# flamegraph.py - create flame graphs from perf samples
# SPDX-License-Identifier: GPL-2.0
#
# Usage:
#
#     perf record -a -g -F 99 sleep 60
#     perf script report flamegraph
#
# Combined:
#
#     perf script flamegraph -a -F 99 sleep 60
#
# Written by Andreas Gerstmayr <agerstmayr@redhat.com>
# Flame Graphs invented by Brendan Gregg <bgregg@netflix.com>
# Works in tandem with d3-flame-graph by Martin Spier <mspier@netflix.com>
#
# pylint: disable=missing-module-docstring
# pylint: disable=missing-class-docstring
# pylint: disable=missing-function-docstring

from __future__ import print_function
import sys
import os
import io
import argparse
import json
import subprocess

# pylint: disable=too-few-public-methods
class Node:
    def __init__(self, name, libtype):
        self.name = name
        # "root" | "kernel" | ""
        # "" indicates user space
        self.libtype = libtype
        self.value = 0
        self.children = []

    def to_json(self):
        return {
            "n": self.name,
            "l": self.libtype,
            "v": self.value,
            "c": self.children
        }


class FlameGraphCLI:
    def __init__(self, args):
        self.args = args
        self.stack = Node("all", "root")

        if self.args.format == "html" and \
                not os.path.isfile(self.args.template):
            print("Flame Graph template {} does not exist. Please install "
                  "the js-d3-flame-graph (RPM) or libjs-d3-flame-graph (deb) "
                  "package, specify an existing flame graph template "
                  "(--template PATH) or another output format "
                  "(--format FORMAT).".format(self.args.template),
                  file=sys.stderr)
            sys.exit(1)

    @staticmethod
    def get_libtype_from_dso(dso):
        """
        when kernel-debuginfo is installed,
        dso points to /usr/lib/debug/lib/modules/*/vmlinux
        """
        if dso and (dso == "[kernel.kallsyms]" or dso.endswith("/vmlinux")):
            return "kernel"

        return ""

    @staticmethod
    def find_or_create_node(node, name, libtype):
        for child in node.children:
            if child.name == name:
                return child

        child = Node(name, libtype)
        node.children.append(child)
        return child

    def process_event(self, event):
        pid = event.get("sample", {}).get("pid", 0)
        # event["dso"] sometimes contains /usr/lib/debug/lib/modules/*/vmlinux
        # for user-space processes; let's use pid for kernel or user-space distinction
        if pid == 0:
            comm = event["comm"]
            libtype = "kernel"
        else:
            comm = "{} ({})".format(event["comm"], pid)
            libtype = ""
        node = self.find_or_create_node(self.stack, comm, libtype)

        if "callchain" in event:
            for entry in reversed(event["callchain"]):
                name = entry.get("sym", {}).get("name", "[unknown]")
                libtype = self.get_libtype_from_dso(entry.get("dso"))
                node = self.find_or_create_node(node, name, libtype)
        else:
            name = event.get("symbol", "[unknown]")
            libtype = self.get_libtype_from_dso(event.get("dso"))
            node = self.find_or_create_node(node, name, libtype)
        node.value += 1

    def get_report_header(self):
        if self.args.input == "-":
            # when this script is invoked with "perf script flamegraph",
            # no perf.data is created and we cannot read the header of it
            return ""

        try:
            output = subprocess.check_output(["perf", "report", "--header-only"])
            return output.decode("utf-8")
        except Exception as err:  # pylint: disable=broad-except
            print("Error reading report header: {}".format(err), file=sys.stderr)
            return ""

    def trace_end(self):
        stacks_json = json.dumps(self.stack, default=lambda x: x.to_json())

        if self.args.format == "html":
            report_header = self.get_report_header()
            options = {
                "colorscheme": self.args.colorscheme,
                "context": report_header
            }
            options_json = json.dumps(options)

            try:
                with io.open(self.args.template, encoding="utf-8") as template:
                    output_str = (
                        template.read()
                        .replace("/** @options_json **/", options_json)
                        .replace("/** @flamegraph_json **/", stacks_json)
                    )
            except IOError as err:
                print("Error reading template file: {}".format(err), file=sys.stderr)
                sys.exit(1)
            output_fn = self.args.output or "flamegraph.html"
        else:
            output_str = stacks_json
            output_fn = self.args.output or "stacks.json"

        if output_fn == "-":
            with io.open(sys.stdout.fileno(), "w", encoding="utf-8", closefd=False) as out:
                out.write(output_str)
        else:
            print("dumping data to {}".format(output_fn))
            try:
                with io.open(output_fn, "w", encoding="utf-8") as out:
                    out.write(output_str)
            except IOError as err:
                print("Error writing output file: {}".format(err), file=sys.stderr)
                sys.exit(1)


if __name__ == "__main__":
    parser = argparse.ArgumentParser(description="Create flame graphs.")
    parser.add_argument("-f", "--format",
                        default="html", choices=["json", "html"],
                        help="output file format")
    parser.add_argument("-o", "--output",
                        help="output file name")
    parser.add_argument("--template",
                        default="/usr/share/d3-flame-graph/d3-flamegraph-base.html",
                        help="path to flame graph HTML template")
    parser.add_argument("--colorscheme",
                        default="blue-green",
                        help="flame graph color scheme",
                        choices=["blue-green", "orange"])
    parser.add_argument("-i", "--input",
                        help=argparse.SUPPRESS)

    cli_args = parser.parse_args()
    cli = FlameGraphCLI(cli_args)

    process_event = cli.process_event
    trace_end = cli.trace_end
select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit/linux-arm.git/diff/?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>Diffstat</a> (limited to 'fs')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/acl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/fid.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/fid.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/fid.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/fid.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/v9fs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/v9fs.c</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/v9fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/v9fs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/v9fs_vfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/v9fs_vfs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_addr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_addr.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_dentry.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_dentry.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_dir.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_file.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_inode.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_inode_dotl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_inode_dotl.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/9p/vfs_super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_super.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/Kconfig</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/Kconfig.binfmt?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/Kconfig.binfmt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/adfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/adfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/inode.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/adfs/map.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/adfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/super.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/affs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/affs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/amigaffs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/amigaffs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/dir.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/file.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/namei.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/affs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/super.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/addr_list.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/addr_list.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/addr_prefs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/addr_prefs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/afs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/afs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/afs_vl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/afs_vl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/callback.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/callback.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/cell.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/cell.c</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/afs/cm_security.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/cm_security.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/cmservice.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/cmservice.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir.c</a></td><td class='right'>1102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/dir_edit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir_edit.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/afs/dir_search.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir_search.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/dir_silly.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir_silly.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/dynroot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dynroot.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/file.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/flock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/flock.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/fs_operation.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/fs_operation.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/fs_probe.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/fs_probe.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/fsclient.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/fsclient.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/inode.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/internal.h</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/main.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/main.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/misc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/mntpt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/mntpt.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/proc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/protocol_yfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/protocol_yfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/rotate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/rotate.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/rxrpc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/rxrpc.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/security.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/security.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/server.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/server.c</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/server_list.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/server_list.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/super.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/validation.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/validation.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/vl_alias.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/vl_alias.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/vl_rotate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/vl_rotate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/vlclient.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/vlclient.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/volume.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/volume.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/write.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/xdr_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/xdr_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/afs/yfsclient.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/yfsclient.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/aio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/aio.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/anon_inodes.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/anon_inodes.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/attr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/attr.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/autofs/autofs_i.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/autofs_i.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/autofs/dev-ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/dev-ioctl.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/autofs/expire.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/expire.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/autofs/init.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/autofs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/inode.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/autofs/root.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/root.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/backing-file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/backing-file.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/bad_inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bad_inode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/Kconfig</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/Makefile</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/acl.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/acl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/acl.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/alloc_background.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_background.c</a></td><td class='right'>2218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 39.9%;'/><td class='none' style='width: 60.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/alloc_background.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_background.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/alloc_background_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_background_format.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/alloc_foreground.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_foreground.c</a></td><td class='right'>1625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 29.2%;'/><td class='none' style='width: 70.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/alloc_foreground.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_foreground.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/alloc_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_types.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/backpointers.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/backpointers.c</a></td><td class='right'>871</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.7%;'/><td class='none' style='width: 84.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/backpointers.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/backpointers.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bbpos.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bbpos.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bbpos_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bbpos_types.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bcachefs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bcachefs.h</a></td><td class='right'>1255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.6%;'/><td class='none' style='width: 77.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bcachefs_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bcachefs_format.h</a></td><td class='right'>1589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 28.6%;'/><td class='none' style='width: 71.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bcachefs_ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bcachefs_ioctl.h</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey.c</a></td><td class='right'>1120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.1%;'/><td class='none' style='width: 79.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey.h</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.0%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey_buf.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_buf.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey_cmp.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_cmp.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey_methods.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_methods.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey_methods.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_methods.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey_sort.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_sort.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bkey_sort.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_sort.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bset.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bset.c</a></td><td class='right'>1597</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 28.7%;'/><td class='none' style='width: 71.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/bset.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bset.h</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_cache.c</a></td><td class='right'>1211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.8%;'/><td class='none' style='width: 78.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_cache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_cache.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_gc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_gc.c</a></td><td class='right'>2071</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 37.2%;'/><td class='none' style='width: 62.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_gc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_gc.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_io.c</a></td><td class='right'>2349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 42.2%;'/><td class='none' style='width: 57.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_io.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_iter.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_iter.c</a></td><td class='right'>3268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 58.7%;'/><td class='none' style='width: 41.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_iter.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_iter.h</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.9%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_journal_iter.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_journal_iter.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_journal_iter.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_journal_iter.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_key_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_key_cache.c</a></td><td class='right'>1067</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.2%;'/><td class='none' style='width: 80.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_key_cache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_key_cache.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_key_cache_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_key_cache_types.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_locking.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_locking.c</a></td><td class='right'>894</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.1%;'/><td class='none' style='width: 83.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_locking.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_locking.h</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_trans_commit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_trans_commit.c</a></td><td class='right'>1126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.2%;'/><td class='none' style='width: 79.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_types.h</a></td><td class='right'>749</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.5%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_update.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update.c</a></td><td class='right'>873</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.7%;'/><td class='none' style='width: 84.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_update.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update.h</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_update_interior.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update_interior.c</a></td><td class='right'>2496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 44.9%;'/><td class='none' style='width: 55.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_update_interior.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update_interior.h</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_write_buffer.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_write_buffer.c</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.6%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_write_buffer.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_write_buffer.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/btree_write_buffer_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_write_buffer_types.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/buckets.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets.c</a></td><td class='right'>1437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.8%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/buckets.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets.h</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.6%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/buckets_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_types.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/buckets_waiting_for_journal.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_waiting_for_journal.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/buckets_waiting_for_journal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_waiting_for_journal.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/buckets_waiting_for_journal_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_waiting_for_journal_types.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/chardev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/chardev.c</a></td><td class='right'>999</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.0%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/chardev.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/chardev.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/checksum.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/checksum.c</a></td><td class='right'>804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.5%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/checksum.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/checksum.h</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/clock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/clock.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/clock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/clock.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/clock_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/clock_types.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/compress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/compress.c</a></td><td class='right'>728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.1%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/compress.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/compress.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/darray.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/darray.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/darray.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/darray.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/data_update.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/data_update.c</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.9%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/data_update.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/data_update.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/debug.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/debug.c</a></td><td class='right'>935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.8%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/debug.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/debug.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/dirent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/dirent.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.8%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/dirent.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/dirent.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/dirent_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/dirent_format.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/disk_groups.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/disk_groups.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.1%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/disk_groups.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/disk_groups.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/disk_groups_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/disk_groups_types.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/ec.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec.c</a></td><td class='right'>2259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.6%;'/><td class='none' style='width: 59.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/ec.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec.h</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/ec_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec_format.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/ec_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec_types.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/errcode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/errcode.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/errcode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/errcode.h</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/error.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/error.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/error.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/error.h</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/extent_update.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extent_update.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/extent_update.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extent_update.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/extents.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents.c</a></td><td class='right'>1510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 27.1%;'/><td class='none' style='width: 72.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/extents.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents.h</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.6%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/extents_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents_format.h</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/extents_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents_types.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/eytzinger.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/eytzinger.h</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fifo.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fifo.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-common.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-common.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.9%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-common.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-common.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io-buffered.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-buffered.c</a></td><td class='right'>1100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.8%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io-buffered.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-buffered.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io-direct.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-direct.c</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.2%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io-direct.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-direct.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io-pagecache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-pagecache.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.4%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io-pagecache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-pagecache.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io.c</a></td><td class='right'>1081</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.4%;'/><td class='none' style='width: 80.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-ioctl.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs-ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-ioctl.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs.c</a></td><td class='right'>1976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 35.5%;'/><td class='none' style='width: 64.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fsck.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fsck.c</a></td><td class='right'>2394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 43.0%;'/><td class='none' style='width: 57.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/fsck.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fsck.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/inode.c</a></td><td class='right'>1195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.5%;'/><td class='none' style='width: 78.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/inode.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/inode_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/inode_format.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_misc.c</a></td><td class='right'>515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.3%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_misc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_misc.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_read.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_read.c</a></td><td class='right'>1220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.9%;'/><td class='none' style='width: 78.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_read.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_read.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_write.c</a></td><td class='right'>1661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 29.9%;'/><td class='none' style='width: 70.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_write.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_write.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/io_write_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_write_types.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal.c</a></td><td class='right'>1506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 27.1%;'/><td class='none' style='width: 72.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal.h</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_io.c</a></td><td class='right'>2006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 36.1%;'/><td class='none' style='width: 63.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_io.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_reclaim.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_reclaim.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.3%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_reclaim.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_reclaim.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_sb.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_sb.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_sb.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_sb.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_seq_blacklist.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_seq_blacklist.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_seq_blacklist.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_seq_blacklist.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/journal_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_types.h</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/keylist.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/keylist.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/keylist.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/keylist.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/keylist_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/keylist_types.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/logged_ops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/logged_ops.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/logged_ops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/logged_ops.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/logged_ops_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/logged_ops_format.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/lru.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/lru.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/lru.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/lru.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/mean_and_variance.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/mean_and_variance.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/mean_and_variance.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/mean_and_variance.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/mean_and_variance_test.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/mean_and_variance_test.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/migrate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/migrate.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/migrate.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/migrate.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/move.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/move.c</a></td><td class='right'>1208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.7%;'/><td class='none' style='width: 78.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/move.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/move.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/move_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/move_types.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/movinggc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/movinggc.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/movinggc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/movinggc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/nocow_locking.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/nocow_locking.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/nocow_locking.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/nocow_locking.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/nocow_locking_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/nocow_locking_types.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/opts.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/opts.c</a></td><td class='right'>602</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.8%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/opts.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/opts.h</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.3%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/printbuf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/printbuf.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/printbuf.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/printbuf.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/quota.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota.c</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/quota.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/quota_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota_format.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/quota_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota_types.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/rebalance.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/rebalance.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.7%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/rebalance.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/rebalance.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/rebalance_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/rebalance_types.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/recovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/recovery.c</a></td><td class='right'>1220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.9%;'/><td class='none' style='width: 78.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/recovery.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/recovery.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/recovery_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/recovery_types.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/reflink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/reflink.c</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.6%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/reflink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/reflink.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/reflink_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/reflink_format.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/replicas.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/replicas.c</a></td><td class='right'>1053</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.9%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/replicas.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/replicas.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/replicas_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/replicas_types.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-clean.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-clean.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-clean.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-clean.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-counters.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-counters.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-counters.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-counters.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-counters_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-counters_format.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-downgrade.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-downgrade.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-downgrade.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-downgrade.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-errors.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-errors.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-errors.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-errors.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-errors_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-errors_types.h</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-members.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-members.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sb-members.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-members.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/seqmutex.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/seqmutex.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/siphash.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/siphash.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/siphash.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/siphash.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/six.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/six.c</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.6%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/six.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/six.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/snapshot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/snapshot.c</a></td><td class='right'>1687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 30.3%;'/><td class='none' style='width: 69.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/snapshot.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/snapshot.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/snapshot_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/snapshot_format.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/str_hash.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/str_hash.h</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/subvolume.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/subvolume.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/subvolume_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume_format.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/subvolume_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume_types.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/super-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super-io.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.1%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/super-io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super-io.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super.c</a></td><td class='right'>2124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 38.2%;'/><td class='none' style='width: 61.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/super.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/super_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super_types.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sysfs.c</a></td><td class='right'>1029</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.5%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/sysfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sysfs.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/tests.c</a></td><td class='right'>882</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.9%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/tests.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/tests.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/thread_with_file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/thread_with_file.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/thread_with_file.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/thread_with_file.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/thread_with_file_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/thread_with_file_types.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/trace.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/trace.h</a></td><td class='right'>1443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.9%;'/><td class='none' style='width: 74.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/two_state_shared_lock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/two_state_shared_lock.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/two_state_shared_lock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/two_state_shared_lock.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/util.c</a></td><td class='right'>1217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.9%;'/><td class='none' style='width: 78.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/util.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/util.h</a></td><td class='right'>879</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.8%;'/><td class='none' style='width: 84.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/varint.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/varint.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/varint.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/varint.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/vstructs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/vstructs.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/xattr.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.8%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/xattr.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/bcachefs/xattr_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/xattr_format.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/befs/linuxvfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/befs/linuxvfs.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/bfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bfs/file.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/bfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bfs/inode.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/binfmt_elf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_elf.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/binfmt_elf_fdpic.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_elf_fdpic.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/binfmt_flat.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_flat.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/binfmt_misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_misc.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/binfmt_script.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_script.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/bpf_fs_kfuncs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bpf_fs_kfuncs.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/Kconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/accessors.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/accessors.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/accessors.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/accessors.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/acl.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/acl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/acl.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/async-thread.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/async-thread.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/async-thread.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/async-thread.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/backref.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/backref.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/backref.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/backref.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/bio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/bio.c</a></td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/bio.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/bio.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/block-group.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-group.c</a></td><td class='right'>727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/block-group.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-group.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/block-rsv.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-rsv.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/block-rsv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-rsv.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/btrfs_inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/btrfs_inode.h</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/compression.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/compression.c</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/compression.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/compression.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ctree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ctree.c</a></td><td class='right'>924</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 83.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ctree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ctree.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/defrag.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/defrag.c</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/defrag.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/defrag.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/delalloc-space.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delalloc-space.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/delalloc-space.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delalloc-space.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/delayed-inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-inode.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/delayed-inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-inode.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/delayed-ref.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-ref.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 82.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/delayed-ref.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-ref.h</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/dev-replace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dev-replace.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/dev-replace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dev-replace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/dir-item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dir-item.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/dir-item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dir-item.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/btrfs/direct-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/direct-io.c</a></td><td class='right'>1106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/btrfs/direct-io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/direct-io.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/discard.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/discard.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/discard.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/discard.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/disk-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/disk-io.c</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/disk-io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/disk-io.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/export.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/export.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/export.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent-io-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-io-tree.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent-io-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-io-tree.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-tree.c</a></td><td class='right'>2030</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.3%;'/><td class='rem' style='width: 16.2%;'/><td class='none' style='width: 63.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-tree.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_io.c</a></td><td class='right'>3851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.0%;'/><td class='rem' style='width: 37.2%;'/><td class='none' style='width: 30.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent_io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_io.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent_map.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_map.c</a></td><td class='right'>838</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/extent_map.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_map.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/btrfs/fiemap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/fiemap.c</a></td><td class='right'>929</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/btrfs/fiemap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/fiemap.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/file-item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file-item.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/file-item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file-item.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file.c</a></td><td class='right'>1957</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 64.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/file.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/free-space-cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-cache.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/free-space-cache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-cache.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/free-space-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-tree.c</a></td><td class='right'>681</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/free-space-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-tree.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/fs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/fs.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/fs.h</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/inode-item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/inode-item.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/inode-item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/inode-item.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/inode.c</a></td><td class='right'>5564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 46.5%;'/><td class='rem' style='width: 53.5%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ioctl.c</a></td><td class='right'>1634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.3%;'/><td class='rem' style='width: 9.1%;'/><td class='none' style='width: 70.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ioctl.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/locking.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/locking.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/locking.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/locking.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/lru_cache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/lru_cache.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/lzo.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/lzo.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/messages.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/messages.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/messages.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/messages.h</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/misc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/misc.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ordered-data.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ordered-data.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ordered-data.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ordered-data.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/orphan.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/orphan.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/orphan.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/orphan.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/print-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/print-tree.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/print-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/print-tree.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/props.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/props.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/props.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/props.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/qgroup.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/qgroup.c</a></td><td class='right'>1288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/qgroup.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/qgroup.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/raid-stripe-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid-stripe-tree.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/raid-stripe-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid-stripe-tree.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/raid56.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid56.c</a></td><td class='right'>1100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/raid56.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid56.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/btrfs/rcu-string.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/rcu-string.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ref-verify.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ref-verify.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ref-verify.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ref-verify.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/reflink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/reflink.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/reflink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/reflink.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/relocation.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/relocation.c</a></td><td class='right'>1438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 14.8%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/relocation.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/relocation.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/root-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/root-tree.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/root-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/root-tree.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/scrub.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/scrub.c</a></td><td class='right'>1008</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/scrub.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/scrub.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/send.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/send.c</a></td><td class='right'>1571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 14.8%;'/><td class='none' style='width: 71.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/send.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/send.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/space-info.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/space-info.c</a></td><td class='right'>992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.1%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/space-info.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/space-info.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/subpage.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/subpage.c</a></td><td class='right'>681</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/subpage.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/subpage.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/super.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/super.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/super.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/sysfs.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/sysfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/sysfs.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/btrfs-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/btrfs-tests.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/btrfs-tests.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/btrfs-tests.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/delayed-refs-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/delayed-refs-tests.c</a></td><td class='right'>1016</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/extent-io-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/extent-io-tests.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/extent-map-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/extent-map-tests.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/free-space-tree-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/free-space-tree-tests.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/inode-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/inode-tests.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/qgroup-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/qgroup-tests.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tests/raid-stripe-tree-tests.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/raid-stripe-tree-tests.c</a></td><td class='right'>1161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/transaction.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/transaction.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/transaction.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/transaction.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tree-checker.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-checker.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tree-checker.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-checker.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tree-log.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-log.c</a></td><td class='right'>3196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.4%;'/><td class='rem' style='width: 24.0%;'/><td class='none' style='width: 42.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tree-log.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-log.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tree-mod-log.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-mod-log.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/tree-mod-log.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-mod-log.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ulist.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ulist.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/ulist.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ulist.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/uuid-tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/uuid-tree.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/uuid-tree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/uuid-tree.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/verity.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/verity.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/verity.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/verity.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/volumes.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/volumes.c</a></td><td class='right'>1537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 14.1%;'/><td class='none' style='width: 72.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/volumes.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/volumes.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/xattr.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/xattr.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/zlib.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zlib.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/zoned.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zoned.c</a></td><td class='right'>801</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/zoned.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zoned.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/btrfs/zstd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zstd.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/buffer.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/buffer.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/cache.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/daemon.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/daemon.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/error_inject.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/error_inject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/interface.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/interface.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/internal.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/io.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/key.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/key.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/namei.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/ondemand.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/ondemand.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/security.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/security.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/volume.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/volume.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cachefiles/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/xattr.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/addr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/addr.c</a></td><td class='right'>1420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.0%;'/><td class='rem' style='width: 9.5%;'/><td class='none' style='width: 74.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/caps.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/caps.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/crypto.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/crypto.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/crypto.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/crypto.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/debugfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/debugfs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/dir.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/export.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/file.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/inode.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/io.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/io.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/ioctl.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/locks.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/locks.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/mds_client.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mds_client.c</a></td><td class='right'>610</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/mds_client.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mds_client.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/mdsmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mdsmap.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/mdsmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mdsmap.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/quota.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/quota.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/super.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/super.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/super.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ceph/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/xattr.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/char_dev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/char_dev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coda/cnode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/cnode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coda/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/dir.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coda/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/file.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coda/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/inode.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coda/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/symlink.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coda/sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/sysctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/compat_binfmt_elf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/compat_binfmt_elf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/configfs_internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/configfs_internal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/dir.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/inode.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/item.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/mount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/mount.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/configfs/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/symlink.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/coredump.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coredump.c</a></td><td class='right'>1189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.9%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 78.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/cramfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cramfs/inode.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/bio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/bio.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/crypto.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/crypto.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/fname.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/fname.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/fscrypt_private.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/fscrypt_private.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/hkdf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/hkdf.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/hooks.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/hooks.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/inline_crypt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/inline_crypt.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/keyring.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/keyring.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/keysetup.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/keysetup.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/keysetup_v1.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/keysetup_v1.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/crypto/policy.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/policy.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/d_path.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/d_path.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dax.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dax.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dcache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dcache.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/debugfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/debugfs/file.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/debugfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/debugfs/inode.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/debugfs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/debugfs/internal.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/devpts/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/devpts/inode.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/direct-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/direct-io.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/ast.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/ast.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/ast.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/ast.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/config.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/config.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/config.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/config.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/debug_fs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/debug_fs.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/dir.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/dir.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/dir.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/dlm_internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/dlm_internal.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/lock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lock.c</a></td><td class='right'>1509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 11.8%;'/><td class='none' style='width: 72.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/lock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lock.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/lockspace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lockspace.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/lowcomms.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lowcomms.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/lowcomms.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lowcomms.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/main.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/member.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/member.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/memory.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/memory.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/memory.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/memory.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/midcomms.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/midcomms.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/midcomms.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/midcomms.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/plock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/plock.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/rcom.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/rcom.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/recover.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/recover.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/recover.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/recover.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/recoverd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/recoverd.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/requestqueue.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/requestqueue.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/dlm/user.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/user.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/drop_caches.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/drop_caches.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/crypto.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/crypto.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/dentry.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/dentry.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/ecryptfs_kernel.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/ecryptfs_kernel.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/file.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/inode.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/keystore.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/keystore.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/main.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/main.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/mmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/mmap.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/read_write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/read_write.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ecryptfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/super.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efivarfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/file.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efivarfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/inode.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efivarfs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/internal.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efivarfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/super.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efivarfs/vars.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/vars.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efs/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efs/super.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/efs/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efs/symlink.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/Kconfig</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/compress.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/compress.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/data.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/data.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/decompressor.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/erofs/decompressor_crypto.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor_crypto.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/decompressor_deflate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor_deflate.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/decompressor_lzma.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor_lzma.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/erofs/decompressor_zstd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor_zstd.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/dir.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/erofs_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/erofs_fs.h</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/erofs/fileio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/fileio.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/fscache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/fscache.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/inode.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/internal.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/namei.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/erofs/pcpubuf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/pcpubuf.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/super.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/sysfs.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/erofs/utils.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/utils.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/xattr.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/xattr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/zdata.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/zdata.c</a></td><td class='right'>1303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 76.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/erofs/zmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/zmap.c</a></td><td class='right'>668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/erofs/zutil.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/zutil.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/eventfd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/eventfd.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/eventpoll.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/eventpoll.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exec.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exec.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/balloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/balloc.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/cache.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/dir.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/exfat_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/exfat_fs.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/exfat_raw.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/exfat_raw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/fatent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/fatent.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/file.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/inode.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/namei.c</a></td><td class='right'>560</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/nls.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/nls.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exfat/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/super.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/exportfs/expfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exportfs/expfs.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/balloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/balloc.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/dir.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/ext2.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/ext2.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/file.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/inode.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/namei.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/super.c</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext2/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/xattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/acl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/acl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/balloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/balloc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/bitmap.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/block_validity.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/block_validity.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/crypto.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/crypto.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/dir.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/ext4.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4.h</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/ext4_extents.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4_extents.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/ext4_jbd2.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4_jbd2.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/ext4_jbd2.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4_jbd2.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/extents.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/extents.c</a></td><td class='right'>1743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.5%;'/><td class='rem' style='width: 14.9%;'/><td class='none' style='width: 68.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/extents_status.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/extents_status.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/extents_status.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/extents_status.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/fast_commit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fast_commit.c</a></td><td class='right'>559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/fast_commit.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fast_commit.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/file.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/fsmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fsmap.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/fsync.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fsync.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/hash.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/hash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/ialloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ialloc.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/indirect.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/indirect.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/inline.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/inline.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/inode-test.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/inode-test.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/inode.c</a></td><td class='right'>2047</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.2%;'/><td class='rem' style='width: 13.6%;'/><td class='none' style='width: 63.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ioctl.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/mballoc-test.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mballoc-test.c</a></td><td class='right'>684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/mballoc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mballoc.c</a></td><td class='right'>1637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.4%;'/><td class='rem' style='width: 13.0%;'/><td class='none' style='width: 70.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/mballoc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mballoc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/migrate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/migrate.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/mmp.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mmp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/move_extent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/move_extent.c</a></td><td class='right'>844</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/namei.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/orphan.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/orphan.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/page-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/page-io.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/readpage.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/readpage.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/resize.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/resize.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/super.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/symlink.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/sysfs.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/verity.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/verity.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/xattr.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ext4/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/xattr.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/acl.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/acl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/acl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/checkpoint.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/checkpoint.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/compress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/compress.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/data.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/data.c</a></td><td class='right'>1410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 12.9%;'/><td class='none' style='width: 74.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/debug.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/debug.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/dir.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/extent_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/extent_cache.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/f2fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/f2fs.h</a></td><td class='right'>1286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.0%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/file.c</a></td><td class='right'>1267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 77.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/gc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/gc.c</a></td><td class='right'>666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/gc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/gc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/inline.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/inline.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/inode.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/namei.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/node.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/node.c</a></td><td class='right'>1225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 78.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/node.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/node.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/recovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/recovery.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/segment.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/segment.c</a></td><td class='right'>1311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.2%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 76.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/segment.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/segment.h</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/shrinker.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/shrinker.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/super.c</a></td><td class='right'>3076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.5%;'/><td class='rem' style='width: 22.8%;'/><td class='none' style='width: 44.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/sysfs.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/verity.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/verity.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/xattr.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/f2fs/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/xattr.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/dir.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/fat.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/fat.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/fat_test.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/fat_test.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/fatent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/fatent.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/inode.c</a></td><td class='right'>710</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/misc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/namei_msdos.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/namei_msdos.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/namei_vfat.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/namei_vfat.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fat/nfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/nfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fcntl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fcntl.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fhandle.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fhandle.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/file.c</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/file_attr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/file_attr.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/file_table.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/file_table.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/filesystems.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/filesystems.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/freevxfs/vxfs_dir.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/freevxfs/vxfs_dir.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/freevxfs/vxfs_inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/freevxfs/vxfs_inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/freevxfs/vxfs_super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/freevxfs/vxfs_super.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fs-writeback.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs-writeback.c</a></td><td class='right'>544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fs_context.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_context.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/fs/fs_dirent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_dirent.c</a> (renamed from fs/fs_types.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fs_parser.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_parser.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fs_struct.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_struct.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fsopen.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fsopen.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/acl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/backing.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/backing.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/control.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/control.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/cuse.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/cuse.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/dax.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dax.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/dev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dev.c</a></td><td class='right'>1068</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 80.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/dev_uring.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dev_uring.c</a></td><td class='right'>1373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/dev_uring_i.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dev_uring_i.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dir.c</a></td><td class='right'>709</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/file.c</a></td><td class='right'>1746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 16.0%;'/><td class='none' style='width: 68.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/fuse_dev_i.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/fuse_dev_i.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/fuse_i.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/fuse_i.h</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/fuse_trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/fuse_trace.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/inode.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/ioctl.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/iomode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/iomode.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/passthrough.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/passthrough.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/readdir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/readdir.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/sysctl.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/fuse/trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/trace.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/virtio_fs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/virtio_fs.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/fuse/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/xattr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/aops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/aops.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/aops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/aops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/bmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/bmap.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/bmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/bmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/dentry.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/dentry.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/dir.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/export.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/file.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/glock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/glock.c</a></td><td class='right'>979</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 82.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/glock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/glock.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/glops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/glops.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/incore.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/incore.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/inode.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/inode.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/lock_dlm.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/lock_dlm.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/log.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/log.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/log.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/log.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/lops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/lops.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/lops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/lops.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/main.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/main.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/meta_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/meta_io.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/meta_io.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/meta_io.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/ops_fstype.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/ops_fstype.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/quota.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/quota.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/quota.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/quota.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/recovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/recovery.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/recovery.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/recovery.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/rgrp.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/rgrp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/super.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/super.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/super.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/sys.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/sys.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/trace_gfs2.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/trace_gfs2.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/trans.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/trans.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/trans.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/trans.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/util.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/util.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/util.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/xattr.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/gfs2/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/xattr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/hfs/.kunitconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/.kunitconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/bfind.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/bfind.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/bitmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/bnode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/bnode.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/brec.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/brec.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/btree.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/btree.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/catalog.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/catalog.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/dir.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/extent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/extent.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/hfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/hfs.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/hfs_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/hfs_fs.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/inode.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/mdb.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/mdb.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/string.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/string.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/hfs/string_test.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/string_test.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/super.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfs/sysdep.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/sysdep.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/.kunitconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/.kunitconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/attributes.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/attributes.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/bfind.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/bfind.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/bitmap.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/bnode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/bnode.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/brec.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/brec.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/btree.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/catalog.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/catalog.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/dir.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/extents.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/extents.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/hfsplus_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/hfsplus_fs.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/hfsplus_raw.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/hfsplus_raw.h</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/inode.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/options.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/options.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/super.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/unicode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/unicode.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/unicode_test.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/unicode_test.c</a></td><td class='right'>1579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/wrapper.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/wrapper.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hfsplus/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/xattr.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hostfs/hostfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hostfs/hostfs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hostfs/hostfs_kern.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hostfs/hostfs_kern.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hostfs/hostfs_user.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hostfs/hostfs_user.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/anode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/anode.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/ea.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/ea.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/file.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/hpfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/hpfs.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/hpfs_fn.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/hpfs_fn.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/inode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/map.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/map.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/namei.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hpfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/super.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/hugetlbfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hugetlbfs/inode.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/init.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/init.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/inode.c</a></td><td class='right'>1063</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 80.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/internal.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ioctl.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/iomap/bio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/bio.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/buffered-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/buffered-io.c</a></td><td class='right'>1868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.0%;'/><td class='rem' style='width: 17.6%;'/><td class='none' style='width: 66.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/direct-io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/direct-io.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/fiemap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/fiemap.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/iomap/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/internal.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/iomap/ioend.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/ioend.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/iter.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/iter.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/seek.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/seek.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/swapfile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/swapfile.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/trace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/iomap/trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/trace.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/compress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/compress.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/dir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/export.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/inode.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/isofs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/isofs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/rock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/rock.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/rock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/rock.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/isofs/util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/util.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/checkpoint.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/checkpoint.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/commit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/commit.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/journal.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/journal.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/recovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/recovery.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/revoke.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/revoke.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jbd2/transaction.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/transaction.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/background.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/background.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/compr_rtime.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/compr_rtime.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/compr_rubin.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/compr_rubin.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/dir.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/erase.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/erase.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/file.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/fs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/fs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/gc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/gc.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/malloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/malloc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/nodemgmt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/nodemgmt.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/readinode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/readinode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/scan.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/scan.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/summary.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/summary.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/super.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/wbuf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/wbuf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jffs2/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/xattr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/file.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/inode.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_discard.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_discard.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_dmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_dmap.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_dtree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_dtree.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_extent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_extent.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_filsys.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_filsys.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_imap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_imap.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_incore.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_incore.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_inode.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_logmgr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_logmgr.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_metapage.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_metapage.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_metapage.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_metapage.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_mount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_mount.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_txnmgr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_txnmgr.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/jfs_xtree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_xtree.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/namei.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/super.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/jfs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/xattr.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernel_read_file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernel_read_file.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/dir.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/file.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/inode.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernfs/kernfs-internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/kernfs-internal.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernfs/mount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/mount.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/kernfs/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/symlink.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/libfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/libfs.c</a></td><td class='right'>777</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/clnt4xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clnt4xdr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/clntlock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clntlock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/clntproc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clntproc.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/clntxdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clntxdr.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/host.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/host.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/mon.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/mon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/lockd/netlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/netlink.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/lockd/netlink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/netlink.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/netns.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/netns.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/svc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svc.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/svc4proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svc4proc.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/svclock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svclock.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/svcproc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svcproc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/svcshare.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svcshare.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/svcsubs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svcsubs.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/xdr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/lockd/xdr4.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/xdr4.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/locks.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/locks.c</a></td><td class='right'>1030</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 81.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/mbcache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mbcache.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/minix/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/dir.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/minix/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/minix/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/inode.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/minix/minix.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/minix.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/minix/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/namei.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/mnt_idmapping.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mnt_idmapping.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/mount.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mount.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/mpage.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mpage.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/namei.c</a></td><td class='right'>2207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.3%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 60.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/namespace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/namespace.c</a></td><td class='right'>3529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.2%;'/><td class='rem' style='width: 24.3%;'/><td class='none' style='width: 36.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/buffered_read.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/buffered_read.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/buffered_write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/buffered_write.c</a></td><td class='right'>1194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 16.9%;'/><td class='none' style='width: 78.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/direct_read.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/direct_read.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/direct_write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/direct_write.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/fscache_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_cache.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/fscache_cookie.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_cookie.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/fscache_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_io.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/fscache_main.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/fscache_volume.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_volume.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/internal.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/netfs/io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/io.c</a></td><td class='right'>785</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.1%;'/><td class='none' style='width: 85.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/iterator.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/iterator.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/locking.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/locking.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/main.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/main.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/misc.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/objects.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/objects.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/netfs/output.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/output.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.6%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/read_collect.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/read_collect.c</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/read_pgpriv2.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/read_pgpriv2.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/read_retry.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/read_retry.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/read_single.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/read_single.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/rolling_buffer.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/rolling_buffer.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/netfs/stats.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/stats.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/write_collect.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/write_collect.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/write_issue.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/write_issue.c</a></td><td class='right'>926</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/netfs/write_retry.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/write_retry.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/blocklayout/blocklayout.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/blocklayout.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/blocklayout/blocklayout.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/blocklayout.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/blocklayout/dev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/dev.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/blocklayout/extent_tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/extent_tree.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/blocklayout/rpc_pipefs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/rpc_pipefs.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/callback.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/callback.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/callback_proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback_proc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/callback_xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback_xdr.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/client.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/client.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/delegation.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/delegation.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/delegation.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/delegation.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/dir.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/direct.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/direct.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/export.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/file.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/filelayout/filelayout.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/filelayout/filelayout.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/filelayout/filelayoutdev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/filelayout/filelayoutdev.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/flexfilelayout/flexfilelayout.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/flexfilelayout/flexfilelayout.c</a></td><td class='right'>1064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 80.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/flexfilelayout/flexfilelayout.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/flexfilelayout/flexfilelayout.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/flexfilelayout/flexfilelayoutdev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/flexfilelayout/flexfilelayoutdev.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/fs_context.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/fs_context.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/fscache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/fscache.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/fscache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/fscache.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/getroot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/getroot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/inode.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/internal.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/io.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/iostat.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/iostat.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfs/localio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/localio.c</a></td><td class='right'>1072</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/mount_clnt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/mount_clnt.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/namespace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/namespace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/netns.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/netns.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs2super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs2super.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs2xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs2xdr.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs3acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs3client.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3client.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs3proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3proc.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs3super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3super.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs3xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3xdr.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs42.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs42proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42proc.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs42xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42xattr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs42xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42xdr.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4_fs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4client.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4client.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4file.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4getroot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4getroot.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4idmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4idmap.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4proc.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 86.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4renewd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4renewd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4session.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4session.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4state.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4state.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4super.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4sysctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4trace.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4trace.h</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfs4xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4xdr.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfsroot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfsroot.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/nfstrace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfstrace.h</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/pagelist.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pagelist.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/pnfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/pnfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/pnfs_dev.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs_dev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/pnfs_nfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs_nfs.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/proc.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/read.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/read.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/super.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/symlink.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/sysctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/sysfs.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/unlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/unlink.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs/write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/write.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/common.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/common.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/grace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/grace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/localio_trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/localio_trace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/localio_trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/localio_trace.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/nfsacl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/nfsacl.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfs_common/nfslocalio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/nfslocalio.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/auth.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/auth.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/auth.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/auth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/blocklayout.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/blocklayout.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/blocklayoutxdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/blocklayoutxdr.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/blocklayoutxdr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/blocklayoutxdr.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/cache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/cache.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfsd/debugfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/debugfs.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/export.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/export.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/export.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/filecache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/filecache.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/filecache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/filecache.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/flexfilelayout.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/flexfilelayout.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/flexfilelayoutxdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/flexfilelayoutxdr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfsd/localio.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/localio.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/lockd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/lockd.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/netlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/netlink.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/netlink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/netlink.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/netns.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/netns.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs2acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs2acl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs3acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs3acl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs3proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs3proc.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs3xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs3xdr.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4callback.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4callback.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4idmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4idmap.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4layouts.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4layouts.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4proc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4proc.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4recover.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4recover.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4state.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4state.c</a></td><td class='right'>2449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.8%;'/><td class='rem' style='width: 13.2%;'/><td class='none' style='width: 56.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4xdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4xdr.c</a></td><td class='right'>743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4xdr_gen.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4xdr_gen.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfs4xdr_gen.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4xdr_gen.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfscache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfscache.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfsctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsctl.c</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfsd.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsd.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfsfh.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsfh.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfsfh.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsfh.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfsproc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsproc.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfssvc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfssvc.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/nfsxdr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsxdr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/pnfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/pnfs.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/state.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/state.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/stats.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/stats.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/stats.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/stats.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/trace.h</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/vfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/vfs.c</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/vfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/vfs.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/xdr3.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/xdr3.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/xdr4.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/xdr4.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nfsd/xdr4cb.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/xdr4cb.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/alloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/alloc.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/alloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/alloc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/bmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/bmap.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/bmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/bmap.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/btnode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/btnode.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/btree.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/btree.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/cpfile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/cpfile.c</a></td><td class='right'>689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/cpfile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/cpfile.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/dat.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/dat.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/dir.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/direct.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/direct.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/file.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/gcinode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/gcinode.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/ifile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/ifile.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/ifile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/ifile.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/inode.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/ioctl.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/mdt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/mdt.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/namei.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/nilfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/nilfs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/page.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/page.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/page.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/page.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/recovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/recovery.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/segbuf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/segbuf.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/segment.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/segment.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/segment.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/segment.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/sufile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sufile.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/sufile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sufile.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/super.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sysfs.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/sysfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sysfs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/the_nilfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/the_nilfs.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nilfs2/the_nilfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/the_nilfs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-celtic.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-celtic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-centeuro.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-centeuro.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-croatian.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-croatian.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-cyrillic.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-cyrillic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-gaelic.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-gaelic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-greek.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-greek.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-iceland.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-iceland.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-inuit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-inuit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-roman.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-roman.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-romanian.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-romanian.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/mac-turkish.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-turkish.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_ascii.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_ascii.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_base.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_base.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp1250.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp1250.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp1251.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp1251.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp1255.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp1255.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp437.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp437.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp737.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp737.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp775.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp775.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp850.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp850.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp852.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp852.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp855.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp855.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp857.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp857.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp860.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp860.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp861.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp861.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp862.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp862.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp863.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp863.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp864.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp864.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp865.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp865.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp866.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp866.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp869.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp869.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp874.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp874.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp932.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp932.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp936.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp936.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp949.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp949.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_cp950.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp950.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_euc-jp.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_euc-jp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-1.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-13.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-13.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-14.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-14.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-15.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-15.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-2.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-3.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-4.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-5.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-5.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-6.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-7.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-7.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_iso8859-9.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-9.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_koi8-r.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_koi8-r.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_koi8-ru.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_koi8-ru.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_koi8-u.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_koi8-u.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_ucs2_utils.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_ucs2_utils.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nls/nls_utf8.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_utf8.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/dnotify/dnotify.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/dnotify/dnotify.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fanotify/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fanotify/fanotify.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/fanotify.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fanotify/fanotify.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/fanotify.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fanotify/fanotify_user.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/fanotify_user.c</a></td><td class='right'>690</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fdinfo.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fdinfo.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fsnotify.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fsnotify.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/fsnotify.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fsnotify.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/group.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/group.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/inotify/inotify_fsnotify.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/inotify/inotify_fsnotify.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/inotify/inotify_user.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/inotify/inotify_user.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/notify/mark.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/mark.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/nsfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nsfs.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/Kconfig</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/aops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/aops.c</a></td><td class='right'>1744</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 31.3%;'/><td class='none' style='width: 68.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/aops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/aops.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/attrib.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/attrib.c</a></td><td class='right'>2624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 47.2%;'/><td class='none' style='width: 52.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/attrib.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/attrib.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/bitmap.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/bitmap.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/collate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/collate.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/collate.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/collate.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/compress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/compress.c</a></td><td class='right'>950</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.1%;'/><td class='none' style='width: 82.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/debug.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/debug.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/debug.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/debug.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/dir.c</a></td><td class='right'>1540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 27.7%;'/><td class='none' style='width: 72.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/dir.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/dir.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/endian.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/endian.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/file.c</a></td><td class='right'>1997</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 35.9%;'/><td class='none' style='width: 64.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/index.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/index.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/index.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/index.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/inode.c</a></td><td class='right'>3102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 55.8%;'/><td class='none' style='width: 44.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/inode.h</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/layout.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/layout.h</a></td><td class='right'>2421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 43.5%;'/><td class='none' style='width: 56.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/lcnalloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/lcnalloc.c</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.0%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/lcnalloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/lcnalloc.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/logfile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/logfile.c</a></td><td class='right'>849</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.3%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/logfile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/logfile.h</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/malloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/malloc.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/mft.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/mft.c</a></td><td class='right'>2907</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 52.2%;'/><td class='none' style='width: 47.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/mft.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/mft.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/mst.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/mst.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/namei.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/ntfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/ntfs.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/quota.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/quota.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/quota.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/quota.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/runlist.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/runlist.c</a></td><td class='right'>1893</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 34.0%;'/><td class='none' style='width: 66.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/runlist.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/runlist.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/super.c</a></td><td class='right'>3202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 57.5%;'/><td class='none' style='width: 42.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/sysctl.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/sysctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/sysctl.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/time.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/time.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/types.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/unistr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/unistr.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/upcase.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/upcase.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/usnjrnl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/usnjrnl.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/usnjrnl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/usnjrnl.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/ntfs/volume.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/volume.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/attrib.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/attrib.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/attrlist.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/attrlist.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/bitmap.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/dir.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/file.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/frecord.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/frecord.c</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/fslog.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/fslog.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/fsntfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/fsntfs.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/index.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/index.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/inode.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/lib/decompress_common.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/lib/decompress_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/lib/lzx_decompress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/lib/lzx_decompress.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/lznt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/lznt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/namei.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/ntfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/ntfs.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/ntfs_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/ntfs_fs.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/record.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/record.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/run.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/run.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/super.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ntfs3/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/xattr.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/acl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/alloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/alloc.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/alloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/alloc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/aops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/aops.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/aops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/aops.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/buffer_head_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/buffer_head_io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/cluster/heartbeat.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/heartbeat.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/cluster/masklog.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/masklog.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/cluster/quorum.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/quorum.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/cluster/tcp.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/tcp.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dcache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dcache.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dir.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlm/dlmapi.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmapi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlm/dlmdebug.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmdebug.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlm/dlmdomain.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmdomain.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlm/dlmmaster.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmmaster.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlm/dlmrecovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmrecovery.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlmfs/dlmfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlmfs/dlmfs.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlmglue.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlmglue.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/dlmglue.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlmglue.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/export.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/extent_map.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/extent_map.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/file.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/file.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/file.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/filecheck.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/filecheck.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/inode.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/inode.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ioctl.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ioctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/journal.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/journal.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/journal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/journal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/localalloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/localalloc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/locks.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/locks.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/mmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/mmap.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/mmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/mmap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/move_extents.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/move_extents.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/namei.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ocfs2.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ocfs2_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_fs.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ocfs2_ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_ioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ocfs2_lockid.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_lockid.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/ocfs2_trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_trace.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/quota.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/quota.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/quota_global.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/quota_global.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/quota_local.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/quota_local.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/refcounttree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/refcounttree.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/reservations.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/reservations.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/reservations.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/reservations.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/resize.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/resize.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/stack_o2cb.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stack_o2cb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/stack_user.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stack_user.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/stackglue.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stackglue.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/stackglue.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stackglue.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/suballoc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/suballoc.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/suballoc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/suballoc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/super.c</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/symlink.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/sysfile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/sysfile.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ocfs2/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/xattr.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/omfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/omfs/dir.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/omfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/omfs/file.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/omfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/omfs/inode.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/open.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/open.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/openpromfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/openpromfs/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/dcache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/dcache.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/file.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/inode.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/namei.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-bufmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-bufmap.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-bufmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-bufmap.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-cache.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-debug.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-debug.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-debugfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-debugfs.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-kernel.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-kernel.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-mod.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-mod.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-sysfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/orangefs-utils.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-utils.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/super.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/orangefs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/xattr.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/copy_up.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/copy_up.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/dir.c</a></td><td class='right'>824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/export.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/file.c</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/inode.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/namei.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/overlayfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/overlayfs.h</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/ovl_entry.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/ovl_entry.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/params.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/params.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/params.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/params.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/readdir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/readdir.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/super.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/util.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/overlayfs/xattrs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/xattrs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/pidfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pidfs.c</a></td><td class='right'>1104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pipe.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pipe.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pnode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pnode.c</a></td><td class='right'>749</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pnode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pnode.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/posix_acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/posix_acl.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/array.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/array.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/base.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/base.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/bootconfig.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/bootconfig.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/consoles.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/consoles.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/fd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/fd.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/generic.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/generic.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/inode.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/internal.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/interrupts.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/interrupts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/kcore.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/kcore.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/meminfo.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/meminfo.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/namespaces.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/namespaces.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/page.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/page.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/proc_net.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/proc_net.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/proc_sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/proc_sysctl.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/root.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/root.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/self.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/self.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/softirqs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/softirqs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/stat.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/stat.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/task_mmu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/task_mmu.c</a></td><td class='right'>1263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/task_nommu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/task_nommu.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/thread_self.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/thread_self.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc/vmcore.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/vmcore.c</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/proc_namespace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc_namespace.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pstore/blk.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/blk.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pstore/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/inode.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pstore/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/internal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pstore/platform.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/platform.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pstore/ram.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/ram.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/pstore/zone.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/zone.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/qnx4/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx4/inode.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/qnx6/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/dir.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/qnx6/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/inode.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/qnx6/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/namei.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/qnx6/qnx6.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/qnx6.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/quota/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/quota/dquot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/dquot.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/quota/quota.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/quota/quota_tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota_tree.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/quota/quota_v1.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota_v1.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/quota/quota_v2.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota_v2.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ramfs/file-mmu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ramfs/file-mmu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ramfs/file-nommu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ramfs/file-nommu.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ramfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ramfs/inode.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/read_write.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/read_write.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/readdir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/readdir.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/Kconfig</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/Makefile</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/README?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/README</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/acl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/acl.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/bitmap.c</a></td><td class='right'>1476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 26.5%;'/><td class='none' style='width: 73.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/dir.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/do_balan.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/do_balan.c</a></td><td class='right'>1900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 34.1%;'/><td class='none' style='width: 65.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/file.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/fix_node.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/fix_node.c</a></td><td class='right'>2822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 50.7%;'/><td class='none' style='width: 49.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/hashes.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/hashes.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/ibalance.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/ibalance.c</a></td><td class='right'>1161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.9%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/inode.c</a></td><td class='right'>3418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 61.4%;'/><td class='none' style='width: 38.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/ioctl.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/item_ops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/item_ops.c</a></td><td class='right'>744</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.4%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/journal.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/journal.c</a></td><td class='right'>4405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 79.2%;'/><td class='none' style='width: 20.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/lbalance.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/lbalance.c</a></td><td class='right'>1426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.6%;'/><td class='none' style='width: 74.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/lock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/lock.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/namei.c</a></td><td class='right'>1725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 31.0%;'/><td class='none' style='width: 69.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/objectid.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/objectid.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/prints.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/prints.c</a></td><td class='right'>792</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.2%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/procfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/procfs.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/reiserfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/reiserfs.h</a></td><td class='right'>3419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 61.4%;'/><td class='none' style='width: 38.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/resize.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/resize.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/stree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/stree.c</a></td><td class='right'>2280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 41.0%;'/><td class='none' style='width: 59.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/super.c</a></td><td class='right'>2647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 47.6%;'/><td class='none' style='width: 52.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/tail_conversion.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/tail_conversion.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr.c</a></td><td class='right'>1039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.7%;'/><td class='none' style='width: 81.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/xattr_acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_acl.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/xattr_security.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_security.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/xattr_trusted.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_trusted.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/reiserfs/xattr_user.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_user.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/remap_range.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/remap_range.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/ctrlmondata.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/ctrlmondata.c</a></td><td class='right'>959</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/internal.h</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/monitor.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/monitor.c</a></td><td class='right'>1811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 67.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/monitor_trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/monitor_trace.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/pseudo_lock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/pseudo_lock.c</a></td><td class='right'>1099</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/resctrl/rdtgroup.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/resctrl/rdtgroup.c</a></td><td class='right'>4584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 82.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 17.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/romfs/mmap-nommu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/romfs/mmap-nommu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/romfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/romfs/super.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/select.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/select.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/seq_file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/seq_file.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/signalfd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/signalfd.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/asn1.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/asn1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cached_dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cached_dir.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cached_dir.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cached_dir.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_debug.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_debug.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_debug.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_debug.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_fs_sb.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_fs_sb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_ioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_spnego.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_spnego.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_spnego.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_spnego.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_swn.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_swn.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_unicode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_unicode.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifs_unicode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifs_unicode.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsacl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsacl.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsacl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsacl.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsencrypt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsencrypt.c</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsfs.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsfs.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsglob.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsglob.h</a></td><td class='right'>727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifspdu.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifspdu.h</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifsproto.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifsproto.h</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifssmb.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifssmb.c</a></td><td class='right'>1501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.2%;'/><td class='rem' style='width: 9.8%;'/><td class='none' style='width: 73.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/cifstransport.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/cifstransport.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/compress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/compress.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/compress.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/compress.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/compress/lz77.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/compress/lz77.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/compress/lz77.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/compress/lz77.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/connect.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/connect.c</a></td><td class='right'>1179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 78.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/dfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/dfs.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/dfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/dfs.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/dfs_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/dfs_cache.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/dir.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/dns_resolve.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/dns_resolve.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/dns_resolve.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/dns_resolve.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/file.c</a></td><td class='right'>3180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 44.1%;'/><td class='none' style='width: 42.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/fs_context.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/fs_context.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/fs_context.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/fs_context.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/fscache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/fscache.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/fscache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/fscache.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/inode.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/ioctl.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/link.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/link.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/misc.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/namespace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/namespace.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/netmisc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/netmisc.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/nterr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/nterr.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/nterr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/nterr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/ntlmssp.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/ntlmssp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/readdir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/readdir.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/reparse.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/reparse.c</a></td><td class='right'>1273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/client/reparse.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/reparse.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/rfc1002pdu.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/rfc1002pdu.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/sess.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/sess.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb1ops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb1ops.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2file.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2glob.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2glob.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2inode.c</a></td><td class='right'>1101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2maperror.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2maperror.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2misc.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2ops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2ops.c</a></td><td class='right'>1610</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 13.2%;'/><td class='none' style='width: 71.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2pdu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2pdu.c</a></td><td class='right'>1287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2pdu.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2pdu.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2proto.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2proto.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smb2transport.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smb2transport.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smbdirect.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smbdirect.c</a></td><td class='right'>2375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.1%;'/><td class='rem' style='width: 17.6%;'/><td class='none' style='width: 57.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smbdirect.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smbdirect.h</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/smbencrypt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/smbencrypt.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/trace.h</a></td><td class='right'>820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/transport.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/transport.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 12.7%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/client/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/client/xattr.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/common/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/smb/common/arc4.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/arc4.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/smb/common/cifs_arc4.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/cifs_arc4.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/common/cifs_md4.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/cifs_md4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/common/fscc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/fscc.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smb2pdu.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smb2pdu.h</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smb2status.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smb2status.h</a> (renamed from fs/smb/client/smb2status.h)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smbacl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smbacl.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smbdirect/smbdirect.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smbdirect/smbdirect.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smbdirect/smbdirect_pdu.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smbdirect/smbdirect_pdu.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smbdirect/smbdirect_socket.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smbdirect/smbdirect_socket.h</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smbfsctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smbfsctl.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/smb/common/smbglob.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/common/smbglob.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/asn1.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/asn1.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/auth.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/auth.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/auth.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/auth.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/connection.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/connection.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/connection.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/connection.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/crypto_ctx.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/crypto_ctx.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/crypto_ctx.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/crypto_ctx.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/glob.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/glob.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/ksmbd_netlink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/ksmbd_netlink.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/ksmbd_work.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/ksmbd_work.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/ksmbd_work.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/ksmbd_work.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/ksmbd_ida.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/ksmbd_ida.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/share_config.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/share_config.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/share_config.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/share_config.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/tree_connect.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/tree_connect.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/tree_connect.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/tree_connect.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/user_config.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/user_config.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/user_config.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/user_config.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/user_session.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/user_session.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/mgmt/user_session.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/mgmt/user_session.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/misc.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/ndr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/ndr.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/oplock.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/oplock.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/oplock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/oplock.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/server.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/server.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/server.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/server.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smb2misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smb2misc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smb2ops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smb2ops.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smb2pdu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smb2pdu.c</a></td><td class='right'>1418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.1%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 74.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smb2pdu.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smb2pdu.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smb_common.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smb_common.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smb_common.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smb_common.h</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smbacl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smbacl.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smbacl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smbacl.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/smb/server/smbstatus.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/smbstatus.h</a></td><td class='right'>1822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.7%;'/><td class='none' style='width: 67.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/transport_ipc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/transport_ipc.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/transport_ipc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/transport_ipc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/transport_rdma.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/transport_rdma.c</a></td><td class='right'>2257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.0%;'/><td class='rem' style='width: 16.6%;'/><td class='none' style='width: 59.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/transport_rdma.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/transport_rdma.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/transport_tcp.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/transport_tcp.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/transport_tcp.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/transport_tcp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/unicode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/unicode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/vfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/vfs.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/vfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/vfs.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/vfs_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/vfs_cache.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/vfs_cache.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/vfs_cache.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/smb/server/xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/smb/server/xattr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/splice.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/splice.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/block.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/block.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/cache.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/decompressor_multi_percpu.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/decompressor_multi_percpu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/file.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/file_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/file_cache.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/file_direct.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/file_direct.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/inode.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/namei.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/page_actor.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/page_actor.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/page_actor.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/page_actor.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/squashfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/squashfs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/squashfs_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/squashfs_fs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/squashfs_fs_i.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/squashfs_fs_i.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/super.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/squashfs/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/squashfs/symlink.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/stack.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/stack.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/stat.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/stat.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/statfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/statfs.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/super.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/sync.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sync.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/sysctls.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysctls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/sysfs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysfs/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/sysfs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysfs/file.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/sysfs/group.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysfs/group.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/sysfs/sysfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysfs/sysfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/balloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/balloc.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/dir.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/file.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/ialloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/ialloc.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/inode.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/itree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/itree.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/namei.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/super.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.7%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/sysv/sysv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/sysv/sysv.h</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/fs/tests/binfmt_elf_kunit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/tests/binfmt_elf_kunit.c</a> (renamed from fs/binfmt_elf_test.c)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/tests/exec_kunit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/tests/exec_kunit.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/timerfd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/timerfd.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/tracefs/event_inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/tracefs/event_inode.c</a></td><td class='right'>891</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/tracefs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/tracefs/inode.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/tracefs/internal.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/tracefs/internal.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/compress.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/compress.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/crypto.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/crypto.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/debug.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/debug.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/debug.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/debug.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/dir.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/file.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/find.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/find.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/io.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/ioctl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/journal.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/journal.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/lprops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/lprops.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/lpt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/lpt.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/lpt_commit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/lpt_commit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/master.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/master.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/orphan.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/orphan.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/recovery.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/recovery.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/replay.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/replay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/super.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/sysfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/tnc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/tnc.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/tnc_commit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/tnc_commit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/tnc_misc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/tnc_misc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/ubifs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/ubifs.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ubifs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ubifs/xattr.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/balloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/balloc.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/dir.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/directory.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/directory.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/file.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/inode.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/namei.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/partition.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/partition.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/super.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/symlink.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/truncate.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/truncate.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/udf_sb.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/udf_sb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/udfdecl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/udfdecl.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/udf/udftime.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/udf/udftime.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/balloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/balloc.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/cylinder.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/cylinder.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/dir.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/file.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/inode.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/namei.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/namei.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/super.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/ufs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/ufs.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/ufs_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/ufs_fs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/util.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/ufs/util.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ufs/util.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/README.utf8data?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/README.utf8data</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/mkutf8data.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/mkutf8data.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/unicode/tests/.kunitconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/tests/.kunitconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/fs/unicode/tests/utf8_kunit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/tests/utf8_kunit.c</a> (renamed from fs/unicode/utf8-selftest.c)</td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/utf8-core.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/utf8-core.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/utf8-norm.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/utf8-norm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/utf8data.c_shipped?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/utf8data.c_shipped</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/unicode/utf8n.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/unicode/utf8n.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/userfaultfd.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/userfaultfd.c</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/utimes.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/utimes.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/vboxsf/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/vboxsf/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/vboxsf/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/vboxsf/dir.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/vboxsf/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/vboxsf/file.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/vboxsf/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/vboxsf/super.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/vboxsf/utils.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/vboxsf/utils.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/enable.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/enable.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/fsverity_private.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/fsverity_private.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/hash_algs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/hash_algs.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/init.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/init.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/measure.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/measure.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/open.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/open.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/read_metadata.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/read_metadata.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/signature.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/signature.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/verity/verify.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/verity/verify.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xattr.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/Kconfig?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/Kconfig</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/Makefile?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/Makefile</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/xfs/kmem.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/kmem.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/xfs/kmem.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/kmem.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ag.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ag.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ag.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ag.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ag_resv.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ag_resv.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ag_resv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ag_resv.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_alloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_alloc.c</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_alloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_alloc.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_alloc_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_alloc_btree.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_alloc_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_alloc_btree.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr_leaf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr_leaf.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr_leaf.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr_leaf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr_remote.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr_remote.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr_remote.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr_remote.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_attr_sf.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_attr_sf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_bmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_bmap.c</a></td><td class='right'>1434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 13.0%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_bmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_bmap.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_bmap_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_bmap_btree.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_bmap_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_bmap_btree.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_btree.c</a></td><td class='right'>1592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 10.6%;'/><td class='none' style='width: 71.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_btree.h</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_btree_mem.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_btree_mem.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_btree_mem.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_btree_mem.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_btree_staging.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_btree_staging.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_btree_staging.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_btree_staging.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_da_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_da_btree.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_da_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_da_btree.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_da_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_da_format.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_defer.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_defer.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_defer.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_defer.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2.c</a></td><td class='right'>1002</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2_block.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2_block.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2_data.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2_data.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2_leaf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2_leaf.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2_node.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2_node.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2_priv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2_priv.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dir2_sf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dir2_sf.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_dquot_buf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_dquot_buf.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_errortag.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_errortag.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_exchmaps.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_exchmaps.c</a></td><td class='right'>1237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_exchmaps.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_exchmaps.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_format.h</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_fs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_fs.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_group.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_group.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_group.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_group.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_health.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_health.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ialloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ialloc.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ialloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ialloc.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ialloc_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ialloc_btree.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ialloc_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ialloc_btree.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_iext_tree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_iext_tree.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_inode_buf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_inode_buf.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_inode_buf.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_inode_buf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_inode_fork.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_inode_fork.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_inode_fork.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_inode_fork.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_inode_util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_inode_util.c</a></td><td class='right'>741</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_inode_util.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_inode_util.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_log_format.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_log_format.h</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_log_recover.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_log_recover.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_log_rlimit.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_log_rlimit.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_metadir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_metadir.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_metadir.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_metadir.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_metafile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_metafile.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_metafile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_metafile.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_ondisk.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_ondisk.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_parent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_parent.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_parent.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_parent.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_quota_defs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_quota_defs.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_refcount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_refcount.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_refcount.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_refcount.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_refcount_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_refcount_btree.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_refcount_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_refcount_btree.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rmap.c</a></td><td class='right'>698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rmap.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rmap_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rmap_btree.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rmap_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rmap_btree.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtbitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtbitmap.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtbitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtbitmap.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtgroup.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtgroup.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtgroup.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtgroup.h</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtrefcount_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtrefcount_btree.c</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtrefcount_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtrefcount_btree.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtrmap_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtrmap_btree.c</a></td><td class='right'>1033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_rtrmap_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_rtrmap_btree.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_sb.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_sb.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_sb.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_sb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_shared.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_shared.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_symlink_remote.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_symlink_remote.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_symlink_remote.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_symlink_remote.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_trans_inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_trans_inode.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_trans_resv.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_trans_resv.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_trans_resv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_trans_resv.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_trans_space.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_trans_space.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_trans_space.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_trans_space.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_types.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_types.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_types.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_types.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_zones.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_zones.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/libxfs/xfs_zones.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/libxfs/xfs_zones.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/fs/xfs/mrlock.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/mrlock.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/agb_bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/agb_bitmap.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/agheader.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/agheader.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/agheader_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/agheader_repair.c</a></td><td class='right'>944</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 83.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/agino_bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/agino_bitmap.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/alloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/alloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/alloc_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/alloc_repair.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/attr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/attr.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/attr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/attr.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/attr_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/attr_repair.c</a></td><td class='right'>1663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/attr_repair.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/attr_repair.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/bitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/bitmap.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/bitmap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/bmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/bmap.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/bmap_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/bmap_repair.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/btree.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/common.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/common.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/common.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/common.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/cow_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/cow_repair.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dab_bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dab_bitmap.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dabtree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dabtree.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dabtree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dabtree.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dir.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dir_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dir_repair.c</a></td><td class='right'>1964</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 64.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dirtree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dirtree.c</a></td><td class='right'>1009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dirtree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dirtree.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/dirtree_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/dirtree_repair.c</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/findparent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/findparent.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/findparent.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/findparent.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/fscounters.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/fscounters.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/fscounters.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/fscounters.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/fscounters_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/fscounters_repair.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/health.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/health.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/health.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/health.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/ialloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/ialloc.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/ialloc_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/ialloc_repair.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/ino_bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/ino_bitmap.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/inode.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/inode_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/inode_repair.c</a></td><td class='right'>627</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/iscan.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/iscan.c</a></td><td class='right'>826</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/iscan.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/iscan.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/listxattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/listxattr.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/listxattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/listxattr.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/metapath.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/metapath.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/newbt.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/newbt.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/newbt.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/newbt.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/nlinks.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/nlinks.c</a></td><td class='right'>1073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/nlinks.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/nlinks.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/nlinks_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/nlinks_repair.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/orphanage.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/orphanage.c</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/orphanage.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/orphanage.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/parent.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/parent.c</a></td><td class='right'>721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/parent_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/parent_repair.c</a></td><td class='right'>1633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/quota.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/quota.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/quota_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/quota_repair.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/quotacheck.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/quotacheck.c</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/quotacheck.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/quotacheck.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/quotacheck_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/quotacheck_repair.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rcbag.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rcbag.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rcbag.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rcbag.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rcbag_btree.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rcbag_btree.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rcbag_btree.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rcbag_btree.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/readdir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/readdir.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/readdir.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/readdir.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/reap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/reap.c</a></td><td class='right'>1265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/reap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/reap.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/refcount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/refcount.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/refcount_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/refcount_repair.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/repair.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/repair.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/repair.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rgb_bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rgb_bitmap.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rgsuper.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rgsuper.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rmap.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rmap_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rmap_repair.c</a></td><td class='right'>1737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 31.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 68.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtb_bitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtb_bitmap.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtbitmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtbitmap.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtbitmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtbitmap.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtbitmap_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtbitmap_repair.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtrefcount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtrefcount.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtrefcount_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtrefcount_repair.c</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtrmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtrmap.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtrmap_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtrmap_repair.c</a></td><td class='right'>981</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtsummary.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtsummary.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtsummary.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtsummary.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/rtsummary_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/rtsummary_repair.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/scrub.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/scrub.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/scrub.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/scrub.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/stats.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/stats.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/symlink.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/symlink_repair.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/symlink_repair.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/tempexch.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/tempexch.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/tempfile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/tempfile.c</a></td><td class='right'>980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/tempfile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/tempfile.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/trace.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/trace.h</a></td><td class='right'>2436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 41.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 56.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfarray.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfarray.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfarray.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfarray.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfblob.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfblob.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfblob.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfblob.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfile.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfile.c</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfile.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfile.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/scrub/xfs_scrub.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/scrub/xfs_scrub.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_acl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_acl.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_aops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_aops.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_aops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_aops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_attr_inactive.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_attr_inactive.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_attr_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_attr_item.c</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_attr_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_attr_item.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_attr_list.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_attr_list.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_bio_io.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_bio_io.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_bmap_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_bmap_item.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_bmap_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_bmap_item.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_bmap_util.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_bmap_util.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_bmap_util.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_bmap_util.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf.c</a></td><td class='right'>1584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 16.8%;'/><td class='none' style='width: 71.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf_item.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf_item.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf_item_recover.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf_item_recover.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf_mem.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf_mem.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_buf_mem.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_buf_mem.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_dir2_readdir.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_dir2_readdir.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_discard.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_discard.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_dquot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_dquot.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_dquot.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_dquot.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_dquot_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_dquot_item.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_dquot_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_dquot_item.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_dquot_item_recover.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_dquot_item_recover.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_drain.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_drain.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_drain.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_drain.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_error.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_error.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_error.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_error.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_exchmaps_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_exchmaps_item.c</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_exchmaps_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_exchmaps_item.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_exchrange.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_exchrange.c</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_exchrange.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_exchrange.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_export.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_export.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_export.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_export.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_extent_busy.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_extent_busy.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_extent_busy.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_extent_busy.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_extfree_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_extfree_item.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_extfree_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_extfree_item.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_file.c</a></td><td class='right'>1317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.1%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 76.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_file.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_file.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_filestream.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_filestream.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_fsmap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_fsmap.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 82.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_fsmap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_fsmap.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_fsops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_fsops.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_fsops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_fsops.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_globals.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_globals.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_handle.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_handle.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_handle.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_handle.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_health.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_health.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_hooks.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_hooks.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_hooks.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_hooks.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_icache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_icache.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_icreate_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_icreate_item.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_inode.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_inode.c</a></td><td class='right'>1976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 24.1%;'/><td class='none' style='width: 64.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_inode.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_inode.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_inode_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_inode_item.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_inode_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_inode_item.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_inode_item_recover.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_inode_item_recover.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_ioctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_ioctl.c</a></td><td class='right'>1050</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 16.2%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_ioctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_ioctl.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_ioctl32.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_ioctl32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iomap.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iomap.c</a></td><td class='right'>1187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.5%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 78.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iomap.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iomap.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iops.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iops.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iops.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_itable.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_itable.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_itable.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_itable.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iunlink_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iunlink_item.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iwalk.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iwalk.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_iwalk.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_iwalk.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_linux.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_linux.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_log.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_log.c</a></td><td class='right'>872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 84.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_log.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_log.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_log_cil.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_log_cil.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_log_priv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_log_priv.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_log_recover.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_log_recover.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_message.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_message.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_message.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_message.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_mount.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_mount.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_mount.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_mount.h</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_mru_cache.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_mru_cache.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_notify_failure.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_notify_failure.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_notify_failure.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_notify_failure.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_pnfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_pnfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_qm.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_qm.c</a></td><td class='right'>708</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_qm.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_qm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_qm_bhv.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_qm_bhv.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_qm_syscalls.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_qm_syscalls.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_quota.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_quota.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_quotaops.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_quotaops.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_refcount_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_refcount_item.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_refcount_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_refcount_item.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_reflink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_reflink.c</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_reflink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_reflink.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_rmap_item.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_rmap_item.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_rmap_item.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_rmap_item.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_rtalloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_rtalloc.c</a></td><td class='right'>1943</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.9%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 65.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_rtalloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_rtalloc.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_stats.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_stats.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_stats.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_stats.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_super.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_super.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_super.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_symlink.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_symlink.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_symlink.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_symlink.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_sysctl.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_sysctl.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_sysctl.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_sysctl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_sysfs.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_sysfs.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_sysfs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trace.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trace.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trace.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trace.h</a></td><td class='right'>2678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 37.0%;'/><td class='rem' style='width: 11.2%;'/><td class='none' style='width: 51.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trans.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trans.c</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trans.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trans.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trans_ail.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trans_ail.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trans_buf.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trans_buf.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trans_dquot.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trans_dquot.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_trans_priv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_trans_priv.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_xattr.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_xattr.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_xattr.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_xattr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_zone_alloc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_zone_alloc.c</a></td><td class='right'>1328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_zone_alloc.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_zone_alloc.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_zone_gc.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_zone_gc.c</a></td><td class='right'>1214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_zone_info.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_zone_info.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_zone_priv.h?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_zone_priv.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/fs/xfs/xfs_zone_space_resv.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/xfs/xfs_zone_space_resv.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/zonefs/file.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/zonefs/file.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/zonefs/super.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/zonefs/super.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/fs/zonefs/sysfs.c?id2=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/zonefs/sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>2051 files changed, 238523 insertions, 283789 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/fs/9p/acl.c b/fs/9p/acl.c<br/>index eed551d8555f..633da5e37299 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/acl.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='ctx'> #include &lt;net/9p/client.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/fs/9p/fid.c b/fs/9p/fid.c<br/>index de009a33e0e2..f84412290a30 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/fid.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/fid.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/fid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/fid.c</a></div><div class='hunk'>@@ -131,10 +131,9 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	} else {</div><div class='del'>-		if (dentry-&gt;d_inode)</div><div class='del'>-			ret = v9fs_fid_find_inode(dentry-&gt;d_inode, false, uid, any);</div><div class='ctx'> 	}</div><div class='add'>+	if (!ret &amp;&amp; dentry-&gt;d_inode)</div><div class='add'>+		ret = v9fs_fid_find_inode(dentry-&gt;d_inode, false, uid, any);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/9p/fid.h b/fs/9p/fid.h<br/>index 29281b7c3887..0d6138bee2a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/fid.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/fid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/fid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/fid.h</a></div><div class='hunk'>@@ -49,9 +49,6 @@ static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry)</div><div class='ctx'> static inline void v9fs_fid_add_modes(struct p9_fid *fid, unsigned int s_flags,</div><div class='ctx'> 	unsigned int s_cache, unsigned int f_flags)</div><div class='ctx'> {</div><div class='del'>-	if (fid-&gt;qid.type != P9_QTFILE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if ((!s_cache) ||</div><div class='ctx'> 	   ((fid-&gt;qid.version == 0) &amp;&amp; !(s_flags &amp; V9FS_IGNORE_QV)) ||</div><div class='ctx'> 	   (s_flags &amp; V9FS_DIRECT_IO) || (f_flags &amp; O_DIRECT)) {</div><div class='head'>diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c<br/>index 61dbe52bb3a3..057487efaaeb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/v9fs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/v9fs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/v9fs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/v9fs.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='hunk'>@@ -33,6 +34,10 @@ struct kmem_cache *v9fs_inode_cache;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	/* Mount-point source, we need to handle this explicitly because</div><div class='add'>+	 * the code below accepts unknown args and the vfs layer only handles</div><div class='add'>+	 * source if we rejected it as EINVAL */</div><div class='add'>+	Opt_source,</div><div class='ctx'> 	/* Options that take integer arguments */</div><div class='ctx'> 	Opt_debug, Opt_dfltuid, Opt_dfltgid, Opt_afid,</div><div class='ctx'> 	/* String options */</div><div class='hunk'>@@ -43,27 +48,71 @@ enum {</div><div class='ctx'> 	Opt_access, Opt_posixacl,</div><div class='ctx'> 	/* Lock timeout option */</div><div class='ctx'> 	Opt_locktimeout,</div><div class='del'>-	/* Error token */</div><div class='del'>-	Opt_err</div><div class='add'>+</div><div class='add'>+	/* Client options */</div><div class='add'>+	Opt_msize, Opt_trans, Opt_legacy, Opt_version,</div><div class='add'>+</div><div class='add'>+	/* fd transport options */</div><div class='add'>+	/* Options that take integer arguments */</div><div class='add'>+	Opt_rfdno, Opt_wfdno,</div><div class='add'>+	/* Options that take no arguments */</div><div class='add'>+</div><div class='add'>+	/* rdma transport options */</div><div class='add'>+	/* Options that take integer arguments */</div><div class='add'>+	Opt_rq_depth, Opt_sq_depth, Opt_timeout,</div><div class='add'>+</div><div class='add'>+	/* Options for both fd and rdma transports */</div><div class='add'>+	Opt_port, Opt_privport,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_debug, "debug=%x"},</div><div class='del'>-	{Opt_dfltuid, "dfltuid=%u"},</div><div class='del'>-	{Opt_dfltgid, "dfltgid=%u"},</div><div class='del'>-	{Opt_afid, "afid=%u"},</div><div class='del'>-	{Opt_uname, "uname=%s"},</div><div class='del'>-	{Opt_remotename, "aname=%s"},</div><div class='del'>-	{Opt_nodevmap, "nodevmap"},</div><div class='del'>-	{Opt_noxattr, "noxattr"},</div><div class='del'>-	{Opt_directio, "directio"},</div><div class='del'>-	{Opt_ignoreqv, "ignoreqv"},</div><div class='del'>-	{Opt_cache, "cache=%s"},</div><div class='del'>-	{Opt_cachetag, "cachetag=%s"},</div><div class='del'>-	{Opt_access, "access=%s"},</div><div class='del'>-	{Opt_posixacl, "posixacl"},</div><div class='del'>-	{Opt_locktimeout, "locktimeout=%u"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table p9_versions[] = {</div><div class='add'>+	{ "9p2000",	p9_proto_legacy },</div><div class='add'>+	{ "9p2000.u",	p9_proto_2000u },</div><div class='add'>+	{ "9p2000.L",	p9_proto_2000L },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This structure contains all parameters used for the core code,</div><div class='add'>+ * the client, and all the transports.</div><div class='add'>+ */</div><div class='add'>+const struct fs_parameter_spec v9fs_param_spec[] = {</div><div class='add'>+	fsparam_string	("source",	Opt_source),</div><div class='add'>+	fsparam_u32hex	("debug",	Opt_debug),</div><div class='add'>+	fsparam_uid	("dfltuid",	Opt_dfltuid),</div><div class='add'>+	fsparam_gid	("dfltgid",	Opt_dfltgid),</div><div class='add'>+	fsparam_u32	("afid",	Opt_afid),</div><div class='add'>+	fsparam_string	("uname",	Opt_uname),</div><div class='add'>+	fsparam_string	("aname",	Opt_remotename),</div><div class='add'>+	fsparam_flag	("nodevmap",	Opt_nodevmap),</div><div class='add'>+	fsparam_flag	("noxattr",	Opt_noxattr),</div><div class='add'>+	fsparam_flag	("directio",	Opt_directio),</div><div class='add'>+	fsparam_flag	("ignoreqv",	Opt_ignoreqv),</div><div class='add'>+	fsparam_string	("cache",	Opt_cache),</div><div class='add'>+	fsparam_string	("cachetag",	Opt_cachetag),</div><div class='add'>+	fsparam_string	("access",	Opt_access),</div><div class='add'>+	fsparam_flag	("posixacl",	Opt_posixacl),</div><div class='add'>+	fsparam_u32	("locktimeout",	Opt_locktimeout),</div><div class='add'>+</div><div class='add'>+	/* client options */</div><div class='add'>+	fsparam_u32	("msize",	Opt_msize),</div><div class='add'>+	fsparam_flag	("noextend",	Opt_legacy),</div><div class='add'>+	fsparam_string	("trans",	Opt_trans),</div><div class='add'>+	fsparam_enum	("version",	Opt_version, p9_versions),</div><div class='add'>+</div><div class='add'>+	/* fd transport options */</div><div class='add'>+	fsparam_u32	("rfdno",	Opt_rfdno),</div><div class='add'>+	fsparam_u32	("wfdno",	Opt_wfdno),</div><div class='add'>+</div><div class='add'>+	/* rdma transport options */</div><div class='add'>+	fsparam_u32	("sq",		Opt_sq_depth),</div><div class='add'>+	fsparam_u32	("rq",		Opt_rq_depth),</div><div class='add'>+	fsparam_u32	("timeout",	Opt_timeout),</div><div class='add'>+</div><div class='add'>+	/* fd and rdma transprt options */</div><div class='add'>+	fsparam_u32	("port",	Opt_port),</div><div class='add'>+	fsparam_flag	("privport",	Opt_privport),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Interpret mount options for cache mode */</div><div class='hunk'>@@ -101,7 +150,7 @@ int v9fs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> 	struct v9fs_session_info *v9ses = root-&gt;d_sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (v9ses-&gt;debug)</div><div class='del'>-		seq_printf(m, ",debug=%x", v9ses-&gt;debug);</div><div class='add'>+		seq_printf(m, ",debug=%#x", v9ses-&gt;debug);</div><div class='ctx'> 	if (!uid_eq(v9ses-&gt;dfltuid, V9FS_DEFUID))</div><div class='ctx'> 		seq_printf(m, ",dfltuid=%u",</div><div class='ctx'> 			   from_kuid_munged(&amp;init_user_ns, v9ses-&gt;dfltuid));</div><div class='hunk'>@@ -117,7 +166,7 @@ int v9fs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> 	if (v9ses-&gt;nodev)</div><div class='ctx'> 		seq_puts(m, ",nodevmap");</div><div class='ctx'> 	if (v9ses-&gt;cache)</div><div class='del'>-		seq_printf(m, ",cache=%x", v9ses-&gt;cache);</div><div class='add'>+		seq_printf(m, ",cache=%#x", v9ses-&gt;cache);</div><div class='ctx'> #ifdef CONFIG_9P_FSCACHE</div><div class='ctx'> 	if (v9ses-&gt;cachetag &amp;&amp; (v9ses-&gt;cache &amp; CACHE_FSCACHE))</div><div class='ctx'> 		seq_printf(m, ",cachetag=%s", v9ses-&gt;cachetag);</div><div class='hunk'>@@ -153,267 +202,254 @@ int v9fs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * v9fs_parse_options - parse mount options into session structure</div><div class='del'>- * @v9ses: existing v9fs session information</div><div class='del'>- * @opts: The mount option string</div><div class='add'>+ * v9fs_parse_param - parse a mount option into the filesystem context</div><div class='add'>+ * @fc: the filesystem context</div><div class='add'>+ * @param: the parameter to parse</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 upon success, -ERRNO upon failure.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)</div><div class='add'>+int v9fs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *options, *tmp_options;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	char *p;</div><div class='del'>-	int option = 0;</div><div class='add'>+	struct v9fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='ctx'> 	char *s;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* setup defaults */</div><div class='del'>-	v9ses-&gt;afid = ~0;</div><div class='del'>-	v9ses-&gt;debug = 0;</div><div class='del'>-	v9ses-&gt;cache = CACHE_NONE;</div><div class='del'>-#ifdef CONFIG_9P_FSCACHE</div><div class='del'>-	v9ses-&gt;cachetag = NULL;</div><div class='del'>-#endif</div><div class='del'>-	v9ses-&gt;session_lock_timeout = P9_LOCK_TIMEOUT;</div><div class='del'>-</div><div class='del'>-	if (!opts)</div><div class='del'>-		return 0;</div><div class='add'>+	int r;</div><div class='add'>+	int opt;</div><div class='add'>+	struct p9_client_opts	*clnt = &amp;ctx-&gt;client_opts;</div><div class='add'>+	struct p9_fd_opts	*fd_opts = &amp;ctx-&gt;fd_opts;</div><div class='add'>+	struct p9_rdma_opts	*rdma_opts = &amp;ctx-&gt;rdma_opts;</div><div class='add'>+	struct p9_session_opts	*session_opts = &amp;ctx-&gt;session_opts;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, v9fs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * We might like to report bad mount options here, but</div><div class='add'>+		 * traditionally 9p has ignored unknown mount options</div><div class='add'>+		 */</div><div class='add'>+		if (opt == -ENOPARAM)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-	tmp_options = kstrdup(opts, GFP_KERNEL);</div><div class='del'>-	if (!tmp_options) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto fail_option_alloc;</div><div class='add'>+		return opt;</div><div class='ctx'> 	}</div><div class='del'>-	options = tmp_options;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token, r;</div><div class='del'>-</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_debug:</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				ret = r;</div><div class='del'>-			} else {</div><div class='del'>-				v9ses-&gt;debug = option;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_source:</div><div class='add'>+		if (fc-&gt;source) {</div><div class='add'>+			pr_info("p9: multiple sources not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		fc-&gt;source = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_debug:</div><div class='add'>+		session_opts-&gt;debug = result.uint_32;</div><div class='ctx'> #ifdef CONFIG_NET_9P_DEBUG</div><div class='del'>-				p9_debug_level = option;</div><div class='add'>+		p9_debug_level = result.uint_32;</div><div class='ctx'> #endif</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_dfltuid:</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				ret = r;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			v9ses-&gt;dfltuid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(v9ses-&gt;dfltuid)) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "uid field, but not a uid?\n");</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_dfltgid:</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				ret = r;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			v9ses-&gt;dfltgid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(v9ses-&gt;dfltgid)) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "gid field, but not a gid?\n");</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_afid:</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				ret = r;</div><div class='del'>-			} else {</div><div class='del'>-				v9ses-&gt;afid = option;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_uname:</div><div class='del'>-			kfree(v9ses-&gt;uname);</div><div class='del'>-			v9ses-&gt;uname = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!v9ses-&gt;uname) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto free_and_return;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_remotename:</div><div class='del'>-			kfree(v9ses-&gt;aname);</div><div class='del'>-			v9ses-&gt;aname = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!v9ses-&gt;aname) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto free_and_return;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nodevmap:</div><div class='del'>-			v9ses-&gt;nodev = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noxattr:</div><div class='del'>-			v9ses-&gt;flags |= V9FS_NO_XATTR;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_directio:</div><div class='del'>-			v9ses-&gt;flags |= V9FS_DIRECT_IO;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ignoreqv:</div><div class='del'>-			v9ses-&gt;flags |= V9FS_IGNORE_QV;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_cachetag:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_dfltuid:</div><div class='add'>+		session_opts-&gt;dfltuid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dfltgid:</div><div class='add'>+		session_opts-&gt;dfltgid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_afid:</div><div class='add'>+		session_opts-&gt;afid = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_uname:</div><div class='add'>+		kfree(session_opts-&gt;uname);</div><div class='add'>+		session_opts-&gt;uname = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_remotename:</div><div class='add'>+		kfree(session_opts-&gt;aname);</div><div class='add'>+		session_opts-&gt;aname = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nodevmap:</div><div class='add'>+		session_opts-&gt;nodev = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_noxattr:</div><div class='add'>+		session_opts-&gt;flags |= V9FS_NO_XATTR;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_directio:</div><div class='add'>+		session_opts-&gt;flags |= V9FS_DIRECT_IO;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ignoreqv:</div><div class='add'>+		session_opts-&gt;flags |= V9FS_IGNORE_QV;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_cachetag:</div><div class='ctx'> #ifdef CONFIG_9P_FSCACHE</div><div class='del'>-			kfree(v9ses-&gt;cachetag);</div><div class='del'>-			v9ses-&gt;cachetag = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!v9ses-&gt;cachetag) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto free_and_return;</div><div class='del'>-			}</div><div class='add'>+		kfree(session_opts-&gt;cachetag);</div><div class='add'>+		session_opts-&gt;cachetag = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='ctx'> #endif</div><div class='del'>-			break;</div><div class='del'>-		case Opt_cache:</div><div class='del'>-			s = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!s) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "problem allocating copy of cache arg\n");</div><div class='del'>-				goto free_and_return;</div><div class='del'>-			}</div><div class='del'>-			r = get_cache_mode(s);</div><div class='del'>-			if (r &lt; 0)</div><div class='del'>-				ret = r;</div><div class='del'>-			else</div><div class='del'>-				v9ses-&gt;cache = r;</div><div class='del'>-</div><div class='del'>-			kfree(s);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_access:</div><div class='del'>-			s = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!s) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "problem allocating copy of access arg\n");</div><div class='del'>-				goto free_and_return;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_cache:</div><div class='add'>+		r = get_cache_mode(param-&gt;string);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			return r;</div><div class='add'>+		session_opts-&gt;cache = r;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_access:</div><div class='add'>+		s = param-&gt;string;</div><div class='add'>+		session_opts-&gt;flags &amp;= ~V9FS_ACCESS_MASK;</div><div class='add'>+		if (strcmp(s, "user") == 0) {</div><div class='add'>+			session_opts-&gt;flags |= V9FS_ACCESS_USER;</div><div class='add'>+		} else if (strcmp(s, "any") == 0) {</div><div class='add'>+			session_opts-&gt;flags |= V9FS_ACCESS_ANY;</div><div class='add'>+		} else if (strcmp(s, "client") == 0) {</div><div class='add'>+			session_opts-&gt;flags |= V9FS_ACCESS_CLIENT;</div><div class='add'>+		} else {</div><div class='add'>+			uid_t uid;</div><div class='add'>+</div><div class='add'>+			session_opts-&gt;flags |= V9FS_ACCESS_SINGLE;</div><div class='add'>+			r = kstrtouint(s, 10, &amp;uid);</div><div class='add'>+			if (r) {</div><div class='add'>+				pr_info("Unknown access argument %s: %d\n",</div><div class='add'>+					param-&gt;string, r);</div><div class='add'>+				return r;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			v9ses-&gt;flags &amp;= ~V9FS_ACCESS_MASK;</div><div class='del'>-			if (strcmp(s, "user") == 0)</div><div class='del'>-				v9ses-&gt;flags |= V9FS_ACCESS_USER;</div><div class='del'>-			else if (strcmp(s, "any") == 0)</div><div class='del'>-				v9ses-&gt;flags |= V9FS_ACCESS_ANY;</div><div class='del'>-			else if (strcmp(s, "client") == 0) {</div><div class='del'>-				v9ses-&gt;flags |= V9FS_ACCESS_CLIENT;</div><div class='del'>-			} else {</div><div class='del'>-				uid_t uid;</div><div class='del'>-</div><div class='del'>-				v9ses-&gt;flags |= V9FS_ACCESS_SINGLE;</div><div class='del'>-				r = kstrtouint(s, 10, &amp;uid);</div><div class='del'>-				if (r) {</div><div class='del'>-					ret = r;</div><div class='del'>-					pr_info("Unknown access argument %s: %d\n",</div><div class='del'>-						s, r);</div><div class='del'>-					kfree(s);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				v9ses-&gt;uid = make_kuid(current_user_ns(), uid);</div><div class='del'>-				if (!uid_valid(v9ses-&gt;uid)) {</div><div class='del'>-					ret = -EINVAL;</div><div class='del'>-					pr_info("Unknown uid %s\n", s);</div><div class='del'>-				}</div><div class='add'>+			session_opts-&gt;uid = make_kuid(current_user_ns(), uid);</div><div class='add'>+			if (!uid_valid(session_opts-&gt;uid)) {</div><div class='add'>+				pr_info("Unknown uid %s\n", s);</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-			kfree(s);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_posixacl:</div><div class='add'>+	case Opt_posixacl:</div><div class='ctx'> #ifdef CONFIG_9P_FS_POSIX_ACL</div><div class='del'>-			v9ses-&gt;flags |= V9FS_POSIX_ACL;</div><div class='add'>+		session_opts-&gt;flags |= V9FS_POSIX_ACL;</div><div class='ctx'> #else</div><div class='del'>-			p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-				 "Not defined CONFIG_9P_FS_POSIX_ACL. Ignoring posixacl option\n");</div><div class='add'>+		p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+			 "Not defined CONFIG_9P_FS_POSIX_ACL. Ignoring posixacl option\n");</div><div class='ctx'> #endif</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_locktimeout:</div><div class='del'>-			r = match_int(&amp;args[0], &amp;option);</div><div class='del'>-			if (r &lt; 0) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "integer field, but no integer?\n");</div><div class='del'>-				ret = r;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (option &lt; 1) {</div><div class='del'>-				p9_debug(P9_DEBUG_ERROR,</div><div class='del'>-					 "locktimeout must be a greater than zero integer.\n");</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			v9ses-&gt;session_lock_timeout = (long)option * HZ;</div><div class='del'>-			break;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			continue;</div><div class='add'>+	case Opt_locktimeout:</div><div class='add'>+		if (result.uint_32 &lt; 1) {</div><div class='add'>+			p9_debug(P9_DEBUG_ERROR,</div><div class='add'>+				 "locktimeout must be a greater than zero integer.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		session_opts-&gt;session_lock_timeout = (long)result.uint_32 * HZ;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Options for client */</div><div class='add'>+	case Opt_msize:</div><div class='add'>+		if (result.uint_32 &lt; 4096) {</div><div class='add'>+			p9_debug(P9_DEBUG_ERROR, "msize should be at least 4k\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (result.uint_32 &gt; INT_MAX) {</div><div class='add'>+			p9_debug(P9_DEBUG_ERROR, "msize too big\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		clnt-&gt;msize = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_trans:</div><div class='add'>+		v9fs_put_trans(clnt-&gt;trans_mod);</div><div class='add'>+		clnt-&gt;trans_mod = v9fs_get_trans_by_name(param-&gt;string);</div><div class='add'>+		if (!clnt-&gt;trans_mod) {</div><div class='add'>+			pr_info("Could not find request transport: %s\n",</div><div class='add'>+				param-&gt;string);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_legacy:</div><div class='add'>+		clnt-&gt;proto_version = p9_proto_legacy;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_version:</div><div class='add'>+		clnt-&gt;proto_version = result.uint_32;</div><div class='add'>+		p9_debug(P9_DEBUG_9P, "Protocol version: %s\n", param-&gt;string);</div><div class='add'>+		break;</div><div class='add'>+	/* Options for fd transport */</div><div class='add'>+	case Opt_rfdno:</div><div class='add'>+		fd_opts-&gt;rfd = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_wfdno:</div><div class='add'>+		fd_opts-&gt;wfd = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	/* Options for rdma transport */</div><div class='add'>+	case Opt_sq_depth:</div><div class='add'>+		rdma_opts-&gt;sq_depth = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_rq_depth:</div><div class='add'>+		rdma_opts-&gt;rq_depth = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_timeout:</div><div class='add'>+		rdma_opts-&gt;timeout = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	/* Options for both fd and rdma transports */</div><div class='add'>+	case Opt_port:</div><div class='add'>+		fd_opts-&gt;port = result.uint_32;</div><div class='add'>+		rdma_opts-&gt;port = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_privport:</div><div class='add'>+		fd_opts-&gt;privport = true;</div><div class='add'>+		rdma_opts-&gt;port = true;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-free_and_return:</div><div class='del'>-	kfree(tmp_options);</div><div class='del'>-fail_option_alloc:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void v9fs_apply_options(struct v9fs_session_info *v9ses,</div><div class='add'>+		  struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct v9fs_context	*ctx = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	v9ses-&gt;debug = ctx-&gt;session_opts.debug;</div><div class='add'>+	v9ses-&gt;dfltuid = ctx-&gt;session_opts.dfltuid;</div><div class='add'>+	v9ses-&gt;dfltgid = ctx-&gt;session_opts.dfltgid;</div><div class='add'>+	v9ses-&gt;afid = ctx-&gt;session_opts.afid;</div><div class='add'>+	v9ses-&gt;uname = ctx-&gt;session_opts.uname;</div><div class='add'>+	ctx-&gt;session_opts.uname = NULL;</div><div class='add'>+	v9ses-&gt;aname = ctx-&gt;session_opts.aname;</div><div class='add'>+	ctx-&gt;session_opts.aname = NULL;</div><div class='add'>+	v9ses-&gt;nodev = ctx-&gt;session_opts.nodev;</div><div class='add'>+	/*</div><div class='add'>+	 * Note that we must |= flags here as session_init already</div><div class='add'>+	 * set basic flags. This adds in flags from parsed options.</div><div class='add'>+	 */</div><div class='add'>+	v9ses-&gt;flags |= ctx-&gt;session_opts.flags;</div><div class='add'>+#ifdef CONFIG_9P_FSCACHE</div><div class='add'>+	v9ses-&gt;cachetag = ctx-&gt;session_opts.cachetag;</div><div class='add'>+	ctx-&gt;session_opts.cachetag = NULL;</div><div class='add'>+#endif</div><div class='add'>+	v9ses-&gt;cache = ctx-&gt;session_opts.cache;</div><div class='add'>+	v9ses-&gt;uid = ctx-&gt;session_opts.uid;</div><div class='add'>+	v9ses-&gt;session_lock_timeout = ctx-&gt;session_opts.session_lock_timeout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * v9fs_session_init - initialize session</div><div class='ctx'>  * @v9ses: session information structure</div><div class='del'>- * @dev_name: device being mounted</div><div class='del'>- * @data: options</div><div class='add'>+ * @fc: the filesystem mount context</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,</div><div class='del'>-		  const char *dev_name, char *data)</div><div class='add'>+		  struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	int rc = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	v9ses-&gt;uname = kstrdup(V9FS_DEFUSER, GFP_KERNEL);</div><div class='del'>-	if (!v9ses-&gt;uname)</div><div class='del'>-		goto err_names;</div><div class='del'>-</div><div class='del'>-	v9ses-&gt;aname = kstrdup(V9FS_DEFANAME, GFP_KERNEL);</div><div class='del'>-	if (!v9ses-&gt;aname)</div><div class='del'>-		goto err_names;</div><div class='ctx'> 	init_rwsem(&amp;v9ses-&gt;rename_sem);</div><div class='ctx'> </div><div class='del'>-	v9ses-&gt;uid = INVALID_UID;</div><div class='del'>-	v9ses-&gt;dfltuid = V9FS_DEFUID;</div><div class='del'>-	v9ses-&gt;dfltgid = V9FS_DEFGID;</div><div class='del'>-</div><div class='del'>-	v9ses-&gt;clnt = p9_client_create(dev_name, data);</div><div class='add'>+	v9ses-&gt;clnt = p9_client_create(fc);</div><div class='ctx'> 	if (IS_ERR(v9ses-&gt;clnt)) {</div><div class='ctx'> 		rc = PTR_ERR(v9ses-&gt;clnt);</div><div class='ctx'> 		p9_debug(P9_DEBUG_ERROR, "problem initializing 9p client\n");</div><div class='ctx'> 		goto err_names;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Initialize flags on the real v9ses. v9fs_apply_options below</div><div class='add'>+	 * will |= the additional flags from parsed options.</div><div class='add'>+	 */</div><div class='ctx'> 	v9ses-&gt;flags = V9FS_ACCESS_USER;</div><div class='ctx'> </div><div class='ctx'> 	if (p9_is_proto_dotl(v9ses-&gt;clnt)) {</div><div class='hunk'>@@ -423,9 +459,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,</div><div class='ctx'> 		v9ses-&gt;flags |= V9FS_PROTO_2000U;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = v9fs_parse_options(v9ses, data);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto err_clnt;</div><div class='add'>+	v9fs_apply_options(v9ses, fc);</div><div class='ctx'> </div><div class='ctx'> 	v9ses-&gt;maxdata = v9ses-&gt;clnt-&gt;msize - P9_IOHDRSZ;</div><div class='ctx'> </div><div class='hunk'>@@ -438,8 +472,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,</div><div class='ctx'> 		v9ses-&gt;flags &amp;= ~V9FS_ACCESS_MASK;</div><div class='ctx'> 		v9ses-&gt;flags |= V9FS_ACCESS_USER;</div><div class='ctx'> 	}</div><div class='del'>-	/*FIXME !! */</div><div class='del'>-	/* for legacy mode, fall back to V9FS_ACCESS_ANY */</div><div class='add'>+	/* FIXME: for legacy mode, fall back to V9FS_ACCESS_ANY */</div><div class='ctx'> 	if (!(v9fs_proto_dotu(v9ses) || v9fs_proto_dotl(v9ses)) &amp;&amp;</div><div class='ctx'> 		((v9ses-&gt;flags&amp;V9FS_ACCESS_MASK) == V9FS_ACCESS_USER)) {</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +483,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,</div><div class='ctx'> 	if (!v9fs_proto_dotl(v9ses) ||</div><div class='ctx'> 		!((v9ses-&gt;flags &amp; V9FS_ACCESS_MASK) == V9FS_ACCESS_CLIENT)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * We support ACL checks on clinet only if the protocol is</div><div class='add'>+		 * We support ACL checks on client only if the protocol is</div><div class='ctx'> 		 * 9P2000.L and access is V9FS_ACCESS_CLIENT.</div><div class='ctx'> 		 */</div><div class='ctx'> 		v9ses-&gt;flags &amp;= ~V9FS_ACL_MASK;</div><div class='hunk'>@@ -472,7 +505,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,</div><div class='ctx'> #ifdef CONFIG_9P_FSCACHE</div><div class='ctx'> 	/* register the session for caching */</div><div class='ctx'> 	if (v9ses-&gt;cache &amp; CACHE_FSCACHE) {</div><div class='del'>-		rc = v9fs_cache_session_get_cookie(v9ses, dev_name);</div><div class='add'>+		rc = v9fs_cache_session_get_cookie(v9ses, fc-&gt;source);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			goto err_clnt;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -561,7 +594,7 @@ static ssize_t caches_show(struct kobject *kobj,</div><div class='ctx'> 	spin_lock(&amp;v9fs_sessionlist_lock);</div><div class='ctx'> 	list_for_each_entry(v9ses, &amp;v9fs_sessionlist, slist) {</div><div class='ctx'> 		if (v9ses-&gt;cachetag) {</div><div class='del'>-			n = snprintf(buf, limit, "%s\n", v9ses-&gt;cachetag);</div><div class='add'>+			n = snprintf(buf + count, limit, "%s\n", v9ses-&gt;cachetag);</div><div class='ctx'> 			if (n &lt; 0) {</div><div class='ctx'> 				count = n;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -597,13 +630,16 @@ static const struct attribute_group v9fs_attr_group = {</div><div class='ctx'> </div><div class='ctx'> static int __init v9fs_sysfs_init(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	v9fs_kobj = kobject_create_and_add("9p", fs_kobj);</div><div class='ctx'> 	if (!v9fs_kobj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (sysfs_create_group(v9fs_kobj, &amp;v9fs_attr_group)) {</div><div class='add'>+	ret = sysfs_create_group(v9fs_kobj, &amp;v9fs_attr_group);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		kobject_put(v9fs_kobj);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -637,7 +673,7 @@ static int v9fs_init_inode_cache(void)</div><div class='ctx'> 	v9fs_inode_cache = kmem_cache_create("v9fs_inode_cache",</div><div class='ctx'> 					  sizeof(struct v9fs_inode),</div><div class='ctx'> 					  0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-					      SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+					      SLAB_ACCOUNT),</div><div class='ctx'> 					  v9fs_inode_init_once);</div><div class='ctx'> 	if (!v9fs_inode_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -659,21 +695,6 @@ static void v9fs_destroy_inode_cache(void)</div><div class='ctx'> 	kmem_cache_destroy(v9fs_inode_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int v9fs_cache_register(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = v9fs_init_inode_cache();</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void v9fs_cache_unregister(void)</div><div class='del'>-{</div><div class='del'>-	v9fs_destroy_inode_cache();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * init_v9fs - Initialize module</div><div class='ctx'>  *</div><div class='hunk'>@@ -684,9 +705,9 @@ static int __init init_v9fs(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Installing v9fs 9p2000 file system support\n");</div><div class='del'>-	/* TODO: Setup list of registered trasnport modules */</div><div class='add'>+	/* TODO: Setup list of registered transport modules */</div><div class='ctx'> </div><div class='del'>-	err = v9fs_cache_register();</div><div class='add'>+	err = v9fs_init_inode_cache();</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("Failed to register v9fs for caching\n");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -709,7 +730,7 @@ out_sysfs_cleanup:</div><div class='ctx'> 	v9fs_sysfs_cleanup();</div><div class='ctx'> </div><div class='ctx'> out_cache:</div><div class='del'>-	v9fs_cache_unregister();</div><div class='add'>+	v9fs_destroy_inode_cache();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -722,7 +743,7 @@ out_cache:</div><div class='ctx'> static void __exit exit_v9fs(void)</div><div class='ctx'> {</div><div class='ctx'> 	v9fs_sysfs_cleanup();</div><div class='del'>-	v9fs_cache_unregister();</div><div class='add'>+	v9fs_destroy_inode_cache();</div><div class='ctx'> 	unregister_filesystem(&amp;v9fs_fs_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h<br/>index 698c43dd5dc8..6a12445d3858 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/v9fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/v9fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/v9fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/v9fs.h</a></div><div class='hunk'>@@ -10,6 +10,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include &lt;linux/netfs.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;net/9p/client.h&gt;</div><div class='add'>+#include &lt;net/9p/transport.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum p9_session_flags - option flags for each 9P session</div><div class='hunk'>@@ -163,11 +166,13 @@ static inline struct fscache_volume *v9fs_session_cache(struct v9fs_session_info</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern const struct fs_parameter_spec v9fs_param_spec[];</div><div class='ctx'> </div><div class='add'>+extern int v9fs_parse_param(struct fs_context *fc, struct fs_parameter *param);</div><div class='ctx'> extern int v9fs_show_options(struct seq_file *m, struct dentry *root);</div><div class='ctx'> </div><div class='ctx'> struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,</div><div class='del'>-				 const char *dev_name, char *data);</div><div class='add'>+				 struct fs_context *fc);</div><div class='ctx'> extern void v9fs_session_close(struct v9fs_session_info *v9ses);</div><div class='ctx'> extern void v9fs_session_cancel(struct v9fs_session_info *v9ses);</div><div class='ctx'> extern void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses);</div><div class='hunk'>@@ -202,7 +207,7 @@ static inline struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode)</div><div class='ctx'> 	return inode-&gt;i_sb-&gt;s_fs_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct v9fs_session_info *v9fs_dentry2v9ses(struct dentry *dentry)</div><div class='add'>+static inline struct v9fs_session_info *v9fs_dentry2v9ses(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	return dentry-&gt;d_sb-&gt;s_fs_info;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h<br/>index 0e8418066a48..d3aefbec4de6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/v9fs_vfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/v9fs_vfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/v9fs_vfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/v9fs_vfs.h</a></div><div class='hunk'>@@ -40,13 +40,16 @@ extern struct kmem_cache *v9fs_inode_cache;</div><div class='ctx'> </div><div class='ctx'> struct inode *v9fs_alloc_inode(struct super_block *sb);</div><div class='ctx'> void v9fs_free_inode(struct inode *inode);</div><div class='del'>-struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode,</div><div class='del'>-			     dev_t rdev);</div><div class='ctx'> void v9fs_set_netfs_context(struct inode *inode);</div><div class='ctx'> int v9fs_init_inode(struct v9fs_session_info *v9ses,</div><div class='ctx'> 		    struct inode *inode, umode_t mode, dev_t rdev);</div><div class='ctx'> void v9fs_evict_inode(struct inode *inode);</div><div class='del'>-ino_t v9fs_qid2ino(struct p9_qid *qid);</div><div class='add'>+#if (BITS_PER_LONG == 32)</div><div class='add'>+#define QID2INO(q) ((ino_t) (((q)-&gt;path+2) ^ (((q)-&gt;path) &gt;&gt; 32)))</div><div class='add'>+#else</div><div class='add'>+#define QID2INO(q) ((ino_t) ((q)-&gt;path+2))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,</div><div class='ctx'> 		      struct super_block *sb, unsigned int flags);</div><div class='ctx'> void v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode,</div><div class='head'>diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c<br/>index 047855033d32..862164181bac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_addr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_addr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_addr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_addr.c</a></div><div class='hunk'>@@ -26,36 +26,40 @@</div><div class='ctx'> #include "cache.h"</div><div class='ctx'> #include "fid.h"</div><div class='ctx'> </div><div class='del'>-static void v9fs_upload_to_server(struct netfs_io_subrequest *subreq)</div><div class='add'>+/*</div><div class='add'>+ * Writeback calls this when it finds a folio that needs uploading.  This isn't</div><div class='add'>+ * called if writeback only has copy-to-cache to deal with.</div><div class='add'>+ */</div><div class='add'>+static void v9fs_begin_writeback(struct netfs_io_request *wreq)</div><div class='ctx'> {</div><div class='del'>-	struct p9_fid *fid = subreq-&gt;rreq-&gt;netfs_priv;</div><div class='del'>-	int err, len;</div><div class='del'>-</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='del'>-	len = p9_client_write(fid, subreq-&gt;start, &amp;subreq-&gt;io_iter, &amp;err);</div><div class='del'>-	netfs_write_subrequest_terminated(subreq, len ?: err, false);</div><div class='del'>-}</div><div class='add'>+	struct p9_fid *fid;</div><div class='ctx'> </div><div class='del'>-static void v9fs_upload_to_server_worker(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq =</div><div class='del'>-		container_of(work, struct netfs_io_subrequest, work);</div><div class='add'>+	fid = v9fs_fid_find_inode(wreq-&gt;inode, true, INVALID_UID, true);</div><div class='add'>+	if (!fid) {</div><div class='add'>+		WARN_ONCE(1, "folio expected an open fid inode-&gt;i_ino=%lx\n",</div><div class='add'>+			  wreq-&gt;inode-&gt;i_ino);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	v9fs_upload_to_server(subreq);</div><div class='add'>+	wreq-&gt;wsize = fid-&gt;clnt-&gt;msize - P9_IOHDRSZ;</div><div class='add'>+	if (fid-&gt;iounit)</div><div class='add'>+		wreq-&gt;wsize = min(wreq-&gt;wsize, fid-&gt;iounit);</div><div class='add'>+	wreq-&gt;netfs_priv = fid;</div><div class='add'>+	wreq-&gt;io_streams[0].avail = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Set up write requests for a writeback slice.  We need to add a write request</div><div class='del'>- * for each write we want to make.</div><div class='add'>+ * Issue a subrequest to write to the server.</div><div class='ctx'>  */</div><div class='del'>-static void v9fs_create_write_requests(struct netfs_io_request *wreq, loff_t start, size_t len)</div><div class='add'>+static void v9fs_issue_write(struct netfs_io_subrequest *subreq)</div><div class='ctx'> {</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='add'>+	struct p9_fid *fid = subreq-&gt;rreq-&gt;netfs_priv;</div><div class='add'>+	int err, len;</div><div class='ctx'> </div><div class='del'>-	subreq = netfs_create_write_request(wreq, NETFS_UPLOAD_TO_SERVER,</div><div class='del'>-					    start, len, v9fs_upload_to_server_worker);</div><div class='del'>-	if (subreq)</div><div class='del'>-		netfs_queue_write_request(subreq);</div><div class='add'>+	len = p9_client_write(fid, subreq-&gt;start, &amp;subreq-&gt;io_iter, &amp;err);</div><div class='add'>+	if (len &gt; 0)</div><div class='add'>+		__set_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	netfs_write_subrequest_terminated(subreq, len ?: err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -66,16 +70,25 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='ctx'> 	struct p9_fid *fid = rreq-&gt;netfs_priv;</div><div class='add'>+	unsigned long long pos = subreq-&gt;start + subreq-&gt;transferred;</div><div class='ctx'> 	int total, err;</div><div class='ctx'> </div><div class='del'>-	total = p9_client_read(fid, subreq-&gt;start + subreq-&gt;transferred,</div><div class='del'>-			       &amp;subreq-&gt;io_iter, &amp;err);</div><div class='add'>+	total = p9_client_read(fid, pos, &amp;subreq-&gt;io_iter, &amp;err);</div><div class='ctx'> </div><div class='ctx'> 	/* if we just extended the file size, any portion not in</div><div class='ctx'> 	 * cache won't be on server and is zeroes */</div><div class='del'>-	__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='add'>+	if (subreq-&gt;rreq-&gt;origin != NETFS_UNBUFFERED_READ &amp;&amp;</div><div class='add'>+	    subreq-&gt;rreq-&gt;origin != NETFS_DIO_READ)</div><div class='add'>+		__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='add'>+	if (pos + total &gt;= i_size_read(rreq-&gt;inode))</div><div class='add'>+		__set_bit(NETFS_SREQ_HIT_EOF, &amp;subreq-&gt;flags);</div><div class='add'>+	if (!err &amp;&amp; total) {</div><div class='add'>+		subreq-&gt;transferred += total;</div><div class='add'>+		__set_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	netfs_subreq_terminated(subreq, err ?: total, false);</div><div class='add'>+	subreq-&gt;error = err;</div><div class='add'>+	netfs_read_subreq_terminated(subreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -87,12 +100,16 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	bool writing = (rreq-&gt;origin == NETFS_READ_FOR_WRITE ||</div><div class='del'>-			rreq-&gt;origin == NETFS_WRITEBACK ||</div><div class='ctx'> 			rreq-&gt;origin == NETFS_WRITETHROUGH ||</div><div class='del'>-			rreq-&gt;origin == NETFS_LAUNDER_WRITE ||</div><div class='ctx'> 			rreq-&gt;origin == NETFS_UNBUFFERED_WRITE ||</div><div class='ctx'> 			rreq-&gt;origin == NETFS_DIO_WRITE);</div><div class='ctx'> </div><div class='add'>+	if (rreq-&gt;origin == NETFS_WRITEBACK)</div><div class='add'>+		return 0; /* We don't get the write handle until we find we</div><div class='add'>+			   * have actually dirty data and not just</div><div class='add'>+			   * copy-to-cache data.</div><div class='add'>+			   */</div><div class='add'>+</div><div class='ctx'> 	if (file) {</div><div class='ctx'> 		fid = file-&gt;private_data;</div><div class='ctx'> 		if (!fid)</div><div class='hunk'>@@ -104,6 +121,10 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)</div><div class='ctx'> 			goto no_fid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rreq-&gt;wsize = fid-&gt;clnt-&gt;msize - P9_IOHDRSZ;</div><div class='add'>+	if (fid-&gt;iounit)</div><div class='add'>+		rreq-&gt;wsize = min(rreq-&gt;wsize, fid-&gt;iounit);</div><div class='add'>+</div><div class='ctx'> 	/* we might need to read from a fid that was opened write-only</div><div class='ctx'> 	 * for read-modify-write of page cache, use the writeback fid</div><div class='ctx'> 	 * for that */</div><div class='hunk'>@@ -132,7 +153,8 @@ const struct netfs_request_ops v9fs_req_ops = {</div><div class='ctx'> 	.init_request		= v9fs_init_request,</div><div class='ctx'> 	.free_request		= v9fs_free_request,</div><div class='ctx'> 	.issue_read		= v9fs_issue_read,</div><div class='del'>-	.create_write_requests	= v9fs_create_write_requests,</div><div class='add'>+	.begin_writeback	= v9fs_begin_writeback,</div><div class='add'>+	.issue_write		= v9fs_issue_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations v9fs_addr_operations = {</div><div class='hunk'>@@ -141,7 +163,7 @@ const struct address_space_operations v9fs_addr_operations = {</div><div class='ctx'> 	.dirty_folio		= netfs_dirty_folio,</div><div class='ctx'> 	.release_folio		= netfs_release_folio,</div><div class='ctx'> 	.invalidate_folio	= netfs_invalidate_folio,</div><div class='del'>-	.launder_folio		= netfs_launder_folio,</div><div class='ctx'> 	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.writepages		= netfs_writepages,</div><div class='add'>+	.migrate_folio		= filemap_migrate_folio,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c<br/>index f16f73581634..c5bf74d547e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_dentry.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_dentry.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_dentry.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_dentry.c</a></div><div class='hunk'>@@ -48,15 +48,20 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry)</div><div class='ctx'> static void v9fs_dentry_release(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_node *p, *n;</div><div class='add'>+	struct hlist_head head;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",</div><div class='ctx'> 		 dentry, dentry);</div><div class='del'>-	hlist_for_each_safe(p, n, (struct hlist_head *)&amp;dentry-&gt;d_fsdata)</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	hlist_move_list((struct hlist_head *)&amp;dentry-&gt;d_fsdata, &amp;head);</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_safe(p, n, &amp;head)</div><div class='ctx'> 		p9_fid_put(hlist_entry(p, struct p9_fid, dlist));</div><div class='del'>-	dentry-&gt;d_fsdata = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int __v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -75,8 +80,13 @@ static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 		struct v9fs_session_info *v9ses;</div><div class='ctx'> </div><div class='ctx'> 		fid = v9fs_fid_lookup(dentry);</div><div class='del'>-		if (IS_ERR(fid))</div><div class='add'>+		if (IS_ERR(fid)) {</div><div class='add'>+			p9_debug(</div><div class='add'>+				P9_DEBUG_VFS,</div><div class='add'>+				"v9fs_fid_lookup: dentry = %pd (%p), got error %pe\n",</div><div class='add'>+				dentry, dentry, fid);</div><div class='ctx'> 			return PTR_ERR(fid);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		v9ses = v9fs_inode2v9ses(inode);</div><div class='ctx'> 		if (v9fs_proto_dotl(v9ses))</div><div class='hunk'>@@ -85,23 +95,57 @@ static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 			retval = v9fs_refresh_inode(fid, inode);</div><div class='ctx'> 		p9_fid_put(fid);</div><div class='ctx'> </div><div class='del'>-		if (retval == -ENOENT)</div><div class='add'>+		if (retval == -ENOENT) {</div><div class='add'>+			p9_debug(P9_DEBUG_VFS, "dentry: %pd (%p) invalidated due to ENOENT\n",</div><div class='add'>+				 dentry, dentry);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		if (v9inode-&gt;cache_validity &amp; V9FS_INO_INVALID_ATTR) {</div><div class='add'>+			p9_debug(P9_DEBUG_VFS, "dentry: %pd (%p) invalidated due to type change\n",</div><div class='add'>+				 dentry, dentry);</div><div class='ctx'> 			return 0;</div><div class='del'>-		if (retval &lt; 0)</div><div class='add'>+		}</div><div class='add'>+		if (retval &lt; 0) {</div><div class='add'>+			p9_debug(P9_DEBUG_VFS,</div><div class='add'>+				"refresh inode: dentry = %pd (%p), got error %pe\n",</div><div class='add'>+				dentry, dentry, ERR_PTR(retval));</div><div class='ctx'> 			return retval;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> out_valid:</div><div class='add'>+	p9_debug(P9_DEBUG_VFS, "dentry: %pd (%p) is valid\n", dentry, dentry);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int v9fs_lookup_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				  struct dentry *dentry, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	return __v9fs_lookup_revalidate(dentry, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool v9fs_dentry_unalias_trylock(const struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct v9fs_session_info *v9ses = v9fs_dentry2v9ses(dentry);</div><div class='add'>+	return down_write_trylock(&amp;v9ses-&gt;rename_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void v9fs_dentry_unalias_unlock(const struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct v9fs_session_info *v9ses = v9fs_dentry2v9ses(dentry);</div><div class='add'>+	up_write(&amp;v9ses-&gt;rename_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct dentry_operations v9fs_cached_dentry_operations = {</div><div class='ctx'> 	.d_revalidate = v9fs_lookup_revalidate,</div><div class='del'>-	.d_weak_revalidate = v9fs_lookup_revalidate,</div><div class='add'>+	.d_weak_revalidate = __v9fs_lookup_revalidate,</div><div class='ctx'> 	.d_delete = v9fs_cached_dentry_delete,</div><div class='ctx'> 	.d_release = v9fs_dentry_release,</div><div class='add'>+	.d_unalias_trylock = v9fs_dentry_unalias_trylock,</div><div class='add'>+	.d_unalias_unlock = v9fs_dentry_unalias_unlock,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct dentry_operations v9fs_dentry_operations = {</div><div class='del'>-	.d_delete = always_delete_dentry,</div><div class='ctx'> 	.d_release = v9fs_dentry_release,</div><div class='add'>+	.d_unalias_trylock = v9fs_dentry_unalias_trylock,</div><div class='add'>+	.d_unalias_unlock = v9fs_dentry_unalias_unlock,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c<br/>index 4102759a5cb5..e0d34e4e9076 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_dir.c</a></div><div class='hunk'>@@ -127,7 +127,7 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			over = !dir_emit(ctx, st.name, strlen(st.name),</div><div class='del'>-					 v9fs_qid2ino(&amp;st.qid), dt_type(&amp;st));</div><div class='add'>+					QID2INO(&amp;st.qid), dt_type(&amp;st));</div><div class='ctx'> 			p9stat_free(&amp;st);</div><div class='ctx'> 			if (over)</div><div class='ctx'> 				return 0;</div><div class='hunk'>@@ -184,7 +184,7 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 			if (!dir_emit(ctx, curdirent.d_name,</div><div class='ctx'> 				      strlen(curdirent.d_name),</div><div class='del'>-				      v9fs_qid2ino(&amp;curdirent.qid),</div><div class='add'>+				      QID2INO(&amp;curdirent.qid),</div><div class='ctx'> 				      curdirent.d_type))</div><div class='ctx'> 				return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c<br/>index bae330c2f0cf..6f3880208587 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_file.c</a></div><div class='hunk'>@@ -43,14 +43,18 @@ int v9fs_file_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct v9fs_session_info *v9ses;</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	int omode;</div><div class='add'>+	int o_append;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, "inode: %p file: %p\n", inode, file);</div><div class='ctx'> 	v9ses = v9fs_inode2v9ses(inode);</div><div class='del'>-	if (v9fs_proto_dotl(v9ses))</div><div class='add'>+	if (v9fs_proto_dotl(v9ses)) {</div><div class='ctx'> 		omode = v9fs_open_to_dotl_flags(file-&gt;f_flags);</div><div class='del'>-	else</div><div class='add'>+		o_append = P9_DOTL_APPEND;</div><div class='add'>+	} else {</div><div class='ctx'> 		omode = v9fs_uflags2omode(file-&gt;f_flags,</div><div class='ctx'> 					v9fs_proto_dotu(v9ses));</div><div class='add'>+		o_append = P9_OAPPEND;</div><div class='add'>+	}</div><div class='ctx'> 	fid = file-&gt;private_data;</div><div class='ctx'> 	if (!fid) {</div><div class='ctx'> 		fid = v9fs_fid_clone(file_dentry(file));</div><div class='hunk'>@@ -58,9 +62,10 @@ int v9fs_file_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			return PTR_ERR(fid);</div><div class='ctx'> </div><div class='ctx'> 		if ((v9ses-&gt;cache &amp; CACHE_WRITEBACK) &amp;&amp; (omode &amp; P9_OWRITE)) {</div><div class='del'>-			int writeback_omode = (omode &amp; ~P9_OWRITE) | P9_ORDWR;</div><div class='add'>+			int writeback_omode = (omode &amp; ~(P9_OWRITE | o_append)) | P9_ORDWR;</div><div class='ctx'> </div><div class='ctx'> 			p9_debug(P9_DEBUG_CACHE, "write-only file with writeback enabled, try opening O_RDWR\n");</div><div class='add'>+</div><div class='ctx'> 			err = p9_client_open(fid, writeback_omode);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				p9_debug(P9_DEBUG_CACHE, "could not open O_RDWR, disabling caches\n");</div><div class='hunk'>@@ -107,7 +112,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);</div><div class='ctx'> </div><div class='del'>-	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) &amp;&amp; fl-&gt;fl_type != F_UNLCK) {</div><div class='add'>+	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) &amp;&amp; fl-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 		filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='ctx'> 		invalidate_mapping_pages(&amp;inode-&gt;i_data, 0, -1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -121,13 +126,12 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	uint8_t status = P9_LOCK_ERROR;</div><div class='ctx'> 	int res = 0;</div><div class='del'>-	unsigned char fl_type;</div><div class='ctx'> 	struct v9fs_session_info *v9ses;</div><div class='ctx'> </div><div class='ctx'> 	fid = filp-&gt;private_data;</div><div class='ctx'> 	BUG_ON(fid == NULL);</div><div class='ctx'> </div><div class='del'>-	BUG_ON((fl-&gt;fl_flags &amp; FL_POSIX) != FL_POSIX);</div><div class='add'>+	BUG_ON((fl-&gt;c.flc_flags &amp; FL_POSIX) != FL_POSIX);</div><div class='ctx'> </div><div class='ctx'> 	res = locks_lock_file_wait(filp, fl);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='hunk'>@@ -136,7 +140,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	/* convert posix lock to p9 tlock args */</div><div class='ctx'> 	memset(&amp;flock, 0, sizeof(flock));</div><div class='ctx'> 	/* map the lock type */</div><div class='del'>-	switch (fl-&gt;fl_type) {</div><div class='add'>+	switch (fl-&gt;c.flc_type) {</div><div class='ctx'> 	case F_RDLCK:</div><div class='ctx'> 		flock.type = P9_LOCK_TYPE_RDLCK;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -152,7 +156,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 		flock.length = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		flock.length = fl-&gt;fl_end - fl-&gt;fl_start + 1;</div><div class='del'>-	flock.proc_id = fl-&gt;fl_pid;</div><div class='add'>+	flock.proc_id = fl-&gt;c.flc_pid;</div><div class='ctx'> 	flock.client_id = fid-&gt;clnt-&gt;name;</div><div class='ctx'> 	if (IS_SETLKW(cmd))</div><div class='ctx'> 		flock.flags = P9_LOCK_FLAGS_BLOCK;</div><div class='hunk'>@@ -207,12 +211,13 @@ out_unlock:</div><div class='ctx'> 	 * incase server returned error for lock request, revert</div><div class='ctx'> 	 * it locally</div><div class='ctx'> 	 */</div><div class='del'>-	if (res &lt; 0 &amp;&amp; fl-&gt;fl_type != F_UNLCK) {</div><div class='del'>-		fl_type = fl-&gt;fl_type;</div><div class='del'>-		fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+	if (res &lt; 0 &amp;&amp; fl-&gt;c.flc_type != F_UNLCK) {</div><div class='add'>+		unsigned char type = fl-&gt;c.flc_type;</div><div class='add'>+</div><div class='add'>+		fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 		/* Even if this fails we want to return the remote error */</div><div class='ctx'> 		locks_lock_file_wait(filp, fl);</div><div class='del'>-		fl-&gt;fl_type = fl_type;</div><div class='add'>+		fl-&gt;c.flc_type = type;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (flock.client_id != fid-&gt;clnt-&gt;name)</div><div class='ctx'> 		kfree(flock.client_id);</div><div class='hunk'>@@ -234,7 +239,7 @@ static int v9fs_file_getlock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> 	 * if we have a conflicting lock locally, no need to validate</div><div class='ctx'> 	 * with server</div><div class='ctx'> 	 */</div><div class='del'>-	if (fl-&gt;fl_type != F_UNLCK)</div><div class='add'>+	if (fl-&gt;c.flc_type != F_UNLCK)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	/* convert posix lock to p9 tgetlock args */</div><div class='hunk'>@@ -245,7 +250,7 @@ static int v9fs_file_getlock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> 		glock.length = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		glock.length = fl-&gt;fl_end - fl-&gt;fl_start + 1;</div><div class='del'>-	glock.proc_id = fl-&gt;fl_pid;</div><div class='add'>+	glock.proc_id = fl-&gt;c.flc_pid;</div><div class='ctx'> 	glock.client_id = fid-&gt;clnt-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	res = p9_client_getlock_dotl(fid, &amp;glock);</div><div class='hunk'>@@ -254,13 +259,13 @@ static int v9fs_file_getlock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> 	/* map 9p lock type to os lock type */</div><div class='ctx'> 	switch (glock.type) {</div><div class='ctx'> 	case P9_LOCK_TYPE_RDLCK:</div><div class='del'>-		fl-&gt;fl_type = F_RDLCK;</div><div class='add'>+		fl-&gt;c.flc_type = F_RDLCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case P9_LOCK_TYPE_WRLCK:</div><div class='del'>-		fl-&gt;fl_type = F_WRLCK;</div><div class='add'>+		fl-&gt;c.flc_type = F_WRLCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case P9_LOCK_TYPE_UNLCK:</div><div class='del'>-		fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+		fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (glock.type != P9_LOCK_TYPE_UNLCK) {</div><div class='hunk'>@@ -269,7 +274,7 @@ static int v9fs_file_getlock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> 			fl-&gt;fl_end = OFFSET_MAX;</div><div class='ctx'> 		else</div><div class='ctx'> 			fl-&gt;fl_end = glock.start + glock.length - 1;</div><div class='del'>-		fl-&gt;fl_pid = -glock.proc_id;</div><div class='add'>+		fl-&gt;c.flc_pid = -glock.proc_id;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (glock.client_id != fid-&gt;clnt-&gt;name)</div><div class='hunk'>@@ -293,7 +298,7 @@ static int v9fs_file_lock_dotl(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",</div><div class='ctx'> 		 filp, cmd, fl, filp);</div><div class='ctx'> </div><div class='del'>-	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) &amp;&amp; fl-&gt;fl_type != F_UNLCK) {</div><div class='add'>+	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) &amp;&amp; fl-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 		filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='ctx'> 		invalidate_mapping_pages(&amp;inode-&gt;i_data, 0, -1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -324,16 +329,16 @@ static int v9fs_file_flock_dotl(struct file *filp, int cmd,</div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",</div><div class='ctx'> 		 filp, cmd, fl, filp);</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_FLOCK))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_FLOCK))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) &amp;&amp; fl-&gt;fl_type != F_UNLCK) {</div><div class='add'>+	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) &amp;&amp; fl-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 		filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='ctx'> 		invalidate_mapping_pages(&amp;inode-&gt;i_data, 0, -1);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Convert flock to posix lock */</div><div class='del'>-	fl-&gt;fl_flags |= FL_POSIX;</div><div class='del'>-	fl-&gt;fl_flags ^= FL_FLOCK;</div><div class='add'>+	fl-&gt;c.flc_flags |= FL_POSIX;</div><div class='add'>+	fl-&gt;c.flc_flags ^= FL_FLOCK;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_SETLK(cmd) | IS_SETLKW(cmd))</div><div class='ctx'> 		ret = v9fs_file_do_lock(filp, cmd, fl);</div><div class='hunk'>@@ -454,9 +459,10 @@ int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='add'>+v9fs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='add'>+	struct file *filp = desc-&gt;file;</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -464,12 +470,12 @@ v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	if (!(v9ses-&gt;cache &amp; CACHE_WRITEBACK)) {</div><div class='ctx'> 		p9_debug(P9_DEBUG_CACHE, "(read-only mmap mode)");</div><div class='del'>-		return generic_file_readonly_mmap(filp, vma);</div><div class='add'>+		return generic_file_readonly_mmap_prepare(desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = generic_file_mmap(filp, vma);</div><div class='add'>+	retval = generic_file_mmap_prepare(desc);</div><div class='ctx'> 	if (!retval)</div><div class='del'>-		vma-&gt;vm_ops = &amp;v9fs_mmap_file_vm_ops;</div><div class='add'>+		desc-&gt;vm_ops = &amp;v9fs_mmap_file_vm_ops;</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -482,24 +488,15 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> </div><div class='ctx'> static void v9fs_mmap_vm_close(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	struct writeback_control wbc = {</div><div class='del'>-		.nr_to_write = LONG_MAX,</div><div class='del'>-		.sync_mode = WB_SYNC_ALL,</div><div class='del'>-		.range_start = (loff_t)vma-&gt;vm_pgoff * PAGE_SIZE,</div><div class='del'>-		 /* absolute end, byte at end included */</div><div class='del'>-		.range_end = (loff_t)vma-&gt;vm_pgoff * PAGE_SIZE +</div><div class='del'>-			(vma-&gt;vm_end - vma-&gt;vm_start - 1),</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	if (!(vma-&gt;vm_flags &amp; VM_SHARED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, "9p VMA close, %p, flushing", vma);</div><div class='ctx'> </div><div class='del'>-	inode = file_inode(vma-&gt;vm_file);</div><div class='del'>-	filemap_fdatawrite_wbc(inode-&gt;i_mapping, &amp;wbc);</div><div class='add'>+	filemap_fdatawrite_range(file_inode(vma-&gt;vm_file)-&gt;i_mapping,</div><div class='add'>+			(loff_t)vma-&gt;vm_pgoff * PAGE_SIZE,</div><div class='add'>+			(loff_t)vma-&gt;vm_pgoff * PAGE_SIZE +</div><div class='add'>+				(vma-&gt;vm_end - vma-&gt;vm_start - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct vm_operations_struct v9fs_mmap_file_vm_ops = {</div><div class='hunk'>@@ -516,10 +513,11 @@ const struct file_operations v9fs_file_operations = {</div><div class='ctx'> 	.open = v9fs_file_open,</div><div class='ctx'> 	.release = v9fs_dir_release,</div><div class='ctx'> 	.lock = v9fs_file_lock,</div><div class='del'>-	.mmap = generic_file_readonly_mmap,</div><div class='add'>+	.mmap_prepare = generic_file_readonly_mmap_prepare,</div><div class='ctx'> 	.splice_read = v9fs_file_splice_read,</div><div class='ctx'> 	.splice_write = iter_file_splice_write,</div><div class='ctx'> 	.fsync = v9fs_file_fsync,</div><div class='add'>+	.setlease = simple_nosetlease,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct file_operations v9fs_file_operations_dotl = {</div><div class='hunk'>@@ -530,8 +528,9 @@ const struct file_operations v9fs_file_operations_dotl = {</div><div class='ctx'> 	.release = v9fs_dir_release,</div><div class='ctx'> 	.lock = v9fs_file_lock_dotl,</div><div class='ctx'> 	.flock = v9fs_file_flock_dotl,</div><div class='del'>-	.mmap = v9fs_file_mmap,</div><div class='add'>+	.mmap_prepare = v9fs_file_mmap_prepare,</div><div class='ctx'> 	.splice_read = v9fs_file_splice_read,</div><div class='ctx'> 	.splice_write = iter_file_splice_write,</div><div class='ctx'> 	.fsync = v9fs_file_fsync_dotl,</div><div class='add'>+	.setlease = simple_nosetlease,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c<br/>index 32572982f72e..97abe65bf7c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_inode.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ static int p9mode2perm(struct v9fs_session_info *v9ses,</div><div class='ctx'> 	int res;</div><div class='ctx'> 	int mode = stat-&gt;mode;</div><div class='ctx'> </div><div class='del'>-	res = mode &amp; S_IALLUGO;</div><div class='add'>+	res = mode &amp; 0777; /* S_IRWXUGO */</div><div class='ctx'> 	if (v9fs_proto_dotu(v9ses)) {</div><div class='ctx'> 		if ((mode &amp; P9_DMSETUID) == P9_DMSETUID)</div><div class='ctx'> 			res |= S_ISUID;</div><div class='hunk'>@@ -178,6 +178,9 @@ int v9fs_uflags2omode(int uflags, int extended)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (uflags &amp; O_TRUNC)</div><div class='add'>+		ret |= P9_OTRUNC;</div><div class='add'>+</div><div class='ctx'> 	if (extended) {</div><div class='ctx'> 		if (uflags &amp; O_EXCL)</div><div class='ctx'> 			ret |= P9_OEXCL;</div><div class='hunk'>@@ -332,36 +335,6 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * v9fs_get_inode - helper function to setup an inode</div><div class='del'>- * @sb: superblock</div><div class='del'>- * @mode: mode to setup inode with</div><div class='del'>- * @rdev: The device numbers to set</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode, dev_t rdev)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct v9fs_session_info *v9ses = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	p9_debug(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);</div><div class='del'>-</div><div class='del'>-	inode = new_inode(sb);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		pr_warn("%s (%d): Problem allocating inode\n",</div><div class='del'>-			__func__, task_pid_nr(current));</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-	err = v9fs_init_inode(v9ses, inode, mode, rdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		iput(inode);</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-	v9fs_set_netfs_context(inode);</div><div class='del'>-	return inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * v9fs_evict_inode - Remove an inode from the inode cache</div><div class='ctx'>  * @inode: inode to release</div><div class='ctx'>  *</div><div class='hunk'>@@ -371,17 +344,22 @@ void v9fs_evict_inode(struct inode *inode)</div><div class='ctx'> 	struct v9fs_inode __maybe_unused *v9inode = V9FS_I(inode);</div><div class='ctx'> 	__le32 __maybe_unused version;</div><div class='ctx'> </div><div class='del'>-	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='add'>+	if (!is_bad_inode(inode)) {</div><div class='add'>+		netfs_wait_for_outstanding_io(inode);</div><div class='add'>+		truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> </div><div class='del'>-	version = cpu_to_le32(v9inode-&gt;qid.version);</div><div class='del'>-	netfs_clear_inode_writeback(inode, &amp;version);</div><div class='add'>+		version = cpu_to_le32(v9inode-&gt;qid.version);</div><div class='add'>+		netfs_clear_inode_writeback(inode, &amp;version);</div><div class='ctx'> </div><div class='del'>-	clear_inode(inode);</div><div class='del'>-	filemap_fdatawrite(&amp;inode-&gt;i_data);</div><div class='add'>+		clear_inode(inode);</div><div class='add'>+		filemap_fdatawrite(&amp;inode-&gt;i_data);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_9P_FSCACHE</div><div class='del'>-	fscache_relinquish_cookie(v9fs_inode_cookie(v9inode), false);</div><div class='add'>+		if (v9fs_inode_cookie(v9inode))</div><div class='add'>+			fscache_relinquish_cookie(v9fs_inode_cookie(v9inode), false);</div><div class='ctx'> #endif</div><div class='add'>+	} else</div><div class='add'>+		clear_inode(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int v9fs_test_inode(struct inode *inode, void *data)</div><div class='hunk'>@@ -432,7 +410,6 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,</div><div class='ctx'> 	dev_t rdev;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	umode_t umode;</div><div class='del'>-	unsigned long i_ino;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct v9fs_session_info *v9ses = sb-&gt;s_fs_info;</div><div class='ctx'> 	int (*test)(struct inode *inode, void *data);</div><div class='hunk'>@@ -442,18 +419,17 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,</div><div class='ctx'> 	else</div><div class='ctx'> 		test = v9fs_test_inode;</div><div class='ctx'> </div><div class='del'>-	i_ino = v9fs_qid2ino(qid);</div><div class='del'>-	inode = iget5_locked(sb, i_ino, test, v9fs_set_inode, st);</div><div class='add'>+	inode = iget5_locked(sb, QID2INO(qid), test, v9fs_set_inode, st);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * initialize the inode with the stat info</div><div class='ctx'> 	 * FIXME!! we may need support for stale inodes</div><div class='ctx'> 	 * later.</div><div class='ctx'> 	 */</div><div class='del'>-	inode-&gt;i_ino = i_ino;</div><div class='add'>+	inode-&gt;i_ino = QID2INO(qid);</div><div class='ctx'> 	umode = p9mode2unixmode(v9ses, st, &amp;rdev);</div><div class='ctx'> 	retval = v9fs_init_inode(v9ses, inode, umode, rdev);</div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -693,8 +669,8 @@ v9fs_vfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int v9fs_vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			  struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *v9fs_vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				     struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 perm;</div><div class='hunk'>@@ -716,8 +692,7 @@ static int v9fs_vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	if (fid)</div><div class='ctx'> 		p9_fid_put(fid);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -793,44 +768,40 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct v9fs_inode __maybe_unused *v9inode;</div><div class='ctx'> 	struct v9fs_session_info *v9ses;</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='del'>-	struct dentry *res = NULL;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int p9_omode;</div><div class='ctx'> </div><div class='ctx'> 	if (d_in_lookup(dentry)) {</div><div class='del'>-		res = v9fs_vfs_lookup(dir, dentry, 0);</div><div class='del'>-		if (IS_ERR(res))</div><div class='del'>-			return PTR_ERR(res);</div><div class='del'>-</div><div class='del'>-		if (res)</div><div class='del'>-			dentry = res;</div><div class='add'>+		struct dentry *res = v9fs_vfs_lookup(dir, dentry, 0);</div><div class='add'>+		if (res || d_really_is_positive(dentry))</div><div class='add'>+			return finish_no_open(file, res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Only creates */</div><div class='del'>-	if (!(flags &amp; O_CREAT) || d_really_is_positive(dentry))</div><div class='del'>-		return finish_no_open(file, res);</div><div class='add'>+	if (!(flags &amp; O_CREAT))</div><div class='add'>+		return finish_no_open(file, NULL);</div><div class='ctx'> </div><div class='ctx'> 	v9ses = v9fs_inode2v9ses(dir);</div><div class='ctx'> 	perm = unixmode2p9mode(v9ses, mode);</div><div class='ctx'> 	p9_omode = v9fs_uflags2omode(flags, v9fs_proto_dotu(v9ses));</div><div class='ctx'> </div><div class='ctx'> 	if ((v9ses-&gt;cache &amp; CACHE_WRITEBACK) &amp;&amp; (p9_omode &amp; P9_OWRITE)) {</div><div class='del'>-		p9_omode = (p9_omode &amp; ~P9_OWRITE) | P9_ORDWR;</div><div class='add'>+		p9_omode = (p9_omode &amp; ~(P9_OWRITE | P9_OAPPEND)) | P9_ORDWR;</div><div class='ctx'> 		p9_debug(P9_DEBUG_CACHE,</div><div class='ctx'> 			"write-only file with writeback enabled, creating w/ O_RDWR\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	fid = v9fs_create(v9ses, dir, dentry, NULL, perm, p9_omode);</div><div class='del'>-	if (IS_ERR(fid)) {</div><div class='del'>-		err = PTR_ERR(fid);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(fid))</div><div class='add'>+		return PTR_ERR(fid);</div><div class='ctx'> </div><div class='ctx'> 	v9fs_invalidate_inode_attr(dir);</div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='ctx'> 	v9inode = V9FS_I(inode);</div><div class='ctx'> 	err = finish_open(file, dentry, generic_file_open);</div><div class='del'>-	if (err)</div><div class='del'>-		goto error;</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		p9_fid_put(fid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = fid;</div><div class='ctx'> #ifdef CONFIG_9P_FSCACHE</div><div class='hunk'>@@ -843,13 +814,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	v9fs_open_fid_add(inode, &amp;fid);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;f_mode |= FMODE_CREATED;</div><div class='del'>-out:</div><div class='del'>-	dput(res);</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	p9_fid_put(fid);</div><div class='del'>-	goto out;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1145,8 +1110,6 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,</div><div class='ctx'> 	struct v9fs_session_info *v9ses = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct v9fs_inode *v9inode = V9FS_I(inode);</div><div class='ctx'> </div><div class='del'>-	set_nlink(inode, 1);</div><div class='del'>-</div><div class='ctx'> 	inode_set_atime(inode, stat-&gt;atime, 0);</div><div class='ctx'> 	inode_set_mtime(inode, stat-&gt;mtime, 0);</div><div class='ctx'> 	inode_set_ctime(inode, stat-&gt;mtime, 0);</div><div class='hunk'>@@ -1187,26 +1150,6 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * v9fs_qid2ino - convert qid into inode number</div><div class='del'>- * @qid: qid to hash</div><div class='del'>- *</div><div class='del'>- * BUG: potential for inode number collisions?</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-ino_t v9fs_qid2ino(struct p9_qid *qid)</div><div class='del'>-{</div><div class='del'>-	u64 path = qid-&gt;path + 2;</div><div class='del'>-	ino_t i = 0;</div><div class='del'>-</div><div class='del'>-	if (sizeof(ino_t) == sizeof(path))</div><div class='del'>-		memcpy(&amp;i, &amp;path, sizeof(ino_t));</div><div class='del'>-	else</div><div class='del'>-		i = (ino_t) (path ^ (path &gt;&gt; 32));</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * v9fs_vfs_get_link - follow a symlink path</div><div class='ctx'>  * @dentry: dentry for symlink</div><div class='ctx'>  * @inode: inode for symlink</div><div class='hunk'>@@ -1450,4 +1393,3 @@ static const struct inode_operations v9fs_symlink_inode_operations = {</div><div class='ctx'> 	.getattr = v9fs_vfs_getattr,</div><div class='ctx'> 	.setattr = v9fs_vfs_setattr,</div><div class='ctx'> };</div><div class='del'>-</div><div class='head'>diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c<br/>index 3505227e1704..643e759eacb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_inode_dotl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_inode_dotl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_inode_dotl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_inode_dotl.c</a></div><div class='hunk'>@@ -100,7 +100,6 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,</div><div class='ctx'> 					int new)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='del'>-	unsigned long i_ino;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct v9fs_session_info *v9ses = sb-&gt;s_fs_info;</div><div class='ctx'> 	int (*test)(struct inode *inode, void *data);</div><div class='hunk'>@@ -110,18 +109,17 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,</div><div class='ctx'> 	else</div><div class='ctx'> 		test = v9fs_test_inode_dotl;</div><div class='ctx'> </div><div class='del'>-	i_ino = v9fs_qid2ino(qid);</div><div class='del'>-	inode = iget5_locked(sb, i_ino, test, v9fs_set_inode_dotl, st);</div><div class='add'>+	inode = iget5_locked(sb, QID2INO(qid), test, v9fs_set_inode_dotl, st);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * initialize the inode with the stat info</div><div class='ctx'> 	 * FIXME!! we may need support for stale inodes</div><div class='ctx'> 	 * later.</div><div class='ctx'> 	 */</div><div class='del'>-	inode-&gt;i_ino = i_ino;</div><div class='add'>+	inode-&gt;i_ino = QID2INO(qid);</div><div class='ctx'> 	retval = v9fs_init_inode(v9ses, inode,</div><div class='ctx'> 				 st-&gt;st_mode, new_decode_dev(st-&gt;st_rdev));</div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -240,20 +238,16 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct p9_fid *dfid = NULL, *ofid = NULL;</div><div class='ctx'> 	struct v9fs_session_info *v9ses;</div><div class='ctx'> 	struct posix_acl *pacl = NULL, *dacl = NULL;</div><div class='del'>-	struct dentry *res = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (d_in_lookup(dentry)) {</div><div class='del'>-		res = v9fs_vfs_lookup(dir, dentry, 0);</div><div class='del'>-		if (IS_ERR(res))</div><div class='del'>-			return PTR_ERR(res);</div><div class='del'>-</div><div class='del'>-		if (res)</div><div class='del'>-			dentry = res;</div><div class='add'>+		struct dentry *res = v9fs_vfs_lookup(dir, dentry, 0);</div><div class='add'>+		if (res || d_really_is_positive(dentry))</div><div class='add'>+			return	finish_no_open(file, res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Only creates */</div><div class='del'>-	if (!(flags &amp; O_CREAT) || d_really_is_positive(dentry))</div><div class='del'>-		return	finish_no_open(file, res);</div><div class='add'>+	if (!(flags &amp; O_CREAT))</div><div class='add'>+		return	finish_no_open(file, NULL);</div><div class='ctx'> </div><div class='ctx'> 	v9ses = v9fs_inode2v9ses(dir);</div><div class='ctx'> </div><div class='hunk'>@@ -288,7 +282,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((v9ses-&gt;cache &amp; CACHE_WRITEBACK) &amp;&amp; (p9_omode &amp; P9_OWRITE)) {</div><div class='del'>-		p9_omode = (p9_omode &amp; ~P9_OWRITE) | P9_ORDWR;</div><div class='add'>+		p9_omode = (p9_omode &amp; ~(P9_OWRITE | P9_DOTL_APPEND)) | P9_ORDWR;</div><div class='ctx'> 		p9_debug(P9_DEBUG_CACHE,</div><div class='ctx'> 			"write-only file with writeback enabled, creating w/ O_RDWR\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -339,7 +333,6 @@ out:</div><div class='ctx'> 	p9_fid_put(ofid);</div><div class='ctx'> 	p9_fid_put(fid);</div><div class='ctx'> 	v9fs_put_acl(dacl, pacl);</div><div class='del'>-	dput(res);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -352,9 +345,9 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int v9fs_vfs_mkdir_dotl(struct mnt_idmap *idmap,</div><div class='del'>-			       struct inode *dir, struct dentry *dentry,</div><div class='del'>-			       umode_t omode)</div><div class='add'>+static struct dentry *v9fs_vfs_mkdir_dotl(struct mnt_idmap *idmap,</div><div class='add'>+					  struct inode *dir, struct dentry *dentry,</div><div class='add'>+					  umode_t omode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct v9fs_session_info *v9ses;</div><div class='hunk'>@@ -402,39 +395,24 @@ static int v9fs_vfs_mkdir_dotl(struct mnt_idmap *idmap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* instantiate inode and assign the unopened fid to the dentry */</div><div class='del'>-	if (v9ses-&gt;cache &amp; (CACHE_META|CACHE_LOOSE)) {</div><div class='del'>-		inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir-&gt;i_sb);</div><div class='del'>-		if (IS_ERR(inode)) {</div><div class='del'>-			err = PTR_ERR(inode);</div><div class='del'>-			p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",</div><div class='del'>-				 err);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		v9fs_fid_add(dentry, &amp;fid);</div><div class='del'>-		v9fs_set_create_acl(inode, fid, dacl, pacl);</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-		err = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Not in cached mode. No need to populate</div><div class='del'>-		 * inode with stat. We need to get an inode</div><div class='del'>-		 * so that we can set the acl with dentry</div><div class='del'>-		 */</div><div class='del'>-		inode = v9fs_get_inode(dir-&gt;i_sb, mode, 0);</div><div class='del'>-		if (IS_ERR(inode)) {</div><div class='del'>-			err = PTR_ERR(inode);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		v9fs_set_create_acl(inode, fid, dacl, pacl);</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='add'>+	inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir-&gt;i_sb);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		err = PTR_ERR(inode);</div><div class='add'>+		p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",</div><div class='add'>+			 err);</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='add'>+	v9fs_set_create_acl(inode, fid, dacl, pacl);</div><div class='add'>+	v9fs_fid_add(dentry, &amp;fid);</div><div class='add'>+	d_instantiate(dentry, inode);</div><div class='add'>+	err = 0;</div><div class='ctx'> 	inc_nlink(dir);</div><div class='ctx'> 	v9fs_invalidate_inode_attr(dir);</div><div class='ctx'> error:</div><div class='ctx'> 	p9_fid_put(fid);</div><div class='ctx'> 	v9fs_put_acl(dacl, pacl);</div><div class='ctx'> 	p9_fid_put(dfid);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -709,14 +687,11 @@ v9fs_vfs_symlink_dotl(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	kgid_t gid;</div><div class='ctx'> 	const unsigned char *name;</div><div class='ctx'> 	struct p9_qid qid;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	struct p9_fid *dfid;</div><div class='ctx'> 	struct p9_fid *fid = NULL;</div><div class='del'>-	struct v9fs_session_info *v9ses;</div><div class='ctx'> </div><div class='ctx'> 	name = dentry-&gt;d_name.name;</div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, "%lu,%s,%s\n", dir-&gt;i_ino, name, symname);</div><div class='del'>-	v9ses = v9fs_inode2v9ses(dir);</div><div class='ctx'> </div><div class='ctx'> 	dfid = v9fs_parent_fid(dentry);</div><div class='ctx'> 	if (IS_ERR(dfid)) {</div><div class='hunk'>@@ -736,36 +711,6 @@ v9fs_vfs_symlink_dotl(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	v9fs_invalidate_inode_attr(dir);</div><div class='del'>-	if (v9ses-&gt;cache &amp; (CACHE_META|CACHE_LOOSE)) {</div><div class='del'>-		/* Now walk from the parent so we can get an unopened fid. */</div><div class='del'>-		fid = p9_client_walk(dfid, 1, &amp;name, 1);</div><div class='del'>-		if (IS_ERR(fid)) {</div><div class='del'>-			err = PTR_ERR(fid);</div><div class='del'>-			p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",</div><div class='del'>-				 err);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* instantiate inode and assign the unopened fid to dentry */</div><div class='del'>-		inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir-&gt;i_sb);</div><div class='del'>-		if (IS_ERR(inode)) {</div><div class='del'>-			err = PTR_ERR(inode);</div><div class='del'>-			p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",</div><div class='del'>-				 err);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		v9fs_fid_add(dentry, &amp;fid);</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-		err = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* Not in cached mode. No need to populate inode with stat */</div><div class='del'>-		inode = v9fs_get_inode(dir-&gt;i_sb, S_IFLNK, 0);</div><div class='del'>-		if (IS_ERR(inode)) {</div><div class='del'>-			err = PTR_ERR(inode);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	p9_fid_put(fid);</div><div class='hunk'>@@ -888,33 +833,17 @@ v9fs_vfs_mknod_dotl(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			 err);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* instantiate inode and assign the unopened fid to the dentry */</div><div class='del'>-	if (v9ses-&gt;cache &amp; (CACHE_META|CACHE_LOOSE)) {</div><div class='del'>-		inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir-&gt;i_sb);</div><div class='del'>-		if (IS_ERR(inode)) {</div><div class='del'>-			err = PTR_ERR(inode);</div><div class='del'>-			p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",</div><div class='del'>-				 err);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		v9fs_set_create_acl(inode, fid, dacl, pacl);</div><div class='del'>-		v9fs_fid_add(dentry, &amp;fid);</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-		err = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Not in cached mode. No need to populate inode with stat.</div><div class='del'>-		 * socket syscall returns a fd, so we need instantiate</div><div class='del'>-		 */</div><div class='del'>-		inode = v9fs_get_inode(dir-&gt;i_sb, mode, rdev);</div><div class='del'>-		if (IS_ERR(inode)) {</div><div class='del'>-			err = PTR_ERR(inode);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		v9fs_set_create_acl(inode, fid, dacl, pacl);</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='add'>+	inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir-&gt;i_sb);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		err = PTR_ERR(inode);</div><div class='add'>+		p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",</div><div class='add'>+			 err);</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='add'>+	v9fs_set_create_acl(inode, fid, dacl, pacl);</div><div class='add'>+	v9fs_fid_add(dentry, &amp;fid);</div><div class='add'>+	d_instantiate(dentry, inode);</div><div class='add'>+	err = 0;</div><div class='ctx'> error:</div><div class='ctx'> 	p9_fid_put(fid);</div><div class='ctx'> 	v9fs_put_acl(dacl, pacl);</div><div class='head'>diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c<br/>index 941f7d0e0bfa..315336de6f02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/9p/vfs_super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/9p/vfs_super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/9p/vfs_super.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/fscache.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;net/9p/9p.h&gt;</div><div class='ctx'> #include &lt;net/9p/client.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -30,32 +31,10 @@</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations v9fs_super_ops, v9fs_super_ops_dotl;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * v9fs_set_super - set the superblock</div><div class='del'>- * @s: super block</div><div class='del'>- * @data: file system specific data</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int v9fs_set_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	s-&gt;s_fs_info = data;</div><div class='del'>-	return set_anon_super(s, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * v9fs_fill_super - populate superblock with info</div><div class='del'>- * @sb: superblock</div><div class='del'>- * @v9ses: session information</div><div class='del'>- * @flags: flags propagated from v9fs_mount()</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses,</div><div class='del'>-		int flags)</div><div class='add'>+static int v9fs_fill_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct v9fs_session_info *v9ses = v9ses = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = fls(v9ses-&gt;maxdata - 1);</div><div class='hunk'>@@ -95,22 +74,17 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * v9fs_mount - mount a superblock</div><div class='del'>- * @fs_type: file system type</div><div class='del'>- * @flags: mount flags</div><div class='del'>- * @dev_name: device name that was mounted</div><div class='del'>- * @data: mount options</div><div class='add'>+ * v9fs_get_tree - create the mountable root and superblock</div><div class='add'>+ * @fc: the filesystem context</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,</div><div class='del'>-		       const char *dev_name, void *data)</div><div class='add'>+static int v9fs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = NULL;</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> 	struct dentry *root = NULL;</div><div class='ctx'> 	struct v9fs_session_info *v9ses = NULL;</div><div class='del'>-	umode_t mode = 0777 | S_ISVTX;</div><div class='ctx'> 	struct p9_fid *fid;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -118,29 +92,32 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,</div><div class='ctx'> </div><div class='ctx'> 	v9ses = kzalloc(sizeof(struct v9fs_session_info), GFP_KERNEL);</div><div class='ctx'> 	if (!v9ses)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	fid = v9fs_session_init(v9ses, dev_name, data);</div><div class='add'>+	fid = v9fs_session_init(v9ses, fc);</div><div class='ctx'> 	if (IS_ERR(fid)) {</div><div class='ctx'> 		retval = PTR_ERR(fid);</div><div class='ctx'> 		goto free_session;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sb = sget(fs_type, NULL, v9fs_set_super, flags, v9ses);</div><div class='add'>+	fc-&gt;s_fs_info = v9ses;</div><div class='add'>+	sb = sget_fc(fc, NULL, set_anon_super_fc);</div><div class='ctx'> 	if (IS_ERR(sb)) {</div><div class='ctx'> 		retval = PTR_ERR(sb);</div><div class='ctx'> 		goto clunk_fid;</div><div class='ctx'> 	}</div><div class='del'>-	retval = v9fs_fill_super(sb, v9ses, flags);</div><div class='add'>+	retval = v9fs_fill_super(sb);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto release_sb;</div><div class='ctx'> </div><div class='del'>-	if (v9ses-&gt;cache &amp; (CACHE_META|CACHE_LOOSE))</div><div class='del'>-		sb-&gt;s_d_op = &amp;v9fs_cached_dentry_operations;</div><div class='del'>-	else</div><div class='del'>-		sb-&gt;s_d_op = &amp;v9fs_dentry_operations;</div><div class='add'>+	if (v9ses-&gt;cache &amp; (CACHE_META|CACHE_LOOSE)) {</div><div class='add'>+		set_default_d_op(sb, &amp;v9fs_cached_dentry_operations);</div><div class='add'>+	} else {</div><div class='add'>+		set_default_d_op(sb, &amp;v9fs_dentry_operations);</div><div class='add'>+		sb-&gt;s_d_flags |= DCACHE_DONTCACHE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	inode = v9fs_get_inode(sb, S_IFDIR | mode, 0);</div><div class='add'>+	inode = v9fs_get_new_inode_from_fid(v9ses, fid, sb);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		retval = PTR_ERR(inode);</div><div class='ctx'> 		goto release_sb;</div><div class='hunk'>@@ -152,46 +129,21 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,</div><div class='ctx'> 		goto release_sb;</div><div class='ctx'> 	}</div><div class='ctx'> 	sb-&gt;s_root = root;</div><div class='del'>-	if (v9fs_proto_dotl(v9ses)) {</div><div class='del'>-		struct p9_stat_dotl *st = NULL;</div><div class='del'>-</div><div class='del'>-		st = p9_client_getattr_dotl(fid, P9_STATS_BASIC);</div><div class='del'>-		if (IS_ERR(st)) {</div><div class='del'>-			retval = PTR_ERR(st);</div><div class='del'>-			goto release_sb;</div><div class='del'>-		}</div><div class='del'>-		d_inode(root)-&gt;i_ino = v9fs_qid2ino(&amp;st-&gt;qid);</div><div class='del'>-		v9fs_stat2inode_dotl(st, d_inode(root), 0);</div><div class='del'>-		kfree(st);</div><div class='del'>-	} else {</div><div class='del'>-		struct p9_wstat *st = NULL;</div><div class='del'>-</div><div class='del'>-		st = p9_client_stat(fid);</div><div class='del'>-		if (IS_ERR(st)) {</div><div class='del'>-			retval = PTR_ERR(st);</div><div class='del'>-			goto release_sb;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d_inode(root)-&gt;i_ino = v9fs_qid2ino(&amp;st-&gt;qid);</div><div class='del'>-		v9fs_stat2inode(st, d_inode(root), sb, 0);</div><div class='del'>-</div><div class='del'>-		p9stat_free(st);</div><div class='del'>-		kfree(st);</div><div class='del'>-	}</div><div class='ctx'> 	retval = v9fs_get_acl(inode, fid);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto release_sb;</div><div class='ctx'> 	v9fs_fid_add(root, &amp;fid);</div><div class='ctx'> </div><div class='ctx'> 	p9_debug(P9_DEBUG_VFS, " simple set mount, return 0\n");</div><div class='del'>-	return dget(sb-&gt;s_root);</div><div class='add'>+	fc-&gt;root = dget(sb-&gt;s_root);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> clunk_fid:</div><div class='ctx'> 	p9_fid_put(fid);</div><div class='ctx'> 	v9fs_session_close(v9ses);</div><div class='ctx'> free_session:</div><div class='ctx'> 	kfree(v9ses);</div><div class='del'>-	return ERR_PTR(retval);</div><div class='add'>+	return retval;</div><div class='ctx'> </div><div class='ctx'> release_sb:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -202,7 +154,7 @@ release_sb:</div><div class='ctx'> 	 */</div><div class='ctx'> 	p9_fid_put(fid);</div><div class='ctx'> 	deactivate_locked_super(sb);</div><div class='del'>-	return ERR_PTR(retval);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -277,7 +229,7 @@ static int v9fs_drop_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	v9ses = v9fs_inode2v9ses(inode);</div><div class='ctx'> 	if (v9ses-&gt;cache &amp; (CACHE_META|CACHE_LOOSE))</div><div class='del'>-		return generic_drop_inode(inode);</div><div class='add'>+		return inode_generic_drop(inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * in case of non cached mode always drop the</div><div class='ctx'> 	 * inode because we want the inode attribute</div><div class='hunk'>@@ -310,6 +262,7 @@ static const struct super_operations v9fs_super_ops = {</div><div class='ctx'> 	.alloc_inode = v9fs_alloc_inode,</div><div class='ctx'> 	.free_inode = v9fs_free_inode,</div><div class='ctx'> 	.statfs = simple_statfs,</div><div class='add'>+	.drop_inode = v9fs_drop_inode,</div><div class='ctx'> 	.evict_inode = v9fs_evict_inode,</div><div class='ctx'> 	.show_options = v9fs_show_options,</div><div class='ctx'> 	.umount_begin = v9fs_umount_begin,</div><div class='hunk'>@@ -327,11 +280,86 @@ static const struct super_operations v9fs_super_ops_dotl = {</div><div class='ctx'> 	.write_inode = v9fs_write_inode_dotl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void v9fs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct v9fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* These should be NULL by now but guard against leaks */</div><div class='add'>+	kfree(ctx-&gt;session_opts.uname);</div><div class='add'>+	kfree(ctx-&gt;session_opts.aname);</div><div class='add'>+#ifdef CONFIG_9P_FSCACHE</div><div class='add'>+	kfree(ctx-&gt;session_opts.cachetag);</div><div class='add'>+#endif</div><div class='add'>+	if (ctx-&gt;client_opts.trans_mod)</div><div class='add'>+		v9fs_put_trans(ctx-&gt;client_opts.trans_mod);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations v9fs_context_ops = {</div><div class='add'>+	.parse_param	= v9fs_parse_param,</div><div class='add'>+	.get_tree	= v9fs_get_tree,</div><div class='add'>+	.free		= v9fs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int v9fs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct v9fs_context	*ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* initialize core options */</div><div class='add'>+	ctx-&gt;session_opts.afid = ~0;</div><div class='add'>+	ctx-&gt;session_opts.cache = CACHE_NONE;</div><div class='add'>+	ctx-&gt;session_opts.session_lock_timeout = P9_LOCK_TIMEOUT;</div><div class='add'>+	ctx-&gt;session_opts.uname = kstrdup(V9FS_DEFUSER, GFP_KERNEL);</div><div class='add'>+	if (!ctx-&gt;session_opts.uname)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;session_opts.aname = kstrdup(V9FS_DEFANAME, GFP_KERNEL);</div><div class='add'>+	if (!ctx-&gt;session_opts.aname)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;session_opts.uid = INVALID_UID;</div><div class='add'>+	ctx-&gt;session_opts.dfltuid = V9FS_DEFUID;</div><div class='add'>+	ctx-&gt;session_opts.dfltgid = V9FS_DEFGID;</div><div class='add'>+</div><div class='add'>+	/* initialize client options */</div><div class='add'>+	ctx-&gt;client_opts.proto_version = p9_proto_2000L;</div><div class='add'>+	ctx-&gt;client_opts.msize = DEFAULT_MSIZE;</div><div class='add'>+</div><div class='add'>+	/* initialize fd transport options */</div><div class='add'>+	ctx-&gt;fd_opts.port = P9_FD_PORT;</div><div class='add'>+	ctx-&gt;fd_opts.rfd = ~0;</div><div class='add'>+	ctx-&gt;fd_opts.wfd = ~0;</div><div class='add'>+	ctx-&gt;fd_opts.privport = false;</div><div class='add'>+</div><div class='add'>+	/* initialize rdma transport options */</div><div class='add'>+	ctx-&gt;rdma_opts.port = P9_RDMA_PORT;</div><div class='add'>+	ctx-&gt;rdma_opts.sq_depth = P9_RDMA_SQ_DEPTH;</div><div class='add'>+	ctx-&gt;rdma_opts.rq_depth = P9_RDMA_RQ_DEPTH;</div><div class='add'>+	ctx-&gt;rdma_opts.timeout = P9_RDMA_TIMEOUT;</div><div class='add'>+	ctx-&gt;rdma_opts.privport = false;</div><div class='add'>+</div><div class='add'>+	fc-&gt;ops = &amp;v9fs_context_ops;</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	fc-&gt;need_free = 1;</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct file_system_type v9fs_fs_type = {</div><div class='ctx'> 	.name = "9p",</div><div class='del'>-	.mount = v9fs_mount,</div><div class='ctx'> 	.kill_sb = v9fs_kill_super,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.fs_flags = FS_RENAME_DOES_D_MOVE,</div><div class='add'>+	.init_fs_context = v9fs_init_fs_context,</div><div class='add'>+	.parameters = v9fs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("9p");</div><div class='head'>diff --git a/fs/Kconfig b/fs/Kconfig<br/>index 89fdbefd1075..0bfdaecaa877 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/Kconfig</a></div><div class='hunk'>@@ -43,7 +43,6 @@ config FS_MBCACHE</div><div class='ctx'> 	default y if EXT4_FS=y</div><div class='ctx'> 	default m if EXT2_FS_XATTR || EXT4_FS</div><div class='ctx'> </div><div class='del'>-source "fs/reiserfs/Kconfig"</div><div class='ctx'> source "fs/jfs/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "fs/xfs/Kconfig"</div><div class='hunk'>@@ -52,7 +51,6 @@ source "fs/ocfs2/Kconfig"</div><div class='ctx'> source "fs/btrfs/Kconfig"</div><div class='ctx'> source "fs/nilfs2/Kconfig"</div><div class='ctx'> source "fs/f2fs/Kconfig"</div><div class='del'>-source "fs/bcachefs/Kconfig"</div><div class='ctx'> source "fs/zonefs/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endif # BLOCK</div><div class='hunk'>@@ -60,8 +58,7 @@ endif # BLOCK</div><div class='ctx'> config FS_DAX</div><div class='ctx'> 	bool "File system based Direct Access (DAX) support"</div><div class='ctx'> 	depends on MMU</div><div class='del'>-	depends on !(ARM || MIPS || SPARC)</div><div class='del'>-	depends on ZONE_DEVICE || FS_DAX_LIMITED</div><div class='add'>+	depends on ZONE_DEVICE</div><div class='ctx'> 	select FS_IOMAP</div><div class='ctx'> 	select DAX</div><div class='ctx'> 	help</div><div class='hunk'>@@ -97,13 +94,6 @@ config FS_DAX_PMD</div><div class='ctx'> 	depends on ZONE_DEVICE</div><div class='ctx'> 	depends on TRANSPARENT_HUGEPAGE</div><div class='ctx'> </div><div class='del'>-# Selected by DAX drivers that do not expect filesystem DAX to support</div><div class='del'>-# get_user_pages() of DAX mappings. I.e. "limited" indicates no support</div><div class='del'>-# for fork() of processes with MAP_SHARED mappings or support for</div><div class='del'>-# direct-I/O to a DAX mapping.</div><div class='del'>-config FS_DAX_LIMITED</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> # Posix ACL utility routines</div><div class='ctx'> #</div><div class='ctx'> # Note: Posix ACLs can be implemented without these helpers.  Never use</div><div class='hunk'>@@ -162,7 +152,6 @@ menu "DOS/FAT/EXFAT/NT Filesystems"</div><div class='ctx'> </div><div class='ctx'> source "fs/fat/Kconfig"</div><div class='ctx'> source "fs/exfat/Kconfig"</div><div class='del'>-source "fs/ntfs/Kconfig"</div><div class='ctx'> source "fs/ntfs3/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='hunk'>@@ -259,9 +248,9 @@ config ARCH_SUPPORTS_HUGETLBFS</div><div class='ctx'> </div><div class='ctx'> menuconfig HUGETLBFS</div><div class='ctx'> 	bool "HugeTLB file system support"</div><div class='del'>-	depends on X86 || SPARC64 || ARCH_SUPPORTS_HUGETLBFS || BROKEN</div><div class='del'>-	depends on (SYSFS || SYSCTL)</div><div class='add'>+	depends on ARCH_SUPPORTS_HUGETLBFS</div><div class='ctx'> 	select MEMFD_CREATE</div><div class='add'>+	select PADATA if SMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  hugetlbfs is a filesystem backing for HugeTLB pages, based on</div><div class='ctx'> 	  ramfs. For architectures that support it, say Y here and read</div><div class='hunk'>@@ -288,6 +277,11 @@ config HUGETLB_PAGE_OPTIMIZE_VMEMMAP</div><div class='ctx'> 	def_bool HUGETLB_PAGE</div><div class='ctx'> 	depends on ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP</div><div class='ctx'> 	depends on SPARSEMEM_VMEMMAP</div><div class='add'>+	select SPARSEMEM_VMEMMAP_PREINIT if ARCH_WANT_HUGETLB_VMEMMAP_PREINIT</div><div class='add'>+</div><div class='add'>+config HUGETLB_PMD_PAGE_TABLE_SHARING</div><div class='add'>+	def_bool HUGETLB_PAGE</div><div class='add'>+	depends on ARCH_WANT_HUGE_PMD_SHARE &amp;&amp; SPLIT_PMD_PTLOCKS</div><div class='ctx'> </div><div class='ctx'> config ARCH_HAS_GIGANTIC_PAGE</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -332,9 +326,9 @@ source "fs/omfs/Kconfig"</div><div class='ctx'> source "fs/hpfs/Kconfig"</div><div class='ctx'> source "fs/qnx4/Kconfig"</div><div class='ctx'> source "fs/qnx6/Kconfig"</div><div class='add'>+source "fs/resctrl/Kconfig"</div><div class='ctx'> source "fs/romfs/Kconfig"</div><div class='ctx'> source "fs/pstore/Kconfig"</div><div class='del'>-source "fs/sysv/Kconfig"</div><div class='ctx'> source "fs/ufs/Kconfig"</div><div class='ctx'> source "fs/erofs/Kconfig"</div><div class='ctx'> source "fs/vboxsf/Kconfig"</div><div class='hunk'>@@ -366,6 +360,7 @@ config GRACE_PERIOD</div><div class='ctx'> config LOCKD</div><div class='ctx'> 	tristate</div><div class='ctx'> 	depends on FILE_LOCKING</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select GRACE_PERIOD</div><div class='ctx'> </div><div class='ctx'> config LOCKD_V4</div><div class='hunk'>@@ -383,6 +378,29 @@ config NFS_COMMON</div><div class='ctx'> 	depends on NFSD || NFS_FS || LOCKD</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config NFS_COMMON_LOCALIO_SUPPORT</div><div class='add'>+	tristate</div><div class='add'>+	depends on NFS_LOCALIO</div><div class='add'>+	default y if NFSD=y || NFS_FS=y</div><div class='add'>+	default m if NFSD=m &amp;&amp; NFS_FS=m</div><div class='add'>+	select SUNRPC</div><div class='add'>+</div><div class='add'>+config NFS_LOCALIO</div><div class='add'>+	bool "NFS client and server support for LOCALIO auxiliary protocol"</div><div class='add'>+	depends on NFSD &amp;&amp; NFS_FS</div><div class='add'>+	select NFS_COMMON_LOCALIO_SUPPORT</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Some NFS servers support an auxiliary NFS LOCALIO protocol</div><div class='add'>+	  that is not an official part of the NFS protocol.</div><div class='add'>+</div><div class='add'>+	  This option enables support for the LOCALIO protocol in the</div><div class='add'>+	  kernel's NFS server and client. Enable this to permit local</div><div class='add'>+	  NFS clients to bypass the network when issuing reads and</div><div class='add'>+	  writes to the local NFS server.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config NFS_V4_2_SSC_HELPER</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y if NFS_V4_2</div><div class='head'>diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt<br/>index f5693164ca9a..1949e25c7741 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/Kconfig.binfmt?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/Kconfig.binfmt</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/Kconfig.binfmt?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/Kconfig.binfmt</a></div><div class='hunk'>@@ -176,4 +176,21 @@ config COREDUMP</div><div class='ctx'> 	  certainly want to say Y here. Not necessary on systems that never</div><div class='ctx'> 	  need debugging or only ever run flawless code.</div><div class='ctx'> </div><div class='add'>+config EXEC_KUNIT_TEST</div><div class='add'>+	bool "Build execve tests" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on KUNIT=y</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  This builds the exec KUnit tests, which tests boundary conditions</div><div class='add'>+	  of various aspects of the exec internals.</div><div class='add'>+</div><div class='add'>+config ARCH_HAS_ELF_CORE_EFLAGS</div><div class='add'>+	bool</div><div class='add'>+	depends on BINFMT_ELF &amp;&amp; ELF_CORE</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Select this option if the architecture makes use of the e_flags</div><div class='add'>+	  field in the ELF header to store ABI or other architecture-specific</div><div class='add'>+	  information that should be preserved in core dumps.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/fs/Makefile b/fs/Makefile<br/>index c09016257f05..a04274a3c854 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/Makefile</a></div><div class='hunk'>@@ -14,8 +14,9 @@ obj-y :=	open.o read_write.o file_table.o super.o \</div><div class='ctx'> 		seq_file.o xattr.o libfs.o fs-writeback.o \</div><div class='ctx'> 		pnode.o splice.o sync.o utimes.o d_path.o \</div><div class='ctx'> 		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \</div><div class='del'>-		fs_types.o fs_context.o fs_parser.o fsopen.o init.o \</div><div class='del'>-		kernel_read_file.o mnt_idmapping.o remap_range.o</div><div class='add'>+		fs_dirent.o fs_context.o fs_parser.o fsopen.o init.o \</div><div class='add'>+		kernel_read_file.o mnt_idmapping.o remap_range.o pidfs.o \</div><div class='add'>+		file_attr.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BUFFER_HEAD)	+= buffer.o mpage.o</div><div class='ctx'> obj-$(CONFIG_PROC_FS)		+= proc_namespace.o</div><div class='hunk'>@@ -61,7 +62,6 @@ obj-$(CONFIG_DLM)		+= dlm/</div><div class='ctx'>  </div><div class='ctx'> # Do not add any filesystems before this line</div><div class='ctx'> obj-$(CONFIG_NETFS_SUPPORT)	+= netfs/</div><div class='del'>-obj-$(CONFIG_REISERFS_FS)	+= reiserfs/</div><div class='ctx'> obj-$(CONFIG_EXT4_FS)		+= ext4/</div><div class='ctx'> # We place ext4 before ext2 so that clean ext3 root fs's do NOT mount using the</div><div class='ctx'> # ext2 driver, which doesn't know about journalling!  Explicitly request ext2</div><div class='hunk'>@@ -88,10 +88,8 @@ obj-$(CONFIG_NFSD)		+= nfsd/</div><div class='ctx'> obj-$(CONFIG_LOCKD)		+= lockd/</div><div class='ctx'> obj-$(CONFIG_NLS)		+= nls/</div><div class='ctx'> obj-y				+= unicode/</div><div class='del'>-obj-$(CONFIG_SYSV_FS)		+= sysv/</div><div class='ctx'> obj-$(CONFIG_SMBFS)		+= smb/</div><div class='ctx'> obj-$(CONFIG_HPFS_FS)		+= hpfs/</div><div class='del'>-obj-$(CONFIG_NTFS_FS)		+= ntfs/</div><div class='ctx'> obj-$(CONFIG_NTFS3_FS)		+= ntfs3/</div><div class='ctx'> obj-$(CONFIG_UFS_FS)		+= ufs/</div><div class='ctx'> obj-$(CONFIG_EFS_FS)		+= efs/</div><div class='hunk'>@@ -123,10 +121,11 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/</div><div class='ctx'> obj-$(CONFIG_BTRFS_FS)		+= btrfs/</div><div class='ctx'> obj-$(CONFIG_GFS2_FS)           += gfs2/</div><div class='ctx'> obj-$(CONFIG_F2FS_FS)		+= f2fs/</div><div class='del'>-obj-$(CONFIG_BCACHEFS_FS)	+= bcachefs/</div><div class='ctx'> obj-$(CONFIG_CEPH_FS)		+= ceph/</div><div class='ctx'> obj-$(CONFIG_PSTORE)		+= pstore/</div><div class='ctx'> obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/</div><div class='ctx'> obj-$(CONFIG_EROFS_FS)		+= erofs/</div><div class='ctx'> obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/</div><div class='ctx'> obj-$(CONFIG_ZONEFS_FS)		+= zonefs/</div><div class='add'>+obj-$(CONFIG_BPF_LSM)		+= bpf_fs_kfuncs.o</div><div class='add'>+obj-$(CONFIG_RESCTRL_FS)	+= resctrl/</div><div class='head'>diff --git a/fs/adfs/file.c b/fs/adfs/file.c<br/>index ee80718aaeec..cd13165fd904 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/adfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/adfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/adfs/file.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> const struct file_operations adfs_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.fsync		= generic_file_fsync,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='head'>diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c<br/>index a183e213a4a5..6830f8bc8d4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/adfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/adfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/adfs/inode.c</a></div><div class='hunk'>@@ -53,14 +53,14 @@ static void adfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 		truncate_pagecache(inode, inode-&gt;i_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int adfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int adfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='add'>+			    loff_t pos, unsigned len,</div><div class='add'>+			    struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,</div><div class='add'>+	ret = cont_write_begin(iocb, mapping, pos, len, foliop, fsdata,</div><div class='ctx'> 				adfs_get_block,</div><div class='ctx'> 				&amp;ADFS_I(mapping-&gt;host)-&gt;mmu_private);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='head'>diff --git a/fs/adfs/map.c b/fs/adfs/map.c<br/>index a81de80c45c1..a0ce272b4098 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/adfs/map.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/adfs/map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/adfs/map.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "adfs.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/adfs/super.c b/fs/adfs/super.c<br/>index e8bfc38239cd..fdccdbbfc213 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/adfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/adfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/adfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/adfs/super.c</a></div><div class='hunk'>@@ -6,7 +6,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -115,87 +116,61 @@ static int adfs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_ftsuffix, Opt_err};</div><div class='add'>+enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_ftsuffix};</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_ownmask, "ownmask=%o"},</div><div class='del'>-	{Opt_othmask, "othmask=%o"},</div><div class='del'>-	{Opt_ftsuffix, "ftsuffix=%u"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct fs_parameter_spec adfs_param_spec[] = {</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct	("ownmask",	Opt_ownmask),</div><div class='add'>+	fsparam_u32oct	("othmask",	Opt_othmask),</div><div class='add'>+	fsparam_u32	("ftsuffix",	Opt_ftsuffix),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(struct super_block *sb, struct adfs_sb_info *asb,</div><div class='del'>-			 char *options)</div><div class='add'>+static int adfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	int option;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		substring_t args[MAX_OPT_ARGS];</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(args, &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			asb-&gt;s_uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(asb-&gt;s_uid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(args, &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			asb-&gt;s_gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(asb-&gt;s_gid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ownmask:</div><div class='del'>-			if (match_octal(args, &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			asb-&gt;s_owner_mask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_othmask:</div><div class='del'>-			if (match_octal(args, &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			asb-&gt;s_other_mask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ftsuffix:</div><div class='del'>-			if (match_int(args, &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			asb-&gt;s_ftsuffix = option;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			adfs_msg(sb, KERN_ERR,</div><div class='del'>-				 "unrecognised mount option \"%s\" or missing value",</div><div class='del'>-				 p);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	struct adfs_sb_info *asb = fc-&gt;s_fs_info;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, adfs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		asb-&gt;s_uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		asb-&gt;s_gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ownmask:</div><div class='add'>+		asb-&gt;s_owner_mask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_othmask:</div><div class='add'>+		asb-&gt;s_other_mask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ftsuffix:</div><div class='add'>+		asb-&gt;s_ftsuffix = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int adfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int adfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct adfs_sb_info temp_asb;</div><div class='del'>-	int ret;</div><div class='add'>+	struct adfs_sb_info *new_asb = fc-&gt;s_fs_info;</div><div class='add'>+	struct adfs_sb_info *asb = ADFS_SB(fc-&gt;root-&gt;d_sb);</div><div class='ctx'> </div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	*flags |= ADFS_SB_FLAGS;</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	fc-&gt;sb_flags |= ADFS_SB_FLAGS;</div><div class='ctx'> </div><div class='del'>-	temp_asb = *ADFS_SB(sb);</div><div class='del'>-	ret = parse_options(sb, &amp;temp_asb, data);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		*ADFS_SB(sb) = temp_asb;</div><div class='add'>+	/* Structure copy newly parsed options */</div><div class='add'>+	*asb = *new_asb;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int adfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='hunk'>@@ -249,7 +224,7 @@ static int __init init_inodecache(void)</div><div class='ctx'> 	adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",</div><div class='ctx'> 					     sizeof(struct adfs_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (adfs_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -273,7 +248,6 @@ static const struct super_operations adfs_sops = {</div><div class='ctx'> 	.write_inode	= adfs_write_inode,</div><div class='ctx'> 	.put_super	= adfs_put_super,</div><div class='ctx'> 	.statfs		= adfs_statfs,</div><div class='del'>-	.remount_fs	= adfs_remount,</div><div class='ctx'> 	.show_options	= adfs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -361,34 +335,21 @@ static int adfs_validate_dr0(struct super_block *sb, struct buffer_head *bh,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int adfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int adfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct adfs_discrecord *dr;</div><div class='ctx'> 	struct object_info root_obj;</div><div class='del'>-	struct adfs_sb_info *asb;</div><div class='add'>+	struct adfs_sb_info *asb = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_flags |= ADFS_SB_FLAGS;</div><div class='ctx'> </div><div class='del'>-	asb = kzalloc(sizeof(*asb), GFP_KERNEL);</div><div class='del'>-	if (!asb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	sb-&gt;s_fs_info = asb;</div><div class='ctx'> 	sb-&gt;s_magic = ADFS_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_time_gran = 10000000;</div><div class='ctx'> </div><div class='del'>-	/* set default options */</div><div class='del'>-	asb-&gt;s_uid = GLOBAL_ROOT_UID;</div><div class='del'>-	asb-&gt;s_gid = GLOBAL_ROOT_GID;</div><div class='del'>-	asb-&gt;s_owner_mask = ADFS_DEFAULT_OWNER_MASK;</div><div class='del'>-	asb-&gt;s_other_mask = ADFS_DEFAULT_OTHER_MASK;</div><div class='del'>-	asb-&gt;s_ftsuffix = 0;</div><div class='del'>-</div><div class='del'>-	if (parse_options(sb, asb, data))</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='ctx'> 	/* Try to probe the filesystem boot block */</div><div class='ctx'> 	ret = adfs_probe(sb, ADFS_DISCRECORD, 1, adfs_validate_bblk);</div><div class='ctx'> 	if (ret == -EILSEQ)</div><div class='hunk'>@@ -436,7 +397,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (asb-&gt;s_ftsuffix)</div><div class='ctx'> 		asb-&gt;s_namelen += 4;</div><div class='ctx'> </div><div class='del'>-	sb-&gt;s_d_op = &amp;adfs_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;adfs_dentry_operations);</div><div class='ctx'> 	root = adfs_iget(sb, &amp;root_obj);</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root);</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='hunk'>@@ -453,18 +414,61 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *adfs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int adfs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, adfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adfs_free_fc(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, adfs_fill_super);</div><div class='add'>+	struct adfs_context *asb = fc-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	kfree(asb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations adfs_context_ops = {</div><div class='add'>+	.parse_param	= adfs_parse_param,</div><div class='add'>+	.get_tree	= adfs_get_tree,</div><div class='add'>+	.reconfigure	= adfs_reconfigure,</div><div class='add'>+	.free		= adfs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int adfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct adfs_sb_info *asb;</div><div class='add'>+</div><div class='add'>+	asb = kzalloc(sizeof(struct adfs_sb_info), GFP_KERNEL);</div><div class='add'>+	if (!asb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+		struct adfs_sb_info *old_asb = ADFS_SB(sb);</div><div class='add'>+</div><div class='add'>+		/* structure copy existing options before parsing */</div><div class='add'>+		*asb = *old_asb;</div><div class='add'>+	} else {</div><div class='add'>+		/* set default options */</div><div class='add'>+		asb-&gt;s_uid = GLOBAL_ROOT_UID;</div><div class='add'>+		asb-&gt;s_gid = GLOBAL_ROOT_GID;</div><div class='add'>+		asb-&gt;s_owner_mask = ADFS_DEFAULT_OWNER_MASK;</div><div class='add'>+		asb-&gt;s_other_mask = ADFS_DEFAULT_OTHER_MASK;</div><div class='add'>+		asb-&gt;s_ftsuffix = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc-&gt;ops = &amp;adfs_context_ops;</div><div class='add'>+	fc-&gt;s_fs_info = asb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type adfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "adfs",</div><div class='del'>-	.mount		= adfs_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = adfs_init_fs_context,</div><div class='add'>+	.parameters	= adfs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("adfs");</div><div class='ctx'> </div><div class='hunk'>@@ -491,4 +495,5 @@ static void __exit exit_adfs_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_adfs_fs)</div><div class='ctx'> module_exit(exit_adfs_fs)</div><div class='add'>+MODULE_DESCRIPTION("Acorn Disc Filing System");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/affs/affs.h b/fs/affs/affs.h<br/>index 60685ec76d98..ac4e9a02910b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/affs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/affs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/affs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/affs.h</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Ugly macros make the code more pretty. */</div><div class='ctx'> </div><div class='del'>-#define GET_END_PTR(st,p,sz)		 ((st *)((char *)(p)+((sz)-sizeof(st))))</div><div class='del'>-#define AFFS_GET_HASHENTRY(data,hashkey) be32_to_cpu(((struct dir_front *)data)-&gt;hashtable[hashkey])</div><div class='ctx'> #define AFFS_BLOCK(sb, bh, blk)		(AFFS_HEAD(bh)-&gt;table[AFFS_SB(sb)-&gt;s_hashsize-1-(blk)])</div><div class='ctx'> </div><div class='ctx'> #define AFFS_HEAD(bh)		((struct affs_head *)(bh)-&gt;b_data)</div><div class='hunk'>@@ -105,6 +103,7 @@ struct affs_sb_info {</div><div class='ctx'> 	int work_queued;		/* non-zero delayed work is queued */</div><div class='ctx'> 	struct delayed_work sb_work;	/* superblock flush delayed work */</div><div class='ctx'> 	spinlock_t work_lock;		/* protects sb_work and work_queued */</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AFFS_MOUNT_SF_INTL		0x0001 /* International filesystem. */</div><div class='hunk'>@@ -169,7 +168,7 @@ extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, unsi</div><div class='ctx'> extern int	affs_unlink(struct inode *dir, struct dentry *dentry);</div><div class='ctx'> extern int	affs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			struct dentry *dentry, umode_t mode, bool);</div><div class='del'>-extern int	affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+extern struct dentry *affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			struct dentry *dentry, umode_t mode);</div><div class='ctx'> extern int	affs_rmdir(struct inode *dir, struct dentry *dentry);</div><div class='ctx'> extern int	affs_link(struct dentry *olddentry, struct inode *dir,</div><div class='head'>diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h<br/>index 81fb396d4dfa..da3217ab6adb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/amigaffs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/amigaffs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/amigaffs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/amigaffs.h</a></div><div class='hunk'>@@ -49,12 +49,13 @@ struct affs_short_date {</div><div class='ctx'> </div><div class='ctx'> struct affs_root_head {</div><div class='ctx'> 	__be32 ptype;</div><div class='add'>+	/* The following fields are not used, but kept as documentation. */</div><div class='ctx'> 	__be32 spare1;</div><div class='ctx'> 	__be32 spare2;</div><div class='ctx'> 	__be32 hash_size;</div><div class='ctx'> 	__be32 spare3;</div><div class='ctx'> 	__be32 checksum;</div><div class='del'>-	__be32 hashtable[1];</div><div class='add'>+	__be32 hashtable[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct affs_root_tail {</div><div class='hunk'>@@ -80,7 +81,7 @@ struct affs_head {</div><div class='ctx'> 	__be32 spare1;</div><div class='ctx'> 	__be32 first_data;</div><div class='ctx'> 	__be32 checksum;</div><div class='del'>-	__be32 table[1];</div><div class='add'>+	__be32 table[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct affs_tail {</div><div class='hunk'>@@ -108,7 +109,7 @@ struct slink_front</div><div class='ctx'> 	__be32 key;</div><div class='ctx'> 	__be32 spare1[3];</div><div class='ctx'> 	__be32 checksum;</div><div class='del'>-	u8 symname[1];	/* depends on block size */</div><div class='add'>+	u8 symname[];	/* depends on block size */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct affs_data_head</div><div class='hunk'>@@ -119,7 +120,7 @@ struct affs_data_head</div><div class='ctx'> 	__be32 size;</div><div class='ctx'> 	__be32 next;</div><div class='ctx'> 	__be32 checksum;</div><div class='del'>-	u8 data[1];	/* depends on block size */</div><div class='add'>+	u8 data[];	/* depends on block size */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Permission bits */</div><div class='head'>diff --git a/fs/affs/dir.c b/fs/affs/dir.c<br/>index b2bf7016e1b3..bd40d5f08810 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/dir.c</a></div><div class='hunk'>@@ -17,13 +17,44 @@</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='ctx'> #include "affs.h"</div><div class='ctx'> </div><div class='add'>+struct affs_dir_data {</div><div class='add'>+	unsigned long ino;</div><div class='add'>+	u64 cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int affs_readdir(struct file *, struct dir_context *);</div><div class='ctx'> </div><div class='add'>+static loff_t affs_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='add'>+{</div><div class='add'>+	struct affs_dir_data *data = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return generic_llseek_cookie(file, offset, whence, &amp;data-&gt;cookie);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int affs_dir_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct affs_dir_data	*data;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct affs_dir_data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	file-&gt;private_data = data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int affs_dir_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations affs_dir_operations = {</div><div class='add'>+	.open		= affs_dir_open,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='add'>+	.llseek		= affs_dir_llseek,</div><div class='ctx'> 	.iterate_shared	= affs_readdir,</div><div class='ctx'> 	.fsync		= affs_file_fsync,</div><div class='add'>+	.release	= affs_dir_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -45,6 +76,7 @@ static int</div><div class='ctx'> affs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode		*inode = file_inode(file);</div><div class='add'>+	struct affs_dir_data	*data = file-&gt;private_data;</div><div class='ctx'> 	struct super_block	*sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct buffer_head	*dir_bh = NULL;</div><div class='ctx'> 	struct buffer_head	*fh_bh = NULL;</div><div class='hunk'>@@ -59,7 +91,7 @@ affs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	pr_debug("%s(ino=%lu,f_pos=%llx)\n", __func__, inode-&gt;i_ino, ctx-&gt;pos);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;pos &lt; 2) {</div><div class='del'>-		file-&gt;private_data = (void *)0;</div><div class='add'>+		data-&gt;ino = 0;</div><div class='ctx'> 		if (!dir_emit_dots(file, ctx))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -80,8 +112,8 @@ affs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	/* If the directory hasn't changed since the last call to readdir(),</div><div class='ctx'> 	 * we can jump directly to where we left off.</div><div class='ctx'> 	 */</div><div class='del'>-	ino = (u32)(long)file-&gt;private_data;</div><div class='del'>-	if (ino &amp;&amp; inode_eq_iversion(inode, file-&gt;f_version)) {</div><div class='add'>+	ino = data-&gt;ino;</div><div class='add'>+	if (ino &amp;&amp; inode_eq_iversion(inode, data-&gt;cookie)) {</div><div class='ctx'> 		pr_debug("readdir() left off=%d\n", ino);</div><div class='ctx'> 		goto inside;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -131,8 +163,8 @@ inside:</div><div class='ctx'> 		} while (ino);</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='del'>-	file-&gt;f_version = inode_query_iversion(inode);</div><div class='del'>-	file-&gt;private_data = (void *)(long)ino;</div><div class='add'>+	data-&gt;cookie = inode_query_iversion(inode);</div><div class='add'>+	data-&gt;ino = ino;</div><div class='ctx'> 	affs_brelse(fh_bh);</div><div class='ctx'> </div><div class='ctx'> out_brelse_dir:</div><div class='head'>diff --git a/fs/affs/file.c b/fs/affs/file.c<br/>index 04c018e19602..765c3443663e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/file.c</a></div><div class='hunk'>@@ -415,14 +415,14 @@ affs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int affs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int affs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='add'>+			    loff_t pos, unsigned len,</div><div class='add'>+			    struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,</div><div class='add'>+	ret = cont_write_begin(iocb, mapping, pos, len, foliop, fsdata,</div><div class='ctx'> 				affs_get_block,</div><div class='ctx'> 				&amp;AFFS_I(mapping-&gt;host)-&gt;mmu_private);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='hunk'>@@ -431,14 +431,15 @@ static int affs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int affs_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			  loff_t pos, unsigned int len, unsigned int copied,</div><div class='del'>-			  struct page *page, void *fsdata)</div><div class='add'>+static int affs_write_end(const struct kiocb *iocb,</div><div class='add'>+			  struct address_space *mapping, loff_t pos,</div><div class='add'>+			  unsigned int len, unsigned int copied,</div><div class='add'>+			  struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);</div><div class='add'>+	ret = generic_write_end(iocb, mapping, pos, len, copied, folio, fsdata);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear Archived bit on file writes, as AmigaOS would do */</div><div class='ctx'> 	if (AFFS_I(inode)-&gt;i_protect &amp; FIBF_ARCHIVED) {</div><div class='hunk'>@@ -597,7 +598,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)</div><div class='ctx'> 		BUG_ON(tmp &gt; bsize);</div><div class='ctx'> 		AFFS_DATA_HEAD(bh)-&gt;ptype = cpu_to_be32(T_DATA);</div><div class='ctx'> 		AFFS_DATA_HEAD(bh)-&gt;key = cpu_to_be32(inode-&gt;i_ino);</div><div class='del'>-		AFFS_DATA_HEAD(bh)-&gt;sequence = cpu_to_be32(bidx);</div><div class='add'>+		AFFS_DATA_HEAD(bh)-&gt;sequence = cpu_to_be32(bidx + 1);</div><div class='ctx'> 		AFFS_DATA_HEAD(bh)-&gt;size = cpu_to_be32(tmp);</div><div class='ctx'> 		affs_fix_checksum(sb, bh);</div><div class='ctx'> 		bh-&gt;b_state &amp;= ~(1UL &lt;&lt; BH_New);</div><div class='hunk'>@@ -646,9 +647,10 @@ static int affs_read_folio_ofs(struct file *file, struct folio *folio)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int affs_write_begin_ofs(struct file *file, struct address_space *mapping,</div><div class='add'>+static int affs_write_begin_ofs(const struct kiocb *iocb,</div><div class='add'>+				struct address_space *mapping,</div><div class='ctx'> 				loff_t pos, unsigned len,</div><div class='del'>-				struct page **pagep, void **fsdata)</div><div class='add'>+				struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct folio *folio;</div><div class='hunk'>@@ -671,7 +673,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping</div><div class='ctx'> 			mapping_gfp_mask(mapping));</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		return PTR_ERR(folio);</div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_uptodate(folio))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -685,11 +687,11 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int affs_write_end_ofs(struct file *file, struct address_space *mapping,</div><div class='del'>-				loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-				struct page *page, void *fsdata)</div><div class='add'>+static int affs_write_end_ofs(const struct kiocb *iocb,</div><div class='add'>+			      struct address_space *mapping,</div><div class='add'>+			      loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			      struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct buffer_head *bh, *prev_bh;</div><div class='hunk'>@@ -726,7 +728,8 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		tmp = min(bsize - boff, to - from);</div><div class='ctx'> 		BUG_ON(boff + tmp &gt; bsize || tmp &gt; bsize);</div><div class='ctx'> 		memcpy(AFFS_DATA(bh) + boff, data + from, tmp);</div><div class='del'>-		be32_add_cpu(&amp;AFFS_DATA_HEAD(bh)-&gt;size, tmp);</div><div class='add'>+		AFFS_DATA_HEAD(bh)-&gt;size = cpu_to_be32(</div><div class='add'>+			max(boff + tmp, be32_to_cpu(AFFS_DATA_HEAD(bh)-&gt;size)));</div><div class='ctx'> 		affs_fix_checksum(sb, bh);</div><div class='ctx'> 		mark_buffer_dirty_inode(bh, inode);</div><div class='ctx'> 		written += tmp;</div><div class='hunk'>@@ -748,7 +751,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		if (buffer_new(bh)) {</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;ptype = cpu_to_be32(T_DATA);</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;key = cpu_to_be32(inode-&gt;i_ino);</div><div class='del'>-			AFFS_DATA_HEAD(bh)-&gt;sequence = cpu_to_be32(bidx);</div><div class='add'>+			AFFS_DATA_HEAD(bh)-&gt;sequence = cpu_to_be32(bidx + 1);</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;size = cpu_to_be32(bsize);</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;next = 0;</div><div class='ctx'> 			bh-&gt;b_state &amp;= ~(1UL &lt;&lt; BH_New);</div><div class='hunk'>@@ -782,7 +785,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		if (buffer_new(bh)) {</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;ptype = cpu_to_be32(T_DATA);</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;key = cpu_to_be32(inode-&gt;i_ino);</div><div class='del'>-			AFFS_DATA_HEAD(bh)-&gt;sequence = cpu_to_be32(bidx);</div><div class='add'>+			AFFS_DATA_HEAD(bh)-&gt;sequence = cpu_to_be32(bidx + 1);</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;size = cpu_to_be32(tmp);</div><div class='ctx'> 			AFFS_DATA_HEAD(bh)-&gt;next = 0;</div><div class='ctx'> 			bh-&gt;b_state &amp;= ~(1UL &lt;&lt; BH_New);</div><div class='hunk'>@@ -882,14 +885,14 @@ affs_truncate(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_size &gt; AFFS_I(inode)-&gt;mmu_private) {</div><div class='ctx'> 		struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		void *fsdata = NULL;</div><div class='ctx'> 		loff_t isize = inode-&gt;i_size;</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='del'>-		res = mapping-&gt;a_ops-&gt;write_begin(NULL, mapping, isize, 0, &amp;page, &amp;fsdata);</div><div class='add'>+		res = mapping-&gt;a_ops-&gt;write_begin(NULL, mapping, isize, 0, &amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (!res)</div><div class='del'>-			res = mapping-&gt;a_ops-&gt;write_end(NULL, mapping, isize, 0, 0, page, fsdata);</div><div class='add'>+			res = mapping-&gt;a_ops-&gt;write_end(NULL, mapping, isize, 0, 0, folio, fsdata);</div><div class='ctx'> 		else</div><div class='ctx'> 			inode-&gt;i_size = AFFS_I(inode)-&gt;mmu_private;</div><div class='ctx'> 		mark_inode_dirty(inode);</div><div class='hunk'>@@ -1000,7 +1003,7 @@ const struct file_operations affs_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.open		= affs_file_open,</div><div class='ctx'> 	.release	= affs_file_release,</div><div class='ctx'> 	.fsync		= affs_file_fsync,</div><div class='head'>diff --git a/fs/affs/inode.c b/fs/affs/inode.c<br/>index 0210df8d3500..0bfc7d151dcd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/inode.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("affs_iget(%lu)\n", inode-&gt;i_ino);</div><div class='head'>diff --git a/fs/affs/namei.c b/fs/affs/namei.c<br/>index 8c154490a2d6..f883be50db12 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/namei.c</a></div><div class='hunk'>@@ -273,7 +273,7 @@ affs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='add'>+struct dentry *</div><div class='ctx'> affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	   struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -285,7 +285,7 @@ affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	inode = affs_new_inode(dir);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		return -ENOSPC;</div><div class='add'>+		return ERR_PTR(-ENOSPC);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = S_IFDIR | mode;</div><div class='ctx'> 	affs_mode_to_prot(inode);</div><div class='hunk'>@@ -298,9 +298,9 @@ affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		clear_nlink(inode);</div><div class='ctx'> 		mark_inode_dirty(inode);</div><div class='ctx'> 		iput(inode);</div><div class='del'>-		return error;</div><div class='add'>+		return ERR_PTR(error);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='head'>diff --git a/fs/affs/super.c b/fs/affs/super.c<br/>index 58b391446ae1..44f8aa883100 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/affs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/affs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/affs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/affs/super.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='hunk'>@@ -27,7 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> static int affs_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='ctx'> static int affs_show_options(struct seq_file *m, struct dentry *root);</div><div class='del'>-static int affs_remount (struct super_block *sb, int *flags, char *data);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> affs_commit_super(struct super_block *sb, int wait)</div><div class='hunk'>@@ -130,8 +130,7 @@ static int __init init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	affs_inode_cachep = kmem_cache_create("affs_inode_cache",</div><div class='ctx'> 					     sizeof(struct affs_inode_info),</div><div class='del'>-					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+					     0, (SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (affs_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -156,140 +155,114 @@ static const struct super_operations affs_sops = {</div><div class='ctx'> 	.put_super	= affs_put_super,</div><div class='ctx'> 	.sync_fs	= affs_sync_fs,</div><div class='ctx'> 	.statfs		= affs_statfs,</div><div class='del'>-	.remount_fs	= affs_remount,</div><div class='ctx'> 	.show_options	= affs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	Opt_bs, Opt_mode, Opt_mufs, Opt_notruncate, Opt_prefix, Opt_protect,</div><div class='ctx'> 	Opt_reserved, Opt_root, Opt_setgid, Opt_setuid,</div><div class='del'>-	Opt_verbose, Opt_volume, Opt_ignore, Opt_err,</div><div class='add'>+	Opt_verbose, Opt_volume, Opt_ignore,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_bs, "bs=%u"},</div><div class='del'>-	{Opt_mode, "mode=%o"},</div><div class='del'>-	{Opt_mufs, "mufs"},</div><div class='del'>-	{Opt_notruncate, "nofilenametruncate"},</div><div class='del'>-	{Opt_prefix, "prefix=%s"},</div><div class='del'>-	{Opt_protect, "protect"},</div><div class='del'>-	{Opt_reserved, "reserved=%u"},</div><div class='del'>-	{Opt_root, "root=%u"},</div><div class='del'>-	{Opt_setgid, "setgid=%u"},</div><div class='del'>-	{Opt_setuid, "setuid=%u"},</div><div class='del'>-	{Opt_verbose, "verbose"},</div><div class='del'>-	{Opt_volume, "volume=%s"},</div><div class='del'>-	{Opt_ignore, "grpquota"},</div><div class='del'>-	{Opt_ignore, "noquota"},</div><div class='del'>-	{Opt_ignore, "quota"},</div><div class='del'>-	{Opt_ignore, "usrquota"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='add'>+struct affs_context {</div><div class='add'>+	kuid_t		uid;		/* uid to override */</div><div class='add'>+	kgid_t		gid;		/* gid to override */</div><div class='add'>+	unsigned int	mode;		/* mode to override */</div><div class='add'>+	unsigned int	reserved;	/* Number of reserved blocks */</div><div class='add'>+	int		root_block;	/* FFS root block number */</div><div class='add'>+	int		blocksize;	/* Initial device blksize */</div><div class='add'>+	char		*prefix;	/* Prefix for volumes and assigns */</div><div class='add'>+	char		volume[32];	/* Vol. prefix for absolute symlinks */</div><div class='add'>+	unsigned long	mount_flags;	/* Options */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved, s32 *root,</div><div class='del'>-		int *blocksize, char **prefix, char *volume, unsigned long *mount_opts)</div><div class='add'>+static const struct fs_parameter_spec affs_param_spec[] = {</div><div class='add'>+	fsparam_u32	("bs",		Opt_bs),</div><div class='add'>+	fsparam_u32oct	("mode",	Opt_mode),</div><div class='add'>+	fsparam_flag	("mufs",	Opt_mufs),</div><div class='add'>+	fsparam_flag	("nofilenametruncate",	Opt_notruncate),</div><div class='add'>+	fsparam_string	("prefix",	Opt_prefix),</div><div class='add'>+	fsparam_flag	("protect",	Opt_protect),</div><div class='add'>+	fsparam_u32	("reserved",	Opt_reserved),</div><div class='add'>+	fsparam_u32	("root",	Opt_root),</div><div class='add'>+	fsparam_gid	("setgid",	Opt_setgid),</div><div class='add'>+	fsparam_uid	("setuid",	Opt_setuid),</div><div class='add'>+	fsparam_flag	("verbose",	Opt_verbose),</div><div class='add'>+	fsparam_string	("volume",	Opt_volume),</div><div class='add'>+	fsparam_flag	("grpquota",	Opt_ignore),</div><div class='add'>+	fsparam_flag	("noquota",	Opt_ignore),</div><div class='add'>+	fsparam_flag	("quota",	Opt_ignore),</div><div class='add'>+	fsparam_flag	("usrquota",	Opt_ignore),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int affs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-</div><div class='del'>-	/* Fill in defaults */</div><div class='del'>-</div><div class='del'>-	*uid        = current_uid();</div><div class='del'>-	*gid        = current_gid();</div><div class='del'>-	*reserved   = 2;</div><div class='del'>-	*root       = -1;</div><div class='del'>-	*blocksize  = -1;</div><div class='del'>-	volume[0]   = ':';</div><div class='del'>-	volume[1]   = 0;</div><div class='del'>-	*mount_opts = 0;</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token, n, option;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_bs:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;n))</div><div class='del'>-				return 0;</div><div class='del'>-			if (n != 512 &amp;&amp; n != 1024 &amp;&amp; n != 2048</div><div class='del'>-			    &amp;&amp; n != 4096) {</div><div class='del'>-				pr_warn("Invalid blocksize (512, 1024, 2048, 4096 allowed)\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			*blocksize = n;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_mode:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			*mode = option &amp; 0777;</div><div class='del'>-			affs_set_opt(*mount_opts, SF_SETMODE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_mufs:</div><div class='del'>-			affs_set_opt(*mount_opts, SF_MUFS);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_notruncate:</div><div class='del'>-			affs_set_opt(*mount_opts, SF_NO_TRUNCATE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_prefix:</div><div class='del'>-			kfree(*prefix);</div><div class='del'>-			*prefix = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!*prefix)</div><div class='del'>-				return 0;</div><div class='del'>-			affs_set_opt(*mount_opts, SF_PREFIX);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_protect:</div><div class='del'>-			affs_set_opt(*mount_opts, SF_IMMUTABLE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_reserved:</div><div class='del'>-			if (match_int(&amp;args[0], reserved))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_root:</div><div class='del'>-			if (match_int(&amp;args[0], root))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_setgid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			*gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(*gid))</div><div class='del'>-				return 0;</div><div class='del'>-			affs_set_opt(*mount_opts, SF_SETGID);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_setuid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			*uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(*uid))</div><div class='del'>-				return 0;</div><div class='del'>-			affs_set_opt(*mount_opts, SF_SETUID);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_verbose:</div><div class='del'>-			affs_set_opt(*mount_opts, SF_VERBOSE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_volume: {</div><div class='del'>-			char *vol = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!vol)</div><div class='del'>-				return 0;</div><div class='del'>-			strscpy(volume, vol, 32);</div><div class='del'>-			kfree(vol);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case Opt_ignore:</div><div class='del'>-		 	/* Silently ignore the quota options */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_warn("Unrecognized mount option \"%s\" or missing value\n",</div><div class='del'>-				p);</div><div class='del'>-			return 0;</div><div class='add'>+	struct affs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int n;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, affs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_bs:</div><div class='add'>+		n = result.uint_32;</div><div class='add'>+		if (n != 512 &amp;&amp; n != 1024 &amp;&amp; n != 2048</div><div class='add'>+		    &amp;&amp; n != 4096) {</div><div class='add'>+			pr_warn("Invalid blocksize (512, 1024, 2048, 4096 allowed)\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		ctx-&gt;blocksize = n;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mode:</div><div class='add'>+		ctx-&gt;mode = result.uint_32 &amp; 0777;</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_SETMODE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mufs:</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_MUFS);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_notruncate:</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_NO_TRUNCATE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_prefix:</div><div class='add'>+		kfree(ctx-&gt;prefix);</div><div class='add'>+		ctx-&gt;prefix = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_PREFIX);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_protect:</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_IMMUTABLE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_reserved:</div><div class='add'>+		ctx-&gt;reserved = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_root:</div><div class='add'>+		ctx-&gt;root_block = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_setgid:</div><div class='add'>+		ctx-&gt;gid = result.gid;</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_SETGID);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_setuid:</div><div class='add'>+		ctx-&gt;uid = result.uid;</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_SETUID);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_verbose:</div><div class='add'>+		affs_set_opt(ctx-&gt;mount_flags, SF_VERBOSE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_volume:</div><div class='add'>+		strscpy(ctx-&gt;volume, param-&gt;string, 32);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ignore:</div><div class='add'>+		/* Silently ignore the quota options */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int affs_show_options(struct seq_file *m, struct dentry *root)</div><div class='hunk'>@@ -330,27 +303,22 @@ static int affs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'>  * hopefully have the guts to do so. Until then: sorry for the mess.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int affs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int affs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct affs_sb_info	*sbi;</div><div class='add'>+	struct affs_context	*ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct buffer_head	*root_bh = NULL;</div><div class='ctx'> 	struct buffer_head	*boot_bh;</div><div class='ctx'> 	struct inode		*root_inode = NULL;</div><div class='del'>-	s32			 root_block;</div><div class='add'>+	int			 silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	int			 size, blocksize;</div><div class='ctx'> 	u32			 chksum;</div><div class='ctx'> 	int			 num_bm;</div><div class='ctx'> 	int			 i, j;</div><div class='del'>-	kuid_t			 uid;</div><div class='del'>-	kgid_t			 gid;</div><div class='del'>-	int			 reserved;</div><div class='del'>-	unsigned long		 mount_flags;</div><div class='ctx'> 	int			 tmp_flags;	/* fix remount prototype... */</div><div class='ctx'> 	u8			 sig[4];</div><div class='ctx'> 	int			 ret;</div><div class='ctx'> </div><div class='del'>-	pr_debug("read_super(%s)\n", data ? (const char *)data : "no options");</div><div class='del'>-</div><div class='ctx'> 	sb-&gt;s_magic             = AFFS_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op                = &amp;affs_sops;</div><div class='ctx'> 	sb-&gt;s_flags |= SB_NODIRATIME;</div><div class='hunk'>@@ -370,19 +338,16 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;work_lock);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;sbi-&gt;sb_work, flush_superblock);</div><div class='ctx'> </div><div class='del'>-	if (!parse_options(data,&amp;uid,&amp;gid,&amp;i,&amp;reserved,&amp;root_block,</div><div class='del'>-				&amp;blocksize,&amp;sbi-&gt;s_prefix,</div><div class='del'>-				sbi-&gt;s_volume, &amp;mount_flags)) {</div><div class='del'>-		pr_err("Error parsing options\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	/* N.B. after this point s_prefix must be released */</div><div class='add'>+	sbi-&gt;s_flags	= ctx-&gt;mount_flags;</div><div class='add'>+	sbi-&gt;s_mode	= ctx-&gt;mode;</div><div class='add'>+	sbi-&gt;s_uid	= ctx-&gt;uid;</div><div class='add'>+	sbi-&gt;s_gid	= ctx-&gt;gid;</div><div class='add'>+	sbi-&gt;s_reserved	= ctx-&gt;reserved;</div><div class='add'>+	sbi-&gt;s_prefix	= ctx-&gt;prefix;</div><div class='add'>+	ctx-&gt;prefix	= NULL;</div><div class='add'>+	memcpy(sbi-&gt;s_volume, ctx-&gt;volume, 32);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_flags   = mount_flags;</div><div class='del'>-	sbi-&gt;s_mode    = i;</div><div class='del'>-	sbi-&gt;s_uid     = uid;</div><div class='del'>-	sbi-&gt;s_gid     = gid;</div><div class='del'>-	sbi-&gt;s_reserved= reserved;</div><div class='add'>+	/* N.B. after this point s_prefix must be released */</div><div class='ctx'> </div><div class='ctx'> 	/* Get the size of the device in 512-byte blocks.</div><div class='ctx'> 	 * If we later see that the partition uses bigger</div><div class='hunk'>@@ -397,15 +362,16 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	i = bdev_logical_block_size(sb-&gt;s_bdev);</div><div class='ctx'> 	j = PAGE_SIZE;</div><div class='add'>+	blocksize = ctx-&gt;blocksize;</div><div class='ctx'> 	if (blocksize &gt; 0) {</div><div class='ctx'> 		i = j = blocksize;</div><div class='ctx'> 		size = size / (blocksize / 512);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (blocksize = i; blocksize &lt;= j; blocksize &lt;&lt;= 1, size &gt;&gt;= 1) {</div><div class='del'>-		sbi-&gt;s_root_block = root_block;</div><div class='del'>-		if (root_block &lt; 0)</div><div class='del'>-			sbi-&gt;s_root_block = (reserved + size - 1) / 2;</div><div class='add'>+		sbi-&gt;s_root_block = ctx-&gt;root_block;</div><div class='add'>+		if (ctx-&gt;root_block &lt; 0)</div><div class='add'>+			sbi-&gt;s_root_block = (ctx-&gt;reserved + size - 1) / 2;</div><div class='ctx'> 		pr_debug("setting blocksize to %d\n", blocksize);</div><div class='ctx'> 		affs_set_blocksize(sb, blocksize);</div><div class='ctx'> 		sbi-&gt;s_partition_size = size;</div><div class='hunk'>@@ -425,7 +391,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 				"size=%d, reserved=%d\n",</div><div class='ctx'> 				sb-&gt;s_id,</div><div class='ctx'> 				sbi-&gt;s_root_block + num_bm,</div><div class='del'>-				blocksize, size, reserved);</div><div class='add'>+				ctx-&gt;blocksize, size, ctx-&gt;reserved);</div><div class='ctx'> 			root_bh = affs_bread(sb, sbi-&gt;s_root_block + num_bm);</div><div class='ctx'> 			if (!root_bh)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -448,7 +414,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> got_root:</div><div class='ctx'> 	/* Keep super block in cache */</div><div class='ctx'> 	sbi-&gt;s_root_bh = root_bh;</div><div class='del'>-	root_block = sbi-&gt;s_root_block;</div><div class='add'>+	ctx-&gt;root_block = sbi-&gt;s_root_block;</div><div class='ctx'> </div><div class='ctx'> 	/* Find out which kind of FS we have */</div><div class='ctx'> 	boot_bh = sb_bread(sb, 0);</div><div class='hunk'>@@ -507,7 +473,7 @@ got_root:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (affs_test_opt(mount_flags, SF_VERBOSE)) {</div><div class='add'>+	if (affs_test_opt(ctx-&gt;mount_flags, SF_VERBOSE)) {</div><div class='ctx'> 		u8 len = AFFS_ROOT_TAIL(sb, root_bh)-&gt;disk_name[0];</div><div class='ctx'> 		pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",</div><div class='ctx'> 			len &gt; 31 ? 31 : len,</div><div class='hunk'>@@ -529,14 +495,14 @@ got_root:</div><div class='ctx'> </div><div class='ctx'> 	/* set up enough so that it can read an inode */</div><div class='ctx'> </div><div class='del'>-	root_inode = affs_iget(sb, root_block);</div><div class='add'>+	root_inode = affs_iget(sb, ctx-&gt;root_block);</div><div class='ctx'> 	if (IS_ERR(root_inode))</div><div class='ctx'> 		return PTR_ERR(root_inode);</div><div class='ctx'> </div><div class='ctx'> 	if (affs_test_opt(AFFS_SB(sb)-&gt;s_flags, SF_INTL))</div><div class='del'>-		sb-&gt;s_d_op = &amp;affs_intl_dentry_operations;</div><div class='add'>+		set_default_d_op(sb, &amp;affs_intl_dentry_operations);</div><div class='ctx'> 	else</div><div class='del'>-		sb-&gt;s_d_op = &amp;affs_dentry_operations;</div><div class='add'>+		set_default_d_op(sb, &amp;affs_dentry_operations);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root_inode);</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='hunk'>@@ -549,56 +515,43 @@ got_root:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-affs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int affs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct super_block	*sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	struct affs_context	*ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct affs_sb_info	*sbi = AFFS_SB(sb);</div><div class='del'>-	int			 blocksize;</div><div class='del'>-	kuid_t			 uid;</div><div class='del'>-	kgid_t			 gid;</div><div class='del'>-	int			 mode;</div><div class='del'>-	int			 reserved;</div><div class='del'>-	int			 root_block;</div><div class='del'>-	unsigned long		 mount_flags;</div><div class='ctx'> 	int			 res = 0;</div><div class='del'>-	char			 volume[32];</div><div class='del'>-	char			*prefix = NULL;</div><div class='del'>-</div><div class='del'>-	pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data);</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_NODIRATIME;</div><div class='del'>-</div><div class='del'>-	memcpy(volume, sbi-&gt;s_volume, 32);</div><div class='del'>-	if (!parse_options(data, &amp;uid, &amp;gid, &amp;mode, &amp;reserved, &amp;root_block,</div><div class='del'>-			   &amp;blocksize, &amp;prefix, volume,</div><div class='del'>-			   &amp;mount_flags)) {</div><div class='del'>-		kfree(prefix);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	fc-&gt;sb_flags |= SB_NODIRATIME;</div><div class='ctx'> </div><div class='ctx'> 	flush_delayed_work(&amp;sbi-&gt;sb_work);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_flags = mount_flags;</div><div class='del'>-	sbi-&gt;s_mode  = mode;</div><div class='del'>-	sbi-&gt;s_uid   = uid;</div><div class='del'>-	sbi-&gt;s_gid   = gid;</div><div class='add'>+	/*</div><div class='add'>+	 * NB: Historically, only mount_flags, mode, uid, gic, prefix,</div><div class='add'>+	 * and volume are accepted during remount.</div><div class='add'>+	 */</div><div class='add'>+	sbi-&gt;s_flags = ctx-&gt;mount_flags;</div><div class='add'>+	sbi-&gt;s_mode  = ctx-&gt;mode;</div><div class='add'>+	sbi-&gt;s_uid   = ctx-&gt;uid;</div><div class='add'>+	sbi-&gt;s_gid   = ctx-&gt;gid;</div><div class='ctx'> 	/* protect against readers */</div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;symlink_lock);</div><div class='del'>-	if (prefix) {</div><div class='add'>+	if (ctx-&gt;prefix) {</div><div class='ctx'> 		kfree(sbi-&gt;s_prefix);</div><div class='del'>-		sbi-&gt;s_prefix = prefix;</div><div class='add'>+		sbi-&gt;s_prefix = ctx-&gt;prefix;</div><div class='add'>+		ctx-&gt;prefix = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(sbi-&gt;s_volume, volume, 32);</div><div class='add'>+	memcpy(sbi-&gt;s_volume, ctx-&gt;volume, 32);</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;symlink_lock);</div><div class='ctx'> </div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='add'>+	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (*flags &amp; SB_RDONLY)</div><div class='add'>+	if (fc-&gt;sb_flags &amp; SB_RDONLY)</div><div class='ctx'> 		affs_free_bitmap(sb);</div><div class='ctx'> 	else</div><div class='del'>-		res = affs_init_bitmap(sb, flags);</div><div class='add'>+		res = affs_init_bitmap(sb, &amp;fc-&gt;sb_flags);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -625,10 +578,9 @@ affs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *affs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int affs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, affs_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, affs_fill_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void affs_kill_sb(struct super_block *sb)</div><div class='hunk'>@@ -640,16 +592,65 @@ static void affs_kill_sb(struct super_block *sb)</div><div class='ctx'> 		affs_brelse(sbi-&gt;s_root_bh);</div><div class='ctx'> 		kfree(sbi-&gt;s_prefix);</div><div class='ctx'> 		mutex_destroy(&amp;sbi-&gt;s_bmlock);</div><div class='del'>-		kfree(sbi);</div><div class='add'>+		kfree_rcu(sbi, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void affs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct affs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	kfree(ctx-&gt;prefix);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations affs_context_ops = {</div><div class='add'>+	.parse_param	= affs_parse_param,</div><div class='add'>+	.get_tree	= affs_get_tree,</div><div class='add'>+	.reconfigure	= affs_reconfigure,</div><div class='add'>+	.free		= affs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int affs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct affs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct affs_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+		struct affs_sb_info *sbi = AFFS_SB(sb);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * NB: historically, no options other than volume were</div><div class='add'>+		 * preserved across a remount unless they were explicitly</div><div class='add'>+		 * passed in.</div><div class='add'>+		 */</div><div class='add'>+		memcpy(ctx-&gt;volume, sbi-&gt;s_volume, 32);</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;uid	= current_uid();</div><div class='add'>+		ctx-&gt;gid	= current_gid();</div><div class='add'>+		ctx-&gt;reserved	= 2;</div><div class='add'>+		ctx-&gt;root_block	= -1;</div><div class='add'>+		ctx-&gt;blocksize	= -1;</div><div class='add'>+		ctx-&gt;volume[0]	= ':';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc-&gt;ops = &amp;affs_context_ops;</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct file_system_type affs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "affs",</div><div class='del'>-	.mount		= affs_mount,</div><div class='ctx'> 	.kill_sb	= affs_kill_sb,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = affs_init_fs_context,</div><div class='add'>+	.parameters	= affs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("affs");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/Kconfig b/fs/afs/Kconfig<br/>index fc8ba9142f2f..682bd8ec2c10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/Kconfig</a></div><div class='hunk'>@@ -5,6 +5,7 @@ config AFS_FS</div><div class='ctx'> 	select AF_RXRPC</div><div class='ctx'> 	select DNS_RESOLVER</div><div class='ctx'> 	select NETFS_SUPPORT</div><div class='add'>+	select CRYPTO_KRB5</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here, you will get an experimental Andrew File System</div><div class='ctx'> 	  driver. It currently only supports unsecured read-only AFS access.</div><div class='head'>diff --git a/fs/afs/Makefile b/fs/afs/Makefile<br/>index dcdc0f1bb76f..b49b8fe682f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/Makefile</a></div><div class='hunk'>@@ -8,9 +8,11 @@ kafs-y := \</div><div class='ctx'> 	addr_prefs.o \</div><div class='ctx'> 	callback.o \</div><div class='ctx'> 	cell.o \</div><div class='add'>+	cm_security.o \</div><div class='ctx'> 	cmservice.o \</div><div class='ctx'> 	dir.o \</div><div class='ctx'> 	dir_edit.o \</div><div class='add'>+	dir_search.o \</div><div class='ctx'> 	dir_silly.o \</div><div class='ctx'> 	dynroot.o \</div><div class='ctx'> 	file.o \</div><div class='head'>diff --git a/fs/afs/addr_list.c b/fs/afs/addr_list.c<br/>index 6d42f85c6be5..e941da5b6dd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/addr_list.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/addr_list.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/addr_list.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/addr_list.c</a></div><div class='hunk'>@@ -362,3 +362,53 @@ int afs_merge_fs_addr6(struct afs_net *net, struct afs_addr_list *alist,</div><div class='ctx'> 	alist-&gt;nr_addrs++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the app data on the rxrpc peers an address list points to</div><div class='add'>+ */</div><div class='add'>+void afs_set_peer_appdata(struct afs_server *server,</div><div class='add'>+			  struct afs_addr_list *old_alist,</div><div class='add'>+			  struct afs_addr_list *new_alist)</div><div class='add'>+{</div><div class='add'>+	unsigned long data = (unsigned long)server;</div><div class='add'>+	int n = 0, o = 0;</div><div class='add'>+</div><div class='add'>+	if (!old_alist) {</div><div class='add'>+		/* New server.  Just set all. */</div><div class='add'>+		for (; n &lt; new_alist-&gt;nr_addrs; n++)</div><div class='add'>+			rxrpc_kernel_set_peer_data(new_alist-&gt;addrs[n].peer, data);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (!new_alist) {</div><div class='add'>+		/* Dead server.  Just remove all. */</div><div class='add'>+		for (; o &lt; old_alist-&gt;nr_addrs; o++)</div><div class='add'>+			rxrpc_kernel_set_peer_data(old_alist-&gt;addrs[o].peer, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Walk through the two lists simultaneously, setting new peers and</div><div class='add'>+	 * clearing old ones.  The two lists are ordered by pointer to peer</div><div class='add'>+	 * record.</div><div class='add'>+	 */</div><div class='add'>+	while (n &lt; new_alist-&gt;nr_addrs &amp;&amp; o &lt; old_alist-&gt;nr_addrs) {</div><div class='add'>+		struct rxrpc_peer *pn = new_alist-&gt;addrs[n].peer;</div><div class='add'>+		struct rxrpc_peer *po = old_alist-&gt;addrs[o].peer;</div><div class='add'>+</div><div class='add'>+		if (pn == po)</div><div class='add'>+			continue;</div><div class='add'>+		if (pn &lt; po) {</div><div class='add'>+			rxrpc_kernel_set_peer_data(pn, data);</div><div class='add'>+			n++;</div><div class='add'>+		} else {</div><div class='add'>+			rxrpc_kernel_set_peer_data(po, 0);</div><div class='add'>+			o++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n &lt; new_alist-&gt;nr_addrs)</div><div class='add'>+		for (; n &lt; new_alist-&gt;nr_addrs; n++)</div><div class='add'>+			rxrpc_kernel_set_peer_data(new_alist-&gt;addrs[n].peer, data);</div><div class='add'>+	if (o &lt; old_alist-&gt;nr_addrs)</div><div class='add'>+		for (; o &lt; old_alist-&gt;nr_addrs; o++)</div><div class='add'>+			rxrpc_kernel_set_peer_data(old_alist-&gt;addrs[o].peer, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/afs/addr_prefs.c b/fs/afs/addr_prefs.c<br/>index a189ff8a5034..133736412c3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/addr_prefs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/addr_prefs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/addr_prefs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/addr_prefs.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static int afs_split_string(char **pbuf, char *strv[], unsigned int maxstrv)</div><div class='ctx'> 		strv[count++] = p;</div><div class='ctx'> </div><div class='ctx'> 		/* Skip over word */</div><div class='del'>-		while (!isspace(*p))</div><div class='add'>+		while (!isspace(*p) &amp;&amp; *p)</div><div class='ctx'> 			p++;</div><div class='ctx'> 		if (!*p)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -413,8 +413,10 @@ int afs_proc_addr_prefs_write(struct file *file, char *buf, size_t size)</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		argc = afs_split_string(&amp;buf, argv, ARRAY_SIZE(argv));</div><div class='del'>-		if (argc &lt; 0)</div><div class='del'>-			return argc;</div><div class='add'>+		if (argc &lt; 0) {</div><div class='add'>+			ret = argc;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 		if (argc &lt; 2)</div><div class='ctx'> 			goto inval;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/afs.h b/fs/afs/afs.h<br/>index b488072aee87..ec3db00bd081 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/afs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/afs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/afs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/afs.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> </div><div class='del'>-#define AFS_MAXCELLNAME		256  	/* Maximum length of a cell name */</div><div class='add'>+#define AFS_MAXCELLNAME		253  	/* Maximum length of a cell name (DNS limited) */</div><div class='ctx'> #define AFS_MAXVOLNAME		64  	/* Maximum length of a volume name */</div><div class='ctx'> #define AFS_MAXNSERVERS		8   	/* Maximum servers in a basic volume record */</div><div class='ctx'> #define AFS_NMAXNSERVERS	13  	/* Maximum servers in a N/U-class volume record */</div><div class='head'>diff --git a/fs/afs/afs_vl.h b/fs/afs/afs_vl.h<br/>index 9c65ffb8a523..b835e25a2c02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/afs_vl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/afs_vl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/afs_vl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/afs_vl.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #define AFS_VL_PORT		7003	/* volume location service port */</div><div class='ctx'> #define VL_SERVICE		52	/* RxRPC service ID for the Volume Location service */</div><div class='ctx'> #define YFS_VL_SERVICE		2503	/* Service ID for AuriStor upgraded VL service */</div><div class='add'>+#define YFS_VL_MAXCELLNAME	256  	/* Maximum length of a cell name in YFS protocol */</div><div class='ctx'> </div><div class='ctx'> enum AFSVL_Operations {</div><div class='ctx'> 	VLGETENTRYBYID		= 503,	/* AFS Get VLDB entry by ID */</div><div class='hunk'>@@ -134,13 +135,4 @@ struct afs_uvldbentry__xdr {</div><div class='ctx'> 	__be32			spares9;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct afs_address_list {</div><div class='del'>-	refcount_t		usage;</div><div class='del'>-	unsigned int		version;</div><div class='del'>-	unsigned int		nr_addrs;</div><div class='del'>-	struct sockaddr_rxrpc	addrs[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern void afs_put_address_list(struct afs_address_list *alist);</div><div class='del'>-</div><div class='ctx'> #endif /* AFS_VL_H */</div><div class='head'>diff --git a/fs/afs/callback.c b/fs/afs/callback.c<br/>index 99b2c8172021..894d2bad6b6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/callback.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/callback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/callback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/callback.c</a></div><div class='hunk'>@@ -41,8 +41,8 @@ static void afs_volume_init_callback(struct afs_volume *volume)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(vnode, &amp;volume-&gt;open_mmaps, cb_mmap_link) {</div><div class='ctx'> 		if (vnode-&gt;cb_v_check != atomic_read(&amp;volume-&gt;cb_v_break)) {</div><div class='del'>-			atomic64_set(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE);</div><div class='del'>-			queue_work(system_unbound_wq, &amp;vnode-&gt;cb_work);</div><div class='add'>+			afs_clear_cb_promise(vnode, afs_cb_promise_clear_vol_init_cb);</div><div class='add'>+			queue_work(system_dfl_wq, &amp;vnode-&gt;cb_work);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +79,7 @@ void __afs_break_callback(struct afs_vnode *vnode, enum afs_cb_break_reason reas</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(AFS_VNODE_NEW_CONTENT, &amp;vnode-&gt;flags);</div><div class='del'>-	if (atomic64_xchg(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE) != AFS_NO_CB_PROMISE) {</div><div class='add'>+	if (afs_clear_cb_promise(vnode, afs_cb_promise_clear_cb_break)) {</div><div class='ctx'> 		vnode-&gt;cb_break++;</div><div class='ctx'> 		vnode-&gt;cb_v_check = atomic_read(&amp;vnode-&gt;volume-&gt;cb_v_break);</div><div class='ctx'> 		afs_clear_permits(vnode);</div><div class='hunk'>@@ -90,7 +90,7 @@ void __afs_break_callback(struct afs_vnode *vnode, enum afs_cb_break_reason reas</div><div class='ctx'> 		if (reason != afs_cb_break_for_deleted &amp;&amp;</div><div class='ctx'> 		    vnode-&gt;status.type == AFS_FTYPE_FILE &amp;&amp;</div><div class='ctx'> 		    atomic_read(&amp;vnode-&gt;cb_nr_mmap))</div><div class='del'>-			queue_work(system_unbound_wq, &amp;vnode-&gt;cb_work);</div><div class='add'>+			queue_work(system_dfl_wq, &amp;vnode-&gt;cb_work);</div><div class='ctx'> </div><div class='ctx'> 		trace_afs_cb_break(&amp;vnode-&gt;fid, vnode-&gt;cb_break, reason, true);</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/fs/afs/cell.c b/fs/afs/cell.c<br/>index caa09875f520..71c10a05cebe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/cell.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/cell.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/cell.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/cell.c</a></div><div class='hunk'>@@ -20,8 +20,9 @@ static unsigned __read_mostly afs_cell_min_ttl = 10 * 60;</div><div class='ctx'> static unsigned __read_mostly afs_cell_max_ttl = 24 * 60 * 60;</div><div class='ctx'> static atomic_t cell_debug_id;</div><div class='ctx'> </div><div class='del'>-static void afs_queue_cell_manager(struct afs_net *);</div><div class='del'>-static void afs_manage_cell_work(struct work_struct *);</div><div class='add'>+static void afs_cell_timer(struct timer_list *timer);</div><div class='add'>+static void afs_destroy_cell_work(struct work_struct *work);</div><div class='add'>+static void afs_manage_cell_work(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> static void afs_dec_cells_outstanding(struct afs_net *net)</div><div class='ctx'> {</div><div class='hunk'>@@ -29,19 +30,11 @@ static void afs_dec_cells_outstanding(struct afs_net *net)</div><div class='ctx'> 		wake_up_var(&amp;net-&gt;cells_outstanding);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set the cell timer to fire after a given delay, assuming it's not already</div><div class='del'>- * set for an earlier time.</div><div class='del'>- */</div><div class='del'>-static void afs_set_cell_timer(struct afs_net *net, time64_t delay)</div><div class='add'>+static void afs_set_cell_state(struct afs_cell *cell, enum afs_cell_state state)</div><div class='ctx'> {</div><div class='del'>-	if (net-&gt;live) {</div><div class='del'>-		atomic_inc(&amp;net-&gt;cells_outstanding);</div><div class='del'>-		if (timer_reduce(&amp;net-&gt;cells_timer, jiffies + delay * HZ))</div><div class='del'>-			afs_dec_cells_outstanding(net);</div><div class='del'>-	} else {</div><div class='del'>-		afs_queue_cell_manager(net);</div><div class='del'>-	}</div><div class='add'>+	smp_store_release(&amp;cell-&gt;state, state); /* Commit cell changes before state */</div><div class='add'>+	smp_wmb(); /* Set cell state before task state */</div><div class='add'>+	wake_up_var(&amp;cell-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -64,7 +57,8 @@ static struct afs_cell *afs_find_cell_locked(struct afs_net *net,</div><div class='ctx'> 		return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> </div><div class='ctx'> 	if (!name) {</div><div class='del'>-		cell = net-&gt;ws_cell;</div><div class='add'>+		cell = rcu_dereference_protected(net-&gt;ws_cell,</div><div class='add'>+						 lockdep_is_held(&amp;net-&gt;cells_lock));</div><div class='ctx'> 		if (!cell)</div><div class='ctx'> 			return ERR_PTR(-EDESTADDRREQ);</div><div class='ctx'> 		goto found;</div><div class='hunk'>@@ -115,7 +109,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,</div><div class='ctx'> 				       const char *name, unsigned int namelen,</div><div class='ctx'> 				       const char *addresses)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vlserver_list *vllist;</div><div class='add'>+	struct afs_vlserver_list *vllist = NULL;</div><div class='ctx'> 	struct afs_cell *cell;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='hunk'>@@ -146,27 +140,37 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cell-&gt;name = kmalloc(namelen + 1, GFP_KERNEL);</div><div class='add'>+	/* Allocate the cell name and the key name in one go. */</div><div class='add'>+	cell-&gt;name = kmalloc(1 + namelen + 1 +</div><div class='add'>+			     4 + namelen + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!cell-&gt;name) {</div><div class='ctx'> 		kfree(cell);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cell-&gt;net = net;</div><div class='add'>+	cell-&gt;name[0] = '.';</div><div class='add'>+	cell-&gt;name++;</div><div class='ctx'> 	cell-&gt;name_len = namelen;</div><div class='ctx'> 	for (i = 0; i &lt; namelen; i++)</div><div class='ctx'> 		cell-&gt;name[i] = tolower(name[i]);</div><div class='del'>-	cell-&gt;name[i] = 0;</div><div class='add'>+	cell-&gt;name[i++] = 0;</div><div class='ctx'> </div><div class='add'>+	cell-&gt;key_desc = cell-&gt;name + i;</div><div class='add'>+	memcpy(cell-&gt;key_desc, "afs@", 4);</div><div class='add'>+	memcpy(cell-&gt;key_desc + 4, cell-&gt;name, cell-&gt;name_len + 1);</div><div class='add'>+</div><div class='add'>+	cell-&gt;net = net;</div><div class='ctx'> 	refcount_set(&amp;cell-&gt;ref, 1);</div><div class='ctx'> 	atomic_set(&amp;cell-&gt;active, 0);</div><div class='add'>+	INIT_WORK(&amp;cell-&gt;destroyer, afs_destroy_cell_work);</div><div class='ctx'> 	INIT_WORK(&amp;cell-&gt;manager, afs_manage_cell_work);</div><div class='add'>+	timer_setup(&amp;cell-&gt;management_timer, afs_cell_timer, 0);</div><div class='ctx'> 	init_rwsem(&amp;cell-&gt;vs_lock);</div><div class='ctx'> 	cell-&gt;volumes = RB_ROOT;</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;cell-&gt;proc_volumes);</div><div class='ctx'> 	seqlock_init(&amp;cell-&gt;volume_lock);</div><div class='ctx'> 	cell-&gt;fs_servers = RB_ROOT;</div><div class='del'>-	seqlock_init(&amp;cell-&gt;fs_lock);</div><div class='add'>+	init_rwsem(&amp;cell-&gt;fs_lock);</div><div class='ctx'> 	rwlock_init(&amp;cell-&gt;vl_servers_lock);</div><div class='ctx'> 	cell-&gt;flags = (1 &lt;&lt; AFS_CELL_FL_CHECK_ALIAS);</div><div class='ctx'> </div><div class='hunk'>@@ -179,6 +183,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,</div><div class='ctx'> 					      VL_SERVICE, AFS_VL_PORT);</div><div class='ctx'> 		if (IS_ERR(vllist)) {</div><div class='ctx'> 			ret = PTR_ERR(vllist);</div><div class='add'>+			vllist = NULL;</div><div class='ctx'> 			goto parse_failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +206,13 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,</div><div class='ctx'> 	cell-&gt;dns_status = vllist-&gt;status;</div><div class='ctx'> 	smp_store_release(&amp;cell-&gt;dns_lookup_count, 1); /* vs source/status */</div><div class='ctx'> 	atomic_inc(&amp;net-&gt;cells_outstanding);</div><div class='add'>+	ret = idr_alloc_cyclic(&amp;net-&gt;cells_dyn_ino, cell,</div><div class='add'>+			       2, INT_MAX / 2, GFP_KERNEL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	cell-&gt;dynroot_ino = ret;</div><div class='ctx'> 	cell-&gt;debug_id = atomic_inc_return(&amp;cell_debug_id);</div><div class='add'>+</div><div class='ctx'> 	trace_afs_cell(cell-&gt;debug_id, 1, 0, afs_cell_trace_alloc);</div><div class='ctx'> </div><div class='ctx'> 	_leave(" = %p", cell);</div><div class='hunk'>@@ -211,7 +222,8 @@ parse_failed:</div><div class='ctx'> 	if (ret == -EINVAL)</div><div class='ctx'> 		printk(KERN_ERR "kAFS: bad VL server IP address\n");</div><div class='ctx'> error:</div><div class='del'>-	kfree(cell-&gt;name);</div><div class='add'>+	afs_put_vlserverlist(cell-&gt;net, vllist);</div><div class='add'>+	kfree(cell-&gt;name - 1);</div><div class='ctx'> 	kfree(cell);</div><div class='ctx'> 	_leave(" = %d", ret);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -223,7 +235,8 @@ error:</div><div class='ctx'>  * @name:	The name of the cell.</div><div class='ctx'>  * @namesz:	The strlen of the cell name.</div><div class='ctx'>  * @vllist:	A colon/comma separated list of numeric IP addresses or NULL.</div><div class='del'>- * @excl:	T if an error should be given if the cell name already exists.</div><div class='add'>+ * @reason:	The reason we're doing the lookup</div><div class='add'>+ * @trace:	The reason to be logged if the lookup is successful.</div><div class='ctx'>  *</div><div class='ctx'>  * Look up a cell record by name and query the DNS for VL server addresses if</div><div class='ctx'>  * needed.  Note that that actual DNS query is punted off to the manager thread</div><div class='hunk'>@@ -232,19 +245,27 @@ error:</div><div class='ctx'>  */</div><div class='ctx'> struct afs_cell *afs_lookup_cell(struct afs_net *net,</div><div class='ctx'> 				 const char *name, unsigned int namesz,</div><div class='del'>-				 const char *vllist, bool excl)</div><div class='add'>+				 const char *vllist,</div><div class='add'>+				 enum afs_lookup_cell_for reason,</div><div class='add'>+				 enum afs_cell_trace trace)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_cell *cell, *candidate, *cursor;</div><div class='ctx'> 	struct rb_node *parent, **pp;</div><div class='ctx'> 	enum afs_cell_state state;</div><div class='ctx'> 	int ret, n;</div><div class='ctx'> </div><div class='del'>-	_enter("%s,%s", name, vllist);</div><div class='add'>+	_enter("%s,%s,%u", name, vllist, reason);</div><div class='ctx'> </div><div class='del'>-	if (!excl) {</div><div class='del'>-		cell = afs_find_cell(net, name, namesz, afs_cell_trace_use_lookup);</div><div class='del'>-		if (!IS_ERR(cell))</div><div class='add'>+	if (reason != AFS_LOOKUP_CELL_PRELOAD) {</div><div class='add'>+		cell = afs_find_cell(net, name, namesz, trace);</div><div class='add'>+		if (!IS_ERR(cell)) {</div><div class='add'>+			if (reason == AFS_LOOKUP_CELL_DYNROOT)</div><div class='add'>+				goto no_wait;</div><div class='add'>+			if (cell-&gt;state == AFS_CELL_SETTING_UP ||</div><div class='add'>+			    cell-&gt;state == AFS_CELL_UNLOOKED)</div><div class='add'>+				goto lookup_cell;</div><div class='ctx'> 			goto wait_for_cell;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Assume we're probably going to create a cell and preallocate and</div><div class='hunk'>@@ -285,29 +306,74 @@ struct afs_cell *afs_lookup_cell(struct afs_net *net,</div><div class='ctx'> </div><div class='ctx'> 	cell = candidate;</div><div class='ctx'> 	candidate = NULL;</div><div class='del'>-	atomic_set(&amp;cell-&gt;active, 2);</div><div class='del'>-	trace_afs_cell(cell-&gt;debug_id, refcount_read(&amp;cell-&gt;ref), 2, afs_cell_trace_insert);</div><div class='add'>+	afs_use_cell(cell, trace);</div><div class='ctx'> 	rb_link_node_rcu(&amp;cell-&gt;net_node, parent, pp);</div><div class='ctx'> 	rb_insert_color(&amp;cell-&gt;net_node, &amp;net-&gt;cells);</div><div class='ctx'> 	up_write(&amp;net-&gt;cells_lock);</div><div class='ctx'> </div><div class='del'>-	afs_queue_cell(cell, afs_cell_trace_get_queue_new);</div><div class='add'>+lookup_cell:</div><div class='add'>+	if (reason != AFS_LOOKUP_CELL_PRELOAD &amp;&amp;</div><div class='add'>+	    reason != AFS_LOOKUP_CELL_ROOTCELL) {</div><div class='add'>+		set_bit(AFS_CELL_FL_DO_LOOKUP, &amp;cell-&gt;flags);</div><div class='add'>+		afs_queue_cell(cell, afs_cell_trace_queue_new);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> wait_for_cell:</div><div class='del'>-	trace_afs_cell(cell-&gt;debug_id, refcount_read(&amp;cell-&gt;ref), atomic_read(&amp;cell-&gt;active),</div><div class='del'>-		       afs_cell_trace_wait);</div><div class='del'>-	_debug("wait_for_cell");</div><div class='del'>-	wait_var_event(&amp;cell-&gt;state,</div><div class='del'>-		       ({</div><div class='del'>-			       state = smp_load_acquire(&amp;cell-&gt;state); /* vs error */</div><div class='del'>-			       state == AFS_CELL_ACTIVE || state == AFS_CELL_REMOVED;</div><div class='del'>-		       }));</div><div class='add'>+	state = smp_load_acquire(&amp;cell-&gt;state); /* vs error */</div><div class='add'>+	switch (state) {</div><div class='add'>+	case AFS_CELL_ACTIVE:</div><div class='add'>+	case AFS_CELL_DEAD:</div><div class='add'>+		break;</div><div class='add'>+	case AFS_CELL_UNLOOKED:</div><div class='add'>+	default:</div><div class='add'>+		if (reason == AFS_LOOKUP_CELL_PRELOAD ||</div><div class='add'>+		    reason == AFS_LOOKUP_CELL_ROOTCELL)</div><div class='add'>+			break;</div><div class='add'>+		_debug("wait_for_cell");</div><div class='add'>+		afs_see_cell(cell, afs_cell_trace_wait);</div><div class='add'>+		wait_var_event(&amp;cell-&gt;state,</div><div class='add'>+			       ({</div><div class='add'>+				       state = smp_load_acquire(&amp;cell-&gt;state); /* vs error */</div><div class='add'>+				       state == AFS_CELL_ACTIVE || state == AFS_CELL_DEAD;</div><div class='add'>+			       }));</div><div class='add'>+		_debug("waited_for_cell %d %d", cell-&gt;state, cell-&gt;error);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+no_wait:</div><div class='ctx'> 	/* Check the state obtained from the wait check. */</div><div class='del'>-	if (state == AFS_CELL_REMOVED) {</div><div class='add'>+	state = smp_load_acquire(&amp;cell-&gt;state); /* vs error */</div><div class='add'>+	if (state == AFS_CELL_DEAD) {</div><div class='ctx'> 		ret = cell-&gt;error;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='add'>+	if (state == AFS_CELL_ACTIVE) {</div><div class='add'>+		switch (cell-&gt;dns_status) {</div><div class='add'>+		case DNS_LOOKUP_NOT_DONE:</div><div class='add'>+			if (cell-&gt;dns_source == DNS_RECORD_FROM_CONFIG) {</div><div class='add'>+				ret = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			fallthrough;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto error;</div><div class='add'>+		case DNS_LOOKUP_GOOD:</div><div class='add'>+		case DNS_LOOKUP_GOOD_WITH_BAD:</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		case DNS_LOOKUP_GOT_NOT_FOUND:</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			goto error;</div><div class='add'>+		case DNS_LOOKUP_BAD:</div><div class='add'>+			ret = -EREMOTEIO;</div><div class='add'>+			goto error;</div><div class='add'>+		case DNS_LOOKUP_GOT_LOCAL_FAILURE:</div><div class='add'>+		case DNS_LOOKUP_GOT_TEMP_FAILURE:</div><div class='add'>+		case DNS_LOOKUP_GOT_NS_FAILURE:</div><div class='add'>+			ret = -EDESTADDRREQ;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	_leave(" = %p [cell]", cell);</div><div class='ctx'> 	return cell;</div><div class='hunk'>@@ -315,10 +381,10 @@ wait_for_cell:</div><div class='ctx'> cell_already_exists:</div><div class='ctx'> 	_debug("cell exists");</div><div class='ctx'> 	cell = cursor;</div><div class='del'>-	if (excl) {</div><div class='add'>+	if (reason == AFS_LOOKUP_CELL_PRELOAD) {</div><div class='ctx'> 		ret = -EEXIST;</div><div class='ctx'> 	} else {</div><div class='del'>-		afs_use_cell(cursor, afs_cell_trace_use_lookup);</div><div class='add'>+		afs_use_cell(cursor, trace);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	up_write(&amp;net-&gt;cells_lock);</div><div class='hunk'>@@ -328,7 +394,7 @@ cell_already_exists:</div><div class='ctx'> 		goto wait_for_cell;</div><div class='ctx'> 	goto error_noput;</div><div class='ctx'> error:</div><div class='del'>-	afs_unuse_cell(net, cell, afs_cell_trace_unuse_lookup);</div><div class='add'>+	afs_unuse_cell(cell, afs_cell_trace_unuse_lookup_error);</div><div class='ctx'> error_noput:</div><div class='ctx'> 	_leave(" = %d [error]", ret);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -365,8 +431,18 @@ int afs_cell_init(struct afs_net *net, const char *rootcell)</div><div class='ctx'> 		len = cp - rootcell;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* allocate a cell record for the root cell */</div><div class='del'>-	new_root = afs_lookup_cell(net, rootcell, len, vllist, false);</div><div class='add'>+	if (len == 0 || !rootcell[0] || rootcell[0] == '.' || rootcell[len - 1] == '.')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (memchr(rootcell, '/', len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cp = strstr(rootcell, "..");</div><div class='add'>+	if (cp &amp;&amp; cp &lt; rootcell + len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* allocate a cell record for the root/workstation cell */</div><div class='add'>+	new_root = afs_lookup_cell(net, rootcell, len, vllist,</div><div class='add'>+				   AFS_LOOKUP_CELL_ROOTCELL,</div><div class='add'>+				   afs_cell_trace_use_lookup_ws);</div><div class='ctx'> 	if (IS_ERR(new_root)) {</div><div class='ctx'> 		_leave(" = %ld", PTR_ERR(new_root));</div><div class='ctx'> 		return PTR_ERR(new_root);</div><div class='hunk'>@@ -377,12 +453,11 @@ int afs_cell_init(struct afs_net *net, const char *rootcell)</div><div class='ctx'> </div><div class='ctx'> 	/* install the new cell */</div><div class='ctx'> 	down_write(&amp;net-&gt;cells_lock);</div><div class='del'>-	afs_see_cell(new_root, afs_cell_trace_see_ws);</div><div class='del'>-	old_root = net-&gt;ws_cell;</div><div class='del'>-	net-&gt;ws_cell = new_root;</div><div class='add'>+	old_root = rcu_replace_pointer(net-&gt;ws_cell, new_root,</div><div class='add'>+				       lockdep_is_held(&amp;net-&gt;cells_lock));</div><div class='ctx'> 	up_write(&amp;net-&gt;cells_lock);</div><div class='ctx'> </div><div class='del'>-	afs_unuse_cell(net, old_root, afs_cell_trace_unuse_ws);</div><div class='add'>+	afs_unuse_cell(old_root, afs_cell_trace_unuse_ws);</div><div class='ctx'> 	_leave(" = 0");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -500,39 +575,24 @@ static void afs_cell_destroy(struct rcu_head *rcu)</div><div class='ctx'> 	trace_afs_cell(cell-&gt;debug_id, r, atomic_read(&amp;cell-&gt;active), afs_cell_trace_free);</div><div class='ctx'> </div><div class='ctx'> 	afs_put_vlserverlist(net, rcu_access_pointer(cell-&gt;vl_servers));</div><div class='del'>-	afs_unuse_cell(net, cell-&gt;alias_of, afs_cell_trace_unuse_alias);</div><div class='add'>+	afs_unuse_cell(cell-&gt;alias_of, afs_cell_trace_unuse_alias);</div><div class='ctx'> 	key_put(cell-&gt;anonymous_key);</div><div class='del'>-	kfree(cell-&gt;name);</div><div class='add'>+	idr_remove(&amp;net-&gt;cells_dyn_ino, cell-&gt;dynroot_ino);</div><div class='add'>+	kfree(cell-&gt;name - 1);</div><div class='ctx'> 	kfree(cell);</div><div class='ctx'> </div><div class='ctx'> 	afs_dec_cells_outstanding(net);</div><div class='ctx'> 	_leave(" [destroyed]");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Queue the cell manager.</div><div class='del'>- */</div><div class='del'>-static void afs_queue_cell_manager(struct afs_net *net)</div><div class='del'>-{</div><div class='del'>-	int outstanding = atomic_inc_return(&amp;net-&gt;cells_outstanding);</div><div class='del'>-</div><div class='del'>-	_enter("%d", outstanding);</div><div class='del'>-</div><div class='del'>-	if (!queue_work(afs_wq, &amp;net-&gt;cells_manager))</div><div class='del'>-		afs_dec_cells_outstanding(net);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Cell management timer.  We have an increment on cells_outstanding that we</div><div class='del'>- * need to pass along to the work item.</div><div class='del'>- */</div><div class='del'>-void afs_cells_timer(struct timer_list *timer)</div><div class='add'>+static void afs_destroy_cell_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct afs_net *net = container_of(timer, struct afs_net, cells_timer);</div><div class='add'>+	struct afs_cell *cell = container_of(work, struct afs_cell, destroyer);</div><div class='ctx'> </div><div class='del'>-	_enter("");</div><div class='del'>-	if (!queue_work(afs_wq, &amp;net-&gt;cells_manager))</div><div class='del'>-		afs_dec_cells_outstanding(net);</div><div class='add'>+	afs_see_cell(cell, afs_cell_trace_destroy);</div><div class='add'>+	timer_delete_sync(&amp;cell-&gt;management_timer);</div><div class='add'>+	cancel_work_sync(&amp;cell-&gt;manager);</div><div class='add'>+	call_rcu(&amp;cell-&gt;rcu, afs_cell_destroy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -564,7 +624,7 @@ void afs_put_cell(struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='ctx'> 		if (zero) {</div><div class='ctx'> 			a = atomic_read(&amp;cell-&gt;active);</div><div class='ctx'> 			WARN(a != 0, "Cell active count %u &gt; 0\n", a);</div><div class='del'>-			call_rcu(&amp;cell-&gt;rcu, afs_cell_destroy);</div><div class='add'>+			WARN_ON(!queue_work(afs_wq, &amp;cell-&gt;destroyer));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -576,10 +636,9 @@ struct afs_cell *afs_use_cell(struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='ctx'> {</div><div class='ctx'> 	int r, a;</div><div class='ctx'> </div><div class='del'>-	r = refcount_read(&amp;cell-&gt;ref);</div><div class='del'>-	WARN_ON(r == 0);</div><div class='add'>+	__refcount_inc(&amp;cell-&gt;ref, &amp;r);</div><div class='ctx'> 	a = atomic_inc_return(&amp;cell-&gt;active);</div><div class='del'>-	trace_afs_cell(cell-&gt;debug_id, r, a, reason);</div><div class='add'>+	trace_afs_cell(cell-&gt;debug_id, r + 1, a, reason);</div><div class='ctx'> 	return cell;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -587,10 +646,11 @@ struct afs_cell *afs_use_cell(struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='ctx'>  * Record a cell becoming less active.  When the active counter reaches 1, it</div><div class='ctx'>  * is scheduled for destruction, but may get reactivated.</div><div class='ctx'>  */</div><div class='del'>-void afs_unuse_cell(struct afs_net *net, struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='add'>+void afs_unuse_cell(struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int debug_id;</div><div class='ctx'> 	time64_t now, expire_delay;</div><div class='add'>+	bool zero;</div><div class='ctx'> 	int r, a;</div><div class='ctx'> </div><div class='ctx'> 	if (!cell)</div><div class='hunk'>@@ -605,13 +665,15 @@ void afs_unuse_cell(struct afs_net *net, struct afs_cell *cell, enum afs_cell_tr</div><div class='ctx'> 		expire_delay = afs_cell_gc_delay;</div><div class='ctx'> </div><div class='ctx'> 	debug_id = cell-&gt;debug_id;</div><div class='del'>-	r = refcount_read(&amp;cell-&gt;ref);</div><div class='ctx'> 	a = atomic_dec_return(&amp;cell-&gt;active);</div><div class='del'>-	trace_afs_cell(debug_id, r, a, reason);</div><div class='del'>-	WARN_ON(a == 0);</div><div class='del'>-	if (a == 1)</div><div class='add'>+	if (!a)</div><div class='ctx'> 		/* 'cell' may now be garbage collected. */</div><div class='del'>-		afs_set_cell_timer(net, expire_delay);</div><div class='add'>+		afs_set_cell_timer(cell, expire_delay);</div><div class='add'>+</div><div class='add'>+	zero = __refcount_dec_and_test(&amp;cell-&gt;ref, &amp;r);</div><div class='add'>+	trace_afs_cell(debug_id, r - 1, a, reason);</div><div class='add'>+	if (zero)</div><div class='add'>+		WARN_ON(!queue_work(afs_wq, &amp;cell-&gt;destroyer));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -631,36 +693,27 @@ void afs_see_cell(struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='ctx'>  */</div><div class='ctx'> void afs_queue_cell(struct afs_cell *cell, enum afs_cell_trace reason)</div><div class='ctx'> {</div><div class='del'>-	afs_get_cell(cell, reason);</div><div class='del'>-	if (!queue_work(afs_wq, &amp;cell-&gt;manager))</div><div class='del'>-		afs_put_cell(cell, afs_cell_trace_put_queue_fail);</div><div class='add'>+	queue_work(afs_wq, &amp;cell-&gt;manager);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Allocate a key to use as a placeholder for anonymous user security.</div><div class='add'>+ * Cell-specific management timer.</div><div class='ctx'>  */</div><div class='del'>-static int afs_alloc_anon_key(struct afs_cell *cell)</div><div class='add'>+static void afs_cell_timer(struct timer_list *timer)</div><div class='ctx'> {</div><div class='del'>-	struct key *key;</div><div class='del'>-	char keyname[4 + AFS_MAXCELLNAME + 1], *cp, *dp;</div><div class='del'>-</div><div class='del'>-	/* Create a key to represent an anonymous user. */</div><div class='del'>-	memcpy(keyname, "afs@", 4);</div><div class='del'>-	dp = keyname + 4;</div><div class='del'>-	cp = cell-&gt;name;</div><div class='del'>-	do {</div><div class='del'>-		*dp++ = tolower(*cp);</div><div class='del'>-	} while (*cp++);</div><div class='add'>+	struct afs_cell *cell = container_of(timer, struct afs_cell, management_timer);</div><div class='ctx'> </div><div class='del'>-	key = rxrpc_get_null_key(keyname);</div><div class='del'>-	if (IS_ERR(key))</div><div class='del'>-		return PTR_ERR(key);</div><div class='del'>-</div><div class='del'>-	cell-&gt;anonymous_key = key;</div><div class='add'>+	afs_see_cell(cell, afs_cell_trace_see_mgmt_timer);</div><div class='add'>+	if (refcount_read(&amp;cell-&gt;ref) &gt; 0 &amp;&amp; cell-&gt;net-&gt;live)</div><div class='add'>+		queue_work(afs_wq, &amp;cell-&gt;manager);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	_debug("anon key %p{%x}",</div><div class='del'>-	       cell-&gt;anonymous_key, key_serial(cell-&gt;anonymous_key));</div><div class='del'>-	return 0;</div><div class='add'>+/*</div><div class='add'>+ * Set/reduce the cell timer.</div><div class='add'>+ */</div><div class='add'>+void afs_set_cell_timer(struct afs_cell *cell, unsigned int delay_secs)</div><div class='add'>+{</div><div class='add'>+	timer_reduce(&amp;cell-&gt;management_timer, jiffies + delay_secs * HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -672,12 +725,6 @@ static int afs_activate_cell(struct afs_net *net, struct afs_cell *cell)</div><div class='ctx'> 	struct afs_cell *pcell;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!cell-&gt;anonymous_key) {</div><div class='del'>-		ret = afs_alloc_anon_key(cell);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = afs_proc_cell_setup(cell);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -695,7 +742,6 @@ static int afs_activate_cell(struct afs_net *net, struct afs_cell *cell)</div><div class='ctx'> 	if (cell-&gt;proc_link.next)</div><div class='ctx'> 		cell-&gt;proc_link.next-&gt;pprev = &amp;cell-&gt;proc_link.next;</div><div class='ctx'> </div><div class='del'>-	afs_dynroot_mkdir(net, cell);</div><div class='ctx'> 	mutex_unlock(&amp;net-&gt;proc_cells_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -710,242 +756,167 @@ static void afs_deactivate_cell(struct afs_net *net, struct afs_cell *cell)</div><div class='ctx'> 	afs_proc_cell_remove(cell);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;net-&gt;proc_cells_lock);</div><div class='del'>-	hlist_del_rcu(&amp;cell-&gt;proc_link);</div><div class='del'>-	afs_dynroot_rmdir(net, cell);</div><div class='add'>+	if (!hlist_unhashed(&amp;cell-&gt;proc_link))</div><div class='add'>+		hlist_del_rcu(&amp;cell-&gt;proc_link);</div><div class='ctx'> 	mutex_unlock(&amp;net-&gt;proc_cells_lock);</div><div class='ctx'> </div><div class='ctx'> 	_leave("");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool afs_has_cell_expired(struct afs_cell *cell, time64_t *_next_manage)</div><div class='add'>+{</div><div class='add'>+	const struct afs_vlserver_list *vllist;</div><div class='add'>+	time64_t expire_at = cell-&gt;last_inactive;</div><div class='add'>+	time64_t now = ktime_get_real_seconds();</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;cell-&gt;active))</div><div class='add'>+		return false;</div><div class='add'>+	if (!cell-&gt;net-&gt;live)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	vllist = rcu_dereference_protected(cell-&gt;vl_servers, true);</div><div class='add'>+	if (vllist &amp;&amp; vllist-&gt;nr_servers &gt; 0)</div><div class='add'>+		expire_at += afs_cell_gc_delay;</div><div class='add'>+</div><div class='add'>+	if (expire_at &lt;= now)</div><div class='add'>+		return true;</div><div class='add'>+	if (expire_at &lt; *_next_manage)</div><div class='add'>+		*_next_manage = expire_at;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Manage a cell record, initialising and destroying it, maintaining its DNS</div><div class='ctx'>  * records.</div><div class='ctx'>  */</div><div class='del'>-static void afs_manage_cell(struct afs_cell *cell)</div><div class='add'>+static bool afs_manage_cell(struct afs_cell *cell)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_net *net = cell-&gt;net;</div><div class='del'>-	int ret, active;</div><div class='add'>+	time64_t next_manage = TIME64_MAX;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%s", cell-&gt;name);</div><div class='ctx'> </div><div class='del'>-again:</div><div class='ctx'> 	_debug("state %u", cell-&gt;state);</div><div class='ctx'> 	switch (cell-&gt;state) {</div><div class='del'>-	case AFS_CELL_INACTIVE:</div><div class='del'>-	case AFS_CELL_FAILED:</div><div class='del'>-		down_write(&amp;net-&gt;cells_lock);</div><div class='del'>-		active = 1;</div><div class='del'>-		if (atomic_try_cmpxchg_relaxed(&amp;cell-&gt;active, &amp;active, 0)) {</div><div class='del'>-			rb_erase(&amp;cell-&gt;net_node, &amp;net-&gt;cells);</div><div class='del'>-			trace_afs_cell(cell-&gt;debug_id, refcount_read(&amp;cell-&gt;ref), 0,</div><div class='del'>-				       afs_cell_trace_unuse_delete);</div><div class='del'>-			smp_store_release(&amp;cell-&gt;state, AFS_CELL_REMOVED);</div><div class='del'>-		}</div><div class='del'>-		up_write(&amp;net-&gt;cells_lock);</div><div class='del'>-		if (cell-&gt;state == AFS_CELL_REMOVED) {</div><div class='del'>-			wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-			goto final_destruction;</div><div class='del'>-		}</div><div class='del'>-		if (cell-&gt;state == AFS_CELL_FAILED)</div><div class='del'>-			goto done;</div><div class='del'>-		smp_store_release(&amp;cell-&gt;state, AFS_CELL_UNSET);</div><div class='del'>-		wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-		goto again;</div><div class='del'>-</div><div class='del'>-	case AFS_CELL_UNSET:</div><div class='del'>-		smp_store_release(&amp;cell-&gt;state, AFS_CELL_ACTIVATING);</div><div class='del'>-		wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-		goto again;</div><div class='del'>-</div><div class='del'>-	case AFS_CELL_ACTIVATING:</div><div class='del'>-		ret = afs_activate_cell(net, cell);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto activation_failed;</div><div class='add'>+	case AFS_CELL_SETTING_UP:</div><div class='add'>+		goto set_up_cell;</div><div class='add'>+	case AFS_CELL_UNLOOKED:</div><div class='add'>+	case AFS_CELL_ACTIVE:</div><div class='add'>+		goto cell_is_active;</div><div class='add'>+	case AFS_CELL_REMOVING:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return false;</div><div class='add'>+	case AFS_CELL_DEAD:</div><div class='add'>+		return false;</div><div class='add'>+	default:</div><div class='add'>+		_debug("bad state %u", cell-&gt;state);</div><div class='add'>+		WARN_ON_ONCE(1); /* Unhandled state */</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		smp_store_release(&amp;cell-&gt;state, AFS_CELL_ACTIVE);</div><div class='del'>-		wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-		goto again;</div><div class='add'>+set_up_cell:</div><div class='add'>+	ret = afs_activate_cell(net, cell);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		cell-&gt;error = ret;</div><div class='add'>+		goto remove_cell;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case AFS_CELL_ACTIVE:</div><div class='del'>-		if (atomic_read(&amp;cell-&gt;active) &gt; 1) {</div><div class='del'>-			if (test_and_clear_bit(AFS_CELL_FL_DO_LOOKUP, &amp;cell-&gt;flags)) {</div><div class='del'>-				ret = afs_update_cell(cell);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					cell-&gt;error = ret;</div><div class='del'>-			}</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		smp_store_release(&amp;cell-&gt;state, AFS_CELL_DEACTIVATING);</div><div class='del'>-		wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-		goto again;</div><div class='add'>+	afs_set_cell_state(cell, AFS_CELL_UNLOOKED);</div><div class='ctx'> </div><div class='del'>-	case AFS_CELL_DEACTIVATING:</div><div class='del'>-		if (atomic_read(&amp;cell-&gt;active) &gt; 1)</div><div class='del'>-			goto reverse_deactivation;</div><div class='del'>-		afs_deactivate_cell(net, cell);</div><div class='del'>-		smp_store_release(&amp;cell-&gt;state, AFS_CELL_INACTIVE);</div><div class='del'>-		wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-		goto again;</div><div class='add'>+cell_is_active:</div><div class='add'>+	if (afs_has_cell_expired(cell, &amp;next_manage))</div><div class='add'>+		goto remove_cell;</div><div class='ctx'> </div><div class='del'>-	case AFS_CELL_REMOVED:</div><div class='del'>-		goto done;</div><div class='add'>+	if (test_and_clear_bit(AFS_CELL_FL_DO_LOOKUP, &amp;cell-&gt;flags)) {</div><div class='add'>+		ret = afs_update_cell(cell);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			cell-&gt;error = ret;</div><div class='add'>+		if (cell-&gt;state == AFS_CELL_UNLOOKED)</div><div class='add'>+			afs_set_cell_state(cell, AFS_CELL_ACTIVE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	if (next_manage &lt; TIME64_MAX &amp;&amp; cell-&gt;net-&gt;live) {</div><div class='add'>+		time64_t now = ktime_get_real_seconds();</div><div class='add'>+</div><div class='add'>+		if (next_manage - now &lt;= 0)</div><div class='add'>+			afs_queue_cell(cell, afs_cell_trace_queue_again);</div><div class='add'>+		else</div><div class='add'>+			afs_set_cell_timer(cell, next_manage - now);</div><div class='ctx'> 	}</div><div class='del'>-	_debug("bad state %u", cell-&gt;state);</div><div class='del'>-	BUG(); /* Unhandled state */</div><div class='add'>+	_leave(" [done %u]", cell-&gt;state);</div><div class='add'>+	return false;</div><div class='ctx'> </div><div class='del'>-activation_failed:</div><div class='del'>-	cell-&gt;error = ret;</div><div class='del'>-	afs_deactivate_cell(net, cell);</div><div class='add'>+remove_cell:</div><div class='add'>+	down_write(&amp;net-&gt;cells_lock);</div><div class='ctx'> </div><div class='del'>-	smp_store_release(&amp;cell-&gt;state, AFS_CELL_FAILED); /* vs error */</div><div class='del'>-	wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-	goto again;</div><div class='add'>+	if (atomic_read(&amp;cell-&gt;active)) {</div><div class='add'>+		up_write(&amp;net-&gt;cells_lock);</div><div class='add'>+		goto cell_is_active;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-reverse_deactivation:</div><div class='del'>-	smp_store_release(&amp;cell-&gt;state, AFS_CELL_ACTIVE);</div><div class='del'>-	wake_up_var(&amp;cell-&gt;state);</div><div class='del'>-	_leave(" [deact-&gt;act]");</div><div class='del'>-	return;</div><div class='add'>+	/* Make sure that the expiring server records are going to see the fact</div><div class='add'>+	 * that the cell is caput.</div><div class='add'>+	 */</div><div class='add'>+	afs_set_cell_state(cell, AFS_CELL_REMOVING);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	_leave(" [done %u]", cell-&gt;state);</div><div class='del'>-	return;</div><div class='add'>+	afs_deactivate_cell(net, cell);</div><div class='add'>+	afs_purge_servers(cell);</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;cell-&gt;net_node, &amp;net-&gt;cells);</div><div class='add'>+	afs_see_cell(cell, afs_cell_trace_unuse_delete);</div><div class='add'>+	up_write(&amp;net-&gt;cells_lock);</div><div class='ctx'> </div><div class='del'>-final_destruction:</div><div class='ctx'> 	/* The root volume is pinning the cell */</div><div class='ctx'> 	afs_put_volume(cell-&gt;root_volume, afs_volume_trace_put_cell_root);</div><div class='ctx'> 	cell-&gt;root_volume = NULL;</div><div class='del'>-	afs_put_cell(cell, afs_cell_trace_put_destroy);</div><div class='add'>+</div><div class='add'>+	afs_set_cell_state(cell, AFS_CELL_DEAD);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_manage_cell_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_cell *cell = container_of(work, struct afs_cell, manager);</div><div class='add'>+	bool final_put;</div><div class='ctx'> </div><div class='del'>-	afs_manage_cell(cell);</div><div class='del'>-	afs_put_cell(cell, afs_cell_trace_put_queue_work);</div><div class='add'>+	afs_see_cell(cell, afs_cell_trace_manage);</div><div class='add'>+	final_put = afs_manage_cell(cell);</div><div class='add'>+	afs_see_cell(cell, afs_cell_trace_managed);</div><div class='add'>+	if (final_put)</div><div class='add'>+		afs_put_cell(cell, afs_cell_trace_put_final);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Manage the records of cells known to a network namespace.  This includes</div><div class='del'>- * updating the DNS records and garbage collecting unused cells that were</div><div class='del'>- * automatically added.</div><div class='del'>- *</div><div class='del'>- * Note that constructed cell records may only be removed from net-&gt;cells by</div><div class='del'>- * this work item, so it is safe for this work item to stash a cursor pointing</div><div class='del'>- * into the tree and then return to caller (provided it skips cells that are</div><div class='del'>- * still under construction).</div><div class='del'>- *</div><div class='del'>- * Note also that we were given an increment on net-&gt;cells_outstanding by</div><div class='del'>- * whoever queued us that we need to deal with before returning.</div><div class='add'>+ * Purge in-memory cell database.</div><div class='ctx'>  */</div><div class='del'>-void afs_manage_cells(struct work_struct *work)</div><div class='add'>+void afs_cell_purge(struct afs_net *net)</div><div class='ctx'> {</div><div class='del'>-	struct afs_net *net = container_of(work, struct afs_net, cells_manager);</div><div class='add'>+	struct afs_cell *ws;</div><div class='ctx'> 	struct rb_node *cursor;</div><div class='del'>-	time64_t now = ktime_get_real_seconds(), next_manage = TIME64_MAX;</div><div class='del'>-	bool purging = !net-&gt;live;</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='del'>-	/* Trawl the cell database looking for cells that have expired from</div><div class='del'>-	 * lack of use and cells whose DNS results have expired and dispatch</div><div class='del'>-	 * their managers.</div><div class='del'>-	 */</div><div class='del'>-	down_read(&amp;net-&gt;cells_lock);</div><div class='add'>+	down_write(&amp;net-&gt;cells_lock);</div><div class='add'>+	ws = rcu_replace_pointer(net-&gt;ws_cell, NULL,</div><div class='add'>+				 lockdep_is_held(&amp;net-&gt;cells_lock));</div><div class='add'>+	up_write(&amp;net-&gt;cells_lock);</div><div class='add'>+	afs_unuse_cell(ws, afs_cell_trace_unuse_ws);</div><div class='ctx'> </div><div class='add'>+	_debug("kick cells");</div><div class='add'>+	down_read(&amp;net-&gt;cells_lock);</div><div class='ctx'> 	for (cursor = rb_first(&amp;net-&gt;cells); cursor; cursor = rb_next(cursor)) {</div><div class='del'>-		struct afs_cell *cell =</div><div class='del'>-			rb_entry(cursor, struct afs_cell, net_node);</div><div class='del'>-		unsigned active;</div><div class='del'>-		bool sched_cell = false;</div><div class='del'>-</div><div class='del'>-		active = atomic_read(&amp;cell-&gt;active);</div><div class='del'>-		trace_afs_cell(cell-&gt;debug_id, refcount_read(&amp;cell-&gt;ref),</div><div class='del'>-			       active, afs_cell_trace_manage);</div><div class='del'>-</div><div class='del'>-		ASSERTCMP(active, &gt;=, 1);</div><div class='del'>-</div><div class='del'>-		if (purging) {</div><div class='del'>-			if (test_and_clear_bit(AFS_CELL_FL_NO_GC, &amp;cell-&gt;flags)) {</div><div class='del'>-				active = atomic_dec_return(&amp;cell-&gt;active);</div><div class='del'>-				trace_afs_cell(cell-&gt;debug_id, refcount_read(&amp;cell-&gt;ref),</div><div class='del'>-					       active, afs_cell_trace_unuse_pin);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		struct afs_cell *cell = rb_entry(cursor, struct afs_cell, net_node);</div><div class='ctx'> </div><div class='del'>-		if (active == 1) {</div><div class='del'>-			struct afs_vlserver_list *vllist;</div><div class='del'>-			time64_t expire_at = cell-&gt;last_inactive;</div><div class='del'>-</div><div class='del'>-			read_lock(&amp;cell-&gt;vl_servers_lock);</div><div class='del'>-			vllist = rcu_dereference_protected(</div><div class='del'>-				cell-&gt;vl_servers,</div><div class='del'>-				lockdep_is_held(&amp;cell-&gt;vl_servers_lock));</div><div class='del'>-			if (vllist-&gt;nr_servers &gt; 0)</div><div class='del'>-				expire_at += afs_cell_gc_delay;</div><div class='del'>-			read_unlock(&amp;cell-&gt;vl_servers_lock);</div><div class='del'>-			if (purging || expire_at &lt;= now)</div><div class='del'>-				sched_cell = true;</div><div class='del'>-			else if (expire_at &lt; next_manage)</div><div class='del'>-				next_manage = expire_at;</div><div class='del'>-		}</div><div class='add'>+		afs_see_cell(cell, afs_cell_trace_purge);</div><div class='ctx'> </div><div class='del'>-		if (!purging) {</div><div class='del'>-			if (test_bit(AFS_CELL_FL_DO_LOOKUP, &amp;cell-&gt;flags))</div><div class='del'>-				sched_cell = true;</div><div class='del'>-		}</div><div class='add'>+		if (test_and_clear_bit(AFS_CELL_FL_NO_GC, &amp;cell-&gt;flags))</div><div class='add'>+			afs_unuse_cell(cell, afs_cell_trace_unuse_pin);</div><div class='ctx'> </div><div class='del'>-		if (sched_cell)</div><div class='del'>-			afs_queue_cell(cell, afs_cell_trace_get_queue_manage);</div><div class='add'>+		afs_queue_cell(cell, afs_cell_trace_queue_purge);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	up_read(&amp;net-&gt;cells_lock);</div><div class='ctx'> </div><div class='del'>-	/* Update the timer on the way out.  We have to pass an increment on</div><div class='del'>-	 * cells_outstanding in the namespace that we are in to the timer or</div><div class='del'>-	 * the work scheduler.</div><div class='del'>-	 */</div><div class='del'>-	if (!purging &amp;&amp; next_manage &lt; TIME64_MAX) {</div><div class='del'>-		now = ktime_get_real_seconds();</div><div class='del'>-</div><div class='del'>-		if (next_manage - now &lt;= 0) {</div><div class='del'>-			if (queue_work(afs_wq, &amp;net-&gt;cells_manager))</div><div class='del'>-				atomic_inc(&amp;net-&gt;cells_outstanding);</div><div class='del'>-		} else {</div><div class='del'>-			afs_set_cell_timer(net, next_manage - now);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	afs_dec_cells_outstanding(net);</div><div class='del'>-	_leave(" [%d]", atomic_read(&amp;net-&gt;cells_outstanding));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Purge in-memory cell database.</div><div class='del'>- */</div><div class='del'>-void afs_cell_purge(struct afs_net *net)</div><div class='del'>-{</div><div class='del'>-	struct afs_cell *ws;</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='del'>-	down_write(&amp;net-&gt;cells_lock);</div><div class='del'>-	ws = net-&gt;ws_cell;</div><div class='del'>-	net-&gt;ws_cell = NULL;</div><div class='del'>-	up_write(&amp;net-&gt;cells_lock);</div><div class='del'>-	afs_unuse_cell(net, ws, afs_cell_trace_unuse_ws);</div><div class='del'>-</div><div class='del'>-	_debug("del timer");</div><div class='del'>-	if (del_timer_sync(&amp;net-&gt;cells_timer))</div><div class='del'>-		atomic_dec(&amp;net-&gt;cells_outstanding);</div><div class='del'>-</div><div class='del'>-	_debug("kick mgr");</div><div class='del'>-	afs_queue_cell_manager(net);</div><div class='del'>-</div><div class='ctx'> 	_debug("wait");</div><div class='ctx'> 	wait_var_event(&amp;net-&gt;cells_outstanding,</div><div class='ctx'> 		       !atomic_read(&amp;net-&gt;cells_outstanding));</div><div class='head'>diff --git a/fs/afs/cm_security.c b/fs/afs/cm_security.c<br/>new file mode 100644<br/>index 000000000000..edcbd249d202<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/cm_security.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/cm_security.c</a></div><div class='hunk'>@@ -0,0 +1,340 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Cache manager security.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;crypto/krb5.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "afs_cm.h"</div><div class='add'>+#include "afs_fs.h"</div><div class='add'>+#include "protocol_yfs.h"</div><div class='add'>+#define RXRPC_TRACE_ONLY_DEFINE_ENUMS</div><div class='add'>+#include &lt;trace/events/rxrpc.h&gt;</div><div class='add'>+</div><div class='add'>+#define RXGK_SERVER_ENC_TOKEN 1036U // 0x40c</div><div class='add'>+#define xdr_round_up(x) (round_up((x), sizeof(__be32)))</div><div class='add'>+#define xdr_len_object(x) (4 + round_up((x), sizeof(__be32)))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RXGK</div><div class='add'>+static int afs_create_yfs_cm_token(struct sk_buff *challenge,</div><div class='add'>+				   struct afs_server *server);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Respond to an RxGK challenge, adding appdata.</div><div class='add'>+ */</div><div class='add'>+static int afs_respond_to_challenge(struct sk_buff *challenge)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_RXGK</div><div class='add'>+	struct krb5_buffer appdata = {};</div><div class='add'>+	struct afs_server *server;</div><div class='add'>+#endif</div><div class='add'>+	struct rxrpc_peer *peer;</div><div class='add'>+	unsigned long peer_data;</div><div class='add'>+	u16 service_id;</div><div class='add'>+	u8 security_index;</div><div class='add'>+</div><div class='add'>+	rxrpc_kernel_query_challenge(challenge, &amp;peer, &amp;peer_data,</div><div class='add'>+				     &amp;service_id, &amp;security_index);</div><div class='add'>+</div><div class='add'>+	_enter("%u,%u", service_id, security_index);</div><div class='add'>+</div><div class='add'>+	switch (service_id) {</div><div class='add'>+		/* We don't send CM_SERVICE RPCs, so don't expect a challenge</div><div class='add'>+		 * therefrom.</div><div class='add'>+		 */</div><div class='add'>+	case FS_SERVICE:</div><div class='add'>+	case VL_SERVICE:</div><div class='add'>+	case YFS_FS_SERVICE:</div><div class='add'>+	case YFS_VL_SERVICE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warn("Can't respond to unknown challenge %u:%u",</div><div class='add'>+			service_id, security_index);</div><div class='add'>+		return rxrpc_kernel_reject_challenge(challenge, RX_USER_ABORT, -EPROTO,</div><div class='add'>+						     afs_abort_unsupported_sec_class);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (security_index) {</div><div class='add'>+#ifdef CONFIG_RXKAD</div><div class='add'>+	case RXRPC_SECURITY_RXKAD:</div><div class='add'>+		return rxkad_kernel_respond_to_challenge(challenge);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RXGK</div><div class='add'>+	case RXRPC_SECURITY_RXGK:</div><div class='add'>+		return rxgk_kernel_respond_to_challenge(challenge, &amp;appdata);</div><div class='add'>+</div><div class='add'>+	case RXRPC_SECURITY_YFS_RXGK:</div><div class='add'>+		switch (service_id) {</div><div class='add'>+		case FS_SERVICE:</div><div class='add'>+		case YFS_FS_SERVICE:</div><div class='add'>+			server = (struct afs_server *)peer_data;</div><div class='add'>+			if (!server-&gt;cm_rxgk_appdata.data) {</div><div class='add'>+				mutex_lock(&amp;server-&gt;cm_token_lock);</div><div class='add'>+				if (!server-&gt;cm_rxgk_appdata.data)</div><div class='add'>+					afs_create_yfs_cm_token(challenge, server);</div><div class='add'>+				mutex_unlock(&amp;server-&gt;cm_token_lock);</div><div class='add'>+			}</div><div class='add'>+			if (server-&gt;cm_rxgk_appdata.data)</div><div class='add'>+				appdata = server-&gt;cm_rxgk_appdata;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return rxgk_kernel_respond_to_challenge(challenge, &amp;appdata);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return rxrpc_kernel_reject_challenge(challenge, RX_USER_ABORT, -EPROTO,</div><div class='add'>+						     afs_abort_unsupported_sec_class);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process the OOB message queue, processing challenge packets.</div><div class='add'>+ */</div><div class='add'>+void afs_process_oob_queue(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct afs_net *net = container_of(work, struct afs_net, rx_oob_work);</div><div class='add'>+	struct sk_buff *oob;</div><div class='add'>+	enum rxrpc_oob_type type;</div><div class='add'>+</div><div class='add'>+	while ((oob = rxrpc_kernel_dequeue_oob(net-&gt;socket, &amp;type))) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case RXRPC_OOB_CHALLENGE:</div><div class='add'>+			afs_respond_to_challenge(oob);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rxrpc_kernel_free_oob(oob);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RXGK</div><div class='add'>+/*</div><div class='add'>+ * Create a securities keyring for the cache manager and attach a key to it for</div><div class='add'>+ * the RxGK tokens we want to use to secure the callback connection back from</div><div class='add'>+ * the fileserver.</div><div class='add'>+ */</div><div class='add'>+int afs_create_token_key(struct afs_net *net, struct socket *socket)</div><div class='add'>+{</div><div class='add'>+	const struct krb5_enctype *krb5;</div><div class='add'>+	struct key *ring;</div><div class='add'>+	key_ref_t key;</div><div class='add'>+	char K0[32], *desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ring = keyring_alloc("kafs",</div><div class='add'>+			     GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(),</div><div class='add'>+			     KEY_POS_SEARCH | KEY_POS_WRITE |</div><div class='add'>+			     KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH,</div><div class='add'>+			     KEY_ALLOC_NOT_IN_QUOTA,</div><div class='add'>+			     NULL, NULL);</div><div class='add'>+	if (IS_ERR(ring))</div><div class='add'>+		return PTR_ERR(ring);</div><div class='add'>+</div><div class='add'>+	ret = rxrpc_sock_set_security_keyring(socket-&gt;sk, ring);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOPKG;</div><div class='add'>+	krb5 = crypto_krb5_find_enctype(KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96);</div><div class='add'>+	if (!krb5)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(krb5-&gt;key_len &gt; sizeof(K0)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	desc = kasprintf(GFP_KERNEL, "%u:%u:%u:%u",</div><div class='add'>+			 YFS_CM_SERVICE, RXRPC_SECURITY_YFS_RXGK, 1, krb5-&gt;etype);</div><div class='add'>+	if (!desc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	wait_for_random_bytes();</div><div class='add'>+	get_random_bytes(K0, krb5-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	key = key_create(make_key_ref(ring, true),</div><div class='add'>+			 "rxrpc_s", desc,</div><div class='add'>+			 K0, krb5-&gt;key_len,</div><div class='add'>+			 KEY_POS_VIEW | KEY_POS_READ | KEY_POS_SEARCH | KEY_USR_VIEW,</div><div class='add'>+			 KEY_ALLOC_NOT_IN_QUOTA);</div><div class='add'>+	kfree(desc);</div><div class='add'>+	if (IS_ERR(key)) {</div><div class='add'>+		ret = PTR_ERR(key);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	net-&gt;fs_cm_token_key = key_ref_to_ptr(key);</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	key_put(ring);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create an YFS RxGK GSS token to use as a ticket to the specified fileserver.</div><div class='add'>+ */</div><div class='add'>+static int afs_create_yfs_cm_token(struct sk_buff *challenge,</div><div class='add'>+				   struct afs_server *server)</div><div class='add'>+{</div><div class='add'>+	const struct krb5_enctype *conn_krb5, *token_krb5;</div><div class='add'>+	const struct krb5_buffer *token_key;</div><div class='add'>+	struct crypto_aead *aead;</div><div class='add'>+	struct scatterlist sg;</div><div class='add'>+	struct afs_net *net = server-&gt;cell-&gt;net;</div><div class='add'>+	const struct key *key = net-&gt;fs_cm_token_key;</div><div class='add'>+	size_t keysize, uuidsize, authsize, toksize, encsize, contsize, adatasize, offset;</div><div class='add'>+	__be32 caps[1] = {</div><div class='add'>+		[0] = htonl(AFS_CAP_ERROR_TRANSLATION),</div><div class='add'>+	};</div><div class='add'>+	__be32 *xdr;</div><div class='add'>+	void *appdata, *K0, *encbase;</div><div class='add'>+	u32 enctype;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!key)</div><div class='add'>+		return -ENOKEY;</div><div class='add'>+</div><div class='add'>+	/* Assume that the fileserver is happy to use the same encoding type as</div><div class='add'>+	 * we were told to use by the token obtained by the user.</div><div class='add'>+	 */</div><div class='add'>+	enctype = rxgk_kernel_query_challenge(challenge);</div><div class='add'>+</div><div class='add'>+	conn_krb5 = crypto_krb5_find_enctype(enctype);</div><div class='add'>+	if (!conn_krb5)</div><div class='add'>+		return -ENOPKG;</div><div class='add'>+	token_krb5 = key-&gt;payload.data[0];</div><div class='add'>+	token_key = (const struct krb5_buffer *)&amp;key-&gt;payload.data[2];</div><div class='add'>+</div><div class='add'>+	/* struct rxgk_key {</div><div class='add'>+	 *	afs_uint32	enctype;</div><div class='add'>+	 *	opaque		key&lt;&gt;;</div><div class='add'>+	 * };</div><div class='add'>+	 */</div><div class='add'>+	keysize = 4 + xdr_len_object(conn_krb5-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	/* struct RXGK_AuthName {</div><div class='add'>+	 *	afs_int32	kind;</div><div class='add'>+	 *	opaque		data&lt;AUTHDATAMAX&gt;;</div><div class='add'>+	 *	opaque		display&lt;AUTHPRINTABLEMAX&gt;;</div><div class='add'>+	 * };</div><div class='add'>+	 */</div><div class='add'>+	uuidsize = sizeof(server-&gt;uuid);</div><div class='add'>+	authsize = 4 + xdr_len_object(uuidsize) + xdr_len_object(0);</div><div class='add'>+</div><div class='add'>+	/* struct RXGK_Token {</div><div class='add'>+	 *	rxgk_key		K0;</div><div class='add'>+	 *	RXGK_Level		level;</div><div class='add'>+	 *	rxgkTime		starttime;</div><div class='add'>+	 *	afs_int32		lifetime;</div><div class='add'>+	 *	afs_int32		bytelife;</div><div class='add'>+	 *	rxgkTime		expirationtime;</div><div class='add'>+	 *	struct RXGK_AuthName	identities&lt;&gt;;</div><div class='add'>+	 * };</div><div class='add'>+	 */</div><div class='add'>+	toksize = keysize + 8 + 4 + 4 + 8 + xdr_len_object(authsize);</div><div class='add'>+</div><div class='add'>+	offset = 0;</div><div class='add'>+	encsize = crypto_krb5_how_much_buffer(token_krb5, KRB5_ENCRYPT_MODE, toksize, &amp;offset);</div><div class='add'>+</div><div class='add'>+	/* struct RXGK_TokenContainer {</div><div class='add'>+	 *	afs_int32	kvno;</div><div class='add'>+	 *	afs_int32	enctype;</div><div class='add'>+	 *	opaque		encrypted_token&lt;&gt;;</div><div class='add'>+	 * };</div><div class='add'>+	 */</div><div class='add'>+	contsize = 4 + 4 + xdr_len_object(encsize);</div><div class='add'>+</div><div class='add'>+	/* struct YFSAppData {</div><div class='add'>+	 *	opr_uuid	initiatorUuid;</div><div class='add'>+	 *	opr_uuid	acceptorUuid;</div><div class='add'>+	 *	Capabilities	caps;</div><div class='add'>+	 *	afs_int32	enctype;</div><div class='add'>+	 *	opaque		callbackKey&lt;&gt;;</div><div class='add'>+	 *	opaque		callbackToken&lt;&gt;;</div><div class='add'>+	 * };</div><div class='add'>+	 */</div><div class='add'>+	adatasize = 16 + 16 +</div><div class='add'>+		xdr_len_object(sizeof(caps)) +</div><div class='add'>+		4 +</div><div class='add'>+		xdr_len_object(conn_krb5-&gt;key_len) +</div><div class='add'>+		xdr_len_object(contsize);</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	appdata = kzalloc(adatasize, GFP_KERNEL);</div><div class='add'>+	if (!appdata)</div><div class='add'>+		goto out;</div><div class='add'>+	xdr = appdata;</div><div class='add'>+</div><div class='add'>+	memcpy(xdr, &amp;net-&gt;uuid, 16);		/* appdata.initiatorUuid */</div><div class='add'>+	xdr += 16 / 4;</div><div class='add'>+	memcpy(xdr, &amp;server-&gt;uuid, 16);		/* appdata.acceptorUuid */</div><div class='add'>+	xdr += 16 / 4;</div><div class='add'>+	*xdr++ = htonl(ARRAY_SIZE(caps));	/* appdata.caps.len */</div><div class='add'>+	memcpy(xdr, &amp;caps, sizeof(caps));	/* appdata.caps */</div><div class='add'>+	xdr += ARRAY_SIZE(caps);</div><div class='add'>+	*xdr++ = htonl(conn_krb5-&gt;etype);	/* appdata.enctype */</div><div class='add'>+</div><div class='add'>+	*xdr++ = htonl(conn_krb5-&gt;key_len);	/* appdata.callbackKey.len */</div><div class='add'>+	K0 = xdr;</div><div class='add'>+	get_random_bytes(K0, conn_krb5-&gt;key_len); /* appdata.callbackKey.data */</div><div class='add'>+	xdr += xdr_round_up(conn_krb5-&gt;key_len) / 4;</div><div class='add'>+</div><div class='add'>+	*xdr++ = htonl(contsize);		/* appdata.callbackToken.len */</div><div class='add'>+	*xdr++ = htonl(1);			/* cont.kvno */</div><div class='add'>+	*xdr++ = htonl(token_krb5-&gt;etype);	/* cont.enctype */</div><div class='add'>+	*xdr++ = htonl(encsize);		/* cont.encrypted_token.len */</div><div class='add'>+</div><div class='add'>+	encbase = xdr;</div><div class='add'>+	xdr += offset / 4;</div><div class='add'>+	*xdr++ = htonl(conn_krb5-&gt;etype);	/* token.K0.enctype */</div><div class='add'>+	*xdr++ = htonl(conn_krb5-&gt;key_len);	/* token.K0.key.len */</div><div class='add'>+	memcpy(xdr, K0, conn_krb5-&gt;key_len);	/* token.K0.key.data */</div><div class='add'>+	xdr += xdr_round_up(conn_krb5-&gt;key_len) / 4;</div><div class='add'>+</div><div class='add'>+	*xdr++ = htonl(RXRPC_SECURITY_ENCRYPT);	/* token.level */</div><div class='add'>+	*xdr++ = htonl(0);			/* token.starttime */</div><div class='add'>+	*xdr++ = htonl(0);			/* " */</div><div class='add'>+	*xdr++ = htonl(0);			/* token.lifetime */</div><div class='add'>+	*xdr++ = htonl(0);			/* token.bytelife */</div><div class='add'>+	*xdr++ = htonl(0);			/* token.expirationtime */</div><div class='add'>+	*xdr++ = htonl(0);			/* " */</div><div class='add'>+	*xdr++ = htonl(1);			/* token.identities.count */</div><div class='add'>+	*xdr++ = htonl(0);			/* token.identities[0].kind */</div><div class='add'>+	*xdr++ = htonl(uuidsize);		/* token.identities[0].data.len */</div><div class='add'>+	memcpy(xdr, &amp;server-&gt;uuid, uuidsize);</div><div class='add'>+	xdr += xdr_round_up(uuidsize) / 4;</div><div class='add'>+	*xdr++ = htonl(0);			/* token.identities[0].display.len */</div><div class='add'>+</div><div class='add'>+	xdr = encbase + xdr_round_up(encsize);</div><div class='add'>+</div><div class='add'>+	if ((unsigned long)xdr - (unsigned long)appdata != adatasize)</div><div class='add'>+		pr_err("Appdata size incorrect %lx != %zx\n",</div><div class='add'>+		       (unsigned long)xdr - (unsigned long)appdata, adatasize);</div><div class='add'>+</div><div class='add'>+	aead = crypto_krb5_prepare_encryption(token_krb5, token_key, RXGK_SERVER_ENC_TOKEN,</div><div class='add'>+					      GFP_KERNEL);</div><div class='add'>+	if (IS_ERR(aead)) {</div><div class='add'>+		ret = PTR_ERR(aead);</div><div class='add'>+		goto out_token;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg, encbase, encsize);</div><div class='add'>+	ret = crypto_krb5_encrypt(token_krb5, aead, &amp;sg, 1, encsize, offset, toksize, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_aead;</div><div class='add'>+</div><div class='add'>+	server-&gt;cm_rxgk_appdata.len  = adatasize;</div><div class='add'>+	server-&gt;cm_rxgk_appdata.data = appdata;</div><div class='add'>+	appdata = NULL;</div><div class='add'>+</div><div class='add'>+out_aead:</div><div class='add'>+	crypto_free_aead(aead);</div><div class='add'>+out_token:</div><div class='add'>+	kfree(appdata);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_RXGK */</div><div class='head'>diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c<br/>index 99a3f20bc786..1a906805a9e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/cmservice.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/cmservice.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/cmservice.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/cmservice.c</a></div><div class='hunk'>@@ -139,49 +139,6 @@ bool afs_cm_incoming_call(struct afs_call *call)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Find the server record by peer address and record a probe to the cache</div><div class='del'>- * manager from a server.</div><div class='del'>- */</div><div class='del'>-static int afs_find_cm_server_by_peer(struct afs_call *call)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_rxrpc srx;</div><div class='del'>-	struct afs_server *server;</div><div class='del'>-	struct rxrpc_peer *peer;</div><div class='del'>-</div><div class='del'>-	peer = rxrpc_kernel_get_call_peer(call-&gt;net-&gt;socket, call-&gt;rxcall);</div><div class='del'>-</div><div class='del'>-	server = afs_find_server(call-&gt;net, peer);</div><div class='del'>-	if (!server) {</div><div class='del'>-		trace_afs_cm_no_server(call, &amp;srx);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	call-&gt;server = server;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find the server record by server UUID and record a probe to the cache</div><div class='del'>- * manager from a server.</div><div class='del'>- */</div><div class='del'>-static int afs_find_cm_server_by_uuid(struct afs_call *call,</div><div class='del'>-				      struct afs_uuid *uuid)</div><div class='del'>-{</div><div class='del'>-	struct afs_server *server;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	server = afs_find_server_by_uuid(call-&gt;net, call-&gt;request);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (!server) {</div><div class='del'>-		trace_afs_cm_no_server_u(call, call-&gt;request);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	call-&gt;server = server;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Clean up a cache manager call.</div><div class='ctx'>  */</div><div class='ctx'> static void afs_cm_destructor(struct afs_call *call)</div><div class='hunk'>@@ -322,10 +279,7 @@ static int afs_deliver_cb_callback(struct afs_call *call)</div><div class='ctx'> </div><div class='ctx'> 	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))</div><div class='ctx'> 		return afs_io_error(call, afs_io_error_cm_reply);</div><div class='del'>-</div><div class='del'>-	/* we'll need the file server record as that tells us which set of</div><div class='del'>-	 * vnodes to operate upon */</div><div class='del'>-	return afs_find_cm_server_by_peer(call);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -349,18 +303,10 @@ static void SRXAFSCB_InitCallBackState(struct work_struct *work)</div><div class='ctx'>  */</div><div class='ctx'> static int afs_deliver_cb_init_call_back_state(struct afs_call *call)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	afs_extract_discard(call, 0);</div><div class='del'>-	ret = afs_extract_data(call, false);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* we'll need the file server record as that tells us which set of</div><div class='del'>-	 * vnodes to operate upon */</div><div class='del'>-	return afs_find_cm_server_by_peer(call);</div><div class='add'>+	return afs_extract_data(call, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -373,8 +319,6 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)</div><div class='ctx'> 	__be32 *b;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='ctx'> 	_enter("{%u}", call-&gt;unmarshall);</div><div class='ctx'> </div><div class='ctx'> 	switch (call-&gt;unmarshall) {</div><div class='hunk'>@@ -421,9 +365,13 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)</div><div class='ctx'> 	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))</div><div class='ctx'> 		return afs_io_error(call, afs_io_error_cm_reply);</div><div class='ctx'> </div><div class='del'>-	/* we'll need the file server record as that tells us which set of</div><div class='del'>-	 * vnodes to operate upon */</div><div class='del'>-	return afs_find_cm_server_by_uuid(call, call-&gt;request);</div><div class='add'>+	if (memcmp(call-&gt;request, &amp;call-&gt;server-&gt;_uuid, sizeof(call-&gt;server-&gt;_uuid)) != 0) {</div><div class='add'>+		pr_notice("Callback UUID does not match fileserver UUID\n");</div><div class='add'>+		trace_afs_cm_no_server_u(call, call-&gt;request);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -455,7 +403,7 @@ static int afs_deliver_cb_probe(struct afs_call *call)</div><div class='ctx'> </div><div class='ctx'> 	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))</div><div class='ctx'> 		return afs_io_error(call, afs_io_error_cm_reply);</div><div class='del'>-	return afs_find_cm_server_by_peer(call);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -533,7 +481,7 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call)</div><div class='ctx'> </div><div class='ctx'> 	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))</div><div class='ctx'> 		return afs_io_error(call, afs_io_error_cm_reply);</div><div class='del'>-	return afs_find_cm_server_by_peer(call);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -593,7 +541,7 @@ static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *call)</div><div class='ctx'> </div><div class='ctx'> 	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))</div><div class='ctx'> 		return afs_io_error(call, afs_io_error_cm_reply);</div><div class='del'>-	return afs_find_cm_server_by_peer(call);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -667,9 +615,5 @@ static int afs_deliver_yfs_cb_callback(struct afs_call *call)</div><div class='ctx'> </div><div class='ctx'> 	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))</div><div class='ctx'> 		return afs_io_error(call, afs_io_error_cm_reply);</div><div class='del'>-</div><div class='del'>-	/* We'll need the file server record as that tells us which set of</div><div class='del'>-	 * vnodes to operate upon.</div><div class='del'>-	 */</div><div class='del'>-	return afs_find_cm_server_by_peer(call);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/afs/dir.c b/fs/afs/dir.c<br/>index c14533ef108f..f4e9e12373ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/dir.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/iversion.h&gt;</div><div class='add'>+#include &lt;linux/iov_iter.h&gt;</div><div class='ctx'> #include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "afs_fs.h"</div><div class='hunk'>@@ -21,7 +23,8 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 				 unsigned int flags);</div><div class='ctx'> static int afs_dir_open(struct inode *inode, struct file *file);</div><div class='ctx'> static int afs_readdir(struct file *file, struct dir_context *ctx);</div><div class='del'>-static int afs_d_revalidate(struct dentry *dentry, unsigned int flags);</div><div class='add'>+static int afs_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			    struct dentry *dentry, unsigned int flags);</div><div class='ctx'> static int afs_d_delete(const struct dentry *dentry);</div><div class='ctx'> static void afs_d_iput(struct dentry *dentry, struct inode *inode);</div><div class='ctx'> static bool afs_lookup_one_filldir(struct dir_context *ctx, const char *name, int nlen,</div><div class='hunk'>@@ -30,8 +33,8 @@ static bool afs_lookup_filldir(struct dir_context *ctx, const char *name, int nl</div><div class='ctx'> 			      loff_t fpos, u64 ino, unsigned dtype);</div><div class='ctx'> static int afs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		      struct dentry *dentry, umode_t mode, bool excl);</div><div class='del'>-static int afs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		     struct dentry *dentry, umode_t mode);</div><div class='add'>+static struct dentry *afs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				struct dentry *dentry, umode_t mode);</div><div class='ctx'> static int afs_rmdir(struct inode *dir, struct dentry *dentry);</div><div class='ctx'> static int afs_unlink(struct inode *dir, struct dentry *dentry);</div><div class='ctx'> static int afs_link(struct dentry *from, struct inode *dir,</div><div class='hunk'>@@ -41,15 +44,6 @@ static int afs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 		      struct dentry *old_dentry, struct inode *new_dir,</div><div class='ctx'> 		      struct dentry *new_dentry, unsigned int flags);</div><div class='del'>-static bool afs_dir_release_folio(struct folio *folio, gfp_t gfp_flags);</div><div class='del'>-static void afs_dir_invalidate_folio(struct folio *folio, size_t offset,</div><div class='del'>-				   size_t length);</div><div class='del'>-</div><div class='del'>-static bool afs_dir_dirty_folio(struct address_space *mapping,</div><div class='del'>-		struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	BUG(); /* This should never happen. */</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> const struct file_operations afs_dir_file_operations = {</div><div class='ctx'> 	.open		= afs_dir_open,</div><div class='hunk'>@@ -74,10 +68,7 @@ const struct inode_operations afs_dir_inode_operations = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations afs_dir_aops = {</div><div class='del'>-	.dirty_folio	= afs_dir_dirty_folio,</div><div class='del'>-	.release_folio	= afs_dir_release_folio,</div><div class='del'>-	.invalidate_folio = afs_dir_invalidate_folio,</div><div class='del'>-	.migrate_folio	= filemap_migrate_folio,</div><div class='add'>+	.writepages	= afs_single_writepages,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct dentry_operations afs_fs_dentry_operations = {</div><div class='hunk'>@@ -98,152 +89,124 @@ struct afs_lookup_one_cookie {</div><div class='ctx'> struct afs_lookup_cookie {</div><div class='ctx'> 	struct dir_context	ctx;</div><div class='ctx'> 	struct qstr		name;</div><div class='del'>-	bool			found;</div><div class='del'>-	bool			one_only;</div><div class='ctx'> 	unsigned short		nr_fids;</div><div class='ctx'> 	struct afs_fid		fids[50];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void afs_dir_unuse_cookie(struct afs_vnode *dvnode, int ret)</div><div class='add'>+{</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		struct afs_vnode_cache_aux aux;</div><div class='add'>+		loff_t i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+</div><div class='add'>+		afs_set_cache_aux(dvnode, &amp;aux);</div><div class='add'>+		fscache_unuse_cookie(afs_vnode_cache(dvnode), &amp;aux, &amp;i_size);</div><div class='add'>+	} else {</div><div class='add'>+		fscache_unuse_cookie(afs_vnode_cache(dvnode), NULL, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Drop the refs that we're holding on the folios we were reading into.  We've</div><div class='del'>- * got refs on the first nr_pages pages.</div><div class='add'>+ * Iterate through a kmapped directory segment, dumping a summary of</div><div class='add'>+ * the contents.</div><div class='ctx'>  */</div><div class='del'>-static void afs_dir_read_cleanup(struct afs_read *req)</div><div class='add'>+static size_t afs_dir_dump_step(void *iter_base, size_t progress, size_t len,</div><div class='add'>+				void *priv, void *priv2)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = req-&gt;vnode-&gt;netfs.inode.i_mapping;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t last = req-&gt;nr_pages - 1;</div><div class='add'>+	do {</div><div class='add'>+		union afs_xdr_dir_block *block = iter_base;</div><div class='ctx'> </div><div class='del'>-	XA_STATE(xas, &amp;mapping-&gt;i_pages, 0);</div><div class='add'>+		pr_warn("[%05zx] %32phN\n", progress, block);</div><div class='add'>+		iter_base += AFS_DIR_BLOCK_SIZE;</div><div class='add'>+		progress += AFS_DIR_BLOCK_SIZE;</div><div class='add'>+		len -= AFS_DIR_BLOCK_SIZE;</div><div class='add'>+	} while (len &gt; 0);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!req-&gt;nr_pages))</div><div class='del'>-		return;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	xas_for_each(&amp;xas, folio, last) {</div><div class='del'>-		if (xas_retry(&amp;xas, folio))</div><div class='del'>-			continue;</div><div class='del'>-		BUG_ON(xa_is_value(folio));</div><div class='del'>-		ASSERTCMP(folio_file_mapping(folio), ==, mapping);</div><div class='add'>+/*</div><div class='add'>+ * Dump the contents of a directory.</div><div class='add'>+ */</div><div class='add'>+static void afs_dir_dump(struct afs_vnode *dvnode)</div><div class='add'>+{</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	unsigned long long i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='ctx'> </div><div class='del'>-		folio_put(folio);</div><div class='del'>-	}</div><div class='add'>+	pr_warn("DIR %llx:%llx is=%llx\n",</div><div class='add'>+		dvnode-&gt;fid.vid, dvnode-&gt;fid.vnode, i_size);</div><div class='ctx'> </div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	iov_iter_folio_queue(&amp;iter, ITER_SOURCE, dvnode-&gt;directory, 0, 0, i_size);</div><div class='add'>+	iterate_folioq(&amp;iter, iov_iter_count(&amp;iter), NULL, NULL,</div><div class='add'>+		       afs_dir_dump_step);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * check that a directory folio is valid</div><div class='ctx'>  */</div><div class='del'>-static bool afs_dir_check_folio(struct afs_vnode *dvnode, struct folio *folio,</div><div class='del'>-				loff_t i_size)</div><div class='add'>+static bool afs_dir_check_block(struct afs_vnode *dvnode, size_t progress,</div><div class='add'>+				union afs_xdr_dir_block *block)</div><div class='ctx'> {</div><div class='del'>-	union afs_xdr_dir_block *block;</div><div class='del'>-	size_t offset, size;</div><div class='del'>-	loff_t pos;</div><div class='add'>+	if (block-&gt;hdr.magic != AFS_DIR_MAGIC) {</div><div class='add'>+		pr_warn("%s(%lx): [%zx] bad magic %04x\n",</div><div class='add'>+		       __func__, dvnode-&gt;netfs.inode.i_ino,</div><div class='add'>+		       progress, ntohs(block-&gt;hdr.magic));</div><div class='add'>+		trace_afs_dir_check_failed(dvnode, progress);</div><div class='add'>+		trace_afs_file_error(dvnode, -EIO, afs_file_error_dir_bad_magic);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Determine how many magic numbers there should be in this folio, but</div><div class='del'>-	 * we must take care because the directory may change size under us.</div><div class='add'>+	/* Make sure each block is NUL terminated so we can reasonably</div><div class='add'>+	 * use string functions on it.  The filenames in the folio</div><div class='add'>+	 * *should* be NUL-terminated anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	pos = folio_pos(folio);</div><div class='del'>-	if (i_size &lt;= pos)</div><div class='del'>-		goto checked;</div><div class='del'>-</div><div class='del'>-	size = min_t(loff_t, folio_size(folio), i_size - pos);</div><div class='del'>-	for (offset = 0; offset &lt; size; offset += sizeof(*block)) {</div><div class='del'>-		block = kmap_local_folio(folio, offset);</div><div class='del'>-		if (block-&gt;hdr.magic != AFS_DIR_MAGIC) {</div><div class='del'>-			printk("kAFS: %s(%lx): [%llx] bad magic %zx/%zx is %04hx\n",</div><div class='del'>-			       __func__, dvnode-&gt;netfs.inode.i_ino,</div><div class='del'>-			       pos, offset, size, ntohs(block-&gt;hdr.magic));</div><div class='del'>-			trace_afs_dir_check_failed(dvnode, pos + offset, i_size);</div><div class='del'>-			kunmap_local(block);</div><div class='del'>-			trace_afs_file_error(dvnode, -EIO, afs_file_error_dir_bad_magic);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Make sure each block is NUL terminated so we can reasonably</div><div class='del'>-		 * use string functions on it.  The filenames in the folio</div><div class='del'>-		 * *should* be NUL-terminated anyway.</div><div class='del'>-		 */</div><div class='del'>-		((u8 *)block)[AFS_DIR_BLOCK_SIZE - 1] = 0;</div><div class='del'>-</div><div class='del'>-		kunmap_local(block);</div><div class='del'>-	}</div><div class='del'>-checked:</div><div class='add'>+	((u8 *)block)[AFS_DIR_BLOCK_SIZE - 1] = 0;</div><div class='ctx'> 	afs_stat_v(dvnode, n_read_dir);</div><div class='ctx'> 	return true;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Dump the contents of a directory.</div><div class='add'>+ * Iterate through a kmapped directory segment, checking the content.</div><div class='ctx'>  */</div><div class='del'>-static void afs_dir_dump(struct afs_vnode *dvnode, struct afs_read *req)</div><div class='add'>+static size_t afs_dir_check_step(void *iter_base, size_t progress, size_t len,</div><div class='add'>+				 void *priv, void *priv2)</div><div class='ctx'> {</div><div class='del'>-	union afs_xdr_dir_block *block;</div><div class='del'>-	struct address_space *mapping = dvnode-&gt;netfs.inode.i_mapping;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t last = req-&gt;nr_pages - 1;</div><div class='del'>-	size_t offset, size;</div><div class='del'>-</div><div class='del'>-	XA_STATE(xas, &amp;mapping-&gt;i_pages, 0);</div><div class='del'>-</div><div class='del'>-	pr_warn("DIR %llx:%llx f=%llx l=%llx al=%llx\n",</div><div class='del'>-		dvnode-&gt;fid.vid, dvnode-&gt;fid.vnode,</div><div class='del'>-		req-&gt;file_size, req-&gt;len, req-&gt;actual_len);</div><div class='del'>-	pr_warn("DIR %llx %x %zx %zx\n",</div><div class='del'>-		req-&gt;pos, req-&gt;nr_pages,</div><div class='del'>-		req-&gt;iter-&gt;iov_offset,  iov_iter_count(req-&gt;iter));</div><div class='del'>-</div><div class='del'>-	xas_for_each(&amp;xas, folio, last) {</div><div class='del'>-		if (xas_retry(&amp;xas, folio))</div><div class='del'>-			continue;</div><div class='add'>+	struct afs_vnode *dvnode = priv;</div><div class='ctx'> </div><div class='del'>-		BUG_ON(folio_file_mapping(folio) != mapping);</div><div class='add'>+	if (WARN_ON_ONCE(progress % AFS_DIR_BLOCK_SIZE ||</div><div class='add'>+			 len % AFS_DIR_BLOCK_SIZE))</div><div class='add'>+		return len;</div><div class='ctx'> </div><div class='del'>-		size = min_t(loff_t, folio_size(folio), req-&gt;actual_len - folio_pos(folio));</div><div class='del'>-		for (offset = 0; offset &lt; size; offset += sizeof(*block)) {</div><div class='del'>-			block = kmap_local_folio(folio, offset);</div><div class='del'>-			pr_warn("[%02lx] %32phN\n", folio_index(folio) + offset, block);</div><div class='del'>-			kunmap_local(block);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	do {</div><div class='add'>+		if (!afs_dir_check_block(dvnode, progress, iter_base))</div><div class='add'>+			break;</div><div class='add'>+		iter_base += AFS_DIR_BLOCK_SIZE;</div><div class='add'>+		len -= AFS_DIR_BLOCK_SIZE;</div><div class='add'>+	} while (len &gt; 0);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check all the blocks in a directory.  All the folios are held pinned.</div><div class='add'>+ * Check all the blocks in a directory.</div><div class='ctx'>  */</div><div class='del'>-static int afs_dir_check(struct afs_vnode *dvnode, struct afs_read *req)</div><div class='add'>+static int afs_dir_check(struct afs_vnode *dvnode)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = dvnode-&gt;netfs.inode.i_mapping;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t last = req-&gt;nr_pages - 1;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	unsigned long long i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+	size_t checked = 0;</div><div class='ctx'> </div><div class='del'>-	XA_STATE(xas, &amp;mapping-&gt;i_pages, 0);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!req-&gt;nr_pages))</div><div class='add'>+	if (unlikely(!i_size))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	xas_for_each(&amp;xas, folio, last) {</div><div class='del'>-		if (xas_retry(&amp;xas, folio))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		BUG_ON(folio_file_mapping(folio) != mapping);</div><div class='del'>-</div><div class='del'>-		if (!afs_dir_check_folio(dvnode, folio, req-&gt;actual_len)) {</div><div class='del'>-			afs_dir_dump(dvnode, req);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	iov_iter_folio_queue(&amp;iter, ITER_SOURCE, dvnode-&gt;directory, 0, 0, i_size);</div><div class='add'>+	checked = iterate_folioq(&amp;iter, iov_iter_count(&amp;iter), dvnode, NULL,</div><div class='add'>+				 afs_dir_check_step);</div><div class='add'>+	if (checked != i_size) {</div><div class='add'>+		afs_dir_dump(dvnode);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -263,134 +226,140 @@ static int afs_dir_open(struct inode *inode, struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Read the directory into the pagecache in one go, scrubbing the previous</div><div class='del'>- * contents.  The list of folios is returned, pinning them so that they don't</div><div class='del'>- * get reclaimed during the iteration.</div><div class='add'>+ * Read a file in a single download.</div><div class='ctx'>  */</div><div class='del'>-static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key)</div><div class='del'>-	__acquires(&amp;dvnode-&gt;validate_lock)</div><div class='add'>+static ssize_t afs_do_read_single(struct afs_vnode *dvnode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = dvnode-&gt;netfs.inode.i_mapping;</div><div class='del'>-	struct afs_read *req;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	loff_t i_size;</div><div class='del'>-	int nr_pages, i;</div><div class='del'>-	int ret;</div><div class='del'>-	loff_t remote_size = 0;</div><div class='add'>+	bool is_dir = (S_ISDIR(dvnode-&gt;netfs.inode.i_mode) &amp;&amp;</div><div class='add'>+		       !test_bit(AFS_VNODE_MOUNTPOINT, &amp;dvnode-&gt;flags));</div><div class='ctx'> </div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='del'>-	req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='del'>-	if (!req)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;req-&gt;usage, 1);</div><div class='del'>-	req-&gt;vnode = dvnode;</div><div class='del'>-	req-&gt;key = key_get(key);</div><div class='del'>-	req-&gt;cleanup = afs_dir_read_cleanup;</div><div class='del'>-</div><div class='del'>-expand:</div><div class='ctx'> 	i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='del'>-	if (i_size &lt; remote_size)</div><div class='del'>-	    i_size = remote_size;</div><div class='del'>-	if (i_size &lt; 2048) {</div><div class='del'>-		ret = afs_bad(dvnode, afs_file_error_dir_small);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	if (i_size &gt; 2048 * 1024) {</div><div class='del'>-		trace_afs_file_error(dvnode, -EFBIG, afs_file_error_dir_big);</div><div class='del'>-		ret = -EFBIG;</div><div class='del'>-		goto error;</div><div class='add'>+	if (is_dir) {</div><div class='add'>+		if (i_size &lt; AFS_DIR_BLOCK_SIZE)</div><div class='add'>+			return afs_bad(dvnode, afs_file_error_dir_small);</div><div class='add'>+		if (i_size &gt; AFS_DIR_BLOCK_SIZE * 1024) {</div><div class='add'>+			trace_afs_file_error(dvnode, -EFBIG, afs_file_error_dir_big);</div><div class='add'>+			return -EFBIG;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (i_size &gt; AFSPATHMAX) {</div><div class='add'>+			trace_afs_file_error(dvnode, -EFBIG, afs_file_error_dir_big);</div><div class='add'>+			return -EFBIG;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_enter("%llu", i_size);</div><div class='add'>+	/* Expand the storage.  TODO: Shrink the storage too. */</div><div class='add'>+	if (dvnode-&gt;directory_size &lt; i_size) {</div><div class='add'>+		size_t cur_size = dvnode-&gt;directory_size;</div><div class='ctx'> </div><div class='del'>-	nr_pages = (i_size + PAGE_SIZE - 1) / PAGE_SIZE;</div><div class='add'>+		ret = netfs_alloc_folioq_buffer(NULL,</div><div class='add'>+						&amp;dvnode-&gt;directory, &amp;cur_size, i_size,</div><div class='add'>+						mapping_gfp_mask(dvnode-&gt;netfs.inode.i_mapping));</div><div class='add'>+		dvnode-&gt;directory_size = cur_size;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;actual_len = i_size; /* May change */</div><div class='del'>-	req-&gt;len = nr_pages * PAGE_SIZE; /* We can ask for more than there is */</div><div class='del'>-	req-&gt;data_version = dvnode-&gt;status.data_version; /* May change */</div><div class='del'>-	iov_iter_xarray(&amp;req-&gt;def_iter, ITER_DEST, &amp;dvnode-&gt;netfs.inode.i_mapping-&gt;i_pages,</div><div class='del'>-			0, i_size);</div><div class='del'>-	req-&gt;iter = &amp;req-&gt;def_iter;</div><div class='add'>+	iov_iter_folio_queue(&amp;iter, ITER_DEST, dvnode-&gt;directory, 0, 0, dvnode-&gt;directory_size);</div><div class='ctx'> </div><div class='del'>-	/* Fill in any gaps that we might find where the memory reclaimer has</div><div class='del'>-	 * been at work and pin all the folios.  If there are any gaps, we will</div><div class='del'>-	 * need to reread the entire directory contents.</div><div class='add'>+	/* AFS requires us to perform the read of a directory synchronously as</div><div class='add'>+	 * a single unit to avoid issues with the directory contents being</div><div class='add'>+	 * changed between reads.</div><div class='ctx'> 	 */</div><div class='del'>-	i = req-&gt;nr_pages;</div><div class='del'>-	while (i &lt; nr_pages) {</div><div class='del'>-		struct folio *folio;</div><div class='del'>-</div><div class='del'>-		folio = filemap_get_folio(mapping, i);</div><div class='del'>-		if (IS_ERR(folio)) {</div><div class='del'>-			if (test_and_clear_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags))</div><div class='del'>-				afs_stat_v(dvnode, n_inval);</div><div class='del'>-			folio = __filemap_get_folio(mapping,</div><div class='del'>-						    i, FGP_LOCK | FGP_CREAT,</div><div class='del'>-						    mapping-&gt;gfp_mask);</div><div class='del'>-			if (IS_ERR(folio)) {</div><div class='del'>-				ret = PTR_ERR(folio);</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			folio_attach_private(folio, (void *)1);</div><div class='del'>-			folio_unlock(folio);</div><div class='add'>+	ret = netfs_read_single(&amp;dvnode-&gt;netfs.inode, file, &amp;iter);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+		if (i_size &gt; ret) {</div><div class='add'>+			/* The content has grown, so we need to expand the</div><div class='add'>+			 * buffer.</div><div class='add'>+			 */</div><div class='add'>+			ret = -ESTALE;</div><div class='add'>+		} else if (is_dir) {</div><div class='add'>+			int ret2 = afs_dir_check(dvnode);</div><div class='add'>+</div><div class='add'>+			if (ret2 &lt; 0)</div><div class='add'>+				ret = ret2;</div><div class='add'>+		} else if (i_size &lt; folioq_folio_size(dvnode-&gt;directory, 0)) {</div><div class='add'>+			/* NUL-terminate a symlink. */</div><div class='add'>+			char *symlink = kmap_local_folio(folioq_folio(dvnode-&gt;directory, 0), 0);</div><div class='add'>+</div><div class='add'>+			symlink[i_size] = 0;</div><div class='add'>+			kunmap_local(symlink);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		req-&gt;nr_pages += folio_nr_pages(folio);</div><div class='del'>-		i += folio_nr_pages(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If we're going to reload, we need to lock all the pages to prevent</div><div class='del'>-	 * races.</div><div class='del'>-	 */</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t afs_read_single(struct afs_vnode *dvnode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), false);</div><div class='add'>+	ret = afs_do_read_single(dvnode, file);</div><div class='add'>+	fscache_unuse_cookie(afs_vnode_cache(dvnode), NULL, NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read the directory into a folio_queue buffer in one go, scrubbing the</div><div class='add'>+ * previous contents.  We return -ESTALE if the caller needs to call us again.</div><div class='add'>+ */</div><div class='add'>+ssize_t afs_read_dir(struct afs_vnode *dvnode, struct file *file)</div><div class='add'>+	__acquires(&amp;dvnode-&gt;validate_lock)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	loff_t i_size;</div><div class='add'>+</div><div class='add'>+	i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+</div><div class='ctx'> 	ret = -ERESTARTSYS;</div><div class='ctx'> 	if (down_read_killable(&amp;dvnode-&gt;validate_lock) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags))</div><div class='del'>-		goto success;</div><div class='add'>+	/* We only need to reread the data if it became invalid - or if we</div><div class='add'>+	 * haven't read it yet.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags) &amp;&amp;</div><div class='add'>+	    test_bit(AFS_VNODE_DIR_READ, &amp;dvnode-&gt;flags)) {</div><div class='add'>+		ret = i_size;</div><div class='add'>+		goto valid;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	up_read(&amp;dvnode-&gt;validate_lock);</div><div class='ctx'> 	if (down_write_killable(&amp;dvnode-&gt;validate_lock) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags)) {</div><div class='del'>-		trace_afs_reload_dir(dvnode);</div><div class='del'>-		ret = afs_fetch_data(dvnode, req);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto error_unlock;</div><div class='del'>-</div><div class='del'>-		task_io_account_read(PAGE_SIZE * req-&gt;nr_pages);</div><div class='add'>+	if (!test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags))</div><div class='add'>+		afs_invalidate_cache(dvnode, 0);</div><div class='ctx'> </div><div class='del'>-		if (req-&gt;len &lt; req-&gt;file_size) {</div><div class='del'>-			/* The content has grown, so we need to expand the</div><div class='del'>-			 * buffer.</div><div class='del'>-			 */</div><div class='del'>-			up_write(&amp;dvnode-&gt;validate_lock);</div><div class='del'>-			remote_size = req-&gt;file_size;</div><div class='del'>-			goto expand;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Validate the data we just read. */</div><div class='del'>-		ret = afs_dir_check(dvnode, req);</div><div class='add'>+	if (!test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags) ||</div><div class='add'>+	    !test_bit(AFS_VNODE_DIR_READ, &amp;dvnode-&gt;flags)) {</div><div class='add'>+		trace_afs_reload_dir(dvnode);</div><div class='add'>+		ret = afs_read_single(dvnode, file);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto error_unlock;</div><div class='ctx'> </div><div class='ctx'> 		// TODO: Trim excess pages</div><div class='ctx'> </div><div class='ctx'> 		set_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags);</div><div class='add'>+		set_bit(AFS_VNODE_DIR_READ, &amp;dvnode-&gt;flags);</div><div class='add'>+	} else {</div><div class='add'>+		ret = i_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	downgrade_write(&amp;dvnode-&gt;validate_lock);</div><div class='del'>-success:</div><div class='del'>-	return req;</div><div class='add'>+valid:</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> error_unlock:</div><div class='ctx'> 	up_write(&amp;dvnode-&gt;validate_lock);</div><div class='ctx'> error:</div><div class='del'>-	afs_put_read(req);</div><div class='del'>-	_leave(" = %d", ret);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='add'>+	_leave(" = %zd", ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -398,79 +367,69 @@ error:</div><div class='ctx'>  */</div><div class='ctx'> static int afs_dir_iterate_block(struct afs_vnode *dvnode,</div><div class='ctx'> 				 struct dir_context *ctx,</div><div class='del'>-				 union afs_xdr_dir_block *block,</div><div class='del'>-				 unsigned blkoff)</div><div class='add'>+				 union afs_xdr_dir_block *block)</div><div class='ctx'> {</div><div class='ctx'> 	union afs_xdr_dirent *dire;</div><div class='del'>-	unsigned offset, next, curr, nr_slots;</div><div class='add'>+	unsigned int blknum, base, hdr, pos, next, nr_slots;</div><div class='ctx'> 	size_t nlen;</div><div class='ctx'> 	int tmp;</div><div class='ctx'> </div><div class='del'>-	_enter("%llx,%x", ctx-&gt;pos, blkoff);</div><div class='add'>+	blknum	= ctx-&gt;pos / AFS_DIR_BLOCK_SIZE;</div><div class='add'>+	base	= blknum * AFS_DIR_SLOTS_PER_BLOCK;</div><div class='add'>+	hdr	= (blknum == 0 ? AFS_DIR_RESV_BLOCKS0 : AFS_DIR_RESV_BLOCKS);</div><div class='add'>+	pos	= DIV_ROUND_UP(ctx-&gt;pos, AFS_DIR_DIRENT_SIZE) - base;</div><div class='ctx'> </div><div class='del'>-	curr = (ctx-&gt;pos - blkoff) / sizeof(union afs_xdr_dirent);</div><div class='add'>+	_enter("%llx,%x", ctx-&gt;pos, blknum);</div><div class='ctx'> </div><div class='ctx'> 	/* walk through the block, an entry at a time */</div><div class='del'>-	for (offset = (blkoff == 0 ? AFS_DIR_RESV_BLOCKS0 : AFS_DIR_RESV_BLOCKS);</div><div class='del'>-	     offset &lt; AFS_DIR_SLOTS_PER_BLOCK;</div><div class='del'>-	     offset = next</div><div class='del'>-	     ) {</div><div class='add'>+	for (unsigned int slot = hdr; slot &lt; AFS_DIR_SLOTS_PER_BLOCK; slot = next) {</div><div class='ctx'> 		/* skip entries marked unused in the bitmap */</div><div class='del'>-		if (!(block-&gt;hdr.bitmap[offset / 8] &amp;</div><div class='del'>-		      (1 &lt;&lt; (offset % 8)))) {</div><div class='del'>-			_debug("ENT[%zu.%u]: unused",</div><div class='del'>-			       blkoff / sizeof(union afs_xdr_dir_block), offset);</div><div class='del'>-			next = offset + 1;</div><div class='del'>-			if (offset &gt;= curr)</div><div class='del'>-				ctx-&gt;pos = blkoff +</div><div class='del'>-					next * sizeof(union afs_xdr_dirent);</div><div class='add'>+		if (!(block-&gt;hdr.bitmap[slot / 8] &amp;</div><div class='add'>+		      (1 &lt;&lt; (slot % 8)))) {</div><div class='add'>+			_debug("ENT[%x]: Unused", base + slot);</div><div class='add'>+			next = slot + 1;</div><div class='add'>+			if (next &gt;= pos)</div><div class='add'>+				ctx-&gt;pos = (base + next) * sizeof(union afs_xdr_dirent);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* got a valid entry */</div><div class='del'>-		dire = &amp;block-&gt;dirents[offset];</div><div class='add'>+		dire = &amp;block-&gt;dirents[slot];</div><div class='ctx'> 		nlen = strnlen(dire-&gt;u.name,</div><div class='del'>-			       sizeof(*block) -</div><div class='del'>-			       offset * sizeof(union afs_xdr_dirent));</div><div class='add'>+			       (unsigned long)(block + 1) - (unsigned long)dire-&gt;u.name - 1);</div><div class='ctx'> 		if (nlen &gt; AFSNAMEMAX - 1) {</div><div class='del'>-			_debug("ENT[%zu]: name too long (len %u/%zu)",</div><div class='del'>-			       blkoff / sizeof(union afs_xdr_dir_block),</div><div class='del'>-			       offset, nlen);</div><div class='add'>+			_debug("ENT[%x]: Name too long (len %zx)",</div><div class='add'>+			       base + slot, nlen);</div><div class='ctx'> 			return afs_bad(dvnode, afs_file_error_dir_name_too_long);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		_debug("ENT[%zu.%u]: %s %zu \"%s\"",</div><div class='del'>-		       blkoff / sizeof(union afs_xdr_dir_block), offset,</div><div class='del'>-		       (offset &lt; curr ? "skip" : "fill"),</div><div class='add'>+		_debug("ENT[%x]: %s %zx \"%s\"",</div><div class='add'>+		       base + slot, (slot &lt; pos ? "skip" : "fill"),</div><div class='ctx'> 		       nlen, dire-&gt;u.name);</div><div class='ctx'> </div><div class='ctx'> 		nr_slots = afs_dir_calc_slots(nlen);</div><div class='del'>-		next = offset + nr_slots;</div><div class='add'>+		next = slot + nr_slots;</div><div class='ctx'> 		if (next &gt; AFS_DIR_SLOTS_PER_BLOCK) {</div><div class='del'>-			_debug("ENT[%zu.%u]:"</div><div class='del'>-			       " %u extends beyond end dir block"</div><div class='del'>-			       " (len %zu)",</div><div class='del'>-			       blkoff / sizeof(union afs_xdr_dir_block),</div><div class='del'>-			       offset, next, nlen);</div><div class='add'>+			_debug("ENT[%x]: extends beyond end dir block (len %zx)",</div><div class='add'>+			       base + slot, nlen);</div><div class='ctx'> 			return afs_bad(dvnode, afs_file_error_dir_over_end);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check that the name-extension dirents are all allocated */</div><div class='ctx'> 		for (tmp = 1; tmp &lt; nr_slots; tmp++) {</div><div class='del'>-			unsigned int ix = offset + tmp;</div><div class='del'>-			if (!(block-&gt;hdr.bitmap[ix / 8] &amp; (1 &lt;&lt; (ix % 8)))) {</div><div class='del'>-				_debug("ENT[%zu.u]:"</div><div class='del'>-				       " %u unmarked extension (%u/%u)",</div><div class='del'>-				       blkoff / sizeof(union afs_xdr_dir_block),</div><div class='del'>-				       offset, tmp, nr_slots);</div><div class='add'>+			unsigned int xslot = slot + tmp;</div><div class='add'>+</div><div class='add'>+			if (!(block-&gt;hdr.bitmap[xslot / 8] &amp; (1 &lt;&lt; (xslot % 8)))) {</div><div class='add'>+				_debug("ENT[%x]: Unmarked extension (%x/%x)",</div><div class='add'>+				       base + slot, tmp, nr_slots);</div><div class='ctx'> 				return afs_bad(dvnode, afs_file_error_dir_unmarked_ext);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* skip if starts before the current position */</div><div class='del'>-		if (offset &lt; curr) {</div><div class='del'>-			if (next &gt; curr)</div><div class='del'>-				ctx-&gt;pos = blkoff + next * sizeof(union afs_xdr_dirent);</div><div class='add'>+		if (slot &lt; pos) {</div><div class='add'>+			if (next &gt; pos)</div><div class='add'>+				ctx-&gt;pos = (base + next) * sizeof(union afs_xdr_dirent);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -484,75 +443,110 @@ static int afs_dir_iterate_block(struct afs_vnode *dvnode,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ctx-&gt;pos = blkoff + next * sizeof(union afs_xdr_dirent);</div><div class='add'>+		ctx-&gt;pos = (base + next) * sizeof(union afs_xdr_dirent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	_leave(" = 1 [more]");</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct afs_dir_iteration_ctx {</div><div class='add'>+	struct dir_context	*dir_ctx;</div><div class='add'>+	int			error;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * iterate through the data blob that lists the contents of an AFS directory</div><div class='add'>+ * Iterate through a kmapped directory segment.</div><div class='ctx'>  */</div><div class='del'>-static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx,</div><div class='del'>-			   struct key *key, afs_dataversion_t *_dir_version)</div><div class='add'>+static size_t afs_dir_iterate_step(void *iter_base, size_t progress, size_t len,</div><div class='add'>+				   void *priv, void *priv2)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *dvnode = AFS_FS_I(dir);</div><div class='del'>-	union afs_xdr_dir_block *dblock;</div><div class='del'>-	struct afs_read *req;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	unsigned offset, size;</div><div class='add'>+	struct afs_dir_iteration_ctx *ctx = priv2;</div><div class='add'>+	struct afs_vnode *dvnode = priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("{%lu},%u,,", dir-&gt;i_ino, (unsigned)ctx-&gt;pos);</div><div class='del'>-</div><div class='del'>-	if (test_bit(AFS_VNODE_DELETED, &amp;AFS_FS_I(dir)-&gt;flags)) {</div><div class='del'>-		_leave(" = -ESTALE");</div><div class='del'>-		return -ESTALE;</div><div class='add'>+	if (WARN_ON_ONCE(progress % AFS_DIR_BLOCK_SIZE ||</div><div class='add'>+			 len % AFS_DIR_BLOCK_SIZE)) {</div><div class='add'>+		pr_err("Mis-iteration prog=%zx len=%zx\n",</div><div class='add'>+		       progress % AFS_DIR_BLOCK_SIZE,</div><div class='add'>+		       len % AFS_DIR_BLOCK_SIZE);</div><div class='add'>+		return len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req = afs_read_dir(dvnode, key);</div><div class='del'>-	if (IS_ERR(req))</div><div class='del'>-		return PTR_ERR(req);</div><div class='del'>-	*_dir_version = req-&gt;data_version;</div><div class='add'>+	do {</div><div class='add'>+		ret = afs_dir_iterate_block(dvnode, ctx-&gt;dir_ctx, iter_base);</div><div class='add'>+		if (ret != 1)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	/* round the file position up to the next entry boundary */</div><div class='del'>-	ctx-&gt;pos += sizeof(union afs_xdr_dirent) - 1;</div><div class='del'>-	ctx-&gt;pos &amp;= ~(sizeof(union afs_xdr_dirent) - 1);</div><div class='add'>+		ctx-&gt;dir_ctx-&gt;pos = round_up(ctx-&gt;dir_ctx-&gt;pos, AFS_DIR_BLOCK_SIZE);</div><div class='add'>+		iter_base += AFS_DIR_BLOCK_SIZE;</div><div class='add'>+		len -= AFS_DIR_BLOCK_SIZE;</div><div class='add'>+	} while (len &gt; 0);</div><div class='ctx'> </div><div class='del'>-	/* walk through the blocks in sequence */</div><div class='del'>-	ret = 0;</div><div class='del'>-	while (ctx-&gt;pos &lt; req-&gt;actual_len) {</div><div class='del'>-		/* Fetch the appropriate folio from the directory and re-add it</div><div class='del'>-		 * to the LRU.  We have all the pages pinned with an extra ref.</div><div class='del'>-		 */</div><div class='del'>-		folio = __filemap_get_folio(dir-&gt;i_mapping, ctx-&gt;pos / PAGE_SIZE,</div><div class='del'>-					    FGP_ACCESSED, 0);</div><div class='del'>-		if (IS_ERR(folio)) {</div><div class='del'>-			ret = afs_bad(dvnode, afs_file_error_dir_missing_page);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		offset = round_down(ctx-&gt;pos, sizeof(*dblock)) - folio_file_pos(folio);</div><div class='del'>-		size = min_t(loff_t, folio_size(folio),</div><div class='del'>-			     req-&gt;actual_len - folio_file_pos(folio));</div><div class='add'>+/*</div><div class='add'>+ * Iterate through the directory folios.</div><div class='add'>+ */</div><div class='add'>+static int afs_dir_iterate_contents(struct inode *dir, struct dir_context *dir_ctx)</div><div class='add'>+{</div><div class='add'>+	struct afs_dir_iteration_ctx ctx = { .dir_ctx = dir_ctx };</div><div class='add'>+	struct afs_vnode *dvnode = AFS_FS_I(dir);</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	unsigned long long i_size = i_size_read(dir);</div><div class='add'>+</div><div class='add'>+	/* Round the file position up to the next entry boundary */</div><div class='add'>+	dir_ctx-&gt;pos = round_up(dir_ctx-&gt;pos, sizeof(union afs_xdr_dirent));</div><div class='ctx'> </div><div class='del'>-		do {</div><div class='del'>-			dblock = kmap_local_folio(folio, offset);</div><div class='del'>-			ret = afs_dir_iterate_block(dvnode, ctx, dblock,</div><div class='del'>-						    folio_file_pos(folio) + offset);</div><div class='del'>-			kunmap_local(dblock);</div><div class='del'>-			if (ret != 1)</div><div class='del'>-				goto out;</div><div class='add'>+	if (i_size &lt;= 0 || dir_ctx-&gt;pos &gt;= i_size)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		} while (offset += sizeof(*dblock), offset &lt; size);</div><div class='add'>+	iov_iter_folio_queue(&amp;iter, ITER_SOURCE, dvnode-&gt;directory, 0, 0, i_size);</div><div class='add'>+	iov_iter_advance(&amp;iter, round_down(dir_ctx-&gt;pos, AFS_DIR_BLOCK_SIZE));</div><div class='ctx'> </div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='add'>+	iterate_folioq(&amp;iter, iov_iter_count(&amp;iter), dvnode, &amp;ctx,</div><div class='add'>+		       afs_dir_iterate_step);</div><div class='add'>+</div><div class='add'>+	if (ctx.error == -ESTALE)</div><div class='add'>+		afs_invalidate_dir(dvnode, afs_dir_invalid_iter_stale);</div><div class='add'>+	return ctx.error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iterate through the data blob that lists the contents of an AFS directory</div><div class='add'>+ */</div><div class='add'>+static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx,</div><div class='add'>+			   struct file *file, afs_dataversion_t *_dir_version)</div><div class='add'>+{</div><div class='add'>+	struct afs_vnode *dvnode = AFS_FS_I(dir);</div><div class='add'>+	int retry_limit = 100;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	_enter("{%lu},%llx,,", dir-&gt;i_ino, ctx-&gt;pos);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (--retry_limit &lt; 0) {</div><div class='add'>+			pr_warn("afs_read_dir(): Too many retries\n");</div><div class='add'>+			ret = -ESTALE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = afs_read_dir(dvnode, file);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			if (ret != -ESTALE)</div><div class='add'>+				break;</div><div class='add'>+			if (test_bit(AFS_VNODE_DELETED, &amp;AFS_FS_I(dir)-&gt;flags)) {</div><div class='add'>+				ret = -ESTALE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		*_dir_version = inode_peek_iversion_raw(dir);</div><div class='add'>+</div><div class='add'>+		ret = afs_dir_iterate_contents(dir, ctx);</div><div class='add'>+		up_read(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+	} while (ret == -ESTALE);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	up_read(&amp;dvnode-&gt;validate_lock);</div><div class='del'>-	afs_put_read(req);</div><div class='ctx'> 	_leave(" = %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -564,8 +558,7 @@ static int afs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	afs_dataversion_t dir_version;</div><div class='ctx'> </div><div class='del'>-	return afs_dir_iterate(file_inode(file), ctx, afs_file_key(file),</div><div class='del'>-			       &amp;dir_version);</div><div class='add'>+	return afs_dir_iterate(file_inode(file), ctx, file, &amp;dir_version);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -605,22 +598,22 @@ static bool afs_lookup_one_filldir(struct dir_context *ctx, const char *name,</div><div class='ctx'>  * Do a lookup of a single name in a directory</div><div class='ctx'>  * - just returns the FID the dentry name maps to if found</div><div class='ctx'>  */</div><div class='del'>-static int afs_do_lookup_one(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			     struct afs_fid *fid, struct key *key,</div><div class='add'>+static int afs_do_lookup_one(struct inode *dir, const struct qstr *name,</div><div class='add'>+			     struct afs_fid *fid,</div><div class='ctx'> 			     afs_dataversion_t *_dir_version)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_super_info *as = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='ctx'> 	struct afs_lookup_one_cookie cookie = {</div><div class='ctx'> 		.ctx.actor = afs_lookup_one_filldir,</div><div class='del'>-		.name = dentry-&gt;d_name,</div><div class='add'>+		.name = *name,</div><div class='ctx'> 		.fid.vid = as-&gt;volume-&gt;vid</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("{%lu},%p{%pd},", dir-&gt;i_ino, dentry, dentry);</div><div class='add'>+	_enter("{%lu},{%.*s},", dir-&gt;i_ino, name-&gt;len, name-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* search the directory */</div><div class='del'>-	ret = afs_dir_iterate(dir, &amp;cookie.ctx, key, _dir_version);</div><div class='add'>+	ret = afs_dir_iterate(dir, &amp;cookie.ctx, NULL, _dir_version);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		_leave(" = %d [iter]", ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -655,19 +648,10 @@ static bool afs_lookup_filldir(struct dir_context *ctx, const char *name,</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(union afs_xdr_dir_block) != 2048);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(union afs_xdr_dirent) != 32);</div><div class='ctx'> </div><div class='del'>-	if (cookie-&gt;found) {</div><div class='del'>-		if (cookie-&gt;nr_fids &lt; 50) {</div><div class='del'>-			cookie-&gt;fids[cookie-&gt;nr_fids].vnode	= ino;</div><div class='del'>-			cookie-&gt;fids[cookie-&gt;nr_fids].unique	= dtype;</div><div class='del'>-			cookie-&gt;nr_fids++;</div><div class='del'>-		}</div><div class='del'>-	} else if (cookie-&gt;name.len == nlen &amp;&amp;</div><div class='del'>-		   memcmp(cookie-&gt;name.name, name, nlen) == 0) {</div><div class='del'>-		cookie-&gt;fids[1].vnode	= ino;</div><div class='del'>-		cookie-&gt;fids[1].unique	= dtype;</div><div class='del'>-		cookie-&gt;found = 1;</div><div class='del'>-		if (cookie-&gt;one_only)</div><div class='del'>-			return false;</div><div class='add'>+	if (cookie-&gt;nr_fids &lt; 50) {</div><div class='add'>+		cookie-&gt;fids[cookie-&gt;nr_fids].vnode	= ino;</div><div class='add'>+		cookie-&gt;fids[cookie-&gt;nr_fids].unique	= dtype;</div><div class='add'>+		cookie-&gt;nr_fids++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return cookie-&gt;nr_fids &lt; 50;</div><div class='hunk'>@@ -708,6 +692,8 @@ static void afs_do_lookup_success(struct afs_operation *op)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (vp-&gt;scb.status.abort_code)</div><div class='add'>+			trace_afs_bulkstat_error(op, &amp;vp-&gt;fid, i, vp-&gt;scb.status.abort_code);</div><div class='ctx'> 		if (!vp-&gt;scb.have_status &amp;&amp; !vp-&gt;scb.have_error)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -785,8 +771,7 @@ static bool afs_server_supports_ibulk(struct afs_vnode *dvnode)</div><div class='ctx'>  * files in one go and create inodes for them.  The inode of the file we were</div><div class='ctx'>  * asked for is returned.</div><div class='ctx'>  */</div><div class='del'>-static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,</div><div class='del'>-				   struct key *key)</div><div class='add'>+static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_lookup_cookie *cookie;</div><div class='ctx'> 	struct afs_vnode_param *vp;</div><div class='hunk'>@@ -794,6 +779,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct afs_vnode *dvnode = AFS_FS_I(dir), *vnode;</div><div class='ctx'> 	struct inode *inode = NULL, *ti;</div><div class='ctx'> 	afs_dataversion_t data_version = READ_ONCE(dvnode-&gt;status.data_version);</div><div class='add'>+	bool supports_ibulk, isnew;</div><div class='ctx'> 	long ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -810,19 +796,19 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	cookie-&gt;nr_fids = 2; /* slot 1 is saved for the fid we actually want</div><div class='ctx'> 			      * and slot 0 for the directory */</div><div class='ctx'> </div><div class='del'>-	if (!afs_server_supports_ibulk(dvnode))</div><div class='del'>-		cookie-&gt;one_only = true;</div><div class='del'>-</div><div class='del'>-	/* search the directory */</div><div class='del'>-	ret = afs_dir_iterate(dir, &amp;cookie-&gt;ctx, key, &amp;data_version);</div><div class='add'>+	/* Search the directory for the named entry using the hash table... */</div><div class='add'>+	ret = afs_dir_search(dvnode, &amp;dentry-&gt;d_name, &amp;cookie-&gt;fids[1], &amp;data_version);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	dentry-&gt;d_fsdata = (void *)(unsigned long)data_version;</div><div class='add'>+	supports_ibulk = afs_server_supports_ibulk(dvnode);</div><div class='add'>+	if (supports_ibulk) {</div><div class='add'>+		/* ...then scan linearly from that point for entries to lookup-ahead. */</div><div class='add'>+		cookie-&gt;ctx.pos = (ret + 1) * AFS_DIR_DIRENT_SIZE;</div><div class='add'>+		afs_dir_iterate(dir, &amp;cookie-&gt;ctx, NULL, &amp;data_version);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = -ENOENT;</div><div class='del'>-	if (!cookie-&gt;found)</div><div class='del'>-		goto out;</div><div class='add'>+	dentry-&gt;d_fsdata = (void *)(unsigned long)data_version;</div><div class='ctx'> </div><div class='ctx'> 	/* Check to see if we already have an inode for the primary fid. */</div><div class='ctx'> 	inode = ilookup5(dir-&gt;i_sb, cookie-&gt;fids[1].vnode,</div><div class='hunk'>@@ -864,7 +850,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			 * callback counters.</div><div class='ctx'> 			 */</div><div class='ctx'> 			ti = ilookup5_nowait(dir-&gt;i_sb, vp-&gt;fid.vnode,</div><div class='del'>-					     afs_ilookup5_test_by_fid, &amp;vp-&gt;fid);</div><div class='add'>+					     afs_ilookup5_test_by_fid, &amp;vp-&gt;fid, &amp;isnew);</div><div class='ctx'> 			if (!IS_ERR_OR_NULL(ti)) {</div><div class='ctx'> 				vnode = AFS_FS_I(ti);</div><div class='ctx'> 				vp-&gt;dv_before = vnode-&gt;status.data_version;</div><div class='hunk'>@@ -881,7 +867,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	 * the whole operation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	afs_op_set_error(op, -ENOTSUPP);</div><div class='del'>-	if (!cookie-&gt;one_only) {</div><div class='add'>+	if (supports_ibulk) {</div><div class='ctx'> 		op-&gt;ops = &amp;afs_inline_bulk_status_operation;</div><div class='ctx'> 		afs_begin_vnode_operation(op);</div><div class='ctx'> 		afs_wait_for_operation(op);</div><div class='hunk'>@@ -897,12 +883,16 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		afs_begin_vnode_operation(op);</div><div class='ctx'> 		afs_wait_for_operation(op);</div><div class='ctx'> 	}</div><div class='del'>-	inode = ERR_PTR(afs_op_error(op));</div><div class='ctx'> </div><div class='ctx'> out_op:</div><div class='ctx'> 	if (!afs_op_error(op)) {</div><div class='del'>-		inode = &amp;op-&gt;file[1].vnode-&gt;netfs.inode;</div><div class='del'>-		op-&gt;file[1].vnode = NULL;</div><div class='add'>+		if (op-&gt;file[1].scb.status.abort_code) {</div><div class='add'>+			afs_op_accumulate_error(op, -ECONNABORTED,</div><div class='add'>+						op-&gt;file[1].scb.status.abort_code);</div><div class='add'>+		} else {</div><div class='add'>+			inode = &amp;op-&gt;file[1].vnode-&gt;netfs.inode;</div><div class='add'>+			op-&gt;file[1].vnode = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;file[0].scb.have_status)</div><div class='hunk'>@@ -919,8 +909,7 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * Look up an entry in a directory with @sys substitution.</div><div class='ctx'>  */</div><div class='del'>-static struct dentry *afs_lookup_atsys(struct inode *dir, struct dentry *dentry,</div><div class='del'>-				       struct key *key)</div><div class='add'>+static struct dentry *afs_lookup_atsys(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_sysnames *subs;</div><div class='ctx'> 	struct afs_net *net = afs_i2net(dir);</div><div class='hunk'>@@ -954,7 +943,7 @@ static struct dentry *afs_lookup_atsys(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		strcpy(p, name);</div><div class='del'>-		ret = lookup_one_len(buf, dentry-&gt;d_parent, len);</div><div class='add'>+		ret = lookup_noperm(&amp;QSTR(buf), dentry-&gt;d_parent);</div><div class='ctx'> 		if (IS_ERR(ret) || d_is_positive(ret))</div><div class='ctx'> 			goto out_s;</div><div class='ctx'> 		dput(ret);</div><div class='hunk'>@@ -968,7 +957,6 @@ out_s:</div><div class='ctx'> 	afs_put_sysnames(subs);</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> out_p:</div><div class='del'>-	key_put(key);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -982,7 +970,6 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct afs_fid fid = {};</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct dentry *d;</div><div class='del'>-	struct key *key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu},%p{%pd},",</div><div class='hunk'>@@ -1000,15 +987,9 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		return ERR_PTR(-ESTALE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = afs_request_key(dvnode-&gt;volume-&gt;cell);</div><div class='del'>-	if (IS_ERR(key)) {</div><div class='del'>-		_leave(" = %ld [key]", PTR_ERR(key));</div><div class='del'>-		return ERR_CAST(key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = afs_validate(dvnode, key);</div><div class='add'>+	ret = afs_validate(dvnode, NULL);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		key_put(key);</div><div class='add'>+		afs_dir_unuse_cookie(dvnode, ret);</div><div class='ctx'> 		_leave(" = %d [val]", ret);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1018,15 +999,13 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	    dentry-&gt;d_name.name[dentry-&gt;d_name.len - 3] == 's' &amp;&amp;</div><div class='ctx'> 	    dentry-&gt;d_name.name[dentry-&gt;d_name.len - 2] == 'y' &amp;&amp;</div><div class='ctx'> 	    dentry-&gt;d_name.name[dentry-&gt;d_name.len - 1] == 's')</div><div class='del'>-		return afs_lookup_atsys(dir, dentry, key);</div><div class='add'>+		return afs_lookup_atsys(dir, dentry);</div><div class='ctx'> </div><div class='ctx'> 	afs_stat_v(dvnode, n_lookup);</div><div class='del'>-	inode = afs_do_lookup(dir, dentry, key);</div><div class='del'>-	key_put(key);</div><div class='add'>+	inode = afs_do_lookup(dir, dentry);</div><div class='ctx'> 	if (inode == ERR_PTR(-ENOENT))</div><div class='del'>-		inode = afs_try_auto_mntpt(dentry, dir);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR_OR_NULL(inode))</div><div class='add'>+		inode = NULL;</div><div class='add'>+	else if (!IS_ERR_OR_NULL(inode))</div><div class='ctx'> 		fid = AFS_FS_I(inode)-&gt;fid;</div><div class='ctx'> </div><div class='ctx'> 	_debug("splice %p", dentry-&gt;d_inode);</div><div class='hunk'>@@ -1044,21 +1023,12 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> /*</div><div class='ctx'>  * Check the validity of a dentry under RCU conditions.</div><div class='ctx'>  */</div><div class='del'>-static int afs_d_revalidate_rcu(struct dentry *dentry)</div><div class='add'>+static int afs_d_revalidate_rcu(struct afs_vnode *dvnode, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *dvnode;</div><div class='del'>-	struct dentry *parent;</div><div class='del'>-	struct inode *dir;</div><div class='ctx'> 	long dir_version, de_version;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%p", dentry);</div><div class='ctx'> </div><div class='del'>-	/* Check the parent directory is still valid first. */</div><div class='del'>-	parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='del'>-	dir = d_inode_rcu(parent);</div><div class='del'>-	if (!dir)</div><div class='del'>-		return -ECHILD;</div><div class='del'>-	dvnode = AFS_FS_I(dir);</div><div class='ctx'> 	if (test_bit(AFS_VNODE_DELETED, &amp;dvnode-&gt;flags))</div><div class='ctx'> 		return -ECHILD;</div><div class='ctx'> </div><div class='hunk'>@@ -1086,11 +1056,11 @@ static int afs_d_revalidate_rcu(struct dentry *dentry)</div><div class='ctx'>  * - NOTE! the hit can be a negative hit too, so we can't assume we have an</div><div class='ctx'>  *   inode</div><div class='ctx'>  */</div><div class='del'>-static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int afs_d_revalidate(struct inode *parent_dir, const struct qstr *name,</div><div class='add'>+			    struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *vnode, *dir;</div><div class='add'>+	struct afs_vnode *vnode, *dir = AFS_FS_I(parent_dir);</div><div class='ctx'> 	struct afs_fid fid;</div><div class='del'>-	struct dentry *parent;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct key *key;</div><div class='ctx'> 	afs_dataversion_t dir_version, invalid_before;</div><div class='hunk'>@@ -1098,7 +1068,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='del'>-		return afs_d_revalidate_rcu(dentry);</div><div class='add'>+		return afs_d_revalidate_rcu(dir, dentry);</div><div class='ctx'> </div><div class='ctx'> 	if (d_really_is_positive(dentry)) {</div><div class='ctx'> 		vnode = AFS_FS_I(d_inode(dentry));</div><div class='hunk'>@@ -1113,14 +1083,9 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	if (IS_ERR(key))</div><div class='ctx'> 		key = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Hold the parent dentry so we can peer at it */</div><div class='del'>-	parent = dget_parent(dentry);</div><div class='del'>-	dir = AFS_FS_I(d_inode(parent));</div><div class='del'>-</div><div class='ctx'> 	/* validate the parent directory */</div><div class='ctx'> 	ret = afs_validate(dir, key);</div><div class='ctx'> 	if (ret == -ERESTARTSYS) {</div><div class='del'>-		dput(parent);</div><div class='ctx'> 		key_put(key);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1148,7 +1113,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	afs_stat_v(dir, n_reval);</div><div class='ctx'> </div><div class='ctx'> 	/* search the directory for this vnode */</div><div class='del'>-	ret = afs_do_lookup_one(&amp;dir-&gt;netfs.inode, dentry, &amp;fid, key, &amp;dir_version);</div><div class='add'>+	ret = afs_do_lookup_one(&amp;dir-&gt;netfs.inode, name, &amp;fid, &amp;dir_version);</div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* the filename maps to something */</div><div class='hunk'>@@ -1192,22 +1157,19 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 		goto out_valid;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		_debug("failed to iterate dir %pd: %d",</div><div class='del'>-		       parent, ret);</div><div class='add'>+		_debug("failed to iterate parent %pd2: %d", dentry, ret);</div><div class='ctx'> 		goto not_found;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_valid:</div><div class='ctx'> 	dentry-&gt;d_fsdata = (void *)(unsigned long)dir_version;</div><div class='ctx'> out_valid_noupdate:</div><div class='del'>-	dput(parent);</div><div class='ctx'> 	key_put(key);</div><div class='ctx'> 	_leave(" = 1 [valid]");</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> not_found:</div><div class='ctx'> 	_debug("dropping dentry %pd2", dentry);</div><div class='del'>-	dput(parent);</div><div class='ctx'> 	key_put(key);</div><div class='ctx'> </div><div class='ctx'> 	_leave(" = 0 [bad]");</div><div class='hunk'>@@ -1275,6 +1237,7 @@ void afs_check_for_remote_deletion(struct afs_operation *op)</div><div class='ctx'>  */</div><div class='ctx'> static void afs_vnode_new_inode(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct afs_vnode_param *dvp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[1];</div><div class='ctx'> 	struct afs_vnode *vnode;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -1294,6 +1257,10 @@ static void afs_vnode_new_inode(struct afs_operation *op)</div><div class='ctx'> </div><div class='ctx'> 	vnode = AFS_FS_I(inode);</div><div class='ctx'> 	set_bit(AFS_VNODE_NEW_CONTENT, &amp;vnode-&gt;flags);</div><div class='add'>+	if (S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+		afs_mkdir_init_dir(vnode, dvp-&gt;vnode);</div><div class='add'>+	else if (S_ISLNK(inode-&gt;i_mode))</div><div class='add'>+		afs_init_new_symlink(vnode, op);</div><div class='ctx'> 	if (!afs_op_error(op))</div><div class='ctx'> 		afs_cache_permit(vnode, op-&gt;key, vnode-&gt;cb_break, &amp;vp-&gt;scb);</div><div class='ctx'> 	d_instantiate(op-&gt;dentry, inode);</div><div class='hunk'>@@ -1310,18 +1277,21 @@ static void afs_create_success(struct afs_operation *op)</div><div class='ctx'> </div><div class='ctx'> static void afs_create_edit_dir(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_cache_resources cres = {};</div><div class='ctx'> 	struct afs_vnode_param *dvp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[1];</div><div class='ctx'> 	struct afs_vnode *dvnode = dvp-&gt;vnode;</div><div class='ctx'> </div><div class='ctx'> 	_enter("op=%08x", op-&gt;debug_id);</div><div class='ctx'> </div><div class='add'>+	fscache_begin_write_operation(&amp;cres, afs_vnode_cache(dvnode));</div><div class='ctx'> 	down_write(&amp;dvnode-&gt;validate_lock);</div><div class='ctx'> 	if (test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    dvnode-&gt;status.data_version == dvp-&gt;dv_before + dvp-&gt;dv_delta)</div><div class='ctx'> 		afs_edit_dir_add(dvnode, &amp;op-&gt;dentry-&gt;d_name, &amp;vp-&gt;fid,</div><div class='ctx'> 				 op-&gt;create.reason);</div><div class='ctx'> 	up_write(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+	fscache_end_operation(&amp;cres);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_create_put(struct afs_operation *op)</div><div class='hunk'>@@ -1344,11 +1314,12 @@ static const struct afs_operation_ops afs_mkdir_operation = {</div><div class='ctx'> /*</div><div class='ctx'>  * create a directory on an AFS filesystem</div><div class='ctx'>  */</div><div class='del'>-static int afs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		     struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *afs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_operation *op;</div><div class='ctx'> 	struct afs_vnode *dvnode = AFS_FS_I(dir);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu},{%pd},%ho",</div><div class='ctx'> 	       dvnode-&gt;fid.vid, dvnode-&gt;fid.vnode, dentry, mode);</div><div class='hunk'>@@ -1356,9 +1327,11 @@ static int afs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	op = afs_alloc_operation(NULL, dvnode-&gt;volume);</div><div class='ctx'> 	if (IS_ERR(op)) {</div><div class='ctx'> 		d_drop(dentry);</div><div class='del'>-		return PTR_ERR(op);</div><div class='add'>+		return ERR_CAST(op);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, dvnode);</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='ctx'> 	op-&gt;file[0].modification = true;</div><div class='hunk'>@@ -1368,7 +1341,9 @@ static int afs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	op-&gt;create.reason = afs_edit_dir_for_mkdir;</div><div class='ctx'> 	op-&gt;mtime	= current_time(dir);</div><div class='ctx'> 	op-&gt;ops		= &amp;afs_mkdir_operation;</div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='add'>+	ret = afs_do_sync_operation(op);</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1381,8 +1356,8 @@ static void afs_dir_remove_subdir(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> 		clear_nlink(&amp;vnode-&gt;netfs.inode);</div><div class='ctx'> 		set_bit(AFS_VNODE_DELETED, &amp;vnode-&gt;flags);</div><div class='del'>-		atomic64_set(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE);</div><div class='del'>-		clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='add'>+		afs_clear_cb_promise(vnode, afs_cb_promise_clear_rmdir);</div><div class='add'>+		afs_invalidate_dir(vnode, afs_dir_invalid_subdir_removed);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1396,18 +1371,21 @@ static void afs_rmdir_success(struct afs_operation *op)</div><div class='ctx'> </div><div class='ctx'> static void afs_rmdir_edit_dir(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_cache_resources cres = {};</div><div class='ctx'> 	struct afs_vnode_param *dvp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_vnode *dvnode = dvp-&gt;vnode;</div><div class='ctx'> </div><div class='ctx'> 	_enter("op=%08x", op-&gt;debug_id);</div><div class='ctx'> 	afs_dir_remove_subdir(op-&gt;dentry);</div><div class='ctx'> </div><div class='add'>+	fscache_begin_write_operation(&amp;cres, afs_vnode_cache(dvnode));</div><div class='ctx'> 	down_write(&amp;dvnode-&gt;validate_lock);</div><div class='ctx'> 	if (test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    dvnode-&gt;status.data_version == dvp-&gt;dv_before + dvp-&gt;dv_delta)</div><div class='ctx'> 		afs_edit_dir_remove(dvnode, &amp;op-&gt;dentry-&gt;d_name,</div><div class='ctx'> 				    afs_edit_dir_for_rmdir);</div><div class='ctx'> 	up_write(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+	fscache_end_operation(&amp;cres);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_rmdir_put(struct afs_operation *op)</div><div class='hunk'>@@ -1442,6 +1420,8 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	if (IS_ERR(op))</div><div class='ctx'> 		return PTR_ERR(op);</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, dvnode);</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='ctx'> 	op-&gt;file[0].modification = true;</div><div class='hunk'>@@ -1465,10 +1445,18 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		op-&gt;file[1].vnode = vnode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='add'>+	ret = afs_do_sync_operation(op);</div><div class='add'>+</div><div class='add'>+	/* Not all systems that can host afs servers have ENOTEMPTY. */</div><div class='add'>+	if (ret == -EEXIST)</div><div class='add'>+		ret = -ENOTEMPTY;</div><div class='add'>+out:</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	return afs_put_operation(op);</div><div class='add'>+	ret = afs_put_operation(op);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1531,16 +1519,19 @@ static void afs_unlink_success(struct afs_operation *op)</div><div class='ctx'> </div><div class='ctx'> static void afs_unlink_edit_dir(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_cache_resources cres = {};</div><div class='ctx'> 	struct afs_vnode_param *dvp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_vnode *dvnode = dvp-&gt;vnode;</div><div class='ctx'> </div><div class='ctx'> 	_enter("op=%08x", op-&gt;debug_id);</div><div class='add'>+	fscache_begin_write_operation(&amp;cres, afs_vnode_cache(dvnode));</div><div class='ctx'> 	down_write(&amp;dvnode-&gt;validate_lock);</div><div class='ctx'> 	if (test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    dvnode-&gt;status.data_version == dvp-&gt;dv_before + dvp-&gt;dv_delta)</div><div class='ctx'> 		afs_edit_dir_remove(dvnode, &amp;op-&gt;dentry-&gt;d_name,</div><div class='ctx'> 				    afs_edit_dir_for_unlink);</div><div class='ctx'> 	up_write(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+	fscache_end_operation(&amp;cres);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_unlink_put(struct afs_operation *op)</div><div class='hunk'>@@ -1579,6 +1570,8 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	if (IS_ERR(op))</div><div class='ctx'> 		return PTR_ERR(op);</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, dvnode);</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='ctx'> 	op-&gt;file[0].modification = true;</div><div class='hunk'>@@ -1625,10 +1618,10 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		afs_wait_for_operation(op);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return afs_put_operation(op);</div><div class='del'>-</div><div class='ctx'> error:</div><div class='del'>-	return afs_put_operation(op);</div><div class='add'>+	ret = afs_put_operation(op);</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct afs_operation_ops afs_create_operation = {</div><div class='hunk'>@@ -1662,6 +1655,8 @@ static int afs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, dvnode);</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='ctx'> 	op-&gt;file[0].modification = true;</div><div class='hunk'>@@ -1672,7 +1667,9 @@ static int afs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	op-&gt;create.reason = afs_edit_dir_for_create;</div><div class='ctx'> 	op-&gt;mtime	= current_time(dir);</div><div class='ctx'> 	op-&gt;ops		= &amp;afs_create_operation;</div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='add'>+	ret = afs_do_sync_operation(op);</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	d_drop(dentry);</div><div class='hunk'>@@ -1737,6 +1734,8 @@ static int afs_link(struct dentry *from, struct inode *dir,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	ret = afs_validate(vnode, op-&gt;key);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error_op;</div><div class='hunk'>@@ -1752,10 +1751,13 @@ static int afs_link(struct dentry *from, struct inode *dir,</div><div class='ctx'> 	op-&gt;dentry_2		= from;</div><div class='ctx'> 	op-&gt;ops			= &amp;afs_link_operation;</div><div class='ctx'> 	op-&gt;create.reason	= afs_edit_dir_for_link;</div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='add'>+	ret = afs_do_sync_operation(op);</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> error_op:</div><div class='ctx'> 	afs_put_operation(op);</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='ctx'> error:</div><div class='ctx'> 	d_drop(dentry);</div><div class='ctx'> 	_leave(" = %d", ret);</div><div class='hunk'>@@ -1799,6 +1801,8 @@ static int afs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, dvnode);</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1807,7 +1811,9 @@ static int afs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	op-&gt;create.reason	= afs_edit_dir_for_symlink;</div><div class='ctx'> 	op-&gt;create.symlink	= content;</div><div class='ctx'> 	op-&gt;mtime		= current_time(dir);</div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='add'>+	ret = afs_do_sync_operation(op);</div><div class='add'>+	afs_dir_unuse_cookie(dvnode, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	d_drop(dentry);</div><div class='hunk'>@@ -1817,6 +1823,9 @@ error:</div><div class='ctx'> </div><div class='ctx'> static void afs_rename_success(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct afs_vnode *vnode = op-&gt;more_files[0].vnode;</div><div class='add'>+	struct afs_vnode *new_vnode = op-&gt;more_files[1].vnode;</div><div class='add'>+</div><div class='ctx'> 	_enter("op=%08x", op-&gt;debug_id);</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;ctime = op-&gt;file[0].scb.status.mtime_client;</div><div class='hunk'>@@ -1826,10 +1835,46 @@ static void afs_rename_success(struct afs_operation *op)</div><div class='ctx'> 		op-&gt;ctime = op-&gt;file[1].scb.status.mtime_client;</div><div class='ctx'> 		afs_vnode_commit_status(op, &amp;op-&gt;file[1]);</div><div class='ctx'> 	}</div><div class='add'>+	if (op-&gt;more_files[0].scb.have_status)</div><div class='add'>+		afs_vnode_commit_status(op, &amp;op-&gt;more_files[0]);</div><div class='add'>+	if (op-&gt;more_files[1].scb.have_status)</div><div class='add'>+		afs_vnode_commit_status(op, &amp;op-&gt;more_files[1]);</div><div class='add'>+</div><div class='add'>+	/* If we're moving a subdir between dirs, we need to update</div><div class='add'>+	 * its DV counter too as the ".." will be altered.</div><div class='add'>+	 */</div><div class='add'>+	if (op-&gt;file[0].vnode != op-&gt;file[1].vnode) {</div><div class='add'>+		if (S_ISDIR(vnode-&gt;netfs.inode.i_mode)) {</div><div class='add'>+			u64 new_dv;</div><div class='add'>+</div><div class='add'>+			write_seqlock(&amp;vnode-&gt;cb_lock);</div><div class='add'>+</div><div class='add'>+			new_dv = vnode-&gt;status.data_version + 1;</div><div class='add'>+			trace_afs_set_dv(vnode, new_dv);</div><div class='add'>+			vnode-&gt;status.data_version = new_dv;</div><div class='add'>+			inode_set_iversion_raw(&amp;vnode-&gt;netfs.inode, new_dv);</div><div class='add'>+</div><div class='add'>+			write_sequnlock(&amp;vnode-&gt;cb_lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((op-&gt;rename.rename_flags &amp; RENAME_EXCHANGE) &amp;&amp;</div><div class='add'>+		    S_ISDIR(new_vnode-&gt;netfs.inode.i_mode)) {</div><div class='add'>+			u64 new_dv;</div><div class='add'>+</div><div class='add'>+			write_seqlock(&amp;new_vnode-&gt;cb_lock);</div><div class='add'>+</div><div class='add'>+			new_dv = new_vnode-&gt;status.data_version + 1;</div><div class='add'>+			new_vnode-&gt;status.data_version = new_dv;</div><div class='add'>+			inode_set_iversion_raw(&amp;new_vnode-&gt;netfs.inode, new_dv);</div><div class='add'>+</div><div class='add'>+			write_sequnlock(&amp;new_vnode-&gt;cb_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_rename_edit_dir(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_cache_resources orig_cres = {}, new_cres = {};</div><div class='ctx'> 	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='ctx'> 	struct afs_vnode *orig_dvnode = orig_dvp-&gt;vnode;</div><div class='hunk'>@@ -1846,6 +1891,10 @@ static void afs_rename_edit_dir(struct afs_operation *op)</div><div class='ctx'> 		op-&gt;rename.rehash = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fscache_begin_write_operation(&amp;orig_cres, afs_vnode_cache(orig_dvnode));</div><div class='add'>+	if (new_dvnode != orig_dvnode)</div><div class='add'>+		fscache_begin_write_operation(&amp;new_cres, afs_vnode_cache(new_dvnode));</div><div class='add'>+</div><div class='ctx'> 	down_write(&amp;orig_dvnode-&gt;validate_lock);</div><div class='ctx'> 	if (test_bit(AFS_VNODE_DIR_VALID, &amp;orig_dvnode-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    orig_dvnode-&gt;status.data_version == orig_dvp-&gt;dv_before + orig_dvp-&gt;dv_delta)</div><div class='hunk'>@@ -1867,6 +1916,12 @@ static void afs_rename_edit_dir(struct afs_operation *op)</div><div class='ctx'> 				 &amp;vnode-&gt;fid, afs_edit_dir_for_rename_2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (S_ISDIR(vnode-&gt;netfs.inode.i_mode) &amp;&amp;</div><div class='add'>+	    new_dvnode != orig_dvnode &amp;&amp;</div><div class='add'>+	    test_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags))</div><div class='add'>+		afs_edit_dir_update(vnode, &amp;dotdot_name, new_dvnode,</div><div class='add'>+				    afs_edit_dir_for_rename_sub);</div><div class='add'>+</div><div class='ctx'> 	new_inode = d_inode(new_dentry);</div><div class='ctx'> 	if (new_inode) {</div><div class='ctx'> 		spin_lock(&amp;new_inode-&gt;i_lock);</div><div class='hunk'>@@ -1879,9 +1934,6 @@ static void afs_rename_edit_dir(struct afs_operation *op)</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can update d_fsdata on the dentries to reflect their</div><div class='ctx'> 	 * new parent's data_version.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that if we ever implement RENAME_EXCHANGE, we'll have</div><div class='del'>-	 * to update both dentries with opposing dir versions.</div><div class='ctx'> 	 */</div><div class='ctx'> 	afs_update_dentry_version(op, new_dvp, op-&gt;dentry);</div><div class='ctx'> 	afs_update_dentry_version(op, new_dvp, op-&gt;dentry_2);</div><div class='hunk'>@@ -1889,6 +1941,70 @@ static void afs_rename_edit_dir(struct afs_operation *op)</div><div class='ctx'> 	d_move(old_dentry, new_dentry);</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;new_dvnode-&gt;validate_lock);</div><div class='add'>+	fscache_end_operation(&amp;orig_cres);</div><div class='add'>+	if (new_dvnode != orig_dvnode)</div><div class='add'>+		fscache_end_operation(&amp;new_cres);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void afs_rename_exchange_edit_dir(struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='add'>+	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='add'>+	struct afs_vnode *orig_dvnode = orig_dvp-&gt;vnode;</div><div class='add'>+	struct afs_vnode *new_dvnode = new_dvp-&gt;vnode;</div><div class='add'>+	struct afs_vnode *old_vnode = op-&gt;more_files[0].vnode;</div><div class='add'>+	struct afs_vnode *new_vnode = op-&gt;more_files[1].vnode;</div><div class='add'>+	struct dentry *old_dentry = op-&gt;dentry;</div><div class='add'>+	struct dentry *new_dentry = op-&gt;dentry_2;</div><div class='add'>+</div><div class='add'>+	_enter("op=%08x", op-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	if (new_dvnode == orig_dvnode) {</div><div class='add'>+		down_write(&amp;orig_dvnode-&gt;validate_lock);</div><div class='add'>+		if (test_bit(AFS_VNODE_DIR_VALID, &amp;orig_dvnode-&gt;flags) &amp;&amp;</div><div class='add'>+		    orig_dvnode-&gt;status.data_version == orig_dvp-&gt;dv_before + orig_dvp-&gt;dv_delta) {</div><div class='add'>+			afs_edit_dir_update(orig_dvnode, &amp;old_dentry-&gt;d_name,</div><div class='add'>+					    new_vnode, afs_edit_dir_for_rename_0);</div><div class='add'>+			afs_edit_dir_update(orig_dvnode, &amp;new_dentry-&gt;d_name,</div><div class='add'>+					    old_vnode, afs_edit_dir_for_rename_1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		d_exchange(old_dentry, new_dentry);</div><div class='add'>+		up_write(&amp;orig_dvnode-&gt;validate_lock);</div><div class='add'>+	} else {</div><div class='add'>+		down_write(&amp;orig_dvnode-&gt;validate_lock);</div><div class='add'>+		if (test_bit(AFS_VNODE_DIR_VALID, &amp;orig_dvnode-&gt;flags) &amp;&amp;</div><div class='add'>+		    orig_dvnode-&gt;status.data_version == orig_dvp-&gt;dv_before + orig_dvp-&gt;dv_delta)</div><div class='add'>+			afs_edit_dir_update(orig_dvnode, &amp;old_dentry-&gt;d_name,</div><div class='add'>+					    new_vnode, afs_edit_dir_for_rename_0);</div><div class='add'>+</div><div class='add'>+		up_write(&amp;orig_dvnode-&gt;validate_lock);</div><div class='add'>+		down_write(&amp;new_dvnode-&gt;validate_lock);</div><div class='add'>+</div><div class='add'>+		if (test_bit(AFS_VNODE_DIR_VALID, &amp;new_dvnode-&gt;flags) &amp;&amp;</div><div class='add'>+		    new_dvnode-&gt;status.data_version == new_dvp-&gt;dv_before + new_dvp-&gt;dv_delta)</div><div class='add'>+			afs_edit_dir_update(new_dvnode, &amp;new_dentry-&gt;d_name,</div><div class='add'>+					    old_vnode, afs_edit_dir_for_rename_1);</div><div class='add'>+</div><div class='add'>+		if (S_ISDIR(old_vnode-&gt;netfs.inode.i_mode) &amp;&amp;</div><div class='add'>+		    test_bit(AFS_VNODE_DIR_VALID, &amp;old_vnode-&gt;flags))</div><div class='add'>+			afs_edit_dir_update(old_vnode, &amp;dotdot_name, new_dvnode,</div><div class='add'>+					    afs_edit_dir_for_rename_sub);</div><div class='add'>+</div><div class='add'>+		if (S_ISDIR(new_vnode-&gt;netfs.inode.i_mode) &amp;&amp;</div><div class='add'>+		    test_bit(AFS_VNODE_DIR_VALID, &amp;new_vnode-&gt;flags))</div><div class='add'>+			afs_edit_dir_update(new_vnode, &amp;dotdot_name, orig_dvnode,</div><div class='add'>+					    afs_edit_dir_for_rename_sub);</div><div class='add'>+</div><div class='add'>+		/* Now we can update d_fsdata on the dentries to reflect their</div><div class='add'>+		 * new parents' data_version.</div><div class='add'>+		 */</div><div class='add'>+		afs_update_dentry_version(op, new_dvp, old_dentry);</div><div class='add'>+		afs_update_dentry_version(op, orig_dvp, new_dentry);</div><div class='add'>+</div><div class='add'>+		d_exchange(old_dentry, new_dentry);</div><div class='add'>+		up_write(&amp;new_dvnode-&gt;validate_lock);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_rename_put(struct afs_operation *op)</div><div class='hunk'>@@ -1909,6 +2025,32 @@ static const struct afs_operation_ops afs_rename_operation = {</div><div class='ctx'> 	.put		= afs_rename_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if 0 /* Autoswitched in yfs_fs_rename_replace(). */</div><div class='add'>+static const struct afs_operation_ops afs_rename_replace_operation = {</div><div class='add'>+	.issue_afs_rpc	= NULL,</div><div class='add'>+	.issue_yfs_rpc	= yfs_fs_rename_replace,</div><div class='add'>+	.success	= afs_rename_success,</div><div class='add'>+	.edit_dir	= afs_rename_edit_dir,</div><div class='add'>+	.put		= afs_rename_put,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct afs_operation_ops afs_rename_noreplace_operation = {</div><div class='add'>+	.issue_afs_rpc	= NULL,</div><div class='add'>+	.issue_yfs_rpc	= yfs_fs_rename_noreplace,</div><div class='add'>+	.success	= afs_rename_success,</div><div class='add'>+	.edit_dir	= afs_rename_edit_dir,</div><div class='add'>+	.put		= afs_rename_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct afs_operation_ops afs_rename_exchange_operation = {</div><div class='add'>+	.issue_afs_rpc	= NULL,</div><div class='add'>+	.issue_yfs_rpc	= yfs_fs_rename_exchange,</div><div class='add'>+	.success	= afs_rename_success,</div><div class='add'>+	.edit_dir	= afs_rename_exchange_edit_dir,</div><div class='add'>+	.put		= afs_rename_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * rename a file in an AFS filesystem and/or move it between directories</div><div class='ctx'>  */</div><div class='hunk'>@@ -1917,10 +2059,10 @@ static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 		      struct dentry *new_dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_operation *op;</div><div class='del'>-	struct afs_vnode *orig_dvnode, *new_dvnode, *vnode;</div><div class='add'>+	struct afs_vnode *orig_dvnode, *new_dvnode, *vnode, *new_vnode = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (flags)</div><div class='add'>+	if (flags &amp; ~(RENAME_NOREPLACE | RENAME_EXCHANGE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't allow silly-rename files be moved around. */</div><div class='hunk'>@@ -1930,6 +2072,8 @@ static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	vnode = AFS_FS_I(d_inode(old_dentry));</div><div class='ctx'> 	orig_dvnode = AFS_FS_I(old_dir);</div><div class='ctx'> 	new_dvnode = AFS_FS_I(new_dir);</div><div class='add'>+	if (d_is_positive(new_dentry))</div><div class='add'>+		new_vnode = AFS_FS_I(d_inode(new_dentry));</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu},{%llx:%llu},{%llx:%llu},{%pd}",</div><div class='ctx'> 	       orig_dvnode-&gt;fid.vid, orig_dvnode-&gt;fid.vnode,</div><div class='hunk'>@@ -1941,11 +2085,20 @@ static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	if (IS_ERR(op))</div><div class='ctx'> 		return PTR_ERR(op);</div><div class='ctx'> </div><div class='add'>+	fscache_use_cookie(afs_vnode_cache(orig_dvnode), true);</div><div class='add'>+	if (new_dvnode != orig_dvnode)</div><div class='add'>+		fscache_use_cookie(afs_vnode_cache(new_dvnode), true);</div><div class='add'>+</div><div class='ctx'> 	ret = afs_validate(vnode, op-&gt;key);</div><div class='ctx'> 	afs_op_set_error(op, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	op-&gt;more_files = kvcalloc(2, sizeof(struct afs_vnode_param), GFP_KERNEL);</div><div class='add'>+	if (!op-&gt;more_files)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, orig_dvnode);</div><div class='ctx'> 	afs_op_set_vnode(op, 1, new_dvnode); /* May be same as orig_dvnode */</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='hunk'>@@ -1954,46 +2107,63 @@ static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	op-&gt;file[1].modification = true;</div><div class='ctx'> 	op-&gt;file[0].update_ctime = true;</div><div class='ctx'> 	op-&gt;file[1].update_ctime = true;</div><div class='add'>+	op-&gt;more_files[0].vnode		= vnode;</div><div class='add'>+	op-&gt;more_files[0].speculative	= true;</div><div class='add'>+	op-&gt;more_files[1].vnode		= new_vnode;</div><div class='add'>+	op-&gt;more_files[1].speculative	= true;</div><div class='add'>+	op-&gt;nr_files = 4;</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;dentry		= old_dentry;</div><div class='ctx'> 	op-&gt;dentry_2		= new_dentry;</div><div class='add'>+	op-&gt;rename.rename_flags	= flags;</div><div class='ctx'> 	op-&gt;rename.new_negative	= d_is_negative(new_dentry);</div><div class='del'>-	op-&gt;ops			= &amp;afs_rename_operation;</div><div class='ctx'> </div><div class='del'>-	/* For non-directories, check whether the target is busy and if so,</div><div class='del'>-	 * make a copy of the dentry and then do a silly-rename.  If the</div><div class='del'>-	 * silly-rename succeeds, the copied dentry is hashed and becomes the</div><div class='del'>-	 * new target.</div><div class='del'>-	 */</div><div class='del'>-	if (d_is_positive(new_dentry) &amp;&amp; !d_is_dir(new_dentry)) {</div><div class='del'>-		/* To prevent any new references to the target during the</div><div class='del'>-		 * rename, we unhash the dentry in advance.</div><div class='add'>+	if (flags &amp; RENAME_NOREPLACE) {</div><div class='add'>+		op-&gt;ops		= &amp;afs_rename_noreplace_operation;</div><div class='add'>+	} else if (flags &amp; RENAME_EXCHANGE) {</div><div class='add'>+		op-&gt;ops		= &amp;afs_rename_exchange_operation;</div><div class='add'>+		d_drop(new_dentry);</div><div class='add'>+	} else {</div><div class='add'>+		/* If we might displace the target, we might need to do silly</div><div class='add'>+		 * rename.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!d_unhashed(new_dentry)) {</div><div class='del'>-			d_drop(new_dentry);</div><div class='del'>-			op-&gt;rename.rehash = new_dentry;</div><div class='del'>-		}</div><div class='add'>+		op-&gt;ops	= &amp;afs_rename_operation;</div><div class='ctx'> </div><div class='del'>-		if (d_count(new_dentry) &gt; 2) {</div><div class='del'>-			/* copy the target dentry's name */</div><div class='del'>-			op-&gt;rename.tmp = d_alloc(new_dentry-&gt;d_parent,</div><div class='del'>-						 &amp;new_dentry-&gt;d_name);</div><div class='del'>-			if (!op-&gt;rename.tmp) {</div><div class='del'>-				afs_op_nomem(op);</div><div class='del'>-				goto error;</div><div class='add'>+		/* For non-directories, check whether the target is busy and if</div><div class='add'>+		 * so, make a copy of the dentry and then do a silly-rename.</div><div class='add'>+		 * If the silly-rename succeeds, the copied dentry is hashed</div><div class='add'>+		 * and becomes the new target.</div><div class='add'>+		 */</div><div class='add'>+		if (d_is_positive(new_dentry) &amp;&amp; !d_is_dir(new_dentry)) {</div><div class='add'>+			/* To prevent any new references to the target during</div><div class='add'>+			 * the rename, we unhash the dentry in advance.</div><div class='add'>+			 */</div><div class='add'>+			if (!d_unhashed(new_dentry)) {</div><div class='add'>+				d_drop(new_dentry);</div><div class='add'>+				op-&gt;rename.rehash = new_dentry;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = afs_sillyrename(new_dvnode,</div><div class='del'>-					      AFS_FS_I(d_inode(new_dentry)),</div><div class='del'>-					      new_dentry, op-&gt;key);</div><div class='del'>-			if (ret) {</div><div class='del'>-				afs_op_set_error(op, ret);</div><div class='del'>-				goto error;</div><div class='add'>+			if (d_count(new_dentry) &gt; 2) {</div><div class='add'>+				/* copy the target dentry's name */</div><div class='add'>+				op-&gt;rename.tmp = d_alloc(new_dentry-&gt;d_parent,</div><div class='add'>+							 &amp;new_dentry-&gt;d_name);</div><div class='add'>+				if (!op-&gt;rename.tmp) {</div><div class='add'>+					afs_op_nomem(op);</div><div class='add'>+					goto error;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				ret = afs_sillyrename(new_dvnode,</div><div class='add'>+						      AFS_FS_I(d_inode(new_dentry)),</div><div class='add'>+						      new_dentry, op-&gt;key);</div><div class='add'>+				if (ret) {</div><div class='add'>+					afs_op_set_error(op, ret);</div><div class='add'>+					goto error;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				op-&gt;dentry_2 = op-&gt;rename.tmp;</div><div class='add'>+				op-&gt;rename.rehash = NULL;</div><div class='add'>+				op-&gt;rename.new_negative = true;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			op-&gt;dentry_2 = op-&gt;rename.tmp;</div><div class='del'>-			op-&gt;rename.rehash = NULL;</div><div class='del'>-			op-&gt;rename.new_negative = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2008,47 +2178,45 @@ static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	 */</div><div class='ctx'> 	d_drop(old_dentry);</div><div class='ctx'> </div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='add'>+	ret = afs_do_sync_operation(op);</div><div class='add'>+	if (ret == -ENOTSUPP)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+out:</div><div class='add'>+	afs_dir_unuse_cookie(orig_dvnode, ret);</div><div class='add'>+	if (new_dvnode != orig_dvnode)</div><div class='add'>+		afs_dir_unuse_cookie(new_dvnode, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	return afs_put_operation(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Release a directory folio and clean up its private state if it's not busy</div><div class='del'>- * - return true if the folio can now be released, false if not</div><div class='del'>- */</div><div class='del'>-static bool afs_dir_release_folio(struct folio *folio, gfp_t gfp_flags)</div><div class='del'>-{</div><div class='del'>-	struct afs_vnode *dvnode = AFS_FS_I(folio_inode(folio));</div><div class='del'>-</div><div class='del'>-	_enter("{{%llx:%llu}[%lu]}", dvnode-&gt;fid.vid, dvnode-&gt;fid.vnode, folio_index(folio));</div><div class='del'>-</div><div class='del'>-	folio_detach_private(folio);</div><div class='del'>-</div><div class='del'>-	/* The directory will need reloading. */</div><div class='del'>-	if (test_and_clear_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags))</div><div class='del'>-		afs_stat_v(dvnode, n_relpg);</div><div class='del'>-	return true;</div><div class='add'>+	ret = afs_put_operation(op);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Invalidate part or all of a folio.</div><div class='add'>+ * Write the file contents to the cache as a single blob.</div><div class='ctx'>  */</div><div class='del'>-static void afs_dir_invalidate_folio(struct folio *folio, size_t offset,</div><div class='del'>-				   size_t length)</div><div class='add'>+int afs_single_writepages(struct address_space *mapping,</div><div class='add'>+			  struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *dvnode = AFS_FS_I(folio_inode(folio));</div><div class='del'>-</div><div class='del'>-	_enter("{%lu},%zu,%zu", folio-&gt;index, offset, length);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!folio_test_locked(folio));</div><div class='add'>+	struct afs_vnode *dvnode = AFS_FS_I(mapping-&gt;host);</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	bool is_dir = (S_ISDIR(dvnode-&gt;netfs.inode.i_mode) &amp;&amp;</div><div class='add'>+		       !test_bit(AFS_VNODE_MOUNTPOINT, &amp;dvnode-&gt;flags));</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* The directory will need reloading. */</div><div class='del'>-	if (test_and_clear_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags))</div><div class='del'>-		afs_stat_v(dvnode, n_inval);</div><div class='add'>+	/* Need to lock to prevent the folio queue and folios from being thrown</div><div class='add'>+	 * away.</div><div class='add'>+	 */</div><div class='add'>+	down_read(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+</div><div class='add'>+	if (is_dir ?</div><div class='add'>+	    test_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags) :</div><div class='add'>+	    atomic64_read(&amp;dvnode-&gt;cb_expires_at) != AFS_NO_CB_PROMISE) {</div><div class='add'>+		iov_iter_folio_queue(&amp;iter, ITER_SOURCE, dvnode-&gt;directory, 0, 0,</div><div class='add'>+				     i_size_read(&amp;dvnode-&gt;netfs.inode));</div><div class='add'>+		ret = netfs_writeback_single(mapping, wbc, &amp;iter);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* we clean up only if the entire folio is being invalidated */</div><div class='del'>-	if (offset == 0 &amp;&amp; length == folio_size(folio))</div><div class='del'>-		folio_detach_private(folio);</div><div class='add'>+	up_read(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c<br/>index e2fa577b66fe..fd3aa9f97ce6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/dir_edit.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir_edit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/dir_edit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/dir_edit.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='add'>+#include &lt;linux/folio_queue.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "xdr_fs.h"</div><div class='ctx'> </div><div class='hunk'>@@ -105,32 +106,66 @@ static void afs_clear_contig_bits(union afs_xdr_dir_block *block,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get a new directory folio.</div><div class='add'>+ * Get a specific block, extending the directory storage to cover it as needed.</div><div class='ctx'>  */</div><div class='del'>-static struct folio *afs_dir_get_folio(struct afs_vnode *vnode, pgoff_t index)</div><div class='add'>+static union afs_xdr_dir_block *afs_dir_get_block(struct afs_dir_iter *iter, size_t block)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = vnode-&gt;netfs.inode.i_mapping;</div><div class='add'>+	struct folio_queue *fq;</div><div class='add'>+	struct afs_vnode *dvnode = iter-&gt;dvnode;</div><div class='ctx'> 	struct folio *folio;</div><div class='add'>+	size_t blpos = block * AFS_DIR_BLOCK_SIZE;</div><div class='add'>+	size_t blend = (block + 1) * AFS_DIR_BLOCK_SIZE, fpos = iter-&gt;fpos;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dvnode-&gt;directory_size &lt; blend) {</div><div class='add'>+		size_t cur_size = dvnode-&gt;directory_size;</div><div class='add'>+</div><div class='add'>+		ret = netfs_alloc_folioq_buffer(</div><div class='add'>+			NULL, &amp;dvnode-&gt;directory, &amp;cur_size, blend,</div><div class='add'>+			mapping_gfp_mask(dvnode-&gt;netfs.inode.i_mapping));</div><div class='add'>+		dvnode-&gt;directory_size = cur_size;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	folio = __filemap_get_folio(mapping, index,</div><div class='del'>-				    FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='del'>-				    mapping-&gt;gfp_mask);</div><div class='del'>-	if (IS_ERR(folio)) {</div><div class='del'>-		clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='del'>-		return NULL;</div><div class='add'>+	fq = iter-&gt;fq;</div><div class='add'>+	if (!fq)</div><div class='add'>+		fq = dvnode-&gt;directory;</div><div class='add'>+</div><div class='add'>+	/* Search the folio queue for the folio containing the block... */</div><div class='add'>+	for (; fq; fq = fq-&gt;next) {</div><div class='add'>+		for (int s = iter-&gt;fq_slot; s &lt; folioq_count(fq); s++) {</div><div class='add'>+			size_t fsize = folioq_folio_size(fq, s);</div><div class='add'>+</div><div class='add'>+			if (blend &lt;= fpos + fsize) {</div><div class='add'>+				/* ... and then return the mapped block. */</div><div class='add'>+				folio = folioq_folio(fq, s);</div><div class='add'>+				if (WARN_ON_ONCE(folio_pos(folio) != fpos))</div><div class='add'>+					goto fail;</div><div class='add'>+				iter-&gt;fq = fq;</div><div class='add'>+				iter-&gt;fq_slot = s;</div><div class='add'>+				iter-&gt;fpos = fpos;</div><div class='add'>+				return kmap_local_folio(folio, blpos - fpos);</div><div class='add'>+			}</div><div class='add'>+			fpos += fsize;</div><div class='add'>+		}</div><div class='add'>+		iter-&gt;fq_slot = 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (!folio_test_private(folio))</div><div class='del'>-		folio_attach_private(folio, (void *)1);</div><div class='del'>-	return folio;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	iter-&gt;fq = NULL;</div><div class='add'>+	iter-&gt;fq_slot = 0;</div><div class='add'>+	afs_invalidate_dir(dvnode, afs_dir_invalid_edit_get_block);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Scan a directory block looking for a dirent of the right name.</div><div class='ctx'>  */</div><div class='del'>-static int afs_dir_scan_block(union afs_xdr_dir_block *block, struct qstr *name,</div><div class='add'>+static int afs_dir_scan_block(const union afs_xdr_dir_block *block, const struct qstr *name,</div><div class='ctx'> 			      unsigned int blocknum)</div><div class='ctx'> {</div><div class='del'>-	union afs_xdr_dirent *de;</div><div class='add'>+	const union afs_xdr_dirent *de;</div><div class='ctx'> 	u64 bitmap;</div><div class='ctx'> 	int d, len, n;</div><div class='ctx'> </div><div class='hunk'>@@ -204,14 +239,13 @@ static void afs_edit_init_block(union afs_xdr_dir_block *meta,</div><div class='ctx'>  * The caller must hold the inode locked.</div><div class='ctx'>  */</div><div class='ctx'> void afs_edit_dir_add(struct afs_vnode *vnode,</div><div class='del'>-		      struct qstr *name, struct afs_fid *new_fid,</div><div class='add'>+		      const struct qstr *name, struct afs_fid *new_fid,</div><div class='ctx'> 		      enum afs_edit_dir_reason why)</div><div class='ctx'> {</div><div class='ctx'> 	union afs_xdr_dir_block *meta, *block;</div><div class='ctx'> 	union afs_xdr_dirent *de;</div><div class='del'>-	struct folio *folio0, *folio;</div><div class='del'>-	unsigned int need_slots, nr_blocks, b;</div><div class='del'>-	pgoff_t index;</div><div class='add'>+	struct afs_dir_iter iter = { .dvnode = vnode };</div><div class='add'>+	unsigned int nr_blocks, b, entry;</div><div class='ctx'> 	loff_t i_size;</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='hunk'>@@ -220,20 +254,17 @@ void afs_edit_dir_add(struct afs_vnode *vnode,</div><div class='ctx'> 	i_size = i_size_read(&amp;vnode-&gt;netfs.inode);</div><div class='ctx'> 	if (i_size &gt; AFS_DIR_BLOCK_SIZE * AFS_DIR_MAX_BLOCKS ||</div><div class='ctx'> 	    (i_size &amp; (AFS_DIR_BLOCK_SIZE - 1))) {</div><div class='del'>-		clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='add'>+		afs_invalidate_dir(vnode, afs_dir_invalid_edit_add_bad_size);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	folio0 = afs_dir_get_folio(vnode, 0);</div><div class='del'>-	if (!folio0) {</div><div class='del'>-		_leave(" [fgp]");</div><div class='add'>+	meta = afs_dir_get_block(&amp;iter, 0);</div><div class='add'>+	if (!meta)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Work out how many slots we're going to need. */</div><div class='del'>-	need_slots = afs_dir_calc_slots(name-&gt;len);</div><div class='add'>+	iter.nr_slots = afs_dir_calc_slots(name-&gt;len);</div><div class='ctx'> </div><div class='del'>-	meta = kmap_local_folio(folio0, 0);</div><div class='ctx'> 	if (i_size == 0)</div><div class='ctx'> 		goto new_directory;</div><div class='ctx'> 	nr_blocks = i_size / AFS_DIR_BLOCK_SIZE;</div><div class='hunk'>@@ -245,22 +276,21 @@ void afs_edit_dir_add(struct afs_vnode *vnode,</div><div class='ctx'> 		/* If the directory extended into a new folio, then we need to</div><div class='ctx'> 		 * tack a new folio on the end.</div><div class='ctx'> 		 */</div><div class='del'>-		index = b / AFS_DIR_BLOCKS_PER_PAGE;</div><div class='ctx'> 		if (nr_blocks &gt;= AFS_DIR_MAX_BLOCKS)</div><div class='del'>-			goto error;</div><div class='del'>-		if (index &gt;= folio_nr_pages(folio0)) {</div><div class='del'>-			folio = afs_dir_get_folio(vnode, index);</div><div class='del'>-			if (!folio)</div><div class='del'>-				goto error;</div><div class='del'>-		} else {</div><div class='del'>-			folio = folio0;</div><div class='del'>-		}</div><div class='add'>+			goto error_too_many_blocks;</div><div class='ctx'> </div><div class='del'>-		block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_file_pos(folio));</div><div class='add'>+		/* Lower dir blocks have a counter in the header we can check. */</div><div class='add'>+		if (b &lt; AFS_DIR_BLOCKS_WITH_CTR &amp;&amp;</div><div class='add'>+		    meta-&gt;meta.alloc_ctrs[b] &lt; iter.nr_slots)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		block = afs_dir_get_block(&amp;iter, b);</div><div class='add'>+		if (!block)</div><div class='add'>+			goto error;</div><div class='ctx'> </div><div class='ctx'> 		/* Abandon the edit if we got a callback break. */</div><div class='ctx'> 		if (!test_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags))</div><div class='del'>-			goto invalidated;</div><div class='add'>+			goto already_invalidated;</div><div class='ctx'> </div><div class='ctx'> 		_debug("block %u: %2u %3u %u",</div><div class='ctx'> 		       b,</div><div class='hunk'>@@ -275,31 +305,23 @@ void afs_edit_dir_add(struct afs_vnode *vnode,</div><div class='ctx'> 			afs_set_i_size(vnode, (b + 1) * AFS_DIR_BLOCK_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Only lower dir blocks have a counter in the header. */</div><div class='del'>-		if (b &gt;= AFS_DIR_BLOCKS_WITH_CTR ||</div><div class='del'>-		    meta-&gt;meta.alloc_ctrs[b] &gt;= need_slots) {</div><div class='del'>-			/* We need to try and find one or more consecutive</div><div class='del'>-			 * slots to hold the entry.</div><div class='del'>-			 */</div><div class='del'>-			slot = afs_find_contig_bits(block, need_slots);</div><div class='del'>-			if (slot &gt;= 0) {</div><div class='del'>-				_debug("slot %u", slot);</div><div class='del'>-				goto found_space;</div><div class='del'>-			}</div><div class='add'>+		/* We need to try and find one or more consecutive slots to</div><div class='add'>+		 * hold the entry.</div><div class='add'>+		 */</div><div class='add'>+		slot = afs_find_contig_bits(block, iter.nr_slots);</div><div class='add'>+		if (slot &gt;= 0) {</div><div class='add'>+			_debug("slot %u", slot);</div><div class='add'>+			goto found_space;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		kunmap_local(block);</div><div class='del'>-		if (folio != folio0) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			folio_put(folio);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* There are no spare slots of sufficient size, yet the operation</div><div class='ctx'> 	 * succeeded.  Download the directory again.</div><div class='ctx'> 	 */</div><div class='ctx'> 	trace_afs_edit_dir(vnode, why, afs_edit_dir_create_nospc, 0, 0, 0, 0, name-&gt;name);</div><div class='del'>-	clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='add'>+	afs_invalidate_dir(vnode, afs_dir_invalid_edit_add_no_slots);</div><div class='ctx'> 	goto out_unmap;</div><div class='ctx'> </div><div class='ctx'> new_directory:</div><div class='hunk'>@@ -307,8 +329,7 @@ new_directory:</div><div class='ctx'> 	i_size = AFS_DIR_BLOCK_SIZE;</div><div class='ctx'> 	afs_set_i_size(vnode, i_size);</div><div class='ctx'> 	slot = AFS_DIR_RESV_BLOCKS0;</div><div class='del'>-	folio = folio0;</div><div class='del'>-	block = kmap_local_folio(folio, 0);</div><div class='add'>+	block = afs_dir_get_block(&amp;iter, 0);</div><div class='ctx'> 	nr_blocks = 1;</div><div class='ctx'> 	b = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -326,41 +347,39 @@ found_space:</div><div class='ctx'> 	de-&gt;u.name[name-&gt;len] = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust the bitmap. */</div><div class='del'>-	afs_set_contig_bits(block, slot, need_slots);</div><div class='del'>-	kunmap_local(block);</div><div class='del'>-	if (folio != folio0) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	}</div><div class='add'>+	afs_set_contig_bits(block, slot, iter.nr_slots);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust the allocation counter. */</div><div class='ctx'> 	if (b &lt; AFS_DIR_BLOCKS_WITH_CTR)</div><div class='del'>-		meta-&gt;meta.alloc_ctrs[b] -= need_slots;</div><div class='add'>+		meta-&gt;meta.alloc_ctrs[b] -= iter.nr_slots;</div><div class='add'>+</div><div class='add'>+	/* Adjust the hash chain. */</div><div class='add'>+	entry = b * AFS_DIR_SLOTS_PER_BLOCK + slot;</div><div class='add'>+	iter.bucket = afs_dir_hash_name(name);</div><div class='add'>+	de-&gt;u.hash_next = meta-&gt;meta.hashtable[iter.bucket];</div><div class='add'>+	meta-&gt;meta.hashtable[iter.bucket] = htons(entry);</div><div class='add'>+	kunmap_local(block);</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_iversion_raw(&amp;vnode-&gt;netfs.inode);</div><div class='ctx'> 	afs_stat_v(vnode, n_dir_cr);</div><div class='ctx'> 	_debug("Insert %s in %u[%u]", name-&gt;name, b, slot);</div><div class='ctx'> </div><div class='add'>+	netfs_single_mark_inode_dirty(&amp;vnode-&gt;netfs.inode);</div><div class='add'>+</div><div class='ctx'> out_unmap:</div><div class='ctx'> 	kunmap_local(meta);</div><div class='del'>-	folio_unlock(folio0);</div><div class='del'>-	folio_put(folio0);</div><div class='ctx'> 	_leave("");</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>-invalidated:</div><div class='add'>+already_invalidated:</div><div class='ctx'> 	trace_afs_edit_dir(vnode, why, afs_edit_dir_create_inval, 0, 0, 0, 0, name-&gt;name);</div><div class='del'>-	clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='ctx'> 	kunmap_local(block);</div><div class='del'>-	if (folio != folio0) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	}</div><div class='ctx'> 	goto out_unmap;</div><div class='ctx'> </div><div class='add'>+error_too_many_blocks:</div><div class='add'>+	afs_invalidate_dir(vnode, afs_dir_invalid_edit_add_too_many_blocks);</div><div class='ctx'> error:</div><div class='ctx'> 	trace_afs_edit_dir(vnode, why, afs_edit_dir_create_error, 0, 0, 0, 0, name-&gt;name);</div><div class='del'>-	clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='ctx'> 	goto out_unmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,15 +391,16 @@ error:</div><div class='ctx'>  * The caller must hold the inode locked.</div><div class='ctx'>  */</div><div class='ctx'> void afs_edit_dir_remove(struct afs_vnode *vnode,</div><div class='del'>-			 struct qstr *name, enum afs_edit_dir_reason why)</div><div class='add'>+			 const struct qstr *name, enum afs_edit_dir_reason why)</div><div class='ctx'> {</div><div class='del'>-	union afs_xdr_dir_block *meta, *block;</div><div class='del'>-	union afs_xdr_dirent *de;</div><div class='del'>-	struct folio *folio0, *folio;</div><div class='del'>-	unsigned int need_slots, nr_blocks, b;</div><div class='del'>-	pgoff_t index;</div><div class='add'>+	union afs_xdr_dir_block *meta, *block, *pblock;</div><div class='add'>+	union afs_xdr_dirent *de, *pde;</div><div class='add'>+	struct afs_dir_iter iter = { .dvnode = vnode };</div><div class='add'>+	struct afs_fid fid;</div><div class='add'>+	unsigned int b, slot, entry;</div><div class='ctx'> 	loff_t i_size;</div><div class='del'>-	int slot;</div><div class='add'>+	__be16 next;</div><div class='add'>+	int found;</div><div class='ctx'> </div><div class='ctx'> 	_enter(",,{%d,%s},", name-&gt;len, name-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -388,81 +408,95 @@ void afs_edit_dir_remove(struct afs_vnode *vnode,</div><div class='ctx'> 	if (i_size &lt; AFS_DIR_BLOCK_SIZE ||</div><div class='ctx'> 	    i_size &gt; AFS_DIR_BLOCK_SIZE * AFS_DIR_MAX_BLOCKS ||</div><div class='ctx'> 	    (i_size &amp; (AFS_DIR_BLOCK_SIZE - 1))) {</div><div class='del'>-		clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='add'>+		afs_invalidate_dir(vnode, afs_dir_invalid_edit_rem_bad_size);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	nr_blocks = i_size / AFS_DIR_BLOCK_SIZE;</div><div class='ctx'> </div><div class='del'>-	folio0 = afs_dir_get_folio(vnode, 0);</div><div class='del'>-	if (!folio0) {</div><div class='del'>-		_leave(" [fgp]");</div><div class='add'>+	if (!afs_dir_init_iter(&amp;iter, name))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Work out how many slots we're going to discard. */</div><div class='del'>-	need_slots = afs_dir_calc_slots(name-&gt;len);</div><div class='del'>-</div><div class='del'>-	meta = kmap_local_folio(folio0, 0);</div><div class='del'>-</div><div class='del'>-	/* Find a block that has sufficient slots available.  Each folio</div><div class='del'>-	 * contains two or more directory blocks.</div><div class='del'>-	 */</div><div class='del'>-	for (b = 0; b &lt; nr_blocks; b++) {</div><div class='del'>-		index = b / AFS_DIR_BLOCKS_PER_PAGE;</div><div class='del'>-		if (index &gt;= folio_nr_pages(folio0)) {</div><div class='del'>-			folio = afs_dir_get_folio(vnode, index);</div><div class='del'>-			if (!folio)</div><div class='del'>-				goto error;</div><div class='del'>-		} else {</div><div class='del'>-			folio = folio0;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_file_pos(folio));</div><div class='del'>-</div><div class='del'>-		/* Abandon the edit if we got a callback break. */</div><div class='del'>-		if (!test_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags))</div><div class='del'>-			goto invalidated;</div><div class='del'>-</div><div class='del'>-		if (b &gt; AFS_DIR_BLOCKS_WITH_CTR ||</div><div class='del'>-		    meta-&gt;meta.alloc_ctrs[b] &lt;= AFS_DIR_SLOTS_PER_BLOCK - 1 - need_slots) {</div><div class='del'>-			slot = afs_dir_scan_block(block, name, b);</div><div class='del'>-			if (slot &gt;= 0)</div><div class='del'>-				goto found_dirent;</div><div class='del'>-		}</div><div class='add'>+	meta = afs_dir_find_block(&amp;iter, 0);</div><div class='add'>+	if (!meta)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		kunmap_local(block);</div><div class='del'>-		if (folio != folio0) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			folio_put(folio);</div><div class='del'>-		}</div><div class='add'>+	/* Find the entry in the blob. */</div><div class='add'>+	found = afs_dir_search_bucket(&amp;iter, name, &amp;fid);</div><div class='add'>+	if (found &lt; 0) {</div><div class='add'>+		/* Didn't find the dirent to clobber.  Re-download. */</div><div class='add'>+		trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_noent,</div><div class='add'>+				   0, 0, 0, 0, name-&gt;name);</div><div class='add'>+		afs_invalidate_dir(vnode, afs_dir_invalid_edit_rem_wrong_name);</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Didn't find the dirent to clobber.  Download the directory again. */</div><div class='del'>-	trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_noent,</div><div class='del'>-			   0, 0, 0, 0, name-&gt;name);</div><div class='del'>-	clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='del'>-	goto out_unmap;</div><div class='add'>+	entry = found;</div><div class='add'>+	b    = entry / AFS_DIR_SLOTS_PER_BLOCK;</div><div class='add'>+	slot = entry % AFS_DIR_SLOTS_PER_BLOCK;</div><div class='ctx'> </div><div class='del'>-found_dirent:</div><div class='add'>+	block = afs_dir_find_block(&amp;iter, b);</div><div class='add'>+	if (!block)</div><div class='add'>+		goto error;</div><div class='add'>+	if (!test_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags))</div><div class='add'>+		goto already_invalidated;</div><div class='add'>+</div><div class='add'>+	/* Check and clear the entry. */</div><div class='ctx'> 	de = &amp;block-&gt;dirents[slot];</div><div class='add'>+	if (de-&gt;u.valid != 1)</div><div class='add'>+		goto error_unmap;</div><div class='ctx'> </div><div class='ctx'> 	trace_afs_edit_dir(vnode, why, afs_edit_dir_delete, b, slot,</div><div class='ctx'> 			   ntohl(de-&gt;u.vnode), ntohl(de-&gt;u.unique),</div><div class='ctx'> 			   name-&gt;name);</div><div class='ctx'> </div><div class='del'>-	memset(de, 0, sizeof(*de) * need_slots);</div><div class='del'>-</div><div class='ctx'> 	/* Adjust the bitmap. */</div><div class='del'>-	afs_clear_contig_bits(block, slot, need_slots);</div><div class='del'>-	kunmap_local(block);</div><div class='del'>-	if (folio != folio0) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	}</div><div class='add'>+	afs_clear_contig_bits(block, slot, iter.nr_slots);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust the allocation counter. */</div><div class='ctx'> 	if (b &lt; AFS_DIR_BLOCKS_WITH_CTR)</div><div class='del'>-		meta-&gt;meta.alloc_ctrs[b] += need_slots;</div><div class='add'>+		meta-&gt;meta.alloc_ctrs[b] += iter.nr_slots;</div><div class='add'>+</div><div class='add'>+	/* Clear the constituent entries. */</div><div class='add'>+	next = de-&gt;u.hash_next;</div><div class='add'>+	memset(de, 0, sizeof(*de) * iter.nr_slots);</div><div class='add'>+	kunmap_local(block);</div><div class='add'>+</div><div class='add'>+	/* Adjust the hash chain: if iter-&gt;prev_entry is 0, the hashtable head</div><div class='add'>+	 * index is previous; otherwise it's slot number of the previous entry.</div><div class='add'>+	 */</div><div class='add'>+	if (!iter.prev_entry) {</div><div class='add'>+		__be16 prev_next = meta-&gt;meta.hashtable[iter.bucket];</div><div class='add'>+</div><div class='add'>+		if (unlikely(prev_next != htons(entry))) {</div><div class='add'>+			pr_warn("%llx:%llx:%x: not head of chain b=%x p=%x,%x e=%x %*s",</div><div class='add'>+				vnode-&gt;fid.vid, vnode-&gt;fid.vnode, vnode-&gt;fid.unique,</div><div class='add'>+				iter.bucket, iter.prev_entry, prev_next, entry,</div><div class='add'>+				name-&gt;len, name-&gt;name);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		meta-&gt;meta.hashtable[iter.bucket] = next;</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int pb = iter.prev_entry / AFS_DIR_SLOTS_PER_BLOCK;</div><div class='add'>+		unsigned int ps = iter.prev_entry % AFS_DIR_SLOTS_PER_BLOCK;</div><div class='add'>+		__be16 prev_next;</div><div class='add'>+</div><div class='add'>+		pblock = afs_dir_find_block(&amp;iter, pb);</div><div class='add'>+		if (!pblock)</div><div class='add'>+			goto error;</div><div class='add'>+		pde = &amp;pblock-&gt;dirents[ps];</div><div class='add'>+		prev_next = pde-&gt;u.hash_next;</div><div class='add'>+		if (prev_next != htons(entry)) {</div><div class='add'>+			kunmap_local(pblock);</div><div class='add'>+			pr_warn("%llx:%llx:%x: not prev in chain b=%x p=%x,%x e=%x %*s",</div><div class='add'>+				vnode-&gt;fid.vid, vnode-&gt;fid.vnode, vnode-&gt;fid.unique,</div><div class='add'>+				iter.bucket, iter.prev_entry, prev_next, entry,</div><div class='add'>+				name-&gt;len, name-&gt;name);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		pde-&gt;u.hash_next = next;</div><div class='add'>+		kunmap_local(pblock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netfs_single_mark_inode_dirty(&amp;vnode-&gt;netfs.inode);</div><div class='ctx'> </div><div class='ctx'> 	inode_set_iversion_raw(&amp;vnode-&gt;netfs.inode, vnode-&gt;status.data_version);</div><div class='ctx'> 	afs_stat_v(vnode, n_dir_rm);</div><div class='hunk'>@@ -470,25 +504,145 @@ found_dirent:</div><div class='ctx'> </div><div class='ctx'> out_unmap:</div><div class='ctx'> 	kunmap_local(meta);</div><div class='del'>-	folio_unlock(folio0);</div><div class='del'>-	folio_put(folio0);</div><div class='ctx'> 	_leave("");</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>-invalidated:</div><div class='add'>+already_invalidated:</div><div class='add'>+	kunmap_local(block);</div><div class='ctx'> 	trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_inval,</div><div class='ctx'> 			   0, 0, 0, 0, name-&gt;name);</div><div class='del'>-	clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='del'>-	kunmap_local(block);</div><div class='del'>-	if (folio != folio0) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	}</div><div class='ctx'> 	goto out_unmap;</div><div class='ctx'> </div><div class='add'>+error_unmap:</div><div class='add'>+	kunmap_local(block);</div><div class='ctx'> error:</div><div class='ctx'> 	trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_error,</div><div class='ctx'> 			   0, 0, 0, 0, name-&gt;name);</div><div class='del'>-	clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='ctx'> 	goto out_unmap;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Edit an entry in a directory to update the vnode it refers to.  This is also</div><div class='add'>+ * used to update the ".." entry in a directory.</div><div class='add'>+ */</div><div class='add'>+void afs_edit_dir_update(struct afs_vnode *vnode, const struct qstr *name,</div><div class='add'>+			 struct afs_vnode *new_dvnode, enum afs_edit_dir_reason why)</div><div class='add'>+{</div><div class='add'>+	union afs_xdr_dir_block *block;</div><div class='add'>+	union afs_xdr_dirent *de;</div><div class='add'>+	struct afs_dir_iter iter = { .dvnode = vnode };</div><div class='add'>+	unsigned int nr_blocks, b;</div><div class='add'>+	loff_t i_size;</div><div class='add'>+	int slot;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	i_size = i_size_read(&amp;vnode-&gt;netfs.inode);</div><div class='add'>+	if (i_size &lt; AFS_DIR_BLOCK_SIZE) {</div><div class='add'>+		afs_invalidate_dir(vnode, afs_dir_invalid_edit_upd_bad_size);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nr_blocks = i_size / AFS_DIR_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Find a block that has sufficient slots available.  Each folio</div><div class='add'>+	 * contains two or more directory blocks.</div><div class='add'>+	 */</div><div class='add'>+	for (b = 0; b &lt; nr_blocks; b++) {</div><div class='add'>+		block = afs_dir_get_block(&amp;iter, b);</div><div class='add'>+		if (!block)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		/* Abandon the edit if we got a callback break. */</div><div class='add'>+		if (!test_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags))</div><div class='add'>+			goto already_invalidated;</div><div class='add'>+</div><div class='add'>+		slot = afs_dir_scan_block(block, name, b);</div><div class='add'>+		if (slot &gt;= 0)</div><div class='add'>+			goto found_dirent;</div><div class='add'>+</div><div class='add'>+		kunmap_local(block);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Didn't find the dirent to clobber.  Download the directory again. */</div><div class='add'>+	trace_afs_edit_dir(vnode, why, afs_edit_dir_update_nodd,</div><div class='add'>+			   0, 0, 0, 0, name-&gt;name);</div><div class='add'>+	afs_invalidate_dir(vnode, afs_dir_invalid_edit_upd_no_dd);</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+found_dirent:</div><div class='add'>+	de = &amp;block-&gt;dirents[slot];</div><div class='add'>+	de-&gt;u.vnode  = htonl(new_dvnode-&gt;fid.vnode);</div><div class='add'>+	de-&gt;u.unique = htonl(new_dvnode-&gt;fid.unique);</div><div class='add'>+</div><div class='add'>+	trace_afs_edit_dir(vnode, why, afs_edit_dir_update_dd, b, slot,</div><div class='add'>+			   ntohl(de-&gt;u.vnode), ntohl(de-&gt;u.unique), name-&gt;name);</div><div class='add'>+</div><div class='add'>+	kunmap_local(block);</div><div class='add'>+	netfs_single_mark_inode_dirty(&amp;vnode-&gt;netfs.inode);</div><div class='add'>+	inode_set_iversion_raw(&amp;vnode-&gt;netfs.inode, vnode-&gt;status.data_version);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	_leave("");</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+already_invalidated:</div><div class='add'>+	kunmap_local(block);</div><div class='add'>+	trace_afs_edit_dir(vnode, why, afs_edit_dir_update_inval,</div><div class='add'>+			   0, 0, 0, 0, name-&gt;name);</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	trace_afs_edit_dir(vnode, why, afs_edit_dir_update_error,</div><div class='add'>+			   0, 0, 0, 0, name-&gt;name);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise a new directory.  We need to fill in the "." and ".." entries.</div><div class='add'>+ */</div><div class='add'>+void afs_mkdir_init_dir(struct afs_vnode *dvnode, struct afs_vnode *parent_dvnode)</div><div class='add'>+{</div><div class='add'>+	union afs_xdr_dir_block *meta;</div><div class='add'>+	struct afs_dir_iter iter = { .dvnode = dvnode };</div><div class='add'>+	union afs_xdr_dirent *de;</div><div class='add'>+	unsigned int slot = AFS_DIR_RESV_BLOCKS0;</div><div class='add'>+	loff_t i_size;</div><div class='add'>+</div><div class='add'>+	i_size = i_size_read(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+	if (i_size != AFS_DIR_BLOCK_SIZE) {</div><div class='add'>+		afs_invalidate_dir(dvnode, afs_dir_invalid_edit_add_bad_size);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	meta = afs_dir_get_block(&amp;iter, 0);</div><div class='add'>+	if (!meta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	afs_edit_init_block(meta, meta, 0);</div><div class='add'>+</div><div class='add'>+	de = &amp;meta-&gt;dirents[slot];</div><div class='add'>+	de-&gt;u.valid  = 1;</div><div class='add'>+	de-&gt;u.vnode  = htonl(dvnode-&gt;fid.vnode);</div><div class='add'>+	de-&gt;u.unique = htonl(dvnode-&gt;fid.unique);</div><div class='add'>+	memcpy(de-&gt;u.name, ".", 2);</div><div class='add'>+	trace_afs_edit_dir(dvnode, afs_edit_dir_for_mkdir, afs_edit_dir_mkdir, 0, slot,</div><div class='add'>+			   dvnode-&gt;fid.vnode, dvnode-&gt;fid.unique, ".");</div><div class='add'>+	slot++;</div><div class='add'>+</div><div class='add'>+	de = &amp;meta-&gt;dirents[slot];</div><div class='add'>+	de-&gt;u.valid  = 1;</div><div class='add'>+	de-&gt;u.vnode  = htonl(parent_dvnode-&gt;fid.vnode);</div><div class='add'>+	de-&gt;u.unique = htonl(parent_dvnode-&gt;fid.unique);</div><div class='add'>+	memcpy(de-&gt;u.name, "..", 3);</div><div class='add'>+	trace_afs_edit_dir(dvnode, afs_edit_dir_for_mkdir, afs_edit_dir_mkdir, 0, slot,</div><div class='add'>+			   parent_dvnode-&gt;fid.vnode, parent_dvnode-&gt;fid.unique, "..");</div><div class='add'>+</div><div class='add'>+	afs_set_contig_bits(meta, AFS_DIR_RESV_BLOCKS0, 2);</div><div class='add'>+	meta-&gt;meta.alloc_ctrs[0] -= 2;</div><div class='add'>+	kunmap_local(meta);</div><div class='add'>+</div><div class='add'>+	netfs_single_mark_inode_dirty(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+	set_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags);</div><div class='add'>+	set_bit(AFS_VNODE_DIR_READ, &amp;dvnode-&gt;flags);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/afs/dir_search.c b/fs/afs/dir_search.c<br/>new file mode 100644<br/>index 000000000000..d2516e55b5ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/dir_search.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/dir_search.c</a></div><div class='hunk'>@@ -0,0 +1,227 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Search a directory's hash table.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ *</div><div class='add'>+ * https://tools.ietf.org/html/draft-keiser-afs3-directory-object-00</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/iversion.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "afs_fs.h"</div><div class='add'>+#include "xdr_fs.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate the name hash.</div><div class='add'>+ */</div><div class='add'>+unsigned int afs_dir_hash_name(const struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	const unsigned char *p = name-&gt;name;</div><div class='add'>+	unsigned int hash = 0, i;</div><div class='add'>+	int bucket;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; name-&gt;len; i++)</div><div class='add'>+		hash = (hash * 173) + p[i];</div><div class='add'>+	bucket = hash &amp; (AFS_DIR_HASHTBL_SIZE - 1);</div><div class='add'>+	if (hash &gt; INT_MAX) {</div><div class='add'>+		bucket = AFS_DIR_HASHTBL_SIZE - bucket;</div><div class='add'>+		bucket &amp;= (AFS_DIR_HASHTBL_SIZE - 1);</div><div class='add'>+	}</div><div class='add'>+	return bucket;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset a directory iterator.</div><div class='add'>+ */</div><div class='add'>+static bool afs_dir_reset_iter(struct afs_dir_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned long long i_size = i_size_read(&amp;iter-&gt;dvnode-&gt;netfs.inode);</div><div class='add'>+	unsigned int nblocks;</div><div class='add'>+</div><div class='add'>+	/* Work out the maximum number of steps we can take. */</div><div class='add'>+	nblocks = umin(i_size / AFS_DIR_BLOCK_SIZE, AFS_DIR_MAX_BLOCKS);</div><div class='add'>+	if (!nblocks)</div><div class='add'>+		return false;</div><div class='add'>+	iter-&gt;loop_check = nblocks * (AFS_DIR_SLOTS_PER_BLOCK - AFS_DIR_RESV_BLOCKS);</div><div class='add'>+	iter-&gt;prev_entry = 0; /* Hash head is previous */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise a directory iterator for looking up a name.</div><div class='add'>+ */</div><div class='add'>+bool afs_dir_init_iter(struct afs_dir_iter *iter, const struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	iter-&gt;nr_slots = afs_dir_calc_slots(name-&gt;len);</div><div class='add'>+	iter-&gt;bucket = afs_dir_hash_name(name);</div><div class='add'>+	return afs_dir_reset_iter(iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get a specific block.</div><div class='add'>+ */</div><div class='add'>+union afs_xdr_dir_block *afs_dir_find_block(struct afs_dir_iter *iter, size_t block)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *fq = iter-&gt;fq;</div><div class='add'>+	struct afs_vnode *dvnode = iter-&gt;dvnode;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	size_t blpos = block * AFS_DIR_BLOCK_SIZE;</div><div class='add'>+	size_t blend = (block + 1) * AFS_DIR_BLOCK_SIZE, fpos = iter-&gt;fpos;</div><div class='add'>+	int slot = iter-&gt;fq_slot;</div><div class='add'>+</div><div class='add'>+	_enter("%zx,%d", block, slot);</div><div class='add'>+</div><div class='add'>+	if (iter-&gt;block) {</div><div class='add'>+		kunmap_local(iter-&gt;block);</div><div class='add'>+		iter-&gt;block = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dvnode-&gt;directory_size &lt; blend)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (!fq || blpos &lt; fpos) {</div><div class='add'>+		fq = dvnode-&gt;directory;</div><div class='add'>+		slot = 0;</div><div class='add'>+		fpos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Search the folio queue for the folio containing the block... */</div><div class='add'>+	for (; fq; fq = fq-&gt;next) {</div><div class='add'>+		for (; slot &lt; folioq_count(fq); slot++) {</div><div class='add'>+			size_t fsize = folioq_folio_size(fq, slot);</div><div class='add'>+</div><div class='add'>+			if (blend &lt;= fpos + fsize) {</div><div class='add'>+				/* ... and then return the mapped block. */</div><div class='add'>+				folio = folioq_folio(fq, slot);</div><div class='add'>+				if (WARN_ON_ONCE(folio_pos(folio) != fpos))</div><div class='add'>+					goto fail;</div><div class='add'>+				iter-&gt;fq = fq;</div><div class='add'>+				iter-&gt;fq_slot = slot;</div><div class='add'>+				iter-&gt;fpos = fpos;</div><div class='add'>+				iter-&gt;block = kmap_local_folio(folio, blpos - fpos);</div><div class='add'>+				return iter-&gt;block;</div><div class='add'>+			}</div><div class='add'>+			fpos += fsize;</div><div class='add'>+		}</div><div class='add'>+		slot = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	iter-&gt;fq = NULL;</div><div class='add'>+	iter-&gt;fq_slot = 0;</div><div class='add'>+	afs_invalidate_dir(dvnode, afs_dir_invalid_edit_get_block);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Search through a directory bucket.</div><div class='add'>+ */</div><div class='add'>+int afs_dir_search_bucket(struct afs_dir_iter *iter, const struct qstr *name,</div><div class='add'>+			  struct afs_fid *_fid)</div><div class='add'>+{</div><div class='add'>+	const union afs_xdr_dir_block *meta;</div><div class='add'>+	unsigned int entry;</div><div class='add'>+	int ret = -ESTALE;</div><div class='add'>+</div><div class='add'>+	meta = afs_dir_find_block(iter, 0);</div><div class='add'>+	if (!meta)</div><div class='add'>+		return -ESTALE;</div><div class='add'>+</div><div class='add'>+	entry = ntohs(meta-&gt;meta.hashtable[iter-&gt;bucket &amp; (AFS_DIR_HASHTBL_SIZE - 1)]);</div><div class='add'>+	_enter("%x,%x", iter-&gt;bucket, entry);</div><div class='add'>+</div><div class='add'>+	while (entry) {</div><div class='add'>+		const union afs_xdr_dir_block *block;</div><div class='add'>+		const union afs_xdr_dirent *dire;</div><div class='add'>+		unsigned int blnum = entry / AFS_DIR_SLOTS_PER_BLOCK;</div><div class='add'>+		unsigned int slot = entry % AFS_DIR_SLOTS_PER_BLOCK;</div><div class='add'>+		unsigned int resv = (blnum == 0 ? AFS_DIR_RESV_BLOCKS0 : AFS_DIR_RESV_BLOCKS);</div><div class='add'>+</div><div class='add'>+		_debug("search %x", entry);</div><div class='add'>+</div><div class='add'>+		if (slot &lt; resv) {</div><div class='add'>+			kdebug("slot out of range h=%x rs=%2x sl=%2x-%2x",</div><div class='add'>+			       iter-&gt;bucket, resv, slot, slot + iter-&gt;nr_slots - 1);</div><div class='add'>+			goto bad;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		block = afs_dir_find_block(iter, blnum);</div><div class='add'>+		if (!block)</div><div class='add'>+			goto bad;</div><div class='add'>+		dire = &amp;block-&gt;dirents[slot];</div><div class='add'>+</div><div class='add'>+		if (slot + iter-&gt;nr_slots &lt;= AFS_DIR_SLOTS_PER_BLOCK &amp;&amp;</div><div class='add'>+		    memcmp(dire-&gt;u.name, name-&gt;name, name-&gt;len) == 0 &amp;&amp;</div><div class='add'>+		    dire-&gt;u.name[name-&gt;len] == '\0') {</div><div class='add'>+			_fid-&gt;vnode  = ntohl(dire-&gt;u.vnode);</div><div class='add'>+			_fid-&gt;unique = ntohl(dire-&gt;u.unique);</div><div class='add'>+			ret = entry;</div><div class='add'>+			goto found;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iter-&gt;prev_entry = entry;</div><div class='add'>+		entry = ntohs(dire-&gt;u.hash_next);</div><div class='add'>+		if (!--iter-&gt;loop_check) {</div><div class='add'>+			kdebug("dir chain loop h=%x", iter-&gt;bucket);</div><div class='add'>+			goto bad;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -ENOENT;</div><div class='add'>+found:</div><div class='add'>+	if (iter-&gt;block) {</div><div class='add'>+		kunmap_local(iter-&gt;block);</div><div class='add'>+		iter-&gt;block = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+bad:</div><div class='add'>+	if (ret == -ESTALE)</div><div class='add'>+		afs_invalidate_dir(iter-&gt;dvnode, afs_dir_invalid_iter_stale);</div><div class='add'>+	_leave(" = %d", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Search the appropriate hash chain in the contents of an AFS directory.</div><div class='add'>+ */</div><div class='add'>+int afs_dir_search(struct afs_vnode *dvnode, const struct qstr *name,</div><div class='add'>+		   struct afs_fid *_fid, afs_dataversion_t *_dir_version)</div><div class='add'>+{</div><div class='add'>+	struct afs_dir_iter iter = { .dvnode = dvnode, };</div><div class='add'>+	int ret, retry_limit = 3;</div><div class='add'>+</div><div class='add'>+	_enter("{%lu},,,", dvnode-&gt;netfs.inode.i_ino);</div><div class='add'>+</div><div class='add'>+	if (!afs_dir_init_iter(&amp;iter, name))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	do {</div><div class='add'>+		if (--retry_limit &lt; 0) {</div><div class='add'>+			pr_warn("afs_read_dir(): Too many retries\n");</div><div class='add'>+			ret = -ESTALE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = afs_read_dir(dvnode, NULL);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			if (ret != -ESTALE)</div><div class='add'>+				break;</div><div class='add'>+			if (test_bit(AFS_VNODE_DELETED, &amp;dvnode-&gt;flags)) {</div><div class='add'>+				ret = -ESTALE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		*_dir_version = inode_peek_iversion_raw(&amp;dvnode-&gt;netfs.inode);</div><div class='add'>+</div><div class='add'>+		ret = afs_dir_search_bucket(&amp;iter, name, _fid);</div><div class='add'>+		up_read(&amp;dvnode-&gt;validate_lock);</div><div class='add'>+		if (ret == -ESTALE)</div><div class='add'>+			afs_dir_reset_iter(&amp;iter);</div><div class='add'>+	} while (ret == -ESTALE);</div><div class='add'>+</div><div class='add'>+	_leave(" = %d", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/afs/dir_silly.c b/fs/afs/dir_silly.c<br/>index a1e581946b93..014495d4b868 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/dir_silly.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dir_silly.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/dir_silly.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/dir_silly.c</a></div><div class='hunk'>@@ -69,6 +69,12 @@ static int afs_do_silly_rename(struct afs_vnode *dvnode, struct afs_vnode *vnode</div><div class='ctx'> 	if (IS_ERR(op))</div><div class='ctx'> 		return PTR_ERR(op);</div><div class='ctx'> </div><div class='add'>+	op-&gt;more_files = kvcalloc(2, sizeof(struct afs_vnode_param), GFP_KERNEL);</div><div class='add'>+	if (!op-&gt;more_files) {</div><div class='add'>+		afs_put_operation(op);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	afs_op_set_vnode(op, 0, dvnode);</div><div class='ctx'> 	afs_op_set_vnode(op, 1, dvnode);</div><div class='ctx'> 	op-&gt;file[0].dv_delta = 1;</div><div class='hunk'>@@ -77,6 +83,11 @@ static int afs_do_silly_rename(struct afs_vnode *dvnode, struct afs_vnode *vnode</div><div class='ctx'> 	op-&gt;file[1].modification = true;</div><div class='ctx'> 	op-&gt;file[0].update_ctime = true;</div><div class='ctx'> 	op-&gt;file[1].update_ctime = true;</div><div class='add'>+	op-&gt;more_files[0].vnode		= AFS_FS_I(d_inode(old));</div><div class='add'>+	op-&gt;more_files[0].speculative	= true;</div><div class='add'>+	op-&gt;more_files[1].vnode		= AFS_FS_I(d_inode(new));</div><div class='add'>+	op-&gt;more_files[1].speculative	= true;</div><div class='add'>+	op-&gt;nr_files = 4;</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;dentry		= old;</div><div class='ctx'> 	op-&gt;dentry_2		= new;</div><div class='hunk'>@@ -113,16 +124,14 @@ int afs_sillyrename(struct afs_vnode *dvnode, struct afs_vnode *vnode,</div><div class='ctx'> </div><div class='ctx'> 	sdentry = NULL;</div><div class='ctx'> 	do {</div><div class='del'>-		int slen;</div><div class='del'>-</div><div class='ctx'> 		dput(sdentry);</div><div class='ctx'> 		sillycounter++;</div><div class='ctx'> </div><div class='ctx'> 		/* Create a silly name.  Note that the ".__afs" prefix is</div><div class='ctx'> 		 * understood by the salvager and must not be changed.</div><div class='ctx'> 		 */</div><div class='del'>-		slen = scnprintf(silly, sizeof(silly), ".__afs%04X", sillycounter);</div><div class='del'>-		sdentry = lookup_one_len(silly, dentry-&gt;d_parent, slen);</div><div class='add'>+		scnprintf(silly, sizeof(silly), ".__afs%04X", sillycounter);</div><div class='add'>+		sdentry = lookup_noperm(&amp;QSTR(silly), dentry-&gt;d_parent);</div><div class='ctx'> </div><div class='ctx'> 		/* N.B. Better to return EBUSY here ... it could be dangerous</div><div class='ctx'> 		 * to delete the file while it's in use.</div><div class='head'>diff --git a/fs/afs/dynroot.c b/fs/afs/dynroot.c<br/>index d3bc4a2d7085..aa56e8951e03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/dynroot.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/dynroot.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/dynroot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/dynroot.c</a></div><div class='hunk'>@@ -10,16 +10,19 @@</div><div class='ctx'> #include &lt;linux/dns_resolver.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-static atomic_t afs_autocell_ino;</div><div class='add'>+#define AFS_MIN_DYNROOT_CELL_INO 4 /* Allow for ., .., @cell, .@cell */</div><div class='add'>+#define AFS_MAX_DYNROOT_CELL_INO ((unsigned int)INT_MAX)</div><div class='add'>+</div><div class='add'>+static struct dentry *afs_lookup_atcell(struct inode *dir, struct dentry *dentry, ino_t ino);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * iget5() comparator for inode created by autocell operations</div><div class='del'>- *</div><div class='del'>- * These pseudo inodes don't match anything.</div><div class='ctx'>  */</div><div class='ctx'> static int afs_iget5_pseudo_test(struct inode *inode, void *opaque)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	struct afs_fid *fid = opaque;</div><div class='add'>+</div><div class='add'>+	return inode-&gt;i_ino == fid-&gt;vnode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -39,28 +42,16 @@ static int afs_iget5_pseudo_set(struct inode *inode, void *opaque)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Create an inode for a dynamic root directory or an autocell dynamic</div><div class='del'>- * automount dir.</div><div class='add'>+ * Create an inode for an autocell dynamic automount dir.</div><div class='ctx'>  */</div><div class='del'>-struct inode *afs_iget_pseudo_dir(struct super_block *sb, bool root)</div><div class='add'>+static struct inode *afs_iget_pseudo_dir(struct super_block *sb, ino_t ino)</div><div class='ctx'> {</div><div class='del'>-	struct afs_super_info *as = AFS_FS_S(sb);</div><div class='ctx'> 	struct afs_vnode *vnode;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct afs_fid fid = {};</div><div class='add'>+	struct afs_fid fid = { .vnode = ino, .unique = 1, };</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='del'>-	if (as-&gt;volume)</div><div class='del'>-		fid.vid = as-&gt;volume-&gt;vid;</div><div class='del'>-	if (root) {</div><div class='del'>-		fid.vnode = 1;</div><div class='del'>-		fid.unique = 1;</div><div class='del'>-	} else {</div><div class='del'>-		fid.vnode = atomic_inc_return(&amp;afs_autocell_ino);</div><div class='del'>-		fid.unique = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	inode = iget5_locked(sb, fid.vnode,</div><div class='ctx'> 			     afs_iget5_pseudo_test, afs_iget5_pseudo_set, &amp;fid);</div><div class='ctx'> 	if (!inode) {</div><div class='hunk'>@@ -73,163 +64,76 @@ struct inode *afs_iget_pseudo_dir(struct super_block *sb, bool root)</div><div class='ctx'> </div><div class='ctx'> 	vnode = AFS_FS_I(inode);</div><div class='ctx'> </div><div class='del'>-	/* there shouldn't be an existing inode */</div><div class='del'>-	BUG_ON(!(inode-&gt;i_state &amp; I_NEW));</div><div class='del'>-</div><div class='del'>-	netfs_inode_init(&amp;vnode-&gt;netfs, NULL, false);</div><div class='del'>-	inode-&gt;i_size		= 0;</div><div class='del'>-	inode-&gt;i_mode		= S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-	if (root) {</div><div class='del'>-		inode-&gt;i_op	= &amp;afs_dynroot_inode_operations;</div><div class='del'>-		inode-&gt;i_fop	= &amp;simple_dir_operations;</div><div class='del'>-	} else {</div><div class='del'>-		inode-&gt;i_op	= &amp;afs_autocell_inode_operations;</div><div class='del'>-	}</div><div class='del'>-	set_nlink(inode, 2);</div><div class='del'>-	inode-&gt;i_uid		= GLOBAL_ROOT_UID;</div><div class='del'>-	inode-&gt;i_gid		= GLOBAL_ROOT_GID;</div><div class='del'>-	simple_inode_init_ts(inode);</div><div class='del'>-	inode-&gt;i_blocks		= 0;</div><div class='del'>-	inode-&gt;i_generation	= 0;</div><div class='del'>-</div><div class='del'>-	set_bit(AFS_VNODE_PSEUDODIR, &amp;vnode-&gt;flags);</div><div class='del'>-	if (!root) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='add'>+		netfs_inode_init(&amp;vnode-&gt;netfs, NULL, false);</div><div class='add'>+		simple_inode_init_ts(inode);</div><div class='add'>+		set_nlink(inode, 2);</div><div class='add'>+		inode-&gt;i_size		= 0;</div><div class='add'>+		inode-&gt;i_mode		= S_IFDIR | 0555;</div><div class='add'>+		inode-&gt;i_op		= &amp;afs_autocell_inode_operations;</div><div class='add'>+		inode-&gt;i_uid		= GLOBAL_ROOT_UID;</div><div class='add'>+		inode-&gt;i_gid		= GLOBAL_ROOT_GID;</div><div class='add'>+		inode-&gt;i_blocks		= 0;</div><div class='add'>+		inode-&gt;i_generation	= 0;</div><div class='add'>+		inode-&gt;i_flags		|= S_AUTOMOUNT | S_NOATIME;</div><div class='add'>+</div><div class='add'>+		set_bit(AFS_VNODE_PSEUDODIR, &amp;vnode-&gt;flags);</div><div class='ctx'> 		set_bit(AFS_VNODE_MOUNTPOINT, &amp;vnode-&gt;flags);</div><div class='del'>-		inode-&gt;i_flags |= S_AUTOMOUNT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_flags |= S_NOATIME;</div><div class='del'>-	unlock_new_inode(inode);</div><div class='add'>+		unlock_new_inode(inode);</div><div class='add'>+	}</div><div class='ctx'> 	_leave(" = %p", inode);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Probe to see if a cell may exist.  This prevents positive dentries from</div><div class='del'>- * being created unnecessarily.</div><div class='add'>+ * Try to automount the mountpoint with pseudo directory, if the autocell</div><div class='add'>+ * option is set.</div><div class='ctx'>  */</div><div class='del'>-static int afs_probe_cell_name(struct dentry *dentry)</div><div class='add'>+static struct dentry *afs_dynroot_lookup_cell(struct inode *dir, struct dentry *dentry,</div><div class='add'>+					      unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct afs_cell *cell;</div><div class='add'>+	struct afs_cell *cell = NULL;</div><div class='ctx'> 	struct afs_net *net = afs_d2net(dentry);</div><div class='add'>+	struct inode *inode = NULL;</div><div class='ctx'> 	const char *name = dentry-&gt;d_name.name;</div><div class='ctx'> 	size_t len = dentry-&gt;d_name.len;</div><div class='del'>-	char *result = NULL;</div><div class='del'>-	int ret;</div><div class='add'>+	bool dotted = false;</div><div class='add'>+	int ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	/* Names prefixed with a dot are R/W mounts. */</div><div class='ctx'> 	if (name[0] == '.') {</div><div class='del'>-		if (len == 1)</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		name++;</div><div class='ctx'> 		len--;</div><div class='add'>+		dotted = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cell = afs_find_cell(net, name, len, afs_cell_trace_use_probe);</div><div class='del'>-	if (!IS_ERR(cell)) {</div><div class='del'>-		afs_unuse_cell(net, cell, afs_cell_trace_unuse_probe);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = dns_query(net-&gt;net, "afsdb", name, len, "srv=1",</div><div class='del'>-			&amp;result, NULL, false);</div><div class='del'>-	if (ret == -ENODATA || ret == -ENOKEY || ret == 0)</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-	if (ret &gt; 0 &amp;&amp; ret &gt;= sizeof(struct dns_server_list_v1_header)) {</div><div class='del'>-		struct dns_server_list_v1_header *v1 = (void *)result;</div><div class='del'>-</div><div class='del'>-		if (v1-&gt;hdr.zero == 0 &amp;&amp;</div><div class='del'>-		    v1-&gt;hdr.content == DNS_PAYLOAD_IS_SERVER_LIST &amp;&amp;</div><div class='del'>-		    v1-&gt;hdr.version == 1 &amp;&amp;</div><div class='del'>-		    (v1-&gt;status != DNS_LOOKUP_GOOD &amp;&amp;</div><div class='del'>-		     v1-&gt;status != DNS_LOOKUP_GOOD_WITH_BAD))</div><div class='del'>-			return -ENOENT;</div><div class='del'>-</div><div class='add'>+	cell = afs_lookup_cell(net, name, len, NULL,</div><div class='add'>+			       AFS_LOOKUP_CELL_DYNROOT,</div><div class='add'>+			       afs_cell_trace_use_lookup_dynroot);</div><div class='add'>+	if (IS_ERR(cell)) {</div><div class='add'>+		ret = PTR_ERR(cell);</div><div class='add'>+		goto out_no_cell;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(result);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Try to auto mount the mountpoint with pseudo directory, if the autocell</div><div class='del'>- * operation is setted.</div><div class='del'>- */</div><div class='del'>-struct inode *afs_try_auto_mntpt(struct dentry *dentry, struct inode *dir)</div><div class='del'>-{</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(dir);</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	int ret = -ENOENT;</div><div class='del'>-</div><div class='del'>-	_enter("%p{%pd}, {%llx:%llu}",</div><div class='del'>-	       dentry, dentry, vnode-&gt;fid.vid, vnode-&gt;fid.vnode);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(AFS_VNODE_AUTOCELL, &amp;vnode-&gt;flags))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = afs_probe_cell_name(dentry);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	inode = afs_iget_pseudo_dir(dir-&gt;i_sb, false);</div><div class='add'>+	inode = afs_iget_pseudo_dir(dir-&gt;i_sb, cell-&gt;dynroot_ino * 2 + dotted);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		ret = PTR_ERR(inode);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_leave("= %p", inode);</div><div class='del'>-	return inode;</div><div class='add'>+	dentry-&gt;d_fsdata = cell;</div><div class='add'>+	return d_splice_alias(inode, dentry);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	_leave("= %d", ret);</div><div class='add'>+	afs_unuse_cell(cell, afs_cell_trace_unuse_lookup_dynroot);</div><div class='add'>+out_no_cell:</div><div class='add'>+	if (!inode)</div><div class='add'>+		return d_splice_alias(inode, dentry);</div><div class='ctx'> 	return ret == -ENOENT ? NULL : ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Look up @cell in a dynroot directory.  This is a substitution for the</div><div class='del'>- * local cell name for the net namespace.</div><div class='del'>- */</div><div class='del'>-static struct dentry *afs_lookup_atcell(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct afs_cell *cell;</div><div class='del'>-	struct afs_net *net = afs_d2net(dentry);</div><div class='del'>-	struct dentry *ret;</div><div class='del'>-	char *name;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (!net-&gt;ws_cell)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-</div><div class='del'>-	ret = ERR_PTR(-ENOMEM);</div><div class='del'>-	name = kmalloc(AFS_MAXCELLNAME + 1, GFP_KERNEL);</div><div class='del'>-	if (!name)</div><div class='del'>-		goto out_p;</div><div class='del'>-</div><div class='del'>-	down_read(&amp;net-&gt;cells_lock);</div><div class='del'>-	cell = net-&gt;ws_cell;</div><div class='del'>-	if (cell) {</div><div class='del'>-		len = cell-&gt;name_len;</div><div class='del'>-		memcpy(name, cell-&gt;name, len + 1);</div><div class='del'>-	}</div><div class='del'>-	up_read(&amp;net-&gt;cells_lock);</div><div class='del'>-</div><div class='del'>-	ret = ERR_PTR(-ENOENT);</div><div class='del'>-	if (!cell)</div><div class='del'>-		goto out_n;</div><div class='del'>-</div><div class='del'>-	ret = lookup_one_len(name, dentry-&gt;d_parent, len);</div><div class='del'>-</div><div class='del'>-	/* We don't want to d_add() the @cell dentry here as we don't want to</div><div class='del'>-	 * the cached dentry to hide changes to the local cell name.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-out_n:</div><div class='del'>-	kfree(name);</div><div class='del'>-out_p:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Look up an entry in a dynroot directory.</div><div class='ctx'>  */</div><div class='ctx'> static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentry,</div><div class='hunk'>@@ -237,8 +141,6 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr</div><div class='ctx'> {</div><div class='ctx'> 	_enter("%pd", dentry);</div><div class='ctx'> </div><div class='del'>-	ASSERTCMP(d_inode(dentry), ==, NULL);</div><div class='del'>-</div><div class='ctx'> 	if (flags &amp; LOOKUP_CREATE)</div><div class='ctx'> 		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> </div><div class='hunk'>@@ -249,150 +151,256 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr</div><div class='ctx'> </div><div class='ctx'> 	if (dentry-&gt;d_name.len == 5 &amp;&amp;</div><div class='ctx'> 	    memcmp(dentry-&gt;d_name.name, "@cell", 5) == 0)</div><div class='del'>-		return afs_lookup_atcell(dentry);</div><div class='add'>+		return afs_lookup_atcell(dir, dentry, 2);</div><div class='ctx'> </div><div class='del'>-	return d_splice_alias(afs_try_auto_mntpt(dentry, dir), dentry);</div><div class='add'>+	if (dentry-&gt;d_name.len == 6 &amp;&amp;</div><div class='add'>+	    memcmp(dentry-&gt;d_name.name, ".@cell", 6) == 0)</div><div class='add'>+		return afs_lookup_atcell(dir, dentry, 3);</div><div class='add'>+</div><div class='add'>+	return afs_dynroot_lookup_cell(dir, dentry, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct inode_operations afs_dynroot_inode_operations = {</div><div class='ctx'> 	.lookup		= afs_dynroot_lookup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void afs_dynroot_d_release(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct afs_cell *cell = dentry-&gt;d_fsdata;</div><div class='add'>+</div><div class='add'>+	afs_unuse_cell(cell, afs_cell_trace_unuse_dynroot_mntpt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Dirs in the dynamic root don't need revalidation.</div><div class='add'>+ * Keep @cell symlink dentries around, but only keep cell autodirs when they're</div><div class='add'>+ * being used.</div><div class='ctx'>  */</div><div class='del'>-static int afs_dynroot_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int afs_dynroot_delete_dentry(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='add'>+	const struct qstr *name = &amp;dentry-&gt;d_name;</div><div class='add'>+</div><div class='add'>+	if (name-&gt;len == 5 &amp;&amp; memcmp(name-&gt;name, "@cell", 5) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (name-&gt;len == 6 &amp;&amp; memcmp(name-&gt;name, ".@cell", 6) == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct dentry_operations afs_dynroot_dentry_operations = {</div><div class='del'>-	.d_revalidate	= afs_dynroot_d_revalidate,</div><div class='del'>-	.d_delete	= always_delete_dentry,</div><div class='del'>-	.d_release	= afs_d_release,</div><div class='add'>+	.d_delete	= afs_dynroot_delete_dentry,</div><div class='add'>+	.d_release	= afs_dynroot_d_release,</div><div class='ctx'> 	.d_automount	= afs_d_automount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void afs_atcell_delayed_put_cell(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct afs_cell *cell = arg;</div><div class='add'>+</div><div class='add'>+	afs_put_cell(cell, afs_cell_trace_put_atcell);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Create a manually added cell mount directory.</div><div class='del'>- * - The caller must hold net-&gt;proc_cells_lock</div><div class='add'>+ * Read @cell or .@cell symlinks.</div><div class='ctx'>  */</div><div class='del'>-int afs_dynroot_mkdir(struct afs_net *net, struct afs_cell *cell)</div><div class='add'>+static const char *afs_atcell_get_link(struct dentry *dentry, struct inode *inode,</div><div class='add'>+				       struct delayed_call *done)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = net-&gt;dynroot_sb;</div><div class='del'>-	struct dentry *root, *subdir;</div><div class='del'>-	int ret;</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(inode);</div><div class='add'>+	struct afs_cell *cell;</div><div class='add'>+	struct afs_net *net = afs_i2net(inode);</div><div class='add'>+	const char *name;</div><div class='add'>+	bool dotted = vnode-&gt;fid.vnode == 3;</div><div class='ctx'> </div><div class='del'>-	if (!sb || atomic_read(&amp;sb-&gt;s_active) == 0)</div><div class='del'>-		return 0;</div><div class='add'>+	if (!rcu_access_pointer(net-&gt;ws_cell))</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='del'>-	/* Let the -&gt;lookup op do the creation */</div><div class='del'>-	root = sb-&gt;s_root;</div><div class='del'>-	inode_lock(root-&gt;d_inode);</div><div class='del'>-	subdir = lookup_one_len(cell-&gt;name, root, cell-&gt;name_len);</div><div class='del'>-	if (IS_ERR(subdir)) {</div><div class='del'>-		ret = PTR_ERR(subdir);</div><div class='del'>-		goto unlock;</div><div class='add'>+	if (!dentry) {</div><div class='add'>+		/* We're in RCU-pathwalk. */</div><div class='add'>+		cell = rcu_dereference(net-&gt;ws_cell);</div><div class='add'>+		if (dotted)</div><div class='add'>+			name = cell-&gt;name - 1;</div><div class='add'>+		else</div><div class='add'>+			name = cell-&gt;name;</div><div class='add'>+		/* Shouldn't need to set a delayed call. */</div><div class='add'>+		return name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Note that we're retaining an extra ref on the dentry */</div><div class='del'>-	subdir-&gt;d_fsdata = (void *)1UL;</div><div class='del'>-	ret = 0;</div><div class='del'>-unlock:</div><div class='del'>-	inode_unlock(root-&gt;d_inode);</div><div class='del'>-	return ret;</div><div class='add'>+	down_read(&amp;net-&gt;cells_lock);</div><div class='add'>+</div><div class='add'>+	cell = rcu_dereference_protected(net-&gt;ws_cell, lockdep_is_held(&amp;net-&gt;cells_lock));</div><div class='add'>+	if (dotted)</div><div class='add'>+		name = cell-&gt;name - 1;</div><div class='add'>+	else</div><div class='add'>+		name = cell-&gt;name;</div><div class='add'>+	afs_get_cell(cell, afs_cell_trace_get_atcell);</div><div class='add'>+	set_delayed_call(done, afs_atcell_delayed_put_cell, cell);</div><div class='add'>+</div><div class='add'>+	up_read(&amp;net-&gt;cells_lock);</div><div class='add'>+	return name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct inode_operations afs_atcell_inode_operations = {</div><div class='add'>+	.get_link	= afs_atcell_get_link,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Remove a manually added cell mount directory.</div><div class='del'>- * - The caller must hold net-&gt;proc_cells_lock</div><div class='add'>+ * Create an inode for the @cell or .@cell symlinks.</div><div class='ctx'>  */</div><div class='del'>-void afs_dynroot_rmdir(struct afs_net *net, struct afs_cell *cell)</div><div class='add'>+static struct dentry *afs_lookup_atcell(struct inode *dir, struct dentry *dentry, ino_t ino)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = net-&gt;dynroot_sb;</div><div class='del'>-	struct dentry *root, *subdir;</div><div class='add'>+	struct afs_vnode *vnode;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct afs_fid fid = { .vnode = ino, .unique = 1, };</div><div class='ctx'> </div><div class='del'>-	if (!sb || atomic_read(&amp;sb-&gt;s_active) == 0)</div><div class='del'>-		return;</div><div class='add'>+	inode = iget5_locked(dir-&gt;i_sb, fid.vnode,</div><div class='add'>+			     afs_iget5_pseudo_test, afs_iget5_pseudo_set, &amp;fid);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	root = sb-&gt;s_root;</div><div class='del'>-	inode_lock(root-&gt;d_inode);</div><div class='add'>+	vnode = AFS_FS_I(inode);</div><div class='ctx'> </div><div class='del'>-	/* Don't want to trigger a lookup call, which will re-add the cell */</div><div class='del'>-	subdir = try_lookup_one_len(cell-&gt;name, root, cell-&gt;name_len);</div><div class='del'>-	if (IS_ERR_OR_NULL(subdir)) {</div><div class='del'>-		_debug("lookup %ld", PTR_ERR(subdir));</div><div class='del'>-		goto no_dentry;</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='add'>+		netfs_inode_init(&amp;vnode-&gt;netfs, NULL, false);</div><div class='add'>+		simple_inode_init_ts(inode);</div><div class='add'>+		set_nlink(inode, 1);</div><div class='add'>+		inode-&gt;i_size		= 0;</div><div class='add'>+		inode-&gt;i_mode		= S_IFLNK | 0555;</div><div class='add'>+		inode-&gt;i_op		= &amp;afs_atcell_inode_operations;</div><div class='add'>+		inode-&gt;i_uid		= GLOBAL_ROOT_UID;</div><div class='add'>+		inode-&gt;i_gid		= GLOBAL_ROOT_GID;</div><div class='add'>+		inode-&gt;i_blocks		= 0;</div><div class='add'>+		inode-&gt;i_generation	= 0;</div><div class='add'>+		inode-&gt;i_flags		|= S_NOATIME;</div><div class='add'>+</div><div class='add'>+		unlock_new_inode(inode);</div><div class='ctx'> 	}</div><div class='add'>+	return d_splice_alias(inode, dentry);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	_debug("rmdir %pd %u", subdir, d_count(subdir));</div><div class='add'>+/*</div><div class='add'>+ * Transcribe the cell database into readdir content under the RCU read lock.</div><div class='add'>+ * Each cell produces two entries, one prefixed with a dot and one not.</div><div class='add'>+ */</div><div class='add'>+static int afs_dynroot_readdir_cells(struct afs_net *net, struct dir_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct afs_cell *cell;</div><div class='add'>+	loff_t newpos;</div><div class='add'>+</div><div class='add'>+	_enter("%llu", ctx-&gt;pos);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		unsigned int ix = ctx-&gt;pos &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+		cell = idr_get_next(&amp;net-&gt;cells_dyn_ino, &amp;ix);</div><div class='add'>+		if (!cell)</div><div class='add'>+			return 0;</div><div class='add'>+		if (READ_ONCE(cell-&gt;state) == AFS_CELL_REMOVING ||</div><div class='add'>+		    READ_ONCE(cell-&gt;state) == AFS_CELL_DEAD) {</div><div class='add'>+			ctx-&gt;pos += 2;</div><div class='add'>+			ctx-&gt;pos &amp;= ~1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (subdir-&gt;d_fsdata) {</div><div class='del'>-		_debug("unpin %u", d_count(subdir));</div><div class='del'>-		subdir-&gt;d_fsdata = NULL;</div><div class='del'>-		dput(subdir);</div><div class='add'>+		newpos = ix &lt;&lt; 1;</div><div class='add'>+		if (newpos &gt; ctx-&gt;pos)</div><div class='add'>+			ctx-&gt;pos = newpos;</div><div class='add'>+</div><div class='add'>+		_debug("pos %llu -&gt; cell %u", ctx-&gt;pos, cell-&gt;dynroot_ino);</div><div class='add'>+</div><div class='add'>+		if ((ctx-&gt;pos &amp; 1) == 0) {</div><div class='add'>+			if (!dir_emit(ctx, cell-&gt;name, cell-&gt;name_len,</div><div class='add'>+				      cell-&gt;dynroot_ino, DT_DIR))</div><div class='add'>+				return 0;</div><div class='add'>+			ctx-&gt;pos++;</div><div class='add'>+		}</div><div class='add'>+		if ((ctx-&gt;pos &amp; 1) == 1) {</div><div class='add'>+			if (!dir_emit(ctx, cell-&gt;name - 1, cell-&gt;name_len + 1,</div><div class='add'>+				      cell-&gt;dynroot_ino + 1, DT_DIR))</div><div class='add'>+				return 0;</div><div class='add'>+			ctx-&gt;pos++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	dput(subdir);</div><div class='del'>-no_dentry:</div><div class='del'>-	inode_unlock(root-&gt;d_inode);</div><div class='del'>-	_leave("");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Populate a newly created dynamic root with cell names.</div><div class='add'>+ * Read the AFS dynamic root directory.  This produces a list of cellnames,</div><div class='add'>+ * dotted and undotted, along with @cell and .@cell links if configured.</div><div class='ctx'>  */</div><div class='del'>-int afs_dynroot_populate(struct super_block *sb)</div><div class='add'>+static int afs_dynroot_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct afs_cell *cell;</div><div class='del'>-	struct afs_net *net = afs_sb2net(sb);</div><div class='del'>-	int ret;</div><div class='add'>+	struct afs_net *net = afs_d2net(file-&gt;f_path.dentry);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;net-&gt;proc_cells_lock);</div><div class='add'>+	if (!dir_emit_dots(file, ctx))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	net-&gt;dynroot_sb = sb;</div><div class='del'>-	hlist_for_each_entry(cell, &amp;net-&gt;proc_cells, proc_link) {</div><div class='del'>-		ret = afs_dynroot_mkdir(net, cell);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+	if (ctx-&gt;pos == 2) {</div><div class='add'>+		if (rcu_access_pointer(net-&gt;ws_cell) &amp;&amp;</div><div class='add'>+		    !dir_emit(ctx, "@cell", 5, 2, DT_LNK))</div><div class='add'>+			return 0;</div><div class='add'>+		ctx-&gt;pos = 3;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;pos == 3) {</div><div class='add'>+		if (rcu_access_pointer(net-&gt;ws_cell) &amp;&amp;</div><div class='add'>+		    !dir_emit(ctx, ".@cell", 6, 3, DT_LNK))</div><div class='add'>+			return 0;</div><div class='add'>+		ctx-&gt;pos = 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;net-&gt;proc_cells_lock);</div><div class='add'>+	if ((unsigned long long)ctx-&gt;pos &lt;= AFS_MAX_DYNROOT_CELL_INO) {</div><div class='add'>+		down_read(&amp;net-&gt;cells_lock);</div><div class='add'>+		ret = afs_dynroot_readdir_cells(net, ctx);</div><div class='add'>+		up_read(&amp;net-&gt;cells_lock);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	net-&gt;dynroot_sb = NULL;</div><div class='del'>-	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct file_operations afs_dynroot_file_operations = {</div><div class='add'>+	.llseek		= generic_file_llseek,</div><div class='add'>+	.read		= generic_read_dir,</div><div class='add'>+	.iterate_shared	= afs_dynroot_readdir,</div><div class='add'>+	.fsync		= noop_fsync,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * When a dynamic root that's in the process of being destroyed, depopulate it</div><div class='del'>- * of pinned directories.</div><div class='add'>+ * Create an inode for a dynamic root directory.</div><div class='ctx'>  */</div><div class='del'>-void afs_dynroot_depopulate(struct super_block *sb)</div><div class='add'>+struct inode *afs_dynroot_iget_root(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct afs_net *net = afs_sb2net(sb);</div><div class='del'>-	struct dentry *root = sb-&gt;s_root, *subdir;</div><div class='del'>-</div><div class='del'>-	/* Prevent more subdirs from being created */</div><div class='del'>-	mutex_lock(&amp;net-&gt;proc_cells_lock);</div><div class='del'>-	if (net-&gt;dynroot_sb == sb)</div><div class='del'>-		net-&gt;dynroot_sb = NULL;</div><div class='del'>-	mutex_unlock(&amp;net-&gt;proc_cells_lock);</div><div class='del'>-</div><div class='del'>-	if (root) {</div><div class='del'>-		struct hlist_node *n;</div><div class='del'>-		inode_lock(root-&gt;d_inode);</div><div class='del'>-</div><div class='del'>-		/* Remove all the pins for dirs created for manually added cells */</div><div class='del'>-		hlist_for_each_entry_safe(subdir, n, &amp;root-&gt;d_children, d_sib) {</div><div class='del'>-			if (subdir-&gt;d_fsdata) {</div><div class='del'>-				subdir-&gt;d_fsdata = NULL;</div><div class='del'>-				dput(subdir);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	struct afs_super_info *as = AFS_FS_S(sb);</div><div class='add'>+	struct afs_vnode *vnode;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct afs_fid fid = { .vid = 0, .vnode = 1, .unique = 1,};</div><div class='add'>+</div><div class='add'>+	if (as-&gt;volume)</div><div class='add'>+		fid.vid = as-&gt;volume-&gt;vid;</div><div class='add'>+</div><div class='add'>+	inode = iget5_locked(sb, fid.vnode,</div><div class='add'>+			     afs_iget5_pseudo_test, afs_iget5_pseudo_set, &amp;fid);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	vnode = AFS_FS_I(inode);</div><div class='ctx'> </div><div class='del'>-		inode_unlock(root-&gt;d_inode);</div><div class='add'>+	/* there shouldn't be an existing inode */</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='add'>+		netfs_inode_init(&amp;vnode-&gt;netfs, NULL, false);</div><div class='add'>+		simple_inode_init_ts(inode);</div><div class='add'>+		set_nlink(inode, 2);</div><div class='add'>+		inode-&gt;i_size		= 0;</div><div class='add'>+		inode-&gt;i_mode		= S_IFDIR | 0555;</div><div class='add'>+		inode-&gt;i_op		= &amp;afs_dynroot_inode_operations;</div><div class='add'>+		inode-&gt;i_fop		= &amp;afs_dynroot_file_operations;</div><div class='add'>+		inode-&gt;i_uid		= GLOBAL_ROOT_UID;</div><div class='add'>+		inode-&gt;i_gid		= GLOBAL_ROOT_GID;</div><div class='add'>+		inode-&gt;i_blocks		= 0;</div><div class='add'>+		inode-&gt;i_generation	= 0;</div><div class='add'>+		inode-&gt;i_flags		|= S_NOATIME;</div><div class='add'>+</div><div class='add'>+		set_bit(AFS_VNODE_PSEUDODIR, &amp;vnode-&gt;flags);</div><div class='add'>+		unlock_new_inode(inode);</div><div class='ctx'> 	}</div><div class='add'>+	_leave(" = %p", inode);</div><div class='add'>+	return inode;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/afs/file.c b/fs/afs/file.c<br/>index 3d33b221d9ca..f66a92294284 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/file.c</a></div><div class='hunk'>@@ -16,10 +16,10 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/netfs.h&gt;</div><div class='add'>+#include &lt;trace/events/netfs.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-static int afs_file_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='del'>-static int afs_symlink_read_folio(struct file *file, struct folio *folio);</div><div class='add'>+static int afs_file_mmap_prepare(struct vm_area_desc *desc);</div><div class='ctx'> </div><div class='ctx'> static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter);</div><div class='ctx'> static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos,</div><div class='hunk'>@@ -35,7 +35,7 @@ const struct file_operations afs_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= afs_file_read_iter,</div><div class='ctx'> 	.write_iter	= netfs_file_write_iter,</div><div class='del'>-	.mmap		= afs_file_mmap,</div><div class='add'>+	.mmap_prepare	= afs_file_mmap_prepare,</div><div class='ctx'> 	.splice_read	= afs_file_splice_read,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fsync		= afs_fsync,</div><div class='hunk'>@@ -54,20 +54,12 @@ const struct address_space_operations afs_file_aops = {</div><div class='ctx'> 	.read_folio	= netfs_read_folio,</div><div class='ctx'> 	.readahead	= netfs_readahead,</div><div class='ctx'> 	.dirty_folio	= netfs_dirty_folio,</div><div class='del'>-	.launder_folio	= netfs_launder_folio,</div><div class='ctx'> 	.release_folio	= netfs_release_folio,</div><div class='ctx'> 	.invalidate_folio = netfs_invalidate_folio,</div><div class='ctx'> 	.migrate_folio	= filemap_migrate_folio,</div><div class='ctx'> 	.writepages	= afs_writepages,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct address_space_operations afs_symlink_aops = {</div><div class='del'>-	.read_folio	= afs_symlink_read_folio,</div><div class='del'>-	.release_folio	= netfs_release_folio,</div><div class='del'>-	.invalidate_folio = netfs_invalidate_folio,</div><div class='del'>-	.migrate_folio	= filemap_migrate_folio,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct vm_operations_struct afs_vm_ops = {</div><div class='ctx'> 	.open		= afs_vm_open,</div><div class='ctx'> 	.close		= afs_vm_close,</div><div class='hunk'>@@ -208,47 +200,12 @@ int afs_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Allocate a new read record.</div><div class='del'>- */</div><div class='del'>-struct afs_read *afs_alloc_read(gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct afs_read *req;</div><div class='del'>-</div><div class='del'>-	req = kzalloc(sizeof(struct afs_read), gfp);</div><div class='del'>-	if (req)</div><div class='del'>-		refcount_set(&amp;req-&gt;usage, 1);</div><div class='del'>-</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Dispose of a ref to a read record.</div><div class='del'>- */</div><div class='del'>-void afs_put_read(struct afs_read *req)</div><div class='del'>-{</div><div class='del'>-	if (refcount_dec_and_test(&amp;req-&gt;usage)) {</div><div class='del'>-		if (req-&gt;cleanup)</div><div class='del'>-			req-&gt;cleanup(req);</div><div class='del'>-		key_put(req-&gt;key);</div><div class='del'>-		kfree(req);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void afs_fetch_data_notify(struct afs_operation *op)</div><div class='ctx'> {</div><div class='del'>-	struct afs_read *req = op-&gt;fetch.req;</div><div class='del'>-	struct netfs_io_subrequest *subreq = req-&gt;subreq;</div><div class='del'>-	int error = afs_op_error(op);</div><div class='del'>-</div><div class='del'>-	req-&gt;error = error;</div><div class='del'>-	if (subreq) {</div><div class='del'>-		__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='del'>-		netfs_subreq_terminated(subreq, error ?: req-&gt;actual_len, false);</div><div class='del'>-		req-&gt;subreq = NULL;</div><div class='del'>-	} else if (req-&gt;done) {</div><div class='del'>-		req-&gt;done(req);</div><div class='del'>-	}</div><div class='add'>+	struct netfs_io_subrequest *subreq = op-&gt;fetch.subreq;</div><div class='add'>+</div><div class='add'>+	subreq-&gt;error = afs_op_error(op);</div><div class='add'>+	netfs_read_subreq_terminated(subreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_fetch_data_success(struct afs_operation *op)</div><div class='hunk'>@@ -258,103 +215,198 @@ static void afs_fetch_data_success(struct afs_operation *op)</div><div class='ctx'> 	_enter("op=%08x", op-&gt;debug_id);</div><div class='ctx'> 	afs_vnode_commit_status(op, &amp;op-&gt;file[0]);</div><div class='ctx'> 	afs_stat_v(vnode, n_fetches);</div><div class='del'>-	atomic_long_add(op-&gt;fetch.req-&gt;actual_len, &amp;op-&gt;net-&gt;n_fetch_bytes);</div><div class='add'>+	atomic_long_add(op-&gt;fetch.subreq-&gt;transferred, &amp;op-&gt;net-&gt;n_fetch_bytes);</div><div class='ctx'> 	afs_fetch_data_notify(op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void afs_fetch_data_put(struct afs_operation *op)</div><div class='add'>+static void afs_fetch_data_aborted(struct afs_operation *op)</div><div class='ctx'> {</div><div class='del'>-	op-&gt;fetch.req-&gt;error = afs_op_error(op);</div><div class='del'>-	afs_put_read(op-&gt;fetch.req);</div><div class='add'>+	afs_check_for_remote_deletion(op);</div><div class='add'>+	afs_fetch_data_notify(op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct afs_operation_ops afs_fetch_data_operation = {</div><div class='add'>+const struct afs_operation_ops afs_fetch_data_operation = {</div><div class='ctx'> 	.issue_afs_rpc	= afs_fs_fetch_data,</div><div class='ctx'> 	.issue_yfs_rpc	= yfs_fs_fetch_data,</div><div class='ctx'> 	.success	= afs_fetch_data_success,</div><div class='del'>-	.aborted	= afs_check_for_remote_deletion,</div><div class='add'>+	.aborted	= afs_fetch_data_aborted,</div><div class='ctx'> 	.failed		= afs_fetch_data_notify,</div><div class='del'>-	.put		= afs_fetch_data_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void afs_issue_read_call(struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	op-&gt;call_responded = false;</div><div class='add'>+	op-&gt;call_error = 0;</div><div class='add'>+	op-&gt;call_abort_code = 0;</div><div class='add'>+	if (test_bit(AFS_SERVER_FL_IS_YFS, &amp;op-&gt;server-&gt;flags))</div><div class='add'>+		yfs_fs_fetch_data(op);</div><div class='add'>+	else</div><div class='add'>+		afs_fs_fetch_data(op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void afs_end_read(struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	if (op-&gt;call_responded &amp;&amp; op-&gt;server)</div><div class='add'>+		set_bit(AFS_SERVER_FL_RESPONDING, &amp;op-&gt;server-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (!afs_op_error(op))</div><div class='add'>+		afs_fetch_data_success(op);</div><div class='add'>+	else if (op-&gt;cumul_error.aborted)</div><div class='add'>+		afs_fetch_data_aborted(op);</div><div class='add'>+	else</div><div class='add'>+		afs_fetch_data_notify(op);</div><div class='add'>+</div><div class='add'>+	afs_end_vnode_operation(op);</div><div class='add'>+	afs_put_operation(op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform I/O processing on an asynchronous call.  The work item carries a ref</div><div class='add'>+ * to the call struct that we either need to release or to pass on.</div><div class='add'>+ */</div><div class='add'>+static void afs_read_receive(struct afs_call *call)</div><div class='add'>+{</div><div class='add'>+	struct afs_operation *op = call-&gt;op;</div><div class='add'>+	enum afs_call_state state;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	state = READ_ONCE(call-&gt;state);</div><div class='add'>+	if (state == AFS_CALL_COMPLETE)</div><div class='add'>+		return;</div><div class='add'>+	trace_afs_read_recv(op, call);</div><div class='add'>+</div><div class='add'>+	while (state &lt; AFS_CALL_COMPLETE &amp;&amp; READ_ONCE(call-&gt;need_attention)) {</div><div class='add'>+		WRITE_ONCE(call-&gt;need_attention, false);</div><div class='add'>+		afs_deliver_to_call(call);</div><div class='add'>+		state = READ_ONCE(call-&gt;state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state &lt; AFS_CALL_COMPLETE) {</div><div class='add'>+		netfs_read_subreq_progress(op-&gt;fetch.subreq);</div><div class='add'>+		if (rxrpc_kernel_check_life(call-&gt;net-&gt;socket, call-&gt;rxcall))</div><div class='add'>+			return;</div><div class='add'>+		/* rxrpc terminated the call. */</div><div class='add'>+		afs_set_call_complete(call, call-&gt;error, call-&gt;abort_code);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	op-&gt;call_abort_code	= call-&gt;abort_code;</div><div class='add'>+	op-&gt;call_error		= call-&gt;error;</div><div class='add'>+	op-&gt;call_responded	= call-&gt;responded;</div><div class='add'>+	op-&gt;call		= NULL;</div><div class='add'>+	call-&gt;op		= NULL;</div><div class='add'>+	afs_put_call(call);</div><div class='add'>+</div><div class='add'>+	/* If the call failed, then we need to crank the server rotation</div><div class='add'>+	 * handle and try the next.</div><div class='add'>+	 */</div><div class='add'>+	if (afs_select_fileserver(op)) {</div><div class='add'>+		afs_issue_read_call(op);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	afs_end_read(op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void afs_fetch_data_async_rx(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct afs_call *call = container_of(work, struct afs_call, async_work);</div><div class='add'>+</div><div class='add'>+	afs_read_receive(call);</div><div class='add'>+	afs_put_call(call);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void afs_fetch_data_immediate_cancel(struct afs_call *call)</div><div class='add'>+{</div><div class='add'>+	if (call-&gt;async) {</div><div class='add'>+		afs_get_call(call, afs_call_trace_wake);</div><div class='add'>+		if (!queue_work(afs_async_calls, &amp;call-&gt;async_work))</div><div class='add'>+			afs_deferred_put_call(call);</div><div class='add'>+		flush_work(&amp;call-&gt;async_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Fetch file data from the volume.</div><div class='ctx'>  */</div><div class='del'>-int afs_fetch_data(struct afs_vnode *vnode, struct afs_read *req)</div><div class='add'>+static void afs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_operation *op;</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(subreq-&gt;rreq-&gt;inode);</div><div class='add'>+	struct key *key = subreq-&gt;rreq-&gt;netfs_priv;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%s{%llx:%llu.%u},%x,,,",</div><div class='ctx'> 	       vnode-&gt;volume-&gt;name,</div><div class='ctx'> 	       vnode-&gt;fid.vid,</div><div class='ctx'> 	       vnode-&gt;fid.vnode,</div><div class='ctx'> 	       vnode-&gt;fid.unique,</div><div class='del'>-	       key_serial(req-&gt;key));</div><div class='add'>+	       key_serial(key));</div><div class='ctx'> </div><div class='del'>-	op = afs_alloc_operation(req-&gt;key, vnode-&gt;volume);</div><div class='add'>+	op = afs_alloc_operation(key, vnode-&gt;volume);</div><div class='ctx'> 	if (IS_ERR(op)) {</div><div class='del'>-		if (req-&gt;subreq)</div><div class='del'>-			netfs_subreq_terminated(req-&gt;subreq, PTR_ERR(op), false);</div><div class='del'>-		return PTR_ERR(op);</div><div class='add'>+		subreq-&gt;error = PTR_ERR(op);</div><div class='add'>+		netfs_read_subreq_terminated(subreq);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	afs_op_set_vnode(op, 0, vnode);</div><div class='ctx'> </div><div class='del'>-	op-&gt;fetch.req	= afs_get_read(req);</div><div class='add'>+	op-&gt;fetch.subreq = subreq;</div><div class='ctx'> 	op-&gt;ops		= &amp;afs_fetch_data_operation;</div><div class='del'>-	return afs_do_sync_operation(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void afs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(subreq-&gt;rreq-&gt;inode);</div><div class='del'>-	struct afs_read *fsreq;</div><div class='ctx'> </div><div class='del'>-	fsreq = afs_alloc_read(GFP_NOFS);</div><div class='del'>-	if (!fsreq)</div><div class='del'>-		return netfs_subreq_terminated(subreq, -ENOMEM, false);</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='ctx'> </div><div class='del'>-	fsreq-&gt;subreq	= subreq;</div><div class='del'>-	fsreq-&gt;pos	= subreq-&gt;start + subreq-&gt;transferred;</div><div class='del'>-	fsreq-&gt;len	= subreq-&gt;len   - subreq-&gt;transferred;</div><div class='del'>-	fsreq-&gt;key	= key_get(subreq-&gt;rreq-&gt;netfs_priv);</div><div class='del'>-	fsreq-&gt;vnode	= vnode;</div><div class='del'>-	fsreq-&gt;iter	= &amp;subreq-&gt;io_iter;</div><div class='add'>+	if (subreq-&gt;rreq-&gt;origin == NETFS_READAHEAD ||</div><div class='add'>+	    subreq-&gt;rreq-&gt;iocb) {</div><div class='add'>+		op-&gt;flags |= AFS_OPERATION_ASYNC;</div><div class='ctx'> </div><div class='del'>-	afs_fetch_data(fsreq-&gt;vnode, fsreq);</div><div class='del'>-	afs_put_read(fsreq);</div><div class='del'>-}</div><div class='add'>+		if (!afs_begin_vnode_operation(op)) {</div><div class='add'>+			subreq-&gt;error = afs_put_operation(op);</div><div class='add'>+			netfs_read_subreq_terminated(subreq);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-static int afs_symlink_read_folio(struct file *file, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(folio-&gt;mapping-&gt;host);</div><div class='del'>-	struct afs_read *fsreq;</div><div class='del'>-	int ret;</div><div class='add'>+		if (!afs_select_fileserver(op)) {</div><div class='add'>+			afs_end_read(op);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	fsreq = afs_alloc_read(GFP_NOFS);</div><div class='del'>-	if (!fsreq)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	fsreq-&gt;pos	= folio_pos(folio);</div><div class='del'>-	fsreq-&gt;len	= folio_size(folio);</div><div class='del'>-	fsreq-&gt;vnode	= vnode;</div><div class='del'>-	fsreq-&gt;iter	= &amp;fsreq-&gt;def_iter;</div><div class='del'>-	iov_iter_xarray(&amp;fsreq-&gt;def_iter, ITER_DEST, &amp;folio-&gt;mapping-&gt;i_pages,</div><div class='del'>-			fsreq-&gt;pos, fsreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	ret = afs_fetch_data(fsreq-&gt;vnode, fsreq);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		folio_mark_uptodate(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return ret;</div><div class='add'>+		afs_issue_read_call(op);</div><div class='add'>+	} else {</div><div class='add'>+		afs_do_sync_operation(op);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int afs_init_request(struct netfs_io_request *rreq, struct file *file)</div><div class='ctx'> {</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(rreq-&gt;inode);</div><div class='add'>+</div><div class='ctx'> 	if (file)</div><div class='ctx'> 		rreq-&gt;netfs_priv = key_get(afs_file_key(file));</div><div class='ctx'> 	rreq-&gt;rsize = 256 * 1024;</div><div class='del'>-	rreq-&gt;wsize = 256 * 1024;</div><div class='add'>+	rreq-&gt;wsize = 256 * 1024 * 1024;</div><div class='add'>+</div><div class='add'>+	switch (rreq-&gt;origin) {</div><div class='add'>+	case NETFS_READ_SINGLE:</div><div class='add'>+		if (!file) {</div><div class='add'>+			struct key *key = afs_request_key(vnode-&gt;volume-&gt;cell);</div><div class='add'>+</div><div class='add'>+			if (IS_ERR(key))</div><div class='add'>+				return PTR_ERR(key);</div><div class='add'>+			rreq-&gt;netfs_priv = key;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_WRITEBACK:</div><div class='add'>+	case NETFS_WRITETHROUGH:</div><div class='add'>+	case NETFS_UNBUFFERED_WRITE:</div><div class='add'>+	case NETFS_DIO_WRITE:</div><div class='add'>+		if (S_ISREG(rreq-&gt;inode-&gt;i_mode))</div><div class='add'>+			rreq-&gt;io_streams[0].avail = true;</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_WRITEBACK_SINGLE:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -369,6 +421,7 @@ static int afs_check_write_begin(struct file *file, loff_t pos, unsigned len,</div><div class='ctx'> static void afs_free_request(struct netfs_io_request *rreq)</div><div class='ctx'> {</div><div class='ctx'> 	key_put(rreq-&gt;netfs_priv);</div><div class='add'>+	afs_put_wb_key(rreq-&gt;netfs_priv2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_update_i_size(struct inode *inode, loff_t new_i_size)</div><div class='hunk'>@@ -400,7 +453,10 @@ const struct netfs_request_ops afs_req_ops = {</div><div class='ctx'> 	.issue_read		= afs_issue_read,</div><div class='ctx'> 	.update_i_size		= afs_update_i_size,</div><div class='ctx'> 	.invalidate_cache	= afs_netfs_invalidate_cache,</div><div class='del'>-	.create_write_requests	= afs_create_write_requests,</div><div class='add'>+	.begin_writeback	= afs_begin_writeback,</div><div class='add'>+	.prepare_write		= afs_prepare_write,</div><div class='add'>+	.issue_write		= afs_issue_write,</div><div class='add'>+	.retry_request		= afs_retry_request,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void afs_add_open_mmap(struct afs_vnode *vnode)</div><div class='hunk'>@@ -417,13 +473,17 @@ static void afs_add_open_mmap(struct afs_vnode *vnode)</div><div class='ctx'> </div><div class='ctx'> static void afs_drop_open_mmap(struct afs_vnode *vnode)</div><div class='ctx'> {</div><div class='del'>-	if (!atomic_dec_and_test(&amp;vnode-&gt;cb_nr_mmap))</div><div class='add'>+	if (atomic_add_unless(&amp;vnode-&gt;cb_nr_mmap, -1, 1))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;vnode-&gt;volume-&gt;open_mmaps_lock);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;vnode-&gt;cb_nr_mmap) == 0)</div><div class='add'>+	read_seqlock_excl(&amp;vnode-&gt;cb_lock);</div><div class='add'>+	// the only place where -&gt;cb_nr_mmap may hit 0</div><div class='add'>+	// see __afs_break_callback() for the other side...</div><div class='add'>+	if (atomic_dec_and_test(&amp;vnode-&gt;cb_nr_mmap))</div><div class='ctx'> 		list_del_init(&amp;vnode-&gt;cb_mmap_link);</div><div class='add'>+	read_sequnlock_excl(&amp;vnode-&gt;cb_lock);</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;vnode-&gt;volume-&gt;open_mmaps_lock);</div><div class='ctx'> 	flush_work(&amp;vnode-&gt;cb_work);</div><div class='hunk'>@@ -432,16 +492,16 @@ static void afs_drop_open_mmap(struct afs_vnode *vnode)</div><div class='ctx'> /*</div><div class='ctx'>  * Handle setting up a memory mapping on an AFS file.</div><div class='ctx'>  */</div><div class='del'>-static int afs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int afs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(file_inode(file));</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(file_inode(desc-&gt;file));</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	afs_add_open_mmap(vnode);</div><div class='ctx'> </div><div class='del'>-	ret = generic_file_mmap(file, vma);</div><div class='add'>+	ret = generic_file_mmap_prepare(desc);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		vma-&gt;vm_ops = &amp;afs_vm_ops;</div><div class='add'>+		desc-&gt;vm_ops = &amp;afs_vm_ops;</div><div class='ctx'> 	else</div><div class='ctx'> 		afs_drop_open_mmap(vnode);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/fs/afs/flock.c b/fs/afs/flock.c<br/>index 9c6dea3139f5..f0e96a35093f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/flock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/flock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/flock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/flock.c</a></div><div class='hunk'>@@ -93,13 +93,13 @@ static void afs_grant_locks(struct afs_vnode *vnode)</div><div class='ctx'> 	bool exclusive = (vnode-&gt;lock_type == AFS_LOCK_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(p, _p, &amp;vnode-&gt;pending_locks, fl_u.afs.link) {</div><div class='del'>-		if (!exclusive &amp;&amp; p-&gt;fl_type == F_WRLCK)</div><div class='add'>+		if (!exclusive &amp;&amp; lock_is_write(p))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		list_move_tail(&amp;p-&gt;fl_u.afs.link, &amp;vnode-&gt;granted_locks);</div><div class='ctx'> 		p-&gt;fl_u.afs.state = AFS_LOCK_GRANTED;</div><div class='ctx'> 		trace_afs_flock_op(vnode, p, afs_flock_op_grant);</div><div class='del'>-		wake_up(&amp;p-&gt;fl_wait);</div><div class='add'>+		locks_wake_up(p);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -112,25 +112,24 @@ static void afs_next_locker(struct afs_vnode *vnode, int error)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock *p, *_p, *next = NULL;</div><div class='ctx'> 	struct key *key = vnode-&gt;lock_key;</div><div class='del'>-	unsigned int fl_type = F_RDLCK;</div><div class='add'>+	unsigned int type = F_RDLCK;</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	if (vnode-&gt;lock_type == AFS_LOCK_WRITE)</div><div class='del'>-		fl_type = F_WRLCK;</div><div class='add'>+		type = F_WRLCK;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(p, _p, &amp;vnode-&gt;pending_locks, fl_u.afs.link) {</div><div class='ctx'> 		if (error &amp;&amp;</div><div class='del'>-		    p-&gt;fl_type == fl_type &amp;&amp;</div><div class='del'>-		    afs_file_key(p-&gt;fl_file) == key) {</div><div class='add'>+		    p-&gt;c.flc_type == type &amp;&amp;</div><div class='add'>+		    afs_file_key(p-&gt;c.flc_file) == key) {</div><div class='ctx'> 			list_del_init(&amp;p-&gt;fl_u.afs.link);</div><div class='ctx'> 			p-&gt;fl_u.afs.state = error;</div><div class='del'>-			wake_up(&amp;p-&gt;fl_wait);</div><div class='add'>+			locks_wake_up(p);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Select the next locker to hand off to. */</div><div class='del'>-		if (next &amp;&amp;</div><div class='del'>-		    (next-&gt;fl_type == F_WRLCK || p-&gt;fl_type == F_RDLCK))</div><div class='add'>+		if (next &amp;&amp; (lock_is_write(next) || lock_is_read(p)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		next = p;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -142,7 +141,7 @@ static void afs_next_locker(struct afs_vnode *vnode, int error)</div><div class='ctx'> 		afs_set_lock_state(vnode, AFS_VNODE_LOCK_SETTING);</div><div class='ctx'> 		next-&gt;fl_u.afs.state = AFS_LOCK_YOUR_TRY;</div><div class='ctx'> 		trace_afs_flock_op(vnode, next, afs_flock_op_wake);</div><div class='del'>-		wake_up(&amp;next-&gt;fl_wait);</div><div class='add'>+		locks_wake_up(next);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		afs_set_lock_state(vnode, AFS_VNODE_LOCK_NONE);</div><div class='ctx'> 		trace_afs_flock_ev(vnode, NULL, afs_flock_no_lockers, 0);</div><div class='hunk'>@@ -166,7 +165,7 @@ static void afs_kill_lockers_enoent(struct afs_vnode *vnode)</div><div class='ctx'> 			       struct file_lock, fl_u.afs.link);</div><div class='ctx'> 		list_del_init(&amp;p-&gt;fl_u.afs.link);</div><div class='ctx'> 		p-&gt;fl_u.afs.state = -ENOENT;</div><div class='del'>-		wake_up(&amp;p-&gt;fl_wait);</div><div class='add'>+		locks_wake_up(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	key_put(vnode-&gt;lock_key);</div><div class='hunk'>@@ -464,14 +463,14 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu},%llu-%llu,%u,%u",</div><div class='ctx'> 	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode,</div><div class='del'>-	       fl-&gt;fl_start, fl-&gt;fl_end, fl-&gt;fl_type, mode);</div><div class='add'>+	       fl-&gt;fl_start, fl-&gt;fl_end, fl-&gt;c.flc_type, mode);</div><div class='ctx'> </div><div class='ctx'> 	fl-&gt;fl_ops = &amp;afs_lock_ops;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fl-&gt;fl_u.afs.link);</div><div class='ctx'> 	fl-&gt;fl_u.afs.state = AFS_LOCK_PENDING;</div><div class='ctx'> </div><div class='ctx'> 	partial = (fl-&gt;fl_start != 0 || fl-&gt;fl_end != OFFSET_MAX);</div><div class='del'>-	type = (fl-&gt;fl_type == F_RDLCK) ? AFS_LOCK_READ : AFS_LOCK_WRITE;</div><div class='add'>+	type = lock_is_read(fl) ? AFS_LOCK_READ : AFS_LOCK_WRITE;</div><div class='ctx'> 	if (mode == afs_flock_mode_write &amp;&amp; partial)</div><div class='ctx'> 		type = AFS_LOCK_WRITE;</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +523,7 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vnode-&gt;lock_state == AFS_VNODE_LOCK_NONE &amp;&amp;</div><div class='del'>-	    !(fl-&gt;fl_flags &amp; FL_SLEEP)) {</div><div class='add'>+	    !(fl-&gt;c.flc_flags &amp; FL_SLEEP)) {</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='ctx'> 		if (type == AFS_LOCK_READ) {</div><div class='ctx'> 			if (vnode-&gt;status.lock_count == -1)</div><div class='hunk'>@@ -621,7 +620,7 @@ skip_server_lock:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> lock_is_contended:</div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_SLEEP)) {</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_SLEEP)) {</div><div class='ctx'> 		list_del_init(&amp;fl-&gt;fl_u.afs.link);</div><div class='ctx'> 		afs_next_locker(vnode, 0);</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='hunk'>@@ -641,7 +640,7 @@ need_to_wait:</div><div class='ctx'> 	spin_unlock(&amp;vnode-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	trace_afs_flock_ev(vnode, fl, afs_flock_waiting, 0);</div><div class='del'>-	ret = wait_event_interruptible(fl-&gt;fl_wait,</div><div class='add'>+	ret = wait_event_interruptible(fl-&gt;c.flc_wait,</div><div class='ctx'> 				       fl-&gt;fl_u.afs.state != AFS_LOCK_PENDING);</div><div class='ctx'> 	trace_afs_flock_ev(vnode, fl, afs_flock_waited, ret);</div><div class='ctx'> </div><div class='hunk'>@@ -704,7 +703,8 @@ static int afs_do_unlk(struct file *file, struct file_lock *fl)</div><div class='ctx'> 	struct afs_vnode *vnode = AFS_FS_I(file_inode(file));</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("{%llx:%llu},%u", vnode-&gt;fid.vid, vnode-&gt;fid.vnode, fl-&gt;fl_type);</div><div class='add'>+	_enter("{%llx:%llu},%u", vnode-&gt;fid.vid, vnode-&gt;fid.vnode,</div><div class='add'>+	       fl-&gt;c.flc_type);</div><div class='ctx'> </div><div class='ctx'> 	trace_afs_flock_op(vnode, fl, afs_flock_op_unlock);</div><div class='ctx'> </div><div class='hunk'>@@ -730,11 +730,11 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl)</div><div class='ctx'> 	if (vnode-&gt;lock_state == AFS_VNODE_LOCK_DELETED)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+	fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> </div><div class='ctx'> 	/* check local lock records first */</div><div class='ctx'> 	posix_test_lock(file, fl);</div><div class='del'>-	if (fl-&gt;fl_type == F_UNLCK) {</div><div class='add'>+	if (lock_is_unlock(fl)) {</div><div class='ctx'> 		/* no local locks; consult the server */</div><div class='ctx'> 		ret = afs_fetch_status(vnode, key, false, NULL);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -743,18 +743,18 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl)</div><div class='ctx'> 		lock_count = READ_ONCE(vnode-&gt;status.lock_count);</div><div class='ctx'> 		if (lock_count != 0) {</div><div class='ctx'> 			if (lock_count &gt; 0)</div><div class='del'>-				fl-&gt;fl_type = F_RDLCK;</div><div class='add'>+				fl-&gt;c.flc_type = F_RDLCK;</div><div class='ctx'> 			else</div><div class='del'>-				fl-&gt;fl_type = F_WRLCK;</div><div class='add'>+				fl-&gt;c.flc_type = F_WRLCK;</div><div class='ctx'> 			fl-&gt;fl_start = 0;</div><div class='ctx'> 			fl-&gt;fl_end = OFFSET_MAX;</div><div class='del'>-			fl-&gt;fl_pid = 0;</div><div class='add'>+			fl-&gt;c.flc_pid = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> error:</div><div class='del'>-	_leave(" = %d [%hd]", ret, fl-&gt;fl_type);</div><div class='add'>+	_leave(" = %d [%hd]", ret, fl-&gt;c.flc_type);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -769,7 +769,7 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu},%d,{t=%x,fl=%x,r=%Ld:%Ld}",</div><div class='ctx'> 	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode, cmd,</div><div class='del'>-	       fl-&gt;fl_type, fl-&gt;fl_flags,</div><div class='add'>+	       fl-&gt;c.flc_type, fl-&gt;c.flc_flags,</div><div class='ctx'> 	       (long long) fl-&gt;fl_start, (long long) fl-&gt;fl_end);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_GETLK(cmd))</div><div class='hunk'>@@ -778,7 +778,7 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	fl-&gt;fl_u.afs.debug_id = atomic_inc_return(&amp;afs_file_lock_debug_id);</div><div class='ctx'> 	trace_afs_flock_op(vnode, fl, afs_flock_op_lock);</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	if (lock_is_unlock(fl))</div><div class='ctx'> 		ret = afs_do_unlk(file, fl);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = afs_do_setlk(file, fl);</div><div class='hunk'>@@ -804,7 +804,7 @@ int afs_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu},%d,{t=%x,fl=%x}",</div><div class='ctx'> 	       vnode-&gt;fid.vid, vnode-&gt;fid.vnode, cmd,</div><div class='del'>-	       fl-&gt;fl_type, fl-&gt;fl_flags);</div><div class='add'>+	       fl-&gt;c.flc_type, fl-&gt;c.flc_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No BSD flocks over NFS allowed.</div><div class='hunk'>@@ -813,14 +813,14 @@ int afs_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	 * Not sure whether that would be unique, though, or whether</div><div class='ctx'> 	 * that would break in other places.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_FLOCK))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_FLOCK))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	fl-&gt;fl_u.afs.debug_id = atomic_inc_return(&amp;afs_file_lock_debug_id);</div><div class='ctx'> 	trace_afs_flock_op(vnode, fl, afs_flock_op_flock);</div><div class='ctx'> </div><div class='ctx'> 	/* we're simulating flock() locks using posix locks on the server */</div><div class='del'>-	if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	if (lock_is_unlock(fl))</div><div class='ctx'> 		ret = afs_do_unlk(file, fl);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = afs_do_setlk(file, fl);</div><div class='hunk'>@@ -843,7 +843,7 @@ int afs_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'>  */</div><div class='ctx'> static void afs_fl_copy_lock(struct file_lock *new, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(file_inode(fl-&gt;fl_file));</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(file_inode(fl-&gt;c.flc_file));</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='hunk'>@@ -861,7 +861,7 @@ static void afs_fl_copy_lock(struct file_lock *new, struct file_lock *fl)</div><div class='ctx'>  */</div><div class='ctx'> static void afs_fl_release_private(struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(file_inode(fl-&gt;fl_file));</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(file_inode(fl-&gt;c.flc_file));</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/fs_operation.c b/fs/afs/fs_operation.c<br/>index 3546b087e791..8418813ee043 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/fs_operation.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/fs_operation.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/fs_operation.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/fs_operation.c</a></div><div class='hunk'>@@ -49,6 +49,105 @@ struct afs_operation *afs_alloc_operation(struct key *key, struct afs_volume *vo</div><div class='ctx'> 	return op;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct afs_io_locker {</div><div class='add'>+	struct list_head	link;</div><div class='add'>+	struct task_struct	*task;</div><div class='add'>+	unsigned long		have_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unlock the I/O lock on a vnode.</div><div class='add'>+ */</div><div class='add'>+static void afs_unlock_for_io(struct afs_vnode *vnode)</div><div class='add'>+{</div><div class='add'>+	struct afs_io_locker *locker;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vnode-&gt;lock);</div><div class='add'>+	locker = list_first_entry_or_null(&amp;vnode-&gt;io_lock_waiters,</div><div class='add'>+					  struct afs_io_locker, link);</div><div class='add'>+	if (locker) {</div><div class='add'>+		list_del(&amp;locker-&gt;link);</div><div class='add'>+		smp_store_release(&amp;locker-&gt;have_lock, 1); /* The unlock barrier. */</div><div class='add'>+		smp_mb__after_atomic(); /* Store have_lock before task state */</div><div class='add'>+		wake_up_process(locker-&gt;task);</div><div class='add'>+	} else {</div><div class='add'>+		clear_bit(AFS_VNODE_IO_LOCK, &amp;vnode-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lock the I/O lock on a vnode uninterruptibly.  We can't use an ordinary</div><div class='add'>+ * mutex as lockdep will complain if we unlock it in the wrong thread.</div><div class='add'>+ */</div><div class='add'>+static void afs_lock_for_io(struct afs_vnode *vnode)</div><div class='add'>+{</div><div class='add'>+	struct afs_io_locker myself = { .task = current, };</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vnode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(AFS_VNODE_IO_LOCK, &amp;vnode-&gt;flags)) {</div><div class='add'>+		spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;myself.link, &amp;vnode-&gt;io_lock_waiters);</div><div class='add'>+	spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+		if (smp_load_acquire(&amp;myself.have_lock)) /* The lock barrier */</div><div class='add'>+			break;</div><div class='add'>+		schedule();</div><div class='add'>+	}</div><div class='add'>+	__set_current_state(TASK_RUNNING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lock the I/O lock on a vnode interruptibly.  We can't use an ordinary mutex</div><div class='add'>+ * as lockdep will complain if we unlock it in the wrong thread.</div><div class='add'>+ */</div><div class='add'>+static int afs_lock_for_io_interruptible(struct afs_vnode *vnode)</div><div class='add'>+{</div><div class='add'>+	struct afs_io_locker myself = { .task = current, };</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vnode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(AFS_VNODE_IO_LOCK, &amp;vnode-&gt;flags)) {</div><div class='add'>+		spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;myself.link, &amp;vnode-&gt;io_lock_waiters);</div><div class='add'>+	spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+		if (smp_load_acquire(&amp;myself.have_lock) || /* The lock barrier */</div><div class='add'>+		    signal_pending(current))</div><div class='add'>+			break;</div><div class='add'>+		schedule();</div><div class='add'>+	}</div><div class='add'>+	__set_current_state(TASK_RUNNING);</div><div class='add'>+</div><div class='add'>+	/* If we got a signal, try to transfer the lock onto the next</div><div class='add'>+	 * waiter.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(signal_pending(current))) {</div><div class='add'>+		spin_lock(&amp;vnode-&gt;lock);</div><div class='add'>+		if (myself.have_lock) {</div><div class='add'>+			spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+			afs_unlock_for_io(vnode);</div><div class='add'>+		} else {</div><div class='add'>+			list_del(&amp;myself.link);</div><div class='add'>+			spin_unlock(&amp;vnode-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+		ret = -ERESTARTSYS;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Lock the vnode(s) being operated upon.</div><div class='ctx'>  */</div><div class='hunk'>@@ -60,7 +159,7 @@ static bool afs_get_io_locks(struct afs_operation *op)</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;flags &amp; AFS_OPERATION_UNINTR) {</div><div class='del'>-		mutex_lock(&amp;vnode-&gt;io_lock);</div><div class='add'>+		afs_lock_for_io(vnode);</div><div class='ctx'> 		op-&gt;flags |= AFS_OPERATION_LOCK_0;</div><div class='ctx'> 		_leave(" = t [1]");</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -72,7 +171,7 @@ static bool afs_get_io_locks(struct afs_operation *op)</div><div class='ctx'> 	if (vnode2 &gt; vnode)</div><div class='ctx'> 		swap(vnode, vnode2);</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;vnode-&gt;io_lock) &lt; 0) {</div><div class='add'>+	if (afs_lock_for_io_interruptible(vnode) &lt; 0) {</div><div class='ctx'> 		afs_op_set_error(op, -ERESTARTSYS);</div><div class='ctx'> 		op-&gt;flags |= AFS_OPERATION_STOP;</div><div class='ctx'> 		_leave(" = f [I 0]");</div><div class='hunk'>@@ -81,10 +180,10 @@ static bool afs_get_io_locks(struct afs_operation *op)</div><div class='ctx'> 	op-&gt;flags |= AFS_OPERATION_LOCK_0;</div><div class='ctx'> </div><div class='ctx'> 	if (vnode2) {</div><div class='del'>-		if (mutex_lock_interruptible_nested(&amp;vnode2-&gt;io_lock, 1) &lt; 0) {</div><div class='add'>+		if (afs_lock_for_io_interruptible(vnode2) &lt; 0) {</div><div class='ctx'> 			afs_op_set_error(op, -ERESTARTSYS);</div><div class='ctx'> 			op-&gt;flags |= AFS_OPERATION_STOP;</div><div class='del'>-			mutex_unlock(&amp;vnode-&gt;io_lock);</div><div class='add'>+			afs_unlock_for_io(vnode);</div><div class='ctx'> 			op-&gt;flags &amp;= ~AFS_OPERATION_LOCK_0;</div><div class='ctx'> 			_leave(" = f [I 1]");</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -104,9 +203,9 @@ static void afs_drop_io_locks(struct afs_operation *op)</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;flags &amp; AFS_OPERATION_LOCK_1)</div><div class='del'>-		mutex_unlock(&amp;vnode2-&gt;io_lock);</div><div class='add'>+		afs_unlock_for_io(vnode2);</div><div class='ctx'> 	if (op-&gt;flags &amp; AFS_OPERATION_LOCK_0)</div><div class='del'>-		mutex_unlock(&amp;vnode-&gt;io_lock);</div><div class='add'>+		afs_unlock_for_io(vnode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_prepare_vnode(struct afs_operation *op, struct afs_vnode_param *vp,</div><div class='hunk'>@@ -157,7 +256,7 @@ bool afs_begin_vnode_operation(struct afs_operation *op)</div><div class='ctx'> /*</div><div class='ctx'>  * Tidy up a filesystem cursor and unlock the vnode.</div><div class='ctx'>  */</div><div class='del'>-static void afs_end_vnode_operation(struct afs_operation *op)</div><div class='add'>+void afs_end_vnode_operation(struct afs_operation *op)</div><div class='ctx'> {</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='hunk'>@@ -201,7 +300,7 @@ void afs_wait_for_operation(struct afs_operation *op)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (op-&gt;call_responded)</div><div class='add'>+	if (op-&gt;call_responded &amp;&amp; op-&gt;server)</div><div class='ctx'> 		set_bit(AFS_SERVER_FL_RESPONDING, &amp;op-&gt;server-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!afs_op_error(op)) {</div><div class='head'>diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c<br/>index 580de4adaaf6..e0030ac74ea0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/fs_probe.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/fs_probe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/fs_probe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/fs_probe.c</a></div><div class='hunk'>@@ -235,20 +235,20 @@ out:</div><div class='ctx'>  * Probe all of a fileserver's addresses to find out the best route and to</div><div class='ctx'>  * query its capabilities.</div><div class='ctx'>  */</div><div class='del'>-void afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,</div><div class='del'>-			     struct afs_addr_list *new_alist, struct key *key)</div><div class='add'>+int afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,</div><div class='add'>+			    struct afs_addr_list *new_alist, struct key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_endpoint_state *estate, *old;</div><div class='del'>-	struct afs_addr_list *alist;</div><div class='add'>+	struct afs_addr_list *old_alist = NULL, *alist;</div><div class='ctx'> 	unsigned long unprobed;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%pU", &amp;server-&gt;uuid);</div><div class='ctx'> </div><div class='ctx'> 	estate = kzalloc(sizeof(*estate), GFP_KERNEL);</div><div class='ctx'> 	if (!estate)</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	refcount_set(&amp;estate-&gt;ref, 1);</div><div class='add'>+	refcount_set(&amp;estate-&gt;ref, 2);</div><div class='ctx'> 	estate-&gt;server_id = server-&gt;debug_id;</div><div class='ctx'> 	estate-&gt;rtt = UINT_MAX;</div><div class='ctx'> </div><div class='hunk'>@@ -256,21 +256,31 @@ void afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> </div><div class='ctx'> 	old = rcu_dereference_protected(server-&gt;endpoint_state,</div><div class='ctx'> 					lockdep_is_held(&amp;server-&gt;fs_lock));</div><div class='del'>-	estate-&gt;responsive_set = old-&gt;responsive_set;</div><div class='del'>-	estate-&gt;addresses = afs_get_addrlist(new_alist ?: old-&gt;addresses,</div><div class='del'>-					     afs_alist_trace_get_estate);</div><div class='add'>+	if (old) {</div><div class='add'>+		estate-&gt;responsive_set = old-&gt;responsive_set;</div><div class='add'>+		if (!new_alist)</div><div class='add'>+			new_alist = old-&gt;addresses;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old_alist != new_alist)</div><div class='add'>+		afs_set_peer_appdata(server, old_alist, new_alist);</div><div class='add'>+</div><div class='add'>+	estate-&gt;addresses = afs_get_addrlist(new_alist, afs_alist_trace_get_estate);</div><div class='ctx'> 	alist = estate-&gt;addresses;</div><div class='ctx'> 	estate-&gt;probe_seq = ++server-&gt;probe_counter;</div><div class='ctx'> 	atomic_set(&amp;estate-&gt;nr_probing, alist-&gt;nr_addrs);</div><div class='ctx'> </div><div class='add'>+	if (new_alist)</div><div class='add'>+		server-&gt;addr_version = new_alist-&gt;version;</div><div class='ctx'> 	rcu_assign_pointer(server-&gt;endpoint_state, estate);</div><div class='del'>-	set_bit(AFS_ESTATE_SUPERSEDED, &amp;old-&gt;flags);</div><div class='ctx'> 	write_unlock(&amp;server-&gt;fs_lock);</div><div class='add'>+	if (old)</div><div class='add'>+		set_bit(AFS_ESTATE_SUPERSEDED, &amp;old-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	trace_afs_estate(estate-&gt;server_id, estate-&gt;probe_seq, refcount_read(&amp;estate-&gt;ref),</div><div class='ctx'> 			 afs_estate_trace_alloc_probe);</div><div class='ctx'> </div><div class='del'>-	afs_get_address_preferences(net, alist);</div><div class='add'>+	afs_get_address_preferences(net, new_alist);</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;probed_at = jiffies;</div><div class='ctx'> 	unprobed = (1UL &lt;&lt; alist-&gt;nr_addrs) - 1;</div><div class='hunk'>@@ -293,6 +303,8 @@ void afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	afs_put_endpoint_state(old, afs_estate_trace_put_probe);</div><div class='add'>+	afs_put_endpoint_state(estate, afs_estate_trace_put_probe);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -506,10 +518,10 @@ int afs_wait_for_one_fs_probe(struct afs_server *server, struct afs_endpoint_sta</div><div class='ctx'> 	finish_wait(&amp;server-&gt;probe_wq, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> dont_wait:</div><div class='del'>-	if (estate-&gt;responsive_set &amp; ~exclude)</div><div class='del'>-		return 1;</div><div class='ctx'> 	if (test_bit(AFS_ESTATE_SUPERSEDED, &amp;estate-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (estate-&gt;responsive_set &amp; ~exclude)</div><div class='add'>+		return 1;</div><div class='ctx'> 	if (is_intr &amp;&amp; signal_pending(current))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> 	if (timo == 0)</div><div class='hunk'>@@ -522,6 +534,6 @@ dont_wait:</div><div class='ctx'>  */</div><div class='ctx'> void afs_fs_probe_cleanup(struct afs_net *net)</div><div class='ctx'> {</div><div class='del'>-	if (del_timer_sync(&amp;net-&gt;fs_probe_timer))</div><div class='add'>+	if (timer_delete_sync(&amp;net-&gt;fs_probe_timer))</div><div class='ctx'> 		afs_dec_servers_outstanding(net);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c<br/>index 79cd30775b7a..bc9556991d7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/fsclient.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/fsclient.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/fsclient.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/fsclient.c</a></div><div class='hunk'>@@ -301,18 +301,19 @@ void afs_fs_fetch_status(struct afs_operation *op)</div><div class='ctx'> static int afs_deliver_fs_fetch_data(struct afs_call *call)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_operation *op = call-&gt;op;</div><div class='add'>+	struct netfs_io_subrequest *subreq = op-&gt;fetch.subreq;</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[0];</div><div class='del'>-	struct afs_read *req = op-&gt;fetch.req;</div><div class='ctx'> 	const __be32 *bp;</div><div class='add'>+	size_t count_before;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%u,%zu,%zu/%llu}",</div><div class='ctx'> 	       call-&gt;unmarshall, call-&gt;iov_len, iov_iter_count(call-&gt;iter),</div><div class='del'>-	       req-&gt;actual_len);</div><div class='add'>+	       call-&gt;remaining);</div><div class='ctx'> </div><div class='ctx'> 	switch (call-&gt;unmarshall) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		req-&gt;actual_len = 0;</div><div class='add'>+		call-&gt;remaining = 0;</div><div class='ctx'> 		call-&gt;unmarshall++;</div><div class='ctx'> 		if (call-&gt;operation_ID == FSFETCHDATA64) {</div><div class='ctx'> 			afs_extract_to_tmp64(call);</div><div class='hunk'>@@ -322,8 +323,8 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call)</div><div class='ctx'> 		}</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> </div><div class='del'>-		/* Extract the returned data length into</div><div class='del'>-		 * -&gt;actual_len.  This may indicate more or less data than was</div><div class='add'>+		/* Extract the returned data length into -&gt;remaining.</div><div class='add'>+		 * This may indicate more or less data than was</div><div class='ctx'> 		 * requested will be returned.</div><div class='ctx'> 		 */</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -332,38 +333,40 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		req-&gt;actual_len = be64_to_cpu(call-&gt;tmp64);</div><div class='del'>-		_debug("DATA length: %llu", req-&gt;actual_len);</div><div class='add'>+		call-&gt;remaining = be64_to_cpu(call-&gt;tmp64);</div><div class='add'>+		_debug("DATA length: %llu", call-&gt;remaining);</div><div class='ctx'> </div><div class='del'>-		if (req-&gt;actual_len == 0)</div><div class='add'>+		if (call-&gt;remaining == 0)</div><div class='ctx'> 			goto no_more_data;</div><div class='ctx'> </div><div class='del'>-		call-&gt;iter = req-&gt;iter;</div><div class='del'>-		call-&gt;iov_len = min(req-&gt;actual_len, req-&gt;len);</div><div class='add'>+		call-&gt;iter = &amp;subreq-&gt;io_iter;</div><div class='add'>+		call-&gt;iov_len = umin(call-&gt;remaining, subreq-&gt;len - subreq-&gt;transferred);</div><div class='ctx'> 		call-&gt;unmarshall++;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 		/* extract the returned data */</div><div class='ctx'> 	case 2:</div><div class='del'>-		_debug("extract data %zu/%llu",</div><div class='del'>-		       iov_iter_count(call-&gt;iter), req-&gt;actual_len);</div><div class='add'>+		count_before = call-&gt;iov_len;</div><div class='add'>+		_debug("extract data %zu/%llu", count_before, call-&gt;remaining);</div><div class='ctx'> </div><div class='ctx'> 		ret = afs_extract_data(call, true);</div><div class='add'>+		subreq-&gt;transferred += count_before - call-&gt;iov_len;</div><div class='add'>+		call-&gt;remaining -= count_before - call-&gt;iov_len;</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		call-&gt;iter = &amp;call-&gt;def_iter;</div><div class='del'>-		if (req-&gt;actual_len &lt;= req-&gt;len)</div><div class='add'>+		if (call-&gt;remaining)</div><div class='ctx'> 			goto no_more_data;</div><div class='ctx'> </div><div class='ctx'> 		/* Discard any excess data the server gave us */</div><div class='del'>-		afs_extract_discard(call, req-&gt;actual_len - req-&gt;len);</div><div class='add'>+		afs_extract_discard(call, call-&gt;remaining);</div><div class='ctx'> 		call-&gt;unmarshall = 3;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case 3:</div><div class='ctx'> 		_debug("extract discard %zu/%llu",</div><div class='del'>-		       iov_iter_count(call-&gt;iter), req-&gt;actual_len - req-&gt;len);</div><div class='add'>+		       iov_iter_count(call-&gt;iter), call-&gt;remaining);</div><div class='ctx'> </div><div class='ctx'> 		ret = afs_extract_data(call, true);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -385,8 +388,8 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call)</div><div class='ctx'> 		xdr_decode_AFSCallBack(&amp;bp, call, &amp;vp-&gt;scb);</div><div class='ctx'> 		xdr_decode_AFSVolSync(&amp;bp, &amp;op-&gt;volsync);</div><div class='ctx'> </div><div class='del'>-		req-&gt;data_version = vp-&gt;scb.status.data_version;</div><div class='del'>-		req-&gt;file_size = vp-&gt;scb.status.size;</div><div class='add'>+		if (subreq-&gt;start + subreq-&gt;transferred &gt;= vp-&gt;scb.status.size)</div><div class='add'>+			__set_bit(NETFS_SREQ_HIT_EOF, &amp;subreq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		call-&gt;unmarshall++;</div><div class='ctx'> 		fallthrough;</div><div class='hunk'>@@ -405,14 +408,18 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call)</div><div class='ctx'> static const struct afs_call_type afs_RXFSFetchData = {</div><div class='ctx'> 	.name		= "FS.FetchData",</div><div class='ctx'> 	.op		= afs_FS_FetchData,</div><div class='add'>+	.async_rx	= afs_fetch_data_async_rx,</div><div class='ctx'> 	.deliver	= afs_deliver_fs_fetch_data,</div><div class='add'>+	.immediate_cancel = afs_fetch_data_immediate_cancel,</div><div class='ctx'> 	.destructor	= afs_flat_call_destructor,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct afs_call_type afs_RXFSFetchData64 = {</div><div class='ctx'> 	.name		= "FS.FetchData64",</div><div class='ctx'> 	.op		= afs_FS_FetchData64,</div><div class='add'>+	.async_rx	= afs_fetch_data_async_rx,</div><div class='ctx'> 	.deliver	= afs_deliver_fs_fetch_data,</div><div class='add'>+	.immediate_cancel = afs_fetch_data_immediate_cancel,</div><div class='ctx'> 	.destructor	= afs_flat_call_destructor,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -421,8 +428,8 @@ static const struct afs_call_type afs_RXFSFetchData64 = {</div><div class='ctx'>  */</div><div class='ctx'> static void afs_fs_fetch_data64(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_io_subrequest *subreq = op-&gt;fetch.subreq;</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[0];</div><div class='del'>-	struct afs_read *req = op-&gt;fetch.req;</div><div class='ctx'> 	struct afs_call *call;</div><div class='ctx'> 	__be32 *bp;</div><div class='ctx'> </div><div class='hunk'>@@ -432,16 +439,19 @@ static void afs_fs_fetch_data64(struct afs_operation *op)</div><div class='ctx'> 	if (!call)</div><div class='ctx'> 		return afs_op_nomem(op);</div><div class='ctx'> </div><div class='add'>+	if (op-&gt;flags &amp; AFS_OPERATION_ASYNC)</div><div class='add'>+		call-&gt;async = true;</div><div class='add'>+</div><div class='ctx'> 	/* marshall the parameters */</div><div class='ctx'> 	bp = call-&gt;request;</div><div class='ctx'> 	bp[0] = htonl(FSFETCHDATA64);</div><div class='ctx'> 	bp[1] = htonl(vp-&gt;fid.vid);</div><div class='ctx'> 	bp[2] = htonl(vp-&gt;fid.vnode);</div><div class='ctx'> 	bp[3] = htonl(vp-&gt;fid.unique);</div><div class='del'>-	bp[4] = htonl(upper_32_bits(req-&gt;pos));</div><div class='del'>-	bp[5] = htonl(lower_32_bits(req-&gt;pos));</div><div class='add'>+	bp[4] = htonl(upper_32_bits(subreq-&gt;start + subreq-&gt;transferred));</div><div class='add'>+	bp[5] = htonl(lower_32_bits(subreq-&gt;start + subreq-&gt;transferred));</div><div class='ctx'> 	bp[6] = 0;</div><div class='del'>-	bp[7] = htonl(lower_32_bits(req-&gt;len));</div><div class='add'>+	bp[7] = htonl(lower_32_bits(subreq-&gt;len   - subreq-&gt;transferred));</div><div class='ctx'> </div><div class='ctx'> 	call-&gt;fid = vp-&gt;fid;</div><div class='ctx'> 	trace_afs_make_fs_call(call, &amp;vp-&gt;fid);</div><div class='hunk'>@@ -453,9 +463,9 @@ static void afs_fs_fetch_data64(struct afs_operation *op)</div><div class='ctx'>  */</div><div class='ctx'> void afs_fs_fetch_data(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_io_subrequest *subreq = op-&gt;fetch.subreq;</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_call *call;</div><div class='del'>-	struct afs_read *req = op-&gt;fetch.req;</div><div class='ctx'> 	__be32 *bp;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(AFS_SERVER_FL_HAS_FS64, &amp;op-&gt;server-&gt;flags))</div><div class='hunk'>@@ -467,16 +477,14 @@ void afs_fs_fetch_data(struct afs_operation *op)</div><div class='ctx'> 	if (!call)</div><div class='ctx'> 		return afs_op_nomem(op);</div><div class='ctx'> </div><div class='del'>-	req-&gt;call_debug_id = call-&gt;debug_id;</div><div class='del'>-</div><div class='ctx'> 	/* marshall the parameters */</div><div class='ctx'> 	bp = call-&gt;request;</div><div class='ctx'> 	bp[0] = htonl(FSFETCHDATA);</div><div class='ctx'> 	bp[1] = htonl(vp-&gt;fid.vid);</div><div class='ctx'> 	bp[2] = htonl(vp-&gt;fid.vnode);</div><div class='ctx'> 	bp[3] = htonl(vp-&gt;fid.unique);</div><div class='del'>-	bp[4] = htonl(lower_32_bits(req-&gt;pos));</div><div class='del'>-	bp[5] = htonl(lower_32_bits(req-&gt;len));</div><div class='add'>+	bp[4] = htonl(lower_32_bits(subreq-&gt;start + subreq-&gt;transferred));</div><div class='add'>+	bp[5] = htonl(lower_32_bits(subreq-&gt;len   + subreq-&gt;transferred));</div><div class='ctx'> </div><div class='ctx'> 	call-&gt;fid = vp-&gt;fid;</div><div class='ctx'> 	trace_afs_make_fs_call(call, &amp;vp-&gt;fid);</div><div class='hunk'>@@ -1645,7 +1653,7 @@ int afs_fs_give_up_all_callbacks(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> 	bp = call-&gt;request;</div><div class='ctx'> 	*bp++ = htonl(FSGIVEUPALLCALLBACKS);</div><div class='ctx'> </div><div class='del'>-	call-&gt;server = afs_use_server(server, afs_server_trace_give_up_cb);</div><div class='add'>+	call-&gt;server = afs_use_server(server, false, afs_server_trace_use_give_up_cb);</div><div class='ctx'> 	afs_make_call(call, GFP_NOFS);</div><div class='ctx'> 	afs_wait_for_call_to_complete(call);</div><div class='ctx'> 	ret = call-&gt;error;</div><div class='hunk'>@@ -1728,6 +1736,7 @@ static const struct afs_call_type afs_RXFSGetCapabilities = {</div><div class='ctx'> 	.op		= afs_FS_GetCapabilities,</div><div class='ctx'> 	.deliver	= afs_deliver_fs_get_capabilities,</div><div class='ctx'> 	.done		= afs_fileserver_probe_result,</div><div class='add'>+	.immediate_cancel = afs_fileserver_probe_result,</div><div class='ctx'> 	.destructor	= afs_fs_get_capabilities_destructor,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1751,7 +1760,7 @@ bool afs_fs_get_capabilities(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	call-&gt;key	= key;</div><div class='del'>-	call-&gt;server	= afs_use_server(server, afs_server_trace_get_caps);</div><div class='add'>+	call-&gt;server	= afs_use_server(server, false, afs_server_trace_use_get_caps);</div><div class='ctx'> 	call-&gt;peer	= rxrpc_kernel_get_peer(estate-&gt;addresses-&gt;addrs[addr_index].peer);</div><div class='ctx'> 	call-&gt;probe	= afs_get_endpoint_state(estate, afs_estate_trace_get_getcaps);</div><div class='ctx'> 	call-&gt;probe_index = addr_index;</div><div class='head'>diff --git a/fs/afs/inode.c b/fs/afs/inode.c<br/>index 94fc049aff58..dde1857fcabb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/inode.c</a></div><div class='hunk'>@@ -25,8 +25,94 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "afs_fs.h"</div><div class='ctx'> </div><div class='add'>+void afs_init_new_symlink(struct afs_vnode *vnode, struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	size_t size = strlen(op-&gt;create.symlink) + 1;</div><div class='add'>+	size_t dsize = 0;</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	if (netfs_alloc_folioq_buffer(NULL, &amp;vnode-&gt;directory, &amp;dsize, size,</div><div class='add'>+				      mapping_gfp_mask(vnode-&gt;netfs.inode.i_mapping)) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vnode-&gt;directory_size = dsize;</div><div class='add'>+	p = kmap_local_folio(folioq_folio(vnode-&gt;directory, 0), 0);</div><div class='add'>+	memcpy(p, op-&gt;create.symlink, size);</div><div class='add'>+	kunmap_local(p);</div><div class='add'>+	set_bit(AFS_VNODE_DIR_READ, &amp;vnode-&gt;flags);</div><div class='add'>+	netfs_single_mark_inode_dirty(&amp;vnode-&gt;netfs.inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void afs_put_link(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio = virt_to_folio(arg);</div><div class='add'>+</div><div class='add'>+	kunmap_local(arg);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *afs_get_link(struct dentry *dentry, struct inode *inode,</div><div class='add'>+			 struct delayed_call *callback)</div><div class='add'>+{</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(inode);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	char *content;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (!dentry) {</div><div class='add'>+		/* RCU pathwalk. */</div><div class='add'>+		if (!test_bit(AFS_VNODE_DIR_READ, &amp;vnode-&gt;flags) || !afs_check_validity(vnode))</div><div class='add'>+			return ERR_PTR(-ECHILD);</div><div class='add'>+		goto good;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(AFS_VNODE_DIR_READ, &amp;vnode-&gt;flags))</div><div class='add'>+		goto fetch;</div><div class='add'>+</div><div class='add'>+	ret = afs_validate(vnode, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(AFS_VNODE_ZAP_DATA, &amp;vnode-&gt;flags) &amp;&amp;</div><div class='add'>+	    test_bit(AFS_VNODE_DIR_READ, &amp;vnode-&gt;flags))</div><div class='add'>+		goto good;</div><div class='add'>+</div><div class='add'>+fetch:</div><div class='add'>+	ret = afs_read_single(vnode, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	set_bit(AFS_VNODE_DIR_READ, &amp;vnode-&gt;flags);</div><div class='add'>+</div><div class='add'>+good:</div><div class='add'>+	folio = folioq_folio(vnode-&gt;directory, 0);</div><div class='add'>+	folio_get(folio);</div><div class='add'>+	content = kmap_local_folio(folio, 0);</div><div class='add'>+	set_delayed_call(callback, afs_put_link, content);</div><div class='add'>+	return content;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int afs_readlink(struct dentry *dentry, char __user *buffer, int buflen)</div><div class='add'>+{</div><div class='add'>+	DEFINE_DELAYED_CALL(done);</div><div class='add'>+	const char *content;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	content = afs_get_link(dentry, d_inode(dentry), &amp;done);</div><div class='add'>+	if (IS_ERR(content)) {</div><div class='add'>+		do_delayed_call(&amp;done);</div><div class='add'>+		return PTR_ERR(content);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = umin(strlen(content), buflen);</div><div class='add'>+	if (copy_to_user(buffer, content, len))</div><div class='add'>+		len = -EFAULT;</div><div class='add'>+	do_delayed_call(&amp;done);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct inode_operations afs_symlink_inode_operations = {</div><div class='del'>-	.get_link	= page_get_link,</div><div class='add'>+	.get_link	= afs_get_link,</div><div class='add'>+	.readlink	= afs_readlink,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static noinline void dump_vnode(struct afs_vnode *vnode, struct afs_vnode *parent_vnode)</div><div class='hunk'>@@ -110,7 +196,9 @@ static int afs_inode_init_from_status(struct afs_operation *op,</div><div class='ctx'> 		inode-&gt;i_op	= &amp;afs_dir_inode_operations;</div><div class='ctx'> 		inode-&gt;i_fop	= &amp;afs_dir_file_operations;</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops	= &amp;afs_dir_aops;</div><div class='del'>-		mapping_set_large_folios(inode-&gt;i_mapping);</div><div class='add'>+		__set_bit(NETFS_ICTX_SINGLE_NO_UPLOAD, &amp;vnode-&gt;netfs.flags);</div><div class='add'>+		/* Assume locally cached directory data will be valid. */</div><div class='add'>+		__set_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AFS_FTYPE_SYMLINK:</div><div class='ctx'> 		/* Symlinks with a mode of 0644 are actually mountpoints. */</div><div class='hunk'>@@ -122,13 +210,13 @@ static int afs_inode_init_from_status(struct afs_operation *op,</div><div class='ctx'> 			inode-&gt;i_mode	= S_IFDIR | 0555;</div><div class='ctx'> 			inode-&gt;i_op	= &amp;afs_mntpt_inode_operations;</div><div class='ctx'> 			inode-&gt;i_fop	= &amp;afs_mntpt_file_operations;</div><div class='del'>-			inode-&gt;i_mapping-&gt;a_ops	= &amp;afs_symlink_aops;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			inode-&gt;i_mode	= S_IFLNK | status-&gt;mode;</div><div class='ctx'> 			inode-&gt;i_op	= &amp;afs_symlink_inode_operations;</div><div class='del'>-			inode-&gt;i_mapping-&gt;a_ops	= &amp;afs_symlink_aops;</div><div class='ctx'> 		}</div><div class='add'>+		inode-&gt;i_mapping-&gt;a_ops	= &amp;afs_dir_aops;</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='add'>+		mapping_set_release_always(inode-&gt;i_mapping);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dump_vnode(vnode, op-&gt;file[0].vnode != vnode ? op-&gt;file[0].vnode : NULL);</div><div class='hunk'>@@ -140,15 +228,17 @@ static int afs_inode_init_from_status(struct afs_operation *op,</div><div class='ctx'> 	afs_set_netfs_context(vnode);</div><div class='ctx'> </div><div class='ctx'> 	vnode-&gt;invalid_before	= status-&gt;data_version;</div><div class='add'>+	trace_afs_set_dv(vnode, status-&gt;data_version);</div><div class='ctx'> 	inode_set_iversion_raw(&amp;vnode-&gt;netfs.inode, status-&gt;data_version);</div><div class='ctx'> </div><div class='ctx'> 	if (!vp-&gt;scb.have_cb) {</div><div class='ctx'> 		/* it's a symlink we just created (the fileserver</div><div class='ctx'> 		 * didn't give us a callback) */</div><div class='del'>-		atomic64_set(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE);</div><div class='add'>+		afs_clear_cb_promise(vnode, afs_cb_promise_set_new_symlink);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		vnode-&gt;cb_server = op-&gt;server;</div><div class='del'>-		atomic64_set(&amp;vnode-&gt;cb_expires_at, vp-&gt;scb.callback.expires_at);</div><div class='add'>+		afs_set_cb_promise(vnode, vp-&gt;scb.callback.expires_at,</div><div class='add'>+				   afs_cb_promise_set_new_inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	write_sequnlock(&amp;vnode-&gt;cb_lock);</div><div class='hunk'>@@ -207,12 +297,17 @@ static void afs_apply_status(struct afs_operation *op,</div><div class='ctx'> 	if (vp-&gt;update_ctime)</div><div class='ctx'> 		inode_set_ctime_to_ts(inode, op-&gt;ctime);</div><div class='ctx'> </div><div class='del'>-	if (vnode-&gt;status.data_version != status-&gt;data_version)</div><div class='add'>+	if (vnode-&gt;status.data_version != status-&gt;data_version) {</div><div class='add'>+		trace_afs_set_dv(vnode, status-&gt;data_version);</div><div class='ctx'> 		data_changed = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	vnode-&gt;status = *status;</div><div class='ctx'> </div><div class='ctx'> 	if (vp-&gt;dv_before + vp-&gt;dv_delta != status-&gt;data_version) {</div><div class='add'>+		trace_afs_dv_mismatch(vnode, vp-&gt;dv_before, vp-&gt;dv_delta,</div><div class='add'>+				      status-&gt;data_version);</div><div class='add'>+</div><div class='ctx'> 		if (vnode-&gt;cb_ro_snapshot == atomic_read(&amp;vnode-&gt;volume-&gt;cb_ro_snapshot) &amp;&amp;</div><div class='ctx'> 		    atomic64_read(&amp;vnode-&gt;cb_expires_at) != AFS_NO_CB_PROMISE)</div><div class='ctx'> 			pr_warn("kAFS: vnode modified {%llx:%llu} %llx-&gt;%llx %s (op=%x)\n",</div><div class='hunk'>@@ -223,12 +318,10 @@ static void afs_apply_status(struct afs_operation *op,</div><div class='ctx'> 				op-&gt;debug_id);</div><div class='ctx'> </div><div class='ctx'> 		vnode-&gt;invalid_before = status-&gt;data_version;</div><div class='del'>-		if (vnode-&gt;status.type == AFS_FTYPE_DIR) {</div><div class='del'>-			if (test_and_clear_bit(AFS_VNODE_DIR_VALID, &amp;vnode-&gt;flags))</div><div class='del'>-				afs_stat_v(vnode, n_inval);</div><div class='del'>-		} else {</div><div class='add'>+		if (vnode-&gt;status.type == AFS_FTYPE_DIR)</div><div class='add'>+			afs_invalidate_dir(vnode, afs_dir_invalid_dv_mismatch);</div><div class='add'>+		else</div><div class='ctx'> 			set_bit(AFS_VNODE_ZAP_DATA, &amp;vnode-&gt;flags);</div><div class='del'>-		}</div><div class='ctx'> 		change_size = true;</div><div class='ctx'> 		data_changed = true;</div><div class='ctx'> 		unexpected_jump = true;</div><div class='hunk'>@@ -258,6 +351,8 @@ static void afs_apply_status(struct afs_operation *op,</div><div class='ctx'> 			inode_set_ctime_to_ts(inode, t);</div><div class='ctx'> 			inode_set_atime_to_ts(inode, t);</div><div class='ctx'> 		}</div><div class='add'>+		if (op-&gt;ops == &amp;afs_fetch_data_operation)</div><div class='add'>+			op-&gt;fetch.subreq-&gt;rreq-&gt;i_size = status-&gt;size;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +368,7 @@ static void afs_apply_callback(struct afs_operation *op,</div><div class='ctx'> 	if (!afs_cb_is_broken(vp-&gt;cb_break_before, vnode)) {</div><div class='ctx'> 		if (op-&gt;volume-&gt;type == AFSVL_RWVOL)</div><div class='ctx'> 			vnode-&gt;cb_server = op-&gt;server;</div><div class='del'>-		atomic64_set(&amp;vnode-&gt;cb_expires_at, cb-&gt;expires_at);</div><div class='add'>+		afs_set_cb_promise(vnode, cb-&gt;expires_at, afs_cb_promise_set_apply_cb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +427,7 @@ static void afs_fetch_status_success(struct afs_operation *op)</div><div class='ctx'> 	struct afs_vnode *vnode = vp-&gt;vnode;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (vnode-&gt;netfs.inode.i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(&amp;vnode-&gt;netfs.inode) &amp; I_NEW) {</div><div class='ctx'> 		ret = afs_inode_init_from_status(op, vp, vnode);</div><div class='ctx'> 		afs_op_set_error(op, ret);</div><div class='ctx'> 		if (ret == 0)</div><div class='hunk'>@@ -435,7 +530,9 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)</div><div class='ctx'> 	} __packed key;</div><div class='ctx'> 	struct afs_vnode_cache_aux aux;</div><div class='ctx'> </div><div class='del'>-	if (vnode-&gt;status.type != AFS_FTYPE_FILE) {</div><div class='add'>+	if (vnode-&gt;status.type != AFS_FTYPE_FILE &amp;&amp;</div><div class='add'>+	    vnode-&gt;status.type != AFS_FTYPE_DIR &amp;&amp;</div><div class='add'>+	    vnode-&gt;status.type != AFS_FTYPE_SYMLINK) {</div><div class='ctx'> 		vnode-&gt;netfs.cache = NULL;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -482,7 +579,7 @@ struct inode *afs_iget(struct afs_operation *op, struct afs_vnode_param *vp)</div><div class='ctx'> 	       inode, vnode-&gt;fid.vid, vnode-&gt;fid.vnode, vnode-&gt;fid.unique);</div><div class='ctx'> </div><div class='ctx'> 	/* deal with an existing inode */</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW)) {</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW)) {</div><div class='ctx'> 		_leave(" = %p", inode);</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -512,7 +609,7 @@ static int afs_iget5_set_root(struct inode *inode, void *opaque)</div><div class='ctx'> 	struct afs_vnode *vnode = AFS_FS_I(inode);</div><div class='ctx'> </div><div class='ctx'> 	vnode-&gt;volume		= as-&gt;volume;</div><div class='del'>-	vnode-&gt;fid.vid		= as-&gt;volume-&gt;vid,</div><div class='add'>+	vnode-&gt;fid.vid		= as-&gt;volume-&gt;vid;</div><div class='ctx'> 	vnode-&gt;fid.vnode	= 1;</div><div class='ctx'> 	vnode-&gt;fid.unique	= 1;</div><div class='ctx'> 	inode-&gt;i_ino		= 1;</div><div class='hunk'>@@ -542,10 +639,10 @@ struct inode *afs_root_iget(struct super_block *sb, struct key *key)</div><div class='ctx'> </div><div class='ctx'> 	_debug("GOT ROOT INODE %p { vl=%llx }", inode, as-&gt;volume-&gt;vid);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!(inode-&gt;i_state &amp; I_NEW));</div><div class='add'>+	BUG_ON(!(inode_state_read_once(inode) &amp; I_NEW));</div><div class='ctx'> </div><div class='ctx'> 	vnode = AFS_FS_I(inode);</div><div class='del'>-	vnode-&gt;cb_v_check = atomic_read(&amp;as-&gt;volume-&gt;cb_v_break),</div><div class='add'>+	vnode-&gt;cb_v_check = atomic_read(&amp;as-&gt;volume-&gt;cb_v_break);</div><div class='ctx'> 	afs_set_netfs_context(vnode);</div><div class='ctx'> </div><div class='ctx'> 	op = afs_alloc_operation(key, as-&gt;volume);</div><div class='hunk'>@@ -626,9 +723,9 @@ int afs_drop_inode(struct inode *inode)</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(AFS_VNODE_PSEUDODIR, &amp;AFS_FS_I(inode)-&gt;flags))</div><div class='del'>-		return generic_delete_inode(inode);</div><div class='add'>+		return inode_just_drop(inode);</div><div class='ctx'> 	else</div><div class='del'>-		return generic_drop_inode(inode);</div><div class='add'>+		return inode_generic_drop(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -637,6 +734,7 @@ int afs_drop_inode(struct inode *inode)</div><div class='ctx'> void afs_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_vnode_cache_aux aux;</div><div class='add'>+	struct afs_super_info *sbi = AFS_FS_S(inode-&gt;i_sb);</div><div class='ctx'> 	struct afs_vnode *vnode = AFS_FS_I(inode);</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%llx:%llu.%d}",</div><div class='hunk'>@@ -648,7 +746,22 @@ void afs_evict_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	ASSERTCMP(inode-&gt;i_ino, ==, vnode-&gt;fid.vnode);</div><div class='ctx'> </div><div class='add'>+	if ((S_ISDIR(inode-&gt;i_mode) ||</div><div class='add'>+	     S_ISLNK(inode-&gt;i_mode)) &amp;&amp;</div><div class='add'>+	    (inode_state_read_once(inode) &amp; I_DIRTY) &amp;&amp;</div><div class='add'>+	    !sbi-&gt;dyn_root) {</div><div class='add'>+		struct writeback_control wbc = {</div><div class='add'>+			.sync_mode = WB_SYNC_ALL,</div><div class='add'>+			.for_sync = true,</div><div class='add'>+			.range_end = LLONG_MAX,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		afs_single_writepages(inode-&gt;i_mapping, &amp;wbc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netfs_wait_for_outstanding_io(inode);</div><div class='ctx'> 	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='add'>+	netfs_free_folioq_buffer(vnode-&gt;directory);</div><div class='ctx'> </div><div class='ctx'> 	afs_set_cache_aux(vnode, &amp;aux);</div><div class='ctx'> 	netfs_clear_inode_writeback(inode, &amp;aux);</div><div class='hunk'>@@ -694,13 +807,18 @@ static void afs_setattr_edit_file(struct afs_operation *op)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[0];</div><div class='ctx'> 	struct afs_vnode *vnode = vp-&gt;vnode;</div><div class='add'>+	struct inode *inode = &amp;vnode-&gt;netfs.inode;</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;setattr.attr-&gt;ia_valid &amp; ATTR_SIZE) {</div><div class='ctx'> 		loff_t size = op-&gt;setattr.attr-&gt;ia_size;</div><div class='del'>-		loff_t i_size = op-&gt;setattr.old_i_size;</div><div class='add'>+		loff_t old = op-&gt;setattr.old_i_size;</div><div class='add'>+</div><div class='add'>+		/* Note: inode-&gt;i_size was updated by afs_apply_status() inside</div><div class='add'>+		 * the I/O and callback locks.</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='del'>-		if (size != i_size) {</div><div class='del'>-			truncate_setsize(&amp;vnode-&gt;netfs.inode, size);</div><div class='add'>+		if (size != old) {</div><div class='add'>+			truncate_pagecache(inode, size);</div><div class='ctx'> 			netfs_resize_file(&amp;vnode-&gt;netfs, size, true);</div><div class='ctx'> 			fscache_resize_cookie(afs_vnode_cache(vnode), size);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/afs/internal.h b/fs/afs/internal.h<br/>index 9c03fcf7ffaa..009064b8d661 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/internal.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/dns_resolver.h&gt;</div><div class='add'>+#include &lt;crypto/krb5.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='hunk'>@@ -130,6 +131,7 @@ struct afs_call {</div><div class='ctx'> 	wait_queue_head_t	waitq;		/* processes awaiting completion */</div><div class='ctx'> 	struct work_struct	async_work;	/* async I/O processor */</div><div class='ctx'> 	struct work_struct	work;		/* actual work processor */</div><div class='add'>+	struct work_struct	free_work;	/* Deferred free processor */</div><div class='ctx'> 	struct rxrpc_call	*rxcall;	/* RxRPC call handle */</div><div class='ctx'> 	struct rxrpc_peer	*peer;		/* Remote endpoint */</div><div class='ctx'> 	struct key		*key;		/* security for this call */</div><div class='hunk'>@@ -162,6 +164,7 @@ struct afs_call {</div><div class='ctx'> 	spinlock_t		state_lock;</div><div class='ctx'> 	int			error;		/* error code */</div><div class='ctx'> 	u32			abort_code;	/* Remote abort ID or 0 */</div><div class='add'>+	unsigned long long	remaining;	/* How much is left to receive */</div><div class='ctx'> 	unsigned int		max_lifespan;	/* Maximum lifespan in secs to set if not 0 */</div><div class='ctx'> 	unsigned		request_size;	/* size of request data */</div><div class='ctx'> 	unsigned		reply_max;	/* maximum size of reply */</div><div class='hunk'>@@ -174,8 +177,10 @@ struct afs_call {</div><div class='ctx'> 	bool			intr;		/* T if interruptible */</div><div class='ctx'> 	bool			unmarshalling_error; /* T if an unmarshalling error occurred */</div><div class='ctx'> 	bool			responded;	/* Got a response from the call (may be abort) */</div><div class='add'>+	u8			security_ix;	/* Security class */</div><div class='ctx'> 	u16			service_id;	/* Actual service ID (after upgrade) */</div><div class='ctx'> 	unsigned int		debug_id;	/* Trace ID */</div><div class='add'>+	u32			enctype;	/* Security encoding type */</div><div class='ctx'> 	u32			operation_ID;	/* operation ID for an incoming call */</div><div class='ctx'> 	u32			count;		/* count for use in unmarshalling */</div><div class='ctx'> 	union {					/* place to extract temporary data */</div><div class='hunk'>@@ -200,11 +205,17 @@ struct afs_call_type {</div><div class='ctx'> 	/* clean up a call */</div><div class='ctx'> 	void (*destructor)(struct afs_call *call);</div><div class='ctx'> </div><div class='add'>+	/* Async receive processing function */</div><div class='add'>+	void (*async_rx)(struct work_struct *work);</div><div class='add'>+</div><div class='ctx'> 	/* Work function */</div><div class='ctx'> 	void (*work)(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> 	/* Call done function (gets called immediately on success or failure) */</div><div class='ctx'> 	void (*done)(struct afs_call *call);</div><div class='add'>+</div><div class='add'>+	/* Handle a call being immediately cancelled. */</div><div class='add'>+	void (*immediate_cancel)(struct afs_call *call);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -232,28 +243,6 @@ static inline struct key *afs_file_key(struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Record of an outstanding read operation on a vnode.</div><div class='del'>- */</div><div class='del'>-struct afs_read {</div><div class='del'>-	loff_t			pos;		/* Where to start reading */</div><div class='del'>-	loff_t			len;		/* How much we're asking for */</div><div class='del'>-	loff_t			actual_len;	/* How much we're actually getting */</div><div class='del'>-	loff_t			file_size;	/* File size returned by server */</div><div class='del'>-	struct key		*key;		/* The key to use to reissue the read */</div><div class='del'>-	struct afs_vnode	*vnode;		/* The file being read into. */</div><div class='del'>-	struct netfs_io_subrequest *subreq;	/* Fscache helper read request this belongs to */</div><div class='del'>-	afs_dataversion_t	data_version;	/* Version number returned by server */</div><div class='del'>-	refcount_t		usage;</div><div class='del'>-	unsigned int		call_debug_id;</div><div class='del'>-	unsigned int		nr_pages;</div><div class='del'>-	int			error;</div><div class='del'>-	void (*done)(struct afs_read *);</div><div class='del'>-	void (*cleanup)(struct afs_read *);</div><div class='del'>-	struct iov_iter		*iter;		/* Iterator representing the buffer */</div><div class='del'>-	struct iov_iter		def_iter;	/* Default iterator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * AFS superblock private data</div><div class='ctx'>  * - there's one superblock per volume</div><div class='ctx'>  */</div><div class='hunk'>@@ -295,15 +284,15 @@ struct afs_net {</div><div class='ctx'> 	struct socket		*socket;</div><div class='ctx'> 	struct afs_call		*spare_incoming_call;</div><div class='ctx'> 	struct work_struct	charge_preallocation_work;</div><div class='add'>+	struct work_struct	rx_oob_work;</div><div class='ctx'> 	struct mutex		socket_mutex;</div><div class='ctx'> 	atomic_t		nr_outstanding_calls;</div><div class='ctx'> 	atomic_t		nr_superblocks;</div><div class='ctx'> </div><div class='ctx'> 	/* Cell database */</div><div class='ctx'> 	struct rb_root		cells;</div><div class='del'>-	struct afs_cell		*ws_cell;</div><div class='del'>-	struct work_struct	cells_manager;</div><div class='del'>-	struct timer_list	cells_timer;</div><div class='add'>+	struct idr		cells_dyn_ino;	/* cell-&gt;dynroot_ino mapping */</div><div class='add'>+	struct afs_cell __rcu	*ws_cell;</div><div class='ctx'> 	atomic_t		cells_outstanding;</div><div class='ctx'> 	struct rw_semaphore	cells_lock;</div><div class='ctx'> 	struct mutex		cells_alias_lock;</div><div class='hunk'>@@ -315,19 +304,12 @@ struct afs_net {</div><div class='ctx'> 	 * cell, but in practice, people create aliases and subsets and there's</div><div class='ctx'> 	 * no easy way to distinguish them.</div><div class='ctx'> 	 */</div><div class='del'>-	seqlock_t		fs_lock;	/* For fs_servers, fs_probe_*, fs_proc */</div><div class='del'>-	struct rb_root		fs_servers;	/* afs_server (by server UUID or address) */</div><div class='add'>+	seqlock_t		fs_lock;	/* For fs_probe_*, fs_proc */</div><div class='ctx'> 	struct list_head	fs_probe_fast;	/* List of afs_server to probe at 30s intervals */</div><div class='ctx'> 	struct list_head	fs_probe_slow;	/* List of afs_server to probe at 5m intervals */</div><div class='ctx'> 	struct hlist_head	fs_proc;	/* procfs servers list */</div><div class='ctx'> </div><div class='del'>-	struct hlist_head	fs_addresses4;	/* afs_server (by lowest IPv4 addr) */</div><div class='del'>-	struct hlist_head	fs_addresses6;	/* afs_server (by lowest IPv6 addr) */</div><div class='del'>-	seqlock_t		fs_addr_lock;	/* For fs_addresses[46] */</div><div class='del'>-</div><div class='del'>-	struct work_struct	fs_manager;</div><div class='del'>-	struct timer_list	fs_timer;</div><div class='del'>-</div><div class='add'>+	struct key		*fs_cm_token_key; /* Key for creating CM tokens */</div><div class='ctx'> 	struct work_struct	fs_prober;</div><div class='ctx'> 	struct timer_list	fs_probe_timer;</div><div class='ctx'> 	atomic_t		servers_outstanding;</div><div class='hunk'>@@ -360,13 +342,11 @@ struct afs_net {</div><div class='ctx'> extern const char afs_init_sysname[];</div><div class='ctx'> </div><div class='ctx'> enum afs_cell_state {</div><div class='del'>-	AFS_CELL_UNSET,</div><div class='del'>-	AFS_CELL_ACTIVATING,</div><div class='add'>+	AFS_CELL_SETTING_UP,</div><div class='add'>+	AFS_CELL_UNLOOKED,</div><div class='ctx'> 	AFS_CELL_ACTIVE,</div><div class='del'>-	AFS_CELL_DEACTIVATING,</div><div class='del'>-	AFS_CELL_INACTIVE,</div><div class='del'>-	AFS_CELL_FAILED,</div><div class='del'>-	AFS_CELL_REMOVED,</div><div class='add'>+	AFS_CELL_REMOVING,</div><div class='add'>+	AFS_CELL_DEAD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -397,7 +377,9 @@ struct afs_cell {</div><div class='ctx'> 	struct afs_cell		*alias_of;	/* The cell this is an alias of */</div><div class='ctx'> 	struct afs_volume	*root_volume;	/* The root.cell volume if there is one */</div><div class='ctx'> 	struct key		*anonymous_key;	/* anonymous user key for this cell */</div><div class='add'>+	struct work_struct	destroyer;	/* Destroyer for cell */</div><div class='ctx'> 	struct work_struct	manager;	/* Manager for init/deinit/dns */</div><div class='add'>+	struct timer_list	management_timer; /* General management timer */</div><div class='ctx'> 	struct hlist_node	proc_link;	/* /proc cell list link */</div><div class='ctx'> 	time64_t		dns_expiry;	/* Time AFSDB/SRV record expires */</div><div class='ctx'> 	time64_t		last_inactive;	/* Time of last drop of usage count */</div><div class='hunk'>@@ -413,6 +395,7 @@ struct afs_cell {</div><div class='ctx'> 	enum dns_lookup_status	dns_status:8;	/* Latest status of data from lookup */</div><div class='ctx'> 	unsigned int		dns_lookup_count; /* Counter of DNS lookups */</div><div class='ctx'> 	unsigned int		debug_id;</div><div class='add'>+	unsigned int		dynroot_ino;	/* Inode numbers for dynroot (a pair) */</div><div class='ctx'> </div><div class='ctx'> 	/* The volumes belonging to this cell */</div><div class='ctx'> 	struct rw_semaphore	vs_lock;	/* Lock for server-&gt;volumes */</div><div class='hunk'>@@ -422,7 +405,7 @@ struct afs_cell {</div><div class='ctx'> </div><div class='ctx'> 	/* Active fileserver interaction state. */</div><div class='ctx'> 	struct rb_root		fs_servers;	/* afs_server (by server UUID) */</div><div class='del'>-	seqlock_t		fs_lock;	/* For fs_servers  */</div><div class='add'>+	struct rw_semaphore	fs_lock;	/* For fs_servers  */</div><div class='ctx'> </div><div class='ctx'> 	/* VL server list. */</div><div class='ctx'> 	rwlock_t		vl_servers_lock; /* Lock on vl_servers */</div><div class='hunk'>@@ -430,6 +413,7 @@ struct afs_cell {</div><div class='ctx'> </div><div class='ctx'> 	u8			name_len;	/* Length of name */</div><div class='ctx'> 	char			*name;		/* Cell name, case-flattened and NUL-padded */</div><div class='add'>+	char			*key_desc;	/* Authentication key description */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -557,32 +541,35 @@ struct afs_server {</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	struct afs_cell		*cell;		/* Cell to which belongs (pins ref) */</div><div class='del'>-	struct rb_node		uuid_rb;	/* Link in net-&gt;fs_servers */</div><div class='del'>-	struct afs_server __rcu	*uuid_next;	/* Next server with same UUID */</div><div class='del'>-	struct afs_server	*uuid_prev;	/* Previous server with same UUID */</div><div class='del'>-	struct list_head	probe_link;	/* Link in net-&gt;fs_probe_list */</div><div class='del'>-	struct hlist_node	addr4_link;	/* Link in net-&gt;fs_addresses4 */</div><div class='del'>-	struct hlist_node	addr6_link;	/* Link in net-&gt;fs_addresses6 */</div><div class='add'>+	struct rb_node		uuid_rb;	/* Link in cell-&gt;fs_servers */</div><div class='add'>+	struct list_head	probe_link;	/* Link in net-&gt;fs_probe_* */</div><div class='ctx'> 	struct hlist_node	proc_link;	/* Link in net-&gt;fs_proc */</div><div class='ctx'> 	struct list_head	volumes;	/* RCU list of afs_server_entry objects */</div><div class='del'>-	struct afs_server	*gc_next;	/* Next server in manager's list */</div><div class='add'>+	struct work_struct	destroyer;	/* Work item to try and destroy a server */</div><div class='add'>+	struct timer_list	timer;		/* Management timer */</div><div class='add'>+	struct mutex		cm_token_lock;	/* Lock governing creation of appdata */</div><div class='add'>+	struct krb5_buffer	cm_rxgk_appdata; /* Appdata to be included in RESPONSE packet */</div><div class='ctx'> 	time64_t		unuse_time;	/* Time at which last unused */</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> #define AFS_SERVER_FL_RESPONDING 0		/* The server is responding */</div><div class='ctx'> #define AFS_SERVER_FL_UPDATING	1</div><div class='ctx'> #define AFS_SERVER_FL_NEEDS_UPDATE 2		/* Fileserver address list is out of date */</div><div class='del'>-#define AFS_SERVER_FL_NOT_READY	4		/* The record is not ready for use */</div><div class='del'>-#define AFS_SERVER_FL_NOT_FOUND	5		/* VL server says no such server */</div><div class='del'>-#define AFS_SERVER_FL_VL_FAIL	6		/* Failed to access VL server */</div><div class='add'>+#define AFS_SERVER_FL_UNCREATED	3		/* The record needs creating */</div><div class='add'>+#define AFS_SERVER_FL_CREATING	4		/* The record is being created */</div><div class='add'>+#define AFS_SERVER_FL_EXPIRED	5		/* The record has expired */</div><div class='add'>+#define AFS_SERVER_FL_NOT_FOUND	6		/* VL server says no such server */</div><div class='add'>+#define AFS_SERVER_FL_VL_FAIL	7		/* Failed to access VL server */</div><div class='ctx'> #define AFS_SERVER_FL_MAY_HAVE_CB 8		/* May have callbacks on this fileserver */</div><div class='ctx'> #define AFS_SERVER_FL_IS_YFS	16		/* Server is YFS not AFS */</div><div class='ctx'> #define AFS_SERVER_FL_NO_IBULK	17		/* Fileserver doesn't support FS.InlineBulkStatus */</div><div class='ctx'> #define AFS_SERVER_FL_NO_RM2	18		/* Fileserver doesn't support YFS.RemoveFile2 */</div><div class='ctx'> #define AFS_SERVER_FL_HAS_FS64	19		/* Fileserver supports FS.{Fetch,Store}Data64 */</div><div class='add'>+#define AFS_SERVER_FL_NO_RENAME2 20		/* YFS Fileserver doesn't support enhanced rename */</div><div class='ctx'> 	refcount_t		ref;		/* Object refcount */</div><div class='ctx'> 	atomic_t		active;		/* Active user count */</div><div class='ctx'> 	u32			addr_version;	/* Address list version */</div><div class='ctx'> 	u16			service_id;	/* Service ID we're using. */</div><div class='add'>+	short			create_error;	/* Creation error */</div><div class='ctx'> 	unsigned int		rtt;		/* Server's current RTT in uS */</div><div class='ctx'> 	unsigned int		debug_id;	/* Debugging ID for traces */</div><div class='ctx'> </div><div class='hunk'>@@ -637,6 +624,7 @@ struct afs_volume {</div><div class='ctx'> 	afs_volid_t		vid;		/* The volume ID of this volume */</div><div class='ctx'> 	afs_volid_t		vids[AFS_MAXTYPES]; /* All associated volume IDs */</div><div class='ctx'> 	refcount_t		ref;</div><div class='add'>+	unsigned int		debug_id;	/* Debugging ID for traces */</div><div class='ctx'> 	time64_t		update_at;	/* Time at which to next update */</div><div class='ctx'> 	struct afs_cell		*cell;		/* Cell to which belongs (pins ref) */</div><div class='ctx'> 	struct rb_node		cell_node;	/* Link in cell-&gt;volumes */</div><div class='hunk'>@@ -703,24 +691,26 @@ struct afs_vnode {</div><div class='ctx'> 	struct afs_file_status	status;		/* AFS status info for this file */</div><div class='ctx'> 	afs_dataversion_t	invalid_before;	/* Child dentries are invalid before this */</div><div class='ctx'> 	struct afs_permits __rcu *permit_cache;	/* cache of permits so far obtained */</div><div class='del'>-	struct mutex		io_lock;	/* Lock for serialising I/O on this mutex */</div><div class='add'>+	struct list_head	io_lock_waiters; /* Threads waiting for the I/O lock */</div><div class='ctx'> 	struct rw_semaphore	validate_lock;	/* lock for validating this vnode */</div><div class='ctx'> 	struct rw_semaphore	rmdir_lock;	/* Lock for rmdir vs sillyrename */</div><div class='ctx'> 	struct key		*silly_key;	/* Silly rename key */</div><div class='ctx'> 	spinlock_t		wb_lock;	/* lock for wb_keys */</div><div class='ctx'> 	spinlock_t		lock;		/* waitqueue/flags lock */</div><div class='ctx'> 	unsigned long		flags;</div><div class='add'>+#define AFS_VNODE_IO_LOCK	0		/* Set if the I/O serialisation lock is held */</div><div class='ctx'> #define AFS_VNODE_UNSET		1		/* set if vnode attributes not yet set */</div><div class='ctx'> #define AFS_VNODE_DIR_VALID	2		/* Set if dir contents are valid */</div><div class='ctx'> #define AFS_VNODE_ZAP_DATA	3		/* set if vnode's data should be invalidated */</div><div class='ctx'> #define AFS_VNODE_DELETED	4		/* set if vnode deleted on server */</div><div class='ctx'> #define AFS_VNODE_MOUNTPOINT	5		/* set if vnode is a mountpoint symlink */</div><div class='del'>-#define AFS_VNODE_AUTOCELL	6		/* set if Vnode is an auto mount point */</div><div class='ctx'> #define AFS_VNODE_PSEUDODIR	7 		/* set if Vnode is a pseudo directory */</div><div class='ctx'> #define AFS_VNODE_NEW_CONTENT	8		/* Set if file has new content (create/trunc-0) */</div><div class='ctx'> #define AFS_VNODE_SILLY_DELETED	9		/* Set if file has been silly-deleted */</div><div class='ctx'> #define AFS_VNODE_MODIFYING	10		/* Set if we're performing a modification op */</div><div class='add'>+#define AFS_VNODE_DIR_READ	11		/* Set if we've read a dir's contents */</div><div class='ctx'> </div><div class='add'>+	struct folio_queue	*directory;	/* Directory contents */</div><div class='ctx'> 	struct list_head	wb_keys;	/* List of keys available for writeback */</div><div class='ctx'> 	struct list_head	pending_locks;	/* locks waiting to be granted */</div><div class='ctx'> 	struct list_head	granted_locks;	/* locks granted on this file */</div><div class='hunk'>@@ -729,6 +719,7 @@ struct afs_vnode {</div><div class='ctx'> 	ktime_t			locked_at;	/* Time at which lock obtained */</div><div class='ctx'> 	enum afs_lock_state	lock_state : 8;</div><div class='ctx'> 	afs_lock_type_t		lock_type : 8;</div><div class='add'>+	unsigned int		directory_size;	/* Amount of space in -&gt;directory */</div><div class='ctx'> </div><div class='ctx'> 	/* outstanding callback notification on this file */</div><div class='ctx'> 	struct work_struct	cb_work;	/* Work for mmap'd files */</div><div class='hunk'>@@ -903,12 +894,13 @@ struct afs_operation {</div><div class='ctx'> 			bool	need_rehash;</div><div class='ctx'> 		} unlink;</div><div class='ctx'> 		struct {</div><div class='del'>-			struct dentry *rehash;</div><div class='del'>-			struct dentry *tmp;</div><div class='del'>-			bool	new_negative;</div><div class='add'>+			struct dentry	*rehash;</div><div class='add'>+			struct dentry	*tmp;</div><div class='add'>+			unsigned int	rename_flags;</div><div class='add'>+			bool		new_negative;</div><div class='ctx'> 		} rename;</div><div class='ctx'> 		struct {</div><div class='del'>-			struct afs_read *req;</div><div class='add'>+			struct netfs_io_subrequest *subreq;</div><div class='ctx'> 		} fetch;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			afs_lock_type_t type;</div><div class='hunk'>@@ -918,7 +910,6 @@ struct afs_operation {</div><div class='ctx'> 			loff_t	pos;</div><div class='ctx'> 			loff_t	size;</div><div class='ctx'> 			loff_t	i_size;</div><div class='del'>-			bool	laundering;	/* Laundering page, PG_writeback not set */</div><div class='ctx'> 		} store;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct iattr	*attr;</div><div class='hunk'>@@ -961,6 +952,7 @@ struct afs_operation {</div><div class='ctx'> #define AFS_OPERATION_TRIED_ALL		0x0400	/* Set if we've tried all the fileservers */</div><div class='ctx'> #define AFS_OPERATION_RETRY_SERVER	0x0800	/* Set if we should retry the current server */</div><div class='ctx'> #define AFS_OPERATION_DIR_CONFLICT	0x1000	/* Set if we detected a 3rd-party dir change */</div><div class='add'>+#define AFS_OPERATION_ASYNC		0x2000	/* Set if should run asynchronously */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -985,6 +977,21 @@ static inline void afs_invalidate_cache(struct afs_vnode *vnode, unsigned int fl</div><div class='ctx'> 			   i_size_read(&amp;vnode-&gt;netfs.inode), flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Directory iteration management.</div><div class='add'>+ */</div><div class='add'>+struct afs_dir_iter {</div><div class='add'>+	struct afs_vnode	*dvnode;</div><div class='add'>+	union afs_xdr_dir_block *block;</div><div class='add'>+	struct folio_queue	*fq;</div><div class='add'>+	unsigned int		fpos;</div><div class='add'>+	int			fq_slot;</div><div class='add'>+	unsigned int		loop_check;</div><div class='add'>+	u8			nr_slots;</div><div class='add'>+	u8			bucket;</div><div class='add'>+	unsigned int		prev_entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #include &lt;trace/events/afs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1005,6 +1012,9 @@ extern int afs_merge_fs_addr4(struct afs_net *net, struct afs_addr_list *addr,</div><div class='ctx'> 			      __be32 xdr, u16 port);</div><div class='ctx'> extern int afs_merge_fs_addr6(struct afs_net *net, struct afs_addr_list *addr,</div><div class='ctx'> 			      __be32 *xdr, u16 port);</div><div class='add'>+void afs_set_peer_appdata(struct afs_server *server,</div><div class='add'>+			  struct afs_addr_list *old_alist,</div><div class='add'>+			  struct afs_addr_list *new_alist);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * addr_prefs.c</div><div class='hunk'>@@ -1041,16 +1051,26 @@ static inline bool afs_cb_is_broken(unsigned int cb_break,</div><div class='ctx'> extern int afs_cell_init(struct afs_net *, const char *);</div><div class='ctx'> extern struct afs_cell *afs_find_cell(struct afs_net *, const char *, unsigned,</div><div class='ctx'> 				      enum afs_cell_trace);</div><div class='del'>-extern struct afs_cell *afs_lookup_cell(struct afs_net *, const char *, unsigned,</div><div class='del'>-					const char *, bool);</div><div class='add'>+enum afs_lookup_cell_for {</div><div class='add'>+	AFS_LOOKUP_CELL_DYNROOT,</div><div class='add'>+	AFS_LOOKUP_CELL_MOUNTPOINT,</div><div class='add'>+	AFS_LOOKUP_CELL_DIRECT_MOUNT,</div><div class='add'>+	AFS_LOOKUP_CELL_PRELOAD,</div><div class='add'>+	AFS_LOOKUP_CELL_ROOTCELL,</div><div class='add'>+	AFS_LOOKUP_CELL_ALIAS_CHECK,</div><div class='add'>+};</div><div class='add'>+struct afs_cell *afs_lookup_cell(struct afs_net *net,</div><div class='add'>+				 const char *name, unsigned int namesz,</div><div class='add'>+				 const char *vllist,</div><div class='add'>+				 enum afs_lookup_cell_for reason,</div><div class='add'>+				 enum afs_cell_trace trace);</div><div class='ctx'> extern struct afs_cell *afs_use_cell(struct afs_cell *, enum afs_cell_trace);</div><div class='del'>-extern void afs_unuse_cell(struct afs_net *, struct afs_cell *, enum afs_cell_trace);</div><div class='add'>+void afs_unuse_cell(struct afs_cell *cell, enum afs_cell_trace reason);</div><div class='ctx'> extern struct afs_cell *afs_get_cell(struct afs_cell *, enum afs_cell_trace);</div><div class='ctx'> extern void afs_see_cell(struct afs_cell *, enum afs_cell_trace);</div><div class='ctx'> extern void afs_put_cell(struct afs_cell *, enum afs_cell_trace);</div><div class='ctx'> extern void afs_queue_cell(struct afs_cell *, enum afs_cell_trace);</div><div class='del'>-extern void afs_manage_cells(struct work_struct *);</div><div class='del'>-extern void afs_cells_timer(struct timer_list *);</div><div class='add'>+void afs_set_cell_timer(struct afs_cell *cell, unsigned int delay_secs);</div><div class='ctx'> extern void __net_exit afs_cell_purge(struct afs_net *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1059,6 +1079,19 @@ extern void __net_exit afs_cell_purge(struct afs_net *);</div><div class='ctx'> extern bool afs_cm_incoming_call(struct afs_call *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * cm_security.c</div><div class='add'>+ */</div><div class='add'>+void afs_process_oob_queue(struct work_struct *work);</div><div class='add'>+#ifdef CONFIG_RXGK</div><div class='add'>+int afs_create_token_key(struct afs_net *net, struct socket *socket);</div><div class='add'>+#else</div><div class='add'>+static inline int afs_create_token_key(struct afs_net *net, struct socket *socket)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * dir.c</div><div class='ctx'>  */</div><div class='ctx'> extern const struct file_operations afs_dir_file_operations;</div><div class='hunk'>@@ -1066,15 +1099,34 @@ extern const struct inode_operations afs_dir_inode_operations;</div><div class='ctx'> extern const struct address_space_operations afs_dir_aops;</div><div class='ctx'> extern const struct dentry_operations afs_fs_dentry_operations;</div><div class='ctx'> </div><div class='add'>+ssize_t afs_read_single(struct afs_vnode *dvnode, struct file *file);</div><div class='add'>+ssize_t afs_read_dir(struct afs_vnode *dvnode, struct file *file)</div><div class='add'>+	__acquires(&amp;dvnode-&gt;validate_lock);</div><div class='ctx'> extern void afs_d_release(struct dentry *);</div><div class='ctx'> extern void afs_check_for_remote_deletion(struct afs_operation *);</div><div class='add'>+int afs_single_writepages(struct address_space *mapping,</div><div class='add'>+			  struct writeback_control *wbc);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dir_edit.c</div><div class='ctx'>  */</div><div class='del'>-extern void afs_edit_dir_add(struct afs_vnode *, struct qstr *, struct afs_fid *,</div><div class='add'>+extern void afs_edit_dir_add(struct afs_vnode *, const struct qstr *, struct afs_fid *,</div><div class='ctx'> 			     enum afs_edit_dir_reason);</div><div class='del'>-extern void afs_edit_dir_remove(struct afs_vnode *, struct qstr *, enum afs_edit_dir_reason);</div><div class='add'>+extern void afs_edit_dir_remove(struct afs_vnode *, const struct qstr *, enum afs_edit_dir_reason);</div><div class='add'>+void afs_edit_dir_update(struct afs_vnode *vnode, const struct qstr *name,</div><div class='add'>+			 struct afs_vnode *new_dvnode, enum afs_edit_dir_reason why);</div><div class='add'>+void afs_mkdir_init_dir(struct afs_vnode *dvnode, struct afs_vnode *parent_vnode);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dir_search.c</div><div class='add'>+ */</div><div class='add'>+unsigned int afs_dir_hash_name(const struct qstr *name);</div><div class='add'>+bool afs_dir_init_iter(struct afs_dir_iter *iter, const struct qstr *name);</div><div class='add'>+union afs_xdr_dir_block *afs_dir_find_block(struct afs_dir_iter *iter, size_t block);</div><div class='add'>+int afs_dir_search_bucket(struct afs_dir_iter *iter, const struct qstr *name,</div><div class='add'>+			  struct afs_fid *_fid);</div><div class='add'>+int afs_dir_search(struct afs_vnode *dvnode, const struct qstr *name,</div><div class='add'>+		   struct afs_fid *_fid, afs_dataversion_t *_dir_version);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dir_silly.c</div><div class='hunk'>@@ -1089,34 +1141,23 @@ extern int afs_silly_iput(struct dentry *, struct inode *);</div><div class='ctx'> extern const struct inode_operations afs_dynroot_inode_operations;</div><div class='ctx'> extern const struct dentry_operations afs_dynroot_dentry_operations;</div><div class='ctx'> </div><div class='del'>-extern struct inode *afs_try_auto_mntpt(struct dentry *, struct inode *);</div><div class='del'>-extern int afs_dynroot_mkdir(struct afs_net *, struct afs_cell *);</div><div class='del'>-extern void afs_dynroot_rmdir(struct afs_net *, struct afs_cell *);</div><div class='del'>-extern int afs_dynroot_populate(struct super_block *);</div><div class='del'>-extern void afs_dynroot_depopulate(struct super_block *);</div><div class='add'>+struct inode *afs_dynroot_iget_root(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * file.c</div><div class='ctx'>  */</div><div class='ctx'> extern const struct address_space_operations afs_file_aops;</div><div class='del'>-extern const struct address_space_operations afs_symlink_aops;</div><div class='ctx'> extern const struct inode_operations afs_file_inode_operations;</div><div class='ctx'> extern const struct file_operations afs_file_operations;</div><div class='add'>+extern const struct afs_operation_ops afs_fetch_data_operation;</div><div class='ctx'> extern const struct netfs_request_ops afs_req_ops;</div><div class='ctx'> </div><div class='ctx'> extern int afs_cache_wb_key(struct afs_vnode *, struct afs_file *);</div><div class='ctx'> extern void afs_put_wb_key(struct afs_wb_key *);</div><div class='ctx'> extern int afs_open(struct inode *, struct file *);</div><div class='ctx'> extern int afs_release(struct inode *, struct file *);</div><div class='del'>-extern int afs_fetch_data(struct afs_vnode *, struct afs_read *);</div><div class='del'>-extern struct afs_read *afs_alloc_read(gfp_t);</div><div class='del'>-extern void afs_put_read(struct afs_read *);</div><div class='del'>-</div><div class='del'>-static inline struct afs_read *afs_get_read(struct afs_read *req)</div><div class='del'>-{</div><div class='del'>-	refcount_inc(&amp;req-&gt;usage);</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='add'>+void afs_fetch_data_async_rx(struct work_struct *work);</div><div class='add'>+void afs_fetch_data_immediate_cancel(struct afs_call *call);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * flock.c</div><div class='hunk'>@@ -1168,6 +1209,7 @@ extern void afs_fs_store_acl(struct afs_operation *);</div><div class='ctx'> extern struct afs_operation *afs_alloc_operation(struct key *, struct afs_volume *);</div><div class='ctx'> extern int afs_put_operation(struct afs_operation *);</div><div class='ctx'> extern bool afs_begin_vnode_operation(struct afs_operation *);</div><div class='add'>+extern void afs_end_vnode_operation(struct afs_operation *op);</div><div class='ctx'> extern void afs_wait_for_operation(struct afs_operation *);</div><div class='ctx'> extern int afs_do_sync_operation(struct afs_operation *);</div><div class='ctx'> </div><div class='hunk'>@@ -1191,8 +1233,8 @@ struct afs_endpoint_state *afs_get_endpoint_state(struct afs_endpoint_state *est</div><div class='ctx'> 						  enum afs_estate_trace where);</div><div class='ctx'> void afs_put_endpoint_state(struct afs_endpoint_state *estate, enum afs_estate_trace where);</div><div class='ctx'> extern void afs_fileserver_probe_result(struct afs_call *);</div><div class='del'>-void afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,</div><div class='del'>-			     struct afs_addr_list *new_addrs, struct key *key);</div><div class='add'>+int afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,</div><div class='add'>+			    struct afs_addr_list *new_alist, struct key *key);</div><div class='ctx'> int afs_wait_for_fs_probes(struct afs_operation *op, struct afs_server_state *states, bool intr);</div><div class='ctx'> extern void afs_probe_fileserver(struct afs_net *, struct afs_server *);</div><div class='ctx'> extern void afs_fs_probe_dispatcher(struct work_struct *);</div><div class='hunk'>@@ -1205,10 +1247,13 @@ extern void afs_fs_probe_cleanup(struct afs_net *);</div><div class='ctx'>  */</div><div class='ctx'> extern const struct afs_operation_ops afs_fetch_status_operation;</div><div class='ctx'> </div><div class='add'>+void afs_init_new_symlink(struct afs_vnode *vnode, struct afs_operation *op);</div><div class='add'>+const char *afs_get_link(struct dentry *dentry, struct inode *inode,</div><div class='add'>+			 struct delayed_call *callback);</div><div class='add'>+int afs_readlink(struct dentry *dentry, char __user *buffer, int buflen);</div><div class='ctx'> extern void afs_vnode_commit_status(struct afs_operation *, struct afs_vnode_param *);</div><div class='ctx'> extern int afs_fetch_status(struct afs_vnode *, struct key *, bool, afs_access_t *);</div><div class='ctx'> extern int afs_ilookup5_test_by_fid(struct inode *, void *);</div><div class='del'>-extern struct inode *afs_iget_pseudo_dir(struct super_block *, bool);</div><div class='ctx'> extern struct inode *afs_iget(struct afs_operation *, struct afs_vnode_param *);</div><div class='ctx'> extern struct inode *afs_root_iget(struct super_block *, struct key *);</div><div class='ctx'> extern int afs_getattr(struct mnt_idmap *idmap, const struct path *,</div><div class='hunk'>@@ -1334,7 +1379,9 @@ extern int __net_init afs_open_socket(struct afs_net *);</div><div class='ctx'> extern void __net_exit afs_close_socket(struct afs_net *);</div><div class='ctx'> extern void afs_charge_preallocation(struct work_struct *);</div><div class='ctx'> extern void afs_put_call(struct afs_call *);</div><div class='add'>+void afs_deferred_put_call(struct afs_call *call);</div><div class='ctx'> void afs_make_call(struct afs_call *call, gfp_t gfp);</div><div class='add'>+void afs_deliver_to_call(struct afs_call *call);</div><div class='ctx'> void afs_wait_for_call_to_complete(struct afs_call *call);</div><div class='ctx'> extern struct afs_call *afs_alloc_flat_call(struct afs_net *,</div><div class='ctx'> 					    const struct afs_call_type *,</div><div class='hunk'>@@ -1345,6 +1392,28 @@ extern void afs_send_simple_reply(struct afs_call *, const void *, size_t);</div><div class='ctx'> extern int afs_extract_data(struct afs_call *, bool);</div><div class='ctx'> extern int afs_protocol_error(struct afs_call *, enum afs_eproto_cause);</div><div class='ctx'> </div><div class='add'>+static inline struct afs_call *afs_get_call(struct afs_call *call,</div><div class='add'>+					    enum afs_call_trace why)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	__refcount_inc(&amp;call-&gt;ref, &amp;r);</div><div class='add'>+</div><div class='add'>+	trace_afs_call(call-&gt;debug_id, why, r + 1,</div><div class='add'>+		       atomic_read(&amp;call-&gt;net-&gt;nr_outstanding_calls),</div><div class='add'>+		       __builtin_return_address(0));</div><div class='add'>+	return call;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void afs_see_call(struct afs_call *call, enum afs_call_trace why)</div><div class='add'>+{</div><div class='add'>+	int r = refcount_read(&amp;call-&gt;ref);</div><div class='add'>+</div><div class='add'>+	trace_afs_call(call-&gt;debug_id, why, r,</div><div class='add'>+		       atomic_read(&amp;call-&gt;net-&gt;nr_outstanding_calls),</div><div class='add'>+		       __builtin_return_address(0));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void afs_make_op_call(struct afs_operation *op, struct afs_call *call,</div><div class='ctx'> 				    gfp_t gfp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1466,20 +1535,30 @@ extern void __exit afs_clean_up_permit_cache(void);</div><div class='ctx'>  */</div><div class='ctx'> extern spinlock_t afs_server_peer_lock;</div><div class='ctx'> </div><div class='del'>-extern struct afs_server *afs_find_server(struct afs_net *, const struct rxrpc_peer *);</div><div class='del'>-extern struct afs_server *afs_find_server_by_uuid(struct afs_net *, const uuid_t *);</div><div class='add'>+struct afs_server *afs_find_server(const struct rxrpc_peer *peer);</div><div class='ctx'> extern struct afs_server *afs_lookup_server(struct afs_cell *, struct key *, const uuid_t *, u32);</div><div class='ctx'> extern struct afs_server *afs_get_server(struct afs_server *, enum afs_server_trace);</div><div class='del'>-extern struct afs_server *afs_use_server(struct afs_server *, enum afs_server_trace);</div><div class='del'>-extern void afs_unuse_server(struct afs_net *, struct afs_server *, enum afs_server_trace);</div><div class='del'>-extern void afs_unuse_server_notime(struct afs_net *, struct afs_server *, enum afs_server_trace);</div><div class='add'>+struct afs_server *afs_use_server(struct afs_server *server, bool activate,</div><div class='add'>+				  enum afs_server_trace reason);</div><div class='add'>+void afs_unuse_server(struct afs_net *net, struct afs_server *server,</div><div class='add'>+		      enum afs_server_trace reason);</div><div class='add'>+void afs_unuse_server_notime(struct afs_net *net, struct afs_server *server,</div><div class='add'>+			     enum afs_server_trace reason);</div><div class='ctx'> extern void afs_put_server(struct afs_net *, struct afs_server *, enum afs_server_trace);</div><div class='del'>-extern void afs_manage_servers(struct work_struct *);</div><div class='del'>-extern void afs_servers_timer(struct timer_list *);</div><div class='add'>+void afs_purge_servers(struct afs_cell *cell);</div><div class='ctx'> extern void afs_fs_probe_timer(struct timer_list *);</div><div class='del'>-extern void __net_exit afs_purge_servers(struct afs_net *);</div><div class='add'>+void __net_exit afs_wait_for_servers(struct afs_net *net);</div><div class='ctx'> bool afs_check_server_record(struct afs_operation *op, struct afs_server *server, struct key *key);</div><div class='ctx'> </div><div class='add'>+static inline void afs_see_server(struct afs_server *server, enum afs_server_trace trace)</div><div class='add'>+{</div><div class='add'>+	int r = refcount_read(&amp;server-&gt;ref);</div><div class='add'>+	int a = atomic_read(&amp;server-&gt;active);</div><div class='add'>+</div><div class='add'>+	trace_afs_server(server-&gt;debug_id, r, a, trace);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void afs_inc_servers_outstanding(struct afs_net *net)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;net-&gt;servers_outstanding);</div><div class='hunk'>@@ -1601,11 +1680,14 @@ extern int afs_check_volume_status(struct afs_volume *, struct afs_operation *);</div><div class='ctx'> /*</div><div class='ctx'>  * write.c</div><div class='ctx'>  */</div><div class='add'>+void afs_prepare_write(struct netfs_io_subrequest *subreq);</div><div class='add'>+void afs_issue_write(struct netfs_io_subrequest *subreq);</div><div class='add'>+void afs_begin_writeback(struct netfs_io_request *wreq);</div><div class='add'>+void afs_retry_request(struct netfs_io_request *wreq, struct netfs_io_stream *stream);</div><div class='ctx'> extern int afs_writepages(struct address_space *, struct writeback_control *);</div><div class='ctx'> extern int afs_fsync(struct file *, loff_t, loff_t, int);</div><div class='ctx'> extern vm_fault_t afs_page_mkwrite(struct vm_fault *vmf);</div><div class='ctx'> extern void afs_prune_wb_keys(struct afs_vnode *);</div><div class='del'>-void afs_create_write_requests(struct netfs_io_request *wreq, loff_t start, size_t len);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * xattr.c</div><div class='hunk'>@@ -1624,6 +1706,9 @@ extern void yfs_fs_remove_dir(struct afs_operation *);</div><div class='ctx'> extern void yfs_fs_link(struct afs_operation *);</div><div class='ctx'> extern void yfs_fs_symlink(struct afs_operation *);</div><div class='ctx'> extern void yfs_fs_rename(struct afs_operation *);</div><div class='add'>+void yfs_fs_rename_replace(struct afs_operation *op);</div><div class='add'>+void yfs_fs_rename_noreplace(struct afs_operation *op);</div><div class='add'>+void yfs_fs_rename_exchange(struct afs_operation *op);</div><div class='ctx'> extern void yfs_fs_store_data(struct afs_operation *);</div><div class='ctx'> extern void yfs_fs_setattr(struct afs_operation *);</div><div class='ctx'> extern void yfs_fs_get_volume_status(struct afs_operation *);</div><div class='hunk'>@@ -1708,6 +1793,38 @@ static inline int afs_bad(struct afs_vnode *vnode, enum afs_file_error where)</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Set the callback promise on a vnode.</div><div class='add'>+ */</div><div class='add'>+static inline void afs_set_cb_promise(struct afs_vnode *vnode, time64_t expires_at,</div><div class='add'>+				      enum afs_cb_promise_trace trace)</div><div class='add'>+{</div><div class='add'>+	atomic64_set(&amp;vnode-&gt;cb_expires_at, expires_at);</div><div class='add'>+	trace_afs_cb_promise(vnode, trace);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear the callback promise on a vnode, returning true if it was promised.</div><div class='add'>+ */</div><div class='add'>+static inline bool afs_clear_cb_promise(struct afs_vnode *vnode,</div><div class='add'>+					enum afs_cb_promise_trace trace)</div><div class='add'>+{</div><div class='add'>+	trace_afs_cb_promise(vnode, trace);</div><div class='add'>+	return atomic64_xchg(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE) != AFS_NO_CB_PROMISE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a directory as being invalid.</div><div class='add'>+ */</div><div class='add'>+static inline void afs_invalidate_dir(struct afs_vnode *dvnode,</div><div class='add'>+				      enum afs_dir_invalid_trace trace)</div><div class='add'>+{</div><div class='add'>+	if (test_and_clear_bit(AFS_VNODE_DIR_VALID, &amp;dvnode-&gt;flags)) {</div><div class='add'>+		trace_afs_dir_invalid(dvnode, trace);</div><div class='add'>+		afs_stat_v(dvnode, n_inval);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * debug tracing</div><div class='head'>diff --git a/fs/afs/main.c b/fs/afs/main.c<br/>index 1b3bd21c168a..e6bb8237db98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/main.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/main.c</a></div><div class='hunk'>@@ -73,29 +73,21 @@ static int __net_init afs_net_init(struct net *net_ns)</div><div class='ctx'> 	generate_random_uuid((unsigned char *)&amp;net-&gt;uuid);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;net-&gt;charge_preallocation_work, afs_charge_preallocation);</div><div class='add'>+	INIT_WORK(&amp;net-&gt;rx_oob_work, afs_process_oob_queue);</div><div class='ctx'> 	mutex_init(&amp;net-&gt;socket_mutex);</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;cells = RB_ROOT;</div><div class='add'>+	idr_init(&amp;net-&gt;cells_dyn_ino);</div><div class='ctx'> 	init_rwsem(&amp;net-&gt;cells_lock);</div><div class='del'>-	INIT_WORK(&amp;net-&gt;cells_manager, afs_manage_cells);</div><div class='del'>-	timer_setup(&amp;net-&gt;cells_timer, afs_cells_timer, 0);</div><div class='del'>-</div><div class='ctx'> 	mutex_init(&amp;net-&gt;cells_alias_lock);</div><div class='ctx'> 	mutex_init(&amp;net-&gt;proc_cells_lock);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;net-&gt;proc_cells);</div><div class='ctx'> </div><div class='ctx'> 	seqlock_init(&amp;net-&gt;fs_lock);</div><div class='del'>-	net-&gt;fs_servers = RB_ROOT;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;net-&gt;fs_probe_fast);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;net-&gt;fs_probe_slow);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;net-&gt;fs_proc);</div><div class='ctx'> </div><div class='del'>-	INIT_HLIST_HEAD(&amp;net-&gt;fs_addresses4);</div><div class='del'>-	INIT_HLIST_HEAD(&amp;net-&gt;fs_addresses6);</div><div class='del'>-	seqlock_init(&amp;net-&gt;fs_addr_lock);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;net-&gt;fs_manager, afs_manage_servers);</div><div class='del'>-	timer_setup(&amp;net-&gt;fs_timer, afs_servers_timer, 0);</div><div class='ctx'> 	INIT_WORK(&amp;net-&gt;fs_prober, afs_fs_probe_dispatcher);</div><div class='ctx'> 	timer_setup(&amp;net-&gt;fs_probe_timer, afs_fs_probe_timer, 0);</div><div class='ctx'> 	atomic_set(&amp;net-&gt;servers_outstanding, 1);</div><div class='hunk'>@@ -131,13 +123,14 @@ error_open_socket:</div><div class='ctx'> 	net-&gt;live = false;</div><div class='ctx'> 	afs_fs_probe_cleanup(net);</div><div class='ctx'> 	afs_cell_purge(net);</div><div class='del'>-	afs_purge_servers(net);</div><div class='add'>+	afs_wait_for_servers(net);</div><div class='ctx'> error_cell_init:</div><div class='ctx'> 	net-&gt;live = false;</div><div class='ctx'> 	afs_proc_cleanup(net);</div><div class='ctx'> error_proc:</div><div class='ctx'> 	afs_put_sysnames(net-&gt;sysnames);</div><div class='ctx'> error_sysnames:</div><div class='add'>+	idr_destroy(&amp;net-&gt;cells_dyn_ino);</div><div class='ctx'> 	net-&gt;live = false;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -152,10 +145,11 @@ static void __net_exit afs_net_exit(struct net *net_ns)</div><div class='ctx'> 	net-&gt;live = false;</div><div class='ctx'> 	afs_fs_probe_cleanup(net);</div><div class='ctx'> 	afs_cell_purge(net);</div><div class='del'>-	afs_purge_servers(net);</div><div class='add'>+	afs_wait_for_servers(net);</div><div class='ctx'> 	afs_close_socket(net);</div><div class='ctx'> 	afs_proc_cleanup(net);</div><div class='ctx'> 	afs_put_sysnames(net-&gt;sysnames);</div><div class='add'>+	idr_destroy(&amp;net-&gt;cells_dyn_ino);</div><div class='ctx'> 	kfree_rcu(rcu_access_pointer(net-&gt;address_prefs), rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,13 +169,13 @@ static int __init afs_init(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n");</div><div class='ctx'> </div><div class='del'>-	afs_wq = alloc_workqueue("afs", 0, 0);</div><div class='add'>+	afs_wq = alloc_workqueue("afs", WQ_PERCPU, 0);</div><div class='ctx'> 	if (!afs_wq)</div><div class='ctx'> 		goto error_afs_wq;</div><div class='del'>-	afs_async_calls = alloc_workqueue("kafsd", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	afs_async_calls = alloc_workqueue("kafsd", WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='ctx'> 	if (!afs_async_calls)</div><div class='ctx'> 		goto error_async;</div><div class='del'>-	afs_lock_manager = alloc_workqueue("kafs_lockd", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	afs_lock_manager = alloc_workqueue("kafs_lockd", WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 	if (!afs_lock_manager)</div><div class='ctx'> 		goto error_lockmgr;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/misc.c b/fs/afs/misc.c<br/>index b8180bf2281f..c8a7f266080d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/misc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/misc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/misc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/misc.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;crypto/krb5.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "afs_fs.h"</div><div class='ctx'> #include "protocol_uae.h"</div><div class='hunk'>@@ -103,7 +104,34 @@ int afs_abort_to_error(u32 abort_code)</div><div class='ctx'> 	case RXKADDATALEN:	return -EKEYREJECTED;</div><div class='ctx'> 	case RXKADILLEGALLEVEL:	return -EKEYREJECTED;</div><div class='ctx'> </div><div class='add'>+	case RXGK_INCONSISTENCY:	return -EPROTO;</div><div class='add'>+	case RXGK_PACKETSHORT:		return -EPROTO;</div><div class='add'>+	case RXGK_BADCHALLENGE:		return -EPROTO;</div><div class='add'>+	case RXGK_SEALEDINCON:		return -EKEYREJECTED;</div><div class='add'>+	case RXGK_NOTAUTH:		return -EKEYREJECTED;</div><div class='add'>+	case RXGK_EXPIRED:		return -EKEYEXPIRED;</div><div class='add'>+	case RXGK_BADLEVEL:		return -EKEYREJECTED;</div><div class='add'>+	case RXGK_BADKEYNO:		return -EKEYREJECTED;</div><div class='add'>+	case RXGK_NOTRXGK:		return -EKEYREJECTED;</div><div class='add'>+	case RXGK_UNSUPPORTED:		return -EKEYREJECTED;</div><div class='add'>+	case RXGK_GSSERROR:		return -EKEYREJECTED;</div><div class='add'>+#ifdef RXGK_BADETYPE</div><div class='add'>+	case RXGK_BADETYPE:		return -ENOPKG;</div><div class='add'>+#endif</div><div class='add'>+#ifdef RXGK_BADTOKEN</div><div class='add'>+	case RXGK_BADTOKEN:		return -EKEYREJECTED;</div><div class='add'>+#endif</div><div class='add'>+#ifdef RXGK_BADETYPE</div><div class='add'>+	case RXGK_DATALEN:		return -EPROTO;</div><div class='add'>+#endif</div><div class='add'>+#ifdef RXGK_BADQOP</div><div class='add'>+	case RXGK_BADQOP:		return -EKEYREJECTED;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	case KRB5_PROG_KEYTYPE_NOSUPP:	return -ENOPKG;</div><div class='add'>+</div><div class='ctx'> 	case RXGEN_OPCODE:	return -ENOTSUPP;</div><div class='add'>+	case RX_INVALID_OPERATION:	return -ENOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	default:		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c<br/>index 97f50e9fd9eb..57c204a3c04e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/mntpt.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/mntpt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/mntpt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/mntpt.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ const struct file_operations afs_mntpt_file_operations = {</div><div class='ctx'> </div><div class='ctx'> const struct inode_operations afs_mntpt_inode_operations = {</div><div class='ctx'> 	.lookup		= afs_mntpt_lookup,</div><div class='del'>-	.readlink	= page_readlink,</div><div class='add'>+	.readlink	= afs_readlink,</div><div class='ctx'> 	.getattr	= afs_getattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +87,7 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt)</div><div class='ctx'> 		ctx-&gt;force = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ctx-&gt;cell) {</div><div class='del'>-		afs_unuse_cell(ctx-&gt;net, ctx-&gt;cell, afs_cell_trace_unuse_mntpt);</div><div class='add'>+		afs_unuse_cell(ctx-&gt;cell, afs_cell_trace_unuse_mntpt);</div><div class='ctx'> 		ctx-&gt;cell = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (test_bit(AFS_VNODE_PSEUDODIR, &amp;vnode-&gt;flags)) {</div><div class='hunk'>@@ -107,7 +107,9 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt)</div><div class='ctx'> 		if (size &gt; AFS_MAXCELLNAME)</div><div class='ctx'> 			return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='del'>-		cell = afs_lookup_cell(ctx-&gt;net, p, size, NULL, false);</div><div class='add'>+		cell = afs_lookup_cell(ctx-&gt;net, p, size, NULL,</div><div class='add'>+				       AFS_LOOKUP_CELL_MOUNTPOINT,</div><div class='add'>+				       afs_cell_trace_use_lookup_mntpt);</div><div class='ctx'> 		if (IS_ERR(cell)) {</div><div class='ctx'> 			pr_err("kAFS: unable to lookup cell '%pd'\n", mntpt);</div><div class='ctx'> 			return PTR_ERR(cell);</div><div class='hunk'>@@ -118,9 +120,9 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt)</div><div class='ctx'> 		ctx-&gt;volnamesz = sizeof(afs_root_volume) - 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* read the contents of the AFS special symlink */</div><div class='del'>-		struct page *page;</div><div class='add'>+		DEFINE_DELAYED_CALL(cleanup);</div><div class='add'>+		const char *content;</div><div class='ctx'> 		loff_t size = i_size_read(d_inode(mntpt));</div><div class='del'>-		char *buf;</div><div class='ctx'> </div><div class='ctx'> 		if (src_as-&gt;cell)</div><div class='ctx'> 			ctx-&gt;cell = afs_use_cell(src_as-&gt;cell, afs_cell_trace_use_mntpt);</div><div class='hunk'>@@ -128,18 +130,24 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt)</div><div class='ctx'> 		if (size &lt; 2 || size &gt; PAGE_SIZE - 1)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		page = read_mapping_page(d_inode(mntpt)-&gt;i_mapping, 0, NULL);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+		content = afs_get_link(mntpt, d_inode(mntpt), &amp;cleanup);</div><div class='add'>+		if (IS_ERR(content)) {</div><div class='add'>+			do_delayed_call(&amp;cleanup);</div><div class='add'>+			return PTR_ERR(content);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		buf = kmap(page);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		if (buf[size - 1] == '.')</div><div class='del'>-			ret = vfs_parse_fs_string(fc, "source", buf, size - 1);</div><div class='del'>-		kunmap(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		if (content[size - 1] == '.')</div><div class='add'>+			ret = vfs_parse_fs_qstr(fc, "source",</div><div class='add'>+						&amp;QSTR_LEN(content, size - 1));</div><div class='add'>+		do_delayed_call(&amp;cleanup);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='add'>+</div><div class='add'>+		/* Don't cross a backup volume mountpoint from a backup volume */</div><div class='add'>+		if (src_as-&gt;volume &amp;&amp; src_as-&gt;volume-&gt;type == AFSVL_BACKVOL &amp;&amp;</div><div class='add'>+		    ctx-&gt;type == AFSVL_BACKVOL)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -183,7 +191,6 @@ struct vfsmount *afs_d_automount(struct path *path)</div><div class='ctx'> 	if (IS_ERR(newmnt))</div><div class='ctx'> 		return newmnt;</div><div class='ctx'> </div><div class='del'>-	mntget(newmnt); /* prevent immediate expiration */</div><div class='ctx'> 	mnt_set_expiry(newmnt, &amp;afs_vfsmounts);</div><div class='ctx'> 	queue_delayed_work(afs_wq, &amp;afs_mntpt_expiry_timer,</div><div class='ctx'> 			   afs_mntpt_expiry_timeout * HZ);</div><div class='head'>diff --git a/fs/afs/proc.c b/fs/afs/proc.c<br/>index 3bd02571f30d..44520549b509 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/proc.c</a></div><div class='hunk'>@@ -122,14 +122,16 @@ static int afs_proc_cells_write(struct file *file, char *buf, size_t size)</div><div class='ctx'> 	if (strcmp(buf, "add") == 0) {</div><div class='ctx'> 		struct afs_cell *cell;</div><div class='ctx'> </div><div class='del'>-		cell = afs_lookup_cell(net, name, strlen(name), args, true);</div><div class='add'>+		cell = afs_lookup_cell(net, name, strlen(name), args,</div><div class='add'>+				       AFS_LOOKUP_CELL_PRELOAD,</div><div class='add'>+				       afs_cell_trace_use_lookup_add);</div><div class='ctx'> 		if (IS_ERR(cell)) {</div><div class='ctx'> 			ret = PTR_ERR(cell);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_set_bit(AFS_CELL_FL_NO_GC, &amp;cell-&gt;flags))</div><div class='del'>-			afs_unuse_cell(net, cell, afs_cell_trace_unuse_no_pin);</div><div class='add'>+			afs_unuse_cell(cell, afs_cell_trace_unuse_no_pin);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		goto inval;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -166,7 +168,7 @@ static int afs_proc_addr_prefs_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	if (!preflist) {</div><div class='ctx'> 		seq_puts(m, "NO PREFS\n");</div><div class='del'>-		return 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "PROT SUBNET                                      PRIOR (v=%u n=%u/%u/%u)\n",</div><div class='hunk'>@@ -191,7 +193,8 @@ static int afs_proc_addr_prefs_show(struct seq_file *m, void *v)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +208,7 @@ static int afs_proc_rootcell_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	net = afs_seq2net_single(m);</div><div class='ctx'> 	down_read(&amp;net-&gt;cells_lock);</div><div class='del'>-	cell = net-&gt;ws_cell;</div><div class='add'>+	cell = rcu_dereference_protected(net-&gt;ws_cell, lockdep_is_held(&amp;net-&gt;cells_lock));</div><div class='ctx'> 	if (cell)</div><div class='ctx'> 		seq_printf(m, "%s\n", cell-&gt;name);</div><div class='ctx'> 	up_read(&amp;net-&gt;cells_lock);</div><div class='hunk'>@@ -239,7 +242,13 @@ static int afs_proc_rootcell_write(struct file *file, char *buf, size_t size)</div><div class='ctx'> 	/* determine command to perform */</div><div class='ctx'> 	_debug("rootcell=%s", buf);</div><div class='ctx'> </div><div class='del'>-	ret = afs_cell_init(net, buf);</div><div class='add'>+	ret = -EEXIST;</div><div class='add'>+	inode_lock(file_inode(file));</div><div class='add'>+	if (!rcu_access_pointer(net-&gt;ws_cell))</div><div class='add'>+		ret = afs_cell_init(net, buf);</div><div class='add'>+	else</div><div class='add'>+		printk("busy\n");</div><div class='add'>+	inode_unlock(file_inode(file));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	_leave(" = %d", ret);</div><div class='hunk'>@@ -436,8 +445,6 @@ static int afs_proc_servers_show(struct seq_file *m, void *v)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	server = list_entry(v, struct afs_server, proc_link);</div><div class='del'>-	estate = rcu_dereference(server-&gt;endpoint_state);</div><div class='del'>-	alist = estate-&gt;addresses;</div><div class='ctx'> 	seq_printf(m, "%pU %3d %3d %s\n",</div><div class='ctx'> 		   &amp;server-&gt;uuid,</div><div class='ctx'> 		   refcount_read(&amp;server-&gt;ref),</div><div class='hunk'>@@ -447,10 +454,16 @@ static int afs_proc_servers_show(struct seq_file *m, void *v)</div><div class='ctx'> 		   server-&gt;flags, server-&gt;rtt);</div><div class='ctx'> 	seq_printf(m, "  - probe: last=%d\n",</div><div class='ctx'> 		   (int)(jiffies - server-&gt;probed_at) / HZ);</div><div class='add'>+</div><div class='add'>+	estate = rcu_dereference(server-&gt;endpoint_state);</div><div class='add'>+	if (!estate)</div><div class='add'>+		goto out;</div><div class='ctx'> 	failed = estate-&gt;failed_set;</div><div class='ctx'> 	seq_printf(m, "  - ESTATE pq=%x np=%u rsp=%lx f=%lx\n",</div><div class='ctx'> 		   estate-&gt;probe_seq, atomic_read(&amp;estate-&gt;nr_probing),</div><div class='ctx'> 		   estate-&gt;responsive_set, estate-&gt;failed_set);</div><div class='add'>+</div><div class='add'>+	alist = estate-&gt;addresses;</div><div class='ctx'> 	seq_printf(m, "  - ALIST v=%u ap=%u\n",</div><div class='ctx'> 		   alist-&gt;version, alist-&gt;addr_pref_version);</div><div class='ctx'> 	for (i = 0; i &lt; alist-&gt;nr_addrs; i++) {</div><div class='hunk'>@@ -463,6 +476,8 @@ static int afs_proc_servers_show(struct seq_file *m, void *v)</div><div class='ctx'> 			   rxrpc_kernel_get_srtt(addr-&gt;peer),</div><div class='ctx'> 			   addr-&gt;last_error, addr-&gt;prio);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/protocol_yfs.h b/fs/afs/protocol_yfs.h<br/>index e4cd89c44c46..b2f06c1917c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/protocol_yfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/protocol_yfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/protocol_yfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/protocol_yfs.h</a></div><div class='hunk'>@@ -50,6 +50,9 @@ enum YFS_FS_Operations {</div><div class='ctx'> 	YFSREMOVEACL		= 64171,</div><div class='ctx'> 	YFSREMOVEFILE2		= 64173,</div><div class='ctx'> 	YFSSTOREOPAQUEACL2	= 64174,</div><div class='add'>+	YFSRENAME_REPLACE	= 64176,</div><div class='add'>+	YFSRENAME_NOREPLACE	= 64177,</div><div class='add'>+	YFSRENAME_EXCHANGE	= 64187,</div><div class='ctx'> 	YFSINLINEBULKSTATUS	= 64536, /* YFS Fetch multiple file statuses with errors */</div><div class='ctx'> 	YFSFETCHDATA64		= 64537, /* YFS Fetch file data */</div><div class='ctx'> 	YFSSTOREDATA64		= 64538, /* YFS Store file data */</div><div class='head'>diff --git a/fs/afs/rotate.c b/fs/afs/rotate.c<br/>index 700a27bc8c25..6a4e7da10fc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/rotate.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/rotate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/rotate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/rotate.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static bool afs_start_fs_iteration(struct afs_operation *op,</div><div class='ctx'> 		write_seqlock(&amp;vnode-&gt;cb_lock);</div><div class='ctx'> 		ASSERTCMP(cb_server, ==, vnode-&gt;cb_server);</div><div class='ctx'> 		vnode-&gt;cb_server = NULL;</div><div class='del'>-		if (atomic64_xchg(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE) != AFS_NO_CB_PROMISE)</div><div class='add'>+		if (afs_clear_cb_promise(vnode, afs_cb_promise_clear_rotate_server))</div><div class='ctx'> 			vnode-&gt;cb_break++;</div><div class='ctx'> 		write_sequnlock(&amp;vnode-&gt;cb_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -432,6 +432,16 @@ bool afs_select_fileserver(struct afs_operation *op)</div><div class='ctx'> 			afs_op_set_error(op, -EDQUOT);</div><div class='ctx'> 			goto failed_but_online;</div><div class='ctx'> </div><div class='add'>+		case RX_INVALID_OPERATION:</div><div class='add'>+		case RXGEN_OPCODE:</div><div class='add'>+			/* Handle downgrading to an older operation. */</div><div class='add'>+			afs_op_set_error(op, -ENOTSUPP);</div><div class='add'>+			if (op-&gt;flags &amp; AFS_OPERATION_DOWNGRADE) {</div><div class='add'>+				op-&gt;flags &amp;= ~AFS_OPERATION_DOWNGRADE;</div><div class='add'>+				goto go_again;</div><div class='add'>+			}</div><div class='add'>+			goto failed_but_online;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			afs_op_accumulate_error(op, error, abort_code);</div><div class='ctx'> 		failed_but_online:</div><div class='hunk'>@@ -541,11 +551,13 @@ pick_server:</div><div class='ctx'> 		    test_bit(AFS_SE_EXCLUDED, &amp;se-&gt;flags) ||</div><div class='ctx'> 		    !test_bit(AFS_SERVER_FL_RESPONDING, &amp;s-&gt;flags))</div><div class='ctx'> 			continue;</div><div class='del'>-		es = op-&gt;server_states-&gt;endpoint_state;</div><div class='add'>+		es = op-&gt;server_states[i].endpoint_state;</div><div class='ctx'> 		sal = es-&gt;addresses;</div><div class='ctx'> </div><div class='ctx'> 		afs_get_address_preferences_rcu(op-&gt;net, sal);</div><div class='ctx'> 		for (j = 0; j &lt; sal-&gt;nr_addrs; j++) {</div><div class='add'>+			if (es-&gt;failed_set &amp; (1 &lt;&lt; j))</div><div class='add'>+				continue;</div><div class='ctx'> 			if (!sal-&gt;addrs[j].peer)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (sal-&gt;addrs[j].prio &gt; best_prio) {</div><div class='hunk'>@@ -581,7 +593,7 @@ selected_server:</div><div class='ctx'> 	if (vnode-&gt;cb_server != server) {</div><div class='ctx'> 		vnode-&gt;cb_server = server;</div><div class='ctx'> 		vnode-&gt;cb_v_check = atomic_read(&amp;vnode-&gt;volume-&gt;cb_v_break);</div><div class='del'>-		atomic64_set(&amp;vnode-&gt;cb_expires_at, AFS_NO_CB_PROMISE);</div><div class='add'>+		afs_clear_cb_promise(vnode, afs_cb_promise_clear_server_change);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> retry_server:</div><div class='hunk'>@@ -602,34 +614,39 @@ iterate_address:</div><div class='ctx'> 		goto wait_for_more_probe_results;</div><div class='ctx'> </div><div class='ctx'> 	alist = op-&gt;estate-&gt;addresses;</div><div class='add'>+	best_prio = -1;</div><div class='add'>+	addr_index = 0;</div><div class='ctx'> 	for (i = 0; i &lt; alist-&gt;nr_addrs; i++) {</div><div class='add'>+		if (!(set &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='ctx'> 		if (alist-&gt;addrs[i].prio &gt; best_prio) {</div><div class='ctx'> 			addr_index = i;</div><div class='ctx'> 			best_prio = alist-&gt;addrs[i].prio;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addr_index = READ_ONCE(alist-&gt;preferred);</div><div class='del'>-	if (!test_bit(addr_index, &amp;set))</div><div class='del'>-		addr_index = __ffs(set);</div><div class='add'>+	alist-&gt;preferred = addr_index;</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;addr_index = addr_index;</div><div class='ctx'> 	set_bit(addr_index, &amp;op-&gt;addr_tried);</div><div class='ctx'> </div><div class='del'>-	op-&gt;volsync.creation = TIME64_MIN;</div><div class='del'>-	op-&gt;volsync.update = TIME64_MIN;</div><div class='del'>-	op-&gt;call_responded = false;</div><div class='ctx'> 	_debug("address [%u] %u/%u %pISp",</div><div class='ctx'> 	       op-&gt;server_index, addr_index, alist-&gt;nr_addrs,</div><div class='ctx'> 	       rxrpc_kernel_remote_addr(alist-&gt;addrs[op-&gt;addr_index].peer));</div><div class='add'>+go_again:</div><div class='add'>+	op-&gt;volsync.creation = TIME64_MIN;</div><div class='add'>+	op-&gt;volsync.update = TIME64_MIN;</div><div class='add'>+	op-&gt;call_responded = false;</div><div class='ctx'> 	_leave(" = t");</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> wait_for_more_probe_results:</div><div class='ctx'> 	error = afs_wait_for_one_fs_probe(op-&gt;server, op-&gt;estate, op-&gt;addr_tried,</div><div class='ctx'> 					  !(op-&gt;flags &amp; AFS_OPERATION_UNINTR));</div><div class='del'>-	if (!error)</div><div class='add'>+	if (error == 1)</div><div class='ctx'> 		goto iterate_address;</div><div class='add'>+	if (!error)</div><div class='add'>+		goto restart_from_beginning;</div><div class='ctx'> </div><div class='ctx'> 	/* We've now had a failure to respond on all of a server's addresses -</div><div class='ctx'> 	 * immediately probe them again and consider retrying the server.</div><div class='hunk'>@@ -640,10 +657,13 @@ wait_for_more_probe_results:</div><div class='ctx'> 		error = afs_wait_for_one_fs_probe(op-&gt;server, op-&gt;estate, op-&gt;addr_tried,</div><div class='ctx'> 						  !(op-&gt;flags &amp; AFS_OPERATION_UNINTR));</div><div class='ctx'> 		switch (error) {</div><div class='del'>-		case 0:</div><div class='add'>+		case 1:</div><div class='ctx'> 			op-&gt;flags &amp;= ~AFS_OPERATION_RETRY_SERVER;</div><div class='del'>-			trace_afs_rotate(op, afs_rotate_trace_retry_server, 0);</div><div class='add'>+			trace_afs_rotate(op, afs_rotate_trace_retry_server, 1);</div><div class='ctx'> 			goto retry_server;</div><div class='add'>+		case 0:</div><div class='add'>+			trace_afs_rotate(op, afs_rotate_trace_retry_server, 0);</div><div class='add'>+			goto restart_from_beginning;</div><div class='ctx'> 		case -ERESTARTSYS:</div><div class='ctx'> 			afs_op_set_error(op, error);</div><div class='ctx'> 			goto failed;</div><div class='hunk'>@@ -656,12 +676,6 @@ wait_for_more_probe_results:</div><div class='ctx'> next_server:</div><div class='ctx'> 	trace_afs_rotate(op, afs_rotate_trace_next_server, 0);</div><div class='ctx'> 	_debug("next");</div><div class='del'>-	ASSERT(op-&gt;estate);</div><div class='del'>-	alist = op-&gt;estate-&gt;addresses;</div><div class='del'>-	if (op-&gt;call_responded &amp;&amp;</div><div class='del'>-	    op-&gt;addr_index != READ_ONCE(alist-&gt;preferred) &amp;&amp;</div><div class='del'>-	    test_bit(alist-&gt;preferred, &amp;op-&gt;addr_tried))</div><div class='del'>-		WRITE_ONCE(alist-&gt;preferred, op-&gt;addr_index);</div><div class='ctx'> 	op-&gt;estate = NULL;</div><div class='ctx'> 	goto pick_server;</div><div class='ctx'> </div><div class='hunk'>@@ -680,7 +694,7 @@ no_more_servers:</div><div class='ctx'> 	for (i = 0; i &lt; op-&gt;server_list-&gt;nr_servers; i++) {</div><div class='ctx'> 		struct afs_endpoint_state *estate;</div><div class='ctx'> </div><div class='del'>-		estate = op-&gt;server_states-&gt;endpoint_state;</div><div class='add'>+		estate = op-&gt;server_states[i].endpoint_state;</div><div class='ctx'> 		error = READ_ONCE(estate-&gt;error);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='ctx'> 			afs_op_accumulate_error(op, error, estate-&gt;abort_code);</div><div class='hunk'>@@ -690,14 +704,7 @@ no_more_servers:</div><div class='ctx'> failed:</div><div class='ctx'> 	trace_afs_rotate(op, afs_rotate_trace_failed, 0);</div><div class='ctx'> 	op-&gt;flags |= AFS_OPERATION_STOP;</div><div class='del'>-	if (op-&gt;estate) {</div><div class='del'>-		alist = op-&gt;estate-&gt;addresses;</div><div class='del'>-		if (op-&gt;call_responded &amp;&amp;</div><div class='del'>-		    op-&gt;addr_index != READ_ONCE(alist-&gt;preferred) &amp;&amp;</div><div class='del'>-		    test_bit(alist-&gt;preferred, &amp;op-&gt;addr_tried))</div><div class='del'>-			WRITE_ONCE(alist-&gt;preferred, op-&gt;addr_index);</div><div class='del'>-		op-&gt;estate = NULL;</div><div class='del'>-	}</div><div class='add'>+	op-&gt;estate = NULL;</div><div class='ctx'> 	_leave(" = f [failed %d]", afs_op_error(op));</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c<br/>index c453428f3c8b..bf0e4ea0aafd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/rxrpc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/rxrpc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/rxrpc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/rxrpc.c</a></div><div class='hunk'>@@ -18,13 +18,23 @@</div><div class='ctx'> </div><div class='ctx'> struct workqueue_struct *afs_async_calls;</div><div class='ctx'> </div><div class='add'>+static void afs_deferred_free_worker(struct work_struct *work);</div><div class='ctx'> static void afs_wake_up_call_waiter(struct sock *, struct rxrpc_call *, unsigned long);</div><div class='ctx'> static void afs_wake_up_async_call(struct sock *, struct rxrpc_call *, unsigned long);</div><div class='ctx'> static void afs_process_async_call(struct work_struct *);</div><div class='ctx'> static void afs_rx_new_call(struct sock *, struct rxrpc_call *, unsigned long);</div><div class='ctx'> static void afs_rx_discard_new_call(struct rxrpc_call *, unsigned long);</div><div class='add'>+static void afs_rx_attach(struct rxrpc_call *rxcall, unsigned long user_call_ID);</div><div class='add'>+static void afs_rx_notify_oob(struct sock *sk, struct sk_buff *oob);</div><div class='ctx'> static int afs_deliver_cm_op_id(struct afs_call *);</div><div class='ctx'> </div><div class='add'>+static const struct rxrpc_kernel_ops afs_rxrpc_callback_ops = {</div><div class='add'>+	.notify_new_call	= afs_rx_new_call,</div><div class='add'>+	.discard_new_call	= afs_rx_discard_new_call,</div><div class='add'>+	.user_attach_call	= afs_rx_attach,</div><div class='add'>+	.notify_oob		= afs_rx_notify_oob,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* asynchronous incoming call initial processing */</div><div class='ctx'> static const struct afs_call_type afs_RXCMxxxx = {</div><div class='ctx'> 	.name		= "CB.xxxx",</div><div class='hunk'>@@ -48,6 +58,7 @@ int afs_open_socket(struct afs_net *net)</div><div class='ctx'> 		goto error_1;</div><div class='ctx'> </div><div class='ctx'> 	socket-&gt;sk-&gt;sk_allocation = GFP_NOFS;</div><div class='add'>+	socket-&gt;sk-&gt;sk_user_data = net;</div><div class='ctx'> </div><div class='ctx'> 	/* bind the callback manager's address to make this a server socket */</div><div class='ctx'> 	memset(&amp;srx, 0, sizeof(srx));</div><div class='hunk'>@@ -63,16 +74,24 @@ int afs_open_socket(struct afs_net *net)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error_2;</div><div class='ctx'> </div><div class='del'>-	ret = kernel_bind(socket, (struct sockaddr *) &amp;srx, sizeof(srx));</div><div class='add'>+	ret = rxrpc_sock_set_manage_response(socket-&gt;sk, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_2;</div><div class='add'>+</div><div class='add'>+	ret = afs_create_token_key(net, socket);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_err("Couldn't create RxGK CM key: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	ret = kernel_bind(socket, (struct sockaddr_unsized *) &amp;srx, sizeof(srx));</div><div class='ctx'> 	if (ret == -EADDRINUSE) {</div><div class='ctx'> 		srx.transport.sin6.sin6_port = 0;</div><div class='del'>-		ret = kernel_bind(socket, (struct sockaddr *) &amp;srx, sizeof(srx));</div><div class='add'>+		ret = kernel_bind(socket, (struct sockaddr_unsized *) &amp;srx, sizeof(srx));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error_2;</div><div class='ctx'> </div><div class='ctx'> 	srx.srx_service = YFS_CM_SERVICE;</div><div class='del'>-	ret = kernel_bind(socket, (struct sockaddr *) &amp;srx, sizeof(srx));</div><div class='add'>+	ret = kernel_bind(socket, (struct sockaddr_unsized *) &amp;srx, sizeof(srx));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error_2;</div><div class='ctx'> </div><div class='hunk'>@@ -83,8 +102,7 @@ int afs_open_socket(struct afs_net *net)</div><div class='ctx'> 	 * it sends back to us.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	rxrpc_kernel_new_call_notification(socket, afs_rx_new_call,</div><div class='del'>-					   afs_rx_discard_new_call);</div><div class='add'>+	rxrpc_kernel_set_notifications(socket, &amp;afs_rxrpc_callback_ops);</div><div class='ctx'> </div><div class='ctx'> 	ret = kernel_listen(socket, INT_MAX);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -124,7 +142,9 @@ void afs_close_socket(struct afs_net *net)</div><div class='ctx'> </div><div class='ctx'> 	kernel_sock_shutdown(net-&gt;socket, SHUT_RDWR);</div><div class='ctx'> 	flush_workqueue(afs_async_calls);</div><div class='add'>+	net-&gt;socket-&gt;sk-&gt;sk_user_data = NULL;</div><div class='ctx'> 	sock_release(net-&gt;socket);</div><div class='add'>+	key_put(net-&gt;fs_cm_token_key);</div><div class='ctx'> </div><div class='ctx'> 	_debug("dework");</div><div class='ctx'> 	_leave("");</div><div class='hunk'>@@ -148,7 +168,9 @@ static struct afs_call *afs_alloc_call(struct afs_net *net,</div><div class='ctx'> 	call-&gt;net = net;</div><div class='ctx'> 	call-&gt;debug_id = atomic_inc_return(&amp;rxrpc_debug_id);</div><div class='ctx'> 	refcount_set(&amp;call-&gt;ref, 1);</div><div class='del'>-	INIT_WORK(&amp;call-&gt;async_work, afs_process_async_call);</div><div class='add'>+	INIT_WORK(&amp;call-&gt;async_work, type-&gt;async_rx ?: afs_process_async_call);</div><div class='add'>+	INIT_WORK(&amp;call-&gt;work, call-&gt;type-&gt;work);</div><div class='add'>+	INIT_WORK(&amp;call-&gt;free_work, afs_deferred_free_worker);</div><div class='ctx'> 	init_waitqueue_head(&amp;call-&gt;waitq);</div><div class='ctx'> 	spin_lock_init(&amp;call-&gt;state_lock);</div><div class='ctx'> 	call-&gt;iter = &amp;call-&gt;def_iter;</div><div class='hunk'>@@ -159,6 +181,36 @@ static struct afs_call *afs_alloc_call(struct afs_net *net,</div><div class='ctx'> 	return call;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void afs_free_call(struct afs_call *call)</div><div class='add'>+{</div><div class='add'>+	struct afs_net *net = call-&gt;net;</div><div class='add'>+	int o;</div><div class='add'>+</div><div class='add'>+	ASSERT(!work_pending(&amp;call-&gt;async_work));</div><div class='add'>+</div><div class='add'>+	rxrpc_kernel_put_peer(call-&gt;peer);</div><div class='add'>+</div><div class='add'>+	if (call-&gt;rxcall) {</div><div class='add'>+		rxrpc_kernel_shutdown_call(net-&gt;socket, call-&gt;rxcall);</div><div class='add'>+		rxrpc_kernel_put_call(net-&gt;socket, call-&gt;rxcall);</div><div class='add'>+		call-&gt;rxcall = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (call-&gt;type-&gt;destructor)</div><div class='add'>+		call-&gt;type-&gt;destructor(call);</div><div class='add'>+</div><div class='add'>+	afs_unuse_server_notime(call-&gt;net, call-&gt;server, afs_server_trace_unuse_call);</div><div class='add'>+	kfree(call-&gt;request);</div><div class='add'>+</div><div class='add'>+	o = atomic_read(&amp;net-&gt;nr_outstanding_calls);</div><div class='add'>+	trace_afs_call(call-&gt;debug_id, afs_call_trace_free, 0, o,</div><div class='add'>+		       __builtin_return_address(0));</div><div class='add'>+	kfree(call);</div><div class='add'>+</div><div class='add'>+	o = atomic_dec_return(&amp;net-&gt;nr_outstanding_calls);</div><div class='add'>+	if (o == 0)</div><div class='add'>+		wake_up_var(&amp;net-&gt;nr_outstanding_calls);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Dispose of a reference on a call.</div><div class='ctx'>  */</div><div class='hunk'>@@ -173,45 +225,34 @@ void afs_put_call(struct afs_call *call)</div><div class='ctx'> 	o = atomic_read(&amp;net-&gt;nr_outstanding_calls);</div><div class='ctx'> 	trace_afs_call(debug_id, afs_call_trace_put, r - 1, o,</div><div class='ctx'> 		       __builtin_return_address(0));</div><div class='add'>+	if (zero)</div><div class='add'>+		afs_free_call(call);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (zero) {</div><div class='del'>-		ASSERT(!work_pending(&amp;call-&gt;async_work));</div><div class='del'>-		ASSERT(call-&gt;type-&gt;name != NULL);</div><div class='del'>-</div><div class='del'>-		rxrpc_kernel_put_peer(call-&gt;peer);</div><div class='del'>-</div><div class='del'>-		if (call-&gt;rxcall) {</div><div class='del'>-			rxrpc_kernel_shutdown_call(net-&gt;socket, call-&gt;rxcall);</div><div class='del'>-			rxrpc_kernel_put_call(net-&gt;socket, call-&gt;rxcall);</div><div class='del'>-			call-&gt;rxcall = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (call-&gt;type-&gt;destructor)</div><div class='del'>-			call-&gt;type-&gt;destructor(call);</div><div class='del'>-</div><div class='del'>-		afs_unuse_server_notime(call-&gt;net, call-&gt;server, afs_server_trace_put_call);</div><div class='del'>-		kfree(call-&gt;request);</div><div class='del'>-</div><div class='del'>-		trace_afs_call(call-&gt;debug_id, afs_call_trace_free, 0, o,</div><div class='del'>-			       __builtin_return_address(0));</div><div class='del'>-		kfree(call);</div><div class='add'>+static void afs_deferred_free_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct afs_call *call = container_of(work, struct afs_call, free_work);</div><div class='ctx'> </div><div class='del'>-		o = atomic_dec_return(&amp;net-&gt;nr_outstanding_calls);</div><div class='del'>-		if (o == 0)</div><div class='del'>-			wake_up_var(&amp;net-&gt;nr_outstanding_calls);</div><div class='del'>-	}</div><div class='add'>+	afs_free_call(call);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct afs_call *afs_get_call(struct afs_call *call,</div><div class='del'>-				     enum afs_call_trace why)</div><div class='add'>+/*</div><div class='add'>+ * Dispose of a reference on a call, deferring the cleanup to a workqueue</div><div class='add'>+ * to avoid lock recursion.</div><div class='add'>+ */</div><div class='add'>+void afs_deferred_put_call(struct afs_call *call)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	__refcount_inc(&amp;call-&gt;ref, &amp;r);</div><div class='add'>+	struct afs_net *net = call-&gt;net;</div><div class='add'>+	unsigned int debug_id = call-&gt;debug_id;</div><div class='add'>+	bool zero;</div><div class='add'>+	int r, o;</div><div class='ctx'> </div><div class='del'>-	trace_afs_call(call-&gt;debug_id, why, r + 1,</div><div class='del'>-		       atomic_read(&amp;call-&gt;net-&gt;nr_outstanding_calls),</div><div class='add'>+	zero = __refcount_dec_and_test(&amp;call-&gt;ref, &amp;r);</div><div class='add'>+	o = atomic_read(&amp;net-&gt;nr_outstanding_calls);</div><div class='add'>+	trace_afs_call(debug_id, afs_call_trace_put, r - 1, o,</div><div class='ctx'> 		       __builtin_return_address(0));</div><div class='del'>-	return call;</div><div class='add'>+	if (zero)</div><div class='add'>+		schedule_work(&amp;call-&gt;free_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -220,8 +261,6 @@ static struct afs_call *afs_get_call(struct afs_call *call,</div><div class='ctx'> static void afs_queue_call_work(struct afs_call *call)</div><div class='ctx'> {</div><div class='ctx'> 	if (call-&gt;type-&gt;work) {</div><div class='del'>-		INIT_WORK(&amp;call-&gt;work, call-&gt;type-&gt;work);</div><div class='del'>-</div><div class='ctx'> 		afs_get_call(call, afs_call_trace_work);</div><div class='ctx'> 		if (!queue_work(afs_wq, &amp;call-&gt;work))</div><div class='ctx'> 			afs_put_call(call);</div><div class='hunk'>@@ -396,11 +435,16 @@ void afs_make_call(struct afs_call *call, gfp_t gfp)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> error_do_abort:</div><div class='del'>-	if (ret != -ECONNABORTED) {</div><div class='add'>+	if (ret != -ECONNABORTED)</div><div class='ctx'> 		rxrpc_kernel_abort_call(call-&gt;net-&gt;socket, rxcall,</div><div class='ctx'> 					RX_USER_ABORT, ret,</div><div class='ctx'> 					afs_abort_send_data_error);</div><div class='del'>-	} else {</div><div class='add'>+	if (call-&gt;async) {</div><div class='add'>+		afs_see_call(call, afs_call_trace_async_abort);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == -ECONNABORTED) {</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 		iov_iter_kvec(&amp;msg.msg_iter, ITER_DEST, NULL, 0, 0);</div><div class='ctx'> 		rxrpc_kernel_recv_data(call-&gt;net-&gt;socket, rxcall,</div><div class='hunk'>@@ -411,8 +455,10 @@ error_do_abort:</div><div class='ctx'> 	call-&gt;error = ret;</div><div class='ctx'> 	trace_afs_call_done(call);</div><div class='ctx'> error_kill_call:</div><div class='del'>-	if (call-&gt;type-&gt;done)</div><div class='del'>-		call-&gt;type-&gt;done(call);</div><div class='add'>+	if (call-&gt;async)</div><div class='add'>+		afs_see_call(call, afs_call_trace_async_kill);</div><div class='add'>+	if (call-&gt;type-&gt;immediate_cancel)</div><div class='add'>+		call-&gt;type-&gt;immediate_cancel(call);</div><div class='ctx'> </div><div class='ctx'> 	/* We need to dispose of the extra ref we grabbed for an async call.</div><div class='ctx'> 	 * The call, however, might be queued on afs_async_calls and we need to</div><div class='hunk'>@@ -467,7 +513,7 @@ static void afs_log_error(struct afs_call *call, s32 remote_abort)</div><div class='ctx'> /*</div><div class='ctx'>  * deliver messages to a call</div><div class='ctx'>  */</div><div class='del'>-static void afs_deliver_to_call(struct afs_call *call)</div><div class='add'>+void afs_deliver_to_call(struct afs_call *call)</div><div class='ctx'> {</div><div class='ctx'> 	enum afs_call_state state;</div><div class='ctx'> 	size_t len;</div><div class='hunk'>@@ -568,7 +614,6 @@ local_abort:</div><div class='ctx'> 	abort_code = 0;</div><div class='ctx'> call_complete:</div><div class='ctx'> 	afs_set_call_complete(call, ret, remote_abort);</div><div class='del'>-	state = AFS_CALL_COMPLETE;</div><div class='ctx'> 	goto done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -640,7 +685,8 @@ static void afs_wake_up_call_waiter(struct sock *sk, struct rxrpc_call *rxcall,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * wake up an asynchronous call</div><div class='add'>+ * Wake up an asynchronous call.  The caller is holding the call notify</div><div class='add'>+ * spinlock around this, so we can't call afs_put_call().</div><div class='ctx'>  */</div><div class='ctx'> static void afs_wake_up_async_call(struct sock *sk, struct rxrpc_call *rxcall,</div><div class='ctx'> 				   unsigned long call_user_ID)</div><div class='hunk'>@@ -657,7 +703,7 @@ static void afs_wake_up_async_call(struct sock *sk, struct rxrpc_call *rxcall,</div><div class='ctx'> 			       __builtin_return_address(0));</div><div class='ctx'> </div><div class='ctx'> 		if (!queue_work(afs_async_calls, &amp;call-&gt;async_work))</div><div class='del'>-			afs_put_call(call);</div><div class='add'>+			afs_deferred_put_call(call);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +757,6 @@ void afs_charge_preallocation(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		if (rxrpc_kernel_charge_accept(net-&gt;socket,</div><div class='ctx'> 					       afs_wake_up_async_call,</div><div class='del'>-					       afs_rx_attach,</div><div class='ctx'> 					       (unsigned long)call,</div><div class='ctx'> 					       GFP_KERNEL,</div><div class='ctx'> 					       call-&gt;debug_id) &lt; 0)</div><div class='hunk'>@@ -739,8 +784,14 @@ static void afs_rx_discard_new_call(struct rxrpc_call *rxcall,</div><div class='ctx'> static void afs_rx_new_call(struct sock *sk, struct rxrpc_call *rxcall,</div><div class='ctx'> 			    unsigned long user_call_ID)</div><div class='ctx'> {</div><div class='add'>+	struct afs_call *call = (struct afs_call *)user_call_ID;</div><div class='ctx'> 	struct afs_net *net = afs_sock2net(sk);</div><div class='ctx'> </div><div class='add'>+	call-&gt;peer = rxrpc_kernel_get_call_peer(sk-&gt;sk_socket, call-&gt;rxcall);</div><div class='add'>+	call-&gt;server = afs_find_server(call-&gt;peer);</div><div class='add'>+	if (!call-&gt;server)</div><div class='add'>+		trace_afs_cm_no_server(call, rxrpc_kernel_remote_srx(call-&gt;peer));</div><div class='add'>+</div><div class='ctx'> 	queue_work(afs_wq, &amp;net-&gt;charge_preallocation_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -767,9 +818,14 @@ static int afs_deliver_cm_op_id(struct afs_call *call)</div><div class='ctx'> 	if (!afs_cm_incoming_call(call))</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='add'>+	call-&gt;security_ix = rxrpc_kernel_query_call_security(call-&gt;rxcall,</div><div class='add'>+							     &amp;call-&gt;service_id,</div><div class='add'>+							     &amp;call-&gt;enctype);</div><div class='add'>+</div><div class='ctx'> 	trace_afs_cb_call(call);</div><div class='add'>+	call-&gt;work.func = call-&gt;type-&gt;work;</div><div class='ctx'> </div><div class='del'>-	/* pass responsibility for the remainer of this message off to the</div><div class='add'>+	/* pass responsibility for the remainder of this message off to the</div><div class='ctx'> 	 * cache manager op */</div><div class='ctx'> 	return call-&gt;type-&gt;deliver(call);</div><div class='ctx'> }</div><div class='hunk'>@@ -918,3 +974,13 @@ noinline int afs_protocol_error(struct afs_call *call,</div><div class='ctx'> 		call-&gt;unmarshalling_error = true;</div><div class='ctx'> 	return -EBADMSG;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wake up OOB notification processing.</div><div class='add'>+ */</div><div class='add'>+static void afs_rx_notify_oob(struct sock *sk, struct sk_buff *oob)</div><div class='add'>+{</div><div class='add'>+	struct afs_net *net = sk-&gt;sk_user_data;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;net-&gt;rx_oob_work);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/afs/security.c b/fs/afs/security.c<br/>index 6a7744c9e2a2..55ddce94af03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/security.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/security.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/security.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/security.c</a></div><div class='hunk'>@@ -16,6 +16,31 @@</div><div class='ctx'> </div><div class='ctx'> static DEFINE_HASHTABLE(afs_permits_cache, 10);</div><div class='ctx'> static DEFINE_SPINLOCK(afs_permits_lock);</div><div class='add'>+static DEFINE_MUTEX(afs_key_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a key to use as a placeholder for anonymous user security.</div><div class='add'>+ */</div><div class='add'>+static int afs_alloc_anon_key(struct afs_cell *cell)</div><div class='add'>+{</div><div class='add'>+	struct key *key;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;afs_key_lock);</div><div class='add'>+	key = cell-&gt;anonymous_key;</div><div class='add'>+	if (!key) {</div><div class='add'>+		key = rxrpc_get_null_key(cell-&gt;key_desc);</div><div class='add'>+		if (!IS_ERR(key))</div><div class='add'>+			cell-&gt;anonymous_key = key;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;afs_key_lock);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(key))</div><div class='add'>+		return PTR_ERR(key);</div><div class='add'>+</div><div class='add'>+	_debug("anon key %p{%x}",</div><div class='add'>+	       cell-&gt;anonymous_key, key_serial(cell-&gt;anonymous_key));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * get a key</div><div class='hunk'>@@ -23,11 +48,12 @@ static DEFINE_SPINLOCK(afs_permits_lock);</div><div class='ctx'> struct key *afs_request_key(struct afs_cell *cell)</div><div class='ctx'> {</div><div class='ctx'> 	struct key *key;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("{%x}", key_serial(cell-&gt;anonymous_key));</div><div class='add'>+	_enter("{%s}", cell-&gt;key_desc);</div><div class='ctx'> </div><div class='del'>-	_debug("key %s", cell-&gt;anonymous_key-&gt;description);</div><div class='del'>-	key = request_key_net(&amp;key_type_rxrpc, cell-&gt;anonymous_key-&gt;description,</div><div class='add'>+	_debug("key %s", cell-&gt;key_desc);</div><div class='add'>+	key = request_key_net(&amp;key_type_rxrpc, cell-&gt;key_desc,</div><div class='ctx'> 			      cell-&gt;net-&gt;net, NULL);</div><div class='ctx'> 	if (IS_ERR(key)) {</div><div class='ctx'> 		if (PTR_ERR(key) != -ENOKEY) {</div><div class='hunk'>@@ -35,6 +61,12 @@ struct key *afs_request_key(struct afs_cell *cell)</div><div class='ctx'> 			return key;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (!cell-&gt;anonymous_key) {</div><div class='add'>+			ret = afs_alloc_anon_key(cell);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ERR_PTR(ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* act as anonymous user */</div><div class='ctx'> 		_leave(" = {%x} [anon]", key_serial(cell-&gt;anonymous_key));</div><div class='ctx'> 		return key_get(cell-&gt;anonymous_key);</div><div class='hunk'>@@ -52,11 +84,10 @@ struct key *afs_request_key_rcu(struct afs_cell *cell)</div><div class='ctx'> {</div><div class='ctx'> 	struct key *key;</div><div class='ctx'> </div><div class='del'>-	_enter("{%x}", key_serial(cell-&gt;anonymous_key));</div><div class='add'>+	_enter("{%s}", cell-&gt;key_desc);</div><div class='ctx'> </div><div class='del'>-	_debug("key %s", cell-&gt;anonymous_key-&gt;description);</div><div class='del'>-	key = request_key_net_rcu(&amp;key_type_rxrpc,</div><div class='del'>-				  cell-&gt;anonymous_key-&gt;description,</div><div class='add'>+	_debug("key %s", cell-&gt;key_desc);</div><div class='add'>+	key = request_key_net_rcu(&amp;key_type_rxrpc, cell-&gt;key_desc,</div><div class='ctx'> 				  cell-&gt;net-&gt;net);</div><div class='ctx'> 	if (IS_ERR(key)) {</div><div class='ctx'> 		if (PTR_ERR(key) != -ENOKEY) {</div><div class='hunk'>@@ -65,6 +96,8 @@ struct key *afs_request_key_rcu(struct afs_cell *cell)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* act as anonymous user */</div><div class='add'>+		if (!cell-&gt;anonymous_key)</div><div class='add'>+			return NULL; /* Need to allocate */</div><div class='ctx'> 		_leave(" = {%x} [anon]", key_serial(cell-&gt;anonymous_key));</div><div class='ctx'> 		return key_get(cell-&gt;anonymous_key);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -408,7 +441,7 @@ int afs_permission(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; MAY_NOT_BLOCK) {</div><div class='ctx'> 		key = afs_request_key_rcu(vnode-&gt;volume-&gt;cell);</div><div class='del'>-		if (IS_ERR(key))</div><div class='add'>+		if (IS_ERR_OR_NULL(key))</div><div class='ctx'> 			return -ECHILD;</div><div class='ctx'> </div><div class='ctx'> 		ret = -ECHILD;</div><div class='head'>diff --git a/fs/afs/server.c b/fs/afs/server.c<br/>index e169121f603e..c4428ebddb1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/server.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/server.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/server.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/server.c</a></div><div class='hunk'>@@ -14,190 +14,104 @@</div><div class='ctx'> static unsigned afs_server_gc_delay = 10;	/* Server record timeout in seconds */</div><div class='ctx'> static atomic_t afs_server_debug_id;</div><div class='ctx'> </div><div class='del'>-static struct afs_server *afs_maybe_use_server(struct afs_server *,</div><div class='del'>-					       enum afs_server_trace);</div><div class='ctx'> static void __afs_put_server(struct afs_net *, struct afs_server *);</div><div class='add'>+static void afs_server_timer(struct timer_list *timer);</div><div class='add'>+static void afs_server_destroyer(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Find a server by one of its addresses.</div><div class='ctx'>  */</div><div class='del'>-struct afs_server *afs_find_server(struct afs_net *net, const struct rxrpc_peer *peer)</div><div class='add'>+struct afs_server *afs_find_server(const struct rxrpc_peer *peer)</div><div class='ctx'> {</div><div class='del'>-	const struct afs_endpoint_state *estate;</div><div class='del'>-	const struct afs_addr_list *alist;</div><div class='del'>-	struct afs_server *server = NULL;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int seq = 1;</div><div class='add'>+	struct afs_server *server = (struct afs_server *)rxrpc_kernel_get_peer_data(peer);</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (server)</div><div class='del'>-			afs_unuse_server_notime(net, server, afs_server_trace_put_find_rsq);</div><div class='del'>-		server = NULL;</div><div class='del'>-		seq++; /* 2 on the 1st/lockless path, otherwise odd */</div><div class='del'>-		read_seqbegin_or_lock(&amp;net-&gt;fs_addr_lock, &amp;seq);</div><div class='del'>-</div><div class='del'>-		hlist_for_each_entry_rcu(server, &amp;net-&gt;fs_addresses6, addr6_link) {</div><div class='del'>-			estate = rcu_dereference(server-&gt;endpoint_state);</div><div class='del'>-			alist = estate-&gt;addresses;</div><div class='del'>-			for (i = 0; i &lt; alist-&gt;nr_addrs; i++)</div><div class='del'>-				if (alist-&gt;addrs[i].peer == peer)</div><div class='del'>-					goto found;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		server = NULL;</div><div class='del'>-		continue;</div><div class='del'>-	found:</div><div class='del'>-		server = afs_maybe_use_server(server, afs_server_trace_get_by_addr);</div><div class='del'>-</div><div class='del'>-	} while (need_seqretry(&amp;net-&gt;fs_addr_lock, seq));</div><div class='del'>-</div><div class='del'>-	done_seqretry(&amp;net-&gt;fs_addr_lock, seq);</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return server;</div><div class='add'>+	if (!server)</div><div class='add'>+		return NULL;</div><div class='add'>+	return afs_use_server(server, false, afs_server_trace_use_cm_call);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Look up a server by its UUID and mark it active.</div><div class='add'>+ * Look up a server by its UUID and mark it active.  The caller must hold</div><div class='add'>+ * cell-&gt;fs_lock.</div><div class='ctx'>  */</div><div class='del'>-struct afs_server *afs_find_server_by_uuid(struct afs_net *net, const uuid_t *uuid)</div><div class='add'>+static struct afs_server *afs_find_server_by_uuid(struct afs_cell *cell, const uuid_t *uuid)</div><div class='ctx'> {</div><div class='del'>-	struct afs_server *server = NULL;</div><div class='add'>+	struct afs_server *server;</div><div class='ctx'> 	struct rb_node *p;</div><div class='del'>-	int diff, seq = 1;</div><div class='add'>+	int diff;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%pU", uuid);</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		/* Unfortunately, rbtree walking doesn't give reliable results</div><div class='del'>-		 * under just the RCU read lock, so we have to check for</div><div class='del'>-		 * changes.</div><div class='del'>-		 */</div><div class='del'>-		if (server)</div><div class='del'>-			afs_unuse_server(net, server, afs_server_trace_put_uuid_rsq);</div><div class='del'>-		server = NULL;</div><div class='del'>-		seq++; /* 2 on the 1st/lockless path, otherwise odd */</div><div class='del'>-		read_seqbegin_or_lock(&amp;net-&gt;fs_lock, &amp;seq);</div><div class='del'>-</div><div class='del'>-		p = net-&gt;fs_servers.rb_node;</div><div class='del'>-		while (p) {</div><div class='del'>-			server = rb_entry(p, struct afs_server, uuid_rb);</div><div class='del'>-</div><div class='del'>-			diff = memcmp(uuid, &amp;server-&gt;uuid, sizeof(*uuid));</div><div class='del'>-			if (diff &lt; 0) {</div><div class='del'>-				p = p-&gt;rb_left;</div><div class='del'>-			} else if (diff &gt; 0) {</div><div class='del'>-				p = p-&gt;rb_right;</div><div class='del'>-			} else {</div><div class='del'>-				afs_use_server(server, afs_server_trace_get_by_uuid);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			server = NULL;</div><div class='del'>-		}</div><div class='del'>-	} while (need_seqretry(&amp;net-&gt;fs_lock, seq));</div><div class='add'>+	p = cell-&gt;fs_servers.rb_node;</div><div class='add'>+	while (p) {</div><div class='add'>+		server = rb_entry(p, struct afs_server, uuid_rb);</div><div class='ctx'> </div><div class='del'>-	done_seqretry(&amp;net-&gt;fs_lock, seq);</div><div class='add'>+		diff = memcmp(uuid, &amp;server-&gt;uuid, sizeof(*uuid));</div><div class='add'>+		if (diff &lt; 0) {</div><div class='add'>+			p = p-&gt;rb_left;</div><div class='add'>+		} else if (diff &gt; 0) {</div><div class='add'>+			p = p-&gt;rb_right;</div><div class='add'>+		} else {</div><div class='add'>+			if (test_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags))</div><div class='add'>+				return NULL; /* Need a write lock */</div><div class='add'>+			afs_use_server(server, true, afs_server_trace_use_by_uuid);</div><div class='add'>+			return server;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	_leave(" = %p", server);</div><div class='del'>-	return server;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Install a server record in the namespace tree.  If there's a clash, we stick</div><div class='del'>- * it into a list anchored on whichever afs_server struct is actually in the</div><div class='del'>- * tree.</div><div class='add'>+ * Install a server record in the cell tree.  The caller must hold an exclusive</div><div class='add'>+ * lock on cell-&gt;fs_lock.</div><div class='ctx'>  */</div><div class='ctx'> static struct afs_server *afs_install_server(struct afs_cell *cell,</div><div class='del'>-					     struct afs_server *candidate)</div><div class='add'>+					     struct afs_server **candidate)</div><div class='ctx'> {</div><div class='del'>-	const struct afs_endpoint_state *estate;</div><div class='del'>-	const struct afs_addr_list *alist;</div><div class='del'>-	struct afs_server *server, *next;</div><div class='add'>+	struct afs_server *server;</div><div class='ctx'> 	struct afs_net *net = cell-&gt;net;</div><div class='ctx'> 	struct rb_node **pp, *p;</div><div class='ctx'> 	int diff;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%p", candidate);</div><div class='ctx'> </div><div class='del'>-	write_seqlock(&amp;net-&gt;fs_lock);</div><div class='del'>-</div><div class='ctx'> 	/* Firstly install the server in the UUID lookup tree */</div><div class='del'>-	pp = &amp;net-&gt;fs_servers.rb_node;</div><div class='add'>+	pp = &amp;cell-&gt;fs_servers.rb_node;</div><div class='ctx'> 	p = NULL;</div><div class='ctx'> 	while (*pp) {</div><div class='ctx'> 		p = *pp;</div><div class='ctx'> 		_debug("- consider %p", p);</div><div class='ctx'> 		server = rb_entry(p, struct afs_server, uuid_rb);</div><div class='del'>-		diff = memcmp(&amp;candidate-&gt;uuid, &amp;server-&gt;uuid, sizeof(uuid_t));</div><div class='del'>-		if (diff &lt; 0) {</div><div class='add'>+		diff = memcmp(&amp;(*candidate)-&gt;uuid, &amp;server-&gt;uuid, sizeof(uuid_t));</div><div class='add'>+		if (diff &lt; 0)</div><div class='ctx'> 			pp = &amp;(*pp)-&gt;rb_left;</div><div class='del'>-		} else if (diff &gt; 0) {</div><div class='add'>+		else if (diff &gt; 0)</div><div class='ctx'> 			pp = &amp;(*pp)-&gt;rb_right;</div><div class='del'>-		} else {</div><div class='del'>-			if (server-&gt;cell == cell)</div><div class='del'>-				goto exists;</div><div class='del'>-</div><div class='del'>-			/* We have the same UUID representing servers in</div><div class='del'>-			 * different cells.  Append the new server to the list.</div><div class='del'>-			 */</div><div class='del'>-			for (;;) {</div><div class='del'>-				next = rcu_dereference_protected(</div><div class='del'>-					server-&gt;uuid_next,</div><div class='del'>-					lockdep_is_held(&amp;net-&gt;fs_lock.lock));</div><div class='del'>-				if (!next)</div><div class='del'>-					break;</div><div class='del'>-				server = next;</div><div class='del'>-			}</div><div class='del'>-			rcu_assign_pointer(server-&gt;uuid_next, candidate);</div><div class='del'>-			candidate-&gt;uuid_prev = server;</div><div class='del'>-			server = candidate;</div><div class='del'>-			goto added_dup;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			goto exists;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	server = candidate;</div><div class='add'>+	server = *candidate;</div><div class='add'>+	*candidate = NULL;</div><div class='ctx'> 	rb_link_node(&amp;server-&gt;uuid_rb, p, pp);</div><div class='del'>-	rb_insert_color(&amp;server-&gt;uuid_rb, &amp;net-&gt;fs_servers);</div><div class='add'>+	rb_insert_color(&amp;server-&gt;uuid_rb, &amp;cell-&gt;fs_servers);</div><div class='add'>+	write_seqlock(&amp;net-&gt;fs_lock);</div><div class='ctx'> 	hlist_add_head_rcu(&amp;server-&gt;proc_link, &amp;net-&gt;fs_proc);</div><div class='add'>+	write_sequnlock(&amp;net-&gt;fs_lock);</div><div class='ctx'> </div><div class='del'>-added_dup:</div><div class='del'>-	write_seqlock(&amp;net-&gt;fs_addr_lock);</div><div class='del'>-	estate = rcu_dereference_protected(server-&gt;endpoint_state,</div><div class='del'>-					   lockdep_is_held(&amp;net-&gt;fs_addr_lock.lock));</div><div class='del'>-	alist = estate-&gt;addresses;</div><div class='del'>-</div><div class='del'>-	/* Secondly, if the server has any IPv4 and/or IPv6 addresses, install</div><div class='del'>-	 * it in the IPv4 and/or IPv6 reverse-map lists.</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: For speed we want to use something other than a flat list</div><div class='del'>-	 * here; even sorting the list in terms of lowest address would help a</div><div class='del'>-	 * bit, but anything we might want to do gets messy and memory</div><div class='del'>-	 * intensive.</div><div class='del'>-	 */</div><div class='del'>-	if (alist-&gt;nr_ipv4 &gt; 0)</div><div class='del'>-		hlist_add_head_rcu(&amp;server-&gt;addr4_link, &amp;net-&gt;fs_addresses4);</div><div class='del'>-	if (alist-&gt;nr_addrs &gt; alist-&gt;nr_ipv4)</div><div class='del'>-		hlist_add_head_rcu(&amp;server-&gt;addr6_link, &amp;net-&gt;fs_addresses6);</div><div class='del'>-</div><div class='del'>-	write_sequnlock(&amp;net-&gt;fs_addr_lock);</div><div class='add'>+	afs_get_cell(cell, afs_cell_trace_get_server);</div><div class='ctx'> </div><div class='ctx'> exists:</div><div class='del'>-	afs_get_server(server, afs_server_trace_get_install);</div><div class='del'>-	write_sequnlock(&amp;net-&gt;fs_lock);</div><div class='add'>+	afs_use_server(server, true, afs_server_trace_use_install);</div><div class='ctx'> 	return server;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Allocate a new server record and mark it active.</div><div class='add'>+ * Allocate a new server record and mark it as active but uncreated.</div><div class='ctx'>  */</div><div class='del'>-static struct afs_server *afs_alloc_server(struct afs_cell *cell,</div><div class='del'>-					   const uuid_t *uuid,</div><div class='del'>-					   struct afs_addr_list *alist)</div><div class='add'>+static struct afs_server *afs_alloc_server(struct afs_cell *cell, const uuid_t *uuid)</div><div class='ctx'> {</div><div class='del'>-	struct afs_endpoint_state *estate;</div><div class='ctx'> 	struct afs_server *server;</div><div class='ctx'> 	struct afs_net *net = cell-&gt;net;</div><div class='ctx'> </div><div class='hunk'>@@ -205,65 +119,50 @@ static struct afs_server *afs_alloc_server(struct afs_cell *cell,</div><div class='ctx'> </div><div class='ctx'> 	server = kzalloc(sizeof(struct afs_server), GFP_KERNEL);</div><div class='ctx'> 	if (!server)</div><div class='del'>-		goto enomem;</div><div class='del'>-</div><div class='del'>-	estate = kzalloc(sizeof(struct afs_endpoint_state), GFP_KERNEL);</div><div class='del'>-	if (!estate)</div><div class='del'>-		goto enomem_server;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	refcount_set(&amp;server-&gt;ref, 1);</div><div class='del'>-	atomic_set(&amp;server-&gt;active, 1);</div><div class='add'>+	atomic_set(&amp;server-&gt;active, 0);</div><div class='add'>+	__set_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags);</div><div class='ctx'> 	server-&gt;debug_id = atomic_inc_return(&amp;afs_server_debug_id);</div><div class='del'>-	server-&gt;addr_version = alist-&gt;version;</div><div class='ctx'> 	server-&gt;uuid = *uuid;</div><div class='ctx'> 	rwlock_init(&amp;server-&gt;fs_lock);</div><div class='add'>+	INIT_WORK(&amp;server-&gt;destroyer, &amp;afs_server_destroyer);</div><div class='add'>+	timer_setup(&amp;server-&gt;timer, afs_server_timer, 0);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;server-&gt;volumes);</div><div class='ctx'> 	init_waitqueue_head(&amp;server-&gt;probe_wq);</div><div class='add'>+	mutex_init(&amp;server-&gt;cm_token_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;server-&gt;probe_link);</div><div class='add'>+	INIT_HLIST_NODE(&amp;server-&gt;proc_link);</div><div class='ctx'> 	spin_lock_init(&amp;server-&gt;probe_lock);</div><div class='ctx'> 	server-&gt;cell = cell;</div><div class='ctx'> 	server-&gt;rtt = UINT_MAX;</div><div class='ctx'> 	server-&gt;service_id = FS_SERVICE;</div><div class='del'>-</div><div class='ctx'> 	server-&gt;probe_counter = 1;</div><div class='ctx'> 	server-&gt;probed_at = jiffies - LONG_MAX / 2;</div><div class='del'>-	refcount_set(&amp;estate-&gt;ref, 1);</div><div class='del'>-	estate-&gt;addresses = alist;</div><div class='del'>-	estate-&gt;server_id = server-&gt;debug_id;</div><div class='del'>-	estate-&gt;probe_seq = 1;</div><div class='del'>-	rcu_assign_pointer(server-&gt;endpoint_state, estate);</div><div class='ctx'> </div><div class='ctx'> 	afs_inc_servers_outstanding(net);</div><div class='del'>-	trace_afs_server(server-&gt;debug_id, 1, 1, afs_server_trace_alloc);</div><div class='del'>-	trace_afs_estate(estate-&gt;server_id, estate-&gt;probe_seq, refcount_read(&amp;estate-&gt;ref),</div><div class='del'>-			 afs_estate_trace_alloc_server);</div><div class='ctx'> 	_leave(" = %p", server);</div><div class='ctx'> 	return server;</div><div class='del'>-</div><div class='del'>-enomem_server:</div><div class='del'>-	kfree(server);</div><div class='del'>-enomem:</div><div class='del'>-	_leave(" = NULL [nomem]");</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Look up an address record for a server</div><div class='ctx'>  */</div><div class='del'>-static struct afs_addr_list *afs_vl_lookup_addrs(struct afs_cell *cell,</div><div class='del'>-						 struct key *key, const uuid_t *uuid)</div><div class='add'>+static struct afs_addr_list *afs_vl_lookup_addrs(struct afs_server *server,</div><div class='add'>+						 struct key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_vl_cursor vc;</div><div class='ctx'> 	struct afs_addr_list *alist = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = -ERESTARTSYS;</div><div class='del'>-	if (afs_begin_vlserver_operation(&amp;vc, cell, key)) {</div><div class='add'>+	if (afs_begin_vlserver_operation(&amp;vc, server-&gt;cell, key)) {</div><div class='ctx'> 		while (afs_select_vlserver(&amp;vc)) {</div><div class='ctx'> 			if (test_bit(AFS_VLSERVER_FL_IS_YFS, &amp;vc.server-&gt;flags))</div><div class='del'>-				alist = afs_yfsvl_get_endpoints(&amp;vc, uuid);</div><div class='add'>+				alist = afs_yfsvl_get_endpoints(&amp;vc, &amp;server-&gt;uuid);</div><div class='ctx'> 			else</div><div class='del'>-				alist = afs_vl_get_addrs_u(&amp;vc, uuid);</div><div class='add'>+				alist = afs_vl_get_addrs_u(&amp;vc, &amp;server-&gt;uuid);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = afs_end_vlserver_operation(&amp;vc);</div><div class='hunk'>@@ -273,72 +172,122 @@ static struct afs_addr_list *afs_vl_lookup_addrs(struct afs_cell *cell,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get or create a fileserver record.</div><div class='add'>+ * Get or create a fileserver record and return it with an active-use count on</div><div class='add'>+ * it.</div><div class='ctx'>  */</div><div class='ctx'> struct afs_server *afs_lookup_server(struct afs_cell *cell, struct key *key,</div><div class='ctx'> 				     const uuid_t *uuid, u32 addr_version)</div><div class='ctx'> {</div><div class='del'>-	struct afs_addr_list *alist;</div><div class='del'>-	struct afs_server *server, *candidate;</div><div class='add'>+	struct afs_addr_list *alist = NULL;</div><div class='add'>+	struct afs_server *server, *candidate = NULL;</div><div class='add'>+	bool creating = false;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%p,%pU", cell-&gt;net, uuid);</div><div class='ctx'> </div><div class='del'>-	server = afs_find_server_by_uuid(cell-&gt;net, uuid);</div><div class='add'>+	down_read(&amp;cell-&gt;fs_lock);</div><div class='add'>+	server = afs_find_server_by_uuid(cell, uuid);</div><div class='add'>+	/* Won't see servers marked uncreated. */</div><div class='add'>+	up_read(&amp;cell-&gt;fs_lock);</div><div class='add'>+</div><div class='ctx'> 	if (server) {</div><div class='add'>+		timer_delete_sync(&amp;server-&gt;timer);</div><div class='add'>+		if (test_bit(AFS_SERVER_FL_CREATING, &amp;server-&gt;flags))</div><div class='add'>+			goto wait_for_creation;</div><div class='ctx'> 		if (server-&gt;addr_version != addr_version)</div><div class='ctx'> 			set_bit(AFS_SERVER_FL_NEEDS_UPDATE, &amp;server-&gt;flags);</div><div class='ctx'> 		return server;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	alist = afs_vl_lookup_addrs(cell, key, uuid);</div><div class='del'>-	if (IS_ERR(alist))</div><div class='del'>-		return ERR_CAST(alist);</div><div class='del'>-</div><div class='del'>-	candidate = afs_alloc_server(cell, uuid, alist);</div><div class='add'>+	candidate = afs_alloc_server(cell, uuid);</div><div class='ctx'> 	if (!candidate) {</div><div class='ctx'> 		afs_put_addrlist(alist, afs_alist_trace_put_server_oom);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	server = afs_install_server(cell, candidate);</div><div class='del'>-	if (server != candidate) {</div><div class='del'>-		afs_put_addrlist(alist, afs_alist_trace_put_server_dup);</div><div class='add'>+	down_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+	server = afs_install_server(cell, &amp;candidate);</div><div class='add'>+	if (test_bit(AFS_SERVER_FL_CREATING, &amp;server-&gt;flags)) {</div><div class='add'>+		/* We need to wait for creation to complete. */</div><div class='add'>+		up_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+		goto wait_for_creation;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags)) {</div><div class='add'>+		set_bit(AFS_SERVER_FL_CREATING, &amp;server-&gt;flags);</div><div class='add'>+		clear_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags);</div><div class='add'>+		creating = true;</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+	timer_delete_sync(&amp;server-&gt;timer);</div><div class='add'>+</div><div class='add'>+	/* If we get to create the server, we look up the addresses and then</div><div class='add'>+	 * immediately dispatch an asynchronous probe to each interface on the</div><div class='add'>+	 * fileserver.  This will make sure the repeat-probing service is</div><div class='add'>+	 * started.</div><div class='add'>+	 */</div><div class='add'>+	if (creating) {</div><div class='add'>+		alist = afs_vl_lookup_addrs(server, key);</div><div class='add'>+		if (IS_ERR(alist)) {</div><div class='add'>+			ret = PTR_ERR(alist);</div><div class='add'>+			goto create_failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = afs_fs_probe_fileserver(cell-&gt;net, server, alist, key);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto create_failed;</div><div class='add'>+</div><div class='add'>+		clear_and_wake_up_bit(AFS_SERVER_FL_CREATING, &amp;server-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	afs_put_addrlist(alist, afs_alist_trace_put_server_create);</div><div class='add'>+	if (candidate) {</div><div class='add'>+		kfree(rcu_access_pointer(server-&gt;endpoint_state));</div><div class='ctx'> 		kfree(candidate);</div><div class='del'>-	} else {</div><div class='del'>-		/* Immediately dispatch an asynchronous probe to each interface</div><div class='del'>-		 * on the fileserver.  This will make sure the repeat-probing</div><div class='del'>-		 * service is started.</div><div class='del'>-		 */</div><div class='del'>-		afs_fs_probe_fileserver(cell-&gt;net, server, alist, key);</div><div class='add'>+		afs_dec_servers_outstanding(cell-&gt;net);</div><div class='add'>+	}</div><div class='add'>+	return server ?: ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+wait_for_creation:</div><div class='add'>+	afs_see_server(server, afs_server_trace_wait_create);</div><div class='add'>+	wait_on_bit(&amp;server-&gt;flags, AFS_SERVER_FL_CREATING, TASK_UNINTERRUPTIBLE);</div><div class='add'>+	if (test_bit_acquire(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags)) {</div><div class='add'>+		/* Barrier: read flag before error */</div><div class='add'>+		ret = READ_ONCE(server-&gt;create_error);</div><div class='add'>+		afs_put_server(cell-&gt;net, server, afs_server_trace_unuse_create_fail);</div><div class='add'>+		server = NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return server;</div><div class='del'>-}</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set the server timer to fire after a given delay, assuming it's not already</div><div class='del'>- * set for an earlier time.</div><div class='del'>- */</div><div class='del'>-static void afs_set_server_timer(struct afs_net *net, time64_t delay)</div><div class='del'>-{</div><div class='del'>-	if (net-&gt;live) {</div><div class='del'>-		afs_inc_servers_outstanding(net);</div><div class='del'>-		if (timer_reduce(&amp;net-&gt;fs_timer, jiffies + delay * HZ))</div><div class='del'>-			afs_dec_servers_outstanding(net);</div><div class='add'>+create_failed:</div><div class='add'>+	down_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(server-&gt;create_error, ret);</div><div class='add'>+	smp_wmb(); /* Barrier: set error before flag. */</div><div class='add'>+	set_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags);</div><div class='add'>+</div><div class='add'>+	clear_and_wake_up_bit(AFS_SERVER_FL_CREATING, &amp;server-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (test_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags)) {</div><div class='add'>+		clear_bit(AFS_SERVER_FL_UNCREATED, &amp;server-&gt;flags);</div><div class='add'>+		creating = true;</div><div class='ctx'> 	}</div><div class='add'>+	afs_unuse_server(cell-&gt;net, server, afs_server_trace_unuse_create_fail);</div><div class='add'>+	server = NULL;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Server management timer.  We have an increment on fs_outstanding that we</div><div class='del'>- * need to pass along to the work item.</div><div class='add'>+ * Set/reduce a server's timer.</div><div class='ctx'>  */</div><div class='del'>-void afs_servers_timer(struct timer_list *timer)</div><div class='add'>+static void afs_set_server_timer(struct afs_server *server, unsigned int delay_secs)</div><div class='ctx'> {</div><div class='del'>-	struct afs_net *net = container_of(timer, struct afs_net, fs_timer);</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='del'>-	if (!queue_work(afs_wq, &amp;net-&gt;fs_manager))</div><div class='del'>-		afs_dec_servers_outstanding(net);</div><div class='add'>+	mod_timer(&amp;server-&gt;timer, jiffies + delay_secs * HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -357,32 +306,20 @@ struct afs_server *afs_get_server(struct afs_server *server,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Try to get a reference on a server object.</div><div class='add'>+ * Get an active count on a server object and maybe remove from the inactive</div><div class='add'>+ * list.</div><div class='ctx'>  */</div><div class='del'>-static struct afs_server *afs_maybe_use_server(struct afs_server *server,</div><div class='del'>-					       enum afs_server_trace reason)</div><div class='del'>-{</div><div class='del'>-	unsigned int a;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	if (!__refcount_inc_not_zero(&amp;server-&gt;ref, &amp;r))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	a = atomic_inc_return(&amp;server-&gt;active);</div><div class='del'>-	trace_afs_server(server-&gt;debug_id, r + 1, a, reason);</div><div class='del'>-	return server;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get an active count on a server object.</div><div class='del'>- */</div><div class='del'>-struct afs_server *afs_use_server(struct afs_server *server, enum afs_server_trace reason)</div><div class='add'>+struct afs_server *afs_use_server(struct afs_server *server, bool activate,</div><div class='add'>+				  enum afs_server_trace reason)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int a;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	__refcount_inc(&amp;server-&gt;ref, &amp;r);</div><div class='ctx'> 	a = atomic_inc_return(&amp;server-&gt;active);</div><div class='add'>+	if (a == 1 &amp;&amp; activate &amp;&amp;</div><div class='add'>+	    !test_bit(AFS_SERVER_FL_EXPIRED, &amp;server-&gt;flags))</div><div class='add'>+		timer_delete(&amp;server-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	trace_afs_server(server-&gt;debug_id, r + 1, a, reason);</div><div class='ctx'> 	return server;</div><div class='hunk'>@@ -394,13 +331,14 @@ struct afs_server *afs_use_server(struct afs_server *server, enum afs_server_tra</div><div class='ctx'> void afs_put_server(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> 		    enum afs_server_trace reason)</div><div class='ctx'> {</div><div class='del'>-	unsigned int a, debug_id = server-&gt;debug_id;</div><div class='add'>+	unsigned int a, debug_id;</div><div class='ctx'> 	bool zero;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	if (!server)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	debug_id = server-&gt;debug_id;</div><div class='ctx'> 	a = atomic_read(&amp;server-&gt;active);</div><div class='ctx'> 	zero = __refcount_dec_and_test(&amp;server-&gt;ref, &amp;r);</div><div class='ctx'> 	trace_afs_server(debug_id, r - 1, a, reason);</div><div class='hunk'>@@ -415,13 +353,16 @@ void afs_put_server(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> void afs_unuse_server_notime(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> 			     enum afs_server_trace reason)</div><div class='ctx'> {</div><div class='del'>-	if (server) {</div><div class='del'>-		unsigned int active = atomic_dec_return(&amp;server-&gt;active);</div><div class='add'>+	if (!server)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		if (active == 0)</div><div class='del'>-			afs_set_server_timer(net, afs_server_gc_delay);</div><div class='del'>-		afs_put_server(net, server, reason);</div><div class='add'>+	if (atomic_dec_and_test(&amp;server-&gt;active)) {</div><div class='add'>+		if (test_bit(AFS_SERVER_FL_EXPIRED, &amp;server-&gt;flags) ||</div><div class='add'>+		    READ_ONCE(server-&gt;cell-&gt;state) &gt;= AFS_CELL_REMOVING)</div><div class='add'>+			schedule_work(&amp;server-&gt;destroyer);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	afs_put_server(net, server, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -430,10 +371,22 @@ void afs_unuse_server_notime(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> void afs_unuse_server(struct afs_net *net, struct afs_server *server,</div><div class='ctx'> 		      enum afs_server_trace reason)</div><div class='ctx'> {</div><div class='del'>-	if (server) {</div><div class='del'>-		server-&gt;unuse_time = ktime_get_real_seconds();</div><div class='del'>-		afs_unuse_server_notime(net, server, reason);</div><div class='add'>+	if (!server)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;server-&gt;active)) {</div><div class='add'>+		if (!test_bit(AFS_SERVER_FL_EXPIRED, &amp;server-&gt;flags) &amp;&amp;</div><div class='add'>+		    READ_ONCE(server-&gt;cell-&gt;state) &lt; AFS_CELL_REMOVING) {</div><div class='add'>+			time64_t unuse_time = ktime_get_real_seconds();</div><div class='add'>+</div><div class='add'>+			server-&gt;unuse_time = unuse_time;</div><div class='add'>+			afs_set_server_timer(server, afs_server_gc_delay);</div><div class='add'>+		} else {</div><div class='add'>+			schedule_work(&amp;server-&gt;destroyer);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	afs_put_server(net, server, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_server_rcu(struct rcu_head *rcu)</div><div class='hunk'>@@ -444,6 +397,8 @@ static void afs_server_rcu(struct rcu_head *rcu)</div><div class='ctx'> 			 atomic_read(&amp;server-&gt;active), afs_server_trace_free);</div><div class='ctx'> 	afs_put_endpoint_state(rcu_access_pointer(server-&gt;endpoint_state),</div><div class='ctx'> 			       afs_estate_trace_put_server);</div><div class='add'>+	afs_put_cell(server-&gt;cell, afs_cell_trace_put_server);</div><div class='add'>+	kfree(server-&gt;cm_rxgk_appdata.data);</div><div class='ctx'> 	kfree(server);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -462,161 +417,119 @@ static void afs_give_up_callbacks(struct afs_net *net, struct afs_server *server</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * destroy a dead server</div><div class='add'>+ * Check to see if the server record has expired.</div><div class='ctx'>  */</div><div class='del'>-static void afs_destroy_server(struct afs_net *net, struct afs_server *server)</div><div class='add'>+static bool afs_has_server_expired(const struct afs_server *server)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(AFS_SERVER_FL_MAY_HAVE_CB, &amp;server-&gt;flags))</div><div class='del'>-		afs_give_up_callbacks(net, server);</div><div class='add'>+	time64_t expires_at;</div><div class='ctx'> </div><div class='del'>-	afs_put_server(net, server, afs_server_trace_destroy);</div><div class='add'>+	if (atomic_read(&amp;server-&gt;active))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (server-&gt;cell-&gt;net-&gt;live ||</div><div class='add'>+	    server-&gt;cell-&gt;state &gt;= AFS_CELL_REMOVING) {</div><div class='add'>+		trace_afs_server(server-&gt;debug_id, refcount_read(&amp;server-&gt;ref),</div><div class='add'>+				 0, afs_server_trace_purging);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expires_at = server-&gt;unuse_time;</div><div class='add'>+	if (!test_bit(AFS_SERVER_FL_VL_FAIL, &amp;server-&gt;flags) &amp;&amp;</div><div class='add'>+	    !test_bit(AFS_SERVER_FL_NOT_FOUND, &amp;server-&gt;flags))</div><div class='add'>+		expires_at += afs_server_gc_delay;</div><div class='add'>+</div><div class='add'>+	return ktime_get_real_seconds() &gt; expires_at;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Garbage collect any expired servers.</div><div class='add'>+ * Remove a server record from it's parent cell's database.</div><div class='ctx'>  */</div><div class='del'>-static void afs_gc_servers(struct afs_net *net, struct afs_server *gc_list)</div><div class='add'>+static bool afs_remove_server_from_cell(struct afs_server *server)</div><div class='ctx'> {</div><div class='del'>-	struct afs_server *server, *next, *prev;</div><div class='del'>-	int active;</div><div class='del'>-</div><div class='del'>-	while ((server = gc_list)) {</div><div class='del'>-		gc_list = server-&gt;gc_next;</div><div class='del'>-</div><div class='del'>-		write_seqlock(&amp;net-&gt;fs_lock);</div><div class='del'>-</div><div class='del'>-		active = atomic_read(&amp;server-&gt;active);</div><div class='del'>-		if (active == 0) {</div><div class='del'>-			trace_afs_server(server-&gt;debug_id, refcount_read(&amp;server-&gt;ref),</div><div class='del'>-					 active, afs_server_trace_gc);</div><div class='del'>-			next = rcu_dereference_protected(</div><div class='del'>-				server-&gt;uuid_next, lockdep_is_held(&amp;net-&gt;fs_lock.lock));</div><div class='del'>-			prev = server-&gt;uuid_prev;</div><div class='del'>-			if (!prev) {</div><div class='del'>-				/* The one at the front is in the tree */</div><div class='del'>-				if (!next) {</div><div class='del'>-					rb_erase(&amp;server-&gt;uuid_rb, &amp;net-&gt;fs_servers);</div><div class='del'>-				} else {</div><div class='del'>-					rb_replace_node_rcu(&amp;server-&gt;uuid_rb,</div><div class='del'>-							    &amp;next-&gt;uuid_rb,</div><div class='del'>-							    &amp;net-&gt;fs_servers);</div><div class='del'>-					next-&gt;uuid_prev = NULL;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* This server is not at the front */</div><div class='del'>-				rcu_assign_pointer(prev-&gt;uuid_next, next);</div><div class='del'>-				if (next)</div><div class='del'>-					next-&gt;uuid_prev = prev;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			list_del(&amp;server-&gt;probe_link);</div><div class='del'>-			hlist_del_rcu(&amp;server-&gt;proc_link);</div><div class='del'>-			if (!hlist_unhashed(&amp;server-&gt;addr4_link))</div><div class='del'>-				hlist_del_rcu(&amp;server-&gt;addr4_link);</div><div class='del'>-			if (!hlist_unhashed(&amp;server-&gt;addr6_link))</div><div class='del'>-				hlist_del_rcu(&amp;server-&gt;addr6_link);</div><div class='del'>-		}</div><div class='del'>-		write_sequnlock(&amp;net-&gt;fs_lock);</div><div class='add'>+	struct afs_cell *cell = server-&gt;cell;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;cell-&gt;fs_lock);</div><div class='ctx'> </div><div class='del'>-		if (active == 0)</div><div class='del'>-			afs_destroy_server(net, server);</div><div class='add'>+	if (!afs_has_server_expired(server)) {</div><div class='add'>+		up_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	set_bit(AFS_SERVER_FL_EXPIRED, &amp;server-&gt;flags);</div><div class='add'>+	_debug("expire %pU %u", &amp;server-&gt;uuid, atomic_read(&amp;server-&gt;active));</div><div class='add'>+	afs_see_server(server, afs_server_trace_see_expired);</div><div class='add'>+	rb_erase(&amp;server-&gt;uuid_rb, &amp;cell-&gt;fs_servers);</div><div class='add'>+	up_write(&amp;cell-&gt;fs_lock);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Manage the records of servers known to be within a network namespace.  This</div><div class='del'>- * includes garbage collecting unused servers.</div><div class='del'>- *</div><div class='del'>- * Note also that we were given an increment on net-&gt;servers_outstanding by</div><div class='del'>- * whoever queued us that we need to deal with before returning.</div><div class='del'>- */</div><div class='del'>-void afs_manage_servers(struct work_struct *work)</div><div class='add'>+static void afs_server_destroyer(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct afs_net *net = container_of(work, struct afs_net, fs_manager);</div><div class='del'>-	struct afs_server *gc_list = NULL;</div><div class='del'>-	struct rb_node *cursor;</div><div class='del'>-	time64_t now = ktime_get_real_seconds(), next_manage = TIME64_MAX;</div><div class='del'>-	bool purging = !net-&gt;live;</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='add'>+	struct afs_endpoint_state *estate;</div><div class='add'>+	struct afs_server *server = container_of(work, struct afs_server, destroyer);</div><div class='add'>+	struct afs_net *net = server-&gt;cell-&gt;net;</div><div class='ctx'> </div><div class='del'>-	/* Trawl the server list looking for servers that have expired from</div><div class='del'>-	 * lack of use.</div><div class='del'>-	 */</div><div class='del'>-	read_seqlock_excl(&amp;net-&gt;fs_lock);</div><div class='add'>+	afs_see_server(server, afs_server_trace_see_destroyer);</div><div class='ctx'> </div><div class='del'>-	for (cursor = rb_first(&amp;net-&gt;fs_servers); cursor; cursor = rb_next(cursor)) {</div><div class='del'>-		struct afs_server *server =</div><div class='del'>-			rb_entry(cursor, struct afs_server, uuid_rb);</div><div class='del'>-		int active = atomic_read(&amp;server-&gt;active);</div><div class='add'>+	if (test_bit(AFS_SERVER_FL_EXPIRED, &amp;server-&gt;flags))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		_debug("manage %pU %u", &amp;server-&gt;uuid, active);</div><div class='add'>+	if (!afs_remove_server_from_cell(server))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		if (purging) {</div><div class='del'>-			trace_afs_server(server-&gt;debug_id, refcount_read(&amp;server-&gt;ref),</div><div class='del'>-					 active, afs_server_trace_purging);</div><div class='del'>-			if (active != 0)</div><div class='del'>-				pr_notice("Can't purge s=%08x\n", server-&gt;debug_id);</div><div class='del'>-		}</div><div class='add'>+	timer_shutdown_sync(&amp;server-&gt;timer);</div><div class='add'>+	cancel_work(&amp;server-&gt;destroyer);</div><div class='ctx'> </div><div class='del'>-		if (active == 0) {</div><div class='del'>-			time64_t expire_at = server-&gt;unuse_time;</div><div class='del'>-</div><div class='del'>-			if (!test_bit(AFS_SERVER_FL_VL_FAIL, &amp;server-&gt;flags) &amp;&amp;</div><div class='del'>-			    !test_bit(AFS_SERVER_FL_NOT_FOUND, &amp;server-&gt;flags))</div><div class='del'>-				expire_at += afs_server_gc_delay;</div><div class='del'>-			if (purging || expire_at &lt;= now) {</div><div class='del'>-				server-&gt;gc_next = gc_list;</div><div class='del'>-				gc_list = server;</div><div class='del'>-			} else if (expire_at &lt; next_manage) {</div><div class='del'>-				next_manage = expire_at;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (test_bit(AFS_SERVER_FL_MAY_HAVE_CB, &amp;server-&gt;flags))</div><div class='add'>+		afs_give_up_callbacks(net, server);</div><div class='ctx'> </div><div class='del'>-	read_sequnlock_excl(&amp;net-&gt;fs_lock);</div><div class='add'>+	/* Unbind the rxrpc_peer records from the server. */</div><div class='add'>+	estate = rcu_access_pointer(server-&gt;endpoint_state);</div><div class='add'>+	if (estate)</div><div class='add'>+		afs_set_peer_appdata(server, estate-&gt;addresses, NULL);</div><div class='ctx'> </div><div class='del'>-	/* Update the timer on the way out.  We have to pass an increment on</div><div class='del'>-	 * servers_outstanding in the namespace that we are in to the timer or</div><div class='del'>-	 * the work scheduler.</div><div class='del'>-	 */</div><div class='del'>-	if (!purging &amp;&amp; next_manage &lt; TIME64_MAX) {</div><div class='del'>-		now = ktime_get_real_seconds();</div><div class='add'>+	write_seqlock(&amp;net-&gt;fs_lock);</div><div class='add'>+	list_del_init(&amp;server-&gt;probe_link);</div><div class='add'>+	if (!hlist_unhashed(&amp;server-&gt;proc_link))</div><div class='add'>+		hlist_del_rcu(&amp;server-&gt;proc_link);</div><div class='add'>+	write_sequnlock(&amp;net-&gt;fs_lock);</div><div class='ctx'> </div><div class='del'>-		if (next_manage - now &lt;= 0) {</div><div class='del'>-			if (queue_work(afs_wq, &amp;net-&gt;fs_manager))</div><div class='del'>-				afs_inc_servers_outstanding(net);</div><div class='del'>-		} else {</div><div class='del'>-			afs_set_server_timer(net, next_manage - now);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	afs_put_server(net, server, afs_server_trace_destroy);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	afs_gc_servers(net, gc_list);</div><div class='add'>+static void afs_server_timer(struct timer_list *timer)</div><div class='add'>+{</div><div class='add'>+	struct afs_server *server = container_of(timer, struct afs_server, timer);</div><div class='ctx'> </div><div class='del'>-	afs_dec_servers_outstanding(net);</div><div class='del'>-	_leave(" [%d]", atomic_read(&amp;net-&gt;servers_outstanding));</div><div class='add'>+	afs_see_server(server, afs_server_trace_see_timer);</div><div class='add'>+	if (!test_bit(AFS_SERVER_FL_EXPIRED, &amp;server-&gt;flags))</div><div class='add'>+		schedule_work(&amp;server-&gt;destroyer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void afs_queue_server_manager(struct afs_net *net)</div><div class='add'>+/*</div><div class='add'>+ * Wake up all the servers in a cell so that they can purge themselves.</div><div class='add'>+ */</div><div class='add'>+void afs_purge_servers(struct afs_cell *cell)</div><div class='ctx'> {</div><div class='del'>-	afs_inc_servers_outstanding(net);</div><div class='del'>-	if (!queue_work(afs_wq, &amp;net-&gt;fs_manager))</div><div class='del'>-		afs_dec_servers_outstanding(net);</div><div class='add'>+	struct afs_server *server;</div><div class='add'>+	struct rb_node *rb;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;cell-&gt;fs_lock);</div><div class='add'>+	for (rb = rb_first(&amp;cell-&gt;fs_servers); rb; rb = rb_next(rb)) {</div><div class='add'>+		server = rb_entry(rb, struct afs_server, uuid_rb);</div><div class='add'>+		afs_see_server(server, afs_server_trace_see_purge);</div><div class='add'>+		schedule_work(&amp;server-&gt;destroyer);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;cell-&gt;fs_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Purge list of servers.</div><div class='add'>+ * Wait for outstanding servers.</div><div class='ctx'>  */</div><div class='del'>-void afs_purge_servers(struct afs_net *net)</div><div class='add'>+void afs_wait_for_servers(struct afs_net *net)</div><div class='ctx'> {</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='del'>-	if (del_timer_sync(&amp;net-&gt;fs_timer))</div><div class='del'>-		afs_dec_servers_outstanding(net);</div><div class='del'>-</div><div class='del'>-	afs_queue_server_manager(net);</div><div class='del'>-</div><div class='del'>-	_debug("wait");</div><div class='ctx'> 	atomic_dec(&amp;net-&gt;servers_outstanding);</div><div class='ctx'> 	wait_var_event(&amp;net-&gt;servers_outstanding,</div><div class='ctx'> 		       !atomic_read(&amp;net-&gt;servers_outstanding));</div><div class='hunk'>@@ -640,7 +553,7 @@ static noinline bool afs_update_server_record(struct afs_operation *op,</div><div class='ctx'> 			 atomic_read(&amp;server-&gt;active),</div><div class='ctx'> 			 afs_server_trace_update);</div><div class='ctx'> </div><div class='del'>-	alist = afs_vl_lookup_addrs(op-&gt;volume-&gt;cell, op-&gt;key, &amp;server-&gt;uuid);</div><div class='add'>+	alist = afs_vl_lookup_addrs(server, op-&gt;key);</div><div class='ctx'> 	if (IS_ERR(alist)) {</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		estate = rcu_dereference(server-&gt;endpoint_state);</div><div class='head'>diff --git a/fs/afs/server_list.c b/fs/afs/server_list.c<br/>index 7e7e567a7f8a..20d5474837df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/server_list.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/server_list.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/server_list.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/server_list.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@ void afs_put_serverlist(struct afs_net *net, struct afs_server_list *slist)</div><div class='ctx'> 	if (slist &amp;&amp; refcount_dec_and_test(&amp;slist-&gt;usage)) {</div><div class='ctx'> 		for (i = 0; i &lt; slist-&gt;nr_servers; i++)</div><div class='ctx'> 			afs_unuse_server(net, slist-&gt;servers[i].server,</div><div class='del'>-					 afs_server_trace_put_slist);</div><div class='add'>+					 afs_server_trace_unuse_slist);</div><div class='ctx'> 		kfree_rcu(slist, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -97,8 +97,8 @@ struct afs_server_list *afs_alloc_server_list(struct afs_volume *volume,</div><div class='ctx'> 				break;</div><div class='ctx'> 		if (j &lt; slist-&gt;nr_servers) {</div><div class='ctx'> 			if (slist-&gt;servers[j].server == server) {</div><div class='del'>-				afs_put_server(volume-&gt;cell-&gt;net, server,</div><div class='del'>-					       afs_server_trace_put_slist_isort);</div><div class='add'>+				afs_unuse_server_notime(volume-&gt;cell-&gt;net, server,</div><div class='add'>+							afs_server_trace_unuse_slist_isort);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/super.c b/fs/afs/super.c<br/>index f3ba1c3e72f5..d672b7ab57ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/super.c</a></div><div class='hunk'>@@ -194,8 +194,6 @@ static int afs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> </div><div class='ctx'> 	if (as-&gt;dyn_root)</div><div class='ctx'> 		seq_puts(m, ",dyn");</div><div class='del'>-	if (test_bit(AFS_VNODE_AUTOCELL, &amp;AFS_FS_I(d_inode(root))-&gt;flags))</div><div class='del'>-		seq_puts(m, ",autocell");</div><div class='ctx'> 	switch (as-&gt;flock_mode) {</div><div class='ctx'> 	case afs_flock_mode_unset:	break;</div><div class='ctx'> 	case afs_flock_mode_local:	p = "local";	break;</div><div class='hunk'>@@ -292,13 +290,14 @@ static int afs_parse_source(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 	/* lookup the cell record */</div><div class='ctx'> 	if (cellname) {</div><div class='ctx'> 		cell = afs_lookup_cell(ctx-&gt;net, cellname, cellnamesz,</div><div class='del'>-				       NULL, false);</div><div class='add'>+				       NULL, AFS_LOOKUP_CELL_DIRECT_MOUNT,</div><div class='add'>+				       afs_cell_trace_use_lookup_mount);</div><div class='ctx'> 		if (IS_ERR(cell)) {</div><div class='ctx'> 			pr_err("kAFS: unable to lookup cell '%*.*s'\n",</div><div class='ctx'> 			       cellnamesz, cellnamesz, cellname ?: "");</div><div class='ctx'> 			return PTR_ERR(cell);</div><div class='ctx'> 		}</div><div class='del'>-		afs_unuse_cell(ctx-&gt;net, ctx-&gt;cell, afs_cell_trace_unuse_parse);</div><div class='add'>+		afs_unuse_cell(ctx-&gt;cell, afs_cell_trace_unuse_parse);</div><div class='ctx'> 		afs_see_cell(cell, afs_cell_trace_see_source);</div><div class='ctx'> 		ctx-&gt;cell = cell;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -395,7 +394,7 @@ static int afs_validate_fc(struct fs_context *fc)</div><div class='ctx'> 				ctx-&gt;key = NULL;</div><div class='ctx'> 				cell = afs_use_cell(ctx-&gt;cell-&gt;alias_of,</div><div class='ctx'> 						    afs_cell_trace_use_fc_alias);</div><div class='del'>-				afs_unuse_cell(ctx-&gt;net, ctx-&gt;cell, afs_cell_trace_unuse_fc);</div><div class='add'>+				afs_unuse_cell(ctx-&gt;cell, afs_cell_trace_unuse_fc);</div><div class='ctx'> 				ctx-&gt;cell = cell;</div><div class='ctx'> 				goto reget_key;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -468,7 +467,7 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate the root inode and dentry */</div><div class='ctx'> 	if (as-&gt;dyn_root) {</div><div class='del'>-		inode = afs_iget_pseudo_dir(sb, true);</div><div class='add'>+		inode = afs_dynroot_iget_root(sb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sprintf(sb-&gt;s_id, "%llu", as-&gt;volume-&gt;vid);</div><div class='ctx'> 		afs_activate_volume(as-&gt;volume);</div><div class='hunk'>@@ -478,21 +477,15 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx)</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return PTR_ERR(inode);</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;autocell || as-&gt;dyn_root)</div><div class='del'>-		set_bit(AFS_VNODE_AUTOCELL, &amp;AFS_FS_I(inode)-&gt;flags);</div><div class='del'>-</div><div class='ctx'> 	ret = -ENOMEM;</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(inode);</div><div class='ctx'> 	if (!sb-&gt;s_root)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	if (as-&gt;dyn_root) {</div><div class='del'>-		sb-&gt;s_d_op = &amp;afs_dynroot_dentry_operations;</div><div class='del'>-		ret = afs_dynroot_populate(sb);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+		set_default_d_op(sb, &amp;afs_dynroot_dentry_operations);</div><div class='ctx'> 	} else {</div><div class='del'>-		sb-&gt;s_d_op = &amp;afs_fs_dentry_operations;</div><div class='add'>+		set_default_d_op(sb, &amp;afs_fs_dentry_operations);</div><div class='ctx'> 		rcu_assign_pointer(as-&gt;volume-&gt;sb, sb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -527,9 +520,8 @@ static struct afs_super_info *afs_alloc_sbi(struct fs_context *fc)</div><div class='ctx'> static void afs_destroy_sbi(struct afs_super_info *as)</div><div class='ctx'> {</div><div class='ctx'> 	if (as) {</div><div class='del'>-		struct afs_net *net = afs_net(as-&gt;net_ns);</div><div class='ctx'> 		afs_put_volume(as-&gt;volume, afs_volume_trace_put_destroy_sbi);</div><div class='del'>-		afs_unuse_cell(net, as-&gt;cell, afs_cell_trace_unuse_sbi);</div><div class='add'>+		afs_unuse_cell(as-&gt;cell, afs_cell_trace_unuse_sbi);</div><div class='ctx'> 		put_net(as-&gt;net_ns);</div><div class='ctx'> 		kfree(as);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -539,9 +531,6 @@ static void afs_kill_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_super_info *as = AFS_FS_S(sb);</div><div class='ctx'> </div><div class='del'>-	if (as-&gt;dyn_root)</div><div class='del'>-		afs_dynroot_depopulate(sb);</div><div class='del'>-</div><div class='ctx'> 	/* Clear the callback interests (which will do ilookup5) before</div><div class='ctx'> 	 * deactivating the superblock.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -615,7 +604,7 @@ static void afs_free_fc(struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	afs_destroy_sbi(fc-&gt;s_fs_info);</div><div class='ctx'> 	afs_put_volume(ctx-&gt;volume, afs_volume_trace_put_free_fc);</div><div class='del'>-	afs_unuse_cell(ctx-&gt;net, ctx-&gt;cell, afs_cell_trace_unuse_fc);</div><div class='add'>+	afs_unuse_cell(ctx-&gt;cell, afs_cell_trace_unuse_fc);</div><div class='ctx'> 	key_put(ctx-&gt;key);</div><div class='ctx'> 	kfree(ctx);</div><div class='ctx'> }</div><div class='hunk'>@@ -663,7 +652,7 @@ static void afs_i_init_once(void *_vnode)</div><div class='ctx'> </div><div class='ctx'> 	memset(vnode, 0, sizeof(*vnode));</div><div class='ctx'> 	inode_init_once(&amp;vnode-&gt;netfs.inode);</div><div class='del'>-	mutex_init(&amp;vnode-&gt;io_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;vnode-&gt;io_lock_waiters);</div><div class='ctx'> 	init_rwsem(&amp;vnode-&gt;validate_lock);</div><div class='ctx'> 	spin_lock_init(&amp;vnode-&gt;wb_lock);</div><div class='ctx'> 	spin_lock_init(&amp;vnode-&gt;lock);</div><div class='hunk'>@@ -696,6 +685,8 @@ static struct inode *afs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	vnode-&gt;volume		= NULL;</div><div class='ctx'> 	vnode-&gt;lock_key		= NULL;</div><div class='ctx'> 	vnode-&gt;permit_cache	= NULL;</div><div class='add'>+	vnode-&gt;directory	= NULL;</div><div class='add'>+	vnode-&gt;directory_size	= 0;</div><div class='ctx'> </div><div class='ctx'> 	vnode-&gt;flags		= 1 &lt;&lt; AFS_VNODE_UNSET;</div><div class='ctx'> 	vnode-&gt;lock_state	= AFS_VNODE_LOCK_NONE;</div><div class='head'>diff --git a/fs/afs/validation.c b/fs/afs/validation.c<br/>index 46b37f2cce7d..0ba8336c9025 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/validation.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/validation.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/validation.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/validation.c</a></div><div class='hunk'>@@ -120,19 +120,31 @@</div><div class='ctx'> bool afs_check_validity(const struct afs_vnode *vnode)</div><div class='ctx'> {</div><div class='ctx'> 	const struct afs_volume *volume = vnode-&gt;volume;</div><div class='add'>+	enum afs_vnode_invalid_trace trace = afs_vnode_valid_trace;</div><div class='add'>+	time64_t cb_expires_at = atomic64_read(&amp;vnode-&gt;cb_expires_at);</div><div class='ctx'> 	time64_t deadline = ktime_get_real_seconds() + 10;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;volume-&gt;cb_v_check) != atomic_read(&amp;volume-&gt;cb_v_break) ||</div><div class='del'>-	    atomic64_read(&amp;vnode-&gt;cb_expires_at)  &lt;= deadline ||</div><div class='del'>-	    volume-&gt;cb_expires_at &lt;= deadline ||</div><div class='del'>-	    vnode-&gt;cb_ro_snapshot != atomic_read(&amp;volume-&gt;cb_ro_snapshot) ||</div><div class='del'>-	    vnode-&gt;cb_scrub	  != atomic_read(&amp;volume-&gt;cb_scrub) ||</div><div class='del'>-	    test_bit(AFS_VNODE_ZAP_DATA, &amp;vnode-&gt;flags)) {</div><div class='del'>-		_debug("inval");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='add'>+	if (test_bit(AFS_VNODE_DELETED, &amp;vnode-&gt;flags))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;volume-&gt;cb_v_check) != atomic_read(&amp;volume-&gt;cb_v_break))</div><div class='add'>+		trace = afs_vnode_invalid_trace_cb_v_break;</div><div class='add'>+	else if (cb_expires_at == AFS_NO_CB_PROMISE)</div><div class='add'>+		trace = afs_vnode_invalid_trace_no_cb_promise;</div><div class='add'>+	else if (cb_expires_at &lt;= deadline)</div><div class='add'>+		trace = afs_vnode_invalid_trace_expired;</div><div class='add'>+	else if (volume-&gt;cb_expires_at &lt;= deadline)</div><div class='add'>+		trace = afs_vnode_invalid_trace_vol_expired;</div><div class='add'>+	else if (vnode-&gt;cb_ro_snapshot != atomic_read(&amp;volume-&gt;cb_ro_snapshot))</div><div class='add'>+		trace = afs_vnode_invalid_trace_cb_ro_snapshot;</div><div class='add'>+	else if (vnode-&gt;cb_scrub != atomic_read(&amp;volume-&gt;cb_scrub))</div><div class='add'>+		trace = afs_vnode_invalid_trace_cb_scrub;</div><div class='add'>+	else if (test_bit(AFS_VNODE_ZAP_DATA, &amp;vnode-&gt;flags))</div><div class='add'>+		trace = afs_vnode_invalid_trace_zap_data;</div><div class='add'>+	else</div><div class='add'>+		return true;</div><div class='add'>+	trace_afs_vnode_invalid(vnode, trace);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -362,9 +374,9 @@ static void afs_zap_data(struct afs_vnode *vnode)</div><div class='ctx'> 	 * written back in a regular file and completely discard the pages in a</div><div class='ctx'> 	 * directory or symlink */</div><div class='ctx'> 	if (S_ISREG(vnode-&gt;netfs.inode.i_mode))</div><div class='del'>-		invalidate_remote_inode(&amp;vnode-&gt;netfs.inode);</div><div class='add'>+		filemap_invalidate_inode(&amp;vnode-&gt;netfs.inode, true, 0, LLONG_MAX);</div><div class='ctx'> 	else</div><div class='del'>-		invalidate_inode_pages2(vnode-&gt;netfs.inode.i_mapping);</div><div class='add'>+		filemap_invalidate_inode(&amp;vnode-&gt;netfs.inode, false, 0, LLONG_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -389,12 +401,17 @@ int afs_validate(struct afs_vnode *vnode, struct key *key)</div><div class='ctx'> 	       key_serial(key));</div><div class='ctx'> </div><div class='ctx'> 	if (afs_check_validity(vnode))</div><div class='del'>-		return 0;</div><div class='add'>+		return test_bit(AFS_VNODE_DELETED, &amp;vnode-&gt;flags) ? -ESTALE : 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = down_write_killable(&amp;vnode-&gt;validate_lock);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(AFS_VNODE_DELETED, &amp;vnode-&gt;flags)) {</div><div class='add'>+		ret = -ESTALE;</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Validate a volume after the v_break has changed or the volume</div><div class='ctx'> 	 * callback expired.  We only want to do this once per volume per</div><div class='ctx'> 	 * v_break change.  The actual work will be done when parsing the</div><div class='hunk'>@@ -448,12 +465,6 @@ int afs_validate(struct afs_vnode *vnode, struct key *key)</div><div class='ctx'> 	vnode-&gt;cb_ro_snapshot = cb_ro_snapshot;</div><div class='ctx'> 	vnode-&gt;cb_scrub = cb_scrub;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(AFS_VNODE_DELETED, &amp;vnode-&gt;flags)) {</div><div class='del'>-		_debug("file already deleted");</div><div class='del'>-		ret = -ESTALE;</div><div class='del'>-		goto error_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* if the vnode's data version number changed then its contents are</div><div class='ctx'> 	 * different */</div><div class='ctx'> 	zap |= test_and_clear_bit(AFS_VNODE_ZAP_DATA, &amp;vnode-&gt;flags);</div><div class='head'>diff --git a/fs/afs/vl_alias.c b/fs/afs/vl_alias.c<br/>index 9f36e14f1c2d..fc9676abd252 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/vl_alias.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/vl_alias.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/vl_alias.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/vl_alias.c</a></div><div class='hunk'>@@ -205,11 +205,11 @@ static int afs_query_for_alias(struct afs_cell *cell, struct key *key)</div><div class='ctx'> 			goto is_alias;</div><div class='ctx'> </div><div class='ctx'> 		if (mutex_lock_interruptible(&amp;cell-&gt;net-&gt;proc_cells_lock) &lt; 0) {</div><div class='del'>-			afs_unuse_cell(cell-&gt;net, p, afs_cell_trace_unuse_check_alias);</div><div class='add'>+			afs_unuse_cell(p, afs_cell_trace_unuse_check_alias);</div><div class='ctx'> 			return -ERESTARTSYS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		afs_unuse_cell(cell-&gt;net, p, afs_cell_trace_unuse_check_alias);</div><div class='add'>+		afs_unuse_cell(p, afs_cell_trace_unuse_check_alias);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cell-&gt;net-&gt;proc_cells_lock);</div><div class='hunk'>@@ -253,6 +253,7 @@ static char *afs_vl_get_cell_name(struct afs_cell *cell, struct key *key)</div><div class='ctx'> static int yfs_check_canonical_cell_name(struct afs_cell *cell, struct key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_cell *master;</div><div class='add'>+	size_t name_len;</div><div class='ctx'> 	char *cell_name;</div><div class='ctx'> </div><div class='ctx'> 	cell_name = afs_vl_get_cell_name(cell, key);</div><div class='hunk'>@@ -264,8 +265,13 @@ static int yfs_check_canonical_cell_name(struct afs_cell *cell, struct key *key)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	master = afs_lookup_cell(cell-&gt;net, cell_name, strlen(cell_name),</div><div class='del'>-				 NULL, false);</div><div class='add'>+	name_len = strlen(cell_name);</div><div class='add'>+	if (!name_len || name_len &gt; AFS_MAXCELLNAME)</div><div class='add'>+		master = ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	else</div><div class='add'>+		master = afs_lookup_cell(cell-&gt;net, cell_name, name_len, NULL,</div><div class='add'>+					 AFS_LOOKUP_CELL_ALIAS_CHECK,</div><div class='add'>+					 afs_cell_trace_use_lookup_canonical);</div><div class='ctx'> 	kfree(cell_name);</div><div class='ctx'> 	if (IS_ERR(master))</div><div class='ctx'> 		return PTR_ERR(master);</div><div class='head'>diff --git a/fs/afs/vl_rotate.c b/fs/afs/vl_rotate.c<br/>index d8f79f6ada3d..6ad9688d8f4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/vl_rotate.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/vl_rotate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/vl_rotate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/vl_rotate.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static bool afs_start_vl_iteration(struct afs_vl_cursor *vc)</div><div class='ctx'> 	    cell-&gt;dns_expiry &lt;= ktime_get_real_seconds()) {</div><div class='ctx'> 		dns_lookup_count = smp_load_acquire(&amp;cell-&gt;dns_lookup_count);</div><div class='ctx'> 		set_bit(AFS_CELL_FL_DO_LOOKUP, &amp;cell-&gt;flags);</div><div class='del'>-		afs_queue_cell(cell, afs_cell_trace_get_queue_dns);</div><div class='add'>+		afs_queue_cell(cell, afs_cell_trace_queue_dns);</div><div class='ctx'> </div><div class='ctx'> 		if (cell-&gt;dns_source == DNS_RECORD_UNAVAILABLE) {</div><div class='ctx'> 			if (wait_var_event_interruptible(</div><div class='head'>diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c<br/>index cac75f89b64a..3a23c0b08eb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/vlclient.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/vlclient.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/vlclient.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/vlclient.c</a></div><div class='hunk'>@@ -370,6 +370,7 @@ static const struct afs_call_type afs_RXVLGetCapabilities = {</div><div class='ctx'> 	.name		= "VL.GetCapabilities",</div><div class='ctx'> 	.op		= afs_VL_GetCapabilities,</div><div class='ctx'> 	.deliver	= afs_deliver_vl_get_capabilities,</div><div class='add'>+	.immediate_cancel = afs_vlserver_probe_result,</div><div class='ctx'> 	.done		= afs_vlserver_probe_result,</div><div class='ctx'> 	.destructor	= afs_destroy_vl_get_capabilities,</div><div class='ctx'> };</div><div class='hunk'>@@ -697,7 +698,7 @@ static int afs_deliver_yfsvl_get_cell_name(struct afs_call *call)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		namesz = ntohl(call-&gt;tmp);</div><div class='del'>-		if (namesz &gt; AFS_MAXCELLNAME)</div><div class='add'>+		if (namesz &gt; YFS_VL_MAXCELLNAME)</div><div class='ctx'> 			return afs_protocol_error(call, afs_eproto_cellname_len);</div><div class='ctx'> 		paddedsz = (namesz + 3) &amp; ~3;</div><div class='ctx'> 		call-&gt;count = namesz;</div><div class='head'>diff --git a/fs/afs/volume.c b/fs/afs/volume.c<br/>index 020ecd45e476..0efff3d25133 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/volume.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/volume.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/volume.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/volume.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned __read_mostly afs_volume_record_life = 60 * 60;</div><div class='add'>+static atomic_t afs_volume_debug_id;</div><div class='ctx'> </div><div class='ctx'> static void afs_destroy_volume(struct work_struct *work);</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +60,7 @@ static void afs_remove_volume_from_cell(struct afs_volume *volume)</div><div class='ctx'> 	struct afs_cell *cell = volume-&gt;cell;</div><div class='ctx'> </div><div class='ctx'> 	if (!hlist_unhashed(&amp;volume-&gt;proc_link)) {</div><div class='del'>-		trace_afs_volume(volume-&gt;vid, refcount_read(&amp;cell-&gt;ref),</div><div class='add'>+		trace_afs_volume(volume-&gt;debug_id, volume-&gt;vid, refcount_read(&amp;volume-&gt;ref),</div><div class='ctx'> 				 afs_volume_trace_remove);</div><div class='ctx'> 		write_seqlock(&amp;cell-&gt;volume_lock);</div><div class='ctx'> 		hlist_del_rcu(&amp;volume-&gt;proc_link);</div><div class='hunk'>@@ -84,6 +85,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params,</div><div class='ctx'> 	if (!volume)</div><div class='ctx'> 		goto error_0;</div><div class='ctx'> </div><div class='add'>+	volume-&gt;debug_id	= atomic_inc_return(&amp;afs_volume_debug_id);</div><div class='ctx'> 	volume-&gt;vid		= vldb-&gt;vid[params-&gt;type];</div><div class='ctx'> 	volume-&gt;update_at	= ktime_get_real_seconds() + afs_volume_record_life;</div><div class='ctx'> 	volume-&gt;cell		= afs_get_cell(params-&gt;cell, afs_cell_trace_get_vol);</div><div class='hunk'>@@ -115,7 +117,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params,</div><div class='ctx'> </div><div class='ctx'> 	*_slist = slist;</div><div class='ctx'> 	rcu_assign_pointer(volume-&gt;servers, slist);</div><div class='del'>-	trace_afs_volume(volume-&gt;vid, 1, afs_volume_trace_alloc);</div><div class='add'>+	trace_afs_volume(volume-&gt;debug_id, volume-&gt;vid, 1, afs_volume_trace_alloc);</div><div class='ctx'> 	return volume;</div><div class='ctx'> </div><div class='ctx'> error_1:</div><div class='hunk'>@@ -247,7 +249,7 @@ static void afs_destroy_volume(struct work_struct *work)</div><div class='ctx'> 	afs_remove_volume_from_cell(volume);</div><div class='ctx'> 	afs_put_serverlist(volume-&gt;cell-&gt;net, slist);</div><div class='ctx'> 	afs_put_cell(volume-&gt;cell, afs_cell_trace_put_vol);</div><div class='del'>-	trace_afs_volume(volume-&gt;vid, refcount_read(&amp;volume-&gt;ref),</div><div class='add'>+	trace_afs_volume(volume-&gt;debug_id, volume-&gt;vid, refcount_read(&amp;volume-&gt;ref),</div><div class='ctx'> 			 afs_volume_trace_free);</div><div class='ctx'> 	kfree_rcu(volume, rcu);</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +264,7 @@ bool afs_try_get_volume(struct afs_volume *volume, enum afs_volume_trace reason)</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	if (__refcount_inc_not_zero(&amp;volume-&gt;ref, &amp;r)) {</div><div class='del'>-		trace_afs_volume(volume-&gt;vid, r + 1, reason);</div><div class='add'>+		trace_afs_volume(volume-&gt;debug_id, volume-&gt;vid, r + 1, reason);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -278,7 +280,7 @@ struct afs_volume *afs_get_volume(struct afs_volume *volume,</div><div class='ctx'> 		int r;</div><div class='ctx'> </div><div class='ctx'> 		__refcount_inc(&amp;volume-&gt;ref, &amp;r);</div><div class='del'>-		trace_afs_volume(volume-&gt;vid, r + 1, reason);</div><div class='add'>+		trace_afs_volume(volume-&gt;debug_id, volume-&gt;vid, r + 1, reason);</div><div class='ctx'> 	}</div><div class='ctx'> 	return volume;</div><div class='ctx'> }</div><div class='hunk'>@@ -290,12 +292,13 @@ struct afs_volume *afs_get_volume(struct afs_volume *volume,</div><div class='ctx'> void afs_put_volume(struct afs_volume *volume, enum afs_volume_trace reason)</div><div class='ctx'> {</div><div class='ctx'> 	if (volume) {</div><div class='add'>+		unsigned int debug_id = volume-&gt;debug_id;</div><div class='ctx'> 		afs_volid_t vid = volume-&gt;vid;</div><div class='ctx'> 		bool zero;</div><div class='ctx'> 		int r;</div><div class='ctx'> </div><div class='ctx'> 		zero = __refcount_dec_and_test(&amp;volume-&gt;ref, &amp;r);</div><div class='del'>-		trace_afs_volume(vid, r - 1, reason);</div><div class='add'>+		trace_afs_volume(debug_id, vid, r - 1, reason);</div><div class='ctx'> 		if (zero)</div><div class='ctx'> 			schedule_work(&amp;volume-&gt;destructor);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -353,7 +356,7 @@ static int afs_update_volume_status(struct afs_volume *volume, struct key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_server_list *new, *old, *discard;</div><div class='ctx'> 	struct afs_vldb_entry *vldb;</div><div class='del'>-	char idbuf[16];</div><div class='add'>+	char idbuf[24];</div><div class='ctx'> 	int ret, idsz;</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='hunk'>@@ -361,7 +364,7 @@ static int afs_update_volume_status(struct afs_volume *volume, struct key *key)</div><div class='ctx'> 	/* We look up an ID by passing it as a decimal string in the</div><div class='ctx'> 	 * operation's name parameter.</div><div class='ctx'> 	 */</div><div class='del'>-	idsz = sprintf(idbuf, "%llu", volume-&gt;vid);</div><div class='add'>+	idsz = snprintf(idbuf, sizeof(idbuf), "%llu", volume-&gt;vid);</div><div class='ctx'> </div><div class='ctx'> 	vldb = afs_vl_lookup_vldb(volume-&gt;cell, key, idbuf, idsz);</div><div class='ctx'> 	if (IS_ERR(vldb)) {</div><div class='head'>diff --git a/fs/afs/write.c b/fs/afs/write.c<br/>index 74402d95a884..93ad86ff3345 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/write.c</a></div><div class='hunk'>@@ -29,43 +29,39 @@ static void afs_pages_written_back(struct afs_vnode *vnode, loff_t start, unsign</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Find a key to use for the writeback.  We cached the keys used to author the</div><div class='del'>- * writes on the vnode.  *_wbk will contain the last writeback key used or NULL</div><div class='del'>- * and we need to start from there if it's set.</div><div class='add'>+ * writes on the vnode.  wreq-&gt;netfs_priv2 will contain the last writeback key</div><div class='add'>+ * record used or NULL and we need to start from there if it's set.</div><div class='add'>+ * wreq-&gt;netfs_priv will be set to the key itself or NULL.</div><div class='ctx'>  */</div><div class='del'>-static int afs_get_writeback_key(struct afs_vnode *vnode,</div><div class='del'>-				 struct afs_wb_key **_wbk)</div><div class='add'>+static void afs_get_writeback_key(struct netfs_io_request *wreq)</div><div class='ctx'> {</div><div class='del'>-	struct afs_wb_key *wbk = NULL;</div><div class='del'>-	struct list_head *p;</div><div class='del'>-	int ret = -ENOKEY, ret2;</div><div class='add'>+	struct afs_wb_key *wbk, *old = wreq-&gt;netfs_priv2;</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(wreq-&gt;inode);</div><div class='add'>+</div><div class='add'>+	key_put(wreq-&gt;netfs_priv);</div><div class='add'>+	wreq-&gt;netfs_priv = NULL;</div><div class='add'>+	wreq-&gt;netfs_priv2 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;vnode-&gt;wb_lock);</div><div class='del'>-	if (*_wbk)</div><div class='del'>-		p = (*_wbk)-&gt;vnode_link.next;</div><div class='add'>+	if (old)</div><div class='add'>+		wbk = list_next_entry(old, vnode_link);</div><div class='ctx'> 	else</div><div class='del'>-		p = vnode-&gt;wb_keys.next;</div><div class='add'>+		wbk = list_first_entry(&amp;vnode-&gt;wb_keys, struct afs_wb_key, vnode_link);</div><div class='ctx'> </div><div class='del'>-	while (p != &amp;vnode-&gt;wb_keys) {</div><div class='del'>-		wbk = list_entry(p, struct afs_wb_key, vnode_link);</div><div class='add'>+	list_for_each_entry_from(wbk, &amp;vnode-&gt;wb_keys, vnode_link) {</div><div class='ctx'> 		_debug("wbk %u", key_serial(wbk-&gt;key));</div><div class='del'>-		ret2 = key_validate(wbk-&gt;key);</div><div class='del'>-		if (ret2 == 0) {</div><div class='add'>+		if (key_validate(wbk-&gt;key) == 0) {</div><div class='ctx'> 			refcount_inc(&amp;wbk-&gt;usage);</div><div class='add'>+			wreq-&gt;netfs_priv = key_get(wbk-&gt;key);</div><div class='add'>+			wreq-&gt;netfs_priv2 = wbk;</div><div class='ctx'> 			_debug("USE WB KEY %u", key_serial(wbk-&gt;key));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		wbk = NULL;</div><div class='del'>-		if (ret == -ENOKEY)</div><div class='del'>-			ret = ret2;</div><div class='del'>-		p = p-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;vnode-&gt;wb_lock);</div><div class='del'>-	if (*_wbk)</div><div class='del'>-		afs_put_wb_key(*_wbk);</div><div class='del'>-	*_wbk = wbk;</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	afs_put_wb_key(old);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void afs_store_data_success(struct afs_operation *op)</div><div class='hunk'>@@ -75,8 +71,7 @@ static void afs_store_data_success(struct afs_operation *op)</div><div class='ctx'> 	op-&gt;ctime = op-&gt;file[0].scb.status.mtime_client;</div><div class='ctx'> 	afs_vnode_commit_status(op, &amp;op-&gt;file[0]);</div><div class='ctx'> 	if (!afs_op_error(op)) {</div><div class='del'>-		if (!op-&gt;store.laundering)</div><div class='del'>-			afs_pages_written_back(vnode, op-&gt;store.pos, op-&gt;store.size);</div><div class='add'>+		afs_pages_written_back(vnode, op-&gt;store.pos, op-&gt;store.size);</div><div class='ctx'> 		afs_stat_v(vnode, n_stores);</div><div class='ctx'> 		atomic_long_add(op-&gt;store.size, &amp;afs_v2net(vnode)-&gt;n_store_bytes);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -89,113 +84,143 @@ static const struct afs_operation_ops afs_store_data_operation = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * write to a file</div><div class='add'>+ * Prepare a subrequest to write to the server.  This sets the max_len</div><div class='add'>+ * parameter.</div><div class='add'>+ */</div><div class='add'>+void afs_prepare_write(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;subreq-&gt;rreq-&gt;io_streams[subreq-&gt;stream_nr];</div><div class='add'>+</div><div class='add'>+	//if (test_bit(NETFS_SREQ_RETRYING, &amp;subreq-&gt;flags))</div><div class='add'>+	//	subreq-&gt;max_len = 512 * 1024;</div><div class='add'>+	//else</div><div class='add'>+	stream-&gt;sreq_max_len = 256 * 1024 * 1024;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Issue a subrequest to write to the server.</div><div class='ctx'>  */</div><div class='del'>-static int afs_store_data(struct afs_vnode *vnode, struct iov_iter *iter, loff_t pos,</div><div class='del'>-			  bool laundering)</div><div class='add'>+static void afs_issue_write_worker(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_io_subrequest *subreq = container_of(work, struct netfs_io_subrequest, work);</div><div class='add'>+	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='ctx'> 	struct afs_operation *op;</div><div class='del'>-	struct afs_wb_key *wbk = NULL;</div><div class='del'>-	loff_t size = iov_iter_count(iter);</div><div class='add'>+	struct afs_vnode *vnode = AFS_FS_I(wreq-&gt;inode);</div><div class='add'>+	unsigned long long pos = subreq-&gt;start + subreq-&gt;transferred;</div><div class='add'>+	size_t len = subreq-&gt;len - subreq-&gt;transferred;</div><div class='ctx'> 	int ret = -ENOKEY;</div><div class='ctx'> </div><div class='del'>-	_enter("%s{%llx:%llu.%u},%llx,%llx",</div><div class='add'>+	_enter("R=%x[%x],%s{%llx:%llu.%u},%llx,%zx",</div><div class='add'>+	       wreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='ctx'> 	       vnode-&gt;volume-&gt;name,</div><div class='ctx'> 	       vnode-&gt;fid.vid,</div><div class='ctx'> 	       vnode-&gt;fid.vnode,</div><div class='ctx'> 	       vnode-&gt;fid.unique,</div><div class='del'>-	       size, pos);</div><div class='add'>+	       pos, len);</div><div class='ctx'> </div><div class='del'>-	ret = afs_get_writeback_key(vnode, &amp;wbk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		_leave(" = %d [no keys]", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+#if 0 // Error injection</div><div class='add'>+	if (subreq-&gt;debug_index == 3)</div><div class='add'>+		return netfs_write_subrequest_terminated(subreq, -ENOANO);</div><div class='ctx'> </div><div class='del'>-	op = afs_alloc_operation(wbk-&gt;key, vnode-&gt;volume);</div><div class='del'>-	if (IS_ERR(op)) {</div><div class='del'>-		afs_put_wb_key(wbk);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!subreq-&gt;retry_count) {</div><div class='add'>+		set_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+		return netfs_write_subrequest_terminated(subreq, -EAGAIN);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	op = afs_alloc_operation(wreq-&gt;netfs_priv, vnode-&gt;volume);</div><div class='add'>+	if (IS_ERR(op))</div><div class='add'>+		return netfs_write_subrequest_terminated(subreq, -EAGAIN);</div><div class='ctx'> </div><div class='ctx'> 	afs_op_set_vnode(op, 0, vnode);</div><div class='del'>-	op-&gt;file[0].dv_delta = 1;</div><div class='add'>+	op-&gt;file[0].dv_delta	= 1;</div><div class='ctx'> 	op-&gt;file[0].modification = true;</div><div class='del'>-	op-&gt;store.pos = pos;</div><div class='del'>-	op-&gt;store.size = size;</div><div class='del'>-	op-&gt;store.laundering = laundering;</div><div class='del'>-	op-&gt;flags |= AFS_OPERATION_UNINTR;</div><div class='del'>-	op-&gt;ops = &amp;afs_store_data_operation;</div><div class='add'>+	op-&gt;store.pos		= pos;</div><div class='add'>+	op-&gt;store.size		= len;</div><div class='add'>+	op-&gt;flags		|= AFS_OPERATION_UNINTR;</div><div class='add'>+	op-&gt;ops			= &amp;afs_store_data_operation;</div><div class='ctx'> </div><div class='del'>-try_next_key:</div><div class='ctx'> 	afs_begin_vnode_operation(op);</div><div class='ctx'> </div><div class='del'>-	op-&gt;store.write_iter = iter;</div><div class='del'>-	op-&gt;store.i_size = max(pos + size, vnode-&gt;netfs.remote_i_size);</div><div class='del'>-	op-&gt;mtime = inode_get_mtime(&amp;vnode-&gt;netfs.inode);</div><div class='add'>+	op-&gt;store.write_iter	= &amp;subreq-&gt;io_iter;</div><div class='add'>+	op-&gt;store.i_size	= umax(pos + len, vnode-&gt;netfs.remote_i_size);</div><div class='add'>+	op-&gt;mtime		= inode_get_mtime(&amp;vnode-&gt;netfs.inode);</div><div class='ctx'> </div><div class='ctx'> 	afs_wait_for_operation(op);</div><div class='del'>-</div><div class='del'>-	switch (afs_op_error(op)) {</div><div class='add'>+	ret = afs_put_operation(op);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case 0:</div><div class='add'>+		__set_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+		break;</div><div class='ctx'> 	case -EACCES:</div><div class='ctx'> 	case -EPERM:</div><div class='ctx'> 	case -ENOKEY:</div><div class='ctx'> 	case -EKEYEXPIRED:</div><div class='ctx'> 	case -EKEYREJECTED:</div><div class='ctx'> 	case -EKEYREVOKED:</div><div class='del'>-		_debug("next");</div><div class='del'>-</div><div class='del'>-		ret = afs_get_writeback_key(vnode, &amp;wbk);</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			key_put(op-&gt;key);</div><div class='del'>-			op-&gt;key = key_get(wbk-&gt;key);</div><div class='del'>-			goto try_next_key;</div><div class='del'>-		}</div><div class='add'>+		/* If there are more keys we can try, use the retry algorithm</div><div class='add'>+		 * to rotate the keys.</div><div class='add'>+		 */</div><div class='add'>+		if (wreq-&gt;netfs_priv2)</div><div class='add'>+			set_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	afs_put_wb_key(wbk);</div><div class='del'>-	_leave(" = %d", afs_op_error(op));</div><div class='del'>-	return afs_put_operation(op);</div><div class='add'>+	netfs_write_subrequest_terminated(subreq, ret &lt; 0 ? ret : subreq-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void afs_upload_to_server(struct netfs_io_subrequest *subreq)</div><div class='add'>+void afs_issue_write(struct netfs_io_subrequest *subreq)</div><div class='ctx'> {</div><div class='del'>-	struct afs_vnode *vnode = AFS_FS_I(subreq-&gt;rreq-&gt;inode);</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	_enter("%x[%x],%zx",</div><div class='del'>-	       subreq-&gt;rreq-&gt;debug_id, subreq-&gt;debug_index, subreq-&gt;io_iter.count);</div><div class='del'>-</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='del'>-	ret = afs_store_data(vnode, &amp;subreq-&gt;io_iter, subreq-&gt;start,</div><div class='del'>-			     subreq-&gt;rreq-&gt;origin == NETFS_LAUNDER_WRITE);</div><div class='del'>-	netfs_write_subrequest_terminated(subreq, ret &lt; 0 ? ret : subreq-&gt;len,</div><div class='del'>-					  false);</div><div class='add'>+	subreq-&gt;work.func = afs_issue_write_worker;</div><div class='add'>+	if (!queue_work(system_dfl_wq, &amp;subreq-&gt;work))</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void afs_upload_to_server_worker(struct work_struct *work)</div><div class='add'>+/*</div><div class='add'>+ * Writeback calls this when it finds a folio that needs uploading.  This isn't</div><div class='add'>+ * called if writeback only has copy-to-cache to deal with.</div><div class='add'>+ */</div><div class='add'>+void afs_begin_writeback(struct netfs_io_request *wreq)</div><div class='ctx'> {</div><div class='del'>-	struct netfs_io_subrequest *subreq =</div><div class='del'>-		container_of(work, struct netfs_io_subrequest, work);</div><div class='del'>-</div><div class='del'>-	afs_upload_to_server(subreq);</div><div class='add'>+	if (S_ISREG(wreq-&gt;inode-&gt;i_mode))</div><div class='add'>+		afs_get_writeback_key(wreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Set up write requests for a writeback slice.  We need to add a write request</div><div class='del'>- * for each write we want to make.</div><div class='add'>+ * Prepare to retry the writes in request.  Use this to try rotating the</div><div class='add'>+ * available writeback keys.</div><div class='ctx'>  */</div><div class='del'>-void afs_create_write_requests(struct netfs_io_request *wreq, loff_t start, size_t len)</div><div class='add'>+void afs_retry_request(struct netfs_io_request *wreq, struct netfs_io_stream *stream)</div><div class='ctx'> {</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-</div><div class='del'>-	_enter("%x,%llx-%llx", wreq-&gt;debug_id, start, start + len);</div><div class='add'>+	struct netfs_io_subrequest *subreq =</div><div class='add'>+		list_first_entry(&amp;stream-&gt;subrequests,</div><div class='add'>+				 struct netfs_io_subrequest, rreq_link);</div><div class='add'>+</div><div class='add'>+	switch (wreq-&gt;origin) {</div><div class='add'>+	case NETFS_READAHEAD:</div><div class='add'>+	case NETFS_READPAGE:</div><div class='add'>+	case NETFS_READ_GAPS:</div><div class='add'>+	case NETFS_READ_SINGLE:</div><div class='add'>+	case NETFS_READ_FOR_WRITE:</div><div class='add'>+	case NETFS_UNBUFFERED_READ:</div><div class='add'>+	case NETFS_DIO_READ:</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	subreq = netfs_create_write_request(wreq, NETFS_UPLOAD_TO_SERVER,</div><div class='del'>-					    start, len, afs_upload_to_server_worker);</div><div class='del'>-	if (subreq)</div><div class='del'>-		netfs_queue_write_request(subreq);</div><div class='add'>+	switch (subreq-&gt;error) {</div><div class='add'>+	case -EACCES:</div><div class='add'>+	case -EPERM:</div><div class='add'>+	case -ENOKEY:</div><div class='add'>+	case -EKEYEXPIRED:</div><div class='add'>+	case -EKEYREJECTED:</div><div class='add'>+	case -EKEYREVOKED:</div><div class='add'>+		afs_get_writeback_key(wreq);</div><div class='add'>+		if (!wreq-&gt;netfs_priv)</div><div class='add'>+			stream-&gt;failed = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/afs/xdr_fs.h b/fs/afs/xdr_fs.h<br/>index 8ca868164507..cc5f143d21a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/xdr_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/xdr_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/xdr_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/xdr_fs.h</a></div><div class='hunk'>@@ -88,7 +88,7 @@ union afs_xdr_dir_block {</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct afs_xdr_dir_hdr	hdr;</div><div class='del'>-		u8			alloc_ctrs[AFS_DIR_MAX_BLOCKS];</div><div class='add'>+		u8			alloc_ctrs[AFS_DIR_BLOCKS_WITH_CTR];</div><div class='ctx'> 		__be16			hashtable[AFS_DIR_HASHTBL_SIZE];</div><div class='ctx'> 	} meta;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c<br/>index f521e66d3bf6..febf13a49f0b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/afs/yfsclient.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/afs/yfsclient.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/afs/yfsclient.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/afs/yfsclient.c</a></div><div class='hunk'>@@ -352,18 +352,19 @@ static int yfs_deliver_status_and_volsync(struct afs_call *call)</div><div class='ctx'> static int yfs_deliver_fs_fetch_data64(struct afs_call *call)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_operation *op = call-&gt;op;</div><div class='add'>+	struct netfs_io_subrequest *subreq = op-&gt;fetch.subreq;</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[0];</div><div class='del'>-	struct afs_read *req = op-&gt;fetch.req;</div><div class='ctx'> 	const __be32 *bp;</div><div class='add'>+	size_t count_before;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%u,%zu, %zu/%llu}",</div><div class='ctx'> 	       call-&gt;unmarshall, call-&gt;iov_len, iov_iter_count(call-&gt;iter),</div><div class='del'>-	       req-&gt;actual_len);</div><div class='add'>+	       call-&gt;remaining);</div><div class='ctx'> </div><div class='ctx'> 	switch (call-&gt;unmarshall) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		req-&gt;actual_len = 0;</div><div class='add'>+		call-&gt;remaining = 0;</div><div class='ctx'> 		afs_extract_to_tmp64(call);</div><div class='ctx'> 		call-&gt;unmarshall++;</div><div class='ctx'> 		fallthrough;</div><div class='hunk'>@@ -378,38 +379,39 @@ static int yfs_deliver_fs_fetch_data64(struct afs_call *call)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		req-&gt;actual_len = be64_to_cpu(call-&gt;tmp64);</div><div class='del'>-		_debug("DATA length: %llu", req-&gt;actual_len);</div><div class='add'>+		call-&gt;remaining = be64_to_cpu(call-&gt;tmp64);</div><div class='add'>+		_debug("DATA length: %llu", call-&gt;remaining);</div><div class='ctx'> </div><div class='del'>-		if (req-&gt;actual_len == 0)</div><div class='add'>+		if (call-&gt;remaining == 0)</div><div class='ctx'> 			goto no_more_data;</div><div class='ctx'> </div><div class='del'>-		call-&gt;iter = req-&gt;iter;</div><div class='del'>-		call-&gt;iov_len = min(req-&gt;actual_len, req-&gt;len);</div><div class='add'>+		call-&gt;iter = &amp;subreq-&gt;io_iter;</div><div class='add'>+		call-&gt;iov_len = min(call-&gt;remaining, subreq-&gt;len - subreq-&gt;transferred);</div><div class='ctx'> 		call-&gt;unmarshall++;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 		/* extract the returned data */</div><div class='ctx'> 	case 2:</div><div class='del'>-		_debug("extract data %zu/%llu",</div><div class='del'>-		       iov_iter_count(call-&gt;iter), req-&gt;actual_len);</div><div class='add'>+		count_before = call-&gt;iov_len;</div><div class='add'>+		_debug("extract data %zu/%llu", count_before, call-&gt;remaining);</div><div class='ctx'> </div><div class='ctx'> 		ret = afs_extract_data(call, true);</div><div class='add'>+		subreq-&gt;transferred += count_before - call-&gt;iov_len;</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		call-&gt;iter = &amp;call-&gt;def_iter;</div><div class='del'>-		if (req-&gt;actual_len &lt;= req-&gt;len)</div><div class='add'>+		if (call-&gt;remaining)</div><div class='ctx'> 			goto no_more_data;</div><div class='ctx'> </div><div class='ctx'> 		/* Discard any excess data the server gave us */</div><div class='del'>-		afs_extract_discard(call, req-&gt;actual_len - req-&gt;len);</div><div class='add'>+		afs_extract_discard(call, call-&gt;remaining);</div><div class='ctx'> 		call-&gt;unmarshall = 3;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case 3:</div><div class='ctx'> 		_debug("extract discard %zu/%llu",</div><div class='del'>-		       iov_iter_count(call-&gt;iter), req-&gt;actual_len - req-&gt;len);</div><div class='add'>+		       iov_iter_count(call-&gt;iter), call-&gt;remaining);</div><div class='ctx'> </div><div class='ctx'> 		ret = afs_extract_data(call, true);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -434,8 +436,8 @@ static int yfs_deliver_fs_fetch_data64(struct afs_call *call)</div><div class='ctx'> 		xdr_decode_YFSCallBack(&amp;bp, call, &amp;vp-&gt;scb);</div><div class='ctx'> 		xdr_decode_YFSVolSync(&amp;bp, &amp;op-&gt;volsync);</div><div class='ctx'> </div><div class='del'>-		req-&gt;data_version = vp-&gt;scb.status.data_version;</div><div class='del'>-		req-&gt;file_size = vp-&gt;scb.status.size;</div><div class='add'>+		if (subreq-&gt;start + subreq-&gt;transferred &gt;= vp-&gt;scb.status.size)</div><div class='add'>+			__set_bit(NETFS_SREQ_HIT_EOF, &amp;subreq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		call-&gt;unmarshall++;</div><div class='ctx'> 		fallthrough;</div><div class='hunk'>@@ -454,7 +456,9 @@ static int yfs_deliver_fs_fetch_data64(struct afs_call *call)</div><div class='ctx'> static const struct afs_call_type yfs_RXYFSFetchData64 = {</div><div class='ctx'> 	.name		= "YFS.FetchData64",</div><div class='ctx'> 	.op		= yfs_FS_FetchData64,</div><div class='add'>+	.async_rx	= afs_fetch_data_async_rx,</div><div class='ctx'> 	.deliver	= yfs_deliver_fs_fetch_data64,</div><div class='add'>+	.immediate_cancel = afs_fetch_data_immediate_cancel,</div><div class='ctx'> 	.destructor	= afs_flat_call_destructor,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -463,14 +467,15 @@ static const struct afs_call_type yfs_RXYFSFetchData64 = {</div><div class='ctx'>  */</div><div class='ctx'> void yfs_fs_fetch_data(struct afs_operation *op)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_io_subrequest *subreq = op-&gt;fetch.subreq;</div><div class='ctx'> 	struct afs_vnode_param *vp = &amp;op-&gt;file[0];</div><div class='del'>-	struct afs_read *req = op-&gt;fetch.req;</div><div class='ctx'> 	struct afs_call *call;</div><div class='ctx'> 	__be32 *bp;</div><div class='ctx'> </div><div class='del'>-	_enter(",%x,{%llx:%llu},%llx,%llx",</div><div class='add'>+	_enter(",%x,{%llx:%llu},%llx,%zx",</div><div class='ctx'> 	       key_serial(op-&gt;key), vp-&gt;fid.vid, vp-&gt;fid.vnode,</div><div class='del'>-	       req-&gt;pos, req-&gt;len);</div><div class='add'>+	       subreq-&gt;start + subreq-&gt;transferred,</div><div class='add'>+	       subreq-&gt;len   - subreq-&gt;transferred);</div><div class='ctx'> </div><div class='ctx'> 	call = afs_alloc_flat_call(op-&gt;net, &amp;yfs_RXYFSFetchData64,</div><div class='ctx'> 				   sizeof(__be32) * 2 +</div><div class='hunk'>@@ -482,15 +487,16 @@ void yfs_fs_fetch_data(struct afs_operation *op)</div><div class='ctx'> 	if (!call)</div><div class='ctx'> 		return afs_op_nomem(op);</div><div class='ctx'> </div><div class='del'>-	req-&gt;call_debug_id = call-&gt;debug_id;</div><div class='add'>+	if (op-&gt;flags &amp; AFS_OPERATION_ASYNC)</div><div class='add'>+		call-&gt;async = true;</div><div class='ctx'> </div><div class='ctx'> 	/* marshall the parameters */</div><div class='ctx'> 	bp = call-&gt;request;</div><div class='ctx'> 	bp = xdr_encode_u32(bp, YFSFETCHDATA64);</div><div class='ctx'> 	bp = xdr_encode_u32(bp, 0); /* RPC flags */</div><div class='ctx'> 	bp = xdr_encode_YFSFid(bp, &amp;vp-&gt;fid);</div><div class='del'>-	bp = xdr_encode_u64(bp, req-&gt;pos);</div><div class='del'>-	bp = xdr_encode_u64(bp, req-&gt;len);</div><div class='add'>+	bp = xdr_encode_u64(bp, subreq-&gt;start + subreq-&gt;transferred);</div><div class='add'>+	bp = xdr_encode_u64(bp, subreq-&gt;len   - subreq-&gt;transferred);</div><div class='ctx'> 	yfs_check_req(call, bp);</div><div class='ctx'> </div><div class='ctx'> 	call-&gt;fid = vp-&gt;fid;</div><div class='hunk'>@@ -661,8 +667,9 @@ static int yfs_deliver_fs_remove_file2(struct afs_call *call)</div><div class='ctx'> static void yfs_done_fs_remove_file2(struct afs_call *call)</div><div class='ctx'> {</div><div class='ctx'> 	if (call-&gt;error == -ECONNABORTED &amp;&amp;</div><div class='del'>-	    call-&gt;abort_code == RX_INVALID_OPERATION) {</div><div class='del'>-		set_bit(AFS_SERVER_FL_NO_RM2, &amp;call-&gt;server-&gt;flags);</div><div class='add'>+	    (call-&gt;abort_code == RX_INVALID_OPERATION ||</div><div class='add'>+	     call-&gt;abort_code == RXGEN_OPCODE)) {</div><div class='add'>+		set_bit(AFS_SERVER_FL_NO_RM2, &amp;call-&gt;op-&gt;server-&gt;flags);</div><div class='ctx'> 		call-&gt;op-&gt;flags |= AFS_OPERATION_DOWNGRADE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1035,6 +1042,9 @@ void yfs_fs_rename(struct afs_operation *op)</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='add'>+	if (!test_bit(AFS_SERVER_FL_NO_RENAME2, &amp;op-&gt;server-&gt;flags))</div><div class='add'>+		return yfs_fs_rename_replace(op);</div><div class='add'>+</div><div class='ctx'> 	call = afs_alloc_flat_call(op-&gt;net, &amp;yfs_RXYFSRename,</div><div class='ctx'> 				   sizeof(__be32) +</div><div class='ctx'> 				   sizeof(struct yfs_xdr_RPCFlags) +</div><div class='hunk'>@@ -1064,6 +1074,252 @@ void yfs_fs_rename(struct afs_operation *op)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Deliver reply data to a YFS.Rename_NoReplace operation.  This does not</div><div class='add'>+ * return the status of a displaced target inode as there cannot be one.</div><div class='add'>+ */</div><div class='add'>+static int yfs_deliver_fs_rename_1(struct afs_call *call)</div><div class='add'>+{</div><div class='add'>+	struct afs_operation *op = call-&gt;op;</div><div class='add'>+	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='add'>+	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='add'>+	struct afs_vnode_param *old_vp = &amp;op-&gt;more_files[0];</div><div class='add'>+	const __be32 *bp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	_enter("{%u}", call-&gt;unmarshall);</div><div class='add'>+</div><div class='add'>+	ret = afs_transfer_reply(call);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bp = call-&gt;buffer;</div><div class='add'>+	/* If the two dirs are the same, we have two copies of the same status</div><div class='add'>+	 * report, so we just decode it twice.</div><div class='add'>+	 */</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;orig_dvp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSFid(&amp;bp, &amp;old_vp-&gt;fid);</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;old_vp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;new_dvp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSVolSync(&amp;bp, &amp;op-&gt;volsync);</div><div class='add'>+	_leave(" = 0 [done]");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Deliver reply data to a YFS.Rename_Replace or a YFS.Rename_Exchange</div><div class='add'>+ * operation.  These return the status of the displaced target inode if there</div><div class='add'>+ * was one.</div><div class='add'>+ */</div><div class='add'>+static int yfs_deliver_fs_rename_2(struct afs_call *call)</div><div class='add'>+{</div><div class='add'>+	struct afs_operation *op = call-&gt;op;</div><div class='add'>+	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='add'>+	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='add'>+	struct afs_vnode_param *old_vp = &amp;op-&gt;more_files[0];</div><div class='add'>+	struct afs_vnode_param *new_vp = &amp;op-&gt;more_files[1];</div><div class='add'>+	const __be32 *bp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	_enter("{%u}", call-&gt;unmarshall);</div><div class='add'>+</div><div class='add'>+	ret = afs_transfer_reply(call);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bp = call-&gt;buffer;</div><div class='add'>+	/* If the two dirs are the same, we have two copies of the same status</div><div class='add'>+	 * report, so we just decode it twice.</div><div class='add'>+	 */</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;orig_dvp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSFid(&amp;bp, &amp;old_vp-&gt;fid);</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;old_vp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;new_dvp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSFid(&amp;bp, &amp;new_vp-&gt;fid);</div><div class='add'>+	xdr_decode_YFSFetchStatus(&amp;bp, call, &amp;new_vp-&gt;scb);</div><div class='add'>+	xdr_decode_YFSVolSync(&amp;bp, &amp;op-&gt;volsync);</div><div class='add'>+	_leave(" = 0 [done]");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void yfs_done_fs_rename_replace(struct afs_call *call)</div><div class='add'>+{</div><div class='add'>+	if (call-&gt;error == -ECONNABORTED &amp;&amp;</div><div class='add'>+	    (call-&gt;abort_code == RX_INVALID_OPERATION ||</div><div class='add'>+	     call-&gt;abort_code == RXGEN_OPCODE)) {</div><div class='add'>+		set_bit(AFS_SERVER_FL_NO_RENAME2, &amp;call-&gt;op-&gt;server-&gt;flags);</div><div class='add'>+		call-&gt;op-&gt;flags |= AFS_OPERATION_DOWNGRADE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * YFS.Rename_Replace operation type</div><div class='add'>+ */</div><div class='add'>+static const struct afs_call_type yfs_RXYFSRename_Replace = {</div><div class='add'>+	.name		= "FS.Rename_Replace",</div><div class='add'>+	.op		= yfs_FS_Rename_Replace,</div><div class='add'>+	.deliver	= yfs_deliver_fs_rename_2,</div><div class='add'>+	.done		= yfs_done_fs_rename_replace,</div><div class='add'>+	.destructor	= afs_flat_call_destructor,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * YFS.Rename_NoReplace operation type</div><div class='add'>+ */</div><div class='add'>+static const struct afs_call_type yfs_RXYFSRename_NoReplace = {</div><div class='add'>+	.name		= "FS.Rename_NoReplace",</div><div class='add'>+	.op		= yfs_FS_Rename_NoReplace,</div><div class='add'>+	.deliver	= yfs_deliver_fs_rename_1,</div><div class='add'>+	.destructor	= afs_flat_call_destructor,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * YFS.Rename_Exchange operation type</div><div class='add'>+ */</div><div class='add'>+static const struct afs_call_type yfs_RXYFSRename_Exchange = {</div><div class='add'>+	.name		= "FS.Rename_Exchange",</div><div class='add'>+	.op		= yfs_FS_Rename_Exchange,</div><div class='add'>+	.deliver	= yfs_deliver_fs_rename_2,</div><div class='add'>+	.destructor	= afs_flat_call_destructor,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rename a file or directory, replacing the target if it exists.  The status</div><div class='add'>+ * of a displaced target is returned.</div><div class='add'>+ */</div><div class='add'>+void yfs_fs_rename_replace(struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='add'>+	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='add'>+	const struct qstr *orig_name = &amp;op-&gt;dentry-&gt;d_name;</div><div class='add'>+	const struct qstr *new_name = &amp;op-&gt;dentry_2-&gt;d_name;</div><div class='add'>+	struct afs_call *call;</div><div class='add'>+	__be32 *bp;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	call = afs_alloc_flat_call(op-&gt;net, &amp;yfs_RXYFSRename_Replace,</div><div class='add'>+				   sizeof(__be32) +</div><div class='add'>+				   sizeof(struct yfs_xdr_RPCFlags) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   xdr_strlen(orig_name-&gt;len) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   xdr_strlen(new_name-&gt;len),</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSVolSync));</div><div class='add'>+	if (!call)</div><div class='add'>+		return afs_op_nomem(op);</div><div class='add'>+</div><div class='add'>+	/* Marshall the parameters. */</div><div class='add'>+	bp = call-&gt;request;</div><div class='add'>+	bp = xdr_encode_u32(bp, YFSRENAME_REPLACE);</div><div class='add'>+	bp = xdr_encode_u32(bp, 0); /* RPC flags */</div><div class='add'>+	bp = xdr_encode_YFSFid(bp, &amp;orig_dvp-&gt;fid);</div><div class='add'>+	bp = xdr_encode_name(bp, orig_name);</div><div class='add'>+	bp = xdr_encode_YFSFid(bp, &amp;new_dvp-&gt;fid);</div><div class='add'>+	bp = xdr_encode_name(bp, new_name);</div><div class='add'>+	yfs_check_req(call, bp);</div><div class='add'>+</div><div class='add'>+	call-&gt;fid = orig_dvp-&gt;fid;</div><div class='add'>+	trace_afs_make_fs_call2(call, &amp;orig_dvp-&gt;fid, orig_name, new_name);</div><div class='add'>+	afs_make_op_call(op, call, GFP_NOFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rename a file or directory, failing if the target dirent exists.</div><div class='add'>+ */</div><div class='add'>+void yfs_fs_rename_noreplace(struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='add'>+	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='add'>+	const struct qstr *orig_name = &amp;op-&gt;dentry-&gt;d_name;</div><div class='add'>+	const struct qstr *new_name = &amp;op-&gt;dentry_2-&gt;d_name;</div><div class='add'>+	struct afs_call *call;</div><div class='add'>+	__be32 *bp;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	call = afs_alloc_flat_call(op-&gt;net, &amp;yfs_RXYFSRename_NoReplace,</div><div class='add'>+				   sizeof(__be32) +</div><div class='add'>+				   sizeof(struct yfs_xdr_RPCFlags) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   xdr_strlen(orig_name-&gt;len) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   xdr_strlen(new_name-&gt;len),</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSVolSync));</div><div class='add'>+	if (!call)</div><div class='add'>+		return afs_op_nomem(op);</div><div class='add'>+</div><div class='add'>+	/* Marshall the parameters. */</div><div class='add'>+	bp = call-&gt;request;</div><div class='add'>+	bp = xdr_encode_u32(bp, YFSRENAME_NOREPLACE);</div><div class='add'>+	bp = xdr_encode_u32(bp, 0); /* RPC flags */</div><div class='add'>+	bp = xdr_encode_YFSFid(bp, &amp;orig_dvp-&gt;fid);</div><div class='add'>+	bp = xdr_encode_name(bp, orig_name);</div><div class='add'>+	bp = xdr_encode_YFSFid(bp, &amp;new_dvp-&gt;fid);</div><div class='add'>+	bp = xdr_encode_name(bp, new_name);</div><div class='add'>+	yfs_check_req(call, bp);</div><div class='add'>+</div><div class='add'>+	call-&gt;fid = orig_dvp-&gt;fid;</div><div class='add'>+	trace_afs_make_fs_call2(call, &amp;orig_dvp-&gt;fid, orig_name, new_name);</div><div class='add'>+	afs_make_op_call(op, call, GFP_NOFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exchange a pair of files directories.</div><div class='add'>+ */</div><div class='add'>+void yfs_fs_rename_exchange(struct afs_operation *op)</div><div class='add'>+{</div><div class='add'>+	struct afs_vnode_param *orig_dvp = &amp;op-&gt;file[0];</div><div class='add'>+	struct afs_vnode_param *new_dvp = &amp;op-&gt;file[1];</div><div class='add'>+	const struct qstr *orig_name = &amp;op-&gt;dentry-&gt;d_name;</div><div class='add'>+	const struct qstr *new_name = &amp;op-&gt;dentry_2-&gt;d_name;</div><div class='add'>+	struct afs_call *call;</div><div class='add'>+	__be32 *bp;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	call = afs_alloc_flat_call(op-&gt;net, &amp;yfs_RXYFSRename_Exchange,</div><div class='add'>+				   sizeof(__be32) +</div><div class='add'>+				   sizeof(struct yfs_xdr_RPCFlags) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   xdr_strlen(orig_name-&gt;len) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   xdr_strlen(new_name-&gt;len),</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFid) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSFetchStatus) +</div><div class='add'>+				   sizeof(struct yfs_xdr_YFSVolSync));</div><div class='add'>+	if (!call)</div><div class='add'>+		return afs_op_nomem(op);</div><div class='add'>+</div><div class='add'>+	/* Marshall the parameters. */</div><div class='add'>+	bp = call-&gt;request;</div><div class='add'>+	bp = xdr_encode_u32(bp, YFSRENAME_EXCHANGE);</div><div class='add'>+	bp = xdr_encode_u32(bp, 0); /* RPC flags */</div><div class='add'>+	bp = xdr_encode_YFSFid(bp, &amp;orig_dvp-&gt;fid);</div><div class='add'>+	bp = xdr_encode_name(bp, orig_name);</div><div class='add'>+	bp = xdr_encode_YFSFid(bp, &amp;new_dvp-&gt;fid);</div><div class='add'>+	bp = xdr_encode_name(bp, new_name);</div><div class='add'>+	yfs_check_req(call, bp);</div><div class='add'>+</div><div class='add'>+	call-&gt;fid = orig_dvp-&gt;fid;</div><div class='add'>+	trace_afs_make_fs_call2(call, &amp;orig_dvp-&gt;fid, orig_name, new_name);</div><div class='add'>+	afs_make_op_call(op, call, GFP_NOFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * YFS.StoreData64 operation type.</div><div class='ctx'>  */</div><div class='ctx'> static const struct afs_call_type yfs_RXYFSStoreData64 = {</div><div class='head'>diff --git a/fs/aio.c b/fs/aio.c<br/>index bb2ff48991f3..0a23a8c0717f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/aio.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/aio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/aio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/aio.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ struct kioctx {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		user_id;</div><div class='ctx'> </div><div class='del'>-	struct __percpu kioctx_cpu *cpu;</div><div class='add'>+	struct kioctx_cpu __percpu *cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For percpu reqs_available, number of slots we move to/from global</div><div class='hunk'>@@ -122,7 +122,7 @@ struct kioctx {</div><div class='ctx'> 	unsigned long		mmap_base;</div><div class='ctx'> 	unsigned long		mmap_size;</div><div class='ctx'> </div><div class='del'>-	struct page		**ring_pages;</div><div class='add'>+	struct folio		**ring_folios;</div><div class='ctx'> 	long			nr_pages;</div><div class='ctx'> </div><div class='ctx'> 	struct rcu_work		free_rwork;	/* see free_ioctx() */</div><div class='hunk'>@@ -160,7 +160,7 @@ struct kioctx {</div><div class='ctx'> 		spinlock_t	completion_lock;</div><div class='ctx'> 	} ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='del'>-	struct page		*internal_pages[AIO_RING_PAGES];</div><div class='add'>+	struct folio		*internal_folios[AIO_RING_PAGES];</div><div class='ctx'> 	struct file		*aio_ring_file;</div><div class='ctx'> </div><div class='ctx'> 	unsigned		id;</div><div class='hunk'>@@ -224,7 +224,7 @@ static unsigned long aio_nr;		/* current system wide number of aio requests */</div><div class='ctx'> static unsigned long aio_max_nr = 0x10000; /* system wide maximum number of aio requests */</div><div class='ctx'> /*----end sysctl variables---*/</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static struct ctl_table aio_sysctls[] = {</div><div class='add'>+static const struct ctl_table aio_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "aio-nr",</div><div class='ctx'> 		.data		= &amp;aio_nr,</div><div class='hunk'>@@ -334,19 +334,20 @@ static void aio_free_ring(struct kioctx *ctx)</div><div class='ctx'> 	put_aio_ring_file(ctx);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ctx-&gt;nr_pages; i++) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		pr_debug("pid(%d) [%d] page-&gt;count=%d\n", current-&gt;pid, i,</div><div class='del'>-				page_count(ctx-&gt;ring_pages[i]));</div><div class='del'>-		page = ctx-&gt;ring_pages[i];</div><div class='del'>-		if (!page)</div><div class='add'>+		struct folio *folio = ctx-&gt;ring_folios[i];</div><div class='add'>+</div><div class='add'>+		if (!folio)</div><div class='ctx'> 			continue;</div><div class='del'>-		ctx-&gt;ring_pages[i] = NULL;</div><div class='del'>-		put_page(page);</div><div class='add'>+</div><div class='add'>+		pr_debug("pid(%d) [%d] folio-&gt;count=%d\n", current-&gt;pid, i,</div><div class='add'>+			 folio_ref_count(folio));</div><div class='add'>+		ctx-&gt;ring_folios[i] = NULL;</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;ring_pages &amp;&amp; ctx-&gt;ring_pages != ctx-&gt;internal_pages) {</div><div class='del'>-		kfree(ctx-&gt;ring_pages);</div><div class='del'>-		ctx-&gt;ring_pages = NULL;</div><div class='add'>+	if (ctx-&gt;ring_folios &amp;&amp; ctx-&gt;ring_folios != ctx-&gt;internal_folios) {</div><div class='add'>+		kfree(ctx-&gt;ring_folios);</div><div class='add'>+		ctx-&gt;ring_folios = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -391,15 +392,15 @@ static const struct vm_operations_struct aio_ring_vm_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int aio_ring_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int aio_ring_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	vm_flags_set(vma, VM_DONTEXPAND);</div><div class='del'>-	vma-&gt;vm_ops = &amp;aio_ring_vm_ops;</div><div class='add'>+	desc-&gt;vm_flags |= VM_DONTEXPAND;</div><div class='add'>+	desc-&gt;vm_ops = &amp;aio_ring_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations aio_ring_fops = {</div><div class='del'>-	.mmap = aio_ring_mmap,</div><div class='add'>+	.mmap_prepare = aio_ring_mmap_prepare,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_MIGRATION)</div><div class='hunk'>@@ -409,17 +410,7 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,</div><div class='ctx'> 	struct kioctx *ctx;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	pgoff_t idx;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We cannot support the _NO_COPY case here, because copy needs to</div><div class='del'>-	 * happen under the ctx-&gt;completion_lock. That does not work with the</div><div class='del'>-	 * migration workflow of MIGRATE_SYNC_NO_COPY.</div><div class='del'>-	 */</div><div class='del'>-	if (mode == MIGRATE_SYNC_NO_COPY)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	rc = 0;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* mapping-&gt;i_private_lock here protects against the kioctx teardown.  */</div><div class='ctx'> 	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='hunk'>@@ -441,7 +432,7 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,</div><div class='ctx'> 	idx = src-&gt;index;</div><div class='ctx'> 	if (idx &lt; (pgoff_t)ctx-&gt;nr_pages) {</div><div class='ctx'> 		/* Make sure the old folio hasn't already been changed */</div><div class='del'>-		if (ctx-&gt;ring_pages[idx] != &amp;src-&gt;page)</div><div class='add'>+		if (ctx-&gt;ring_folios[idx] != src)</div><div class='ctx'> 			rc = -EAGAIN;</div><div class='ctx'> 	} else</div><div class='ctx'> 		rc = -EINVAL;</div><div class='hunk'>@@ -454,7 +445,7 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,</div><div class='ctx'> 	folio_get(dst);</div><div class='ctx'> </div><div class='ctx'> 	rc = folio_migrate_mapping(mapping, dst, src, 1);</div><div class='del'>-	if (rc != MIGRATEPAGE_SUCCESS) {</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		folio_put(dst);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -464,9 +455,10 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,</div><div class='ctx'> 	 * events from being lost.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irqsave(&amp;ctx-&gt;completion_lock, flags);</div><div class='del'>-	folio_migrate_copy(dst, src);</div><div class='del'>-	BUG_ON(ctx-&gt;ring_pages[idx] != &amp;src-&gt;page);</div><div class='del'>-	ctx-&gt;ring_pages[idx] = &amp;dst-&gt;page;</div><div class='add'>+	folio_copy(dst, src);</div><div class='add'>+	folio_migrate_flags(dst, src);</div><div class='add'>+	BUG_ON(ctx-&gt;ring_folios[idx] != src);</div><div class='add'>+	ctx-&gt;ring_folios[idx] = dst;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ctx-&gt;completion_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* The old folio is no longer accessible. */</div><div class='hunk'>@@ -516,28 +508,30 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)</div><div class='ctx'> 	nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring))</div><div class='ctx'> 			/ sizeof(struct io_event);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;ring_pages = ctx-&gt;internal_pages;</div><div class='add'>+	ctx-&gt;ring_folios = ctx-&gt;internal_folios;</div><div class='ctx'> 	if (nr_pages &gt; AIO_RING_PAGES) {</div><div class='del'>-		ctx-&gt;ring_pages = kcalloc(nr_pages, sizeof(struct page *),</div><div class='del'>-					  GFP_KERNEL);</div><div class='del'>-		if (!ctx-&gt;ring_pages) {</div><div class='add'>+		ctx-&gt;ring_folios = kcalloc(nr_pages, sizeof(struct folio *),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!ctx-&gt;ring_folios) {</div><div class='ctx'> 			put_aio_ring_file(ctx);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		page = find_or_create_page(file-&gt;f_mapping,</div><div class='del'>-					   i, GFP_USER | __GFP_ZERO);</div><div class='del'>-		if (!page)</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='add'>+		folio = __filemap_get_folio(file-&gt;f_mapping, i,</div><div class='add'>+					    FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					    GFP_USER | __GFP_ZERO);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			break;</div><div class='del'>-		pr_debug("pid(%d) page[%d]-&gt;count=%d\n",</div><div class='del'>-			 current-&gt;pid, i, page_count(page));</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='ctx'> </div><div class='del'>-		ctx-&gt;ring_pages[i] = page;</div><div class='add'>+		pr_debug("pid(%d) [%d] folio-&gt;count=%d\n", current-&gt;pid, i,</div><div class='add'>+			 folio_ref_count(folio));</div><div class='add'>+		folio_end_read(folio, true);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;ring_folios[i] = folio;</div><div class='ctx'> 	}</div><div class='ctx'> 	ctx-&gt;nr_pages = i;</div><div class='ctx'> </div><div class='hunk'>@@ -570,7 +564,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)</div><div class='ctx'> 	ctx-&gt;user_id = ctx-&gt;mmap_base;</div><div class='ctx'> 	ctx-&gt;nr_events = nr_events; /* trusted copy */</div><div class='ctx'> </div><div class='del'>-	ring = page_address(ctx-&gt;ring_pages[0]);</div><div class='add'>+	ring = folio_address(ctx-&gt;ring_folios[0]);</div><div class='ctx'> 	ring-&gt;nr = nr_events;	/* user copy */</div><div class='ctx'> 	ring-&gt;id = ~0U;</div><div class='ctx'> 	ring-&gt;head = ring-&gt;tail = 0;</div><div class='hunk'>@@ -578,7 +572,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)</div><div class='ctx'> 	ring-&gt;compat_features = AIO_RING_COMPAT_FEATURES;</div><div class='ctx'> 	ring-&gt;incompat_features = AIO_RING_INCOMPAT_FEATURES;</div><div class='ctx'> 	ring-&gt;header_length = sizeof(struct aio_ring);</div><div class='del'>-	flush_dcache_page(ctx-&gt;ring_pages[0]);</div><div class='add'>+	flush_dcache_folio(ctx-&gt;ring_folios[0]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -589,13 +583,24 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)</div><div class='ctx'> </div><div class='ctx'> void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)</div><div class='ctx'> {</div><div class='del'>-	struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw);</div><div class='del'>-	struct kioctx *ctx = req-&gt;ki_ctx;</div><div class='add'>+	struct aio_kiocb *req;</div><div class='add'>+	struct kioctx *ctx;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * kiocb didn't come from aio or is neither a read nor a write, hence</div><div class='add'>+	 * ignore it.</div><div class='add'>+	 */</div><div class='add'>+	if (!(iocb-&gt;ki_flags &amp; IOCB_AIO_RW))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req = container_of(iocb, struct aio_kiocb, rw);</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON_ONCE(!list_empty(&amp;req-&gt;ki_list)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	ctx = req-&gt;ki_ctx;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;ctx-&gt;ctx_lock, flags);</div><div class='ctx'> 	list_add_tail(&amp;req-&gt;ki_list, &amp;ctx-&gt;active_reqs);</div><div class='ctx'> 	req-&gt;ki_cancel = cancel;</div><div class='hunk'>@@ -631,7 +636,7 @@ static void free_ioctx_reqs(struct percpu_ref *ref)</div><div class='ctx'> </div><div class='ctx'> 	/* Synchronize against RCU protected table-&gt;table[] dereferences */</div><div class='ctx'> 	INIT_RCU_WORK(&amp;ctx-&gt;free_rwork, free_ioctx);</div><div class='del'>-	queue_rcu_work(system_wq, &amp;ctx-&gt;free_rwork);</div><div class='add'>+	queue_rcu_work(system_percpu_wq, &amp;ctx-&gt;free_rwork);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -678,9 +683,9 @@ static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> 					/* While kioctx setup is in progress,</div><div class='ctx'> 					 * we are protected from page migration</div><div class='del'>-					 * changes ring_pages by -&gt;ring_lock.</div><div class='add'>+					 * changes ring_folios by -&gt;ring_lock.</div><div class='ctx'> 					 */</div><div class='del'>-					ring = page_address(ctx-&gt;ring_pages[0]);</div><div class='add'>+					ring = folio_address(ctx-&gt;ring_folios[0]);</div><div class='ctx'> 					ring-&gt;id = ctx-&gt;id;</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1022,7 +1027,7 @@ static void user_refill_reqs_available(struct kioctx *ctx)</div><div class='ctx'> 		 * against ctx-&gt;completed_events below will make sure we do the</div><div class='ctx'> 		 * safe/right thing.</div><div class='ctx'> 		 */</div><div class='del'>-		ring = page_address(ctx-&gt;ring_pages[0]);</div><div class='add'>+		ring = folio_address(ctx-&gt;ring_folios[0]);</div><div class='ctx'> 		head = ring-&gt;head;</div><div class='ctx'> </div><div class='ctx'> 		refill_reqs_available(ctx, head, ctx-&gt;tail);</div><div class='hunk'>@@ -1134,12 +1139,12 @@ static void aio_complete(struct aio_kiocb *iocb)</div><div class='ctx'> 	if (++tail &gt;= ctx-&gt;nr_events)</div><div class='ctx'> 		tail = 0;</div><div class='ctx'> </div><div class='del'>-	ev_page = page_address(ctx-&gt;ring_pages[pos / AIO_EVENTS_PER_PAGE]);</div><div class='add'>+	ev_page = folio_address(ctx-&gt;ring_folios[pos / AIO_EVENTS_PER_PAGE]);</div><div class='ctx'> 	event = ev_page + pos % AIO_EVENTS_PER_PAGE;</div><div class='ctx'> </div><div class='ctx'> 	*event = iocb-&gt;ki_res;</div><div class='ctx'> </div><div class='del'>-	flush_dcache_page(ctx-&gt;ring_pages[pos / AIO_EVENTS_PER_PAGE]);</div><div class='add'>+	flush_dcache_folio(ctx-&gt;ring_folios[pos / AIO_EVENTS_PER_PAGE]);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%p[%u]: %p: %p %Lx %Lx %Lx\n", ctx, tail, iocb,</div><div class='ctx'> 		 (void __user *)(unsigned long)iocb-&gt;ki_res.obj,</div><div class='hunk'>@@ -1152,10 +1157,10 @@ static void aio_complete(struct aio_kiocb *iocb)</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;tail = tail;</div><div class='ctx'> </div><div class='del'>-	ring = page_address(ctx-&gt;ring_pages[0]);</div><div class='add'>+	ring = folio_address(ctx-&gt;ring_folios[0]);</div><div class='ctx'> 	head = ring-&gt;head;</div><div class='ctx'> 	ring-&gt;tail = tail;</div><div class='del'>-	flush_dcache_page(ctx-&gt;ring_pages[0]);</div><div class='add'>+	flush_dcache_folio(ctx-&gt;ring_folios[0]);</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;completed_events++;</div><div class='ctx'> 	if (ctx-&gt;completed_events &gt; 1)</div><div class='hunk'>@@ -1191,8 +1196,8 @@ static void aio_complete(struct aio_kiocb *iocb)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ctx-&gt;wait.lock, flags);</div><div class='ctx'> 		list_for_each_entry_safe(curr, next, &amp;ctx-&gt;wait.head, w.entry)</div><div class='ctx'> 			if (avail &gt;= curr-&gt;min_nr) {</div><div class='del'>-				list_del_init_careful(&amp;curr-&gt;w.entry);</div><div class='ctx'> 				wake_up_process(curr-&gt;w.private);</div><div class='add'>+				list_del_init_careful(&amp;curr-&gt;w.entry);</div><div class='ctx'> 			}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ctx-&gt;wait.lock, flags);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1227,8 +1232,8 @@ static long aio_read_events_ring(struct kioctx *ctx,</div><div class='ctx'> 	sched_annotate_sleep();</div><div class='ctx'> 	mutex_lock(&amp;ctx-&gt;ring_lock);</div><div class='ctx'> </div><div class='del'>-	/* Access to -&gt;ring_pages here is protected by ctx-&gt;ring_lock. */</div><div class='del'>-	ring = page_address(ctx-&gt;ring_pages[0]);</div><div class='add'>+	/* Access to -&gt;ring_folios here is protected by ctx-&gt;ring_lock. */</div><div class='add'>+	ring = folio_address(ctx-&gt;ring_folios[0]);</div><div class='ctx'> 	head = ring-&gt;head;</div><div class='ctx'> 	tail = ring-&gt;tail;</div><div class='ctx'> </div><div class='hunk'>@@ -1249,20 +1254,20 @@ static long aio_read_events_ring(struct kioctx *ctx,</div><div class='ctx'> 	while (ret &lt; nr) {</div><div class='ctx'> 		long avail;</div><div class='ctx'> 		struct io_event *ev;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		avail = (head &lt;= tail ?  tail : ctx-&gt;nr_events) - head;</div><div class='ctx'> 		if (head == tail)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		pos = head + AIO_EVENTS_OFFSET;</div><div class='del'>-		page = ctx-&gt;ring_pages[pos / AIO_EVENTS_PER_PAGE];</div><div class='add'>+		folio = ctx-&gt;ring_folios[pos / AIO_EVENTS_PER_PAGE];</div><div class='ctx'> 		pos %= AIO_EVENTS_PER_PAGE;</div><div class='ctx'> </div><div class='ctx'> 		avail = min(avail, nr - ret);</div><div class='ctx'> 		avail = min_t(long, avail, AIO_EVENTS_PER_PAGE - pos);</div><div class='ctx'> </div><div class='del'>-		ev = page_address(page);</div><div class='add'>+		ev = folio_address(folio);</div><div class='ctx'> 		copy_ret = copy_to_user(event + ret, ev + pos,</div><div class='ctx'> 					sizeof(*ev) * avail);</div><div class='ctx'> </div><div class='hunk'>@@ -1276,9 +1281,9 @@ static long aio_read_events_ring(struct kioctx *ctx,</div><div class='ctx'> 		head %= ctx-&gt;nr_events;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ring = page_address(ctx-&gt;ring_pages[0]);</div><div class='add'>+	ring = folio_address(ctx-&gt;ring_folios[0]);</div><div class='ctx'> 	ring-&gt;head = head;</div><div class='del'>-	flush_dcache_page(ctx-&gt;ring_pages[0]);</div><div class='add'>+	flush_dcache_folio(ctx-&gt;ring_folios[0]);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%li  h%u t%u\n", ret, head, tail);</div><div class='ctx'> out:</div><div class='hunk'>@@ -1330,7 +1335,7 @@ static long read_events(struct kioctx *ctx, long min_nr, long nr,</div><div class='ctx'> 	if (until == 0 || ret &lt; 0 || ret &gt;= min_nr)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	hrtimer_init_sleeper_on_stack(&amp;t, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='add'>+	hrtimer_setup_sleeper_on_stack(&amp;t, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='ctx'> 	if (until != KTIME_MAX) {</div><div class='ctx'> 		hrtimer_set_expires_range_ns(&amp;t.timer, until, current-&gt;timer_slack_ns);</div><div class='ctx'> 		hrtimer_sleeper_start_expires(&amp;t, HRTIMER_MODE_REL);</div><div class='hunk'>@@ -1502,14 +1507,15 @@ static void aio_complete_rw(struct kiocb *kiocb, long res)</div><div class='ctx'> 	iocb_put(iocb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb)</div><div class='add'>+static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb, int rw_type)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	req-&gt;ki_write_stream = 0;</div><div class='ctx'> 	req-&gt;ki_complete = aio_complete_rw;</div><div class='ctx'> 	req-&gt;private = NULL;</div><div class='ctx'> 	req-&gt;ki_pos = iocb-&gt;aio_offset;</div><div class='del'>-	req-&gt;ki_flags = req-&gt;ki_filp-&gt;f_iocb_flags;</div><div class='add'>+	req-&gt;ki_flags = req-&gt;ki_filp-&gt;f_iocb_flags | IOCB_AIO_RW;</div><div class='ctx'> 	if (iocb-&gt;aio_flags &amp; IOCB_FLAG_RESFD)</div><div class='ctx'> 		req-&gt;ki_flags |= IOCB_EVENTFD;</div><div class='ctx'> 	if (iocb-&gt;aio_flags &amp; IOCB_FLAG_IOPRIO) {</div><div class='hunk'>@@ -1528,7 +1534,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb)</div><div class='ctx'> 	} else</div><div class='ctx'> 		req-&gt;ki_ioprio = get_current_ioprio();</div><div class='ctx'> </div><div class='del'>-	ret = kiocb_set_rw_flags(req, iocb-&gt;aio_rw_flags);</div><div class='add'>+	ret = kiocb_set_rw_flags(req, iocb-&gt;aio_rw_flags, rw_type);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1580,7 +1586,7 @@ static int aio_read(struct kiocb *req, const struct iocb *iocb,</div><div class='ctx'> 	struct file *file;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = aio_prep_rw(req, iocb);</div><div class='add'>+	ret = aio_prep_rw(req, iocb, READ);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	file = req-&gt;ki_filp;</div><div class='hunk'>@@ -1594,7 +1600,7 @@ static int aio_read(struct kiocb *req, const struct iocb *iocb,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = rw_verify_area(READ, file, &amp;req-&gt;ki_pos, iov_iter_count(&amp;iter));</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		aio_rw_done(req, call_read_iter(file, req, &amp;iter));</div><div class='add'>+		aio_rw_done(req, file-&gt;f_op-&gt;read_iter(req, &amp;iter));</div><div class='ctx'> 	kfree(iovec);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1607,7 +1613,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,</div><div class='ctx'> 	struct file *file;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = aio_prep_rw(req, iocb);</div><div class='add'>+	ret = aio_prep_rw(req, iocb, WRITE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	file = req-&gt;ki_filp;</div><div class='hunk'>@@ -1625,7 +1631,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,</div><div class='ctx'> 		if (S_ISREG(file_inode(file)-&gt;i_mode))</div><div class='ctx'> 			kiocb_start_write(req);</div><div class='ctx'> 		req-&gt;ki_flags |= IOCB_WRITE;</div><div class='del'>-		aio_rw_done(req, call_write_iter(file, req, &amp;iter));</div><div class='add'>+		aio_rw_done(req, file-&gt;f_op-&gt;write_iter(req, &amp;iter));</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(iovec);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1634,10 +1640,10 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,</div><div class='ctx'> static void aio_fsync_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct aio_kiocb *iocb = container_of(work, struct aio_kiocb, fsync.work);</div><div class='del'>-	const struct cred *old_cred = override_creds(iocb-&gt;fsync.creds);</div><div class='ctx'> </div><div class='del'>-	iocb-&gt;ki_res.res = vfs_fsync(iocb-&gt;fsync.file, iocb-&gt;fsync.datasync);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	scoped_with_creds(iocb-&gt;fsync.creds)</div><div class='add'>+		iocb-&gt;ki_res.res = vfs_fsync(iocb-&gt;fsync.file, iocb-&gt;fsync.datasync);</div><div class='add'>+</div><div class='ctx'> 	put_cred(iocb-&gt;fsync.creds);</div><div class='ctx'> 	iocb_put(iocb);</div><div class='ctx'> }</div><div class='hunk'>@@ -2186,7 +2192,6 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;ctx-&gt;ctx_lock);</div><div class='del'>-	/* TODO: use a hash or array, this sucks. */</div><div class='ctx'> 	list_for_each_entry(kiocb, &amp;ctx-&gt;active_reqs, ki_list) {</div><div class='ctx'> 		if (kiocb-&gt;ki_res.obj == obj) {</div><div class='ctx'> 			ret = kiocb-&gt;ki_cancel(&amp;kiocb-&gt;rw);</div><div class='head'>diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c<br/>index 0496cb5b6eab..b8381c7fb636 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/anon_inodes.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/anon_inodes.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/anon_inodes.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/anon_inodes.c</a></div><div class='hunk'>@@ -24,10 +24,51 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='ctx'> static struct vfsmount *anon_inode_mnt __ro_after_init;</div><div class='ctx'> static struct inode *anon_inode_inode __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * User space expects anonymous inodes to have no file type in st_mode.</div><div class='add'>+ *</div><div class='add'>+ * In particular, 'lsof' has this legacy logic:</div><div class='add'>+ *</div><div class='add'>+ *	type = s-&gt;st_mode &amp; S_IFMT;</div><div class='add'>+ *	switch (type) {</div><div class='add'>+ *	  ...</div><div class='add'>+ *	case 0:</div><div class='add'>+ *		if (!strcmp(p, "anon_inode"))</div><div class='add'>+ *			Lf-&gt;ntype = Ntype = N_ANON_INODE;</div><div class='add'>+ *</div><div class='add'>+ * to detect our old anon_inode logic.</div><div class='add'>+ *</div><div class='add'>+ * Rather than mess with our internal sane inode data, just fix it</div><div class='add'>+ * up here in getattr() by masking off the format bits.</div><div class='add'>+ */</div><div class='add'>+int anon_inode_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='add'>+		       struct kstat *stat, u32 request_mask,</div><div class='add'>+		       unsigned int query_flags)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='add'>+</div><div class='add'>+	generic_fillattr(&amp;nop_mnt_idmap, request_mask, inode, stat);</div><div class='add'>+	stat-&gt;mode &amp;= ~S_IFMT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int anon_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		       struct iattr *attr)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct inode_operations anon_inode_operations = {</div><div class='add'>+	.getattr = anon_inode_getattr,</div><div class='add'>+	.setattr = anon_inode_setattr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * anon_inodefs_dname() is called from d_path().</div><div class='ctx'>  */</div><div class='ctx'> static char *anon_inodefs_dname(struct dentry *dentry, char *buffer, int buflen)</div><div class='hunk'>@@ -45,6 +86,8 @@ static int anon_inodefs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	struct pseudo_fs_context *ctx = init_pseudo(fc, ANON_INODE_FS_MAGIC);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	fc-&gt;s_iflags |= SB_I_NOEXEC;</div><div class='add'>+	fc-&gt;s_iflags |= SB_I_NODEV;</div><div class='ctx'> 	ctx-&gt;dops = &amp;anon_inodefs_dentry_operations;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -55,25 +98,38 @@ static struct file_system_type anon_inode_fs_type = {</div><div class='ctx'> 	.kill_sb	= kill_anon_super,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct inode *anon_inode_make_secure_inode(</div><div class='del'>-	const char *name,</div><div class='del'>-	const struct inode *context_inode)</div><div class='add'>+/**</div><div class='add'>+ * anon_inode_make_secure_inode - allocate an anonymous inode with security context</div><div class='add'>+ * @sb:		[in]	Superblock to allocate from</div><div class='add'>+ * @name:	[in]	Name of the class of the newfile (e.g., "secretmem")</div><div class='add'>+ * @context_inode:</div><div class='add'>+ *		[in]	Optional parent inode for security inheritance</div><div class='add'>+ *</div><div class='add'>+ * The function ensures proper security initialization through the LSM hook</div><div class='add'>+ * security_inode_init_security_anon().</div><div class='add'>+ *</div><div class='add'>+ * Return:	Pointer to new inode on success, ERR_PTR on failure.</div><div class='add'>+ */</div><div class='add'>+struct inode *anon_inode_make_secure_inode(struct super_block *sb, const char *name,</div><div class='add'>+					   const struct inode *context_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	const struct qstr qname = QSTR_INIT(name, strlen(name));</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	inode = alloc_anon_inode(anon_inode_mnt-&gt;mnt_sb);</div><div class='add'>+	inode = alloc_anon_inode(sb);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	inode-&gt;i_flags &amp;= ~S_PRIVATE;</div><div class='del'>-	error =	security_inode_init_security_anon(inode, &amp;qname, context_inode);</div><div class='add'>+	inode-&gt;i_op = &amp;anon_inode_operations;</div><div class='add'>+	error =	security_inode_init_security_anon(inode, &amp;QSTR(name),</div><div class='add'>+						  context_inode);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 		return ERR_PTR(error);</div><div class='ctx'> 	}</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_FOR_MODULES(anon_inode_make_secure_inode, "kvm");</div><div class='ctx'> </div><div class='ctx'> static struct file *__anon_inode_getfile(const char *name,</div><div class='ctx'> 					 const struct file_operations *fops,</div><div class='hunk'>@@ -88,7 +144,8 @@ static struct file *__anon_inode_getfile(const char *name,</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='ctx'> 	if (make_inode) {</div><div class='del'>-		inode =	anon_inode_make_secure_inode(name, context_inode);</div><div class='add'>+		inode =	anon_inode_make_secure_inode(anon_inode_mnt-&gt;mnt_sb,</div><div class='add'>+						     name, context_inode);</div><div class='ctx'> 		if (IS_ERR(inode)) {</div><div class='ctx'> 			file = ERR_CAST(inode);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -149,6 +206,38 @@ struct file *anon_inode_getfile(const char *name,</div><div class='ctx'> EXPORT_SYMBOL_GPL(anon_inode_getfile);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * anon_inode_getfile_fmode - creates a new file instance by hooking it up to an</div><div class='add'>+ *                      anonymous inode, and a dentry that describe the "class"</div><div class='add'>+ *                      of the file</div><div class='add'>+ *</div><div class='add'>+ * @name:    [in]    name of the "class" of the new file</div><div class='add'>+ * @fops:    [in]    file operations for the new file</div><div class='add'>+ * @priv:    [in]    private data for the new file (will be file's private_data)</div><div class='add'>+ * @flags:   [in]    flags</div><div class='add'>+ * @f_mode:  [in]    fmode</div><div class='add'>+ *</div><div class='add'>+ * Creates a new file by hooking it on a single inode. This is useful for files</div><div class='add'>+ * that do not need to have a full-fledged inode in order to operate correctly.</div><div class='add'>+ * All the files created with anon_inode_getfile() will share a single inode,</div><div class='add'>+ * hence saving memory and avoiding code duplication for the file/inode/dentry</div><div class='add'>+ * setup. Allows setting the fmode. Returns the newly created file* or an error</div><div class='add'>+ * pointer.</div><div class='add'>+ */</div><div class='add'>+struct file *anon_inode_getfile_fmode(const char *name,</div><div class='add'>+				const struct file_operations *fops,</div><div class='add'>+				void *priv, int flags, fmode_t f_mode)</div><div class='add'>+{</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	file = __anon_inode_getfile(name, fops, priv, flags, NULL, false);</div><div class='add'>+	if (!IS_ERR(file))</div><div class='add'>+		file-&gt;f_mode |= f_mode;</div><div class='add'>+</div><div class='add'>+	return file;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(anon_inode_getfile_fmode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * anon_inode_create_getfile - Like anon_inode_getfile(), but creates a new</div><div class='ctx'>  *                             !S_PRIVATE anon inode rather than reuse the</div><div class='ctx'>  *                             singleton anon inode and calls the</div><div class='hunk'>@@ -191,27 +280,8 @@ static int __anon_inode_getfd(const char *name,</div><div class='ctx'> 			      const struct inode *context_inode,</div><div class='ctx'> 			      bool make_inode)</div><div class='ctx'> {</div><div class='del'>-	int error, fd;</div><div class='del'>-	struct file *file;</div><div class='del'>-</div><div class='del'>-	error = get_unused_fd_flags(flags);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		return error;</div><div class='del'>-	fd = error;</div><div class='del'>-</div><div class='del'>-	file = __anon_inode_getfile(name, fops, priv, flags, context_inode,</div><div class='del'>-				    make_inode);</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		error = PTR_ERR(file);</div><div class='del'>-		goto err_put_unused_fd;</div><div class='del'>-	}</div><div class='del'>-	fd_install(fd, file);</div><div class='del'>-</div><div class='del'>-	return fd;</div><div class='del'>-</div><div class='del'>-err_put_unused_fd:</div><div class='del'>-	put_unused_fd(fd);</div><div class='del'>-	return error;</div><div class='add'>+	return FD_ADD(flags, __anon_inode_getfile(name, fops, priv, flags,</div><div class='add'>+						  context_inode, make_inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -271,6 +341,7 @@ int anon_inode_create_getfd(const char *name, const struct file_operations *fops</div><div class='ctx'> 	return __anon_inode_getfd(name, fops, priv, flags, context_inode, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static int __init anon_inode_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	anon_inode_mnt = kern_mount(&amp;anon_inode_fs_type);</div><div class='hunk'>@@ -280,6 +351,7 @@ static int __init anon_inode_init(void)</div><div class='ctx'> 	anon_inode_inode = alloc_anon_inode(anon_inode_mnt-&gt;mnt_sb);</div><div class='ctx'> 	if (IS_ERR(anon_inode_inode))</div><div class='ctx'> 		panic("anon_inode_init() inode allocation failed (%ld)\n", PTR_ERR(anon_inode_inode));</div><div class='add'>+	anon_inode_inode-&gt;i_op = &amp;anon_inode_operations;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/attr.c b/fs/attr.c<br/>index 5a13f0c8495f..b9ec6b47bab2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/attr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/attr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/attr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/attr.c</a></div><div class='hunk'>@@ -16,10 +16,6 @@</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/evm.h&gt;</div><div class='del'>-#include &lt;linux/ima.h&gt;</div><div class='del'>-</div><div class='del'>-#include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * setattr_should_drop_sgid - determine whether the setgid bit needs to be</div><div class='hunk'>@@ -234,7 +230,7 @@ EXPORT_SYMBOL(setattr_prepare);</div><div class='ctx'>  * @inode:	the inode to be truncated</div><div class='ctx'>  * @offset:	the new size to assign to the inode</div><div class='ctx'>  *</div><div class='del'>- * inode_newsize_ok must be called with i_mutex held.</div><div class='add'>+ * inode_newsize_ok must be called with i_rwsem held exclusively.</div><div class='ctx'>  *</div><div class='ctx'>  * inode_newsize_ok will check filesystem limits and ulimits to check that the</div><div class='ctx'>  * new inode size is within limits. inode_newsize_ok will also send SIGXFSZ</div><div class='hunk'>@@ -276,12 +272,45 @@ out_big:</div><div class='ctx'> EXPORT_SYMBOL(inode_newsize_ok);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * setattr_copy_mgtime - update timestamps for mgtime inodes</div><div class='add'>+ * @inode: inode timestamps to be updated</div><div class='add'>+ * @attr: attrs for the update</div><div class='add'>+ *</div><div class='add'>+ * With multigrain timestamps, take more care to prevent races when</div><div class='add'>+ * updating the ctime. Always update the ctime to the very latest using</div><div class='add'>+ * the standard mechanism, and use that to populate the atime and mtime</div><div class='add'>+ * appropriately (unless those are being set to specific values).</div><div class='add'>+ */</div><div class='add'>+static void setattr_copy_mgtime(struct inode *inode, const struct iattr *attr)</div><div class='add'>+{</div><div class='add'>+	unsigned int ia_valid = attr-&gt;ia_valid;</div><div class='add'>+	struct timespec64 now;</div><div class='add'>+</div><div class='add'>+	if (ia_valid &amp; ATTR_CTIME_SET)</div><div class='add'>+		now = inode_set_ctime_deleg(inode, attr-&gt;ia_ctime);</div><div class='add'>+	else if (ia_valid &amp; ATTR_CTIME)</div><div class='add'>+		now = inode_set_ctime_current(inode);</div><div class='add'>+	else</div><div class='add'>+		now = current_time(inode);</div><div class='add'>+</div><div class='add'>+	if (ia_valid &amp; ATTR_ATIME_SET)</div><div class='add'>+		inode_set_atime_to_ts(inode, attr-&gt;ia_atime);</div><div class='add'>+	else if (ia_valid &amp; ATTR_ATIME)</div><div class='add'>+		inode_set_atime_to_ts(inode, now);</div><div class='add'>+</div><div class='add'>+	if (ia_valid &amp; ATTR_MTIME_SET)</div><div class='add'>+		inode_set_mtime_to_ts(inode, attr-&gt;ia_mtime);</div><div class='add'>+	else if (ia_valid &amp; ATTR_MTIME)</div><div class='add'>+		inode_set_mtime_to_ts(inode, now);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * setattr_copy - copy simple metadata updates into the generic inode</div><div class='ctx'>  * @idmap:	idmap of the mount the inode was found from</div><div class='ctx'>  * @inode:	the inode to be updated</div><div class='ctx'>  * @attr:	the new attributes</div><div class='ctx'>  *</div><div class='del'>- * setattr_copy must be called with i_mutex held.</div><div class='add'>+ * setattr_copy must be called with i_rwsem held exclusively.</div><div class='ctx'>  *</div><div class='ctx'>  * setattr_copy updates the inode's metadata with that specified</div><div class='ctx'>  * in attr on idmapped mounts. Necessary permission checks to determine</div><div class='hunk'>@@ -307,12 +336,6 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	i_uid_update(idmap, attr, inode);</div><div class='ctx'> 	i_gid_update(idmap, attr, inode);</div><div class='del'>-	if (ia_valid &amp; ATTR_ATIME)</div><div class='del'>-		inode_set_atime_to_ts(inode, attr-&gt;ia_atime);</div><div class='del'>-	if (ia_valid &amp; ATTR_MTIME)</div><div class='del'>-		inode_set_mtime_to_ts(inode, attr-&gt;ia_mtime);</div><div class='del'>-	if (ia_valid &amp; ATTR_CTIME)</div><div class='del'>-		inode_set_ctime_to_ts(inode, attr-&gt;ia_ctime);</div><div class='ctx'> 	if (ia_valid &amp; ATTR_MODE) {</div><div class='ctx'> 		umode_t mode = attr-&gt;ia_mode;</div><div class='ctx'> 		if (!in_group_or_capable(idmap, inode,</div><div class='hunk'>@@ -320,6 +343,19 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> 			mode &amp;= ~S_ISGID;</div><div class='ctx'> 		inode-&gt;i_mode = mode;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (is_mgtime(inode))</div><div class='add'>+		return setattr_copy_mgtime(inode, attr);</div><div class='add'>+</div><div class='add'>+	if (ia_valid &amp; ATTR_ATIME)</div><div class='add'>+		inode_set_atime_to_ts(inode, attr-&gt;ia_atime);</div><div class='add'>+	if (ia_valid &amp; ATTR_MTIME)</div><div class='add'>+		inode_set_mtime_to_ts(inode, attr-&gt;ia_mtime);</div><div class='add'>+</div><div class='add'>+	if (ia_valid &amp; ATTR_CTIME_SET)</div><div class='add'>+		inode_set_ctime_deleg(inode, attr-&gt;ia_ctime);</div><div class='add'>+	else if (ia_valid &amp; ATTR_CTIME)</div><div class='add'>+		inode_set_ctime_to_ts(inode, attr-&gt;ia_ctime);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(setattr_copy);</div><div class='ctx'> </div><div class='hunk'>@@ -352,19 +388,19 @@ int may_setattr(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> EXPORT_SYMBOL(may_setattr);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * notify_change - modify attributes of a filesytem object</div><div class='add'>+ * notify_change - modify attributes of a filesystem object</div><div class='ctx'>  * @idmap:	idmap of the mount the inode was found from</div><div class='ctx'>  * @dentry:	object affected</div><div class='ctx'>  * @attr:	new attributes</div><div class='ctx'>  * @delegated_inode: returns inode, if the inode is delegated</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold the i_mutex on the affected object.</div><div class='add'>+ * The caller must hold the i_rwsem exclusively on the affected object.</div><div class='ctx'>  *</div><div class='ctx'>  * If notify_change discovers a delegation in need of breaking,</div><div class='ctx'>  * it will return -EWOULDBLOCK and return a reference to the inode in</div><div class='ctx'>  * delegated_inode.  The caller should then break the delegation and</div><div class='ctx'>  * retry.  Because breaking a delegation may take a long time, the</div><div class='del'>- * caller should drop the i_mutex before doing so.</div><div class='add'>+ * caller should drop the i_rwsem before doing so.</div><div class='ctx'>  *</div><div class='ctx'>  * Alternatively, a caller may pass NULL for delegated_inode.  This may</div><div class='ctx'>  * be appropriate for callers that expect the underlying filesystem not</div><div class='hunk'>@@ -379,7 +415,7 @@ EXPORT_SYMBOL(may_setattr);</div><div class='ctx'>  * performed on the raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='ctx'> int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		  struct iattr *attr, struct inode **delegated_inode)</div><div class='add'>+		  struct iattr *attr, struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = dentry-&gt;d_inode;</div><div class='ctx'> 	umode_t mode = inode-&gt;i_mode;</div><div class='hunk'>@@ -411,22 +447,25 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		if (S_ISLNK(inode-&gt;i_mode))</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-		/* Flag setting protected by i_mutex */</div><div class='add'>+		/* Flag setting protected by i_rwsem */</div><div class='ctx'> 		if (is_sxid(attr-&gt;ia_mode))</div><div class='ctx'> 			inode-&gt;i_flags &amp;= ~S_NOSEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	now = current_time(inode);</div><div class='ctx'> </div><div class='del'>-	attr-&gt;ia_ctime = now;</div><div class='del'>-	if (!(ia_valid &amp; ATTR_ATIME_SET))</div><div class='del'>-		attr-&gt;ia_atime = now;</div><div class='del'>-	else</div><div class='add'>+	if (ia_valid &amp; ATTR_ATIME_SET)</div><div class='ctx'> 		attr-&gt;ia_atime = timestamp_truncate(attr-&gt;ia_atime, inode);</div><div class='del'>-	if (!(ia_valid &amp; ATTR_MTIME_SET))</div><div class='del'>-		attr-&gt;ia_mtime = now;</div><div class='ctx'> 	else</div><div class='add'>+		attr-&gt;ia_atime = now;</div><div class='add'>+	if (ia_valid &amp; ATTR_CTIME_SET)</div><div class='add'>+		attr-&gt;ia_ctime = timestamp_truncate(attr-&gt;ia_ctime, inode);</div><div class='add'>+	else</div><div class='add'>+		attr-&gt;ia_ctime = now;</div><div class='add'>+	if (ia_valid &amp; ATTR_MTIME_SET)</div><div class='ctx'> 		attr-&gt;ia_mtime = timestamp_truncate(attr-&gt;ia_mtime, inode);</div><div class='add'>+	else</div><div class='add'>+		attr-&gt;ia_mtime = now;</div><div class='ctx'> </div><div class='ctx'> 	if (ia_valid &amp; ATTR_KILL_PRIV) {</div><div class='ctx'> 		error = security_inode_need_killpriv(dentry);</div><div class='hunk'>@@ -491,9 +530,17 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	error = security_inode_setattr(idmap, dentry, attr);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	error = try_break_deleg(inode, delegated_inode);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If ATTR_DELEG is set, then these attributes are being set on</div><div class='add'>+	 * behalf of the holder of a write delegation. We want to avoid</div><div class='add'>+	 * breaking the delegation in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (!(ia_valid &amp; ATTR_DELEG)) {</div><div class='add'>+		error = try_break_deleg(inode, delegated_inode);</div><div class='add'>+		if (error)</div><div class='add'>+			return error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_op-&gt;setattr)</div><div class='ctx'> 		error = inode-&gt;i_op-&gt;setattr(idmap, dentry, attr);</div><div class='hunk'>@@ -502,8 +549,7 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		fsnotify_change(dentry, ia_valid);</div><div class='del'>-		ima_inode_post_setattr(idmap, dentry);</div><div class='del'>-		evm_inode_post_setattr(dentry, ia_valid);</div><div class='add'>+		security_inode_post_setattr(idmap, dentry, ia_valid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='head'>diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h<br/>index 8c1d587b3eef..4fd555528c5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/autofs/autofs_i.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/autofs_i.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/autofs/autofs_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/autofs/autofs_i.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;uapi/linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='hunk'>@@ -27,6 +28,9 @@</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include "../mount.h"</div><div class='add'>+#include &lt;linux/ns_common.h&gt;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* This is the range of ioctl() numbers we claim as ours */</div><div class='ctx'> #define AUTOFS_IOC_FIRST     AUTOFS_IOC_READY</div><div class='hunk'>@@ -62,6 +66,7 @@ struct autofs_info {</div><div class='ctx'> 	struct list_head expiring;</div><div class='ctx'> </div><div class='ctx'> 	struct autofs_sb_info *sbi;</div><div class='add'>+	unsigned long exp_timeout;</div><div class='ctx'> 	unsigned long last_used;</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +86,9 @@ struct autofs_info {</div><div class='ctx'> 					*/</div><div class='ctx'> #define AUTOFS_INF_PENDING	(1&lt;&lt;2) /* dentry pending mount */</div><div class='ctx'> </div><div class='add'>+#define AUTOFS_INF_EXPIRE_SET	(1&lt;&lt;3) /* per-dentry expire timeout set for</div><div class='add'>+					  this mount point.</div><div class='add'>+					*/</div><div class='ctx'> struct autofs_wait_queue {</div><div class='ctx'> 	wait_queue_head_t queue;</div><div class='ctx'> 	struct autofs_wait_queue *next;</div><div class='hunk'>@@ -110,6 +118,7 @@ struct autofs_sb_info {</div><div class='ctx'> 	int pipefd;</div><div class='ctx'> 	struct file *pipe;</div><div class='ctx'> 	struct pid *oz_pgrp;</div><div class='add'>+	u64 mnt_ns_id;</div><div class='ctx'> 	int version;</div><div class='ctx'> 	int sub_version;</div><div class='ctx'> 	int min_proto;</div><div class='hunk'>@@ -214,6 +223,8 @@ void autofs_clean_ino(struct autofs_info *);</div><div class='ctx'> </div><div class='ctx'> static inline int autofs_check_pipe(struct file *pipe)</div><div class='ctx'> {</div><div class='add'>+	if (pipe-&gt;f_mode &amp; FMODE_PATH)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (!(pipe-&gt;f_mode &amp; FMODE_CAN_WRITE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (!S_ISFIFO(file_inode(pipe)-&gt;i_mode))</div><div class='head'>diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c<br/>index 5bf781ea6d67..6743b3b64217 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/autofs/dev-ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/dev-ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/autofs/dev-ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/autofs/dev-ioctl.c</a></div><div class='hunk'>@@ -110,6 +110,7 @@ static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)</div><div class='ctx'>  */</div><div class='ctx'> static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)</div><div class='ctx'> {</div><div class='add'>+	unsigned int inr = _IOC_NR(cmd);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = check_dev_ioctl_version(cmd, param);</div><div class='hunk'>@@ -128,15 +129,19 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Setting the per-dentry expire timeout requires a trailing</div><div class='add'>+		 * path component, ie. no '/', so invert the logic of the</div><div class='add'>+		 * check_name() return for AUTOFS_DEV_IOCTL_TIMEOUT_CMD.</div><div class='add'>+		 */</div><div class='ctx'> 		err = check_name(param-&gt;path);</div><div class='add'>+		if (inr == AUTOFS_DEV_IOCTL_TIMEOUT_CMD)</div><div class='add'>+			err = err ? 0 : -EINVAL;</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			pr_warn("invalid path supplied for cmd(0x%08x)\n",</div><div class='ctx'> 				cmd);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		unsigned int inr = _IOC_NR(cmd);</div><div class='del'>-</div><div class='ctx'> 		if (inr == AUTOFS_DEV_IOCTL_OPENMOUNT_CMD ||</div><div class='ctx'> 		    inr == AUTOFS_DEV_IOCTL_REQUESTER_CMD ||</div><div class='ctx'> 		    inr == AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD) {</div><div class='hunk'>@@ -226,32 +231,14 @@ static int test_by_type(const struct path *path, void *p)</div><div class='ctx'>  */</div><div class='ctx'> static int autofs_dev_ioctl_open_mountpoint(const char *name, dev_t devid)</div><div class='ctx'> {</div><div class='del'>-	int err, fd;</div><div class='del'>-</div><div class='del'>-	fd = get_unused_fd_flags(O_CLOEXEC);</div><div class='del'>-	if (likely(fd &gt;= 0)) {</div><div class='del'>-		struct file *filp;</div><div class='del'>-		struct path path;</div><div class='del'>-</div><div class='del'>-		err = find_autofs_mount(name, &amp;path, test_by_dev, &amp;devid);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		filp = dentry_open(&amp;path, O_RDONLY, current_cred());</div><div class='del'>-		path_put(&amp;path);</div><div class='del'>-		if (IS_ERR(filp)) {</div><div class='del'>-			err = PTR_ERR(filp);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fd_install(fd, filp);</div><div class='del'>-	}</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return fd;</div><div class='add'>+	err = find_autofs_mount(name, &amp;path, test_by_dev, &amp;devid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	put_unused_fd(fd);</div><div class='del'>-	return err;</div><div class='add'>+	return FD_ADD(O_CLOEXEC, dentry_open(&amp;path, O_RDONLY, current_cred()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Open a file descriptor on an autofs mount point */</div><div class='hunk'>@@ -376,6 +363,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,</div><div class='ctx'> 		swap(sbi-&gt;oz_pgrp, new_pid);</div><div class='ctx'> 		sbi-&gt;pipefd = pipefd;</div><div class='ctx'> 		sbi-&gt;pipe = pipe;</div><div class='add'>+		sbi-&gt;mnt_ns_id = to_ns_common(current-&gt;nsproxy-&gt;mnt_ns)-&gt;ns_id;</div><div class='ctx'> 		sbi-&gt;flags &amp;= ~AUTOFS_SBI_CATATONIC;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -396,16 +384,97 @@ static int autofs_dev_ioctl_catatonic(struct file *fp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set the autofs mount timeout */</div><div class='add'>+/*</div><div class='add'>+ * Set the autofs mount expire timeout.</div><div class='add'>+ *</div><div class='add'>+ * There are two places an expire timeout can be set, in the autofs</div><div class='add'>+ * super block info. (this is all that's needed for direct and offset</div><div class='add'>+ * mounts because there's a distinct mount corresponding to each of</div><div class='add'>+ * these) and per-dentry within within the dentry info. If a per-dentry</div><div class='add'>+ * timeout is set it will override the expire timeout set in the parent</div><div class='add'>+ * autofs super block info.</div><div class='add'>+ *</div><div class='add'>+ * If setting the autofs super block expire timeout the autofs_dev_ioctl</div><div class='add'>+ * size field will be equal to the autofs_dev_ioctl structure size. If</div><div class='add'>+ * setting the per-dentry expire timeout the mount point name is passed</div><div class='add'>+ * in the autofs_dev_ioctl path field and the size field updated to</div><div class='add'>+ * reflect this.</div><div class='add'>+ *</div><div class='add'>+ * Setting the autofs mount expire timeout sets the timeout in the super</div><div class='add'>+ * block info. struct. Setting the per-dentry timeout does a little more.</div><div class='add'>+ * If the timeout is equal to -1 the per-dentry timeout (and flag) is</div><div class='add'>+ * cleared which reverts to using the super block timeout, otherwise if</div><div class='add'>+ * timeout is 0 the timeout is set to this value and the flag is left</div><div class='add'>+ * set which disables expiration for the mount point, lastly the flag</div><div class='add'>+ * and the timeout are set enabling the dentry to use this timeout.</div><div class='add'>+ */</div><div class='ctx'> static int autofs_dev_ioctl_timeout(struct file *fp,</div><div class='ctx'> 				    struct autofs_sb_info *sbi,</div><div class='ctx'> 				    struct autofs_dev_ioctl *param)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout;</div><div class='add'>+	unsigned long timeout = param-&gt;timeout.timeout;</div><div class='add'>+</div><div class='add'>+	/* If setting the expire timeout for an individual indirect</div><div class='add'>+	 * mount point dentry the mount trailing component path is</div><div class='add'>+	 * placed in param-&gt;path and param-&gt;size adjusted to account</div><div class='add'>+	 * for it otherwise param-&gt;size it is set to the structure</div><div class='add'>+	 * size.</div><div class='add'>+	 */</div><div class='add'>+	if (param-&gt;size == AUTOFS_DEV_IOCTL_SIZE) {</div><div class='add'>+		param-&gt;timeout.timeout = sbi-&gt;exp_timeout / HZ;</div><div class='add'>+		sbi-&gt;exp_timeout = timeout * HZ;</div><div class='add'>+	} else {</div><div class='add'>+		struct dentry *base = fp-&gt;f_path.dentry;</div><div class='add'>+		int path_len = param-&gt;size - AUTOFS_DEV_IOCTL_SIZE - 1;</div><div class='add'>+		struct dentry *dentry;</div><div class='add'>+		struct autofs_info *ino;</div><div class='add'>+</div><div class='add'>+		if (!autofs_type_indirect(sbi-&gt;type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		dentry = try_lookup_noperm(&amp;QSTR_LEN(param-&gt;path, path_len),</div><div class='add'>+					   base);</div><div class='add'>+		if (IS_ERR_OR_NULL(dentry))</div><div class='add'>+			return dentry ? PTR_ERR(dentry) : -ENOENT;</div><div class='add'>+		ino = autofs_dentry_ino(dentry);</div><div class='add'>+		if (!ino) {</div><div class='add'>+			dput(dentry);</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ino-&gt;exp_timeout &amp;&amp; ino-&gt;flags &amp; AUTOFS_INF_EXPIRE_SET)</div><div class='add'>+			param-&gt;timeout.timeout = ino-&gt;exp_timeout / HZ;</div><div class='add'>+		else</div><div class='add'>+			param-&gt;timeout.timeout = sbi-&gt;exp_timeout / HZ;</div><div class='add'>+</div><div class='add'>+		if (timeout == -1) {</div><div class='add'>+			/* Revert to using the super block timeout */</div><div class='add'>+			ino-&gt;flags &amp;= ~AUTOFS_INF_EXPIRE_SET;</div><div class='add'>+			ino-&gt;exp_timeout = 0;</div><div class='add'>+		} else {</div><div class='add'>+			/* Set the dentry expire flag and timeout.</div><div class='add'>+			 *</div><div class='add'>+			 * If timeout is 0 it will prevent the expire</div><div class='add'>+			 * of this particular automount.</div><div class='add'>+			 */</div><div class='add'>+			ino-&gt;flags |= AUTOFS_INF_EXPIRE_SET;</div><div class='add'>+			ino-&gt;exp_timeout = timeout * HZ;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* An expire timeout greater than the superblock timeout</div><div class='add'>+		 * could be a problem at shutdown but the super block</div><div class='add'>+		 * timeout itself can change so all we can really do is</div><div class='add'>+		 * warn the user.</div><div class='add'>+		 */</div><div class='add'>+		if (ino-&gt;flags &amp; AUTOFS_INF_EXPIRE_SET &amp;&amp;</div><div class='add'>+		    ino-&gt;exp_timeout &gt; sbi-&gt;exp_timeout)</div><div class='add'>+			pr_warn("per-mount expire timeout is greater than "</div><div class='add'>+				"the parent autofs mount timeout which could "</div><div class='add'>+				"prevent shutdown\n");</div><div class='add'>+</div><div class='add'>+		dput(dentry);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	timeout = param-&gt;timeout.timeout;</div><div class='del'>-	param-&gt;timeout.timeout = sbi-&gt;exp_timeout / HZ;</div><div class='del'>-	sbi-&gt;exp_timeout = timeout * HZ;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c<br/>index 39d8c84c16f4..5c2d459e1e48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/autofs/expire.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/expire.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/autofs/expire.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/autofs/expire.c</a></div><div class='hunk'>@@ -429,8 +429,6 @@ static struct dentry *autofs_expire_indirect(struct super_block *sb,</div><div class='ctx'> 	if (!root)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	timeout = sbi-&gt;exp_timeout;</div><div class='del'>-</div><div class='ctx'> 	dentry = NULL;</div><div class='ctx'> 	while ((dentry = get_next_positive_subdir(dentry, root))) {</div><div class='ctx'> 		spin_lock(&amp;sbi-&gt;fs_lock);</div><div class='hunk'>@@ -441,6 +439,11 @@ static struct dentry *autofs_expire_indirect(struct super_block *sb,</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;sbi-&gt;fs_lock);</div><div class='ctx'> </div><div class='add'>+		if (ino-&gt;flags &amp; AUTOFS_INF_EXPIRE_SET)</div><div class='add'>+			timeout = ino-&gt;exp_timeout;</div><div class='add'>+		else</div><div class='add'>+			timeout = sbi-&gt;exp_timeout;</div><div class='add'>+</div><div class='ctx'> 		expired = should_expire(dentry, mnt, timeout, how);</div><div class='ctx'> 		if (!expired)</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/fs/autofs/init.c b/fs/autofs/init.c<br/>index b5e4dfa04ed0..1d644a35ffa0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/autofs/init.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/autofs/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/autofs/init.c</a></div><div class='hunk'>@@ -38,4 +38,5 @@ static void __exit exit_autofs_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_autofs_fs)</div><div class='ctx'> module_exit(exit_autofs_fs)</div><div class='add'>+MODULE_DESCRIPTION("Kernel automounter support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c<br/>index 1f5db6863663..b932b1719dfc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/autofs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/autofs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/autofs/inode.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@ struct autofs_info *autofs_new_ino(struct autofs_sb_info *sbi)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;ino-&gt;expiring);</div><div class='ctx'> 		ino-&gt;last_used = jiffies;</div><div class='ctx'> 		ino-&gt;sbi = sbi;</div><div class='add'>+		ino-&gt;exp_timeout = -1;</div><div class='ctx'> 		ino-&gt;count = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ino;</div><div class='hunk'>@@ -28,6 +29,7 @@ void autofs_clean_ino(struct autofs_info *ino)</div><div class='ctx'> {</div><div class='ctx'> 	ino-&gt;uid = GLOBAL_ROOT_UID;</div><div class='ctx'> 	ino-&gt;gid = GLOBAL_ROOT_GID;</div><div class='add'>+	ino-&gt;exp_timeout = -1;</div><div class='ctx'> 	ino-&gt;last_used = jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +55,7 @@ void autofs_kill_sb(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("shutting down\n");</div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> 	if (sbi)</div><div class='ctx'> 		kfree_rcu(sbi, rcu);</div><div class='ctx'> }</div><div class='hunk'>@@ -126,7 +128,7 @@ enum {</div><div class='ctx'> const struct fs_parameter_spec autofs_param_specs[] = {</div><div class='ctx'> 	fsparam_flag	("direct",		Opt_direct),</div><div class='ctx'> 	fsparam_fd	("fd",			Opt_fd),</div><div class='del'>-	fsparam_u32	("gid",			Opt_gid),</div><div class='add'>+	fsparam_gid	("gid",			Opt_gid),</div><div class='ctx'> 	fsparam_flag	("ignore",		Opt_ignore),</div><div class='ctx'> 	fsparam_flag	("indirect",		Opt_indirect),</div><div class='ctx'> 	fsparam_u32	("maxproto",		Opt_maxproto),</div><div class='hunk'>@@ -134,7 +136,7 @@ const struct fs_parameter_spec autofs_param_specs[] = {</div><div class='ctx'> 	fsparam_flag	("offset",		Opt_offset),</div><div class='ctx'> 	fsparam_u32	("pgrp",		Opt_pgrp),</div><div class='ctx'> 	fsparam_flag	("strictexpire",	Opt_strictexpire),</div><div class='del'>-	fsparam_u32	("uid",			Opt_uid),</div><div class='add'>+	fsparam_uid	("uid",			Opt_uid),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -172,8 +174,7 @@ static int autofs_parse_fd(struct fs_context *fc, struct autofs_sb_info *sbi,</div><div class='ctx'> 	ret = autofs_check_pipe(pipe);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		errorf(fc, "Invalid/unusable pipe");</div><div class='del'>-		if (param-&gt;type != fs_value_is_file)</div><div class='del'>-			fput(pipe);</div><div class='add'>+		fput(pipe);</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -193,8 +194,6 @@ static int autofs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 	struct autofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct autofs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='ctx'> 	struct fs_parse_result result;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='ctx'> 	int opt;</div><div class='ctx'> </div><div class='ctx'> 	opt = fs_parse(fc, autofs_param_specs, param, &amp;result);</div><div class='hunk'>@@ -205,16 +204,10 @@ static int autofs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 	case Opt_fd:</div><div class='ctx'> 		return autofs_parse_fd(fc, sbi, param, &amp;result);</div><div class='ctx'> 	case Opt_uid:</div><div class='del'>-		uid = make_kuid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!uid_valid(uid))</div><div class='del'>-			return invalfc(fc, "Invalid uid");</div><div class='del'>-		ctx-&gt;uid = uid;</div><div class='add'>+		ctx-&gt;uid = result.uid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_gid:</div><div class='del'>-		gid = make_kgid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!gid_valid(gid))</div><div class='del'>-			return invalfc(fc, "Invalid gid");</div><div class='del'>-		ctx-&gt;gid = gid;</div><div class='add'>+		ctx-&gt;gid = result.gid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_pgrp:</div><div class='ctx'> 		ctx-&gt;pgrp = result.uint_32;</div><div class='hunk'>@@ -258,6 +251,7 @@ static struct autofs_sb_info *autofs_alloc_sbi(void)</div><div class='ctx'> 	sbi-&gt;min_proto = AUTOFS_MIN_PROTO_VERSION;</div><div class='ctx'> 	sbi-&gt;max_proto = AUTOFS_MAX_PROTO_VERSION;</div><div class='ctx'> 	sbi-&gt;pipefd = -1;</div><div class='add'>+	sbi-&gt;mnt_ns_id = to_ns_common(current-&gt;nsproxy-&gt;mnt_ns)-&gt;ns_id;</div><div class='ctx'> </div><div class='ctx'> 	set_autofs_type_indirect(&amp;sbi-&gt;type);</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;wq_mutex);</div><div class='hunk'>@@ -318,7 +312,7 @@ static int autofs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> 	s-&gt;s_blocksize_bits = 10;</div><div class='ctx'> 	s-&gt;s_magic = AUTOFS_SUPER_MAGIC;</div><div class='ctx'> 	s-&gt;s_op = &amp;autofs_sops;</div><div class='del'>-	s-&gt;s_d_op = &amp;autofs_dentry_operations;</div><div class='add'>+	set_default_d_op(s, &amp;autofs_dentry_operations);</div><div class='ctx'> 	s-&gt;s_time_gran = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/fs/autofs/root.c b/fs/autofs/root.c<br/>index 530d18827e35..2c31002b314a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/autofs/root.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/autofs/root.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/autofs/root.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/autofs/root.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@ static int autofs_dir_symlink(struct mnt_idmap *, struct inode *,</div><div class='ctx'> 			      struct dentry *, const char *);</div><div class='ctx'> static int autofs_dir_unlink(struct inode *, struct dentry *);</div><div class='ctx'> static int autofs_dir_rmdir(struct inode *, struct dentry *);</div><div class='del'>-static int autofs_dir_mkdir(struct mnt_idmap *, struct inode *,</div><div class='del'>-			    struct dentry *, umode_t);</div><div class='add'>+static struct dentry *autofs_dir_mkdir(struct mnt_idmap *, struct inode *,</div><div class='add'>+				       struct dentry *, umode_t);</div><div class='ctx'> static long autofs_root_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static long autofs_root_compat_ioctl(struct file *,</div><div class='hunk'>@@ -341,6 +341,14 @@ static struct vfsmount *autofs_d_automount(struct path *path)</div><div class='ctx'> 	if (autofs_oz_mode(sbi))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	/* Refuse to trigger mount if current namespace is not the owner</div><div class='add'>+	 * and the mount is propagation private.</div><div class='add'>+	 */</div><div class='add'>+	if (sbi-&gt;mnt_ns_id != to_ns_common(current-&gt;nsproxy-&gt;mnt_ns)-&gt;ns_id) {</div><div class='add'>+		if (vfsmount_to_propagation_flags(path-&gt;mnt) &amp; MS_PRIVATE)</div><div class='add'>+			return ERR_PTR(-EPERM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If an expire request is pending everyone must wait.</div><div class='ctx'> 	 * If the expire fails we're still mounted so continue</div><div class='hunk'>@@ -594,9 +602,8 @@ static int autofs_dir_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> 	}</div><div class='ctx'> 	inode-&gt;i_private = cp;</div><div class='ctx'> 	inode-&gt;i_size = size;</div><div class='del'>-	d_add(dentry, inode);</div><div class='ctx'> </div><div class='del'>-	dget(dentry);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	p_ino = autofs_dentry_ino(dentry-&gt;d_parent);</div><div class='ctx'> 	p_ino-&gt;count++;</div><div class='ctx'> </div><div class='hunk'>@@ -623,12 +630,11 @@ static int autofs_dir_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> static int autofs_dir_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct autofs_sb_info *sbi = autofs_sbi(dir-&gt;i_sb);</div><div class='del'>-	struct autofs_info *ino = autofs_dentry_ino(dentry);</div><div class='ctx'> 	struct autofs_info *p_ino;</div><div class='ctx'> </div><div class='ctx'> 	p_ino = autofs_dentry_ino(dentry-&gt;d_parent);</div><div class='ctx'> 	p_ino-&gt;count--;</div><div class='del'>-	dput(ino-&gt;dentry);</div><div class='add'>+	d_make_discardable(dentry);</div><div class='ctx'> </div><div class='ctx'> 	d_inode(dentry)-&gt;i_size = 0;</div><div class='ctx'> 	clear_nlink(d_inode(dentry));</div><div class='hunk'>@@ -710,7 +716,7 @@ static int autofs_dir_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> 	p_ino = autofs_dentry_ino(dentry-&gt;d_parent);</div><div class='ctx'> 	p_ino-&gt;count--;</div><div class='del'>-	dput(ino-&gt;dentry);</div><div class='add'>+	d_make_discardable(dentry);</div><div class='ctx'> 	d_inode(dentry)-&gt;i_size = 0;</div><div class='ctx'> 	clear_nlink(d_inode(dentry));</div><div class='ctx'> </div><div class='hunk'>@@ -720,9 +726,9 @@ static int autofs_dir_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int autofs_dir_mkdir(struct mnt_idmap *idmap,</div><div class='del'>-			    struct inode *dir, struct dentry *dentry,</div><div class='del'>-			    umode_t mode)</div><div class='add'>+static struct dentry *autofs_dir_mkdir(struct mnt_idmap *idmap,</div><div class='add'>+				       struct inode *dir, struct dentry *dentry,</div><div class='add'>+				       umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct autofs_sb_info *sbi = autofs_sbi(dir-&gt;i_sb);</div><div class='ctx'> 	struct autofs_info *ino = autofs_dentry_ino(dentry);</div><div class='hunk'>@@ -739,19 +745,18 @@ static int autofs_dir_mkdir(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	inode = autofs_get_inode(dir-&gt;i_sb, S_IFDIR | mode);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	d_add(dentry, inode);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;version &lt; 5)</div><div class='ctx'> 		autofs_set_leaf_automount_flags(dentry);</div><div class='ctx'> </div><div class='del'>-	dget(dentry);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	p_ino = autofs_dentry_ino(dentry-&gt;d_parent);</div><div class='ctx'> 	p_ino-&gt;count++;</div><div class='ctx'> 	inc_nlink(dir);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get/set timeout ioctl() operation */</div><div class='head'>diff --git a/fs/backing-file.c b/fs/backing-file.c<br/>index a681f38d84d8..45da8600d564 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/backing-file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/backing-file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/backing-file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/backing-file.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ struct file *backing_file_open(const struct path *user_path, int flags,</div><div class='ctx'> 		return f;</div><div class='ctx'> </div><div class='ctx'> 	path_get(user_path);</div><div class='del'>-	*backing_file_user_path(f) = *user_path;</div><div class='add'>+	backing_file_set_user_path(f, user_path);</div><div class='ctx'> 	error = vfs_open(real_path, f);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fput(f);</div><div class='hunk'>@@ -52,12 +52,35 @@ struct file *backing_file_open(const struct path *user_path, int flags,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(backing_file_open);</div><div class='ctx'> </div><div class='add'>+struct file *backing_tmpfile_open(const struct path *user_path, int flags,</div><div class='add'>+				  const struct path *real_parentpath,</div><div class='add'>+				  umode_t mode, const struct cred *cred)</div><div class='add'>+{</div><div class='add'>+	struct mnt_idmap *real_idmap = mnt_idmap(real_parentpath-&gt;mnt);</div><div class='add'>+	struct file *f;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	f = alloc_empty_backing_file(flags, cred);</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return f;</div><div class='add'>+</div><div class='add'>+	path_get(user_path);</div><div class='add'>+	backing_file_set_user_path(f, user_path);</div><div class='add'>+	error = vfs_tmpfile(real_idmap, real_parentpath, f, mode);</div><div class='add'>+	if (error) {</div><div class='add'>+		fput(f);</div><div class='add'>+		f = ERR_PTR(error);</div><div class='add'>+	}</div><div class='add'>+	return f;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(backing_tmpfile_open);</div><div class='add'>+</div><div class='ctx'> struct backing_aio {</div><div class='ctx'> 	struct kiocb iocb;</div><div class='ctx'> 	refcount_t ref;</div><div class='ctx'> 	struct kiocb *orig_iocb;</div><div class='ctx'> 	/* used for aio completion */</div><div class='del'>-	void (*end_write)(struct file *);</div><div class='add'>+	void (*end_write)(struct kiocb *iocb, ssize_t);</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	long res;</div><div class='ctx'> };</div><div class='hunk'>@@ -85,10 +108,10 @@ static void backing_aio_cleanup(struct backing_aio *aio, long res)</div><div class='ctx'> 	struct kiocb *iocb = &amp;aio-&gt;iocb;</div><div class='ctx'> 	struct kiocb *orig_iocb = aio-&gt;orig_iocb;</div><div class='ctx'> </div><div class='add'>+	orig_iocb-&gt;ki_pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	if (aio-&gt;end_write)</div><div class='del'>-		aio-&gt;end_write(orig_iocb-&gt;ki_filp);</div><div class='add'>+		aio-&gt;end_write(orig_iocb, res);</div><div class='ctx'> </div><div class='del'>-	orig_iocb-&gt;ki_pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	backing_aio_put(aio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -134,13 +157,37 @@ static int backing_aio_init_wq(struct kiocb *iocb)</div><div class='ctx'> 	return sb_init_dio_done_wq(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int do_backing_file_read_iter(struct file *file, struct iov_iter *iter,</div><div class='add'>+				     struct kiocb *iocb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct backing_aio *aio = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (is_sync_kiocb(iocb)) {</div><div class='add'>+		rwf_t rwf = iocb_to_rw_flags(flags);</div><div class='add'>+</div><div class='add'>+		return vfs_iter_read(file, iter, &amp;iocb-&gt;ki_pos, rwf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aio = kmem_cache_zalloc(backing_aio_cachep, GFP_KERNEL);</div><div class='add'>+	if (!aio)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	aio-&gt;orig_iocb = iocb;</div><div class='add'>+	kiocb_clone(&amp;aio-&gt;iocb, iocb, get_file(file));</div><div class='add'>+	aio-&gt;iocb.ki_complete = backing_aio_rw_complete;</div><div class='add'>+	refcount_set(&amp;aio-&gt;ref, 2);</div><div class='add'>+	ret = vfs_iocb_iter_read(file, &amp;aio-&gt;iocb, iter);</div><div class='add'>+	backing_aio_put(aio);</div><div class='add'>+	if (ret != -EIOCBQUEUED)</div><div class='add'>+		backing_aio_cleanup(aio, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 			       struct kiocb *iocb, int flags,</div><div class='ctx'> 			       struct backing_file_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct backing_aio *aio = NULL;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!(file-&gt;f_mode &amp; FMODE_BACKING)))</div><div class='hunk'>@@ -153,41 +200,57 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 	    !(file-&gt;f_mode &amp; FMODE_CAN_ODIRECT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	old_cred = override_creds(ctx-&gt;cred);</div><div class='add'>+	scoped_with_creds(ctx-&gt;cred)</div><div class='add'>+		ret = do_backing_file_read_iter(file, iter, iocb, flags);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;accessed)</div><div class='add'>+		ctx-&gt;accessed(iocb-&gt;ki_filp);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(backing_file_read_iter);</div><div class='add'>+</div><div class='add'>+static int do_backing_file_write_iter(struct file *file, struct iov_iter *iter,</div><div class='add'>+				      struct kiocb *iocb, int flags,</div><div class='add'>+				      void (*end_write)(struct kiocb *, ssize_t))</div><div class='add'>+{</div><div class='add'>+	struct backing_aio *aio;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	if (is_sync_kiocb(iocb)) {</div><div class='ctx'> 		rwf_t rwf = iocb_to_rw_flags(flags);</div><div class='ctx'> </div><div class='del'>-		ret = vfs_iter_read(file, iter, &amp;iocb-&gt;ki_pos, rwf);</div><div class='del'>-	} else {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		aio = kmem_cache_zalloc(backing_aio_cachep, GFP_KERNEL);</div><div class='del'>-		if (!aio)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		aio-&gt;orig_iocb = iocb;</div><div class='del'>-		kiocb_clone(&amp;aio-&gt;iocb, iocb, get_file(file));</div><div class='del'>-		aio-&gt;iocb.ki_complete = backing_aio_rw_complete;</div><div class='del'>-		refcount_set(&amp;aio-&gt;ref, 2);</div><div class='del'>-		ret = vfs_iocb_iter_read(file, &amp;aio-&gt;iocb, iter);</div><div class='del'>-		backing_aio_put(aio);</div><div class='del'>-		if (ret != -EIOCBQUEUED)</div><div class='del'>-			backing_aio_cleanup(aio, ret);</div><div class='add'>+		ret = vfs_iter_write(file, iter, &amp;iocb-&gt;ki_pos, rwf);</div><div class='add'>+		if (end_write)</div><div class='add'>+			end_write(iocb, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;accessed)</div><div class='del'>-		ctx-&gt;accessed(ctx-&gt;user_file);</div><div class='add'>+	ret = backing_aio_init_wq(iocb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	aio = kmem_cache_zalloc(backing_aio_cachep, GFP_KERNEL);</div><div class='add'>+	if (!aio)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	aio-&gt;orig_iocb = iocb;</div><div class='add'>+	aio-&gt;end_write = end_write;</div><div class='add'>+	kiocb_clone(&amp;aio-&gt;iocb, iocb, get_file(file));</div><div class='add'>+	aio-&gt;iocb.ki_flags = flags;</div><div class='add'>+	aio-&gt;iocb.ki_complete = backing_aio_queue_completion;</div><div class='add'>+	refcount_set(&amp;aio-&gt;ref, 2);</div><div class='add'>+	ret = vfs_iocb_iter_write(file, &amp;aio-&gt;iocb, iter);</div><div class='add'>+	backing_aio_put(aio);</div><div class='add'>+	if (ret != -EIOCBQUEUED)</div><div class='add'>+		backing_aio_cleanup(aio, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(backing_file_read_iter);</div><div class='ctx'> </div><div class='ctx'> ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 				struct kiocb *iocb, int flags,</div><div class='ctx'> 				struct backing_file_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!(file-&gt;f_mode &amp; FMODE_BACKING)))</div><div class='hunk'>@@ -196,7 +259,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 	if (!iov_iter_count(iter))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = file_remove_privs(ctx-&gt;user_file);</div><div class='add'>+	ret = file_remove_privs(iocb-&gt;ki_filp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -204,94 +267,56 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 	    !(file-&gt;f_mode &amp; FMODE_CAN_ODIRECT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Stacked filesystems don't support deferred completions, don't copy</div><div class='del'>-	 * this property in case it is set by the issuer.</div><div class='del'>-	 */</div><div class='del'>-	flags &amp;= ~IOCB_DIO_CALLER_COMP;</div><div class='del'>-</div><div class='del'>-	old_cred = override_creds(ctx-&gt;cred);</div><div class='del'>-	if (is_sync_kiocb(iocb)) {</div><div class='del'>-		rwf_t rwf = iocb_to_rw_flags(flags);</div><div class='del'>-</div><div class='del'>-		ret = vfs_iter_write(file, iter, &amp;iocb-&gt;ki_pos, rwf);</div><div class='del'>-		if (ctx-&gt;end_write)</div><div class='del'>-			ctx-&gt;end_write(ctx-&gt;user_file);</div><div class='del'>-	} else {</div><div class='del'>-		struct backing_aio *aio;</div><div class='del'>-</div><div class='del'>-		ret = backing_aio_init_wq(iocb);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		aio = kmem_cache_zalloc(backing_aio_cachep, GFP_KERNEL);</div><div class='del'>-		if (!aio)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		aio-&gt;orig_iocb = iocb;</div><div class='del'>-		aio-&gt;end_write = ctx-&gt;end_write;</div><div class='del'>-		kiocb_clone(&amp;aio-&gt;iocb, iocb, get_file(file));</div><div class='del'>-		aio-&gt;iocb.ki_flags = flags;</div><div class='del'>-		aio-&gt;iocb.ki_complete = backing_aio_queue_completion;</div><div class='del'>-		refcount_set(&amp;aio-&gt;ref, 2);</div><div class='del'>-		ret = vfs_iocb_iter_write(file, &amp;aio-&gt;iocb, iter);</div><div class='del'>-		backing_aio_put(aio);</div><div class='del'>-		if (ret != -EIOCBQUEUED)</div><div class='del'>-			backing_aio_cleanup(aio, ret);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	scoped_with_creds(ctx-&gt;cred)</div><div class='add'>+		return do_backing_file_write_iter(file, iter, iocb, flags, ctx-&gt;end_write);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(backing_file_write_iter);</div><div class='ctx'> </div><div class='del'>-ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,</div><div class='ctx'> 				 struct pipe_inode_info *pipe, size_t len,</div><div class='ctx'> 				 unsigned int flags,</div><div class='ctx'> 				 struct backing_file_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!(in-&gt;f_mode &amp; FMODE_BACKING)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	old_cred = override_creds(ctx-&gt;cred);</div><div class='del'>-	ret = vfs_splice_read(in, ppos, pipe, len, flags);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	scoped_with_creds(ctx-&gt;cred)</div><div class='add'>+		ret = vfs_splice_read(in, &amp;iocb-&gt;ki_pos, pipe, len, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;accessed)</div><div class='del'>-		ctx-&gt;accessed(ctx-&gt;user_file);</div><div class='add'>+		ctx-&gt;accessed(iocb-&gt;ki_filp);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(backing_file_splice_read);</div><div class='ctx'> </div><div class='ctx'> ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,</div><div class='del'>-				  struct file *out, loff_t *ppos, size_t len,</div><div class='del'>-				  unsigned int flags,</div><div class='add'>+				  struct file *out, struct kiocb *iocb,</div><div class='add'>+				  size_t len, unsigned int flags,</div><div class='ctx'> 				  struct backing_file_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!(out-&gt;f_mode &amp; FMODE_BACKING)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	ret = file_remove_privs(ctx-&gt;user_file);</div><div class='add'>+	if (!out-&gt;f_op-&gt;splice_write)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = file_remove_privs(iocb-&gt;ki_filp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	old_cred = override_creds(ctx-&gt;cred);</div><div class='del'>-	file_start_write(out);</div><div class='del'>-	ret = iter_file_splice_write(pipe, out, ppos, len, flags);</div><div class='del'>-	file_end_write(out);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	scoped_with_creds(ctx-&gt;cred) {</div><div class='add'>+		file_start_write(out);</div><div class='add'>+		ret = out-&gt;f_op-&gt;splice_write(pipe, out, &amp;iocb-&gt;ki_pos, len, flags);</div><div class='add'>+		file_end_write(out);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;end_write)</div><div class='del'>-		ctx-&gt;end_write(ctx-&gt;user_file);</div><div class='add'>+		ctx-&gt;end_write(iocb, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -300,24 +325,22 @@ EXPORT_SYMBOL_GPL(backing_file_splice_write);</div><div class='ctx'> int backing_file_mmap(struct file *file, struct vm_area_struct *vma,</div><div class='ctx'> 		      struct backing_file_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='add'>+	struct file *user_file = vma-&gt;vm_file;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!(file-&gt;f_mode &amp; FMODE_BACKING)) ||</div><div class='del'>-	    WARN_ON_ONCE(ctx-&gt;user_file != vma-&gt;vm_file))</div><div class='add'>+	if (WARN_ON_ONCE(!(file-&gt;f_mode &amp; FMODE_BACKING)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (!file-&gt;f_op-&gt;mmap)</div><div class='add'>+	if (!can_mmap_file(file))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	vma_set_file(vma, file);</div><div class='ctx'> </div><div class='del'>-	old_cred = override_creds(ctx-&gt;cred);</div><div class='del'>-	ret = call_mmap(vma-&gt;vm_file, vma);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	scoped_with_creds(ctx-&gt;cred)</div><div class='add'>+		ret = vfs_mmap(vma-&gt;vm_file, vma);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;accessed)</div><div class='del'>-		ctx-&gt;accessed(ctx-&gt;user_file);</div><div class='add'>+		ctx-&gt;accessed(user_file);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -325,9 +348,7 @@ EXPORT_SYMBOL_GPL(backing_file_mmap);</div><div class='ctx'> </div><div class='ctx'> static int __init backing_aio_init(void)</div><div class='ctx'> {</div><div class='del'>-	backing_aio_cachep = kmem_cache_create("backing_aio",</div><div class='del'>-					       sizeof(struct backing_aio),</div><div class='del'>-					       0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+	backing_aio_cachep = KMEM_CACHE(backing_aio, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!backing_aio_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/bad_inode.c b/fs/bad_inode.c<br/>index 316d88da2ce1..0ef9bcb744dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bad_inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bad_inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/bad_inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/bad_inode.c</a></div><div class='hunk'>@@ -58,10 +58,10 @@ static int bad_inode_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bad_inode_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			   struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *bad_inode_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				      struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	return -EIO;</div><div class='add'>+	return ERR_PTR(-EIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bad_inode_rmdir (struct inode *dir, struct dentry *dentry)</div><div class='head'>diff --git a/fs/bcachefs/Kconfig b/fs/bcachefs/Kconfig<br/>deleted file mode 100644<br/>index 5cdfef3b551a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,97 +0,0 @@</div><div class='del'>-</div><div class='del'>-config BCACHEFS_FS</div><div class='del'>-	tristate "bcachefs filesystem support (EXPERIMENTAL)"</div><div class='del'>-	depends on BLOCK</div><div class='del'>-	select EXPORTFS</div><div class='del'>-	select CLOSURES</div><div class='del'>-	select LIBCRC32C</div><div class='del'>-	select CRC64</div><div class='del'>-	select FS_POSIX_ACL</div><div class='del'>-	select LZ4_COMPRESS</div><div class='del'>-	select LZ4_DECOMPRESS</div><div class='del'>-	select LZ4HC_COMPRESS</div><div class='del'>-	select LZ4HC_DECOMPRESS</div><div class='del'>-	select ZLIB_DEFLATE</div><div class='del'>-	select ZLIB_INFLATE</div><div class='del'>-	select ZSTD_COMPRESS</div><div class='del'>-	select ZSTD_DECOMPRESS</div><div class='del'>-	select CRYPTO_SHA256</div><div class='del'>-	select CRYPTO_CHACHA20</div><div class='del'>-	select CRYPTO_POLY1305</div><div class='del'>-	select KEYS</div><div class='del'>-	select RAID6_PQ</div><div class='del'>-	select XOR_BLOCKS</div><div class='del'>-	select XXHASH</div><div class='del'>-	select SRCU</div><div class='del'>-	select SYMBOLIC_ERRNAME</div><div class='del'>-	help</div><div class='del'>-	The bcachefs filesystem - a modern, copy on write filesystem, with</div><div class='del'>-	support for multiple devices, compression, checksumming, etc.</div><div class='del'>-</div><div class='del'>-config BCACHEFS_QUOTA</div><div class='del'>-	bool "bcachefs quota support"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	select QUOTACTL</div><div class='del'>-</div><div class='del'>-config BCACHEFS_ERASURE_CODING</div><div class='del'>-	bool "bcachefs erasure coding (RAID5/6) support (EXPERIMENTAL)"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	select QUOTACTL</div><div class='del'>-	help</div><div class='del'>-	This enables the "erasure_code" filesysystem and inode option, which</div><div class='del'>-	organizes data into reed-solomon stripes instead of ordinary</div><div class='del'>-	replication.</div><div class='del'>-</div><div class='del'>-	WARNING: this feature is still undergoing on disk format changes, and</div><div class='del'>-	should only be enabled for testing purposes.</div><div class='del'>-</div><div class='del'>-config BCACHEFS_POSIX_ACL</div><div class='del'>-	bool "bcachefs POSIX ACL support"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	select FS_POSIX_ACL</div><div class='del'>-</div><div class='del'>-config BCACHEFS_DEBUG</div><div class='del'>-	bool "bcachefs debugging"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	help</div><div class='del'>-	Enables many extra debugging checks and assertions.</div><div class='del'>-</div><div class='del'>-	The resulting code will be significantly slower than normal; you</div><div class='del'>-	probably shouldn't select this option unless you're a developer.</div><div class='del'>-</div><div class='del'>-config BCACHEFS_TESTS</div><div class='del'>-	bool "bcachefs unit and performance tests"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	help</div><div class='del'>-	Include some unit and performance tests for the core btree code</div><div class='del'>-</div><div class='del'>-config BCACHEFS_LOCK_TIME_STATS</div><div class='del'>-       bool "bcachefs lock time statistics"</div><div class='del'>-       depends on BCACHEFS_FS</div><div class='del'>-       help</div><div class='del'>-       Expose statistics for how long we held a lock in debugfs</div><div class='del'>-</div><div class='del'>-config BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-	bool "disable latency accounting and time stats"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	help</div><div class='del'>-	This disables device latency tracking and time stats, only for performance testing</div><div class='del'>-</div><div class='del'>-config BCACHEFS_SIX_OPTIMISTIC_SPIN</div><div class='del'>-	bool "Optimistic spinning for six locks"</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	depends on SMP</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	Instead of immediately sleeping when attempting to take a six lock that</div><div class='del'>-	is held by another thread, spin for a short while, as long as the</div><div class='del'>-	thread owning the lock is running.</div><div class='del'>-</div><div class='del'>-config MEAN_AND_VARIANCE_UNIT_TEST</div><div class='del'>-	tristate "mean_and_variance unit tests" if !KUNIT_ALL_TESTS</div><div class='del'>-	depends on KUNIT</div><div class='del'>-	depends on BCACHEFS_FS</div><div class='del'>-	default KUNIT_ALL_TESTS</div><div class='del'>-	help</div><div class='del'>-	  This option enables the kunit tests for mean_and_variance module.</div><div class='del'>-	  If unsure, say N.</div><div class='head'>diff --git a/fs/bcachefs/Makefile b/fs/bcachefs/Makefile<br/>deleted file mode 100644<br/>index 1a05cecda7cc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_BCACHEFS_FS)	+= bcachefs.o</div><div class='del'>-</div><div class='del'>-bcachefs-y		:=	\</div><div class='del'>-	acl.o			\</div><div class='del'>-	alloc_background.o	\</div><div class='del'>-	alloc_foreground.o	\</div><div class='del'>-	backpointers.o		\</div><div class='del'>-	bkey.o			\</div><div class='del'>-	bkey_methods.o		\</div><div class='del'>-	bkey_sort.o		\</div><div class='del'>-	bset.o			\</div><div class='del'>-	btree_cache.o		\</div><div class='del'>-	btree_gc.o		\</div><div class='del'>-	btree_io.o		\</div><div class='del'>-	btree_iter.o		\</div><div class='del'>-	btree_journal_iter.o	\</div><div class='del'>-	btree_key_cache.o	\</div><div class='del'>-	btree_locking.o		\</div><div class='del'>-	btree_trans_commit.o	\</div><div class='del'>-	btree_update.o		\</div><div class='del'>-	btree_update_interior.o	\</div><div class='del'>-	btree_write_buffer.o	\</div><div class='del'>-	buckets.o		\</div><div class='del'>-	buckets_waiting_for_journal.o	\</div><div class='del'>-	chardev.o		\</div><div class='del'>-	checksum.o		\</div><div class='del'>-	clock.o			\</div><div class='del'>-	compress.o		\</div><div class='del'>-	darray.o		\</div><div class='del'>-	debug.o			\</div><div class='del'>-	dirent.o		\</div><div class='del'>-	disk_groups.o		\</div><div class='del'>-	data_update.o		\</div><div class='del'>-	ec.o			\</div><div class='del'>-	errcode.o		\</div><div class='del'>-	error.o			\</div><div class='del'>-	extents.o		\</div><div class='del'>-	extent_update.o		\</div><div class='del'>-	fs.o			\</div><div class='del'>-	fs-common.o		\</div><div class='del'>-	fs-ioctl.o		\</div><div class='del'>-	fs-io.o			\</div><div class='del'>-	fs-io-buffered.o	\</div><div class='del'>-	fs-io-direct.o		\</div><div class='del'>-	fs-io-pagecache.o	\</div><div class='del'>-	fsck.o			\</div><div class='del'>-	inode.o			\</div><div class='del'>-	io_read.o		\</div><div class='del'>-	io_misc.o		\</div><div class='del'>-	io_write.o		\</div><div class='del'>-	journal.o		\</div><div class='del'>-	journal_io.o		\</div><div class='del'>-	journal_reclaim.o	\</div><div class='del'>-	journal_sb.o		\</div><div class='del'>-	journal_seq_blacklist.o	\</div><div class='del'>-	keylist.o		\</div><div class='del'>-	logged_ops.o		\</div><div class='del'>-	lru.o			\</div><div class='del'>-	mean_and_variance.o	\</div><div class='del'>-	migrate.o		\</div><div class='del'>-	move.o			\</div><div class='del'>-	movinggc.o		\</div><div class='del'>-	nocow_locking.o		\</div><div class='del'>-	opts.o			\</div><div class='del'>-	printbuf.o		\</div><div class='del'>-	quota.o			\</div><div class='del'>-	rebalance.o		\</div><div class='del'>-	recovery.o		\</div><div class='del'>-	reflink.o		\</div><div class='del'>-	replicas.o		\</div><div class='del'>-	sb-clean.o		\</div><div class='del'>-	sb-counters.o		\</div><div class='del'>-	sb-downgrade.o		\</div><div class='del'>-	sb-errors.o		\</div><div class='del'>-	sb-members.o		\</div><div class='del'>-	siphash.o		\</div><div class='del'>-	six.o			\</div><div class='del'>-	snapshot.o		\</div><div class='del'>-	subvolume.o		\</div><div class='del'>-	super.o			\</div><div class='del'>-	super-io.o		\</div><div class='del'>-	sysfs.o			\</div><div class='del'>-	tests.o			\</div><div class='del'>-	thread_with_file.o	\</div><div class='del'>-	trace.o			\</div><div class='del'>-	two_state_shared_lock.o	\</div><div class='del'>-	util.o			\</div><div class='del'>-	varint.o		\</div><div class='del'>-	xattr.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_MEAN_AND_VARIANCE_UNIT_TEST)   += mean_and_variance_test.o</div><div class='head'>diff --git a/fs/bcachefs/acl.c b/fs/bcachefs/acl.c<br/>deleted file mode 100644<br/>index 3640f417cce1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/acl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,464 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/posix_acl.h&gt;</div><div class='del'>-</div><div class='del'>-static const char * const acl_types[] = {</div><div class='del'>-	[ACL_USER_OBJ]	= "user_obj",</div><div class='del'>-	[ACL_USER]	= "user",</div><div class='del'>-	[ACL_GROUP_OBJ]	= "group_obj",</div><div class='del'>-	[ACL_GROUP]	= "group",</div><div class='del'>-	[ACL_MASK]	= "mask",</div><div class='del'>-	[ACL_OTHER]	= "other",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_acl_to_text(struct printbuf *out, const void *value, size_t size)</div><div class='del'>-{</div><div class='del'>-	const void *p, *end = value + size;</div><div class='del'>-</div><div class='del'>-	if (!value ||</div><div class='del'>-	    size &lt; sizeof(bch_acl_header) ||</div><div class='del'>-	    ((bch_acl_header *)value)-&gt;a_version != cpu_to_le32(BCH_ACL_VERSION))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	p = value + sizeof(bch_acl_header);</div><div class='del'>-	while (p &lt; end) {</div><div class='del'>-		const bch_acl_entry *in = p;</div><div class='del'>-		unsigned tag = le16_to_cpu(in-&gt;e_tag);</div><div class='del'>-</div><div class='del'>-		prt_str(out, acl_types[tag]);</div><div class='del'>-</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			p += sizeof(bch_acl_entry_short);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_USER:</div><div class='del'>-			prt_printf(out, " uid %u", le32_to_cpu(in-&gt;e_id));</div><div class='del'>-			p += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			prt_printf(out, " gid %u", le32_to_cpu(in-&gt;e_id));</div><div class='del'>-			p += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prt_printf(out, " %o", le16_to_cpu(in-&gt;e_perm));</div><div class='del'>-</div><div class='del'>-		if (p != end)</div><div class='del'>-			prt_char(out, ' ');</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-</div><div class='del'>-#include "fs.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl_xattr.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-static inline size_t bch2_acl_size(unsigned nr_short, unsigned nr_long)</div><div class='del'>-{</div><div class='del'>-	return sizeof(bch_acl_header) +</div><div class='del'>-		sizeof(bch_acl_entry_short) * nr_short +</div><div class='del'>-		sizeof(bch_acl_entry) * nr_long;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int acl_to_xattr_type(int type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ACL_TYPE_ACCESS:</div><div class='del'>-		return KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS;</div><div class='del'>-	case ACL_TYPE_DEFAULT:</div><div class='del'>-		return KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from filesystem to in-memory representation.</div><div class='del'>- */</div><div class='del'>-static struct posix_acl *bch2_acl_from_disk(struct btree_trans *trans,</div><div class='del'>-					    const void *value, size_t size)</div><div class='del'>-{</div><div class='del'>-	const void *p, *end = value + size;</div><div class='del'>-	struct posix_acl *acl;</div><div class='del'>-	struct posix_acl_entry *out;</div><div class='del'>-	unsigned count = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!value)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (size &lt; sizeof(bch_acl_header))</div><div class='del'>-		goto invalid;</div><div class='del'>-	if (((bch_acl_header *)value)-&gt;a_version !=</div><div class='del'>-	    cpu_to_le32(BCH_ACL_VERSION))</div><div class='del'>-		goto invalid;</div><div class='del'>-</div><div class='del'>-	p = value + sizeof(bch_acl_header);</div><div class='del'>-	while (p &lt; end) {</div><div class='del'>-		const bch_acl_entry *entry = p;</div><div class='del'>-</div><div class='del'>-		if (p + sizeof(bch_acl_entry_short) &gt; end)</div><div class='del'>-			goto invalid;</div><div class='del'>-</div><div class='del'>-		switch (le16_to_cpu(entry-&gt;e_tag)) {</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			p += sizeof(bch_acl_entry_short);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_USER:</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			p += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto invalid;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p &gt; end)</div><div class='del'>-		goto invalid;</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	acl = allocate_dropping_locks(trans, ret,</div><div class='del'>-			posix_acl_alloc(count, _gfp));</div><div class='del'>-	if (!acl)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(acl);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out = acl-&gt;a_entries;</div><div class='del'>-</div><div class='del'>-	p = value + sizeof(bch_acl_header);</div><div class='del'>-	while (p &lt; end) {</div><div class='del'>-		const bch_acl_entry *in = p;</div><div class='del'>-</div><div class='del'>-		out-&gt;e_tag  = le16_to_cpu(in-&gt;e_tag);</div><div class='del'>-		out-&gt;e_perm = le16_to_cpu(in-&gt;e_perm);</div><div class='del'>-</div><div class='del'>-		switch (out-&gt;e_tag) {</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			p += sizeof(bch_acl_entry_short);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_USER:</div><div class='del'>-			out-&gt;e_uid = make_kuid(&amp;init_user_ns,</div><div class='del'>-					       le32_to_cpu(in-&gt;e_id));</div><div class='del'>-			p += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			out-&gt;e_gid = make_kgid(&amp;init_user_ns,</div><div class='del'>-					       le32_to_cpu(in-&gt;e_id));</div><div class='del'>-			p += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		out++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(out != acl-&gt;a_entries + acl-&gt;a_count);</div><div class='del'>-</div><div class='del'>-	return acl;</div><div class='del'>-invalid:</div><div class='del'>-	pr_err("invalid acl entry");</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define acl_for_each_entry(acl, acl_e)			\</div><div class='del'>-	for (acl_e = acl-&gt;a_entries;			\</div><div class='del'>-	     acl_e &lt; acl-&gt;a_entries + acl-&gt;a_count;	\</div><div class='del'>-	     acl_e++)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from in-memory to filesystem representation.</div><div class='del'>- */</div><div class='del'>-static struct bkey_i_xattr *</div><div class='del'>-bch2_acl_to_xattr(struct btree_trans *trans,</div><div class='del'>-		  const struct posix_acl *acl,</div><div class='del'>-		  int type)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_xattr *xattr;</div><div class='del'>-	bch_acl_header *acl_header;</div><div class='del'>-	const struct posix_acl_entry *acl_e;</div><div class='del'>-	void *outptr;</div><div class='del'>-	unsigned nr_short = 0, nr_long = 0, acl_len, u64s;</div><div class='del'>-</div><div class='del'>-	acl_for_each_entry(acl, acl_e) {</div><div class='del'>-		switch (acl_e-&gt;e_tag) {</div><div class='del'>-		case ACL_USER:</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			nr_long++;</div><div class='del'>-			break;</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			nr_short++;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return ERR_PTR(-EINVAL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	acl_len = bch2_acl_size(nr_short, nr_long);</div><div class='del'>-	u64s = BKEY_U64s + xattr_val_u64s(0, acl_len);</div><div class='del'>-</div><div class='del'>-	if (u64s &gt; U8_MAX)</div><div class='del'>-		return ERR_PTR(-E2BIG);</div><div class='del'>-</div><div class='del'>-	xattr = bch2_trans_kmalloc(trans, u64s * sizeof(u64));</div><div class='del'>-	if (IS_ERR(xattr))</div><div class='del'>-		return xattr;</div><div class='del'>-</div><div class='del'>-	bkey_xattr_init(&amp;xattr-&gt;k_i);</div><div class='del'>-	xattr-&gt;k.u64s		= u64s;</div><div class='del'>-	xattr-&gt;v.x_type		= acl_to_xattr_type(type);</div><div class='del'>-	xattr-&gt;v.x_name_len	= 0;</div><div class='del'>-	xattr-&gt;v.x_val_len	= cpu_to_le16(acl_len);</div><div class='del'>-</div><div class='del'>-	acl_header = xattr_val(&amp;xattr-&gt;v);</div><div class='del'>-	acl_header-&gt;a_version = cpu_to_le32(BCH_ACL_VERSION);</div><div class='del'>-</div><div class='del'>-	outptr = (void *) acl_header + sizeof(*acl_header);</div><div class='del'>-</div><div class='del'>-	acl_for_each_entry(acl, acl_e) {</div><div class='del'>-		bch_acl_entry *entry = outptr;</div><div class='del'>-</div><div class='del'>-		entry-&gt;e_tag = cpu_to_le16(acl_e-&gt;e_tag);</div><div class='del'>-		entry-&gt;e_perm = cpu_to_le16(acl_e-&gt;e_perm);</div><div class='del'>-		switch (acl_e-&gt;e_tag) {</div><div class='del'>-		case ACL_USER:</div><div class='del'>-			entry-&gt;e_id = cpu_to_le32(</div><div class='del'>-				from_kuid(&amp;init_user_ns, acl_e-&gt;e_uid));</div><div class='del'>-			outptr += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			entry-&gt;e_id = cpu_to_le32(</div><div class='del'>-				from_kgid(&amp;init_user_ns, acl_e-&gt;e_gid));</div><div class='del'>-			outptr += sizeof(bch_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			outptr += sizeof(bch_acl_entry_short);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(outptr != xattr_val(&amp;xattr-&gt;v) + acl_len);</div><div class='del'>-</div><div class='del'>-	return xattr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct posix_acl *bch2_get_acl(struct mnt_idmap *idmap,</div><div class='del'>-			       struct dentry *dentry, int type)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(dentry-&gt;d_inode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_hash_info hash = bch2_hash_info_init(c, &amp;inode-&gt;ei_inode);</div><div class='del'>-	struct xattr_search_key search = X_SEARCH(acl_to_xattr_type(type), "", 0);</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bkey_s_c_xattr xattr;</div><div class='del'>-	struct posix_acl *acl = NULL;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_lookup(trans, &amp;iter, bch2_xattr_hash_desc,</div><div class='del'>-			&amp;hash, inode_inum(inode), &amp;search, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (!bch2_err_matches(ret, ENOENT))</div><div class='del'>-			acl = ERR_PTR(ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret) {</div><div class='del'>-		acl = ERR_PTR(ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	xattr = bkey_s_c_to_xattr(k);</div><div class='del'>-	acl = bch2_acl_from_disk(trans, xattr_val(xattr.v),</div><div class='del'>-			le16_to_cpu(xattr.v-&gt;x_val_len));</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(acl))</div><div class='del'>-		set_cached_acl(&amp;inode-&gt;v, type, acl);</div><div class='del'>-out:</div><div class='del'>-	if (bch2_err_matches(PTR_ERR_OR_ZERO(acl), BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return acl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_set_acl_trans(struct btree_trans *trans, subvol_inum inum,</div><div class='del'>-		       struct bch_inode_unpacked *inode_u,</div><div class='del'>-		       struct posix_acl *acl, int type)</div><div class='del'>-{</div><div class='del'>-	struct bch_hash_info hash_info = bch2_hash_info_init(trans-&gt;c, inode_u);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (type == ACL_TYPE_DEFAULT &amp;&amp;</div><div class='del'>-	    !S_ISDIR(inode_u-&gt;bi_mode))</div><div class='del'>-		return acl ? -EACCES : 0;</div><div class='del'>-</div><div class='del'>-	if (acl) {</div><div class='del'>-		struct bkey_i_xattr *xattr =</div><div class='del'>-			bch2_acl_to_xattr(trans, acl, type);</div><div class='del'>-		if (IS_ERR(xattr))</div><div class='del'>-			return PTR_ERR(xattr);</div><div class='del'>-</div><div class='del'>-		ret = bch2_hash_set(trans, bch2_xattr_hash_desc, &amp;hash_info,</div><div class='del'>-				    inum, &amp;xattr-&gt;k_i, 0);</div><div class='del'>-	} else {</div><div class='del'>-		struct xattr_search_key search =</div><div class='del'>-			X_SEARCH(acl_to_xattr_type(type), "", 0);</div><div class='del'>-</div><div class='del'>-		ret = bch2_hash_delete(trans, bch2_xattr_hash_desc, &amp;hash_info,</div><div class='del'>-				       inum, &amp;search);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_err_matches(ret, ENOENT) ? 0 : ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_set_acl(struct mnt_idmap *idmap,</div><div class='del'>-		 struct dentry *dentry,</div><div class='del'>-		 struct posix_acl *_acl, int type)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(dentry-&gt;d_inode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter inode_iter = { NULL };</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	struct posix_acl *acl;</div><div class='del'>-	umode_t mode;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-	acl = _acl;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvol_is_ro_trans(trans, inode-&gt;ei_subvol) ?:</div><div class='del'>-		bch2_inode_peek(trans, &amp;inode_iter, &amp;inode_u, inode_inum(inode),</div><div class='del'>-			      BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto btree_err;</div><div class='del'>-</div><div class='del'>-	mode = inode_u.bi_mode;</div><div class='del'>-</div><div class='del'>-	if (type == ACL_TYPE_ACCESS) {</div><div class='del'>-		ret = posix_acl_update_mode(idmap, &amp;inode-&gt;v, &amp;mode, &amp;acl);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto btree_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_set_acl_trans(trans, inode_inum(inode), &amp;inode_u, acl, type);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto btree_err;</div><div class='del'>-</div><div class='del'>-	inode_u.bi_ctime	= bch2_current_time(c);</div><div class='del'>-	inode_u.bi_mode		= mode;</div><div class='del'>-</div><div class='del'>-	ret =   bch2_inode_write(trans, &amp;inode_iter, &amp;inode_u) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL, 0);</div><div class='del'>-btree_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_inode_update_after_write(trans, inode, &amp;inode_u,</div><div class='del'>-				      ATTR_CTIME|ATTR_MODE);</div><div class='del'>-</div><div class='del'>-	set_cached_acl(&amp;inode-&gt;v, type, acl);</div><div class='del'>-err:</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_acl_chmod(struct btree_trans *trans, subvol_inum inum,</div><div class='del'>-		   struct bch_inode_unpacked *inode,</div><div class='del'>-		   umode_t mode,</div><div class='del'>-		   struct posix_acl **new_acl)</div><div class='del'>-{</div><div class='del'>-	struct bch_hash_info hash_info = bch2_hash_info_init(trans-&gt;c, inode);</div><div class='del'>-	struct xattr_search_key search = X_SEARCH(KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS, "", 0);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c_xattr xattr;</div><div class='del'>-	struct bkey_i_xattr *new;</div><div class='del'>-	struct posix_acl *acl = NULL;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_lookup(trans, &amp;iter, bch2_xattr_hash_desc,</div><div class='del'>-			       &amp;hash_info, inum, &amp;search, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		return bch2_err_matches(ret, ENOENT) ? 0 : ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-	xattr = bkey_s_c_to_xattr(k);</div><div class='del'>-</div><div class='del'>-	acl = bch2_acl_from_disk(trans, xattr_val(xattr.v),</div><div class='del'>-			le16_to_cpu(xattr.v-&gt;x_val_len));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(acl);</div><div class='del'>-	if (IS_ERR_OR_NULL(acl))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = allocate_dropping_locks_errcode(trans,</div><div class='del'>-				__posix_acl_chmod(&amp;acl, _gfp, mode));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	new = bch2_acl_to_xattr(trans, acl, ACL_TYPE_ACCESS);</div><div class='del'>-	if (IS_ERR(new)) {</div><div class='del'>-		ret = PTR_ERR(new);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new-&gt;k.p = iter.pos;</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;new-&gt;k_i, 0);</div><div class='del'>-	*new_acl = acl;</div><div class='del'>-	acl = NULL;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	if (!IS_ERR_OR_NULL(acl))</div><div class='del'>-		kfree(acl);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BCACHEFS_POSIX_ACL */</div><div class='head'>diff --git a/fs/bcachefs/acl.h b/fs/bcachefs/acl.h<br/>deleted file mode 100644<br/>index 27e7eec0f278..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/acl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/acl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ACL_H</div><div class='del'>-#define _BCACHEFS_ACL_H</div><div class='del'>-</div><div class='del'>-struct bch_inode_unpacked;</div><div class='del'>-struct bch_hash_info;</div><div class='del'>-struct bch_inode_info;</div><div class='del'>-struct posix_acl;</div><div class='del'>-</div><div class='del'>-#define BCH_ACL_VERSION	0x0001</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le16		e_tag;</div><div class='del'>-	__le16		e_perm;</div><div class='del'>-	__le32		e_id;</div><div class='del'>-} bch_acl_entry;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le16		e_tag;</div><div class='del'>-	__le16		e_perm;</div><div class='del'>-} bch_acl_entry_short;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le32		a_version;</div><div class='del'>-} bch_acl_header;</div><div class='del'>-</div><div class='del'>-void bch2_acl_to_text(struct printbuf *, const void *, size_t);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-</div><div class='del'>-struct posix_acl *bch2_get_acl(struct mnt_idmap *, struct dentry *, int);</div><div class='del'>-</div><div class='del'>-int bch2_set_acl_trans(struct btree_trans *, subvol_inum,</div><div class='del'>-		       struct bch_inode_unpacked *,</div><div class='del'>-		       struct posix_acl *, int);</div><div class='del'>-int bch2_set_acl(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);</div><div class='del'>-int bch2_acl_chmod(struct btree_trans *, subvol_inum,</div><div class='del'>-		   struct bch_inode_unpacked *,</div><div class='del'>-		   umode_t, struct posix_acl **);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int bch2_set_acl_trans(struct btree_trans *trans, subvol_inum inum,</div><div class='del'>-				     struct bch_inode_unpacked *inode_u,</div><div class='del'>-				     struct posix_acl *acl, int type)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_acl_chmod(struct btree_trans *trans, subvol_inum inum,</div><div class='del'>-				 struct bch_inode_unpacked *inode,</div><div class='del'>-				 umode_t mode,</div><div class='del'>-				 struct posix_acl **new_acl)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BCACHEFS_POSIX_ACL */</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_ACL_H */</div><div class='head'>diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c<br/>deleted file mode 100644<br/>index 10704f2d3af5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/alloc_background.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_background.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2218 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "buckets_waiting_for_journal.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "lru.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-#include "varint.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/sched/task.h&gt;</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-</div><div class='del'>-/* Persistent alloc info: */</div><div class='del'>-</div><div class='del'>-static const unsigned BCH_ALLOC_V1_FIELD_BYTES[] = {</div><div class='del'>-#define x(name, bits) [BCH_ALLOC_FIELD_V1_##name] = bits / 8,</div><div class='del'>-	BCH_ALLOC_FIELDS_V1()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bkey_alloc_unpacked {</div><div class='del'>-	u64		journal_seq;</div><div class='del'>-	u8		gen;</div><div class='del'>-	u8		oldest_gen;</div><div class='del'>-	u8		data_type;</div><div class='del'>-	bool		need_discard:1;</div><div class='del'>-	bool		need_inc_gen:1;</div><div class='del'>-#define x(_name, _bits)	u##_bits _name;</div><div class='del'>-	BCH_ALLOC_FIELDS_V2()</div><div class='del'>-#undef  x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline u64 alloc_field_v1_get(const struct bch_alloc *a,</div><div class='del'>-				     const void **p, unsigned field)</div><div class='del'>-{</div><div class='del'>-	unsigned bytes = BCH_ALLOC_V1_FIELD_BYTES[field];</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	if (!(a-&gt;fields &amp; (1 &lt;&lt; field)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (bytes) {</div><div class='del'>-	case 1:</div><div class='del'>-		v = *((const u8 *) *p);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		v = le16_to_cpup(*p);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		v = le32_to_cpup(*p);</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		v = le64_to_cpup(*p);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*p += bytes;</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_alloc_unpack_v1(struct bkey_alloc_unpacked *out,</div><div class='del'>-				 struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	const struct bch_alloc *in = bkey_s_c_to_alloc(k).v;</div><div class='del'>-	const void *d = in-&gt;data;</div><div class='del'>-	unsigned idx = 0;</div><div class='del'>-</div><div class='del'>-	out-&gt;gen = in-&gt;gen;</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits) out-&gt;_name = alloc_field_v1_get(in, &amp;d, idx++);</div><div class='del'>-	BCH_ALLOC_FIELDS_V1()</div><div class='del'>-#undef  x</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_alloc_unpack_v2(struct bkey_alloc_unpacked *out,</div><div class='del'>-				struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_alloc_v2 a = bkey_s_c_to_alloc_v2(k);</div><div class='del'>-	const u8 *in = a.v-&gt;data;</div><div class='del'>-	const u8 *end = bkey_val_end(a);</div><div class='del'>-	unsigned fieldnr = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	out-&gt;gen	= a.v-&gt;gen;</div><div class='del'>-	out-&gt;oldest_gen	= a.v-&gt;oldest_gen;</div><div class='del'>-	out-&gt;data_type	= a.v-&gt;data_type;</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)							\</div><div class='del'>-	if (fieldnr &lt; a.v-&gt;nr_fields) {					\</div><div class='del'>-		ret = bch2_varint_decode_fast(in, end, &amp;v);		\</div><div class='del'>-		if (ret &lt; 0)						\</div><div class='del'>-			return ret;					\</div><div class='del'>-		in += ret;						\</div><div class='del'>-	} else {							\</div><div class='del'>-		v = 0;							\</div><div class='del'>-	}								\</div><div class='del'>-	out-&gt;_name = v;							\</div><div class='del'>-	if (v != out-&gt;_name)						\</div><div class='del'>-		return -1;						\</div><div class='del'>-	fieldnr++;</div><div class='del'>-</div><div class='del'>-	BCH_ALLOC_FIELDS_V2()</div><div class='del'>-#undef  x</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_alloc_unpack_v3(struct bkey_alloc_unpacked *out,</div><div class='del'>-				struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_alloc_v3 a = bkey_s_c_to_alloc_v3(k);</div><div class='del'>-	const u8 *in = a.v-&gt;data;</div><div class='del'>-	const u8 *end = bkey_val_end(a);</div><div class='del'>-	unsigned fieldnr = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	out-&gt;gen	= a.v-&gt;gen;</div><div class='del'>-	out-&gt;oldest_gen	= a.v-&gt;oldest_gen;</div><div class='del'>-	out-&gt;data_type	= a.v-&gt;data_type;</div><div class='del'>-	out-&gt;need_discard = BCH_ALLOC_V3_NEED_DISCARD(a.v);</div><div class='del'>-	out-&gt;need_inc_gen = BCH_ALLOC_V3_NEED_INC_GEN(a.v);</div><div class='del'>-	out-&gt;journal_seq = le64_to_cpu(a.v-&gt;journal_seq);</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)							\</div><div class='del'>-	if (fieldnr &lt; a.v-&gt;nr_fields) {					\</div><div class='del'>-		ret = bch2_varint_decode_fast(in, end, &amp;v);		\</div><div class='del'>-		if (ret &lt; 0)						\</div><div class='del'>-			return ret;					\</div><div class='del'>-		in += ret;						\</div><div class='del'>-	} else {							\</div><div class='del'>-		v = 0;							\</div><div class='del'>-	}								\</div><div class='del'>-	out-&gt;_name = v;							\</div><div class='del'>-	if (v != out-&gt;_name)						\</div><div class='del'>-		return -1;						\</div><div class='del'>-	fieldnr++;</div><div class='del'>-</div><div class='del'>-	BCH_ALLOC_FIELDS_V2()</div><div class='del'>-#undef  x</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_alloc_unpacked bch2_alloc_unpack(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_alloc_unpacked ret = { .gen	= 0 };</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_alloc:</div><div class='del'>-		bch2_alloc_unpack_v1(&amp;ret, k);</div><div class='del'>-		break;</div><div class='del'>-	case KEY_TYPE_alloc_v2:</div><div class='del'>-		bch2_alloc_unpack_v2(&amp;ret, k);</div><div class='del'>-		break;</div><div class='del'>-	case KEY_TYPE_alloc_v3:</div><div class='del'>-		bch2_alloc_unpack_v3(&amp;ret, k);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bch_alloc_v1_val_u64s(const struct bch_alloc *a)</div><div class='del'>-{</div><div class='del'>-	unsigned i, bytes = offsetof(struct bch_alloc, data);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(BCH_ALLOC_V1_FIELD_BYTES); i++)</div><div class='del'>-		if (a-&gt;fields &amp; (1 &lt;&lt; i))</div><div class='del'>-			bytes += BCH_ALLOC_V1_FIELD_BYTES[i];</div><div class='del'>-</div><div class='del'>-	return DIV_ROUND_UP(bytes, sizeof(u64));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_alloc_v1_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_alloc a = bkey_s_c_to_alloc(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* allow for unknown fields */</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(a.k) &lt; bch_alloc_v1_val_u64s(a.v), c, err,</div><div class='del'>-			 alloc_v1_val_size_bad,</div><div class='del'>-			 "incorrect value size (%zu &lt; %u)",</div><div class='del'>-			 bkey_val_u64s(a.k), bch_alloc_v1_val_u64s(a.v));</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_alloc_v2_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_alloc_unpacked u;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bch2_alloc_unpack_v2(&amp;u, k), c, err,</div><div class='del'>-			 alloc_v2_unpack_error,</div><div class='del'>-			 "unpack error");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_alloc_v3_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_alloc_unpacked u;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bch2_alloc_unpack_v3(&amp;u, k), c, err,</div><div class='del'>-			 alloc_v2_unpack_error,</div><div class='del'>-			 "unpack error");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_alloc_v4_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_alloc_v4 a = bkey_s_c_to_alloc_v4(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(alloc_v4_u64s(a.v) &gt; bkey_val_u64s(k.k), c, err,</div><div class='del'>-			 alloc_v4_val_size_bad,</div><div class='del'>-			 "bad val size (%u &gt; %zu)",</div><div class='del'>-			 alloc_v4_u64s(a.v), bkey_val_u64s(k.k));</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!BCH_ALLOC_V4_BACKPOINTERS_START(a.v) &amp;&amp;</div><div class='del'>-			 BCH_ALLOC_V4_NR_BACKPOINTERS(a.v), c, err,</div><div class='del'>-			 alloc_v4_backpointers_start_bad,</div><div class='del'>-			 "invalid backpointers_start");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(alloc_data_type(*a.v, a.v-&gt;data_type) != a.v-&gt;data_type, c, err,</div><div class='del'>-			 alloc_key_data_type_bad,</div><div class='del'>-			 "invalid data type (got %u should be %u)",</div><div class='del'>-			 a.v-&gt;data_type, alloc_data_type(*a.v, a.v-&gt;data_type));</div><div class='del'>-</div><div class='del'>-	switch (a.v-&gt;data_type) {</div><div class='del'>-	case BCH_DATA_free:</div><div class='del'>-	case BCH_DATA_need_gc_gens:</div><div class='del'>-	case BCH_DATA_need_discard:</div><div class='del'>-		bkey_fsck_err_on(bch2_bucket_sectors(*a.v) || a.v-&gt;stripe,</div><div class='del'>-				 c, err, alloc_key_empty_but_have_data,</div><div class='del'>-				 "empty data type free but have data");</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_sb:</div><div class='del'>-	case BCH_DATA_journal:</div><div class='del'>-	case BCH_DATA_btree:</div><div class='del'>-	case BCH_DATA_user:</div><div class='del'>-	case BCH_DATA_parity:</div><div class='del'>-		bkey_fsck_err_on(!bch2_bucket_sectors_dirty(*a.v),</div><div class='del'>-				 c, err, alloc_key_dirty_sectors_0,</div><div class='del'>-				 "data_type %s but dirty_sectors==0",</div><div class='del'>-				 bch2_data_type_str(a.v-&gt;data_type));</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_cached:</div><div class='del'>-		bkey_fsck_err_on(!a.v-&gt;cached_sectors ||</div><div class='del'>-				 bch2_bucket_sectors_dirty(*a.v) ||</div><div class='del'>-				 a.v-&gt;stripe,</div><div class='del'>-				 c, err, alloc_key_cached_inconsistency,</div><div class='del'>-				 "data type inconsistency");</div><div class='del'>-</div><div class='del'>-		bkey_fsck_err_on(!a.v-&gt;io_time[READ] &amp;&amp;</div><div class='del'>-				 c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_alloc_to_lru_refs,</div><div class='del'>-				 c, err, alloc_key_cached_but_read_time_zero,</div><div class='del'>-				 "cached bucket with read_time == 0");</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_stripe:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_alloc_v4_swab(struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	struct bch_alloc_v4 *a = bkey_s_to_alloc_v4(k).v;</div><div class='del'>-	struct bch_backpointer *bp, *bps;</div><div class='del'>-</div><div class='del'>-	a-&gt;journal_seq		= swab64(a-&gt;journal_seq);</div><div class='del'>-	a-&gt;flags		= swab32(a-&gt;flags);</div><div class='del'>-	a-&gt;dirty_sectors	= swab32(a-&gt;dirty_sectors);</div><div class='del'>-	a-&gt;cached_sectors	= swab32(a-&gt;cached_sectors);</div><div class='del'>-	a-&gt;io_time[0]		= swab64(a-&gt;io_time[0]);</div><div class='del'>-	a-&gt;io_time[1]		= swab64(a-&gt;io_time[1]);</div><div class='del'>-	a-&gt;stripe		= swab32(a-&gt;stripe);</div><div class='del'>-	a-&gt;nr_external_backpointers = swab32(a-&gt;nr_external_backpointers);</div><div class='del'>-	a-&gt;fragmentation_lru	= swab64(a-&gt;fragmentation_lru);</div><div class='del'>-</div><div class='del'>-	bps = alloc_v4_backpointers(a);</div><div class='del'>-	for (bp = bps; bp &lt; bps + BCH_ALLOC_V4_NR_BACKPOINTERS(a); bp++) {</div><div class='del'>-		bp-&gt;bucket_offset	= swab40(bp-&gt;bucket_offset);</div><div class='del'>-		bp-&gt;bucket_len		= swab32(bp-&gt;bucket_len);</div><div class='del'>-		bch2_bpos_swab(&amp;bp-&gt;pos);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_alloc_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_alloc_v4 _a;</div><div class='del'>-	const struct bch_alloc_v4 *a = bch2_alloc_to_v4(k, &amp;_a);</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "gen %u oldest_gen %u data_type ", a-&gt;gen, a-&gt;oldest_gen);</div><div class='del'>-	bch2_prt_data_type(out, a-&gt;data_type);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "journal_seq       %llu",	a-&gt;journal_seq);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "need_discard      %llu",	BCH_ALLOC_V4_NEED_DISCARD(a));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "need_inc_gen      %llu",	BCH_ALLOC_V4_NEED_INC_GEN(a));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "dirty_sectors     %u",	a-&gt;dirty_sectors);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "cached_sectors    %u",	a-&gt;cached_sectors);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "stripe            %u",	a-&gt;stripe);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "stripe_redundancy %u",	a-&gt;stripe_redundancy);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "io_time[READ]     %llu",	a-&gt;io_time[READ]);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "io_time[WRITE]    %llu",	a-&gt;io_time[WRITE]);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "fragmentation     %llu",	a-&gt;fragmentation_lru);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "bp_start          %llu", BCH_ALLOC_V4_BACKPOINTERS_START(a));</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_alloc_to_v4(struct bkey_s_c k, struct bch_alloc_v4 *out)</div><div class='del'>-{</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_alloc_v4) {</div><div class='del'>-		void *src, *dst;</div><div class='del'>-</div><div class='del'>-		*out = *bkey_s_c_to_alloc_v4(k).v;</div><div class='del'>-</div><div class='del'>-		src = alloc_v4_backpointers(out);</div><div class='del'>-		SET_BCH_ALLOC_V4_BACKPOINTERS_START(out, BCH_ALLOC_V4_U64s);</div><div class='del'>-		dst = alloc_v4_backpointers(out);</div><div class='del'>-</div><div class='del'>-		if (src &lt; dst)</div><div class='del'>-			memset(src, 0, dst - src);</div><div class='del'>-</div><div class='del'>-		SET_BCH_ALLOC_V4_NR_BACKPOINTERS(out, 0);</div><div class='del'>-	} else {</div><div class='del'>-		struct bkey_alloc_unpacked u = bch2_alloc_unpack(k);</div><div class='del'>-</div><div class='del'>-		*out = (struct bch_alloc_v4) {</div><div class='del'>-			.journal_seq		= u.journal_seq,</div><div class='del'>-			.flags			= u.need_discard,</div><div class='del'>-			.gen			= u.gen,</div><div class='del'>-			.oldest_gen		= u.oldest_gen,</div><div class='del'>-			.data_type		= u.data_type,</div><div class='del'>-			.stripe_redundancy	= u.stripe_redundancy,</div><div class='del'>-			.dirty_sectors		= u.dirty_sectors,</div><div class='del'>-			.cached_sectors		= u.cached_sectors,</div><div class='del'>-			.io_time[READ]		= u.read_time,</div><div class='del'>-			.io_time[WRITE]		= u.write_time,</div><div class='del'>-			.stripe			= u.stripe,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		SET_BCH_ALLOC_V4_BACKPOINTERS_START(out, BCH_ALLOC_V4_U64s);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline struct bkey_i_alloc_v4 *</div><div class='del'>-__bch2_alloc_to_v4_mut(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_alloc_v4 *ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_kmalloc(trans, max(bkey_bytes(k.k), sizeof(struct bkey_i_alloc_v4)));</div><div class='del'>-	if (IS_ERR(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_alloc_v4) {</div><div class='del'>-		void *src, *dst;</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(&amp;ret-&gt;k_i, k);</div><div class='del'>-</div><div class='del'>-		src = alloc_v4_backpointers(&amp;ret-&gt;v);</div><div class='del'>-		SET_BCH_ALLOC_V4_BACKPOINTERS_START(&amp;ret-&gt;v, BCH_ALLOC_V4_U64s);</div><div class='del'>-		dst = alloc_v4_backpointers(&amp;ret-&gt;v);</div><div class='del'>-</div><div class='del'>-		if (src &lt; dst)</div><div class='del'>-			memset(src, 0, dst - src);</div><div class='del'>-</div><div class='del'>-		SET_BCH_ALLOC_V4_NR_BACKPOINTERS(&amp;ret-&gt;v, 0);</div><div class='del'>-		set_alloc_v4_u64s(ret);</div><div class='del'>-	} else {</div><div class='del'>-		bkey_alloc_v4_init(&amp;ret-&gt;k_i);</div><div class='del'>-		ret-&gt;k.p = k.k-&gt;p;</div><div class='del'>-		bch2_alloc_to_v4(k, &amp;ret-&gt;v);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i_alloc_v4 *bch2_alloc_to_v4_mut_inlined(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_alloc_v4 a;</div><div class='del'>-</div><div class='del'>-	if (likely(k.k-&gt;type == KEY_TYPE_alloc_v4) &amp;&amp;</div><div class='del'>-	    ((a = bkey_s_c_to_alloc_v4(k), true) &amp;&amp;</div><div class='del'>-	     BCH_ALLOC_V4_NR_BACKPOINTERS(a.v) == 0))</div><div class='del'>-		return bch2_bkey_make_mut_noupdate_typed(trans, k, alloc_v4);</div><div class='del'>-</div><div class='del'>-	return __bch2_alloc_to_v4_mut(trans, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i_alloc_v4 *bch2_alloc_to_v4_mut(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return bch2_alloc_to_v4_mut_inlined(trans, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i_alloc_v4 *</div><div class='del'>-bch2_trans_start_alloc_update(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			      struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i_alloc_v4 *a;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, iter, BTREE_ID_alloc, pos,</div><div class='del'>-			     BTREE_ITER_WITH_UPDATES|</div><div class='del'>-			     BTREE_ITER_CACHED|</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4_mut_inlined(trans, k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(a);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-	return a;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, iter);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bpos alloc_gens_pos(struct bpos pos, unsigned *offset)</div><div class='del'>-{</div><div class='del'>-	*offset = pos.offset &amp; KEY_TYPE_BUCKET_GENS_MASK;</div><div class='del'>-</div><div class='del'>-	pos.offset &gt;&gt;= KEY_TYPE_BUCKET_GENS_BITS;</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bpos bucket_gens_pos_to_alloc(struct bpos pos, unsigned offset)</div><div class='del'>-{</div><div class='del'>-	pos.offset &lt;&lt;= KEY_TYPE_BUCKET_GENS_BITS;</div><div class='del'>-	pos.offset += offset;</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned alloc_gen(struct bkey_s_c k, unsigned offset)</div><div class='del'>-{</div><div class='del'>-	return k.k-&gt;type == KEY_TYPE_bucket_gens</div><div class='del'>-		? bkey_s_c_to_bucket_gens(k).v-&gt;gens[offset]</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bucket_gens_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			     enum bkey_invalid_flags flags,</div><div class='del'>-			     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_bytes(k.k) != sizeof(struct bch_bucket_gens), c, err,</div><div class='del'>-			 bucket_gens_val_size_bad,</div><div class='del'>-			 "bad val size (%zu != %zu)",</div><div class='del'>-			 bkey_val_bytes(k.k), sizeof(struct bch_bucket_gens));</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bucket_gens_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_bucket_gens g = bkey_s_c_to_bucket_gens(k);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(g.v-&gt;gens); i++) {</div><div class='del'>-		if (i)</div><div class='del'>-			prt_char(out, ' ');</div><div class='del'>-		prt_printf(out, "%u", g.v-&gt;gens[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bucket_gens_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct bkey_i_bucket_gens g;</div><div class='del'>-	bool have_bucket_gens_key = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,</div><div class='del'>-				 BTREE_ITER_PREFETCH, k, ({</div><div class='del'>-		/*</div><div class='del'>-		 * Not a fsck error because this is checked/repaired by</div><div class='del'>-		 * bch2_check_alloc_key() which runs later:</div><div class='del'>-		 */</div><div class='del'>-		if (!bch2_dev_bucket_exists(c, k.k-&gt;p))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		struct bch_alloc_v4 a;</div><div class='del'>-		u8 gen = bch2_alloc_to_v4(k, &amp;a)-&gt;gen;</div><div class='del'>-		unsigned offset;</div><div class='del'>-		struct bpos pos = alloc_gens_pos(iter.pos, &amp;offset);</div><div class='del'>-</div><div class='del'>-		if (have_bucket_gens_key &amp;&amp; bkey_cmp(iter.pos, pos)) {</div><div class='del'>-			ret = commit_do(trans, NULL, NULL,</div><div class='del'>-					BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-				bch2_btree_insert_trans(trans, BTREE_ID_bucket_gens, &amp;g.k_i, 0));</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-			have_bucket_gens_key = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!have_bucket_gens_key) {</div><div class='del'>-			bkey_bucket_gens_init(&amp;g.k_i);</div><div class='del'>-			g.k.p = pos;</div><div class='del'>-			have_bucket_gens_key = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g.v.gens[offset] = gen;</div><div class='del'>-		0;</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	if (have_bucket_gens_key &amp;&amp; !ret)</div><div class='del'>-		ret = commit_do(trans, NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_bucket_gens, &amp;g.k_i, 0));</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_alloc_read(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	down_read(&amp;c-&gt;gc_lock);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;sb.version_upgrade_complete &gt;= bcachefs_metadata_version_bucket_gens) {</div><div class='del'>-		ret = for_each_btree_key(trans, iter, BTREE_ID_bucket_gens, POS_MIN,</div><div class='del'>-					 BTREE_ITER_PREFETCH, k, ({</div><div class='del'>-			u64 start = bucket_gens_pos_to_alloc(k.k-&gt;p, 0).offset;</div><div class='del'>-			u64 end = bucket_gens_pos_to_alloc(bpos_nosnap_successor(k.k-&gt;p), 0).offset;</div><div class='del'>-</div><div class='del'>-			if (k.k-&gt;type != KEY_TYPE_bucket_gens)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			const struct bch_bucket_gens *g = bkey_s_c_to_bucket_gens(k).v;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Not a fsck error because this is checked/repaired by</div><div class='del'>-			 * bch2_check_alloc_key() which runs later:</div><div class='del'>-			 */</div><div class='del'>-			if (!bch2_dev_exists2(c, k.k-&gt;p.inode))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, k.k-&gt;p.inode);</div><div class='del'>-</div><div class='del'>-			for (u64 b = max_t(u64, ca-&gt;mi.first_bucket, start);</div><div class='del'>-			     b &lt; min_t(u64, ca-&gt;mi.nbuckets, end);</div><div class='del'>-			     b++)</div><div class='del'>-				*bucket_gen(ca, b) = g-&gt;gens[b &amp; KEY_TYPE_BUCKET_GENS_MASK];</div><div class='del'>-			0;</div><div class='del'>-		}));</div><div class='del'>-	} else {</div><div class='del'>-		ret = for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,</div><div class='del'>-					 BTREE_ITER_PREFETCH, k, ({</div><div class='del'>-			/*</div><div class='del'>-			 * Not a fsck error because this is checked/repaired by</div><div class='del'>-			 * bch2_check_alloc_key() which runs later:</div><div class='del'>-			 */</div><div class='del'>-			if (!bch2_dev_bucket_exists(c, k.k-&gt;p))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, k.k-&gt;p.inode);</div><div class='del'>-</div><div class='del'>-			struct bch_alloc_v4 a;</div><div class='del'>-			*bucket_gen(ca, k.k-&gt;p.offset) = bch2_alloc_to_v4(k, &amp;a)-&gt;gen;</div><div class='del'>-			0;</div><div class='del'>-		}));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	up_read(&amp;c-&gt;gc_lock);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Free space/discard btree: */</div><div class='del'>-</div><div class='del'>-static int bch2_bucket_do_index(struct btree_trans *trans,</div><div class='del'>-				struct bkey_s_c alloc_k,</div><div class='del'>-				const struct bch_alloc_v4 *a,</div><div class='del'>-				bool set)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, alloc_k.k-&gt;p.inode);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c old;</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	enum btree_id btree;</div><div class='del'>-	enum bch_bkey_type old_type = !set ? KEY_TYPE_set : KEY_TYPE_deleted;</div><div class='del'>-	enum bch_bkey_type new_type =  set ? KEY_TYPE_set : KEY_TYPE_deleted;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (a-&gt;data_type != BCH_DATA_free &amp;&amp;</div><div class='del'>-	    a-&gt;data_type != BCH_DATA_need_discard)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	k = bch2_trans_kmalloc_nomemzero(trans, sizeof(*k));</div><div class='del'>-	if (IS_ERR(k))</div><div class='del'>-		return PTR_ERR(k);</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;k-&gt;k);</div><div class='del'>-	k-&gt;k.type = new_type;</div><div class='del'>-</div><div class='del'>-	switch (a-&gt;data_type) {</div><div class='del'>-	case BCH_DATA_free:</div><div class='del'>-		btree = BTREE_ID_freespace;</div><div class='del'>-		k-&gt;k.p = alloc_freespace_pos(alloc_k.k-&gt;p, *a);</div><div class='del'>-		bch2_key_resize(&amp;k-&gt;k, 1);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_need_discard:</div><div class='del'>-		btree = BTREE_ID_need_discard;</div><div class='del'>-		k-&gt;k.p = alloc_k.k-&gt;p;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old = bch2_bkey_get_iter(trans, &amp;iter, btree,</div><div class='del'>-			     bkey_start_pos(&amp;k-&gt;k),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(old);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.freespace_initialized &amp;&amp;</div><div class='del'>-	    c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_alloc_info &amp;&amp;</div><div class='del'>-	    bch2_trans_inconsistent_on(old.k-&gt;type != old_type, trans,</div><div class='del'>-			"incorrect key when %s %s:%llu:%llu:0 (got %s should be %s)\n"</div><div class='del'>-			"  for %s",</div><div class='del'>-			set ? "setting" : "clearing",</div><div class='del'>-			bch2_btree_id_str(btree),</div><div class='del'>-			iter.pos.inode,</div><div class='del'>-			iter.pos.offset,</div><div class='del'>-			bch2_bkey_types[old.k-&gt;type],</div><div class='del'>-			bch2_bkey_types[old_type],</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf))) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, k, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_bucket_gen_update(struct btree_trans *trans,</div><div class='del'>-					   struct bpos bucket, u8 gen)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	unsigned offset;</div><div class='del'>-	struct bpos pos = alloc_gens_pos(bucket, &amp;offset);</div><div class='del'>-	struct bkey_i_bucket_gens *g;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g = bch2_trans_kmalloc(trans, sizeof(*g));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(g);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_bucket_gens, pos,</div><div class='del'>-			       BTREE_ITER_INTENT|</div><div class='del'>-			       BTREE_ITER_WITH_UPDATES);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_bucket_gens) {</div><div class='del'>-		bkey_bucket_gens_init(&amp;g-&gt;k_i);</div><div class='del'>-		g-&gt;k.p = iter.pos;</div><div class='del'>-	} else {</div><div class='del'>-		bkey_reassemble(&amp;g-&gt;k_i, k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g-&gt;v.gens[offset] = gen;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;g-&gt;k_i, 0);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_alloc(struct btree_trans *trans,</div><div class='del'>-		       enum btree_id btree, unsigned level,</div><div class='del'>-		       struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-		       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (bch2_trans_inconsistent_on(!bch2_dev_bucket_exists(c, new.k-&gt;p), trans,</div><div class='del'>-				       "alloc key for invalid device or bucket"))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, new.k-&gt;p.inode);</div><div class='del'>-</div><div class='del'>-	struct bch_alloc_v4 old_a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *old_a = bch2_alloc_to_v4(old, &amp;old_a_convert);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		struct bch_alloc_v4 *new_a = bkey_s_to_alloc_v4(new).v;</div><div class='del'>-</div><div class='del'>-		new_a-&gt;data_type = alloc_data_type(*new_a, new_a-&gt;data_type);</div><div class='del'>-</div><div class='del'>-		if (bch2_bucket_sectors(*new_a) &gt; bch2_bucket_sectors(*old_a)) {</div><div class='del'>-			new_a-&gt;io_time[READ] = max_t(u64, 1, atomic64_read(&amp;c-&gt;io_clock[READ].now));</div><div class='del'>-			new_a-&gt;io_time[WRITE]= max_t(u64, 1, atomic64_read(&amp;c-&gt;io_clock[WRITE].now));</div><div class='del'>-			SET_BCH_ALLOC_V4_NEED_INC_GEN(new_a, true);</div><div class='del'>-			SET_BCH_ALLOC_V4_NEED_DISCARD(new_a, true);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (data_type_is_empty(new_a-&gt;data_type) &amp;&amp;</div><div class='del'>-		    BCH_ALLOC_V4_NEED_INC_GEN(new_a) &amp;&amp;</div><div class='del'>-		    !bch2_bucket_is_open_safe(c, new.k-&gt;p.inode, new.k-&gt;p.offset)) {</div><div class='del'>-			new_a-&gt;gen++;</div><div class='del'>-			SET_BCH_ALLOC_V4_NEED_INC_GEN(new_a, false);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (old_a-&gt;data_type != new_a-&gt;data_type ||</div><div class='del'>-		    (new_a-&gt;data_type == BCH_DATA_free &amp;&amp;</div><div class='del'>-		     alloc_freespace_genbits(*old_a) != alloc_freespace_genbits(*new_a))) {</div><div class='del'>-			ret =   bch2_bucket_do_index(trans, old, old_a, false) ?:</div><div class='del'>-				bch2_bucket_do_index(trans, new.s_c, new_a, true);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (new_a-&gt;data_type == BCH_DATA_cached &amp;&amp;</div><div class='del'>-		    !new_a-&gt;io_time[READ])</div><div class='del'>-			new_a-&gt;io_time[READ] = max_t(u64, 1, atomic64_read(&amp;c-&gt;io_clock[READ].now));</div><div class='del'>-</div><div class='del'>-		u64 old_lru = alloc_lru_idx_read(*old_a);</div><div class='del'>-		u64 new_lru = alloc_lru_idx_read(*new_a);</div><div class='del'>-		if (old_lru != new_lru) {</div><div class='del'>-			ret = bch2_lru_change(trans, new.k-&gt;p.inode,</div><div class='del'>-					      bucket_to_u64(new.k-&gt;p),</div><div class='del'>-					      old_lru, new_lru);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new_a-&gt;fragmentation_lru = alloc_lru_idx_fragmentation(*new_a,</div><div class='del'>-						bch_dev_bkey_exists(c, new.k-&gt;p.inode));</div><div class='del'>-		if (old_a-&gt;fragmentation_lru != new_a-&gt;fragmentation_lru) {</div><div class='del'>-			ret = bch2_lru_change(trans,</div><div class='del'>-					BCH_LRU_FRAGMENTATION_START,</div><div class='del'>-					bucket_to_u64(new.k-&gt;p),</div><div class='del'>-					old_a-&gt;fragmentation_lru, new_a-&gt;fragmentation_lru);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (old_a-&gt;gen != new_a-&gt;gen) {</div><div class='del'>-			ret = bch2_bucket_gen_update(trans, new.k-&gt;p, new_a-&gt;gen);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * need to know if we're getting called from the invalidate path or</div><div class='del'>-		 * not:</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if ((flags &amp; BTREE_TRIGGER_BUCKET_INVALIDATE) &amp;&amp;</div><div class='del'>-		    old_a-&gt;cached_sectors) {</div><div class='del'>-			ret = bch2_update_cached_sectors_list(trans, new.k-&gt;p.inode,</div><div class='del'>-							      -((s64) old_a-&gt;cached_sectors));</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; BTREE_TRIGGER_ATOMIC) &amp;&amp; (flags &amp; BTREE_TRIGGER_INSERT)) {</div><div class='del'>-		struct bch_alloc_v4 *new_a = bkey_s_to_alloc_v4(new).v;</div><div class='del'>-		u64 journal_seq = trans-&gt;journal_res.seq;</div><div class='del'>-		u64 bucket_journal_seq = new_a-&gt;journal_seq;</div><div class='del'>-</div><div class='del'>-		if ((flags &amp; BTREE_TRIGGER_INSERT) &amp;&amp;</div><div class='del'>-		    data_type_is_empty(old_a-&gt;data_type) !=</div><div class='del'>-		    data_type_is_empty(new_a-&gt;data_type) &amp;&amp;</div><div class='del'>-		    new.k-&gt;type == KEY_TYPE_alloc_v4) {</div><div class='del'>-			struct bch_alloc_v4 *v = bkey_s_to_alloc_v4(new).v;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * If the btree updates referring to a bucket weren't flushed</div><div class='del'>-			 * before the bucket became empty again, then the we don't have</div><div class='del'>-			 * to wait on a journal flush before we can reuse the bucket:</div><div class='del'>-			 */</div><div class='del'>-			v-&gt;journal_seq = bucket_journal_seq =</div><div class='del'>-				data_type_is_empty(new_a-&gt;data_type) &amp;&amp;</div><div class='del'>-				(journal_seq == v-&gt;journal_seq ||</div><div class='del'>-				 bch2_journal_noflush_seq(&amp;c-&gt;journal, v-&gt;journal_seq))</div><div class='del'>-				? 0 : journal_seq;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!data_type_is_empty(old_a-&gt;data_type) &amp;&amp;</div><div class='del'>-		    data_type_is_empty(new_a-&gt;data_type) &amp;&amp;</div><div class='del'>-		    bucket_journal_seq) {</div><div class='del'>-			ret = bch2_set_bucket_needs_journal_commit(&amp;c-&gt;buckets_waiting_for_journal,</div><div class='del'>-					c-&gt;journal.flushed_seq_ondisk,</div><div class='del'>-					new.k-&gt;p.inode, new.k-&gt;p.offset,</div><div class='del'>-					bucket_journal_seq);</div><div class='del'>-			if (ret) {</div><div class='del'>-				bch2_fs_fatal_error(c,</div><div class='del'>-					"error setting bucket_needs_journal_commit: %i", ret);</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		if (new_a-&gt;gen != old_a-&gt;gen)</div><div class='del'>-			*bucket_gen(ca, new.k-&gt;p.offset) = new_a-&gt;gen;</div><div class='del'>-</div><div class='del'>-		bch2_dev_usage_update(c, ca, old_a, new_a, journal_seq, false);</div><div class='del'>-</div><div class='del'>-		if (new_a-&gt;data_type == BCH_DATA_free &amp;&amp;</div><div class='del'>-		    (!new_a-&gt;journal_seq || new_a-&gt;journal_seq &lt; c-&gt;journal.flushed_seq_ondisk))</div><div class='del'>-			closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-</div><div class='del'>-		if (new_a-&gt;data_type == BCH_DATA_need_discard &amp;&amp;</div><div class='del'>-		    (!bucket_journal_seq || bucket_journal_seq &lt; c-&gt;journal.flushed_seq_ondisk))</div><div class='del'>-			bch2_do_discards(c);</div><div class='del'>-</div><div class='del'>-		if (old_a-&gt;data_type != BCH_DATA_cached &amp;&amp;</div><div class='del'>-		    new_a-&gt;data_type == BCH_DATA_cached &amp;&amp;</div><div class='del'>-		    should_invalidate_buckets(ca, bch2_dev_usage_read(ca)))</div><div class='del'>-			bch2_do_invalidates(c);</div><div class='del'>-</div><div class='del'>-		if (new_a-&gt;data_type == BCH_DATA_need_gc_gens)</div><div class='del'>-			bch2_do_gc_gens(c);</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; BTREE_TRIGGER_GC) &amp;&amp;</div><div class='del'>-	    (flags &amp; BTREE_TRIGGER_BUCKET_INVALIDATE)) {</div><div class='del'>-		struct bch_alloc_v4 new_a_convert;</div><div class='del'>-		const struct bch_alloc_v4 *new_a = bch2_alloc_to_v4(new.s_c, &amp;new_a_convert);</div><div class='del'>-</div><div class='del'>-		percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		struct bucket *g = gc_bucket(ca, new.k-&gt;p.offset);</div><div class='del'>-</div><div class='del'>-		bucket_lock(g);</div><div class='del'>-</div><div class='del'>-		g-&gt;gen_valid		= 1;</div><div class='del'>-		g-&gt;gen			= new_a-&gt;gen;</div><div class='del'>-		g-&gt;data_type		= new_a-&gt;data_type;</div><div class='del'>-		g-&gt;stripe		= new_a-&gt;stripe;</div><div class='del'>-		g-&gt;stripe_redundancy	= new_a-&gt;stripe_redundancy;</div><div class='del'>-		g-&gt;dirty_sectors	= new_a-&gt;dirty_sectors;</div><div class='del'>-		g-&gt;cached_sectors	= new_a-&gt;cached_sectors;</div><div class='del'>-</div><div class='del'>-		bucket_unlock(g);</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This synthesizes deleted extents for holes, similar to BTREE_ITER_SLOTS for</div><div class='del'>- * extents style btrees, but works on non-extents btrees:</div><div class='del'>- */</div><div class='del'>-static struct bkey_s_c bch2_get_key_or_hole(struct btree_iter *iter, struct bpos end, struct bkey *hole)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-</div><div class='del'>-	if (bkey_err(k))</div><div class='del'>-		return k;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type) {</div><div class='del'>-		return k;</div><div class='del'>-	} else {</div><div class='del'>-		struct btree_iter iter2;</div><div class='del'>-		struct bpos next;</div><div class='del'>-</div><div class='del'>-		bch2_trans_copy_iter(&amp;iter2, iter);</div><div class='del'>-</div><div class='del'>-		struct btree_path *path = btree_iter_path(iter-&gt;trans, iter);</div><div class='del'>-		if (!bpos_eq(path-&gt;l[0].b-&gt;key.k.p, SPOS_MAX))</div><div class='del'>-			end = bkey_min(end, bpos_nosnap_successor(path-&gt;l[0].b-&gt;key.k.p));</div><div class='del'>-</div><div class='del'>-		end = bkey_min(end, POS(iter-&gt;pos.inode, iter-&gt;pos.offset + U32_MAX - 1));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * btree node min/max is a closed interval, upto takes a half</div><div class='del'>-		 * open interval:</div><div class='del'>-		 */</div><div class='del'>-		k = bch2_btree_iter_peek_upto(&amp;iter2, end);</div><div class='del'>-		next = iter2.pos;</div><div class='del'>-		bch2_trans_iter_exit(iter-&gt;trans, &amp;iter2);</div><div class='del'>-</div><div class='del'>-		BUG_ON(next.offset &gt;= iter-&gt;pos.offset + U32_MAX);</div><div class='del'>-</div><div class='del'>-		if (bkey_err(k))</div><div class='del'>-			return k;</div><div class='del'>-</div><div class='del'>-		bkey_init(hole);</div><div class='del'>-		hole-&gt;p = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-		bch2_key_resize(hole, next.offset - iter-&gt;pos.offset);</div><div class='del'>-		return (struct bkey_s_c) { hole, NULL };</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool next_bucket(struct bch_fs *c, struct bpos *bucket)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_bucket_exists(c, *bucket))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_exists2(c, bucket-&gt;inode)) {</div><div class='del'>-		ca = bch_dev_bkey_exists(c, bucket-&gt;inode);</div><div class='del'>-</div><div class='del'>-		if (bucket-&gt;offset &lt; ca-&gt;mi.first_bucket) {</div><div class='del'>-			bucket-&gt;offset = ca-&gt;mi.first_bucket;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bucket-&gt;inode++;</div><div class='del'>-		bucket-&gt;offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ca = __bch2_next_dev_idx(c, bucket-&gt;inode, NULL);</div><div class='del'>-	if (ca)</div><div class='del'>-		*bucket = POS(ca-&gt;dev_idx, ca-&gt;mi.first_bucket);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ca != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c bch2_get_key_or_real_bucket_hole(struct btree_iter *iter, struct bkey *hole)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = iter-&gt;trans-&gt;c;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-again:</div><div class='del'>-	k = bch2_get_key_or_hole(iter, POS_MAX, hole);</div><div class='del'>-	if (bkey_err(k))</div><div class='del'>-		return k;</div><div class='del'>-</div><div class='del'>-	if (!k.k-&gt;type) {</div><div class='del'>-		struct bpos bucket = bkey_start_pos(k.k);</div><div class='del'>-</div><div class='del'>-		if (!bch2_dev_bucket_exists(c, bucket)) {</div><div class='del'>-			if (!next_bucket(c, &amp;bucket))</div><div class='del'>-				return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-			bch2_btree_iter_set_pos(iter, bucket);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!bch2_dev_bucket_exists(c, k.k-&gt;p)) {</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, bucket.inode);</div><div class='del'>-</div><div class='del'>-			bch2_key_resize(hole, ca-&gt;mi.nbuckets - bucket.offset);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline_for_stack</div><div class='del'>-int bch2_check_alloc_key(struct btree_trans *trans,</div><div class='del'>-			 struct bkey_s_c alloc_k,</div><div class='del'>-			 struct btree_iter *alloc_iter,</div><div class='del'>-			 struct btree_iter *discard_iter,</div><div class='del'>-			 struct btree_iter *freespace_iter,</div><div class='del'>-			 struct btree_iter *bucket_gens_iter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	unsigned discard_key_type, freespace_key_type;</div><div class='del'>-	unsigned gens_offset;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!bch2_dev_bucket_exists(c, alloc_k.k-&gt;p), c,</div><div class='del'>-			alloc_key_to_missing_dev_bucket,</div><div class='del'>-			"alloc key for invalid device:bucket %llu:%llu",</div><div class='del'>-			alloc_k.k-&gt;p.inode, alloc_k.k-&gt;p.offset))</div><div class='del'>-		return bch2_btree_delete_at(trans, alloc_iter, 0);</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, alloc_k.k-&gt;p.inode);</div><div class='del'>-	if (!ca-&gt;mi.freespace_initialized)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(alloc_k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-	discard_key_type = a-&gt;data_type == BCH_DATA_need_discard ? KEY_TYPE_set : 0;</div><div class='del'>-	bch2_btree_iter_set_pos(discard_iter, alloc_k.k-&gt;p);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(discard_iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != discard_key_type &amp;&amp;</div><div class='del'>-	    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-	     fsck_err(c, need_discard_key_wrong,</div><div class='del'>-		      "incorrect key in need_discard btree (got %s should be %s)\n"</div><div class='del'>-		      "  %s",</div><div class='del'>-		      bch2_bkey_types[k.k-&gt;type],</div><div class='del'>-		      bch2_bkey_types[discard_key_type],</div><div class='del'>-		      (bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf)))) {</div><div class='del'>-		struct bkey_i *update =</div><div class='del'>-			bch2_trans_kmalloc(trans, sizeof(*update));</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(update);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;update-&gt;k);</div><div class='del'>-		update-&gt;k.type	= discard_key_type;</div><div class='del'>-		update-&gt;k.p	= discard_iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, discard_iter, update, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	freespace_key_type = a-&gt;data_type == BCH_DATA_free ? KEY_TYPE_set : 0;</div><div class='del'>-	bch2_btree_iter_set_pos(freespace_iter, alloc_freespace_pos(alloc_k.k-&gt;p, *a));</div><div class='del'>-	k = bch2_btree_iter_peek_slot(freespace_iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != freespace_key_type &amp;&amp;</div><div class='del'>-	    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-	     fsck_err(c, freespace_key_wrong,</div><div class='del'>-		      "incorrect key in freespace btree (got %s should be %s)\n"</div><div class='del'>-		      "  %s",</div><div class='del'>-		      bch2_bkey_types[k.k-&gt;type],</div><div class='del'>-		      bch2_bkey_types[freespace_key_type],</div><div class='del'>-		      (printbuf_reset(&amp;buf),</div><div class='del'>-		       bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf)))) {</div><div class='del'>-		struct bkey_i *update =</div><div class='del'>-			bch2_trans_kmalloc(trans, sizeof(*update));</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(update);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;update-&gt;k);</div><div class='del'>-		update-&gt;k.type	= freespace_key_type;</div><div class='del'>-		update-&gt;k.p	= freespace_iter-&gt;pos;</div><div class='del'>-		bch2_key_resize(&amp;update-&gt;k, 1);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, freespace_iter, update, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_pos(bucket_gens_iter, alloc_gens_pos(alloc_k.k-&gt;p, &amp;gens_offset));</div><div class='del'>-	k = bch2_btree_iter_peek_slot(bucket_gens_iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (a-&gt;gen != alloc_gen(k, gens_offset) &amp;&amp;</div><div class='del'>-	    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-	     fsck_err(c, bucket_gens_key_wrong,</div><div class='del'>-		      "incorrect gen in bucket_gens btree (got %u should be %u)\n"</div><div class='del'>-		      "  %s",</div><div class='del'>-		      alloc_gen(k, gens_offset), a-&gt;gen,</div><div class='del'>-		      (printbuf_reset(&amp;buf),</div><div class='del'>-		       bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf)))) {</div><div class='del'>-		struct bkey_i_bucket_gens *g =</div><div class='del'>-			bch2_trans_kmalloc(trans, sizeof(*g));</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(g);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type == KEY_TYPE_bucket_gens) {</div><div class='del'>-			bkey_reassemble(&amp;g-&gt;k_i, k);</div><div class='del'>-		} else {</div><div class='del'>-			bkey_bucket_gens_init(&amp;g-&gt;k_i);</div><div class='del'>-			g-&gt;k.p = alloc_gens_pos(alloc_k.k-&gt;p, &amp;gens_offset);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g-&gt;v.gens[gens_offset] = a-&gt;gen;</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, bucket_gens_iter, &amp;g-&gt;k_i, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline_for_stack</div><div class='del'>-int bch2_check_alloc_hole_freespace(struct btree_trans *trans,</div><div class='del'>-				    struct bpos start,</div><div class='del'>-				    struct bpos *end,</div><div class='del'>-				    struct btree_iter *freespace_iter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, start.inode);</div><div class='del'>-	if (!ca-&gt;mi.freespace_initialized)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_pos(freespace_iter, start);</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(freespace_iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	*end = bkey_min(k.k-&gt;p, *end);</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_set &amp;&amp;</div><div class='del'>-	    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-	     fsck_err(c, freespace_hole_missing,</div><div class='del'>-		      "hole in alloc btree missing in freespace btree\n"</div><div class='del'>-		      "  device %llu buckets %llu-%llu",</div><div class='del'>-		      freespace_iter-&gt;pos.inode,</div><div class='del'>-		      freespace_iter-&gt;pos.offset,</div><div class='del'>-		      end-&gt;offset))) {</div><div class='del'>-		struct bkey_i *update =</div><div class='del'>-			bch2_trans_kmalloc(trans, sizeof(*update));</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(update);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;update-&gt;k);</div><div class='del'>-		update-&gt;k.type	= KEY_TYPE_set;</div><div class='del'>-		update-&gt;k.p	= freespace_iter-&gt;pos;</div><div class='del'>-		bch2_key_resize(&amp;update-&gt;k,</div><div class='del'>-				min_t(u64, U32_MAX, end-&gt;offset -</div><div class='del'>-				      freespace_iter-&gt;pos.offset));</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, freespace_iter, update, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline_for_stack</div><div class='del'>-int bch2_check_alloc_hole_bucket_gens(struct btree_trans *trans,</div><div class='del'>-				      struct bpos start,</div><div class='del'>-				      struct bpos *end,</div><div class='del'>-				      struct btree_iter *bucket_gens_iter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	unsigned i, gens_offset, gens_end_offset;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_pos(bucket_gens_iter, alloc_gens_pos(start, &amp;gens_offset));</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(bucket_gens_iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (bkey_cmp(alloc_gens_pos(start, &amp;gens_offset),</div><div class='del'>-		     alloc_gens_pos(*end,  &amp;gens_end_offset)))</div><div class='del'>-		gens_end_offset = KEY_TYPE_BUCKET_GENS_NR;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_bucket_gens) {</div><div class='del'>-		struct bkey_i_bucket_gens g;</div><div class='del'>-		bool need_update = false;</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(&amp;g.k_i, k);</div><div class='del'>-</div><div class='del'>-		for (i = gens_offset; i &lt; gens_end_offset; i++) {</div><div class='del'>-			if (fsck_err_on(g.v.gens[i], c,</div><div class='del'>-					bucket_gens_hole_wrong,</div><div class='del'>-					"hole in alloc btree at %llu:%llu with nonzero gen in bucket_gens btree (%u)",</div><div class='del'>-					bucket_gens_pos_to_alloc(k.k-&gt;p, i).inode,</div><div class='del'>-					bucket_gens_pos_to_alloc(k.k-&gt;p, i).offset,</div><div class='del'>-					g.v.gens[i])) {</div><div class='del'>-				g.v.gens[i] = 0;</div><div class='del'>-				need_update = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (need_update) {</div><div class='del'>-			struct bkey_i *u = bch2_trans_kmalloc(trans, sizeof(g));</div><div class='del'>-</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			memcpy(u, &amp;g, sizeof(g));</div><div class='del'>-</div><div class='del'>-			ret = bch2_trans_update(trans, bucket_gens_iter, u, 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*end = bkey_min(*end, bucket_gens_pos_to_alloc(bpos_nosnap_successor(k.k-&gt;p), 0));</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline_for_stack int bch2_check_discard_freespace_key(struct btree_trans *trans,</div><div class='del'>-					      struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter alloc_iter;</div><div class='del'>-	struct bkey_s_c alloc_k;</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	u64 genbits;</div><div class='del'>-	struct bpos pos;</div><div class='del'>-	enum bch_data_type state = iter-&gt;btree_id == BTREE_ID_need_discard</div><div class='del'>-		? BCH_DATA_need_discard</div><div class='del'>-		: BCH_DATA_free;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	pos = iter-&gt;pos;</div><div class='del'>-	pos.offset &amp;= ~(~0ULL &lt;&lt; 56);</div><div class='del'>-	genbits = iter-&gt;pos.offset &amp; (~0ULL &lt;&lt; 56);</div><div class='del'>-</div><div class='del'>-	alloc_k = bch2_bkey_get_iter(trans, &amp;alloc_iter, BTREE_ID_alloc, pos, 0);</div><div class='del'>-	ret = bkey_err(alloc_k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!bch2_dev_bucket_exists(c, pos), c,</div><div class='del'>-			need_discard_freespace_key_to_invalid_dev_bucket,</div><div class='del'>-			"entry in %s btree for nonexistant dev:bucket %llu:%llu",</div><div class='del'>-			bch2_btree_id_str(iter-&gt;btree_id), pos.inode, pos.offset))</div><div class='del'>-		goto delete;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(alloc_k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(a-&gt;data_type != state ||</div><div class='del'>-			(state == BCH_DATA_free &amp;&amp;</div><div class='del'>-			 genbits != alloc_freespace_genbits(*a)), c,</div><div class='del'>-			need_discard_freespace_key_bad,</div><div class='del'>-			"%s\n  incorrectly set at %s:%llu:%llu:0 (free %u, genbits %llu should be %llu)",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf),</div><div class='del'>-			bch2_btree_id_str(iter-&gt;btree_id),</div><div class='del'>-			iter-&gt;pos.inode,</div><div class='del'>-			iter-&gt;pos.offset,</div><div class='del'>-			a-&gt;data_type == state,</div><div class='del'>-			genbits &gt;&gt; 56, alloc_freespace_genbits(*a) &gt;&gt; 56))</div><div class='del'>-		goto delete;</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	set_btree_iter_dontneed(&amp;alloc_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;alloc_iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-delete:</div><div class='del'>-	ret =   bch2_btree_delete_extent_at(trans, iter,</div><div class='del'>-			iter-&gt;btree_id == BTREE_ID_freespace ? 1 : 0, 0) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-			BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We've already checked that generation numbers in the bucket_gens btree are</div><div class='del'>- * valid for buckets that exist; this just checks for keys for nonexistent</div><div class='del'>- * buckets.</div><div class='del'>- */</div><div class='del'>-static noinline_for_stack</div><div class='del'>-int bch2_check_bucket_gens_key(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_i_bucket_gens g;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	u64 start = bucket_gens_pos_to_alloc(k.k-&gt;p, 0).offset;</div><div class='del'>-	u64 end = bucket_gens_pos_to_alloc(bpos_nosnap_successor(k.k-&gt;p), 0).offset;</div><div class='del'>-	u64 b;</div><div class='del'>-	bool need_update = false, dev_exists;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(k.k-&gt;type != KEY_TYPE_bucket_gens);</div><div class='del'>-	bkey_reassemble(&amp;g.k_i, k);</div><div class='del'>-</div><div class='del'>-	/* if no bch_dev, skip out whether we repair or not */</div><div class='del'>-	dev_exists = bch2_dev_exists2(c, k.k-&gt;p.inode);</div><div class='del'>-	if (!dev_exists) {</div><div class='del'>-		if (fsck_err_on(!dev_exists, c,</div><div class='del'>-				bucket_gens_to_invalid_dev,</div><div class='del'>-				"bucket_gens key for invalid device:\n  %s",</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-			ret = bch2_btree_delete_at(trans, iter, 0);</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, k.k-&gt;p.inode);</div><div class='del'>-	if (fsck_err_on(end &lt;= ca-&gt;mi.first_bucket ||</div><div class='del'>-			start &gt;= ca-&gt;mi.nbuckets, c,</div><div class='del'>-			bucket_gens_to_invalid_buckets,</div><div class='del'>-			"bucket_gens key for invalid buckets:\n  %s",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at(trans, iter, 0);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (b = start; b &lt; ca-&gt;mi.first_bucket; b++)</div><div class='del'>-		if (fsck_err_on(g.v.gens[b &amp; KEY_TYPE_BUCKET_GENS_MASK], c,</div><div class='del'>-				bucket_gens_nonzero_for_invalid_buckets,</div><div class='del'>-				"bucket_gens key has nonzero gen for invalid bucket")) {</div><div class='del'>-			g.v.gens[b &amp; KEY_TYPE_BUCKET_GENS_MASK] = 0;</div><div class='del'>-			need_update = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	for (b = ca-&gt;mi.nbuckets; b &lt; end; b++)</div><div class='del'>-		if (fsck_err_on(g.v.gens[b &amp; KEY_TYPE_BUCKET_GENS_MASK], c,</div><div class='del'>-				bucket_gens_nonzero_for_invalid_buckets,</div><div class='del'>-				"bucket_gens key has nonzero gen for invalid bucket")) {</div><div class='del'>-			g.v.gens[b &amp; KEY_TYPE_BUCKET_GENS_MASK] = 0;</div><div class='del'>-			need_update = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if (need_update) {</div><div class='del'>-		struct bkey_i *u = bch2_trans_kmalloc(trans, sizeof(g));</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		memcpy(u, &amp;g, sizeof(g));</div><div class='del'>-		ret = bch2_trans_update(trans, iter, u, 0);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_alloc_info(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter, discard_iter, freespace_iter, bucket_gens_iter;</div><div class='del'>-	struct bkey hole;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_alloc, POS_MIN,</div><div class='del'>-			     BTREE_ITER_PREFETCH);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;discard_iter, BTREE_ID_need_discard, POS_MIN,</div><div class='del'>-			     BTREE_ITER_PREFETCH);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;freespace_iter, BTREE_ID_freespace, POS_MIN,</div><div class='del'>-			     BTREE_ITER_PREFETCH);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;bucket_gens_iter, BTREE_ID_bucket_gens, POS_MIN,</div><div class='del'>-			     BTREE_ITER_PREFETCH);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		struct bpos next;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		k = bch2_get_key_or_real_bucket_hole(&amp;iter, &amp;hole);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto bkey_err;</div><div class='del'>-</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type) {</div><div class='del'>-			next = bpos_nosnap_successor(k.k-&gt;p);</div><div class='del'>-</div><div class='del'>-			ret = bch2_check_alloc_key(trans,</div><div class='del'>-						   k, &amp;iter,</div><div class='del'>-						   &amp;discard_iter,</div><div class='del'>-						   &amp;freespace_iter,</div><div class='del'>-						   &amp;bucket_gens_iter);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto bkey_err;</div><div class='del'>-		} else {</div><div class='del'>-			next = k.k-&gt;p;</div><div class='del'>-</div><div class='del'>-			ret = bch2_check_alloc_hole_freespace(trans,</div><div class='del'>-						    bkey_start_pos(k.k),</div><div class='del'>-						    &amp;next,</div><div class='del'>-						    &amp;freespace_iter) ?:</div><div class='del'>-				bch2_check_alloc_hole_bucket_gens(trans,</div><div class='del'>-						    bkey_start_pos(k.k),</div><div class='del'>-						    &amp;next,</div><div class='del'>-						    &amp;bucket_gens_iter);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto bkey_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-					BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto bkey_err;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter, next);</div><div class='del'>-bkey_err:</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;bucket_gens_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;freespace_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;discard_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key(trans, iter,</div><div class='del'>-			BTREE_ID_need_discard, POS_MIN,</div><div class='del'>-			BTREE_ITER_PREFETCH, k,</div><div class='del'>-		bch2_check_discard_freespace_key(trans, &amp;iter));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_freespace, POS_MIN,</div><div class='del'>-			     BTREE_ITER_PREFETCH);</div><div class='del'>-	while (1) {</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-		k = bch2_btree_iter_peek(&amp;iter);</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = bkey_err(k) ?:</div><div class='del'>-			bch2_check_discard_freespace_key(trans, &amp;iter);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (ret) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-</div><div class='del'>-			bch_err(c, "while checking %s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter, bpos_nosnap_successor(iter.pos));</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key_commit(trans, iter,</div><div class='del'>-			BTREE_ID_bucket_gens, POS_MIN,</div><div class='del'>-			BTREE_ITER_PREFETCH, k,</div><div class='del'>-			NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		bch2_check_bucket_gens_key(trans, &amp;iter, k));</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_check_alloc_to_lru_ref(struct btree_trans *trans,</div><div class='del'>-				       struct btree_iter *alloc_iter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter lru_iter;</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	struct bkey_s_c alloc_k, lru_k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	alloc_k = bch2_btree_iter_peek(alloc_iter);</div><div class='del'>-	if (!alloc_k.k)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bkey_err(alloc_k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(alloc_k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-	if (a-&gt;data_type != BCH_DATA_cached)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!a-&gt;io_time[READ], c,</div><div class='del'>-			alloc_key_cached_but_read_time_zero,</div><div class='del'>-			"cached bucket with read_time 0\n"</div><div class='del'>-			"  %s",</div><div class='del'>-		(printbuf_reset(&amp;buf),</div><div class='del'>-		 bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf))) {</div><div class='del'>-		struct bkey_i_alloc_v4 *a_mut =</div><div class='del'>-			bch2_alloc_to_v4_mut(trans, alloc_k);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(a_mut);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		a_mut-&gt;v.io_time[READ] = atomic64_read(&amp;c-&gt;io_clock[READ].now);</div><div class='del'>-		ret = bch2_trans_update(trans, alloc_iter,</div><div class='del'>-					&amp;a_mut-&gt;k_i, BTREE_TRIGGER_NORUN);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		a = &amp;a_mut-&gt;v;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lru_k = bch2_bkey_get_iter(trans, &amp;lru_iter, BTREE_ID_lru,</div><div class='del'>-			     lru_pos(alloc_k.k-&gt;p.inode,</div><div class='del'>-				     bucket_to_u64(alloc_k.k-&gt;p),</div><div class='del'>-				     a-&gt;io_time[READ]), 0);</div><div class='del'>-	ret = bkey_err(lru_k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(lru_k.k-&gt;type != KEY_TYPE_set, c,</div><div class='del'>-			alloc_key_to_missing_lru_entry,</div><div class='del'>-			"missing lru entry\n"</div><div class='del'>-			"  %s",</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf))) {</div><div class='del'>-		ret = bch2_lru_set(trans,</div><div class='del'>-				   alloc_k.k-&gt;p.inode,</div><div class='del'>-				   bucket_to_u64(alloc_k.k-&gt;p),</div><div class='del'>-				   a-&gt;io_time[READ]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;lru_iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_alloc_to_lru_refs(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_alloc,</div><div class='del'>-				POS_MIN, BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_check_alloc_to_lru_ref(trans, &amp;iter)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct discard_buckets_state {</div><div class='del'>-	u64		seen;</div><div class='del'>-	u64		open;</div><div class='del'>-	u64		need_journal_commit;</div><div class='del'>-	u64		discarded;</div><div class='del'>-	struct bch_dev	*ca;</div><div class='del'>-	u64		need_journal_commit_this_dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void discard_buckets_next_dev(struct bch_fs *c, struct discard_buckets_state *s, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;ca == ca)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;ca &amp;&amp; s-&gt;need_journal_commit_this_dev &gt;</div><div class='del'>-	    bch2_dev_usage_read(s-&gt;ca).d[BCH_DATA_free].buckets)</div><div class='del'>-		bch2_journal_flush_async(&amp;c-&gt;journal, NULL);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;ca)</div><div class='del'>-		percpu_ref_put(&amp;s-&gt;ca-&gt;ref);</div><div class='del'>-	if (ca)</div><div class='del'>-		percpu_ref_get(&amp;ca-&gt;ref);</div><div class='del'>-	s-&gt;ca = ca;</div><div class='del'>-	s-&gt;need_journal_commit_this_dev = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_discard_one_bucket(struct btree_trans *trans,</div><div class='del'>-				   struct btree_iter *need_discard_iter,</div><div class='del'>-				   struct bpos *discard_pos_done,</div><div class='del'>-				   struct discard_buckets_state *s)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bpos pos = need_discard_iter-&gt;pos;</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct bkey_i_alloc_v4 *a;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, pos.inode);</div><div class='del'>-</div><div class='del'>-	if (!percpu_ref_tryget(&amp;ca-&gt;io_ref)) {</div><div class='del'>-		bch2_btree_iter_set_pos(need_discard_iter, POS(pos.inode + 1, 0));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	discard_buckets_next_dev(c, s, ca);</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_is_open_safe(c, pos.inode, pos.offset)) {</div><div class='del'>-		s-&gt;open++;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_needs_journal_commit(&amp;c-&gt;buckets_waiting_for_journal,</div><div class='del'>-			c-&gt;journal.flushed_seq_ondisk,</div><div class='del'>-			pos.inode, pos.offset)) {</div><div class='del'>-		s-&gt;need_journal_commit++;</div><div class='del'>-		s-&gt;need_journal_commit_this_dev++;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_alloc,</div><div class='del'>-			       need_discard_iter-&gt;pos,</div><div class='del'>-			       BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4_mut(trans, k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(a);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (BCH_ALLOC_V4_NEED_INC_GEN(&amp;a-&gt;v)) {</div><div class='del'>-		a-&gt;v.gen++;</div><div class='del'>-		SET_BCH_ALLOC_V4_NEED_INC_GEN(&amp;a-&gt;v, false);</div><div class='del'>-		goto write;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (a-&gt;v.journal_seq &gt; c-&gt;journal.flushed_seq_ondisk) {</div><div class='del'>-		if (c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_alloc_info) {</div><div class='del'>-			bch2_trans_inconsistent(trans,</div><div class='del'>-				"clearing need_discard but journal_seq %llu &gt; flushed_seq %llu\n"</div><div class='del'>-				"%s",</div><div class='del'>-				a-&gt;v.journal_seq,</div><div class='del'>-				c-&gt;journal.flushed_seq_ondisk,</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (a-&gt;v.data_type != BCH_DATA_need_discard) {</div><div class='del'>-		if (c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_alloc_info) {</div><div class='del'>-			bch2_trans_inconsistent(trans,</div><div class='del'>-				"bucket incorrectly set in need_discard btree\n"</div><div class='del'>-				"%s",</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bkey_eq(*discard_pos_done, iter.pos) &amp;&amp;</div><div class='del'>-	    ca-&gt;mi.discard &amp;&amp; !c-&gt;opts.nochanges) {</div><div class='del'>-		/*</div><div class='del'>-		 * This works without any other locks because this is the only</div><div class='del'>-		 * thread that removes items from the need_discard tree</div><div class='del'>-		 */</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		blkdev_issue_discard(ca-&gt;disk_sb.bdev,</div><div class='del'>-				     k.k-&gt;p.offset * ca-&gt;mi.bucket_size,</div><div class='del'>-				     ca-&gt;mi.bucket_size,</div><div class='del'>-				     GFP_KERNEL);</div><div class='del'>-		*discard_pos_done = iter.pos;</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_relock_notrace(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SET_BCH_ALLOC_V4_NEED_DISCARD(&amp;a-&gt;v, false);</div><div class='del'>-	a-&gt;v.data_type = alloc_data_type(a-&gt;v, a-&gt;v.data_type);</div><div class='del'>-write:</div><div class='del'>-	ret =   bch2_trans_update(trans, &amp;iter, &amp;a-&gt;k_i, 0) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				  BCH_WATERMARK_btree|</div><div class='del'>-				  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	count_event(c, bucket_discard);</div><div class='del'>-	s-&gt;discarded++;</div><div class='del'>-out:</div><div class='del'>-	s-&gt;seen++;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_do_discards_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work, struct bch_fs, discard_work);</div><div class='del'>-	struct discard_buckets_state s = {};</div><div class='del'>-	struct bpos discard_pos_done = POS_MAX;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We're doing the commit in bch2_discard_one_bucket instead of using</div><div class='del'>-	 * for_each_btree_key_commit() so that we can increment counters after</div><div class='del'>-	 * successful commit:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter,</div><div class='del'>-				   BTREE_ID_need_discard, POS_MIN, 0, k,</div><div class='del'>-			bch2_discard_one_bucket(trans, &amp;iter, &amp;discard_pos_done, &amp;s)));</div><div class='del'>-</div><div class='del'>-	discard_buckets_next_dev(c, &amp;s, NULL);</div><div class='del'>-</div><div class='del'>-	trace_discard_buckets(c, s.seen, s.open, s.need_journal_commit, s.discarded,</div><div class='del'>-			      bch2_err_str(ret));</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_discard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_do_discards(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bch2_write_ref_tryget(c, BCH_WRITE_REF_discard) &amp;&amp;</div><div class='del'>-	    !queue_work(c-&gt;write_ref_wq, &amp;c-&gt;discard_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_discard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int invalidate_one_bucket(struct btree_trans *trans,</div><div class='del'>-				 struct btree_iter *lru_iter,</div><div class='del'>-				 struct bkey_s_c lru_k,</div><div class='del'>-				 s64 *nr_to_invalidate)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter alloc_iter = { NULL };</div><div class='del'>-	struct bkey_i_alloc_v4 *a = NULL;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bpos bucket = u64_to_bucket(lru_k.k-&gt;p.offset);</div><div class='del'>-	unsigned cached_sectors;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (*nr_to_invalidate &lt;= 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_bucket_exists(c, bucket)) {</div><div class='del'>-		prt_str(&amp;buf, "lru entry points to invalid bucket");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_is_open_safe(c, bucket.inode, bucket.offset))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	a = bch2_trans_start_alloc_update(trans, &amp;alloc_iter, bucket);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(a);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* We expect harmless races here due to the btree write buffer: */</div><div class='del'>-	if (lru_pos_time(lru_iter-&gt;pos) != alloc_lru_idx_read(a-&gt;v))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	BUG_ON(a-&gt;v.data_type != BCH_DATA_cached);</div><div class='del'>-</div><div class='del'>-	if (!a-&gt;v.cached_sectors)</div><div class='del'>-		bch_err(c, "invalidating empty bucket, confused");</div><div class='del'>-</div><div class='del'>-	cached_sectors = a-&gt;v.cached_sectors;</div><div class='del'>-</div><div class='del'>-	SET_BCH_ALLOC_V4_NEED_INC_GEN(&amp;a-&gt;v, false);</div><div class='del'>-	a-&gt;v.gen++;</div><div class='del'>-	a-&gt;v.data_type		= 0;</div><div class='del'>-	a-&gt;v.dirty_sectors	= 0;</div><div class='del'>-	a-&gt;v.cached_sectors	= 0;</div><div class='del'>-	a-&gt;v.io_time[READ]	= atomic64_read(&amp;c-&gt;io_clock[READ].now);</div><div class='del'>-	a-&gt;v.io_time[WRITE]	= atomic64_read(&amp;c-&gt;io_clock[WRITE].now);</div><div class='del'>-</div><div class='del'>-	ret =   bch2_trans_update(trans, &amp;alloc_iter, &amp;a-&gt;k_i,</div><div class='del'>-				BTREE_TRIGGER_BUCKET_INVALIDATE) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				  BCH_WATERMARK_btree|</div><div class='del'>-				  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, bucket_invalidate, c, bucket.inode, bucket.offset, cached_sectors);</div><div class='del'>-	--*nr_to_invalidate;</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;alloc_iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	prt_str(&amp;buf, "\n  lru key: ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, lru_k);</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\n  lru entry: ");</div><div class='del'>-	bch2_lru_pos_to_text(&amp;buf, lru_iter-&gt;pos);</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\n  alloc key: ");</div><div class='del'>-	if (!a)</div><div class='del'>-		bch2_bpos_to_text(&amp;buf, bucket);</div><div class='del'>-	else</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(&amp;a-&gt;k_i));</div><div class='del'>-</div><div class='del'>-	bch_err(c, "%s", buf.buf);</div><div class='del'>-	if (c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_lrus) {</div><div class='del'>-		bch2_inconsistent_error(c);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_do_invalidates_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work, struct bch_fs, invalidate_work);</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_write_buffer_tryflush(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		s64 nr_to_invalidate =</div><div class='del'>-			should_invalidate_buckets(ca, bch2_dev_usage_read(ca));</div><div class='del'>-</div><div class='del'>-		ret = for_each_btree_key_upto(trans, iter, BTREE_ID_lru,</div><div class='del'>-				lru_pos(ca-&gt;dev_idx, 0, 0),</div><div class='del'>-				lru_pos(ca-&gt;dev_idx, U64_MAX, LRU_TIME_MAX),</div><div class='del'>-				BTREE_ITER_INTENT, k,</div><div class='del'>-			invalidate_one_bucket(trans, &amp;iter, k, &amp;nr_to_invalidate));</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_invalidate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_do_invalidates(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bch2_write_ref_tryget(c, BCH_WRITE_REF_invalidate) &amp;&amp;</div><div class='del'>-	    !queue_work(c-&gt;write_ref_wq, &amp;c-&gt;invalidate_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_invalidate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_freespace_init(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			    u64 bucket_start, u64 bucket_end)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey hole;</div><div class='del'>-	struct bpos end = POS(ca-&gt;dev_idx, bucket_end);</div><div class='del'>-	struct bch_member *m;</div><div class='del'>-	unsigned long last_updated = jiffies;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bucket_start &gt; bucket_end);</div><div class='del'>-	BUG_ON(bucket_end &gt; ca-&gt;mi.nbuckets);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_alloc,</div><div class='del'>-		POS(ca-&gt;dev_idx, max_t(u64, ca-&gt;mi.first_bucket, bucket_start)),</div><div class='del'>-		BTREE_ITER_PREFETCH);</div><div class='del'>-	/*</div><div class='del'>-	 * Scan the alloc btree for every bucket on @ca, and add buckets to the</div><div class='del'>-	 * freespace/need_discard/need_gc_gens btrees as needed:</div><div class='del'>-	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		if (last_updated + HZ * 10 &lt; jiffies) {</div><div class='del'>-			bch_info(ca, "%s: currently at %llu/%llu",</div><div class='del'>-				 __func__, iter.pos.offset, ca-&gt;mi.nbuckets);</div><div class='del'>-			last_updated = jiffies;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		if (bkey_ge(iter.pos, end)) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		k = bch2_get_key_or_hole(&amp;iter, end, &amp;hole);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto bkey_err;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type) {</div><div class='del'>-			/*</div><div class='del'>-			 * We process live keys in the alloc btree one at a</div><div class='del'>-			 * time:</div><div class='del'>-			 */</div><div class='del'>-			struct bch_alloc_v4 a_convert;</div><div class='del'>-			const struct bch_alloc_v4 *a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-			ret =   bch2_bucket_do_index(trans, k, a, true) ?:</div><div class='del'>-				bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-						  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto bkey_err;</div><div class='del'>-</div><div class='del'>-			bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-		} else {</div><div class='del'>-			struct bkey_i *freespace;</div><div class='del'>-</div><div class='del'>-			freespace = bch2_trans_kmalloc(trans, sizeof(*freespace));</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(freespace);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto bkey_err;</div><div class='del'>-</div><div class='del'>-			bkey_init(&amp;freespace-&gt;k);</div><div class='del'>-			freespace-&gt;k.type	= KEY_TYPE_set;</div><div class='del'>-			freespace-&gt;k.p		= k.k-&gt;p;</div><div class='del'>-			freespace-&gt;k.size	= k.k-&gt;size;</div><div class='del'>-</div><div class='del'>-			ret = bch2_btree_insert_trans(trans, BTREE_ID_freespace, freespace, 0) ?:</div><div class='del'>-				bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-						  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto bkey_err;</div><div class='del'>-</div><div class='del'>-			bch2_btree_iter_set_pos(&amp;iter, k.k-&gt;p);</div><div class='del'>-		}</div><div class='del'>-bkey_err:</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		bch_err_msg(ca, ret, "initializing free space");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	m = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	SET_BCH_MEMBER_FREESPACE_INITIALIZED(m, true);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_freespace_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	bool doing_init = false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can crash during the device add path, so we need to check this on</div><div class='del'>-	 * every mount:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		if (ca-&gt;mi.freespace_initialized)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!doing_init) {</div><div class='del'>-			bch_info(c, "initializing freespace");</div><div class='del'>-			doing_init = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_dev_freespace_init(c, ca, 0, ca-&gt;mi.nbuckets);</div><div class='del'>-		if (ret) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			bch_err_fn(c, ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (doing_init) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		bch_verbose(c, "done initializing freespace");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Bucket IO clocks: */</div><div class='del'>-</div><div class='del'>-int bch2_bucket_io_time_reset(struct btree_trans *trans, unsigned dev,</div><div class='del'>-			      size_t bucket_nr, int rw)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_alloc_v4 *a;</div><div class='del'>-	u64 now;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	a = bch2_trans_start_alloc_update(trans, &amp;iter,  POS(dev, bucket_nr));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(a);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	now = atomic64_read(&amp;c-&gt;io_clock[rw].now);</div><div class='del'>-	if (a-&gt;v.io_time[rw] == now)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	a-&gt;v.io_time[rw] = now;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_trans_update(trans, &amp;iter, &amp;a-&gt;k_i, 0) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL, 0);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Startup/shutdown (ro/rw): */</div><div class='del'>-</div><div class='del'>-void bch2_recalc_capacity(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	u64 capacity = 0, reserved_sectors = 0, gc_reserve;</div><div class='del'>-	unsigned bucket_size_max = 0;</div><div class='del'>-	unsigned long ra_pages = 0;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		struct backing_dev_info *bdi = ca-&gt;disk_sb.bdev-&gt;bd_disk-&gt;bdi;</div><div class='del'>-</div><div class='del'>-		ra_pages += bdi-&gt;ra_pages;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_set_ra_pages(c, ra_pages);</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca) {</div><div class='del'>-		u64 dev_reserve = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to reserve buckets (from the number</div><div class='del'>-		 * of currently available buckets) against</div><div class='del'>-		 * foreground writes so that mainly copygc can</div><div class='del'>-		 * make forward progress.</div><div class='del'>-		 *</div><div class='del'>-		 * We need enough to refill the various reserves</div><div class='del'>-		 * from scratch - copygc will use its entire</div><div class='del'>-		 * reserve all at once, then run against when</div><div class='del'>-		 * its reserve is refilled (from the formerly</div><div class='del'>-		 * available buckets).</div><div class='del'>-		 *</div><div class='del'>-		 * This reserve is just used when considering if</div><div class='del'>-		 * allocations for foreground writes must wait -</div><div class='del'>-		 * not -ENOSPC calculations.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		dev_reserve += ca-&gt;nr_btree_reserve * 2;</div><div class='del'>-		dev_reserve += ca-&gt;mi.nbuckets &gt;&gt; 6; /* copygc reserve */</div><div class='del'>-</div><div class='del'>-		dev_reserve += 1;	/* btree write point */</div><div class='del'>-		dev_reserve += 1;	/* copygc write point */</div><div class='del'>-		dev_reserve += 1;	/* rebalance write point */</div><div class='del'>-</div><div class='del'>-		dev_reserve *= ca-&gt;mi.bucket_size;</div><div class='del'>-</div><div class='del'>-		capacity += bucket_to_sector(ca, ca-&gt;mi.nbuckets -</div><div class='del'>-					     ca-&gt;mi.first_bucket);</div><div class='del'>-</div><div class='del'>-		reserved_sectors += dev_reserve * 2;</div><div class='del'>-</div><div class='del'>-		bucket_size_max = max_t(unsigned, bucket_size_max,</div><div class='del'>-					ca-&gt;mi.bucket_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gc_reserve = c-&gt;opts.gc_reserve_bytes</div><div class='del'>-		? c-&gt;opts.gc_reserve_bytes &gt;&gt; 9</div><div class='del'>-		: div64_u64(capacity * c-&gt;opts.gc_reserve_percent, 100);</div><div class='del'>-</div><div class='del'>-	reserved_sectors = max(gc_reserve, reserved_sectors);</div><div class='del'>-</div><div class='del'>-	reserved_sectors = min(reserved_sectors, capacity);</div><div class='del'>-</div><div class='del'>-	c-&gt;capacity = capacity - reserved_sectors;</div><div class='del'>-</div><div class='del'>-	c-&gt;bucket_size_max = bucket_size_max;</div><div class='del'>-</div><div class='del'>-	/* Wake up case someone was waiting for buckets */</div><div class='del'>-	closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_min_rw_member_capacity(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	u64 ret = U64_MAX;</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca)</div><div class='del'>-		ret = min(ret, ca-&gt;mi.nbuckets * ca-&gt;mi.bucket_size);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_dev_has_open_write_point(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	for (ob = c-&gt;open_buckets;</div><div class='del'>-	     ob &lt; c-&gt;open_buckets + ARRAY_SIZE(c-&gt;open_buckets);</div><div class='del'>-	     ob++) {</div><div class='del'>-		spin_lock(&amp;ob-&gt;lock);</div><div class='del'>-		if (ob-&gt;valid &amp;&amp; !ob-&gt;on_partial_list &amp;&amp;</div><div class='del'>-		    ob-&gt;dev == ca-&gt;dev_idx)</div><div class='del'>-			ret = true;</div><div class='del'>-		spin_unlock(&amp;ob-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* device goes ro: */</div><div class='del'>-void bch2_dev_allocator_remove(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	/* First, remove device from allocation groups: */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;rw_devs); i++)</div><div class='del'>-		clear_bit(ca-&gt;dev_idx, c-&gt;rw_devs[i].d);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Capacity is calculated based off of devices in allocation groups:</div><div class='del'>-	 */</div><div class='del'>-	bch2_recalc_capacity(c);</div><div class='del'>-</div><div class='del'>-	bch2_open_buckets_stop(c, ca, false);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wake up threads that were blocked on allocation, so they can notice</div><div class='del'>-	 * the device can no longer be removed and the capacity has changed:</div><div class='del'>-	 */</div><div class='del'>-	closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * journal_res_get() can block waiting for free space in the journal -</div><div class='del'>-	 * it needs to notice there may not be devices to allocate from anymore:</div><div class='del'>-	 */</div><div class='del'>-	wake_up(&amp;c-&gt;journal.wait);</div><div class='del'>-</div><div class='del'>-	/* Now wait for any in flight writes: */</div><div class='del'>-</div><div class='del'>-	closure_wait_event(&amp;c-&gt;open_buckets_wait,</div><div class='del'>-			   !bch2_dev_has_open_write_point(c, ca));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* device goes rw: */</div><div class='del'>-void bch2_dev_allocator_add(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;rw_devs); i++)</div><div class='del'>-		if (ca-&gt;mi.data_allowed &amp; (1 &lt;&lt; i))</div><div class='del'>-			set_bit(ca-&gt;dev_idx, c-&gt;rw_devs[i].d);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_allocator_background_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	spin_lock_init(&amp;c-&gt;freelist_lock);</div><div class='del'>-	INIT_WORK(&amp;c-&gt;discard_work, bch2_do_discards_work);</div><div class='del'>-	INIT_WORK(&amp;c-&gt;invalidate_work, bch2_do_invalidates_work);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/alloc_background.h b/fs/bcachefs/alloc_background.h<br/>deleted file mode 100644<br/>index e7f7e842ee1b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/alloc_background.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_background.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,274 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ALLOC_BACKGROUND_H</div><div class='del'>-#define _BCACHEFS_ALLOC_BACKGROUND_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_types.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-</div><div class='del'>-/* How out of date a pointer gen is allowed to be: */</div><div class='del'>-#define BUCKET_GC_GEN_MAX	96U</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_bucket_exists(struct bch_fs *c, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_exists2(c, pos.inode))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, pos.inode);</div><div class='del'>-	return pos.offset &gt;= ca-&gt;mi.first_bucket &amp;&amp;</div><div class='del'>-		pos.offset &lt; ca-&gt;mi.nbuckets;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 bucket_to_u64(struct bpos bucket)</div><div class='del'>-{</div><div class='del'>-	return (bucket.inode &lt;&lt; 48) | bucket.offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos u64_to_bucket(u64 bucket)</div><div class='del'>-{</div><div class='del'>-	return POS(bucket &gt;&gt; 48, bucket &amp; ~(~0ULL &lt;&lt; 48));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 alloc_gc_gen(struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	return a.gen - a.oldest_gen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_data_type __alloc_data_type(u32 dirty_sectors,</div><div class='del'>-						   u32 cached_sectors,</div><div class='del'>-						   u32 stripe,</div><div class='del'>-						   struct bch_alloc_v4 a,</div><div class='del'>-						   enum bch_data_type data_type)</div><div class='del'>-{</div><div class='del'>-	if (stripe)</div><div class='del'>-		return data_type == BCH_DATA_parity ? data_type : BCH_DATA_stripe;</div><div class='del'>-	if (dirty_sectors)</div><div class='del'>-		return data_type;</div><div class='del'>-	if (cached_sectors)</div><div class='del'>-		return BCH_DATA_cached;</div><div class='del'>-	if (BCH_ALLOC_V4_NEED_DISCARD(&amp;a))</div><div class='del'>-		return BCH_DATA_need_discard;</div><div class='del'>-	if (alloc_gc_gen(a) &gt;= BUCKET_GC_GEN_MAX)</div><div class='del'>-		return BCH_DATA_need_gc_gens;</div><div class='del'>-	return BCH_DATA_free;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_data_type alloc_data_type(struct bch_alloc_v4 a,</div><div class='del'>-						 enum bch_data_type data_type)</div><div class='del'>-{</div><div class='del'>-	return __alloc_data_type(a.dirty_sectors, a.cached_sectors,</div><div class='del'>-				 a.stripe, a, data_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_data_type bucket_data_type(enum bch_data_type data_type)</div><div class='del'>-{</div><div class='del'>-	return data_type == BCH_DATA_stripe ? BCH_DATA_user : data_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_bucket_sectors(struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	return a.dirty_sectors + a.cached_sectors;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_bucket_sectors_dirty(struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	return a.dirty_sectors;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_bucket_sectors_fragmented(struct bch_dev *ca,</div><div class='del'>-						 struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	int d = bch2_bucket_sectors_dirty(a);</div><div class='del'>-</div><div class='del'>-	return d ? max(0, ca-&gt;mi.bucket_size - d) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 alloc_lru_idx_read(struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	return a.data_type == BCH_DATA_cached ? a.io_time[READ] : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DATA_TYPES_MOVABLE		\</div><div class='del'>-	((1U &lt;&lt; BCH_DATA_btree)|	\</div><div class='del'>-	 (1U &lt;&lt; BCH_DATA_user)|		\</div><div class='del'>-	 (1U &lt;&lt; BCH_DATA_stripe))</div><div class='del'>-</div><div class='del'>-static inline bool data_type_movable(enum bch_data_type type)</div><div class='del'>-{</div><div class='del'>-	return (1U &lt;&lt; type) &amp; DATA_TYPES_MOVABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 alloc_lru_idx_fragmentation(struct bch_alloc_v4 a,</div><div class='del'>-					      struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	if (!data_type_movable(a.data_type) ||</div><div class='del'>-	    !bch2_bucket_sectors_fragmented(ca, a))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	u64 d = bch2_bucket_sectors_dirty(a);</div><div class='del'>-	return div_u64(d * (1ULL &lt;&lt; 31), ca-&gt;mi.bucket_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 alloc_freespace_genbits(struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	return ((u64) alloc_gc_gen(a) &gt;&gt; 4) &lt;&lt; 56;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos alloc_freespace_pos(struct bpos pos, struct bch_alloc_v4 a)</div><div class='del'>-{</div><div class='del'>-	pos.offset |= alloc_freespace_genbits(a);</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned alloc_v4_u64s(const struct bch_alloc_v4 *a)</div><div class='del'>-{</div><div class='del'>-	unsigned ret = (BCH_ALLOC_V4_BACKPOINTERS_START(a) ?:</div><div class='del'>-			BCH_ALLOC_V4_U64s_V0) +</div><div class='del'>-		BCH_ALLOC_V4_NR_BACKPOINTERS(a) *</div><div class='del'>-		(sizeof(struct bch_backpointer) / sizeof(u64));</div><div class='del'>-</div><div class='del'>-	BUG_ON(ret &gt; U8_MAX - BKEY_U64s);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_alloc_v4_u64s(struct bkey_i_alloc_v4 *a)</div><div class='del'>-{</div><div class='del'>-	set_bkey_val_u64s(&amp;a-&gt;k, alloc_v4_u64s(&amp;a-&gt;v));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i_alloc_v4 *</div><div class='del'>-bch2_trans_start_alloc_update(struct btree_trans *, struct btree_iter *, struct bpos);</div><div class='del'>-</div><div class='del'>-void __bch2_alloc_to_v4(struct bkey_s_c, struct bch_alloc_v4 *);</div><div class='del'>-</div><div class='del'>-static inline const struct bch_alloc_v4 *bch2_alloc_to_v4(struct bkey_s_c k, struct bch_alloc_v4 *convert)</div><div class='del'>-{</div><div class='del'>-	const struct bch_alloc_v4 *ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(k.k-&gt;type != KEY_TYPE_alloc_v4))</div><div class='del'>-		goto slowpath;</div><div class='del'>-</div><div class='del'>-	ret = bkey_s_c_to_alloc_v4(k).v;</div><div class='del'>-	if (BCH_ALLOC_V4_BACKPOINTERS_START(ret) != BCH_ALLOC_V4_U64s)</div><div class='del'>-		goto slowpath;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-slowpath:</div><div class='del'>-	__bch2_alloc_to_v4(k, convert);</div><div class='del'>-	return convert;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i_alloc_v4 *bch2_alloc_to_v4_mut(struct btree_trans *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-int bch2_bucket_io_time_reset(struct btree_trans *, unsigned, size_t, int);</div><div class='del'>-</div><div class='del'>-int bch2_alloc_v1_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_alloc_v2_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_alloc_v3_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_alloc_v4_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_alloc_v4_swab(struct bkey_s);</div><div class='del'>-void bch2_alloc_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_alloc ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_alloc_v1_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_alloc_to_text,		\</div><div class='del'>-	.trigger	= bch2_trigger_alloc,		\</div><div class='del'>-	.min_val_size	= 8,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_alloc_v2 ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_alloc_v2_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_alloc_to_text,		\</div><div class='del'>-	.trigger	= bch2_trigger_alloc,		\</div><div class='del'>-	.min_val_size	= 8,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_alloc_v3 ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_alloc_v3_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_alloc_to_text,		\</div><div class='del'>-	.trigger	= bch2_trigger_alloc,		\</div><div class='del'>-	.min_val_size	= 16,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_alloc_v4 ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_alloc_v4_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_alloc_to_text,		\</div><div class='del'>-	.swab		= bch2_alloc_v4_swab,		\</div><div class='del'>-	.trigger	= bch2_trigger_alloc,		\</div><div class='del'>-	.min_val_size	= 48,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_bucket_gens_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			     enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_bucket_gens_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_bucket_gens ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_bucket_gens_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_bucket_gens_to_text,	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_bucket_gens_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline bool bkey_is_alloc(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return  k-&gt;type == KEY_TYPE_alloc ||</div><div class='del'>-		k-&gt;type == KEY_TYPE_alloc_v2 ||</div><div class='del'>-		k-&gt;type == KEY_TYPE_alloc_v3;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_alloc_read(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_trigger_alloc(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-		       struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-int bch2_check_alloc_info(struct bch_fs *);</div><div class='del'>-int bch2_check_alloc_to_lru_refs(struct bch_fs *);</div><div class='del'>-void bch2_do_discards(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline u64 should_invalidate_buckets(struct bch_dev *ca,</div><div class='del'>-					    struct bch_dev_usage u)</div><div class='del'>-{</div><div class='del'>-	u64 want_free = ca-&gt;mi.nbuckets &gt;&gt; 7;</div><div class='del'>-	u64 free = max_t(s64, 0,</div><div class='del'>-			   u.d[BCH_DATA_free].buckets</div><div class='del'>-			 + u.d[BCH_DATA_need_discard].buckets</div><div class='del'>-			 - bch2_dev_buckets_reserved(ca, BCH_WATERMARK_stripe));</div><div class='del'>-</div><div class='del'>-	return clamp_t(s64, want_free - free, 0, u.d[BCH_DATA_cached].buckets);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_do_invalidates(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline struct bch_backpointer *alloc_v4_backpointers(struct bch_alloc_v4 *a)</div><div class='del'>-{</div><div class='del'>-	return (void *) ((u64 *) &amp;a-&gt;v +</div><div class='del'>-			 (BCH_ALLOC_V4_BACKPOINTERS_START(a) ?:</div><div class='del'>-			  BCH_ALLOC_V4_U64s_V0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline const struct bch_backpointer *alloc_v4_backpointers_c(const struct bch_alloc_v4 *a)</div><div class='del'>-{</div><div class='del'>-	return (void *) ((u64 *) &amp;a-&gt;v + BCH_ALLOC_V4_BACKPOINTERS_START(a));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_freespace_init(struct bch_fs *, struct bch_dev *, u64, u64);</div><div class='del'>-int bch2_fs_freespace_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_recalc_capacity(struct bch_fs *);</div><div class='del'>-u64 bch2_min_rw_member_capacity(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_dev_allocator_remove(struct bch_fs *, struct bch_dev *);</div><div class='del'>-void bch2_dev_allocator_add(struct bch_fs *, struct bch_dev *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_allocator_background_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_ALLOC_BACKGROUND_H */</div><div class='head'>diff --git a/fs/bcachefs/alloc_background_format.h b/fs/bcachefs/alloc_background_format.h<br/>deleted file mode 100644<br/>index b4ec20be93b8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/alloc_background_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_background_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ALLOC_BACKGROUND_FORMAT_H</div><div class='del'>-#define _BCACHEFS_ALLOC_BACKGROUND_FORMAT_H</div><div class='del'>-</div><div class='del'>-struct bch_alloc {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__u8			fields;</div><div class='del'>-	__u8			gen;</div><div class='del'>-	__u8			data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define BCH_ALLOC_FIELDS_V1()			\</div><div class='del'>-	x(read_time,		16)		\</div><div class='del'>-	x(write_time,		16)		\</div><div class='del'>-	x(data_type,		8)		\</div><div class='del'>-	x(dirty_sectors,	16)		\</div><div class='del'>-	x(cached_sectors,	16)		\</div><div class='del'>-	x(oldest_gen,		8)		\</div><div class='del'>-	x(stripe,		32)		\</div><div class='del'>-	x(stripe_redundancy,	8)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-#define x(name, _bits) BCH_ALLOC_FIELD_V1_##name,</div><div class='del'>-	BCH_ALLOC_FIELDS_V1()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_alloc_v2 {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__u8			nr_fields;</div><div class='del'>-	__u8			gen;</div><div class='del'>-	__u8			oldest_gen;</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u8			data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define BCH_ALLOC_FIELDS_V2()			\</div><div class='del'>-	x(read_time,		64)		\</div><div class='del'>-	x(write_time,		64)		\</div><div class='del'>-	x(dirty_sectors,	32)		\</div><div class='del'>-	x(cached_sectors,	32)		\</div><div class='del'>-	x(stripe,		32)		\</div><div class='del'>-	x(stripe_redundancy,	8)</div><div class='del'>-</div><div class='del'>-struct bch_alloc_v3 {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le64			journal_seq;</div><div class='del'>-	__le32			flags;</div><div class='del'>-	__u8			nr_fields;</div><div class='del'>-	__u8			gen;</div><div class='del'>-	__u8			oldest_gen;</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u8			data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(BCH_ALLOC_V3_NEED_DISCARD,struct bch_alloc_v3, flags,  0,  1)</div><div class='del'>-LE32_BITMASK(BCH_ALLOC_V3_NEED_INC_GEN,struct bch_alloc_v3, flags,  1,  2)</div><div class='del'>-</div><div class='del'>-struct bch_alloc_v4 {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__u64			journal_seq;</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u8			gen;</div><div class='del'>-	__u8			oldest_gen;</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u8			stripe_redundancy;</div><div class='del'>-	__u32			dirty_sectors;</div><div class='del'>-	__u32			cached_sectors;</div><div class='del'>-	__u64			io_time[2];</div><div class='del'>-	__u32			stripe;</div><div class='del'>-	__u32			nr_external_backpointers;</div><div class='del'>-	__u64			fragmentation_lru;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define BCH_ALLOC_V4_U64s_V0	6</div><div class='del'>-#define BCH_ALLOC_V4_U64s	(sizeof(struct bch_alloc_v4) / sizeof(__u64))</div><div class='del'>-</div><div class='del'>-BITMASK(BCH_ALLOC_V4_NEED_DISCARD,	struct bch_alloc_v4, flags,  0,  1)</div><div class='del'>-BITMASK(BCH_ALLOC_V4_NEED_INC_GEN,	struct bch_alloc_v4, flags,  1,  2)</div><div class='del'>-BITMASK(BCH_ALLOC_V4_BACKPOINTERS_START,struct bch_alloc_v4, flags,  2,  8)</div><div class='del'>-BITMASK(BCH_ALLOC_V4_NR_BACKPOINTERS,	struct bch_alloc_v4, flags,  8,  14)</div><div class='del'>-</div><div class='del'>-#define KEY_TYPE_BUCKET_GENS_BITS	8</div><div class='del'>-#define KEY_TYPE_BUCKET_GENS_NR		(1U &lt;&lt; KEY_TYPE_BUCKET_GENS_BITS)</div><div class='del'>-#define KEY_TYPE_BUCKET_GENS_MASK	(KEY_TYPE_BUCKET_GENS_NR - 1)</div><div class='del'>-</div><div class='del'>-struct bch_bucket_gens {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	u8			gens[KEY_TYPE_BUCKET_GENS_NR];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_ALLOC_BACKGROUND_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c<br/>deleted file mode 100644<br/>index 633d3223b353..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/alloc_foreground.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_foreground.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1625 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- *</div><div class='del'>- * Foreground allocator code: allocate buckets from freelist, and allocate in</div><div class='del'>- * sector granularity from writepoints.</div><div class='del'>- *</div><div class='del'>- * bch2_bucket_alloc() allocates a single bucket from a specific device.</div><div class='del'>- *</div><div class='del'>- * bch2_bucket_alloc_set() allocates one or more buckets from different devices</div><div class='del'>- * in a given filesystem.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "buckets_waiting_for_journal.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "movinggc.h"</div><div class='del'>-#include "nocow_locking.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/rculist.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-</div><div class='del'>-static void bch2_trans_mutex_lock_norelock(struct btree_trans *trans,</div><div class='del'>-					   struct mutex *lock)</div><div class='del'>-{</div><div class='del'>-	if (!mutex_trylock(lock)) {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		mutex_lock(lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char * const bch2_watermarks[] = {</div><div class='del'>-#define x(t) #t,</div><div class='del'>-	BCH_WATERMARKS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Open buckets represent a bucket that's currently being allocated from.  They</div><div class='del'>- * serve two purposes:</div><div class='del'>- *</div><div class='del'>- *  - They track buckets that have been partially allocated, allowing for</div><div class='del'>- *    sub-bucket sized allocations - they're used by the sector allocator below</div><div class='del'>- *</div><div class='del'>- *  - They provide a reference to the buckets they own that mark and sweep GC</div><div class='del'>- *    can find, until the new allocation has a pointer to it inserted into the</div><div class='del'>- *    btree</div><div class='del'>- *</div><div class='del'>- * When allocating some space with the sector allocator, the allocation comes</div><div class='del'>- * with a reference to an open bucket - the caller is required to put that</div><div class='del'>- * reference _after_ doing the index update that makes its allocation reachable.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bch2_reset_alloc_cursors(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, NULL)</div><div class='del'>-		ca-&gt;alloc_cursor = 0;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_open_bucket_hash_add(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	open_bucket_idx_t idx = ob - c-&gt;open_buckets;</div><div class='del'>-	open_bucket_idx_t *slot = open_bucket_hashslot(c, ob-&gt;dev, ob-&gt;bucket);</div><div class='del'>-</div><div class='del'>-	ob-&gt;hash = *slot;</div><div class='del'>-	*slot = idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_open_bucket_hash_remove(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	open_bucket_idx_t idx = ob - c-&gt;open_buckets;</div><div class='del'>-	open_bucket_idx_t *slot = open_bucket_hashslot(c, ob-&gt;dev, ob-&gt;bucket);</div><div class='del'>-</div><div class='del'>-	while (*slot != idx) {</div><div class='del'>-		BUG_ON(!*slot);</div><div class='del'>-		slot = &amp;c-&gt;open_buckets[*slot].hash;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*slot = ob-&gt;hash;</div><div class='del'>-	ob-&gt;hash = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_open_bucket_put(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (ob-&gt;ec) {</div><div class='del'>-		ec_stripe_new_put(c, ob-&gt;ec, STRIPE_REF_io);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	spin_lock(&amp;ob-&gt;lock);</div><div class='del'>-</div><div class='del'>-	ob-&gt;valid = false;</div><div class='del'>-	ob-&gt;data_type = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;ob-&gt;lock);</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	bch2_open_bucket_hash_remove(c, ob);</div><div class='del'>-</div><div class='del'>-	ob-&gt;freelist = c-&gt;open_buckets_freelist;</div><div class='del'>-	c-&gt;open_buckets_freelist = ob - c-&gt;open_buckets;</div><div class='del'>-</div><div class='del'>-	c-&gt;open_buckets_nr_free++;</div><div class='del'>-	ca-&gt;nr_open_buckets--;</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	closure_wake_up(&amp;c-&gt;open_buckets_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_open_bucket_write_error(struct bch_fs *c,</div><div class='del'>-				  struct open_buckets *obs,</div><div class='del'>-				  unsigned dev)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, obs, ob, i)</div><div class='del'>-		if (ob-&gt;dev == dev &amp;&amp; ob-&gt;ec)</div><div class='del'>-			bch2_ec_bucket_cancel(c, ob);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct open_bucket *bch2_open_bucket_alloc(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!c-&gt;open_buckets_freelist || !c-&gt;open_buckets_nr_free);</div><div class='del'>-</div><div class='del'>-	ob = c-&gt;open_buckets + c-&gt;open_buckets_freelist;</div><div class='del'>-	c-&gt;open_buckets_freelist = ob-&gt;freelist;</div><div class='del'>-	atomic_set(&amp;ob-&gt;pin, 1);</div><div class='del'>-	ob-&gt;data_type = 0;</div><div class='del'>-</div><div class='del'>-	c-&gt;open_buckets_nr_free--;</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void open_bucket_free_unused(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(c-&gt;open_buckets_partial_nr &gt;=</div><div class='del'>-	       ARRAY_SIZE(c-&gt;open_buckets_partial));</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	ob-&gt;on_partial_list = true;</div><div class='del'>-	c-&gt;open_buckets_partial[c-&gt;open_buckets_partial_nr++] =</div><div class='del'>-		ob - c-&gt;open_buckets;</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	closure_wake_up(&amp;c-&gt;open_buckets_wait);</div><div class='del'>-	closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* _only_ for allocating the journal on a new device: */</div><div class='del'>-long bch2_bucket_alloc_new_fs(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	while (ca-&gt;new_fs_bucket_idx &lt; ca-&gt;mi.nbuckets) {</div><div class='del'>-		u64 b = ca-&gt;new_fs_bucket_idx++;</div><div class='del'>-</div><div class='del'>-		if (!is_superblock_bucket(ca, b) &amp;&amp;</div><div class='del'>-		    (!ca-&gt;buckets_nouse || !test_bit(b, ca-&gt;buckets_nouse)))</div><div class='del'>-			return b;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned open_buckets_reserved(enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	switch (watermark) {</div><div class='del'>-	case BCH_WATERMARK_reclaim:</div><div class='del'>-		return 0;</div><div class='del'>-	case BCH_WATERMARK_btree:</div><div class='del'>-	case BCH_WATERMARK_btree_copygc:</div><div class='del'>-		return OPEN_BUCKETS_COUNT / 4;</div><div class='del'>-	case BCH_WATERMARK_copygc:</div><div class='del'>-		return OPEN_BUCKETS_COUNT / 3;</div><div class='del'>-	default:</div><div class='del'>-		return OPEN_BUCKETS_COUNT / 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct open_bucket *__try_alloc_bucket(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-					      u64 bucket,</div><div class='del'>-					      enum bch_watermark watermark,</div><div class='del'>-					      const struct bch_alloc_v4 *a,</div><div class='del'>-					      struct bucket_alloc_state *s,</div><div class='del'>-					      struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-</div><div class='del'>-	if (unlikely(ca-&gt;buckets_nouse &amp;&amp; test_bit(bucket, ca-&gt;buckets_nouse))) {</div><div class='del'>-		s-&gt;skipped_nouse++;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_is_open(c, ca-&gt;dev_idx, bucket)) {</div><div class='del'>-		s-&gt;skipped_open++;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_needs_journal_commit(&amp;c-&gt;buckets_waiting_for_journal,</div><div class='del'>-			c-&gt;journal.flushed_seq_ondisk, ca-&gt;dev_idx, bucket)) {</div><div class='del'>-		s-&gt;skipped_need_journal_commit++;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_nocow_is_locked(&amp;c-&gt;nocow_locks, POS(ca-&gt;dev_idx, bucket))) {</div><div class='del'>-		s-&gt;skipped_nocow++;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	if (unlikely(c-&gt;open_buckets_nr_free &lt;= open_buckets_reserved(watermark))) {</div><div class='del'>-		if (cl)</div><div class='del'>-			closure_wait(&amp;c-&gt;open_buckets_wait, cl);</div><div class='del'>-</div><div class='del'>-		track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_allocate_open_bucket],</div><div class='del'>-				   &amp;c-&gt;blocked_allocate_open_bucket, true);</div><div class='del'>-		spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-		return ERR_PTR(-BCH_ERR_open_buckets_empty);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recheck under lock: */</div><div class='del'>-	if (bch2_bucket_is_open(c, ca-&gt;dev_idx, bucket)) {</div><div class='del'>-		spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-		s-&gt;skipped_open++;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ob = bch2_open_bucket_alloc(c);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ob-&gt;lock);</div><div class='del'>-</div><div class='del'>-	ob-&gt;valid	= true;</div><div class='del'>-	ob-&gt;sectors_free = ca-&gt;mi.bucket_size;</div><div class='del'>-	ob-&gt;dev		= ca-&gt;dev_idx;</div><div class='del'>-	ob-&gt;gen		= a-&gt;gen;</div><div class='del'>-	ob-&gt;bucket	= bucket;</div><div class='del'>-	spin_unlock(&amp;ob-&gt;lock);</div><div class='del'>-</div><div class='del'>-	ca-&gt;nr_open_buckets++;</div><div class='del'>-	bch2_open_bucket_hash_add(c, ob);</div><div class='del'>-</div><div class='del'>-	track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_allocate_open_bucket],</div><div class='del'>-			   &amp;c-&gt;blocked_allocate_open_bucket, false);</div><div class='del'>-</div><div class='del'>-	track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_allocate],</div><div class='del'>-			   &amp;c-&gt;blocked_allocate, false);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct open_bucket *try_alloc_bucket(struct btree_trans *trans, struct bch_dev *ca,</div><div class='del'>-					    enum bch_watermark watermark, u64 free_entry,</div><div class='del'>-					    struct bucket_alloc_state *s,</div><div class='del'>-					    struct bkey_s_c freespace_k,</div><div class='del'>-					    struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	u64 b = free_entry &amp; ~(~0ULL &lt;&lt; 56);</div><div class='del'>-	unsigned genbits = free_entry &gt;&gt; 56;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (b &lt; ca-&gt;mi.first_bucket || b &gt;= ca-&gt;mi.nbuckets) {</div><div class='del'>-		prt_printf(&amp;buf, "freespace btree has bucket outside allowed range %u-%llu\n"</div><div class='del'>-		       "  freespace key ",</div><div class='del'>-			ca-&gt;mi.first_bucket, ca-&gt;mi.nbuckets);</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, freespace_k);</div><div class='del'>-		bch2_trans_inconsistent(trans, "%s", buf.buf);</div><div class='del'>-		ob = ERR_PTR(-EIO);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter,</div><div class='del'>-			       BTREE_ID_alloc, POS(ca-&gt;dev_idx, b),</div><div class='del'>-			       BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ob = ERR_PTR(ret);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-	if (a-&gt;data_type != BCH_DATA_free) {</div><div class='del'>-		if (c-&gt;curr_recovery_pass &lt;= BCH_RECOVERY_PASS_check_alloc_info) {</div><div class='del'>-			ob = NULL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "non free bucket in freespace btree\n"</div><div class='del'>-		       "  freespace key ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, freespace_k);</div><div class='del'>-		prt_printf(&amp;buf, "\n  ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		bch2_trans_inconsistent(trans, "%s", buf.buf);</div><div class='del'>-		ob = ERR_PTR(-EIO);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (genbits != (alloc_freespace_genbits(*a) &gt;&gt; 56) &amp;&amp;</div><div class='del'>-	    c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_alloc_info) {</div><div class='del'>-		prt_printf(&amp;buf, "bucket in freespace btree with wrong genbits (got %u should be %llu)\n"</div><div class='del'>-		       "  freespace key ",</div><div class='del'>-		       genbits, alloc_freespace_genbits(*a) &gt;&gt; 56);</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, freespace_k);</div><div class='del'>-		prt_printf(&amp;buf, "\n  ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		bch2_trans_inconsistent(trans, "%s", buf.buf);</div><div class='del'>-		ob = ERR_PTR(-EIO);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;curr_recovery_pass &lt;= BCH_RECOVERY_PASS_check_extents_to_backpointers) {</div><div class='del'>-		struct bch_backpointer bp;</div><div class='del'>-		struct bpos bp_pos = POS_MIN;</div><div class='del'>-</div><div class='del'>-		ret = bch2_get_next_backpointer(trans, POS(ca-&gt;dev_idx, b), -1,</div><div class='del'>-						&amp;bp_pos, &amp;bp,</div><div class='del'>-						BTREE_ITER_NOPRESERVE);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ob = ERR_PTR(ret);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!bkey_eq(bp_pos, POS_MAX)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Bucket may have data in it - we don't call</div><div class='del'>-			 * bc2h_trans_inconnsistent() because fsck hasn't</div><div class='del'>-			 * finished yet</div><div class='del'>-			 */</div><div class='del'>-			ob = NULL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ob = __try_alloc_bucket(c, ca, b, watermark, a, s, cl);</div><div class='del'>-	if (!ob)</div><div class='del'>-		set_btree_iter_dontneed(&amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (iter.path)</div><div class='del'>-		set_btree_iter_dontneed(&amp;iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This path is for before the freespace btree is initialized:</div><div class='del'>- *</div><div class='del'>- * If ca-&gt;new_fs_bucket_idx is nonzero, we haven't yet marked superblock &amp;</div><div class='del'>- * journal buckets - journal buckets will be &lt; ca-&gt;new_fs_bucket_idx</div><div class='del'>- */</div><div class='del'>-static noinline struct open_bucket *</div><div class='del'>-bch2_bucket_alloc_early(struct btree_trans *trans,</div><div class='del'>-			struct bch_dev *ca,</div><div class='del'>-			enum bch_watermark watermark,</div><div class='del'>-			struct bucket_alloc_state *s,</div><div class='del'>-			struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter, citer;</div><div class='del'>-	struct bkey_s_c k, ck;</div><div class='del'>-	struct open_bucket *ob = NULL;</div><div class='del'>-	u64 first_bucket = max_t(u64, ca-&gt;mi.first_bucket, ca-&gt;new_fs_bucket_idx);</div><div class='del'>-	u64 alloc_start = max(first_bucket, READ_ONCE(ca-&gt;alloc_cursor));</div><div class='del'>-	u64 alloc_cursor = alloc_start;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Scan with an uncached iterator to avoid polluting the key cache. An</div><div class='del'>-	 * uncached iter will return a cached key if one exists, but if not</div><div class='del'>-	 * there is no other underlying protection for the associated key cache</div><div class='del'>-	 * slot. To avoid racing bucket allocations, look up the cached key slot</div><div class='del'>-	 * of any likely allocation candidate before attempting to proceed with</div><div class='del'>-	 * the allocation. This provides proper exclusion on the associated</div><div class='del'>-	 * bucket.</div><div class='del'>-	 */</div><div class='del'>-again:</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_alloc, POS(ca-&gt;dev_idx, alloc_cursor),</div><div class='del'>-			   BTREE_ITER_SLOTS, k, ret) {</div><div class='del'>-		struct bch_alloc_v4 a_convert;</div><div class='del'>-		const struct bch_alloc_v4 *a;</div><div class='del'>-</div><div class='del'>-		if (bkey_ge(k.k-&gt;p, POS(ca-&gt;dev_idx, ca-&gt;mi.nbuckets)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (ca-&gt;new_fs_bucket_idx &amp;&amp;</div><div class='del'>-		    is_superblock_bucket(ca, k.k-&gt;p.offset))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-		if (a-&gt;data_type != BCH_DATA_free)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* now check the cached key to serialize concurrent allocs of the bucket */</div><div class='del'>-		ck = bch2_bkey_get_iter(trans, &amp;citer, BTREE_ID_alloc, k.k-&gt;p, BTREE_ITER_CACHED);</div><div class='del'>-		ret = bkey_err(ck);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		a = bch2_alloc_to_v4(ck, &amp;a_convert);</div><div class='del'>-		if (a-&gt;data_type != BCH_DATA_free)</div><div class='del'>-			goto next;</div><div class='del'>-</div><div class='del'>-		s-&gt;buckets_seen++;</div><div class='del'>-</div><div class='del'>-		ob = __try_alloc_bucket(trans-&gt;c, ca, k.k-&gt;p.offset, watermark, a, s, cl);</div><div class='del'>-next:</div><div class='del'>-		set_btree_iter_dontneed(&amp;citer);</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;citer);</div><div class='del'>-		if (ob)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	alloc_cursor = iter.pos.offset;</div><div class='del'>-	ca-&gt;alloc_cursor = alloc_cursor;</div><div class='del'>-</div><div class='del'>-	if (!ob &amp;&amp; ret)</div><div class='del'>-		ob = ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (!ob &amp;&amp; alloc_start &gt; first_bucket) {</div><div class='del'>-		alloc_cursor = alloc_start = first_bucket;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct open_bucket *bch2_bucket_alloc_freelist(struct btree_trans *trans,</div><div class='del'>-						   struct bch_dev *ca,</div><div class='del'>-						   enum bch_watermark watermark,</div><div class='del'>-						   struct bucket_alloc_state *s,</div><div class='del'>-						   struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct open_bucket *ob = NULL;</div><div class='del'>-	u64 alloc_start = max_t(u64, ca-&gt;mi.first_bucket, READ_ONCE(ca-&gt;alloc_cursor));</div><div class='del'>-	u64 alloc_cursor = alloc_start;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(ca-&gt;new_fs_bucket_idx);</div><div class='del'>-again:</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_freespace,</div><div class='del'>-				     POS(ca-&gt;dev_idx, alloc_cursor), 0, k, ret) {</div><div class='del'>-		if (k.k-&gt;p.inode != ca-&gt;dev_idx)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (alloc_cursor = max(alloc_cursor, bkey_start_offset(k.k));</div><div class='del'>-		     alloc_cursor &lt; k.k-&gt;p.offset;</div><div class='del'>-		     alloc_cursor++) {</div><div class='del'>-			ret = btree_trans_too_many_iters(trans);</div><div class='del'>-			if (ret) {</div><div class='del'>-				ob = ERR_PTR(ret);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			s-&gt;buckets_seen++;</div><div class='del'>-</div><div class='del'>-			ob = try_alloc_bucket(trans, ca, watermark,</div><div class='del'>-					      alloc_cursor, s, k, cl);</div><div class='del'>-			if (ob) {</div><div class='del'>-				set_btree_iter_dontneed(&amp;iter);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ob || ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	ca-&gt;alloc_cursor = alloc_cursor;</div><div class='del'>-</div><div class='del'>-	if (!ob &amp;&amp; ret)</div><div class='del'>-		ob = ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (!ob &amp;&amp; alloc_start &gt; ca-&gt;mi.first_bucket) {</div><div class='del'>-		alloc_cursor = alloc_start = ca-&gt;mi.first_bucket;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_bucket_alloc_trans - allocate a single bucket from a specific device</div><div class='del'>- * @trans:	transaction object</div><div class='del'>- * @ca:		device to allocate from</div><div class='del'>- * @watermark:	how important is this allocation?</div><div class='del'>- * @cl:		if not NULL, closure to be used to wait if buckets not available</div><div class='del'>- * @usage:	for secondarily also returning the current device usage</div><div class='del'>- *</div><div class='del'>- * Returns:	an open_bucket on success, or an ERR_PTR() on failure.</div><div class='del'>- */</div><div class='del'>-static struct open_bucket *bch2_bucket_alloc_trans(struct btree_trans *trans,</div><div class='del'>-				      struct bch_dev *ca,</div><div class='del'>-				      enum bch_watermark watermark,</div><div class='del'>-				      struct closure *cl,</div><div class='del'>-				      struct bch_dev_usage *usage)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct open_bucket *ob = NULL;</div><div class='del'>-	bool freespace = READ_ONCE(ca-&gt;mi.freespace_initialized);</div><div class='del'>-	u64 avail;</div><div class='del'>-	struct bucket_alloc_state s = { 0 };</div><div class='del'>-	bool waiting = false;</div><div class='del'>-again:</div><div class='del'>-	bch2_dev_usage_read_fast(ca, usage);</div><div class='del'>-	avail = dev_buckets_free(ca, *usage, watermark);</div><div class='del'>-</div><div class='del'>-	if (usage-&gt;d[BCH_DATA_need_discard].buckets &gt; avail)</div><div class='del'>-		bch2_do_discards(c);</div><div class='del'>-</div><div class='del'>-	if (usage-&gt;d[BCH_DATA_need_gc_gens].buckets &gt; avail)</div><div class='del'>-		bch2_do_gc_gens(c);</div><div class='del'>-</div><div class='del'>-	if (should_invalidate_buckets(ca, *usage))</div><div class='del'>-		bch2_do_invalidates(c);</div><div class='del'>-</div><div class='del'>-	if (!avail) {</div><div class='del'>-		if (cl &amp;&amp; !waiting) {</div><div class='del'>-			closure_wait(&amp;c-&gt;freelist_wait, cl);</div><div class='del'>-			waiting = true;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_allocate],</div><div class='del'>-				   &amp;c-&gt;blocked_allocate, true);</div><div class='del'>-</div><div class='del'>-		ob = ERR_PTR(-BCH_ERR_freelist_empty);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (waiting)</div><div class='del'>-		closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-alloc:</div><div class='del'>-	ob = likely(freespace)</div><div class='del'>-		? bch2_bucket_alloc_freelist(trans, ca, watermark, &amp;s, cl)</div><div class='del'>-		: bch2_bucket_alloc_early(trans, ca, watermark, &amp;s, cl);</div><div class='del'>-</div><div class='del'>-	if (s.skipped_need_journal_commit * 2 &gt; avail)</div><div class='del'>-		bch2_journal_flush_async(&amp;c-&gt;journal, NULL);</div><div class='del'>-</div><div class='del'>-	if (!ob &amp;&amp; freespace &amp;&amp; c-&gt;curr_recovery_pass &lt;= BCH_RECOVERY_PASS_check_alloc_info) {</div><div class='del'>-		freespace = false;</div><div class='del'>-		goto alloc;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	if (!ob)</div><div class='del'>-		ob = ERR_PTR(-BCH_ERR_no_buckets_found);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(ob))</div><div class='del'>-		trace_and_count(c, bucket_alloc, ca,</div><div class='del'>-				bch2_watermarks[watermark],</div><div class='del'>-				ob-&gt;bucket,</div><div class='del'>-				usage-&gt;d[BCH_DATA_free].buckets,</div><div class='del'>-				avail,</div><div class='del'>-				bch2_copygc_wait_amount(c),</div><div class='del'>-				c-&gt;copygc_wait - atomic64_read(&amp;c-&gt;io_clock[WRITE].now),</div><div class='del'>-				&amp;s,</div><div class='del'>-				cl == NULL,</div><div class='del'>-				"");</div><div class='del'>-	else if (!bch2_err_matches(PTR_ERR(ob), BCH_ERR_transaction_restart))</div><div class='del'>-		trace_and_count(c, bucket_alloc_fail, ca,</div><div class='del'>-				bch2_watermarks[watermark],</div><div class='del'>-				0,</div><div class='del'>-				usage-&gt;d[BCH_DATA_free].buckets,</div><div class='del'>-				avail,</div><div class='del'>-				bch2_copygc_wait_amount(c),</div><div class='del'>-				c-&gt;copygc_wait - atomic64_read(&amp;c-&gt;io_clock[WRITE].now),</div><div class='del'>-				&amp;s,</div><div class='del'>-				cl == NULL,</div><div class='del'>-				bch2_err_str(PTR_ERR(ob)));</div><div class='del'>-</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct open_bucket *bch2_bucket_alloc(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-				      enum bch_watermark watermark,</div><div class='del'>-				      struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev_usage usage;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-</div><div class='del'>-	bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		      PTR_ERR_OR_ZERO(ob = bch2_bucket_alloc_trans(trans, ca, watermark,</div><div class='del'>-							cl, &amp;usage)));</div><div class='del'>-	return ob;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __dev_stripe_cmp(struct dev_stripe_state *stripe,</div><div class='del'>-			    unsigned l, unsigned r)</div><div class='del'>-{</div><div class='del'>-	return ((stripe-&gt;next_alloc[l] &gt; stripe-&gt;next_alloc[r]) -</div><div class='del'>-		(stripe-&gt;next_alloc[l] &lt; stripe-&gt;next_alloc[r]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define dev_stripe_cmp(l, r) __dev_stripe_cmp(stripe, l, r)</div><div class='del'>-</div><div class='del'>-struct dev_alloc_list bch2_dev_alloc_list(struct bch_fs *c,</div><div class='del'>-					  struct dev_stripe_state *stripe,</div><div class='del'>-					  struct bch_devs_mask *devs)</div><div class='del'>-{</div><div class='del'>-	struct dev_alloc_list ret = { .nr = 0 };</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(i, devs-&gt;d, BCH_SB_MEMBERS_MAX)</div><div class='del'>-		ret.devs[ret.nr++] = i;</div><div class='del'>-</div><div class='del'>-	bubble_sort(ret.devs, ret.nr, dev_stripe_cmp);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_dev_stripe_increment_inlined(struct bch_dev *ca,</div><div class='del'>-			       struct dev_stripe_state *stripe,</div><div class='del'>-			       struct bch_dev_usage *usage)</div><div class='del'>-{</div><div class='del'>-	u64 *v = stripe-&gt;next_alloc + ca-&gt;dev_idx;</div><div class='del'>-	u64 free_space = dev_buckets_available(ca, BCH_WATERMARK_normal);</div><div class='del'>-	u64 free_space_inv = free_space</div><div class='del'>-		? div64_u64(1ULL &lt;&lt; 48, free_space)</div><div class='del'>-		: 1ULL &lt;&lt; 48;</div><div class='del'>-	u64 scale = *v / 4;</div><div class='del'>-</div><div class='del'>-	if (*v + free_space_inv &gt;= *v)</div><div class='del'>-		*v += free_space_inv;</div><div class='del'>-	else</div><div class='del'>-		*v = U64_MAX;</div><div class='del'>-</div><div class='del'>-	for (v = stripe-&gt;next_alloc;</div><div class='del'>-	     v &lt; stripe-&gt;next_alloc + ARRAY_SIZE(stripe-&gt;next_alloc); v++)</div><div class='del'>-		*v = *v &lt; scale ? 0 : *v - scale;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_stripe_increment(struct bch_dev *ca,</div><div class='del'>-			       struct dev_stripe_state *stripe)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev_usage usage;</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_read_fast(ca, &amp;usage);</div><div class='del'>-	bch2_dev_stripe_increment_inlined(ca, stripe, &amp;usage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_new_bucket(struct bch_fs *c,</div><div class='del'>-			   struct open_buckets *ptrs,</div><div class='del'>-			   struct bch_devs_mask *devs_may_alloc,</div><div class='del'>-			   unsigned nr_replicas,</div><div class='del'>-			   unsigned *nr_effective,</div><div class='del'>-			   bool *have_cache,</div><div class='del'>-			   unsigned flags,</div><div class='del'>-			   struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	unsigned durability =</div><div class='del'>-		bch_dev_bkey_exists(c, ob-&gt;dev)-&gt;mi.durability;</div><div class='del'>-</div><div class='del'>-	BUG_ON(*nr_effective &gt;= nr_replicas);</div><div class='del'>-</div><div class='del'>-	__clear_bit(ob-&gt;dev, devs_may_alloc-&gt;d);</div><div class='del'>-	*nr_effective	+= durability;</div><div class='del'>-	*have_cache	|= !durability;</div><div class='del'>-</div><div class='del'>-	ob_push(c, ptrs, ob);</div><div class='del'>-</div><div class='del'>-	if (*nr_effective &gt;= nr_replicas)</div><div class='del'>-		return 1;</div><div class='del'>-	if (ob-&gt;ec)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bucket_alloc_set_trans(struct btree_trans *trans,</div><div class='del'>-		      struct open_buckets *ptrs,</div><div class='del'>-		      struct dev_stripe_state *stripe,</div><div class='del'>-		      struct bch_devs_mask *devs_may_alloc,</div><div class='del'>-		      unsigned nr_replicas,</div><div class='del'>-		      unsigned *nr_effective,</div><div class='del'>-		      bool *have_cache,</div><div class='del'>-		      unsigned flags,</div><div class='del'>-		      enum bch_data_type data_type,</div><div class='del'>-		      enum bch_watermark watermark,</div><div class='del'>-		      struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct dev_alloc_list devs_sorted =</div><div class='del'>-		bch2_dev_alloc_list(c, stripe, devs_may_alloc);</div><div class='del'>-	unsigned dev;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret = -BCH_ERR_insufficient_devices;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(*nr_effective &gt;= nr_replicas);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; devs_sorted.nr; i++) {</div><div class='del'>-		struct bch_dev_usage usage;</div><div class='del'>-		struct open_bucket *ob;</div><div class='del'>-</div><div class='del'>-		dev = devs_sorted.devs[i];</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ca = rcu_dereference(c-&gt;devs[dev]);</div><div class='del'>-		if (ca)</div><div class='del'>-			percpu_ref_get(&amp;ca-&gt;ref);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		if (!ca)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!ca-&gt;mi.durability &amp;&amp; *have_cache) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ob = bch2_bucket_alloc_trans(trans, ca, watermark, cl, &amp;usage);</div><div class='del'>-		if (!IS_ERR(ob))</div><div class='del'>-			bch2_dev_stripe_increment_inlined(ca, stripe, &amp;usage);</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(ob)) {</div><div class='del'>-			ret = PTR_ERR(ob);</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart) || cl)</div><div class='del'>-				break;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ob-&gt;data_type = data_type;</div><div class='del'>-</div><div class='del'>-		if (add_new_bucket(c, ptrs, devs_may_alloc,</div><div class='del'>-				   nr_replicas, nr_effective,</div><div class='del'>-				   have_cache, flags, ob)) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Allocate from stripes: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if we can't allocate a new stripe because there are already too many</div><div class='del'>- * partially filled stripes, force allocating from an existing stripe even when</div><div class='del'>- * it's to a device we don't want:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int bucket_alloc_from_stripe(struct btree_trans *trans,</div><div class='del'>-			 struct open_buckets *ptrs,</div><div class='del'>-			 struct write_point *wp,</div><div class='del'>-			 struct bch_devs_mask *devs_may_alloc,</div><div class='del'>-			 u16 target,</div><div class='del'>-			 unsigned nr_replicas,</div><div class='del'>-			 unsigned *nr_effective,</div><div class='del'>-			 bool *have_cache,</div><div class='del'>-			 enum bch_watermark watermark,</div><div class='del'>-			 unsigned flags,</div><div class='del'>-			 struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct dev_alloc_list devs_sorted;</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i, ec_idx;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (nr_replicas &lt; 2)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (ec_open_bucket(c, ptrs))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	h = bch2_ec_stripe_head_get(trans, target, 0, nr_replicas - 1, watermark, cl);</div><div class='del'>-	if (IS_ERR(h))</div><div class='del'>-		return PTR_ERR(h);</div><div class='del'>-	if (!h)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	devs_sorted = bch2_dev_alloc_list(c, &amp;wp-&gt;stripe, devs_may_alloc);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; devs_sorted.nr; i++)</div><div class='del'>-		for (ec_idx = 0; ec_idx &lt; h-&gt;s-&gt;nr_data; ec_idx++) {</div><div class='del'>-			if (!h-&gt;s-&gt;blocks[ec_idx])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ob = c-&gt;open_buckets + h-&gt;s-&gt;blocks[ec_idx];</div><div class='del'>-			if (ob-&gt;dev == devs_sorted.devs[i] &amp;&amp;</div><div class='del'>-			    !test_and_set_bit(ec_idx, h-&gt;s-&gt;blocks_allocated))</div><div class='del'>-				goto got_bucket;</div><div class='del'>-		}</div><div class='del'>-	goto out_put_head;</div><div class='del'>-got_bucket:</div><div class='del'>-	ob-&gt;ec_idx	= ec_idx;</div><div class='del'>-	ob-&gt;ec		= h-&gt;s;</div><div class='del'>-	ec_stripe_new_get(h-&gt;s, STRIPE_REF_io);</div><div class='del'>-</div><div class='del'>-	ret = add_new_bucket(c, ptrs, devs_may_alloc,</div><div class='del'>-			     nr_replicas, nr_effective,</div><div class='del'>-			     have_cache, flags, ob);</div><div class='del'>-out_put_head:</div><div class='del'>-	bch2_ec_stripe_head_put(c, h);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sector allocator */</div><div class='del'>-</div><div class='del'>-static bool want_bucket(struct bch_fs *c,</div><div class='del'>-			struct write_point *wp,</div><div class='del'>-			struct bch_devs_mask *devs_may_alloc,</div><div class='del'>-			bool *have_cache, bool ec,</div><div class='del'>-			struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(ob-&gt;dev, devs_may_alloc-&gt;d))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (ob-&gt;data_type != wp-&gt;data_type)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (!ca-&gt;mi.durability &amp;&amp;</div><div class='del'>-	    (wp-&gt;data_type == BCH_DATA_btree || ec || *have_cache))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (ec != (ob-&gt;ec != NULL))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bucket_alloc_set_writepoint(struct bch_fs *c,</div><div class='del'>-				       struct open_buckets *ptrs,</div><div class='del'>-				       struct write_point *wp,</div><div class='del'>-				       struct bch_devs_mask *devs_may_alloc,</div><div class='del'>-				       unsigned nr_replicas,</div><div class='del'>-				       unsigned *nr_effective,</div><div class='del'>-				       bool *have_cache,</div><div class='del'>-				       bool ec, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct open_buckets ptrs_skip = { .nr = 0 };</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i) {</div><div class='del'>-		if (!ret &amp;&amp; want_bucket(c, wp, devs_may_alloc,</div><div class='del'>-					have_cache, ec, ob))</div><div class='del'>-			ret = add_new_bucket(c, ptrs, devs_may_alloc,</div><div class='del'>-				       nr_replicas, nr_effective,</div><div class='del'>-				       have_cache, flags, ob);</div><div class='del'>-		else</div><div class='del'>-			ob_push(c, &amp;ptrs_skip, ob);</div><div class='del'>-	}</div><div class='del'>-	wp-&gt;ptrs = ptrs_skip;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bucket_alloc_set_partial(struct bch_fs *c,</div><div class='del'>-				    struct open_buckets *ptrs,</div><div class='del'>-				    struct write_point *wp,</div><div class='del'>-				    struct bch_devs_mask *devs_may_alloc,</div><div class='del'>-				    unsigned nr_replicas,</div><div class='del'>-				    unsigned *nr_effective,</div><div class='del'>-				    bool *have_cache, bool ec,</div><div class='del'>-				    enum bch_watermark watermark,</div><div class='del'>-				    unsigned flags)</div><div class='del'>-{</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;open_buckets_partial_nr)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;open_buckets_partial_nr)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	for (i = c-&gt;open_buckets_partial_nr - 1; i &gt;= 0; --i) {</div><div class='del'>-		struct open_bucket *ob = c-&gt;open_buckets + c-&gt;open_buckets_partial[i];</div><div class='del'>-</div><div class='del'>-		if (want_bucket(c, wp, devs_may_alloc, have_cache, ec, ob)) {</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-			struct bch_dev_usage usage;</div><div class='del'>-			u64 avail;</div><div class='del'>-</div><div class='del'>-			bch2_dev_usage_read_fast(ca, &amp;usage);</div><div class='del'>-			avail = dev_buckets_free(ca, usage, watermark);</div><div class='del'>-			if (!avail)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			array_remove_item(c-&gt;open_buckets_partial,</div><div class='del'>-					  c-&gt;open_buckets_partial_nr,</div><div class='del'>-					  i);</div><div class='del'>-			ob-&gt;on_partial_list = false;</div><div class='del'>-</div><div class='del'>-			ret = add_new_bucket(c, ptrs, devs_may_alloc,</div><div class='del'>-					     nr_replicas, nr_effective,</div><div class='del'>-					     have_cache, flags, ob);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __open_bucket_add_buckets(struct btree_trans *trans,</div><div class='del'>-			struct open_buckets *ptrs,</div><div class='del'>-			struct write_point *wp,</div><div class='del'>-			struct bch_devs_list *devs_have,</div><div class='del'>-			u16 target,</div><div class='del'>-			bool erasure_code,</div><div class='del'>-			unsigned nr_replicas,</div><div class='del'>-			unsigned *nr_effective,</div><div class='del'>-			bool *have_cache,</div><div class='del'>-			enum bch_watermark watermark,</div><div class='del'>-			unsigned flags,</div><div class='del'>-			struct closure *_cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_devs_mask devs;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	struct closure *cl = NULL;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	devs = target_rw_devs(c, wp-&gt;data_type, target);</div><div class='del'>-</div><div class='del'>-	/* Don't allocate from devices we already have pointers to: */</div><div class='del'>-	darray_for_each(*devs_have, i)</div><div class='del'>-		__clear_bit(*i, devs.d);</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, ptrs, ob, i)</div><div class='del'>-		__clear_bit(ob-&gt;dev, devs.d);</div><div class='del'>-</div><div class='del'>-	if (erasure_code &amp;&amp; ec_open_bucket(c, ptrs))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bucket_alloc_set_writepoint(c, ptrs, wp, &amp;devs,</div><div class='del'>-				 nr_replicas, nr_effective,</div><div class='del'>-				 have_cache, erasure_code, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bucket_alloc_set_partial(c, ptrs, wp, &amp;devs,</div><div class='del'>-				 nr_replicas, nr_effective,</div><div class='del'>-				 have_cache, erasure_code, watermark, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (erasure_code) {</div><div class='del'>-		ret = bucket_alloc_from_stripe(trans, ptrs, wp, &amp;devs,</div><div class='del'>-					 target,</div><div class='del'>-					 nr_replicas, nr_effective,</div><div class='del'>-					 have_cache,</div><div class='del'>-					 watermark, flags, _cl);</div><div class='del'>-	} else {</div><div class='del'>-retry_blocking:</div><div class='del'>-		/*</div><div class='del'>-		 * Try nonblocking first, so that if one device is full we'll try from</div><div class='del'>-		 * other devices:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_bucket_alloc_set_trans(trans, ptrs, &amp;wp-&gt;stripe, &amp;devs,</div><div class='del'>-					nr_replicas, nr_effective, have_cache,</div><div class='del'>-					flags, wp-&gt;data_type, watermark, cl);</div><div class='del'>-		if (ret &amp;&amp;</div><div class='del'>-		    !bch2_err_matches(ret, BCH_ERR_transaction_restart) &amp;&amp;</div><div class='del'>-		    !bch2_err_matches(ret, BCH_ERR_insufficient_devices) &amp;&amp;</div><div class='del'>-		    !cl &amp;&amp; _cl) {</div><div class='del'>-			cl = _cl;</div><div class='del'>-			goto retry_blocking;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int open_bucket_add_buckets(struct btree_trans *trans,</div><div class='del'>-			struct open_buckets *ptrs,</div><div class='del'>-			struct write_point *wp,</div><div class='del'>-			struct bch_devs_list *devs_have,</div><div class='del'>-			u16 target,</div><div class='del'>-			unsigned erasure_code,</div><div class='del'>-			unsigned nr_replicas,</div><div class='del'>-			unsigned *nr_effective,</div><div class='del'>-			bool *have_cache,</div><div class='del'>-			enum bch_watermark watermark,</div><div class='del'>-			unsigned flags,</div><div class='del'>-			struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (erasure_code) {</div><div class='del'>-		ret = __open_bucket_add_buckets(trans, ptrs, wp,</div><div class='del'>-				devs_have, target, erasure_code,</div><div class='del'>-				nr_replicas, nr_effective, have_cache,</div><div class='del'>-				watermark, flags, cl);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart) ||</div><div class='del'>-		    bch2_err_matches(ret, BCH_ERR_operation_blocked) ||</div><div class='del'>-		    bch2_err_matches(ret, BCH_ERR_freelist_empty) ||</div><div class='del'>-		    bch2_err_matches(ret, BCH_ERR_open_buckets_empty))</div><div class='del'>-			return ret;</div><div class='del'>-		if (*nr_effective &gt;= nr_replicas)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __open_bucket_add_buckets(trans, ptrs, wp,</div><div class='del'>-			devs_have, target, false,</div><div class='del'>-			nr_replicas, nr_effective, have_cache,</div><div class='del'>-			watermark, flags, cl);</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * should_drop_bucket - check if this is open_bucket should go away</div><div class='del'>- * @ob:		open_bucket to predicate on</div><div class='del'>- * @c:		filesystem handle</div><div class='del'>- * @ca:		if set, we're killing buckets for a particular device</div><div class='del'>- * @ec:		if true, we're shutting down erasure coding and killing all ec</div><div class='del'>- *		open_buckets</div><div class='del'>- *		otherwise, return true</div><div class='del'>- * Returns: true if we should kill this open_bucket</div><div class='del'>- *</div><div class='del'>- * We're killing open_buckets because we're shutting down a device, erasure</div><div class='del'>- * coding, or the entire filesystem - check if this open_bucket matches:</div><div class='del'>- */</div><div class='del'>-static bool should_drop_bucket(struct open_bucket *ob, struct bch_fs *c,</div><div class='del'>-			       struct bch_dev *ca, bool ec)</div><div class='del'>-{</div><div class='del'>-	if (ec) {</div><div class='del'>-		return ob-&gt;ec != NULL;</div><div class='del'>-	} else if (ca) {</div><div class='del'>-		bool drop = ob-&gt;dev == ca-&gt;dev_idx;</div><div class='del'>-		struct open_bucket *ob2;</div><div class='del'>-		unsigned i;</div><div class='del'>-</div><div class='del'>-		if (!drop &amp;&amp; ob-&gt;ec) {</div><div class='del'>-			unsigned nr_blocks;</div><div class='del'>-</div><div class='del'>-			mutex_lock(&amp;ob-&gt;ec-&gt;lock);</div><div class='del'>-			nr_blocks = bkey_i_to_stripe(&amp;ob-&gt;ec-&gt;new_stripe.key)-&gt;v.nr_blocks;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; nr_blocks; i++) {</div><div class='del'>-				if (!ob-&gt;ec-&gt;blocks[i])</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				ob2 = c-&gt;open_buckets + ob-&gt;ec-&gt;blocks[i];</div><div class='del'>-				drop |= ob2-&gt;dev == ca-&gt;dev_idx;</div><div class='del'>-			}</div><div class='del'>-			mutex_unlock(&amp;ob-&gt;ec-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return drop;</div><div class='del'>-	} else {</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_writepoint_stop(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-				 bool ec, struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	struct open_buckets ptrs = { .nr = 0 };</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wp-&gt;lock);</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		if (should_drop_bucket(ob, c, ca, ec))</div><div class='del'>-			bch2_open_bucket_put(c, ob);</div><div class='del'>-		else</div><div class='del'>-			ob_push(c, &amp;ptrs, ob);</div><div class='del'>-	wp-&gt;ptrs = ptrs;</div><div class='del'>-	mutex_unlock(&amp;wp-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_open_buckets_stop(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			    bool ec)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	/* Next, close write points that point to this device... */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;write_points); i++)</div><div class='del'>-		bch2_writepoint_stop(c, ca, ec, &amp;c-&gt;write_points[i]);</div><div class='del'>-</div><div class='del'>-	bch2_writepoint_stop(c, ca, ec, &amp;c-&gt;copygc_write_point);</div><div class='del'>-	bch2_writepoint_stop(c, ca, ec, &amp;c-&gt;rebalance_write_point);</div><div class='del'>-	bch2_writepoint_stop(c, ca, ec, &amp;c-&gt;btree_write_point);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-	while (c-&gt;btree_reserve_cache_nr) {</div><div class='del'>-		struct btree_alloc *a =</div><div class='del'>-			&amp;c-&gt;btree_reserve_cache[--c-&gt;btree_reserve_cache_nr];</div><div class='del'>-</div><div class='del'>-		bch2_open_buckets_put(c, &amp;a-&gt;ob);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	i = 0;</div><div class='del'>-	while (i &lt; c-&gt;open_buckets_partial_nr) {</div><div class='del'>-		struct open_bucket *ob =</div><div class='del'>-			c-&gt;open_buckets + c-&gt;open_buckets_partial[i];</div><div class='del'>-</div><div class='del'>-		if (should_drop_bucket(ob, c, ca, ec)) {</div><div class='del'>-			--c-&gt;open_buckets_partial_nr;</div><div class='del'>-			swap(c-&gt;open_buckets_partial[i],</div><div class='del'>-			     c-&gt;open_buckets_partial[c-&gt;open_buckets_partial_nr]);</div><div class='del'>-			ob-&gt;on_partial_list = false;</div><div class='del'>-			spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-			bch2_open_bucket_put(c, ob);</div><div class='del'>-			spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-		} else {</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	bch2_ec_stop_dev(c, ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct hlist_head *writepoint_hash(struct bch_fs *c,</div><div class='del'>-						 unsigned long write_point)</div><div class='del'>-{</div><div class='del'>-	unsigned hash =</div><div class='del'>-		hash_long(write_point, ilog2(ARRAY_SIZE(c-&gt;write_points_hash)));</div><div class='del'>-</div><div class='del'>-	return &amp;c-&gt;write_points_hash[hash];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct write_point *__writepoint_find(struct hlist_head *head,</div><div class='del'>-					     unsigned long write_point)</div><div class='del'>-{</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(wp, head, node)</div><div class='del'>-		if (wp-&gt;write_point == write_point)</div><div class='del'>-			goto out;</div><div class='del'>-	wp = NULL;</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return wp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool too_many_writepoints(struct bch_fs *c, unsigned factor)</div><div class='del'>-{</div><div class='del'>-	u64 stranded	= c-&gt;write_points_nr * c-&gt;bucket_size_max;</div><div class='del'>-	u64 free	= bch2_fs_usage_read_short(c).free;</div><div class='del'>-</div><div class='del'>-	return stranded * factor &gt; free;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool try_increase_writepoints(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;write_points_nr == ARRAY_SIZE(c-&gt;write_points) ||</div><div class='del'>-	    too_many_writepoints(c, 32))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	wp = c-&gt;write_points + c-&gt;write_points_nr++;</div><div class='del'>-	hlist_add_head_rcu(&amp;wp-&gt;node, writepoint_hash(c, wp-&gt;write_point));</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool try_decrease_writepoints(struct btree_trans *trans, unsigned old_nr)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-	if (c-&gt;write_points_nr &lt; old_nr) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;write_points_nr == 1 ||</div><div class='del'>-	    !too_many_writepoints(c, 8)) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wp = c-&gt;write_points + --c-&gt;write_points_nr;</div><div class='del'>-</div><div class='del'>-	hlist_del_rcu(&amp;wp-&gt;node);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-</div><div class='del'>-	bch2_trans_mutex_lock_norelock(trans, &amp;wp-&gt;lock);</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		open_bucket_free_unused(c, ob);</div><div class='del'>-	wp-&gt;ptrs.nr = 0;</div><div class='del'>-	mutex_unlock(&amp;wp-&gt;lock);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct write_point *writepoint_find(struct btree_trans *trans,</div><div class='del'>-					   unsigned long write_point)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct write_point *wp, *oldest;</div><div class='del'>-	struct hlist_head *head;</div><div class='del'>-</div><div class='del'>-	if (!(write_point &amp; 1UL)) {</div><div class='del'>-		wp = (struct write_point *) write_point;</div><div class='del'>-		bch2_trans_mutex_lock_norelock(trans, &amp;wp-&gt;lock);</div><div class='del'>-		return wp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	head = writepoint_hash(c, write_point);</div><div class='del'>-restart_find:</div><div class='del'>-	wp = __writepoint_find(head, write_point);</div><div class='del'>-	if (wp) {</div><div class='del'>-lock_wp:</div><div class='del'>-		bch2_trans_mutex_lock_norelock(trans, &amp;wp-&gt;lock);</div><div class='del'>-		if (wp-&gt;write_point == write_point)</div><div class='del'>-			goto out;</div><div class='del'>-		mutex_unlock(&amp;wp-&gt;lock);</div><div class='del'>-		goto restart_find;</div><div class='del'>-	}</div><div class='del'>-restart_find_oldest:</div><div class='del'>-	oldest = NULL;</div><div class='del'>-	for (wp = c-&gt;write_points;</div><div class='del'>-	     wp &lt; c-&gt;write_points + c-&gt;write_points_nr; wp++)</div><div class='del'>-		if (!oldest || time_before64(wp-&gt;last_used, oldest-&gt;last_used))</div><div class='del'>-			oldest = wp;</div><div class='del'>-</div><div class='del'>-	bch2_trans_mutex_lock_norelock(trans, &amp;oldest-&gt;lock);</div><div class='del'>-	bch2_trans_mutex_lock_norelock(trans, &amp;c-&gt;write_points_hash_lock);</div><div class='del'>-	if (oldest &gt;= c-&gt;write_points + c-&gt;write_points_nr ||</div><div class='del'>-	    try_increase_writepoints(c)) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-		mutex_unlock(&amp;oldest-&gt;lock);</div><div class='del'>-		goto restart_find_oldest;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wp = __writepoint_find(head, write_point);</div><div class='del'>-	if (wp &amp;&amp; wp != oldest) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-		mutex_unlock(&amp;oldest-&gt;lock);</div><div class='del'>-		goto lock_wp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wp = oldest;</div><div class='del'>-	hlist_del_rcu(&amp;wp-&gt;node);</div><div class='del'>-	wp-&gt;write_point = write_point;</div><div class='del'>-	hlist_add_head_rcu(&amp;wp-&gt;node, head);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-out:</div><div class='del'>-	wp-&gt;last_used = local_clock();</div><div class='del'>-	return wp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void</div><div class='del'>-deallocate_extra_replicas(struct bch_fs *c,</div><div class='del'>-			  struct open_buckets *ptrs,</div><div class='del'>-			  struct open_buckets *ptrs_no_use,</div><div class='del'>-			  unsigned extra_replicas)</div><div class='del'>-{</div><div class='del'>-	struct open_buckets ptrs2 = { 0 };</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, ptrs, ob, i) {</div><div class='del'>-		unsigned d = bch_dev_bkey_exists(c, ob-&gt;dev)-&gt;mi.durability;</div><div class='del'>-</div><div class='del'>-		if (d &amp;&amp; d &lt;= extra_replicas) {</div><div class='del'>-			extra_replicas -= d;</div><div class='del'>-			ob_push(c, ptrs_no_use, ob);</div><div class='del'>-		} else {</div><div class='del'>-			ob_push(c, &amp;ptrs2, ob);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*ptrs = ptrs2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get us an open_bucket we can allocate from, return with it locked:</div><div class='del'>- */</div><div class='del'>-int bch2_alloc_sectors_start_trans(struct btree_trans *trans,</div><div class='del'>-			     unsigned target,</div><div class='del'>-			     unsigned erasure_code,</div><div class='del'>-			     struct write_point_specifier write_point,</div><div class='del'>-			     struct bch_devs_list *devs_have,</div><div class='del'>-			     unsigned nr_replicas,</div><div class='del'>-			     unsigned nr_replicas_required,</div><div class='del'>-			     enum bch_watermark watermark,</div><div class='del'>-			     unsigned flags,</div><div class='del'>-			     struct closure *cl,</div><div class='del'>-			     struct write_point **wp_ret)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	struct open_buckets ptrs;</div><div class='del'>-	unsigned nr_effective, write_points_nr;</div><div class='del'>-	bool have_cache;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!IS_ENABLED(CONFIG_BCACHEFS_ERASURE_CODING))</div><div class='del'>-		erasure_code = false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(flags &amp; BCH_WRITE_ONLY_SPECIFIED_DEVS);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!nr_replicas || !nr_replicas_required);</div><div class='del'>-retry:</div><div class='del'>-	ptrs.nr		= 0;</div><div class='del'>-	nr_effective	= 0;</div><div class='del'>-	write_points_nr = c-&gt;write_points_nr;</div><div class='del'>-	have_cache	= false;</div><div class='del'>-</div><div class='del'>-	*wp_ret = wp = writepoint_find(trans, write_point.v);</div><div class='del'>-</div><div class='del'>-	/* metadata may not allocate on cache devices: */</div><div class='del'>-	if (wp-&gt;data_type != BCH_DATA_user)</div><div class='del'>-		have_cache = true;</div><div class='del'>-</div><div class='del'>-	if (target &amp;&amp; !(flags &amp; BCH_WRITE_ONLY_SPECIFIED_DEVS)) {</div><div class='del'>-		ret = open_bucket_add_buckets(trans, &amp;ptrs, wp, devs_have,</div><div class='del'>-					      target, erasure_code,</div><div class='del'>-					      nr_replicas, &amp;nr_effective,</div><div class='del'>-					      &amp;have_cache, watermark,</div><div class='del'>-					      flags, NULL);</div><div class='del'>-		if (!ret ||</div><div class='del'>-		    bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto alloc_done;</div><div class='del'>-</div><div class='del'>-		/* Don't retry from all devices if we're out of open buckets: */</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_open_buckets_empty)) {</div><div class='del'>-			int ret = open_bucket_add_buckets(trans, &amp;ptrs, wp, devs_have,</div><div class='del'>-					      target, erasure_code,</div><div class='del'>-					      nr_replicas, &amp;nr_effective,</div><div class='del'>-					      &amp;have_cache, watermark,</div><div class='del'>-					      flags, cl);</div><div class='del'>-			if (!ret ||</div><div class='del'>-			    bch2_err_matches(ret, BCH_ERR_transaction_restart) ||</div><div class='del'>-			    bch2_err_matches(ret, BCH_ERR_open_buckets_empty))</div><div class='del'>-				goto alloc_done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Only try to allocate cache (durability = 0 devices) from the</div><div class='del'>-		 * specified target:</div><div class='del'>-		 */</div><div class='del'>-		have_cache = true;</div><div class='del'>-</div><div class='del'>-		ret = open_bucket_add_buckets(trans, &amp;ptrs, wp, devs_have,</div><div class='del'>-					      0, erasure_code,</div><div class='del'>-					      nr_replicas, &amp;nr_effective,</div><div class='del'>-					      &amp;have_cache, watermark,</div><div class='del'>-					      flags, cl);</div><div class='del'>-	} else {</div><div class='del'>-		ret = open_bucket_add_buckets(trans, &amp;ptrs, wp, devs_have,</div><div class='del'>-					      target, erasure_code,</div><div class='del'>-					      nr_replicas, &amp;nr_effective,</div><div class='del'>-					      &amp;have_cache, watermark,</div><div class='del'>-					      flags, cl);</div><div class='del'>-	}</div><div class='del'>-alloc_done:</div><div class='del'>-	BUG_ON(!ret &amp;&amp; nr_effective &lt; nr_replicas);</div><div class='del'>-</div><div class='del'>-	if (erasure_code &amp;&amp; !ec_open_bucket(c, &amp;ptrs))</div><div class='del'>-		pr_debug("failed to get ec bucket: ret %u", ret);</div><div class='del'>-</div><div class='del'>-	if (ret == -BCH_ERR_insufficient_devices &amp;&amp;</div><div class='del'>-	    nr_effective &gt;= nr_replicas_required)</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (nr_effective &gt; nr_replicas)</div><div class='del'>-		deallocate_extra_replicas(c, &amp;ptrs, &amp;wp-&gt;ptrs, nr_effective - nr_replicas);</div><div class='del'>-</div><div class='del'>-	/* Free buckets we didn't use: */</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		open_bucket_free_unused(c, ob);</div><div class='del'>-</div><div class='del'>-	wp-&gt;ptrs = ptrs;</div><div class='del'>-</div><div class='del'>-	wp-&gt;sectors_free = UINT_MAX;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		wp-&gt;sectors_free = min(wp-&gt;sectors_free, ob-&gt;sectors_free);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!wp-&gt;sectors_free || wp-&gt;sectors_free == UINT_MAX);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		if (ptrs.nr &lt; ARRAY_SIZE(ptrs.v))</div><div class='del'>-			ob_push(c, &amp;ptrs, ob);</div><div class='del'>-		else</div><div class='del'>-			open_bucket_free_unused(c, ob);</div><div class='del'>-	wp-&gt;ptrs = ptrs;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;wp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_freelist_empty) &amp;&amp;</div><div class='del'>-	    try_decrease_writepoints(trans, write_points_nr))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_open_buckets_empty) ||</div><div class='del'>-	    bch2_err_matches(ret, BCH_ERR_freelist_empty))</div><div class='del'>-		return cl</div><div class='del'>-			? -BCH_ERR_bucket_alloc_blocked</div><div class='del'>-			: -BCH_ERR_ENOSPC_bucket_alloc;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_extent_ptr bch2_ob_ptr(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return (struct bch_extent_ptr) {</div><div class='del'>-		.type	= 1 &lt;&lt; BCH_EXTENT_ENTRY_ptr,</div><div class='del'>-		.gen	= ob-&gt;gen,</div><div class='del'>-		.dev	= ob-&gt;dev,</div><div class='del'>-		.offset	= bucket_to_sector(ca, ob-&gt;bucket) +</div><div class='del'>-			ca-&gt;mi.bucket_size -</div><div class='del'>-			ob-&gt;sectors_free,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_alloc_sectors_append_ptrs(struct bch_fs *c, struct write_point *wp,</div><div class='del'>-				    struct bkey_i *k, unsigned sectors,</div><div class='del'>-				    bool cached)</div><div class='del'>-{</div><div class='del'>-	bch2_alloc_sectors_append_ptrs_inlined(c, wp, k, sectors, cached);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Append pointers to the space we just allocated to @k, and mark @sectors space</div><div class='del'>- * as allocated out of @ob</div><div class='del'>- */</div><div class='del'>-void bch2_alloc_sectors_done(struct bch_fs *c, struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	bch2_alloc_sectors_done_inlined(c, wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void writepoint_init(struct write_point *wp,</div><div class='del'>-				   enum bch_data_type type)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;wp-&gt;lock);</div><div class='del'>-	wp-&gt;data_type = type;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;wp-&gt;index_update_work, bch2_write_point_do_index_updates);</div><div class='del'>-	INIT_LIST_HEAD(&amp;wp-&gt;writes);</div><div class='del'>-	spin_lock_init(&amp;wp-&gt;writes_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_allocator_foreground_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;c-&gt;write_points_hash_lock);</div><div class='del'>-	c-&gt;write_points_nr = ARRAY_SIZE(c-&gt;write_points);</div><div class='del'>-</div><div class='del'>-	/* open bucket 0 is a sentinal NULL: */</div><div class='del'>-	spin_lock_init(&amp;c-&gt;open_buckets[0].lock);</div><div class='del'>-</div><div class='del'>-	for (ob = c-&gt;open_buckets + 1;</div><div class='del'>-	     ob &lt; c-&gt;open_buckets + ARRAY_SIZE(c-&gt;open_buckets); ob++) {</div><div class='del'>-		spin_lock_init(&amp;ob-&gt;lock);</div><div class='del'>-		c-&gt;open_buckets_nr_free++;</div><div class='del'>-</div><div class='del'>-		ob-&gt;freelist = c-&gt;open_buckets_freelist;</div><div class='del'>-		c-&gt;open_buckets_freelist = ob - c-&gt;open_buckets;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	writepoint_init(&amp;c-&gt;btree_write_point,		BCH_DATA_btree);</div><div class='del'>-	writepoint_init(&amp;c-&gt;rebalance_write_point,	BCH_DATA_user);</div><div class='del'>-	writepoint_init(&amp;c-&gt;copygc_write_point,		BCH_DATA_user);</div><div class='del'>-</div><div class='del'>-	for (wp = c-&gt;write_points;</div><div class='del'>-	     wp &lt; c-&gt;write_points + c-&gt;write_points_nr; wp++) {</div><div class='del'>-		writepoint_init(wp, BCH_DATA_user);</div><div class='del'>-</div><div class='del'>-		wp-&gt;last_used	= local_clock();</div><div class='del'>-		wp-&gt;write_point	= (unsigned long) wp;</div><div class='del'>-		hlist_add_head_rcu(&amp;wp-&gt;node,</div><div class='del'>-				   writepoint_hash(c, wp-&gt;write_point));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_open_bucket_to_text(struct printbuf *out, struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-	unsigned data_type = ob-&gt;data_type;</div><div class='del'>-	barrier(); /* READ_ONCE() doesn't work on bitfields */</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%zu ref %u ",</div><div class='del'>-		   ob - c-&gt;open_buckets,</div><div class='del'>-		   atomic_read(&amp;ob-&gt;pin));</div><div class='del'>-	bch2_prt_data_type(out, data_type);</div><div class='del'>-	prt_printf(out, " %u:%llu gen %u allocated %u/%u",</div><div class='del'>-		   ob-&gt;dev, ob-&gt;bucket, ob-&gt;gen,</div><div class='del'>-		   ca-&gt;mi.bucket_size - ob-&gt;sectors_free, ca-&gt;mi.bucket_size);</div><div class='del'>-	if (ob-&gt;ec)</div><div class='del'>-		prt_printf(out, " ec idx %llu", ob-&gt;ec-&gt;idx);</div><div class='del'>-	if (ob-&gt;on_partial_list)</div><div class='del'>-		prt_str(out, " partial");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_open_buckets_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-</div><div class='del'>-	for (ob = c-&gt;open_buckets;</div><div class='del'>-	     ob &lt; c-&gt;open_buckets + ARRAY_SIZE(c-&gt;open_buckets);</div><div class='del'>-	     ob++) {</div><div class='del'>-		spin_lock(&amp;ob-&gt;lock);</div><div class='del'>-		if (ob-&gt;valid &amp;&amp; !ob-&gt;on_partial_list)</div><div class='del'>-			bch2_open_bucket_to_text(out, c, ob);</div><div class='del'>-		spin_unlock(&amp;ob-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	--out-&gt;atomic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_open_buckets_partial_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;open_buckets_partial_nr; i++)</div><div class='del'>-		bch2_open_bucket_to_text(out, c,</div><div class='del'>-				c-&gt;open_buckets + c-&gt;open_buckets_partial[i]);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	--out-&gt;atomic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char * const bch2_write_point_states[] = {</div><div class='del'>-#define x(n)	#n,</div><div class='del'>-	WRITE_POINT_STATES()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_write_point_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				     struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%lu: ", wp-&gt;write_point);</div><div class='del'>-	prt_human_readable_u64(out, wp-&gt;sectors_allocated);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, " last wrote: ");</div><div class='del'>-	bch2_pr_time_units(out, sched_clock() - wp-&gt;last_used);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; WRITE_POINT_STATE_NR; i++) {</div><div class='del'>-		prt_printf(out, " %s: ", bch2_write_point_states[i]);</div><div class='del'>-		bch2_pr_time_units(out, wp-&gt;time[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		bch2_open_bucket_to_text(out, c, ob);</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_write_points_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Foreground write points\n");</div><div class='del'>-	for (wp = c-&gt;write_points;</div><div class='del'>-	     wp &lt; c-&gt;write_points + ARRAY_SIZE(c-&gt;write_points);</div><div class='del'>-	     wp++)</div><div class='del'>-		bch2_write_point_to_text(out, c, wp);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Copygc write point\n");</div><div class='del'>-	bch2_write_point_to_text(out, c, &amp;c-&gt;copygc_write_point);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Rebalance write point\n");</div><div class='del'>-	bch2_write_point_to_text(out, c, &amp;c-&gt;rebalance_write_point);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Btree write point\n");</div><div class='del'>-	bch2_write_point_to_text(out, c, &amp;c-&gt;btree_write_point);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/alloc_foreground.h b/fs/bcachefs/alloc_foreground.h<br/>deleted file mode 100644<br/>index 7aaeec44c746..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/alloc_foreground.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_foreground.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,224 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ALLOC_FOREGROUND_H</div><div class='del'>-#define _BCACHEFS_ALLOC_FOREGROUND_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_types.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/hash.h&gt;</div><div class='del'>-</div><div class='del'>-struct bkey;</div><div class='del'>-struct bch_dev;</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct bch_devs_List;</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_watermarks[];</div><div class='del'>-</div><div class='del'>-void bch2_reset_alloc_cursors(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-struct dev_alloc_list {</div><div class='del'>-	unsigned	nr;</div><div class='del'>-	u8		devs[BCH_SB_MEMBERS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dev_alloc_list bch2_dev_alloc_list(struct bch_fs *,</div><div class='del'>-					  struct dev_stripe_state *,</div><div class='del'>-					  struct bch_devs_mask *);</div><div class='del'>-void bch2_dev_stripe_increment(struct bch_dev *, struct dev_stripe_state *);</div><div class='del'>-</div><div class='del'>-long bch2_bucket_alloc_new_fs(struct bch_dev *);</div><div class='del'>-</div><div class='del'>-struct open_bucket *bch2_bucket_alloc(struct bch_fs *, struct bch_dev *,</div><div class='del'>-				      enum bch_watermark, struct closure *);</div><div class='del'>-</div><div class='del'>-static inline void ob_push(struct bch_fs *c, struct open_buckets *obs,</div><div class='del'>-			   struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(obs-&gt;nr &gt;= ARRAY_SIZE(obs-&gt;v));</div><div class='del'>-</div><div class='del'>-	obs-&gt;v[obs-&gt;nr++] = ob - c-&gt;open_buckets;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define open_bucket_for_each(_c, _obs, _ob, _i)				\</div><div class='del'>-	for ((_i) = 0;							\</div><div class='del'>-	     (_i) &lt; (_obs)-&gt;nr &amp;&amp;					\</div><div class='del'>-	     ((_ob) = (_c)-&gt;open_buckets + (_obs)-&gt;v[_i], true);	\</div><div class='del'>-	     (_i)++)</div><div class='del'>-</div><div class='del'>-static inline struct open_bucket *ec_open_bucket(struct bch_fs *c,</div><div class='del'>-						 struct open_buckets *obs)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, obs, ob, i)</div><div class='del'>-		if (ob-&gt;ec)</div><div class='del'>-			return ob;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_open_bucket_write_error(struct bch_fs *,</div><div class='del'>-			struct open_buckets *, unsigned);</div><div class='del'>-</div><div class='del'>-void __bch2_open_bucket_put(struct bch_fs *, struct open_bucket *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_open_bucket_put(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	if (atomic_dec_and_test(&amp;ob-&gt;pin))</div><div class='del'>-		__bch2_open_bucket_put(c, ob);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_open_buckets_put(struct bch_fs *c,</div><div class='del'>-					 struct open_buckets *ptrs)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, ptrs, ob, i)</div><div class='del'>-		bch2_open_bucket_put(c, ob);</div><div class='del'>-	ptrs-&gt;nr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_alloc_sectors_done_inlined(struct bch_fs *c, struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	struct open_buckets ptrs = { .nr = 0 }, keep = { .nr = 0 };</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-		ob_push(c, !ob-&gt;sectors_free ? &amp;ptrs : &amp;keep, ob);</div><div class='del'>-	wp-&gt;ptrs = keep;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;wp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	bch2_open_buckets_put(c, &amp;ptrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_open_bucket_get(struct bch_fs *c,</div><div class='del'>-					struct write_point *wp,</div><div class='del'>-					struct open_buckets *ptrs)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i) {</div><div class='del'>-		ob-&gt;data_type = wp-&gt;data_type;</div><div class='del'>-		atomic_inc(&amp;ob-&gt;pin);</div><div class='del'>-		ob_push(c, ptrs, ob);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline open_bucket_idx_t *open_bucket_hashslot(struct bch_fs *c,</div><div class='del'>-						  unsigned dev, u64 bucket)</div><div class='del'>-{</div><div class='del'>-	return c-&gt;open_buckets_hash +</div><div class='del'>-		(jhash_3words(dev, bucket, bucket &gt;&gt; 32, 0) &amp;</div><div class='del'>-		 (OPEN_BUCKETS_COUNT - 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_bucket_is_open(struct bch_fs *c, unsigned dev, u64 bucket)</div><div class='del'>-{</div><div class='del'>-	open_bucket_idx_t slot = *open_bucket_hashslot(c, dev, bucket);</div><div class='del'>-</div><div class='del'>-	while (slot) {</div><div class='del'>-		struct open_bucket *ob = &amp;c-&gt;open_buckets[slot];</div><div class='del'>-</div><div class='del'>-		if (ob-&gt;dev == dev &amp;&amp; ob-&gt;bucket == bucket)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		slot = ob-&gt;hash;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_bucket_is_open_safe(struct bch_fs *c, unsigned dev, u64 bucket)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_is_open(c, dev, bucket))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;freelist_lock);</div><div class='del'>-	ret = bch2_bucket_is_open(c, dev, bucket);</div><div class='del'>-	spin_unlock(&amp;c-&gt;freelist_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bucket_alloc_set_trans(struct btree_trans *, struct open_buckets *,</div><div class='del'>-		      struct dev_stripe_state *, struct bch_devs_mask *,</div><div class='del'>-		      unsigned, unsigned *, bool *, unsigned,</div><div class='del'>-		      enum bch_data_type, enum bch_watermark,</div><div class='del'>-		      struct closure *);</div><div class='del'>-</div><div class='del'>-int bch2_alloc_sectors_start_trans(struct btree_trans *,</div><div class='del'>-				   unsigned, unsigned,</div><div class='del'>-				   struct write_point_specifier,</div><div class='del'>-				   struct bch_devs_list *,</div><div class='del'>-				   unsigned, unsigned,</div><div class='del'>-				   enum bch_watermark,</div><div class='del'>-				   unsigned,</div><div class='del'>-				   struct closure *,</div><div class='del'>-				   struct write_point **);</div><div class='del'>-</div><div class='del'>-struct bch_extent_ptr bch2_ob_ptr(struct bch_fs *, struct open_bucket *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Append pointers to the space we just allocated to @k, and mark @sectors space</div><div class='del'>- * as allocated out of @ob</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-bch2_alloc_sectors_append_ptrs_inlined(struct bch_fs *c, struct write_point *wp,</div><div class='del'>-				       struct bkey_i *k, unsigned sectors,</div><div class='del'>-				       bool cached)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(sectors &gt; wp-&gt;sectors_free);</div><div class='del'>-	wp-&gt;sectors_free	-= sectors;</div><div class='del'>-	wp-&gt;sectors_allocated	+= sectors;</div><div class='del'>-</div><div class='del'>-	open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-		struct bch_extent_ptr ptr = bch2_ob_ptr(c, ob);</div><div class='del'>-</div><div class='del'>-		ptr.cached = cached ||</div><div class='del'>-			(!ca-&gt;mi.durability &amp;&amp;</div><div class='del'>-			 wp-&gt;data_type == BCH_DATA_user);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_append_ptr(k, ptr);</div><div class='del'>-</div><div class='del'>-		BUG_ON(sectors &gt; ob-&gt;sectors_free);</div><div class='del'>-		ob-&gt;sectors_free -= sectors;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_alloc_sectors_append_ptrs(struct bch_fs *, struct write_point *,</div><div class='del'>-				    struct bkey_i *, unsigned, bool);</div><div class='del'>-void bch2_alloc_sectors_done(struct bch_fs *, struct write_point *);</div><div class='del'>-</div><div class='del'>-void bch2_open_buckets_stop(struct bch_fs *c, struct bch_dev *, bool);</div><div class='del'>-</div><div class='del'>-static inline struct write_point_specifier writepoint_hashed(unsigned long v)</div><div class='del'>-{</div><div class='del'>-	return (struct write_point_specifier) { .v = v | 1 };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct write_point_specifier writepoint_ptr(struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	return (struct write_point_specifier) { .v = (unsigned long) wp };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_allocator_foreground_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_open_buckets_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-void bch2_open_buckets_partial_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_write_points_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_ALLOC_FOREGROUND_H */</div><div class='head'>diff --git a/fs/bcachefs/alloc_types.h b/fs/bcachefs/alloc_types.h<br/>deleted file mode 100644<br/>index b91b7a461056..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/alloc_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/alloc_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ALLOC_TYPES_H</div><div class='del'>-#define _BCACHEFS_ALLOC_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "clock_types.h"</div><div class='del'>-#include "fifo.h"</div><div class='del'>-</div><div class='del'>-struct bucket_alloc_state {</div><div class='del'>-	u64	buckets_seen;</div><div class='del'>-	u64	skipped_open;</div><div class='del'>-	u64	skipped_need_journal_commit;</div><div class='del'>-	u64	skipped_nocow;</div><div class='del'>-	u64	skipped_nouse;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_WATERMARKS()		\</div><div class='del'>-	x(stripe)			\</div><div class='del'>-	x(normal)			\</div><div class='del'>-	x(copygc)			\</div><div class='del'>-	x(btree)			\</div><div class='del'>-	x(btree_copygc)			\</div><div class='del'>-	x(reclaim)</div><div class='del'>-</div><div class='del'>-enum bch_watermark {</div><div class='del'>-#define x(name)	BCH_WATERMARK_##name,</div><div class='del'>-	BCH_WATERMARKS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_WATERMARK_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_WATERMARK_BITS	3</div><div class='del'>-#define BCH_WATERMARK_MASK	~(~0U &lt;&lt; BCH_WATERMARK_BITS)</div><div class='del'>-</div><div class='del'>-#define OPEN_BUCKETS_COUNT	1024</div><div class='del'>-</div><div class='del'>-#define WRITE_POINT_HASH_NR	32</div><div class='del'>-#define WRITE_POINT_MAX		32</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 0 is never a valid open_bucket_idx_t:</div><div class='del'>- */</div><div class='del'>-typedef u16			open_bucket_idx_t;</div><div class='del'>-</div><div class='del'>-struct open_bucket {</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	atomic_t		pin;</div><div class='del'>-	open_bucket_idx_t	freelist;</div><div class='del'>-	open_bucket_idx_t	hash;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When an open bucket has an ec_stripe attached, this is the index of</div><div class='del'>-	 * the block in the stripe this open_bucket corresponds to:</div><div class='del'>-	 */</div><div class='del'>-	u8			ec_idx;</div><div class='del'>-	enum bch_data_type	data_type:6;</div><div class='del'>-	unsigned		valid:1;</div><div class='del'>-	unsigned		on_partial_list:1;</div><div class='del'>-</div><div class='del'>-	u8			dev;</div><div class='del'>-	u8			gen;</div><div class='del'>-	u32			sectors_free;</div><div class='del'>-	u64			bucket;</div><div class='del'>-	struct ec_stripe_new	*ec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define OPEN_BUCKET_LIST_MAX	15</div><div class='del'>-</div><div class='del'>-struct open_buckets {</div><div class='del'>-	open_bucket_idx_t	nr;</div><div class='del'>-	open_bucket_idx_t	v[OPEN_BUCKET_LIST_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dev_stripe_state {</div><div class='del'>-	u64			next_alloc[BCH_SB_MEMBERS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define WRITE_POINT_STATES()		\</div><div class='del'>-	x(stopped)			\</div><div class='del'>-	x(waiting_io)			\</div><div class='del'>-	x(waiting_work)			\</div><div class='del'>-	x(running)</div><div class='del'>-</div><div class='del'>-enum write_point_state {</div><div class='del'>-#define x(n)	WRITE_POINT_##n,</div><div class='del'>-	WRITE_POINT_STATES()</div><div class='del'>-#undef x</div><div class='del'>-	WRITE_POINT_STATE_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct write_point {</div><div class='del'>-	struct {</div><div class='del'>-		struct hlist_node	node;</div><div class='del'>-		struct mutex		lock;</div><div class='del'>-		u64			last_used;</div><div class='del'>-		unsigned long		write_point;</div><div class='del'>-		enum bch_data_type	data_type;</div><div class='del'>-</div><div class='del'>-		/* calculated based on how many pointers we're actually going to use: */</div><div class='del'>-		unsigned		sectors_free;</div><div class='del'>-</div><div class='del'>-		struct open_buckets	ptrs;</div><div class='del'>-		struct dev_stripe_state	stripe;</div><div class='del'>-</div><div class='del'>-		u64			sectors_allocated;</div><div class='del'>-	} __aligned(SMP_CACHE_BYTES);</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		struct work_struct	index_update_work;</div><div class='del'>-</div><div class='del'>-		struct list_head	writes;</div><div class='del'>-		spinlock_t		writes_lock;</div><div class='del'>-</div><div class='del'>-		enum write_point_state	state;</div><div class='del'>-		u64			last_state_change;</div><div class='del'>-		u64			time[WRITE_POINT_STATE_NR];</div><div class='del'>-	} __aligned(SMP_CACHE_BYTES);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct write_point_specifier {</div><div class='del'>-	unsigned long		v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_ALLOC_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/backpointers.c b/fs/bcachefs/backpointers.c<br/>deleted file mode 100644<br/>index b4dc319bcb2b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/backpointers.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/backpointers.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,871 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bbpos.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-static bool extent_matches_bp(struct bch_fs *c,</div><div class='del'>-			      enum btree_id btree_id, unsigned level,</div><div class='del'>-			      struct bkey_s_c k,</div><div class='del'>-			      struct bpos bucket,</div><div class='del'>-			      struct bch_backpointer bp)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		struct bpos bucket2;</div><div class='del'>-		struct bch_backpointer bp2;</div><div class='del'>-</div><div class='del'>-		if (p.ptr.cached)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_extent_ptr_to_bp(c, btree_id, level, k, p,</div><div class='del'>-				      &amp;bucket2, &amp;bp2);</div><div class='del'>-		if (bpos_eq(bucket, bucket2) &amp;&amp;</div><div class='del'>-		    !memcmp(&amp;bp, &amp;bp2, sizeof(bp)))</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_backpointer_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			     enum bkey_invalid_flags flags,</div><div class='del'>-			     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_backpointer bp = bkey_s_c_to_backpointer(k);</div><div class='del'>-	struct bpos bucket = bp_pos_to_bucket(c, bp.k-&gt;p);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!bpos_eq(bp.k-&gt;p, bucket_pos_to_bp(c, bucket, bp.v-&gt;bucket_offset)),</div><div class='del'>-			 c, err,</div><div class='del'>-			 backpointer_pos_wrong,</div><div class='del'>-			 "backpointer at wrong pos");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_backpointer_to_text(struct printbuf *out, const struct bch_backpointer *bp)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "btree=%s l=%u offset=%llu:%u len=%u pos=",</div><div class='del'>-	       bch2_btree_id_str(bp-&gt;btree_id),</div><div class='del'>-	       bp-&gt;level,</div><div class='del'>-	       (u64) (bp-&gt;bucket_offset &gt;&gt; MAX_EXTENT_COMPRESS_RATIO_SHIFT),</div><div class='del'>-	       (u32) bp-&gt;bucket_offset &amp; ~(~0U &lt;&lt; MAX_EXTENT_COMPRESS_RATIO_SHIFT),</div><div class='del'>-	       bp-&gt;bucket_len);</div><div class='del'>-	bch2_bpos_to_text(out, bp-&gt;pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_backpointer_k_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	prt_str(out, "bucket=");</div><div class='del'>-	bch2_bpos_to_text(out, bp_pos_to_bucket(c, k.k-&gt;p));</div><div class='del'>-	prt_str(out, " ");</div><div class='del'>-</div><div class='del'>-	bch2_backpointer_to_text(out, bkey_s_c_to_backpointer(k).v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_backpointer_swab(struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_backpointer bp = bkey_s_to_backpointer(k);</div><div class='del'>-</div><div class='del'>-	bp.v-&gt;bucket_offset	= swab40(bp.v-&gt;bucket_offset);</div><div class='del'>-	bp.v-&gt;bucket_len	= swab32(bp.v-&gt;bucket_len);</div><div class='del'>-	bch2_bpos_swab(&amp;bp.v-&gt;pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int backpointer_mod_err(struct btree_trans *trans,</div><div class='del'>-					struct bch_backpointer bp,</div><div class='del'>-					struct bkey_s_c bp_k,</div><div class='del'>-					struct bkey_s_c orig_k,</div><div class='del'>-					bool insert)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	if (insert) {</div><div class='del'>-		prt_printf(&amp;buf, "existing backpointer found when inserting ");</div><div class='del'>-		bch2_backpointer_to_text(&amp;buf, &amp;bp);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		printbuf_indent_add(&amp;buf, 2);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "found ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bp_k);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "for ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, orig_k);</div><div class='del'>-</div><div class='del'>-		bch_err(c, "%s", buf.buf);</div><div class='del'>-	} else if (c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_extents_to_backpointers) {</div><div class='del'>-		prt_printf(&amp;buf, "backpointer not found when deleting");</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		printbuf_indent_add(&amp;buf, 2);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "searching for ");</div><div class='del'>-		bch2_backpointer_to_text(&amp;buf, &amp;bp);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "got ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bp_k);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "for ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, orig_k);</div><div class='del'>-</div><div class='del'>-		bch_err(c, "%s", buf.buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_extents_to_backpointers) {</div><div class='del'>-		bch2_inconsistent_error(c);</div><div class='del'>-		return -EIO;</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *trans,</div><div class='del'>-				struct bpos bucket,</div><div class='del'>-				struct bch_backpointer bp,</div><div class='del'>-				struct bkey_s_c orig_k,</div><div class='del'>-				bool insert)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter bp_iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i_backpointer *bp_k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bp_k = bch2_trans_kmalloc_nomemzero(trans, sizeof(struct bkey_i_backpointer));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(bp_k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bkey_backpointer_init(&amp;bp_k-&gt;k_i);</div><div class='del'>-	bp_k-&gt;k.p = bucket_pos_to_bp(trans-&gt;c, bucket, bp.bucket_offset);</div><div class='del'>-	bp_k-&gt;v = bp;</div><div class='del'>-</div><div class='del'>-	if (!insert) {</div><div class='del'>-		bp_k-&gt;k.type = KEY_TYPE_deleted;</div><div class='del'>-		set_bkey_val_u64s(&amp;bp_k-&gt;k, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;bp_iter, BTREE_ID_backpointers,</div><div class='del'>-			       bp_k-&gt;k.p,</div><div class='del'>-			       BTREE_ITER_INTENT|</div><div class='del'>-			       BTREE_ITER_SLOTS|</div><div class='del'>-			       BTREE_ITER_WITH_UPDATES);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (insert</div><div class='del'>-	    ? k.k-&gt;type</div><div class='del'>-	    : (k.k-&gt;type != KEY_TYPE_backpointer ||</div><div class='del'>-	       memcmp(bkey_s_c_to_backpointer(k).v, &amp;bp, sizeof(bp)))) {</div><div class='del'>-		ret = backpointer_mod_err(trans, bp, k, orig_k, insert);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;bp_iter, &amp;bp_k-&gt;k_i, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;bp_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find the next backpointer &gt;= *bp_offset:</div><div class='del'>- */</div><div class='del'>-int bch2_get_next_backpointer(struct btree_trans *trans,</div><div class='del'>-			      struct bpos bucket, int gen,</div><div class='del'>-			      struct bpos *bp_pos,</div><div class='del'>-			      struct bch_backpointer *bp,</div><div class='del'>-			      unsigned iter_flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bpos bp_end_pos = bucket_pos_to_bp(c, bpos_nosnap_successor(bucket), 0);</div><div class='del'>-	struct btree_iter alloc_iter = { NULL }, bp_iter = { NULL };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (bpos_ge(*bp_pos, bp_end_pos))</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	if (gen &gt;= 0) {</div><div class='del'>-		k = bch2_bkey_get_iter(trans, &amp;alloc_iter, BTREE_ID_alloc,</div><div class='del'>-				       bucket, BTREE_ITER_CACHED|iter_flags);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_alloc_v4 ||</div><div class='del'>-		    bkey_s_c_to_alloc_v4(k).v-&gt;gen != gen)</div><div class='del'>-			goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*bp_pos = bpos_max(*bp_pos, bucket_pos_to_bp(c, bucket, 0));</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, bp_iter, BTREE_ID_backpointers,</div><div class='del'>-				     *bp_pos, iter_flags, k, ret) {</div><div class='del'>-		if (bpos_ge(k.k-&gt;p, bp_end_pos))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		*bp_pos = k.k-&gt;p;</div><div class='del'>-		*bp = *bkey_s_c_to_backpointer(k).v;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	*bp_pos = SPOS_MAX;</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;bp_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;alloc_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void backpointer_not_found(struct btree_trans *trans,</div><div class='del'>-				  struct bpos bp_pos,</div><div class='del'>-				  struct bch_backpointer bp,</div><div class='del'>-				  struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bpos bucket = bp_pos_to_bucket(c, bp_pos);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're using the btree write buffer, the backpointer we were</div><div class='del'>-	 * looking at may have already been deleted - failure to find what it</div><div class='del'>-	 * pointed to is not an error:</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!bch2_backpointers_no_use_write_buffer))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "backpointer doesn't match %s it points to:\n  ",</div><div class='del'>-		   bp.level ? "btree node" : "extent");</div><div class='del'>-	prt_printf(&amp;buf, "bucket: ");</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, bucket);</div><div class='del'>-	prt_printf(&amp;buf, "\n  ");</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "backpointer pos: ");</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, bp_pos);</div><div class='del'>-	prt_printf(&amp;buf, "\n  ");</div><div class='del'>-</div><div class='del'>-	bch2_backpointer_to_text(&amp;buf, &amp;bp);</div><div class='del'>-	prt_printf(&amp;buf, "\n  ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-	if (c-&gt;curr_recovery_pass &gt;= BCH_RECOVERY_PASS_check_extents_to_backpointers)</div><div class='del'>-		bch_err_ratelimited(c, "%s", buf.buf);</div><div class='del'>-	else</div><div class='del'>-		bch2_trans_inconsistent(trans, "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans,</div><div class='del'>-					 struct btree_iter *iter,</div><div class='del'>-					 struct bpos bp_pos,</div><div class='del'>-					 struct bch_backpointer bp,</div><div class='del'>-					 unsigned iter_flags)</div><div class='del'>-{</div><div class='del'>-	if (likely(!bp.level)) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-		struct bpos bucket = bp_pos_to_bucket(c, bp_pos);</div><div class='del'>-		struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-		bch2_trans_node_iter_init(trans, iter,</div><div class='del'>-					  bp.btree_id,</div><div class='del'>-					  bp.pos,</div><div class='del'>-					  0, 0,</div><div class='del'>-					  iter_flags);</div><div class='del'>-		k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-		if (bkey_err(k)) {</div><div class='del'>-			bch2_trans_iter_exit(trans, iter);</div><div class='del'>-			return k;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (k.k &amp;&amp; extent_matches_bp(c, bp.btree_id, bp.level, k, bucket, bp))</div><div class='del'>-			return k;</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-		backpointer_not_found(trans, bp_pos, bp, k);</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-	} else {</div><div class='del'>-		struct btree *b = bch2_backpointer_get_node(trans, iter, bp_pos, bp);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR_OR_NULL(b)) {</div><div class='del'>-			bch2_trans_iter_exit(trans, iter);</div><div class='del'>-			return IS_ERR(b) ? bkey_s_c_err(PTR_ERR(b)) : bkey_s_c_null;</div><div class='del'>-		}</div><div class='del'>-		return bkey_i_to_s_c(&amp;b-&gt;key);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree *bch2_backpointer_get_node(struct btree_trans *trans,</div><div class='del'>-					struct btree_iter *iter,</div><div class='del'>-					struct bpos bp_pos,</div><div class='del'>-					struct bch_backpointer bp)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bpos bucket = bp_pos_to_bucket(c, bp_pos);</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bp.level);</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_iter_init(trans, iter,</div><div class='del'>-				  bp.btree_id,</div><div class='del'>-				  bp.pos,</div><div class='del'>-				  0,</div><div class='del'>-				  bp.level - 1,</div><div class='del'>-				  0);</div><div class='del'>-	b = bch2_btree_iter_peek_node(iter);</div><div class='del'>-	if (IS_ERR_OR_NULL(b))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;c.level != bp.level - 1);</div><div class='del'>-</div><div class='del'>-	if (extent_matches_bp(c, bp.btree_id, bp.level,</div><div class='del'>-			      bkey_i_to_s_c(&amp;b-&gt;key),</div><div class='del'>-			      bucket, bp))</div><div class='del'>-		return b;</div><div class='del'>-</div><div class='del'>-	if (btree_node_will_make_reachable(b)) {</div><div class='del'>-		b = ERR_PTR(-BCH_ERR_backpointer_to_overwritten_btree_node);</div><div class='del'>-	} else {</div><div class='del'>-		backpointer_not_found(trans, bp_pos, bp, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-		b = NULL;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, iter);</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_iter *bp_iter,</div><div class='del'>-					struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter alloc_iter = { NULL };</div><div class='del'>-	struct bkey_s_c alloc_k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!bch2_dev_exists2(c, k.k-&gt;p.inode), c,</div><div class='del'>-			backpointer_to_missing_device,</div><div class='del'>-			"backpointer for missing device:\n%s",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at(trans, bp_iter, 0);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alloc_k = bch2_bkey_get_iter(trans, &amp;alloc_iter, BTREE_ID_alloc,</div><div class='del'>-				     bp_pos_to_bucket(c, k.k-&gt;p), 0);</div><div class='del'>-	ret = bkey_err(alloc_k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(alloc_k.k-&gt;type != KEY_TYPE_alloc_v4, c,</div><div class='del'>-			backpointer_to_missing_alloc,</div><div class='del'>-			"backpointer for nonexistent alloc key: %llu:%llu:0\n%s",</div><div class='del'>-			alloc_iter.pos.inode, alloc_iter.pos.offset,</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, alloc_k), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at(trans, bp_iter, 0);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;alloc_iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* verify that every backpointer has a corresponding alloc key */</div><div class='del'>-int bch2_check_btree_backpointers(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-			BTREE_ID_backpointers, POS_MIN, 0, k,</div><div class='del'>-			NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		  bch2_check_btree_backpointer(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_and_val_eq(struct bkey_s_c l, struct bkey_s_c r)</div><div class='del'>-{</div><div class='del'>-	return bpos_eq(l.k-&gt;p, r.k-&gt;p) &amp;&amp;</div><div class='del'>-		bkey_bytes(l.k) == bkey_bytes(r.k) &amp;&amp;</div><div class='del'>-		!memcmp(l.v, r.v, bkey_val_bytes(l.k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct extents_to_bp_state {</div><div class='del'>-	struct bpos	bucket_start;</div><div class='del'>-	struct bpos	bucket_end;</div><div class='del'>-	struct bkey_buf last_flushed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int check_bp_exists(struct btree_trans *trans,</div><div class='del'>-			   struct extents_to_bp_state *s,</div><div class='del'>-			   struct bpos bucket,</div><div class='del'>-			   struct bch_backpointer bp,</div><div class='del'>-			   struct bkey_s_c orig_k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter bp_iter = { NULL };</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bkey_s_c bp_k;</div><div class='del'>-	struct bkey_buf tmp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;tmp);</div><div class='del'>-</div><div class='del'>-	if (bpos_lt(bucket, s-&gt;bucket_start) ||</div><div class='del'>-	    bpos_gt(bucket, s-&gt;bucket_end))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_bucket_exists(c, bucket))</div><div class='del'>-		goto missing;</div><div class='del'>-</div><div class='del'>-	bp_k = bch2_bkey_get_iter(trans, &amp;bp_iter, BTREE_ID_backpointers,</div><div class='del'>-				  bucket_pos_to_bp(c, bucket, bp.bucket_offset),</div><div class='del'>-				  0);</div><div class='del'>-	ret = bkey_err(bp_k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (bp_k.k-&gt;type != KEY_TYPE_backpointer ||</div><div class='del'>-	    memcmp(bkey_s_c_to_backpointer(bp_k).v, &amp;bp, sizeof(bp))) {</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;tmp, c, orig_k);</div><div class='del'>-</div><div class='del'>-		if (!bkey_and_val_eq(orig_k, bkey_i_to_s_c(s-&gt;last_flushed.k))) {</div><div class='del'>-			if (bp.level) {</div><div class='del'>-				bch2_trans_unlock(trans);</div><div class='del'>-				bch2_btree_interior_updates_flush(c);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = bch2_btree_write_buffer_flush_sync(trans);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_buf_copy(&amp;s-&gt;last_flushed, c, tmp.k);</div><div class='del'>-			ret = -BCH_ERR_transaction_restart_write_buffer_flush;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		goto missing;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;bp_iter);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;tmp, c);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-missing:</div><div class='del'>-	prt_printf(&amp;buf, "missing backpointer for btree=%s l=%u ",</div><div class='del'>-	       bch2_btree_id_str(bp.btree_id), bp.level);</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, orig_k);</div><div class='del'>-	prt_printf(&amp;buf, "\nbp pos ");</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, bp_iter.pos);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-	    fsck_err(c, ptr_to_missing_backpointer, "%s", buf.buf))</div><div class='del'>-		ret = bch2_bucket_backpointer_mod(trans, bucket, bp, orig_k, true);</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_extent_to_backpointers(struct btree_trans *trans,</div><div class='del'>-					struct extents_to_bp_state *s,</div><div class='del'>-					enum btree_id btree, unsigned level,</div><div class='del'>-					struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs;</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		struct bpos bucket_pos;</div><div class='del'>-		struct bch_backpointer bp;</div><div class='del'>-</div><div class='del'>-		if (p.ptr.cached)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_extent_ptr_to_bp(c, btree, level,</div><div class='del'>-				      k, p, &amp;bucket_pos, &amp;bp);</div><div class='del'>-</div><div class='del'>-		ret = check_bp_exists(trans, s, bucket_pos, bp, k);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_btree_root_to_backpointers(struct btree_trans *trans,</div><div class='del'>-					    struct extents_to_bp_state *s,</div><div class='del'>-					    enum btree_id btree_id,</div><div class='del'>-					    int *level)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_node_iter_init(trans, &amp;iter, btree_id, POS_MIN,</div><div class='del'>-				  0, bch2_btree_id_root(c, btree_id)-&gt;b-&gt;c.level, 0);</div><div class='del'>-	b = bch2_btree_iter_peek_node(&amp;iter);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(b);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (b != btree_node_root(c, b)) {</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*level = b-&gt;c.level;</div><div class='del'>-</div><div class='del'>-	k = bkey_i_to_s_c(&amp;b-&gt;key);</div><div class='del'>-	ret = check_extent_to_backpointers(trans, s, btree_id, b-&gt;c.level + 1, k);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bbpos bp_to_bbpos(struct bch_backpointer bp)</div><div class='del'>-{</div><div class='del'>-	return (struct bbpos) {</div><div class='del'>-		.btree	= bp.btree_id,</div><div class='del'>-		.pos	= bp.pos,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t btree_nodes_fit_in_ram(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct sysinfo i;</div><div class='del'>-	u64 mem_bytes;</div><div class='del'>-</div><div class='del'>-	si_meminfo(&amp;i);</div><div class='del'>-	mem_bytes = i.totalram * i.mem_unit;</div><div class='del'>-	return div_u64(mem_bytes &gt;&gt; 1, c-&gt;opts.btree_node_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_get_btree_in_memory_pos(struct btree_trans *trans,</div><div class='del'>-					unsigned btree_leaf_mask,</div><div class='del'>-					unsigned btree_interior_mask,</div><div class='del'>-					struct bbpos start, struct bbpos *end)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	size_t btree_nodes = btree_nodes_fit_in_ram(trans-&gt;c);</div><div class='del'>-	enum btree_id btree;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (btree = start.btree; btree &lt; BTREE_ID_NR &amp;&amp; !ret; btree++) {</div><div class='del'>-		unsigned depth = ((1U &lt;&lt; btree) &amp; btree_leaf_mask) ? 1 : 2;</div><div class='del'>-</div><div class='del'>-		if (!((1U &lt;&lt; btree) &amp; btree_leaf_mask) &amp;&amp;</div><div class='del'>-		    !((1U &lt;&lt; btree) &amp; btree_interior_mask))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_trans_node_iter_init(trans, &amp;iter, btree,</div><div class='del'>-					  btree == start.btree ? start.pos : POS_MIN,</div><div class='del'>-					  0, depth, 0);</div><div class='del'>-		/*</div><div class='del'>-		 * for_each_btree_key_contineu() doesn't check the return value</div><div class='del'>-		 * from bch2_btree_iter_advance(), which is needed when</div><div class='del'>-		 * iterating over interior nodes where we'll see keys at</div><div class='del'>-		 * SPOS_MAX:</div><div class='del'>-		 */</div><div class='del'>-		do {</div><div class='del'>-			k = __bch2_btree_iter_peek_and_restart(trans, &amp;iter, 0);</div><div class='del'>-			ret = bkey_err(k);</div><div class='del'>-			if (!k.k || ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			--btree_nodes;</div><div class='del'>-			if (!btree_nodes) {</div><div class='del'>-				*end = BBPOS(btree, k.k-&gt;p);</div><div class='del'>-				bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		} while (bch2_btree_iter_advance(&amp;iter));</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*end = BBPOS_MAX;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans,</div><div class='del'>-						   struct extents_to_bp_state *s)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (enum btree_id btree_id = 0;</div><div class='del'>-	     btree_id &lt; btree_id_nr_alive(c);</div><div class='del'>-	     btree_id++) {</div><div class='del'>-		int level, depth = btree_type_has_ptrs(btree_id) ? 0 : 1;</div><div class='del'>-</div><div class='del'>-		ret = commit_do(trans, NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-				check_btree_root_to_backpointers(trans, s, btree_id, &amp;level));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		while (level &gt;= depth) {</div><div class='del'>-			struct btree_iter iter;</div><div class='del'>-			bch2_trans_node_iter_init(trans, &amp;iter, btree_id, POS_MIN, 0,</div><div class='del'>-						  level,</div><div class='del'>-						  BTREE_ITER_PREFETCH);</div><div class='del'>-			while (1) {</div><div class='del'>-				bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-				struct bkey_s_c k = bch2_btree_iter_peek(&amp;iter);</div><div class='del'>-				if (!k.k)</div><div class='del'>-					break;</div><div class='del'>-				ret = bkey_err(k) ?:</div><div class='del'>-					check_extent_to_backpointers(trans, s, btree_id, level, k) ?:</div><div class='del'>-					bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-							  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-				if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-					ret = 0;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				if (ret)</div><div class='del'>-					break;</div><div class='del'>-				if (bpos_eq(iter.pos, SPOS_MAX))</div><div class='del'>-					break;</div><div class='del'>-				bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-			}</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			--level;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bpos bucket_pos_to_bp_safe(const struct bch_fs *c,</div><div class='del'>-					 struct bpos bucket)</div><div class='del'>-{</div><div class='del'>-	return bch2_dev_exists2(c, bucket.inode)</div><div class='del'>-		? bucket_pos_to_bp(c, bucket, 0)</div><div class='del'>-		: bucket;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,</div><div class='del'>-					struct bpos start, struct bpos *end)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter alloc_iter;</div><div class='del'>-	struct btree_iter bp_iter;</div><div class='del'>-	struct bkey_s_c alloc_k, bp_k;</div><div class='del'>-	size_t btree_nodes = btree_nodes_fit_in_ram(trans-&gt;c);</div><div class='del'>-	bool alloc_end = false, bp_end = false;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_iter_init(trans, &amp;alloc_iter, BTREE_ID_alloc,</div><div class='del'>-				  start, 0, 1, 0);</div><div class='del'>-	bch2_trans_node_iter_init(trans, &amp;bp_iter, BTREE_ID_backpointers,</div><div class='del'>-				  bucket_pos_to_bp_safe(trans-&gt;c, start), 0, 1, 0);</div><div class='del'>-	while (1) {</div><div class='del'>-		alloc_k = !alloc_end</div><div class='del'>-			? __bch2_btree_iter_peek_and_restart(trans, &amp;alloc_iter, 0)</div><div class='del'>-			: bkey_s_c_null;</div><div class='del'>-		bp_k = !bp_end</div><div class='del'>-			? __bch2_btree_iter_peek_and_restart(trans, &amp;bp_iter, 0)</div><div class='del'>-			: bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-		ret = bkey_err(alloc_k) ?: bkey_err(bp_k);</div><div class='del'>-		if ((!alloc_k.k &amp;&amp; !bp_k.k) || ret) {</div><div class='del'>-			*end = SPOS_MAX;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		--btree_nodes;</div><div class='del'>-		if (!btree_nodes) {</div><div class='del'>-			*end = alloc_k.k ? alloc_k.k-&gt;p : SPOS_MAX;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bpos_lt(alloc_iter.pos, SPOS_MAX) &amp;&amp;</div><div class='del'>-		    bpos_lt(bucket_pos_to_bp_safe(trans-&gt;c, alloc_iter.pos), bp_iter.pos)) {</div><div class='del'>-			if (!bch2_btree_iter_advance(&amp;alloc_iter))</div><div class='del'>-				alloc_end = true;</div><div class='del'>-		} else {</div><div class='del'>-			if (!bch2_btree_iter_advance(&amp;bp_iter))</div><div class='del'>-				bp_end = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;bp_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;alloc_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_extents_to_backpointers(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct extents_to_bp_state s = { .bucket_start = POS_MIN };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;s.last_flushed);</div><div class='del'>-	bkey_init(&amp;s.last_flushed.k-&gt;k);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		ret = bch2_get_alloc_in_memory_pos(trans, s.bucket_start, &amp;s.bucket_end);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if ( bpos_eq(s.bucket_start, POS_MIN) &amp;&amp;</div><div class='del'>-		    !bpos_eq(s.bucket_end, SPOS_MAX))</div><div class='del'>-			bch_verbose(c, "%s(): alloc info does not fit in ram, running in multiple passes with %zu nodes per pass",</div><div class='del'>-				    __func__, btree_nodes_fit_in_ram(c));</div><div class='del'>-</div><div class='del'>-		if (!bpos_eq(s.bucket_start, POS_MIN) ||</div><div class='del'>-		    !bpos_eq(s.bucket_end, SPOS_MAX)) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			prt_str(&amp;buf, "check_extents_to_backpointers(): ");</div><div class='del'>-			bch2_bpos_to_text(&amp;buf, s.bucket_start);</div><div class='del'>-			prt_str(&amp;buf, "-");</div><div class='del'>-			bch2_bpos_to_text(&amp;buf, s.bucket_end);</div><div class='del'>-</div><div class='del'>-			bch_verbose(c, "%s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_check_extents_to_backpointers_pass(trans, &amp;s);</div><div class='del'>-		if (ret || bpos_eq(s.bucket_end, SPOS_MAX))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		s.bucket_start = bpos_successor(s.bucket_end);</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;s.last_flushed, c);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_one_backpointer(struct btree_trans *trans,</div><div class='del'>-				 struct bbpos start,</div><div class='del'>-				 struct bbpos end,</div><div class='del'>-				 struct bkey_s_c_backpointer bp,</div><div class='del'>-				 struct bpos *last_flushed_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bbpos pos = bp_to_bbpos(*bp.v);</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (bbpos_cmp(pos, start) &lt; 0 ||</div><div class='del'>-	    bbpos_cmp(pos, end) &gt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	k = bch2_backpointer_get_key(trans, &amp;iter, bp.k-&gt;p, *bp.v, 0);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret == -BCH_ERR_backpointer_to_overwritten_btree_node)</div><div class='del'>-		return 0;</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!k.k &amp;&amp; !bpos_eq(*last_flushed_pos, bp.k-&gt;p)) {</div><div class='del'>-		*last_flushed_pos = bp.k-&gt;p;</div><div class='del'>-		ret = bch2_btree_write_buffer_flush_sync(trans) ?:</div><div class='del'>-			-BCH_ERR_transaction_restart_write_buffer_flush;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!k.k, c,</div><div class='del'>-			backpointer_to_missing_ptr,</div><div class='del'>-			"backpointer for missing %s\n  %s",</div><div class='del'>-			bp.v-&gt;level ? "btree node" : "extent",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, bp.s_c), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at_buffered(trans, BTREE_ID_backpointers, bp.k-&gt;p);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_check_backpointers_to_extents_pass(struct btree_trans *trans,</div><div class='del'>-						   struct bbpos start,</div><div class='del'>-						   struct bbpos end)</div><div class='del'>-{</div><div class='del'>-	struct bpos last_flushed_pos = SPOS_MAX;</div><div class='del'>-</div><div class='del'>-	return for_each_btree_key_commit(trans, iter, BTREE_ID_backpointers,</div><div class='del'>-				  POS_MIN, BTREE_ITER_PREFETCH, k,</div><div class='del'>-				  NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		check_one_backpointer(trans, start, end,</div><div class='del'>-				      bkey_s_c_to_backpointer(k),</div><div class='del'>-				      &amp;last_flushed_pos));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_backpointers_to_extents(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct bbpos start = (struct bbpos) { .btree = 0, .pos = POS_MIN, }, end;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		ret = bch2_get_btree_in_memory_pos(trans,</div><div class='del'>-						   (1U &lt;&lt; BTREE_ID_extents)|</div><div class='del'>-						   (1U &lt;&lt; BTREE_ID_reflink),</div><div class='del'>-						   ~0,</div><div class='del'>-						   start, &amp;end);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!bbpos_cmp(start, BBPOS_MIN) &amp;&amp;</div><div class='del'>-		    bbpos_cmp(end, BBPOS_MAX))</div><div class='del'>-			bch_verbose(c, "%s(): extents do not fit in ram, running in multiple passes with %zu nodes per pass",</div><div class='del'>-				    __func__, btree_nodes_fit_in_ram(c));</div><div class='del'>-</div><div class='del'>-		if (bbpos_cmp(start, BBPOS_MIN) ||</div><div class='del'>-		    bbpos_cmp(end, BBPOS_MAX)) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			prt_str(&amp;buf, "check_backpointers_to_extents(): ");</div><div class='del'>-			bch2_bbpos_to_text(&amp;buf, start);</div><div class='del'>-			prt_str(&amp;buf, "-");</div><div class='del'>-			bch2_bbpos_to_text(&amp;buf, end);</div><div class='del'>-</div><div class='del'>-			bch_verbose(c, "%s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_check_backpointers_to_extents_pass(trans, start, end);</div><div class='del'>-		if (ret || !bbpos_cmp(end, BBPOS_MAX))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		start = bbpos_successor(end);</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/backpointers.h b/fs/bcachefs/backpointers.h<br/>deleted file mode 100644<br/>index 327365a9feac..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/backpointers.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/backpointers.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BACKPOINTERS_BACKGROUND_H</div><div class='del'>-#define _BCACHEFS_BACKPOINTERS_BACKGROUND_H</div><div class='del'>-</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-</div><div class='del'>-static inline u64 swab40(u64 x)</div><div class='del'>-{</div><div class='del'>-	return (((x &amp; 0x00000000ffULL) &lt;&lt; 32)|</div><div class='del'>-		((x &amp; 0x000000ff00ULL) &lt;&lt; 16)|</div><div class='del'>-		((x &amp; 0x0000ff0000ULL) &gt;&gt;  0)|</div><div class='del'>-		((x &amp; 0x00ff000000ULL) &gt;&gt; 16)|</div><div class='del'>-		((x &amp; 0xff00000000ULL) &gt;&gt; 32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_backpointer_invalid(struct bch_fs *, struct bkey_s_c k,</div><div class='del'>-			     enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_backpointer_to_text(struct printbuf *, const struct bch_backpointer *);</div><div class='del'>-void bch2_backpointer_k_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-void bch2_backpointer_swab(struct bkey_s);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_backpointer ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_backpointer_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_backpointer_k_to_text,	\</div><div class='del'>-	.swab		= bch2_backpointer_swab,	\</div><div class='del'>-	.min_val_size	= 32,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define MAX_EXTENT_COMPRESS_RATIO_SHIFT		10</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from pos in backpointer btree to pos of corresponding bucket in alloc</div><div class='del'>- * btree:</div><div class='del'>- */</div><div class='del'>-static inline struct bpos bp_pos_to_bucket(const struct bch_fs *c,</div><div class='del'>-					   struct bpos bp_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, bp_pos.inode);</div><div class='del'>-	u64 bucket_sector = bp_pos.offset &gt;&gt; MAX_EXTENT_COMPRESS_RATIO_SHIFT;</div><div class='del'>-</div><div class='del'>-	return POS(bp_pos.inode, sector_to_bucket(ca, bucket_sector));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from pos in alloc btree + bucket offset to pos in backpointer btree:</div><div class='del'>- */</div><div class='del'>-static inline struct bpos bucket_pos_to_bp(const struct bch_fs *c,</div><div class='del'>-					   struct bpos bucket,</div><div class='del'>-					   u64 bucket_offset)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, bucket.inode);</div><div class='del'>-	struct bpos ret;</div><div class='del'>-</div><div class='del'>-	ret = POS(bucket.inode,</div><div class='del'>-		  (bucket_to_sector(ca, bucket.offset) &lt;&lt;</div><div class='del'>-		   MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!bkey_eq(bucket, bp_pos_to_bucket(c, ret)));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *, struct bpos bucket,</div><div class='del'>-				struct bch_backpointer, struct bkey_s_c, bool);</div><div class='del'>-</div><div class='del'>-static inline int bch2_bucket_backpointer_mod(struct btree_trans *trans,</div><div class='del'>-				struct bpos bucket,</div><div class='del'>-				struct bch_backpointer bp,</div><div class='del'>-				struct bkey_s_c orig_k,</div><div class='del'>-				bool insert)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(bch2_backpointers_no_use_write_buffer))</div><div class='del'>-		return bch2_bucket_backpointer_mod_nowritebuffer(trans, bucket, bp, orig_k, insert);</div><div class='del'>-</div><div class='del'>-	struct bkey_i_backpointer bp_k;</div><div class='del'>-</div><div class='del'>-	bkey_backpointer_init(&amp;bp_k.k_i);</div><div class='del'>-	bp_k.k.p = bucket_pos_to_bp(trans-&gt;c, bucket, bp.bucket_offset);</div><div class='del'>-	bp_k.v = bp;</div><div class='del'>-</div><div class='del'>-	if (!insert) {</div><div class='del'>-		bp_k.k.type = KEY_TYPE_deleted;</div><div class='del'>-		set_bkey_val_u64s(&amp;bp_k.k, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update_buffered(trans, BTREE_ID_backpointers, &amp;bp_k.k_i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_data_type bkey_ptr_data_type(enum btree_id btree_id, unsigned level,</div><div class='del'>-						    struct bkey_s_c k, struct extent_ptr_decoded p)</div><div class='del'>-{</div><div class='del'>-	return  level		? BCH_DATA_btree :</div><div class='del'>-		p.has_ec	? BCH_DATA_stripe :</div><div class='del'>-				  BCH_DATA_user;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_extent_ptr_to_bp(struct bch_fs *c,</div><div class='del'>-			   enum btree_id btree_id, unsigned level,</div><div class='del'>-			   struct bkey_s_c k, struct extent_ptr_decoded p,</div><div class='del'>-			   struct bpos *bucket_pos, struct bch_backpointer *bp)</div><div class='del'>-{</div><div class='del'>-	enum bch_data_type data_type = bkey_ptr_data_type(btree_id, level, k, p);</div><div class='del'>-	s64 sectors = level ? btree_sectors(c) : k.k-&gt;size;</div><div class='del'>-	u32 bucket_offset;</div><div class='del'>-</div><div class='del'>-	*bucket_pos = PTR_BUCKET_POS_OFFSET(c, &amp;p.ptr, &amp;bucket_offset);</div><div class='del'>-	*bp = (struct bch_backpointer) {</div><div class='del'>-		.btree_id	= btree_id,</div><div class='del'>-		.level		= level,</div><div class='del'>-		.data_type	= data_type,</div><div class='del'>-		.bucket_offset	= ((u64) bucket_offset &lt;&lt; MAX_EXTENT_COMPRESS_RATIO_SHIFT) +</div><div class='del'>-			p.crc.offset,</div><div class='del'>-		.bucket_len	= ptr_disk_sectors(sectors, p),</div><div class='del'>-		.pos		= k.k-&gt;p,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_get_next_backpointer(struct btree_trans *, struct bpos, int,</div><div class='del'>-			      struct bpos *, struct bch_backpointer *, unsigned);</div><div class='del'>-struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *, struct btree_iter *,</div><div class='del'>-					 struct bpos, struct bch_backpointer,</div><div class='del'>-					 unsigned);</div><div class='del'>-struct btree *bch2_backpointer_get_node(struct btree_trans *, struct btree_iter *,</div><div class='del'>-					struct bpos, struct bch_backpointer);</div><div class='del'>-</div><div class='del'>-int bch2_check_btree_backpointers(struct bch_fs *);</div><div class='del'>-int bch2_check_extents_to_backpointers(struct bch_fs *);</div><div class='del'>-int bch2_check_backpointers_to_extents(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BACKPOINTERS_BACKGROUND_H */</div><div class='head'>diff --git a/fs/bcachefs/bbpos.h b/fs/bcachefs/bbpos.h<br/>deleted file mode 100644<br/>index be2edced5213..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bbpos.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bbpos.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BBPOS_H</div><div class='del'>-#define _BCACHEFS_BBPOS_H</div><div class='del'>-</div><div class='del'>-#include "bbpos_types.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-</div><div class='del'>-static inline int bbpos_cmp(struct bbpos l, struct bbpos r)</div><div class='del'>-{</div><div class='del'>-	return cmp_int(l.btree, r.btree) ?: bpos_cmp(l.pos, r.pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bbpos bbpos_successor(struct bbpos pos)</div><div class='del'>-{</div><div class='del'>-	if (bpos_cmp(pos.pos, SPOS_MAX)) {</div><div class='del'>-		pos.pos = bpos_successor(pos.pos);</div><div class='del'>-		return pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pos.btree != BTREE_ID_NR) {</div><div class='del'>-		pos.btree++;</div><div class='del'>-		pos.pos = POS_MIN;</div><div class='del'>-		return pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bbpos_to_text(struct printbuf *out, struct bbpos pos)</div><div class='del'>-{</div><div class='del'>-	prt_str(out, bch2_btree_id_str(pos.btree));</div><div class='del'>-	prt_char(out, ':');</div><div class='del'>-	bch2_bpos_to_text(out, pos.pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BBPOS_H */</div><div class='head'>diff --git a/fs/bcachefs/bbpos_types.h b/fs/bcachefs/bbpos_types.h<br/>deleted file mode 100644<br/>index 5198e94cf3b8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bbpos_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bbpos_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BBPOS_TYPES_H</div><div class='del'>-#define _BCACHEFS_BBPOS_TYPES_H</div><div class='del'>-</div><div class='del'>-struct bbpos {</div><div class='del'>-	enum btree_id		btree;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bbpos BBPOS(enum btree_id btree, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	return (struct bbpos) { btree, pos };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BBPOS_MIN	BBPOS(0, POS_MIN)</div><div class='del'>-#define BBPOS_MAX	BBPOS(BTREE_ID_NR - 1, POS_MAX)</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BBPOS_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h<br/>deleted file mode 100644<br/>index b80c6c9efd8c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bcachefs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bcachefs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1255 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_H</div><div class='del'>-#define _BCACHEFS_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SOME HIGH LEVEL CODE DOCUMENTATION:</div><div class='del'>- *</div><div class='del'>- * Bcache mostly works with cache sets, cache devices, and backing devices.</div><div class='del'>- *</div><div class='del'>- * Support for multiple cache devices hasn't quite been finished off yet, but</div><div class='del'>- * it's about 95% plumbed through. A cache set and its cache devices is sort of</div><div class='del'>- * like a md raid array and its component devices. Most of the code doesn't care</div><div class='del'>- * about individual cache devices, the main abstraction is the cache set.</div><div class='del'>- *</div><div class='del'>- * Multiple cache devices is intended to give us the ability to mirror dirty</div><div class='del'>- * cached data and metadata, without mirroring clean cached data.</div><div class='del'>- *</div><div class='del'>- * Backing devices are different, in that they have a lifetime independent of a</div><div class='del'>- * cache set. When you register a newly formatted backing device it'll come up</div><div class='del'>- * in passthrough mode, and then you can attach and detach a backing device from</div><div class='del'>- * a cache set at runtime - while it's mounted and in use. Detaching implicitly</div><div class='del'>- * invalidates any cached data for that backing device.</div><div class='del'>- *</div><div class='del'>- * A cache set can have multiple (many) backing devices attached to it.</div><div class='del'>- *</div><div class='del'>- * There's also flash only volumes - this is the reason for the distinction</div><div class='del'>- * between struct cached_dev and struct bcache_device. A flash only volume</div><div class='del'>- * works much like a bcache device that has a backing device, except the</div><div class='del'>- * "cached" data is always dirty. The end result is that we get thin</div><div class='del'>- * provisioning with very little additional code.</div><div class='del'>- *</div><div class='del'>- * Flash only volumes work but they're not production ready because the moving</div><div class='del'>- * garbage collector needs more work. More on that later.</div><div class='del'>- *</div><div class='del'>- * BUCKETS/ALLOCATION:</div><div class='del'>- *</div><div class='del'>- * Bcache is primarily designed for caching, which means that in normal</div><div class='del'>- * operation all of our available space will be allocated. Thus, we need an</div><div class='del'>- * efficient way of deleting things from the cache so we can write new things to</div><div class='del'>- * it.</div><div class='del'>- *</div><div class='del'>- * To do this, we first divide the cache device up into buckets. A bucket is the</div><div class='del'>- * unit of allocation; they're typically around 1 mb - anywhere from 128k to 2M+</div><div class='del'>- * works efficiently.</div><div class='del'>- *</div><div class='del'>- * Each bucket has a 16 bit priority, and an 8 bit generation associated with</div><div class='del'>- * it. The gens and priorities for all the buckets are stored contiguously and</div><div class='del'>- * packed on disk (in a linked list of buckets - aside from the superblock, all</div><div class='del'>- * of bcache's metadata is stored in buckets).</div><div class='del'>- *</div><div class='del'>- * The priority is used to implement an LRU. We reset a bucket's priority when</div><div class='del'>- * we allocate it or on cache it, and every so often we decrement the priority</div><div class='del'>- * of each bucket. It could be used to implement something more sophisticated,</div><div class='del'>- * if anyone ever gets around to it.</div><div class='del'>- *</div><div class='del'>- * The generation is used for invalidating buckets. Each pointer also has an 8</div><div class='del'>- * bit generation embedded in it; for a pointer to be considered valid, its gen</div><div class='del'>- * must match the gen of the bucket it points into.  Thus, to reuse a bucket all</div><div class='del'>- * we have to do is increment its gen (and write its new gen to disk; we batch</div><div class='del'>- * this up).</div><div class='del'>- *</div><div class='del'>- * Bcache is entirely COW - we never write twice to a bucket, even buckets that</div><div class='del'>- * contain metadata (including btree nodes).</div><div class='del'>- *</div><div class='del'>- * THE BTREE:</div><div class='del'>- *</div><div class='del'>- * Bcache is in large part design around the btree.</div><div class='del'>- *</div><div class='del'>- * At a high level, the btree is just an index of key -&gt; ptr tuples.</div><div class='del'>- *</div><div class='del'>- * Keys represent extents, and thus have a size field. Keys also have a variable</div><div class='del'>- * number of pointers attached to them (potentially zero, which is handy for</div><div class='del'>- * invalidating the cache).</div><div class='del'>- *</div><div class='del'>- * The key itself is an inode:offset pair. The inode number corresponds to a</div><div class='del'>- * backing device or a flash only volume. The offset is the ending offset of the</div><div class='del'>- * extent within the inode - not the starting offset; this makes lookups</div><div class='del'>- * slightly more convenient.</div><div class='del'>- *</div><div class='del'>- * Pointers contain the cache device id, the offset on that device, and an 8 bit</div><div class='del'>- * generation number. More on the gen later.</div><div class='del'>- *</div><div class='del'>- * Index lookups are not fully abstracted - cache lookups in particular are</div><div class='del'>- * still somewhat mixed in with the btree code, but things are headed in that</div><div class='del'>- * direction.</div><div class='del'>- *</div><div class='del'>- * Updates are fairly well abstracted, though. There are two different ways of</div><div class='del'>- * updating the btree; insert and replace.</div><div class='del'>- *</div><div class='del'>- * BTREE_INSERT will just take a list of keys and insert them into the btree -</div><div class='del'>- * overwriting (possibly only partially) any extents they overlap with. This is</div><div class='del'>- * used to update the index after a write.</div><div class='del'>- *</div><div class='del'>- * BTREE_REPLACE is really cmpxchg(); it inserts a key into the btree iff it is</div><div class='del'>- * overwriting a key that matches another given key. This is used for inserting</div><div class='del'>- * data into the cache after a cache miss, and for background writeback, and for</div><div class='del'>- * the moving garbage collector.</div><div class='del'>- *</div><div class='del'>- * There is no "delete" operation; deleting things from the index is</div><div class='del'>- * accomplished by either by invalidating pointers (by incrementing a bucket's</div><div class='del'>- * gen) or by inserting a key with 0 pointers - which will overwrite anything</div><div class='del'>- * previously present at that location in the index.</div><div class='del'>- *</div><div class='del'>- * This means that there are always stale/invalid keys in the btree. They're</div><div class='del'>- * filtered out by the code that iterates through a btree node, and removed when</div><div class='del'>- * a btree node is rewritten.</div><div class='del'>- *</div><div class='del'>- * BTREE NODES:</div><div class='del'>- *</div><div class='del'>- * Our unit of allocation is a bucket, and we can't arbitrarily allocate and</div><div class='del'>- * free smaller than a bucket - so, that's how big our btree nodes are.</div><div class='del'>- *</div><div class='del'>- * (If buckets are really big we'll only use part of the bucket for a btree node</div><div class='del'>- * - no less than 1/4th - but a bucket still contains no more than a single</div><div class='del'>- * btree node. I'd actually like to change this, but for now we rely on the</div><div class='del'>- * bucket's gen for deleting btree nodes when we rewrite/split a node.)</div><div class='del'>- *</div><div class='del'>- * Anyways, btree nodes are big - big enough to be inefficient with a textbook</div><div class='del'>- * btree implementation.</div><div class='del'>- *</div><div class='del'>- * The way this is solved is that btree nodes are internally log structured; we</div><div class='del'>- * can append new keys to an existing btree node without rewriting it. This</div><div class='del'>- * means each set of keys we write is sorted, but the node is not.</div><div class='del'>- *</div><div class='del'>- * We maintain this log structure in memory - keeping 1Mb of keys sorted would</div><div class='del'>- * be expensive, and we have to distinguish between the keys we have written and</div><div class='del'>- * the keys we haven't. So to do a lookup in a btree node, we have to search</div><div class='del'>- * each sorted set. But we do merge written sets together lazily, so the cost of</div><div class='del'>- * these extra searches is quite low (normally most of the keys in a btree node</div><div class='del'>- * will be in one big set, and then there'll be one or two sets that are much</div><div class='del'>- * smaller).</div><div class='del'>- *</div><div class='del'>- * This log structure makes bcache's btree more of a hybrid between a</div><div class='del'>- * conventional btree and a compacting data structure, with some of the</div><div class='del'>- * advantages of both.</div><div class='del'>- *</div><div class='del'>- * GARBAGE COLLECTION:</div><div class='del'>- *</div><div class='del'>- * We can't just invalidate any bucket - it might contain dirty data or</div><div class='del'>- * metadata. If it once contained dirty data, other writes might overwrite it</div><div class='del'>- * later, leaving no valid pointers into that bucket in the index.</div><div class='del'>- *</div><div class='del'>- * Thus, the primary purpose of garbage collection is to find buckets to reuse.</div><div class='del'>- * It also counts how much valid data it each bucket currently contains, so that</div><div class='del'>- * allocation can reuse buckets sooner when they've been mostly overwritten.</div><div class='del'>- *</div><div class='del'>- * It also does some things that are really internal to the btree</div><div class='del'>- * implementation. If a btree node contains pointers that are stale by more than</div><div class='del'>- * some threshold, it rewrites the btree node to avoid the bucket's generation</div><div class='del'>- * wrapping around. It also merges adjacent btree nodes if they're empty enough.</div><div class='del'>- *</div><div class='del'>- * THE JOURNAL:</div><div class='del'>- *</div><div class='del'>- * Bcache's journal is not necessary for consistency; we always strictly</div><div class='del'>- * order metadata writes so that the btree and everything else is consistent on</div><div class='del'>- * disk in the event of an unclean shutdown, and in fact bcache had writeback</div><div class='del'>- * caching (with recovery from unclean shutdown) before journalling was</div><div class='del'>- * implemented.</div><div class='del'>- *</div><div class='del'>- * Rather, the journal is purely a performance optimization; we can't complete a</div><div class='del'>- * write until we've updated the index on disk, otherwise the cache would be</div><div class='del'>- * inconsistent in the event of an unclean shutdown. This means that without the</div><div class='del'>- * journal, on random write workloads we constantly have to update all the leaf</div><div class='del'>- * nodes in the btree, and those writes will be mostly empty (appending at most</div><div class='del'>- * a few keys each) - highly inefficient in terms of amount of metadata writes,</div><div class='del'>- * and it puts more strain on the various btree resorting/compacting code.</div><div class='del'>- *</div><div class='del'>- * The journal is just a log of keys we've inserted; on startup we just reinsert</div><div class='del'>- * all the keys in the open journal entries. That means that when we're updating</div><div class='del'>- * a node in the btree, we can wait until a 4k block of keys fills up before</div><div class='del'>- * writing them out.</div><div class='del'>- *</div><div class='del'>- * For simplicity, we only journal updates to leaf nodes; updates to parent</div><div class='del'>- * nodes are rare enough (since our leaf nodes are huge) that it wasn't worth</div><div class='del'>- * the complexity to deal with journalling them (in particular, journal replay)</div><div class='del'>- * - updates to non leaf nodes just happen synchronously (see btree_split()).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#undef pr_fmt</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#define pr_fmt(fmt) "bcachefs: %s() " fmt "\n", __func__</div><div class='del'>-#else</div><div class='del'>-#define pr_fmt(fmt) "%s() " fmt "\n", __func__</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;linux/backing-dev-defs.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/closure.h&gt;</div><div class='del'>-#include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/percpu-refcount.h&gt;</div><div class='del'>-#include &lt;linux/percpu-rwsem.h&gt;</div><div class='del'>-#include &lt;linux/refcount.h&gt;</div><div class='del'>-#include &lt;linux/rhashtable.h&gt;</div><div class='del'>-#include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;linux/semaphore.h&gt;</div><div class='del'>-#include &lt;linux/seqlock.h&gt;</div><div class='del'>-#include &lt;linux/shrinker.h&gt;</div><div class='del'>-#include &lt;linux/srcu.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/zstd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "fifo.h"</div><div class='del'>-#include "nocow_locking_types.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "recovery_types.h"</div><div class='del'>-#include "sb-errors_types.h"</div><div class='del'>-#include "seqmutex.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-#define BCH_WRITE_REF_DEBUG</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef dynamic_fault</div><div class='del'>-#define dynamic_fault(...)		0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define race_fault(...)			dynamic_fault("bcachefs:race")</div><div class='del'>-</div><div class='del'>-#define count_event(_c, _name)	this_cpu_inc((_c)-&gt;counters[BCH_COUNTER_##_name])</div><div class='del'>-</div><div class='del'>-#define trace_and_count(_c, _name, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	count_event(_c, _name);						\</div><div class='del'>-	trace_##_name(__VA_ARGS__);					\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch2_fs_init_fault(name)					\</div><div class='del'>-	dynamic_fault("bcachefs:bch_fs_init:" name)</div><div class='del'>-#define bch2_meta_read_fault(name)					\</div><div class='del'>-	 dynamic_fault("bcachefs:meta:read:" name)</div><div class='del'>-#define bch2_meta_write_fault(name)					\</div><div class='del'>-	 dynamic_fault("bcachefs:meta:write:" name)</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#define BCACHEFS_LOG_PREFIX</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef BCACHEFS_LOG_PREFIX</div><div class='del'>-</div><div class='del'>-#define bch2_log_msg(_c, fmt)			"bcachefs (%s): " fmt, ((_c)-&gt;name)</div><div class='del'>-#define bch2_fmt_dev(_ca, fmt)			"bcachefs (%s): " fmt "\n", ((_ca)-&gt;name)</div><div class='del'>-#define bch2_fmt_dev_offset(_ca, _offset, fmt)	"bcachefs (%s sector %llu): " fmt "\n", ((_ca)-&gt;name), (_offset)</div><div class='del'>-#define bch2_fmt_inum(_c, _inum, fmt)		"bcachefs (%s inum %llu): " fmt "\n", ((_c)-&gt;name), (_inum)</div><div class='del'>-#define bch2_fmt_inum_offset(_c, _inum, _offset, fmt)			\</div><div class='del'>-	 "bcachefs (%s inum %llu offset %llu): " fmt "\n", ((_c)-&gt;name), (_inum), (_offset)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define bch2_log_msg(_c, fmt)			fmt</div><div class='del'>-#define bch2_fmt_dev(_ca, fmt)			"%s: " fmt "\n", ((_ca)-&gt;name)</div><div class='del'>-#define bch2_fmt_dev_offset(_ca, _offset, fmt)	"%s sector %llu: " fmt "\n", ((_ca)-&gt;name), (_offset)</div><div class='del'>-#define bch2_fmt_inum(_c, _inum, fmt)		"inum %llu: " fmt "\n", (_inum)</div><div class='del'>-#define bch2_fmt_inum_offset(_c, _inum, _offset, fmt)				\</div><div class='del'>-	 "inum %llu offset %llu: " fmt "\n", (_inum), (_offset)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define bch2_fmt(_c, fmt)		bch2_log_msg(_c, fmt "\n")</div><div class='del'>-</div><div class='del'>-__printf(2, 3)</div><div class='del'>-void __bch2_print(struct bch_fs *c, const char *fmt, ...);</div><div class='del'>-</div><div class='del'>-#define maybe_dev_to_fs(_c)	_Generic((_c),				\</div><div class='del'>-	struct bch_dev *:	((struct bch_dev *) (_c))-&gt;fs,		\</div><div class='del'>-	struct bch_fs *:	(_c))</div><div class='del'>-</div><div class='del'>-#define bch2_print(_c, ...) __bch2_print(maybe_dev_to_fs(_c), __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define bch2_print_ratelimited(_c, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	static DEFINE_RATELIMIT_STATE(_rs,				\</div><div class='del'>-				      DEFAULT_RATELIMIT_INTERVAL,	\</div><div class='del'>-				      DEFAULT_RATELIMIT_BURST);		\</div><div class='del'>-									\</div><div class='del'>-	if (__ratelimit(&amp;_rs))						\</div><div class='del'>-		bch2_print(_c, __VA_ARGS__);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch_info(c, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_INFO bch2_fmt(c, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_notice(c, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_NOTICE bch2_fmt(c, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_warn(c, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_WARNING bch2_fmt(c, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_warn_ratelimited(c, fmt, ...) \</div><div class='del'>-	bch2_print_ratelimited(c, KERN_WARNING bch2_fmt(c, fmt), ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define bch_err(c, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_ERR bch2_fmt(c, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_dev(ca, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_ERR bch2_fmt_dev(ca, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_dev_offset(ca, _offset, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_ERR bch2_fmt_dev_offset(ca, _offset, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_inum(c, _inum, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_ERR bch2_fmt_inum(c, _inum, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_inum_offset(c, _inum, _offset, fmt, ...) \</div><div class='del'>-	bch2_print(c, KERN_ERR bch2_fmt_inum_offset(c, _inum, _offset, fmt), ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define bch_err_ratelimited(c, fmt, ...) \</div><div class='del'>-	bch2_print_ratelimited(c, KERN_ERR bch2_fmt(c, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_dev_ratelimited(ca, fmt, ...) \</div><div class='del'>-	bch2_print_ratelimited(ca, KERN_ERR bch2_fmt_dev(ca, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_dev_offset_ratelimited(ca, _offset, fmt, ...) \</div><div class='del'>-	bch2_print_ratelimited(ca, KERN_ERR bch2_fmt_dev_offset(ca, _offset, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_inum_ratelimited(c, _inum, fmt, ...) \</div><div class='del'>-	bch2_print_ratelimited(c, KERN_ERR bch2_fmt_inum(c, _inum, fmt), ##__VA_ARGS__)</div><div class='del'>-#define bch_err_inum_offset_ratelimited(c, _inum, _offset, fmt, ...) \</div><div class='del'>-	bch2_print_ratelimited(c, KERN_ERR bch2_fmt_inum_offset(c, _inum, _offset, fmt), ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-static inline bool should_print_err(int err)</div><div class='del'>-{</div><div class='del'>-	return err &amp;&amp; !bch2_err_matches(err, BCH_ERR_transaction_restart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch_err_fn(_c, _ret)						\</div><div class='del'>-do {									\</div><div class='del'>-	if (should_print_err(_ret))					\</div><div class='del'>-		bch_err(_c, "%s(): error %s", __func__, bch2_err_str(_ret));\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch_err_fn_ratelimited(_c, _ret)				\</div><div class='del'>-do {									\</div><div class='del'>-	if (should_print_err(_ret))					\</div><div class='del'>-		bch_err_ratelimited(_c, "%s(): error %s", __func__, bch2_err_str(_ret));\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch_err_msg(_c, _ret, _msg, ...)				\</div><div class='del'>-do {									\</div><div class='del'>-	if (should_print_err(_ret))					\</div><div class='del'>-		bch_err(_c, "%s(): error " _msg " %s", __func__,	\</div><div class='del'>-			##__VA_ARGS__, bch2_err_str(_ret));		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch_verbose(c, fmt, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	if ((c)-&gt;opts.verbose)						\</div><div class='del'>-		bch_info(c, fmt, ##__VA_ARGS__);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define pr_verbose_init(opts, fmt, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	if (opt_get(opts, verbose))					\</div><div class='del'>-		pr_info(fmt, ##__VA_ARGS__);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-/* Parameters that are useful for debugging, but should always be compiled in: */</div><div class='del'>-#define BCH_DEBUG_PARAMS_ALWAYS()					\</div><div class='del'>-	BCH_DEBUG_PARAM(key_merging_disabled,				\</div><div class='del'>-		"Disables merging of extents")				\</div><div class='del'>-	BCH_DEBUG_PARAM(btree_gc_always_rewrite,			\</div><div class='del'>-		"Causes mark and sweep to compact and rewrite every "	\</div><div class='del'>-		"btree node it traverses")				\</div><div class='del'>-	BCH_DEBUG_PARAM(btree_gc_rewrite_disabled,			\</div><div class='del'>-		"Disables rewriting of btree nodes during mark and sweep")\</div><div class='del'>-	BCH_DEBUG_PARAM(btree_shrinker_disabled,			\</div><div class='del'>-		"Disables the shrinker callback for the btree node cache")\</div><div class='del'>-	BCH_DEBUG_PARAM(verify_btree_ondisk,				\</div><div class='del'>-		"Reread btree nodes at various points to verify the "	\</div><div class='del'>-		"mergesort in the read path against modifications "	\</div><div class='del'>-		"done in memory")					\</div><div class='del'>-	BCH_DEBUG_PARAM(verify_all_btree_replicas,			\</div><div class='del'>-		"When reading btree nodes, read all replicas and "	\</div><div class='del'>-		"compare them")						\</div><div class='del'>-	BCH_DEBUG_PARAM(backpointers_no_use_write_buffer,		\</div><div class='del'>-		"Don't use the write buffer for backpointers, enabling "\</div><div class='del'>-		"extra runtime checks")</div><div class='del'>-</div><div class='del'>-/* Parameters that should only be compiled in debug mode: */</div><div class='del'>-#define BCH_DEBUG_PARAMS_DEBUG()					\</div><div class='del'>-	BCH_DEBUG_PARAM(expensive_debug_checks,				\</div><div class='del'>-		"Enables various runtime debugging checks that "	\</div><div class='del'>-		"significantly affect performance")			\</div><div class='del'>-	BCH_DEBUG_PARAM(debug_check_iterators,				\</div><div class='del'>-		"Enables extra verification for btree iterators")	\</div><div class='del'>-	BCH_DEBUG_PARAM(debug_check_btree_accounting,			\</div><div class='del'>-		"Verify btree accounting for keys within a node")	\</div><div class='del'>-	BCH_DEBUG_PARAM(journal_seq_verify,				\</div><div class='del'>-		"Store the journal sequence number in the version "	\</div><div class='del'>-		"number of every btree key, and verify that btree "	\</div><div class='del'>-		"update ordering is preserved during recovery")		\</div><div class='del'>-	BCH_DEBUG_PARAM(inject_invalid_keys,				\</div><div class='del'>-		"Store the journal sequence number in the version "	\</div><div class='del'>-		"number of every btree key, and verify that btree "	\</div><div class='del'>-		"update ordering is preserved during recovery")		\</div><div class='del'>-	BCH_DEBUG_PARAM(test_alloc_startup,				\</div><div class='del'>-		"Force allocator startup to use the slowpath where it"	\</div><div class='del'>-		"can't find enough free buckets without invalidating"	\</div><div class='del'>-		"cached data")						\</div><div class='del'>-	BCH_DEBUG_PARAM(force_reconstruct_read,				\</div><div class='del'>-		"Force reads to use the reconstruct path, when reading"	\</div><div class='del'>-		"from erasure coded extents")				\</div><div class='del'>-	BCH_DEBUG_PARAM(test_restart_gc,				\</div><div class='del'>-		"Test restarting mark and sweep gc when bucket gens change")</div><div class='del'>-</div><div class='del'>-#define BCH_DEBUG_PARAMS_ALL() BCH_DEBUG_PARAMS_ALWAYS() BCH_DEBUG_PARAMS_DEBUG()</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-#define BCH_DEBUG_PARAMS() BCH_DEBUG_PARAMS_ALL()</div><div class='del'>-#else</div><div class='del'>-#define BCH_DEBUG_PARAMS() BCH_DEBUG_PARAMS_ALWAYS()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BCH_DEBUG_PARAM(name, description) extern bool bch2_##name;</div><div class='del'>-BCH_DEBUG_PARAMS()</div><div class='del'>-#undef BCH_DEBUG_PARAM</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-#define BCH_DEBUG_PARAM(name, description) static const __maybe_unused bool bch2_##name;</div><div class='del'>-BCH_DEBUG_PARAMS_DEBUG()</div><div class='del'>-#undef BCH_DEBUG_PARAM</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BCH_TIME_STATS()			\</div><div class='del'>-	x(btree_node_mem_alloc)			\</div><div class='del'>-	x(btree_node_split)			\</div><div class='del'>-	x(btree_node_compact)			\</div><div class='del'>-	x(btree_node_merge)			\</div><div class='del'>-	x(btree_node_sort)			\</div><div class='del'>-	x(btree_node_read)			\</div><div class='del'>-	x(btree_node_read_done)			\</div><div class='del'>-	x(btree_interior_update_foreground)	\</div><div class='del'>-	x(btree_interior_update_total)		\</div><div class='del'>-	x(btree_gc)				\</div><div class='del'>-	x(data_write)				\</div><div class='del'>-	x(data_read)				\</div><div class='del'>-	x(data_promote)				\</div><div class='del'>-	x(journal_flush_write)			\</div><div class='del'>-	x(journal_noflush_write)		\</div><div class='del'>-	x(journal_flush_seq)			\</div><div class='del'>-	x(blocked_journal_low_on_space)		\</div><div class='del'>-	x(blocked_journal_low_on_pin)		\</div><div class='del'>-	x(blocked_journal_max_in_flight)	\</div><div class='del'>-	x(blocked_allocate)			\</div><div class='del'>-	x(blocked_allocate_open_bucket)		\</div><div class='del'>-	x(blocked_write_buffer_full)		\</div><div class='del'>-	x(nocow_lock_contended)</div><div class='del'>-</div><div class='del'>-enum bch_time_stats {</div><div class='del'>-#define x(name) BCH_TIME_##name,</div><div class='del'>-	BCH_TIME_STATS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_TIME_STAT_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#include "alloc_types.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "btree_write_buffer_types.h"</div><div class='del'>-#include "buckets_types.h"</div><div class='del'>-#include "buckets_waiting_for_journal_types.h"</div><div class='del'>-#include "clock_types.h"</div><div class='del'>-#include "disk_groups_types.h"</div><div class='del'>-#include "ec_types.h"</div><div class='del'>-#include "journal_types.h"</div><div class='del'>-#include "keylist_types.h"</div><div class='del'>-#include "quota_types.h"</div><div class='del'>-#include "rebalance_types.h"</div><div class='del'>-#include "replicas_types.h"</div><div class='del'>-#include "subvolume_types.h"</div><div class='del'>-#include "super_types.h"</div><div class='del'>-#include "thread_with_file_types.h"</div><div class='del'>-</div><div class='del'>-/* Number of nodes btree coalesce will try to coalesce at once */</div><div class='del'>-#define GC_MERGE_NODES		4U</div><div class='del'>-</div><div class='del'>-/* Maximum number of nodes we might need to allocate atomically: */</div><div class='del'>-#define BTREE_RESERVE_MAX	(BTREE_MAX_DEPTH + (BTREE_MAX_DEPTH - 1))</div><div class='del'>-</div><div class='del'>-/* Size of the freelist we allocate btree nodes from: */</div><div class='del'>-#define BTREE_NODE_RESERVE	(BTREE_RESERVE_MAX * 4)</div><div class='del'>-</div><div class='del'>-#define BTREE_NODE_OPEN_BUCKET_RESERVE	(BTREE_RESERVE_MAX * BCH_REPLICAS_MAX)</div><div class='del'>-</div><div class='del'>-struct btree;</div><div class='del'>-</div><div class='del'>-enum gc_phase {</div><div class='del'>-	GC_PHASE_NOT_RUNNING,</div><div class='del'>-	GC_PHASE_START,</div><div class='del'>-	GC_PHASE_SB,</div><div class='del'>-</div><div class='del'>-	GC_PHASE_BTREE_stripes,</div><div class='del'>-	GC_PHASE_BTREE_extents,</div><div class='del'>-	GC_PHASE_BTREE_inodes,</div><div class='del'>-	GC_PHASE_BTREE_dirents,</div><div class='del'>-	GC_PHASE_BTREE_xattrs,</div><div class='del'>-	GC_PHASE_BTREE_alloc,</div><div class='del'>-	GC_PHASE_BTREE_quotas,</div><div class='del'>-	GC_PHASE_BTREE_reflink,</div><div class='del'>-	GC_PHASE_BTREE_subvolumes,</div><div class='del'>-	GC_PHASE_BTREE_snapshots,</div><div class='del'>-	GC_PHASE_BTREE_lru,</div><div class='del'>-	GC_PHASE_BTREE_freespace,</div><div class='del'>-	GC_PHASE_BTREE_need_discard,</div><div class='del'>-	GC_PHASE_BTREE_backpointers,</div><div class='del'>-	GC_PHASE_BTREE_bucket_gens,</div><div class='del'>-	GC_PHASE_BTREE_snapshot_trees,</div><div class='del'>-	GC_PHASE_BTREE_deleted_inodes,</div><div class='del'>-	GC_PHASE_BTREE_logged_ops,</div><div class='del'>-	GC_PHASE_BTREE_rebalance_work,</div><div class='del'>-</div><div class='del'>-	GC_PHASE_PENDING_DELETE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gc_pos {</div><div class='del'>-	enum gc_phase		phase;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-	unsigned		level;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct reflink_gc {</div><div class='del'>-	u64		offset;</div><div class='del'>-	u32		size;</div><div class='del'>-	u32		refcount;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef GENRADIX(struct reflink_gc) reflink_gc_table;</div><div class='del'>-</div><div class='del'>-struct io_count {</div><div class='del'>-	u64			sectors[2][BCH_DATA_NR];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_dev {</div><div class='del'>-	struct kobject		kobj;</div><div class='del'>-	struct percpu_ref	ref;</div><div class='del'>-	struct completion	ref_completion;</div><div class='del'>-	struct percpu_ref	io_ref;</div><div class='del'>-	struct completion	io_ref_completion;</div><div class='del'>-</div><div class='del'>-	struct bch_fs		*fs;</div><div class='del'>-</div><div class='del'>-	u8			dev_idx;</div><div class='del'>-	/*</div><div class='del'>-	 * Cached version of this device's member info from superblock</div><div class='del'>-	 * Committed by bch2_write_super() -&gt; bch_fs_mi_update()</div><div class='del'>-	 */</div><div class='del'>-	struct bch_member_cpu	mi;</div><div class='del'>-	atomic64_t		errors[BCH_MEMBER_ERROR_NR];</div><div class='del'>-</div><div class='del'>-	__uuid_t		uuid;</div><div class='del'>-	char			name[BDEVNAME_SIZE];</div><div class='del'>-</div><div class='del'>-	struct bch_sb_handle	disk_sb;</div><div class='del'>-	struct bch_sb		*sb_read_scratch;</div><div class='del'>-	int			sb_write_error;</div><div class='del'>-	dev_t			dev;</div><div class='del'>-	atomic_t		flush_seq;</div><div class='del'>-</div><div class='del'>-	struct bch_devs_mask	self;</div><div class='del'>-</div><div class='del'>-	/* biosets used in cloned bios for writing multiple replicas */</div><div class='del'>-	struct bio_set		replica_set;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Buckets:</div><div class='del'>-	 * Per-bucket arrays are protected by c-&gt;mark_lock, bucket_lock and</div><div class='del'>-	 * gc_lock, for device resize - holding any is sufficient for access:</div><div class='del'>-	 * Or rcu_read_lock(), but only for ptr_stale():</div><div class='del'>-	 */</div><div class='del'>-	struct bucket_array __rcu *buckets_gc;</div><div class='del'>-	struct bucket_gens __rcu *bucket_gens;</div><div class='del'>-	u8			*oldest_gen;</div><div class='del'>-	unsigned long		*buckets_nouse;</div><div class='del'>-	struct rw_semaphore	bucket_lock;</div><div class='del'>-</div><div class='del'>-	struct bch_dev_usage		*usage_base;</div><div class='del'>-	struct bch_dev_usage __percpu	*usage[JOURNAL_BUF_NR];</div><div class='del'>-	struct bch_dev_usage __percpu	*usage_gc;</div><div class='del'>-</div><div class='del'>-	/* Allocator: */</div><div class='del'>-	u64			new_fs_bucket_idx;</div><div class='del'>-	u64			alloc_cursor;</div><div class='del'>-</div><div class='del'>-	unsigned		nr_open_buckets;</div><div class='del'>-	unsigned		nr_btree_reserve;</div><div class='del'>-</div><div class='del'>-	size_t			inc_gen_needs_gc;</div><div class='del'>-	size_t			inc_gen_really_needs_gc;</div><div class='del'>-	size_t			buckets_waiting_on_journal;</div><div class='del'>-</div><div class='del'>-	atomic64_t		rebalance_work;</div><div class='del'>-</div><div class='del'>-	struct journal_device	journal;</div><div class='del'>-	u64			prev_journal_sector;</div><div class='del'>-</div><div class='del'>-	struct work_struct	io_error_work;</div><div class='del'>-</div><div class='del'>-	/* The rest of this all shows up in sysfs */</div><div class='del'>-	atomic64_t		cur_latency[2];</div><div class='del'>-	struct bch2_time_stats	io_latency[2];</div><div class='del'>-</div><div class='del'>-#define CONGESTED_MAX		1024</div><div class='del'>-	atomic_t		congested;</div><div class='del'>-	u64			congested_last;</div><div class='del'>-</div><div class='del'>-	struct io_count __percpu *io_done;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initial_gc_unfixed</div><div class='del'>- * error</div><div class='del'>- * topology error</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define BCH_FS_FLAGS()			\</div><div class='del'>-	x(started)			\</div><div class='del'>-	x(may_go_rw)			\</div><div class='del'>-	x(rw)				\</div><div class='del'>-	x(was_rw)			\</div><div class='del'>-	x(stopping)			\</div><div class='del'>-	x(emergency_ro)			\</div><div class='del'>-	x(going_ro)			\</div><div class='del'>-	x(write_disable_complete)	\</div><div class='del'>-	x(clean_shutdown)		\</div><div class='del'>-	x(fsck_running)			\</div><div class='del'>-	x(initial_gc_unfixed)		\</div><div class='del'>-	x(need_another_gc)		\</div><div class='del'>-	x(need_delete_dead_snapshots)	\</div><div class='del'>-	x(error)			\</div><div class='del'>-	x(topology_error)		\</div><div class='del'>-	x(errors_fixed)			\</div><div class='del'>-	x(errors_not_fixed)</div><div class='del'>-</div><div class='del'>-enum bch_fs_flags {</div><div class='del'>-#define x(n)		BCH_FS_##n,</div><div class='del'>-	BCH_FS_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_debug {</div><div class='del'>-	unsigned		id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_TRANSACTIONS_NR 128</div><div class='del'>-</div><div class='del'>-struct btree_transaction_stats {</div><div class='del'>-	struct bch2_time_stats	duration;</div><div class='del'>-	struct bch2_time_stats	lock_hold_times;</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	unsigned		nr_max_paths;</div><div class='del'>-	unsigned		journal_entries_size;</div><div class='del'>-	unsigned		max_mem;</div><div class='del'>-	char			*max_paths_text;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs_pcpu {</div><div class='del'>-	u64			sectors_available;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct journal_seq_blacklist_table {</div><div class='del'>-	size_t			nr;</div><div class='del'>-	struct journal_seq_blacklist_table_entry {</div><div class='del'>-		u64		start;</div><div class='del'>-		u64		end;</div><div class='del'>-		bool		dirty;</div><div class='del'>-	}			entries[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct journal_keys {</div><div class='del'>-	struct journal_key {</div><div class='del'>-		u64		journal_seq;</div><div class='del'>-		u32		journal_offset;</div><div class='del'>-		enum btree_id	btree_id:8;</div><div class='del'>-		unsigned	level:8;</div><div class='del'>-		bool		allocated;</div><div class='del'>-		bool		overwritten;</div><div class='del'>-		struct bkey_i	*k;</div><div class='del'>-	}			*d;</div><div class='del'>-	/*</div><div class='del'>-	 * Gap buffer: instead of all the empty space in the array being at the</div><div class='del'>-	 * end of the buffer - from @nr to @size - the empty space is at @gap.</div><div class='del'>-	 * This means that sequential insertions are O(n) instead of O(n^2).</div><div class='del'>-	 */</div><div class='del'>-	size_t			gap;</div><div class='del'>-	size_t			nr;</div><div class='del'>-	size_t			size;</div><div class='del'>-	atomic_t		ref;</div><div class='del'>-	bool			initial_ref_held;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_trans_buf {</div><div class='del'>-	struct btree_trans	*trans;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define REPLICAS_DELTA_LIST_MAX	(1U &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-#define BCACHEFS_ROOT_SUBVOL_INUM					\</div><div class='del'>-	((subvol_inum) { BCACHEFS_ROOT_SUBVOL,	BCACHEFS_ROOT_INO })</div><div class='del'>-</div><div class='del'>-#define BCH_WRITE_REFS()						\</div><div class='del'>-	x(trans)							\</div><div class='del'>-	x(write)							\</div><div class='del'>-	x(promote)							\</div><div class='del'>-	x(node_rewrite)							\</div><div class='del'>-	x(stripe_create)						\</div><div class='del'>-	x(stripe_delete)						\</div><div class='del'>-	x(reflink)							\</div><div class='del'>-	x(fallocate)							\</div><div class='del'>-	x(discard)							\</div><div class='del'>-	x(invalidate)							\</div><div class='del'>-	x(delete_dead_snapshots)					\</div><div class='del'>-	x(snapshot_delete_pagecache)					\</div><div class='del'>-	x(sysfs)							\</div><div class='del'>-	x(btree_write_buffer)</div><div class='del'>-</div><div class='del'>-enum bch_write_ref {</div><div class='del'>-#define x(n) BCH_WRITE_REF_##n,</div><div class='del'>-	BCH_WRITE_REFS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_WRITE_REF_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs {</div><div class='del'>-	struct closure		cl;</div><div class='del'>-</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct kobject		kobj;</div><div class='del'>-	struct kobject		counters_kobj;</div><div class='del'>-	struct kobject		internal;</div><div class='del'>-	struct kobject		opts_dir;</div><div class='del'>-	struct kobject		time_stats;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	int			minor;</div><div class='del'>-	struct device		*chardev;</div><div class='del'>-	struct super_block	*vfs_sb;</div><div class='del'>-	dev_t			dev;</div><div class='del'>-	char			name[40];</div><div class='del'>-	struct stdio_redirect	*stdio;</div><div class='del'>-	struct task_struct	*stdio_filter;</div><div class='del'>-</div><div class='del'>-	/* ro/rw, add/remove/resize devices: */</div><div class='del'>-	struct rw_semaphore	state_lock;</div><div class='del'>-</div><div class='del'>-	/* Counts outstanding writes, for clean transition to read-only */</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	atomic_long_t		writes[BCH_WRITE_REF_NR];</div><div class='del'>-#else</div><div class='del'>-	struct percpu_ref	writes;</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * Analagous to c-&gt;writes, for asynchronous ops that don't necessarily</div><div class='del'>-	 * need fs to be read-write</div><div class='del'>-	 */</div><div class='del'>-	refcount_t		ro_ref;</div><div class='del'>-	wait_queue_head_t	ro_ref_wait;</div><div class='del'>-</div><div class='del'>-	struct work_struct	read_only_work;</div><div class='del'>-</div><div class='del'>-	struct bch_dev __rcu	*devs[BCH_SB_MEMBERS_MAX];</div><div class='del'>-</div><div class='del'>-	struct bch_replicas_cpu replicas;</div><div class='del'>-	struct bch_replicas_cpu replicas_gc;</div><div class='del'>-	struct mutex		replicas_gc_lock;</div><div class='del'>-	mempool_t		replicas_delta_pool;</div><div class='del'>-</div><div class='del'>-	struct journal_entry_res btree_root_journal_res;</div><div class='del'>-	struct journal_entry_res replicas_journal_res;</div><div class='del'>-	struct journal_entry_res clock_journal_res;</div><div class='del'>-	struct journal_entry_res dev_usage_journal_res;</div><div class='del'>-</div><div class='del'>-	struct bch_disk_groups_cpu __rcu *disk_groups;</div><div class='del'>-</div><div class='del'>-	struct bch_opts		opts;</div><div class='del'>-</div><div class='del'>-	/* Updated by bch2_sb_update():*/</div><div class='del'>-	struct {</div><div class='del'>-		__uuid_t	uuid;</div><div class='del'>-		__uuid_t	user_uuid;</div><div class='del'>-</div><div class='del'>-		u16		version;</div><div class='del'>-		u16		version_min;</div><div class='del'>-		u16		version_upgrade_complete;</div><div class='del'>-</div><div class='del'>-		u8		nr_devices;</div><div class='del'>-		u8		clean;</div><div class='del'>-</div><div class='del'>-		u8		encryption_type;</div><div class='del'>-</div><div class='del'>-		u64		time_base_lo;</div><div class='del'>-		u32		time_base_hi;</div><div class='del'>-		unsigned	time_units_per_sec;</div><div class='del'>-		unsigned	nsec_per_time_unit;</div><div class='del'>-		u64		features;</div><div class='del'>-		u64		compat;</div><div class='del'>-		unsigned long	errors_silent[BITS_TO_LONGS(BCH_SB_ERR_MAX)];</div><div class='del'>-	}			sb;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	struct bch_sb_handle	disk_sb;</div><div class='del'>-</div><div class='del'>-	unsigned short		block_bits;	/* ilog2(block_size) */</div><div class='del'>-</div><div class='del'>-	u16			btree_foreground_merge_threshold;</div><div class='del'>-</div><div class='del'>-	struct closure		sb_write;</div><div class='del'>-	struct mutex		sb_lock;</div><div class='del'>-</div><div class='del'>-	/* snapshot.c: */</div><div class='del'>-	struct snapshot_table __rcu *snapshots;</div><div class='del'>-	size_t			snapshot_table_size;</div><div class='del'>-	struct mutex		snapshot_table_lock;</div><div class='del'>-	struct rw_semaphore	snapshot_create_lock;</div><div class='del'>-</div><div class='del'>-	struct work_struct	snapshot_delete_work;</div><div class='del'>-	struct work_struct	snapshot_wait_for_pagecache_and_delete_work;</div><div class='del'>-	snapshot_id_list	snapshots_unlinked;</div><div class='del'>-	struct mutex		snapshots_unlinked_lock;</div><div class='del'>-</div><div class='del'>-	/* BTREE CACHE */</div><div class='del'>-	struct bio_set		btree_bio;</div><div class='del'>-	struct workqueue_struct	*io_complete_wq;</div><div class='del'>-</div><div class='del'>-	struct btree_root	btree_roots_known[BTREE_ID_NR];</div><div class='del'>-	DARRAY(struct btree_root) btree_roots_extra;</div><div class='del'>-	struct mutex		btree_root_lock;</div><div class='del'>-</div><div class='del'>-	struct btree_cache	btree_cache;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Cache of allocated btree nodes - if we allocate a btree node and</div><div class='del'>-	 * don't use it, if we free it that space can't be reused until going</div><div class='del'>-	 * _all_ the way through the allocator (which exposes us to a livelock</div><div class='del'>-	 * when allocating btree reserves fail halfway through) - instead, we</div><div class='del'>-	 * can stick them here:</div><div class='del'>-	 */</div><div class='del'>-	struct btree_alloc	btree_reserve_cache[BTREE_NODE_RESERVE * 2];</div><div class='del'>-	unsigned		btree_reserve_cache_nr;</div><div class='del'>-	struct mutex		btree_reserve_cache_lock;</div><div class='del'>-</div><div class='del'>-	mempool_t		btree_interior_update_pool;</div><div class='del'>-	struct list_head	btree_interior_update_list;</div><div class='del'>-	struct list_head	btree_interior_updates_unwritten;</div><div class='del'>-	struct mutex		btree_interior_update_lock;</div><div class='del'>-	struct closure_waitlist	btree_interior_update_wait;</div><div class='del'>-</div><div class='del'>-	struct workqueue_struct	*btree_interior_update_worker;</div><div class='del'>-	struct work_struct	btree_interior_update_work;</div><div class='del'>-</div><div class='del'>-	struct list_head	pending_node_rewrites;</div><div class='del'>-	struct mutex		pending_node_rewrites_lock;</div><div class='del'>-</div><div class='del'>-	/* btree_io.c: */</div><div class='del'>-	spinlock_t		btree_write_error_lock;</div><div class='del'>-	struct btree_write_stats {</div><div class='del'>-		atomic64_t	nr;</div><div class='del'>-		atomic64_t	bytes;</div><div class='del'>-	}			btree_write_stats[BTREE_WRITE_TYPE_NR];</div><div class='del'>-</div><div class='del'>-	/* btree_iter.c: */</div><div class='del'>-	struct seqmutex		btree_trans_lock;</div><div class='del'>-	struct list_head	btree_trans_list;</div><div class='del'>-	mempool_t		btree_trans_pool;</div><div class='del'>-	mempool_t		btree_trans_mem_pool;</div><div class='del'>-	struct btree_trans_buf  __percpu	*btree_trans_bufs;</div><div class='del'>-</div><div class='del'>-	struct srcu_struct	btree_trans_barrier;</div><div class='del'>-	bool			btree_trans_barrier_initialized;</div><div class='del'>-</div><div class='del'>-	struct btree_key_cache	btree_key_cache;</div><div class='del'>-	unsigned		btree_key_cache_btrees;</div><div class='del'>-</div><div class='del'>-	struct btree_write_buffer btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	struct workqueue_struct	*btree_update_wq;</div><div class='del'>-	struct workqueue_struct	*btree_io_complete_wq;</div><div class='del'>-	/* copygc needs its own workqueue for index updates.. */</div><div class='del'>-	struct workqueue_struct	*copygc_wq;</div><div class='del'>-	/*</div><div class='del'>-	 * Use a dedicated wq for write ref holder tasks. Required to avoid</div><div class='del'>-	 * dependency problems with other wq tasks that can block on ref</div><div class='del'>-	 * draining, such as read-only transition.</div><div class='del'>-	 */</div><div class='del'>-	struct workqueue_struct *write_ref_wq;</div><div class='del'>-</div><div class='del'>-	/* ALLOCATION */</div><div class='del'>-	struct bch_devs_mask	rw_devs[BCH_DATA_NR];</div><div class='del'>-</div><div class='del'>-	u64			capacity; /* sectors */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When capacity _decreases_ (due to a disk being removed), we</div><div class='del'>-	 * increment capacity_gen - this invalidates outstanding reservations</div><div class='del'>-	 * and forces them to be revalidated</div><div class='del'>-	 */</div><div class='del'>-	u32			capacity_gen;</div><div class='del'>-	unsigned		bucket_size_max;</div><div class='del'>-</div><div class='del'>-	atomic64_t		sectors_available;</div><div class='del'>-	struct mutex		sectors_available_lock;</div><div class='del'>-</div><div class='del'>-	struct bch_fs_pcpu __percpu	*pcpu;</div><div class='del'>-</div><div class='del'>-	struct percpu_rw_semaphore	mark_lock;</div><div class='del'>-</div><div class='del'>-	seqcount_t			usage_lock;</div><div class='del'>-	struct bch_fs_usage		*usage_base;</div><div class='del'>-	struct bch_fs_usage __percpu	*usage[JOURNAL_BUF_NR];</div><div class='del'>-	struct bch_fs_usage __percpu	*usage_gc;</div><div class='del'>-	u64 __percpu		*online_reserved;</div><div class='del'>-</div><div class='del'>-	/* single element mempool: */</div><div class='del'>-	struct mutex		usage_scratch_lock;</div><div class='del'>-	struct bch_fs_usage_online *usage_scratch;</div><div class='del'>-</div><div class='del'>-	struct io_clock		io_clock[2];</div><div class='del'>-</div><div class='del'>-	/* JOURNAL SEQ BLACKLIST */</div><div class='del'>-	struct journal_seq_blacklist_table *</div><div class='del'>-				journal_seq_blacklist_table;</div><div class='del'>-	struct work_struct	journal_seq_blacklist_gc_work;</div><div class='del'>-</div><div class='del'>-	/* ALLOCATOR */</div><div class='del'>-	spinlock_t		freelist_lock;</div><div class='del'>-	struct closure_waitlist	freelist_wait;</div><div class='del'>-	u64			blocked_allocate;</div><div class='del'>-	u64			blocked_allocate_open_bucket;</div><div class='del'>-</div><div class='del'>-	open_bucket_idx_t	open_buckets_freelist;</div><div class='del'>-	open_bucket_idx_t	open_buckets_nr_free;</div><div class='del'>-	struct closure_waitlist	open_buckets_wait;</div><div class='del'>-	struct open_bucket	open_buckets[OPEN_BUCKETS_COUNT];</div><div class='del'>-	open_bucket_idx_t	open_buckets_hash[OPEN_BUCKETS_COUNT];</div><div class='del'>-</div><div class='del'>-	open_bucket_idx_t	open_buckets_partial[OPEN_BUCKETS_COUNT];</div><div class='del'>-	open_bucket_idx_t	open_buckets_partial_nr;</div><div class='del'>-</div><div class='del'>-	struct write_point	btree_write_point;</div><div class='del'>-	struct write_point	rebalance_write_point;</div><div class='del'>-</div><div class='del'>-	struct write_point	write_points[WRITE_POINT_MAX];</div><div class='del'>-	struct hlist_head	write_points_hash[WRITE_POINT_HASH_NR];</div><div class='del'>-	struct mutex		write_points_hash_lock;</div><div class='del'>-	unsigned		write_points_nr;</div><div class='del'>-</div><div class='del'>-	struct buckets_waiting_for_journal buckets_waiting_for_journal;</div><div class='del'>-	struct work_struct	discard_work;</div><div class='del'>-	struct work_struct	invalidate_work;</div><div class='del'>-</div><div class='del'>-	/* GARBAGE COLLECTION */</div><div class='del'>-	struct task_struct	*gc_thread;</div><div class='del'>-	atomic_t		kick_gc;</div><div class='del'>-	unsigned long		gc_count;</div><div class='del'>-</div><div class='del'>-	enum btree_id		gc_gens_btree;</div><div class='del'>-	struct bpos		gc_gens_pos;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Tracks GC's progress - everything in the range [ZERO_KEY..gc_cur_pos]</div><div class='del'>-	 * has been marked by GC.</div><div class='del'>-	 *</div><div class='del'>-	 * gc_cur_phase is a superset of btree_ids (BTREE_ID_extents etc.)</div><div class='del'>-	 *</div><div class='del'>-	 * Protected by gc_pos_lock. Only written to by GC thread, so GC thread</div><div class='del'>-	 * can read without a lock.</div><div class='del'>-	 */</div><div class='del'>-	seqcount_t		gc_pos_lock;</div><div class='del'>-	struct gc_pos		gc_pos;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The allocation code needs gc_mark in struct bucket to be correct, but</div><div class='del'>-	 * it's not while a gc is in progress.</div><div class='del'>-	 */</div><div class='del'>-	struct rw_semaphore	gc_lock;</div><div class='del'>-	struct mutex		gc_gens_lock;</div><div class='del'>-</div><div class='del'>-	/* IO PATH */</div><div class='del'>-	struct semaphore	io_in_flight;</div><div class='del'>-	struct bio_set		bio_read;</div><div class='del'>-	struct bio_set		bio_read_split;</div><div class='del'>-	struct bio_set		bio_write;</div><div class='del'>-	struct mutex		bio_bounce_pages_lock;</div><div class='del'>-	mempool_t		bio_bounce_pages;</div><div class='del'>-	struct bucket_nocow_lock_table</div><div class='del'>-				nocow_locks;</div><div class='del'>-	struct rhashtable	promote_table;</div><div class='del'>-</div><div class='del'>-	mempool_t		compression_bounce[2];</div><div class='del'>-	mempool_t		compress_workspace[BCH_COMPRESSION_TYPE_NR];</div><div class='del'>-	mempool_t		decompress_workspace;</div><div class='del'>-	size_t			zstd_workspace_size;</div><div class='del'>-</div><div class='del'>-	struct crypto_shash	*sha256;</div><div class='del'>-	struct crypto_sync_skcipher *chacha20;</div><div class='del'>-	struct crypto_shash	*poly1305;</div><div class='del'>-</div><div class='del'>-	atomic64_t		key_version;</div><div class='del'>-</div><div class='del'>-	mempool_t		large_bkey_pool;</div><div class='del'>-</div><div class='del'>-	/* MOVE.C */</div><div class='del'>-	struct list_head	moving_context_list;</div><div class='del'>-	struct mutex		moving_context_lock;</div><div class='del'>-</div><div class='del'>-	/* REBALANCE */</div><div class='del'>-	struct bch_fs_rebalance	rebalance;</div><div class='del'>-</div><div class='del'>-	/* COPYGC */</div><div class='del'>-	struct task_struct	*copygc_thread;</div><div class='del'>-	struct write_point	copygc_write_point;</div><div class='del'>-	s64			copygc_wait_at;</div><div class='del'>-	s64			copygc_wait;</div><div class='del'>-	bool			copygc_running;</div><div class='del'>-	wait_queue_head_t	copygc_running_wq;</div><div class='del'>-</div><div class='del'>-	/* STRIPES: */</div><div class='del'>-	GENRADIX(struct stripe) stripes;</div><div class='del'>-	GENRADIX(struct gc_stripe) gc_stripes;</div><div class='del'>-</div><div class='del'>-	struct hlist_head	ec_stripes_new[32];</div><div class='del'>-	spinlock_t		ec_stripes_new_lock;</div><div class='del'>-</div><div class='del'>-	ec_stripes_heap		ec_stripes_heap;</div><div class='del'>-	struct mutex		ec_stripes_heap_lock;</div><div class='del'>-</div><div class='del'>-	/* ERASURE CODING */</div><div class='del'>-	struct list_head	ec_stripe_head_list;</div><div class='del'>-	struct mutex		ec_stripe_head_lock;</div><div class='del'>-</div><div class='del'>-	struct list_head	ec_stripe_new_list;</div><div class='del'>-	struct mutex		ec_stripe_new_lock;</div><div class='del'>-	wait_queue_head_t	ec_stripe_new_wait;</div><div class='del'>-</div><div class='del'>-	struct work_struct	ec_stripe_create_work;</div><div class='del'>-	u64			ec_stripe_hint;</div><div class='del'>-</div><div class='del'>-	struct work_struct	ec_stripe_delete_work;</div><div class='del'>-</div><div class='del'>-	struct bio_set		ec_bioset;</div><div class='del'>-</div><div class='del'>-	/* REFLINK */</div><div class='del'>-	reflink_gc_table	reflink_gc_table;</div><div class='del'>-	size_t			reflink_gc_nr;</div><div class='del'>-</div><div class='del'>-	/* fs.c */</div><div class='del'>-	struct list_head	vfs_inodes_list;</div><div class='del'>-	struct mutex		vfs_inodes_lock;</div><div class='del'>-</div><div class='del'>-	/* VFS IO PATH - fs-io.c */</div><div class='del'>-	struct bio_set		writepage_bioset;</div><div class='del'>-	struct bio_set		dio_write_bioset;</div><div class='del'>-	struct bio_set		dio_read_bioset;</div><div class='del'>-	struct bio_set		nocow_flush_bioset;</div><div class='del'>-</div><div class='del'>-	/* QUOTAS */</div><div class='del'>-	struct bch_memquota_type quotas[QTYP_NR];</div><div class='del'>-</div><div class='del'>-	/* RECOVERY */</div><div class='del'>-	u64			journal_replay_seq_start;</div><div class='del'>-	u64			journal_replay_seq_end;</div><div class='del'>-	/*</div><div class='del'>-	 * Two different uses:</div><div class='del'>-	 * "Has this fsck pass?" - i.e. should this type of error be an</div><div class='del'>-	 * emergency read-only</div><div class='del'>-	 * And, in certain situations fsck will rewind to an earlier pass: used</div><div class='del'>-	 * for signaling to the toplevel code which pass we want to run now.</div><div class='del'>-	 */</div><div class='del'>-	enum bch_recovery_pass	curr_recovery_pass;</div><div class='del'>-	/* bitmap of explicitly enabled recovery passes: */</div><div class='del'>-	u64			recovery_passes_explicit;</div><div class='del'>-	/* bitmask of recovery passes that we actually ran */</div><div class='del'>-	u64			recovery_passes_complete;</div><div class='del'>-	/* never rewinds version of curr_recovery_pass */</div><div class='del'>-	enum bch_recovery_pass	recovery_pass_done;</div><div class='del'>-	struct semaphore	online_fsck_mutex;</div><div class='del'>-</div><div class='del'>-	/* DEBUG JUNK */</div><div class='del'>-	struct dentry		*fs_debug_dir;</div><div class='del'>-	struct dentry		*btree_debug_dir;</div><div class='del'>-	struct btree_debug	btree_debug[BTREE_ID_NR];</div><div class='del'>-	struct btree		*verify_data;</div><div class='del'>-	struct btree_node	*verify_ondisk;</div><div class='del'>-	struct mutex		verify_lock;</div><div class='del'>-</div><div class='del'>-	u64			*unused_inode_hints;</div><div class='del'>-	unsigned		inode_shard_bits;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * A btree node on disk could have too many bsets for an iterator to fit</div><div class='del'>-	 * on the stack - have to dynamically allocate them</div><div class='del'>-	 */</div><div class='del'>-	mempool_t		fill_iter;</div><div class='del'>-</div><div class='del'>-	mempool_t		btree_bounce_pool;</div><div class='del'>-</div><div class='del'>-	struct journal		journal;</div><div class='del'>-	GENRADIX(struct journal_replay *) journal_entries;</div><div class='del'>-	u64			journal_entries_base_seq;</div><div class='del'>-	struct journal_keys	journal_keys;</div><div class='del'>-	struct list_head	journal_iters;</div><div class='del'>-</div><div class='del'>-	u64			last_bucket_seq_cleanup;</div><div class='del'>-</div><div class='del'>-	u64			counters_on_mount[BCH_COUNTER_NR];</div><div class='del'>-	u64 __percpu		*counters;</div><div class='del'>-</div><div class='del'>-	unsigned		btree_gc_periodic:1;</div><div class='del'>-	unsigned		copy_gc_enabled:1;</div><div class='del'>-	bool			promote_whole_extents;</div><div class='del'>-</div><div class='del'>-	struct bch2_time_stats	times[BCH_TIME_STAT_NR];</div><div class='del'>-</div><div class='del'>-	struct btree_transaction_stats btree_transaction_stats[BCH_TRANSACTIONS_NR];</div><div class='del'>-</div><div class='del'>-	/* ERRORS */</div><div class='del'>-	struct list_head	fsck_error_msgs;</div><div class='del'>-	struct mutex		fsck_error_msgs_lock;</div><div class='del'>-	bool			fsck_alloc_msgs_err;</div><div class='del'>-</div><div class='del'>-	bch_sb_errors_cpu	fsck_error_counts;</div><div class='del'>-	struct mutex		fsck_error_counts_lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct wait_queue_head bch2_read_only_wait;</div><div class='del'>-</div><div class='del'>-static inline void bch2_write_ref_get(struct bch_fs *c, enum bch_write_ref ref)</div><div class='del'>-{</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	atomic_long_inc(&amp;c-&gt;writes[ref]);</div><div class='del'>-#else</div><div class='del'>-	percpu_ref_get(&amp;c-&gt;writes);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __bch2_write_ref_tryget(struct bch_fs *c, enum bch_write_ref ref)</div><div class='del'>-{</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	return !test_bit(BCH_FS_going_ro, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-		atomic_long_inc_not_zero(&amp;c-&gt;writes[ref]);</div><div class='del'>-#else</div><div class='del'>-	return percpu_ref_tryget(&amp;c-&gt;writes);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_write_ref_tryget(struct bch_fs *c, enum bch_write_ref ref)</div><div class='del'>-{</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	return !test_bit(BCH_FS_going_ro, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-		atomic_long_inc_not_zero(&amp;c-&gt;writes[ref]);</div><div class='del'>-#else</div><div class='del'>-	return percpu_ref_tryget_live(&amp;c-&gt;writes);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_write_ref_put(struct bch_fs *c, enum bch_write_ref ref)</div><div class='del'>-{</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	long v = atomic_long_dec_return(&amp;c-&gt;writes[ref]);</div><div class='del'>-</div><div class='del'>-	BUG_ON(v &lt; 0);</div><div class='del'>-	if (v)</div><div class='del'>-		return;</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_WRITE_REF_NR; i++)</div><div class='del'>-		if (atomic_long_read(&amp;c-&gt;writes[i]))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-	set_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags);</div><div class='del'>-	wake_up(&amp;bch2_read_only_wait);</div><div class='del'>-#else</div><div class='del'>-	percpu_ref_put(&amp;c-&gt;writes);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_ro_ref_tryget(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(BCH_FS_stopping, &amp;c-&gt;flags))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return refcount_inc_not_zero(&amp;c-&gt;ro_ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_ro_ref_put(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (refcount_dec_and_test(&amp;c-&gt;ro_ref))</div><div class='del'>-		wake_up(&amp;c-&gt;ro_ref_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_set_ra_pages(struct bch_fs *c, unsigned ra_pages)</div><div class='del'>-{</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-	if (c-&gt;vfs_sb)</div><div class='del'>-		c-&gt;vfs_sb-&gt;s_bdi-&gt;ra_pages = ra_pages;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bucket_bytes(const struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	return ca-&gt;mi.bucket_size &lt;&lt; 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned block_bytes(const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return c-&gt;opts.block_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned block_sectors(const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return c-&gt;opts.block_size &gt;&gt; 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_id_cached(const struct bch_fs *c, enum btree_id btree)</div><div class='del'>-{</div><div class='del'>-	return c-&gt;btree_key_cache_btrees &amp; (1U &lt;&lt; btree);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct timespec64 bch2_time_to_timespec(const struct bch_fs *c, s64 time)</div><div class='del'>-{</div><div class='del'>-	struct timespec64 t;</div><div class='del'>-	s32 rem;</div><div class='del'>-</div><div class='del'>-	time += c-&gt;sb.time_base_lo;</div><div class='del'>-</div><div class='del'>-	t.tv_sec = div_s64_rem(time, c-&gt;sb.time_units_per_sec, &amp;rem);</div><div class='del'>-	t.tv_nsec = rem * c-&gt;sb.nsec_per_time_unit;</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s64 timespec_to_bch2_time(const struct bch_fs *c, struct timespec64 ts)</div><div class='del'>-{</div><div class='del'>-	return (ts.tv_sec * c-&gt;sb.time_units_per_sec +</div><div class='del'>-		(int) ts.tv_nsec / c-&gt;sb.nsec_per_time_unit) - c-&gt;sb.time_base_lo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s64 bch2_current_time(const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct timespec64 now;</div><div class='del'>-</div><div class='del'>-	ktime_get_coarse_real_ts64(&amp;now);</div><div class='del'>-	return timespec_to_bch2_time(c, now);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_exists2(const struct bch_fs *c, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	return dev &lt; c-&gt;sb.nr_devices &amp;&amp; c-&gt;devs[dev];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct stdio_redirect *bch2_fs_stdio_redirect(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct stdio_redirect *stdio = c-&gt;stdio;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;stdio_filter &amp;&amp; c-&gt;stdio_filter != current)</div><div class='del'>-		stdio = NULL;</div><div class='del'>-	return stdio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BKEY_PADDED_ONSTACK(key, pad)				\</div><div class='del'>-	struct { struct bkey_i key; __u64 key ## _pad[pad]; }</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_H */</div><div class='head'>diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h<br/>deleted file mode 100644<br/>index 0668b682a21c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bcachefs_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bcachefs_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1589 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FORMAT_H</div><div class='del'>-#define _BCACHEFS_FORMAT_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bcachefs on disk data structures</div><div class='del'>- *</div><div class='del'>- * OVERVIEW:</div><div class='del'>- *</div><div class='del'>- * There are three main types of on disk data structures in bcachefs (this is</div><div class='del'>- * reduced from 5 in bcache)</div><div class='del'>- *</div><div class='del'>- *  - superblock</div><div class='del'>- *  - journal</div><div class='del'>- *  - btree</div><div class='del'>- *</div><div class='del'>- * The btree is the primary structure; most metadata exists as keys in the</div><div class='del'>- * various btrees. There are only a small number of btrees, they're not</div><div class='del'>- * sharded - we have one btree for extents, another for inodes, et cetera.</div><div class='del'>- *</div><div class='del'>- * SUPERBLOCK:</div><div class='del'>- *</div><div class='del'>- * The superblock contains the location of the journal, the list of devices in</div><div class='del'>- * the filesystem, and in general any metadata we need in order to decide</div><div class='del'>- * whether we can start a filesystem or prior to reading the journal/btree</div><div class='del'>- * roots.</div><div class='del'>- *</div><div class='del'>- * The superblock is extensible, and most of the contents of the superblock are</div><div class='del'>- * in variable length, type tagged fields; see struct bch_sb_field.</div><div class='del'>- *</div><div class='del'>- * Backup superblocks do not reside in a fixed location; also, superblocks do</div><div class='del'>- * not have a fixed size. To locate backup superblocks we have struct</div><div class='del'>- * bch_sb_layout; we store a copy of this inside every superblock, and also</div><div class='del'>- * before the first superblock.</div><div class='del'>- *</div><div class='del'>- * JOURNAL:</div><div class='del'>- *</div><div class='del'>- * The journal primarily records btree updates in the order they occurred;</div><div class='del'>- * journal replay consists of just iterating over all the keys in the open</div><div class='del'>- * journal entries and re-inserting them into the btrees.</div><div class='del'>- *</div><div class='del'>- * The journal also contains entry types for the btree roots, and blacklisted</div><div class='del'>- * journal sequence numbers (see journal_seq_blacklist.c).</div><div class='del'>- *</div><div class='del'>- * BTREE:</div><div class='del'>- *</div><div class='del'>- * bcachefs btrees are copy on write b+ trees, where nodes are big (typically</div><div class='del'>- * 128k-256k) and log structured. We use struct btree_node for writing the first</div><div class='del'>- * entry in a given node (offset 0), and struct btree_node_entry for all</div><div class='del'>- * subsequent writes.</div><div class='del'>- *</div><div class='del'>- * After the header, btree node entries contain a list of keys in sorted order.</div><div class='del'>- * Values are stored inline with the keys; since values are variable length (and</div><div class='del'>- * keys effectively are variable length too, due to packing) we can't do random</div><div class='del'>- * access without building up additional in memory tables in the btree node read</div><div class='del'>- * path.</div><div class='del'>- *</div><div class='del'>- * BTREE KEYS (struct bkey):</div><div class='del'>- *</div><div class='del'>- * The various btrees share a common format for the key - so as to avoid</div><div class='del'>- * switching in fastpath lookup/comparison code - but define their own</div><div class='del'>- * structures for the key values.</div><div class='del'>- *</div><div class='del'>- * The size of a key/value pair is stored as a u8 in units of u64s, so the max</div><div class='del'>- * size is just under 2k. The common part also contains a type tag for the</div><div class='del'>- * value, and a format field indicating whether the key is packed or not (and</div><div class='del'>- * also meant to allow adding new key fields in the future, if desired).</div><div class='del'>- *</div><div class='del'>- * bkeys, when stored within a btree node, may also be packed. In that case, the</div><div class='del'>- * bkey_format in that node is used to unpack it. Packed bkeys mean that we can</div><div class='del'>- * be generous with field sizes in the common part of the key format (64 bit</div><div class='del'>- * inode number, 64 bit offset, 96 bit version field, etc.) for negligible cost.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/uuid.h&gt;</div><div class='del'>-#include "vstructs.h"</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-typedef uuid_t __uuid_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BITMASK(name, type, field, offset, end)				\</div><div class='del'>-static const __maybe_unused unsigned	name##_OFFSET = offset;		\</div><div class='del'>-static const __maybe_unused unsigned	name##_BITS = (end - offset);	\</div><div class='del'>-									\</div><div class='del'>-static inline __u64 name(const type *k)					\</div><div class='del'>-{									\</div><div class='del'>-	return (k-&gt;field &gt;&gt; offset) &amp; ~(~0ULL &lt;&lt; (end - offset));	\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline void SET_##name(type *k, __u64 v)				\</div><div class='del'>-{									\</div><div class='del'>-	k-&gt;field &amp;= ~(~(~0ULL &lt;&lt; (end - offset)) &lt;&lt; offset);		\</div><div class='del'>-	k-&gt;field |= (v &amp; ~(~0ULL &lt;&lt; (end - offset))) &lt;&lt; offset;		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define LE_BITMASK(_bits, name, type, field, offset, end)		\</div><div class='del'>-static const __maybe_unused unsigned	name##_OFFSET = offset;		\</div><div class='del'>-static const __maybe_unused unsigned	name##_BITS = (end - offset);	\</div><div class='del'>-static const __maybe_unused __u##_bits	name##_MAX = (1ULL &lt;&lt; (end - offset)) - 1;\</div><div class='del'>-									\</div><div class='del'>-static inline __u64 name(const type *k)					\</div><div class='del'>-{									\</div><div class='del'>-	return (__le##_bits##_to_cpu(k-&gt;field) &gt;&gt; offset) &amp;		\</div><div class='del'>-		~(~0ULL &lt;&lt; (end - offset));				\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline void SET_##name(type *k, __u64 v)				\</div><div class='del'>-{									\</div><div class='del'>-	__u##_bits new = __le##_bits##_to_cpu(k-&gt;field);		\</div><div class='del'>-									\</div><div class='del'>-	new &amp;= ~(~(~0ULL &lt;&lt; (end - offset)) &lt;&lt; offset);			\</div><div class='del'>-	new |= (v &amp; ~(~0ULL &lt;&lt; (end - offset))) &lt;&lt; offset;		\</div><div class='del'>-	k-&gt;field = __cpu_to_le##_bits(new);				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define LE16_BITMASK(n, t, f, o, e)	LE_BITMASK(16, n, t, f, o, e)</div><div class='del'>-#define LE32_BITMASK(n, t, f, o, e)	LE_BITMASK(32, n, t, f, o, e)</div><div class='del'>-#define LE64_BITMASK(n, t, f, o, e)	LE_BITMASK(64, n, t, f, o, e)</div><div class='del'>-</div><div class='del'>-struct bkey_format {</div><div class='del'>-	__u8		key_u64s;</div><div class='del'>-	__u8		nr_fields;</div><div class='del'>-	/* One unused slot for now: */</div><div class='del'>-	__u8		bits_per_field[6];</div><div class='del'>-	__le64		field_offset[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Btree keys - all units are in sectors */</div><div class='del'>-</div><div class='del'>-struct bpos {</div><div class='del'>-	/*</div><div class='del'>-	 * Word order matches machine byte order - btree code treats a bpos as a</div><div class='del'>-	 * single large integer, for search/comparison purposes</div><div class='del'>-	 *</div><div class='del'>-	 * Note that wherever a bpos is embedded in another on disk data</div><div class='del'>-	 * structure, it has to be byte swabbed when reading in metadata that</div><div class='del'>-	 * wasn't written in native endian order:</div><div class='del'>-	 */</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-	__u32		snapshot;</div><div class='del'>-	__u64		offset;</div><div class='del'>-	__u64		inode;</div><div class='del'>-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__</div><div class='del'>-	__u64		inode;</div><div class='del'>-	__u64		offset;		/* Points to end of extent - sectors */</div><div class='del'>-	__u32		snapshot;</div><div class='del'>-#else</div><div class='del'>-#error edit for your odd byteorder.</div><div class='del'>-#endif</div><div class='del'>-} __packed</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-__aligned(4)</div><div class='del'>-#endif</div><div class='del'>-;</div><div class='del'>-</div><div class='del'>-#define KEY_INODE_MAX			((__u64)~0ULL)</div><div class='del'>-#define KEY_OFFSET_MAX			((__u64)~0ULL)</div><div class='del'>-#define KEY_SNAPSHOT_MAX		((__u32)~0U)</div><div class='del'>-#define KEY_SIZE_MAX			((__u32)~0U)</div><div class='del'>-</div><div class='del'>-static inline struct bpos SPOS(__u64 inode, __u64 offset, __u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	return (struct bpos) {</div><div class='del'>-		.inode		= inode,</div><div class='del'>-		.offset		= offset,</div><div class='del'>-		.snapshot	= snapshot,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define POS_MIN				SPOS(0, 0, 0)</div><div class='del'>-#define POS_MAX				SPOS(KEY_INODE_MAX, KEY_OFFSET_MAX, 0)</div><div class='del'>-#define SPOS_MAX			SPOS(KEY_INODE_MAX, KEY_OFFSET_MAX, KEY_SNAPSHOT_MAX)</div><div class='del'>-#define POS(_inode, _offset)		SPOS(_inode, _offset, 0)</div><div class='del'>-</div><div class='del'>-/* Empty placeholder struct, for container_of() */</div><div class='del'>-struct bch_val {</div><div class='del'>-	__u64		__nothing[0];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bversion {</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-	__u64		lo;</div><div class='del'>-	__u32		hi;</div><div class='del'>-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__</div><div class='del'>-	__u32		hi;</div><div class='del'>-	__u64		lo;</div><div class='del'>-#endif</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-struct bkey {</div><div class='del'>-	/* Size of combined key and value, in u64s */</div><div class='del'>-	__u8		u64s;</div><div class='del'>-</div><div class='del'>-	/* Format of key (0 for format local to btree node) */</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u8		format:7,</div><div class='del'>-			needs_whiteout:1;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u8		needs_whiteout:1,</div><div class='del'>-			format:7;</div><div class='del'>-#else</div><div class='del'>-#error edit for your odd byteorder.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Type of the value */</div><div class='del'>-	__u8		type;</div><div class='del'>-</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-	__u8		pad[1];</div><div class='del'>-</div><div class='del'>-	struct bversion	version;</div><div class='del'>-	__u32		size;		/* extent size, in sectors */</div><div class='del'>-	struct bpos	p;</div><div class='del'>-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__</div><div class='del'>-	struct bpos	p;</div><div class='del'>-	__u32		size;		/* extent size, in sectors */</div><div class='del'>-	struct bversion	version;</div><div class='del'>-</div><div class='del'>-	__u8		pad[1];</div><div class='del'>-#endif</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bkey_packed {</div><div class='del'>-	__u64		_data[0];</div><div class='del'>-</div><div class='del'>-	/* Size of combined key and value, in u64s */</div><div class='del'>-	__u8		u64s;</div><div class='del'>-</div><div class='del'>-	/* Format of key (0 for format local to btree node) */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: next incompat on disk format change, switch format and</div><div class='del'>-	 * needs_whiteout - bkey_packed() will be cheaper if format is the high</div><div class='del'>-	 * bits of the bitfield</div><div class='del'>-	 */</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u8		format:7,</div><div class='del'>-			needs_whiteout:1;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u8		needs_whiteout:1,</div><div class='del'>-			format:7;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Type of the value */</div><div class='del'>-	__u8		type;</div><div class='del'>-	__u8		key_start[0];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We copy bkeys with struct assignment in various places, and while</div><div class='del'>-	 * that shouldn't be done with packed bkeys we can't disallow it in C,</div><div class='del'>-	 * and it's legal to cast a bkey to a bkey_packed  - so padding it out</div><div class='del'>-	 * to the same size as struct bkey should hopefully be safest.</div><div class='del'>-	 */</div><div class='del'>-	__u8		pad[sizeof(struct bkey) - 3];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le64			lo;</div><div class='del'>-	__le64			hi;</div><div class='del'>-} bch_le128;</div><div class='del'>-</div><div class='del'>-#define BKEY_U64s			(sizeof(struct bkey) / sizeof(__u64))</div><div class='del'>-#define BKEY_U64s_MAX			U8_MAX</div><div class='del'>-#define BKEY_VAL_U64s_MAX		(BKEY_U64s_MAX - BKEY_U64s)</div><div class='del'>-</div><div class='del'>-#define KEY_PACKED_BITS_START		24</div><div class='del'>-</div><div class='del'>-#define KEY_FORMAT_LOCAL_BTREE		0</div><div class='del'>-#define KEY_FORMAT_CURRENT		1</div><div class='del'>-</div><div class='del'>-enum bch_bkey_fields {</div><div class='del'>-	BKEY_FIELD_INODE,</div><div class='del'>-	BKEY_FIELD_OFFSET,</div><div class='del'>-	BKEY_FIELD_SNAPSHOT,</div><div class='del'>-	BKEY_FIELD_SIZE,</div><div class='del'>-	BKEY_FIELD_VERSION_HI,</div><div class='del'>-	BKEY_FIELD_VERSION_LO,</div><div class='del'>-	BKEY_NR_FIELDS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define bkey_format_field(name, field)					\</div><div class='del'>-	[BKEY_FIELD_##name] = (sizeof(((struct bkey *) NULL)-&gt;field) * 8)</div><div class='del'>-</div><div class='del'>-#define BKEY_FORMAT_CURRENT						\</div><div class='del'>-((struct bkey_format) {							\</div><div class='del'>-	.key_u64s	= BKEY_U64s,					\</div><div class='del'>-	.nr_fields	= BKEY_NR_FIELDS,				\</div><div class='del'>-	.bits_per_field = {						\</div><div class='del'>-		bkey_format_field(INODE,	p.inode),		\</div><div class='del'>-		bkey_format_field(OFFSET,	p.offset),		\</div><div class='del'>-		bkey_format_field(SNAPSHOT,	p.snapshot),		\</div><div class='del'>-		bkey_format_field(SIZE,		size),			\</div><div class='del'>-		bkey_format_field(VERSION_HI,	version.hi),		\</div><div class='del'>-		bkey_format_field(VERSION_LO,	version.lo),		\</div><div class='del'>-	},								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* bkey with inline value */</div><div class='del'>-struct bkey_i {</div><div class='del'>-	__u64			_data[0];</div><div class='del'>-</div><div class='del'>-	struct bkey	k;</div><div class='del'>-	struct bch_val	v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define POS_KEY(_pos)							\</div><div class='del'>-((struct bkey) {							\</div><div class='del'>-	.u64s		= BKEY_U64s,					\</div><div class='del'>-	.format		= KEY_FORMAT_CURRENT,				\</div><div class='del'>-	.p		= _pos,						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define KEY(_inode, _offset, _size)					\</div><div class='del'>-((struct bkey) {							\</div><div class='del'>-	.u64s		= BKEY_U64s,					\</div><div class='del'>-	.format		= KEY_FORMAT_CURRENT,				\</div><div class='del'>-	.p		= POS(_inode, _offset),				\</div><div class='del'>-	.size		= _size,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline void bkey_init(struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	*k = KEY(0, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_bytes(_k)		((_k)-&gt;u64s * sizeof(__u64))</div><div class='del'>-</div><div class='del'>-#define __BKEY_PADDED(key, pad)					\</div><div class='del'>-	struct bkey_i key; __u64 key ## _pad[pad]</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * - DELETED keys are used internally to mark keys that should be ignored but</div><div class='del'>- *   override keys in composition order.  Their version number is ignored.</div><div class='del'>- *</div><div class='del'>- * - DISCARDED keys indicate that the data is all 0s because it has been</div><div class='del'>- *   discarded. DISCARDs may have a version; if the version is nonzero the key</div><div class='del'>- *   will be persistent, otherwise the key will be dropped whenever the btree</div><div class='del'>- *   node is rewritten (like DELETED keys).</div><div class='del'>- *</div><div class='del'>- * - ERROR: any read of the data returns a read error, as the data was lost due</div><div class='del'>- *   to a failing device. Like DISCARDED keys, they can be removed (overridden)</div><div class='del'>- *   by new writes or cluster-wide GC. Node repair can also overwrite them with</div><div class='del'>- *   the same or a more recent version number, but not with an older version</div><div class='del'>- *   number.</div><div class='del'>- *</div><div class='del'>- * - WHITEOUT: for hash table btrees</div><div class='del'>- */</div><div class='del'>-#define BCH_BKEY_TYPES()				\</div><div class='del'>-	x(deleted,		0)			\</div><div class='del'>-	x(whiteout,		1)			\</div><div class='del'>-	x(error,		2)			\</div><div class='del'>-	x(cookie,		3)			\</div><div class='del'>-	x(hash_whiteout,	4)			\</div><div class='del'>-	x(btree_ptr,		5)			\</div><div class='del'>-	x(extent,		6)			\</div><div class='del'>-	x(reservation,		7)			\</div><div class='del'>-	x(inode,		8)			\</div><div class='del'>-	x(inode_generation,	9)			\</div><div class='del'>-	x(dirent,		10)			\</div><div class='del'>-	x(xattr,		11)			\</div><div class='del'>-	x(alloc,		12)			\</div><div class='del'>-	x(quota,		13)			\</div><div class='del'>-	x(stripe,		14)			\</div><div class='del'>-	x(reflink_p,		15)			\</div><div class='del'>-	x(reflink_v,		16)			\</div><div class='del'>-	x(inline_data,		17)			\</div><div class='del'>-	x(btree_ptr_v2,		18)			\</div><div class='del'>-	x(indirect_inline_data,	19)			\</div><div class='del'>-	x(alloc_v2,		20)			\</div><div class='del'>-	x(subvolume,		21)			\</div><div class='del'>-	x(snapshot,		22)			\</div><div class='del'>-	x(inode_v2,		23)			\</div><div class='del'>-	x(alloc_v3,		24)			\</div><div class='del'>-	x(set,			25)			\</div><div class='del'>-	x(lru,			26)			\</div><div class='del'>-	x(alloc_v4,		27)			\</div><div class='del'>-	x(backpointer,		28)			\</div><div class='del'>-	x(inode_v3,		29)			\</div><div class='del'>-	x(bucket_gens,		30)			\</div><div class='del'>-	x(snapshot_tree,	31)			\</div><div class='del'>-	x(logged_op_truncate,	32)			\</div><div class='del'>-	x(logged_op_finsert,	33)</div><div class='del'>-</div><div class='del'>-enum bch_bkey_type {</div><div class='del'>-#define x(name, nr) KEY_TYPE_##name	= nr,</div><div class='del'>-	BCH_BKEY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	KEY_TYPE_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_deleted {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_whiteout {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_error {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_cookie {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le64			cookie;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_hash_whiteout {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_set {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 128 bits, sufficient for cryptographic MACs: */</div><div class='del'>-struct bch_csum {</div><div class='del'>-	__le64			lo;</div><div class='del'>-	__le64			hi;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_backpointer {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__u8			btree_id;</div><div class='del'>-	__u8			level;</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u64			bucket_offset:40;</div><div class='del'>-	__u32			bucket_len;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/* LRU btree: */</div><div class='del'>-</div><div class='del'>-struct bch_lru {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le64			idx;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define LRU_ID_STRIPES		(1U &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-/* Optional/variable size superblock sections: */</div><div class='del'>-</div><div class='del'>-struct bch_sb_field {</div><div class='del'>-	__u64			_data[0];</div><div class='del'>-	__le32			u64s;</div><div class='del'>-	__le32			type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_SB_FIELDS()				\</div><div class='del'>-	x(journal,			0)	\</div><div class='del'>-	x(members_v1,			1)	\</div><div class='del'>-	x(crypt,			2)	\</div><div class='del'>-	x(replicas_v0,			3)	\</div><div class='del'>-	x(quota,			4)	\</div><div class='del'>-	x(disk_groups,			5)	\</div><div class='del'>-	x(clean,			6)	\</div><div class='del'>-	x(replicas,			7)	\</div><div class='del'>-	x(journal_seq_blacklist,	8)	\</div><div class='del'>-	x(journal_v2,			9)	\</div><div class='del'>-	x(counters,			10)	\</div><div class='del'>-	x(members_v2,			11)	\</div><div class='del'>-	x(errors,			12)	\</div><div class='del'>-	x(ext,				13)	\</div><div class='del'>-	x(downgrade,			14)</div><div class='del'>-</div><div class='del'>-#include "alloc_background_format.h"</div><div class='del'>-#include "extents_format.h"</div><div class='del'>-#include "reflink_format.h"</div><div class='del'>-#include "ec_format.h"</div><div class='del'>-#include "inode_format.h"</div><div class='del'>-#include "dirent_format.h"</div><div class='del'>-#include "xattr_format.h"</div><div class='del'>-#include "quota_format.h"</div><div class='del'>-#include "logged_ops_format.h"</div><div class='del'>-#include "snapshot_format.h"</div><div class='del'>-#include "subvolume_format.h"</div><div class='del'>-#include "sb-counters_format.h"</div><div class='del'>-</div><div class='del'>-enum bch_sb_field_type {</div><div class='del'>-#define x(f, nr)	BCH_SB_FIELD_##f = nr,</div><div class='del'>-	BCH_SB_FIELDS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_SB_FIELD_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Most superblock fields are replicated in all device's superblocks - a few are</div><div class='del'>- * not:</div><div class='del'>- */</div><div class='del'>-#define BCH_SINGLE_DEVICE_SB_FIELDS		\</div><div class='del'>-	((1U &lt;&lt; BCH_SB_FIELD_journal)|		\</div><div class='del'>-	 (1U &lt;&lt; BCH_SB_FIELD_journal_v2))</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_journal: */</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_journal {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	__le64			buckets[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_journal_v2 {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field_journal_v2_entry {</div><div class='del'>-		__le64		start;</div><div class='del'>-		__le64		nr;</div><div class='del'>-	}			d[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_members_v1: */</div><div class='del'>-</div><div class='del'>-#define BCH_MIN_NR_NBUCKETS	(1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-#define BCH_IOPS_MEASUREMENTS()			\</div><div class='del'>-	x(seqread,	0)			\</div><div class='del'>-	x(seqwrite,	1)			\</div><div class='del'>-	x(randread,	2)			\</div><div class='del'>-	x(randwrite,	3)</div><div class='del'>-</div><div class='del'>-enum bch_iops_measurement {</div><div class='del'>-#define x(t, n) BCH_IOPS_##t = n,</div><div class='del'>-	BCH_IOPS_MEASUREMENTS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_IOPS_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_MEMBER_ERROR_TYPES()		\</div><div class='del'>-	x(read,		0)			\</div><div class='del'>-	x(write,	1)			\</div><div class='del'>-	x(checksum,	2)</div><div class='del'>-</div><div class='del'>-enum bch_member_error_type {</div><div class='del'>-#define x(t, n) BCH_MEMBER_ERROR_##t = n,</div><div class='del'>-	BCH_MEMBER_ERROR_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_MEMBER_ERROR_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_member {</div><div class='del'>-	__uuid_t		uuid;</div><div class='del'>-	__le64			nbuckets;	/* device size */</div><div class='del'>-	__le16			first_bucket;   /* index of first bucket used */</div><div class='del'>-	__le16			bucket_size;	/* sectors */</div><div class='del'>-	__le32			pad;</div><div class='del'>-	__le64			last_mount;	/* time_t */</div><div class='del'>-</div><div class='del'>-	__le64			flags;</div><div class='del'>-	__le32			iops[4];</div><div class='del'>-	__le64			errors[BCH_MEMBER_ERROR_NR];</div><div class='del'>-	__le64			errors_at_reset[BCH_MEMBER_ERROR_NR];</div><div class='del'>-	__le64			errors_reset_time;</div><div class='del'>-	__le64			seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_MEMBER_V1_BYTES	56</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_STATE,		struct bch_member, flags,  0,  4)</div><div class='del'>-/* 4-14 unused, was TIER, HAS_(META)DATA, REPLACEMENT */</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_DISCARD,	struct bch_member, flags, 14, 15)</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_DATA_ALLOWED,	struct bch_member, flags, 15, 20)</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_GROUP,		struct bch_member, flags, 20, 28)</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_DURABILITY,	struct bch_member, flags, 28, 30)</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_FREESPACE_INITIALIZED,</div><div class='del'>-					struct bch_member, flags, 30, 31)</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_NR_READ_ERRORS,	struct bch_member, flags[1], 0,  20);</div><div class='del'>-LE64_BITMASK(BCH_MEMBER_NR_WRITE_ERRORS,struct bch_member, flags[1], 20, 40);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BCH_MEMBER_STATES()			\</div><div class='del'>-	x(rw,		0)			\</div><div class='del'>-	x(ro,		1)			\</div><div class='del'>-	x(failed,	2)			\</div><div class='del'>-	x(spare,	3)</div><div class='del'>-</div><div class='del'>-enum bch_member_state {</div><div class='del'>-#define x(t, n) BCH_MEMBER_STATE_##t = n,</div><div class='del'>-	BCH_MEMBER_STATES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_MEMBER_STATE_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_members_v1 {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct bch_member	_members[]; //Members are now variable size</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_members_v2 {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	__le16			member_bytes; //size of single member entry</div><div class='del'>-	u8			pad[6];</div><div class='del'>-	struct bch_member	_members[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_crypt: */</div><div class='del'>-</div><div class='del'>-struct nonce {</div><div class='del'>-	__le32			d[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_key {</div><div class='del'>-	__le64			key[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_KEY_MAGIC					\</div><div class='del'>-	(((__u64) 'b' &lt;&lt;  0)|((__u64) 'c' &lt;&lt;  8)|		\</div><div class='del'>-	 ((__u64) 'h' &lt;&lt; 16)|((__u64) '*' &lt;&lt; 24)|		\</div><div class='del'>-	 ((__u64) '*' &lt;&lt; 32)|((__u64) 'k' &lt;&lt; 40)|		\</div><div class='del'>-	 ((__u64) 'e' &lt;&lt; 48)|((__u64) 'y' &lt;&lt; 56))</div><div class='del'>-</div><div class='del'>-struct bch_encrypted_key {</div><div class='del'>-	__le64			magic;</div><div class='del'>-	struct bch_key		key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If this field is present in the superblock, it stores an encryption key which</div><div class='del'>- * is used encrypt all other data/metadata. The key will normally be encrypted</div><div class='del'>- * with the key userspace provides, but if encryption has been turned off we'll</div><div class='del'>- * just store the master key unencrypted in the superblock so we can access the</div><div class='del'>- * previously encrypted data.</div><div class='del'>- */</div><div class='del'>-struct bch_sb_field_crypt {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-</div><div class='del'>-	__le64			flags;</div><div class='del'>-	__le64			kdf_flags;</div><div class='del'>-	struct bch_encrypted_key key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_CRYPT_KDF_TYPE,	struct bch_sb_field_crypt, flags, 0, 4);</div><div class='del'>-</div><div class='del'>-enum bch_kdf_types {</div><div class='del'>-	BCH_KDF_SCRYPT		= 0,</div><div class='del'>-	BCH_KDF_NR		= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* stored as base 2 log of scrypt params: */</div><div class='del'>-LE64_BITMASK(BCH_KDF_SCRYPT_N,	struct bch_sb_field_crypt, kdf_flags,  0, 16);</div><div class='del'>-LE64_BITMASK(BCH_KDF_SCRYPT_R,	struct bch_sb_field_crypt, kdf_flags, 16, 32);</div><div class='del'>-LE64_BITMASK(BCH_KDF_SCRYPT_P,	struct bch_sb_field_crypt, kdf_flags, 32, 48);</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_replicas: */</div><div class='del'>-</div><div class='del'>-#define BCH_DATA_TYPES()		\</div><div class='del'>-	x(free,		0)		\</div><div class='del'>-	x(sb,		1)		\</div><div class='del'>-	x(journal,	2)		\</div><div class='del'>-	x(btree,	3)		\</div><div class='del'>-	x(user,		4)		\</div><div class='del'>-	x(cached,	5)		\</div><div class='del'>-	x(parity,	6)		\</div><div class='del'>-	x(stripe,	7)		\</div><div class='del'>-	x(need_gc_gens,	8)		\</div><div class='del'>-	x(need_discard,	9)</div><div class='del'>-</div><div class='del'>-enum bch_data_type {</div><div class='del'>-#define x(t, n) BCH_DATA_##t,</div><div class='del'>-	BCH_DATA_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_DATA_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool data_type_is_empty(enum bch_data_type type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_DATA_free:</div><div class='del'>-	case BCH_DATA_need_gc_gens:</div><div class='del'>-	case BCH_DATA_need_discard:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool data_type_is_hidden(enum bch_data_type type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_DATA_sb:</div><div class='del'>-	case BCH_DATA_journal:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_replicas_entry_v0 {</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u8			nr_devs;</div><div class='del'>-	__u8			devs[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_replicas_v0 {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct bch_replicas_entry_v0 entries[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_replicas_entry_v1 {</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u8			nr_devs;</div><div class='del'>-	__u8			nr_required;</div><div class='del'>-	__u8			devs[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define replicas_entry_bytes(_i)					\</div><div class='del'>-	(offsetof(typeof(*(_i)), devs) + (_i)-&gt;nr_devs)</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_replicas {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct bch_replicas_entry_v1 entries[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_disk_groups: */</div><div class='del'>-</div><div class='del'>-#define BCH_SB_LABEL_SIZE		32</div><div class='del'>-</div><div class='del'>-struct bch_disk_group {</div><div class='del'>-	__u8			label[BCH_SB_LABEL_SIZE];</div><div class='del'>-	__le64			flags[2];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_GROUP_DELETED,		struct bch_disk_group, flags[0], 0,  1)</div><div class='del'>-LE64_BITMASK(BCH_GROUP_DATA_ALLOWED,	struct bch_disk_group, flags[0], 1,  6)</div><div class='del'>-LE64_BITMASK(BCH_GROUP_PARENT,		struct bch_disk_group, flags[0], 6, 24)</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_disk_groups {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct bch_disk_group	entries[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On clean shutdown, store btree roots and current journal sequence number in</div><div class='del'>- * the superblock:</div><div class='del'>- */</div><div class='del'>-struct jset_entry {</div><div class='del'>-	__le16			u64s;</div><div class='del'>-	__u8			btree_id;</div><div class='del'>-	__u8			level;</div><div class='del'>-	__u8			type; /* designates what this jset holds */</div><div class='del'>-	__u8			pad[3];</div><div class='del'>-</div><div class='del'>-	struct bkey_i		start[0];</div><div class='del'>-	__u64			_data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_clean {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-</div><div class='del'>-	__le32			flags;</div><div class='del'>-	__le16			_read_clock; /* no longer used */</div><div class='del'>-	__le16			_write_clock;</div><div class='del'>-	__le64			journal_seq;</div><div class='del'>-</div><div class='del'>-	struct jset_entry	start[0];</div><div class='del'>-	__u64			_data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct journal_seq_blacklist_entry {</div><div class='del'>-	__le64			start;</div><div class='del'>-	__le64			end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_journal_seq_blacklist {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct journal_seq_blacklist_entry start[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_errors {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct bch_sb_field_error_entry {</div><div class='del'>-		__le64		v;</div><div class='del'>-		__le64		last_error_time;</div><div class='del'>-	}			entries[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_ERROR_ENTRY_ID,	struct bch_sb_field_error_entry, v,  0, 16);</div><div class='del'>-LE64_BITMASK(BCH_SB_ERROR_ENTRY_NR,	struct bch_sb_field_error_entry, v, 16, 64);</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_ext {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	__le64			recovery_passes_required[2];</div><div class='del'>-	__le64			errors_silent[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_downgrade_entry {</div><div class='del'>-	__le16			version;</div><div class='del'>-	__le64			recovery_passes[2];</div><div class='del'>-	__le16			nr_errors;</div><div class='del'>-	__le16			errors[] __counted_by(nr_errors);</div><div class='del'>-} __packed __aligned(2);</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_downgrade {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	struct bch_sb_field_downgrade_entry entries[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Superblock: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * New versioning scheme:</div><div class='del'>- * One common version number for all on disk data structures - superblock, btree</div><div class='del'>- * nodes, journal entries</div><div class='del'>- */</div><div class='del'>-#define BCH_VERSION_MAJOR(_v)		((__u16) ((_v) &gt;&gt; 10))</div><div class='del'>-#define BCH_VERSION_MINOR(_v)		((__u16) ((_v) &amp; ~(~0U &lt;&lt; 10)))</div><div class='del'>-#define BCH_VERSION(_major, _minor)	(((_major) &lt;&lt; 10)|(_minor) &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * field 1:		version name</div><div class='del'>- * field 2:		BCH_VERSION(major, minor)</div><div class='del'>- * field 3:		recovery passess required on upgrade</div><div class='del'>- */</div><div class='del'>-#define BCH_METADATA_VERSIONS()						\</div><div class='del'>-	x(bkey_renumber,		BCH_VERSION(0, 10))		\</div><div class='del'>-	x(inode_btree_change,		BCH_VERSION(0, 11))		\</div><div class='del'>-	x(snapshot,			BCH_VERSION(0, 12))		\</div><div class='del'>-	x(inode_backpointers,		BCH_VERSION(0, 13))		\</div><div class='del'>-	x(btree_ptr_sectors_written,	BCH_VERSION(0, 14))		\</div><div class='del'>-	x(snapshot_2,			BCH_VERSION(0, 15))		\</div><div class='del'>-	x(reflink_p_fix,		BCH_VERSION(0, 16))		\</div><div class='del'>-	x(subvol_dirent,		BCH_VERSION(0, 17))		\</div><div class='del'>-	x(inode_v2,			BCH_VERSION(0, 18))		\</div><div class='del'>-	x(freespace,			BCH_VERSION(0, 19))		\</div><div class='del'>-	x(alloc_v4,			BCH_VERSION(0, 20))		\</div><div class='del'>-	x(new_data_types,		BCH_VERSION(0, 21))		\</div><div class='del'>-	x(backpointers,			BCH_VERSION(0, 22))		\</div><div class='del'>-	x(inode_v3,			BCH_VERSION(0, 23))		\</div><div class='del'>-	x(unwritten_extents,		BCH_VERSION(0, 24))		\</div><div class='del'>-	x(bucket_gens,			BCH_VERSION(0, 25))		\</div><div class='del'>-	x(lru_v2,			BCH_VERSION(0, 26))		\</div><div class='del'>-	x(fragmentation_lru,		BCH_VERSION(0, 27))		\</div><div class='del'>-	x(no_bps_in_alloc_keys,		BCH_VERSION(0, 28))		\</div><div class='del'>-	x(snapshot_trees,		BCH_VERSION(0, 29))		\</div><div class='del'>-	x(major_minor,			BCH_VERSION(1,  0))		\</div><div class='del'>-	x(snapshot_skiplists,		BCH_VERSION(1,  1))		\</div><div class='del'>-	x(deleted_inodes,		BCH_VERSION(1,  2))		\</div><div class='del'>-	x(rebalance_work,		BCH_VERSION(1,  3))		\</div><div class='del'>-	x(member_seq,			BCH_VERSION(1,  4))</div><div class='del'>-</div><div class='del'>-enum bcachefs_metadata_version {</div><div class='del'>-	bcachefs_metadata_version_min = 9,</div><div class='del'>-#define x(t, n)	bcachefs_metadata_version_##t = n,</div><div class='del'>-	BCH_METADATA_VERSIONS()</div><div class='del'>-#undef x</div><div class='del'>-	bcachefs_metadata_version_max</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const __maybe_unused</div><div class='del'>-unsigned bcachefs_metadata_required_upgrade_below = bcachefs_metadata_version_rebalance_work;</div><div class='del'>-</div><div class='del'>-#define bcachefs_metadata_version_current	(bcachefs_metadata_version_max - 1)</div><div class='del'>-</div><div class='del'>-#define BCH_SB_SECTOR			8</div><div class='del'>-#define BCH_SB_MEMBERS_MAX		64 /* XXX kill */</div><div class='del'>-</div><div class='del'>-struct bch_sb_layout {</div><div class='del'>-	__uuid_t		magic;	/* bcachefs superblock UUID */</div><div class='del'>-	__u8			layout_type;</div><div class='del'>-	__u8			sb_max_size_bits; /* base 2 of 512 byte sectors */</div><div class='del'>-	__u8			nr_superblocks;</div><div class='del'>-	__u8			pad[5];</div><div class='del'>-	__le64			sb_offset[61];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define BCH_SB_LAYOUT_SECTOR	7</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @offset	- sector where this sb was written</div><div class='del'>- * @version	- on disk format version</div><div class='del'>- * @version_min	- Oldest metadata version this filesystem contains; so we can</div><div class='del'>- *		  safely drop compatibility code and refuse to mount filesystems</div><div class='del'>- *		  we'd need it for</div><div class='del'>- * @magic	- identifies as a bcachefs superblock (BCHFS_MAGIC)</div><div class='del'>- * @seq		- incremented each time superblock is written</div><div class='del'>- * @uuid	- used for generating various magic numbers and identifying</div><div class='del'>- *                member devices, never changes</div><div class='del'>- * @user_uuid	- user visible UUID, may be changed</div><div class='del'>- * @label	- filesystem label</div><div class='del'>- * @seq		- identifies most recent superblock, incremented each time</div><div class='del'>- *		  superblock is written</div><div class='del'>- * @features	- enabled incompatible features</div><div class='del'>- */</div><div class='del'>-struct bch_sb {</div><div class='del'>-	struct bch_csum		csum;</div><div class='del'>-	__le16			version;</div><div class='del'>-	__le16			version_min;</div><div class='del'>-	__le16			pad[2];</div><div class='del'>-	__uuid_t		magic;</div><div class='del'>-	__uuid_t		uuid;</div><div class='del'>-	__uuid_t		user_uuid;</div><div class='del'>-	__u8			label[BCH_SB_LABEL_SIZE];</div><div class='del'>-	__le64			offset;</div><div class='del'>-	__le64			seq;</div><div class='del'>-</div><div class='del'>-	__le16			block_size;</div><div class='del'>-	__u8			dev_idx;</div><div class='del'>-	__u8			nr_devices;</div><div class='del'>-	__le32			u64s;</div><div class='del'>-</div><div class='del'>-	__le64			time_base_lo;</div><div class='del'>-	__le32			time_base_hi;</div><div class='del'>-	__le32			time_precision;</div><div class='del'>-</div><div class='del'>-	__le64			flags[7];</div><div class='del'>-	__le64			write_time;</div><div class='del'>-	__le64			features[2];</div><div class='del'>-	__le64			compat[2];</div><div class='del'>-</div><div class='del'>-	struct bch_sb_layout	layout;</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field	start[0];</div><div class='del'>-	__le64			_data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flags:</div><div class='del'>- * BCH_SB_INITALIZED	- set on first mount</div><div class='del'>- * BCH_SB_CLEAN		- did we shut down cleanly? Just a hint, doesn't affect</div><div class='del'>- *			  behaviour of mount/recovery path:</div><div class='del'>- * BCH_SB_INODE_32BIT	- limit inode numbers to 32 bits</div><div class='del'>- * BCH_SB_128_BIT_MACS	- 128 bit macs instead of 80</div><div class='del'>- * BCH_SB_ENCRYPTION_TYPE - if nonzero encryption is enabled; overrides</div><div class='del'>- *			   DATA/META_CSUM_TYPE. Also indicates encryption</div><div class='del'>- *			   algorithm in use, if/when we get more than one</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-LE16_BITMASK(BCH_SB_BLOCK_SIZE,		struct bch_sb, block_size, 0, 16);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_INITIALIZED,	struct bch_sb, flags[0],  0,  1);</div><div class='del'>-LE64_BITMASK(BCH_SB_CLEAN,		struct bch_sb, flags[0],  1,  2);</div><div class='del'>-LE64_BITMASK(BCH_SB_CSUM_TYPE,		struct bch_sb, flags[0],  2,  8);</div><div class='del'>-LE64_BITMASK(BCH_SB_ERROR_ACTION,	struct bch_sb, flags[0],  8, 12);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_BTREE_NODE_SIZE,	struct bch_sb, flags[0], 12, 28);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_GC_RESERVE,		struct bch_sb, flags[0], 28, 33);</div><div class='del'>-LE64_BITMASK(BCH_SB_ROOT_RESERVE,	struct bch_sb, flags[0], 33, 40);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_META_CSUM_TYPE,	struct bch_sb, flags[0], 40, 44);</div><div class='del'>-LE64_BITMASK(BCH_SB_DATA_CSUM_TYPE,	struct bch_sb, flags[0], 44, 48);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_META_REPLICAS_WANT,	struct bch_sb, flags[0], 48, 52);</div><div class='del'>-LE64_BITMASK(BCH_SB_DATA_REPLICAS_WANT,	struct bch_sb, flags[0], 52, 56);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_POSIX_ACL,		struct bch_sb, flags[0], 56, 57);</div><div class='del'>-LE64_BITMASK(BCH_SB_USRQUOTA,		struct bch_sb, flags[0], 57, 58);</div><div class='del'>-LE64_BITMASK(BCH_SB_GRPQUOTA,		struct bch_sb, flags[0], 58, 59);</div><div class='del'>-LE64_BITMASK(BCH_SB_PRJQUOTA,		struct bch_sb, flags[0], 59, 60);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_HAS_ERRORS,		struct bch_sb, flags[0], 60, 61);</div><div class='del'>-LE64_BITMASK(BCH_SB_HAS_TOPOLOGY_ERRORS,struct bch_sb, flags[0], 61, 62);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_BIG_ENDIAN,		struct bch_sb, flags[0], 62, 63);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_STR_HASH_TYPE,	struct bch_sb, flags[1],  0,  4);</div><div class='del'>-LE64_BITMASK(BCH_SB_COMPRESSION_TYPE_LO,struct bch_sb, flags[1],  4,  8);</div><div class='del'>-LE64_BITMASK(BCH_SB_INODE_32BIT,	struct bch_sb, flags[1],  8,  9);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_128_BIT_MACS,	struct bch_sb, flags[1],  9, 10);</div><div class='del'>-LE64_BITMASK(BCH_SB_ENCRYPTION_TYPE,	struct bch_sb, flags[1], 10, 14);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Max size of an extent that may require bouncing to read or write</div><div class='del'>- * (checksummed, compressed): 64k</div><div class='del'>- */</div><div class='del'>-LE64_BITMASK(BCH_SB_ENCODED_EXTENT_MAX_BITS,</div><div class='del'>-					struct bch_sb, flags[1], 14, 20);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_META_REPLICAS_REQ,	struct bch_sb, flags[1], 20, 24);</div><div class='del'>-LE64_BITMASK(BCH_SB_DATA_REPLICAS_REQ,	struct bch_sb, flags[1], 24, 28);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_PROMOTE_TARGET,	struct bch_sb, flags[1], 28, 40);</div><div class='del'>-LE64_BITMASK(BCH_SB_FOREGROUND_TARGET,	struct bch_sb, flags[1], 40, 52);</div><div class='del'>-LE64_BITMASK(BCH_SB_BACKGROUND_TARGET,	struct bch_sb, flags[1], 52, 64);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_BACKGROUND_COMPRESSION_TYPE_LO,</div><div class='del'>-					struct bch_sb, flags[2],  0,  4);</div><div class='del'>-LE64_BITMASK(BCH_SB_GC_RESERVE_BYTES,	struct bch_sb, flags[2],  4, 64);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_ERASURE_CODE,	struct bch_sb, flags[3],  0, 16);</div><div class='del'>-LE64_BITMASK(BCH_SB_METADATA_TARGET,	struct bch_sb, flags[3], 16, 28);</div><div class='del'>-LE64_BITMASK(BCH_SB_SHARD_INUMS,	struct bch_sb, flags[3], 28, 29);</div><div class='del'>-LE64_BITMASK(BCH_SB_INODES_USE_KEY_CACHE,struct bch_sb, flags[3], 29, 30);</div><div class='del'>-LE64_BITMASK(BCH_SB_JOURNAL_FLUSH_DELAY,struct bch_sb, flags[3], 30, 62);</div><div class='del'>-LE64_BITMASK(BCH_SB_JOURNAL_FLUSH_DISABLED,struct bch_sb, flags[3], 62, 63);</div><div class='del'>-LE64_BITMASK(BCH_SB_JOURNAL_RECLAIM_DELAY,struct bch_sb, flags[4], 0, 32);</div><div class='del'>-LE64_BITMASK(BCH_SB_JOURNAL_TRANSACTION_NAMES,struct bch_sb, flags[4], 32, 33);</div><div class='del'>-LE64_BITMASK(BCH_SB_NOCOW,		struct bch_sb, flags[4], 33, 34);</div><div class='del'>-LE64_BITMASK(BCH_SB_WRITE_BUFFER_SIZE,	struct bch_sb, flags[4], 34, 54);</div><div class='del'>-LE64_BITMASK(BCH_SB_VERSION_UPGRADE,	struct bch_sb, flags[4], 54, 56);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_COMPRESSION_TYPE_HI,struct bch_sb, flags[4], 56, 60);</div><div class='del'>-LE64_BITMASK(BCH_SB_BACKGROUND_COMPRESSION_TYPE_HI,</div><div class='del'>-					struct bch_sb, flags[4], 60, 64);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BCH_SB_VERSION_UPGRADE_COMPLETE,</div><div class='del'>-					struct bch_sb, flags[5],  0, 16);</div><div class='del'>-</div><div class='del'>-static inline __u64 BCH_SB_COMPRESSION_TYPE(const struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	return BCH_SB_COMPRESSION_TYPE_LO(sb) | (BCH_SB_COMPRESSION_TYPE_HI(sb) &lt;&lt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void SET_BCH_SB_COMPRESSION_TYPE(struct bch_sb *sb, __u64 v)</div><div class='del'>-{</div><div class='del'>-	SET_BCH_SB_COMPRESSION_TYPE_LO(sb, v);</div><div class='del'>-	SET_BCH_SB_COMPRESSION_TYPE_HI(sb, v &gt;&gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u64 BCH_SB_BACKGROUND_COMPRESSION_TYPE(const struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	return BCH_SB_BACKGROUND_COMPRESSION_TYPE_LO(sb) |</div><div class='del'>-		(BCH_SB_BACKGROUND_COMPRESSION_TYPE_HI(sb) &lt;&lt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void SET_BCH_SB_BACKGROUND_COMPRESSION_TYPE(struct bch_sb *sb, __u64 v)</div><div class='del'>-{</div><div class='del'>-	SET_BCH_SB_BACKGROUND_COMPRESSION_TYPE_LO(sb, v);</div><div class='del'>-	SET_BCH_SB_BACKGROUND_COMPRESSION_TYPE_HI(sb, v &gt;&gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Features:</div><div class='del'>- *</div><div class='del'>- * journal_seq_blacklist_v3:	gates BCH_SB_FIELD_journal_seq_blacklist</div><div class='del'>- * reflink:			gates KEY_TYPE_reflink</div><div class='del'>- * inline_data:			gates KEY_TYPE_inline_data</div><div class='del'>- * new_siphash:			gates BCH_STR_HASH_siphash</div><div class='del'>- * new_extent_overwrite:	gates BTREE_NODE_NEW_EXTENT_OVERWRITE</div><div class='del'>- */</div><div class='del'>-#define BCH_SB_FEATURES()			\</div><div class='del'>-	x(lz4,				0)	\</div><div class='del'>-	x(gzip,				1)	\</div><div class='del'>-	x(zstd,				2)	\</div><div class='del'>-	x(atomic_nlink,			3)	\</div><div class='del'>-	x(ec,				4)	\</div><div class='del'>-	x(journal_seq_blacklist_v3,	5)	\</div><div class='del'>-	x(reflink,			6)	\</div><div class='del'>-	x(new_siphash,			7)	\</div><div class='del'>-	x(inline_data,			8)	\</div><div class='del'>-	x(new_extent_overwrite,		9)	\</div><div class='del'>-	x(incompressible,		10)	\</div><div class='del'>-	x(btree_ptr_v2,			11)	\</div><div class='del'>-	x(extents_above_btree_updates,	12)	\</div><div class='del'>-	x(btree_updates_journalled,	13)	\</div><div class='del'>-	x(reflink_inline_data,		14)	\</div><div class='del'>-	x(new_varint,			15)	\</div><div class='del'>-	x(journal_no_flush,		16)	\</div><div class='del'>-	x(alloc_v2,			17)	\</div><div class='del'>-	x(extents_across_btree_nodes,	18)</div><div class='del'>-</div><div class='del'>-#define BCH_SB_FEATURES_ALWAYS				\</div><div class='del'>-	((1ULL &lt;&lt; BCH_FEATURE_new_extent_overwrite)|	\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_extents_above_btree_updates)|\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_btree_updates_journalled)|\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_alloc_v2)|\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_extents_across_btree_nodes))</div><div class='del'>-</div><div class='del'>-#define BCH_SB_FEATURES_ALL				\</div><div class='del'>-	(BCH_SB_FEATURES_ALWAYS|			\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_new_siphash)|		\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_btree_ptr_v2)|		\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_new_varint)|		\</div><div class='del'>-	 (1ULL &lt;&lt; BCH_FEATURE_journal_no_flush))</div><div class='del'>-</div><div class='del'>-enum bch_sb_feature {</div><div class='del'>-#define x(f, n) BCH_FEATURE_##f,</div><div class='del'>-	BCH_SB_FEATURES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_FEATURE_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_SB_COMPAT()					\</div><div class='del'>-	x(alloc_info,				0)	\</div><div class='del'>-	x(alloc_metadata,			1)	\</div><div class='del'>-	x(extents_above_btree_updates_done,	2)	\</div><div class='del'>-	x(bformat_overflow_done,		3)</div><div class='del'>-</div><div class='del'>-enum bch_sb_compat {</div><div class='del'>-#define x(f, n) BCH_COMPAT_##f,</div><div class='del'>-	BCH_SB_COMPAT()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_COMPAT_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* options: */</div><div class='del'>-</div><div class='del'>-#define BCH_VERSION_UPGRADE_OPTS()	\</div><div class='del'>-	x(compatible,		0)	\</div><div class='del'>-	x(incompatible,		1)	\</div><div class='del'>-	x(none,			2)</div><div class='del'>-</div><div class='del'>-enum bch_version_upgrade_opts {</div><div class='del'>-#define x(t, n) BCH_VERSION_UPGRADE_##t = n,</div><div class='del'>-	BCH_VERSION_UPGRADE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_REPLICAS_MAX		4U</div><div class='del'>-</div><div class='del'>-#define BCH_BKEY_PTRS_MAX		16U</div><div class='del'>-</div><div class='del'>-#define BCH_ERROR_ACTIONS()		\</div><div class='del'>-	x(continue,		0)	\</div><div class='del'>-	x(ro,			1)	\</div><div class='del'>-	x(panic,		2)</div><div class='del'>-</div><div class='del'>-enum bch_error_actions {</div><div class='del'>-#define x(t, n) BCH_ON_ERROR_##t = n,</div><div class='del'>-	BCH_ERROR_ACTIONS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_ON_ERROR_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_STR_HASH_TYPES()		\</div><div class='del'>-	x(crc32c,		0)	\</div><div class='del'>-	x(crc64,		1)	\</div><div class='del'>-	x(siphash_old,		2)	\</div><div class='del'>-	x(siphash,		3)</div><div class='del'>-</div><div class='del'>-enum bch_str_hash_type {</div><div class='del'>-#define x(t, n) BCH_STR_HASH_##t = n,</div><div class='del'>-	BCH_STR_HASH_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_STR_HASH_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_STR_HASH_OPTS()		\</div><div class='del'>-	x(crc32c,		0)	\</div><div class='del'>-	x(crc64,		1)	\</div><div class='del'>-	x(siphash,		2)</div><div class='del'>-</div><div class='del'>-enum bch_str_hash_opts {</div><div class='del'>-#define x(t, n) BCH_STR_HASH_OPT_##t = n,</div><div class='del'>-	BCH_STR_HASH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_STR_HASH_OPT_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_CSUM_TYPES()			\</div><div class='del'>-	x(none,				0)	\</div><div class='del'>-	x(crc32c_nonzero,		1)	\</div><div class='del'>-	x(crc64_nonzero,		2)	\</div><div class='del'>-	x(chacha20_poly1305_80,		3)	\</div><div class='del'>-	x(chacha20_poly1305_128,	4)	\</div><div class='del'>-	x(crc32c,			5)	\</div><div class='del'>-	x(crc64,			6)	\</div><div class='del'>-	x(xxhash,			7)</div><div class='del'>-</div><div class='del'>-enum bch_csum_type {</div><div class='del'>-#define x(t, n) BCH_CSUM_##t = n,</div><div class='del'>-	BCH_CSUM_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_CSUM_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const __maybe_unused unsigned bch_crc_bytes[] = {</div><div class='del'>-	[BCH_CSUM_none]				= 0,</div><div class='del'>-	[BCH_CSUM_crc32c_nonzero]		= 4,</div><div class='del'>-	[BCH_CSUM_crc32c]			= 4,</div><div class='del'>-	[BCH_CSUM_crc64_nonzero]		= 8,</div><div class='del'>-	[BCH_CSUM_crc64]			= 8,</div><div class='del'>-	[BCH_CSUM_xxhash]			= 8,</div><div class='del'>-	[BCH_CSUM_chacha20_poly1305_80]		= 10,</div><div class='del'>-	[BCH_CSUM_chacha20_poly1305_128]	= 16,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline _Bool bch2_csum_type_is_encryption(enum bch_csum_type type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_CSUM_chacha20_poly1305_80:</div><div class='del'>-	case BCH_CSUM_chacha20_poly1305_128:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_CSUM_OPTS()			\</div><div class='del'>-	x(none,			0)	\</div><div class='del'>-	x(crc32c,		1)	\</div><div class='del'>-	x(crc64,		2)	\</div><div class='del'>-	x(xxhash,		3)</div><div class='del'>-</div><div class='del'>-enum bch_csum_opts {</div><div class='del'>-#define x(t, n) BCH_CSUM_OPT_##t = n,</div><div class='del'>-	BCH_CSUM_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_CSUM_OPT_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_COMPRESSION_TYPES()		\</div><div class='del'>-	x(none,			0)	\</div><div class='del'>-	x(lz4_old,		1)	\</div><div class='del'>-	x(gzip,			2)	\</div><div class='del'>-	x(lz4,			3)	\</div><div class='del'>-	x(zstd,			4)	\</div><div class='del'>-	x(incompressible,	5)</div><div class='del'>-</div><div class='del'>-enum bch_compression_type {</div><div class='del'>-#define x(t, n) BCH_COMPRESSION_TYPE_##t = n,</div><div class='del'>-	BCH_COMPRESSION_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_COMPRESSION_TYPE_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_COMPRESSION_OPTS()		\</div><div class='del'>-	x(none,		0)		\</div><div class='del'>-	x(lz4,		1)		\</div><div class='del'>-	x(gzip,		2)		\</div><div class='del'>-	x(zstd,		3)</div><div class='del'>-</div><div class='del'>-enum bch_compression_opts {</div><div class='del'>-#define x(t, n) BCH_COMPRESSION_OPT_##t = n,</div><div class='del'>-	BCH_COMPRESSION_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_COMPRESSION_OPT_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Magic numbers</div><div class='del'>- *</div><div class='del'>- * The various other data structures have their own magic numbers, which are</div><div class='del'>- * xored with the first part of the cache set's UUID</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define BCACHE_MAGIC							\</div><div class='del'>-	UUID_INIT(0xc68573f6, 0x4e1a, 0x45ca,				\</div><div class='del'>-		  0x82, 0x65, 0xf5, 0x7f, 0x48, 0xba, 0x6d, 0x81)</div><div class='del'>-#define BCHFS_MAGIC							\</div><div class='del'>-	UUID_INIT(0xc68573f6, 0x66ce, 0x90a9,				\</div><div class='del'>-		  0xd9, 0x6a, 0x60, 0xcf, 0x80, 0x3d, 0xf7, 0xef)</div><div class='del'>-</div><div class='del'>-#define BCACHEFS_STATFS_MAGIC		0xca451a4e</div><div class='del'>-</div><div class='del'>-#define JSET_MAGIC		__cpu_to_le64(0x245235c1a3625032ULL)</div><div class='del'>-#define BSET_MAGIC		__cpu_to_le64(0x90135c78b99e07f5ULL)</div><div class='del'>-</div><div class='del'>-static inline __le64 __bch2_sb_magic(struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	__le64 ret;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;ret, &amp;sb-&gt;uuid, sizeof(ret));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u64 __jset_magic(struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	return __le64_to_cpu(__bch2_sb_magic(sb) ^ JSET_MAGIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u64 __bset_magic(struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	return __le64_to_cpu(__bch2_sb_magic(sb) ^ BSET_MAGIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Journal */</div><div class='del'>-</div><div class='del'>-#define JSET_KEYS_U64s	(sizeof(struct jset_entry) / sizeof(__u64))</div><div class='del'>-</div><div class='del'>-#define BCH_JSET_ENTRY_TYPES()			\</div><div class='del'>-	x(btree_keys,		0)		\</div><div class='del'>-	x(btree_root,		1)		\</div><div class='del'>-	x(prio_ptrs,		2)		\</div><div class='del'>-	x(blacklist,		3)		\</div><div class='del'>-	x(blacklist_v2,		4)		\</div><div class='del'>-	x(usage,		5)		\</div><div class='del'>-	x(data_usage,		6)		\</div><div class='del'>-	x(clock,		7)		\</div><div class='del'>-	x(dev_usage,		8)		\</div><div class='del'>-	x(log,			9)		\</div><div class='del'>-	x(overwrite,		10)		\</div><div class='del'>-	x(write_buffer_keys,	11)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-#define x(f, nr)	BCH_JSET_ENTRY_##f	= nr,</div><div class='del'>-	BCH_JSET_ENTRY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_JSET_ENTRY_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool jset_entry_is_key(struct jset_entry *e)</div><div class='del'>-{</div><div class='del'>-	switch (e-&gt;type) {</div><div class='del'>-	case BCH_JSET_ENTRY_btree_keys:</div><div class='del'>-	case BCH_JSET_ENTRY_btree_root:</div><div class='del'>-	case BCH_JSET_ENTRY_overwrite:</div><div class='del'>-	case BCH_JSET_ENTRY_write_buffer_keys:</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Journal sequence numbers can be blacklisted: bsets record the max sequence</div><div class='del'>- * number of all the journal entries they contain updates for, so that on</div><div class='del'>- * recovery we can ignore those bsets that contain index updates newer that what</div><div class='del'>- * made it into the journal.</div><div class='del'>- *</div><div class='del'>- * This means that we can't reuse that journal_seq - we have to skip it, and</div><div class='del'>- * then record that we skipped it so that the next time we crash and recover we</div><div class='del'>- * don't think there was a missing journal entry.</div><div class='del'>- */</div><div class='del'>-struct jset_entry_blacklist {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	__le64			seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct jset_entry_blacklist_v2 {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	__le64			start;</div><div class='del'>-	__le64			end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_FS_USAGE_TYPES()			\</div><div class='del'>-	x(reserved,		0)		\</div><div class='del'>-	x(inodes,		1)		\</div><div class='del'>-	x(key_version,		2)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-#define x(f, nr)	BCH_FS_USAGE_##f	= nr,</div><div class='del'>-	BCH_FS_USAGE_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_FS_USAGE_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct jset_entry_usage {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	__le64			v;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct jset_entry_data_usage {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	__le64			v;</div><div class='del'>-	struct bch_replicas_entry_v1 r;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct jset_entry_clock {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	__u8			rw;</div><div class='del'>-	__u8			pad[7];</div><div class='del'>-	__le64			time;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct jset_entry_dev_usage_type {</div><div class='del'>-	__le64			buckets;</div><div class='del'>-	__le64			sectors;</div><div class='del'>-	__le64			fragmented;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct jset_entry_dev_usage {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	__le32			dev;</div><div class='del'>-	__u32			pad;</div><div class='del'>-</div><div class='del'>-	__le64			_buckets_ec;		/* No longer used */</div><div class='del'>-	__le64			_buckets_unavailable;	/* No longer used */</div><div class='del'>-</div><div class='del'>-	struct jset_entry_dev_usage_type d[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline unsigned jset_entry_dev_usage_nr_types(struct jset_entry_dev_usage *u)</div><div class='del'>-{</div><div class='del'>-	return (vstruct_bytes(&amp;u-&gt;entry) - sizeof(struct jset_entry_dev_usage)) /</div><div class='del'>-		sizeof(struct jset_entry_dev_usage_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct jset_entry_log {</div><div class='del'>-	struct jset_entry	entry;</div><div class='del'>-	u8			d[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On disk format for a journal entry:</div><div class='del'>- * seq is monotonically increasing; every journal entry has its own unique</div><div class='del'>- * sequence number.</div><div class='del'>- *</div><div class='del'>- * last_seq is the oldest journal entry that still has keys the btree hasn't</div><div class='del'>- * flushed to disk yet.</div><div class='del'>- *</div><div class='del'>- * version is for on disk format changes.</div><div class='del'>- */</div><div class='del'>-struct jset {</div><div class='del'>-	struct bch_csum		csum;</div><div class='del'>-</div><div class='del'>-	__le64			magic;</div><div class='del'>-	__le64			seq;</div><div class='del'>-	__le32			version;</div><div class='del'>-	__le32			flags;</div><div class='del'>-</div><div class='del'>-	__le32			u64s; /* size of d[] in u64s */</div><div class='del'>-</div><div class='del'>-	__u8			encrypted_start[0];</div><div class='del'>-</div><div class='del'>-	__le16			_read_clock; /* no longer used */</div><div class='del'>-	__le16			_write_clock;</div><div class='del'>-</div><div class='del'>-	/* Sequence number of oldest dirty journal entry */</div><div class='del'>-	__le64			last_seq;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	struct jset_entry	start[0];</div><div class='del'>-	__u64			_data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(JSET_CSUM_TYPE,	struct jset, flags, 0, 4);</div><div class='del'>-LE32_BITMASK(JSET_BIG_ENDIAN,	struct jset, flags, 4, 5);</div><div class='del'>-LE32_BITMASK(JSET_NO_FLUSH,	struct jset, flags, 5, 6);</div><div class='del'>-</div><div class='del'>-#define BCH_JOURNAL_BUCKETS_MIN		8</div><div class='del'>-</div><div class='del'>-/* Btree: */</div><div class='del'>-</div><div class='del'>-enum btree_id_flags {</div><div class='del'>-	BTREE_ID_EXTENTS	= BIT(0),</div><div class='del'>-	BTREE_ID_SNAPSHOTS	= BIT(1),</div><div class='del'>-	BTREE_ID_SNAPSHOT_FIELD	= BIT(2),</div><div class='del'>-	BTREE_ID_DATA		= BIT(3),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_BTREE_IDS()								\</div><div class='del'>-	x(extents,		0,	BTREE_ID_EXTENTS|BTREE_ID_SNAPSHOTS|BTREE_ID_DATA,\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_whiteout)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_error)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_cookie)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_extent)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_reservation)|					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_reflink_p)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_inline_data))					\</div><div class='del'>-	x(inodes,		1,	BTREE_ID_SNAPSHOTS,			\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_whiteout)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_inode)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_inode_v2)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_inode_v3)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_inode_generation))					\</div><div class='del'>-	x(dirents,		2,	BTREE_ID_SNAPSHOTS,			\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_whiteout)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_hash_whiteout)|					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_dirent))						\</div><div class='del'>-	x(xattrs,		3,	BTREE_ID_SNAPSHOTS,			\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_whiteout)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_cookie)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_hash_whiteout)|					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_xattr))						\</div><div class='del'>-	x(alloc,		4,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_alloc)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_alloc_v2)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_alloc_v3)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_alloc_v4))						\</div><div class='del'>-	x(quotas,		5,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_quota))						\</div><div class='del'>-	x(stripes,		6,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_stripe))						\</div><div class='del'>-	x(reflink,		7,	BTREE_ID_EXTENTS|BTREE_ID_DATA,		\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_reflink_v)|						\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_indirect_inline_data))				\</div><div class='del'>-	x(subvolumes,		8,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_subvolume))						\</div><div class='del'>-	x(snapshots,		9,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_snapshot))						\</div><div class='del'>-	x(lru,			10,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_set))						\</div><div class='del'>-	x(freespace,		11,	BTREE_ID_EXTENTS,			\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_set))						\</div><div class='del'>-	x(need_discard,		12,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_set))						\</div><div class='del'>-	x(backpointers,		13,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_backpointer))					\</div><div class='del'>-	x(bucket_gens,		14,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_bucket_gens))					\</div><div class='del'>-	x(snapshot_trees,	15,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_snapshot_tree))					\</div><div class='del'>-	x(deleted_inodes,	16,	BTREE_ID_SNAPSHOT_FIELD,		\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_set))						\</div><div class='del'>-	x(logged_ops,		17,	0,					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_logged_op_truncate)|					\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_logged_op_finsert))					\</div><div class='del'>-	x(rebalance_work,	18,	BTREE_ID_SNAPSHOT_FIELD,		\</div><div class='del'>-	  BIT_ULL(KEY_TYPE_set)|BIT_ULL(KEY_TYPE_cookie))</div><div class='del'>-</div><div class='del'>-enum btree_id {</div><div class='del'>-#define x(name, nr, ...) BTREE_ID_##name = nr,</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	BTREE_ID_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BTREE_MAX_DEPTH		4U</div><div class='del'>-</div><div class='del'>-/* Btree nodes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Btree nodes</div><div class='del'>- *</div><div class='del'>- * On disk a btree node is a list/log of these; within each set the keys are</div><div class='del'>- * sorted</div><div class='del'>- */</div><div class='del'>-struct bset {</div><div class='del'>-	__le64			seq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Highest journal entry this bset contains keys for.</div><div class='del'>-	 * If on recovery we don't see that journal entry, this bset is ignored:</div><div class='del'>-	 * this allows us to preserve the order of all index updates after a</div><div class='del'>-	 * crash, since the journal records a total order of all index updates</div><div class='del'>-	 * and anything that didn't make it to the journal doesn't get used.</div><div class='del'>-	 */</div><div class='del'>-	__le64			journal_seq;</div><div class='del'>-</div><div class='del'>-	__le32			flags;</div><div class='del'>-	__le16			version;</div><div class='del'>-	__le16			u64s; /* count of d[] in u64s */</div><div class='del'>-</div><div class='del'>-	struct bkey_packed	start[0];</div><div class='del'>-	__u64			_data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(BSET_CSUM_TYPE,	struct bset, flags, 0, 4);</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(BSET_BIG_ENDIAN,	struct bset, flags, 4, 5);</div><div class='del'>-LE32_BITMASK(BSET_SEPARATE_WHITEOUTS,</div><div class='del'>-				struct bset, flags, 5, 6);</div><div class='del'>-</div><div class='del'>-/* Sector offset within the btree node: */</div><div class='del'>-LE32_BITMASK(BSET_OFFSET,	struct bset, flags, 16, 32);</div><div class='del'>-</div><div class='del'>-struct btree_node {</div><div class='del'>-	struct bch_csum		csum;</div><div class='del'>-	__le64			magic;</div><div class='del'>-</div><div class='del'>-	/* this flags field is encrypted, unlike bset-&gt;flags: */</div><div class='del'>-	__le64			flags;</div><div class='del'>-</div><div class='del'>-	/* Closed interval: */</div><div class='del'>-	struct bpos		min_key;</div><div class='del'>-	struct bpos		max_key;</div><div class='del'>-	struct bch_extent_ptr	_ptr; /* not used anymore */</div><div class='del'>-	struct bkey_format	format;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-	struct bset		keys;</div><div class='del'>-	struct {</div><div class='del'>-		__u8		pad[22];</div><div class='del'>-		__le16		u64s;</div><div class='del'>-		__u64		_data[0];</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-	};</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(BTREE_NODE_ID_LO,	struct btree_node, flags,  0,  4);</div><div class='del'>-LE64_BITMASK(BTREE_NODE_LEVEL,	struct btree_node, flags,  4,  8);</div><div class='del'>-LE64_BITMASK(BTREE_NODE_NEW_EXTENT_OVERWRITE,</div><div class='del'>-				struct btree_node, flags,  8,  9);</div><div class='del'>-LE64_BITMASK(BTREE_NODE_ID_HI,	struct btree_node, flags,  9, 25);</div><div class='del'>-/* 25-32 unused */</div><div class='del'>-LE64_BITMASK(BTREE_NODE_SEQ,	struct btree_node, flags, 32, 64);</div><div class='del'>-</div><div class='del'>-static inline __u64 BTREE_NODE_ID(struct btree_node *n)</div><div class='del'>-{</div><div class='del'>-	return BTREE_NODE_ID_LO(n) | (BTREE_NODE_ID_HI(n) &lt;&lt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void SET_BTREE_NODE_ID(struct btree_node *n, __u64 v)</div><div class='del'>-{</div><div class='del'>-	SET_BTREE_NODE_ID_LO(n, v);</div><div class='del'>-	SET_BTREE_NODE_ID_HI(n, v &gt;&gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_node_entry {</div><div class='del'>-	struct bch_csum		csum;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-	struct bset		keys;</div><div class='del'>-	struct {</div><div class='del'>-		__u8		pad[22];</div><div class='del'>-		__le16		u64s;</div><div class='del'>-		__u64		_data[0];</div><div class='del'>-	};</div><div class='del'>-	};</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/bcachefs_ioctl.h b/fs/bcachefs/bcachefs_ioctl.h<br/>deleted file mode 100644<br/>index 4b8fba754b1c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bcachefs_ioctl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bcachefs_ioctl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,412 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_IOCTL_H</div><div class='del'>-#define _BCACHEFS_IOCTL_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uuid.h&gt;</div><div class='del'>-#include &lt;asm/ioctl.h&gt;</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flags common to multiple ioctls:</div><div class='del'>- */</div><div class='del'>-#define BCH_FORCE_IF_DATA_LOST		(1 &lt;&lt; 0)</div><div class='del'>-#define BCH_FORCE_IF_METADATA_LOST	(1 &lt;&lt; 1)</div><div class='del'>-#define BCH_FORCE_IF_DATA_DEGRADED	(1 &lt;&lt; 2)</div><div class='del'>-#define BCH_FORCE_IF_METADATA_DEGRADED	(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#define BCH_FORCE_IF_LOST			\</div><div class='del'>-	(BCH_FORCE_IF_DATA_LOST|		\</div><div class='del'>-	 BCH_FORCE_IF_METADATA_LOST)</div><div class='del'>-#define BCH_FORCE_IF_DEGRADED			\</div><div class='del'>-	(BCH_FORCE_IF_DATA_DEGRADED|		\</div><div class='del'>-	 BCH_FORCE_IF_METADATA_DEGRADED)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If cleared, ioctl that refer to a device pass it as a pointer to a pathname</div><div class='del'>- * (e.g. /dev/sda1); if set, the dev field is the device's index within the</div><div class='del'>- * filesystem:</div><div class='del'>- */</div><div class='del'>-#define BCH_BY_INDEX			(1 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For BCH_IOCTL_READ_SUPER: get superblock of a specific device, not filesystem</div><div class='del'>- * wide superblock:</div><div class='del'>- */</div><div class='del'>-#define BCH_READ_DEV			(1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-/* global control dev: */</div><div class='del'>-</div><div class='del'>-/* These are currently broken, and probably unnecessary: */</div><div class='del'>-#if 0</div><div class='del'>-#define BCH_IOCTL_ASSEMBLE	_IOW(0xbc, 1, struct bch_ioctl_assemble)</div><div class='del'>-#define BCH_IOCTL_INCREMENTAL	_IOW(0xbc, 2, struct bch_ioctl_incremental)</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_assemble {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			nr_devs;</div><div class='del'>-	__u64			pad;</div><div class='del'>-	__u64			devs[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_incremental {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u64			pad;</div><div class='del'>-	__u64			dev;</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* filesystem ioctls: */</div><div class='del'>-</div><div class='del'>-#define BCH_IOCTL_QUERY_UUID	_IOR(0xbc,	1,  struct bch_ioctl_query_uuid)</div><div class='del'>-</div><div class='del'>-/* These only make sense when we also have incremental assembly */</div><div class='del'>-#if 0</div><div class='del'>-#define BCH_IOCTL_START		_IOW(0xbc,	2,  struct bch_ioctl_start)</div><div class='del'>-#define BCH_IOCTL_STOP		_IO(0xbc,	3)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BCH_IOCTL_DISK_ADD	_IOW(0xbc,	4,  struct bch_ioctl_disk)</div><div class='del'>-#define BCH_IOCTL_DISK_REMOVE	_IOW(0xbc,	5,  struct bch_ioctl_disk)</div><div class='del'>-#define BCH_IOCTL_DISK_ONLINE	_IOW(0xbc,	6,  struct bch_ioctl_disk)</div><div class='del'>-#define BCH_IOCTL_DISK_OFFLINE	_IOW(0xbc,	7,  struct bch_ioctl_disk)</div><div class='del'>-#define BCH_IOCTL_DISK_SET_STATE _IOW(0xbc,	8,  struct bch_ioctl_disk_set_state)</div><div class='del'>-#define BCH_IOCTL_DATA		_IOW(0xbc,	10, struct bch_ioctl_data)</div><div class='del'>-#define BCH_IOCTL_FS_USAGE	_IOWR(0xbc,	11, struct bch_ioctl_fs_usage)</div><div class='del'>-#define BCH_IOCTL_DEV_USAGE	_IOWR(0xbc,	11, struct bch_ioctl_dev_usage)</div><div class='del'>-#define BCH_IOCTL_READ_SUPER	_IOW(0xbc,	12, struct bch_ioctl_read_super)</div><div class='del'>-#define BCH_IOCTL_DISK_GET_IDX	_IOW(0xbc,	13,  struct bch_ioctl_disk_get_idx)</div><div class='del'>-#define BCH_IOCTL_DISK_RESIZE	_IOW(0xbc,	14,  struct bch_ioctl_disk_resize)</div><div class='del'>-#define BCH_IOCTL_DISK_RESIZE_JOURNAL _IOW(0xbc,15,  struct bch_ioctl_disk_resize_journal)</div><div class='del'>-</div><div class='del'>-#define BCH_IOCTL_SUBVOLUME_CREATE _IOW(0xbc,	16,  struct bch_ioctl_subvolume)</div><div class='del'>-#define BCH_IOCTL_SUBVOLUME_DESTROY _IOW(0xbc,	17,  struct bch_ioctl_subvolume)</div><div class='del'>-</div><div class='del'>-#define BCH_IOCTL_DEV_USAGE_V2	_IOWR(0xbc,	18, struct bch_ioctl_dev_usage_v2)</div><div class='del'>-</div><div class='del'>-#define BCH_IOCTL_FSCK_OFFLINE	_IOW(0xbc,	19,  struct bch_ioctl_fsck_offline)</div><div class='del'>-#define BCH_IOCTL_FSCK_ONLINE	_IOW(0xbc,	20,  struct bch_ioctl_fsck_online)</div><div class='del'>-</div><div class='del'>-/* ioctl below act on a particular file, not the filesystem as a whole: */</div><div class='del'>-</div><div class='del'>-#define BCHFS_IOC_REINHERIT_ATTRS	_IOR(0xbc, 64, const char __user *)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_QUERY_UUID: get filesystem UUID</div><div class='del'>- *</div><div class='del'>- * Returns user visible UUID, not internal UUID (which may not ever be changed);</div><div class='del'>- * the filesystem's sysfs directory may be found under /sys/fs/bcachefs with</div><div class='del'>- * this UUID.</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_query_uuid {</div><div class='del'>-	__uuid_t		uuid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-struct bch_ioctl_start {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			pad;</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_ADD: add a new device to an existing filesystem</div><div class='del'>- *</div><div class='del'>- * The specified device must not be open or in use. On success, the new device</div><div class='del'>- * will be an online member of the filesystem just like any other member.</div><div class='del'>- *</div><div class='del'>- * The device must first be prepared by userspace by formatting with a bcachefs</div><div class='del'>- * superblock, which is only used for passing in superblock options/parameters</div><div class='del'>- * for that device (in struct bch_member). The new device's superblock should</div><div class='del'>- * not claim to be a member of any existing filesystem - UUIDs on it will be</div><div class='del'>- * ignored.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_REMOVE: permanently remove a member device from a filesystem</div><div class='del'>- *</div><div class='del'>- * Any data present on @dev will be permanently deleted, and @dev will be</div><div class='del'>- * removed from its slot in the filesystem's list of member devices. The device</div><div class='del'>- * may be either offline or offline.</div><div class='del'>- *</div><div class='del'>- * Will fail removing @dev would leave us with insufficient read write devices</div><div class='del'>- * or degraded/unavailable data, unless the approprate BCH_FORCE_IF_* flags are</div><div class='del'>- * set.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_ONLINE: given a disk that is already a member of a filesystem</div><div class='del'>- * but is not open (e.g. because we started in degraded mode), bring it online</div><div class='del'>- *</div><div class='del'>- * all existing data on @dev will be available once the device is online,</div><div class='del'>- * exactly as if @dev was present when the filesystem was first mounted</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_OFFLINE: offline a disk, causing the kernel to close that</div><div class='del'>- * block device, without removing it from the filesystem (so it can be brought</div><div class='del'>- * back online later)</div><div class='del'>- *</div><div class='del'>- * Data present on @dev will be unavailable while @dev is offline (unless</div><div class='del'>- * replicated), but will still be intact and untouched if @dev is brought back</div><div class='del'>- * online</div><div class='del'>- *</div><div class='del'>- * Will fail (similarly to BCH_IOCTL_DISK_SET_STATE) if offlining @dev would</div><div class='del'>- * leave us with insufficient read write devices or degraded/unavailable data,</div><div class='del'>- * unless the approprate BCH_FORCE_IF_* flags are set.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_disk {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			pad;</div><div class='del'>-	__u64			dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_SET_STATE: modify state of a member device of a filesystem</div><div class='del'>- *</div><div class='del'>- * @new_state		- one of the bch_member_state states (rw, ro, failed,</div><div class='del'>- *			  spare)</div><div class='del'>- *</div><div class='del'>- * Will refuse to change member state if we would then have insufficient devices</div><div class='del'>- * to write to, or if it would result in degraded data (when @new_state is</div><div class='del'>- * failed or spare) unless the appropriate BCH_FORCE_IF_* flags are set.</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_disk_set_state {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u8			new_state;</div><div class='del'>-	__u8			pad[3];</div><div class='del'>-	__u64			dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_DATA_OPS()			\</div><div class='del'>-	x(scrub,		0)	\</div><div class='del'>-	x(rereplicate,		1)	\</div><div class='del'>-	x(migrate,		2)	\</div><div class='del'>-	x(rewrite_old_nodes,	3)	\</div><div class='del'>-	x(drop_extra_replicas,	4)</div><div class='del'>-</div><div class='del'>-enum bch_data_ops {</div><div class='del'>-#define x(t, n) BCH_DATA_OP_##t = n,</div><div class='del'>-	BCH_DATA_OPS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_DATA_OP_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DATA: operations that walk and manipulate filesystem data (e.g.</div><div class='del'>- * scrub, rereplicate, migrate).</div><div class='del'>- *</div><div class='del'>- * This ioctl kicks off a job in the background, and returns a file descriptor.</div><div class='del'>- * Reading from the file descriptor returns a struct bch_ioctl_data_event,</div><div class='del'>- * indicating current progress, and closing the file descriptor will stop the</div><div class='del'>- * job. The file descriptor is O_CLOEXEC.</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_data {</div><div class='del'>-	__u16			op;</div><div class='del'>-	__u8			start_btree;</div><div class='del'>-	__u8			end_btree;</div><div class='del'>-	__u32			flags;</div><div class='del'>-</div><div class='del'>-	struct bpos		start_pos;</div><div class='del'>-	struct bpos		end_pos;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-	struct {</div><div class='del'>-		__u32		dev;</div><div class='del'>-		__u32		pad;</div><div class='del'>-	}			migrate;</div><div class='del'>-	struct {</div><div class='del'>-		__u64		pad[8];</div><div class='del'>-	};</div><div class='del'>-	};</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-enum bch_data_event {</div><div class='del'>-	BCH_DATA_EVENT_PROGRESS	= 0,</div><div class='del'>-	/* XXX: add an event for reporting errors */</div><div class='del'>-	BCH_DATA_EVENT_NR	= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_data_progress {</div><div class='del'>-	__u8			data_type;</div><div class='del'>-	__u8			btree_id;</div><div class='del'>-	__u8			pad[2];</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-</div><div class='del'>-	__u64			sectors_done;</div><div class='del'>-	__u64			sectors_total;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_data_event {</div><div class='del'>-	__u8			type;</div><div class='del'>-	__u8			pad[7];</div><div class='del'>-	union {</div><div class='del'>-	struct bch_ioctl_data_progress p;</div><div class='del'>-	__u64			pad2[15];</div><div class='del'>-	};</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_replicas_usage {</div><div class='del'>-	__u64			sectors;</div><div class='del'>-	struct bch_replicas_entry_v1 r;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static inline struct bch_replicas_usage *</div><div class='del'>-replicas_usage_next(struct bch_replicas_usage *u)</div><div class='del'>-{</div><div class='del'>-	return (void *) u + replicas_entry_bytes(&amp;u-&gt;r) + 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_FS_USAGE: query filesystem disk space usage</div><div class='del'>- *</div><div class='del'>- * Returns disk space usage broken out by data type, number of replicas, and</div><div class='del'>- * by component device</div><div class='del'>- *</div><div class='del'>- * @replica_entries_bytes - size, in bytes, allocated for replica usage entries</div><div class='del'>- *</div><div class='del'>- * On success, @replica_entries_bytes will be changed to indicate the number of</div><div class='del'>- * bytes actually used.</div><div class='del'>- *</div><div class='del'>- * Returns -ERANGE if @replica_entries_bytes was too small</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_fs_usage {</div><div class='del'>-	__u64			capacity;</div><div class='del'>-	__u64			used;</div><div class='del'>-	__u64			online_reserved;</div><div class='del'>-	__u64			persistent_reserved[BCH_REPLICAS_MAX];</div><div class='del'>-</div><div class='del'>-	__u32			replica_entries_bytes;</div><div class='del'>-	__u32			pad;</div><div class='del'>-</div><div class='del'>-	struct bch_replicas_usage replicas[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DEV_USAGE: query device disk space usage</div><div class='del'>- *</div><div class='del'>- * Returns disk space usage broken out by data type - both by buckets and</div><div class='del'>- * sectors.</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_dev_usage {</div><div class='del'>-	__u64			dev;</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u8			state;</div><div class='del'>-	__u8			pad[7];</div><div class='del'>-</div><div class='del'>-	__u32			bucket_size;</div><div class='del'>-	__u64			nr_buckets;</div><div class='del'>-</div><div class='del'>-	__u64			buckets_ec;</div><div class='del'>-</div><div class='del'>-	struct bch_ioctl_dev_usage_type {</div><div class='del'>-		__u64		buckets;</div><div class='del'>-		__u64		sectors;</div><div class='del'>-		__u64		fragmented;</div><div class='del'>-	}			d[10];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_dev_usage_v2 {</div><div class='del'>-	__u64			dev;</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u8			state;</div><div class='del'>-	__u8			nr_data_types;</div><div class='del'>-	__u8			pad[6];</div><div class='del'>-</div><div class='del'>-	__u32			bucket_size;</div><div class='del'>-	__u64			nr_buckets;</div><div class='del'>-</div><div class='del'>-	struct bch_ioctl_dev_usage_type d[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_READ_SUPER: read filesystem superblock</div><div class='del'>- *</div><div class='del'>- * Equivalent to reading the superblock directly from the block device, except</div><div class='del'>- * avoids racing with the kernel writing the superblock or having to figure out</div><div class='del'>- * which block device to read</div><div class='del'>- *</div><div class='del'>- * @sb		- buffer to read into</div><div class='del'>- * @size	- size of userspace allocated buffer</div><div class='del'>- * @dev		- device to read superblock for, if BCH_READ_DEV flag is</div><div class='del'>- *		  specified</div><div class='del'>- *</div><div class='del'>- * Returns -ERANGE if buffer provided is too small</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_read_super {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			pad;</div><div class='del'>-	__u64			dev;</div><div class='del'>-	__u64			size;</div><div class='del'>-	__u64			sb;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_GET_IDX: give a path to a block device, query filesystem to</div><div class='del'>- * determine if disk is a (online) member - if so, returns device's index</div><div class='del'>- *</div><div class='del'>- * Returns -ENOENT if not found</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_disk_get_idx {</div><div class='del'>-	__u64			dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_RESIZE: resize filesystem on a device</div><div class='del'>- *</div><div class='del'>- * @dev		- member to resize</div><div class='del'>- * @nbuckets	- new number of buckets</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_disk_resize {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			pad;</div><div class='del'>-	__u64			dev;</div><div class='del'>-	__u64			nbuckets;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_DISK_RESIZE_JOURNAL: resize journal on a device</div><div class='del'>- *</div><div class='del'>- * @dev		- member to resize</div><div class='del'>- * @nbuckets	- new number of buckets</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_disk_resize_journal {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			pad;</div><div class='del'>-	__u64			dev;</div><div class='del'>-	__u64			nbuckets;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_ioctl_subvolume {</div><div class='del'>-	__u32			flags;</div><div class='del'>-	__u32			dirfd;</div><div class='del'>-	__u16			mode;</div><div class='del'>-	__u16			pad[3];</div><div class='del'>-	__u64			dst_ptr;</div><div class='del'>-	__u64			src_ptr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_SUBVOL_SNAPSHOT_CREATE	(1U &lt;&lt; 0)</div><div class='del'>-#define BCH_SUBVOL_SNAPSHOT_RO		(1U &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_FSCK_OFFLINE: run fsck from the 'bcachefs fsck' userspace command,</div><div class='del'>- * but with the kernel's implementation of fsck:</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_fsck_offline {</div><div class='del'>-	__u64			flags;</div><div class='del'>-	__u64			opts;		/* string */</div><div class='del'>-	__u64			nr_devs;</div><div class='del'>-	__u64			devs[] __counted_by(nr_devs);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_IOCTL_FSCK_ONLINE: run fsck from the 'bcachefs fsck' userspace command,</div><div class='del'>- * but with the kernel's implementation of fsck:</div><div class='del'>- */</div><div class='del'>-struct bch_ioctl_fsck_online {</div><div class='del'>-	__u64			flags;</div><div class='del'>-	__u64			opts;		/* string */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_IOCTL_H */</div><div class='head'>diff --git a/fs/bcachefs/bkey.c b/fs/bcachefs/bkey.c<br/>deleted file mode 100644<br/>index 76e79a15ba08..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1120 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "bkey_cmp.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-const struct bkey_format bch2_bkey_format_current = BKEY_FORMAT_CURRENT;</div><div class='del'>-</div><div class='del'>-void bch2_bkey_packed_to_binary_text(struct printbuf *out,</div><div class='del'>-				     const struct bkey_format *f,</div><div class='del'>-				     const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	const u64 *p = high_word(f, k);</div><div class='del'>-	unsigned word_bits = 64 - high_bit_offset;</div><div class='del'>-	unsigned nr_key_bits = bkey_format_key_bits(f) + high_bit_offset;</div><div class='del'>-	u64 v = *p &amp; (~0ULL &gt;&gt; high_bit_offset);</div><div class='del'>-</div><div class='del'>-	if (!nr_key_bits) {</div><div class='del'>-		prt_str(out, "(empty)");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		unsigned next_key_bits = nr_key_bits;</div><div class='del'>-</div><div class='del'>-		if (nr_key_bits &lt; 64) {</div><div class='del'>-			v &gt;&gt;= 64 - nr_key_bits;</div><div class='del'>-			next_key_bits = 0;</div><div class='del'>-		} else {</div><div class='del'>-			next_key_bits -= 64;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_prt_u64_base2_nbits(out, v, min(word_bits, nr_key_bits));</div><div class='del'>-</div><div class='del'>-		if (!next_key_bits)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		prt_char(out, ' ');</div><div class='del'>-</div><div class='del'>-		p = next_word(p);</div><div class='del'>-		v = *p;</div><div class='del'>-		word_bits = 64;</div><div class='del'>-		nr_key_bits = next_key_bits;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-</div><div class='del'>-static void bch2_bkey_pack_verify(const struct bkey_packed *packed,</div><div class='del'>-				  const struct bkey *unpacked,</div><div class='del'>-				  const struct bkey_format *format)</div><div class='del'>-{</div><div class='del'>-	struct bkey tmp;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bkeyp_val_u64s(format, packed) !=</div><div class='del'>-	       bkey_val_u64s(unpacked));</div><div class='del'>-</div><div class='del'>-	BUG_ON(packed-&gt;u64s &lt; bkeyp_key_u64s(format, packed));</div><div class='del'>-</div><div class='del'>-	tmp = __bch2_bkey_unpack_key(format, packed);</div><div class='del'>-</div><div class='del'>-	if (memcmp(&amp;tmp, unpacked, sizeof(struct bkey))) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "keys differ: format u64s %u fields %u %u %u %u %u\n",</div><div class='del'>-		      format-&gt;key_u64s,</div><div class='del'>-		      format-&gt;bits_per_field[0],</div><div class='del'>-		      format-&gt;bits_per_field[1],</div><div class='del'>-		      format-&gt;bits_per_field[2],</div><div class='del'>-		      format-&gt;bits_per_field[3],</div><div class='del'>-		      format-&gt;bits_per_field[4]);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "compiled unpack: ");</div><div class='del'>-		bch2_bkey_to_text(&amp;buf, unpacked);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "c unpack:        ");</div><div class='del'>-		bch2_bkey_to_text(&amp;buf, &amp;tmp);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "compiled unpack: ");</div><div class='del'>-		bch2_bkey_packed_to_binary_text(&amp;buf, &amp;bch2_bkey_format_current,</div><div class='del'>-						(struct bkey_packed *) unpacked);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "c unpack:        ");</div><div class='del'>-		bch2_bkey_packed_to_binary_text(&amp;buf, &amp;bch2_bkey_format_current,</div><div class='del'>-						(struct bkey_packed *) &amp;tmp);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		panic("%s", buf.buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_bkey_pack_verify(const struct bkey_packed *packed,</div><div class='del'>-					const struct bkey *unpacked,</div><div class='del'>-					const struct bkey_format *format) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct pack_state {</div><div class='del'>-	const struct bkey_format *format;</div><div class='del'>-	unsigned		bits;	/* bits remaining in current word */</div><div class='del'>-	u64			w;	/* current word */</div><div class='del'>-	u64			*p;	/* pointer to next word */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static struct pack_state pack_state_init(const struct bkey_format *format,</div><div class='del'>-					 struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	u64 *p = high_word(format, k);</div><div class='del'>-</div><div class='del'>-	return (struct pack_state) {</div><div class='del'>-		.format	= format,</div><div class='del'>-		.bits	= 64 - high_bit_offset,</div><div class='del'>-		.w	= 0,</div><div class='del'>-		.p	= p,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static void pack_state_finish(struct pack_state *state,</div><div class='del'>-			      struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(state-&gt;p &lt;  k-&gt;_data);</div><div class='del'>-	EBUG_ON(state-&gt;p &gt;= (u64 *) k-&gt;_data + state-&gt;format-&gt;key_u64s);</div><div class='del'>-</div><div class='del'>-	*state-&gt;p = state-&gt;w;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct unpack_state {</div><div class='del'>-	const struct bkey_format *format;</div><div class='del'>-	unsigned		bits;	/* bits remaining in current word */</div><div class='del'>-	u64			w;	/* current word */</div><div class='del'>-	const u64		*p;	/* pointer to next word */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static struct unpack_state unpack_state_init(const struct bkey_format *format,</div><div class='del'>-					     const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	const u64 *p = high_word(format, k);</div><div class='del'>-</div><div class='del'>-	return (struct unpack_state) {</div><div class='del'>-		.format	= format,</div><div class='del'>-		.bits	= 64 - high_bit_offset,</div><div class='del'>-		.w	= *p &lt;&lt; high_bit_offset,</div><div class='del'>-		.p	= p,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static u64 get_inc_field(struct unpack_state *state, unsigned field)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = state-&gt;format-&gt;bits_per_field[field];</div><div class='del'>-	u64 v = 0, offset = le64_to_cpu(state-&gt;format-&gt;field_offset[field]);</div><div class='del'>-</div><div class='del'>-	if (bits &gt;= state-&gt;bits) {</div><div class='del'>-		v = state-&gt;w &gt;&gt; (64 - bits);</div><div class='del'>-		bits -= state-&gt;bits;</div><div class='del'>-</div><div class='del'>-		state-&gt;p = next_word(state-&gt;p);</div><div class='del'>-		state-&gt;w = *state-&gt;p;</div><div class='del'>-		state-&gt;bits = 64;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* avoid shift by 64 if bits is 0 - bits is never 64 here: */</div><div class='del'>-	v |= (state-&gt;w &gt;&gt; 1) &gt;&gt; (63 - bits);</div><div class='del'>-	state-&gt;w &lt;&lt;= bits;</div><div class='del'>-	state-&gt;bits -= bits;</div><div class='del'>-</div><div class='del'>-	return v + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static void __set_inc_field(struct pack_state *state, unsigned field, u64 v)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = state-&gt;format-&gt;bits_per_field[field];</div><div class='del'>-</div><div class='del'>-	if (bits) {</div><div class='del'>-		if (bits &gt; state-&gt;bits) {</div><div class='del'>-			bits -= state-&gt;bits;</div><div class='del'>-			/* avoid shift by 64 if bits is 64 - bits is never 0 here: */</div><div class='del'>-			state-&gt;w |= (v &gt;&gt; 1) &gt;&gt; (bits - 1);</div><div class='del'>-</div><div class='del'>-			*state-&gt;p = state-&gt;w;</div><div class='del'>-			state-&gt;p = next_word(state-&gt;p);</div><div class='del'>-			state-&gt;w = 0;</div><div class='del'>-			state-&gt;bits = 64;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		state-&gt;bits -= bits;</div><div class='del'>-		state-&gt;w |= v &lt;&lt; state-&gt;bits;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static bool set_inc_field(struct pack_state *state, unsigned field, u64 v)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = state-&gt;format-&gt;bits_per_field[field];</div><div class='del'>-	u64 offset = le64_to_cpu(state-&gt;format-&gt;field_offset[field]);</div><div class='del'>-</div><div class='del'>-	if (v &lt; offset)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	v -= offset;</div><div class='del'>-</div><div class='del'>-	if (fls64(v) &gt; bits)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	__set_inc_field(state, field, v);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note: does NOT set out-&gt;format (we don't know what it should be here!)</div><div class='del'>- *</div><div class='del'>- * Also: doesn't work on extents - it doesn't preserve the invariant that</div><div class='del'>- * if k is packed bkey_start_pos(k) will successfully pack</div><div class='del'>- */</div><div class='del'>-static bool bch2_bkey_transform_key(const struct bkey_format *out_f,</div><div class='del'>-				   struct bkey_packed *out,</div><div class='del'>-				   const struct bkey_format *in_f,</div><div class='del'>-				   const struct bkey_packed *in)</div><div class='del'>-{</div><div class='del'>-	struct pack_state out_s = pack_state_init(out_f, out);</div><div class='del'>-	struct unpack_state in_s = unpack_state_init(in_f, in);</div><div class='del'>-	u64 *w = out-&gt;_data;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	*w = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BKEY_NR_FIELDS; i++)</div><div class='del'>-		if (!set_inc_field(&amp;out_s, i, get_inc_field(&amp;in_s, i)))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-	/* Can't happen because the val would be too big to unpack: */</div><div class='del'>-	EBUG_ON(in-&gt;u64s - in_f-&gt;key_u64s + out_f-&gt;key_u64s &gt; U8_MAX);</div><div class='del'>-</div><div class='del'>-	pack_state_finish(&amp;out_s, out);</div><div class='del'>-	out-&gt;u64s	= out_f-&gt;key_u64s + in-&gt;u64s - in_f-&gt;key_u64s;</div><div class='del'>-	out-&gt;needs_whiteout = in-&gt;needs_whiteout;</div><div class='del'>-	out-&gt;type	= in-&gt;type;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_transform(const struct bkey_format *out_f,</div><div class='del'>-			struct bkey_packed *out,</div><div class='del'>-			const struct bkey_format *in_f,</div><div class='del'>-			const struct bkey_packed *in)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_bkey_transform_key(out_f, out, in_f, in))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	memcpy_u64s((u64 *) out + out_f-&gt;key_u64s,</div><div class='del'>-		    (u64 *) in + in_f-&gt;key_u64s,</div><div class='del'>-		    (in-&gt;u64s - in_f-&gt;key_u64s));</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey __bch2_bkey_unpack_key(const struct bkey_format *format,</div><div class='del'>-			      const struct bkey_packed *in)</div><div class='del'>-{</div><div class='del'>-	struct unpack_state state = unpack_state_init(format, in);</div><div class='del'>-	struct bkey out;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(format-&gt;nr_fields != BKEY_NR_FIELDS);</div><div class='del'>-	EBUG_ON(in-&gt;u64s &lt; format-&gt;key_u64s);</div><div class='del'>-	EBUG_ON(in-&gt;format != KEY_FORMAT_LOCAL_BTREE);</div><div class='del'>-	EBUG_ON(in-&gt;u64s - format-&gt;key_u64s + BKEY_U64s &gt; U8_MAX);</div><div class='del'>-</div><div class='del'>-	out.u64s	= BKEY_U64s + in-&gt;u64s - format-&gt;key_u64s;</div><div class='del'>-	out.format	= KEY_FORMAT_CURRENT;</div><div class='del'>-	out.needs_whiteout = in-&gt;needs_whiteout;</div><div class='del'>-	out.type	= in-&gt;type;</div><div class='del'>-	out.pad[0]	= 0;</div><div class='del'>-</div><div class='del'>-#define x(id, field)	out.field = get_inc_field(&amp;state, id);</div><div class='del'>-	bkey_fields()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_BCACHEFS_COMPILED_UNPACK</div><div class='del'>-struct bpos __bkey_unpack_pos(const struct bkey_format *format,</div><div class='del'>-				     const struct bkey_packed *in)</div><div class='del'>-{</div><div class='del'>-	struct unpack_state state = unpack_state_init(format, in);</div><div class='del'>-	struct bpos out;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(format-&gt;nr_fields != BKEY_NR_FIELDS);</div><div class='del'>-	EBUG_ON(in-&gt;u64s &lt; format-&gt;key_u64s);</div><div class='del'>-	EBUG_ON(in-&gt;format != KEY_FORMAT_LOCAL_BTREE);</div><div class='del'>-</div><div class='del'>-	out.inode	= get_inc_field(&amp;state, BKEY_FIELD_INODE);</div><div class='del'>-	out.offset	= get_inc_field(&amp;state, BKEY_FIELD_OFFSET);</div><div class='del'>-	out.snapshot	= get_inc_field(&amp;state, BKEY_FIELD_SNAPSHOT);</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_bkey_pack_key -- pack just the key, not the value</div><div class='del'>- * @out:	packed result</div><div class='del'>- * @in:		key to pack</div><div class='del'>- * @format:	format of packed result</div><div class='del'>- *</div><div class='del'>- * Returns: true on success, false on failure</div><div class='del'>- */</div><div class='del'>-bool bch2_bkey_pack_key(struct bkey_packed *out, const struct bkey *in,</div><div class='del'>-			const struct bkey_format *format)</div><div class='del'>-{</div><div class='del'>-	struct pack_state state = pack_state_init(format, out);</div><div class='del'>-	u64 *w = out-&gt;_data;</div><div class='del'>-</div><div class='del'>-	EBUG_ON((void *) in == (void *) out);</div><div class='del'>-	EBUG_ON(format-&gt;nr_fields != BKEY_NR_FIELDS);</div><div class='del'>-	EBUG_ON(in-&gt;format != KEY_FORMAT_CURRENT);</div><div class='del'>-</div><div class='del'>-	*w = 0;</div><div class='del'>-</div><div class='del'>-#define x(id, field)	if (!set_inc_field(&amp;state, id, in-&gt;field)) return false;</div><div class='del'>-	bkey_fields()</div><div class='del'>-#undef x</div><div class='del'>-	pack_state_finish(&amp;state, out);</div><div class='del'>-	out-&gt;u64s	= format-&gt;key_u64s + in-&gt;u64s - BKEY_U64s;</div><div class='del'>-	out-&gt;format	= KEY_FORMAT_LOCAL_BTREE;</div><div class='del'>-	out-&gt;needs_whiteout = in-&gt;needs_whiteout;</div><div class='del'>-	out-&gt;type	= in-&gt;type;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_pack_verify(out, in, format);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_bkey_unpack -- unpack the key and the value</div><div class='del'>- * @b:		btree node of @src key (for packed format)</div><div class='del'>- * @dst:	unpacked result</div><div class='del'>- * @src:	packed input</div><div class='del'>- */</div><div class='del'>-void bch2_bkey_unpack(const struct btree *b, struct bkey_i *dst,</div><div class='del'>-		      const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	__bkey_unpack_key(b, &amp;dst-&gt;k, src);</div><div class='del'>-</div><div class='del'>-	memcpy_u64s(&amp;dst-&gt;v,</div><div class='del'>-		    bkeyp_val(&amp;b-&gt;format, src),</div><div class='del'>-		    bkeyp_val_u64s(&amp;b-&gt;format, src));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_bkey_pack -- pack the key and the value</div><div class='del'>- * @dst:	packed result</div><div class='del'>- * @src:	unpacked input</div><div class='del'>- * @format:	format of packed result</div><div class='del'>- *</div><div class='del'>- * Returns: true on success, false on failure</div><div class='del'>- */</div><div class='del'>-bool bch2_bkey_pack(struct bkey_packed *dst, const struct bkey_i *src,</div><div class='del'>-		    const struct bkey_format *format)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed tmp;</div><div class='del'>-</div><div class='del'>-	if (!bch2_bkey_pack_key(&amp;tmp, &amp;src-&gt;k, format))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	memmove_u64s((u64 *) dst + format-&gt;key_u64s,</div><div class='del'>-		     &amp;src-&gt;v,</div><div class='del'>-		     bkey_val_u64s(&amp;src-&gt;k));</div><div class='del'>-	memcpy_u64s_small(dst, &amp;tmp, format-&gt;key_u64s);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static bool set_inc_field_lossy(struct pack_state *state, unsigned field, u64 v)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = state-&gt;format-&gt;bits_per_field[field];</div><div class='del'>-	u64 offset = le64_to_cpu(state-&gt;format-&gt;field_offset[field]);</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(v &lt; offset);</div><div class='del'>-	v -= offset;</div><div class='del'>-</div><div class='del'>-	if (fls64(v) &gt; bits) {</div><div class='del'>-		v = ~(~0ULL &lt;&lt; bits);</div><div class='del'>-		ret = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__set_inc_field(state, field, v);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-static bool bkey_packed_successor(struct bkey_packed *out,</div><div class='del'>-				  const struct btree *b,</div><div class='del'>-				  struct bkey_packed k)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_format *f = &amp;b-&gt;format;</div><div class='del'>-	unsigned nr_key_bits = b-&gt;nr_key_bits;</div><div class='del'>-	unsigned first_bit, offset;</div><div class='del'>-	u64 *p;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(b-&gt;nr_key_bits != bkey_format_key_bits(f));</div><div class='del'>-</div><div class='del'>-	if (!nr_key_bits)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	*out = k;</div><div class='del'>-</div><div class='del'>-	first_bit = high_bit_offset + nr_key_bits - 1;</div><div class='del'>-	p = nth_word(high_word(f, out), first_bit &gt;&gt; 6);</div><div class='del'>-	offset = 63 - (first_bit &amp; 63);</div><div class='del'>-</div><div class='del'>-	while (nr_key_bits) {</div><div class='del'>-		unsigned bits = min(64 - offset, nr_key_bits);</div><div class='del'>-		u64 mask = (~0ULL &gt;&gt; (64 - bits)) &lt;&lt; offset;</div><div class='del'>-</div><div class='del'>-		if ((*p &amp; mask) != mask) {</div><div class='del'>-			*p += 1ULL &lt;&lt; offset;</div><div class='del'>-			EBUG_ON(bch2_bkey_cmp_packed(b, out, &amp;k) &lt;= 0);</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*p &amp;= ~mask;</div><div class='del'>-		p = prev_word(p);</div><div class='del'>-		nr_key_bits -= bits;</div><div class='del'>-		offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bkey_format_has_too_big_fields(const struct bkey_format *f)</div><div class='del'>-{</div><div class='del'>-	for (unsigned i = 0; i &lt; f-&gt;nr_fields; i++) {</div><div class='del'>-		unsigned unpacked_bits = bch2_bkey_format_current.bits_per_field[i];</div><div class='del'>-		u64 unpacked_max = ~((~0ULL &lt;&lt; 1) &lt;&lt; (unpacked_bits - 1));</div><div class='del'>-		u64 packed_max = f-&gt;bits_per_field[i]</div><div class='del'>-			? ~((~0ULL &lt;&lt; 1) &lt;&lt; (f-&gt;bits_per_field[i] - 1))</div><div class='del'>-			: 0;</div><div class='del'>-		u64 field_offset = le64_to_cpu(f-&gt;field_offset[i]);</div><div class='del'>-</div><div class='del'>-		if (packed_max + field_offset &lt; packed_max ||</div><div class='del'>-		    packed_max + field_offset &gt; unpacked_max)</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns a packed key that compares &lt;= in</div><div class='del'>- *</div><div class='del'>- * This is used in bset_search_tree(), where we need a packed pos in order to be</div><div class='del'>- * able to compare against the keys in the auxiliary search tree - and it's</div><div class='del'>- * legal to use a packed pos that isn't equivalent to the original pos,</div><div class='del'>- * _provided_ it compares &lt;= to the original pos.</div><div class='del'>- */</div><div class='del'>-enum bkey_pack_pos_ret bch2_bkey_pack_pos_lossy(struct bkey_packed *out,</div><div class='del'>-					   struct bpos in,</div><div class='del'>-					   const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_format *f = &amp;b-&gt;format;</div><div class='del'>-	struct pack_state state = pack_state_init(f, out);</div><div class='del'>-	u64 *w = out-&gt;_data;</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	struct bpos orig = in;</div><div class='del'>-#endif</div><div class='del'>-	bool exact = true;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * bch2_bkey_pack_key() will write to all of f-&gt;key_u64s, minus the 3</div><div class='del'>-	 * byte header, but pack_pos() won't if the len/version fields are big</div><div class='del'>-	 * enough - we need to make sure to zero them out:</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; f-&gt;key_u64s; i++)</div><div class='del'>-		w[i] = 0;</div><div class='del'>-</div><div class='del'>-	if (unlikely(in.snapshot &lt;</div><div class='del'>-		     le64_to_cpu(f-&gt;field_offset[BKEY_FIELD_SNAPSHOT]))) {</div><div class='del'>-		if (!in.offset-- &amp;&amp;</div><div class='del'>-		    !in.inode--)</div><div class='del'>-			return BKEY_PACK_POS_FAIL;</div><div class='del'>-		in.snapshot	= KEY_SNAPSHOT_MAX;</div><div class='del'>-		exact = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(in.offset &lt;</div><div class='del'>-		     le64_to_cpu(f-&gt;field_offset[BKEY_FIELD_OFFSET]))) {</div><div class='del'>-		if (!in.inode--)</div><div class='del'>-			return BKEY_PACK_POS_FAIL;</div><div class='del'>-		in.offset	= KEY_OFFSET_MAX;</div><div class='del'>-		in.snapshot	= KEY_SNAPSHOT_MAX;</div><div class='del'>-		exact = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(in.inode &lt;</div><div class='del'>-		     le64_to_cpu(f-&gt;field_offset[BKEY_FIELD_INODE])))</div><div class='del'>-		return BKEY_PACK_POS_FAIL;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!set_inc_field_lossy(&amp;state, BKEY_FIELD_INODE, in.inode))) {</div><div class='del'>-		in.offset	= KEY_OFFSET_MAX;</div><div class='del'>-		in.snapshot	= KEY_SNAPSHOT_MAX;</div><div class='del'>-		exact = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!set_inc_field_lossy(&amp;state, BKEY_FIELD_OFFSET, in.offset))) {</div><div class='del'>-		in.snapshot	= KEY_SNAPSHOT_MAX;</div><div class='del'>-		exact = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!set_inc_field_lossy(&amp;state, BKEY_FIELD_SNAPSHOT, in.snapshot)))</div><div class='del'>-		exact = false;</div><div class='del'>-</div><div class='del'>-	pack_state_finish(&amp;state, out);</div><div class='del'>-	out-&gt;u64s	= f-&gt;key_u64s;</div><div class='del'>-	out-&gt;format	= KEY_FORMAT_LOCAL_BTREE;</div><div class='del'>-	out-&gt;type	= KEY_TYPE_deleted;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	if (exact) {</div><div class='del'>-		BUG_ON(bkey_cmp_left_packed(b, out, &amp;orig));</div><div class='del'>-	} else {</div><div class='del'>-		struct bkey_packed successor;</div><div class='del'>-</div><div class='del'>-		BUG_ON(bkey_cmp_left_packed(b, out, &amp;orig) &gt;= 0);</div><div class='del'>-		BUG_ON(bkey_packed_successor(&amp;successor, b, *out) &amp;&amp;</div><div class='del'>-		       bkey_cmp_left_packed(b, &amp;successor, &amp;orig) &lt; 0 &amp;&amp;</div><div class='del'>-		       !bkey_format_has_too_big_fields(f));</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return exact ? BKEY_PACK_POS_EXACT : BKEY_PACK_POS_SMALLER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_format_init(struct bkey_format_state *s)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(s-&gt;field_min); i++)</div><div class='del'>-		s-&gt;field_min[i] = U64_MAX;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(s-&gt;field_max); i++)</div><div class='del'>-		s-&gt;field_max[i] = 0;</div><div class='del'>-</div><div class='del'>-	/* Make sure we can store a size of 0: */</div><div class='del'>-	s-&gt;field_min[BKEY_FIELD_SIZE] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_format_add_pos(struct bkey_format_state *s, struct bpos p)</div><div class='del'>-{</div><div class='del'>-	unsigned field = 0;</div><div class='del'>-</div><div class='del'>-	__bkey_format_add(s, field++, p.inode);</div><div class='del'>-	__bkey_format_add(s, field++, p.offset);</div><div class='del'>-	__bkey_format_add(s, field++, p.snapshot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We don't want it to be possible for the packed format to represent fields</div><div class='del'>- * bigger than a u64... that will cause confusion and issues (like with</div><div class='del'>- * bkey_packed_successor())</div><div class='del'>- */</div><div class='del'>-static void set_format_field(struct bkey_format *f, enum bch_bkey_fields i,</div><div class='del'>-			     unsigned bits, u64 offset)</div><div class='del'>-{</div><div class='del'>-	unsigned unpacked_bits = bch2_bkey_format_current.bits_per_field[i];</div><div class='del'>-	u64 unpacked_max = ~((~0ULL &lt;&lt; 1) &lt;&lt; (unpacked_bits - 1));</div><div class='del'>-</div><div class='del'>-	bits = min(bits, unpacked_bits);</div><div class='del'>-</div><div class='del'>-	offset = bits == unpacked_bits ? 0 : min(offset, unpacked_max - ((1ULL &lt;&lt; bits) - 1));</div><div class='del'>-</div><div class='del'>-	f-&gt;bits_per_field[i]	= bits;</div><div class='del'>-	f-&gt;field_offset[i]	= cpu_to_le64(offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_format bch2_bkey_format_done(struct bkey_format_state *s)</div><div class='del'>-{</div><div class='del'>-	unsigned i, bits = KEY_PACKED_BITS_START;</div><div class='del'>-	struct bkey_format ret = {</div><div class='del'>-		.nr_fields = BKEY_NR_FIELDS,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(s-&gt;field_min); i++) {</div><div class='del'>-		s-&gt;field_min[i] = min(s-&gt;field_min[i], s-&gt;field_max[i]);</div><div class='del'>-</div><div class='del'>-		set_format_field(&amp;ret, i,</div><div class='del'>-				 fls64(s-&gt;field_max[i] - s-&gt;field_min[i]),</div><div class='del'>-				 s-&gt;field_min[i]);</div><div class='del'>-</div><div class='del'>-		bits += ret.bits_per_field[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allow for extent merging: */</div><div class='del'>-	if (ret.bits_per_field[BKEY_FIELD_SIZE]) {</div><div class='del'>-		unsigned b = min(4U, 32U - ret.bits_per_field[BKEY_FIELD_SIZE]);</div><div class='del'>-</div><div class='del'>-		ret.bits_per_field[BKEY_FIELD_SIZE] += b;</div><div class='del'>-		bits += b;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret.key_u64s = DIV_ROUND_UP(bits, 64);</div><div class='del'>-</div><div class='del'>-	/* if we have enough spare bits, round fields up to nearest byte */</div><div class='del'>-	bits = ret.key_u64s * 64 - bits;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ret.bits_per_field); i++) {</div><div class='del'>-		unsigned r = round_up(ret.bits_per_field[i], 8) -</div><div class='del'>-			ret.bits_per_field[i];</div><div class='del'>-</div><div class='del'>-		if (r &lt;= bits) {</div><div class='del'>-			set_format_field(&amp;ret, i,</div><div class='del'>-					 ret.bits_per_field[i] + r,</div><div class='del'>-					 le64_to_cpu(ret.field_offset[i]));</div><div class='del'>-			bits -= r;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	{</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		BUG_ON(bch2_bkey_format_invalid(NULL, &amp;ret, 0, &amp;buf));</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_format_invalid(struct bch_fs *c,</div><div class='del'>-			     struct bkey_format *f,</div><div class='del'>-			     enum bkey_invalid_flags flags,</div><div class='del'>-			     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	unsigned i, bits = KEY_PACKED_BITS_START;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;nr_fields != BKEY_NR_FIELDS) {</div><div class='del'>-		prt_printf(err, "incorrect number of fields: got %u, should be %u",</div><div class='del'>-			   f-&gt;nr_fields, BKEY_NR_FIELDS);</div><div class='del'>-		return -BCH_ERR_invalid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Verify that the packed format can't represent fields larger than the</div><div class='del'>-	 * unpacked format:</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; f-&gt;nr_fields; i++) {</div><div class='del'>-		if (!c || c-&gt;sb.version_min &gt;= bcachefs_metadata_version_snapshot) {</div><div class='del'>-			unsigned unpacked_bits = bch2_bkey_format_current.bits_per_field[i];</div><div class='del'>-			u64 unpacked_max = ~((~0ULL &lt;&lt; 1) &lt;&lt; (unpacked_bits - 1));</div><div class='del'>-			u64 packed_max = f-&gt;bits_per_field[i]</div><div class='del'>-				? ~((~0ULL &lt;&lt; 1) &lt;&lt; (f-&gt;bits_per_field[i] - 1))</div><div class='del'>-				: 0;</div><div class='del'>-			u64 field_offset = le64_to_cpu(f-&gt;field_offset[i]);</div><div class='del'>-</div><div class='del'>-			if (packed_max + field_offset &lt; packed_max ||</div><div class='del'>-			    packed_max + field_offset &gt; unpacked_max) {</div><div class='del'>-				prt_printf(err, "field %u too large: %llu + %llu &gt; %llu",</div><div class='del'>-					   i, packed_max, field_offset, unpacked_max);</div><div class='del'>-				return -BCH_ERR_invalid;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bits += f-&gt;bits_per_field[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (f-&gt;key_u64s != DIV_ROUND_UP(bits, 64)) {</div><div class='del'>-		prt_printf(err, "incorrect key_u64s: got %u, should be %u",</div><div class='del'>-			   f-&gt;key_u64s, DIV_ROUND_UP(bits, 64));</div><div class='del'>-		return -BCH_ERR_invalid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_format_to_text(struct printbuf *out, const struct bkey_format *f)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "u64s %u fields ", f-&gt;key_u64s);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(f-&gt;bits_per_field); i++) {</div><div class='del'>-		if (i)</div><div class='del'>-			prt_str(out, ", ");</div><div class='del'>-		prt_printf(out, "%u:%llu",</div><div class='del'>-			   f-&gt;bits_per_field[i],</div><div class='del'>-			   le64_to_cpu(f-&gt;field_offset[i]));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Most significant differing bit</div><div class='del'>- * Bits are indexed from 0 - return is [0, nr_key_bits)</div><div class='del'>- */</div><div class='del'>-__pure</div><div class='del'>-unsigned bch2_bkey_greatest_differing_bit(const struct btree *b,</div><div class='del'>-					  const struct bkey_packed *l_k,</div><div class='del'>-					  const struct bkey_packed *r_k)</div><div class='del'>-{</div><div class='del'>-	const u64 *l = high_word(&amp;b-&gt;format, l_k);</div><div class='del'>-	const u64 *r = high_word(&amp;b-&gt;format, r_k);</div><div class='del'>-	unsigned nr_key_bits = b-&gt;nr_key_bits;</div><div class='del'>-	unsigned word_bits = 64 - high_bit_offset;</div><div class='del'>-	u64 l_v, r_v;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(b-&gt;nr_key_bits != bkey_format_key_bits(&amp;b-&gt;format));</div><div class='del'>-</div><div class='del'>-	/* for big endian, skip past header */</div><div class='del'>-	l_v = *l &amp; (~0ULL &gt;&gt; high_bit_offset);</div><div class='del'>-	r_v = *r &amp; (~0ULL &gt;&gt; high_bit_offset);</div><div class='del'>-</div><div class='del'>-	while (nr_key_bits) {</div><div class='del'>-		if (nr_key_bits &lt; word_bits) {</div><div class='del'>-			l_v &gt;&gt;= word_bits - nr_key_bits;</div><div class='del'>-			r_v &gt;&gt;= word_bits - nr_key_bits;</div><div class='del'>-			nr_key_bits = 0;</div><div class='del'>-		} else {</div><div class='del'>-			nr_key_bits -= word_bits;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (l_v != r_v)</div><div class='del'>-			return fls64(l_v ^ r_v) - 1 + nr_key_bits;</div><div class='del'>-</div><div class='del'>-		l = next_word(l);</div><div class='del'>-		r = next_word(r);</div><div class='del'>-</div><div class='del'>-		l_v = *l;</div><div class='del'>-		r_v = *r;</div><div class='del'>-		word_bits = 64;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * First set bit</div><div class='del'>- * Bits are indexed from 0 - return is [0, nr_key_bits)</div><div class='del'>- */</div><div class='del'>-__pure</div><div class='del'>-unsigned bch2_bkey_ffs(const struct btree *b, const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	const u64 *p = high_word(&amp;b-&gt;format, k);</div><div class='del'>-	unsigned nr_key_bits = b-&gt;nr_key_bits;</div><div class='del'>-	unsigned ret = 0, offset;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(b-&gt;nr_key_bits != bkey_format_key_bits(&amp;b-&gt;format));</div><div class='del'>-</div><div class='del'>-	offset = nr_key_bits;</div><div class='del'>-	while (offset &gt; 64) {</div><div class='del'>-		p = next_word(p);</div><div class='del'>-		offset -= 64;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	offset = 64 - offset;</div><div class='del'>-</div><div class='del'>-	while (nr_key_bits) {</div><div class='del'>-		unsigned bits = nr_key_bits + offset &lt; 64</div><div class='del'>-			? nr_key_bits</div><div class='del'>-			: 64 - offset;</div><div class='del'>-</div><div class='del'>-		u64 mask = (~0ULL &gt;&gt; (64 - bits)) &lt;&lt; offset;</div><div class='del'>-</div><div class='del'>-		if (*p &amp; mask)</div><div class='del'>-			return ret + __ffs64(*p &amp; mask) - offset;</div><div class='del'>-</div><div class='del'>-		p = prev_word(p);</div><div class='del'>-		nr_key_bits -= bits;</div><div class='del'>-		ret += bits;</div><div class='del'>-		offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_BCACHEFS_COMPILED_UNPACK</div><div class='del'>-</div><div class='del'>-#define I(_x)			(*(out)++ = (_x))</div><div class='del'>-#define I1(i0)						I(i0)</div><div class='del'>-#define I2(i0, i1)		(I1(i0),		I(i1))</div><div class='del'>-#define I3(i0, i1, i2)		(I2(i0, i1),		I(i2))</div><div class='del'>-#define I4(i0, i1, i2, i3)	(I3(i0, i1, i2),	I(i3))</div><div class='del'>-#define I5(i0, i1, i2, i3, i4)	(I4(i0, i1, i2, i3),	I(i4))</div><div class='del'>-</div><div class='del'>-static u8 *compile_bkey_field(const struct bkey_format *format, u8 *out,</div><div class='del'>-			      enum bch_bkey_fields field,</div><div class='del'>-			      unsigned dst_offset, unsigned dst_size,</div><div class='del'>-			      bool *eax_zeroed)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = format-&gt;bits_per_field[field];</div><div class='del'>-	u64 offset = le64_to_cpu(format-&gt;field_offset[field]);</div><div class='del'>-	unsigned i, byte, bit_offset, align, shl, shr;</div><div class='del'>-</div><div class='del'>-	if (!bits &amp;&amp; !offset) {</div><div class='del'>-		if (!*eax_zeroed) {</div><div class='del'>-			/* xor eax, eax */</div><div class='del'>-			I2(0x31, 0xc0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*eax_zeroed = true;</div><div class='del'>-		goto set_field;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bits) {</div><div class='del'>-		/* just return offset: */</div><div class='del'>-</div><div class='del'>-		switch (dst_size) {</div><div class='del'>-		case 8:</div><div class='del'>-			if (offset &gt; S32_MAX) {</div><div class='del'>-				/* mov [rdi + dst_offset], offset */</div><div class='del'>-				I3(0xc7, 0x47, dst_offset);</div><div class='del'>-				memcpy(out, &amp;offset, 4);</div><div class='del'>-				out += 4;</div><div class='del'>-</div><div class='del'>-				I3(0xc7, 0x47, dst_offset + 4);</div><div class='del'>-				memcpy(out, (void *) &amp;offset + 4, 4);</div><div class='del'>-				out += 4;</div><div class='del'>-			} else {</div><div class='del'>-				/* mov [rdi + dst_offset], offset */</div><div class='del'>-				/* sign extended */</div><div class='del'>-				I4(0x48, 0xc7, 0x47, dst_offset);</div><div class='del'>-				memcpy(out, &amp;offset, 4);</div><div class='del'>-				out += 4;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			/* mov [rdi + dst_offset], offset */</div><div class='del'>-			I3(0xc7, 0x47, dst_offset);</div><div class='del'>-			memcpy(out, &amp;offset, 4);</div><div class='del'>-			out += 4;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bit_offset = format-&gt;key_u64s * 64;</div><div class='del'>-	for (i = 0; i &lt;= field; i++)</div><div class='del'>-		bit_offset -= format-&gt;bits_per_field[i];</div><div class='del'>-</div><div class='del'>-	byte = bit_offset / 8;</div><div class='del'>-	bit_offset -= byte * 8;</div><div class='del'>-</div><div class='del'>-	*eax_zeroed = false;</div><div class='del'>-</div><div class='del'>-	if (bit_offset == 0 &amp;&amp; bits == 8) {</div><div class='del'>-		/* movzx eax, BYTE PTR [rsi + imm8] */</div><div class='del'>-		I4(0x0f, 0xb6, 0x46, byte);</div><div class='del'>-	} else if (bit_offset == 0 &amp;&amp; bits == 16) {</div><div class='del'>-		/* movzx eax, WORD PTR [rsi + imm8] */</div><div class='del'>-		I4(0x0f, 0xb7, 0x46, byte);</div><div class='del'>-	} else if (bit_offset + bits &lt;= 32) {</div><div class='del'>-		align = min(4 - DIV_ROUND_UP(bit_offset + bits, 8), byte &amp; 3);</div><div class='del'>-		byte -= align;</div><div class='del'>-		bit_offset += align * 8;</div><div class='del'>-</div><div class='del'>-		BUG_ON(bit_offset + bits &gt; 32);</div><div class='del'>-</div><div class='del'>-		/* mov eax, [rsi + imm8] */</div><div class='del'>-		I3(0x8b, 0x46, byte);</div><div class='del'>-</div><div class='del'>-		if (bit_offset) {</div><div class='del'>-			/* shr eax, imm8 */</div><div class='del'>-			I3(0xc1, 0xe8, bit_offset);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bit_offset + bits &lt; 32) {</div><div class='del'>-			unsigned mask = ~0U &gt;&gt; (32 - bits);</div><div class='del'>-</div><div class='del'>-			/* and eax, imm32 */</div><div class='del'>-			I1(0x25);</div><div class='del'>-			memcpy(out, &amp;mask, 4);</div><div class='del'>-			out += 4;</div><div class='del'>-		}</div><div class='del'>-	} else if (bit_offset + bits &lt;= 64) {</div><div class='del'>-		align = min(8 - DIV_ROUND_UP(bit_offset + bits, 8), byte &amp; 7);</div><div class='del'>-		byte -= align;</div><div class='del'>-		bit_offset += align * 8;</div><div class='del'>-</div><div class='del'>-		BUG_ON(bit_offset + bits &gt; 64);</div><div class='del'>-</div><div class='del'>-		/* mov rax, [rsi + imm8] */</div><div class='del'>-		I4(0x48, 0x8b, 0x46, byte);</div><div class='del'>-</div><div class='del'>-		shl = 64 - bit_offset - bits;</div><div class='del'>-		shr = bit_offset + shl;</div><div class='del'>-</div><div class='del'>-		if (shl) {</div><div class='del'>-			/* shl rax, imm8 */</div><div class='del'>-			I4(0x48, 0xc1, 0xe0, shl);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (shr) {</div><div class='del'>-			/* shr rax, imm8 */</div><div class='del'>-			I4(0x48, 0xc1, 0xe8, shr);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		align = min(4 - DIV_ROUND_UP(bit_offset + bits, 8), byte &amp; 3);</div><div class='del'>-		byte -= align;</div><div class='del'>-		bit_offset += align * 8;</div><div class='del'>-</div><div class='del'>-		BUG_ON(bit_offset + bits &gt; 96);</div><div class='del'>-</div><div class='del'>-		/* mov rax, [rsi + byte] */</div><div class='del'>-		I4(0x48, 0x8b, 0x46, byte);</div><div class='del'>-</div><div class='del'>-		/* mov edx, [rsi + byte + 8] */</div><div class='del'>-		I3(0x8b, 0x56, byte + 8);</div><div class='del'>-</div><div class='del'>-		/* bits from next word: */</div><div class='del'>-		shr = bit_offset + bits - 64;</div><div class='del'>-		BUG_ON(shr &gt; bit_offset);</div><div class='del'>-</div><div class='del'>-		/* shr rax, bit_offset */</div><div class='del'>-		I4(0x48, 0xc1, 0xe8, shr);</div><div class='del'>-</div><div class='del'>-		/* shl rdx, imm8 */</div><div class='del'>-		I4(0x48, 0xc1, 0xe2, 64 - shr);</div><div class='del'>-</div><div class='del'>-		/* or rax, rdx */</div><div class='del'>-		I3(0x48, 0x09, 0xd0);</div><div class='del'>-</div><div class='del'>-		shr = bit_offset - shr;</div><div class='del'>-</div><div class='del'>-		if (shr) {</div><div class='del'>-			/* shr rax, imm8 */</div><div class='del'>-			I4(0x48, 0xc1, 0xe8, shr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* rax += offset: */</div><div class='del'>-	if (offset &gt; S32_MAX) {</div><div class='del'>-		/* mov rdx, imm64 */</div><div class='del'>-		I2(0x48, 0xba);</div><div class='del'>-		memcpy(out, &amp;offset, 8);</div><div class='del'>-		out += 8;</div><div class='del'>-		/* add %rdx, %rax */</div><div class='del'>-		I3(0x48, 0x01, 0xd0);</div><div class='del'>-	} else if (offset + (~0ULL &gt;&gt; (64 - bits)) &gt; U32_MAX) {</div><div class='del'>-		/* add rax, imm32 */</div><div class='del'>-		I2(0x48, 0x05);</div><div class='del'>-		memcpy(out, &amp;offset, 4);</div><div class='del'>-		out += 4;</div><div class='del'>-	} else if (offset) {</div><div class='del'>-		/* add eax, imm32 */</div><div class='del'>-		I1(0x05);</div><div class='del'>-		memcpy(out, &amp;offset, 4);</div><div class='del'>-		out += 4;</div><div class='del'>-	}</div><div class='del'>-set_field:</div><div class='del'>-	switch (dst_size) {</div><div class='del'>-	case 8:</div><div class='del'>-		/* mov [rdi + dst_offset], rax */</div><div class='del'>-		I4(0x48, 0x89, 0x47, dst_offset);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		/* mov [rdi + dst_offset], eax */</div><div class='del'>-		I3(0x89, 0x47, dst_offset);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_compile_bkey_format(const struct bkey_format *format, void *_out)</div><div class='del'>-{</div><div class='del'>-	bool eax_zeroed = false;</div><div class='del'>-	u8 *out = _out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * rdi: dst - unpacked key</div><div class='del'>-	 * rsi: src - packed key</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* k-&gt;u64s, k-&gt;format, k-&gt;type */</div><div class='del'>-</div><div class='del'>-	/* mov eax, [rsi] */</div><div class='del'>-	I2(0x8b, 0x06);</div><div class='del'>-</div><div class='del'>-	/* add eax, BKEY_U64s - format-&gt;key_u64s */</div><div class='del'>-	I5(0x05, BKEY_U64s - format-&gt;key_u64s, KEY_FORMAT_CURRENT, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* and eax, imm32: mask out k-&gt;pad: */</div><div class='del'>-	I5(0x25, 0xff, 0xff, 0xff, 0);</div><div class='del'>-</div><div class='del'>-	/* mov [rdi], eax */</div><div class='del'>-	I2(0x89, 0x07);</div><div class='del'>-</div><div class='del'>-#define x(id, field)							\</div><div class='del'>-	out = compile_bkey_field(format, out, id,			\</div><div class='del'>-				 offsetof(struct bkey, field),		\</div><div class='del'>-				 sizeof(((struct bkey *) NULL)-&gt;field),	\</div><div class='del'>-				 &amp;eax_zeroed);</div><div class='del'>-	bkey_fields()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-	/* retq */</div><div class='del'>-	I1(0xc3);</div><div class='del'>-</div><div class='del'>-	return (void *) out - _out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-__pure</div><div class='del'>-int __bch2_bkey_cmp_packed_format_checked(const struct bkey_packed *l,</div><div class='del'>-					  const struct bkey_packed *r,</div><div class='del'>-					  const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_cmp_packed_format_checked_inlined(l, r, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__pure __flatten</div><div class='del'>-int __bch2_bkey_cmp_left_packed_format_checked(const struct btree *b,</div><div class='del'>-					       const struct bkey_packed *l,</div><div class='del'>-					       const struct bpos *r)</div><div class='del'>-{</div><div class='del'>-	return bpos_cmp(bkey_unpack_pos_format_checked(b, l), *r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__pure __flatten</div><div class='del'>-int bch2_bkey_cmp_packed(const struct btree *b,</div><div class='del'>-			 const struct bkey_packed *l,</div><div class='del'>-			 const struct bkey_packed *r)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_cmp_packed_inlined(b, l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__pure __flatten</div><div class='del'>-int __bch2_bkey_cmp_left_packed(const struct btree *b,</div><div class='del'>-				const struct bkey_packed *l,</div><div class='del'>-				const struct bpos *r)</div><div class='del'>-{</div><div class='del'>-	const struct bkey *l_unpacked;</div><div class='del'>-</div><div class='del'>-	return unlikely(l_unpacked = packed_to_bkey_c(l))</div><div class='del'>-		? bpos_cmp(l_unpacked-&gt;p, *r)</div><div class='del'>-		: __bch2_bkey_cmp_left_packed_format_checked(b, l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bpos_swab(struct bpos *p)</div><div class='del'>-{</div><div class='del'>-	u8 *l = (u8 *) p;</div><div class='del'>-	u8 *h = ((u8 *) &amp;p[1]) - 1;</div><div class='del'>-</div><div class='del'>-	while (l &lt; h) {</div><div class='del'>-		swap(*l, *h);</div><div class='del'>-		l++;</div><div class='del'>-		--h;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_swab_key(const struct bkey_format *_f, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_format *f = bkey_packed(k) ? _f : &amp;bch2_bkey_format_current;</div><div class='del'>-	u8 *l = k-&gt;key_start;</div><div class='del'>-	u8 *h = (u8 *) (k-&gt;_data + f-&gt;key_u64s) - 1;</div><div class='del'>-</div><div class='del'>-	while (l &lt; h) {</div><div class='del'>-		swap(*l, *h);</div><div class='del'>-		l++;</div><div class='del'>-		--h;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-void bch2_bkey_pack_test(void)</div><div class='del'>-{</div><div class='del'>-	struct bkey t = KEY(4134ULL, 1250629070527416633ULL, 0);</div><div class='del'>-	struct bkey_packed p;</div><div class='del'>-</div><div class='del'>-	struct bkey_format test_format = {</div><div class='del'>-		.key_u64s	= 3,</div><div class='del'>-		.nr_fields	= BKEY_NR_FIELDS,</div><div class='del'>-		.bits_per_field = {</div><div class='del'>-			13,</div><div class='del'>-			64,</div><div class='del'>-			32,</div><div class='del'>-		},</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct unpack_state in_s =</div><div class='del'>-		unpack_state_init(&amp;bch2_bkey_format_current, (void *) &amp;t);</div><div class='del'>-	struct pack_state out_s = pack_state_init(&amp;test_format, &amp;p);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; out_s.format-&gt;nr_fields; i++) {</div><div class='del'>-		u64 a, v = get_inc_field(&amp;in_s, i);</div><div class='del'>-</div><div class='del'>-		switch (i) {</div><div class='del'>-#define x(id, field)	case id: a = t.field; break;</div><div class='del'>-	bkey_fields()</div><div class='del'>-#undef x</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (a != v)</div><div class='del'>-			panic("got %llu actual %llu i %u\n", v, a, i);</div><div class='del'>-</div><div class='del'>-		if (!set_inc_field(&amp;out_s, i, v))</div><div class='del'>-			panic("failed at %u\n", i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bch2_bkey_pack_key(&amp;p, &amp;t, &amp;test_format));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/bcachefs/bkey.h b/fs/bcachefs/bkey.h<br/>deleted file mode 100644<br/>index 831be01809f2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,778 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BKEY_H</div><div class='del'>-#define _BCACHEFS_BKEY_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-#include "vstructs.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags {</div><div class='del'>-	BKEY_INVALID_WRITE		= (1U &lt;&lt; 0),</div><div class='del'>-	BKEY_INVALID_COMMIT		= (1U &lt;&lt; 1),</div><div class='del'>-	BKEY_INVALID_JOURNAL		= (1U &lt;&lt; 2),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * compiled unpack functions are disabled, pending a new interface for</div><div class='del'>- * dynamically allocating executable memory:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-#define HAVE_BCACHEFS_COMPILED_UNPACK	1</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_bkey_packed_to_binary_text(struct printbuf *,</div><div class='del'>-				     const struct bkey_format *,</div><div class='del'>-				     const struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-/* bkey with split value, const */</div><div class='del'>-struct bkey_s_c {</div><div class='del'>-	const struct bkey	*k;</div><div class='del'>-	const struct bch_val	*v;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bkey with split value */</div><div class='del'>-struct bkey_s {</div><div class='del'>-	union {</div><div class='del'>-	struct {</div><div class='del'>-		struct bkey	*k;</div><div class='del'>-		struct bch_val	*v;</div><div class='del'>-	};</div><div class='del'>-	struct bkey_s_c		s_c;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define bkey_p_next(_k)		vstruct_next(_k)</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bkey_next(struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_i *) ((u64 *) k-&gt;_data + k-&gt;k.u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_val_u64s(_k)	((_k)-&gt;u64s - BKEY_U64s)</div><div class='del'>-</div><div class='del'>-static inline size_t bkey_val_bytes(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return bkey_val_u64s(k) * sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_bkey_val_u64s(struct bkey *k, unsigned val_u64s)</div><div class='del'>-{</div><div class='del'>-	unsigned u64s = BKEY_U64s + val_u64s;</div><div class='del'>-</div><div class='del'>-	BUG_ON(u64s &gt; U8_MAX);</div><div class='del'>-	k-&gt;u64s = u64s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_bkey_val_bytes(struct bkey *k, unsigned bytes)</div><div class='del'>-{</div><div class='del'>-	set_bkey_val_u64s(k, DIV_ROUND_UP(bytes, sizeof(u64)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_val_end(_k)	((void *) (((u64 *) (_k).v) + bkey_val_u64s((_k).k)))</div><div class='del'>-</div><div class='del'>-#define bkey_deleted(_k)	((_k)-&gt;type == KEY_TYPE_deleted)</div><div class='del'>-</div><div class='del'>-#define bkey_whiteout(_k)				\</div><div class='del'>-	((_k)-&gt;type == KEY_TYPE_deleted || (_k)-&gt;type == KEY_TYPE_whiteout)</div><div class='del'>-</div><div class='del'>-enum bkey_lr_packed {</div><div class='del'>-	BKEY_PACKED_BOTH,</div><div class='del'>-	BKEY_PACKED_RIGHT,</div><div class='del'>-	BKEY_PACKED_LEFT,</div><div class='del'>-	BKEY_PACKED_NONE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define bkey_lr_packed(_l, _r)						\</div><div class='del'>-	((_l)-&gt;format + ((_r)-&gt;format &lt;&lt; 1))</div><div class='del'>-</div><div class='del'>-static inline void bkey_p_copy(struct bkey_packed *dst, const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	memcpy_u64s_small(dst, src, src-&gt;u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bkey_copy(struct bkey_i *dst, const struct bkey_i *src)</div><div class='del'>-{</div><div class='del'>-	memcpy_u64s_small(dst, src, src-&gt;k.u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree;</div><div class='del'>-</div><div class='del'>-__pure</div><div class='del'>-unsigned bch2_bkey_greatest_differing_bit(const struct btree *,</div><div class='del'>-					  const struct bkey_packed *,</div><div class='del'>-					  const struct bkey_packed *);</div><div class='del'>-__pure</div><div class='del'>-unsigned bch2_bkey_ffs(const struct btree *, const struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-__pure</div><div class='del'>-int __bch2_bkey_cmp_packed_format_checked(const struct bkey_packed *,</div><div class='del'>-				     const struct bkey_packed *,</div><div class='del'>-				     const struct btree *);</div><div class='del'>-</div><div class='del'>-__pure</div><div class='del'>-int __bch2_bkey_cmp_left_packed_format_checked(const struct btree *,</div><div class='del'>-					  const struct bkey_packed *,</div><div class='del'>-					  const struct bpos *);</div><div class='del'>-</div><div class='del'>-__pure</div><div class='del'>-int bch2_bkey_cmp_packed(const struct btree *,</div><div class='del'>-			 const struct bkey_packed *,</div><div class='del'>-			 const struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-__pure</div><div class='del'>-int __bch2_bkey_cmp_left_packed(const struct btree *,</div><div class='del'>-				const struct bkey_packed *,</div><div class='del'>-				const struct bpos *);</div><div class='del'>-</div><div class='del'>-static inline __pure</div><div class='del'>-int bkey_cmp_left_packed(const struct btree *b,</div><div class='del'>-			 const struct bkey_packed *l, const struct bpos *r)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_cmp_left_packed(b, l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The compiler generates better code when we pass bpos by ref, but it's often</div><div class='del'>- * enough terribly convenient to pass it by val... as much as I hate c++, const</div><div class='del'>- * ref would be nice here:</div><div class='del'>- */</div><div class='del'>-__pure __flatten</div><div class='del'>-static inline int bkey_cmp_left_packed_byval(const struct btree *b,</div><div class='del'>-					     const struct bkey_packed *l,</div><div class='del'>-					     struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bkey_cmp_left_packed(b, l, &amp;r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bpos_eq(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  !((l.inode	^ r.inode) |</div><div class='del'>-		  (l.offset	^ r.offset) |</div><div class='del'>-		  (l.snapshot	^ r.snapshot));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bpos_lt(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  l.inode	!= r.inode ? l.inode &lt; r.inode :</div><div class='del'>-		l.offset != r.offset ? l.offset &lt; r.offset :</div><div class='del'>-		l.snapshot != r.snapshot ? l.snapshot &lt; r.snapshot : false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bpos_le(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  l.inode	!= r.inode ? l.inode &lt; r.inode :</div><div class='del'>-		l.offset != r.offset ? l.offset &lt; r.offset :</div><div class='del'>-		l.snapshot != r.snapshot ? l.snapshot &lt; r.snapshot : true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bpos_gt(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bpos_lt(r, l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bpos_ge(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bpos_le(r, l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int bpos_cmp(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  cmp_int(l.inode,    r.inode) ?:</div><div class='del'>-		cmp_int(l.offset,   r.offset) ?:</div><div class='del'>-		cmp_int(l.snapshot, r.snapshot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bpos_min(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bpos_lt(l, r) ? l : r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bpos_max(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bpos_gt(l, r) ? l : r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bkey_eq(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  !((l.inode	^ r.inode) |</div><div class='del'>-		  (l.offset	^ r.offset));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bkey_lt(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  l.inode	!= r.inode</div><div class='del'>-		? l.inode &lt; r.inode</div><div class='del'>-		: l.offset &lt; r.offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bkey_le(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  l.inode	!= r.inode</div><div class='del'>-		? l.inode &lt; r.inode</div><div class='del'>-		: l.offset &lt;= r.offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bkey_gt(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bkey_lt(r, l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool bkey_ge(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bkey_le(r, l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int bkey_cmp(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return  cmp_int(l.inode,    r.inode) ?:</div><div class='del'>-		cmp_int(l.offset,   r.offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bkey_min(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bkey_lt(l, r) ? l : r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bkey_max(struct bpos l, struct bpos r)</div><div class='del'>-{</div><div class='del'>-	return bkey_gt(l, r) ? l : r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bpos_swab(struct bpos *);</div><div class='del'>-void bch2_bkey_swab_key(const struct bkey_format *, struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-static __always_inline int bversion_cmp(struct bversion l, struct bversion r)</div><div class='del'>-{</div><div class='del'>-	return  cmp_int(l.hi, r.hi) ?:</div><div class='del'>-		cmp_int(l.lo, r.lo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ZERO_VERSION	((struct bversion) { .hi = 0, .lo = 0 })</div><div class='del'>-#define MAX_VERSION	((struct bversion) { .hi = ~0, .lo = ~0ULL })</div><div class='del'>-</div><div class='del'>-static __always_inline int bversion_zero(struct bversion v)</div><div class='del'>-{</div><div class='del'>-	return !bversion_cmp(v, ZERO_VERSION);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-/* statement expressions confusing unlikely()? */</div><div class='del'>-#define bkey_packed(_k)							\</div><div class='del'>-	({ EBUG_ON((_k)-&gt;format &gt; KEY_FORMAT_CURRENT);			\</div><div class='del'>-	 (_k)-&gt;format != KEY_FORMAT_CURRENT; })</div><div class='del'>-#else</div><div class='del'>-#define bkey_packed(_k)		((_k)-&gt;format != KEY_FORMAT_CURRENT)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * It's safe to treat an unpacked bkey as a packed one, but not the reverse</div><div class='del'>- */</div><div class='del'>-static inline struct bkey_packed *bkey_to_packed(struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_packed *) k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline const struct bkey_packed *bkey_to_packed_c(const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return (const struct bkey_packed *) k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *packed_to_bkey(struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bkey_packed(k) ? NULL : (struct bkey_i *) k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline const struct bkey *packed_to_bkey_c(const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bkey_packed(k) ? NULL : (const struct bkey *) k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bkey_format_key_bits(const struct bkey_format *format)</div><div class='del'>-{</div><div class='del'>-	return format-&gt;bits_per_field[BKEY_FIELD_INODE] +</div><div class='del'>-		format-&gt;bits_per_field[BKEY_FIELD_OFFSET] +</div><div class='del'>-		format-&gt;bits_per_field[BKEY_FIELD_SNAPSHOT];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bpos_successor(struct bpos p)</div><div class='del'>-{</div><div class='del'>-	if (!++p.snapshot &amp;&amp;</div><div class='del'>-	    !++p.offset &amp;&amp;</div><div class='del'>-	    !++p.inode)</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bpos_predecessor(struct bpos p)</div><div class='del'>-{</div><div class='del'>-	if (!p.snapshot-- &amp;&amp;</div><div class='del'>-	    !p.offset-- &amp;&amp;</div><div class='del'>-	    !p.inode--)</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bpos_nosnap_successor(struct bpos p)</div><div class='del'>-{</div><div class='del'>-	p.snapshot = 0;</div><div class='del'>-</div><div class='del'>-	if (!++p.offset &amp;&amp;</div><div class='del'>-	    !++p.inode)</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bpos_nosnap_predecessor(struct bpos p)</div><div class='del'>-{</div><div class='del'>-	p.snapshot = 0;</div><div class='del'>-</div><div class='del'>-	if (!p.offset-- &amp;&amp;</div><div class='del'>-	    !p.inode--)</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 bkey_start_offset(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return k-&gt;p.offset - k-&gt;size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bkey_start_pos(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bpos) {</div><div class='del'>-		.inode		= k-&gt;p.inode,</div><div class='del'>-		.offset		= bkey_start_offset(k),</div><div class='del'>-		.snapshot	= k-&gt;p.snapshot,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Packed helpers */</div><div class='del'>-</div><div class='del'>-static inline unsigned bkeyp_key_u64s(const struct bkey_format *format,</div><div class='del'>-				      const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	unsigned ret = bkey_packed(k) ? format-&gt;key_u64s : BKEY_U64s;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(k-&gt;u64s &lt; ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bkeyp_key_bytes(const struct bkey_format *format,</div><div class='del'>-				       const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bkeyp_key_u64s(format, k) * sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bkeyp_val_u64s(const struct bkey_format *format,</div><div class='del'>-				      const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return k-&gt;u64s - bkeyp_key_u64s(format, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t bkeyp_val_bytes(const struct bkey_format *format,</div><div class='del'>-				     const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bkeyp_val_u64s(format, k) * sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_bkeyp_val_u64s(const struct bkey_format *format,</div><div class='del'>-				      struct bkey_packed *k, unsigned val_u64s)</div><div class='del'>-{</div><div class='del'>-	k-&gt;u64s = bkeyp_key_u64s(format, k) + val_u64s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkeyp_val(_format, _k)						\</div><div class='del'>-	 ((struct bch_val *) ((u64 *) (_k)-&gt;_data + bkeyp_key_u64s(_format, _k)))</div><div class='del'>-</div><div class='del'>-extern const struct bkey_format bch2_bkey_format_current;</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_transform(const struct bkey_format *,</div><div class='del'>-			 struct bkey_packed *,</div><div class='del'>-			 const struct bkey_format *,</div><div class='del'>-			 const struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-struct bkey __bch2_bkey_unpack_key(const struct bkey_format *,</div><div class='del'>-				   const struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_BCACHEFS_COMPILED_UNPACK</div><div class='del'>-struct bpos __bkey_unpack_pos(const struct bkey_format *,</div><div class='del'>-			      const struct bkey_packed *);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_pack_key(struct bkey_packed *, const struct bkey *,</div><div class='del'>-		   const struct bkey_format *);</div><div class='del'>-</div><div class='del'>-enum bkey_pack_pos_ret {</div><div class='del'>-	BKEY_PACK_POS_EXACT,</div><div class='del'>-	BKEY_PACK_POS_SMALLER,</div><div class='del'>-	BKEY_PACK_POS_FAIL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bkey_pack_pos_ret bch2_bkey_pack_pos_lossy(struct bkey_packed *, struct bpos,</div><div class='del'>-					   const struct btree *);</div><div class='del'>-</div><div class='del'>-static inline bool bkey_pack_pos(struct bkey_packed *out, struct bpos in,</div><div class='del'>-				 const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_pack_pos_lossy(out, in, b) == BKEY_PACK_POS_EXACT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_unpack(const struct btree *, struct bkey_i *,</div><div class='del'>-		 const struct bkey_packed *);</div><div class='del'>-bool bch2_bkey_pack(struct bkey_packed *, const struct bkey_i *,</div><div class='del'>-	       const struct bkey_format *);</div><div class='del'>-</div><div class='del'>-typedef void (*compiled_unpack_fn)(struct bkey *, const struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__bkey_unpack_key_format_checked(const struct btree *b,</div><div class='del'>-			       struct bkey *dst,</div><div class='del'>-			       const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(HAVE_BCACHEFS_COMPILED_UNPACK)) {</div><div class='del'>-		compiled_unpack_fn unpack_fn = b-&gt;aux_data;</div><div class='del'>-		unpack_fn(dst, src);</div><div class='del'>-</div><div class='del'>-		if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG) &amp;&amp;</div><div class='del'>-		    bch2_expensive_debug_checks) {</div><div class='del'>-			struct bkey dst2 = __bch2_bkey_unpack_key(&amp;b-&gt;format, src);</div><div class='del'>-</div><div class='del'>-			BUG_ON(memcmp(dst, &amp;dst2, sizeof(*dst)));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		*dst = __bch2_bkey_unpack_key(&amp;b-&gt;format, src);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey</div><div class='del'>-bkey_unpack_key_format_checked(const struct btree *b,</div><div class='del'>-			       const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	struct bkey dst;</div><div class='del'>-</div><div class='del'>-	__bkey_unpack_key_format_checked(b, &amp;dst, src);</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __bkey_unpack_key(const struct btree *b,</div><div class='del'>-				     struct bkey *dst,</div><div class='del'>-				     const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	if (likely(bkey_packed(src)))</div><div class='del'>-		__bkey_unpack_key_format_checked(b, dst, src);</div><div class='del'>-	else</div><div class='del'>-		*dst = *packed_to_bkey_c(src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bkey_unpack_key -- unpack just the key, not the value</div><div class='del'>- */</div><div class='del'>-static inline struct bkey bkey_unpack_key(const struct btree *b,</div><div class='del'>-					  const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	return likely(bkey_packed(src))</div><div class='del'>-		? bkey_unpack_key_format_checked(b, src)</div><div class='del'>-		: *packed_to_bkey_c(src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos</div><div class='del'>-bkey_unpack_pos_format_checked(const struct btree *b,</div><div class='del'>-			       const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_BCACHEFS_COMPILED_UNPACK</div><div class='del'>-	return bkey_unpack_key_format_checked(b, src).p;</div><div class='del'>-#else</div><div class='del'>-	return __bkey_unpack_pos(&amp;b-&gt;format, src);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bkey_unpack_pos(const struct btree *b,</div><div class='del'>-					  const struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	return likely(bkey_packed(src))</div><div class='del'>-		? bkey_unpack_pos_format_checked(b, src)</div><div class='del'>-		: packed_to_bkey_c(src)-&gt;p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Disassembled bkeys */</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bkey_disassemble(const struct btree *b,</div><div class='del'>-					       const struct bkey_packed *k,</div><div class='del'>-					       struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	__bkey_unpack_key(b, u, k);</div><div class='del'>-</div><div class='del'>-	return (struct bkey_s_c) { u, bkeyp_val(&amp;b-&gt;format, k), };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* non const version: */</div><div class='del'>-static inline struct bkey_s __bkey_disassemble(const struct btree *b,</div><div class='del'>-					       struct bkey_packed *k,</div><div class='del'>-					       struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	__bkey_unpack_key(b, u, k);</div><div class='del'>-</div><div class='del'>-	return (struct bkey_s) { .k = u, .v = bkeyp_val(&amp;b-&gt;format, k), };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 bkey_field_max(const struct bkey_format *f,</div><div class='del'>-				 enum bch_bkey_fields nr)</div><div class='del'>-{</div><div class='del'>-	return f-&gt;bits_per_field[nr] &lt; 64</div><div class='del'>-		? (le64_to_cpu(f-&gt;field_offset[nr]) +</div><div class='del'>-		   ~(~0ULL &lt;&lt; f-&gt;bits_per_field[nr]))</div><div class='del'>-		: U64_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_BCACHEFS_COMPILED_UNPACK</div><div class='del'>-</div><div class='del'>-int bch2_compile_bkey_format(const struct bkey_format *, void *);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int bch2_compile_bkey_format(const struct bkey_format *format,</div><div class='del'>-					  void *out) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void bkey_reassemble(struct bkey_i *dst,</div><div class='del'>-				   struct bkey_s_c src)</div><div class='del'>-{</div><div class='del'>-	dst-&gt;k = *src.k;</div><div class='del'>-	memcpy_u64s_small(&amp;dst-&gt;v, src.v, bkey_val_u64s(src.k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_s_null		((struct bkey_s)   { .k = NULL })</div><div class='del'>-#define bkey_s_c_null		((struct bkey_s_c) { .k = NULL })</div><div class='del'>-</div><div class='del'>-#define bkey_s_err(err)		((struct bkey_s)   { .k = ERR_PTR(err) })</div><div class='del'>-#define bkey_s_c_err(err)	((struct bkey_s_c) { .k = ERR_PTR(err) })</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s bkey_to_s(struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_s) { .k = k, .v = NULL };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bkey_to_s_c(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_s_c) { .k = k, .v = NULL };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s bkey_i_to_s(struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_s) { .k = &amp;k-&gt;k, .v = &amp;k-&gt;v };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bkey_i_to_s_c(const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_s_c) { .k = &amp;k-&gt;k, .v = &amp;k-&gt;v };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For a given type of value (e.g. struct bch_extent), generates the types for</div><div class='del'>- * bkey + bch_extent - inline, split, split const - and also all the conversion</div><div class='del'>- * functions, which also check that the value is of the correct type.</div><div class='del'>- *</div><div class='del'>- * We use anonymous unions for upcasting - e.g. converting from e.g. a</div><div class='del'>- * bkey_i_extent to a bkey_i - since that's always safe, instead of conversion</div><div class='del'>- * functions.</div><div class='del'>- */</div><div class='del'>-#define x(name, ...)					\</div><div class='del'>-struct bkey_i_##name {							\</div><div class='del'>-	union {								\</div><div class='del'>-		struct bkey		k;				\</div><div class='del'>-		struct bkey_i		k_i;				\</div><div class='del'>-	};								\</div><div class='del'>-	struct bch_##name		v;				\</div><div class='del'>-};									\</div><div class='del'>-									\</div><div class='del'>-struct bkey_s_c_##name {						\</div><div class='del'>-	union {								\</div><div class='del'>-	struct {							\</div><div class='del'>-		const struct bkey	*k;				\</div><div class='del'>-		const struct bch_##name	*v;				\</div><div class='del'>-	};								\</div><div class='del'>-	struct bkey_s_c			s_c;				\</div><div class='del'>-	};								\</div><div class='del'>-};									\</div><div class='del'>-									\</div><div class='del'>-struct bkey_s_##name {							\</div><div class='del'>-	union {								\</div><div class='del'>-	struct {							\</div><div class='del'>-		struct bkey		*k;				\</div><div class='del'>-		struct bch_##name	*v;				\</div><div class='del'>-	};								\</div><div class='del'>-	struct bkey_s_c_##name		c;				\</div><div class='del'>-	struct bkey_s			s;				\</div><div class='del'>-	struct bkey_s_c			s_c;				\</div><div class='del'>-	};								\</div><div class='del'>-};									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_i_##name *bkey_i_to_##name(struct bkey_i *k)	\</div><div class='del'>-{									\</div><div class='del'>-	EBUG_ON(!IS_ERR_OR_NULL(k) &amp;&amp; k-&gt;k.type != KEY_TYPE_##name);	\</div><div class='del'>-	return container_of(&amp;k-&gt;k, struct bkey_i_##name, k);		\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline const struct bkey_i_##name *				\</div><div class='del'>-bkey_i_to_##name##_c(const struct bkey_i *k)				\</div><div class='del'>-{									\</div><div class='del'>-	EBUG_ON(!IS_ERR_OR_NULL(k) &amp;&amp; k-&gt;k.type != KEY_TYPE_##name);	\</div><div class='del'>-	return container_of(&amp;k-&gt;k, struct bkey_i_##name, k);		\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_s_##name bkey_s_to_##name(struct bkey_s k)	\</div><div class='del'>-{									\</div><div class='del'>-	EBUG_ON(!IS_ERR_OR_NULL(k.k) &amp;&amp; k.k-&gt;type != KEY_TYPE_##name);	\</div><div class='del'>-	return (struct bkey_s_##name) {					\</div><div class='del'>-		.k = k.k,						\</div><div class='del'>-		.v = container_of(k.v, struct bch_##name, v),		\</div><div class='del'>-	};								\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_s_c_##name bkey_s_c_to_##name(struct bkey_s_c k)\</div><div class='del'>-{									\</div><div class='del'>-	EBUG_ON(!IS_ERR_OR_NULL(k.k) &amp;&amp; k.k-&gt;type != KEY_TYPE_##name);	\</div><div class='del'>-	return (struct bkey_s_c_##name) {				\</div><div class='del'>-		.k = k.k,						\</div><div class='del'>-		.v = container_of(k.v, struct bch_##name, v),		\</div><div class='del'>-	};								\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_s_##name name##_i_to_s(struct bkey_i_##name *k)\</div><div class='del'>-{									\</div><div class='del'>-	return (struct bkey_s_##name) {					\</div><div class='del'>-		.k = &amp;k-&gt;k,						\</div><div class='del'>-		.v = &amp;k-&gt;v,						\</div><div class='del'>-	};								\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_s_c_##name					\</div><div class='del'>-name##_i_to_s_c(const struct bkey_i_##name *k)				\</div><div class='del'>-{									\</div><div class='del'>-	return (struct bkey_s_c_##name) {				\</div><div class='del'>-		.k = &amp;k-&gt;k,						\</div><div class='del'>-		.v = &amp;k-&gt;v,						\</div><div class='del'>-	};								\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_s_##name bkey_i_to_s_##name(struct bkey_i *k)	\</div><div class='del'>-{									\</div><div class='del'>-	EBUG_ON(!IS_ERR_OR_NULL(k) &amp;&amp; k-&gt;k.type != KEY_TYPE_##name);	\</div><div class='del'>-	return (struct bkey_s_##name) {					\</div><div class='del'>-		.k = &amp;k-&gt;k,						\</div><div class='del'>-		.v = container_of(&amp;k-&gt;v, struct bch_##name, v),		\</div><div class='del'>-	};								\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_s_c_##name					\</div><div class='del'>-bkey_i_to_s_c_##name(const struct bkey_i *k)				\</div><div class='del'>-{									\</div><div class='del'>-	EBUG_ON(!IS_ERR_OR_NULL(k) &amp;&amp; k-&gt;k.type != KEY_TYPE_##name);	\</div><div class='del'>-	return (struct bkey_s_c_##name) {				\</div><div class='del'>-		.k = &amp;k-&gt;k,						\</div><div class='del'>-		.v = container_of(&amp;k-&gt;v, struct bch_##name, v),		\</div><div class='del'>-	};								\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline struct bkey_i_##name *bkey_##name##_init(struct bkey_i *_k)\</div><div class='del'>-{									\</div><div class='del'>-	struct bkey_i_##name *k =					\</div><div class='del'>-		container_of(&amp;_k-&gt;k, struct bkey_i_##name, k);		\</div><div class='del'>-									\</div><div class='del'>-	bkey_init(&amp;k-&gt;k);						\</div><div class='del'>-	memset(&amp;k-&gt;v, 0, sizeof(k-&gt;v));					\</div><div class='del'>-	k-&gt;k.type = KEY_TYPE_##name;					\</div><div class='del'>-	set_bkey_val_bytes(&amp;k-&gt;k, sizeof(k-&gt;v));			\</div><div class='del'>-									\</div><div class='del'>-	return k;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BCH_BKEY_TYPES();</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-/* byte order helpers */</div><div class='del'>-</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-</div><div class='del'>-static inline unsigned high_word_offset(const struct bkey_format *f)</div><div class='del'>-{</div><div class='del'>-	return f-&gt;key_u64s - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define high_bit_offset		0</div><div class='del'>-#define nth_word(p, n)		((p) - (n))</div><div class='del'>-</div><div class='del'>-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__</div><div class='del'>-</div><div class='del'>-static inline unsigned high_word_offset(const struct bkey_format *f)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define high_bit_offset		KEY_PACKED_BITS_START</div><div class='del'>-#define nth_word(p, n)		((p) + (n))</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#error edit for your odd byteorder.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define high_word(f, k)		((u64 *) (k)-&gt;_data + high_word_offset(f))</div><div class='del'>-#define next_word(p)		nth_word(p, 1)</div><div class='del'>-#define prev_word(p)		nth_word(p, -1)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-void bch2_bkey_pack_test(void);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_bkey_pack_test(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define bkey_fields()							\</div><div class='del'>-	x(BKEY_FIELD_INODE,		p.inode)			\</div><div class='del'>-	x(BKEY_FIELD_OFFSET,		p.offset)			\</div><div class='del'>-	x(BKEY_FIELD_SNAPSHOT,		p.snapshot)			\</div><div class='del'>-	x(BKEY_FIELD_SIZE,		size)				\</div><div class='del'>-	x(BKEY_FIELD_VERSION_HI,	version.hi)			\</div><div class='del'>-	x(BKEY_FIELD_VERSION_LO,	version.lo)</div><div class='del'>-</div><div class='del'>-struct bkey_format_state {</div><div class='del'>-	u64 field_min[BKEY_NR_FIELDS];</div><div class='del'>-	u64 field_max[BKEY_NR_FIELDS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_bkey_format_init(struct bkey_format_state *);</div><div class='del'>-</div><div class='del'>-static inline void __bkey_format_add(struct bkey_format_state *s, unsigned field, u64 v)</div><div class='del'>-{</div><div class='del'>-	s-&gt;field_min[field] = min(s-&gt;field_min[field], v);</div><div class='del'>-	s-&gt;field_max[field] = max(s-&gt;field_max[field], v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Changes @format so that @k can be successfully packed with @format</div><div class='del'>- */</div><div class='del'>-static inline void bch2_bkey_format_add_key(struct bkey_format_state *s, const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-#define x(id, field) __bkey_format_add(s, id, k-&gt;field);</div><div class='del'>-	bkey_fields()</div><div class='del'>-#undef x</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_format_add_pos(struct bkey_format_state *, struct bpos);</div><div class='del'>-struct bkey_format bch2_bkey_format_done(struct bkey_format_state *);</div><div class='del'>-int bch2_bkey_format_invalid(struct bch_fs *, struct bkey_format *,</div><div class='del'>-			     enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_bkey_format_to_text(struct printbuf *, const struct bkey_format *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BKEY_H */</div><div class='head'>diff --git a/fs/bcachefs/bkey_buf.h b/fs/bcachefs/bkey_buf.h<br/>deleted file mode 100644<br/>index a30c4ae8eb36..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey_buf.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_buf.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BKEY_BUF_H</div><div class='del'>-#define _BCACHEFS_BKEY_BUF_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey.h"</div><div class='del'>-</div><div class='del'>-struct bkey_buf {</div><div class='del'>-	struct bkey_i	*k;</div><div class='del'>-	u64		onstack[12];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_buf_realloc(struct bkey_buf *s,</div><div class='del'>-					 struct bch_fs *c, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;k == (void *) s-&gt;onstack &amp;&amp;</div><div class='del'>-	    u64s &gt; ARRAY_SIZE(s-&gt;onstack)) {</div><div class='del'>-		s-&gt;k = mempool_alloc(&amp;c-&gt;large_bkey_pool, GFP_NOFS);</div><div class='del'>-		memcpy(s-&gt;k, s-&gt;onstack, sizeof(s-&gt;onstack));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_buf_reassemble(struct bkey_buf *s,</div><div class='del'>-					    struct bch_fs *c,</div><div class='del'>-					    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	bch2_bkey_buf_realloc(s, c, k.k-&gt;u64s);</div><div class='del'>-	bkey_reassemble(s-&gt;k, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_buf_copy(struct bkey_buf *s,</div><div class='del'>-				      struct bch_fs *c,</div><div class='del'>-				      struct bkey_i *src)</div><div class='del'>-{</div><div class='del'>-	bch2_bkey_buf_realloc(s, c, src-&gt;k.u64s);</div><div class='del'>-	bkey_copy(s-&gt;k, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_buf_unpack(struct bkey_buf *s,</div><div class='del'>-					struct bch_fs *c,</div><div class='del'>-					struct btree *b,</div><div class='del'>-					struct bkey_packed *src)</div><div class='del'>-{</div><div class='del'>-	bch2_bkey_buf_realloc(s, c, BKEY_U64s +</div><div class='del'>-			      bkeyp_val_u64s(&amp;b-&gt;format, src));</div><div class='del'>-	bch2_bkey_unpack(b, s-&gt;k, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_buf_init(struct bkey_buf *s)</div><div class='del'>-{</div><div class='del'>-	s-&gt;k = (void *) s-&gt;onstack;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_buf_exit(struct bkey_buf *s, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;k != (void *) s-&gt;onstack)</div><div class='del'>-		mempool_free(s-&gt;k, &amp;c-&gt;large_bkey_pool);</div><div class='del'>-	s-&gt;k = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BKEY_BUF_H */</div><div class='head'>diff --git a/fs/bcachefs/bkey_cmp.h b/fs/bcachefs/bkey_cmp.h<br/>deleted file mode 100644<br/>index 5f42a6e69360..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey_cmp.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_cmp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,129 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BKEY_CMP_H</div><div class='del'>-#define _BCACHEFS_BKEY_CMP_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-static inline int __bkey_cmp_bits(const u64 *l, const u64 *r,</div><div class='del'>-				  unsigned nr_key_bits)</div><div class='del'>-{</div><div class='del'>-	long d0, d1, d2, d3;</div><div class='del'>-	int cmp;</div><div class='del'>-</div><div class='del'>-	/* we shouldn't need asm for this, but gcc is being retarded: */</div><div class='del'>-</div><div class='del'>-	asm(".intel_syntax noprefix;"</div><div class='del'>-	    "xor eax, eax;"</div><div class='del'>-	    "xor edx, edx;"</div><div class='del'>-	    "1:;"</div><div class='del'>-	    "mov r8, [rdi];"</div><div class='del'>-	    "mov r9, [rsi];"</div><div class='del'>-	    "sub ecx, 64;"</div><div class='del'>-	    "jl 2f;"</div><div class='del'>-</div><div class='del'>-	    "cmp r8, r9;"</div><div class='del'>-	    "jnz 3f;"</div><div class='del'>-</div><div class='del'>-	    "lea rdi, [rdi - 8];"</div><div class='del'>-	    "lea rsi, [rsi - 8];"</div><div class='del'>-	    "jmp 1b;"</div><div class='del'>-</div><div class='del'>-	    "2:;"</div><div class='del'>-	    "not ecx;"</div><div class='del'>-	    "shr r8, 1;"</div><div class='del'>-	    "shr r9, 1;"</div><div class='del'>-	    "shr r8, cl;"</div><div class='del'>-	    "shr r9, cl;"</div><div class='del'>-	    "cmp r8, r9;"</div><div class='del'>-</div><div class='del'>-	    "3:\n"</div><div class='del'>-	    "seta al;"</div><div class='del'>-	    "setb dl;"</div><div class='del'>-	    "sub eax, edx;"</div><div class='del'>-	    ".att_syntax prefix;"</div><div class='del'>-	    : "=&amp;D" (d0), "=&amp;S" (d1), "=&amp;d" (d2), "=&amp;c" (d3), "=&amp;a" (cmp)</div><div class='del'>-	    : "0" (l), "1" (r), "3" (nr_key_bits)</div><div class='del'>-	    : "r8", "r9", "cc", "memory");</div><div class='del'>-</div><div class='del'>-	return cmp;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int __bkey_cmp_bits(const u64 *l, const u64 *r,</div><div class='del'>-				  unsigned nr_key_bits)</div><div class='del'>-{</div><div class='del'>-	u64 l_v, r_v;</div><div class='del'>-</div><div class='del'>-	if (!nr_key_bits)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* for big endian, skip past header */</div><div class='del'>-	nr_key_bits += high_bit_offset;</div><div class='del'>-	l_v = *l &amp; (~0ULL &gt;&gt; high_bit_offset);</div><div class='del'>-	r_v = *r &amp; (~0ULL &gt;&gt; high_bit_offset);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (nr_key_bits &lt; 64) {</div><div class='del'>-			l_v &gt;&gt;= 64 - nr_key_bits;</div><div class='del'>-			r_v &gt;&gt;= 64 - nr_key_bits;</div><div class='del'>-			nr_key_bits = 0;</div><div class='del'>-		} else {</div><div class='del'>-			nr_key_bits -= 64;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!nr_key_bits || l_v != r_v)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		l = next_word(l);</div><div class='del'>-		r = next_word(r);</div><div class='del'>-</div><div class='del'>-		l_v = *l;</div><div class='del'>-		r_v = *r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cmp_int(l_v, r_v);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline __pure __flatten</div><div class='del'>-int __bch2_bkey_cmp_packed_format_checked_inlined(const struct bkey_packed *l,</div><div class='del'>-					  const struct bkey_packed *r,</div><div class='del'>-					  const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_format *f = &amp;b-&gt;format;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!bkey_packed(l) || !bkey_packed(r));</div><div class='del'>-	EBUG_ON(b-&gt;nr_key_bits != bkey_format_key_bits(f));</div><div class='del'>-</div><div class='del'>-	ret = __bkey_cmp_bits(high_word(f, l),</div><div class='del'>-			      high_word(f, r),</div><div class='del'>-			      b-&gt;nr_key_bits);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(ret != bpos_cmp(bkey_unpack_pos(b, l),</div><div class='del'>-				bkey_unpack_pos(b, r)));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __pure __flatten</div><div class='del'>-int bch2_bkey_cmp_packed_inlined(const struct btree *b,</div><div class='del'>-			 const struct bkey_packed *l,</div><div class='del'>-			 const struct bkey_packed *r)</div><div class='del'>-{</div><div class='del'>-	struct bkey unpacked;</div><div class='del'>-</div><div class='del'>-	if (likely(bkey_packed(l) &amp;&amp; bkey_packed(r)))</div><div class='del'>-		return __bch2_bkey_cmp_packed_format_checked_inlined(l, r, b);</div><div class='del'>-</div><div class='del'>-	if (bkey_packed(l)) {</div><div class='del'>-		__bkey_unpack_key_format_checked(b, &amp;unpacked, l);</div><div class='del'>-		l = (void *) &amp;unpacked;</div><div class='del'>-	} else if (bkey_packed(r)) {</div><div class='del'>-		__bkey_unpack_key_format_checked(b, &amp;unpacked, r);</div><div class='del'>-		r = (void *) &amp;unpacked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bpos_cmp(((struct bkey *) l)-&gt;p, ((struct bkey *) r)-&gt;p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BKEY_CMP_H */</div><div class='head'>diff --git a/fs/bcachefs/bkey_methods.c b/fs/bcachefs/bkey_methods.c<br/>deleted file mode 100644<br/>index 5e52684764eb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey_methods.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_methods.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,468 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_misc.h"</div><div class='del'>-#include "lru.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "reflink.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-</div><div class='del'>-const char * const bch2_bkey_types[] = {</div><div class='del'>-#define x(name, nr) #name,</div><div class='del'>-	BCH_BKEY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int deleted_key_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			       enum bkey_invalid_flags flags, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_deleted ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid = deleted_key_invalid,		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_whiteout ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid = deleted_key_invalid,		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static int empty_val_key_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				 enum bkey_invalid_flags flags, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_bytes(k.k), c, err,</div><div class='del'>-			 bkey_val_size_nonzero,</div><div class='del'>-			 "incorrect value size (%zu != 0)",</div><div class='del'>-			 bkey_val_bytes(k.k));</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_error ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid = empty_val_key_invalid,		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static int key_type_cookie_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				   enum bkey_invalid_flags flags, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void key_type_cookie_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_cookie ck = bkey_s_c_to_cookie(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%llu", le64_to_cpu(ck.v-&gt;cookie));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_cookie ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= key_type_cookie_invalid,	\</div><div class='del'>-	.val_to_text	= key_type_cookie_to_text,	\</div><div class='del'>-	.min_val_size	= 8,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_hash_whiteout ((struct bkey_ops) {\</div><div class='del'>-	.key_invalid = empty_val_key_invalid,		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static int key_type_inline_data_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-					enum bkey_invalid_flags flags, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void key_type_inline_data_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					 struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_inline_data d = bkey_s_c_to_inline_data(k);</div><div class='del'>-	unsigned datalen = bkey_inline_data_bytes(k.k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "datalen %u: %*phN",</div><div class='del'>-	       datalen, min(datalen, 32U), d.v-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_inline_data ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= key_type_inline_data_invalid,	\</div><div class='del'>-	.val_to_text	= key_type_inline_data_to_text,	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static bool key_type_set_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_c r)</div><div class='del'>-{</div><div class='del'>-	bch2_key_resize(l.k, l.k-&gt;size + r.k-&gt;size);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_set ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= empty_val_key_invalid,	\</div><div class='del'>-	.key_merge	= key_type_set_merge,		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-const struct bkey_ops bch2_bkey_ops[] = {</div><div class='del'>-#define x(name, nr) [KEY_TYPE_##name]	= bch2_bkey_ops_##name,</div><div class='del'>-	BCH_BKEY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct bkey_ops bch2_bkey_null_ops = {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_bkey_val_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops = bch2_bkey_type_ops(k.k-&gt;type);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_bytes(k.k) &lt; ops-&gt;min_val_size, c, err,</div><div class='del'>-			 bkey_val_size_too_small,</div><div class='del'>-			 "bad val size (%zu &lt; %u)",</div><div class='del'>-			 bkey_val_bytes(k.k), ops-&gt;min_val_size);</div><div class='del'>-</div><div class='del'>-	if (!ops-&gt;key_invalid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = ops-&gt;key_invalid(c, k, flags, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 bch2_key_types_allowed[] = {</div><div class='del'>-	[BKEY_TYPE_btree] =</div><div class='del'>-		BIT_ULL(KEY_TYPE_deleted)|</div><div class='del'>-		BIT_ULL(KEY_TYPE_btree_ptr)|</div><div class='del'>-		BIT_ULL(KEY_TYPE_btree_ptr_v2),</div><div class='del'>-#define x(name, nr, flags, keys)	[BKEY_TYPE_##name] = BIT_ULL(KEY_TYPE_deleted)|keys,</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char *bch2_btree_node_type_str(enum btree_node_type type)</div><div class='del'>-{</div><div class='del'>-	return type == BKEY_TYPE_btree ? "internal btree node" : bch2_btree_id_str(type - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			enum btree_node_type type,</div><div class='del'>-			enum bkey_invalid_flags flags,</div><div class='del'>-			struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(k.k-&gt;u64s &lt; BKEY_U64s, c, err,</div><div class='del'>-			 bkey_u64s_too_small,</div><div class='del'>-			 "u64s too small (%u &lt; %zu)", k.k-&gt;u64s, BKEY_U64s);</div><div class='del'>-</div><div class='del'>-	if (type &gt;= BKEY_TYPE_NR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on((flags &amp; BKEY_INVALID_COMMIT) &amp;&amp;</div><div class='del'>-			 !(bch2_key_types_allowed[type] &amp; BIT_ULL(k.k-&gt;type)), c, err,</div><div class='del'>-			 bkey_invalid_type_for_btree,</div><div class='del'>-			 "invalid key type for btree %s (%s)",</div><div class='del'>-			 bch2_btree_node_type_str(type), bch2_bkey_types[k.k-&gt;type]);</div><div class='del'>-</div><div class='del'>-	if (btree_node_type_is_extents(type) &amp;&amp; !bkey_whiteout(k.k)) {</div><div class='del'>-		bkey_fsck_err_on(k.k-&gt;size == 0, c, err,</div><div class='del'>-				 bkey_extent_size_zero,</div><div class='del'>-				 "size == 0");</div><div class='del'>-</div><div class='del'>-		bkey_fsck_err_on(k.k-&gt;size &gt; k.k-&gt;p.offset, c, err,</div><div class='del'>-				 bkey_extent_size_greater_than_offset,</div><div class='del'>-				 "size greater than offset (%u &gt; %llu)",</div><div class='del'>-				 k.k-&gt;size, k.k-&gt;p.offset);</div><div class='del'>-	} else {</div><div class='del'>-		bkey_fsck_err_on(k.k-&gt;size, c, err,</div><div class='del'>-				 bkey_size_nonzero,</div><div class='del'>-				 "size != 0");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type != BKEY_TYPE_btree) {</div><div class='del'>-		enum btree_id btree = type - 1;</div><div class='del'>-</div><div class='del'>-		if (btree_type_has_snapshots(btree)) {</div><div class='del'>-			bkey_fsck_err_on(!k.k-&gt;p.snapshot, c, err,</div><div class='del'>-					 bkey_snapshot_zero,</div><div class='del'>-					 "snapshot == 0");</div><div class='del'>-		} else if (!btree_type_has_snapshot_field(btree)) {</div><div class='del'>-			bkey_fsck_err_on(k.k-&gt;p.snapshot, c, err,</div><div class='del'>-					 bkey_snapshot_nonzero,</div><div class='del'>-					 "nonzero snapshot");</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * btree uses snapshot field but it's not required to be</div><div class='del'>-			 * nonzero</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bkey_fsck_err_on(bkey_eq(k.k-&gt;p, POS_MAX), c, err,</div><div class='del'>-				 bkey_at_pos_max,</div><div class='del'>-				 "key at POS_MAX");</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-		      enum btree_node_type type,</div><div class='del'>-		      enum bkey_invalid_flags flags,</div><div class='del'>-		      struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_invalid(c, k, type, flags, err) ?:</div><div class='del'>-		bch2_bkey_val_invalid(c, k, flags, err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_in_btree_node(struct bch_fs *c, struct btree *b,</div><div class='del'>-			    struct bkey_s_c k, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bpos_lt(k.k-&gt;p, b-&gt;data-&gt;min_key), c, err,</div><div class='del'>-			 bkey_before_start_of_btree_node,</div><div class='del'>-			 "key before start of btree node");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bpos_gt(k.k-&gt;p, b-&gt;data-&gt;max_key), c, err,</div><div class='del'>-			 bkey_after_end_of_btree_node,</div><div class='del'>-			 "key past end of btree node");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bpos_to_text(struct printbuf *out, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	if (bpos_eq(pos, POS_MIN))</div><div class='del'>-		prt_printf(out, "POS_MIN");</div><div class='del'>-	else if (bpos_eq(pos, POS_MAX))</div><div class='del'>-		prt_printf(out, "POS_MAX");</div><div class='del'>-	else if (bpos_eq(pos, SPOS_MAX))</div><div class='del'>-		prt_printf(out, "SPOS_MAX");</div><div class='del'>-	else {</div><div class='del'>-		if (pos.inode == U64_MAX)</div><div class='del'>-			prt_printf(out, "U64_MAX");</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "%llu", pos.inode);</div><div class='del'>-		prt_printf(out, ":");</div><div class='del'>-		if (pos.offset == U64_MAX)</div><div class='del'>-			prt_printf(out, "U64_MAX");</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "%llu", pos.offset);</div><div class='del'>-		prt_printf(out, ":");</div><div class='del'>-		if (pos.snapshot == U32_MAX)</div><div class='del'>-			prt_printf(out, "U32_MAX");</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "%u", pos.snapshot);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_to_text(struct printbuf *out, const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	if (k) {</div><div class='del'>-		prt_printf(out, "u64s %u type ", k-&gt;u64s);</div><div class='del'>-</div><div class='del'>-		if (k-&gt;type &lt; KEY_TYPE_MAX)</div><div class='del'>-			prt_printf(out, "%s ", bch2_bkey_types[k-&gt;type]);</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "%u ", k-&gt;type);</div><div class='del'>-</div><div class='del'>-		bch2_bpos_to_text(out, k-&gt;p);</div><div class='del'>-</div><div class='del'>-		prt_printf(out, " len %u ver %llu", k-&gt;size, k-&gt;version.lo);</div><div class='del'>-	} else {</div><div class='del'>-		prt_printf(out, "(null)");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_val_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-		      struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops = bch2_bkey_type_ops(k.k-&gt;type);</div><div class='del'>-</div><div class='del'>-	if (likely(ops-&gt;val_to_text))</div><div class='del'>-		ops-&gt;val_to_text(out, c, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_val_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			   struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	bch2_bkey_to_text(out, k.k);</div><div class='del'>-</div><div class='del'>-	if (bkey_val_bytes(k.k)) {</div><div class='del'>-		prt_printf(out, ": ");</div><div class='del'>-		bch2_val_to_text(out, c, k);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_swab_val(struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops = bch2_bkey_type_ops(k.k-&gt;type);</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;swab)</div><div class='del'>-		ops-&gt;swab(k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_normalize(struct bch_fs *c, struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops = bch2_bkey_type_ops(k.k-&gt;type);</div><div class='del'>-</div><div class='del'>-	return ops-&gt;key_normalize</div><div class='del'>-		? ops-&gt;key_normalize(c, k)</div><div class='del'>-		: false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_c r)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops = bch2_bkey_type_ops(l.k-&gt;type);</div><div class='del'>-</div><div class='del'>-	return ops-&gt;key_merge &amp;&amp;</div><div class='del'>-		bch2_bkey_maybe_mergable(l.k, r.k) &amp;&amp;</div><div class='del'>-		(u64) l.k-&gt;size + r.k-&gt;size &lt;= KEY_SIZE_MAX &amp;&amp;</div><div class='del'>-		!bch2_key_merging_disabled &amp;&amp;</div><div class='del'>-		ops-&gt;key_merge(c, l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct old_bkey_type {</div><div class='del'>-	u8		btree_node_type;</div><div class='del'>-	u8		old;</div><div class='del'>-	u8		new;</div><div class='del'>-} bkey_renumber_table[] = {</div><div class='del'>-	{BKEY_TYPE_btree,	128, KEY_TYPE_btree_ptr		},</div><div class='del'>-	{BKEY_TYPE_extents,	128, KEY_TYPE_extent		},</div><div class='del'>-	{BKEY_TYPE_extents,	129, KEY_TYPE_extent		},</div><div class='del'>-	{BKEY_TYPE_extents,	130, KEY_TYPE_reservation	},</div><div class='del'>-	{BKEY_TYPE_inodes,	128, KEY_TYPE_inode		},</div><div class='del'>-	{BKEY_TYPE_inodes,	130, KEY_TYPE_inode_generation	},</div><div class='del'>-	{BKEY_TYPE_dirents,	128, KEY_TYPE_dirent		},</div><div class='del'>-	{BKEY_TYPE_dirents,	129, KEY_TYPE_hash_whiteout	},</div><div class='del'>-	{BKEY_TYPE_xattrs,	128, KEY_TYPE_xattr		},</div><div class='del'>-	{BKEY_TYPE_xattrs,	129, KEY_TYPE_hash_whiteout	},</div><div class='del'>-	{BKEY_TYPE_alloc,	128, KEY_TYPE_alloc		},</div><div class='del'>-	{BKEY_TYPE_quotas,	128, KEY_TYPE_quota		},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_bkey_renumber(enum btree_node_type btree_node_type,</div><div class='del'>-			struct bkey_packed *k,</div><div class='del'>-			int write)</div><div class='del'>-{</div><div class='del'>-	const struct old_bkey_type *i;</div><div class='del'>-</div><div class='del'>-	for (i = bkey_renumber_table;</div><div class='del'>-	     i &lt; bkey_renumber_table + ARRAY_SIZE(bkey_renumber_table);</div><div class='del'>-	     i++)</div><div class='del'>-		if (btree_node_type == i-&gt;btree_node_type &amp;&amp;</div><div class='del'>-		    k-&gt;type == (write ? i-&gt;new : i-&gt;old)) {</div><div class='del'>-			k-&gt;type = write ? i-&gt;old : i-&gt;new;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_bkey_compat(unsigned level, enum btree_id btree_id,</div><div class='del'>-			unsigned version, unsigned big_endian,</div><div class='del'>-			int write,</div><div class='del'>-			struct bkey_format *f,</div><div class='del'>-			struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops;</div><div class='del'>-	struct bkey uk;</div><div class='del'>-	unsigned nr_compat = 5;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do these operations in reverse order in the write path:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_compat; i++)</div><div class='del'>-	switch (!write ? i : nr_compat - 1 - i) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (big_endian != CPU_BIG_ENDIAN)</div><div class='del'>-			bch2_bkey_swab_key(f, k);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		if (version &lt; bcachefs_metadata_version_bkey_renumber)</div><div class='del'>-			bch2_bkey_renumber(__btree_node_type(level, btree_id), k, write);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		if (version &lt; bcachefs_metadata_version_inode_btree_change &amp;&amp;</div><div class='del'>-		    btree_id == BTREE_ID_inodes) {</div><div class='del'>-			if (!bkey_packed(k)) {</div><div class='del'>-				struct bkey_i *u = packed_to_bkey(k);</div><div class='del'>-</div><div class='del'>-				swap(u-&gt;k.p.inode, u-&gt;k.p.offset);</div><div class='del'>-			} else if (f-&gt;bits_per_field[BKEY_FIELD_INODE] &amp;&amp;</div><div class='del'>-				   f-&gt;bits_per_field[BKEY_FIELD_OFFSET]) {</div><div class='del'>-				struct bkey_format tmp = *f, *in = f, *out = &amp;tmp;</div><div class='del'>-</div><div class='del'>-				swap(tmp.bits_per_field[BKEY_FIELD_INODE],</div><div class='del'>-				     tmp.bits_per_field[BKEY_FIELD_OFFSET]);</div><div class='del'>-				swap(tmp.field_offset[BKEY_FIELD_INODE],</div><div class='del'>-				     tmp.field_offset[BKEY_FIELD_OFFSET]);</div><div class='del'>-</div><div class='del'>-				if (!write)</div><div class='del'>-					swap(in, out);</div><div class='del'>-</div><div class='del'>-				uk = __bch2_bkey_unpack_key(in, k);</div><div class='del'>-				swap(uk.p.inode, uk.p.offset);</div><div class='del'>-				BUG_ON(!bch2_bkey_pack_key(k, &amp;uk, out));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		if (version &lt; bcachefs_metadata_version_snapshot &amp;&amp;</div><div class='del'>-		    (level || btree_type_has_snapshots(btree_id))) {</div><div class='del'>-			struct bkey_i *u = packed_to_bkey(k);</div><div class='del'>-</div><div class='del'>-			if (u) {</div><div class='del'>-				u-&gt;k.p.snapshot = write</div><div class='del'>-					? 0 : U32_MAX;</div><div class='del'>-			} else {</div><div class='del'>-				u64 min_packed = le64_to_cpu(f-&gt;field_offset[BKEY_FIELD_SNAPSHOT]);</div><div class='del'>-				u64 max_packed = min_packed +</div><div class='del'>-					~(~0ULL &lt;&lt; f-&gt;bits_per_field[BKEY_FIELD_SNAPSHOT]);</div><div class='del'>-</div><div class='del'>-				uk = __bch2_bkey_unpack_key(f, k);</div><div class='del'>-				uk.p.snapshot = write</div><div class='del'>-					? min_packed : min_t(u64, U32_MAX, max_packed);</div><div class='del'>-</div><div class='del'>-				BUG_ON(!bch2_bkey_pack_key(k, &amp;uk, f));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case 4: {</div><div class='del'>-		struct bkey_s u;</div><div class='del'>-</div><div class='del'>-		if (!bkey_packed(k)) {</div><div class='del'>-			u = bkey_i_to_s(packed_to_bkey(k));</div><div class='del'>-		} else {</div><div class='del'>-			uk = __bch2_bkey_unpack_key(f, k);</div><div class='del'>-			u.k = &amp;uk;</div><div class='del'>-			u.v = bkeyp_val(f, k);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (big_endian != CPU_BIG_ENDIAN)</div><div class='del'>-			bch2_bkey_swab_val(u);</div><div class='del'>-</div><div class='del'>-		ops = bch2_bkey_type_ops(k-&gt;type);</div><div class='del'>-</div><div class='del'>-		if (ops-&gt;compat)</div><div class='del'>-			ops-&gt;compat(btree_id, version, big_endian, write, u);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h<br/>deleted file mode 100644<br/>index 03efe8ee565a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey_methods.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_methods.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,181 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BKEY_METHODS_H</div><div class='del'>-#define _BCACHEFS_BKEY_METHODS_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct btree;</div><div class='del'>-struct btree_trans;</div><div class='del'>-struct bkey;</div><div class='del'>-enum btree_node_type;</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_bkey_types[];</div><div class='del'>-extern const struct bkey_ops bch2_bkey_null_ops;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * key_invalid: checks validity of @k, returns 0 if good or -EINVAL if bad. If</div><div class='del'>- * invalid, entire key will be deleted.</div><div class='del'>- *</div><div class='del'>- * When invalid, error string is returned via @err. @rw indicates whether key is</div><div class='del'>- * being read or written; more aggressive checks can be enabled when rw == WRITE.</div><div class='del'>- */</div><div class='del'>-struct bkey_ops {</div><div class='del'>-	int		(*key_invalid)(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				       enum bkey_invalid_flags flags, struct printbuf *err);</div><div class='del'>-	void		(*val_to_text)(struct printbuf *, struct bch_fs *,</div><div class='del'>-				       struct bkey_s_c);</div><div class='del'>-	void		(*swab)(struct bkey_s);</div><div class='del'>-	bool		(*key_normalize)(struct bch_fs *, struct bkey_s);</div><div class='del'>-	bool		(*key_merge)(struct bch_fs *, struct bkey_s, struct bkey_s_c);</div><div class='del'>-	int		(*trigger)(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-				   struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-	void		(*compat)(enum btree_id id, unsigned version,</div><div class='del'>-				  unsigned big_endian, int write,</div><div class='del'>-				  struct bkey_s);</div><div class='del'>-</div><div class='del'>-	/* Size of value type when first created: */</div><div class='del'>-	unsigned	min_val_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern const struct bkey_ops bch2_bkey_ops[];</div><div class='del'>-</div><div class='del'>-static inline const struct bkey_ops *bch2_bkey_type_ops(enum bch_bkey_type type)</div><div class='del'>-{</div><div class='del'>-	return likely(type &lt; KEY_TYPE_MAX)</div><div class='del'>-		? &amp;bch2_bkey_ops[type]</div><div class='del'>-		: &amp;bch2_bkey_null_ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_val_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int __bch2_bkey_invalid(struct bch_fs *, struct bkey_s_c, enum btree_node_type,</div><div class='del'>-			enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_bkey_invalid(struct bch_fs *, struct bkey_s_c, enum btree_node_type,</div><div class='del'>-		      enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_bkey_in_btree_node(struct bch_fs *, struct btree *,</div><div class='del'>-			    struct bkey_s_c, struct printbuf *);</div><div class='del'>-</div><div class='del'>-void bch2_bpos_to_text(struct printbuf *, struct bpos);</div><div class='del'>-void bch2_bkey_to_text(struct printbuf *, const struct bkey *);</div><div class='del'>-void bch2_val_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-		      struct bkey_s_c);</div><div class='del'>-void bch2_bkey_val_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			   struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-void bch2_bkey_swab_val(struct bkey_s);</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_normalize(struct bch_fs *, struct bkey_s);</div><div class='del'>-</div><div class='del'>-static inline bool bch2_bkey_maybe_mergable(const struct bkey *l, const struct bkey *r)</div><div class='del'>-{</div><div class='del'>-	return l-&gt;type == r-&gt;type &amp;&amp;</div><div class='del'>-		!bversion_cmp(l-&gt;version, r-&gt;version) &amp;&amp;</div><div class='del'>-		bpos_eq(l-&gt;p, bkey_start_pos(r));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-enum btree_update_flags {</div><div class='del'>-	__BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE = __BTREE_ITER_FLAGS_END,</div><div class='del'>-	__BTREE_UPDATE_NOJOURNAL,</div><div class='del'>-	__BTREE_UPDATE_KEY_CACHE_RECLAIM,</div><div class='del'>-</div><div class='del'>-	__BTREE_TRIGGER_NORUN,</div><div class='del'>-	__BTREE_TRIGGER_TRANSACTIONAL,</div><div class='del'>-	__BTREE_TRIGGER_ATOMIC,</div><div class='del'>-	__BTREE_TRIGGER_GC,</div><div class='del'>-	__BTREE_TRIGGER_INSERT,</div><div class='del'>-	__BTREE_TRIGGER_OVERWRITE,</div><div class='del'>-	__BTREE_TRIGGER_BUCKET_INVALIDATE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE (1U &lt;&lt; __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE)</div><div class='del'>-#define BTREE_UPDATE_NOJOURNAL		(1U &lt;&lt; __BTREE_UPDATE_NOJOURNAL)</div><div class='del'>-#define BTREE_UPDATE_KEY_CACHE_RECLAIM	(1U &lt;&lt; __BTREE_UPDATE_KEY_CACHE_RECLAIM)</div><div class='del'>-</div><div class='del'>-/* Don't run triggers at all */</div><div class='del'>-#define BTREE_TRIGGER_NORUN		(1U &lt;&lt; __BTREE_TRIGGER_NORUN)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If set, we're running transactional triggers as part of a transaction commit:</div><div class='del'>- * triggers may generate new updates</div><div class='del'>- *</div><div class='del'>- * If cleared, and either BTREE_TRIGGER_INSERT|BTREE_TRIGGER_OVERWRITE are set,</div><div class='del'>- * we're running atomic triggers during a transaction commit: we have our</div><div class='del'>- * journal reservation, we're holding btree node write locks, and we know the</div><div class='del'>- * transaction is going to commit (returning an error here is a fatal error,</div><div class='del'>- * causing us to go emergency read-only)</div><div class='del'>- */</div><div class='del'>-#define BTREE_TRIGGER_TRANSACTIONAL	(1U &lt;&lt; __BTREE_TRIGGER_TRANSACTIONAL)</div><div class='del'>-#define BTREE_TRIGGER_ATOMIC		(1U &lt;&lt; __BTREE_TRIGGER_ATOMIC)</div><div class='del'>-</div><div class='del'>-/* We're in gc/fsck: running triggers to recalculate e.g. disk usage */</div><div class='del'>-#define BTREE_TRIGGER_GC		(1U &lt;&lt; __BTREE_TRIGGER_GC)</div><div class='del'>-</div><div class='del'>-/* @new is entering the btree */</div><div class='del'>-#define BTREE_TRIGGER_INSERT		(1U &lt;&lt; __BTREE_TRIGGER_INSERT)</div><div class='del'>-</div><div class='del'>-/* @old is leaving the btree */</div><div class='del'>-#define BTREE_TRIGGER_OVERWRITE		(1U &lt;&lt; __BTREE_TRIGGER_OVERWRITE)</div><div class='del'>-</div><div class='del'>-/* signal from bucket invalidate path to alloc trigger */</div><div class='del'>-#define BTREE_TRIGGER_BUCKET_INVALIDATE	(1U &lt;&lt; __BTREE_TRIGGER_BUCKET_INVALIDATE)</div><div class='del'>-</div><div class='del'>-static inline int bch2_key_trigger(struct btree_trans *trans,</div><div class='del'>-		enum btree_id btree, unsigned level,</div><div class='del'>-		struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-		unsigned flags)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_ops *ops = bch2_bkey_type_ops(old.k-&gt;type ?: new.k-&gt;type);</div><div class='del'>-</div><div class='del'>-	return ops-&gt;trigger</div><div class='del'>-		? ops-&gt;trigger(trans, btree, level, old, new, flags)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_key_trigger_old(struct btree_trans *trans,</div><div class='del'>-				       enum btree_id btree_id, unsigned level,</div><div class='del'>-				       struct bkey_s_c old, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i deleted;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;deleted.k);</div><div class='del'>-	deleted.k.p = old.k-&gt;p;</div><div class='del'>-</div><div class='del'>-	return bch2_key_trigger(trans, btree_id, level, old, bkey_i_to_s(&amp;deleted),</div><div class='del'>-				BTREE_TRIGGER_OVERWRITE|flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_key_trigger_new(struct btree_trans *trans,</div><div class='del'>-				       enum btree_id btree_id, unsigned level,</div><div class='del'>-				       struct bkey_s new, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i deleted;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;deleted.k);</div><div class='del'>-	deleted.k.p = new.k-&gt;p;</div><div class='del'>-</div><div class='del'>-	return bch2_key_trigger(trans, btree_id, level, bkey_i_to_s_c(&amp;deleted), new,</div><div class='del'>-				BTREE_TRIGGER_INSERT|flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_renumber(enum btree_node_type, struct bkey_packed *, int);</div><div class='del'>-</div><div class='del'>-void __bch2_bkey_compat(unsigned, enum btree_id, unsigned, unsigned,</div><div class='del'>-			int, struct bkey_format *, struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_compat(unsigned level, enum btree_id btree_id,</div><div class='del'>-			       unsigned version, unsigned big_endian,</div><div class='del'>-			       int write,</div><div class='del'>-			       struct bkey_format *f,</div><div class='del'>-			       struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_current ||</div><div class='del'>-	    big_endian != CPU_BIG_ENDIAN)</div><div class='del'>-		__bch2_bkey_compat(level, btree_id, version,</div><div class='del'>-				   big_endian, write, f, k);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BKEY_METHODS_H */</div><div class='head'>diff --git a/fs/bcachefs/bkey_sort.c b/fs/bcachefs/bkey_sort.c<br/>deleted file mode 100644<br/>index bcca9e76a0b4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey_sort.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_sort.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "bkey_cmp.h"</div><div class='del'>-#include "bkey_sort.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-</div><div class='del'>-typedef int (*sort_cmp_fn)(struct btree *,</div><div class='del'>-			   struct bkey_packed *,</div><div class='del'>-			   struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-static inline bool sort_iter_end(struct sort_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return !iter-&gt;used;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sort_iter_sift(struct sort_iter *iter, unsigned from,</div><div class='del'>-				  sort_cmp_fn cmp)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = from;</div><div class='del'>-	     i + 1 &lt; iter-&gt;used &amp;&amp;</div><div class='del'>-	     cmp(iter-&gt;b, iter-&gt;data[i].k, iter-&gt;data[i + 1].k) &gt; 0;</div><div class='del'>-	     i++)</div><div class='del'>-		swap(iter-&gt;data[i], iter-&gt;data[i + 1]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sort_iter_sort(struct sort_iter *iter, sort_cmp_fn cmp)</div><div class='del'>-{</div><div class='del'>-	unsigned i = iter-&gt;used;</div><div class='del'>-</div><div class='del'>-	while (i--)</div><div class='del'>-		sort_iter_sift(iter, i, cmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *sort_iter_peek(struct sort_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return !sort_iter_end(iter) ? iter-&gt;data-&gt;k : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sort_iter_advance(struct sort_iter *iter, sort_cmp_fn cmp)</div><div class='del'>-{</div><div class='del'>-	struct sort_iter_set *i = iter-&gt;data;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!iter-&gt;used);</div><div class='del'>-</div><div class='del'>-	i-&gt;k = bkey_p_next(i-&gt;k);</div><div class='del'>-</div><div class='del'>-	BUG_ON(i-&gt;k &gt; i-&gt;end);</div><div class='del'>-</div><div class='del'>-	if (i-&gt;k == i-&gt;end)</div><div class='del'>-		array_remove_item(iter-&gt;data, iter-&gt;used, 0);</div><div class='del'>-	else</div><div class='del'>-		sort_iter_sift(iter, 0, cmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *sort_iter_next(struct sort_iter *iter,</div><div class='del'>-						 sort_cmp_fn cmp)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *ret = sort_iter_peek(iter);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		sort_iter_advance(iter, cmp);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If keys compare equal, compare by pointer order:</div><div class='del'>- */</div><div class='del'>-static inline int key_sort_fix_overlapping_cmp(struct btree *b,</div><div class='del'>-					       struct bkey_packed *l,</div><div class='del'>-					       struct bkey_packed *r)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_cmp_packed(b, l, r) ?:</div><div class='del'>-		cmp_int((unsigned long) l, (unsigned long) r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool should_drop_next_key(struct sort_iter *iter)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * key_sort_cmp() ensures that when keys compare equal the older key</div><div class='del'>-	 * comes first; so if l-&gt;k compares equal to r-&gt;k then l-&gt;k is older</div><div class='del'>-	 * and should be dropped.</div><div class='del'>-	 */</div><div class='del'>-	return iter-&gt;used &gt;= 2 &amp;&amp;</div><div class='del'>-		!bch2_bkey_cmp_packed(iter-&gt;b,</div><div class='del'>-				 iter-&gt;data[0].k,</div><div class='del'>-				 iter-&gt;data[1].k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_nr_keys</div><div class='del'>-bch2_key_sort_fix_overlapping(struct bch_fs *c, struct bset *dst,</div><div class='del'>-			      struct sort_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *out = dst-&gt;start;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct btree_nr_keys nr;</div><div class='del'>-</div><div class='del'>-	memset(&amp;nr, 0, sizeof(nr));</div><div class='del'>-</div><div class='del'>-	sort_iter_sort(iter, key_sort_fix_overlapping_cmp);</div><div class='del'>-</div><div class='del'>-	while ((k = sort_iter_peek(iter))) {</div><div class='del'>-		if (!bkey_deleted(k) &amp;&amp;</div><div class='del'>-		    !should_drop_next_key(iter)) {</div><div class='del'>-			bkey_p_copy(out, k);</div><div class='del'>-			btree_keys_account_key_add(&amp;nr, 0, out);</div><div class='del'>-			out = bkey_p_next(out);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sort_iter_advance(iter, key_sort_fix_overlapping_cmp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;u64s = cpu_to_le16((u64 *) out - dst-&gt;_data);</div><div class='del'>-	return nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sort + repack in a new format: */</div><div class='del'>-struct btree_nr_keys</div><div class='del'>-bch2_sort_repack(struct bset *dst, struct btree *src,</div><div class='del'>-		 struct btree_node_iter *src_iter,</div><div class='del'>-		 struct bkey_format *out_f,</div><div class='del'>-		 bool filter_whiteouts)</div><div class='del'>-{</div><div class='del'>-	struct bkey_format *in_f = &amp;src-&gt;format;</div><div class='del'>-	struct bkey_packed *in, *out = vstruct_last(dst);</div><div class='del'>-	struct btree_nr_keys nr;</div><div class='del'>-	bool transform = memcmp(out_f, &amp;src-&gt;format, sizeof(*out_f));</div><div class='del'>-</div><div class='del'>-	memset(&amp;nr, 0, sizeof(nr));</div><div class='del'>-</div><div class='del'>-	while ((in = bch2_btree_node_iter_next_all(src_iter, src))) {</div><div class='del'>-		if (filter_whiteouts &amp;&amp; bkey_deleted(in))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!transform)</div><div class='del'>-			bkey_p_copy(out, in);</div><div class='del'>-		else if (bch2_bkey_transform(out_f, out, bkey_packed(in)</div><div class='del'>-					     ? in_f : &amp;bch2_bkey_format_current, in))</div><div class='del'>-			out-&gt;format = KEY_FORMAT_LOCAL_BTREE;</div><div class='del'>-		else</div><div class='del'>-			bch2_bkey_unpack(src, (void *) out, in);</div><div class='del'>-</div><div class='del'>-		out-&gt;needs_whiteout = false;</div><div class='del'>-</div><div class='del'>-		btree_keys_account_key_add(&amp;nr, 0, out);</div><div class='del'>-		out = bkey_p_next(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;u64s = cpu_to_le16((u64 *) out - dst-&gt;_data);</div><div class='del'>-	return nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sort_keys_cmp(struct btree *b,</div><div class='del'>-				struct bkey_packed *l,</div><div class='del'>-				struct bkey_packed *r)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_cmp_packed_inlined(b, l, r) ?:</div><div class='del'>-		(int) bkey_deleted(r) - (int) bkey_deleted(l) ?:</div><div class='del'>-		(int) l-&gt;needs_whiteout - (int) r-&gt;needs_whiteout;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_sort_keys(struct bkey_packed *dst,</div><div class='del'>-			struct sort_iter *iter,</div><div class='del'>-			bool filter_whiteouts)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_format *f = &amp;iter-&gt;b-&gt;format;</div><div class='del'>-	struct bkey_packed *in, *next, *out = dst;</div><div class='del'>-</div><div class='del'>-	sort_iter_sort(iter, sort_keys_cmp);</div><div class='del'>-</div><div class='del'>-	while ((in = sort_iter_next(iter, sort_keys_cmp))) {</div><div class='del'>-		bool needs_whiteout = false;</div><div class='del'>-</div><div class='del'>-		if (bkey_deleted(in) &amp;&amp;</div><div class='del'>-		    (filter_whiteouts || !in-&gt;needs_whiteout))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		while ((next = sort_iter_peek(iter)) &amp;&amp;</div><div class='del'>-		       !bch2_bkey_cmp_packed_inlined(iter-&gt;b, in, next)) {</div><div class='del'>-			BUG_ON(in-&gt;needs_whiteout &amp;&amp;</div><div class='del'>-			       next-&gt;needs_whiteout);</div><div class='del'>-			needs_whiteout |= in-&gt;needs_whiteout;</div><div class='del'>-			in = sort_iter_next(iter, sort_keys_cmp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bkey_deleted(in)) {</div><div class='del'>-			memcpy_u64s_small(out, in, bkeyp_key_u64s(f, in));</div><div class='del'>-			set_bkeyp_val_u64s(f, out, 0);</div><div class='del'>-		} else {</div><div class='del'>-			bkey_p_copy(out, in);</div><div class='del'>-		}</div><div class='del'>-		out-&gt;needs_whiteout |= needs_whiteout;</div><div class='del'>-		out = bkey_p_next(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (u64 *) out - (u64 *) dst;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/bkey_sort.h b/fs/bcachefs/bkey_sort.h<br/>deleted file mode 100644<br/>index 7c0f0b160f18..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bkey_sort.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bkey_sort.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BKEY_SORT_H</div><div class='del'>-#define _BCACHEFS_BKEY_SORT_H</div><div class='del'>-</div><div class='del'>-struct sort_iter {</div><div class='del'>-	struct btree		*b;</div><div class='del'>-	unsigned		used;</div><div class='del'>-	unsigned		size;</div><div class='del'>-</div><div class='del'>-	struct sort_iter_set {</div><div class='del'>-		struct bkey_packed *k, *end;</div><div class='del'>-	} data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void sort_iter_init(struct sort_iter *iter, struct btree *b, unsigned size)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;b = b;</div><div class='del'>-	iter-&gt;used = 0;</div><div class='del'>-	iter-&gt;size = size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sort_iter_stack {</div><div class='del'>-	struct sort_iter	iter;</div><div class='del'>-	struct sort_iter_set	sets[MAX_BSETS + 1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void sort_iter_stack_init(struct sort_iter_stack *iter, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	sort_iter_init(&amp;iter-&gt;iter, b, ARRAY_SIZE(iter-&gt;sets));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sort_iter_add(struct sort_iter *iter,</div><div class='del'>-				 struct bkey_packed *k,</div><div class='del'>-				 struct bkey_packed *end)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(iter-&gt;used &gt;= iter-&gt;size);</div><div class='del'>-</div><div class='del'>-	if (k != end)</div><div class='del'>-		iter-&gt;data[iter-&gt;used++] = (struct sort_iter_set) { k, end };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_nr_keys</div><div class='del'>-bch2_key_sort_fix_overlapping(struct bch_fs *, struct bset *,</div><div class='del'>-			      struct sort_iter *);</div><div class='del'>-</div><div class='del'>-struct btree_nr_keys</div><div class='del'>-bch2_sort_repack(struct bset *, struct btree *,</div><div class='del'>-		 struct btree_node_iter *,</div><div class='del'>-		 struct bkey_format *, bool);</div><div class='del'>-</div><div class='del'>-unsigned bch2_sort_keys(struct bkey_packed *,</div><div class='del'>-			struct sort_iter *, bool);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BKEY_SORT_H */</div><div class='head'>diff --git a/fs/bcachefs/bset.c b/fs/bcachefs/bset.c<br/>deleted file mode 100644<br/>index 3fd1085b6c61..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bset.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bset.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1597 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Code for working with individual keys, and sorted sets of keys with in a</div><div class='del'>- * btree node</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "eytzinger.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-</div><div class='del'>-static inline void __bch2_btree_node_iter_advance(struct btree_node_iter *,</div><div class='del'>-						  struct btree *);</div><div class='del'>-</div><div class='del'>-static inline unsigned __btree_node_iter_used(struct btree_node_iter *iter)</div><div class='del'>-{</div><div class='del'>-	unsigned n = ARRAY_SIZE(iter-&gt;data);</div><div class='del'>-</div><div class='del'>-	while (n &amp;&amp; __btree_node_iter_set_end(iter, n - 1))</div><div class='del'>-		--n;</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bset_tree *bch2_bkey_to_bset(struct btree *b, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_to_bset_inlined(b, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * There are never duplicate live keys in the btree - but including keys that</div><div class='del'>- * have been flagged as deleted (and will be cleaned up later) we _will_ see</div><div class='del'>- * duplicates.</div><div class='del'>- *</div><div class='del'>- * Thus the sort order is: usual key comparison first, but for keys that compare</div><div class='del'>- * equal the deleted key(s) come first, and the (at most one) live version comes</div><div class='del'>- * last.</div><div class='del'>- *</div><div class='del'>- * The main reason for this is insertion: to handle overwrites, we first iterate</div><div class='del'>- * over keys that compare equal to our insert key, and then insert immediately</div><div class='del'>- * prior to the first key greater than the key we're inserting - our insert</div><div class='del'>- * position will be after all keys that compare equal to our insert key, which</div><div class='del'>- * by the time we actually do the insert will all be deleted.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bch2_dump_bset(struct bch_fs *c, struct btree *b,</div><div class='del'>-		    struct bset *i, unsigned set)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *_k, *_n;</div><div class='del'>-	struct bkey uk, n;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	if (!i-&gt;u64s)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (_k = i-&gt;start;</div><div class='del'>-	     _k &lt; vstruct_last(i);</div><div class='del'>-	     _k = _n) {</div><div class='del'>-		_n = bkey_p_next(_k);</div><div class='del'>-</div><div class='del'>-		if (!_k-&gt;u64s) {</div><div class='del'>-			printk(KERN_ERR "block %u key %5zu - u64s 0? aieee!\n", set,</div><div class='del'>-			       _k-&gt;_data - i-&gt;_data);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		k = bkey_disassemble(b, _k, &amp;uk);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		if (c)</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		else</div><div class='del'>-			bch2_bkey_to_text(&amp;buf, k.k);</div><div class='del'>-		printk(KERN_ERR "block %u key %5zu: %s\n", set,</div><div class='del'>-		       _k-&gt;_data - i-&gt;_data, buf.buf);</div><div class='del'>-</div><div class='del'>-		if (_n == vstruct_last(i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		n = bkey_unpack_key(b, _n);</div><div class='del'>-</div><div class='del'>-		if (bpos_lt(n.p, k.k-&gt;p)) {</div><div class='del'>-			printk(KERN_ERR "Key skipped backwards\n");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!bkey_deleted(k.k) &amp;&amp; bpos_eq(n.p, k.k-&gt;p))</div><div class='del'>-			printk(KERN_ERR "Duplicate keys\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dump_btree_node(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	console_lock();</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		bch2_dump_bset(c, b, bset(b, t), t - b-&gt;set);</div><div class='del'>-	console_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dump_btree_node_iter(struct btree *b,</div><div class='del'>-			      struct btree_node_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter_set *set;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	printk(KERN_ERR "btree node iter with %u/%u sets:\n",</div><div class='del'>-	       __btree_node_iter_used(iter), b-&gt;nsets);</div><div class='del'>-</div><div class='del'>-	btree_node_iter_for_each(iter, set) {</div><div class='del'>-		struct bkey_packed *k = __btree_node_offset_to_key(b, set-&gt;k);</div><div class='del'>-		struct bset_tree *t = bch2_bkey_to_bset(b, k);</div><div class='del'>-		struct bkey uk = bkey_unpack_key(b, k);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf, &amp;uk);</div><div class='del'>-		printk(KERN_ERR "set %zu key %u: %s\n",</div><div class='del'>-		       t - b-&gt;set, set-&gt;k, buf.buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-</div><div class='del'>-void __bch2_verify_btree_nr_keys(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct btree_nr_keys nr = { 0 };</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		bset_tree_for_each_key(b, t, k)</div><div class='del'>-			if (!bkey_deleted(k))</div><div class='del'>-				btree_keys_account_key_add(&amp;nr, t - b-&gt;set, k);</div><div class='del'>-</div><div class='del'>-	BUG_ON(memcmp(&amp;nr, &amp;b-&gt;nr, sizeof(nr)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_node_iter_next_check(struct btree_node_iter *_iter,</div><div class='del'>-					    struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter iter = *_iter;</div><div class='del'>-	const struct bkey_packed *k, *n;</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_node_iter_peek_all(&amp;iter, b);</div><div class='del'>-	__bch2_btree_node_iter_advance(&amp;iter, b);</div><div class='del'>-	n = bch2_btree_node_iter_peek_all(&amp;iter, b);</div><div class='del'>-</div><div class='del'>-	bkey_unpack_key(b, k);</div><div class='del'>-</div><div class='del'>-	if (n &amp;&amp;</div><div class='del'>-	    bkey_iter_cmp(b, k, n) &gt; 0) {</div><div class='del'>-		struct btree_node_iter_set *set;</div><div class='del'>-		struct bkey ku = bkey_unpack_key(b, k);</div><div class='del'>-		struct bkey nu = bkey_unpack_key(b, n);</div><div class='del'>-		struct printbuf buf1 = PRINTBUF;</div><div class='del'>-		struct printbuf buf2 = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_dump_btree_node(NULL, b);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf1, &amp;ku);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf2, &amp;nu);</div><div class='del'>-		printk(KERN_ERR "out of order/overlapping:\n%s\n%s\n",</div><div class='del'>-		       buf1.buf, buf2.buf);</div><div class='del'>-		printk(KERN_ERR "iter was:");</div><div class='del'>-</div><div class='del'>-		btree_node_iter_for_each(_iter, set) {</div><div class='del'>-			struct bkey_packed *k2 = __btree_node_offset_to_key(b, set-&gt;k);</div><div class='del'>-			struct bset_tree *t = bch2_bkey_to_bset(b, k2);</div><div class='del'>-			printk(" [%zi %zi]", t - b-&gt;set,</div><div class='del'>-			       k2-&gt;_data - bset(b, t)-&gt;_data);</div><div class='del'>-		}</div><div class='del'>-		panic("\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_verify(struct btree_node_iter *iter,</div><div class='del'>-				 struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter_set *set, *s2;</div><div class='del'>-	struct bkey_packed *k, *p;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_node_iter_end(iter))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Verify no duplicates: */</div><div class='del'>-	btree_node_iter_for_each(iter, set) {</div><div class='del'>-		BUG_ON(set-&gt;k &gt; set-&gt;end);</div><div class='del'>-		btree_node_iter_for_each(iter, s2)</div><div class='del'>-			BUG_ON(set != s2 &amp;&amp; set-&gt;end == s2-&gt;end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Verify that set-&gt;end is correct: */</div><div class='del'>-	btree_node_iter_for_each(iter, set) {</div><div class='del'>-		for_each_bset(b, t)</div><div class='del'>-			if (set-&gt;end == t-&gt;end_offset)</div><div class='del'>-				goto found;</div><div class='del'>-		BUG();</div><div class='del'>-found:</div><div class='del'>-		BUG_ON(set-&gt;k &lt; btree_bkey_first_offset(t) ||</div><div class='del'>-		       set-&gt;k &gt;= t-&gt;end_offset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Verify iterator is sorted: */</div><div class='del'>-	btree_node_iter_for_each(iter, set)</div><div class='del'>-		BUG_ON(set != iter-&gt;data &amp;&amp;</div><div class='del'>-		       btree_node_iter_cmp(b, set[-1], set[0]) &gt; 0);</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_node_iter_peek_all(iter, b);</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		if (iter-&gt;data[0].end == t-&gt;end_offset)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		p = bch2_bkey_prev_all(b, t,</div><div class='del'>-			bch2_btree_node_iter_bset_pos(iter, b, t));</div><div class='del'>-</div><div class='del'>-		BUG_ON(p &amp;&amp; bkey_iter_cmp(b, k, p) &lt; 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_verify_insert_pos(struct btree *b, struct bkey_packed *where,</div><div class='del'>-			    struct bkey_packed *insert, unsigned clobber_u64s)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t = bch2_bkey_to_bset(b, where);</div><div class='del'>-	struct bkey_packed *prev = bch2_bkey_prev_all(b, t, where);</div><div class='del'>-	struct bkey_packed *next = (void *) ((u64 *) where-&gt;_data + clobber_u64s);</div><div class='del'>-	struct printbuf buf1 = PRINTBUF;</div><div class='del'>-	struct printbuf buf2 = PRINTBUF;</div><div class='del'>-#if 0</div><div class='del'>-	BUG_ON(prev &amp;&amp;</div><div class='del'>-	       bkey_iter_cmp(b, prev, insert) &gt; 0);</div><div class='del'>-#else</div><div class='del'>-	if (prev &amp;&amp;</div><div class='del'>-	    bkey_iter_cmp(b, prev, insert) &gt; 0) {</div><div class='del'>-		struct bkey k1 = bkey_unpack_key(b, prev);</div><div class='del'>-		struct bkey k2 = bkey_unpack_key(b, insert);</div><div class='del'>-</div><div class='del'>-		bch2_dump_btree_node(NULL, b);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf1, &amp;k1);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf2, &amp;k2);</div><div class='del'>-</div><div class='del'>-		panic("prev &gt; insert:\n"</div><div class='del'>-		      "prev    key %s\n"</div><div class='del'>-		      "insert  key %s\n",</div><div class='del'>-		      buf1.buf, buf2.buf);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#if 0</div><div class='del'>-	BUG_ON(next != btree_bkey_last(b, t) &amp;&amp;</div><div class='del'>-	       bkey_iter_cmp(b, insert, next) &gt; 0);</div><div class='del'>-#else</div><div class='del'>-	if (next != btree_bkey_last(b, t) &amp;&amp;</div><div class='del'>-	    bkey_iter_cmp(b, insert, next) &gt; 0) {</div><div class='del'>-		struct bkey k1 = bkey_unpack_key(b, insert);</div><div class='del'>-		struct bkey k2 = bkey_unpack_key(b, next);</div><div class='del'>-</div><div class='del'>-		bch2_dump_btree_node(NULL, b);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf1, &amp;k1);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf2, &amp;k2);</div><div class='del'>-</div><div class='del'>-		panic("insert &gt; next:\n"</div><div class='del'>-		      "insert  key %s\n"</div><div class='del'>-		      "next    key %s\n",</div><div class='del'>-		      buf1.buf, buf2.buf);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_node_iter_next_check(struct btree_node_iter *iter,</div><div class='del'>-						   struct btree *b) {}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Auxiliary search trees */</div><div class='del'>-</div><div class='del'>-#define BFLOAT_FAILED_UNPACKED	U8_MAX</div><div class='del'>-#define BFLOAT_FAILED		U8_MAX</div><div class='del'>-</div><div class='del'>-struct bkey_float {</div><div class='del'>-	u8		exponent;</div><div class='del'>-	u8		key_offset;</div><div class='del'>-	u16		mantissa;</div><div class='del'>-};</div><div class='del'>-#define BKEY_MANTISSA_BITS	16</div><div class='del'>-</div><div class='del'>-static unsigned bkey_float_byte_offset(unsigned idx)</div><div class='del'>-{</div><div class='del'>-	return idx * sizeof(struct bkey_float);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ro_aux_tree {</div><div class='del'>-	u8			nothing[0];</div><div class='del'>-	struct bkey_float	f[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rw_aux_tree {</div><div class='del'>-	u16		offset;</div><div class='del'>-	struct bpos	k;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned bset_aux_tree_buf_end(const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(t-&gt;aux_data_offset == U16_MAX);</div><div class='del'>-</div><div class='del'>-	switch (bset_aux_tree_type(t)) {</div><div class='del'>-	case BSET_NO_AUX_TREE:</div><div class='del'>-		return t-&gt;aux_data_offset;</div><div class='del'>-	case BSET_RO_AUX_TREE:</div><div class='del'>-		return t-&gt;aux_data_offset +</div><div class='del'>-			DIV_ROUND_UP(t-&gt;size * sizeof(struct bkey_float) +</div><div class='del'>-				     t-&gt;size * sizeof(u8), 8);</div><div class='del'>-	case BSET_RW_AUX_TREE:</div><div class='del'>-		return t-&gt;aux_data_offset +</div><div class='del'>-			DIV_ROUND_UP(sizeof(struct rw_aux_tree) * t-&gt;size, 8);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bset_aux_tree_buf_start(const struct btree *b,</div><div class='del'>-					const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return t == b-&gt;set</div><div class='del'>-		? DIV_ROUND_UP(b-&gt;unpack_fn_len, 8)</div><div class='del'>-		: bset_aux_tree_buf_end(t - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *__aux_tree_base(const struct btree *b,</div><div class='del'>-			     const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return b-&gt;aux_data + t-&gt;aux_data_offset * 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ro_aux_tree *ro_aux_tree_base(const struct btree *b,</div><div class='del'>-					    const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(bset_aux_tree_type(t) != BSET_RO_AUX_TREE);</div><div class='del'>-</div><div class='del'>-	return __aux_tree_base(b, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 *ro_aux_tree_prev(const struct btree *b,</div><div class='del'>-			    const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(bset_aux_tree_type(t) != BSET_RO_AUX_TREE);</div><div class='del'>-</div><div class='del'>-	return __aux_tree_base(b, t) + bkey_float_byte_offset(t-&gt;size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_float *bkey_float(const struct btree *b,</div><div class='del'>-				     const struct bset_tree *t,</div><div class='del'>-				     unsigned idx)</div><div class='del'>-{</div><div class='del'>-	return ro_aux_tree_base(b, t)-&gt;f + idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bset_aux_tree_verify(const struct btree *b)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	const struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		if (t-&gt;aux_data_offset == U16_MAX)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		BUG_ON(t != b-&gt;set &amp;&amp;</div><div class='del'>-		       t[-1].aux_data_offset == U16_MAX);</div><div class='del'>-</div><div class='del'>-		BUG_ON(t-&gt;aux_data_offset &lt; bset_aux_tree_buf_start(b, t));</div><div class='del'>-		BUG_ON(t-&gt;aux_data_offset &gt; btree_aux_data_u64s(b));</div><div class='del'>-		BUG_ON(bset_aux_tree_buf_end(t) &gt; btree_aux_data_u64s(b));</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_keys_init(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	b-&gt;nsets		= 0;</div><div class='del'>-	memset(&amp;b-&gt;nr, 0, sizeof(b-&gt;nr));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_BSETS; i++)</div><div class='del'>-		b-&gt;set[i].data_offset = U16_MAX;</div><div class='del'>-</div><div class='del'>-	bch2_bset_set_no_aux_tree(b, b-&gt;set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Binary tree stuff for auxiliary search trees */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Cacheline/offset &lt;-&gt; bkey pointer arithmetic:</div><div class='del'>- *</div><div class='del'>- * t-&gt;tree is a binary search tree in an array; each node corresponds to a key</div><div class='del'>- * in one cacheline in t-&gt;set (BSET_CACHELINE bytes).</div><div class='del'>- *</div><div class='del'>- * This means we don't have to store the full index of the key that a node in</div><div class='del'>- * the binary tree points to; eytzinger1_to_inorder() gives us the cacheline, and</div><div class='del'>- * then bkey_float-&gt;m gives us the offset within that cacheline, in units of 8</div><div class='del'>- * bytes.</div><div class='del'>- *</div><div class='del'>- * cacheline_to_bkey() and friends abstract out all the pointer arithmetic to</div><div class='del'>- * make this work.</div><div class='del'>- *</div><div class='del'>- * To construct the bfloat for an arbitrary key we need to know what the key</div><div class='del'>- * immediately preceding it is: we have to check if the two keys differ in the</div><div class='del'>- * bits we're going to store in bkey_float-&gt;mantissa. t-&gt;prev[j] stores the size</div><div class='del'>- * of the previous key so we can walk backwards to it from t-&gt;tree[j]'s key.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void *bset_cacheline(const struct btree *b,</div><div class='del'>-				   const struct bset_tree *t,</div><div class='del'>-				   unsigned cacheline)</div><div class='del'>-{</div><div class='del'>-	return (void *) round_down((unsigned long) btree_bkey_first(b, t),</div><div class='del'>-				   L1_CACHE_BYTES) +</div><div class='del'>-		cacheline * BSET_CACHELINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_packed *cacheline_to_bkey(const struct btree *b,</div><div class='del'>-					     const struct bset_tree *t,</div><div class='del'>-					     unsigned cacheline,</div><div class='del'>-					     unsigned offset)</div><div class='del'>-{</div><div class='del'>-	return bset_cacheline(b, t, cacheline) + offset * 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bkey_to_cacheline(const struct btree *b,</div><div class='del'>-				  const struct bset_tree *t,</div><div class='del'>-				  const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return ((void *) k - bset_cacheline(b, t, 0)) / BSET_CACHELINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t __bkey_to_cacheline_offset(const struct btree *b,</div><div class='del'>-					  const struct bset_tree *t,</div><div class='del'>-					  unsigned cacheline,</div><div class='del'>-					  const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return (u64 *) k - (u64 *) bset_cacheline(b, t, cacheline);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bkey_to_cacheline_offset(const struct btree *b,</div><div class='del'>-					 const struct bset_tree *t,</div><div class='del'>-					 unsigned cacheline,</div><div class='del'>-					 const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	size_t m = __bkey_to_cacheline_offset(b, t, cacheline, k);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(m &gt; U8_MAX);</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *tree_to_bkey(const struct btree *b,</div><div class='del'>-					       const struct bset_tree *t,</div><div class='del'>-					       unsigned j)</div><div class='del'>-{</div><div class='del'>-	return cacheline_to_bkey(b, t,</div><div class='del'>-			__eytzinger1_to_inorder(j, t-&gt;size - 1, t-&gt;extra),</div><div class='del'>-			bkey_float(b, t, j)-&gt;key_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_packed *tree_to_prev_bkey(const struct btree *b,</div><div class='del'>-					     const struct bset_tree *t,</div><div class='del'>-					     unsigned j)</div><div class='del'>-{</div><div class='del'>-	unsigned prev_u64s = ro_aux_tree_prev(b, t)[j];</div><div class='del'>-</div><div class='del'>-	return (void *) ((u64 *) tree_to_bkey(b, t, j)-&gt;_data - prev_u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rw_aux_tree *rw_aux_tree(const struct btree *b,</div><div class='del'>-				       const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(bset_aux_tree_type(t) != BSET_RW_AUX_TREE);</div><div class='del'>-</div><div class='del'>-	return __aux_tree_base(b, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For the write set - the one we're currently inserting keys into - we don't</div><div class='del'>- * maintain a full search tree, we just keep a simple lookup table in t-&gt;prev.</div><div class='del'>- */</div><div class='del'>-static struct bkey_packed *rw_aux_to_bkey(const struct btree *b,</div><div class='del'>-					  struct bset_tree *t,</div><div class='del'>-					  unsigned j)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_offset_to_key(b, rw_aux_tree(b, t)[j].offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rw_aux_tree_set(const struct btree *b, struct bset_tree *t,</div><div class='del'>-			    unsigned j, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(k &gt;= btree_bkey_last(b, t));</div><div class='del'>-</div><div class='del'>-	rw_aux_tree(b, t)[j] = (struct rw_aux_tree) {</div><div class='del'>-		.offset	= __btree_node_key_to_offset(b, k),</div><div class='del'>-		.k	= bkey_unpack_pos(b, k),</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_bset_verify_rw_aux_tree(struct btree *b,</div><div class='del'>-					struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k = btree_bkey_first(b, t);</div><div class='del'>-	unsigned j = 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_expensive_debug_checks)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bset_has_ro_aux_tree(t));</div><div class='del'>-</div><div class='del'>-	if (!bset_has_rw_aux_tree(t))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(t-&gt;size &lt; 1);</div><div class='del'>-	BUG_ON(rw_aux_to_bkey(b, t, j) != k);</div><div class='del'>-</div><div class='del'>-	goto start;</div><div class='del'>-	while (1) {</div><div class='del'>-		if (rw_aux_to_bkey(b, t, j) == k) {</div><div class='del'>-			BUG_ON(!bpos_eq(rw_aux_tree(b, t)[j].k,</div><div class='del'>-					bkey_unpack_pos(b, k)));</div><div class='del'>-start:</div><div class='del'>-			if (++j == t-&gt;size)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			BUG_ON(rw_aux_tree(b, t)[j].offset &lt;=</div><div class='del'>-			       rw_aux_tree(b, t)[j - 1].offset);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		k = bkey_p_next(k);</div><div class='del'>-		BUG_ON(k &gt;= btree_bkey_last(b, t));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns idx of first entry &gt;= offset: */</div><div class='del'>-static unsigned rw_aux_tree_bsearch(struct btree *b,</div><div class='del'>-				    struct bset_tree *t,</div><div class='del'>-				    unsigned offset)</div><div class='del'>-{</div><div class='del'>-	unsigned bset_offs = offset - btree_bkey_first_offset(t);</div><div class='del'>-	unsigned bset_u64s = t-&gt;end_offset - btree_bkey_first_offset(t);</div><div class='del'>-	unsigned idx = bset_u64s ? bset_offs * t-&gt;size / bset_u64s : 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bset_aux_tree_type(t) != BSET_RW_AUX_TREE);</div><div class='del'>-	EBUG_ON(!t-&gt;size);</div><div class='del'>-	EBUG_ON(idx &gt; t-&gt;size);</div><div class='del'>-</div><div class='del'>-	while (idx &lt; t-&gt;size &amp;&amp;</div><div class='del'>-	       rw_aux_tree(b, t)[idx].offset &lt; offset)</div><div class='del'>-		idx++;</div><div class='del'>-</div><div class='del'>-	while (idx &amp;&amp;</div><div class='del'>-	       rw_aux_tree(b, t)[idx - 1].offset &gt;= offset)</div><div class='del'>-		idx--;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(idx &lt; t-&gt;size &amp;&amp;</div><div class='del'>-		rw_aux_tree(b, t)[idx].offset &lt; offset);</div><div class='del'>-	EBUG_ON(idx &amp;&amp; rw_aux_tree(b, t)[idx - 1].offset &gt;= offset);</div><div class='del'>-	EBUG_ON(idx + 1 &lt; t-&gt;size &amp;&amp;</div><div class='del'>-		rw_aux_tree(b, t)[idx].offset ==</div><div class='del'>-		rw_aux_tree(b, t)[idx + 1].offset);</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bkey_mantissa(const struct bkey_packed *k,</div><div class='del'>-				     const struct bkey_float *f,</div><div class='del'>-				     unsigned idx)</div><div class='del'>-{</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!bkey_packed(k));</div><div class='del'>-</div><div class='del'>-	v = get_unaligned((u64 *) (((u8 *) k-&gt;_data) + (f-&gt;exponent &gt;&gt; 3)));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In little endian, we're shifting off low bits (and then the bits we</div><div class='del'>-	 * want are at the low end), in big endian we're shifting off high bits</div><div class='del'>-	 * (and then the bits we want are at the high end, so we shift them</div><div class='del'>-	 * back down):</div><div class='del'>-	 */</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-	v &gt;&gt;= f-&gt;exponent &amp; 7;</div><div class='del'>-#else</div><div class='del'>-	v &gt;&gt;= 64 - (f-&gt;exponent &amp; 7) - BKEY_MANTISSA_BITS;</div><div class='del'>-#endif</div><div class='del'>-	return (u16) v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline void make_bfloat(struct btree *b, struct bset_tree *t,</div><div class='del'>-					unsigned j,</div><div class='del'>-					struct bkey_packed *min_key,</div><div class='del'>-					struct bkey_packed *max_key)</div><div class='del'>-{</div><div class='del'>-	struct bkey_float *f = bkey_float(b, t, j);</div><div class='del'>-	struct bkey_packed *m = tree_to_bkey(b, t, j);</div><div class='del'>-	struct bkey_packed *l = is_power_of_2(j)</div><div class='del'>-		? min_key</div><div class='del'>-		: tree_to_prev_bkey(b, t, j &gt;&gt; ffs(j));</div><div class='del'>-	struct bkey_packed *r = is_power_of_2(j + 1)</div><div class='del'>-		? max_key</div><div class='del'>-		: tree_to_bkey(b, t, j &gt;&gt; (ffz(j) + 1));</div><div class='del'>-	unsigned mantissa;</div><div class='del'>-	int shift, exponent, high_bit;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * for failed bfloats, the lookup code falls back to comparing against</div><div class='del'>-	 * the original key.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!bkey_packed(l) || !bkey_packed(r) || !bkey_packed(m) ||</div><div class='del'>-	    !b-&gt;nr_key_bits) {</div><div class='del'>-		f-&gt;exponent = BFLOAT_FAILED_UNPACKED;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The greatest differing bit of l and r is the first bit we must</div><div class='del'>-	 * include in the bfloat mantissa we're creating in order to do</div><div class='del'>-	 * comparisons - that bit always becomes the high bit of</div><div class='del'>-	 * bfloat-&gt;mantissa, and thus the exponent we're calculating here is</div><div class='del'>-	 * the position of what will become the low bit in bfloat-&gt;mantissa:</div><div class='del'>-	 *</div><div class='del'>-	 * Note that this may be negative - we may be running off the low end</div><div class='del'>-	 * of the key: we handle this later:</div><div class='del'>-	 */</div><div class='del'>-	high_bit = max(bch2_bkey_greatest_differing_bit(b, l, r),</div><div class='del'>-		       min_t(unsigned, BKEY_MANTISSA_BITS, b-&gt;nr_key_bits) - 1);</div><div class='del'>-	exponent = high_bit - (BKEY_MANTISSA_BITS - 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Then we calculate the actual shift value, from the start of the key</div><div class='del'>-	 * (k-&gt;_data), to get the key bits starting at exponent:</div><div class='del'>-	 */</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-	shift = (int) (b-&gt;format.key_u64s * 64 - b-&gt;nr_key_bits) + exponent;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(shift + BKEY_MANTISSA_BITS &gt; b-&gt;format.key_u64s * 64);</div><div class='del'>-#else</div><div class='del'>-	shift = high_bit_offset +</div><div class='del'>-		b-&gt;nr_key_bits -</div><div class='del'>-		exponent -</div><div class='del'>-		BKEY_MANTISSA_BITS;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(shift &lt; KEY_PACKED_BITS_START);</div><div class='del'>-#endif</div><div class='del'>-	EBUG_ON(shift &lt; 0 || shift &gt;= BFLOAT_FAILED);</div><div class='del'>-</div><div class='del'>-	f-&gt;exponent = shift;</div><div class='del'>-	mantissa = bkey_mantissa(m, f, j);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we've got garbage bits, set them to all 1s - it's legal for the</div><div class='del'>-	 * bfloat to compare larger than the original key, but not smaller:</div><div class='del'>-	 */</div><div class='del'>-	if (exponent &lt; 0)</div><div class='del'>-		mantissa |= ~(~0U &lt;&lt; -exponent);</div><div class='del'>-</div><div class='del'>-	f-&gt;mantissa = mantissa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bytes remaining - only valid for last bset: */</div><div class='del'>-static unsigned __bset_tree_capacity(const struct btree *b, const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	bset_aux_tree_verify(b);</div><div class='del'>-</div><div class='del'>-	return btree_aux_data_bytes(b) - t-&gt;aux_data_offset * sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bset_ro_tree_capacity(const struct btree *b, const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return __bset_tree_capacity(b, t) /</div><div class='del'>-		(sizeof(struct bkey_float) + sizeof(u8));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bset_rw_tree_capacity(const struct btree *b, const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return __bset_tree_capacity(b, t) / sizeof(struct rw_aux_tree);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void __build_rw_aux_tree(struct btree *b, struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-</div><div class='del'>-	t-&gt;size = 1;</div><div class='del'>-	t-&gt;extra = BSET_RW_AUX_TREE_VAL;</div><div class='del'>-	rw_aux_tree(b, t)[0].offset =</div><div class='del'>-		__btree_node_key_to_offset(b, btree_bkey_first(b, t));</div><div class='del'>-</div><div class='del'>-	bset_tree_for_each_key(b, t, k) {</div><div class='del'>-		if (t-&gt;size == bset_rw_tree_capacity(b, t))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if ((void *) k - (void *) rw_aux_to_bkey(b, t, t-&gt;size - 1) &gt;</div><div class='del'>-		    L1_CACHE_BYTES)</div><div class='del'>-			rw_aux_tree_set(b, t, t-&gt;size++, k);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void __build_ro_aux_tree(struct btree *b, struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *prev = NULL, *k = btree_bkey_first(b, t);</div><div class='del'>-	struct bkey_i min_key, max_key;</div><div class='del'>-	unsigned cacheline = 1;</div><div class='del'>-</div><div class='del'>-	t-&gt;size = min(bkey_to_cacheline(b, t, btree_bkey_last(b, t)),</div><div class='del'>-		      bset_ro_tree_capacity(b, t));</div><div class='del'>-retry:</div><div class='del'>-	if (t-&gt;size &lt; 2) {</div><div class='del'>-		t-&gt;size = 0;</div><div class='del'>-		t-&gt;extra = BSET_NO_AUX_TREE_VAL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t-&gt;extra = (t-&gt;size - rounddown_pow_of_two(t-&gt;size - 1)) &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-	/* First we figure out where the first key in each cacheline is */</div><div class='del'>-	eytzinger1_for_each(j, t-&gt;size - 1) {</div><div class='del'>-		while (bkey_to_cacheline(b, t, k) &lt; cacheline)</div><div class='del'>-			prev = k, k = bkey_p_next(k);</div><div class='del'>-</div><div class='del'>-		if (k &gt;= btree_bkey_last(b, t)) {</div><div class='del'>-			/* XXX: this path sucks */</div><div class='del'>-			t-&gt;size--;</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ro_aux_tree_prev(b, t)[j] = prev-&gt;u64s;</div><div class='del'>-		bkey_float(b, t, j)-&gt;key_offset =</div><div class='del'>-			bkey_to_cacheline_offset(b, t, cacheline++, k);</div><div class='del'>-</div><div class='del'>-		EBUG_ON(tree_to_prev_bkey(b, t, j) != prev);</div><div class='del'>-		EBUG_ON(tree_to_bkey(b, t, j) != k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (k != btree_bkey_last(b, t))</div><div class='del'>-		prev = k, k = bkey_p_next(k);</div><div class='del'>-</div><div class='del'>-	if (!bkey_pack_pos(bkey_to_packed(&amp;min_key), b-&gt;data-&gt;min_key, b)) {</div><div class='del'>-		bkey_init(&amp;min_key.k);</div><div class='del'>-		min_key.k.p = b-&gt;data-&gt;min_key;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bkey_pack_pos(bkey_to_packed(&amp;max_key), b-&gt;data-&gt;max_key, b)) {</div><div class='del'>-		bkey_init(&amp;max_key.k);</div><div class='del'>-		max_key.k.p = b-&gt;data-&gt;max_key;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Then we build the tree */</div><div class='del'>-	eytzinger1_for_each(j, t-&gt;size - 1)</div><div class='del'>-		make_bfloat(b, t, j,</div><div class='del'>-			    bkey_to_packed(&amp;min_key),</div><div class='del'>-			    bkey_to_packed(&amp;max_key));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bset_alloc_tree(struct btree *b, struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *i;</div><div class='del'>-</div><div class='del'>-	for (i = b-&gt;set; i != t; i++)</div><div class='del'>-		BUG_ON(bset_has_rw_aux_tree(i));</div><div class='del'>-</div><div class='del'>-	bch2_bset_set_no_aux_tree(b, t);</div><div class='del'>-</div><div class='del'>-	/* round up to next cacheline: */</div><div class='del'>-	t-&gt;aux_data_offset = round_up(bset_aux_tree_buf_start(b, t),</div><div class='del'>-				      SMP_CACHE_BYTES / sizeof(u64));</div><div class='del'>-</div><div class='del'>-	bset_aux_tree_verify(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bset_build_aux_tree(struct btree *b, struct bset_tree *t,</div><div class='del'>-			     bool writeable)</div><div class='del'>-{</div><div class='del'>-	if (writeable</div><div class='del'>-	    ? bset_has_rw_aux_tree(t)</div><div class='del'>-	    : bset_has_ro_aux_tree(t))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bset_alloc_tree(b, t);</div><div class='del'>-</div><div class='del'>-	if (!__bset_tree_capacity(b, t))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (writeable)</div><div class='del'>-		__build_rw_aux_tree(b, t);</div><div class='del'>-	else</div><div class='del'>-		__build_ro_aux_tree(b, t);</div><div class='del'>-</div><div class='del'>-	bset_aux_tree_verify(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bset_init_first(struct btree *b, struct bset *i)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;nsets);</div><div class='del'>-</div><div class='del'>-	memset(i, 0, sizeof(*i));</div><div class='del'>-	get_random_bytes(&amp;i-&gt;seq, sizeof(i-&gt;seq));</div><div class='del'>-	SET_BSET_BIG_ENDIAN(i, CPU_BIG_ENDIAN);</div><div class='del'>-</div><div class='del'>-	t = &amp;b-&gt;set[b-&gt;nsets++];</div><div class='del'>-	set_btree_bset(b, t, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bset_init_next(struct btree *b, struct btree_node_entry *bne)</div><div class='del'>-{</div><div class='del'>-	struct bset *i = &amp;bne-&gt;keys;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bset_byte_offset(b, bne) &gt;= btree_buf_bytes(b));</div><div class='del'>-	BUG_ON((void *) bne &lt; (void *) btree_bkey_last(b, bset_tree_last(b)));</div><div class='del'>-	BUG_ON(b-&gt;nsets &gt;= MAX_BSETS);</div><div class='del'>-</div><div class='del'>-	memset(i, 0, sizeof(*i));</div><div class='del'>-	i-&gt;seq = btree_bset_first(b)-&gt;seq;</div><div class='del'>-	SET_BSET_BIG_ENDIAN(i, CPU_BIG_ENDIAN);</div><div class='del'>-</div><div class='del'>-	t = &amp;b-&gt;set[b-&gt;nsets++];</div><div class='del'>-	set_btree_bset(b, t, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * find _some_ key in the same bset as @k that precedes @k - not necessarily the</div><div class='del'>- * immediate predecessor:</div><div class='del'>- */</div><div class='del'>-static struct bkey_packed *__bkey_prev(struct btree *b, struct bset_tree *t,</div><div class='del'>-				       struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *p;</div><div class='del'>-	unsigned offset;</div><div class='del'>-	int j;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(k &lt; btree_bkey_first(b, t) ||</div><div class='del'>-		k &gt; btree_bkey_last(b, t));</div><div class='del'>-</div><div class='del'>-	if (k == btree_bkey_first(b, t))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	switch (bset_aux_tree_type(t)) {</div><div class='del'>-	case BSET_NO_AUX_TREE:</div><div class='del'>-		p = btree_bkey_first(b, t);</div><div class='del'>-		break;</div><div class='del'>-	case BSET_RO_AUX_TREE:</div><div class='del'>-		j = min_t(unsigned, t-&gt;size - 1, bkey_to_cacheline(b, t, k));</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			p = j ? tree_to_bkey(b, t,</div><div class='del'>-					__inorder_to_eytzinger1(j--,</div><div class='del'>-							t-&gt;size - 1, t-&gt;extra))</div><div class='del'>-			      : btree_bkey_first(b, t);</div><div class='del'>-		} while (p &gt;= k);</div><div class='del'>-		break;</div><div class='del'>-	case BSET_RW_AUX_TREE:</div><div class='del'>-		offset = __btree_node_key_to_offset(b, k);</div><div class='del'>-		j = rw_aux_tree_bsearch(b, t, offset);</div><div class='del'>-		p = j ? rw_aux_to_bkey(b, t, j - 1)</div><div class='del'>-		      : btree_bkey_first(b, t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_packed *bch2_bkey_prev_filter(struct btree *b,</div><div class='del'>-					  struct bset_tree *t,</div><div class='del'>-					  struct bkey_packed *k,</div><div class='del'>-					  unsigned min_key_type)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *p, *i, *ret = NULL, *orig_k = k;</div><div class='del'>-</div><div class='del'>-	while ((p = __bkey_prev(b, t, k)) &amp;&amp; !ret) {</div><div class='del'>-		for (i = p; i != k; i = bkey_p_next(i))</div><div class='del'>-			if (i-&gt;type &gt;= min_key_type)</div><div class='del'>-				ret = i;</div><div class='del'>-</div><div class='del'>-		k = p;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_expensive_debug_checks) {</div><div class='del'>-		BUG_ON(ret &gt;= orig_k);</div><div class='del'>-</div><div class='del'>-		for (i = ret</div><div class='del'>-			? bkey_p_next(ret)</div><div class='del'>-			: btree_bkey_first(b, t);</div><div class='del'>-		     i != orig_k;</div><div class='del'>-		     i = bkey_p_next(i))</div><div class='del'>-			BUG_ON(i-&gt;type &gt;= min_key_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Insert */</div><div class='del'>-</div><div class='del'>-static void bch2_bset_fix_lookup_table(struct btree *b,</div><div class='del'>-				       struct bset_tree *t,</div><div class='del'>-				       struct bkey_packed *_where,</div><div class='del'>-				       unsigned clobber_u64s,</div><div class='del'>-				       unsigned new_u64s)</div><div class='del'>-{</div><div class='del'>-	int shift = new_u64s - clobber_u64s;</div><div class='del'>-	unsigned l, j, where = __btree_node_key_to_offset(b, _where);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bset_has_ro_aux_tree(t));</div><div class='del'>-</div><div class='del'>-	if (!bset_has_rw_aux_tree(t))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* returns first entry &gt;= where */</div><div class='del'>-	l = rw_aux_tree_bsearch(b, t, where);</div><div class='del'>-</div><div class='del'>-	if (!l) /* never delete first entry */</div><div class='del'>-		l++;</div><div class='del'>-	else if (l &lt; t-&gt;size &amp;&amp;</div><div class='del'>-		 where &lt; t-&gt;end_offset &amp;&amp;</div><div class='del'>-		 rw_aux_tree(b, t)[l].offset == where)</div><div class='del'>-		rw_aux_tree_set(b, t, l++, _where);</div><div class='del'>-</div><div class='del'>-	/* l now &gt; where */</div><div class='del'>-</div><div class='del'>-	for (j = l;</div><div class='del'>-	     j &lt; t-&gt;size &amp;&amp;</div><div class='del'>-	     rw_aux_tree(b, t)[j].offset &lt; where + clobber_u64s;</div><div class='del'>-	     j++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	if (j &lt; t-&gt;size &amp;&amp;</div><div class='del'>-	    rw_aux_tree(b, t)[j].offset + shift ==</div><div class='del'>-	    rw_aux_tree(b, t)[l - 1].offset)</div><div class='del'>-		j++;</div><div class='del'>-</div><div class='del'>-	memmove(&amp;rw_aux_tree(b, t)[l],</div><div class='del'>-		&amp;rw_aux_tree(b, t)[j],</div><div class='del'>-		(void *) &amp;rw_aux_tree(b, t)[t-&gt;size] -</div><div class='del'>-		(void *) &amp;rw_aux_tree(b, t)[j]);</div><div class='del'>-	t-&gt;size -= j - l;</div><div class='del'>-</div><div class='del'>-	for (j = l; j &lt; t-&gt;size; j++)</div><div class='del'>-		rw_aux_tree(b, t)[j].offset += shift;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(l &lt; t-&gt;size &amp;&amp;</div><div class='del'>-		rw_aux_tree(b, t)[l].offset ==</div><div class='del'>-		rw_aux_tree(b, t)[l - 1].offset);</div><div class='del'>-</div><div class='del'>-	if (t-&gt;size &lt; bset_rw_tree_capacity(b, t) &amp;&amp;</div><div class='del'>-	    (l &lt; t-&gt;size</div><div class='del'>-	     ? rw_aux_tree(b, t)[l].offset</div><div class='del'>-	     : t-&gt;end_offset) -</div><div class='del'>-	    rw_aux_tree(b, t)[l - 1].offset &gt;</div><div class='del'>-	    L1_CACHE_BYTES / sizeof(u64)) {</div><div class='del'>-		struct bkey_packed *start = rw_aux_to_bkey(b, t, l - 1);</div><div class='del'>-		struct bkey_packed *end = l &lt; t-&gt;size</div><div class='del'>-			? rw_aux_to_bkey(b, t, l)</div><div class='del'>-			: btree_bkey_last(b, t);</div><div class='del'>-		struct bkey_packed *k = start;</div><div class='del'>-</div><div class='del'>-		while (1) {</div><div class='del'>-			k = bkey_p_next(k);</div><div class='del'>-			if (k == end)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if ((void *) k - (void *) start &gt;= L1_CACHE_BYTES) {</div><div class='del'>-				memmove(&amp;rw_aux_tree(b, t)[l + 1],</div><div class='del'>-					&amp;rw_aux_tree(b, t)[l],</div><div class='del'>-					(void *) &amp;rw_aux_tree(b, t)[t-&gt;size] -</div><div class='del'>-					(void *) &amp;rw_aux_tree(b, t)[l]);</div><div class='del'>-				t-&gt;size++;</div><div class='del'>-				rw_aux_tree_set(b, t, l, k);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bset_verify_rw_aux_tree(b, t);</div><div class='del'>-	bset_aux_tree_verify(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bset_insert(struct btree *b,</div><div class='del'>-		      struct btree_node_iter *iter,</div><div class='del'>-		      struct bkey_packed *where,</div><div class='del'>-		      struct bkey_i *insert,</div><div class='del'>-		      unsigned clobber_u64s)</div><div class='del'>-{</div><div class='del'>-	struct bkey_format *f = &amp;b-&gt;format;</div><div class='del'>-	struct bset_tree *t = bset_tree_last(b);</div><div class='del'>-	struct bkey_packed packed, *src = bkey_to_packed(insert);</div><div class='del'>-</div><div class='del'>-	bch2_bset_verify_rw_aux_tree(b, t);</div><div class='del'>-	bch2_verify_insert_pos(b, where, bkey_to_packed(insert), clobber_u64s);</div><div class='del'>-</div><div class='del'>-	if (bch2_bkey_pack_key(&amp;packed, &amp;insert-&gt;k, f))</div><div class='del'>-		src = &amp;packed;</div><div class='del'>-</div><div class='del'>-	if (!bkey_deleted(&amp;insert-&gt;k))</div><div class='del'>-		btree_keys_account_key_add(&amp;b-&gt;nr, t - b-&gt;set, src);</div><div class='del'>-</div><div class='del'>-	if (src-&gt;u64s != clobber_u64s) {</div><div class='del'>-		u64 *src_p = (u64 *) where-&gt;_data + clobber_u64s;</div><div class='del'>-		u64 *dst_p = (u64 *) where-&gt;_data + src-&gt;u64s;</div><div class='del'>-</div><div class='del'>-		EBUG_ON((int) le16_to_cpu(bset(b, t)-&gt;u64s) &lt;</div><div class='del'>-			(int) clobber_u64s - src-&gt;u64s);</div><div class='del'>-</div><div class='del'>-		memmove_u64s(dst_p, src_p, btree_bkey_last(b, t)-&gt;_data - src_p);</div><div class='del'>-		le16_add_cpu(&amp;bset(b, t)-&gt;u64s, src-&gt;u64s - clobber_u64s);</div><div class='del'>-		set_btree_bset_end(b, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy_u64s_small(where, src,</div><div class='del'>-		    bkeyp_key_u64s(f, src));</div><div class='del'>-	memcpy_u64s(bkeyp_val(f, where), &amp;insert-&gt;v,</div><div class='del'>-		    bkeyp_val_u64s(f, src));</div><div class='del'>-</div><div class='del'>-	if (src-&gt;u64s != clobber_u64s)</div><div class='del'>-		bch2_bset_fix_lookup_table(b, t, where, clobber_u64s, src-&gt;u64s);</div><div class='del'>-</div><div class='del'>-	bch2_verify_btree_nr_keys(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bset_delete(struct btree *b,</div><div class='del'>-		      struct bkey_packed *where,</div><div class='del'>-		      unsigned clobber_u64s)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t = bset_tree_last(b);</div><div class='del'>-	u64 *src_p = (u64 *) where-&gt;_data + clobber_u64s;</div><div class='del'>-	u64 *dst_p = where-&gt;_data;</div><div class='del'>-</div><div class='del'>-	bch2_bset_verify_rw_aux_tree(b, t);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(le16_to_cpu(bset(b, t)-&gt;u64s) &lt; clobber_u64s);</div><div class='del'>-</div><div class='del'>-	memmove_u64s_down(dst_p, src_p, btree_bkey_last(b, t)-&gt;_data - src_p);</div><div class='del'>-	le16_add_cpu(&amp;bset(b, t)-&gt;u64s, -clobber_u64s);</div><div class='del'>-	set_btree_bset_end(b, t);</div><div class='del'>-</div><div class='del'>-	bch2_bset_fix_lookup_table(b, t, where, clobber_u64s, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Lookup */</div><div class='del'>-</div><div class='del'>-__flatten</div><div class='del'>-static struct bkey_packed *bset_search_write_set(const struct btree *b,</div><div class='del'>-				struct bset_tree *t,</div><div class='del'>-				struct bpos *search)</div><div class='del'>-{</div><div class='del'>-	unsigned l = 0, r = t-&gt;size;</div><div class='del'>-</div><div class='del'>-	while (l + 1 != r) {</div><div class='del'>-		unsigned m = (l + r) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-		if (bpos_lt(rw_aux_tree(b, t)[m].k, *search))</div><div class='del'>-			l = m;</div><div class='del'>-		else</div><div class='del'>-			r = m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rw_aux_to_bkey(b, t, l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prefetch_four_cachelines(void *p)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	asm("prefetcht0 (-127 + 64 * 0)(%0);"</div><div class='del'>-	    "prefetcht0 (-127 + 64 * 1)(%0);"</div><div class='del'>-	    "prefetcht0 (-127 + 64 * 2)(%0);"</div><div class='del'>-	    "prefetcht0 (-127 + 64 * 3)(%0);"</div><div class='del'>-	    :</div><div class='del'>-	    : "r" (p + 127));</div><div class='del'>-#else</div><div class='del'>-	prefetch(p + L1_CACHE_BYTES * 0);</div><div class='del'>-	prefetch(p + L1_CACHE_BYTES * 1);</div><div class='del'>-	prefetch(p + L1_CACHE_BYTES * 2);</div><div class='del'>-	prefetch(p + L1_CACHE_BYTES * 3);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_mantissa_bits_dropped(const struct btree *b,</div><div class='del'>-					      const struct bkey_float *f,</div><div class='del'>-					      unsigned idx)</div><div class='del'>-{</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-	unsigned key_bits_start = b-&gt;format.key_u64s * 64 - b-&gt;nr_key_bits;</div><div class='del'>-</div><div class='del'>-	return f-&gt;exponent &gt; key_bits_start;</div><div class='del'>-#else</div><div class='del'>-	unsigned key_bits_end = high_bit_offset + b-&gt;nr_key_bits;</div><div class='del'>-</div><div class='del'>-	return f-&gt;exponent + BKEY_MANTISSA_BITS &lt; key_bits_end;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__flatten</div><div class='del'>-static struct bkey_packed *bset_search_tree(const struct btree *b,</div><div class='del'>-				const struct bset_tree *t,</div><div class='del'>-				const struct bpos *search,</div><div class='del'>-				const struct bkey_packed *packed_search)</div><div class='del'>-{</div><div class='del'>-	struct ro_aux_tree *base = ro_aux_tree_base(b, t);</div><div class='del'>-	struct bkey_float *f;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	unsigned inorder, n = 1, l, r;</div><div class='del'>-	int cmp;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (likely(n &lt;&lt; 4 &lt; t-&gt;size))</div><div class='del'>-			prefetch(&amp;base-&gt;f[n &lt;&lt; 4]);</div><div class='del'>-</div><div class='del'>-		f = &amp;base-&gt;f[n];</div><div class='del'>-		if (unlikely(f-&gt;exponent &gt;= BFLOAT_FAILED))</div><div class='del'>-			goto slowpath;</div><div class='del'>-</div><div class='del'>-		l = f-&gt;mantissa;</div><div class='del'>-		r = bkey_mantissa(packed_search, f, n);</div><div class='del'>-</div><div class='del'>-		if (unlikely(l == r) &amp;&amp; bkey_mantissa_bits_dropped(b, f, n))</div><div class='del'>-			goto slowpath;</div><div class='del'>-</div><div class='del'>-		n = n * 2 + (l &lt; r);</div><div class='del'>-		continue;</div><div class='del'>-slowpath:</div><div class='del'>-		k = tree_to_bkey(b, t, n);</div><div class='del'>-		cmp = bkey_cmp_p_or_unp(b, k, packed_search, search);</div><div class='del'>-		if (!cmp)</div><div class='del'>-			return k;</div><div class='del'>-</div><div class='del'>-		n = n * 2 + (cmp &lt; 0);</div><div class='del'>-	} while (n &lt; t-&gt;size);</div><div class='del'>-</div><div class='del'>-	inorder = __eytzinger1_to_inorder(n &gt;&gt; 1, t-&gt;size - 1, t-&gt;extra);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * n would have been the node we recursed to - the low bit tells us if</div><div class='del'>-	 * we recursed left or recursed right.</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!(n &amp; 1))) {</div><div class='del'>-		--inorder;</div><div class='del'>-		if (unlikely(!inorder))</div><div class='del'>-			return btree_bkey_first(b, t);</div><div class='del'>-</div><div class='del'>-		f = &amp;base-&gt;f[eytzinger1_prev(n &gt;&gt; 1, t-&gt;size - 1)];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cacheline_to_bkey(b, t, inorder, f-&gt;key_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline __flatten</div><div class='del'>-struct bkey_packed *__bch2_bset_search(struct btree *b,</div><div class='del'>-				struct bset_tree *t,</div><div class='del'>-				struct bpos *search,</div><div class='del'>-				const struct bkey_packed *lossy_packed_search)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First, we search for a cacheline, then lastly we do a linear search</div><div class='del'>-	 * within that cacheline.</div><div class='del'>-	 *</div><div class='del'>-	 * To search for the cacheline, there's three different possibilities:</div><div class='del'>-	 *  * The set is too small to have a search tree, so we just do a linear</div><div class='del'>-	 *    search over the whole set.</div><div class='del'>-	 *  * The set is the one we're currently inserting into; keeping a full</div><div class='del'>-	 *    auxiliary search tree up to date would be too expensive, so we</div><div class='del'>-	 *    use a much simpler lookup table to do a binary search -</div><div class='del'>-	 *    bset_search_write_set().</div><div class='del'>-	 *  * Or we use the auxiliary search tree we constructed earlier -</div><div class='del'>-	 *    bset_search_tree()</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (bset_aux_tree_type(t)) {</div><div class='del'>-	case BSET_NO_AUX_TREE:</div><div class='del'>-		return btree_bkey_first(b, t);</div><div class='del'>-	case BSET_RW_AUX_TREE:</div><div class='del'>-		return bset_search_write_set(b, t, search);</div><div class='del'>-	case BSET_RO_AUX_TREE:</div><div class='del'>-		return bset_search_tree(b, t, search, lossy_packed_search);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline __flatten</div><div class='del'>-struct bkey_packed *bch2_bset_search_linear(struct btree *b,</div><div class='del'>-				struct bset_tree *t,</div><div class='del'>-				struct bpos *search,</div><div class='del'>-				struct bkey_packed *packed_search,</div><div class='del'>-				const struct bkey_packed *lossy_packed_search,</div><div class='del'>-				struct bkey_packed *m)</div><div class='del'>-{</div><div class='del'>-	if (lossy_packed_search)</div><div class='del'>-		while (m != btree_bkey_last(b, t) &amp;&amp;</div><div class='del'>-		       bkey_iter_cmp_p_or_unp(b, m,</div><div class='del'>-					lossy_packed_search, search) &lt; 0)</div><div class='del'>-			m = bkey_p_next(m);</div><div class='del'>-</div><div class='del'>-	if (!packed_search)</div><div class='del'>-		while (m != btree_bkey_last(b, t) &amp;&amp;</div><div class='del'>-		       bkey_iter_pos_cmp(b, m, search) &lt; 0)</div><div class='del'>-			m = bkey_p_next(m);</div><div class='del'>-</div><div class='del'>-	if (bch2_expensive_debug_checks) {</div><div class='del'>-		struct bkey_packed *prev = bch2_bkey_prev_all(b, t, m);</div><div class='del'>-</div><div class='del'>-		BUG_ON(prev &amp;&amp;</div><div class='del'>-		       bkey_iter_cmp_p_or_unp(b, prev,</div><div class='del'>-					packed_search, search) &gt;= 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree node iterator */</div><div class='del'>-</div><div class='del'>-static inline void __bch2_btree_node_iter_push(struct btree_node_iter *iter,</div><div class='del'>-			      struct btree *b,</div><div class='del'>-			      const struct bkey_packed *k,</div><div class='del'>-			      const struct bkey_packed *end)</div><div class='del'>-{</div><div class='del'>-	if (k != end) {</div><div class='del'>-		struct btree_node_iter_set *pos;</div><div class='del'>-</div><div class='del'>-		btree_node_iter_for_each(iter, pos)</div><div class='del'>-			;</div><div class='del'>-</div><div class='del'>-		BUG_ON(pos &gt;= iter-&gt;data + ARRAY_SIZE(iter-&gt;data));</div><div class='del'>-		*pos = (struct btree_node_iter_set) {</div><div class='del'>-			__btree_node_key_to_offset(b, k),</div><div class='del'>-			__btree_node_key_to_offset(b, end)</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_push(struct btree_node_iter *iter,</div><div class='del'>-			       struct btree *b,</div><div class='del'>-			       const struct bkey_packed *k,</div><div class='del'>-			       const struct bkey_packed *end)</div><div class='del'>-{</div><div class='del'>-	__bch2_btree_node_iter_push(iter, b, k, end);</div><div class='del'>-	bch2_btree_node_iter_sort(iter, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __flatten __cold</div><div class='del'>-static void btree_node_iter_init_pack_failed(struct btree_node_iter *iter,</div><div class='del'>-			      struct btree *b, struct bpos *search)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-</div><div class='del'>-	trace_bkey_pack_pos_fail(search);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_init_from_start(iter, b);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_node_iter_peek(iter, b)) &amp;&amp;</div><div class='del'>-	       bkey_iter_pos_cmp(b, k, search) &lt; 0)</div><div class='del'>-		bch2_btree_node_iter_advance(iter, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_node_iter_init - initialize a btree node iterator, starting from a</div><div class='del'>- * given position</div><div class='del'>- *</div><div class='del'>- * @iter:	iterator to initialize</div><div class='del'>- * @b:		btree node to search</div><div class='del'>- * @search:	search key</div><div class='del'>- *</div><div class='del'>- * Main entry point to the lookup code for individual btree nodes:</div><div class='del'>- *</div><div class='del'>- * NOTE:</div><div class='del'>- *</div><div class='del'>- * When you don't filter out deleted keys, btree nodes _do_ contain duplicate</div><div class='del'>- * keys. This doesn't matter for most code, but it does matter for lookups.</div><div class='del'>- *</div><div class='del'>- * Some adjacent keys with a string of equal keys:</div><div class='del'>- *	i j k k k k l m</div><div class='del'>- *</div><div class='del'>- * If you search for k, the lookup code isn't guaranteed to return you any</div><div class='del'>- * specific k. The lookup code is conceptually doing a binary search and</div><div class='del'>- * iterating backwards is very expensive so if the pivot happens to land at the</div><div class='del'>- * last k that's what you'll get.</div><div class='del'>- *</div><div class='del'>- * This works out ok, but it's something to be aware of:</div><div class='del'>- *</div><div class='del'>- *  - For non extents, we guarantee that the live key comes last - see</div><div class='del'>- *    btree_node_iter_cmp(), keys_out_of_order(). So the duplicates you don't</div><div class='del'>- *    see will only be deleted keys you don't care about.</div><div class='del'>- *</div><div class='del'>- *  - For extents, deleted keys sort last (see the comment at the top of this</div><div class='del'>- *    file). But when you're searching for extents, you actually want the first</div><div class='del'>- *    key strictly greater than your search key - an extent that compares equal</div><div class='del'>- *    to the search key is going to have 0 sectors after the search key.</div><div class='del'>- *</div><div class='del'>- *    But this does mean that we can't just search for</div><div class='del'>- *    bpos_successor(start_of_range) to get the first extent that overlaps with</div><div class='del'>- *    the range we want - if we're unlucky and there's an extent that ends</div><div class='del'>- *    exactly where we searched, then there could be a deleted key at the same</div><div class='del'>- *    position and we'd get that when we search instead of the preceding extent</div><div class='del'>- *    we needed.</div><div class='del'>- *</div><div class='del'>- *    So we've got to search for start_of_range, then after the lookup iterate</div><div class='del'>- *    past any extents that compare equal to the position we searched for.</div><div class='del'>- */</div><div class='del'>-__flatten</div><div class='del'>-void bch2_btree_node_iter_init(struct btree_node_iter *iter,</div><div class='del'>-			       struct btree *b, struct bpos *search)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed p, *packed_search = NULL;</div><div class='del'>-	struct btree_node_iter_set *pos = iter-&gt;data;</div><div class='del'>-	struct bkey_packed *k[MAX_BSETS];</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bpos_lt(*search, b-&gt;data-&gt;min_key));</div><div class='del'>-	EBUG_ON(bpos_gt(*search, b-&gt;data-&gt;max_key));</div><div class='del'>-	bset_aux_tree_verify(b);</div><div class='del'>-</div><div class='del'>-	memset(iter, 0, sizeof(*iter));</div><div class='del'>-</div><div class='del'>-	switch (bch2_bkey_pack_pos_lossy(&amp;p, *search, b)) {</div><div class='del'>-	case BKEY_PACK_POS_EXACT:</div><div class='del'>-		packed_search = &amp;p;</div><div class='del'>-		break;</div><div class='del'>-	case BKEY_PACK_POS_SMALLER:</div><div class='del'>-		packed_search = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case BKEY_PACK_POS_FAIL:</div><div class='del'>-		btree_node_iter_init_pack_failed(iter, b, search);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; b-&gt;nsets; i++) {</div><div class='del'>-		k[i] = __bch2_bset_search(b, b-&gt;set + i, search, &amp;p);</div><div class='del'>-		prefetch_four_cachelines(k[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; b-&gt;nsets; i++) {</div><div class='del'>-		struct bset_tree *t = b-&gt;set + i;</div><div class='del'>-		struct bkey_packed *end = btree_bkey_last(b, t);</div><div class='del'>-</div><div class='del'>-		k[i] = bch2_bset_search_linear(b, t, search,</div><div class='del'>-					       packed_search, &amp;p, k[i]);</div><div class='del'>-		if (k[i] != end)</div><div class='del'>-			*pos++ = (struct btree_node_iter_set) {</div><div class='del'>-				__btree_node_key_to_offset(b, k[i]),</div><div class='del'>-				__btree_node_key_to_offset(b, end)</div><div class='del'>-			};</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_sort(iter, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_init_from_start(struct btree_node_iter *iter,</div><div class='del'>-					  struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	memset(iter, 0, sizeof(*iter));</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		__bch2_btree_node_iter_push(iter, b,</div><div class='del'>-					   btree_bkey_first(b, t),</div><div class='del'>-					   btree_bkey_last(b, t));</div><div class='del'>-	bch2_btree_node_iter_sort(iter, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_packed *bch2_btree_node_iter_bset_pos(struct btree_node_iter *iter,</div><div class='del'>-						  struct btree *b,</div><div class='del'>-						  struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter_set *set;</div><div class='del'>-</div><div class='del'>-	btree_node_iter_for_each(iter, set)</div><div class='del'>-		if (set-&gt;end == t-&gt;end_offset)</div><div class='del'>-			return __btree_node_offset_to_key(b, set-&gt;k);</div><div class='del'>-</div><div class='del'>-	return btree_bkey_last(b, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_iter_sort_two(struct btree_node_iter *iter,</div><div class='del'>-					    struct btree *b,</div><div class='del'>-					    unsigned first)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	if ((ret = (btree_node_iter_cmp(b,</div><div class='del'>-					iter-&gt;data[first],</div><div class='del'>-					iter-&gt;data[first + 1]) &gt; 0)))</div><div class='del'>-		swap(iter-&gt;data[first], iter-&gt;data[first + 1]);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_sort(struct btree_node_iter *iter,</div><div class='del'>-			       struct btree *b)</div><div class='del'>-{</div><div class='del'>-	/* unrolled bubble sort: */</div><div class='del'>-</div><div class='del'>-	if (!__btree_node_iter_set_end(iter, 2)) {</div><div class='del'>-		btree_node_iter_sort_two(iter, b, 0);</div><div class='del'>-		btree_node_iter_sort_two(iter, b, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!__btree_node_iter_set_end(iter, 1))</div><div class='del'>-		btree_node_iter_sort_two(iter, b, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_set_drop(struct btree_node_iter *iter,</div><div class='del'>-				   struct btree_node_iter_set *set)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter_set *last =</div><div class='del'>-		iter-&gt;data + ARRAY_SIZE(iter-&gt;data) - 1;</div><div class='del'>-</div><div class='del'>-	memmove(&amp;set[0], &amp;set[1], (void *) last - (void *) set);</div><div class='del'>-	*last = (struct btree_node_iter_set) { 0, 0 };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __bch2_btree_node_iter_advance(struct btree_node_iter *iter,</div><div class='del'>-						  struct btree *b)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;data-&gt;k += __bch2_btree_node_iter_peek_all(iter, b)-&gt;u64s;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(iter-&gt;data-&gt;k &gt; iter-&gt;data-&gt;end);</div><div class='del'>-</div><div class='del'>-	if (unlikely(__btree_node_iter_set_end(iter, 0))) {</div><div class='del'>-		/* avoid an expensive memmove call: */</div><div class='del'>-		iter-&gt;data[0] = iter-&gt;data[1];</div><div class='del'>-		iter-&gt;data[1] = iter-&gt;data[2];</div><div class='del'>-		iter-&gt;data[2] = (struct btree_node_iter_set) { 0, 0 };</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (__btree_node_iter_set_end(iter, 1))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!btree_node_iter_sort_two(iter, b, 0))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (__btree_node_iter_set_end(iter, 2))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btree_node_iter_sort_two(iter, b, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_advance(struct btree_node_iter *iter,</div><div class='del'>-				  struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (bch2_expensive_debug_checks) {</div><div class='del'>-		bch2_btree_node_iter_verify(iter, b);</div><div class='del'>-		bch2_btree_node_iter_next_check(iter, b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_btree_node_iter_advance(iter, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Expensive:</div><div class='del'>- */</div><div class='del'>-struct bkey_packed *bch2_btree_node_iter_prev_all(struct btree_node_iter *iter,</div><div class='del'>-						  struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k, *prev = NULL;</div><div class='del'>-	struct btree_node_iter_set *set;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	unsigned end = 0;</div><div class='del'>-</div><div class='del'>-	if (bch2_expensive_debug_checks)</div><div class='del'>-		bch2_btree_node_iter_verify(iter, b);</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		k = bch2_bkey_prev_all(b, t,</div><div class='del'>-			bch2_btree_node_iter_bset_pos(iter, b, t));</div><div class='del'>-		if (k &amp;&amp;</div><div class='del'>-		    (!prev || bkey_iter_cmp(b, k, prev) &gt; 0)) {</div><div class='del'>-			prev = k;</div><div class='del'>-			end = t-&gt;end_offset;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!prev)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We're manually memmoving instead of just calling sort() to ensure the</div><div class='del'>-	 * prev we picked ends up in slot 0 - sort won't necessarily put it</div><div class='del'>-	 * there because of duplicate deleted keys:</div><div class='del'>-	 */</div><div class='del'>-	btree_node_iter_for_each(iter, set)</div><div class='del'>-		if (set-&gt;end == end)</div><div class='del'>-			goto found;</div><div class='del'>-</div><div class='del'>-	BUG_ON(set != &amp;iter-&gt;data[__btree_node_iter_used(iter)]);</div><div class='del'>-found:</div><div class='del'>-	BUG_ON(set &gt;= iter-&gt;data + ARRAY_SIZE(iter-&gt;data));</div><div class='del'>-</div><div class='del'>-	memmove(&amp;iter-&gt;data[1],</div><div class='del'>-		&amp;iter-&gt;data[0],</div><div class='del'>-		(void *) set - (void *) &amp;iter-&gt;data[0]);</div><div class='del'>-</div><div class='del'>-	iter-&gt;data[0].k = __btree_node_key_to_offset(b, prev);</div><div class='del'>-	iter-&gt;data[0].end = end;</div><div class='del'>-</div><div class='del'>-	if (bch2_expensive_debug_checks)</div><div class='del'>-		bch2_btree_node_iter_verify(iter, b);</div><div class='del'>-	return prev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_packed *bch2_btree_node_iter_prev(struct btree_node_iter *iter,</div><div class='del'>-					      struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *prev;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		prev = bch2_btree_node_iter_prev_all(iter, b);</div><div class='del'>-	} while (prev &amp;&amp; bkey_deleted(prev));</div><div class='del'>-</div><div class='del'>-	return prev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_node_iter_peek_unpack(struct btree_node_iter *iter,</div><div class='del'>-						 struct btree *b,</div><div class='del'>-						 struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k = bch2_btree_node_iter_peek(iter, b);</div><div class='del'>-</div><div class='del'>-	return k ? bkey_disassemble(b, k, u) : bkey_s_c_null;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Mergesort */</div><div class='del'>-</div><div class='del'>-void bch2_btree_keys_stats(const struct btree *b, struct bset_stats *stats)</div><div class='del'>-{</div><div class='del'>-	const struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		enum bset_aux_tree_type type = bset_aux_tree_type(t);</div><div class='del'>-		size_t j;</div><div class='del'>-</div><div class='del'>-		stats-&gt;sets[type].nr++;</div><div class='del'>-		stats-&gt;sets[type].bytes += le16_to_cpu(bset(b, t)-&gt;u64s) *</div><div class='del'>-			sizeof(u64);</div><div class='del'>-</div><div class='del'>-		if (bset_has_ro_aux_tree(t)) {</div><div class='del'>-			stats-&gt;floats += t-&gt;size - 1;</div><div class='del'>-</div><div class='del'>-			for (j = 1; j &lt; t-&gt;size; j++)</div><div class='del'>-				stats-&gt;failed +=</div><div class='del'>-					bkey_float(b, t, j)-&gt;exponent ==</div><div class='del'>-					BFLOAT_FAILED;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bfloat_to_text(struct printbuf *out, struct btree *b,</div><div class='del'>-			 struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t = bch2_bkey_to_bset(b, k);</div><div class='del'>-	struct bkey uk;</div><div class='del'>-	unsigned j, inorder;</div><div class='del'>-</div><div class='del'>-	if (!bset_has_ro_aux_tree(t))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inorder = bkey_to_cacheline(b, t, k);</div><div class='del'>-	if (!inorder || inorder &gt;= t-&gt;size)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	j = __inorder_to_eytzinger1(inorder, t-&gt;size - 1, t-&gt;extra);</div><div class='del'>-	if (k != tree_to_bkey(b, t, j))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (bkey_float(b, t, j)-&gt;exponent) {</div><div class='del'>-	case BFLOAT_FAILED:</div><div class='del'>-		uk = bkey_unpack_key(b, k);</div><div class='del'>-		prt_printf(out,</div><div class='del'>-		       "    failed unpacked at depth %u\n"</div><div class='del'>-		       "\t",</div><div class='del'>-		       ilog2(j));</div><div class='del'>-		bch2_bpos_to_text(out, uk.p);</div><div class='del'>-		prt_printf(out, "\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/bset.h b/fs/bcachefs/bset.h<br/>deleted file mode 100644<br/>index 79c77baaa383..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/bset.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/bset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,540 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BSET_H</div><div class='del'>-#define _BCACHEFS_BSET_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "util.h" /* for time_stats */</div><div class='del'>-#include "vstructs.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BKEYS:</div><div class='del'>- *</div><div class='del'>- * A bkey contains a key, a size field, a variable number of pointers, and some</div><div class='del'>- * ancillary flag bits.</div><div class='del'>- *</div><div class='del'>- * We use two different functions for validating bkeys, bkey_invalid and</div><div class='del'>- * bkey_deleted().</div><div class='del'>- *</div><div class='del'>- * The one exception to the rule that ptr_invalid() filters out invalid keys is</div><div class='del'>- * that it also filters out keys of size 0 - these are keys that have been</div><div class='del'>- * completely overwritten. It'd be safe to delete these in memory while leaving</div><div class='del'>- * them on disk, just unnecessary work - so we filter them out when resorting</div><div class='del'>- * instead.</div><div class='del'>- *</div><div class='del'>- * We can't filter out stale keys when we're resorting, because garbage</div><div class='del'>- * collection needs to find them to ensure bucket gens don't wrap around -</div><div class='del'>- * unless we're rewriting the btree node those stale keys still exist on disk.</div><div class='del'>- *</div><div class='del'>- * We also implement functions here for removing some number of sectors from the</div><div class='del'>- * front or the back of a bkey - this is mainly used for fixing overlapping</div><div class='del'>- * extents, by removing the overlapping sectors from the older key.</div><div class='del'>- *</div><div class='del'>- * BSETS:</div><div class='del'>- *</div><div class='del'>- * A bset is an array of bkeys laid out contiguously in memory in sorted order,</div><div class='del'>- * along with a header. A btree node is made up of a number of these, written at</div><div class='del'>- * different times.</div><div class='del'>- *</div><div class='del'>- * There could be many of them on disk, but we never allow there to be more than</div><div class='del'>- * 4 in memory - we lazily resort as needed.</div><div class='del'>- *</div><div class='del'>- * We implement code here for creating and maintaining auxiliary search trees</div><div class='del'>- * (described below) for searching an individial bset, and on top of that we</div><div class='del'>- * implement a btree iterator.</div><div class='del'>- *</div><div class='del'>- * BTREE ITERATOR:</div><div class='del'>- *</div><div class='del'>- * Most of the code in bcache doesn't care about an individual bset - it needs</div><div class='del'>- * to search entire btree nodes and iterate over them in sorted order.</div><div class='del'>- *</div><div class='del'>- * The btree iterator code serves both functions; it iterates through the keys</div><div class='del'>- * in a btree node in sorted order, starting from either keys after a specific</div><div class='del'>- * point (if you pass it a search key) or the start of the btree node.</div><div class='del'>- *</div><div class='del'>- * AUXILIARY SEARCH TREES:</div><div class='del'>- *</div><div class='del'>- * Since keys are variable length, we can't use a binary search on a bset - we</div><div class='del'>- * wouldn't be able to find the start of the next key. But binary searches are</div><div class='del'>- * slow anyways, due to terrible cache behaviour; bcache originally used binary</div><div class='del'>- * searches and that code topped out at under 50k lookups/second.</div><div class='del'>- *</div><div class='del'>- * So we need to construct some sort of lookup table. Since we only insert keys</div><div class='del'>- * into the last (unwritten) set, most of the keys within a given btree node are</div><div class='del'>- * usually in sets that are mostly constant. We use two different types of</div><div class='del'>- * lookup tables to take advantage of this.</div><div class='del'>- *</div><div class='del'>- * Both lookup tables share in common that they don't index every key in the</div><div class='del'>- * set; they index one key every BSET_CACHELINE bytes, and then a linear search</div><div class='del'>- * is used for the rest.</div><div class='del'>- *</div><div class='del'>- * For sets that have been written to disk and are no longer being inserted</div><div class='del'>- * into, we construct a binary search tree in an array - traversing a binary</div><div class='del'>- * search tree in an array gives excellent locality of reference and is very</div><div class='del'>- * fast, since both children of any node are adjacent to each other in memory</div><div class='del'>- * (and their grandchildren, and great grandchildren...) - this means</div><div class='del'>- * prefetching can be used to great effect.</div><div class='del'>- *</div><div class='del'>- * It's quite useful performance wise to keep these nodes small - not just</div><div class='del'>- * because they're more likely to be in L2, but also because we can prefetch</div><div class='del'>- * more nodes on a single cacheline and thus prefetch more iterations in advance</div><div class='del'>- * when traversing this tree.</div><div class='del'>- *</div><div class='del'>- * Nodes in the auxiliary search tree must contain both a key to compare against</div><div class='del'>- * (we don't want to fetch the key from the set, that would defeat the purpose),</div><div class='del'>- * and a pointer to the key. We use a few tricks to compress both of these.</div><div class='del'>- *</div><div class='del'>- * To compress the pointer, we take advantage of the fact that one node in the</div><div class='del'>- * search tree corresponds to precisely BSET_CACHELINE bytes in the set. We have</div><div class='del'>- * a function (to_inorder()) that takes the index of a node in a binary tree and</div><div class='del'>- * returns what its index would be in an inorder traversal, so we only have to</div><div class='del'>- * store the low bits of the offset.</div><div class='del'>- *</div><div class='del'>- * The key is 84 bits (KEY_DEV + key-&gt;key, the offset on the device). To</div><div class='del'>- * compress that,  we take advantage of the fact that when we're traversing the</div><div class='del'>- * search tree at every iteration we know that both our search key and the key</div><div class='del'>- * we're looking for lie within some range - bounded by our previous</div><div class='del'>- * comparisons. (We special case the start of a search so that this is true even</div><div class='del'>- * at the root of the tree).</div><div class='del'>- *</div><div class='del'>- * So we know the key we're looking for is between a and b, and a and b don't</div><div class='del'>- * differ higher than bit 50, we don't need to check anything higher than bit</div><div class='del'>- * 50.</div><div class='del'>- *</div><div class='del'>- * We don't usually need the rest of the bits, either; we only need enough bits</div><div class='del'>- * to partition the key range we're currently checking.  Consider key n - the</div><div class='del'>- * key our auxiliary search tree node corresponds to, and key p, the key</div><div class='del'>- * immediately preceding n.  The lowest bit we need to store in the auxiliary</div><div class='del'>- * search tree is the highest bit that differs between n and p.</div><div class='del'>- *</div><div class='del'>- * Note that this could be bit 0 - we might sometimes need all 80 bits to do the</div><div class='del'>- * comparison. But we'd really like our nodes in the auxiliary search tree to be</div><div class='del'>- * of fixed size.</div><div class='del'>- *</div><div class='del'>- * The solution is to make them fixed size, and when we're constructing a node</div><div class='del'>- * check if p and n differed in the bits we needed them to. If they don't we</div><div class='del'>- * flag that node, and when doing lookups we fallback to comparing against the</div><div class='del'>- * real key. As long as this doesn't happen to often (and it seems to reliably</div><div class='del'>- * happen a bit less than 1% of the time), we win - even on failures, that key</div><div class='del'>- * is then more likely to be in cache than if we were doing binary searches all</div><div class='del'>- * the way, since we're touching so much less memory.</div><div class='del'>- *</div><div class='del'>- * The keys in the auxiliary search tree are stored in (software) floating</div><div class='del'>- * point, with an exponent and a mantissa. The exponent needs to be big enough</div><div class='del'>- * to address all the bits in the original key, but the number of bits in the</div><div class='del'>- * mantissa is somewhat arbitrary; more bits just gets us fewer failures.</div><div class='del'>- *</div><div class='del'>- * We need 7 bits for the exponent and 3 bits for the key's offset (since keys</div><div class='del'>- * are 8 byte aligned); using 22 bits for the mantissa means a node is 4 bytes.</div><div class='del'>- * We need one node per 128 bytes in the btree node, which means the auxiliary</div><div class='del'>- * search trees take up 3% as much memory as the btree itself.</div><div class='del'>- *</div><div class='del'>- * Constructing these auxiliary search trees is moderately expensive, and we</div><div class='del'>- * don't want to be constantly rebuilding the search tree for the last set</div><div class='del'>- * whenever we insert another key into it. For the unwritten set, we use a much</div><div class='del'>- * simpler lookup table - it's just a flat array, so index i in the lookup table</div><div class='del'>- * corresponds to the i range of BSET_CACHELINE bytes in the set. Indexing</div><div class='del'>- * within each byte range works the same as with the auxiliary search trees.</div><div class='del'>- *</div><div class='del'>- * These are much easier to keep up to date when we insert a key - we do it</div><div class='del'>- * somewhat lazily; when we shift a key up we usually just increment the pointer</div><div class='del'>- * to it, only when it would overflow do we go to the trouble of finding the</div><div class='del'>- * first key in that range of bytes again.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum bset_aux_tree_type {</div><div class='del'>-	BSET_NO_AUX_TREE,</div><div class='del'>-	BSET_RO_AUX_TREE,</div><div class='del'>-	BSET_RW_AUX_TREE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BSET_TREE_NR_TYPES	3</div><div class='del'>-</div><div class='del'>-#define BSET_NO_AUX_TREE_VAL	(U16_MAX)</div><div class='del'>-#define BSET_RW_AUX_TREE_VAL	(U16_MAX - 1)</div><div class='del'>-</div><div class='del'>-static inline enum bset_aux_tree_type bset_aux_tree_type(const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	switch (t-&gt;extra) {</div><div class='del'>-	case BSET_NO_AUX_TREE_VAL:</div><div class='del'>-		EBUG_ON(t-&gt;size);</div><div class='del'>-		return BSET_NO_AUX_TREE;</div><div class='del'>-	case BSET_RW_AUX_TREE_VAL:</div><div class='del'>-		EBUG_ON(!t-&gt;size);</div><div class='del'>-		return BSET_RW_AUX_TREE;</div><div class='del'>-	default:</div><div class='del'>-		EBUG_ON(!t-&gt;size);</div><div class='del'>-		return BSET_RO_AUX_TREE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BSET_CACHELINE was originally intended to match the hardware cacheline size -</div><div class='del'>- * it used to be 64, but I realized the lookup code would touch slightly less</div><div class='del'>- * memory if it was 128.</div><div class='del'>- *</div><div class='del'>- * It definites the number of bytes (in struct bset) per struct bkey_float in</div><div class='del'>- * the auxiliar search tree - when we're done searching the bset_float tree we</div><div class='del'>- * have this many bytes left that we do a linear search over.</div><div class='del'>- *</div><div class='del'>- * Since (after level 5) every level of the bset_tree is on a new cacheline,</div><div class='del'>- * we're touching one fewer cacheline in the bset tree in exchange for one more</div><div class='del'>- * cacheline in the linear search - but the linear search might stop before it</div><div class='del'>- * gets to the second cacheline.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define BSET_CACHELINE		256</div><div class='del'>-</div><div class='del'>-static inline size_t btree_keys_cachelines(const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return (1U &lt;&lt; b-&gt;byte_order) / BSET_CACHELINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t btree_aux_data_bytes(const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return btree_keys_cachelines(b) * 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t btree_aux_data_u64s(const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return btree_aux_data_bytes(b) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_bset(_b, _t)						\</div><div class='del'>-	for (_t = (_b)-&gt;set; _t &lt; (_b)-&gt;set + (_b)-&gt;nsets; _t++)</div><div class='del'>-</div><div class='del'>-#define bset_tree_for_each_key(_b, _t, _k)				\</div><div class='del'>-	for (_k = btree_bkey_first(_b, _t);				\</div><div class='del'>-	     _k != btree_bkey_last(_b, _t);				\</div><div class='del'>-	     _k = bkey_p_next(_k))</div><div class='del'>-</div><div class='del'>-static inline bool bset_has_ro_aux_tree(const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return bset_aux_tree_type(t) == BSET_RO_AUX_TREE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bset_has_rw_aux_tree(struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return bset_aux_tree_type(t) == BSET_RW_AUX_TREE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_bset_set_no_aux_tree(struct btree *b,</div><div class='del'>-					    struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(t &lt; b-&gt;set);</div><div class='del'>-</div><div class='del'>-	for (; t &lt; b-&gt;set + ARRAY_SIZE(b-&gt;set); t++) {</div><div class='del'>-		t-&gt;size = 0;</div><div class='del'>-		t-&gt;extra = BSET_NO_AUX_TREE_VAL;</div><div class='del'>-		t-&gt;aux_data_offset = U16_MAX;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_node_set_format(struct btree *b,</div><div class='del'>-					 struct bkey_format f)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	b-&gt;format	= f;</div><div class='del'>-	b-&gt;nr_key_bits	= bkey_format_key_bits(&amp;f);</div><div class='del'>-</div><div class='del'>-	len = bch2_compile_bkey_format(&amp;b-&gt;format, b-&gt;aux_data);</div><div class='del'>-	BUG_ON(len &lt; 0 || len &gt; U8_MAX);</div><div class='del'>-</div><div class='del'>-	b-&gt;unpack_fn_len = len;</div><div class='del'>-</div><div class='del'>-	bch2_bset_set_no_aux_tree(b, b-&gt;set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bset *bset_next_set(struct btree *b,</div><div class='del'>-					 unsigned block_bytes)</div><div class='del'>-{</div><div class='del'>-	struct bset *i = btree_bset_last(b);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!is_power_of_2(block_bytes));</div><div class='del'>-</div><div class='del'>-	return ((void *) i) + round_up(vstruct_bytes(i), block_bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_keys_init(struct btree *);</div><div class='del'>-</div><div class='del'>-void bch2_bset_init_first(struct btree *, struct bset *);</div><div class='del'>-void bch2_bset_init_next(struct btree *, struct btree_node_entry *);</div><div class='del'>-void bch2_bset_build_aux_tree(struct btree *, struct bset_tree *, bool);</div><div class='del'>-</div><div class='del'>-void bch2_bset_insert(struct btree *, struct btree_node_iter *,</div><div class='del'>-		     struct bkey_packed *, struct bkey_i *, unsigned);</div><div class='del'>-void bch2_bset_delete(struct btree *, struct bkey_packed *, unsigned);</div><div class='del'>-</div><div class='del'>-/* Bkey utility code */</div><div class='del'>-</div><div class='del'>-/* packed or unpacked */</div><div class='del'>-static inline int bkey_cmp_p_or_unp(const struct btree *b,</div><div class='del'>-				    const struct bkey_packed *l,</div><div class='del'>-				    const struct bkey_packed *r_packed,</div><div class='del'>-				    const struct bpos *r)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(r_packed &amp;&amp; !bkey_packed(r_packed));</div><div class='del'>-</div><div class='del'>-	if (unlikely(!bkey_packed(l)))</div><div class='del'>-		return bpos_cmp(packed_to_bkey_c(l)-&gt;p, *r);</div><div class='del'>-</div><div class='del'>-	if (likely(r_packed))</div><div class='del'>-		return __bch2_bkey_cmp_packed_format_checked(l, r_packed, b);</div><div class='del'>-</div><div class='del'>-	return __bch2_bkey_cmp_left_packed_format_checked(b, l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bset_tree *</div><div class='del'>-bch2_bkey_to_bset_inlined(struct btree *b, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	unsigned offset = __btree_node_key_to_offset(b, k);</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		if (offset &lt;= t-&gt;end_offset) {</div><div class='del'>-			EBUG_ON(offset &lt; btree_bkey_first_offset(t));</div><div class='del'>-			return t;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bset_tree *bch2_bkey_to_bset(struct btree *, struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-struct bkey_packed *bch2_bkey_prev_filter(struct btree *, struct bset_tree *,</div><div class='del'>-					  struct bkey_packed *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-bch2_bkey_prev_all(struct btree *b, struct bset_tree *t, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_prev_filter(b, t, k, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-bch2_bkey_prev(struct btree *b, struct bset_tree *t, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_prev_filter(b, t, k, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree key iteration */</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_push(struct btree_node_iter *, struct btree *,</div><div class='del'>-			      const struct bkey_packed *,</div><div class='del'>-			      const struct bkey_packed *);</div><div class='del'>-void bch2_btree_node_iter_init(struct btree_node_iter *, struct btree *,</div><div class='del'>-			       struct bpos *);</div><div class='del'>-void bch2_btree_node_iter_init_from_start(struct btree_node_iter *,</div><div class='del'>-					  struct btree *);</div><div class='del'>-struct bkey_packed *bch2_btree_node_iter_bset_pos(struct btree_node_iter *,</div><div class='del'>-						 struct btree *,</div><div class='del'>-						 struct bset_tree *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_sort(struct btree_node_iter *, struct btree *);</div><div class='del'>-void bch2_btree_node_iter_set_drop(struct btree_node_iter *,</div><div class='del'>-				   struct btree_node_iter_set *);</div><div class='del'>-void bch2_btree_node_iter_advance(struct btree_node_iter *, struct btree *);</div><div class='del'>-</div><div class='del'>-#define btree_node_iter_for_each(_iter, _set)				\</div><div class='del'>-	for (_set = (_iter)-&gt;data;					\</div><div class='del'>-	     _set &lt; (_iter)-&gt;data + ARRAY_SIZE((_iter)-&gt;data) &amp;&amp;	\</div><div class='del'>-	     (_set)-&gt;k != (_set)-&gt;end;					\</div><div class='del'>-	     _set++)</div><div class='del'>-</div><div class='del'>-static inline bool __btree_node_iter_set_end(struct btree_node_iter *iter,</div><div class='del'>-					     unsigned i)</div><div class='del'>-{</div><div class='del'>-	return iter-&gt;data[i].k == iter-&gt;data[i].end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_btree_node_iter_end(struct btree_node_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_iter_set_end(iter, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When keys compare equal, deleted keys compare first:</div><div class='del'>- *</div><div class='del'>- * XXX: only need to compare pointers for keys that are both within a</div><div class='del'>- * btree_node_iterator - we need to break ties for prev() to work correctly</div><div class='del'>- */</div><div class='del'>-static inline int bkey_iter_cmp(const struct btree *b,</div><div class='del'>-				const struct bkey_packed *l,</div><div class='del'>-				const struct bkey_packed *r)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_cmp_packed(b, l, r)</div><div class='del'>-		?: (int) bkey_deleted(r) - (int) bkey_deleted(l)</div><div class='del'>-		?: cmp_int(l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_node_iter_cmp(const struct btree *b,</div><div class='del'>-				      struct btree_node_iter_set l,</div><div class='del'>-				      struct btree_node_iter_set r)</div><div class='del'>-{</div><div class='del'>-	return bkey_iter_cmp(b,</div><div class='del'>-			__btree_node_offset_to_key(b, l.k),</div><div class='del'>-			__btree_node_offset_to_key(b, r.k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These assume r (the search key) is not a deleted key: */</div><div class='del'>-static inline int bkey_iter_pos_cmp(const struct btree *b,</div><div class='del'>-			const struct bkey_packed *l,</div><div class='del'>-			const struct bpos *r)</div><div class='del'>-{</div><div class='del'>-	return bkey_cmp_left_packed(b, l, r)</div><div class='del'>-		?: -((int) bkey_deleted(l));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bkey_iter_cmp_p_or_unp(const struct btree *b,</div><div class='del'>-				    const struct bkey_packed *l,</div><div class='del'>-				    const struct bkey_packed *r_packed,</div><div class='del'>-				    const struct bpos *r)</div><div class='del'>-{</div><div class='del'>-	return bkey_cmp_p_or_unp(b, l, r_packed, r)</div><div class='del'>-		?: -((int) bkey_deleted(l));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-__bch2_btree_node_iter_peek_all(struct btree_node_iter *iter,</div><div class='del'>-				struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_offset_to_key(b, iter-&gt;data-&gt;k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-bch2_btree_node_iter_peek_all(struct btree_node_iter *iter, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return !bch2_btree_node_iter_end(iter)</div><div class='del'>-		? __btree_node_offset_to_key(b, iter-&gt;data-&gt;k)</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-bch2_btree_node_iter_peek(struct btree_node_iter *iter, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_node_iter_peek_all(iter, b)) &amp;&amp;</div><div class='del'>-	       bkey_deleted(k))</div><div class='del'>-		bch2_btree_node_iter_advance(iter, b);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-bch2_btree_node_iter_next_all(struct btree_node_iter *iter, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *ret = bch2_btree_node_iter_peek_all(iter, b);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		bch2_btree_node_iter_advance(iter, b);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_packed *bch2_btree_node_iter_prev_all(struct btree_node_iter *,</div><div class='del'>-						  struct btree *);</div><div class='del'>-struct bkey_packed *bch2_btree_node_iter_prev(struct btree_node_iter *,</div><div class='del'>-					      struct btree *);</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_node_iter_peek_unpack(struct btree_node_iter *,</div><div class='del'>-						struct btree *,</div><div class='del'>-						struct bkey *);</div><div class='del'>-</div><div class='del'>-#define for_each_btree_node_key(b, k, iter)				\</div><div class='del'>-	for (bch2_btree_node_iter_init_from_start((iter), (b));		\</div><div class='del'>-	     (k = bch2_btree_node_iter_peek((iter), (b)));		\</div><div class='del'>-	     bch2_btree_node_iter_advance(iter, b))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_node_key_unpack(b, k, iter, unpacked)		\</div><div class='del'>-	for (bch2_btree_node_iter_init_from_start((iter), (b));		\</div><div class='del'>-	     (k = bch2_btree_node_iter_peek_unpack((iter), (b), (unpacked))).k;\</div><div class='del'>-	     bch2_btree_node_iter_advance(iter, b))</div><div class='del'>-</div><div class='del'>-/* Accounting: */</div><div class='del'>-</div><div class='del'>-static inline void btree_keys_account_key(struct btree_nr_keys *n,</div><div class='del'>-					  unsigned bset,</div><div class='del'>-					  struct bkey_packed *k,</div><div class='del'>-					  int sign)</div><div class='del'>-{</div><div class='del'>-	n-&gt;live_u64s		+= k-&gt;u64s * sign;</div><div class='del'>-	n-&gt;bset_u64s[bset]	+= k-&gt;u64s * sign;</div><div class='del'>-</div><div class='del'>-	if (bkey_packed(k))</div><div class='del'>-		n-&gt;packed_keys	+= sign;</div><div class='del'>-	else</div><div class='del'>-		n-&gt;unpacked_keys += sign;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_keys_account_val_delta(struct btree *b,</div><div class='del'>-						struct bkey_packed *k,</div><div class='del'>-						int delta)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t = bch2_bkey_to_bset(b, k);</div><div class='del'>-</div><div class='del'>-	b-&gt;nr.live_u64s			+= delta;</div><div class='del'>-	b-&gt;nr.bset_u64s[t - b-&gt;set]	+= delta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define btree_keys_account_key_add(_nr, _bset_idx, _k)		\</div><div class='del'>-	btree_keys_account_key(_nr, _bset_idx, _k, 1)</div><div class='del'>-#define btree_keys_account_key_drop(_nr, _bset_idx, _k)	\</div><div class='del'>-	btree_keys_account_key(_nr, _bset_idx, _k, -1)</div><div class='del'>-</div><div class='del'>-#define btree_account_key_add(_b, _k)				\</div><div class='del'>-	btree_keys_account_key(&amp;(_b)-&gt;nr,			\</div><div class='del'>-		bch2_bkey_to_bset(_b, _k) - (_b)-&gt;set, _k, 1)</div><div class='del'>-#define btree_account_key_drop(_b, _k)				\</div><div class='del'>-	btree_keys_account_key(&amp;(_b)-&gt;nr,			\</div><div class='del'>-		bch2_bkey_to_bset(_b, _k) - (_b)-&gt;set, _k, -1)</div><div class='del'>-</div><div class='del'>-struct bset_stats {</div><div class='del'>-	struct {</div><div class='del'>-		size_t nr, bytes;</div><div class='del'>-	} sets[BSET_TREE_NR_TYPES];</div><div class='del'>-</div><div class='del'>-	size_t floats;</div><div class='del'>-	size_t failed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_btree_keys_stats(const struct btree *, struct bset_stats *);</div><div class='del'>-void bch2_bfloat_to_text(struct printbuf *, struct btree *,</div><div class='del'>-			 struct bkey_packed *);</div><div class='del'>-</div><div class='del'>-/* Debug stuff */</div><div class='del'>-</div><div class='del'>-void bch2_dump_bset(struct bch_fs *, struct btree *, struct bset *, unsigned);</div><div class='del'>-void bch2_dump_btree_node(struct bch_fs *, struct btree *);</div><div class='del'>-void bch2_dump_btree_node_iter(struct btree *, struct btree_node_iter *);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-</div><div class='del'>-void __bch2_verify_btree_nr_keys(struct btree *);</div><div class='del'>-void bch2_btree_node_iter_verify(struct btree_node_iter *, struct btree *);</div><div class='del'>-void bch2_verify_insert_pos(struct btree *, struct bkey_packed *,</div><div class='del'>-			    struct bkey_packed *, unsigned);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void __bch2_verify_btree_nr_keys(struct btree *b) {}</div><div class='del'>-static inline void bch2_btree_node_iter_verify(struct btree_node_iter *iter,</div><div class='del'>-					      struct btree *b) {}</div><div class='del'>-static inline void bch2_verify_insert_pos(struct btree *b,</div><div class='del'>-					  struct bkey_packed *where,</div><div class='del'>-					  struct bkey_packed *insert,</div><div class='del'>-					  unsigned clobber_u64s) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void bch2_verify_btree_nr_keys(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (bch2_debug_check_btree_accounting)</div><div class='del'>-		__bch2_verify_btree_nr_keys(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BSET_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c<br/>deleted file mode 100644<br/>index d7c81beac14a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_cache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1211 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-</div><div class='del'>-const char * const bch2_btree_node_flags[] = {</div><div class='del'>-#define x(f)	#f,</div><div class='del'>-	BTREE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_recalc_btree_reserve(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i, reserve = 16;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;btree_roots_known[0].b)</div><div class='del'>-		reserve += 8;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; btree_id_nr_alive(c); i++) {</div><div class='del'>-		struct btree_root *r = bch2_btree_id_root(c, i);</div><div class='del'>-</div><div class='del'>-		if (r-&gt;b)</div><div class='del'>-			reserve += min_t(unsigned, 1, r-&gt;b-&gt;c.level) * 8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;btree_cache.reserve = reserve;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_cache_can_free(struct btree_cache *bc)</div><div class='del'>-{</div><div class='del'>-	return max_t(int, 0, bc-&gt;used - bc-&gt;reserve);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_to_freedlist(struct btree_cache *bc, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (b-&gt;c.lock.readers)</div><div class='del'>-		list_move(&amp;b-&gt;list, &amp;bc-&gt;freed_pcpu);</div><div class='del'>-	else</div><div class='del'>-		list_move(&amp;b-&gt;list, &amp;bc-&gt;freed_nonpcpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_data_free(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(btree_node_write_in_flight(b));</div><div class='del'>-</div><div class='del'>-	clear_btree_node_just_written(b);</div><div class='del'>-</div><div class='del'>-	kvpfree(b-&gt;data, btree_buf_bytes(b));</div><div class='del'>-	b-&gt;data = NULL;</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	kvfree(b-&gt;aux_data);</div><div class='del'>-#else</div><div class='del'>-	munmap(b-&gt;aux_data, btree_aux_data_bytes(b));</div><div class='del'>-#endif</div><div class='del'>-	b-&gt;aux_data = NULL;</div><div class='del'>-</div><div class='del'>-	bc-&gt;used--;</div><div class='del'>-</div><div class='del'>-	btree_node_to_freedlist(bc, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_cache_cmp_fn(struct rhashtable_compare_arg *arg,</div><div class='del'>-				   const void *obj)</div><div class='del'>-{</div><div class='del'>-	const struct btree *b = obj;</div><div class='del'>-	const u64 *v = arg-&gt;key;</div><div class='del'>-</div><div class='del'>-	return b-&gt;hash_val == *v ? 0 : 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct rhashtable_params bch_btree_cache_params = {</div><div class='del'>-	.head_offset	= offsetof(struct btree, hash),</div><div class='del'>-	.key_offset	= offsetof(struct btree, hash_val),</div><div class='del'>-	.key_len	= sizeof(u64),</div><div class='del'>-	.obj_cmpfn	= bch2_btree_cache_cmp_fn,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int btree_node_data_alloc(struct bch_fs *c, struct btree *b, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(b-&gt;data || b-&gt;aux_data);</div><div class='del'>-</div><div class='del'>-	b-&gt;data = kvpmalloc(btree_buf_bytes(b), gfp);</div><div class='del'>-	if (!b-&gt;data)</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_node_mem_alloc;</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	b-&gt;aux_data = kvmalloc(btree_aux_data_bytes(b), gfp);</div><div class='del'>-#else</div><div class='del'>-	b-&gt;aux_data = mmap(NULL, btree_aux_data_bytes(b),</div><div class='del'>-			   PROT_READ|PROT_WRITE|PROT_EXEC,</div><div class='del'>-			   MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);</div><div class='del'>-	if (b-&gt;aux_data == MAP_FAILED)</div><div class='del'>-		b-&gt;aux_data = NULL;</div><div class='del'>-#endif</div><div class='del'>-	if (!b-&gt;aux_data) {</div><div class='del'>-		kvpfree(b-&gt;data, btree_buf_bytes(b));</div><div class='del'>-		b-&gt;data = NULL;</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_node_mem_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *__btree_node_mem_alloc(struct bch_fs *c, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	b = kzalloc(sizeof(struct btree), gfp);</div><div class='del'>-	if (!b)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	bkey_btree_ptr_init(&amp;b-&gt;key);</div><div class='del'>-	INIT_LIST_HEAD(&amp;b-&gt;list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;b-&gt;write_blocked);</div><div class='del'>-	b-&gt;byte_order = ilog2(c-&gt;opts.btree_node_size);</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	b = __btree_node_mem_alloc(c, GFP_KERNEL);</div><div class='del'>-	if (!b)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (btree_node_data_alloc(c, b, GFP_KERNEL)) {</div><div class='del'>-		kfree(b);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_lock_init(&amp;b-&gt;c, 0);</div><div class='del'>-</div><div class='del'>-	bc-&gt;used++;</div><div class='del'>-	list_add(&amp;b-&gt;list, &amp;bc-&gt;freeable);</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree in memory cache - hash table */</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_hash_remove(struct btree_cache *bc, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	int ret = rhashtable_remove_fast(&amp;bc-&gt;table, &amp;b-&gt;hash, bch_btree_cache_params);</div><div class='del'>-</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	/* Cause future lookups for this node to fail: */</div><div class='del'>-	b-&gt;hash_val = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_btree_node_hash_insert(struct btree_cache *bc, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(b-&gt;hash_val);</div><div class='del'>-	b-&gt;hash_val = btree_ptr_hash_val(&amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-	return rhashtable_lookup_insert_fast(&amp;bc-&gt;table, &amp;b-&gt;hash,</div><div class='del'>-					     bch_btree_cache_params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_hash_insert(struct btree_cache *bc, struct btree *b,</div><div class='del'>-				unsigned level, enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	b-&gt;c.level	= level;</div><div class='del'>-	b-&gt;c.btree_id	= id;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-	ret = __bch2_btree_node_hash_insert(bc, b);</div><div class='del'>-	if (!ret)</div><div class='del'>-		list_add_tail(&amp;b-&gt;list, &amp;bc-&gt;live);</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__flatten</div><div class='del'>-static inline struct btree *btree_cache_find(struct btree_cache *bc,</div><div class='del'>-				     const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	u64 v = btree_ptr_hash_val(k);</div><div class='del'>-</div><div class='del'>-	return rhashtable_lookup_fast(&amp;bc-&gt;table, &amp;v, bch_btree_cache_params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this version is for btree nodes that have already been freed (we're not</div><div class='del'>- * reaping a real btree node)</div><div class='del'>- */</div><div class='del'>-static int __btree_node_reclaim(struct bch_fs *c, struct btree *b, bool flush)</div><div class='del'>-{</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;bc-&gt;lock);</div><div class='del'>-wait_on_io:</div><div class='del'>-	if (b-&gt;flags &amp; ((1U &lt;&lt; BTREE_NODE_dirty)|</div><div class='del'>-			(1U &lt;&lt; BTREE_NODE_read_in_flight)|</div><div class='del'>-			(1U &lt;&lt; BTREE_NODE_write_in_flight))) {</div><div class='del'>-		if (!flush)</div><div class='del'>-			return -BCH_ERR_ENOMEM_btree_node_reclaim;</div><div class='del'>-</div><div class='del'>-		/* XXX: waiting on IO with btree cache lock held */</div><div class='del'>-		bch2_btree_node_wait_on_read(b);</div><div class='del'>-		bch2_btree_node_wait_on_write(b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!six_trylock_intent(&amp;b-&gt;c.lock))</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_node_reclaim;</div><div class='del'>-</div><div class='del'>-	if (!six_trylock_write(&amp;b-&gt;c.lock))</div><div class='del'>-		goto out_unlock_intent;</div><div class='del'>-</div><div class='del'>-	/* recheck under lock */</div><div class='del'>-	if (b-&gt;flags &amp; ((1U &lt;&lt; BTREE_NODE_read_in_flight)|</div><div class='del'>-			(1U &lt;&lt; BTREE_NODE_write_in_flight))) {</div><div class='del'>-		if (!flush)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-		six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-		goto wait_on_io;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btree_node_noevict(b) ||</div><div class='del'>-	    btree_node_write_blocked(b) ||</div><div class='del'>-	    btree_node_will_make_reachable(b))</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	if (btree_node_dirty(b)) {</div><div class='del'>-		if (!flush)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		/*</div><div class='del'>-		 * Using the underscore version because we don't want to compact</div><div class='del'>-		 * bsets after the write, since this node is about to be evicted</div><div class='del'>-		 * - unless btree verify mode is enabled, since it runs out of</div><div class='del'>-		 * the post write cleanup:</div><div class='del'>-		 */</div><div class='del'>-		if (bch2_verify_btree_ondisk)</div><div class='del'>-			bch2_btree_node_write(c, b, SIX_LOCK_intent,</div><div class='del'>-					      BTREE_WRITE_cache_reclaim);</div><div class='del'>-		else</div><div class='del'>-			__bch2_btree_node_write(c, b,</div><div class='del'>-						BTREE_WRITE_cache_reclaim);</div><div class='del'>-</div><div class='del'>-		six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-		six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-		goto wait_on_io;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (b-&gt;hash_val &amp;&amp; !ret)</div><div class='del'>-		trace_and_count(c, btree_cache_reap, c, b);</div><div class='del'>-	return ret;</div><div class='del'>-out_unlock:</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-out_unlock_intent:</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-	ret = -BCH_ERR_ENOMEM_btree_node_reclaim;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_node_reclaim(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_reclaim(c, b, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_node_write_and_reclaim(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_reclaim(c, b, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long bch2_btree_cache_scan(struct shrinker *shrink,</div><div class='del'>-					   struct shrink_control *sc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = shrink-&gt;private_data;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b, *t;</div><div class='del'>-	unsigned long nr = sc-&gt;nr_to_scan;</div><div class='del'>-	unsigned long can_free = 0;</div><div class='del'>-	unsigned long freed = 0;</div><div class='del'>-	unsigned long touched = 0;</div><div class='del'>-	unsigned i, flags;</div><div class='del'>-	unsigned long ret = SHRINK_STOP;</div><div class='del'>-	bool trigger_writes = atomic_read(&amp;bc-&gt;dirty) + nr &gt;=</div><div class='del'>-		bc-&gt;used * 3 / 4;</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_shrinker_disabled)</div><div class='del'>-		return SHRINK_STOP;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-	flags = memalloc_nofs_save();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It's _really_ critical that we don't free too many btree nodes - we</div><div class='del'>-	 * have to always leave ourselves a reserve. The reserve is how we</div><div class='del'>-	 * guarantee that allocating memory for a new btree node can always</div><div class='del'>-	 * succeed, so that inserting keys into the btree can always succeed and</div><div class='del'>-	 * IO can always make forward progress:</div><div class='del'>-	 */</div><div class='del'>-	can_free = btree_cache_can_free(bc);</div><div class='del'>-	nr = min_t(unsigned long, nr, can_free);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	list_for_each_entry_safe(b, t, &amp;bc-&gt;freeable, list) {</div><div class='del'>-		/*</div><div class='del'>-		 * Leave a few nodes on the freeable list, so that a btree split</div><div class='del'>-		 * won't have to hit the system allocator:</div><div class='del'>-		 */</div><div class='del'>-		if (++i &lt;= 3)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		touched++;</div><div class='del'>-</div><div class='del'>-		if (touched &gt;= nr)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (!btree_node_reclaim(c, b)) {</div><div class='del'>-			btree_node_data_free(c, b);</div><div class='del'>-			six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-			six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-			freed++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-restart:</div><div class='del'>-	list_for_each_entry_safe(b, t, &amp;bc-&gt;live, list) {</div><div class='del'>-		touched++;</div><div class='del'>-</div><div class='del'>-		if (btree_node_accessed(b)) {</div><div class='del'>-			clear_btree_node_accessed(b);</div><div class='del'>-		} else if (!btree_node_reclaim(c, b)) {</div><div class='del'>-			freed++;</div><div class='del'>-			btree_node_data_free(c, b);</div><div class='del'>-</div><div class='del'>-			bch2_btree_node_hash_remove(bc, b);</div><div class='del'>-			six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-			six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-			if (freed == nr)</div><div class='del'>-				goto out_rotate;</div><div class='del'>-		} else if (trigger_writes &amp;&amp;</div><div class='del'>-			   btree_node_dirty(b) &amp;&amp;</div><div class='del'>-			   !btree_node_will_make_reachable(b) &amp;&amp;</div><div class='del'>-			   !btree_node_write_blocked(b) &amp;&amp;</div><div class='del'>-			   six_trylock_read(&amp;b-&gt;c.lock)) {</div><div class='del'>-			list_move(&amp;bc-&gt;live, &amp;b-&gt;list);</div><div class='del'>-			mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-			__bch2_btree_node_write(c, b, BTREE_WRITE_cache_reclaim);</div><div class='del'>-			six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-			if (touched &gt;= nr)</div><div class='del'>-				goto out_nounlock;</div><div class='del'>-			mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-			goto restart;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (touched &gt;= nr)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-out_rotate:</div><div class='del'>-	if (&amp;t-&gt;list != &amp;bc-&gt;live)</div><div class='del'>-		list_move_tail(&amp;bc-&gt;live, &amp;t-&gt;list);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-out_nounlock:</div><div class='del'>-	ret = freed;</div><div class='del'>-	memalloc_nofs_restore(flags);</div><div class='del'>-	trace_and_count(c, btree_cache_scan, sc-&gt;nr_to_scan, can_free, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long bch2_btree_cache_count(struct shrinker *shrink,</div><div class='del'>-					    struct shrink_control *sc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = shrink-&gt;private_data;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_shrinker_disabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return btree_cache_can_free(bc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_cache_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned i, flags;</div><div class='del'>-</div><div class='del'>-	shrinker_free(bc-&gt;shrink);</div><div class='del'>-</div><div class='del'>-	/* vfree() can allocate memory: */</div><div class='del'>-	flags = memalloc_nofs_save();</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;verify_data)</div><div class='del'>-		list_move(&amp;c-&gt;verify_data-&gt;list, &amp;bc-&gt;live);</div><div class='del'>-</div><div class='del'>-	kvpfree(c-&gt;verify_ondisk, c-&gt;opts.btree_node_size);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; btree_id_nr_alive(c); i++) {</div><div class='del'>-		struct btree_root *r = bch2_btree_id_root(c, i);</div><div class='del'>-</div><div class='del'>-		if (r-&gt;b)</div><div class='del'>-			list_add(&amp;r-&gt;b-&gt;list, &amp;bc-&gt;live);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_splice(&amp;bc-&gt;freeable, &amp;bc-&gt;live);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;bc-&gt;live)) {</div><div class='del'>-		b = list_first_entry(&amp;bc-&gt;live, struct btree, list);</div><div class='del'>-</div><div class='del'>-		BUG_ON(btree_node_read_in_flight(b) ||</div><div class='del'>-		       btree_node_write_in_flight(b));</div><div class='del'>-</div><div class='del'>-		btree_node_data_free(c, b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bch2_journal_error(&amp;c-&gt;journal) &amp;&amp;</div><div class='del'>-	       atomic_read(&amp;c-&gt;btree_cache.dirty));</div><div class='del'>-</div><div class='del'>-	list_splice(&amp;bc-&gt;freed_pcpu, &amp;bc-&gt;freed_nonpcpu);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;bc-&gt;freed_nonpcpu)) {</div><div class='del'>-		b = list_first_entry(&amp;bc-&gt;freed_nonpcpu, struct btree, list);</div><div class='del'>-		list_del(&amp;b-&gt;list);</div><div class='del'>-		six_lock_exit(&amp;b-&gt;c.lock);</div><div class='del'>-		kfree(b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-	memalloc_nofs_restore(flags);</div><div class='del'>-</div><div class='del'>-	if (bc-&gt;table_init_done)</div><div class='del'>-		rhashtable_destroy(&amp;bc-&gt;table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_btree_cache_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct shrinker *shrink;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = rhashtable_init(&amp;bc-&gt;table, &amp;bch_btree_cache_params);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bc-&gt;table_init_done = true;</div><div class='del'>-</div><div class='del'>-	bch2_recalc_btree_reserve(c);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bc-&gt;reserve; i++)</div><div class='del'>-		if (!__bch2_btree_node_mem_alloc(c))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-	list_splice_init(&amp;bc-&gt;live, &amp;bc-&gt;freeable);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;c-&gt;verify_lock);</div><div class='del'>-</div><div class='del'>-	shrink = shrinker_alloc(0, "%s-btree_cache", c-&gt;name);</div><div class='del'>-	if (!shrink)</div><div class='del'>-		goto err;</div><div class='del'>-	bc-&gt;shrink = shrink;</div><div class='del'>-	shrink-&gt;count_objects	= bch2_btree_cache_count;</div><div class='del'>-	shrink-&gt;scan_objects	= bch2_btree_cache_scan;</div><div class='del'>-	shrink-&gt;seeks		= 4;</div><div class='del'>-	shrink-&gt;private_data	= c;</div><div class='del'>-	shrinker_register(shrink);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	return -BCH_ERR_ENOMEM_fs_btree_cache_init;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_cache_init_early(struct btree_cache *bc)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;bc-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bc-&gt;live);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bc-&gt;freeable);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bc-&gt;freed_pcpu);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bc-&gt;freed_nonpcpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We can only have one thread cannibalizing other cached btree nodes at a time,</div><div class='del'>- * or we'll deadlock. We use an open coded mutex to ensure that, which a</div><div class='del'>- * cannibalize_bucket() will take. This means every time we unlock the root of</div><div class='del'>- * the btree, we need to release this lock if we have it held.</div><div class='del'>- */</div><div class='del'>-void bch2_btree_cache_cannibalize_unlock(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-</div><div class='del'>-	if (bc-&gt;alloc_lock == current) {</div><div class='del'>-		trace_and_count(c, btree_cache_cannibalize_unlock, trans);</div><div class='del'>-		bc-&gt;alloc_lock = NULL;</div><div class='del'>-		closure_wake_up(&amp;bc-&gt;alloc_wait);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_cache_cannibalize_lock(struct btree_trans *trans, struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct task_struct *old;</div><div class='del'>-</div><div class='del'>-	old = cmpxchg(&amp;bc-&gt;alloc_lock, NULL, current);</div><div class='del'>-	if (old == NULL || old == current)</div><div class='del'>-		goto success;</div><div class='del'>-</div><div class='del'>-	if (!cl) {</div><div class='del'>-		trace_and_count(c, btree_cache_cannibalize_lock_fail, trans);</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_cache_cannibalize_lock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closure_wait(&amp;bc-&gt;alloc_wait, cl);</div><div class='del'>-</div><div class='del'>-	/* Try again, after adding ourselves to waitlist */</div><div class='del'>-	old = cmpxchg(&amp;bc-&gt;alloc_lock, NULL, current);</div><div class='del'>-	if (old == NULL || old == current) {</div><div class='del'>-		/* We raced */</div><div class='del'>-		closure_wake_up(&amp;bc-&gt;alloc_wait);</div><div class='del'>-		goto success;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_cache_cannibalize_lock_fail, trans);</div><div class='del'>-	return -BCH_ERR_btree_cache_cannibalize_lock_blocked;</div><div class='del'>-</div><div class='del'>-success:</div><div class='del'>-	trace_and_count(c, btree_cache_cannibalize_lock, trans);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *btree_node_cannibalize(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_reverse(b, &amp;bc-&gt;live, list)</div><div class='del'>-		if (!btree_node_reclaim(c, b))</div><div class='del'>-			return b;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		list_for_each_entry_reverse(b, &amp;bc-&gt;live, list)</div><div class='del'>-			if (!btree_node_write_and_reclaim(c, b))</div><div class='del'>-				return b;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Rare case: all nodes were intent-locked.</div><div class='del'>-		 * Just busy-wait.</div><div class='del'>-		 */</div><div class='del'>-		WARN_ONCE(1, "btree cache cannibalize failed\n");</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_node_mem_alloc(struct btree_trans *trans, bool pcpu_read_locks)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct list_head *freed = pcpu_read_locks</div><div class='del'>-		? &amp;bc-&gt;freed_pcpu</div><div class='del'>-		: &amp;bc-&gt;freed_nonpcpu;</div><div class='del'>-	struct btree *b, *b2;</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-	unsigned flags;</div><div class='del'>-</div><div class='del'>-	flags = memalloc_nofs_save();</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We never free struct btree itself, just the memory that holds the on</div><div class='del'>-	 * disk node. Check the freed list before allocating a new one:</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(b, freed, list)</div><div class='del'>-		if (!btree_node_reclaim(c, b)) {</div><div class='del'>-			list_del_init(&amp;b-&gt;list);</div><div class='del'>-			goto got_node;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	b = __btree_node_mem_alloc(c, GFP_NOWAIT|__GFP_NOWARN);</div><div class='del'>-	if (!b) {</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		b = __btree_node_mem_alloc(c, GFP_KERNEL);</div><div class='del'>-		if (!b)</div><div class='del'>-			goto err;</div><div class='del'>-		mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_lock_init(&amp;b-&gt;c, pcpu_read_locks ? SIX_LOCK_INIT_PCPU : 0);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!six_trylock_intent(&amp;b-&gt;c.lock));</div><div class='del'>-	BUG_ON(!six_trylock_write(&amp;b-&gt;c.lock));</div><div class='del'>-got_node:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * btree_free() doesn't free memory; it sticks the node on the end of</div><div class='del'>-	 * the list. Check if there's any freed nodes there:</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(b2, &amp;bc-&gt;freeable, list)</div><div class='del'>-		if (!btree_node_reclaim(c, b2)) {</div><div class='del'>-			swap(b-&gt;data, b2-&gt;data);</div><div class='del'>-			swap(b-&gt;aux_data, b2-&gt;aux_data);</div><div class='del'>-			btree_node_to_freedlist(bc, b2);</div><div class='del'>-			six_unlock_write(&amp;b2-&gt;c.lock);</div><div class='del'>-			six_unlock_intent(&amp;b2-&gt;c.lock);</div><div class='del'>-			goto got_mem;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (btree_node_data_alloc(c, b, GFP_NOWAIT|__GFP_NOWARN)) {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		if (btree_node_data_alloc(c, b, GFP_KERNEL|__GFP_NOWARN))</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-	bc-&gt;used++;</div><div class='del'>-got_mem:</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(btree_node_hashed(b));</div><div class='del'>-	BUG_ON(btree_node_dirty(b));</div><div class='del'>-	BUG_ON(btree_node_write_in_flight(b));</div><div class='del'>-out:</div><div class='del'>-	b-&gt;flags		= 0;</div><div class='del'>-	b-&gt;written		= 0;</div><div class='del'>-	b-&gt;nsets		= 0;</div><div class='del'>-	b-&gt;sib_u64s[0]		= 0;</div><div class='del'>-	b-&gt;sib_u64s[1]		= 0;</div><div class='del'>-	b-&gt;whiteout_u64s	= 0;</div><div class='del'>-	bch2_btree_keys_init(b);</div><div class='del'>-	set_btree_node_accessed(b);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_node_mem_alloc],</div><div class='del'>-			       start_time);</div><div class='del'>-</div><div class='del'>-	memalloc_nofs_restore(flags);</div><div class='del'>-	return b;</div><div class='del'>-err:</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Try to cannibalize another cached btree node: */</div><div class='del'>-	if (bc-&gt;alloc_lock == current) {</div><div class='del'>-		b2 = btree_node_cannibalize(c);</div><div class='del'>-		clear_btree_node_just_written(b2);</div><div class='del'>-		bch2_btree_node_hash_remove(bc, b2);</div><div class='del'>-</div><div class='del'>-		if (b) {</div><div class='del'>-			swap(b-&gt;data, b2-&gt;data);</div><div class='del'>-			swap(b-&gt;aux_data, b2-&gt;aux_data);</div><div class='del'>-			btree_node_to_freedlist(bc, b2);</div><div class='del'>-			six_unlock_write(&amp;b2-&gt;c.lock);</div><div class='del'>-			six_unlock_intent(&amp;b2-&gt;c.lock);</div><div class='del'>-		} else {</div><div class='del'>-			b = b2;</div><div class='del'>-			list_del_init(&amp;b-&gt;list);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-		trace_and_count(c, btree_cache_cannibalize, trans);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-	memalloc_nofs_restore(flags);</div><div class='del'>-	return ERR_PTR(-BCH_ERR_ENOMEM_btree_node_mem_alloc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Slowpath, don't want it inlined into btree_iter_traverse() */</div><div class='del'>-static noinline struct btree *bch2_btree_node_fill(struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path,</div><div class='del'>-				const struct bkey_i *k,</div><div class='del'>-				enum btree_id btree_id,</div><div class='del'>-				unsigned level,</div><div class='del'>-				enum six_lock_type lock_type,</div><div class='del'>-				bool sync)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	u32 seq;</div><div class='del'>-</div><div class='del'>-	BUG_ON(level + 1 &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-	/*</div><div class='del'>-	 * Parent node must be locked, else we could read in a btree node that's</div><div class='del'>-	 * been freed:</div><div class='del'>-	 */</div><div class='del'>-	if (path &amp;&amp; !bch2_btree_node_relock(trans, path, level + 1)) {</div><div class='del'>-		trace_and_count(c, trans_restart_relock_parent_for_fill, trans, _THIS_IP_, path);</div><div class='del'>-		return ERR_PTR(btree_trans_restart(trans, BCH_ERR_transaction_restart_fill_relock));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_node_mem_alloc(trans, level != 0);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(PTR_ERR_OR_ZERO(b), ENOMEM)) {</div><div class='del'>-		trans-&gt;memory_allocation_failure = true;</div><div class='del'>-		trace_and_count(c, trans_restart_memory_allocation_failure, trans, _THIS_IP_, path);</div><div class='del'>-		return ERR_PTR(btree_trans_restart(trans, BCH_ERR_transaction_restart_fill_mem_alloc_fail));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(b))</div><div class='del'>-		return b;</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;b-&gt;key, k);</div><div class='del'>-	if (bch2_btree_node_hash_insert(bc, b, level, btree_id)) {</div><div class='del'>-		/* raced with another fill: */</div><div class='del'>-</div><div class='del'>-		/* mark as unhashed... */</div><div class='del'>-		b-&gt;hash_val = 0;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-		list_add(&amp;b-&gt;list, &amp;bc-&gt;freeable);</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-		six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-		six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_btree_node_read_in_flight(b);</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-	seq = six_lock_seq(&amp;b-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	/* Unlock before doing IO: */</div><div class='del'>-	if (path &amp;&amp; sync)</div><div class='del'>-		bch2_trans_unlock_noassert(trans);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_read(trans, b, sync);</div><div class='del'>-</div><div class='del'>-	if (!sync)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (path) {</div><div class='del'>-		int ret = bch2_trans_relock(trans) ?:</div><div class='del'>-			bch2_btree_path_relock_intent(trans, path);</div><div class='del'>-		if (ret) {</div><div class='del'>-			BUG_ON(!trans-&gt;restarted);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!six_relock_type(&amp;b-&gt;c.lock, lock_type, seq)) {</div><div class='del'>-		if (path)</div><div class='del'>-			trace_and_count(c, trans_restart_relock_after_fill, trans, _THIS_IP_, path);</div><div class='del'>-		return ERR_PTR(btree_trans_restart(trans, BCH_ERR_transaction_restart_relock_after_fill));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void btree_bad_header(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;curr_recovery_pass &lt;= BCH_RECOVERY_PASS_check_allocations)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf,</div><div class='del'>-	       "btree node header doesn't match ptr\n"</div><div class='del'>-	       "btree %s level %u\n"</div><div class='del'>-	       "ptr: ",</div><div class='del'>-	       bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level);</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "\nheader: btree %s level %llu\n"</div><div class='del'>-	       "min ",</div><div class='del'>-	       bch2_btree_id_str(BTREE_NODE_ID(b-&gt;data)),</div><div class='del'>-	       BTREE_NODE_LEVEL(b-&gt;data));</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, b-&gt;data-&gt;min_key);</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "\nmax ");</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, b-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-	bch2_fs_inconsistent(c, "%s", buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_check_header(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (b-&gt;c.btree_id != BTREE_NODE_ID(b-&gt;data) ||</div><div class='del'>-	    b-&gt;c.level != BTREE_NODE_LEVEL(b-&gt;data) ||</div><div class='del'>-	    !bpos_eq(b-&gt;data-&gt;max_key, b-&gt;key.k.p) ||</div><div class='del'>-	    (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2 &amp;&amp;</div><div class='del'>-	     !bpos_eq(b-&gt;data-&gt;min_key,</div><div class='del'>-		      bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v.min_key)))</div><div class='del'>-		btree_bad_header(c, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *__bch2_btree_node_get(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-					   const struct bkey_i *k, unsigned level,</div><div class='del'>-					   enum six_lock_type lock_type,</div><div class='del'>-					   unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	bool need_relock = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-retry:</div><div class='del'>-	b = btree_cache_find(bc, k);</div><div class='del'>-	if (unlikely(!b)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We must have the parent locked to call bch2_btree_node_fill(),</div><div class='del'>-		 * else we could read in a btree node from disk that's been</div><div class='del'>-		 * freed:</div><div class='del'>-		 */</div><div class='del'>-		b = bch2_btree_node_fill(trans, path, k, path-&gt;btree_id,</div><div class='del'>-					 level, lock_type, true);</div><div class='del'>-		need_relock = true;</div><div class='del'>-</div><div class='del'>-		/* We raced and found the btree node in the cache */</div><div class='del'>-		if (!b)</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(b))</div><div class='del'>-			return b;</div><div class='del'>-	} else {</div><div class='del'>-		if (btree_node_read_locked(path, level + 1))</div><div class='del'>-			btree_node_unlock(trans, path, level + 1);</div><div class='del'>-</div><div class='del'>-		ret = btree_node_lock(trans, path, &amp;b-&gt;c, level, lock_type, trace_ip);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-		if (unlikely(b-&gt;hash_val != btree_ptr_hash_val(k) ||</div><div class='del'>-			     b-&gt;c.level != level ||</div><div class='del'>-			     race_fault())) {</div><div class='del'>-			six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-			if (bch2_btree_node_relock(trans, path, level + 1))</div><div class='del'>-				goto retry;</div><div class='del'>-</div><div class='del'>-			trace_and_count(c, trans_restart_btree_node_reused, trans, trace_ip, path);</div><div class='del'>-			return ERR_PTR(btree_trans_restart(trans, BCH_ERR_transaction_restart_lock_node_reused));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* avoid atomic set bit if it's not needed: */</div><div class='del'>-		if (!btree_node_accessed(b))</div><div class='del'>-			set_btree_node_accessed(b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(btree_node_read_in_flight(b))) {</div><div class='del'>-		u32 seq = six_lock_seq(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-		six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		need_relock = true;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_wait_on_read(b);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * should_be_locked is not set on this path yet, so we need to</div><div class='del'>-		 * relock it specifically:</div><div class='del'>-		 */</div><div class='del'>-		if (!six_relock_type(&amp;b-&gt;c.lock, lock_type, seq))</div><div class='del'>-			goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(need_relock)) {</div><div class='del'>-		ret = bch2_trans_relock(trans) ?:</div><div class='del'>-			bch2_btree_path_relock_intent(trans, path);</div><div class='del'>-		if (ret) {</div><div class='del'>-			six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prefetch(b-&gt;aux_data);</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		void *p = (u64 *) b-&gt;aux_data + t-&gt;aux_data_offset;</div><div class='del'>-</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 0);</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 1);</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(btree_node_read_error(b))) {</div><div class='del'>-		six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-		return ERR_PTR(-EIO);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EBUG_ON(b-&gt;c.btree_id != path-&gt;btree_id);</div><div class='del'>-	EBUG_ON(BTREE_NODE_LEVEL(b-&gt;data) != level);</div><div class='del'>-	btree_check_header(c, b);</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_node_get - find a btree node in the cache and lock it, reading it</div><div class='del'>- * in from disk if necessary.</div><div class='del'>- *</div><div class='del'>- * @trans:	btree transaction object</div><div class='del'>- * @path:	btree_path being traversed</div><div class='del'>- * @k:		pointer to btree node (generally KEY_TYPE_btree_ptr_v2)</div><div class='del'>- * @level:	level of btree node being looked up (0 == leaf node)</div><div class='del'>- * @lock_type:	SIX_LOCK_read or SIX_LOCK_intent</div><div class='del'>- * @trace_ip:	ip of caller of btree iterator code (i.e. caller of bch2_btree_iter_peek())</div><div class='del'>- *</div><div class='del'>- * The btree node will have either a read or a write lock held, depending on</div><div class='del'>- * the @write parameter.</div><div class='del'>- *</div><div class='del'>- * Returns: btree node or ERR_PTR()</div><div class='del'>- */</div><div class='del'>-struct btree *bch2_btree_node_get(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-				  const struct bkey_i *k, unsigned level,</div><div class='del'>-				  enum six_lock_type lock_type,</div><div class='del'>-				  unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-</div><div class='del'>-	b = btree_node_mem_ptr(k);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check b-&gt;hash_val _before_ calling btree_node_lock() - this might not</div><div class='del'>-	 * be the node we want anymore, and trying to lock the wrong node could</div><div class='del'>-	 * cause an unneccessary transaction restart:</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!c-&gt;opts.btree_node_mem_ptr_optimization ||</div><div class='del'>-		     !b ||</div><div class='del'>-		     b-&gt;hash_val != btree_ptr_hash_val(k)))</div><div class='del'>-		return __bch2_btree_node_get(trans, path, k, level, lock_type, trace_ip);</div><div class='del'>-</div><div class='del'>-	if (btree_node_read_locked(path, level + 1))</div><div class='del'>-		btree_node_unlock(trans, path, level + 1);</div><div class='del'>-</div><div class='del'>-	ret = btree_node_lock(trans, path, &amp;b-&gt;c, level, lock_type, trace_ip);</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	if (unlikely(b-&gt;hash_val != btree_ptr_hash_val(k) ||</div><div class='del'>-		     b-&gt;c.level != level ||</div><div class='del'>-		     race_fault())) {</div><div class='del'>-		six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-		if (bch2_btree_node_relock(trans, path, level + 1))</div><div class='del'>-			return __bch2_btree_node_get(trans, path, k, level, lock_type, trace_ip);</div><div class='del'>-</div><div class='del'>-		trace_and_count(c, trans_restart_btree_node_reused, trans, trace_ip, path);</div><div class='del'>-		return ERR_PTR(btree_trans_restart(trans, BCH_ERR_transaction_restart_lock_node_reused));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(btree_node_read_in_flight(b))) {</div><div class='del'>-		six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-		return __bch2_btree_node_get(trans, path, k, level, lock_type, trace_ip);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prefetch(b-&gt;aux_data);</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		void *p = (u64 *) b-&gt;aux_data + t-&gt;aux_data_offset;</div><div class='del'>-</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 0);</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 1);</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* avoid atomic set bit if it's not needed: */</div><div class='del'>-	if (!btree_node_accessed(b))</div><div class='del'>-		set_btree_node_accessed(b);</div><div class='del'>-</div><div class='del'>-	if (unlikely(btree_node_read_error(b))) {</div><div class='del'>-		six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-		return ERR_PTR(-EIO);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EBUG_ON(b-&gt;c.btree_id != path-&gt;btree_id);</div><div class='del'>-	EBUG_ON(BTREE_NODE_LEVEL(b-&gt;data) != level);</div><div class='del'>-	btree_check_header(c, b);</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_node_get_noiter(struct btree_trans *trans,</div><div class='del'>-					 const struct bkey_i *k,</div><div class='del'>-					 enum btree_id btree_id,</div><div class='del'>-					 unsigned level,</div><div class='del'>-					 bool nofill)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.btree_node_mem_ptr_optimization) {</div><div class='del'>-		b = btree_node_mem_ptr(k);</div><div class='del'>-		if (b)</div><div class='del'>-			goto lock_node;</div><div class='del'>-	}</div><div class='del'>-retry:</div><div class='del'>-	b = btree_cache_find(bc, k);</div><div class='del'>-	if (unlikely(!b)) {</div><div class='del'>-		if (nofill)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		b = bch2_btree_node_fill(trans, NULL, k, btree_id,</div><div class='del'>-					 level, SIX_LOCK_read, true);</div><div class='del'>-</div><div class='del'>-		/* We raced and found the btree node in the cache */</div><div class='del'>-		if (!b)</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(b) &amp;&amp;</div><div class='del'>-		    !bch2_btree_cache_cannibalize_lock(trans, NULL))</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(b))</div><div class='del'>-			goto out;</div><div class='del'>-	} else {</div><div class='del'>-lock_node:</div><div class='del'>-		ret = btree_node_lock_nopath(trans, &amp;b-&gt;c, SIX_LOCK_read, _THIS_IP_);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-		if (unlikely(b-&gt;hash_val != btree_ptr_hash_val(k) ||</div><div class='del'>-			     b-&gt;c.btree_id != btree_id ||</div><div class='del'>-			     b-&gt;c.level != level)) {</div><div class='del'>-			six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX: waiting on IO with btree locks held: */</div><div class='del'>-	__bch2_btree_node_wait_on_read(b);</div><div class='del'>-</div><div class='del'>-	prefetch(b-&gt;aux_data);</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		void *p = (u64 *) b-&gt;aux_data + t-&gt;aux_data_offset;</div><div class='del'>-</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 0);</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 1);</div><div class='del'>-		prefetch(p + L1_CACHE_BYTES * 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* avoid atomic set bit if it's not needed: */</div><div class='del'>-	if (!btree_node_accessed(b))</div><div class='del'>-		set_btree_node_accessed(b);</div><div class='del'>-</div><div class='del'>-	if (unlikely(btree_node_read_error(b))) {</div><div class='del'>-		six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-		b = ERR_PTR(-EIO);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EBUG_ON(b-&gt;c.btree_id != btree_id);</div><div class='del'>-	EBUG_ON(BTREE_NODE_LEVEL(b-&gt;data) != level);</div><div class='del'>-	btree_check_header(c, b);</div><div class='del'>-out:</div><div class='del'>-	bch2_btree_cache_cannibalize_unlock(trans);</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_prefetch(struct btree_trans *trans,</div><div class='del'>-			     struct btree_path *path,</div><div class='del'>-			     const struct bkey_i *k,</div><div class='del'>-			     enum btree_id btree_id, unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	BUG_ON(trans &amp;&amp; !btree_node_locked(path, level + 1));</div><div class='del'>-	BUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-</div><div class='del'>-	b = btree_cache_find(bc, k);</div><div class='del'>-	if (b)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_node_fill(trans, path, k, btree_id,</div><div class='del'>-				 level, SIX_LOCK_read, false);</div><div class='del'>-	return PTR_ERR_OR_ZERO(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_evict(struct btree_trans *trans, const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_cache *bc = &amp;c-&gt;btree_cache;</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	b = btree_cache_find(bc, k);</div><div class='del'>-	if (!b)</div><div class='del'>-		return;</div><div class='del'>-wait_on_io:</div><div class='del'>-	/* not allowed to wait on io with btree locks held: */</div><div class='del'>-</div><div class='del'>-	/* XXX we're called from btree_gc which will be holding other btree</div><div class='del'>-	 * nodes locked</div><div class='del'>-	 */</div><div class='del'>-	__bch2_btree_node_wait_on_read(b);</div><div class='del'>-	__bch2_btree_node_wait_on_write(b);</div><div class='del'>-</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_intent);</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_write);</div><div class='del'>-</div><div class='del'>-	if (btree_node_dirty(b)) {</div><div class='del'>-		__bch2_btree_node_write(c, b, BTREE_WRITE_cache_reclaim);</div><div class='del'>-		six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-		six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-		goto wait_on_io;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(btree_node_dirty(b));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-	btree_node_data_free(c, b);</div><div class='del'>-	bch2_btree_node_hash_remove(bc, b);</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *bch2_btree_id_str(enum btree_id btree)</div><div class='del'>-{</div><div class='del'>-	return btree &lt; BTREE_ID_NR ? __bch2_btree_ids[btree] : "(unknown)";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_pos_to_text(struct printbuf *out, struct bch_fs *c, const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "%s level %u/%u\n  ",</div><div class='del'>-	       bch2_btree_id_str(b-&gt;c.btree_id),</div><div class='del'>-	       b-&gt;c.level,</div><div class='del'>-	       bch2_btree_id_root(c, b-&gt;c.btree_id)-&gt;level);</div><div class='del'>-	bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_to_text(struct printbuf *out, struct bch_fs *c, const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_stats stats;</div><div class='del'>-</div><div class='del'>-	memset(&amp;stats, 0, sizeof(stats));</div><div class='del'>-</div><div class='del'>-	bch2_btree_keys_stats(b, &amp;stats);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "l %u ", b-&gt;c.level);</div><div class='del'>-	bch2_bpos_to_text(out, b-&gt;data-&gt;min_key);</div><div class='del'>-	prt_printf(out, " - ");</div><div class='del'>-	bch2_bpos_to_text(out, b-&gt;data-&gt;max_key);</div><div class='del'>-	prt_printf(out, ":\n"</div><div class='del'>-	       "    ptrs: ");</div><div class='del'>-	bch2_val_to_text(out, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out,</div><div class='del'>-	       "    format: ");</div><div class='del'>-	bch2_bkey_format_to_text(out, &amp;b-&gt;format);</div><div class='del'>-</div><div class='del'>-	prt_printf(out,</div><div class='del'>-	       "    unpack fn len: %u\n"</div><div class='del'>-	       "    bytes used %zu/%zu (%zu%% full)\n"</div><div class='del'>-	       "    sib u64s: %u, %u (merge threshold %u)\n"</div><div class='del'>-	       "    nr packed keys %u\n"</div><div class='del'>-	       "    nr unpacked keys %u\n"</div><div class='del'>-	       "    floats %zu\n"</div><div class='del'>-	       "    failed unpacked %zu\n",</div><div class='del'>-	       b-&gt;unpack_fn_len,</div><div class='del'>-	       b-&gt;nr.live_u64s * sizeof(u64),</div><div class='del'>-	       btree_buf_bytes(b) - sizeof(struct btree_node),</div><div class='del'>-	       b-&gt;nr.live_u64s * 100 / btree_max_u64s(c),</div><div class='del'>-	       b-&gt;sib_u64s[0],</div><div class='del'>-	       b-&gt;sib_u64s[1],</div><div class='del'>-	       c-&gt;btree_foreground_merge_threshold,</div><div class='del'>-	       b-&gt;nr.packed_keys,</div><div class='del'>-	       b-&gt;nr.unpacked_keys,</div><div class='del'>-	       stats.floats,</div><div class='del'>-	       stats.failed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_cache_to_text(struct printbuf *out, const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "nr nodes:\t\t%u\n", c-&gt;btree_cache.used);</div><div class='del'>-	prt_printf(out, "nr dirty:\t\t%u\n", atomic_read(&amp;c-&gt;btree_cache.dirty));</div><div class='del'>-	prt_printf(out, "cannibalize lock:\t%p\n", c-&gt;btree_cache.alloc_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_cache.h b/fs/bcachefs/btree_cache.h<br/>deleted file mode 100644<br/>index 6d33885fdbde..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_cache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_cache.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,136 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_CACHE_H</div><div class='del'>-#define _BCACHEFS_BTREE_CACHE_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_btree_node_flags[];</div><div class='del'>-</div><div class='del'>-struct btree_iter;</div><div class='del'>-</div><div class='del'>-void bch2_recalc_btree_reserve(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_hash_remove(struct btree_cache *, struct btree *);</div><div class='del'>-int __bch2_btree_node_hash_insert(struct btree_cache *, struct btree *);</div><div class='del'>-int bch2_btree_node_hash_insert(struct btree_cache *, struct btree *,</div><div class='del'>-				unsigned, enum btree_id);</div><div class='del'>-</div><div class='del'>-void bch2_btree_cache_cannibalize_unlock(struct btree_trans *);</div><div class='del'>-int bch2_btree_cache_cannibalize_lock(struct btree_trans *, struct closure *);</div><div class='del'>-</div><div class='del'>-struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *);</div><div class='del'>-struct btree *bch2_btree_node_mem_alloc(struct btree_trans *, bool);</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_node_get(struct btree_trans *, struct btree_path *,</div><div class='del'>-				  const struct bkey_i *, unsigned,</div><div class='del'>-				  enum six_lock_type, unsigned long);</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_node_get_noiter(struct btree_trans *, const struct bkey_i *,</div><div class='del'>-					 enum btree_id, unsigned, bool);</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_prefetch(struct btree_trans *, struct btree_path *,</div><div class='del'>-			     const struct bkey_i *, enum btree_id, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_evict(struct btree_trans *, const struct bkey_i *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_cache_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_btree_cache_init(struct bch_fs *);</div><div class='del'>-void bch2_fs_btree_cache_init_early(struct btree_cache *);</div><div class='del'>-</div><div class='del'>-static inline u64 btree_ptr_hash_val(const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	switch (k-&gt;k.type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr:</div><div class='del'>-		return *((u64 *) bkey_i_to_btree_ptr_c(k)-&gt;v.start);</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-		/*</div><div class='del'>-		 * The cast/deref is only necessary to avoid sparse endianness</div><div class='del'>-		 * warnings:</div><div class='del'>-		 */</div><div class='del'>-		return *((u64 *) &amp;bkey_i_to_btree_ptr_v2_c(k)-&gt;v.seq);</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree *btree_node_mem_ptr(const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return k-&gt;k.type == KEY_TYPE_btree_ptr_v2</div><div class='del'>-		? (void *)(unsigned long)bkey_i_to_btree_ptr_v2_c(k)-&gt;v.mem_ptr</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is btree node in hash table? */</div><div class='del'>-static inline bool btree_node_hashed(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return b-&gt;hash_val != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_cached_btree(_b, _c, _tbl, _iter, _pos)		\</div><div class='del'>-	for ((_tbl) = rht_dereference_rcu((_c)-&gt;btree_cache.table.tbl,	\</div><div class='del'>-					  &amp;(_c)-&gt;btree_cache.table),	\</div><div class='del'>-	     _iter = 0;	_iter &lt; (_tbl)-&gt;size; _iter++)			\</div><div class='del'>-		rht_for_each_entry_rcu((_b), (_pos), _tbl, _iter, hash)</div><div class='del'>-</div><div class='del'>-static inline size_t btree_buf_bytes(const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return 1UL &lt;&lt; b-&gt;byte_order;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t btree_buf_max_u64s(const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return (btree_buf_bytes(b) - sizeof(struct btree_node)) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t btree_max_u64s(const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return (c-&gt;opts.btree_node_size - sizeof(struct btree_node)) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t btree_sectors(const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return c-&gt;opts.btree_node_size &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_blocks(const struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return btree_sectors(c) &gt;&gt; c-&gt;block_bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BTREE_SPLIT_THRESHOLD(c)		(btree_max_u64s(c) * 2 / 3)</div><div class='del'>-</div><div class='del'>-#define BTREE_FOREGROUND_MERGE_THRESHOLD(c)	(btree_max_u64s(c) * 1 / 3)</div><div class='del'>-#define BTREE_FOREGROUND_MERGE_HYSTERESIS(c)			\</div><div class='del'>-	(BTREE_FOREGROUND_MERGE_THRESHOLD(c) +			\</div><div class='del'>-	 (BTREE_FOREGROUND_MERGE_THRESHOLD(c) &gt;&gt; 2))</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_id_nr_alive(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return BTREE_ID_NR + c-&gt;btree_roots_extra.nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_root *bch2_btree_id_root(struct bch_fs *c, unsigned id)</div><div class='del'>-{</div><div class='del'>-	if (likely(id &lt; BTREE_ID_NR)) {</div><div class='del'>-		return &amp;c-&gt;btree_roots_known[id];</div><div class='del'>-	} else {</div><div class='del'>-		unsigned idx = id - BTREE_ID_NR;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(idx &gt;= c-&gt;btree_roots_extra.nr);</div><div class='del'>-		return &amp;c-&gt;btree_roots_extra.data[idx];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree *btree_node_root(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_id_root(c, b-&gt;c.btree_id)-&gt;b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *bch2_btree_id_str(enum btree_id);</div><div class='del'>-void bch2_btree_pos_to_text(struct printbuf *, struct bch_fs *, const struct btree *);</div><div class='del'>-void bch2_btree_node_to_text(struct printbuf *, struct bch_fs *, const struct btree *);</div><div class='del'>-void bch2_btree_cache_to_text(struct printbuf *, const struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_CACHE_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c<br/>deleted file mode 100644<br/>index 1102995643b1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_gc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_gc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2071 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2010 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright (C) 2014 Datera Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "reflink.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/sched/task.h&gt;</div><div class='del'>-</div><div class='del'>-#define DROP_THIS_NODE		10</div><div class='del'>-#define DROP_PREV_NODE		11</div><div class='del'>-</div><div class='del'>-static struct bkey_s unsafe_bkey_s_c_to_s(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return (struct bkey_s) {{{</div><div class='del'>-		(struct bkey *) k.k,</div><div class='del'>-		(struct bch_val *) k.v</div><div class='del'>-	}}};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool should_restart_for_topology_repair(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return c-&gt;opts.fix_errors != FSCK_FIX_no &amp;&amp;</div><div class='del'>-		!(c-&gt;recovery_passes_complete &amp; BIT_ULL(BCH_RECOVERY_PASS_check_topology));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __gc_pos_set(struct bch_fs *c, struct gc_pos new_pos)</div><div class='del'>-{</div><div class='del'>-	preempt_disable();</div><div class='del'>-	write_seqcount_begin(&amp;c-&gt;gc_pos_lock);</div><div class='del'>-	c-&gt;gc_pos = new_pos;</div><div class='del'>-	write_seqcount_end(&amp;c-&gt;gc_pos_lock);</div><div class='del'>-	preempt_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void gc_pos_set(struct bch_fs *c, struct gc_pos new_pos)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(gc_pos_cmp(new_pos, c-&gt;gc_pos) &lt;= 0);</div><div class='del'>-	__gc_pos_set(c, new_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Missing: if an interior btree node is empty, we need to do something -</div><div class='del'>- * perhaps just kill it</div><div class='del'>- */</div><div class='del'>-static int bch2_gc_check_topology(struct bch_fs *c,</div><div class='del'>-				  struct btree *b,</div><div class='del'>-				  struct bkey_buf *prev,</div><div class='del'>-				  struct bkey_buf cur,</div><div class='del'>-				  bool is_last)</div><div class='del'>-{</div><div class='del'>-	struct bpos node_start	= b-&gt;data-&gt;min_key;</div><div class='del'>-	struct bpos node_end	= b-&gt;data-&gt;max_key;</div><div class='del'>-	struct bpos expected_start = bkey_deleted(&amp;prev-&gt;k-&gt;k)</div><div class='del'>-		? node_start</div><div class='del'>-		: bpos_successor(prev-&gt;k-&gt;k.p);</div><div class='del'>-	struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (cur.k-&gt;k.type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-		struct bkey_i_btree_ptr_v2 *bp = bkey_i_to_btree_ptr_v2(cur.k);</div><div class='del'>-</div><div class='del'>-		if (!bpos_eq(expected_start, bp-&gt;v.min_key)) {</div><div class='del'>-			bch2_topology_error(c);</div><div class='del'>-</div><div class='del'>-			if (bkey_deleted(&amp;prev-&gt;k-&gt;k)) {</div><div class='del'>-				prt_printf(&amp;buf1, "start of node: ");</div><div class='del'>-				bch2_bpos_to_text(&amp;buf1, node_start);</div><div class='del'>-			} else {</div><div class='del'>-				bch2_bkey_val_to_text(&amp;buf1, c, bkey_i_to_s_c(prev-&gt;k));</div><div class='del'>-			}</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf2, c, bkey_i_to_s_c(cur.k));</div><div class='del'>-</div><div class='del'>-			if (__fsck_err(c,</div><div class='del'>-				       FSCK_CAN_FIX|</div><div class='del'>-				       FSCK_CAN_IGNORE|</div><div class='del'>-				       FSCK_NO_RATELIMIT,</div><div class='del'>-				       btree_node_topology_bad_min_key,</div><div class='del'>-				       "btree node with incorrect min_key at btree %s level %u:\n"</div><div class='del'>-				       "  prev %s\n"</div><div class='del'>-				       "  cur %s",</div><div class='del'>-				       bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-				       buf1.buf, buf2.buf) &amp;&amp; should_restart_for_topology_repair(c)) {</div><div class='del'>-				bch_info(c, "Halting mark and sweep to start topology repair pass");</div><div class='del'>-				ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_check_topology);</div><div class='del'>-				goto err;</div><div class='del'>-			} else {</div><div class='del'>-				set_bit(BCH_FS_initial_gc_unfixed, &amp;c-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_last &amp;&amp; !bpos_eq(cur.k-&gt;k.p, node_end)) {</div><div class='del'>-		bch2_topology_error(c);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf1);</div><div class='del'>-		printbuf_reset(&amp;buf2);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf1, c, bkey_i_to_s_c(cur.k));</div><div class='del'>-		bch2_bpos_to_text(&amp;buf2, node_end);</div><div class='del'>-</div><div class='del'>-		if (__fsck_err(c, FSCK_CAN_FIX|FSCK_CAN_IGNORE|FSCK_NO_RATELIMIT,</div><div class='del'>-			  btree_node_topology_bad_max_key,</div><div class='del'>-			  "btree node with incorrect max_key at btree %s level %u:\n"</div><div class='del'>-			  "  %s\n"</div><div class='del'>-			  "  expected %s",</div><div class='del'>-			  bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-			  buf1.buf, buf2.buf) &amp;&amp;</div><div class='del'>-		    should_restart_for_topology_repair(c)) {</div><div class='del'>-			bch_info(c, "Halting mark and sweep to start topology repair pass");</div><div class='del'>-			ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_check_topology);</div><div class='del'>-			goto err;</div><div class='del'>-		} else {</div><div class='del'>-			set_bit(BCH_FS_initial_gc_unfixed, &amp;c-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_copy(prev, c, cur.k);</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf2);</div><div class='del'>-	printbuf_exit(&amp;buf1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_ptr_to_v2(struct btree *b, struct bkey_i_btree_ptr_v2 *dst)</div><div class='del'>-{</div><div class='del'>-	switch (b-&gt;key.k.type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr: {</div><div class='del'>-		struct bkey_i_btree_ptr *src = bkey_i_to_btree_ptr(&amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-		dst-&gt;k.p		= src-&gt;k.p;</div><div class='del'>-		dst-&gt;v.mem_ptr		= 0;</div><div class='del'>-		dst-&gt;v.seq		= b-&gt;data-&gt;keys.seq;</div><div class='del'>-		dst-&gt;v.sectors_written	= 0;</div><div class='del'>-		dst-&gt;v.flags		= 0;</div><div class='del'>-		dst-&gt;v.min_key		= b-&gt;data-&gt;min_key;</div><div class='del'>-		set_bkey_val_bytes(&amp;dst-&gt;k, sizeof(dst-&gt;v) + bkey_val_bytes(&amp;src-&gt;k));</div><div class='del'>-		memcpy(dst-&gt;v.start, src-&gt;v.start, bkey_val_bytes(&amp;src-&gt;k));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-		bkey_copy(&amp;dst-&gt;k_i, &amp;b-&gt;key);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_node_update_key_early(struct btree_trans *trans,</div><div class='del'>-					     enum btree_id btree, unsigned level,</div><div class='del'>-					     struct bkey_s_c old, struct bkey_i *new)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct bkey_buf tmp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;tmp);</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;tmp, c, old);</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_node_get_noiter(trans, tmp.k, btree, level, true);</div><div class='del'>-	if (!IS_ERR_OR_NULL(b)) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-</div><div class='del'>-		bkey_copy(&amp;b-&gt;key, new);</div><div class='del'>-		ret = __bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache, b);</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-		six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;tmp, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_node_min(struct bch_fs *c, struct btree *b, struct bpos new_min)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_btree_ptr_v2 *new;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	new = kmalloc_array(BKEY_BTREE_PTR_U64s_MAX, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!new)</div><div class='del'>-		return -BCH_ERR_ENOMEM_gc_repair_key;</div><div class='del'>-</div><div class='del'>-	btree_ptr_to_v2(b, new);</div><div class='del'>-	b-&gt;data-&gt;min_key	= new_min;</div><div class='del'>-	new-&gt;v.min_key		= new_min;</div><div class='del'>-	SET_BTREE_PTR_RANGE_UPDATED(&amp;new-&gt;v, true);</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_key_insert_take(c, b-&gt;c.btree_id, b-&gt;c.level + 1, &amp;new-&gt;k_i);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(new);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_drop_keys_outside_node(b);</div><div class='del'>-	bkey_copy(&amp;b-&gt;key, &amp;new-&gt;k_i);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_node_max(struct bch_fs *c, struct btree *b, struct bpos new_max)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_btree_ptr_v2 *new;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_key_delete(c, b-&gt;c.btree_id, b-&gt;c.level + 1, b-&gt;key.k.p);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	new = kmalloc_array(BKEY_BTREE_PTR_U64s_MAX, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!new)</div><div class='del'>-		return -BCH_ERR_ENOMEM_gc_repair_key;</div><div class='del'>-</div><div class='del'>-	btree_ptr_to_v2(b, new);</div><div class='del'>-	b-&gt;data-&gt;max_key	= new_max;</div><div class='del'>-	new-&gt;k.p		= new_max;</div><div class='del'>-	SET_BTREE_PTR_RANGE_UPDATED(&amp;new-&gt;v, true);</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_key_insert_take(c, b-&gt;c.btree_id, b-&gt;c.level + 1, &amp;new-&gt;k_i);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(new);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_drop_keys_outside_node(b);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;b-&gt;key, &amp;new-&gt;k_i);</div><div class='del'>-	ret = __bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache, b);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_repair_node_boundaries(struct bch_fs *c, struct btree *b,</div><div class='del'>-					struct btree *prev, struct btree *cur)</div><div class='del'>-{</div><div class='del'>-	struct bpos expected_start = !prev</div><div class='del'>-		? b-&gt;data-&gt;min_key</div><div class='del'>-		: bpos_successor(prev-&gt;key.k.p);</div><div class='del'>-	struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!prev) {</div><div class='del'>-		prt_printf(&amp;buf1, "start of node: ");</div><div class='del'>-		bch2_bpos_to_text(&amp;buf1, b-&gt;data-&gt;min_key);</div><div class='del'>-	} else {</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf1, c, bkey_i_to_s_c(&amp;prev-&gt;key));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf2, c, bkey_i_to_s_c(&amp;cur-&gt;key));</div><div class='del'>-</div><div class='del'>-	if (prev &amp;&amp;</div><div class='del'>-	    bpos_gt(expected_start, cur-&gt;data-&gt;min_key) &amp;&amp;</div><div class='del'>-	    BTREE_NODE_SEQ(cur-&gt;data) &gt; BTREE_NODE_SEQ(prev-&gt;data)) {</div><div class='del'>-		/* cur overwrites prev: */</div><div class='del'>-</div><div class='del'>-		if (mustfix_fsck_err_on(bpos_ge(prev-&gt;data-&gt;min_key,</div><div class='del'>-						cur-&gt;data-&gt;min_key), c,</div><div class='del'>-				btree_node_topology_overwritten_by_next_node,</div><div class='del'>-				"btree node overwritten by next node at btree %s level %u:\n"</div><div class='del'>-				"  node %s\n"</div><div class='del'>-				"  next %s",</div><div class='del'>-				bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-				buf1.buf, buf2.buf)) {</div><div class='del'>-			ret = DROP_PREV_NODE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (mustfix_fsck_err_on(!bpos_eq(prev-&gt;key.k.p,</div><div class='del'>-						 bpos_predecessor(cur-&gt;data-&gt;min_key)), c,</div><div class='del'>-				btree_node_topology_bad_max_key,</div><div class='del'>-				"btree node with incorrect max_key at btree %s level %u:\n"</div><div class='del'>-				"  node %s\n"</div><div class='del'>-				"  next %s",</div><div class='del'>-				bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-				buf1.buf, buf2.buf))</div><div class='del'>-			ret = set_node_max(c, prev,</div><div class='del'>-					   bpos_predecessor(cur-&gt;data-&gt;min_key));</div><div class='del'>-	} else {</div><div class='del'>-		/* prev overwrites cur: */</div><div class='del'>-</div><div class='del'>-		if (mustfix_fsck_err_on(bpos_ge(expected_start,</div><div class='del'>-						cur-&gt;data-&gt;max_key), c,</div><div class='del'>-				btree_node_topology_overwritten_by_prev_node,</div><div class='del'>-				"btree node overwritten by prev node at btree %s level %u:\n"</div><div class='del'>-				"  prev %s\n"</div><div class='del'>-				"  node %s",</div><div class='del'>-				bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-				buf1.buf, buf2.buf)) {</div><div class='del'>-			ret = DROP_THIS_NODE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (mustfix_fsck_err_on(!bpos_eq(expected_start, cur-&gt;data-&gt;min_key), c,</div><div class='del'>-				btree_node_topology_bad_min_key,</div><div class='del'>-				"btree node with incorrect min_key at btree %s level %u:\n"</div><div class='del'>-				"  prev %s\n"</div><div class='del'>-				"  node %s",</div><div class='del'>-				bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-				buf1.buf, buf2.buf))</div><div class='del'>-			ret = set_node_min(c, cur, expected_start);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf2);</div><div class='del'>-	printbuf_exit(&amp;buf1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_repair_node_end(struct bch_fs *c, struct btree *b,</div><div class='del'>-				 struct btree *child)</div><div class='del'>-{</div><div class='del'>-	struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf1, c, bkey_i_to_s_c(&amp;child-&gt;key));</div><div class='del'>-	bch2_bpos_to_text(&amp;buf2, b-&gt;key.k.p);</div><div class='del'>-</div><div class='del'>-	if (mustfix_fsck_err_on(!bpos_eq(child-&gt;key.k.p, b-&gt;key.k.p), c,</div><div class='del'>-				btree_node_topology_bad_max_key,</div><div class='del'>-			"btree node with incorrect max_key at btree %s level %u:\n"</div><div class='del'>-			"  %s\n"</div><div class='del'>-			"  expected %s",</div><div class='del'>-			bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level,</div><div class='del'>-			buf1.buf, buf2.buf)) {</div><div class='del'>-		ret = set_node_max(c, child, b-&gt;key.k.p);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf2);</div><div class='del'>-	printbuf_exit(&amp;buf1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_repair_topology_recurse(struct btree_trans *trans, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_and_journal_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf prev_k, cur_k;</div><div class='del'>-	struct btree *prev = NULL, *cur = NULL;</div><div class='del'>-	bool have_child, dropped_children = false;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!b-&gt;c.level)</div><div class='del'>-		return 0;</div><div class='del'>-again:</div><div class='del'>-	prev = NULL;</div><div class='del'>-	have_child = dropped_children = false;</div><div class='del'>-	bch2_bkey_buf_init(&amp;prev_k);</div><div class='del'>-	bch2_bkey_buf_init(&amp;cur_k);</div><div class='del'>-	bch2_btree_and_journal_iter_init_node_iter(&amp;iter, c, b);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_and_journal_iter_peek(&amp;iter)).k) {</div><div class='del'>-		BUG_ON(bpos_lt(k.k-&gt;p, b-&gt;data-&gt;min_key));</div><div class='del'>-		BUG_ON(bpos_gt(k.k-&gt;p, b-&gt;data-&gt;max_key));</div><div class='del'>-</div><div class='del'>-		bch2_btree_and_journal_iter_advance(&amp;iter);</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;cur_k, c, k);</div><div class='del'>-</div><div class='del'>-		cur = bch2_btree_node_get_noiter(trans, cur_k.k,</div><div class='del'>-					b-&gt;c.btree_id, b-&gt;c.level - 1,</div><div class='del'>-					false);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(cur);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(cur_k.k));</div><div class='del'>-</div><div class='del'>-		if (mustfix_fsck_err_on(ret == -EIO, c,</div><div class='del'>-				btree_node_unreadable,</div><div class='del'>-				"Topology repair: unreadable btree node at btree %s level %u:\n"</div><div class='del'>-				"  %s",</div><div class='del'>-				bch2_btree_id_str(b-&gt;c.btree_id),</div><div class='del'>-				b-&gt;c.level - 1,</div><div class='del'>-				buf.buf)) {</div><div class='del'>-			bch2_btree_node_evict(trans, cur_k.k);</div><div class='del'>-			ret = bch2_journal_key_delete(c, b-&gt;c.btree_id,</div><div class='del'>-						      b-&gt;c.level, cur_k.k-&gt;k.p);</div><div class='del'>-			cur = NULL;</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch_err_msg(c, ret, "getting btree node");</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = btree_repair_node_boundaries(c, b, prev, cur);</div><div class='del'>-</div><div class='del'>-		if (ret == DROP_THIS_NODE) {</div><div class='del'>-			six_unlock_read(&amp;cur-&gt;c.lock);</div><div class='del'>-			bch2_btree_node_evict(trans, cur_k.k);</div><div class='del'>-			ret = bch2_journal_key_delete(c, b-&gt;c.btree_id,</div><div class='del'>-						      b-&gt;c.level, cur_k.k-&gt;k.p);</div><div class='del'>-			cur = NULL;</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (prev)</div><div class='del'>-			six_unlock_read(&amp;prev-&gt;c.lock);</div><div class='del'>-		prev = NULL;</div><div class='del'>-</div><div class='del'>-		if (ret == DROP_PREV_NODE) {</div><div class='del'>-			bch2_btree_node_evict(trans, prev_k.k);</div><div class='del'>-			ret = bch2_journal_key_delete(c, b-&gt;c.btree_id,</div><div class='del'>-						      b-&gt;c.level, prev_k.k-&gt;k.p);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			bch2_btree_and_journal_iter_exit(&amp;iter);</div><div class='del'>-			bch2_bkey_buf_exit(&amp;prev_k, c);</div><div class='del'>-			bch2_bkey_buf_exit(&amp;cur_k, c);</div><div class='del'>-			goto again;</div><div class='del'>-		} else if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		prev = cur;</div><div class='del'>-		cur = NULL;</div><div class='del'>-		bch2_bkey_buf_copy(&amp;prev_k, c, cur_k.k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; !IS_ERR_OR_NULL(prev)) {</div><div class='del'>-		BUG_ON(cur);</div><div class='del'>-		ret = btree_repair_node_end(c, b, prev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR_OR_NULL(prev))</div><div class='del'>-		six_unlock_read(&amp;prev-&gt;c.lock);</div><div class='del'>-	prev = NULL;</div><div class='del'>-	if (!IS_ERR_OR_NULL(cur))</div><div class='del'>-		six_unlock_read(&amp;cur-&gt;c.lock);</div><div class='del'>-	cur = NULL;</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_btree_and_journal_iter_exit(&amp;iter);</div><div class='del'>-	bch2_btree_and_journal_iter_init_node_iter(&amp;iter, c, b);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_and_journal_iter_peek(&amp;iter)).k) {</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;cur_k, c, k);</div><div class='del'>-		bch2_btree_and_journal_iter_advance(&amp;iter);</div><div class='del'>-</div><div class='del'>-		cur = bch2_btree_node_get_noiter(trans, cur_k.k,</div><div class='del'>-					b-&gt;c.btree_id, b-&gt;c.level - 1,</div><div class='del'>-					false);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(cur);</div><div class='del'>-</div><div class='del'>-		bch_err_msg(c, ret, "getting btree node");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_repair_topology_recurse(trans, cur);</div><div class='del'>-		six_unlock_read(&amp;cur-&gt;c.lock);</div><div class='del'>-		cur = NULL;</div><div class='del'>-</div><div class='del'>-		if (ret == DROP_THIS_NODE) {</div><div class='del'>-			bch2_btree_node_evict(trans, cur_k.k);</div><div class='del'>-			ret = bch2_journal_key_delete(c, b-&gt;c.btree_id,</div><div class='del'>-						      b-&gt;c.level, cur_k.k-&gt;k.p);</div><div class='del'>-			dropped_children = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		have_child = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_reset(&amp;buf);</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-</div><div class='del'>-	if (mustfix_fsck_err_on(!have_child, c,</div><div class='del'>-			btree_node_topology_interior_node_empty,</div><div class='del'>-			"empty interior btree node at btree %s level %u\n"</div><div class='del'>-			"  %s",</div><div class='del'>-			bch2_btree_id_str(b-&gt;c.btree_id),</div><div class='del'>-			b-&gt;c.level, buf.buf))</div><div class='del'>-		ret = DROP_THIS_NODE;</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	if (!IS_ERR_OR_NULL(prev))</div><div class='del'>-		six_unlock_read(&amp;prev-&gt;c.lock);</div><div class='del'>-	if (!IS_ERR_OR_NULL(cur))</div><div class='del'>-		six_unlock_read(&amp;cur-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	bch2_btree_and_journal_iter_exit(&amp;iter);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;prev_k, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;cur_k, c);</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; dropped_children)</div><div class='del'>-		goto again;</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_topology(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; btree_id_nr_alive(c) &amp;&amp; !ret; i++) {</div><div class='del'>-		struct btree_root *r = bch2_btree_id_root(c, i);</div><div class='del'>-</div><div class='del'>-		if (!r-&gt;alive)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		b = r-&gt;b;</div><div class='del'>-		if (btree_node_fake(b))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_read);</div><div class='del'>-		ret = bch2_btree_repair_topology_recurse(trans, b);</div><div class='del'>-		six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-		if (ret == DROP_THIS_NODE) {</div><div class='del'>-			bch_err(c, "empty btree root - repair unimplemented");</div><div class='del'>-			ret = -BCH_ERR_fsck_repair_unimplemented;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_check_fix_ptrs(struct btree_trans *trans, enum btree_id btree_id,</div><div class='del'>-			       unsigned level, bool is_root,</div><div class='del'>-			       struct bkey_s_c *k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs_c = bch2_bkey_ptrs_c(*k);</div><div class='del'>-	const union bch_extent_entry *entry_c;</div><div class='del'>-	struct extent_ptr_decoded p = { 0 };</div><div class='del'>-	bool do_update = false;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX</div><div class='del'>-	 * use check_bucket_ref here</div><div class='del'>-	 */</div><div class='del'>-	bkey_for_each_ptr_decode(k-&gt;k, ptrs_c, p, entry_c) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, p.ptr.dev);</div><div class='del'>-		struct bucket *g = PTR_GC_BUCKET(ca, &amp;p.ptr);</div><div class='del'>-		enum bch_data_type data_type = bch2_bkey_ptr_data_type(*k, &amp;entry_c-&gt;ptr);</div><div class='del'>-</div><div class='del'>-		if (!g-&gt;gen_valid &amp;&amp;</div><div class='del'>-		    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-		     fsck_err(c, ptr_to_missing_alloc_key,</div><div class='del'>-			      "bucket %u:%zu data type %s ptr gen %u missing in alloc btree\n"</div><div class='del'>-			      "while marking %s",</div><div class='del'>-			      p.ptr.dev, PTR_BUCKET_NR(ca, &amp;p.ptr),</div><div class='del'>-			      bch2_data_type_str(ptr_data_type(k-&gt;k, &amp;p.ptr)),</div><div class='del'>-			      p.ptr.gen,</div><div class='del'>-			      (printbuf_reset(&amp;buf),</div><div class='del'>-			       bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf)))) {</div><div class='del'>-			if (!p.ptr.cached) {</div><div class='del'>-				g-&gt;gen_valid		= true;</div><div class='del'>-				g-&gt;gen			= p.ptr.gen;</div><div class='del'>-			} else {</div><div class='del'>-				do_update = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gen_cmp(p.ptr.gen, g-&gt;gen) &gt; 0 &amp;&amp;</div><div class='del'>-		    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-		     fsck_err(c, ptr_gen_newer_than_bucket_gen,</div><div class='del'>-			      "bucket %u:%zu data type %s ptr gen in the future: %u &gt; %u\n"</div><div class='del'>-			      "while marking %s",</div><div class='del'>-			      p.ptr.dev, PTR_BUCKET_NR(ca, &amp;p.ptr),</div><div class='del'>-			      bch2_data_type_str(ptr_data_type(k-&gt;k, &amp;p.ptr)),</div><div class='del'>-			      p.ptr.gen, g-&gt;gen,</div><div class='del'>-			      (printbuf_reset(&amp;buf),</div><div class='del'>-			       bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf)))) {</div><div class='del'>-			if (!p.ptr.cached) {</div><div class='del'>-				g-&gt;gen_valid		= true;</div><div class='del'>-				g-&gt;gen			= p.ptr.gen;</div><div class='del'>-				g-&gt;data_type		= 0;</div><div class='del'>-				g-&gt;dirty_sectors	= 0;</div><div class='del'>-				g-&gt;cached_sectors	= 0;</div><div class='del'>-				set_bit(BCH_FS_need_another_gc, &amp;c-&gt;flags);</div><div class='del'>-			} else {</div><div class='del'>-				do_update = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gen_cmp(g-&gt;gen, p.ptr.gen) &gt; BUCKET_GC_GEN_MAX &amp;&amp;</div><div class='del'>-		    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-		     fsck_err(c, ptr_gen_newer_than_bucket_gen,</div><div class='del'>-			      "bucket %u:%zu gen %u data type %s: ptr gen %u too stale\n"</div><div class='del'>-			      "while marking %s",</div><div class='del'>-			      p.ptr.dev, PTR_BUCKET_NR(ca, &amp;p.ptr), g-&gt;gen,</div><div class='del'>-			      bch2_data_type_str(ptr_data_type(k-&gt;k, &amp;p.ptr)),</div><div class='del'>-			      p.ptr.gen,</div><div class='del'>-			      (printbuf_reset(&amp;buf),</div><div class='del'>-			       bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf))))</div><div class='del'>-			do_update = true;</div><div class='del'>-</div><div class='del'>-		if (!p.ptr.cached &amp;&amp; gen_cmp(p.ptr.gen, g-&gt;gen) &lt; 0 &amp;&amp;</div><div class='del'>-		    (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-		     fsck_err(c, stale_dirty_ptr,</div><div class='del'>-			      "bucket %u:%zu data type %s stale dirty ptr: %u &lt; %u\n"</div><div class='del'>-			      "while marking %s",</div><div class='del'>-			      p.ptr.dev, PTR_BUCKET_NR(ca, &amp;p.ptr),</div><div class='del'>-			      bch2_data_type_str(ptr_data_type(k-&gt;k, &amp;p.ptr)),</div><div class='del'>-			      p.ptr.gen, g-&gt;gen,</div><div class='del'>-			      (printbuf_reset(&amp;buf),</div><div class='del'>-			       bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf))))</div><div class='del'>-			do_update = true;</div><div class='del'>-</div><div class='del'>-		if (data_type != BCH_DATA_btree &amp;&amp; p.ptr.gen != g-&gt;gen)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(bucket_data_type(g-&gt;data_type) &amp;&amp;</div><div class='del'>-				bucket_data_type(g-&gt;data_type) != data_type, c,</div><div class='del'>-				ptr_bucket_data_type_mismatch,</div><div class='del'>-				"bucket %u:%zu different types of data in same bucket: %s, %s\n"</div><div class='del'>-				"while marking %s",</div><div class='del'>-				p.ptr.dev, PTR_BUCKET_NR(ca, &amp;p.ptr),</div><div class='del'>-				bch2_data_type_str(g-&gt;data_type),</div><div class='del'>-				bch2_data_type_str(data_type),</div><div class='del'>-				(printbuf_reset(&amp;buf),</div><div class='del'>-				 bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf))) {</div><div class='del'>-			if (data_type == BCH_DATA_btree) {</div><div class='del'>-				g-&gt;data_type	= data_type;</div><div class='del'>-				set_bit(BCH_FS_need_another_gc, &amp;c-&gt;flags);</div><div class='del'>-			} else {</div><div class='del'>-				do_update = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (p.has_ec) {</div><div class='del'>-			struct gc_stripe *m = genradix_ptr(&amp;c-&gt;gc_stripes, p.ec.idx);</div><div class='del'>-</div><div class='del'>-			if (fsck_err_on(!m || !m-&gt;alive, c,</div><div class='del'>-					ptr_to_missing_stripe,</div><div class='del'>-					"pointer to nonexistent stripe %llu\n"</div><div class='del'>-					"while marking %s",</div><div class='del'>-					(u64) p.ec.idx,</div><div class='del'>-					(printbuf_reset(&amp;buf),</div><div class='del'>-					 bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf)))</div><div class='del'>-				do_update = true;</div><div class='del'>-</div><div class='del'>-			if (fsck_err_on(m &amp;&amp; m-&gt;alive &amp;&amp; !bch2_ptr_matches_stripe_m(m, p), c,</div><div class='del'>-					ptr_to_incorrect_stripe,</div><div class='del'>-					"pointer does not match stripe %llu\n"</div><div class='del'>-					"while marking %s",</div><div class='del'>-					(u64) p.ec.idx,</div><div class='del'>-					(printbuf_reset(&amp;buf),</div><div class='del'>-					 bch2_bkey_val_to_text(&amp;buf, c, *k), buf.buf)))</div><div class='del'>-				do_update = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (do_update) {</div><div class='del'>-		struct bkey_ptrs ptrs;</div><div class='del'>-		union bch_extent_entry *entry;</div><div class='del'>-		struct bch_extent_ptr *ptr;</div><div class='del'>-		struct bkey_i *new;</div><div class='del'>-</div><div class='del'>-		if (is_root) {</div><div class='del'>-			bch_err(c, "cannot update btree roots yet");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new = kmalloc(bkey_bytes(k-&gt;k), GFP_KERNEL);</div><div class='del'>-		if (!new) {</div><div class='del'>-			ret = -BCH_ERR_ENOMEM_gc_repair_key;</div><div class='del'>-			bch_err_msg(c, ret, "allocating new key");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(new, *k);</div><div class='del'>-</div><div class='del'>-		if (level) {</div><div class='del'>-			/*</div><div class='del'>-			 * We don't want to drop btree node pointers - if the</div><div class='del'>-			 * btree node isn't there anymore, the read path will</div><div class='del'>-			 * sort it out:</div><div class='del'>-			 */</div><div class='del'>-			ptrs = bch2_bkey_ptrs(bkey_i_to_s(new));</div><div class='del'>-			bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-				struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-				struct bucket *g = PTR_GC_BUCKET(ca, ptr);</div><div class='del'>-</div><div class='del'>-				ptr-&gt;gen = g-&gt;gen;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			bch2_bkey_drop_ptrs(bkey_i_to_s(new), ptr, ({</div><div class='del'>-				struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-				struct bucket *g = PTR_GC_BUCKET(ca, ptr);</div><div class='del'>-				enum bch_data_type data_type = bch2_bkey_ptr_data_type(*k, ptr);</div><div class='del'>-</div><div class='del'>-				(ptr-&gt;cached &amp;&amp;</div><div class='del'>-				 (!g-&gt;gen_valid || gen_cmp(ptr-&gt;gen, g-&gt;gen) &gt; 0)) ||</div><div class='del'>-				(!ptr-&gt;cached &amp;&amp;</div><div class='del'>-				 gen_cmp(ptr-&gt;gen, g-&gt;gen) &lt; 0) ||</div><div class='del'>-				gen_cmp(g-&gt;gen, ptr-&gt;gen) &gt; BUCKET_GC_GEN_MAX ||</div><div class='del'>-				(g-&gt;data_type &amp;&amp;</div><div class='del'>-				 g-&gt;data_type != data_type);</div><div class='del'>-			}));</div><div class='del'>-again:</div><div class='del'>-			ptrs = bch2_bkey_ptrs(bkey_i_to_s(new));</div><div class='del'>-			bkey_extent_entry_for_each(ptrs, entry) {</div><div class='del'>-				if (extent_entry_type(entry) == BCH_EXTENT_ENTRY_stripe_ptr) {</div><div class='del'>-					struct gc_stripe *m = genradix_ptr(&amp;c-&gt;gc_stripes,</div><div class='del'>-									entry-&gt;stripe_ptr.idx);</div><div class='del'>-					union bch_extent_entry *next_ptr;</div><div class='del'>-</div><div class='del'>-					bkey_extent_entry_for_each_from(ptrs, next_ptr, entry)</div><div class='del'>-						if (extent_entry_type(next_ptr) == BCH_EXTENT_ENTRY_ptr)</div><div class='del'>-							goto found;</div><div class='del'>-					next_ptr = NULL;</div><div class='del'>-found:</div><div class='del'>-					if (!next_ptr) {</div><div class='del'>-						bch_err(c, "aieee, found stripe ptr with no data ptr");</div><div class='del'>-						continue;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if (!m || !m-&gt;alive ||</div><div class='del'>-					    !__bch2_ptr_matches_stripe(&amp;m-&gt;ptrs[entry-&gt;stripe_ptr.block],</div><div class='del'>-								       &amp;next_ptr-&gt;ptr,</div><div class='del'>-								       m-&gt;sectors)) {</div><div class='del'>-						bch2_bkey_extent_entry_drop(new, entry);</div><div class='del'>-						goto again;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_journal_key_insert_take(c, btree_id, level, new);</div><div class='del'>-		if (ret) {</div><div class='del'>-			kfree(new);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (level)</div><div class='del'>-			bch2_btree_node_update_key_early(trans, btree_id, level - 1, *k, new);</div><div class='del'>-</div><div class='del'>-		if (0) {</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, *k);</div><div class='del'>-			bch_info(c, "updated %s", buf.buf);</div><div class='del'>-</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(new));</div><div class='del'>-			bch_info(c, "new key %s", buf.buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*k = bkey_i_to_s_c(new);</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* marking of btree keys/nodes: */</div><div class='del'>-</div><div class='del'>-static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id,</div><div class='del'>-			    unsigned level, bool is_root,</div><div class='del'>-			    struct bkey_s_c *k,</div><div class='del'>-			    bool initial)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey deleted = KEY(0, 0, 0);</div><div class='del'>-	struct bkey_s_c old = (struct bkey_s_c) { &amp;deleted, NULL };</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	deleted.p = k-&gt;k-&gt;p;</div><div class='del'>-</div><div class='del'>-	if (initial) {</div><div class='del'>-		BUG_ON(bch2_journal_seq_verify &amp;&amp;</div><div class='del'>-		       k-&gt;k-&gt;version.lo &gt; atomic64_read(&amp;c-&gt;journal.seq));</div><div class='del'>-</div><div class='del'>-		ret = bch2_check_fix_ptrs(trans, btree_id, level, is_root, k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(k-&gt;k-&gt;version.lo &gt; atomic64_read(&amp;c-&gt;key_version), c,</div><div class='del'>-				bkey_version_in_future,</div><div class='del'>-				"key version number higher than recorded: %llu &gt; %llu",</div><div class='del'>-				k-&gt;k-&gt;version.lo,</div><div class='del'>-				atomic64_read(&amp;c-&gt;key_version)))</div><div class='del'>-			atomic64_set(&amp;c-&gt;key_version, k-&gt;k-&gt;version.lo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_key_trigger(trans, btree_id, level, old, unsafe_bkey_s_c_to_s(*k), BTREE_TRIGGER_GC));</div><div class='del'>-fsck_err:</div><div class='del'>-err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_gc_mark_node(struct btree_trans *trans, struct btree *b, bool initial)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_node_iter iter;</div><div class='del'>-	struct bkey unpacked;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf prev, cur;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!btree_node_type_needs_gc(btree_node_type(b)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_init_from_start(&amp;iter, b);</div><div class='del'>-	bch2_bkey_buf_init(&amp;prev);</div><div class='del'>-	bch2_bkey_buf_init(&amp;cur);</div><div class='del'>-	bkey_init(&amp;prev.k-&gt;k);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_node_iter_peek_unpack(&amp;iter, b, &amp;unpacked)).k) {</div><div class='del'>-		ret = bch2_gc_mark_key(trans, b-&gt;c.btree_id, b-&gt;c.level, false,</div><div class='del'>-				       &amp;k, initial);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_iter_advance(&amp;iter, b);</div><div class='del'>-</div><div class='del'>-		if (b-&gt;c.level) {</div><div class='del'>-			bch2_bkey_buf_reassemble(&amp;cur, c, k);</div><div class='del'>-</div><div class='del'>-			ret = bch2_gc_check_topology(c, b, &amp;prev, cur,</div><div class='del'>-					bch2_btree_node_iter_end(&amp;iter));</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;cur, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;prev, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_btree(struct btree_trans *trans, enum btree_id btree_id,</div><div class='del'>-			 bool initial, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned depth = metadata_only ? 1 : 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	gc_pos_set(c, gc_pos_btree(btree_id, POS_MIN, 0));</div><div class='del'>-</div><div class='del'>-	__for_each_btree_node(trans, iter, btree_id, POS_MIN,</div><div class='del'>-			      0, depth, BTREE_ITER_PREFETCH, b, ret) {</div><div class='del'>-		bch2_verify_btree_nr_keys(b);</div><div class='del'>-</div><div class='del'>-		gc_pos_set(c, gc_pos_btree_node(b));</div><div class='del'>-</div><div class='del'>-		ret = btree_gc_mark_node(trans, b, initial);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-	b = bch2_btree_id_root(c, btree_id)-&gt;b;</div><div class='del'>-	if (!btree_node_fake(b)) {</div><div class='del'>-		struct bkey_s_c k = bkey_i_to_s_c(&amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-		ret = bch2_gc_mark_key(trans, b-&gt;c.btree_id, b-&gt;c.level + 1,</div><div class='del'>-				       true, &amp;k, initial);</div><div class='del'>-	}</div><div class='del'>-	gc_pos_set(c, gc_pos_btree_root(b-&gt;c.btree_id));</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_btree_init_recurse(struct btree_trans *trans, struct btree *b,</div><div class='del'>-				      unsigned target_depth)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_and_journal_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf cur, prev;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_btree_and_journal_iter_init_node_iter(&amp;iter, c, b);</div><div class='del'>-	bch2_bkey_buf_init(&amp;prev);</div><div class='del'>-	bch2_bkey_buf_init(&amp;cur);</div><div class='del'>-	bkey_init(&amp;prev.k-&gt;k);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_and_journal_iter_peek(&amp;iter)).k) {</div><div class='del'>-		BUG_ON(bpos_lt(k.k-&gt;p, b-&gt;data-&gt;min_key));</div><div class='del'>-		BUG_ON(bpos_gt(k.k-&gt;p, b-&gt;data-&gt;max_key));</div><div class='del'>-</div><div class='del'>-		ret = bch2_gc_mark_key(trans, b-&gt;c.btree_id, b-&gt;c.level,</div><div class='del'>-				       false, &amp;k, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto fsck_err;</div><div class='del'>-</div><div class='del'>-		if (b-&gt;c.level) {</div><div class='del'>-			bch2_bkey_buf_reassemble(&amp;cur, c, k);</div><div class='del'>-			k = bkey_i_to_s_c(cur.k);</div><div class='del'>-</div><div class='del'>-			bch2_btree_and_journal_iter_advance(&amp;iter);</div><div class='del'>-</div><div class='del'>-			ret = bch2_gc_check_topology(c, b,</div><div class='del'>-					&amp;prev, cur,</div><div class='del'>-					!bch2_btree_and_journal_iter_peek(&amp;iter).k);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto fsck_err;</div><div class='del'>-		} else {</div><div class='del'>-			bch2_btree_and_journal_iter_advance(&amp;iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b-&gt;c.level &gt; target_depth) {</div><div class='del'>-		bch2_btree_and_journal_iter_exit(&amp;iter);</div><div class='del'>-		bch2_btree_and_journal_iter_init_node_iter(&amp;iter, c, b);</div><div class='del'>-</div><div class='del'>-		while ((k = bch2_btree_and_journal_iter_peek(&amp;iter)).k) {</div><div class='del'>-			struct btree *child;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_buf_reassemble(&amp;cur, c, k);</div><div class='del'>-			bch2_btree_and_journal_iter_advance(&amp;iter);</div><div class='del'>-</div><div class='del'>-			child = bch2_btree_node_get_noiter(trans, cur.k,</div><div class='del'>-						b-&gt;c.btree_id, b-&gt;c.level - 1,</div><div class='del'>-						false);</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(child);</div><div class='del'>-</div><div class='del'>-			if (ret == -EIO) {</div><div class='del'>-				bch2_topology_error(c);</div><div class='del'>-</div><div class='del'>-				if (__fsck_err(c,</div><div class='del'>-					  FSCK_CAN_FIX|</div><div class='del'>-					  FSCK_CAN_IGNORE|</div><div class='del'>-					  FSCK_NO_RATELIMIT,</div><div class='del'>-					  btree_node_read_error,</div><div class='del'>-					  "Unreadable btree node at btree %s level %u:\n"</div><div class='del'>-					  "  %s",</div><div class='del'>-					  bch2_btree_id_str(b-&gt;c.btree_id),</div><div class='del'>-					  b-&gt;c.level - 1,</div><div class='del'>-					  (printbuf_reset(&amp;buf),</div><div class='del'>-					   bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(cur.k)), buf.buf)) &amp;&amp;</div><div class='del'>-				    should_restart_for_topology_repair(c)) {</div><div class='del'>-					bch_info(c, "Halting mark and sweep to start topology repair pass");</div><div class='del'>-					ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_check_topology);</div><div class='del'>-					goto fsck_err;</div><div class='del'>-				} else {</div><div class='del'>-					/* Continue marking when opted to not</div><div class='del'>-					 * fix the error: */</div><div class='del'>-					ret = 0;</div><div class='del'>-					set_bit(BCH_FS_initial_gc_unfixed, &amp;c-&gt;flags);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-			} else if (ret) {</div><div class='del'>-				bch_err_msg(c, ret, "getting btree node");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = bch2_gc_btree_init_recurse(trans, child,</div><div class='del'>-							 target_depth);</div><div class='del'>-			six_unlock_read(&amp;child-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_bkey_buf_exit(&amp;cur, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;prev, c);</div><div class='del'>-	bch2_btree_and_journal_iter_exit(&amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_btree_init(struct btree_trans *trans,</div><div class='del'>-			      enum btree_id btree_id,</div><div class='del'>-			      bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned target_depth = metadata_only ? 1 : 0;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_id_root(c, btree_id)-&gt;b;</div><div class='del'>-</div><div class='del'>-	if (btree_node_fake(b))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	six_lock_read(&amp;b-&gt;c.lock, NULL, NULL);</div><div class='del'>-	printbuf_reset(&amp;buf);</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, b-&gt;data-&gt;min_key);</div><div class='del'>-	if (mustfix_fsck_err_on(!bpos_eq(b-&gt;data-&gt;min_key, POS_MIN), c,</div><div class='del'>-				btree_root_bad_min_key,</div><div class='del'>-			"btree root with incorrect min_key: %s", buf.buf)) {</div><div class='del'>-		bch_err(c, "repair unimplemented");</div><div class='del'>-		ret = -BCH_ERR_fsck_repair_unimplemented;</div><div class='del'>-		goto fsck_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_reset(&amp;buf);</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, b-&gt;data-&gt;max_key);</div><div class='del'>-	if (mustfix_fsck_err_on(!bpos_eq(b-&gt;data-&gt;max_key, SPOS_MAX), c,</div><div class='del'>-				btree_root_bad_max_key,</div><div class='del'>-			"btree root with incorrect max_key: %s", buf.buf)) {</div><div class='del'>-		bch_err(c, "repair unimplemented");</div><div class='del'>-		ret = -BCH_ERR_fsck_repair_unimplemented;</div><div class='del'>-		goto fsck_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b-&gt;c.level &gt;= target_depth)</div><div class='del'>-		ret = bch2_gc_btree_init_recurse(trans, b, target_depth);</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		struct bkey_s_c k = bkey_i_to_s_c(&amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-		ret = bch2_gc_mark_key(trans, b-&gt;c.btree_id, b-&gt;c.level + 1, true,</div><div class='del'>-				       &amp;k, true);</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_id_gc_phase_cmp(enum btree_id l, enum btree_id r)</div><div class='del'>-{</div><div class='del'>-	return  (int) btree_id_to_gc_phase(l) -</div><div class='del'>-		(int) btree_id_to_gc_phase(r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_btrees(struct bch_fs *c, bool initial, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	enum btree_id ids[BTREE_ID_NR];</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTREE_ID_NR; i++)</div><div class='del'>-		ids[i] = i;</div><div class='del'>-	bubble_sort(ids, BTREE_ID_NR, btree_id_gc_phase_cmp);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTREE_ID_NR &amp;&amp; !ret; i++)</div><div class='del'>-		ret = initial</div><div class='del'>-			? bch2_gc_btree_init(trans, ids[i], metadata_only)</div><div class='del'>-			: bch2_gc_btree(trans, ids[i], initial, metadata_only);</div><div class='del'>-</div><div class='del'>-	for (i = BTREE_ID_NR; i &lt; btree_id_nr_alive(c) &amp;&amp; !ret; i++) {</div><div class='del'>-		if (!bch2_btree_id_root(c, i)-&gt;alive)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = initial</div><div class='del'>-			? bch2_gc_btree_init(trans, i, metadata_only)</div><div class='del'>-			: bch2_gc_btree(trans, i, initial, metadata_only);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mark_metadata_sectors(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-				  u64 start, u64 end,</div><div class='del'>-				  enum bch_data_type type,</div><div class='del'>-				  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	u64 b = sector_to_bucket(ca, start);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		unsigned sectors =</div><div class='del'>-			min_t(u64, bucket_to_sector(ca, b + 1), end) - start;</div><div class='del'>-</div><div class='del'>-		bch2_mark_metadata_bucket(c, ca, b, type, sectors,</div><div class='del'>-					  gc_phase(GC_PHASE_SB), flags);</div><div class='del'>-		b++;</div><div class='del'>-		start += sectors;</div><div class='del'>-	} while (start &lt; end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_mark_dev_superblock(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-				     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_layout *layout = &amp;ca-&gt;disk_sb.sb-&gt;layout;</div><div class='del'>-	unsigned i;</div><div class='del'>-	u64 b;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; layout-&gt;nr_superblocks; i++) {</div><div class='del'>-		u64 offset = le64_to_cpu(layout-&gt;sb_offset[i]);</div><div class='del'>-</div><div class='del'>-		if (offset == BCH_SB_SECTOR)</div><div class='del'>-			mark_metadata_sectors(c, ca, 0, BCH_SB_SECTOR,</div><div class='del'>-					      BCH_DATA_sb, flags);</div><div class='del'>-</div><div class='del'>-		mark_metadata_sectors(c, ca, offset,</div><div class='del'>-				      offset + (1 &lt;&lt; layout-&gt;sb_max_size_bits),</div><div class='del'>-				      BCH_DATA_sb, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ca-&gt;journal.nr; i++) {</div><div class='del'>-		b = ca-&gt;journal.buckets[i];</div><div class='del'>-		bch2_mark_metadata_bucket(c, ca, b, BCH_DATA_journal,</div><div class='del'>-					  ca-&gt;mi.bucket_size,</div><div class='del'>-					  gc_phase(GC_PHASE_SB), flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_mark_superblocks(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	gc_pos_set(c, gc_phase(GC_PHASE_SB));</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		bch2_mark_dev_superblock(c, ca, BTREE_TRIGGER_GC);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Also see bch2_pending_btree_node_free_insert_done() */</div><div class='del'>-static void bch2_mark_pending_btree_node_frees(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-	struct pending_btree_node_free *d;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	gc_pos_set(c, gc_phase(GC_PHASE_PENDING_DELETE));</div><div class='del'>-</div><div class='del'>-	for_each_pending_btree_node_free(c, as, d)</div><div class='del'>-		if (d-&gt;index_update_done)</div><div class='del'>-			bch2_mark_key(c, bkey_i_to_s_c(&amp;d-&gt;key), BTREE_TRIGGER_GC);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void bch2_gc_free(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	genradix_free(&amp;c-&gt;reflink_gc_table);</div><div class='del'>-	genradix_free(&amp;c-&gt;gc_stripes);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		kvpfree(rcu_dereference_protected(ca-&gt;buckets_gc, 1),</div><div class='del'>-			sizeof(struct bucket_array) +</div><div class='del'>-			ca-&gt;mi.nbuckets * sizeof(struct bucket));</div><div class='del'>-		ca-&gt;buckets_gc = NULL;</div><div class='del'>-</div><div class='del'>-		free_percpu(ca-&gt;usage_gc);</div><div class='del'>-		ca-&gt;usage_gc = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_percpu(c-&gt;usage_gc);</div><div class='del'>-	c-&gt;usage_gc = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_done(struct bch_fs *c,</div><div class='del'>-			bool initial, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = NULL;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool verify = !metadata_only &amp;&amp;</div><div class='del'>-		!c-&gt;opts.reconstruct_alloc &amp;&amp;</div><div class='del'>-		(!initial || (c-&gt;sb.compat &amp; (1ULL &lt;&lt; BCH_COMPAT_alloc_info)));</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-#define copy_field(_err, _f, _msg, ...)					\</div><div class='del'>-	if (dst-&gt;_f != src-&gt;_f &amp;&amp;					\</div><div class='del'>-	    (!verify ||							\</div><div class='del'>-	     fsck_err(c, _err, _msg ": got %llu, should be %llu"	\</div><div class='del'>-		      , ##__VA_ARGS__, dst-&gt;_f, src-&gt;_f)))		\</div><div class='del'>-		dst-&gt;_f = src-&gt;_f</div><div class='del'>-#define copy_dev_field(_err, _f, _msg, ...)				\</div><div class='del'>-	copy_field(_err, _f, "dev %u has wrong " _msg, ca-&gt;dev_idx, ##__VA_ARGS__)</div><div class='del'>-#define copy_fs_field(_err, _f, _msg, ...)				\</div><div class='del'>-	copy_field(_err, _f, "fs has wrong " _msg, ##__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;usage); i++)</div><div class='del'>-		bch2_fs_usage_acc_to_base(c, i);</div><div class='del'>-</div><div class='del'>-	__for_each_member_device(c, ca) {</div><div class='del'>-		struct bch_dev_usage *dst = ca-&gt;usage_base;</div><div class='del'>-		struct bch_dev_usage *src = (void *)</div><div class='del'>-			bch2_acc_percpu_u64s((u64 __percpu *) ca-&gt;usage_gc,</div><div class='del'>-					     dev_usage_u64s());</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; BCH_DATA_NR; i++) {</div><div class='del'>-			copy_dev_field(dev_usage_buckets_wrong,</div><div class='del'>-				       d[i].buckets,	"%s buckets", bch2_data_type_str(i));</div><div class='del'>-			copy_dev_field(dev_usage_sectors_wrong,</div><div class='del'>-				       d[i].sectors,	"%s sectors", bch2_data_type_str(i));</div><div class='del'>-			copy_dev_field(dev_usage_fragmented_wrong,</div><div class='del'>-				       d[i].fragmented,	"%s fragmented", bch2_data_type_str(i));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		unsigned nr = fs_usage_u64s(c);</div><div class='del'>-		struct bch_fs_usage *dst = c-&gt;usage_base;</div><div class='del'>-		struct bch_fs_usage *src = (void *)</div><div class='del'>-			bch2_acc_percpu_u64s((u64 __percpu *) c-&gt;usage_gc, nr);</div><div class='del'>-</div><div class='del'>-		copy_fs_field(fs_usage_hidden_wrong,</div><div class='del'>-			      b.hidden,		"hidden");</div><div class='del'>-		copy_fs_field(fs_usage_btree_wrong,</div><div class='del'>-			      b.btree,		"btree");</div><div class='del'>-</div><div class='del'>-		if (!metadata_only) {</div><div class='del'>-			copy_fs_field(fs_usage_data_wrong,</div><div class='del'>-				      b.data,	"data");</div><div class='del'>-			copy_fs_field(fs_usage_cached_wrong,</div><div class='del'>-				      b.cached,	"cached");</div><div class='del'>-			copy_fs_field(fs_usage_reserved_wrong,</div><div class='del'>-				      b.reserved,	"reserved");</div><div class='del'>-			copy_fs_field(fs_usage_nr_inodes_wrong,</div><div class='del'>-				      b.nr_inodes,"nr_inodes");</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; BCH_REPLICAS_MAX; i++)</div><div class='del'>-				copy_fs_field(fs_usage_persistent_reserved_wrong,</div><div class='del'>-					      persistent_reserved[i],</div><div class='del'>-					      "persistent_reserved[%i]", i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; c-&gt;replicas.nr; i++) {</div><div class='del'>-			struct bch_replicas_entry_v1 *e =</div><div class='del'>-				cpu_replicas_entry(&amp;c-&gt;replicas, i);</div><div class='del'>-</div><div class='del'>-			if (metadata_only &amp;&amp;</div><div class='del'>-			    (e-&gt;data_type == BCH_DATA_user ||</div><div class='del'>-			     e-&gt;data_type == BCH_DATA_cached))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-			bch2_replicas_entry_to_text(&amp;buf, e);</div><div class='del'>-</div><div class='del'>-			copy_fs_field(fs_usage_replicas_wrong,</div><div class='del'>-				      replicas[i], "%s", buf.buf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#undef copy_fs_field</div><div class='del'>-#undef copy_dev_field</div><div class='del'>-#undef copy_stripe_field</div><div class='del'>-#undef copy_field</div><div class='del'>-fsck_err:</div><div class='del'>-	if (ca)</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_start(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(c-&gt;usage_gc);</div><div class='del'>-</div><div class='del'>-	c-&gt;usage_gc = __alloc_percpu_gfp(fs_usage_u64s(c) * sizeof(u64),</div><div class='del'>-					 sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!c-&gt;usage_gc) {</div><div class='del'>-		bch_err(c, "error allocating c-&gt;usage_gc");</div><div class='del'>-		return -BCH_ERR_ENOMEM_gc_start;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		BUG_ON(ca-&gt;usage_gc);</div><div class='del'>-</div><div class='del'>-		ca-&gt;usage_gc = alloc_percpu(struct bch_dev_usage);</div><div class='del'>-		if (!ca-&gt;usage_gc) {</div><div class='del'>-			bch_err(c, "error allocating ca-&gt;usage_gc");</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			return -BCH_ERR_ENOMEM_gc_start;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		this_cpu_write(ca-&gt;usage_gc-&gt;d[BCH_DATA_free].buckets,</div><div class='del'>-			       ca-&gt;mi.nbuckets - ca-&gt;mi.first_bucket);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_reset(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		free_percpu(ca-&gt;usage_gc);</div><div class='del'>-		ca-&gt;usage_gc = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_percpu(c-&gt;usage_gc);</div><div class='del'>-	c-&gt;usage_gc = NULL;</div><div class='del'>-</div><div class='del'>-	return bch2_gc_start(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns true if not equal */</div><div class='del'>-static inline bool bch2_alloc_v4_cmp(struct bch_alloc_v4 l,</div><div class='del'>-				     struct bch_alloc_v4 r)</div><div class='del'>-{</div><div class='del'>-	return  l.gen != r.gen				||</div><div class='del'>-		l.oldest_gen != r.oldest_gen		||</div><div class='del'>-		l.data_type != r.data_type		||</div><div class='del'>-		l.dirty_sectors	!= r.dirty_sectors	||</div><div class='del'>-		l.cached_sectors != r.cached_sectors	 ||</div><div class='del'>-		l.stripe_redundancy != r.stripe_redundancy ||</div><div class='del'>-		l.stripe != r.stripe;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_alloc_write_key(struct btree_trans *trans,</div><div class='del'>-				struct btree_iter *iter,</div><div class='del'>-				struct bkey_s_c k,</div><div class='del'>-				bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, iter-&gt;pos.inode);</div><div class='del'>-	struct bucket gc, *b;</div><div class='del'>-	struct bkey_i_alloc_v4 *a;</div><div class='del'>-	struct bch_alloc_v4 old_convert, new;</div><div class='del'>-	const struct bch_alloc_v4 *old;</div><div class='del'>-	enum bch_data_type type;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	old = bch2_alloc_to_v4(k, &amp;old_convert);</div><div class='del'>-	new = *old;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	b = gc_bucket(ca, iter-&gt;pos.offset);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * b-&gt;data_type doesn't yet include need_discard &amp; need_gc_gen states -</div><div class='del'>-	 * fix that here:</div><div class='del'>-	 */</div><div class='del'>-	type = __alloc_data_type(b-&gt;dirty_sectors,</div><div class='del'>-				 b-&gt;cached_sectors,</div><div class='del'>-				 b-&gt;stripe,</div><div class='del'>-				 *old,</div><div class='del'>-				 b-&gt;data_type);</div><div class='del'>-	if (b-&gt;data_type != type) {</div><div class='del'>-		struct bch_dev_usage *u;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		u = this_cpu_ptr(ca-&gt;usage_gc);</div><div class='del'>-		u-&gt;d[b-&gt;data_type].buckets--;</div><div class='del'>-		b-&gt;data_type = type;</div><div class='del'>-		u-&gt;d[b-&gt;data_type].buckets++;</div><div class='del'>-		preempt_enable();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gc = *b;</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (metadata_only &amp;&amp;</div><div class='del'>-	    gc.data_type != BCH_DATA_sb &amp;&amp;</div><div class='del'>-	    gc.data_type != BCH_DATA_journal &amp;&amp;</div><div class='del'>-	    gc.data_type != BCH_DATA_btree)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (gen_after(old-&gt;gen, gc.gen))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-	    fsck_err_on(new.data_type != gc.data_type, c,</div><div class='del'>-			alloc_key_data_type_wrong,</div><div class='del'>-			"bucket %llu:%llu gen %u has wrong data_type"</div><div class='del'>-			": got %s, should be %s",</div><div class='del'>-			iter-&gt;pos.inode, iter-&gt;pos.offset,</div><div class='del'>-			gc.gen,</div><div class='del'>-			bch2_data_type_str(new.data_type),</div><div class='del'>-			bch2_data_type_str(gc.data_type)))</div><div class='del'>-		new.data_type = gc.data_type;</div><div class='del'>-</div><div class='del'>-#define copy_bucket_field(_errtype, _f)					\</div><div class='del'>-	if (c-&gt;opts.reconstruct_alloc ||				\</div><div class='del'>-	    fsck_err_on(new._f != gc._f, c, _errtype,			\</div><div class='del'>-			"bucket %llu:%llu gen %u data type %s has wrong " #_f	\</div><div class='del'>-			": got %u, should be %u",			\</div><div class='del'>-			iter-&gt;pos.inode, iter-&gt;pos.offset,		\</div><div class='del'>-			gc.gen,						\</div><div class='del'>-			bch2_data_type_str(gc.data_type),		\</div><div class='del'>-			new._f, gc._f))					\</div><div class='del'>-		new._f = gc._f;						\</div><div class='del'>-</div><div class='del'>-	copy_bucket_field(alloc_key_gen_wrong,</div><div class='del'>-			  gen);</div><div class='del'>-	copy_bucket_field(alloc_key_dirty_sectors_wrong,</div><div class='del'>-			  dirty_sectors);</div><div class='del'>-	copy_bucket_field(alloc_key_cached_sectors_wrong,</div><div class='del'>-			  cached_sectors);</div><div class='del'>-	copy_bucket_field(alloc_key_stripe_wrong,</div><div class='del'>-			  stripe);</div><div class='del'>-	copy_bucket_field(alloc_key_stripe_redundancy_wrong,</div><div class='del'>-			  stripe_redundancy);</div><div class='del'>-#undef copy_bucket_field</div><div class='del'>-</div><div class='del'>-	if (!bch2_alloc_v4_cmp(*old, new))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4_mut(trans, k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(a);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	a-&gt;v = new;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The trigger normally makes sure this is set, but we're not running</div><div class='del'>-	 * triggers:</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;v.data_type == BCH_DATA_cached &amp;&amp; !a-&gt;v.io_time[READ])</div><div class='del'>-		a-&gt;v.io_time[READ] = max_t(u64, 1, atomic64_read(&amp;c-&gt;io_clock[READ].now));</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, iter, &amp;a-&gt;k_i, BTREE_TRIGGER_NORUN);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_alloc_done(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		ret = bch2_trans_run(c,</div><div class='del'>-			for_each_btree_key_upto_commit(trans, iter, BTREE_ID_alloc,</div><div class='del'>-					POS(ca-&gt;dev_idx, ca-&gt;mi.first_bucket),</div><div class='del'>-					POS(ca-&gt;dev_idx, ca-&gt;mi.nbuckets - 1),</div><div class='del'>-					BTREE_ITER_SLOTS|BTREE_ITER_PREFETCH, k,</div><div class='del'>-					NULL, NULL, BCH_TRANS_COMMIT_lazy_rw,</div><div class='del'>-				bch2_alloc_write_key(trans, &amp;iter, k, metadata_only)));</div><div class='del'>-		if (ret) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_alloc_start(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		struct bucket_array *buckets = kvpmalloc(sizeof(struct bucket_array) +</div><div class='del'>-				ca-&gt;mi.nbuckets * sizeof(struct bucket),</div><div class='del'>-				GFP_KERNEL|__GFP_ZERO);</div><div class='del'>-		if (!buckets) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			bch_err(c, "error allocating ca-&gt;buckets[gc]");</div><div class='del'>-			return -BCH_ERR_ENOMEM_gc_alloc_start;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		buckets-&gt;first_bucket	= ca-&gt;mi.first_bucket;</div><div class='del'>-		buckets-&gt;nbuckets	= ca-&gt;mi.nbuckets;</div><div class='del'>-		rcu_assign_pointer(ca-&gt;buckets_gc, buckets);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,</div><div class='del'>-					 BTREE_ITER_PREFETCH, k, ({</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, k.k-&gt;p.inode);</div><div class='del'>-			struct bucket *g = gc_bucket(ca, k.k-&gt;p.offset);</div><div class='del'>-</div><div class='del'>-			struct bch_alloc_v4 a_convert;</div><div class='del'>-			const struct bch_alloc_v4 *a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-			g-&gt;gen_valid	= 1;</div><div class='del'>-			g-&gt;gen		= a-&gt;gen;</div><div class='del'>-</div><div class='del'>-			if (metadata_only &amp;&amp;</div><div class='del'>-			    (a-&gt;data_type == BCH_DATA_user ||</div><div class='del'>-			     a-&gt;data_type == BCH_DATA_cached ||</div><div class='del'>-			     a-&gt;data_type == BCH_DATA_parity)) {</div><div class='del'>-				g-&gt;data_type		= a-&gt;data_type;</div><div class='del'>-				g-&gt;dirty_sectors	= a-&gt;dirty_sectors;</div><div class='del'>-				g-&gt;cached_sectors	= a-&gt;cached_sectors;</div><div class='del'>-				g-&gt;stripe		= a-&gt;stripe;</div><div class='del'>-				g-&gt;stripe_redundancy	= a-&gt;stripe_redundancy;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_gc_alloc_reset(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		struct bucket_array *buckets = gc_bucket_array(ca);</div><div class='del'>-		struct bucket *g;</div><div class='del'>-</div><div class='del'>-		for_each_bucket(g, buckets) {</div><div class='del'>-			if (metadata_only &amp;&amp;</div><div class='del'>-			    (g-&gt;data_type == BCH_DATA_user ||</div><div class='del'>-			     g-&gt;data_type == BCH_DATA_cached ||</div><div class='del'>-			     g-&gt;data_type == BCH_DATA_parity))</div><div class='del'>-				continue;</div><div class='del'>-			g-&gt;data_type = 0;</div><div class='del'>-			g-&gt;dirty_sectors = 0;</div><div class='del'>-			g-&gt;cached_sectors = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_write_reflink_key(struct btree_trans *trans,</div><div class='del'>-				     struct btree_iter *iter,</div><div class='del'>-				     struct bkey_s_c k,</div><div class='del'>-				     size_t *idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	const __le64 *refcount = bkey_refcount_c(k);</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct reflink_gc *r;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!refcount)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while ((r = genradix_ptr(&amp;c-&gt;reflink_gc_table, *idx)) &amp;&amp;</div><div class='del'>-	       r-&gt;offset &lt; k.k-&gt;p.offset)</div><div class='del'>-		++*idx;</div><div class='del'>-</div><div class='del'>-	if (!r ||</div><div class='del'>-	    r-&gt;offset != k.k-&gt;p.offset ||</div><div class='del'>-	    r-&gt;size != k.k-&gt;size) {</div><div class='del'>-		bch_err(c, "unexpected inconsistency walking reflink table at gc finish");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(r-&gt;refcount != le64_to_cpu(*refcount), c,</div><div class='del'>-			reflink_v_refcount_wrong,</div><div class='del'>-			"reflink key has wrong refcount:\n"</div><div class='del'>-			"  %s\n"</div><div class='del'>-			"  should be %u",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf),</div><div class='del'>-			r-&gt;refcount)) {</div><div class='del'>-		struct bkey_i *new = bch2_bkey_make_mut(trans, iter, &amp;k, 0);</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(new);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (!r-&gt;refcount)</div><div class='del'>-			new-&gt;k.type = KEY_TYPE_deleted;</div><div class='del'>-		else</div><div class='del'>-			*bkey_refcount(bkey_i_to_s(new)) = cpu_to_le64(r-&gt;refcount);</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_reflink_done(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	size_t idx = 0;</div><div class='del'>-</div><div class='del'>-	if (metadata_only)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-				BTREE_ID_reflink, POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_gc_write_reflink_key(trans, &amp;iter, k, &amp;idx)));</div><div class='del'>-	c-&gt;reflink_gc_nr = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_reflink_start(struct bch_fs *c,</div><div class='del'>-				 bool metadata_only)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (metadata_only)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	c-&gt;reflink_gc_nr = 0;</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_reflink, POS_MIN,</div><div class='del'>-				   BTREE_ITER_PREFETCH, k, ({</div><div class='del'>-			const __le64 *refcount = bkey_refcount_c(k);</div><div class='del'>-</div><div class='del'>-			if (!refcount)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			struct reflink_gc *r = genradix_ptr_alloc(&amp;c-&gt;reflink_gc_table,</div><div class='del'>-							c-&gt;reflink_gc_nr++, GFP_KERNEL);</div><div class='del'>-			if (!r) {</div><div class='del'>-				ret = -BCH_ERR_ENOMEM_gc_reflink_start;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			r-&gt;offset	= k.k-&gt;p.offset;</div><div class='del'>-			r-&gt;size		= k.k-&gt;size;</div><div class='del'>-			r-&gt;refcount	= 0;</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_gc_reflink_reset(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-	struct reflink_gc *r;</div><div class='del'>-</div><div class='del'>-	genradix_for_each(&amp;c-&gt;reflink_gc_table, iter, r)</div><div class='del'>-		r-&gt;refcount = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_write_stripes_key(struct btree_trans *trans,</div><div class='del'>-				     struct btree_iter *iter,</div><div class='del'>-				     struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	const struct bch_stripe *s;</div><div class='del'>-	struct gc_stripe *m;</div><div class='del'>-	bool bad = false;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_stripe)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	s = bkey_s_c_to_stripe(k).v;</div><div class='del'>-	m = genradix_ptr(&amp;c-&gt;gc_stripes, k.k-&gt;p.offset);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; s-&gt;nr_blocks; i++) {</div><div class='del'>-		u32 old = stripe_blockcount_get(s, i);</div><div class='del'>-		u32 new = (m ? m-&gt;block_sectors[i] : 0);</div><div class='del'>-</div><div class='del'>-		if (old != new) {</div><div class='del'>-			prt_printf(&amp;buf, "stripe block %u has wrong sector count: got %u, should be %u\n",</div><div class='del'>-				   i, old, new);</div><div class='del'>-			bad = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bad)</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(bad, c, stripe_sector_count_wrong,</div><div class='del'>-			"%s", buf.buf)) {</div><div class='del'>-		struct bkey_i_stripe *new;</div><div class='del'>-</div><div class='del'>-		new = bch2_trans_kmalloc(trans, bkey_bytes(k.k));</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(new);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(&amp;new-&gt;k_i, k);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; new-&gt;v.nr_blocks; i++)</div><div class='del'>-			stripe_blockcount_set(&amp;new-&gt;v, i, m ? m-&gt;block_sectors[i] : 0);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, iter, &amp;new-&gt;k_i, 0);</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_stripes_done(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	if (metadata_only)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-				BTREE_ID_stripes, POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_gc_write_stripes_key(trans, &amp;iter, k)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_gc_stripes_reset(struct bch_fs *c, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	genradix_free(&amp;c-&gt;gc_stripes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_gc - walk _all_ references to buckets, and recompute them:</div><div class='del'>- *</div><div class='del'>- * @c:			filesystem object</div><div class='del'>- * @initial:		are we in recovery?</div><div class='del'>- * @metadata_only:	are we just checking metadata references, or everything?</div><div class='del'>- *</div><div class='del'>- * Returns: 0 on success, or standard errcode on failure</div><div class='del'>- *</div><div class='del'>- * Order matters here:</div><div class='del'>- *  - Concurrent GC relies on the fact that we have a total ordering for</div><div class='del'>- *    everything that GC walks - see  gc_will_visit_node(),</div><div class='del'>- *    gc_will_visit_root()</div><div class='del'>- *</div><div class='del'>- *  - also, references move around in the course of index updates and</div><div class='del'>- *    various other crap: everything needs to agree on the ordering</div><div class='del'>- *    references are allowed to move around in - e.g., we're allowed to</div><div class='del'>- *    start with a reference owned by an open_bucket (the allocator) and</div><div class='del'>- *    move it to the btree, but not the reverse.</div><div class='del'>- *</div><div class='del'>- *    This is necessary to ensure that gc doesn't miss references that</div><div class='del'>- *    move around - if references move backwards in the ordering GC</div><div class='del'>- *    uses, GC could skip past them</div><div class='del'>- */</div><div class='del'>-int bch2_gc(struct bch_fs *c, bool initial, bool metadata_only)</div><div class='del'>-{</div><div class='del'>-	unsigned iter = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;gc_lock);</div><div class='del'>-</div><div class='del'>-	bch2_btree_interior_updates_flush(c);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_gc_start(c) ?:</div><div class='del'>-		bch2_gc_alloc_start(c, metadata_only) ?:</div><div class='del'>-		bch2_gc_reflink_start(c, metadata_only);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-again:</div><div class='del'>-	gc_pos_set(c, gc_phase(GC_PHASE_START));</div><div class='del'>-</div><div class='del'>-	bch2_mark_superblocks(c);</div><div class='del'>-</div><div class='del'>-	ret = bch2_gc_btrees(c, initial, metadata_only);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	bch2_mark_pending_btree_node_frees(c);</div><div class='del'>-#endif</div><div class='del'>-	c-&gt;gc_count++;</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_need_another_gc, &amp;c-&gt;flags) ||</div><div class='del'>-	    (!iter &amp;&amp; bch2_test_restart_gc)) {</div><div class='del'>-		if (iter++ &gt; 2) {</div><div class='del'>-			bch_info(c, "Unable to fix bucket gens, looping");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: make sure gens we fixed got saved</div><div class='del'>-		 */</div><div class='del'>-		bch_info(c, "Second GC pass needed, restarting:");</div><div class='del'>-		clear_bit(BCH_FS_need_another_gc, &amp;c-&gt;flags);</div><div class='del'>-		__gc_pos_set(c, gc_phase(GC_PHASE_NOT_RUNNING));</div><div class='del'>-</div><div class='del'>-		bch2_gc_stripes_reset(c, metadata_only);</div><div class='del'>-		bch2_gc_alloc_reset(c, metadata_only);</div><div class='del'>-		bch2_gc_reflink_reset(c, metadata_only);</div><div class='del'>-		ret = bch2_gc_reset(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/* flush fsck errors, reset counters */</div><div class='del'>-		bch2_flush_fsck_errs(c);</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (!ret) {</div><div class='del'>-		bch2_journal_block(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-		ret   = bch2_gc_stripes_done(c, metadata_only) ?:</div><div class='del'>-			bch2_gc_reflink_done(c, metadata_only) ?:</div><div class='del'>-			bch2_gc_alloc_done(c, metadata_only) ?:</div><div class='del'>-			bch2_gc_done(c, initial, metadata_only);</div><div class='del'>-</div><div class='del'>-		bch2_journal_unblock(&amp;c-&gt;journal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-	/* Indicates that gc is no longer in progress: */</div><div class='del'>-	__gc_pos_set(c, gc_phase(GC_PHASE_NOT_RUNNING));</div><div class='del'>-</div><div class='del'>-	bch2_gc_free(c);</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	up_write(&amp;c-&gt;gc_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * At startup, allocations can happen directly instead of via the</div><div class='del'>-	 * allocator thread - issue wakeup in case they blocked on gc_lock:</div><div class='del'>-	 */</div><div class='del'>-	closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gc_btree_gens_key(struct btree_trans *trans,</div><div class='del'>-			     struct btree_iter *iter,</div><div class='del'>-			     struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	struct bkey_i *u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-		if (ptr_stale(ca, ptr) &gt; 16) {</div><div class='del'>-			percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-			goto update;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-		u8 *gen = &amp;ca-&gt;oldest_gen[PTR_BUCKET_NR(ca, ptr)];</div><div class='del'>-</div><div class='del'>-		if (gen_after(*gen, ptr-&gt;gen))</div><div class='del'>-			*gen = ptr-&gt;gen;</div><div class='del'>-	}</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	return 0;</div><div class='del'>-update:</div><div class='del'>-	u = bch2_bkey_make_mut(trans, iter, &amp;k, 0);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_extent_normalize(c, bkey_i_to_s(u));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_alloc_write_oldest_gen(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-				       struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(trans-&gt;c, iter-&gt;pos.inode);</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-	struct bkey_i_alloc_v4 *a_mut;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (a-&gt;oldest_gen == ca-&gt;oldest_gen[iter-&gt;pos.offset])</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	a_mut = bch2_alloc_to_v4_mut(trans, k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(a_mut);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	a_mut-&gt;v.oldest_gen = ca-&gt;oldest_gen[iter-&gt;pos.offset];</div><div class='del'>-	a_mut-&gt;v.data_type = alloc_data_type(a_mut-&gt;v, a_mut-&gt;v.data_type);</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update(trans, iter, &amp;a_mut-&gt;k_i, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_gc_gens(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	u64 b, start_time = local_clock();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ideally we would be using state_lock and not gc_lock here, but that</div><div class='del'>-	 * introduces a deadlock in the RO path - we currently take the state</div><div class='del'>-	 * lock at the start of going RO, thus the gc thread may get stuck:</div><div class='del'>-	 */</div><div class='del'>-	if (!mutex_trylock(&amp;c-&gt;gc_gens_lock))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, gc_gens_start, c);</div><div class='del'>-	down_read(&amp;c-&gt;gc_lock);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		struct bucket_gens *gens = bucket_gens(ca);</div><div class='del'>-</div><div class='del'>-		BUG_ON(ca-&gt;oldest_gen);</div><div class='del'>-</div><div class='del'>-		ca-&gt;oldest_gen = kvmalloc(gens-&gt;nbuckets, GFP_KERNEL);</div><div class='del'>-		if (!ca-&gt;oldest_gen) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			ret = -BCH_ERR_ENOMEM_gc_gens;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (b = gens-&gt;first_bucket;</div><div class='del'>-		     b &lt; gens-&gt;nbuckets; b++)</div><div class='del'>-			ca-&gt;oldest_gen[b] = gens-&gt;b[b];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BTREE_ID_NR; i++)</div><div class='del'>-		if (btree_type_has_ptrs(i)) {</div><div class='del'>-			c-&gt;gc_gens_btree = i;</div><div class='del'>-			c-&gt;gc_gens_pos = POS_MIN;</div><div class='del'>-</div><div class='del'>-			ret = bch2_trans_run(c,</div><div class='del'>-				for_each_btree_key_commit(trans, iter, i,</div><div class='del'>-						POS_MIN,</div><div class='del'>-						BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS,</div><div class='del'>-						k,</div><div class='del'>-						NULL, NULL,</div><div class='del'>-						BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-					gc_btree_gens_key(trans, &amp;iter, k)));</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_alloc,</div><div class='del'>-				POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH,</div><div class='del'>-				k,</div><div class='del'>-				NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_alloc_write_oldest_gen(trans, &amp;iter, k)));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	c-&gt;gc_gens_btree	= 0;</div><div class='del'>-	c-&gt;gc_gens_pos		= POS_MIN;</div><div class='del'>-</div><div class='del'>-	c-&gt;gc_count++;</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_gc], start_time);</div><div class='del'>-	trace_and_count(c, gc_gens_end, c);</div><div class='del'>-err:</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		kvfree(ca-&gt;oldest_gen);</div><div class='del'>-		ca-&gt;oldest_gen = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	up_read(&amp;c-&gt;gc_lock);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;gc_gens_lock);</div><div class='del'>-	if (!bch2_err_matches(ret, EROFS))</div><div class='del'>-		bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_gc_thread(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = arg;</div><div class='del'>-	struct io_clock *clock = &amp;c-&gt;io_clock[WRITE];</div><div class='del'>-	unsigned long last = atomic64_read(&amp;clock-&gt;now);</div><div class='del'>-	unsigned last_kick = atomic_read(&amp;c-&gt;kick_gc);</div><div class='del'>-</div><div class='del'>-	set_freezable();</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		while (1) {</div><div class='del'>-			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-			if (kthread_should_stop()) {</div><div class='del'>-				__set_current_state(TASK_RUNNING);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (atomic_read(&amp;c-&gt;kick_gc) != last_kick)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (c-&gt;btree_gc_periodic) {</div><div class='del'>-				unsigned long next = last + c-&gt;capacity / 16;</div><div class='del'>-</div><div class='del'>-				if (atomic64_read(&amp;clock-&gt;now) &gt;= next)</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				bch2_io_clock_schedule_timeout(clock, next);</div><div class='del'>-			} else {</div><div class='del'>-				schedule();</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			try_to_freeze();</div><div class='del'>-		}</div><div class='del'>-		__set_current_state(TASK_RUNNING);</div><div class='del'>-</div><div class='del'>-		last = atomic64_read(&amp;clock-&gt;now);</div><div class='del'>-		last_kick = atomic_read(&amp;c-&gt;kick_gc);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Full gc is currently incompatible with btree key cache:</div><div class='del'>-		 */</div><div class='del'>-#if 0</div><div class='del'>-		ret = bch2_gc(c, false, false);</div><div class='del'>-#else</div><div class='del'>-		bch2_gc_gens(c);</div><div class='del'>-#endif</div><div class='del'>-		debug_check_no_locks_held();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_gc_thread_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-</div><div class='del'>-	p = c-&gt;gc_thread;</div><div class='del'>-	c-&gt;gc_thread = NULL;</div><div class='del'>-</div><div class='del'>-	if (p) {</div><div class='del'>-		kthread_stop(p);</div><div class='del'>-		put_task_struct(p);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_gc_thread_start(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;gc_thread)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = kthread_create(bch2_gc_thread, c, "bch-gc/%s", c-&gt;name);</div><div class='del'>-	if (IS_ERR(p)) {</div><div class='del'>-		bch_err_fn(c, PTR_ERR(p));</div><div class='del'>-		return PTR_ERR(p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	get_task_struct(p);</div><div class='del'>-	c-&gt;gc_thread = p;</div><div class='del'>-	wake_up_process(p);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_gc.h b/fs/bcachefs/btree_gc.h<br/>deleted file mode 100644<br/>index 607575f83a00..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_gc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_gc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_GC_H</div><div class='del'>-#define _BCACHEFS_BTREE_GC_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-</div><div class='del'>-int bch2_check_topology(struct bch_fs *);</div><div class='del'>-int bch2_gc(struct bch_fs *, bool, bool);</div><div class='del'>-int bch2_gc_gens(struct bch_fs *);</div><div class='del'>-void bch2_gc_thread_stop(struct bch_fs *);</div><div class='del'>-int bch2_gc_thread_start(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For concurrent mark and sweep (with other index updates), we define a total</div><div class='del'>- * ordering of _all_ references GC walks:</div><div class='del'>- *</div><div class='del'>- * Note that some references will have the same GC position as others - e.g.</div><div class='del'>- * everything within the same btree node; in those cases we're relying on</div><div class='del'>- * whatever locking exists for where those references live, i.e. the write lock</div><div class='del'>- * on a btree node.</div><div class='del'>- *</div><div class='del'>- * That locking is also required to ensure GC doesn't pass the updater in</div><div class='del'>- * between the updater adding/removing the reference and updating the GC marks;</div><div class='del'>- * without that, we would at best double count sometimes.</div><div class='del'>- *</div><div class='del'>- * That part is important - whenever calling bch2_mark_pointers(), a lock _must_</div><div class='del'>- * be held that prevents GC from passing the position the updater is at.</div><div class='del'>- *</div><div class='del'>- * (What about the start of gc, when we're clearing all the marks? GC clears the</div><div class='del'>- * mark with the gc pos seqlock held, and bch_mark_bucket checks against the gc</div><div class='del'>- * position inside its cmpxchg loop, so crap magically works).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Position of (the start of) a gc phase: */</div><div class='del'>-static inline struct gc_pos gc_phase(enum gc_phase phase)</div><div class='del'>-{</div><div class='del'>-	return (struct gc_pos) {</div><div class='del'>-		.phase	= phase,</div><div class='del'>-		.pos	= POS_MIN,</div><div class='del'>-		.level	= 0,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gc_pos_cmp(struct gc_pos l, struct gc_pos r)</div><div class='del'>-{</div><div class='del'>-	return  cmp_int(l.phase, r.phase) ?:</div><div class='del'>-		bpos_cmp(l.pos, r.pos) ?:</div><div class='del'>-		cmp_int(l.level, r.level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum gc_phase btree_id_to_gc_phase(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(name, v, ...) case BTREE_ID_##name: return GC_PHASE_BTREE_##name;</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct gc_pos gc_pos_btree(enum btree_id id,</div><div class='del'>-					 struct bpos pos, unsigned level)</div><div class='del'>-{</div><div class='del'>-	return (struct gc_pos) {</div><div class='del'>-		.phase	= btree_id_to_gc_phase(id),</div><div class='del'>-		.pos	= pos,</div><div class='del'>-		.level	= level,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GC position of the pointers within a btree node: note, _not_ for &amp;b-&gt;key</div><div class='del'>- * itself, that lives in the parent node:</div><div class='del'>- */</div><div class='del'>-static inline struct gc_pos gc_pos_btree_node(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return gc_pos_btree(b-&gt;c.btree_id, b-&gt;key.k.p, b-&gt;c.level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GC position of the pointer to a btree root: we don't use</div><div class='del'>- * gc_pos_pointer_to_btree_node() here to avoid a potential race with</div><div class='del'>- * btree_split() increasing the tree depth - the new root will have level &gt; the</div><div class='del'>- * old root and thus have a greater gc position than the old root, but that</div><div class='del'>- * would be incorrect since once gc has marked the root it's not coming back.</div><div class='del'>- */</div><div class='del'>-static inline struct gc_pos gc_pos_btree_root(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	return gc_pos_btree(id, SPOS_MAX, BTREE_MAX_DEPTH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool gc_visited(struct bch_fs *c, struct gc_pos pos)</div><div class='del'>-{</div><div class='del'>-	unsigned seq;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqcount_begin(&amp;c-&gt;gc_pos_lock);</div><div class='del'>-		ret = gc_pos_cmp(pos, c-&gt;gc_pos) &lt;= 0;</div><div class='del'>-	} while (read_seqcount_retry(&amp;c-&gt;gc_pos_lock, seq));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_do_gc_gens(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	atomic_inc(&amp;c-&gt;kick_gc);</div><div class='del'>-	if (c-&gt;gc_thread)</div><div class='del'>-		wake_up_process(c-&gt;gc_thread);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_GC_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c<br/>deleted file mode 100644<br/>index aa9b6cbe3226..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2349 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "bkey_sort.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_io_unlock(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!btree_node_write_in_flight(b));</div><div class='del'>-</div><div class='del'>-	clear_btree_node_write_in_flight_inner(b);</div><div class='del'>-	clear_btree_node_write_in_flight(b);</div><div class='del'>-	wake_up_bit(&amp;b-&gt;flags, BTREE_NODE_write_in_flight);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_io_lock(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	bch2_assert_btree_nodes_not_locked();</div><div class='del'>-</div><div class='del'>-	wait_on_bit_lock_io(&amp;b-&gt;flags, BTREE_NODE_write_in_flight,</div><div class='del'>-			    TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_btree_node_wait_on_read(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	wait_on_bit_io(&amp;b-&gt;flags, BTREE_NODE_read_in_flight,</div><div class='del'>-		       TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_btree_node_wait_on_write(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	wait_on_bit_io(&amp;b-&gt;flags, BTREE_NODE_write_in_flight,</div><div class='del'>-		       TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_wait_on_read(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	bch2_assert_btree_nodes_not_locked();</div><div class='del'>-</div><div class='del'>-	wait_on_bit_io(&amp;b-&gt;flags, BTREE_NODE_read_in_flight,</div><div class='del'>-		       TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_wait_on_write(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	bch2_assert_btree_nodes_not_locked();</div><div class='del'>-</div><div class='del'>-	wait_on_bit_io(&amp;b-&gt;flags, BTREE_NODE_write_in_flight,</div><div class='del'>-		       TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void verify_no_dups(struct btree *b,</div><div class='del'>-			   struct bkey_packed *start,</div><div class='del'>-			   struct bkey_packed *end)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	struct bkey_packed *k, *p;</div><div class='del'>-</div><div class='del'>-	if (start == end)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (p = start, k = bkey_p_next(start);</div><div class='del'>-	     k != end;</div><div class='del'>-	     p = k, k = bkey_p_next(k)) {</div><div class='del'>-		struct bkey l = bkey_unpack_key(b, p);</div><div class='del'>-		struct bkey r = bkey_unpack_key(b, k);</div><div class='del'>-</div><div class='del'>-		BUG_ON(bpos_ge(l.p, bkey_start_pos(&amp;r)));</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_needs_whiteout(struct bset *i, int v)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-</div><div class='del'>-	for (k = i-&gt;start; k != vstruct_last(i); k = bkey_p_next(k))</div><div class='del'>-		k-&gt;needs_whiteout = v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_bounce_free(struct bch_fs *c, size_t size,</div><div class='del'>-			      bool used_mempool, void *p)</div><div class='del'>-{</div><div class='del'>-	if (used_mempool)</div><div class='del'>-		mempool_free(p, &amp;c-&gt;btree_bounce_pool);</div><div class='del'>-	else</div><div class='del'>-		vpfree(p, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *btree_bounce_alloc(struct bch_fs *c, size_t size,</div><div class='del'>-				bool *used_mempool)</div><div class='del'>-{</div><div class='del'>-	unsigned flags = memalloc_nofs_save();</div><div class='del'>-	void *p;</div><div class='del'>-</div><div class='del'>-	BUG_ON(size &gt; c-&gt;opts.btree_node_size);</div><div class='del'>-</div><div class='del'>-	*used_mempool = false;</div><div class='del'>-	p = vpmalloc(size, __GFP_NOWARN|GFP_NOWAIT);</div><div class='del'>-	if (!p) {</div><div class='del'>-		*used_mempool = true;</div><div class='del'>-		p = mempool_alloc(&amp;c-&gt;btree_bounce_pool, GFP_NOFS);</div><div class='del'>-	}</div><div class='del'>-	memalloc_nofs_restore(flags);</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sort_bkey_ptrs(const struct btree *bt,</div><div class='del'>-			   struct bkey_packed **ptrs, unsigned nr)</div><div class='del'>-{</div><div class='del'>-	unsigned n = nr, a = nr / 2, b, c, d;</div><div class='del'>-</div><div class='del'>-	if (!a)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Heap sort: see lib/sort.c: */</div><div class='del'>-	while (1) {</div><div class='del'>-		if (a)</div><div class='del'>-			a--;</div><div class='del'>-		else if (--n)</div><div class='del'>-			swap(ptrs[0], ptrs[n]);</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (b = a; c = 2 * b + 1, (d = c + 1) &lt; n;)</div><div class='del'>-			b = bch2_bkey_cmp_packed(bt,</div><div class='del'>-					    ptrs[c],</div><div class='del'>-					    ptrs[d]) &gt;= 0 ? c : d;</div><div class='del'>-		if (d == n)</div><div class='del'>-			b = c;</div><div class='del'>-</div><div class='del'>-		while (b != a &amp;&amp;</div><div class='del'>-		       bch2_bkey_cmp_packed(bt,</div><div class='del'>-				       ptrs[a],</div><div class='del'>-				       ptrs[b]) &gt;= 0)</div><div class='del'>-			b = (b - 1) / 2;</div><div class='del'>-		c = b;</div><div class='del'>-		while (b != a) {</div><div class='del'>-			b = (b - 1) / 2;</div><div class='del'>-			swap(ptrs[b], ptrs[c]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sort_whiteouts(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *new_whiteouts, **ptrs, **ptrs_end, *k;</div><div class='del'>-	bool used_mempool = false;</div><div class='del'>-	size_t bytes = b-&gt;whiteout_u64s * sizeof(u64);</div><div class='del'>-</div><div class='del'>-	if (!b-&gt;whiteout_u64s)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	new_whiteouts = btree_bounce_alloc(c, bytes, &amp;used_mempool);</div><div class='del'>-</div><div class='del'>-	ptrs = ptrs_end = ((void *) new_whiteouts + bytes);</div><div class='del'>-</div><div class='del'>-	for (k = unwritten_whiteouts_start(b);</div><div class='del'>-	     k != unwritten_whiteouts_end(b);</div><div class='del'>-	     k = bkey_p_next(k))</div><div class='del'>-		*--ptrs = k;</div><div class='del'>-</div><div class='del'>-	sort_bkey_ptrs(b, ptrs, ptrs_end - ptrs);</div><div class='del'>-</div><div class='del'>-	k = new_whiteouts;</div><div class='del'>-</div><div class='del'>-	while (ptrs != ptrs_end) {</div><div class='del'>-		bkey_p_copy(k, *ptrs);</div><div class='del'>-		k = bkey_p_next(k);</div><div class='del'>-		ptrs++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	verify_no_dups(b, new_whiteouts,</div><div class='del'>-		       (void *) ((u64 *) new_whiteouts + b-&gt;whiteout_u64s));</div><div class='del'>-</div><div class='del'>-	memcpy_u64s(unwritten_whiteouts_start(b),</div><div class='del'>-		    new_whiteouts, b-&gt;whiteout_u64s);</div><div class='del'>-</div><div class='del'>-	btree_bounce_free(c, bytes, used_mempool, new_whiteouts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool should_compact_bset(struct btree *b, struct bset_tree *t,</div><div class='del'>-				bool compacting, enum compact_mode mode)</div><div class='del'>-{</div><div class='del'>-	if (!bset_dead_u64s(b, t))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case COMPACT_LAZY:</div><div class='del'>-		return should_compact_bset_lazy(b, t) ||</div><div class='del'>-			(compacting &amp;&amp; !bset_written(b, bset(b, t)));</div><div class='del'>-	case COMPACT_ALL:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_drop_whiteouts(struct btree *b, enum compact_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		struct bset *i = bset(b, t);</div><div class='del'>-		struct bkey_packed *k, *n, *out, *start, *end;</div><div class='del'>-		struct btree_node_entry *src = NULL, *dst = NULL;</div><div class='del'>-</div><div class='del'>-		if (t != b-&gt;set &amp;&amp; !bset_written(b, i)) {</div><div class='del'>-			src = container_of(i, struct btree_node_entry, keys);</div><div class='del'>-			dst = max(write_block(b),</div><div class='del'>-				  (void *) btree_bkey_last(b, t - 1));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (src != dst)</div><div class='del'>-			ret = true;</div><div class='del'>-</div><div class='del'>-		if (!should_compact_bset(b, t, ret, mode)) {</div><div class='del'>-			if (src != dst) {</div><div class='del'>-				memmove(dst, src, sizeof(*src) +</div><div class='del'>-					le16_to_cpu(src-&gt;keys.u64s) *</div><div class='del'>-					sizeof(u64));</div><div class='del'>-				i = &amp;dst-&gt;keys;</div><div class='del'>-				set_btree_bset(b, t, i);</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		start	= btree_bkey_first(b, t);</div><div class='del'>-		end	= btree_bkey_last(b, t);</div><div class='del'>-</div><div class='del'>-		if (src != dst) {</div><div class='del'>-			memmove(dst, src, sizeof(*src));</div><div class='del'>-			i = &amp;dst-&gt;keys;</div><div class='del'>-			set_btree_bset(b, t, i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		out = i-&gt;start;</div><div class='del'>-</div><div class='del'>-		for (k = start; k != end; k = n) {</div><div class='del'>-			n = bkey_p_next(k);</div><div class='del'>-</div><div class='del'>-			if (!bkey_deleted(k)) {</div><div class='del'>-				bkey_p_copy(out, k);</div><div class='del'>-				out = bkey_p_next(out);</div><div class='del'>-			} else {</div><div class='del'>-				BUG_ON(k-&gt;needs_whiteout);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i-&gt;u64s = cpu_to_le16((u64 *) out - i-&gt;_data);</div><div class='del'>-		set_btree_bset_end(b, t);</div><div class='del'>-		bch2_bset_set_no_aux_tree(b, t);</div><div class='del'>-		ret = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_verify_btree_nr_keys(b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_compact_whiteouts(struct bch_fs *c, struct btree *b,</div><div class='del'>-			    enum compact_mode mode)</div><div class='del'>-{</div><div class='del'>-	return bch2_drop_whiteouts(b, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_sort(struct bch_fs *c, struct btree *b,</div><div class='del'>-			    unsigned start_idx,</div><div class='del'>-			    unsigned end_idx,</div><div class='del'>-			    bool filter_whiteouts)</div><div class='del'>-{</div><div class='del'>-	struct btree_node *out;</div><div class='del'>-	struct sort_iter_stack sort_iter;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	struct bset *start_bset = bset(b, &amp;b-&gt;set[start_idx]);</div><div class='del'>-	bool used_mempool = false;</div><div class='del'>-	u64 start_time, seq = 0;</div><div class='del'>-	unsigned i, u64s = 0, bytes, shift = end_idx - start_idx - 1;</div><div class='del'>-	bool sorting_entire_node = start_idx == 0 &amp;&amp;</div><div class='del'>-		end_idx == b-&gt;nsets;</div><div class='del'>-</div><div class='del'>-	sort_iter_stack_init(&amp;sort_iter, b);</div><div class='del'>-</div><div class='del'>-	for (t = b-&gt;set + start_idx;</div><div class='del'>-	     t &lt; b-&gt;set + end_idx;</div><div class='del'>-	     t++) {</div><div class='del'>-		u64s += le16_to_cpu(bset(b, t)-&gt;u64s);</div><div class='del'>-		sort_iter_add(&amp;sort_iter.iter,</div><div class='del'>-			      btree_bkey_first(b, t),</div><div class='del'>-			      btree_bkey_last(b, t));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bytes = sorting_entire_node</div><div class='del'>-		? btree_buf_bytes(b)</div><div class='del'>-		: __vstruct_bytes(struct btree_node, u64s);</div><div class='del'>-</div><div class='del'>-	out = btree_bounce_alloc(c, bytes, &amp;used_mempool);</div><div class='del'>-</div><div class='del'>-	start_time = local_clock();</div><div class='del'>-</div><div class='del'>-	u64s = bch2_sort_keys(out-&gt;keys.start, &amp;sort_iter.iter, filter_whiteouts);</div><div class='del'>-</div><div class='del'>-	out-&gt;keys.u64s = cpu_to_le16(u64s);</div><div class='del'>-</div><div class='del'>-	BUG_ON(vstruct_end(&amp;out-&gt;keys) &gt; (void *) out + bytes);</div><div class='del'>-</div><div class='del'>-	if (sorting_entire_node)</div><div class='del'>-		bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_node_sort],</div><div class='del'>-				       start_time);</div><div class='del'>-</div><div class='del'>-	/* Make sure we preserve bset journal_seq: */</div><div class='del'>-	for (t = b-&gt;set + start_idx; t &lt; b-&gt;set + end_idx; t++)</div><div class='del'>-		seq = max(seq, le64_to_cpu(bset(b, t)-&gt;journal_seq));</div><div class='del'>-	start_bset-&gt;journal_seq = cpu_to_le64(seq);</div><div class='del'>-</div><div class='del'>-	if (sorting_entire_node) {</div><div class='del'>-		u64s = le16_to_cpu(out-&gt;keys.u64s);</div><div class='del'>-</div><div class='del'>-		BUG_ON(bytes != btree_buf_bytes(b));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Our temporary buffer is the same size as the btree node's</div><div class='del'>-		 * buffer, we can just swap buffers instead of doing a big</div><div class='del'>-		 * memcpy()</div><div class='del'>-		 */</div><div class='del'>-		*out = *b-&gt;data;</div><div class='del'>-		out-&gt;keys.u64s = cpu_to_le16(u64s);</div><div class='del'>-		swap(out, b-&gt;data);</div><div class='del'>-		set_btree_bset(b, b-&gt;set, &amp;b-&gt;data-&gt;keys);</div><div class='del'>-	} else {</div><div class='del'>-		start_bset-&gt;u64s = out-&gt;keys.u64s;</div><div class='del'>-		memcpy_u64s(start_bset-&gt;start,</div><div class='del'>-			    out-&gt;keys.start,</div><div class='del'>-			    le16_to_cpu(out-&gt;keys.u64s));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = start_idx + 1; i &lt; end_idx; i++)</div><div class='del'>-		b-&gt;nr.bset_u64s[start_idx] +=</div><div class='del'>-			b-&gt;nr.bset_u64s[i];</div><div class='del'>-</div><div class='del'>-	b-&gt;nsets -= shift;</div><div class='del'>-</div><div class='del'>-	for (i = start_idx + 1; i &lt; b-&gt;nsets; i++) {</div><div class='del'>-		b-&gt;nr.bset_u64s[i]	= b-&gt;nr.bset_u64s[i + shift];</div><div class='del'>-		b-&gt;set[i]		= b-&gt;set[i + shift];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = b-&gt;nsets; i &lt; MAX_BSETS; i++)</div><div class='del'>-		b-&gt;nr.bset_u64s[i] = 0;</div><div class='del'>-</div><div class='del'>-	set_btree_bset_end(b, &amp;b-&gt;set[start_idx]);</div><div class='del'>-	bch2_bset_set_no_aux_tree(b, &amp;b-&gt;set[start_idx]);</div><div class='del'>-</div><div class='del'>-	btree_bounce_free(c, bytes, used_mempool, out);</div><div class='del'>-</div><div class='del'>-	bch2_verify_btree_nr_keys(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_sort_into(struct bch_fs *c,</div><div class='del'>-			 struct btree *dst,</div><div class='del'>-			 struct btree *src)</div><div class='del'>-{</div><div class='del'>-	struct btree_nr_keys nr;</div><div class='del'>-	struct btree_node_iter src_iter;</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-</div><div class='del'>-	BUG_ON(dst-&gt;nsets != 1);</div><div class='del'>-</div><div class='del'>-	bch2_bset_set_no_aux_tree(dst, dst-&gt;set);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_init_from_start(&amp;src_iter, src);</div><div class='del'>-</div><div class='del'>-	nr = bch2_sort_repack(btree_bset_first(dst),</div><div class='del'>-			src, &amp;src_iter,</div><div class='del'>-			&amp;dst-&gt;format,</div><div class='del'>-			true);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_node_sort],</div><div class='del'>-			       start_time);</div><div class='del'>-</div><div class='del'>-	set_btree_bset_end(dst, dst-&gt;set);</div><div class='del'>-</div><div class='del'>-	dst-&gt;nr.live_u64s	+= nr.live_u64s;</div><div class='del'>-	dst-&gt;nr.bset_u64s[0]	+= nr.bset_u64s[0];</div><div class='del'>-	dst-&gt;nr.packed_keys	+= nr.packed_keys;</div><div class='del'>-	dst-&gt;nr.unpacked_keys	+= nr.unpacked_keys;</div><div class='del'>-</div><div class='del'>-	bch2_verify_btree_nr_keys(dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We're about to add another bset to the btree node, so if there's currently</div><div class='del'>- * too many bsets - sort some of them together:</div><div class='del'>- */</div><div class='del'>-static bool btree_node_compact(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	unsigned unwritten_idx;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	for (unwritten_idx = 0;</div><div class='del'>-	     unwritten_idx &lt; b-&gt;nsets;</div><div class='del'>-	     unwritten_idx++)</div><div class='del'>-		if (!bset_written(b, bset(b, &amp;b-&gt;set[unwritten_idx])))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (b-&gt;nsets - unwritten_idx &gt; 1) {</div><div class='del'>-		btree_node_sort(c, b, unwritten_idx,</div><div class='del'>-				b-&gt;nsets, false);</div><div class='del'>-		ret = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unwritten_idx &gt; 1) {</div><div class='del'>-		btree_node_sort(c, b, 0, unwritten_idx, false);</div><div class='del'>-		ret = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_build_aux_trees(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		bch2_bset_build_aux_tree(b, t,</div><div class='del'>-				!bset_written(b, bset(b, t)) &amp;&amp;</div><div class='del'>-				t == bset_tree_last(b));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If we have MAX_BSETS (3) bsets, should we sort them all down to just one?</div><div class='del'>- *</div><div class='del'>- * The first bset is going to be of similar order to the size of the node, the</div><div class='del'>- * last bset is bounded by btree_write_set_buffer(), which is set to keep the</div><div class='del'>- * memmove on insert from being too expensive: the middle bset should, ideally,</div><div class='del'>- * be the geometric mean of the first and the last.</div><div class='del'>- *</div><div class='del'>- * Returns true if the middle bset is greater than that geometric mean:</div><div class='del'>- */</div><div class='del'>-static inline bool should_compact_all(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	unsigned mid_u64s_bits =</div><div class='del'>-		(ilog2(btree_max_u64s(c)) + BTREE_WRITE_SET_U64s_BITS) / 2;</div><div class='del'>-</div><div class='del'>-	return bset_u64s(&amp;b-&gt;set[1]) &gt; 1U &lt;&lt; mid_u64s_bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @bch_btree_init_next - initialize a new (unwritten) bset that can then be</div><div class='del'>- * inserted into</div><div class='del'>- *</div><div class='del'>- * Safe to call if there already is an unwritten bset - will only add a new bset</div><div class='del'>- * if @b doesn't already have one.</div><div class='del'>- *</div><div class='del'>- * Returns true if we sorted (i.e. invalidated iterators</div><div class='del'>- */</div><div class='del'>-void bch2_btree_init_next(struct btree_trans *trans, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_node_entry *bne;</div><div class='del'>-	bool reinit_iter = false;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!six_lock_counts(&amp;b-&gt;c.lock).n[SIX_LOCK_write]);</div><div class='del'>-	BUG_ON(bset_written(b, bset(b, &amp;b-&gt;set[1])));</div><div class='del'>-	BUG_ON(btree_node_just_written(b));</div><div class='del'>-</div><div class='del'>-	if (b-&gt;nsets == MAX_BSETS &amp;&amp;</div><div class='del'>-	    !btree_node_write_in_flight(b) &amp;&amp;</div><div class='del'>-	    should_compact_all(c, b)) {</div><div class='del'>-		bch2_btree_node_write(c, b, SIX_LOCK_write,</div><div class='del'>-				      BTREE_WRITE_init_next_bset);</div><div class='del'>-		reinit_iter = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b-&gt;nsets == MAX_BSETS &amp;&amp;</div><div class='del'>-	    btree_node_compact(c, b))</div><div class='del'>-		reinit_iter = true;</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;nsets &gt;= MAX_BSETS);</div><div class='del'>-</div><div class='del'>-	bne = want_new_bset(c, b);</div><div class='del'>-	if (bne)</div><div class='del'>-		bch2_bset_init_next(b, bne);</div><div class='del'>-</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	if (reinit_iter)</div><div class='del'>-		bch2_trans_node_reinit_iter(trans, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_err_msg(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			  struct bch_dev *ca,</div><div class='del'>-			  struct btree *b, struct bset *i,</div><div class='del'>-			  unsigned offset, int write)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, bch2_log_msg(c, "%s"),</div><div class='del'>-		   write == READ</div><div class='del'>-		   ? "error validating btree node "</div><div class='del'>-		   : "corrupt btree node before write ");</div><div class='del'>-	if (ca)</div><div class='del'>-		prt_printf(out, "on %s ", ca-&gt;name);</div><div class='del'>-	prt_printf(out, "at btree ");</div><div class='del'>-	bch2_btree_pos_to_text(out, c, b);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "\n  node offset %u/%u",</div><div class='del'>-		   b-&gt;written, btree_ptr_sectors_written(&amp;b-&gt;key));</div><div class='del'>-	if (i)</div><div class='del'>-		prt_printf(out, " bset u64s %u", le16_to_cpu(i-&gt;u64s));</div><div class='del'>-	prt_str(out, ": ");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__printf(9, 10)</div><div class='del'>-static int __btree_err(int ret,</div><div class='del'>-		       struct bch_fs *c,</div><div class='del'>-		       struct bch_dev *ca,</div><div class='del'>-		       struct btree *b,</div><div class='del'>-		       struct bset *i,</div><div class='del'>-		       int write,</div><div class='del'>-		       bool have_retry,</div><div class='del'>-		       enum bch_sb_error_id err_type,</div><div class='del'>-		       const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct printbuf out = PRINTBUF;</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	btree_err_msg(&amp;out, c, ca, b, i, b-&gt;written, write);</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	prt_vprintf(&amp;out, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	if (write == WRITE) {</div><div class='del'>-		bch2_print_string_as_lines(KERN_ERR, out.buf);</div><div class='del'>-		ret = c-&gt;opts.errors == BCH_ON_ERROR_continue</div><div class='del'>-			? 0</div><div class='del'>-			: -BCH_ERR_fsck_errors_not_fixed;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!have_retry &amp;&amp; ret == -BCH_ERR_btree_node_read_err_want_retry)</div><div class='del'>-		ret = -BCH_ERR_btree_node_read_err_fixable;</div><div class='del'>-	if (!have_retry &amp;&amp; ret == -BCH_ERR_btree_node_read_err_must_retry)</div><div class='del'>-		ret = -BCH_ERR_btree_node_read_err_bad_node;</div><div class='del'>-</div><div class='del'>-	if (ret != -BCH_ERR_btree_node_read_err_fixable)</div><div class='del'>-		bch2_sb_error_count(c, err_type);</div><div class='del'>-</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case -BCH_ERR_btree_node_read_err_fixable:</div><div class='del'>-		ret = bch2_fsck_err(c, FSCK_CAN_FIX, err_type, "%s", out.buf);</div><div class='del'>-		if (ret != -BCH_ERR_fsck_fix &amp;&amp;</div><div class='del'>-		    ret != -BCH_ERR_fsck_ignore)</div><div class='del'>-			goto fsck_err;</div><div class='del'>-		ret = -BCH_ERR_fsck_fix;</div><div class='del'>-		break;</div><div class='del'>-	case -BCH_ERR_btree_node_read_err_want_retry:</div><div class='del'>-	case -BCH_ERR_btree_node_read_err_must_retry:</div><div class='del'>-		bch2_print_string_as_lines(KERN_ERR, out.buf);</div><div class='del'>-		break;</div><div class='del'>-	case -BCH_ERR_btree_node_read_err_bad_node:</div><div class='del'>-		bch2_print_string_as_lines(KERN_ERR, out.buf);</div><div class='del'>-		bch2_topology_error(c);</div><div class='del'>-		ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_check_topology) ?: -EIO;</div><div class='del'>-		break;</div><div class='del'>-	case -BCH_ERR_btree_node_read_err_incompatible:</div><div class='del'>-		bch2_print_string_as_lines(KERN_ERR, out.buf);</div><div class='del'>-		ret = -BCH_ERR_fsck_errors_not_fixed;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;out);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define btree_err(type, c, ca, b, i, _err_type, msg, ...)		\</div><div class='del'>-({									\</div><div class='del'>-	int _ret = __btree_err(type, c, ca, b, i, write, have_retry,	\</div><div class='del'>-			       BCH_FSCK_ERR_##_err_type,		\</div><div class='del'>-			       msg, ##__VA_ARGS__);			\</div><div class='del'>-									\</div><div class='del'>-	if (_ret != -BCH_ERR_fsck_fix) {				\</div><div class='del'>-		ret = _ret;						\</div><div class='del'>-		goto fsck_err;						\</div><div class='del'>-	}								\</div><div class='del'>-									\</div><div class='del'>-	*saw_error = true;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define btree_err_on(cond, ...)	((cond) ? btree_err(__VA_ARGS__) : false)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When btree topology repair changes the start or end of a node, that might</div><div class='del'>- * mean we have to drop keys that are no longer inside the node:</div><div class='del'>- */</div><div class='del'>-__cold</div><div class='del'>-void bch2_btree_node_drop_keys_outside_node(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		struct bset *i = bset(b, t);</div><div class='del'>-		struct bkey_packed *k;</div><div class='del'>-</div><div class='del'>-		for (k = i-&gt;start; k != vstruct_last(i); k = bkey_p_next(k))</div><div class='del'>-			if (bkey_cmp_left_packed(b, k, &amp;b-&gt;data-&gt;min_key) &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (k != i-&gt;start) {</div><div class='del'>-			unsigned shift = (u64 *) k - (u64 *) i-&gt;start;</div><div class='del'>-</div><div class='del'>-			memmove_u64s_down(i-&gt;start, k,</div><div class='del'>-					  (u64 *) vstruct_end(i) - (u64 *) k);</div><div class='del'>-			i-&gt;u64s = cpu_to_le16(le16_to_cpu(i-&gt;u64s) - shift);</div><div class='del'>-			set_btree_bset_end(b, t);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (k = i-&gt;start; k != vstruct_last(i); k = bkey_p_next(k))</div><div class='del'>-			if (bkey_cmp_left_packed(b, k, &amp;b-&gt;data-&gt;max_key) &gt; 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (k != vstruct_last(i)) {</div><div class='del'>-			i-&gt;u64s = cpu_to_le16((u64 *) k - (u64 *) i-&gt;start);</div><div class='del'>-			set_btree_bset_end(b, t);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Always rebuild search trees: eytzinger search tree nodes directly</div><div class='del'>-	 * depend on the values of min/max key:</div><div class='del'>-	 */</div><div class='del'>-	bch2_bset_set_no_aux_tree(b, b-&gt;set);</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey unpacked;</div><div class='del'>-	struct btree_node_iter iter;</div><div class='del'>-	for_each_btree_node_key_unpack(b, k, &amp;iter, &amp;unpacked) {</div><div class='del'>-		BUG_ON(bpos_lt(k.k-&gt;p, b-&gt;data-&gt;min_key));</div><div class='del'>-		BUG_ON(bpos_gt(k.k-&gt;p, b-&gt;data-&gt;max_key));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_bset(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			 struct btree *b, struct bset *i,</div><div class='del'>-			 unsigned offset, unsigned sectors,</div><div class='del'>-			 int write, bool have_retry, bool *saw_error)</div><div class='del'>-{</div><div class='del'>-	unsigned version = le16_to_cpu(i-&gt;version);</div><div class='del'>-	struct printbuf buf1 = PRINTBUF;</div><div class='del'>-	struct printbuf buf2 = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	btree_err_on(!bch2_version_compatible(version),</div><div class='del'>-		     -BCH_ERR_btree_node_read_err_incompatible,</div><div class='del'>-		     c, ca, b, i,</div><div class='del'>-		     btree_node_unsupported_version,</div><div class='del'>-		     "unsupported bset version %u.%u",</div><div class='del'>-		     BCH_VERSION_MAJOR(version),</div><div class='del'>-		     BCH_VERSION_MINOR(version));</div><div class='del'>-</div><div class='del'>-	if (btree_err_on(version &lt; c-&gt;sb.version_min,</div><div class='del'>-			 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-			 c, NULL, b, i,</div><div class='del'>-			 btree_node_bset_older_than_sb_min,</div><div class='del'>-			 "bset version %u older than superblock version_min %u",</div><div class='del'>-			 version, c-&gt;sb.version_min)) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;version_min = cpu_to_le16(version);</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btree_err_on(BCH_VERSION_MAJOR(version) &gt;</div><div class='del'>-			 BCH_VERSION_MAJOR(c-&gt;sb.version),</div><div class='del'>-			 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-			 c, NULL, b, i,</div><div class='del'>-			 btree_node_bset_newer_than_sb,</div><div class='del'>-			 "bset version %u newer than superblock version %u",</div><div class='del'>-			 version, c-&gt;sb.version)) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;version = cpu_to_le16(version);</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btree_err_on(BSET_SEPARATE_WHITEOUTS(i),</div><div class='del'>-		     -BCH_ERR_btree_node_read_err_incompatible,</div><div class='del'>-		     c, ca, b, i,</div><div class='del'>-		     btree_node_unsupported_version,</div><div class='del'>-		     "BSET_SEPARATE_WHITEOUTS no longer supported");</div><div class='del'>-</div><div class='del'>-	if (btree_err_on(offset + sectors &gt; btree_sectors(c),</div><div class='del'>-			 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-			 c, ca, b, i,</div><div class='del'>-			 bset_past_end_of_btree_node,</div><div class='del'>-			 "bset past end of btree node")) {</div><div class='del'>-		i-&gt;u64s = 0;</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btree_err_on(offset &amp;&amp; !i-&gt;u64s,</div><div class='del'>-		     -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-		     c, ca, b, i,</div><div class='del'>-		     bset_empty,</div><div class='del'>-		     "empty bset");</div><div class='del'>-</div><div class='del'>-	btree_err_on(BSET_OFFSET(i) &amp;&amp; BSET_OFFSET(i) != offset,</div><div class='del'>-		     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-		     c, ca, b, i,</div><div class='del'>-		     bset_wrong_sector_offset,</div><div class='del'>-		     "bset at wrong sector offset");</div><div class='del'>-</div><div class='del'>-	if (!offset) {</div><div class='del'>-		struct btree_node *bn =</div><div class='del'>-			container_of(i, struct btree_node, keys);</div><div class='del'>-		/* These indicate that we read the wrong btree node: */</div><div class='del'>-</div><div class='del'>-		if (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-			struct bch_btree_ptr_v2 *bp =</div><div class='del'>-				&amp;bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v;</div><div class='del'>-</div><div class='del'>-			/* XXX endianness */</div><div class='del'>-			btree_err_on(bp-&gt;seq != bn-&gt;keys.seq,</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-				     c, ca, b, NULL,</div><div class='del'>-				     bset_bad_seq,</div><div class='del'>-				     "incorrect sequence number (wrong btree node)");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btree_err_on(BTREE_NODE_ID(bn) != b-&gt;c.btree_id,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-			     c, ca, b, i,</div><div class='del'>-			     btree_node_bad_btree,</div><div class='del'>-			     "incorrect btree id");</div><div class='del'>-</div><div class='del'>-		btree_err_on(BTREE_NODE_LEVEL(bn) != b-&gt;c.level,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-			     c, ca, b, i,</div><div class='del'>-			     btree_node_bad_level,</div><div class='del'>-			     "incorrect level");</div><div class='del'>-</div><div class='del'>-		if (!write)</div><div class='del'>-			compat_btree_node(b-&gt;c.level, b-&gt;c.btree_id, version,</div><div class='del'>-					  BSET_BIG_ENDIAN(i), write, bn);</div><div class='del'>-</div><div class='del'>-		if (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-			struct bch_btree_ptr_v2 *bp =</div><div class='del'>-				&amp;bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v;</div><div class='del'>-</div><div class='del'>-			if (BTREE_PTR_RANGE_UPDATED(bp)) {</div><div class='del'>-				b-&gt;data-&gt;min_key = bp-&gt;min_key;</div><div class='del'>-				b-&gt;data-&gt;max_key = b-&gt;key.k.p;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			btree_err_on(!bpos_eq(b-&gt;data-&gt;min_key, bp-&gt;min_key),</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-				     c, ca, b, NULL,</div><div class='del'>-				     btree_node_bad_min_key,</div><div class='del'>-				     "incorrect min_key: got %s should be %s",</div><div class='del'>-				     (printbuf_reset(&amp;buf1),</div><div class='del'>-				      bch2_bpos_to_text(&amp;buf1, bn-&gt;min_key), buf1.buf),</div><div class='del'>-				     (printbuf_reset(&amp;buf2),</div><div class='del'>-				      bch2_bpos_to_text(&amp;buf2, bp-&gt;min_key), buf2.buf));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btree_err_on(!bpos_eq(bn-&gt;max_key, b-&gt;key.k.p),</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-			     c, ca, b, i,</div><div class='del'>-			     btree_node_bad_max_key,</div><div class='del'>-			     "incorrect max key %s",</div><div class='del'>-			     (printbuf_reset(&amp;buf1),</div><div class='del'>-			      bch2_bpos_to_text(&amp;buf1, bn-&gt;max_key), buf1.buf));</div><div class='del'>-</div><div class='del'>-		if (write)</div><div class='del'>-			compat_btree_node(b-&gt;c.level, b-&gt;c.btree_id, version,</div><div class='del'>-					  BSET_BIG_ENDIAN(i), write, bn);</div><div class='del'>-</div><div class='del'>-		btree_err_on(bch2_bkey_format_invalid(c, &amp;bn-&gt;format, write, &amp;buf1),</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_bad_node,</div><div class='del'>-			     c, ca, b, i,</div><div class='del'>-			     btree_node_bad_format,</div><div class='del'>-			     "invalid bkey format: %s\n  %s", buf1.buf,</div><div class='del'>-			     (printbuf_reset(&amp;buf2),</div><div class='del'>-			      bch2_bkey_format_to_text(&amp;buf2, &amp;bn-&gt;format), buf2.buf));</div><div class='del'>-		printbuf_reset(&amp;buf1);</div><div class='del'>-</div><div class='del'>-		compat_bformat(b-&gt;c.level, b-&gt;c.btree_id, version,</div><div class='del'>-			       BSET_BIG_ENDIAN(i), write,</div><div class='del'>-			       &amp;bn-&gt;format);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf2);</div><div class='del'>-	printbuf_exit(&amp;buf1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bset_key_invalid(struct bch_fs *c, struct btree *b,</div><div class='del'>-			    struct bkey_s_c k,</div><div class='del'>-			    bool updated_range, int rw,</div><div class='del'>-			    struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_invalid(c, k, btree_node_type(b), READ, err) ?:</div><div class='del'>-		(!updated_range ? bch2_bkey_in_btree_node(c, b, k, err) : 0) ?:</div><div class='del'>-		(rw == WRITE ? bch2_bkey_val_invalid(c, k, READ, err) : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool __bkey_valid(struct bch_fs *c, struct btree *b,</div><div class='del'>-			 struct bset *i, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	if (bkey_p_next(k) &gt; vstruct_last(i))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (k-&gt;format &gt; KEY_FORMAT_CURRENT)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bkey tmp;</div><div class='del'>-	struct bkey_s u = __bkey_disassemble(b, k, &amp;tmp);</div><div class='del'>-	bool ret = __bch2_bkey_invalid(c, u.s_c, btree_node_type(b), READ, &amp;buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_bset_keys(struct bch_fs *c, struct btree *b,</div><div class='del'>-			 struct bset *i, int write,</div><div class='del'>-			 bool have_retry, bool *saw_error)</div><div class='del'>-{</div><div class='del'>-	unsigned version = le16_to_cpu(i-&gt;version);</div><div class='del'>-	struct bkey_packed *k, *prev = NULL;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool updated_range = b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2 &amp;&amp;</div><div class='del'>-		BTREE_PTR_RANGE_UPDATED(&amp;bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (k = i-&gt;start;</div><div class='del'>-	     k != vstruct_last(i);) {</div><div class='del'>-		struct bkey_s u;</div><div class='del'>-		struct bkey tmp;</div><div class='del'>-		unsigned next_good_key;</div><div class='del'>-</div><div class='del'>-		if (btree_err_on(bkey_p_next(k) &gt; vstruct_last(i),</div><div class='del'>-				 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				 c, NULL, b, i,</div><div class='del'>-				 btree_node_bkey_past_bset_end,</div><div class='del'>-				 "key extends past end of bset")) {</div><div class='del'>-			i-&gt;u64s = cpu_to_le16((u64 *) k - i-&gt;_data);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (btree_err_on(k-&gt;format &gt; KEY_FORMAT_CURRENT,</div><div class='del'>-				 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				 c, NULL, b, i,</div><div class='del'>-				 btree_node_bkey_bad_format,</div><div class='del'>-				 "invalid bkey format %u", k-&gt;format))</div><div class='del'>-			goto drop_this_key;</div><div class='del'>-</div><div class='del'>-		/* XXX: validate k-&gt;u64s */</div><div class='del'>-		if (!write)</div><div class='del'>-			bch2_bkey_compat(b-&gt;c.level, b-&gt;c.btree_id, version,</div><div class='del'>-				    BSET_BIG_ENDIAN(i), write,</div><div class='del'>-				    &amp;b-&gt;format, k);</div><div class='del'>-</div><div class='del'>-		u = __bkey_disassemble(b, k, &amp;tmp);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		if (bset_key_invalid(c, b, u.s_c, updated_range, write, &amp;buf)) {</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-			bset_key_invalid(c, b, u.s_c, updated_range, write, &amp;buf);</div><div class='del'>-			prt_printf(&amp;buf, "\n  ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, u.s_c);</div><div class='del'>-</div><div class='del'>-			btree_err(-BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				  c, NULL, b, i,</div><div class='del'>-				  btree_node_bad_bkey,</div><div class='del'>-				  "invalid bkey: %s", buf.buf);</div><div class='del'>-			goto drop_this_key;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (write)</div><div class='del'>-			bch2_bkey_compat(b-&gt;c.level, b-&gt;c.btree_id, version,</div><div class='del'>-				    BSET_BIG_ENDIAN(i), write,</div><div class='del'>-				    &amp;b-&gt;format, k);</div><div class='del'>-</div><div class='del'>-		if (prev &amp;&amp; bkey_iter_cmp(b, prev, k) &gt; 0) {</div><div class='del'>-			struct bkey up = bkey_unpack_key(b, prev);</div><div class='del'>-</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-			prt_printf(&amp;buf, "keys out of order: ");</div><div class='del'>-			bch2_bkey_to_text(&amp;buf, &amp;up);</div><div class='del'>-			prt_printf(&amp;buf, " &gt; ");</div><div class='del'>-			bch2_bkey_to_text(&amp;buf, u.k);</div><div class='del'>-</div><div class='del'>-			if (btree_err(-BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				      c, NULL, b, i,</div><div class='del'>-				      btree_node_bkey_out_of_order,</div><div class='del'>-				      "%s", buf.buf))</div><div class='del'>-				goto drop_this_key;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev = k;</div><div class='del'>-		k = bkey_p_next(k);</div><div class='del'>-		continue;</div><div class='del'>-drop_this_key:</div><div class='del'>-		next_good_key = k-&gt;u64s;</div><div class='del'>-</div><div class='del'>-		if (!next_good_key ||</div><div class='del'>-		    (BSET_BIG_ENDIAN(i) == CPU_BIG_ENDIAN &amp;&amp;</div><div class='del'>-		     version &gt;= bcachefs_metadata_version_snapshot)) {</div><div class='del'>-			/*</div><div class='del'>-			 * only do scanning if bch2_bkey_compat() has nothing to</div><div class='del'>-			 * do</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (!__bkey_valid(c, b, i, (void *) ((u64 *) k + next_good_key))) {</div><div class='del'>-				for (next_good_key = 1;</div><div class='del'>-				     next_good_key &lt; (u64 *) vstruct_last(i) - (u64 *) k;</div><div class='del'>-				     next_good_key++)</div><div class='del'>-					if (__bkey_valid(c, b, i, (void *) ((u64 *) k + next_good_key)))</div><div class='del'>-						goto got_good_key;</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * didn't find a good key, have to truncate the rest of</div><div class='del'>-			 * the bset</div><div class='del'>-			 */</div><div class='del'>-			next_good_key = (u64 *) vstruct_last(i) - (u64 *) k;</div><div class='del'>-		}</div><div class='del'>-got_good_key:</div><div class='del'>-		le16_add_cpu(&amp;i-&gt;u64s, -next_good_key);</div><div class='del'>-		memmove_u64s_down(k, bkey_p_next(k), (u64 *) vstruct_end(i) - (u64 *) k);</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			      struct btree *b, bool have_retry, bool *saw_error)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_entry *bne;</div><div class='del'>-	struct sort_iter *iter;</div><div class='del'>-	struct btree_node *sorted;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct bset *i;</div><div class='del'>-	bool used_mempool, blacklisted;</div><div class='del'>-	bool updated_range = b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2 &amp;&amp;</div><div class='del'>-		BTREE_PTR_RANGE_UPDATED(&amp;bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v);</div><div class='del'>-	unsigned u64s;</div><div class='del'>-	unsigned ptr_written = btree_ptr_sectors_written(&amp;b-&gt;key);</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0, retry_read = 0, write = READ;</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-</div><div class='del'>-	b-&gt;version_ondisk = U16_MAX;</div><div class='del'>-	/* We might get called multiple times on read retry: */</div><div class='del'>-	b-&gt;written = 0;</div><div class='del'>-</div><div class='del'>-	iter = mempool_alloc(&amp;c-&gt;fill_iter, GFP_NOFS);</div><div class='del'>-	sort_iter_init(iter, b, (btree_blocks(c) + 1) * 2);</div><div class='del'>-</div><div class='del'>-	if (bch2_meta_read_fault("btree"))</div><div class='del'>-		btree_err(-BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-			  c, ca, b, NULL,</div><div class='del'>-			  btree_node_fault_injected,</div><div class='del'>-			  "dynamic fault");</div><div class='del'>-</div><div class='del'>-	btree_err_on(le64_to_cpu(b-&gt;data-&gt;magic) != bset_magic(c),</div><div class='del'>-		     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-		     c, ca, b, NULL,</div><div class='del'>-		     btree_node_bad_magic,</div><div class='del'>-		     "bad magic: want %llx, got %llx",</div><div class='del'>-		     bset_magic(c), le64_to_cpu(b-&gt;data-&gt;magic));</div><div class='del'>-</div><div class='del'>-	if (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-		struct bch_btree_ptr_v2 *bp =</div><div class='del'>-			&amp;bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v;</div><div class='del'>-</div><div class='del'>-		bch2_bpos_to_text(&amp;buf, b-&gt;data-&gt;min_key);</div><div class='del'>-		prt_str(&amp;buf, "-");</div><div class='del'>-		bch2_bpos_to_text(&amp;buf, b-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-		btree_err_on(b-&gt;data-&gt;keys.seq != bp-&gt;seq,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-			     c, ca, b, NULL,</div><div class='del'>-			     btree_node_bad_seq,</div><div class='del'>-			     "got wrong btree node (want %llx got %llx)\n"</div><div class='del'>-			     "got btree %s level %llu pos %s",</div><div class='del'>-			     bp-&gt;seq, b-&gt;data-&gt;keys.seq,</div><div class='del'>-			     bch2_btree_id_str(BTREE_NODE_ID(b-&gt;data)),</div><div class='del'>-			     BTREE_NODE_LEVEL(b-&gt;data),</div><div class='del'>-			     buf.buf);</div><div class='del'>-	} else {</div><div class='del'>-		btree_err_on(!b-&gt;data-&gt;keys.seq,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_must_retry,</div><div class='del'>-			     c, ca, b, NULL,</div><div class='del'>-			     btree_node_bad_seq,</div><div class='del'>-			     "bad btree header: seq 0");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (b-&gt;written &lt; (ptr_written ?: btree_sectors(c))) {</div><div class='del'>-		unsigned sectors;</div><div class='del'>-		struct nonce nonce;</div><div class='del'>-		bool first = !b-&gt;written;</div><div class='del'>-		bool csum_bad;</div><div class='del'>-</div><div class='del'>-		if (!b-&gt;written) {</div><div class='del'>-			i = &amp;b-&gt;data-&gt;keys;</div><div class='del'>-</div><div class='del'>-			btree_err_on(!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)),</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-				     c, ca, b, i,</div><div class='del'>-				     bset_unknown_csum,</div><div class='del'>-				     "unknown checksum type %llu", BSET_CSUM_TYPE(i));</div><div class='del'>-</div><div class='del'>-			nonce = btree_nonce(i, b-&gt;written &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			struct bch_csum csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, b-&gt;data);</div><div class='del'>-			csum_bad = bch2_crc_cmp(b-&gt;data-&gt;csum, csum);</div><div class='del'>-			if (csum_bad)</div><div class='del'>-				bch2_io_error(ca, BCH_MEMBER_ERROR_checksum);</div><div class='del'>-</div><div class='del'>-			btree_err_on(csum_bad,</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-				     c, ca, b, i,</div><div class='del'>-				     bset_bad_csum,</div><div class='del'>-				     "%s",</div><div class='del'>-				     (printbuf_reset(&amp;buf),</div><div class='del'>-				      bch2_csum_err_msg(&amp;buf, BSET_CSUM_TYPE(i), b-&gt;data-&gt;csum, csum),</div><div class='del'>-				      buf.buf));</div><div class='del'>-</div><div class='del'>-			ret = bset_encrypt(c, i, b-&gt;written &lt;&lt; 9);</div><div class='del'>-			if (bch2_fs_fatal_err_on(ret, c,</div><div class='del'>-					"error decrypting btree node: %i", ret))</div><div class='del'>-				goto fsck_err;</div><div class='del'>-</div><div class='del'>-			btree_err_on(btree_node_type_is_extents(btree_node_type(b)) &amp;&amp;</div><div class='del'>-				     !BTREE_NODE_NEW_EXTENT_OVERWRITE(b-&gt;data),</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_incompatible,</div><div class='del'>-				     c, NULL, b, NULL,</div><div class='del'>-				     btree_node_unsupported_version,</div><div class='del'>-				     "btree node does not have NEW_EXTENT_OVERWRITE set");</div><div class='del'>-</div><div class='del'>-			sectors = vstruct_sectors(b-&gt;data, c-&gt;block_bits);</div><div class='del'>-		} else {</div><div class='del'>-			bne = write_block(b);</div><div class='del'>-			i = &amp;bne-&gt;keys;</div><div class='del'>-</div><div class='del'>-			if (i-&gt;seq != b-&gt;data-&gt;keys.seq)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			btree_err_on(!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)),</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-				     c, ca, b, i,</div><div class='del'>-				     bset_unknown_csum,</div><div class='del'>-				     "unknown checksum type %llu", BSET_CSUM_TYPE(i));</div><div class='del'>-</div><div class='del'>-			nonce = btree_nonce(i, b-&gt;written &lt;&lt; 9);</div><div class='del'>-			struct bch_csum csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne);</div><div class='del'>-			csum_bad = bch2_crc_cmp(bne-&gt;csum, csum);</div><div class='del'>-			if (csum_bad)</div><div class='del'>-				bch2_io_error(ca, BCH_MEMBER_ERROR_checksum);</div><div class='del'>-</div><div class='del'>-			btree_err_on(csum_bad,</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-				     c, ca, b, i,</div><div class='del'>-				     bset_bad_csum,</div><div class='del'>-				     "%s",</div><div class='del'>-				     (printbuf_reset(&amp;buf),</div><div class='del'>-				      bch2_csum_err_msg(&amp;buf, BSET_CSUM_TYPE(i), bne-&gt;csum, csum),</div><div class='del'>-				      buf.buf));</div><div class='del'>-</div><div class='del'>-			ret = bset_encrypt(c, i, b-&gt;written &lt;&lt; 9);</div><div class='del'>-			if (bch2_fs_fatal_err_on(ret, c,</div><div class='del'>-					"error decrypting btree node: %i\n", ret))</div><div class='del'>-				goto fsck_err;</div><div class='del'>-</div><div class='del'>-			sectors = vstruct_sectors(bne, c-&gt;block_bits);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		b-&gt;version_ondisk = min(b-&gt;version_ondisk,</div><div class='del'>-					le16_to_cpu(i-&gt;version));</div><div class='del'>-</div><div class='del'>-		ret = validate_bset(c, ca, b, i, b-&gt;written, sectors,</div><div class='del'>-				    READ, have_retry, saw_error);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto fsck_err;</div><div class='del'>-</div><div class='del'>-		if (!b-&gt;written)</div><div class='del'>-			btree_node_set_format(b, b-&gt;data-&gt;format);</div><div class='del'>-</div><div class='del'>-		ret = validate_bset_keys(c, b, i, READ, have_retry, saw_error);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto fsck_err;</div><div class='del'>-</div><div class='del'>-		SET_BSET_BIG_ENDIAN(i, CPU_BIG_ENDIAN);</div><div class='del'>-</div><div class='del'>-		blacklisted = bch2_journal_seq_is_blacklisted(c,</div><div class='del'>-					le64_to_cpu(i-&gt;journal_seq),</div><div class='del'>-					true);</div><div class='del'>-</div><div class='del'>-		btree_err_on(blacklisted &amp;&amp; first,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-			     c, ca, b, i,</div><div class='del'>-			     bset_blacklisted_journal_seq,</div><div class='del'>-			     "first btree node bset has blacklisted journal seq (%llu)",</div><div class='del'>-			     le64_to_cpu(i-&gt;journal_seq));</div><div class='del'>-</div><div class='del'>-		btree_err_on(blacklisted &amp;&amp; ptr_written,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-			     c, ca, b, i,</div><div class='del'>-			     first_bset_blacklisted_journal_seq,</div><div class='del'>-			     "found blacklisted bset (journal seq %llu) in btree node at offset %u-%u/%u",</div><div class='del'>-			     le64_to_cpu(i-&gt;journal_seq),</div><div class='del'>-			     b-&gt;written, b-&gt;written + sectors, ptr_written);</div><div class='del'>-</div><div class='del'>-		b-&gt;written += sectors;</div><div class='del'>-</div><div class='del'>-		if (blacklisted &amp;&amp; !first)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		sort_iter_add(iter,</div><div class='del'>-			      vstruct_idx(i, 0),</div><div class='del'>-			      vstruct_last(i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ptr_written) {</div><div class='del'>-		btree_err_on(b-&gt;written &lt; ptr_written,</div><div class='del'>-			     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-			     c, ca, b, NULL,</div><div class='del'>-			     btree_node_data_missing,</div><div class='del'>-			     "btree node data missing: expected %u sectors, found %u",</div><div class='del'>-			     ptr_written, b-&gt;written);</div><div class='del'>-	} else {</div><div class='del'>-		for (bne = write_block(b);</div><div class='del'>-		     bset_byte_offset(b, bne) &lt; btree_buf_bytes(b);</div><div class='del'>-		     bne = (void *) bne + block_bytes(c))</div><div class='del'>-			btree_err_on(bne-&gt;keys.seq == b-&gt;data-&gt;keys.seq &amp;&amp;</div><div class='del'>-				     !bch2_journal_seq_is_blacklisted(c,</div><div class='del'>-								      le64_to_cpu(bne-&gt;keys.journal_seq),</div><div class='del'>-								      true),</div><div class='del'>-				     -BCH_ERR_btree_node_read_err_want_retry,</div><div class='del'>-				     c, ca, b, NULL,</div><div class='del'>-				     btree_node_bset_after_end,</div><div class='del'>-				     "found bset signature after last bset");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sorted = btree_bounce_alloc(c, btree_buf_bytes(b), &amp;used_mempool);</div><div class='del'>-	sorted-&gt;keys.u64s = 0;</div><div class='del'>-</div><div class='del'>-	set_btree_bset(b, b-&gt;set, &amp;b-&gt;data-&gt;keys);</div><div class='del'>-</div><div class='del'>-	b-&gt;nr = bch2_key_sort_fix_overlapping(c, &amp;sorted-&gt;keys, iter);</div><div class='del'>-</div><div class='del'>-	u64s = le16_to_cpu(sorted-&gt;keys.u64s);</div><div class='del'>-	*sorted = *b-&gt;data;</div><div class='del'>-	sorted-&gt;keys.u64s = cpu_to_le16(u64s);</div><div class='del'>-	swap(sorted, b-&gt;data);</div><div class='del'>-	set_btree_bset(b, b-&gt;set, &amp;b-&gt;data-&gt;keys);</div><div class='del'>-	b-&gt;nsets = 1;</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;nr.live_u64s != u64s);</div><div class='del'>-</div><div class='del'>-	btree_bounce_free(c, btree_buf_bytes(b), used_mempool, sorted);</div><div class='del'>-</div><div class='del'>-	if (updated_range)</div><div class='del'>-		bch2_btree_node_drop_keys_outside_node(b);</div><div class='del'>-</div><div class='del'>-	i = &amp;b-&gt;data-&gt;keys;</div><div class='del'>-	for (k = i-&gt;start; k != vstruct_last(i);) {</div><div class='del'>-		struct bkey tmp;</div><div class='del'>-		struct bkey_s u = __bkey_disassemble(b, k, &amp;tmp);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-</div><div class='del'>-		if (bch2_bkey_val_invalid(c, u.s_c, READ, &amp;buf) ||</div><div class='del'>-		    (bch2_inject_invalid_keys &amp;&amp;</div><div class='del'>-		     !bversion_cmp(u.k-&gt;version, MAX_VERSION))) {</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-</div><div class='del'>-			prt_printf(&amp;buf, "invalid bkey: ");</div><div class='del'>-			bch2_bkey_val_invalid(c, u.s_c, READ, &amp;buf);</div><div class='del'>-			prt_printf(&amp;buf, "\n  ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, u.s_c);</div><div class='del'>-</div><div class='del'>-			btree_err(-BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				  c, NULL, b, i,</div><div class='del'>-				  btree_node_bad_bkey,</div><div class='del'>-				  "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-			btree_keys_account_key_drop(&amp;b-&gt;nr, 0, k);</div><div class='del'>-</div><div class='del'>-			i-&gt;u64s = cpu_to_le16(le16_to_cpu(i-&gt;u64s) - k-&gt;u64s);</div><div class='del'>-			memmove_u64s_down(k, bkey_p_next(k),</div><div class='del'>-					  (u64 *) vstruct_end(i) - (u64 *) k);</div><div class='del'>-			set_btree_bset_end(b, b-&gt;set);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (u.k-&gt;type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-			struct bkey_s_btree_ptr_v2 bp = bkey_s_to_btree_ptr_v2(u);</div><div class='del'>-</div><div class='del'>-			bp.v-&gt;mem_ptr = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		k = bkey_p_next(k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bset_build_aux_tree(b, b-&gt;set, false);</div><div class='del'>-</div><div class='del'>-	set_needs_whiteout(btree_bset_first(b), true);</div><div class='del'>-</div><div class='del'>-	btree_node_reset_sib_u64s(b);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(bch2_bkey_ptrs(bkey_i_to_s(&amp;b-&gt;key)), ptr) {</div><div class='del'>-		struct bch_dev *ca2 = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-		if (ca2-&gt;mi.state != BCH_MEMBER_STATE_rw)</div><div class='del'>-			set_btree_node_need_rewrite(b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ptr_written)</div><div class='del'>-		set_btree_node_need_rewrite(b);</div><div class='del'>-out:</div><div class='del'>-	mempool_free(iter, &amp;c-&gt;fill_iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_node_read_done], start_time);</div><div class='del'>-	return retry_read;</div><div class='del'>-fsck_err:</div><div class='del'>-	if (ret == -BCH_ERR_btree_node_read_err_want_retry ||</div><div class='del'>-	    ret == -BCH_ERR_btree_node_read_err_must_retry)</div><div class='del'>-		retry_read = 1;</div><div class='del'>-	else</div><div class='del'>-		set_btree_node_read_error(b);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_read_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct btree_read_bio *rb =</div><div class='del'>-		container_of(work, struct btree_read_bio, work);</div><div class='del'>-	struct bch_fs *c	= rb-&gt;c;</div><div class='del'>-	struct btree *b		= rb-&gt;b;</div><div class='del'>-	struct bch_dev *ca	= bch_dev_bkey_exists(c, rb-&gt;pick.ptr.dev);</div><div class='del'>-	struct bio *bio		= &amp;rb-&gt;bio;</div><div class='del'>-	struct bch_io_failures failed = { .nr = 0 };</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool saw_error = false;</div><div class='del'>-	bool retry = false;</div><div class='del'>-	bool can_retry;</div><div class='del'>-</div><div class='del'>-	goto start;</div><div class='del'>-	while (1) {</div><div class='del'>-		retry = true;</div><div class='del'>-		bch_info(c, "retrying read");</div><div class='del'>-		ca = bch_dev_bkey_exists(c, rb-&gt;pick.ptr.dev);</div><div class='del'>-		rb-&gt;have_ioref		= bch2_dev_get_ioref(ca, READ);</div><div class='del'>-		bio_reset(bio, NULL, REQ_OP_READ|REQ_SYNC|REQ_META);</div><div class='del'>-		bio-&gt;bi_iter.bi_sector	= rb-&gt;pick.ptr.offset;</div><div class='del'>-		bio-&gt;bi_iter.bi_size	= btree_buf_bytes(b);</div><div class='del'>-</div><div class='del'>-		if (rb-&gt;have_ioref) {</div><div class='del'>-			bio_set_dev(bio, ca-&gt;disk_sb.bdev);</div><div class='del'>-			submit_bio_wait(bio);</div><div class='del'>-		} else {</div><div class='del'>-			bio-&gt;bi_status = BLK_STS_REMOVED;</div><div class='del'>-		}</div><div class='del'>-start:</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		bch2_btree_pos_to_text(&amp;buf, c, b);</div><div class='del'>-		bch2_dev_io_err_on(bio-&gt;bi_status, ca, BCH_MEMBER_ERROR_read,</div><div class='del'>-				   "btree read error %s for %s",</div><div class='del'>-				   bch2_blk_status_to_str(bio-&gt;bi_status), buf.buf);</div><div class='del'>-		if (rb-&gt;have_ioref)</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-		rb-&gt;have_ioref = false;</div><div class='del'>-</div><div class='del'>-		bch2_mark_io_failure(&amp;failed, &amp;rb-&gt;pick);</div><div class='del'>-</div><div class='del'>-		can_retry = bch2_bkey_pick_read_device(c,</div><div class='del'>-				bkey_i_to_s_c(&amp;b-&gt;key),</div><div class='del'>-				&amp;failed, &amp;rb-&gt;pick) &gt; 0;</div><div class='del'>-</div><div class='del'>-		if (!bio-&gt;bi_status &amp;&amp;</div><div class='del'>-		    !bch2_btree_node_read_done(c, ca, b, can_retry, &amp;saw_error)) {</div><div class='del'>-			if (retry)</div><div class='del'>-				bch_info(c, "retry success");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		saw_error = true;</div><div class='del'>-</div><div class='del'>-		if (!can_retry) {</div><div class='del'>-			set_btree_node_read_error(b);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_node_read],</div><div class='del'>-			       rb-&gt;start_time);</div><div class='del'>-	bio_put(&amp;rb-&gt;bio);</div><div class='del'>-</div><div class='del'>-	if (saw_error &amp;&amp; !btree_node_read_error(b)) {</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		bch2_bpos_to_text(&amp;buf, b-&gt;key.k.p);</div><div class='del'>-		bch_info(c, "%s: rewriting btree node at btree=%s level=%u %s due to error",</div><div class='del'>-			 __func__, bch2_btree_id_str(b-&gt;c.btree_id), b-&gt;c.level, buf.buf);</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_rewrite_async(c, b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	clear_btree_node_read_in_flight(b);</div><div class='del'>-	wake_up_bit(&amp;b-&gt;flags, BTREE_NODE_read_in_flight);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_read_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct btree_read_bio *rb =</div><div class='del'>-		container_of(bio, struct btree_read_bio, bio);</div><div class='del'>-	struct bch_fs *c	= rb-&gt;c;</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;have_ioref) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, rb-&gt;pick.ptr.dev);</div><div class='del'>-</div><div class='del'>-		bch2_latency_acct(ca, rb-&gt;start_time, READ);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_work(c-&gt;io_complete_wq, &amp;rb-&gt;work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_node_read_all {</div><div class='del'>-	struct closure		cl;</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	struct btree		*b;</div><div class='del'>-	unsigned		nr;</div><div class='del'>-	void			*buf[BCH_REPLICAS_MAX];</div><div class='del'>-	struct bio		*bio[BCH_REPLICAS_MAX];</div><div class='del'>-	blk_status_t		err[BCH_REPLICAS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned btree_node_sectors_written(struct bch_fs *c, void *data)</div><div class='del'>-{</div><div class='del'>-	struct btree_node *bn = data;</div><div class='del'>-	struct btree_node_entry *bne;</div><div class='del'>-	unsigned offset = 0;</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(bn-&gt;magic) !=  bset_magic(c))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while (offset &lt; btree_sectors(c)) {</div><div class='del'>-		if (!offset) {</div><div class='del'>-			offset += vstruct_sectors(bn, c-&gt;block_bits);</div><div class='del'>-		} else {</div><div class='del'>-			bne = data + (offset &lt;&lt; 9);</div><div class='del'>-			if (bne-&gt;keys.seq != bn-&gt;keys.seq)</div><div class='del'>-				break;</div><div class='del'>-			offset += vstruct_sectors(bne, c-&gt;block_bits);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool btree_node_has_extra_bsets(struct bch_fs *c, unsigned offset, void *data)</div><div class='del'>-{</div><div class='del'>-	struct btree_node *bn = data;</div><div class='del'>-	struct btree_node_entry *bne;</div><div class='del'>-</div><div class='del'>-	if (!offset)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	while (offset &lt; btree_sectors(c)) {</div><div class='del'>-		bne = data + (offset &lt;&lt; 9);</div><div class='del'>-		if (bne-&gt;keys.seq == bn-&gt;keys.seq)</div><div class='del'>-			return true;</div><div class='del'>-		offset++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(btree_node_read_all_replicas_done)</div><div class='del'>-{</div><div class='del'>-	closure_type(ra, struct btree_node_read_all, cl);</div><div class='del'>-	struct bch_fs *c = ra-&gt;c;</div><div class='del'>-	struct btree *b = ra-&gt;b;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool dump_bset_maps = false;</div><div class='del'>-	bool have_retry = false;</div><div class='del'>-	int ret = 0, best = -1, write = READ;</div><div class='del'>-	unsigned i, written = 0, written2 = 0;</div><div class='del'>-	__le64 seq = b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2</div><div class='del'>-		? bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v.seq : 0;</div><div class='del'>-	bool _saw_error = false, *saw_error = &amp;_saw_error;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ra-&gt;nr; i++) {</div><div class='del'>-		struct btree_node *bn = ra-&gt;buf[i];</div><div class='del'>-</div><div class='del'>-		if (ra-&gt;err[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (le64_to_cpu(bn-&gt;magic) != bset_magic(c) ||</div><div class='del'>-		    (seq &amp;&amp; seq != bn-&gt;keys.seq))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (best &lt; 0) {</div><div class='del'>-			best = i;</div><div class='del'>-			written = btree_node_sectors_written(c, bn);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		written2 = btree_node_sectors_written(c, ra-&gt;buf[i]);</div><div class='del'>-		if (btree_err_on(written2 != written, -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				 c, NULL, b, NULL,</div><div class='del'>-				 btree_node_replicas_sectors_written_mismatch,</div><div class='del'>-				 "btree node sectors written mismatch: %u != %u",</div><div class='del'>-				 written, written2) ||</div><div class='del'>-		    btree_err_on(btree_node_has_extra_bsets(c, written2, ra-&gt;buf[i]),</div><div class='del'>-				 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				 c, NULL, b, NULL,</div><div class='del'>-				 btree_node_bset_after_end,</div><div class='del'>-				 "found bset signature after last bset") ||</div><div class='del'>-		    btree_err_on(memcmp(ra-&gt;buf[best], ra-&gt;buf[i], written &lt;&lt; 9),</div><div class='del'>-				 -BCH_ERR_btree_node_read_err_fixable,</div><div class='del'>-				 c, NULL, b, NULL,</div><div class='del'>-				 btree_node_replicas_data_mismatch,</div><div class='del'>-				 "btree node replicas content mismatch"))</div><div class='del'>-			dump_bset_maps = true;</div><div class='del'>-</div><div class='del'>-		if (written2 &gt; written) {</div><div class='del'>-			written = written2;</div><div class='del'>-			best = i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	if (dump_bset_maps) {</div><div class='del'>-		for (i = 0; i &lt; ra-&gt;nr; i++) {</div><div class='del'>-			struct btree_node *bn = ra-&gt;buf[i];</div><div class='del'>-			struct btree_node_entry *bne = NULL;</div><div class='del'>-			unsigned offset = 0, sectors;</div><div class='del'>-			bool gap = false;</div><div class='del'>-</div><div class='del'>-			if (ra-&gt;err[i])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			printbuf_reset(&amp;buf);</div><div class='del'>-</div><div class='del'>-			while (offset &lt; btree_sectors(c)) {</div><div class='del'>-				if (!offset) {</div><div class='del'>-					sectors = vstruct_sectors(bn, c-&gt;block_bits);</div><div class='del'>-				} else {</div><div class='del'>-					bne = ra-&gt;buf[i] + (offset &lt;&lt; 9);</div><div class='del'>-					if (bne-&gt;keys.seq != bn-&gt;keys.seq)</div><div class='del'>-						break;</div><div class='del'>-					sectors = vstruct_sectors(bne, c-&gt;block_bits);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				prt_printf(&amp;buf, " %u-%u", offset, offset + sectors);</div><div class='del'>-				if (bne &amp;&amp; bch2_journal_seq_is_blacklisted(c,</div><div class='del'>-							le64_to_cpu(bne-&gt;keys.journal_seq), false))</div><div class='del'>-					prt_printf(&amp;buf, "*");</div><div class='del'>-				offset += sectors;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			while (offset &lt; btree_sectors(c)) {</div><div class='del'>-				bne = ra-&gt;buf[i] + (offset &lt;&lt; 9);</div><div class='del'>-				if (bne-&gt;keys.seq == bn-&gt;keys.seq) {</div><div class='del'>-					if (!gap)</div><div class='del'>-						prt_printf(&amp;buf, " GAP");</div><div class='del'>-					gap = true;</div><div class='del'>-</div><div class='del'>-					sectors = vstruct_sectors(bne, c-&gt;block_bits);</div><div class='del'>-					prt_printf(&amp;buf, " %u-%u", offset, offset + sectors);</div><div class='del'>-					if (bch2_journal_seq_is_blacklisted(c,</div><div class='del'>-							le64_to_cpu(bne-&gt;keys.journal_seq), false))</div><div class='del'>-						prt_printf(&amp;buf, "*");</div><div class='del'>-				}</div><div class='del'>-				offset++;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bch_err(c, "replica %u:%s", i, buf.buf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (best &gt;= 0) {</div><div class='del'>-		memcpy(b-&gt;data, ra-&gt;buf[best], btree_buf_bytes(b));</div><div class='del'>-		ret = bch2_btree_node_read_done(c, NULL, b, false, saw_error);</div><div class='del'>-	} else {</div><div class='del'>-		ret = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		set_btree_node_read_error(b);</div><div class='del'>-	else if (*saw_error)</div><div class='del'>-		bch2_btree_node_rewrite_async(c, b);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ra-&gt;nr; i++) {</div><div class='del'>-		mempool_free(ra-&gt;buf[i], &amp;c-&gt;btree_bounce_pool);</div><div class='del'>-		bio_put(ra-&gt;bio[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closure_debug_destroy(&amp;ra-&gt;cl);</div><div class='del'>-	kfree(ra);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-	clear_btree_node_read_in_flight(b);</div><div class='del'>-	wake_up_bit(&amp;b-&gt;flags, BTREE_NODE_read_in_flight);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_read_all_replicas_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct btree_read_bio *rb =</div><div class='del'>-		container_of(bio, struct btree_read_bio, bio);</div><div class='del'>-	struct bch_fs *c	= rb-&gt;c;</div><div class='del'>-	struct btree_node_read_all *ra = rb-&gt;ra;</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;have_ioref) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, rb-&gt;pick.ptr.dev);</div><div class='del'>-</div><div class='del'>-		bch2_latency_acct(ca, rb-&gt;start_time, READ);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ra-&gt;err[rb-&gt;idx] = bio-&gt;bi_status;</div><div class='del'>-	closure_put(&amp;ra-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX This allocates multiple times from the same mempools, and can deadlock</div><div class='del'>- * under sufficient memory pressure (but is only a debug path)</div><div class='del'>- */</div><div class='del'>-static int btree_node_read_all_replicas(struct bch_fs *c, struct btree *b, bool sync)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k = bkey_i_to_s_c(&amp;b-&gt;key);</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded pick;</div><div class='del'>-	struct btree_node_read_all *ra;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	ra = kzalloc(sizeof(*ra), GFP_NOFS);</div><div class='del'>-	if (!ra)</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_node_read_all_replicas;</div><div class='del'>-</div><div class='del'>-	closure_init(&amp;ra-&gt;cl, NULL);</div><div class='del'>-	ra-&gt;c	= c;</div><div class='del'>-	ra-&gt;b	= b;</div><div class='del'>-	ra-&gt;nr	= bch2_bkey_nr_ptrs(k);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ra-&gt;nr; i++) {</div><div class='del'>-		ra-&gt;buf[i] = mempool_alloc(&amp;c-&gt;btree_bounce_pool, GFP_NOFS);</div><div class='del'>-		ra-&gt;bio[i] = bio_alloc_bioset(NULL,</div><div class='del'>-					      buf_pages(ra-&gt;buf[i], btree_buf_bytes(b)),</div><div class='del'>-					      REQ_OP_READ|REQ_SYNC|REQ_META,</div><div class='del'>-					      GFP_NOFS,</div><div class='del'>-					      &amp;c-&gt;btree_bio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, pick, entry) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, pick.ptr.dev);</div><div class='del'>-		struct btree_read_bio *rb =</div><div class='del'>-			container_of(ra-&gt;bio[i], struct btree_read_bio, bio);</div><div class='del'>-		rb-&gt;c			= c;</div><div class='del'>-		rb-&gt;b			= b;</div><div class='del'>-		rb-&gt;ra			= ra;</div><div class='del'>-		rb-&gt;start_time		= local_clock();</div><div class='del'>-		rb-&gt;have_ioref		= bch2_dev_get_ioref(ca, READ);</div><div class='del'>-		rb-&gt;idx			= i;</div><div class='del'>-		rb-&gt;pick		= pick;</div><div class='del'>-		rb-&gt;bio.bi_iter.bi_sector = pick.ptr.offset;</div><div class='del'>-		rb-&gt;bio.bi_end_io	= btree_node_read_all_replicas_endio;</div><div class='del'>-		bch2_bio_map(&amp;rb-&gt;bio, ra-&gt;buf[i], btree_buf_bytes(b));</div><div class='del'>-</div><div class='del'>-		if (rb-&gt;have_ioref) {</div><div class='del'>-			this_cpu_add(ca-&gt;io_done-&gt;sectors[READ][BCH_DATA_btree],</div><div class='del'>-				     bio_sectors(&amp;rb-&gt;bio));</div><div class='del'>-			bio_set_dev(&amp;rb-&gt;bio, ca-&gt;disk_sb.bdev);</div><div class='del'>-</div><div class='del'>-			closure_get(&amp;ra-&gt;cl);</div><div class='del'>-			submit_bio(&amp;rb-&gt;bio);</div><div class='del'>-		} else {</div><div class='del'>-			ra-&gt;err[i] = BLK_STS_REMOVED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sync) {</div><div class='del'>-		closure_sync(&amp;ra-&gt;cl);</div><div class='del'>-		btree_node_read_all_replicas_done(&amp;ra-&gt;cl.work);</div><div class='del'>-	} else {</div><div class='del'>-		continue_at(&amp;ra-&gt;cl, btree_node_read_all_replicas_done,</div><div class='del'>-			    c-&gt;io_complete_wq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_read(struct btree_trans *trans, struct btree *b,</div><div class='del'>-			  bool sync)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct extent_ptr_decoded pick;</div><div class='del'>-	struct btree_read_bio *rb;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_read, trans, b);</div><div class='del'>-</div><div class='del'>-	if (bch2_verify_all_btree_replicas &amp;&amp;</div><div class='del'>-	    !btree_node_read_all_replicas(c, b, sync))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_pick_read_device(c, bkey_i_to_s_c(&amp;b-&gt;key),</div><div class='del'>-					 NULL, &amp;pick);</div><div class='del'>-</div><div class='del'>-	if (ret &lt;= 0) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_str(&amp;buf, "btree node read error: no device to read from\n at ");</div><div class='del'>-		bch2_btree_pos_to_text(&amp;buf, c, b);</div><div class='del'>-		bch_err(c, "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-		if (c-&gt;recovery_passes_explicit &amp; BIT_ULL(BCH_RECOVERY_PASS_check_topology) &amp;&amp;</div><div class='del'>-		    c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_check_topology)</div><div class='del'>-			bch2_fatal_error(c);</div><div class='del'>-</div><div class='del'>-		set_btree_node_read_error(b);</div><div class='del'>-		clear_btree_node_read_in_flight(b);</div><div class='del'>-		wake_up_bit(&amp;b-&gt;flags, BTREE_NODE_read_in_flight);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, pick.ptr.dev);</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(NULL,</div><div class='del'>-			       buf_pages(b-&gt;data, btree_buf_bytes(b)),</div><div class='del'>-			       REQ_OP_READ|REQ_SYNC|REQ_META,</div><div class='del'>-			       GFP_NOFS,</div><div class='del'>-			       &amp;c-&gt;btree_bio);</div><div class='del'>-	rb = container_of(bio, struct btree_read_bio, bio);</div><div class='del'>-	rb-&gt;c			= c;</div><div class='del'>-	rb-&gt;b			= b;</div><div class='del'>-	rb-&gt;ra			= NULL;</div><div class='del'>-	rb-&gt;start_time		= local_clock();</div><div class='del'>-	rb-&gt;have_ioref		= bch2_dev_get_ioref(ca, READ);</div><div class='del'>-	rb-&gt;pick		= pick;</div><div class='del'>-	INIT_WORK(&amp;rb-&gt;work, btree_node_read_work);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector	= pick.ptr.offset;</div><div class='del'>-	bio-&gt;bi_end_io		= btree_node_read_endio;</div><div class='del'>-	bch2_bio_map(bio, b-&gt;data, btree_buf_bytes(b));</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;have_ioref) {</div><div class='del'>-		this_cpu_add(ca-&gt;io_done-&gt;sectors[READ][BCH_DATA_btree],</div><div class='del'>-			     bio_sectors(bio));</div><div class='del'>-		bio_set_dev(bio, ca-&gt;disk_sb.bdev);</div><div class='del'>-</div><div class='del'>-		if (sync) {</div><div class='del'>-			submit_bio_wait(bio);</div><div class='del'>-			bch2_latency_acct(ca, rb-&gt;start_time, READ);</div><div class='del'>-			btree_node_read_work(&amp;rb-&gt;work);</div><div class='del'>-		} else {</div><div class='del'>-			submit_bio(bio);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		bio-&gt;bi_status = BLK_STS_REMOVED;</div><div class='del'>-</div><div class='del'>-		if (sync)</div><div class='del'>-			btree_node_read_work(&amp;rb-&gt;work);</div><div class='del'>-		else</div><div class='del'>-			queue_work(c-&gt;io_complete_wq, &amp;rb-&gt;work);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_btree_root_read(struct btree_trans *trans, enum btree_id id,</div><div class='del'>-				  const struct bkey_i *k, unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct closure cl;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = bch2_btree_cache_cannibalize_lock(trans, &amp;cl);</div><div class='del'>-		closure_sync(&amp;cl);</div><div class='del'>-	} while (ret);</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_node_mem_alloc(trans, level != 0);</div><div class='del'>-	bch2_btree_cache_cannibalize_unlock(trans);</div><div class='del'>-</div><div class='del'>-	BUG_ON(IS_ERR(b));</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;b-&gt;key, k);</div><div class='del'>-	BUG_ON(bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache, b, level, id));</div><div class='del'>-</div><div class='del'>-	set_btree_node_read_in_flight(b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_read(trans, b, true);</div><div class='del'>-</div><div class='del'>-	if (btree_node_read_error(b)) {</div><div class='del'>-		bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-		list_move(&amp;b-&gt;list, &amp;c-&gt;btree_cache.freeable);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_set_root_for_read(c, b);</div><div class='del'>-err:</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_root_read(struct bch_fs *c, enum btree_id id,</div><div class='del'>-			const struct bkey_i *k, unsigned level)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_run(c, __bch2_btree_root_read(trans, id, k, level));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_complete_write(struct bch_fs *c, struct btree *b,</div><div class='del'>-				      struct btree_write *w)</div><div class='del'>-{</div><div class='del'>-	unsigned long old, new, v = READ_ONCE(b-&gt;will_make_reachable);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = new = v;</div><div class='del'>-		if (!(old &amp; 1))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		new &amp;= ~1UL;</div><div class='del'>-	} while ((v = cmpxchg(&amp;b-&gt;will_make_reachable, old, new)) != old);</div><div class='del'>-</div><div class='del'>-	if (old &amp; 1)</div><div class='del'>-		closure_put(&amp;((struct btree_update *) new)-&gt;cl);</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;w-&gt;journal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __btree_node_write_done(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_write *w = btree_prev_write(b);</div><div class='del'>-	unsigned long old, new, v;</div><div class='del'>-	unsigned type = 0;</div><div class='del'>-</div><div class='del'>-	bch2_btree_complete_write(c, b, w);</div><div class='del'>-</div><div class='del'>-	v = READ_ONCE(b-&gt;flags);</div><div class='del'>-	do {</div><div class='del'>-		old = new = v;</div><div class='del'>-</div><div class='del'>-		if ((old &amp; (1U &lt;&lt; BTREE_NODE_dirty)) &amp;&amp;</div><div class='del'>-		    (old &amp; (1U &lt;&lt; BTREE_NODE_need_write)) &amp;&amp;</div><div class='del'>-		    !(old &amp; (1U &lt;&lt; BTREE_NODE_never_write)) &amp;&amp;</div><div class='del'>-		    !(old &amp; (1U &lt;&lt; BTREE_NODE_write_blocked)) &amp;&amp;</div><div class='del'>-		    !(old &amp; (1U &lt;&lt; BTREE_NODE_will_make_reachable))) {</div><div class='del'>-			new &amp;= ~(1U &lt;&lt; BTREE_NODE_dirty);</div><div class='del'>-			new &amp;= ~(1U &lt;&lt; BTREE_NODE_need_write);</div><div class='del'>-			new |=  (1U &lt;&lt; BTREE_NODE_write_in_flight);</div><div class='del'>-			new |=  (1U &lt;&lt; BTREE_NODE_write_in_flight_inner);</div><div class='del'>-			new |=  (1U &lt;&lt; BTREE_NODE_just_written);</div><div class='del'>-			new ^=  (1U &lt;&lt; BTREE_NODE_write_idx);</div><div class='del'>-</div><div class='del'>-			type = new &amp; BTREE_WRITE_TYPE_MASK;</div><div class='del'>-			new &amp;= ~BTREE_WRITE_TYPE_MASK;</div><div class='del'>-		} else {</div><div class='del'>-			new &amp;= ~(1U &lt;&lt; BTREE_NODE_write_in_flight);</div><div class='del'>-			new &amp;= ~(1U &lt;&lt; BTREE_NODE_write_in_flight_inner);</div><div class='del'>-		}</div><div class='del'>-	} while ((v = cmpxchg(&amp;b-&gt;flags, old, new)) != old);</div><div class='del'>-</div><div class='del'>-	if (new &amp; (1U &lt;&lt; BTREE_NODE_write_in_flight))</div><div class='del'>-		__bch2_btree_node_write(c, b, BTREE_WRITE_ALREADY_STARTED|type);</div><div class='del'>-	else</div><div class='del'>-		wake_up_bit(&amp;b-&gt;flags, BTREE_NODE_write_in_flight);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_write_done(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_read);</div><div class='del'>-	__btree_node_write_done(c, b);</div><div class='del'>-	six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_write_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_bio *wbio =</div><div class='del'>-		container_of(work, struct btree_write_bio, work);</div><div class='del'>-	struct bch_fs *c	= wbio-&gt;wbio.c;</div><div class='del'>-	struct btree *b		= wbio-&gt;wbio.bio.bi_private;</div><div class='del'>-	struct bch_extent_ptr *ptr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	btree_bounce_free(c,</div><div class='del'>-		wbio-&gt;data_bytes,</div><div class='del'>-		wbio-&gt;wbio.used_mempool,</div><div class='del'>-		wbio-&gt;data);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_drop_ptrs(bkey_i_to_s(&amp;wbio-&gt;key), ptr,</div><div class='del'>-		bch2_dev_list_has_dev(wbio-&gt;wbio.failed, ptr-&gt;dev));</div><div class='del'>-</div><div class='del'>-	if (!bch2_bkey_nr_ptrs(bkey_i_to_s_c(&amp;wbio-&gt;key))) {</div><div class='del'>-		ret = -BCH_ERR_btree_write_all_failed;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;wbio.first_btree_write) {</div><div class='del'>-		if (wbio-&gt;wbio.failed.nr) {</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-			bch2_btree_node_update_key_get_iter(trans, b, &amp;wbio-&gt;key,</div><div class='del'>-					BCH_WATERMARK_reclaim|</div><div class='del'>-					BCH_TRANS_COMMIT_journal_reclaim|</div><div class='del'>-					BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-					BCH_TRANS_COMMIT_no_check_rw,</div><div class='del'>-					!wbio-&gt;wbio.failed.nr));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bio_put(&amp;wbio-&gt;wbio.bio);</div><div class='del'>-	btree_node_write_done(c, b);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	set_btree_node_noevict(b);</div><div class='del'>-	if (!bch2_err_matches(ret, EROFS))</div><div class='del'>-		bch2_fs_fatal_error(c, "fatal error writing btree node: %s", bch2_err_str(ret));</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_node_write_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bch_write_bio *wbio	= to_wbio(bio);</div><div class='del'>-	struct bch_write_bio *parent	= wbio-&gt;split ? wbio-&gt;parent : NULL;</div><div class='del'>-	struct bch_write_bio *orig	= parent ?: wbio;</div><div class='del'>-	struct btree_write_bio *wb	= container_of(orig, struct btree_write_bio, wbio);</div><div class='del'>-	struct bch_fs *c		= wbio-&gt;c;</div><div class='del'>-	struct btree *b			= wbio-&gt;bio.bi_private;</div><div class='del'>-	struct bch_dev *ca		= bch_dev_bkey_exists(c, wbio-&gt;dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;have_ioref)</div><div class='del'>-		bch2_latency_acct(ca, wbio-&gt;submit_time, WRITE);</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_io_err_on(bio-&gt;bi_status, ca, BCH_MEMBER_ERROR_write,</div><div class='del'>-			       "btree write error: %s",</div><div class='del'>-			       bch2_blk_status_to_str(bio-&gt;bi_status)) ||</div><div class='del'>-	    bch2_meta_write_fault("btree")) {</div><div class='del'>-		spin_lock_irqsave(&amp;c-&gt;btree_write_error_lock, flags);</div><div class='del'>-		bch2_dev_list_add_dev(&amp;orig-&gt;failed, wbio-&gt;dev);</div><div class='del'>-		spin_unlock_irqrestore(&amp;c-&gt;btree_write_error_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;have_ioref)</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-	if (parent) {</div><div class='del'>-		bio_put(bio);</div><div class='del'>-		bio_endio(&amp;parent-&gt;bio);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_btree_node_write_in_flight_inner(b);</div><div class='del'>-	wake_up_bit(&amp;b-&gt;flags, BTREE_NODE_write_in_flight_inner);</div><div class='del'>-	INIT_WORK(&amp;wb-&gt;work, btree_node_write_work);</div><div class='del'>-	queue_work(c-&gt;btree_io_complete_wq, &amp;wb-&gt;work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_bset_for_write(struct bch_fs *c, struct btree *b,</div><div class='del'>-				   struct bset *i, unsigned sectors)</div><div class='del'>-{</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool saw_error;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_invalid(c, bkey_i_to_s_c(&amp;b-&gt;key),</div><div class='del'>-				BKEY_TYPE_btree, WRITE, &amp;buf);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		bch2_fs_inconsistent(c, "invalid btree node key before write: %s", buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = validate_bset_keys(c, b, i, WRITE, false, &amp;saw_error) ?:</div><div class='del'>-		validate_bset(c, NULL, b, i, b-&gt;written, sectors, WRITE, false, &amp;saw_error);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_inconsistent_error(c);</div><div class='del'>-		dump_stack();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_write_submit(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_bio *wbio = container_of(work, struct btree_write_bio, work);</div><div class='del'>-	BKEY_PADDED_ONSTACK(k, BKEY_BTREE_PTR_VAL_U64s_MAX) tmp;</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;tmp.k, &amp;wbio-&gt;key);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(bch2_bkey_ptrs(bkey_i_to_s(&amp;tmp.k)), ptr)</div><div class='del'>-		ptr-&gt;offset += wbio-&gt;sector_offset;</div><div class='del'>-</div><div class='del'>-	bch2_submit_wbio_replicas(&amp;wbio-&gt;wbio, wbio-&gt;wbio.c, BCH_DATA_btree,</div><div class='del'>-				  &amp;tmp.k, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_btree_node_write(struct bch_fs *c, struct btree *b, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_bio *wbio;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	struct bset *i;</div><div class='del'>-	struct btree_node *bn = NULL;</div><div class='del'>-	struct btree_node_entry *bne = NULL;</div><div class='del'>-	struct sort_iter_stack sort_iter;</div><div class='del'>-	struct nonce nonce;</div><div class='del'>-	unsigned bytes_to_write, sectors_to_write, bytes, u64s;</div><div class='del'>-	u64 seq = 0;</div><div class='del'>-	bool used_mempool;</div><div class='del'>-	unsigned long old, new;</div><div class='del'>-	bool validate_before_checksum = false;</div><div class='del'>-	enum btree_write_type type = flags &amp; BTREE_WRITE_TYPE_MASK;</div><div class='del'>-	void *data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_WRITE_ALREADY_STARTED)</div><div class='del'>-		goto do_write;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We may only have a read lock on the btree node - the dirty bit is our</div><div class='del'>-	 * "lock" against racing with other threads that may be trying to start</div><div class='del'>-	 * a write, we do a write iff we clear the dirty bit. Since setting the</div><div class='del'>-	 * dirty bit requires a write lock, we can't race with other threads</div><div class='del'>-	 * redirtying it:</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		old = new = READ_ONCE(b-&gt;flags);</div><div class='del'>-</div><div class='del'>-		if (!(old &amp; (1 &lt;&lt; BTREE_NODE_dirty)))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if ((flags &amp; BTREE_WRITE_ONLY_IF_NEED) &amp;&amp;</div><div class='del'>-		    !(old &amp; (1 &lt;&lt; BTREE_NODE_need_write)))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (old &amp;</div><div class='del'>-		    ((1 &lt;&lt; BTREE_NODE_never_write)|</div><div class='del'>-		     (1 &lt;&lt; BTREE_NODE_write_blocked)))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (b-&gt;written &amp;&amp;</div><div class='del'>-		    (old &amp; (1 &lt;&lt; BTREE_NODE_will_make_reachable)))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (old &amp; (1 &lt;&lt; BTREE_NODE_write_in_flight))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (flags &amp; BTREE_WRITE_ONLY_IF_NEED)</div><div class='del'>-			type = new &amp; BTREE_WRITE_TYPE_MASK;</div><div class='del'>-		new &amp;= ~BTREE_WRITE_TYPE_MASK;</div><div class='del'>-</div><div class='del'>-		new &amp;= ~(1 &lt;&lt; BTREE_NODE_dirty);</div><div class='del'>-		new &amp;= ~(1 &lt;&lt; BTREE_NODE_need_write);</div><div class='del'>-		new |=  (1 &lt;&lt; BTREE_NODE_write_in_flight);</div><div class='del'>-		new |=  (1 &lt;&lt; BTREE_NODE_write_in_flight_inner);</div><div class='del'>-		new |=  (1 &lt;&lt; BTREE_NODE_just_written);</div><div class='del'>-		new ^=  (1 &lt;&lt; BTREE_NODE_write_idx);</div><div class='del'>-	} while (cmpxchg_acquire(&amp;b-&gt;flags, old, new) != old);</div><div class='del'>-</div><div class='del'>-	if (new &amp; (1U &lt;&lt; BTREE_NODE_need_write))</div><div class='del'>-		return;</div><div class='del'>-do_write:</div><div class='del'>-	BUG_ON((type == BTREE_WRITE_initial) != (b-&gt;written == 0));</div><div class='del'>-</div><div class='del'>-	atomic_dec(&amp;c-&gt;btree_cache.dirty);</div><div class='del'>-</div><div class='del'>-	BUG_ON(btree_node_fake(b));</div><div class='del'>-	BUG_ON((b-&gt;will_make_reachable != 0) != !b-&gt;written);</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;written &gt;= btree_sectors(c));</div><div class='del'>-	BUG_ON(b-&gt;written &amp; (block_sectors(c) - 1));</div><div class='del'>-	BUG_ON(bset_written(b, btree_bset_last(b)));</div><div class='del'>-	BUG_ON(le64_to_cpu(b-&gt;data-&gt;magic) != bset_magic(c));</div><div class='del'>-	BUG_ON(memcmp(&amp;b-&gt;data-&gt;format, &amp;b-&gt;format, sizeof(b-&gt;format)));</div><div class='del'>-</div><div class='del'>-	bch2_sort_whiteouts(c, b);</div><div class='del'>-</div><div class='del'>-	sort_iter_stack_init(&amp;sort_iter, b);</div><div class='del'>-</div><div class='del'>-	bytes = !b-&gt;written</div><div class='del'>-		? sizeof(struct btree_node)</div><div class='del'>-		: sizeof(struct btree_node_entry);</div><div class='del'>-</div><div class='del'>-	bytes += b-&gt;whiteout_u64s * sizeof(u64);</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t) {</div><div class='del'>-		i = bset(b, t);</div><div class='del'>-</div><div class='del'>-		if (bset_written(b, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bytes += le16_to_cpu(i-&gt;u64s) * sizeof(u64);</div><div class='del'>-		sort_iter_add(&amp;sort_iter.iter,</div><div class='del'>-			      btree_bkey_first(b, t),</div><div class='del'>-			      btree_bkey_last(b, t));</div><div class='del'>-		seq = max(seq, le64_to_cpu(i-&gt;journal_seq));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;written &amp;&amp; !seq);</div><div class='del'>-</div><div class='del'>-	/* bch2_varint_decode may read up to 7 bytes past the end of the buffer: */</div><div class='del'>-	bytes += 8;</div><div class='del'>-</div><div class='del'>-	/* buffer must be a multiple of the block size */</div><div class='del'>-	bytes = round_up(bytes, block_bytes(c));</div><div class='del'>-</div><div class='del'>-	data = btree_bounce_alloc(c, bytes, &amp;used_mempool);</div><div class='del'>-</div><div class='del'>-	if (!b-&gt;written) {</div><div class='del'>-		bn = data;</div><div class='del'>-		*bn = *b-&gt;data;</div><div class='del'>-		i = &amp;bn-&gt;keys;</div><div class='del'>-	} else {</div><div class='del'>-		bne = data;</div><div class='del'>-		bne-&gt;keys = b-&gt;data-&gt;keys;</div><div class='del'>-		i = &amp;bne-&gt;keys;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i-&gt;journal_seq	= cpu_to_le64(seq);</div><div class='del'>-	i-&gt;u64s		= 0;</div><div class='del'>-</div><div class='del'>-	sort_iter_add(&amp;sort_iter.iter,</div><div class='del'>-		      unwritten_whiteouts_start(b),</div><div class='del'>-		      unwritten_whiteouts_end(b));</div><div class='del'>-	SET_BSET_SEPARATE_WHITEOUTS(i, false);</div><div class='del'>-</div><div class='del'>-	b-&gt;whiteout_u64s = 0;</div><div class='del'>-</div><div class='del'>-	u64s = bch2_sort_keys(i-&gt;start, &amp;sort_iter.iter, false);</div><div class='del'>-	le16_add_cpu(&amp;i-&gt;u64s, u64s);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!b-&gt;written &amp;&amp; i-&gt;u64s != b-&gt;data-&gt;keys.u64s);</div><div class='del'>-</div><div class='del'>-	set_needs_whiteout(i, false);</div><div class='del'>-</div><div class='del'>-	/* do we have data to write? */</div><div class='del'>-	if (b-&gt;written &amp;&amp; !i-&gt;u64s)</div><div class='del'>-		goto nowrite;</div><div class='del'>-</div><div class='del'>-	bytes_to_write = vstruct_end(i) - data;</div><div class='del'>-	sectors_to_write = round_up(bytes_to_write, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-</div><div class='del'>-	if (!b-&gt;written &amp;&amp;</div><div class='del'>-	    b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2)</div><div class='del'>-		BUG_ON(btree_ptr_sectors_written(&amp;b-&gt;key) != sectors_to_write);</div><div class='del'>-</div><div class='del'>-	memset(data + bytes_to_write, 0,</div><div class='del'>-	       (sectors_to_write &lt;&lt; 9) - bytes_to_write);</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;written + sectors_to_write &gt; btree_sectors(c));</div><div class='del'>-	BUG_ON(BSET_BIG_ENDIAN(i) != CPU_BIG_ENDIAN);</div><div class='del'>-	BUG_ON(i-&gt;seq != b-&gt;data-&gt;keys.seq);</div><div class='del'>-</div><div class='del'>-	i-&gt;version = cpu_to_le16(c-&gt;sb.version);</div><div class='del'>-	SET_BSET_OFFSET(i, b-&gt;written);</div><div class='del'>-	SET_BSET_CSUM_TYPE(i, bch2_meta_checksum_type(c));</div><div class='del'>-</div><div class='del'>-	if (bch2_csum_type_is_encryption(BSET_CSUM_TYPE(i)))</div><div class='del'>-		validate_before_checksum = true;</div><div class='del'>-</div><div class='del'>-	/* validate_bset will be modifying: */</div><div class='del'>-	if (le16_to_cpu(i-&gt;version) &lt; bcachefs_metadata_version_current)</div><div class='del'>-		validate_before_checksum = true;</div><div class='del'>-</div><div class='del'>-	/* if we're going to be encrypting, check metadata validity first: */</div><div class='del'>-	if (validate_before_checksum &amp;&amp;</div><div class='del'>-	    validate_bset_for_write(c, b, i, sectors_to_write))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bset_encrypt(c, i, b-&gt;written &lt;&lt; 9);</div><div class='del'>-	if (bch2_fs_fatal_err_on(ret, c,</div><div class='del'>-			"error encrypting btree node: %i\n", ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	nonce = btree_nonce(i, b-&gt;written &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-	if (bn)</div><div class='del'>-		bn-&gt;csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bn);</div><div class='del'>-	else</div><div class='del'>-		bne-&gt;csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne);</div><div class='del'>-</div><div class='del'>-	/* if we're not encrypting, check metadata after checksumming: */</div><div class='del'>-	if (!validate_before_checksum &amp;&amp;</div><div class='del'>-	    validate_bset_for_write(c, b, i, sectors_to_write))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We handle btree write errors by immediately halting the journal -</div><div class='del'>-	 * after we've done that, we can't issue any subsequent btree writes</div><div class='del'>-	 * because they might have pointers to new nodes that failed to write.</div><div class='del'>-	 *</div><div class='del'>-	 * Furthermore, there's no point in doing any more btree writes because</div><div class='del'>-	 * with the journal stopped, we're never going to update the journal to</div><div class='del'>-	 * reflect that those writes were done and the data flushed from the</div><div class='del'>-	 * journal:</div><div class='del'>-	 *</div><div class='del'>-	 * Also on journal error, the pending write may have updates that were</div><div class='del'>-	 * never journalled (interior nodes, see btree_update_nodes_written()) -</div><div class='del'>-	 * it's critical that we don't do the write in that case otherwise we</div><div class='del'>-	 * will have updates visible that weren't in the journal:</div><div class='del'>-	 *</div><div class='del'>-	 * Make sure to update b-&gt;written so bch2_btree_init_next() doesn't</div><div class='del'>-	 * break:</div><div class='del'>-	 */</div><div class='del'>-	if (bch2_journal_error(&amp;c-&gt;journal) ||</div><div class='del'>-	    c-&gt;opts.nochanges)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_write, b, bytes_to_write, sectors_to_write);</div><div class='del'>-</div><div class='del'>-	wbio = container_of(bio_alloc_bioset(NULL,</div><div class='del'>-				buf_pages(data, sectors_to_write &lt;&lt; 9),</div><div class='del'>-				REQ_OP_WRITE|REQ_META,</div><div class='del'>-				GFP_NOFS,</div><div class='del'>-				&amp;c-&gt;btree_bio),</div><div class='del'>-			    struct btree_write_bio, wbio.bio);</div><div class='del'>-	wbio_init(&amp;wbio-&gt;wbio.bio);</div><div class='del'>-	wbio-&gt;data			= data;</div><div class='del'>-	wbio-&gt;data_bytes		= bytes;</div><div class='del'>-	wbio-&gt;sector_offset		= b-&gt;written;</div><div class='del'>-	wbio-&gt;wbio.c			= c;</div><div class='del'>-	wbio-&gt;wbio.used_mempool		= used_mempool;</div><div class='del'>-	wbio-&gt;wbio.first_btree_write	= !b-&gt;written;</div><div class='del'>-	wbio-&gt;wbio.bio.bi_end_io	= btree_node_write_endio;</div><div class='del'>-	wbio-&gt;wbio.bio.bi_private	= b;</div><div class='del'>-</div><div class='del'>-	bch2_bio_map(&amp;wbio-&gt;wbio.bio, data, sectors_to_write &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;wbio-&gt;key, &amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-	b-&gt;written += sectors_to_write;</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;key.k.type == KEY_TYPE_btree_ptr_v2)</div><div class='del'>-		bkey_i_to_btree_ptr_v2(&amp;wbio-&gt;key)-&gt;v.sectors_written =</div><div class='del'>-			cpu_to_le16(b-&gt;written);</div><div class='del'>-</div><div class='del'>-	atomic64_inc(&amp;c-&gt;btree_write_stats[type].nr);</div><div class='del'>-	atomic64_add(bytes_to_write, &amp;c-&gt;btree_write_stats[type].bytes);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;wbio-&gt;work, btree_write_submit);</div><div class='del'>-	queue_work(c-&gt;io_complete_wq, &amp;wbio-&gt;work);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	set_btree_node_noevict(b);</div><div class='del'>-	b-&gt;written += sectors_to_write;</div><div class='del'>-nowrite:</div><div class='del'>-	btree_bounce_free(c, bytes, used_mempool, data);</div><div class='del'>-	__btree_node_write_done(c, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Work that must be done with write lock held:</div><div class='del'>- */</div><div class='del'>-bool bch2_btree_post_write_cleanup(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	bool invalidated_iter = false;</div><div class='del'>-	struct btree_node_entry *bne;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	if (!btree_node_just_written(b))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;whiteout_u64s);</div><div class='del'>-</div><div class='del'>-	clear_btree_node_just_written(b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note: immediately after write, bset_written() doesn't work - the</div><div class='del'>-	 * amount of data we had to write after compaction might have been</div><div class='del'>-	 * smaller than the offset of the last bset.</div><div class='del'>-	 *</div><div class='del'>-	 * However, we know that all bsets have been written here, as long as</div><div class='del'>-	 * we're still holding the write lock:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: decide if we really want to unconditionally sort down to a</div><div class='del'>-	 * single bset:</div><div class='del'>-	 */</div><div class='del'>-	if (b-&gt;nsets &gt; 1) {</div><div class='del'>-		btree_node_sort(c, b, 0, b-&gt;nsets, true);</div><div class='del'>-		invalidated_iter = true;</div><div class='del'>-	} else {</div><div class='del'>-		invalidated_iter = bch2_drop_whiteouts(b, COMPACT_ALL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		set_needs_whiteout(bset(b, t), true);</div><div class='del'>-</div><div class='del'>-	bch2_btree_verify(c, b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If later we don't unconditionally sort down to a single bset, we have</div><div class='del'>-	 * to ensure this is still true:</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON((void *) btree_bkey_last(b, bset_tree_last(b)) &gt; write_block(b));</div><div class='del'>-</div><div class='del'>-	bne = want_new_bset(c, b);</div><div class='del'>-	if (bne)</div><div class='del'>-		bch2_bset_init_next(b, bne);</div><div class='del'>-</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	return invalidated_iter;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use this one if the node is intent locked:</div><div class='del'>- */</div><div class='del'>-void bch2_btree_node_write(struct bch_fs *c, struct btree *b,</div><div class='del'>-			   enum six_lock_type lock_type_held,</div><div class='del'>-			   unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (lock_type_held == SIX_LOCK_intent ||</div><div class='del'>-	    (lock_type_held == SIX_LOCK_read &amp;&amp;</div><div class='del'>-	     six_lock_tryupgrade(&amp;b-&gt;c.lock))) {</div><div class='del'>-		__bch2_btree_node_write(c, b, flags);</div><div class='del'>-</div><div class='del'>-		/* don't cycle lock unnecessarily: */</div><div class='del'>-		if (btree_node_just_written(b) &amp;&amp;</div><div class='del'>-		    six_trylock_write(&amp;b-&gt;c.lock)) {</div><div class='del'>-			bch2_btree_post_write_cleanup(c, b);</div><div class='del'>-			six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (lock_type_held == SIX_LOCK_read)</div><div class='del'>-			six_lock_downgrade(&amp;b-&gt;c.lock);</div><div class='del'>-	} else {</div><div class='del'>-		__bch2_btree_node_write(c, b, flags);</div><div class='del'>-		if (lock_type_held == SIX_LOCK_write &amp;&amp;</div><div class='del'>-		    btree_node_just_written(b))</div><div class='del'>-			bch2_btree_post_write_cleanup(c, b);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool __bch2_btree_flush_all(struct bch_fs *c, unsigned flag)</div><div class='del'>-{</div><div class='del'>-	struct bucket_table *tbl;</div><div class='del'>-	struct rhash_head *pos;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned i;</div><div class='del'>-	bool ret = false;</div><div class='del'>-restart:</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_cached_btree(b, c, tbl, i, pos)</div><div class='del'>-		if (test_bit(flag, &amp;b-&gt;flags)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			wait_on_bit_io(&amp;b-&gt;flags, flag, TASK_UNINTERRUPTIBLE);</div><div class='del'>-			ret = true;</div><div class='del'>-			goto restart;</div><div class='del'>-		}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_flush_all_reads(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return __bch2_btree_flush_all(c, BTREE_NODE_read_in_flight);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_flush_all_writes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return __bch2_btree_flush_all(c, BTREE_NODE_write_in_flight);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char * const bch2_btree_write_types[] = {</div><div class='del'>-#define x(t, n) [n] = #t,</div><div class='del'>-	BCH_BTREE_WRITE_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_btree_write_stats_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	printbuf_tabstop_push(out, 20);</div><div class='del'>-	printbuf_tabstop_push(out, 10);</div><div class='del'>-</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_str(out, "nr");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_str(out, "size");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BTREE_WRITE_TYPE_NR; i++) {</div><div class='del'>-		u64 nr		= atomic64_read(&amp;c-&gt;btree_write_stats[i].nr);</div><div class='del'>-		u64 bytes	= atomic64_read(&amp;c-&gt;btree_write_stats[i].bytes);</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "%s:", bch2_btree_write_types[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, nr);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_human_readable_u64(out, nr ? div64_u64(bytes, nr) : 0);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_io.h b/fs/bcachefs/btree_io.h<br/>deleted file mode 100644<br/>index e251cb6b965f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_io.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,225 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_IO_H</div><div class='del'>-#define _BCACHEFS_BTREE_IO_H</div><div class='del'>-</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "io_write_types.h"</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct btree_write;</div><div class='del'>-struct btree;</div><div class='del'>-struct btree_iter;</div><div class='del'>-struct btree_node_read_all;</div><div class='del'>-</div><div class='del'>-static inline void set_btree_node_dirty_acct(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (!test_and_set_bit(BTREE_NODE_dirty, &amp;b-&gt;flags))</div><div class='del'>-		atomic_inc(&amp;c-&gt;btree_cache.dirty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void clear_btree_node_dirty_acct(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (test_and_clear_bit(BTREE_NODE_dirty, &amp;b-&gt;flags))</div><div class='del'>-		atomic_dec(&amp;c-&gt;btree_cache.dirty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_ptr_sectors_written(struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return k-&gt;k.type == KEY_TYPE_btree_ptr_v2</div><div class='del'>-		? le16_to_cpu(bkey_i_to_btree_ptr_v2(k)-&gt;v.sectors_written)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_read_bio {</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	struct btree		*b;</div><div class='del'>-	struct btree_node_read_all *ra;</div><div class='del'>-	u64			start_time;</div><div class='del'>-	unsigned		have_ioref:1;</div><div class='del'>-	unsigned		idx:7;</div><div class='del'>-	struct extent_ptr_decoded	pick;</div><div class='del'>-	struct work_struct	work;</div><div class='del'>-	struct bio		bio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_write_bio {</div><div class='del'>-	struct work_struct	work;</div><div class='del'>-	__BKEY_PADDED(key, BKEY_BTREE_PTR_VAL_U64s_MAX);</div><div class='del'>-	void			*data;</div><div class='del'>-	unsigned		data_bytes;</div><div class='del'>-	unsigned		sector_offset;</div><div class='del'>-	struct bch_write_bio	wbio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_io_unlock(struct btree *);</div><div class='del'>-void bch2_btree_node_io_lock(struct btree *);</div><div class='del'>-void __bch2_btree_node_wait_on_read(struct btree *);</div><div class='del'>-void __bch2_btree_node_wait_on_write(struct btree *);</div><div class='del'>-void bch2_btree_node_wait_on_read(struct btree *);</div><div class='del'>-void bch2_btree_node_wait_on_write(struct btree *);</div><div class='del'>-</div><div class='del'>-enum compact_mode {</div><div class='del'>-	COMPACT_LAZY,</div><div class='del'>-	COMPACT_ALL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-bool bch2_compact_whiteouts(struct bch_fs *, struct btree *,</div><div class='del'>-			    enum compact_mode);</div><div class='del'>-</div><div class='del'>-static inline bool should_compact_bset_lazy(struct btree *b,</div><div class='del'>-					    struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	unsigned total_u64s = bset_u64s(t);</div><div class='del'>-	unsigned dead_u64s = bset_dead_u64s(b, t);</div><div class='del'>-</div><div class='del'>-	return dead_u64s &gt; 64 &amp;&amp; dead_u64s * 3 &gt; total_u64s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_maybe_compact_whiteouts(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		if (should_compact_bset_lazy(b, t))</div><div class='del'>-			return bch2_compact_whiteouts(c, b, COMPACT_LAZY);</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct nonce btree_nonce(struct bset *i, unsigned offset)</div><div class='del'>-{</div><div class='del'>-	return (struct nonce) {{</div><div class='del'>-		[0] = cpu_to_le32(offset),</div><div class='del'>-		[1] = ((__le32 *) &amp;i-&gt;seq)[0],</div><div class='del'>-		[2] = ((__le32 *) &amp;i-&gt;seq)[1],</div><div class='del'>-		[3] = ((__le32 *) &amp;i-&gt;journal_seq)[0]^BCH_NONCE_BTREE,</div><div class='del'>-	}};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bset_encrypt(struct bch_fs *c, struct bset *i, unsigned offset)</div><div class='del'>-{</div><div class='del'>-	struct nonce nonce = btree_nonce(i, offset);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!offset) {</div><div class='del'>-		struct btree_node *bn = container_of(i, struct btree_node, keys);</div><div class='del'>-		unsigned bytes = (void *) &amp;bn-&gt;keys - (void *) &amp;bn-&gt;flags;</div><div class='del'>-</div><div class='del'>-		ret = bch2_encrypt(c, BSET_CSUM_TYPE(i), nonce,</div><div class='del'>-				   &amp;bn-&gt;flags, bytes);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		nonce = nonce_add(nonce, round_up(bytes, CHACHA_BLOCK_SIZE));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_encrypt(c, BSET_CSUM_TYPE(i), nonce, i-&gt;_data,</div><div class='del'>-			    vstruct_end(i) - (void *) i-&gt;_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_sort_into(struct bch_fs *, struct btree *, struct btree *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_drop_keys_outside_node(struct btree *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_build_aux_trees(struct btree *);</div><div class='del'>-void bch2_btree_init_next(struct btree_trans *, struct btree *);</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_read_done(struct bch_fs *, struct bch_dev *,</div><div class='del'>-			      struct btree *, bool, bool *);</div><div class='del'>-void bch2_btree_node_read(struct btree_trans *, struct btree *, bool);</div><div class='del'>-int bch2_btree_root_read(struct bch_fs *, enum btree_id,</div><div class='del'>-			 const struct bkey_i *, unsigned);</div><div class='del'>-</div><div class='del'>-bool bch2_btree_post_write_cleanup(struct bch_fs *, struct btree *);</div><div class='del'>-</div><div class='del'>-enum btree_write_flags {</div><div class='del'>-	__BTREE_WRITE_ONLY_IF_NEED = BTREE_WRITE_TYPE_BITS,</div><div class='del'>-	__BTREE_WRITE_ALREADY_STARTED,</div><div class='del'>-};</div><div class='del'>-#define BTREE_WRITE_ONLY_IF_NEED	BIT(__BTREE_WRITE_ONLY_IF_NEED)</div><div class='del'>-#define BTREE_WRITE_ALREADY_STARTED	BIT(__BTREE_WRITE_ALREADY_STARTED)</div><div class='del'>-</div><div class='del'>-void __bch2_btree_node_write(struct bch_fs *, struct btree *, unsigned);</div><div class='del'>-void bch2_btree_node_write(struct bch_fs *, struct btree *,</div><div class='del'>-			   enum six_lock_type, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void btree_node_write_if_need(struct bch_fs *c, struct btree *b,</div><div class='del'>-					    enum six_lock_type lock_held)</div><div class='del'>-{</div><div class='del'>-	bch2_btree_node_write(c, b, lock_held, BTREE_WRITE_ONLY_IF_NEED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_flush_all_reads(struct bch_fs *);</div><div class='del'>-bool bch2_btree_flush_all_writes(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline void compat_bformat(unsigned level, enum btree_id btree_id,</div><div class='del'>-				  unsigned version, unsigned big_endian,</div><div class='del'>-				  int write, struct bkey_format *f)</div><div class='del'>-{</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_inode_btree_change &amp;&amp;</div><div class='del'>-	    btree_id == BTREE_ID_inodes) {</div><div class='del'>-		swap(f-&gt;bits_per_field[BKEY_FIELD_INODE],</div><div class='del'>-		     f-&gt;bits_per_field[BKEY_FIELD_OFFSET]);</div><div class='del'>-		swap(f-&gt;field_offset[BKEY_FIELD_INODE],</div><div class='del'>-		     f-&gt;field_offset[BKEY_FIELD_OFFSET]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_snapshot &amp;&amp;</div><div class='del'>-	    (level || btree_type_has_snapshots(btree_id))) {</div><div class='del'>-		u64 max_packed =</div><div class='del'>-			~(~0ULL &lt;&lt; f-&gt;bits_per_field[BKEY_FIELD_SNAPSHOT]);</div><div class='del'>-</div><div class='del'>-		f-&gt;field_offset[BKEY_FIELD_SNAPSHOT] = write</div><div class='del'>-			? 0</div><div class='del'>-			: cpu_to_le64(U32_MAX - max_packed);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void compat_bpos(unsigned level, enum btree_id btree_id,</div><div class='del'>-			       unsigned version, unsigned big_endian,</div><div class='del'>-			       int write, struct bpos *p)</div><div class='del'>-{</div><div class='del'>-	if (big_endian != CPU_BIG_ENDIAN)</div><div class='del'>-		bch2_bpos_swab(p);</div><div class='del'>-</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_inode_btree_change &amp;&amp;</div><div class='del'>-	    btree_id == BTREE_ID_inodes)</div><div class='del'>-		swap(p-&gt;inode, p-&gt;offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void compat_btree_node(unsigned level, enum btree_id btree_id,</div><div class='del'>-				     unsigned version, unsigned big_endian,</div><div class='del'>-				     int write,</div><div class='del'>-				     struct btree_node *bn)</div><div class='del'>-{</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_inode_btree_change &amp;&amp;</div><div class='del'>-	    btree_id_is_extents(btree_id) &amp;&amp;</div><div class='del'>-	    !bpos_eq(bn-&gt;min_key, POS_MIN) &amp;&amp;</div><div class='del'>-	    write)</div><div class='del'>-		bn-&gt;min_key = bpos_nosnap_predecessor(bn-&gt;min_key);</div><div class='del'>-</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_snapshot &amp;&amp;</div><div class='del'>-	    write)</div><div class='del'>-		bn-&gt;max_key.snapshot = 0;</div><div class='del'>-</div><div class='del'>-	compat_bpos(level, btree_id, version, big_endian, write, &amp;bn-&gt;min_key);</div><div class='del'>-	compat_bpos(level, btree_id, version, big_endian, write, &amp;bn-&gt;max_key);</div><div class='del'>-</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_snapshot &amp;&amp;</div><div class='del'>-	    !write)</div><div class='del'>-		bn-&gt;max_key.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_inode_btree_change &amp;&amp;</div><div class='del'>-	    btree_id_is_extents(btree_id) &amp;&amp;</div><div class='del'>-	    !bpos_eq(bn-&gt;min_key, POS_MIN) &amp;&amp;</div><div class='del'>-	    !write)</div><div class='del'>-		bn-&gt;min_key = bpos_nosnap_successor(bn-&gt;min_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_write_stats_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_IO_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c<br/>deleted file mode 100644<br/>index 5467a8635be1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_iter.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_iter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3268 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-</div><div class='del'>-static inline void btree_path_list_remove(struct btree_trans *, struct btree_path *);</div><div class='del'>-static inline void btree_path_list_add(struct btree_trans *,</div><div class='del'>-			btree_path_idx_t, btree_path_idx_t);</div><div class='del'>-</div><div class='del'>-static inline unsigned long btree_iter_ip_allocated(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-#ifdef TRACK_PATH_ALLOCATED</div><div class='del'>-	return iter-&gt;ip_allocated;</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static btree_path_idx_t btree_path_alloc(struct btree_trans *, btree_path_idx_t);</div><div class='del'>-static void bch2_trans_srcu_lock(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-static inline int __btree_path_cmp(const struct btree_path *l,</div><div class='del'>-				   enum btree_id	r_btree_id,</div><div class='del'>-				   bool			r_cached,</div><div class='del'>-				   struct bpos		r_pos,</div><div class='del'>-				   unsigned		r_level)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Must match lock ordering as defined by __bch2_btree_node_lock:</div><div class='del'>-	 */</div><div class='del'>-	return   cmp_int(l-&gt;btree_id,	r_btree_id) ?:</div><div class='del'>-		 cmp_int((int) l-&gt;cached,	(int) r_cached) ?:</div><div class='del'>-		 bpos_cmp(l-&gt;pos,	r_pos) ?:</div><div class='del'>-		-cmp_int(l-&gt;level,	r_level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_path_cmp(const struct btree_path *l,</div><div class='del'>-				 const struct btree_path *r)</div><div class='del'>-{</div><div class='del'>-	return __btree_path_cmp(l, r-&gt;btree_id, r-&gt;cached, r-&gt;pos, r-&gt;level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bkey_successor(struct btree_iter *iter, struct bpos p)</div><div class='del'>-{</div><div class='del'>-	/* Are we iterating over keys in all snapshots? */</div><div class='del'>-	if (iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS) {</div><div class='del'>-		p = bpos_successor(p);</div><div class='del'>-	} else {</div><div class='del'>-		p = bpos_nosnap_successor(p);</div><div class='del'>-		p.snapshot = iter-&gt;snapshot;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos bkey_predecessor(struct btree_iter *iter, struct bpos p)</div><div class='del'>-{</div><div class='del'>-	/* Are we iterating over keys in all snapshots? */</div><div class='del'>-	if (iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS) {</div><div class='del'>-		p = bpos_predecessor(p);</div><div class='del'>-	} else {</div><div class='del'>-		p = bpos_nosnap_predecessor(p);</div><div class='del'>-		p.snapshot = iter-&gt;snapshot;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos btree_iter_search_key(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bpos pos = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-	if ((iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS) &amp;&amp;</div><div class='del'>-	    !bkey_eq(pos, POS_MAX))</div><div class='del'>-		pos = bkey_successor(iter, pos);</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_pos_before_node(struct btree_path *path,</div><div class='del'>-					      struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return bpos_lt(path-&gt;pos, b-&gt;data-&gt;min_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_pos_after_node(struct btree_path *path,</div><div class='del'>-					     struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return bpos_gt(path-&gt;pos, b-&gt;key.k.p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_pos_in_node(struct btree_path *path,</div><div class='del'>-					  struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return path-&gt;btree_id == b-&gt;c.btree_id &amp;&amp;</div><div class='del'>-		!btree_path_pos_before_node(path, b) &amp;&amp;</div><div class='del'>-		!btree_path_pos_after_node(path, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree iterator: */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-</div><div class='del'>-static void bch2_btree_path_verify_cached(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct bkey_cached *ck;</div><div class='del'>-	bool locked = btree_node_locked(path, 0);</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_node_relock(trans, path, 0))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ck = (void *) path-&gt;l[0].b;</div><div class='del'>-	BUG_ON(ck-&gt;key.btree_id != path-&gt;btree_id ||</div><div class='del'>-	       !bkey_eq(ck-&gt;key.pos, path-&gt;pos));</div><div class='del'>-</div><div class='del'>-	if (!locked)</div><div class='del'>-		btree_node_unlock(trans, path, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_path_verify_level(struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct btree_path_level *l;</div><div class='del'>-	struct btree_node_iter tmp;</div><div class='del'>-	bool locked;</div><div class='del'>-	struct bkey_packed *p, *k;</div><div class='del'>-	struct printbuf buf1 = PRINTBUF;</div><div class='del'>-	struct printbuf buf2 = PRINTBUF;</div><div class='del'>-	struct printbuf buf3 = PRINTBUF;</div><div class='del'>-	const char *msg;</div><div class='del'>-</div><div class='del'>-	if (!bch2_debug_check_iterators)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	l	= &amp;path-&gt;l[level];</div><div class='del'>-	tmp	= l-&gt;iter;</div><div class='del'>-	locked	= btree_node_locked(path, level);</div><div class='del'>-</div><div class='del'>-	if (path-&gt;cached) {</div><div class='del'>-		if (!level)</div><div class='del'>-			bch2_btree_path_verify_cached(trans, path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!btree_path_node(path, level))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_node_relock_notrace(trans, path, level))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!btree_path_pos_in_node(path, l-&gt;b));</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_verify(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For interior nodes, the iterator will have skipped past deleted keys:</div><div class='del'>-	 */</div><div class='del'>-	p = level</div><div class='del'>-		? bch2_btree_node_iter_prev(&amp;tmp, l-&gt;b)</div><div class='del'>-		: bch2_btree_node_iter_prev_all(&amp;tmp, l-&gt;b);</div><div class='del'>-	k = bch2_btree_node_iter_peek_all(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-</div><div class='del'>-	if (p &amp;&amp; bkey_iter_pos_cmp(l-&gt;b, p, &amp;path-&gt;pos) &gt;= 0) {</div><div class='del'>-		msg = "before";</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k &amp;&amp; bkey_iter_pos_cmp(l-&gt;b, k, &amp;path-&gt;pos) &lt; 0) {</div><div class='del'>-		msg = "after";</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!locked)</div><div class='del'>-		btree_node_unlock(trans, path, level);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	bch2_bpos_to_text(&amp;buf1, path-&gt;pos);</div><div class='del'>-</div><div class='del'>-	if (p) {</div><div class='del'>-		struct bkey uk = bkey_unpack_key(l-&gt;b, p);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_to_text(&amp;buf2, &amp;uk);</div><div class='del'>-	} else {</div><div class='del'>-		prt_printf(&amp;buf2, "(none)");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k) {</div><div class='del'>-		struct bkey uk = bkey_unpack_key(l-&gt;b, k);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_to_text(&amp;buf3, &amp;uk);</div><div class='del'>-	} else {</div><div class='del'>-		prt_printf(&amp;buf3, "(none)");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	panic("path should be %s key at level %u:\n"</div><div class='del'>-	      "path pos %s\n"</div><div class='del'>-	      "prev key %s\n"</div><div class='del'>-	      "cur  key %s\n",</div><div class='del'>-	      msg, level, buf1.buf, buf2.buf, buf3.buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_path_verify(struct btree_trans *trans,</div><div class='del'>-				   struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;btree_id &gt;= BTREE_ID_NR);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (!path-&gt;cached ? BTREE_MAX_DEPTH : 1); i++) {</div><div class='del'>-		if (!path-&gt;l[i].b) {</div><div class='del'>-			BUG_ON(!path-&gt;cached &amp;&amp;</div><div class='del'>-			       bch2_btree_id_root(c, path-&gt;btree_id)-&gt;b-&gt;c.level &gt; i);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_path_verify_level(trans, path, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_path_verify_locks(path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_verify_paths(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned iter;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, iter)</div><div class='del'>-		bch2_btree_path_verify(trans, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_iter_verify(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-</div><div class='del'>-	BUG_ON(iter-&gt;btree_id &gt;= BTREE_ID_NR);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!!(iter-&gt;flags &amp; BTREE_ITER_CACHED) != btree_iter_path(trans, iter)-&gt;cached);</div><div class='del'>-</div><div class='del'>-	BUG_ON((iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS) &amp;&amp;</div><div class='del'>-	       (iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS));</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(iter-&gt;flags &amp; __BTREE_ITER_ALL_SNAPSHOTS) &amp;&amp;</div><div class='del'>-	       (iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS) &amp;&amp;</div><div class='del'>-	       !btree_type_has_snapshot_field(iter-&gt;btree_id));</div><div class='del'>-</div><div class='del'>-	if (iter-&gt;update_path)</div><div class='del'>-		bch2_btree_path_verify(trans, &amp;trans-&gt;paths[iter-&gt;update_path]);</div><div class='del'>-	bch2_btree_path_verify(trans, btree_iter_path(trans, iter));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_iter_verify_entry_exit(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	BUG_ON((iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS) &amp;&amp;</div><div class='del'>-	       !iter-&gt;pos.snapshot);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS) &amp;&amp;</div><div class='del'>-	       iter-&gt;pos.snapshot != iter-&gt;snapshot);</div><div class='del'>-</div><div class='del'>-	BUG_ON(bkey_lt(iter-&gt;pos, bkey_start_pos(&amp;iter-&gt;k)) ||</div><div class='del'>-	       bkey_gt(iter-&gt;pos, iter-&gt;k.p));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_iter_verify_ret(struct btree_iter *iter, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct btree_iter copy;</div><div class='del'>-	struct bkey_s_c prev;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_debug_check_iterators)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!(iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bkey_err(k) || !k.k)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bch2_snapshot_is_ancestor(trans-&gt;c,</div><div class='del'>-					  iter-&gt;snapshot,</div><div class='del'>-					  k.k-&gt;p.snapshot));</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;copy, iter-&gt;btree_id, iter-&gt;pos,</div><div class='del'>-			     BTREE_ITER_NOPRESERVE|</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-	prev = bch2_btree_iter_prev(&amp;copy);</div><div class='del'>-	if (!prev.k)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bkey_err(prev);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (bkey_eq(prev.k-&gt;p, k.k-&gt;p) &amp;&amp;</div><div class='del'>-	    bch2_snapshot_is_ancestor(trans-&gt;c, iter-&gt;snapshot,</div><div class='del'>-				      prev.k-&gt;p.snapshot) &gt; 0) {</div><div class='del'>-		struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_to_text(&amp;buf1, k.k);</div><div class='del'>-		bch2_bkey_to_text(&amp;buf2, prev.k);</div><div class='del'>-</div><div class='del'>-		panic("iter snap %u\n"</div><div class='del'>-		      "k    %s\n"</div><div class='del'>-		      "prev %s\n",</div><div class='del'>-		      iter-&gt;snapshot,</div><div class='del'>-		      buf1.buf, buf2.buf);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;copy);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_assert_pos_locked(struct btree_trans *trans, enum btree_id id,</div><div class='del'>-			    struct bpos pos, bool key_cache)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	struct trans_for_each_path_inorder_iter iter;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	btree_trans_sort_paths(trans);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_inorder(trans, path, iter) {</div><div class='del'>-		int cmp = cmp_int(path-&gt;btree_id, id) ?:</div><div class='del'>-			cmp_int(path-&gt;cached, key_cache);</div><div class='del'>-</div><div class='del'>-		if (cmp &gt; 0)</div><div class='del'>-			break;</div><div class='del'>-		if (cmp &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!btree_node_locked(path, 0) ||</div><div class='del'>-		    !path-&gt;should_be_locked)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!key_cache) {</div><div class='del'>-			if (bkey_ge(pos, path-&gt;l[0].b-&gt;data-&gt;min_key) &amp;&amp;</div><div class='del'>-			    bkey_le(pos, path-&gt;l[0].b-&gt;key.k.p))</div><div class='del'>-				return;</div><div class='del'>-		} else {</div><div class='del'>-			if (bkey_eq(pos, path-&gt;pos))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_dump_trans_paths_updates(trans);</div><div class='del'>-	bch2_bpos_to_text(&amp;buf, pos);</div><div class='del'>-</div><div class='del'>-	panic("not locked: %s %s%s\n",</div><div class='del'>-	      bch2_btree_id_str(id), buf.buf,</div><div class='del'>-	      key_cache ? " cached" : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_path_verify_level(struct btree_trans *trans,</div><div class='del'>-						struct btree_path *path, unsigned l) {}</div><div class='del'>-static inline void bch2_btree_path_verify(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path) {}</div><div class='del'>-static inline void bch2_btree_iter_verify(struct btree_iter *iter) {}</div><div class='del'>-static inline void bch2_btree_iter_verify_entry_exit(struct btree_iter *iter) {}</div><div class='del'>-static inline int bch2_btree_iter_verify_ret(struct btree_iter *iter, struct bkey_s_c k) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Btree path: fixups after btree updates */</div><div class='del'>-</div><div class='del'>-static void btree_node_iter_set_set_pos(struct btree_node_iter *iter,</div><div class='del'>-					struct btree *b,</div><div class='del'>-					struct bset_tree *t,</div><div class='del'>-					struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter_set *set;</div><div class='del'>-</div><div class='del'>-	btree_node_iter_for_each(iter, set)</div><div class='del'>-		if (set-&gt;end == t-&gt;end_offset) {</div><div class='del'>-			set-&gt;k = __btree_node_key_to_offset(b, k);</div><div class='del'>-			bch2_btree_node_iter_sort(iter, b);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_push(iter, b, k, btree_bkey_last(b, t));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_btree_path_fix_key_modified(struct btree_path *path,</div><div class='del'>-					       struct btree *b,</div><div class='del'>-					       struct bkey_packed *where)</div><div class='del'>-{</div><div class='del'>-	struct btree_path_level *l = &amp;path-&gt;l[b-&gt;c.level];</div><div class='del'>-</div><div class='del'>-	if (where != bch2_btree_node_iter_peek_all(&amp;l-&gt;iter, l-&gt;b))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (bkey_iter_pos_cmp(l-&gt;b, where, &amp;path-&gt;pos) &lt; 0)</div><div class='del'>-		bch2_btree_node_iter_advance(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_path_fix_key_modified(struct btree_trans *trans,</div><div class='del'>-				      struct btree *b,</div><div class='del'>-				      struct bkey_packed *where)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_with_node(trans, b, path, i) {</div><div class='del'>-		__bch2_btree_path_fix_key_modified(path, b, where);</div><div class='del'>-		bch2_btree_path_verify_level(trans, path, b-&gt;c.level);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_btree_node_iter_fix(struct btree_path *path,</div><div class='del'>-				       struct btree *b,</div><div class='del'>-				       struct btree_node_iter *node_iter,</div><div class='del'>-				       struct bset_tree *t,</div><div class='del'>-				       struct bkey_packed *where,</div><div class='del'>-				       unsigned clobber_u64s,</div><div class='del'>-				       unsigned new_u64s)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_packed *end = btree_bkey_last(b, t);</div><div class='del'>-	struct btree_node_iter_set *set;</div><div class='del'>-	unsigned offset = __btree_node_key_to_offset(b, where);</div><div class='del'>-	int shift = new_u64s - clobber_u64s;</div><div class='del'>-	unsigned old_end = t-&gt;end_offset - shift;</div><div class='del'>-	unsigned orig_iter_pos = node_iter-&gt;data[0].k;</div><div class='del'>-	bool iter_current_key_modified =</div><div class='del'>-		orig_iter_pos &gt;= offset &amp;&amp;</div><div class='del'>-		orig_iter_pos &lt;= offset + clobber_u64s;</div><div class='del'>-</div><div class='del'>-	btree_node_iter_for_each(node_iter, set)</div><div class='del'>-		if (set-&gt;end == old_end)</div><div class='del'>-			goto found;</div><div class='del'>-</div><div class='del'>-	/* didn't find the bset in the iterator - might have to readd it: */</div><div class='del'>-	if (new_u64s &amp;&amp;</div><div class='del'>-	    bkey_iter_pos_cmp(b, where, &amp;path-&gt;pos) &gt;= 0) {</div><div class='del'>-		bch2_btree_node_iter_push(node_iter, b, where, end);</div><div class='del'>-		goto fixup_done;</div><div class='del'>-	} else {</div><div class='del'>-		/* Iterator is after key that changed */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-found:</div><div class='del'>-	set-&gt;end = t-&gt;end_offset;</div><div class='del'>-</div><div class='del'>-	/* Iterator hasn't gotten to the key that changed yet: */</div><div class='del'>-	if (set-&gt;k &lt; offset)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (new_u64s &amp;&amp;</div><div class='del'>-	    bkey_iter_pos_cmp(b, where, &amp;path-&gt;pos) &gt;= 0) {</div><div class='del'>-		set-&gt;k = offset;</div><div class='del'>-	} else if (set-&gt;k &lt; offset + clobber_u64s) {</div><div class='del'>-		set-&gt;k = offset + new_u64s;</div><div class='del'>-		if (set-&gt;k == set-&gt;end)</div><div class='del'>-			bch2_btree_node_iter_set_drop(node_iter, set);</div><div class='del'>-	} else {</div><div class='del'>-		/* Iterator is after key that changed */</div><div class='del'>-		set-&gt;k = (int) set-&gt;k + shift;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_sort(node_iter, b);</div><div class='del'>-fixup_done:</div><div class='del'>-	if (node_iter-&gt;data[0].k != orig_iter_pos)</div><div class='del'>-		iter_current_key_modified = true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When a new key is added, and the node iterator now points to that</div><div class='del'>-	 * key, the iterator might have skipped past deleted keys that should</div><div class='del'>-	 * come after the key the iterator now points to. We have to rewind to</div><div class='del'>-	 * before those deleted keys - otherwise</div><div class='del'>-	 * bch2_btree_node_iter_prev_all() breaks:</div><div class='del'>-	 */</div><div class='del'>-	if (!bch2_btree_node_iter_end(node_iter) &amp;&amp;</div><div class='del'>-	    iter_current_key_modified &amp;&amp;</div><div class='del'>-	    b-&gt;c.level) {</div><div class='del'>-		struct bkey_packed *k, *k2, *p;</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_node_iter_peek_all(node_iter, b);</div><div class='del'>-</div><div class='del'>-		for_each_bset(b, t) {</div><div class='del'>-			bool set_pos = false;</div><div class='del'>-</div><div class='del'>-			if (node_iter-&gt;data[0].end == t-&gt;end_offset)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			k2 = bch2_btree_node_iter_bset_pos(node_iter, b, t);</div><div class='del'>-</div><div class='del'>-			while ((p = bch2_bkey_prev_all(b, t, k2)) &amp;&amp;</div><div class='del'>-			       bkey_iter_cmp(b, k, p) &lt; 0) {</div><div class='del'>-				k2 = p;</div><div class='del'>-				set_pos = true;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (set_pos)</div><div class='del'>-				btree_node_iter_set_set_pos(node_iter,</div><div class='del'>-							    b, t, k2);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_iter_fix(struct btree_trans *trans,</div><div class='del'>-			      struct btree_path *path,</div><div class='del'>-			      struct btree *b,</div><div class='del'>-			      struct btree_node_iter *node_iter,</div><div class='del'>-			      struct bkey_packed *where,</div><div class='del'>-			      unsigned clobber_u64s,</div><div class='del'>-			      unsigned new_u64s)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t = bch2_bkey_to_bset_inlined(b, where);</div><div class='del'>-	struct btree_path *linked;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (node_iter != &amp;path-&gt;l[b-&gt;c.level].iter) {</div><div class='del'>-		__bch2_btree_node_iter_fix(path, b, node_iter, t,</div><div class='del'>-					   where, clobber_u64s, new_u64s);</div><div class='del'>-</div><div class='del'>-		if (bch2_debug_check_iterators)</div><div class='del'>-			bch2_btree_node_iter_verify(node_iter, b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_with_node(trans, b, linked, i) {</div><div class='del'>-		__bch2_btree_node_iter_fix(linked, b,</div><div class='del'>-					   &amp;linked-&gt;l[b-&gt;c.level].iter, t,</div><div class='del'>-					   where, clobber_u64s, new_u64s);</div><div class='del'>-		bch2_btree_path_verify_level(trans, linked, b-&gt;c.level);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree path level: pointer to a particular btree node and node iter */</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c __btree_iter_unpack(struct bch_fs *c,</div><div class='del'>-						  struct btree_path_level *l,</div><div class='del'>-						  struct bkey *u,</div><div class='del'>-						  struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!k)) {</div><div class='del'>-		/*</div><div class='del'>-		 * signal to bch2_btree_iter_peek_slot() that we're currently at</div><div class='del'>-		 * a hole</div><div class='del'>-		 */</div><div class='del'>-		u-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bkey_disassemble(l-&gt;b, k, u);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c btree_path_level_peek_all(struct bch_fs *c,</div><div class='del'>-							struct btree_path_level *l,</div><div class='del'>-							struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	return __btree_iter_unpack(c, l, u,</div><div class='del'>-			bch2_btree_node_iter_peek_all(&amp;l-&gt;iter, l-&gt;b));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c btree_path_level_peek(struct btree_trans *trans,</div><div class='del'>-						    struct btree_path *path,</div><div class='del'>-						    struct btree_path_level *l,</div><div class='del'>-						    struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k = __btree_iter_unpack(trans-&gt;c, l, u,</div><div class='del'>-			bch2_btree_node_iter_peek(&amp;l-&gt;iter, l-&gt;b));</div><div class='del'>-</div><div class='del'>-	path-&gt;pos = k.k ? k.k-&gt;p : l-&gt;b-&gt;key.k.p;</div><div class='del'>-	trans-&gt;paths_sorted = false;</div><div class='del'>-	bch2_btree_path_verify_level(trans, path, l - path-&gt;l);</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c btree_path_level_prev(struct btree_trans *trans,</div><div class='del'>-						    struct btree_path *path,</div><div class='del'>-						    struct btree_path_level *l,</div><div class='del'>-						    struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k = __btree_iter_unpack(trans-&gt;c, l, u,</div><div class='del'>-			bch2_btree_node_iter_prev(&amp;l-&gt;iter, l-&gt;b));</div><div class='del'>-</div><div class='del'>-	path-&gt;pos = k.k ? k.k-&gt;p : l-&gt;b-&gt;data-&gt;min_key;</div><div class='del'>-	trans-&gt;paths_sorted = false;</div><div class='del'>-	bch2_btree_path_verify_level(trans, path, l - path-&gt;l);</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_advance_to_pos(struct btree_path *path,</div><div class='del'>-					     struct btree_path_level *l,</div><div class='del'>-					     int max_advance)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	int nr_advanced = 0;</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_node_iter_peek_all(&amp;l-&gt;iter, l-&gt;b)) &amp;&amp;</div><div class='del'>-	       bkey_iter_pos_cmp(l-&gt;b, k, &amp;path-&gt;pos) &lt; 0) {</div><div class='del'>-		if (max_advance &gt; 0 &amp;&amp; nr_advanced &gt;= max_advance)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_iter_advance(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-		nr_advanced++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __btree_path_level_init(struct btree_path *path,</div><div class='del'>-					   unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct btree_path_level *l = &amp;path-&gt;l[level];</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_init(&amp;l-&gt;iter, l-&gt;b, &amp;path-&gt;pos);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Iterators to interior nodes should always be pointed at the first non</div><div class='del'>-	 * whiteout:</div><div class='del'>-	 */</div><div class='del'>-	if (level)</div><div class='del'>-		bch2_btree_node_iter_peek(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_path_level_init(struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path,</div><div class='del'>-				struct btree *b)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(path-&gt;cached);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!btree_path_pos_in_node(path, b));</div><div class='del'>-</div><div class='del'>-	path-&gt;l[b-&gt;c.level].lock_seq = six_lock_seq(&amp;b-&gt;c.lock);</div><div class='del'>-	path-&gt;l[b-&gt;c.level].b = b;</div><div class='del'>-	__btree_path_level_init(path, b-&gt;c.level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree path: fixups after btree node updates: */</div><div class='del'>-</div><div class='del'>-static void bch2_trans_revalidate_updates_in_node(struct btree_trans *trans, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (!i-&gt;cached &amp;&amp;</div><div class='del'>-		    i-&gt;level	== b-&gt;c.level &amp;&amp;</div><div class='del'>-		    i-&gt;btree_id	== b-&gt;c.btree_id &amp;&amp;</div><div class='del'>-		    bpos_cmp(i-&gt;k-&gt;k.p, b-&gt;data-&gt;min_key) &gt;= 0 &amp;&amp;</div><div class='del'>-		    bpos_cmp(i-&gt;k-&gt;k.p, b-&gt;data-&gt;max_key) &lt;= 0) {</div><div class='del'>-			i-&gt;old_v = bch2_btree_path_peek_slot(trans-&gt;paths + i-&gt;path, &amp;i-&gt;old_k).v;</div><div class='del'>-</div><div class='del'>-			if (unlikely(trans-&gt;journal_replay_not_finished)) {</div><div class='del'>-				struct bkey_i *j_k =</div><div class='del'>-					bch2_journal_keys_peek_slot(c, i-&gt;btree_id, i-&gt;level,</div><div class='del'>-								    i-&gt;k-&gt;k.p);</div><div class='del'>-</div><div class='del'>-				if (j_k) {</div><div class='del'>-					i-&gt;old_k = j_k-&gt;k;</div><div class='del'>-					i-&gt;old_v = &amp;j_k-&gt;v;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A btree node is being replaced - update the iterator to point to the new</div><div class='del'>- * node:</div><div class='del'>- */</div><div class='del'>-void bch2_trans_node_add(struct btree_trans *trans,</div><div class='del'>-			 struct btree_path *path,</div><div class='del'>-			 struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *prev;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!btree_path_pos_in_node(path, b));</div><div class='del'>-</div><div class='del'>-	while ((prev = prev_btree_path(trans, path)) &amp;&amp;</div><div class='del'>-	       btree_path_pos_in_node(prev, b))</div><div class='del'>-		path = prev;</div><div class='del'>-</div><div class='del'>-	for (;</div><div class='del'>-	     path &amp;&amp; btree_path_pos_in_node(path, b);</div><div class='del'>-	     path = next_btree_path(trans, path))</div><div class='del'>-		if (path-&gt;uptodate == BTREE_ITER_UPTODATE &amp;&amp; !path-&gt;cached) {</div><div class='del'>-			enum btree_node_locked_type t =</div><div class='del'>-				btree_lock_want(path, b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-			if (t != BTREE_NODE_UNLOCKED) {</div><div class='del'>-				btree_node_unlock(trans, path, b-&gt;c.level);</div><div class='del'>-				six_lock_increment(&amp;b-&gt;c.lock, (enum six_lock_type) t);</div><div class='del'>-				mark_btree_node_locked(trans, path, b-&gt;c.level, t);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bch2_btree_path_level_init(trans, path, b);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	bch2_trans_revalidate_updates_in_node(trans, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A btree node has been modified in such a way as to invalidate iterators - fix</div><div class='del'>- * them:</div><div class='del'>- */</div><div class='del'>-void bch2_trans_node_reinit_iter(struct btree_trans *trans, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_with_node(trans, b, path, i)</div><div class='del'>-		__btree_path_level_init(path, b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-	bch2_trans_revalidate_updates_in_node(trans, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree path: traverse, set_pos: */</div><div class='del'>-</div><div class='del'>-static inline int btree_path_lock_root(struct btree_trans *trans,</div><div class='del'>-				       struct btree_path *path,</div><div class='del'>-				       unsigned depth_want,</div><div class='del'>-				       unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *b, **rootp = &amp;bch2_btree_id_root(c, path-&gt;btree_id)-&gt;b;</div><div class='del'>-	enum six_lock_type lock_type;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;nodes_locked);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		b = READ_ONCE(*rootp);</div><div class='del'>-		path-&gt;level = READ_ONCE(b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-		if (unlikely(path-&gt;level &lt; depth_want)) {</div><div class='del'>-			/*</div><div class='del'>-			 * the root is at a lower depth than the depth we want:</div><div class='del'>-			 * got to the end of the btree, or we're walking nodes</div><div class='del'>-			 * greater than some depth and there are no nodes &gt;=</div><div class='del'>-			 * that depth</div><div class='del'>-			 */</div><div class='del'>-			path-&gt;level = depth_want;</div><div class='del'>-			for (i = path-&gt;level; i &lt; BTREE_MAX_DEPTH; i++)</div><div class='del'>-				path-&gt;l[i].b = NULL;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lock_type = __btree_lock_want(path, path-&gt;level);</div><div class='del'>-		ret = btree_node_lock(trans, path, &amp;b-&gt;c,</div><div class='del'>-				      path-&gt;level, lock_type, trace_ip);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_lock_fail_root_changed))</div><div class='del'>-				continue;</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				return ret;</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (likely(b == READ_ONCE(*rootp) &amp;&amp;</div><div class='del'>-			   b-&gt;c.level == path-&gt;level &amp;&amp;</div><div class='del'>-			   !race_fault())) {</div><div class='del'>-			for (i = 0; i &lt; path-&gt;level; i++)</div><div class='del'>-				path-&gt;l[i].b = ERR_PTR(-BCH_ERR_no_btree_node_lock_root);</div><div class='del'>-			path-&gt;l[path-&gt;level].b = b;</div><div class='del'>-			for (i = path-&gt;level + 1; i &lt; BTREE_MAX_DEPTH; i++)</div><div class='del'>-				path-&gt;l[i].b = NULL;</div><div class='del'>-</div><div class='del'>-			mark_btree_node_locked(trans, path, path-&gt;level,</div><div class='del'>-					       (enum btree_node_locked_type) lock_type);</div><div class='del'>-			bch2_btree_path_level_init(trans, path, b);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		six_unlock_type(&amp;b-&gt;c.lock, lock_type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline</div><div class='del'>-static int btree_path_prefetch(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_path_level *l = path_l(path);</div><div class='del'>-	struct btree_node_iter node_iter = l-&gt;iter;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct bkey_buf tmp;</div><div class='del'>-	unsigned nr = test_bit(BCH_FS_started, &amp;c-&gt;flags)</div><div class='del'>-		? (path-&gt;level &gt; 1 ? 0 :  2)</div><div class='del'>-		: (path-&gt;level &gt; 1 ? 1 : 16);</div><div class='del'>-	bool was_locked = btree_node_locked(path, path-&gt;level);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;tmp);</div><div class='del'>-</div><div class='del'>-	while (nr-- &amp;&amp; !ret) {</div><div class='del'>-		if (!bch2_btree_node_relock(trans, path, path-&gt;level))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_iter_advance(&amp;node_iter, l-&gt;b);</div><div class='del'>-		k = bch2_btree_node_iter_peek(&amp;node_iter, l-&gt;b);</div><div class='del'>-		if (!k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_unpack(&amp;tmp, c, l-&gt;b, k);</div><div class='del'>-		ret = bch2_btree_node_prefetch(trans, path, tmp.k, path-&gt;btree_id,</div><div class='del'>-					       path-&gt;level - 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!was_locked)</div><div class='del'>-		btree_node_unlock(trans, path, path-&gt;level);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;tmp, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_path_prefetch_j(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-				 struct btree_and_journal_iter *jiter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf tmp;</div><div class='del'>-	unsigned nr = test_bit(BCH_FS_started, &amp;c-&gt;flags)</div><div class='del'>-		? (path-&gt;level &gt; 1 ? 0 :  2)</div><div class='del'>-		: (path-&gt;level &gt; 1 ? 1 : 16);</div><div class='del'>-	bool was_locked = btree_node_locked(path, path-&gt;level);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;tmp);</div><div class='del'>-</div><div class='del'>-	while (nr-- &amp;&amp; !ret) {</div><div class='del'>-		if (!bch2_btree_node_relock(trans, path, path-&gt;level))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_btree_and_journal_iter_advance(jiter);</div><div class='del'>-		k = bch2_btree_and_journal_iter_peek(jiter);</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;tmp, c, k);</div><div class='del'>-		ret = bch2_btree_node_prefetch(trans, path, tmp.k, path-&gt;btree_id,</div><div class='del'>-					       path-&gt;level - 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!was_locked)</div><div class='del'>-		btree_node_unlock(trans, path, path-&gt;level);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;tmp, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void btree_node_mem_ptr_set(struct btree_trans *trans,</div><div class='del'>-					    struct btree_path *path,</div><div class='del'>-					    unsigned plevel, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_path_level *l = &amp;path-&gt;l[plevel];</div><div class='del'>-	bool locked = btree_node_locked(path, plevel);</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct bch_btree_ptr_v2 *bp;</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_node_relock(trans, path, plevel))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_node_iter_peek_all(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-	BUG_ON(k-&gt;type != KEY_TYPE_btree_ptr_v2);</div><div class='del'>-</div><div class='del'>-	bp = (void *) bkeyp_val(&amp;l-&gt;b-&gt;format, k);</div><div class='del'>-	bp-&gt;mem_ptr = (unsigned long)b;</div><div class='del'>-</div><div class='del'>-	if (!locked)</div><div class='del'>-		btree_node_unlock(trans, path, plevel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int btree_node_iter_and_journal_peek(struct btree_trans *trans,</div><div class='del'>-						     struct btree_path *path,</div><div class='del'>-						     unsigned flags,</div><div class='del'>-						     struct bkey_buf *out)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_path_level *l = path_l(path);</div><div class='del'>-	struct btree_and_journal_iter jiter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	__bch2_btree_and_journal_iter_init_node_iter(&amp;jiter, c, l-&gt;b, l-&gt;iter, path-&gt;pos);</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_and_journal_iter_peek(&amp;jiter);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_reassemble(out, c, k);</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; BTREE_ITER_PREFETCH) &amp;&amp;</div><div class='del'>-	    c-&gt;opts.btree_node_prefetch)</div><div class='del'>-		ret = btree_path_prefetch_j(trans, path, &amp;jiter);</div><div class='del'>-</div><div class='del'>-	bch2_btree_and_journal_iter_exit(&amp;jiter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int btree_path_down(struct btree_trans *trans,</div><div class='del'>-					   struct btree_path *path,</div><div class='del'>-					   unsigned flags,</div><div class='del'>-					   unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_path_level *l = path_l(path);</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned level = path-&gt;level - 1;</div><div class='del'>-	enum six_lock_type lock_type = __btree_lock_want(path, level);</div><div class='del'>-	struct bkey_buf tmp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!btree_node_locked(path, path-&gt;level));</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;tmp);</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;journal_replay_not_finished)) {</div><div class='del'>-		ret = btree_node_iter_and_journal_peek(trans, path, flags, &amp;tmp);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_bkey_buf_unpack(&amp;tmp, c, l-&gt;b,</div><div class='del'>-				 bch2_btree_node_iter_peek(&amp;l-&gt;iter, l-&gt;b));</div><div class='del'>-</div><div class='del'>-		if ((flags &amp; BTREE_ITER_PREFETCH) &amp;&amp;</div><div class='del'>-		    c-&gt;opts.btree_node_prefetch) {</div><div class='del'>-			ret = btree_path_prefetch(trans, path);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_node_get(trans, path, tmp.k, level, lock_type, trace_ip);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(b);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (likely(!trans-&gt;journal_replay_not_finished &amp;&amp;</div><div class='del'>-		   tmp.k-&gt;k.type == KEY_TYPE_btree_ptr_v2) &amp;&amp;</div><div class='del'>-	    unlikely(b != btree_node_mem_ptr(tmp.k)))</div><div class='del'>-		btree_node_mem_ptr_set(trans, path, level + 1, b);</div><div class='del'>-</div><div class='del'>-	if (btree_node_read_locked(path, level + 1))</div><div class='del'>-		btree_node_unlock(trans, path, level + 1);</div><div class='del'>-</div><div class='del'>-	mark_btree_node_locked(trans, path, level,</div><div class='del'>-			       (enum btree_node_locked_type) lock_type);</div><div class='del'>-	path-&gt;level = level;</div><div class='del'>-	bch2_btree_path_level_init(trans, path, b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_path_verify_locks(path);</div><div class='del'>-err:</div><div class='del'>-	bch2_bkey_buf_exit(&amp;tmp, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int bch2_btree_path_traverse_all(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned long trace_ip = _RET_IP_;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;in_traverse_all)</div><div class='del'>-		return -BCH_ERR_transaction_restart_in_traverse_all;</div><div class='del'>-</div><div class='del'>-	trans-&gt;in_traverse_all = true;</div><div class='del'>-retry_all:</div><div class='del'>-	trans-&gt;restarted = 0;</div><div class='del'>-	trans-&gt;last_restarted_ip = 0;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		path-&gt;should_be_locked = false;</div><div class='del'>-</div><div class='del'>-	btree_trans_sort_paths(trans);</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-	cond_resched();</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;memory_allocation_failure)) {</div><div class='del'>-		struct closure cl;</div><div class='del'>-</div><div class='del'>-		closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			ret = bch2_btree_cache_cannibalize_lock(trans, &amp;cl);</div><div class='del'>-			closure_sync(&amp;cl);</div><div class='del'>-		} while (ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now, redo traversals in correct order: */</div><div class='del'>-	i = 0;</div><div class='del'>-	while (i &lt; trans-&gt;nr_sorted) {</div><div class='del'>-		btree_path_idx_t idx = trans-&gt;sorted[i];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Traversing a path can cause another path to be added at about</div><div class='del'>-		 * the same position:</div><div class='del'>-		 */</div><div class='del'>-		if (trans-&gt;paths[idx].uptodate) {</div><div class='del'>-			__btree_path_get(&amp;trans-&gt;paths[idx], false);</div><div class='del'>-			ret = bch2_btree_path_traverse_one(trans, idx, 0, _THIS_IP_);</div><div class='del'>-			__btree_path_put(&amp;trans-&gt;paths[idx], false);</div><div class='del'>-</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart) ||</div><div class='del'>-			    bch2_err_matches(ret, ENOMEM))</div><div class='del'>-				goto retry_all;</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		} else {</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We used to assert that all paths had been traversed here</div><div class='del'>-	 * (path-&gt;uptodate &lt; BTREE_ITER_NEED_TRAVERSE); however, since</div><div class='del'>-	 * path-&gt;should_be_locked is not set yet, we might have unlocked and</div><div class='del'>-	 * then failed to relock a path - that's fine.</div><div class='del'>-	 */</div><div class='del'>-err:</div><div class='del'>-	bch2_btree_cache_cannibalize_unlock(trans);</div><div class='del'>-</div><div class='del'>-	trans-&gt;in_traverse_all = false;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, trans_traverse_all, trans, trace_ip);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_check_pos_in_node(struct btree_path *path,</div><div class='del'>-						unsigned l, int check_pos)</div><div class='del'>-{</div><div class='del'>-	if (check_pos &lt; 0 &amp;&amp; btree_path_pos_before_node(path, path-&gt;l[l].b))</div><div class='del'>-		return false;</div><div class='del'>-	if (check_pos &gt; 0 &amp;&amp; btree_path_pos_after_node(path, path-&gt;l[l].b))</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_good_node(struct btree_trans *trans,</div><div class='del'>-					struct btree_path *path,</div><div class='del'>-					unsigned l, int check_pos)</div><div class='del'>-{</div><div class='del'>-	return is_btree_node(path, l) &amp;&amp;</div><div class='del'>-		bch2_btree_node_relock(trans, path, l) &amp;&amp;</div><div class='del'>-		btree_path_check_pos_in_node(path, l, check_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_path_set_level_down(struct btree_trans *trans,</div><div class='del'>-				      struct btree_path *path,</div><div class='del'>-				      unsigned new_level)</div><div class='del'>-{</div><div class='del'>-	unsigned l;</div><div class='del'>-</div><div class='del'>-	path-&gt;level = new_level;</div><div class='del'>-</div><div class='del'>-	for (l = path-&gt;level + 1; l &lt; BTREE_MAX_DEPTH; l++)</div><div class='del'>-		if (btree_lock_want(path, l) == BTREE_NODE_UNLOCKED)</div><div class='del'>-			btree_node_unlock(trans, path, l);</div><div class='del'>-</div><div class='del'>-	btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-	bch2_btree_path_verify(trans, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline unsigned __btree_path_up_until_good_node(struct btree_trans *trans,</div><div class='del'>-							 struct btree_path *path,</div><div class='del'>-							 int check_pos)</div><div class='del'>-{</div><div class='del'>-	unsigned i, l = path-&gt;level;</div><div class='del'>-again:</div><div class='del'>-	while (btree_path_node(path, l) &amp;&amp;</div><div class='del'>-	       !btree_path_good_node(trans, path, l, check_pos))</div><div class='del'>-		__btree_path_set_level_up(trans, path, l++);</div><div class='del'>-</div><div class='del'>-	/* If we need intent locks, take them too: */</div><div class='del'>-	for (i = l + 1;</div><div class='del'>-	     i &lt; path-&gt;locks_want &amp;&amp; btree_path_node(path, i);</div><div class='del'>-	     i++)</div><div class='del'>-		if (!bch2_btree_node_relock(trans, path, i)) {</div><div class='del'>-			while (l &lt;= i)</div><div class='del'>-				__btree_path_set_level_up(trans, path, l++);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_path_up_until_good_node(struct btree_trans *trans,</div><div class='del'>-						     struct btree_path *path,</div><div class='del'>-						     int check_pos)</div><div class='del'>-{</div><div class='del'>-	return likely(btree_node_locked(path, path-&gt;level) &amp;&amp;</div><div class='del'>-		      btree_path_check_pos_in_node(path, path-&gt;level, check_pos))</div><div class='del'>-		? path-&gt;level</div><div class='del'>-		: __btree_path_up_until_good_node(trans, path, check_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the main state machine for walking down the btree - walks down to a</div><div class='del'>- * specified depth</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, -EIO on error (error reading in a btree node).</div><div class='del'>- *</div><div class='del'>- * On error, caller (peek_node()/peek_key()) must return NULL; the error is</div><div class='del'>- * stashed in the iterator and returned from bch2_trans_exit().</div><div class='del'>- */</div><div class='del'>-int bch2_btree_path_traverse_one(struct btree_trans *trans,</div><div class='del'>-				 btree_path_idx_t path_idx,</div><div class='del'>-				 unsigned flags,</div><div class='del'>-				 unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = &amp;trans-&gt;paths[path_idx];</div><div class='del'>-	unsigned depth_want = path-&gt;level;</div><div class='del'>-	int ret = -((int) trans-&gt;restarted);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!trans-&gt;srcu_held))</div><div class='del'>-		bch2_trans_srcu_lock(trans);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure we obey path-&gt;should_be_locked: if it's set, we can't unlock</div><div class='del'>-	 * and re-traverse the path without a transaction restart:</div><div class='del'>-	 */</div><div class='del'>-	if (path-&gt;should_be_locked) {</div><div class='del'>-		ret = bch2_btree_path_relock(trans, path, trace_ip);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (path-&gt;cached) {</div><div class='del'>-		ret = bch2_btree_path_traverse_cached(trans, path, flags);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path = &amp;trans-&gt;paths[path_idx];</div><div class='del'>-</div><div class='del'>-	if (unlikely(path-&gt;level &gt;= BTREE_MAX_DEPTH))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	path-&gt;level = btree_path_up_until_good_node(trans, path, 0);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(btree_path_node(path, path-&gt;level) &amp;&amp;</div><div class='del'>-		!btree_node_locked(path, path-&gt;level));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note: path-&gt;nodes[path-&gt;level] may be temporarily NULL here - that</div><div class='del'>-	 * would indicate to other code that we got to the end of the btree,</div><div class='del'>-	 * here it indicates that relocking the root failed - it's critical that</div><div class='del'>-	 * btree_path_lock_root() comes next and that it can't fail</div><div class='del'>-	 */</div><div class='del'>-	while (path-&gt;level &gt; depth_want) {</div><div class='del'>-		ret = btree_path_node(path, path-&gt;level)</div><div class='del'>-			? btree_path_down(trans, path, flags, trace_ip)</div><div class='del'>-			: btree_path_lock_root(trans, path, depth_want, trace_ip);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			if (ret == 1) {</div><div class='del'>-				/*</div><div class='del'>-				 * No nodes at this level - got to the end of</div><div class='del'>-				 * the btree:</div><div class='del'>-				 */</div><div class='del'>-				ret = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			__bch2_btree_path_unlock(trans, path);</div><div class='del'>-			path-&gt;level = depth_want;</div><div class='del'>-			path-&gt;l[path-&gt;level].b = ERR_PTR(ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path-&gt;uptodate = BTREE_ITER_UPTODATE;</div><div class='del'>-out:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart) != !!trans-&gt;restarted)</div><div class='del'>-		panic("ret %s (%i) trans-&gt;restarted %s (%i)\n",</div><div class='del'>-		      bch2_err_str(ret), ret,</div><div class='del'>-		      bch2_err_str(trans-&gt;restarted), trans-&gt;restarted);</div><div class='del'>-	bch2_btree_path_verify(trans, path);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_path_copy(struct btree_trans *trans, struct btree_path *dst,</div><div class='del'>-			    struct btree_path *src)</div><div class='del'>-{</div><div class='del'>-	unsigned i, offset = offsetof(struct btree_path, pos);</div><div class='del'>-</div><div class='del'>-	memcpy((void *) dst + offset,</div><div class='del'>-	       (void *) src + offset,</div><div class='del'>-	       sizeof(struct btree_path) - offset);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTREE_MAX_DEPTH; i++) {</div><div class='del'>-		unsigned t = btree_node_locked_type(dst, i);</div><div class='del'>-</div><div class='del'>-		if (t != BTREE_NODE_UNLOCKED)</div><div class='del'>-			six_lock_increment(&amp;dst-&gt;l[i].b-&gt;c.lock, t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static btree_path_idx_t btree_path_clone(struct btree_trans *trans, btree_path_idx_t src,</div><div class='del'>-					 bool intent)</div><div class='del'>-{</div><div class='del'>-	btree_path_idx_t new = btree_path_alloc(trans, src);</div><div class='del'>-	btree_path_copy(trans, trans-&gt;paths + new, trans-&gt;paths + src);</div><div class='del'>-	__btree_path_get(trans-&gt;paths + new, intent);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__flatten</div><div class='del'>-btree_path_idx_t __bch2_btree_path_make_mut(struct btree_trans *trans,</div><div class='del'>-			btree_path_idx_t path, bool intent, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	__btree_path_put(trans-&gt;paths + path, intent);</div><div class='del'>-	path = btree_path_clone(trans, path, intent);</div><div class='del'>-	trans-&gt;paths[path].preserve = false;</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-btree_path_idx_t __must_check</div><div class='del'>-__bch2_btree_path_set_pos(struct btree_trans *trans,</div><div class='del'>-			  btree_path_idx_t path_idx, struct bpos new_pos,</div><div class='del'>-			  bool intent, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	int cmp = bpos_cmp(new_pos, trans-&gt;paths[path_idx].pos);</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_not_in_restart(trans);</div><div class='del'>-	EBUG_ON(!trans-&gt;paths[path_idx].ref);</div><div class='del'>-</div><div class='del'>-	path_idx = bch2_btree_path_make_mut(trans, path_idx, intent, ip);</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-	path-&gt;pos		= new_pos;</div><div class='del'>-	trans-&gt;paths_sorted	= false;</div><div class='del'>-</div><div class='del'>-	if (unlikely(path-&gt;cached)) {</div><div class='del'>-		btree_node_unlock(trans, path, 0);</div><div class='del'>-		path-&gt;l[0].b = ERR_PTR(-BCH_ERR_no_btree_node_up);</div><div class='del'>-		btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unsigned level = btree_path_up_until_good_node(trans, path, cmp);</div><div class='del'>-</div><div class='del'>-	if (btree_path_node(path, level)) {</div><div class='del'>-		struct btree_path_level *l = &amp;path-&gt;l[level];</div><div class='del'>-</div><div class='del'>-		BUG_ON(!btree_node_locked(path, level));</div><div class='del'>-		/*</div><div class='del'>-		 * We might have to skip over many keys, or just a few: try</div><div class='del'>-		 * advancing the node iterator, and if we have to skip over too</div><div class='del'>-		 * many keys just reinit it (or if we're rewinding, since that</div><div class='del'>-		 * is expensive).</div><div class='del'>-		 */</div><div class='del'>-		if (cmp &lt; 0 ||</div><div class='del'>-		    !btree_path_advance_to_pos(path, l, 8))</div><div class='del'>-			bch2_btree_node_iter_init(&amp;l-&gt;iter, l-&gt;b, &amp;path-&gt;pos);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Iterators to interior nodes should always be pointed at the first non</div><div class='del'>-		 * whiteout:</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(level))</div><div class='del'>-			bch2_btree_node_iter_peek(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(level != path-&gt;level)) {</div><div class='del'>-		btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-		__bch2_btree_path_unlock(trans, path);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_btree_path_verify(trans, path);</div><div class='del'>-	return path_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree path: main interface: */</div><div class='del'>-</div><div class='del'>-static struct btree_path *have_path_at_pos(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *sib;</div><div class='del'>-</div><div class='del'>-	sib = prev_btree_path(trans, path);</div><div class='del'>-	if (sib &amp;&amp; !btree_path_cmp(sib, path))</div><div class='del'>-		return sib;</div><div class='del'>-</div><div class='del'>-	sib = next_btree_path(trans, path);</div><div class='del'>-	if (sib &amp;&amp; !btree_path_cmp(sib, path))</div><div class='del'>-		return sib;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree_path *have_node_at_pos(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *sib;</div><div class='del'>-</div><div class='del'>-	sib = prev_btree_path(trans, path);</div><div class='del'>-	if (sib &amp;&amp; sib-&gt;level == path-&gt;level &amp;&amp; path_l(sib)-&gt;b == path_l(path)-&gt;b)</div><div class='del'>-		return sib;</div><div class='del'>-</div><div class='del'>-	sib = next_btree_path(trans, path);</div><div class='del'>-	if (sib &amp;&amp; sib-&gt;level == path-&gt;level &amp;&amp; path_l(sib)-&gt;b == path_l(path)-&gt;b)</div><div class='del'>-		return sib;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __bch2_path_free(struct btree_trans *trans, btree_path_idx_t path)</div><div class='del'>-{</div><div class='del'>-	__bch2_btree_path_unlock(trans, trans-&gt;paths + path);</div><div class='del'>-	btree_path_list_remove(trans, trans-&gt;paths + path);</div><div class='del'>-	__clear_bit(path, trans-&gt;paths_allocated);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_path_put(struct btree_trans *trans, btree_path_idx_t path_idx, bool intent)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx, *dup;</div><div class='del'>-</div><div class='del'>-	if (!__btree_path_put(path, intent))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dup = path-&gt;preserve</div><div class='del'>-		? have_path_at_pos(trans, path)</div><div class='del'>-		: have_node_at_pos(trans, path);</div><div class='del'>-</div><div class='del'>-	if (!dup &amp;&amp; !(!path-&gt;preserve &amp;&amp; !is_btree_node(path, path-&gt;level)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (path-&gt;should_be_locked &amp;&amp;</div><div class='del'>-	    !trans-&gt;restarted &amp;&amp;</div><div class='del'>-	    (!dup || !bch2_btree_path_relock_norestart(trans, dup)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (dup) {</div><div class='del'>-		dup-&gt;preserve		|= path-&gt;preserve;</div><div class='del'>-		dup-&gt;should_be_locked	|= path-&gt;should_be_locked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_path_free(trans, path_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_path_put_nokeep(struct btree_trans *trans, btree_path_idx_t path,</div><div class='del'>-				 bool intent)</div><div class='del'>-{</div><div class='del'>-	if (!__btree_path_put(trans-&gt;paths + path, intent))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__bch2_path_free(trans, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __noreturn bch2_trans_restart_error(struct btree_trans *trans, u32 restart_count)</div><div class='del'>-{</div><div class='del'>-	panic("trans-&gt;restart_count %u, should be %u, last restarted by %pS\n",</div><div class='del'>-	      trans-&gt;restart_count, restart_count,</div><div class='del'>-	      (void *) trans-&gt;last_begin_ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __noreturn bch2_trans_in_restart_error(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	panic("in transaction restart: %s, last restarted by %pS\n",</div><div class='del'>-	      bch2_err_str(trans-&gt;restarted),</div><div class='del'>-	      (void *) trans-&gt;last_restarted_ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __cold</div><div class='del'>-void bch2_trans_updates_to_text(struct printbuf *buf, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	prt_printf(buf, "transaction updates for %s journal seq %llu",</div><div class='del'>-	       trans-&gt;fn, trans-&gt;journal_res.seq);</div><div class='del'>-	prt_newline(buf);</div><div class='del'>-	printbuf_indent_add(buf, 2);</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		struct bkey_s_c old = { &amp;i-&gt;old_k, i-&gt;old_v };</div><div class='del'>-</div><div class='del'>-		prt_printf(buf, "update: btree=%s cached=%u %pS",</div><div class='del'>-		       bch2_btree_id_str(i-&gt;btree_id),</div><div class='del'>-		       i-&gt;cached,</div><div class='del'>-		       (void *) i-&gt;ip_allocated);</div><div class='del'>-		prt_newline(buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(buf, "  old ");</div><div class='del'>-		bch2_bkey_val_to_text(buf, trans-&gt;c, old);</div><div class='del'>-		prt_newline(buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(buf, "  new ");</div><div class='del'>-		bch2_bkey_val_to_text(buf, trans-&gt;c, bkey_i_to_s_c(i-&gt;k));</div><div class='del'>-		prt_newline(buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (struct jset_entry *e = trans-&gt;journal_entries;</div><div class='del'>-	     e != btree_trans_journal_entries_top(trans);</div><div class='del'>-	     e = vstruct_next(e))</div><div class='del'>-		bch2_journal_entry_to_text(buf, trans-&gt;c, e);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(buf, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __cold</div><div class='del'>-void bch2_dump_trans_updates(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	bch2_trans_updates_to_text(&amp;buf, trans);</div><div class='del'>-	bch2_print_string_as_lines(KERN_ERR, buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_path_to_text(struct printbuf *out, struct btree_trans *trans, btree_path_idx_t path_idx)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "path: idx %2u ref %u:%u %c %c btree=%s l=%u pos ",</div><div class='del'>-		   path_idx, path-&gt;ref, path-&gt;intent_ref,</div><div class='del'>-		   path-&gt;preserve ? 'P' : ' ',</div><div class='del'>-		   path-&gt;should_be_locked ? 'S' : ' ',</div><div class='del'>-		   bch2_btree_id_str(path-&gt;btree_id),</div><div class='del'>-		   path-&gt;level);</div><div class='del'>-	bch2_bpos_to_text(out, path-&gt;pos);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, " locks %u", path-&gt;nodes_locked);</div><div class='del'>-#ifdef TRACK_PATH_ALLOCATED</div><div class='del'>-	prt_printf(out, " %pS", (void *) path-&gt;ip_allocated);</div><div class='del'>-#endif</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline __cold</div><div class='del'>-void __bch2_trans_paths_to_text(struct printbuf *out, struct btree_trans *trans,</div><div class='del'>-				bool nosort)</div><div class='del'>-{</div><div class='del'>-	struct trans_for_each_path_inorder_iter iter;</div><div class='del'>-</div><div class='del'>-	if (!nosort)</div><div class='del'>-		btree_trans_sort_paths(trans);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_idx_inorder(trans, iter)</div><div class='del'>-		bch2_btree_path_to_text(out, trans, iter.path_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __cold</div><div class='del'>-void bch2_trans_paths_to_text(struct printbuf *out, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	__bch2_trans_paths_to_text(out, trans, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline __cold</div><div class='del'>-void __bch2_dump_trans_paths_updates(struct btree_trans *trans, bool nosort)</div><div class='del'>-{</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	__bch2_trans_paths_to_text(&amp;buf, trans, nosort);</div><div class='del'>-	bch2_trans_updates_to_text(&amp;buf, trans);</div><div class='del'>-</div><div class='del'>-	bch2_print_string_as_lines(KERN_ERR, buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __cold</div><div class='del'>-void bch2_dump_trans_paths_updates(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	__bch2_dump_trans_paths_updates(trans, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __cold</div><div class='del'>-static void bch2_trans_update_max_paths(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_transaction_stats *s = btree_trans_stats(trans);</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	size_t nr = bitmap_weight(trans-&gt;paths_allocated, trans-&gt;nr_paths);</div><div class='del'>-</div><div class='del'>-	bch2_trans_paths_to_text(&amp;buf, trans);</div><div class='del'>-</div><div class='del'>-	if (!buf.allocation_failure) {</div><div class='del'>-		mutex_lock(&amp;s-&gt;lock);</div><div class='del'>-		if (nr &gt; s-&gt;nr_max_paths) {</div><div class='del'>-			s-&gt;nr_max_paths = nr;</div><div class='del'>-			swap(s-&gt;max_paths_text, buf.buf);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;s-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-	trans-&gt;nr_paths_max = nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline __cold</div><div class='del'>-int __bch2_btree_trans_too_many_iters(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (trace_trans_restart_too_many_iters_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_trans_paths_to_text(&amp;buf, trans);</div><div class='del'>-		trace_trans_restart_too_many_iters(trans, _THIS_IP_, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count_event(trans-&gt;c, trans_restart_too_many_iters);</div><div class='del'>-</div><div class='del'>-	return btree_trans_restart(trans, BCH_ERR_transaction_restart_too_many_iters);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void btree_path_overflow(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	bch2_dump_trans_paths_updates(trans);</div><div class='del'>-	bch_err(trans-&gt;c, "trans path overflow");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void btree_paths_realloc(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	unsigned nr = trans-&gt;nr_paths * 2;</div><div class='del'>-</div><div class='del'>-	void *p = kzalloc(BITS_TO_LONGS(nr) * sizeof(unsigned long) +</div><div class='del'>-			  sizeof(struct btree_trans_paths) +</div><div class='del'>-			  nr * sizeof(struct btree_path) +</div><div class='del'>-			  nr * sizeof(btree_path_idx_t) + 8 +</div><div class='del'>-			  nr * sizeof(struct btree_insert_entry), GFP_KERNEL|__GFP_NOFAIL);</div><div class='del'>-</div><div class='del'>-	unsigned long *paths_allocated = p;</div><div class='del'>-	memcpy(paths_allocated, trans-&gt;paths_allocated, BITS_TO_LONGS(trans-&gt;nr_paths) * sizeof(unsigned long));</div><div class='del'>-	p += BITS_TO_LONGS(nr) * sizeof(unsigned long);</div><div class='del'>-</div><div class='del'>-	p += sizeof(struct btree_trans_paths);</div><div class='del'>-	struct btree_path *paths = p;</div><div class='del'>-	*trans_paths_nr(paths) = nr;</div><div class='del'>-	memcpy(paths, trans-&gt;paths, trans-&gt;nr_paths * sizeof(struct btree_path));</div><div class='del'>-	p += nr * sizeof(struct btree_path);</div><div class='del'>-</div><div class='del'>-	btree_path_idx_t *sorted = p;</div><div class='del'>-	memcpy(sorted, trans-&gt;sorted, trans-&gt;nr_sorted * sizeof(btree_path_idx_t));</div><div class='del'>-	p += nr * sizeof(btree_path_idx_t) + 8;</div><div class='del'>-</div><div class='del'>-	struct btree_insert_entry *updates = p;</div><div class='del'>-	memcpy(updates, trans-&gt;updates, trans-&gt;nr_paths * sizeof(struct btree_insert_entry));</div><div class='del'>-</div><div class='del'>-	unsigned long *old = trans-&gt;paths_allocated;</div><div class='del'>-</div><div class='del'>-	rcu_assign_pointer(trans-&gt;paths_allocated,	paths_allocated);</div><div class='del'>-	rcu_assign_pointer(trans-&gt;paths,		paths);</div><div class='del'>-	rcu_assign_pointer(trans-&gt;sorted,		sorted);</div><div class='del'>-	rcu_assign_pointer(trans-&gt;updates,		updates);</div><div class='del'>-</div><div class='del'>-	trans-&gt;nr_paths		= nr;</div><div class='del'>-</div><div class='del'>-	if (old != trans-&gt;_paths_allocated)</div><div class='del'>-		kfree_rcu_mightsleep(old);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline btree_path_idx_t btree_path_alloc(struct btree_trans *trans,</div><div class='del'>-						btree_path_idx_t pos)</div><div class='del'>-{</div><div class='del'>-	btree_path_idx_t idx = find_first_zero_bit(trans-&gt;paths_allocated, trans-&gt;nr_paths);</div><div class='del'>-</div><div class='del'>-	if (unlikely(idx == trans-&gt;nr_paths)) {</div><div class='del'>-		if (trans-&gt;nr_paths == BTREE_ITER_MAX) {</div><div class='del'>-			btree_path_overflow(trans);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btree_paths_realloc(trans);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do this before marking the new path as allocated, since it won't be</div><div class='del'>-	 * initialized yet:</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(idx &gt; trans-&gt;nr_paths_max))</div><div class='del'>-		bch2_trans_update_max_paths(trans);</div><div class='del'>-</div><div class='del'>-	__set_bit(idx, trans-&gt;paths_allocated);</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = &amp;trans-&gt;paths[idx];</div><div class='del'>-	path-&gt;ref		= 0;</div><div class='del'>-	path-&gt;intent_ref	= 0;</div><div class='del'>-	path-&gt;nodes_locked	= 0;</div><div class='del'>-</div><div class='del'>-	btree_path_list_add(trans, pos, idx);</div><div class='del'>-	trans-&gt;paths_sorted = false;</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-btree_path_idx_t bch2_path_get(struct btree_trans *trans,</div><div class='del'>-			     enum btree_id btree_id, struct bpos pos,</div><div class='del'>-			     unsigned locks_want, unsigned level,</div><div class='del'>-			     unsigned flags, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	bool cached = flags &amp; BTREE_ITER_CACHED;</div><div class='del'>-	bool intent = flags &amp; BTREE_ITER_INTENT;</div><div class='del'>-	struct trans_for_each_path_inorder_iter iter;</div><div class='del'>-	btree_path_idx_t path_pos = 0, path_idx;</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_not_in_restart(trans);</div><div class='del'>-	bch2_trans_verify_locks(trans);</div><div class='del'>-</div><div class='del'>-	btree_trans_sort_paths(trans);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_inorder(trans, path, iter) {</div><div class='del'>-		if (__btree_path_cmp(path,</div><div class='del'>-				     btree_id,</div><div class='del'>-				     cached,</div><div class='del'>-				     pos,</div><div class='del'>-				     level) &gt; 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		path_pos = iter.path_idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (path_pos &amp;&amp;</div><div class='del'>-	    trans-&gt;paths[path_pos].cached	== cached &amp;&amp;</div><div class='del'>-	    trans-&gt;paths[path_pos].btree_id	== btree_id &amp;&amp;</div><div class='del'>-	    trans-&gt;paths[path_pos].level	== level) {</div><div class='del'>-		__btree_path_get(trans-&gt;paths + path_pos, intent);</div><div class='del'>-		path_idx = bch2_btree_path_set_pos(trans, path_pos, pos, intent, ip);</div><div class='del'>-		path = trans-&gt;paths + path_idx;</div><div class='del'>-	} else {</div><div class='del'>-		path_idx = btree_path_alloc(trans, path_pos);</div><div class='del'>-		path = trans-&gt;paths + path_idx;</div><div class='del'>-</div><div class='del'>-		__btree_path_get(path, intent);</div><div class='del'>-		path-&gt;pos			= pos;</div><div class='del'>-		path-&gt;btree_id			= btree_id;</div><div class='del'>-		path-&gt;cached			= cached;</div><div class='del'>-		path-&gt;uptodate			= BTREE_ITER_NEED_TRAVERSE;</div><div class='del'>-		path-&gt;should_be_locked		= false;</div><div class='del'>-		path-&gt;level			= level;</div><div class='del'>-		path-&gt;locks_want		= locks_want;</div><div class='del'>-		path-&gt;nodes_locked		= 0;</div><div class='del'>-		for (unsigned i = 0; i &lt; ARRAY_SIZE(path-&gt;l); i++)</div><div class='del'>-			path-&gt;l[i].b		= ERR_PTR(-BCH_ERR_no_btree_node_init);</div><div class='del'>-#ifdef TRACK_PATH_ALLOCATED</div><div class='del'>-		path-&gt;ip_allocated		= ip;</div><div class='del'>-#endif</div><div class='del'>-		trans-&gt;paths_sorted		= false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BTREE_ITER_NOPRESERVE))</div><div class='del'>-		path-&gt;preserve = true;</div><div class='del'>-</div><div class='del'>-	if (path-&gt;intent_ref)</div><div class='del'>-		locks_want = max(locks_want, level + 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the path has locks_want greater than requested, we don't downgrade</div><div class='del'>-	 * it here - on transaction restart because btree node split needs to</div><div class='del'>-	 * upgrade locks, we might be putting/getting the iterator again.</div><div class='del'>-	 * Downgrading iterators only happens via bch2_trans_downgrade(), after</div><div class='del'>-	 * a successful transaction commit.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	locks_want = min(locks_want, BTREE_MAX_DEPTH);</div><div class='del'>-	if (locks_want &gt; path-&gt;locks_want)</div><div class='del'>-		bch2_btree_path_upgrade_noupgrade_sibs(trans, path, locks_want, NULL);</div><div class='del'>-</div><div class='del'>-	return path_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_path_peek_slot(struct btree_path *path, struct bkey *u)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct btree_path_level *l = path_l(path);</div><div class='del'>-	struct bkey_packed *_k;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!l-&gt;b))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;uptodate != BTREE_ITER_UPTODATE);</div><div class='del'>-	EBUG_ON(!btree_node_locked(path, path-&gt;level));</div><div class='del'>-</div><div class='del'>-	if (!path-&gt;cached) {</div><div class='del'>-		_k = bch2_btree_node_iter_peek_all(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-		k = _k ? bkey_disassemble(l-&gt;b, _k, u) : bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(k.k &amp;&amp; bkey_deleted(k.k) &amp;&amp; bpos_eq(k.k-&gt;p, path-&gt;pos));</div><div class='del'>-</div><div class='del'>-		if (!k.k || !bpos_eq(path-&gt;pos, k.k-&gt;p))</div><div class='del'>-			goto hole;</div><div class='del'>-	} else {</div><div class='del'>-		struct bkey_cached *ck = (void *) path-&gt;l[0].b;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(ck &amp;&amp;</div><div class='del'>-			(path-&gt;btree_id != ck-&gt;key.btree_id ||</div><div class='del'>-			 !bkey_eq(path-&gt;pos, ck-&gt;key.pos)));</div><div class='del'>-		if (!ck || !ck-&gt;valid)</div><div class='del'>-			return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-		*u = ck-&gt;k-&gt;k;</div><div class='del'>-		k = bkey_i_to_s_c(ck-&gt;k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-hole:</div><div class='del'>-	bkey_init(u);</div><div class='del'>-	u-&gt;p = path-&gt;pos;</div><div class='del'>-	return (struct bkey_s_c) { u, NULL };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree iterators: */</div><div class='del'>-</div><div class='del'>-int __must_check</div><div class='del'>-__bch2_btree_iter_traverse(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_path_traverse(iter-&gt;trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __must_check</div><div class='del'>-bch2_btree_iter_traverse(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path,</div><div class='del'>-					btree_iter_search_key(iter),</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_path_traverse(iter-&gt;trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	btree_path_set_should_be_locked(trans-&gt;paths + iter-&gt;path);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Iterate across nodes (leaf and interior nodes) */</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_iter_peek_node(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct btree *b = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(trans-&gt;paths[iter-&gt;path].cached);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_path_traverse(trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	b = btree_path_node(path, path-&gt;level);</div><div class='del'>-	if (!b)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bpos_lt(b-&gt;key.k.p, iter-&gt;pos));</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;iter-&gt;k);</div><div class='del'>-	iter-&gt;k.p = iter-&gt;pos = b-&gt;key.k.p;</div><div class='del'>-</div><div class='del'>-	iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path, b-&gt;key.k.p,</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-	btree_path_set_should_be_locked(btree_iter_path(trans, iter));</div><div class='del'>-out:</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-err:</div><div class='del'>-	b = ERR_PTR(ret);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_iter_peek_node_and_restart(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	while (b = bch2_btree_iter_peek_node(iter),</div><div class='del'>-	       bch2_err_matches(PTR_ERR_OR_ZERO(b), BCH_ERR_transaction_restart))</div><div class='del'>-		bch2_trans_begin(iter-&gt;trans);</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_iter_next_node(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct btree *b = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(trans-&gt;paths[iter-&gt;path].cached);</div><div class='del'>-	bch2_trans_verify_not_in_restart(trans);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-</div><div class='del'>-	/* already at end? */</div><div class='del'>-	if (!btree_path_node(path, path-&gt;level))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* got to end? */</div><div class='del'>-	if (!btree_path_node(path, path-&gt;level + 1)) {</div><div class='del'>-		btree_path_set_level_up(trans, path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_node_relock(trans, path, path-&gt;level + 1)) {</div><div class='del'>-		__bch2_btree_path_unlock(trans, path);</div><div class='del'>-		path-&gt;l[path-&gt;level].b		= ERR_PTR(-BCH_ERR_no_btree_node_relock);</div><div class='del'>-		path-&gt;l[path-&gt;level + 1].b	= ERR_PTR(-BCH_ERR_no_btree_node_relock);</div><div class='del'>-		btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-		trace_and_count(trans-&gt;c, trans_restart_relock_next_node, trans, _THIS_IP_, path);</div><div class='del'>-		ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_relock);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b = btree_path_node(path, path-&gt;level + 1);</div><div class='del'>-</div><div class='del'>-	if (bpos_eq(iter-&gt;pos, b-&gt;key.k.p)) {</div><div class='del'>-		__btree_path_set_level_up(trans, path, path-&gt;level++);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Haven't gotten to the end of the parent node: go back down to</div><div class='del'>-		 * the next child node</div><div class='del'>-		 */</div><div class='del'>-		iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path,</div><div class='del'>-					bpos_successor(iter-&gt;pos),</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-		path = btree_iter_path(trans, iter);</div><div class='del'>-		btree_path_set_level_down(trans, path, iter-&gt;min_depth);</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_traverse(trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		path = btree_iter_path(trans, iter);</div><div class='del'>-		b = path-&gt;l[path-&gt;level].b;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;iter-&gt;k);</div><div class='del'>-	iter-&gt;k.p = iter-&gt;pos = b-&gt;key.k.p;</div><div class='del'>-</div><div class='del'>-	iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path, b-&gt;key.k.p,</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-	btree_path_set_should_be_locked(btree_iter_path(trans, iter));</div><div class='del'>-	EBUG_ON(btree_iter_path(trans, iter)-&gt;uptodate);</div><div class='del'>-out:</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-err:</div><div class='del'>-	b = ERR_PTR(ret);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Iterate across keys (in leaf nodes only) */</div><div class='del'>-</div><div class='del'>-inline bool bch2_btree_iter_advance(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bpos pos = iter-&gt;k.p;</div><div class='del'>-	bool ret = !(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS</div><div class='del'>-		     ? bpos_eq(pos, SPOS_MAX)</div><div class='del'>-		     : bkey_eq(pos, SPOS_MAX));</div><div class='del'>-</div><div class='del'>-	if (ret &amp;&amp; !(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS))</div><div class='del'>-		pos = bkey_successor(iter, pos);</div><div class='del'>-	bch2_btree_iter_set_pos(iter, pos);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline bool bch2_btree_iter_rewind(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bpos pos = bkey_start_pos(&amp;iter-&gt;k);</div><div class='del'>-	bool ret = !(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS</div><div class='del'>-		     ? bpos_eq(pos, POS_MIN)</div><div class='del'>-		     : bkey_eq(pos, POS_MIN));</div><div class='del'>-</div><div class='del'>-	if (ret &amp;&amp; !(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS))</div><div class='del'>-		pos = bkey_predecessor(iter, pos);</div><div class='del'>-	bch2_btree_iter_set_pos(iter, pos);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline</div><div class='del'>-void bch2_btree_trans_peek_prev_updates(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-					struct bkey_s_c *k)</div><div class='del'>-{</div><div class='del'>-	struct bpos end = path_l(btree_iter_path(trans, iter))-&gt;b-&gt;data-&gt;min_key;</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (!i-&gt;key_cache_already_flushed &amp;&amp;</div><div class='del'>-		    i-&gt;btree_id == iter-&gt;btree_id &amp;&amp;</div><div class='del'>-		    bpos_le(i-&gt;k-&gt;k.p, iter-&gt;pos) &amp;&amp;</div><div class='del'>-		    bpos_ge(i-&gt;k-&gt;k.p, k-&gt;k ? k-&gt;k-&gt;p : end)) {</div><div class='del'>-			iter-&gt;k = i-&gt;k-&gt;k;</div><div class='del'>-			*k = bkey_i_to_s_c(i-&gt;k);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline</div><div class='del'>-void bch2_btree_trans_peek_updates(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-				   struct bkey_s_c *k)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	struct bpos end = path_l(path)-&gt;b-&gt;key.k.p;</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (!i-&gt;key_cache_already_flushed &amp;&amp;</div><div class='del'>-		    i-&gt;btree_id == iter-&gt;btree_id &amp;&amp;</div><div class='del'>-		    bpos_ge(i-&gt;k-&gt;k.p, path-&gt;pos) &amp;&amp;</div><div class='del'>-		    bpos_le(i-&gt;k-&gt;k.p, k-&gt;k ? k-&gt;k-&gt;p : end)) {</div><div class='del'>-			iter-&gt;k = i-&gt;k-&gt;k;</div><div class='del'>-			*k = bkey_i_to_s_c(i-&gt;k);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline</div><div class='del'>-void bch2_btree_trans_peek_slot_updates(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-					struct bkey_s_c *k)</div><div class='del'>-{</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (!i-&gt;key_cache_already_flushed &amp;&amp;</div><div class='del'>-		    i-&gt;btree_id == iter-&gt;btree_id &amp;&amp;</div><div class='del'>-		    bpos_eq(i-&gt;k-&gt;k.p, iter-&gt;pos)) {</div><div class='del'>-			iter-&gt;k = i-&gt;k-&gt;k;</div><div class='del'>-			*k = bkey_i_to_s_c(i-&gt;k);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_i *bch2_btree_journal_peek(struct btree_trans *trans,</div><div class='del'>-					      struct btree_iter *iter,</div><div class='del'>-					      struct bpos end_pos)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-</div><div class='del'>-	return bch2_journal_keys_peek_upto(trans-&gt;c, iter-&gt;btree_id,</div><div class='del'>-					   path-&gt;level,</div><div class='del'>-					   path-&gt;pos,</div><div class='del'>-					   end_pos,</div><div class='del'>-					   &amp;iter-&gt;journal_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline</div><div class='del'>-struct bkey_s_c btree_trans_peek_slot_journal(struct btree_trans *trans,</div><div class='del'>-					      struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	struct bkey_i *k = bch2_btree_journal_peek(trans, iter, path-&gt;pos);</div><div class='del'>-</div><div class='del'>-	if (k) {</div><div class='del'>-		iter-&gt;k = k-&gt;k;</div><div class='del'>-		return bkey_i_to_s_c(k);</div><div class='del'>-	} else {</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline</div><div class='del'>-struct bkey_s_c btree_trans_peek_journal(struct btree_trans *trans,</div><div class='del'>-					 struct btree_iter *iter,</div><div class='del'>-					 struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	struct bkey_i *next_journal =</div><div class='del'>-		bch2_btree_journal_peek(trans, iter,</div><div class='del'>-				k.k ? k.k-&gt;p : path_l(path)-&gt;b-&gt;key.k.p);</div><div class='del'>-</div><div class='del'>-	if (next_journal) {</div><div class='del'>-		iter-&gt;k = next_journal-&gt;k;</div><div class='del'>-		k = bkey_i_to_s_c(next_journal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Checks btree key cache for key at iter-&gt;pos and returns it if present, or</div><div class='del'>- * bkey_s_c_null:</div><div class='del'>- */</div><div class='del'>-static noinline</div><div class='del'>-struct bkey_s_c btree_trans_peek_key_cache(struct btree_iter *iter, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey u;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if ((iter-&gt;flags &amp; BTREE_ITER_KEY_CACHE_FILL) &amp;&amp;</div><div class='del'>-	    bpos_eq(iter-&gt;pos, pos))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_key_cache_find(c, iter-&gt;btree_id, pos))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	if (!iter-&gt;key_cache_path)</div><div class='del'>-		iter-&gt;key_cache_path = bch2_path_get(trans, iter-&gt;btree_id, pos,</div><div class='del'>-						     iter-&gt;flags &amp; BTREE_ITER_INTENT, 0,</div><div class='del'>-						     iter-&gt;flags|BTREE_ITER_CACHED|</div><div class='del'>-						     BTREE_ITER_CACHED_NOFILL,</div><div class='del'>-						     _THIS_IP_);</div><div class='del'>-</div><div class='del'>-	iter-&gt;key_cache_path = bch2_btree_path_set_pos(trans, iter-&gt;key_cache_path, pos,</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-	ret =   bch2_btree_path_traverse(trans, iter-&gt;key_cache_path,</div><div class='del'>-					 iter-&gt;flags|BTREE_ITER_CACHED) ?:</div><div class='del'>-		bch2_btree_path_relock(trans, btree_iter_path(trans, iter), _THIS_IP_);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return bkey_s_c_err(ret);</div><div class='del'>-</div><div class='del'>-	btree_path_set_should_be_locked(trans-&gt;paths + iter-&gt;key_cache_path);</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_path_peek_slot(trans-&gt;paths + iter-&gt;key_cache_path, &amp;u);</div><div class='del'>-	if (k.k &amp;&amp; !bkey_err(k)) {</div><div class='del'>-		iter-&gt;k = u;</div><div class='del'>-		k.k = &amp;iter-&gt;k;</div><div class='del'>-	}</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bpos search_key)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct bkey_s_c k, k2;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(btree_iter_path(trans, iter)-&gt;cached);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		struct btree_path_level *l;</div><div class='del'>-</div><div class='del'>-		iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path, search_key,</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_traverse(trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			/* ensure that iter-&gt;k is consistent with iter-&gt;pos: */</div><div class='del'>-			bch2_btree_iter_set_pos(iter, iter-&gt;pos);</div><div class='del'>-			k = bkey_s_c_err(ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-		l = path_l(path);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!l-&gt;b)) {</div><div class='del'>-			/* No btree nodes at requested level: */</div><div class='del'>-			bch2_btree_iter_set_pos(iter, SPOS_MAX);</div><div class='del'>-			k = bkey_s_c_null;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btree_path_set_should_be_locked(path);</div><div class='del'>-</div><div class='del'>-		k = btree_path_level_peek_all(trans-&gt;c, l, &amp;iter-&gt;k);</div><div class='del'>-</div><div class='del'>-		if (unlikely(iter-&gt;flags &amp; BTREE_ITER_WITH_KEY_CACHE) &amp;&amp;</div><div class='del'>-		    k.k &amp;&amp;</div><div class='del'>-		    (k2 = btree_trans_peek_key_cache(iter, k.k-&gt;p)).k) {</div><div class='del'>-			k = k2;</div><div class='del'>-			ret = bkey_err(k);</div><div class='del'>-			if (ret) {</div><div class='del'>-				bch2_btree_iter_set_pos(iter, iter-&gt;pos);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(iter-&gt;flags &amp; BTREE_ITER_WITH_JOURNAL))</div><div class='del'>-			k = btree_trans_peek_journal(trans, iter, k);</div><div class='del'>-</div><div class='del'>-		if (unlikely((iter-&gt;flags &amp; BTREE_ITER_WITH_UPDATES) &amp;&amp;</div><div class='del'>-			     trans-&gt;nr_updates))</div><div class='del'>-			bch2_btree_trans_peek_updates(trans, iter, &amp;k);</div><div class='del'>-</div><div class='del'>-		if (k.k &amp;&amp; bkey_deleted(k.k)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If we've got a whiteout, and it's after the search</div><div class='del'>-			 * key, advance the search key to the whiteout instead</div><div class='del'>-			 * of just after the whiteout - it might be a btree</div><div class='del'>-			 * whiteout, with a real key at the same position, since</div><div class='del'>-			 * in the btree deleted keys sort before non deleted.</div><div class='del'>-			 */</div><div class='del'>-			search_key = !bpos_eq(search_key, k.k-&gt;p)</div><div class='del'>-				? k.k-&gt;p</div><div class='del'>-				: bpos_successor(k.k-&gt;p);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (likely(k.k)) {</div><div class='del'>-			break;</div><div class='del'>-		} else if (likely(!bpos_eq(l-&gt;b-&gt;key.k.p, SPOS_MAX))) {</div><div class='del'>-			/* Advance to next leaf node: */</div><div class='del'>-			search_key = bpos_successor(l-&gt;b-&gt;key.k.p);</div><div class='del'>-		} else {</div><div class='del'>-			/* End of btree: */</div><div class='del'>-			bch2_btree_iter_set_pos(iter, SPOS_MAX);</div><div class='del'>-			k = bkey_s_c_null;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_iter_peek_upto() - returns first key greater than or equal to</div><div class='del'>- * iterator's current position</div><div class='del'>- * @iter:	iterator to peek from</div><div class='del'>- * @end:	search limit: returns keys less than or equal to @end</div><div class='del'>- *</div><div class='del'>- * Returns:	key if found, or an error extractable with bkey_err().</div><div class='del'>- */</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *iter, struct bpos end)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct bpos search_key = btree_iter_search_key(iter);</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bpos iter_pos;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON((iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS) &amp;&amp; bkey_eq(end, POS_MAX));</div><div class='del'>-</div><div class='del'>-	if (iter-&gt;update_path) {</div><div class='del'>-		bch2_path_put_nokeep(trans, iter-&gt;update_path,</div><div class='del'>-				     iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-		iter-&gt;update_path = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		k = __bch2_btree_iter_peek(iter, search_key);</div><div class='del'>-		if (unlikely(!k.k))</div><div class='del'>-			goto end;</div><div class='del'>-		if (unlikely(bkey_err(k)))</div><div class='del'>-			goto out_no_locked;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to check against @end before FILTER_SNAPSHOTS because</div><div class='del'>-		 * if we get to a different inode that requested we might be</div><div class='del'>-		 * seeing keys for a different snapshot tree that will all be</div><div class='del'>-		 * filtered out.</div><div class='del'>-		 *</div><div class='del'>-		 * But we can't do the full check here, because bkey_start_pos()</div><div class='del'>-		 * isn't monotonically increasing before FILTER_SNAPSHOTS, and</div><div class='del'>-		 * that's what we check against in extents mode:</div><div class='del'>-		 */</div><div class='del'>-		if (k.k-&gt;p.inode &gt; end.inode)</div><div class='del'>-			goto end;</div><div class='del'>-</div><div class='del'>-		if (iter-&gt;update_path &amp;&amp;</div><div class='del'>-		    !bkey_eq(trans-&gt;paths[iter-&gt;update_path].pos, k.k-&gt;p)) {</div><div class='del'>-			bch2_path_put_nokeep(trans, iter-&gt;update_path,</div><div class='del'>-					     iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-			iter-&gt;update_path = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS) &amp;&amp;</div><div class='del'>-		    (iter-&gt;flags &amp; BTREE_ITER_INTENT) &amp;&amp;</div><div class='del'>-		    !(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS) &amp;&amp;</div><div class='del'>-		    !iter-&gt;update_path) {</div><div class='del'>-			struct bpos pos = k.k-&gt;p;</div><div class='del'>-</div><div class='del'>-			if (pos.snapshot &lt; iter-&gt;snapshot) {</div><div class='del'>-				search_key = bpos_successor(k.k-&gt;p);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			pos.snapshot = iter-&gt;snapshot;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * advance, same as on exit for iter-&gt;path, but only up</div><div class='del'>-			 * to snapshot</div><div class='del'>-			 */</div><div class='del'>-			__btree_path_get(trans-&gt;paths + iter-&gt;path, iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-			iter-&gt;update_path = iter-&gt;path;</div><div class='del'>-</div><div class='del'>-			iter-&gt;update_path = bch2_btree_path_set_pos(trans,</div><div class='del'>-						iter-&gt;update_path, pos,</div><div class='del'>-						iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-						_THIS_IP_);</div><div class='del'>-			ret = bch2_btree_path_traverse(trans, iter-&gt;update_path, iter-&gt;flags);</div><div class='del'>-			if (unlikely(ret)) {</div><div class='del'>-				k = bkey_s_c_err(ret);</div><div class='del'>-				goto out_no_locked;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We can never have a key in a leaf node at POS_MAX, so</div><div class='del'>-		 * we don't have to check these successor() calls:</div><div class='del'>-		 */</div><div class='del'>-		if ((iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS) &amp;&amp;</div><div class='del'>-		    !bch2_snapshot_is_ancestor(trans-&gt;c,</div><div class='del'>-					       iter-&gt;snapshot,</div><div class='del'>-					       k.k-&gt;p.snapshot)) {</div><div class='del'>-			search_key = bpos_successor(k.k-&gt;p);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bkey_whiteout(k.k) &amp;&amp;</div><div class='del'>-		    !(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS)) {</div><div class='del'>-			search_key = bkey_successor(iter, k.k-&gt;p);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * iter-&gt;pos should be mononotically increasing, and always be</div><div class='del'>-		 * equal to the key we just returned - except extents can</div><div class='del'>-		 * straddle iter-&gt;pos:</div><div class='del'>-		 */</div><div class='del'>-		if (!(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS))</div><div class='del'>-			iter_pos = k.k-&gt;p;</div><div class='del'>-		else</div><div class='del'>-			iter_pos = bkey_max(iter-&gt;pos, bkey_start_pos(k.k));</div><div class='del'>-</div><div class='del'>-		if (unlikely(!(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS)</div><div class='del'>-			     ? bkey_gt(iter_pos, end)</div><div class='del'>-			     : bkey_ge(iter_pos, end)))</div><div class='del'>-			goto end;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iter-&gt;pos = iter_pos;</div><div class='del'>-</div><div class='del'>-	iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path, k.k-&gt;p,</div><div class='del'>-				iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-				btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-	btree_path_set_should_be_locked(btree_iter_path(trans, iter));</div><div class='del'>-out_no_locked:</div><div class='del'>-	if (iter-&gt;update_path) {</div><div class='del'>-		ret = bch2_btree_path_relock(trans, trans-&gt;paths + iter-&gt;update_path, _THIS_IP_);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			k = bkey_s_c_err(ret);</div><div class='del'>-		else</div><div class='del'>-			btree_path_set_should_be_locked(trans-&gt;paths + iter-&gt;update_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS))</div><div class='del'>-		iter-&gt;pos.snapshot = iter-&gt;snapshot;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_iter_verify_ret(iter, k);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		bch2_btree_iter_set_pos(iter, iter-&gt;pos);</div><div class='del'>-		k = bkey_s_c_err(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-end:</div><div class='del'>-	bch2_btree_iter_set_pos(iter, end);</div><div class='del'>-	k = bkey_s_c_null;</div><div class='del'>-	goto out_no_locked;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_iter_next() - returns first key greater than iterator's current</div><div class='del'>- * position</div><div class='del'>- * @iter:	iterator to peek from</div><div class='del'>- *</div><div class='del'>- * Returns:	key if found, or an error extractable with bkey_err().</div><div class='del'>- */</div><div class='del'>-struct bkey_s_c bch2_btree_iter_next(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_btree_iter_advance(iter))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_iter_peek(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_iter_peek_prev() - returns first key less than or equal to</div><div class='del'>- * iterator's current position</div><div class='del'>- * @iter:	iterator to peek from</div><div class='del'>- *</div><div class='del'>- * Returns:	key if found, or an error extractable with bkey_err().</div><div class='del'>- */</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_prev(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct bpos search_key = iter-&gt;pos;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey saved_k;</div><div class='del'>-	const struct bch_val *saved_v;</div><div class='del'>-	btree_path_idx_t saved_path = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(btree_iter_path(trans, iter)-&gt;cached ||</div><div class='del'>-		btree_iter_path(trans, iter)-&gt;level);</div><div class='del'>-</div><div class='del'>-	if (iter-&gt;flags &amp; BTREE_ITER_WITH_JOURNAL)</div><div class='del'>-		return bkey_s_c_err(-EIO);</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-</div><div class='del'>-	if (iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS)</div><div class='del'>-		search_key.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path, search_key,</div><div class='del'>-						iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-						btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_traverse(trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			/* ensure that iter-&gt;k is consistent with iter-&gt;pos: */</div><div class='del'>-			bch2_btree_iter_set_pos(iter, iter-&gt;pos);</div><div class='del'>-			k = bkey_s_c_err(ret);</div><div class='del'>-			goto out_no_locked;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-</div><div class='del'>-		k = btree_path_level_peek(trans, path, &amp;path-&gt;l[0], &amp;iter-&gt;k);</div><div class='del'>-		if (!k.k ||</div><div class='del'>-		    ((iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS)</div><div class='del'>-		     ? bpos_ge(bkey_start_pos(k.k), search_key)</div><div class='del'>-		     : bpos_gt(k.k-&gt;p, search_key)))</div><div class='del'>-			k = btree_path_level_prev(trans, path, &amp;path-&gt;l[0], &amp;iter-&gt;k);</div><div class='del'>-</div><div class='del'>-		if (unlikely((iter-&gt;flags &amp; BTREE_ITER_WITH_UPDATES) &amp;&amp;</div><div class='del'>-			     trans-&gt;nr_updates))</div><div class='del'>-			bch2_btree_trans_peek_prev_updates(trans, iter, &amp;k);</div><div class='del'>-</div><div class='del'>-		if (likely(k.k)) {</div><div class='del'>-			if (iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS) {</div><div class='del'>-				if (k.k-&gt;p.snapshot == iter-&gt;snapshot)</div><div class='del'>-					goto got_key;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * If we have a saved candidate, and we're no</div><div class='del'>-				 * longer at the same _key_ (not pos), return</div><div class='del'>-				 * that candidate</div><div class='del'>-				 */</div><div class='del'>-				if (saved_path &amp;&amp; !bkey_eq(k.k-&gt;p, saved_k.p)) {</div><div class='del'>-					bch2_path_put_nokeep(trans, iter-&gt;path,</div><div class='del'>-						      iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-					iter-&gt;path = saved_path;</div><div class='del'>-					saved_path = 0;</div><div class='del'>-					iter-&gt;k	= saved_k;</div><div class='del'>-					k.v	= saved_v;</div><div class='del'>-					goto got_key;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (bch2_snapshot_is_ancestor(trans-&gt;c,</div><div class='del'>-							      iter-&gt;snapshot,</div><div class='del'>-							      k.k-&gt;p.snapshot)) {</div><div class='del'>-					if (saved_path)</div><div class='del'>-						bch2_path_put_nokeep(trans, saved_path,</div><div class='del'>-						      iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-					saved_path = btree_path_clone(trans, iter-&gt;path,</div><div class='del'>-								iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-					path = btree_iter_path(trans, iter);</div><div class='del'>-					saved_k = *k.k;</div><div class='del'>-					saved_v = k.v;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				search_key = bpos_predecessor(k.k-&gt;p);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-got_key:</div><div class='del'>-			if (bkey_whiteout(k.k) &amp;&amp;</div><div class='del'>-			    !(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS)) {</div><div class='del'>-				search_key = bkey_predecessor(iter, k.k-&gt;p);</div><div class='del'>-				if (iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS)</div><div class='del'>-					search_key.snapshot = U32_MAX;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			btree_path_set_should_be_locked(path);</div><div class='del'>-			break;</div><div class='del'>-		} else if (likely(!bpos_eq(path-&gt;l[0].b-&gt;data-&gt;min_key, POS_MIN))) {</div><div class='del'>-			/* Advance to previous leaf node: */</div><div class='del'>-			search_key = bpos_predecessor(path-&gt;l[0].b-&gt;data-&gt;min_key);</div><div class='del'>-		} else {</div><div class='del'>-			/* Start of btree: */</div><div class='del'>-			bch2_btree_iter_set_pos(iter, POS_MIN);</div><div class='del'>-			k = bkey_s_c_null;</div><div class='del'>-			goto out_no_locked;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bkey_gt(bkey_start_pos(k.k), iter-&gt;pos));</div><div class='del'>-</div><div class='del'>-	/* Extents can straddle iter-&gt;pos: */</div><div class='del'>-	if (bkey_lt(k.k-&gt;p, iter-&gt;pos))</div><div class='del'>-		iter-&gt;pos = k.k-&gt;p;</div><div class='del'>-</div><div class='del'>-	if (iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS)</div><div class='del'>-		iter-&gt;pos.snapshot = iter-&gt;snapshot;</div><div class='del'>-out_no_locked:</div><div class='del'>-	if (saved_path)</div><div class='del'>-		bch2_path_put_nokeep(trans, saved_path, iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_iter_prev() - returns first key less than iterator's current</div><div class='del'>- * position</div><div class='del'>- * @iter:	iterator to peek from</div><div class='del'>- *</div><div class='del'>- * Returns:	key if found, or an error extractable with bkey_err().</div><div class='del'>- */</div><div class='del'>-struct bkey_s_c bch2_btree_iter_prev(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_btree_iter_rewind(iter))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_iter_peek_prev(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-	struct bpos search_key;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-	EBUG_ON(btree_iter_path(trans, iter)-&gt;level &amp;&amp; (iter-&gt;flags &amp; BTREE_ITER_WITH_KEY_CACHE));</div><div class='del'>-</div><div class='del'>-	/* extents can't span inode numbers: */</div><div class='del'>-	if ((iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS) &amp;&amp;</div><div class='del'>-	    unlikely(iter-&gt;pos.offset == KEY_OFFSET_MAX)) {</div><div class='del'>-		if (iter-&gt;pos.inode == KEY_INODE_MAX)</div><div class='del'>-			return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(iter, bpos_nosnap_successor(iter-&gt;pos));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	search_key = btree_iter_search_key(iter);</div><div class='del'>-	iter-&gt;path = bch2_btree_path_set_pos(trans, iter-&gt;path, search_key,</div><div class='del'>-					iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-					btree_iter_ip_allocated(iter));</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_path_traverse(trans, iter-&gt;path, iter-&gt;flags);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		k = bkey_s_c_err(ret);</div><div class='del'>-		goto out_no_locked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((iter-&gt;flags &amp; BTREE_ITER_CACHED) ||</div><div class='del'>-	    !(iter-&gt;flags &amp; (BTREE_ITER_IS_EXTENTS|BTREE_ITER_FILTER_SNAPSHOTS))) {</div><div class='del'>-		k = bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-		if (unlikely((iter-&gt;flags &amp; BTREE_ITER_WITH_UPDATES) &amp;&amp;</div><div class='del'>-			     trans-&gt;nr_updates)) {</div><div class='del'>-			bch2_btree_trans_peek_slot_updates(trans, iter, &amp;k);</div><div class='del'>-			if (k.k)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(iter-&gt;flags &amp; BTREE_ITER_WITH_JOURNAL) &amp;&amp;</div><div class='del'>-		    (k = btree_trans_peek_slot_journal(trans, iter)).k)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (unlikely(iter-&gt;flags &amp; BTREE_ITER_WITH_KEY_CACHE) &amp;&amp;</div><div class='del'>-		    (k = btree_trans_peek_key_cache(iter, iter-&gt;pos)).k) {</div><div class='del'>-			if (!bkey_err(k))</div><div class='del'>-				iter-&gt;k = *k.k;</div><div class='del'>-			/* We're not returning a key from iter-&gt;path: */</div><div class='del'>-			goto out_no_locked;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_path_peek_slot(trans-&gt;paths + iter-&gt;path, &amp;iter-&gt;k);</div><div class='del'>-		if (unlikely(!k.k))</div><div class='del'>-			goto out_no_locked;</div><div class='del'>-	} else {</div><div class='del'>-		struct bpos next;</div><div class='del'>-		struct bpos end = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-		if (iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS)</div><div class='del'>-			end.offset = U64_MAX;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(btree_iter_path(trans, iter)-&gt;level);</div><div class='del'>-</div><div class='del'>-		if (iter-&gt;flags &amp; BTREE_ITER_INTENT) {</div><div class='del'>-			struct btree_iter iter2;</div><div class='del'>-</div><div class='del'>-			bch2_trans_copy_iter(&amp;iter2, iter);</div><div class='del'>-			k = bch2_btree_iter_peek_upto(&amp;iter2, end);</div><div class='del'>-</div><div class='del'>-			if (k.k &amp;&amp; !bkey_err(k)) {</div><div class='del'>-				iter-&gt;k = iter2.k;</div><div class='del'>-				k.k = &amp;iter-&gt;k;</div><div class='del'>-			}</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;iter2);</div><div class='del'>-		} else {</div><div class='del'>-			struct bpos pos = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-			k = bch2_btree_iter_peek_upto(iter, end);</div><div class='del'>-			if (unlikely(bkey_err(k)))</div><div class='del'>-				bch2_btree_iter_set_pos(iter, pos);</div><div class='del'>-			else</div><div class='del'>-				iter-&gt;pos = pos;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(bkey_err(k)))</div><div class='del'>-			goto out_no_locked;</div><div class='del'>-</div><div class='del'>-		next = k.k ? bkey_start_pos(k.k) : POS_MAX;</div><div class='del'>-</div><div class='del'>-		if (bkey_lt(iter-&gt;pos, next)) {</div><div class='del'>-			bkey_init(&amp;iter-&gt;k);</div><div class='del'>-			iter-&gt;k.p = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-			if (iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS) {</div><div class='del'>-				bch2_key_resize(&amp;iter-&gt;k,</div><div class='del'>-						min_t(u64, KEY_SIZE_MAX,</div><div class='del'>-						      (next.inode == iter-&gt;pos.inode</div><div class='del'>-						       ? next.offset</div><div class='del'>-						       : KEY_OFFSET_MAX) -</div><div class='del'>-						      iter-&gt;pos.offset));</div><div class='del'>-				EBUG_ON(!iter-&gt;k.size);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			k = (struct bkey_s_c) { &amp;iter-&gt;k, NULL };</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	btree_path_set_should_be_locked(btree_iter_path(trans, iter));</div><div class='del'>-out_no_locked:</div><div class='del'>-	bch2_btree_iter_verify_entry_exit(iter);</div><div class='del'>-	bch2_btree_iter_verify(iter);</div><div class='del'>-	ret = bch2_btree_iter_verify_ret(iter, k);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return bkey_s_c_err(ret);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_next_slot(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_btree_iter_advance(iter))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_iter_peek_slot(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_prev_slot(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_btree_iter_rewind(iter))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_iter_peek_slot(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	while (btree_trans_too_many_iters(iter-&gt;trans) ||</div><div class='del'>-	       (k = bch2_btree_iter_peek_type(iter, iter-&gt;flags),</div><div class='del'>-		bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart)))</div><div class='del'>-		bch2_trans_begin(iter-&gt;trans);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* new transactional stuff: */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-static void btree_trans_verify_sorted_refs(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(trans-&gt;nr_sorted != bitmap_weight(trans-&gt;paths_allocated, trans-&gt;nr_paths) - 1);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i) {</div><div class='del'>-		BUG_ON(path-&gt;sorted_idx &gt;= trans-&gt;nr_sorted);</div><div class='del'>-		BUG_ON(trans-&gt;sorted[path-&gt;sorted_idx] != i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; trans-&gt;nr_sorted; i++) {</div><div class='del'>-		unsigned idx = trans-&gt;sorted[i];</div><div class='del'>-</div><div class='del'>-		BUG_ON(!test_bit(idx, trans-&gt;paths_allocated));</div><div class='del'>-		BUG_ON(trans-&gt;paths[idx].sorted_idx != i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_trans_verify_sorted(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path, *prev = NULL;</div><div class='del'>-	struct trans_for_each_path_inorder_iter iter;</div><div class='del'>-</div><div class='del'>-	if (!bch2_debug_check_iterators)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_inorder(trans, path, iter) {</div><div class='del'>-		if (prev &amp;&amp; btree_path_cmp(prev, path) &gt; 0) {</div><div class='del'>-			__bch2_dump_trans_paths_updates(trans, true);</div><div class='del'>-			panic("trans paths out of order!\n");</div><div class='del'>-		}</div><div class='del'>-		prev = path;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void btree_trans_verify_sorted_refs(struct btree_trans *trans) {}</div><div class='del'>-static inline void btree_trans_verify_sorted(struct btree_trans *trans) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __bch2_btree_trans_sort_paths(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	int i, l = 0, r = trans-&gt;nr_sorted, inc = 1;</div><div class='del'>-	bool swapped;</div><div class='del'>-</div><div class='del'>-	btree_trans_verify_sorted_refs(trans);</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;paths_sorted)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Cocktail shaker sort: this is efficient because iterators will be</div><div class='del'>-	 * mostly sorted.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		swapped = false;</div><div class='del'>-</div><div class='del'>-		for (i = inc &gt; 0 ? l : r - 2;</div><div class='del'>-		     i + 1 &lt; r &amp;&amp; i &gt;= l;</div><div class='del'>-		     i += inc) {</div><div class='del'>-			if (btree_path_cmp(trans-&gt;paths + trans-&gt;sorted[i],</div><div class='del'>-					   trans-&gt;paths + trans-&gt;sorted[i + 1]) &gt; 0) {</div><div class='del'>-				swap(trans-&gt;sorted[i], trans-&gt;sorted[i + 1]);</div><div class='del'>-				trans-&gt;paths[trans-&gt;sorted[i]].sorted_idx = i;</div><div class='del'>-				trans-&gt;paths[trans-&gt;sorted[i + 1]].sorted_idx = i + 1;</div><div class='del'>-				swapped = true;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (inc &gt; 0)</div><div class='del'>-			--r;</div><div class='del'>-		else</div><div class='del'>-			l++;</div><div class='del'>-		inc = -inc;</div><div class='del'>-	} while (swapped);</div><div class='del'>-</div><div class='del'>-	trans-&gt;paths_sorted = true;</div><div class='del'>-out:</div><div class='del'>-	btree_trans_verify_sorted(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_path_list_remove(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(path-&gt;sorted_idx &gt;= trans-&gt;nr_sorted);</div><div class='del'>-#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='del'>-	trans-&gt;nr_sorted--;</div><div class='del'>-	memmove_u64s_down_small(trans-&gt;sorted + path-&gt;sorted_idx,</div><div class='del'>-				trans-&gt;sorted + path-&gt;sorted_idx + 1,</div><div class='del'>-				DIV_ROUND_UP(trans-&gt;nr_sorted - path-&gt;sorted_idx,</div><div class='del'>-					     sizeof(u64) / sizeof(btree_path_idx_t)));</div><div class='del'>-#else</div><div class='del'>-	array_remove_item(trans-&gt;sorted, trans-&gt;nr_sorted, path-&gt;sorted_idx);</div><div class='del'>-#endif</div><div class='del'>-	for (unsigned i = path-&gt;sorted_idx; i &lt; trans-&gt;nr_sorted; i++)</div><div class='del'>-		trans-&gt;paths[trans-&gt;sorted[i]].sorted_idx = i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_path_list_add(struct btree_trans *trans,</div><div class='del'>-				       btree_path_idx_t pos,</div><div class='del'>-				       btree_path_idx_t path_idx)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-</div><div class='del'>-	path-&gt;sorted_idx = pos ? trans-&gt;paths[pos].sorted_idx + 1 : trans-&gt;nr_sorted;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='del'>-	memmove_u64s_up_small(trans-&gt;sorted + path-&gt;sorted_idx + 1,</div><div class='del'>-			      trans-&gt;sorted + path-&gt;sorted_idx,</div><div class='del'>-			      DIV_ROUND_UP(trans-&gt;nr_sorted - path-&gt;sorted_idx,</div><div class='del'>-					   sizeof(u64) / sizeof(btree_path_idx_t)));</div><div class='del'>-	trans-&gt;nr_sorted++;</div><div class='del'>-	trans-&gt;sorted[path-&gt;sorted_idx] = path_idx;</div><div class='del'>-#else</div><div class='del'>-	array_insert_item(trans-&gt;sorted, trans-&gt;nr_sorted, path-&gt;sorted_idx, path_idx);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for (unsigned i = path-&gt;sorted_idx; i &lt; trans-&gt;nr_sorted; i++)</div><div class='del'>-		trans-&gt;paths[trans-&gt;sorted[i]].sorted_idx = i;</div><div class='del'>-</div><div class='del'>-	btree_trans_verify_sorted_refs(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_iter_exit(struct btree_trans *trans, struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (iter-&gt;update_path)</div><div class='del'>-		bch2_path_put_nokeep(trans, iter-&gt;update_path,</div><div class='del'>-			      iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-	if (iter-&gt;path)</div><div class='del'>-		bch2_path_put(trans, iter-&gt;path,</div><div class='del'>-			      iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-	if (iter-&gt;key_cache_path)</div><div class='del'>-		bch2_path_put(trans, iter-&gt;key_cache_path,</div><div class='del'>-			      iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-	iter-&gt;path		= 0;</div><div class='del'>-	iter-&gt;update_path	= 0;</div><div class='del'>-	iter-&gt;key_cache_path	= 0;</div><div class='del'>-	iter-&gt;trans		= NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_iter_init_outlined(struct btree_trans *trans,</div><div class='del'>-			  struct btree_iter *iter,</div><div class='del'>-			  enum btree_id btree_id, struct bpos pos,</div><div class='del'>-			  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	bch2_trans_iter_init_common(trans, iter, btree_id, pos, 0, 0,</div><div class='del'>-			       bch2_btree_iter_flags(trans, btree_id, flags),</div><div class='del'>-			       _RET_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_node_iter_init(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       enum btree_id btree_id,</div><div class='del'>-			       struct bpos pos,</div><div class='del'>-			       unsigned locks_want,</div><div class='del'>-			       unsigned depth,</div><div class='del'>-			       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	flags |= BTREE_ITER_NOT_EXTENTS;</div><div class='del'>-	flags |= __BTREE_ITER_ALL_SNAPSHOTS;</div><div class='del'>-	flags |= BTREE_ITER_ALL_SNAPSHOTS;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init_common(trans, iter, btree_id, pos, locks_want, depth,</div><div class='del'>-			       __bch2_btree_iter_flags(trans, btree_id, flags),</div><div class='del'>-			       _RET_IP_);</div><div class='del'>-</div><div class='del'>-	iter-&gt;min_depth	= depth;</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	BUG_ON(path-&gt;locks_want	 &lt; min(locks_want, BTREE_MAX_DEPTH));</div><div class='del'>-	BUG_ON(path-&gt;level	!= depth);</div><div class='del'>-	BUG_ON(iter-&gt;min_depth	!= depth);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_copy_iter(struct btree_iter *dst, struct btree_iter *src)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = src-&gt;trans;</div><div class='del'>-</div><div class='del'>-	*dst = *src;</div><div class='del'>-	if (src-&gt;path)</div><div class='del'>-		__btree_path_get(trans-&gt;paths + src-&gt;path, src-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-	if (src-&gt;update_path)</div><div class='del'>-		__btree_path_get(trans-&gt;paths + src-&gt;update_path, src-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-	dst-&gt;key_cache_path = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *__bch2_trans_kmalloc(struct btree_trans *trans, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	unsigned new_top = trans-&gt;mem_top + size;</div><div class='del'>-	unsigned old_bytes = trans-&gt;mem_bytes;</div><div class='del'>-	unsigned new_bytes = roundup_pow_of_two(new_top);</div><div class='del'>-	int ret;</div><div class='del'>-	void *new_mem;</div><div class='del'>-	void *p;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(new_bytes &gt; BTREE_TRANS_MEM_MAX);</div><div class='del'>-</div><div class='del'>-	struct btree_transaction_stats *s = btree_trans_stats(trans);</div><div class='del'>-	s-&gt;max_mem = max(s-&gt;max_mem, new_bytes);</div><div class='del'>-</div><div class='del'>-	new_mem = krealloc(trans-&gt;mem, new_bytes, GFP_NOWAIT|__GFP_NOWARN);</div><div class='del'>-	if (unlikely(!new_mem)) {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-		new_mem = krealloc(trans-&gt;mem, new_bytes, GFP_KERNEL);</div><div class='del'>-		if (!new_mem &amp;&amp; new_bytes &lt;= BTREE_TRANS_MEM_MAX) {</div><div class='del'>-			new_mem = mempool_alloc(&amp;c-&gt;btree_trans_mem_pool, GFP_KERNEL);</div><div class='del'>-			new_bytes = BTREE_TRANS_MEM_MAX;</div><div class='del'>-			kfree(trans-&gt;mem);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!new_mem)</div><div class='del'>-			return ERR_PTR(-BCH_ERR_ENOMEM_trans_kmalloc);</div><div class='del'>-</div><div class='del'>-		trans-&gt;mem = new_mem;</div><div class='del'>-		trans-&gt;mem_bytes = new_bytes;</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_relock(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans-&gt;mem = new_mem;</div><div class='del'>-	trans-&gt;mem_bytes = new_bytes;</div><div class='del'>-</div><div class='del'>-	if (old_bytes) {</div><div class='del'>-		trace_and_count(c, trans_restart_mem_realloced, trans, _RET_IP_, new_bytes);</div><div class='del'>-		return ERR_PTR(btree_trans_restart(trans, BCH_ERR_transaction_restart_mem_realloced));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p = trans-&gt;mem + trans-&gt;mem_top;</div><div class='del'>-	trans-&gt;mem_top += size;</div><div class='del'>-	memset(p, 0, size);</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void check_srcu_held_too_long(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	WARN(trans-&gt;srcu_held &amp;&amp; time_after(jiffies, trans-&gt;srcu_lock_time + HZ * 10),</div><div class='del'>-	     "btree trans held srcu lock (delaying memory reclaim) for %lu seconds",</div><div class='del'>-	     (jiffies - trans-&gt;srcu_lock_time) / HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_srcu_unlock(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;srcu_held) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-		struct btree_path *path;</div><div class='del'>-		unsigned i;</div><div class='del'>-</div><div class='del'>-		trans_for_each_path(trans, path, i)</div><div class='del'>-			if (path-&gt;cached &amp;&amp; !btree_node_locked(path, 0))</div><div class='del'>-				path-&gt;l[0].b = ERR_PTR(-BCH_ERR_no_btree_node_srcu_reset);</div><div class='del'>-</div><div class='del'>-		check_srcu_held_too_long(trans);</div><div class='del'>-		srcu_read_unlock(&amp;c-&gt;btree_trans_barrier, trans-&gt;srcu_idx);</div><div class='del'>-		trans-&gt;srcu_held = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_trans_srcu_lock(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (!trans-&gt;srcu_held) {</div><div class='del'>-		trans-&gt;srcu_idx = srcu_read_lock(&amp;trans-&gt;c-&gt;btree_trans_barrier);</div><div class='del'>-		trans-&gt;srcu_lock_time	= jiffies;</div><div class='del'>-		trans-&gt;srcu_held = true;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_trans_begin() - reset a transaction after a interrupted attempt</div><div class='del'>- * @trans: transaction to reset</div><div class='del'>- *</div><div class='del'>- * Returns:	current restart counter, to be used with trans_was_restarted()</div><div class='del'>- *</div><div class='del'>- * While iterating over nodes or updating nodes a attempt to lock a btree node</div><div class='del'>- * may return BCH_ERR_transaction_restart when the trylock fails. When this</div><div class='del'>- * occurs bch2_trans_begin() should be called and the transaction retried.</div><div class='del'>- */</div><div class='del'>-u32 bch2_trans_begin(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-	u64 now;</div><div class='del'>-</div><div class='del'>-	bch2_trans_reset_updates(trans);</div><div class='del'>-</div><div class='del'>-	trans-&gt;restart_count++;</div><div class='del'>-	trans-&gt;mem_top			= 0;</div><div class='del'>-	trans-&gt;journal_entries		= NULL;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i) {</div><div class='del'>-		path-&gt;should_be_locked = false;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the transaction wasn't restarted, we're presuming to be</div><div class='del'>-		 * doing something new: dont keep iterators excpt the ones that</div><div class='del'>-		 * are in use - except for the subvolumes btree:</div><div class='del'>-		 */</div><div class='del'>-		if (!trans-&gt;restarted &amp;&amp; path-&gt;btree_id != BTREE_ID_subvolumes)</div><div class='del'>-			path-&gt;preserve = false;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: we probably shouldn't be doing this if the transaction</div><div class='del'>-		 * was restarted, but currently we still overflow transaction</div><div class='del'>-		 * iterators if we do that</div><div class='del'>-		 */</div><div class='del'>-		if (!path-&gt;ref &amp;&amp; !path-&gt;preserve)</div><div class='del'>-			__bch2_path_free(trans, i);</div><div class='del'>-		else</div><div class='del'>-			path-&gt;preserve = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	now = local_clock();</div><div class='del'>-</div><div class='del'>-	if (!IS_ENABLED(CONFIG_BCACHEFS_NO_LATENCY_ACCT) &amp;&amp;</div><div class='del'>-	    time_after64(now, trans-&gt;last_begin_time + 10))</div><div class='del'>-		__bch2_time_stats_update(&amp;btree_trans_stats(trans)-&gt;duration,</div><div class='del'>-					 trans-&gt;last_begin_time, now);</div><div class='del'>-</div><div class='del'>-	if (!trans-&gt;restarted &amp;&amp;</div><div class='del'>-	    (need_resched() ||</div><div class='del'>-	     time_after64(now, trans-&gt;last_begin_time + BTREE_TRANS_MAX_LOCK_HOLD_TIME_NS))) {</div><div class='del'>-		drop_locks_do(trans, (cond_resched(), 0));</div><div class='del'>-		now = local_clock();</div><div class='del'>-	}</div><div class='del'>-	trans-&gt;last_begin_time = now;</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;srcu_held &amp;&amp;</div><div class='del'>-		     time_after(jiffies, trans-&gt;srcu_lock_time + msecs_to_jiffies(10))))</div><div class='del'>-		bch2_trans_srcu_unlock(trans);</div><div class='del'>-</div><div class='del'>-	trans-&gt;last_begin_ip = _RET_IP_;</div><div class='del'>-	if (trans-&gt;restarted) {</div><div class='del'>-		bch2_btree_path_traverse_all(trans);</div><div class='del'>-		trans-&gt;notrace_relock_fail = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return trans-&gt;restart_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *bch2_btree_transaction_fns[BCH_TRANSACTIONS_NR] = { "(unknown)" };</div><div class='del'>-</div><div class='del'>-unsigned bch2_trans_get_fn_idx(const char *fn)</div><div class='del'>-{</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(bch2_btree_transaction_fns); i++)</div><div class='del'>-		if (!bch2_btree_transaction_fns[i] ||</div><div class='del'>-		    bch2_btree_transaction_fns[i] == fn) {</div><div class='del'>-			bch2_btree_transaction_fns[i] = fn;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	pr_warn_once("BCH_TRANSACTIONS_NR not big enough!");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_trans *__bch2_trans_get(struct bch_fs *c, unsigned fn_idx)</div><div class='del'>-	__acquires(&amp;c-&gt;btree_trans_barrier)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(__KERNEL__)) {</div><div class='del'>-		trans = this_cpu_xchg(c-&gt;btree_trans_bufs-&gt;trans, NULL);</div><div class='del'>-		if (trans) {</div><div class='del'>-			memset(trans, 0, offsetof(struct btree_trans, list));</div><div class='del'>-			goto got_trans;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans = mempool_alloc(&amp;c-&gt;btree_trans_pool, GFP_NOFS);</div><div class='del'>-	memset(trans, 0, sizeof(*trans));</div><div class='del'>-	closure_init_stack(&amp;trans-&gt;ref);</div><div class='del'>-</div><div class='del'>-	seqmutex_lock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-	if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG)) {</div><div class='del'>-		struct btree_trans *pos;</div><div class='del'>-		pid_t pid = current-&gt;pid;</div><div class='del'>-</div><div class='del'>-		trans-&gt;locking_wait.task = current;</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(pos, &amp;c-&gt;btree_trans_list, list) {</div><div class='del'>-			struct task_struct *pos_task = READ_ONCE(pos-&gt;locking_wait.task);</div><div class='del'>-			/*</div><div class='del'>-			 * We'd much prefer to be stricter here and completely</div><div class='del'>-			 * disallow multiple btree_trans in the same thread -</div><div class='del'>-			 * but the data move path calls bch2_write when we</div><div class='del'>-			 * already have a btree_trans initialized.</div><div class='del'>-			 */</div><div class='del'>-			BUG_ON(pos_task &amp;&amp;</div><div class='del'>-			       pid == pos_task-&gt;pid &amp;&amp;</div><div class='del'>-			       bch2_trans_locked(pos));</div><div class='del'>-</div><div class='del'>-			if (pos_task &amp;&amp; pid &lt; pos_task-&gt;pid) {</div><div class='del'>-				list_add_tail(&amp;trans-&gt;list, &amp;pos-&gt;list);</div><div class='del'>-				goto list_add_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;trans-&gt;list, &amp;c-&gt;btree_trans_list);</div><div class='del'>-list_add_done:</div><div class='del'>-	seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-got_trans:</div><div class='del'>-	trans-&gt;c		= c;</div><div class='del'>-	trans-&gt;last_begin_time	= local_clock();</div><div class='del'>-	trans-&gt;fn_idx		= fn_idx;</div><div class='del'>-	trans-&gt;locking_wait.task = current;</div><div class='del'>-	trans-&gt;journal_replay_not_finished =</div><div class='del'>-		unlikely(!test_bit(JOURNAL_REPLAY_DONE, &amp;c-&gt;journal.flags)) &amp;&amp;</div><div class='del'>-		atomic_inc_not_zero(&amp;c-&gt;journal_keys.ref);</div><div class='del'>-	trans-&gt;nr_paths		= ARRAY_SIZE(trans-&gt;_paths);</div><div class='del'>-	trans-&gt;paths_allocated	= trans-&gt;_paths_allocated;</div><div class='del'>-	trans-&gt;sorted		= trans-&gt;_sorted;</div><div class='del'>-	trans-&gt;paths		= trans-&gt;_paths;</div><div class='del'>-	trans-&gt;updates		= trans-&gt;_updates;</div><div class='del'>-</div><div class='del'>-	*trans_paths_nr(trans-&gt;paths) = BTREE_ITER_INITIAL;</div><div class='del'>-</div><div class='del'>-	trans-&gt;paths_allocated[0] = 1;</div><div class='del'>-</div><div class='del'>-	if (fn_idx &lt; BCH_TRANSACTIONS_NR) {</div><div class='del'>-		trans-&gt;fn = bch2_btree_transaction_fns[fn_idx];</div><div class='del'>-</div><div class='del'>-		struct btree_transaction_stats *s = &amp;c-&gt;btree_transaction_stats[fn_idx];</div><div class='del'>-</div><div class='del'>-		if (s-&gt;max_mem) {</div><div class='del'>-			unsigned expected_mem_bytes = roundup_pow_of_two(s-&gt;max_mem);</div><div class='del'>-</div><div class='del'>-			trans-&gt;mem = kmalloc(expected_mem_bytes, GFP_KERNEL);</div><div class='del'>-			if (likely(trans-&gt;mem))</div><div class='del'>-				trans-&gt;mem_bytes = expected_mem_bytes;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		trans-&gt;nr_paths_max = s-&gt;nr_max_paths;</div><div class='del'>-		trans-&gt;journal_entries_size = s-&gt;journal_entries_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans-&gt;srcu_idx		= srcu_read_lock(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-	trans-&gt;srcu_lock_time	= jiffies;</div><div class='del'>-	trans-&gt;srcu_held	= true;</div><div class='del'>-	return trans;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_btree_paths_leaked(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path-&gt;ref)</div><div class='del'>-			goto leaked;</div><div class='del'>-	return;</div><div class='del'>-leaked:</div><div class='del'>-	bch_err(c, "btree paths leaked from %s!", trans-&gt;fn);</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path-&gt;ref)</div><div class='del'>-			printk(KERN_ERR "  btree %s %pS\n",</div><div class='del'>-			       bch2_btree_id_str(path-&gt;btree_id),</div><div class='del'>-			       (void *) path-&gt;ip_allocated);</div><div class='del'>-	/* Be noisy about this: */</div><div class='del'>-	bch2_fatal_error(c);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_put(struct btree_trans *trans)</div><div class='del'>-	__releases(&amp;c-&gt;btree_trans_barrier)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		__btree_path_put(trans-&gt;paths + i-&gt;path, true);</div><div class='del'>-	trans-&gt;nr_updates	= 0;</div><div class='del'>-	trans-&gt;locking_wait.task = NULL;</div><div class='del'>-</div><div class='del'>-	check_btree_paths_leaked(trans);</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;srcu_held) {</div><div class='del'>-		check_srcu_held_too_long(trans);</div><div class='del'>-		srcu_read_unlock(&amp;c-&gt;btree_trans_barrier, trans-&gt;srcu_idx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;fs_usage_deltas) {</div><div class='del'>-		if (trans-&gt;fs_usage_deltas-&gt;size + sizeof(trans-&gt;fs_usage_deltas) ==</div><div class='del'>-		    REPLICAS_DELTA_LIST_MAX)</div><div class='del'>-			mempool_free(trans-&gt;fs_usage_deltas,</div><div class='del'>-				     &amp;c-&gt;replicas_delta_pool);</div><div class='del'>-		else</div><div class='del'>-			kfree(trans-&gt;fs_usage_deltas);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;journal_replay_not_finished))</div><div class='del'>-		bch2_journal_keys_put(c);</div><div class='del'>-</div><div class='del'>-	unsigned long *paths_allocated = trans-&gt;paths_allocated;</div><div class='del'>-	trans-&gt;paths_allocated	= NULL;</div><div class='del'>-	trans-&gt;paths		= NULL;</div><div class='del'>-</div><div class='del'>-	if (paths_allocated != trans-&gt;_paths_allocated)</div><div class='del'>-		kfree_rcu_mightsleep(paths_allocated);</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;mem_bytes == BTREE_TRANS_MEM_MAX)</div><div class='del'>-		mempool_free(trans-&gt;mem, &amp;c-&gt;btree_trans_mem_pool);</div><div class='del'>-	else</div><div class='del'>-		kfree(trans-&gt;mem);</div><div class='del'>-</div><div class='del'>-	/* Userspace doesn't have a real percpu implementation: */</div><div class='del'>-	if (IS_ENABLED(__KERNEL__))</div><div class='del'>-		trans = this_cpu_xchg(c-&gt;btree_trans_bufs-&gt;trans, trans);</div><div class='del'>-</div><div class='del'>-	if (trans) {</div><div class='del'>-		closure_sync(&amp;trans-&gt;ref);</div><div class='del'>-</div><div class='del'>-		seqmutex_lock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-		list_del(&amp;trans-&gt;list);</div><div class='del'>-		seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-</div><div class='del'>-		mempool_free(trans, &amp;c-&gt;btree_trans_pool);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __maybe_unused</div><div class='del'>-bch2_btree_bkey_cached_common_to_text(struct printbuf *out,</div><div class='del'>-				      struct btree_bkey_cached_common *b)</div><div class='del'>-{</div><div class='del'>-	struct six_lock_count c = six_lock_counts(&amp;b-&gt;lock);</div><div class='del'>-	struct task_struct *owner;</div><div class='del'>-	pid_t pid;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	owner = READ_ONCE(b-&gt;lock.owner);</div><div class='del'>-	pid = owner ? owner-&gt;pid : 0;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%px %c l=%u %s:", b, b-&gt;cached ? 'c' : 'b',</div><div class='del'>-		   b-&gt;level, bch2_btree_id_str(b-&gt;btree_id));</div><div class='del'>-	bch2_bpos_to_text(out, btree_node_pos(b));</div><div class='del'>-</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, " locks %u:%u:%u held by pid %u",</div><div class='del'>-		   c.n[0], c.n[1], c.n[2], pid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_trans_to_text(struct printbuf *out, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_bkey_cached_common *b;</div><div class='del'>-	static char lock_types[] = { 'r', 'i', 'w' };</div><div class='del'>-	struct task_struct *task = READ_ONCE(trans-&gt;locking_wait.task);</div><div class='del'>-	unsigned l, idx;</div><div class='del'>-</div><div class='del'>-	/* before rcu_read_lock(): */</div><div class='del'>-	bch2_printbuf_make_room(out, 4096);</div><div class='del'>-</div><div class='del'>-	if (!out-&gt;nr_tabstops) {</div><div class='del'>-		printbuf_tabstop_push(out, 16);</div><div class='del'>-		printbuf_tabstop_push(out, 32);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%i %s\n", task ? task-&gt;pid : 0, trans-&gt;fn);</div><div class='del'>-</div><div class='del'>-	/* trans-&gt;paths is rcu protected vs. freeing */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-</div><div class='del'>-	struct btree_path *paths = rcu_dereference(trans-&gt;paths);</div><div class='del'>-	if (!paths)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	unsigned long *paths_allocated = trans_paths_allocated(paths);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_idx_from(paths_allocated, *trans_paths_nr(paths), idx, 1) {</div><div class='del'>-		struct btree_path *path = paths + idx;</div><div class='del'>-		if (!path-&gt;nodes_locked)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "  path %u %c l=%u %s:",</div><div class='del'>-		       idx,</div><div class='del'>-		       path-&gt;cached ? 'c' : 'b',</div><div class='del'>-		       path-&gt;level,</div><div class='del'>-		       bch2_btree_id_str(path-&gt;btree_id));</div><div class='del'>-		bch2_bpos_to_text(out, path-&gt;pos);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-</div><div class='del'>-		for (l = 0; l &lt; BTREE_MAX_DEPTH; l++) {</div><div class='del'>-			if (btree_node_locked(path, l) &amp;&amp;</div><div class='del'>-			    !IS_ERR_OR_NULL(b = (void *) READ_ONCE(path-&gt;l[l].b))) {</div><div class='del'>-				prt_printf(out, "    %c l=%u ",</div><div class='del'>-					   lock_types[btree_node_locked_type(path, l)], l);</div><div class='del'>-				bch2_btree_bkey_cached_common_to_text(out, b);</div><div class='del'>-				prt_newline(out);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b = READ_ONCE(trans-&gt;locking);</div><div class='del'>-	if (b) {</div><div class='del'>-		prt_printf(out, "  blocked for %lluus on",</div><div class='del'>-			   div_u64(local_clock() - trans-&gt;locking_wait.start_time,</div><div class='del'>-				   1000));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-		prt_printf(out, "    %c", lock_types[trans-&gt;locking_wait.lock_want]);</div><div class='del'>-		bch2_btree_bkey_cached_common_to_text(out, b);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	--out-&gt;atomic;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_iter_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_transaction_stats *s;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;btree_trans_bufs)</div><div class='del'>-		for_each_possible_cpu(cpu) {</div><div class='del'>-			struct btree_trans *trans =</div><div class='del'>-				per_cpu_ptr(c-&gt;btree_trans_bufs, cpu)-&gt;trans;</div><div class='del'>-</div><div class='del'>-			if (trans) {</div><div class='del'>-				closure_sync(&amp;trans-&gt;ref);</div><div class='del'>-</div><div class='del'>-				seqmutex_lock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-				list_del(&amp;trans-&gt;list);</div><div class='del'>-				seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-			}</div><div class='del'>-			kfree(trans);</div><div class='del'>-		}</div><div class='del'>-	free_percpu(c-&gt;btree_trans_bufs);</div><div class='del'>-</div><div class='del'>-	trans = list_first_entry_or_null(&amp;c-&gt;btree_trans_list, struct btree_trans, list);</div><div class='del'>-	if (trans)</div><div class='del'>-		panic("%s leaked btree_trans\n", trans-&gt;fn);</div><div class='del'>-</div><div class='del'>-	for (s = c-&gt;btree_transaction_stats;</div><div class='del'>-	     s &lt; c-&gt;btree_transaction_stats + ARRAY_SIZE(c-&gt;btree_transaction_stats);</div><div class='del'>-	     s++) {</div><div class='del'>-		kfree(s-&gt;max_paths_text);</div><div class='del'>-		bch2_time_stats_exit(&amp;s-&gt;lock_hold_times);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;btree_trans_barrier_initialized)</div><div class='del'>-		cleanup_srcu_struct(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-	mempool_exit(&amp;c-&gt;btree_trans_mem_pool);</div><div class='del'>-	mempool_exit(&amp;c-&gt;btree_trans_pool);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_iter_init_early(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_transaction_stats *s;</div><div class='del'>-</div><div class='del'>-	for (s = c-&gt;btree_transaction_stats;</div><div class='del'>-	     s &lt; c-&gt;btree_transaction_stats + ARRAY_SIZE(c-&gt;btree_transaction_stats);</div><div class='del'>-	     s++) {</div><div class='del'>-		bch2_time_stats_init(&amp;s-&gt;duration);</div><div class='del'>-		bch2_time_stats_init(&amp;s-&gt;lock_hold_times);</div><div class='del'>-		mutex_init(&amp;s-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;btree_trans_list);</div><div class='del'>-	seqmutex_init(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_btree_iter_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	c-&gt;btree_trans_bufs = alloc_percpu(struct btree_trans_buf);</div><div class='del'>-	if (!c-&gt;btree_trans_bufs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ret   = mempool_init_kmalloc_pool(&amp;c-&gt;btree_trans_pool, 1,</div><div class='del'>-					  sizeof(struct btree_trans)) ?:</div><div class='del'>-		mempool_init_kmalloc_pool(&amp;c-&gt;btree_trans_mem_pool, 1,</div><div class='del'>-					  BTREE_TRANS_MEM_MAX) ?:</div><div class='del'>-		init_srcu_struct(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-	if (!ret)</div><div class='del'>-		c-&gt;btree_trans_barrier_initialized = true;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h<br/>deleted file mode 100644<br/>index 24772538e4cc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_iter.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_iter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,884 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_ITER_H</div><div class='del'>-#define _BCACHEFS_BTREE_ITER_H</div><div class='del'>-</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-static inline int __bkey_err(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return PTR_ERR_OR_ZERO(k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_err(_k)	__bkey_err((_k).k)</div><div class='del'>-</div><div class='del'>-static inline void __btree_path_get(struct btree_path *path, bool intent)</div><div class='del'>-{</div><div class='del'>-	path-&gt;ref++;</div><div class='del'>-	path-&gt;intent_ref += intent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __btree_path_put(struct btree_path *path, bool intent)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!path-&gt;ref);</div><div class='del'>-	EBUG_ON(!path-&gt;intent_ref &amp;&amp; intent);</div><div class='del'>-	path-&gt;intent_ref -= intent;</div><div class='del'>-	return --path-&gt;ref == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_path_set_dirty(struct btree_path *path,</div><div class='del'>-					enum btree_path_uptodate u)</div><div class='del'>-{</div><div class='del'>-	path-&gt;uptodate = max_t(unsigned, path-&gt;uptodate, u);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree *btree_path_node(struct btree_path *path,</div><div class='del'>-					    unsigned level)</div><div class='del'>-{</div><div class='del'>-	return level &lt; BTREE_MAX_DEPTH ? path-&gt;l[level].b : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_lock_seq_matches(const struct btree_path *path,</div><div class='del'>-					const struct btree *b, unsigned level)</div><div class='del'>-{</div><div class='del'>-	return path-&gt;l[level].lock_seq == six_lock_seq(&amp;b-&gt;c.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree *btree_node_parent(struct btree_path *path,</div><div class='del'>-					      struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return btree_path_node(path, b-&gt;c.level + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Iterate over paths within a transaction: */</div><div class='del'>-</div><div class='del'>-void __bch2_btree_trans_sort_paths(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-static inline void btree_trans_sort_paths(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_BCACHEFS_DEBUG) &amp;&amp;</div><div class='del'>-	    trans-&gt;paths_sorted)</div><div class='del'>-		return;</div><div class='del'>-	__bch2_btree_trans_sort_paths(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long *trans_paths_nr(struct btree_path *paths)</div><div class='del'>-{</div><div class='del'>-	return &amp;container_of(paths, struct btree_trans_paths, paths[0])-&gt;nr_paths;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long *trans_paths_allocated(struct btree_path *paths)</div><div class='del'>-{</div><div class='del'>-	unsigned long *v = trans_paths_nr(paths);</div><div class='del'>-	return v - BITS_TO_LONGS(*v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define trans_for_each_path_idx_from(_paths_allocated, _nr, _idx, _start)\</div><div class='del'>-	for (_idx = _start;						\</div><div class='del'>-	     (_idx = find_next_bit(_paths_allocated, _nr, _idx)) &lt; _nr;	\</div><div class='del'>-	     _idx++)</div><div class='del'>-</div><div class='del'>-static inline struct btree_path *</div><div class='del'>-__trans_next_path(struct btree_trans *trans, unsigned *idx)</div><div class='del'>-{</div><div class='del'>-	unsigned long *w = trans-&gt;paths_allocated + *idx / BITS_PER_LONG;</div><div class='del'>-	/*</div><div class='del'>-	 * Open coded find_next_bit(), because</div><div class='del'>-	 *  - this is fast path, we can't afford the function call</div><div class='del'>-	 *  - and we know that nr_paths is a multiple of BITS_PER_LONG,</div><div class='del'>-	 */</div><div class='del'>-	while (*idx &lt; trans-&gt;nr_paths) {</div><div class='del'>-		unsigned long v = *w &gt;&gt; (*idx &amp; (BITS_PER_LONG - 1));</div><div class='del'>-		if (v) {</div><div class='del'>-			*idx += __ffs(v);</div><div class='del'>-			return trans-&gt;paths + *idx;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*idx += BITS_PER_LONG;</div><div class='del'>-		*idx &amp;= ~(BITS_PER_LONG - 1);</div><div class='del'>-		w++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This version is intended to be safe for use on a btree_trans that is owned by</div><div class='del'>- * another thread, for bch2_btree_trans_to_text();</div><div class='del'>- */</div><div class='del'>-#define trans_for_each_path_from(_trans, _path, _idx, _start)		\</div><div class='del'>-	for (_idx = _start;						\</div><div class='del'>-	     (_path = __trans_next_path((_trans), &amp;_idx));		\</div><div class='del'>-	     _idx++)</div><div class='del'>-</div><div class='del'>-#define trans_for_each_path(_trans, _path, _idx)			\</div><div class='del'>-	trans_for_each_path_from(_trans, _path, _idx, 1)</div><div class='del'>-</div><div class='del'>-static inline struct btree_path *next_btree_path(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	unsigned idx = path ? path-&gt;sorted_idx + 1 : 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(idx &gt; trans-&gt;nr_sorted);</div><div class='del'>-</div><div class='del'>-	return idx &lt; trans-&gt;nr_sorted</div><div class='del'>-		? trans-&gt;paths + trans-&gt;sorted[idx]</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_path *prev_btree_path(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	unsigned idx = path ? path-&gt;sorted_idx : trans-&gt;nr_sorted;</div><div class='del'>-</div><div class='del'>-	return idx</div><div class='del'>-		? trans-&gt;paths + trans-&gt;sorted[idx - 1]</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define trans_for_each_path_idx_inorder(_trans, _iter)			\</div><div class='del'>-	for (_iter = (struct trans_for_each_path_inorder_iter) { 0 };	\</div><div class='del'>-	     (_iter.path_idx = trans-&gt;sorted[_iter.sorted_idx],		\</div><div class='del'>-	      _iter.sorted_idx &lt; (_trans)-&gt;nr_sorted);			\</div><div class='del'>-	     _iter.sorted_idx++)</div><div class='del'>-</div><div class='del'>-struct trans_for_each_path_inorder_iter {</div><div class='del'>-	btree_path_idx_t	sorted_idx;</div><div class='del'>-	btree_path_idx_t	path_idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define trans_for_each_path_inorder(_trans, _path, _iter)		\</div><div class='del'>-	for (_iter = (struct trans_for_each_path_inorder_iter) { 0 };	\</div><div class='del'>-	     (_iter.path_idx = trans-&gt;sorted[_iter.sorted_idx],		\</div><div class='del'>-	      _path = (_trans)-&gt;paths + _iter.path_idx,			\</div><div class='del'>-	      _iter.sorted_idx &lt; (_trans)-&gt;nr_sorted);			\</div><div class='del'>-	     _iter.sorted_idx++)</div><div class='del'>-</div><div class='del'>-#define trans_for_each_path_inorder_reverse(_trans, _path, _i)		\</div><div class='del'>-	for (_i = trans-&gt;nr_sorted - 1;					\</div><div class='del'>-	     ((_path) = (_trans)-&gt;paths + trans-&gt;sorted[_i]), (_i) &gt;= 0;\</div><div class='del'>-	     --_i)</div><div class='del'>-</div><div class='del'>-static inline bool __path_has_node(const struct btree_path *path,</div><div class='del'>-				   const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return path-&gt;l[b-&gt;c.level].b == b &amp;&amp;</div><div class='del'>-		btree_node_lock_seq_matches(path, b, b-&gt;c.level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_path *</div><div class='del'>-__trans_next_path_with_node(struct btree_trans *trans, struct btree *b,</div><div class='del'>-			    unsigned *idx)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-</div><div class='del'>-	while ((path = __trans_next_path(trans, idx)) &amp;&amp;</div><div class='del'>-		!__path_has_node(path, b))</div><div class='del'>-	       (*idx)++;</div><div class='del'>-</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define trans_for_each_path_with_node(_trans, _b, _path, _iter)		\</div><div class='del'>-	for (_iter = 1;							\</div><div class='del'>-	     (_path = __trans_next_path_with_node((_trans), (_b), &amp;_iter));\</div><div class='del'>-	     _iter++)</div><div class='del'>-</div><div class='del'>-btree_path_idx_t __bch2_btree_path_make_mut(struct btree_trans *, btree_path_idx_t,</div><div class='del'>-					    bool, unsigned long);</div><div class='del'>-</div><div class='del'>-static inline btree_path_idx_t __must_check</div><div class='del'>-bch2_btree_path_make_mut(struct btree_trans *trans,</div><div class='del'>-			 btree_path_idx_t path, bool intent,</div><div class='del'>-			 unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;paths[path].ref &gt; 1 ||</div><div class='del'>-	    trans-&gt;paths[path].preserve)</div><div class='del'>-		path = __bch2_btree_path_make_mut(trans, path, intent, ip);</div><div class='del'>-	trans-&gt;paths[path].should_be_locked = false;</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-btree_path_idx_t __must_check</div><div class='del'>-__bch2_btree_path_set_pos(struct btree_trans *, btree_path_idx_t,</div><div class='del'>-			  struct bpos, bool, unsigned long);</div><div class='del'>-</div><div class='del'>-static inline btree_path_idx_t __must_check</div><div class='del'>-bch2_btree_path_set_pos(struct btree_trans *trans,</div><div class='del'>-			btree_path_idx_t path, struct bpos new_pos,</div><div class='del'>-			bool intent, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	return !bpos_eq(new_pos, trans-&gt;paths[path].pos)</div><div class='del'>-		? __bch2_btree_path_set_pos(trans, path, new_pos, intent, ip)</div><div class='del'>-		: path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __must_check bch2_btree_path_traverse_one(struct btree_trans *,</div><div class='del'>-					      btree_path_idx_t,</div><div class='del'>-					      unsigned, unsigned long);</div><div class='del'>-</div><div class='del'>-static inline int __must_check bch2_btree_path_traverse(struct btree_trans *trans,</div><div class='del'>-					  btree_path_idx_t path, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;paths[path].uptodate &lt; BTREE_ITER_NEED_RELOCK)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_path_traverse_one(trans, path, flags, _RET_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-btree_path_idx_t bch2_path_get(struct btree_trans *, enum btree_id, struct bpos,</div><div class='del'>-				 unsigned, unsigned, unsigned, unsigned long);</div><div class='del'>-struct bkey_s_c bch2_btree_path_peek_slot(struct btree_path *, struct bkey *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch2_btree_path_peek_slot() for a cached iterator might return a key in a</div><div class='del'>- * different snapshot:</div><div class='del'>- */</div><div class='del'>-static inline struct bkey_s_c bch2_btree_path_peek_slot_exact(struct btree_path *path, struct bkey *u)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k = bch2_btree_path_peek_slot(path, u);</div><div class='del'>-</div><div class='del'>-	if (k.k &amp;&amp; bpos_eq(path-&gt;pos, k.k-&gt;p))</div><div class='del'>-		return k;</div><div class='del'>-</div><div class='del'>-	bkey_init(u);</div><div class='del'>-	u-&gt;p = path-&gt;pos;</div><div class='del'>-	return (struct bkey_s_c) { u, NULL };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i *bch2_btree_journal_peek_slot(struct btree_trans *,</div><div class='del'>-					struct btree_iter *, struct bpos);</div><div class='del'>-</div><div class='del'>-void bch2_btree_path_level_init(struct btree_trans *, struct btree_path *, struct btree *);</div><div class='del'>-</div><div class='del'>-int __bch2_trans_mutex_lock(struct btree_trans *, struct mutex *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_trans_mutex_lock(struct btree_trans *trans, struct mutex *lock)</div><div class='del'>-{</div><div class='del'>-	return mutex_trylock(lock)</div><div class='del'>-		? 0</div><div class='del'>-		: __bch2_trans_mutex_lock(trans, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-void bch2_trans_verify_paths(struct btree_trans *);</div><div class='del'>-void bch2_assert_pos_locked(struct btree_trans *, enum btree_id,</div><div class='del'>-			    struct bpos, bool);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_trans_verify_paths(struct btree_trans *trans) {}</div><div class='del'>-static inline void bch2_assert_pos_locked(struct btree_trans *trans, enum btree_id id,</div><div class='del'>-					  struct bpos pos, bool key_cache) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_btree_path_fix_key_modified(struct btree_trans *trans,</div><div class='del'>-				      struct btree *, struct bkey_packed *);</div><div class='del'>-void bch2_btree_node_iter_fix(struct btree_trans *trans, struct btree_path *,</div><div class='del'>-			      struct btree *, struct btree_node_iter *,</div><div class='del'>-			      struct bkey_packed *, unsigned, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_btree_path_relock_intent(struct btree_trans *, struct btree_path *);</div><div class='del'>-</div><div class='del'>-void bch2_path_put(struct btree_trans *, btree_path_idx_t, bool);</div><div class='del'>-</div><div class='del'>-int bch2_trans_relock(struct btree_trans *);</div><div class='del'>-int bch2_trans_relock_notrace(struct btree_trans *);</div><div class='del'>-void bch2_trans_unlock(struct btree_trans *);</div><div class='del'>-void bch2_trans_unlock_long(struct btree_trans *);</div><div class='del'>-bool bch2_trans_locked(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-static inline int trans_was_restarted(struct btree_trans *trans, u32 restart_count)</div><div class='del'>-{</div><div class='del'>-	return restart_count != trans-&gt;restart_count</div><div class='del'>-		? -BCH_ERR_transaction_restart_nested</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __noreturn bch2_trans_restart_error(struct btree_trans *, u32);</div><div class='del'>-</div><div class='del'>-static inline void bch2_trans_verify_not_restarted(struct btree_trans *trans,</div><div class='del'>-						   u32 restart_count)</div><div class='del'>-{</div><div class='del'>-	if (trans_was_restarted(trans, restart_count))</div><div class='del'>-		bch2_trans_restart_error(trans, restart_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __noreturn bch2_trans_in_restart_error(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_trans_verify_not_in_restart(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;restarted)</div><div class='del'>-		bch2_trans_in_restart_error(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static int btree_trans_restart_nounlock(struct btree_trans *trans, int err)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(err &lt;= 0);</div><div class='del'>-	BUG_ON(!bch2_err_matches(-err, BCH_ERR_transaction_restart));</div><div class='del'>-</div><div class='del'>-	trans-&gt;restarted = err;</div><div class='del'>-	trans-&gt;last_restarted_ip = _THIS_IP_;</div><div class='del'>-	return -err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static int btree_trans_restart(struct btree_trans *trans, int err)</div><div class='del'>-{</div><div class='del'>-	btree_trans_restart_nounlock(trans, err);</div><div class='del'>-	return -err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_node_upgrade(struct btree_trans *,</div><div class='del'>-			     struct btree_path *, unsigned);</div><div class='del'>-</div><div class='del'>-void __bch2_btree_path_downgrade(struct btree_trans *, struct btree_path *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_path_downgrade(struct btree_trans *trans,</div><div class='del'>-					     struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	unsigned new_locks_want = path-&gt;level + !!path-&gt;intent_ref;</div><div class='del'>-</div><div class='del'>-	if (path-&gt;locks_want &gt; new_locks_want)</div><div class='del'>-		__bch2_btree_path_downgrade(trans, path, new_locks_want);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_downgrade(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-void bch2_trans_node_add(struct btree_trans *trans, struct btree_path *, struct btree *);</div><div class='del'>-void bch2_trans_node_reinit_iter(struct btree_trans *, struct btree *);</div><div class='del'>-</div><div class='del'>-int __must_check __bch2_btree_iter_traverse(struct btree_iter *iter);</div><div class='del'>-int __must_check bch2_btree_iter_traverse(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-struct btree *bch2_btree_iter_peek_node(struct btree_iter *);</div><div class='del'>-struct btree *bch2_btree_iter_peek_node_and_restart(struct btree_iter *);</div><div class='del'>-struct btree *bch2_btree_iter_next_node(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *, struct bpos);</div><div class='del'>-struct bkey_s_c bch2_btree_iter_next(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bch2_btree_iter_peek(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_iter_peek_upto(iter, SPOS_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_prev(struct btree_iter *);</div><div class='del'>-struct bkey_s_c bch2_btree_iter_prev(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *);</div><div class='del'>-struct bkey_s_c bch2_btree_iter_next_slot(struct btree_iter *);</div><div class='del'>-struct bkey_s_c bch2_btree_iter_prev_slot(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-bool bch2_btree_iter_advance(struct btree_iter *);</div><div class='del'>-bool bch2_btree_iter_rewind(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-static inline void __bch2_btree_iter_set_pos(struct btree_iter *iter, struct bpos new_pos)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;k.type = KEY_TYPE_deleted;</div><div class='del'>-	iter-&gt;k.p.inode		= iter-&gt;pos.inode	= new_pos.inode;</div><div class='del'>-	iter-&gt;k.p.offset	= iter-&gt;pos.offset	= new_pos.offset;</div><div class='del'>-	iter-&gt;k.p.snapshot	= iter-&gt;pos.snapshot	= new_pos.snapshot;</div><div class='del'>-	iter-&gt;k.size = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_iter_set_pos(struct btree_iter *iter, struct bpos new_pos)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-</div><div class='del'>-	if (unlikely(iter-&gt;update_path))</div><div class='del'>-		bch2_path_put(trans, iter-&gt;update_path,</div><div class='del'>-			      iter-&gt;flags &amp; BTREE_ITER_INTENT);</div><div class='del'>-	iter-&gt;update_path = 0;</div><div class='del'>-</div><div class='del'>-	if (!(iter-&gt;flags &amp; BTREE_ITER_ALL_SNAPSHOTS))</div><div class='del'>-		new_pos.snapshot = iter-&gt;snapshot;</div><div class='del'>-</div><div class='del'>-	__bch2_btree_iter_set_pos(iter, new_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_iter_set_pos_to_extent_start(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS));</div><div class='del'>-	iter-&gt;pos = bkey_start_pos(&amp;iter-&gt;k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_iter_set_snapshot(struct btree_iter *iter, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bpos pos = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-	iter-&gt;snapshot = snapshot;</div><div class='del'>-	pos.snapshot = snapshot;</div><div class='del'>-	bch2_btree_iter_set_pos(iter, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_iter_exit(struct btree_trans *, struct btree_iter *);</div><div class='del'>-</div><div class='del'>-static inline unsigned __bch2_btree_iter_flags(struct btree_trans *trans,</div><div class='del'>-					       unsigned btree_id,</div><div class='del'>-					       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (!(flags &amp; (BTREE_ITER_ALL_SNAPSHOTS|BTREE_ITER_NOT_EXTENTS)) &amp;&amp;</div><div class='del'>-	    btree_id_is_extents(btree_id))</div><div class='del'>-		flags |= BTREE_ITER_IS_EXTENTS;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; __BTREE_ITER_ALL_SNAPSHOTS) &amp;&amp;</div><div class='del'>-	    !btree_type_has_snapshot_field(btree_id))</div><div class='del'>-		flags &amp;= ~BTREE_ITER_ALL_SNAPSHOTS;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BTREE_ITER_ALL_SNAPSHOTS) &amp;&amp;</div><div class='del'>-	    btree_type_has_snapshots(btree_id))</div><div class='del'>-		flags |= BTREE_ITER_FILTER_SNAPSHOTS;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;journal_replay_not_finished)</div><div class='del'>-		flags |= BTREE_ITER_WITH_JOURNAL;</div><div class='del'>-</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_btree_iter_flags(struct btree_trans *trans,</div><div class='del'>-					     unsigned btree_id,</div><div class='del'>-					     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (!btree_id_cached(trans-&gt;c, btree_id)) {</div><div class='del'>-		flags &amp;= ~BTREE_ITER_CACHED;</div><div class='del'>-		flags &amp;= ~BTREE_ITER_WITH_KEY_CACHE;</div><div class='del'>-	} else if (!(flags &amp; BTREE_ITER_CACHED))</div><div class='del'>-		flags |= BTREE_ITER_WITH_KEY_CACHE;</div><div class='del'>-</div><div class='del'>-	return __bch2_btree_iter_flags(trans, btree_id, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_trans_iter_init_common(struct btree_trans *trans,</div><div class='del'>-					  struct btree_iter *iter,</div><div class='del'>-					  unsigned btree_id, struct bpos pos,</div><div class='del'>-					  unsigned locks_want,</div><div class='del'>-					  unsigned depth,</div><div class='del'>-					  unsigned flags,</div><div class='del'>-					  unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;trans		= trans;</div><div class='del'>-	iter-&gt;update_path	= 0;</div><div class='del'>-	iter-&gt;key_cache_path	= 0;</div><div class='del'>-	iter-&gt;btree_id		= btree_id;</div><div class='del'>-	iter-&gt;min_depth		= 0;</div><div class='del'>-	iter-&gt;flags		= flags;</div><div class='del'>-	iter-&gt;snapshot		= pos.snapshot;</div><div class='del'>-	iter-&gt;pos		= pos;</div><div class='del'>-	iter-&gt;k			= POS_KEY(pos);</div><div class='del'>-	iter-&gt;journal_idx	= 0;</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	iter-&gt;ip_allocated = ip;</div><div class='del'>-#endif</div><div class='del'>-	iter-&gt;path = bch2_path_get(trans, btree_id, iter-&gt;pos,</div><div class='del'>-				   locks_want, depth, flags, ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_iter_init_outlined(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			  enum btree_id, struct bpos, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void bch2_trans_iter_init(struct btree_trans *trans,</div><div class='del'>-			  struct btree_iter *iter,</div><div class='del'>-			  unsigned btree_id, struct bpos pos,</div><div class='del'>-			  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (__builtin_constant_p(btree_id) &amp;&amp;</div><div class='del'>-	    __builtin_constant_p(flags))</div><div class='del'>-		bch2_trans_iter_init_common(trans, iter, btree_id, pos, 0, 0,</div><div class='del'>-				bch2_btree_iter_flags(trans, btree_id, flags),</div><div class='del'>-				_THIS_IP_);</div><div class='del'>-	else</div><div class='del'>-		bch2_trans_iter_init_outlined(trans, iter, btree_id, pos, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_node_iter_init(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			       enum btree_id, struct bpos,</div><div class='del'>-			       unsigned, unsigned, unsigned);</div><div class='del'>-void bch2_trans_copy_iter(struct btree_iter *, struct btree_iter *);</div><div class='del'>-</div><div class='del'>-static inline void set_btree_iter_dontneed(struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = iter-&gt;trans;</div><div class='del'>-</div><div class='del'>-	if (!trans-&gt;restarted)</div><div class='del'>-		btree_iter_path(trans, iter)-&gt;preserve = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *__bch2_trans_kmalloc(struct btree_trans *, size_t);</div><div class='del'>-</div><div class='del'>-static inline void *bch2_trans_kmalloc(struct btree_trans *trans, size_t size)</div><div class='del'>-{</div><div class='del'>-	size = roundup(size, 8);</div><div class='del'>-</div><div class='del'>-	if (likely(trans-&gt;mem_top + size &lt;= trans-&gt;mem_bytes)) {</div><div class='del'>-		void *p = trans-&gt;mem + trans-&gt;mem_top;</div><div class='del'>-</div><div class='del'>-		trans-&gt;mem_top += size;</div><div class='del'>-		memset(p, 0, size);</div><div class='del'>-		return p;</div><div class='del'>-	} else {</div><div class='del'>-		return __bch2_trans_kmalloc(trans, size);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *bch2_trans_kmalloc_nomemzero(struct btree_trans *trans, size_t size)</div><div class='del'>-{</div><div class='del'>-	size = round_up(size, 8);</div><div class='del'>-</div><div class='del'>-	if (likely(trans-&gt;mem_top + size &lt;= trans-&gt;mem_bytes)) {</div><div class='del'>-		void *p = trans-&gt;mem + trans-&gt;mem_top;</div><div class='del'>-</div><div class='del'>-		trans-&gt;mem_top += size;</div><div class='del'>-		return p;</div><div class='del'>-	} else {</div><div class='del'>-		return __bch2_trans_kmalloc(trans, size);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c __bch2_bkey_get_iter(struct btree_trans *trans,</div><div class='del'>-				struct btree_iter *iter,</div><div class='del'>-				unsigned btree_id, struct bpos pos,</div><div class='del'>-				unsigned flags, unsigned type)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, iter, btree_id, pos, flags);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-</div><div class='del'>-	if (!bkey_err(k) &amp;&amp; type &amp;&amp; k.k-&gt;type != type)</div><div class='del'>-		k = bkey_s_c_err(-BCH_ERR_ENOENT_bkey_type_mismatch);</div><div class='del'>-	if (unlikely(bkey_err(k)))</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bch2_bkey_get_iter(struct btree_trans *trans,</div><div class='del'>-				struct btree_iter *iter,</div><div class='del'>-				unsigned btree_id, struct bpos pos,</div><div class='del'>-				unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_get_iter(trans, iter, btree_id, pos, flags, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_get_iter_typed(_trans, _iter, _btree_id, _pos, _flags, _type)\</div><div class='del'>-	bkey_s_c_to_##_type(__bch2_bkey_get_iter(_trans, _iter,			\</div><div class='del'>-				       _btree_id, _pos, _flags, KEY_TYPE_##_type))</div><div class='del'>-</div><div class='del'>-static inline int __bch2_bkey_get_val_typed(struct btree_trans *trans,</div><div class='del'>-				unsigned btree_id, struct bpos pos,</div><div class='del'>-				unsigned flags, unsigned type,</div><div class='del'>-				unsigned val_size, void *val)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = __bch2_bkey_get_iter(trans, &amp;iter, btree_id, pos, flags, type);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		unsigned b = min_t(unsigned, bkey_val_bytes(k.k), val_size);</div><div class='del'>-</div><div class='del'>-		memcpy(val, k.v, b);</div><div class='del'>-		if (unlikely(b &lt; sizeof(*val)))</div><div class='del'>-			memset((void *) val + b, 0, sizeof(*val) - b);</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_get_val_typed(_trans, _btree_id, _pos, _flags, _type, _val)\</div><div class='del'>-	__bch2_bkey_get_val_typed(_trans, _btree_id, _pos, _flags,	\</div><div class='del'>-				  KEY_TYPE_##_type, sizeof(*_val), _val)</div><div class='del'>-</div><div class='del'>-void bch2_trans_srcu_unlock(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-u32 bch2_trans_begin(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX</div><div class='del'>- * this does not handle transaction restarts from bch2_btree_iter_next_node()</div><div class='del'>- * correctly</div><div class='del'>- */</div><div class='del'>-#define __for_each_btree_node(_trans, _iter, _btree_id, _start,		\</div><div class='del'>-			      _locks_want, _depth, _flags, _b, _ret)	\</div><div class='del'>-	for (bch2_trans_node_iter_init((_trans), &amp;(_iter), (_btree_id),	\</div><div class='del'>-				_start, _locks_want, _depth, _flags);	\</div><div class='del'>-	     (_b) = bch2_btree_iter_peek_node_and_restart(&amp;(_iter)),	\</div><div class='del'>-	     !((_ret) = PTR_ERR_OR_ZERO(_b)) &amp;&amp; (_b);			\</div><div class='del'>-	     (_b) = bch2_btree_iter_next_node(&amp;(_iter)))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_node(_trans, _iter, _btree_id, _start,		\</div><div class='del'>-			    _flags, _b, _ret)				\</div><div class='del'>-	__for_each_btree_node(_trans, _iter, _btree_id, _start,		\</div><div class='del'>-			      0, 0, _flags, _b, _ret)</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bch2_btree_iter_peek_prev_type(struct btree_iter *iter,</div><div class='del'>-							     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return  flags &amp; BTREE_ITER_SLOTS      ? bch2_btree_iter_peek_slot(iter) :</div><div class='del'>-						bch2_btree_iter_peek_prev(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bch2_btree_iter_peek_type(struct btree_iter *iter,</div><div class='del'>-							unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return  flags &amp; BTREE_ITER_SLOTS      ? bch2_btree_iter_peek_slot(iter) :</div><div class='del'>-						bch2_btree_iter_peek(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c bch2_btree_iter_peek_upto_type(struct btree_iter *iter,</div><div class='del'>-							     struct bpos end,</div><div class='del'>-							     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (!(flags &amp; BTREE_ITER_SLOTS))</div><div class='del'>-		return bch2_btree_iter_peek_upto(iter, end);</div><div class='del'>-</div><div class='del'>-	if (bkey_gt(iter-&gt;pos, end))</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_iter_peek_slot(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_btree_trans_too_many_iters(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-static inline int btree_trans_too_many_iters(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (bitmap_weight(trans-&gt;paths_allocated, trans-&gt;nr_paths) &gt; BTREE_ITER_INITIAL - 8)</div><div class='del'>-		return __bch2_btree_trans_too_many_iters(trans);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * goto instead of loop, so that when used inside for_each_btree_key2()</div><div class='del'>- * break/continue work correctly</div><div class='del'>- */</div><div class='del'>-#define lockrestart_do(_trans, _do)					\</div><div class='del'>-({									\</div><div class='del'>-	__label__ transaction_restart;					\</div><div class='del'>-	u32 _restart_count;						\</div><div class='del'>-	int _ret2;							\</div><div class='del'>-transaction_restart:							\</div><div class='del'>-	_restart_count = bch2_trans_begin(_trans);			\</div><div class='del'>-	_ret2 = (_do);							\</div><div class='del'>-									\</div><div class='del'>-	if (bch2_err_matches(_ret2, BCH_ERR_transaction_restart))	\</div><div class='del'>-		goto transaction_restart;				\</div><div class='del'>-									\</div><div class='del'>-	if (!_ret2)							\</div><div class='del'>-		bch2_trans_verify_not_restarted(_trans, _restart_count);\</div><div class='del'>-	_ret2;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nested_lockrestart_do(), nested_commit_do():</div><div class='del'>- *</div><div class='del'>- * These are like lockrestart_do() and commit_do(), with two differences:</div><div class='del'>- *</div><div class='del'>- *  - We don't call bch2_trans_begin() unless we had a transaction restart</div><div class='del'>- *  - We return -BCH_ERR_transaction_restart_nested if we succeeded after a</div><div class='del'>- *  transaction restart</div><div class='del'>- */</div><div class='del'>-#define nested_lockrestart_do(_trans, _do)				\</div><div class='del'>-({									\</div><div class='del'>-	u32 _restart_count, _orig_restart_count;			\</div><div class='del'>-	int _ret2;							\</div><div class='del'>-									\</div><div class='del'>-	_restart_count = _orig_restart_count = (_trans)-&gt;restart_count;	\</div><div class='del'>-									\</div><div class='del'>-	while (bch2_err_matches(_ret2 = (_do), BCH_ERR_transaction_restart))\</div><div class='del'>-		_restart_count = bch2_trans_begin(_trans);		\</div><div class='del'>-									\</div><div class='del'>-	if (!_ret2)							\</div><div class='del'>-		bch2_trans_verify_not_restarted(_trans, _restart_count);\</div><div class='del'>-									\</div><div class='del'>-	_ret2 ?: trans_was_restarted(_trans, _restart_count);		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_upto(_trans, _iter, _btree_id,		\</div><div class='del'>-				_start, _end, _flags, _k, _do)		\</div><div class='del'>-({									\</div><div class='del'>-	struct btree_iter _iter;					\</div><div class='del'>-	struct bkey_s_c _k;						\</div><div class='del'>-	int _ret3 = 0;							\</div><div class='del'>-									\</div><div class='del'>-	bch2_trans_iter_init((_trans), &amp;(_iter), (_btree_id),		\</div><div class='del'>-			     (_start), (_flags));			\</div><div class='del'>-									\</div><div class='del'>-	do {								\</div><div class='del'>-		_ret3 = lockrestart_do(_trans, ({			\</div><div class='del'>-			(_k) = bch2_btree_iter_peek_upto_type(&amp;(_iter),	\</div><div class='del'>-						_end, (_flags));	\</div><div class='del'>-			if (!(_k).k)					\</div><div class='del'>-				break;					\</div><div class='del'>-									\</div><div class='del'>-			bkey_err(_k) ?: (_do);				\</div><div class='del'>-		}));							\</div><div class='del'>-	} while (!_ret3 &amp;&amp; bch2_btree_iter_advance(&amp;(_iter)));		\</div><div class='del'>-									\</div><div class='del'>-	bch2_trans_iter_exit((_trans), &amp;(_iter));			\</div><div class='del'>-	_ret3;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key(_trans, _iter, _btree_id,			\</div><div class='del'>-			   _start, _flags, _k, _do)			\</div><div class='del'>-	for_each_btree_key_upto(_trans, _iter, _btree_id, _start,	\</div><div class='del'>-				 SPOS_MAX, _flags, _k, _do)</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_reverse(_trans, _iter, _btree_id,		\</div><div class='del'>-				   _start, _flags, _k, _do)		\</div><div class='del'>-({									\</div><div class='del'>-	struct btree_iter _iter;					\</div><div class='del'>-	struct bkey_s_c _k;						\</div><div class='del'>-	int _ret3 = 0;							\</div><div class='del'>-									\</div><div class='del'>-	bch2_trans_iter_init((_trans), &amp;(_iter), (_btree_id),		\</div><div class='del'>-			     (_start), (_flags));			\</div><div class='del'>-									\</div><div class='del'>-	do {								\</div><div class='del'>-		_ret3 = lockrestart_do(_trans, ({			\</div><div class='del'>-			(_k) = bch2_btree_iter_peek_prev_type(&amp;(_iter),	\</div><div class='del'>-							(_flags));	\</div><div class='del'>-			if (!(_k).k)					\</div><div class='del'>-				break;					\</div><div class='del'>-									\</div><div class='del'>-			bkey_err(_k) ?: (_do);				\</div><div class='del'>-		}));							\</div><div class='del'>-	} while (!_ret3 &amp;&amp; bch2_btree_iter_rewind(&amp;(_iter)));		\</div><div class='del'>-									\</div><div class='del'>-	bch2_trans_iter_exit((_trans), &amp;(_iter));			\</div><div class='del'>-	_ret3;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_commit(_trans, _iter, _btree_id,		\</div><div class='del'>-				  _start, _iter_flags, _k,		\</div><div class='del'>-				  _disk_res, _journal_seq, _commit_flags,\</div><div class='del'>-				  _do)					\</div><div class='del'>-	for_each_btree_key(_trans, _iter, _btree_id, _start, _iter_flags, _k,\</div><div class='del'>-			    (_do) ?: bch2_trans_commit(_trans, (_disk_res),\</div><div class='del'>-					(_journal_seq), (_commit_flags)))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_reverse_commit(_trans, _iter, _btree_id,	\</div><div class='del'>-				  _start, _iter_flags, _k,		\</div><div class='del'>-				  _disk_res, _journal_seq, _commit_flags,\</div><div class='del'>-				  _do)					\</div><div class='del'>-	for_each_btree_key_reverse(_trans, _iter, _btree_id, _start, _iter_flags, _k,\</div><div class='del'>-			    (_do) ?: bch2_trans_commit(_trans, (_disk_res),\</div><div class='del'>-					(_journal_seq), (_commit_flags)))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_upto_commit(_trans, _iter, _btree_id,	\</div><div class='del'>-				  _start, _end, _iter_flags, _k,	\</div><div class='del'>-				  _disk_res, _journal_seq, _commit_flags,\</div><div class='del'>-				  _do)					\</div><div class='del'>-	for_each_btree_key_upto(_trans, _iter, _btree_id, _start, _end, _iter_flags, _k,\</div><div class='del'>-			    (_do) ?: bch2_trans_commit(_trans, (_disk_res),\</div><div class='del'>-					(_journal_seq), (_commit_flags)))</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_iter_peek_and_restart_outlined(struct btree_iter *);</div><div class='del'>-</div><div class='del'>-static inline struct bkey_s_c</div><div class='del'>-__bch2_btree_iter_peek_and_restart(struct btree_trans *trans,</div><div class='del'>-				   struct btree_iter *iter, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	while (btree_trans_too_many_iters(trans) ||</div><div class='del'>-	       (k = bch2_btree_iter_peek_type(iter, flags),</div><div class='del'>-		bch2_err_matches(bkey_err(k), BCH_ERR_transaction_restart)))</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_old(_trans, _iter, _btree_id,		\</div><div class='del'>-			   _start, _flags, _k, _ret)			\</div><div class='del'>-	for (bch2_trans_iter_init((_trans), &amp;(_iter), (_btree_id),	\</div><div class='del'>-				  (_start), (_flags));			\</div><div class='del'>-	     (_k) = __bch2_btree_iter_peek_and_restart((_trans), &amp;(_iter), _flags),\</div><div class='del'>-	     !((_ret) = bkey_err(_k)) &amp;&amp; (_k).k;			\</div><div class='del'>-	     bch2_btree_iter_advance(&amp;(_iter)))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_upto_norestart(_trans, _iter, _btree_id,	\</div><div class='del'>-			   _start, _end, _flags, _k, _ret)		\</div><div class='del'>-	for (bch2_trans_iter_init((_trans), &amp;(_iter), (_btree_id),	\</div><div class='del'>-				  (_start), (_flags));			\</div><div class='del'>-	     (_k) = bch2_btree_iter_peek_upto_type(&amp;(_iter), _end, _flags),\</div><div class='del'>-	     !((_ret) = bkey_err(_k)) &amp;&amp; (_k).k;			\</div><div class='del'>-	     bch2_btree_iter_advance(&amp;(_iter)))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_upto_continue_norestart(_iter, _end, _flags, _k, _ret)\</div><div class='del'>-	for (;									\</div><div class='del'>-	     (_k) = bch2_btree_iter_peek_upto_type(&amp;(_iter), _end, _flags),	\</div><div class='del'>-	     !((_ret) = bkey_err(_k)) &amp;&amp; (_k).k;				\</div><div class='del'>-	     bch2_btree_iter_advance(&amp;(_iter)))</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_norestart(_trans, _iter, _btree_id,		\</div><div class='del'>-			   _start, _flags, _k, _ret)			\</div><div class='del'>-	for_each_btree_key_upto_norestart(_trans, _iter, _btree_id, _start,\</div><div class='del'>-					  SPOS_MAX, _flags, _k, _ret)</div><div class='del'>-</div><div class='del'>-#define for_each_btree_key_continue_norestart(_iter, _flags, _k, _ret)	\</div><div class='del'>-	for_each_btree_key_upto_continue_norestart(_iter, SPOS_MAX, _flags, _k, _ret)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This should not be used in a fastpath, without first trying _do in</div><div class='del'>- * nonblocking mode - it will cause excessive transaction restarts and</div><div class='del'>- * potentially livelocking:</div><div class='del'>- */</div><div class='del'>-#define drop_locks_do(_trans, _do)					\</div><div class='del'>-({									\</div><div class='del'>-	bch2_trans_unlock(_trans);					\</div><div class='del'>-	_do ?: bch2_trans_relock(_trans);				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define allocate_dropping_locks_errcode(_trans, _do)			\</div><div class='del'>-({									\</div><div class='del'>-	gfp_t _gfp = GFP_NOWAIT|__GFP_NOWARN;				\</div><div class='del'>-	int _ret = _do;							\</div><div class='del'>-									\</div><div class='del'>-	if (bch2_err_matches(_ret, ENOMEM)) {				\</div><div class='del'>-		_gfp = GFP_KERNEL;					\</div><div class='del'>-		_ret = drop_locks_do(trans, _do);			\</div><div class='del'>-	}								\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define allocate_dropping_locks(_trans, _ret, _do)			\</div><div class='del'>-({									\</div><div class='del'>-	gfp_t _gfp = GFP_NOWAIT|__GFP_NOWARN;				\</div><div class='del'>-	typeof(_do) _p = _do;						\</div><div class='del'>-									\</div><div class='del'>-	_ret = 0;							\</div><div class='del'>-	if (unlikely(!_p)) {						\</div><div class='del'>-		_gfp = GFP_KERNEL;					\</div><div class='del'>-		_ret = drop_locks_do(trans, ((_p = _do), 0));		\</div><div class='del'>-	}								\</div><div class='del'>-	_p;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-void bch2_trans_updates_to_text(struct printbuf *, struct btree_trans *);</div><div class='del'>-void bch2_trans_paths_to_text(struct printbuf *, struct btree_trans *);</div><div class='del'>-void bch2_dump_trans_updates(struct btree_trans *);</div><div class='del'>-void bch2_dump_trans_paths_updates(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-struct btree_trans *__bch2_trans_get(struct bch_fs *, unsigned);</div><div class='del'>-void bch2_trans_put(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-extern const char *bch2_btree_transaction_fns[BCH_TRANSACTIONS_NR];</div><div class='del'>-unsigned bch2_trans_get_fn_idx(const char *);</div><div class='del'>-</div><div class='del'>-#define bch2_trans_get(_c)						\</div><div class='del'>-({									\</div><div class='del'>-	static unsigned trans_fn_idx;					\</div><div class='del'>-									\</div><div class='del'>-	if (unlikely(!trans_fn_idx))					\</div><div class='del'>-		trans_fn_idx = bch2_trans_get_fn_idx(__func__);		\</div><div class='del'>-	__bch2_trans_get(_c, trans_fn_idx);				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-void bch2_btree_trans_to_text(struct printbuf *, struct btree_trans *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_iter_exit(struct bch_fs *);</div><div class='del'>-void bch2_fs_btree_iter_init_early(struct bch_fs *);</div><div class='del'>-int bch2_fs_btree_iter_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_ITER_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c<br/>deleted file mode 100644<br/>index 719a94a84950..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_journal_iter.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_journal_iter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,556 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For managing keys we read from the journal: until journal replay works normal</div><div class='del'>- * btree lookups need to be able to find and return keys from the journal where</div><div class='del'>- * they overwrite what's in the btree, so we have a special iterator and</div><div class='del'>- * operations for the regular btree iter code to use:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __journal_key_cmp(enum btree_id	l_btree_id,</div><div class='del'>-			     unsigned		l_level,</div><div class='del'>-			     struct bpos	l_pos,</div><div class='del'>-			     const struct journal_key *r)</div><div class='del'>-{</div><div class='del'>-	return (cmp_int(l_btree_id,	r-&gt;btree_id) ?:</div><div class='del'>-		cmp_int(l_level,	r-&gt;level) ?:</div><div class='del'>-		bpos_cmp(l_pos,	r-&gt;k-&gt;k.p));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_key_cmp(const struct journal_key *l, const struct journal_key *r)</div><div class='del'>-{</div><div class='del'>-	return __journal_key_cmp(l-&gt;btree_id, l-&gt;level, l-&gt;k-&gt;k.p, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t idx_to_pos(struct journal_keys *keys, size_t idx)</div><div class='del'>-{</div><div class='del'>-	size_t gap_size = keys-&gt;size - keys-&gt;nr;</div><div class='del'>-</div><div class='del'>-	if (idx &gt;= keys-&gt;gap)</div><div class='del'>-		idx += gap_size;</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct journal_key *idx_to_key(struct journal_keys *keys, size_t idx)</div><div class='del'>-{</div><div class='del'>-	return keys-&gt;d + idx_to_pos(keys, idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t __bch2_journal_key_search(struct journal_keys *keys,</div><div class='del'>-					enum btree_id id, unsigned level,</div><div class='del'>-					struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	size_t l = 0, r = keys-&gt;nr, m;</div><div class='del'>-</div><div class='del'>-	while (l &lt; r) {</div><div class='del'>-		m = l + ((r - l) &gt;&gt; 1);</div><div class='del'>-		if (__journal_key_cmp(id, level, pos, idx_to_key(keys, m)) &gt; 0)</div><div class='del'>-			l = m + 1;</div><div class='del'>-		else</div><div class='del'>-			r = m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(l &lt; keys-&gt;nr &amp;&amp;</div><div class='del'>-	       __journal_key_cmp(id, level, pos, idx_to_key(keys, l)) &gt; 0);</div><div class='del'>-</div><div class='del'>-	BUG_ON(l &amp;&amp;</div><div class='del'>-	       __journal_key_cmp(id, level, pos, idx_to_key(keys, l - 1)) &lt;= 0);</div><div class='del'>-</div><div class='del'>-	return l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t bch2_journal_key_search(struct journal_keys *keys,</div><div class='del'>-				      enum btree_id id, unsigned level,</div><div class='del'>-				      struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	return idx_to_pos(keys, __bch2_journal_key_search(keys, id, level, pos));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns first non-overwritten key &gt;= search key: */</div><div class='del'>-struct bkey_i *bch2_journal_keys_peek_upto(struct bch_fs *c, enum btree_id btree_id,</div><div class='del'>-					   unsigned level, struct bpos pos,</div><div class='del'>-					   struct bpos end_pos, size_t *idx)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	unsigned iters = 0;</div><div class='del'>-	struct journal_key *k;</div><div class='del'>-</div><div class='del'>-	BUG_ON(*idx &gt; keys-&gt;nr);</div><div class='del'>-search:</div><div class='del'>-	if (!*idx)</div><div class='del'>-		*idx = __bch2_journal_key_search(keys, btree_id, level, pos);</div><div class='del'>-</div><div class='del'>-	while (*idx &amp;&amp;</div><div class='del'>-	       __journal_key_cmp(btree_id, level, end_pos, idx_to_key(keys, *idx - 1)) &lt;= 0) {</div><div class='del'>-		--(*idx);</div><div class='del'>-		iters++;</div><div class='del'>-		if (iters == 10) {</div><div class='del'>-			*idx = 0;</div><div class='del'>-			goto search;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((k = *idx &lt; keys-&gt;nr ? idx_to_key(keys, *idx) : NULL)) {</div><div class='del'>-		if (__journal_key_cmp(btree_id, level, end_pos, k) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		if (k-&gt;overwritten) {</div><div class='del'>-			(*idx)++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (__journal_key_cmp(btree_id, level, pos, k) &lt;= 0)</div><div class='del'>-			return k-&gt;k;</div><div class='del'>-</div><div class='del'>-		(*idx)++;</div><div class='del'>-		iters++;</div><div class='del'>-		if (iters == 10) {</div><div class='del'>-			*idx = 0;</div><div class='del'>-			goto search;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i *bch2_journal_keys_peek_slot(struct bch_fs *c, enum btree_id btree_id,</div><div class='del'>-					   unsigned level, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	size_t idx = 0;</div><div class='del'>-</div><div class='del'>-	return bch2_journal_keys_peek_upto(c, btree_id, level, pos, pos, &amp;idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_iters_fix(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	/* The key we just inserted is immediately before the gap: */</div><div class='del'>-	size_t gap_end = keys-&gt;gap + (keys-&gt;size - keys-&gt;nr);</div><div class='del'>-	struct btree_and_journal_iter *iter;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If an iterator points one after the key we just inserted, decrement</div><div class='del'>-	 * the iterator so it points at the key we just inserted - if the</div><div class='del'>-	 * decrement was unnecessary, bch2_btree_and_journal_iter_peek() will</div><div class='del'>-	 * handle that:</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(iter, &amp;c-&gt;journal_iters, journal.list)</div><div class='del'>-		if (iter-&gt;journal.idx == gap_end)</div><div class='del'>-			iter-&gt;journal.idx = keys-&gt;gap - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_iters_move_gap(struct bch_fs *c, size_t old_gap, size_t new_gap)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	struct journal_iter *iter;</div><div class='del'>-	size_t gap_size = keys-&gt;size - keys-&gt;nr;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(iter, &amp;c-&gt;journal_iters, list) {</div><div class='del'>-		if (iter-&gt;idx &gt; old_gap)</div><div class='del'>-			iter-&gt;idx -= gap_size;</div><div class='del'>-		if (iter-&gt;idx &gt;= new_gap)</div><div class='del'>-			iter-&gt;idx += gap_size;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_key_insert_take(struct bch_fs *c, enum btree_id id,</div><div class='del'>-				 unsigned level, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct journal_key n = {</div><div class='del'>-		.btree_id	= id,</div><div class='del'>-		.level		= level,</div><div class='del'>-		.k		= k,</div><div class='del'>-		.allocated	= true,</div><div class='del'>-		/*</div><div class='del'>-		 * Ensure these keys are done last by journal replay, to unblock</div><div class='del'>-		 * journal reclaim:</div><div class='del'>-		 */</div><div class='del'>-		.journal_seq	= U32_MAX,</div><div class='del'>-	};</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	size_t idx = bch2_journal_key_search(keys, id, level, k-&gt;k.p);</div><div class='del'>-</div><div class='del'>-	BUG_ON(test_bit(BCH_FS_rw, &amp;c-&gt;flags));</div><div class='del'>-</div><div class='del'>-	if (idx &lt; keys-&gt;size &amp;&amp;</div><div class='del'>-	    journal_key_cmp(&amp;n, &amp;keys-&gt;d[idx]) == 0) {</div><div class='del'>-		if (keys-&gt;d[idx].allocated)</div><div class='del'>-			kfree(keys-&gt;d[idx].k);</div><div class='del'>-		keys-&gt;d[idx] = n;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idx &gt; keys-&gt;gap)</div><div class='del'>-		idx -= keys-&gt;size - keys-&gt;nr;</div><div class='del'>-</div><div class='del'>-	if (keys-&gt;nr == keys-&gt;size) {</div><div class='del'>-		struct journal_keys new_keys = {</div><div class='del'>-			.nr			= keys-&gt;nr,</div><div class='del'>-			.size			= max_t(size_t, keys-&gt;size, 8) * 2,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		new_keys.d = kvmalloc_array(new_keys.size, sizeof(new_keys.d[0]), GFP_KERNEL);</div><div class='del'>-		if (!new_keys.d) {</div><div class='del'>-			bch_err(c, "%s: error allocating new key array (size %zu)",</div><div class='del'>-				__func__, new_keys.size);</div><div class='del'>-			return -BCH_ERR_ENOMEM_journal_key_insert;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Since @keys was full, there was no gap: */</div><div class='del'>-		memcpy(new_keys.d, keys-&gt;d, sizeof(keys-&gt;d[0]) * keys-&gt;nr);</div><div class='del'>-		kvfree(keys-&gt;d);</div><div class='del'>-		keys-&gt;d		= new_keys.d;</div><div class='del'>-		keys-&gt;nr	= new_keys.nr;</div><div class='del'>-		keys-&gt;size	= new_keys.size;</div><div class='del'>-</div><div class='del'>-		/* And now the gap is at the end: */</div><div class='del'>-		keys-&gt;gap	= keys-&gt;nr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal_iters_move_gap(c, keys-&gt;gap, idx);</div><div class='del'>-</div><div class='del'>-	move_gap(keys-&gt;d, keys-&gt;nr, keys-&gt;size, keys-&gt;gap, idx);</div><div class='del'>-	keys-&gt;gap = idx;</div><div class='del'>-</div><div class='del'>-	keys-&gt;nr++;</div><div class='del'>-	keys-&gt;d[keys-&gt;gap++] = n;</div><div class='del'>-</div><div class='del'>-	journal_iters_fix(c);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Can only be used from the recovery thread while we're still RO - can't be</div><div class='del'>- * used once we've got RW, as journal_keys is at that point used by multiple</div><div class='del'>- * threads:</div><div class='del'>- */</div><div class='del'>-int bch2_journal_key_insert(struct bch_fs *c, enum btree_id id,</div><div class='del'>-			    unsigned level, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *n;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	n = kmalloc(bkey_bytes(&amp;k-&gt;k), GFP_KERNEL);</div><div class='del'>-	if (!n)</div><div class='del'>-		return -BCH_ERR_ENOMEM_journal_key_insert;</div><div class='del'>-</div><div class='del'>-	bkey_copy(n, k);</div><div class='del'>-	ret = bch2_journal_key_insert_take(c, id, level, n);</div><div class='del'>-	if (ret)</div><div class='del'>-		kfree(n);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_key_delete(struct bch_fs *c, enum btree_id id,</div><div class='del'>-			    unsigned level, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i whiteout;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;whiteout.k);</div><div class='del'>-	whiteout.k.p = pos;</div><div class='del'>-</div><div class='del'>-	return bch2_journal_key_insert(c, id, level, &amp;whiteout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_key_overwritten(struct bch_fs *c, enum btree_id btree,</div><div class='del'>-				  unsigned level, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	size_t idx = bch2_journal_key_search(keys, btree, level, pos);</div><div class='del'>-</div><div class='del'>-	if (idx &lt; keys-&gt;size &amp;&amp;</div><div class='del'>-	    keys-&gt;d[idx].btree_id	== btree &amp;&amp;</div><div class='del'>-	    keys-&gt;d[idx].level		== level &amp;&amp;</div><div class='del'>-	    bpos_eq(keys-&gt;d[idx].k-&gt;k.p, pos))</div><div class='del'>-		keys-&gt;d[idx].overwritten = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_journal_iter_advance(struct journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (iter-&gt;idx &lt; iter-&gt;keys-&gt;size) {</div><div class='del'>-		iter-&gt;idx++;</div><div class='del'>-		if (iter-&gt;idx == iter-&gt;keys-&gt;gap)</div><div class='del'>-			iter-&gt;idx += iter-&gt;keys-&gt;size - iter-&gt;keys-&gt;nr;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c bch2_journal_iter_peek(struct journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct journal_key *k = iter-&gt;keys-&gt;d + iter-&gt;idx;</div><div class='del'>-</div><div class='del'>-	while (k &lt; iter-&gt;keys-&gt;d + iter-&gt;keys-&gt;size &amp;&amp;</div><div class='del'>-	       k-&gt;btree_id	== iter-&gt;btree_id &amp;&amp;</div><div class='del'>-	       k-&gt;level		== iter-&gt;level) {</div><div class='del'>-		if (!k-&gt;overwritten)</div><div class='del'>-			return bkey_i_to_s_c(k-&gt;k);</div><div class='del'>-</div><div class='del'>-		bch2_journal_iter_advance(iter);</div><div class='del'>-		k = iter-&gt;keys-&gt;d + iter-&gt;idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bkey_s_c_null;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_journal_iter_exit(struct journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;iter-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_journal_iter_init(struct bch_fs *c,</div><div class='del'>-				   struct journal_iter *iter,</div><div class='del'>-				   enum btree_id id, unsigned level,</div><div class='del'>-				   struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;btree_id	= id;</div><div class='del'>-	iter-&gt;level	= level;</div><div class='del'>-	iter-&gt;keys	= &amp;c-&gt;journal_keys;</div><div class='del'>-	iter-&gt;idx	= bch2_journal_key_search(&amp;c-&gt;journal_keys, id, level, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c bch2_journal_iter_peek_btree(struct btree_and_journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_node_iter_peek_unpack(&amp;iter-&gt;node_iter,</div><div class='del'>-						iter-&gt;b, &amp;iter-&gt;unpacked);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_journal_iter_advance_btree(struct btree_and_journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	bch2_btree_node_iter_advance(&amp;iter-&gt;node_iter, iter-&gt;b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_and_journal_iter_advance(struct btree_and_journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (bpos_eq(iter-&gt;pos, SPOS_MAX))</div><div class='del'>-		iter-&gt;at_end = true;</div><div class='del'>-	else</div><div class='del'>-		iter-&gt;pos = bpos_successor(iter-&gt;pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_s_c bch2_btree_and_journal_iter_peek(struct btree_and_journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c btree_k, journal_k, ret;</div><div class='del'>-again:</div><div class='del'>-	if (iter-&gt;at_end)</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	while ((btree_k = bch2_journal_iter_peek_btree(iter)).k &amp;&amp;</div><div class='del'>-	       bpos_lt(btree_k.k-&gt;p, iter-&gt;pos))</div><div class='del'>-		bch2_journal_iter_advance_btree(iter);</div><div class='del'>-</div><div class='del'>-	while ((journal_k = bch2_journal_iter_peek(&amp;iter-&gt;journal)).k &amp;&amp;</div><div class='del'>-	       bpos_lt(journal_k.k-&gt;p, iter-&gt;pos))</div><div class='del'>-		bch2_journal_iter_advance(&amp;iter-&gt;journal);</div><div class='del'>-</div><div class='del'>-	ret = journal_k.k &amp;&amp;</div><div class='del'>-		(!btree_k.k || bpos_le(journal_k.k-&gt;p, btree_k.k-&gt;p))</div><div class='del'>-		? journal_k</div><div class='del'>-		: btree_k;</div><div class='del'>-</div><div class='del'>-	if (ret.k &amp;&amp; iter-&gt;b &amp;&amp; bpos_gt(ret.k-&gt;p, iter-&gt;b-&gt;data-&gt;max_key))</div><div class='del'>-		ret = bkey_s_c_null;</div><div class='del'>-</div><div class='del'>-	if (ret.k) {</div><div class='del'>-		iter-&gt;pos = ret.k-&gt;p;</div><div class='del'>-		if (bkey_deleted(ret.k)) {</div><div class='del'>-			bch2_btree_and_journal_iter_advance(iter);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		iter-&gt;pos = SPOS_MAX;</div><div class='del'>-		iter-&gt;at_end = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_and_journal_iter_exit(struct btree_and_journal_iter *iter)</div><div class='del'>-{</div><div class='del'>-	bch2_journal_iter_exit(&amp;iter-&gt;journal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *iter,</div><div class='del'>-						  struct bch_fs *c,</div><div class='del'>-						  struct btree *b,</div><div class='del'>-						  struct btree_node_iter node_iter,</div><div class='del'>-						  struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	memset(iter, 0, sizeof(*iter));</div><div class='del'>-</div><div class='del'>-	iter-&gt;b = b;</div><div class='del'>-	iter-&gt;node_iter = node_iter;</div><div class='del'>-	bch2_journal_iter_init(c, &amp;iter-&gt;journal, b-&gt;c.btree_id, b-&gt;c.level, pos);</div><div class='del'>-	INIT_LIST_HEAD(&amp;iter-&gt;journal.list);</div><div class='del'>-	iter-&gt;pos = b-&gt;data-&gt;min_key;</div><div class='del'>-	iter-&gt;at_end = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this version is used by btree_gc before filesystem has gone RW and</div><div class='del'>- * multithreaded, so uses the journal_iters list:</div><div class='del'>- */</div><div class='del'>-void bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *iter,</div><div class='del'>-						struct bch_fs *c,</div><div class='del'>-						struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_node_iter node_iter;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_init_from_start(&amp;node_iter, b);</div><div class='del'>-	__bch2_btree_and_journal_iter_init_node_iter(iter, c, b, node_iter, b-&gt;data-&gt;min_key);</div><div class='del'>-	list_add(&amp;iter-&gt;journal.list, &amp;c-&gt;journal_iters);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sort and dedup all keys in the journal: */</div><div class='del'>-</div><div class='del'>-void bch2_journal_entries_free(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct journal_replay **i;</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, iter, i)</div><div class='del'>-		if (*i)</div><div class='del'>-			kvpfree(*i, offsetof(struct journal_replay, j) +</div><div class='del'>-				vstruct_bytes(&amp;(*i)-&gt;j));</div><div class='del'>-	genradix_free(&amp;c-&gt;journal_entries);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When keys compare equal, oldest compares first:</div><div class='del'>- */</div><div class='del'>-static int journal_sort_key_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const struct journal_key *l = _l;</div><div class='del'>-	const struct journal_key *r = _r;</div><div class='del'>-</div><div class='del'>-	return  journal_key_cmp(l, r) ?:</div><div class='del'>-		cmp_int(l-&gt;journal_seq, r-&gt;journal_seq) ?:</div><div class='del'>-		cmp_int(l-&gt;journal_offset, r-&gt;journal_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_keys_put(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	struct journal_key *i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(atomic_read(&amp;keys-&gt;ref) &lt;= 0);</div><div class='del'>-</div><div class='del'>-	if (!atomic_dec_and_test(&amp;keys-&gt;ref))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	move_gap(keys-&gt;d, keys-&gt;nr, keys-&gt;size, keys-&gt;gap, keys-&gt;nr);</div><div class='del'>-	keys-&gt;gap = keys-&gt;nr;</div><div class='del'>-</div><div class='del'>-	for (i = keys-&gt;d; i &lt; keys-&gt;d + keys-&gt;nr; i++)</div><div class='del'>-		if (i-&gt;allocated)</div><div class='del'>-			kfree(i-&gt;k);</div><div class='del'>-</div><div class='del'>-	kvfree(keys-&gt;d);</div><div class='del'>-	keys-&gt;d = NULL;</div><div class='del'>-	keys-&gt;nr = keys-&gt;gap = keys-&gt;size = 0;</div><div class='del'>-</div><div class='del'>-	bch2_journal_entries_free(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __journal_keys_sort(struct journal_keys *keys)</div><div class='del'>-{</div><div class='del'>-	struct journal_key *src, *dst;</div><div class='del'>-</div><div class='del'>-	sort(keys-&gt;d, keys-&gt;nr, sizeof(keys-&gt;d[0]), journal_sort_key_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	src = dst = keys-&gt;d;</div><div class='del'>-	while (src &lt; keys-&gt;d + keys-&gt;nr) {</div><div class='del'>-		while (src + 1 &lt; keys-&gt;d + keys-&gt;nr &amp;&amp;</div><div class='del'>-		       !journal_key_cmp(src, src + 1))</div><div class='del'>-			src++;</div><div class='del'>-</div><div class='del'>-		*dst++ = *src++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	keys-&gt;nr = dst - keys-&gt;d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_keys_sort(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-	struct journal_replay *i, **_i;</div><div class='del'>-	struct jset_entry *entry;</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	size_t nr_keys = 0, nr_read = 0;</div><div class='del'>-</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, iter, _i) {</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for_each_jset_key(k, entry, &amp;i-&gt;j)</div><div class='del'>-			nr_keys++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!nr_keys)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	keys-&gt;size = roundup_pow_of_two(nr_keys);</div><div class='del'>-</div><div class='del'>-	keys-&gt;d = kvmalloc_array(keys-&gt;size, sizeof(keys-&gt;d[0]), GFP_KERNEL);</div><div class='del'>-	if (!keys-&gt;d) {</div><div class='del'>-		bch_err(c, "Failed to allocate buffer for sorted journal keys (%zu keys); trying slowpath",</div><div class='del'>-			nr_keys);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			keys-&gt;size &gt;&gt;= 1;</div><div class='del'>-			keys-&gt;d = kvmalloc_array(keys-&gt;size, sizeof(keys-&gt;d[0]), GFP_KERNEL);</div><div class='del'>-		} while (!keys-&gt;d &amp;&amp; keys-&gt;size &gt; nr_keys / 8);</div><div class='del'>-</div><div class='del'>-		if (!keys-&gt;d) {</div><div class='del'>-			bch_err(c, "Failed to allocate %zu size buffer for sorted journal keys; exiting",</div><div class='del'>-				keys-&gt;size);</div><div class='del'>-			return -BCH_ERR_ENOMEM_journal_keys_sort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, iter, _i) {</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		for_each_jset_key(k, entry, &amp;i-&gt;j) {</div><div class='del'>-			if (keys-&gt;nr == keys-&gt;size) {</div><div class='del'>-				__journal_keys_sort(keys);</div><div class='del'>-</div><div class='del'>-				if (keys-&gt;nr &gt; keys-&gt;size * 7 / 8) {</div><div class='del'>-					bch_err(c, "Too many journal keys for slowpath; have %zu compacted, buf size %zu, processed %zu/%zu",</div><div class='del'>-						keys-&gt;nr, keys-&gt;size, nr_read, nr_keys);</div><div class='del'>-					return -BCH_ERR_ENOMEM_journal_keys_sort;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			keys-&gt;d[keys-&gt;nr++] = (struct journal_key) {</div><div class='del'>-				.btree_id	= entry-&gt;btree_id,</div><div class='del'>-				.level		= entry-&gt;level,</div><div class='del'>-				.k		= k,</div><div class='del'>-				.journal_seq	= le64_to_cpu(i-&gt;j.seq),</div><div class='del'>-				.journal_offset	= k-&gt;_data - i-&gt;j._data,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			nr_read++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__journal_keys_sort(keys);</div><div class='del'>-	keys-&gt;gap = keys-&gt;nr;</div><div class='del'>-</div><div class='del'>-	bch_verbose(c, "Journal keys: %zu read, %zu after sorting and compacting", nr_keys, keys-&gt;nr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_journal_iter.h b/fs/bcachefs/btree_journal_iter.h<br/>deleted file mode 100644<br/>index 8ca4c100b2e3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_journal_iter.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_journal_iter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_JOURNAL_ITER_H</div><div class='del'>-#define _BCACHEFS_BTREE_JOURNAL_ITER_H</div><div class='del'>-</div><div class='del'>-struct journal_iter {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	enum btree_id		btree_id;</div><div class='del'>-	unsigned		level;</div><div class='del'>-	size_t			idx;</div><div class='del'>-	struct journal_keys	*keys;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Iterate over keys in the btree, with keys from the journal overlaid on top:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct btree_and_journal_iter {</div><div class='del'>-	struct btree		*b;</div><div class='del'>-	struct btree_node_iter	node_iter;</div><div class='del'>-	struct bkey		unpacked;</div><div class='del'>-</div><div class='del'>-	struct journal_iter	journal;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-	bool			at_end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bkey_i *bch2_journal_keys_peek_upto(struct bch_fs *, enum btree_id,</div><div class='del'>-				unsigned, struct bpos, struct bpos, size_t *);</div><div class='del'>-struct bkey_i *bch2_journal_keys_peek_slot(struct bch_fs *, enum btree_id,</div><div class='del'>-					   unsigned, struct bpos);</div><div class='del'>-</div><div class='del'>-int bch2_journal_key_insert_take(struct bch_fs *, enum btree_id,</div><div class='del'>-				 unsigned, struct bkey_i *);</div><div class='del'>-int bch2_journal_key_insert(struct bch_fs *, enum btree_id,</div><div class='del'>-			    unsigned, struct bkey_i *);</div><div class='del'>-int bch2_journal_key_delete(struct bch_fs *, enum btree_id,</div><div class='del'>-			    unsigned, struct bpos);</div><div class='del'>-void bch2_journal_key_overwritten(struct bch_fs *, enum btree_id,</div><div class='del'>-				  unsigned, struct bpos);</div><div class='del'>-</div><div class='del'>-void bch2_btree_and_journal_iter_advance(struct btree_and_journal_iter *);</div><div class='del'>-struct bkey_s_c bch2_btree_and_journal_iter_peek(struct btree_and_journal_iter *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_and_journal_iter_exit(struct btree_and_journal_iter *);</div><div class='del'>-void __bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,</div><div class='del'>-				struct bch_fs *, struct btree *,</div><div class='del'>-				struct btree_node_iter, struct bpos);</div><div class='del'>-void bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,</div><div class='del'>-						struct bch_fs *,</div><div class='del'>-						struct btree *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_keys_put(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_journal_keys_put_initial(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;journal_keys.initial_ref_held)</div><div class='del'>-		bch2_journal_keys_put(c);</div><div class='del'>-	c-&gt;journal_keys.initial_ref_held = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_entries_free(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_journal_keys_sort(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_JOURNAL_ITER_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c<br/>deleted file mode 100644<br/>index 74e52fd28abe..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_key_cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_key_cache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1067 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-</div><div class='del'>-static inline bool btree_uses_pcpu_readers(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	return id == BTREE_ID_subvolumes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct kmem_cache *bch2_key_cache;</div><div class='del'>-</div><div class='del'>-static int bch2_btree_key_cache_cmp_fn(struct rhashtable_compare_arg *arg,</div><div class='del'>-				       const void *obj)</div><div class='del'>-{</div><div class='del'>-	const struct bkey_cached *ck = obj;</div><div class='del'>-	const struct bkey_cached_key *key = arg-&gt;key;</div><div class='del'>-</div><div class='del'>-	return ck-&gt;key.btree_id != key-&gt;btree_id ||</div><div class='del'>-		!bpos_eq(ck-&gt;key.pos, key-&gt;pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct rhashtable_params bch2_btree_key_cache_params = {</div><div class='del'>-	.head_offset	= offsetof(struct bkey_cached, hash),</div><div class='del'>-	.key_offset	= offsetof(struct bkey_cached, key),</div><div class='del'>-	.key_len	= sizeof(struct bkey_cached_key),</div><div class='del'>-	.obj_cmpfn	= bch2_btree_key_cache_cmp_fn,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-__flatten</div><div class='del'>-inline struct bkey_cached *</div><div class='del'>-bch2_btree_key_cache_find(struct bch_fs *c, enum btree_id btree_id, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bkey_cached_key key = {</div><div class='del'>-		.btree_id	= btree_id,</div><div class='del'>-		.pos		= pos,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return rhashtable_lookup_fast(&amp;c-&gt;btree_key_cache.table, &amp;key,</div><div class='del'>-				      bch2_btree_key_cache_params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bkey_cached_lock_for_evict(struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	if (!six_trylock_intent(&amp;ck-&gt;c.lock))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-		six_unlock_intent(&amp;ck-&gt;c.lock);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!six_trylock_write(&amp;ck-&gt;c.lock)) {</div><div class='del'>-		six_unlock_intent(&amp;ck-&gt;c.lock);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bkey_cached_evict(struct btree_key_cache *c,</div><div class='del'>-			      struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(rhashtable_remove_fast(&amp;c-&gt;table, &amp;ck-&gt;hash,</div><div class='del'>-				      bch2_btree_key_cache_params));</div><div class='del'>-	memset(&amp;ck-&gt;key, ~0, sizeof(ck-&gt;key));</div><div class='del'>-</div><div class='del'>-	atomic_long_dec(&amp;c-&gt;nr_keys);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bkey_cached_free(struct btree_key_cache *bc,</div><div class='del'>-			     struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(bc, struct bch_fs, btree_key_cache);</div><div class='del'>-</div><div class='del'>-	BUG_ON(test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags));</div><div class='del'>-</div><div class='del'>-	ck-&gt;btree_trans_barrier_seq =</div><div class='del'>-		start_poll_synchronize_srcu(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-</div><div class='del'>-	if (ck-&gt;c.lock.readers) {</div><div class='del'>-		list_move_tail(&amp;ck-&gt;list, &amp;bc-&gt;freed_pcpu);</div><div class='del'>-		bc-&gt;nr_freed_pcpu++;</div><div class='del'>-	} else {</div><div class='del'>-		list_move_tail(&amp;ck-&gt;list, &amp;bc-&gt;freed_nonpcpu);</div><div class='del'>-		bc-&gt;nr_freed_nonpcpu++;</div><div class='del'>-	}</div><div class='del'>-	atomic_long_inc(&amp;bc-&gt;nr_freed);</div><div class='del'>-</div><div class='del'>-	kfree(ck-&gt;k);</div><div class='del'>-	ck-&gt;k		= NULL;</div><div class='del'>-	ck-&gt;u64s	= 0;</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;ck-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;ck-&gt;c.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-static void __bkey_cached_move_to_freelist_ordered(struct btree_key_cache *bc,</div><div class='del'>-						   struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	struct bkey_cached *pos;</div><div class='del'>-</div><div class='del'>-	bc-&gt;nr_freed_nonpcpu++;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_reverse(pos, &amp;bc-&gt;freed_nonpcpu, list) {</div><div class='del'>-		if (ULONG_CMP_GE(ck-&gt;btree_trans_barrier_seq,</div><div class='del'>-				 pos-&gt;btree_trans_barrier_seq)) {</div><div class='del'>-			list_move(&amp;ck-&gt;list, &amp;pos-&gt;list);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_move(&amp;ck-&gt;list, &amp;bc-&gt;freed_nonpcpu);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void bkey_cached_move_to_freelist(struct btree_key_cache *bc,</div><div class='del'>-					 struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags));</div><div class='del'>-</div><div class='del'>-	if (!ck-&gt;c.lock.readers) {</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-		struct btree_key_cache_freelist *f;</div><div class='del'>-		bool freed = false;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		f = this_cpu_ptr(bc-&gt;pcpu_freed);</div><div class='del'>-</div><div class='del'>-		if (f-&gt;nr &lt; ARRAY_SIZE(f-&gt;objs)) {</div><div class='del'>-			f-&gt;objs[f-&gt;nr++] = ck;</div><div class='del'>-			freed = true;</div><div class='del'>-		}</div><div class='del'>-		preempt_enable();</div><div class='del'>-</div><div class='del'>-		if (!freed) {</div><div class='del'>-			mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-			preempt_disable();</div><div class='del'>-			f = this_cpu_ptr(bc-&gt;pcpu_freed);</div><div class='del'>-</div><div class='del'>-			while (f-&gt;nr &gt; ARRAY_SIZE(f-&gt;objs) / 2) {</div><div class='del'>-				struct bkey_cached *ck2 = f-&gt;objs[--f-&gt;nr];</div><div class='del'>-</div><div class='del'>-				__bkey_cached_move_to_freelist_ordered(bc, ck2);</div><div class='del'>-			}</div><div class='del'>-			preempt_enable();</div><div class='del'>-</div><div class='del'>-			__bkey_cached_move_to_freelist_ordered(bc, ck);</div><div class='del'>-			mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-		list_move_tail(&amp;ck-&gt;list, &amp;bc-&gt;freed_nonpcpu);</div><div class='del'>-		bc-&gt;nr_freed_nonpcpu++;</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-		list_move_tail(&amp;ck-&gt;list, &amp;bc-&gt;freed_pcpu);</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bkey_cached_free_fast(struct btree_key_cache *bc,</div><div class='del'>-				  struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(bc, struct bch_fs, btree_key_cache);</div><div class='del'>-</div><div class='del'>-	ck-&gt;btree_trans_barrier_seq =</div><div class='del'>-		start_poll_synchronize_srcu(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-</div><div class='del'>-	list_del_init(&amp;ck-&gt;list);</div><div class='del'>-	atomic_long_inc(&amp;bc-&gt;nr_freed);</div><div class='del'>-</div><div class='del'>-	kfree(ck-&gt;k);</div><div class='del'>-	ck-&gt;k		= NULL;</div><div class='del'>-	ck-&gt;u64s	= 0;</div><div class='del'>-</div><div class='del'>-	bkey_cached_move_to_freelist(bc, ck);</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;ck-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;ck-&gt;c.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_cached *</div><div class='del'>-bkey_cached_alloc(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-		  bool *was_new)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_key_cache *bc = &amp;c-&gt;btree_key_cache;</div><div class='del'>-	struct bkey_cached *ck = NULL;</div><div class='del'>-	bool pcpu_readers = btree_uses_pcpu_readers(path-&gt;btree_id);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!pcpu_readers) {</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-		struct btree_key_cache_freelist *f;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		f = this_cpu_ptr(bc-&gt;pcpu_freed);</div><div class='del'>-		if (f-&gt;nr)</div><div class='del'>-			ck = f-&gt;objs[--f-&gt;nr];</div><div class='del'>-		preempt_enable();</div><div class='del'>-</div><div class='del'>-		if (!ck) {</div><div class='del'>-			mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-			preempt_disable();</div><div class='del'>-			f = this_cpu_ptr(bc-&gt;pcpu_freed);</div><div class='del'>-</div><div class='del'>-			while (!list_empty(&amp;bc-&gt;freed_nonpcpu) &amp;&amp;</div><div class='del'>-			       f-&gt;nr &lt; ARRAY_SIZE(f-&gt;objs) / 2) {</div><div class='del'>-				ck = list_last_entry(&amp;bc-&gt;freed_nonpcpu, struct bkey_cached, list);</div><div class='del'>-				list_del_init(&amp;ck-&gt;list);</div><div class='del'>-				bc-&gt;nr_freed_nonpcpu--;</div><div class='del'>-				f-&gt;objs[f-&gt;nr++] = ck;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ck = f-&gt;nr ? f-&gt;objs[--f-&gt;nr] : NULL;</div><div class='del'>-			preempt_enable();</div><div class='del'>-			mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-		if (!list_empty(&amp;bc-&gt;freed_nonpcpu)) {</div><div class='del'>-			ck = list_last_entry(&amp;bc-&gt;freed_nonpcpu, struct bkey_cached, list);</div><div class='del'>-			list_del_init(&amp;ck-&gt;list);</div><div class='del'>-			bc-&gt;nr_freed_nonpcpu--;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-		if (!list_empty(&amp;bc-&gt;freed_pcpu)) {</div><div class='del'>-			ck = list_last_entry(&amp;bc-&gt;freed_pcpu, struct bkey_cached, list);</div><div class='del'>-			list_del_init(&amp;ck-&gt;list);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ck) {</div><div class='del'>-		ret = btree_node_lock_nopath(trans, &amp;ck-&gt;c, SIX_LOCK_intent, _THIS_IP_);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			bkey_cached_move_to_freelist(bc, ck);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		path-&gt;l[0].b = (void *) ck;</div><div class='del'>-		path-&gt;l[0].lock_seq = six_lock_seq(&amp;ck-&gt;c.lock);</div><div class='del'>-		mark_btree_node_locked(trans, path, 0, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_node_lock_write(trans, path, &amp;ck-&gt;c);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			btree_node_unlock(trans, path, 0);</div><div class='del'>-			bkey_cached_move_to_freelist(bc, ck);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return ck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ck = allocate_dropping_locks(trans, ret,</div><div class='del'>-			kmem_cache_zalloc(bch2_key_cache, _gfp));</div><div class='del'>-	if (ret) {</div><div class='del'>-		kmem_cache_free(bch2_key_cache, ck);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ck)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;ck-&gt;list);</div><div class='del'>-	bch2_btree_lock_init(&amp;ck-&gt;c, pcpu_readers ? SIX_LOCK_INIT_PCPU : 0);</div><div class='del'>-</div><div class='del'>-	ck-&gt;c.cached = true;</div><div class='del'>-	BUG_ON(!six_trylock_intent(&amp;ck-&gt;c.lock));</div><div class='del'>-	BUG_ON(!six_trylock_write(&amp;ck-&gt;c.lock));</div><div class='del'>-	*was_new = true;</div><div class='del'>-	return ck;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_cached *</div><div class='del'>-bkey_cached_reuse(struct btree_key_cache *c)</div><div class='del'>-{</div><div class='del'>-	struct bucket_table *tbl;</div><div class='del'>-	struct rhash_head *pos;</div><div class='del'>-	struct bkey_cached *ck;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;lock);</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	tbl = rht_dereference_rcu(c-&gt;table.tbl, &amp;c-&gt;table);</div><div class='del'>-	for (i = 0; i &lt; tbl-&gt;size; i++)</div><div class='del'>-		rht_for_each_entry_rcu(ck, pos, tbl, i, hash) {</div><div class='del'>-			if (!test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags) &amp;&amp;</div><div class='del'>-			    bkey_cached_lock_for_evict(ck)) {</div><div class='del'>-				bkey_cached_evict(c, ck);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	ck = NULL;</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	mutex_unlock(&amp;c-&gt;lock);</div><div class='del'>-	return ck;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_cached *</div><div class='del'>-btree_key_cache_create(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_key_cache *bc = &amp;c-&gt;btree_key_cache;</div><div class='del'>-	struct bkey_cached *ck;</div><div class='del'>-	bool was_new = false;</div><div class='del'>-</div><div class='del'>-	ck = bkey_cached_alloc(trans, path, &amp;was_new);</div><div class='del'>-	if (IS_ERR(ck))</div><div class='del'>-		return ck;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!ck)) {</div><div class='del'>-		ck = bkey_cached_reuse(bc);</div><div class='del'>-		if (unlikely(!ck)) {</div><div class='del'>-			bch_err(c, "error allocating memory for key cache item, btree %s",</div><div class='del'>-				bch2_btree_id_str(path-&gt;btree_id));</div><div class='del'>-			return ERR_PTR(-BCH_ERR_ENOMEM_btree_key_cache_create);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked(trans, path, 0, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ck-&gt;c.level		= 0;</div><div class='del'>-	ck-&gt;c.btree_id		= path-&gt;btree_id;</div><div class='del'>-	ck-&gt;key.btree_id	= path-&gt;btree_id;</div><div class='del'>-	ck-&gt;key.pos		= path-&gt;pos;</div><div class='del'>-	ck-&gt;valid		= false;</div><div class='del'>-	ck-&gt;flags		= 1U &lt;&lt; BKEY_CACHED_ACCESSED;</div><div class='del'>-</div><div class='del'>-	if (unlikely(rhashtable_lookup_insert_fast(&amp;bc-&gt;table,</div><div class='del'>-					  &amp;ck-&gt;hash,</div><div class='del'>-					  bch2_btree_key_cache_params))) {</div><div class='del'>-		/* We raced with another fill: */</div><div class='del'>-</div><div class='del'>-		if (likely(was_new)) {</div><div class='del'>-			six_unlock_write(&amp;ck-&gt;c.lock);</div><div class='del'>-			six_unlock_intent(&amp;ck-&gt;c.lock);</div><div class='del'>-			kfree(ck);</div><div class='del'>-		} else {</div><div class='del'>-			bkey_cached_free_fast(bc, ck);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked(trans, path, 0, BTREE_NODE_UNLOCKED);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_long_inc(&amp;bc-&gt;nr_keys);</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;ck-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	return ck;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_key_cache_fill(struct btree_trans *trans,</div><div class='del'>-				struct btree_path *ck_path,</div><div class='del'>-				struct bkey_cached *ck)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	unsigned new_u64s = 0;</div><div class='del'>-	struct bkey_i *new_k = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, ck-&gt;key.btree_id, ck-&gt;key.pos,</div><div class='del'>-			       BTREE_ITER_KEY_CACHE_FILL|</div><div class='del'>-			       BTREE_ITER_CACHED_NOFILL);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_node_relock(trans, ck_path, 0)) {</div><div class='del'>-		trace_and_count(trans-&gt;c, trans_restart_relock_key_cache_fill, trans, _THIS_IP_, ck_path);</div><div class='del'>-		ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_fill);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * bch2_varint_decode can read past the end of the buffer by at</div><div class='del'>-	 * most 7 bytes (it won't be used):</div><div class='del'>-	 */</div><div class='del'>-	new_u64s = k.k-&gt;u64s + 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate some extra space so that the transaction commit path is less</div><div class='del'>-	 * likely to have to reallocate, since that requires a transaction</div><div class='del'>-	 * restart:</div><div class='del'>-	 */</div><div class='del'>-	new_u64s = min(256U, (new_u64s * 3) / 2);</div><div class='del'>-</div><div class='del'>-	if (new_u64s &gt; ck-&gt;u64s) {</div><div class='del'>-		new_u64s = roundup_pow_of_two(new_u64s);</div><div class='del'>-		new_k = kmalloc(new_u64s * sizeof(u64), GFP_NOWAIT|__GFP_NOWARN);</div><div class='del'>-		if (!new_k) {</div><div class='del'>-			bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-			new_k = kmalloc(new_u64s * sizeof(u64), GFP_KERNEL);</div><div class='del'>-			if (!new_k) {</div><div class='del'>-				bch_err(trans-&gt;c, "error allocating memory for key cache key, btree %s u64s %u",</div><div class='del'>-					bch2_btree_id_str(ck-&gt;key.btree_id), new_u64s);</div><div class='del'>-				ret = -BCH_ERR_ENOMEM_btree_key_cache_fill;</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!bch2_btree_node_relock(trans, ck_path, 0)) {</div><div class='del'>-				kfree(new_k);</div><div class='del'>-				trace_and_count(trans-&gt;c, trans_restart_relock_key_cache_fill, trans, _THIS_IP_, ck_path);</div><div class='del'>-				ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_fill);</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = bch2_trans_relock(trans);</div><div class='del'>-			if (ret) {</div><div class='del'>-				kfree(new_k);</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_node_lock_write(trans, ck_path, &amp;ck_path-&gt;l[0].b-&gt;c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(new_k);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_k) {</div><div class='del'>-		kfree(ck-&gt;k);</div><div class='del'>-		ck-&gt;u64s = new_u64s;</div><div class='del'>-		ck-&gt;k = new_k;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_reassemble(ck-&gt;k, k);</div><div class='del'>-	ck-&gt;valid = true;</div><div class='del'>-	bch2_btree_node_unlock_write(trans, ck_path, ck_path-&gt;l[0].b);</div><div class='del'>-</div><div class='del'>-	/* We're not likely to need this iterator again: */</div><div class='del'>-	set_btree_iter_dontneed(&amp;iter);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int</div><div class='del'>-bch2_btree_path_traverse_cached_slowpath(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-					 unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_cached *ck;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(path-&gt;level);</div><div class='del'>-</div><div class='del'>-	path-&gt;l[1].b = NULL;</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_node_relock_notrace(trans, path, 0)) {</div><div class='del'>-		ck = (void *) path-&gt;l[0].b;</div><div class='del'>-		goto fill;</div><div class='del'>-	}</div><div class='del'>-retry:</div><div class='del'>-	ck = bch2_btree_key_cache_find(c, path-&gt;btree_id, path-&gt;pos);</div><div class='del'>-	if (!ck) {</div><div class='del'>-		ck = btree_key_cache_create(trans, path);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(ck);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-		if (!ck)</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked(trans, path, 0, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-		path-&gt;locks_want = 1;</div><div class='del'>-	} else {</div><div class='del'>-		enum six_lock_type lock_want = __btree_lock_want(path, 0);</div><div class='del'>-</div><div class='del'>-		ret = btree_node_lock(trans, path, (void *) ck, 0,</div><div class='del'>-				      lock_want, _THIS_IP_);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-		if (ck-&gt;key.btree_id != path-&gt;btree_id ||</div><div class='del'>-		    !bpos_eq(ck-&gt;key.pos, path-&gt;pos)) {</div><div class='del'>-			six_unlock_type(&amp;ck-&gt;c.lock, lock_want);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked(trans, path, 0,</div><div class='del'>-				       (enum btree_node_locked_type) lock_want);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path-&gt;l[0].lock_seq	= six_lock_seq(&amp;ck-&gt;c.lock);</div><div class='del'>-	path-&gt;l[0].b		= (void *) ck;</div><div class='del'>-fill:</div><div class='del'>-	path-&gt;uptodate = BTREE_ITER_UPTODATE;</div><div class='del'>-</div><div class='del'>-	if (!ck-&gt;valid &amp;&amp; !(flags &amp; BTREE_ITER_CACHED_NOFILL)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Using the underscore version because we haven't set</div><div class='del'>-		 * path-&gt;uptodate yet:</div><div class='del'>-		 */</div><div class='del'>-		if (!path-&gt;locks_want &amp;&amp;</div><div class='del'>-		    !__bch2_btree_path_upgrade(trans, path, 1, NULL)) {</div><div class='del'>-			trace_and_count(trans-&gt;c, trans_restart_key_cache_upgrade, trans, _THIS_IP_);</div><div class='del'>-			ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_upgrade);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = btree_key_cache_fill(trans, path, ck);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_relock(trans, path, _THIS_IP_);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		path-&gt;uptodate = BTREE_ITER_UPTODATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BKEY_CACHED_ACCESSED, &amp;ck-&gt;flags))</div><div class='del'>-		set_bit(BKEY_CACHED_ACCESSED, &amp;ck-&gt;flags);</div><div class='del'>-</div><div class='del'>-	BUG_ON(btree_node_locked_type(path, 0) != btree_lock_want(path, 0));</div><div class='del'>-	BUG_ON(path-&gt;uptodate);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	path-&gt;uptodate = BTREE_ITER_NEED_TRAVERSE;</div><div class='del'>-	if (!bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-		btree_node_unlock(trans, path, 0);</div><div class='del'>-		path-&gt;l[0].b = ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_path_traverse_cached(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-				    unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_cached *ck;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;level);</div><div class='del'>-</div><div class='del'>-	path-&gt;l[1].b = NULL;</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_node_relock_notrace(trans, path, 0)) {</div><div class='del'>-		ck = (void *) path-&gt;l[0].b;</div><div class='del'>-		goto fill;</div><div class='del'>-	}</div><div class='del'>-retry:</div><div class='del'>-	ck = bch2_btree_key_cache_find(c, path-&gt;btree_id, path-&gt;pos);</div><div class='del'>-	if (!ck) {</div><div class='del'>-		return bch2_btree_path_traverse_cached_slowpath(trans, path, flags);</div><div class='del'>-	} else {</div><div class='del'>-		enum six_lock_type lock_want = __btree_lock_want(path, 0);</div><div class='del'>-</div><div class='del'>-		ret = btree_node_lock(trans, path, (void *) ck, 0,</div><div class='del'>-				      lock_want, _THIS_IP_);</div><div class='del'>-		EBUG_ON(ret &amp;&amp; !bch2_err_matches(ret, BCH_ERR_transaction_restart));</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (ck-&gt;key.btree_id != path-&gt;btree_id ||</div><div class='del'>-		    !bpos_eq(ck-&gt;key.pos, path-&gt;pos)) {</div><div class='del'>-			six_unlock_type(&amp;ck-&gt;c.lock, lock_want);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked(trans, path, 0,</div><div class='del'>-				       (enum btree_node_locked_type) lock_want);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path-&gt;l[0].lock_seq	= six_lock_seq(&amp;ck-&gt;c.lock);</div><div class='del'>-	path-&gt;l[0].b		= (void *) ck;</div><div class='del'>-fill:</div><div class='del'>-	if (!ck-&gt;valid)</div><div class='del'>-		return bch2_btree_path_traverse_cached_slowpath(trans, path, flags);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BKEY_CACHED_ACCESSED, &amp;ck-&gt;flags))</div><div class='del'>-		set_bit(BKEY_CACHED_ACCESSED, &amp;ck-&gt;flags);</div><div class='del'>-</div><div class='del'>-	path-&gt;uptodate = BTREE_ITER_UPTODATE;</div><div class='del'>-	EBUG_ON(!ck-&gt;valid);</div><div class='del'>-	EBUG_ON(btree_node_locked_type(path, 0) != btree_lock_want(path, 0));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_key_cache_flush_pos(struct btree_trans *trans,</div><div class='del'>-				     struct bkey_cached_key key,</div><div class='del'>-				     u64 journal_seq,</div><div class='del'>-				     unsigned commit_flags,</div><div class='del'>-				     bool evict)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-	struct btree_iter c_iter, b_iter;</div><div class='del'>-	struct bkey_cached *ck = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;b_iter, key.btree_id, key.pos,</div><div class='del'>-			     BTREE_ITER_SLOTS|</div><div class='del'>-			     BTREE_ITER_INTENT|</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;c_iter, key.btree_id, key.pos,</div><div class='del'>-			     BTREE_ITER_CACHED|</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	b_iter.flags &amp;= ~BTREE_ITER_WITH_KEY_CACHE;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_iter_traverse(&amp;c_iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ck = (void *) btree_iter_path(trans, &amp;c_iter)-&gt;l[0].b;</div><div class='del'>-	if (!ck)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-		if (evict)</div><div class='del'>-			goto evict;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ck-&gt;valid);</div><div class='del'>-</div><div class='del'>-	if (journal_seq &amp;&amp; ck-&gt;journal.seq != journal_seq)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	trans-&gt;journal_res.seq = ck-&gt;journal.seq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're at the end of the journal, we really want to free up space</div><div class='del'>-	 * in the journal right away - we don't want to pin that old journal</div><div class='del'>-	 * sequence number with a new btree node write, we want to re-journal</div><div class='del'>-	 * the update</div><div class='del'>-	 */</div><div class='del'>-	if (ck-&gt;journal.seq == journal_last_seq(j))</div><div class='del'>-		commit_flags |= BCH_WATERMARK_reclaim;</div><div class='del'>-</div><div class='del'>-	if (ck-&gt;journal.seq != journal_last_seq(j) ||</div><div class='del'>-	    j-&gt;watermark == BCH_WATERMARK_stripe)</div><div class='del'>-		commit_flags |= BCH_TRANS_COMMIT_no_journal_res;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_btree_iter_traverse(&amp;b_iter) ?:</div><div class='del'>-		bch2_trans_update(trans, &amp;b_iter, ck-&gt;k,</div><div class='del'>-				  BTREE_UPDATE_KEY_CACHE_RECLAIM|</div><div class='del'>-				  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE|</div><div class='del'>-				  BTREE_TRIGGER_NORUN) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				  BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-				  BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-				  commit_flags);</div><div class='del'>-</div><div class='del'>-	bch2_fs_fatal_err_on(ret &amp;&amp;</div><div class='del'>-			     !bch2_err_matches(ret, BCH_ERR_transaction_restart) &amp;&amp;</div><div class='del'>-			     !bch2_err_matches(ret, BCH_ERR_journal_reclaim_would_deadlock) &amp;&amp;</div><div class='del'>-			     !bch2_journal_error(j), c,</div><div class='del'>-			     "error flushing key cache: %s", bch2_err_str(ret));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_drop(j, &amp;ck-&gt;journal);</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, &amp;c_iter);</div><div class='del'>-	BUG_ON(!btree_node_locked(path, 0));</div><div class='del'>-</div><div class='del'>-	if (!evict) {</div><div class='del'>-		if (test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-			clear_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags);</div><div class='del'>-			atomic_long_dec(&amp;c-&gt;btree_key_cache.nr_dirty);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct btree_path *path2;</div><div class='del'>-		unsigned i;</div><div class='del'>-evict:</div><div class='del'>-		trans_for_each_path(trans, path2, i)</div><div class='del'>-			if (path2 != path)</div><div class='del'>-				__bch2_btree_path_unlock(trans, path2);</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_lock_write_nofail(trans, path, &amp;ck-&gt;c);</div><div class='del'>-</div><div class='del'>-		if (test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-			clear_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags);</div><div class='del'>-			atomic_long_dec(&amp;c-&gt;btree_key_cache.nr_dirty);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked_noreset(path, 0, BTREE_NODE_UNLOCKED);</div><div class='del'>-		bkey_cached_evict(&amp;c-&gt;btree_key_cache, ck);</div><div class='del'>-		bkey_cached_free_fast(&amp;c-&gt;btree_key_cache, ck);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;b_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;c_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_key_cache_journal_flush(struct journal *j,</div><div class='del'>-				struct journal_entry_pin *pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct bkey_cached *ck =</div><div class='del'>-		container_of(pin, struct bkey_cached, journal);</div><div class='del'>-	struct bkey_cached_key key;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	int srcu_idx = srcu_read_lock(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;ck-&gt;c, SIX_LOCK_read);</div><div class='del'>-	key = ck-&gt;key;</div><div class='del'>-</div><div class='del'>-	if (ck-&gt;journal.seq != seq ||</div><div class='del'>-	    !test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-		six_unlock_read(&amp;ck-&gt;c.lock);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ck-&gt;seq != seq) {</div><div class='del'>-		bch2_journal_pin_update(&amp;c-&gt;journal, ck-&gt;seq, &amp;ck-&gt;journal,</div><div class='del'>-					bch2_btree_key_cache_journal_flush);</div><div class='del'>-		six_unlock_read(&amp;ck-&gt;c.lock);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-	six_unlock_read(&amp;ck-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	ret = lockrestart_do(trans,</div><div class='del'>-		btree_key_cache_flush_pos(trans, key, seq,</div><div class='del'>-				BCH_TRANS_COMMIT_journal_reclaim, false));</div><div class='del'>-unlock:</div><div class='del'>-	srcu_read_unlock(&amp;c-&gt;btree_trans_barrier, srcu_idx);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_insert_key_cached(struct btree_trans *trans,</div><div class='del'>-				  unsigned flags,</div><div class='del'>-				  struct btree_insert_entry *insert_entry)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_cached *ck = (void *) (trans-&gt;paths + insert_entry-&gt;path)-&gt;l[0].b;</div><div class='del'>-	struct bkey_i *insert = insert_entry-&gt;k;</div><div class='del'>-	bool kick_reclaim = false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(insert-&gt;k.u64s &gt; ck-&gt;u64s);</div><div class='del'>-</div><div class='del'>-	bkey_copy(ck-&gt;k, insert);</div><div class='del'>-	ck-&gt;valid = true;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-		EBUG_ON(test_bit(BCH_FS_clean_shutdown, &amp;c-&gt;flags));</div><div class='del'>-		set_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags);</div><div class='del'>-		atomic_long_inc(&amp;c-&gt;btree_key_cache.nr_dirty);</div><div class='del'>-</div><div class='del'>-		if (bch2_nr_btree_keys_need_flush(c))</div><div class='del'>-			kick_reclaim = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To minimize lock contention, we only add the journal pin here and</div><div class='del'>-	 * defer pin updates to the flush callback via -&gt;seq. Be careful not to</div><div class='del'>-	 * update -&gt;seq on nojournal commits because we don't want to update the</div><div class='del'>-	 * pin to a seq that doesn't include journal updates on disk. Otherwise</div><div class='del'>-	 * we risk losing the update after a crash.</div><div class='del'>-	 *</div><div class='del'>-	 * The only exception is if the pin is not active in the first place. We</div><div class='del'>-	 * have to add the pin because journal reclaim drives key cache</div><div class='del'>-	 * flushing. The flush callback will not proceed unless -&gt;seq matches</div><div class='del'>-	 * the latest pin, so make sure it starts with a consistent value.</div><div class='del'>-	 */</div><div class='del'>-	if (!(insert_entry-&gt;flags &amp; BTREE_UPDATE_NOJOURNAL) ||</div><div class='del'>-	    !journal_pin_active(&amp;ck-&gt;journal)) {</div><div class='del'>-		ck-&gt;seq = trans-&gt;journal_res.seq;</div><div class='del'>-	}</div><div class='del'>-	bch2_journal_pin_add(&amp;c-&gt;journal, trans-&gt;journal_res.seq,</div><div class='del'>-			     &amp;ck-&gt;journal, bch2_btree_key_cache_journal_flush);</div><div class='del'>-</div><div class='del'>-	if (kick_reclaim)</div><div class='del'>-		journal_reclaim_kick(&amp;c-&gt;journal);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_key_cache_drop(struct btree_trans *trans,</div><div class='del'>-			       struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_cached *ck = (void *) path-&gt;l[0].b;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ck-&gt;valid);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We just did an update to the btree, bypassing the key cache: the key</div><div class='del'>-	 * cache key is now stale and must be dropped, even if dirty:</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-		clear_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags);</div><div class='del'>-		atomic_long_dec(&amp;c-&gt;btree_key_cache.nr_dirty);</div><div class='del'>-		bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;ck-&gt;journal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ck-&gt;valid = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink,</div><div class='del'>-					   struct shrink_control *sc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = shrink-&gt;private_data;</div><div class='del'>-	struct btree_key_cache *bc = &amp;c-&gt;btree_key_cache;</div><div class='del'>-	struct bucket_table *tbl;</div><div class='del'>-	struct bkey_cached *ck, *t;</div><div class='del'>-	size_t scanned = 0, freed = 0, nr = sc-&gt;nr_to_scan;</div><div class='del'>-	unsigned start, flags;</div><div class='del'>-	int srcu_idx;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-	srcu_idx = srcu_read_lock(&amp;c-&gt;btree_trans_barrier);</div><div class='del'>-	flags = memalloc_nofs_save();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Newest freed entries are at the end of the list - once we hit one</div><div class='del'>-	 * that's too new to be freed, we can bail out:</div><div class='del'>-	 */</div><div class='del'>-	scanned += bc-&gt;nr_freed_nonpcpu;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(ck, t, &amp;bc-&gt;freed_nonpcpu, list) {</div><div class='del'>-		if (!poll_state_synchronize_srcu(&amp;c-&gt;btree_trans_barrier,</div><div class='del'>-						 ck-&gt;btree_trans_barrier_seq))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;ck-&gt;list);</div><div class='del'>-		six_lock_exit(&amp;ck-&gt;c.lock);</div><div class='del'>-		kmem_cache_free(bch2_key_cache, ck);</div><div class='del'>-		atomic_long_dec(&amp;bc-&gt;nr_freed);</div><div class='del'>-		freed++;</div><div class='del'>-		bc-&gt;nr_freed_nonpcpu--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (scanned &gt;= nr)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	scanned += bc-&gt;nr_freed_pcpu;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(ck, t, &amp;bc-&gt;freed_pcpu, list) {</div><div class='del'>-		if (!poll_state_synchronize_srcu(&amp;c-&gt;btree_trans_barrier,</div><div class='del'>-						 ck-&gt;btree_trans_barrier_seq))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;ck-&gt;list);</div><div class='del'>-		six_lock_exit(&amp;ck-&gt;c.lock);</div><div class='del'>-		kmem_cache_free(bch2_key_cache, ck);</div><div class='del'>-		atomic_long_dec(&amp;bc-&gt;nr_freed);</div><div class='del'>-		freed++;</div><div class='del'>-		bc-&gt;nr_freed_pcpu--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (scanned &gt;= nr)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	tbl = rht_dereference_rcu(bc-&gt;table.tbl, &amp;bc-&gt;table);</div><div class='del'>-	if (bc-&gt;shrink_iter &gt;= tbl-&gt;size)</div><div class='del'>-		bc-&gt;shrink_iter = 0;</div><div class='del'>-	start = bc-&gt;shrink_iter;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct rhash_head *pos, *next;</div><div class='del'>-</div><div class='del'>-		pos = rht_ptr_rcu(rht_bucket(tbl, bc-&gt;shrink_iter));</div><div class='del'>-</div><div class='del'>-		while (!rht_is_a_nulls(pos)) {</div><div class='del'>-			next = rht_dereference_bucket_rcu(pos-&gt;next, tbl, bc-&gt;shrink_iter);</div><div class='del'>-			ck = container_of(pos, struct bkey_cached, hash);</div><div class='del'>-</div><div class='del'>-			if (test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags))</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			if (test_bit(BKEY_CACHED_ACCESSED, &amp;ck-&gt;flags))</div><div class='del'>-				clear_bit(BKEY_CACHED_ACCESSED, &amp;ck-&gt;flags);</div><div class='del'>-			else if (bkey_cached_lock_for_evict(ck)) {</div><div class='del'>-				bkey_cached_evict(bc, ck);</div><div class='del'>-				bkey_cached_free(bc, ck);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			scanned++;</div><div class='del'>-			if (scanned &gt;= nr)</div><div class='del'>-				break;</div><div class='del'>-next:</div><div class='del'>-			pos = next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bc-&gt;shrink_iter++;</div><div class='del'>-		if (bc-&gt;shrink_iter &gt;= tbl-&gt;size)</div><div class='del'>-			bc-&gt;shrink_iter = 0;</div><div class='del'>-	} while (scanned &lt; nr &amp;&amp; bc-&gt;shrink_iter != start);</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-out:</div><div class='del'>-	memalloc_nofs_restore(flags);</div><div class='del'>-	srcu_read_unlock(&amp;c-&gt;btree_trans_barrier, srcu_idx);</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return freed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long bch2_btree_key_cache_count(struct shrinker *shrink,</div><div class='del'>-					    struct shrink_control *sc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = shrink-&gt;private_data;</div><div class='del'>-	struct btree_key_cache *bc = &amp;c-&gt;btree_key_cache;</div><div class='del'>-	long nr = atomic_long_read(&amp;bc-&gt;nr_keys) -</div><div class='del'>-		atomic_long_read(&amp;bc-&gt;nr_dirty);</div><div class='del'>-</div><div class='del'>-	return max(0L, nr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_key_cache_exit(struct btree_key_cache *bc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(bc, struct bch_fs, btree_key_cache);</div><div class='del'>-	struct bucket_table *tbl;</div><div class='del'>-	struct bkey_cached *ck, *n;</div><div class='del'>-	struct rhash_head *pos;</div><div class='del'>-	LIST_HEAD(items);</div><div class='del'>-	unsigned i;</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	int cpu;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	shrinker_free(bc-&gt;shrink);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The loop is needed to guard against racing with rehash:</div><div class='del'>-	 */</div><div class='del'>-	while (atomic_long_read(&amp;bc-&gt;nr_keys)) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		tbl = rht_dereference_rcu(bc-&gt;table.tbl, &amp;bc-&gt;table);</div><div class='del'>-		if (tbl)</div><div class='del'>-			for (i = 0; i &lt; tbl-&gt;size; i++)</div><div class='del'>-				rht_for_each_entry_rcu(ck, pos, tbl, i, hash) {</div><div class='del'>-					bkey_cached_evict(bc, ck);</div><div class='del'>-					list_add(&amp;ck-&gt;list, &amp;items);</div><div class='del'>-				}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct btree_key_cache_freelist *f =</div><div class='del'>-			per_cpu_ptr(bc-&gt;pcpu_freed, cpu);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; f-&gt;nr; i++) {</div><div class='del'>-			ck = f-&gt;objs[i];</div><div class='del'>-			list_add(&amp;ck-&gt;list, &amp;items);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	BUG_ON(list_count_nodes(&amp;bc-&gt;freed_pcpu) != bc-&gt;nr_freed_pcpu);</div><div class='del'>-	BUG_ON(list_count_nodes(&amp;bc-&gt;freed_nonpcpu) != bc-&gt;nr_freed_nonpcpu);</div><div class='del'>-</div><div class='del'>-	list_splice(&amp;bc-&gt;freed_pcpu,	&amp;items);</div><div class='del'>-	list_splice(&amp;bc-&gt;freed_nonpcpu,	&amp;items);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(ck, n, &amp;items, list) {</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		list_del(&amp;ck-&gt;list);</div><div class='del'>-		kfree(ck-&gt;k);</div><div class='del'>-		six_lock_exit(&amp;ck-&gt;c.lock);</div><div class='del'>-		kmem_cache_free(bch2_key_cache, ck);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_long_read(&amp;bc-&gt;nr_dirty) &amp;&amp;</div><div class='del'>-	    !bch2_journal_error(&amp;c-&gt;journal) &amp;&amp;</div><div class='del'>-	    test_bit(BCH_FS_was_rw, &amp;c-&gt;flags))</div><div class='del'>-		panic("btree key cache shutdown error: nr_dirty nonzero (%li)\n",</div><div class='del'>-		      atomic_long_read(&amp;bc-&gt;nr_dirty));</div><div class='del'>-</div><div class='del'>-	if (atomic_long_read(&amp;bc-&gt;nr_keys))</div><div class='del'>-		panic("btree key cache shutdown error: nr_keys nonzero (%li)\n",</div><div class='del'>-		      atomic_long_read(&amp;bc-&gt;nr_keys));</div><div class='del'>-</div><div class='del'>-	if (bc-&gt;table_init_done)</div><div class='del'>-		rhashtable_destroy(&amp;bc-&gt;table);</div><div class='del'>-</div><div class='del'>-	free_percpu(bc-&gt;pcpu_freed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_key_cache_init_early(struct btree_key_cache *c)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;c-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;freed_pcpu);</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;freed_nonpcpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_btree_key_cache_init(struct btree_key_cache *bc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(bc, struct bch_fs, btree_key_cache);</div><div class='del'>-	struct shrinker *shrink;</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	bc-&gt;pcpu_freed = alloc_percpu(struct btree_key_cache_freelist);</div><div class='del'>-	if (!bc-&gt;pcpu_freed)</div><div class='del'>-		return -BCH_ERR_ENOMEM_fs_btree_cache_init;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (rhashtable_init(&amp;bc-&gt;table, &amp;bch2_btree_key_cache_params))</div><div class='del'>-		return -BCH_ERR_ENOMEM_fs_btree_cache_init;</div><div class='del'>-</div><div class='del'>-	bc-&gt;table_init_done = true;</div><div class='del'>-</div><div class='del'>-	shrink = shrinker_alloc(0, "%s-btree_key_cache", c-&gt;name);</div><div class='del'>-	if (!shrink)</div><div class='del'>-		return -BCH_ERR_ENOMEM_fs_btree_cache_init;</div><div class='del'>-	bc-&gt;shrink = shrink;</div><div class='del'>-	shrink-&gt;seeks		= 0;</div><div class='del'>-	shrink-&gt;count_objects	= bch2_btree_key_cache_count;</div><div class='del'>-	shrink-&gt;scan_objects	= bch2_btree_key_cache_scan;</div><div class='del'>-	shrink-&gt;private_data	= c;</div><div class='del'>-	shrinker_register(shrink);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_key_cache_to_text(struct printbuf *out, struct btree_key_cache *c)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "nr_freed:\t%lu",	atomic_long_read(&amp;c-&gt;nr_freed));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "nr_keys:\t%lu",	atomic_long_read(&amp;c-&gt;nr_keys));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "nr_dirty:\t%lu",	atomic_long_read(&amp;c-&gt;nr_dirty));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_key_cache_exit(void)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_destroy(bch2_key_cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init bch2_btree_key_cache_init(void)</div><div class='del'>-{</div><div class='del'>-	bch2_key_cache = KMEM_CACHE(bkey_cached, SLAB_RECLAIM_ACCOUNT);</div><div class='del'>-	if (!bch2_key_cache)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_key_cache.h b/fs/bcachefs/btree_key_cache.h<br/>deleted file mode 100644<br/>index e6b2cd0dd2c1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_key_cache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_key_cache.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_KEY_CACHE_H</div><div class='del'>-#define _BCACHEFS_BTREE_KEY_CACHE_H</div><div class='del'>-</div><div class='del'>-static inline size_t bch2_nr_btree_keys_need_flush(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	size_t nr_dirty = atomic_long_read(&amp;c-&gt;btree_key_cache.nr_dirty);</div><div class='del'>-	size_t nr_keys = atomic_long_read(&amp;c-&gt;btree_key_cache.nr_keys);</div><div class='del'>-	size_t max_dirty = 1024 + nr_keys  / 2;</div><div class='del'>-</div><div class='del'>-	return max_t(ssize_t, 0, nr_dirty - max_dirty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_btree_key_cache_must_wait(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	size_t nr_dirty = atomic_long_read(&amp;c-&gt;btree_key_cache.nr_dirty);</div><div class='del'>-	size_t nr_keys = atomic_long_read(&amp;c-&gt;btree_key_cache.nr_keys);</div><div class='del'>-	size_t max_dirty = 4096 + (nr_keys * 3) / 4;</div><div class='del'>-</div><div class='del'>-	return nr_dirty &gt; max_dirty;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_key_cache_journal_flush(struct journal *,</div><div class='del'>-				struct journal_entry_pin *, u64);</div><div class='del'>-</div><div class='del'>-struct bkey_cached *</div><div class='del'>-bch2_btree_key_cache_find(struct bch_fs *, enum btree_id, struct bpos);</div><div class='del'>-</div><div class='del'>-int bch2_btree_path_traverse_cached(struct btree_trans *, struct btree_path *,</div><div class='del'>-				    unsigned);</div><div class='del'>-</div><div class='del'>-bool bch2_btree_insert_key_cached(struct btree_trans *, unsigned,</div><div class='del'>-			struct btree_insert_entry *);</div><div class='del'>-void bch2_btree_key_cache_drop(struct btree_trans *,</div><div class='del'>-			       struct btree_path *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_key_cache_exit(struct btree_key_cache *);</div><div class='del'>-void bch2_fs_btree_key_cache_init_early(struct btree_key_cache *);</div><div class='del'>-int bch2_fs_btree_key_cache_init(struct btree_key_cache *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_key_cache_to_text(struct printbuf *, struct btree_key_cache *);</div><div class='del'>-</div><div class='del'>-void bch2_btree_key_cache_exit(void);</div><div class='del'>-int __init bch2_btree_key_cache_init(void);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_KEY_CACHE_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_key_cache_types.h b/fs/bcachefs/btree_key_cache_types.h<br/>deleted file mode 100644<br/>index 290e4e57df5b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_key_cache_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_key_cache_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_KEY_CACHE_TYPES_H</div><div class='del'>-#define _BCACHEFS_BTREE_KEY_CACHE_TYPES_H</div><div class='del'>-</div><div class='del'>-struct btree_key_cache_freelist {</div><div class='del'>-	struct bkey_cached	*objs[16];</div><div class='del'>-	unsigned		nr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_key_cache {</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	struct rhashtable	table;</div><div class='del'>-	bool			table_init_done;</div><div class='del'>-</div><div class='del'>-	struct list_head	freed_pcpu;</div><div class='del'>-	size_t			nr_freed_pcpu;</div><div class='del'>-	struct list_head	freed_nonpcpu;</div><div class='del'>-	size_t			nr_freed_nonpcpu;</div><div class='del'>-</div><div class='del'>-	struct shrinker		*shrink;</div><div class='del'>-	unsigned		shrink_iter;</div><div class='del'>-	struct btree_key_cache_freelist __percpu *pcpu_freed;</div><div class='del'>-</div><div class='del'>-	atomic_long_t		nr_freed;</div><div class='del'>-	atomic_long_t		nr_keys;</div><div class='del'>-	atomic_long_t		nr_dirty;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bkey_cached_key {</div><div class='del'>-	u32			btree_id;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-} __packed __aligned(4);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_KEY_CACHE_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c<br/>deleted file mode 100644<br/>index bed75c93c069..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_locking.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_locking.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,894 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-</div><div class='del'>-static struct lock_class_key bch2_btree_node_lock_key;</div><div class='del'>-</div><div class='del'>-void bch2_btree_lock_init(struct btree_bkey_cached_common *b,</div><div class='del'>-			  enum six_lock_init_flags flags)</div><div class='del'>-{</div><div class='del'>-	__six_lock_init(&amp;b-&gt;lock, "b-&gt;c.lock", &amp;bch2_btree_node_lock_key, flags);</div><div class='del'>-	lockdep_set_novalidate_class(&amp;b-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-void bch2_assert_btree_nodes_not_locked(void)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	//Re-enable when lock_class_is_held() is merged:</div><div class='del'>-	BUG_ON(lock_class_is_held(&amp;bch2_btree_node_lock_key));</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Btree node locking: */</div><div class='del'>-</div><div class='del'>-struct six_lock_count bch2_btree_node_lock_counts(struct btree_trans *trans,</div><div class='del'>-						  struct btree_path *skip,</div><div class='del'>-						  struct btree_bkey_cached_common *b,</div><div class='del'>-						  unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	struct six_lock_count ret;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ret, 0, sizeof(ret));</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_OR_NULL(b))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path != skip &amp;&amp; &amp;path-&gt;l[level].b-&gt;c == b) {</div><div class='del'>-			int t = btree_node_locked_type(path, level);</div><div class='del'>-</div><div class='del'>-			if (t != BTREE_NODE_UNLOCKED)</div><div class='del'>-				ret.n[t]++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock */</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_unlock_write(struct btree_trans *trans,</div><div class='del'>-			struct btree_path *path, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	bch2_btree_node_unlock_write_inlined(trans, path, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* lock */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @trans wants to lock @b with type @type</div><div class='del'>- */</div><div class='del'>-struct trans_waiting_for_lock {</div><div class='del'>-	struct btree_trans		*trans;</div><div class='del'>-	struct btree_bkey_cached_common	*node_want;</div><div class='del'>-	enum six_lock_type		lock_want;</div><div class='del'>-</div><div class='del'>-	/* for iterating over held locks :*/</div><div class='del'>-	u8				path_idx;</div><div class='del'>-	u8				level;</div><div class='del'>-	u64				lock_start_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lock_graph {</div><div class='del'>-	struct trans_waiting_for_lock	g[8];</div><div class='del'>-	unsigned			nr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static noinline void print_cycle(struct printbuf *out, struct lock_graph *g)</div><div class='del'>-{</div><div class='del'>-	struct trans_waiting_for_lock *i;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Found lock cycle (%u entries):", g-&gt;nr);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	for (i = g-&gt;g; i &lt; g-&gt;g + g-&gt;nr; i++) {</div><div class='del'>-		struct task_struct *task = READ_ONCE(i-&gt;trans-&gt;locking_wait.task);</div><div class='del'>-		if (!task)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_btree_trans_to_text(out, i-&gt;trans);</div><div class='del'>-		bch2_prt_task_backtrace(out, task, i == g-&gt;g ? 5 : 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void print_chain(struct printbuf *out, struct lock_graph *g)</div><div class='del'>-{</div><div class='del'>-	struct trans_waiting_for_lock *i;</div><div class='del'>-</div><div class='del'>-	for (i = g-&gt;g; i != g-&gt;g + g-&gt;nr; i++) {</div><div class='del'>-		struct task_struct *task = i-&gt;trans-&gt;locking_wait.task;</div><div class='del'>-		if (i != g-&gt;g)</div><div class='del'>-			prt_str(out, "&lt;- ");</div><div class='del'>-		prt_printf(out, "%u ", task ?task-&gt;pid : 0);</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lock_graph_up(struct lock_graph *g)</div><div class='del'>-{</div><div class='del'>-	closure_put(&amp;g-&gt;g[--g-&gt;nr].trans-&gt;ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void lock_graph_pop_all(struct lock_graph *g)</div><div class='del'>-{</div><div class='del'>-	while (g-&gt;nr)</div><div class='del'>-		lock_graph_up(g);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __lock_graph_down(struct lock_graph *g, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	g-&gt;g[g-&gt;nr++] = (struct trans_waiting_for_lock) {</div><div class='del'>-		.trans		= trans,</div><div class='del'>-		.node_want	= trans-&gt;locking,</div><div class='del'>-		.lock_want	= trans-&gt;locking_wait.lock_want,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lock_graph_down(struct lock_graph *g, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	closure_get(&amp;trans-&gt;ref);</div><div class='del'>-	__lock_graph_down(g, trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool lock_graph_remove_non_waiters(struct lock_graph *g)</div><div class='del'>-{</div><div class='del'>-	struct trans_waiting_for_lock *i;</div><div class='del'>-</div><div class='del'>-	for (i = g-&gt;g + 1; i &lt; g-&gt;g + g-&gt;nr; i++)</div><div class='del'>-		if (i-&gt;trans-&gt;locking != i-&gt;node_want ||</div><div class='del'>-		    i-&gt;trans-&gt;locking_wait.start_time != i[-1].lock_start_time) {</div><div class='del'>-			while (g-&gt;g + g-&gt;nr &gt; i)</div><div class='del'>-				lock_graph_up(g);</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void trace_would_deadlock(struct lock_graph *g, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	count_event(c, trans_restart_would_deadlock);</div><div class='del'>-</div><div class='del'>-	if (trace_trans_restart_would_deadlock_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		buf.atomic++;</div><div class='del'>-		print_cycle(&amp;buf, g);</div><div class='del'>-</div><div class='del'>-		trace_trans_restart_would_deadlock(trans, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int abort_lock(struct lock_graph *g, struct trans_waiting_for_lock *i)</div><div class='del'>-{</div><div class='del'>-	if (i == g-&gt;g) {</div><div class='del'>-		trace_would_deadlock(g, i-&gt;trans);</div><div class='del'>-		return btree_trans_restart(i-&gt;trans, BCH_ERR_transaction_restart_would_deadlock);</div><div class='del'>-	} else {</div><div class='del'>-		i-&gt;trans-&gt;lock_must_abort = true;</div><div class='del'>-		wake_up_process(i-&gt;trans-&gt;locking_wait.task);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_trans_abort_preference(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (trans-&gt;lock_may_not_fail)</div><div class='del'>-		return 0;</div><div class='del'>-	if (trans-&gt;locking_wait.lock_want == SIX_LOCK_write)</div><div class='del'>-		return 1;</div><div class='del'>-	if (!trans-&gt;in_traverse_all)</div><div class='del'>-		return 2;</div><div class='del'>-	return 3;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle)</div><div class='del'>-{</div><div class='del'>-	struct trans_waiting_for_lock *i, *abort = NULL;</div><div class='del'>-	unsigned best = 0, pref;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (lock_graph_remove_non_waiters(g))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Only checking, for debugfs: */</div><div class='del'>-	if (cycle) {</div><div class='del'>-		print_cycle(cycle, g);</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = g-&gt;g; i &lt; g-&gt;g + g-&gt;nr; i++) {</div><div class='del'>-		pref = btree_trans_abort_preference(i-&gt;trans);</div><div class='del'>-		if (pref &gt; best) {</div><div class='del'>-			abort = i;</div><div class='del'>-			best = pref;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!best)) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, bch2_fmt(g-&gt;g-&gt;trans-&gt;c, "cycle of nofail locks"));</div><div class='del'>-</div><div class='del'>-		for (i = g-&gt;g; i &lt; g-&gt;g + g-&gt;nr; i++) {</div><div class='del'>-			struct btree_trans *trans = i-&gt;trans;</div><div class='del'>-</div><div class='del'>-			bch2_btree_trans_to_text(&amp;buf, trans);</div><div class='del'>-</div><div class='del'>-			prt_printf(&amp;buf, "backtrace:");</div><div class='del'>-			prt_newline(&amp;buf);</div><div class='del'>-			printbuf_indent_add(&amp;buf, 2);</div><div class='del'>-			bch2_prt_task_backtrace(&amp;buf, trans-&gt;locking_wait.task, 2);</div><div class='del'>-			printbuf_indent_sub(&amp;buf, 2);</div><div class='del'>-			prt_newline(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_print_string_as_lines(KERN_ERR, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = abort_lock(g, abort);</div><div class='del'>-out:</div><div class='del'>-	if (ret)</div><div class='del'>-		while (g-&gt;nr)</div><div class='del'>-			lock_graph_up(g);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lock_graph_descend(struct lock_graph *g, struct btree_trans *trans,</div><div class='del'>-			      struct printbuf *cycle)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *orig_trans = g-&gt;g-&gt;trans;</div><div class='del'>-	struct trans_waiting_for_lock *i;</div><div class='del'>-</div><div class='del'>-	for (i = g-&gt;g; i &lt; g-&gt;g + g-&gt;nr; i++)</div><div class='del'>-		if (i-&gt;trans == trans) {</div><div class='del'>-			closure_put(&amp;trans-&gt;ref);</div><div class='del'>-			return break_cycle(g, cycle);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if (g-&gt;nr == ARRAY_SIZE(g-&gt;g)) {</div><div class='del'>-		closure_put(&amp;trans-&gt;ref);</div><div class='del'>-</div><div class='del'>-		if (orig_trans-&gt;lock_may_not_fail)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		while (g-&gt;nr)</div><div class='del'>-			lock_graph_up(g);</div><div class='del'>-</div><div class='del'>-		if (cycle)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		trace_and_count(trans-&gt;c, trans_restart_would_deadlock_recursion_limit, trans, _RET_IP_);</div><div class='del'>-		return btree_trans_restart(orig_trans, BCH_ERR_transaction_restart_deadlock_recursion_limit);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__lock_graph_down(g, trans);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool lock_type_conflicts(enum six_lock_type t1, enum six_lock_type t2)</div><div class='del'>-{</div><div class='del'>-	return t1 + t2 &gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_for_deadlock(struct btree_trans *trans, struct printbuf *cycle)</div><div class='del'>-{</div><div class='del'>-	struct lock_graph g;</div><div class='del'>-	struct trans_waiting_for_lock *top;</div><div class='del'>-	struct btree_bkey_cached_common *b;</div><div class='del'>-	btree_path_idx_t path_idx;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	g.nr = 0;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;lock_must_abort) {</div><div class='del'>-		if (cycle)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		trace_would_deadlock(&amp;g, trans);</div><div class='del'>-		return btree_trans_restart(trans, BCH_ERR_transaction_restart_would_deadlock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lock_graph_down(&amp;g, trans);</div><div class='del'>-</div><div class='del'>-	/* trans-&gt;paths is rcu protected vs. freeing */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (cycle)</div><div class='del'>-		cycle-&gt;atomic++;</div><div class='del'>-next:</div><div class='del'>-	if (!g.nr)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	top = &amp;g.g[g.nr - 1];</div><div class='del'>-</div><div class='del'>-	struct btree_path *paths = rcu_dereference(top-&gt;trans-&gt;paths);</div><div class='del'>-	if (!paths)</div><div class='del'>-		goto up;</div><div class='del'>-</div><div class='del'>-	unsigned long *paths_allocated = trans_paths_allocated(paths);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_idx_from(paths_allocated, *trans_paths_nr(paths),</div><div class='del'>-				     path_idx, top-&gt;path_idx) {</div><div class='del'>-		struct btree_path *path = paths + path_idx;</div><div class='del'>-		if (!path-&gt;nodes_locked)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (path_idx != top-&gt;path_idx) {</div><div class='del'>-			top-&gt;path_idx		= path_idx;</div><div class='del'>-			top-&gt;level		= 0;</div><div class='del'>-			top-&gt;lock_start_time	= 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (;</div><div class='del'>-		     top-&gt;level &lt; BTREE_MAX_DEPTH;</div><div class='del'>-		     top-&gt;level++, top-&gt;lock_start_time = 0) {</div><div class='del'>-			int lock_held = btree_node_locked_type(path, top-&gt;level);</div><div class='del'>-</div><div class='del'>-			if (lock_held == BTREE_NODE_UNLOCKED)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			b = &amp;READ_ONCE(path-&gt;l[top-&gt;level].b)-&gt;c;</div><div class='del'>-</div><div class='del'>-			if (IS_ERR_OR_NULL(b)) {</div><div class='del'>-				/*</div><div class='del'>-				 * If we get here, it means we raced with the</div><div class='del'>-				 * other thread updating its btree_path</div><div class='del'>-				 * structures - which means it can't be blocked</div><div class='del'>-				 * waiting on a lock:</div><div class='del'>-				 */</div><div class='del'>-				if (!lock_graph_remove_non_waiters(&amp;g)) {</div><div class='del'>-					/*</div><div class='del'>-					 * If lock_graph_remove_non_waiters()</div><div class='del'>-					 * didn't do anything, it must be</div><div class='del'>-					 * because we're being called by debugfs</div><div class='del'>-					 * checking for lock cycles, which</div><div class='del'>-					 * invokes us on btree_transactions that</div><div class='del'>-					 * aren't actually waiting on anything.</div><div class='del'>-					 * Just bail out:</div><div class='del'>-					 */</div><div class='del'>-					lock_graph_pop_all(&amp;g);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				goto next;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (list_empty_careful(&amp;b-&gt;lock.wait_list))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			raw_spin_lock(&amp;b-&gt;lock.wait_lock);</div><div class='del'>-			list_for_each_entry(trans, &amp;b-&gt;lock.wait_list, locking_wait.list) {</div><div class='del'>-				BUG_ON(b != trans-&gt;locking);</div><div class='del'>-</div><div class='del'>-				if (top-&gt;lock_start_time &amp;&amp;</div><div class='del'>-				    time_after_eq64(top-&gt;lock_start_time, trans-&gt;locking_wait.start_time))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				top-&gt;lock_start_time = trans-&gt;locking_wait.start_time;</div><div class='del'>-</div><div class='del'>-				/* Don't check for self deadlock: */</div><div class='del'>-				if (trans == top-&gt;trans ||</div><div class='del'>-				    !lock_type_conflicts(lock_held, trans-&gt;locking_wait.lock_want))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				closure_get(&amp;trans-&gt;ref);</div><div class='del'>-				raw_spin_unlock(&amp;b-&gt;lock.wait_lock);</div><div class='del'>-</div><div class='del'>-				ret = lock_graph_descend(&amp;g, trans, cycle);</div><div class='del'>-				if (ret)</div><div class='del'>-					goto out;</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-			raw_spin_unlock(&amp;b-&gt;lock.wait_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-up:</div><div class='del'>-	if (g.nr &gt; 1 &amp;&amp; cycle)</div><div class='del'>-		print_chain(cycle, &amp;g);</div><div class='del'>-	lock_graph_up(&amp;g);</div><div class='del'>-	goto next;</div><div class='del'>-out:</div><div class='del'>-	if (cycle)</div><div class='del'>-		--cycle-&gt;atomic;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_six_check_for_deadlock(struct six_lock *lock, void *p)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = p;</div><div class='del'>-</div><div class='del'>-	return bch2_check_for_deadlock(trans, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_btree_node_lock_write(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-				 struct btree_bkey_cached_common *b,</div><div class='del'>-				 bool lock_may_not_fail)</div><div class='del'>-{</div><div class='del'>-	int readers = bch2_btree_node_lock_counts(trans, NULL, b, b-&gt;level).n[SIX_LOCK_read];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Must drop our read locks before calling six_lock_write() -</div><div class='del'>-	 * six_unlock() won't do wakeups until the reader count</div><div class='del'>-	 * goes to 0, and it's safe because we have the node intent</div><div class='del'>-	 * locked:</div><div class='del'>-	 */</div><div class='del'>-	six_lock_readers_add(&amp;b-&gt;lock, -readers);</div><div class='del'>-	ret = __btree_node_lock_nopath(trans, b, SIX_LOCK_write,</div><div class='del'>-				       lock_may_not_fail, _RET_IP_);</div><div class='del'>-	six_lock_readers_add(&amp;b-&gt;lock, readers);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		mark_btree_node_locked_noreset(path, b-&gt;level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_lock_write_nofail(struct btree_trans *trans,</div><div class='del'>-				       struct btree_path *path,</div><div class='del'>-				       struct btree_bkey_cached_common *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *linked;</div><div class='del'>-	unsigned i, iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX BIG FAT NOTICE</div><div class='del'>-	 *</div><div class='del'>-	 * Drop all read locks before taking a write lock:</div><div class='del'>-	 *</div><div class='del'>-	 * This is a hack, because bch2_btree_node_lock_write_nofail() is a</div><div class='del'>-	 * hack - but by dropping read locks first, this should never fail, and</div><div class='del'>-	 * we only use this in code paths where whatever read locks we've</div><div class='del'>-	 * already taken are no longer needed:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, linked, iter) {</div><div class='del'>-		if (!linked-&gt;nodes_locked)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; BTREE_MAX_DEPTH; i++)</div><div class='del'>-			if (btree_node_read_locked(linked, i)) {</div><div class='del'>-				btree_node_unlock(trans, linked, i);</div><div class='del'>-				btree_path_set_dirty(linked, BTREE_ITER_NEED_RELOCK);</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __btree_node_lock_write(trans, path, b, true);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* relock */</div><div class='del'>-</div><div class='del'>-static inline bool btree_path_get_locks(struct btree_trans *trans,</div><div class='del'>-					struct btree_path *path,</div><div class='del'>-					bool upgrade,</div><div class='del'>-					struct get_locks_fail *f)</div><div class='del'>-{</div><div class='del'>-	unsigned l = path-&gt;level;</div><div class='del'>-	int fail_idx = -1;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (!btree_path_node(path, l))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!(upgrade</div><div class='del'>-		      ? bch2_btree_node_upgrade(trans, path, l)</div><div class='del'>-		      : bch2_btree_node_relock(trans, path, l))) {</div><div class='del'>-			fail_idx	= l;</div><div class='del'>-</div><div class='del'>-			if (f) {</div><div class='del'>-				f-&gt;l	= l;</div><div class='del'>-				f-&gt;b	= path-&gt;l[l].b;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		l++;</div><div class='del'>-	} while (l &lt; path-&gt;locks_want);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When we fail to get a lock, we have to ensure that any child nodes</div><div class='del'>-	 * can't be relocked so bch2_btree_path_traverse has to walk back up to</div><div class='del'>-	 * the node that we failed to relock:</div><div class='del'>-	 */</div><div class='del'>-	if (fail_idx &gt;= 0) {</div><div class='del'>-		__bch2_btree_path_unlock(trans, path);</div><div class='del'>-		btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			path-&gt;l[fail_idx].b = upgrade</div><div class='del'>-				? ERR_PTR(-BCH_ERR_no_btree_node_upgrade)</div><div class='del'>-				: ERR_PTR(-BCH_ERR_no_btree_node_relock);</div><div class='del'>-			--fail_idx;</div><div class='del'>-		} while (fail_idx &gt;= 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (path-&gt;uptodate == BTREE_ITER_NEED_RELOCK)</div><div class='del'>-		path-&gt;uptodate = BTREE_ITER_UPTODATE;</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_locks(trans);</div><div class='del'>-</div><div class='del'>-	return path-&gt;uptodate &lt; BTREE_ITER_NEED_RELOCK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_btree_node_relock(struct btree_trans *trans,</div><div class='del'>-			      struct btree_path *path, unsigned level,</div><div class='del'>-			      bool trace)</div><div class='del'>-{</div><div class='del'>-	struct btree *b = btree_path_node(path, level);</div><div class='del'>-	int want = __btree_lock_want(path, level);</div><div class='del'>-</div><div class='del'>-	if (race_fault())</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (six_relock_type(&amp;b-&gt;c.lock, want, path-&gt;l[level].lock_seq) ||</div><div class='del'>-	    (btree_node_lock_seq_matches(path, b, level) &amp;&amp;</div><div class='del'>-	     btree_node_lock_increment(trans, &amp;b-&gt;c, level, want))) {</div><div class='del'>-		mark_btree_node_locked(trans, path, level, want);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-fail:</div><div class='del'>-	if (trace &amp;&amp; !trans-&gt;notrace_relock_fail)</div><div class='del'>-		trace_and_count(trans-&gt;c, btree_path_relock_fail, trans, _RET_IP_, path, level);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* upgrade */</div><div class='del'>-</div><div class='del'>-bool bch2_btree_node_upgrade(struct btree_trans *trans,</div><div class='del'>-			     struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct btree *b = path-&gt;l[level].b;</div><div class='del'>-	struct six_lock_count count = bch2_btree_node_lock_counts(trans, path, &amp;b-&gt;c, level);</div><div class='del'>-</div><div class='del'>-	if (!is_btree_node(path, level))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	switch (btree_lock_want(path, level)) {</div><div class='del'>-	case BTREE_NODE_UNLOCKED:</div><div class='del'>-		BUG_ON(btree_node_locked(path, level));</div><div class='del'>-		return true;</div><div class='del'>-	case BTREE_NODE_READ_LOCKED:</div><div class='del'>-		BUG_ON(btree_node_intent_locked(path, level));</div><div class='del'>-		return bch2_btree_node_relock(trans, path, level);</div><div class='del'>-	case BTREE_NODE_INTENT_LOCKED:</div><div class='del'>-		break;</div><div class='del'>-	case BTREE_NODE_WRITE_LOCKED:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btree_node_intent_locked(path, level))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (race_fault())</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (btree_node_locked(path, level)) {</div><div class='del'>-		bool ret;</div><div class='del'>-</div><div class='del'>-		six_lock_readers_add(&amp;b-&gt;c.lock, -count.n[SIX_LOCK_read]);</div><div class='del'>-		ret = six_lock_tryupgrade(&amp;b-&gt;c.lock);</div><div class='del'>-		six_lock_readers_add(&amp;b-&gt;c.lock, count.n[SIX_LOCK_read]);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto success;</div><div class='del'>-	} else {</div><div class='del'>-		if (six_relock_type(&amp;b-&gt;c.lock, SIX_LOCK_intent, path-&gt;l[level].lock_seq))</div><div class='del'>-			goto success;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do we already have an intent lock via another path? If so, just bump</div><div class='del'>-	 * lock count:</div><div class='del'>-	 */</div><div class='del'>-	if (btree_node_lock_seq_matches(path, b, level) &amp;&amp;</div><div class='del'>-	    btree_node_lock_increment(trans, &amp;b-&gt;c, level, BTREE_NODE_INTENT_LOCKED)) {</div><div class='del'>-		btree_node_unlock(trans, path, level);</div><div class='del'>-		goto success;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_and_count(trans-&gt;c, btree_path_upgrade_fail, trans, _RET_IP_, path, level);</div><div class='del'>-	return false;</div><div class='del'>-success:</div><div class='del'>-	mark_btree_node_locked_noreset(path, level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree path locking: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Only for btree_cache.c - only relocks intent locks</div><div class='del'>- */</div><div class='del'>-int bch2_btree_path_relock_intent(struct btree_trans *trans,</div><div class='del'>-				  struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	unsigned l;</div><div class='del'>-</div><div class='del'>-	for (l = path-&gt;level;</div><div class='del'>-	     l &lt; path-&gt;locks_want &amp;&amp; btree_path_node(path, l);</div><div class='del'>-	     l++) {</div><div class='del'>-		if (!bch2_btree_node_relock(trans, path, l)) {</div><div class='del'>-			__bch2_btree_path_unlock(trans, path);</div><div class='del'>-			btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-			trace_and_count(trans-&gt;c, trans_restart_relock_path_intent, trans, _RET_IP_, path);</div><div class='del'>-			return btree_trans_restart(trans, BCH_ERR_transaction_restart_relock_path_intent);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__flatten</div><div class='del'>-bool bch2_btree_path_relock_norestart(struct btree_trans *trans, struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct get_locks_fail f;</div><div class='del'>-</div><div class='del'>-	return btree_path_get_locks(trans, path, false, &amp;f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_btree_path_relock(struct btree_trans *trans,</div><div class='del'>-			struct btree_path *path, unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_btree_path_relock_norestart(trans, path)) {</div><div class='del'>-		trace_and_count(trans-&gt;c, trans_restart_relock_path, trans, trace_ip, path);</div><div class='del'>-		return btree_trans_restart(trans, BCH_ERR_transaction_restart_relock_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_path_upgrade_noupgrade_sibs(struct btree_trans *trans,</div><div class='del'>-			       struct btree_path *path,</div><div class='del'>-			       unsigned new_locks_want,</div><div class='del'>-			       struct get_locks_fail *f)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(path-&gt;locks_want &gt;= new_locks_want);</div><div class='del'>-</div><div class='del'>-	path-&gt;locks_want = new_locks_want;</div><div class='del'>-</div><div class='del'>-	return btree_path_get_locks(trans, path, true, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_btree_path_upgrade(struct btree_trans *trans,</div><div class='del'>-			       struct btree_path *path,</div><div class='del'>-			       unsigned new_locks_want,</div><div class='del'>-			       struct get_locks_fail *f)</div><div class='del'>-{</div><div class='del'>-	if (bch2_btree_path_upgrade_noupgrade_sibs(trans, path, new_locks_want, f))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: this is ugly - we'd prefer to not be mucking with other</div><div class='del'>-	 * iterators in the btree_trans here.</div><div class='del'>-	 *</div><div class='del'>-	 * On failure to upgrade the iterator, setting iter-&gt;locks_want and</div><div class='del'>-	 * calling get_locks() is sufficient to make bch2_btree_path_traverse()</div><div class='del'>-	 * get the locks we want on transaction restart.</div><div class='del'>-	 *</div><div class='del'>-	 * But if this iterator was a clone, on transaction restart what we did</div><div class='del'>-	 * to this iterator isn't going to be preserved.</div><div class='del'>-	 *</div><div class='del'>-	 * Possibly we could add an iterator field for the parent iterator when</div><div class='del'>-	 * an iterator is a copy - for now, we'll just upgrade any other</div><div class='del'>-	 * iterators with the same btree id.</div><div class='del'>-	 *</div><div class='del'>-	 * The code below used to be needed to ensure ancestor nodes get locked</div><div class='del'>-	 * before interior nodes - now that's handled by</div><div class='del'>-	 * bch2_btree_path_traverse_all().</div><div class='del'>-	 */</div><div class='del'>-	if (!path-&gt;cached &amp;&amp; !trans-&gt;in_traverse_all) {</div><div class='del'>-		struct btree_path *linked;</div><div class='del'>-		unsigned i;</div><div class='del'>-</div><div class='del'>-		trans_for_each_path(trans, linked, i)</div><div class='del'>-			if (linked != path &amp;&amp;</div><div class='del'>-			    linked-&gt;cached == path-&gt;cached &amp;&amp;</div><div class='del'>-			    linked-&gt;btree_id == path-&gt;btree_id &amp;&amp;</div><div class='del'>-			    linked-&gt;locks_want &lt; new_locks_want) {</div><div class='del'>-				linked-&gt;locks_want = new_locks_want;</div><div class='del'>-				btree_path_get_locks(trans, linked, true, NULL);</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_btree_path_downgrade(struct btree_trans *trans,</div><div class='del'>-				 struct btree_path *path,</div><div class='del'>-				 unsigned new_locks_want)</div><div class='del'>-{</div><div class='del'>-	unsigned l, old_locks_want = path-&gt;locks_want;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;restarted)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;locks_want &lt; new_locks_want);</div><div class='del'>-</div><div class='del'>-	path-&gt;locks_want = new_locks_want;</div><div class='del'>-</div><div class='del'>-	while (path-&gt;nodes_locked &amp;&amp;</div><div class='del'>-	       (l = btree_path_highest_level_locked(path)) &gt;= path-&gt;locks_want) {</div><div class='del'>-		if (l &gt; path-&gt;level) {</div><div class='del'>-			btree_node_unlock(trans, path, l);</div><div class='del'>-		} else {</div><div class='del'>-			if (btree_node_intent_locked(path, l)) {</div><div class='del'>-				six_lock_downgrade(&amp;path-&gt;l[l].b-&gt;c.lock);</div><div class='del'>-				mark_btree_node_locked_noreset(path, l, BTREE_NODE_READ_LOCKED);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_path_verify_locks(path);</div><div class='del'>-</div><div class='del'>-	trace_path_downgrade(trans, _RET_IP_, path, old_locks_want);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree transaction locking: */</div><div class='del'>-</div><div class='del'>-void bch2_trans_downgrade(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;restarted)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		bch2_btree_path_downgrade(trans, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_relock(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;restarted))</div><div class='del'>-		return -((int) trans-&gt;restarted);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i) {</div><div class='del'>-		struct get_locks_fail f;</div><div class='del'>-</div><div class='del'>-		if (path-&gt;should_be_locked &amp;&amp;</div><div class='del'>-		    !btree_path_get_locks(trans, path, false, &amp;f)) {</div><div class='del'>-			if (trace_trans_restart_relock_enabled()) {</div><div class='del'>-				struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-				bch2_bpos_to_text(&amp;buf, path-&gt;pos);</div><div class='del'>-				prt_printf(&amp;buf, " l=%u seq=%u node seq=",</div><div class='del'>-					   f.l, path-&gt;l[f.l].lock_seq);</div><div class='del'>-				if (IS_ERR_OR_NULL(f.b)) {</div><div class='del'>-					prt_str(&amp;buf, bch2_err_str(PTR_ERR(f.b)));</div><div class='del'>-				} else {</div><div class='del'>-					prt_printf(&amp;buf, "%u", f.b-&gt;c.lock.seq);</div><div class='del'>-</div><div class='del'>-					struct six_lock_count c =</div><div class='del'>-						bch2_btree_node_lock_counts(trans, NULL, &amp;f.b-&gt;c, f.l);</div><div class='del'>-					prt_printf(&amp;buf, " self locked %u.%u.%u", c.n[0], c.n[1], c.n[2]);</div><div class='del'>-</div><div class='del'>-					c = six_lock_counts(&amp;f.b-&gt;c.lock);</div><div class='del'>-					prt_printf(&amp;buf, " total locked %u.%u.%u", c.n[0], c.n[1], c.n[2]);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				trace_trans_restart_relock(trans, _RET_IP_, buf.buf);</div><div class='del'>-				printbuf_exit(&amp;buf);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			count_event(trans-&gt;c, trans_restart_relock);</div><div class='del'>-			return btree_trans_restart(trans, BCH_ERR_transaction_restart_relock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_relock_notrace(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;restarted))</div><div class='del'>-		return -((int) trans-&gt;restarted);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path-&gt;should_be_locked &amp;&amp;</div><div class='del'>-		    !bch2_btree_path_relock_norestart(trans, path)) {</div><div class='del'>-			return btree_trans_restart(trans, BCH_ERR_transaction_restart_relock);</div><div class='del'>-		}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_unlock_noassert(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		__bch2_btree_path_unlock(trans, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_unlock(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		__bch2_btree_path_unlock(trans, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_unlock_long(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-	bch2_trans_srcu_unlock(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_trans_locked(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path-&gt;nodes_locked)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_trans_mutex_lock(struct btree_trans *trans,</div><div class='del'>-			    struct mutex *lock)</div><div class='del'>-{</div><div class='del'>-	int ret = drop_locks_do(trans, (mutex_lock(lock), 0));</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		mutex_unlock(lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Debug */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-</div><div class='del'>-void bch2_btree_path_verify_locks(struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	unsigned l;</div><div class='del'>-</div><div class='del'>-	if (!path-&gt;nodes_locked) {</div><div class='del'>-		BUG_ON(path-&gt;uptodate == BTREE_ITER_UPTODATE &amp;&amp;</div><div class='del'>-		       btree_path_node(path, path-&gt;level));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (l = 0; l &lt; BTREE_MAX_DEPTH; l++) {</div><div class='del'>-		int want = btree_lock_want(path, l);</div><div class='del'>-		int have = btree_node_locked_type(path, l);</div><div class='del'>-</div><div class='del'>-		BUG_ON(!is_btree_node(path, l) &amp;&amp; have != BTREE_NODE_UNLOCKED);</div><div class='del'>-</div><div class='del'>-		BUG_ON(is_btree_node(path, l) &amp;&amp;</div><div class='del'>-		       (want == BTREE_NODE_UNLOCKED ||</div><div class='del'>-			have != BTREE_NODE_WRITE_LOCKED) &amp;&amp;</div><div class='del'>-		       want != have);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_verify_locks(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		bch2_btree_path_verify_locks(path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/bcachefs/btree_locking.h b/fs/bcachefs/btree_locking.h<br/>deleted file mode 100644<br/>index 4bd72c855da1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_locking.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_locking.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,424 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_LOCKING_H</div><div class='del'>-#define _BCACHEFS_BTREE_LOCKING_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Only for internal btree use:</div><div class='del'>- *</div><div class='del'>- * The btree iterator tracks what locks it wants to take, and what locks it</div><div class='del'>- * currently has - here we have wrappers for locking/unlocking btree nodes and</div><div class='del'>- * updating the iterator state</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "six.h"</div><div class='del'>-</div><div class='del'>-void bch2_btree_lock_init(struct btree_bkey_cached_common *, enum six_lock_init_flags);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-void bch2_assert_btree_nodes_not_locked(void);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_assert_btree_nodes_not_locked(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_trans_unlock_noassert(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-static inline bool is_btree_node(struct btree_path *path, unsigned l)</div><div class='del'>-{</div><div class='del'>-	return l &lt; BTREE_MAX_DEPTH &amp;&amp; !IS_ERR_OR_NULL(path-&gt;l[l].b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_transaction_stats *btree_trans_stats(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;fn_idx &lt; ARRAY_SIZE(trans-&gt;c-&gt;btree_transaction_stats)</div><div class='del'>-		? &amp;trans-&gt;c-&gt;btree_transaction_stats[trans-&gt;fn_idx]</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* matches six lock types */</div><div class='del'>-enum btree_node_locked_type {</div><div class='del'>-	BTREE_NODE_UNLOCKED		= -1,</div><div class='del'>-	BTREE_NODE_READ_LOCKED		= SIX_LOCK_read,</div><div class='del'>-	BTREE_NODE_INTENT_LOCKED	= SIX_LOCK_intent,</div><div class='del'>-	BTREE_NODE_WRITE_LOCKED		= SIX_LOCK_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int btree_node_locked_type(struct btree_path *path,</div><div class='del'>-					 unsigned level)</div><div class='del'>-{</div><div class='del'>-	return BTREE_NODE_UNLOCKED + ((path-&gt;nodes_locked &gt;&gt; (level &lt;&lt; 1)) &amp; 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_write_locked(struct btree_path *path, unsigned l)</div><div class='del'>-{</div><div class='del'>-	return btree_node_locked_type(path, l) == BTREE_NODE_WRITE_LOCKED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_intent_locked(struct btree_path *path, unsigned l)</div><div class='del'>-{</div><div class='del'>-	return btree_node_locked_type(path, l) == BTREE_NODE_INTENT_LOCKED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_read_locked(struct btree_path *path, unsigned l)</div><div class='del'>-{</div><div class='del'>-	return btree_node_locked_type(path, l) == BTREE_NODE_READ_LOCKED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_locked(struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-	return btree_node_locked_type(path, level) != BTREE_NODE_UNLOCKED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mark_btree_node_locked_noreset(struct btree_path *path,</div><div class='del'>-						  unsigned level,</div><div class='del'>-						  enum btree_node_locked_type type)</div><div class='del'>-{</div><div class='del'>-	/* relying on this to avoid a branch */</div><div class='del'>-	BUILD_BUG_ON(SIX_LOCK_read   != 0);</div><div class='del'>-	BUILD_BUG_ON(SIX_LOCK_intent != 1);</div><div class='del'>-</div><div class='del'>-	path-&gt;nodes_locked &amp;= ~(3U &lt;&lt; (level &lt;&lt; 1));</div><div class='del'>-	path-&gt;nodes_locked |= (type + 1) &lt;&lt; (level &lt;&lt; 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mark_btree_node_unlocked(struct btree_path *path,</div><div class='del'>-					    unsigned level)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(btree_node_write_locked(path, level));</div><div class='del'>-	mark_btree_node_locked_noreset(path, level, BTREE_NODE_UNLOCKED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mark_btree_node_locked(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path,</div><div class='del'>-					  unsigned level,</div><div class='del'>-					  enum btree_node_locked_type type)</div><div class='del'>-{</div><div class='del'>-	mark_btree_node_locked_noreset(path, level, (enum btree_node_locked_type) type);</div><div class='del'>-#ifdef CONFIG_BCACHEFS_LOCK_TIME_STATS</div><div class='del'>-	path-&gt;l[level].lock_taken_time = local_clock();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum six_lock_type __btree_lock_want(struct btree_path *path, int level)</div><div class='del'>-{</div><div class='del'>-	return level &lt; path-&gt;locks_want</div><div class='del'>-		? SIX_LOCK_intent</div><div class='del'>-		: SIX_LOCK_read;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum btree_node_locked_type</div><div class='del'>-btree_lock_want(struct btree_path *path, int level)</div><div class='del'>-{</div><div class='del'>-	if (level &lt; path-&gt;level)</div><div class='del'>-		return BTREE_NODE_UNLOCKED;</div><div class='del'>-	if (level &lt; path-&gt;locks_want)</div><div class='del'>-		return BTREE_NODE_INTENT_LOCKED;</div><div class='del'>-	if (level == path-&gt;level)</div><div class='del'>-		return BTREE_NODE_READ_LOCKED;</div><div class='del'>-	return BTREE_NODE_UNLOCKED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_trans_lock_hold_time_update(struct btree_trans *trans,</div><div class='del'>-					      struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_LOCK_TIME_STATS</div><div class='del'>-	__bch2_time_stats_update(&amp;btree_trans_stats(trans)-&gt;lock_hold_times,</div><div class='del'>-				 path-&gt;l[level].lock_taken_time,</div><div class='del'>-				 local_clock());</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock: */</div><div class='del'>-</div><div class='del'>-static inline void btree_node_unlock(struct btree_trans *trans,</div><div class='del'>-				     struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-	int lock_type = btree_node_locked_type(path, level);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-</div><div class='del'>-	if (lock_type != BTREE_NODE_UNLOCKED) {</div><div class='del'>-		six_unlock_type(&amp;path-&gt;l[level].b-&gt;c.lock, lock_type);</div><div class='del'>-		btree_trans_lock_hold_time_update(trans, path, level);</div><div class='del'>-	}</div><div class='del'>-	mark_btree_node_unlocked(path, level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_path_lowest_level_locked(struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	return __ffs(path-&gt;nodes_locked) &gt;&gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_path_highest_level_locked(struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	return __fls(path-&gt;nodes_locked) &gt;&gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __bch2_btree_path_unlock(struct btree_trans *trans,</div><div class='del'>-					    struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	btree_path_set_dirty(path, BTREE_ITER_NEED_RELOCK);</div><div class='del'>-</div><div class='del'>-	while (path-&gt;nodes_locked)</div><div class='del'>-		btree_node_unlock(trans, path, btree_path_lowest_level_locked(path));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Updates the saved lock sequence number, so that bch2_btree_node_relock() will</div><div class='del'>- * succeed:</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-bch2_btree_node_unlock_write_inlined(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-				     struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *linked;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;l[b-&gt;c.level].b != b);</div><div class='del'>-	EBUG_ON(path-&gt;l[b-&gt;c.level].lock_seq != six_lock_seq(&amp;b-&gt;c.lock));</div><div class='del'>-	EBUG_ON(btree_node_locked_type(path, b-&gt;c.level) != SIX_LOCK_write);</div><div class='del'>-</div><div class='del'>-	mark_btree_node_locked_noreset(path, b-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_with_node(trans, b, linked, i)</div><div class='del'>-		linked-&gt;l[b-&gt;c.level].lock_seq++;</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_unlock_write(struct btree_trans *,</div><div class='del'>-			struct btree_path *, struct btree *);</div><div class='del'>-</div><div class='del'>-int bch2_six_check_for_deadlock(struct six_lock *lock, void *p);</div><div class='del'>-</div><div class='del'>-/* lock: */</div><div class='del'>-</div><div class='del'>-static inline int __btree_node_lock_nopath(struct btree_trans *trans,</div><div class='del'>-					 struct btree_bkey_cached_common *b,</div><div class='del'>-					 enum six_lock_type type,</div><div class='del'>-					 bool lock_may_not_fail,</div><div class='del'>-					 unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	trans-&gt;lock_may_not_fail = lock_may_not_fail;</div><div class='del'>-	trans-&gt;lock_must_abort	= false;</div><div class='del'>-	trans-&gt;locking		= b;</div><div class='del'>-</div><div class='del'>-	ret = six_lock_ip_waiter(&amp;b-&gt;lock, type, &amp;trans-&gt;locking_wait,</div><div class='del'>-				 bch2_six_check_for_deadlock, trans, ip);</div><div class='del'>-	WRITE_ONCE(trans-&gt;locking, NULL);</div><div class='del'>-	WRITE_ONCE(trans-&gt;locking_wait.start_time, 0);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __must_check</div><div class='del'>-btree_node_lock_nopath(struct btree_trans *trans,</div><div class='del'>-		       struct btree_bkey_cached_common *b,</div><div class='del'>-		       enum six_lock_type type,</div><div class='del'>-		       unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_lock_nopath(trans, b, type, false, ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_node_lock_nopath_nofail(struct btree_trans *trans,</div><div class='del'>-					 struct btree_bkey_cached_common *b,</div><div class='del'>-					 enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	int ret = __btree_node_lock_nopath(trans, b, type, true, _THIS_IP_);</div><div class='del'>-</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lock a btree node if we already have it locked on one of our linked</div><div class='del'>- * iterators:</div><div class='del'>- */</div><div class='del'>-static inline bool btree_node_lock_increment(struct btree_trans *trans,</div><div class='del'>-					     struct btree_bkey_cached_common *b,</div><div class='del'>-					     unsigned level,</div><div class='del'>-					     enum btree_node_locked_type want)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (&amp;path-&gt;l[level].b-&gt;c == b &amp;&amp;</div><div class='del'>-		    btree_node_locked_type(path, level) &gt;= want) {</div><div class='del'>-			six_lock_increment(&amp;b-&gt;lock, (enum six_lock_type) want);</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_node_lock(struct btree_trans *trans,</div><div class='del'>-			struct btree_path *path,</div><div class='del'>-			struct btree_bkey_cached_common *b,</div><div class='del'>-			unsigned level,</div><div class='del'>-			enum six_lock_type type,</div><div class='del'>-			unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-</div><div class='del'>-	if (likely(six_trylock_type(&amp;b-&gt;lock, type)) ||</div><div class='del'>-	    btree_node_lock_increment(trans, b, level, (enum btree_node_locked_type) type) ||</div><div class='del'>-	    !(ret = btree_node_lock_nopath(trans, b, type, btree_path_ip_allocated(path)))) {</div><div class='del'>-#ifdef CONFIG_BCACHEFS_LOCK_TIME_STATS</div><div class='del'>-		path-&gt;l[b-&gt;level].lock_taken_time = local_clock();</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_btree_node_lock_write(struct btree_trans *, struct btree_path *,</div><div class='del'>-				 struct btree_bkey_cached_common *b, bool);</div><div class='del'>-</div><div class='del'>-static inline int __btree_node_lock_write(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path,</div><div class='del'>-					  struct btree_bkey_cached_common *b,</div><div class='del'>-					  bool lock_may_not_fail)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(&amp;path-&gt;l[b-&gt;level].b-&gt;c != b);</div><div class='del'>-	EBUG_ON(path-&gt;l[b-&gt;level].lock_seq != six_lock_seq(&amp;b-&gt;lock));</div><div class='del'>-	EBUG_ON(!btree_node_intent_locked(path, b-&gt;level));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * six locks are unfair, and read locks block while a thread wants a</div><div class='del'>-	 * write lock: thus, we need to tell the cycle detector we have a write</div><div class='del'>-	 * lock _before_ taking the lock:</div><div class='del'>-	 */</div><div class='del'>-	mark_btree_node_locked_noreset(path, b-&gt;level, BTREE_NODE_WRITE_LOCKED);</div><div class='del'>-</div><div class='del'>-	return likely(six_trylock_write(&amp;b-&gt;lock))</div><div class='del'>-		? 0</div><div class='del'>-		: __bch2_btree_node_lock_write(trans, path, b, lock_may_not_fail);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __must_check</div><div class='del'>-bch2_btree_node_lock_write(struct btree_trans *trans,</div><div class='del'>-			   struct btree_path *path,</div><div class='del'>-			   struct btree_bkey_cached_common *b)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_lock_write(trans, path, b, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_lock_write_nofail(struct btree_trans *,</div><div class='del'>-				       struct btree_path *,</div><div class='del'>-				       struct btree_bkey_cached_common *);</div><div class='del'>-</div><div class='del'>-/* relock: */</div><div class='del'>-</div><div class='del'>-bool bch2_btree_path_relock_norestart(struct btree_trans *, struct btree_path *);</div><div class='del'>-int __bch2_btree_path_relock(struct btree_trans *,</div><div class='del'>-			     struct btree_path *, unsigned long);</div><div class='del'>-</div><div class='del'>-static inline int bch2_btree_path_relock(struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path, unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	return btree_node_locked(path, path-&gt;level)</div><div class='del'>-		? 0</div><div class='del'>-		: __bch2_btree_path_relock(trans, path, trace_ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_btree_node_relock(struct btree_trans *, struct btree_path *, unsigned, bool trace);</div><div class='del'>-</div><div class='del'>-static inline bool bch2_btree_node_relock(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(btree_node_locked(path, level) &amp;&amp;</div><div class='del'>-		!btree_node_write_locked(path, level) &amp;&amp;</div><div class='del'>-		btree_node_locked_type(path, level) != __btree_lock_want(path, level));</div><div class='del'>-</div><div class='del'>-	return likely(btree_node_locked(path, level)) ||</div><div class='del'>-		(!IS_ERR_OR_NULL(path-&gt;l[level].b) &amp;&amp;</div><div class='del'>-		 __bch2_btree_node_relock(trans, path, level, true));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_btree_node_relock_notrace(struct btree_trans *trans,</div><div class='del'>-						  struct btree_path *path, unsigned level)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(btree_node_locked(path, level) &amp;&amp;</div><div class='del'>-		!btree_node_write_locked(path, level) &amp;&amp;</div><div class='del'>-		btree_node_locked_type(path, level) != __btree_lock_want(path, level));</div><div class='del'>-</div><div class='del'>-	return likely(btree_node_locked(path, level)) ||</div><div class='del'>-		(!IS_ERR_OR_NULL(path-&gt;l[level].b) &amp;&amp;</div><div class='del'>-		 __bch2_btree_node_relock(trans, path, level, false));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* upgrade */</div><div class='del'>-</div><div class='del'>-bool bch2_btree_path_upgrade_noupgrade_sibs(struct btree_trans *,</div><div class='del'>-			       struct btree_path *, unsigned,</div><div class='del'>-			       struct get_locks_fail *);</div><div class='del'>-</div><div class='del'>-bool __bch2_btree_path_upgrade(struct btree_trans *,</div><div class='del'>-			       struct btree_path *, unsigned,</div><div class='del'>-			       struct get_locks_fail *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_btree_path_upgrade(struct btree_trans *trans,</div><div class='del'>-					  struct btree_path *path,</div><div class='del'>-					  unsigned new_locks_want)</div><div class='del'>-{</div><div class='del'>-	struct get_locks_fail f;</div><div class='del'>-	unsigned old_locks_want = path-&gt;locks_want;</div><div class='del'>-</div><div class='del'>-	new_locks_want = min(new_locks_want, BTREE_MAX_DEPTH);</div><div class='del'>-</div><div class='del'>-	if (path-&gt;locks_want &lt; new_locks_want</div><div class='del'>-	    ? __bch2_btree_path_upgrade(trans, path, new_locks_want, &amp;f)</div><div class='del'>-	    : path-&gt;uptodate == BTREE_ITER_UPTODATE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	trace_and_count(trans-&gt;c, trans_restart_upgrade, trans, _THIS_IP_, path,</div><div class='del'>-			old_locks_want, new_locks_want, &amp;f);</div><div class='del'>-	return btree_trans_restart(trans, BCH_ERR_transaction_restart_upgrade);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* misc: */</div><div class='del'>-</div><div class='del'>-static inline void btree_path_set_should_be_locked(struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!btree_node_locked(path, path-&gt;level));</div><div class='del'>-	EBUG_ON(path-&gt;uptodate);</div><div class='del'>-</div><div class='del'>-	path-&gt;should_be_locked = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __btree_path_set_level_up(struct btree_trans *trans,</div><div class='del'>-				      struct btree_path *path,</div><div class='del'>-				      unsigned l)</div><div class='del'>-{</div><div class='del'>-	btree_node_unlock(trans, path, l);</div><div class='del'>-	path-&gt;l[l].b = ERR_PTR(-BCH_ERR_no_btree_node_up);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_path_set_level_up(struct btree_trans *trans,</div><div class='del'>-				    struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	__btree_path_set_level_up(trans, path, path-&gt;level++);</div><div class='del'>-	btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* debug */</div><div class='del'>-</div><div class='del'>-struct six_lock_count bch2_btree_node_lock_counts(struct btree_trans *,</div><div class='del'>-				struct btree_path *,</div><div class='del'>-				struct btree_bkey_cached_common *b,</div><div class='del'>-				unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_check_for_deadlock(struct btree_trans *, struct printbuf *);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-void bch2_btree_path_verify_locks(struct btree_path *);</div><div class='del'>-void bch2_trans_verify_locks(struct btree_trans *);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_btree_path_verify_locks(struct btree_path *path) {}</div><div class='del'>-static inline void bch2_trans_verify_locks(struct btree_trans *trans) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_LOCKING_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c<br/>deleted file mode 100644<br/>index 30d69a6d133e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_trans_commit.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_trans_commit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1126 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-</div><div class='del'>-static void verify_update_old_key(struct btree_trans *trans, struct btree_insert_entry *i)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey u;</div><div class='del'>-	struct bkey_s_c k = bch2_btree_path_peek_slot_exact(trans-&gt;paths + i-&gt;path, &amp;u);</div><div class='del'>-</div><div class='del'>-	if (unlikely(trans-&gt;journal_replay_not_finished)) {</div><div class='del'>-		struct bkey_i *j_k =</div><div class='del'>-			bch2_journal_keys_peek_slot(c, i-&gt;btree_id, i-&gt;level, i-&gt;k-&gt;k.p);</div><div class='del'>-</div><div class='del'>-		if (j_k)</div><div class='del'>-			k = bkey_i_to_s_c(j_k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	u = *k.k;</div><div class='del'>-	u.needs_whiteout = i-&gt;old_k.needs_whiteout;</div><div class='del'>-</div><div class='del'>-	BUG_ON(memcmp(&amp;i-&gt;old_k, &amp;u, sizeof(struct bkey)));</div><div class='del'>-	BUG_ON(i-&gt;old_v != k.v);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_path_level *insert_l(struct btree_trans *trans, struct btree_insert_entry *i)</div><div class='del'>-{</div><div class='del'>-	return (trans-&gt;paths + i-&gt;path)-&gt;l + i-&gt;level;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool same_leaf_as_prev(struct btree_trans *trans,</div><div class='del'>-				     struct btree_insert_entry *i)</div><div class='del'>-{</div><div class='del'>-	return i != trans-&gt;updates &amp;&amp;</div><div class='del'>-		insert_l(trans, &amp;i[0])-&gt;b == insert_l(trans, &amp;i[-1])-&gt;b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool same_leaf_as_next(struct btree_trans *trans,</div><div class='del'>-				     struct btree_insert_entry *i)</div><div class='del'>-{</div><div class='del'>-	return i + 1 &lt; trans-&gt;updates + trans-&gt;nr_updates &amp;&amp;</div><div class='del'>-		insert_l(trans, &amp;i[0])-&gt;b == insert_l(trans, &amp;i[1])-&gt;b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void bch2_btree_node_prep_for_write(struct btree_trans *trans,</div><div class='del'>-					   struct btree_path *path,</div><div class='del'>-					   struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	if (unlikely(btree_node_just_written(b)) &amp;&amp;</div><div class='del'>-	    bch2_btree_post_write_cleanup(c, b))</div><div class='del'>-		bch2_trans_node_reinit_iter(trans, b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the last bset has been written, or if it's gotten too big - start</div><div class='del'>-	 * a new bset to insert into:</div><div class='del'>-	 */</div><div class='del'>-	if (want_new_bset(c, b))</div><div class='del'>-		bch2_btree_init_next(trans, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int trans_lock_write_fail(struct btree_trans *trans, struct btree_insert_entry *i)</div><div class='del'>-{</div><div class='del'>-	while (--i &gt;= trans-&gt;updates) {</div><div class='del'>-		if (same_leaf_as_prev(trans, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_unlock_write(trans, trans-&gt;paths + i-&gt;path, insert_l(trans, i)-&gt;b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_and_count(trans-&gt;c, trans_restart_would_deadlock_write, trans);</div><div class='del'>-	return btree_trans_restart(trans, BCH_ERR_transaction_restart_would_deadlock_write);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_trans_lock_write(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(trans-&gt;write_locked);</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		if (same_leaf_as_prev(trans, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (bch2_btree_node_lock_write(trans, trans-&gt;paths + i-&gt;path, &amp;insert_l(trans, i)-&gt;b-&gt;c))</div><div class='del'>-			return trans_lock_write_fail(trans, i);</div><div class='del'>-</div><div class='del'>-		if (!i-&gt;cached)</div><div class='del'>-			bch2_btree_node_prep_for_write(trans, trans-&gt;paths + i-&gt;path, insert_l(trans, i)-&gt;b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans-&gt;write_locked = true;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_trans_unlock_write(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	if (likely(trans-&gt;write_locked)) {</div><div class='del'>-		trans_for_each_update(trans, i)</div><div class='del'>-			if (!same_leaf_as_prev(trans, i))</div><div class='del'>-				bch2_btree_node_unlock_write_inlined(trans,</div><div class='del'>-						trans-&gt;paths + i-&gt;path, insert_l(trans, i)-&gt;b);</div><div class='del'>-		trans-&gt;write_locked = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Inserting into a given leaf node (last stage of insert): */</div><div class='del'>-</div><div class='del'>-/* Handle overwrites and do insert, for non extents: */</div><div class='del'>-bool bch2_btree_bset_insert_key(struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path,</div><div class='del'>-				struct btree *b,</div><div class='del'>-				struct btree_node_iter *node_iter,</div><div class='del'>-				struct bkey_i *insert)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	unsigned clobber_u64s = 0, new_u64s = 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(btree_node_just_written(b));</div><div class='del'>-	EBUG_ON(bset_written(b, btree_bset_last(b)));</div><div class='del'>-	EBUG_ON(bkey_deleted(&amp;insert-&gt;k) &amp;&amp; bkey_val_u64s(&amp;insert-&gt;k));</div><div class='del'>-	EBUG_ON(bpos_lt(insert-&gt;k.p, b-&gt;data-&gt;min_key));</div><div class='del'>-	EBUG_ON(bpos_gt(insert-&gt;k.p, b-&gt;data-&gt;max_key));</div><div class='del'>-	EBUG_ON(insert-&gt;k.u64s &gt; bch2_btree_keys_u64s_remaining(b));</div><div class='del'>-	EBUG_ON(!b-&gt;c.level &amp;&amp; !bpos_eq(insert-&gt;k.p, path-&gt;pos));</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_node_iter_peek_all(node_iter, b);</div><div class='del'>-	if (k &amp;&amp; bkey_cmp_left_packed(b, k, &amp;insert-&gt;k.p))</div><div class='del'>-		k = NULL;</div><div class='del'>-</div><div class='del'>-	/* @k is the key being overwritten/deleted, if any: */</div><div class='del'>-	EBUG_ON(k &amp;&amp; bkey_deleted(k));</div><div class='del'>-</div><div class='del'>-	/* Deleting, but not found? nothing to do: */</div><div class='del'>-	if (bkey_deleted(&amp;insert-&gt;k) &amp;&amp; !k)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (bkey_deleted(&amp;insert-&gt;k)) {</div><div class='del'>-		/* Deleting: */</div><div class='del'>-		btree_account_key_drop(b, k);</div><div class='del'>-		k-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-</div><div class='del'>-		if (k-&gt;needs_whiteout)</div><div class='del'>-			push_whiteout(b, insert-&gt;k.p);</div><div class='del'>-		k-&gt;needs_whiteout = false;</div><div class='del'>-</div><div class='del'>-		if (k &gt;= btree_bset_last(b)-&gt;start) {</div><div class='del'>-			clobber_u64s = k-&gt;u64s;</div><div class='del'>-			bch2_bset_delete(b, k, clobber_u64s);</div><div class='del'>-			goto fix_iter;</div><div class='del'>-		} else {</div><div class='del'>-			bch2_btree_path_fix_key_modified(trans, b, k);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k) {</div><div class='del'>-		/* Overwriting: */</div><div class='del'>-		btree_account_key_drop(b, k);</div><div class='del'>-		k-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-</div><div class='del'>-		insert-&gt;k.needs_whiteout = k-&gt;needs_whiteout;</div><div class='del'>-		k-&gt;needs_whiteout = false;</div><div class='del'>-</div><div class='del'>-		if (k &gt;= btree_bset_last(b)-&gt;start) {</div><div class='del'>-			clobber_u64s = k-&gt;u64s;</div><div class='del'>-			goto overwrite;</div><div class='del'>-		} else {</div><div class='del'>-			bch2_btree_path_fix_key_modified(trans, b, k);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_node_iter_bset_pos(node_iter, b, bset_tree_last(b));</div><div class='del'>-overwrite:</div><div class='del'>-	bch2_bset_insert(b, node_iter, k, insert, clobber_u64s);</div><div class='del'>-	new_u64s = k-&gt;u64s;</div><div class='del'>-fix_iter:</div><div class='del'>-	if (clobber_u64s != new_u64s)</div><div class='del'>-		bch2_btree_node_iter_fix(trans, path, b, node_iter, k,</div><div class='del'>-					 clobber_u64s, new_u64s);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __btree_node_flush(struct journal *j, struct journal_entry_pin *pin,</div><div class='del'>-			       unsigned i, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct btree_write *w = container_of(pin, struct btree_write, journal);</div><div class='del'>-	struct btree *b = container_of(w, struct btree, writes[i]);</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	unsigned long old, new, v;</div><div class='del'>-	unsigned idx = w - b-&gt;writes;</div><div class='del'>-</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_read);</div><div class='del'>-	v = READ_ONCE(b-&gt;flags);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = new = v;</div><div class='del'>-</div><div class='del'>-		if (!(old &amp; (1 &lt;&lt; BTREE_NODE_dirty)) ||</div><div class='del'>-		    !!(old &amp; (1 &lt;&lt; BTREE_NODE_write_idx)) != idx ||</div><div class='del'>-		    w-&gt;journal.seq != seq)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		new &amp;= ~BTREE_WRITE_TYPE_MASK;</div><div class='del'>-		new |= BTREE_WRITE_journal_reclaim;</div><div class='del'>-		new |= 1 &lt;&lt; BTREE_NODE_need_write;</div><div class='del'>-	} while ((v = cmpxchg(&amp;b-&gt;flags, old, new)) != old);</div><div class='del'>-</div><div class='del'>-	btree_node_write_if_need(c, b, SIX_LOCK_read);</div><div class='del'>-	six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_flush0(struct journal *j, struct journal_entry_pin *pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_flush(j, pin, 0, seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_flush1(struct journal *j, struct journal_entry_pin *pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_flush(j, pin, 1, seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void bch2_btree_add_journal_pin(struct bch_fs *c,</div><div class='del'>-				       struct btree *b, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct btree_write *w = btree_current_write(b);</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_add(&amp;c-&gt;journal, seq, &amp;w-&gt;journal,</div><div class='del'>-			     btree_node_write_idx(b) == 0</div><div class='del'>-			     ? bch2_btree_node_flush0</div><div class='del'>-			     : bch2_btree_node_flush1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_insert_key_leaf() - insert a key one key into a leaf node</div><div class='del'>- * @trans:		btree transaction object</div><div class='del'>- * @path:		path pointing to @insert's pos</div><div class='del'>- * @insert:		key to insert</div><div class='del'>- * @journal_seq:	sequence number of journal reservation</div><div class='del'>- */</div><div class='del'>-inline void bch2_btree_insert_key_leaf(struct btree_trans *trans,</div><div class='del'>-				       struct btree_path *path,</div><div class='del'>-				       struct bkey_i *insert,</div><div class='del'>-				       u64 journal_seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *b = path_l(path)-&gt;b;</div><div class='del'>-	struct bset_tree *t = bset_tree_last(b);</div><div class='del'>-	struct bset *i = bset(b, t);</div><div class='del'>-	int old_u64s = bset_u64s(t);</div><div class='del'>-	int old_live_u64s = b-&gt;nr.live_u64s;</div><div class='del'>-	int live_u64s_added, u64s_added;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!bch2_btree_bset_insert_key(trans, path, b,</div><div class='del'>-					&amp;path_l(path)-&gt;iter, insert)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	i-&gt;journal_seq = cpu_to_le64(max(journal_seq, le64_to_cpu(i-&gt;journal_seq)));</div><div class='del'>-</div><div class='del'>-	bch2_btree_add_journal_pin(c, b, journal_seq);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!btree_node_dirty(b))) {</div><div class='del'>-		EBUG_ON(test_bit(BCH_FS_clean_shutdown, &amp;c-&gt;flags));</div><div class='del'>-		set_btree_node_dirty_acct(c, b);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	live_u64s_added = (int) b-&gt;nr.live_u64s - old_live_u64s;</div><div class='del'>-	u64s_added = (int) bset_u64s(t) - old_u64s;</div><div class='del'>-</div><div class='del'>-	if (b-&gt;sib_u64s[0] != U16_MAX &amp;&amp; live_u64s_added &lt; 0)</div><div class='del'>-		b-&gt;sib_u64s[0] = max(0, (int) b-&gt;sib_u64s[0] + live_u64s_added);</div><div class='del'>-	if (b-&gt;sib_u64s[1] != U16_MAX &amp;&amp; live_u64s_added &lt; 0)</div><div class='del'>-		b-&gt;sib_u64s[1] = max(0, (int) b-&gt;sib_u64s[1] + live_u64s_added);</div><div class='del'>-</div><div class='del'>-	if (u64s_added &gt; live_u64s_added &amp;&amp;</div><div class='del'>-	    bch2_maybe_compact_whiteouts(c, b))</div><div class='del'>-		bch2_trans_node_reinit_iter(trans, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cached btree updates: */</div><div class='del'>-</div><div class='del'>-/* Normal update interface: */</div><div class='del'>-</div><div class='del'>-static inline void btree_insert_entry_checks(struct btree_trans *trans,</div><div class='del'>-					     struct btree_insert_entry *i)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + i-&gt;path;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bpos_eq(i-&gt;k-&gt;k.p, path-&gt;pos));</div><div class='del'>-	BUG_ON(i-&gt;cached	!= path-&gt;cached);</div><div class='del'>-	BUG_ON(i-&gt;level		!= path-&gt;level);</div><div class='del'>-	BUG_ON(i-&gt;btree_id	!= path-&gt;btree_id);</div><div class='del'>-	EBUG_ON(!i-&gt;level &amp;&amp;</div><div class='del'>-		btree_type_has_snapshots(i-&gt;btree_id) &amp;&amp;</div><div class='del'>-		!(i-&gt;flags &amp; BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) &amp;&amp;</div><div class='del'>-		test_bit(JOURNAL_REPLAY_DONE, &amp;trans-&gt;c-&gt;journal.flags) &amp;&amp;</div><div class='del'>-		i-&gt;k-&gt;k.p.snapshot &amp;&amp;</div><div class='del'>-		bch2_snapshot_is_internal_node(trans-&gt;c, i-&gt;k-&gt;k.p.snapshot));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int bch2_trans_journal_res_get(struct btree_trans *trans,</div><div class='del'>-						      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return bch2_journal_res_get(&amp;trans-&gt;c-&gt;journal, &amp;trans-&gt;journal_res,</div><div class='del'>-				    trans-&gt;journal_u64s, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define JSET_ENTRY_LOG_U64s		4</div><div class='del'>-</div><div class='del'>-static noinline void journal_transaction_name(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-	struct jset_entry *entry =</div><div class='del'>-		bch2_journal_add_entry(j, &amp;trans-&gt;journal_res,</div><div class='del'>-				       BCH_JSET_ENTRY_log, 0, 0,</div><div class='del'>-				       JSET_ENTRY_LOG_U64s);</div><div class='del'>-	struct jset_entry_log *l =</div><div class='del'>-		container_of(entry, struct jset_entry_log, entry);</div><div class='del'>-</div><div class='del'>-	strncpy(l-&gt;d, trans-&gt;fn, JSET_ENTRY_LOG_U64s * sizeof(u64));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int btree_key_can_insert(struct btree_trans *trans,</div><div class='del'>-				       struct btree *b, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_btree_node_insert_fits(b, u64s))</div><div class='del'>-		return -BCH_ERR_btree_insert_btree_node_full;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline static int</div><div class='del'>-btree_key_can_insert_cached_slowpath(struct btree_trans *trans, unsigned flags,</div><div class='del'>-				     struct btree_path *path, unsigned new_u64s)</div><div class='del'>-{</div><div class='del'>-	struct bkey_cached *ck = (void *) path-&gt;l[0].b;</div><div class='del'>-	struct bkey_i *new_k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock_write(trans);</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	new_k = kmalloc(new_u64s * sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!new_k) {</div><div class='del'>-		bch_err(trans-&gt;c, "error allocating memory for key cache key, btree %s u64s %u",</div><div class='del'>-			bch2_btree_id_str(path-&gt;btree_id), new_u64s);</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_key_cache_insert;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret =   bch2_trans_relock(trans) ?:</div><div class='del'>-		bch2_trans_lock_write(trans);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		kfree(new_k);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(new_k, ck-&gt;k, ck-&gt;u64s * sizeof(u64));</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (i-&gt;old_v == &amp;ck-&gt;k-&gt;v)</div><div class='del'>-			i-&gt;old_v = &amp;new_k-&gt;v;</div><div class='del'>-</div><div class='del'>-	kfree(ck-&gt;k);</div><div class='del'>-	ck-&gt;u64s	= new_u64s;</div><div class='del'>-	ck-&gt;k		= new_k;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_key_can_insert_cached(struct btree_trans *trans, unsigned flags,</div><div class='del'>-				       struct btree_path *path, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_cached *ck = (void *) path-&gt;l[0].b;</div><div class='del'>-	unsigned new_u64s;</div><div class='del'>-	struct bkey_i *new_k;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(path-&gt;level);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags) &amp;&amp;</div><div class='del'>-	    bch2_btree_key_cache_must_wait(c) &amp;&amp;</div><div class='del'>-	    !(flags &amp; BCH_TRANS_COMMIT_journal_reclaim))</div><div class='del'>-		return -BCH_ERR_btree_insert_need_journal_reclaim;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * bch2_varint_decode can read past the end of the buffer by at most 7</div><div class='del'>-	 * bytes (it won't be used):</div><div class='del'>-	 */</div><div class='del'>-	u64s += 1;</div><div class='del'>-</div><div class='del'>-	if (u64s &lt;= ck-&gt;u64s)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	new_u64s	= roundup_pow_of_two(u64s);</div><div class='del'>-	new_k		= krealloc(ck-&gt;k, new_u64s * sizeof(u64), GFP_NOWAIT|__GFP_NOWARN);</div><div class='del'>-	if (unlikely(!new_k))</div><div class='del'>-		return btree_key_can_insert_cached_slowpath(trans, flags, path, new_u64s);</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (i-&gt;old_v == &amp;ck-&gt;k-&gt;v)</div><div class='del'>-			i-&gt;old_v = &amp;new_k-&gt;v;</div><div class='del'>-</div><div class='del'>-	ck-&gt;u64s	= new_u64s;</div><div class='del'>-	ck-&gt;k		= new_k;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Triggers: */</div><div class='del'>-</div><div class='del'>-static int run_one_mem_trigger(struct btree_trans *trans,</div><div class='del'>-			       struct btree_insert_entry *i,</div><div class='del'>-			       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c old = { &amp;i-&gt;old_k, i-&gt;old_v };</div><div class='del'>-	struct bkey_i *new = i-&gt;k;</div><div class='del'>-	const struct bkey_ops *old_ops = bch2_bkey_type_ops(old.k-&gt;type);</div><div class='del'>-	const struct bkey_ops *new_ops = bch2_bkey_type_ops(i-&gt;k-&gt;k.type);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	verify_update_old_key(trans, i);</div><div class='del'>-</div><div class='del'>-	if (unlikely(flags &amp; BTREE_TRIGGER_NORUN))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (old_ops-&gt;trigger == new_ops-&gt;trigger) {</div><div class='del'>-		ret   = bch2_key_trigger(trans, i-&gt;btree_id, i-&gt;level,</div><div class='del'>-				old, bkey_i_to_s(new),</div><div class='del'>-				BTREE_TRIGGER_INSERT|BTREE_TRIGGER_OVERWRITE|flags);</div><div class='del'>-	} else {</div><div class='del'>-		ret   = bch2_key_trigger_new(trans, i-&gt;btree_id, i-&gt;level,</div><div class='del'>-				bkey_i_to_s(new), flags) ?:</div><div class='del'>-			bch2_key_trigger_old(trans, i-&gt;btree_id, i-&gt;level,</div><div class='del'>-				old, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int run_one_trans_trigger(struct btree_trans *trans, struct btree_insert_entry *i,</div><div class='del'>-				 bool overwrite)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Transactional triggers create new btree_insert_entries, so we can't</div><div class='del'>-	 * pass them a pointer to a btree_insert_entry, that memory is going to</div><div class='del'>-	 * move:</div><div class='del'>-	 */</div><div class='del'>-	struct bkey old_k = i-&gt;old_k;</div><div class='del'>-	struct bkey_s_c old = { &amp;old_k, i-&gt;old_v };</div><div class='del'>-	const struct bkey_ops *old_ops = bch2_bkey_type_ops(old.k-&gt;type);</div><div class='del'>-	const struct bkey_ops *new_ops = bch2_bkey_type_ops(i-&gt;k-&gt;k.type);</div><div class='del'>-	unsigned flags = i-&gt;flags|BTREE_TRIGGER_TRANSACTIONAL;</div><div class='del'>-</div><div class='del'>-	verify_update_old_key(trans, i);</div><div class='del'>-</div><div class='del'>-	if ((i-&gt;flags &amp; BTREE_TRIGGER_NORUN) ||</div><div class='del'>-	    !(BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS &amp; (1U &lt;&lt; i-&gt;bkey_type)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!i-&gt;insert_trigger_run &amp;&amp;</div><div class='del'>-	    !i-&gt;overwrite_trigger_run &amp;&amp;</div><div class='del'>-	    old_ops-&gt;trigger == new_ops-&gt;trigger) {</div><div class='del'>-		i-&gt;overwrite_trigger_run = true;</div><div class='del'>-		i-&gt;insert_trigger_run = true;</div><div class='del'>-		return bch2_key_trigger(trans, i-&gt;btree_id, i-&gt;level, old, bkey_i_to_s(i-&gt;k),</div><div class='del'>-					BTREE_TRIGGER_INSERT|</div><div class='del'>-					BTREE_TRIGGER_OVERWRITE|flags) ?: 1;</div><div class='del'>-	} else if (overwrite &amp;&amp; !i-&gt;overwrite_trigger_run) {</div><div class='del'>-		i-&gt;overwrite_trigger_run = true;</div><div class='del'>-		return bch2_key_trigger_old(trans, i-&gt;btree_id, i-&gt;level, old, flags) ?: 1;</div><div class='del'>-	} else if (!overwrite &amp;&amp; !i-&gt;insert_trigger_run) {</div><div class='del'>-		i-&gt;insert_trigger_run = true;</div><div class='del'>-		return bch2_key_trigger_new(trans, i-&gt;btree_id, i-&gt;level, bkey_i_to_s(i-&gt;k), flags) ?: 1;</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int run_btree_triggers(struct btree_trans *trans, enum btree_id btree_id,</div><div class='del'>-			      struct btree_insert_entry *btree_id_start)</div><div class='del'>-{</div><div class='del'>-	struct btree_insert_entry *i;</div><div class='del'>-	bool trans_trigger_run;</div><div class='del'>-	int ret, overwrite;</div><div class='del'>-</div><div class='del'>-	for (overwrite = 1; overwrite &gt;= 0; --overwrite) {</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Running triggers will append more updates to the list of updates as</div><div class='del'>-		 * we're walking it:</div><div class='del'>-		 */</div><div class='del'>-		do {</div><div class='del'>-			trans_trigger_run = false;</div><div class='del'>-</div><div class='del'>-			for (i = btree_id_start;</div><div class='del'>-			     i &lt; trans-&gt;updates + trans-&gt;nr_updates &amp;&amp; i-&gt;btree_id &lt;= btree_id;</div><div class='del'>-			     i++) {</div><div class='del'>-				if (i-&gt;btree_id != btree_id)</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				ret = run_one_trans_trigger(trans, i, overwrite);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					return ret;</div><div class='del'>-				if (ret)</div><div class='del'>-					trans_trigger_run = true;</div><div class='del'>-			}</div><div class='del'>-		} while (trans_trigger_run);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_trans_commit_run_triggers(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_insert_entry *btree_id_start = trans-&gt;updates;</div><div class='del'>-	unsigned btree_id = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *</div><div class='del'>-	 * For a given btree, this algorithm runs insert triggers before</div><div class='del'>-	 * overwrite triggers: this is so that when extents are being moved</div><div class='del'>-	 * (e.g. by FALLOCATE_FL_INSERT_RANGE), we don't drop references before</div><div class='del'>-	 * they are re-added.</div><div class='del'>-	 */</div><div class='del'>-	for (btree_id = 0; btree_id &lt; BTREE_ID_NR; btree_id++) {</div><div class='del'>-		if (btree_id == BTREE_ID_alloc)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		while (btree_id_start &lt; trans-&gt;updates + trans-&gt;nr_updates &amp;&amp;</div><div class='del'>-		       btree_id_start-&gt;btree_id &lt; btree_id)</div><div class='del'>-			btree_id_start++;</div><div class='del'>-</div><div class='del'>-		ret = run_btree_triggers(trans, btree_id, btree_id_start);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		if (i-&gt;btree_id &gt; BTREE_ID_alloc)</div><div class='del'>-			break;</div><div class='del'>-		if (i-&gt;btree_id == BTREE_ID_alloc) {</div><div class='del'>-			ret = run_btree_triggers(trans, BTREE_ID_alloc, i);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		BUG_ON(!(i-&gt;flags &amp; BTREE_TRIGGER_NORUN) &amp;&amp;</div><div class='del'>-		       (BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS &amp; (1U &lt;&lt; i-&gt;bkey_type)) &amp;&amp;</div><div class='del'>-		       (!i-&gt;insert_trigger_run || !i-&gt;overwrite_trigger_run));</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_trans_commit_run_gc_triggers(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: synchronization of cached update triggers with gc</div><div class='del'>-		 * XXX: synchronization of interior node updates with gc</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(i-&gt;cached || i-&gt;level);</div><div class='del'>-</div><div class='del'>-		if (btree_node_type_needs_gc(__btree_node_type(i-&gt;level, i-&gt;btree_id)) &amp;&amp;</div><div class='del'>-		    gc_visited(trans-&gt;c, gc_pos_btree_node(insert_l(trans, i)-&gt;b))) {</div><div class='del'>-			int ret = run_one_mem_trigger(trans, i, i-&gt;flags|BTREE_TRIGGER_GC);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags,</div><div class='del'>-			       struct btree_insert_entry **stopped_at,</div><div class='del'>-			       unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_trans_commit_hook *h;</div><div class='del'>-	unsigned u64s = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (race_fault()) {</div><div class='del'>-		trace_and_count(c, trans_restart_fault_inject, trans, trace_ip);</div><div class='del'>-		return btree_trans_restart_nounlock(trans, BCH_ERR_transaction_restart_fault_inject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the insert will fit in the leaf node with the write lock</div><div class='del'>-	 * held, otherwise another thread could write the node changing the</div><div class='del'>-	 * amount of space available:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	prefetch(&amp;trans-&gt;c-&gt;journal.flags);</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		/* Multiple inserts might go to same leaf: */</div><div class='del'>-		if (!same_leaf_as_prev(trans, i))</div><div class='del'>-			u64s = 0;</div><div class='del'>-</div><div class='del'>-		u64s += i-&gt;k-&gt;k.u64s;</div><div class='del'>-		ret = !i-&gt;cached</div><div class='del'>-			? btree_key_can_insert(trans, insert_l(trans, i)-&gt;b, u64s)</div><div class='del'>-			: btree_key_can_insert_cached(trans, flags, trans-&gt;paths + i-&gt;path, u64s);</div><div class='del'>-		if (ret) {</div><div class='del'>-			*stopped_at = i;</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i-&gt;k-&gt;k.needs_whiteout = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't get journal reservation until after we know insert will</div><div class='del'>-	 * succeed:</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!(flags &amp; BCH_TRANS_COMMIT_no_journal_res))) {</div><div class='del'>-		ret = bch2_trans_journal_res_get(trans,</div><div class='del'>-				(flags &amp; BCH_WATERMARK_MASK)|</div><div class='del'>-				JOURNAL_RES_GET_NONBLOCK);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (unlikely(trans-&gt;journal_transaction_names))</div><div class='del'>-			journal_transaction_name(trans);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Not allowed to fail after we've gotten our journal reservation - we</div><div class='del'>-	 * have to use it:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG) &amp;&amp;</div><div class='del'>-	    !(flags &amp; BCH_TRANS_COMMIT_no_journal_res)) {</div><div class='del'>-		if (bch2_journal_seq_verify)</div><div class='del'>-			trans_for_each_update(trans, i)</div><div class='del'>-				i-&gt;k-&gt;k.version.lo = trans-&gt;journal_res.seq;</div><div class='del'>-		else if (bch2_inject_invalid_keys)</div><div class='del'>-			trans_for_each_update(trans, i)</div><div class='del'>-				i-&gt;k-&gt;k.version = MAX_VERSION;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;fs_usage_deltas &amp;&amp;</div><div class='del'>-	    bch2_trans_fs_usage_apply(trans, trans-&gt;fs_usage_deltas))</div><div class='del'>-		return -BCH_ERR_btree_insert_need_mark_replicas;</div><div class='del'>-</div><div class='del'>-	/* XXX: we only want to run this if deltas are nonzero */</div><div class='del'>-	bch2_trans_account_disk_usage_change(trans);</div><div class='del'>-</div><div class='del'>-	h = trans-&gt;hooks;</div><div class='del'>-	while (h) {</div><div class='del'>-		ret = h-&gt;fn(trans, h);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto revert_fs_usage;</div><div class='del'>-		h = h-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		if (BTREE_NODE_TYPE_HAS_ATOMIC_TRIGGERS &amp; (1U &lt;&lt; i-&gt;bkey_type)) {</div><div class='del'>-			ret = run_one_mem_trigger(trans, i, BTREE_TRIGGER_ATOMIC|i-&gt;flags);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto fatal_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if (unlikely(c-&gt;gc_pos.phase)) {</div><div class='del'>-		ret = bch2_trans_commit_run_gc_triggers(trans);</div><div class='del'>-		if  (ret)</div><div class='del'>-			goto fatal_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (likely(!(flags &amp; BCH_TRANS_COMMIT_no_journal_res))) {</div><div class='del'>-		struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-		struct jset_entry *entry;</div><div class='del'>-</div><div class='del'>-		trans_for_each_update(trans, i) {</div><div class='del'>-			if (i-&gt;key_cache_already_flushed)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (i-&gt;flags &amp; BTREE_UPDATE_NOJOURNAL)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			verify_update_old_key(trans, i);</div><div class='del'>-</div><div class='del'>-			if (trans-&gt;journal_transaction_names) {</div><div class='del'>-				entry = bch2_journal_add_entry(j, &amp;trans-&gt;journal_res,</div><div class='del'>-						       BCH_JSET_ENTRY_overwrite,</div><div class='del'>-						       i-&gt;btree_id, i-&gt;level,</div><div class='del'>-						       i-&gt;old_k.u64s);</div><div class='del'>-				bkey_reassemble((struct bkey_i *) entry-&gt;start,</div><div class='del'>-						(struct bkey_s_c) { &amp;i-&gt;old_k, i-&gt;old_v });</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			entry = bch2_journal_add_entry(j, &amp;trans-&gt;journal_res,</div><div class='del'>-					       BCH_JSET_ENTRY_btree_keys,</div><div class='del'>-					       i-&gt;btree_id, i-&gt;level,</div><div class='del'>-					       i-&gt;k-&gt;k.u64s);</div><div class='del'>-			bkey_copy((struct bkey_i *) entry-&gt;start, i-&gt;k);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy_u64s_small(journal_res_entry(&amp;c-&gt;journal, &amp;trans-&gt;journal_res),</div><div class='del'>-				  trans-&gt;journal_entries,</div><div class='del'>-				  trans-&gt;journal_entries_u64s);</div><div class='del'>-</div><div class='del'>-		trans-&gt;journal_res.offset	+= trans-&gt;journal_entries_u64s;</div><div class='del'>-		trans-&gt;journal_res.u64s		-= trans-&gt;journal_entries_u64s;</div><div class='del'>-</div><div class='del'>-		if (trans-&gt;journal_seq)</div><div class='del'>-			*trans-&gt;journal_seq = trans-&gt;journal_res.seq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		struct btree_path *path = trans-&gt;paths + i-&gt;path;</div><div class='del'>-</div><div class='del'>-		if (!i-&gt;cached) {</div><div class='del'>-			bch2_btree_insert_key_leaf(trans, path, i-&gt;k, trans-&gt;journal_res.seq);</div><div class='del'>-		} else if (!i-&gt;key_cache_already_flushed)</div><div class='del'>-			bch2_btree_insert_key_cached(trans, flags, i);</div><div class='del'>-		else {</div><div class='del'>-			bch2_btree_key_cache_drop(trans, path);</div><div class='del'>-			btree_path_set_dirty(path, BTREE_ITER_NEED_TRAVERSE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-fatal_err:</div><div class='del'>-	bch2_fatal_error(c);</div><div class='del'>-revert_fs_usage:</div><div class='del'>-	if (trans-&gt;fs_usage_deltas)</div><div class='del'>-		bch2_trans_fs_usage_revert(trans, trans-&gt;fs_usage_deltas);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void bch2_drop_overwrites_from_journal(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		bch2_journal_key_overwritten(trans-&gt;c, i-&gt;btree_id, i-&gt;level, i-&gt;k-&gt;k.p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_trans_commit_bkey_invalid(struct btree_trans *trans,</div><div class='del'>-						   enum bkey_invalid_flags flags,</div><div class='del'>-						   struct btree_insert_entry *i,</div><div class='del'>-						   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	printbuf_reset(err);</div><div class='del'>-	prt_printf(err, "invalid bkey on insert from %s -&gt; %ps",</div><div class='del'>-		   trans-&gt;fn, (void *) i-&gt;ip_allocated);</div><div class='del'>-	prt_newline(err);</div><div class='del'>-	printbuf_indent_add(err, 2);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_val_to_text(err, c, bkey_i_to_s_c(i-&gt;k));</div><div class='del'>-	prt_newline(err);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_invalid(c, bkey_i_to_s_c(i-&gt;k), i-&gt;bkey_type, flags, err);</div><div class='del'>-	bch2_print_string_as_lines(KERN_ERR, err-&gt;buf);</div><div class='del'>-</div><div class='del'>-	bch2_inconsistent_error(c);</div><div class='del'>-	bch2_dump_trans_updates(trans);</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_trans_commit_journal_entry_invalid(struct btree_trans *trans,</div><div class='del'>-						   struct jset_entry *i)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "invalid bkey on insert from %s", trans-&gt;fn);</div><div class='del'>-	prt_newline(&amp;buf);</div><div class='del'>-	printbuf_indent_add(&amp;buf, 2);</div><div class='del'>-</div><div class='del'>-	bch2_journal_entry_to_text(&amp;buf, c, i);</div><div class='del'>-	prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-	bch2_print_string_as_lines(KERN_ERR, buf.buf);</div><div class='del'>-</div><div class='del'>-	bch2_inconsistent_error(c);</div><div class='del'>-	bch2_dump_trans_updates(trans);</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_trans_commit_journal_pin_flush(struct journal *j,</div><div class='del'>-				struct journal_entry_pin *_pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get journal reservation, take write locks, and attempt to do btree update(s):</div><div class='del'>- */</div><div class='del'>-static inline int do_bch2_trans_commit(struct btree_trans *trans, unsigned flags,</div><div class='del'>-				       struct btree_insert_entry **stopped_at,</div><div class='del'>-				       unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0, u64s_delta = 0;</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		if (i-&gt;cached)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		u64s_delta += !bkey_deleted(&amp;i-&gt;k-&gt;k) ? i-&gt;k-&gt;k.u64s : 0;</div><div class='del'>-		u64s_delta -= i-&gt;old_btree_u64s;</div><div class='del'>-</div><div class='del'>-		if (!same_leaf_as_next(trans, i)) {</div><div class='del'>-			if (u64s_delta &lt;= 0) {</div><div class='del'>-				ret = bch2_foreground_maybe_merge(trans, i-&gt;path,</div><div class='del'>-							i-&gt;level, flags);</div><div class='del'>-				if (unlikely(ret))</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			u64s_delta = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_lock_write(trans);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_commit_write_locked(trans, flags, stopped_at, trace_ip);</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; unlikely(trans-&gt;journal_replay_not_finished))</div><div class='del'>-		bch2_drop_overwrites_from_journal(trans);</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock_write(trans);</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; trans-&gt;journal_pin)</div><div class='del'>-		bch2_journal_pin_add(&amp;c-&gt;journal, trans-&gt;journal_res.seq,</div><div class='del'>-				     trans-&gt;journal_pin,</div><div class='del'>-				     bch2_trans_commit_journal_pin_flush);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Drop journal reservation after dropping write locks, since dropping</div><div class='del'>-	 * the journal reservation may kick off a journal write:</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!(flags &amp; BCH_TRANS_COMMIT_no_journal_res)))</div><div class='del'>-		bch2_journal_res_put(&amp;c-&gt;journal, &amp;trans-&gt;journal_res);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_reclaim_wait_done(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_journal_error(&amp;c-&gt;journal) ?:</div><div class='del'>-		!bch2_btree_key_cache_must_wait(c);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		journal_reclaim_kick(&amp;c-&gt;journal);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline</div><div class='del'>-int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags,</div><div class='del'>-			    struct btree_insert_entry *i,</div><div class='del'>-			    int ret, unsigned long trace_ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case -BCH_ERR_btree_insert_btree_node_full:</div><div class='del'>-		ret = bch2_btree_split_leaf(trans, i-&gt;path, flags);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			trace_and_count(c, trans_restart_btree_node_split, trans,</div><div class='del'>-					trace_ip, trans-&gt;paths + i-&gt;path);</div><div class='del'>-		break;</div><div class='del'>-	case -BCH_ERR_btree_insert_need_mark_replicas:</div><div class='del'>-		ret = drop_locks_do(trans,</div><div class='del'>-			bch2_replicas_delta_list_mark(c, trans-&gt;fs_usage_deltas));</div><div class='del'>-		break;</div><div class='del'>-	case -BCH_ERR_journal_res_get_blocked:</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: this should probably be a separate BTREE_INSERT_NONBLOCK</div><div class='del'>-		 * flag</div><div class='del'>-		 */</div><div class='del'>-		if ((flags &amp; BCH_TRANS_COMMIT_journal_reclaim) &amp;&amp;</div><div class='del'>-		    (flags &amp; BCH_WATERMARK_MASK) != BCH_WATERMARK_reclaim) {</div><div class='del'>-			ret = -BCH_ERR_journal_reclaim_would_deadlock;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = drop_locks_do(trans,</div><div class='del'>-			bch2_trans_journal_res_get(trans,</div><div class='del'>-					(flags &amp; BCH_WATERMARK_MASK)|</div><div class='del'>-					JOURNAL_RES_GET_CHECK));</div><div class='del'>-		break;</div><div class='del'>-	case -BCH_ERR_btree_insert_need_journal_reclaim:</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-		trace_and_count(c, trans_blocked_journal_reclaim, trans, trace_ip);</div><div class='del'>-</div><div class='del'>-		wait_event_freezable(c-&gt;journal.reclaim_wait,</div><div class='del'>-				     (ret = journal_reclaim_wait_done(c)));</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_relock(trans);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG_ON(ret &gt;= 0);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_err_matches(ret, BCH_ERR_transaction_restart) != !!trans-&gt;restarted);</div><div class='del'>-</div><div class='del'>-	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOSPC) &amp;&amp;</div><div class='del'>-				(flags &amp; BCH_TRANS_COMMIT_no_enospc), c,</div><div class='del'>-		"%s: incorrectly got %s\n", __func__, bch2_err_str(ret));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int</div><div class='del'>-bch2_trans_commit_get_rw_cold(struct btree_trans *trans, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (likely(!(flags &amp; BCH_TRANS_COMMIT_lazy_rw)) ||</div><div class='del'>-	    test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -BCH_ERR_erofs_trans_commit;</div><div class='del'>-</div><div class='del'>-	ret = drop_locks_do(trans, bch2_fs_read_write_early(c));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_get(c, BCH_WRITE_REF_trans);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is for updates done in the early part of fsck - btree_gc - before we've</div><div class='del'>- * gone RW. we only add the new key to the list of keys for journal replay to</div><div class='del'>- * do.</div><div class='del'>- */</div><div class='del'>-static noinline int</div><div class='del'>-do_bch2_trans_commit_to_journal_replay(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		ret = bch2_journal_key_insert(c, i-&gt;btree_id, i-&gt;level, i-&gt;k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_trans_commit(struct btree_trans *trans, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_insert_entry *errored_at = NULL;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!trans-&gt;nr_updates &amp;&amp;</div><div class='del'>-	    !trans-&gt;journal_entries_u64s)</div><div class='del'>-		goto out_reset;</div><div class='del'>-</div><div class='del'>-	memset(&amp;trans-&gt;fs_usage_delta, 0, sizeof(trans-&gt;fs_usage_delta));</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_commit_run_triggers(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_reset;</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-		enum bkey_invalid_flags invalid_flags = 0;</div><div class='del'>-</div><div class='del'>-		if (!(flags &amp; BCH_TRANS_COMMIT_no_journal_res))</div><div class='del'>-			invalid_flags |= BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT;</div><div class='del'>-</div><div class='del'>-		if (unlikely(bch2_bkey_invalid(c, bkey_i_to_s_c(i-&gt;k),</div><div class='del'>-					       i-&gt;bkey_type, invalid_flags, &amp;buf)))</div><div class='del'>-			ret = bch2_trans_commit_bkey_invalid(trans, invalid_flags, i, &amp;buf);</div><div class='del'>-		btree_insert_entry_checks(trans, i);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (struct jset_entry *i = trans-&gt;journal_entries;</div><div class='del'>-	     i != (void *) ((u64 *) trans-&gt;journal_entries + trans-&gt;journal_entries_u64s);</div><div class='del'>-	     i = vstruct_next(i)) {</div><div class='del'>-		enum bkey_invalid_flags invalid_flags = 0;</div><div class='del'>-</div><div class='del'>-		if (!(flags &amp; BCH_TRANS_COMMIT_no_journal_res))</div><div class='del'>-			invalid_flags |= BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT;</div><div class='del'>-</div><div class='del'>-		if (unlikely(bch2_journal_entry_validate(c, NULL, i,</div><div class='del'>-					bcachefs_metadata_version_current,</div><div class='del'>-					CPU_BIG_ENDIAN, invalid_flags)))</div><div class='del'>-			ret = bch2_trans_commit_journal_entry_invalid(trans, i);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!test_bit(BCH_FS_may_go_rw, &amp;c-&gt;flags))) {</div><div class='del'>-		ret = do_bch2_trans_commit_to_journal_replay(trans);</div><div class='del'>-		goto out_reset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_TRANS_COMMIT_no_check_rw) &amp;&amp;</div><div class='del'>-	    unlikely(!bch2_write_ref_tryget(c, BCH_WRITE_REF_trans))) {</div><div class='del'>-		ret = bch2_trans_commit_get_rw_cold(trans, flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_reset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EBUG_ON(test_bit(BCH_FS_clean_shutdown, &amp;c-&gt;flags));</div><div class='del'>-</div><div class='del'>-	trans-&gt;journal_u64s		= trans-&gt;journal_entries_u64s;</div><div class='del'>-	trans-&gt;journal_transaction_names = READ_ONCE(c-&gt;opts.journal_transaction_names);</div><div class='del'>-	if (trans-&gt;journal_transaction_names)</div><div class='del'>-		trans-&gt;journal_u64s += jset_u64s(JSET_ENTRY_LOG_U64s);</div><div class='del'>-</div><div class='del'>-	trans_for_each_update(trans, i) {</div><div class='del'>-		struct btree_path *path = trans-&gt;paths + i-&gt;path;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(!path-&gt;should_be_locked);</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_upgrade(trans, path, i-&gt;level + 1);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(!btree_node_intent_locked(path, i-&gt;level));</div><div class='del'>-</div><div class='del'>-		if (i-&gt;key_cache_already_flushed)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (i-&gt;flags &amp; BTREE_UPDATE_NOJOURNAL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* we're going to journal the key being updated: */</div><div class='del'>-		trans-&gt;journal_u64s += jset_u64s(i-&gt;k-&gt;k.u64s);</div><div class='del'>-</div><div class='del'>-		/* and we're also going to log the overwrite: */</div><div class='del'>-		if (trans-&gt;journal_transaction_names)</div><div class='del'>-			trans-&gt;journal_u64s += jset_u64s(i-&gt;old_k.u64s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;extra_disk_res) {</div><div class='del'>-		ret = bch2_disk_reservation_add(c, trans-&gt;disk_res,</div><div class='del'>-				trans-&gt;extra_disk_res,</div><div class='del'>-				(flags &amp; BCH_TRANS_COMMIT_no_enospc)</div><div class='del'>-				? BCH_DISK_RESERVATION_NOFAIL : 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-retry:</div><div class='del'>-	errored_at = NULL;</div><div class='del'>-	bch2_trans_verify_not_in_restart(trans);</div><div class='del'>-	if (likely(!(flags &amp; BCH_TRANS_COMMIT_no_journal_res)))</div><div class='del'>-		memset(&amp;trans-&gt;journal_res, 0, sizeof(trans-&gt;journal_res));</div><div class='del'>-</div><div class='del'>-	ret = do_bch2_trans_commit(trans, flags, &amp;errored_at, _RET_IP_);</div><div class='del'>-</div><div class='del'>-	/* make sure we didn't drop or screw up locks: */</div><div class='del'>-	bch2_trans_verify_locks(trans);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, transaction_commit, trans, _RET_IP_);</div><div class='del'>-out:</div><div class='del'>-	if (likely(!(flags &amp; BCH_TRANS_COMMIT_no_check_rw)))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_trans);</div><div class='del'>-out_reset:</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_trans_downgrade(trans);</div><div class='del'>-	bch2_trans_reset_updates(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	ret = bch2_trans_commit_error(trans, flags, errored_at, ret, _RET_IP_);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We might have done another transaction commit in the error path -</div><div class='del'>-	 * i.e. btree write buffer flush - which will have made use of</div><div class='del'>-	 * trans-&gt;journal_res, but with BCH_TRANS_COMMIT_no_journal_res that is</div><div class='del'>-	 * how the journal sequence number to pin is passed in - so we must</div><div class='del'>-	 * restart:</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; BCH_TRANS_COMMIT_no_journal_res) {</div><div class='del'>-		ret = -BCH_ERR_transaction_restart_nested;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	goto retry;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h<br/>deleted file mode 100644<br/>index 4a5a64499eb7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,749 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_TYPES_H</div><div class='del'>-#define _BCACHEFS_BTREE_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/rhashtable.h&gt;</div><div class='del'>-</div><div class='del'>-#include "btree_key_cache_types.h"</div><div class='del'>-#include "buckets_types.h"</div><div class='del'>-#include "darray.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "journal_types.h"</div><div class='del'>-#include "replicas_types.h"</div><div class='del'>-#include "six.h"</div><div class='del'>-</div><div class='del'>-struct open_bucket;</div><div class='del'>-struct btree_update;</div><div class='del'>-struct btree_trans;</div><div class='del'>-</div><div class='del'>-#define MAX_BSETS		3U</div><div class='del'>-</div><div class='del'>-struct btree_nr_keys {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Amount of live metadata (i.e. size of node after a compaction) in</div><div class='del'>-	 * units of u64s</div><div class='del'>-	 */</div><div class='del'>-	u16			live_u64s;</div><div class='del'>-	u16			bset_u64s[MAX_BSETS];</div><div class='del'>-</div><div class='del'>-	/* live keys only: */</div><div class='del'>-	u16			packed_keys;</div><div class='del'>-	u16			unpacked_keys;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bset_tree {</div><div class='del'>-	/*</div><div class='del'>-	 * We construct a binary tree in an array as if the array</div><div class='del'>-	 * started at 1, so that things line up on the same cachelines</div><div class='del'>-	 * better: see comments in bset.c at cacheline_to_bkey() for</div><div class='del'>-	 * details</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* size of the binary tree and prev array */</div><div class='del'>-	u16			size;</div><div class='del'>-</div><div class='del'>-	/* function of size - precalculated for to_inorder() */</div><div class='del'>-	u16			extra;</div><div class='del'>-</div><div class='del'>-	u16			data_offset;</div><div class='del'>-	u16			aux_data_offset;</div><div class='del'>-	u16			end_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_write {</div><div class='del'>-	struct journal_entry_pin	journal;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_alloc {</div><div class='del'>-	struct open_buckets	ob;</div><div class='del'>-	__BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_bkey_cached_common {</div><div class='del'>-	struct six_lock		lock;</div><div class='del'>-	u8			level;</div><div class='del'>-	u8			btree_id;</div><div class='del'>-	bool			cached;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree {</div><div class='del'>-	struct btree_bkey_cached_common c;</div><div class='del'>-</div><div class='del'>-	struct rhash_head	hash;</div><div class='del'>-	u64			hash_val;</div><div class='del'>-</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	u16			written;</div><div class='del'>-	u8			nsets;</div><div class='del'>-	u8			nr_key_bits;</div><div class='del'>-	u16			version_ondisk;</div><div class='del'>-</div><div class='del'>-	struct bkey_format	format;</div><div class='del'>-</div><div class='del'>-	struct btree_node	*data;</div><div class='del'>-	void			*aux_data;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sets of sorted keys - the real btree node - plus a binary search tree</div><div class='del'>-	 *</div><div class='del'>-	 * set[0] is special; set[0]-&gt;tree, set[0]-&gt;prev and set[0]-&gt;data point</div><div class='del'>-	 * to the memory we have allocated for this btree node. Additionally,</div><div class='del'>-	 * set[0]-&gt;data points to the entire btree node as it exists on disk.</div><div class='del'>-	 */</div><div class='del'>-	struct bset_tree	set[MAX_BSETS];</div><div class='del'>-</div><div class='del'>-	struct btree_nr_keys	nr;</div><div class='del'>-	u16			sib_u64s[2];</div><div class='del'>-	u16			whiteout_u64s;</div><div class='del'>-	u8			byte_order;</div><div class='del'>-	u8			unpack_fn_len;</div><div class='del'>-</div><div class='del'>-	struct btree_write	writes[2];</div><div class='del'>-</div><div class='del'>-	/* Key/pointer for this btree node */</div><div class='del'>-	__BKEY_PADDED(key, BKEY_BTREE_PTR_VAL_U64s_MAX);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: add a delete sequence number, so when bch2_btree_node_relock()</div><div class='del'>-	 * fails because the lock sequence number has changed - i.e. the</div><div class='del'>-	 * contents were modified - we can still relock the node if it's still</div><div class='del'>-	 * the one we want, without redoing the traversal</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For asynchronous splits/interior node updates:</div><div class='del'>-	 * When we do a split, we allocate new child nodes and update the parent</div><div class='del'>-	 * node to point to them: we update the parent in memory immediately,</div><div class='del'>-	 * but then we must wait until the children have been written out before</div><div class='del'>-	 * the update to the parent can be written - this is a list of the</div><div class='del'>-	 * btree_updates that are blocking this node from being</div><div class='del'>-	 * written:</div><div class='del'>-	 */</div><div class='del'>-	struct list_head	write_blocked;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Also for asynchronous splits/interior node updates:</div><div class='del'>-	 * If a btree node isn't reachable yet, we don't want to kick off</div><div class='del'>-	 * another write - because that write also won't yet be reachable and</div><div class='del'>-	 * marking it as completed before it's reachable would be incorrect:</div><div class='del'>-	 */</div><div class='del'>-	unsigned long		will_make_reachable;</div><div class='del'>-</div><div class='del'>-	struct open_buckets	ob;</div><div class='del'>-</div><div class='del'>-	/* lru list */</div><div class='del'>-	struct list_head	list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_cache {</div><div class='del'>-	struct rhashtable	table;</div><div class='del'>-	bool			table_init_done;</div><div class='del'>-	/*</div><div class='del'>-	 * We never free a struct btree, except on shutdown - we just put it on</div><div class='del'>-	 * the btree_cache_freed list and reuse it later. This simplifies the</div><div class='del'>-	 * code, and it doesn't cost us much memory as the memory usage is</div><div class='del'>-	 * dominated by buffers that hold the actual btree node data and those</div><div class='del'>-	 * can be freed - and the number of struct btrees allocated is</div><div class='del'>-	 * effectively bounded.</div><div class='del'>-	 *</div><div class='del'>-	 * btree_cache_freeable effectively is a small cache - we use it because</div><div class='del'>-	 * high order page allocations can be rather expensive, and it's quite</div><div class='del'>-	 * common to delete and allocate btree nodes in quick succession. It</div><div class='del'>-	 * should never grow past ~2-3 nodes in practice.</div><div class='del'>-	 */</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	struct list_head	live;</div><div class='del'>-	struct list_head	freeable;</div><div class='del'>-	struct list_head	freed_pcpu;</div><div class='del'>-	struct list_head	freed_nonpcpu;</div><div class='del'>-</div><div class='del'>-	/* Number of elements in live + freeable lists */</div><div class='del'>-	unsigned		used;</div><div class='del'>-	unsigned		reserve;</div><div class='del'>-	atomic_t		dirty;</div><div class='del'>-	struct shrinker		*shrink;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we need to allocate memory for a new btree node and that</div><div class='del'>-	 * allocation fails, we can cannibalize another node in the btree cache</div><div class='del'>-	 * to satisfy the allocation - lock to guarantee only one thread does</div><div class='del'>-	 * this at a time:</div><div class='del'>-	 */</div><div class='del'>-	struct task_struct	*alloc_lock;</div><div class='del'>-	struct closure_waitlist	alloc_wait;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_node_iter {</div><div class='del'>-	struct btree_node_iter_set {</div><div class='del'>-		u16	k, end;</div><div class='del'>-	} data[MAX_BSETS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Iterate over all possible positions, synthesizing deleted keys for holes:</div><div class='del'>- */</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_SLOTS		= 1 &lt;&lt; 0;</div><div class='del'>-/*</div><div class='del'>- * Indicates that intent locks should be taken on leaf nodes, because we expect</div><div class='del'>- * to be doing updates:</div><div class='del'>- */</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_INTENT		= 1 &lt;&lt; 1;</div><div class='del'>-/*</div><div class='del'>- * Causes the btree iterator code to prefetch additional btree nodes from disk:</div><div class='del'>- */</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_PREFETCH		= 1 &lt;&lt; 2;</div><div class='del'>-/*</div><div class='del'>- * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for</div><div class='del'>- * @pos or the first key strictly greater than @pos</div><div class='del'>- */</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_IS_EXTENTS		= 1 &lt;&lt; 3;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_NOT_EXTENTS		= 1 &lt;&lt; 4;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_CACHED		= 1 &lt;&lt; 5;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE	= 1 &lt;&lt; 6;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES		= 1 &lt;&lt; 7;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL		= 1 &lt;&lt; 8;</div><div class='del'>-static const __maybe_unused u16 __BTREE_ITER_ALL_SNAPSHOTS	= 1 &lt;&lt; 9;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS	= 1 &lt;&lt; 10;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS	= 1 &lt;&lt; 11;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_NOPRESERVE		= 1 &lt;&lt; 12;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_CACHED_NOFILL	= 1 &lt;&lt; 13;</div><div class='del'>-static const __maybe_unused u16 BTREE_ITER_KEY_CACHE_FILL	= 1 &lt;&lt; 14;</div><div class='del'>-#define __BTREE_ITER_FLAGS_END					       15</div><div class='del'>-</div><div class='del'>-enum btree_path_uptodate {</div><div class='del'>-	BTREE_ITER_UPTODATE		= 0,</div><div class='del'>-	BTREE_ITER_NEED_RELOCK		= 1,</div><div class='del'>-	BTREE_ITER_NEED_TRAVERSE	= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_BCACHEFS_LOCK_TIME_STATS) || defined(CONFIG_BCACHEFS_DEBUG)</div><div class='del'>-#define TRACK_PATH_ALLOCATED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef u16 btree_path_idx_t;</div><div class='del'>-</div><div class='del'>-struct btree_path {</div><div class='del'>-	btree_path_idx_t	sorted_idx;</div><div class='del'>-	u8			ref;</div><div class='del'>-	u8			intent_ref;</div><div class='del'>-</div><div class='del'>-	/* btree_iter_copy starts here: */</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-</div><div class='del'>-	enum btree_id		btree_id:5;</div><div class='del'>-	bool			cached:1;</div><div class='del'>-	bool			preserve:1;</div><div class='del'>-	enum btree_path_uptodate uptodate:2;</div><div class='del'>-	/*</div><div class='del'>-	 * When true, failing to relock this path will cause the transaction to</div><div class='del'>-	 * restart:</div><div class='del'>-	 */</div><div class='del'>-	bool			should_be_locked:1;</div><div class='del'>-	unsigned		level:3,</div><div class='del'>-				locks_want:3;</div><div class='del'>-	u8			nodes_locked;</div><div class='del'>-</div><div class='del'>-	struct btree_path_level {</div><div class='del'>-		struct btree	*b;</div><div class='del'>-		struct btree_node_iter iter;</div><div class='del'>-		u32		lock_seq;</div><div class='del'>-#ifdef CONFIG_BCACHEFS_LOCK_TIME_STATS</div><div class='del'>-		u64             lock_taken_time;</div><div class='del'>-#endif</div><div class='del'>-	}			l[BTREE_MAX_DEPTH];</div><div class='del'>-#ifdef TRACK_PATH_ALLOCATED</div><div class='del'>-	unsigned long		ip_allocated;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct btree_path_level *path_l(struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	return path-&gt;l + path-&gt;level;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long btree_path_ip_allocated(struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-#ifdef TRACK_PATH_ALLOCATED</div><div class='del'>-	return path-&gt;ip_allocated;</div><div class='del'>-#else</div><div class='del'>-	return _THIS_IP_;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @pos			- iterator's current position</div><div class='del'>- * @level		- current btree depth</div><div class='del'>- * @locks_want		- btree level below which we start taking intent locks</div><div class='del'>- * @nodes_locked	- bitmask indicating which nodes in @nodes are locked</div><div class='del'>- * @nodes_intent_locked	- bitmask indicating which locks are intent locks</div><div class='del'>- */</div><div class='del'>-struct btree_iter {</div><div class='del'>-	struct btree_trans	*trans;</div><div class='del'>-	btree_path_idx_t	path;</div><div class='del'>-	btree_path_idx_t	update_path;</div><div class='del'>-	btree_path_idx_t	key_cache_path;</div><div class='del'>-</div><div class='del'>-	enum btree_id		btree_id:8;</div><div class='del'>-	u8			min_depth;</div><div class='del'>-</div><div class='del'>-	/* btree_iter_copy starts here: */</div><div class='del'>-	u16			flags;</div><div class='del'>-</div><div class='del'>-	/* When we're filtering by snapshot, the snapshot ID we're looking for: */</div><div class='del'>-	unsigned		snapshot;</div><div class='del'>-</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-	/*</div><div class='del'>-	 * Current unpacked key - so that bch2_btree_iter_next()/</div><div class='del'>-	 * bch2_btree_iter_next_slot() can correctly advance pos.</div><div class='del'>-	 */</div><div class='del'>-	struct bkey		k;</div><div class='del'>-</div><div class='del'>-	/* BTREE_ITER_WITH_JOURNAL: */</div><div class='del'>-	size_t			journal_idx;</div><div class='del'>-#ifdef TRACK_PATH_ALLOCATED</div><div class='del'>-	unsigned long		ip_allocated;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BKEY_CACHED_ACCESSED		0</div><div class='del'>-#define BKEY_CACHED_DIRTY		1</div><div class='del'>-</div><div class='del'>-struct bkey_cached {</div><div class='del'>-	struct btree_bkey_cached_common c;</div><div class='del'>-</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	u16			u64s;</div><div class='del'>-	bool			valid;</div><div class='del'>-	u32			btree_trans_barrier_seq;</div><div class='del'>-	struct bkey_cached_key	key;</div><div class='del'>-</div><div class='del'>-	struct rhash_head	hash;</div><div class='del'>-	struct list_head	list;</div><div class='del'>-</div><div class='del'>-	struct journal_entry_pin journal;</div><div class='del'>-	u64			seq;</div><div class='del'>-</div><div class='del'>-	struct bkey_i		*k;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bpos btree_node_pos(struct btree_bkey_cached_common *b)</div><div class='del'>-{</div><div class='del'>-	return !b-&gt;cached</div><div class='del'>-		? container_of(b, struct btree, c)-&gt;key.k.p</div><div class='del'>-		: container_of(b, struct bkey_cached, c)-&gt;key.pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_insert_entry {</div><div class='del'>-	unsigned		flags;</div><div class='del'>-	u8			bkey_type;</div><div class='del'>-	enum btree_id		btree_id:8;</div><div class='del'>-	u8			level:4;</div><div class='del'>-	bool			cached:1;</div><div class='del'>-	bool			insert_trigger_run:1;</div><div class='del'>-	bool			overwrite_trigger_run:1;</div><div class='del'>-	bool			key_cache_already_flushed:1;</div><div class='del'>-	/*</div><div class='del'>-	 * @old_k may be a key from the journal; @old_btree_u64s always refers</div><div class='del'>-	 * to the size of the key being overwritten in the btree:</div><div class='del'>-	 */</div><div class='del'>-	u8			old_btree_u64s;</div><div class='del'>-	btree_path_idx_t	path;</div><div class='del'>-	struct bkey_i		*k;</div><div class='del'>-	/* key being overwritten: */</div><div class='del'>-	struct bkey		old_k;</div><div class='del'>-	const struct bch_val	*old_v;</div><div class='del'>-	unsigned long		ip_allocated;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BTREE_ITER_INITIAL		64</div><div class='del'>-#define BTREE_ITER_MAX			(1U &lt;&lt; 10)</div><div class='del'>-</div><div class='del'>-struct btree_trans_commit_hook;</div><div class='del'>-typedef int (btree_trans_commit_hook_fn)(struct btree_trans *, struct btree_trans_commit_hook *);</div><div class='del'>-</div><div class='del'>-struct btree_trans_commit_hook {</div><div class='del'>-	btree_trans_commit_hook_fn	*fn;</div><div class='del'>-	struct btree_trans_commit_hook	*next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BTREE_TRANS_MEM_MAX	(1U &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-#define BTREE_TRANS_MAX_LOCK_HOLD_TIME_NS	10000</div><div class='del'>-</div><div class='del'>-struct btree_trans_paths {</div><div class='del'>-	unsigned long		nr_paths;</div><div class='del'>-	struct btree_path	paths[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_trans {</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-</div><div class='del'>-	unsigned long		*paths_allocated;</div><div class='del'>-	struct btree_path	*paths;</div><div class='del'>-	btree_path_idx_t	*sorted;</div><div class='del'>-	struct btree_insert_entry *updates;</div><div class='del'>-</div><div class='del'>-	void			*mem;</div><div class='del'>-	unsigned		mem_top;</div><div class='del'>-	unsigned		mem_bytes;</div><div class='del'>-</div><div class='del'>-	btree_path_idx_t	nr_sorted;</div><div class='del'>-	btree_path_idx_t	nr_paths;</div><div class='del'>-	btree_path_idx_t	nr_paths_max;</div><div class='del'>-	u8			fn_idx;</div><div class='del'>-	u8			nr_updates;</div><div class='del'>-	u8			lock_must_abort;</div><div class='del'>-	bool			lock_may_not_fail:1;</div><div class='del'>-	bool			srcu_held:1;</div><div class='del'>-	bool			used_mempool:1;</div><div class='del'>-	bool			in_traverse_all:1;</div><div class='del'>-	bool			paths_sorted:1;</div><div class='del'>-	bool			memory_allocation_failure:1;</div><div class='del'>-	bool			journal_transaction_names:1;</div><div class='del'>-	bool			journal_replay_not_finished:1;</div><div class='del'>-	bool			notrace_relock_fail:1;</div><div class='del'>-	bool			write_locked:1;</div><div class='del'>-	enum bch_errcode	restarted:16;</div><div class='del'>-	u32			restart_count;</div><div class='del'>-</div><div class='del'>-	u64			last_begin_time;</div><div class='del'>-	unsigned long		last_begin_ip;</div><div class='del'>-	unsigned long		last_restarted_ip;</div><div class='del'>-	unsigned long		srcu_lock_time;</div><div class='del'>-</div><div class='del'>-	const char		*fn;</div><div class='del'>-	struct btree_bkey_cached_common *locking;</div><div class='del'>-	struct six_lock_waiter	locking_wait;</div><div class='del'>-	int			srcu_idx;</div><div class='del'>-</div><div class='del'>-	/* update path: */</div><div class='del'>-	u16			journal_entries_u64s;</div><div class='del'>-	u16			journal_entries_size;</div><div class='del'>-	struct jset_entry	*journal_entries;</div><div class='del'>-</div><div class='del'>-	struct btree_trans_commit_hook *hooks;</div><div class='del'>-	struct journal_entry_pin *journal_pin;</div><div class='del'>-</div><div class='del'>-	struct journal_res	journal_res;</div><div class='del'>-	u64			*journal_seq;</div><div class='del'>-	struct disk_reservation *disk_res;</div><div class='del'>-</div><div class='del'>-	struct bch_fs_usage_base fs_usage_delta;</div><div class='del'>-</div><div class='del'>-	unsigned		journal_u64s;</div><div class='del'>-	unsigned		extra_disk_res; /* XXX kill */</div><div class='del'>-	struct replicas_delta_list *fs_usage_deltas;</div><div class='del'>-</div><div class='del'>-	/* Entries before this are zeroed out on every bch2_trans_get() call */</div><div class='del'>-</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct closure		ref;</div><div class='del'>-</div><div class='del'>-	unsigned long		_paths_allocated[BITS_TO_LONGS(BTREE_ITER_INITIAL)];</div><div class='del'>-	struct btree_trans_paths trans_paths;</div><div class='del'>-	struct btree_path	_paths[BTREE_ITER_INITIAL];</div><div class='del'>-	btree_path_idx_t	_sorted[BTREE_ITER_INITIAL + 4];</div><div class='del'>-	struct btree_insert_entry _updates[BTREE_ITER_INITIAL];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct btree_path *btree_iter_path(struct btree_trans *trans, struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return trans-&gt;paths + iter-&gt;path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_path *btree_iter_key_cache_path(struct btree_trans *trans, struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return iter-&gt;key_cache_path</div><div class='del'>-		? trans-&gt;paths + iter-&gt;key_cache_path</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_BTREE_WRITE_TYPES()						\</div><div class='del'>-	x(initial,		0)					\</div><div class='del'>-	x(init_next_bset,	1)					\</div><div class='del'>-	x(cache_reclaim,	2)					\</div><div class='del'>-	x(journal_reclaim,	3)					\</div><div class='del'>-	x(interior,		4)</div><div class='del'>-</div><div class='del'>-enum btree_write_type {</div><div class='del'>-#define x(t, n) BTREE_WRITE_##t,</div><div class='del'>-	BCH_BTREE_WRITE_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	BTREE_WRITE_TYPE_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BTREE_WRITE_TYPE_MASK	(roundup_pow_of_two(BTREE_WRITE_TYPE_NR) - 1)</div><div class='del'>-#define BTREE_WRITE_TYPE_BITS	ilog2(roundup_pow_of_two(BTREE_WRITE_TYPE_NR))</div><div class='del'>-</div><div class='del'>-#define BTREE_FLAGS()							\</div><div class='del'>-	x(read_in_flight)						\</div><div class='del'>-	x(read_error)							\</div><div class='del'>-	x(dirty)							\</div><div class='del'>-	x(need_write)							\</div><div class='del'>-	x(write_blocked)						\</div><div class='del'>-	x(will_make_reachable)						\</div><div class='del'>-	x(noevict)							\</div><div class='del'>-	x(write_idx)							\</div><div class='del'>-	x(accessed)							\</div><div class='del'>-	x(write_in_flight)						\</div><div class='del'>-	x(write_in_flight_inner)					\</div><div class='del'>-	x(just_written)							\</div><div class='del'>-	x(dying)							\</div><div class='del'>-	x(fake)								\</div><div class='del'>-	x(need_rewrite)							\</div><div class='del'>-	x(never_write)</div><div class='del'>-</div><div class='del'>-enum btree_flags {</div><div class='del'>-	/* First bits for btree node write type */</div><div class='del'>-	BTREE_NODE_FLAGS_START = BTREE_WRITE_TYPE_BITS - 1,</div><div class='del'>-#define x(flag)	BTREE_NODE_##flag,</div><div class='del'>-	BTREE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define x(flag)								\</div><div class='del'>-static inline bool btree_node_ ## flag(struct btree *b)			\</div><div class='del'>-{	return test_bit(BTREE_NODE_ ## flag, &amp;b-&gt;flags); }		\</div><div class='del'>-									\</div><div class='del'>-static inline void set_btree_node_ ## flag(struct btree *b)		\</div><div class='del'>-{	set_bit(BTREE_NODE_ ## flag, &amp;b-&gt;flags); }			\</div><div class='del'>-									\</div><div class='del'>-static inline void clear_btree_node_ ## flag(struct btree *b)		\</div><div class='del'>-{	clear_bit(BTREE_NODE_ ## flag, &amp;b-&gt;flags); }</div><div class='del'>-</div><div class='del'>-BTREE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-static inline struct btree_write *btree_current_write(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return b-&gt;writes + btree_node_write_idx(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_write *btree_prev_write(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return b-&gt;writes + (btree_node_write_idx(b) ^ 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bset_tree *bset_tree_last(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!b-&gt;nsets);</div><div class='del'>-	return b-&gt;set + b-&gt;nsets - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *</div><div class='del'>-__btree_node_offset_to_ptr(const struct btree *b, u16 offset)</div><div class='del'>-{</div><div class='del'>-	return (void *) ((u64 *) b-&gt;data + 1 + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16</div><div class='del'>-__btree_node_ptr_to_offset(const struct btree *b, const void *p)</div><div class='del'>-{</div><div class='del'>-	u16 ret = (u64 *) p - 1 - (u64 *) b-&gt;data;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(__btree_node_offset_to_ptr(b, ret) != p);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bset *bset(const struct btree *b,</div><div class='del'>-				const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_offset_to_ptr(b, t-&gt;data_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_btree_bset_end(struct btree *b, struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	t-&gt;end_offset =</div><div class='del'>-		__btree_node_ptr_to_offset(b, vstruct_last(bset(b, t)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_btree_bset(struct btree *b, struct bset_tree *t,</div><div class='del'>-				  const struct bset *i)</div><div class='del'>-{</div><div class='del'>-	t-&gt;data_offset = __btree_node_ptr_to_offset(b, i);</div><div class='del'>-	set_btree_bset_end(b, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bset *btree_bset_first(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return bset(b, b-&gt;set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bset *btree_bset_last(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return bset(b, bset_tree_last(b));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16</div><div class='del'>-__btree_node_key_to_offset(const struct btree *b, const struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_ptr_to_offset(b, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *</div><div class='del'>-__btree_node_offset_to_key(const struct btree *b, u16 k)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_offset_to_ptr(b, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_bkey_first_offset(const struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return t-&gt;data_offset + offsetof(struct bset, _data) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define btree_bkey_first(_b, _t)					\</div><div class='del'>-({									\</div><div class='del'>-	EBUG_ON(bset(_b, _t)-&gt;start !=					\</div><div class='del'>-		__btree_node_offset_to_key(_b, btree_bkey_first_offset(_t)));\</div><div class='del'>-									\</div><div class='del'>-	bset(_b, _t)-&gt;start;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define btree_bkey_last(_b, _t)						\</div><div class='del'>-({									\</div><div class='del'>-	EBUG_ON(__btree_node_offset_to_key(_b, (_t)-&gt;end_offset) !=	\</div><div class='del'>-		vstruct_last(bset(_b, _t)));				\</div><div class='del'>-									\</div><div class='del'>-	__btree_node_offset_to_key(_b, (_t)-&gt;end_offset);		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline unsigned bset_u64s(struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return t-&gt;end_offset - t-&gt;data_offset -</div><div class='del'>-		sizeof(struct bset) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bset_dead_u64s(struct btree *b, struct bset_tree *t)</div><div class='del'>-{</div><div class='del'>-	return bset_u64s(t) - b-&gt;nr.bset_u64s[t - b-&gt;set];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bset_byte_offset(struct btree *b, void *i)</div><div class='del'>-{</div><div class='del'>-	return i - (void *) b-&gt;data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum btree_node_type {</div><div class='del'>-	BKEY_TYPE_btree,</div><div class='del'>-#define x(kwd, val, ...) BKEY_TYPE_##kwd = val + 1,</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	BKEY_TYPE_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Type of a key in btree @id at level @level: */</div><div class='del'>-static inline enum btree_node_type __btree_node_type(unsigned level, enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	return level ? BKEY_TYPE_btree : (unsigned) id + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Type of keys @b contains: */</div><div class='del'>-static inline enum btree_node_type btree_node_type(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return __btree_node_type(b-&gt;c.level, b-&gt;c.btree_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *bch2_btree_node_type_str(enum btree_node_type);</div><div class='del'>-</div><div class='del'>-#define BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS		\</div><div class='del'>-	(BIT_ULL(BKEY_TYPE_extents)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_alloc)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_inodes)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_stripes)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_reflink)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_btree))</div><div class='del'>-</div><div class='del'>-#define BTREE_NODE_TYPE_HAS_ATOMIC_TRIGGERS		\</div><div class='del'>-	(BIT_ULL(BKEY_TYPE_alloc)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_inodes)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_stripes)|			\</div><div class='del'>-	 BIT_ULL(BKEY_TYPE_snapshots))</div><div class='del'>-</div><div class='del'>-#define BTREE_NODE_TYPE_HAS_TRIGGERS			\</div><div class='del'>-	(BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS|		\</div><div class='del'>-	 BTREE_NODE_TYPE_HAS_ATOMIC_TRIGGERS)</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_type_needs_gc(enum btree_node_type type)</div><div class='del'>-{</div><div class='del'>-	return BTREE_NODE_TYPE_HAS_TRIGGERS &amp; BIT_ULL(type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_node_type_is_extents(enum btree_node_type type)</div><div class='del'>-{</div><div class='del'>-	const unsigned mask = 0</div><div class='del'>-#define x(name, nr, flags, ...)	|((!!((flags) &amp; BTREE_ID_EXTENTS)) &lt;&lt; (nr + 1))</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-	return (1U &lt;&lt; type) &amp; mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_id_is_extents(enum btree_id btree)</div><div class='del'>-{</div><div class='del'>-	return btree_node_type_is_extents(__btree_node_type(0, btree));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_type_has_snapshots(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	const unsigned mask = 0</div><div class='del'>-#define x(name, nr, flags, ...)	|((!!((flags) &amp; BTREE_ID_SNAPSHOTS)) &lt;&lt; nr)</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-	return (1U &lt;&lt; id) &amp; mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_type_has_snapshot_field(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	const unsigned mask = 0</div><div class='del'>-#define x(name, nr, flags, ...)	|((!!((flags) &amp; (BTREE_ID_SNAPSHOT_FIELD|BTREE_ID_SNAPSHOTS))) &lt;&lt; nr)</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-	return (1U &lt;&lt; id) &amp; mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool btree_type_has_ptrs(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	const unsigned mask = 0</div><div class='del'>-#define x(name, nr, flags, ...)	|((!!((flags) &amp; BTREE_ID_DATA)) &lt;&lt; nr)</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-#undef x</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-	return (1U &lt;&lt; id) &amp; mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_root {</div><div class='del'>-	struct btree		*b;</div><div class='del'>-</div><div class='del'>-	/* On disk root - see async splits: */</div><div class='del'>-	__BKEY_PADDED(key, BKEY_BTREE_PTR_VAL_U64s_MAX);</div><div class='del'>-	u8			level;</div><div class='del'>-	u8			alive;</div><div class='del'>-	s8			error;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btree_gc_coalesce_fail_reason {</div><div class='del'>-	BTREE_GC_COALESCE_FAIL_RESERVE_GET,</div><div class='del'>-	BTREE_GC_COALESCE_FAIL_KEYLIST_REALLOC,</div><div class='del'>-	BTREE_GC_COALESCE_FAIL_FORMAT_FITS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum btree_node_sibling {</div><div class='del'>-	btree_prev_sib,</div><div class='del'>-	btree_next_sib,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct get_locks_fail {</div><div class='del'>-	unsigned	l;</div><div class='del'>-	struct btree	*b;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c<br/>deleted file mode 100644<br/>index c3ff365acce9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_update.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,873 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-static inline int btree_insert_entry_cmp(const struct btree_insert_entry *l,</div><div class='del'>-					 const struct btree_insert_entry *r)</div><div class='del'>-{</div><div class='del'>-	return   cmp_int(l-&gt;btree_id,	r-&gt;btree_id) ?:</div><div class='del'>-		 cmp_int(l-&gt;cached,	r-&gt;cached) ?:</div><div class='del'>-		 -cmp_int(l-&gt;level,	r-&gt;level) ?:</div><div class='del'>-		 bpos_cmp(l-&gt;k-&gt;k.p,	r-&gt;k-&gt;k.p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __must_check</div><div class='del'>-bch2_trans_update_by_path(struct btree_trans *, btree_path_idx_t,</div><div class='del'>-			  struct bkey_i *, enum btree_update_flags,</div><div class='del'>-			  unsigned long ip);</div><div class='del'>-</div><div class='del'>-static noinline int extent_front_merge(struct btree_trans *trans,</div><div class='del'>-				       struct btree_iter *iter,</div><div class='del'>-				       struct bkey_s_c k,</div><div class='del'>-				       struct bkey_i **insert,</div><div class='del'>-				       enum btree_update_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_i *update;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	update = bch2_bkey_make_mut_noupdate(trans, k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(update);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_bkey_merge(c, bkey_i_to_s(update), bkey_i_to_s_c(*insert)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret =   bch2_key_has_snapshot_overwrites(trans, iter-&gt;btree_id, k.k-&gt;p) ?:</div><div class='del'>-		bch2_key_has_snapshot_overwrites(trans, iter-&gt;btree_id, (*insert)-&gt;k.p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	if (ret)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_delete_at(trans, iter, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*insert = update;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int extent_back_merge(struct btree_trans *trans,</div><div class='del'>-				      struct btree_iter *iter,</div><div class='del'>-				      struct bkey_i *insert,</div><div class='del'>-				      struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret =   bch2_key_has_snapshot_overwrites(trans, iter-&gt;btree_id, insert-&gt;k.p) ?:</div><div class='del'>-		bch2_key_has_snapshot_overwrites(trans, iter-&gt;btree_id, k.k-&gt;p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	if (ret)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_merge(c, bkey_i_to_s(insert), k);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When deleting, check if we need to emit a whiteout (because we're overwriting</div><div class='del'>- * something in an ancestor snapshot)</div><div class='del'>- */</div><div class='del'>-static int need_whiteout_for_snapshot(struct btree_trans *trans,</div><div class='del'>-				      enum btree_id btree_id, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot = pos.snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_snapshot_parent(trans-&gt;c, pos.snapshot))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pos.snapshot++;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, btree_id, pos,</div><div class='del'>-			   BTREE_ITER_ALL_SNAPSHOTS|</div><div class='del'>-			   BTREE_ITER_NOPRESERVE, k, ret) {</div><div class='del'>-		if (!bkey_eq(k.k-&gt;p, pos))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bch2_snapshot_is_ancestor(trans-&gt;c, snapshot,</div><div class='del'>-					      k.k-&gt;p.snapshot)) {</div><div class='del'>-			ret = !bkey_whiteout(k.k);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_insert_snapshot_whiteouts(struct btree_trans *trans,</div><div class='del'>-				   enum btree_id id,</div><div class='del'>-				   struct bpos old_pos,</div><div class='del'>-				   struct bpos new_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter old_iter, new_iter = { NULL };</div><div class='del'>-	struct bkey_s_c old_k, new_k;</div><div class='del'>-	snapshot_id_list s;</div><div class='del'>-	struct bkey_i *update;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_snapshot_has_children(c, old_pos.snapshot))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	darray_init(&amp;s);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;old_iter, id, old_pos,</div><div class='del'>-			     BTREE_ITER_NOT_EXTENTS|</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-	while ((old_k = bch2_btree_iter_prev(&amp;old_iter)).k &amp;&amp;</div><div class='del'>-	       !(ret = bkey_err(old_k)) &amp;&amp;</div><div class='del'>-	       bkey_eq(old_pos, old_k.k-&gt;p)) {</div><div class='del'>-		struct bpos whiteout_pos =</div><div class='del'>-			SPOS(new_pos.inode, new_pos.offset, old_k.k-&gt;p.snapshot);;</div><div class='del'>-</div><div class='del'>-		if (!bch2_snapshot_is_ancestor(c, old_k.k-&gt;p.snapshot, old_pos.snapshot) ||</div><div class='del'>-		    snapshot_list_has_ancestor(c, &amp;s, old_k.k-&gt;p.snapshot))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		new_k = bch2_bkey_get_iter(trans, &amp;new_iter, id, whiteout_pos,</div><div class='del'>-					   BTREE_ITER_NOT_EXTENTS|</div><div class='del'>-					   BTREE_ITER_INTENT);</div><div class='del'>-		ret = bkey_err(new_k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (new_k.k-&gt;type == KEY_TYPE_deleted) {</div><div class='del'>-			update = bch2_trans_kmalloc(trans, sizeof(struct bkey_i));</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(update);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			bkey_init(&amp;update-&gt;k);</div><div class='del'>-			update-&gt;k.p		= whiteout_pos;</div><div class='del'>-			update-&gt;k.type		= KEY_TYPE_whiteout;</div><div class='del'>-</div><div class='del'>-			ret = bch2_trans_update(trans, &amp;new_iter, update,</div><div class='del'>-						BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-		}</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;new_iter);</div><div class='del'>-</div><div class='del'>-		ret = snapshot_list_add(c, &amp;s, old_k.k-&gt;p.snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;new_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;old_iter);</div><div class='del'>-	darray_exit(&amp;s);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_update_extent_overwrite(struct btree_trans *trans,</div><div class='del'>-				       struct btree_iter *iter,</div><div class='del'>-				       enum btree_update_flags flags,</div><div class='del'>-				       struct bkey_s_c old,</div><div class='del'>-				       struct bkey_s_c new)</div><div class='del'>-{</div><div class='del'>-	enum btree_id btree_id = iter-&gt;btree_id;</div><div class='del'>-	struct bkey_i *update;</div><div class='del'>-	struct bpos new_start = bkey_start_pos(new.k);</div><div class='del'>-	unsigned front_split = bkey_lt(bkey_start_pos(old.k), new_start);</div><div class='del'>-	unsigned back_split  = bkey_gt(old.k-&gt;p, new.k-&gt;p);</div><div class='del'>-	unsigned middle_split = (front_split || back_split) &amp;&amp;</div><div class='del'>-		old.k-&gt;p.snapshot != new.k-&gt;p.snapshot;</div><div class='del'>-	unsigned nr_splits = front_split + back_split + middle_split;</div><div class='del'>-	int ret = 0, compressed_sectors;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're going to be splitting a compressed extent, note it</div><div class='del'>-	 * so that __bch2_trans_commit() can increase our disk</div><div class='del'>-	 * reservation:</div><div class='del'>-	 */</div><div class='del'>-	if (nr_splits &gt; 1 &amp;&amp;</div><div class='del'>-	    (compressed_sectors = bch2_bkey_sectors_compressed(old)))</div><div class='del'>-		trans-&gt;extra_disk_res += compressed_sectors * (nr_splits - 1);</div><div class='del'>-</div><div class='del'>-	if (front_split) {</div><div class='del'>-		update = bch2_bkey_make_mut_noupdate(trans, old);</div><div class='del'>-		if ((ret = PTR_ERR_OR_ZERO(update)))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bch2_cut_back(new_start, update);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_insert_snapshot_whiteouts(trans, btree_id,</div><div class='del'>-					old.k-&gt;p, update-&gt;k.p) ?:</div><div class='del'>-			bch2_btree_insert_nonextent(trans, btree_id, update,</div><div class='del'>-					BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE|flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we're overwriting in a different snapshot - middle split: */</div><div class='del'>-	if (middle_split) {</div><div class='del'>-		update = bch2_bkey_make_mut_noupdate(trans, old);</div><div class='del'>-		if ((ret = PTR_ERR_OR_ZERO(update)))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bch2_cut_front(new_start, update);</div><div class='del'>-		bch2_cut_back(new.k-&gt;p, update);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_insert_snapshot_whiteouts(trans, btree_id,</div><div class='del'>-					old.k-&gt;p, update-&gt;k.p) ?:</div><div class='del'>-			bch2_btree_insert_nonextent(trans, btree_id, update,</div><div class='del'>-					  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE|flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bkey_le(old.k-&gt;p, new.k-&gt;p)) {</div><div class='del'>-		update = bch2_trans_kmalloc(trans, sizeof(*update));</div><div class='del'>-		if ((ret = PTR_ERR_OR_ZERO(update)))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;update-&gt;k);</div><div class='del'>-		update-&gt;k.p = old.k-&gt;p;</div><div class='del'>-		update-&gt;k.p.snapshot = new.k-&gt;p.snapshot;</div><div class='del'>-</div><div class='del'>-		if (new.k-&gt;p.snapshot != old.k-&gt;p.snapshot) {</div><div class='del'>-			update-&gt;k.type = KEY_TYPE_whiteout;</div><div class='del'>-		} else if (btree_type_has_snapshots(btree_id)) {</div><div class='del'>-			ret = need_whiteout_for_snapshot(trans, btree_id, update-&gt;k.p);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			if (ret)</div><div class='del'>-				update-&gt;k.type = KEY_TYPE_whiteout;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_insert_nonextent(trans, btree_id, update,</div><div class='del'>-					  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE|flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (back_split) {</div><div class='del'>-		update = bch2_bkey_make_mut_noupdate(trans, old);</div><div class='del'>-		if ((ret = PTR_ERR_OR_ZERO(update)))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bch2_cut_front(new.k-&gt;p, update);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update_by_path(trans, iter-&gt;path, update,</div><div class='del'>-					  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE|</div><div class='del'>-					  flags, _RET_IP_);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_trans_update_extent(struct btree_trans *trans,</div><div class='del'>-				    struct btree_iter *orig_iter,</div><div class='del'>-				    struct bkey_i *insert,</div><div class='del'>-				    enum btree_update_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	enum btree_id btree_id = orig_iter-&gt;btree_id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, btree_id, bkey_start_pos(&amp;insert-&gt;k),</div><div class='del'>-			     BTREE_ITER_INTENT|</div><div class='del'>-			     BTREE_ITER_WITH_UPDATES|</div><div class='del'>-			     BTREE_ITER_NOT_EXTENTS);</div><div class='del'>-	k = bch2_btree_iter_peek_upto(&amp;iter, POS(insert-&gt;k.p.inode, U64_MAX));</div><div class='del'>-	if ((ret = bkey_err(k)))</div><div class='del'>-		goto err;</div><div class='del'>-	if (!k.k)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (bkey_eq(k.k-&gt;p, bkey_start_pos(&amp;insert-&gt;k))) {</div><div class='del'>-		if (bch2_bkey_maybe_mergable(k.k, &amp;insert-&gt;k)) {</div><div class='del'>-			ret = extent_front_merge(trans, &amp;iter, k, &amp;insert, flags);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (bkey_gt(insert-&gt;k.p, bkey_start_pos(k.k))) {</div><div class='del'>-		bool done = bkey_lt(insert-&gt;k.p, k.k-&gt;p);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update_extent_overwrite(trans, &amp;iter, flags, k, bkey_i_to_s_c(insert));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (done)</div><div class='del'>-			goto out;</div><div class='del'>-next:</div><div class='del'>-		bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-		k = bch2_btree_iter_peek_upto(&amp;iter, POS(insert-&gt;k.p.inode, U64_MAX));</div><div class='del'>-		if ((ret = bkey_err(k)))</div><div class='del'>-			goto err;</div><div class='del'>-		if (!k.k)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_bkey_maybe_mergable(&amp;insert-&gt;k, k.k)) {</div><div class='del'>-		ret = extent_back_merge(trans, &amp;iter, insert, k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (!bkey_deleted(&amp;insert-&gt;k))</div><div class='del'>-		ret = bch2_btree_insert_nonextent(trans, btree_id, insert, flags);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int flush_new_cached_update(struct btree_trans *trans,</div><div class='del'>-					    struct btree_insert_entry *i,</div><div class='del'>-					    enum btree_update_flags flags,</div><div class='del'>-					    unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	struct bkey k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	btree_path_idx_t path_idx =</div><div class='del'>-		bch2_path_get(trans, i-&gt;btree_id, i-&gt;old_k.p, 1, 0,</div><div class='del'>-			      BTREE_ITER_INTENT, _THIS_IP_);</div><div class='del'>-	ret = bch2_btree_path_traverse(trans, path_idx, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	struct btree_path *btree_path = trans-&gt;paths + path_idx;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The old key in the insert entry might actually refer to an existing</div><div class='del'>-	 * key in the btree that has been deleted from cache and not yet</div><div class='del'>-	 * flushed. Check for this and skip the flush so we don't run triggers</div><div class='del'>-	 * against a stale key.</div><div class='del'>-	 */</div><div class='del'>-	bch2_btree_path_peek_slot_exact(btree_path, &amp;k);</div><div class='del'>-	if (!bkey_deleted(&amp;k))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	i-&gt;key_cache_already_flushed = true;</div><div class='del'>-	i-&gt;flags |= BTREE_TRIGGER_NORUN;</div><div class='del'>-</div><div class='del'>-	btree_path_set_should_be_locked(btree_path);</div><div class='del'>-	ret = bch2_trans_update_by_path(trans, path_idx, i-&gt;k, flags, ip);</div><div class='del'>-out:</div><div class='del'>-	bch2_path_put(trans, path_idx, true);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __must_check</div><div class='del'>-bch2_trans_update_by_path(struct btree_trans *trans, btree_path_idx_t path_idx,</div><div class='del'>-			  struct bkey_i *k, enum btree_update_flags flags,</div><div class='del'>-			  unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_insert_entry *i, n;</div><div class='del'>-	int cmp;</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-	EBUG_ON(!path-&gt;should_be_locked);</div><div class='del'>-	EBUG_ON(trans-&gt;nr_updates &gt;= trans-&gt;nr_paths);</div><div class='del'>-	EBUG_ON(!bpos_eq(k-&gt;k.p, path-&gt;pos));</div><div class='del'>-</div><div class='del'>-	n = (struct btree_insert_entry) {</div><div class='del'>-		.flags		= flags,</div><div class='del'>-		.bkey_type	= __btree_node_type(path-&gt;level, path-&gt;btree_id),</div><div class='del'>-		.btree_id	= path-&gt;btree_id,</div><div class='del'>-		.level		= path-&gt;level,</div><div class='del'>-		.cached		= path-&gt;cached,</div><div class='del'>-		.path		= path_idx,</div><div class='del'>-		.k		= k,</div><div class='del'>-		.ip_allocated	= ip,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		BUG_ON(i != trans-&gt;updates &amp;&amp;</div><div class='del'>-		       btree_insert_entry_cmp(i - 1, i) &gt;= 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Pending updates are kept sorted: first, find position of new update,</div><div class='del'>-	 * then delete/trim any updates the new update overwrites:</div><div class='del'>-	 */</div><div class='del'>-	for (i = trans-&gt;updates; i &lt; trans-&gt;updates + trans-&gt;nr_updates; i++) {</div><div class='del'>-		cmp = btree_insert_entry_cmp(&amp;n, i);</div><div class='del'>-		if (cmp &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cmp &amp;&amp; i &lt; trans-&gt;updates + trans-&gt;nr_updates) {</div><div class='del'>-		EBUG_ON(i-&gt;insert_trigger_run || i-&gt;overwrite_trigger_run);</div><div class='del'>-</div><div class='del'>-		bch2_path_put(trans, i-&gt;path, true);</div><div class='del'>-		i-&gt;flags	= n.flags;</div><div class='del'>-		i-&gt;cached	= n.cached;</div><div class='del'>-		i-&gt;k		= n.k;</div><div class='del'>-		i-&gt;path		= n.path;</div><div class='del'>-		i-&gt;ip_allocated	= n.ip_allocated;</div><div class='del'>-	} else {</div><div class='del'>-		array_insert_item(trans-&gt;updates, trans-&gt;nr_updates,</div><div class='del'>-				  i - trans-&gt;updates, n);</div><div class='del'>-</div><div class='del'>-		i-&gt;old_v = bch2_btree_path_peek_slot_exact(path, &amp;i-&gt;old_k).v;</div><div class='del'>-		i-&gt;old_btree_u64s = !bkey_deleted(&amp;i-&gt;old_k) ? i-&gt;old_k.u64s : 0;</div><div class='del'>-</div><div class='del'>-		if (unlikely(trans-&gt;journal_replay_not_finished)) {</div><div class='del'>-			struct bkey_i *j_k =</div><div class='del'>-				bch2_journal_keys_peek_slot(c, n.btree_id, n.level, k-&gt;k.p);</div><div class='del'>-</div><div class='del'>-			if (j_k) {</div><div class='del'>-				i-&gt;old_k = j_k-&gt;k;</div><div class='del'>-				i-&gt;old_v = &amp;j_k-&gt;v;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__btree_path_get(trans-&gt;paths + i-&gt;path, true);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If a key is present in the key cache, it must also exist in the</div><div class='del'>-	 * btree - this is necessary for cache coherency. When iterating over</div><div class='del'>-	 * a btree that's cached in the key cache, the btree iter code checks</div><div class='del'>-	 * the key cache - but the key has to exist in the btree for that to</div><div class='del'>-	 * work:</div><div class='del'>-	 */</div><div class='del'>-	if (path-&gt;cached &amp;&amp; bkey_deleted(&amp;i-&gt;old_k))</div><div class='del'>-		return flush_new_cached_update(trans, i, flags, ip);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_trans_update_get_key_cache(struct btree_trans *trans,</div><div class='del'>-						    struct btree_iter *iter,</div><div class='del'>-						    struct btree_path *path)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *key_cache_path = btree_iter_key_cache_path(trans, iter);</div><div class='del'>-</div><div class='del'>-	if (!key_cache_path ||</div><div class='del'>-	    !key_cache_path-&gt;should_be_locked ||</div><div class='del'>-	    !bpos_eq(key_cache_path-&gt;pos, iter-&gt;pos)) {</div><div class='del'>-		struct bkey_cached *ck;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if (!iter-&gt;key_cache_path)</div><div class='del'>-			iter-&gt;key_cache_path =</div><div class='del'>-				bch2_path_get(trans, path-&gt;btree_id, path-&gt;pos, 1, 0,</div><div class='del'>-					      BTREE_ITER_INTENT|</div><div class='del'>-					      BTREE_ITER_CACHED, _THIS_IP_);</div><div class='del'>-</div><div class='del'>-		iter-&gt;key_cache_path =</div><div class='del'>-			bch2_btree_path_set_pos(trans, iter-&gt;key_cache_path, path-&gt;pos,</div><div class='del'>-						iter-&gt;flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-						_THIS_IP_);</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_traverse(trans, iter-&gt;key_cache_path, BTREE_ITER_CACHED);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ck = (void *) trans-&gt;paths[iter-&gt;key_cache_path].l[0].b;</div><div class='del'>-</div><div class='del'>-		if (test_bit(BKEY_CACHED_DIRTY, &amp;ck-&gt;flags)) {</div><div class='del'>-			trace_and_count(trans-&gt;c, trans_restart_key_cache_raced, trans, _RET_IP_);</div><div class='del'>-			return btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_raced);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btree_path_set_should_be_locked(trans-&gt;paths + iter-&gt;key_cache_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __must_check bch2_trans_update(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-				   struct bkey_i *k, enum btree_update_flags flags)</div><div class='del'>-{</div><div class='del'>-	btree_path_idx_t path_idx = iter-&gt;update_path ?: iter-&gt;path;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS)</div><div class='del'>-		return bch2_trans_update_extent(trans, iter, k, flags);</div><div class='del'>-</div><div class='del'>-	if (bkey_deleted(&amp;k-&gt;k) &amp;&amp;</div><div class='del'>-	    !(flags &amp; BTREE_UPDATE_KEY_CACHE_RECLAIM) &amp;&amp;</div><div class='del'>-	    (iter-&gt;flags &amp; BTREE_ITER_FILTER_SNAPSHOTS)) {</div><div class='del'>-		ret = need_whiteout_for_snapshot(trans, iter-&gt;btree_id, k-&gt;k.p);</div><div class='del'>-		if (unlikely(ret &lt; 0))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			k-&gt;k.type = KEY_TYPE_whiteout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure that updates to cached btrees go to the key cache:</div><div class='del'>-	 */</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-	if (!(flags &amp; BTREE_UPDATE_KEY_CACHE_RECLAIM) &amp;&amp;</div><div class='del'>-	    !path-&gt;cached &amp;&amp;</div><div class='del'>-	    !path-&gt;level &amp;&amp;</div><div class='del'>-	    btree_id_cached(trans-&gt;c, path-&gt;btree_id)) {</div><div class='del'>-		ret = bch2_trans_update_get_key_cache(trans, iter, path);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		path_idx = iter-&gt;key_cache_path;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update_by_path(trans, path_idx, k, flags, _RET_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_insert_clone_trans(struct btree_trans *trans,</div><div class='del'>-				  enum btree_id btree,</div><div class='del'>-				  struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *n = bch2_trans_kmalloc(trans, bkey_bytes(&amp;k-&gt;k));</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bkey_copy(n, k);</div><div class='del'>-	return bch2_btree_insert_trans(trans, btree, n, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct jset_entry *__bch2_trans_jset_entry_alloc(struct btree_trans *trans, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	unsigned new_top = trans-&gt;journal_entries_u64s + u64s;</div><div class='del'>-	unsigned old_size = trans-&gt;journal_entries_size;</div><div class='del'>-</div><div class='del'>-	if (new_top &gt; trans-&gt;journal_entries_size) {</div><div class='del'>-		trans-&gt;journal_entries_size = roundup_pow_of_two(new_top);</div><div class='del'>-</div><div class='del'>-		btree_trans_stats(trans)-&gt;journal_entries_size = trans-&gt;journal_entries_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	struct jset_entry *n =</div><div class='del'>-		bch2_trans_kmalloc_nomemzero(trans,</div><div class='del'>-				trans-&gt;journal_entries_size * sizeof(u64));</div><div class='del'>-	if (IS_ERR(n))</div><div class='del'>-		return ERR_CAST(n);</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;journal_entries)</div><div class='del'>-		memcpy(n, trans-&gt;journal_entries, old_size * sizeof(u64));</div><div class='del'>-	trans-&gt;journal_entries = n;</div><div class='del'>-</div><div class='del'>-	struct jset_entry *e = btree_trans_journal_entries_top(trans);</div><div class='del'>-	trans-&gt;journal_entries_u64s = new_top;</div><div class='del'>-	return e;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_get_empty_slot(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			     enum btree_id btree, struct bpos end)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, iter, btree, POS_MAX, BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_prev(iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_advance(iter);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(k.k-&gt;type != KEY_TYPE_deleted);</div><div class='del'>-</div><div class='del'>-	if (bkey_gt(k.k-&gt;p, end)) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_btree_slot;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_commit_hook(struct btree_trans *trans,</div><div class='del'>-			    struct btree_trans_commit_hook *h)</div><div class='del'>-{</div><div class='del'>-	h-&gt;next = trans-&gt;hooks;</div><div class='del'>-	trans-&gt;hooks = h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_insert_nonextent(struct btree_trans *trans,</div><div class='del'>-				enum btree_id btree, struct bkey_i *k,</div><div class='del'>-				enum btree_update_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, btree, k-&gt;k.p,</div><div class='del'>-			     BTREE_ITER_CACHED|</div><div class='del'>-			     BTREE_ITER_NOT_EXTENTS|</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	ret   = bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_trans_update(trans, &amp;iter, k, flags);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_insert_trans(struct btree_trans *trans, enum btree_id id,</div><div class='del'>-			    struct bkey_i *k, enum btree_update_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, id, bkey_start_pos(&amp;k-&gt;k),</div><div class='del'>-			     BTREE_ITER_CACHED|</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	ret   = bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_trans_update(trans, &amp;iter, k, flags);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_insert - insert keys into the extent btree</div><div class='del'>- * @c:			pointer to struct bch_fs</div><div class='del'>- * @id:			btree to insert into</div><div class='del'>- * @k:			key to insert</div><div class='del'>- * @disk_res:		must be non-NULL whenever inserting or potentially</div><div class='del'>- *			splitting data extents</div><div class='del'>- * @flags:		transaction commit flags</div><div class='del'>- *</div><div class='del'>- * Returns:		0 on success, error code on failure</div><div class='del'>- */</div><div class='del'>-int bch2_btree_insert(struct bch_fs *c, enum btree_id id, struct bkey_i *k,</div><div class='del'>-		      struct disk_reservation *disk_res, int flags)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_do(c, disk_res, NULL, flags,</div><div class='del'>-			     bch2_btree_insert_trans(trans, id, k, 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_delete_extent_at(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-				unsigned len, unsigned update_flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-</div><div class='del'>-	k = bch2_trans_kmalloc(trans, sizeof(*k));</div><div class='del'>-	if (IS_ERR(k))</div><div class='del'>-		return PTR_ERR(k);</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;k-&gt;k);</div><div class='del'>-	k-&gt;k.p = iter-&gt;pos;</div><div class='del'>-	bch2_key_resize(&amp;k-&gt;k, len);</div><div class='del'>-	return bch2_trans_update(trans, iter, k, update_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_delete_at(struct btree_trans *trans,</div><div class='del'>-			 struct btree_iter *iter, unsigned update_flags)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_delete_extent_at(trans, iter, 0, update_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_delete(struct btree_trans *trans,</div><div class='del'>-		      enum btree_id btree, struct bpos pos,</div><div class='del'>-		      unsigned update_flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, btree, pos,</div><div class='del'>-			     BTREE_ITER_CACHED|</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	ret   = bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_btree_delete_at(trans, &amp;iter, update_flags);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_delete_range_trans(struct btree_trans *trans, enum btree_id id,</div><div class='del'>-				  struct bpos start, struct bpos end,</div><div class='del'>-				  unsigned update_flags,</div><div class='del'>-				  u64 *journal_seq)</div><div class='del'>-{</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, id, start, BTREE_ITER_INTENT);</div><div class='del'>-	while ((k = bch2_btree_iter_peek_upto(&amp;iter, end)).k) {</div><div class='del'>-		struct disk_reservation disk_res =</div><div class='del'>-			bch2_disk_reservation_init(trans-&gt;c, 0);</div><div class='del'>-		struct bkey_i delete;</div><div class='del'>-</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;delete.k);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This could probably be more efficient for extents:</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For extents, iter.pos won't necessarily be the same as</div><div class='del'>-		 * bkey_start_pos(k.k) (for non extents they always will be the</div><div class='del'>-		 * same). It's important that we delete starting from iter.pos</div><div class='del'>-		 * because the range we want to delete could start in the middle</div><div class='del'>-		 * of k.</div><div class='del'>-		 *</div><div class='del'>-		 * (bch2_btree_iter_peek() does guarantee that iter.pos &gt;=</div><div class='del'>-		 * bkey_start_pos(k.k)).</div><div class='del'>-		 */</div><div class='del'>-		delete.k.p = iter.pos;</div><div class='del'>-</div><div class='del'>-		if (iter.flags &amp; BTREE_ITER_IS_EXTENTS)</div><div class='del'>-			bch2_key_resize(&amp;delete.k,</div><div class='del'>-					bpos_min(end, k.k-&gt;p).offset -</div><div class='del'>-					iter.pos.offset);</div><div class='del'>-</div><div class='del'>-		ret   = bch2_trans_update(trans, &amp;iter, &amp;delete, update_flags) ?:</div><div class='del'>-			bch2_trans_commit(trans, &amp;disk_res, journal_seq,</div><div class='del'>-					  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-		bch2_disk_reservation_put(trans-&gt;c, &amp;disk_res);</div><div class='del'>-err:</div><div class='del'>-		/*</div><div class='del'>-		 * the bch2_trans_begin() call is in a weird place because we</div><div class='del'>-		 * need to call it after every transaction commit, to avoid path</div><div class='del'>-		 * overflow, but don't want to call it if the delete operation</div><div class='del'>-		 * is a no-op and we have no work to do:</div><div class='del'>-		 */</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			ret = 0;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret ?: trans_was_restarted(trans, restart_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch_btree_delete_range - delete everything within a given range</div><div class='del'>- *</div><div class='del'>- * Range is a half open interval - [start, end)</div><div class='del'>- */</div><div class='del'>-int bch2_btree_delete_range(struct bch_fs *c, enum btree_id id,</div><div class='del'>-			    struct bpos start, struct bpos end,</div><div class='del'>-			    unsigned update_flags,</div><div class='del'>-			    u64 *journal_seq)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-			bch2_btree_delete_range_trans(trans, id, start, end,</div><div class='del'>-						      update_flags, journal_seq));</div><div class='del'>-	if (ret == -BCH_ERR_transaction_restart_nested)</div><div class='del'>-		ret = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_bit_mod(struct btree_trans *trans, enum btree_id btree,</div><div class='del'>-		       struct bpos pos, bool set)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i k;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;k.k);</div><div class='del'>-	k.k.type = set ? KEY_TYPE_set : KEY_TYPE_deleted;</div><div class='del'>-	k.k.p = pos;</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update_buffered(trans, btree, &amp;k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_trans_log_msg(struct btree_trans *trans, struct printbuf *buf, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry *e = bch2_trans_jset_entry_alloc(trans, jset_u64s(u64s));</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(e);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	struct jset_entry_log *l = container_of(e, struct jset_entry_log, entry);</div><div class='del'>-	journal_entry_init(e, BCH_JSET_ENTRY_log, 0, 1, u64s);</div><div class='del'>-	memcpy(l-&gt;d, buf-&gt;buf, buf-&gt;pos);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__printf(3, 0)</div><div class='del'>-static int</div><div class='del'>-__bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt,</div><div class='del'>-		  va_list args)</div><div class='del'>-{</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	prt_vprintf(&amp;buf, fmt, args);</div><div class='del'>-</div><div class='del'>-	unsigned u64s = DIV_ROUND_UP(buf.pos, sizeof(u64));</div><div class='del'>-	prt_chars(&amp;buf, '\0', u64s * sizeof(u64) - buf.pos);</div><div class='del'>-</div><div class='del'>-	int ret = buf.allocation_failure ? -BCH_ERR_ENOMEM_trans_log_msg : 0;</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(JOURNAL_STARTED, &amp;c-&gt;journal.flags)) {</div><div class='del'>-		ret = darray_make_room(&amp;c-&gt;journal.early_journal_entries, jset_u64s(u64s));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		struct jset_entry_log *l = (void *) &amp;darray_top(c-&gt;journal.early_journal_entries);</div><div class='del'>-		journal_entry_init(&amp;l-&gt;entry, BCH_JSET_ENTRY_log, 0, 1, u64s);</div><div class='del'>-		memcpy(l-&gt;d, buf.buf, buf.pos);</div><div class='del'>-		c-&gt;journal.early_journal_entries.nr += jset_u64s(u64s);</div><div class='del'>-	} else {</div><div class='del'>-		ret = bch2_trans_do(c, NULL, NULL,</div><div class='del'>-			BCH_TRANS_COMMIT_lazy_rw|commit_flags,</div><div class='del'>-			__bch2_trans_log_msg(trans, &amp;buf, u64s));</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__printf(2, 3)</div><div class='del'>-int bch2_fs_log_msg(struct bch_fs *c, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	ret = __bch2_fs_log_msg(c, 0, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use for logging messages during recovery to enable reserved space and avoid</div><div class='del'>- * blocking.</div><div class='del'>- */</div><div class='del'>-__printf(2, 3)</div><div class='del'>-int bch2_journal_log_msg(struct bch_fs *c, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	ret = __bch2_fs_log_msg(c, BCH_WATERMARK_reclaim, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h<br/>deleted file mode 100644<br/>index b9382b7b288b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_update.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,361 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_UPDATE_H</div><div class='del'>-#define _BCACHEFS_BTREE_UPDATE_H</div><div class='del'>-</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct btree;</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_prep_for_write(struct btree_trans *,</div><div class='del'>-				    struct btree_path *, struct btree *);</div><div class='del'>-bool bch2_btree_bset_insert_key(struct btree_trans *, struct btree_path *,</div><div class='del'>-				struct btree *, struct btree_node_iter *,</div><div class='del'>-				struct bkey_i *);</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_flush0(struct journal *, struct journal_entry_pin *, u64);</div><div class='del'>-int bch2_btree_node_flush1(struct journal *, struct journal_entry_pin *, u64);</div><div class='del'>-void bch2_btree_add_journal_pin(struct bch_fs *, struct btree *, u64);</div><div class='del'>-</div><div class='del'>-void bch2_btree_insert_key_leaf(struct btree_trans *, struct btree_path *,</div><div class='del'>-				struct bkey_i *, u64);</div><div class='del'>-</div><div class='del'>-#define BCH_TRANS_COMMIT_FLAGS()							\</div><div class='del'>-	x(no_enospc,	"don't check for enospc")					\</div><div class='del'>-	x(no_check_rw,	"don't attempt to take a ref on c-&gt;writes")			\</div><div class='del'>-	x(lazy_rw,	"go read-write if we haven't yet - only for use in recovery")	\</div><div class='del'>-	x(no_journal_res, "don't take a journal reservation, instead "			\</div><div class='del'>-			"pin journal entry referred to by trans-&gt;journal_res.seq")	\</div><div class='del'>-	x(journal_reclaim, "operation required for journal reclaim; may return error"	\</div><div class='del'>-			"instead of deadlocking if BCH_WATERMARK_reclaim not specified")\</div><div class='del'>-</div><div class='del'>-enum __bch_trans_commit_flags {</div><div class='del'>-	/* First bits for bch_watermark: */</div><div class='del'>-	__BCH_TRANS_COMMIT_FLAGS_START = BCH_WATERMARK_BITS,</div><div class='del'>-#define x(n, ...)	__BCH_TRANS_COMMIT_##n,</div><div class='del'>-	BCH_TRANS_COMMIT_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bch_trans_commit_flags {</div><div class='del'>-#define x(n, ...)	BCH_TRANS_COMMIT_##n = BIT(__BCH_TRANS_COMMIT_##n),</div><div class='del'>-	BCH_TRANS_COMMIT_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_btree_delete_extent_at(struct btree_trans *, struct btree_iter *,</div><div class='del'>-				unsigned, unsigned);</div><div class='del'>-int bch2_btree_delete_at(struct btree_trans *, struct btree_iter *, unsigned);</div><div class='del'>-int bch2_btree_delete(struct btree_trans *, enum btree_id, struct bpos, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_btree_insert_nonextent(struct btree_trans *, enum btree_id,</div><div class='del'>-				struct bkey_i *, enum btree_update_flags);</div><div class='del'>-</div><div class='del'>-int bch2_btree_insert_trans(struct btree_trans *, enum btree_id, struct bkey_i *,</div><div class='del'>-			enum btree_update_flags);</div><div class='del'>-int bch2_btree_insert(struct bch_fs *, enum btree_id, struct bkey_i *,</div><div class='del'>-		     struct disk_reservation *, int flags);</div><div class='del'>-</div><div class='del'>-int bch2_btree_delete_range_trans(struct btree_trans *, enum btree_id,</div><div class='del'>-				  struct bpos, struct bpos, unsigned, u64 *);</div><div class='del'>-int bch2_btree_delete_range(struct bch_fs *, enum btree_id,</div><div class='del'>-			    struct bpos, struct bpos, unsigned, u64 *);</div><div class='del'>-</div><div class='del'>-int bch2_btree_bit_mod(struct btree_trans *, enum btree_id, struct bpos, bool);</div><div class='del'>-</div><div class='del'>-static inline int bch2_btree_delete_at_buffered(struct btree_trans *trans,</div><div class='del'>-						enum btree_id btree, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_bit_mod(trans, btree, pos, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_insert_snapshot_whiteouts(struct btree_trans *, enum btree_id,</div><div class='del'>-				     struct bpos, struct bpos);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For use when splitting extents in existing snapshots:</div><div class='del'>- *</div><div class='del'>- * If @old_pos is an interior snapshot node, iterate over descendent snapshot</div><div class='del'>- * nodes: for every descendent snapshot in whiche @old_pos is overwritten and</div><div class='del'>- * not visible, emit a whiteout at @new_pos.</div><div class='del'>- */</div><div class='del'>-static inline int bch2_insert_snapshot_whiteouts(struct btree_trans *trans,</div><div class='del'>-						 enum btree_id btree,</div><div class='del'>-						 struct bpos old_pos,</div><div class='del'>-						 struct bpos new_pos)</div><div class='del'>-{</div><div class='del'>-	if (!btree_type_has_snapshots(btree) ||</div><div class='del'>-	    bkey_eq(old_pos, new_pos))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return __bch2_insert_snapshot_whiteouts(trans, btree, old_pos, new_pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_update_extent_overwrite(struct btree_trans *, struct btree_iter *,</div><div class='del'>-				       enum btree_update_flags,</div><div class='del'>-				       struct bkey_s_c, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-int bch2_bkey_get_empty_slot(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			     enum btree_id, struct bpos);</div><div class='del'>-</div><div class='del'>-int __must_check bch2_trans_update(struct btree_trans *, struct btree_iter *,</div><div class='del'>-				   struct bkey_i *, enum btree_update_flags);</div><div class='del'>-</div><div class='del'>-struct jset_entry *__bch2_trans_jset_entry_alloc(struct btree_trans *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline struct jset_entry *btree_trans_journal_entries_top(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	return (void *) ((u64 *) trans-&gt;journal_entries + trans-&gt;journal_entries_u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct jset_entry *</div><div class='del'>-bch2_trans_jset_entry_alloc(struct btree_trans *trans, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	if (!trans-&gt;journal_entries ||</div><div class='del'>-	    trans-&gt;journal_entries_u64s + u64s &gt; trans-&gt;journal_entries_size)</div><div class='del'>-		return __bch2_trans_jset_entry_alloc(trans, u64s);</div><div class='del'>-</div><div class='del'>-	struct jset_entry *e = btree_trans_journal_entries_top(trans);</div><div class='del'>-	trans-&gt;journal_entries_u64s += u64s;</div><div class='del'>-	return e;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_insert_clone_trans(struct btree_trans *, enum btree_id, struct bkey_i *);</div><div class='del'>-</div><div class='del'>-static inline int __must_check bch2_trans_update_buffered(struct btree_trans *trans,</div><div class='del'>-					    enum btree_id btree,</div><div class='del'>-					    struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(trans-&gt;journal_replay_not_finished))</div><div class='del'>-		return bch2_btree_insert_clone_trans(trans, btree, k);</div><div class='del'>-</div><div class='del'>-	struct jset_entry *e = bch2_trans_jset_entry_alloc(trans, jset_u64s(k-&gt;k.u64s));</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(e);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	journal_entry_init(e, BCH_JSET_ENTRY_write_buffer_keys, btree, 0, k-&gt;k.u64s);</div><div class='del'>-	bkey_copy(e-&gt;start, k);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_commit_hook(struct btree_trans *,</div><div class='del'>-			    struct btree_trans_commit_hook *);</div><div class='del'>-int __bch2_trans_commit(struct btree_trans *, unsigned);</div><div class='del'>-</div><div class='del'>-__printf(2, 3) int bch2_fs_log_msg(struct bch_fs *, const char *, ...);</div><div class='del'>-__printf(2, 3) int bch2_journal_log_msg(struct bch_fs *, const char *, ...);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_trans_commit - insert keys at given iterator positions</div><div class='del'>- *</div><div class='del'>- * This is main entry point for btree updates.</div><div class='del'>- *</div><div class='del'>- * Return values:</div><div class='del'>- * -EROFS: filesystem read only</div><div class='del'>- * -EIO: journal or btree node IO error</div><div class='del'>- */</div><div class='del'>-static inline int bch2_trans_commit(struct btree_trans *trans,</div><div class='del'>-				    struct disk_reservation *disk_res,</div><div class='del'>-				    u64 *journal_seq,</div><div class='del'>-				    unsigned flags)</div><div class='del'>-{</div><div class='del'>-	trans-&gt;disk_res		= disk_res;</div><div class='del'>-	trans-&gt;journal_seq	= journal_seq;</div><div class='del'>-</div><div class='del'>-	return __bch2_trans_commit(trans, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define commit_do(_trans, _disk_res, _journal_seq, _flags, _do)	\</div><div class='del'>-	lockrestart_do(_trans, _do ?: bch2_trans_commit(_trans, (_disk_res),\</div><div class='del'>-					(_journal_seq), (_flags)))</div><div class='del'>-</div><div class='del'>-#define nested_commit_do(_trans, _disk_res, _journal_seq, _flags, _do)	\</div><div class='del'>-	nested_lockrestart_do(_trans, _do ?: bch2_trans_commit(_trans, (_disk_res),\</div><div class='del'>-					(_journal_seq), (_flags)))</div><div class='del'>-</div><div class='del'>-#define bch2_trans_run(_c, _do)						\</div><div class='del'>-({									\</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(_c);			\</div><div class='del'>-	int _ret = (_do);						\</div><div class='del'>-	bch2_trans_put(trans);						\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_trans_do(_c, _disk_res, _journal_seq, _flags, _do)		\</div><div class='del'>-	bch2_trans_run(_c, commit_do(trans, _disk_res, _journal_seq, _flags, _do))</div><div class='del'>-</div><div class='del'>-#define trans_for_each_update(_trans, _i)				\</div><div class='del'>-	for (struct btree_insert_entry *_i = (_trans)-&gt;updates;		\</div><div class='del'>-	     (_i) &lt; (_trans)-&gt;updates + (_trans)-&gt;nr_updates;		\</div><div class='del'>-	     (_i)++)</div><div class='del'>-</div><div class='del'>-static inline void bch2_trans_reset_updates(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	trans_for_each_update(trans, i)</div><div class='del'>-		bch2_path_put(trans, i-&gt;path, true);</div><div class='del'>-</div><div class='del'>-	trans-&gt;nr_updates		= 0;</div><div class='del'>-	trans-&gt;journal_entries_u64s	= 0;</div><div class='del'>-	trans-&gt;hooks			= NULL;</div><div class='del'>-	trans-&gt;extra_disk_res		= 0;</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;fs_usage_deltas) {</div><div class='del'>-		trans-&gt;fs_usage_deltas-&gt;used = 0;</div><div class='del'>-		memset((void *) trans-&gt;fs_usage_deltas +</div><div class='del'>-		       offsetof(struct replicas_delta_list, memset_start), 0,</div><div class='del'>-		       (void *) &amp;trans-&gt;fs_usage_deltas-&gt;memset_end -</div><div class='del'>-		       (void *) &amp;trans-&gt;fs_usage_deltas-&gt;memset_start);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *__bch2_bkey_make_mut_noupdate(struct btree_trans *trans, struct bkey_s_c k,</div><div class='del'>-						  unsigned type, unsigned min_bytes)</div><div class='del'>-{</div><div class='del'>-	unsigned bytes = max_t(unsigned, min_bytes, bkey_bytes(k.k));</div><div class='del'>-	struct bkey_i *mut;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; k.k-&gt;type != type)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-</div><div class='del'>-	mut = bch2_trans_kmalloc_nomemzero(trans, bytes);</div><div class='del'>-	if (!IS_ERR(mut)) {</div><div class='del'>-		bkey_reassemble(mut, k);</div><div class='del'>-</div><div class='del'>-		if (unlikely(bytes &gt; bkey_bytes(k.k))) {</div><div class='del'>-			memset((void *) mut + bkey_bytes(k.k), 0,</div><div class='del'>-			       bytes - bkey_bytes(k.k));</div><div class='del'>-			mut-&gt;k.u64s = DIV_ROUND_UP(bytes, sizeof(u64));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return mut;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bch2_bkey_make_mut_noupdate(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_make_mut_noupdate(trans, k, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_make_mut_noupdate_typed(_trans, _k, _type)		\</div><div class='del'>-	bkey_i_to_##_type(__bch2_bkey_make_mut_noupdate(_trans, _k,	\</div><div class='del'>-				KEY_TYPE_##_type, sizeof(struct bkey_i_##_type)))</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *__bch2_bkey_make_mut(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-					struct bkey_s_c *k, unsigned flags,</div><div class='del'>-					unsigned type, unsigned min_bytes)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *mut = __bch2_bkey_make_mut_noupdate(trans, *k, type, min_bytes);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(mut))</div><div class='del'>-		return mut;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, iter, mut, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	*k = bkey_i_to_s_c(mut);</div><div class='del'>-	return mut;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bch2_bkey_make_mut(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-						struct bkey_s_c *k, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_make_mut(trans, iter, k, flags, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_make_mut_typed(_trans, _iter, _k, _flags, _type)	\</div><div class='del'>-	bkey_i_to_##_type(__bch2_bkey_make_mut(_trans, _iter, _k, _flags,\</div><div class='del'>-				KEY_TYPE_##_type, sizeof(struct bkey_i_##_type)))</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *__bch2_bkey_get_mut_noupdate(struct btree_trans *trans,</div><div class='del'>-					 struct btree_iter *iter,</div><div class='del'>-					 unsigned btree_id, struct bpos pos,</div><div class='del'>-					 unsigned flags, unsigned type, unsigned min_bytes)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k = __bch2_bkey_get_iter(trans, iter,</div><div class='del'>-				btree_id, pos, flags|BTREE_ITER_INTENT, type);</div><div class='del'>-	struct bkey_i *ret = IS_ERR(k.k)</div><div class='del'>-		? ERR_CAST(k.k)</div><div class='del'>-		: __bch2_bkey_make_mut_noupdate(trans, k, 0, min_bytes);</div><div class='del'>-	if (IS_ERR(ret))</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bch2_bkey_get_mut_noupdate(struct btree_trans *trans,</div><div class='del'>-					       struct btree_iter *iter,</div><div class='del'>-					       unsigned btree_id, struct bpos pos,</div><div class='del'>-					       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_get_mut_noupdate(trans, iter, btree_id, pos, flags, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *__bch2_bkey_get_mut(struct btree_trans *trans,</div><div class='del'>-					 struct btree_iter *iter,</div><div class='del'>-					 unsigned btree_id, struct bpos pos,</div><div class='del'>-					 unsigned flags, unsigned type, unsigned min_bytes)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *mut = __bch2_bkey_get_mut_noupdate(trans, iter,</div><div class='del'>-				btree_id, pos, flags|BTREE_ITER_INTENT, type, min_bytes);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(mut))</div><div class='del'>-		return mut;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, iter, mut, flags);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mut;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bch2_bkey_get_mut_minsize(struct btree_trans *trans,</div><div class='del'>-						       struct btree_iter *iter,</div><div class='del'>-						       unsigned btree_id, struct bpos pos,</div><div class='del'>-						       unsigned flags, unsigned min_bytes)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_get_mut(trans, iter, btree_id, pos, flags, 0, min_bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bch2_bkey_get_mut(struct btree_trans *trans,</div><div class='del'>-					       struct btree_iter *iter,</div><div class='del'>-					       unsigned btree_id, struct bpos pos,</div><div class='del'>-					       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return __bch2_bkey_get_mut(trans, iter, btree_id, pos, flags, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_get_mut_typed(_trans, _iter, _btree_id, _pos, _flags, _type)\</div><div class='del'>-	bkey_i_to_##_type(__bch2_bkey_get_mut(_trans, _iter,		\</div><div class='del'>-			_btree_id, _pos, _flags,			\</div><div class='del'>-			KEY_TYPE_##_type, sizeof(struct bkey_i_##_type)))</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *__bch2_bkey_alloc(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-					       unsigned flags, unsigned type, unsigned val_size)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k = bch2_trans_kmalloc(trans, sizeof(*k) + val_size);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(k))</div><div class='del'>-		return k;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;k-&gt;k);</div><div class='del'>-	k-&gt;k.p = iter-&gt;pos;</div><div class='del'>-	k-&gt;k.type = type;</div><div class='del'>-	set_bkey_val_bytes(&amp;k-&gt;k, val_size);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, iter, k, flags);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_alloc(_trans, _iter, _flags, _type)			\</div><div class='del'>-	bkey_i_to_##_type(__bch2_bkey_alloc(_trans, _iter, _flags,	\</div><div class='del'>-				KEY_TYPE_##_type, sizeof(struct bch_##_type)))</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_UPDATE_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c<br/>deleted file mode 100644<br/>index 17a5938aa71a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_update_interior.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update_interior.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2496 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='del'>-static int bch2_btree_insert_node(struct btree_update *, struct btree_trans *,</div><div class='del'>-				  btree_path_idx_t, struct btree *,</div><div class='del'>-				  struct keylist *, unsigned);</div><div class='del'>-static void bch2_btree_update_add_new_node(struct btree_update *, struct btree *);</div><div class='del'>-</div><div class='del'>-static btree_path_idx_t get_unlocked_mut_path(struct btree_trans *trans,</div><div class='del'>-					      enum btree_id btree_id,</div><div class='del'>-					      unsigned level,</div><div class='del'>-					      struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	btree_path_idx_t path_idx = bch2_path_get(trans, btree_id, pos, level + 1, level,</div><div class='del'>-			     BTREE_ITER_NOPRESERVE|</div><div class='del'>-			     BTREE_ITER_INTENT, _RET_IP_);</div><div class='del'>-	path_idx = bch2_btree_path_make_mut(trans, path_idx, true, _RET_IP_);</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-	bch2_btree_path_downgrade(trans, path);</div><div class='del'>-	__bch2_btree_path_unlock(trans, path);</div><div class='del'>-	return path_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Debug code: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Verify that child nodes correctly span parent node's range:</div><div class='del'>- */</div><div class='del'>-static void btree_node_interior_verify(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	struct bpos next_node = b-&gt;data-&gt;min_key;</div><div class='del'>-	struct btree_node_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_s_c_btree_ptr_v2 bp;</div><div class='del'>-	struct bkey unpacked;</div><div class='del'>-	struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(JOURNAL_REPLAY_DONE, &amp;c-&gt;journal.flags))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_iter_init_from_start(&amp;iter, b);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		k = bch2_btree_node_iter_peek_unpack(&amp;iter, b, &amp;unpacked);</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_btree_ptr_v2)</div><div class='del'>-			break;</div><div class='del'>-		bp = bkey_s_c_to_btree_ptr_v2(k);</div><div class='del'>-</div><div class='del'>-		if (!bpos_eq(next_node, bp.v-&gt;min_key)) {</div><div class='del'>-			bch2_dump_btree_node(c, b);</div><div class='del'>-			bch2_bpos_to_text(&amp;buf1, next_node);</div><div class='del'>-			bch2_bpos_to_text(&amp;buf2, bp.v-&gt;min_key);</div><div class='del'>-			panic("expected next min_key %s got %s\n", buf1.buf, buf2.buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_iter_advance(&amp;iter, b);</div><div class='del'>-</div><div class='del'>-		if (bch2_btree_node_iter_end(&amp;iter)) {</div><div class='del'>-			if (!bpos_eq(k.k-&gt;p, b-&gt;key.k.p)) {</div><div class='del'>-				bch2_dump_btree_node(c, b);</div><div class='del'>-				bch2_bpos_to_text(&amp;buf1, b-&gt;key.k.p);</div><div class='del'>-				bch2_bpos_to_text(&amp;buf2, k.k-&gt;p);</div><div class='del'>-				panic("expected end %s got %s\n", buf1.buf, buf2.buf);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		next_node = bpos_successor(k.k-&gt;p);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calculate ideal packed bkey format for new btree nodes: */</div><div class='del'>-</div><div class='del'>-static void __bch2_btree_calc_format(struct bkey_format_state *s, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct bset_tree *t;</div><div class='del'>-	struct bkey uk;</div><div class='del'>-</div><div class='del'>-	for_each_bset(b, t)</div><div class='del'>-		bset_tree_for_each_key(b, t, k)</div><div class='del'>-			if (!bkey_deleted(k)) {</div><div class='del'>-				uk = bkey_unpack_key(b, k);</div><div class='del'>-				bch2_bkey_format_add_key(s, &amp;uk);</div><div class='del'>-			}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_format bch2_btree_calc_format(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_format_state s;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_format_init(&amp;s);</div><div class='del'>-	bch2_bkey_format_add_pos(&amp;s, b-&gt;data-&gt;min_key);</div><div class='del'>-	bch2_bkey_format_add_pos(&amp;s, b-&gt;data-&gt;max_key);</div><div class='del'>-	__bch2_btree_calc_format(&amp;s, b);</div><div class='del'>-</div><div class='del'>-	return bch2_bkey_format_done(&amp;s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t btree_node_u64s_with_format(struct btree_nr_keys nr,</div><div class='del'>-					  struct bkey_format *old_f,</div><div class='del'>-					  struct bkey_format *new_f)</div><div class='del'>-{</div><div class='del'>-	/* stupid integer promotion rules */</div><div class='del'>-	ssize_t delta =</div><div class='del'>-	    (((int) new_f-&gt;key_u64s - old_f-&gt;key_u64s) *</div><div class='del'>-	     (int) nr.packed_keys) +</div><div class='del'>-	    (((int) new_f-&gt;key_u64s - BKEY_U64s) *</div><div class='del'>-	     (int) nr.unpacked_keys);</div><div class='del'>-</div><div class='del'>-	BUG_ON(delta + nr.live_u64s &lt; 0);</div><div class='del'>-</div><div class='del'>-	return nr.live_u64s + delta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_node_format_fits - check if we could rewrite node with a new format</div><div class='del'>- *</div><div class='del'>- * @c:		filesystem handle</div><div class='del'>- * @b:		btree node to rewrite</div><div class='del'>- * @nr:		number of keys for new node (i.e. b-&gt;nr)</div><div class='del'>- * @new_f:	bkey format to translate keys to</div><div class='del'>- *</div><div class='del'>- * Returns: true if all re-packed keys will be able to fit in a new node.</div><div class='del'>- *</div><div class='del'>- * Assumes all keys will successfully pack with the new format.</div><div class='del'>- */</div><div class='del'>-static bool bch2_btree_node_format_fits(struct bch_fs *c, struct btree *b,</div><div class='del'>-				 struct btree_nr_keys nr,</div><div class='del'>-				 struct bkey_format *new_f)</div><div class='del'>-{</div><div class='del'>-	size_t u64s = btree_node_u64s_with_format(nr, &amp;b-&gt;format, new_f);</div><div class='del'>-</div><div class='del'>-	return __vstruct_bytes(struct btree_node, u64s) &lt; btree_buf_bytes(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree node freeing/allocation: */</div><div class='del'>-</div><div class='del'>-static void __btree_node_free(struct btree_trans *trans, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_free, trans, b);</div><div class='del'>-</div><div class='del'>-	BUG_ON(btree_node_write_blocked(b));</div><div class='del'>-	BUG_ON(btree_node_dirty(b));</div><div class='del'>-	BUG_ON(btree_node_need_write(b));</div><div class='del'>-	BUG_ON(b == btree_node_root(c, b));</div><div class='del'>-	BUG_ON(b-&gt;ob.nr);</div><div class='del'>-	BUG_ON(!list_empty(&amp;b-&gt;write_blocked));</div><div class='del'>-	BUG_ON(b-&gt;will_make_reachable);</div><div class='del'>-</div><div class='del'>-	clear_btree_node_noevict(b);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	list_move(&amp;b-&gt;list, &amp;c-&gt;btree_cache.freeable);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_node_free_inmem(struct btree_trans *trans,</div><div class='del'>-				       struct btree_path *path,</div><div class='del'>-				       struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	unsigned i, level = b-&gt;c.level;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_lock_write_nofail(trans, path, &amp;b-&gt;c);</div><div class='del'>-	bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-	__btree_node_free(trans, b);</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-	mark_btree_node_locked_noreset(path, level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path-&gt;l[level].b == b) {</div><div class='del'>-			btree_node_unlock(trans, path, level);</div><div class='del'>-			path-&gt;l[level].b = ERR_PTR(-BCH_ERR_no_btree_node_init);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_node_free_never_used(struct btree_update *as,</div><div class='del'>-					    struct btree_trans *trans,</div><div class='del'>-					    struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct prealloc_nodes *p = &amp;as-&gt;prealloc_nodes[b-&gt;c.lock.readers != NULL];</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	unsigned i, level = b-&gt;c.level;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!list_empty(&amp;b-&gt;write_blocked));</div><div class='del'>-	BUG_ON(b-&gt;will_make_reachable != (1UL|(unsigned long) as));</div><div class='del'>-</div><div class='del'>-	b-&gt;will_make_reachable = 0;</div><div class='del'>-	closure_put(&amp;as-&gt;cl);</div><div class='del'>-</div><div class='del'>-	clear_btree_node_will_make_reachable(b);</div><div class='del'>-	clear_btree_node_accessed(b);</div><div class='del'>-	clear_btree_node_dirty_acct(c, b);</div><div class='del'>-	clear_btree_node_need_write(b);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	list_del_init(&amp;b-&gt;list);</div><div class='del'>-	bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(p-&gt;nr &gt;= ARRAY_SIZE(p-&gt;b));</div><div class='del'>-	p-&gt;b[p-&gt;nr++] = b;</div><div class='del'>-</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path(trans, path, i)</div><div class='del'>-		if (path-&gt;l[level].b == b) {</div><div class='del'>-			btree_node_unlock(trans, path, level);</div><div class='del'>-			path-&gt;l[level].b = ERR_PTR(-BCH_ERR_no_btree_node_init);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *__bch2_btree_node_alloc(struct btree_trans *trans,</div><div class='del'>-					     struct disk_reservation *res,</div><div class='del'>-					     struct closure *cl,</div><div class='del'>-					     bool interior_node,</div><div class='del'>-					     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	BKEY_PADDED_ONSTACK(k, BKEY_BTREE_PTR_VAL_U64s_MAX) tmp;</div><div class='del'>-	struct open_buckets obs = { .nr = 0 };</div><div class='del'>-	struct bch_devs_list devs_have = (struct bch_devs_list) { 0 };</div><div class='del'>-	enum bch_watermark watermark = flags &amp; BCH_WATERMARK_MASK;</div><div class='del'>-	unsigned nr_reserve = watermark &gt; BCH_WATERMARK_reclaim</div><div class='del'>-		? BTREE_NODE_RESERVE</div><div class='del'>-		: 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-	if (c-&gt;btree_reserve_cache_nr &gt; nr_reserve) {</div><div class='del'>-		struct btree_alloc *a =</div><div class='del'>-			&amp;c-&gt;btree_reserve_cache[--c-&gt;btree_reserve_cache_nr];</div><div class='del'>-</div><div class='del'>-		obs = a-&gt;ob;</div><div class='del'>-		bkey_copy(&amp;tmp.k, &amp;a-&gt;k);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-		goto mem_alloc;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	ret = bch2_alloc_sectors_start_trans(trans,</div><div class='del'>-				      c-&gt;opts.metadata_target ?:</div><div class='del'>-				      c-&gt;opts.foreground_target,</div><div class='del'>-				      0,</div><div class='del'>-				      writepoint_ptr(&amp;c-&gt;btree_write_point),</div><div class='del'>-				      &amp;devs_have,</div><div class='del'>-				      res-&gt;nr_replicas,</div><div class='del'>-				      c-&gt;opts.metadata_replicas_required,</div><div class='del'>-				      watermark, 0, cl, &amp;wp);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (wp-&gt;sectors_free &lt; btree_sectors(c)) {</div><div class='del'>-		struct open_bucket *ob;</div><div class='del'>-		unsigned i;</div><div class='del'>-</div><div class='del'>-		open_bucket_for_each(c, &amp;wp-&gt;ptrs, ob, i)</div><div class='del'>-			if (ob-&gt;sectors_free &lt; btree_sectors(c))</div><div class='del'>-				ob-&gt;sectors_free = 0;</div><div class='del'>-</div><div class='del'>-		bch2_alloc_sectors_done(c, wp);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_btree_ptr_v2_init(&amp;tmp.k);</div><div class='del'>-	bch2_alloc_sectors_append_ptrs(c, wp, &amp;tmp.k, btree_sectors(c), false);</div><div class='del'>-</div><div class='del'>-	bch2_open_bucket_get(c, wp, &amp;obs);</div><div class='del'>-	bch2_alloc_sectors_done(c, wp);</div><div class='del'>-mem_alloc:</div><div class='del'>-	b = bch2_btree_node_mem_alloc(trans, interior_node);</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	/* we hold cannibalize_lock: */</div><div class='del'>-	BUG_ON(IS_ERR(b));</div><div class='del'>-	BUG_ON(b-&gt;ob.nr);</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;b-&gt;key, &amp;tmp.k);</div><div class='del'>-	b-&gt;ob = obs;</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *bch2_btree_node_alloc(struct btree_update *as,</div><div class='del'>-					   struct btree_trans *trans,</div><div class='del'>-					   unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct prealloc_nodes *p = &amp;as-&gt;prealloc_nodes[!!level];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(level &gt;= BTREE_MAX_DEPTH);</div><div class='del'>-	BUG_ON(!p-&gt;nr);</div><div class='del'>-</div><div class='del'>-	b = p-&gt;b[--p-&gt;nr];</div><div class='del'>-</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_intent);</div><div class='del'>-	btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_write);</div><div class='del'>-</div><div class='del'>-	set_btree_node_accessed(b);</div><div class='del'>-	set_btree_node_dirty_acct(c, b);</div><div class='del'>-	set_btree_node_need_write(b);</div><div class='del'>-</div><div class='del'>-	bch2_bset_init_first(b, &amp;b-&gt;data-&gt;keys);</div><div class='del'>-	b-&gt;c.level	= level;</div><div class='del'>-	b-&gt;c.btree_id	= as-&gt;btree_id;</div><div class='del'>-	b-&gt;version_ondisk = c-&gt;sb.version;</div><div class='del'>-</div><div class='del'>-	memset(&amp;b-&gt;nr, 0, sizeof(b-&gt;nr));</div><div class='del'>-	b-&gt;data-&gt;magic = cpu_to_le64(bset_magic(c));</div><div class='del'>-	memset(&amp;b-&gt;data-&gt;_ptr, 0, sizeof(b-&gt;data-&gt;_ptr));</div><div class='del'>-	b-&gt;data-&gt;flags = 0;</div><div class='del'>-	SET_BTREE_NODE_ID(b-&gt;data, as-&gt;btree_id);</div><div class='del'>-	SET_BTREE_NODE_LEVEL(b-&gt;data, level);</div><div class='del'>-</div><div class='del'>-	if (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-		struct bkey_i_btree_ptr_v2 *bp = bkey_i_to_btree_ptr_v2(&amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-		bp-&gt;v.mem_ptr		= 0;</div><div class='del'>-		bp-&gt;v.seq		= b-&gt;data-&gt;keys.seq;</div><div class='del'>-		bp-&gt;v.sectors_written	= 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SET_BTREE_NODE_NEW_EXTENT_OVERWRITE(b-&gt;data, true);</div><div class='del'>-</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache, b, level, as-&gt;btree_id);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_alloc, trans, b);</div><div class='del'>-	bch2_increment_clock(c, btree_sectors(c), WRITE);</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_set_min(struct btree *b, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	if (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2)</div><div class='del'>-		bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v.min_key = pos;</div><div class='del'>-	b-&gt;data-&gt;min_key = pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_set_max(struct btree *b, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	b-&gt;key.k.p = pos;</div><div class='del'>-	b-&gt;data-&gt;max_key = pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *bch2_btree_node_alloc_replacement(struct btree_update *as,</div><div class='del'>-						       struct btree_trans *trans,</div><div class='del'>-						       struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree *n = bch2_btree_node_alloc(as, trans, b-&gt;c.level);</div><div class='del'>-	struct bkey_format format = bch2_btree_calc_format(b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The keys might expand with the new format - if they wouldn't fit in</div><div class='del'>-	 * the btree node anymore, use the old format for now:</div><div class='del'>-	 */</div><div class='del'>-	if (!bch2_btree_node_format_fits(as-&gt;c, b, b-&gt;nr, &amp;format))</div><div class='del'>-		format = b-&gt;format;</div><div class='del'>-</div><div class='del'>-	SET_BTREE_NODE_SEQ(n-&gt;data, BTREE_NODE_SEQ(b-&gt;data) + 1);</div><div class='del'>-</div><div class='del'>-	btree_set_min(n, b-&gt;data-&gt;min_key);</div><div class='del'>-	btree_set_max(n, b-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-	n-&gt;data-&gt;format		= format;</div><div class='del'>-	btree_node_set_format(n, format);</div><div class='del'>-</div><div class='del'>-	bch2_btree_sort_into(as-&gt;c, n, b);</div><div class='del'>-</div><div class='del'>-	btree_node_reset_sib_u64s(n);</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree *__btree_root_alloc(struct btree_update *as,</div><div class='del'>-				struct btree_trans *trans, unsigned level)</div><div class='del'>-{</div><div class='del'>-	struct btree *b = bch2_btree_node_alloc(as, trans, level);</div><div class='del'>-</div><div class='del'>-	btree_set_min(b, POS_MIN);</div><div class='del'>-	btree_set_max(b, SPOS_MAX);</div><div class='del'>-	b-&gt;data-&gt;format = bch2_btree_calc_format(b);</div><div class='del'>-</div><div class='del'>-	btree_node_set_format(b, b-&gt;data-&gt;format);</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_reserve_put(struct btree_update *as, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct prealloc_nodes *p;</div><div class='del'>-</div><div class='del'>-	for (p = as-&gt;prealloc_nodes;</div><div class='del'>-	     p &lt; as-&gt;prealloc_nodes + ARRAY_SIZE(as-&gt;prealloc_nodes);</div><div class='del'>-	     p++) {</div><div class='del'>-		while (p-&gt;nr) {</div><div class='del'>-			struct btree *b = p-&gt;b[--p-&gt;nr];</div><div class='del'>-</div><div class='del'>-			mutex_lock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-</div><div class='del'>-			if (c-&gt;btree_reserve_cache_nr &lt;</div><div class='del'>-			    ARRAY_SIZE(c-&gt;btree_reserve_cache)) {</div><div class='del'>-				struct btree_alloc *a =</div><div class='del'>-					&amp;c-&gt;btree_reserve_cache[c-&gt;btree_reserve_cache_nr++];</div><div class='del'>-</div><div class='del'>-				a-&gt;ob = b-&gt;ob;</div><div class='del'>-				b-&gt;ob.nr = 0;</div><div class='del'>-				bkey_copy(&amp;a-&gt;k, &amp;b-&gt;key);</div><div class='del'>-			} else {</div><div class='del'>-				bch2_open_buckets_put(c, &amp;b-&gt;ob);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mutex_unlock(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-</div><div class='del'>-			btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_intent);</div><div class='del'>-			btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_write);</div><div class='del'>-			__btree_node_free(trans, b);</div><div class='del'>-			six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-			six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_reserve_get(struct btree_trans *trans,</div><div class='del'>-				  struct btree_update *as,</div><div class='del'>-				  unsigned nr_nodes[2],</div><div class='del'>-				  unsigned flags,</div><div class='del'>-				  struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct btree *b;</div><div class='del'>-	unsigned interior;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(nr_nodes[0] + nr_nodes[1] &gt; BTREE_RESERVE_MAX);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Protects reaping from the btree node cache and using the btree node</div><div class='del'>-	 * open bucket reserve:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_btree_cache_cannibalize_lock(trans, cl);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for (interior = 0; interior &lt; 2; interior++) {</div><div class='del'>-		struct prealloc_nodes *p = as-&gt;prealloc_nodes + interior;</div><div class='del'>-</div><div class='del'>-		while (p-&gt;nr &lt; nr_nodes[interior]) {</div><div class='del'>-			b = __bch2_btree_node_alloc(trans, &amp;as-&gt;disk_res, cl,</div><div class='del'>-						    interior, flags);</div><div class='del'>-			if (IS_ERR(b)) {</div><div class='del'>-				ret = PTR_ERR(b);</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			p-&gt;b[p-&gt;nr++] = b;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_btree_cache_cannibalize_unlock(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Asynchronous interior node update machinery */</div><div class='del'>-</div><div class='del'>-static void bch2_btree_update_free(struct btree_update *as, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-</div><div class='del'>-	if (as-&gt;took_gc_lock)</div><div class='del'>-		up_read(&amp;c-&gt;gc_lock);</div><div class='del'>-	as-&gt;took_gc_lock = false;</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;as-&gt;journal);</div><div class='del'>-	bch2_journal_pin_flush(&amp;c-&gt;journal, &amp;as-&gt;journal);</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;as-&gt;disk_res);</div><div class='del'>-	bch2_btree_reserve_put(as, trans);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_interior_update_total],</div><div class='del'>-			       as-&gt;start_time);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	list_del(&amp;as-&gt;unwritten_list);</div><div class='del'>-	list_del(&amp;as-&gt;list);</div><div class='del'>-</div><div class='del'>-	closure_debug_destroy(&amp;as-&gt;cl);</div><div class='del'>-	mempool_free(as, &amp;c-&gt;btree_interior_update_pool);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Have to do the wakeup with btree_interior_update_lock still held,</div><div class='del'>-	 * since being on btree_interior_update_list is our ref on @c:</div><div class='del'>-	 */</div><div class='del'>-	closure_wake_up(&amp;c-&gt;btree_interior_update_wait);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_update_add_key(struct btree_update *as,</div><div class='del'>-				 struct keylist *keys, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k = &amp;b-&gt;key;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_keylist_u64s(keys) + k-&gt;k.u64s &gt;</div><div class='del'>-	       ARRAY_SIZE(as-&gt;_old_keys));</div><div class='del'>-</div><div class='del'>-	bkey_copy(keys-&gt;top, k);</div><div class='del'>-	bkey_i_to_btree_ptr_v2(keys-&gt;top)-&gt;v.mem_ptr = b-&gt;c.level + 1;</div><div class='del'>-</div><div class='del'>-	bch2_keylist_push(keys);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The transactional part of an interior btree node update, where we journal the</div><div class='del'>- * update we did to the interior node and update alloc info:</div><div class='del'>- */</div><div class='del'>-static int btree_update_nodes_written_trans(struct btree_trans *trans,</div><div class='del'>-					    struct btree_update *as)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry *e = bch2_trans_jset_entry_alloc(trans, as-&gt;journal_u64s);</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(e);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	memcpy(e, as-&gt;journal_entries, as-&gt;journal_u64s * sizeof(u64));</div><div class='del'>-</div><div class='del'>-	trans-&gt;journal_pin = &amp;as-&gt;journal;</div><div class='del'>-</div><div class='del'>-	for_each_keylist_key(&amp;as-&gt;old_keys, k) {</div><div class='del'>-		unsigned level = bkey_i_to_btree_ptr_v2(k)-&gt;v.mem_ptr;</div><div class='del'>-</div><div class='del'>-		ret = bch2_key_trigger_old(trans, as-&gt;btree_id, level, bkey_i_to_s_c(k),</div><div class='del'>-					   BTREE_TRIGGER_TRANSACTIONAL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_keylist_key(&amp;as-&gt;new_keys, k) {</div><div class='del'>-		unsigned level = bkey_i_to_btree_ptr_v2(k)-&gt;v.mem_ptr;</div><div class='del'>-</div><div class='del'>-		ret = bch2_key_trigger_new(trans, as-&gt;btree_id, level, bkey_i_to_s(k),</div><div class='del'>-					   BTREE_TRIGGER_TRANSACTIONAL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_update_nodes_written(struct btree_update *as)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	u64 journal_seq = 0;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're already in an error state, it might be because a btree node</div><div class='del'>-	 * was never written, and we might be trying to free that same btree</div><div class='del'>-	 * node here, but it won't have been marked as allocated and we'll see</div><div class='del'>-	 * spurious disk usage inconsistencies in the transactional part below</div><div class='del'>-	 * if we don't skip it:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_journal_error(&amp;c-&gt;journal);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for any in flight writes to finish before we free the old nodes</div><div class='del'>-	 * on disk:</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; as-&gt;nr_old_nodes; i++) {</div><div class='del'>-		__le64 seq;</div><div class='del'>-</div><div class='del'>-		b = as-&gt;old_nodes[i];</div><div class='del'>-</div><div class='del'>-		btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_read);</div><div class='del'>-		seq = b-&gt;data ? b-&gt;data-&gt;keys.seq : 0;</div><div class='del'>-		six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-		if (seq == as-&gt;old_nodes_seq[i])</div><div class='del'>-			wait_on_bit_io(&amp;b-&gt;flags, BTREE_NODE_write_in_flight_inner,</div><div class='del'>-				       TASK_UNINTERRUPTIBLE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We did an update to a parent node where the pointers we added pointed</div><div class='del'>-	 * to child nodes that weren't written yet: now, the child nodes have</div><div class='del'>-	 * been written so we can write out the update to the interior node.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't call into journal reclaim here: we'd block on the journal</div><div class='del'>-	 * reclaim lock, but we may need to release the open buckets we have</div><div class='del'>-	 * pinned in order for other btree updates to make forward progress, and</div><div class='del'>-	 * journal reclaim does btree updates when flushing bkey_cached entries,</div><div class='del'>-	 * which may require allocations as well.</div><div class='del'>-	 */</div><div class='del'>-	ret = commit_do(trans, &amp;as-&gt;disk_res, &amp;journal_seq,</div><div class='del'>-			BCH_WATERMARK_reclaim|</div><div class='del'>-			BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-			BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-			BCH_TRANS_COMMIT_journal_reclaim,</div><div class='del'>-			btree_update_nodes_written_trans(trans, as));</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	bch2_fs_fatal_err_on(ret &amp;&amp; !bch2_journal_error(&amp;c-&gt;journal), c,</div><div class='del'>-			     "%s(): error %s", __func__, bch2_err_str(ret));</div><div class='del'>-err:</div><div class='del'>-	if (as-&gt;b) {</div><div class='del'>-</div><div class='del'>-		b = as-&gt;b;</div><div class='del'>-		btree_path_idx_t path_idx = get_unlocked_mut_path(trans,</div><div class='del'>-						as-&gt;btree_id, b-&gt;c.level, b-&gt;key.k.p);</div><div class='del'>-		struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-		/*</div><div class='del'>-		 * @b is the node we did the final insert into:</div><div class='del'>-		 *</div><div class='del'>-		 * On failure to get a journal reservation, we still have to</div><div class='del'>-		 * unblock the write and allow most of the write path to happen</div><div class='del'>-		 * so that shutdown works, but the i-&gt;journal_seq mechanism</div><div class='del'>-		 * won't work to prevent the btree write from being visible (we</div><div class='del'>-		 * didn't get a journal sequence number) - instead</div><div class='del'>-		 * __bch2_btree_node_write() doesn't do the actual write if</div><div class='del'>-		 * we're in journal error state:</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Ensure transaction is unlocked before using</div><div class='del'>-		 * btree_node_lock_nopath() (the use of which is always suspect,</div><div class='del'>-		 * we need to work on removing this in the future)</div><div class='del'>-		 *</div><div class='del'>-		 * It should be, but get_unlocked_mut_path() -&gt; bch2_path_get()</div><div class='del'>-		 * calls bch2_path_upgrade(), before we call path_make_mut(), so</div><div class='del'>-		 * we may rarely end up with a locked path besides the one we</div><div class='del'>-		 * have here:</div><div class='del'>-		 */</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_intent);</div><div class='del'>-		mark_btree_node_locked(trans, path, b-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-		path-&gt;l[b-&gt;c.level].lock_seq = six_lock_seq(&amp;b-&gt;c.lock);</div><div class='del'>-		path-&gt;l[b-&gt;c.level].b = b;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_lock_write_nofail(trans, path, &amp;b-&gt;c);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-		list_del(&amp;as-&gt;write_blocked_list);</div><div class='del'>-		if (list_empty(&amp;b-&gt;write_blocked))</div><div class='del'>-			clear_btree_node_write_blocked(b);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Node might have been freed, recheck under</div><div class='del'>-		 * btree_interior_update_lock:</div><div class='del'>-		 */</div><div class='del'>-		if (as-&gt;b == b) {</div><div class='del'>-			BUG_ON(!b-&gt;c.level);</div><div class='del'>-			BUG_ON(!btree_node_dirty(b));</div><div class='del'>-</div><div class='del'>-			if (!ret) {</div><div class='del'>-				struct bset *last = btree_bset_last(b);</div><div class='del'>-</div><div class='del'>-				last-&gt;journal_seq = cpu_to_le64(</div><div class='del'>-							     max(journal_seq,</div><div class='del'>-								 le64_to_cpu(last-&gt;journal_seq)));</div><div class='del'>-</div><div class='del'>-				bch2_btree_add_journal_pin(c, b, journal_seq);</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * If we didn't get a journal sequence number we</div><div class='del'>-				 * can't write this btree node, because recovery</div><div class='del'>-				 * won't know to ignore this write:</div><div class='del'>-				 */</div><div class='del'>-				set_btree_node_never_write(b);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-		mark_btree_node_locked_noreset(path, b-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-		six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-		btree_node_write_if_need(c, b, SIX_LOCK_intent);</div><div class='del'>-		btree_node_unlock(trans, path, b-&gt;c.level);</div><div class='del'>-		bch2_path_put(trans, path_idx, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;as-&gt;journal);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	for (i = 0; i &lt; as-&gt;nr_new_nodes; i++) {</div><div class='del'>-		b = as-&gt;new_nodes[i];</div><div class='del'>-</div><div class='del'>-		BUG_ON(b-&gt;will_make_reachable != (unsigned long) as);</div><div class='del'>-		b-&gt;will_make_reachable = 0;</div><div class='del'>-		clear_btree_node_will_make_reachable(b);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; as-&gt;nr_new_nodes; i++) {</div><div class='del'>-		b = as-&gt;new_nodes[i];</div><div class='del'>-</div><div class='del'>-		btree_node_lock_nopath_nofail(trans, &amp;b-&gt;c, SIX_LOCK_read);</div><div class='del'>-		btree_node_write_if_need(c, b, SIX_LOCK_read);</div><div class='del'>-		six_unlock_read(&amp;b-&gt;c.lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; as-&gt;nr_open_buckets; i++)</div><div class='del'>-		bch2_open_bucket_put(c, c-&gt;open_buckets + as-&gt;open_buckets[i]);</div><div class='del'>-</div><div class='del'>-	bch2_btree_update_free(as, trans);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_interior_update_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c =</div><div class='del'>-		container_of(work, struct bch_fs, btree_interior_update_work);</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-		as = list_first_entry_or_null(&amp;c-&gt;btree_interior_updates_unwritten,</div><div class='del'>-					      struct btree_update, unwritten_list);</div><div class='del'>-		if (as &amp;&amp; !as-&gt;nodes_written)</div><div class='del'>-			as = NULL;</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-		if (!as)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		btree_update_nodes_written(as);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(btree_update_set_nodes_written)</div><div class='del'>-{</div><div class='del'>-	closure_type(as, struct btree_update, cl);</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	as-&gt;nodes_written = true;</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	queue_work(c-&gt;btree_interior_update_worker, &amp;c-&gt;btree_interior_update_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We're updating @b with pointers to nodes that haven't finished writing yet:</div><div class='del'>- * block @b from being written until @as completes</div><div class='del'>- */</div><div class='del'>-static void btree_update_updated_node(struct btree_update *as, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	list_add_tail(&amp;as-&gt;unwritten_list, &amp;c-&gt;btree_interior_updates_unwritten);</div><div class='del'>-</div><div class='del'>-	BUG_ON(as-&gt;mode != BTREE_INTERIOR_NO_UPDATE);</div><div class='del'>-	BUG_ON(!btree_node_dirty(b));</div><div class='del'>-	BUG_ON(!b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-	as-&gt;mode	= BTREE_INTERIOR_UPDATING_NODE;</div><div class='del'>-	as-&gt;b		= b;</div><div class='del'>-</div><div class='del'>-	set_btree_node_write_blocked(b);</div><div class='del'>-	list_add(&amp;as-&gt;write_blocked_list, &amp;b-&gt;write_blocked);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_update_reparent_journal_pin_flush(struct journal *j,</div><div class='del'>-				struct journal_entry_pin *_pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_update_reparent(struct btree_update *as,</div><div class='del'>-				  struct btree_update *child)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	child-&gt;b = NULL;</div><div class='del'>-	child-&gt;mode = BTREE_INTERIOR_UPDATING_AS;</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_copy(&amp;c-&gt;journal, &amp;as-&gt;journal, &amp;child-&gt;journal,</div><div class='del'>-			      bch2_update_reparent_journal_pin_flush);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btree_update_updated_root(struct btree_update *as, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *insert = &amp;b-&gt;key;</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-</div><div class='del'>-	BUG_ON(as-&gt;mode != BTREE_INTERIOR_NO_UPDATE);</div><div class='del'>-</div><div class='del'>-	BUG_ON(as-&gt;journal_u64s + jset_u64s(insert-&gt;k.u64s) &gt;</div><div class='del'>-	       ARRAY_SIZE(as-&gt;journal_entries));</div><div class='del'>-</div><div class='del'>-	as-&gt;journal_u64s +=</div><div class='del'>-		journal_entry_set((void *) &amp;as-&gt;journal_entries[as-&gt;journal_u64s],</div><div class='del'>-				  BCH_JSET_ENTRY_btree_root,</div><div class='del'>-				  b-&gt;c.btree_id, b-&gt;c.level,</div><div class='del'>-				  insert, insert-&gt;k.u64s);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	list_add_tail(&amp;as-&gt;unwritten_list, &amp;c-&gt;btree_interior_updates_unwritten);</div><div class='del'>-</div><div class='del'>-	as-&gt;mode	= BTREE_INTERIOR_UPDATING_ROOT;</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch2_btree_update_add_new_node:</div><div class='del'>- *</div><div class='del'>- * This causes @as to wait on @b to be written, before it gets to</div><div class='del'>- * bch2_btree_update_nodes_written</div><div class='del'>- *</div><div class='del'>- * Additionally, it sets b-&gt;will_make_reachable to prevent any additional writes</div><div class='del'>- * to @b from happening besides the first until @b is reachable on disk</div><div class='del'>- *</div><div class='del'>- * And it adds @b to the list of @as's new nodes, so that we can update sector</div><div class='del'>- * counts in bch2_btree_update_nodes_written:</div><div class='del'>- */</div><div class='del'>-static void bch2_btree_update_add_new_node(struct btree_update *as, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-</div><div class='del'>-	closure_get(&amp;as-&gt;cl);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	BUG_ON(as-&gt;nr_new_nodes &gt;= ARRAY_SIZE(as-&gt;new_nodes));</div><div class='del'>-	BUG_ON(b-&gt;will_make_reachable);</div><div class='del'>-</div><div class='del'>-	as-&gt;new_nodes[as-&gt;nr_new_nodes++] = b;</div><div class='del'>-	b-&gt;will_make_reachable = 1UL|(unsigned long) as;</div><div class='del'>-	set_btree_node_will_make_reachable(b);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	btree_update_add_key(as, &amp;as-&gt;new_keys, b);</div><div class='del'>-</div><div class='del'>-	if (b-&gt;key.k.type == KEY_TYPE_btree_ptr_v2) {</div><div class='del'>-		unsigned bytes = vstruct_end(&amp;b-&gt;data-&gt;keys) - (void *) b-&gt;data;</div><div class='del'>-		unsigned sectors = round_up(bytes, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-</div><div class='del'>-		bkey_i_to_btree_ptr_v2(&amp;b-&gt;key)-&gt;v.sectors_written =</div><div class='del'>-			cpu_to_le16(sectors);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns true if @b was a new node</div><div class='del'>- */</div><div class='del'>-static void btree_update_drop_new_node(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-	unsigned long v;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * When b-&gt;will_make_reachable != 0, it owns a ref on as-&gt;cl that's</div><div class='del'>-	 * dropped when it gets written by bch2_btree_complete_write - the</div><div class='del'>-	 * xchg() is for synchronization with bch2_btree_complete_write:</div><div class='del'>-	 */</div><div class='del'>-	v = xchg(&amp;b-&gt;will_make_reachable, 0);</div><div class='del'>-	clear_btree_node_will_make_reachable(b);</div><div class='del'>-	as = (struct btree_update *) (v &amp; ~1UL);</div><div class='del'>-</div><div class='del'>-	if (!as) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; as-&gt;nr_new_nodes; i++)</div><div class='del'>-		if (as-&gt;new_nodes[i] == b)</div><div class='del'>-			goto found;</div><div class='del'>-</div><div class='del'>-	BUG();</div><div class='del'>-found:</div><div class='del'>-	array_remove_item(as-&gt;new_nodes, as-&gt;nr_new_nodes, i);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	if (v &amp; 1)</div><div class='del'>-		closure_put(&amp;as-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_update_get_open_buckets(struct btree_update *as, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	while (b-&gt;ob.nr)</div><div class='del'>-		as-&gt;open_buckets[as-&gt;nr_open_buckets++] =</div><div class='del'>-			b-&gt;ob.v[--b-&gt;ob.nr];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_update_will_free_node_journal_pin_flush(struct journal *j,</div><div class='del'>-				struct journal_entry_pin *_pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @b is being split/rewritten: it may have pointers to not-yet-written btree</div><div class='del'>- * nodes and thus outstanding btree_updates - redirect @b's</div><div class='del'>- * btree_updates to point to this btree_update:</div><div class='del'>- */</div><div class='del'>-static void bch2_btree_interior_update_will_free_node(struct btree_update *as,</div><div class='del'>-						      struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct btree_update *p, *n;</div><div class='del'>-	struct btree_write *w;</div><div class='del'>-</div><div class='del'>-	set_btree_node_dying(b);</div><div class='del'>-</div><div class='del'>-	if (btree_node_fake(b))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Does this node have any btree_update operations preventing</div><div class='del'>-	 * it from being written?</div><div class='del'>-	 *</div><div class='del'>-	 * If so, redirect them to point to this btree_update: we can</div><div class='del'>-	 * write out our new nodes, but we won't make them visible until those</div><div class='del'>-	 * operations complete</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry_safe(p, n, &amp;b-&gt;write_blocked, write_blocked_list) {</div><div class='del'>-		list_del_init(&amp;p-&gt;write_blocked_list);</div><div class='del'>-		btree_update_reparent(as, p);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * for flush_held_btree_writes() waiting on updates to flush or</div><div class='del'>-		 * nodes to be writeable:</div><div class='del'>-		 */</div><div class='del'>-		closure_wake_up(&amp;c-&gt;btree_interior_update_wait);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_btree_node_dirty_acct(c, b);</div><div class='del'>-	clear_btree_node_need_write(b);</div><div class='del'>-	clear_btree_node_write_blocked(b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Does this node have unwritten data that has a pin on the journal?</div><div class='del'>-	 *</div><div class='del'>-	 * If so, transfer that pin to the btree_update operation -</div><div class='del'>-	 * note that if we're freeing multiple nodes, we only need to keep the</div><div class='del'>-	 * oldest pin of any of the nodes we're freeing. We'll release the pin</div><div class='del'>-	 * when the new nodes are persistent and reachable on disk:</div><div class='del'>-	 */</div><div class='del'>-	w = btree_current_write(b);</div><div class='del'>-	bch2_journal_pin_copy(&amp;c-&gt;journal, &amp;as-&gt;journal, &amp;w-&gt;journal,</div><div class='del'>-			      bch2_btree_update_will_free_node_journal_pin_flush);</div><div class='del'>-	bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;w-&gt;journal);</div><div class='del'>-</div><div class='del'>-	w = btree_prev_write(b);</div><div class='del'>-	bch2_journal_pin_copy(&amp;c-&gt;journal, &amp;as-&gt;journal, &amp;w-&gt;journal,</div><div class='del'>-			      bch2_btree_update_will_free_node_journal_pin_flush);</div><div class='del'>-	bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;w-&gt;journal);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Is this a node that isn't reachable on disk yet?</div><div class='del'>-	 *</div><div class='del'>-	 * Nodes that aren't reachable yet have writes blocked until they're</div><div class='del'>-	 * reachable - now that we've cancelled any pending writes and moved</div><div class='del'>-	 * things waiting on that write to wait on this update, we can drop this</div><div class='del'>-	 * node from the list of nodes that the other update is making</div><div class='del'>-	 * reachable, prior to freeing it:</div><div class='del'>-	 */</div><div class='del'>-	btree_update_drop_new_node(c, b);</div><div class='del'>-</div><div class='del'>-	btree_update_add_key(as, &amp;as-&gt;old_keys, b);</div><div class='del'>-</div><div class='del'>-	as-&gt;old_nodes[as-&gt;nr_old_nodes] = b;</div><div class='del'>-	as-&gt;old_nodes_seq[as-&gt;nr_old_nodes] = b-&gt;data-&gt;keys.seq;</div><div class='del'>-	as-&gt;nr_old_nodes++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_update_done(struct btree_update *as, struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	u64 start_time = as-&gt;start_time;</div><div class='del'>-</div><div class='del'>-	BUG_ON(as-&gt;mode == BTREE_INTERIOR_NO_UPDATE);</div><div class='del'>-</div><div class='del'>-	if (as-&gt;took_gc_lock)</div><div class='del'>-		up_read(&amp;as-&gt;c-&gt;gc_lock);</div><div class='del'>-	as-&gt;took_gc_lock = false;</div><div class='del'>-</div><div class='del'>-	bch2_btree_reserve_put(as, trans);</div><div class='del'>-</div><div class='del'>-	continue_at(&amp;as-&gt;cl, btree_update_set_nodes_written,</div><div class='del'>-		    as-&gt;c-&gt;btree_interior_update_worker);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_interior_update_foreground],</div><div class='del'>-			       start_time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct btree_update *</div><div class='del'>-bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,</div><div class='del'>-			unsigned level, bool split, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-	int disk_res_flags = (flags &amp; BCH_TRANS_COMMIT_no_enospc)</div><div class='del'>-		? BCH_DISK_RESERVATION_NOFAIL : 0;</div><div class='del'>-	unsigned nr_nodes[2] = { 0, 0 };</div><div class='del'>-	unsigned update_level = level;</div><div class='del'>-	enum bch_watermark watermark = flags &amp; BCH_WATERMARK_MASK;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!path-&gt;should_be_locked);</div><div class='del'>-</div><div class='del'>-	if (watermark == BCH_WATERMARK_copygc)</div><div class='del'>-		watermark = BCH_WATERMARK_btree_copygc;</div><div class='del'>-	if (watermark &lt; BCH_WATERMARK_btree)</div><div class='del'>-		watermark = BCH_WATERMARK_btree;</div><div class='del'>-</div><div class='del'>-	flags &amp;= ~BCH_WATERMARK_MASK;</div><div class='del'>-	flags |= watermark;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_TRANS_COMMIT_journal_reclaim) &amp;&amp;</div><div class='del'>-	    watermark &lt; c-&gt;journal.watermark) {</div><div class='del'>-		struct journal_res res = { 0 };</div><div class='del'>-</div><div class='del'>-		ret = drop_locks_do(trans,</div><div class='del'>-			bch2_journal_res_get(&amp;c-&gt;journal, &amp;res, 1,</div><div class='del'>-					     watermark|JOURNAL_RES_GET_CHECK));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		nr_nodes[!!update_level] += 1 + split;</div><div class='del'>-		update_level++;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_path_upgrade(trans, path, update_level + 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-		if (!btree_path_node(path, update_level)) {</div><div class='del'>-			/* Allocating new root? */</div><div class='del'>-			nr_nodes[1] += split;</div><div class='del'>-			update_level = BTREE_MAX_DEPTH;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Always check for space for two keys, even if we won't have to</div><div class='del'>-		 * split at prior level - it might have been a merge instead:</div><div class='del'>-		 */</div><div class='del'>-		if (bch2_btree_node_insert_fits(path-&gt;l[update_level].b,</div><div class='del'>-						BKEY_BTREE_PTR_U64s_MAX * 2))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		split = path-&gt;l[update_level].b-&gt;nr.live_u64s &gt; BTREE_SPLIT_THRESHOLD(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!down_read_trylock(&amp;c-&gt;gc_lock)) {</div><div class='del'>-		ret = drop_locks_do(trans, (down_read(&amp;c-&gt;gc_lock), 0));</div><div class='del'>-		if (ret) {</div><div class='del'>-			up_read(&amp;c-&gt;gc_lock);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	as = mempool_alloc(&amp;c-&gt;btree_interior_update_pool, GFP_NOFS);</div><div class='del'>-	memset(as, 0, sizeof(*as));</div><div class='del'>-	closure_init(&amp;as-&gt;cl, NULL);</div><div class='del'>-	as-&gt;c		= c;</div><div class='del'>-	as-&gt;start_time	= start_time;</div><div class='del'>-	as-&gt;mode	= BTREE_INTERIOR_NO_UPDATE;</div><div class='del'>-	as-&gt;took_gc_lock = true;</div><div class='del'>-	as-&gt;btree_id	= path-&gt;btree_id;</div><div class='del'>-	as-&gt;update_level = update_level;</div><div class='del'>-	INIT_LIST_HEAD(&amp;as-&gt;list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;as-&gt;unwritten_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;as-&gt;write_blocked_list);</div><div class='del'>-	bch2_keylist_init(&amp;as-&gt;old_keys, as-&gt;_old_keys);</div><div class='del'>-	bch2_keylist_init(&amp;as-&gt;new_keys, as-&gt;_new_keys);</div><div class='del'>-	bch2_keylist_init(&amp;as-&gt;parent_keys, as-&gt;inline_keys);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	list_add_tail(&amp;as-&gt;list, &amp;c-&gt;btree_interior_update_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't want to allocate if we're in an error state, that can cause</div><div class='del'>-	 * deadlock on emergency shutdown due to open buckets getting stuck in</div><div class='del'>-	 * the btree_reserve_cache after allocator shutdown has cleared it out.</div><div class='del'>-	 * This check needs to come after adding us to the btree_interior_update</div><div class='del'>-	 * list but before calling bch2_btree_reserve_get, to synchronize with</div><div class='del'>-	 * __bch2_fs_read_only().</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_journal_error(&amp;c-&gt;journal);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_disk_reservation_get(c, &amp;as-&gt;disk_res,</div><div class='del'>-			(nr_nodes[0] + nr_nodes[1]) * btree_sectors(c),</div><div class='del'>-			c-&gt;opts.metadata_replicas,</div><div class='del'>-			disk_res_flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_reserve_get(trans, as, nr_nodes, flags, NULL);</div><div class='del'>-	if (bch2_err_matches(ret, ENOSPC) ||</div><div class='del'>-	    bch2_err_matches(ret, ENOMEM)) {</div><div class='del'>-		struct closure cl;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: this should probably be a separate BTREE_INSERT_NONBLOCK</div><div class='del'>-		 * flag</div><div class='del'>-		 */</div><div class='del'>-		if (bch2_err_matches(ret, ENOSPC) &amp;&amp;</div><div class='del'>-		    (flags &amp; BCH_TRANS_COMMIT_journal_reclaim) &amp;&amp;</div><div class='del'>-		    watermark != BCH_WATERMARK_reclaim) {</div><div class='del'>-			ret = -BCH_ERR_journal_reclaim_would_deadlock;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			ret = bch2_btree_reserve_get(trans, as, nr_nodes, flags, &amp;cl);</div><div class='del'>-</div><div class='del'>-			bch2_trans_unlock(trans);</div><div class='del'>-			closure_sync(&amp;cl);</div><div class='del'>-		} while (bch2_err_matches(ret, BCH_ERR_operation_blocked));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		trace_and_count(c, btree_reserve_get_fail, trans-&gt;fn,</div><div class='del'>-				_RET_IP_, nr_nodes[0] + nr_nodes[1], ret);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_relock(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_not_restarted(trans, restart_count);</div><div class='del'>-	return as;</div><div class='del'>-err:</div><div class='del'>-	bch2_btree_update_free(as, trans);</div><div class='del'>-	if (!bch2_err_matches(ret, ENOSPC) &amp;&amp;</div><div class='del'>-	    !bch2_err_matches(ret, EROFS))</div><div class='del'>-		bch_err_fn_ratelimited(c, ret);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Btree root updates: */</div><div class='del'>-</div><div class='del'>-static void bch2_btree_set_root_inmem(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	/* Root nodes cannot be reaped */</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	list_del_init(&amp;b-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-	BUG_ON(btree_node_root(c, b) &amp;&amp;</div><div class='del'>-	       (b-&gt;c.level &lt; btree_node_root(c, b)-&gt;c.level ||</div><div class='del'>-		!btree_node_dying(btree_node_root(c, b))));</div><div class='del'>-</div><div class='del'>-	bch2_btree_id_root(c, b-&gt;c.btree_id)-&gt;b = b;</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-</div><div class='del'>-	bch2_recalc_btree_reserve(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_set_root(struct btree_update *as,</div><div class='del'>-				struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path,</div><div class='del'>-				struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct btree *old;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_set_root, trans, b);</div><div class='del'>-</div><div class='del'>-	old = btree_node_root(c, b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure no one is using the old root while we switch to the</div><div class='del'>-	 * new root:</div><div class='del'>-	 */</div><div class='del'>-	bch2_btree_node_lock_write_nofail(trans, path, &amp;old-&gt;c);</div><div class='del'>-</div><div class='del'>-	bch2_btree_set_root_inmem(c, b);</div><div class='del'>-</div><div class='del'>-	btree_update_updated_root(as, b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unlock old root after new root is visible:</div><div class='del'>-	 *</div><div class='del'>-	 * The new root isn't persistent, but that's ok: we still have</div><div class='del'>-	 * an intent lock on the new root, and any updates that would</div><div class='del'>-	 * depend on the new root would have to update the new root.</div><div class='del'>-	 */</div><div class='del'>-	bch2_btree_node_unlock_write(trans, path, old);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Interior node updates: */</div><div class='del'>-</div><div class='del'>-static void bch2_insert_fixup_btree_ptr(struct btree_update *as,</div><div class='del'>-					struct btree_trans *trans,</div><div class='del'>-					struct btree_path *path,</div><div class='del'>-					struct btree *b,</div><div class='del'>-					struct btree_node_iter *node_iter,</div><div class='del'>-					struct bkey_i *insert)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	unsigned long old, new, v;</div><div class='del'>-</div><div class='del'>-	BUG_ON(insert-&gt;k.type == KEY_TYPE_btree_ptr_v2 &amp;&amp;</div><div class='del'>-	       !btree_ptr_sectors_written(insert));</div><div class='del'>-</div><div class='del'>-	if (unlikely(!test_bit(JOURNAL_REPLAY_DONE, &amp;c-&gt;journal.flags)))</div><div class='del'>-		bch2_journal_key_overwritten(c, b-&gt;c.btree_id, b-&gt;c.level, insert-&gt;k.p);</div><div class='del'>-</div><div class='del'>-	if (bch2_bkey_invalid(c, bkey_i_to_s_c(insert),</div><div class='del'>-			      btree_node_type(b), WRITE, &amp;buf) ?:</div><div class='del'>-	    bch2_bkey_in_btree_node(c, b, bkey_i_to_s_c(insert), &amp;buf)) {</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		prt_printf(&amp;buf, "inserting invalid bkey\n  ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(insert));</div><div class='del'>-		prt_printf(&amp;buf, "\n  ");</div><div class='del'>-		bch2_bkey_invalid(c, bkey_i_to_s_c(insert),</div><div class='del'>-				  btree_node_type(b), WRITE, &amp;buf);</div><div class='del'>-		bch2_bkey_in_btree_node(c, b, bkey_i_to_s_c(insert), &amp;buf);</div><div class='del'>-</div><div class='del'>-		bch2_fs_inconsistent(c, "%s", buf.buf);</div><div class='del'>-		dump_stack();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(as-&gt;journal_u64s + jset_u64s(insert-&gt;k.u64s) &gt;</div><div class='del'>-	       ARRAY_SIZE(as-&gt;journal_entries));</div><div class='del'>-</div><div class='del'>-	as-&gt;journal_u64s +=</div><div class='del'>-		journal_entry_set((void *) &amp;as-&gt;journal_entries[as-&gt;journal_u64s],</div><div class='del'>-				  BCH_JSET_ENTRY_btree_keys,</div><div class='del'>-				  b-&gt;c.btree_id, b-&gt;c.level,</div><div class='del'>-				  insert, insert-&gt;k.u64s);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_node_iter_peek_all(node_iter, b)) &amp;&amp;</div><div class='del'>-	       bkey_iter_pos_cmp(b, k, &amp;insert-&gt;k.p) &lt; 0)</div><div class='del'>-		bch2_btree_node_iter_advance(node_iter, b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_bset_insert_key(trans, path, b, node_iter, insert);</div><div class='del'>-	set_btree_node_dirty_acct(c, b);</div><div class='del'>-</div><div class='del'>-	v = READ_ONCE(b-&gt;flags);</div><div class='del'>-	do {</div><div class='del'>-		old = new = v;</div><div class='del'>-</div><div class='del'>-		new &amp;= ~BTREE_WRITE_TYPE_MASK;</div><div class='del'>-		new |= BTREE_WRITE_interior;</div><div class='del'>-		new |= 1 &lt;&lt; BTREE_NODE_need_write;</div><div class='del'>-	} while ((v = cmpxchg(&amp;b-&gt;flags, old, new)) != old);</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__bch2_btree_insert_keys_interior(struct btree_update *as,</div><div class='del'>-				  struct btree_trans *trans,</div><div class='del'>-				  struct btree_path *path,</div><div class='del'>-				  struct btree *b,</div><div class='del'>-				  struct btree_node_iter node_iter,</div><div class='del'>-				  struct keylist *keys)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *insert = bch2_keylist_front(keys);</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-</div><div class='del'>-	BUG_ON(btree_node_type(b) != BKEY_TYPE_btree);</div><div class='del'>-</div><div class='del'>-	while ((k = bch2_btree_node_iter_prev_all(&amp;node_iter, b)) &amp;&amp;</div><div class='del'>-	       (bkey_cmp_left_packed(b, k, &amp;insert-&gt;k.p) &gt;= 0))</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	while (!bch2_keylist_empty(keys)) {</div><div class='del'>-		insert = bch2_keylist_front(keys);</div><div class='del'>-</div><div class='del'>-		if (bpos_gt(insert-&gt;k.p, b-&gt;key.k.p))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_insert_fixup_btree_ptr(as, trans, path, b, &amp;node_iter, insert);</div><div class='del'>-		bch2_keylist_pop_front(keys);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Move keys from n1 (original replacement node, now lower node) to n2 (higher</div><div class='del'>- * node)</div><div class='del'>- */</div><div class='del'>-static void __btree_split_node(struct btree_update *as,</div><div class='del'>-			       struct btree_trans *trans,</div><div class='del'>-			       struct btree *b,</div><div class='del'>-			       struct btree *n[2])</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	struct bpos n1_pos = POS_MIN;</div><div class='del'>-	struct btree_node_iter iter;</div><div class='del'>-	struct bset *bsets[2];</div><div class='del'>-	struct bkey_format_state format[2];</div><div class='del'>-	struct bkey_packed *out[2];</div><div class='del'>-	struct bkey uk;</div><div class='del'>-	unsigned u64s, n1_u64s = (b-&gt;nr.live_u64s * 3) / 5;</div><div class='del'>-	struct { unsigned nr_keys, val_u64s; } nr_keys[2];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(&amp;nr_keys, 0, sizeof(nr_keys));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		BUG_ON(n[i]-&gt;nsets != 1);</div><div class='del'>-</div><div class='del'>-		bsets[i] = btree_bset_first(n[i]);</div><div class='del'>-		out[i] = bsets[i]-&gt;start;</div><div class='del'>-</div><div class='del'>-		SET_BTREE_NODE_SEQ(n[i]-&gt;data, BTREE_NODE_SEQ(b-&gt;data) + 1);</div><div class='del'>-		bch2_bkey_format_init(&amp;format[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	u64s = 0;</div><div class='del'>-	for_each_btree_node_key(b, k, &amp;iter) {</div><div class='del'>-		if (bkey_deleted(k))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		i = u64s &gt;= n1_u64s;</div><div class='del'>-		u64s += k-&gt;u64s;</div><div class='del'>-		uk = bkey_unpack_key(b, k);</div><div class='del'>-		if (!i)</div><div class='del'>-			n1_pos = uk.p;</div><div class='del'>-		bch2_bkey_format_add_key(&amp;format[i], &amp;uk);</div><div class='del'>-</div><div class='del'>-		nr_keys[i].nr_keys++;</div><div class='del'>-		nr_keys[i].val_u64s += bkeyp_val_u64s(&amp;b-&gt;format, k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btree_set_min(n[0], b-&gt;data-&gt;min_key);</div><div class='del'>-	btree_set_max(n[0], n1_pos);</div><div class='del'>-	btree_set_min(n[1], bpos_successor(n1_pos));</div><div class='del'>-	btree_set_max(n[1], b-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		bch2_bkey_format_add_pos(&amp;format[i], n[i]-&gt;data-&gt;min_key);</div><div class='del'>-		bch2_bkey_format_add_pos(&amp;format[i], n[i]-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-		n[i]-&gt;data-&gt;format = bch2_bkey_format_done(&amp;format[i]);</div><div class='del'>-</div><div class='del'>-		unsigned u64s = nr_keys[i].nr_keys * n[i]-&gt;data-&gt;format.key_u64s +</div><div class='del'>-			nr_keys[i].val_u64s;</div><div class='del'>-		if (__vstruct_bytes(struct btree_node, u64s) &gt; btree_buf_bytes(b))</div><div class='del'>-			n[i]-&gt;data-&gt;format = b-&gt;format;</div><div class='del'>-</div><div class='del'>-		btree_node_set_format(n[i], n[i]-&gt;data-&gt;format);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	u64s = 0;</div><div class='del'>-	for_each_btree_node_key(b, k, &amp;iter) {</div><div class='del'>-		if (bkey_deleted(k))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		i = u64s &gt;= n1_u64s;</div><div class='del'>-		u64s += k-&gt;u64s;</div><div class='del'>-</div><div class='del'>-		if (bch2_bkey_transform(&amp;n[i]-&gt;format, out[i], bkey_packed(k)</div><div class='del'>-					? &amp;b-&gt;format: &amp;bch2_bkey_format_current, k))</div><div class='del'>-			out[i]-&gt;format = KEY_FORMAT_LOCAL_BTREE;</div><div class='del'>-		else</div><div class='del'>-			bch2_bkey_unpack(b, (void *) out[i], k);</div><div class='del'>-</div><div class='del'>-		out[i]-&gt;needs_whiteout = false;</div><div class='del'>-</div><div class='del'>-		btree_keys_account_key_add(&amp;n[i]-&gt;nr, 0, out[i]);</div><div class='del'>-		out[i] = bkey_p_next(out[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		bsets[i]-&gt;u64s = cpu_to_le16((u64 *) out[i] - bsets[i]-&gt;_data);</div><div class='del'>-</div><div class='del'>-		BUG_ON(!bsets[i]-&gt;u64s);</div><div class='del'>-</div><div class='del'>-		set_btree_bset_end(n[i], n[i]-&gt;set);</div><div class='del'>-</div><div class='del'>-		btree_node_reset_sib_u64s(n[i]);</div><div class='del'>-</div><div class='del'>-		bch2_verify_btree_nr_keys(n[i]);</div><div class='del'>-</div><div class='del'>-		if (b-&gt;c.level)</div><div class='del'>-			btree_node_interior_verify(as-&gt;c, n[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For updates to interior nodes, we've got to do the insert before we split</div><div class='del'>- * because the stuff we're inserting has to be inserted atomically. Post split,</div><div class='del'>- * the keys might have to go in different nodes and the split would no longer be</div><div class='del'>- * atomic.</div><div class='del'>- *</div><div class='del'>- * Worse, if the insert is from btree node coalescing, if we do the insert after</div><div class='del'>- * we do the split (and pick the pivot) - the pivot we pick might be between</div><div class='del'>- * nodes that were coalesced, and thus in the middle of a child node post</div><div class='del'>- * coalescing:</div><div class='del'>- */</div><div class='del'>-static void btree_split_insert_keys(struct btree_update *as,</div><div class='del'>-				    struct btree_trans *trans,</div><div class='del'>-				    btree_path_idx_t path_idx,</div><div class='del'>-				    struct btree *b,</div><div class='del'>-				    struct keylist *keys)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-</div><div class='del'>-	if (!bch2_keylist_empty(keys) &amp;&amp;</div><div class='del'>-	    bpos_le(bch2_keylist_front(keys)-&gt;k.p, b-&gt;data-&gt;max_key)) {</div><div class='del'>-		struct btree_node_iter node_iter;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_iter_init(&amp;node_iter, b, &amp;bch2_keylist_front(keys)-&gt;k.p);</div><div class='del'>-</div><div class='del'>-		__bch2_btree_insert_keys_interior(as, trans, path, b, node_iter, keys);</div><div class='del'>-</div><div class='del'>-		btree_node_interior_verify(as-&gt;c, b);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_split(struct btree_update *as, struct btree_trans *trans,</div><div class='del'>-		       btree_path_idx_t path, struct btree *b,</div><div class='del'>-		       struct keylist *keys, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct btree *parent = btree_node_parent(trans-&gt;paths + path, b);</div><div class='del'>-	struct btree *n1, *n2 = NULL, *n3 = NULL;</div><div class='del'>-	btree_path_idx_t path1 = 0, path2 = 0;</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!parent &amp;&amp; (b != btree_node_root(c, b)));</div><div class='del'>-	BUG_ON(parent &amp;&amp; !btree_node_intent_locked(trans-&gt;paths + path, b-&gt;c.level + 1));</div><div class='del'>-</div><div class='del'>-	bch2_btree_interior_update_will_free_node(as, b);</div><div class='del'>-</div><div class='del'>-	if (b-&gt;nr.live_u64s &gt; BTREE_SPLIT_THRESHOLD(c)) {</div><div class='del'>-		struct btree *n[2];</div><div class='del'>-</div><div class='del'>-		trace_and_count(c, btree_node_split, trans, b);</div><div class='del'>-</div><div class='del'>-		n[0] = n1 = bch2_btree_node_alloc(as, trans, b-&gt;c.level);</div><div class='del'>-		n[1] = n2 = bch2_btree_node_alloc(as, trans, b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-		__btree_split_node(as, trans, b, n);</div><div class='del'>-</div><div class='del'>-		if (keys) {</div><div class='del'>-			btree_split_insert_keys(as, trans, path, n1, keys);</div><div class='del'>-			btree_split_insert_keys(as, trans, path, n2, keys);</div><div class='del'>-			BUG_ON(!bch2_keylist_empty(keys));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_build_aux_trees(n2);</div><div class='del'>-		bch2_btree_build_aux_trees(n1);</div><div class='del'>-</div><div class='del'>-		bch2_btree_update_add_new_node(as, n1);</div><div class='del'>-		bch2_btree_update_add_new_node(as, n2);</div><div class='del'>-		six_unlock_write(&amp;n2-&gt;c.lock);</div><div class='del'>-		six_unlock_write(&amp;n1-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-		path1 = get_unlocked_mut_path(trans, as-&gt;btree_id, n1-&gt;c.level, n1-&gt;key.k.p);</div><div class='del'>-		six_lock_increment(&amp;n1-&gt;c.lock, SIX_LOCK_intent);</div><div class='del'>-		mark_btree_node_locked(trans, trans-&gt;paths + path1, n1-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-		bch2_btree_path_level_init(trans, trans-&gt;paths + path1, n1);</div><div class='del'>-</div><div class='del'>-		path2 = get_unlocked_mut_path(trans, as-&gt;btree_id, n2-&gt;c.level, n2-&gt;key.k.p);</div><div class='del'>-		six_lock_increment(&amp;n2-&gt;c.lock, SIX_LOCK_intent);</div><div class='del'>-		mark_btree_node_locked(trans, trans-&gt;paths + path2, n2-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-		bch2_btree_path_level_init(trans, trans-&gt;paths + path2, n2);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Note that on recursive parent_keys == keys, so we</div><div class='del'>-		 * can't start adding new keys to parent_keys before emptying it</div><div class='del'>-		 * out (which we did with btree_split_insert_keys() above)</div><div class='del'>-		 */</div><div class='del'>-		bch2_keylist_add(&amp;as-&gt;parent_keys, &amp;n1-&gt;key);</div><div class='del'>-		bch2_keylist_add(&amp;as-&gt;parent_keys, &amp;n2-&gt;key);</div><div class='del'>-</div><div class='del'>-		if (!parent) {</div><div class='del'>-			/* Depth increases, make a new root */</div><div class='del'>-			n3 = __btree_root_alloc(as, trans, b-&gt;c.level + 1);</div><div class='del'>-</div><div class='del'>-			bch2_btree_update_add_new_node(as, n3);</div><div class='del'>-			six_unlock_write(&amp;n3-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-			trans-&gt;paths[path2].locks_want++;</div><div class='del'>-			BUG_ON(btree_node_locked(trans-&gt;paths + path2, n3-&gt;c.level));</div><div class='del'>-			six_lock_increment(&amp;n3-&gt;c.lock, SIX_LOCK_intent);</div><div class='del'>-			mark_btree_node_locked(trans, trans-&gt;paths + path2, n3-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-			bch2_btree_path_level_init(trans, trans-&gt;paths + path2, n3);</div><div class='del'>-</div><div class='del'>-			n3-&gt;sib_u64s[0] = U16_MAX;</div><div class='del'>-			n3-&gt;sib_u64s[1] = U16_MAX;</div><div class='del'>-</div><div class='del'>-			btree_split_insert_keys(as, trans, path, n3, &amp;as-&gt;parent_keys);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		trace_and_count(c, btree_node_compact, trans, b);</div><div class='del'>-</div><div class='del'>-		n1 = bch2_btree_node_alloc_replacement(as, trans, b);</div><div class='del'>-</div><div class='del'>-		if (keys) {</div><div class='del'>-			btree_split_insert_keys(as, trans, path, n1, keys);</div><div class='del'>-			BUG_ON(!bch2_keylist_empty(keys));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_build_aux_trees(n1);</div><div class='del'>-		bch2_btree_update_add_new_node(as, n1);</div><div class='del'>-		six_unlock_write(&amp;n1-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-		path1 = get_unlocked_mut_path(trans, as-&gt;btree_id, n1-&gt;c.level, n1-&gt;key.k.p);</div><div class='del'>-		six_lock_increment(&amp;n1-&gt;c.lock, SIX_LOCK_intent);</div><div class='del'>-		mark_btree_node_locked(trans, trans-&gt;paths + path1, n1-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-		bch2_btree_path_level_init(trans, trans-&gt;paths + path1, n1);</div><div class='del'>-</div><div class='del'>-		if (parent)</div><div class='del'>-			bch2_keylist_add(&amp;as-&gt;parent_keys, &amp;n1-&gt;key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* New nodes all written, now make them visible: */</div><div class='del'>-</div><div class='del'>-	if (parent) {</div><div class='del'>-		/* Split a non root node */</div><div class='del'>-		ret = bch2_btree_insert_node(as, trans, path, parent, &amp;as-&gt;parent_keys, flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else if (n3) {</div><div class='del'>-		bch2_btree_set_root(as, trans, trans-&gt;paths + path, n3);</div><div class='del'>-	} else {</div><div class='del'>-		/* Root filled up but didn't need to be split */</div><div class='del'>-		bch2_btree_set_root(as, trans, trans-&gt;paths + path, n1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (n3) {</div><div class='del'>-		bch2_btree_update_get_open_buckets(as, n3);</div><div class='del'>-		bch2_btree_node_write(c, n3, SIX_LOCK_intent, 0);</div><div class='del'>-	}</div><div class='del'>-	if (n2) {</div><div class='del'>-		bch2_btree_update_get_open_buckets(as, n2);</div><div class='del'>-		bch2_btree_node_write(c, n2, SIX_LOCK_intent, 0);</div><div class='del'>-	}</div><div class='del'>-	bch2_btree_update_get_open_buckets(as, n1);</div><div class='del'>-	bch2_btree_node_write(c, n1, SIX_LOCK_intent, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The old node must be freed (in memory) _before_ unlocking the new</div><div class='del'>-	 * nodes - else another thread could re-acquire a read lock on the old</div><div class='del'>-	 * node after another thread has locked and updated the new node, thus</div><div class='del'>-	 * seeing stale data:</div><div class='del'>-	 */</div><div class='del'>-	bch2_btree_node_free_inmem(trans, trans-&gt;paths + path, b);</div><div class='del'>-</div><div class='del'>-	if (n3)</div><div class='del'>-		bch2_trans_node_add(trans, trans-&gt;paths + path, n3);</div><div class='del'>-	if (n2)</div><div class='del'>-		bch2_trans_node_add(trans, trans-&gt;paths + path2, n2);</div><div class='del'>-	bch2_trans_node_add(trans, trans-&gt;paths + path1, n1);</div><div class='del'>-</div><div class='del'>-	if (n3)</div><div class='del'>-		six_unlock_intent(&amp;n3-&gt;c.lock);</div><div class='del'>-	if (n2)</div><div class='del'>-		six_unlock_intent(&amp;n2-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;n1-&gt;c.lock);</div><div class='del'>-out:</div><div class='del'>-	if (path2) {</div><div class='del'>-		__bch2_btree_path_unlock(trans, trans-&gt;paths + path2);</div><div class='del'>-		bch2_path_put(trans, path2, true);</div><div class='del'>-	}</div><div class='del'>-	if (path1) {</div><div class='del'>-		__bch2_btree_path_unlock(trans, trans-&gt;paths + path1);</div><div class='del'>-		bch2_path_put(trans, path1, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_locks(trans);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[n2</div><div class='del'>-			       ? BCH_TIME_btree_node_split</div><div class='del'>-			       : BCH_TIME_btree_node_compact],</div><div class='del'>-			       start_time);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	if (n3)</div><div class='del'>-		bch2_btree_node_free_never_used(as, trans, n3);</div><div class='del'>-	if (n2)</div><div class='del'>-		bch2_btree_node_free_never_used(as, trans, n2);</div><div class='del'>-	bch2_btree_node_free_never_used(as, trans, n1);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-bch2_btree_insert_keys_interior(struct btree_update *as,</div><div class='del'>-				struct btree_trans *trans,</div><div class='del'>-				struct btree_path *path,</div><div class='del'>-				struct btree *b,</div><div class='del'>-				struct keylist *keys)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *linked;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	__bch2_btree_insert_keys_interior(as, trans, path, b,</div><div class='del'>-					  path-&gt;l[b-&gt;c.level].iter, keys);</div><div class='del'>-</div><div class='del'>-	btree_update_updated_node(as, b);</div><div class='del'>-</div><div class='del'>-	trans_for_each_path_with_node(trans, b, linked, i)</div><div class='del'>-		bch2_btree_node_iter_peek(&amp;linked-&gt;l[b-&gt;c.level].iter, b);</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_paths(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_btree_insert_node - insert bkeys into a given btree node</div><div class='del'>- *</div><div class='del'>- * @as:			btree_update object</div><div class='del'>- * @trans:		btree_trans object</div><div class='del'>- * @path_idx:		path that points to current node</div><div class='del'>- * @b:			node to insert keys into</div><div class='del'>- * @keys:		list of keys to insert</div><div class='del'>- * @flags:		transaction commit flags</div><div class='del'>- *</div><div class='del'>- * Returns: 0 on success, typically transaction restart error on failure</div><div class='del'>- *</div><div class='del'>- * Inserts as many keys as it can into a given btree node, splitting it if full.</div><div class='del'>- * If a split occurred, this function will return early. This can only happen</div><div class='del'>- * for leaf nodes -- inserts into interior nodes have to be atomic.</div><div class='del'>- */</div><div class='del'>-static int bch2_btree_insert_node(struct btree_update *as, struct btree_trans *trans,</div><div class='del'>-				  btree_path_idx_t path_idx, struct btree *b,</div><div class='del'>-				  struct keylist *keys, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = as-&gt;c;</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-	int old_u64s = le16_to_cpu(btree_bset_last(b)-&gt;u64s);</div><div class='del'>-	int old_live_u64s = b-&gt;nr.live_u64s;</div><div class='del'>-	int live_u64s_added, u64s_added;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;gc_lock);</div><div class='del'>-	BUG_ON(!btree_node_intent_locked(path, b-&gt;c.level));</div><div class='del'>-	BUG_ON(!b-&gt;c.level);</div><div class='del'>-	BUG_ON(!as || as-&gt;b);</div><div class='del'>-	bch2_verify_keylist_sorted(keys);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_node_lock_write(trans, path, &amp;b-&gt;c);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_prep_for_write(trans, path, b);</div><div class='del'>-</div><div class='del'>-	if (!bch2_btree_node_insert_fits(b, bch2_keylist_u64s(keys))) {</div><div class='del'>-		bch2_btree_node_unlock_write(trans, path, b);</div><div class='del'>-		goto split;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btree_node_interior_verify(c, b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_insert_keys_interior(as, trans, path, b, keys);</div><div class='del'>-</div><div class='del'>-	live_u64s_added = (int) b-&gt;nr.live_u64s - old_live_u64s;</div><div class='del'>-	u64s_added = (int) le16_to_cpu(btree_bset_last(b)-&gt;u64s) - old_u64s;</div><div class='del'>-</div><div class='del'>-	if (b-&gt;sib_u64s[0] != U16_MAX &amp;&amp; live_u64s_added &lt; 0)</div><div class='del'>-		b-&gt;sib_u64s[0] = max(0, (int) b-&gt;sib_u64s[0] + live_u64s_added);</div><div class='del'>-	if (b-&gt;sib_u64s[1] != U16_MAX &amp;&amp; live_u64s_added &lt; 0)</div><div class='del'>-		b-&gt;sib_u64s[1] = max(0, (int) b-&gt;sib_u64s[1] + live_u64s_added);</div><div class='del'>-</div><div class='del'>-	if (u64s_added &gt; live_u64s_added &amp;&amp;</div><div class='del'>-	    bch2_maybe_compact_whiteouts(c, b))</div><div class='del'>-		bch2_trans_node_reinit_iter(trans, b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_unlock_write(trans, path, b);</div><div class='del'>-</div><div class='del'>-	btree_node_interior_verify(c, b);</div><div class='del'>-	return 0;</div><div class='del'>-split:</div><div class='del'>-	/*</div><div class='del'>-	 * We could attempt to avoid the transaction restart, by calling</div><div class='del'>-	 * bch2_btree_path_upgrade() and allocating more nodes:</div><div class='del'>-	 */</div><div class='del'>-	if (b-&gt;c.level &gt;= as-&gt;update_level) {</div><div class='del'>-		trace_and_count(c, trans_restart_split_race, trans, _THIS_IP_, b);</div><div class='del'>-		return btree_trans_restart(trans, BCH_ERR_transaction_restart_split_race);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return btree_split(as, trans, path_idx, b, keys, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_split_leaf(struct btree_trans *trans,</div><div class='del'>-			  btree_path_idx_t path,</div><div class='del'>-			  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	/* btree_split &amp; merge may both cause paths array to be reallocated */</div><div class='del'>-</div><div class='del'>-	struct btree *b = path_l(trans-&gt;paths + path)-&gt;b;</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-	unsigned l;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	as = bch2_btree_update_start(trans, trans-&gt;paths + path,</div><div class='del'>-				     trans-&gt;paths[path].level,</div><div class='del'>-				     true, flags);</div><div class='del'>-	if (IS_ERR(as))</div><div class='del'>-		return PTR_ERR(as);</div><div class='del'>-</div><div class='del'>-	ret = btree_split(as, trans, path, b, NULL, flags);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_btree_update_free(as, trans);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_update_done(as, trans);</div><div class='del'>-</div><div class='del'>-	for (l = trans-&gt;paths[path].level + 1;</div><div class='del'>-	     btree_node_intent_locked(&amp;trans-&gt;paths[path], l) &amp;&amp; !ret;</div><div class='del'>-	     l++)</div><div class='del'>-		ret = bch2_foreground_maybe_merge(trans, path, l, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_foreground_maybe_merge(struct btree_trans *trans,</div><div class='del'>-				  btree_path_idx_t path,</div><div class='del'>-				  unsigned level,</div><div class='del'>-				  unsigned flags,</div><div class='del'>-				  enum btree_node_sibling sib)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-	struct bkey_format_state new_s;</div><div class='del'>-	struct bkey_format new_f;</div><div class='del'>-	struct bkey_i delete;</div><div class='del'>-	struct btree *b, *m, *n, *prev, *next, *parent;</div><div class='del'>-	struct bpos sib_pos;</div><div class='del'>-	size_t sib_u64s;</div><div class='del'>-	enum btree_id btree = trans-&gt;paths[path].btree_id;</div><div class='del'>-	btree_path_idx_t sib_path = 0, new_path = 0;</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!trans-&gt;paths[path].should_be_locked);</div><div class='del'>-	BUG_ON(!btree_node_locked(&amp;trans-&gt;paths[path], level));</div><div class='del'>-</div><div class='del'>-	b = trans-&gt;paths[path].l[level].b;</div><div class='del'>-</div><div class='del'>-	if ((sib == btree_prev_sib &amp;&amp; bpos_eq(b-&gt;data-&gt;min_key, POS_MIN)) ||</div><div class='del'>-	    (sib == btree_next_sib &amp;&amp; bpos_eq(b-&gt;data-&gt;max_key, SPOS_MAX))) {</div><div class='del'>-		b-&gt;sib_u64s[sib] = U16_MAX;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sib_pos = sib == btree_prev_sib</div><div class='del'>-		? bpos_predecessor(b-&gt;data-&gt;min_key)</div><div class='del'>-		: bpos_successor(b-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-	sib_path = bch2_path_get(trans, btree, sib_pos,</div><div class='del'>-				 U8_MAX, level, BTREE_ITER_INTENT, _THIS_IP_);</div><div class='del'>-	ret = bch2_btree_path_traverse(trans, sib_path, false);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	btree_path_set_should_be_locked(trans-&gt;paths + sib_path);</div><div class='del'>-</div><div class='del'>-	m = trans-&gt;paths[sib_path].l[level].b;</div><div class='del'>-</div><div class='del'>-	if (btree_node_parent(trans-&gt;paths + path, b) !=</div><div class='del'>-	    btree_node_parent(trans-&gt;paths + sib_path, m)) {</div><div class='del'>-		b-&gt;sib_u64s[sib] = U16_MAX;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sib == btree_prev_sib) {</div><div class='del'>-		prev = m;</div><div class='del'>-		next = b;</div><div class='del'>-	} else {</div><div class='del'>-		prev = b;</div><div class='del'>-		next = m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bpos_eq(bpos_successor(prev-&gt;data-&gt;max_key), next-&gt;data-&gt;min_key)) {</div><div class='del'>-		struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bpos_to_text(&amp;buf1, prev-&gt;data-&gt;max_key);</div><div class='del'>-		bch2_bpos_to_text(&amp;buf2, next-&gt;data-&gt;min_key);</div><div class='del'>-		bch_err(c,</div><div class='del'>-			"%s(): btree topology error:\n"</div><div class='del'>-			"  prev ends at   %s\n"</div><div class='del'>-			"  next starts at %s",</div><div class='del'>-			__func__, buf1.buf, buf2.buf);</div><div class='del'>-		printbuf_exit(&amp;buf1);</div><div class='del'>-		printbuf_exit(&amp;buf2);</div><div class='del'>-		bch2_topology_error(c);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_format_init(&amp;new_s);</div><div class='del'>-	bch2_bkey_format_add_pos(&amp;new_s, prev-&gt;data-&gt;min_key);</div><div class='del'>-	__bch2_btree_calc_format(&amp;new_s, prev);</div><div class='del'>-	__bch2_btree_calc_format(&amp;new_s, next);</div><div class='del'>-	bch2_bkey_format_add_pos(&amp;new_s, next-&gt;data-&gt;max_key);</div><div class='del'>-	new_f = bch2_bkey_format_done(&amp;new_s);</div><div class='del'>-</div><div class='del'>-	sib_u64s = btree_node_u64s_with_format(b-&gt;nr, &amp;b-&gt;format, &amp;new_f) +</div><div class='del'>-		btree_node_u64s_with_format(m-&gt;nr, &amp;m-&gt;format, &amp;new_f);</div><div class='del'>-</div><div class='del'>-	if (sib_u64s &gt; BTREE_FOREGROUND_MERGE_HYSTERESIS(c)) {</div><div class='del'>-		sib_u64s -= BTREE_FOREGROUND_MERGE_HYSTERESIS(c);</div><div class='del'>-		sib_u64s /= 2;</div><div class='del'>-		sib_u64s += BTREE_FOREGROUND_MERGE_HYSTERESIS(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sib_u64s = min(sib_u64s, btree_max_u64s(c));</div><div class='del'>-	sib_u64s = min(sib_u64s, (size_t) U16_MAX - 1);</div><div class='del'>-	b-&gt;sib_u64s[sib] = sib_u64s;</div><div class='del'>-</div><div class='del'>-	if (b-&gt;sib_u64s[sib] &gt; c-&gt;btree_foreground_merge_threshold)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	parent = btree_node_parent(trans-&gt;paths + path, b);</div><div class='del'>-	as = bch2_btree_update_start(trans, trans-&gt;paths + path, level, false,</div><div class='del'>-				     BCH_TRANS_COMMIT_no_enospc|flags);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(as);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_merge, trans, b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_interior_update_will_free_node(as, b);</div><div class='del'>-	bch2_btree_interior_update_will_free_node(as, m);</div><div class='del'>-</div><div class='del'>-	n = bch2_btree_node_alloc(as, trans, b-&gt;c.level);</div><div class='del'>-</div><div class='del'>-	SET_BTREE_NODE_SEQ(n-&gt;data,</div><div class='del'>-			   max(BTREE_NODE_SEQ(b-&gt;data),</div><div class='del'>-			       BTREE_NODE_SEQ(m-&gt;data)) + 1);</div><div class='del'>-</div><div class='del'>-	btree_set_min(n, prev-&gt;data-&gt;min_key);</div><div class='del'>-	btree_set_max(n, next-&gt;data-&gt;max_key);</div><div class='del'>-</div><div class='del'>-	n-&gt;data-&gt;format	 = new_f;</div><div class='del'>-	btree_node_set_format(n, new_f);</div><div class='del'>-</div><div class='del'>-	bch2_btree_sort_into(c, n, prev);</div><div class='del'>-	bch2_btree_sort_into(c, n, next);</div><div class='del'>-</div><div class='del'>-	bch2_btree_build_aux_trees(n);</div><div class='del'>-	bch2_btree_update_add_new_node(as, n);</div><div class='del'>-	six_unlock_write(&amp;n-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	new_path = get_unlocked_mut_path(trans, btree, n-&gt;c.level, n-&gt;key.k.p);</div><div class='del'>-	six_lock_increment(&amp;n-&gt;c.lock, SIX_LOCK_intent);</div><div class='del'>-	mark_btree_node_locked(trans, trans-&gt;paths + new_path, n-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-	bch2_btree_path_level_init(trans, trans-&gt;paths + new_path, n);</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;delete.k);</div><div class='del'>-	delete.k.p = prev-&gt;key.k.p;</div><div class='del'>-	bch2_keylist_add(&amp;as-&gt;parent_keys, &amp;delete);</div><div class='del'>-	bch2_keylist_add(&amp;as-&gt;parent_keys, &amp;n-&gt;key);</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_paths(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_insert_node(as, trans, path, parent, &amp;as-&gt;parent_keys, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_update;</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_paths(trans);</div><div class='del'>-</div><div class='del'>-	bch2_btree_update_get_open_buckets(as, n);</div><div class='del'>-	bch2_btree_node_write(c, n, SIX_LOCK_intent, 0);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_free_inmem(trans, trans-&gt;paths + path, b);</div><div class='del'>-	bch2_btree_node_free_inmem(trans, trans-&gt;paths + sib_path, m);</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_add(trans, trans-&gt;paths + path, n);</div><div class='del'>-</div><div class='del'>-	bch2_trans_verify_paths(trans);</div><div class='del'>-</div><div class='del'>-	six_unlock_intent(&amp;n-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	bch2_btree_update_done(as, trans);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_btree_node_merge], start_time);</div><div class='del'>-out:</div><div class='del'>-err:</div><div class='del'>-	if (new_path)</div><div class='del'>-		bch2_path_put(trans, new_path, true);</div><div class='del'>-	bch2_path_put(trans, sib_path, true);</div><div class='del'>-	bch2_trans_verify_locks(trans);</div><div class='del'>-	return ret;</div><div class='del'>-err_free_update:</div><div class='del'>-	bch2_btree_node_free_never_used(as, trans, n);</div><div class='del'>-	bch2_btree_update_free(as, trans);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_rewrite(struct btree_trans *trans,</div><div class='del'>-			    struct btree_iter *iter,</div><div class='del'>-			    struct btree *b,</div><div class='del'>-			    unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *n, *parent;</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-	btree_path_idx_t new_path = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	flags |= BCH_TRANS_COMMIT_no_enospc;</div><div class='del'>-</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	parent = btree_node_parent(path, b);</div><div class='del'>-	as = bch2_btree_update_start(trans, path, b-&gt;c.level, false, flags);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(as);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	bch2_btree_interior_update_will_free_node(as, b);</div><div class='del'>-</div><div class='del'>-	n = bch2_btree_node_alloc_replacement(as, trans, b);</div><div class='del'>-</div><div class='del'>-	bch2_btree_build_aux_trees(n);</div><div class='del'>-	bch2_btree_update_add_new_node(as, n);</div><div class='del'>-	six_unlock_write(&amp;n-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	new_path = get_unlocked_mut_path(trans, iter-&gt;btree_id, n-&gt;c.level, n-&gt;key.k.p);</div><div class='del'>-	six_lock_increment(&amp;n-&gt;c.lock, SIX_LOCK_intent);</div><div class='del'>-	mark_btree_node_locked(trans, trans-&gt;paths + new_path, n-&gt;c.level, BTREE_NODE_INTENT_LOCKED);</div><div class='del'>-	bch2_btree_path_level_init(trans, trans-&gt;paths + new_path, n);</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, btree_node_rewrite, trans, b);</div><div class='del'>-</div><div class='del'>-	if (parent) {</div><div class='del'>-		bch2_keylist_add(&amp;as-&gt;parent_keys, &amp;n-&gt;key);</div><div class='del'>-		ret = bch2_btree_insert_node(as, trans, iter-&gt;path,</div><div class='del'>-					     parent, &amp;as-&gt;parent_keys, flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_btree_set_root(as, trans, btree_iter_path(trans, iter), n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_update_get_open_buckets(as, n);</div><div class='del'>-	bch2_btree_node_write(c, n, SIX_LOCK_intent, 0);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_free_inmem(trans, btree_iter_path(trans, iter), b);</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_add(trans, trans-&gt;paths + iter-&gt;path, n);</div><div class='del'>-	six_unlock_intent(&amp;n-&gt;c.lock);</div><div class='del'>-</div><div class='del'>-	bch2_btree_update_done(as, trans);</div><div class='del'>-out:</div><div class='del'>-	if (new_path)</div><div class='del'>-		bch2_path_put(trans, new_path, true);</div><div class='del'>-	bch2_trans_downgrade(trans);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	bch2_btree_node_free_never_used(as, trans, n);</div><div class='del'>-	bch2_btree_update_free(as, trans);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct async_btree_rewrite {</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	struct work_struct	work;</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	enum btree_id		btree_id;</div><div class='del'>-	unsigned		level;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-	__le64			seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int async_btree_node_rewrite_trans(struct btree_trans *trans,</div><div class='del'>-					  struct async_btree_rewrite *a)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_iter_init(trans, &amp;iter, a-&gt;btree_id, a-&gt;pos,</div><div class='del'>-				  BTREE_MAX_DEPTH, a-&gt;level, 0);</div><div class='del'>-	b = bch2_btree_iter_peek_node(&amp;iter);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(b);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!b || b-&gt;data-&gt;keys.seq != a-&gt;seq) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		if (b)</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-		else</div><div class='del'>-			prt_str(&amp;buf, "(null");</div><div class='del'>-		bch_info(c, "%s: node to rewrite not found:, searching for seq %llu, got\n%s",</div><div class='del'>-			 __func__, a-&gt;seq, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_node_rewrite(trans, &amp;iter, b, 0);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void async_btree_node_rewrite_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct async_btree_rewrite *a =</div><div class='del'>-		container_of(work, struct async_btree_rewrite, work);</div><div class='del'>-	struct bch_fs *c = a-&gt;c;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		      async_btree_node_rewrite_trans(trans, a));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_node_rewrite);</div><div class='del'>-	kfree(a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_rewrite_async(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct async_btree_rewrite *a;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	a = kmalloc(sizeof(*a), GFP_NOFS);</div><div class='del'>-	if (!a) {</div><div class='del'>-		bch_err(c, "%s: error allocating memory", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	a-&gt;c		= c;</div><div class='del'>-	a-&gt;btree_id	= b-&gt;c.btree_id;</div><div class='del'>-	a-&gt;level	= b-&gt;c.level;</div><div class='del'>-	a-&gt;pos		= b-&gt;key.k.p;</div><div class='del'>-	a-&gt;seq		= b-&gt;data-&gt;keys.seq;</div><div class='del'>-	INIT_WORK(&amp;a-&gt;work, async_btree_node_rewrite_work);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!test_bit(BCH_FS_may_go_rw, &amp;c-&gt;flags))) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-		list_add(&amp;a-&gt;list, &amp;c-&gt;pending_node_rewrites);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_node_rewrite)) {</div><div class='del'>-		if (test_bit(BCH_FS_started, &amp;c-&gt;flags)) {</div><div class='del'>-			bch_err(c, "%s: error getting c-&gt;writes ref", __func__);</div><div class='del'>-			kfree(a);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_fs_read_write_early(c);</div><div class='del'>-		bch_err_msg(c, ret, "going read-write");</div><div class='del'>-		if (ret) {</div><div class='del'>-			kfree(a);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_write_ref_get(c, BCH_WRITE_REF_node_rewrite);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_work(c-&gt;btree_interior_update_worker, &amp;a-&gt;work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_do_pending_node_rewrites(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct async_btree_rewrite *a, *n;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-	list_for_each_entry_safe(a, n, &amp;c-&gt;pending_node_rewrites, list) {</div><div class='del'>-		list_del(&amp;a-&gt;list);</div><div class='del'>-</div><div class='del'>-		bch2_write_ref_get(c, BCH_WRITE_REF_node_rewrite);</div><div class='del'>-		queue_work(c-&gt;btree_interior_update_worker, &amp;a-&gt;work);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_free_pending_node_rewrites(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct async_btree_rewrite *a, *n;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-	list_for_each_entry_safe(a, n, &amp;c-&gt;pending_node_rewrites, list) {</div><div class='del'>-		list_del(&amp;a-&gt;list);</div><div class='del'>-</div><div class='del'>-		kfree(a);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_btree_node_update_key(struct btree_trans *trans,</div><div class='del'>-					struct btree_iter *iter,</div><div class='del'>-					struct btree *b, struct btree *new_hash,</div><div class='del'>-					struct bkey_i *new_key,</div><div class='del'>-					unsigned commit_flags,</div><div class='del'>-					bool skip_triggers)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter2 = { NULL };</div><div class='del'>-	struct btree *parent;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!skip_triggers) {</div><div class='del'>-		ret   = bch2_key_trigger_old(trans, b-&gt;c.btree_id, b-&gt;c.level + 1,</div><div class='del'>-					     bkey_i_to_s_c(&amp;b-&gt;key),</div><div class='del'>-					     BTREE_TRIGGER_TRANSACTIONAL) ?:</div><div class='del'>-			bch2_key_trigger_new(trans, b-&gt;c.btree_id, b-&gt;c.level + 1,</div><div class='del'>-					     bkey_i_to_s(new_key),</div><div class='del'>-					     BTREE_TRIGGER_TRANSACTIONAL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_hash) {</div><div class='del'>-		bkey_copy(&amp;new_hash-&gt;key, new_key);</div><div class='del'>-		ret = bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache,</div><div class='del'>-				new_hash, b-&gt;c.level, b-&gt;c.btree_id);</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parent = btree_node_parent(btree_iter_path(trans, iter), b);</div><div class='del'>-	if (parent) {</div><div class='del'>-		bch2_trans_copy_iter(&amp;iter2, iter);</div><div class='del'>-</div><div class='del'>-		iter2.path = bch2_btree_path_make_mut(trans, iter2.path,</div><div class='del'>-				iter2.flags &amp; BTREE_ITER_INTENT,</div><div class='del'>-				_THIS_IP_);</div><div class='del'>-</div><div class='del'>-		struct btree_path *path2 = btree_iter_path(trans, &amp;iter2);</div><div class='del'>-		BUG_ON(path2-&gt;level != b-&gt;c.level);</div><div class='del'>-		BUG_ON(!bpos_eq(path2-&gt;pos, new_key-&gt;k.p));</div><div class='del'>-</div><div class='del'>-		btree_path_set_level_up(trans, path2);</div><div class='del'>-</div><div class='del'>-		trans-&gt;paths_sorted = false;</div><div class='del'>-</div><div class='del'>-		ret   = bch2_btree_iter_traverse(&amp;iter2) ?:</div><div class='del'>-			bch2_trans_update(trans, &amp;iter2, new_key, BTREE_TRIGGER_NORUN);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		BUG_ON(btree_node_root(c, b) != b);</div><div class='del'>-</div><div class='del'>-		struct jset_entry *e = bch2_trans_jset_entry_alloc(trans,</div><div class='del'>-				       jset_u64s(new_key-&gt;k.u64s));</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(e);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		journal_entry_set(e,</div><div class='del'>-				  BCH_JSET_ENTRY_btree_root,</div><div class='del'>-				  b-&gt;c.btree_id, b-&gt;c.level,</div><div class='del'>-				  new_key, new_key-&gt;k.u64s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_commit(trans, NULL, NULL, commit_flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_lock_write_nofail(trans, btree_iter_path(trans, iter), &amp;b-&gt;c);</div><div class='del'>-</div><div class='del'>-	if (new_hash) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-		bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, new_hash);</div><div class='del'>-		bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-</div><div class='del'>-		bkey_copy(&amp;b-&gt;key, new_key);</div><div class='del'>-		ret = __bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache, b);</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	} else {</div><div class='del'>-		bkey_copy(&amp;b-&gt;key, new_key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_unlock_write(trans, btree_iter_path(trans, iter), b);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter2);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	if (new_hash) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-		bch2_btree_node_hash_remove(&amp;c-&gt;btree_cache, b);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	}</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_update_key(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			       struct btree *b, struct bkey_i *new_key,</div><div class='del'>-			       unsigned commit_flags, bool skip_triggers)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree *new_hash = NULL;</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-	struct closure cl;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_path_upgrade(trans, path, b-&gt;c.level + 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * check btree_ptr_hash_val() after @b is locked by</div><div class='del'>-	 * btree_iter_traverse():</div><div class='del'>-	 */</div><div class='del'>-	if (btree_ptr_hash_val(new_key) != b-&gt;hash_val) {</div><div class='del'>-		ret = bch2_btree_cache_cannibalize_lock(trans, &amp;cl);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ret = drop_locks_do(trans, (closure_sync(&amp;cl), 0));</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new_hash = bch2_btree_node_mem_alloc(trans, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path-&gt;intent_ref++;</div><div class='del'>-	ret = __bch2_btree_node_update_key(trans, iter, b, new_hash, new_key,</div><div class='del'>-					   commit_flags, skip_triggers);</div><div class='del'>-	--path-&gt;intent_ref;</div><div class='del'>-</div><div class='del'>-	if (new_hash) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-		list_move(&amp;new_hash-&gt;list, &amp;c-&gt;btree_cache.freeable);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-</div><div class='del'>-		six_unlock_write(&amp;new_hash-&gt;c.lock);</div><div class='del'>-		six_unlock_intent(&amp;new_hash-&gt;c.lock);</div><div class='del'>-	}</div><div class='del'>-	closure_sync(&amp;cl);</div><div class='del'>-	bch2_btree_cache_cannibalize_unlock(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_update_key_get_iter(struct btree_trans *trans,</div><div class='del'>-					struct btree *b, struct bkey_i *new_key,</div><div class='del'>-					unsigned commit_flags, bool skip_triggers)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_iter_init(trans, &amp;iter, b-&gt;c.btree_id, b-&gt;key.k.p,</div><div class='del'>-				  BTREE_MAX_DEPTH, b-&gt;c.level,</div><div class='del'>-				  BTREE_ITER_INTENT);</div><div class='del'>-	ret = bch2_btree_iter_traverse(&amp;iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* has node been freed? */</div><div class='del'>-	if (btree_iter_path(trans, &amp;iter)-&gt;l[b-&gt;c.level].b != b) {</div><div class='del'>-		/* node has been freed: */</div><div class='del'>-		BUG_ON(!btree_node_dying(b));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!btree_node_hashed(b));</div><div class='del'>-</div><div class='del'>-	struct bch_extent_ptr *ptr;</div><div class='del'>-	bch2_bkey_drop_ptrs(bkey_i_to_s(new_key), ptr,</div><div class='del'>-			    !bch2_bkey_has_device(bkey_i_to_s(&amp;b-&gt;key), ptr-&gt;dev));</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_node_update_key(trans, &amp;iter, b, new_key,</div><div class='del'>-					 commit_flags, skip_triggers);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Init code: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Only for filesystem bringup, when first reading the btree roots or allocating</div><div class='del'>- * btree roots when initializing a new filesystem:</div><div class='del'>- */</div><div class='del'>-void bch2_btree_set_root_for_read(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(btree_node_root(c, b));</div><div class='del'>-</div><div class='del'>-	bch2_btree_set_root_inmem(c, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_btree_root_alloc(struct btree_trans *trans, enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct closure cl;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = bch2_btree_cache_cannibalize_lock(trans, &amp;cl);</div><div class='del'>-		closure_sync(&amp;cl);</div><div class='del'>-	} while (ret);</div><div class='del'>-</div><div class='del'>-	b = bch2_btree_node_mem_alloc(trans, false);</div><div class='del'>-	bch2_btree_cache_cannibalize_unlock(trans);</div><div class='del'>-</div><div class='del'>-	set_btree_node_fake(b);</div><div class='del'>-	set_btree_node_need_rewrite(b);</div><div class='del'>-	b-&gt;c.level	= 0;</div><div class='del'>-	b-&gt;c.btree_id	= id;</div><div class='del'>-</div><div class='del'>-	bkey_btree_ptr_init(&amp;b-&gt;key);</div><div class='del'>-	b-&gt;key.k.p = SPOS_MAX;</div><div class='del'>-	*((u64 *) bkey_i_to_btree_ptr(&amp;b-&gt;key)-&gt;v.start) = U64_MAX - id;</div><div class='del'>-</div><div class='del'>-	bch2_bset_init_first(b, &amp;b-&gt;data-&gt;keys);</div><div class='del'>-	bch2_btree_build_aux_trees(b);</div><div class='del'>-</div><div class='del'>-	b-&gt;data-&gt;flags = 0;</div><div class='del'>-	btree_set_min(b, POS_MIN);</div><div class='del'>-	btree_set_max(b, SPOS_MAX);</div><div class='del'>-	b-&gt;data-&gt;format = bch2_btree_calc_format(b);</div><div class='del'>-	btree_node_set_format(b, b-&gt;data-&gt;format);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_node_hash_insert(&amp;c-&gt;btree_cache, b,</div><div class='del'>-					  b-&gt;c.level, b-&gt;c.btree_id);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	bch2_btree_set_root_inmem(c, b);</div><div class='del'>-</div><div class='del'>-	six_unlock_write(&amp;b-&gt;c.lock);</div><div class='del'>-	six_unlock_intent(&amp;b-&gt;c.lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_root_alloc(struct bch_fs *c, enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	bch2_trans_run(c, __bch2_btree_root_alloc(trans, id));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_updates_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_update *as;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	list_for_each_entry(as, &amp;c-&gt;btree_interior_update_list, list)</div><div class='del'>-		prt_printf(out, "%p m %u w %u r %u j %llu\n",</div><div class='del'>-		       as,</div><div class='del'>-		       as-&gt;mode,</div><div class='del'>-		       as-&gt;nodes_written,</div><div class='del'>-		       closure_nr_remaining(&amp;as-&gt;cl),</div><div class='del'>-		       as-&gt;journal.seq);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_btree_interior_updates_pending(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	ret = !list_empty(&amp;c-&gt;btree_interior_update_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_btree_interior_updates_flush(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bool ret = bch2_btree_interior_updates_pending(c);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		closure_wait_event(&amp;c-&gt;btree_interior_update_wait,</div><div class='del'>-				   !bch2_btree_interior_updates_pending(c));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_entry_to_btree_root(struct bch_fs *c, struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct btree_root *r = bch2_btree_id_root(c, entry-&gt;btree_id);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-</div><div class='del'>-	r-&gt;level = entry-&gt;level;</div><div class='del'>-	r-&gt;alive = true;</div><div class='del'>-	bkey_copy(&amp;r-&gt;key, (struct bkey_i *) entry-&gt;start);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct jset_entry *</div><div class='del'>-bch2_btree_roots_to_journal_entries(struct bch_fs *c,</div><div class='del'>-				    struct jset_entry *end,</div><div class='del'>-				    unsigned long skip)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; btree_id_nr_alive(c); i++) {</div><div class='del'>-		struct btree_root *r = bch2_btree_id_root(c, i);</div><div class='del'>-</div><div class='del'>-		if (r-&gt;alive &amp;&amp; !test_bit(i, &amp;skip)) {</div><div class='del'>-			journal_entry_set(end, BCH_JSET_ENTRY_btree_root,</div><div class='del'>-					  i, r-&gt;level, &amp;r-&gt;key, r-&gt;key.k.u64s);</div><div class='del'>-			end = vstruct_next(end);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_root_lock);</div><div class='del'>-</div><div class='del'>-	return end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_interior_update_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;btree_interior_update_worker)</div><div class='del'>-		destroy_workqueue(c-&gt;btree_interior_update_worker);</div><div class='del'>-	mempool_exit(&amp;c-&gt;btree_interior_update_pool);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_interior_update_init_early(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;c-&gt;btree_reserve_cache_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;btree_interior_update_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;btree_interior_updates_unwritten);</div><div class='del'>-	mutex_init(&amp;c-&gt;btree_interior_update_lock);</div><div class='del'>-	INIT_WORK(&amp;c-&gt;btree_interior_update_work, btree_interior_update_work);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;pending_node_rewrites);</div><div class='del'>-	mutex_init(&amp;c-&gt;pending_node_rewrites_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_btree_interior_update_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	c-&gt;btree_interior_update_worker =</div><div class='del'>-		alloc_workqueue("btree_update", WQ_UNBOUND|WQ_MEM_RECLAIM, 1);</div><div class='del'>-	if (!c-&gt;btree_interior_update_worker)</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_interior_update_worker_init;</div><div class='del'>-</div><div class='del'>-	if (mempool_init_kmalloc_pool(&amp;c-&gt;btree_interior_update_pool, 1,</div><div class='del'>-				      sizeof(struct btree_update)))</div><div class='del'>-		return -BCH_ERR_ENOMEM_btree_interior_update_pool_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_update_interior.h b/fs/bcachefs/btree_update_interior.h<br/>deleted file mode 100644<br/>index c593c925d1e3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_update_interior.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_update_interior.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,325 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_UPDATE_INTERIOR_H</div><div class='del'>-#define _BCACHEFS_BTREE_UPDATE_INTERIOR_H</div><div class='del'>-</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-</div><div class='del'>-#define BTREE_UPDATE_NODES_MAX		((BTREE_MAX_DEPTH - 2) * 2 + GC_MERGE_NODES)</div><div class='del'>-</div><div class='del'>-#define BTREE_UPDATE_JOURNAL_RES	(BTREE_UPDATE_NODES_MAX * (BKEY_BTREE_PTR_U64s_MAX + 1))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Tracks an in progress split/rewrite of a btree node and the update to the</div><div class='del'>- * parent node:</div><div class='del'>- *</div><div class='del'>- * When we split/rewrite a node, we do all the updates in memory without</div><div class='del'>- * waiting for any writes to complete - we allocate the new node(s) and update</div><div class='del'>- * the parent node, possibly recursively up to the root.</div><div class='del'>- *</div><div class='del'>- * The end result is that we have one or more new nodes being written -</div><div class='del'>- * possibly several, if there were multiple splits - and then a write (updating</div><div class='del'>- * an interior node) which will make all these new nodes visible.</div><div class='del'>- *</div><div class='del'>- * Additionally, as we split/rewrite nodes we free the old nodes - but the old</div><div class='del'>- * nodes can't be freed (their space on disk can't be reclaimed) until the</div><div class='del'>- * update to the interior node that makes the new node visible completes -</div><div class='del'>- * until then, the old nodes are still reachable on disk.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-struct btree_update {</div><div class='del'>-	struct closure			cl;</div><div class='del'>-	struct bch_fs			*c;</div><div class='del'>-	u64				start_time;</div><div class='del'>-</div><div class='del'>-	struct list_head		list;</div><div class='del'>-	struct list_head		unwritten_list;</div><div class='del'>-</div><div class='del'>-	/* What kind of update are we doing? */</div><div class='del'>-	enum {</div><div class='del'>-		BTREE_INTERIOR_NO_UPDATE,</div><div class='del'>-		BTREE_INTERIOR_UPDATING_NODE,</div><div class='del'>-		BTREE_INTERIOR_UPDATING_ROOT,</div><div class='del'>-		BTREE_INTERIOR_UPDATING_AS,</div><div class='del'>-	} mode;</div><div class='del'>-</div><div class='del'>-	unsigned			nodes_written:1;</div><div class='del'>-	unsigned			took_gc_lock:1;</div><div class='del'>-</div><div class='del'>-	enum btree_id			btree_id;</div><div class='del'>-	unsigned			update_level;</div><div class='del'>-</div><div class='del'>-	struct disk_reservation		disk_res;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * BTREE_INTERIOR_UPDATING_NODE:</div><div class='del'>-	 * The update that made the new nodes visible was a regular update to an</div><div class='del'>-	 * existing interior node - @b. We can't write out the update to @b</div><div class='del'>-	 * until the new nodes we created are finished writing, so we block @b</div><div class='del'>-	 * from writing by putting this btree_interior update on the</div><div class='del'>-	 * @b-&gt;write_blocked list with @write_blocked_list:</div><div class='del'>-	 */</div><div class='del'>-	struct btree			*b;</div><div class='del'>-	struct list_head		write_blocked_list;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We may be freeing nodes that were dirty, and thus had journal entries</div><div class='del'>-	 * pinned: we need to transfer the oldest of those pins to the</div><div class='del'>-	 * btree_update operation, and release it when the new node(s)</div><div class='del'>-	 * are all persistent and reachable:</div><div class='del'>-	 */</div><div class='del'>-	struct journal_entry_pin	journal;</div><div class='del'>-</div><div class='del'>-	/* Preallocated nodes we reserve when we start the update: */</div><div class='del'>-	struct prealloc_nodes {</div><div class='del'>-		struct btree		*b[BTREE_UPDATE_NODES_MAX];</div><div class='del'>-		unsigned		nr;</div><div class='del'>-	}				prealloc_nodes[2];</div><div class='del'>-</div><div class='del'>-	/* Nodes being freed: */</div><div class='del'>-	struct keylist			old_keys;</div><div class='del'>-	u64				_old_keys[BTREE_UPDATE_NODES_MAX *</div><div class='del'>-						  BKEY_BTREE_PTR_U64s_MAX];</div><div class='del'>-</div><div class='del'>-	/* Nodes being added: */</div><div class='del'>-	struct keylist			new_keys;</div><div class='del'>-	u64				_new_keys[BTREE_UPDATE_NODES_MAX *</div><div class='del'>-						  BKEY_BTREE_PTR_U64s_MAX];</div><div class='del'>-</div><div class='del'>-	/* New nodes, that will be made reachable by this update: */</div><div class='del'>-	struct btree			*new_nodes[BTREE_UPDATE_NODES_MAX];</div><div class='del'>-	unsigned			nr_new_nodes;</div><div class='del'>-</div><div class='del'>-	struct btree			*old_nodes[BTREE_UPDATE_NODES_MAX];</div><div class='del'>-	__le64				old_nodes_seq[BTREE_UPDATE_NODES_MAX];</div><div class='del'>-	unsigned			nr_old_nodes;</div><div class='del'>-</div><div class='del'>-	open_bucket_idx_t		open_buckets[BTREE_UPDATE_NODES_MAX *</div><div class='del'>-						     BCH_REPLICAS_MAX];</div><div class='del'>-	open_bucket_idx_t		nr_open_buckets;</div><div class='del'>-</div><div class='del'>-	unsigned			journal_u64s;</div><div class='del'>-	u64				journal_entries[BTREE_UPDATE_JOURNAL_RES];</div><div class='del'>-</div><div class='del'>-	/* Only here to reduce stack usage on recursive splits: */</div><div class='del'>-	struct keylist			parent_keys;</div><div class='del'>-	/*</div><div class='del'>-	 * Enough room for btree_split's keys without realloc - btree node</div><div class='del'>-	 * pointers never have crc/compression info, so we only need to acount</div><div class='del'>-	 * for the pointers for three keys</div><div class='del'>-	 */</div><div class='del'>-	u64				inline_keys[BKEY_BTREE_PTR_U64s_MAX * 3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree *__bch2_btree_node_alloc_replacement(struct btree_update *,</div><div class='del'>-						  struct btree_trans *,</div><div class='del'>-						  struct btree *,</div><div class='del'>-						  struct bkey_format);</div><div class='del'>-</div><div class='del'>-int bch2_btree_split_leaf(struct btree_trans *, btree_path_idx_t, unsigned);</div><div class='del'>-</div><div class='del'>-int __bch2_foreground_maybe_merge(struct btree_trans *, btree_path_idx_t,</div><div class='del'>-				  unsigned, unsigned, enum btree_node_sibling);</div><div class='del'>-</div><div class='del'>-static inline int bch2_foreground_maybe_merge_sibling(struct btree_trans *trans,</div><div class='del'>-					btree_path_idx_t path_idx,</div><div class='del'>-					unsigned level, unsigned flags,</div><div class='del'>-					enum btree_node_sibling sib)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = trans-&gt;paths + path_idx;</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!btree_node_locked(path, level));</div><div class='del'>-</div><div class='del'>-	b = path-&gt;l[level].b;</div><div class='del'>-	if (b-&gt;sib_u64s[sib] &gt; trans-&gt;c-&gt;btree_foreground_merge_threshold)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return __bch2_foreground_maybe_merge(trans, path_idx, level, flags, sib);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_foreground_maybe_merge(struct btree_trans *trans,</div><div class='del'>-					      btree_path_idx_t path,</div><div class='del'>-					      unsigned level,</div><div class='del'>-					      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return  bch2_foreground_maybe_merge_sibling(trans, path, level, flags,</div><div class='del'>-						    btree_prev_sib) ?:</div><div class='del'>-		bch2_foreground_maybe_merge_sibling(trans, path, level, flags,</div><div class='del'>-						    btree_next_sib);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_node_rewrite(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			    struct btree *, unsigned);</div><div class='del'>-void bch2_btree_node_rewrite_async(struct bch_fs *, struct btree *);</div><div class='del'>-int bch2_btree_node_update_key(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			       struct btree *, struct bkey_i *,</div><div class='del'>-			       unsigned, bool);</div><div class='del'>-int bch2_btree_node_update_key_get_iter(struct btree_trans *, struct btree *,</div><div class='del'>-					struct bkey_i *, unsigned, bool);</div><div class='del'>-</div><div class='del'>-void bch2_btree_set_root_for_read(struct bch_fs *, struct btree *);</div><div class='del'>-void bch2_btree_root_alloc(struct bch_fs *, enum btree_id);</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_update_reserve_required(struct bch_fs *c,</div><div class='del'>-						     struct btree *b)</div><div class='del'>-{</div><div class='del'>-	unsigned depth = btree_node_root(c, b)-&gt;c.level + 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Number of nodes we might have to allocate in a worst case btree</div><div class='del'>-	 * split operation - we split all the way up to the root, then allocate</div><div class='del'>-	 * a new root, unless we're already at max depth:</div><div class='del'>-	 */</div><div class='del'>-	if (depth &lt; BTREE_MAX_DEPTH)</div><div class='del'>-		return (depth - b-&gt;c.level) * 2 + 1;</div><div class='del'>-	else</div><div class='del'>-		return (depth - b-&gt;c.level) * 2 - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btree_node_reset_sib_u64s(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	b-&gt;sib_u64s[0] = b-&gt;nr.live_u64s;</div><div class='del'>-	b-&gt;sib_u64s[1] = b-&gt;nr.live_u64s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *btree_data_end(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return (void *) b-&gt;data + btree_buf_bytes(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *unwritten_whiteouts_start(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return (void *) ((u64 *) btree_data_end(b) - b-&gt;whiteout_u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_packed *unwritten_whiteouts_end(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return btree_data_end(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *write_block(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	return (void *) b-&gt;data + (b-&gt;written &lt;&lt; 9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __btree_addr_written(struct btree *b, void *p)</div><div class='del'>-{</div><div class='del'>-	return p &lt; write_block(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bset_written(struct btree *b, struct bset *i)</div><div class='del'>-{</div><div class='del'>-	return __btree_addr_written(b, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_written(struct btree *b, struct bkey_packed *k)</div><div class='del'>-{</div><div class='del'>-	return __btree_addr_written(b, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline ssize_t __bch2_btree_u64s_remaining(struct btree *b, void *end)</div><div class='del'>-{</div><div class='del'>-	ssize_t used = bset_byte_offset(b, end) / sizeof(u64) +</div><div class='del'>-		b-&gt;whiteout_u64s;</div><div class='del'>-	ssize_t total = btree_buf_bytes(b) &gt;&gt; 3;</div><div class='del'>-</div><div class='del'>-	/* Always leave one extra u64 for bch2_varint_decode: */</div><div class='del'>-	used++;</div><div class='del'>-</div><div class='del'>-	return total - used;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t bch2_btree_keys_u64s_remaining(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	ssize_t remaining = __bch2_btree_u64s_remaining(b,</div><div class='del'>-				btree_bkey_last(b, bset_tree_last(b)));</div><div class='del'>-</div><div class='del'>-	BUG_ON(remaining &lt; 0);</div><div class='del'>-</div><div class='del'>-	if (bset_written(b, btree_bset_last(b)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return remaining;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BTREE_WRITE_SET_U64s_BITS	9</div><div class='del'>-</div><div class='del'>-static inline unsigned btree_write_set_buffer(struct btree *b)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Could buffer up larger amounts of keys for btrees with larger keys,</div><div class='del'>-	 * pending benchmarking:</div><div class='del'>-	 */</div><div class='del'>-	return 8 &lt;&lt; BTREE_WRITE_SET_U64s_BITS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct btree_node_entry *want_new_bset(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bset_tree *t = bset_tree_last(b);</div><div class='del'>-	struct btree_node_entry *bne = max(write_block(b),</div><div class='del'>-			(void *) btree_bkey_last(b, bset_tree_last(b)));</div><div class='del'>-	ssize_t remaining_space =</div><div class='del'>-		__bch2_btree_u64s_remaining(b, bne-&gt;keys.start);</div><div class='del'>-</div><div class='del'>-	if (unlikely(bset_written(b, bset(b, t)))) {</div><div class='del'>-		if (remaining_space &gt; (ssize_t) (block_bytes(c) &gt;&gt; 3))</div><div class='del'>-			return bne;</div><div class='del'>-	} else {</div><div class='del'>-		if (unlikely(bset_u64s(t) * sizeof(u64) &gt; btree_write_set_buffer(b)) &amp;&amp;</div><div class='del'>-		    remaining_space &gt; (ssize_t) (btree_write_set_buffer(b) &gt;&gt; 3))</div><div class='del'>-			return bne;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void push_whiteout(struct btree *b, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bkey_packed k;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_btree_keys_u64s_remaining(b) &lt; BKEY_U64s);</div><div class='del'>-	EBUG_ON(btree_node_just_written(b));</div><div class='del'>-</div><div class='del'>-	if (!bkey_pack_pos(&amp;k, pos, b)) {</div><div class='del'>-		struct bkey *u = (void *) &amp;k;</div><div class='del'>-</div><div class='del'>-		bkey_init(u);</div><div class='del'>-		u-&gt;p = pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k.needs_whiteout = true;</div><div class='del'>-</div><div class='del'>-	b-&gt;whiteout_u64s += k.u64s;</div><div class='del'>-	bkey_p_copy(unwritten_whiteouts_start(b), &amp;k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write lock must be held on @b (else the dirty bset that we were going to</div><div class='del'>- * insert into could be written out from under us)</div><div class='del'>- */</div><div class='del'>-static inline bool bch2_btree_node_insert_fits(struct btree *b, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(btree_node_need_rewrite(b)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return u64s &lt;= bch2_btree_keys_u64s_remaining(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_updates_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-bool bch2_btree_interior_updates_flush(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_entry_to_btree_root(struct bch_fs *, struct jset_entry *);</div><div class='del'>-struct jset_entry *bch2_btree_roots_to_journal_entries(struct bch_fs *,</div><div class='del'>-					struct jset_entry *, unsigned long);</div><div class='del'>-</div><div class='del'>-void bch2_do_pending_node_rewrites(struct bch_fs *);</div><div class='del'>-void bch2_free_pending_node_rewrites(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_interior_update_exit(struct bch_fs *);</div><div class='del'>-void bch2_fs_btree_interior_update_init_early(struct bch_fs *);</div><div class='del'>-int bch2_fs_btree_interior_update_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_UPDATE_INTERIOR_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_write_buffer.c b/fs/bcachefs/btree_write_buffer.c<br/>deleted file mode 100644<br/>index ac7844861966..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_write_buffer.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_write_buffer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,646 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-</div><div class='del'>-static int bch2_btree_write_buffer_journal_flush(struct journal *,</div><div class='del'>-				struct journal_entry_pin *, u64);</div><div class='del'>-</div><div class='del'>-static int bch2_journal_keys_to_write_buffer(struct bch_fs *, struct journal_buf *);</div><div class='del'>-</div><div class='del'>-static inline bool __wb_key_ref_cmp(const struct wb_key_ref *l, const struct wb_key_ref *r)</div><div class='del'>-{</div><div class='del'>-	return (cmp_int(l-&gt;hi, r-&gt;hi) ?:</div><div class='del'>-		cmp_int(l-&gt;mi, r-&gt;mi) ?:</div><div class='del'>-		cmp_int(l-&gt;lo, r-&gt;lo)) &gt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool wb_key_ref_cmp(const struct wb_key_ref *l, const struct wb_key_ref *r)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	int cmp;</div><div class='del'>-</div><div class='del'>-	asm("mov   (%[l]), %%rax;"</div><div class='del'>-	    "sub   (%[r]), %%rax;"</div><div class='del'>-	    "mov  8(%[l]), %%rax;"</div><div class='del'>-	    "sbb  8(%[r]), %%rax;"</div><div class='del'>-	    "mov 16(%[l]), %%rax;"</div><div class='del'>-	    "sbb 16(%[r]), %%rax;"</div><div class='del'>-	    : "=@ccae" (cmp)</div><div class='del'>-	    : [l] "r" (l), [r] "r" (r)</div><div class='del'>-	    : "rax", "cc");</div><div class='del'>-</div><div class='del'>-	EBUG_ON(cmp != __wb_key_ref_cmp(l, r));</div><div class='del'>-	return cmp;</div><div class='del'>-#else</div><div class='del'>-	return __wb_key_ref_cmp(l, r);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compare excluding idx, the low 24 bits: */</div><div class='del'>-static inline bool wb_key_eq(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const struct wb_key_ref *l = _l;</div><div class='del'>-	const struct wb_key_ref *r = _r;</div><div class='del'>-</div><div class='del'>-	return !((l-&gt;hi ^ r-&gt;hi)|</div><div class='del'>-		 (l-&gt;mi ^ r-&gt;mi)|</div><div class='del'>-		 ((l-&gt;lo &gt;&gt; 24) ^ (r-&gt;lo &gt;&gt; 24)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void wb_sort(struct wb_key_ref *base, size_t num)</div><div class='del'>-{</div><div class='del'>-	size_t n = num, a = num / 2;</div><div class='del'>-</div><div class='del'>-	if (!a)		/* num &lt; 2 || size == 0 */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		size_t b, c, d;</div><div class='del'>-</div><div class='del'>-		if (a)			/* Building heap: sift down --a */</div><div class='del'>-			--a;</div><div class='del'>-		else if (--n)		/* Sorting: Extract root to --n */</div><div class='del'>-			swap(base[0], base[n]);</div><div class='del'>-		else			/* Sort complete */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Sift element at "a" down into heap.  This is the</div><div class='del'>-		 * "bottom-up" variant, which significantly reduces</div><div class='del'>-		 * calls to cmp_func(): we find the sift-down path all</div><div class='del'>-		 * the way to the leaves (one compare per level), then</div><div class='del'>-		 * backtrack to find where to insert the target element.</div><div class='del'>-		 *</div><div class='del'>-		 * Because elements tend to sift down close to the leaves,</div><div class='del'>-		 * this uses fewer compares than doing two per level</div><div class='del'>-		 * on the way down.  (A bit more than half as many on</div><div class='del'>-		 * average, 3/4 worst-case.)</div><div class='del'>-		 */</div><div class='del'>-		for (b = a; c = 2*b + 1, (d = c + 1) &lt; n;)</div><div class='del'>-			b = wb_key_ref_cmp(base + c, base + d) ? c : d;</div><div class='del'>-		if (d == n)		/* Special case last leaf with no sibling */</div><div class='del'>-			b = c;</div><div class='del'>-</div><div class='del'>-		/* Now backtrack from "b" to the correct location for "a" */</div><div class='del'>-		while (b != a &amp;&amp; wb_key_ref_cmp(base + a, base + b))</div><div class='del'>-			b = (b - 1) / 2;</div><div class='del'>-		c = b;			/* Where "a" belongs */</div><div class='del'>-		while (b != a) {	/* Shift it into place */</div><div class='del'>-			b = (b - 1) / 2;</div><div class='del'>-			swap(base[b], base[c]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int wb_flush_one_slowpath(struct btree_trans *trans,</div><div class='del'>-					  struct btree_iter *iter,</div><div class='del'>-					  struct btree_write_buffered_key *wb)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path = btree_iter_path(trans, iter);</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_unlock_write(trans, path, path-&gt;l[0].b);</div><div class='del'>-</div><div class='del'>-	trans-&gt;journal_res.seq = wb-&gt;journal_seq;</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update(trans, iter, &amp;wb-&gt;k,</div><div class='del'>-				 BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				  BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-				  BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-				  BCH_TRANS_COMMIT_no_journal_res|</div><div class='del'>-				  BCH_TRANS_COMMIT_journal_reclaim);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int wb_flush_one(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			       struct btree_write_buffered_key *wb,</div><div class='del'>-			       bool *write_locked, size_t *fast)</div><div class='del'>-{</div><div class='del'>-	struct btree_path *path;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!wb-&gt;journal_seq);</div><div class='del'>-	EBUG_ON(!trans-&gt;c-&gt;btree_write_buffer.flushing.pin.seq);</div><div class='del'>-	EBUG_ON(trans-&gt;c-&gt;btree_write_buffer.flushing.pin.seq &gt; wb-&gt;journal_seq);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_iter_traverse(iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't clone a path that has write locks: unshare it now, before</div><div class='del'>-	 * set_pos and traverse():</div><div class='del'>-	 */</div><div class='del'>-	if (btree_iter_path(trans, iter)-&gt;ref &gt; 1)</div><div class='del'>-		iter-&gt;path = __bch2_btree_path_make_mut(trans, iter-&gt;path, true, _THIS_IP_);</div><div class='del'>-</div><div class='del'>-	path = btree_iter_path(trans, iter);</div><div class='del'>-</div><div class='del'>-	if (!*write_locked) {</div><div class='del'>-		ret = bch2_btree_node_lock_write(trans, path, &amp;path-&gt;l[0].b-&gt;c);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bch2_btree_node_prep_for_write(trans, path, path-&gt;l[0].b);</div><div class='del'>-		*write_locked = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(!bch2_btree_node_insert_fits(path-&gt;l[0].b, wb-&gt;k.k.u64s))) {</div><div class='del'>-		*write_locked = false;</div><div class='del'>-		return wb_flush_one_slowpath(trans, iter, wb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_insert_key_leaf(trans, path, &amp;wb-&gt;k, wb-&gt;journal_seq);</div><div class='del'>-	(*fast)++;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Update a btree with a write buffered key using the journal seq of the</div><div class='del'>- * original write buffer insert.</div><div class='del'>- *</div><div class='del'>- * It is not safe to rejournal the key once it has been inserted into the write</div><div class='del'>- * buffer because that may break recovery ordering. For example, the key may</div><div class='del'>- * have already been modified in the active write buffer in a seq that comes</div><div class='del'>- * before the current transaction. If we were to journal this key again and</div><div class='del'>- * crash, recovery would process updates in the wrong order.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-btree_write_buffered_insert(struct btree_trans *trans,</div><div class='del'>-			  struct btree_write_buffered_key *wb)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, wb-&gt;btree, bkey_start_pos(&amp;wb-&gt;k.k),</div><div class='del'>-			     BTREE_ITER_CACHED|BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	trans-&gt;journal_res.seq = wb-&gt;journal_seq;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_trans_update(trans, &amp;iter, &amp;wb-&gt;k,</div><div class='del'>-				  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void move_keys_from_inc_to_flushing(struct btree_write_buffer *wb)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(wb, struct bch_fs, btree_write_buffer);</div><div class='del'>-	struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-</div><div class='del'>-	if (!wb-&gt;inc.keys.nr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_add(j, wb-&gt;inc.keys.data[0].journal_seq, &amp;wb-&gt;flushing.pin,</div><div class='del'>-			     bch2_btree_write_buffer_journal_flush);</div><div class='del'>-</div><div class='del'>-	darray_resize(&amp;wb-&gt;flushing.keys, min_t(size_t, 1U &lt;&lt; 20, wb-&gt;flushing.keys.nr + wb-&gt;inc.keys.nr));</div><div class='del'>-	darray_resize(&amp;wb-&gt;sorted, wb-&gt;flushing.keys.size);</div><div class='del'>-</div><div class='del'>-	if (!wb-&gt;flushing.keys.nr &amp;&amp; wb-&gt;sorted.size &gt;= wb-&gt;inc.keys.nr) {</div><div class='del'>-		swap(wb-&gt;flushing.keys, wb-&gt;inc.keys);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	size_t nr = min(darray_room(wb-&gt;flushing.keys),</div><div class='del'>-			wb-&gt;sorted.size - wb-&gt;flushing.keys.nr);</div><div class='del'>-	nr = min(nr, wb-&gt;inc.keys.nr);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;darray_top(wb-&gt;flushing.keys),</div><div class='del'>-	       wb-&gt;inc.keys.data,</div><div class='del'>-	       sizeof(wb-&gt;inc.keys.data[0]) * nr);</div><div class='del'>-</div><div class='del'>-	memmove(wb-&gt;inc.keys.data,</div><div class='del'>-		wb-&gt;inc.keys.data + nr,</div><div class='del'>-	       sizeof(wb-&gt;inc.keys.data[0]) * (wb-&gt;inc.keys.nr - nr));</div><div class='del'>-</div><div class='del'>-	wb-&gt;flushing.keys.nr	+= nr;</div><div class='del'>-	wb-&gt;inc.keys.nr		-= nr;</div><div class='del'>-out:</div><div class='del'>-	if (!wb-&gt;inc.keys.nr)</div><div class='del'>-		bch2_journal_pin_drop(j, &amp;wb-&gt;inc.pin);</div><div class='del'>-	else</div><div class='del'>-		bch2_journal_pin_update(j, wb-&gt;inc.keys.data[0].journal_seq, &amp;wb-&gt;inc.pin,</div><div class='del'>-					bch2_btree_write_buffer_journal_flush);</div><div class='del'>-</div><div class='del'>-	if (j-&gt;watermark) {</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		bch2_journal_set_watermark(j);</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(wb-&gt;sorted.size &lt; wb-&gt;flushing.keys.nr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_write_buffer_flush_locked(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	size_t skipped = 0, fast = 0, slowpath = 0;</div><div class='del'>-	bool write_locked = false;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wb-&gt;inc.lock);</div><div class='del'>-	move_keys_from_inc_to_flushing(wb);</div><div class='del'>-	mutex_unlock(&amp;wb-&gt;inc.lock);</div><div class='del'>-</div><div class='del'>-	for (size_t i = 0; i &lt; wb-&gt;flushing.keys.nr; i++) {</div><div class='del'>-		wb-&gt;sorted.data[i].idx = i;</div><div class='del'>-		wb-&gt;sorted.data[i].btree = wb-&gt;flushing.keys.data[i].btree;</div><div class='del'>-		memcpy(&amp;wb-&gt;sorted.data[i].pos, &amp;wb-&gt;flushing.keys.data[i].k.k.p, sizeof(struct bpos));</div><div class='del'>-	}</div><div class='del'>-	wb-&gt;sorted.nr = wb-&gt;flushing.keys.nr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We first sort so that we can detect and skip redundant updates, and</div><div class='del'>-	 * then we attempt to flush in sorted btree order, as this is most</div><div class='del'>-	 * efficient.</div><div class='del'>-	 *</div><div class='del'>-	 * However, since we're not flushing in the order they appear in the</div><div class='del'>-	 * journal we won't be able to drop our journal pin until everything is</div><div class='del'>-	 * flushed - which means this could deadlock the journal if we weren't</div><div class='del'>-	 * passing BCH_TRANS_COMMIT_journal_reclaim. This causes the update to fail</div><div class='del'>-	 * if it would block taking a journal reservation.</div><div class='del'>-	 *</div><div class='del'>-	 * If that happens, simply skip the key so we can optimistically insert</div><div class='del'>-	 * as many keys as possible in the fast path.</div><div class='del'>-	 */</div><div class='del'>-	wb_sort(wb-&gt;sorted.data, wb-&gt;sorted.nr);</div><div class='del'>-</div><div class='del'>-	darray_for_each(wb-&gt;sorted, i) {</div><div class='del'>-		struct btree_write_buffered_key *k = &amp;wb-&gt;flushing.keys.data[i-&gt;idx];</div><div class='del'>-</div><div class='del'>-		for (struct wb_key_ref *n = i + 1; n &lt; min(i + 4, &amp;darray_top(wb-&gt;sorted)); n++)</div><div class='del'>-			prefetch(&amp;wb-&gt;flushing.keys.data[n-&gt;idx]);</div><div class='del'>-</div><div class='del'>-		BUG_ON(!k-&gt;journal_seq);</div><div class='del'>-</div><div class='del'>-		if (i + 1 &lt; &amp;darray_top(wb-&gt;sorted) &amp;&amp;</div><div class='del'>-		    wb_key_eq(i, i + 1)) {</div><div class='del'>-			struct btree_write_buffered_key *n = &amp;wb-&gt;flushing.keys.data[i[1].idx];</div><div class='del'>-</div><div class='del'>-			skipped++;</div><div class='del'>-			n-&gt;journal_seq = min_t(u64, n-&gt;journal_seq, k-&gt;journal_seq);</div><div class='del'>-			k-&gt;journal_seq = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (write_locked) {</div><div class='del'>-			struct btree_path *path = btree_iter_path(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-			if (path-&gt;btree_id != i-&gt;btree ||</div><div class='del'>-			    bpos_gt(k-&gt;k.k.p, path-&gt;l[0].b-&gt;key.k.p)) {</div><div class='del'>-				bch2_btree_node_unlock_write(trans, path, path-&gt;l[0].b);</div><div class='del'>-				write_locked = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!iter.path || iter.btree_id != k-&gt;btree) {</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-			bch2_trans_iter_init(trans, &amp;iter, k-&gt;btree, k-&gt;k.k.p,</div><div class='del'>-					     BTREE_ITER_INTENT|BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter, k-&gt;k.k.p);</div><div class='del'>-		btree_iter_path(trans, &amp;iter)-&gt;preserve = false;</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			if (race_fault()) {</div><div class='del'>-				ret = -BCH_ERR_journal_reclaim_would_deadlock;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = wb_flush_one(trans, &amp;iter, k, &amp;write_locked, &amp;fast);</div><div class='del'>-			if (!write_locked)</div><div class='del'>-				bch2_trans_begin(trans);</div><div class='del'>-		} while (bch2_err_matches(ret, BCH_ERR_transaction_restart));</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='del'>-			k-&gt;journal_seq = 0;</div><div class='del'>-		} else if (ret == -BCH_ERR_journal_reclaim_would_deadlock) {</div><div class='del'>-			slowpath++;</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write_locked) {</div><div class='del'>-		struct btree_path *path = btree_iter_path(trans, &amp;iter);</div><div class='del'>-		bch2_btree_node_unlock_write(trans, path, path-&gt;l[0].b);</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (slowpath) {</div><div class='del'>-		/*</div><div class='del'>-		 * Flush in the order they were present in the journal, so that</div><div class='del'>-		 * we can release journal pins:</div><div class='del'>-		 * The fastpath zapped the seq of keys that were successfully flushed so</div><div class='del'>-		 * we can skip those here.</div><div class='del'>-		 */</div><div class='del'>-		trace_and_count(c, write_buffer_flush_slowpath, trans, slowpath, wb-&gt;flushing.keys.nr);</div><div class='del'>-</div><div class='del'>-		darray_for_each(wb-&gt;flushing.keys, i) {</div><div class='del'>-			if (!i-&gt;journal_seq)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			bch2_journal_pin_update(j, i-&gt;journal_seq, &amp;wb-&gt;flushing.pin,</div><div class='del'>-						bch2_btree_write_buffer_journal_flush);</div><div class='del'>-</div><div class='del'>-			bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-			ret = commit_do(trans, NULL, NULL,</div><div class='del'>-					BCH_WATERMARK_reclaim|</div><div class='del'>-					BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-					BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-					BCH_TRANS_COMMIT_no_journal_res|</div><div class='del'>-					BCH_TRANS_COMMIT_journal_reclaim,</div><div class='del'>-					btree_write_buffered_insert(trans, i));</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_fs_fatal_err_on(ret, c, "%s: insert error %s", __func__, bch2_err_str(ret));</div><div class='del'>-	trace_write_buffer_flush(trans, wb-&gt;flushing.keys.nr, skipped, fast, 0);</div><div class='del'>-	bch2_journal_pin_drop(j, &amp;wb-&gt;flushing.pin);</div><div class='del'>-	wb-&gt;flushing.keys.nr = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fetch_wb_keys_from_journal(struct bch_fs *c, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-	struct journal_buf *buf;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	while (!ret &amp;&amp; (buf = bch2_next_write_buffer_flush_journal_buf(j, seq))) {</div><div class='del'>-		ret = bch2_journal_keys_to_write_buffer(c, buf);</div><div class='del'>-		mutex_unlock(&amp;j-&gt;buf_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_write_buffer_flush_seq(struct btree_trans *trans, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-	int ret = 0, fetch_from_journal_err;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-		fetch_from_journal_err = fetch_wb_keys_from_journal(c, seq);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * On memory allocation failure, bch2_btree_write_buffer_flush_locked()</div><div class='del'>-		 * is not guaranteed to empty wb-&gt;inc:</div><div class='del'>-		 */</div><div class='del'>-		mutex_lock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-		ret = bch2_btree_write_buffer_flush_locked(trans);</div><div class='del'>-		mutex_unlock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-	} while (!ret &amp;&amp;</div><div class='del'>-		 (fetch_from_journal_err ||</div><div class='del'>-		  (wb-&gt;inc.pin.seq &amp;&amp; wb-&gt;inc.pin.seq &lt;= seq) ||</div><div class='del'>-		  (wb-&gt;flushing.pin.seq &amp;&amp; wb-&gt;flushing.pin.seq &lt;= seq)));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_btree_write_buffer_journal_flush(struct journal *j,</div><div class='del'>-				struct journal_entry_pin *_pin, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-</div><div class='del'>-	return bch2_trans_run(c, btree_write_buffer_flush_seq(trans, seq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_write_buffer_flush_sync(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, write_buffer_flush_sync, trans, _RET_IP_);</div><div class='del'>-</div><div class='del'>-	return btree_write_buffer_flush_seq(trans, journal_cur_seq(&amp;c-&gt;journal));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_write_buffer_flush_nocheck_rw(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (mutex_trylock(&amp;wb-&gt;flushing.lock)) {</div><div class='del'>-		ret = bch2_btree_write_buffer_flush_locked(trans);</div><div class='del'>-		mutex_unlock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_write_buffer_tryflush(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_btree_write_buffer))</div><div class='del'>-		return -BCH_ERR_erofs_no_writes;</div><div class='del'>-</div><div class='del'>-	int ret = bch2_btree_write_buffer_flush_nocheck_rw(trans);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_btree_write_buffer);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_write_buffer_flush_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work, struct bch_fs, btree_write_buffer.flush_work);</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-	do {</div><div class='del'>-		ret = bch2_trans_run(c, bch2_btree_write_buffer_flush_locked(trans));</div><div class='del'>-	} while (!ret &amp;&amp; bch2_btree_write_buffer_should_flush(c));</div><div class='del'>-	mutex_unlock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_btree_write_buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_key_to_wb_slowpath(struct bch_fs *c,</div><div class='del'>-			     struct journal_keys_to_wb *dst,</div><div class='del'>-			     enum btree_id btree, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	ret = darray_make_room_gfp(&amp;dst-&gt;wb-&gt;keys, 1, GFP_KERNEL);</div><div class='del'>-	if (!ret &amp;&amp; dst-&gt;wb == &amp;wb-&gt;flushing)</div><div class='del'>-		ret = darray_resize(&amp;wb-&gt;sorted, wb-&gt;flushing.keys.size);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		if (dst-&gt;wb == &amp;c-&gt;btree_write_buffer.flushing) {</div><div class='del'>-			mutex_unlock(&amp;dst-&gt;wb-&gt;lock);</div><div class='del'>-			dst-&gt;wb = &amp;c-&gt;btree_write_buffer.inc;</div><div class='del'>-			bch2_journal_pin_add(&amp;c-&gt;journal, dst-&gt;seq, &amp;dst-&gt;wb-&gt;pin,</div><div class='del'>-					     bch2_btree_write_buffer_journal_flush);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;room = darray_room(dst-&gt;wb-&gt;keys);</div><div class='del'>-	if (dst-&gt;wb == &amp;wb-&gt;flushing)</div><div class='del'>-		dst-&gt;room = min(dst-&gt;room, wb-&gt;sorted.size - wb-&gt;flushing.keys.nr);</div><div class='del'>-	BUG_ON(!dst-&gt;room);</div><div class='del'>-	BUG_ON(!dst-&gt;seq);</div><div class='del'>-</div><div class='del'>-	struct btree_write_buffered_key *wb_k = &amp;darray_top(dst-&gt;wb-&gt;keys);</div><div class='del'>-	wb_k-&gt;journal_seq	= dst-&gt;seq;</div><div class='del'>-	wb_k-&gt;btree		= btree;</div><div class='del'>-	bkey_copy(&amp;wb_k-&gt;k, k);</div><div class='del'>-	dst-&gt;wb-&gt;keys.nr++;</div><div class='del'>-	dst-&gt;room--;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_keys_to_write_buffer_start(struct bch_fs *c, struct journal_keys_to_wb *dst, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	if (mutex_trylock(&amp;wb-&gt;flushing.lock)) {</div><div class='del'>-		mutex_lock(&amp;wb-&gt;inc.lock);</div><div class='del'>-		move_keys_from_inc_to_flushing(wb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Attempt to skip wb-&gt;inc, and add keys directly to</div><div class='del'>-		 * wb-&gt;flushing, saving us a copy later:</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (!wb-&gt;inc.keys.nr) {</div><div class='del'>-			dst-&gt;wb = &amp;wb-&gt;flushing;</div><div class='del'>-		} else {</div><div class='del'>-			mutex_unlock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-			dst-&gt;wb = &amp;wb-&gt;inc;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		mutex_lock(&amp;wb-&gt;inc.lock);</div><div class='del'>-		dst-&gt;wb = &amp;wb-&gt;inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;room = darray_room(dst-&gt;wb-&gt;keys);</div><div class='del'>-	if (dst-&gt;wb == &amp;wb-&gt;flushing)</div><div class='del'>-		dst-&gt;room = min(dst-&gt;room, wb-&gt;sorted.size - wb-&gt;flushing.keys.nr);</div><div class='del'>-	dst-&gt;seq = seq;</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_add(&amp;c-&gt;journal, seq, &amp;dst-&gt;wb-&gt;pin,</div><div class='del'>-			     bch2_btree_write_buffer_journal_flush);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_keys_to_write_buffer_end(struct bch_fs *c, struct journal_keys_to_wb *dst)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	if (!dst-&gt;wb-&gt;keys.nr)</div><div class='del'>-		bch2_journal_pin_drop(&amp;c-&gt;journal, &amp;dst-&gt;wb-&gt;pin);</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_write_buffer_should_flush(c) &amp;&amp;</div><div class='del'>-	    __bch2_write_ref_tryget(c, BCH_WRITE_REF_btree_write_buffer) &amp;&amp;</div><div class='del'>-	    !queue_work(system_unbound_wq, &amp;c-&gt;btree_write_buffer.flush_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_btree_write_buffer);</div><div class='del'>-</div><div class='del'>-	if (dst-&gt;wb == &amp;wb-&gt;flushing)</div><div class='del'>-		mutex_unlock(&amp;wb-&gt;flushing.lock);</div><div class='del'>-	mutex_unlock(&amp;wb-&gt;inc.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_journal_keys_to_write_buffer(struct bch_fs *c, struct journal_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys_to_wb dst;</div><div class='del'>-	struct jset_entry *entry;</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_journal_keys_to_write_buffer_start(c, &amp;dst, le64_to_cpu(buf-&gt;data-&gt;seq));</div><div class='del'>-</div><div class='del'>-	for_each_jset_entry_type(entry, buf-&gt;data, BCH_JSET_ENTRY_write_buffer_keys) {</div><div class='del'>-		jset_entry_for_each_key(entry, k) {</div><div class='del'>-			ret = bch2_journal_key_to_wb(c, &amp;dst, entry-&gt;btree_id, k);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		entry-&gt;type = BCH_JSET_ENTRY_btree_keys;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf-&gt;need_flush_to_write_buffer = false;</div><div class='del'>-out:</div><div class='del'>-	bch2_journal_keys_to_write_buffer_end(c, &amp;dst);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wb_keys_resize(struct btree_write_buffer_keys *wb, size_t new_size)</div><div class='del'>-{</div><div class='del'>-	if (wb-&gt;keys.size &gt;= new_size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!mutex_trylock(&amp;wb-&gt;lock))</div><div class='del'>-		return -EINTR;</div><div class='del'>-</div><div class='del'>-	int ret = darray_resize(&amp;wb-&gt;keys, new_size);</div><div class='del'>-	mutex_unlock(&amp;wb-&gt;lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_write_buffer_resize(struct bch_fs *c, size_t new_size)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	return wb_keys_resize(&amp;wb-&gt;flushing, new_size) ?:</div><div class='del'>-		wb_keys_resize(&amp;wb-&gt;inc, new_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_btree_write_buffer_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	BUG_ON((wb-&gt;inc.keys.nr || wb-&gt;flushing.keys.nr) &amp;&amp;</div><div class='del'>-	       !bch2_journal_error(&amp;c-&gt;journal));</div><div class='del'>-</div><div class='del'>-	darray_exit(&amp;wb-&gt;sorted);</div><div class='del'>-	darray_exit(&amp;wb-&gt;flushing.keys);</div><div class='del'>-	darray_exit(&amp;wb-&gt;inc.keys);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_btree_write_buffer_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;wb-&gt;inc.lock);</div><div class='del'>-	mutex_init(&amp;wb-&gt;flushing.lock);</div><div class='del'>-	INIT_WORK(&amp;wb-&gt;flush_work, bch2_btree_write_buffer_flush_work);</div><div class='del'>-</div><div class='del'>-	/* Will be resized by journal as needed: */</div><div class='del'>-	unsigned initial_size = 1 &lt;&lt; 16;</div><div class='del'>-</div><div class='del'>-	return  darray_make_room(&amp;wb-&gt;inc.keys, initial_size) ?:</div><div class='del'>-		darray_make_room(&amp;wb-&gt;flushing.keys, initial_size) ?:</div><div class='del'>-		darray_make_room(&amp;wb-&gt;sorted, initial_size);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/btree_write_buffer.h b/fs/bcachefs/btree_write_buffer.h<br/>deleted file mode 100644<br/>index eebcd2b15249..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_write_buffer.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_write_buffer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_WRITE_BUFFER_H</div><div class='del'>-#define _BCACHEFS_BTREE_WRITE_BUFFER_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-</div><div class='del'>-static inline bool bch2_btree_write_buffer_should_flush(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	return wb-&gt;inc.keys.nr + wb-&gt;flushing.keys.nr &gt; wb-&gt;inc.keys.size / 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_btree_write_buffer_must_wait(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_write_buffer *wb = &amp;c-&gt;btree_write_buffer;</div><div class='del'>-</div><div class='del'>-	return wb-&gt;inc.keys.nr &gt; wb-&gt;inc.keys.size * 3 / 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct btree_trans;</div><div class='del'>-int bch2_btree_write_buffer_flush_sync(struct btree_trans *);</div><div class='del'>-int bch2_btree_write_buffer_flush_nocheck_rw(struct btree_trans *);</div><div class='del'>-int bch2_btree_write_buffer_tryflush(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-struct journal_keys_to_wb {</div><div class='del'>-	struct btree_write_buffer_keys	*wb;</div><div class='del'>-	size_t				room;</div><div class='del'>-	u64				seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_journal_key_to_wb_slowpath(struct bch_fs *,</div><div class='del'>-			     struct journal_keys_to_wb *,</div><div class='del'>-			     enum btree_id, struct bkey_i *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_journal_key_to_wb(struct bch_fs *c,</div><div class='del'>-			     struct journal_keys_to_wb *dst,</div><div class='del'>-			     enum btree_id btree, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!dst-&gt;seq);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!dst-&gt;room))</div><div class='del'>-		return bch2_journal_key_to_wb_slowpath(c, dst, btree, k);</div><div class='del'>-</div><div class='del'>-	struct btree_write_buffered_key *wb_k = &amp;darray_top(dst-&gt;wb-&gt;keys);</div><div class='del'>-	wb_k-&gt;journal_seq	= dst-&gt;seq;</div><div class='del'>-	wb_k-&gt;btree		= btree;</div><div class='del'>-	bkey_copy(&amp;wb_k-&gt;k, k);</div><div class='del'>-	dst-&gt;wb-&gt;keys.nr++;</div><div class='del'>-	dst-&gt;room--;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_keys_to_write_buffer_start(struct bch_fs *, struct journal_keys_to_wb *, u64);</div><div class='del'>-void bch2_journal_keys_to_write_buffer_end(struct bch_fs *, struct journal_keys_to_wb *);</div><div class='del'>-</div><div class='del'>-int bch2_btree_write_buffer_resize(struct bch_fs *, size_t);</div><div class='del'>-void bch2_fs_btree_write_buffer_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_btree_write_buffer_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_WRITE_BUFFER_H */</div><div class='head'>diff --git a/fs/bcachefs/btree_write_buffer_types.h b/fs/bcachefs/btree_write_buffer_types.h<br/>deleted file mode 100644<br/>index 9b9433de9c36..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/btree_write_buffer_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/btree_write_buffer_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_BTREE_WRITE_BUFFER_TYPES_H</div><div class='del'>-#define _BCACHEFS_BTREE_WRITE_BUFFER_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "darray.h"</div><div class='del'>-#include "journal_types.h"</div><div class='del'>-</div><div class='del'>-#define BTREE_WRITE_BUFERED_VAL_U64s_MAX	4</div><div class='del'>-#define BTREE_WRITE_BUFERED_U64s_MAX	(BKEY_U64s + BTREE_WRITE_BUFERED_VAL_U64s_MAX)</div><div class='del'>-</div><div class='del'>-struct wb_key_ref {</div><div class='del'>-union {</div><div class='del'>-	struct {</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-		unsigned			idx:24;</div><div class='del'>-		u8				pos[sizeof(struct bpos)];</div><div class='del'>-		enum btree_id			btree:8;</div><div class='del'>-#else</div><div class='del'>-		enum btree_id			btree:8;</div><div class='del'>-		u8				pos[sizeof(struct bpos)];</div><div class='del'>-		unsigned			idx:24;</div><div class='del'>-#endif</div><div class='del'>-	} __packed;</div><div class='del'>-	struct {</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-		u64 lo;</div><div class='del'>-		u64 mi;</div><div class='del'>-		u64 hi;</div><div class='del'>-#else</div><div class='del'>-		u64 hi;</div><div class='del'>-		u64 mi;</div><div class='del'>-		u64 lo;</div><div class='del'>-#endif</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_write_buffered_key {</div><div class='del'>-	enum btree_id			btree:8;</div><div class='del'>-	u64				journal_seq:56;</div><div class='del'>-	__BKEY_PADDED(k, BTREE_WRITE_BUFERED_VAL_U64s_MAX);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_write_buffer_keys {</div><div class='del'>-	DARRAY(struct btree_write_buffered_key) keys;</div><div class='del'>-	struct journal_entry_pin	pin;</div><div class='del'>-	struct mutex			lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btree_write_buffer {</div><div class='del'>-	DARRAY(struct wb_key_ref)	sorted;</div><div class='del'>-	struct btree_write_buffer_keys	inc;</div><div class='del'>-	struct btree_write_buffer_keys	flushing;</div><div class='del'>-	struct work_struct		flush_work;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_BTREE_WRITE_BUFFER_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c<br/>deleted file mode 100644<br/>index 54f7826ac498..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/buckets.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1437 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Code for manipulating bucket marks for garbage collection.</div><div class='del'>- *</div><div class='del'>- * Copyright 2014 Datera, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "buckets_waiting_for_journal.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "movinggc.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "reflink.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='del'>-</div><div class='del'>-static inline void fs_usage_data_type_to_base(struct bch_fs_usage_base *fs_usage,</div><div class='del'>-					      enum bch_data_type data_type,</div><div class='del'>-					      s64 sectors)</div><div class='del'>-{</div><div class='del'>-	switch (data_type) {</div><div class='del'>-	case BCH_DATA_btree:</div><div class='del'>-		fs_usage-&gt;btree		+= sectors;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_user:</div><div class='del'>-	case BCH_DATA_parity:</div><div class='del'>-		fs_usage-&gt;data		+= sectors;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_cached:</div><div class='del'>-		fs_usage-&gt;cached	+= sectors;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_usage_initialize(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-	struct bch_fs_usage *usage = c-&gt;usage_base;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(c-&gt;usage); i++)</div><div class='del'>-		bch2_fs_usage_acc_to_base(c, i);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_REPLICAS_MAX; i++)</div><div class='del'>-		usage-&gt;b.reserved += usage-&gt;persistent_reserved[i];</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; c-&gt;replicas.nr; i++) {</div><div class='del'>-		struct bch_replicas_entry_v1 *e =</div><div class='del'>-			cpu_replicas_entry(&amp;c-&gt;replicas, i);</div><div class='del'>-</div><div class='del'>-		fs_usage_data_type_to_base(&amp;usage-&gt;b, e-&gt;data_type, usage-&gt;replicas[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		struct bch_dev_usage dev = bch2_dev_usage_read(ca);</div><div class='del'>-</div><div class='del'>-		usage-&gt;b.hidden += (dev.d[BCH_DATA_sb].buckets +</div><div class='del'>-				    dev.d[BCH_DATA_journal].buckets) *</div><div class='del'>-			ca-&gt;mi.bucket_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_dev_usage *dev_usage_ptr(struct bch_dev *ca,</div><div class='del'>-						  unsigned journal_seq,</div><div class='del'>-						  bool gc)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!gc &amp;&amp; !journal_seq);</div><div class='del'>-</div><div class='del'>-	return this_cpu_ptr(gc</div><div class='del'>-			    ? ca-&gt;usage_gc</div><div class='del'>-			    : ca-&gt;usage[journal_seq &amp; JOURNAL_BUF_MASK]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_read_fast(struct bch_dev *ca, struct bch_dev_usage *usage)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	unsigned seq, i, u64s = dev_usage_u64s();</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqcount_begin(&amp;c-&gt;usage_lock);</div><div class='del'>-		memcpy(usage, ca-&gt;usage_base, u64s * sizeof(u64));</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(ca-&gt;usage); i++)</div><div class='del'>-			acc_u64s_percpu((u64 *) usage, (u64 __percpu *) ca-&gt;usage[i], u64s);</div><div class='del'>-	} while (read_seqcount_retry(&amp;c-&gt;usage_lock, seq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_fs_usage_read_one(struct bch_fs *c, u64 *v)</div><div class='del'>-{</div><div class='del'>-	ssize_t offset = v - (u64 *) c-&gt;usage_base;</div><div class='del'>-	unsigned i, seq;</div><div class='del'>-	u64 ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(offset &lt; 0 || offset &gt;= fs_usage_u64s(c));</div><div class='del'>-	percpu_rwsem_assert_held(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqcount_begin(&amp;c-&gt;usage_lock);</div><div class='del'>-		ret = *v;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(c-&gt;usage); i++)</div><div class='del'>-			ret += percpu_u64_get((u64 __percpu *) c-&gt;usage[i] + offset);</div><div class='del'>-	} while (read_seqcount_retry(&amp;c-&gt;usage_lock, seq));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_online *bch2_fs_usage_read(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_usage_online *ret;</div><div class='del'>-	unsigned nr_replicas = READ_ONCE(c-&gt;replicas.nr);</div><div class='del'>-	unsigned seq, i;</div><div class='del'>-retry:</div><div class='del'>-	ret = kmalloc(__fs_usage_online_u64s(nr_replicas) * sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (unlikely(!ret))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (nr_replicas != c-&gt;replicas.nr) {</div><div class='del'>-		nr_replicas = c-&gt;replicas.nr;</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		kfree(ret);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret-&gt;online_reserved = percpu_u64_get(c-&gt;online_reserved);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqcount_begin(&amp;c-&gt;usage_lock);</div><div class='del'>-		unsafe_memcpy(&amp;ret-&gt;u, c-&gt;usage_base,</div><div class='del'>-			      __fs_usage_u64s(nr_replicas) * sizeof(u64),</div><div class='del'>-			      "embedded variable length struct");</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(c-&gt;usage); i++)</div><div class='del'>-			acc_u64s_percpu((u64 *) &amp;ret-&gt;u, (u64 __percpu *) c-&gt;usage[i],</div><div class='del'>-					__fs_usage_u64s(nr_replicas));</div><div class='del'>-	} while (read_seqcount_retry(&amp;c-&gt;usage_lock, seq));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_usage_acc_to_base(struct bch_fs *c, unsigned idx)</div><div class='del'>-{</div><div class='del'>-	unsigned u64s = fs_usage_u64s(c);</div><div class='del'>-</div><div class='del'>-	BUG_ON(idx &gt;= ARRAY_SIZE(c-&gt;usage));</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	write_seqcount_begin(&amp;c-&gt;usage_lock);</div><div class='del'>-</div><div class='del'>-	acc_u64s_percpu((u64 *) c-&gt;usage_base,</div><div class='del'>-			(u64 __percpu *) c-&gt;usage[idx], u64s);</div><div class='del'>-	percpu_memset(c-&gt;usage[idx], 0, u64s * sizeof(u64));</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, NULL) {</div><div class='del'>-		u64s = dev_usage_u64s();</div><div class='del'>-</div><div class='del'>-		acc_u64s_percpu((u64 *) ca-&gt;usage_base,</div><div class='del'>-				(u64 __percpu *) ca-&gt;usage[idx], u64s);</div><div class='del'>-		percpu_memset(ca-&gt;usage[idx], 0, u64s * sizeof(u64));</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	write_seqcount_end(&amp;c-&gt;usage_lock);</div><div class='del'>-	preempt_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_usage_to_text(struct printbuf *out,</div><div class='del'>-			   struct bch_fs *c,</div><div class='del'>-			   struct bch_fs_usage_online *fs_usage)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "capacity:\t\t\t%llu\n", c-&gt;capacity);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "hidden:\t\t\t\t%llu\n",</div><div class='del'>-	       fs_usage-&gt;u.b.hidden);</div><div class='del'>-	prt_printf(out, "data:\t\t\t\t%llu\n",</div><div class='del'>-	       fs_usage-&gt;u.b.data);</div><div class='del'>-	prt_printf(out, "cached:\t\t\t\t%llu\n",</div><div class='del'>-	       fs_usage-&gt;u.b.cached);</div><div class='del'>-	prt_printf(out, "reserved:\t\t\t%llu\n",</div><div class='del'>-	       fs_usage-&gt;u.b.reserved);</div><div class='del'>-	prt_printf(out, "nr_inodes:\t\t\t%llu\n",</div><div class='del'>-	       fs_usage-&gt;u.b.nr_inodes);</div><div class='del'>-	prt_printf(out, "online reserved:\t\t%llu\n",</div><div class='del'>-	       fs_usage-&gt;online_reserved);</div><div class='del'>-</div><div class='del'>-	for (i = 0;</div><div class='del'>-	     i &lt; ARRAY_SIZE(fs_usage-&gt;u.persistent_reserved);</div><div class='del'>-	     i++) {</div><div class='del'>-		prt_printf(out, "%u replicas:\n", i + 1);</div><div class='del'>-		prt_printf(out, "\treserved:\t\t%llu\n",</div><div class='del'>-		       fs_usage-&gt;u.persistent_reserved[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;replicas.nr; i++) {</div><div class='del'>-		struct bch_replicas_entry_v1 *e =</div><div class='del'>-			cpu_replicas_entry(&amp;c-&gt;replicas, i);</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "\t");</div><div class='del'>-		bch2_replicas_entry_to_text(out, e);</div><div class='del'>-		prt_printf(out, ":\t%llu\n", fs_usage-&gt;u.replicas[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 reserve_factor(u64 r)</div><div class='del'>-{</div><div class='del'>-	return r + (round_up(r, (1 &lt;&lt; RESERVE_FACTOR)) &gt;&gt; RESERVE_FACTOR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_fs_sectors_used(struct bch_fs *c, struct bch_fs_usage_online *fs_usage)</div><div class='del'>-{</div><div class='del'>-	return min(fs_usage-&gt;u.b.hidden +</div><div class='del'>-		   fs_usage-&gt;u.b.btree +</div><div class='del'>-		   fs_usage-&gt;u.b.data +</div><div class='del'>-		   reserve_factor(fs_usage-&gt;u.b.reserved +</div><div class='del'>-				  fs_usage-&gt;online_reserved),</div><div class='del'>-		   c-&gt;capacity);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_fs_usage_short</div><div class='del'>-__bch2_fs_usage_read_short(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_usage_short ret;</div><div class='del'>-	u64 data, reserved;</div><div class='del'>-</div><div class='del'>-	ret.capacity = c-&gt;capacity -</div><div class='del'>-		bch2_fs_usage_read_one(c, &amp;c-&gt;usage_base-&gt;b.hidden);</div><div class='del'>-</div><div class='del'>-	data		= bch2_fs_usage_read_one(c, &amp;c-&gt;usage_base-&gt;b.data) +</div><div class='del'>-		bch2_fs_usage_read_one(c, &amp;c-&gt;usage_base-&gt;b.btree);</div><div class='del'>-	reserved	= bch2_fs_usage_read_one(c, &amp;c-&gt;usage_base-&gt;b.reserved) +</div><div class='del'>-		percpu_u64_get(c-&gt;online_reserved);</div><div class='del'>-</div><div class='del'>-	ret.used	= min(ret.capacity, data + reserve_factor(reserved));</div><div class='del'>-	ret.free	= ret.capacity - ret.used;</div><div class='del'>-</div><div class='del'>-	ret.nr_inodes	= bch2_fs_usage_read_one(c, &amp;c-&gt;usage_base-&gt;b.nr_inodes);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_short</div><div class='del'>-bch2_fs_usage_read_short(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_usage_short ret;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	ret = __bch2_fs_usage_read_short(c);</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_init(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	ca-&gt;usage_base-&gt;d[BCH_DATA_free].buckets = ca-&gt;mi.nbuckets - ca-&gt;mi.first_bucket;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_to_text(struct printbuf *out, struct bch_dev_usage *usage)</div><div class='del'>-{</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_str(out, "buckets");</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_str(out, "sectors");</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_str(out, "fragmented");</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_DATA_NR; i++) {</div><div class='del'>-		bch2_prt_data_type(out, i);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, usage-&gt;d[i].buckets);</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-		prt_u64(out, usage-&gt;d[i].sectors);</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-		prt_u64(out, usage-&gt;d[i].fragmented);</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_update(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			   const struct bch_alloc_v4 *old,</div><div class='del'>-			   const struct bch_alloc_v4 *new,</div><div class='del'>-			   u64 journal_seq, bool gc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_usage *fs_usage;</div><div class='del'>-	struct bch_dev_usage *u;</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	fs_usage = fs_usage_ptr(c, journal_seq, gc);</div><div class='del'>-</div><div class='del'>-	if (data_type_is_hidden(old-&gt;data_type))</div><div class='del'>-		fs_usage-&gt;b.hidden -= ca-&gt;mi.bucket_size;</div><div class='del'>-	if (data_type_is_hidden(new-&gt;data_type))</div><div class='del'>-		fs_usage-&gt;b.hidden += ca-&gt;mi.bucket_size;</div><div class='del'>-</div><div class='del'>-	u = dev_usage_ptr(ca, journal_seq, gc);</div><div class='del'>-</div><div class='del'>-	u-&gt;d[old-&gt;data_type].buckets--;</div><div class='del'>-	u-&gt;d[new-&gt;data_type].buckets++;</div><div class='del'>-</div><div class='del'>-	u-&gt;d[old-&gt;data_type].sectors -= bch2_bucket_sectors_dirty(*old);</div><div class='del'>-	u-&gt;d[new-&gt;data_type].sectors += bch2_bucket_sectors_dirty(*new);</div><div class='del'>-</div><div class='del'>-	u-&gt;d[BCH_DATA_cached].sectors += new-&gt;cached_sectors;</div><div class='del'>-	u-&gt;d[BCH_DATA_cached].sectors -= old-&gt;cached_sectors;</div><div class='del'>-</div><div class='del'>-	u-&gt;d[old-&gt;data_type].fragmented -= bch2_bucket_sectors_fragmented(ca, *old);</div><div class='del'>-	u-&gt;d[new-&gt;data_type].fragmented += bch2_bucket_sectors_fragmented(ca, *new);</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_alloc_v4 bucket_m_to_alloc(struct bucket b)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_alloc_v4) {</div><div class='del'>-		.gen		= b.gen,</div><div class='del'>-		.data_type	= b.data_type,</div><div class='del'>-		.dirty_sectors	= b.dirty_sectors,</div><div class='del'>-		.cached_sectors	= b.cached_sectors,</div><div class='del'>-		.stripe		= b.stripe,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_update_m(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			     struct bucket *old, struct bucket *new)</div><div class='del'>-{</div><div class='del'>-	struct bch_alloc_v4 old_a = bucket_m_to_alloc(*old);</div><div class='del'>-	struct bch_alloc_v4 new_a = bucket_m_to_alloc(*new);</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_update(c, ca, &amp;old_a, &amp;new_a, 0, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __update_replicas(struct bch_fs *c,</div><div class='del'>-				    struct bch_fs_usage *fs_usage,</div><div class='del'>-				    struct bch_replicas_entry_v1 *r,</div><div class='del'>-				    s64 sectors)</div><div class='del'>-{</div><div class='del'>-	int idx = bch2_replicas_entry_idx(c, r);</div><div class='del'>-</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	fs_usage_data_type_to_base(&amp;fs_usage-&gt;b, r-&gt;data_type, sectors);</div><div class='del'>-	fs_usage-&gt;replicas[idx]		+= sectors;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_update_replicas(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			 struct bch_replicas_entry_v1 *r, s64 sectors,</div><div class='del'>-			 unsigned journal_seq, bool gc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_usage *fs_usage;</div><div class='del'>-	int idx, ret = 0;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	idx = bch2_replicas_entry_idx(c, r);</div><div class='del'>-	if (idx &lt; 0 &amp;&amp;</div><div class='del'>-	    fsck_err(c, ptr_to_missing_replicas_entry,</div><div class='del'>-		     "no replicas entry\n  while marking %s",</div><div class='del'>-		     (bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		ret = bch2_mark_replicas(c, r);</div><div class='del'>-		percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-		idx = bch2_replicas_entry_idx(c, r);</div><div class='del'>-	}</div><div class='del'>-	if (idx &lt; 0) {</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	fs_usage = fs_usage_ptr(c, journal_seq, gc);</div><div class='del'>-	fs_usage_data_type_to_base(&amp;fs_usage-&gt;b, r-&gt;data_type, sectors);</div><div class='del'>-	fs_usage-&gt;replicas[idx]		+= sectors;</div><div class='del'>-	preempt_enable();</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int update_cached_sectors(struct bch_fs *c,</div><div class='del'>-			struct bkey_s_c k,</div><div class='del'>-			unsigned dev, s64 sectors,</div><div class='del'>-			unsigned journal_seq, bool gc)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_padded r;</div><div class='del'>-</div><div class='del'>-	bch2_replicas_entry_cached(&amp;r.e, dev);</div><div class='del'>-</div><div class='del'>-	return bch2_update_replicas(c, k, &amp;r.e, sectors, journal_seq, gc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __replicas_deltas_realloc(struct btree_trans *trans, unsigned more,</div><div class='del'>-				     gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct replicas_delta_list *d = trans-&gt;fs_usage_deltas;</div><div class='del'>-	unsigned new_size = d ? (d-&gt;size + more) * 2 : 128;</div><div class='del'>-	unsigned alloc_size = sizeof(*d) + new_size;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(alloc_size &gt; REPLICAS_DELTA_LIST_MAX);</div><div class='del'>-</div><div class='del'>-	if (!d || d-&gt;used + more &gt; d-&gt;size) {</div><div class='del'>-		d = krealloc(d, alloc_size, gfp|__GFP_ZERO);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!d)) {</div><div class='del'>-			if (alloc_size &gt; REPLICAS_DELTA_LIST_MAX)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			d = mempool_alloc(&amp;trans-&gt;c-&gt;replicas_delta_pool, gfp);</div><div class='del'>-			if (!d)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			memset(d, 0, REPLICAS_DELTA_LIST_MAX);</div><div class='del'>-</div><div class='del'>-			if (trans-&gt;fs_usage_deltas)</div><div class='del'>-				memcpy(d, trans-&gt;fs_usage_deltas,</div><div class='del'>-				       trans-&gt;fs_usage_deltas-&gt;size + sizeof(*d));</div><div class='del'>-</div><div class='del'>-			new_size = REPLICAS_DELTA_LIST_MAX - sizeof(*d);</div><div class='del'>-			kfree(trans-&gt;fs_usage_deltas);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d-&gt;size = new_size;</div><div class='del'>-		trans-&gt;fs_usage_deltas = d;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_deltas_realloc(struct btree_trans *trans, unsigned more)</div><div class='del'>-{</div><div class='del'>-	return allocate_dropping_locks_errcode(trans,</div><div class='del'>-				__replicas_deltas_realloc(trans, more, _gfp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_update_replicas_list(struct btree_trans *trans,</div><div class='del'>-			 struct bch_replicas_entry_v1 *r,</div><div class='del'>-			 s64 sectors)</div><div class='del'>-{</div><div class='del'>-	struct replicas_delta_list *d;</div><div class='del'>-	struct replicas_delta *n;</div><div class='del'>-	unsigned b;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!sectors)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	b = replicas_entry_bytes(r) + 8;</div><div class='del'>-	ret = bch2_replicas_deltas_realloc(trans, b);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	d = trans-&gt;fs_usage_deltas;</div><div class='del'>-	n = (void *) d-&gt;d + d-&gt;used;</div><div class='del'>-	n-&gt;delta = sectors;</div><div class='del'>-	unsafe_memcpy((void *) n + offsetof(struct replicas_delta, r),</div><div class='del'>-		      r, replicas_entry_bytes(r),</div><div class='del'>-		      "flexible array member embedded in strcuct with padding");</div><div class='del'>-	bch2_replicas_entry_sort(&amp;n-&gt;r);</div><div class='del'>-	d-&gt;used += b;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_update_cached_sectors_list(struct btree_trans *trans, unsigned dev, s64 sectors)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_padded r;</div><div class='del'>-</div><div class='del'>-	bch2_replicas_entry_cached(&amp;r.e, dev);</div><div class='del'>-</div><div class='del'>-	return bch2_update_replicas_list(trans, &amp;r.e, sectors);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_mark_metadata_bucket(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			      size_t b, enum bch_data_type data_type,</div><div class='del'>-			      unsigned sectors, struct gc_pos pos,</div><div class='del'>-			      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bucket old, new, *g;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(flags &amp; BTREE_TRIGGER_GC));</div><div class='del'>-	BUG_ON(data_type != BCH_DATA_sb &amp;&amp;</div><div class='del'>-	       data_type != BCH_DATA_journal);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Backup superblock might be past the end of our normal usable space:</div><div class='del'>-	 */</div><div class='del'>-	if (b &gt;= ca-&gt;mi.nbuckets)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	g = gc_bucket(ca, b);</div><div class='del'>-</div><div class='del'>-	bucket_lock(g);</div><div class='del'>-	old = *g;</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_inconsistent_on(g-&gt;data_type &amp;&amp;</div><div class='del'>-			g-&gt;data_type != data_type, c,</div><div class='del'>-			"different types of data in same bucket: %s, %s",</div><div class='del'>-			bch2_data_type_str(g-&gt;data_type),</div><div class='del'>-			bch2_data_type_str(data_type))) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_inconsistent_on((u64) g-&gt;dirty_sectors + sectors &gt; ca-&gt;mi.bucket_size, c,</div><div class='del'>-			"bucket %u:%zu gen %u data type %s sector count overflow: %u + %u &gt; bucket size",</div><div class='del'>-			ca-&gt;dev_idx, b, g-&gt;gen,</div><div class='del'>-			bch2_data_type_str(g-&gt;data_type ?: data_type),</div><div class='del'>-			g-&gt;dirty_sectors, sectors)) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g-&gt;data_type = data_type;</div><div class='del'>-	g-&gt;dirty_sectors += sectors;</div><div class='del'>-	new = *g;</div><div class='del'>-err:</div><div class='del'>-	bucket_unlock(g);</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_dev_usage_update_m(c, ca, &amp;old, &amp;new);</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_bucket_ref(struct btree_trans *trans,</div><div class='del'>-			  struct bkey_s_c k,</div><div class='del'>-			  const struct bch_extent_ptr *ptr,</div><div class='del'>-			  s64 sectors, enum bch_data_type ptr_data_type,</div><div class='del'>-			  u8 b_gen, u8 bucket_data_type,</div><div class='del'>-			  u32 bucket_sectors)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-	size_t bucket_nr = PTR_BUCKET_NR(ca, ptr);</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (bucket_data_type == BCH_DATA_cached)</div><div class='del'>-		bucket_data_type = BCH_DATA_user;</div><div class='del'>-</div><div class='del'>-	if ((bucket_data_type == BCH_DATA_stripe &amp;&amp; ptr_data_type == BCH_DATA_user) ||</div><div class='del'>-	    (bucket_data_type == BCH_DATA_user   &amp;&amp; ptr_data_type == BCH_DATA_stripe))</div><div class='del'>-		bucket_data_type = ptr_data_type = BCH_DATA_stripe;</div><div class='del'>-</div><div class='del'>-	if (gen_after(ptr-&gt;gen, b_gen)) {</div><div class='del'>-		bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK,</div><div class='del'>-			      BCH_FSCK_ERR_ptr_gen_newer_than_bucket_gen,</div><div class='del'>-			"bucket %u:%zu gen %u data type %s: ptr gen %u newer than bucket gen\n"</div><div class='del'>-			"while marking %s",</div><div class='del'>-			ptr-&gt;dev, bucket_nr, b_gen,</div><div class='del'>-			bch2_data_type_str(bucket_data_type ?: ptr_data_type),</div><div class='del'>-			ptr-&gt;gen,</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (gen_cmp(b_gen, ptr-&gt;gen) &gt; BUCKET_GC_GEN_MAX) {</div><div class='del'>-		bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK,</div><div class='del'>-			      BCH_FSCK_ERR_ptr_too_stale,</div><div class='del'>-			"bucket %u:%zu gen %u data type %s: ptr gen %u too stale\n"</div><div class='del'>-			"while marking %s",</div><div class='del'>-			ptr-&gt;dev, bucket_nr, b_gen,</div><div class='del'>-			bch2_data_type_str(bucket_data_type ?: ptr_data_type),</div><div class='del'>-			ptr-&gt;gen,</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b_gen != ptr-&gt;gen &amp;&amp; !ptr-&gt;cached) {</div><div class='del'>-		bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK,</div><div class='del'>-			      BCH_FSCK_ERR_stale_dirty_ptr,</div><div class='del'>-			"bucket %u:%zu gen %u (mem gen %u) data type %s: stale dirty ptr (gen %u)\n"</div><div class='del'>-			"while marking %s",</div><div class='del'>-			ptr-&gt;dev, bucket_nr, b_gen,</div><div class='del'>-			*bucket_gen(ca, bucket_nr),</div><div class='del'>-			bch2_data_type_str(bucket_data_type ?: ptr_data_type),</div><div class='del'>-			ptr-&gt;gen,</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b_gen != ptr-&gt;gen) {</div><div class='del'>-		ret = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!data_type_is_empty(bucket_data_type) &amp;&amp;</div><div class='del'>-	    ptr_data_type &amp;&amp;</div><div class='del'>-	    bucket_data_type != ptr_data_type) {</div><div class='del'>-		bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK,</div><div class='del'>-			      BCH_FSCK_ERR_ptr_bucket_data_type_mismatch,</div><div class='del'>-			"bucket %u:%zu gen %u different types of data in same bucket: %s, %s\n"</div><div class='del'>-			"while marking %s",</div><div class='del'>-			ptr-&gt;dev, bucket_nr, b_gen,</div><div class='del'>-			bch2_data_type_str(bucket_data_type),</div><div class='del'>-			bch2_data_type_str(ptr_data_type),</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((u64) bucket_sectors + sectors &gt; U32_MAX) {</div><div class='del'>-		bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK,</div><div class='del'>-			      BCH_FSCK_ERR_bucket_sector_count_overflow,</div><div class='del'>-			"bucket %u:%zu gen %u data type %s sector count overflow: %u + %lli &gt; U32_MAX\n"</div><div class='del'>-			"while marking %s",</div><div class='del'>-			ptr-&gt;dev, bucket_nr, b_gen,</div><div class='del'>-			bch2_data_type_str(bucket_data_type ?: ptr_data_type),</div><div class='del'>-			bucket_sectors, sectors,</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	bch2_dump_trans_updates(trans);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_fs_usage_revert(struct btree_trans *trans,</div><div class='del'>-				struct replicas_delta_list *deltas)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_fs_usage *dst;</div><div class='del'>-	struct replicas_delta *d, *top = (void *) deltas-&gt;d + deltas-&gt;used;</div><div class='del'>-	s64 added = 0;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	preempt_disable();</div><div class='del'>-	dst = fs_usage_ptr(c, trans-&gt;journal_res.seq, false);</div><div class='del'>-</div><div class='del'>-	/* revert changes: */</div><div class='del'>-	for (d = deltas-&gt;d; d != top; d = replicas_delta_next(d)) {</div><div class='del'>-		switch (d-&gt;r.data_type) {</div><div class='del'>-		case BCH_DATA_btree:</div><div class='del'>-		case BCH_DATA_user:</div><div class='del'>-		case BCH_DATA_parity:</div><div class='del'>-			added += d-&gt;delta;</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(__update_replicas(c, dst, &amp;d-&gt;r, -d-&gt;delta));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;b.nr_inodes -= deltas-&gt;nr_inodes;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_REPLICAS_MAX; i++) {</div><div class='del'>-		added				-= deltas-&gt;persistent_reserved[i];</div><div class='del'>-		dst-&gt;b.reserved			-= deltas-&gt;persistent_reserved[i];</div><div class='del'>-		dst-&gt;persistent_reserved[i]	-= deltas-&gt;persistent_reserved[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (added &gt; 0) {</div><div class='del'>-		trans-&gt;disk_res-&gt;sectors += added;</div><div class='del'>-		this_cpu_add(*c-&gt;online_reserved, added);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_trans_account_disk_usage_change(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u64 disk_res_sectors = trans-&gt;disk_res ? trans-&gt;disk_res-&gt;sectors : 0;</div><div class='del'>-	static int warned_disk_usage = 0;</div><div class='del'>-	bool warn = false;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	preempt_disable();</div><div class='del'>-	struct bch_fs_usage_base *dst = &amp;fs_usage_ptr(c, trans-&gt;journal_res.seq, false)-&gt;b;</div><div class='del'>-	struct bch_fs_usage_base *src = &amp;trans-&gt;fs_usage_delta;</div><div class='del'>-</div><div class='del'>-	s64 added = src-&gt;btree + src-&gt;data + src-&gt;reserved;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Not allowed to reduce sectors_available except by getting a</div><div class='del'>-	 * reservation:</div><div class='del'>-	 */</div><div class='del'>-	s64 should_not_have_added = added - (s64) disk_res_sectors;</div><div class='del'>-	if (unlikely(should_not_have_added &gt; 0)) {</div><div class='del'>-		u64 old, new, v = atomic64_read(&amp;c-&gt;sectors_available);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			old = v;</div><div class='del'>-			new = max_t(s64, 0, old - should_not_have_added);</div><div class='del'>-		} while ((v = atomic64_cmpxchg(&amp;c-&gt;sectors_available,</div><div class='del'>-					       old, new)) != old);</div><div class='del'>-</div><div class='del'>-		added -= should_not_have_added;</div><div class='del'>-		warn = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (added &gt; 0) {</div><div class='del'>-		trans-&gt;disk_res-&gt;sectors -= added;</div><div class='del'>-		this_cpu_sub(*c-&gt;online_reserved, added);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;hidden	+= src-&gt;hidden;</div><div class='del'>-	dst-&gt;btree	+= src-&gt;btree;</div><div class='del'>-	dst-&gt;data	+= src-&gt;data;</div><div class='del'>-	dst-&gt;cached	+= src-&gt;cached;</div><div class='del'>-	dst-&gt;reserved	+= src-&gt;reserved;</div><div class='del'>-	dst-&gt;nr_inodes	+= src-&gt;nr_inodes;</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (unlikely(warn) &amp;&amp; !xchg(&amp;warned_disk_usage, 1))</div><div class='del'>-		bch2_trans_inconsistent(trans,</div><div class='del'>-					"disk usage increased %lli more than %llu sectors reserved)",</div><div class='del'>-					should_not_have_added, disk_res_sectors);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_fs_usage_apply(struct btree_trans *trans,</div><div class='del'>-			      struct replicas_delta_list *deltas)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct replicas_delta *d, *d2;</div><div class='del'>-	struct replicas_delta *top = (void *) deltas-&gt;d + deltas-&gt;used;</div><div class='del'>-	struct bch_fs_usage *dst;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	preempt_disable();</div><div class='del'>-	dst = fs_usage_ptr(c, trans-&gt;journal_res.seq, false);</div><div class='del'>-</div><div class='del'>-	for (d = deltas-&gt;d; d != top; d = replicas_delta_next(d))</div><div class='del'>-		if (__update_replicas(c, dst, &amp;d-&gt;r, d-&gt;delta))</div><div class='del'>-			goto need_mark;</div><div class='del'>-</div><div class='del'>-	dst-&gt;b.nr_inodes += deltas-&gt;nr_inodes;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_REPLICAS_MAX; i++) {</div><div class='del'>-		dst-&gt;b.reserved			+= deltas-&gt;persistent_reserved[i];</div><div class='del'>-		dst-&gt;persistent_reserved[i]	+= deltas-&gt;persistent_reserved[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	return 0;</div><div class='del'>-need_mark:</div><div class='del'>-	/* revert changes: */</div><div class='del'>-	for (d2 = deltas-&gt;d; d2 != d; d2 = replicas_delta_next(d2))</div><div class='del'>-		BUG_ON(__update_replicas(c, dst, &amp;d2-&gt;r, -d2-&gt;delta));</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_extent: */</div><div class='del'>-</div><div class='del'>-static int __mark_pointer(struct btree_trans *trans,</div><div class='del'>-			  struct bkey_s_c k,</div><div class='del'>-			  const struct bch_extent_ptr *ptr,</div><div class='del'>-			  s64 sectors, enum bch_data_type ptr_data_type,</div><div class='del'>-			  u8 bucket_gen, u8 *bucket_data_type,</div><div class='del'>-			  u32 *dirty_sectors, u32 *cached_sectors)</div><div class='del'>-{</div><div class='del'>-	u32 *dst_sectors = !ptr-&gt;cached</div><div class='del'>-		? dirty_sectors</div><div class='del'>-		: cached_sectors;</div><div class='del'>-	int ret = bch2_check_bucket_ref(trans, k, ptr, sectors, ptr_data_type,</div><div class='del'>-				   bucket_gen, *bucket_data_type, *dst_sectors);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*dst_sectors += sectors;</div><div class='del'>-</div><div class='del'>-	if (!*dirty_sectors &amp;&amp; !*cached_sectors)</div><div class='del'>-		*bucket_data_type = 0;</div><div class='del'>-	else if (*bucket_data_type != BCH_DATA_stripe)</div><div class='del'>-		*bucket_data_type = ptr_data_type;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_trigger_pointer(struct btree_trans *trans,</div><div class='del'>-			enum btree_id btree_id, unsigned level,</div><div class='del'>-			struct bkey_s_c k, struct extent_ptr_decoded p,</div><div class='del'>-			s64 *sectors,</div><div class='del'>-			unsigned flags)</div><div class='del'>-{</div><div class='del'>-	bool insert = !(flags &amp; BTREE_TRIGGER_OVERWRITE);</div><div class='del'>-	struct bpos bucket;</div><div class='del'>-	struct bch_backpointer bp;</div><div class='del'>-</div><div class='del'>-	bch2_extent_ptr_to_bp(trans-&gt;c, btree_id, level, k, p, &amp;bucket, &amp;bp);</div><div class='del'>-	*sectors = insert ? bp.bucket_len : -((s64) bp.bucket_len);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		struct btree_iter iter;</div><div class='del'>-		struct bkey_i_alloc_v4 *a = bch2_trans_start_alloc_update(trans, &amp;iter, bucket);</div><div class='del'>-		int ret = PTR_ERR_OR_ZERO(a);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = __mark_pointer(trans, k, &amp;p.ptr, *sectors, bp.data_type,</div><div class='del'>-				     a-&gt;v.gen, &amp;a-&gt;v.data_type,</div><div class='del'>-				     &amp;a-&gt;v.dirty_sectors, &amp;a-&gt;v.cached_sectors) ?:</div><div class='del'>-			bch2_trans_update(trans, &amp;iter, &amp;a-&gt;k_i, 0);</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (!p.ptr.cached) {</div><div class='del'>-			ret = bch2_bucket_backpointer_mod(trans, bucket, bp, k, insert);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_GC) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, p.ptr.dev);</div><div class='del'>-		enum bch_data_type data_type = bkey_ptr_data_type(btree_id, level, k, p);</div><div class='del'>-</div><div class='del'>-		percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		struct bucket *g = PTR_GC_BUCKET(ca, &amp;p.ptr);</div><div class='del'>-		bucket_lock(g);</div><div class='del'>-		struct bucket old = *g;</div><div class='del'>-</div><div class='del'>-		u8 bucket_data_type = g-&gt;data_type;</div><div class='del'>-		int ret = __mark_pointer(trans, k, &amp;p.ptr, *sectors,</div><div class='del'>-				     data_type, g-&gt;gen,</div><div class='del'>-				     &amp;bucket_data_type,</div><div class='del'>-				     &amp;g-&gt;dirty_sectors,</div><div class='del'>-				     &amp;g-&gt;cached_sectors);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bucket_unlock(g);</div><div class='del'>-			percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g-&gt;data_type = bucket_data_type;</div><div class='del'>-		struct bucket new = *g;</div><div class='del'>-		bucket_unlock(g);</div><div class='del'>-		bch2_dev_usage_update_m(c, ca, &amp;old, &amp;new);</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_trigger_stripe_ptr(struct btree_trans *trans,</div><div class='del'>-				struct bkey_s_c k,</div><div class='del'>-				struct extent_ptr_decoded p,</div><div class='del'>-				enum bch_data_type data_type,</div><div class='del'>-				s64 sectors, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		struct btree_iter iter;</div><div class='del'>-		struct bkey_i_stripe *s = bch2_bkey_get_mut_typed(trans, &amp;iter,</div><div class='del'>-				BTREE_ID_stripes, POS(0, p.ec.idx),</div><div class='del'>-				BTREE_ITER_WITH_UPDATES, stripe);</div><div class='del'>-		int ret = PTR_ERR_OR_ZERO(s);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			bch2_trans_inconsistent_on(bch2_err_matches(ret, ENOENT), trans,</div><div class='del'>-				"pointer to nonexistent stripe %llu",</div><div class='del'>-				(u64) p.ec.idx);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!bch2_ptr_matches_stripe(&amp;s-&gt;v, p)) {</div><div class='del'>-			bch2_trans_inconsistent(trans,</div><div class='del'>-				"stripe pointer doesn't match stripe %llu",</div><div class='del'>-				(u64) p.ec.idx);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		stripe_blockcount_set(&amp;s-&gt;v, p.ec.block,</div><div class='del'>-			stripe_blockcount_get(&amp;s-&gt;v, p.ec.block) +</div><div class='del'>-			sectors);</div><div class='del'>-</div><div class='del'>-		struct bch_replicas_padded r;</div><div class='del'>-		bch2_bkey_to_replicas(&amp;r.e, bkey_i_to_s_c(&amp;s-&gt;k_i));</div><div class='del'>-		r.e.data_type = data_type;</div><div class='del'>-		ret = bch2_update_replicas_list(trans, &amp;r.e, sectors);</div><div class='del'>-err:</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_GC) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-		BUG_ON(!(flags &amp; BTREE_TRIGGER_GC));</div><div class='del'>-</div><div class='del'>-		struct gc_stripe *m = genradix_ptr_alloc(&amp;c-&gt;gc_stripes, p.ec.idx, GFP_KERNEL);</div><div class='del'>-		if (!m) {</div><div class='del'>-			bch_err(c, "error allocating memory for gc_stripes, idx %llu",</div><div class='del'>-				(u64) p.ec.idx);</div><div class='del'>-			return -BCH_ERR_ENOMEM_mark_stripe_ptr;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-		if (!m || !m-&gt;alive) {</div><div class='del'>-			mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-			bch_err_ratelimited(c, "pointer to nonexistent stripe %llu\n  while marking %s",</div><div class='del'>-					    (u64) p.ec.idx, buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			bch2_inconsistent_error(c);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		m-&gt;block_sectors[p.ec.block] += sectors;</div><div class='del'>-</div><div class='del'>-		struct bch_replicas_padded r = m-&gt;r;</div><div class='del'>-		mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-		r.e.data_type = data_type;</div><div class='del'>-		bch2_update_replicas(c, k, &amp;r.e, sectors, trans-&gt;journal_res.seq, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __trigger_extent(struct btree_trans *trans,</div><div class='del'>-			    enum btree_id btree_id, unsigned level,</div><div class='del'>-			    struct bkey_s_c k, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	bool gc = flags &amp; BTREE_TRIGGER_GC;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	struct bch_replicas_padded r;</div><div class='del'>-	enum bch_data_type data_type = bkey_is_btree_ptr(k.k)</div><div class='del'>-		? BCH_DATA_btree</div><div class='del'>-		: BCH_DATA_user;</div><div class='del'>-	s64 dirty_sectors = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	r.e.data_type	= data_type;</div><div class='del'>-	r.e.nr_devs	= 0;</div><div class='del'>-	r.e.nr_required	= 1;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		s64 disk_sectors;</div><div class='del'>-		ret = bch2_trigger_pointer(trans, btree_id, level, k, p, &amp;disk_sectors, flags);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		bool stale = ret &gt; 0;</div><div class='del'>-</div><div class='del'>-		if (p.ptr.cached) {</div><div class='del'>-			if (!stale) {</div><div class='del'>-				ret = !gc</div><div class='del'>-					? bch2_update_cached_sectors_list(trans, p.ptr.dev, disk_sectors)</div><div class='del'>-					: update_cached_sectors(c, k, p.ptr.dev, disk_sectors, 0, true);</div><div class='del'>-				bch2_fs_fatal_err_on(ret &amp;&amp; gc, c, "%s(): no replicas entry while updating cached sectors",</div><div class='del'>-						     __func__);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-		} else if (!p.has_ec) {</div><div class='del'>-			dirty_sectors	       += disk_sectors;</div><div class='del'>-			r.e.devs[r.e.nr_devs++]	= p.ptr.dev;</div><div class='del'>-		} else {</div><div class='del'>-			ret = bch2_trigger_stripe_ptr(trans, k, p, data_type, disk_sectors, flags);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * There may be other dirty pointers in this extent, but</div><div class='del'>-			 * if so they're not required for mounting if we have an</div><div class='del'>-			 * erasure coded pointer in this extent:</div><div class='del'>-			 */</div><div class='del'>-			r.e.nr_required = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (r.e.nr_devs) {</div><div class='del'>-		ret = !gc</div><div class='del'>-			? bch2_update_replicas_list(trans, &amp;r.e, dirty_sectors)</div><div class='del'>-			: bch2_update_replicas(c, k, &amp;r.e, dirty_sectors, 0, true);</div><div class='del'>-		if (unlikely(ret &amp;&amp; gc)) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-			bch2_fs_fatal_error(c, "%s(): no replicas entry for %s", __func__, buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_extent(struct btree_trans *trans,</div><div class='del'>-			enum btree_id btree_id, unsigned level,</div><div class='del'>-			struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-			unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c new_ptrs = bch2_bkey_ptrs_c(new.s_c);</div><div class='del'>-	struct bkey_ptrs_c old_ptrs = bch2_bkey_ptrs_c(old);</div><div class='del'>-	unsigned new_ptrs_bytes = (void *) new_ptrs.end - (void *) new_ptrs.start;</div><div class='del'>-	unsigned old_ptrs_bytes = (void *) old_ptrs.end - (void *) old_ptrs.start;</div><div class='del'>-</div><div class='del'>-	/* if pointers aren't changing - nothing to do: */</div><div class='del'>-	if (new_ptrs_bytes == old_ptrs_bytes &amp;&amp;</div><div class='del'>-	    !memcmp(new_ptrs.start,</div><div class='del'>-		    old_ptrs.start,</div><div class='del'>-		    new_ptrs_bytes))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-		int mod = (int) bch2_bkey_needs_rebalance(c, new.s_c) -</div><div class='del'>-			  (int) bch2_bkey_needs_rebalance(c, old);</div><div class='del'>-</div><div class='del'>-		if (mod) {</div><div class='del'>-			int ret = bch2_btree_bit_mod(trans, BTREE_ID_rebalance_work, new.k-&gt;p, mod &gt; 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; (BTREE_TRIGGER_TRANSACTIONAL|BTREE_TRIGGER_GC))</div><div class='del'>-		return trigger_run_overwrite_then_insert(__trigger_extent, trans, btree_id, level, old, new, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_reservation */</div><div class='del'>-</div><div class='del'>-static int __trigger_reservation(struct btree_trans *trans,</div><div class='del'>-				 enum btree_id btree_id, unsigned level,</div><div class='del'>-				 struct bkey_s_c k, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	unsigned replicas = bkey_s_c_to_reservation(k).v-&gt;nr_replicas;</div><div class='del'>-	s64 sectors = (s64) k.k-&gt;size * replicas;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_OVERWRITE)</div><div class='del'>-		sectors = -sectors;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		int ret = bch2_replicas_deltas_realloc(trans, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		struct replicas_delta_list *d = trans-&gt;fs_usage_deltas;</div><div class='del'>-		replicas = min(replicas, ARRAY_SIZE(d-&gt;persistent_reserved));</div><div class='del'>-</div><div class='del'>-		d-&gt;persistent_reserved[replicas - 1] += sectors;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_GC) {</div><div class='del'>-		percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		preempt_disable();</div><div class='del'>-</div><div class='del'>-		struct bch_fs_usage *fs_usage = this_cpu_ptr(c-&gt;usage_gc);</div><div class='del'>-</div><div class='del'>-		replicas = min(replicas, ARRAY_SIZE(fs_usage-&gt;persistent_reserved));</div><div class='del'>-		fs_usage-&gt;b.reserved				+= sectors;</div><div class='del'>-		fs_usage-&gt;persistent_reserved[replicas - 1]	+= sectors;</div><div class='del'>-</div><div class='del'>-		preempt_enable();</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_reservation(struct btree_trans *trans,</div><div class='del'>-			  enum btree_id btree_id, unsigned level,</div><div class='del'>-			  struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-			  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return trigger_run_overwrite_then_insert(__trigger_reservation, trans, btree_id, level, old, new, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Mark superblocks: */</div><div class='del'>-</div><div class='del'>-static int __bch2_trans_mark_metadata_bucket(struct btree_trans *trans,</div><div class='del'>-				    struct bch_dev *ca, size_t b,</div><div class='del'>-				    enum bch_data_type type,</div><div class='del'>-				    unsigned sectors)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_alloc_v4 *a;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Backup superblock might be past the end of our normal usable space:</div><div class='del'>-	 */</div><div class='del'>-	if (b &gt;= ca-&gt;mi.nbuckets)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	a = bch2_trans_start_alloc_update(trans, &amp;iter, POS(ca-&gt;dev_idx, b));</div><div class='del'>-	if (IS_ERR(a))</div><div class='del'>-		return PTR_ERR(a);</div><div class='del'>-</div><div class='del'>-	if (a-&gt;v.data_type &amp;&amp; type &amp;&amp; a-&gt;v.data_type != type) {</div><div class='del'>-		bch2_fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK,</div><div class='del'>-			      BCH_FSCK_ERR_bucket_metadata_type_mismatch,</div><div class='del'>-			"bucket %llu:%llu gen %u different types of data in same bucket: %s, %s\n"</div><div class='del'>-			"while marking %s",</div><div class='del'>-			iter.pos.inode, iter.pos.offset, a-&gt;v.gen,</div><div class='del'>-			bch2_data_type_str(a-&gt;v.data_type),</div><div class='del'>-			bch2_data_type_str(type),</div><div class='del'>-			bch2_data_type_str(type));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (a-&gt;v.data_type	!= type ||</div><div class='del'>-	    a-&gt;v.dirty_sectors	!= sectors) {</div><div class='del'>-		a-&gt;v.data_type		= type;</div><div class='del'>-		a-&gt;v.dirty_sectors	= sectors;</div><div class='del'>-		ret = bch2_trans_update(trans, &amp;iter, &amp;a-&gt;k_i, 0);</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_mark_metadata_bucket(struct btree_trans *trans,</div><div class='del'>-				    struct bch_dev *ca, size_t b,</div><div class='del'>-				    enum bch_data_type type,</div><div class='del'>-				    unsigned sectors)</div><div class='del'>-{</div><div class='del'>-	return commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			__bch2_trans_mark_metadata_bucket(trans, ca, b, type, sectors));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_trans_mark_metadata_sectors(struct btree_trans *trans,</div><div class='del'>-					    struct bch_dev *ca,</div><div class='del'>-					    u64 start, u64 end,</div><div class='del'>-					    enum bch_data_type type,</div><div class='del'>-					    u64 *bucket, unsigned *bucket_sectors)</div><div class='del'>-{</div><div class='del'>-	do {</div><div class='del'>-		u64 b = sector_to_bucket(ca, start);</div><div class='del'>-		unsigned sectors =</div><div class='del'>-			min_t(u64, bucket_to_sector(ca, b + 1), end) - start;</div><div class='del'>-</div><div class='del'>-		if (b != *bucket &amp;&amp; *bucket_sectors) {</div><div class='del'>-			int ret = bch2_trans_mark_metadata_bucket(trans, ca, *bucket,</div><div class='del'>-								  type, *bucket_sectors);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			*bucket_sectors = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*bucket		= b;</div><div class='del'>-		*bucket_sectors	+= sectors;</div><div class='del'>-		start += sectors;</div><div class='del'>-	} while (start &lt; end);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_trans_mark_dev_sb(struct btree_trans *trans,</div><div class='del'>-				    struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_layout *layout = &amp;ca-&gt;disk_sb.sb-&gt;layout;</div><div class='del'>-	u64 bucket = 0;</div><div class='del'>-	unsigned i, bucket_sectors = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; layout-&gt;nr_superblocks; i++) {</div><div class='del'>-		u64 offset = le64_to_cpu(layout-&gt;sb_offset[i]);</div><div class='del'>-</div><div class='del'>-		if (offset == BCH_SB_SECTOR) {</div><div class='del'>-			ret = bch2_trans_mark_metadata_sectors(trans, ca,</div><div class='del'>-						0, BCH_SB_SECTOR,</div><div class='del'>-						BCH_DATA_sb, &amp;bucket, &amp;bucket_sectors);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_mark_metadata_sectors(trans, ca, offset,</div><div class='del'>-				      offset + (1 &lt;&lt; layout-&gt;sb_max_size_bits),</div><div class='del'>-				      BCH_DATA_sb, &amp;bucket, &amp;bucket_sectors);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bucket_sectors) {</div><div class='del'>-		ret = bch2_trans_mark_metadata_bucket(trans, ca,</div><div class='del'>-				bucket, BCH_DATA_sb, bucket_sectors);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ca-&gt;journal.nr; i++) {</div><div class='del'>-		ret = bch2_trans_mark_metadata_bucket(trans, ca,</div><div class='del'>-				ca-&gt;journal.buckets[i],</div><div class='del'>-				BCH_DATA_journal, ca-&gt;mi.bucket_size);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_mark_dev_sb(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c, __bch2_trans_mark_dev_sb(trans, ca));</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trans_mark_dev_sbs(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		int ret = bch2_trans_mark_dev_sb(c, ca);</div><div class='del'>-		if (ret) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Disk reservations: */</div><div class='del'>-</div><div class='del'>-#define SECTORS_CACHE	1024</div><div class='del'>-</div><div class='del'>-int __bch2_disk_reservation_add(struct bch_fs *c, struct disk_reservation *res,</div><div class='del'>-			      u64 sectors, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_pcpu *pcpu;</div><div class='del'>-	u64 old, v, get;</div><div class='del'>-	s64 sectors_available;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	preempt_disable();</div><div class='del'>-	pcpu = this_cpu_ptr(c-&gt;pcpu);</div><div class='del'>-</div><div class='del'>-	if (sectors &lt;= pcpu-&gt;sectors_available)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	v = atomic64_read(&amp;c-&gt;sectors_available);</div><div class='del'>-	do {</div><div class='del'>-		old = v;</div><div class='del'>-		get = min((u64) sectors + SECTORS_CACHE, old);</div><div class='del'>-</div><div class='del'>-		if (get &lt; sectors) {</div><div class='del'>-			preempt_enable();</div><div class='del'>-			goto recalculate;</div><div class='del'>-		}</div><div class='del'>-	} while ((v = atomic64_cmpxchg(&amp;c-&gt;sectors_available,</div><div class='del'>-				       old, old - get)) != old);</div><div class='del'>-</div><div class='del'>-	pcpu-&gt;sectors_available		+= get;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	pcpu-&gt;sectors_available		-= sectors;</div><div class='del'>-	this_cpu_add(*c-&gt;online_reserved, sectors);</div><div class='del'>-	res-&gt;sectors			+= sectors;</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-recalculate:</div><div class='del'>-	mutex_lock(&amp;c-&gt;sectors_available_lock);</div><div class='del'>-</div><div class='del'>-	percpu_u64_set(&amp;c-&gt;pcpu-&gt;sectors_available, 0);</div><div class='del'>-	sectors_available = avail_factor(__bch2_fs_usage_read_short(c).free);</div><div class='del'>-</div><div class='del'>-	if (sectors &lt;= sectors_available ||</div><div class='del'>-	    (flags &amp; BCH_DISK_RESERVATION_NOFAIL)) {</div><div class='del'>-		atomic64_set(&amp;c-&gt;sectors_available,</div><div class='del'>-			     max_t(s64, 0, sectors_available - sectors));</div><div class='del'>-		this_cpu_add(*c-&gt;online_reserved, sectors);</div><div class='del'>-		res-&gt;sectors			+= sectors;</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else {</div><div class='del'>-		atomic64_set(&amp;c-&gt;sectors_available, sectors_available);</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_disk_reservation;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sectors_available_lock);</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Startup/shutdown: */</div><div class='del'>-</div><div class='del'>-static void bucket_gens_free_rcu(struct rcu_head *rcu)</div><div class='del'>-{</div><div class='del'>-	struct bucket_gens *buckets =</div><div class='del'>-		container_of(rcu, struct bucket_gens, rcu);</div><div class='del'>-</div><div class='del'>-	kvpfree(buckets, sizeof(*buckets) + buckets-&gt;nbuckets);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets)</div><div class='del'>-{</div><div class='del'>-	struct bucket_gens *bucket_gens = NULL, *old_bucket_gens = NULL;</div><div class='del'>-	unsigned long *buckets_nouse = NULL;</div><div class='del'>-	bool resize = ca-&gt;bucket_gens != NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!(bucket_gens	= kvpmalloc(sizeof(struct bucket_gens) + nbuckets,</div><div class='del'>-					    GFP_KERNEL|__GFP_ZERO))) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_bucket_gens;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((c-&gt;opts.buckets_nouse &amp;&amp;</div><div class='del'>-	     !(buckets_nouse	= kvpmalloc(BITS_TO_LONGS(nbuckets) *</div><div class='del'>-					    sizeof(unsigned long),</div><div class='del'>-					    GFP_KERNEL|__GFP_ZERO)))) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_buckets_nouse;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bucket_gens-&gt;first_bucket = ca-&gt;mi.first_bucket;</div><div class='del'>-	bucket_gens-&gt;nbuckets	= nbuckets;</div><div class='del'>-</div><div class='del'>-	if (resize) {</div><div class='del'>-		down_write(&amp;c-&gt;gc_lock);</div><div class='del'>-		down_write(&amp;ca-&gt;bucket_lock);</div><div class='del'>-		percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_bucket_gens = rcu_dereference_protected(ca-&gt;bucket_gens, 1);</div><div class='del'>-</div><div class='del'>-	if (resize) {</div><div class='del'>-		size_t n = min(bucket_gens-&gt;nbuckets, old_bucket_gens-&gt;nbuckets);</div><div class='del'>-</div><div class='del'>-		memcpy(bucket_gens-&gt;b,</div><div class='del'>-		       old_bucket_gens-&gt;b,</div><div class='del'>-		       n);</div><div class='del'>-		if (buckets_nouse)</div><div class='del'>-			memcpy(buckets_nouse,</div><div class='del'>-			       ca-&gt;buckets_nouse,</div><div class='del'>-			       BITS_TO_LONGS(n) * sizeof(unsigned long));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_assign_pointer(ca-&gt;bucket_gens, bucket_gens);</div><div class='del'>-	bucket_gens	= old_bucket_gens;</div><div class='del'>-</div><div class='del'>-	swap(ca-&gt;buckets_nouse, buckets_nouse);</div><div class='del'>-</div><div class='del'>-	nbuckets = ca-&gt;mi.nbuckets;</div><div class='del'>-</div><div class='del'>-	if (resize) {</div><div class='del'>-		percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-		up_write(&amp;ca-&gt;bucket_lock);</div><div class='del'>-		up_write(&amp;c-&gt;gc_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-	kvpfree(buckets_nouse,</div><div class='del'>-		BITS_TO_LONGS(nbuckets) * sizeof(unsigned long));</div><div class='del'>-	if (bucket_gens)</div><div class='del'>-		call_rcu(&amp;bucket_gens-&gt;rcu, bucket_gens_free_rcu);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_buckets_free(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	kvpfree(ca-&gt;buckets_nouse,</div><div class='del'>-		BITS_TO_LONGS(ca-&gt;mi.nbuckets) * sizeof(unsigned long));</div><div class='del'>-	kvpfree(rcu_dereference_protected(ca-&gt;bucket_gens, 1),</div><div class='del'>-		sizeof(struct bucket_gens) + ca-&gt;mi.nbuckets);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ca-&gt;usage); i++)</div><div class='del'>-		free_percpu(ca-&gt;usage[i]);</div><div class='del'>-	kfree(ca-&gt;usage_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_buckets_alloc(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	ca-&gt;usage_base = kzalloc(sizeof(struct bch_dev_usage), GFP_KERNEL);</div><div class='del'>-	if (!ca-&gt;usage_base)</div><div class='del'>-		return -BCH_ERR_ENOMEM_usage_init;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ca-&gt;usage); i++) {</div><div class='del'>-		ca-&gt;usage[i] = alloc_percpu(struct bch_dev_usage);</div><div class='del'>-		if (!ca-&gt;usage[i])</div><div class='del'>-			return -BCH_ERR_ENOMEM_usage_init;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_dev_buckets_resize(c, ca, ca-&gt;mi.nbuckets);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h<br/>deleted file mode 100644<br/>index 6387e039f789..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/buckets.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,478 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Code for manipulating bucket marks for garbage collection.</div><div class='del'>- *</div><div class='del'>- * Copyright 2014 Datera, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _BUCKETS_H</div><div class='del'>-#define _BUCKETS_H</div><div class='del'>-</div><div class='del'>-#include "buckets_types.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-</div><div class='del'>-static inline size_t sector_to_bucket(const struct bch_dev *ca, sector_t s)</div><div class='del'>-{</div><div class='del'>-	return div_u64(s, ca-&gt;mi.bucket_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sector_t bucket_to_sector(const struct bch_dev *ca, size_t b)</div><div class='del'>-{</div><div class='del'>-	return ((sector_t) b) * ca-&gt;mi.bucket_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sector_t bucket_remainder(const struct bch_dev *ca, sector_t s)</div><div class='del'>-{</div><div class='del'>-	u32 remainder;</div><div class='del'>-</div><div class='del'>-	div_u64_rem(s, ca-&gt;mi.bucket_size, &amp;remainder);</div><div class='del'>-	return remainder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t sector_to_bucket_and_offset(const struct bch_dev *ca, sector_t s,</div><div class='del'>-						 u32 *offset)</div><div class='del'>-{</div><div class='del'>-	return div_u64_rem(s, ca-&gt;mi.bucket_size, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_bucket(_b, _buckets)				\</div><div class='del'>-	for (_b = (_buckets)-&gt;b + (_buckets)-&gt;first_bucket;	\</div><div class='del'>-	     _b &lt; (_buckets)-&gt;b + (_buckets)-&gt;nbuckets; _b++)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ugly hack alert:</div><div class='del'>- *</div><div class='del'>- * We need to cram a spinlock in a single byte, because that's what we have left</div><div class='del'>- * in struct bucket, and we care about the size of these - during fsck, we need</div><div class='del'>- * in memory state for every single bucket on every device.</div><div class='del'>- *</div><div class='del'>- * We used to do</div><div class='del'>- *   while (xchg(&amp;b-&gt;lock, 1) cpu_relax();</div><div class='del'>- * but, it turns out not all architectures support xchg on a single byte.</div><div class='del'>- *</div><div class='del'>- * So now we use bit_spin_lock(), with fun games since we can't burn a whole</div><div class='del'>- * ulong for this - we just need to make sure the lock bit always ends up in the</div><div class='del'>- * first byte.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-#define BUCKET_LOCK_BITNR	0</div><div class='del'>-#else</div><div class='del'>-#define BUCKET_LOCK_BITNR	(BITS_PER_LONG - 1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-union ulong_byte_assert {</div><div class='del'>-	ulong	ulong;</div><div class='del'>-	u8	byte;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void bucket_unlock(struct bucket *b)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON(!((union ulong_byte_assert) { .ulong = 1UL &lt;&lt; BUCKET_LOCK_BITNR }).byte);</div><div class='del'>-</div><div class='del'>-	clear_bit_unlock(BUCKET_LOCK_BITNR, (void *) &amp;b-&gt;lock);</div><div class='del'>-	wake_up_bit((void *) &amp;b-&gt;lock, BUCKET_LOCK_BITNR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bucket_lock(struct bucket *b)</div><div class='del'>-{</div><div class='del'>-	wait_on_bit_lock((void *) &amp;b-&gt;lock, BUCKET_LOCK_BITNR,</div><div class='del'>-			 TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bucket_array *gc_bucket_array(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	return rcu_dereference_check(ca-&gt;buckets_gc,</div><div class='del'>-				     !ca-&gt;fs ||</div><div class='del'>-				     percpu_rwsem_is_held(&amp;ca-&gt;fs-&gt;mark_lock) ||</div><div class='del'>-				     lockdep_is_held(&amp;ca-&gt;fs-&gt;gc_lock) ||</div><div class='del'>-				     lockdep_is_held(&amp;ca-&gt;bucket_lock));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bucket *gc_bucket(struct bch_dev *ca, size_t b)</div><div class='del'>-{</div><div class='del'>-	struct bucket_array *buckets = gc_bucket_array(ca);</div><div class='del'>-</div><div class='del'>-	BUG_ON(b &lt; buckets-&gt;first_bucket || b &gt;= buckets-&gt;nbuckets);</div><div class='del'>-	return buckets-&gt;b + b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bucket_gens *bucket_gens(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	return rcu_dereference_check(ca-&gt;bucket_gens,</div><div class='del'>-				     !ca-&gt;fs ||</div><div class='del'>-				     percpu_rwsem_is_held(&amp;ca-&gt;fs-&gt;mark_lock) ||</div><div class='del'>-				     lockdep_is_held(&amp;ca-&gt;fs-&gt;gc_lock) ||</div><div class='del'>-				     lockdep_is_held(&amp;ca-&gt;bucket_lock));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 *bucket_gen(struct bch_dev *ca, size_t b)</div><div class='del'>-{</div><div class='del'>-	struct bucket_gens *gens = bucket_gens(ca);</div><div class='del'>-</div><div class='del'>-	BUG_ON(b &lt; gens-&gt;first_bucket || b &gt;= gens-&gt;nbuckets);</div><div class='del'>-	return gens-&gt;b + b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t PTR_BUCKET_NR(const struct bch_dev *ca,</div><div class='del'>-				   const struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	return sector_to_bucket(ca, ptr-&gt;offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos PTR_BUCKET_POS(const struct bch_fs *c,</div><div class='del'>-				   const struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return POS(ptr-&gt;dev, PTR_BUCKET_NR(ca, ptr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos PTR_BUCKET_POS_OFFSET(const struct bch_fs *c,</div><div class='del'>-						const struct bch_extent_ptr *ptr,</div><div class='del'>-						u32 *bucket_offset)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return POS(ptr-&gt;dev, sector_to_bucket_and_offset(ca, ptr-&gt;offset, bucket_offset));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bucket *PTR_GC_BUCKET(struct bch_dev *ca,</div><div class='del'>-					   const struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	return gc_bucket(ca, PTR_BUCKET_NR(ca, ptr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_data_type ptr_data_type(const struct bkey *k,</div><div class='del'>-					       const struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	if (bkey_is_btree_ptr(k))</div><div class='del'>-		return BCH_DATA_btree;</div><div class='del'>-</div><div class='del'>-	return ptr-&gt;cached ? BCH_DATA_cached : BCH_DATA_user;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s64 ptr_disk_sectors(s64 sectors, struct extent_ptr_decoded p)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(sectors &lt; 0);</div><div class='del'>-</div><div class='del'>-	return crc_is_compressed(p.crc)</div><div class='del'>-		? DIV_ROUND_UP_ULL(sectors * p.crc.compressed_size,</div><div class='del'>-				   p.crc.uncompressed_size)</div><div class='del'>-		: sectors;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gen_cmp(u8 a, u8 b)</div><div class='del'>-{</div><div class='del'>-	return (s8) (a - b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int gen_after(u8 a, u8 b)</div><div class='del'>-{</div><div class='del'>-	int r = gen_cmp(a, b);</div><div class='del'>-</div><div class='del'>-	return r &gt; 0 ? r : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ptr_stale() - check if a pointer points into a bucket that has been</div><div class='del'>- * invalidated.</div><div class='del'>- */</div><div class='del'>-static inline u8 ptr_stale(struct bch_dev *ca,</div><div class='del'>-			   const struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	u8 ret;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	ret = gen_after(*bucket_gen(ca, PTR_BUCKET_NR(ca, ptr)), ptr-&gt;gen);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Device usage: */</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_read_fast(struct bch_dev *, struct bch_dev_usage *);</div><div class='del'>-static inline struct bch_dev_usage bch2_dev_usage_read(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev_usage ret;</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_read_fast(ca, &amp;ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_init(struct bch_dev *);</div><div class='del'>-void bch2_dev_usage_to_text(struct printbuf *, struct bch_dev_usage *);</div><div class='del'>-</div><div class='del'>-static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	s64 reserved = 0;</div><div class='del'>-</div><div class='del'>-	switch (watermark) {</div><div class='del'>-	case BCH_WATERMARK_NR:</div><div class='del'>-		BUG();</div><div class='del'>-	case BCH_WATERMARK_stripe:</div><div class='del'>-		reserved += ca-&gt;mi.nbuckets &gt;&gt; 6;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case BCH_WATERMARK_normal:</div><div class='del'>-		reserved += ca-&gt;mi.nbuckets &gt;&gt; 6;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case BCH_WATERMARK_copygc:</div><div class='del'>-		reserved += ca-&gt;nr_btree_reserve;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case BCH_WATERMARK_btree:</div><div class='del'>-		reserved += ca-&gt;nr_btree_reserve;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case BCH_WATERMARK_btree_copygc:</div><div class='del'>-	case BCH_WATERMARK_reclaim:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return reserved;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 dev_buckets_free(struct bch_dev *ca,</div><div class='del'>-				   struct bch_dev_usage usage,</div><div class='del'>-				   enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	return max_t(s64, 0,</div><div class='del'>-		     usage.d[BCH_DATA_free].buckets -</div><div class='del'>-		     ca-&gt;nr_open_buckets -</div><div class='del'>-		     bch2_dev_buckets_reserved(ca, watermark));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 __dev_buckets_available(struct bch_dev *ca,</div><div class='del'>-					  struct bch_dev_usage usage,</div><div class='del'>-					  enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	return max_t(s64, 0,</div><div class='del'>-		       usage.d[BCH_DATA_free].buckets</div><div class='del'>-		     + usage.d[BCH_DATA_cached].buckets</div><div class='del'>-		     + usage.d[BCH_DATA_need_gc_gens].buckets</div><div class='del'>-		     + usage.d[BCH_DATA_need_discard].buckets</div><div class='del'>-		     - ca-&gt;nr_open_buckets</div><div class='del'>-		     - bch2_dev_buckets_reserved(ca, watermark));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 dev_buckets_available(struct bch_dev *ca,</div><div class='del'>-					enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	return __dev_buckets_available(ca, bch2_dev_usage_read(ca), watermark);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Filesystem usage: */</div><div class='del'>-</div><div class='del'>-static inline unsigned __fs_usage_u64s(unsigned nr_replicas)</div><div class='del'>-{</div><div class='del'>-	return sizeof(struct bch_fs_usage) / sizeof(u64) + nr_replicas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned fs_usage_u64s(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return __fs_usage_u64s(READ_ONCE(c-&gt;replicas.nr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __fs_usage_online_u64s(unsigned nr_replicas)</div><div class='del'>-{</div><div class='del'>-	return sizeof(struct bch_fs_usage_online) / sizeof(u64) + nr_replicas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned fs_usage_online_u64s(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return __fs_usage_online_u64s(READ_ONCE(c-&gt;replicas.nr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned dev_usage_u64s(void)</div><div class='del'>-{</div><div class='del'>-	return sizeof(struct bch_dev_usage) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_fs_usage_read_one(struct bch_fs *, u64 *);</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_online *bch2_fs_usage_read(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_usage_acc_to_base(struct bch_fs *, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_fs_usage_to_text(struct printbuf *,</div><div class='del'>-			   struct bch_fs *, struct bch_fs_usage_online *);</div><div class='del'>-</div><div class='del'>-u64 bch2_fs_sectors_used(struct bch_fs *, struct bch_fs_usage_online *);</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_short</div><div class='del'>-bch2_fs_usage_read_short(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_dev_usage_update(struct bch_fs *, struct bch_dev *,</div><div class='del'>-			   const struct bch_alloc_v4 *,</div><div class='del'>-			   const struct bch_alloc_v4 *, u64, bool);</div><div class='del'>-void bch2_dev_usage_update_m(struct bch_fs *, struct bch_dev *,</div><div class='del'>-			     struct bucket *, struct bucket *);</div><div class='del'>-</div><div class='del'>-/* key/bucket marking: */</div><div class='del'>-</div><div class='del'>-static inline struct bch_fs_usage *fs_usage_ptr(struct bch_fs *c,</div><div class='del'>-						unsigned journal_seq,</div><div class='del'>-						bool gc)</div><div class='del'>-{</div><div class='del'>-	percpu_rwsem_assert_held(&amp;c-&gt;mark_lock);</div><div class='del'>-	BUG_ON(!gc &amp;&amp; !journal_seq);</div><div class='del'>-</div><div class='del'>-	return this_cpu_ptr(gc</div><div class='del'>-			    ? c-&gt;usage_gc</div><div class='del'>-			    : c-&gt;usage[journal_seq &amp; JOURNAL_BUF_MASK]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_update_replicas(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			 struct bch_replicas_entry_v1 *, s64,</div><div class='del'>-			 unsigned, bool);</div><div class='del'>-int bch2_update_replicas_list(struct btree_trans *,</div><div class='del'>-			 struct bch_replicas_entry_v1 *, s64);</div><div class='del'>-int bch2_update_cached_sectors_list(struct btree_trans *, unsigned, s64);</div><div class='del'>-int bch2_replicas_deltas_realloc(struct btree_trans *, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_fs_usage_initialize(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_check_bucket_ref(struct btree_trans *, struct bkey_s_c,</div><div class='del'>-			  const struct bch_extent_ptr *,</div><div class='del'>-			  s64, enum bch_data_type, u8, u8, u32);</div><div class='del'>-</div><div class='del'>-int bch2_mark_metadata_bucket(struct bch_fs *, struct bch_dev *,</div><div class='del'>-			      size_t, enum bch_data_type, unsigned,</div><div class='del'>-			      struct gc_pos, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_trigger_extent(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-			struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-int bch2_trigger_reservation(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-			  struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-#define trigger_run_overwrite_then_insert(_fn, _trans, _btree_id, _level, _old, _new, _flags)\</div><div class='del'>-({												\</div><div class='del'>-	int ret = 0;										\</div><div class='del'>-												\</div><div class='del'>-	if (_old.k-&gt;type)									\</div><div class='del'>-		ret = _fn(_trans, _btree_id, _level, _old, _flags &amp; ~BTREE_TRIGGER_INSERT);	\</div><div class='del'>-	if (!ret &amp;&amp; _new.k-&gt;type)								\</div><div class='del'>-		ret = _fn(_trans, _btree_id, _level, _new.s_c, _flags &amp; ~BTREE_TRIGGER_OVERWRITE);\</div><div class='del'>-	ret;											\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-void bch2_trans_account_disk_usage_change(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-void bch2_trans_fs_usage_revert(struct btree_trans *, struct replicas_delta_list *);</div><div class='del'>-int bch2_trans_fs_usage_apply(struct btree_trans *, struct replicas_delta_list *);</div><div class='del'>-</div><div class='del'>-int bch2_trans_mark_metadata_bucket(struct btree_trans *, struct bch_dev *,</div><div class='del'>-				    size_t, enum bch_data_type, unsigned);</div><div class='del'>-int bch2_trans_mark_dev_sb(struct bch_fs *, struct bch_dev *);</div><div class='del'>-int bch2_trans_mark_dev_sbs(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline bool is_superblock_bucket(struct bch_dev *ca, u64 b)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_layout *layout = &amp;ca-&gt;disk_sb.sb-&gt;layout;</div><div class='del'>-	u64 b_offset	= bucket_to_sector(ca, b);</div><div class='del'>-	u64 b_end	= bucket_to_sector(ca, b + 1);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (!b)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; layout-&gt;nr_superblocks; i++) {</div><div class='del'>-		u64 offset = le64_to_cpu(layout-&gt;sb_offset[i]);</div><div class='del'>-		u64 end = offset + (1 &lt;&lt; layout-&gt;sb_max_size_bits);</div><div class='del'>-</div><div class='del'>-		if (!(offset &gt;= b_end || end &lt;= b_offset))</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline const char *bch2_data_type_str(enum bch_data_type type)</div><div class='del'>-{</div><div class='del'>-	return type &lt; BCH_DATA_NR</div><div class='del'>-		? __bch2_data_types[type]</div><div class='del'>-		: "(invalid data type)";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_prt_data_type(struct printbuf *out, enum bch_data_type type)</div><div class='del'>-{</div><div class='del'>-	if (type &lt; BCH_DATA_NR)</div><div class='del'>-		prt_str(out, __bch2_data_types[type]);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(invalid data type %u)", type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* disk reservations: */</div><div class='del'>-</div><div class='del'>-static inline void bch2_disk_reservation_put(struct bch_fs *c,</div><div class='del'>-					     struct disk_reservation *res)</div><div class='del'>-{</div><div class='del'>-	if (res-&gt;sectors) {</div><div class='del'>-		this_cpu_sub(*c-&gt;online_reserved, res-&gt;sectors);</div><div class='del'>-		res-&gt;sectors = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_DISK_RESERVATION_NOFAIL		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-int __bch2_disk_reservation_add(struct bch_fs *,</div><div class='del'>-				struct disk_reservation *,</div><div class='del'>-				u64, int);</div><div class='del'>-</div><div class='del'>-static inline int bch2_disk_reservation_add(struct bch_fs *c, struct disk_reservation *res,</div><div class='del'>-					    u64 sectors, int flags)</div><div class='del'>-{</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	u64 old, new;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = this_cpu_read(c-&gt;pcpu-&gt;sectors_available);</div><div class='del'>-		if (sectors &gt; old)</div><div class='del'>-			return __bch2_disk_reservation_add(c, res, sectors, flags);</div><div class='del'>-</div><div class='del'>-		new = old - sectors;</div><div class='del'>-	} while (this_cpu_cmpxchg(c-&gt;pcpu-&gt;sectors_available, old, new) != old);</div><div class='del'>-</div><div class='del'>-	this_cpu_add(*c-&gt;online_reserved, sectors);</div><div class='del'>-	res-&gt;sectors			+= sectors;</div><div class='del'>-	return 0;</div><div class='del'>-#else</div><div class='del'>-	return __bch2_disk_reservation_add(c, res, sectors, flags);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct disk_reservation</div><div class='del'>-bch2_disk_reservation_init(struct bch_fs *c, unsigned nr_replicas)</div><div class='del'>-{</div><div class='del'>-	return (struct disk_reservation) {</div><div class='del'>-		.sectors	= 0,</div><div class='del'>-#if 0</div><div class='del'>-		/* not used yet: */</div><div class='del'>-		.gen		= c-&gt;capacity_gen,</div><div class='del'>-#endif</div><div class='del'>-		.nr_replicas	= nr_replicas,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_disk_reservation_get(struct bch_fs *c,</div><div class='del'>-					    struct disk_reservation *res,</div><div class='del'>-					    u64 sectors, unsigned nr_replicas,</div><div class='del'>-					    int flags)</div><div class='del'>-{</div><div class='del'>-	*res = bch2_disk_reservation_init(c, nr_replicas);</div><div class='del'>-</div><div class='del'>-	return bch2_disk_reservation_add(c, res, sectors * nr_replicas, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RESERVE_FACTOR	6</div><div class='del'>-</div><div class='del'>-static inline u64 avail_factor(u64 r)</div><div class='del'>-{</div><div class='del'>-	return div_u64(r &lt;&lt; RESERVE_FACTOR, (1 &lt;&lt; RESERVE_FACTOR) + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_buckets_resize(struct bch_fs *, struct bch_dev *, u64);</div><div class='del'>-void bch2_dev_buckets_free(struct bch_dev *);</div><div class='del'>-int bch2_dev_buckets_alloc(struct bch_fs *, struct bch_dev *);</div><div class='del'>-</div><div class='del'>-#endif /* _BUCKETS_H */</div><div class='head'>diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h<br/>deleted file mode 100644<br/>index 6a31740222a7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/buckets_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BUCKETS_TYPES_H</div><div class='del'>-#define _BUCKETS_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#define BUCKET_JOURNAL_SEQ_BITS		16</div><div class='del'>-</div><div class='del'>-struct bucket {</div><div class='del'>-	u8			lock;</div><div class='del'>-	u8			gen_valid:1;</div><div class='del'>-	u8			data_type:7;</div><div class='del'>-	u8			gen;</div><div class='del'>-	u8			stripe_redundancy;</div><div class='del'>-	u32			stripe;</div><div class='del'>-	u32			dirty_sectors;</div><div class='del'>-	u32			cached_sectors;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bucket_array {</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	u16			first_bucket;</div><div class='del'>-	size_t			nbuckets;</div><div class='del'>-	struct bucket		b[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bucket_gens {</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	u16			first_bucket;</div><div class='del'>-	size_t			nbuckets;</div><div class='del'>-	u8			b[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_dev_usage {</div><div class='del'>-	struct {</div><div class='del'>-		u64		buckets;</div><div class='del'>-		u64		sectors; /* _compressed_ sectors: */</div><div class='del'>-		/*</div><div class='del'>-		 * XXX</div><div class='del'>-		 * Why do we have this? Isn't it just buckets * bucket_size -</div><div class='del'>-		 * sectors?</div><div class='del'>-		 */</div><div class='del'>-		u64		fragmented;</div><div class='del'>-	}			d[BCH_DATA_NR];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_base {</div><div class='del'>-	u64			hidden;</div><div class='del'>-	u64			btree;</div><div class='del'>-	u64			data;</div><div class='del'>-	u64			cached;</div><div class='del'>-	u64			reserved;</div><div class='del'>-	u64			nr_inodes;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage {</div><div class='del'>-	/* all fields are in units of 512 byte sectors: */</div><div class='del'>-	struct bch_fs_usage_base b;</div><div class='del'>-	u64			persistent_reserved[BCH_REPLICAS_MAX];</div><div class='del'>-	u64			replicas[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_online {</div><div class='del'>-	u64			online_reserved;</div><div class='del'>-	struct bch_fs_usage	u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs_usage_short {</div><div class='del'>-	u64			capacity;</div><div class='del'>-	u64			used;</div><div class='del'>-	u64			free;</div><div class='del'>-	u64			nr_inodes;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A reservation for space on disk:</div><div class='del'>- */</div><div class='del'>-struct disk_reservation {</div><div class='del'>-	u64			sectors;</div><div class='del'>-	u32			gen;</div><div class='del'>-	unsigned		nr_replicas;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BUCKETS_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/buckets_waiting_for_journal.c b/fs/bcachefs/buckets_waiting_for_journal.c<br/>deleted file mode 100644<br/>index ec1b636ef78d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/buckets_waiting_for_journal.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_waiting_for_journal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "buckets_waiting_for_journal.h"</div><div class='del'>-#include &lt;linux/hash.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='del'>-static inline struct bucket_hashed *</div><div class='del'>-bucket_hash(struct buckets_waiting_for_journal_table *t,</div><div class='del'>-	    unsigned hash_seed_idx, u64 dev_bucket)</div><div class='del'>-{</div><div class='del'>-	return t-&gt;d + hash_64(dev_bucket ^ t-&gt;hash_seeds[hash_seed_idx], t-&gt;bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bucket_table_init(struct buckets_waiting_for_journal_table *t, size_t bits)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	t-&gt;bits = bits;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(t-&gt;hash_seeds); i++)</div><div class='del'>-		get_random_bytes(&amp;t-&gt;hash_seeds[i], sizeof(t-&gt;hash_seeds[i]));</div><div class='del'>-	memset(t-&gt;d, 0, sizeof(t-&gt;d[0]) &lt;&lt; t-&gt;bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bucket_needs_journal_commit(struct buckets_waiting_for_journal *b,</div><div class='del'>-				      u64 flushed_seq,</div><div class='del'>-				      unsigned dev, u64 bucket)</div><div class='del'>-{</div><div class='del'>-	struct buckets_waiting_for_journal_table *t;</div><div class='del'>-	u64 dev_bucket = (u64) dev &lt;&lt; 56 | bucket;</div><div class='del'>-	bool ret = false;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;b-&gt;lock);</div><div class='del'>-	t = b-&gt;t;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(t-&gt;hash_seeds); i++) {</div><div class='del'>-		struct bucket_hashed *h = bucket_hash(t, i, dev_bucket);</div><div class='del'>-</div><div class='del'>-		if (h-&gt;dev_bucket == dev_bucket) {</div><div class='del'>-			ret = h-&gt;journal_seq &gt; flushed_seq;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;b-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bucket_table_insert(struct buckets_waiting_for_journal_table *t,</div><div class='del'>-				struct bucket_hashed *new,</div><div class='del'>-				u64 flushed_seq)</div><div class='del'>-{</div><div class='del'>-	struct bucket_hashed *last_evicted = NULL;</div><div class='del'>-	unsigned tries, i;</div><div class='del'>-</div><div class='del'>-	for (tries = 0; tries &lt; 10; tries++) {</div><div class='del'>-		struct bucket_hashed *old, *victim = NULL;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(t-&gt;hash_seeds); i++) {</div><div class='del'>-			old = bucket_hash(t, i, new-&gt;dev_bucket);</div><div class='del'>-</div><div class='del'>-			if (old-&gt;dev_bucket == new-&gt;dev_bucket ||</div><div class='del'>-			    old-&gt;journal_seq &lt;= flushed_seq) {</div><div class='del'>-				*old = *new;</div><div class='del'>-				return true;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (last_evicted != old)</div><div class='del'>-				victim = old;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* hashed to same slot 3 times: */</div><div class='del'>-		if (!victim)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Failed to find an empty slot: */</div><div class='del'>-		swap(*new, *victim);</div><div class='del'>-		last_evicted = victim;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_set_bucket_needs_journal_commit(struct buckets_waiting_for_journal *b,</div><div class='del'>-					 u64 flushed_seq,</div><div class='del'>-					 unsigned dev, u64 bucket,</div><div class='del'>-					 u64 journal_seq)</div><div class='del'>-{</div><div class='del'>-	struct buckets_waiting_for_journal_table *t, *n;</div><div class='del'>-	struct bucket_hashed tmp, new = {</div><div class='del'>-		.dev_bucket	= (u64) dev &lt;&lt; 56 | bucket,</div><div class='del'>-		.journal_seq	= journal_seq,</div><div class='del'>-	};</div><div class='del'>-	size_t i, size, new_bits, nr_elements = 1, nr_rehashes = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;b-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (likely(bucket_table_insert(b-&gt;t, &amp;new, flushed_seq)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	t = b-&gt;t;</div><div class='del'>-	size = 1UL &lt;&lt; t-&gt;bits;</div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		nr_elements += t-&gt;d[i].journal_seq &gt; flushed_seq;</div><div class='del'>-</div><div class='del'>-	new_bits = t-&gt;bits + (nr_elements * 3 &gt; size);</div><div class='del'>-</div><div class='del'>-	n = kvmalloc(sizeof(*n) + (sizeof(n-&gt;d[0]) &lt;&lt; new_bits), GFP_KERNEL);</div><div class='del'>-	if (!n) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_buckets_waiting_for_journal_set;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-retry_rehash:</div><div class='del'>-	nr_rehashes++;</div><div class='del'>-	bucket_table_init(n, new_bits);</div><div class='del'>-</div><div class='del'>-	tmp = new;</div><div class='del'>-	BUG_ON(!bucket_table_insert(n, &amp;tmp, flushed_seq));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 1UL &lt;&lt; t-&gt;bits; i++) {</div><div class='del'>-		if (t-&gt;d[i].journal_seq &lt;= flushed_seq)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		tmp = t-&gt;d[i];</div><div class='del'>-		if (!bucket_table_insert(n, &amp;tmp, flushed_seq))</div><div class='del'>-			goto retry_rehash;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b-&gt;t = n;</div><div class='del'>-	kvfree(t);</div><div class='del'>-</div><div class='del'>-	pr_debug("took %zu rehashes, table at %zu/%lu elements",</div><div class='del'>-		 nr_rehashes, nr_elements, 1UL &lt;&lt; b-&gt;t-&gt;bits);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;b-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_buckets_waiting_for_journal_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct buckets_waiting_for_journal *b = &amp;c-&gt;buckets_waiting_for_journal;</div><div class='del'>-</div><div class='del'>-	kvfree(b-&gt;t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define INITIAL_TABLE_BITS		3</div><div class='del'>-</div><div class='del'>-int bch2_fs_buckets_waiting_for_journal_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct buckets_waiting_for_journal *b = &amp;c-&gt;buckets_waiting_for_journal;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;b-&gt;lock);</div><div class='del'>-</div><div class='del'>-	b-&gt;t = kvmalloc(sizeof(*b-&gt;t) +</div><div class='del'>-			(sizeof(b-&gt;t-&gt;d[0]) &lt;&lt; INITIAL_TABLE_BITS), GFP_KERNEL);</div><div class='del'>-	if (!b-&gt;t)</div><div class='del'>-		return -BCH_ERR_ENOMEM_buckets_waiting_for_journal_init;</div><div class='del'>-</div><div class='del'>-	bucket_table_init(b-&gt;t, INITIAL_TABLE_BITS);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/buckets_waiting_for_journal.h b/fs/bcachefs/buckets_waiting_for_journal.h<br/>deleted file mode 100644<br/>index d2ae19cbe18c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/buckets_waiting_for_journal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_waiting_for_journal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BUCKETS_WAITING_FOR_JOURNAL_H</div><div class='del'>-#define _BUCKETS_WAITING_FOR_JOURNAL_H</div><div class='del'>-</div><div class='del'>-#include "buckets_waiting_for_journal_types.h"</div><div class='del'>-</div><div class='del'>-bool bch2_bucket_needs_journal_commit(struct buckets_waiting_for_journal *,</div><div class='del'>-				      u64, unsigned, u64);</div><div class='del'>-int bch2_set_bucket_needs_journal_commit(struct buckets_waiting_for_journal *,</div><div class='del'>-					 u64, unsigned, u64, u64);</div><div class='del'>-</div><div class='del'>-void bch2_fs_buckets_waiting_for_journal_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_buckets_waiting_for_journal_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BUCKETS_WAITING_FOR_JOURNAL_H */</div><div class='head'>diff --git a/fs/bcachefs/buckets_waiting_for_journal_types.h b/fs/bcachefs/buckets_waiting_for_journal_types.h<br/>deleted file mode 100644<br/>index e593db061d81..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/buckets_waiting_for_journal_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/buckets_waiting_for_journal_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BUCKETS_WAITING_FOR_JOURNAL_TYPES_H</div><div class='del'>-#define _BUCKETS_WAITING_FOR_JOURNAL_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/siphash.h&gt;</div><div class='del'>-</div><div class='del'>-struct bucket_hashed {</div><div class='del'>-	u64			dev_bucket;</div><div class='del'>-	u64			journal_seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct buckets_waiting_for_journal_table {</div><div class='del'>-	unsigned		bits;</div><div class='del'>-	u64			hash_seeds[3];</div><div class='del'>-	struct bucket_hashed	d[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct buckets_waiting_for_journal {</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	struct buckets_waiting_for_journal_table *t;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BUCKETS_WAITING_FOR_JOURNAL_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/chardev.c b/fs/bcachefs/chardev.c<br/>deleted file mode 100644<br/>index 226b39c17667..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/chardev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/chardev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,999 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_CHARDEV</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bcachefs_ioctl.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "chardev.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "thread_with_file.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/cdev.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/ioctl.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/sched/task.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-__must_check</div><div class='del'>-static int copy_to_user_errcode(void __user *to, const void *from, unsigned long n)</div><div class='del'>-{</div><div class='del'>-	return copy_to_user(to, from, n) ? -EFAULT : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns with ref on ca-&gt;ref */</div><div class='del'>-static struct bch_dev *bch2_device_lookup(struct bch_fs *c, u64 dev,</div><div class='del'>-					  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BCH_BY_INDEX) {</div><div class='del'>-		if (dev &gt;= c-&gt;sb.nr_devices)</div><div class='del'>-			return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ca = rcu_dereference(c-&gt;devs[dev]);</div><div class='del'>-		if (ca)</div><div class='del'>-			percpu_ref_get(&amp;ca-&gt;ref);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		if (!ca)</div><div class='del'>-			return ERR_PTR(-EINVAL);</div><div class='del'>-	} else {</div><div class='del'>-		char *path;</div><div class='del'>-</div><div class='del'>-		path = strndup_user((const char __user *)</div><div class='del'>-				    (unsigned long) dev, PATH_MAX);</div><div class='del'>-		if (IS_ERR(path))</div><div class='del'>-			return ERR_CAST(path);</div><div class='del'>-</div><div class='del'>-		ca = bch2_dev_lookup(c, path);</div><div class='del'>-		kfree(path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static long bch2_ioctl_assemble(struct bch_ioctl_assemble __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_ioctl_assemble arg;</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-	u64 *user_devs = NULL;</div><div class='del'>-	char **devs = NULL;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;arg, user_arg, sizeof(arg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (arg.flags || arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	user_devs = kmalloc_array(arg.nr_devs, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!user_devs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	devs = kcalloc(arg.nr_devs, sizeof(char *), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(user_devs, user_arg-&gt;devs,</div><div class='del'>-			   sizeof(u64) * arg.nr_devs))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; arg.nr_devs; i++) {</div><div class='del'>-		devs[i] = strndup_user((const char __user *)(unsigned long)</div><div class='del'>-				       user_devs[i],</div><div class='del'>-				       PATH_MAX);</div><div class='del'>-		ret= PTR_ERR_OR_ZERO(devs[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c = bch2_fs_open(devs, arg.nr_devs, bch2_opts_empty());</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(c);</div><div class='del'>-	if (!ret)</div><div class='del'>-		closure_put(&amp;c-&gt;cl);</div><div class='del'>-err:</div><div class='del'>-	if (devs)</div><div class='del'>-		for (i = 0; i &lt; arg.nr_devs; i++)</div><div class='del'>-			kfree(devs[i]);</div><div class='del'>-	kfree(devs);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_incremental(struct bch_ioctl_incremental __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_ioctl_incremental arg;</div><div class='del'>-	const char *err;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;arg, user_arg, sizeof(arg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (arg.flags || arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	path = strndup_user((const char __user *)(unsigned long) arg.dev, PATH_MAX);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(path);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	err = bch2_fs_open_incremental(path);</div><div class='del'>-	kfree(path);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_err("Could not register bcachefs devices: %s", err);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct fsck_thread {</div><div class='del'>-	struct thread_with_stdio thr;</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	char			**devs;</div><div class='del'>-	size_t			nr_devs;</div><div class='del'>-	struct bch_opts		opts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_fsck_thread_exit(struct thread_with_stdio *_thr)</div><div class='del'>-{</div><div class='del'>-	struct fsck_thread *thr = container_of(_thr, struct fsck_thread, thr);</div><div class='del'>-	if (thr-&gt;devs)</div><div class='del'>-		for (size_t i = 0; i &lt; thr-&gt;nr_devs; i++)</div><div class='del'>-			kfree(thr-&gt;devs[i]);</div><div class='del'>-	kfree(thr-&gt;devs);</div><div class='del'>-	kfree(thr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fsck_offline_thread_fn(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct fsck_thread *thr = container_of(arg, struct fsck_thread, thr);</div><div class='del'>-	struct bch_fs *c = bch2_fs_open(thr-&gt;devs, thr-&gt;nr_devs, thr-&gt;opts);</div><div class='del'>-</div><div class='del'>-	thr-&gt;thr.thr.ret = PTR_ERR_OR_ZERO(c);</div><div class='del'>-	if (!thr-&gt;thr.thr.ret)</div><div class='del'>-		bch2_fs_stop(c);</div><div class='del'>-</div><div class='del'>-	thread_with_stdio_done(&amp;thr-&gt;thr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_fsck_offline(struct bch_ioctl_fsck_offline __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_ioctl_fsck_offline arg;</div><div class='del'>-	struct fsck_thread *thr = NULL;</div><div class='del'>-	u64 *devs = NULL;</div><div class='del'>-	long ret = 0;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;arg, user_arg, sizeof(arg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (arg.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!(devs = kcalloc(arg.nr_devs, sizeof(*devs), GFP_KERNEL)) ||</div><div class='del'>-	    !(thr = kzalloc(sizeof(*thr), GFP_KERNEL)) ||</div><div class='del'>-	    !(thr-&gt;devs = kcalloc(arg.nr_devs, sizeof(*thr-&gt;devs), GFP_KERNEL))) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thr-&gt;opts = bch2_opts_empty();</div><div class='del'>-	thr-&gt;nr_devs = arg.nr_devs;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(devs, &amp;user_arg-&gt;devs[0],</div><div class='del'>-			   array_size(sizeof(user_arg-&gt;devs[0]), arg.nr_devs))) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (size_t i = 0; i &lt; arg.nr_devs; i++) {</div><div class='del'>-		thr-&gt;devs[i] = strndup_user((char __user *)(unsigned long) devs[i], PATH_MAX);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(thr-&gt;devs[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (arg.opts) {</div><div class='del'>-		char *optstr = strndup_user((char __user *)(unsigned long) arg.opts, 1 &lt;&lt; 16);</div><div class='del'>-</div><div class='del'>-		ret =   PTR_ERR_OR_ZERO(optstr) ?:</div><div class='del'>-			bch2_parse_mount_opts(NULL, &amp;thr-&gt;opts, optstr);</div><div class='del'>-		kfree(optstr);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	opt_set(thr-&gt;opts, stdio, (u64)(unsigned long)&amp;thr-&gt;thr.stdio);</div><div class='del'>-</div><div class='del'>-	ret = bch2_run_thread_with_stdio(&amp;thr-&gt;thr,</div><div class='del'>-			bch2_fsck_thread_exit,</div><div class='del'>-			bch2_fsck_offline_thread_fn);</div><div class='del'>-err:</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		if (thr)</div><div class='del'>-			bch2_fsck_thread_exit(&amp;thr-&gt;thr);</div><div class='del'>-		pr_err("ret %s", bch2_err_str(ret));</div><div class='del'>-	}</div><div class='del'>-	kfree(devs);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_global_ioctl(unsigned cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-#if 0</div><div class='del'>-	case BCH_IOCTL_ASSEMBLE:</div><div class='del'>-		return bch2_ioctl_assemble(arg);</div><div class='del'>-	case BCH_IOCTL_INCREMENTAL:</div><div class='del'>-		return bch2_ioctl_incremental(arg);</div><div class='del'>-#endif</div><div class='del'>-	case BCH_IOCTL_FSCK_OFFLINE: {</div><div class='del'>-		ret = bch2_ioctl_fsck_offline(arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		ret = -ENOTTY;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		ret = bch2_err_class(ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_query_uuid(struct bch_fs *c,</div><div class='del'>-			struct bch_ioctl_query_uuid __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	return copy_to_user_errcode(&amp;user_arg-&gt;uuid, &amp;c-&gt;sb.user_uuid,</div><div class='del'>-				    sizeof(c-&gt;sb.user_uuid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static long bch2_ioctl_start(struct bch_fs *c, struct bch_ioctl_start arg)</div><div class='del'>-{</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (arg.flags || arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return bch2_fs_start(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	bch2_fs_stop(c);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_add(struct bch_fs *c, struct bch_ioctl_disk arg)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (arg.flags || arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	path = strndup_user((const char __user *)(unsigned long) arg.dev, PATH_MAX);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(path);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_add(c, path);</div><div class='del'>-	kfree(path);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_remove(struct bch_fs *c, struct bch_ioctl_disk arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~(BCH_FORCE_IF_DATA_LOST|</div><div class='del'>-			   BCH_FORCE_IF_METADATA_LOST|</div><div class='del'>-			   BCH_FORCE_IF_DEGRADED|</div><div class='del'>-			   BCH_BY_INDEX)) ||</div><div class='del'>-	    arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	return bch2_dev_remove(c, ca, arg.flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_online(struct bch_fs *c, struct bch_ioctl_disk arg)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (arg.flags || arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	path = strndup_user((const char __user *)(unsigned long) arg.dev, PATH_MAX);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(path);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_online(c, path);</div><div class='del'>-	kfree(path);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_offline(struct bch_fs *c, struct bch_ioctl_disk arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~(BCH_FORCE_IF_DATA_LOST|</div><div class='del'>-			   BCH_FORCE_IF_METADATA_LOST|</div><div class='del'>-			   BCH_FORCE_IF_DEGRADED|</div><div class='del'>-			   BCH_BY_INDEX)) ||</div><div class='del'>-	    arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_offline(c, ca, arg.flags);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_set_state(struct bch_fs *c,</div><div class='del'>-			struct bch_ioctl_disk_set_state arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~(BCH_FORCE_IF_DATA_LOST|</div><div class='del'>-			   BCH_FORCE_IF_METADATA_LOST|</div><div class='del'>-			   BCH_FORCE_IF_DEGRADED|</div><div class='del'>-			   BCH_BY_INDEX)) ||</div><div class='del'>-	    arg.pad[0] || arg.pad[1] || arg.pad[2] ||</div><div class='del'>-	    arg.new_state &gt;= BCH_MEMBER_STATE_NR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_set_state(c, ca, arg.new_state, arg.flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		bch_err(c, "Error setting device state: %s", bch2_err_str(ret));</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_data_ctx {</div><div class='del'>-	struct thread_with_file		thr;</div><div class='del'>-</div><div class='del'>-	struct bch_fs			*c;</div><div class='del'>-	struct bch_ioctl_data		arg;</div><div class='del'>-	struct bch_move_stats		stats;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_data_thread(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_data_ctx *ctx = container_of(arg, struct bch_data_ctx, thr);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;thr.ret = bch2_data_job(ctx-&gt;c, &amp;ctx-&gt;stats, ctx-&gt;arg);</div><div class='del'>-	ctx-&gt;stats.data_type = U8_MAX;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_data_job_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct bch_data_ctx *ctx = container_of(file-&gt;private_data, struct bch_data_ctx, thr);</div><div class='del'>-</div><div class='del'>-	bch2_thread_with_file_exit(&amp;ctx-&gt;thr);</div><div class='del'>-	kfree(ctx);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_data_job_read(struct file *file, char __user *buf,</div><div class='del'>-				  size_t len, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct bch_data_ctx *ctx = container_of(file-&gt;private_data, struct bch_data_ctx, thr);</div><div class='del'>-	struct bch_fs *c = ctx-&gt;c;</div><div class='del'>-	struct bch_ioctl_data_event e = {</div><div class='del'>-		.type			= BCH_DATA_EVENT_PROGRESS,</div><div class='del'>-		.p.data_type		= ctx-&gt;stats.data_type,</div><div class='del'>-		.p.btree_id		= ctx-&gt;stats.pos.btree,</div><div class='del'>-		.p.pos			= ctx-&gt;stats.pos.pos,</div><div class='del'>-		.p.sectors_done		= atomic64_read(&amp;ctx-&gt;stats.sectors_seen),</div><div class='del'>-		.p.sectors_total	= bch2_fs_usage_read_short(c).used,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(e))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return copy_to_user_errcode(buf, &amp;e, sizeof(e)) ?: sizeof(e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations bcachefs_data_ops = {</div><div class='del'>-	.release	= bch2_data_job_release,</div><div class='del'>-	.read		= bch2_data_job_read,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_data(struct bch_fs *c,</div><div class='del'>-			    struct bch_ioctl_data arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_data_ctx *ctx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (arg.op &gt;= BCH_DATA_OP_NR || arg.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='del'>-	if (!ctx)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;c = c;</div><div class='del'>-	ctx-&gt;arg = arg;</div><div class='del'>-</div><div class='del'>-	ret = bch2_run_thread_with_file(&amp;ctx-&gt;thr,</div><div class='del'>-			&amp;bcachefs_data_ops,</div><div class='del'>-			bch2_data_thread);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		kfree(ctx);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_fs_usage(struct bch_fs *c,</div><div class='del'>-				struct bch_ioctl_fs_usage __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_ioctl_fs_usage *arg = NULL;</div><div class='del'>-	struct bch_replicas_usage *dst_e, *dst_end;</div><div class='del'>-	struct bch_fs_usage_online *src;</div><div class='del'>-	u32 replica_entries_bytes;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (get_user(replica_entries_bytes, &amp;user_arg-&gt;replica_entries_bytes))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	arg = kzalloc(size_add(sizeof(*arg), replica_entries_bytes), GFP_KERNEL);</div><div class='del'>-	if (!arg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	src = bch2_fs_usage_read(c);</div><div class='del'>-	if (!src) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arg-&gt;capacity		= c-&gt;capacity;</div><div class='del'>-	arg-&gt;used		= bch2_fs_sectors_used(c, src);</div><div class='del'>-	arg-&gt;online_reserved	= src-&gt;online_reserved;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_REPLICAS_MAX; i++)</div><div class='del'>-		arg-&gt;persistent_reserved[i] = src-&gt;u.persistent_reserved[i];</div><div class='del'>-</div><div class='del'>-	dst_e	= arg-&gt;replicas;</div><div class='del'>-	dst_end = (void *) arg-&gt;replicas + replica_entries_bytes;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;replicas.nr; i++) {</div><div class='del'>-		struct bch_replicas_entry_v1 *src_e =</div><div class='del'>-			cpu_replicas_entry(&amp;c-&gt;replicas, i);</div><div class='del'>-</div><div class='del'>-		/* check that we have enough space for one replicas entry */</div><div class='del'>-		if (dst_e + 1 &gt; dst_end) {</div><div class='del'>-			ret = -ERANGE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dst_e-&gt;sectors		= src-&gt;u.replicas[i];</div><div class='del'>-		dst_e-&gt;r		= *src_e;</div><div class='del'>-</div><div class='del'>-		/* recheck after setting nr_devs: */</div><div class='del'>-		if (replicas_usage_next(dst_e) &gt; dst_end) {</div><div class='del'>-			ret = -ERANGE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(dst_e-&gt;r.devs, src_e-&gt;devs, src_e-&gt;nr_devs);</div><div class='del'>-</div><div class='del'>-		dst_e = replicas_usage_next(dst_e);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	arg-&gt;replica_entries_bytes = (void *) dst_e - (void *) arg-&gt;replicas;</div><div class='del'>-</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	kfree(src);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = copy_to_user_errcode(user_arg, arg,</div><div class='del'>-			sizeof(*arg) + arg-&gt;replica_entries_bytes);</div><div class='del'>-err:</div><div class='del'>-	kfree(arg);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* obsolete, didn't allow for new data types: */</div><div class='del'>-static long bch2_ioctl_dev_usage(struct bch_fs *c,</div><div class='del'>-				 struct bch_ioctl_dev_usage __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_ioctl_dev_usage arg;</div><div class='del'>-	struct bch_dev_usage src;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;arg, user_arg, sizeof(arg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~BCH_BY_INDEX) ||</div><div class='del'>-	    arg.pad[0] ||</div><div class='del'>-	    arg.pad[1] ||</div><div class='del'>-	    arg.pad[2])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	src = bch2_dev_usage_read(ca);</div><div class='del'>-</div><div class='del'>-	arg.state		= ca-&gt;mi.state;</div><div class='del'>-	arg.bucket_size		= ca-&gt;mi.bucket_size;</div><div class='del'>-	arg.nr_buckets		= ca-&gt;mi.nbuckets - ca-&gt;mi.first_bucket;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_DATA_NR; i++) {</div><div class='del'>-		arg.d[i].buckets	= src.d[i].buckets;</div><div class='del'>-		arg.d[i].sectors	= src.d[i].sectors;</div><div class='del'>-		arg.d[i].fragmented	= src.d[i].fragmented;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-</div><div class='del'>-	return copy_to_user_errcode(user_arg, &amp;arg, sizeof(arg));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_dev_usage_v2(struct bch_fs *c,</div><div class='del'>-				 struct bch_ioctl_dev_usage_v2 __user *user_arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_ioctl_dev_usage_v2 arg;</div><div class='del'>-	struct bch_dev_usage src;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;arg, user_arg, sizeof(arg)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~BCH_BY_INDEX) ||</div><div class='del'>-	    arg.pad[0] ||</div><div class='del'>-	    arg.pad[1] ||</div><div class='del'>-	    arg.pad[2])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	src = bch2_dev_usage_read(ca);</div><div class='del'>-</div><div class='del'>-	arg.state		= ca-&gt;mi.state;</div><div class='del'>-	arg.bucket_size		= ca-&gt;mi.bucket_size;</div><div class='del'>-	arg.nr_data_types	= min(arg.nr_data_types, BCH_DATA_NR);</div><div class='del'>-	arg.nr_buckets		= ca-&gt;mi.nbuckets - ca-&gt;mi.first_bucket;</div><div class='del'>-</div><div class='del'>-	ret = copy_to_user_errcode(user_arg, &amp;arg, sizeof(arg));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; arg.nr_data_types; i++) {</div><div class='del'>-		struct bch_ioctl_dev_usage_type t = {</div><div class='del'>-			.buckets	= src.d[i].buckets,</div><div class='del'>-			.sectors	= src.d[i].sectors,</div><div class='del'>-			.fragmented	= src.d[i].fragmented,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ret = copy_to_user_errcode(&amp;user_arg-&gt;d[i], &amp;t, sizeof(t));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_read_super(struct bch_fs *c,</div><div class='del'>-				  struct bch_ioctl_read_super arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = NULL;</div><div class='del'>-	struct bch_sb *sb;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~(BCH_BY_INDEX|BCH_READ_DEV)) ||</div><div class='del'>-	    arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (arg.flags &amp; BCH_READ_DEV) {</div><div class='del'>-		ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(ca)) {</div><div class='del'>-			ret = PTR_ERR(ca);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sb = ca-&gt;disk_sb.sb;</div><div class='del'>-	} else {</div><div class='del'>-		sb = c-&gt;disk_sb.sb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vstruct_bytes(sb) &gt; arg.size) {</div><div class='del'>-		ret = -ERANGE;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = copy_to_user_errcode((void __user *)(unsigned long)arg.sb, sb,</div><div class='del'>-				   vstruct_bytes(sb));</div><div class='del'>-err:</div><div class='del'>-	if (!IS_ERR_OR_NULL(ca))</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_get_idx(struct bch_fs *c,</div><div class='del'>-				    struct bch_ioctl_disk_get_idx arg)</div><div class='del'>-{</div><div class='del'>-	dev_t dev = huge_decode_dev(arg.dev);</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		if (ca-&gt;dev == dev) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-			return ca-&gt;dev_idx;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return -BCH_ERR_ENOENT_dev_idx_not_found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_resize(struct bch_fs *c,</div><div class='del'>-				   struct bch_ioctl_disk_resize arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~BCH_BY_INDEX) ||</div><div class='del'>-	    arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_resize(c, ca, arg.nbuckets);</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_disk_resize_journal(struct bch_fs *c,</div><div class='del'>-				   struct bch_ioctl_disk_resize_journal arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; ~BCH_BY_INDEX) ||</div><div class='del'>-	    arg.pad)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (arg.nbuckets &gt; U32_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ca = bch2_device_lookup(c, arg.dev, arg.flags);</div><div class='del'>-	if (IS_ERR(ca))</div><div class='del'>-		return PTR_ERR(ca);</div><div class='del'>-</div><div class='del'>-	ret = bch2_set_nr_journal_buckets(c, ca, arg.nbuckets);</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fsck_online_thread_fn(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct fsck_thread *thr = container_of(arg, struct fsck_thread, thr);</div><div class='del'>-	struct bch_fs *c = thr-&gt;c;</div><div class='del'>-</div><div class='del'>-	c-&gt;stdio_filter = current;</div><div class='del'>-	c-&gt;stdio = &amp;thr-&gt;thr.stdio;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: can we figure out a way to do this without mucking with c-&gt;opts?</div><div class='del'>-	 */</div><div class='del'>-	unsigned old_fix_errors = c-&gt;opts.fix_errors;</div><div class='del'>-	if (opt_defined(thr-&gt;opts, fix_errors))</div><div class='del'>-		c-&gt;opts.fix_errors = thr-&gt;opts.fix_errors;</div><div class='del'>-	else</div><div class='del'>-		c-&gt;opts.fix_errors = FSCK_FIX_ask;</div><div class='del'>-</div><div class='del'>-	c-&gt;opts.fsck = true;</div><div class='del'>-	set_bit(BCH_FS_fsck_running, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	c-&gt;curr_recovery_pass = BCH_RECOVERY_PASS_check_alloc_info;</div><div class='del'>-	int ret = bch2_run_online_recovery_passes(c);</div><div class='del'>-</div><div class='del'>-	clear_bit(BCH_FS_fsck_running, &amp;c-&gt;flags);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-</div><div class='del'>-	c-&gt;stdio = NULL;</div><div class='del'>-	c-&gt;stdio_filter = NULL;</div><div class='del'>-	c-&gt;opts.fix_errors = old_fix_errors;</div><div class='del'>-</div><div class='del'>-	thread_with_stdio_done(&amp;thr-&gt;thr);</div><div class='del'>-</div><div class='del'>-	up(&amp;c-&gt;online_fsck_mutex);</div><div class='del'>-	bch2_ro_ref_put(c);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_fsck_online(struct bch_fs *c,</div><div class='del'>-				   struct bch_ioctl_fsck_online arg)</div><div class='del'>-{</div><div class='del'>-	struct fsck_thread *thr = NULL;</div><div class='del'>-	long ret = 0;</div><div class='del'>-</div><div class='del'>-	if (arg.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!bch2_ro_ref_tryget(c))</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	if (down_trylock(&amp;c-&gt;online_fsck_mutex)) {</div><div class='del'>-		bch2_ro_ref_put(c);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thr = kzalloc(sizeof(*thr), GFP_KERNEL);</div><div class='del'>-	if (!thr) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thr-&gt;c = c;</div><div class='del'>-	thr-&gt;opts = bch2_opts_empty();</div><div class='del'>-</div><div class='del'>-	if (arg.opts) {</div><div class='del'>-		char *optstr = strndup_user((char __user *)(unsigned long) arg.opts, 1 &lt;&lt; 16);</div><div class='del'>-</div><div class='del'>-		ret =   PTR_ERR_OR_ZERO(optstr) ?:</div><div class='del'>-			bch2_parse_mount_opts(c, &amp;thr-&gt;opts, optstr);</div><div class='del'>-		kfree(optstr);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_run_thread_with_stdio(&amp;thr-&gt;thr,</div><div class='del'>-			bch2_fsck_thread_exit,</div><div class='del'>-			bch2_fsck_online_thread_fn);</div><div class='del'>-err:</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		bch_err_fn(c, ret);</div><div class='del'>-		if (thr)</div><div class='del'>-			bch2_fsck_thread_exit(&amp;thr-&gt;thr);</div><div class='del'>-		up(&amp;c-&gt;online_fsck_mutex);</div><div class='del'>-		bch2_ro_ref_put(c);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_IOCTL(_name, _argtype)					\</div><div class='del'>-do {									\</div><div class='del'>-	_argtype i;							\</div><div class='del'>-									\</div><div class='del'>-	if (copy_from_user(&amp;i, arg, sizeof(i)))				\</div><div class='del'>-		return -EFAULT;						\</div><div class='del'>-	ret = bch2_ioctl_##_name(c, i);					\</div><div class='del'>-	goto out;							\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case BCH_IOCTL_QUERY_UUID:</div><div class='del'>-		return bch2_ioctl_query_uuid(c, arg);</div><div class='del'>-	case BCH_IOCTL_FS_USAGE:</div><div class='del'>-		return bch2_ioctl_fs_usage(c, arg);</div><div class='del'>-	case BCH_IOCTL_DEV_USAGE:</div><div class='del'>-		return bch2_ioctl_dev_usage(c, arg);</div><div class='del'>-	case BCH_IOCTL_DEV_USAGE_V2:</div><div class='del'>-		return bch2_ioctl_dev_usage_v2(c, arg);</div><div class='del'>-#if 0</div><div class='del'>-	case BCH_IOCTL_START:</div><div class='del'>-		BCH_IOCTL(start, struct bch_ioctl_start);</div><div class='del'>-	case BCH_IOCTL_STOP:</div><div class='del'>-		return bch2_ioctl_stop(c);</div><div class='del'>-#endif</div><div class='del'>-	case BCH_IOCTL_READ_SUPER:</div><div class='del'>-		BCH_IOCTL(read_super, struct bch_ioctl_read_super);</div><div class='del'>-	case BCH_IOCTL_DISK_GET_IDX:</div><div class='del'>-		BCH_IOCTL(disk_get_idx, struct bch_ioctl_disk_get_idx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case BCH_IOCTL_DISK_ADD:</div><div class='del'>-		BCH_IOCTL(disk_add, struct bch_ioctl_disk);</div><div class='del'>-	case BCH_IOCTL_DISK_REMOVE:</div><div class='del'>-		BCH_IOCTL(disk_remove, struct bch_ioctl_disk);</div><div class='del'>-	case BCH_IOCTL_DISK_ONLINE:</div><div class='del'>-		BCH_IOCTL(disk_online, struct bch_ioctl_disk);</div><div class='del'>-	case BCH_IOCTL_DISK_OFFLINE:</div><div class='del'>-		BCH_IOCTL(disk_offline, struct bch_ioctl_disk);</div><div class='del'>-	case BCH_IOCTL_DISK_SET_STATE:</div><div class='del'>-		BCH_IOCTL(disk_set_state, struct bch_ioctl_disk_set_state);</div><div class='del'>-	case BCH_IOCTL_DATA:</div><div class='del'>-		BCH_IOCTL(data, struct bch_ioctl_data);</div><div class='del'>-	case BCH_IOCTL_DISK_RESIZE:</div><div class='del'>-		BCH_IOCTL(disk_resize, struct bch_ioctl_disk_resize);</div><div class='del'>-	case BCH_IOCTL_DISK_RESIZE_JOURNAL:</div><div class='del'>-		BCH_IOCTL(disk_resize_journal, struct bch_ioctl_disk_resize_journal);</div><div class='del'>-	case BCH_IOCTL_FSCK_ONLINE:</div><div class='del'>-		BCH_IOCTL(fsck_online, struct bch_ioctl_fsck_online);</div><div class='del'>-	default:</div><div class='del'>-		return -ENOTTY;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		ret = bch2_err_class(ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_IDR(bch_chardev_minor);</div><div class='del'>-</div><div class='del'>-static long bch2_chardev_ioctl(struct file *filp, unsigned cmd, unsigned long v)</div><div class='del'>-{</div><div class='del'>-	unsigned minor = iminor(file_inode(filp));</div><div class='del'>-	struct bch_fs *c = minor &lt; U8_MAX ? idr_find(&amp;bch_chardev_minor, minor) : NULL;</div><div class='del'>-	void __user *arg = (void __user *) v;</div><div class='del'>-</div><div class='del'>-	return c</div><div class='del'>-		? bch2_fs_ioctl(c, cmd, arg)</div><div class='del'>-		: bch2_global_ioctl(cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations bch_chardev_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.unlocked_ioctl = bch2_chardev_ioctl,</div><div class='del'>-	.open		= nonseekable_open,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch_chardev_major;</div><div class='del'>-static struct class *bch_chardev_class;</div><div class='del'>-static struct device *bch_chardev;</div><div class='del'>-</div><div class='del'>-void bch2_fs_chardev_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR_OR_NULL(c-&gt;chardev))</div><div class='del'>-		device_unregister(c-&gt;chardev);</div><div class='del'>-	if (c-&gt;minor &gt;= 0)</div><div class='del'>-		idr_remove(&amp;bch_chardev_minor, c-&gt;minor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_chardev_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	c-&gt;minor = idr_alloc(&amp;bch_chardev_minor, c, 0, 0, GFP_KERNEL);</div><div class='del'>-	if (c-&gt;minor &lt; 0)</div><div class='del'>-		return c-&gt;minor;</div><div class='del'>-</div><div class='del'>-	c-&gt;chardev = device_create(bch_chardev_class, NULL,</div><div class='del'>-				   MKDEV(bch_chardev_major, c-&gt;minor), c,</div><div class='del'>-				   "bcachefs%u-ctl", c-&gt;minor);</div><div class='del'>-	if (IS_ERR(c-&gt;chardev))</div><div class='del'>-		return PTR_ERR(c-&gt;chardev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_chardev_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR_OR_NULL(bch_chardev_class))</div><div class='del'>-		device_destroy(bch_chardev_class,</div><div class='del'>-			       MKDEV(bch_chardev_major, U8_MAX));</div><div class='del'>-	if (!IS_ERR_OR_NULL(bch_chardev_class))</div><div class='del'>-		class_destroy(bch_chardev_class);</div><div class='del'>-	if (bch_chardev_major &gt; 0)</div><div class='del'>-		unregister_chrdev(bch_chardev_major, "bcachefs");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init bch2_chardev_init(void)</div><div class='del'>-{</div><div class='del'>-	bch_chardev_major = register_chrdev(0, "bcachefs-ctl", &amp;bch_chardev_fops);</div><div class='del'>-	if (bch_chardev_major &lt; 0)</div><div class='del'>-		return bch_chardev_major;</div><div class='del'>-</div><div class='del'>-	bch_chardev_class = class_create("bcachefs");</div><div class='del'>-	if (IS_ERR(bch_chardev_class))</div><div class='del'>-		return PTR_ERR(bch_chardev_class);</div><div class='del'>-</div><div class='del'>-	bch_chardev = device_create(bch_chardev_class, NULL,</div><div class='del'>-				    MKDEV(bch_chardev_major, U8_MAX),</div><div class='del'>-				    NULL, "bcachefs-ctl");</div><div class='del'>-	if (IS_ERR(bch_chardev))</div><div class='del'>-		return PTR_ERR(bch_chardev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_CHARDEV */</div><div class='head'>diff --git a/fs/bcachefs/chardev.h b/fs/bcachefs/chardev.h<br/>deleted file mode 100644<br/>index 0f563ca53c36..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/chardev.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/chardev.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_CHARDEV_H</div><div class='del'>-#define _BCACHEFS_CHARDEV_H</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-long bch2_fs_ioctl(struct bch_fs *, unsigned, void __user *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_chardev_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_chardev_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_chardev_exit(void);</div><div class='del'>-int __init bch2_chardev_init(void);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline long bch2_fs_ioctl(struct bch_fs *c,</div><div class='del'>-				unsigned cmd, void __user * arg)</div><div class='del'>-{</div><div class='del'>-	return -ENOTTY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_fs_chardev_exit(struct bch_fs *c) {}</div><div class='del'>-static inline int bch2_fs_chardev_init(struct bch_fs *c) { return 0; }</div><div class='del'>-</div><div class='del'>-static inline void bch2_chardev_exit(void) {}</div><div class='del'>-static inline int __init bch2_chardev_init(void) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_CHARDEV_H */</div><div class='head'>diff --git a/fs/bcachefs/checksum.c b/fs/bcachefs/checksum.c<br/>deleted file mode 100644<br/>index 3c761ad6b1c8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/checksum.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/checksum.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,804 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/crc32c.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/xxhash.h&gt;</div><div class='del'>-#include &lt;linux/key.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='del'>-#include &lt;crypto/chacha.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-#include &lt;crypto/poly1305.h&gt;</div><div class='del'>-#include &lt;crypto/skcipher.h&gt;</div><div class='del'>-#include &lt;keys/user-type.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch2_checksum state is an abstraction of the checksum state calculated over different pages.</div><div class='del'>- * it features page merging without having the checksum algorithm lose its state.</div><div class='del'>- * for native checksum aglorithms (like crc), a default seed value will do.</div><div class='del'>- * for hash-like algorithms, a state needs to be stored</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct bch2_checksum_state {</div><div class='del'>-	union {</div><div class='del'>-		u64 seed;</div><div class='del'>-		struct xxh64_state h64state;</div><div class='del'>-	};</div><div class='del'>-	unsigned int type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_checksum_init(struct bch2_checksum_state *state)</div><div class='del'>-{</div><div class='del'>-	switch (state-&gt;type) {</div><div class='del'>-	case BCH_CSUM_none:</div><div class='del'>-	case BCH_CSUM_crc32c:</div><div class='del'>-	case BCH_CSUM_crc64:</div><div class='del'>-		state-&gt;seed = 0;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_CSUM_crc32c_nonzero:</div><div class='del'>-		state-&gt;seed = U32_MAX;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_CSUM_crc64_nonzero:</div><div class='del'>-		state-&gt;seed = U64_MAX;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_CSUM_xxhash:</div><div class='del'>-		xxh64_reset(&amp;state-&gt;h64state, 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 bch2_checksum_final(const struct bch2_checksum_state *state)</div><div class='del'>-{</div><div class='del'>-	switch (state-&gt;type) {</div><div class='del'>-	case BCH_CSUM_none:</div><div class='del'>-	case BCH_CSUM_crc32c:</div><div class='del'>-	case BCH_CSUM_crc64:</div><div class='del'>-		return state-&gt;seed;</div><div class='del'>-	case BCH_CSUM_crc32c_nonzero:</div><div class='del'>-		return state-&gt;seed ^ U32_MAX;</div><div class='del'>-	case BCH_CSUM_crc64_nonzero:</div><div class='del'>-		return state-&gt;seed ^ U64_MAX;</div><div class='del'>-	case BCH_CSUM_xxhash:</div><div class='del'>-		return xxh64_digest(&amp;state-&gt;h64state);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_checksum_update(struct bch2_checksum_state *state, const void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	switch (state-&gt;type) {</div><div class='del'>-	case BCH_CSUM_none:</div><div class='del'>-		return;</div><div class='del'>-	case BCH_CSUM_crc32c_nonzero:</div><div class='del'>-	case BCH_CSUM_crc32c:</div><div class='del'>-		state-&gt;seed = crc32c(state-&gt;seed, data, len);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_CSUM_crc64_nonzero:</div><div class='del'>-	case BCH_CSUM_crc64:</div><div class='del'>-		state-&gt;seed = crc64_be(state-&gt;seed, data, len);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_CSUM_xxhash:</div><div class='del'>-		xxh64_update(&amp;state-&gt;h64state, data, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int do_encrypt_sg(struct crypto_sync_skcipher *tfm,</div><div class='del'>-				struct nonce nonce,</div><div class='del'>-				struct scatterlist *sg, size_t len)</div><div class='del'>-{</div><div class='del'>-	SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	skcipher_request_set_sync_tfm(req, tfm);</div><div class='del'>-	skcipher_request_set_crypt(req, sg, sg, len, nonce.d);</div><div class='del'>-</div><div class='del'>-	ret = crypto_skcipher_encrypt(req);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_err("got error %i from crypto_skcipher_encrypt()", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int do_encrypt(struct crypto_sync_skcipher *tfm,</div><div class='del'>-			      struct nonce nonce,</div><div class='del'>-			      void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	if (!is_vmalloc_addr(buf)) {</div><div class='del'>-		struct scatterlist sg;</div><div class='del'>-</div><div class='del'>-		sg_init_table(&amp;sg, 1);</div><div class='del'>-		sg_set_page(&amp;sg,</div><div class='del'>-			    is_vmalloc_addr(buf)</div><div class='del'>-			    ? vmalloc_to_page(buf)</div><div class='del'>-			    : virt_to_page(buf),</div><div class='del'>-			    len, offset_in_page(buf));</div><div class='del'>-		return do_encrypt_sg(tfm, nonce, &amp;sg, len);</div><div class='del'>-	} else {</div><div class='del'>-		unsigned pages = buf_pages(buf, len);</div><div class='del'>-		struct scatterlist *sg;</div><div class='del'>-		size_t orig_len = len;</div><div class='del'>-		int ret, i;</div><div class='del'>-</div><div class='del'>-		sg = kmalloc_array(pages, sizeof(*sg), GFP_KERNEL);</div><div class='del'>-		if (!sg)</div><div class='del'>-			return -BCH_ERR_ENOMEM_do_encrypt;</div><div class='del'>-</div><div class='del'>-		sg_init_table(sg, pages);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; pages; i++) {</div><div class='del'>-			unsigned offset = offset_in_page(buf);</div><div class='del'>-			unsigned pg_len = min_t(size_t, len, PAGE_SIZE - offset);</div><div class='del'>-</div><div class='del'>-			sg_set_page(sg + i, vmalloc_to_page(buf), pg_len, offset);</div><div class='del'>-			buf += pg_len;</div><div class='del'>-			len -= pg_len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = do_encrypt_sg(tfm, nonce, sg, orig_len);</div><div class='del'>-		kfree(sg);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_chacha_encrypt_key(struct bch_key *key, struct nonce nonce,</div><div class='del'>-			    void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct crypto_sync_skcipher *chacha20 =</div><div class='del'>-		crypto_alloc_sync_skcipher("chacha20", 0, 0);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(chacha20);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("error requesting chacha20 cipher: %s", bch2_err_str(ret));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = crypto_skcipher_setkey(&amp;chacha20-&gt;base,</div><div class='del'>-				     (void *) key, sizeof(*key));</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("error from crypto_skcipher_setkey(): %s", bch2_err_str(ret));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = do_encrypt(chacha20, nonce, buf, len);</div><div class='del'>-err:</div><div class='del'>-	crypto_free_sync_skcipher(chacha20);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gen_poly_key(struct bch_fs *c, struct shash_desc *desc,</div><div class='del'>-			struct nonce nonce)</div><div class='del'>-{</div><div class='del'>-	u8 key[POLY1305_KEY_SIZE];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	nonce.d[3] ^= BCH_NONCE_POLY;</div><div class='del'>-</div><div class='del'>-	memset(key, 0, sizeof(key));</div><div class='del'>-	ret = do_encrypt(c-&gt;chacha20, nonce, key, sizeof(key));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	desc-&gt;tfm = c-&gt;poly1305;</div><div class='del'>-	crypto_shash_init(desc);</div><div class='del'>-	crypto_shash_update(desc, key, sizeof(key));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_csum bch2_checksum(struct bch_fs *c, unsigned type,</div><div class='del'>-			      struct nonce nonce, const void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_CSUM_none:</div><div class='del'>-	case BCH_CSUM_crc32c_nonzero:</div><div class='del'>-	case BCH_CSUM_crc64_nonzero:</div><div class='del'>-	case BCH_CSUM_crc32c:</div><div class='del'>-	case BCH_CSUM_xxhash:</div><div class='del'>-	case BCH_CSUM_crc64: {</div><div class='del'>-		struct bch2_checksum_state state;</div><div class='del'>-</div><div class='del'>-		state.type = type;</div><div class='del'>-</div><div class='del'>-		bch2_checksum_init(&amp;state);</div><div class='del'>-		bch2_checksum_update(&amp;state, data, len);</div><div class='del'>-</div><div class='del'>-		return (struct bch_csum) { .lo = cpu_to_le64(bch2_checksum_final(&amp;state)) };</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case BCH_CSUM_chacha20_poly1305_80:</div><div class='del'>-	case BCH_CSUM_chacha20_poly1305_128: {</div><div class='del'>-		SHASH_DESC_ON_STACK(desc, c-&gt;poly1305);</div><div class='del'>-		u8 digest[POLY1305_DIGEST_SIZE];</div><div class='del'>-		struct bch_csum ret = { 0 };</div><div class='del'>-</div><div class='del'>-		gen_poly_key(c, desc, nonce);</div><div class='del'>-</div><div class='del'>-		crypto_shash_update(desc, data, len);</div><div class='del'>-		crypto_shash_final(desc, digest);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;ret, digest, bch_crc_bytes[type]);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_encrypt(struct bch_fs *c, unsigned type,</div><div class='del'>-		  struct nonce nonce, void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_csum_type_is_encryption(type))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return do_encrypt(c-&gt;chacha20, nonce, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_csum __bch2_checksum_bio(struct bch_fs *c, unsigned type,</div><div class='del'>-					   struct nonce nonce, struct bio *bio,</div><div class='del'>-					   struct bvec_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bv;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_CSUM_none:</div><div class='del'>-		return (struct bch_csum) { 0 };</div><div class='del'>-	case BCH_CSUM_crc32c_nonzero:</div><div class='del'>-	case BCH_CSUM_crc64_nonzero:</div><div class='del'>-	case BCH_CSUM_crc32c:</div><div class='del'>-	case BCH_CSUM_xxhash:</div><div class='del'>-	case BCH_CSUM_crc64: {</div><div class='del'>-		struct bch2_checksum_state state;</div><div class='del'>-</div><div class='del'>-		state.type = type;</div><div class='del'>-		bch2_checksum_init(&amp;state);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HIGHMEM</div><div class='del'>-		__bio_for_each_segment(bv, bio, *iter, *iter) {</div><div class='del'>-			void *p = kmap_local_page(bv.bv_page) + bv.bv_offset;</div><div class='del'>-</div><div class='del'>-			bch2_checksum_update(&amp;state, p, bv.bv_len);</div><div class='del'>-			kunmap_local(p);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		__bio_for_each_bvec(bv, bio, *iter, *iter)</div><div class='del'>-			bch2_checksum_update(&amp;state, page_address(bv.bv_page) + bv.bv_offset,</div><div class='del'>-				bv.bv_len);</div><div class='del'>-#endif</div><div class='del'>-		return (struct bch_csum) { .lo = cpu_to_le64(bch2_checksum_final(&amp;state)) };</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case BCH_CSUM_chacha20_poly1305_80:</div><div class='del'>-	case BCH_CSUM_chacha20_poly1305_128: {</div><div class='del'>-		SHASH_DESC_ON_STACK(desc, c-&gt;poly1305);</div><div class='del'>-		u8 digest[POLY1305_DIGEST_SIZE];</div><div class='del'>-		struct bch_csum ret = { 0 };</div><div class='del'>-</div><div class='del'>-		gen_poly_key(c, desc, nonce);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HIGHMEM</div><div class='del'>-		__bio_for_each_segment(bv, bio, *iter, *iter) {</div><div class='del'>-			void *p = kmap_local_page(bv.bv_page) + bv.bv_offset;</div><div class='del'>-</div><div class='del'>-			crypto_shash_update(desc, p, bv.bv_len);</div><div class='del'>-			kunmap_local(p);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		__bio_for_each_bvec(bv, bio, *iter, *iter)</div><div class='del'>-			crypto_shash_update(desc,</div><div class='del'>-				page_address(bv.bv_page) + bv.bv_offset,</div><div class='del'>-				bv.bv_len);</div><div class='del'>-#endif</div><div class='del'>-		crypto_shash_final(desc, digest);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;ret, digest, bch_crc_bytes[type]);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_csum bch2_checksum_bio(struct bch_fs *c, unsigned type,</div><div class='del'>-				  struct nonce nonce, struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bvec_iter iter = bio-&gt;bi_iter;</div><div class='del'>-</div><div class='del'>-	return __bch2_checksum_bio(c, type, nonce, bio, &amp;iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_encrypt_bio(struct bch_fs *c, unsigned type,</div><div class='del'>-		     struct nonce nonce, struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bv;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-	struct scatterlist sgl[16], *sg = sgl;</div><div class='del'>-	size_t bytes = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_csum_type_is_encryption(type))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	sg_init_table(sgl, ARRAY_SIZE(sgl));</div><div class='del'>-</div><div class='del'>-	bio_for_each_segment(bv, bio, iter) {</div><div class='del'>-		if (sg == sgl + ARRAY_SIZE(sgl)) {</div><div class='del'>-			sg_mark_end(sg - 1);</div><div class='del'>-</div><div class='del'>-			ret = do_encrypt_sg(c-&gt;chacha20, nonce, sgl, bytes);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			nonce = nonce_add(nonce, bytes);</div><div class='del'>-			bytes = 0;</div><div class='del'>-</div><div class='del'>-			sg_init_table(sgl, ARRAY_SIZE(sgl));</div><div class='del'>-			sg = sgl;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sg_set_page(sg++, bv.bv_page, bv.bv_len, bv.bv_offset);</div><div class='del'>-		bytes += bv.bv_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sg_mark_end(sg - 1);</div><div class='del'>-	return do_encrypt_sg(c-&gt;chacha20, nonce, sgl, bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_csum bch2_checksum_merge(unsigned type, struct bch_csum a,</div><div class='del'>-				    struct bch_csum b, size_t b_len)</div><div class='del'>-{</div><div class='del'>-	struct bch2_checksum_state state;</div><div class='del'>-</div><div class='del'>-	state.type = type;</div><div class='del'>-	bch2_checksum_init(&amp;state);</div><div class='del'>-	state.seed = le64_to_cpu(a.lo);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bch2_checksum_mergeable(type));</div><div class='del'>-</div><div class='del'>-	while (b_len) {</div><div class='del'>-		unsigned page_len = min_t(unsigned, b_len, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-		bch2_checksum_update(&amp;state,</div><div class='del'>-				page_address(ZERO_PAGE(0)), page_len);</div><div class='del'>-		b_len -= page_len;</div><div class='del'>-	}</div><div class='del'>-	a.lo = cpu_to_le64(bch2_checksum_final(&amp;state));</div><div class='del'>-	a.lo ^= b.lo;</div><div class='del'>-	a.hi ^= b.hi;</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_rechecksum_bio(struct bch_fs *c, struct bio *bio,</div><div class='del'>-			struct bversion version,</div><div class='del'>-			struct bch_extent_crc_unpacked crc_old,</div><div class='del'>-			struct bch_extent_crc_unpacked *crc_a,</div><div class='del'>-			struct bch_extent_crc_unpacked *crc_b,</div><div class='del'>-			unsigned len_a, unsigned len_b,</div><div class='del'>-			unsigned new_csum_type)</div><div class='del'>-{</div><div class='del'>-	struct bvec_iter iter = bio-&gt;bi_iter;</div><div class='del'>-	struct nonce nonce = extent_nonce(version, crc_old);</div><div class='del'>-	struct bch_csum merged = { 0 };</div><div class='del'>-	struct crc_split {</div><div class='del'>-		struct bch_extent_crc_unpacked	*crc;</div><div class='del'>-		unsigned			len;</div><div class='del'>-		unsigned			csum_type;</div><div class='del'>-		struct bch_csum			csum;</div><div class='del'>-	} splits[3] = {</div><div class='del'>-		{ crc_a, len_a, new_csum_type, { 0 }},</div><div class='del'>-		{ crc_b, len_b, new_csum_type, { 0 } },</div><div class='del'>-		{ NULL,	 bio_sectors(bio) - len_a - len_b, new_csum_type, { 0 } },</div><div class='del'>-	}, *i;</div><div class='del'>-	bool mergeable = crc_old.csum_type == new_csum_type &amp;&amp;</div><div class='del'>-		bch2_checksum_mergeable(new_csum_type);</div><div class='del'>-	unsigned crc_nonce = crc_old.nonce;</div><div class='del'>-</div><div class='del'>-	BUG_ON(len_a + len_b &gt; bio_sectors(bio));</div><div class='del'>-	BUG_ON(crc_old.uncompressed_size != bio_sectors(bio));</div><div class='del'>-	BUG_ON(crc_is_compressed(crc_old));</div><div class='del'>-	BUG_ON(bch2_csum_type_is_encryption(crc_old.csum_type) !=</div><div class='del'>-	       bch2_csum_type_is_encryption(new_csum_type));</div><div class='del'>-</div><div class='del'>-	for (i = splits; i &lt; splits + ARRAY_SIZE(splits); i++) {</div><div class='del'>-		iter.bi_size = i-&gt;len &lt;&lt; 9;</div><div class='del'>-		if (mergeable || i-&gt;crc)</div><div class='del'>-			i-&gt;csum = __bch2_checksum_bio(c, i-&gt;csum_type,</div><div class='del'>-						      nonce, bio, &amp;iter);</div><div class='del'>-		else</div><div class='del'>-			bio_advance_iter(bio, &amp;iter, i-&gt;len &lt;&lt; 9);</div><div class='del'>-		nonce = nonce_add(nonce, i-&gt;len &lt;&lt; 9);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mergeable)</div><div class='del'>-		for (i = splits; i &lt; splits + ARRAY_SIZE(splits); i++)</div><div class='del'>-			merged = bch2_checksum_merge(new_csum_type, merged,</div><div class='del'>-						     i-&gt;csum, i-&gt;len &lt;&lt; 9);</div><div class='del'>-	else</div><div class='del'>-		merged = bch2_checksum_bio(c, crc_old.csum_type,</div><div class='del'>-				extent_nonce(version, crc_old), bio);</div><div class='del'>-</div><div class='del'>-	if (bch2_crc_cmp(merged, crc_old.csum) &amp;&amp; !c-&gt;opts.no_data_io) {</div><div class='del'>-		bch_err(c, "checksum error in %s() (memory corruption or bug?)\n"</div><div class='del'>-			"expected %0llx:%0llx got %0llx:%0llx (old type %s new type %s)",</div><div class='del'>-			__func__,</div><div class='del'>-			crc_old.csum.hi,</div><div class='del'>-			crc_old.csum.lo,</div><div class='del'>-			merged.hi,</div><div class='del'>-			merged.lo,</div><div class='del'>-			bch2_csum_types[crc_old.csum_type],</div><div class='del'>-			bch2_csum_types[new_csum_type]);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = splits; i &lt; splits + ARRAY_SIZE(splits); i++) {</div><div class='del'>-		if (i-&gt;crc)</div><div class='del'>-			*i-&gt;crc = (struct bch_extent_crc_unpacked) {</div><div class='del'>-				.csum_type		= i-&gt;csum_type,</div><div class='del'>-				.compression_type	= crc_old.compression_type,</div><div class='del'>-				.compressed_size	= i-&gt;len,</div><div class='del'>-				.uncompressed_size	= i-&gt;len,</div><div class='del'>-				.offset			= 0,</div><div class='del'>-				.live_size		= i-&gt;len,</div><div class='del'>-				.nonce			= crc_nonce,</div><div class='del'>-				.csum			= i-&gt;csum,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		if (bch2_csum_type_is_encryption(new_csum_type))</div><div class='del'>-			crc_nonce += i-&gt;len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_crypt: */</div><div class='del'>-</div><div class='del'>-static int bch2_sb_crypt_validate(struct bch_sb *sb,</div><div class='del'>-				  struct bch_sb_field *f,</div><div class='del'>-				  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_crypt *crypt = field_to_type(f, crypt);</div><div class='del'>-</div><div class='del'>-	if (vstruct_bytes(&amp;crypt-&gt;field) &lt; sizeof(*crypt)) {</div><div class='del'>-		prt_printf(err, "wrong size (got %zu should be %zu)",</div><div class='del'>-		       vstruct_bytes(&amp;crypt-&gt;field), sizeof(*crypt));</div><div class='del'>-		return -BCH_ERR_invalid_sb_crypt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (BCH_CRYPT_KDF_TYPE(crypt)) {</div><div class='del'>-		prt_printf(err, "bad kdf type %llu", BCH_CRYPT_KDF_TYPE(crypt));</div><div class='del'>-		return -BCH_ERR_invalid_sb_crypt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_crypt_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				  struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_crypt *crypt = field_to_type(f, crypt);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "KFD:               %llu", BCH_CRYPT_KDF_TYPE(crypt));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "scrypt n:          %llu", BCH_KDF_SCRYPT_N(crypt));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "scrypt r:          %llu", BCH_KDF_SCRYPT_R(crypt));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "scrypt p:          %llu", BCH_KDF_SCRYPT_P(crypt));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_crypt = {</div><div class='del'>-	.validate	= bch2_sb_crypt_validate,</div><div class='del'>-	.to_text	= bch2_sb_crypt_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-static int __bch2_request_key(char *key_description, struct bch_key *key)</div><div class='del'>-{</div><div class='del'>-	struct key *keyring_key;</div><div class='del'>-	const struct user_key_payload *ukp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	keyring_key = request_key(&amp;key_type_user, key_description, NULL);</div><div class='del'>-	if (IS_ERR(keyring_key))</div><div class='del'>-		return PTR_ERR(keyring_key);</div><div class='del'>-</div><div class='del'>-	down_read(&amp;keyring_key-&gt;sem);</div><div class='del'>-	ukp = dereference_key_locked(keyring_key);</div><div class='del'>-	if (ukp-&gt;datalen == sizeof(*key)) {</div><div class='del'>-		memcpy(key, ukp-&gt;data, ukp-&gt;datalen);</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	up_read(&amp;keyring_key-&gt;sem);</div><div class='del'>-	key_put(keyring_key);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#include &lt;keyutils.h&gt;</div><div class='del'>-</div><div class='del'>-static int __bch2_request_key(char *key_description, struct bch_key *key)</div><div class='del'>-{</div><div class='del'>-	key_serial_t key_id;</div><div class='del'>-</div><div class='del'>-	key_id = request_key("user", key_description, NULL,</div><div class='del'>-			     KEY_SPEC_SESSION_KEYRING);</div><div class='del'>-	if (key_id &gt;= 0)</div><div class='del'>-		goto got_key;</div><div class='del'>-</div><div class='del'>-	key_id = request_key("user", key_description, NULL,</div><div class='del'>-			     KEY_SPEC_USER_KEYRING);</div><div class='del'>-	if (key_id &gt;= 0)</div><div class='del'>-		goto got_key;</div><div class='del'>-</div><div class='del'>-	key_id = request_key("user", key_description, NULL,</div><div class='del'>-			     KEY_SPEC_USER_SESSION_KEYRING);</div><div class='del'>-	if (key_id &gt;= 0)</div><div class='del'>-		goto got_key;</div><div class='del'>-</div><div class='del'>-	return -errno;</div><div class='del'>-got_key:</div><div class='del'>-</div><div class='del'>-	if (keyctl_read(key_id, (void *) key, sizeof(*key)) != sizeof(*key))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include "../crypto.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int bch2_request_key(struct bch_sb *sb, struct bch_key *key)</div><div class='del'>-{</div><div class='del'>-	struct printbuf key_description = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;key_description, "bcachefs:");</div><div class='del'>-	pr_uuid(&amp;key_description, sb-&gt;user_uuid.b);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_request_key(key_description.buf, key);</div><div class='del'>-	printbuf_exit(&amp;key_description);</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-	if (ret) {</div><div class='del'>-		char *passphrase = read_passphrase("Enter passphrase: ");</div><div class='del'>-		struct bch_encrypted_key sb_key;</div><div class='del'>-</div><div class='del'>-		bch2_passphrase_check(sb, passphrase,</div><div class='del'>-				      key, &amp;sb_key);</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* stash with memfd, pass memfd fd to mount */</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-int bch2_revoke_key(struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	key_serial_t key_id;</div><div class='del'>-	struct printbuf key_description = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;key_description, "bcachefs:");</div><div class='del'>-	pr_uuid(&amp;key_description, sb-&gt;user_uuid.b);</div><div class='del'>-</div><div class='del'>-	key_id = request_key("user", key_description.buf, NULL, KEY_SPEC_USER_KEYRING);</div><div class='del'>-	printbuf_exit(&amp;key_description);</div><div class='del'>-	if (key_id &lt; 0)</div><div class='del'>-		return errno;</div><div class='del'>-</div><div class='del'>-	keyctl_revoke(key_id);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int bch2_decrypt_sb_key(struct bch_fs *c,</div><div class='del'>-			struct bch_sb_field_crypt *crypt,</div><div class='del'>-			struct bch_key *key)</div><div class='del'>-{</div><div class='del'>-	struct bch_encrypted_key sb_key = crypt-&gt;key;</div><div class='del'>-	struct bch_key user_key;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* is key encrypted? */</div><div class='del'>-	if (!bch2_key_is_encrypted(&amp;sb_key))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_request_key(c-&gt;disk_sb.sb, &amp;user_key);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error requesting encryption key: %s", bch2_err_str(ret));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* decrypt real key: */</div><div class='del'>-	ret = bch2_chacha_encrypt_key(&amp;user_key, bch2_sb_key_nonce(c),</div><div class='del'>-				      &amp;sb_key, sizeof(sb_key));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (bch2_key_is_encrypted(&amp;sb_key)) {</div><div class='del'>-		bch_err(c, "incorrect encryption key");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	*key = sb_key.key;</div><div class='del'>-err:</div><div class='del'>-	memzero_explicit(&amp;sb_key, sizeof(sb_key));</div><div class='del'>-	memzero_explicit(&amp;user_key, sizeof(user_key));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_alloc_ciphers(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;chacha20)</div><div class='del'>-		c-&gt;chacha20 = crypto_alloc_sync_skcipher("chacha20", 0, 0);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(c-&gt;chacha20);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error requesting chacha20 module: %s", bch2_err_str(ret));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;poly1305)</div><div class='del'>-		c-&gt;poly1305 = crypto_alloc_shash("poly1305", 0, 0);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(c-&gt;poly1305);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error requesting poly1305 module: %s", bch2_err_str(ret));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_disable_encryption(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_crypt *crypt;</div><div class='del'>-	struct bch_key key;</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	crypt = bch2_sb_field_get(c-&gt;disk_sb.sb, crypt);</div><div class='del'>-	if (!crypt)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* is key encrypted? */</div><div class='del'>-	ret = 0;</div><div class='del'>-	if (bch2_key_is_encrypted(&amp;crypt-&gt;key))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_decrypt_sb_key(c, crypt, &amp;key);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	crypt-&gt;key.magic	= cpu_to_le64(BCH_KEY_MAGIC);</div><div class='del'>-	crypt-&gt;key.key		= key;</div><div class='del'>-</div><div class='del'>-	SET_BCH_SB_ENCRYPTION_TYPE(c-&gt;disk_sb.sb, 0);</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_enable_encryption(struct bch_fs *c, bool keyed)</div><div class='del'>-{</div><div class='del'>-	struct bch_encrypted_key key;</div><div class='del'>-	struct bch_key user_key;</div><div class='del'>-	struct bch_sb_field_crypt *crypt;</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	/* Do we already have an encryption key? */</div><div class='del'>-	if (bch2_sb_field_get(c-&gt;disk_sb.sb, crypt))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_alloc_ciphers(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	key.magic = cpu_to_le64(BCH_KEY_MAGIC);</div><div class='del'>-	get_random_bytes(&amp;key.key, sizeof(key.key));</div><div class='del'>-</div><div class='del'>-	if (keyed) {</div><div class='del'>-		ret = bch2_request_key(c-&gt;disk_sb.sb, &amp;user_key);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bch_err(c, "error requesting encryption key: %s", bch2_err_str(ret));</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_chacha_encrypt_key(&amp;user_key, bch2_sb_key_nonce(c),</div><div class='del'>-					      &amp;key, sizeof(key));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = crypto_skcipher_setkey(&amp;c-&gt;chacha20-&gt;base,</div><div class='del'>-			(void *) &amp;key.key, sizeof(key.key));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	crypt = bch2_sb_field_resize(&amp;c-&gt;disk_sb, crypt,</div><div class='del'>-				     sizeof(*crypt) / sizeof(u64));</div><div class='del'>-	if (!crypt) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_sb_crypt;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	crypt-&gt;key = key;</div><div class='del'>-</div><div class='del'>-	/* write superblock */</div><div class='del'>-	SET_BCH_SB_ENCRYPTION_TYPE(c-&gt;disk_sb.sb, 1);</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-err:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	memzero_explicit(&amp;user_key, sizeof(user_key));</div><div class='del'>-	memzero_explicit(&amp;key, sizeof(key));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_encryption_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR_OR_NULL(c-&gt;poly1305))</div><div class='del'>-		crypto_free_shash(c-&gt;poly1305);</div><div class='del'>-	if (!IS_ERR_OR_NULL(c-&gt;chacha20))</div><div class='del'>-		crypto_free_sync_skcipher(c-&gt;chacha20);</div><div class='del'>-	if (!IS_ERR_OR_NULL(c-&gt;sha256))</div><div class='del'>-		crypto_free_shash(c-&gt;sha256);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_encryption_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_crypt *crypt;</div><div class='del'>-	struct bch_key key;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	c-&gt;sha256 = crypto_alloc_shash("sha256", 0, 0);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(c-&gt;sha256);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error requesting sha256 module: %s", bch2_err_str(ret));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	crypt = bch2_sb_field_get(c-&gt;disk_sb.sb, crypt);</div><div class='del'>-	if (!crypt)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_alloc_ciphers(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_decrypt_sb_key(c, crypt, &amp;key);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = crypto_skcipher_setkey(&amp;c-&gt;chacha20-&gt;base,</div><div class='del'>-			(void *) &amp;key.key, sizeof(key.key));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-out:</div><div class='del'>-	memzero_explicit(&amp;key, sizeof(key));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/checksum.h b/fs/bcachefs/checksum.h<br/>deleted file mode 100644<br/>index 1b8c2c1016dc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/checksum.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/checksum.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,236 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_CHECKSUM_H</div><div class='del'>-#define _BCACHEFS_CHECKSUM_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "extents_types.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/crc64.h&gt;</div><div class='del'>-#include &lt;crypto/chacha.h&gt;</div><div class='del'>-</div><div class='del'>-static inline bool bch2_checksum_mergeable(unsigned type)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_CSUM_none:</div><div class='del'>-	case BCH_CSUM_crc32c:</div><div class='del'>-	case BCH_CSUM_crc64:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_csum bch2_checksum_merge(unsigned, struct bch_csum,</div><div class='del'>-				    struct bch_csum, size_t);</div><div class='del'>-</div><div class='del'>-#define BCH_NONCE_EXTENT	cpu_to_le32(1 &lt;&lt; 28)</div><div class='del'>-#define BCH_NONCE_BTREE		cpu_to_le32(2 &lt;&lt; 28)</div><div class='del'>-#define BCH_NONCE_JOURNAL	cpu_to_le32(3 &lt;&lt; 28)</div><div class='del'>-#define BCH_NONCE_PRIO		cpu_to_le32(4 &lt;&lt; 28)</div><div class='del'>-#define BCH_NONCE_POLY		cpu_to_le32(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-struct bch_csum bch2_checksum(struct bch_fs *, unsigned, struct nonce,</div><div class='del'>-			     const void *, size_t);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is used for various on disk data structures - bch_sb, prio_set, bset,</div><div class='del'>- * jset: The checksum is _always_ the first field of these structs</div><div class='del'>- */</div><div class='del'>-#define csum_vstruct(_c, _type, _nonce, _i)				\</div><div class='del'>-({									\</div><div class='del'>-	const void *_start = ((const void *) (_i)) + sizeof((_i)-&gt;csum);\</div><div class='del'>-									\</div><div class='del'>-	bch2_checksum(_c, _type, _nonce, _start, vstruct_end(_i) - _start);\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline void bch2_csum_to_text(struct printbuf *out,</div><div class='del'>-				     enum bch_csum_type type,</div><div class='del'>-				     struct bch_csum csum)</div><div class='del'>-{</div><div class='del'>-	const u8 *p = (u8 *) &amp;csum;</div><div class='del'>-	unsigned bytes = type &lt; BCH_CSUM_NR ? bch_crc_bytes[type] : 16;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; bytes; i++)</div><div class='del'>-		prt_hex_byte(out, p[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_csum_err_msg(struct printbuf *out,</div><div class='del'>-				     enum bch_csum_type type,</div><div class='del'>-				     struct bch_csum expected,</div><div class='del'>-				     struct bch_csum got)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "checksum error: got ");</div><div class='del'>-	bch2_csum_to_text(out, type, got);</div><div class='del'>-	prt_str(out, " should be ");</div><div class='del'>-	bch2_csum_to_text(out, type, expected);</div><div class='del'>-	prt_printf(out, " type %s", bch2_csum_types[type]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_chacha_encrypt_key(struct bch_key *, struct nonce, void *, size_t);</div><div class='del'>-int bch2_request_key(struct bch_sb *, struct bch_key *);</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-int bch2_revoke_key(struct bch_sb *);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int bch2_encrypt(struct bch_fs *, unsigned, struct nonce,</div><div class='del'>-		 void *data, size_t);</div><div class='del'>-</div><div class='del'>-struct bch_csum bch2_checksum_bio(struct bch_fs *, unsigned,</div><div class='del'>-				  struct nonce, struct bio *);</div><div class='del'>-</div><div class='del'>-int bch2_rechecksum_bio(struct bch_fs *, struct bio *, struct bversion,</div><div class='del'>-			struct bch_extent_crc_unpacked,</div><div class='del'>-			struct bch_extent_crc_unpacked *,</div><div class='del'>-			struct bch_extent_crc_unpacked *,</div><div class='del'>-			unsigned, unsigned, unsigned);</div><div class='del'>-</div><div class='del'>-int __bch2_encrypt_bio(struct bch_fs *, unsigned,</div><div class='del'>-		       struct nonce, struct bio *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_encrypt_bio(struct bch_fs *c, unsigned type,</div><div class='del'>-				   struct nonce nonce, struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	return bch2_csum_type_is_encryption(type)</div><div class='del'>-		? __bch2_encrypt_bio(c, type, nonce, bio)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_crypt;</div><div class='del'>-</div><div class='del'>-int bch2_decrypt_sb_key(struct bch_fs *, struct bch_sb_field_crypt *,</div><div class='del'>-			struct bch_key *);</div><div class='del'>-</div><div class='del'>-int bch2_disable_encryption(struct bch_fs *);</div><div class='del'>-int bch2_enable_encryption(struct bch_fs *, bool);</div><div class='del'>-</div><div class='del'>-void bch2_fs_encryption_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_encryption_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline enum bch_csum_type bch2_csum_opt_to_type(enum bch_csum_opts type,</div><div class='del'>-						       bool data)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_CSUM_OPT_none:</div><div class='del'>-		return BCH_CSUM_none;</div><div class='del'>-	case BCH_CSUM_OPT_crc32c:</div><div class='del'>-		return data ? BCH_CSUM_crc32c : BCH_CSUM_crc32c_nonzero;</div><div class='del'>-	case BCH_CSUM_OPT_crc64:</div><div class='del'>-		return data ? BCH_CSUM_crc64 : BCH_CSUM_crc64_nonzero;</div><div class='del'>-	case BCH_CSUM_OPT_xxhash:</div><div class='del'>-		return BCH_CSUM_xxhash;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_csum_type bch2_data_checksum_type(struct bch_fs *c,</div><div class='del'>-							 struct bch_io_opts opts)</div><div class='del'>-{</div><div class='del'>-	if (opts.nocow)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;sb.encryption_type)</div><div class='del'>-		return c-&gt;opts.wide_macs</div><div class='del'>-			? BCH_CSUM_chacha20_poly1305_128</div><div class='del'>-			: BCH_CSUM_chacha20_poly1305_80;</div><div class='del'>-</div><div class='del'>-	return bch2_csum_opt_to_type(opts.data_checksum, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_csum_type bch2_meta_checksum_type(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;sb.encryption_type)</div><div class='del'>-		return BCH_CSUM_chacha20_poly1305_128;</div><div class='del'>-</div><div class='del'>-	return bch2_csum_opt_to_type(c-&gt;opts.metadata_checksum, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_checksum_type_valid(const struct bch_fs *c,</div><div class='del'>-					   unsigned type)</div><div class='del'>-{</div><div class='del'>-	if (type &gt;= BCH_CSUM_NR)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (bch2_csum_type_is_encryption(type) &amp;&amp; !c-&gt;chacha20)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns true if not equal */</div><div class='del'>-static inline bool bch2_crc_cmp(struct bch_csum l, struct bch_csum r)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: need some way of preventing the compiler from optimizing this</div><div class='del'>-	 * into a form that isn't constant time..</div><div class='del'>-	 */</div><div class='del'>-	return ((l.lo ^ r.lo) | (l.hi ^ r.hi)) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for skipping ahead and encrypting/decrypting at an offset: */</div><div class='del'>-static inline struct nonce nonce_add(struct nonce nonce, unsigned offset)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(offset &amp; (CHACHA_BLOCK_SIZE - 1));</div><div class='del'>-</div><div class='del'>-	le32_add_cpu(&amp;nonce.d[0], offset / CHACHA_BLOCK_SIZE);</div><div class='del'>-	return nonce;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct nonce null_nonce(void)</div><div class='del'>-{</div><div class='del'>-	struct nonce ret;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ret, 0, sizeof(ret));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct nonce extent_nonce(struct bversion version,</div><div class='del'>-					struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	unsigned compression_type = crc_is_compressed(crc)</div><div class='del'>-		? crc.compression_type</div><div class='del'>-		: 0;</div><div class='del'>-	unsigned size = compression_type ? crc.uncompressed_size : 0;</div><div class='del'>-	struct nonce nonce = (struct nonce) {{</div><div class='del'>-		[0] = cpu_to_le32(size &lt;&lt; 22),</div><div class='del'>-		[1] = cpu_to_le32(version.lo),</div><div class='del'>-		[2] = cpu_to_le32(version.lo &gt;&gt; 32),</div><div class='del'>-		[3] = cpu_to_le32(version.hi|</div><div class='del'>-				  (compression_type &lt;&lt; 24))^BCH_NONCE_EXTENT,</div><div class='del'>-	}};</div><div class='del'>-</div><div class='del'>-	return nonce_add(nonce, crc.nonce &lt;&lt; 9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_key_is_encrypted(struct bch_encrypted_key *key)</div><div class='del'>-{</div><div class='del'>-	return le64_to_cpu(key-&gt;magic) != BCH_KEY_MAGIC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct nonce __bch2_sb_key_nonce(struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	__le64 magic = __bch2_sb_magic(sb);</div><div class='del'>-</div><div class='del'>-	return (struct nonce) {{</div><div class='del'>-		[0] = 0,</div><div class='del'>-		[1] = 0,</div><div class='del'>-		[2] = ((__le32 *) &amp;magic)[0],</div><div class='del'>-		[3] = ((__le32 *) &amp;magic)[1],</div><div class='del'>-	}};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct nonce bch2_sb_key_nonce(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	__le64 magic = bch2_sb_magic(c);</div><div class='del'>-</div><div class='del'>-	return (struct nonce) {{</div><div class='del'>-		[0] = 0,</div><div class='del'>-		[1] = 0,</div><div class='del'>-		[2] = ((__le32 *) &amp;magic)[0],</div><div class='del'>-		[3] = ((__le32 *) &amp;magic)[1],</div><div class='del'>-	}};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_CHECKSUM_H */</div><div class='head'>diff --git a/fs/bcachefs/clock.c b/fs/bcachefs/clock.c<br/>deleted file mode 100644<br/>index 363644451106..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/clock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/clock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,193 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='del'>-</div><div class='del'>-static inline long io_timer_cmp(io_timer_heap *h,</div><div class='del'>-				struct io_timer *l,</div><div class='del'>-				struct io_timer *r)</div><div class='del'>-{</div><div class='del'>-	return l-&gt;expire - r-&gt;expire;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_timer_add(struct io_clock *clock, struct io_timer *timer)</div><div class='del'>-{</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;clock-&gt;timer_lock);</div><div class='del'>-</div><div class='del'>-	if (time_after_eq((unsigned long) atomic64_read(&amp;clock-&gt;now),</div><div class='del'>-			  timer-&gt;expire)) {</div><div class='del'>-		spin_unlock(&amp;clock-&gt;timer_lock);</div><div class='del'>-		timer-&gt;fn(timer);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; clock-&gt;timers.used; i++)</div><div class='del'>-		if (clock-&gt;timers.data[i] == timer)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!heap_add(&amp;clock-&gt;timers, timer, io_timer_cmp, NULL));</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;clock-&gt;timer_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_timer_del(struct io_clock *clock, struct io_timer *timer)</div><div class='del'>-{</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;clock-&gt;timer_lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; clock-&gt;timers.used; i++)</div><div class='del'>-		if (clock-&gt;timers.data[i] == timer) {</div><div class='del'>-			heap_del(&amp;clock-&gt;timers, i, io_timer_cmp, NULL);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;clock-&gt;timer_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct io_clock_wait {</div><div class='del'>-	struct io_timer		io_timer;</div><div class='del'>-	struct timer_list	cpu_timer;</div><div class='del'>-	struct task_struct	*task;</div><div class='del'>-	int			expired;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void io_clock_wait_fn(struct io_timer *timer)</div><div class='del'>-{</div><div class='del'>-	struct io_clock_wait *wait = container_of(timer,</div><div class='del'>-				struct io_clock_wait, io_timer);</div><div class='del'>-</div><div class='del'>-	wait-&gt;expired = 1;</div><div class='del'>-	wake_up_process(wait-&gt;task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void io_clock_cpu_timeout(struct timer_list *timer)</div><div class='del'>-{</div><div class='del'>-	struct io_clock_wait *wait = container_of(timer,</div><div class='del'>-				struct io_clock_wait, cpu_timer);</div><div class='del'>-</div><div class='del'>-	wait-&gt;expired = 1;</div><div class='del'>-	wake_up_process(wait-&gt;task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_clock_schedule_timeout(struct io_clock *clock, unsigned long until)</div><div class='del'>-{</div><div class='del'>-	struct io_clock_wait wait;</div><div class='del'>-</div><div class='del'>-	/* XXX: calculate sleep time rigorously */</div><div class='del'>-	wait.io_timer.expire	= until;</div><div class='del'>-	wait.io_timer.fn	= io_clock_wait_fn;</div><div class='del'>-	wait.task		= current;</div><div class='del'>-	wait.expired		= 0;</div><div class='del'>-	bch2_io_timer_add(clock, &amp;wait.io_timer);</div><div class='del'>-</div><div class='del'>-	schedule();</div><div class='del'>-</div><div class='del'>-	bch2_io_timer_del(clock, &amp;wait.io_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_kthread_io_clock_wait(struct io_clock *clock,</div><div class='del'>-				unsigned long io_until,</div><div class='del'>-				unsigned long cpu_timeout)</div><div class='del'>-{</div><div class='del'>-	bool kthread = (current-&gt;flags &amp; PF_KTHREAD) != 0;</div><div class='del'>-	struct io_clock_wait wait;</div><div class='del'>-</div><div class='del'>-	wait.io_timer.expire	= io_until;</div><div class='del'>-	wait.io_timer.fn	= io_clock_wait_fn;</div><div class='del'>-	wait.task		= current;</div><div class='del'>-	wait.expired		= 0;</div><div class='del'>-	bch2_io_timer_add(clock, &amp;wait.io_timer);</div><div class='del'>-</div><div class='del'>-	timer_setup_on_stack(&amp;wait.cpu_timer, io_clock_cpu_timeout, 0);</div><div class='del'>-</div><div class='del'>-	if (cpu_timeout != MAX_SCHEDULE_TIMEOUT)</div><div class='del'>-		mod_timer(&amp;wait.cpu_timer, cpu_timeout + jiffies);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-		if (kthread &amp;&amp; kthread_should_stop())</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (wait.expired)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		schedule();</div><div class='del'>-		try_to_freeze();</div><div class='del'>-	} while (0);</div><div class='del'>-</div><div class='del'>-	__set_current_state(TASK_RUNNING);</div><div class='del'>-	del_timer_sync(&amp;wait.cpu_timer);</div><div class='del'>-	destroy_timer_on_stack(&amp;wait.cpu_timer);</div><div class='del'>-	bch2_io_timer_del(clock, &amp;wait.io_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct io_timer *get_expired_timer(struct io_clock *clock,</div><div class='del'>-					  unsigned long now)</div><div class='del'>-{</div><div class='del'>-	struct io_timer *ret = NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;clock-&gt;timer_lock);</div><div class='del'>-</div><div class='del'>-	if (clock-&gt;timers.used &amp;&amp;</div><div class='del'>-	    time_after_eq(now, clock-&gt;timers.data[0]-&gt;expire))</div><div class='del'>-		heap_pop(&amp;clock-&gt;timers, ret, io_timer_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;clock-&gt;timer_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_increment_clock(struct io_clock *clock, unsigned sectors)</div><div class='del'>-{</div><div class='del'>-	struct io_timer *timer;</div><div class='del'>-	unsigned long now = atomic64_add_return(sectors, &amp;clock-&gt;now);</div><div class='del'>-</div><div class='del'>-	while ((timer = get_expired_timer(clock, now)))</div><div class='del'>-		timer-&gt;fn(timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_timers_to_text(struct printbuf *out, struct io_clock *clock)</div><div class='del'>-{</div><div class='del'>-	unsigned long now;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-	spin_lock(&amp;clock-&gt;timer_lock);</div><div class='del'>-	now = atomic64_read(&amp;clock-&gt;now);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; clock-&gt;timers.used; i++)</div><div class='del'>-		prt_printf(out, "%ps:\t%li\n",</div><div class='del'>-		       clock-&gt;timers.data[i]-&gt;fn,</div><div class='del'>-		       clock-&gt;timers.data[i]-&gt;expire - now);</div><div class='del'>-	spin_unlock(&amp;clock-&gt;timer_lock);</div><div class='del'>-	--out-&gt;atomic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_clock_exit(struct io_clock *clock)</div><div class='del'>-{</div><div class='del'>-	free_heap(&amp;clock-&gt;timers);</div><div class='del'>-	free_percpu(clock-&gt;pcpu_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_io_clock_init(struct io_clock *clock)</div><div class='del'>-{</div><div class='del'>-	atomic64_set(&amp;clock-&gt;now, 0);</div><div class='del'>-	spin_lock_init(&amp;clock-&gt;timer_lock);</div><div class='del'>-</div><div class='del'>-	clock-&gt;max_slop = IO_CLOCK_PCPU_SECTORS * num_possible_cpus();</div><div class='del'>-</div><div class='del'>-	clock-&gt;pcpu_buf = alloc_percpu(*clock-&gt;pcpu_buf);</div><div class='del'>-	if (!clock-&gt;pcpu_buf)</div><div class='del'>-		return -BCH_ERR_ENOMEM_io_clock_init;</div><div class='del'>-</div><div class='del'>-	if (!init_heap(&amp;clock-&gt;timers, NR_IO_TIMERS, GFP_KERNEL))</div><div class='del'>-		return -BCH_ERR_ENOMEM_io_clock_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/clock.h b/fs/bcachefs/clock.h<br/>deleted file mode 100644<br/>index 70a0f7436c84..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/clock.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_CLOCK_H</div><div class='del'>-#define _BCACHEFS_CLOCK_H</div><div class='del'>-</div><div class='del'>-void bch2_io_timer_add(struct io_clock *, struct io_timer *);</div><div class='del'>-void bch2_io_timer_del(struct io_clock *, struct io_timer *);</div><div class='del'>-void bch2_kthread_io_clock_wait(struct io_clock *, unsigned long,</div><div class='del'>-				unsigned long);</div><div class='del'>-</div><div class='del'>-void __bch2_increment_clock(struct io_clock *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void bch2_increment_clock(struct bch_fs *c, unsigned sectors,</div><div class='del'>-					int rw)</div><div class='del'>-{</div><div class='del'>-	struct io_clock *clock = &amp;c-&gt;io_clock[rw];</div><div class='del'>-</div><div class='del'>-	if (unlikely(this_cpu_add_return(*clock-&gt;pcpu_buf, sectors) &gt;=</div><div class='del'>-		   IO_CLOCK_PCPU_SECTORS))</div><div class='del'>-		__bch2_increment_clock(clock, this_cpu_xchg(*clock-&gt;pcpu_buf, 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_clock_schedule_timeout(struct io_clock *, unsigned long);</div><div class='del'>-</div><div class='del'>-#define bch2_kthread_wait_event_ioclock_timeout(condition, clock, timeout)\</div><div class='del'>-({									\</div><div class='del'>-	long __ret = timeout;						\</div><div class='del'>-	might_sleep();							\</div><div class='del'>-	if (!___wait_cond_timeout(condition))				\</div><div class='del'>-		__ret = __wait_event_timeout(wq, condition, timeout);	\</div><div class='del'>-	__ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-void bch2_io_timers_to_text(struct printbuf *, struct io_clock *);</div><div class='del'>-</div><div class='del'>-void bch2_io_clock_exit(struct io_clock *);</div><div class='del'>-int bch2_io_clock_init(struct io_clock *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_CLOCK_H */</div><div class='head'>diff --git a/fs/bcachefs/clock_types.h b/fs/bcachefs/clock_types.h<br/>deleted file mode 100644<br/>index 5fae0012d808..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/clock_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/clock_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_CLOCK_TYPES_H</div><div class='del'>-#define _BCACHEFS_CLOCK_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#define NR_IO_TIMERS		(BCH_SB_MEMBERS_MAX * 3)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clocks/timers in units of sectors of IO:</div><div class='del'>- *</div><div class='del'>- * Note - they use percpu batching, so they're only approximate.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct io_timer;</div><div class='del'>-typedef void (*io_timer_fn)(struct io_timer *);</div><div class='del'>-</div><div class='del'>-struct io_timer {</div><div class='del'>-	io_timer_fn		fn;</div><div class='del'>-	unsigned long		expire;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Amount to buffer up on a percpu counter */</div><div class='del'>-#define IO_CLOCK_PCPU_SECTORS	128</div><div class='del'>-</div><div class='del'>-typedef HEAP(struct io_timer *)	io_timer_heap;</div><div class='del'>-</div><div class='del'>-struct io_clock {</div><div class='del'>-	atomic64_t		now;</div><div class='del'>-	u16 __percpu		*pcpu_buf;</div><div class='del'>-	unsigned		max_slop;</div><div class='del'>-</div><div class='del'>-	spinlock_t		timer_lock;</div><div class='del'>-	io_timer_heap		timers;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_CLOCK_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c<br/>deleted file mode 100644<br/>index 33df8cf86bd8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/compress.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/compress.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,728 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/lz4.h&gt;</div><div class='del'>-#include &lt;linux/zlib.h&gt;</div><div class='del'>-#include &lt;linux/zstd.h&gt;</div><div class='del'>-</div><div class='del'>-/* Bounce buffer: */</div><div class='del'>-struct bbuf {</div><div class='del'>-	void		*b;</div><div class='del'>-	enum {</div><div class='del'>-		BB_NONE,</div><div class='del'>-		BB_VMAP,</div><div class='del'>-		BB_KMALLOC,</div><div class='del'>-		BB_MEMPOOL,</div><div class='del'>-	}		type;</div><div class='del'>-	int		rw;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bbuf __bounce_alloc(struct bch_fs *c, unsigned size, int rw)</div><div class='del'>-{</div><div class='del'>-	void *b;</div><div class='del'>-</div><div class='del'>-	BUG_ON(size &gt; c-&gt;opts.encoded_extent_max);</div><div class='del'>-</div><div class='del'>-	b = kmalloc(size, GFP_NOFS|__GFP_NOWARN);</div><div class='del'>-	if (b)</div><div class='del'>-		return (struct bbuf) { .b = b, .type = BB_KMALLOC, .rw = rw };</div><div class='del'>-</div><div class='del'>-	b = mempool_alloc(&amp;c-&gt;compression_bounce[rw], GFP_NOFS);</div><div class='del'>-	if (b)</div><div class='del'>-		return (struct bbuf) { .b = b, .type = BB_MEMPOOL, .rw = rw };</div><div class='del'>-</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bio_phys_contig(struct bio *bio, struct bvec_iter start)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bv;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-	void *expected_start = NULL;</div><div class='del'>-</div><div class='del'>-	__bio_for_each_bvec(bv, bio, iter, start) {</div><div class='del'>-		if (expected_start &amp;&amp;</div><div class='del'>-		    expected_start != page_address(bv.bv_page) + bv.bv_offset)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		expected_start = page_address(bv.bv_page) +</div><div class='del'>-			bv.bv_offset + bv.bv_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bbuf __bio_map_or_bounce(struct bch_fs *c, struct bio *bio,</div><div class='del'>-				       struct bvec_iter start, int rw)</div><div class='del'>-{</div><div class='del'>-	struct bbuf ret;</div><div class='del'>-	struct bio_vec bv;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-	unsigned nr_pages = 0;</div><div class='del'>-	struct page *stack_pages[16];</div><div class='del'>-	struct page **pages = NULL;</div><div class='del'>-	void *data;</div><div class='del'>-</div><div class='del'>-	BUG_ON(start.bi_size &gt; c-&gt;opts.encoded_extent_max);</div><div class='del'>-</div><div class='del'>-	if (!PageHighMem(bio_iter_page(bio, start)) &amp;&amp;</div><div class='del'>-	    bio_phys_contig(bio, start))</div><div class='del'>-		return (struct bbuf) {</div><div class='del'>-			.b = page_address(bio_iter_page(bio, start)) +</div><div class='del'>-				bio_iter_offset(bio, start),</div><div class='del'>-			.type = BB_NONE, .rw = rw</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	/* check if we can map the pages contiguously: */</div><div class='del'>-	__bio_for_each_segment(bv, bio, iter, start) {</div><div class='del'>-		if (iter.bi_size != start.bi_size &amp;&amp;</div><div class='del'>-		    bv.bv_offset)</div><div class='del'>-			goto bounce;</div><div class='del'>-</div><div class='del'>-		if (bv.bv_len &lt; iter.bi_size &amp;&amp;</div><div class='del'>-		    bv.bv_offset + bv.bv_len &lt; PAGE_SIZE)</div><div class='del'>-			goto bounce;</div><div class='del'>-</div><div class='del'>-		nr_pages++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(DIV_ROUND_UP(start.bi_size, PAGE_SIZE) &gt; nr_pages);</div><div class='del'>-</div><div class='del'>-	pages = nr_pages &gt; ARRAY_SIZE(stack_pages)</div><div class='del'>-		? kmalloc_array(nr_pages, sizeof(struct page *), GFP_NOFS)</div><div class='del'>-		: stack_pages;</div><div class='del'>-	if (!pages)</div><div class='del'>-		goto bounce;</div><div class='del'>-</div><div class='del'>-	nr_pages = 0;</div><div class='del'>-	__bio_for_each_segment(bv, bio, iter, start)</div><div class='del'>-		pages[nr_pages++] = bv.bv_page;</div><div class='del'>-</div><div class='del'>-	data = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL);</div><div class='del'>-	if (pages != stack_pages)</div><div class='del'>-		kfree(pages);</div><div class='del'>-</div><div class='del'>-	if (data)</div><div class='del'>-		return (struct bbuf) {</div><div class='del'>-			.b = data + bio_iter_offset(bio, start),</div><div class='del'>-			.type = BB_VMAP, .rw = rw</div><div class='del'>-		};</div><div class='del'>-bounce:</div><div class='del'>-	ret = __bounce_alloc(c, start.bi_size, rw);</div><div class='del'>-</div><div class='del'>-	if (rw == READ)</div><div class='del'>-		memcpy_from_bio(ret.b, bio, start);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bbuf bio_map_or_bounce(struct bch_fs *c, struct bio *bio, int rw)</div><div class='del'>-{</div><div class='del'>-	return __bio_map_or_bounce(c, bio, bio-&gt;bi_iter, rw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bio_unmap_or_unbounce(struct bch_fs *c, struct bbuf buf)</div><div class='del'>-{</div><div class='del'>-	switch (buf.type) {</div><div class='del'>-	case BB_NONE:</div><div class='del'>-		break;</div><div class='del'>-	case BB_VMAP:</div><div class='del'>-		vunmap((void *) ((unsigned long) buf.b &amp; PAGE_MASK));</div><div class='del'>-		break;</div><div class='del'>-	case BB_KMALLOC:</div><div class='del'>-		kfree(buf.b);</div><div class='del'>-		break;</div><div class='del'>-	case BB_MEMPOOL:</div><div class='del'>-		mempool_free(buf.b, &amp;c-&gt;compression_bounce[buf.rw]);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void zlib_set_workspace(z_stream *strm, void *workspace)</div><div class='del'>-{</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	strm-&gt;workspace = workspace;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bio_uncompress(struct bch_fs *c, struct bio *src,</div><div class='del'>-			    void *dst_data, struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	struct bbuf src_data = { NULL };</div><div class='del'>-	size_t src_len = src-&gt;bi_iter.bi_size;</div><div class='del'>-	size_t dst_len = crc.uncompressed_size &lt;&lt; 9;</div><div class='del'>-	void *workspace;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	src_data = bio_map_or_bounce(c, src, READ);</div><div class='del'>-</div><div class='del'>-	switch (crc.compression_type) {</div><div class='del'>-	case BCH_COMPRESSION_TYPE_lz4_old:</div><div class='del'>-	case BCH_COMPRESSION_TYPE_lz4:</div><div class='del'>-		ret = LZ4_decompress_safe_partial(src_data.b, dst_data,</div><div class='del'>-						  src_len, dst_len, dst_len);</div><div class='del'>-		if (ret != dst_len)</div><div class='del'>-			goto err;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_COMPRESSION_TYPE_gzip: {</div><div class='del'>-		z_stream strm = {</div><div class='del'>-			.next_in	= src_data.b,</div><div class='del'>-			.avail_in	= src_len,</div><div class='del'>-			.next_out	= dst_data,</div><div class='del'>-			.avail_out	= dst_len,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		workspace = mempool_alloc(&amp;c-&gt;decompress_workspace, GFP_NOFS);</div><div class='del'>-</div><div class='del'>-		zlib_set_workspace(&amp;strm, workspace);</div><div class='del'>-		zlib_inflateInit2(&amp;strm, -MAX_WBITS);</div><div class='del'>-		ret = zlib_inflate(&amp;strm, Z_FINISH);</div><div class='del'>-</div><div class='del'>-		mempool_free(workspace, &amp;c-&gt;decompress_workspace);</div><div class='del'>-</div><div class='del'>-		if (ret != Z_STREAM_END)</div><div class='del'>-			goto err;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_COMPRESSION_TYPE_zstd: {</div><div class='del'>-		ZSTD_DCtx *ctx;</div><div class='del'>-		size_t real_src_len = le32_to_cpup(src_data.b);</div><div class='del'>-</div><div class='del'>-		if (real_src_len &gt; src_len - 4)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		workspace = mempool_alloc(&amp;c-&gt;decompress_workspace, GFP_NOFS);</div><div class='del'>-		ctx = zstd_init_dctx(workspace, zstd_dctx_workspace_bound());</div><div class='del'>-</div><div class='del'>-		ret = zstd_decompress_dctx(ctx,</div><div class='del'>-				dst_data,	dst_len,</div><div class='del'>-				src_data.b + 4, real_src_len);</div><div class='del'>-</div><div class='del'>-		mempool_free(workspace, &amp;c-&gt;decompress_workspace);</div><div class='del'>-</div><div class='del'>-		if (ret != dst_len)</div><div class='del'>-			goto err;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	bio_unmap_or_unbounce(c, src_data);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	ret = -EIO;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bio_uncompress_inplace(struct bch_fs *c, struct bio *bio,</div><div class='del'>-				struct bch_extent_crc_unpacked *crc)</div><div class='del'>-{</div><div class='del'>-	struct bbuf data = { NULL };</div><div class='del'>-	size_t dst_len = crc-&gt;uncompressed_size &lt;&lt; 9;</div><div class='del'>-</div><div class='del'>-	/* bio must own its pages: */</div><div class='del'>-	BUG_ON(!bio-&gt;bi_vcnt);</div><div class='del'>-	BUG_ON(DIV_ROUND_UP(crc-&gt;live_size, PAGE_SECTORS) &gt; bio-&gt;bi_max_vecs);</div><div class='del'>-</div><div class='del'>-	if (crc-&gt;uncompressed_size &lt;&lt; 9	&gt; c-&gt;opts.encoded_extent_max ||</div><div class='del'>-	    crc-&gt;compressed_size &lt;&lt; 9	&gt; c-&gt;opts.encoded_extent_max) {</div><div class='del'>-		bch_err(c, "error rewriting existing data: extent too big");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = __bounce_alloc(c, dst_len, WRITE);</div><div class='del'>-</div><div class='del'>-	if (__bio_uncompress(c, bio, data.b, *crc)) {</div><div class='del'>-		if (!c-&gt;opts.no_data_io)</div><div class='del'>-			bch_err(c, "error rewriting existing data: decompression error");</div><div class='del'>-		bio_unmap_or_unbounce(c, data);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: don't have a good way to assert that the bio was allocated with</div><div class='del'>-	 * enough space, we depend on bch2_move_extent doing the right thing</div><div class='del'>-	 */</div><div class='del'>-	bio-&gt;bi_iter.bi_size = crc-&gt;live_size &lt;&lt; 9;</div><div class='del'>-</div><div class='del'>-	memcpy_to_bio(bio, bio-&gt;bi_iter, data.b + (crc-&gt;offset &lt;&lt; 9));</div><div class='del'>-</div><div class='del'>-	crc-&gt;csum_type		= 0;</div><div class='del'>-	crc-&gt;compression_type	= 0;</div><div class='del'>-	crc-&gt;compressed_size	= crc-&gt;live_size;</div><div class='del'>-	crc-&gt;uncompressed_size	= crc-&gt;live_size;</div><div class='del'>-	crc-&gt;offset		= 0;</div><div class='del'>-	crc-&gt;csum		= (struct bch_csum) { 0, 0 };</div><div class='del'>-</div><div class='del'>-	bio_unmap_or_unbounce(c, data);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bio_uncompress(struct bch_fs *c, struct bio *src,</div><div class='del'>-		       struct bio *dst, struct bvec_iter dst_iter,</div><div class='del'>-		       struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	struct bbuf dst_data = { NULL };</div><div class='del'>-	size_t dst_len = crc.uncompressed_size &lt;&lt; 9;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (crc.uncompressed_size &lt;&lt; 9	&gt; c-&gt;opts.encoded_extent_max ||</div><div class='del'>-	    crc.compressed_size &lt;&lt; 9	&gt; c-&gt;opts.encoded_extent_max)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	dst_data = dst_len == dst_iter.bi_size</div><div class='del'>-		? __bio_map_or_bounce(c, dst, dst_iter, WRITE)</div><div class='del'>-		: __bounce_alloc(c, dst_len, WRITE);</div><div class='del'>-</div><div class='del'>-	ret = __bio_uncompress(c, src, dst_data.b, crc);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (dst_data.type != BB_NONE &amp;&amp;</div><div class='del'>-	    dst_data.type != BB_VMAP)</div><div class='del'>-		memcpy_to_bio(dst, dst_iter, dst_data.b + (crc.offset &lt;&lt; 9));</div><div class='del'>-err:</div><div class='del'>-	bio_unmap_or_unbounce(c, dst_data);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int attempt_compress(struct bch_fs *c,</div><div class='del'>-			    void *workspace,</div><div class='del'>-			    void *dst, size_t dst_len,</div><div class='del'>-			    void *src, size_t src_len,</div><div class='del'>-			    struct bch_compression_opt compression)</div><div class='del'>-{</div><div class='del'>-	enum bch_compression_type compression_type =</div><div class='del'>-		__bch2_compression_opt_to_type[compression.type];</div><div class='del'>-</div><div class='del'>-	switch (compression_type) {</div><div class='del'>-	case BCH_COMPRESSION_TYPE_lz4:</div><div class='del'>-		if (compression.level &lt; LZ4HC_MIN_CLEVEL) {</div><div class='del'>-			int len = src_len;</div><div class='del'>-			int ret = LZ4_compress_destSize(</div><div class='del'>-					src,		dst,</div><div class='del'>-					&amp;len,		dst_len,</div><div class='del'>-					workspace);</div><div class='del'>-			if (len &lt; src_len)</div><div class='del'>-				return -len;</div><div class='del'>-</div><div class='del'>-			return ret;</div><div class='del'>-		} else {</div><div class='del'>-			int ret = LZ4_compress_HC(</div><div class='del'>-					src,		dst,</div><div class='del'>-					src_len,	dst_len,</div><div class='del'>-					compression.level,</div><div class='del'>-					workspace);</div><div class='del'>-</div><div class='del'>-			return ret ?: -1;</div><div class='del'>-		}</div><div class='del'>-	case BCH_COMPRESSION_TYPE_gzip: {</div><div class='del'>-		z_stream strm = {</div><div class='del'>-			.next_in	= src,</div><div class='del'>-			.avail_in	= src_len,</div><div class='del'>-			.next_out	= dst,</div><div class='del'>-			.avail_out	= dst_len,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		zlib_set_workspace(&amp;strm, workspace);</div><div class='del'>-		zlib_deflateInit2(&amp;strm,</div><div class='del'>-				  compression.level</div><div class='del'>-				  ? clamp_t(unsigned, compression.level,</div><div class='del'>-					    Z_BEST_SPEED, Z_BEST_COMPRESSION)</div><div class='del'>-				  : Z_DEFAULT_COMPRESSION,</div><div class='del'>-				  Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL,</div><div class='del'>-				  Z_DEFAULT_STRATEGY);</div><div class='del'>-</div><div class='del'>-		if (zlib_deflate(&amp;strm, Z_FINISH) != Z_STREAM_END)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		if (zlib_deflateEnd(&amp;strm) != Z_OK)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		return strm.total_out;</div><div class='del'>-	}</div><div class='del'>-	case BCH_COMPRESSION_TYPE_zstd: {</div><div class='del'>-		/*</div><div class='del'>-		 * rescale:</div><div class='del'>-		 * zstd max compression level is 22, our max level is 15</div><div class='del'>-		 */</div><div class='del'>-		unsigned level = min((compression.level * 3) / 2, zstd_max_clevel());</div><div class='del'>-		ZSTD_parameters params = zstd_get_params(level, c-&gt;opts.encoded_extent_max);</div><div class='del'>-		ZSTD_CCtx *ctx = zstd_init_cctx(workspace, c-&gt;zstd_workspace_size);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ZSTD requires that when we decompress we pass in the exact</div><div class='del'>-		 * compressed size - rounding it up to the nearest sector</div><div class='del'>-		 * doesn't work, so we use the first 4 bytes of the buffer for</div><div class='del'>-		 * that.</div><div class='del'>-		 *</div><div class='del'>-		 * Additionally, the ZSTD code seems to have a bug where it will</div><div class='del'>-		 * write just past the end of the buffer - so subtract a fudge</div><div class='del'>-		 * factor (7 bytes) from the dst buffer size to account for</div><div class='del'>-		 * that.</div><div class='del'>-		 */</div><div class='del'>-		size_t len = zstd_compress_cctx(ctx,</div><div class='del'>-				dst + 4,	dst_len - 4 - 7,</div><div class='del'>-				src,		src_len,</div><div class='del'>-				&amp;params);</div><div class='del'>-		if (zstd_is_error(len))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		*((__le32 *) dst) = cpu_to_le32(len);</div><div class='del'>-		return len + 4;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned __bio_compress(struct bch_fs *c,</div><div class='del'>-			       struct bio *dst, size_t *dst_len,</div><div class='del'>-			       struct bio *src, size_t *src_len,</div><div class='del'>-			       struct bch_compression_opt compression)</div><div class='del'>-{</div><div class='del'>-	struct bbuf src_data = { NULL }, dst_data = { NULL };</div><div class='del'>-	void *workspace;</div><div class='del'>-	enum bch_compression_type compression_type =</div><div class='del'>-		__bch2_compression_opt_to_type[compression.type];</div><div class='del'>-	unsigned pad;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(compression_type &gt;= BCH_COMPRESSION_TYPE_NR);</div><div class='del'>-	BUG_ON(!mempool_initialized(&amp;c-&gt;compress_workspace[compression_type]));</div><div class='del'>-</div><div class='del'>-	/* If it's only one block, don't bother trying to compress: */</div><div class='del'>-	if (src-&gt;bi_iter.bi_size &lt;= c-&gt;opts.block_size)</div><div class='del'>-		return BCH_COMPRESSION_TYPE_incompressible;</div><div class='del'>-</div><div class='del'>-	dst_data = bio_map_or_bounce(c, dst, WRITE);</div><div class='del'>-	src_data = bio_map_or_bounce(c, src, READ);</div><div class='del'>-</div><div class='del'>-	workspace = mempool_alloc(&amp;c-&gt;compress_workspace[compression_type], GFP_NOFS);</div><div class='del'>-</div><div class='del'>-	*src_len = src-&gt;bi_iter.bi_size;</div><div class='del'>-	*dst_len = dst-&gt;bi_iter.bi_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: this algorithm sucks when the compression code doesn't tell us</div><div class='del'>-	 * how much would fit, like LZ4 does:</div><div class='del'>-	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		if (*src_len &lt;= block_bytes(c)) {</div><div class='del'>-			ret = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = attempt_compress(c, workspace,</div><div class='del'>-				       dst_data.b,	*dst_len,</div><div class='del'>-				       src_data.b,	*src_len,</div><div class='del'>-				       compression);</div><div class='del'>-		if (ret &gt; 0) {</div><div class='del'>-			*dst_len = ret;</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Didn't fit: should we retry with a smaller amount?  */</div><div class='del'>-		if (*src_len &lt;= *dst_len) {</div><div class='del'>-			ret = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If ret is negative, it's a hint as to how much data would fit</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(-ret &gt;= *src_len);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			*src_len = -ret;</div><div class='del'>-		else</div><div class='del'>-			*src_len -= (*src_len - *dst_len) / 2;</div><div class='del'>-		*src_len = round_down(*src_len, block_bytes(c));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mempool_free(workspace, &amp;c-&gt;compress_workspace[compression_type]);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* Didn't get smaller: */</div><div class='del'>-	if (round_up(*dst_len, block_bytes(c)) &gt;= *src_len)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	pad = round_up(*dst_len, block_bytes(c)) - *dst_len;</div><div class='del'>-</div><div class='del'>-	memset(dst_data.b + *dst_len, 0, pad);</div><div class='del'>-	*dst_len += pad;</div><div class='del'>-</div><div class='del'>-	if (dst_data.type != BB_NONE &amp;&amp;</div><div class='del'>-	    dst_data.type != BB_VMAP)</div><div class='del'>-		memcpy_to_bio(dst, dst-&gt;bi_iter, dst_data.b);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!*dst_len || *dst_len &gt; dst-&gt;bi_iter.bi_size);</div><div class='del'>-	BUG_ON(!*src_len || *src_len &gt; src-&gt;bi_iter.bi_size);</div><div class='del'>-	BUG_ON(*dst_len &amp; (block_bytes(c) - 1));</div><div class='del'>-	BUG_ON(*src_len &amp; (block_bytes(c) - 1));</div><div class='del'>-	ret = compression_type;</div><div class='del'>-out:</div><div class='del'>-	bio_unmap_or_unbounce(c, src_data);</div><div class='del'>-	bio_unmap_or_unbounce(c, dst_data);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	ret = BCH_COMPRESSION_TYPE_incompressible;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bio_compress(struct bch_fs *c,</div><div class='del'>-			   struct bio *dst, size_t *dst_len,</div><div class='del'>-			   struct bio *src, size_t *src_len,</div><div class='del'>-			   unsigned compression_opt)</div><div class='del'>-{</div><div class='del'>-	unsigned orig_dst = dst-&gt;bi_iter.bi_size;</div><div class='del'>-	unsigned orig_src = src-&gt;bi_iter.bi_size;</div><div class='del'>-	unsigned compression_type;</div><div class='del'>-</div><div class='del'>-	/* Don't consume more than BCH_ENCODED_EXTENT_MAX from @src: */</div><div class='del'>-	src-&gt;bi_iter.bi_size = min_t(unsigned, src-&gt;bi_iter.bi_size,</div><div class='del'>-				     c-&gt;opts.encoded_extent_max);</div><div class='del'>-	/* Don't generate a bigger output than input: */</div><div class='del'>-	dst-&gt;bi_iter.bi_size = min(dst-&gt;bi_iter.bi_size, src-&gt;bi_iter.bi_size);</div><div class='del'>-</div><div class='del'>-	compression_type =</div><div class='del'>-		__bio_compress(c, dst, dst_len, src, src_len,</div><div class='del'>-			       bch2_compression_decode(compression_opt));</div><div class='del'>-</div><div class='del'>-	dst-&gt;bi_iter.bi_size = orig_dst;</div><div class='del'>-	src-&gt;bi_iter.bi_size = orig_src;</div><div class='del'>-	return compression_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_fs_compress_init(struct bch_fs *, u64);</div><div class='del'>-</div><div class='del'>-#define BCH_FEATURE_none	0</div><div class='del'>-</div><div class='del'>-static const unsigned bch2_compression_opt_to_feature[] = {</div><div class='del'>-#define x(t, n) [BCH_COMPRESSION_OPT_##t] = BCH_FEATURE_##t,</div><div class='del'>-	BCH_COMPRESSION_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#undef BCH_FEATURE_none</div><div class='del'>-</div><div class='del'>-static int __bch2_check_set_has_compressed_data(struct bch_fs *c, u64 f)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if ((c-&gt;sb.features &amp; f) == f)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if ((c-&gt;sb.features &amp; f) == f) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __bch2_fs_compress_init(c, c-&gt;sb.features|f);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;features[0] |= cpu_to_le64(f);</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_set_has_compressed_data(struct bch_fs *c,</div><div class='del'>-				       unsigned compression_opt)</div><div class='del'>-{</div><div class='del'>-	unsigned compression_type = bch2_compression_decode(compression_opt).type;</div><div class='del'>-</div><div class='del'>-	BUG_ON(compression_type &gt;= ARRAY_SIZE(bch2_compression_opt_to_feature));</div><div class='del'>-</div><div class='del'>-	return compression_type</div><div class='del'>-		? __bch2_check_set_has_compressed_data(c,</div><div class='del'>-				1ULL &lt;&lt; bch2_compression_opt_to_feature[compression_type])</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_compress_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mempool_exit(&amp;c-&gt;decompress_workspace);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;compress_workspace); i++)</div><div class='del'>-		mempool_exit(&amp;c-&gt;compress_workspace[i]);</div><div class='del'>-	mempool_exit(&amp;c-&gt;compression_bounce[WRITE]);</div><div class='del'>-	mempool_exit(&amp;c-&gt;compression_bounce[READ]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_fs_compress_init(struct bch_fs *c, u64 features)</div><div class='del'>-{</div><div class='del'>-	size_t decompress_workspace_size = 0;</div><div class='del'>-	ZSTD_parameters params = zstd_get_params(zstd_max_clevel(),</div><div class='del'>-						 c-&gt;opts.encoded_extent_max);</div><div class='del'>-</div><div class='del'>-	c-&gt;zstd_workspace_size = zstd_cctx_workspace_bound(&amp;params.cParams);</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		unsigned			feature;</div><div class='del'>-		enum bch_compression_type	type;</div><div class='del'>-		size_t				compress_workspace;</div><div class='del'>-		size_t				decompress_workspace;</div><div class='del'>-	} compression_types[] = {</div><div class='del'>-		{ BCH_FEATURE_lz4, BCH_COMPRESSION_TYPE_lz4,</div><div class='del'>-			max_t(size_t, LZ4_MEM_COMPRESS, LZ4HC_MEM_COMPRESS),</div><div class='del'>-			0 },</div><div class='del'>-		{ BCH_FEATURE_gzip, BCH_COMPRESSION_TYPE_gzip,</div><div class='del'>-			zlib_deflate_workspacesize(MAX_WBITS, DEF_MEM_LEVEL),</div><div class='del'>-			zlib_inflate_workspacesize(), },</div><div class='del'>-		{ BCH_FEATURE_zstd, BCH_COMPRESSION_TYPE_zstd,</div><div class='del'>-			c-&gt;zstd_workspace_size,</div><div class='del'>-			zstd_dctx_workspace_bound() },</div><div class='del'>-	}, *i;</div><div class='del'>-	bool have_compressed = false;</div><div class='del'>-</div><div class='del'>-	for (i = compression_types;</div><div class='del'>-	     i &lt; compression_types + ARRAY_SIZE(compression_types);</div><div class='del'>-	     i++)</div><div class='del'>-		have_compressed |= (features &amp; (1 &lt;&lt; i-&gt;feature)) != 0;</div><div class='del'>-</div><div class='del'>-	if (!have_compressed)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!mempool_initialized(&amp;c-&gt;compression_bounce[READ]) &amp;&amp;</div><div class='del'>-	    mempool_init_kvpmalloc_pool(&amp;c-&gt;compression_bounce[READ],</div><div class='del'>-					1, c-&gt;opts.encoded_extent_max))</div><div class='del'>-		return -BCH_ERR_ENOMEM_compression_bounce_read_init;</div><div class='del'>-</div><div class='del'>-	if (!mempool_initialized(&amp;c-&gt;compression_bounce[WRITE]) &amp;&amp;</div><div class='del'>-	    mempool_init_kvpmalloc_pool(&amp;c-&gt;compression_bounce[WRITE],</div><div class='del'>-					1, c-&gt;opts.encoded_extent_max))</div><div class='del'>-		return -BCH_ERR_ENOMEM_compression_bounce_write_init;</div><div class='del'>-</div><div class='del'>-	for (i = compression_types;</div><div class='del'>-	     i &lt; compression_types + ARRAY_SIZE(compression_types);</div><div class='del'>-	     i++) {</div><div class='del'>-		decompress_workspace_size =</div><div class='del'>-			max(decompress_workspace_size, i-&gt;decompress_workspace);</div><div class='del'>-</div><div class='del'>-		if (!(features &amp; (1 &lt;&lt; i-&gt;feature)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (mempool_initialized(&amp;c-&gt;compress_workspace[i-&gt;type]))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (mempool_init_kvpmalloc_pool(</div><div class='del'>-				&amp;c-&gt;compress_workspace[i-&gt;type],</div><div class='del'>-				1, i-&gt;compress_workspace))</div><div class='del'>-			return -BCH_ERR_ENOMEM_compression_workspace_init;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!mempool_initialized(&amp;c-&gt;decompress_workspace) &amp;&amp;</div><div class='del'>-	    mempool_init_kvpmalloc_pool(&amp;c-&gt;decompress_workspace,</div><div class='del'>-					1, decompress_workspace_size))</div><div class='del'>-		return -BCH_ERR_ENOMEM_decompression_workspace_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 compression_opt_to_feature(unsigned v)</div><div class='del'>-{</div><div class='del'>-	unsigned type = bch2_compression_decode(v).type;</div><div class='del'>-</div><div class='del'>-	return BIT_ULL(bch2_compression_opt_to_feature[type]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_compress_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	u64 f = c-&gt;sb.features;</div><div class='del'>-</div><div class='del'>-	f |= compression_opt_to_feature(c-&gt;opts.compression);</div><div class='del'>-	f |= compression_opt_to_feature(c-&gt;opts.background_compression);</div><div class='del'>-</div><div class='del'>-	return __bch2_fs_compress_init(c, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opt_compression_parse(struct bch_fs *c, const char *_val, u64 *res,</div><div class='del'>-			       struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	char *val = kstrdup(_val, GFP_KERNEL);</div><div class='del'>-	char *p = val, *type_str, *level_str;</div><div class='del'>-	struct bch_compression_opt opt = { 0 };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!val)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	type_str = strsep(&amp;p, ":");</div><div class='del'>-	level_str = p;</div><div class='del'>-</div><div class='del'>-	ret = match_string(bch2_compression_opts, -1, type_str);</div><div class='del'>-	if (ret &lt; 0 &amp;&amp; err)</div><div class='del'>-		prt_str(err, "invalid compression type");</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	opt.type = ret;</div><div class='del'>-</div><div class='del'>-	if (level_str) {</div><div class='del'>-		unsigned level;</div><div class='del'>-</div><div class='del'>-		ret = kstrtouint(level_str, 10, &amp;level);</div><div class='del'>-		if (!ret &amp;&amp; !opt.type &amp;&amp; level)</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		if (!ret &amp;&amp; level &gt; 15)</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		if (ret &lt; 0 &amp;&amp; err)</div><div class='del'>-			prt_str(err, "invalid compression level");</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		opt.level = level;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*res = bch2_compression_encode(opt);</div><div class='del'>-err:</div><div class='del'>-	kfree(val);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_compression_opt_to_text(struct printbuf *out, u64 v)</div><div class='del'>-{</div><div class='del'>-	struct bch_compression_opt opt = bch2_compression_decode(v);</div><div class='del'>-</div><div class='del'>-	if (opt.type &lt; BCH_COMPRESSION_OPT_NR)</div><div class='del'>-		prt_str(out, bch2_compression_opts[opt.type]);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(unknown compression opt %u)", opt.type);</div><div class='del'>-	if (opt.level)</div><div class='del'>-		prt_printf(out, ":%u", opt.level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opt_compression_to_text(struct printbuf *out,</div><div class='del'>-				  struct bch_fs *c,</div><div class='del'>-				  struct bch_sb *sb,</div><div class='del'>-				  u64 v)</div><div class='del'>-{</div><div class='del'>-	return bch2_compression_opt_to_text(out, v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opt_compression_validate(u64 v, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_compression_opt_valid(v)) {</div><div class='del'>-		prt_printf(err, "invalid compression opt %llu", v);</div><div class='del'>-		return -BCH_ERR_invalid_sb_opt_compression;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/compress.h b/fs/bcachefs/compress.h<br/>deleted file mode 100644<br/>index 58c2eb45570f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/compress.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/compress.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_COMPRESS_H</div><div class='del'>-#define _BCACHEFS_COMPRESS_H</div><div class='del'>-</div><div class='del'>-#include "extents_types.h"</div><div class='del'>-</div><div class='del'>-static const unsigned __bch2_compression_opt_to_type[] = {</div><div class='del'>-#define x(t, n) [BCH_COMPRESSION_OPT_##t] = BCH_COMPRESSION_TYPE_##t,</div><div class='del'>-	BCH_COMPRESSION_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_compression_opt {</div><div class='del'>-	u8		type:4,</div><div class='del'>-			level:4;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bch_compression_opt __bch2_compression_decode(unsigned v)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_compression_opt) {</div><div class='del'>-		.type	= v &amp; 15,</div><div class='del'>-		.level	= v &gt;&gt; 4,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_compression_opt_valid(unsigned v)</div><div class='del'>-{</div><div class='del'>-	struct bch_compression_opt opt = __bch2_compression_decode(v);</div><div class='del'>-</div><div class='del'>-	return opt.type &lt; ARRAY_SIZE(__bch2_compression_opt_to_type) &amp;&amp; !(!opt.type &amp;&amp; opt.level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_compression_opt bch2_compression_decode(unsigned v)</div><div class='del'>-{</div><div class='del'>-	return bch2_compression_opt_valid(v)</div><div class='del'>-		? __bch2_compression_decode(v)</div><div class='del'>-		: (struct bch_compression_opt) { 0 };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_compression_encode(struct bch_compression_opt opt)</div><div class='del'>-{</div><div class='del'>-	return opt.type|(opt.level &lt;&lt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_compression_type bch2_compression_opt_to_type(unsigned v)</div><div class='del'>-{</div><div class='del'>-	return __bch2_compression_opt_to_type[bch2_compression_decode(v).type];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_prt_compression_type(struct printbuf *out, enum bch_compression_type type)</div><div class='del'>-{</div><div class='del'>-	if (type &lt; BCH_COMPRESSION_TYPE_NR)</div><div class='del'>-		prt_str(out, __bch2_compression_types[type]);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(invalid compression type %u)", type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bio_uncompress_inplace(struct bch_fs *, struct bio *,</div><div class='del'>-				struct bch_extent_crc_unpacked *);</div><div class='del'>-int bch2_bio_uncompress(struct bch_fs *, struct bio *, struct bio *,</div><div class='del'>-		       struct bvec_iter, struct bch_extent_crc_unpacked);</div><div class='del'>-unsigned bch2_bio_compress(struct bch_fs *, struct bio *, size_t *,</div><div class='del'>-			   struct bio *, size_t *, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_check_set_has_compressed_data(struct bch_fs *, unsigned);</div><div class='del'>-void bch2_fs_compress_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_compress_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_compression_opt_to_text(struct printbuf *, u64);</div><div class='del'>-</div><div class='del'>-int bch2_opt_compression_parse(struct bch_fs *, const char *, u64 *, struct printbuf *);</div><div class='del'>-void bch2_opt_compression_to_text(struct printbuf *, struct bch_fs *, struct bch_sb *, u64);</div><div class='del'>-int bch2_opt_compression_validate(u64, struct printbuf *);</div><div class='del'>-</div><div class='del'>-#define bch2_opt_compression (struct bch_opt_fn) {		\</div><div class='del'>-	.parse		= bch2_opt_compression_parse,		\</div><div class='del'>-	.to_text	= bch2_opt_compression_to_text,		\</div><div class='del'>-	.validate	= bch2_opt_compression_validate,	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_COMPRESS_H */</div><div class='head'>diff --git a/fs/bcachefs/darray.c b/fs/bcachefs/darray.c<br/>deleted file mode 100644<br/>index ac35b8b705ae..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/darray.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/darray.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "darray.h"</div><div class='del'>-</div><div class='del'>-int __bch2_darray_resize(darray_char *d, size_t element_size, size_t new_size, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	if (new_size &gt; d-&gt;size) {</div><div class='del'>-		new_size = roundup_pow_of_two(new_size);</div><div class='del'>-</div><div class='del'>-		void *data = kvmalloc_array(new_size, element_size, gfp);</div><div class='del'>-		if (!data)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		memcpy(data, d-&gt;data, d-&gt;size * element_size);</div><div class='del'>-		if (d-&gt;data != d-&gt;preallocated)</div><div class='del'>-			kvfree(d-&gt;data);</div><div class='del'>-		d-&gt;data	= data;</div><div class='del'>-		d-&gt;size = new_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/darray.h b/fs/bcachefs/darray.h<br/>deleted file mode 100644<br/>index 4b340d13caac..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/darray.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/darray.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_DARRAY_H</div><div class='del'>-#define _BCACHEFS_DARRAY_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Dynamic arrays:</div><div class='del'>- *</div><div class='del'>- * Inspired by CCAN's darray</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#define DARRAY_PREALLOCATED(_type, _nr)					\</div><div class='del'>-struct {								\</div><div class='del'>-	size_t nr, size;						\</div><div class='del'>-	_type *data;							\</div><div class='del'>-	_type preallocated[_nr];					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DARRAY(_type) DARRAY_PREALLOCATED(_type, 0)</div><div class='del'>-</div><div class='del'>-typedef DARRAY(char)	darray_char;</div><div class='del'>-typedef DARRAY(char *) darray_str;</div><div class='del'>-</div><div class='del'>-int __bch2_darray_resize(darray_char *, size_t, size_t, gfp_t);</div><div class='del'>-</div><div class='del'>-static inline int __darray_resize(darray_char *d, size_t element_size,</div><div class='del'>-				  size_t new_size, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	return unlikely(new_size &gt; d-&gt;size)</div><div class='del'>-		? __bch2_darray_resize(d, element_size, new_size, gfp)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define darray_resize_gfp(_d, _new_size, _gfp)				\</div><div class='del'>-	unlikely(__darray_resize((darray_char *) (_d), sizeof((_d)-&gt;data[0]), (_new_size), _gfp))</div><div class='del'>-</div><div class='del'>-#define darray_resize(_d, _new_size)					\</div><div class='del'>-	darray_resize_gfp(_d, _new_size, GFP_KERNEL)</div><div class='del'>-</div><div class='del'>-static inline int __darray_make_room(darray_char *d, size_t t_size, size_t more, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	return __darray_resize(d, t_size, d-&gt;nr + more, gfp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define darray_make_room_gfp(_d, _more, _gfp)				\</div><div class='del'>-	__darray_make_room((darray_char *) (_d), sizeof((_d)-&gt;data[0]), (_more), _gfp)</div><div class='del'>-</div><div class='del'>-#define darray_make_room(_d, _more)					\</div><div class='del'>-	darray_make_room_gfp(_d, _more, GFP_KERNEL)</div><div class='del'>-</div><div class='del'>-#define darray_room(_d)		((_d).size - (_d).nr)</div><div class='del'>-</div><div class='del'>-#define darray_top(_d)		((_d).data[(_d).nr])</div><div class='del'>-</div><div class='del'>-#define darray_push_gfp(_d, _item, _gfp)				\</div><div class='del'>-({									\</div><div class='del'>-	int _ret = darray_make_room_gfp((_d), 1, _gfp);			\</div><div class='del'>-									\</div><div class='del'>-	if (!_ret)							\</div><div class='del'>-		(_d)-&gt;data[(_d)-&gt;nr++] = (_item);			\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define darray_push(_d, _item)	darray_push_gfp(_d, _item, GFP_KERNEL)</div><div class='del'>-</div><div class='del'>-#define darray_pop(_d)		((_d)-&gt;data[--(_d)-&gt;nr])</div><div class='del'>-</div><div class='del'>-#define darray_first(_d)	((_d).data[0])</div><div class='del'>-#define darray_last(_d)		((_d).data[(_d).nr - 1])</div><div class='del'>-</div><div class='del'>-#define darray_insert_item(_d, pos, _item)				\</div><div class='del'>-({									\</div><div class='del'>-	size_t _pos = (pos);						\</div><div class='del'>-	int _ret = darray_make_room((_d), 1);				\</div><div class='del'>-									\</div><div class='del'>-	if (!_ret)							\</div><div class='del'>-		array_insert_item((_d)-&gt;data, (_d)-&gt;nr, _pos, (_item));	\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define darray_remove_item(_d, _pos)					\</div><div class='del'>-	array_remove_item((_d)-&gt;data, (_d)-&gt;nr, (_pos) - (_d)-&gt;data)</div><div class='del'>-</div><div class='del'>-#define __darray_for_each(_d, _i)						\</div><div class='del'>-	for ((_i) = (_d).data; _i &lt; (_d).data + (_d).nr; _i++)</div><div class='del'>-</div><div class='del'>-#define darray_for_each(_d, _i)						\</div><div class='del'>-	for (typeof(&amp;(_d).data[0]) _i = (_d).data; _i &lt; (_d).data + (_d).nr; _i++)</div><div class='del'>-</div><div class='del'>-#define darray_for_each_reverse(_d, _i)					\</div><div class='del'>-	for (typeof(&amp;(_d).data[0]) _i = (_d).data + (_d).nr - 1; _i &gt;= (_d).data; --_i)</div><div class='del'>-</div><div class='del'>-#define darray_init(_d)							\</div><div class='del'>-do {									\</div><div class='del'>-	(_d)-&gt;nr = 0;							\</div><div class='del'>-	(_d)-&gt;size = ARRAY_SIZE((_d)-&gt;preallocated);			\</div><div class='del'>-	(_d)-&gt;data = (_d)-&gt;size ? (_d)-&gt;preallocated : NULL;		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define darray_exit(_d)							\</div><div class='del'>-do {									\</div><div class='del'>-	if (!ARRAY_SIZE((_d)-&gt;preallocated) ||				\</div><div class='del'>-	    (_d)-&gt;data != (_d)-&gt;preallocated)				\</div><div class='del'>-		kvfree((_d)-&gt;data);					\</div><div class='del'>-	darray_init(_d);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DARRAY_H */</div><div class='head'>diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c<br/>deleted file mode 100644<br/>index 4150feca42a2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/data_update.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/data_update.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,663 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "data_update.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "nocow_locking.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-static void trace_move_extent_finish2(struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	if (trace_move_extent_finish_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		trace_move_extent_finish(c, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void trace_move_extent_fail2(struct data_update *m,</div><div class='del'>-			 struct bkey_s_c new,</div><div class='del'>-			 struct bkey_s_c wrote,</div><div class='del'>-			 struct bkey_i *insert,</div><div class='del'>-			 const char *msg)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = m-&gt;op.c;</div><div class='del'>-	struct bkey_s_c old = bkey_i_to_s_c(m-&gt;k.k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct bch_extent_ptr *ptr;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	unsigned i, rewrites_found = 0;</div><div class='del'>-</div><div class='del'>-	if (!trace_move_extent_fail_enabled())</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, msg);</div><div class='del'>-</div><div class='del'>-	if (insert) {</div><div class='del'>-		i = 0;</div><div class='del'>-		bkey_for_each_ptr_decode(old.k, bch2_bkey_ptrs_c(old), p, entry) {</div><div class='del'>-			if (((1U &lt;&lt; i) &amp; m-&gt;data_opts.rewrite_ptrs) &amp;&amp;</div><div class='del'>-			    (ptr = bch2_extent_has_ptr(old, p, bkey_i_to_s(insert))) &amp;&amp;</div><div class='del'>-			    !ptr-&gt;cached)</div><div class='del'>-				rewrites_found |= 1U &lt;&lt; i;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "\nrewrite ptrs:   %u%u%u%u",</div><div class='del'>-		   (m-&gt;data_opts.rewrite_ptrs &amp; (1 &lt;&lt; 0)) != 0,</div><div class='del'>-		   (m-&gt;data_opts.rewrite_ptrs &amp; (1 &lt;&lt; 1)) != 0,</div><div class='del'>-		   (m-&gt;data_opts.rewrite_ptrs &amp; (1 &lt;&lt; 2)) != 0,</div><div class='del'>-		   (m-&gt;data_opts.rewrite_ptrs &amp; (1 &lt;&lt; 3)) != 0);</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "\nrewrites found: %u%u%u%u",</div><div class='del'>-		   (rewrites_found &amp; (1 &lt;&lt; 0)) != 0,</div><div class='del'>-		   (rewrites_found &amp; (1 &lt;&lt; 1)) != 0,</div><div class='del'>-		   (rewrites_found &amp; (1 &lt;&lt; 2)) != 0,</div><div class='del'>-		   (rewrites_found &amp; (1 &lt;&lt; 3)) != 0);</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\nold:    ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, old);</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\nnew:    ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, new);</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\nwrote:  ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, wrote);</div><div class='del'>-</div><div class='del'>-	if (insert) {</div><div class='del'>-		prt_str(&amp;buf, "\ninsert: ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(insert));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_move_extent_fail(c, buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_data_update_index_update(struct btree_trans *trans,</div><div class='del'>-					   struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct data_update *m =</div><div class='del'>-		container_of(op, struct data_update, op);</div><div class='del'>-	struct keylist *keys = &amp;op-&gt;insert_keys;</div><div class='del'>-	struct bkey_buf _new, _insert;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;_new);</div><div class='del'>-	bch2_bkey_buf_init(&amp;_insert);</div><div class='del'>-	bch2_bkey_buf_realloc(&amp;_insert, c, U8_MAX);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, m-&gt;btree_id,</div><div class='del'>-			     bkey_start_pos(&amp;bch2_keylist_front(keys)-&gt;k),</div><div class='del'>-			     BTREE_ITER_SLOTS|BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		struct bkey_s_c k;</div><div class='del'>-		struct bkey_s_c old = bkey_i_to_s_c(m-&gt;k.k);</div><div class='del'>-		struct bkey_i *insert = NULL;</div><div class='del'>-		struct bkey_i_extent *new;</div><div class='del'>-		const union bch_extent_entry *entry_c;</div><div class='del'>-		union bch_extent_entry *entry;</div><div class='del'>-		struct extent_ptr_decoded p;</div><div class='del'>-		struct bch_extent_ptr *ptr;</div><div class='del'>-		const struct bch_extent_ptr *ptr_c;</div><div class='del'>-		struct bpos next_pos;</div><div class='del'>-		bool should_check_enospc;</div><div class='del'>-		s64 i_sectors_delta = 0, disk_sectors_delta = 0;</div><div class='del'>-		unsigned rewrites_found = 0, durability, i;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		new = bkey_i_to_extent(bch2_keylist_front(keys));</div><div class='del'>-</div><div class='del'>-		if (!bch2_extents_match(k, old)) {</div><div class='del'>-			trace_move_extent_fail2(m, k, bkey_i_to_s_c(&amp;new-&gt;k_i),</div><div class='del'>-						NULL, "no match:");</div><div class='del'>-			goto nowork;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(_insert.k, k);</div><div class='del'>-		insert = _insert.k;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_copy(&amp;_new, c, bch2_keylist_front(keys));</div><div class='del'>-		new = bkey_i_to_extent(_new.k);</div><div class='del'>-		bch2_cut_front(iter.pos, &amp;new-&gt;k_i);</div><div class='del'>-</div><div class='del'>-		bch2_cut_front(iter.pos,	insert);</div><div class='del'>-		bch2_cut_back(new-&gt;k.p,		insert);</div><div class='del'>-		bch2_cut_back(insert-&gt;k.p,	&amp;new-&gt;k_i);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * @old: extent that we read from</div><div class='del'>-		 * @insert: key that we're going to update, initialized from</div><div class='del'>-		 * extent currently in btree - same as @old unless we raced with</div><div class='del'>-		 * other updates</div><div class='del'>-		 * @new: extent with new pointers that we'll be adding to @insert</div><div class='del'>-		 *</div><div class='del'>-		 * Fist, drop rewrite_ptrs from @new:</div><div class='del'>-		 */</div><div class='del'>-		i = 0;</div><div class='del'>-		bkey_for_each_ptr_decode(old.k, bch2_bkey_ptrs_c(old), p, entry_c) {</div><div class='del'>-			if (((1U &lt;&lt; i) &amp; m-&gt;data_opts.rewrite_ptrs) &amp;&amp;</div><div class='del'>-			    (ptr = bch2_extent_has_ptr(old, p, bkey_i_to_s(insert))) &amp;&amp;</div><div class='del'>-			    !ptr-&gt;cached) {</div><div class='del'>-				bch2_extent_ptr_set_cached(bkey_i_to_s(insert), ptr);</div><div class='del'>-				rewrites_found |= 1U &lt;&lt; i;</div><div class='del'>-			}</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (m-&gt;data_opts.rewrite_ptrs &amp;&amp;</div><div class='del'>-		    !rewrites_found &amp;&amp;</div><div class='del'>-		    bch2_bkey_durability(c, k) &gt;= m-&gt;op.opts.data_replicas) {</div><div class='del'>-			trace_move_extent_fail2(m, k, bkey_i_to_s_c(&amp;new-&gt;k_i), insert, "no rewrites found:");</div><div class='del'>-			goto nowork;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * A replica that we just wrote might conflict with a replica</div><div class='del'>-		 * that we want to keep, due to racing with another move:</div><div class='del'>-		 */</div><div class='del'>-restart_drop_conflicting_replicas:</div><div class='del'>-		extent_for_each_ptr(extent_i_to_s(new), ptr)</div><div class='del'>-			if ((ptr_c = bch2_bkey_has_device_c(bkey_i_to_s_c(insert), ptr-&gt;dev)) &amp;&amp;</div><div class='del'>-			    !ptr_c-&gt;cached) {</div><div class='del'>-				bch2_bkey_drop_ptr_noerror(bkey_i_to_s(&amp;new-&gt;k_i), ptr);</div><div class='del'>-				goto restart_drop_conflicting_replicas;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		if (!bkey_val_u64s(&amp;new-&gt;k)) {</div><div class='del'>-			trace_move_extent_fail2(m, k, bkey_i_to_s_c(&amp;new-&gt;k_i), insert, "new replicas conflicted:");</div><div class='del'>-			goto nowork;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now, drop pointers that conflict with what we just wrote: */</div><div class='del'>-		extent_for_each_ptr_decode(extent_i_to_s(new), p, entry)</div><div class='del'>-			if ((ptr = bch2_bkey_has_device(bkey_i_to_s(insert), p.ptr.dev)))</div><div class='del'>-				bch2_bkey_drop_ptr_noerror(bkey_i_to_s(insert), ptr);</div><div class='del'>-</div><div class='del'>-		durability = bch2_bkey_durability(c, bkey_i_to_s_c(insert)) +</div><div class='del'>-			bch2_bkey_durability(c, bkey_i_to_s_c(&amp;new-&gt;k_i));</div><div class='del'>-</div><div class='del'>-		/* Now, drop excess replicas: */</div><div class='del'>-restart_drop_extra_replicas:</div><div class='del'>-		bkey_for_each_ptr_decode(old.k, bch2_bkey_ptrs(bkey_i_to_s(insert)), p, entry) {</div><div class='del'>-			unsigned ptr_durability = bch2_extent_ptr_durability(c, &amp;p);</div><div class='del'>-</div><div class='del'>-			if (!p.ptr.cached &amp;&amp;</div><div class='del'>-			    durability - ptr_durability &gt;= m-&gt;op.opts.data_replicas) {</div><div class='del'>-				durability -= ptr_durability;</div><div class='del'>-</div><div class='del'>-				bch2_extent_ptr_set_cached(bkey_i_to_s(insert), &amp;entry-&gt;ptr);</div><div class='del'>-				goto restart_drop_extra_replicas;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Finally, add the pointers we just wrote: */</div><div class='del'>-		extent_for_each_ptr_decode(extent_i_to_s(new), p, entry)</div><div class='del'>-			bch2_extent_ptr_decoded_append(insert, &amp;p);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_narrow_crcs(insert, (struct bch_extent_crc_unpacked) { 0 });</div><div class='del'>-		bch2_extent_normalize(c, bkey_i_to_s(insert));</div><div class='del'>-</div><div class='del'>-		ret = bch2_sum_sector_overwrites(trans, &amp;iter, insert,</div><div class='del'>-						 &amp;should_check_enospc,</div><div class='del'>-						 &amp;i_sectors_delta,</div><div class='del'>-						 &amp;disk_sectors_delta);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (disk_sectors_delta &gt; (s64) op-&gt;res.sectors) {</div><div class='del'>-			ret = bch2_disk_reservation_add(c, &amp;op-&gt;res,</div><div class='del'>-						disk_sectors_delta - op-&gt;res.sectors,</div><div class='del'>-						!should_check_enospc</div><div class='del'>-						? BCH_DISK_RESERVATION_NOFAIL : 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		next_pos = insert-&gt;k.p;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check for nonce offset inconsistency:</div><div class='del'>-		 * This is debug code - we've been seeing this bug rarely, and</div><div class='del'>-		 * it's been hard to reproduce, so this should give us some more</div><div class='del'>-		 * information when it does occur:</div><div class='del'>-		 */</div><div class='del'>-		struct printbuf err = PRINTBUF;</div><div class='del'>-		int invalid = bch2_bkey_invalid(c, bkey_i_to_s_c(insert), __btree_node_type(0, m-&gt;btree_id), 0, &amp;err);</div><div class='del'>-		printbuf_exit(&amp;err);</div><div class='del'>-</div><div class='del'>-		if (invalid) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			prt_str(&amp;buf, "about to insert invalid key in data update path");</div><div class='del'>-			prt_str(&amp;buf, "\nold: ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, old);</div><div class='del'>-			prt_str(&amp;buf, "\nk:   ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-			prt_str(&amp;buf, "\nnew: ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(insert));</div><div class='del'>-</div><div class='del'>-			bch2_print_string_as_lines(KERN_ERR, buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-			bch2_fatal_error(c);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (trace_data_update_enabled()) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			prt_str(&amp;buf, "\nold: ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, old);</div><div class='del'>-			prt_str(&amp;buf, "\nk:   ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-			prt_str(&amp;buf, "\nnew: ");</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(insert));</div><div class='del'>-</div><div class='del'>-			trace_data_update(c, buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret =   bch2_insert_snapshot_whiteouts(trans, m-&gt;btree_id,</div><div class='del'>-						k.k-&gt;p, bkey_start_pos(&amp;insert-&gt;k)) ?:</div><div class='del'>-			bch2_insert_snapshot_whiteouts(trans, m-&gt;btree_id,</div><div class='del'>-						k.k-&gt;p, insert-&gt;k.p) ?:</div><div class='del'>-			bch2_bkey_set_needs_rebalance(c, insert, &amp;op-&gt;opts) ?:</div><div class='del'>-			bch2_trans_update(trans, &amp;iter, insert,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?:</div><div class='del'>-			bch2_trans_commit(trans, &amp;op-&gt;res,</div><div class='del'>-				NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-				m-&gt;data_opts.btree_insert_flags);</div><div class='del'>-		if (!ret) {</div><div class='del'>-			bch2_btree_iter_set_pos(&amp;iter, next_pos);</div><div class='del'>-</div><div class='del'>-			this_cpu_add(c-&gt;counters[BCH_COUNTER_move_extent_finish], new-&gt;k.size);</div><div class='del'>-			trace_move_extent_finish2(c, bkey_i_to_s_c(&amp;new-&gt;k_i));</div><div class='del'>-		}</div><div class='del'>-err:</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			ret = 0;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-next:</div><div class='del'>-		while (bkey_ge(iter.pos, bch2_keylist_front(keys)-&gt;k.p)) {</div><div class='del'>-			bch2_keylist_pop_front(keys);</div><div class='del'>-			if (bch2_keylist_empty(keys))</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-		continue;</div><div class='del'>-nowork:</div><div class='del'>-		if (m-&gt;stats) {</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset &lt;= iter.pos.offset);</div><div class='del'>-			atomic64_inc(&amp;m-&gt;stats-&gt;keys_raced);</div><div class='del'>-			atomic64_add(k.k-&gt;p.offset - iter.pos.offset,</div><div class='del'>-				     &amp;m-&gt;stats-&gt;sectors_raced);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		count_event(c, move_extent_fail);</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-		goto next;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;_insert, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;_new, c);</div><div class='del'>-	BUG_ON(bch2_err_matches(ret, BCH_ERR_transaction_restart));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_data_update_index_update(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_run(op-&gt;c, __bch2_data_update_index_update(trans, op));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_data_update_read_done(struct data_update *m,</div><div class='del'>-				struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	/* write bio must own pages: */</div><div class='del'>-	BUG_ON(!m-&gt;op.wbio.bio.bi_vcnt);</div><div class='del'>-</div><div class='del'>-	m-&gt;op.crc = crc;</div><div class='del'>-	m-&gt;op.wbio.bio.bi_iter.bi_size = crc.compressed_size &lt;&lt; 9;</div><div class='del'>-</div><div class='del'>-	closure_call(&amp;m-&gt;op.cl, bch2_write, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_data_update_exit(struct data_update *update)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = update-&gt;op.c;</div><div class='del'>-	struct bkey_ptrs_c ptrs =</div><div class='del'>-		bch2_bkey_ptrs_c(bkey_i_to_s_c(update-&gt;k.k));</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-		if (c-&gt;opts.nocow_enabled)</div><div class='del'>-			bch2_bucket_nocow_unlock(&amp;c-&gt;nocow_locks,</div><div class='del'>-						 PTR_BUCKET_POS(c, ptr), 0);</div><div class='del'>-		percpu_ref_put(&amp;bch_dev_bkey_exists(c, ptr-&gt;dev)-&gt;ref);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;update-&gt;k, c);</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;update-&gt;op.res);</div><div class='del'>-	bch2_bio_free_pages_pool(c, &amp;update-&gt;op.wbio.bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_update_unwritten_extent(struct btree_trans *trans,</div><div class='del'>-				  struct data_update *update)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = update-&gt;op.c;</div><div class='del'>-	struct bio *bio = &amp;update-&gt;op.wbio.bio;</div><div class='del'>-	struct bkey_i_extent *e;</div><div class='del'>-	struct write_point *wp;</div><div class='del'>-	struct closure cl;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-	bch2_keylist_init(&amp;update-&gt;op.insert_keys, update-&gt;op.inline_keys);</div><div class='del'>-</div><div class='del'>-	while (bio_sectors(bio)) {</div><div class='del'>-		unsigned sectors = bio_sectors(bio);</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_init(trans, &amp;iter, update-&gt;btree_id, update-&gt;op.pos,</div><div class='del'>-				     BTREE_ITER_SLOTS);</div><div class='del'>-		ret = lockrestart_do(trans, ({</div><div class='del'>-			k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-			bkey_err(k);</div><div class='del'>-		}));</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-		if (ret || !bch2_extents_match(k, bkey_i_to_s_c(update-&gt;k.k)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		e = bkey_extent_init(update-&gt;op.insert_keys.top);</div><div class='del'>-		e-&gt;k.p = update-&gt;op.pos;</div><div class='del'>-</div><div class='del'>-		ret = bch2_alloc_sectors_start_trans(trans,</div><div class='del'>-				update-&gt;op.target,</div><div class='del'>-				false,</div><div class='del'>-				update-&gt;op.write_point,</div><div class='del'>-				&amp;update-&gt;op.devs_have,</div><div class='del'>-				update-&gt;op.nr_replicas,</div><div class='del'>-				update-&gt;op.nr_replicas,</div><div class='del'>-				update-&gt;op.watermark,</div><div class='del'>-				0, &amp;cl, &amp;wp);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_operation_blocked)) {</div><div class='del'>-			bch2_trans_unlock(trans);</div><div class='del'>-			closure_sync(&amp;cl);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch_err_fn_ratelimited(c, ret);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		sectors = min(sectors, wp-&gt;sectors_free);</div><div class='del'>-</div><div class='del'>-		bch2_key_resize(&amp;e-&gt;k, sectors);</div><div class='del'>-</div><div class='del'>-		bch2_open_bucket_get(c, wp, &amp;update-&gt;op.open_buckets);</div><div class='del'>-		bch2_alloc_sectors_append_ptrs(c, wp, &amp;e-&gt;k_i, sectors, false);</div><div class='del'>-		bch2_alloc_sectors_done(c, wp);</div><div class='del'>-</div><div class='del'>-		bio_advance(bio, sectors &lt;&lt; 9);</div><div class='del'>-		update-&gt;op.pos.offset += sectors;</div><div class='del'>-</div><div class='del'>-		extent_for_each_ptr(extent_i_to_s(e), ptr)</div><div class='del'>-			ptr-&gt;unwritten = true;</div><div class='del'>-		bch2_keylist_push(&amp;update-&gt;op.insert_keys);</div><div class='del'>-</div><div class='del'>-		ret = __bch2_data_update_index_update(trans, &amp;update-&gt;op);</div><div class='del'>-</div><div class='del'>-		bch2_open_buckets_put(c, &amp;update-&gt;op.open_buckets);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (closure_nr_remaining(&amp;cl) != 1) {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		closure_sync(&amp;cl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_extent_drop_ptrs(struct btree_trans *trans,</div><div class='del'>-			  struct btree_iter *iter,</div><div class='del'>-			  struct bkey_s_c k,</div><div class='del'>-			  struct data_update_opts data_opts)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_i *n;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	n = bch2_bkey_make_mut_noupdate(trans, k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	while (data_opts.kill_ptrs) {</div><div class='del'>-		unsigned i = 0, drop = __fls(data_opts.kill_ptrs);</div><div class='del'>-		struct bch_extent_ptr *ptr;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_drop_ptrs(bkey_i_to_s(n), ptr, i++ == drop);</div><div class='del'>-		data_opts.kill_ptrs ^= 1U &lt;&lt; drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the new extent no longer has any pointers, bch2_extent_normalize()</div><div class='del'>-	 * will do the appropriate thing with it (turning it into a</div><div class='del'>-	 * KEY_TYPE_error key, or just a discard if it was a cached extent)</div><div class='del'>-	 */</div><div class='del'>-	bch2_extent_normalize(c, bkey_i_to_s(n));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since we're not inserting through an extent iterator</div><div class='del'>-	 * (BTREE_ITER_ALL_SNAPSHOTS iterators aren't extent iterators),</div><div class='del'>-	 * we aren't using the extent overwrite path to delete, we're</div><div class='del'>-	 * just using the normal key deletion path:</div><div class='del'>-	 */</div><div class='del'>-	if (bkey_deleted(&amp;n-&gt;k) &amp;&amp; !(iter-&gt;flags &amp; BTREE_ITER_IS_EXTENTS))</div><div class='del'>-		n-&gt;k.size = 0;</div><div class='del'>-</div><div class='del'>-	return bch2_trans_relock(trans) ?:</div><div class='del'>-		bch2_trans_update(trans, iter, n, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_data_update_init(struct btree_trans *trans,</div><div class='del'>-			  struct btree_iter *iter,</div><div class='del'>-			  struct moving_context *ctxt,</div><div class='del'>-			  struct data_update *m,</div><div class='del'>-			  struct write_point_specifier wp,</div><div class='del'>-			  struct bch_io_opts io_opts,</div><div class='del'>-			  struct data_update_opts data_opts,</div><div class='del'>-			  enum btree_id btree_id,</div><div class='del'>-			  struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	unsigned i, reserve_sectors = k.k-&gt;size * data_opts.extra_replicas;</div><div class='del'>-	unsigned ptrs_locked = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;m-&gt;k);</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;m-&gt;k, c, k);</div><div class='del'>-	m-&gt;btree_id	= btree_id;</div><div class='del'>-	m-&gt;data_opts	= data_opts;</div><div class='del'>-	m-&gt;ctxt		= ctxt;</div><div class='del'>-	m-&gt;stats	= ctxt ? ctxt-&gt;stats : NULL;</div><div class='del'>-</div><div class='del'>-	bch2_write_op_init(&amp;m-&gt;op, c, io_opts);</div><div class='del'>-	m-&gt;op.pos	= bkey_start_pos(k.k);</div><div class='del'>-	m-&gt;op.version	= k.k-&gt;version;</div><div class='del'>-	m-&gt;op.target	= data_opts.target;</div><div class='del'>-	m-&gt;op.write_point = wp;</div><div class='del'>-	m-&gt;op.nr_replicas = 0;</div><div class='del'>-	m-&gt;op.flags	|= BCH_WRITE_PAGES_STABLE|</div><div class='del'>-		BCH_WRITE_PAGES_OWNED|</div><div class='del'>-		BCH_WRITE_DATA_ENCODED|</div><div class='del'>-		BCH_WRITE_MOVE|</div><div class='del'>-		m-&gt;data_opts.write_flags;</div><div class='del'>-	m-&gt;op.compression_opt	= background_compression(io_opts);</div><div class='del'>-	m-&gt;op.watermark		= m-&gt;data_opts.btree_insert_flags &amp; BCH_WATERMARK_MASK;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-		percpu_ref_get(&amp;bch_dev_bkey_exists(c, ptr-&gt;dev)-&gt;ref);</div><div class='del'>-</div><div class='del'>-	unsigned durability_have = 0, durability_removing = 0;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		bool locked;</div><div class='del'>-</div><div class='del'>-		if (((1U &lt;&lt; i) &amp; m-&gt;data_opts.rewrite_ptrs)) {</div><div class='del'>-			BUG_ON(p.ptr.cached);</div><div class='del'>-</div><div class='del'>-			if (crc_is_compressed(p.crc))</div><div class='del'>-				reserve_sectors += k.k-&gt;size;</div><div class='del'>-</div><div class='del'>-			m-&gt;op.nr_replicas += bch2_extent_ptr_desired_durability(c, &amp;p);</div><div class='del'>-			durability_removing += bch2_extent_ptr_desired_durability(c, &amp;p);</div><div class='del'>-		} else if (!p.ptr.cached &amp;&amp;</div><div class='del'>-			   !((1U &lt;&lt; i) &amp; m-&gt;data_opts.kill_ptrs)) {</div><div class='del'>-			bch2_dev_list_add_dev(&amp;m-&gt;op.devs_have, p.ptr.dev);</div><div class='del'>-			durability_have += bch2_extent_ptr_durability(c, &amp;p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * op-&gt;csum_type is normally initialized from the fs/file's</div><div class='del'>-		 * current options - but if an extent is encrypted, we require</div><div class='del'>-		 * that it stays encrypted:</div><div class='del'>-		 */</div><div class='del'>-		if (bch2_csum_type_is_encryption(p.crc.csum_type)) {</div><div class='del'>-			m-&gt;op.nonce	= p.crc.nonce + p.crc.offset;</div><div class='del'>-			m-&gt;op.csum_type = p.crc.csum_type;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (p.crc.compression_type == BCH_COMPRESSION_TYPE_incompressible)</div><div class='del'>-			m-&gt;op.incompressible = true;</div><div class='del'>-</div><div class='del'>-		if (c-&gt;opts.nocow_enabled) {</div><div class='del'>-			if (ctxt) {</div><div class='del'>-				move_ctxt_wait_event(ctxt,</div><div class='del'>-						(locked = bch2_bucket_nocow_trylock(&amp;c-&gt;nocow_locks,</div><div class='del'>-									  PTR_BUCKET_POS(c, &amp;p.ptr), 0)) ||</div><div class='del'>-						(!atomic_read(&amp;ctxt-&gt;read_sectors) &amp;&amp;</div><div class='del'>-						 !atomic_read(&amp;ctxt-&gt;write_sectors)));</div><div class='del'>-</div><div class='del'>-				if (!locked)</div><div class='del'>-					bch2_bucket_nocow_lock(&amp;c-&gt;nocow_locks,</div><div class='del'>-							       PTR_BUCKET_POS(c, &amp;p.ptr), 0);</div><div class='del'>-			} else {</div><div class='del'>-				if (!bch2_bucket_nocow_trylock(&amp;c-&gt;nocow_locks,</div><div class='del'>-							       PTR_BUCKET_POS(c, &amp;p.ptr), 0)) {</div><div class='del'>-					ret = -BCH_ERR_nocow_lock_blocked;</div><div class='del'>-					goto err;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			ptrs_locked |= (1U &lt;&lt; i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If current extent durability is less than io_opts.data_replicas,</div><div class='del'>-	 * we're not trying to rereplicate the extent up to data_replicas here -</div><div class='del'>-	 * unless extra_replicas was specified</div><div class='del'>-	 *</div><div class='del'>-	 * Increasing replication is an explicit operation triggered by</div><div class='del'>-	 * rereplicate, currently, so that users don't get an unexpected -ENOSPC</div><div class='del'>-	 */</div><div class='del'>-	if (!(m-&gt;data_opts.write_flags &amp; BCH_WRITE_CACHED) &amp;&amp;</div><div class='del'>-	    durability_have &gt;= io_opts.data_replicas) {</div><div class='del'>-		m-&gt;data_opts.kill_ptrs |= m-&gt;data_opts.rewrite_ptrs;</div><div class='del'>-		m-&gt;data_opts.rewrite_ptrs = 0;</div><div class='del'>-		/* if iter == NULL, it's just a promote */</div><div class='del'>-		if (iter)</div><div class='del'>-			ret = bch2_extent_drop_ptrs(trans, iter, k, m-&gt;data_opts);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	m-&gt;op.nr_replicas = min(durability_removing, io_opts.data_replicas - durability_have) +</div><div class='del'>-		m-&gt;data_opts.extra_replicas;</div><div class='del'>-	m-&gt;op.nr_replicas_required = m-&gt;op.nr_replicas;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!m-&gt;op.nr_replicas);</div><div class='del'>-</div><div class='del'>-	if (reserve_sectors) {</div><div class='del'>-		ret = bch2_disk_reservation_add(c, &amp;m-&gt;op.res, reserve_sectors,</div><div class='del'>-				m-&gt;data_opts.extra_replicas</div><div class='del'>-				? 0</div><div class='del'>-				: BCH_DISK_RESERVATION_NOFAIL);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bkey_extent_is_unwritten(k)) {</div><div class='del'>-		bch2_update_unwritten_extent(trans, m);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	i = 0;</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		if ((1U &lt;&lt; i) &amp; ptrs_locked)</div><div class='del'>-			bch2_bucket_nocow_unlock(&amp;c-&gt;nocow_locks,</div><div class='del'>-						 PTR_BUCKET_POS(c, &amp;p.ptr), 0);</div><div class='del'>-		percpu_ref_put(&amp;bch_dev_bkey_exists(c, p.ptr.dev)-&gt;ref);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;m-&gt;k, c);</div><div class='del'>-	bch2_bio_free_pages_pool(c, &amp;m-&gt;op.wbio.bio);</div><div class='del'>-	return ret;</div><div class='del'>-done:</div><div class='del'>-	bch2_data_update_exit(m);</div><div class='del'>-	return ret ?: -BCH_ERR_data_update_done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_data_update_opts_normalize(struct bkey_s_c k, struct data_update_opts *opts)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	unsigned i = 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-		if ((opts-&gt;rewrite_ptrs &amp; (1U &lt;&lt; i)) &amp;&amp; ptr-&gt;cached) {</div><div class='del'>-			opts-&gt;kill_ptrs |= 1U &lt;&lt; i;</div><div class='del'>-			opts-&gt;rewrite_ptrs ^= 1U &lt;&lt; i;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/data_update.h b/fs/bcachefs/data_update.h<br/>deleted file mode 100644<br/>index 991095bbd469..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/data_update.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/data_update.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-</div><div class='del'>-#ifndef _BCACHEFS_DATA_UPDATE_H</div><div class='del'>-#define _BCACHEFS_DATA_UPDATE_H</div><div class='del'>-</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "io_write_types.h"</div><div class='del'>-</div><div class='del'>-struct moving_context;</div><div class='del'>-</div><div class='del'>-struct data_update_opts {</div><div class='del'>-	unsigned	rewrite_ptrs;</div><div class='del'>-	unsigned	kill_ptrs;</div><div class='del'>-	u16		target;</div><div class='del'>-	u8		extra_replicas;</div><div class='del'>-	unsigned	btree_insert_flags;</div><div class='del'>-	unsigned	write_flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct data_update {</div><div class='del'>-	/* extent being updated: */</div><div class='del'>-	enum btree_id		btree_id;</div><div class='del'>-	struct bkey_buf		k;</div><div class='del'>-	struct data_update_opts	data_opts;</div><div class='del'>-	struct moving_context	*ctxt;</div><div class='del'>-	struct bch_move_stats	*stats;</div><div class='del'>-	struct bch_write_op	op;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_data_update_index_update(struct bch_write_op *);</div><div class='del'>-</div><div class='del'>-void bch2_data_update_read_done(struct data_update *,</div><div class='del'>-				struct bch_extent_crc_unpacked);</div><div class='del'>-</div><div class='del'>-int bch2_extent_drop_ptrs(struct btree_trans *,</div><div class='del'>-			  struct btree_iter *,</div><div class='del'>-			  struct bkey_s_c,</div><div class='del'>-			  struct data_update_opts);</div><div class='del'>-</div><div class='del'>-void bch2_data_update_exit(struct data_update *);</div><div class='del'>-int bch2_data_update_init(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			  struct moving_context *,</div><div class='del'>-			  struct data_update *,</div><div class='del'>-			  struct write_point_specifier,</div><div class='del'>-			  struct bch_io_opts, struct data_update_opts,</div><div class='del'>-			  enum btree_id, struct bkey_s_c);</div><div class='del'>-void bch2_data_update_opts_normalize(struct bkey_s_c, struct data_update_opts *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DATA_UPDATE_H */</div><div class='head'>diff --git a/fs/bcachefs/debug.c b/fs/bcachefs/debug.c<br/>deleted file mode 100644<br/>index cadda9bbe4a4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/debug.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/debug.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,935 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Assorted bcachefs debug code</div><div class='del'>- *</div><div class='del'>- * Copyright 2010, 2011 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "fsck.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-static struct dentry *bch_debug;</div><div class='del'>-</div><div class='del'>-static bool bch2_btree_verify_replica(struct bch_fs *c, struct btree *b,</div><div class='del'>-				      struct extent_ptr_decoded pick)</div><div class='del'>-{</div><div class='del'>-	struct btree *v = c-&gt;verify_data;</div><div class='del'>-	struct btree_node *n_ondisk = c-&gt;verify_ondisk;</div><div class='del'>-	struct btree_node *n_sorted = c-&gt;verify_data-&gt;data;</div><div class='del'>-	struct bset *sorted, *inmemory = &amp;b-&gt;data-&gt;keys;</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, pick.ptr.dev);</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	bool failed = false, saw_error = false;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_get_ioref(ca, READ))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(ca-&gt;disk_sb.bdev,</div><div class='del'>-			       buf_pages(n_sorted, btree_buf_bytes(b)),</div><div class='del'>-			       REQ_OP_READ|REQ_META,</div><div class='del'>-			       GFP_NOFS,</div><div class='del'>-			       &amp;c-&gt;btree_bio);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector	= pick.ptr.offset;</div><div class='del'>-	bch2_bio_map(bio, n_sorted, btree_buf_bytes(b));</div><div class='del'>-</div><div class='del'>-	submit_bio_wait(bio);</div><div class='del'>-</div><div class='del'>-	bio_put(bio);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-	memcpy(n_ondisk, n_sorted, btree_buf_bytes(b));</div><div class='del'>-</div><div class='del'>-	v-&gt;written = 0;</div><div class='del'>-	if (bch2_btree_node_read_done(c, ca, v, false, &amp;saw_error) || saw_error)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	n_sorted = c-&gt;verify_data-&gt;data;</div><div class='del'>-	sorted = &amp;n_sorted-&gt;keys;</div><div class='del'>-</div><div class='del'>-	if (inmemory-&gt;u64s != sorted-&gt;u64s ||</div><div class='del'>-	    memcmp(inmemory-&gt;start,</div><div class='del'>-		   sorted-&gt;start,</div><div class='del'>-		   vstruct_end(inmemory) - (void *) inmemory-&gt;start)) {</div><div class='del'>-		unsigned offset = 0, sectors;</div><div class='del'>-		struct bset *i;</div><div class='del'>-		unsigned j;</div><div class='del'>-</div><div class='del'>-		console_lock();</div><div class='del'>-</div><div class='del'>-		printk(KERN_ERR "*** in memory:\n");</div><div class='del'>-		bch2_dump_bset(c, b, inmemory, 0);</div><div class='del'>-</div><div class='del'>-		printk(KERN_ERR "*** read back in:\n");</div><div class='del'>-		bch2_dump_bset(c, v, sorted, 0);</div><div class='del'>-</div><div class='del'>-		while (offset &lt; v-&gt;written) {</div><div class='del'>-			if (!offset) {</div><div class='del'>-				i = &amp;n_ondisk-&gt;keys;</div><div class='del'>-				sectors = vstruct_blocks(n_ondisk, c-&gt;block_bits) &lt;&lt;</div><div class='del'>-					c-&gt;block_bits;</div><div class='del'>-			} else {</div><div class='del'>-				struct btree_node_entry *bne =</div><div class='del'>-					(void *) n_ondisk + (offset &lt;&lt; 9);</div><div class='del'>-				i = &amp;bne-&gt;keys;</div><div class='del'>-</div><div class='del'>-				sectors = vstruct_blocks(bne, c-&gt;block_bits) &lt;&lt;</div><div class='del'>-					c-&gt;block_bits;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			printk(KERN_ERR "*** on disk block %u:\n", offset);</div><div class='del'>-			bch2_dump_bset(c, b, i, offset);</div><div class='del'>-</div><div class='del'>-			offset += sectors;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; le16_to_cpu(inmemory-&gt;u64s); j++)</div><div class='del'>-			if (inmemory-&gt;_data[j] != sorted-&gt;_data[j])</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		console_unlock();</div><div class='del'>-		bch_err(c, "verify failed at key %u", j);</div><div class='del'>-</div><div class='del'>-		failed = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (v-&gt;written != b-&gt;written) {</div><div class='del'>-		bch_err(c, "written wrong: expected %u, got %u",</div><div class='del'>-			b-&gt;written, v-&gt;written);</div><div class='del'>-		failed = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return failed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_btree_verify(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct btree *v;</div><div class='del'>-	struct bset *inmemory = &amp;b-&gt;data-&gt;keys;</div><div class='del'>-	struct bkey_packed *k;</div><div class='del'>-	bool failed = false;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bch2_btree_node_io_lock(b);</div><div class='del'>-	mutex_lock(&amp;c-&gt;verify_lock);</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;verify_ondisk) {</div><div class='del'>-		c-&gt;verify_ondisk = kvpmalloc(btree_buf_bytes(b), GFP_KERNEL);</div><div class='del'>-		if (!c-&gt;verify_ondisk)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;verify_data) {</div><div class='del'>-		c-&gt;verify_data = __bch2_btree_node_mem_alloc(c);</div><div class='del'>-		if (!c-&gt;verify_data)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		list_del_init(&amp;c-&gt;verify_data-&gt;list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(b-&gt;nsets != 1);</div><div class='del'>-</div><div class='del'>-	for (k = inmemory-&gt;start; k != vstruct_last(inmemory); k = bkey_p_next(k))</div><div class='del'>-		if (k-&gt;type == KEY_TYPE_btree_ptr_v2)</div><div class='del'>-			((struct bch_btree_ptr_v2 *) bkeyp_val(&amp;b-&gt;format, k))-&gt;mem_ptr = 0;</div><div class='del'>-</div><div class='del'>-	v = c-&gt;verify_data;</div><div class='del'>-	bkey_copy(&amp;v-&gt;key, &amp;b-&gt;key);</div><div class='del'>-	v-&gt;c.level	= b-&gt;c.level;</div><div class='del'>-	v-&gt;c.btree_id	= b-&gt;c.btree_id;</div><div class='del'>-	bch2_btree_keys_init(v);</div><div class='del'>-</div><div class='del'>-	ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-	bkey_for_each_ptr_decode(&amp;b-&gt;key.k, ptrs, p, entry)</div><div class='del'>-		failed |= bch2_btree_verify_replica(c, b, p);</div><div class='del'>-</div><div class='del'>-	if (failed) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-		bch2_fs_fatal_error(c, "btree node verify failed for : %s\n", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;verify_lock);</div><div class='del'>-	bch2_btree_node_io_unlock(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_node_ondisk_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				    const struct btree *b)</div><div class='del'>-{</div><div class='del'>-	struct btree_node *n_ondisk = NULL;</div><div class='del'>-	struct extent_ptr_decoded pick;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct bio *bio = NULL;</div><div class='del'>-	unsigned offset = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (bch2_bkey_pick_read_device(c, bkey_i_to_s_c(&amp;b-&gt;key), NULL, &amp;pick) &lt;= 0) {</div><div class='del'>-		prt_printf(out, "error getting device to read from: invalid device\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, pick.ptr.dev);</div><div class='del'>-	if (!bch2_dev_get_ioref(ca, READ)) {</div><div class='del'>-		prt_printf(out, "error getting device to read from: not online\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n_ondisk = kvpmalloc(btree_buf_bytes(b), GFP_KERNEL);</div><div class='del'>-	if (!n_ondisk) {</div><div class='del'>-		prt_printf(out, "memory allocation failure\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(ca-&gt;disk_sb.bdev,</div><div class='del'>-			       buf_pages(n_ondisk, btree_buf_bytes(b)),</div><div class='del'>-			       REQ_OP_READ|REQ_META,</div><div class='del'>-			       GFP_NOFS,</div><div class='del'>-			       &amp;c-&gt;btree_bio);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector	= pick.ptr.offset;</div><div class='del'>-	bch2_bio_map(bio, n_ondisk, btree_buf_bytes(b));</div><div class='del'>-</div><div class='del'>-	ret = submit_bio_wait(bio);</div><div class='del'>-	if (ret) {</div><div class='del'>-		prt_printf(out, "IO error reading btree node: %s\n", bch2_err_str(ret));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (offset &lt; btree_sectors(c)) {</div><div class='del'>-		struct bset *i;</div><div class='del'>-		struct nonce nonce;</div><div class='del'>-		struct bch_csum csum;</div><div class='del'>-		struct bkey_packed *k;</div><div class='del'>-		unsigned sectors;</div><div class='del'>-</div><div class='del'>-		if (!offset) {</div><div class='del'>-			i = &amp;n_ondisk-&gt;keys;</div><div class='del'>-</div><div class='del'>-			if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i))) {</div><div class='del'>-				prt_printf(out, "unknown checksum type at offset %u: %llu\n",</div><div class='del'>-					   offset, BSET_CSUM_TYPE(i));</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			nonce = btree_nonce(i, offset &lt;&lt; 9);</div><div class='del'>-			csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, n_ondisk);</div><div class='del'>-</div><div class='del'>-			if (bch2_crc_cmp(csum, n_ondisk-&gt;csum)) {</div><div class='del'>-				prt_printf(out, "invalid checksum\n");</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bset_encrypt(c, i, offset &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			sectors = vstruct_sectors(n_ondisk, c-&gt;block_bits);</div><div class='del'>-		} else {</div><div class='del'>-			struct btree_node_entry *bne = (void *) n_ondisk + (offset &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			i = &amp;bne-&gt;keys;</div><div class='del'>-</div><div class='del'>-			if (i-&gt;seq != n_ondisk-&gt;keys.seq)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i))) {</div><div class='del'>-				prt_printf(out, "unknown checksum type at offset %u: %llu\n",</div><div class='del'>-					   offset, BSET_CSUM_TYPE(i));</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			nonce = btree_nonce(i, offset &lt;&lt; 9);</div><div class='del'>-			csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne);</div><div class='del'>-</div><div class='del'>-			if (bch2_crc_cmp(csum, bne-&gt;csum)) {</div><div class='del'>-				prt_printf(out, "invalid checksum");</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bset_encrypt(c, i, offset &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			sectors = vstruct_sectors(bne, c-&gt;block_bits);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "  offset %u version %u, journal seq %llu\n",</div><div class='del'>-			   offset,</div><div class='del'>-			   le16_to_cpu(i-&gt;version),</div><div class='del'>-			   le64_to_cpu(i-&gt;journal_seq));</div><div class='del'>-		offset += sectors;</div><div class='del'>-</div><div class='del'>-		printbuf_indent_add(out, 4);</div><div class='del'>-</div><div class='del'>-		for (k = i-&gt;start; k != vstruct_last(i); k = bkey_p_next(k)) {</div><div class='del'>-			struct bkey u;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_val_to_text(out, c, bkey_disassemble(b, k, &amp;u));</div><div class='del'>-			prt_newline(out);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printbuf_indent_sub(out, 4);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (bio)</div><div class='del'>-		bio_put(bio);</div><div class='del'>-	kvpfree(n_ondisk, btree_buf_bytes(b));</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-</div><div class='del'>-/* XXX: bch_fs refcounting */</div><div class='del'>-</div><div class='del'>-struct dump_iter {</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	enum btree_id		id;</div><div class='del'>-	struct bpos		from;</div><div class='del'>-	struct bpos		prev_node;</div><div class='del'>-	u64			iter;</div><div class='del'>-</div><div class='del'>-	struct printbuf		buf;</div><div class='del'>-</div><div class='del'>-	char __user		*ubuf;	/* destination user buffer */</div><div class='del'>-	size_t			size;	/* size of requested read */</div><div class='del'>-	ssize_t			ret;	/* bytes read so far */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t flush_buf(struct dump_iter *i)</div><div class='del'>-{</div><div class='del'>-	if (i-&gt;buf.pos) {</div><div class='del'>-		size_t bytes = min_t(size_t, i-&gt;buf.pos, i-&gt;size);</div><div class='del'>-		int copied = bytes - copy_to_user(i-&gt;ubuf, i-&gt;buf.buf, bytes);</div><div class='del'>-</div><div class='del'>-		i-&gt;ret	 += copied;</div><div class='del'>-		i-&gt;ubuf	 += copied;</div><div class='del'>-		i-&gt;size	 -= copied;</div><div class='del'>-		i-&gt;buf.pos -= copied;</div><div class='del'>-		memmove(i-&gt;buf.buf, i-&gt;buf.buf + copied, i-&gt;buf.pos);</div><div class='del'>-</div><div class='del'>-		if (copied != bytes)</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i-&gt;size ? 0 : i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dump_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct btree_debug *bd = inode-&gt;i_private;</div><div class='del'>-	struct dump_iter *i;</div><div class='del'>-</div><div class='del'>-	i = kzalloc(sizeof(struct dump_iter), GFP_KERNEL);</div><div class='del'>-	if (!i)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	file-&gt;private_data = i;</div><div class='del'>-	i-&gt;from = POS_MIN;</div><div class='del'>-	i-&gt;iter	= 0;</div><div class='del'>-	i-&gt;c	= container_of(bd, struct bch_fs, btree_debug[bd-&gt;id]);</div><div class='del'>-	i-&gt;id	= bd-&gt;id;</div><div class='del'>-	i-&gt;buf	= PRINTBUF;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dump_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;i-&gt;buf);</div><div class='del'>-	kfree(i);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_read_btree(struct file *file, char __user *buf,</div><div class='del'>-			       size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-</div><div class='del'>-	return flush_buf(i) ?:</div><div class='del'>-		bch2_trans_run(i-&gt;c,</div><div class='del'>-			for_each_btree_key(trans, iter, i-&gt;id, i-&gt;from,</div><div class='del'>-					   BTREE_ITER_PREFETCH|</div><div class='del'>-					   BTREE_ITER_ALL_SNAPSHOTS, k, ({</div><div class='del'>-				bch2_bkey_val_to_text(&amp;i-&gt;buf, i-&gt;c, k);</div><div class='del'>-				prt_newline(&amp;i-&gt;buf);</div><div class='del'>-				bch2_trans_unlock(trans);</div><div class='del'>-				i-&gt;from = bpos_successor(iter.pos);</div><div class='del'>-				flush_buf(i);</div><div class='del'>-			}))) ?:</div><div class='del'>-		i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations btree_debug_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_read_btree,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_read_btree_formats(struct file *file, char __user *buf,</div><div class='del'>-				       size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-</div><div class='del'>-	ret = flush_buf(i);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (bpos_eq(SPOS_MAX, i-&gt;from))</div><div class='del'>-		return i-&gt;ret;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(i-&gt;c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	for_each_btree_node(trans, iter, i-&gt;id, i-&gt;from, 0, b, ret) {</div><div class='del'>-		bch2_btree_node_to_text(&amp;i-&gt;buf, i-&gt;c, b);</div><div class='del'>-		i-&gt;from = !bpos_eq(SPOS_MAX, b-&gt;key.k.p)</div><div class='del'>-			? bpos_successor(b-&gt;key.k.p)</div><div class='del'>-			: b-&gt;key.k.p;</div><div class='del'>-</div><div class='del'>-		ret = drop_locks_do(trans, flush_buf(i));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-</div><div class='del'>-	return ret ?: i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations btree_format_debug_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_read_btree_formats,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,</div><div class='del'>-				       size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-</div><div class='del'>-	return flush_buf(i) ?:</div><div class='del'>-		bch2_trans_run(i-&gt;c,</div><div class='del'>-			for_each_btree_key(trans, iter, i-&gt;id, i-&gt;from,</div><div class='del'>-					   BTREE_ITER_PREFETCH|</div><div class='del'>-					   BTREE_ITER_ALL_SNAPSHOTS, k, ({</div><div class='del'>-				struct btree_path_level *l =</div><div class='del'>-					&amp;btree_iter_path(trans, &amp;iter)-&gt;l[0];</div><div class='del'>-				struct bkey_packed *_k =</div><div class='del'>-					bch2_btree_node_iter_peek(&amp;l-&gt;iter, l-&gt;b);</div><div class='del'>-</div><div class='del'>-				if (bpos_gt(l-&gt;b-&gt;key.k.p, i-&gt;prev_node)) {</div><div class='del'>-					bch2_btree_node_to_text(&amp;i-&gt;buf, i-&gt;c, l-&gt;b);</div><div class='del'>-					i-&gt;prev_node = l-&gt;b-&gt;key.k.p;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				bch2_bfloat_to_text(&amp;i-&gt;buf, l-&gt;b, _k);</div><div class='del'>-				bch2_trans_unlock(trans);</div><div class='del'>-				i-&gt;from = bpos_successor(iter.pos);</div><div class='del'>-				flush_buf(i);</div><div class='del'>-			}))) ?:</div><div class='del'>-		i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations bfloat_failed_debug_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_read_bfloat_failed,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_cached_btree_node_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					   struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (!out-&gt;nr_tabstops)</div><div class='del'>-		printbuf_tabstop_push(out, 32);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%px btree=%s l=%u ",</div><div class='del'>-	       b,</div><div class='del'>-	       bch2_btree_id_str(b-&gt;c.btree_id),</div><div class='del'>-	       b-&gt;c.level);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(&amp;b-&gt;key));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "flags: ");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_bitflags(out, bch2_btree_node_flags, b-&gt;flags);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "pcpu read locks: ");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", b-&gt;c.lock.readers != NULL);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "written:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", b-&gt;written);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "writes blocked:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", !list_empty_careful(&amp;b-&gt;write_blocked));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "will make reachable:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%lx", b-&gt;will_make_reachable);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "journal pin %px:", &amp;b-&gt;writes[0].journal);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", b-&gt;writes[0].journal.seq);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "journal pin %px:", &amp;b-&gt;writes[1].journal);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", b-&gt;writes[1].journal.seq);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_cached_btree_nodes_read(struct file *file, char __user *buf,</div><div class='del'>-					    size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-	struct bch_fs *c = i-&gt;c;</div><div class='del'>-	bool done = false;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct bucket_table *tbl;</div><div class='del'>-		struct rhash_head *pos;</div><div class='del'>-		struct btree *b;</div><div class='del'>-</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		i-&gt;buf.atomic++;</div><div class='del'>-		tbl = rht_dereference_rcu(c-&gt;btree_cache.table.tbl,</div><div class='del'>-					  &amp;c-&gt;btree_cache.table);</div><div class='del'>-		if (i-&gt;iter &lt; tbl-&gt;size) {</div><div class='del'>-			rht_for_each_entry_rcu(b, pos, tbl, i-&gt;iter, hash)</div><div class='del'>-				bch2_cached_btree_node_to_text(&amp;i-&gt;buf, c, b);</div><div class='del'>-			i-&gt;iter++;</div><div class='del'>-		} else {</div><div class='del'>-			done = true;</div><div class='del'>-		}</div><div class='del'>-		--i-&gt;buf.atomic;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	} while (!done);</div><div class='del'>-</div><div class='del'>-	if (i-&gt;buf.allocation_failure)</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-</div><div class='del'>-	return ret ?: i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations cached_btree_nodes_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_cached_btree_nodes_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_btree_transactions_read(struct file *file, char __user *buf,</div><div class='del'>-					    size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-	struct bch_fs *c = i-&gt;c;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-	u32 seq;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-restart:</div><div class='del'>-	seqmutex_lock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-	list_for_each_entry(trans, &amp;c-&gt;btree_trans_list, list) {</div><div class='del'>-		struct task_struct *task = READ_ONCE(trans-&gt;locking_wait.task);</div><div class='del'>-</div><div class='del'>-		if (!task || task-&gt;pid &lt;= i-&gt;iter)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		closure_get(&amp;trans-&gt;ref);</div><div class='del'>-		seq = seqmutex_seq(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-		seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-		if (ret) {</div><div class='del'>-			closure_put(&amp;trans-&gt;ref);</div><div class='del'>-			goto unlocked;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_btree_trans_to_text(&amp;i-&gt;buf, trans);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;i-&gt;buf, "backtrace:");</div><div class='del'>-		prt_newline(&amp;i-&gt;buf);</div><div class='del'>-		printbuf_indent_add(&amp;i-&gt;buf, 2);</div><div class='del'>-		bch2_prt_task_backtrace(&amp;i-&gt;buf, task, 0);</div><div class='del'>-		printbuf_indent_sub(&amp;i-&gt;buf, 2);</div><div class='del'>-		prt_newline(&amp;i-&gt;buf);</div><div class='del'>-</div><div class='del'>-		i-&gt;iter = task-&gt;pid;</div><div class='del'>-</div><div class='del'>-		closure_put(&amp;trans-&gt;ref);</div><div class='del'>-</div><div class='del'>-		if (!seqmutex_relock(&amp;c-&gt;btree_trans_lock, seq))</div><div class='del'>-			goto restart;</div><div class='del'>-	}</div><div class='del'>-	seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-unlocked:</div><div class='del'>-	if (i-&gt;buf.allocation_failure)</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-</div><div class='del'>-	return ret ?: i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations btree_transactions_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_btree_transactions_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_journal_pins_read(struct file *file, char __user *buf,</div><div class='del'>-				      size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-	struct bch_fs *c = i-&gt;c;</div><div class='del'>-	bool done = false;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		err = flush_buf(i);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (!i-&gt;size)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		done = bch2_journal_seq_pins_to_text(&amp;i-&gt;buf, &amp;c-&gt;journal, &amp;i-&gt;iter);</div><div class='del'>-		i-&gt;iter++;</div><div class='del'>-	} while (!done);</div><div class='del'>-</div><div class='del'>-	if (i-&gt;buf.allocation_failure)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations journal_pins_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_journal_pins_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int btree_transaction_stats_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;i_private;</div><div class='del'>-	struct dump_iter *i;</div><div class='del'>-</div><div class='del'>-	i = kzalloc(sizeof(struct dump_iter), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!i)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	i-&gt;iter = 1;</div><div class='del'>-	i-&gt;c    = c;</div><div class='del'>-	i-&gt;buf  = PRINTBUF;</div><div class='del'>-	file-&gt;private_data = i;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btree_transaction_stats_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;i-&gt;buf);</div><div class='del'>-	kfree(i);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t btree_transaction_stats_read(struct file *file, char __user *buf,</div><div class='del'>-					    size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter        *i = file-&gt;private_data;</div><div class='del'>-	struct bch_fs *c = i-&gt;c;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size = size;</div><div class='del'>-	i-&gt;ret  = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		struct btree_transaction_stats *s = &amp;c-&gt;btree_transaction_stats[i-&gt;iter];</div><div class='del'>-</div><div class='del'>-		err = flush_buf(i);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (!i-&gt;size)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (i-&gt;iter == ARRAY_SIZE(bch2_btree_transaction_fns) ||</div><div class='del'>-		    !bch2_btree_transaction_fns[i-&gt;iter])</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;i-&gt;buf, "%s: ", bch2_btree_transaction_fns[i-&gt;iter]);</div><div class='del'>-		prt_newline(&amp;i-&gt;buf);</div><div class='del'>-		printbuf_indent_add(&amp;i-&gt;buf, 2);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;i-&gt;buf, "Max mem used: %u", s-&gt;max_mem);</div><div class='del'>-		prt_newline(&amp;i-&gt;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;i-&gt;buf, "Transaction duration:");</div><div class='del'>-		prt_newline(&amp;i-&gt;buf);</div><div class='del'>-</div><div class='del'>-		printbuf_indent_add(&amp;i-&gt;buf, 2);</div><div class='del'>-		bch2_time_stats_to_text(&amp;i-&gt;buf, &amp;s-&gt;duration);</div><div class='del'>-		printbuf_indent_sub(&amp;i-&gt;buf, 2);</div><div class='del'>-</div><div class='del'>-		if (IS_ENABLED(CONFIG_BCACHEFS_LOCK_TIME_STATS)) {</div><div class='del'>-			prt_printf(&amp;i-&gt;buf, "Lock hold times:");</div><div class='del'>-			prt_newline(&amp;i-&gt;buf);</div><div class='del'>-</div><div class='del'>-			printbuf_indent_add(&amp;i-&gt;buf, 2);</div><div class='del'>-			bch2_time_stats_to_text(&amp;i-&gt;buf, &amp;s-&gt;lock_hold_times);</div><div class='del'>-			printbuf_indent_sub(&amp;i-&gt;buf, 2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (s-&gt;max_paths_text) {</div><div class='del'>-			prt_printf(&amp;i-&gt;buf, "Maximum allocated btree paths (%u):", s-&gt;nr_max_paths);</div><div class='del'>-			prt_newline(&amp;i-&gt;buf);</div><div class='del'>-</div><div class='del'>-			printbuf_indent_add(&amp;i-&gt;buf, 2);</div><div class='del'>-			prt_str_indented(&amp;i-&gt;buf, s-&gt;max_paths_text);</div><div class='del'>-			printbuf_indent_sub(&amp;i-&gt;buf, 2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-		printbuf_indent_sub(&amp;i-&gt;buf, 2);</div><div class='del'>-		prt_newline(&amp;i-&gt;buf);</div><div class='del'>-		i-&gt;iter++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i-&gt;buf.allocation_failure)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations btree_transaction_stats_op = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= btree_transaction_stats_open,</div><div class='del'>-	.release	= btree_transaction_stats_release,</div><div class='del'>-	.read		= btree_transaction_stats_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_btree_deadlock_read(struct file *file, char __user *buf,</div><div class='del'>-					    size_t size, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct dump_iter *i = file-&gt;private_data;</div><div class='del'>-	struct bch_fs *c = i-&gt;c;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-	u32 seq;</div><div class='del'>-</div><div class='del'>-	i-&gt;ubuf = buf;</div><div class='del'>-	i-&gt;size	= size;</div><div class='del'>-	i-&gt;ret	= 0;</div><div class='del'>-</div><div class='del'>-	if (i-&gt;iter)</div><div class='del'>-		goto out;</div><div class='del'>-restart:</div><div class='del'>-	seqmutex_lock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-	list_for_each_entry(trans, &amp;c-&gt;btree_trans_list, list) {</div><div class='del'>-		struct task_struct *task = READ_ONCE(trans-&gt;locking_wait.task);</div><div class='del'>-</div><div class='del'>-		if (!task || task-&gt;pid &lt;= i-&gt;iter)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		closure_get(&amp;trans-&gt;ref);</div><div class='del'>-		seq = seqmutex_seq(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-		seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-		if (ret) {</div><div class='del'>-			closure_put(&amp;trans-&gt;ref);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_check_for_deadlock(trans, &amp;i-&gt;buf);</div><div class='del'>-</div><div class='del'>-		i-&gt;iter = task-&gt;pid;</div><div class='del'>-</div><div class='del'>-		closure_put(&amp;trans-&gt;ref);</div><div class='del'>-</div><div class='del'>-		if (!seqmutex_relock(&amp;c-&gt;btree_trans_lock, seq))</div><div class='del'>-			goto restart;</div><div class='del'>-	}</div><div class='del'>-	seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-out:</div><div class='del'>-	if (i-&gt;buf.allocation_failure)</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = flush_buf(i);</div><div class='del'>-</div><div class='del'>-	return ret ?: i-&gt;ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations btree_deadlock_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= bch2_dump_open,</div><div class='del'>-	.release	= bch2_dump_release,</div><div class='del'>-	.read		= bch2_btree_deadlock_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_fs_debug_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR_OR_NULL(c-&gt;fs_debug_dir))</div><div class='del'>-		debugfs_remove_recursive(c-&gt;fs_debug_dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_debug_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_debug *bd;</div><div class='del'>-	char name[100];</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_OR_NULL(bch_debug))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	snprintf(name, sizeof(name), "%pU", c-&gt;sb.user_uuid.b);</div><div class='del'>-	c-&gt;fs_debug_dir = debugfs_create_dir(name, bch_debug);</div><div class='del'>-	if (IS_ERR_OR_NULL(c-&gt;fs_debug_dir))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("cached_btree_nodes", 0400, c-&gt;fs_debug_dir,</div><div class='del'>-			    c-&gt;btree_debug, &amp;cached_btree_nodes_ops);</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("btree_transactions", 0400, c-&gt;fs_debug_dir,</div><div class='del'>-			    c-&gt;btree_debug, &amp;btree_transactions_ops);</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("journal_pins", 0400, c-&gt;fs_debug_dir,</div><div class='del'>-			    c-&gt;btree_debug, &amp;journal_pins_ops);</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("btree_transaction_stats", 0400, c-&gt;fs_debug_dir,</div><div class='del'>-			    c, &amp;btree_transaction_stats_op);</div><div class='del'>-</div><div class='del'>-	debugfs_create_file("btree_deadlock", 0400, c-&gt;fs_debug_dir,</div><div class='del'>-			    c-&gt;btree_debug, &amp;btree_deadlock_ops);</div><div class='del'>-</div><div class='del'>-	c-&gt;btree_debug_dir = debugfs_create_dir("btrees", c-&gt;fs_debug_dir);</div><div class='del'>-	if (IS_ERR_OR_NULL(c-&gt;btree_debug_dir))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (bd = c-&gt;btree_debug;</div><div class='del'>-	     bd &lt; c-&gt;btree_debug + ARRAY_SIZE(c-&gt;btree_debug);</div><div class='del'>-	     bd++) {</div><div class='del'>-		bd-&gt;id = bd - c-&gt;btree_debug;</div><div class='del'>-		debugfs_create_file(bch2_btree_id_str(bd-&gt;id),</div><div class='del'>-				    0400, c-&gt;btree_debug_dir, bd,</div><div class='del'>-				    &amp;btree_debug_ops);</div><div class='del'>-</div><div class='del'>-		snprintf(name, sizeof(name), "%s-formats",</div><div class='del'>-			 bch2_btree_id_str(bd-&gt;id));</div><div class='del'>-</div><div class='del'>-		debugfs_create_file(name, 0400, c-&gt;btree_debug_dir, bd,</div><div class='del'>-				    &amp;btree_format_debug_ops);</div><div class='del'>-</div><div class='del'>-		snprintf(name, sizeof(name), "%s-bfloat-failed",</div><div class='del'>-			 bch2_btree_id_str(bd-&gt;id));</div><div class='del'>-</div><div class='del'>-		debugfs_create_file(name, 0400, c-&gt;btree_debug_dir, bd,</div><div class='del'>-				    &amp;bfloat_failed_debug_ops);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_debug_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR_OR_NULL(bch_debug))</div><div class='del'>-		debugfs_remove_recursive(bch_debug);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init bch2_debug_init(void)</div><div class='del'>-{</div><div class='del'>-	bch_debug = debugfs_create_dir("bcachefs", NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/debug.h b/fs/bcachefs/debug.h<br/>deleted file mode 100644<br/>index 2c37143b5fd1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/debug.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/debug.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_DEBUG_H</div><div class='del'>-#define _BCACHEFS_DEBUG_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-</div><div class='del'>-struct bio;</div><div class='del'>-struct btree;</div><div class='del'>-struct bch_fs;</div><div class='del'>-</div><div class='del'>-void __bch2_btree_verify(struct bch_fs *, struct btree *);</div><div class='del'>-void bch2_btree_node_ondisk_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-				    const struct btree *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_btree_verify(struct bch_fs *c, struct btree *b)</div><div class='del'>-{</div><div class='del'>-	if (bch2_verify_btree_ondisk)</div><div class='del'>-		__bch2_btree_verify(c, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-void bch2_fs_debug_exit(struct bch_fs *);</div><div class='del'>-void bch2_fs_debug_init(struct bch_fs *);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_fs_debug_exit(struct bch_fs *c) {}</div><div class='del'>-static inline void bch2_fs_debug_init(struct bch_fs *c) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_debug_exit(void);</div><div class='del'>-int bch2_debug_init(void);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DEBUG_H */</div><div class='head'>diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c<br/>deleted file mode 100644<br/>index 4ae1e9f002a0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/dirent.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/dirent.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,603 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "str_hash.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dcache.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned bch2_dirent_name_bytes(struct bkey_s_c_dirent d)</div><div class='del'>-{</div><div class='del'>-	unsigned bkey_u64s = bkey_val_u64s(d.k);</div><div class='del'>-	unsigned bkey_bytes = bkey_u64s * sizeof(u64);</div><div class='del'>-	u64 last_u64 = ((u64*)d.v)[bkey_u64s - 1];</div><div class='del'>-#if CPU_BIG_ENDIAN</div><div class='del'>-	unsigned trailing_nuls = last_u64 ? __builtin_ctzll(last_u64) / 8 : 64 / 8;</div><div class='del'>-#else</div><div class='del'>-	unsigned trailing_nuls = last_u64 ? __builtin_clzll(last_u64) / 8 : 64 / 8;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return bkey_bytes -</div><div class='del'>-		offsetof(struct bch_dirent, d_name) -</div><div class='del'>-		trailing_nuls;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct qstr bch2_dirent_get_name(struct bkey_s_c_dirent d)</div><div class='del'>-{</div><div class='del'>-	return (struct qstr) QSTR_INIT(d.v-&gt;d_name, bch2_dirent_name_bytes(d));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 bch2_dirent_hash(const struct bch_hash_info *info,</div><div class='del'>-			    const struct qstr *name)</div><div class='del'>-{</div><div class='del'>-	struct bch_str_hash_ctx ctx;</div><div class='del'>-</div><div class='del'>-	bch2_str_hash_init(&amp;ctx, info);</div><div class='del'>-	bch2_str_hash_update(&amp;ctx, info, name-&gt;name, name-&gt;len);</div><div class='del'>-</div><div class='del'>-	/* [0,2) reserved for dots */</div><div class='del'>-	return max_t(u64, bch2_str_hash_end(&amp;ctx, info), 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 dirent_hash_key(const struct bch_hash_info *info, const void *key)</div><div class='del'>-{</div><div class='del'>-	return bch2_dirent_hash(info, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 dirent_hash_bkey(const struct bch_hash_info *info, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);</div><div class='del'>-	struct qstr name = bch2_dirent_get_name(d);</div><div class='del'>-</div><div class='del'>-	return bch2_dirent_hash(info, &amp;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dirent_cmp_key(struct bkey_s_c _l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_dirent l = bkey_s_c_to_dirent(_l);</div><div class='del'>-	const struct qstr l_name = bch2_dirent_get_name(l);</div><div class='del'>-	const struct qstr *r_name = _r;</div><div class='del'>-</div><div class='del'>-	return !qstr_eq(l_name, *r_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dirent_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_dirent l = bkey_s_c_to_dirent(_l);</div><div class='del'>-	struct bkey_s_c_dirent r = bkey_s_c_to_dirent(_r);</div><div class='del'>-	const struct qstr l_name = bch2_dirent_get_name(l);</div><div class='del'>-	const struct qstr r_name = bch2_dirent_get_name(r);</div><div class='del'>-</div><div class='del'>-	return !qstr_eq(l_name, r_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dirent_is_visible(subvol_inum inum, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);</div><div class='del'>-</div><div class='del'>-	if (d.v-&gt;d_type == DT_SUBVOL)</div><div class='del'>-		return le32_to_cpu(d.v-&gt;d_parent_subvol) == inum.subvol;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_hash_desc bch2_dirent_hash_desc = {</div><div class='del'>-	.btree_id	= BTREE_ID_dirents,</div><div class='del'>-	.key_type	= KEY_TYPE_dirent,</div><div class='del'>-	.hash_key	= dirent_hash_key,</div><div class='del'>-	.hash_bkey	= dirent_hash_bkey,</div><div class='del'>-	.cmp_key	= dirent_cmp_key,</div><div class='del'>-	.cmp_bkey	= dirent_cmp_bkey,</div><div class='del'>-	.is_visible	= dirent_is_visible,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_dirent_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			enum bkey_invalid_flags flags,</div><div class='del'>-			struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);</div><div class='del'>-	struct qstr d_name = bch2_dirent_get_name(d);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!d_name.len, c, err,</div><div class='del'>-			 dirent_empty_name,</div><div class='del'>-			 "empty name");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(k.k) &gt; dirent_val_u64s(d_name.len), c, err,</div><div class='del'>-			 dirent_val_too_big,</div><div class='del'>-			 "value too big (%zu &gt; %u)",</div><div class='del'>-			 bkey_val_u64s(k.k), dirent_val_u64s(d_name.len));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check new keys don't exceed the max length</div><div class='del'>-	 * (older keys may be larger.)</div><div class='del'>-	 */</div><div class='del'>-	bkey_fsck_err_on((flags &amp; BKEY_INVALID_COMMIT) &amp;&amp; d_name.len &gt; BCH_NAME_MAX, c, err,</div><div class='del'>-			 dirent_name_too_long,</div><div class='del'>-			 "dirent name too big (%u &gt; %u)",</div><div class='del'>-			 d_name.len, BCH_NAME_MAX);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(d_name.len != strnlen(d_name.name, d_name.len), c, err,</div><div class='del'>-			 dirent_name_embedded_nul,</div><div class='del'>-			 "dirent has stray data after name's NUL");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on((d_name.len == 1 &amp;&amp; !memcmp(d_name.name, ".", 1)) ||</div><div class='del'>-			 (d_name.len == 2 &amp;&amp; !memcmp(d_name.name, "..", 2)), c, err,</div><div class='del'>-			 dirent_name_dot_or_dotdot,</div><div class='del'>-			 "invalid name");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(memchr(d_name.name, '/', d_name.len), c, err,</div><div class='del'>-			 dirent_name_has_slash,</div><div class='del'>-			 "name with /");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(d.v-&gt;d_type != DT_SUBVOL &amp;&amp;</div><div class='del'>-			 le64_to_cpu(d.v-&gt;d_inum) == d.k-&gt;p.inode, c, err,</div><div class='del'>-			 dirent_to_itself,</div><div class='del'>-			 "dirent points to own directory");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dirent_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			 struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);</div><div class='del'>-	struct qstr d_name = bch2_dirent_get_name(d);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%.*s -&gt; %llu type %s",</div><div class='del'>-	       d_name.len,</div><div class='del'>-	       d_name.name,</div><div class='del'>-	       d.v-&gt;d_type != DT_SUBVOL</div><div class='del'>-	       ? le64_to_cpu(d.v-&gt;d_inum)</div><div class='del'>-	       : le32_to_cpu(d.v-&gt;d_child_subvol),</div><div class='del'>-	       bch2_d_type_str(d.v-&gt;d_type));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_i_dirent *dirent_create_key(struct btree_trans *trans,</div><div class='del'>-				subvol_inum dir, u8 type,</div><div class='del'>-				const struct qstr *name, u64 dst)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_dirent *dirent;</div><div class='del'>-	unsigned u64s = BKEY_U64s + dirent_val_u64s(name-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (name-&gt;len &gt; BCH_NAME_MAX)</div><div class='del'>-		return ERR_PTR(-ENAMETOOLONG);</div><div class='del'>-</div><div class='del'>-	BUG_ON(u64s &gt; U8_MAX);</div><div class='del'>-</div><div class='del'>-	dirent = bch2_trans_kmalloc(trans, u64s * sizeof(u64));</div><div class='del'>-	if (IS_ERR(dirent))</div><div class='del'>-		return dirent;</div><div class='del'>-</div><div class='del'>-	bkey_dirent_init(&amp;dirent-&gt;k_i);</div><div class='del'>-	dirent-&gt;k.u64s = u64s;</div><div class='del'>-</div><div class='del'>-	if (type != DT_SUBVOL) {</div><div class='del'>-		dirent-&gt;v.d_inum = cpu_to_le64(dst);</div><div class='del'>-	} else {</div><div class='del'>-		dirent-&gt;v.d_parent_subvol = cpu_to_le32(dir.subvol);</div><div class='del'>-		dirent-&gt;v.d_child_subvol = cpu_to_le32(dst);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dirent-&gt;v.d_type = type;</div><div class='del'>-</div><div class='del'>-	memcpy(dirent-&gt;v.d_name, name-&gt;name, name-&gt;len);</div><div class='del'>-	memset(dirent-&gt;v.d_name + name-&gt;len, 0,</div><div class='del'>-	       bkey_val_bytes(&amp;dirent-&gt;k) -</div><div class='del'>-	       offsetof(struct bch_dirent, d_name) -</div><div class='del'>-	       name-&gt;len);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bch2_dirent_name_bytes(dirent_i_to_s_c(dirent)) != name-&gt;len);</div><div class='del'>-</div><div class='del'>-	return dirent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dirent_create_snapshot(struct btree_trans *trans,</div><div class='del'>-			u64 dir, u32 snapshot,</div><div class='del'>-			const struct bch_hash_info *hash_info,</div><div class='del'>-			u8 type, const struct qstr *name, u64 dst_inum,</div><div class='del'>-			u64 *dir_offset,</div><div class='del'>-			bch_str_hash_flags_t str_hash_flags)</div><div class='del'>-{</div><div class='del'>-	subvol_inum zero_inum = { 0 };</div><div class='del'>-	struct bkey_i_dirent *dirent;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dirent = dirent_create_key(trans, zero_inum, type, name, dst_inum);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(dirent);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	dirent-&gt;k.p.inode	= dir;</div><div class='del'>-	dirent-&gt;k.p.snapshot	= snapshot;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_set_snapshot(trans, bch2_dirent_hash_desc, hash_info,</div><div class='del'>-				     zero_inum, snapshot,</div><div class='del'>-				     &amp;dirent-&gt;k_i, str_hash_flags,</div><div class='del'>-				     BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-	*dir_offset = dirent-&gt;k.p.offset;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dirent_create(struct btree_trans *trans, subvol_inum dir,</div><div class='del'>-		       const struct bch_hash_info *hash_info,</div><div class='del'>-		       u8 type, const struct qstr *name, u64 dst_inum,</div><div class='del'>-		       u64 *dir_offset,</div><div class='del'>-		       bch_str_hash_flags_t str_hash_flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_dirent *dirent;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dirent = dirent_create_key(trans, dir, type, name, dst_inum);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(dirent);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_set(trans, bch2_dirent_hash_desc, hash_info,</div><div class='del'>-			    dir, &amp;dirent-&gt;k_i, str_hash_flags);</div><div class='del'>-	*dir_offset = dirent-&gt;k.p.offset;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dirent_copy_target(struct bkey_i_dirent *dst,</div><div class='del'>-			       struct bkey_s_c_dirent src)</div><div class='del'>-{</div><div class='del'>-	dst-&gt;v.d_inum = src.v-&gt;d_inum;</div><div class='del'>-	dst-&gt;v.d_type = src.v-&gt;d_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dirent_read_target(struct btree_trans *trans, subvol_inum dir,</div><div class='del'>-			    struct bkey_s_c_dirent d, subvol_inum *target)</div><div class='del'>-{</div><div class='del'>-	struct bch_subvolume s;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (d.v-&gt;d_type == DT_SUBVOL &amp;&amp;</div><div class='del'>-	    le32_to_cpu(d.v-&gt;d_parent_subvol) != dir.subvol)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (likely(d.v-&gt;d_type != DT_SUBVOL)) {</div><div class='del'>-		target-&gt;subvol	= dir.subvol;</div><div class='del'>-		target-&gt;inum	= le64_to_cpu(d.v-&gt;d_inum);</div><div class='del'>-	} else {</div><div class='del'>-		target-&gt;subvol	= le32_to_cpu(d.v-&gt;d_child_subvol);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get(trans, target-&gt;subvol, true, BTREE_ITER_CACHED, &amp;s);</div><div class='del'>-</div><div class='del'>-		target-&gt;inum	= le64_to_cpu(s.inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dirent_rename(struct btree_trans *trans,</div><div class='del'>-		subvol_inum src_dir, struct bch_hash_info *src_hash,</div><div class='del'>-		subvol_inum dst_dir, struct bch_hash_info *dst_hash,</div><div class='del'>-		const struct qstr *src_name, subvol_inum *src_inum, u64 *src_offset,</div><div class='del'>-		const struct qstr *dst_name, subvol_inum *dst_inum, u64 *dst_offset,</div><div class='del'>-		enum bch_rename_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter src_iter = { NULL };</div><div class='del'>-	struct btree_iter dst_iter = { NULL };</div><div class='del'>-	struct bkey_s_c old_src, old_dst = bkey_s_c_null;</div><div class='del'>-	struct bkey_i_dirent *new_src = NULL, *new_dst = NULL;</div><div class='del'>-	struct bpos dst_pos =</div><div class='del'>-		POS(dst_dir.inum, bch2_dirent_hash(dst_hash, dst_name));</div><div class='del'>-	unsigned src_type = 0, dst_type = 0, src_update_flags = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (src_dir.subvol != dst_dir.subvol)</div><div class='del'>-		return -EXDEV;</div><div class='del'>-</div><div class='del'>-	memset(src_inum, 0, sizeof(*src_inum));</div><div class='del'>-	memset(dst_inum, 0, sizeof(*dst_inum));</div><div class='del'>-</div><div class='del'>-	/* Lookup src: */</div><div class='del'>-	ret = bch2_hash_lookup(trans, &amp;src_iter, bch2_dirent_hash_desc,</div><div class='del'>-			       src_hash, src_dir, src_name,</div><div class='del'>-			       BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	old_src = bch2_btree_iter_peek_slot(&amp;src_iter);</div><div class='del'>-	ret = bkey_err(old_src);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_read_target(trans, src_dir,</div><div class='del'>-			bkey_s_c_to_dirent(old_src), src_inum);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	src_type = bkey_s_c_to_dirent(old_src).v-&gt;d_type;</div><div class='del'>-</div><div class='del'>-	if (src_type == DT_SUBVOL &amp;&amp; mode == BCH_RENAME_EXCHANGE)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Lookup dst: */</div><div class='del'>-	if (mode == BCH_RENAME) {</div><div class='del'>-		/*</div><div class='del'>-		 * Note that we're _not_ checking if the target already exists -</div><div class='del'>-		 * we're relying on the VFS to do that check for us for</div><div class='del'>-		 * correctness:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_hash_hole(trans, &amp;dst_iter, bch2_dirent_hash_desc,</div><div class='del'>-				     dst_hash, dst_dir, dst_name);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	} else {</div><div class='del'>-		ret = bch2_hash_lookup(trans, &amp;dst_iter, bch2_dirent_hash_desc,</div><div class='del'>-				       dst_hash, dst_dir, dst_name,</div><div class='del'>-				       BTREE_ITER_INTENT);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		old_dst = bch2_btree_iter_peek_slot(&amp;dst_iter);</div><div class='del'>-		ret = bkey_err(old_dst);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ret = bch2_dirent_read_target(trans, dst_dir,</div><div class='del'>-				bkey_s_c_to_dirent(old_dst), dst_inum);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		dst_type = bkey_s_c_to_dirent(old_dst).v-&gt;d_type;</div><div class='del'>-</div><div class='del'>-		if (dst_type == DT_SUBVOL)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode != BCH_RENAME_EXCHANGE)</div><div class='del'>-		*src_offset = dst_iter.pos.offset;</div><div class='del'>-</div><div class='del'>-	/* Create new dst key: */</div><div class='del'>-	new_dst = dirent_create_key(trans, dst_dir, 0, dst_name, 0);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(new_dst);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	dirent_copy_target(new_dst, bkey_s_c_to_dirent(old_src));</div><div class='del'>-	new_dst-&gt;k.p = dst_iter.pos;</div><div class='del'>-</div><div class='del'>-	/* Create new src key: */</div><div class='del'>-	if (mode == BCH_RENAME_EXCHANGE) {</div><div class='del'>-		new_src = dirent_create_key(trans, src_dir, 0, src_name, 0);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(new_src);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		dirent_copy_target(new_src, bkey_s_c_to_dirent(old_dst));</div><div class='del'>-		new_src-&gt;k.p = src_iter.pos;</div><div class='del'>-	} else {</div><div class='del'>-		new_src = bch2_trans_kmalloc(trans, sizeof(struct bkey_i));</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(new_src);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;new_src-&gt;k);</div><div class='del'>-		new_src-&gt;k.p = src_iter.pos;</div><div class='del'>-</div><div class='del'>-		if (bkey_le(dst_pos, src_iter.pos) &amp;&amp;</div><div class='del'>-		    bkey_lt(src_iter.pos, dst_iter.pos)) {</div><div class='del'>-			/*</div><div class='del'>-			 * We have a hash collision for the new dst key,</div><div class='del'>-			 * and new_src - the key we're deleting - is between</div><div class='del'>-			 * new_dst's hashed slot and the slot we're going to be</div><div class='del'>-			 * inserting it into - oops.  This will break the hash</div><div class='del'>-			 * table if we don't deal with it:</div><div class='del'>-			 */</div><div class='del'>-			if (mode == BCH_RENAME) {</div><div class='del'>-				/*</div><div class='del'>-				 * If we're not overwriting, we can just insert</div><div class='del'>-				 * new_dst at the src position:</div><div class='del'>-				 */</div><div class='del'>-				new_src = new_dst;</div><div class='del'>-				new_src-&gt;k.p = src_iter.pos;</div><div class='del'>-				goto out_set_src;</div><div class='del'>-			} else {</div><div class='del'>-				/* If we're overwriting, we can't insert new_dst</div><div class='del'>-				 * at a different slot because it has to</div><div class='del'>-				 * overwrite old_dst - just make sure to use a</div><div class='del'>-				 * whiteout when deleting src:</div><div class='del'>-				 */</div><div class='del'>-				new_src-&gt;k.type = KEY_TYPE_hash_whiteout;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* Check if we need a whiteout to delete src: */</div><div class='del'>-			ret = bch2_hash_needs_whiteout(trans, bch2_dirent_hash_desc,</div><div class='del'>-						       src_hash, &amp;src_iter);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			if (ret)</div><div class='del'>-				new_src-&gt;k.type = KEY_TYPE_hash_whiteout;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;dst_iter, &amp;new_dst-&gt;k_i, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-out_set_src:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're deleting a subvolume, we need to really delete the dirent,</div><div class='del'>-	 * not just emit a whiteout in the current snapshot:</div><div class='del'>-	 */</div><div class='del'>-	if (src_type == DT_SUBVOL) {</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;src_iter, old_src.k-&gt;p.snapshot);</div><div class='del'>-		ret = bch2_btree_iter_traverse(&amp;src_iter);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		new_src-&gt;k.p = src_iter.pos;</div><div class='del'>-		src_update_flags |= BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;src_iter, &amp;new_src-&gt;k_i, src_update_flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_EXCHANGE)</div><div class='del'>-		*src_offset = new_src-&gt;k.p.offset;</div><div class='del'>-	*dst_offset = new_dst-&gt;k.p.offset;</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;src_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dst_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_dirent_lookup_trans(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       subvol_inum dir,</div><div class='del'>-			       const struct bch_hash_info *hash_info,</div><div class='del'>-			       const struct qstr *name, subvol_inum *inum,</div><div class='del'>-			       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_s_c_dirent d;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, dir.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_lookup(trans, iter, bch2_dirent_hash_desc,</div><div class='del'>-			       hash_info, dir, name, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	d = bkey_s_c_to_dirent(k);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_read_target(trans, dir, d, inum);</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-err:</div><div class='del'>-	if (ret)</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_dirent_lookup(struct bch_fs *c, subvol_inum dir,</div><div class='del'>-		       const struct bch_hash_info *hash_info,</div><div class='del'>-		       const struct qstr *name, subvol_inum *inum)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-</div><div class='del'>-	int ret = lockrestart_do(trans,</div><div class='del'>-		__bch2_dirent_lookup_trans(trans, &amp;iter, dir, hash_info, name, inum, 0));</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_empty_dir_snapshot(struct btree_trans *trans, u64 dir, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, iter, BTREE_ID_dirents,</div><div class='del'>-			   SPOS(dir, 0, snapshot),</div><div class='del'>-			   POS(dir, U64_MAX), 0, k, ret)</div><div class='del'>-		if (k.k-&gt;type == KEY_TYPE_dirent) {</div><div class='del'>-			ret = -ENOTEMPTY;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_empty_dir_trans(struct btree_trans *trans, subvol_inum dir)</div><div class='del'>-{</div><div class='del'>-	u32 snapshot;</div><div class='del'>-</div><div class='del'>-	return bch2_subvolume_get_snapshot(trans, dir.subvol, &amp;snapshot) ?:</div><div class='del'>-		bch2_empty_dir_snapshot(trans, dir.inum, snapshot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_readdir(struct bch_fs *c, subvol_inum inum, struct dir_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_s_c_dirent dirent;</div><div class='del'>-	subvol_inum target;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	struct qstr name;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, iter, BTREE_ID_dirents,</div><div class='del'>-			   SPOS(inum.inum, ctx-&gt;pos, snapshot),</div><div class='del'>-			   POS(inum.inum, U64_MAX), 0, k, ret) {</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_dirent)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		dirent = bkey_s_c_to_dirent(k);</div><div class='del'>-</div><div class='del'>-		ret = bch2_dirent_read_target(trans, inum, dirent, &amp;target);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* dir_emit() can fault and block: */</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-		dirent = bkey_i_to_s_c_dirent(sk.k);</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-		name = bch2_dirent_get_name(dirent);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;pos = dirent.k-&gt;p.offset;</div><div class='del'>-		if (!dir_emit(ctx, name.name,</div><div class='del'>-			      name.len,</div><div class='del'>-			      target.inum,</div><div class='del'>-			      vfs_d_type(dirent.v-&gt;d_type)))</div><div class='del'>-			break;</div><div class='del'>-		ctx-&gt;pos = dirent.k-&gt;p.offset + 1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * read_target looks up subvolumes, we can overflow paths if the</div><div class='del'>-		 * directory has many subvolumes in it</div><div class='del'>-		 */</div><div class='del'>-		ret = btree_trans_too_many_iters(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/dirent.h b/fs/bcachefs/dirent.h<br/>deleted file mode 100644<br/>index 21ffeb78f02e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/dirent.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/dirent.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_DIRENT_H</div><div class='del'>-#define _BCACHEFS_DIRENT_H</div><div class='del'>-</div><div class='del'>-#include "str_hash.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-extern const struct bch_hash_desc bch2_dirent_hash_desc;</div><div class='del'>-</div><div class='del'>-int bch2_dirent_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_dirent_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_dirent ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_dirent_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_dirent_to_text,		\</div><div class='del'>-	.min_val_size	= 16,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-struct qstr;</div><div class='del'>-struct file;</div><div class='del'>-struct dir_context;</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct bch_hash_info;</div><div class='del'>-struct bch_inode_info;</div><div class='del'>-</div><div class='del'>-struct qstr bch2_dirent_get_name(struct bkey_s_c_dirent d);</div><div class='del'>-</div><div class='del'>-static inline unsigned dirent_val_u64s(unsigned len)</div><div class='del'>-{</div><div class='del'>-	return DIV_ROUND_UP(offsetof(struct bch_dirent, d_name) + len,</div><div class='del'>-			    sizeof(u64));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dirent_read_target(struct btree_trans *, subvol_inum,</div><div class='del'>-			    struct bkey_s_c_dirent, subvol_inum *);</div><div class='del'>-</div><div class='del'>-int bch2_dirent_create_snapshot(struct btree_trans *, u64, u32,</div><div class='del'>-			const struct bch_hash_info *, u8,</div><div class='del'>-			const struct qstr *, u64, u64 *,</div><div class='del'>-			bch_str_hash_flags_t);</div><div class='del'>-int bch2_dirent_create(struct btree_trans *, subvol_inum,</div><div class='del'>-		       const struct bch_hash_info *, u8,</div><div class='del'>-		       const struct qstr *, u64, u64 *,</div><div class='del'>-		       bch_str_hash_flags_t);</div><div class='del'>-</div><div class='del'>-static inline unsigned vfs_d_type(unsigned type)</div><div class='del'>-{</div><div class='del'>-	return type == DT_SUBVOL ? DT_DIR : type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum bch_rename_mode {</div><div class='del'>-	BCH_RENAME,</div><div class='del'>-	BCH_RENAME_OVERWRITE,</div><div class='del'>-	BCH_RENAME_EXCHANGE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_dirent_rename(struct btree_trans *,</div><div class='del'>-		       subvol_inum, struct bch_hash_info *,</div><div class='del'>-		       subvol_inum, struct bch_hash_info *,</div><div class='del'>-		       const struct qstr *, subvol_inum *, u64 *,</div><div class='del'>-		       const struct qstr *, subvol_inum *, u64 *,</div><div class='del'>-		       enum bch_rename_mode);</div><div class='del'>-</div><div class='del'>-int __bch2_dirent_lookup_trans(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			       subvol_inum, const struct bch_hash_info *,</div><div class='del'>-			       const struct qstr *, subvol_inum *, unsigned);</div><div class='del'>-u64 bch2_dirent_lookup(struct bch_fs *, subvol_inum,</div><div class='del'>-		       const struct bch_hash_info *,</div><div class='del'>-		       const struct qstr *, subvol_inum *);</div><div class='del'>-</div><div class='del'>-int bch2_empty_dir_snapshot(struct btree_trans *, u64, u32);</div><div class='del'>-int bch2_empty_dir_trans(struct btree_trans *, subvol_inum);</div><div class='del'>-int bch2_readdir(struct bch_fs *, subvol_inum, struct dir_context *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DIRENT_H */</div><div class='head'>diff --git a/fs/bcachefs/dirent_format.h b/fs/bcachefs/dirent_format.h<br/>deleted file mode 100644<br/>index 5e116b88e814..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/dirent_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/dirent_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_DIRENT_FORMAT_H</div><div class='del'>-#define _BCACHEFS_DIRENT_FORMAT_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Dirents (and xattrs) have to implement string lookups; since our b-tree</div><div class='del'>- * doesn't support arbitrary length strings for the key, we instead index by a</div><div class='del'>- * 64 bit hash (currently truncated sha1) of the string, stored in the offset</div><div class='del'>- * field of the key - using linear probing to resolve hash collisions. This also</div><div class='del'>- * provides us with the readdir cookie posix requires.</div><div class='del'>- *</div><div class='del'>- * Linear probing requires us to use whiteouts for deletions, in the event of a</div><div class='del'>- * collision:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct bch_dirent {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	/* Target inode number: */</div><div class='del'>-	union {</div><div class='del'>-	__le64			d_inum;</div><div class='del'>-	struct {		/* DT_SUBVOL */</div><div class='del'>-	__le32			d_child_subvol;</div><div class='del'>-	__le32			d_parent_subvol;</div><div class='del'>-	};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Copy of mode bits 12-15 from the target inode - so userspace can get</div><div class='del'>-	 * the filetype without having to do a stat()</div><div class='del'>-	 */</div><div class='del'>-	__u8			d_type;</div><div class='del'>-</div><div class='del'>-	__u8			d_name[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define DT_SUBVOL	16</div><div class='del'>-#define BCH_DT_MAX	17</div><div class='del'>-</div><div class='del'>-#define BCH_NAME_MAX	512</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DIRENT_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/disk_groups.c b/fs/bcachefs/disk_groups.c<br/>deleted file mode 100644<br/>index 06a7df529b40..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/disk_groups.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/disk_groups.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,617 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-</div><div class='del'>-static int group_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const struct bch_disk_group *l = _l;</div><div class='del'>-	const struct bch_disk_group *r = _r;</div><div class='del'>-</div><div class='del'>-	return ((BCH_GROUP_DELETED(l) &gt; BCH_GROUP_DELETED(r)) -</div><div class='del'>-		(BCH_GROUP_DELETED(l) &lt; BCH_GROUP_DELETED(r))) ?:</div><div class='del'>-		((BCH_GROUP_PARENT(l) &gt; BCH_GROUP_PARENT(r)) -</div><div class='del'>-		 (BCH_GROUP_PARENT(l) &lt; BCH_GROUP_PARENT(r))) ?:</div><div class='del'>-		strncmp(l-&gt;label, r-&gt;label, sizeof(l-&gt;label));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_disk_groups_validate(struct bch_sb *sb,</div><div class='del'>-					struct bch_sb_field *f,</div><div class='del'>-					struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups =</div><div class='del'>-		field_to_type(f, disk_groups);</div><div class='del'>-	struct bch_disk_group *g, *sorted = NULL;</div><div class='del'>-	unsigned nr_groups = disk_groups_nr(groups);</div><div class='del'>-	unsigned i, len;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sb-&gt;nr_devices; i++) {</div><div class='del'>-		struct bch_member m = bch2_sb_member_get(sb, i);</div><div class='del'>-		unsigned group_id;</div><div class='del'>-</div><div class='del'>-		if (!BCH_MEMBER_GROUP(&amp;m))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		group_id = BCH_MEMBER_GROUP(&amp;m) - 1;</div><div class='del'>-</div><div class='del'>-		if (group_id &gt;= nr_groups) {</div><div class='del'>-			prt_printf(err, "disk %u has invalid label %u (have %u)",</div><div class='del'>-				   i, group_id, nr_groups);</div><div class='del'>-			return -BCH_ERR_invalid_sb_disk_groups;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (BCH_GROUP_DELETED(&amp;groups-&gt;entries[group_id])) {</div><div class='del'>-			prt_printf(err, "disk %u has deleted label %u", i, group_id);</div><div class='del'>-			return -BCH_ERR_invalid_sb_disk_groups;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!nr_groups)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_groups; i++) {</div><div class='del'>-		g = groups-&gt;entries + i;</div><div class='del'>-</div><div class='del'>-		if (BCH_GROUP_DELETED(g))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		len = strnlen(g-&gt;label, sizeof(g-&gt;label));</div><div class='del'>-		if (!len) {</div><div class='del'>-			prt_printf(err, "label %u empty", i);</div><div class='del'>-			return -BCH_ERR_invalid_sb_disk_groups;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sorted = kmalloc_array(nr_groups, sizeof(*sorted), GFP_KERNEL);</div><div class='del'>-	if (!sorted)</div><div class='del'>-		return -BCH_ERR_ENOMEM_disk_groups_validate;</div><div class='del'>-</div><div class='del'>-	memcpy(sorted, groups-&gt;entries, nr_groups * sizeof(*sorted));</div><div class='del'>-	sort(sorted, nr_groups, sizeof(*sorted), group_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	for (g = sorted; g + 1 &lt; sorted + nr_groups; g++)</div><div class='del'>-		if (!BCH_GROUP_DELETED(g) &amp;&amp;</div><div class='del'>-		    !group_cmp(&amp;g[0], &amp;g[1])) {</div><div class='del'>-			prt_printf(err, "duplicate label %llu.%.*s",</div><div class='del'>-			       BCH_GROUP_PARENT(g),</div><div class='del'>-			       (int) sizeof(g-&gt;label), g-&gt;label);</div><div class='del'>-			ret = -BCH_ERR_invalid_sb_disk_groups;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-err:</div><div class='del'>-	kfree(sorted);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_disk_groups_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	struct bch_disk_groups_cpu *g = rcu_dereference(c-&gt;disk_groups);</div><div class='del'>-	if (!g)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; g-&gt;nr; i++) {</div><div class='del'>-		if (i)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-</div><div class='del'>-		if (g-&gt;entries[i].deleted) {</div><div class='del'>-			prt_printf(out, "[deleted]");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "[parent %d devs", g-&gt;entries[i].parent);</div><div class='del'>-		for_each_member_device_rcu(c, ca, &amp;g-&gt;entries[i].devs)</div><div class='del'>-			prt_printf(out, " %s", ca-&gt;name);</div><div class='del'>-		prt_printf(out, "]");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	out-&gt;atomic--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_disk_groups_to_text(struct printbuf *out,</div><div class='del'>-					struct bch_sb *sb,</div><div class='del'>-					struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups =</div><div class='del'>-		field_to_type(f, disk_groups);</div><div class='del'>-	struct bch_disk_group *g;</div><div class='del'>-	unsigned nr_groups = disk_groups_nr(groups);</div><div class='del'>-</div><div class='del'>-	for (g = groups-&gt;entries;</div><div class='del'>-	     g &lt; groups-&gt;entries + nr_groups;</div><div class='del'>-	     g++) {</div><div class='del'>-		if (g != groups-&gt;entries)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-</div><div class='del'>-		if (BCH_GROUP_DELETED(g))</div><div class='del'>-			prt_printf(out, "[deleted]");</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "[parent %llu name %s]",</div><div class='del'>-			       BCH_GROUP_PARENT(g), g-&gt;label);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_disk_groups = {</div><div class='del'>-	.validate	= bch2_sb_disk_groups_validate,</div><div class='del'>-	.to_text	= bch2_sb_disk_groups_to_text</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_sb_disk_groups_to_cpu(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups;</div><div class='del'>-	struct bch_disk_groups_cpu *cpu_g, *old_g;</div><div class='del'>-	unsigned i, g, nr_groups;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	groups		= bch2_sb_field_get(c-&gt;disk_sb.sb, disk_groups);</div><div class='del'>-	nr_groups	= disk_groups_nr(groups);</div><div class='del'>-</div><div class='del'>-	if (!groups)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	cpu_g = kzalloc(struct_size(cpu_g, entries, nr_groups), GFP_KERNEL);</div><div class='del'>-	if (!cpu_g)</div><div class='del'>-		return -BCH_ERR_ENOMEM_disk_groups_to_cpu;</div><div class='del'>-</div><div class='del'>-	cpu_g-&gt;nr = nr_groups;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_groups; i++) {</div><div class='del'>-		struct bch_disk_group *src	= &amp;groups-&gt;entries[i];</div><div class='del'>-		struct bch_disk_group_cpu *dst	= &amp;cpu_g-&gt;entries[i];</div><div class='del'>-</div><div class='del'>-		dst-&gt;deleted	= BCH_GROUP_DELETED(src);</div><div class='del'>-		dst-&gt;parent	= BCH_GROUP_PARENT(src);</div><div class='del'>-		memcpy(dst-&gt;label, src-&gt;label, sizeof(dst-&gt;label));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;disk_sb.sb-&gt;nr_devices; i++) {</div><div class='del'>-		struct bch_member m = bch2_sb_member_get(c-&gt;disk_sb.sb, i);</div><div class='del'>-		struct bch_disk_group_cpu *dst;</div><div class='del'>-</div><div class='del'>-		if (!bch2_member_exists(&amp;m))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		g = BCH_MEMBER_GROUP(&amp;m);</div><div class='del'>-		while (g) {</div><div class='del'>-			dst = &amp;cpu_g-&gt;entries[g - 1];</div><div class='del'>-			__set_bit(i, dst-&gt;devs.d);</div><div class='del'>-			g = dst-&gt;parent;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_g = rcu_dereference_protected(c-&gt;disk_groups,</div><div class='del'>-				lockdep_is_held(&amp;c-&gt;sb_lock));</div><div class='del'>-	rcu_assign_pointer(c-&gt;disk_groups, cpu_g);</div><div class='del'>-	if (old_g)</div><div class='del'>-		kfree_rcu(old_g, rcu);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *c, unsigned target)</div><div class='del'>-{</div><div class='del'>-	struct target t = target_decode(target);</div><div class='del'>-	struct bch_devs_mask *devs;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	switch (t.type) {</div><div class='del'>-	case TARGET_NULL:</div><div class='del'>-		devs = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case TARGET_DEV: {</div><div class='del'>-		struct bch_dev *ca = t.dev &lt; c-&gt;sb.nr_devices</div><div class='del'>-			? rcu_dereference(c-&gt;devs[t.dev])</div><div class='del'>-			: NULL;</div><div class='del'>-		devs = ca ? &amp;ca-&gt;self : NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case TARGET_GROUP: {</div><div class='del'>-		struct bch_disk_groups_cpu *g = rcu_dereference(c-&gt;disk_groups);</div><div class='del'>-</div><div class='del'>-		devs = g &amp;&amp; t.group &lt; g-&gt;nr &amp;&amp; !g-&gt;entries[t.group].deleted</div><div class='del'>-			? &amp;g-&gt;entries[t.group].devs</div><div class='del'>-			: NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return devs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_dev_in_target(struct bch_fs *c, unsigned dev, unsigned target)</div><div class='del'>-{</div><div class='del'>-	struct target t = target_decode(target);</div><div class='del'>-</div><div class='del'>-	switch (t.type) {</div><div class='del'>-	case TARGET_NULL:</div><div class='del'>-		return false;</div><div class='del'>-	case TARGET_DEV:</div><div class='del'>-		return dev == t.dev;</div><div class='del'>-	case TARGET_GROUP: {</div><div class='del'>-		struct bch_disk_groups_cpu *g;</div><div class='del'>-		const struct bch_devs_mask *m;</div><div class='del'>-		bool ret;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		g = rcu_dereference(c-&gt;disk_groups);</div><div class='del'>-		m = g &amp;&amp; t.group &lt; g-&gt;nr &amp;&amp; !g-&gt;entries[t.group].deleted</div><div class='del'>-			? &amp;g-&gt;entries[t.group].devs</div><div class='del'>-			: NULL;</div><div class='del'>-</div><div class='del'>-		ret = m ? test_bit(dev, m-&gt;d) : false;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_disk_group_find(struct bch_sb_field_disk_groups *groups,</div><div class='del'>-				  unsigned parent,</div><div class='del'>-				  const char *name, unsigned namelen)</div><div class='del'>-{</div><div class='del'>-	unsigned i, nr_groups = disk_groups_nr(groups);</div><div class='del'>-</div><div class='del'>-	if (!namelen || namelen &gt; BCH_SB_LABEL_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_groups; i++) {</div><div class='del'>-		struct bch_disk_group *g = groups-&gt;entries + i;</div><div class='del'>-</div><div class='del'>-		if (BCH_GROUP_DELETED(g))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!BCH_GROUP_DELETED(g) &amp;&amp;</div><div class='del'>-		    BCH_GROUP_PARENT(g) == parent &amp;&amp;</div><div class='del'>-		    strnlen(g-&gt;label, sizeof(g-&gt;label)) == namelen &amp;&amp;</div><div class='del'>-		    !memcmp(name, g-&gt;label, namelen))</div><div class='del'>-			return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_disk_group_add(struct bch_sb_handle *sb, unsigned parent,</div><div class='del'>-				 const char *name, unsigned namelen)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups =</div><div class='del'>-		bch2_sb_field_get(sb-&gt;sb, disk_groups);</div><div class='del'>-	unsigned i, nr_groups = disk_groups_nr(groups);</div><div class='del'>-	struct bch_disk_group *g;</div><div class='del'>-</div><div class='del'>-	if (!namelen || namelen &gt; BCH_SB_LABEL_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = 0;</div><div class='del'>-	     i &lt; nr_groups &amp;&amp; !BCH_GROUP_DELETED(&amp;groups-&gt;entries[i]);</div><div class='del'>-	     i++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	if (i == nr_groups) {</div><div class='del'>-		unsigned u64s =</div><div class='del'>-			(sizeof(struct bch_sb_field_disk_groups) +</div><div class='del'>-			 sizeof(struct bch_disk_group) * (nr_groups + 1)) /</div><div class='del'>-			sizeof(u64);</div><div class='del'>-</div><div class='del'>-		groups = bch2_sb_field_resize(sb, disk_groups, u64s);</div><div class='del'>-		if (!groups)</div><div class='del'>-			return -BCH_ERR_ENOSPC_disk_label_add;</div><div class='del'>-</div><div class='del'>-		nr_groups = disk_groups_nr(groups);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(i &gt;= nr_groups);</div><div class='del'>-</div><div class='del'>-	g = &amp;groups-&gt;entries[i];</div><div class='del'>-</div><div class='del'>-	memcpy(g-&gt;label, name, namelen);</div><div class='del'>-	if (namelen &lt; sizeof(g-&gt;label))</div><div class='del'>-		g-&gt;label[namelen] = '\0';</div><div class='del'>-	SET_BCH_GROUP_DELETED(g, 0);</div><div class='del'>-	SET_BCH_GROUP_PARENT(g, parent);</div><div class='del'>-	SET_BCH_GROUP_DATA_ALLOWED(g, ~0);</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_disk_path_find(struct bch_sb_handle *sb, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups =</div><div class='del'>-		bch2_sb_field_get(sb-&gt;sb, disk_groups);</div><div class='del'>-	int v = -1;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		const char *next = strchrnul(name, '.');</div><div class='del'>-		unsigned len = next - name;</div><div class='del'>-</div><div class='del'>-		if (*next == '.')</div><div class='del'>-			next++;</div><div class='del'>-</div><div class='del'>-		v = __bch2_disk_group_find(groups, v + 1, name, len);</div><div class='del'>-		name = next;</div><div class='del'>-	} while (*name &amp;&amp; v &gt;= 0);</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_disk_path_find_or_create(struct bch_sb_handle *sb, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups;</div><div class='del'>-	unsigned parent = 0;</div><div class='del'>-	int v = -1;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		const char *next = strchrnul(name, '.');</div><div class='del'>-		unsigned len = next - name;</div><div class='del'>-</div><div class='del'>-		if (*next == '.')</div><div class='del'>-			next++;</div><div class='del'>-</div><div class='del'>-		groups = bch2_sb_field_get(sb-&gt;sb, disk_groups);</div><div class='del'>-</div><div class='del'>-		v = __bch2_disk_group_find(groups, parent, name, len);</div><div class='del'>-		if (v &lt; 0)</div><div class='del'>-			v = __bch2_disk_group_add(sb, parent, name, len);</div><div class='del'>-		if (v &lt; 0)</div><div class='del'>-			return v;</div><div class='del'>-</div><div class='del'>-		parent = v + 1;</div><div class='del'>-		name = next;</div><div class='del'>-	} while (*name &amp;&amp; v &gt;= 0);</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_disk_path_to_text(struct printbuf *out, struct bch_fs *c, unsigned v)</div><div class='del'>-{</div><div class='del'>-	struct bch_disk_groups_cpu *groups;</div><div class='del'>-	struct bch_disk_group_cpu *g;</div><div class='del'>-	unsigned nr = 0;</div><div class='del'>-	u16 path[32];</div><div class='del'>-</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	groups = rcu_dereference(c-&gt;disk_groups);</div><div class='del'>-	if (!groups)</div><div class='del'>-		goto invalid;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (nr == ARRAY_SIZE(path))</div><div class='del'>-			goto invalid;</div><div class='del'>-</div><div class='del'>-		if (v &gt;= groups-&gt;nr)</div><div class='del'>-			goto invalid;</div><div class='del'>-</div><div class='del'>-		g = groups-&gt;entries + v;</div><div class='del'>-</div><div class='del'>-		if (g-&gt;deleted)</div><div class='del'>-			goto invalid;</div><div class='del'>-</div><div class='del'>-		path[nr++] = v;</div><div class='del'>-</div><div class='del'>-		if (!g-&gt;parent)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		v = g-&gt;parent - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (nr) {</div><div class='del'>-		v = path[--nr];</div><div class='del'>-		g = groups-&gt;entries + v;</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "%.*s", (int) sizeof(g-&gt;label), g-&gt;label);</div><div class='del'>-		if (nr)</div><div class='del'>-			prt_printf(out, ".");</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	out-&gt;atomic--;</div><div class='del'>-	return;</div><div class='del'>-invalid:</div><div class='del'>-	prt_printf(out, "invalid label %u", v);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_disk_path_to_text_sb(struct printbuf *out, struct bch_sb *sb, unsigned v)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_disk_groups *groups =</div><div class='del'>-		bch2_sb_field_get(sb, disk_groups);</div><div class='del'>-	struct bch_disk_group *g;</div><div class='del'>-	unsigned nr = 0;</div><div class='del'>-	u16 path[32];</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (nr == ARRAY_SIZE(path))</div><div class='del'>-			goto inval;</div><div class='del'>-</div><div class='del'>-		if (v &gt;= disk_groups_nr(groups))</div><div class='del'>-			goto inval;</div><div class='del'>-</div><div class='del'>-		g = groups-&gt;entries + v;</div><div class='del'>-</div><div class='del'>-		if (BCH_GROUP_DELETED(g))</div><div class='del'>-			goto inval;</div><div class='del'>-</div><div class='del'>-		path[nr++] = v;</div><div class='del'>-</div><div class='del'>-		if (!BCH_GROUP_PARENT(g))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		v = BCH_GROUP_PARENT(g) - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (nr) {</div><div class='del'>-		v = path[--nr];</div><div class='del'>-		g = groups-&gt;entries + v;</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "%.*s", (int) sizeof(g-&gt;label), g-&gt;label);</div><div class='del'>-		if (nr)</div><div class='del'>-			prt_printf(out, ".");</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-inval:</div><div class='del'>-	prt_printf(out, "invalid label %u", v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_dev_group_set(struct bch_fs *c, struct bch_dev *ca, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct bch_member *mi;</div><div class='del'>-	int ret, v = -1;</div><div class='del'>-</div><div class='del'>-	if (!strlen(name) || !strcmp(name, "none"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	v = bch2_disk_path_find_or_create(&amp;c-&gt;disk_sb, name);</div><div class='del'>-	if (v &lt; 0)</div><div class='del'>-		return v;</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_disk_groups_to_cpu(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mi = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	SET_BCH_MEMBER_GROUP(mi, v + 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_group_set(struct bch_fs *c, struct bch_dev *ca, const char *name)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	ret = __bch2_dev_group_set(c, ca, name) ?:</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opt_target_parse(struct bch_fs *c, const char *val, u64 *res,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int g;</div><div class='del'>-</div><div class='del'>-	if (!val)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!c)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!strlen(val) || !strcmp(val, "none")) {</div><div class='del'>-		*res = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Is it a device? */</div><div class='del'>-	ca = bch2_dev_lookup(c, val);</div><div class='del'>-	if (!IS_ERR(ca)) {</div><div class='del'>-		*res = dev_to_target(ca-&gt;dev_idx);</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	g = bch2_disk_path_find(&amp;c-&gt;disk_sb, val);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (g &gt;= 0) {</div><div class='del'>-		*res = group_to_target(g);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_target_to_text(struct printbuf *out, struct bch_fs *c, unsigned v)</div><div class='del'>-{</div><div class='del'>-	struct target t = target_decode(v);</div><div class='del'>-</div><div class='del'>-	switch (t.type) {</div><div class='del'>-	case TARGET_NULL:</div><div class='del'>-		prt_printf(out, "none");</div><div class='del'>-		break;</div><div class='del'>-	case TARGET_DEV: {</div><div class='del'>-		struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-		out-&gt;atomic++;</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ca = t.dev &lt; c-&gt;sb.nr_devices</div><div class='del'>-			? rcu_dereference(c-&gt;devs[t.dev])</div><div class='del'>-			: NULL;</div><div class='del'>-</div><div class='del'>-		if (ca &amp;&amp; percpu_ref_tryget(&amp;ca-&gt;io_ref)) {</div><div class='del'>-			prt_printf(out, "/dev/%s", ca-&gt;name);</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-		} else if (ca) {</div><div class='del'>-			prt_printf(out, "offline device %u", t.dev);</div><div class='del'>-		} else {</div><div class='del'>-			prt_printf(out, "invalid device %u", t.dev);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		out-&gt;atomic--;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case TARGET_GROUP:</div><div class='del'>-		bch2_disk_path_to_text(out, c, t.group);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_target_to_text_sb(struct printbuf *out, struct bch_sb *sb, unsigned v)</div><div class='del'>-{</div><div class='del'>-	struct target t = target_decode(v);</div><div class='del'>-</div><div class='del'>-	switch (t.type) {</div><div class='del'>-	case TARGET_NULL:</div><div class='del'>-		prt_printf(out, "none");</div><div class='del'>-		break;</div><div class='del'>-	case TARGET_DEV: {</div><div class='del'>-		struct bch_member m = bch2_sb_member_get(sb, t.dev);</div><div class='del'>-</div><div class='del'>-		if (bch2_dev_exists(sb, t.dev)) {</div><div class='del'>-			prt_printf(out, "Device ");</div><div class='del'>-			pr_uuid(out, m.uuid.b);</div><div class='del'>-			prt_printf(out, " (%u)", t.dev);</div><div class='del'>-		} else {</div><div class='del'>-			prt_printf(out, "Bad device %u", t.dev);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case TARGET_GROUP:</div><div class='del'>-		bch2_disk_path_to_text_sb(out, sb, t.group);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opt_target_to_text(struct printbuf *out,</div><div class='del'>-			     struct bch_fs *c,</div><div class='del'>-			     struct bch_sb *sb,</div><div class='del'>-			     u64 v)</div><div class='del'>-{</div><div class='del'>-	if (c)</div><div class='del'>-		bch2_target_to_text(out, c, v);</div><div class='del'>-	else</div><div class='del'>-		bch2_target_to_text_sb(out, sb, v);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/disk_groups.h b/fs/bcachefs/disk_groups.h<br/>deleted file mode 100644<br/>index 441826fff224..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/disk_groups.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/disk_groups.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,111 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_DISK_GROUPS_H</div><div class='del'>-#define _BCACHEFS_DISK_GROUPS_H</div><div class='del'>-</div><div class='del'>-#include "disk_groups_types.h"</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_disk_groups;</div><div class='del'>-</div><div class='del'>-static inline unsigned disk_groups_nr(struct bch_sb_field_disk_groups *groups)</div><div class='del'>-{</div><div class='del'>-	return groups</div><div class='del'>-		? (vstruct_end(&amp;groups-&gt;field) -</div><div class='del'>-		   (void *) &amp;groups-&gt;entries[0]) / sizeof(struct bch_disk_group)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct target {</div><div class='del'>-	enum {</div><div class='del'>-		TARGET_NULL,</div><div class='del'>-		TARGET_DEV,</div><div class='del'>-		TARGET_GROUP,</div><div class='del'>-	}			type;</div><div class='del'>-	union {</div><div class='del'>-		unsigned	dev;</div><div class='del'>-		unsigned	group;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define TARGET_DEV_START	1</div><div class='del'>-#define TARGET_GROUP_START	(256 + TARGET_DEV_START)</div><div class='del'>-</div><div class='del'>-static inline u16 dev_to_target(unsigned dev)</div><div class='del'>-{</div><div class='del'>-	return TARGET_DEV_START + dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 group_to_target(unsigned group)</div><div class='del'>-{</div><div class='del'>-	return TARGET_GROUP_START + group;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct target target_decode(unsigned target)</div><div class='del'>-{</div><div class='del'>-	if (target &gt;= TARGET_GROUP_START)</div><div class='del'>-		return (struct target) {</div><div class='del'>-			.type	= TARGET_GROUP,</div><div class='del'>-			.group	= target - TARGET_GROUP_START</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	if (target &gt;= TARGET_DEV_START)</div><div class='del'>-		return (struct target) {</div><div class='del'>-			.type	= TARGET_DEV,</div><div class='del'>-			.group	= target - TARGET_DEV_START</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	return (struct target) { .type = TARGET_NULL };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline struct bch_devs_mask target_rw_devs(struct bch_fs *c,</div><div class='del'>-						  enum bch_data_type data_type,</div><div class='del'>-						  u16 target)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_mask devs = c-&gt;rw_devs[data_type];</div><div class='del'>-	const struct bch_devs_mask *t = bch2_target_to_mask(c, target);</div><div class='del'>-</div><div class='del'>-	if (t)</div><div class='del'>-		bitmap_and(devs.d, devs.d, t-&gt;d, BCH_SB_MEMBERS_MAX);</div><div class='del'>-	return devs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_target_accepts_data(struct bch_fs *c,</div><div class='del'>-					    enum bch_data_type data_type,</div><div class='del'>-					    u16 target)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_mask rw_devs = target_rw_devs(c, data_type, target);</div><div class='del'>-	return !bitmap_empty(rw_devs.d, BCH_SB_MEMBERS_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_dev_in_target(struct bch_fs *, unsigned, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_disk_path_find(struct bch_sb_handle *, const char *);</div><div class='del'>-</div><div class='del'>-/* Exported for userspace bcachefs-tools: */</div><div class='del'>-int bch2_disk_path_find_or_create(struct bch_sb_handle *, const char *);</div><div class='del'>-</div><div class='del'>-void bch2_disk_path_to_text(struct printbuf *, struct bch_fs *, unsigned);</div><div class='del'>-void bch2_disk_path_to_text_sb(struct printbuf *, struct bch_sb *, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_target_to_text(struct printbuf *out, struct bch_fs *, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_opt_target_parse(struct bch_fs *, const char *, u64 *, struct printbuf *);</div><div class='del'>-void bch2_opt_target_to_text(struct printbuf *, struct bch_fs *, struct bch_sb *, u64);</div><div class='del'>-</div><div class='del'>-#define bch2_opt_target (struct bch_opt_fn) {		\</div><div class='del'>-	.parse		= bch2_opt_target_parse,	\</div><div class='del'>-	.to_text	= bch2_opt_target_to_text,	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_disk_groups_to_cpu(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int __bch2_dev_group_set(struct bch_fs *, struct bch_dev *, const char *);</div><div class='del'>-int bch2_dev_group_set(struct bch_fs *, struct bch_dev *, const char *);</div><div class='del'>-</div><div class='del'>-const char *bch2_sb_validate_disk_groups(struct bch_sb *,</div><div class='del'>-					 struct bch_sb_field *);</div><div class='del'>-</div><div class='del'>-void bch2_disk_groups_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DISK_GROUPS_H */</div><div class='head'>diff --git a/fs/bcachefs/disk_groups_types.h b/fs/bcachefs/disk_groups_types.h<br/>deleted file mode 100644<br/>index a54ef085b13d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/disk_groups_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/disk_groups_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_DISK_GROUPS_TYPES_H</div><div class='del'>-#define _BCACHEFS_DISK_GROUPS_TYPES_H</div><div class='del'>-</div><div class='del'>-struct bch_disk_group_cpu {</div><div class='del'>-	bool				deleted;</div><div class='del'>-	u16				parent;</div><div class='del'>-	u8				label[BCH_SB_LABEL_SIZE];</div><div class='del'>-	struct bch_devs_mask		devs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_disk_groups_cpu {</div><div class='del'>-	struct rcu_head			rcu;</div><div class='del'>-	unsigned			nr;</div><div class='del'>-	struct bch_disk_group_cpu	entries[] __counted_by(nr);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_DISK_GROUPS_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c<br/>deleted file mode 100644<br/>index d503af270024..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/ec.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2259 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-/* erasure coding */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/raid/pq.h&gt;</div><div class='del'>-#include &lt;linux/raid/xor.h&gt;</div><div class='del'>-</div><div class='del'>-static void raid5_recov(unsigned disks, unsigned failed_idx,</div><div class='del'>-			size_t size, void **data)</div><div class='del'>-{</div><div class='del'>-	unsigned i = 2, nr;</div><div class='del'>-</div><div class='del'>-	BUG_ON(failed_idx &gt;= disks);</div><div class='del'>-</div><div class='del'>-	swap(data[0], data[failed_idx]);</div><div class='del'>-	memcpy(data[0], data[1], size);</div><div class='del'>-</div><div class='del'>-	while (i &lt; disks) {</div><div class='del'>-		nr = min_t(unsigned, disks - i, MAX_XOR_BLOCKS);</div><div class='del'>-		xor_blocks(nr, size, data[0], data + i);</div><div class='del'>-		i += nr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	swap(data[0], data[failed_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid_gen(int nd, int np, size_t size, void **v)</div><div class='del'>-{</div><div class='del'>-	if (np &gt;= 1)</div><div class='del'>-		raid5_recov(nd + np, nd, size, v);</div><div class='del'>-	if (np &gt;= 2)</div><div class='del'>-		raid6_call.gen_syndrome(nd + np, size, v);</div><div class='del'>-	BUG_ON(np &gt; 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid_rec(int nr, int *ir, int nd, int np, size_t size, void **v)</div><div class='del'>-{</div><div class='del'>-	switch (nr) {</div><div class='del'>-	case 0:</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		if (ir[0] &lt; nd + 1)</div><div class='del'>-			raid5_recov(nd + 1, ir[0], size, v);</div><div class='del'>-		else</div><div class='del'>-			raid6_call.gen_syndrome(nd + np, size, v);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		if (ir[1] &lt; nd) {</div><div class='del'>-			/* data+data failure. */</div><div class='del'>-			raid6_2data_recov(nd + np, size, ir[0], ir[1], v);</div><div class='del'>-		} else if (ir[0] &lt; nd) {</div><div class='del'>-			/* data + p/q failure */</div><div class='del'>-</div><div class='del'>-			if (ir[1] == nd) /* data + p failure */</div><div class='del'>-				raid6_datap_recov(nd + np, size, ir[0], v);</div><div class='del'>-			else { /* data + q failure */</div><div class='del'>-				raid5_recov(nd + 1, ir[0], size, v);</div><div class='del'>-				raid6_call.gen_syndrome(nd + np, size, v);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			raid_gen(nd, np, size, v);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;raid/raid.h&gt;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct ec_bio {</div><div class='del'>-	struct bch_dev		*ca;</div><div class='del'>-	struct ec_stripe_buf	*buf;</div><div class='del'>-	size_t			idx;</div><div class='del'>-	struct bio		bio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Stripes btree keys: */</div><div class='del'>-</div><div class='del'>-int bch2_stripe_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			enum bkey_invalid_flags flags,</div><div class='del'>-			struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	const struct bch_stripe *s = bkey_s_c_to_stripe(k).v;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_eq(k.k-&gt;p, POS_MIN) ||</div><div class='del'>-			 bpos_gt(k.k-&gt;p, POS(0, U32_MAX)), c, err,</div><div class='del'>-			 stripe_pos_bad,</div><div class='del'>-			 "stripe at bad pos");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(k.k) &lt; stripe_val_u64s(s), c, err,</div><div class='del'>-			 stripe_val_size_bad,</div><div class='del'>-			 "incorrect value size (%zu &lt; %u)",</div><div class='del'>-			 bkey_val_u64s(k.k), stripe_val_u64s(s));</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_ptrs_invalid(c, k, flags, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_stripe_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			 struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	const struct bch_stripe *s = bkey_s_c_to_stripe(k).v;</div><div class='del'>-	unsigned i, nr_data = s-&gt;nr_blocks - s-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "algo %u sectors %u blocks %u:%u csum %u gran %u",</div><div class='del'>-	       s-&gt;algorithm,</div><div class='del'>-	       le16_to_cpu(s-&gt;sectors),</div><div class='del'>-	       nr_data,</div><div class='del'>-	       s-&gt;nr_redundant,</div><div class='del'>-	       s-&gt;csum_type,</div><div class='del'>-	       1U &lt;&lt; s-&gt;csum_granularity_bits);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; s-&gt;nr_blocks; i++) {</div><div class='del'>-		const struct bch_extent_ptr *ptr = s-&gt;ptrs + i;</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-		u32 offset;</div><div class='del'>-		u64 b = sector_to_bucket_and_offset(ca, ptr-&gt;offset, &amp;offset);</div><div class='del'>-</div><div class='del'>-		prt_printf(out, " %u:%llu:%u", ptr-&gt;dev, b, offset);</div><div class='del'>-		if (i &lt; nr_data)</div><div class='del'>-			prt_printf(out, "#%u", stripe_blockcount_get(s, i));</div><div class='del'>-		prt_printf(out, " gen %u", ptr-&gt;gen);</div><div class='del'>-		if (ptr_stale(ca, ptr))</div><div class='del'>-			prt_printf(out, " stale");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Triggers: */</div><div class='del'>-</div><div class='del'>-static int bch2_trans_mark_stripe_bucket(struct btree_trans *trans,</div><div class='del'>-					 struct bkey_s_c_stripe s,</div><div class='del'>-					 unsigned idx, bool deleting)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	const struct bch_extent_ptr *ptr = &amp;s.v-&gt;ptrs[idx];</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_alloc_v4 *a;</div><div class='del'>-	enum bch_data_type data_type = idx &gt;= s.v-&gt;nr_blocks - s.v-&gt;nr_redundant</div><div class='del'>-		? BCH_DATA_parity : 0;</div><div class='del'>-	s64 sectors = data_type ? le16_to_cpu(s.v-&gt;sectors) : 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (deleting)</div><div class='del'>-		sectors = -sectors;</div><div class='del'>-</div><div class='del'>-	a = bch2_trans_start_alloc_update(trans, &amp;iter, PTR_BUCKET_POS(c, ptr));</div><div class='del'>-	if (IS_ERR(a))</div><div class='del'>-		return PTR_ERR(a);</div><div class='del'>-</div><div class='del'>-	ret = bch2_check_bucket_ref(trans, s.s_c, ptr, sectors, data_type,</div><div class='del'>-				    a-&gt;v.gen, a-&gt;v.data_type,</div><div class='del'>-				    a-&gt;v.dirty_sectors);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!deleting) {</div><div class='del'>-		if (bch2_trans_inconsistent_on(a-&gt;v.stripe ||</div><div class='del'>-					       a-&gt;v.stripe_redundancy, trans,</div><div class='del'>-				"bucket %llu:%llu gen %u data type %s dirty_sectors %u: multiple stripes using same bucket (%u, %llu)",</div><div class='del'>-				iter.pos.inode, iter.pos.offset, a-&gt;v.gen,</div><div class='del'>-				bch2_data_type_str(a-&gt;v.data_type),</div><div class='del'>-				a-&gt;v.dirty_sectors,</div><div class='del'>-				a-&gt;v.stripe, s.k-&gt;p.offset)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bch2_trans_inconsistent_on(data_type &amp;&amp; a-&gt;v.dirty_sectors, trans,</div><div class='del'>-				"bucket %llu:%llu gen %u data type %s dirty_sectors %u: data already in stripe bucket %llu",</div><div class='del'>-				iter.pos.inode, iter.pos.offset, a-&gt;v.gen,</div><div class='del'>-				bch2_data_type_str(a-&gt;v.data_type),</div><div class='del'>-				a-&gt;v.dirty_sectors,</div><div class='del'>-				s.k-&gt;p.offset)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		a-&gt;v.stripe		= s.k-&gt;p.offset;</div><div class='del'>-		a-&gt;v.stripe_redundancy	= s.v-&gt;nr_redundant;</div><div class='del'>-		a-&gt;v.data_type		= BCH_DATA_stripe;</div><div class='del'>-	} else {</div><div class='del'>-		if (bch2_trans_inconsistent_on(a-&gt;v.stripe != s.k-&gt;p.offset ||</div><div class='del'>-					       a-&gt;v.stripe_redundancy != s.v-&gt;nr_redundant, trans,</div><div class='del'>-				"bucket %llu:%llu gen %u: not marked as stripe when deleting stripe %llu (got %u)",</div><div class='del'>-				iter.pos.inode, iter.pos.offset, a-&gt;v.gen,</div><div class='del'>-				s.k-&gt;p.offset, a-&gt;v.stripe)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		a-&gt;v.stripe		= 0;</div><div class='del'>-		a-&gt;v.stripe_redundancy	= 0;</div><div class='del'>-		a-&gt;v.data_type		= alloc_data_type(a-&gt;v, BCH_DATA_user);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	a-&gt;v.dirty_sectors += sectors;</div><div class='del'>-	if (data_type)</div><div class='del'>-		a-&gt;v.data_type = !deleting ? data_type : 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;a-&gt;k_i, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mark_stripe_bucket(struct btree_trans *trans,</div><div class='del'>-			      struct bkey_s_c k,</div><div class='del'>-			      unsigned ptr_idx,</div><div class='del'>-			      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	const struct bch_stripe *s = bkey_s_c_to_stripe(k).v;</div><div class='del'>-	unsigned nr_data = s-&gt;nr_blocks - s-&gt;nr_redundant;</div><div class='del'>-	bool parity = ptr_idx &gt;= nr_data;</div><div class='del'>-	enum bch_data_type data_type = parity ? BCH_DATA_parity : BCH_DATA_stripe;</div><div class='del'>-	s64 sectors = parity ? le16_to_cpu(s-&gt;sectors) : 0;</div><div class='del'>-	const struct bch_extent_ptr *ptr = s-&gt;ptrs + ptr_idx;</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-	struct bucket old, new, *g;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(flags &amp; BTREE_TRIGGER_GC));</div><div class='del'>-</div><div class='del'>-	/* * XXX doesn't handle deletion */</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	g = PTR_GC_BUCKET(ca, ptr);</div><div class='del'>-</div><div class='del'>-	if (g-&gt;dirty_sectors ||</div><div class='del'>-	    (g-&gt;stripe &amp;&amp; g-&gt;stripe != k.k-&gt;p.offset)) {</div><div class='del'>-		bch2_fs_inconsistent(c,</div><div class='del'>-			      "bucket %u:%zu gen %u: multiple stripes using same bucket\n%s",</div><div class='del'>-			      ptr-&gt;dev, PTR_BUCKET_NR(ca, ptr), g-&gt;gen,</div><div class='del'>-			      (bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bucket_lock(g);</div><div class='del'>-	old = *g;</div><div class='del'>-</div><div class='del'>-	ret = bch2_check_bucket_ref(trans, k, ptr, sectors, data_type,</div><div class='del'>-				    g-&gt;gen, g-&gt;data_type,</div><div class='del'>-				    g-&gt;dirty_sectors);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	g-&gt;data_type = data_type;</div><div class='del'>-	g-&gt;dirty_sectors += sectors;</div><div class='del'>-</div><div class='del'>-	g-&gt;stripe		= k.k-&gt;p.offset;</div><div class='del'>-	g-&gt;stripe_redundancy	= s-&gt;nr_redundant;</div><div class='del'>-	new = *g;</div><div class='del'>-err:</div><div class='del'>-	bucket_unlock(g);</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_dev_usage_update_m(c, ca, &amp;old, &amp;new);</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_stripe(struct btree_trans *trans,</div><div class='del'>-			enum btree_id btree_id, unsigned level,</div><div class='del'>-			struct bkey_s_c old, struct bkey_s _new,</div><div class='del'>-			unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c new = _new.s_c;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u64 idx = new.k-&gt;p.offset;</div><div class='del'>-	const struct bch_stripe *old_s = old.k-&gt;type == KEY_TYPE_stripe</div><div class='del'>-		? bkey_s_c_to_stripe(old).v : NULL;</div><div class='del'>-	const struct bch_stripe *new_s = new.k-&gt;type == KEY_TYPE_stripe</div><div class='del'>-		? bkey_s_c_to_stripe(new).v : NULL;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the pointers aren't changing, we don't need to do anything:</div><div class='del'>-		 */</div><div class='del'>-		if (new_s &amp;&amp; old_s &amp;&amp;</div><div class='del'>-		    new_s-&gt;nr_blocks	== old_s-&gt;nr_blocks &amp;&amp;</div><div class='del'>-		    new_s-&gt;nr_redundant	== old_s-&gt;nr_redundant &amp;&amp;</div><div class='del'>-		    !memcmp(old_s-&gt;ptrs, new_s-&gt;ptrs,</div><div class='del'>-			    new_s-&gt;nr_blocks * sizeof(struct bch_extent_ptr)))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		BUG_ON(new_s &amp;&amp; old_s &amp;&amp;</div><div class='del'>-		       (new_s-&gt;nr_blocks	!= old_s-&gt;nr_blocks ||</div><div class='del'>-			new_s-&gt;nr_redundant	!= old_s-&gt;nr_redundant));</div><div class='del'>-</div><div class='del'>-		if (new_s) {</div><div class='del'>-			s64 sectors = le16_to_cpu(new_s-&gt;sectors);</div><div class='del'>-</div><div class='del'>-			struct bch_replicas_padded r;</div><div class='del'>-			bch2_bkey_to_replicas(&amp;r.e, new);</div><div class='del'>-			int ret = bch2_update_replicas_list(trans, &amp;r.e, sectors * new_s-&gt;nr_redundant);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (old_s) {</div><div class='del'>-			s64 sectors = -((s64) le16_to_cpu(old_s-&gt;sectors));</div><div class='del'>-</div><div class='del'>-			struct bch_replicas_padded r;</div><div class='del'>-			bch2_bkey_to_replicas(&amp;r.e, old);</div><div class='del'>-			int ret = bch2_update_replicas_list(trans, &amp;r.e, sectors * old_s-&gt;nr_redundant);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		unsigned nr_blocks = new_s ? new_s-&gt;nr_blocks : old_s-&gt;nr_blocks;</div><div class='del'>-		for (unsigned i = 0; i &lt; nr_blocks; i++) {</div><div class='del'>-			if (new_s &amp;&amp; old_s &amp;&amp;</div><div class='del'>-			    !memcmp(&amp;new_s-&gt;ptrs[i],</div><div class='del'>-				    &amp;old_s-&gt;ptrs[i],</div><div class='del'>-				    sizeof(new_s-&gt;ptrs[i])))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (new_s) {</div><div class='del'>-				int ret = bch2_trans_mark_stripe_bucket(trans,</div><div class='del'>-						bkey_s_c_to_stripe(new), i, false);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (old_s) {</div><div class='del'>-				int ret = bch2_trans_mark_stripe_bucket(trans,</div><div class='del'>-						bkey_s_c_to_stripe(old), i, true);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_ATOMIC) {</div><div class='del'>-		struct stripe *m = genradix_ptr(&amp;c-&gt;stripes, idx);</div><div class='del'>-</div><div class='del'>-		if (!m) {</div><div class='del'>-			struct printbuf buf1 = PRINTBUF;</div><div class='del'>-			struct printbuf buf2 = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf1, c, old);</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf2, c, new);</div><div class='del'>-			bch_err_ratelimited(c, "error marking nonexistent stripe %llu while marking\n"</div><div class='del'>-					    "old %s\n"</div><div class='del'>-					    "new %s", idx, buf1.buf, buf2.buf);</div><div class='del'>-			printbuf_exit(&amp;buf2);</div><div class='del'>-			printbuf_exit(&amp;buf1);</div><div class='del'>-			bch2_inconsistent_error(c);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!new_s) {</div><div class='del'>-			bch2_stripes_heap_del(c, m, idx);</div><div class='del'>-</div><div class='del'>-			memset(m, 0, sizeof(*m));</div><div class='del'>-		} else {</div><div class='del'>-			m-&gt;sectors	= le16_to_cpu(new_s-&gt;sectors);</div><div class='del'>-			m-&gt;algorithm	= new_s-&gt;algorithm;</div><div class='del'>-			m-&gt;nr_blocks	= new_s-&gt;nr_blocks;</div><div class='del'>-			m-&gt;nr_redundant	= new_s-&gt;nr_redundant;</div><div class='del'>-			m-&gt;blocks_nonempty = 0;</div><div class='del'>-</div><div class='del'>-			for (unsigned i = 0; i &lt; new_s-&gt;nr_blocks; i++)</div><div class='del'>-				m-&gt;blocks_nonempty += !!stripe_blockcount_get(new_s, i);</div><div class='del'>-</div><div class='del'>-			if (!old_s)</div><div class='del'>-				bch2_stripes_heap_insert(c, m, idx);</div><div class='del'>-			else</div><div class='del'>-				bch2_stripes_heap_update(c, m, idx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_GC) {</div><div class='del'>-		struct gc_stripe *m =</div><div class='del'>-			genradix_ptr_alloc(&amp;c-&gt;gc_stripes, idx, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (!m) {</div><div class='del'>-			bch_err(c, "error allocating memory for gc_stripes, idx %llu",</div><div class='del'>-				idx);</div><div class='del'>-			return -BCH_ERR_ENOMEM_mark_stripe;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * This will be wrong when we bring back runtime gc: we should</div><div class='del'>-		 * be unmarking the old key and then marking the new key</div><div class='del'>-		 */</div><div class='del'>-		m-&gt;alive	= true;</div><div class='del'>-		m-&gt;sectors	= le16_to_cpu(new_s-&gt;sectors);</div><div class='del'>-		m-&gt;nr_blocks	= new_s-&gt;nr_blocks;</div><div class='del'>-		m-&gt;nr_redundant	= new_s-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-		for (unsigned i = 0; i &lt; new_s-&gt;nr_blocks; i++)</div><div class='del'>-			m-&gt;ptrs[i] = new_s-&gt;ptrs[i];</div><div class='del'>-</div><div class='del'>-		bch2_bkey_to_replicas(&amp;m-&gt;r.e, new);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * gc recalculates this field from stripe ptr</div><div class='del'>-		 * references:</div><div class='del'>-		 */</div><div class='del'>-		memset(m-&gt;block_sectors, 0, sizeof(m-&gt;block_sectors));</div><div class='del'>-</div><div class='del'>-		for (unsigned i = 0; i &lt; new_s-&gt;nr_blocks; i++) {</div><div class='del'>-			int ret = mark_stripe_bucket(trans, new, i, flags);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		int ret = bch2_update_replicas(c, new, &amp;m-&gt;r.e,</div><div class='del'>-				      ((s64) m-&gt;sectors * m-&gt;nr_redundant),</div><div class='del'>-				      0, true);</div><div class='del'>-		if (ret) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, new);</div><div class='del'>-			bch2_fs_fatal_error(c, "no replicas entry for %s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns blocknr in stripe that we matched: */</div><div class='del'>-static const struct bch_extent_ptr *bkey_matches_stripe(struct bch_stripe *s,</div><div class='del'>-						struct bkey_s_c k, unsigned *block)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	unsigned i, nr_data = s-&gt;nr_blocks - s-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-		for (i = 0; i &lt; nr_data; i++)</div><div class='del'>-			if (__bch2_ptr_matches_stripe(&amp;s-&gt;ptrs[i], ptr,</div><div class='del'>-						      le16_to_cpu(s-&gt;sectors))) {</div><div class='del'>-				*block = i;</div><div class='del'>-				return ptr;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool extent_has_stripe_ptr(struct bkey_s_c k, u64 idx)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_extent: {</div><div class='del'>-		struct bkey_s_c_extent e = bkey_s_c_to_extent(k);</div><div class='del'>-		const union bch_extent_entry *entry;</div><div class='del'>-</div><div class='del'>-		extent_for_each_entry(e, entry)</div><div class='del'>-			if (extent_entry_type(entry) ==</div><div class='del'>-			    BCH_EXTENT_ENTRY_stripe_ptr &amp;&amp;</div><div class='del'>-			    entry-&gt;stripe_ptr.idx == idx)</div><div class='del'>-				return true;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Stripe bufs: */</div><div class='del'>-</div><div class='del'>-static void ec_stripe_buf_exit(struct ec_stripe_buf *buf)</div><div class='del'>-{</div><div class='del'>-	if (buf-&gt;key.k.type == KEY_TYPE_stripe) {</div><div class='del'>-		struct bkey_i_stripe *s = bkey_i_to_stripe(&amp;buf-&gt;key);</div><div class='del'>-		unsigned i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; s-&gt;v.nr_blocks; i++) {</div><div class='del'>-			kvpfree(buf-&gt;data[i], buf-&gt;size &lt;&lt; 9);</div><div class='del'>-			buf-&gt;data[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* XXX: this is a non-mempoolified memory allocation: */</div><div class='del'>-static int ec_stripe_buf_init(struct ec_stripe_buf *buf,</div><div class='del'>-			      unsigned offset, unsigned size)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned csum_granularity = 1U &lt;&lt; v-&gt;csum_granularity_bits;</div><div class='del'>-	unsigned end = offset + size;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(end &gt; le16_to_cpu(v-&gt;sectors));</div><div class='del'>-</div><div class='del'>-	offset	= round_down(offset, csum_granularity);</div><div class='del'>-	end	= min_t(unsigned, le16_to_cpu(v-&gt;sectors),</div><div class='del'>-			round_up(end, csum_granularity));</div><div class='del'>-</div><div class='del'>-	buf-&gt;offset	= offset;</div><div class='del'>-	buf-&gt;size	= end - offset;</div><div class='del'>-</div><div class='del'>-	memset(buf-&gt;valid, 0xFF, sizeof(buf-&gt;valid));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; v-&gt;nr_blocks; i++) {</div><div class='del'>-		buf-&gt;data[i] = kvpmalloc(buf-&gt;size &lt;&lt; 9, GFP_KERNEL);</div><div class='del'>-		if (!buf-&gt;data[i])</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	ec_stripe_buf_exit(buf);</div><div class='del'>-	return -BCH_ERR_ENOMEM_stripe_buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Checksumming: */</div><div class='del'>-</div><div class='del'>-static struct bch_csum ec_block_checksum(struct ec_stripe_buf *buf,</div><div class='del'>-					 unsigned block, unsigned offset)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned csum_granularity = 1 &lt;&lt; v-&gt;csum_granularity_bits;</div><div class='del'>-	unsigned end = buf-&gt;offset + buf-&gt;size;</div><div class='del'>-	unsigned len = min(csum_granularity, end - offset);</div><div class='del'>-</div><div class='del'>-	BUG_ON(offset &gt;= end);</div><div class='del'>-	BUG_ON(offset &lt;  buf-&gt;offset);</div><div class='del'>-	BUG_ON(offset &amp; (csum_granularity - 1));</div><div class='del'>-	BUG_ON(offset + len != le16_to_cpu(v-&gt;sectors) &amp;&amp;</div><div class='del'>-	       (len &amp; (csum_granularity - 1)));</div><div class='del'>-</div><div class='del'>-	return bch2_checksum(NULL, v-&gt;csum_type,</div><div class='del'>-			     null_nonce(),</div><div class='del'>-			     buf-&gt;data[block] + ((offset - buf-&gt;offset) &lt;&lt; 9),</div><div class='del'>-			     len &lt;&lt; 9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_generate_checksums(struct ec_stripe_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned i, j, csums_per_device = stripe_csums_per_device(v);</div><div class='del'>-</div><div class='del'>-	if (!v-&gt;csum_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(buf-&gt;offset);</div><div class='del'>-	BUG_ON(buf-&gt;size != le16_to_cpu(v-&gt;sectors));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; v-&gt;nr_blocks; i++)</div><div class='del'>-		for (j = 0; j &lt; csums_per_device; j++)</div><div class='del'>-			stripe_csum_set(v, i, j,</div><div class='del'>-				ec_block_checksum(buf, i, j &lt;&lt; v-&gt;csum_granularity_bits));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_validate_checksums(struct bch_fs *c, struct ec_stripe_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned csum_granularity = 1 &lt;&lt; v-&gt;csum_granularity_bits;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (!v-&gt;csum_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; v-&gt;nr_blocks; i++) {</div><div class='del'>-		unsigned offset = buf-&gt;offset;</div><div class='del'>-		unsigned end = buf-&gt;offset + buf-&gt;size;</div><div class='del'>-</div><div class='del'>-		if (!test_bit(i, buf-&gt;valid))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		while (offset &lt; end) {</div><div class='del'>-			unsigned j = offset &gt;&gt; v-&gt;csum_granularity_bits;</div><div class='del'>-			unsigned len = min(csum_granularity, end - offset);</div><div class='del'>-			struct bch_csum want = stripe_csum_get(v, i, j);</div><div class='del'>-			struct bch_csum got = ec_block_checksum(buf, i, offset);</div><div class='del'>-</div><div class='del'>-			if (bch2_crc_cmp(want, got)) {</div><div class='del'>-				struct printbuf err = PRINTBUF;</div><div class='del'>-				struct bch_dev *ca = bch_dev_bkey_exists(c, v-&gt;ptrs[i].dev);</div><div class='del'>-</div><div class='del'>-				prt_printf(&amp;err, "stripe checksum error: expected %0llx:%0llx got %0llx:%0llx (type %s)\n",</div><div class='del'>-					   want.hi, want.lo,</div><div class='del'>-					   got.hi, got.lo,</div><div class='del'>-					   bch2_csum_types[v-&gt;csum_type]);</div><div class='del'>-				prt_printf(&amp;err, "  for %ps at %u of\n  ", (void *) _RET_IP_, i);</div><div class='del'>-				bch2_bkey_val_to_text(&amp;err, c, bkey_i_to_s_c(&amp;buf-&gt;key));</div><div class='del'>-				bch_err_ratelimited(ca, "%s", err.buf);</div><div class='del'>-				printbuf_exit(&amp;err);</div><div class='del'>-</div><div class='del'>-				clear_bit(i, buf-&gt;valid);</div><div class='del'>-</div><div class='del'>-				bch2_io_error(ca, BCH_MEMBER_ERROR_checksum);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			offset += len;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Erasure coding: */</div><div class='del'>-</div><div class='del'>-static void ec_generate_ec(struct ec_stripe_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned nr_data = v-&gt;nr_blocks - v-&gt;nr_redundant;</div><div class='del'>-	unsigned bytes = le16_to_cpu(v-&gt;sectors) &lt;&lt; 9;</div><div class='del'>-</div><div class='del'>-	raid_gen(nr_data, v-&gt;nr_redundant, bytes, buf-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned ec_nr_failed(struct ec_stripe_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-</div><div class='del'>-	return v-&gt;nr_blocks - bitmap_weight(buf-&gt;valid, v-&gt;nr_blocks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ec_do_recov(struct bch_fs *c, struct ec_stripe_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned i, failed[BCH_BKEY_PTRS_MAX], nr_failed = 0;</div><div class='del'>-	unsigned nr_data = v-&gt;nr_blocks - v-&gt;nr_redundant;</div><div class='del'>-	unsigned bytes = buf-&gt;size &lt;&lt; 9;</div><div class='del'>-</div><div class='del'>-	if (ec_nr_failed(buf) &gt; v-&gt;nr_redundant) {</div><div class='del'>-		bch_err_ratelimited(c,</div><div class='del'>-			"error doing reconstruct read: unable to read enough blocks");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_data; i++)</div><div class='del'>-		if (!test_bit(i, buf-&gt;valid))</div><div class='del'>-			failed[nr_failed++] = i;</div><div class='del'>-</div><div class='del'>-	raid_rec(nr_failed, failed, nr_data, v-&gt;nr_redundant, bytes, buf-&gt;data);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* IO: */</div><div class='del'>-</div><div class='del'>-static void ec_block_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct ec_bio *ec_bio = container_of(bio, struct ec_bio, bio);</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;ec_bio-&gt;buf-&gt;key)-&gt;v;</div><div class='del'>-	struct bch_extent_ptr *ptr = &amp;v-&gt;ptrs[ec_bio-&gt;idx];</div><div class='del'>-	struct bch_dev *ca = ec_bio-&gt;ca;</div><div class='del'>-	struct closure *cl = bio-&gt;bi_private;</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_io_err_on(bio-&gt;bi_status, ca,</div><div class='del'>-			       bio_data_dir(bio)</div><div class='del'>-			       ? BCH_MEMBER_ERROR_write</div><div class='del'>-			       : BCH_MEMBER_ERROR_read,</div><div class='del'>-			       "erasure coding %s error: %s",</div><div class='del'>-			       bio_data_dir(bio) ? "write" : "read",</div><div class='del'>-			       bch2_blk_status_to_str(bio-&gt;bi_status)))</div><div class='del'>-		clear_bit(ec_bio-&gt;idx, ec_bio-&gt;buf-&gt;valid);</div><div class='del'>-</div><div class='del'>-	if (ptr_stale(ca, ptr)) {</div><div class='del'>-		bch_err_ratelimited(ca-&gt;fs,</div><div class='del'>-				    "error %s stripe: stale pointer after io",</div><div class='del'>-				    bio_data_dir(bio) == READ ? "reading from" : "writing to");</div><div class='del'>-		clear_bit(ec_bio-&gt;idx, ec_bio-&gt;buf-&gt;valid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio_put(&amp;ec_bio-&gt;bio);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-	closure_put(cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_block_io(struct bch_fs *c, struct ec_stripe_buf *buf,</div><div class='del'>-			blk_opf_t opf, unsigned idx, struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-	unsigned offset = 0, bytes = buf-&gt;size &lt;&lt; 9;</div><div class='del'>-	struct bch_extent_ptr *ptr = &amp;v-&gt;ptrs[idx];</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-	enum bch_data_type data_type = idx &lt; v-&gt;nr_blocks - v-&gt;nr_redundant</div><div class='del'>-		? BCH_DATA_user</div><div class='del'>-		: BCH_DATA_parity;</div><div class='del'>-	int rw = op_is_write(opf);</div><div class='del'>-</div><div class='del'>-	if (ptr_stale(ca, ptr)) {</div><div class='del'>-		bch_err_ratelimited(c,</div><div class='del'>-				    "error %s stripe: stale pointer",</div><div class='del'>-				    rw == READ ? "reading from" : "writing to");</div><div class='del'>-		clear_bit(idx, buf-&gt;valid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_get_ioref(ca, rw)) {</div><div class='del'>-		clear_bit(idx, buf-&gt;valid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	this_cpu_add(ca-&gt;io_done-&gt;sectors[rw][data_type], buf-&gt;size);</div><div class='del'>-</div><div class='del'>-	while (offset &lt; bytes) {</div><div class='del'>-		unsigned nr_iovecs = min_t(size_t, BIO_MAX_VECS,</div><div class='del'>-					   DIV_ROUND_UP(bytes, PAGE_SIZE));</div><div class='del'>-		unsigned b = min_t(size_t, bytes - offset,</div><div class='del'>-				   nr_iovecs &lt;&lt; PAGE_SHIFT);</div><div class='del'>-		struct ec_bio *ec_bio;</div><div class='del'>-</div><div class='del'>-		ec_bio = container_of(bio_alloc_bioset(ca-&gt;disk_sb.bdev,</div><div class='del'>-						       nr_iovecs,</div><div class='del'>-						       opf,</div><div class='del'>-						       GFP_KERNEL,</div><div class='del'>-						       &amp;c-&gt;ec_bioset),</div><div class='del'>-				      struct ec_bio, bio);</div><div class='del'>-</div><div class='del'>-		ec_bio-&gt;ca			= ca;</div><div class='del'>-		ec_bio-&gt;buf			= buf;</div><div class='del'>-		ec_bio-&gt;idx			= idx;</div><div class='del'>-</div><div class='del'>-		ec_bio-&gt;bio.bi_iter.bi_sector	= ptr-&gt;offset + buf-&gt;offset + (offset &gt;&gt; 9);</div><div class='del'>-		ec_bio-&gt;bio.bi_end_io		= ec_block_endio;</div><div class='del'>-		ec_bio-&gt;bio.bi_private		= cl;</div><div class='del'>-</div><div class='del'>-		bch2_bio_map(&amp;ec_bio-&gt;bio, buf-&gt;data[idx] + offset, b);</div><div class='del'>-</div><div class='del'>-		closure_get(cl);</div><div class='del'>-		percpu_ref_get(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-		submit_bio(&amp;ec_bio-&gt;bio);</div><div class='del'>-</div><div class='del'>-		offset += b;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_stripe_key_trans(struct btree_trans *trans, u64 idx,</div><div class='del'>-				struct ec_stripe_buf *stripe)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_stripes,</div><div class='del'>-			       POS(0, idx), BTREE_ITER_SLOTS);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_stripe) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	bkey_reassemble(&amp;stripe-&gt;key, k);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* recovery read path: */</div><div class='del'>-int bch2_ec_read_extent(struct btree_trans *trans, struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct ec_stripe_buf *buf;</div><div class='del'>-	struct closure cl;</div><div class='del'>-	struct bch_stripe *v;</div><div class='del'>-	unsigned i, offset;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!rbio-&gt;pick.has_ec);</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(sizeof(*buf), GFP_NOFS);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -BCH_ERR_ENOMEM_ec_read_extent;</div><div class='del'>-</div><div class='del'>-	ret = lockrestart_do(trans, get_stripe_key_trans(trans, rbio-&gt;pick.ec.idx, buf));</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err_ratelimited(c,</div><div class='del'>-			"error doing reconstruct read: error %i looking up stripe", ret);</div><div class='del'>-		kfree(buf);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	v = &amp;bkey_i_to_stripe(&amp;buf-&gt;key)-&gt;v;</div><div class='del'>-</div><div class='del'>-	if (!bch2_ptr_matches_stripe(v, rbio-&gt;pick)) {</div><div class='del'>-		bch_err_ratelimited(c,</div><div class='del'>-			"error doing reconstruct read: pointer doesn't match stripe");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	offset = rbio-&gt;bio.bi_iter.bi_sector - v-&gt;ptrs[rbio-&gt;pick.ec.block].offset;</div><div class='del'>-	if (offset + bio_sectors(&amp;rbio-&gt;bio) &gt; le16_to_cpu(v-&gt;sectors)) {</div><div class='del'>-		bch_err_ratelimited(c,</div><div class='del'>-			"error doing reconstruct read: read is bigger than stripe");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ec_stripe_buf_init(buf, offset, bio_sectors(&amp;rbio-&gt;bio));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; v-&gt;nr_blocks; i++)</div><div class='del'>-		ec_block_io(c, buf, REQ_OP_READ, i, &amp;cl);</div><div class='del'>-</div><div class='del'>-	closure_sync(&amp;cl);</div><div class='del'>-</div><div class='del'>-	if (ec_nr_failed(buf) &gt; v-&gt;nr_redundant) {</div><div class='del'>-		bch_err_ratelimited(c,</div><div class='del'>-			"error doing reconstruct read: unable to read enough blocks");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ec_validate_checksums(c, buf);</div><div class='del'>-</div><div class='del'>-	ret = ec_do_recov(c, buf);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	memcpy_to_bio(&amp;rbio-&gt;bio, rbio-&gt;bio.bi_iter,</div><div class='del'>-		      buf-&gt;data[rbio-&gt;pick.ec.block] + ((offset - buf-&gt;offset) &lt;&lt; 9));</div><div class='del'>-err:</div><div class='del'>-	ec_stripe_buf_exit(buf);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stripe bucket accounting: */</div><div class='del'>-</div><div class='del'>-static int __ec_stripe_mem_alloc(struct bch_fs *c, size_t idx, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	ec_stripes_heap n, *h = &amp;c-&gt;ec_stripes_heap;</div><div class='del'>-</div><div class='del'>-	if (idx &gt;= h-&gt;size) {</div><div class='del'>-		if (!init_heap(&amp;n, max(1024UL, roundup_pow_of_two(idx + 1)), gfp))</div><div class='del'>-			return -BCH_ERR_ENOMEM_ec_stripe_mem_alloc;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-		if (n.size &gt; h-&gt;size) {</div><div class='del'>-			memcpy(n.data, h-&gt;data, h-&gt;used * sizeof(h-&gt;data[0]));</div><div class='del'>-			n.used = h-&gt;used;</div><div class='del'>-			swap(*h, n);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-		free_heap(&amp;n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!genradix_ptr_alloc(&amp;c-&gt;stripes, idx, gfp))</div><div class='del'>-		return -BCH_ERR_ENOMEM_ec_stripe_mem_alloc;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;gc_pos.phase != GC_PHASE_NOT_RUNNING &amp;&amp;</div><div class='del'>-	    !genradix_ptr_alloc(&amp;c-&gt;gc_stripes, idx, gfp))</div><div class='del'>-		return -BCH_ERR_ENOMEM_ec_stripe_mem_alloc;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ec_stripe_mem_alloc(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter)</div><div class='del'>-{</div><div class='del'>-	return allocate_dropping_locks_errcode(trans,</div><div class='del'>-			__ec_stripe_mem_alloc(trans-&gt;c, iter-&gt;pos.offset, _gfp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Hash table of open stripes:</div><div class='del'>- * Stripes that are being created or modified are kept in a hash table, so that</div><div class='del'>- * stripe deletion can skip them.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static bool __bch2_stripe_is_open(struct bch_fs *c, u64 idx)</div><div class='del'>-{</div><div class='del'>-	unsigned hash = hash_64(idx, ilog2(ARRAY_SIZE(c-&gt;ec_stripes_new)));</div><div class='del'>-	struct ec_stripe_new *s;</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry(s, &amp;c-&gt;ec_stripes_new[hash], hash)</div><div class='del'>-		if (s-&gt;idx == idx)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_stripe_is_open(struct bch_fs *c, u64 idx)</div><div class='del'>-{</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-	ret = __bch2_stripe_is_open(c, idx);</div><div class='del'>-	spin_unlock(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_try_open_stripe(struct bch_fs *c,</div><div class='del'>-				 struct ec_stripe_new *s,</div><div class='del'>-				 u64 idx)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-	ret = !__bch2_stripe_is_open(c, idx);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unsigned hash = hash_64(idx, ilog2(ARRAY_SIZE(c-&gt;ec_stripes_new)));</div><div class='del'>-</div><div class='del'>-		s-&gt;idx = idx;</div><div class='del'>-		hlist_add_head(&amp;s-&gt;hash, &amp;c-&gt;ec_stripes_new[hash]);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_stripe_close(struct bch_fs *c, struct ec_stripe_new *s)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!s-&gt;idx);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-	hlist_del_init(&amp;s-&gt;hash);</div><div class='del'>-	spin_unlock(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-</div><div class='del'>-	s-&gt;idx = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Heap of all existing stripes, ordered by blocks_nonempty */</div><div class='del'>-</div><div class='del'>-static u64 stripe_idx_to_delete(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	ec_stripes_heap *h = &amp;c-&gt;ec_stripes_heap;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-	if (h-&gt;used &amp;&amp;</div><div class='del'>-	    h-&gt;data[0].blocks_nonempty == 0 &amp;&amp;</div><div class='del'>-	    !bch2_stripe_is_open(c, h-&gt;data[0].idx))</div><div class='del'>-		return h-&gt;data[0].idx;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ec_stripes_heap_cmp(ec_stripes_heap *h,</div><div class='del'>-				      struct ec_stripe_heap_entry l,</div><div class='del'>-				      struct ec_stripe_heap_entry r)</div><div class='del'>-{</div><div class='del'>-	return ((l.blocks_nonempty &gt; r.blocks_nonempty) -</div><div class='del'>-		(l.blocks_nonempty &lt; r.blocks_nonempty));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ec_stripes_heap_set_backpointer(ec_stripes_heap *h,</div><div class='del'>-						   size_t i)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(h, struct bch_fs, ec_stripes_heap);</div><div class='del'>-</div><div class='del'>-	genradix_ptr(&amp;c-&gt;stripes, h-&gt;data[i].idx)-&gt;heap_idx = i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void heap_verify_backpointer(struct bch_fs *c, size_t idx)</div><div class='del'>-{</div><div class='del'>-	ec_stripes_heap *h = &amp;c-&gt;ec_stripes_heap;</div><div class='del'>-	struct stripe *m = genradix_ptr(&amp;c-&gt;stripes, idx);</div><div class='del'>-</div><div class='del'>-	BUG_ON(m-&gt;heap_idx &gt;= h-&gt;used);</div><div class='del'>-	BUG_ON(h-&gt;data[m-&gt;heap_idx].idx != idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_stripes_heap_del(struct bch_fs *c,</div><div class='del'>-			   struct stripe *m, size_t idx)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-	heap_verify_backpointer(c, idx);</div><div class='del'>-</div><div class='del'>-	heap_del(&amp;c-&gt;ec_stripes_heap, m-&gt;heap_idx,</div><div class='del'>-		 ec_stripes_heap_cmp,</div><div class='del'>-		 ec_stripes_heap_set_backpointer);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_stripes_heap_insert(struct bch_fs *c,</div><div class='del'>-			      struct stripe *m, size_t idx)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-	BUG_ON(heap_full(&amp;c-&gt;ec_stripes_heap));</div><div class='del'>-</div><div class='del'>-	heap_add(&amp;c-&gt;ec_stripes_heap, ((struct ec_stripe_heap_entry) {</div><div class='del'>-			.idx = idx,</div><div class='del'>-			.blocks_nonempty = m-&gt;blocks_nonempty,</div><div class='del'>-		}),</div><div class='del'>-		 ec_stripes_heap_cmp,</div><div class='del'>-		 ec_stripes_heap_set_backpointer);</div><div class='del'>-</div><div class='del'>-	heap_verify_backpointer(c, idx);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_stripes_heap_update(struct bch_fs *c,</div><div class='del'>-			      struct stripe *m, size_t idx)</div><div class='del'>-{</div><div class='del'>-	ec_stripes_heap *h = &amp;c-&gt;ec_stripes_heap;</div><div class='del'>-	bool do_deletes;</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-	heap_verify_backpointer(c, idx);</div><div class='del'>-</div><div class='del'>-	h-&gt;data[m-&gt;heap_idx].blocks_nonempty = m-&gt;blocks_nonempty;</div><div class='del'>-</div><div class='del'>-	i = m-&gt;heap_idx;</div><div class='del'>-	heap_sift_up(h,	  i, ec_stripes_heap_cmp,</div><div class='del'>-		     ec_stripes_heap_set_backpointer);</div><div class='del'>-	heap_sift_down(h, i, ec_stripes_heap_cmp,</div><div class='del'>-		       ec_stripes_heap_set_backpointer);</div><div class='del'>-</div><div class='del'>-	heap_verify_backpointer(c, idx);</div><div class='del'>-</div><div class='del'>-	do_deletes = stripe_idx_to_delete(c) != 0;</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-	if (do_deletes)</div><div class='del'>-		bch2_do_stripe_deletes(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stripe deletion */</div><div class='del'>-</div><div class='del'>-static int ec_stripe_delete(struct btree_trans *trans, u64 idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_s_c_stripe s;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_stripes, POS(0, idx),</div><div class='del'>-			       BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_stripe) {</div><div class='del'>-		bch2_fs_inconsistent(c, "attempting to delete nonexistent stripe %llu", idx);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = bkey_s_c_to_stripe(k);</div><div class='del'>-	for (unsigned i = 0; i &lt; s.v-&gt;nr_blocks; i++)</div><div class='del'>-		if (stripe_blockcount_get(s.v, i)) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-			bch2_fs_inconsistent(c, "attempting to delete nonempty stripe %s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_delete_at(trans, &amp;iter, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_stripe_delete_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c =</div><div class='del'>-		container_of(work, struct bch_fs, ec_stripe_delete_work);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-		u64 idx = stripe_idx_to_delete(c);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-		if (!idx)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		int ret = bch2_trans_do(c, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-					ec_stripe_delete(trans, idx));</div><div class='del'>-		bch_err_fn(c, ret);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_stripe_delete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_do_stripe_deletes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bch2_write_ref_tryget(c, BCH_WRITE_REF_stripe_delete) &amp;&amp;</div><div class='del'>-	    !queue_work(c-&gt;write_ref_wq, &amp;c-&gt;ec_stripe_delete_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_stripe_delete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stripe creation: */</div><div class='del'>-</div><div class='del'>-static int ec_stripe_key_update(struct btree_trans *trans,</div><div class='del'>-				struct bkey_i_stripe *new,</div><div class='del'>-				bool create)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_stripes,</div><div class='del'>-			       new-&gt;k.p, BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != (create ? KEY_TYPE_deleted : KEY_TYPE_stripe)) {</div><div class='del'>-		bch2_fs_inconsistent(c, "error %s stripe: got existing key type %s",</div><div class='del'>-				     create ? "creating" : "updating",</div><div class='del'>-				     bch2_bkey_types[k.k-&gt;type]);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_stripe) {</div><div class='del'>-		const struct bch_stripe *old = bkey_s_c_to_stripe(k).v;</div><div class='del'>-		unsigned i;</div><div class='del'>-</div><div class='del'>-		if (old-&gt;nr_blocks != new-&gt;v.nr_blocks) {</div><div class='del'>-			bch_err(c, "error updating stripe: nr_blocks does not match");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; new-&gt;v.nr_blocks; i++) {</div><div class='del'>-			unsigned v = stripe_blockcount_get(old, i);</div><div class='del'>-</div><div class='del'>-			BUG_ON(v &amp;&amp;</div><div class='del'>-			       (old-&gt;ptrs[i].dev != new-&gt;v.ptrs[i].dev ||</div><div class='del'>-				old-&gt;ptrs[i].gen != new-&gt;v.ptrs[i].gen ||</div><div class='del'>-				old-&gt;ptrs[i].offset != new-&gt;v.ptrs[i].offset));</div><div class='del'>-</div><div class='del'>-			stripe_blockcount_set(&amp;new-&gt;v, i, v);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;new-&gt;k_i, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ec_stripe_update_extent(struct btree_trans *trans,</div><div class='del'>-				   struct bpos bucket, u8 gen,</div><div class='del'>-				   struct ec_stripe_buf *s,</div><div class='del'>-				   struct bpos *bp_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;s-&gt;key)-&gt;v;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_backpointer bp;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	const struct bch_extent_ptr *ptr_c;</div><div class='del'>-	struct bch_extent_ptr *ptr, *ec_ptr = NULL;</div><div class='del'>-	struct bch_extent_stripe_ptr stripe_ptr;</div><div class='del'>-	struct bkey_i *n;</div><div class='del'>-	int ret, dev, block;</div><div class='del'>-</div><div class='del'>-	ret = bch2_get_next_backpointer(trans, bucket, gen,</div><div class='del'>-				bp_pos, &amp;bp, BTREE_ITER_CACHED);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	if (bpos_eq(*bp_pos, SPOS_MAX))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bp.level) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-		struct btree_iter node_iter;</div><div class='del'>-		struct btree *b;</div><div class='del'>-</div><div class='del'>-		b = bch2_backpointer_get_node(trans, &amp;node_iter, *bp_pos, bp);</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;node_iter);</div><div class='del'>-</div><div class='del'>-		if (!b)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "found btree node in erasure coded bucket: b=%px\n", b);</div><div class='del'>-		bch2_backpointer_to_text(&amp;buf, &amp;bp);</div><div class='del'>-</div><div class='del'>-		bch2_fs_inconsistent(c, "%s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_backpointer_get_key(trans, &amp;iter, *bp_pos, bp, BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	if (!k.k) {</div><div class='del'>-		/*</div><div class='del'>-		 * extent no longer exists - we could flush the btree</div><div class='del'>-		 * write buffer and retry to verify, but no need:</div><div class='del'>-		 */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (extent_has_stripe_ptr(k, s-&gt;key.k.p.offset))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ptr_c = bkey_matches_stripe(v, k, &amp;block);</div><div class='del'>-	/*</div><div class='del'>-	 * It doesn't generally make sense to erasure code cached ptrs:</div><div class='del'>-	 * XXX: should we be incrementing a counter?</div><div class='del'>-	 */</div><div class='del'>-	if (!ptr_c || ptr_c-&gt;cached)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	dev = v-&gt;ptrs[block].dev;</div><div class='del'>-</div><div class='del'>-	n = bch2_trans_kmalloc(trans, bkey_bytes(k.k) + sizeof(stripe_ptr));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	bkey_reassemble(n, k);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_drop_ptrs(bkey_i_to_s(n), ptr, ptr-&gt;dev != dev);</div><div class='del'>-	ec_ptr = bch2_bkey_has_device(bkey_i_to_s(n), dev);</div><div class='del'>-	BUG_ON(!ec_ptr);</div><div class='del'>-</div><div class='del'>-	stripe_ptr = (struct bch_extent_stripe_ptr) {</div><div class='del'>-		.type = 1 &lt;&lt; BCH_EXTENT_ENTRY_stripe_ptr,</div><div class='del'>-		.block		= block,</div><div class='del'>-		.redundancy	= v-&gt;nr_redundant,</div><div class='del'>-		.idx		= s-&gt;key.k.p.offset,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	__extent_entry_insert(n,</div><div class='del'>-			(union bch_extent_entry *) ec_ptr,</div><div class='del'>-			(union bch_extent_entry *) &amp;stripe_ptr);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, n, 0);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ec_stripe_update_bucket(struct btree_trans *trans, struct ec_stripe_buf *s,</div><div class='del'>-				   unsigned block)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;s-&gt;key)-&gt;v;</div><div class='del'>-	struct bch_extent_ptr bucket = v-&gt;ptrs[block];</div><div class='del'>-	struct bpos bucket_pos = PTR_BUCKET_POS(c, &amp;bucket);</div><div class='del'>-	struct bpos bp_pos = POS_MIN;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		ret = commit_do(trans, NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			ec_stripe_update_extent(trans, bucket_pos, bucket.gen,</div><div class='del'>-						s, &amp;bp_pos));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-		if (bkey_eq(bp_pos, POS_MAX))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bp_pos = bpos_nosnap_successor(bp_pos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ec_stripe_update_extents(struct bch_fs *c, struct ec_stripe_buf *s)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;s-&gt;key)-&gt;v;</div><div class='del'>-	unsigned i, nr_data = v-&gt;nr_blocks - v-&gt;nr_redundant;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_write_buffer_flush_sync(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_data; i++) {</div><div class='del'>-		ret = ec_stripe_update_bucket(trans, s, i);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void zero_out_rest_of_ec_bucket(struct bch_fs *c,</div><div class='del'>-				       struct ec_stripe_new *s,</div><div class='del'>-				       unsigned block,</div><div class='del'>-				       struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-	unsigned offset = ca-&gt;mi.bucket_size - ob-&gt;sectors_free;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_get_ioref(ca, WRITE)) {</div><div class='del'>-		s-&gt;err = -BCH_ERR_erofs_no_writes;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(s-&gt;new_stripe.data[block] + (offset &lt;&lt; 9),</div><div class='del'>-	       0,</div><div class='del'>-	       ob-&gt;sectors_free &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-	ret = blkdev_issue_zeroout(ca-&gt;disk_sb.bdev,</div><div class='del'>-			ob-&gt;bucket * ca-&gt;mi.bucket_size + offset,</div><div class='del'>-			ob-&gt;sectors_free,</div><div class='del'>-			GFP_KERNEL, 0);</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		s-&gt;err = ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ec_stripe_new_free(struct bch_fs *c, struct ec_stripe_new *s)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;idx)</div><div class='del'>-		bch2_stripe_close(c, s);</div><div class='del'>-	kfree(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * data buckets of new stripe all written: create the stripe</div><div class='del'>- */</div><div class='del'>-static void ec_stripe_create(struct ec_stripe_new *s)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = s-&gt;c;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;s-&gt;new_stripe.key)-&gt;v;</div><div class='del'>-	unsigned i, nr_data = v-&gt;nr_blocks - v-&gt;nr_redundant;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(s-&gt;h-&gt;s == s);</div><div class='del'>-</div><div class='del'>-	closure_sync(&amp;s-&gt;iodone);</div><div class='del'>-</div><div class='del'>-	if (!s-&gt;err) {</div><div class='del'>-		for (i = 0; i &lt; nr_data; i++)</div><div class='del'>-			if (s-&gt;blocks[i]) {</div><div class='del'>-				ob = c-&gt;open_buckets + s-&gt;blocks[i];</div><div class='del'>-</div><div class='del'>-				if (ob-&gt;sectors_free)</div><div class='del'>-					zero_out_rest_of_ec_bucket(c, s, i, ob);</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (s-&gt;err) {</div><div class='del'>-		if (!bch2_err_matches(s-&gt;err, EROFS))</div><div class='del'>-			bch_err(c, "error creating stripe: error writing data buckets");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (s-&gt;have_existing_stripe) {</div><div class='del'>-		ec_validate_checksums(c, &amp;s-&gt;existing_stripe);</div><div class='del'>-</div><div class='del'>-		if (ec_do_recov(c, &amp;s-&gt;existing_stripe)) {</div><div class='del'>-			bch_err(c, "error creating stripe: error reading existing stripe");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nr_data; i++)</div><div class='del'>-			if (stripe_blockcount_get(&amp;bkey_i_to_stripe(&amp;s-&gt;existing_stripe.key)-&gt;v, i))</div><div class='del'>-				swap(s-&gt;new_stripe.data[i],</div><div class='del'>-				     s-&gt;existing_stripe.data[i]);</div><div class='del'>-</div><div class='del'>-		ec_stripe_buf_exit(&amp;s-&gt;existing_stripe);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!s-&gt;allocated);</div><div class='del'>-	BUG_ON(!s-&gt;idx);</div><div class='del'>-</div><div class='del'>-	ec_generate_ec(&amp;s-&gt;new_stripe);</div><div class='del'>-</div><div class='del'>-	ec_generate_checksums(&amp;s-&gt;new_stripe);</div><div class='del'>-</div><div class='del'>-	/* write p/q: */</div><div class='del'>-	for (i = nr_data; i &lt; v-&gt;nr_blocks; i++)</div><div class='del'>-		ec_block_io(c, &amp;s-&gt;new_stripe, REQ_OP_WRITE, i, &amp;s-&gt;iodone);</div><div class='del'>-	closure_sync(&amp;s-&gt;iodone);</div><div class='del'>-</div><div class='del'>-	if (ec_nr_failed(&amp;s-&gt;new_stripe)) {</div><div class='del'>-		bch_err(c, "error creating stripe: error writing redundancy buckets");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_do(c, &amp;s-&gt;res, NULL,</div><div class='del'>-			    BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-			    BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			    ec_stripe_key_update(trans,</div><div class='del'>-					bkey_i_to_stripe(&amp;s-&gt;new_stripe.key),</div><div class='del'>-					!s-&gt;have_existing_stripe));</div><div class='del'>-	bch_err_msg(c, ret, "creating stripe key");</div><div class='del'>-	if (ret) {</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ec_stripe_update_extents(c, &amp;s-&gt;new_stripe);</div><div class='del'>-	bch_err_msg(c, ret, "error updating extents");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-err:</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;s-&gt;res);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; v-&gt;nr_blocks; i++)</div><div class='del'>-		if (s-&gt;blocks[i]) {</div><div class='del'>-			ob = c-&gt;open_buckets + s-&gt;blocks[i];</div><div class='del'>-</div><div class='del'>-			if (i &lt; nr_data) {</div><div class='del'>-				ob-&gt;ec = NULL;</div><div class='del'>-				__bch2_open_bucket_put(c, ob);</div><div class='del'>-			} else {</div><div class='del'>-				bch2_open_bucket_put(c, ob);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	list_del(&amp;s-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	wake_up(&amp;c-&gt;ec_stripe_new_wait);</div><div class='del'>-</div><div class='del'>-	ec_stripe_buf_exit(&amp;s-&gt;existing_stripe);</div><div class='del'>-	ec_stripe_buf_exit(&amp;s-&gt;new_stripe);</div><div class='del'>-	closure_debug_destroy(&amp;s-&gt;iodone);</div><div class='del'>-</div><div class='del'>-	ec_stripe_new_put(c, s, STRIPE_REF_stripe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ec_stripe_new *get_pending_stripe(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_new *s;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	list_for_each_entry(s, &amp;c-&gt;ec_stripe_new_list, list)</div><div class='del'>-		if (!atomic_read(&amp;s-&gt;ref[STRIPE_REF_io]))</div><div class='del'>-			goto out;</div><div class='del'>-	s = NULL;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_stripe_create_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work,</div><div class='del'>-		struct bch_fs, ec_stripe_create_work);</div><div class='del'>-	struct ec_stripe_new *s;</div><div class='del'>-</div><div class='del'>-	while ((s = get_pending_stripe(c)))</div><div class='del'>-		ec_stripe_create(s);</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_stripe_create);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ec_do_stripe_creates(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bch2_write_ref_get(c, BCH_WRITE_REF_stripe_create);</div><div class='del'>-</div><div class='del'>-	if (!queue_work(system_long_wq, &amp;c-&gt;ec_stripe_create_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_stripe_create);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_stripe_set_pending(struct bch_fs *c, struct ec_stripe_head *h)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_new *s = h-&gt;s;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!s-&gt;allocated &amp;&amp; !s-&gt;err);</div><div class='del'>-</div><div class='del'>-	h-&gt;s		= NULL;</div><div class='del'>-	s-&gt;pending	= true;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	list_add(&amp;s-&gt;list, &amp;c-&gt;ec_stripe_new_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-</div><div class='del'>-	ec_stripe_new_put(c, s, STRIPE_REF_io);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ec_bucket_cancel(struct bch_fs *c, struct open_bucket *ob)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_new *s = ob-&gt;ec;</div><div class='del'>-</div><div class='del'>-	s-&gt;err = -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *bch2_writepoint_ec_buf(struct bch_fs *c, struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	struct open_bucket *ob = ec_open_bucket(c, &amp;wp-&gt;ptrs);</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	unsigned offset;</div><div class='del'>-</div><div class='del'>-	if (!ob)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ob-&gt;ec-&gt;new_stripe.data[ob-&gt;ec_idx]);</div><div class='del'>-</div><div class='del'>-	ca	= bch_dev_bkey_exists(c, ob-&gt;dev);</div><div class='del'>-	offset	= ca-&gt;mi.bucket_size - ob-&gt;sectors_free;</div><div class='del'>-</div><div class='del'>-	return ob-&gt;ec-&gt;new_stripe.data[ob-&gt;ec_idx] + (offset &lt;&lt; 9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int unsigned_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	unsigned l = *((const unsigned *) _l);</div><div class='del'>-	unsigned r = *((const unsigned *) _r);</div><div class='del'>-</div><div class='del'>-	return cmp_int(l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pick most common bucket size: */</div><div class='del'>-static unsigned pick_blocksize(struct bch_fs *c,</div><div class='del'>-			       struct bch_devs_mask *devs)</div><div class='del'>-{</div><div class='del'>-	unsigned nr = 0, sizes[BCH_SB_MEMBERS_MAX];</div><div class='del'>-	struct {</div><div class='del'>-		unsigned nr, size;</div><div class='del'>-	} cur = { 0, 0 }, best = { 0, 0 };</div><div class='del'>-</div><div class='del'>-	for_each_member_device_rcu(c, ca, devs)</div><div class='del'>-		sizes[nr++] = ca-&gt;mi.bucket_size;</div><div class='del'>-</div><div class='del'>-	sort(sizes, nr, sizeof(unsigned), unsigned_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; nr; i++) {</div><div class='del'>-		if (sizes[i] != cur.size) {</div><div class='del'>-			if (cur.nr &gt; best.nr)</div><div class='del'>-				best = cur;</div><div class='del'>-</div><div class='del'>-			cur.nr = 0;</div><div class='del'>-			cur.size = sizes[i];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cur.nr++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cur.nr &gt; best.nr)</div><div class='del'>-		best = cur;</div><div class='del'>-</div><div class='del'>-	return best.size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool may_create_new_stripe(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ec_stripe_key_init(struct bch_fs *c,</div><div class='del'>-			       struct bkey_i *k,</div><div class='del'>-			       unsigned nr_data,</div><div class='del'>-			       unsigned nr_parity,</div><div class='del'>-			       unsigned stripe_size)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_stripe *s = bkey_stripe_init(k);</div><div class='del'>-	unsigned u64s;</div><div class='del'>-</div><div class='del'>-	s-&gt;v.sectors			= cpu_to_le16(stripe_size);</div><div class='del'>-	s-&gt;v.algorithm			= 0;</div><div class='del'>-	s-&gt;v.nr_blocks			= nr_data + nr_parity;</div><div class='del'>-	s-&gt;v.nr_redundant		= nr_parity;</div><div class='del'>-	s-&gt;v.csum_granularity_bits	= ilog2(c-&gt;opts.encoded_extent_max &gt;&gt; 9);</div><div class='del'>-	s-&gt;v.csum_type			= BCH_CSUM_crc32c;</div><div class='del'>-	s-&gt;v.pad			= 0;</div><div class='del'>-</div><div class='del'>-	while ((u64s = stripe_val_u64s(&amp;s-&gt;v)) &gt; BKEY_VAL_U64s_MAX) {</div><div class='del'>-		BUG_ON(1 &lt;&lt; s-&gt;v.csum_granularity_bits &gt;=</div><div class='del'>-		       le16_to_cpu(s-&gt;v.sectors) ||</div><div class='del'>-		       s-&gt;v.csum_granularity_bits == U8_MAX);</div><div class='del'>-		s-&gt;v.csum_granularity_bits++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bkey_val_u64s(&amp;s-&gt;k, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ec_new_stripe_alloc(struct bch_fs *c, struct ec_stripe_head *h)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_new *s;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;h-&gt;lock);</div><div class='del'>-</div><div class='del'>-	s = kzalloc(sizeof(*s), GFP_KERNEL);</div><div class='del'>-	if (!s)</div><div class='del'>-		return -BCH_ERR_ENOMEM_ec_new_stripe_alloc;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;s-&gt;lock);</div><div class='del'>-	closure_init(&amp;s-&gt;iodone, NULL);</div><div class='del'>-	atomic_set(&amp;s-&gt;ref[STRIPE_REF_stripe], 1);</div><div class='del'>-	atomic_set(&amp;s-&gt;ref[STRIPE_REF_io], 1);</div><div class='del'>-	s-&gt;c		= c;</div><div class='del'>-	s-&gt;h		= h;</div><div class='del'>-	s-&gt;nr_data	= min_t(unsigned, h-&gt;nr_active_devs,</div><div class='del'>-				BCH_BKEY_PTRS_MAX) - h-&gt;redundancy;</div><div class='del'>-	s-&gt;nr_parity	= h-&gt;redundancy;</div><div class='del'>-</div><div class='del'>-	ec_stripe_key_init(c, &amp;s-&gt;new_stripe.key,</div><div class='del'>-			   s-&gt;nr_data, s-&gt;nr_parity, h-&gt;blocksize);</div><div class='del'>-</div><div class='del'>-	h-&gt;s = s;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ec_stripe_head *</div><div class='del'>-ec_new_stripe_head_alloc(struct bch_fs *c, unsigned target,</div><div class='del'>-			 unsigned algo, unsigned redundancy,</div><div class='del'>-			 enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-</div><div class='del'>-	h = kzalloc(sizeof(*h), GFP_KERNEL);</div><div class='del'>-	if (!h)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;h-&gt;lock);</div><div class='del'>-	BUG_ON(!mutex_trylock(&amp;h-&gt;lock));</div><div class='del'>-</div><div class='del'>-	h-&gt;target	= target;</div><div class='del'>-	h-&gt;algo		= algo;</div><div class='del'>-	h-&gt;redundancy	= redundancy;</div><div class='del'>-	h-&gt;watermark	= watermark;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	h-&gt;devs = target_rw_devs(c, BCH_DATA_user, target);</div><div class='del'>-</div><div class='del'>-	for_each_member_device_rcu(c, ca, &amp;h-&gt;devs)</div><div class='del'>-		if (!ca-&gt;mi.durability)</div><div class='del'>-			__clear_bit(ca-&gt;dev_idx, h-&gt;devs.d);</div><div class='del'>-</div><div class='del'>-	h-&gt;blocksize = pick_blocksize(c, &amp;h-&gt;devs);</div><div class='del'>-</div><div class='del'>-	for_each_member_device_rcu(c, ca, &amp;h-&gt;devs)</div><div class='del'>-		if (ca-&gt;mi.bucket_size == h-&gt;blocksize)</div><div class='del'>-			h-&gt;nr_active_devs++;</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we only have redundancy + 1 devices, we're better off with just</div><div class='del'>-	 * replication:</div><div class='del'>-	 */</div><div class='del'>-	if (h-&gt;nr_active_devs &lt; h-&gt;redundancy + 2)</div><div class='del'>-		bch_err(c, "insufficient devices available to create stripe (have %u, need %u) - mismatched bucket sizes?",</div><div class='del'>-			h-&gt;nr_active_devs, h-&gt;redundancy + 2);</div><div class='del'>-</div><div class='del'>-	list_add(&amp;h-&gt;list, &amp;c-&gt;ec_stripe_head_list);</div><div class='del'>-	return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ec_stripe_head_put(struct bch_fs *c, struct ec_stripe_head *h)</div><div class='del'>-{</div><div class='del'>-	if (h-&gt;s &amp;&amp;</div><div class='del'>-	    h-&gt;s-&gt;allocated &amp;&amp;</div><div class='del'>-	    bitmap_weight(h-&gt;s-&gt;blocks_allocated,</div><div class='del'>-			  h-&gt;s-&gt;nr_data) == h-&gt;s-&gt;nr_data)</div><div class='del'>-		ec_stripe_set_pending(c, h);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;h-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ec_stripe_head *</div><div class='del'>-__bch2_ec_stripe_head_get(struct btree_trans *trans,</div><div class='del'>-			  unsigned target,</div><div class='del'>-			  unsigned algo,</div><div class='del'>-			  unsigned redundancy,</div><div class='del'>-			  enum bch_watermark watermark)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!redundancy)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_mutex_lock(trans, &amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_going_ro, &amp;c-&gt;flags)) {</div><div class='del'>-		h = ERR_PTR(-BCH_ERR_erofs_no_writes);</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(h, &amp;c-&gt;ec_stripe_head_list, list)</div><div class='del'>-		if (h-&gt;target		== target &amp;&amp;</div><div class='del'>-		    h-&gt;algo		== algo &amp;&amp;</div><div class='del'>-		    h-&gt;redundancy	== redundancy &amp;&amp;</div><div class='del'>-		    h-&gt;watermark	== watermark) {</div><div class='del'>-			ret = bch2_trans_mutex_lock(trans, &amp;h-&gt;lock);</div><div class='del'>-			if (ret)</div><div class='del'>-				h = ERR_PTR(ret);</div><div class='del'>-			goto found;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	h = ec_new_stripe_head_alloc(c, target, algo, redundancy, watermark);</div><div class='del'>-found:</div><div class='del'>-	if (!IS_ERR_OR_NULL(h) &amp;&amp;</div><div class='del'>-	    h-&gt;nr_active_devs &lt; h-&gt;redundancy + 2) {</div><div class='del'>-		mutex_unlock(&amp;h-&gt;lock);</div><div class='del'>-		h = NULL;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-	return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int new_stripe_alloc_buckets(struct btree_trans *trans, struct ec_stripe_head *h,</div><div class='del'>-				    enum bch_watermark watermark, struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_devs_mask devs = h-&gt;devs;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	struct open_buckets buckets;</div><div class='del'>-	struct bch_stripe *v = &amp;bkey_i_to_stripe(&amp;h-&gt;s-&gt;new_stripe.key)-&gt;v;</div><div class='del'>-	unsigned i, j, nr_have_parity = 0, nr_have_data = 0;</div><div class='del'>-	bool have_cache = true;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(v-&gt;nr_blocks	!= h-&gt;s-&gt;nr_data + h-&gt;s-&gt;nr_parity);</div><div class='del'>-	BUG_ON(v-&gt;nr_redundant	!= h-&gt;s-&gt;nr_parity);</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(i, h-&gt;s-&gt;blocks_gotten, v-&gt;nr_blocks) {</div><div class='del'>-		__clear_bit(v-&gt;ptrs[i].dev, devs.d);</div><div class='del'>-		if (i &lt; h-&gt;s-&gt;nr_data)</div><div class='del'>-			nr_have_data++;</div><div class='del'>-		else</div><div class='del'>-			nr_have_parity++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(nr_have_data	&gt; h-&gt;s-&gt;nr_data);</div><div class='del'>-	BUG_ON(nr_have_parity	&gt; h-&gt;s-&gt;nr_parity);</div><div class='del'>-</div><div class='del'>-	buckets.nr = 0;</div><div class='del'>-	if (nr_have_parity &lt; h-&gt;s-&gt;nr_parity) {</div><div class='del'>-		ret = bch2_bucket_alloc_set_trans(trans, &amp;buckets,</div><div class='del'>-					    &amp;h-&gt;parity_stripe,</div><div class='del'>-					    &amp;devs,</div><div class='del'>-					    h-&gt;s-&gt;nr_parity,</div><div class='del'>-					    &amp;nr_have_parity,</div><div class='del'>-					    &amp;have_cache, 0,</div><div class='del'>-					    BCH_DATA_parity,</div><div class='del'>-					    watermark,</div><div class='del'>-					    cl);</div><div class='del'>-</div><div class='del'>-		open_bucket_for_each(c, &amp;buckets, ob, i) {</div><div class='del'>-			j = find_next_zero_bit(h-&gt;s-&gt;blocks_gotten,</div><div class='del'>-					       h-&gt;s-&gt;nr_data + h-&gt;s-&gt;nr_parity,</div><div class='del'>-					       h-&gt;s-&gt;nr_data);</div><div class='del'>-			BUG_ON(j &gt;= h-&gt;s-&gt;nr_data + h-&gt;s-&gt;nr_parity);</div><div class='del'>-</div><div class='del'>-			h-&gt;s-&gt;blocks[j] = buckets.v[i];</div><div class='del'>-			v-&gt;ptrs[j] = bch2_ob_ptr(c, ob);</div><div class='del'>-			__set_bit(j, h-&gt;s-&gt;blocks_gotten);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buckets.nr = 0;</div><div class='del'>-	if (nr_have_data &lt; h-&gt;s-&gt;nr_data) {</div><div class='del'>-		ret = bch2_bucket_alloc_set_trans(trans, &amp;buckets,</div><div class='del'>-					    &amp;h-&gt;block_stripe,</div><div class='del'>-					    &amp;devs,</div><div class='del'>-					    h-&gt;s-&gt;nr_data,</div><div class='del'>-					    &amp;nr_have_data,</div><div class='del'>-					    &amp;have_cache, 0,</div><div class='del'>-					    BCH_DATA_user,</div><div class='del'>-					    watermark,</div><div class='del'>-					    cl);</div><div class='del'>-</div><div class='del'>-		open_bucket_for_each(c, &amp;buckets, ob, i) {</div><div class='del'>-			j = find_next_zero_bit(h-&gt;s-&gt;blocks_gotten,</div><div class='del'>-					       h-&gt;s-&gt;nr_data, 0);</div><div class='del'>-			BUG_ON(j &gt;= h-&gt;s-&gt;nr_data);</div><div class='del'>-</div><div class='del'>-			h-&gt;s-&gt;blocks[j] = buckets.v[i];</div><div class='del'>-			v-&gt;ptrs[j] = bch2_ob_ptr(c, ob);</div><div class='del'>-			__set_bit(j, h-&gt;s-&gt;blocks_gotten);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* XXX: doesn't obey target: */</div><div class='del'>-static s64 get_existing_stripe(struct bch_fs *c,</div><div class='del'>-			       struct ec_stripe_head *head)</div><div class='del'>-{</div><div class='del'>-	ec_stripes_heap *h = &amp;c-&gt;ec_stripes_heap;</div><div class='del'>-	struct stripe *m;</div><div class='del'>-	size_t heap_idx;</div><div class='del'>-	u64 stripe_idx;</div><div class='del'>-	s64 ret = -1;</div><div class='del'>-</div><div class='del'>-	if (may_create_new_stripe(c))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-	for (heap_idx = 0; heap_idx &lt; h-&gt;used; heap_idx++) {</div><div class='del'>-		/* No blocks worth reusing, stripe will just be deleted: */</div><div class='del'>-		if (!h-&gt;data[heap_idx].blocks_nonempty)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		stripe_idx = h-&gt;data[heap_idx].idx;</div><div class='del'>-</div><div class='del'>-		m = genradix_ptr(&amp;c-&gt;stripes, stripe_idx);</div><div class='del'>-</div><div class='del'>-		if (m-&gt;algorithm	== head-&gt;algo &amp;&amp;</div><div class='del'>-		    m-&gt;nr_redundant	== head-&gt;redundancy &amp;&amp;</div><div class='del'>-		    m-&gt;sectors		== head-&gt;blocksize &amp;&amp;</div><div class='del'>-		    m-&gt;blocks_nonempty	&lt; m-&gt;nr_blocks - m-&gt;nr_redundant &amp;&amp;</div><div class='del'>-		    bch2_try_open_stripe(c, head-&gt;s, stripe_idx)) {</div><div class='del'>-			ret = stripe_idx;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_ec_stripe_head_reuse(struct btree_trans *trans, struct ec_stripe_head *h)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_stripe *new_v = &amp;bkey_i_to_stripe(&amp;h-&gt;s-&gt;new_stripe.key)-&gt;v;</div><div class='del'>-	struct bch_stripe *existing_v;</div><div class='del'>-	unsigned i;</div><div class='del'>-	s64 idx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we can't allocate a new stripe, and there's no stripes with empty</div><div class='del'>-	 * blocks for us to reuse, that means we have to wait on copygc:</div><div class='del'>-	 */</div><div class='del'>-	idx = get_existing_stripe(c, h);</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		return -BCH_ERR_stripe_alloc_blocked;</div><div class='del'>-</div><div class='del'>-	ret = get_stripe_key_trans(trans, idx, &amp;h-&gt;s-&gt;existing_stripe);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_stripe_close(c, h-&gt;s);</div><div class='del'>-		if (!bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			bch2_fs_fatal_error(c, "error reading stripe key: %s", bch2_err_str(ret));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	existing_v = &amp;bkey_i_to_stripe(&amp;h-&gt;s-&gt;existing_stripe.key)-&gt;v;</div><div class='del'>-</div><div class='del'>-	BUG_ON(existing_v-&gt;nr_redundant != h-&gt;s-&gt;nr_parity);</div><div class='del'>-	h-&gt;s-&gt;nr_data = existing_v-&gt;nr_blocks -</div><div class='del'>-		existing_v-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-	ret = ec_stripe_buf_init(&amp;h-&gt;s-&gt;existing_stripe, 0, h-&gt;blocksize);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_stripe_close(c, h-&gt;s);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(h-&gt;s-&gt;existing_stripe.size != h-&gt;blocksize);</div><div class='del'>-	BUG_ON(h-&gt;s-&gt;existing_stripe.size != le16_to_cpu(existing_v-&gt;sectors));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Free buckets we initially allocated - they might conflict with</div><div class='del'>-	 * blocks from the stripe we're reusing:</div><div class='del'>-	 */</div><div class='del'>-	for_each_set_bit(i, h-&gt;s-&gt;blocks_gotten, new_v-&gt;nr_blocks) {</div><div class='del'>-		bch2_open_bucket_put(c, c-&gt;open_buckets + h-&gt;s-&gt;blocks[i]);</div><div class='del'>-		h-&gt;s-&gt;blocks[i] = 0;</div><div class='del'>-	}</div><div class='del'>-	memset(h-&gt;s-&gt;blocks_gotten, 0, sizeof(h-&gt;s-&gt;blocks_gotten));</div><div class='del'>-	memset(h-&gt;s-&gt;blocks_allocated, 0, sizeof(h-&gt;s-&gt;blocks_allocated));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; existing_v-&gt;nr_blocks; i++) {</div><div class='del'>-		if (stripe_blockcount_get(existing_v, i)) {</div><div class='del'>-			__set_bit(i, h-&gt;s-&gt;blocks_gotten);</div><div class='del'>-			__set_bit(i, h-&gt;s-&gt;blocks_allocated);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ec_block_io(c, &amp;h-&gt;s-&gt;existing_stripe, READ, i, &amp;h-&gt;s-&gt;iodone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_copy(&amp;h-&gt;s-&gt;new_stripe.key, &amp;h-&gt;s-&gt;existing_stripe.key);</div><div class='del'>-	h-&gt;s-&gt;have_existing_stripe = true;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_ec_stripe_head_reserve(struct btree_trans *trans, struct ec_stripe_head *h)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bpos min_pos = POS(0, 1);</div><div class='del'>-	struct bpos start_pos = bpos_max(min_pos, POS(0, c-&gt;ec_stripe_hint));</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!h-&gt;s-&gt;res.sectors) {</div><div class='del'>-		ret = bch2_disk_reservation_get(c, &amp;h-&gt;s-&gt;res,</div><div class='del'>-					h-&gt;blocksize,</div><div class='del'>-					h-&gt;s-&gt;nr_parity,</div><div class='del'>-					BCH_DISK_RESERVATION_NOFAIL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_stripes, start_pos,</div><div class='del'>-			   BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) {</div><div class='del'>-		if (bkey_gt(k.k-&gt;p, POS(0, U32_MAX))) {</div><div class='del'>-			if (start_pos.offset) {</div><div class='del'>-				start_pos = min_pos;</div><div class='del'>-				bch2_btree_iter_set_pos(&amp;iter, start_pos);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = -BCH_ERR_ENOSPC_stripe_create;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bkey_deleted(k.k) &amp;&amp;</div><div class='del'>-		    bch2_try_open_stripe(c, h-&gt;s, k.k-&gt;p.offset))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;ec_stripe_hint = iter.pos.offset;</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = ec_stripe_mem_alloc(trans, &amp;iter);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_stripe_close(c, h-&gt;s);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	h-&gt;s-&gt;new_stripe.key.k.p = iter.pos;</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;h-&gt;s-&gt;res);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ec_stripe_head *bch2_ec_stripe_head_get(struct btree_trans *trans,</div><div class='del'>-					       unsigned target,</div><div class='del'>-					       unsigned algo,</div><div class='del'>-					       unsigned redundancy,</div><div class='del'>-					       enum bch_watermark watermark,</div><div class='del'>-					       struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-	bool waiting = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	h = __bch2_ec_stripe_head_get(trans, target, algo, redundancy, watermark);</div><div class='del'>-	if (IS_ERR_OR_NULL(h))</div><div class='del'>-		return h;</div><div class='del'>-</div><div class='del'>-	if (!h-&gt;s) {</div><div class='del'>-		ret = ec_new_stripe_alloc(c, h);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bch_err(c, "failed to allocate new stripe");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (h-&gt;s-&gt;allocated)</div><div class='del'>-		goto allocated;</div><div class='del'>-</div><div class='del'>-	if (h-&gt;s-&gt;have_existing_stripe)</div><div class='del'>-		goto alloc_existing;</div><div class='del'>-</div><div class='del'>-	/* First, try to allocate a full stripe: */</div><div class='del'>-	ret =   new_stripe_alloc_buckets(trans, h, BCH_WATERMARK_stripe, NULL) ?:</div><div class='del'>-		__bch2_ec_stripe_head_reserve(trans, h);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto allocate_buf;</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart) ||</div><div class='del'>-	    bch2_err_matches(ret, ENOMEM))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Not enough buckets available for a full stripe: we must reuse an</div><div class='del'>-	 * existing stripe:</div><div class='del'>-	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		ret = __bch2_ec_stripe_head_reuse(trans, h);</div><div class='del'>-		if (!ret)</div><div class='del'>-			break;</div><div class='del'>-		if (waiting || !cl || ret != -BCH_ERR_stripe_alloc_blocked)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (watermark == BCH_WATERMARK_copygc) {</div><div class='del'>-			ret =   new_stripe_alloc_buckets(trans, h, watermark, NULL) ?:</div><div class='del'>-				__bch2_ec_stripe_head_reserve(trans, h);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-			goto allocate_buf;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* XXX freelist_wait? */</div><div class='del'>-		closure_wait(&amp;c-&gt;freelist_wait, cl);</div><div class='del'>-		waiting = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (waiting)</div><div class='del'>-		closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-alloc_existing:</div><div class='del'>-	/*</div><div class='del'>-	 * Retry allocating buckets, with the watermark for this</div><div class='del'>-	 * particular write:</div><div class='del'>-	 */</div><div class='del'>-	ret = new_stripe_alloc_buckets(trans, h, watermark, cl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-allocate_buf:</div><div class='del'>-	ret = ec_stripe_buf_init(&amp;h-&gt;s-&gt;new_stripe, 0, h-&gt;blocksize);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	h-&gt;s-&gt;allocated = true;</div><div class='del'>-allocated:</div><div class='del'>-	BUG_ON(!h-&gt;s-&gt;idx);</div><div class='del'>-	BUG_ON(!h-&gt;s-&gt;new_stripe.data[0]);</div><div class='del'>-	BUG_ON(trans-&gt;restarted);</div><div class='del'>-	return h;</div><div class='del'>-err:</div><div class='del'>-	bch2_ec_stripe_head_put(c, h);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_ec_stop(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-	struct open_bucket *ob;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-	list_for_each_entry(h, &amp;c-&gt;ec_stripe_head_list, list) {</div><div class='del'>-		mutex_lock(&amp;h-&gt;lock);</div><div class='del'>-		if (!h-&gt;s)</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		if (!ca)</div><div class='del'>-			goto found;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; bkey_i_to_stripe(&amp;h-&gt;s-&gt;new_stripe.key)-&gt;v.nr_blocks; i++) {</div><div class='del'>-			if (!h-&gt;s-&gt;blocks[i])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ob = c-&gt;open_buckets + h-&gt;s-&gt;blocks[i];</div><div class='del'>-			if (ob-&gt;dev == ca-&gt;dev_idx)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-		goto unlock;</div><div class='del'>-found:</div><div class='del'>-		h-&gt;s-&gt;err = -BCH_ERR_erofs_no_writes;</div><div class='del'>-		ec_stripe_set_pending(c, h);</div><div class='del'>-unlock:</div><div class='del'>-		mutex_unlock(&amp;h-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ec_stop_dev(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	__bch2_ec_stop(c, ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_ec_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	__bch2_ec_stop(c, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_fs_ec_flush_done(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	ret = list_empty(&amp;c-&gt;ec_stripe_new_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_ec_flush(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	wait_event(c-&gt;ec_stripe_new_wait, bch2_fs_ec_flush_done(c));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_stripes_read(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_stripes, POS_MIN,</div><div class='del'>-				   BTREE_ITER_PREFETCH, k, ({</div><div class='del'>-			if (k.k-&gt;type != KEY_TYPE_stripe)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ret = __ec_stripe_mem_alloc(c, k.k-&gt;p.offset, GFP_KERNEL);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			const struct bch_stripe *s = bkey_s_c_to_stripe(k).v;</div><div class='del'>-</div><div class='del'>-			struct stripe *m = genradix_ptr(&amp;c-&gt;stripes, k.k-&gt;p.offset);</div><div class='del'>-			m-&gt;sectors	= le16_to_cpu(s-&gt;sectors);</div><div class='del'>-			m-&gt;algorithm	= s-&gt;algorithm;</div><div class='del'>-			m-&gt;nr_blocks	= s-&gt;nr_blocks;</div><div class='del'>-			m-&gt;nr_redundant	= s-&gt;nr_redundant;</div><div class='del'>-			m-&gt;blocks_nonempty = 0;</div><div class='del'>-</div><div class='del'>-			for (unsigned i = 0; i &lt; s-&gt;nr_blocks; i++)</div><div class='del'>-				m-&gt;blocks_nonempty += !!stripe_blockcount_get(s, i);</div><div class='del'>-</div><div class='del'>-			bch2_stripes_heap_insert(c, m, k.k-&gt;p.offset);</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_stripes_heap_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	ec_stripes_heap *h = &amp;c-&gt;ec_stripes_heap;</div><div class='del'>-	struct stripe *m;</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-	for (i = 0; i &lt; min_t(size_t, h-&gt;used, 50); i++) {</div><div class='del'>-		m = genradix_ptr(&amp;c-&gt;stripes, h-&gt;data[i].idx);</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "%zu %u/%u+%u", h-&gt;data[i].idx,</div><div class='del'>-		       h-&gt;data[i].blocks_nonempty,</div><div class='del'>-		       m-&gt;nr_blocks - m-&gt;nr_redundant,</div><div class='del'>-		       m-&gt;nr_redundant);</div><div class='del'>-		if (bch2_stripe_is_open(c, h-&gt;data[i].idx))</div><div class='del'>-			prt_str(out, " open");</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_new_stripes_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-	struct ec_stripe_new *s;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-	list_for_each_entry(h, &amp;c-&gt;ec_stripe_head_list, list) {</div><div class='del'>-		prt_printf(out, "target %u algo %u redundancy %u %s:\n",</div><div class='del'>-		       h-&gt;target, h-&gt;algo, h-&gt;redundancy,</div><div class='del'>-		       bch2_watermarks[h-&gt;watermark]);</div><div class='del'>-</div><div class='del'>-		if (h-&gt;s)</div><div class='del'>-			prt_printf(out, "\tidx %llu blocks %u+%u allocated %u\n",</div><div class='del'>-			       h-&gt;s-&gt;idx, h-&gt;s-&gt;nr_data, h-&gt;s-&gt;nr_parity,</div><div class='del'>-			       bitmap_weight(h-&gt;s-&gt;blocks_allocated,</div><div class='del'>-					     h-&gt;s-&gt;nr_data));</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "in flight:\n");</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	list_for_each_entry(s, &amp;c-&gt;ec_stripe_new_list, list) {</div><div class='del'>-		prt_printf(out, "\tidx %llu blocks %u+%u ref %u %u %s\n",</div><div class='del'>-			   s-&gt;idx, s-&gt;nr_data, s-&gt;nr_parity,</div><div class='del'>-			   atomic_read(&amp;s-&gt;ref[STRIPE_REF_io]),</div><div class='del'>-			   atomic_read(&amp;s-&gt;ref[STRIPE_REF_stripe]),</div><div class='del'>-			   bch2_watermarks[s-&gt;h-&gt;watermark]);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_ec_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct ec_stripe_head *h;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-		h = list_first_entry_or_null(&amp;c-&gt;ec_stripe_head_list,</div><div class='del'>-					     struct ec_stripe_head, list);</div><div class='del'>-		if (h)</div><div class='del'>-			list_del(&amp;h-&gt;list);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-		if (!h)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (h-&gt;s) {</div><div class='del'>-			for (i = 0; i &lt; bkey_i_to_stripe(&amp;h-&gt;s-&gt;new_stripe.key)-&gt;v.nr_blocks; i++)</div><div class='del'>-				BUG_ON(h-&gt;s-&gt;blocks[i]);</div><div class='del'>-</div><div class='del'>-			kfree(h-&gt;s);</div><div class='del'>-		}</div><div class='del'>-		kfree(h);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!list_empty(&amp;c-&gt;ec_stripe_new_list));</div><div class='del'>-</div><div class='del'>-	free_heap(&amp;c-&gt;ec_stripes_heap);</div><div class='del'>-	genradix_free(&amp;c-&gt;stripes);</div><div class='del'>-	bioset_exit(&amp;c-&gt;ec_bioset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_ec_init_early(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	spin_lock_init(&amp;c-&gt;ec_stripes_new_lock);</div><div class='del'>-	mutex_init(&amp;c-&gt;ec_stripes_heap_lock);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;ec_stripe_head_list);</div><div class='del'>-	mutex_init(&amp;c-&gt;ec_stripe_head_lock);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;ec_stripe_new_list);</div><div class='del'>-	mutex_init(&amp;c-&gt;ec_stripe_new_lock);</div><div class='del'>-	init_waitqueue_head(&amp;c-&gt;ec_stripe_new_wait);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;c-&gt;ec_stripe_create_work, ec_stripe_create_work);</div><div class='del'>-	INIT_WORK(&amp;c-&gt;ec_stripe_delete_work, ec_stripe_delete_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_ec_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return bioset_init(&amp;c-&gt;ec_bioset, 1, offsetof(struct ec_bio, bio),</div><div class='del'>-			   BIOSET_NEED_BVECS);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/ec.h b/fs/bcachefs/ec.h<br/>deleted file mode 100644<br/>index f4369b02e805..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/ec.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,261 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EC_H</div><div class='del'>-#define _BCACHEFS_EC_H</div><div class='del'>-</div><div class='del'>-#include "ec_types.h"</div><div class='del'>-#include "buckets_types.h"</div><div class='del'>-#include "extents_types.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-</div><div class='del'>-int bch2_stripe_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_stripe_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			 struct bkey_s_c);</div><div class='del'>-int bch2_trigger_stripe(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-			struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_stripe ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_stripe_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_stripe_to_text,		\</div><div class='del'>-	.swab		= bch2_ptr_swab,		\</div><div class='del'>-	.trigger	= bch2_trigger_stripe,		\</div><div class='del'>-	.min_val_size	= 8,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline unsigned stripe_csums_per_device(const struct bch_stripe *s)</div><div class='del'>-{</div><div class='del'>-	return DIV_ROUND_UP(le16_to_cpu(s-&gt;sectors),</div><div class='del'>-			    1 &lt;&lt; s-&gt;csum_granularity_bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned stripe_csum_offset(const struct bch_stripe *s,</div><div class='del'>-					  unsigned dev, unsigned csum_idx)</div><div class='del'>-{</div><div class='del'>-	unsigned csum_bytes = bch_crc_bytes[s-&gt;csum_type];</div><div class='del'>-</div><div class='del'>-	return sizeof(struct bch_stripe) +</div><div class='del'>-		sizeof(struct bch_extent_ptr) * s-&gt;nr_blocks +</div><div class='del'>-		(dev * stripe_csums_per_device(s) + csum_idx) * csum_bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned stripe_blockcount_offset(const struct bch_stripe *s,</div><div class='del'>-						unsigned idx)</div><div class='del'>-{</div><div class='del'>-	return stripe_csum_offset(s, s-&gt;nr_blocks, 0) +</div><div class='del'>-		sizeof(u16) * idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned stripe_blockcount_get(const struct bch_stripe *s,</div><div class='del'>-					     unsigned idx)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpup((void *) s + stripe_blockcount_offset(s, idx));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void stripe_blockcount_set(struct bch_stripe *s,</div><div class='del'>-					 unsigned idx, unsigned v)</div><div class='del'>-{</div><div class='del'>-	__le16 *p = (void *) s + stripe_blockcount_offset(s, idx);</div><div class='del'>-</div><div class='del'>-	*p = cpu_to_le16(v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned stripe_val_u64s(const struct bch_stripe *s)</div><div class='del'>-{</div><div class='del'>-	return DIV_ROUND_UP(stripe_blockcount_offset(s, s-&gt;nr_blocks),</div><div class='del'>-			    sizeof(u64));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *stripe_csum(struct bch_stripe *s,</div><div class='del'>-				unsigned block, unsigned csum_idx)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(block &gt;= s-&gt;nr_blocks);</div><div class='del'>-	EBUG_ON(csum_idx &gt;= stripe_csums_per_device(s));</div><div class='del'>-</div><div class='del'>-	return (void *) s + stripe_csum_offset(s, block, csum_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_csum stripe_csum_get(struct bch_stripe *s,</div><div class='del'>-				   unsigned block, unsigned csum_idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_csum csum = { 0 };</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;csum, stripe_csum(s, block, csum_idx), bch_crc_bytes[s-&gt;csum_type]);</div><div class='del'>-	return csum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void stripe_csum_set(struct bch_stripe *s,</div><div class='del'>-				   unsigned block, unsigned csum_idx,</div><div class='del'>-				   struct bch_csum csum)</div><div class='del'>-{</div><div class='del'>-	memcpy(stripe_csum(s, block, csum_idx), &amp;csum, bch_crc_bytes[s-&gt;csum_type]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __bch2_ptr_matches_stripe(const struct bch_extent_ptr *stripe_ptr,</div><div class='del'>-					     const struct bch_extent_ptr *data_ptr,</div><div class='del'>-					     unsigned sectors)</div><div class='del'>-{</div><div class='del'>-	return  data_ptr-&gt;dev    == stripe_ptr-&gt;dev &amp;&amp;</div><div class='del'>-		data_ptr-&gt;gen    == stripe_ptr-&gt;gen &amp;&amp;</div><div class='del'>-		data_ptr-&gt;offset &gt;= stripe_ptr-&gt;offset &amp;&amp;</div><div class='del'>-		data_ptr-&gt;offset  &lt; stripe_ptr-&gt;offset + sectors;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_ptr_matches_stripe(const struct bch_stripe *s,</div><div class='del'>-					   struct extent_ptr_decoded p)</div><div class='del'>-{</div><div class='del'>-	unsigned nr_data = s-&gt;nr_blocks - s-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!p.has_ec);</div><div class='del'>-</div><div class='del'>-	if (p.ec.block &gt;= nr_data)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return __bch2_ptr_matches_stripe(&amp;s-&gt;ptrs[p.ec.block], &amp;p.ptr,</div><div class='del'>-					 le16_to_cpu(s-&gt;sectors));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_ptr_matches_stripe_m(const struct gc_stripe *m,</div><div class='del'>-					     struct extent_ptr_decoded p)</div><div class='del'>-{</div><div class='del'>-	unsigned nr_data = m-&gt;nr_blocks - m-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!p.has_ec);</div><div class='del'>-</div><div class='del'>-	if (p.ec.block &gt;= nr_data)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return __bch2_ptr_matches_stripe(&amp;m-&gt;ptrs[p.ec.block], &amp;p.ptr,</div><div class='del'>-					 m-&gt;sectors);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_read_bio;</div><div class='del'>-</div><div class='del'>-struct ec_stripe_buf {</div><div class='del'>-	/* might not be buffering the entire stripe: */</div><div class='del'>-	unsigned		offset;</div><div class='del'>-	unsigned		size;</div><div class='del'>-	unsigned long		valid[BITS_TO_LONGS(BCH_BKEY_PTRS_MAX)];</div><div class='del'>-</div><div class='del'>-	void			*data[BCH_BKEY_PTRS_MAX];</div><div class='del'>-</div><div class='del'>-	__BKEY_PADDED(key, 255);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ec_stripe_head;</div><div class='del'>-</div><div class='del'>-enum ec_stripe_ref {</div><div class='del'>-	STRIPE_REF_io,</div><div class='del'>-	STRIPE_REF_stripe,</div><div class='del'>-	STRIPE_REF_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ec_stripe_new {</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	struct ec_stripe_head	*h;</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	struct list_head	list;</div><div class='del'>-</div><div class='del'>-	struct hlist_node	hash;</div><div class='del'>-	u64			idx;</div><div class='del'>-</div><div class='del'>-	struct closure		iodone;</div><div class='del'>-</div><div class='del'>-	atomic_t		ref[STRIPE_REF_NR];</div><div class='del'>-</div><div class='del'>-	int			err;</div><div class='del'>-</div><div class='del'>-	u8			nr_data;</div><div class='del'>-	u8			nr_parity;</div><div class='del'>-	bool			allocated;</div><div class='del'>-	bool			pending;</div><div class='del'>-	bool			have_existing_stripe;</div><div class='del'>-</div><div class='del'>-	unsigned long		blocks_gotten[BITS_TO_LONGS(BCH_BKEY_PTRS_MAX)];</div><div class='del'>-	unsigned long		blocks_allocated[BITS_TO_LONGS(BCH_BKEY_PTRS_MAX)];</div><div class='del'>-	open_bucket_idx_t	blocks[BCH_BKEY_PTRS_MAX];</div><div class='del'>-	struct disk_reservation	res;</div><div class='del'>-</div><div class='del'>-	struct ec_stripe_buf	new_stripe;</div><div class='del'>-	struct ec_stripe_buf	existing_stripe;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ec_stripe_head {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-</div><div class='del'>-	unsigned		target;</div><div class='del'>-	unsigned		algo;</div><div class='del'>-	unsigned		redundancy;</div><div class='del'>-	enum bch_watermark	watermark;</div><div class='del'>-</div><div class='del'>-	struct bch_devs_mask	devs;</div><div class='del'>-	unsigned		nr_active_devs;</div><div class='del'>-</div><div class='del'>-	unsigned		blocksize;</div><div class='del'>-</div><div class='del'>-	struct dev_stripe_state	block_stripe;</div><div class='del'>-	struct dev_stripe_state	parity_stripe;</div><div class='del'>-</div><div class='del'>-	struct ec_stripe_new	*s;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_ec_read_extent(struct btree_trans *, struct bch_read_bio *);</div><div class='del'>-</div><div class='del'>-void *bch2_writepoint_ec_buf(struct bch_fs *, struct write_point *);</div><div class='del'>-</div><div class='del'>-void bch2_ec_bucket_cancel(struct bch_fs *, struct open_bucket *);</div><div class='del'>-</div><div class='del'>-int bch2_ec_stripe_new_alloc(struct bch_fs *, struct ec_stripe_head *);</div><div class='del'>-</div><div class='del'>-void bch2_ec_stripe_head_put(struct bch_fs *, struct ec_stripe_head *);</div><div class='del'>-struct ec_stripe_head *bch2_ec_stripe_head_get(struct btree_trans *,</div><div class='del'>-			unsigned, unsigned, unsigned,</div><div class='del'>-			enum bch_watermark, struct closure *);</div><div class='del'>-</div><div class='del'>-void bch2_stripes_heap_update(struct bch_fs *, struct stripe *, size_t);</div><div class='del'>-void bch2_stripes_heap_del(struct bch_fs *, struct stripe *, size_t);</div><div class='del'>-void bch2_stripes_heap_insert(struct bch_fs *, struct stripe *, size_t);</div><div class='del'>-</div><div class='del'>-void bch2_do_stripe_deletes(struct bch_fs *);</div><div class='del'>-void bch2_ec_do_stripe_creates(struct bch_fs *);</div><div class='del'>-void bch2_ec_stripe_new_free(struct bch_fs *, struct ec_stripe_new *);</div><div class='del'>-</div><div class='del'>-static inline void ec_stripe_new_get(struct ec_stripe_new *s,</div><div class='del'>-				     enum ec_stripe_ref ref)</div><div class='del'>-{</div><div class='del'>-	atomic_inc(&amp;s-&gt;ref[ref]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ec_stripe_new_put(struct bch_fs *c, struct ec_stripe_new *s,</div><div class='del'>-				     enum ec_stripe_ref ref)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(atomic_read(&amp;s-&gt;ref[ref]) &lt;= 0);</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;s-&gt;ref[ref]))</div><div class='del'>-		switch (ref) {</div><div class='del'>-		case STRIPE_REF_stripe:</div><div class='del'>-			bch2_ec_stripe_new_free(c, s);</div><div class='del'>-			break;</div><div class='del'>-		case STRIPE_REF_io:</div><div class='del'>-			bch2_ec_do_stripe_creates(c);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ec_stop_dev(struct bch_fs *, struct bch_dev *);</div><div class='del'>-void bch2_fs_ec_stop(struct bch_fs *);</div><div class='del'>-void bch2_fs_ec_flush(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_stripes_read(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_stripes_heap_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-void bch2_new_stripes_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_ec_exit(struct bch_fs *);</div><div class='del'>-void bch2_fs_ec_init_early(struct bch_fs *);</div><div class='del'>-int bch2_fs_ec_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EC_H */</div><div class='head'>diff --git a/fs/bcachefs/ec_format.h b/fs/bcachefs/ec_format.h<br/>deleted file mode 100644<br/>index 44ce88ba08d7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/ec_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EC_FORMAT_H</div><div class='del'>-#define _BCACHEFS_EC_FORMAT_H</div><div class='del'>-</div><div class='del'>-struct bch_stripe {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le16			sectors;</div><div class='del'>-	__u8			algorithm;</div><div class='del'>-	__u8			nr_blocks;</div><div class='del'>-	__u8			nr_redundant;</div><div class='del'>-</div><div class='del'>-	__u8			csum_granularity_bits;</div><div class='del'>-	__u8			csum_type;</div><div class='del'>-	__u8			pad;</div><div class='del'>-</div><div class='del'>-	struct bch_extent_ptr	ptrs[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EC_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/ec_types.h b/fs/bcachefs/ec_types.h<br/>deleted file mode 100644<br/>index 976426da3a12..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/ec_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/ec_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EC_TYPES_H</div><div class='del'>-#define _BCACHEFS_EC_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-</div><div class='del'>-struct bch_replicas_padded {</div><div class='del'>-	struct bch_replicas_entry_v1	e;</div><div class='del'>-	u8				pad[BCH_BKEY_PTRS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct stripe {</div><div class='del'>-	size_t			heap_idx;</div><div class='del'>-	u16			sectors;</div><div class='del'>-	u8			algorithm;</div><div class='del'>-	u8			nr_blocks;</div><div class='del'>-	u8			nr_redundant;</div><div class='del'>-	u8			blocks_nonempty;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gc_stripe {</div><div class='del'>-	u16			sectors;</div><div class='del'>-</div><div class='del'>-	u8			nr_blocks;</div><div class='del'>-	u8			nr_redundant;</div><div class='del'>-</div><div class='del'>-	unsigned		alive:1; /* does a corresponding key exist in stripes btree? */</div><div class='del'>-	u16			block_sectors[BCH_BKEY_PTRS_MAX];</div><div class='del'>-	struct bch_extent_ptr	ptrs[BCH_BKEY_PTRS_MAX];</div><div class='del'>-</div><div class='del'>-	struct bch_replicas_padded r;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ec_stripe_heap_entry {</div><div class='del'>-	size_t			idx;</div><div class='del'>-	unsigned		blocks_nonempty;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef HEAP(struct ec_stripe_heap_entry) ec_stripes_heap;</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EC_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/errcode.c b/fs/bcachefs/errcode.c<br/>deleted file mode 100644<br/>index d260ff9bbfeb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/errcode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/errcode.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errname.h&gt;</div><div class='del'>-</div><div class='del'>-static const char * const bch2_errcode_strs[] = {</div><div class='del'>-#define x(class, err) [BCH_ERR_##err - BCH_ERR_START] = #err,</div><div class='del'>-	BCH_ERRCODES()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned bch2_errcode_parents[] = {</div><div class='del'>-#define x(class, err) [BCH_ERR_##err - BCH_ERR_START] = class,</div><div class='del'>-	BCH_ERRCODES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char *bch2_err_str(int err)</div><div class='del'>-{</div><div class='del'>-	const char *errstr;</div><div class='del'>-</div><div class='del'>-	err = abs(err);</div><div class='del'>-</div><div class='del'>-	BUG_ON(err &gt;= BCH_ERR_MAX);</div><div class='del'>-</div><div class='del'>-	if (err &gt;= BCH_ERR_START)</div><div class='del'>-		errstr = bch2_errcode_strs[err - BCH_ERR_START];</div><div class='del'>-	else if (err)</div><div class='del'>-		errstr = errname(err);</div><div class='del'>-	else</div><div class='del'>-		errstr = "(No error)";</div><div class='del'>-	return errstr ?: "(Invalid error)";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_err_matches(int err, int class)</div><div class='del'>-{</div><div class='del'>-	err	= abs(err);</div><div class='del'>-	class	= abs(class);</div><div class='del'>-</div><div class='del'>-	BUG_ON(err	&gt;= BCH_ERR_MAX);</div><div class='del'>-	BUG_ON(class	&gt;= BCH_ERR_MAX);</div><div class='del'>-</div><div class='del'>-	while (err &gt;= BCH_ERR_START &amp;&amp; err != class)</div><div class='del'>-		err = bch2_errcode_parents[err - BCH_ERR_START];</div><div class='del'>-</div><div class='del'>-	return err == class;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_err_class(int err)</div><div class='del'>-{</div><div class='del'>-	err = -err;</div><div class='del'>-	BUG_ON((unsigned) err &gt;= BCH_ERR_MAX);</div><div class='del'>-</div><div class='del'>-	while (err &gt;= BCH_ERR_START &amp;&amp; bch2_errcode_parents[err - BCH_ERR_START])</div><div class='del'>-		err = bch2_errcode_parents[err - BCH_ERR_START];</div><div class='del'>-</div><div class='del'>-	return -err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *bch2_blk_status_to_str(blk_status_t status)</div><div class='del'>-{</div><div class='del'>-	if (status == BLK_STS_REMOVED)</div><div class='del'>-		return "device removed";</div><div class='del'>-	return blk_status_to_str(status);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/errcode.h b/fs/bcachefs/errcode.h<br/>deleted file mode 100644<br/>index 8c40c2067a04..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/errcode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/errcode.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,276 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ERRCODE_H</div><div class='del'>-#define _BCACHEFS_ERRCODE_H</div><div class='del'>-</div><div class='del'>-#define BCH_ERRCODES()								\</div><div class='del'>-	x(ERANGE,			ERANGE_option_too_small)		\</div><div class='del'>-	x(ERANGE,			ERANGE_option_too_big)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_stripe_buf)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_replicas_table)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_cpu_replicas)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_replicas_gc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_disk_groups_validate)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_disk_groups_to_cpu)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_mark_snapshot)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_mark_stripe)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_mark_stripe_ptr)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_key_cache_create)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_key_cache_fill)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_key_cache_insert)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_trans_kmalloc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_trans_log_msg)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_do_encrypt)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_ec_read_extent)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_ec_stripe_mem_alloc)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_ec_new_stripe_alloc)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_btree_cache_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_btree_key_cache_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_counters_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_btree_write_buffer_init)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_io_clock_init)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_blacklist_table_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_sb_realloc_injected)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_sb_bio_realloc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_sb_buf_realloc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_sb_journal_validate)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_sb_journal_v2_validate)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_journal_entry_add)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_journal_read_buf_realloc)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_interior_update_worker_init)\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_interior_update_pool_init)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_bio_read_init)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_bio_read_split_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_bio_write_init)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_bio_bounce_pages_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_writepage_bioset_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_dio_read_bioset_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_dio_write_bioset_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_nocow_flush_bioset_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_promote_table_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_compression_bounce_read_init)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_compression_bounce_write_init)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_compression_workspace_init)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_decompression_workspace_init)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_bucket_gens)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_buckets_nouse)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_usage_init)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_node_read_all_replicas)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_node_reclaim)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_node_mem_alloc)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_btree_cache_cannibalize_lock)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_buckets_waiting_for_journal_init)\</div><div class='del'>-	x(ENOMEM,			ENOMEM_buckets_waiting_for_journal_set)	\</div><div class='del'>-	x(ENOMEM,			ENOMEM_set_nr_journal_buckets)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_dev_journal_init)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_journal_pin_fifo)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_journal_buf)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_gc_start)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_gc_alloc_start)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_gc_reflink_start)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_gc_gens)				\</div><div class='del'>-	x(ENOMEM,			ENOMEM_gc_repair_key)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fsck_extent_ends_at)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fsck_add_nlink)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_journal_key_insert)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_journal_keys_sort)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_read_superblock_clean)		\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_alloc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_name_alloc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_fs_other_alloc)			\</div><div class='del'>-	x(ENOMEM,			ENOMEM_dev_alloc)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_disk_reservation)		\</div><div class='del'>-	x(ENOSPC,			ENOSPC_bucket_alloc)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_disk_label_add)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_stripe_create)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_inode_create)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_str_hash_create)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_snapshot_create)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_subvolume_create)		\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb)				\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_journal)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_journal_seq_blacklist)	\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_quota)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_replicas)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_members)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_members_v2)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_crypt)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_sb_downgrade)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_btree_slot)			\</div><div class='del'>-	x(ENOSPC,			ENOSPC_snapshot_tree)			\</div><div class='del'>-	x(ENOENT,			ENOENT_bkey_type_mismatch)		\</div><div class='del'>-	x(ENOENT,			ENOENT_str_hash_lookup)			\</div><div class='del'>-	x(ENOENT,			ENOENT_str_hash_set_must_replace)	\</div><div class='del'>-	x(ENOENT,			ENOENT_inode)				\</div><div class='del'>-	x(ENOENT,			ENOENT_not_subvol)			\</div><div class='del'>-	x(ENOENT,			ENOENT_not_directory)			\</div><div class='del'>-	x(ENOENT,			ENOENT_directory_dead)			\</div><div class='del'>-	x(ENOENT,			ENOENT_subvolume)			\</div><div class='del'>-	x(ENOENT,			ENOENT_snapshot_tree)			\</div><div class='del'>-	x(ENOENT,			ENOENT_dirent_doesnt_match_inode)	\</div><div class='del'>-	x(ENOENT,			ENOENT_dev_not_found)			\</div><div class='del'>-	x(ENOENT,			ENOENT_dev_idx_not_found)		\</div><div class='del'>-	x(0,				open_buckets_empty)			\</div><div class='del'>-	x(0,				freelist_empty)				\</div><div class='del'>-	x(BCH_ERR_freelist_empty,	no_buckets_found)			\</div><div class='del'>-	x(0,				transaction_restart)			\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_fault_inject)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_relock)		\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_relock_path)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_relock_path_intent)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_relock_after_fill)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_too_many_iters)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_lock_node_reused)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_fill_relock)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_fill_mem_alloc_fail)\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_mem_realloced)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_in_traverse_all)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_would_deadlock)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_would_deadlock_write)\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_deadlock_recursion_limit)\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_upgrade)		\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_key_cache_upgrade)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_key_cache_fill)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_key_cache_raced)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_key_cache_realloced)\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_journal_preres_get)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_split_race)		\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_write_buffer_flush)	\</div><div class='del'>-	x(BCH_ERR_transaction_restart,	transaction_restart_nested)		\</div><div class='del'>-	x(0,				no_btree_node)				\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_relock)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_upgrade)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_drop)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_lock_root)		\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_up)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_down)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_init)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_cached)			\</div><div class='del'>-	x(BCH_ERR_no_btree_node,	no_btree_node_srcu_reset)		\</div><div class='del'>-	x(0,				btree_insert_fail)			\</div><div class='del'>-	x(BCH_ERR_btree_insert_fail,	btree_insert_btree_node_full)		\</div><div class='del'>-	x(BCH_ERR_btree_insert_fail,	btree_insert_need_mark_replicas)	\</div><div class='del'>-	x(BCH_ERR_btree_insert_fail,	btree_insert_need_journal_res)		\</div><div class='del'>-	x(BCH_ERR_btree_insert_fail,	btree_insert_need_journal_reclaim)	\</div><div class='del'>-	x(0,				backpointer_to_overwritten_btree_node)	\</div><div class='del'>-	x(0,				lock_fail_root_changed)			\</div><div class='del'>-	x(0,				journal_reclaim_would_deadlock)		\</div><div class='del'>-	x(EINVAL,			fsck)					\</div><div class='del'>-	x(BCH_ERR_fsck,			fsck_fix)				\</div><div class='del'>-	x(BCH_ERR_fsck,			fsck_ignore)				\</div><div class='del'>-	x(BCH_ERR_fsck,			fsck_errors_not_fixed)			\</div><div class='del'>-	x(BCH_ERR_fsck,			fsck_repair_unimplemented)		\</div><div class='del'>-	x(BCH_ERR_fsck,			fsck_repair_impossible)			\</div><div class='del'>-	x(0,				restart_recovery)			\</div><div class='del'>-	x(0,				data_update_done)			\</div><div class='del'>-	x(EINVAL,			device_state_not_allowed)		\</div><div class='del'>-	x(EINVAL,			member_info_missing)			\</div><div class='del'>-	x(EINVAL,			mismatched_block_size)			\</div><div class='del'>-	x(EINVAL,			block_size_too_small)			\</div><div class='del'>-	x(EINVAL,			bucket_size_too_small)			\</div><div class='del'>-	x(EINVAL,			device_size_too_small)			\</div><div class='del'>-	x(EINVAL,			device_not_a_member_of_filesystem)	\</div><div class='del'>-	x(EINVAL,			device_has_been_removed)		\</div><div class='del'>-	x(EINVAL,			device_splitbrain)			\</div><div class='del'>-	x(EINVAL,			device_already_online)			\</div><div class='del'>-	x(EINVAL,			insufficient_devices_to_start)		\</div><div class='del'>-	x(EINVAL,			invalid)				\</div><div class='del'>-	x(EINVAL,			internal_fsck_err)			\</div><div class='del'>-	x(EINVAL,			opt_parse_error)			\</div><div class='del'>-	x(EROFS,			erofs_trans_commit)			\</div><div class='del'>-	x(EROFS,			erofs_no_writes)			\</div><div class='del'>-	x(EROFS,			erofs_journal_err)			\</div><div class='del'>-	x(EROFS,			erofs_sb_err)				\</div><div class='del'>-	x(EROFS,			erofs_unfixed_errors)			\</div><div class='del'>-	x(EROFS,			erofs_norecovery)			\</div><div class='del'>-	x(EROFS,			erofs_nochanges)			\</div><div class='del'>-	x(EROFS,			insufficient_devices)			\</div><div class='del'>-	x(0,				operation_blocked)			\</div><div class='del'>-	x(BCH_ERR_operation_blocked,	btree_cache_cannibalize_lock_blocked)	\</div><div class='del'>-	x(BCH_ERR_operation_blocked,	journal_res_get_blocked)		\</div><div class='del'>-	x(BCH_ERR_operation_blocked,	journal_preres_get_blocked)		\</div><div class='del'>-	x(BCH_ERR_operation_blocked,	bucket_alloc_blocked)			\</div><div class='del'>-	x(BCH_ERR_operation_blocked,	stripe_alloc_blocked)			\</div><div class='del'>-	x(BCH_ERR_invalid,		invalid_sb)				\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_magic)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_version)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_features)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_too_big)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_csum_type)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_csum)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_block_size)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_uuid)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_too_many_members)		\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_dev_idx)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_time_precision)		\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_field_size)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_layout)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb_layout,	invalid_sb_layout_type)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb_layout,	invalid_sb_layout_nr_superblocks)	\</div><div class='del'>-	x(BCH_ERR_invalid_sb_layout,	invalid_sb_layout_superblocks_overlap)	\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_members_missing)		\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_members)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_disk_groups)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_replicas)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_replicas_entry)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_journal)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_journal_seq_blacklist)	\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_crypt)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_clean)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_quota)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_errors)			\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_opt_compression)		\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_ext)				\</div><div class='del'>-	x(BCH_ERR_invalid_sb,		invalid_sb_downgrade)			\</div><div class='del'>-	x(BCH_ERR_invalid,		invalid_bkey)				\</div><div class='del'>-	x(BCH_ERR_operation_blocked,    nocow_lock_blocked)			\</div><div class='del'>-	x(EIO,				btree_node_read_err)			\</div><div class='del'>-	x(EIO,				sb_not_downgraded)			\</div><div class='del'>-	x(EIO,				btree_write_all_failed)			\</div><div class='del'>-	x(BCH_ERR_btree_node_read_err,	btree_node_read_err_fixable)		\</div><div class='del'>-	x(BCH_ERR_btree_node_read_err,	btree_node_read_err_want_retry)		\</div><div class='del'>-	x(BCH_ERR_btree_node_read_err,	btree_node_read_err_must_retry)		\</div><div class='del'>-	x(BCH_ERR_btree_node_read_err,	btree_node_read_err_bad_node)		\</div><div class='del'>-	x(BCH_ERR_btree_node_read_err,	btree_node_read_err_incompatible)	\</div><div class='del'>-	x(0,				nopromote)				\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_may_not)			\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_already_promoted)		\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_unwritten)			\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_congested)			\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_in_flight)			\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_no_writes)			\</div><div class='del'>-	x(BCH_ERR_nopromote,		nopromote_enomem)</div><div class='del'>-</div><div class='del'>-enum bch_errcode {</div><div class='del'>-	BCH_ERR_START		= 2048,</div><div class='del'>-#define x(class, err) BCH_ERR_##err,</div><div class='del'>-	BCH_ERRCODES()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_ERR_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char *bch2_err_str(int);</div><div class='del'>-bool __bch2_err_matches(int, int);</div><div class='del'>-</div><div class='del'>-static inline bool _bch2_err_matches(int err, int class)</div><div class='del'>-{</div><div class='del'>-	return err &lt; 0 &amp;&amp; __bch2_err_matches(err, class);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_err_matches(_err, _class)			\</div><div class='del'>-({							\</div><div class='del'>-	BUILD_BUG_ON(!__builtin_constant_p(_class));	\</div><div class='del'>-	unlikely(_bch2_err_matches(_err, _class));	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int __bch2_err_class(int);</div><div class='del'>-</div><div class='del'>-static inline long bch2_err_class(long err)</div><div class='del'>-{</div><div class='del'>-	return err &lt; 0 ? __bch2_err_class(err) : err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BLK_STS_REMOVED		((__force blk_status_t)128)</div><div class='del'>-</div><div class='del'>-const char *bch2_blk_status_to_str(blk_status_t);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHFES_ERRCODE_H */</div><div class='head'>diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c<br/>deleted file mode 100644<br/>index d32c8bebe46c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/error.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/error.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,337 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "thread_with_file.h"</div><div class='del'>-</div><div class='del'>-#define FSCK_ERR_RATELIMIT_NR	10</div><div class='del'>-</div><div class='del'>-bool bch2_inconsistent_error(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	set_bit(BCH_FS_error, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	switch (c-&gt;opts.errors) {</div><div class='del'>-	case BCH_ON_ERROR_continue:</div><div class='del'>-		return false;</div><div class='del'>-	case BCH_ON_ERROR_ro:</div><div class='del'>-		if (bch2_fs_emergency_read_only(c))</div><div class='del'>-			bch_err(c, "inconsistency detected - emergency read only");</div><div class='del'>-		return true;</div><div class='del'>-	case BCH_ON_ERROR_panic:</div><div class='del'>-		panic(bch2_fmt(c, "panic after error"));</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_topology_error(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	set_bit(BCH_FS_topology_error, &amp;c-&gt;flags);</div><div class='del'>-	if (!test_bit(BCH_FS_fsck_running, &amp;c-&gt;flags))</div><div class='del'>-		bch2_inconsistent_error(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fatal_error(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bch2_fs_emergency_read_only(c))</div><div class='del'>-		bch_err(c, "fatal error - emergency read only");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_error_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = container_of(work, struct bch_dev, io_error_work);</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	bool dev;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	dev = bch2_dev_state_allowed(c, ca, BCH_MEMBER_STATE_ro,</div><div class='del'>-				    BCH_FORCE_IF_DEGRADED);</div><div class='del'>-	if (dev</div><div class='del'>-	    ? __bch2_dev_set_state(c, ca, BCH_MEMBER_STATE_ro,</div><div class='del'>-				  BCH_FORCE_IF_DEGRADED)</div><div class='del'>-	    : bch2_fs_emergency_read_only(c))</div><div class='del'>-		bch_err(ca,</div><div class='del'>-			"too many IO errors, setting %s RO",</div><div class='del'>-			dev ? "device" : "filesystem");</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_io_error(struct bch_dev *ca, enum bch_member_error_type type)</div><div class='del'>-{</div><div class='del'>-	atomic64_inc(&amp;ca-&gt;errors[type]);</div><div class='del'>-	//queue_work(system_long_wq, &amp;ca-&gt;io_error_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum ask_yn {</div><div class='del'>-	YN_NO,</div><div class='del'>-	YN_YES,</div><div class='del'>-	YN_ALLNO,</div><div class='del'>-	YN_ALLYES,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static enum ask_yn parse_yn_response(char *buf)</div><div class='del'>-{</div><div class='del'>-	buf = strim(buf);</div><div class='del'>-</div><div class='del'>-	if (strlen(buf) == 1)</div><div class='del'>-		switch (buf[0]) {</div><div class='del'>-		case 'n':</div><div class='del'>-			return YN_NO;</div><div class='del'>-		case 'y':</div><div class='del'>-			return YN_YES;</div><div class='del'>-		case 'N':</div><div class='del'>-			return YN_ALLNO;</div><div class='del'>-		case 'Y':</div><div class='del'>-			return YN_ALLYES;</div><div class='del'>-		}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-static enum ask_yn bch2_fsck_ask_yn(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct stdio_redirect *stdio = c-&gt;stdio;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;stdio_filter &amp;&amp; c-&gt;stdio_filter != current)</div><div class='del'>-		stdio = NULL;</div><div class='del'>-</div><div class='del'>-	if (!stdio)</div><div class='del'>-		return YN_NO;</div><div class='del'>-</div><div class='del'>-	char buf[100];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		bch2_print(c, " (y,n, or Y,N for all errors of this type) ");</div><div class='del'>-</div><div class='del'>-		int r = bch2_stdio_redirect_readline(stdio, buf, sizeof(buf) - 1);</div><div class='del'>-		if (r &lt; 0)</div><div class='del'>-			return YN_NO;</div><div class='del'>-		buf[r] = '\0';</div><div class='del'>-	} while ((ret = parse_yn_response(buf)) &lt; 0);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include "tools-util.h"</div><div class='del'>-</div><div class='del'>-static enum ask_yn bch2_fsck_ask_yn(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	char *buf = NULL;</div><div class='del'>-	size_t buflen = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		fputs(" (y,n, or Y,N for all errors of this type) ", stdout);</div><div class='del'>-		fflush(stdout);</div><div class='del'>-</div><div class='del'>-		if (getline(&amp;buf, &amp;buflen, stdin) &lt; 0)</div><div class='del'>-			die("error reading from standard input");</div><div class='del'>-	} while ((ret = parse_yn_response(buf)) &lt; 0);</div><div class='del'>-</div><div class='del'>-	free(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct fsck_err_state *fsck_err_get(struct bch_fs *c, const char *fmt)</div><div class='del'>-{</div><div class='del'>-	struct fsck_err_state *s;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_fsck_running, &amp;c-&gt;flags))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(s, &amp;c-&gt;fsck_error_msgs, list)</div><div class='del'>-		if (s-&gt;fmt == fmt) {</div><div class='del'>-			/*</div><div class='del'>-			 * move it to the head of the list: repeated fsck errors</div><div class='del'>-			 * are common</div><div class='del'>-			 */</div><div class='del'>-			list_move(&amp;s-&gt;list, &amp;c-&gt;fsck_error_msgs);</div><div class='del'>-			return s;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	s = kzalloc(sizeof(*s), GFP_NOFS);</div><div class='del'>-	if (!s) {</div><div class='del'>-		if (!c-&gt;fsck_alloc_msgs_err)</div><div class='del'>-			bch_err(c, "kmalloc err, cannot ratelimit fsck errs");</div><div class='del'>-		c-&gt;fsck_alloc_msgs_err = true;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;s-&gt;list);</div><div class='del'>-	s-&gt;fmt = fmt;</div><div class='del'>-	list_add(&amp;s-&gt;list, &amp;c-&gt;fsck_error_msgs);</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fsck_err(struct bch_fs *c,</div><div class='del'>-		  enum bch_fsck_flags flags,</div><div class='del'>-		  enum bch_sb_error_id err,</div><div class='del'>-		  const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct fsck_err_state *s = NULL;</div><div class='del'>-	va_list args;</div><div class='del'>-	bool print = true, suppressing = false, inconsistent = false;</div><div class='del'>-	struct printbuf buf = PRINTBUF, *out = &amp;buf;</div><div class='del'>-	int ret = -BCH_ERR_fsck_ignore;</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; FSCK_CAN_FIX) &amp;&amp;</div><div class='del'>-	    test_bit(err, c-&gt;sb.errors_silent))</div><div class='del'>-		return -BCH_ERR_fsck_fix;</div><div class='del'>-</div><div class='del'>-	bch2_sb_error_count(c, err);</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	prt_vprintf(out, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;fsck_error_msgs_lock);</div><div class='del'>-	s = fsck_err_get(c, fmt);</div><div class='del'>-	if (s) {</div><div class='del'>-		/*</div><div class='del'>-		 * We may be called multiple times for the same error on</div><div class='del'>-		 * transaction restart - this memoizes instead of asking the user</div><div class='del'>-		 * multiple times for the same error:</div><div class='del'>-		 */</div><div class='del'>-		if (s-&gt;last_msg &amp;&amp; !strcmp(buf.buf, s-&gt;last_msg)) {</div><div class='del'>-			ret = s-&gt;ret;</div><div class='del'>-			mutex_unlock(&amp;c-&gt;fsck_error_msgs_lock);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kfree(s-&gt;last_msg);</div><div class='del'>-		s-&gt;last_msg = kstrdup(buf.buf, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (c-&gt;opts.ratelimit_errors &amp;&amp;</div><div class='del'>-		    !(flags &amp; FSCK_NO_RATELIMIT) &amp;&amp;</div><div class='del'>-		    s-&gt;nr &gt;= FSCK_ERR_RATELIMIT_NR) {</div><div class='del'>-			if (s-&gt;nr == FSCK_ERR_RATELIMIT_NR)</div><div class='del'>-				suppressing = true;</div><div class='del'>-			else</div><div class='del'>-				print = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		s-&gt;nr++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef BCACHEFS_LOG_PREFIX</div><div class='del'>-	if (!strncmp(fmt, "bcachefs:", 9))</div><div class='del'>-		prt_printf(out, bch2_log_msg(c, ""));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_fsck_running, &amp;c-&gt;flags)) {</div><div class='del'>-		if (c-&gt;opts.errors != BCH_ON_ERROR_continue ||</div><div class='del'>-		    !(flags &amp; (FSCK_CAN_FIX|FSCK_CAN_IGNORE))) {</div><div class='del'>-			prt_str(out, ", shutting down");</div><div class='del'>-			inconsistent = true;</div><div class='del'>-			ret = -BCH_ERR_fsck_errors_not_fixed;</div><div class='del'>-		} else if (flags &amp; FSCK_CAN_FIX) {</div><div class='del'>-			prt_str(out, ", fixing");</div><div class='del'>-			ret = -BCH_ERR_fsck_fix;</div><div class='del'>-		} else {</div><div class='del'>-			prt_str(out, ", continuing");</div><div class='del'>-			ret = -BCH_ERR_fsck_ignore;</div><div class='del'>-		}</div><div class='del'>-	} else if (c-&gt;opts.fix_errors == FSCK_FIX_exit) {</div><div class='del'>-		prt_str(out, ", exiting");</div><div class='del'>-		ret = -BCH_ERR_fsck_errors_not_fixed;</div><div class='del'>-	} else if (flags &amp; FSCK_CAN_FIX) {</div><div class='del'>-		int fix = s &amp;&amp; s-&gt;fix</div><div class='del'>-			? s-&gt;fix</div><div class='del'>-			: c-&gt;opts.fix_errors;</div><div class='del'>-</div><div class='del'>-		if (fix == FSCK_FIX_ask) {</div><div class='del'>-			int ask;</div><div class='del'>-</div><div class='del'>-			prt_str(out, ": fix?");</div><div class='del'>-			if (bch2_fs_stdio_redirect(c))</div><div class='del'>-				bch2_print(c, "%s", out-&gt;buf);</div><div class='del'>-			else</div><div class='del'>-				bch2_print_string_as_lines(KERN_ERR, out-&gt;buf);</div><div class='del'>-			print = false;</div><div class='del'>-</div><div class='del'>-			ask = bch2_fsck_ask_yn(c);</div><div class='del'>-</div><div class='del'>-			if (ask &gt;= YN_ALLNO &amp;&amp; s)</div><div class='del'>-				s-&gt;fix = ask == YN_ALLNO</div><div class='del'>-					? FSCK_FIX_no</div><div class='del'>-					: FSCK_FIX_yes;</div><div class='del'>-</div><div class='del'>-			ret = ask &amp; 1</div><div class='del'>-				? -BCH_ERR_fsck_fix</div><div class='del'>-				: -BCH_ERR_fsck_ignore;</div><div class='del'>-		} else if (fix == FSCK_FIX_yes ||</div><div class='del'>-			   (c-&gt;opts.nochanges &amp;&amp;</div><div class='del'>-			    !(flags &amp; FSCK_CAN_IGNORE))) {</div><div class='del'>-			prt_str(out, ", fixing");</div><div class='del'>-			ret = -BCH_ERR_fsck_fix;</div><div class='del'>-		} else {</div><div class='del'>-			prt_str(out, ", not fixing");</div><div class='del'>-		}</div><div class='del'>-	} else if (flags &amp; FSCK_NEED_FSCK) {</div><div class='del'>-		prt_str(out, " (run fsck to correct)");</div><div class='del'>-	} else {</div><div class='del'>-		prt_str(out, " (repair unimplemented)");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret == -BCH_ERR_fsck_ignore &amp;&amp;</div><div class='del'>-	    (c-&gt;opts.fix_errors == FSCK_FIX_exit ||</div><div class='del'>-	     !(flags &amp; FSCK_CAN_IGNORE)))</div><div class='del'>-		ret = -BCH_ERR_fsck_errors_not_fixed;</div><div class='del'>-</div><div class='del'>-	if (print) {</div><div class='del'>-		if (bch2_fs_stdio_redirect(c))</div><div class='del'>-			bch2_print(c, "%s\n", out-&gt;buf);</div><div class='del'>-		else</div><div class='del'>-			bch2_print_string_as_lines(KERN_ERR, out-&gt;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_fsck_running, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    (ret != -BCH_ERR_fsck_fix &amp;&amp;</div><div class='del'>-	     ret != -BCH_ERR_fsck_ignore))</div><div class='del'>-		bch_err(c, "Unable to continue, halting");</div><div class='del'>-	else if (suppressing)</div><div class='del'>-		bch_err(c, "Ratelimiting new instances of previous error");</div><div class='del'>-</div><div class='del'>-	if (s)</div><div class='del'>-		s-&gt;ret = ret;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;fsck_error_msgs_lock);</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-	if (inconsistent)</div><div class='del'>-		bch2_inconsistent_error(c);</div><div class='del'>-</div><div class='del'>-	if (ret == -BCH_ERR_fsck_fix) {</div><div class='del'>-		set_bit(BCH_FS_errors_fixed, &amp;c-&gt;flags);</div><div class='del'>-	} else {</div><div class='del'>-		set_bit(BCH_FS_errors_not_fixed, &amp;c-&gt;flags);</div><div class='del'>-		set_bit(BCH_FS_error, &amp;c-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_flush_fsck_errs(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct fsck_err_state *s, *n;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;fsck_error_msgs_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(s, n, &amp;c-&gt;fsck_error_msgs, list) {</div><div class='del'>-		if (s-&gt;ratelimited &amp;&amp; s-&gt;last_msg)</div><div class='del'>-			bch_err(c, "Saw %llu errors like:\n    %s", s-&gt;nr, s-&gt;last_msg);</div><div class='del'>-</div><div class='del'>-		list_del(&amp;s-&gt;list);</div><div class='del'>-		kfree(s-&gt;last_msg);</div><div class='del'>-		kfree(s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;fsck_error_msgs_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/error.h b/fs/bcachefs/error.h<br/>deleted file mode 100644<br/>index fec17d1353d1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/error.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/error.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,242 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_ERROR_H</div><div class='del'>-#define _BCACHEFS_ERROR_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/printk.h&gt;</div><div class='del'>-#include "sb-errors.h"</div><div class='del'>-</div><div class='del'>-struct bch_dev;</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct work_struct;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX: separate out errors that indicate on disk data is inconsistent, and flag</div><div class='del'>- * superblock as such</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Error messages: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Inconsistency errors: The on disk data is inconsistent. If these occur during</div><div class='del'>- * initial recovery, they don't indicate a bug in the running code - we walk all</div><div class='del'>- * the metadata before modifying anything. If they occur at runtime, they</div><div class='del'>- * indicate either a bug in the running code or (less likely) data is being</div><div class='del'>- * silently corrupted under us.</div><div class='del'>- *</div><div class='del'>- * XXX: audit all inconsistent errors and make sure they're all recoverable, in</div><div class='del'>- * BCH_ON_ERROR_CONTINUE mode</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-bool bch2_inconsistent_error(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_topology_error(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#define bch2_fs_inconsistent(c, ...)					\</div><div class='del'>-({									\</div><div class='del'>-	bch_err(c, __VA_ARGS__);					\</div><div class='del'>-	bch2_inconsistent_error(c);					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_fs_inconsistent_on(cond, c, ...)				\</div><div class='del'>-({									\</div><div class='del'>-	bool _ret = unlikely(!!(cond));					\</div><div class='del'>-									\</div><div class='del'>-	if (_ret)							\</div><div class='del'>-		bch2_fs_inconsistent(c, __VA_ARGS__);			\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Later we might want to mark only the particular device inconsistent, not the</div><div class='del'>- * entire filesystem:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define bch2_dev_inconsistent(ca, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	bch_err(ca, __VA_ARGS__);					\</div><div class='del'>-	bch2_inconsistent_error((ca)-&gt;fs);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch2_dev_inconsistent_on(cond, ca, ...)				\</div><div class='del'>-({									\</div><div class='del'>-	bool _ret = unlikely(!!(cond));					\</div><div class='del'>-									\</div><div class='del'>-	if (_ret)							\</div><div class='del'>-		bch2_dev_inconsistent(ca, __VA_ARGS__);			\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When a transaction update discovers or is causing a fs inconsistency, it's</div><div class='del'>- * helpful to also dump the pending updates:</div><div class='del'>- */</div><div class='del'>-#define bch2_trans_inconsistent(trans, ...)				\</div><div class='del'>-({									\</div><div class='del'>-	bch_err(trans-&gt;c, __VA_ARGS__);					\</div><div class='del'>-	bch2_dump_trans_updates(trans);					\</div><div class='del'>-	bch2_inconsistent_error(trans-&gt;c);				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_trans_inconsistent_on(cond, trans, ...)			\</div><div class='del'>-({									\</div><div class='del'>-	bool _ret = unlikely(!!(cond));					\</div><div class='del'>-									\</div><div class='del'>-	if (_ret)							\</div><div class='del'>-		bch2_trans_inconsistent(trans, __VA_ARGS__);		\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fsck errors: inconsistency errors we detect at mount time, and should ideally</div><div class='del'>- * be able to repair:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct fsck_err_state {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	const char		*fmt;</div><div class='del'>-	u64			nr;</div><div class='del'>-	bool			ratelimited;</div><div class='del'>-	int			ret;</div><div class='del'>-	int			fix;</div><div class='del'>-	char			*last_msg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bch_fsck_flags {</div><div class='del'>-	FSCK_CAN_FIX		= 1 &lt;&lt; 0,</div><div class='del'>-	FSCK_CAN_IGNORE		= 1 &lt;&lt; 1,</div><div class='del'>-	FSCK_NEED_FSCK		= 1 &lt;&lt; 2,</div><div class='del'>-	FSCK_NO_RATELIMIT	= 1 &lt;&lt; 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define fsck_err_count(_c, _err)	bch2_sb_err_count(_c, BCH_FSCK_ERR_##_err)</div><div class='del'>-</div><div class='del'>-__printf(4, 5) __cold</div><div class='del'>-int bch2_fsck_err(struct bch_fs *,</div><div class='del'>-		  enum bch_fsck_flags,</div><div class='del'>-		  enum bch_sb_error_id,</div><div class='del'>-		  const char *, ...);</div><div class='del'>-void bch2_flush_fsck_errs(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#define __fsck_err(c, _flags, _err_type, ...)				\</div><div class='del'>-({									\</div><div class='del'>-	int _ret = bch2_fsck_err(c, _flags, BCH_FSCK_ERR_##_err_type,	\</div><div class='del'>-				 __VA_ARGS__);				\</div><div class='del'>-									\</div><div class='del'>-	if (_ret != -BCH_ERR_fsck_fix &amp;&amp;				\</div><div class='del'>-	    _ret != -BCH_ERR_fsck_ignore) {				\</div><div class='del'>-		ret = _ret;						\</div><div class='del'>-		goto fsck_err;						\</div><div class='del'>-	}								\</div><div class='del'>-									\</div><div class='del'>-	_ret == -BCH_ERR_fsck_fix;					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* These macros return true if error should be fixed: */</div><div class='del'>-</div><div class='del'>-/* XXX: mark in superblock that filesystem contains errors, if we ignore: */</div><div class='del'>-</div><div class='del'>-#define __fsck_err_on(cond, c, _flags, _err_type, ...)			\</div><div class='del'>-	(unlikely(cond) ? __fsck_err(c, _flags, _err_type, __VA_ARGS__) : false)</div><div class='del'>-</div><div class='del'>-#define need_fsck_err_on(cond, c, _err_type, ...)				\</div><div class='del'>-	__fsck_err_on(cond, c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, _err_type, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define need_fsck_err(c, _err_type, ...)				\</div><div class='del'>-	__fsck_err(c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, _err_type, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define mustfix_fsck_err(c, _err_type, ...)				\</div><div class='del'>-	__fsck_err(c, FSCK_CAN_FIX, _err_type, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define mustfix_fsck_err_on(cond, c, _err_type, ...)			\</div><div class='del'>-	__fsck_err_on(cond, c, FSCK_CAN_FIX, _err_type, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define fsck_err(c, _err_type, ...)					\</div><div class='del'>-	__fsck_err(c, FSCK_CAN_FIX|FSCK_CAN_IGNORE, _err_type, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define fsck_err_on(cond, c, _err_type, ...)				\</div><div class='del'>-	__fsck_err_on(cond, c, FSCK_CAN_FIX|FSCK_CAN_IGNORE, _err_type, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-__printf(4, 0)</div><div class='del'>-static inline void bch2_bkey_fsck_err(struct bch_fs *c,</div><div class='del'>-				     struct printbuf *err_msg,</div><div class='del'>-				     enum bch_sb_error_id err_type,</div><div class='del'>-				     const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	prt_vprintf(err_msg, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_fsck_err(c, _err_msg, _err_type, ...)			\</div><div class='del'>-do {									\</div><div class='del'>-	prt_printf(_err_msg, __VA_ARGS__);				\</div><div class='del'>-	bch2_sb_error_count(c, BCH_FSCK_ERR_##_err_type);		\</div><div class='del'>-	ret = -BCH_ERR_invalid_bkey;					\</div><div class='del'>-	goto fsck_err;							\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bkey_fsck_err_on(cond, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	if (unlikely(cond))						\</div><div class='del'>-		bkey_fsck_err(__VA_ARGS__);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fatal errors: these don't indicate a bug, but we can't continue running in RW</div><div class='del'>- * mode - pretty much just due to metadata IO errors:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bch2_fatal_error(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#define bch2_fs_fatal_error(c, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	bch_err(c, __VA_ARGS__);					\</div><div class='del'>-	bch2_fatal_error(c);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch2_fs_fatal_err_on(cond, c, ...)				\</div><div class='del'>-({									\</div><div class='del'>-	bool _ret = unlikely(!!(cond));					\</div><div class='del'>-									\</div><div class='del'>-	if (_ret)							\</div><div class='del'>-		bch2_fs_fatal_error(c, __VA_ARGS__);			\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IO errors: either recoverable metadata IO (because we have replicas), or data</div><div class='del'>- * IO - we need to log it and print out a message, but we don't (necessarily)</div><div class='del'>- * want to shut down the fs:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bch2_io_error_work(struct work_struct *);</div><div class='del'>-</div><div class='del'>-/* Does the error handling without logging a message */</div><div class='del'>-void bch2_io_error(struct bch_dev *, enum bch_member_error_type);</div><div class='del'>-</div><div class='del'>-#define bch2_dev_io_err_on(cond, ca, _type, ...)			\</div><div class='del'>-({									\</div><div class='del'>-	bool _ret = (cond);						\</div><div class='del'>-									\</div><div class='del'>-	if (_ret) {							\</div><div class='del'>-		bch_err_dev_ratelimited(ca, __VA_ARGS__);		\</div><div class='del'>-		bch2_io_error(ca, _type);				\</div><div class='del'>-	}								\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_dev_inum_io_err_on(cond, ca, _type, ...)			\</div><div class='del'>-({									\</div><div class='del'>-	bool _ret = (cond);						\</div><div class='del'>-									\</div><div class='del'>-	if (_ret) {							\</div><div class='del'>-		bch_err_inum_offset_ratelimited(ca, __VA_ARGS__);	\</div><div class='del'>-		bch2_io_error(ca, _type);				\</div><div class='del'>-	}								\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_ERROR_H */</div><div class='head'>diff --git a/fs/bcachefs/extent_update.c b/fs/bcachefs/extent_update.c<br/>deleted file mode 100644<br/>index b9033bb4f11c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/extent_update.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extent_update.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "extent_update.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This counts the number of iterators to the alloc &amp; ec btrees we'll need</div><div class='del'>- * inserting/removing this extent:</div><div class='del'>- */</div><div class='del'>-static unsigned bch2_bkey_nr_alloc_ptrs(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	unsigned ret = 0, lru = 0;</div><div class='del'>-</div><div class='del'>-	bkey_extent_entry_for_each(ptrs, entry) {</div><div class='del'>-		switch (__extent_entry_type(entry)) {</div><div class='del'>-		case BCH_EXTENT_ENTRY_ptr:</div><div class='del'>-			/* Might also be updating LRU btree */</div><div class='del'>-			if (entry-&gt;ptr.cached)</div><div class='del'>-				lru++;</div><div class='del'>-</div><div class='del'>-			fallthrough;</div><div class='del'>-		case BCH_EXTENT_ENTRY_stripe_ptr:</div><div class='del'>-			ret++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Updating keys in the alloc btree may also update keys in the</div><div class='del'>-	 * freespace or discard btrees:</div><div class='del'>-	 */</div><div class='del'>-	return lru + ret * 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int count_iters_for_insert(struct btree_trans *trans,</div><div class='del'>-				  struct bkey_s_c k,</div><div class='del'>-				  unsigned offset,</div><div class='del'>-				  struct bpos *end,</div><div class='del'>-				  unsigned *nr_iters,</div><div class='del'>-				  unsigned max_iters)</div><div class='del'>-{</div><div class='del'>-	int ret = 0, ret2 = 0;</div><div class='del'>-</div><div class='del'>-	if (*nr_iters &gt;= max_iters) {</div><div class='del'>-		*end = bpos_min(*end, k.k-&gt;p);</div><div class='del'>-		ret = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-		*nr_iters += bch2_bkey_nr_alloc_ptrs(k);</div><div class='del'>-</div><div class='del'>-		if (*nr_iters &gt;= max_iters) {</div><div class='del'>-			*end = bpos_min(*end, k.k-&gt;p);</div><div class='del'>-			ret = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case KEY_TYPE_reflink_p: {</div><div class='del'>-		struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k);</div><div class='del'>-		u64 idx = le64_to_cpu(p.v-&gt;idx);</div><div class='del'>-		unsigned sectors = bpos_min(*end, p.k-&gt;p).offset -</div><div class='del'>-			bkey_start_offset(p.k);</div><div class='del'>-		struct btree_iter iter;</div><div class='del'>-		struct bkey_s_c r_k;</div><div class='del'>-</div><div class='del'>-		for_each_btree_key_norestart(trans, iter,</div><div class='del'>-				   BTREE_ID_reflink, POS(0, idx + offset),</div><div class='del'>-				   BTREE_ITER_SLOTS, r_k, ret2) {</div><div class='del'>-			if (bkey_ge(bkey_start_pos(r_k.k), POS(0, idx + sectors)))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* extent_update_to_keys(), for the reflink_v update */</div><div class='del'>-			*nr_iters += 1;</div><div class='del'>-</div><div class='del'>-			*nr_iters += 1 + bch2_bkey_nr_alloc_ptrs(r_k);</div><div class='del'>-</div><div class='del'>-			if (*nr_iters &gt;= max_iters) {</div><div class='del'>-				struct bpos pos = bkey_start_pos(k.k);</div><div class='del'>-				pos.offset += min_t(u64, k.k-&gt;size,</div><div class='del'>-						    r_k.k-&gt;p.offset - idx);</div><div class='del'>-</div><div class='del'>-				*end = bpos_min(*end, pos);</div><div class='del'>-				ret = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret2 ?: ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define EXTENT_ITERS_MAX	(BTREE_ITER_INITIAL / 3)</div><div class='del'>-</div><div class='del'>-int bch2_extent_atomic_end(struct btree_trans *trans,</div><div class='del'>-			   struct btree_iter *iter,</div><div class='del'>-			   struct bkey_i *insert,</div><div class='del'>-			   struct bpos *end)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter copy;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	unsigned nr_iters = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_iter_traverse(iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*end = insert-&gt;k.p;</div><div class='del'>-</div><div class='del'>-	/* extent_update_to_keys(): */</div><div class='del'>-	nr_iters += 1;</div><div class='del'>-</div><div class='del'>-	ret = count_iters_for_insert(trans, bkey_i_to_s_c(insert), 0, end,</div><div class='del'>-				     &amp;nr_iters, EXTENT_ITERS_MAX / 2);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_copy_iter(&amp;copy, iter);</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_continue_norestart(copy, insert-&gt;k.p, 0, k, ret) {</div><div class='del'>-		unsigned offset = 0;</div><div class='del'>-</div><div class='del'>-		if (bkey_gt(bkey_start_pos(&amp;insert-&gt;k), bkey_start_pos(k.k)))</div><div class='del'>-			offset = bkey_start_offset(&amp;insert-&gt;k) -</div><div class='del'>-				bkey_start_offset(k.k);</div><div class='del'>-</div><div class='del'>-		/* extent_handle_overwrites(): */</div><div class='del'>-		switch (bch2_extent_overlap(&amp;insert-&gt;k, k.k)) {</div><div class='del'>-		case BCH_EXTENT_OVERLAP_ALL:</div><div class='del'>-		case BCH_EXTENT_OVERLAP_FRONT:</div><div class='del'>-			nr_iters += 1;</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_OVERLAP_BACK:</div><div class='del'>-		case BCH_EXTENT_OVERLAP_MIDDLE:</div><div class='del'>-			nr_iters += 2;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = count_iters_for_insert(trans, k, offset, end,</div><div class='del'>-					&amp;nr_iters, EXTENT_ITERS_MAX);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;copy);</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_extent_trim_atomic(struct btree_trans *trans,</div><div class='del'>-			    struct btree_iter *iter,</div><div class='del'>-			    struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct bpos end;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_extent_atomic_end(trans, iter, k, &amp;end);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_cut_back(end, k);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/extent_update.h b/fs/bcachefs/extent_update.h<br/>deleted file mode 100644<br/>index 6f5cf449361a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/extent_update.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extent_update.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EXTENT_UPDATE_H</div><div class='del'>-#define _BCACHEFS_EXTENT_UPDATE_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-</div><div class='del'>-int bch2_extent_atomic_end(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			   struct bkey_i *, struct bpos *);</div><div class='del'>-int bch2_extent_trim_atomic(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			    struct bkey_i *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EXTENT_UPDATE_H */</div><div class='head'>diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c<br/>deleted file mode 100644<br/>index 61395b113df9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/extents.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1510 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2010 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * Code for managing the extent btree and dynamically updating the writeback</div><div class='del'>- * dirty sector count.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-static unsigned bch2_crc_field_size_max[] = {</div><div class='del'>-	[BCH_EXTENT_ENTRY_crc32] = CRC32_SIZE_MAX,</div><div class='del'>-	[BCH_EXTENT_ENTRY_crc64] = CRC64_SIZE_MAX,</div><div class='del'>-	[BCH_EXTENT_ENTRY_crc128] = CRC128_SIZE_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_extent_crc_pack(union bch_extent_crc *,</div><div class='del'>-				 struct bch_extent_crc_unpacked,</div><div class='del'>-				 enum bch_extent_entry_type);</div><div class='del'>-</div><div class='del'>-static struct bch_dev_io_failures *dev_io_failures(struct bch_io_failures *f,</div><div class='del'>-						   unsigned dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev_io_failures *i;</div><div class='del'>-</div><div class='del'>-	for (i = f-&gt;devs; i &lt; f-&gt;devs + f-&gt;nr; i++)</div><div class='del'>-		if (i-&gt;dev == dev)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_mark_io_failure(struct bch_io_failures *failed,</div><div class='del'>-			  struct extent_ptr_decoded *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev_io_failures *f = dev_io_failures(failed, p-&gt;ptr.dev);</div><div class='del'>-</div><div class='del'>-	if (!f) {</div><div class='del'>-		BUG_ON(failed-&gt;nr &gt;= ARRAY_SIZE(failed-&gt;devs));</div><div class='del'>-</div><div class='del'>-		f = &amp;failed-&gt;devs[failed-&gt;nr++];</div><div class='del'>-		f-&gt;dev		= p-&gt;ptr.dev;</div><div class='del'>-		f-&gt;idx		= p-&gt;idx;</div><div class='del'>-		f-&gt;nr_failed	= 1;</div><div class='del'>-		f-&gt;nr_retries	= 0;</div><div class='del'>-	} else if (p-&gt;idx != f-&gt;idx) {</div><div class='del'>-		f-&gt;idx		= p-&gt;idx;</div><div class='del'>-		f-&gt;nr_failed	= 1;</div><div class='del'>-		f-&gt;nr_retries	= 0;</div><div class='del'>-	} else {</div><div class='del'>-		f-&gt;nr_failed++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns true if p1 is better than p2:</div><div class='del'>- */</div><div class='del'>-static inline bool ptr_better(struct bch_fs *c,</div><div class='del'>-			      const struct extent_ptr_decoded p1,</div><div class='del'>-			      const struct extent_ptr_decoded p2)</div><div class='del'>-{</div><div class='del'>-	if (likely(!p1.idx &amp;&amp; !p2.idx)) {</div><div class='del'>-		struct bch_dev *dev1 = bch_dev_bkey_exists(c, p1.ptr.dev);</div><div class='del'>-		struct bch_dev *dev2 = bch_dev_bkey_exists(c, p2.ptr.dev);</div><div class='del'>-</div><div class='del'>-		u64 l1 = atomic64_read(&amp;dev1-&gt;cur_latency[READ]);</div><div class='del'>-		u64 l2 = atomic64_read(&amp;dev2-&gt;cur_latency[READ]);</div><div class='del'>-</div><div class='del'>-		/* Pick at random, biased in favor of the faster device: */</div><div class='del'>-</div><div class='del'>-		return bch2_rand_range(l1 + l2) &gt; l1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_force_reconstruct_read)</div><div class='del'>-		return p1.idx &gt; p2.idx;</div><div class='del'>-</div><div class='del'>-	return p1.idx &lt; p2.idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This picks a non-stale pointer, preferably from a device other than @avoid.</div><div class='del'>- * Avoid can be NULL, meaning pick any. If there are no non-stale pointers to</div><div class='del'>- * other devices, it will still pick a pointer from avoid.</div><div class='del'>- */</div><div class='del'>-int bch2_bkey_pick_read_device(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			       struct bch_io_failures *failed,</div><div class='del'>-			       struct extent_ptr_decoded *pick)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	struct bch_dev_io_failures *f;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_error)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		/*</div><div class='del'>-		 * Unwritten extent: no need to actually read, treat it as a</div><div class='del'>-		 * hole and return 0s:</div><div class='del'>-		 */</div><div class='del'>-		if (p.ptr.unwritten)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		ca = bch_dev_bkey_exists(c, p.ptr.dev);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If there are any dirty pointers it's an error if we can't</div><div class='del'>-		 * read:</div><div class='del'>-		 */</div><div class='del'>-		if (!ret &amp;&amp; !p.ptr.cached)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-</div><div class='del'>-		if (p.ptr.cached &amp;&amp; ptr_stale(ca, &amp;p.ptr))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		f = failed ? dev_io_failures(failed, p.ptr.dev) : NULL;</div><div class='del'>-		if (f)</div><div class='del'>-			p.idx = f-&gt;nr_failed &lt; f-&gt;nr_retries</div><div class='del'>-				? f-&gt;idx</div><div class='del'>-				: f-&gt;idx + 1;</div><div class='del'>-</div><div class='del'>-		if (!p.idx &amp;&amp;</div><div class='del'>-		    !bch2_dev_is_readable(ca))</div><div class='del'>-			p.idx++;</div><div class='del'>-</div><div class='del'>-		if (bch2_force_reconstruct_read &amp;&amp;</div><div class='del'>-		    !p.idx &amp;&amp; p.has_ec)</div><div class='del'>-			p.idx++;</div><div class='del'>-</div><div class='del'>-		if (p.idx &gt;= (unsigned) p.has_ec + 1)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (ret &gt; 0 &amp;&amp; !ptr_better(c, p, *pick))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		*pick = p;</div><div class='del'>-		ret = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_btree_ptr: */</div><div class='del'>-</div><div class='del'>-int bch2_btree_ptr_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			   enum bkey_invalid_flags flags,</div><div class='del'>-			   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(k.k) &gt; BCH_REPLICAS_MAX, c, err,</div><div class='del'>-			 btree_ptr_val_too_big,</div><div class='del'>-			 "value too big (%zu &gt; %u)", bkey_val_u64s(k.k), BCH_REPLICAS_MAX);</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_ptrs_invalid(c, k, flags, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_ptr_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	bch2_bkey_ptrs_to_text(out, c, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_ptr_v2_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			      enum bkey_invalid_flags flags,</div><div class='del'>-			      struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(k.k) &gt; BKEY_BTREE_PTR_VAL_U64s_MAX, c, err,</div><div class='del'>-			 btree_ptr_v2_val_too_big,</div><div class='del'>-			 "value too big (%zu &gt; %zu)",</div><div class='del'>-			 bkey_val_u64s(k.k), BKEY_BTREE_PTR_VAL_U64s_MAX);</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_ptrs_invalid(c, k, flags, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_ptr_v2_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			       struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_btree_ptr_v2 bp = bkey_s_c_to_btree_ptr_v2(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "seq %llx written %u min_key %s",</div><div class='del'>-	       le64_to_cpu(bp.v-&gt;seq),</div><div class='del'>-	       le16_to_cpu(bp.v-&gt;sectors_written),</div><div class='del'>-	       BTREE_PTR_RANGE_UPDATED(bp.v) ? "R " : "");</div><div class='del'>-</div><div class='del'>-	bch2_bpos_to_text(out, bp.v-&gt;min_key);</div><div class='del'>-	prt_printf(out, " ");</div><div class='del'>-	bch2_bkey_ptrs_to_text(out, c, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_btree_ptr_v2_compat(enum btree_id btree_id, unsigned version,</div><div class='del'>-			      unsigned big_endian, int write,</div><div class='del'>-			      struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_btree_ptr_v2 bp = bkey_s_to_btree_ptr_v2(k);</div><div class='del'>-</div><div class='del'>-	compat_bpos(0, btree_id, version, big_endian, write, &amp;bp.v-&gt;min_key);</div><div class='del'>-</div><div class='del'>-	if (version &lt; bcachefs_metadata_version_inode_btree_change &amp;&amp;</div><div class='del'>-	    btree_id_is_extents(btree_id) &amp;&amp;</div><div class='del'>-	    !bkey_eq(bp.v-&gt;min_key, POS_MIN))</div><div class='del'>-		bp.v-&gt;min_key = write</div><div class='del'>-			? bpos_nosnap_predecessor(bp.v-&gt;min_key)</div><div class='del'>-			: bpos_nosnap_successor(bp.v-&gt;min_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_extent: */</div><div class='del'>-</div><div class='del'>-bool bch2_extent_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_c r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs   l_ptrs = bch2_bkey_ptrs(l);</div><div class='del'>-	struct bkey_ptrs_c r_ptrs = bch2_bkey_ptrs_c(r);</div><div class='del'>-	union bch_extent_entry *en_l;</div><div class='del'>-	const union bch_extent_entry *en_r;</div><div class='del'>-	struct extent_ptr_decoded lp, rp;</div><div class='del'>-	bool use_right_ptr;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-	en_l = l_ptrs.start;</div><div class='del'>-	en_r = r_ptrs.start;</div><div class='del'>-	while (en_l &lt; l_ptrs.end &amp;&amp; en_r &lt; r_ptrs.end) {</div><div class='del'>-		if (extent_entry_type(en_l) != extent_entry_type(en_r))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		en_l = extent_entry_next(en_l);</div><div class='del'>-		en_r = extent_entry_next(en_r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (en_l &lt; l_ptrs.end || en_r &lt; r_ptrs.end)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	en_l = l_ptrs.start;</div><div class='del'>-	en_r = r_ptrs.start;</div><div class='del'>-	lp.crc = bch2_extent_crc_unpack(l.k, NULL);</div><div class='del'>-	rp.crc = bch2_extent_crc_unpack(r.k, NULL);</div><div class='del'>-</div><div class='del'>-	while (__bkey_ptr_next_decode(l.k, l_ptrs.end, lp, en_l) &amp;&amp;</div><div class='del'>-	       __bkey_ptr_next_decode(r.k, r_ptrs.end, rp, en_r)) {</div><div class='del'>-		if (lp.ptr.offset + lp.crc.offset + lp.crc.live_size !=</div><div class='del'>-		    rp.ptr.offset + rp.crc.offset ||</div><div class='del'>-		    lp.ptr.dev			!= rp.ptr.dev ||</div><div class='del'>-		    lp.ptr.gen			!= rp.ptr.gen ||</div><div class='del'>-		    lp.ptr.unwritten		!= rp.ptr.unwritten ||</div><div class='del'>-		    lp.has_ec			!= rp.has_ec)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		/* Extents may not straddle buckets: */</div><div class='del'>-		ca = bch_dev_bkey_exists(c, lp.ptr.dev);</div><div class='del'>-		if (PTR_BUCKET_NR(ca, &amp;lp.ptr) != PTR_BUCKET_NR(ca, &amp;rp.ptr))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		if (lp.has_ec			!= rp.has_ec ||</div><div class='del'>-		    (lp.has_ec &amp;&amp;</div><div class='del'>-		     (lp.ec.block		!= rp.ec.block ||</div><div class='del'>-		      lp.ec.redundancy		!= rp.ec.redundancy ||</div><div class='del'>-		      lp.ec.idx			!= rp.ec.idx)))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		if (lp.crc.compression_type	!= rp.crc.compression_type ||</div><div class='del'>-		    lp.crc.nonce		!= rp.crc.nonce)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		if (lp.crc.offset + lp.crc.live_size + rp.crc.live_size &lt;=</div><div class='del'>-		    lp.crc.uncompressed_size) {</div><div class='del'>-			/* can use left extent's crc entry */</div><div class='del'>-		} else if (lp.crc.live_size &lt;= rp.crc.offset) {</div><div class='del'>-			/* can use right extent's crc entry */</div><div class='del'>-		} else {</div><div class='del'>-			/* check if checksums can be merged: */</div><div class='del'>-			if (lp.crc.csum_type		!= rp.crc.csum_type ||</div><div class='del'>-			    lp.crc.nonce		!= rp.crc.nonce ||</div><div class='del'>-			    crc_is_compressed(lp.crc) ||</div><div class='del'>-			    !bch2_checksum_mergeable(lp.crc.csum_type))</div><div class='del'>-				return false;</div><div class='del'>-</div><div class='del'>-			if (lp.crc.offset + lp.crc.live_size != lp.crc.compressed_size ||</div><div class='del'>-			    rp.crc.offset)</div><div class='del'>-				return false;</div><div class='del'>-</div><div class='del'>-			if (lp.crc.csum_type &amp;&amp;</div><div class='del'>-			    lp.crc.uncompressed_size +</div><div class='del'>-			    rp.crc.uncompressed_size &gt; (c-&gt;opts.encoded_extent_max &gt;&gt; 9))</div><div class='del'>-				return false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		en_l = extent_entry_next(en_l);</div><div class='del'>-		en_r = extent_entry_next(en_r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	en_l = l_ptrs.start;</div><div class='del'>-	en_r = r_ptrs.start;</div><div class='del'>-	while (en_l &lt; l_ptrs.end &amp;&amp; en_r &lt; r_ptrs.end) {</div><div class='del'>-		if (extent_entry_is_crc(en_l)) {</div><div class='del'>-			struct bch_extent_crc_unpacked crc_l = bch2_extent_crc_unpack(l.k, entry_to_crc(en_l));</div><div class='del'>-			struct bch_extent_crc_unpacked crc_r = bch2_extent_crc_unpack(r.k, entry_to_crc(en_r));</div><div class='del'>-</div><div class='del'>-			if (crc_l.uncompressed_size + crc_r.uncompressed_size &gt;</div><div class='del'>-			    bch2_crc_field_size_max[extent_entry_type(en_l)])</div><div class='del'>-				return false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		en_l = extent_entry_next(en_l);</div><div class='del'>-		en_r = extent_entry_next(en_r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	use_right_ptr = false;</div><div class='del'>-	en_l = l_ptrs.start;</div><div class='del'>-	en_r = r_ptrs.start;</div><div class='del'>-	while (en_l &lt; l_ptrs.end) {</div><div class='del'>-		if (extent_entry_type(en_l) == BCH_EXTENT_ENTRY_ptr &amp;&amp;</div><div class='del'>-		    use_right_ptr)</div><div class='del'>-			en_l-&gt;ptr = en_r-&gt;ptr;</div><div class='del'>-</div><div class='del'>-		if (extent_entry_is_crc(en_l)) {</div><div class='del'>-			struct bch_extent_crc_unpacked crc_l =</div><div class='del'>-				bch2_extent_crc_unpack(l.k, entry_to_crc(en_l));</div><div class='del'>-			struct bch_extent_crc_unpacked crc_r =</div><div class='del'>-				bch2_extent_crc_unpack(r.k, entry_to_crc(en_r));</div><div class='del'>-</div><div class='del'>-			use_right_ptr = false;</div><div class='del'>-</div><div class='del'>-			if (crc_l.offset + crc_l.live_size + crc_r.live_size &lt;=</div><div class='del'>-			    crc_l.uncompressed_size) {</div><div class='del'>-				/* can use left extent's crc entry */</div><div class='del'>-			} else if (crc_l.live_size &lt;= crc_r.offset) {</div><div class='del'>-				/* can use right extent's crc entry */</div><div class='del'>-				crc_r.offset -= crc_l.live_size;</div><div class='del'>-				bch2_extent_crc_pack(entry_to_crc(en_l), crc_r,</div><div class='del'>-						     extent_entry_type(en_l));</div><div class='del'>-				use_right_ptr = true;</div><div class='del'>-			} else {</div><div class='del'>-				crc_l.csum = bch2_checksum_merge(crc_l.csum_type,</div><div class='del'>-								 crc_l.csum,</div><div class='del'>-								 crc_r.csum,</div><div class='del'>-								 crc_r.uncompressed_size &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-				crc_l.uncompressed_size	+= crc_r.uncompressed_size;</div><div class='del'>-				crc_l.compressed_size	+= crc_r.compressed_size;</div><div class='del'>-				bch2_extent_crc_pack(entry_to_crc(en_l), crc_l,</div><div class='del'>-						     extent_entry_type(en_l));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		en_l = extent_entry_next(en_l);</div><div class='del'>-		en_r = extent_entry_next(en_r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_key_resize(l.k, l.k-&gt;size + r.k-&gt;size);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_reservation: */</div><div class='del'>-</div><div class='del'>-int bch2_reservation_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			     enum bkey_invalid_flags flags,</div><div class='del'>-			     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_reservation r = bkey_s_c_to_reservation(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!r.v-&gt;nr_replicas || r.v-&gt;nr_replicas &gt; BCH_REPLICAS_MAX, c, err,</div><div class='del'>-			 reservation_key_nr_replicas_invalid,</div><div class='del'>-			 "invalid nr_replicas (%u)", r.v-&gt;nr_replicas);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_reservation_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			      struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_reservation r = bkey_s_c_to_reservation(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "generation %u replicas %u",</div><div class='del'>-	       le32_to_cpu(r.v-&gt;generation),</div><div class='del'>-	       r.v-&gt;nr_replicas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_reservation_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_reservation l = bkey_s_to_reservation(_l);</div><div class='del'>-	struct bkey_s_c_reservation r = bkey_s_c_to_reservation(_r);</div><div class='del'>-</div><div class='del'>-	if (l.v-&gt;generation != r.v-&gt;generation ||</div><div class='del'>-	    l.v-&gt;nr_replicas != r.v-&gt;nr_replicas)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	bch2_key_resize(l.k, l.k-&gt;size + r.k-&gt;size);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Extent checksum entries: */</div><div class='del'>-</div><div class='del'>-/* returns true if not equal */</div><div class='del'>-static inline bool bch2_crc_unpacked_cmp(struct bch_extent_crc_unpacked l,</div><div class='del'>-					 struct bch_extent_crc_unpacked r)</div><div class='del'>-{</div><div class='del'>-	return (l.csum_type		!= r.csum_type ||</div><div class='del'>-		l.compression_type	!= r.compression_type ||</div><div class='del'>-		l.compressed_size	!= r.compressed_size ||</div><div class='del'>-		l.uncompressed_size	!= r.uncompressed_size ||</div><div class='del'>-		l.offset		!= r.offset ||</div><div class='del'>-		l.live_size		!= r.live_size ||</div><div class='del'>-		l.nonce			!= r.nonce ||</div><div class='del'>-		bch2_crc_cmp(l.csum, r.csum));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool can_narrow_crc(struct bch_extent_crc_unpacked u,</div><div class='del'>-				  struct bch_extent_crc_unpacked n)</div><div class='del'>-{</div><div class='del'>-	return !crc_is_compressed(u) &amp;&amp;</div><div class='del'>-		u.csum_type &amp;&amp;</div><div class='del'>-		u.uncompressed_size &gt; u.live_size &amp;&amp;</div><div class='del'>-		bch2_csum_type_is_encryption(u.csum_type) ==</div><div class='del'>-		bch2_csum_type_is_encryption(n.csum_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_can_narrow_extent_crcs(struct bkey_s_c k,</div><div class='del'>-				 struct bch_extent_crc_unpacked n)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	struct bch_extent_crc_unpacked crc;</div><div class='del'>-	const union bch_extent_entry *i;</div><div class='del'>-</div><div class='del'>-	if (!n.csum_type)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_crc(k.k, ptrs, crc, i)</div><div class='del'>-		if (can_narrow_crc(crc, n))</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We're writing another replica for this extent, so while we've got the data in</div><div class='del'>- * memory we'll be computing a new checksum for the currently live data.</div><div class='del'>- *</div><div class='del'>- * If there are other replicas we aren't moving, and they are checksummed but</div><div class='del'>- * not compressed, we can modify them to point to only the data that is</div><div class='del'>- * currently live (so that readers won't have to bounce) while we've got the</div><div class='del'>- * checksum we need:</div><div class='del'>- */</div><div class='del'>-bool bch2_bkey_narrow_crcs(struct bkey_i *k, struct bch_extent_crc_unpacked n)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(bkey_i_to_s(k));</div><div class='del'>-	struct bch_extent_crc_unpacked u;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	union bch_extent_entry *i;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	/* Find a checksum entry that covers only live data: */</div><div class='del'>-	if (!n.csum_type) {</div><div class='del'>-		bkey_for_each_crc(&amp;k-&gt;k, ptrs, u, i)</div><div class='del'>-			if (!crc_is_compressed(u) &amp;&amp;</div><div class='del'>-			    u.csum_type &amp;&amp;</div><div class='del'>-			    u.live_size == u.uncompressed_size) {</div><div class='del'>-				n = u;</div><div class='del'>-				goto found;</div><div class='del'>-			}</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-found:</div><div class='del'>-	BUG_ON(crc_is_compressed(n));</div><div class='del'>-	BUG_ON(n.offset);</div><div class='del'>-	BUG_ON(n.live_size != k-&gt;k.size);</div><div class='del'>-</div><div class='del'>-restart_narrow_pointers:</div><div class='del'>-	ptrs = bch2_bkey_ptrs(bkey_i_to_s(k));</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(&amp;k-&gt;k, ptrs, p, i)</div><div class='del'>-		if (can_narrow_crc(p.crc, n)) {</div><div class='del'>-			bch2_bkey_drop_ptr_noerror(bkey_i_to_s(k), &amp;i-&gt;ptr);</div><div class='del'>-			p.ptr.offset += p.crc.offset;</div><div class='del'>-			p.crc = n;</div><div class='del'>-			bch2_extent_ptr_decoded_append(k, &amp;p);</div><div class='del'>-			ret = true;</div><div class='del'>-			goto restart_narrow_pointers;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_extent_crc_pack(union bch_extent_crc *dst,</div><div class='del'>-				 struct bch_extent_crc_unpacked src,</div><div class='del'>-				 enum bch_extent_entry_type type)</div><div class='del'>-{</div><div class='del'>-#define set_common_fields(_dst, _src)					\</div><div class='del'>-		_dst.type		= 1 &lt;&lt; type;			\</div><div class='del'>-		_dst.csum_type		= _src.csum_type,		\</div><div class='del'>-		_dst.compression_type	= _src.compression_type,	\</div><div class='del'>-		_dst._compressed_size	= _src.compressed_size - 1,	\</div><div class='del'>-		_dst._uncompressed_size	= _src.uncompressed_size - 1,	\</div><div class='del'>-		_dst.offset		= _src.offset</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc32:</div><div class='del'>-		set_common_fields(dst-&gt;crc32, src);</div><div class='del'>-		dst-&gt;crc32.csum		= (u32 __force) *((__le32 *) &amp;src.csum.lo);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc64:</div><div class='del'>-		set_common_fields(dst-&gt;crc64, src);</div><div class='del'>-		dst-&gt;crc64.nonce	= src.nonce;</div><div class='del'>-		dst-&gt;crc64.csum_lo	= (u64 __force) src.csum.lo;</div><div class='del'>-		dst-&gt;crc64.csum_hi	= (u64 __force) *((__le16 *) &amp;src.csum.hi);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc128:</div><div class='del'>-		set_common_fields(dst-&gt;crc128, src);</div><div class='del'>-		dst-&gt;crc128.nonce	= src.nonce;</div><div class='del'>-		dst-&gt;crc128.csum	= src.csum;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-#undef set_common_fields</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_extent_crc_append(struct bkey_i *k,</div><div class='del'>-			    struct bch_extent_crc_unpacked new)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(bkey_i_to_s(k));</div><div class='del'>-	union bch_extent_crc *crc = (void *) ptrs.end;</div><div class='del'>-	enum bch_extent_entry_type type;</div><div class='del'>-</div><div class='del'>-	if (bch_crc_bytes[new.csum_type]	&lt;= 4 &amp;&amp;</div><div class='del'>-	    new.uncompressed_size		&lt;= CRC32_SIZE_MAX &amp;&amp;</div><div class='del'>-	    new.nonce				&lt;= CRC32_NONCE_MAX)</div><div class='del'>-		type = BCH_EXTENT_ENTRY_crc32;</div><div class='del'>-	else if (bch_crc_bytes[new.csum_type]	&lt;= 10 &amp;&amp;</div><div class='del'>-		   new.uncompressed_size	&lt;= CRC64_SIZE_MAX &amp;&amp;</div><div class='del'>-		   new.nonce			&lt;= CRC64_NONCE_MAX)</div><div class='del'>-		type = BCH_EXTENT_ENTRY_crc64;</div><div class='del'>-	else if (bch_crc_bytes[new.csum_type]	&lt;= 16 &amp;&amp;</div><div class='del'>-		   new.uncompressed_size	&lt;= CRC128_SIZE_MAX &amp;&amp;</div><div class='del'>-		   new.nonce			&lt;= CRC128_NONCE_MAX)</div><div class='del'>-		type = BCH_EXTENT_ENTRY_crc128;</div><div class='del'>-	else</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	bch2_extent_crc_pack(crc, new, type);</div><div class='del'>-</div><div class='del'>-	k-&gt;k.u64s += extent_entry_u64s(ptrs.end);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bkey_val_u64s(&amp;k-&gt;k) &gt; BKEY_EXTENT_VAL_U64s_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Generic code for keys with pointers: */</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_nr_ptrs(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_devs(k).nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_nr_ptrs_allocated(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return k.k-&gt;type == KEY_TYPE_reservation</div><div class='del'>-		? bkey_s_c_to_reservation(k).v-&gt;nr_replicas</div><div class='del'>-		: bch2_bkey_dirty_devs(k).nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_nr_ptrs_fully_allocated(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	unsigned ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_reservation) {</div><div class='del'>-		ret = bkey_s_c_to_reservation(k).v-&gt;nr_replicas;</div><div class='del'>-	} else {</div><div class='del'>-		struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-		const union bch_extent_entry *entry;</div><div class='del'>-		struct extent_ptr_decoded p;</div><div class='del'>-</div><div class='del'>-		bkey_for_each_ptr_decode(k.k, ptrs, p, entry)</div><div class='del'>-			ret += !p.ptr.cached &amp;&amp; !crc_is_compressed(p.crc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_sectors_compressed(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	unsigned ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry)</div><div class='del'>-		if (!p.ptr.cached &amp;&amp; crc_is_compressed(p.crc))</div><div class='del'>-			ret += p.crc.compressed_size;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_is_incompressible(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct bch_extent_crc_unpacked crc;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_crc(k.k, ptrs, crc, entry)</div><div class='del'>-		if (crc.compression_type == BCH_COMPRESSION_TYPE_incompressible)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_replicas(struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p = { 0 };</div><div class='del'>-	unsigned replicas = 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		if (p.ptr.cached)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (p.has_ec)</div><div class='del'>-			replicas += p.ec.redundancy;</div><div class='del'>-</div><div class='del'>-		replicas++;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return replicas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __extent_ptr_durability(struct bch_dev *ca, struct extent_ptr_decoded *p)</div><div class='del'>-{</div><div class='del'>-	if (p-&gt;ptr.cached)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return p-&gt;has_ec</div><div class='del'>-		? p-&gt;ec.redundancy + 1</div><div class='del'>-		: ca-&gt;mi.durability;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_extent_ptr_desired_durability(struct bch_fs *c, struct extent_ptr_decoded *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, p-&gt;ptr.dev);</div><div class='del'>-</div><div class='del'>-	return __extent_ptr_durability(ca, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_extent_ptr_durability(struct bch_fs *c, struct extent_ptr_decoded *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, p-&gt;ptr.dev);</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.state == BCH_MEMBER_STATE_failed)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return __extent_ptr_durability(ca, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_durability(struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	unsigned durability = 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry)</div><div class='del'>-		durability += bch2_extent_ptr_durability(c, &amp;p);</div><div class='del'>-</div><div class='del'>-	return durability;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bch2_bkey_durability_safe(struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	unsigned durability = 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry)</div><div class='del'>-		if (p.ptr.dev &lt; c-&gt;sb.nr_devices &amp;&amp; c-&gt;devs[p.ptr.dev])</div><div class='del'>-			durability += bch2_extent_ptr_durability(c, &amp;p);</div><div class='del'>-</div><div class='del'>-	return durability;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_extent_entry_drop(struct bkey_i *k, union bch_extent_entry *entry)</div><div class='del'>-{</div><div class='del'>-	union bch_extent_entry *end = bkey_val_end(bkey_i_to_s(k));</div><div class='del'>-	union bch_extent_entry *next = extent_entry_next(entry);</div><div class='del'>-</div><div class='del'>-	memmove_u64s(entry, next, (u64 *) end - (u64 *) next);</div><div class='del'>-	k-&gt;k.u64s -= extent_entry_u64s(entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_extent_ptr_decoded_append(struct bkey_i *k,</div><div class='del'>-				    struct extent_ptr_decoded *p)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(bkey_i_to_s(k));</div><div class='del'>-	struct bch_extent_crc_unpacked crc =</div><div class='del'>-		bch2_extent_crc_unpack(&amp;k-&gt;k, NULL);</div><div class='del'>-	union bch_extent_entry *pos;</div><div class='del'>-</div><div class='del'>-	if (!bch2_crc_unpacked_cmp(crc, p-&gt;crc)) {</div><div class='del'>-		pos = ptrs.start;</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_for_each_crc(&amp;k-&gt;k, ptrs, crc, pos)</div><div class='del'>-		if (!bch2_crc_unpacked_cmp(crc, p-&gt;crc)) {</div><div class='del'>-			pos = extent_entry_next(pos);</div><div class='del'>-			goto found;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	bch2_extent_crc_append(k, p-&gt;crc);</div><div class='del'>-	pos = bkey_val_end(bkey_i_to_s(k));</div><div class='del'>-found:</div><div class='del'>-	p-&gt;ptr.type = 1 &lt;&lt; BCH_EXTENT_ENTRY_ptr;</div><div class='del'>-	__extent_entry_insert(k, pos, to_entry(&amp;p-&gt;ptr));</div><div class='del'>-</div><div class='del'>-	if (p-&gt;has_ec) {</div><div class='del'>-		p-&gt;ec.type = 1 &lt;&lt; BCH_EXTENT_ENTRY_stripe_ptr;</div><div class='del'>-		__extent_entry_insert(k, pos, to_entry(&amp;p-&gt;ec));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static union bch_extent_entry *extent_entry_prev(struct bkey_ptrs ptrs,</div><div class='del'>-					  union bch_extent_entry *entry)</div><div class='del'>-{</div><div class='del'>-	union bch_extent_entry *i = ptrs.start;</div><div class='del'>-</div><div class='del'>-	if (i == entry)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	while (extent_entry_next(i) != entry)</div><div class='del'>-		i = extent_entry_next(i);</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns pointer to the next entry after the one being dropped:</div><div class='del'>- */</div><div class='del'>-union bch_extent_entry *bch2_bkey_drop_ptr_noerror(struct bkey_s k,</div><div class='del'>-						   struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(k);</div><div class='del'>-	union bch_extent_entry *entry = to_entry(ptr), *next;</div><div class='del'>-	union bch_extent_entry *ret = entry;</div><div class='del'>-	bool drop_crc = true;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(ptr &lt; &amp;ptrs.start-&gt;ptr ||</div><div class='del'>-		ptr &gt;= &amp;ptrs.end-&gt;ptr);</div><div class='del'>-	EBUG_ON(ptr-&gt;type != 1 &lt;&lt; BCH_EXTENT_ENTRY_ptr);</div><div class='del'>-</div><div class='del'>-	for (next = extent_entry_next(entry);</div><div class='del'>-	     next != ptrs.end;</div><div class='del'>-	     next = extent_entry_next(next)) {</div><div class='del'>-		if (extent_entry_is_crc(next)) {</div><div class='del'>-			break;</div><div class='del'>-		} else if (extent_entry_is_ptr(next)) {</div><div class='del'>-			drop_crc = false;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	extent_entry_drop(k, entry);</div><div class='del'>-</div><div class='del'>-	while ((entry = extent_entry_prev(ptrs, entry))) {</div><div class='del'>-		if (extent_entry_is_ptr(entry))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if ((extent_entry_is_crc(entry) &amp;&amp; drop_crc) ||</div><div class='del'>-		    extent_entry_is_stripe_ptr(entry)) {</div><div class='del'>-			ret = (void *) ret - extent_entry_bytes(entry);</div><div class='del'>-			extent_entry_drop(k, entry);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-union bch_extent_entry *bch2_bkey_drop_ptr(struct bkey_s k,</div><div class='del'>-					   struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	bool have_dirty = bch2_bkey_dirty_devs(k.s_c).nr;</div><div class='del'>-	union bch_extent_entry *ret =</div><div class='del'>-		bch2_bkey_drop_ptr_noerror(k, ptr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we deleted all the dirty pointers and there's still cached</div><div class='del'>-	 * pointers, we could set the cached pointers to dirty if they're not</div><div class='del'>-	 * stale - but to do that correctly we'd need to grab an open_bucket</div><div class='del'>-	 * reference so that we don't race with bucket reuse:</div><div class='del'>-	 */</div><div class='del'>-	if (have_dirty &amp;&amp;</div><div class='del'>-	    !bch2_bkey_dirty_devs(k.s_c).nr) {</div><div class='del'>-		k.k-&gt;type = KEY_TYPE_error;</div><div class='del'>-		set_bkey_val_u64s(k.k, 0);</div><div class='del'>-		ret = NULL;</div><div class='del'>-	} else if (!bch2_bkey_nr_ptrs(k.s_c)) {</div><div class='del'>-		k.k-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-		set_bkey_val_u64s(k.k, 0);</div><div class='del'>-		ret = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_drop_device(struct bkey_s k, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_extent_ptr *ptr;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_drop_ptrs(k, ptr, ptr-&gt;dev == dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_drop_device_noerror(struct bkey_s k, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_extent_ptr *ptr = bch2_bkey_has_device(k, dev);</div><div class='del'>-</div><div class='del'>-	if (ptr)</div><div class='del'>-		bch2_bkey_drop_ptr_noerror(k, ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_extent_ptr *bch2_bkey_has_device_c(struct bkey_s_c k, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-		if (ptr-&gt;dev == dev)</div><div class='del'>-			return ptr;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_has_target(struct bch_fs *c, struct bkey_s_c k, unsigned target)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-		if (bch2_dev_in_target(c, ptr-&gt;dev, target) &amp;&amp;</div><div class='del'>-		    (!ptr-&gt;cached ||</div><div class='del'>-		     !ptr_stale(bch_dev_bkey_exists(c, ptr-&gt;dev), ptr)))</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_matches_ptr(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			   struct bch_extent_ptr m, u64 offset)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry)</div><div class='del'>-		if (p.ptr.dev	== m.dev &amp;&amp;</div><div class='del'>-		    p.ptr.gen	== m.gen &amp;&amp;</div><div class='del'>-		    (s64) p.ptr.offset + p.crc.offset - bkey_start_offset(k.k) ==</div><div class='del'>-		    (s64) m.offset  - offset)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns true if two extents refer to the same data:</div><div class='del'>- */</div><div class='del'>-bool bch2_extents_match(struct bkey_s_c k1, struct bkey_s_c k2)</div><div class='del'>-{</div><div class='del'>-	if (k1.k-&gt;type != k2.k-&gt;type)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (bkey_extent_is_direct_data(k1.k)) {</div><div class='del'>-		struct bkey_ptrs_c ptrs1 = bch2_bkey_ptrs_c(k1);</div><div class='del'>-		struct bkey_ptrs_c ptrs2 = bch2_bkey_ptrs_c(k2);</div><div class='del'>-		const union bch_extent_entry *entry1, *entry2;</div><div class='del'>-		struct extent_ptr_decoded p1, p2;</div><div class='del'>-</div><div class='del'>-		if (bkey_extent_is_unwritten(k1) != bkey_extent_is_unwritten(k2))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		bkey_for_each_ptr_decode(k1.k, ptrs1, p1, entry1)</div><div class='del'>-			bkey_for_each_ptr_decode(k2.k, ptrs2, p2, entry2)</div><div class='del'>-				if (p1.ptr.dev		== p2.ptr.dev &amp;&amp;</div><div class='del'>-				    p1.ptr.gen		== p2.ptr.gen &amp;&amp;</div><div class='del'>-				    (s64) p1.ptr.offset + p1.crc.offset - bkey_start_offset(k1.k) ==</div><div class='del'>-				    (s64) p2.ptr.offset + p2.crc.offset - bkey_start_offset(k2.k))</div><div class='del'>-					return true;</div><div class='del'>-</div><div class='del'>-		return false;</div><div class='del'>-	} else {</div><div class='del'>-		/* KEY_TYPE_deleted, etc. */</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_extent_ptr *</div><div class='del'>-bch2_extent_has_ptr(struct bkey_s_c k1, struct extent_ptr_decoded p1, struct bkey_s k2)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs2 = bch2_bkey_ptrs(k2);</div><div class='del'>-	union bch_extent_entry *entry2;</div><div class='del'>-	struct extent_ptr_decoded p2;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k2.k, ptrs2, p2, entry2)</div><div class='del'>-		if (p1.ptr.dev		== p2.ptr.dev &amp;&amp;</div><div class='del'>-		    p1.ptr.gen		== p2.ptr.gen &amp;&amp;</div><div class='del'>-		    (s64) p1.ptr.offset + p1.crc.offset - bkey_start_offset(k1.k) ==</div><div class='del'>-		    (s64) p2.ptr.offset + p2.crc.offset - bkey_start_offset(k2.k))</div><div class='del'>-			return &amp;entry2-&gt;ptr;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_extent_ptr_set_cached(struct bkey_s k, struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(k);</div><div class='del'>-	union bch_extent_entry *entry;</div><div class='del'>-	union bch_extent_entry *ec = NULL;</div><div class='del'>-</div><div class='del'>-	bkey_extent_entry_for_each(ptrs, entry) {</div><div class='del'>-		if (&amp;entry-&gt;ptr == ptr) {</div><div class='del'>-			ptr-&gt;cached = true;</div><div class='del'>-			if (ec)</div><div class='del'>-				extent_entry_drop(k, ec);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (extent_entry_is_stripe_ptr(entry))</div><div class='del'>-			ec = entry;</div><div class='del'>-		else if (extent_entry_is_ptr(entry))</div><div class='del'>-			ec = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch_extent_normalize - clean up an extent, dropping stale pointers etc.</div><div class='del'>- *</div><div class='del'>- * Returns true if @k should be dropped entirely</div><div class='del'>- *</div><div class='del'>- * For existing keys, only called when btree nodes are being rewritten, not when</div><div class='del'>- * they're merely being compacted/resorted in memory.</div><div class='del'>- */</div><div class='del'>-bool bch2_extent_normalize(struct bch_fs *c, struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	struct bch_extent_ptr *ptr;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_drop_ptrs(k, ptr,</div><div class='del'>-		ptr-&gt;cached &amp;&amp;</div><div class='del'>-		ptr_stale(bch_dev_bkey_exists(c, ptr-&gt;dev), ptr));</div><div class='del'>-</div><div class='del'>-	return bkey_deleted(k.k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_ptrs_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	if (c)</div><div class='del'>-		prt_printf(out, "durability: %u ", bch2_bkey_durability_safe(c, k));</div><div class='del'>-</div><div class='del'>-	bkey_extent_entry_for_each(ptrs, entry) {</div><div class='del'>-		if (!first)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-</div><div class='del'>-		switch (__extent_entry_type(entry)) {</div><div class='del'>-		case BCH_EXTENT_ENTRY_ptr: {</div><div class='del'>-			const struct bch_extent_ptr *ptr = entry_to_ptr(entry);</div><div class='del'>-			struct bch_dev *ca = c &amp;&amp; ptr-&gt;dev &lt; c-&gt;sb.nr_devices &amp;&amp; c-&gt;devs[ptr-&gt;dev]</div><div class='del'>-				? bch_dev_bkey_exists(c, ptr-&gt;dev)</div><div class='del'>-				: NULL;</div><div class='del'>-</div><div class='del'>-			if (!ca) {</div><div class='del'>-				prt_printf(out, "ptr: %u:%llu gen %u%s", ptr-&gt;dev,</div><div class='del'>-				       (u64) ptr-&gt;offset, ptr-&gt;gen,</div><div class='del'>-				       ptr-&gt;cached ? " cached" : "");</div><div class='del'>-			} else {</div><div class='del'>-				u32 offset;</div><div class='del'>-				u64 b = sector_to_bucket_and_offset(ca, ptr-&gt;offset, &amp;offset);</div><div class='del'>-</div><div class='del'>-				prt_printf(out, "ptr: %u:%llu:%u gen %u",</div><div class='del'>-					   ptr-&gt;dev, b, offset, ptr-&gt;gen);</div><div class='del'>-				if (ptr-&gt;cached)</div><div class='del'>-					prt_str(out, " cached");</div><div class='del'>-				if (ptr-&gt;unwritten)</div><div class='del'>-					prt_str(out, " unwritten");</div><div class='del'>-				if (ca &amp;&amp; ptr_stale(ca, ptr))</div><div class='del'>-					prt_printf(out, " stale");</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc32:</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc64:</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc128: {</div><div class='del'>-			struct bch_extent_crc_unpacked crc =</div><div class='del'>-				bch2_extent_crc_unpack(k.k, entry_to_crc(entry));</div><div class='del'>-</div><div class='del'>-			prt_printf(out, "crc: c_size %u size %u offset %u nonce %u csum %s compress ",</div><div class='del'>-			       crc.compressed_size,</div><div class='del'>-			       crc.uncompressed_size,</div><div class='del'>-			       crc.offset, crc.nonce,</div><div class='del'>-			       bch2_csum_types[crc.csum_type]);</div><div class='del'>-			bch2_prt_compression_type(out, crc.compression_type);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case BCH_EXTENT_ENTRY_stripe_ptr: {</div><div class='del'>-			const struct bch_extent_stripe_ptr *ec = &amp;entry-&gt;stripe_ptr;</div><div class='del'>-</div><div class='del'>-			prt_printf(out, "ec: idx %llu block %u",</div><div class='del'>-			       (u64) ec-&gt;idx, ec-&gt;block);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case BCH_EXTENT_ENTRY_rebalance: {</div><div class='del'>-			const struct bch_extent_rebalance *r = &amp;entry-&gt;rebalance;</div><div class='del'>-</div><div class='del'>-			prt_str(out, "rebalance: target ");</div><div class='del'>-			if (c)</div><div class='del'>-				bch2_target_to_text(out, c, r-&gt;target);</div><div class='del'>-			else</div><div class='del'>-				prt_printf(out, "%u", r-&gt;target);</div><div class='del'>-			prt_str(out, " compression ");</div><div class='del'>-			bch2_compression_opt_to_text(out, r-&gt;compression);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		default:</div><div class='del'>-			prt_printf(out, "(invalid extent entry %.16llx)", *((u64 *) entry));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		first = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int extent_ptr_invalid(struct bch_fs *c,</div><div class='del'>-			      struct bkey_s_c k,</div><div class='del'>-			      enum bkey_invalid_flags flags,</div><div class='del'>-			      const struct bch_extent_ptr *ptr,</div><div class='del'>-			      unsigned size_ondisk,</div><div class='del'>-			      bool metadata,</div><div class='del'>-			      struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	u64 bucket;</div><div class='del'>-	u32 bucket_offset;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_exists2(c, ptr-&gt;dev)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we're in the write path this key might have already been</div><div class='del'>-		 * overwritten, and we could be seeing a device that doesn't</div><div class='del'>-		 * exist anymore due to racing with device removal:</div><div class='del'>-		 */</div><div class='del'>-		if (flags &amp; BKEY_INVALID_WRITE)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		bkey_fsck_err(c, err, ptr_to_invalid_device,</div><div class='del'>-			   "pointer to invalid device (%u)", ptr-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr2)</div><div class='del'>-		bkey_fsck_err_on(ptr != ptr2 &amp;&amp; ptr-&gt;dev == ptr2-&gt;dev, c, err,</div><div class='del'>-				 ptr_to_duplicate_device,</div><div class='del'>-				 "multiple pointers to same device (%u)", ptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-	bucket = sector_to_bucket_and_offset(ca, ptr-&gt;offset, &amp;bucket_offset);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bucket &gt;= ca-&gt;mi.nbuckets, c, err,</div><div class='del'>-			 ptr_after_last_bucket,</div><div class='del'>-			 "pointer past last bucket (%llu &gt; %llu)", bucket, ca-&gt;mi.nbuckets);</div><div class='del'>-	bkey_fsck_err_on(ptr-&gt;offset &lt; bucket_to_sector(ca, ca-&gt;mi.first_bucket), c, err,</div><div class='del'>-			 ptr_before_first_bucket,</div><div class='del'>-			 "pointer before first bucket (%llu &lt; %u)", bucket, ca-&gt;mi.first_bucket);</div><div class='del'>-	bkey_fsck_err_on(bucket_offset + size_ondisk &gt; ca-&gt;mi.bucket_size, c, err,</div><div class='del'>-			 ptr_spans_multiple_buckets,</div><div class='del'>-			 "pointer spans multiple buckets (%u + %u &gt; %u)",</div><div class='del'>-		       bucket_offset, size_ondisk, ca-&gt;mi.bucket_size);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_ptrs_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			   enum bkey_invalid_flags flags,</div><div class='del'>-			   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct bch_extent_crc_unpacked crc;</div><div class='del'>-	unsigned size_ondisk = k.k-&gt;size;</div><div class='del'>-	unsigned nonce = UINT_MAX;</div><div class='del'>-	unsigned nr_ptrs = 0;</div><div class='del'>-	bool have_written = false, have_unwritten = false, have_ec = false, crc_since_last_ptr = false;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (bkey_is_btree_ptr(k.k))</div><div class='del'>-		size_ondisk = btree_sectors(c);</div><div class='del'>-</div><div class='del'>-	bkey_extent_entry_for_each(ptrs, entry) {</div><div class='del'>-		bkey_fsck_err_on(__extent_entry_type(entry) &gt;= BCH_EXTENT_ENTRY_MAX, c, err,</div><div class='del'>-			extent_ptrs_invalid_entry,</div><div class='del'>-			"invalid extent entry type (got %u, max %u)",</div><div class='del'>-			__extent_entry_type(entry), BCH_EXTENT_ENTRY_MAX);</div><div class='del'>-</div><div class='del'>-		bkey_fsck_err_on(bkey_is_btree_ptr(k.k) &amp;&amp;</div><div class='del'>-				 !extent_entry_is_ptr(entry), c, err,</div><div class='del'>-				 btree_ptr_has_non_ptr,</div><div class='del'>-				 "has non ptr field");</div><div class='del'>-</div><div class='del'>-		switch (extent_entry_type(entry)) {</div><div class='del'>-		case BCH_EXTENT_ENTRY_ptr:</div><div class='del'>-			ret = extent_ptr_invalid(c, k, flags, &amp;entry-&gt;ptr,</div><div class='del'>-						 size_ondisk, false, err);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			bkey_fsck_err_on(entry-&gt;ptr.cached &amp;&amp; have_ec, c, err,</div><div class='del'>-					 ptr_cached_and_erasure_coded,</div><div class='del'>-					 "cached, erasure coded ptr");</div><div class='del'>-</div><div class='del'>-			if (!entry-&gt;ptr.unwritten)</div><div class='del'>-				have_written = true;</div><div class='del'>-			else</div><div class='del'>-				have_unwritten = true;</div><div class='del'>-</div><div class='del'>-			have_ec = false;</div><div class='del'>-			crc_since_last_ptr = false;</div><div class='del'>-			nr_ptrs++;</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc32:</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc64:</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc128:</div><div class='del'>-			crc = bch2_extent_crc_unpack(k.k, entry_to_crc(entry));</div><div class='del'>-</div><div class='del'>-			bkey_fsck_err_on(crc.offset + crc.live_size &gt; crc.uncompressed_size, c, err,</div><div class='del'>-					 ptr_crc_uncompressed_size_too_small,</div><div class='del'>-					 "checksum offset + key size &gt; uncompressed size");</div><div class='del'>-			bkey_fsck_err_on(!bch2_checksum_type_valid(c, crc.csum_type), c, err,</div><div class='del'>-					 ptr_crc_csum_type_unknown,</div><div class='del'>-					 "invalid checksum type");</div><div class='del'>-			bkey_fsck_err_on(crc.compression_type &gt;= BCH_COMPRESSION_TYPE_NR, c, err,</div><div class='del'>-					 ptr_crc_compression_type_unknown,</div><div class='del'>-					 "invalid compression type");</div><div class='del'>-</div><div class='del'>-			if (bch2_csum_type_is_encryption(crc.csum_type)) {</div><div class='del'>-				if (nonce == UINT_MAX)</div><div class='del'>-					nonce = crc.offset + crc.nonce;</div><div class='del'>-				else if (nonce != crc.offset + crc.nonce)</div><div class='del'>-					bkey_fsck_err(c, err, ptr_crc_nonce_mismatch,</div><div class='del'>-						      "incorrect nonce");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bkey_fsck_err_on(crc_since_last_ptr, c, err,</div><div class='del'>-					 ptr_crc_redundant,</div><div class='del'>-					 "redundant crc entry");</div><div class='del'>-			crc_since_last_ptr = true;</div><div class='del'>-</div><div class='del'>-			bkey_fsck_err_on(crc_is_encoded(crc) &amp;&amp;</div><div class='del'>-					 (crc.uncompressed_size &gt; c-&gt;opts.encoded_extent_max &gt;&gt; 9) &amp;&amp;</div><div class='del'>-					 (flags &amp; (BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT)), c, err,</div><div class='del'>-					 ptr_crc_uncompressed_size_too_big,</div><div class='del'>-					 "too large encoded extent");</div><div class='del'>-</div><div class='del'>-			size_ondisk = crc.compressed_size;</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_stripe_ptr:</div><div class='del'>-			bkey_fsck_err_on(have_ec, c, err,</div><div class='del'>-					 ptr_stripe_redundant,</div><div class='del'>-					 "redundant stripe entry");</div><div class='del'>-			have_ec = true;</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_rebalance: {</div><div class='del'>-			const struct bch_extent_rebalance *r = &amp;entry-&gt;rebalance;</div><div class='del'>-</div><div class='del'>-			if (!bch2_compression_opt_valid(r-&gt;compression)) {</div><div class='del'>-				struct bch_compression_opt opt = __bch2_compression_decode(r-&gt;compression);</div><div class='del'>-				prt_printf(err, "invalid compression opt %u:%u",</div><div class='del'>-					   opt.type, opt.level);</div><div class='del'>-				return -BCH_ERR_invalid_bkey;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!nr_ptrs, c, err,</div><div class='del'>-			 extent_ptrs_no_ptrs,</div><div class='del'>-			 "no ptrs");</div><div class='del'>-	bkey_fsck_err_on(nr_ptrs &gt; BCH_BKEY_PTRS_MAX, c, err,</div><div class='del'>-			 extent_ptrs_too_many_ptrs,</div><div class='del'>-			 "too many ptrs: %u &gt; %u", nr_ptrs, BCH_BKEY_PTRS_MAX);</div><div class='del'>-	bkey_fsck_err_on(have_written &amp;&amp; have_unwritten, c, err,</div><div class='del'>-			 extent_ptrs_written_and_unwritten,</div><div class='del'>-			 "extent with unwritten and written ptrs");</div><div class='del'>-	bkey_fsck_err_on(k.k-&gt;type != KEY_TYPE_extent &amp;&amp; have_unwritten, c, err,</div><div class='del'>-			 extent_ptrs_unwritten,</div><div class='del'>-			 "has unwritten ptrs");</div><div class='del'>-	bkey_fsck_err_on(crc_since_last_ptr, c, err,</div><div class='del'>-			 extent_ptrs_redundant_crc,</div><div class='del'>-			 "redundant crc entry");</div><div class='del'>-	bkey_fsck_err_on(have_ec, c, err,</div><div class='del'>-			 extent_ptrs_redundant_stripe,</div><div class='del'>-			 "redundant stripe entry");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_ptr_swab(struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(k);</div><div class='del'>-	union bch_extent_entry *entry;</div><div class='del'>-	u64 *d;</div><div class='del'>-</div><div class='del'>-	for (d =  (u64 *) ptrs.start;</div><div class='del'>-	     d != (u64 *) ptrs.end;</div><div class='del'>-	     d++)</div><div class='del'>-		*d = swab64(*d);</div><div class='del'>-</div><div class='del'>-	for (entry = ptrs.start;</div><div class='del'>-	     entry &lt; ptrs.end;</div><div class='del'>-	     entry = extent_entry_next(entry)) {</div><div class='del'>-		switch (extent_entry_type(entry)) {</div><div class='del'>-		case BCH_EXTENT_ENTRY_ptr:</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc32:</div><div class='del'>-			entry-&gt;crc32.csum = swab32(entry-&gt;crc32.csum);</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc64:</div><div class='del'>-			entry-&gt;crc64.csum_hi = swab16(entry-&gt;crc64.csum_hi);</div><div class='del'>-			entry-&gt;crc64.csum_lo = swab64(entry-&gt;crc64.csum_lo);</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc128:</div><div class='del'>-			entry-&gt;crc128.csum.hi = (__force __le64)</div><div class='del'>-				swab64((__force u64) entry-&gt;crc128.csum.hi);</div><div class='del'>-			entry-&gt;crc128.csum.lo = (__force __le64)</div><div class='del'>-				swab64((__force u64) entry-&gt;crc128.csum.lo);</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_stripe_ptr:</div><div class='del'>-			break;</div><div class='del'>-		case BCH_EXTENT_ENTRY_rebalance:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_extent_rebalance *bch2_bkey_rebalance_opts(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-</div><div class='del'>-	bkey_extent_entry_for_each(ptrs, entry)</div><div class='del'>-		if (__extent_entry_type(entry) == BCH_EXTENT_ENTRY_rebalance)</div><div class='del'>-			return &amp;entry-&gt;rebalance;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_ptrs_need_rebalance(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				       unsigned target, unsigned compression)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	unsigned rewrite_ptrs = 0;</div><div class='del'>-</div><div class='del'>-	if (compression) {</div><div class='del'>-		unsigned compression_type = bch2_compression_opt_to_type(compression);</div><div class='del'>-		const union bch_extent_entry *entry;</div><div class='del'>-		struct extent_ptr_decoded p;</div><div class='del'>-		unsigned i = 0;</div><div class='del'>-</div><div class='del'>-		bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-			if (p.crc.compression_type == BCH_COMPRESSION_TYPE_incompressible ||</div><div class='del'>-			    p.ptr.unwritten) {</div><div class='del'>-				rewrite_ptrs = 0;</div><div class='del'>-				goto incompressible;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!p.ptr.cached &amp;&amp; p.crc.compression_type != compression_type)</div><div class='del'>-				rewrite_ptrs |= 1U &lt;&lt; i;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-incompressible:</div><div class='del'>-	if (target &amp;&amp; bch2_target_accepts_data(c, BCH_DATA_user, target)) {</div><div class='del'>-		unsigned i = 0;</div><div class='del'>-</div><div class='del'>-		bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-			if (!ptr-&gt;cached &amp;&amp; !bch2_dev_in_target(c, ptr-&gt;dev, target))</div><div class='del'>-				rewrite_ptrs |= 1U &lt;&lt; i;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rewrite_ptrs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_needs_rebalance(struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	const struct bch_extent_rebalance *r = bch2_bkey_rebalance_opts(k);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If it's an indirect extent, we don't delete the rebalance entry when</div><div class='del'>-	 * done so that we know what options were applied - check if it still</div><div class='del'>-	 * needs work done:</div><div class='del'>-	 */</div><div class='del'>-	if (r &amp;&amp;</div><div class='del'>-	    k.k-&gt;type == KEY_TYPE_reflink_v &amp;&amp;</div><div class='del'>-	    !bch2_bkey_ptrs_need_rebalance(c, k, r-&gt;target, r-&gt;compression))</div><div class='del'>-		r = NULL;</div><div class='del'>-</div><div class='del'>-	return r != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bkey_set_needs_rebalance(struct bch_fs *c, struct bkey_i *_k,</div><div class='del'>-				  struct bch_io_opts *opts)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s k = bkey_i_to_s(_k);</div><div class='del'>-	struct bch_extent_rebalance *r;</div><div class='del'>-	unsigned target = opts-&gt;background_target;</div><div class='del'>-	unsigned compression = background_compression(*opts);</div><div class='del'>-	bool needs_rebalance;</div><div class='del'>-</div><div class='del'>-	if (!bkey_extent_is_direct_data(k.k))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* get existing rebalance entry: */</div><div class='del'>-	r = (struct bch_extent_rebalance *) bch2_bkey_rebalance_opts(k.s_c);</div><div class='del'>-	if (r) {</div><div class='del'>-		if (k.k-&gt;type == KEY_TYPE_reflink_v) {</div><div class='del'>-			/*</div><div class='del'>-			 * indirect extents: existing options take precedence,</div><div class='del'>-			 * so that we don't move extents back and forth if</div><div class='del'>-			 * they're referenced by different inodes with different</div><div class='del'>-			 * options:</div><div class='del'>-			 */</div><div class='del'>-			if (r-&gt;target)</div><div class='del'>-				target = r-&gt;target;</div><div class='del'>-			if (r-&gt;compression)</div><div class='del'>-				compression = r-&gt;compression;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		r-&gt;target	= target;</div><div class='del'>-		r-&gt;compression	= compression;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	needs_rebalance = bch2_bkey_ptrs_need_rebalance(c, k.s_c, target, compression);</div><div class='del'>-</div><div class='del'>-	if (needs_rebalance &amp;&amp; !r) {</div><div class='del'>-		union bch_extent_entry *new = bkey_val_end(k);</div><div class='del'>-</div><div class='del'>-		new-&gt;rebalance.type		= 1U &lt;&lt; BCH_EXTENT_ENTRY_rebalance;</div><div class='del'>-		new-&gt;rebalance.compression	= compression;</div><div class='del'>-		new-&gt;rebalance.target		= target;</div><div class='del'>-		new-&gt;rebalance.unused		= 0;</div><div class='del'>-		k.k-&gt;u64s += extent_entry_u64s(new);</div><div class='del'>-	} else if (!needs_rebalance &amp;&amp; r &amp;&amp; k.k-&gt;type != KEY_TYPE_reflink_v) {</div><div class='del'>-		/*</div><div class='del'>-		 * For indirect extents, don't delete the rebalance entry when</div><div class='del'>-		 * we're finished so that we know we specifically moved it or</div><div class='del'>-		 * compressed it to its current location/compression type</div><div class='del'>-		 */</div><div class='del'>-		extent_entry_drop(k, (union bch_extent_entry *) r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Generic extent code: */</div><div class='del'>-</div><div class='del'>-int bch2_cut_front_s(struct bpos where, struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	unsigned new_val_u64s = bkey_val_u64s(k.k);</div><div class='del'>-	int val_u64s_delta;</div><div class='del'>-	u64 sub;</div><div class='del'>-</div><div class='del'>-	if (bkey_le(where, bkey_start_pos(k.k)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bkey_gt(where, k.k-&gt;p));</div><div class='del'>-</div><div class='del'>-	sub = where.offset - bkey_start_offset(k.k);</div><div class='del'>-</div><div class='del'>-	k.k-&gt;size -= sub;</div><div class='del'>-</div><div class='del'>-	if (!k.k-&gt;size) {</div><div class='del'>-		k.k-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-		new_val_u64s = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-	case KEY_TYPE_reflink_v: {</div><div class='del'>-		struct bkey_ptrs ptrs = bch2_bkey_ptrs(k);</div><div class='del'>-		union bch_extent_entry *entry;</div><div class='del'>-		bool seen_crc = false;</div><div class='del'>-</div><div class='del'>-		bkey_extent_entry_for_each(ptrs, entry) {</div><div class='del'>-			switch (extent_entry_type(entry)) {</div><div class='del'>-			case BCH_EXTENT_ENTRY_ptr:</div><div class='del'>-				if (!seen_crc)</div><div class='del'>-					entry-&gt;ptr.offset += sub;</div><div class='del'>-				break;</div><div class='del'>-			case BCH_EXTENT_ENTRY_crc32:</div><div class='del'>-				entry-&gt;crc32.offset += sub;</div><div class='del'>-				break;</div><div class='del'>-			case BCH_EXTENT_ENTRY_crc64:</div><div class='del'>-				entry-&gt;crc64.offset += sub;</div><div class='del'>-				break;</div><div class='del'>-			case BCH_EXTENT_ENTRY_crc128:</div><div class='del'>-				entry-&gt;crc128.offset += sub;</div><div class='del'>-				break;</div><div class='del'>-			case BCH_EXTENT_ENTRY_stripe_ptr:</div><div class='del'>-				break;</div><div class='del'>-			case BCH_EXTENT_ENTRY_rebalance:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (extent_entry_is_crc(entry))</div><div class='del'>-				seen_crc = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_reflink_p: {</div><div class='del'>-		struct bkey_s_reflink_p p = bkey_s_to_reflink_p(k);</div><div class='del'>-</div><div class='del'>-		le64_add_cpu(&amp;p.v-&gt;idx, sub);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_inline_data:</div><div class='del'>-	case KEY_TYPE_indirect_inline_data: {</div><div class='del'>-		void *p = bkey_inline_data_p(k);</div><div class='del'>-		unsigned bytes = bkey_inline_data_bytes(k.k);</div><div class='del'>-</div><div class='del'>-		sub = min_t(u64, sub &lt;&lt; 9, bytes);</div><div class='del'>-</div><div class='del'>-		memmove(p, p + sub, bytes - sub);</div><div class='del'>-</div><div class='del'>-		new_val_u64s -= sub &gt;&gt; 3;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val_u64s_delta = bkey_val_u64s(k.k) - new_val_u64s;</div><div class='del'>-	BUG_ON(val_u64s_delta &lt; 0);</div><div class='del'>-</div><div class='del'>-	set_bkey_val_u64s(k.k, new_val_u64s);</div><div class='del'>-	memset(bkey_val_end(k), 0, val_u64s_delta * sizeof(u64));</div><div class='del'>-	return -val_u64s_delta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_cut_back_s(struct bpos where, struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	unsigned new_val_u64s = bkey_val_u64s(k.k);</div><div class='del'>-	int val_u64s_delta;</div><div class='del'>-	u64 len = 0;</div><div class='del'>-</div><div class='del'>-	if (bkey_ge(where, k.k-&gt;p))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bkey_lt(where, bkey_start_pos(k.k)));</div><div class='del'>-</div><div class='del'>-	len = where.offset - bkey_start_offset(k.k);</div><div class='del'>-</div><div class='del'>-	k.k-&gt;p.offset = where.offset;</div><div class='del'>-	k.k-&gt;size = len;</div><div class='del'>-</div><div class='del'>-	if (!len) {</div><div class='del'>-		k.k-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-		new_val_u64s = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_inline_data:</div><div class='del'>-	case KEY_TYPE_indirect_inline_data:</div><div class='del'>-		new_val_u64s = (bkey_inline_data_offset(k.k) +</div><div class='del'>-				min(bkey_inline_data_bytes(k.k), k.k-&gt;size &lt;&lt; 9)) &gt;&gt; 3;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val_u64s_delta = bkey_val_u64s(k.k) - new_val_u64s;</div><div class='del'>-	BUG_ON(val_u64s_delta &lt; 0);</div><div class='del'>-</div><div class='del'>-	set_bkey_val_u64s(k.k, new_val_u64s);</div><div class='del'>-	memset(bkey_val_end(k), 0, val_u64s_delta * sizeof(u64));</div><div class='del'>-	return -val_u64s_delta;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h<br/>deleted file mode 100644<br/>index 6bf839d69e84..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/extents.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,757 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EXTENTS_H</div><div class='del'>-#define _BCACHEFS_EXTENTS_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "extents_types.h"</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct btree_trans;</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-</div><div class='del'>-/* extent entries: */</div><div class='del'>-</div><div class='del'>-#define extent_entry_last(_e)						\</div><div class='del'>-	((typeof(&amp;(_e).v-&gt;start[0])) bkey_val_end(_e))</div><div class='del'>-</div><div class='del'>-#define entry_to_ptr(_entry)						\</div><div class='del'>-({									\</div><div class='del'>-	EBUG_ON((_entry) &amp;&amp; !extent_entry_is_ptr(_entry));		\</div><div class='del'>-									\</div><div class='del'>-	__builtin_choose_expr(						\</div><div class='del'>-		type_is_exact(_entry, const union bch_extent_entry *),	\</div><div class='del'>-		(const struct bch_extent_ptr *) (_entry),		\</div><div class='del'>-		(struct bch_extent_ptr *) (_entry));			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* downcast, preserves const */</div><div class='del'>-#define to_entry(_entry)						\</div><div class='del'>-({									\</div><div class='del'>-	BUILD_BUG_ON(!type_is(_entry, union bch_extent_crc *) &amp;&amp;	\</div><div class='del'>-		     !type_is(_entry, struct bch_extent_ptr *) &amp;&amp;	\</div><div class='del'>-		     !type_is(_entry, struct bch_extent_stripe_ptr *));	\</div><div class='del'>-									\</div><div class='del'>-	__builtin_choose_expr(						\</div><div class='del'>-		(type_is_exact(_entry, const union bch_extent_crc *) ||	\</div><div class='del'>-		 type_is_exact(_entry, const struct bch_extent_ptr *) ||\</div><div class='del'>-		 type_is_exact(_entry, const struct bch_extent_stripe_ptr *)),\</div><div class='del'>-		(const union bch_extent_entry *) (_entry),		\</div><div class='del'>-		(union bch_extent_entry *) (_entry));			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define extent_entry_next(_entry)					\</div><div class='del'>-	((typeof(_entry)) ((void *) (_entry) + extent_entry_bytes(_entry)))</div><div class='del'>-</div><div class='del'>-static inline unsigned</div><div class='del'>-__extent_entry_type(const union bch_extent_entry *e)</div><div class='del'>-{</div><div class='del'>-	return e-&gt;type ? __ffs(e-&gt;type) : BCH_EXTENT_ENTRY_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_extent_entry_type</div><div class='del'>-extent_entry_type(const union bch_extent_entry *e)</div><div class='del'>-{</div><div class='del'>-	int ret = __ffs(e-&gt;type);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(ret &lt; 0 || ret &gt;= BCH_EXTENT_ENTRY_MAX);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t extent_entry_bytes(const union bch_extent_entry *entry)</div><div class='del'>-{</div><div class='del'>-	switch (extent_entry_type(entry)) {</div><div class='del'>-#define x(f, n)						\</div><div class='del'>-	case BCH_EXTENT_ENTRY_##f:			\</div><div class='del'>-		return sizeof(struct bch_extent_##f);</div><div class='del'>-	BCH_EXTENT_ENTRY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t extent_entry_u64s(const union bch_extent_entry *entry)</div><div class='del'>-{</div><div class='del'>-	return extent_entry_bytes(entry) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __extent_entry_insert(struct bkey_i *k,</div><div class='del'>-					 union bch_extent_entry *dst,</div><div class='del'>-					 union bch_extent_entry *new)</div><div class='del'>-{</div><div class='del'>-	union bch_extent_entry *end = bkey_val_end(bkey_i_to_s(k));</div><div class='del'>-</div><div class='del'>-	memmove_u64s_up_small((u64 *) dst + extent_entry_u64s(new),</div><div class='del'>-			      dst, (u64 *) end - (u64 *) dst);</div><div class='del'>-	k-&gt;k.u64s += extent_entry_u64s(new);</div><div class='del'>-	memcpy_u64s_small(dst, new, extent_entry_u64s(new));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void extent_entry_drop(struct bkey_s k, union bch_extent_entry *entry)</div><div class='del'>-{</div><div class='del'>-	union bch_extent_entry *next = extent_entry_next(entry);</div><div class='del'>-</div><div class='del'>-	/* stripes have ptrs, but their layout doesn't work with this code */</div><div class='del'>-	BUG_ON(k.k-&gt;type == KEY_TYPE_stripe);</div><div class='del'>-</div><div class='del'>-	memmove_u64s_down(entry, next,</div><div class='del'>-			  (u64 *) bkey_val_end(k) - (u64 *) next);</div><div class='del'>-	k.k-&gt;u64s -= (u64 *) next - (u64 *) entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool extent_entry_is_ptr(const union bch_extent_entry *e)</div><div class='del'>-{</div><div class='del'>-	return extent_entry_type(e) == BCH_EXTENT_ENTRY_ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool extent_entry_is_stripe_ptr(const union bch_extent_entry *e)</div><div class='del'>-{</div><div class='del'>-	return extent_entry_type(e) == BCH_EXTENT_ENTRY_stripe_ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool extent_entry_is_crc(const union bch_extent_entry *e)</div><div class='del'>-{</div><div class='del'>-	switch (extent_entry_type(e)) {</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc32:</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc64:</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc128:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-union bch_extent_crc {</div><div class='del'>-	u8				type;</div><div class='del'>-	struct bch_extent_crc32		crc32;</div><div class='del'>-	struct bch_extent_crc64		crc64;</div><div class='del'>-	struct bch_extent_crc128	crc128;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define __entry_to_crc(_entry)						\</div><div class='del'>-	__builtin_choose_expr(						\</div><div class='del'>-		type_is_exact(_entry, const union bch_extent_entry *),	\</div><div class='del'>-		(const union bch_extent_crc *) (_entry),		\</div><div class='del'>-		(union bch_extent_crc *) (_entry))</div><div class='del'>-</div><div class='del'>-#define entry_to_crc(_entry)						\</div><div class='del'>-({									\</div><div class='del'>-	EBUG_ON((_entry) &amp;&amp; !extent_entry_is_crc(_entry));		\</div><div class='del'>-									\</div><div class='del'>-	__entry_to_crc(_entry);						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline struct bch_extent_crc_unpacked</div><div class='del'>-bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc)</div><div class='del'>-{</div><div class='del'>-#define common_fields(_crc)						\</div><div class='del'>-		.csum_type		= _crc.csum_type,		\</div><div class='del'>-		.compression_type	= _crc.compression_type,	\</div><div class='del'>-		.compressed_size	= _crc._compressed_size + 1,	\</div><div class='del'>-		.uncompressed_size	= _crc._uncompressed_size + 1,	\</div><div class='del'>-		.offset			= _crc.offset,			\</div><div class='del'>-		.live_size		= k-&gt;size</div><div class='del'>-</div><div class='del'>-	if (!crc)</div><div class='del'>-		return (struct bch_extent_crc_unpacked) {</div><div class='del'>-			.compressed_size	= k-&gt;size,</div><div class='del'>-			.uncompressed_size	= k-&gt;size,</div><div class='del'>-			.live_size		= k-&gt;size,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	switch (extent_entry_type(to_entry(crc))) {</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc32: {</div><div class='del'>-		struct bch_extent_crc_unpacked ret = (struct bch_extent_crc_unpacked) {</div><div class='del'>-			common_fields(crc-&gt;crc32),</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		*((__le32 *) &amp;ret.csum.lo) = (__le32 __force) crc-&gt;crc32.csum;</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc64: {</div><div class='del'>-		struct bch_extent_crc_unpacked ret = (struct bch_extent_crc_unpacked) {</div><div class='del'>-			common_fields(crc-&gt;crc64),</div><div class='del'>-			.nonce			= crc-&gt;crc64.nonce,</div><div class='del'>-			.csum.lo		= (__force __le64) crc-&gt;crc64.csum_lo,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		*((__le16 *) &amp;ret.csum.hi) = (__le16 __force) crc-&gt;crc64.csum_hi;</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	case BCH_EXTENT_ENTRY_crc128: {</div><div class='del'>-		struct bch_extent_crc_unpacked ret = (struct bch_extent_crc_unpacked) {</div><div class='del'>-			common_fields(crc-&gt;crc128),</div><div class='del'>-			.nonce			= crc-&gt;crc128.nonce,</div><div class='del'>-			.csum			= crc-&gt;crc128.csum,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-#undef common_fields</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool crc_is_compressed(struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	return (crc.compression_type != BCH_COMPRESSION_TYPE_none &amp;&amp;</div><div class='del'>-		crc.compression_type != BCH_COMPRESSION_TYPE_incompressible);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool crc_is_encoded(struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	return crc.csum_type != BCH_CSUM_none || crc_is_compressed(crc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bkey_ptrs: generically over any key type that has ptrs */</div><div class='del'>-</div><div class='del'>-struct bkey_ptrs_c {</div><div class='del'>-	const union bch_extent_entry	*start;</div><div class='del'>-	const union bch_extent_entry	*end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bkey_ptrs {</div><div class='del'>-	union bch_extent_entry	*start;</div><div class='del'>-	union bch_extent_entry	*end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bkey_ptrs_c bch2_bkey_ptrs_c(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr: {</div><div class='del'>-		struct bkey_s_c_btree_ptr e = bkey_s_c_to_btree_ptr(k);</div><div class='del'>-</div><div class='del'>-		return (struct bkey_ptrs_c) {</div><div class='del'>-			to_entry(&amp;e.v-&gt;start[0]),</div><div class='del'>-			to_entry(extent_entry_last(e))</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_extent: {</div><div class='del'>-		struct bkey_s_c_extent e = bkey_s_c_to_extent(k);</div><div class='del'>-</div><div class='del'>-		return (struct bkey_ptrs_c) {</div><div class='del'>-			e.v-&gt;start,</div><div class='del'>-			extent_entry_last(e)</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_stripe: {</div><div class='del'>-		struct bkey_s_c_stripe s = bkey_s_c_to_stripe(k);</div><div class='del'>-</div><div class='del'>-		return (struct bkey_ptrs_c) {</div><div class='del'>-			to_entry(&amp;s.v-&gt;ptrs[0]),</div><div class='del'>-			to_entry(&amp;s.v-&gt;ptrs[s.v-&gt;nr_blocks]),</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_reflink_v: {</div><div class='del'>-		struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(k);</div><div class='del'>-</div><div class='del'>-		return (struct bkey_ptrs_c) {</div><div class='del'>-			r.v-&gt;start,</div><div class='del'>-			bkey_val_end(r),</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2: {</div><div class='del'>-		struct bkey_s_c_btree_ptr_v2 e = bkey_s_c_to_btree_ptr_v2(k);</div><div class='del'>-</div><div class='del'>-		return (struct bkey_ptrs_c) {</div><div class='del'>-			to_entry(&amp;e.v-&gt;start[0]),</div><div class='del'>-			to_entry(extent_entry_last(e))</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		return (struct bkey_ptrs_c) { NULL, NULL };</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_ptrs bch2_bkey_ptrs(struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k.s_c);</div><div class='del'>-</div><div class='del'>-	return (struct bkey_ptrs) {</div><div class='del'>-		(void *) p.start,</div><div class='del'>-		(void *) p.end</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __bkey_extent_entry_for_each_from(_start, _end, _entry)		\</div><div class='del'>-	for ((_entry) = (_start);					\</div><div class='del'>-	     (_entry) &lt; (_end);						\</div><div class='del'>-	     (_entry) = extent_entry_next(_entry))</div><div class='del'>-</div><div class='del'>-#define __bkey_ptr_next(_ptr, _end)					\</div><div class='del'>-({									\</div><div class='del'>-	typeof(_end) _entry;						\</div><div class='del'>-									\</div><div class='del'>-	__bkey_extent_entry_for_each_from(to_entry(_ptr), _end, _entry)	\</div><div class='del'>-		if (extent_entry_is_ptr(_entry))			\</div><div class='del'>-			break;						\</div><div class='del'>-									\</div><div class='del'>-	_entry &lt; (_end) ? entry_to_ptr(_entry) : NULL;			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bkey_extent_entry_for_each_from(_p, _entry, _start)		\</div><div class='del'>-	__bkey_extent_entry_for_each_from(_start, (_p).end, _entry)</div><div class='del'>-</div><div class='del'>-#define bkey_extent_entry_for_each(_p, _entry)				\</div><div class='del'>-	bkey_extent_entry_for_each_from(_p, _entry, _p.start)</div><div class='del'>-</div><div class='del'>-#define __bkey_for_each_ptr(_start, _end, _ptr)				\</div><div class='del'>-	for (typeof(_start) (_ptr) = (_start);				\</div><div class='del'>-	     ((_ptr) = __bkey_ptr_next(_ptr, _end));			\</div><div class='del'>-	     (_ptr)++)</div><div class='del'>-</div><div class='del'>-#define bkey_ptr_next(_p, _ptr)						\</div><div class='del'>-	__bkey_ptr_next(_ptr, (_p).end)</div><div class='del'>-</div><div class='del'>-#define bkey_for_each_ptr(_p, _ptr)					\</div><div class='del'>-	__bkey_for_each_ptr(&amp;(_p).start-&gt;ptr, (_p).end, _ptr)</div><div class='del'>-</div><div class='del'>-#define __bkey_ptr_next_decode(_k, _end, _ptr, _entry)			\</div><div class='del'>-({									\</div><div class='del'>-	__label__ out;							\</div><div class='del'>-									\</div><div class='del'>-	(_ptr).idx	= 0;						\</div><div class='del'>-	(_ptr).has_ec	= false;					\</div><div class='del'>-									\</div><div class='del'>-	__bkey_extent_entry_for_each_from(_entry, _end, _entry)		\</div><div class='del'>-		switch (extent_entry_type(_entry)) {			\</div><div class='del'>-		case BCH_EXTENT_ENTRY_ptr:				\</div><div class='del'>-			(_ptr).ptr		= _entry-&gt;ptr;		\</div><div class='del'>-			goto out;					\</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc32:				\</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc64:				\</div><div class='del'>-		case BCH_EXTENT_ENTRY_crc128:				\</div><div class='del'>-			(_ptr).crc = bch2_extent_crc_unpack(_k,		\</div><div class='del'>-					entry_to_crc(_entry));		\</div><div class='del'>-			break;						\</div><div class='del'>-		case BCH_EXTENT_ENTRY_stripe_ptr:			\</div><div class='del'>-			(_ptr).ec = _entry-&gt;stripe_ptr;			\</div><div class='del'>-			(_ptr).has_ec	= true;				\</div><div class='del'>-			break;						\</div><div class='del'>-		default:						\</div><div class='del'>-			/* nothing */					\</div><div class='del'>-			break;						\</div><div class='del'>-		}							\</div><div class='del'>-out:									\</div><div class='del'>-	_entry &lt; (_end);						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define __bkey_for_each_ptr_decode(_k, _start, _end, _ptr, _entry)	\</div><div class='del'>-	for ((_ptr).crc = bch2_extent_crc_unpack(_k, NULL),		\</div><div class='del'>-	     (_entry) = _start;						\</div><div class='del'>-	     __bkey_ptr_next_decode(_k, _end, _ptr, _entry);		\</div><div class='del'>-	     (_entry) = extent_entry_next(_entry))</div><div class='del'>-</div><div class='del'>-#define bkey_for_each_ptr_decode(_k, _p, _ptr, _entry)			\</div><div class='del'>-	__bkey_for_each_ptr_decode(_k, (_p).start, (_p).end,		\</div><div class='del'>-				   _ptr, _entry)</div><div class='del'>-</div><div class='del'>-#define bkey_crc_next(_k, _start, _end, _crc, _iter)			\</div><div class='del'>-({									\</div><div class='del'>-	__bkey_extent_entry_for_each_from(_iter, _end, _iter)		\</div><div class='del'>-		if (extent_entry_is_crc(_iter)) {			\</div><div class='del'>-			(_crc) = bch2_extent_crc_unpack(_k,		\</div><div class='del'>-						entry_to_crc(_iter));	\</div><div class='del'>-			break;						\</div><div class='del'>-		}							\</div><div class='del'>-									\</div><div class='del'>-	(_iter) &lt; (_end);						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define __bkey_for_each_crc(_k, _start, _end, _crc, _iter)		\</div><div class='del'>-	for ((_crc) = bch2_extent_crc_unpack(_k, NULL),			\</div><div class='del'>-	     (_iter) = (_start);					\</div><div class='del'>-	     bkey_crc_next(_k, _start, _end, _crc, _iter);		\</div><div class='del'>-	     (_iter) = extent_entry_next(_iter))</div><div class='del'>-</div><div class='del'>-#define bkey_for_each_crc(_k, _p, _crc, _iter)				\</div><div class='del'>-	__bkey_for_each_crc(_k, (_p).start, (_p).end, _crc, _iter)</div><div class='del'>-</div><div class='del'>-/* Iterate over pointers in KEY_TYPE_extent: */</div><div class='del'>-</div><div class='del'>-#define extent_for_each_entry_from(_e, _entry, _start)			\</div><div class='del'>-	__bkey_extent_entry_for_each_from(_start,			\</div><div class='del'>-				extent_entry_last(_e), _entry)</div><div class='del'>-</div><div class='del'>-#define extent_for_each_entry(_e, _entry)				\</div><div class='del'>-	extent_for_each_entry_from(_e, _entry, (_e).v-&gt;start)</div><div class='del'>-</div><div class='del'>-#define extent_ptr_next(_e, _ptr)					\</div><div class='del'>-	__bkey_ptr_next(_ptr, extent_entry_last(_e))</div><div class='del'>-</div><div class='del'>-#define extent_for_each_ptr(_e, _ptr)					\</div><div class='del'>-	__bkey_for_each_ptr(&amp;(_e).v-&gt;start-&gt;ptr, extent_entry_last(_e), _ptr)</div><div class='del'>-</div><div class='del'>-#define extent_for_each_ptr_decode(_e, _ptr, _entry)			\</div><div class='del'>-	__bkey_for_each_ptr_decode((_e).k, (_e).v-&gt;start,		\</div><div class='del'>-				   extent_entry_last(_e), _ptr, _entry)</div><div class='del'>-</div><div class='del'>-/* utility code common to all keys with pointers: */</div><div class='del'>-</div><div class='del'>-void bch2_mark_io_failure(struct bch_io_failures *,</div><div class='del'>-			  struct extent_ptr_decoded *);</div><div class='del'>-int bch2_bkey_pick_read_device(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			       struct bch_io_failures *,</div><div class='del'>-			       struct extent_ptr_decoded *);</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_btree_ptr: */</div><div class='del'>-</div><div class='del'>-int bch2_btree_ptr_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			   enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_btree_ptr_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			    struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-int bch2_btree_ptr_v2_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			      enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_btree_ptr_v2_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-void bch2_btree_ptr_v2_compat(enum btree_id, unsigned, unsigned,</div><div class='del'>-			      int, struct bkey_s);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_btree_ptr ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_btree_ptr_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_btree_ptr_to_text,		\</div><div class='del'>-	.swab		= bch2_ptr_swab,			\</div><div class='del'>-	.trigger	= bch2_trigger_extent,			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_btree_ptr_v2 ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_btree_ptr_v2_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_btree_ptr_v2_to_text,		\</div><div class='del'>-	.swab		= bch2_ptr_swab,			\</div><div class='del'>-	.compat		= bch2_btree_ptr_v2_compat,		\</div><div class='del'>-	.trigger	= bch2_trigger_extent,			\</div><div class='del'>-	.min_val_size	= 40,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_extent: */</div><div class='del'>-</div><div class='del'>-bool bch2_extent_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_extent ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_bkey_ptrs_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_bkey_ptrs_to_text,		\</div><div class='del'>-	.swab		= bch2_ptr_swab,			\</div><div class='del'>-	.key_normalize	= bch2_extent_normalize,		\</div><div class='del'>-	.key_merge	= bch2_extent_merge,			\</div><div class='del'>-	.trigger	= bch2_trigger_extent,			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_reservation: */</div><div class='del'>-</div><div class='del'>-int bch2_reservation_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			     enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_reservation_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-bool bch2_reservation_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_reservation ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_reservation_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_reservation_to_text,		\</div><div class='del'>-	.key_merge	= bch2_reservation_merge,		\</div><div class='del'>-	.trigger	= bch2_trigger_reservation,		\</div><div class='del'>-	.min_val_size	= 8,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* Extent checksum entries: */</div><div class='del'>-</div><div class='del'>-bool bch2_can_narrow_extent_crcs(struct bkey_s_c,</div><div class='del'>-				 struct bch_extent_crc_unpacked);</div><div class='del'>-bool bch2_bkey_narrow_crcs(struct bkey_i *, struct bch_extent_crc_unpacked);</div><div class='del'>-void bch2_extent_crc_append(struct bkey_i *,</div><div class='del'>-			    struct bch_extent_crc_unpacked);</div><div class='del'>-</div><div class='del'>-/* Generic code for keys with pointers: */</div><div class='del'>-</div><div class='del'>-static inline bool bkey_is_btree_ptr(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	switch (k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr:</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_extent_is_direct_data(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	switch (k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr:</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_extent_is_inline_data(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return  k-&gt;type == KEY_TYPE_inline_data ||</div><div class='del'>-		k-&gt;type == KEY_TYPE_indirect_inline_data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bkey_inline_data_offset(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	switch (k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_inline_data:</div><div class='del'>-		return sizeof(struct bch_inline_data);</div><div class='del'>-	case KEY_TYPE_indirect_inline_data:</div><div class='del'>-		return sizeof(struct bch_indirect_inline_data);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bkey_inline_data_bytes(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return bkey_val_bytes(k) - bkey_inline_data_offset(k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bkey_inline_data_p(_k)	(((void *) (_k).v) + bkey_inline_data_offset((_k).k))</div><div class='del'>-</div><div class='del'>-static inline bool bkey_extent_is_data(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return  bkey_extent_is_direct_data(k) ||</div><div class='del'>-		bkey_extent_is_inline_data(k) ||</div><div class='del'>-		k-&gt;type == KEY_TYPE_reflink_p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Should extent be counted under inode-&gt;i_sectors?</div><div class='del'>- */</div><div class='del'>-static inline bool bkey_extent_is_allocation(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	switch (k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-	case KEY_TYPE_reservation:</div><div class='del'>-	case KEY_TYPE_reflink_p:</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-	case KEY_TYPE_inline_data:</div><div class='del'>-	case KEY_TYPE_indirect_inline_data:</div><div class='del'>-	case KEY_TYPE_error:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_extent_is_unwritten(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-		if (ptr-&gt;unwritten)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_extent_is_reservation(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return k.k-&gt;type == KEY_TYPE_reservation ||</div><div class='del'>-		bkey_extent_is_unwritten(k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_devs_list bch2_bkey_devs(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_list ret = (struct bch_devs_list) { 0 };</div><div class='del'>-	struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(p, ptr)</div><div class='del'>-		ret.data[ret.nr++] = ptr-&gt;dev;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_devs_list bch2_bkey_dirty_devs(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_list ret = (struct bch_devs_list) { 0 };</div><div class='del'>-	struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(p, ptr)</div><div class='del'>-		if (!ptr-&gt;cached)</div><div class='del'>-			ret.data[ret.nr++] = ptr-&gt;dev;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_devs_list bch2_bkey_cached_devs(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_list ret = (struct bch_devs_list) { 0 };</div><div class='del'>-	struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(p, ptr)</div><div class='del'>-		if (ptr-&gt;cached)</div><div class='del'>-			ret.data[ret.nr++] = ptr-&gt;dev;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_bkey_ptr_data_type(struct bkey_s_c k, const struct bch_extent_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr:</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-		return BCH_DATA_btree;</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-		return BCH_DATA_user;</div><div class='del'>-	case KEY_TYPE_stripe: {</div><div class='del'>-		struct bkey_s_c_stripe s = bkey_s_c_to_stripe(k);</div><div class='del'>-</div><div class='del'>-		BUG_ON(ptr &lt; s.v-&gt;ptrs ||</div><div class='del'>-		       ptr &gt;= s.v-&gt;ptrs + s.v-&gt;nr_blocks);</div><div class='del'>-</div><div class='del'>-		return ptr &gt;= s.v-&gt;ptrs + s.v-&gt;nr_blocks - s.v-&gt;nr_redundant</div><div class='del'>-			? BCH_DATA_parity</div><div class='del'>-			: BCH_DATA_user;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_nr_ptrs(struct bkey_s_c);</div><div class='del'>-unsigned bch2_bkey_nr_ptrs_allocated(struct bkey_s_c);</div><div class='del'>-unsigned bch2_bkey_nr_ptrs_fully_allocated(struct bkey_s_c);</div><div class='del'>-bool bch2_bkey_is_incompressible(struct bkey_s_c);</div><div class='del'>-unsigned bch2_bkey_sectors_compressed(struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-unsigned bch2_bkey_replicas(struct bch_fs *, struct bkey_s_c);</div><div class='del'>-unsigned bch2_extent_ptr_desired_durability(struct bch_fs *, struct extent_ptr_decoded *);</div><div class='del'>-unsigned bch2_extent_ptr_durability(struct bch_fs *, struct extent_ptr_decoded *);</div><div class='del'>-unsigned bch2_bkey_durability(struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-void bch2_bkey_drop_device(struct bkey_s, unsigned);</div><div class='del'>-void bch2_bkey_drop_device_noerror(struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-const struct bch_extent_ptr *bch2_bkey_has_device_c(struct bkey_s_c, unsigned);</div><div class='del'>-</div><div class='del'>-static inline struct bch_extent_ptr *bch2_bkey_has_device(struct bkey_s k, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	return (void *) bch2_bkey_has_device_c(k.s_c, dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_has_target(struct bch_fs *, struct bkey_s_c, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_bkey_extent_entry_drop(struct bkey_i *, union bch_extent_entry *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_bkey_append_ptr(struct bkey_i *k, struct bch_extent_ptr ptr)</div><div class='del'>-{</div><div class='del'>-	struct bch_extent_ptr *dest;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bch2_bkey_has_device(bkey_i_to_s(k), ptr.dev));</div><div class='del'>-</div><div class='del'>-	switch (k-&gt;k.type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr:</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-		EBUG_ON(bkey_val_u64s(&amp;k-&gt;k) &gt;= BKEY_EXTENT_VAL_U64s_MAX);</div><div class='del'>-</div><div class='del'>-		ptr.type = 1 &lt;&lt; BCH_EXTENT_ENTRY_ptr;</div><div class='del'>-		dest = (struct bch_extent_ptr *)((void *) &amp;k-&gt;v + bkey_val_bytes(&amp;k-&gt;k));</div><div class='del'>-		*dest = ptr;</div><div class='del'>-		k-&gt;k.u64s++;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_extent_ptr_decoded_append(struct bkey_i *,</div><div class='del'>-				    struct extent_ptr_decoded *);</div><div class='del'>-union bch_extent_entry *bch2_bkey_drop_ptr_noerror(struct bkey_s,</div><div class='del'>-						   struct bch_extent_ptr *);</div><div class='del'>-union bch_extent_entry *bch2_bkey_drop_ptr(struct bkey_s,</div><div class='del'>-					   struct bch_extent_ptr *);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_drop_ptrs(_k, _ptr, _cond)				\</div><div class='del'>-do {									\</div><div class='del'>-	struct bkey_ptrs _ptrs = bch2_bkey_ptrs(_k);			\</div><div class='del'>-									\</div><div class='del'>-	_ptr = &amp;_ptrs.start-&gt;ptr;					\</div><div class='del'>-									\</div><div class='del'>-	while ((_ptr = bkey_ptr_next(_ptrs, _ptr))) {			\</div><div class='del'>-		if (_cond) {						\</div><div class='del'>-			_ptr = (void *) bch2_bkey_drop_ptr(_k, _ptr);	\</div><div class='del'>-			_ptrs = bch2_bkey_ptrs(_k);			\</div><div class='del'>-			continue;					\</div><div class='del'>-		}							\</div><div class='del'>-									\</div><div class='del'>-		(_ptr)++;						\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-bool bch2_bkey_matches_ptr(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			   struct bch_extent_ptr, u64);</div><div class='del'>-bool bch2_extents_match(struct bkey_s_c, struct bkey_s_c);</div><div class='del'>-struct bch_extent_ptr *</div><div class='del'>-bch2_extent_has_ptr(struct bkey_s_c, struct extent_ptr_decoded, struct bkey_s);</div><div class='del'>-</div><div class='del'>-void bch2_extent_ptr_set_cached(struct bkey_s, struct bch_extent_ptr *);</div><div class='del'>-</div><div class='del'>-bool bch2_extent_normalize(struct bch_fs *, struct bkey_s);</div><div class='del'>-void bch2_bkey_ptrs_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			    struct bkey_s_c);</div><div class='del'>-int bch2_bkey_ptrs_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			   enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-</div><div class='del'>-void bch2_ptr_swab(struct bkey_s);</div><div class='del'>-</div><div class='del'>-const struct bch_extent_rebalance *bch2_bkey_rebalance_opts(struct bkey_s_c);</div><div class='del'>-unsigned bch2_bkey_ptrs_need_rebalance(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-				       unsigned, unsigned);</div><div class='del'>-bool bch2_bkey_needs_rebalance(struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-int bch2_bkey_set_needs_rebalance(struct bch_fs *, struct bkey_i *,</div><div class='del'>-				  struct bch_io_opts *);</div><div class='del'>-</div><div class='del'>-/* Generic extent code: */</div><div class='del'>-</div><div class='del'>-enum bch_extent_overlap {</div><div class='del'>-	BCH_EXTENT_OVERLAP_ALL		= 0,</div><div class='del'>-	BCH_EXTENT_OVERLAP_BACK		= 1,</div><div class='del'>-	BCH_EXTENT_OVERLAP_FRONT	= 2,</div><div class='del'>-	BCH_EXTENT_OVERLAP_MIDDLE	= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Returns how k overlaps with m */</div><div class='del'>-static inline enum bch_extent_overlap bch2_extent_overlap(const struct bkey *k,</div><div class='del'>-							  const struct bkey *m)</div><div class='del'>-{</div><div class='del'>-	int cmp1 = bkey_lt(k-&gt;p, m-&gt;p);</div><div class='del'>-	int cmp2 = bkey_gt(bkey_start_pos(k), bkey_start_pos(m));</div><div class='del'>-</div><div class='del'>-	return (cmp1 &lt;&lt; 1) + cmp2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_cut_front_s(struct bpos, struct bkey_s);</div><div class='del'>-int bch2_cut_back_s(struct bpos, struct bkey_s);</div><div class='del'>-</div><div class='del'>-static inline void bch2_cut_front(struct bpos where, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	bch2_cut_front_s(where, bkey_i_to_s(k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_cut_back(struct bpos where, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	bch2_cut_back_s(where, bkey_i_to_s(k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch_key_resize - adjust size of @k</div><div class='del'>- *</div><div class='del'>- * bkey_start_offset(k) will be preserved, modifies where the extent ends</div><div class='del'>- */</div><div class='del'>-static inline void bch2_key_resize(struct bkey *k, unsigned new_size)</div><div class='del'>-{</div><div class='del'>-	k-&gt;p.offset -= k-&gt;size;</div><div class='del'>-	k-&gt;p.offset += new_size;</div><div class='del'>-	k-&gt;size = new_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EXTENTS_H */</div><div class='head'>diff --git a/fs/bcachefs/extents_format.h b/fs/bcachefs/extents_format.h<br/>deleted file mode 100644<br/>index 3bd2fdbb0817..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/extents_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,295 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EXTENTS_FORMAT_H</div><div class='del'>-#define _BCACHEFS_EXTENTS_FORMAT_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In extent bkeys, the value is a list of pointers (bch_extent_ptr), optionally</div><div class='del'>- * preceded by checksum/compression information (bch_extent_crc32 or</div><div class='del'>- * bch_extent_crc64).</div><div class='del'>- *</div><div class='del'>- * One major determining factor in the format of extents is how we handle and</div><div class='del'>- * represent extents that have been partially overwritten and thus trimmed:</div><div class='del'>- *</div><div class='del'>- * If an extent is not checksummed or compressed, when the extent is trimmed we</div><div class='del'>- * don't have to remember the extent we originally allocated and wrote: we can</div><div class='del'>- * merely adjust ptr-&gt;offset to point to the start of the data that is currently</div><div class='del'>- * live. The size field in struct bkey records the current (live) size of the</div><div class='del'>- * extent, and is also used to mean "size of region on disk that we point to" in</div><div class='del'>- * this case.</div><div class='del'>- *</div><div class='del'>- * Thus an extent that is not checksummed or compressed will consist only of a</div><div class='del'>- * list of bch_extent_ptrs, with none of the fields in</div><div class='del'>- * bch_extent_crc32/bch_extent_crc64.</div><div class='del'>- *</div><div class='del'>- * When an extent is checksummed or compressed, it's not possible to read only</div><div class='del'>- * the data that is currently live: we have to read the entire extent that was</div><div class='del'>- * originally written, and then return only the part of the extent that is</div><div class='del'>- * currently live.</div><div class='del'>- *</div><div class='del'>- * Thus, in addition to the current size of the extent in struct bkey, we need</div><div class='del'>- * to store the size of the originally allocated space - this is the</div><div class='del'>- * compressed_size and uncompressed_size fields in bch_extent_crc32/64. Also,</div><div class='del'>- * when the extent is trimmed, instead of modifying the offset field of the</div><div class='del'>- * pointer, we keep a second smaller offset field - "offset into the original</div><div class='del'>- * extent of the currently live region".</div><div class='del'>- *</div><div class='del'>- * The other major determining factor is replication and data migration:</div><div class='del'>- *</div><div class='del'>- * Each pointer may have its own bch_extent_crc32/64. When doing a replicated</div><div class='del'>- * write, we will initially write all the replicas in the same format, with the</div><div class='del'>- * same checksum type and compression format - however, when copygc runs later (or</div><div class='del'>- * tiering/cache promotion, anything that moves data), it is not in general</div><div class='del'>- * going to rewrite all the pointers at once - one of the replicas may be in a</div><div class='del'>- * bucket on one device that has very little fragmentation while another lives</div><div class='del'>- * in a bucket that has become heavily fragmented, and thus is being rewritten</div><div class='del'>- * sooner than the rest.</div><div class='del'>- *</div><div class='del'>- * Thus it will only move a subset of the pointers (or in the case of</div><div class='del'>- * tiering/cache promotion perhaps add a single pointer without dropping any</div><div class='del'>- * current pointers), and if the extent has been partially overwritten it must</div><div class='del'>- * write only the currently live portion (or copygc would not be able to reduce</div><div class='del'>- * fragmentation!) - which necessitates a different bch_extent_crc format for</div><div class='del'>- * the new pointer.</div><div class='del'>- *</div><div class='del'>- * But in the interests of space efficiency, we don't want to store one</div><div class='del'>- * bch_extent_crc for each pointer if we don't have to.</div><div class='del'>- *</div><div class='del'>- * Thus, a bch_extent consists of bch_extent_crc32s, bch_extent_crc64s, and</div><div class='del'>- * bch_extent_ptrs appended arbitrarily one after the other. We determine the</div><div class='del'>- * type of a given entry with a scheme similar to utf8 (except we're encoding a</div><div class='del'>- * type, not a size), encoding the type in the position of the first set bit:</div><div class='del'>- *</div><div class='del'>- * bch_extent_crc32	- 0b1</div><div class='del'>- * bch_extent_ptr	- 0b10</div><div class='del'>- * bch_extent_crc64	- 0b100</div><div class='del'>- *</div><div class='del'>- * We do it this way because bch_extent_crc32 is _very_ constrained on bits (and</div><div class='del'>- * bch_extent_crc64 is the least constrained).</div><div class='del'>- *</div><div class='del'>- * Then, each bch_extent_crc32/64 applies to the pointers that follow after it,</div><div class='del'>- * until the next bch_extent_crc32/64.</div><div class='del'>- *</div><div class='del'>- * If there are no bch_extent_crcs preceding a bch_extent_ptr, then that pointer</div><div class='del'>- * is neither checksummed nor compressed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define BCH_EXTENT_ENTRY_TYPES()		\</div><div class='del'>-	x(ptr,			0)		\</div><div class='del'>-	x(crc32,		1)		\</div><div class='del'>-	x(crc64,		2)		\</div><div class='del'>-	x(crc128,		3)		\</div><div class='del'>-	x(stripe_ptr,		4)		\</div><div class='del'>-	x(rebalance,		5)</div><div class='del'>-#define BCH_EXTENT_ENTRY_MAX	6</div><div class='del'>-</div><div class='del'>-enum bch_extent_entry_type {</div><div class='del'>-#define x(f, n) BCH_EXTENT_ENTRY_##f = n,</div><div class='del'>-	BCH_EXTENT_ENTRY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Compressed/uncompressed size are stored biased by 1: */</div><div class='del'>-struct bch_extent_crc32 {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u32			type:2,</div><div class='del'>-				_compressed_size:7,</div><div class='del'>-				_uncompressed_size:7,</div><div class='del'>-				offset:7,</div><div class='del'>-				_unused:1,</div><div class='del'>-				csum_type:4,</div><div class='del'>-				compression_type:4;</div><div class='del'>-	__u32			csum;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u32			csum;</div><div class='del'>-	__u32			compression_type:4,</div><div class='del'>-				csum_type:4,</div><div class='del'>-				_unused:1,</div><div class='del'>-				offset:7,</div><div class='del'>-				_uncompressed_size:7,</div><div class='del'>-				_compressed_size:7,</div><div class='del'>-				type:2;</div><div class='del'>-#endif</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define CRC32_SIZE_MAX		(1U &lt;&lt; 7)</div><div class='del'>-#define CRC32_NONCE_MAX		0</div><div class='del'>-</div><div class='del'>-struct bch_extent_crc64 {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			type:3,</div><div class='del'>-				_compressed_size:9,</div><div class='del'>-				_uncompressed_size:9,</div><div class='del'>-				offset:9,</div><div class='del'>-				nonce:10,</div><div class='del'>-				csum_type:4,</div><div class='del'>-				compression_type:4,</div><div class='del'>-				csum_hi:16;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			csum_hi:16,</div><div class='del'>-				compression_type:4,</div><div class='del'>-				csum_type:4,</div><div class='del'>-				nonce:10,</div><div class='del'>-				offset:9,</div><div class='del'>-				_uncompressed_size:9,</div><div class='del'>-				_compressed_size:9,</div><div class='del'>-				type:3;</div><div class='del'>-#endif</div><div class='del'>-	__u64			csum_lo;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define CRC64_SIZE_MAX		(1U &lt;&lt; 9)</div><div class='del'>-#define CRC64_NONCE_MAX		((1U &lt;&lt; 10) - 1)</div><div class='del'>-</div><div class='del'>-struct bch_extent_crc128 {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			type:4,</div><div class='del'>-				_compressed_size:13,</div><div class='del'>-				_uncompressed_size:13,</div><div class='del'>-				offset:13,</div><div class='del'>-				nonce:13,</div><div class='del'>-				csum_type:4,</div><div class='del'>-				compression_type:4;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			compression_type:4,</div><div class='del'>-				csum_type:4,</div><div class='del'>-				nonce:13,</div><div class='del'>-				offset:13,</div><div class='del'>-				_uncompressed_size:13,</div><div class='del'>-				_compressed_size:13,</div><div class='del'>-				type:4;</div><div class='del'>-#endif</div><div class='del'>-	struct bch_csum		csum;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define CRC128_SIZE_MAX		(1U &lt;&lt; 13)</div><div class='del'>-#define CRC128_NONCE_MAX	((1U &lt;&lt; 13) - 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @reservation - pointer hasn't been written to, just reserved</div><div class='del'>- */</div><div class='del'>-struct bch_extent_ptr {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			type:1,</div><div class='del'>-				cached:1,</div><div class='del'>-				unused:1,</div><div class='del'>-				unwritten:1,</div><div class='del'>-				offset:44, /* 8 petabytes */</div><div class='del'>-				dev:8,</div><div class='del'>-				gen:8;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			gen:8,</div><div class='del'>-				dev:8,</div><div class='del'>-				offset:44,</div><div class='del'>-				unwritten:1,</div><div class='del'>-				unused:1,</div><div class='del'>-				cached:1,</div><div class='del'>-				type:1;</div><div class='del'>-#endif</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_extent_stripe_ptr {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			type:5,</div><div class='del'>-				block:8,</div><div class='del'>-				redundancy:4,</div><div class='del'>-				idx:47;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			idx:47,</div><div class='del'>-				redundancy:4,</div><div class='del'>-				block:8,</div><div class='del'>-				type:5;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_extent_rebalance {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			type:6,</div><div class='del'>-				unused:34,</div><div class='del'>-				compression:8, /* enum bch_compression_opt */</div><div class='del'>-				target:16;</div><div class='del'>-#elif defined (__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u64			target:16,</div><div class='del'>-				compression:8,</div><div class='del'>-				unused:34,</div><div class='del'>-				type:6;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union bch_extent_entry {</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ||  __BITS_PER_LONG == 64</div><div class='del'>-	unsigned long			type;</div><div class='del'>-#elif __BITS_PER_LONG == 32</div><div class='del'>-	struct {</div><div class='del'>-		unsigned long		pad;</div><div class='del'>-		unsigned long		type;</div><div class='del'>-	};</div><div class='del'>-#else</div><div class='del'>-#error edit for your odd byteorder.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define x(f, n) struct bch_extent_##f	f;</div><div class='del'>-	BCH_EXTENT_ENTRY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_btree_ptr {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__u64			_data[0];</div><div class='del'>-	struct bch_extent_ptr	start[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_btree_ptr_v2 {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__u64			mem_ptr;</div><div class='del'>-	__le64			seq;</div><div class='del'>-	__le16			sectors_written;</div><div class='del'>-	__le16			flags;</div><div class='del'>-	struct bpos		min_key;</div><div class='del'>-	__u64			_data[0];</div><div class='del'>-	struct bch_extent_ptr	start[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-LE16_BITMASK(BTREE_PTR_RANGE_UPDATED,	struct bch_btree_ptr_v2, flags, 0, 1);</div><div class='del'>-</div><div class='del'>-struct bch_extent {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__u64			_data[0];</div><div class='del'>-	union bch_extent_entry	start[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/* Maximum size (in u64s) a single pointer could be: */</div><div class='del'>-#define BKEY_EXTENT_PTR_U64s_MAX\</div><div class='del'>-	((sizeof(struct bch_extent_crc128) +			\</div><div class='del'>-	  sizeof(struct bch_extent_ptr)) / sizeof(__u64))</div><div class='del'>-</div><div class='del'>-/* Maximum possible size of an entire extent value: */</div><div class='del'>-#define BKEY_EXTENT_VAL_U64s_MAX				\</div><div class='del'>-	(1 + BKEY_EXTENT_PTR_U64s_MAX * (BCH_REPLICAS_MAX + 1))</div><div class='del'>-</div><div class='del'>-/* * Maximum possible size of an entire extent, key + value: */</div><div class='del'>-#define BKEY_EXTENT_U64s_MAX		(BKEY_U64s + BKEY_EXTENT_VAL_U64s_MAX)</div><div class='del'>-</div><div class='del'>-/* Btree pointers don't carry around checksums: */</div><div class='del'>-#define BKEY_BTREE_PTR_VAL_U64s_MAX				\</div><div class='del'>-	((sizeof(struct bch_btree_ptr_v2) +			\</div><div class='del'>-	  sizeof(struct bch_extent_ptr) * BCH_REPLICAS_MAX) / sizeof(__u64))</div><div class='del'>-#define BKEY_BTREE_PTR_U64s_MAX					\</div><div class='del'>-	(BKEY_U64s + BKEY_BTREE_PTR_VAL_U64s_MAX)</div><div class='del'>-</div><div class='del'>-struct bch_reservation {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__le32			generation;</div><div class='del'>-	__u8			nr_replicas;</div><div class='del'>-	__u8			pad[3];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_inline_data {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	u8			data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EXTENTS_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/extents_types.h b/fs/bcachefs/extents_types.h<br/>deleted file mode 100644<br/>index 43d6c341ecca..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/extents_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/extents_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_EXTENTS_TYPES_H</div><div class='del'>-#define _BCACHEFS_EXTENTS_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-</div><div class='del'>-struct bch_extent_crc_unpacked {</div><div class='del'>-	u32			compressed_size;</div><div class='del'>-	u32			uncompressed_size;</div><div class='del'>-	u32			live_size;</div><div class='del'>-</div><div class='del'>-	u8			csum_type;</div><div class='del'>-	u8			compression_type;</div><div class='del'>-</div><div class='del'>-	u16			offset;</div><div class='del'>-</div><div class='del'>-	u16			nonce;</div><div class='del'>-</div><div class='del'>-	struct bch_csum		csum;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct extent_ptr_decoded {</div><div class='del'>-	unsigned			idx;</div><div class='del'>-	bool				has_ec;</div><div class='del'>-	struct bch_extent_crc_unpacked	crc;</div><div class='del'>-	struct bch_extent_ptr		ptr;</div><div class='del'>-	struct bch_extent_stripe_ptr	ec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_io_failures {</div><div class='del'>-	u8			nr;</div><div class='del'>-	struct bch_dev_io_failures {</div><div class='del'>-		u8		dev;</div><div class='del'>-		u8		idx;</div><div class='del'>-		u8		nr_failed;</div><div class='del'>-		u8		nr_retries;</div><div class='del'>-	}			devs[BCH_REPLICAS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_EXTENTS_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/eytzinger.h b/fs/bcachefs/eytzinger.h<br/>deleted file mode 100644<br/>index b04750dbf870..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/eytzinger.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/eytzinger.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,281 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _EYTZINGER_H</div><div class='del'>-#define _EYTZINGER_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Traversal for trees in eytzinger layout - a full binary tree layed out in an</div><div class='del'>- * array</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * One based indexing version:</div><div class='del'>- *</div><div class='del'>- * With one based indexing each level of the tree starts at a power of two -</div><div class='del'>- * good for cacheline alignment:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_child(unsigned i, unsigned child)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(child &gt; 1);</div><div class='del'>-</div><div class='del'>-	return (i &lt;&lt; 1) + child;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_left_child(unsigned i)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_child(i, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_right_child(unsigned i)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_child(i, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_first(unsigned size)</div><div class='del'>-{</div><div class='del'>-	return rounddown_pow_of_two(size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_last(unsigned size)</div><div class='del'>-{</div><div class='del'>-	return rounddown_pow_of_two(size + 1) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * eytzinger1_next() and eytzinger1_prev() have the nice properties that</div><div class='del'>- *</div><div class='del'>- * eytzinger1_next(0) == eytzinger1_first())</div><div class='del'>- * eytzinger1_prev(0) == eytzinger1_last())</div><div class='del'>- *</div><div class='del'>- * eytzinger1_prev(eytzinger1_first()) == 0</div><div class='del'>- * eytzinger1_next(eytzinger1_last()) == 0</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_next(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(i &gt; size);</div><div class='del'>-</div><div class='del'>-	if (eytzinger1_right_child(i) &lt;= size) {</div><div class='del'>-		i = eytzinger1_right_child(i);</div><div class='del'>-</div><div class='del'>-		i &lt;&lt;= __fls(size + 1) - __fls(i);</div><div class='del'>-		i &gt;&gt;= i &gt; size;</div><div class='del'>-	} else {</div><div class='del'>-		i &gt;&gt;= ffz(i) + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_prev(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(i &gt; size);</div><div class='del'>-</div><div class='del'>-	if (eytzinger1_left_child(i) &lt;= size) {</div><div class='del'>-		i = eytzinger1_left_child(i) + 1;</div><div class='del'>-</div><div class='del'>-		i &lt;&lt;= __fls(size + 1) - __fls(i);</div><div class='del'>-		i -= 1;</div><div class='del'>-		i &gt;&gt;= i &gt; size;</div><div class='del'>-	} else {</div><div class='del'>-		i &gt;&gt;= __ffs(i) + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_extra(unsigned size)</div><div class='del'>-{</div><div class='del'>-	return (size + 1 - rounddown_pow_of_two(size)) &lt;&lt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __eytzinger1_to_inorder(unsigned i, unsigned size,</div><div class='del'>-					      unsigned extra)</div><div class='del'>-{</div><div class='del'>-	unsigned b = __fls(i);</div><div class='del'>-	unsigned shift = __fls(size) - b;</div><div class='del'>-	int s;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!i || i &gt; size);</div><div class='del'>-</div><div class='del'>-	i  ^= 1U &lt;&lt; b;</div><div class='del'>-	i &lt;&lt;= 1;</div><div class='del'>-	i  |= 1;</div><div class='del'>-	i &lt;&lt;= shift;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * sign bit trick:</div><div class='del'>-	 *</div><div class='del'>-	 * if (i &gt; extra)</div><div class='del'>-	 *	i -= (i - extra) &gt;&gt; 1;</div><div class='del'>-	 */</div><div class='del'>-	s = extra - i;</div><div class='del'>-	i += (s &gt;&gt; 1) &amp; (s &gt;&gt; 31);</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __inorder_to_eytzinger1(unsigned i, unsigned size,</div><div class='del'>-					       unsigned extra)</div><div class='del'>-{</div><div class='del'>-	unsigned shift;</div><div class='del'>-	int s;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!i || i &gt; size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * sign bit trick:</div><div class='del'>-	 *</div><div class='del'>-	 * if (i &gt; extra)</div><div class='del'>-	 *	i += i - extra;</div><div class='del'>-	 */</div><div class='del'>-	s = extra - i;</div><div class='del'>-	i -= s &amp; (s &gt;&gt; 31);</div><div class='del'>-</div><div class='del'>-	shift = __ffs(i);</div><div class='del'>-</div><div class='del'>-	i &gt;&gt;= shift + 1;</div><div class='del'>-	i  |= 1U &lt;&lt; (__fls(size) - shift);</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger1_to_inorder(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	return __eytzinger1_to_inorder(i, size, eytzinger1_extra(size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned inorder_to_eytzinger1(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	return __inorder_to_eytzinger1(i, size, eytzinger1_extra(size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define eytzinger1_for_each(_i, _size)			\</div><div class='del'>-	for (unsigned (_i) = eytzinger1_first((_size));	\</div><div class='del'>-	     (_i) != 0;					\</div><div class='del'>-	     (_i) = eytzinger1_next((_i), (_size)))</div><div class='del'>-</div><div class='del'>-/* Zero based indexing version: */</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_child(unsigned i, unsigned child)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(child &gt; 1);</div><div class='del'>-</div><div class='del'>-	return (i &lt;&lt; 1) + 1 + child;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_left_child(unsigned i)</div><div class='del'>-{</div><div class='del'>-	return eytzinger0_child(i, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_right_child(unsigned i)</div><div class='del'>-{</div><div class='del'>-	return eytzinger0_child(i, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_first(unsigned size)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_first(size) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_last(unsigned size)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_last(size) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_next(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_next(i + 1, size) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_prev(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_prev(i + 1, size) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_extra(unsigned size)</div><div class='del'>-{</div><div class='del'>-	return eytzinger1_extra(size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __eytzinger0_to_inorder(unsigned i, unsigned size,</div><div class='del'>-					       unsigned extra)</div><div class='del'>-{</div><div class='del'>-	return __eytzinger1_to_inorder(i + 1, size, extra) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __inorder_to_eytzinger0(unsigned i, unsigned size,</div><div class='del'>-					       unsigned extra)</div><div class='del'>-{</div><div class='del'>-	return __inorder_to_eytzinger1(i + 1, size, extra) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned eytzinger0_to_inorder(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	return __eytzinger0_to_inorder(i, size, eytzinger0_extra(size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned inorder_to_eytzinger0(unsigned i, unsigned size)</div><div class='del'>-{</div><div class='del'>-	return __inorder_to_eytzinger0(i, size, eytzinger0_extra(size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define eytzinger0_for_each(_i, _size)			\</div><div class='del'>-	for (unsigned (_i) = eytzinger0_first((_size));	\</div><div class='del'>-	     (_i) != -1;				\</div><div class='del'>-	     (_i) = eytzinger0_next((_i), (_size)))</div><div class='del'>-</div><div class='del'>-typedef int (*eytzinger_cmp_fn)(const void *l, const void *r, size_t size);</div><div class='del'>-</div><div class='del'>-/* return greatest node &lt;= @search, or -1 if not found */</div><div class='del'>-static inline ssize_t eytzinger0_find_le(void *base, size_t nr, size_t size,</div><div class='del'>-					 eytzinger_cmp_fn cmp, const void *search)</div><div class='del'>-{</div><div class='del'>-	unsigned i, n = 0;</div><div class='del'>-</div><div class='del'>-	if (!nr)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		i = n;</div><div class='del'>-		n = eytzinger0_child(i, cmp(search, base + i * size, size) &gt;= 0);</div><div class='del'>-	} while (n &lt; nr);</div><div class='del'>-</div><div class='del'>-	if (n &amp; 1) {</div><div class='del'>-		/* @i was greater than @search, return previous node: */</div><div class='del'>-</div><div class='del'>-		if (i == eytzinger0_first(nr))</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		return eytzinger0_prev(i, nr);</div><div class='del'>-	} else {</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define eytzinger0_find(base, nr, size, _cmp, search)			\</div><div class='del'>-({									\</div><div class='del'>-	void *_base		= (base);				\</div><div class='del'>-	const void *_search	= (search);				\</div><div class='del'>-	size_t _nr		= (nr);					\</div><div class='del'>-	size_t _size		= (size);				\</div><div class='del'>-	size_t _i		= 0;					\</div><div class='del'>-	int _res;							\</div><div class='del'>-									\</div><div class='del'>-	while (_i &lt; _nr &amp;&amp;						\</div><div class='del'>-	       (_res = _cmp(_search, _base + _i * _size, _size)))	\</div><div class='del'>-		_i = eytzinger0_child(_i, _res &gt; 0);			\</div><div class='del'>-	_i;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-void eytzinger0_sort(void *, size_t, size_t,</div><div class='del'>-		    int (*cmp_func)(const void *, const void *, size_t),</div><div class='del'>-		    void (*swap_func)(void *, void *, size_t));</div><div class='del'>-</div><div class='del'>-#endif /* _EYTZINGER_H */</div><div class='head'>diff --git a/fs/bcachefs/fifo.h b/fs/bcachefs/fifo.h<br/>deleted file mode 100644<br/>index 66b945be10c2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fifo.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fifo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FIFO_H</div><div class='del'>-#define _BCACHEFS_FIFO_H</div><div class='del'>-</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#define FIFO(type)							\</div><div class='del'>-struct {								\</div><div class='del'>-	size_t front, back, size, mask;					\</div><div class='del'>-	type *data;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DECLARE_FIFO(type, name)	FIFO(type) name</div><div class='del'>-</div><div class='del'>-#define fifo_buf_size(fifo)						\</div><div class='del'>-	((fifo)-&gt;size							\</div><div class='del'>-	 ? roundup_pow_of_two((fifo)-&gt;size) * sizeof((fifo)-&gt;data[0])	\</div><div class='del'>-	 : 0)</div><div class='del'>-</div><div class='del'>-#define init_fifo(fifo, _size, _gfp)					\</div><div class='del'>-({									\</div><div class='del'>-	(fifo)-&gt;front	= (fifo)-&gt;back = 0;				\</div><div class='del'>-	(fifo)-&gt;size	= (_size);					\</div><div class='del'>-	(fifo)-&gt;mask	= (fifo)-&gt;size					\</div><div class='del'>-		? roundup_pow_of_two((fifo)-&gt;size) - 1			\</div><div class='del'>-		: 0;							\</div><div class='del'>-	(fifo)-&gt;data	= kvpmalloc(fifo_buf_size(fifo), (_gfp));	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define free_fifo(fifo)							\</div><div class='del'>-do {									\</div><div class='del'>-	kvpfree((fifo)-&gt;data, fifo_buf_size(fifo));			\</div><div class='del'>-	(fifo)-&gt;data = NULL;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define fifo_swap(l, r)							\</div><div class='del'>-do {									\</div><div class='del'>-	swap((l)-&gt;front, (r)-&gt;front);					\</div><div class='del'>-	swap((l)-&gt;back, (r)-&gt;back);					\</div><div class='del'>-	swap((l)-&gt;size, (r)-&gt;size);					\</div><div class='del'>-	swap((l)-&gt;mask, (r)-&gt;mask);					\</div><div class='del'>-	swap((l)-&gt;data, (r)-&gt;data);					\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define fifo_move(dest, src)						\</div><div class='del'>-do {									\</div><div class='del'>-	typeof(*((dest)-&gt;data)) _t;					\</div><div class='del'>-	while (!fifo_full(dest) &amp;&amp;					\</div><div class='del'>-	       fifo_pop(src, _t))					\</div><div class='del'>-		fifo_push(dest, _t);					\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define fifo_used(fifo)		(((fifo)-&gt;back - (fifo)-&gt;front))</div><div class='del'>-#define fifo_free(fifo)		((fifo)-&gt;size - fifo_used(fifo))</div><div class='del'>-</div><div class='del'>-#define fifo_empty(fifo)	((fifo)-&gt;front == (fifo)-&gt;back)</div><div class='del'>-#define fifo_full(fifo)		(fifo_used(fifo) == (fifo)-&gt;size)</div><div class='del'>-</div><div class='del'>-#define fifo_peek_front(fifo)	((fifo)-&gt;data[(fifo)-&gt;front &amp; (fifo)-&gt;mask])</div><div class='del'>-#define fifo_peek_back(fifo)	((fifo)-&gt;data[((fifo)-&gt;back - 1) &amp; (fifo)-&gt;mask])</div><div class='del'>-</div><div class='del'>-#define fifo_entry_idx_abs(fifo, p)					\</div><div class='del'>-	((((p) &gt;= &amp;fifo_peek_front(fifo)				\</div><div class='del'>-	   ? (fifo)-&gt;front : (fifo)-&gt;back) &amp; ~(fifo)-&gt;mask) +		\</div><div class='del'>-	   (((p) - (fifo)-&gt;data)))</div><div class='del'>-</div><div class='del'>-#define fifo_entry_idx(fifo, p)	(((p) - &amp;fifo_peek_front(fifo)) &amp; (fifo)-&gt;mask)</div><div class='del'>-#define fifo_idx_entry(fifo, i)	((fifo)-&gt;data[((fifo)-&gt;front + (i)) &amp; (fifo)-&gt;mask])</div><div class='del'>-</div><div class='del'>-#define fifo_push_back_ref(f)						\</div><div class='del'>-	(fifo_full((f)) ? NULL : &amp;(f)-&gt;data[(f)-&gt;back++ &amp; (f)-&gt;mask])</div><div class='del'>-</div><div class='del'>-#define fifo_push_front_ref(f)						\</div><div class='del'>-	(fifo_full((f)) ? NULL : &amp;(f)-&gt;data[--(f)-&gt;front &amp; (f)-&gt;mask])</div><div class='del'>-</div><div class='del'>-#define fifo_push_back(fifo, new)					\</div><div class='del'>-({									\</div><div class='del'>-	typeof((fifo)-&gt;data) _r = fifo_push_back_ref(fifo);		\</div><div class='del'>-	if (_r)								\</div><div class='del'>-		*_r = (new);						\</div><div class='del'>-	_r != NULL;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define fifo_push_front(fifo, new)					\</div><div class='del'>-({									\</div><div class='del'>-	typeof((fifo)-&gt;data) _r = fifo_push_front_ref(fifo);		\</div><div class='del'>-	if (_r)								\</div><div class='del'>-		*_r = (new);						\</div><div class='del'>-	_r != NULL;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define fifo_pop_front(fifo, i)						\</div><div class='del'>-({									\</div><div class='del'>-	bool _r = !fifo_empty((fifo));					\</div><div class='del'>-	if (_r)								\</div><div class='del'>-		(i) = (fifo)-&gt;data[(fifo)-&gt;front++ &amp; (fifo)-&gt;mask];	\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define fifo_pop_back(fifo, i)						\</div><div class='del'>-({									\</div><div class='del'>-	bool _r = !fifo_empty((fifo));					\</div><div class='del'>-	if (_r)								\</div><div class='del'>-		(i) = (fifo)-&gt;data[--(fifo)-&gt;back &amp; (fifo)-&gt;mask];	\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define fifo_push_ref(fifo)	fifo_push_back_ref(fifo)</div><div class='del'>-#define fifo_push(fifo, i)	fifo_push_back(fifo, (i))</div><div class='del'>-#define fifo_pop(fifo, i)	fifo_pop_front(fifo, (i))</div><div class='del'>-#define fifo_peek(fifo)		fifo_peek_front(fifo)</div><div class='del'>-</div><div class='del'>-#define fifo_for_each_entry(_entry, _fifo, _iter)			\</div><div class='del'>-	for (typecheck(typeof((_fifo)-&gt;front), _iter),			\</div><div class='del'>-	     (_iter) = (_fifo)-&gt;front;					\</div><div class='del'>-	     ((_iter != (_fifo)-&gt;back) &amp;&amp;				\</div><div class='del'>-	      (_entry = (_fifo)-&gt;data[(_iter) &amp; (_fifo)-&gt;mask], true));	\</div><div class='del'>-	     (_iter)++)</div><div class='del'>-</div><div class='del'>-#define fifo_for_each_entry_ptr(_ptr, _fifo, _iter)			\</div><div class='del'>-	for (typecheck(typeof((_fifo)-&gt;front), _iter),			\</div><div class='del'>-	     (_iter) = (_fifo)-&gt;front;					\</div><div class='del'>-	     ((_iter != (_fifo)-&gt;back) &amp;&amp;				\</div><div class='del'>-	      (_ptr = &amp;(_fifo)-&gt;data[(_iter) &amp; (_fifo)-&gt;mask], true));	\</div><div class='del'>-	     (_iter)++)</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FIFO_H */</div><div class='head'>diff --git a/fs/bcachefs/fs-common.c b/fs/bcachefs/fs-common.c<br/>deleted file mode 100644<br/>index 1c1ea0f0c692..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-common.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-common.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,495 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "fs-common.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/posix_acl.h&gt;</div><div class='del'>-</div><div class='del'>-static inline int is_subdir_for_nlink(struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	return S_ISDIR(inode-&gt;bi_mode) &amp;&amp; !inode-&gt;bi_subvol;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_create_trans(struct btree_trans *trans,</div><div class='del'>-		      subvol_inum dir,</div><div class='del'>-		      struct bch_inode_unpacked *dir_u,</div><div class='del'>-		      struct bch_inode_unpacked *new_inode,</div><div class='del'>-		      const struct qstr *name,</div><div class='del'>-		      uid_t uid, gid_t gid, umode_t mode, dev_t rdev,</div><div class='del'>-		      struct posix_acl *default_acl,</div><div class='del'>-		      struct posix_acl *acl,</div><div class='del'>-		      subvol_inum snapshot_src,</div><div class='del'>-		      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter dir_iter = { NULL };</div><div class='del'>-	struct btree_iter inode_iter = { NULL };</div><div class='del'>-	subvol_inum new_inum = dir;</div><div class='del'>-	u64 now = bch2_current_time(c);</div><div class='del'>-	u64 cpu = raw_smp_processor_id();</div><div class='del'>-	u64 dir_target;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	unsigned dir_type = mode_to_type(mode);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, dir.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;dir_iter, dir_u, dir, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_CREATE_SNAPSHOT)) {</div><div class='del'>-		/* Normal create path - allocate a new inode: */</div><div class='del'>-		bch2_inode_init_late(new_inode, now, uid, gid, mode, rdev, dir_u);</div><div class='del'>-</div><div class='del'>-		if (flags &amp; BCH_CREATE_TMPFILE)</div><div class='del'>-			new_inode-&gt;bi_flags |= BCH_INODE_unlinked;</div><div class='del'>-</div><div class='del'>-		ret = bch2_inode_create(trans, &amp;inode_iter, new_inode, snapshot, cpu);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		snapshot_src = (subvol_inum) { 0 };</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Creating a snapshot - we're not allocating a new inode, but</div><div class='del'>-		 * we do have to lookup the root inode of the subvolume we're</div><div class='del'>-		 * snapshotting and update it (in the new snapshot):</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (!snapshot_src.inum) {</div><div class='del'>-			/* Inode wasn't specified, just snapshot: */</div><div class='del'>-			struct bch_subvolume s;</div><div class='del'>-</div><div class='del'>-			ret = bch2_subvolume_get(trans, snapshot_src.subvol, true,</div><div class='del'>-						 BTREE_ITER_CACHED, &amp;s);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			snapshot_src.inum = le64_to_cpu(s.inode);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_inode_peek(trans, &amp;inode_iter, new_inode, snapshot_src,</div><div class='del'>-				      BTREE_ITER_INTENT);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (new_inode-&gt;bi_subvol != snapshot_src.subvol) {</div><div class='del'>-			/* Not a subvolume root: */</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we're not root, we have to own the subvolume being</div><div class='del'>-		 * snapshotted:</div><div class='del'>-		 */</div><div class='del'>-		if (uid &amp;&amp; new_inode-&gt;bi_uid != uid) {</div><div class='del'>-			ret = -EPERM;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		flags |= BCH_CREATE_SUBVOL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_inum.inum	= new_inode-&gt;bi_inum;</div><div class='del'>-	dir_target	= new_inode-&gt;bi_inum;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BCH_CREATE_SUBVOL) {</div><div class='del'>-		u32 new_subvol, dir_snapshot;</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_create(trans, new_inode-&gt;bi_inum,</div><div class='del'>-					    snapshot_src.subvol,</div><div class='del'>-					    &amp;new_subvol, &amp;snapshot,</div><div class='del'>-					    (flags &amp; BCH_CREATE_SNAPSHOT_RO) != 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		new_inode-&gt;bi_parent_subvol	= dir.subvol;</div><div class='del'>-		new_inode-&gt;bi_subvol		= new_subvol;</div><div class='del'>-		new_inum.subvol			= new_subvol;</div><div class='del'>-		dir_target			= new_subvol;</div><div class='del'>-		dir_type			= DT_SUBVOL;</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, dir.subvol, &amp;dir_snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;dir_iter, dir_snapshot);</div><div class='del'>-		ret = bch2_btree_iter_traverse(&amp;dir_iter);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_CREATE_SNAPSHOT)) {</div><div class='del'>-		if (default_acl) {</div><div class='del'>-			ret = bch2_set_acl_trans(trans, new_inum, new_inode,</div><div class='del'>-						 default_acl, ACL_TYPE_DEFAULT);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (acl) {</div><div class='del'>-			ret = bch2_set_acl_trans(trans, new_inum, new_inode,</div><div class='del'>-						 acl, ACL_TYPE_ACCESS);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_CREATE_TMPFILE)) {</div><div class='del'>-		struct bch_hash_info dir_hash = bch2_hash_info_init(c, dir_u);</div><div class='del'>-		u64 dir_offset;</div><div class='del'>-</div><div class='del'>-		if (is_subdir_for_nlink(new_inode))</div><div class='del'>-			dir_u-&gt;bi_nlink++;</div><div class='del'>-		dir_u-&gt;bi_mtime = dir_u-&gt;bi_ctime = now;</div><div class='del'>-</div><div class='del'>-		ret = bch2_inode_write(trans, &amp;dir_iter, dir_u);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ret = bch2_dirent_create(trans, dir, &amp;dir_hash,</div><div class='del'>-					 dir_type,</div><div class='del'>-					 name,</div><div class='del'>-					 dir_target,</div><div class='del'>-					 &amp;dir_offset,</div><div class='del'>-					 BCH_HASH_SET_MUST_CREATE);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		new_inode-&gt;bi_dir		= dir_u-&gt;bi_inum;</div><div class='del'>-		new_inode-&gt;bi_dir_offset	= dir_offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_iter.flags &amp;= ~BTREE_ITER_ALL_SNAPSHOTS;</div><div class='del'>-	bch2_btree_iter_set_snapshot(&amp;inode_iter, snapshot);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_btree_iter_traverse(&amp;inode_iter) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;inode_iter, new_inode);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dir_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_link_trans(struct btree_trans *trans,</div><div class='del'>-		    subvol_inum dir,  struct bch_inode_unpacked *dir_u,</div><div class='del'>-		    subvol_inum inum, struct bch_inode_unpacked *inode_u,</div><div class='del'>-		    const struct qstr *name)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter dir_iter = { NULL };</div><div class='del'>-	struct btree_iter inode_iter = { NULL };</div><div class='del'>-	struct bch_hash_info dir_hash;</div><div class='del'>-	u64 now = bch2_current_time(c);</div><div class='del'>-	u64 dir_offset = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (dir.subvol != inum.subvol)</div><div class='del'>-		return -EXDEV;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;inode_iter, inode_u, inum, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	inode_u-&gt;bi_ctime = now;</div><div class='del'>-	ret = bch2_inode_nlink_inc(inode_u);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;dir_iter, dir_u, dir, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (bch2_reinherit_attrs(inode_u, dir_u)) {</div><div class='del'>-		ret = -EXDEV;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dir_u-&gt;bi_mtime = dir_u-&gt;bi_ctime = now;</div><div class='del'>-</div><div class='del'>-	dir_hash = bch2_hash_info_init(c, dir_u);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_create(trans, dir, &amp;dir_hash,</div><div class='del'>-				 mode_to_type(inode_u-&gt;bi_mode),</div><div class='del'>-				 name, inum.inum, &amp;dir_offset,</div><div class='del'>-				 BCH_HASH_SET_MUST_CREATE);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	inode_u-&gt;bi_dir		= dir.inum;</div><div class='del'>-	inode_u-&gt;bi_dir_offset	= dir_offset;</div><div class='del'>-</div><div class='del'>-	ret =   bch2_inode_write(trans, &amp;dir_iter, dir_u) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;inode_iter, inode_u);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dir_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_unlink_trans(struct btree_trans *trans,</div><div class='del'>-		      subvol_inum dir,</div><div class='del'>-		      struct bch_inode_unpacked *dir_u,</div><div class='del'>-		      struct bch_inode_unpacked *inode_u,</div><div class='del'>-		      const struct qstr *name,</div><div class='del'>-		      bool deleting_snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter dir_iter = { NULL };</div><div class='del'>-	struct btree_iter dirent_iter = { NULL };</div><div class='del'>-	struct btree_iter inode_iter = { NULL };</div><div class='del'>-	struct bch_hash_info dir_hash;</div><div class='del'>-	subvol_inum inum;</div><div class='del'>-	u64 now = bch2_current_time(c);</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;dir_iter, dir_u, dir, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dir_hash = bch2_hash_info_init(c, dir_u);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_dirent_lookup_trans(trans, &amp;dirent_iter, dir, &amp;dir_hash,</div><div class='del'>-					 name, &amp;inum, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;inode_iter, inode_u, inum,</div><div class='del'>-			      BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!deleting_snapshot &amp;&amp; S_ISDIR(inode_u-&gt;bi_mode)) {</div><div class='del'>-		ret = bch2_empty_dir_trans(trans, inum);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (deleting_snapshot &amp;&amp; !inode_u-&gt;bi_subvol) {</div><div class='del'>-		ret = -BCH_ERR_ENOENT_not_subvol;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (deleting_snapshot || inode_u-&gt;bi_subvol) {</div><div class='del'>-		ret = bch2_subvolume_unlink(trans, inode_u-&gt;bi_subvol);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;dirent_iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we're deleting a subvolume, we need to really delete the</div><div class='del'>-		 * dirent, not just emit a whiteout in the current snapshot:</div><div class='del'>-		 */</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;dirent_iter, k.k-&gt;p.snapshot);</div><div class='del'>-		ret = bch2_btree_iter_traverse(&amp;dirent_iter);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_inode_nlink_dec(trans, inode_u);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inode_u-&gt;bi_dir		== dirent_iter.pos.inode &amp;&amp;</div><div class='del'>-	    inode_u-&gt;bi_dir_offset	== dirent_iter.pos.offset) {</div><div class='del'>-		inode_u-&gt;bi_dir		= 0;</div><div class='del'>-		inode_u-&gt;bi_dir_offset	= 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dir_u-&gt;bi_mtime = dir_u-&gt;bi_ctime = inode_u-&gt;bi_ctime = now;</div><div class='del'>-	dir_u-&gt;bi_nlink -= is_subdir_for_nlink(inode_u);</div><div class='del'>-</div><div class='del'>-	ret =   bch2_hash_delete_at(trans, bch2_dirent_hash_desc,</div><div class='del'>-				    &amp;dir_hash, &amp;dirent_iter,</div><div class='del'>-				    BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;dir_iter, dir_u) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;inode_iter, inode_u);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dirent_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dir_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_reinherit_attrs(struct bch_inode_unpacked *dst_u,</div><div class='del'>-			  struct bch_inode_unpacked *src_u)</div><div class='del'>-{</div><div class='del'>-	u64 src, dst;</div><div class='del'>-	unsigned id;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; Inode_opt_nr; id++) {</div><div class='del'>-		/* Skip attributes that were explicitly set on this inode */</div><div class='del'>-		if (dst_u-&gt;bi_fields_set &amp; (1 &lt;&lt; id))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		src = bch2_inode_opt_get(src_u, id);</div><div class='del'>-		dst = bch2_inode_opt_get(dst_u, id);</div><div class='del'>-</div><div class='del'>-		if (src == dst)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_inode_opt_set(dst_u, id, src);</div><div class='del'>-		ret = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_rename_trans(struct btree_trans *trans,</div><div class='del'>-		      subvol_inum src_dir, struct bch_inode_unpacked *src_dir_u,</div><div class='del'>-		      subvol_inum dst_dir, struct bch_inode_unpacked *dst_dir_u,</div><div class='del'>-		      struct bch_inode_unpacked *src_inode_u,</div><div class='del'>-		      struct bch_inode_unpacked *dst_inode_u,</div><div class='del'>-		      const struct qstr *src_name,</div><div class='del'>-		      const struct qstr *dst_name,</div><div class='del'>-		      enum bch_rename_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter src_dir_iter = { NULL };</div><div class='del'>-	struct btree_iter dst_dir_iter = { NULL };</div><div class='del'>-	struct btree_iter src_inode_iter = { NULL };</div><div class='del'>-	struct btree_iter dst_inode_iter = { NULL };</div><div class='del'>-	struct bch_hash_info src_hash, dst_hash;</div><div class='del'>-	subvol_inum src_inum, dst_inum;</div><div class='del'>-	u64 src_offset, dst_offset;</div><div class='del'>-	u64 now = bch2_current_time(c);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;src_dir_iter, src_dir_u, src_dir,</div><div class='del'>-			      BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	src_hash = bch2_hash_info_init(c, src_dir_u);</div><div class='del'>-</div><div class='del'>-	if (dst_dir.inum	!= src_dir.inum ||</div><div class='del'>-	    dst_dir.subvol	!= src_dir.subvol) {</div><div class='del'>-		ret = bch2_inode_peek(trans, &amp;dst_dir_iter, dst_dir_u, dst_dir,</div><div class='del'>-				      BTREE_ITER_INTENT);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		dst_hash = bch2_hash_info_init(c, dst_dir_u);</div><div class='del'>-	} else {</div><div class='del'>-		dst_dir_u = src_dir_u;</div><div class='del'>-		dst_hash = src_hash;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_rename(trans,</div><div class='del'>-				 src_dir, &amp;src_hash,</div><div class='del'>-				 dst_dir, &amp;dst_hash,</div><div class='del'>-				 src_name, &amp;src_inum, &amp;src_offset,</div><div class='del'>-				 dst_name, &amp;dst_inum, &amp;dst_offset,</div><div class='del'>-				 mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;src_inode_iter, src_inode_u, src_inum,</div><div class='del'>-			      BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (dst_inum.inum) {</div><div class='del'>-		ret = bch2_inode_peek(trans, &amp;dst_inode_iter, dst_inode_u, dst_inum,</div><div class='del'>-				      BTREE_ITER_INTENT);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	src_inode_u-&gt;bi_dir		= dst_dir_u-&gt;bi_inum;</div><div class='del'>-	src_inode_u-&gt;bi_dir_offset	= dst_offset;</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_EXCHANGE) {</div><div class='del'>-		dst_inode_u-&gt;bi_dir		= src_dir_u-&gt;bi_inum;</div><div class='del'>-		dst_inode_u-&gt;bi_dir_offset	= src_offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_OVERWRITE &amp;&amp;</div><div class='del'>-	    dst_inode_u-&gt;bi_dir		== dst_dir_u-&gt;bi_inum &amp;&amp;</div><div class='del'>-	    dst_inode_u-&gt;bi_dir_offset	== src_offset) {</div><div class='del'>-		dst_inode_u-&gt;bi_dir		= 0;</div><div class='del'>-		dst_inode_u-&gt;bi_dir_offset	= 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_OVERWRITE) {</div><div class='del'>-		if (S_ISDIR(src_inode_u-&gt;bi_mode) !=</div><div class='del'>-		    S_ISDIR(dst_inode_u-&gt;bi_mode)) {</div><div class='del'>-			ret = -ENOTDIR;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (S_ISDIR(dst_inode_u-&gt;bi_mode) &amp;&amp;</div><div class='del'>-		    bch2_empty_dir_trans(trans, dst_inum)) {</div><div class='del'>-			ret = -ENOTEMPTY;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_reinherit_attrs(src_inode_u, dst_dir_u) &amp;&amp;</div><div class='del'>-	    S_ISDIR(src_inode_u-&gt;bi_mode)) {</div><div class='del'>-		ret = -EXDEV;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_EXCHANGE &amp;&amp;</div><div class='del'>-	    bch2_reinherit_attrs(dst_inode_u, src_dir_u) &amp;&amp;</div><div class='del'>-	    S_ISDIR(dst_inode_u-&gt;bi_mode)) {</div><div class='del'>-		ret = -EXDEV;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_subdir_for_nlink(src_inode_u)) {</div><div class='del'>-		src_dir_u-&gt;bi_nlink--;</div><div class='del'>-		dst_dir_u-&gt;bi_nlink++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dst_inum.inum &amp;&amp; is_subdir_for_nlink(dst_inode_u)) {</div><div class='del'>-		dst_dir_u-&gt;bi_nlink--;</div><div class='del'>-		src_dir_u-&gt;bi_nlink += mode == BCH_RENAME_EXCHANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_OVERWRITE)</div><div class='del'>-		bch2_inode_nlink_dec(trans, dst_inode_u);</div><div class='del'>-</div><div class='del'>-	src_dir_u-&gt;bi_mtime		= now;</div><div class='del'>-	src_dir_u-&gt;bi_ctime		= now;</div><div class='del'>-</div><div class='del'>-	if (src_dir.inum != dst_dir.inum) {</div><div class='del'>-		dst_dir_u-&gt;bi_mtime	= now;</div><div class='del'>-		dst_dir_u-&gt;bi_ctime	= now;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	src_inode_u-&gt;bi_ctime		= now;</div><div class='del'>-</div><div class='del'>-	if (dst_inum.inum)</div><div class='del'>-		dst_inode_u-&gt;bi_ctime	= now;</div><div class='del'>-</div><div class='del'>-	ret =   bch2_inode_write(trans, &amp;src_dir_iter, src_dir_u) ?:</div><div class='del'>-		(src_dir.inum != dst_dir.inum</div><div class='del'>-		 ? bch2_inode_write(trans, &amp;dst_dir_iter, dst_dir_u)</div><div class='del'>-		 : 0) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;src_inode_iter, src_inode_u) ?:</div><div class='del'>-		(dst_inum.inum</div><div class='del'>-		 ? bch2_inode_write(trans, &amp;dst_inode_iter, dst_inode_u)</div><div class='del'>-		 : 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dst_inode_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;src_inode_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dst_dir_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;src_dir_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/fs-common.h b/fs/bcachefs/fs-common.h<br/>deleted file mode 100644<br/>index dde237859514..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-common.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_COMMON_H</div><div class='del'>-#define _BCACHEFS_FS_COMMON_H</div><div class='del'>-</div><div class='del'>-struct posix_acl;</div><div class='del'>-</div><div class='del'>-#define BCH_CREATE_TMPFILE		(1U &lt;&lt; 0)</div><div class='del'>-#define BCH_CREATE_SUBVOL		(1U &lt;&lt; 1)</div><div class='del'>-#define BCH_CREATE_SNAPSHOT		(1U &lt;&lt; 2)</div><div class='del'>-#define BCH_CREATE_SNAPSHOT_RO		(1U &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-int bch2_create_trans(struct btree_trans *, subvol_inum,</div><div class='del'>-		      struct bch_inode_unpacked *,</div><div class='del'>-		      struct bch_inode_unpacked *,</div><div class='del'>-		      const struct qstr *,</div><div class='del'>-		      uid_t, gid_t, umode_t, dev_t,</div><div class='del'>-		      struct posix_acl *,</div><div class='del'>-		      struct posix_acl *,</div><div class='del'>-		      subvol_inum, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_link_trans(struct btree_trans *,</div><div class='del'>-		    subvol_inum, struct bch_inode_unpacked *,</div><div class='del'>-		    subvol_inum, struct bch_inode_unpacked *,</div><div class='del'>-		    const struct qstr *);</div><div class='del'>-</div><div class='del'>-int bch2_unlink_trans(struct btree_trans *, subvol_inum,</div><div class='del'>-		      struct bch_inode_unpacked *,</div><div class='del'>-		      struct bch_inode_unpacked *,</div><div class='del'>-		      const struct qstr *, bool);</div><div class='del'>-</div><div class='del'>-int bch2_rename_trans(struct btree_trans *,</div><div class='del'>-		      subvol_inum, struct bch_inode_unpacked *,</div><div class='del'>-		      subvol_inum, struct bch_inode_unpacked *,</div><div class='del'>-		      struct bch_inode_unpacked *,</div><div class='del'>-		      struct bch_inode_unpacked *,</div><div class='del'>-		      const struct qstr *,</div><div class='del'>-		      const struct qstr *,</div><div class='del'>-		      enum bch_rename_mode);</div><div class='del'>-</div><div class='del'>-bool bch2_reinherit_attrs(struct bch_inode_unpacked *,</div><div class='del'>-			  struct bch_inode_unpacked *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_COMMON_H */</div><div class='head'>diff --git a/fs/bcachefs/fs-io-buffered.c b/fs/bcachefs/fs-io-buffered.c<br/>deleted file mode 100644<br/>index 73c12e565af5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io-buffered.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-buffered.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1100 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "fs-io.h"</div><div class='del'>-#include "fs-io-buffered.h"</div><div class='del'>-#include "fs-io-direct.h"</div><div class='del'>-#include "fs-io-pagecache.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-</div><div class='del'>-static inline bool bio_full(struct bio *bio, unsigned len)</div><div class='del'>-{</div><div class='del'>-	if (bio-&gt;bi_vcnt &gt;= bio-&gt;bi_max_vecs)</div><div class='del'>-		return true;</div><div class='del'>-	if (bio-&gt;bi_iter.bi_size &gt; UINT_MAX - len)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* readpage(s): */</div><div class='del'>-</div><div class='del'>-static void bch2_readpages_end_io(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct folio_iter fi;</div><div class='del'>-</div><div class='del'>-	bio_for_each_folio_all(fi, bio) {</div><div class='del'>-		if (!bio-&gt;bi_status) {</div><div class='del'>-			folio_mark_uptodate(fi.folio);</div><div class='del'>-		} else {</div><div class='del'>-			folio_clear_uptodate(fi.folio);</div><div class='del'>-			folio_set_error(fi.folio);</div><div class='del'>-		}</div><div class='del'>-		folio_unlock(fi.folio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio_put(bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct readpages_iter {</div><div class='del'>-	struct address_space	*mapping;</div><div class='del'>-	unsigned		idx;</div><div class='del'>-	folios			folios;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int readpages_iter_init(struct readpages_iter *iter,</div><div class='del'>-			       struct readahead_control *ractl)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio;</div><div class='del'>-</div><div class='del'>-	*iter = (struct readpages_iter) { ractl-&gt;mapping };</div><div class='del'>-</div><div class='del'>-	while ((folio = __readahead_folio(ractl))) {</div><div class='del'>-		if (!bch2_folio_create(folio, GFP_KERNEL) ||</div><div class='del'>-		    darray_push(&amp;iter-&gt;folios, folio)) {</div><div class='del'>-			bch2_folio_release(folio);</div><div class='del'>-			ractl-&gt;_nr_pages += folio_nr_pages(folio);</div><div class='del'>-			ractl-&gt;_index -= folio_nr_pages(folio);</div><div class='del'>-			return iter-&gt;folios.nr ? 0 : -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct folio *readpage_iter_peek(struct readpages_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (iter-&gt;idx &gt;= iter-&gt;folios.nr)</div><div class='del'>-		return NULL;</div><div class='del'>-	return iter-&gt;folios.data[iter-&gt;idx];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void readpage_iter_advance(struct readpages_iter *iter)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;idx++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool extent_partial_reads_expensive(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	struct bch_extent_crc_unpacked crc;</div><div class='del'>-	const union bch_extent_entry *i;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_crc(k.k, ptrs, crc, i)</div><div class='del'>-		if (crc.csum_type || crc.compression_type)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int readpage_bio_extend(struct btree_trans *trans,</div><div class='del'>-			       struct readpages_iter *iter,</div><div class='del'>-			       struct bio *bio,</div><div class='del'>-			       unsigned sectors_this_extent,</div><div class='del'>-			       bool get_more)</div><div class='del'>-{</div><div class='del'>-	/* Don't hold btree locks while allocating memory: */</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	while (bio_sectors(bio) &lt; sectors_this_extent &amp;&amp;</div><div class='del'>-	       bio-&gt;bi_vcnt &lt; bio-&gt;bi_max_vecs) {</div><div class='del'>-		struct folio *folio = readpage_iter_peek(iter);</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if (folio) {</div><div class='del'>-			readpage_iter_advance(iter);</div><div class='del'>-		} else {</div><div class='del'>-			pgoff_t folio_offset = bio_end_sector(bio) &gt;&gt; PAGE_SECTORS_SHIFT;</div><div class='del'>-</div><div class='del'>-			if (!get_more)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			folio = xa_load(&amp;iter-&gt;mapping-&gt;i_pages, folio_offset);</div><div class='del'>-			if (folio &amp;&amp; !xa_is_value(folio))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			folio = filemap_alloc_folio(readahead_gfp_mask(iter-&gt;mapping), 0);</div><div class='del'>-			if (!folio)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (!__bch2_folio_create(folio, GFP_KERNEL)) {</div><div class='del'>-				folio_put(folio);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = filemap_add_folio(iter-&gt;mapping, folio, folio_offset, GFP_KERNEL);</div><div class='del'>-			if (ret) {</div><div class='del'>-				__bch2_folio_release(folio);</div><div class='del'>-				folio_put(folio);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			folio_put(folio);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		BUG_ON(folio_sector(folio) != bio_end_sector(bio));</div><div class='del'>-</div><div class='del'>-		BUG_ON(!bio_add_folio(bio, folio, folio_size(folio), 0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_trans_relock(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bchfs_read(struct btree_trans *trans,</div><div class='del'>-		       struct bch_read_bio *rbio,</div><div class='del'>-		       subvol_inum inum,</div><div class='del'>-		       struct readpages_iter *readpages_iter)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	int flags = BCH_READ_RETRY_IF_STALE|</div><div class='del'>-		BCH_READ_MAY_PROMOTE;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	rbio-&gt;c = c;</div><div class='del'>-	rbio-&gt;start_time = local_clock();</div><div class='del'>-	rbio-&gt;subvol = inum.subvol;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-	iter = (struct btree_iter) { NULL };</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     SPOS(inum.inum, rbio-&gt;bio.bi_iter.bi_sector, snapshot),</div><div class='del'>-			     BTREE_ITER_SLOTS);</div><div class='del'>-	while (1) {</div><div class='del'>-		struct bkey_s_c k;</div><div class='del'>-		unsigned bytes, sectors, offset_into_extent;</div><div class='del'>-		enum btree_id data_btree = BTREE_ID_extents;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * read_extent -&gt; io_time_reset may cause a transaction restart</div><div class='del'>-		 * without returning an error, we need to check for that here:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_trans_relock(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter,</div><div class='del'>-				POS(inum.inum, rbio-&gt;bio.bi_iter.bi_sector));</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		offset_into_extent = iter.pos.offset -</div><div class='del'>-			bkey_start_offset(k.k);</div><div class='del'>-		sectors = k.k-&gt;size - offset_into_extent;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-</div><div class='del'>-		ret = bch2_read_indirect_extent(trans, &amp;data_btree,</div><div class='del'>-					&amp;offset_into_extent, &amp;sk);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		k = bkey_i_to_s_c(sk.k);</div><div class='del'>-</div><div class='del'>-		sectors = min(sectors, k.k-&gt;size - offset_into_extent);</div><div class='del'>-</div><div class='del'>-		if (readpages_iter) {</div><div class='del'>-			ret = readpage_bio_extend(trans, readpages_iter, &amp;rbio-&gt;bio, sectors,</div><div class='del'>-						  extent_partial_reads_expensive(k));</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bytes = min(sectors, bio_sectors(&amp;rbio-&gt;bio)) &lt;&lt; 9;</div><div class='del'>-		swap(rbio-&gt;bio.bi_iter.bi_size, bytes);</div><div class='del'>-</div><div class='del'>-		if (rbio-&gt;bio.bi_iter.bi_size == bytes)</div><div class='del'>-			flags |= BCH_READ_LAST_FRAGMENT;</div><div class='del'>-</div><div class='del'>-		bch2_bio_page_state_set(&amp;rbio-&gt;bio, k);</div><div class='del'>-</div><div class='del'>-		bch2_read_extent(trans, rbio, iter.pos,</div><div class='del'>-				 data_btree, k, offset_into_extent, flags);</div><div class='del'>-</div><div class='del'>-		if (flags &amp; BCH_READ_LAST_FRAGMENT)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		swap(rbio-&gt;bio.bi_iter.bi_size, bytes);</div><div class='del'>-		bio_advance(&amp;rbio-&gt;bio, bytes);</div><div class='del'>-</div><div class='del'>-		ret = btree_trans_too_many_iters(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err_inum_offset_ratelimited(c,</div><div class='del'>-				iter.pos.inode,</div><div class='del'>-				iter.pos.offset &lt;&lt; 9,</div><div class='del'>-				"read error %i from btree lookup", ret);</div><div class='del'>-		rbio-&gt;bio.bi_status = BLK_STS_IOERR;</div><div class='del'>-		bio_endio(&amp;rbio-&gt;bio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_readahead(struct readahead_control *ractl)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(ractl-&gt;mapping-&gt;host);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	struct readpages_iter readpages_iter;</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(&amp;opts, c, &amp;inode-&gt;ei_inode);</div><div class='del'>-</div><div class='del'>-	int ret = readpages_iter_init(&amp;readpages_iter, ractl);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_add_get(inode);</div><div class='del'>-</div><div class='del'>-	while ((folio = readpage_iter_peek(&amp;readpages_iter))) {</div><div class='del'>-		unsigned n = min_t(unsigned,</div><div class='del'>-				   readpages_iter.folios.nr -</div><div class='del'>-				   readpages_iter.idx,</div><div class='del'>-				   BIO_MAX_VECS);</div><div class='del'>-		struct bch_read_bio *rbio =</div><div class='del'>-			rbio_init(bio_alloc_bioset(NULL, n, REQ_OP_READ,</div><div class='del'>-						   GFP_KERNEL, &amp;c-&gt;bio_read),</div><div class='del'>-				  opts);</div><div class='del'>-</div><div class='del'>-		readpage_iter_advance(&amp;readpages_iter);</div><div class='del'>-</div><div class='del'>-		rbio-&gt;bio.bi_iter.bi_sector = folio_sector(folio);</div><div class='del'>-		rbio-&gt;bio.bi_end_io = bch2_readpages_end_io;</div><div class='del'>-		BUG_ON(!bio_add_folio(&amp;rbio-&gt;bio, folio, folio_size(folio), 0));</div><div class='del'>-</div><div class='del'>-		bchfs_read(trans, rbio, inode_inum(inode),</div><div class='del'>-			   &amp;readpages_iter);</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_add_put(inode);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	darray_exit(&amp;readpages_iter.folios);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bchfs_readfolio(struct bch_fs *c, struct bch_read_bio *rbio,</div><div class='del'>-			     subvol_inum inum, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	bch2_folio_create(folio, __GFP_NOFAIL);</div><div class='del'>-</div><div class='del'>-	rbio-&gt;bio.bi_opf = REQ_OP_READ|REQ_SYNC;</div><div class='del'>-	rbio-&gt;bio.bi_iter.bi_sector = folio_sector(folio);</div><div class='del'>-	BUG_ON(!bio_add_folio(&amp;rbio-&gt;bio, folio, folio_size(folio), 0));</div><div class='del'>-</div><div class='del'>-	bch2_trans_run(c, (bchfs_read(trans, rbio, inum, NULL), 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_read_single_folio_end_io(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	complete(bio-&gt;bi_private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_read_single_folio(struct folio *folio, struct address_space *mapping)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(mapping-&gt;host);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_read_bio *rbio;</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	int ret;</div><div class='del'>-	DECLARE_COMPLETION_ONSTACK(done);</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(&amp;opts, c, &amp;inode-&gt;ei_inode);</div><div class='del'>-</div><div class='del'>-	rbio = rbio_init(bio_alloc_bioset(NULL, 1, REQ_OP_READ, GFP_KERNEL, &amp;c-&gt;bio_read),</div><div class='del'>-			 opts);</div><div class='del'>-	rbio-&gt;bio.bi_private = &amp;done;</div><div class='del'>-	rbio-&gt;bio.bi_end_io = bch2_read_single_folio_end_io;</div><div class='del'>-</div><div class='del'>-	__bchfs_readfolio(c, rbio, inode_inum(inode), folio);</div><div class='del'>-	wait_for_completion(&amp;done);</div><div class='del'>-</div><div class='del'>-	ret = blk_status_to_errno(rbio-&gt;bio.bi_status);</div><div class='del'>-	bio_put(&amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	folio_mark_uptodate(folio);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_read_folio(struct file *file, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_read_single_folio(folio, folio-&gt;mapping);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* writepages: */</div><div class='del'>-</div><div class='del'>-struct bch_writepage_io {</div><div class='del'>-	struct bch_inode_info		*inode;</div><div class='del'>-</div><div class='del'>-	/* must be last: */</div><div class='del'>-	struct bch_write_op		op;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_writepage_state {</div><div class='del'>-	struct bch_writepage_io	*io;</div><div class='del'>-	struct bch_io_opts	opts;</div><div class='del'>-	struct bch_folio_sector	*tmp;</div><div class='del'>-	unsigned		tmp_sectors;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bch_writepage_state bch_writepage_state_init(struct bch_fs *c,</div><div class='del'>-								  struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	struct bch_writepage_state ret = { 0 };</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(&amp;ret.opts, c, &amp;inode-&gt;ei_inode);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Determine when a writepage io is full. We have to limit writepage bios to a</div><div class='del'>- * single page per bvec (i.e. 1MB with 4k pages) because that is the limit to</div><div class='del'>- * what the bounce path in bch2_write_extent() can handle. In theory we could</div><div class='del'>- * loosen this restriction for non-bounce I/O, but we don't have that context</div><div class='del'>- * here. Ideally, we can up this limit and make it configurable in the future</div><div class='del'>- * when the bounce path can be enhanced to accommodate larger source bios.</div><div class='del'>- */</div><div class='del'>-static inline bool bch_io_full(struct bch_writepage_io *io, unsigned len)</div><div class='del'>-{</div><div class='del'>-	struct bio *bio = &amp;io-&gt;op.wbio.bio;</div><div class='del'>-	return bio_full(bio, len) ||</div><div class='del'>-		(bio-&gt;bi_iter.bi_size + len &gt; BIO_MAX_VECS * PAGE_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_writepage_io_done(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_writepage_io *io =</div><div class='del'>-		container_of(op, struct bch_writepage_io, op);</div><div class='del'>-	struct bch_fs *c = io-&gt;op.c;</div><div class='del'>-	struct bio *bio = &amp;io-&gt;op.wbio.bio;</div><div class='del'>-	struct folio_iter fi;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (io-&gt;op.error) {</div><div class='del'>-		set_bit(EI_INODE_ERROR, &amp;io-&gt;inode-&gt;ei_flags);</div><div class='del'>-</div><div class='del'>-		bio_for_each_folio_all(fi, bio) {</div><div class='del'>-			struct bch_folio *s;</div><div class='del'>-</div><div class='del'>-			folio_set_error(fi.folio);</div><div class='del'>-			mapping_set_error(fi.folio-&gt;mapping, -EIO);</div><div class='del'>-</div><div class='del'>-			s = __bch2_folio(fi.folio);</div><div class='del'>-			spin_lock(&amp;s-&gt;lock);</div><div class='del'>-			for (i = 0; i &lt; folio_sectors(fi.folio); i++)</div><div class='del'>-				s-&gt;s[i].nr_replicas = 0;</div><div class='del'>-			spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (io-&gt;op.flags &amp; BCH_WRITE_WROTE_DATA_INLINE) {</div><div class='del'>-		bio_for_each_folio_all(fi, bio) {</div><div class='del'>-			struct bch_folio *s;</div><div class='del'>-</div><div class='del'>-			s = __bch2_folio(fi.folio);</div><div class='del'>-			spin_lock(&amp;s-&gt;lock);</div><div class='del'>-			for (i = 0; i &lt; folio_sectors(fi.folio); i++)</div><div class='del'>-				s-&gt;s[i].nr_replicas = 0;</div><div class='del'>-			spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * racing with fallocate can cause us to add fewer sectors than</div><div class='del'>-	 * expected - but we shouldn't add more sectors than expected:</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON_ONCE(io-&gt;op.i_sectors_delta &gt; 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * (error (due to going RO) halfway through a page can screw that up</div><div class='del'>-	 * slightly)</div><div class='del'>-	 * XXX wtf?</div><div class='del'>-	   BUG_ON(io-&gt;op.op.i_sectors_delta &gt;= PAGE_SECTORS);</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PageWriteback is effectively our ref on the inode - fixup i_blocks</div><div class='del'>-	 * before calling end_page_writeback:</div><div class='del'>-	 */</div><div class='del'>-	bch2_i_sectors_acct(c, io-&gt;inode, NULL, io-&gt;op.i_sectors_delta);</div><div class='del'>-</div><div class='del'>-	bio_for_each_folio_all(fi, bio) {</div><div class='del'>-		struct bch_folio *s = __bch2_folio(fi.folio);</div><div class='del'>-</div><div class='del'>-		if (atomic_dec_and_test(&amp;s-&gt;write_count))</div><div class='del'>-			folio_end_writeback(fi.folio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio_put(&amp;io-&gt;op.wbio.bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_writepage_do_io(struct bch_writepage_state *w)</div><div class='del'>-{</div><div class='del'>-	struct bch_writepage_io *io = w-&gt;io;</div><div class='del'>-</div><div class='del'>-	w-&gt;io = NULL;</div><div class='del'>-	closure_call(&amp;io-&gt;op.cl, bch2_write, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get a bch_writepage_io and add @page to it - appending to an existing one if</div><div class='del'>- * possible, else allocating a new one:</div><div class='del'>- */</div><div class='del'>-static void bch2_writepage_io_alloc(struct bch_fs *c,</div><div class='del'>-				    struct writeback_control *wbc,</div><div class='del'>-				    struct bch_writepage_state *w,</div><div class='del'>-				    struct bch_inode_info *inode,</div><div class='del'>-				    u64 sector,</div><div class='del'>-				    unsigned nr_replicas)</div><div class='del'>-{</div><div class='del'>-	struct bch_write_op *op;</div><div class='del'>-</div><div class='del'>-	w-&gt;io = container_of(bio_alloc_bioset(NULL, BIO_MAX_VECS,</div><div class='del'>-					      REQ_OP_WRITE,</div><div class='del'>-					      GFP_KERNEL,</div><div class='del'>-					      &amp;c-&gt;writepage_bioset),</div><div class='del'>-			     struct bch_writepage_io, op.wbio.bio);</div><div class='del'>-</div><div class='del'>-	w-&gt;io-&gt;inode		= inode;</div><div class='del'>-	op			= &amp;w-&gt;io-&gt;op;</div><div class='del'>-	bch2_write_op_init(op, c, w-&gt;opts);</div><div class='del'>-	op-&gt;target		= w-&gt;opts.foreground_target;</div><div class='del'>-	op-&gt;nr_replicas		= nr_replicas;</div><div class='del'>-	op-&gt;res.nr_replicas	= nr_replicas;</div><div class='del'>-	op-&gt;write_point		= writepoint_hashed(inode-&gt;ei_last_dirtied);</div><div class='del'>-	op-&gt;subvol		= inode-&gt;ei_subvol;</div><div class='del'>-	op-&gt;pos			= POS(inode-&gt;v.i_ino, sector);</div><div class='del'>-	op-&gt;end_io		= bch2_writepage_io_done;</div><div class='del'>-	op-&gt;devs_need_flush	= &amp;inode-&gt;ei_devs_need_flush;</div><div class='del'>-	op-&gt;wbio.bio.bi_iter.bi_sector = sector;</div><div class='del'>-	op-&gt;wbio.bio.bi_opf	= wbc_to_write_flags(wbc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_writepage(struct folio *folio,</div><div class='del'>-			    struct writeback_control *wbc,</div><div class='del'>-			    void *data)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(folio-&gt;mapping-&gt;host);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_writepage_state *w = data;</div><div class='del'>-	struct bch_folio *s;</div><div class='del'>-	unsigned i, offset, f_sectors, nr_replicas_this_write = U32_MAX;</div><div class='del'>-	loff_t i_size = i_size_read(&amp;inode-&gt;v);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!folio_test_uptodate(folio));</div><div class='del'>-</div><div class='del'>-	/* Is the folio fully inside i_size? */</div><div class='del'>-	if (folio_end_pos(folio) &lt;= i_size)</div><div class='del'>-		goto do_io;</div><div class='del'>-</div><div class='del'>-	/* Is the folio fully outside i_size? (truncate in progress) */</div><div class='del'>-	if (folio_pos(folio) &gt;= i_size) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The folio straddles i_size.  It must be zeroed out on each and every</div><div class='del'>-	 * writepage invocation because it may be mmapped.  "A file is mapped</div><div class='del'>-	 * in multiples of the folio size.  For a file that is not a multiple of</div><div class='del'>-	 * the  folio size, the remaining memory is zeroed when mapped, and</div><div class='del'>-	 * writes to that region are not written out to the file."</div><div class='del'>-	 */</div><div class='del'>-	folio_zero_segment(folio,</div><div class='del'>-			   i_size - folio_pos(folio),</div><div class='del'>-			   folio_size(folio));</div><div class='del'>-do_io:</div><div class='del'>-	f_sectors = folio_sectors(folio);</div><div class='del'>-	s = bch2_folio(folio);</div><div class='del'>-</div><div class='del'>-	if (f_sectors &gt; w-&gt;tmp_sectors) {</div><div class='del'>-		kfree(w-&gt;tmp);</div><div class='del'>-		w-&gt;tmp = kcalloc(f_sectors, sizeof(struct bch_folio_sector), __GFP_NOFAIL);</div><div class='del'>-		w-&gt;tmp_sectors = f_sectors;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Things get really hairy with errors during writeback:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_get_folio_disk_reservation(c, inode, folio, false);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	/* Before unlocking the page, get copy of reservations: */</div><div class='del'>-	spin_lock(&amp;s-&gt;lock);</div><div class='del'>-	memcpy(w-&gt;tmp, s-&gt;s, sizeof(struct bch_folio_sector) * f_sectors);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; f_sectors; i++) {</div><div class='del'>-		if (s-&gt;s[i].state &lt; SECTOR_dirty)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nr_replicas_this_write =</div><div class='del'>-			min_t(unsigned, nr_replicas_this_write,</div><div class='del'>-			      s-&gt;s[i].nr_replicas +</div><div class='del'>-			      s-&gt;s[i].replicas_reserved);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; f_sectors; i++) {</div><div class='del'>-		if (s-&gt;s[i].state &lt; SECTOR_dirty)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		s-&gt;s[i].nr_replicas = w-&gt;opts.compression</div><div class='del'>-			? 0 : nr_replicas_this_write;</div><div class='del'>-</div><div class='del'>-		s-&gt;s[i].replicas_reserved = 0;</div><div class='del'>-		bch2_folio_sector_set(folio, s, i, SECTOR_allocated);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(atomic_read(&amp;s-&gt;write_count));</div><div class='del'>-	atomic_set(&amp;s-&gt;write_count, 1);</div><div class='del'>-</div><div class='del'>-	BUG_ON(folio_test_writeback(folio));</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-</div><div class='del'>-	offset = 0;</div><div class='del'>-	while (1) {</div><div class='del'>-		unsigned sectors = 0, dirty_sectors = 0, reserved_sectors = 0;</div><div class='del'>-		u64 sector;</div><div class='del'>-</div><div class='del'>-		while (offset &lt; f_sectors &amp;&amp;</div><div class='del'>-		       w-&gt;tmp[offset].state &lt; SECTOR_dirty)</div><div class='del'>-			offset++;</div><div class='del'>-</div><div class='del'>-		if (offset == f_sectors)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		while (offset + sectors &lt; f_sectors &amp;&amp;</div><div class='del'>-		       w-&gt;tmp[offset + sectors].state &gt;= SECTOR_dirty) {</div><div class='del'>-			reserved_sectors += w-&gt;tmp[offset + sectors].replicas_reserved;</div><div class='del'>-			dirty_sectors += w-&gt;tmp[offset + sectors].state == SECTOR_dirty;</div><div class='del'>-			sectors++;</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(!sectors);</div><div class='del'>-</div><div class='del'>-		sector = folio_sector(folio) + offset;</div><div class='del'>-</div><div class='del'>-		if (w-&gt;io &amp;&amp;</div><div class='del'>-		    (w-&gt;io-&gt;op.res.nr_replicas != nr_replicas_this_write ||</div><div class='del'>-		     bch_io_full(w-&gt;io, sectors &lt;&lt; 9) ||</div><div class='del'>-		     bio_end_sector(&amp;w-&gt;io-&gt;op.wbio.bio) != sector))</div><div class='del'>-			bch2_writepage_do_io(w);</div><div class='del'>-</div><div class='del'>-		if (!w-&gt;io)</div><div class='del'>-			bch2_writepage_io_alloc(c, wbc, w, inode, sector,</div><div class='del'>-						nr_replicas_this_write);</div><div class='del'>-</div><div class='del'>-		atomic_inc(&amp;s-&gt;write_count);</div><div class='del'>-</div><div class='del'>-		BUG_ON(inode != w-&gt;io-&gt;inode);</div><div class='del'>-		BUG_ON(!bio_add_folio(&amp;w-&gt;io-&gt;op.wbio.bio, folio,</div><div class='del'>-				     sectors &lt;&lt; 9, offset &lt;&lt; 9));</div><div class='del'>-</div><div class='del'>-		/* Check for writing past i_size: */</div><div class='del'>-		WARN_ONCE((bio_end_sector(&amp;w-&gt;io-&gt;op.wbio.bio) &lt;&lt; 9) &gt;</div><div class='del'>-			  round_up(i_size, block_bytes(c)) &amp;&amp;</div><div class='del'>-			  !test_bit(BCH_FS_emergency_ro, &amp;c-&gt;flags),</div><div class='del'>-			  "writing past i_size: %llu &gt; %llu (unrounded %llu)\n",</div><div class='del'>-			  bio_end_sector(&amp;w-&gt;io-&gt;op.wbio.bio) &lt;&lt; 9,</div><div class='del'>-			  round_up(i_size, block_bytes(c)),</div><div class='del'>-			  i_size);</div><div class='del'>-</div><div class='del'>-		w-&gt;io-&gt;op.res.sectors += reserved_sectors;</div><div class='del'>-		w-&gt;io-&gt;op.i_sectors_delta -= dirty_sectors;</div><div class='del'>-		w-&gt;io-&gt;op.new_i_size = i_size;</div><div class='del'>-</div><div class='del'>-		offset += sectors;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;s-&gt;write_count))</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_writepages(struct address_space *mapping, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = mapping-&gt;host-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_writepage_state w =</div><div class='del'>-		bch_writepage_state_init(c, to_bch_ei(mapping-&gt;host));</div><div class='del'>-	struct blk_plug plug;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	blk_start_plug(&amp;plug);</div><div class='del'>-	ret = write_cache_pages(mapping, wbc, __bch2_writepage, &amp;w);</div><div class='del'>-	if (w.io)</div><div class='del'>-		bch2_writepage_do_io(&amp;w);</div><div class='del'>-	blk_finish_plug(&amp;plug);</div><div class='del'>-	kfree(w.tmp);</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* buffered writes: */</div><div class='del'>-</div><div class='del'>-int bch2_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		     loff_t pos, unsigned len,</div><div class='del'>-		     struct page **pagep, void **fsdata)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(mapping-&gt;host);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch2_folio_reservation *res;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	unsigned offset;</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	res = kmalloc(sizeof(*res), GFP_KERNEL);</div><div class='del'>-	if (!res)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	bch2_folio_reservation_init(c, inode, res);</div><div class='del'>-	*fsdata = res;</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_add_get(inode);</div><div class='del'>-</div><div class='del'>-	folio = __filemap_get_folio(mapping, pos &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				FGP_LOCK|FGP_WRITE|FGP_CREAT|FGP_STABLE,</div><div class='del'>-				mapping_gfp_mask(mapping));</div><div class='del'>-	if (IS_ERR_OR_NULL(folio))</div><div class='del'>-		goto err_unlock;</div><div class='del'>-</div><div class='del'>-	offset = pos - folio_pos(folio);</div><div class='del'>-	len = min_t(size_t, len, folio_end_pos(folio) - pos);</div><div class='del'>-</div><div class='del'>-	if (folio_test_uptodate(folio))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* If we're writing entire folio, don't need to read it in first: */</div><div class='del'>-	if (!offset &amp;&amp; len == folio_size(folio))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!offset &amp;&amp; pos + len &gt;= inode-&gt;v.i_size) {</div><div class='del'>-		folio_zero_segment(folio, len, folio_size(folio));</div><div class='del'>-		flush_dcache_folio(folio);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (folio_pos(folio) &gt;= inode-&gt;v.i_size) {</div><div class='del'>-		folio_zero_segments(folio, 0, offset, offset + len, folio_size(folio));</div><div class='del'>-		flush_dcache_folio(folio);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-readpage:</div><div class='del'>-	ret = bch2_read_single_folio(folio, mapping);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-out:</div><div class='del'>-	ret = bch2_folio_set(c, inode_inum(inode), &amp;folio, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_folio_reservation_get(c, inode, folio, res, offset, len);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (!folio_test_uptodate(folio)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If the folio hasn't been read in, we won't know if we</div><div class='del'>-			 * actually need a reservation - we don't actually need</div><div class='del'>-			 * to read here, we just need to check if the folio is</div><div class='del'>-			 * fully backed by uncompressed data:</div><div class='del'>-			 */</div><div class='del'>-			goto readpage;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	folio_put(folio);</div><div class='del'>-	*pagep = NULL;</div><div class='del'>-err_unlock:</div><div class='del'>-	bch2_pagecache_add_put(inode);</div><div class='del'>-	kfree(res);</div><div class='del'>-	*fsdata = NULL;</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-		   loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-		   struct page *page, void *fsdata)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(mapping-&gt;host);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch2_folio_reservation *res = fsdata;</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	unsigned offset = pos - folio_pos(folio);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;inode-&gt;v.i_rwsem);</div><div class='del'>-	BUG_ON(offset + copied &gt; folio_size(folio));</div><div class='del'>-</div><div class='del'>-	if (unlikely(copied &lt; len &amp;&amp; !folio_test_uptodate(folio))) {</div><div class='del'>-		/*</div><div class='del'>-		 * The folio needs to be read in, but that would destroy</div><div class='del'>-		 * our partial write - simplest thing is to just force</div><div class='del'>-		 * userspace to redo the write:</div><div class='del'>-		 */</div><div class='del'>-		folio_zero_range(folio, 0, folio_size(folio));</div><div class='del'>-		flush_dcache_folio(folio);</div><div class='del'>-		copied = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-	if (pos + copied &gt; inode-&gt;v.i_size)</div><div class='del'>-		i_size_write(&amp;inode-&gt;v, pos + copied);</div><div class='del'>-	spin_unlock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-</div><div class='del'>-	if (copied) {</div><div class='del'>-		if (!folio_test_uptodate(folio))</div><div class='del'>-			folio_mark_uptodate(folio);</div><div class='del'>-</div><div class='del'>-		bch2_set_folio_dirty(c, inode, folio, res, offset, copied);</div><div class='del'>-</div><div class='del'>-		inode-&gt;ei_last_dirtied = (unsigned long) current;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	folio_put(folio);</div><div class='del'>-	bch2_pagecache_add_put(inode);</div><div class='del'>-</div><div class='del'>-	bch2_folio_reservation_put(c, inode, res);</div><div class='del'>-	kfree(res);</div><div class='del'>-</div><div class='del'>-	return copied;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void folios_trunc(folios *fs, struct folio **fi)</div><div class='del'>-{</div><div class='del'>-	while (fs-&gt;data + fs-&gt;nr &gt; fi) {</div><div class='del'>-		struct folio *f = darray_pop(fs);</div><div class='del'>-</div><div class='del'>-		folio_unlock(f);</div><div class='del'>-		folio_put(f);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_buffered_write(struct bch_inode_info *inode,</div><div class='del'>-				 struct address_space *mapping,</div><div class='del'>-				 struct iov_iter *iter,</div><div class='del'>-				 loff_t pos, unsigned len)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch2_folio_reservation res;</div><div class='del'>-	folios fs;</div><div class='del'>-	struct folio *f;</div><div class='del'>-	unsigned copied = 0, f_offset, f_copied;</div><div class='del'>-	u64 end = pos + len, f_pos, f_len;</div><div class='del'>-	loff_t last_folio_pos = inode-&gt;v.i_size;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!len);</div><div class='del'>-</div><div class='del'>-	bch2_folio_reservation_init(c, inode, &amp;res);</div><div class='del'>-	darray_init(&amp;fs);</div><div class='del'>-</div><div class='del'>-	ret = bch2_filemap_get_contig_folios_d(mapping, pos, end,</div><div class='del'>-				   FGP_LOCK|FGP_WRITE|FGP_STABLE|FGP_CREAT,</div><div class='del'>-				   mapping_gfp_mask(mapping),</div><div class='del'>-				   &amp;fs);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!fs.nr);</div><div class='del'>-</div><div class='del'>-	f = darray_first(fs);</div><div class='del'>-	if (pos != folio_pos(f) &amp;&amp; !folio_test_uptodate(f)) {</div><div class='del'>-		ret = bch2_read_single_folio(f, mapping);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f = darray_last(fs);</div><div class='del'>-	end = min(end, folio_end_pos(f));</div><div class='del'>-	last_folio_pos = folio_pos(f);</div><div class='del'>-	if (end != folio_end_pos(f) &amp;&amp; !folio_test_uptodate(f)) {</div><div class='del'>-		if (end &gt;= inode-&gt;v.i_size) {</div><div class='del'>-			folio_zero_range(f, 0, folio_size(f));</div><div class='del'>-		} else {</div><div class='del'>-			ret = bch2_read_single_folio(f, mapping);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_folio_set(c, inode_inum(inode), fs.data, fs.nr);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	f_pos = pos;</div><div class='del'>-	f_offset = pos - folio_pos(darray_first(fs));</div><div class='del'>-	darray_for_each(fs, fi) {</div><div class='del'>-		f = *fi;</div><div class='del'>-		f_len = min(end, folio_end_pos(f)) - f_pos;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: per POSIX and fstests generic/275, on -ENOSPC we're</div><div class='del'>-		 * supposed to write as much as we have disk space for.</div><div class='del'>-		 *</div><div class='del'>-		 * On failure here we should still write out a partial page if</div><div class='del'>-		 * we aren't completely out of disk space - we don't do that</div><div class='del'>-		 * yet:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_folio_reservation_get(c, inode, f, &amp;res, f_offset, f_len);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			folios_trunc(&amp;fs, fi);</div><div class='del'>-			if (!fs.nr)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			end = min(end, folio_end_pos(darray_last(fs)));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		f_pos = folio_end_pos(f);</div><div class='del'>-		f_offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mapping_writably_mapped(mapping))</div><div class='del'>-		darray_for_each(fs, fi)</div><div class='del'>-			flush_dcache_folio(*fi);</div><div class='del'>-</div><div class='del'>-	f_pos = pos;</div><div class='del'>-	f_offset = pos - folio_pos(darray_first(fs));</div><div class='del'>-	darray_for_each(fs, fi) {</div><div class='del'>-		f = *fi;</div><div class='del'>-		f_len = min(end, folio_end_pos(f)) - f_pos;</div><div class='del'>-		f_copied = copy_page_from_iter_atomic(&amp;f-&gt;page, f_offset, f_len, iter);</div><div class='del'>-		if (!f_copied) {</div><div class='del'>-			folios_trunc(&amp;fs, fi);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!folio_test_uptodate(f) &amp;&amp;</div><div class='del'>-		    f_copied != folio_size(f) &amp;&amp;</div><div class='del'>-		    pos + copied + f_copied &lt; inode-&gt;v.i_size) {</div><div class='del'>-			iov_iter_revert(iter, f_copied);</div><div class='del'>-			folio_zero_range(f, 0, folio_size(f));</div><div class='del'>-			folios_trunc(&amp;fs, fi);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		flush_dcache_folio(f);</div><div class='del'>-		copied += f_copied;</div><div class='del'>-</div><div class='del'>-		if (f_copied != f_len) {</div><div class='del'>-			folios_trunc(&amp;fs, fi + 1);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		f_pos = folio_end_pos(f);</div><div class='del'>-		f_offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!copied)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	end = pos + copied;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-	if (end &gt; inode-&gt;v.i_size)</div><div class='del'>-		i_size_write(&amp;inode-&gt;v, end);</div><div class='del'>-	spin_unlock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-</div><div class='del'>-	f_pos = pos;</div><div class='del'>-	f_offset = pos - folio_pos(darray_first(fs));</div><div class='del'>-	darray_for_each(fs, fi) {</div><div class='del'>-		f = *fi;</div><div class='del'>-		f_len = min(end, folio_end_pos(f)) - f_pos;</div><div class='del'>-</div><div class='del'>-		if (!folio_test_uptodate(f))</div><div class='del'>-			folio_mark_uptodate(f);</div><div class='del'>-</div><div class='del'>-		bch2_set_folio_dirty(c, inode, f, &amp;res, f_offset, f_len);</div><div class='del'>-</div><div class='del'>-		f_pos = folio_end_pos(f);</div><div class='del'>-		f_offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode-&gt;ei_last_dirtied = (unsigned long) current;</div><div class='del'>-out:</div><div class='del'>-	darray_for_each(fs, fi) {</div><div class='del'>-		folio_unlock(*fi);</div><div class='del'>-		folio_put(*fi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the last folio added to the mapping starts beyond current EOF, we</div><div class='del'>-	 * performed a short write but left around at least one post-EOF folio.</div><div class='del'>-	 * Clean up the mapping before we return.</div><div class='del'>-	 */</div><div class='del'>-	if (last_folio_pos &gt;= inode-&gt;v.i_size)</div><div class='del'>-		truncate_pagecache(&amp;inode-&gt;v, inode-&gt;v.i_size);</div><div class='del'>-</div><div class='del'>-	darray_exit(&amp;fs);</div><div class='del'>-	bch2_folio_reservation_put(c, inode, &amp;res);</div><div class='del'>-</div><div class='del'>-	return copied ?: ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t bch2_buffered_write(struct kiocb *iocb, struct iov_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	loff_t pos = iocb-&gt;ki_pos;</div><div class='del'>-	ssize_t written = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_add_get(inode);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		unsigned offset = pos &amp; (PAGE_SIZE - 1);</div><div class='del'>-		unsigned bytes = iov_iter_count(iter);</div><div class='del'>-again:</div><div class='del'>-		/*</div><div class='del'>-		 * Bring in the user page that we will copy from _first_.</div><div class='del'>-		 * Otherwise there's a nasty deadlock on copying from the</div><div class='del'>-		 * same page as we're writing to, without it being marked</div><div class='del'>-		 * up-to-date.</div><div class='del'>-		 *</div><div class='del'>-		 * Not only is this an optimisation, but it is also required</div><div class='del'>-		 * to check that the address is actually valid, when atomic</div><div class='del'>-		 * usercopies are used, below.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(fault_in_iov_iter_readable(iter, bytes))) {</div><div class='del'>-			bytes = min_t(unsigned long, iov_iter_count(iter),</div><div class='del'>-				      PAGE_SIZE - offset);</div><div class='del'>-</div><div class='del'>-			if (unlikely(fault_in_iov_iter_readable(iter, bytes))) {</div><div class='del'>-				ret = -EFAULT;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(fatal_signal_pending(current))) {</div><div class='del'>-			ret = -EINTR;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = __bch2_buffered_write(inode, mapping, iter, pos, bytes);</div><div class='del'>-		if (unlikely(ret &lt; 0))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		if (unlikely(ret == 0)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If we were unable to copy any data at all, we must</div><div class='del'>-			 * fall back to a single segment length write.</div><div class='del'>-			 *</div><div class='del'>-			 * If we didn't fallback here, we could livelock</div><div class='del'>-			 * because not all segments in the iov can be copied at</div><div class='del'>-			 * once without a pagefault.</div><div class='del'>-			 */</div><div class='del'>-			bytes = min_t(unsigned long, PAGE_SIZE - offset,</div><div class='del'>-				      iov_iter_single_seg_count(iter));</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		pos += ret;</div><div class='del'>-		written += ret;</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-	} while (iov_iter_count(iter));</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_add_put(inode);</div><div class='del'>-</div><div class='del'>-	return written ? written : ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t bch2_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='del'>-{</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='del'>-		ret = bch2_direct_write(iocb, from);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_lock(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	ret = generic_write_checks(iocb, from);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	ret = file_remove_privs(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	ret = file_update_time(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	ret = bch2_buffered_write(iocb, from);</div><div class='del'>-	if (likely(ret &gt; 0))</div><div class='del'>-		iocb-&gt;ki_pos += ret;</div><div class='del'>-unlock:</div><div class='del'>-	inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		ret = generic_write_sync(iocb, ret);</div><div class='del'>-out:</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_fs_io_buffered_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bioset_exit(&amp;c-&gt;writepage_bioset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_fs_io_buffered_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bioset_init(&amp;c-&gt;writepage_bioset,</div><div class='del'>-			4, offsetof(struct bch_writepage_io, op.wbio.bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		return -BCH_ERR_ENOMEM_writepage_bioset_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/fs-io-buffered.h b/fs/bcachefs/fs-io-buffered.h<br/>deleted file mode 100644<br/>index a6126ff790e6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io-buffered.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-buffered.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_IO_BUFFERED_H</div><div class='del'>-#define _BCACHEFS_FS_IO_BUFFERED_H</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-int bch2_read_single_folio(struct folio *, struct address_space *);</div><div class='del'>-int bch2_read_folio(struct file *, struct folio *);</div><div class='del'>-</div><div class='del'>-int bch2_writepages(struct address_space *, struct writeback_control *);</div><div class='del'>-void bch2_readahead(struct readahead_control *);</div><div class='del'>-</div><div class='del'>-int bch2_write_begin(struct file *, struct address_space *, loff_t,</div><div class='del'>-		     unsigned, struct page **, void **);</div><div class='del'>-int bch2_write_end(struct file *, struct address_space *, loff_t,</div><div class='del'>-		   unsigned, unsigned, struct page *, void *);</div><div class='del'>-</div><div class='del'>-ssize_t bch2_write_iter(struct kiocb *, struct iov_iter *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_fs_io_buffered_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_fs_io_buffered_init(struct bch_fs *);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_fs_fs_io_buffered_exit(struct bch_fs *c) {}</div><div class='del'>-static inline int bch2_fs_fs_io_buffered_init(struct bch_fs *c) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_IO_BUFFERED_H */</div><div class='head'>diff --git a/fs/bcachefs/fs-io-direct.c b/fs/bcachefs/fs-io-direct.c<br/>deleted file mode 100644<br/>index e3b219e19e10..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io-direct.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-direct.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,678 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "fs-io.h"</div><div class='del'>-#include "fs-io-direct.h"</div><div class='del'>-#include "fs-io-pagecache.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='del'>-</div><div class='del'>-/* O_DIRECT reads */</div><div class='del'>-</div><div class='del'>-struct dio_read {</div><div class='del'>-	struct closure			cl;</div><div class='del'>-	struct kiocb			*req;</div><div class='del'>-	long				ret;</div><div class='del'>-	bool				should_dirty;</div><div class='del'>-	struct bch_read_bio		rbio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bio_check_or_release(struct bio *bio, bool check_dirty)</div><div class='del'>-{</div><div class='del'>-	if (check_dirty) {</div><div class='del'>-		bio_check_pages_dirty(bio);</div><div class='del'>-	} else {</div><div class='del'>-		bio_release_pages(bio, false);</div><div class='del'>-		bio_put(bio);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(bch2_dio_read_complete)</div><div class='del'>-{</div><div class='del'>-	closure_type(dio, struct dio_read, cl);</div><div class='del'>-</div><div class='del'>-	dio-&gt;req-&gt;ki_complete(dio-&gt;req, dio-&gt;ret);</div><div class='del'>-	bio_check_or_release(&amp;dio-&gt;rbio.bio, dio-&gt;should_dirty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_direct_IO_read_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct dio_read *dio = bio-&gt;bi_private;</div><div class='del'>-</div><div class='del'>-	if (bio-&gt;bi_status)</div><div class='del'>-		dio-&gt;ret = blk_status_to_errno(bio-&gt;bi_status);</div><div class='del'>-</div><div class='del'>-	closure_put(&amp;dio-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_direct_IO_read_split_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct dio_read *dio = bio-&gt;bi_private;</div><div class='del'>-	bool should_dirty = dio-&gt;should_dirty;</div><div class='del'>-</div><div class='del'>-	bch2_direct_IO_read_endio(bio);</div><div class='del'>-	bio_check_or_release(bio, should_dirty);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_direct_IO_read(struct kiocb *req, struct iov_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct file *file = req-&gt;ki_filp;</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	struct dio_read *dio;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	loff_t offset = req-&gt;ki_pos;</div><div class='del'>-	bool sync = is_sync_kiocb(req);</div><div class='del'>-	size_t shorten;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(&amp;opts, c, &amp;inode-&gt;ei_inode);</div><div class='del'>-</div><div class='del'>-	/* bios must be 512 byte aligned: */</div><div class='del'>-	if ((offset|iter-&gt;count) &amp; (SECTOR_SIZE - 1))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = min_t(loff_t, iter-&gt;count,</div><div class='del'>-		    max_t(loff_t, 0, i_size_read(&amp;inode-&gt;v) - offset));</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	shorten = iov_iter_count(iter) - round_up(ret, block_bytes(c));</div><div class='del'>-	iter-&gt;count -= shorten;</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(NULL,</div><div class='del'>-			       bio_iov_vecs_to_alloc(iter, BIO_MAX_VECS),</div><div class='del'>-			       REQ_OP_READ,</div><div class='del'>-			       GFP_KERNEL,</div><div class='del'>-			       &amp;c-&gt;dio_read_bioset);</div><div class='del'>-</div><div class='del'>-	bio-&gt;bi_end_io = bch2_direct_IO_read_endio;</div><div class='del'>-</div><div class='del'>-	dio = container_of(bio, struct dio_read, rbio.bio);</div><div class='del'>-	closure_init(&amp;dio-&gt;cl, NULL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this is a _really_ horrible hack just to avoid an atomic sub at the</div><div class='del'>-	 * end:</div><div class='del'>-	 */</div><div class='del'>-	if (!sync) {</div><div class='del'>-		set_closure_fn(&amp;dio-&gt;cl, bch2_dio_read_complete, NULL);</div><div class='del'>-		atomic_set(&amp;dio-&gt;cl.remaining,</div><div class='del'>-			   CLOSURE_REMAINING_INITIALIZER -</div><div class='del'>-			   CLOSURE_RUNNING +</div><div class='del'>-			   CLOSURE_DESTRUCTOR);</div><div class='del'>-	} else {</div><div class='del'>-		atomic_set(&amp;dio-&gt;cl.remaining,</div><div class='del'>-			   CLOSURE_REMAINING_INITIALIZER + 1);</div><div class='del'>-		dio-&gt;cl.closure_get_happened = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dio-&gt;req	= req;</div><div class='del'>-	dio-&gt;ret	= ret;</div><div class='del'>-	/*</div><div class='del'>-	 * This is one of the sketchier things I've encountered: we have to skip</div><div class='del'>-	 * the dirtying of requests that are internal from the kernel (i.e. from</div><div class='del'>-	 * loopback), because we'll deadlock on page_lock.</div><div class='del'>-	 */</div><div class='del'>-	dio-&gt;should_dirty = iter_is_iovec(iter);</div><div class='del'>-</div><div class='del'>-	goto start;</div><div class='del'>-	while (iter-&gt;count) {</div><div class='del'>-		bio = bio_alloc_bioset(NULL,</div><div class='del'>-				       bio_iov_vecs_to_alloc(iter, BIO_MAX_VECS),</div><div class='del'>-				       REQ_OP_READ,</div><div class='del'>-				       GFP_KERNEL,</div><div class='del'>-				       &amp;c-&gt;bio_read);</div><div class='del'>-		bio-&gt;bi_end_io		= bch2_direct_IO_read_split_endio;</div><div class='del'>-start:</div><div class='del'>-		bio-&gt;bi_opf		= REQ_OP_READ|REQ_SYNC;</div><div class='del'>-		bio-&gt;bi_iter.bi_sector	= offset &gt;&gt; 9;</div><div class='del'>-		bio-&gt;bi_private		= dio;</div><div class='del'>-</div><div class='del'>-		ret = bio_iov_iter_get_pages(bio, iter);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			/* XXX: fault inject this path */</div><div class='del'>-			bio-&gt;bi_status = BLK_STS_RESOURCE;</div><div class='del'>-			bio_endio(bio);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		offset += bio-&gt;bi_iter.bi_size;</div><div class='del'>-</div><div class='del'>-		if (dio-&gt;should_dirty)</div><div class='del'>-			bio_set_pages_dirty(bio);</div><div class='del'>-</div><div class='del'>-		if (iter-&gt;count)</div><div class='del'>-			closure_get(&amp;dio-&gt;cl);</div><div class='del'>-</div><div class='del'>-		bch2_read(c, rbio_init(bio, opts), inode_inum(inode));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iter-&gt;count += shorten;</div><div class='del'>-</div><div class='del'>-	if (sync) {</div><div class='del'>-		closure_sync(&amp;dio-&gt;cl);</div><div class='del'>-		closure_debug_destroy(&amp;dio-&gt;cl);</div><div class='del'>-		ret = dio-&gt;ret;</div><div class='del'>-		bio_check_or_release(&amp;dio-&gt;rbio.bio, dio-&gt;should_dirty);</div><div class='del'>-		return ret;</div><div class='del'>-	} else {</div><div class='del'>-		return -EIOCBQUEUED;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t bch2_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	size_t count = iov_iter_count(iter);</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		return 0; /* skip atime */</div><div class='del'>-</div><div class='del'>-	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='del'>-		struct blk_plug plug;</div><div class='del'>-</div><div class='del'>-		if (unlikely(mapping-&gt;nrpages)) {</div><div class='del'>-			ret = filemap_write_and_wait_range(mapping,</div><div class='del'>-						iocb-&gt;ki_pos,</div><div class='del'>-						iocb-&gt;ki_pos + count - 1);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		file_accessed(file);</div><div class='del'>-</div><div class='del'>-		blk_start_plug(&amp;plug);</div><div class='del'>-		ret = bch2_direct_IO_read(iocb, iter);</div><div class='del'>-		blk_finish_plug(&amp;plug);</div><div class='del'>-</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			iocb-&gt;ki_pos += ret;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_pagecache_add_get(inode);</div><div class='del'>-		ret = generic_file_read_iter(iocb, iter);</div><div class='del'>-		bch2_pagecache_add_put(inode);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* O_DIRECT writes */</div><div class='del'>-</div><div class='del'>-struct dio_write {</div><div class='del'>-	struct kiocb			*req;</div><div class='del'>-	struct address_space		*mapping;</div><div class='del'>-	struct bch_inode_info		*inode;</div><div class='del'>-	struct mm_struct		*mm;</div><div class='del'>-	const struct iovec		*iov;</div><div class='del'>-	unsigned			loop:1,</div><div class='del'>-					extending:1,</div><div class='del'>-					sync:1,</div><div class='del'>-					flush:1;</div><div class='del'>-	struct quota_res		quota_res;</div><div class='del'>-	u64				written;</div><div class='del'>-</div><div class='del'>-	struct iov_iter			iter;</div><div class='del'>-	struct iovec			inline_vecs[2];</div><div class='del'>-</div><div class='del'>-	/* must be last: */</div><div class='del'>-	struct bch_write_op		op;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool bch2_check_range_allocated(struct bch_fs *c, subvol_inum inum,</div><div class='del'>-				       u64 offset, u64 size,</div><div class='del'>-				       unsigned nr_replicas, bool compressed)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u64 end = offset + size;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	bool ret = true;</div><div class='del'>-	int err;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	err = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_extents,</div><div class='del'>-			   SPOS(inum.inum, offset, snapshot),</div><div class='del'>-			   BTREE_ITER_SLOTS, k, err) {</div><div class='del'>-		if (bkey_ge(bkey_start_pos(k.k), POS(inum.inum, end)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;p.snapshot != snapshot ||</div><div class='del'>-		    nr_replicas &gt; bch2_bkey_replicas(c, k) ||</div><div class='del'>-		    (!compressed &amp;&amp; bch2_bkey_sectors_compressed(k))) {</div><div class='del'>-			ret = false;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	offset = iter.pos.offset;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(err, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return err ? false : ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline bool bch2_dio_write_check_allocated(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = dio-&gt;op.c;</div><div class='del'>-	struct bch_inode_info *inode = dio-&gt;inode;</div><div class='del'>-	struct bio *bio = &amp;dio-&gt;op.wbio.bio;</div><div class='del'>-</div><div class='del'>-	return bch2_check_range_allocated(c, inode_inum(inode),</div><div class='del'>-				dio-&gt;op.pos.offset, bio_sectors(bio),</div><div class='del'>-				dio-&gt;op.opts.data_replicas,</div><div class='del'>-				dio-&gt;op.opts.compression != 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dio_write_loop_async(struct bch_write_op *);</div><div class='del'>-static __always_inline long bch2_dio_write_done(struct dio_write *dio);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We're going to return -EIOCBQUEUED, but we haven't finished consuming the</div><div class='del'>- * iov_iter yet, so we need to stash a copy of the iovec: it might be on the</div><div class='del'>- * caller's stack, we're not guaranteed that it will live for the duration of</div><div class='del'>- * the IO:</div><div class='del'>- */</div><div class='del'>-static noinline int bch2_dio_write_copy_iov(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct iovec *iov = dio-&gt;inline_vecs;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * iov_iter has a single embedded iovec - nothing to do:</div><div class='del'>-	 */</div><div class='del'>-	if (iter_is_ubuf(&amp;dio-&gt;iter))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't currently handle non-iovec iov_iters here - return an error,</div><div class='del'>-	 * and we'll fall back to doing the IO synchronously:</div><div class='del'>-	 */</div><div class='del'>-	if (!iter_is_iovec(&amp;dio-&gt;iter))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (dio-&gt;iter.nr_segs &gt; ARRAY_SIZE(dio-&gt;inline_vecs)) {</div><div class='del'>-		dio-&gt;iov = iov = kmalloc_array(dio-&gt;iter.nr_segs, sizeof(*iov),</div><div class='del'>-				    GFP_KERNEL);</div><div class='del'>-		if (unlikely(!iov))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(iov, dio-&gt;iter.__iov, dio-&gt;iter.nr_segs * sizeof(*iov));</div><div class='del'>-	dio-&gt;iter.__iov = iov;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(bch2_dio_write_flush_done)</div><div class='del'>-{</div><div class='del'>-	closure_type(dio, struct dio_write, op.cl);</div><div class='del'>-	struct bch_fs *c = dio-&gt;op.c;</div><div class='del'>-</div><div class='del'>-	closure_debug_destroy(cl);</div><div class='del'>-</div><div class='del'>-	dio-&gt;op.error = bch2_journal_error(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	bch2_dio_write_done(dio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void bch2_dio_write_flush(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = dio-&gt;op.c;</div><div class='del'>-	struct bch_inode_unpacked inode;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dio-&gt;flush = 0;</div><div class='del'>-</div><div class='del'>-	closure_init(&amp;dio-&gt;op.cl, NULL);</div><div class='del'>-</div><div class='del'>-	if (!dio-&gt;op.error) {</div><div class='del'>-		ret = bch2_inode_find_by_inum(c, inode_inum(dio-&gt;inode), &amp;inode);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dio-&gt;op.error = ret;</div><div class='del'>-		} else {</div><div class='del'>-			bch2_journal_flush_seq_async(&amp;c-&gt;journal, inode.bi_journal_seq,</div><div class='del'>-						     &amp;dio-&gt;op.cl);</div><div class='del'>-			bch2_inode_flush_nocow_writes_async(c, dio-&gt;inode, &amp;dio-&gt;op.cl);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dio-&gt;sync) {</div><div class='del'>-		closure_sync(&amp;dio-&gt;op.cl);</div><div class='del'>-		closure_debug_destroy(&amp;dio-&gt;op.cl);</div><div class='del'>-	} else {</div><div class='del'>-		continue_at(&amp;dio-&gt;op.cl, bch2_dio_write_flush_done, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline long bch2_dio_write_done(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct kiocb *req = dio-&gt;req;</div><div class='del'>-	struct bch_inode_info *inode = dio-&gt;inode;</div><div class='del'>-	bool sync = dio-&gt;sync;</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(dio-&gt;flush)) {</div><div class='del'>-		bch2_dio_write_flush(dio);</div><div class='del'>-		if (!sync)</div><div class='del'>-			return -EIOCBQUEUED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_block_put(inode);</div><div class='del'>-</div><div class='del'>-	kfree(dio-&gt;iov);</div><div class='del'>-</div><div class='del'>-	ret = dio-&gt;op.error ?: ((long) dio-&gt;written &lt;&lt; 9);</div><div class='del'>-	bio_put(&amp;dio-&gt;op.wbio.bio);</div><div class='del'>-</div><div class='del'>-	/* inode-&gt;i_dio_count is our ref on inode and thus bch_fs */</div><div class='del'>-	inode_dio_end(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		ret = bch2_err_class(ret);</div><div class='del'>-</div><div class='del'>-	if (!sync) {</div><div class='del'>-		req-&gt;ki_complete(req, ret);</div><div class='del'>-		ret = -EIOCBQUEUED;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline void bch2_dio_write_end(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = dio-&gt;op.c;</div><div class='del'>-	struct kiocb *req = dio-&gt;req;</div><div class='del'>-	struct bch_inode_info *inode = dio-&gt;inode;</div><div class='del'>-	struct bio *bio = &amp;dio-&gt;op.wbio.bio;</div><div class='del'>-</div><div class='del'>-	req-&gt;ki_pos	+= (u64) dio-&gt;op.written &lt;&lt; 9;</div><div class='del'>-	dio-&gt;written	+= dio-&gt;op.written;</div><div class='del'>-</div><div class='del'>-	if (dio-&gt;extending) {</div><div class='del'>-		spin_lock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-		if (req-&gt;ki_pos &gt; inode-&gt;v.i_size)</div><div class='del'>-			i_size_write(&amp;inode-&gt;v, req-&gt;ki_pos);</div><div class='del'>-		spin_unlock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dio-&gt;op.i_sectors_delta || dio-&gt;quota_res.sectors) {</div><div class='del'>-		mutex_lock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-		__bch2_i_sectors_acct(c, inode, &amp;dio-&gt;quota_res, dio-&gt;op.i_sectors_delta);</div><div class='del'>-		__bch2_quota_reservation_put(c, inode, &amp;dio-&gt;quota_res);</div><div class='del'>-		mutex_unlock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio_release_pages(bio, false);</div><div class='del'>-</div><div class='del'>-	if (unlikely(dio-&gt;op.error))</div><div class='del'>-		set_bit(EI_INODE_ERROR, &amp;inode-&gt;ei_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline long bch2_dio_write_loop(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = dio-&gt;op.c;</div><div class='del'>-	struct kiocb *req = dio-&gt;req;</div><div class='del'>-	struct address_space *mapping = dio-&gt;mapping;</div><div class='del'>-	struct bch_inode_info *inode = dio-&gt;inode;</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	struct bio *bio = &amp;dio-&gt;op.wbio.bio;</div><div class='del'>-	unsigned unaligned, iter_count;</div><div class='del'>-	bool sync = dio-&gt;sync, dropped_locks;</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(&amp;opts, c, &amp;inode-&gt;ei_inode);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		iter_count = dio-&gt;iter.count;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(current-&gt;faults_disabled_mapping);</div><div class='del'>-		current-&gt;faults_disabled_mapping = mapping;</div><div class='del'>-</div><div class='del'>-		ret = bio_iov_iter_get_pages(bio, &amp;dio-&gt;iter);</div><div class='del'>-</div><div class='del'>-		dropped_locks = fdm_dropped_locks();</div><div class='del'>-</div><div class='del'>-		current-&gt;faults_disabled_mapping = NULL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the fault handler returned an error but also signalled</div><div class='del'>-		 * that it dropped &amp; retook ei_pagecache_lock, we just need to</div><div class='del'>-		 * re-shoot down the page cache and retry:</div><div class='del'>-		 */</div><div class='del'>-		if (dropped_locks &amp;&amp; ret)</div><div class='del'>-			ret = 0;</div><div class='del'>-</div><div class='del'>-		if (unlikely(ret &lt; 0))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (unlikely(dropped_locks)) {</div><div class='del'>-			ret = bch2_write_invalidate_inode_pages_range(mapping,</div><div class='del'>-					req-&gt;ki_pos,</div><div class='del'>-					req-&gt;ki_pos + iter_count - 1);</div><div class='del'>-			if (unlikely(ret))</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			if (!bio-&gt;bi_iter.bi_size)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		unaligned = bio-&gt;bi_iter.bi_size &amp; (block_bytes(c) - 1);</div><div class='del'>-		bio-&gt;bi_iter.bi_size -= unaligned;</div><div class='del'>-		iov_iter_revert(&amp;dio-&gt;iter, unaligned);</div><div class='del'>-</div><div class='del'>-		if (!bio-&gt;bi_iter.bi_size) {</div><div class='del'>-			/*</div><div class='del'>-			 * bio_iov_iter_get_pages was only able to get &lt;</div><div class='del'>-			 * blocksize worth of pages:</div><div class='del'>-			 */</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_write_op_init(&amp;dio-&gt;op, c, opts);</div><div class='del'>-		dio-&gt;op.end_io		= sync</div><div class='del'>-			? NULL</div><div class='del'>-			: bch2_dio_write_loop_async;</div><div class='del'>-		dio-&gt;op.target		= dio-&gt;op.opts.foreground_target;</div><div class='del'>-		dio-&gt;op.write_point	= writepoint_hashed((unsigned long) current);</div><div class='del'>-		dio-&gt;op.nr_replicas	= dio-&gt;op.opts.data_replicas;</div><div class='del'>-		dio-&gt;op.subvol		= inode-&gt;ei_subvol;</div><div class='del'>-		dio-&gt;op.pos		= POS(inode-&gt;v.i_ino, (u64) req-&gt;ki_pos &gt;&gt; 9);</div><div class='del'>-		dio-&gt;op.devs_need_flush	= &amp;inode-&gt;ei_devs_need_flush;</div><div class='del'>-</div><div class='del'>-		if (sync)</div><div class='del'>-			dio-&gt;op.flags |= BCH_WRITE_SYNC;</div><div class='del'>-		dio-&gt;op.flags |= BCH_WRITE_CHECK_ENOSPC;</div><div class='del'>-</div><div class='del'>-		ret = bch2_quota_reservation_add(c, inode, &amp;dio-&gt;quota_res,</div><div class='del'>-						 bio_sectors(bio), true);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ret = bch2_disk_reservation_get(c, &amp;dio-&gt;op.res, bio_sectors(bio),</div><div class='del'>-						dio-&gt;op.opts.data_replicas, 0);</div><div class='del'>-		if (unlikely(ret) &amp;&amp;</div><div class='del'>-		    !bch2_dio_write_check_allocated(dio))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		task_io_account_write(bio-&gt;bi_iter.bi_size);</div><div class='del'>-</div><div class='del'>-		if (unlikely(dio-&gt;iter.count) &amp;&amp;</div><div class='del'>-		    !dio-&gt;sync &amp;&amp;</div><div class='del'>-		    !dio-&gt;loop &amp;&amp;</div><div class='del'>-		    bch2_dio_write_copy_iov(dio))</div><div class='del'>-			dio-&gt;sync = sync = true;</div><div class='del'>-</div><div class='del'>-		dio-&gt;loop = true;</div><div class='del'>-		closure_call(&amp;dio-&gt;op.cl, bch2_write, NULL, NULL);</div><div class='del'>-</div><div class='del'>-		if (!sync)</div><div class='del'>-			return -EIOCBQUEUED;</div><div class='del'>-</div><div class='del'>-		bch2_dio_write_end(dio);</div><div class='del'>-</div><div class='del'>-		if (likely(!dio-&gt;iter.count) || dio-&gt;op.error)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bio_reset(bio, NULL, REQ_OP_WRITE);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return bch2_dio_write_done(dio);</div><div class='del'>-err:</div><div class='del'>-	dio-&gt;op.error = ret;</div><div class='del'>-</div><div class='del'>-	bio_release_pages(bio, false);</div><div class='del'>-</div><div class='del'>-	bch2_quota_reservation_put(c, inode, &amp;dio-&gt;quota_res);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline __cold void bch2_dio_write_continue(struct dio_write *dio)</div><div class='del'>-{</div><div class='del'>-	struct mm_struct *mm = dio-&gt;mm;</div><div class='del'>-</div><div class='del'>-	bio_reset(&amp;dio-&gt;op.wbio.bio, NULL, REQ_OP_WRITE);</div><div class='del'>-</div><div class='del'>-	if (mm)</div><div class='del'>-		kthread_use_mm(mm);</div><div class='del'>-	bch2_dio_write_loop(dio);</div><div class='del'>-	if (mm)</div><div class='del'>-		kthread_unuse_mm(mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dio_write_loop_async(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct dio_write *dio = container_of(op, struct dio_write, op);</div><div class='del'>-</div><div class='del'>-	bch2_dio_write_end(dio);</div><div class='del'>-</div><div class='del'>-	if (likely(!dio-&gt;iter.count) || dio-&gt;op.error)</div><div class='del'>-		bch2_dio_write_done(dio);</div><div class='del'>-	else</div><div class='del'>-		bch2_dio_write_continue(dio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t bch2_direct_write(struct kiocb *req, struct iov_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct file *file = req-&gt;ki_filp;</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct dio_write *dio;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	bool locked = true, extending;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	prefetch(&amp;c-&gt;opts);</div><div class='del'>-	prefetch((void *) &amp;c-&gt;opts + 64);</div><div class='del'>-	prefetch(&amp;inode-&gt;ei_inode);</div><div class='del'>-	prefetch((void *) &amp;inode-&gt;ei_inode + 64);</div><div class='del'>-</div><div class='del'>-	inode_lock(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	ret = generic_write_checks(req, iter);</div><div class='del'>-	if (unlikely(ret &lt;= 0))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = file_remove_privs(file);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = file_update_time(file);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (unlikely((req-&gt;ki_pos|iter-&gt;count) &amp; (block_bytes(c) - 1)))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	inode_dio_begin(&amp;inode-&gt;v);</div><div class='del'>-	bch2_pagecache_block_get(inode);</div><div class='del'>-</div><div class='del'>-	extending = req-&gt;ki_pos + iter-&gt;count &gt; inode-&gt;v.i_size;</div><div class='del'>-	if (!extending) {</div><div class='del'>-		inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-		locked = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(NULL,</div><div class='del'>-			       bio_iov_vecs_to_alloc(iter, BIO_MAX_VECS),</div><div class='del'>-			       REQ_OP_WRITE,</div><div class='del'>-			       GFP_KERNEL,</div><div class='del'>-			       &amp;c-&gt;dio_write_bioset);</div><div class='del'>-	dio = container_of(bio, struct dio_write, op.wbio.bio);</div><div class='del'>-	dio-&gt;req		= req;</div><div class='del'>-	dio-&gt;mapping		= mapping;</div><div class='del'>-	dio-&gt;inode		= inode;</div><div class='del'>-	dio-&gt;mm			= current-&gt;mm;</div><div class='del'>-	dio-&gt;iov		= NULL;</div><div class='del'>-	dio-&gt;loop		= false;</div><div class='del'>-	dio-&gt;extending		= extending;</div><div class='del'>-	dio-&gt;sync		= is_sync_kiocb(req) || extending;</div><div class='del'>-	dio-&gt;flush		= iocb_is_dsync(req) &amp;&amp; !c-&gt;opts.journal_flush_disabled;</div><div class='del'>-	dio-&gt;quota_res.sectors	= 0;</div><div class='del'>-	dio-&gt;written		= 0;</div><div class='del'>-	dio-&gt;iter		= *iter;</div><div class='del'>-	dio-&gt;op.c		= c;</div><div class='del'>-</div><div class='del'>-	if (unlikely(mapping-&gt;nrpages)) {</div><div class='del'>-		ret = bch2_write_invalidate_inode_pages_range(mapping,</div><div class='del'>-						req-&gt;ki_pos,</div><div class='del'>-						req-&gt;ki_pos + iter-&gt;count - 1);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto err_put_bio;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_dio_write_loop(dio);</div><div class='del'>-err:</div><div class='del'>-	if (locked)</div><div class='del'>-		inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-	return ret;</div><div class='del'>-err_put_bio:</div><div class='del'>-	bch2_pagecache_block_put(inode);</div><div class='del'>-	bio_put(bio);</div><div class='del'>-	inode_dio_end(&amp;inode-&gt;v);</div><div class='del'>-	goto err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_fs_io_direct_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bioset_exit(&amp;c-&gt;dio_write_bioset);</div><div class='del'>-	bioset_exit(&amp;c-&gt;dio_read_bioset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_fs_io_direct_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bioset_init(&amp;c-&gt;dio_read_bioset,</div><div class='del'>-			4, offsetof(struct dio_read, rbio.bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		return -BCH_ERR_ENOMEM_dio_read_bioset_init;</div><div class='del'>-</div><div class='del'>-	if (bioset_init(&amp;c-&gt;dio_write_bioset,</div><div class='del'>-			4, offsetof(struct dio_write, op.wbio.bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		return -BCH_ERR_ENOMEM_dio_write_bioset_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/fs-io-direct.h b/fs/bcachefs/fs-io-direct.h<br/>deleted file mode 100644<br/>index 814621ec7f81..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io-direct.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-direct.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_IO_DIRECT_H</div><div class='del'>-#define _BCACHEFS_FS_IO_DIRECT_H</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-ssize_t bch2_direct_write(struct kiocb *, struct iov_iter *);</div><div class='del'>-ssize_t bch2_read_iter(struct kiocb *, struct iov_iter *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_fs_io_direct_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_fs_io_direct_init(struct bch_fs *);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_fs_fs_io_direct_exit(struct bch_fs *c) {}</div><div class='del'>-static inline int bch2_fs_fs_io_direct_init(struct bch_fs *c) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_IO_DIRECT_H */</div><div class='head'>diff --git a/fs/bcachefs/fs-io-pagecache.c b/fs/bcachefs/fs-io-pagecache.c<br/>deleted file mode 100644<br/>index d359aa9b33b8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io-pagecache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-pagecache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,802 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "fs-io.h"</div><div class='del'>-#include "fs-io-pagecache.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pagevec.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-</div><div class='del'>-int bch2_filemap_get_contig_folios_d(struct address_space *mapping,</div><div class='del'>-				     loff_t start, u64 end,</div><div class='del'>-				     fgf_t fgp_flags, gfp_t gfp,</div><div class='del'>-				     folios *fs)</div><div class='del'>-{</div><div class='del'>-	struct folio *f;</div><div class='del'>-	u64 pos = start;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	while (pos &lt; end) {</div><div class='del'>-		if ((u64) pos &gt;= (u64) start + (1ULL &lt;&lt; 20))</div><div class='del'>-			fgp_flags &amp;= ~FGP_CREAT;</div><div class='del'>-</div><div class='del'>-		ret = darray_make_room_gfp(fs, 1, gfp &amp; GFP_KERNEL);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		f = __filemap_get_folio(mapping, pos &gt;&gt; PAGE_SHIFT, fgp_flags, gfp);</div><div class='del'>-		if (IS_ERR_OR_NULL(f))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		BUG_ON(fs-&gt;nr &amp;&amp; folio_pos(f) != pos);</div><div class='del'>-</div><div class='del'>-		pos = folio_end_pos(f);</div><div class='del'>-		darray_push(fs, f);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!fs-&gt;nr &amp;&amp; !ret &amp;&amp; (fgp_flags &amp; FGP_CREAT))</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return fs-&gt;nr ? 0 : ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pagecache_block must be held */</div><div class='del'>-int bch2_write_invalidate_inode_pages_range(struct address_space *mapping,</div><div class='del'>-					    loff_t start, loff_t end)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: the way this is currently implemented, we can spin if a process</div><div class='del'>-	 * is continually redirtying a specific page</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		if (!mapping-&gt;nrpages)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		ret = filemap_write_and_wait_range(mapping, start, end);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!mapping-&gt;nrpages)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		ret = invalidate_inode_pages2_range(mapping,</div><div class='del'>-				start &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				end &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	} while (ret == -EBUSY);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Useful for debug tracing: */</div><div class='del'>-static const char * const bch2_folio_sector_states[] = {</div><div class='del'>-#define x(n)	#n,</div><div class='del'>-	BCH_FOLIO_SECTOR_STATE()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline enum bch_folio_sector_state</div><div class='del'>-folio_sector_dirty(enum bch_folio_sector_state state)</div><div class='del'>-{</div><div class='del'>-	switch (state) {</div><div class='del'>-	case SECTOR_unallocated:</div><div class='del'>-		return SECTOR_dirty;</div><div class='del'>-	case SECTOR_reserved:</div><div class='del'>-		return SECTOR_dirty_reserved;</div><div class='del'>-	default:</div><div class='del'>-		return state;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_folio_sector_state</div><div class='del'>-folio_sector_undirty(enum bch_folio_sector_state state)</div><div class='del'>-{</div><div class='del'>-	switch (state) {</div><div class='del'>-	case SECTOR_dirty:</div><div class='del'>-		return SECTOR_unallocated;</div><div class='del'>-	case SECTOR_dirty_reserved:</div><div class='del'>-		return SECTOR_reserved;</div><div class='del'>-	default:</div><div class='del'>-		return state;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline enum bch_folio_sector_state</div><div class='del'>-folio_sector_reserve(enum bch_folio_sector_state state)</div><div class='del'>-{</div><div class='del'>-	switch (state) {</div><div class='del'>-	case SECTOR_unallocated:</div><div class='del'>-		return SECTOR_reserved;</div><div class='del'>-	case SECTOR_dirty:</div><div class='del'>-		return SECTOR_dirty_reserved;</div><div class='del'>-	default:</div><div class='del'>-		return state;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for newly allocated folios: */</div><div class='del'>-struct bch_folio *__bch2_folio_create(struct folio *folio, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct bch_folio *s;</div><div class='del'>-</div><div class='del'>-	s = kzalloc(sizeof(*s) +</div><div class='del'>-		    sizeof(struct bch_folio_sector) *</div><div class='del'>-		    folio_sectors(folio), gfp);</div><div class='del'>-	if (!s)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;s-&gt;lock);</div><div class='del'>-	folio_attach_private(folio, s);</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_folio *bch2_folio_create(struct folio *folio, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	return bch2_folio(folio) ?: __bch2_folio_create(folio, gfp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bkey_to_sector_state(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	if (bkey_extent_is_reservation(k))</div><div class='del'>-		return SECTOR_reserved;</div><div class='del'>-	if (bkey_extent_is_allocation(k.k))</div><div class='del'>-		return SECTOR_allocated;</div><div class='del'>-	return SECTOR_unallocated;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_folio_set(struct folio *folio,</div><div class='del'>-			     unsigned pg_offset, unsigned pg_len,</div><div class='del'>-			     unsigned nr_ptrs, unsigned state)</div><div class='del'>-{</div><div class='del'>-	struct bch_folio *s = bch2_folio(folio);</div><div class='del'>-	unsigned i, sectors = folio_sectors(folio);</div><div class='del'>-</div><div class='del'>-	BUG_ON(pg_offset &gt;= sectors);</div><div class='del'>-	BUG_ON(pg_offset + pg_len &gt; sectors);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for (i = pg_offset; i &lt; pg_offset + pg_len; i++) {</div><div class='del'>-		s-&gt;s[i].nr_replicas	= nr_ptrs;</div><div class='del'>-		bch2_folio_sector_set(folio, s, i, state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == sectors)</div><div class='del'>-		s-&gt;uptodate = true;</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize bch_folio state (allocated/unallocated, nr_replicas) from the</div><div class='del'>- * extents btree:</div><div class='del'>- */</div><div class='del'>-int bch2_folio_set(struct bch_fs *c, subvol_inum inum,</div><div class='del'>-		   struct folio **fs, unsigned nr_folios)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bch_folio *s;</div><div class='del'>-	u64 offset = folio_sector(fs[0]);</div><div class='del'>-	unsigned folio_idx;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	bool need_set = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (folio_idx = 0; folio_idx &lt; nr_folios; folio_idx++) {</div><div class='del'>-		s = bch2_folio_create(fs[folio_idx], GFP_KERNEL);</div><div class='del'>-		if (!s)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		need_set |= !s-&gt;uptodate;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!need_set)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	folio_idx = 0;</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_extents,</div><div class='del'>-			   SPOS(inum.inum, offset, snapshot),</div><div class='del'>-			   BTREE_ITER_SLOTS, k, ret) {</div><div class='del'>-		unsigned nr_ptrs = bch2_bkey_nr_ptrs_fully_allocated(k);</div><div class='del'>-		unsigned state = bkey_to_sector_state(k);</div><div class='del'>-</div><div class='del'>-		while (folio_idx &lt; nr_folios) {</div><div class='del'>-			struct folio *folio = fs[folio_idx];</div><div class='del'>-			u64 folio_start	= folio_sector(folio);</div><div class='del'>-			u64 folio_end	= folio_end_sector(folio);</div><div class='del'>-			unsigned folio_offset = max(bkey_start_offset(k.k), folio_start) -</div><div class='del'>-				folio_start;</div><div class='del'>-			unsigned folio_len = min(k.k-&gt;p.offset, folio_end) -</div><div class='del'>-				folio_offset - folio_start;</div><div class='del'>-</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset &lt; folio_start);</div><div class='del'>-			BUG_ON(bkey_start_offset(k.k) &gt; folio_end);</div><div class='del'>-</div><div class='del'>-			if (!bch2_folio(folio)-&gt;uptodate)</div><div class='del'>-				__bch2_folio_set(folio, folio_offset, folio_len, nr_ptrs, state);</div><div class='del'>-</div><div class='del'>-			if (k.k-&gt;p.offset &lt; folio_end)</div><div class='del'>-				break;</div><div class='del'>-			folio_idx++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (folio_idx == nr_folios)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	offset = iter.pos.offset;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bio_page_state_set(struct bio *bio, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-	struct folio_vec fv;</div><div class='del'>-	unsigned nr_ptrs = k.k-&gt;type == KEY_TYPE_reflink_v</div><div class='del'>-		? 0 : bch2_bkey_nr_ptrs_fully_allocated(k);</div><div class='del'>-	unsigned state = bkey_to_sector_state(k);</div><div class='del'>-</div><div class='del'>-	bio_for_each_folio(fv, bio, iter)</div><div class='del'>-		__bch2_folio_set(fv.fv_folio,</div><div class='del'>-				 fv.fv_offset &gt;&gt; 9,</div><div class='del'>-				 fv.fv_len &gt;&gt; 9,</div><div class='del'>-				 nr_ptrs, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_mark_pagecache_unallocated(struct bch_inode_info *inode,</div><div class='del'>-				     u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	pgoff_t index = start &gt;&gt; PAGE_SECTORS_SHIFT;</div><div class='del'>-	pgoff_t end_index = (end - 1) &gt;&gt; PAGE_SECTORS_SHIFT;</div><div class='del'>-	struct folio_batch fbatch;</div><div class='del'>-	unsigned i, j;</div><div class='del'>-</div><div class='del'>-	if (end &lt;= start)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	folio_batch_init(&amp;fbatch);</div><div class='del'>-</div><div class='del'>-	while (filemap_get_folios(inode-&gt;v.i_mapping,</div><div class='del'>-				  &amp;index, end_index, &amp;fbatch)) {</div><div class='del'>-		for (i = 0; i &lt; folio_batch_count(&amp;fbatch); i++) {</div><div class='del'>-			struct folio *folio = fbatch.folios[i];</div><div class='del'>-			u64 folio_start = folio_sector(folio);</div><div class='del'>-			u64 folio_end = folio_end_sector(folio);</div><div class='del'>-			unsigned folio_offset = max(start, folio_start) - folio_start;</div><div class='del'>-			unsigned folio_len = min(end, folio_end) - folio_offset - folio_start;</div><div class='del'>-			struct bch_folio *s;</div><div class='del'>-</div><div class='del'>-			BUG_ON(end &lt;= folio_start);</div><div class='del'>-</div><div class='del'>-			folio_lock(folio);</div><div class='del'>-			s = bch2_folio(folio);</div><div class='del'>-</div><div class='del'>-			if (s) {</div><div class='del'>-				spin_lock(&amp;s-&gt;lock);</div><div class='del'>-				for (j = folio_offset; j &lt; folio_offset + folio_len; j++)</div><div class='del'>-					s-&gt;s[j].nr_replicas = 0;</div><div class='del'>-				spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-		}</div><div class='del'>-		folio_batch_release(&amp;fbatch);</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_mark_pagecache_reserved(struct bch_inode_info *inode,</div><div class='del'>-				 u64 *start, u64 end,</div><div class='del'>-				 bool nonblocking)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	pgoff_t index = *start &gt;&gt; PAGE_SECTORS_SHIFT;</div><div class='del'>-	pgoff_t end_index = (end - 1) &gt;&gt; PAGE_SECTORS_SHIFT;</div><div class='del'>-	struct folio_batch fbatch;</div><div class='del'>-	s64 i_sectors_delta = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (end &lt;= *start)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	folio_batch_init(&amp;fbatch);</div><div class='del'>-</div><div class='del'>-	while (filemap_get_folios(inode-&gt;v.i_mapping,</div><div class='del'>-				  &amp;index, end_index, &amp;fbatch)) {</div><div class='del'>-		for (unsigned i = 0; i &lt; folio_batch_count(&amp;fbatch); i++) {</div><div class='del'>-			struct folio *folio = fbatch.folios[i];</div><div class='del'>-</div><div class='del'>-			if (!nonblocking)</div><div class='del'>-				folio_lock(folio);</div><div class='del'>-			else if (!folio_trylock(folio)) {</div><div class='del'>-				folio_batch_release(&amp;fbatch);</div><div class='del'>-				ret = -EAGAIN;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			u64 folio_start = folio_sector(folio);</div><div class='del'>-			u64 folio_end = folio_end_sector(folio);</div><div class='del'>-</div><div class='del'>-			BUG_ON(end &lt;= folio_start);</div><div class='del'>-</div><div class='del'>-			*start = min(end, folio_end);</div><div class='del'>-</div><div class='del'>-			struct bch_folio *s = bch2_folio(folio);</div><div class='del'>-			if (s) {</div><div class='del'>-				unsigned folio_offset = max(*start, folio_start) - folio_start;</div><div class='del'>-				unsigned folio_len = min(end, folio_end) - folio_offset - folio_start;</div><div class='del'>-</div><div class='del'>-				spin_lock(&amp;s-&gt;lock);</div><div class='del'>-				for (unsigned j = folio_offset; j &lt; folio_offset + folio_len; j++) {</div><div class='del'>-					i_sectors_delta -= s-&gt;s[j].state == SECTOR_dirty;</div><div class='del'>-					bch2_folio_sector_set(folio, s, j,</div><div class='del'>-						folio_sector_reserve(s-&gt;s[j].state));</div><div class='del'>-				}</div><div class='del'>-				spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-		}</div><div class='del'>-		folio_batch_release(&amp;fbatch);</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_i_sectors_acct(c, inode, NULL, i_sectors_delta);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned sectors_to_reserve(struct bch_folio_sector *s,</div><div class='del'>-					  unsigned nr_replicas)</div><div class='del'>-{</div><div class='del'>-	return max(0, (int) nr_replicas -</div><div class='del'>-		   s-&gt;nr_replicas -</div><div class='del'>-		   s-&gt;replicas_reserved);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_get_folio_disk_reservation(struct bch_fs *c,</div><div class='del'>-				struct bch_inode_info *inode,</div><div class='del'>-				struct folio *folio, bool check_enospc)</div><div class='del'>-{</div><div class='del'>-	struct bch_folio *s = bch2_folio_create(folio, 0);</div><div class='del'>-	unsigned nr_replicas = inode_nr_replicas(c, inode);</div><div class='del'>-	struct disk_reservation disk_res = { 0 };</div><div class='del'>-	unsigned i, sectors = folio_sectors(folio), disk_res_sectors = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!s)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sectors; i++)</div><div class='del'>-		disk_res_sectors += sectors_to_reserve(&amp;s-&gt;s[i], nr_replicas);</div><div class='del'>-</div><div class='del'>-	if (!disk_res_sectors)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_disk_reservation_get(c, &amp;disk_res,</div><div class='del'>-					disk_res_sectors, 1,</div><div class='del'>-					!check_enospc</div><div class='del'>-					? BCH_DISK_RESERVATION_NOFAIL</div><div class='del'>-					: 0);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sectors; i++)</div><div class='del'>-		s-&gt;s[i].replicas_reserved +=</div><div class='del'>-			sectors_to_reserve(&amp;s-&gt;s[i], nr_replicas);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_folio_reservation_put(struct bch_fs *c,</div><div class='del'>-			struct bch_inode_info *inode,</div><div class='del'>-			struct bch2_folio_reservation *res)</div><div class='del'>-{</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;res-&gt;disk);</div><div class='del'>-	bch2_quota_reservation_put(c, inode, &amp;res-&gt;quota);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_folio_reservation_get(struct bch_fs *c,</div><div class='del'>-			struct bch_inode_info *inode,</div><div class='del'>-			struct folio *folio,</div><div class='del'>-			struct bch2_folio_reservation *res,</div><div class='del'>-			unsigned offset, unsigned len)</div><div class='del'>-{</div><div class='del'>-	struct bch_folio *s = bch2_folio_create(folio, 0);</div><div class='del'>-	unsigned i, disk_sectors = 0, quota_sectors = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!s)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!s-&gt;uptodate);</div><div class='del'>-</div><div class='del'>-	for (i = round_down(offset, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-	     i &lt; round_up(offset + len, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-	     i++) {</div><div class='del'>-		disk_sectors += sectors_to_reserve(&amp;s-&gt;s[i],</div><div class='del'>-						res-&gt;disk.nr_replicas);</div><div class='del'>-		quota_sectors += s-&gt;s[i].state == SECTOR_unallocated;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (disk_sectors) {</div><div class='del'>-		ret = bch2_disk_reservation_add(c, &amp;res-&gt;disk, disk_sectors, 0);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (quota_sectors) {</div><div class='del'>-		ret = bch2_quota_reservation_add(c, inode, &amp;res-&gt;quota,</div><div class='del'>-						 quota_sectors, true);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			struct disk_reservation tmp = {</div><div class='del'>-				.sectors = disk_sectors</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			bch2_disk_reservation_put(c, &amp;tmp);</div><div class='del'>-			res-&gt;disk.sectors -= disk_sectors;</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_clear_folio_bits(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(folio-&gt;mapping-&gt;host);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_folio *s = bch2_folio(folio);</div><div class='del'>-	struct disk_reservation disk_res = { 0 };</div><div class='del'>-	int i, sectors = folio_sectors(folio), dirty_sectors = 0;</div><div class='del'>-</div><div class='del'>-	if (!s)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!folio_test_locked(folio));</div><div class='del'>-	EBUG_ON(folio_test_writeback(folio));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sectors; i++) {</div><div class='del'>-		disk_res.sectors += s-&gt;s[i].replicas_reserved;</div><div class='del'>-		s-&gt;s[i].replicas_reserved = 0;</div><div class='del'>-</div><div class='del'>-		dirty_sectors -= s-&gt;s[i].state == SECTOR_dirty;</div><div class='del'>-		bch2_folio_sector_set(folio, s, i, folio_sector_undirty(s-&gt;s[i].state));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;disk_res);</div><div class='del'>-</div><div class='del'>-	bch2_i_sectors_acct(c, inode, NULL, dirty_sectors);</div><div class='del'>-</div><div class='del'>-	bch2_folio_release(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_set_folio_dirty(struct bch_fs *c,</div><div class='del'>-			  struct bch_inode_info *inode,</div><div class='del'>-			  struct folio *folio,</div><div class='del'>-			  struct bch2_folio_reservation *res,</div><div class='del'>-			  unsigned offset, unsigned len)</div><div class='del'>-{</div><div class='del'>-	struct bch_folio *s = bch2_folio(folio);</div><div class='del'>-	unsigned i, dirty_sectors = 0;</div><div class='del'>-</div><div class='del'>-	WARN_ON((u64) folio_pos(folio) + offset + len &gt;</div><div class='del'>-		round_up((u64) i_size_read(&amp;inode-&gt;v), block_bytes(c)));</div><div class='del'>-</div><div class='del'>-	BUG_ON(!s-&gt;uptodate);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for (i = round_down(offset, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-	     i &lt; round_up(offset + len, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-	     i++) {</div><div class='del'>-		unsigned sectors = sectors_to_reserve(&amp;s-&gt;s[i],</div><div class='del'>-						res-&gt;disk.nr_replicas);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This can happen if we race with the error path in</div><div class='del'>-		 * bch2_writepage_io_done():</div><div class='del'>-		 */</div><div class='del'>-		sectors = min_t(unsigned, sectors, res-&gt;disk.sectors);</div><div class='del'>-</div><div class='del'>-		s-&gt;s[i].replicas_reserved += sectors;</div><div class='del'>-		res-&gt;disk.sectors -= sectors;</div><div class='del'>-</div><div class='del'>-		dirty_sectors += s-&gt;s[i].state == SECTOR_unallocated;</div><div class='del'>-</div><div class='del'>-		bch2_folio_sector_set(folio, s, i, folio_sector_dirty(s-&gt;s[i].state));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	bch2_i_sectors_acct(c, inode, &amp;res-&gt;quota, dirty_sectors);</div><div class='del'>-</div><div class='del'>-	if (!folio_test_dirty(folio))</div><div class='del'>-		filemap_dirty_folio(inode-&gt;v.i_mapping, folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-vm_fault_t bch2_page_fault(struct vm_fault *vmf)</div><div class='del'>-{</div><div class='del'>-	struct file *file = vmf-&gt;vma-&gt;vm_file;</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct address_space *fdm = faults_disabled_mapping();</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	vm_fault_t ret;</div><div class='del'>-</div><div class='del'>-	if (fdm == mapping)</div><div class='del'>-		return VM_FAULT_SIGBUS;</div><div class='del'>-</div><div class='del'>-	/* Lock ordering: */</div><div class='del'>-	if (fdm &gt; mapping) {</div><div class='del'>-		struct bch_inode_info *fdm_host = to_bch_ei(fdm-&gt;host);</div><div class='del'>-</div><div class='del'>-		if (bch2_pagecache_add_tryget(inode))</div><div class='del'>-			goto got_lock;</div><div class='del'>-</div><div class='del'>-		bch2_pagecache_block_put(fdm_host);</div><div class='del'>-</div><div class='del'>-		bch2_pagecache_add_get(inode);</div><div class='del'>-		bch2_pagecache_add_put(inode);</div><div class='del'>-</div><div class='del'>-		bch2_pagecache_block_get(fdm_host);</div><div class='del'>-</div><div class='del'>-		/* Signal that lock has been dropped: */</div><div class='del'>-		set_fdm_dropped_locks();</div><div class='del'>-		return VM_FAULT_SIGBUS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_pagecache_add_get(inode);</div><div class='del'>-got_lock:</div><div class='del'>-	ret = filemap_fault(vmf);</div><div class='del'>-	bch2_pagecache_add_put(inode);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-vm_fault_t bch2_page_mkwrite(struct vm_fault *vmf)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='del'>-	struct file *file = vmf-&gt;vma-&gt;vm_file;</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch2_folio_reservation res;</div><div class='del'>-	unsigned len;</div><div class='del'>-	loff_t isize;</div><div class='del'>-	vm_fault_t ret;</div><div class='del'>-</div><div class='del'>-	bch2_folio_reservation_init(c, inode, &amp;res);</div><div class='del'>-</div><div class='del'>-	sb_start_pagefault(inode-&gt;v.i_sb);</div><div class='del'>-	file_update_time(file);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Not strictly necessary, but helps avoid dio writes livelocking in</div><div class='del'>-	 * bch2_write_invalidate_inode_pages_range() - can drop this if/when we get</div><div class='del'>-	 * a bch2_write_invalidate_inode_pages_range() that works without dropping</div><div class='del'>-	 * page lock before invalidating page</div><div class='del'>-	 */</div><div class='del'>-	bch2_pagecache_add_get(inode);</div><div class='del'>-</div><div class='del'>-	folio_lock(folio);</div><div class='del'>-	isize = i_size_read(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	if (folio-&gt;mapping != mapping || folio_pos(folio) &gt;= isize) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		ret = VM_FAULT_NOPAGE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = min_t(loff_t, folio_size(folio), isize - folio_pos(folio));</div><div class='del'>-</div><div class='del'>-	if (bch2_folio_set(c, inode_inum(inode), &amp;folio, 1) ?:</div><div class='del'>-	    bch2_folio_reservation_get(c, inode, folio, &amp;res, 0, len)) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		ret = VM_FAULT_SIGBUS;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_set_folio_dirty(c, inode, folio, &amp;res, 0, len);</div><div class='del'>-	bch2_folio_reservation_put(c, inode, &amp;res);</div><div class='del'>-</div><div class='del'>-	folio_wait_stable(folio);</div><div class='del'>-	ret = VM_FAULT_LOCKED;</div><div class='del'>-out:</div><div class='del'>-	bch2_pagecache_add_put(inode);</div><div class='del'>-	sb_end_pagefault(inode-&gt;v.i_sb);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_invalidate_folio(struct folio *folio, size_t offset, size_t length)</div><div class='del'>-{</div><div class='del'>-	if (offset || length &lt; folio_size(folio))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bch2_clear_folio_bits(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_release_folio(struct folio *folio, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	if (folio_test_dirty(folio) || folio_test_writeback(folio))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	bch2_clear_folio_bits(folio);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fseek: */</div><div class='del'>-</div><div class='del'>-static int folio_data_offset(struct folio *folio, loff_t pos,</div><div class='del'>-			     unsigned min_replicas)</div><div class='del'>-{</div><div class='del'>-	struct bch_folio *s = bch2_folio(folio);</div><div class='del'>-	unsigned i, sectors = folio_sectors(folio);</div><div class='del'>-</div><div class='del'>-	if (s)</div><div class='del'>-		for (i = folio_pos_to_s(folio, pos); i &lt; sectors; i++)</div><div class='del'>-			if (s-&gt;s[i].state &gt;= SECTOR_dirty &amp;&amp;</div><div class='del'>-			    s-&gt;s[i].nr_replicas + s-&gt;s[i].replicas_reserved &gt;= min_replicas)</div><div class='del'>-				return i &lt;&lt; SECTOR_SHIFT;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-loff_t bch2_seek_pagecache_data(struct inode *vinode,</div><div class='del'>-				loff_t start_offset,</div><div class='del'>-				loff_t end_offset,</div><div class='del'>-				unsigned min_replicas,</div><div class='del'>-				bool nonblock)</div><div class='del'>-{</div><div class='del'>-	struct folio_batch fbatch;</div><div class='del'>-	pgoff_t start_index	= start_offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t end_index	= end_offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t index		= start_index;</div><div class='del'>-	unsigned i;</div><div class='del'>-	loff_t ret;</div><div class='del'>-	int offset;</div><div class='del'>-</div><div class='del'>-	folio_batch_init(&amp;fbatch);</div><div class='del'>-</div><div class='del'>-	while (filemap_get_folios(vinode-&gt;i_mapping,</div><div class='del'>-				  &amp;index, end_index, &amp;fbatch)) {</div><div class='del'>-		for (i = 0; i &lt; folio_batch_count(&amp;fbatch); i++) {</div><div class='del'>-			struct folio *folio = fbatch.folios[i];</div><div class='del'>-</div><div class='del'>-			if (!nonblock) {</div><div class='del'>-				folio_lock(folio);</div><div class='del'>-			} else if (!folio_trylock(folio)) {</div><div class='del'>-				folio_batch_release(&amp;fbatch);</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			offset = folio_data_offset(folio,</div><div class='del'>-					max(folio_pos(folio), start_offset),</div><div class='del'>-					min_replicas);</div><div class='del'>-			if (offset &gt;= 0) {</div><div class='del'>-				ret = clamp(folio_pos(folio) + offset,</div><div class='del'>-					    start_offset, end_offset);</div><div class='del'>-				folio_unlock(folio);</div><div class='del'>-				folio_batch_release(&amp;fbatch);</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-		}</div><div class='del'>-		folio_batch_release(&amp;fbatch);</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return end_offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Search for a hole in a folio.</div><div class='del'>- *</div><div class='del'>- * The filemap layer returns -ENOENT if no folio exists, so reuse the same error</div><div class='del'>- * code to indicate a pagecache hole exists at the returned offset. Otherwise</div><div class='del'>- * return 0 if the folio is filled with data, or an error code. This function</div><div class='del'>- * can return -EAGAIN if nonblock is specified.</div><div class='del'>- */</div><div class='del'>-static int folio_hole_offset(struct address_space *mapping, loff_t *offset,</div><div class='del'>-			      unsigned min_replicas, bool nonblock)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	struct bch_folio *s;</div><div class='del'>-	unsigned i, sectors;</div><div class='del'>-	int ret = -ENOENT;</div><div class='del'>-</div><div class='del'>-	folio = __filemap_get_folio(mapping, *offset &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				    FGP_LOCK|(nonblock ? FGP_NOWAIT : 0), 0);</div><div class='del'>-	if (IS_ERR(folio))</div><div class='del'>-		return PTR_ERR(folio);</div><div class='del'>-</div><div class='del'>-	s = bch2_folio(folio);</div><div class='del'>-	if (!s)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	sectors = folio_sectors(folio);</div><div class='del'>-	for (i = folio_pos_to_s(folio, *offset); i &lt; sectors; i++)</div><div class='del'>-		if (s-&gt;s[i].state &lt; SECTOR_dirty ||</div><div class='del'>-		    s-&gt;s[i].nr_replicas + s-&gt;s[i].replicas_reserved &lt; min_replicas) {</div><div class='del'>-			*offset = max(*offset,</div><div class='del'>-				      folio_pos(folio) + (i &lt;&lt; SECTOR_SHIFT));</div><div class='del'>-			goto unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	*offset = folio_end_pos(folio);</div><div class='del'>-	ret = 0;</div><div class='del'>-unlock:</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	folio_put(folio);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-loff_t bch2_seek_pagecache_hole(struct inode *vinode,</div><div class='del'>-				loff_t start_offset,</div><div class='del'>-				loff_t end_offset,</div><div class='del'>-				unsigned min_replicas,</div><div class='del'>-				bool nonblock)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = vinode-&gt;i_mapping;</div><div class='del'>-	loff_t offset = start_offset;</div><div class='del'>-	loff_t ret = 0;</div><div class='del'>-</div><div class='del'>-	while (!ret &amp;&amp; offset &lt; end_offset)</div><div class='del'>-		ret = folio_hole_offset(mapping, &amp;offset, min_replicas, nonblock);</div><div class='del'>-</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOENT)</div><div class='del'>-		return ret;</div><div class='del'>-	return min(offset, end_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_clamp_data_hole(struct inode *inode,</div><div class='del'>-			 u64 *hole_start,</div><div class='del'>-			 u64 *hole_end,</div><div class='del'>-			 unsigned min_replicas,</div><div class='del'>-			 bool nonblock)</div><div class='del'>-{</div><div class='del'>-	loff_t ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_seek_pagecache_hole(inode,</div><div class='del'>-		*hole_start &lt;&lt; 9, *hole_end &lt;&lt; 9, min_replicas, nonblock) &gt;&gt; 9;</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*hole_start = ret;</div><div class='del'>-</div><div class='del'>-	if (*hole_start == *hole_end)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_seek_pagecache_data(inode,</div><div class='del'>-		*hole_start &lt;&lt; 9, *hole_end &lt;&lt; 9, min_replicas, nonblock) &gt;&gt; 9;</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*hole_end = ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/fs-io-pagecache.h b/fs/bcachefs/fs-io-pagecache.h<br/>deleted file mode 100644<br/>index 8cbaba6565b4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io-pagecache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io-pagecache.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,176 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_IO_PAGECACHE_H</div><div class='del'>-#define _BCACHEFS_FS_IO_PAGECACHE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-</div><div class='del'>-typedef DARRAY(struct folio *) folios;</div><div class='del'>-</div><div class='del'>-int bch2_filemap_get_contig_folios_d(struct address_space *, loff_t,</div><div class='del'>-				     u64, fgf_t, gfp_t, folios *);</div><div class='del'>-int bch2_write_invalidate_inode_pages_range(struct address_space *, loff_t, loff_t);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use u64 for the end pos and sector helpers because if the folio covers the</div><div class='del'>- * max supported range of the mapping, the start offset of the next folio</div><div class='del'>- * overflows loff_t. This breaks much of the range based processing in the</div><div class='del'>- * buffered write path.</div><div class='del'>- */</div><div class='del'>-static inline u64 folio_end_pos(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_pos(folio) + folio_size(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t folio_sectors(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return PAGE_SECTORS &lt;&lt; folio_order(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t folio_sector(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_pos(folio) &gt;&gt; 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 folio_end_sector(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_end_pos(folio) &gt;&gt; 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_FOLIO_SECTOR_STATE()	\</div><div class='del'>-	x(unallocated)			\</div><div class='del'>-	x(reserved)			\</div><div class='del'>-	x(dirty)			\</div><div class='del'>-	x(dirty_reserved)		\</div><div class='del'>-	x(allocated)</div><div class='del'>-</div><div class='del'>-enum bch_folio_sector_state {</div><div class='del'>-#define x(n)	SECTOR_##n,</div><div class='del'>-	BCH_FOLIO_SECTOR_STATE()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_folio_sector {</div><div class='del'>-	/* Uncompressed, fully allocated replicas (or on disk reservation): */</div><div class='del'>-	unsigned		nr_replicas:4;</div><div class='del'>-</div><div class='del'>-	/* Owns PAGE_SECTORS * replicas_reserved sized in memory reservation: */</div><div class='del'>-	unsigned		replicas_reserved:4;</div><div class='del'>-</div><div class='del'>-	/* i_sectors: */</div><div class='del'>-	enum bch_folio_sector_state state:8;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_folio {</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	atomic_t		write_count;</div><div class='del'>-	/*</div><div class='del'>-	 * Is the sector state up to date with the btree?</div><div class='del'>-	 * (Not the data itself)</div><div class='del'>-	 */</div><div class='del'>-	bool			uptodate;</div><div class='del'>-	struct bch_folio_sector	s[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Helper for when we need to add debug instrumentation: */</div><div class='del'>-static inline void bch2_folio_sector_set(struct folio *folio,</div><div class='del'>-			     struct bch_folio *s,</div><div class='del'>-			     unsigned i, unsigned n)</div><div class='del'>-{</div><div class='del'>-	s-&gt;s[i].state = n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* file offset (to folio offset) to bch_folio_sector index */</div><div class='del'>-static inline int folio_pos_to_s(struct folio *folio, loff_t pos)</div><div class='del'>-{</div><div class='del'>-	u64 f_offset = pos - folio_pos(folio);</div><div class='del'>-</div><div class='del'>-	BUG_ON(pos &lt; folio_pos(folio) || pos &gt;= folio_end_pos(folio));</div><div class='del'>-	return f_offset &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for newly allocated folios: */</div><div class='del'>-static inline void __bch2_folio_release(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	kfree(folio_detach_private(folio));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_folio_release(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!folio_test_locked(folio));</div><div class='del'>-	__bch2_folio_release(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_folio *__bch2_folio(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_has_private(folio)</div><div class='del'>-		? (struct bch_folio *) folio_get_private(folio)</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_folio *bch2_folio(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!folio_test_locked(folio));</div><div class='del'>-</div><div class='del'>-	return __bch2_folio(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_folio *__bch2_folio_create(struct folio *, gfp_t);</div><div class='del'>-struct bch_folio *bch2_folio_create(struct folio *, gfp_t);</div><div class='del'>-</div><div class='del'>-struct bch2_folio_reservation {</div><div class='del'>-	struct disk_reservation	disk;</div><div class='del'>-	struct quota_res	quota;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline unsigned inode_nr_replicas(struct bch_fs *c, struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	/* XXX: this should not be open coded */</div><div class='del'>-	return inode-&gt;ei_inode.bi_data_replicas</div><div class='del'>-		? inode-&gt;ei_inode.bi_data_replicas - 1</div><div class='del'>-		: c-&gt;opts.data_replicas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_folio_reservation_init(struct bch_fs *c,</div><div class='del'>-			struct bch_inode_info *inode,</div><div class='del'>-			struct bch2_folio_reservation *res)</div><div class='del'>-{</div><div class='del'>-	memset(res, 0, sizeof(*res));</div><div class='del'>-</div><div class='del'>-	res-&gt;disk.nr_replicas = inode_nr_replicas(c, inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_folio_set(struct bch_fs *, subvol_inum, struct folio **, unsigned);</div><div class='del'>-void bch2_bio_page_state_set(struct bio *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-void bch2_mark_pagecache_unallocated(struct bch_inode_info *, u64, u64);</div><div class='del'>-int bch2_mark_pagecache_reserved(struct bch_inode_info *, u64 *, u64, bool);</div><div class='del'>-</div><div class='del'>-int bch2_get_folio_disk_reservation(struct bch_fs *,</div><div class='del'>-				struct bch_inode_info *,</div><div class='del'>-				struct folio *, bool);</div><div class='del'>-</div><div class='del'>-void bch2_folio_reservation_put(struct bch_fs *,</div><div class='del'>-			struct bch_inode_info *,</div><div class='del'>-			struct bch2_folio_reservation *);</div><div class='del'>-int bch2_folio_reservation_get(struct bch_fs *,</div><div class='del'>-			struct bch_inode_info *,</div><div class='del'>-			struct folio *,</div><div class='del'>-			struct bch2_folio_reservation *,</div><div class='del'>-			unsigned, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_set_folio_dirty(struct bch_fs *,</div><div class='del'>-			  struct bch_inode_info *,</div><div class='del'>-			  struct folio *,</div><div class='del'>-			  struct bch2_folio_reservation *,</div><div class='del'>-			  unsigned, unsigned);</div><div class='del'>-</div><div class='del'>-vm_fault_t bch2_page_fault(struct vm_fault *);</div><div class='del'>-vm_fault_t bch2_page_mkwrite(struct vm_fault *);</div><div class='del'>-void bch2_invalidate_folio(struct folio *, size_t, size_t);</div><div class='del'>-bool bch2_release_folio(struct folio *, gfp_t);</div><div class='del'>-</div><div class='del'>-loff_t bch2_seek_pagecache_data(struct inode *, loff_t, loff_t, unsigned, bool);</div><div class='del'>-loff_t bch2_seek_pagecache_hole(struct inode *, loff_t, loff_t, unsigned, bool);</div><div class='del'>-int bch2_clamp_data_hole(struct inode *, u64 *, u64 *, unsigned, bool);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_IO_PAGECACHE_H */</div><div class='head'>diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c<br/>deleted file mode 100644<br/>index dc52918d06ef..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1081 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "extent_update.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "fs-io.h"</div><div class='del'>-#include "fs-io-buffered.h"</div><div class='del'>-#include "fs-io-pagecache.h"</div><div class='del'>-#include "fsck.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "io_misc.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "reflink.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/aio.h&gt;</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/falloc.h&gt;</div><div class='del'>-#include &lt;linux/migrate.h&gt;</div><div class='del'>-#include &lt;linux/mmu_context.h&gt;</div><div class='del'>-#include &lt;linux/pagevec.h&gt;</div><div class='del'>-#include &lt;linux/rmap.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;trace/events/writeback.h&gt;</div><div class='del'>-</div><div class='del'>-struct nocow_flush {</div><div class='del'>-	struct closure	*cl;</div><div class='del'>-	struct bch_dev	*ca;</div><div class='del'>-	struct bio	bio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void nocow_flush_endio(struct bio *_bio)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct nocow_flush *bio = container_of(_bio, struct nocow_flush, bio);</div><div class='del'>-</div><div class='del'>-	closure_put(bio-&gt;cl);</div><div class='del'>-	percpu_ref_put(&amp;bio-&gt;ca-&gt;io_ref);</div><div class='del'>-	bio_put(&amp;bio-&gt;bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_flush_nocow_writes_async(struct bch_fs *c,</div><div class='del'>-					 struct bch_inode_info *inode,</div><div class='del'>-					 struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct nocow_flush *bio;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct bch_devs_mask devs;</div><div class='del'>-	unsigned dev;</div><div class='del'>-</div><div class='del'>-	dev = find_first_bit(inode-&gt;ei_devs_need_flush.d, BCH_SB_MEMBERS_MAX);</div><div class='del'>-	if (dev == BCH_SB_MEMBERS_MAX)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	devs = inode-&gt;ei_devs_need_flush;</div><div class='del'>-	memset(&amp;inode-&gt;ei_devs_need_flush, 0, sizeof(inode-&gt;ei_devs_need_flush));</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(dev, devs.d, BCH_SB_MEMBERS_MAX) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ca = rcu_dereference(c-&gt;devs[dev]);</div><div class='del'>-		if (ca &amp;&amp; !percpu_ref_tryget(&amp;ca-&gt;io_ref))</div><div class='del'>-			ca = NULL;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		if (!ca)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bio = container_of(bio_alloc_bioset(ca-&gt;disk_sb.bdev, 0,</div><div class='del'>-						    REQ_OP_FLUSH,</div><div class='del'>-						    GFP_KERNEL,</div><div class='del'>-						    &amp;c-&gt;nocow_flush_bioset),</div><div class='del'>-				   struct nocow_flush, bio);</div><div class='del'>-		bio-&gt;cl			= cl;</div><div class='del'>-		bio-&gt;ca			= ca;</div><div class='del'>-		bio-&gt;bio.bi_end_io	= nocow_flush_endio;</div><div class='del'>-		closure_bio_submit(&amp;bio-&gt;bio, cl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_inode_flush_nocow_writes(struct bch_fs *c,</div><div class='del'>-					 struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	struct closure cl;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-	bch2_inode_flush_nocow_writes_async(c, inode, &amp;cl);</div><div class='del'>-	closure_sync(&amp;cl);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* i_size updates: */</div><div class='del'>-</div><div class='del'>-struct inode_new_size {</div><div class='del'>-	loff_t		new_size;</div><div class='del'>-	u64		now;</div><div class='del'>-	unsigned	fields;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int inode_set_size(struct btree_trans *trans,</div><div class='del'>-			  struct bch_inode_info *inode,</div><div class='del'>-			  struct bch_inode_unpacked *bi,</div><div class='del'>-			  void *p)</div><div class='del'>-{</div><div class='del'>-	struct inode_new_size *s = p;</div><div class='del'>-</div><div class='del'>-	bi-&gt;bi_size = s-&gt;new_size;</div><div class='del'>-	if (s-&gt;fields &amp; ATTR_ATIME)</div><div class='del'>-		bi-&gt;bi_atime = s-&gt;now;</div><div class='del'>-	if (s-&gt;fields &amp; ATTR_MTIME)</div><div class='del'>-		bi-&gt;bi_mtime = s-&gt;now;</div><div class='del'>-	if (s-&gt;fields &amp; ATTR_CTIME)</div><div class='del'>-		bi-&gt;bi_ctime = s-&gt;now;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __must_check bch2_write_inode_size(struct bch_fs *c,</div><div class='del'>-				       struct bch_inode_info *inode,</div><div class='del'>-				       loff_t new_size, unsigned fields)</div><div class='del'>-{</div><div class='del'>-	struct inode_new_size s = {</div><div class='del'>-		.new_size	= new_size,</div><div class='del'>-		.now		= bch2_current_time(c),</div><div class='del'>-		.fields		= fields,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return bch2_write_inode(c, inode, inode_set_size, &amp;s, fields);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_i_sectors_acct(struct bch_fs *c, struct bch_inode_info *inode,</div><div class='del'>-			   struct quota_res *quota_res, s64 sectors)</div><div class='del'>-{</div><div class='del'>-	bch2_fs_inconsistent_on((s64) inode-&gt;v.i_blocks + sectors &lt; 0, c,</div><div class='del'>-				"inode %lu i_blocks underflow: %llu + %lli &lt; 0 (ondisk %lli)",</div><div class='del'>-				inode-&gt;v.i_ino, (u64) inode-&gt;v.i_blocks, sectors,</div><div class='del'>-				inode-&gt;ei_inode.bi_sectors);</div><div class='del'>-	inode-&gt;v.i_blocks += sectors;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_QUOTA</div><div class='del'>-	if (quota_res &amp;&amp;</div><div class='del'>-	    !test_bit(EI_INODE_SNAPSHOT, &amp;inode-&gt;ei_flags) &amp;&amp;</div><div class='del'>-	    sectors &gt; 0) {</div><div class='del'>-		BUG_ON(sectors &gt; quota_res-&gt;sectors);</div><div class='del'>-		BUG_ON(sectors &gt; inode-&gt;ei_quota_reserved);</div><div class='del'>-</div><div class='del'>-		quota_res-&gt;sectors -= sectors;</div><div class='del'>-		inode-&gt;ei_quota_reserved -= sectors;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_quota_acct(c, inode-&gt;ei_qid, Q_SPC, sectors, KEY_TYPE_QUOTA_WARN);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fsync: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inode-&gt;ei_inode.bi_journal_seq won't be up to date since it's set in an</div><div class='del'>- * insert trigger: look up the btree inode instead</div><div class='del'>- */</div><div class='del'>-static int bch2_flush_inode(struct bch_fs *c,</div><div class='del'>-			    struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.journal_flush_disabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_find_by_inum(c, inode_inum(inode), &amp;u);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return bch2_journal_flush_seq(&amp;c-&gt;journal, u.bi_journal_seq) ?:</div><div class='del'>-		bch2_inode_flush_nocow_writes(c, inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fsync(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = file_write_and_wait_range(file, start, end);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = sync_inode_metadata(&amp;inode-&gt;v, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = bch2_flush_inode(c, inode);</div><div class='del'>-out:</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* truncate: */</div><div class='del'>-</div><div class='del'>-static inline int range_has_data(struct bch_fs *c, u32 subvol,</div><div class='del'>-				 struct bpos start,</div><div class='del'>-				 struct bpos end)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, subvol, &amp;start.snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, iter, BTREE_ID_extents, start, end, 0, k, ret)</div><div class='del'>-		if (bkey_extent_is_data(k.k) &amp;&amp; !bkey_extent_is_unwritten(k)) {</div><div class='del'>-			ret = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	start = iter.pos;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_truncate_folio(struct bch_inode_info *inode,</div><div class='del'>-				 pgoff_t index, loff_t start, loff_t end)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct address_space *mapping = inode-&gt;v.i_mapping;</div><div class='del'>-	struct bch_folio *s;</div><div class='del'>-	unsigned start_offset;</div><div class='del'>-	unsigned end_offset;</div><div class='del'>-	unsigned i;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	s64 i_sectors_delta = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 end_pos;</div><div class='del'>-</div><div class='del'>-	folio = filemap_lock_folio(mapping, index);</div><div class='del'>-	if (IS_ERR_OR_NULL(folio)) {</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: we're doing two index lookups when we end up reading the</div><div class='del'>-		 * folio</div><div class='del'>-		 */</div><div class='del'>-		ret = range_has_data(c, inode-&gt;ei_subvol,</div><div class='del'>-				POS(inode-&gt;v.i_ino, (index &lt;&lt; PAGE_SECTORS_SHIFT)),</div><div class='del'>-				POS(inode-&gt;v.i_ino, (index &lt;&lt; PAGE_SECTORS_SHIFT) + PAGE_SECTORS));</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		folio = __filemap_get_folio(mapping, index,</div><div class='del'>-					    FGP_LOCK|FGP_CREAT, GFP_KERNEL);</div><div class='del'>-		if (IS_ERR_OR_NULL(folio)) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(start	&gt;= folio_end_pos(folio));</div><div class='del'>-	BUG_ON(end	&lt;= folio_pos(folio));</div><div class='del'>-</div><div class='del'>-	start_offset	= max(start, folio_pos(folio)) - folio_pos(folio);</div><div class='del'>-	end_offset	= min_t(u64, end, folio_end_pos(folio)) - folio_pos(folio);</div><div class='del'>-</div><div class='del'>-	/* Folio boundary? Nothing to do */</div><div class='del'>-	if (start_offset == 0 &amp;&amp;</div><div class='del'>-	    end_offset == folio_size(folio)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = bch2_folio_create(folio, 0);</div><div class='del'>-	if (!s) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!folio_test_uptodate(folio)) {</div><div class='del'>-		ret = bch2_read_single_folio(folio, mapping);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_folio_set(c, inode_inum(inode), &amp;folio, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	for (i = round_up(start_offset, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-	     i &lt; round_down(end_offset, block_bytes(c)) &gt;&gt; 9;</div><div class='del'>-	     i++) {</div><div class='del'>-		s-&gt;s[i].nr_replicas	= 0;</div><div class='del'>-</div><div class='del'>-		i_sectors_delta -= s-&gt;s[i].state == SECTOR_dirty;</div><div class='del'>-		bch2_folio_sector_set(folio, s, i, SECTOR_unallocated);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_i_sectors_acct(c, inode, NULL, i_sectors_delta);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Caller needs to know whether this folio will be written out by</div><div class='del'>-	 * writeback - doing an i_size update if necessary - or whether it will</div><div class='del'>-	 * be responsible for the i_size update.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that we shouldn't ever see a folio beyond EOF, but check and</div><div class='del'>-	 * warn if so. This has been observed by failure to clean up folios</div><div class='del'>-	 * after a short write and there's still a chance reclaim will fix</div><div class='del'>-	 * things up.</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON_ONCE(folio_pos(folio) &gt;= inode-&gt;v.i_size);</div><div class='del'>-	end_pos = folio_end_pos(folio);</div><div class='del'>-	if (inode-&gt;v.i_size &gt; folio_pos(folio))</div><div class='del'>-		end_pos = min_t(u64, inode-&gt;v.i_size, end_pos);</div><div class='del'>-	ret = s-&gt;s[folio_pos_to_s(folio, end_pos - 1)].state &gt;= SECTOR_dirty;</div><div class='del'>-</div><div class='del'>-	folio_zero_segment(folio, start_offset, end_offset);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Bit of a hack - we don't want truncate to fail due to -ENOSPC.</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: because we aren't currently tracking whether the folio has actual</div><div class='del'>-	 * data in it (vs. just 0s, or only partially written) this wrong. ick.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(bch2_get_folio_disk_reservation(c, inode, folio, false));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This removes any writeable userspace mappings; we need to force</div><div class='del'>-	 * .page_mkwrite to be called again before any mmapped writes, to</div><div class='del'>-	 * redirty the full page:</div><div class='del'>-	 */</div><div class='del'>-	folio_mkclean(folio);</div><div class='del'>-	filemap_dirty_folio(mapping, folio);</div><div class='del'>-unlock:</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	folio_put(folio);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_truncate_folio(struct bch_inode_info *inode, loff_t from)</div><div class='del'>-{</div><div class='del'>-	return __bch2_truncate_folio(inode, from &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				     from, ANYSINT_MAX(loff_t));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_truncate_folios(struct bch_inode_info *inode,</div><div class='del'>-				loff_t start, loff_t end)</div><div class='del'>-{</div><div class='del'>-	int ret = __bch2_truncate_folio(inode, start &gt;&gt; PAGE_SHIFT,</div><div class='del'>-					start, end);</div><div class='del'>-</div><div class='del'>-	if (ret &gt;= 0 &amp;&amp;</div><div class='del'>-	    start &gt;&gt; PAGE_SHIFT != end &gt;&gt; PAGE_SHIFT)</div><div class='del'>-		ret = __bch2_truncate_folio(inode,</div><div class='del'>-					(end - 1) &gt;&gt; PAGE_SHIFT,</div><div class='del'>-					start, end);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_extend(struct mnt_idmap *idmap,</div><div class='del'>-		       struct bch_inode_info *inode,</div><div class='del'>-		       struct bch_inode_unpacked *inode_u,</div><div class='del'>-		       struct iattr *iattr)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = inode-&gt;v.i_mapping;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * sync appends:</div><div class='del'>-	 *</div><div class='del'>-	 * this has to be done _before_ extending i_size:</div><div class='del'>-	 */</div><div class='del'>-	ret = filemap_write_and_wait_range(mapping, inode_u-&gt;bi_size, S64_MAX);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	truncate_setsize(&amp;inode-&gt;v, iattr-&gt;ia_size);</div><div class='del'>-</div><div class='del'>-	return bch2_setattr_nonsize(idmap, inode, iattr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bchfs_truncate(struct mnt_idmap *idmap,</div><div class='del'>-		  struct bch_inode_info *inode, struct iattr *iattr)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct address_space *mapping = inode-&gt;v.i_mapping;</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	s64 i_sectors_delta = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the truncate call with change the size of the file, the</div><div class='del'>-	 * cmtimes should be updated. If the size will not change, we</div><div class='del'>-	 * do not need to update the cmtimes.</div><div class='del'>-	 */</div><div class='del'>-	if (iattr-&gt;ia_size != inode-&gt;v.i_size) {</div><div class='del'>-		if (!(iattr-&gt;ia_valid &amp; ATTR_MTIME))</div><div class='del'>-			ktime_get_coarse_real_ts64(&amp;iattr-&gt;ia_mtime);</div><div class='del'>-		if (!(iattr-&gt;ia_valid &amp; ATTR_CTIME))</div><div class='del'>-			ktime_get_coarse_real_ts64(&amp;iattr-&gt;ia_ctime);</div><div class='del'>-		iattr-&gt;ia_valid |= ATTR_MTIME|ATTR_CTIME;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_dio_wait(&amp;inode-&gt;v);</div><div class='del'>-	bch2_pagecache_block_get(inode);</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_find_by_inum(c, inode_inum(inode), &amp;inode_u);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * check this before next assertion; on filesystem error our normal</div><div class='del'>-	 * invariants are a bit broken (truncate has to truncate the page cache</div><div class='del'>-	 * before the inode).</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_journal_error(&amp;c-&gt;journal);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	WARN_ONCE(!test_bit(EI_INODE_ERROR, &amp;inode-&gt;ei_flags) &amp;&amp;</div><div class='del'>-		  inode-&gt;v.i_size &lt; inode_u.bi_size,</div><div class='del'>-		  "truncate spotted in mem i_size &lt; btree i_size: %llu &lt; %llu\n",</div><div class='del'>-		  (u64) inode-&gt;v.i_size, inode_u.bi_size);</div><div class='del'>-</div><div class='del'>-	if (iattr-&gt;ia_size &gt; inode-&gt;v.i_size) {</div><div class='del'>-		ret = bch2_extend(idmap, inode, &amp;inode_u, iattr);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iattr-&gt;ia_valid &amp;= ~ATTR_SIZE;</div><div class='del'>-</div><div class='del'>-	ret = bch2_truncate_folio(inode, iattr-&gt;ia_size);</div><div class='del'>-	if (unlikely(ret &lt; 0))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	truncate_setsize(&amp;inode-&gt;v, iattr-&gt;ia_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When extending, we're going to write the new i_size to disk</div><div class='del'>-	 * immediately so we need to flush anything above the current on disk</div><div class='del'>-	 * i_size first:</div><div class='del'>-	 *</div><div class='del'>-	 * Also, when extending we need to flush the page that i_size currently</div><div class='del'>-	 * straddles - if it's mapped to userspace, we need to ensure that</div><div class='del'>-	 * userspace has to redirty it and call .mkwrite -&gt; set_page_dirty</div><div class='del'>-	 * again to allocate the part of the page that was extended.</div><div class='del'>-	 */</div><div class='del'>-	if (iattr-&gt;ia_size &gt; inode_u.bi_size)</div><div class='del'>-		ret = filemap_write_and_wait_range(mapping,</div><div class='del'>-				inode_u.bi_size,</div><div class='del'>-				iattr-&gt;ia_size - 1);</div><div class='del'>-	else if (iattr-&gt;ia_size &amp; (PAGE_SIZE - 1))</div><div class='del'>-		ret = filemap_write_and_wait_range(mapping,</div><div class='del'>-				round_down(iattr-&gt;ia_size, PAGE_SIZE),</div><div class='del'>-				iattr-&gt;ia_size - 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_truncate(c, inode_inum(inode), iattr-&gt;ia_size, &amp;i_sectors_delta);</div><div class='del'>-	bch2_i_sectors_acct(c, inode, NULL, i_sectors_delta);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we error here, VFS caches are now inconsistent with btree</div><div class='del'>-		 */</div><div class='del'>-		set_bit(EI_INODE_ERROR, &amp;inode-&gt;ei_flags);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_fs_inconsistent_on(!inode-&gt;v.i_size &amp;&amp; inode-&gt;v.i_blocks &amp;&amp;</div><div class='del'>-				!bch2_journal_error(&amp;c-&gt;journal), c,</div><div class='del'>-				"inode %lu truncated to 0 but i_blocks %llu (ondisk %lli)",</div><div class='del'>-				inode-&gt;v.i_ino, (u64) inode-&gt;v.i_blocks,</div><div class='del'>-				inode-&gt;ei_inode.bi_sectors);</div><div class='del'>-</div><div class='del'>-	ret = bch2_setattr_nonsize(idmap, inode, iattr);</div><div class='del'>-err:</div><div class='del'>-	bch2_pagecache_block_put(inode);</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fallocate: */</div><div class='del'>-</div><div class='del'>-static int inode_update_times_fn(struct btree_trans *trans,</div><div class='del'>-				 struct bch_inode_info *inode,</div><div class='del'>-				 struct bch_inode_unpacked *bi, void *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	bi-&gt;bi_mtime = bi-&gt;bi_ctime = bch2_current_time(c);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bchfs_fpunch(struct bch_inode_info *inode, loff_t offset, loff_t len)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	u64 end		= offset + len;</div><div class='del'>-	u64 block_start	= round_up(offset, block_bytes(c));</div><div class='del'>-	u64 block_end	= round_down(end, block_bytes(c));</div><div class='del'>-	bool truncated_last_page;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_truncate_folios(inode, offset, end);</div><div class='del'>-	if (unlikely(ret &lt; 0))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	truncated_last_page = ret;</div><div class='del'>-</div><div class='del'>-	truncate_pagecache_range(&amp;inode-&gt;v, offset, end - 1);</div><div class='del'>-</div><div class='del'>-	if (block_start &lt; block_end) {</div><div class='del'>-		s64 i_sectors_delta = 0;</div><div class='del'>-</div><div class='del'>-		ret = bch2_fpunch(c, inode_inum(inode),</div><div class='del'>-				  block_start &gt;&gt; 9, block_end &gt;&gt; 9,</div><div class='del'>-				  &amp;i_sectors_delta);</div><div class='del'>-		bch2_i_sectors_acct(c, inode, NULL, i_sectors_delta);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	if (end &gt;= inode-&gt;v.i_size &amp;&amp; !truncated_last_page) {</div><div class='del'>-		ret = bch2_write_inode_size(c, inode, inode-&gt;v.i_size,</div><div class='del'>-					    ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-	} else {</div><div class='del'>-		ret = bch2_write_inode(c, inode, inode_update_times_fn, NULL,</div><div class='del'>-				       ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bchfs_fcollapse_finsert(struct bch_inode_info *inode,</div><div class='del'>-				   loff_t offset, loff_t len,</div><div class='del'>-				   bool insert)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct address_space *mapping = inode-&gt;v.i_mapping;</div><div class='del'>-	s64 i_sectors_delta = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if ((offset | len) &amp; (block_bytes(c) - 1))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (insert) {</div><div class='del'>-		if (offset &gt;= inode-&gt;v.i_size)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		if (offset + len &gt;= inode-&gt;v.i_size)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_write_invalidate_inode_pages_range(mapping, offset, LLONG_MAX);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (insert)</div><div class='del'>-		i_size_write(&amp;inode-&gt;v, inode-&gt;v.i_size + len);</div><div class='del'>-</div><div class='del'>-	ret = bch2_fcollapse_finsert(c, inode_inum(inode), offset &gt;&gt; 9, len &gt;&gt; 9,</div><div class='del'>-				     insert, &amp;i_sectors_delta);</div><div class='del'>-	if (!ret &amp;&amp; !insert)</div><div class='del'>-		i_size_write(&amp;inode-&gt;v, inode-&gt;v.i_size - len);</div><div class='del'>-	bch2_i_sectors_acct(c, inode, NULL, i_sectors_delta);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bchfs_fallocate(struct bch_inode_info *inode, int mode,</div><div class='del'>-			     u64 start_sector, u64 end_sector)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bpos end_pos = POS(inode-&gt;v.i_ino, end_sector);</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(&amp;opts, c, &amp;inode-&gt;ei_inode);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			POS(inode-&gt;v.i_ino, start_sector),</div><div class='del'>-			BTREE_ITER_SLOTS|BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	while (!ret &amp;&amp; bkey_lt(iter.pos, end_pos)) {</div><div class='del'>-		s64 i_sectors_delta = 0;</div><div class='del'>-		struct quota_res quota_res = { 0 };</div><div class='del'>-		struct bkey_s_c k;</div><div class='del'>-		unsigned sectors;</div><div class='del'>-		bool is_allocation;</div><div class='del'>-		u64 hole_start, hole_end;</div><div class='del'>-		u32 snapshot;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans,</div><div class='del'>-					inode-&gt;ei_subvol, &amp;snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto bkey_err;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;iter, snapshot);</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-		if ((ret = bkey_err(k)))</div><div class='del'>-			goto bkey_err;</div><div class='del'>-</div><div class='del'>-		hole_start	= iter.pos.offset;</div><div class='del'>-		hole_end	= bpos_min(k.k-&gt;p, end_pos).offset;</div><div class='del'>-		is_allocation	= bkey_extent_is_allocation(k.k);</div><div class='del'>-</div><div class='del'>-		/* already reserved */</div><div class='del'>-		if (bkey_extent_is_reservation(k) &amp;&amp;</div><div class='del'>-		    bch2_bkey_nr_ptrs_fully_allocated(k) &gt;= opts.data_replicas) {</div><div class='del'>-			bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bkey_extent_is_data(k.k) &amp;&amp;</div><div class='del'>-		    !(mode &amp; FALLOC_FL_ZERO_RANGE)) {</div><div class='del'>-			bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(mode &amp; FALLOC_FL_ZERO_RANGE)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Lock ordering - can't be holding btree locks while</div><div class='del'>-			 * blocking on a folio lock:</div><div class='del'>-			 */</div><div class='del'>-			if (bch2_clamp_data_hole(&amp;inode-&gt;v,</div><div class='del'>-						 &amp;hole_start,</div><div class='del'>-						 &amp;hole_end,</div><div class='del'>-						 opts.data_replicas, true))</div><div class='del'>-				ret = drop_locks_do(trans,</div><div class='del'>-					(bch2_clamp_data_hole(&amp;inode-&gt;v,</div><div class='del'>-							      &amp;hole_start,</div><div class='del'>-							      &amp;hole_end,</div><div class='del'>-							      opts.data_replicas, false), 0));</div><div class='del'>-			bch2_btree_iter_set_pos(&amp;iter, POS(iter.pos.inode, hole_start));</div><div class='del'>-</div><div class='del'>-			if (ret)</div><div class='del'>-				goto bkey_err;</div><div class='del'>-</div><div class='del'>-			if (hole_start == hole_end)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sectors	= hole_end - hole_start;</div><div class='del'>-</div><div class='del'>-		if (!is_allocation) {</div><div class='del'>-			ret = bch2_quota_reservation_add(c, inode,</div><div class='del'>-					&amp;quota_res, sectors, true);</div><div class='del'>-			if (unlikely(ret))</div><div class='del'>-				goto bkey_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_extent_fallocate(trans, inode_inum(inode), &amp;iter,</div><div class='del'>-					    sectors, opts, &amp;i_sectors_delta,</div><div class='del'>-					    writepoint_hashed((unsigned long) current));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto bkey_err;</div><div class='del'>-</div><div class='del'>-		bch2_i_sectors_acct(c, inode, &amp;quota_res, i_sectors_delta);</div><div class='del'>-</div><div class='del'>-		if (bch2_mark_pagecache_reserved(inode, &amp;hole_start,</div><div class='del'>-						 iter.pos.offset, true))</div><div class='del'>-			drop_locks_do(trans,</div><div class='del'>-				bch2_mark_pagecache_reserved(inode, &amp;hole_start,</div><div class='del'>-							     iter.pos.offset, false));</div><div class='del'>-bkey_err:</div><div class='del'>-		bch2_quota_reservation_put(c, inode, &amp;quota_res);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, ENOSPC) &amp;&amp; (mode &amp; FALLOC_FL_ZERO_RANGE)) {</div><div class='del'>-		struct quota_res quota_res = { 0 };</div><div class='del'>-		s64 i_sectors_delta = 0;</div><div class='del'>-</div><div class='del'>-		bch2_fpunch_at(trans, &amp;iter, inode_inum(inode),</div><div class='del'>-			       end_sector, &amp;i_sectors_delta);</div><div class='del'>-		bch2_i_sectors_acct(c, inode, &amp;quota_res, i_sectors_delta);</div><div class='del'>-		bch2_quota_reservation_put(c, inode, &amp;quota_res);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bchfs_fallocate(struct bch_inode_info *inode, int mode,</div><div class='del'>-			    loff_t offset, loff_t len)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	u64 end		= offset + len;</div><div class='del'>-	u64 block_start	= round_down(offset,	block_bytes(c));</div><div class='del'>-	u64 block_end	= round_up(end,		block_bytes(c));</div><div class='del'>-	bool truncated_last_page = false;</div><div class='del'>-	int ret, ret2 = 0;</div><div class='del'>-</div><div class='del'>-	if (!(mode &amp; FALLOC_FL_KEEP_SIZE) &amp;&amp; end &gt; inode-&gt;v.i_size) {</div><div class='del'>-		ret = inode_newsize_ok(&amp;inode-&gt;v, end);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode &amp; FALLOC_FL_ZERO_RANGE) {</div><div class='del'>-		ret = bch2_truncate_folios(inode, offset, end);</div><div class='del'>-		if (unlikely(ret &lt; 0))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		truncated_last_page = ret;</div><div class='del'>-</div><div class='del'>-		truncate_pagecache_range(&amp;inode-&gt;v, offset, end - 1);</div><div class='del'>-</div><div class='del'>-		block_start	= round_up(offset,	block_bytes(c));</div><div class='del'>-		block_end	= round_down(end,	block_bytes(c));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __bchfs_fallocate(inode, mode, block_start &gt;&gt; 9, block_end &gt;&gt; 9);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On -ENOSPC in ZERO_RANGE mode, we still want to do the inode update,</div><div class='del'>-	 * so that the VFS cache i_size is consistent with the btree i_size:</div><div class='del'>-	 */</div><div class='del'>-	if (ret &amp;&amp;</div><div class='del'>-	    !(bch2_err_matches(ret, ENOSPC) &amp;&amp; (mode &amp; FALLOC_FL_ZERO_RANGE)))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (mode &amp; FALLOC_FL_KEEP_SIZE &amp;&amp; end &gt; inode-&gt;v.i_size)</div><div class='del'>-		end = inode-&gt;v.i_size;</div><div class='del'>-</div><div class='del'>-	if (end &gt;= inode-&gt;v.i_size &amp;&amp;</div><div class='del'>-	    (((mode &amp; FALLOC_FL_ZERO_RANGE) &amp;&amp; !truncated_last_page) ||</div><div class='del'>-	     !(mode &amp; FALLOC_FL_KEEP_SIZE))) {</div><div class='del'>-		spin_lock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-		i_size_write(&amp;inode-&gt;v, end);</div><div class='del'>-		spin_unlock(&amp;inode-&gt;v.i_lock);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-		ret2 = bch2_write_inode_size(c, inode, end, 0);</div><div class='del'>-		mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret ?: ret2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long bch2_fallocate_dispatch(struct file *file, int mode,</div><div class='del'>-			     loff_t offset, loff_t len)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_fallocate))</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	inode_lock(&amp;inode-&gt;v);</div><div class='del'>-	inode_dio_wait(&amp;inode-&gt;v);</div><div class='del'>-	bch2_pagecache_block_get(inode);</div><div class='del'>-</div><div class='del'>-	ret = file_modified(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!(mode &amp; ~(FALLOC_FL_KEEP_SIZE|FALLOC_FL_ZERO_RANGE)))</div><div class='del'>-		ret = bchfs_fallocate(inode, mode, offset, len);</div><div class='del'>-	else if (mode == (FALLOC_FL_PUNCH_HOLE|FALLOC_FL_KEEP_SIZE))</div><div class='del'>-		ret = bchfs_fpunch(inode, offset, len);</div><div class='del'>-	else if (mode == FALLOC_FL_INSERT_RANGE)</div><div class='del'>-		ret = bchfs_fcollapse_finsert(inode, offset, len, true);</div><div class='del'>-	else if (mode == FALLOC_FL_COLLAPSE_RANGE)</div><div class='del'>-		ret = bchfs_fcollapse_finsert(inode, offset, len, false);</div><div class='del'>-	else</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-err:</div><div class='del'>-	bch2_pagecache_block_put(inode);</div><div class='del'>-	inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_fallocate);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Take a quota reservation for unallocated blocks in a given file range</div><div class='del'>- * Does not check pagecache</div><div class='del'>- */</div><div class='del'>-static int quota_reserve_range(struct bch_inode_info *inode,</div><div class='del'>-			       struct quota_res *res,</div><div class='del'>-			       u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	u64 sectors = end - start;</div><div class='del'>-	u64 pos = start;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inode-&gt;ei_subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     SPOS(inode-&gt;v.i_ino, pos, snapshot), 0);</div><div class='del'>-</div><div class='del'>-	while (!(ret = btree_trans_too_many_iters(trans)) &amp;&amp;</div><div class='del'>-	       (k = bch2_btree_iter_peek_upto(&amp;iter, POS(inode-&gt;v.i_ino, end - 1))).k &amp;&amp;</div><div class='del'>-	       !(ret = bkey_err(k))) {</div><div class='del'>-		if (bkey_extent_is_allocation(k.k)) {</div><div class='del'>-			u64 s = min(end, k.k-&gt;p.offset) -</div><div class='del'>-				max(start, bkey_start_offset(k.k));</div><div class='del'>-			BUG_ON(s &gt; sectors);</div><div class='del'>-			sectors -= s;</div><div class='del'>-		}</div><div class='del'>-		bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-	}</div><div class='del'>-	pos = iter.pos.offset;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret ?: bch2_quota_reservation_add(c, inode, res, sectors, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-loff_t bch2_remap_file_range(struct file *file_src, loff_t pos_src,</div><div class='del'>-			     struct file *file_dst, loff_t pos_dst,</div><div class='del'>-			     loff_t len, unsigned remap_flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *src = file_bch_inode(file_src);</div><div class='del'>-	struct bch_inode_info *dst = file_bch_inode(file_dst);</div><div class='del'>-	struct bch_fs *c = src-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct quota_res quota_res = { 0 };</div><div class='del'>-	s64 i_sectors_delta = 0;</div><div class='del'>-	u64 aligned_len;</div><div class='del'>-	loff_t ret = 0;</div><div class='del'>-</div><div class='del'>-	if (remap_flags &amp; ~(REMAP_FILE_DEDUP|REMAP_FILE_ADVISORY))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (remap_flags &amp; REMAP_FILE_DEDUP)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if ((pos_src &amp; (block_bytes(c) - 1)) ||</div><div class='del'>-	    (pos_dst &amp; (block_bytes(c) - 1)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (src == dst &amp;&amp;</div><div class='del'>-	    abs(pos_src - pos_dst) &lt; len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	lock_two_nondirectories(&amp;src-&gt;v, &amp;dst-&gt;v);</div><div class='del'>-	bch2_lock_inodes(INODE_PAGECACHE_BLOCK, src, dst);</div><div class='del'>-</div><div class='del'>-	inode_dio_wait(&amp;src-&gt;v);</div><div class='del'>-	inode_dio_wait(&amp;dst-&gt;v);</div><div class='del'>-</div><div class='del'>-	ret = generic_remap_file_range_prep(file_src, pos_src,</div><div class='del'>-					    file_dst, pos_dst,</div><div class='del'>-					    &amp;len, remap_flags);</div><div class='del'>-	if (ret &lt; 0 || len == 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	aligned_len = round_up((u64) len, block_bytes(c));</div><div class='del'>-</div><div class='del'>-	ret = bch2_write_invalidate_inode_pages_range(dst-&gt;v.i_mapping,</div><div class='del'>-				pos_dst, pos_dst + len - 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = quota_reserve_range(dst, &amp;quota_res, pos_dst &gt;&gt; 9,</div><div class='del'>-				  (pos_dst + aligned_len) &gt;&gt; 9);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	file_update_time(file_dst);</div><div class='del'>-</div><div class='del'>-	bch2_mark_pagecache_unallocated(src, pos_src &gt;&gt; 9,</div><div class='del'>-				   (pos_src + aligned_len) &gt;&gt; 9);</div><div class='del'>-</div><div class='del'>-	ret = bch2_remap_range(c,</div><div class='del'>-			       inode_inum(dst), pos_dst &gt;&gt; 9,</div><div class='del'>-			       inode_inum(src), pos_src &gt;&gt; 9,</div><div class='del'>-			       aligned_len &gt;&gt; 9,</div><div class='del'>-			       pos_dst + len, &amp;i_sectors_delta);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * due to alignment, we might have remapped slightly more than requsted</div><div class='del'>-	 */</div><div class='del'>-	ret = min((u64) ret &lt;&lt; 9, (u64) len);</div><div class='del'>-</div><div class='del'>-	bch2_i_sectors_acct(c, dst, &amp;quota_res, i_sectors_delta);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;dst-&gt;v.i_lock);</div><div class='del'>-	if (pos_dst + ret &gt; dst-&gt;v.i_size)</div><div class='del'>-		i_size_write(&amp;dst-&gt;v, pos_dst + ret);</div><div class='del'>-	spin_unlock(&amp;dst-&gt;v.i_lock);</div><div class='del'>-</div><div class='del'>-	if ((file_dst-&gt;f_flags &amp; (__O_SYNC | O_DSYNC)) ||</div><div class='del'>-	    IS_SYNC(file_inode(file_dst)))</div><div class='del'>-		ret = bch2_flush_inode(c, dst);</div><div class='del'>-err:</div><div class='del'>-	bch2_quota_reservation_put(c, dst, &amp;quota_res);</div><div class='del'>-	bch2_unlock_inodes(INODE_PAGECACHE_BLOCK, src, dst);</div><div class='del'>-	unlock_two_nondirectories(&amp;src-&gt;v, &amp;dst-&gt;v);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fseek: */</div><div class='del'>-</div><div class='del'>-static loff_t bch2_seek_data(struct file *file, u64 offset)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	subvol_inum inum = inode_inum(inode);</div><div class='del'>-	u64 isize, next_data = MAX_LFS_FILESIZE;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	isize = i_size_read(&amp;inode-&gt;v);</div><div class='del'>-	if (offset &gt;= isize)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, iter, BTREE_ID_extents,</div><div class='del'>-			   SPOS(inode-&gt;v.i_ino, offset &gt;&gt; 9, snapshot),</div><div class='del'>-			   POS(inode-&gt;v.i_ino, U64_MAX),</div><div class='del'>-			   0, k, ret) {</div><div class='del'>-		if (bkey_extent_is_data(k.k)) {</div><div class='del'>-			next_data = max(offset, bkey_start_offset(k.k) &lt;&lt; 9);</div><div class='del'>-			break;</div><div class='del'>-		} else if (k.k-&gt;p.offset &gt;&gt; 9 &gt; isize)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (next_data &gt; offset)</div><div class='del'>-		next_data = bch2_seek_pagecache_data(&amp;inode-&gt;v,</div><div class='del'>-					offset, next_data, 0, false);</div><div class='del'>-</div><div class='del'>-	if (next_data &gt;= isize)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	return vfs_setpos(file, next_data, MAX_LFS_FILESIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static loff_t bch2_seek_hole(struct file *file, u64 offset)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	subvol_inum inum = inode_inum(inode);</div><div class='del'>-	u64 isize, next_hole = MAX_LFS_FILESIZE;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	isize = i_size_read(&amp;inode-&gt;v);</div><div class='del'>-	if (offset &gt;= isize)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_extents,</div><div class='del'>-			   SPOS(inode-&gt;v.i_ino, offset &gt;&gt; 9, snapshot),</div><div class='del'>-			   BTREE_ITER_SLOTS, k, ret) {</div><div class='del'>-		if (k.k-&gt;p.inode != inode-&gt;v.i_ino) {</div><div class='del'>-			next_hole = bch2_seek_pagecache_hole(&amp;inode-&gt;v,</div><div class='del'>-					offset, MAX_LFS_FILESIZE, 0, false);</div><div class='del'>-			break;</div><div class='del'>-		} else if (!bkey_extent_is_data(k.k)) {</div><div class='del'>-			next_hole = bch2_seek_pagecache_hole(&amp;inode-&gt;v,</div><div class='del'>-					max(offset, bkey_start_offset(k.k) &lt;&lt; 9),</div><div class='del'>-					k.k-&gt;p.offset &lt;&lt; 9, 0, false);</div><div class='del'>-</div><div class='del'>-			if (next_hole &lt; k.k-&gt;p.offset &lt;&lt; 9)</div><div class='del'>-				break;</div><div class='del'>-		} else {</div><div class='del'>-			offset = max(offset, bkey_start_offset(k.k) &lt;&lt; 9);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (next_hole &gt; isize)</div><div class='del'>-		next_hole = isize;</div><div class='del'>-</div><div class='del'>-	return vfs_setpos(file, next_hole, MAX_LFS_FILESIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-loff_t bch2_llseek(struct file *file, loff_t offset, int whence)</div><div class='del'>-{</div><div class='del'>-	loff_t ret;</div><div class='del'>-</div><div class='del'>-	switch (whence) {</div><div class='del'>-	case SEEK_SET:</div><div class='del'>-	case SEEK_CUR:</div><div class='del'>-	case SEEK_END:</div><div class='del'>-		ret = generic_file_llseek(file, offset, whence);</div><div class='del'>-		break;</div><div class='del'>-	case SEEK_DATA:</div><div class='del'>-		ret = bch2_seek_data(file, offset);</div><div class='del'>-		break;</div><div class='del'>-	case SEEK_HOLE:</div><div class='del'>-		ret = bch2_seek_hole(file, offset);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_fsio_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bioset_exit(&amp;c-&gt;nocow_flush_bioset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_fsio_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bioset_init(&amp;c-&gt;nocow_flush_bioset,</div><div class='del'>-			1, offsetof(struct nocow_flush, bio), 0))</div><div class='del'>-		return -BCH_ERR_ENOMEM_nocow_flush_bioset_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/fs-io.h b/fs/bcachefs/fs-io.h<br/>deleted file mode 100644<br/>index ca70346e68dc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-io.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,184 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_IO_H</div><div class='del'>-#define _BCACHEFS_FS_IO_H</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "io_write_types.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='del'>-</div><div class='del'>-struct folio_vec {</div><div class='del'>-	struct folio	*fv_folio;</div><div class='del'>-	size_t		fv_offset;</div><div class='del'>-	size_t		fv_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct folio_vec biovec_to_foliovec(struct bio_vec bv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct folio *folio	= page_folio(bv.bv_page);</div><div class='del'>-	size_t offset		= (folio_page_idx(folio, bv.bv_page) &lt;&lt; PAGE_SHIFT) +</div><div class='del'>-		bv.bv_offset;</div><div class='del'>-	size_t len = min_t(size_t, folio_size(folio) - offset, bv.bv_len);</div><div class='del'>-</div><div class='del'>-	return (struct folio_vec) {</div><div class='del'>-		.fv_folio	= folio,</div><div class='del'>-		.fv_offset	= offset,</div><div class='del'>-		.fv_len		= len,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct folio_vec bio_iter_iovec_folio(struct bio *bio,</div><div class='del'>-						    struct bvec_iter iter)</div><div class='del'>-{</div><div class='del'>-	return biovec_to_foliovec(bio_iter_iovec(bio, iter));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __bio_for_each_folio(bvl, bio, iter, start)			\</div><div class='del'>-	for (iter = (start);						\</div><div class='del'>-	     (iter).bi_size &amp;&amp;						\</div><div class='del'>-		((bvl = bio_iter_iovec_folio((bio), (iter))), 1);	\</div><div class='del'>-	     bio_advance_iter_single((bio), &amp;(iter), (bvl).fv_len))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bio_for_each_folio - iterate over folios within a bio</div><div class='del'>- *</div><div class='del'>- * Like other non-_all versions, this iterates over what bio-&gt;bi_iter currently</div><div class='del'>- * points to. This version is for drivers, where the bio may have previously</div><div class='del'>- * been split or cloned.</div><div class='del'>- */</div><div class='del'>-#define bio_for_each_folio(bvl, bio, iter)				\</div><div class='del'>-	__bio_for_each_folio(bvl, bio, iter, (bio)-&gt;bi_iter)</div><div class='del'>-</div><div class='del'>-struct quota_res {</div><div class='del'>-	u64				sectors;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_QUOTA</div><div class='del'>-</div><div class='del'>-static inline void __bch2_quota_reservation_put(struct bch_fs *c,</div><div class='del'>-					 struct bch_inode_info *inode,</div><div class='del'>-					 struct quota_res *res)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(res-&gt;sectors &gt; inode-&gt;ei_quota_reserved);</div><div class='del'>-</div><div class='del'>-	bch2_quota_acct(c, inode-&gt;ei_qid, Q_SPC,</div><div class='del'>-			-((s64) res-&gt;sectors), KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-	inode-&gt;ei_quota_reserved -= res-&gt;sectors;</div><div class='del'>-	res-&gt;sectors = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_quota_reservation_put(struct bch_fs *c,</div><div class='del'>-				       struct bch_inode_info *inode,</div><div class='del'>-				       struct quota_res *res)</div><div class='del'>-{</div><div class='del'>-	if (res-&gt;sectors) {</div><div class='del'>-		mutex_lock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-		__bch2_quota_reservation_put(c, inode, res);</div><div class='del'>-		mutex_unlock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_quota_reservation_add(struct bch_fs *c,</div><div class='del'>-				      struct bch_inode_info *inode,</div><div class='del'>-				      struct quota_res *res,</div><div class='del'>-				      u64 sectors,</div><div class='del'>-				      bool check_enospc)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (test_bit(EI_INODE_SNAPSHOT, &amp;inode-&gt;ei_flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-	ret = bch2_quota_acct(c, inode-&gt;ei_qid, Q_SPC, sectors,</div><div class='del'>-			      check_enospc ? KEY_TYPE_QUOTA_PREALLOC : KEY_TYPE_QUOTA_NOCHECK);</div><div class='del'>-	if (likely(!ret)) {</div><div class='del'>-		inode-&gt;ei_quota_reserved += sectors;</div><div class='del'>-		res-&gt;sectors += sectors;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void __bch2_quota_reservation_put(struct bch_fs *c,</div><div class='del'>-					 struct bch_inode_info *inode,</div><div class='del'>-					 struct quota_res *res) {}</div><div class='del'>-</div><div class='del'>-static inline void bch2_quota_reservation_put(struct bch_fs *c,</div><div class='del'>-				       struct bch_inode_info *inode,</div><div class='del'>-				       struct quota_res *res) {}</div><div class='del'>-</div><div class='del'>-static inline int bch2_quota_reservation_add(struct bch_fs *c,</div><div class='del'>-				      struct bch_inode_info *inode,</div><div class='del'>-				      struct quota_res *res,</div><div class='del'>-				      unsigned sectors,</div><div class='del'>-				      bool check_enospc)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __bch2_i_sectors_acct(struct bch_fs *, struct bch_inode_info *,</div><div class='del'>-			   struct quota_res *, s64);</div><div class='del'>-</div><div class='del'>-static inline void bch2_i_sectors_acct(struct bch_fs *c, struct bch_inode_info *inode,</div><div class='del'>-				       struct quota_res *quota_res, s64 sectors)</div><div class='del'>-{</div><div class='del'>-	if (sectors) {</div><div class='del'>-		mutex_lock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-		__bch2_i_sectors_acct(c, inode, quota_res, sectors);</div><div class='del'>-		mutex_unlock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct address_space *faults_disabled_mapping(void)</div><div class='del'>-{</div><div class='del'>-	return (void *) (((unsigned long) current-&gt;faults_disabled_mapping) &amp; ~1UL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_fdm_dropped_locks(void)</div><div class='del'>-{</div><div class='del'>-	current-&gt;faults_disabled_mapping =</div><div class='del'>-		(void *) (((unsigned long) current-&gt;faults_disabled_mapping)|1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool fdm_dropped_locks(void)</div><div class='del'>-{</div><div class='del'>-	return ((unsigned long) current-&gt;faults_disabled_mapping) &amp; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_flush_nocow_writes_async(struct bch_fs *,</div><div class='del'>-			struct bch_inode_info *, struct closure *);</div><div class='del'>-</div><div class='del'>-int __must_check bch2_write_inode_size(struct bch_fs *,</div><div class='del'>-				       struct bch_inode_info *,</div><div class='del'>-				       loff_t, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_fsync(struct file *, loff_t, loff_t, int);</div><div class='del'>-</div><div class='del'>-int bchfs_truncate(struct mnt_idmap *,</div><div class='del'>-		  struct bch_inode_info *, struct iattr *);</div><div class='del'>-long bch2_fallocate_dispatch(struct file *, int, loff_t, loff_t);</div><div class='del'>-</div><div class='del'>-loff_t bch2_remap_file_range(struct file *, loff_t, struct file *,</div><div class='del'>-			     loff_t, loff_t, unsigned);</div><div class='del'>-</div><div class='del'>-loff_t bch2_llseek(struct file *, loff_t, int);</div><div class='del'>-</div><div class='del'>-void bch2_fs_fsio_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_fsio_init(struct bch_fs *);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_fs_fsio_exit(struct bch_fs *c) {}</div><div class='del'>-static inline int bch2_fs_fsio_init(struct bch_fs *c) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_IO_H */</div><div class='head'>diff --git a/fs/bcachefs/fs-ioctl.c b/fs/bcachefs/fs-ioctl.c<br/>deleted file mode 100644<br/>index 3a4c24c28e7f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-ioctl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,564 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "chardev.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "fs-common.h"</div><div class='del'>-#include "fs-ioctl.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/compat.h&gt;</div><div class='del'>-#include &lt;linux/fsnotify.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='del'>-#include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-</div><div class='del'>-#define FS_IOC_GOINGDOWN	     _IOR('X', 125, __u32)</div><div class='del'>-#define FSOP_GOING_FLAGS_DEFAULT	0x0	/* going down */</div><div class='del'>-#define FSOP_GOING_FLAGS_LOGFLUSH	0x1	/* flush log but not data */</div><div class='del'>-#define FSOP_GOING_FLAGS_NOLOGFLUSH	0x2	/* don't flush log nor data */</div><div class='del'>-</div><div class='del'>-struct flags_set {</div><div class='del'>-	unsigned		mask;</div><div class='del'>-	unsigned		flags;</div><div class='del'>-</div><div class='del'>-	unsigned		projid;</div><div class='del'>-</div><div class='del'>-	bool			set_projinherit;</div><div class='del'>-	bool			projinherit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_inode_flags_set(struct btree_trans *trans,</div><div class='del'>-				struct bch_inode_info *inode,</div><div class='del'>-				struct bch_inode_unpacked *bi,</div><div class='del'>-				void *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	/*</div><div class='del'>-	 * We're relying on btree locking here for exclusion with other ioctl</div><div class='del'>-	 * calls - use the flags in the btree (@bi), not inode-&gt;i_flags:</div><div class='del'>-	 */</div><div class='del'>-	struct flags_set *s = p;</div><div class='del'>-	unsigned newflags = s-&gt;flags;</div><div class='del'>-	unsigned oldflags = bi-&gt;bi_flags &amp; s-&gt;mask;</div><div class='del'>-</div><div class='del'>-	if (((newflags ^ oldflags) &amp; (BCH_INODE_append|BCH_INODE_immutable)) &amp;&amp;</div><div class='del'>-	    !capable(CAP_LINUX_IMMUTABLE))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (!S_ISREG(bi-&gt;bi_mode) &amp;&amp;</div><div class='del'>-	    !S_ISDIR(bi-&gt;bi_mode) &amp;&amp;</div><div class='del'>-	    (newflags &amp; (BCH_INODE_nodump|BCH_INODE_noatime)) != newflags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;set_projinherit) {</div><div class='del'>-		bi-&gt;bi_fields_set &amp;= ~(1 &lt;&lt; Inode_opt_project);</div><div class='del'>-		bi-&gt;bi_fields_set |= ((int) s-&gt;projinherit &lt;&lt; Inode_opt_project);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bi-&gt;bi_flags &amp;= ~s-&gt;mask;</div><div class='del'>-	bi-&gt;bi_flags |= newflags;</div><div class='del'>-</div><div class='del'>-	bi-&gt;bi_ctime = timespec_to_bch2_time(c, current_time(&amp;inode-&gt;v));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_ioc_getflags(struct bch_inode_info *inode, int __user *arg)</div><div class='del'>-{</div><div class='del'>-	unsigned flags = map_flags(bch_flags_to_uflags, inode-&gt;ei_inode.bi_flags);</div><div class='del'>-</div><div class='del'>-	return put_user(flags, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_ioc_setflags(struct bch_fs *c,</div><div class='del'>-			     struct file *file,</div><div class='del'>-			     struct bch_inode_info *inode,</div><div class='del'>-			     void __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct flags_set s = { .mask = map_defined(bch_flags_to_uflags) };</div><div class='del'>-	unsigned uflags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (get_user(uflags, (int __user *) arg))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	s.flags = map_flags_rev(bch_flags_to_uflags, uflags);</div><div class='del'>-	if (uflags)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	ret = mnt_want_write_file(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	inode_lock(&amp;inode-&gt;v);</div><div class='del'>-	if (!inode_owner_or_capable(file_mnt_idmap(file), &amp;inode-&gt;v)) {</div><div class='del'>-		ret = -EACCES;</div><div class='del'>-		goto setflags_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	ret   = bch2_subvol_is_ro(c, inode-&gt;ei_subvol) ?:</div><div class='del'>-		bch2_write_inode(c, inode, bch2_inode_flags_set, &amp;s,</div><div class='del'>-			       ATTR_CTIME);</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-setflags_out:</div><div class='del'>-	inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-	mnt_drop_write_file(file);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_ioc_fsgetxattr(struct bch_inode_info *inode,</div><div class='del'>-			       struct fsxattr __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct fsxattr fa = { 0 };</div><div class='del'>-</div><div class='del'>-	fa.fsx_xflags = map_flags(bch_flags_to_xflags, inode-&gt;ei_inode.bi_flags);</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;ei_inode.bi_fields_set &amp; (1 &lt;&lt; Inode_opt_project))</div><div class='del'>-		fa.fsx_xflags |= FS_XFLAG_PROJINHERIT;</div><div class='del'>-</div><div class='del'>-	fa.fsx_projid = inode-&gt;ei_qid.q[QTYP_PRJ];</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;fa, sizeof(fa)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fssetxattr_inode_update_fn(struct btree_trans *trans,</div><div class='del'>-				      struct bch_inode_info *inode,</div><div class='del'>-				      struct bch_inode_unpacked *bi,</div><div class='del'>-				      void *p)</div><div class='del'>-{</div><div class='del'>-	struct flags_set *s = p;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;projid != bi-&gt;bi_project) {</div><div class='del'>-		bi-&gt;bi_fields_set |= 1U &lt;&lt; Inode_opt_project;</div><div class='del'>-		bi-&gt;bi_project = s-&gt;projid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_inode_flags_set(trans, inode, bi, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_ioc_fssetxattr(struct bch_fs *c,</div><div class='del'>-			       struct file *file,</div><div class='del'>-			       struct bch_inode_info *inode,</div><div class='del'>-			       struct fsxattr __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct flags_set s = { .mask = map_defined(bch_flags_to_xflags) };</div><div class='del'>-	struct fsxattr fa;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;fa, arg, sizeof(fa)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	s.set_projinherit = true;</div><div class='del'>-	s.projinherit = (fa.fsx_xflags &amp; FS_XFLAG_PROJINHERIT) != 0;</div><div class='del'>-	fa.fsx_xflags &amp;= ~FS_XFLAG_PROJINHERIT;</div><div class='del'>-</div><div class='del'>-	s.flags = map_flags_rev(bch_flags_to_xflags, fa.fsx_xflags);</div><div class='del'>-	if (fa.fsx_xflags)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (fa.fsx_projid &gt;= U32_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * inode fields accessible via the xattr interface are stored with a +1</div><div class='del'>-	 * bias, so that 0 means unset:</div><div class='del'>-	 */</div><div class='del'>-	s.projid = fa.fsx_projid + 1;</div><div class='del'>-</div><div class='del'>-	ret = mnt_want_write_file(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	inode_lock(&amp;inode-&gt;v);</div><div class='del'>-	if (!inode_owner_or_capable(file_mnt_idmap(file), &amp;inode-&gt;v)) {</div><div class='del'>-		ret = -EACCES;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	ret   = bch2_subvol_is_ro(c, inode-&gt;ei_subvol) ?:</div><div class='del'>-		bch2_set_projid(c, inode, fa.fsx_projid) ?:</div><div class='del'>-		bch2_write_inode(c, inode, fssetxattr_inode_update_fn, &amp;s,</div><div class='del'>-			       ATTR_CTIME);</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-err:</div><div class='del'>-	inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-	mnt_drop_write_file(file);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_reinherit_attrs_fn(struct btree_trans *trans,</div><div class='del'>-				   struct bch_inode_info *inode,</div><div class='del'>-				   struct bch_inode_unpacked *bi,</div><div class='del'>-				   void *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *dir = p;</div><div class='del'>-</div><div class='del'>-	return !bch2_reinherit_attrs(bi, &amp;dir-&gt;ei_inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_ioc_reinherit_attrs(struct bch_fs *c,</div><div class='del'>-				    struct file *file,</div><div class='del'>-				    struct bch_inode_info *src,</div><div class='del'>-				    const char __user *name)</div><div class='del'>-{</div><div class='del'>-	struct bch_hash_info hash = bch2_hash_info_init(c, &amp;src-&gt;ei_inode);</div><div class='del'>-	struct bch_inode_info *dst;</div><div class='del'>-	struct inode *vinode = NULL;</div><div class='del'>-	char *kname = NULL;</div><div class='del'>-	struct qstr qstr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	subvol_inum inum;</div><div class='del'>-</div><div class='del'>-	kname = kmalloc(BCH_NAME_MAX + 1, GFP_KERNEL);</div><div class='del'>-	if (!kname)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ret = strncpy_from_user(kname, name, BCH_NAME_MAX);</div><div class='del'>-	if (unlikely(ret &lt; 0))</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	qstr.len	= ret;</div><div class='del'>-	qstr.name	= kname;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_lookup(c, inode_inum(src), &amp;hash, &amp;qstr, &amp;inum);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	vinode = bch2_vfs_inode_get(c, inum);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(vinode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	dst = to_bch_ei(vinode);</div><div class='del'>-</div><div class='del'>-	ret = mnt_want_write_file(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err2;</div><div class='del'>-</div><div class='del'>-	bch2_lock_inodes(INODE_UPDATE_LOCK, src, dst);</div><div class='del'>-</div><div class='del'>-	if (inode_attr_changing(src, dst, Inode_opt_project)) {</div><div class='del'>-		ret = bch2_fs_quota_transfer(c, dst,</div><div class='del'>-					     src-&gt;ei_qid,</div><div class='del'>-					     1 &lt;&lt; QTYP_PRJ,</div><div class='del'>-					     KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_write_inode(c, dst, bch2_reinherit_attrs_fn, src, 0);</div><div class='del'>-err3:</div><div class='del'>-	bch2_unlock_inodes(INODE_UPDATE_LOCK, src, dst);</div><div class='del'>-</div><div class='del'>-	/* return true if we did work */</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ret = !ret;</div><div class='del'>-</div><div class='del'>-	mnt_drop_write_file(file);</div><div class='del'>-err2:</div><div class='del'>-	iput(vinode);</div><div class='del'>-err1:</div><div class='del'>-	kfree(kname);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)</div><div class='del'>-{</div><div class='del'>-	u32 flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (get_user(flags, arg))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	bch_notice(c, "shutdown by ioctl type %u", flags);</div><div class='del'>-</div><div class='del'>-	switch (flags) {</div><div class='del'>-	case FSOP_GOING_FLAGS_DEFAULT:</div><div class='del'>-		ret = bdev_freeze(c-&gt;vfs_sb-&gt;s_bdev);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-		bch2_journal_flush(&amp;c-&gt;journal);</div><div class='del'>-		bch2_fs_emergency_read_only(c);</div><div class='del'>-		bdev_thaw(c-&gt;vfs_sb-&gt;s_bdev);</div><div class='del'>-		break;</div><div class='del'>-	case FSOP_GOING_FLAGS_LOGFLUSH:</div><div class='del'>-		bch2_journal_flush(&amp;c-&gt;journal);</div><div class='del'>-		fallthrough;</div><div class='del'>-	case FSOP_GOING_FLAGS_NOLOGFLUSH:</div><div class='del'>-		bch2_fs_emergency_read_only(c);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long __bch2_ioctl_subvolume_create(struct bch_fs *c, struct file *filp,</div><div class='del'>-					  struct bch_ioctl_subvolume arg)</div><div class='del'>-{</div><div class='del'>-	struct inode *dir;</div><div class='del'>-	struct bch_inode_info *inode;</div><div class='del'>-	struct user_namespace *s_user_ns;</div><div class='del'>-	struct dentry *dst_dentry;</div><div class='del'>-	struct path src_path, dst_path;</div><div class='del'>-	int how = LOOKUP_FOLLOW;</div><div class='del'>-	int error;</div><div class='del'>-	subvol_inum snapshot_src = { 0 };</div><div class='del'>-	unsigned lookup_flags = 0;</div><div class='del'>-	unsigned create_flags = BCH_CREATE_SUBVOL;</div><div class='del'>-</div><div class='del'>-	if (arg.flags &amp; ~(BCH_SUBVOL_SNAPSHOT_CREATE|</div><div class='del'>-			  BCH_SUBVOL_SNAPSHOT_RO))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!(arg.flags &amp; BCH_SUBVOL_SNAPSHOT_CREATE) &amp;&amp;</div><div class='del'>-	    (arg.src_ptr ||</div><div class='del'>-	     (arg.flags &amp; BCH_SUBVOL_SNAPSHOT_RO)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (arg.flags &amp; BCH_SUBVOL_SNAPSHOT_CREATE)</div><div class='del'>-		create_flags |= BCH_CREATE_SNAPSHOT;</div><div class='del'>-</div><div class='del'>-	if (arg.flags &amp; BCH_SUBVOL_SNAPSHOT_RO)</div><div class='del'>-		create_flags |= BCH_CREATE_SNAPSHOT_RO;</div><div class='del'>-</div><div class='del'>-	if (arg.flags &amp; BCH_SUBVOL_SNAPSHOT_CREATE) {</div><div class='del'>-		/* sync_inodes_sb enforce s_umount is locked */</div><div class='del'>-		down_read(&amp;c-&gt;vfs_sb-&gt;s_umount);</div><div class='del'>-		sync_inodes_sb(c-&gt;vfs_sb);</div><div class='del'>-		up_read(&amp;c-&gt;vfs_sb-&gt;s_umount);</div><div class='del'>-	}</div><div class='del'>-retry:</div><div class='del'>-	if (arg.src_ptr) {</div><div class='del'>-		error = user_path_at(arg.dirfd,</div><div class='del'>-				(const char __user *)(unsigned long)arg.src_ptr,</div><div class='del'>-				how, &amp;src_path);</div><div class='del'>-		if (error)</div><div class='del'>-			goto err1;</div><div class='del'>-</div><div class='del'>-		if (src_path.dentry-&gt;d_sb-&gt;s_fs_info != c) {</div><div class='del'>-			path_put(&amp;src_path);</div><div class='del'>-			error = -EXDEV;</div><div class='del'>-			goto err1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		snapshot_src = inode_inum(to_bch_ei(src_path.dentry-&gt;d_inode));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst_dentry = user_path_create(arg.dirfd,</div><div class='del'>-			(const char __user *)(unsigned long)arg.dst_ptr,</div><div class='del'>-			&amp;dst_path, lookup_flags);</div><div class='del'>-	error = PTR_ERR_OR_ZERO(dst_dentry);</div><div class='del'>-	if (error)</div><div class='del'>-		goto err2;</div><div class='del'>-</div><div class='del'>-	if (dst_dentry-&gt;d_sb-&gt;s_fs_info != c) {</div><div class='del'>-		error = -EXDEV;</div><div class='del'>-		goto err3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dst_dentry-&gt;d_inode) {</div><div class='del'>-		error = -EEXIST;</div><div class='del'>-		goto err3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dir = dst_path.dentry-&gt;d_inode;</div><div class='del'>-	if (IS_DEADDIR(dir)) {</div><div class='del'>-		error = -BCH_ERR_ENOENT_directory_dead;</div><div class='del'>-		goto err3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s_user_ns = dir-&gt;i_sb-&gt;s_user_ns;</div><div class='del'>-	if (!kuid_has_mapping(s_user_ns, current_fsuid()) ||</div><div class='del'>-	    !kgid_has_mapping(s_user_ns, current_fsgid())) {</div><div class='del'>-		error = -EOVERFLOW;</div><div class='del'>-		goto err3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = inode_permission(file_mnt_idmap(filp),</div><div class='del'>-				 dir, MAY_WRITE | MAY_EXEC);</div><div class='del'>-	if (error)</div><div class='del'>-		goto err3;</div><div class='del'>-</div><div class='del'>-	if (!IS_POSIXACL(dir))</div><div class='del'>-		arg.mode &amp;= ~current_umask();</div><div class='del'>-</div><div class='del'>-	error = security_path_mkdir(&amp;dst_path, dst_dentry, arg.mode);</div><div class='del'>-	if (error)</div><div class='del'>-		goto err3;</div><div class='del'>-</div><div class='del'>-	if ((arg.flags &amp; BCH_SUBVOL_SNAPSHOT_CREATE) &amp;&amp;</div><div class='del'>-	    !arg.src_ptr)</div><div class='del'>-		snapshot_src.subvol = inode_inum(to_bch_ei(dir)).subvol;</div><div class='del'>-</div><div class='del'>-	inode = __bch2_create(file_mnt_idmap(filp), to_bch_ei(dir),</div><div class='del'>-			      dst_dentry, arg.mode|S_IFDIR,</div><div class='del'>-			      0, snapshot_src, create_flags);</div><div class='del'>-	error = PTR_ERR_OR_ZERO(inode);</div><div class='del'>-	if (error)</div><div class='del'>-		goto err3;</div><div class='del'>-</div><div class='del'>-	d_instantiate(dst_dentry, &amp;inode-&gt;v);</div><div class='del'>-	fsnotify_mkdir(dir, dst_dentry);</div><div class='del'>-err3:</div><div class='del'>-	done_path_create(&amp;dst_path, dst_dentry);</div><div class='del'>-err2:</div><div class='del'>-	if (arg.src_ptr)</div><div class='del'>-		path_put(&amp;src_path);</div><div class='del'>-</div><div class='del'>-	if (retry_estale(error, lookup_flags)) {</div><div class='del'>-		lookup_flags |= LOOKUP_REVAL;</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-err1:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_subvolume_create(struct bch_fs *c, struct file *filp,</div><div class='del'>-					struct bch_ioctl_subvolume arg)</div><div class='del'>-{</div><div class='del'>-	down_write(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-	long ret = __bch2_ioctl_subvolume_create(c, filp, arg);</div><div class='del'>-	up_write(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp,</div><div class='del'>-				struct bch_ioctl_subvolume arg)</div><div class='del'>-{</div><div class='del'>-	const char __user *name = (void __user *)(unsigned long)arg.dst_ptr;</div><div class='del'>-	struct path path;</div><div class='del'>-	struct inode *dir;</div><div class='del'>-	struct dentry *victim;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (arg.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	victim = user_path_locked_at(arg.dirfd, name, &amp;path);</div><div class='del'>-	if (IS_ERR(victim))</div><div class='del'>-		return PTR_ERR(victim);</div><div class='del'>-</div><div class='del'>-	if (victim-&gt;d_sb-&gt;s_fs_info != c) {</div><div class='del'>-		ret = -EXDEV;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	if (!d_is_positive(victim)) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	dir = d_inode(path.dentry);</div><div class='del'>-	ret = __bch2_unlink(dir, victim, true);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		fsnotify_rmdir(dir, victim);</div><div class='del'>-		d_delete(victim);</div><div class='del'>-	}</div><div class='del'>-	inode_unlock(dir);</div><div class='del'>-err:</div><div class='del'>-	dput(victim);</div><div class='del'>-	path_put(&amp;path);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long bch2_fs_file_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case FS_IOC_GETFLAGS:</div><div class='del'>-		ret = bch2_ioc_getflags(inode, (int __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FS_IOC_SETFLAGS:</div><div class='del'>-		ret = bch2_ioc_setflags(c, file, inode, (int __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FS_IOC_FSGETXATTR:</div><div class='del'>-		ret = bch2_ioc_fsgetxattr(inode, (void __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FS_IOC_FSSETXATTR:</div><div class='del'>-		ret = bch2_ioc_fssetxattr(c, file, inode,</div><div class='del'>-					  (void __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BCHFS_IOC_REINHERIT_ATTRS:</div><div class='del'>-		ret = bch2_ioc_reinherit_attrs(c, file, inode,</div><div class='del'>-					       (void __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FS_IOC_GETVERSION:</div><div class='del'>-		ret = -ENOTTY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FS_IOC_SETVERSION:</div><div class='del'>-		ret = -ENOTTY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case FS_IOC_GOINGDOWN:</div><div class='del'>-		ret = bch2_ioc_goingdown(c, (u32 __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BCH_IOCTL_SUBVOLUME_CREATE: {</div><div class='del'>-		struct bch_ioctl_subvolume i;</div><div class='del'>-</div><div class='del'>-		ret = copy_from_user(&amp;i, (void __user *) arg, sizeof(i))</div><div class='del'>-			? -EFAULT</div><div class='del'>-			: bch2_ioctl_subvolume_create(c, file, i);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case BCH_IOCTL_SUBVOLUME_DESTROY: {</div><div class='del'>-		struct bch_ioctl_subvolume i;</div><div class='del'>-</div><div class='del'>-		ret = copy_from_user(&amp;i, (void __user *) arg, sizeof(i))</div><div class='del'>-			? -EFAULT</div><div class='del'>-			: bch2_ioctl_subvolume_destroy(c, file, i);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = bch2_fs_ioctl(c, cmd, (void __user *) arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-long bch2_compat_fs_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	/* These are just misnamed, they actually get/put from/to user an int */</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case FS_IOC_GETFLAGS:</div><div class='del'>-		cmd = FS_IOC_GETFLAGS;</div><div class='del'>-		break;</div><div class='del'>-	case FS_IOC32_SETFLAGS:</div><div class='del'>-		cmd = FS_IOC_SETFLAGS;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-	return bch2_fs_file_ioctl(file, cmd, (unsigned long) compat_ptr(arg));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/fs-ioctl.h b/fs/bcachefs/fs-ioctl.h<br/>deleted file mode 100644<br/>index d30f9bb056fd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs-ioctl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs-ioctl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_IOCTL_H</div><div class='del'>-#define _BCACHEFS_FS_IOCTL_H</div><div class='del'>-</div><div class='del'>-/* Inode flags: */</div><div class='del'>-</div><div class='del'>-/* bcachefs inode flags -&gt; vfs inode flags: */</div><div class='del'>-static const __maybe_unused unsigned bch_flags_to_vfs[] = {</div><div class='del'>-	[__BCH_INODE_sync]	= S_SYNC,</div><div class='del'>-	[__BCH_INODE_immutable]	= S_IMMUTABLE,</div><div class='del'>-	[__BCH_INODE_append]	= S_APPEND,</div><div class='del'>-	[__BCH_INODE_noatime]	= S_NOATIME,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bcachefs inode flags -&gt; FS_IOC_GETFLAGS: */</div><div class='del'>-static const __maybe_unused unsigned bch_flags_to_uflags[] = {</div><div class='del'>-	[__BCH_INODE_sync]	= FS_SYNC_FL,</div><div class='del'>-	[__BCH_INODE_immutable]	= FS_IMMUTABLE_FL,</div><div class='del'>-	[__BCH_INODE_append]	= FS_APPEND_FL,</div><div class='del'>-	[__BCH_INODE_nodump]	= FS_NODUMP_FL,</div><div class='del'>-	[__BCH_INODE_noatime]	= FS_NOATIME_FL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bcachefs inode flags -&gt; FS_IOC_FSGETXATTR: */</div><div class='del'>-static const __maybe_unused unsigned bch_flags_to_xflags[] = {</div><div class='del'>-	[__BCH_INODE_sync]	= FS_XFLAG_SYNC,</div><div class='del'>-	[__BCH_INODE_immutable]	= FS_XFLAG_IMMUTABLE,</div><div class='del'>-	[__BCH_INODE_append]	= FS_XFLAG_APPEND,</div><div class='del'>-	[__BCH_INODE_nodump]	= FS_XFLAG_NODUMP,</div><div class='del'>-	[__BCH_INODE_noatime]	= FS_XFLAG_NOATIME,</div><div class='del'>-	//[__BCH_INODE_PROJINHERIT] = FS_XFLAG_PROJINHERIT;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define set_flags(_map, _in, _out)					\</div><div class='del'>-do {									\</div><div class='del'>-	unsigned _i;							\</div><div class='del'>-									\</div><div class='del'>-	for (_i = 0; _i &lt; ARRAY_SIZE(_map); _i++)			\</div><div class='del'>-		if ((_in) &amp; (1 &lt;&lt; _i))					\</div><div class='del'>-			(_out) |= _map[_i];				\</div><div class='del'>-		else							\</div><div class='del'>-			(_out) &amp;= ~_map[_i];				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define map_flags(_map, _in)						\</div><div class='del'>-({									\</div><div class='del'>-	unsigned _out = 0;						\</div><div class='del'>-									\</div><div class='del'>-	set_flags(_map, _in, _out);					\</div><div class='del'>-	_out;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define map_flags_rev(_map, _in)					\</div><div class='del'>-({									\</div><div class='del'>-	unsigned _i, _out = 0;						\</div><div class='del'>-									\</div><div class='del'>-	for (_i = 0; _i &lt; ARRAY_SIZE(_map); _i++)			\</div><div class='del'>-		if ((_in) &amp; _map[_i]) {					\</div><div class='del'>-			(_out) |= 1 &lt;&lt; _i;				\</div><div class='del'>-			(_in) &amp;= ~_map[_i];				\</div><div class='del'>-		}							\</div><div class='del'>-	(_out);								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define map_defined(_map)						\</div><div class='del'>-({									\</div><div class='del'>-	unsigned _in = ~0;						\</div><div class='del'>-									\</div><div class='del'>-	map_flags_rev(_map, _in);					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* Set VFS inode flags from bcachefs inode: */</div><div class='del'>-static inline void bch2_inode_flags_to_vfs(struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	set_flags(bch_flags_to_vfs, inode-&gt;ei_inode.bi_flags, inode-&gt;v.i_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long bch2_fs_file_ioctl(struct file *, unsigned, unsigned long);</div><div class='del'>-long bch2_compat_fs_ioctl(struct file *, unsigned, unsigned long);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_IOCTL_H */</div><div class='head'>diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c<br/>deleted file mode 100644<br/>index ec419b8e2c43..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1976 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "chardev.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "fs-common.h"</div><div class='del'>-#include "fs-io.h"</div><div class='del'>-#include "fs-ioctl.h"</div><div class='del'>-#include "fs-io-buffered.h"</div><div class='del'>-#include "fs-io-direct.h"</div><div class='del'>-#include "fs-io-pagecache.h"</div><div class='del'>-#include "fsck.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/aio.h&gt;</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/exportfs.h&gt;</div><div class='del'>-#include &lt;linux/fiemap.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/statfs.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-</div><div class='del'>-static struct kmem_cache *bch2_inode_cache;</div><div class='del'>-</div><div class='del'>-static void bch2_vfs_inode_init(struct btree_trans *, subvol_inum,</div><div class='del'>-				struct bch_inode_info *,</div><div class='del'>-				struct bch_inode_unpacked *,</div><div class='del'>-				struct bch_subvolume *);</div><div class='del'>-</div><div class='del'>-void bch2_inode_update_after_write(struct btree_trans *trans,</div><div class='del'>-				   struct bch_inode_info *inode,</div><div class='del'>-				   struct bch_inode_unpacked *bi,</div><div class='del'>-				   unsigned fields)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bi-&gt;bi_inum != inode-&gt;v.i_ino);</div><div class='del'>-</div><div class='del'>-	bch2_assert_pos_locked(trans, BTREE_ID_inodes,</div><div class='del'>-			       POS(0, bi-&gt;bi_inum),</div><div class='del'>-			       c-&gt;opts.inodes_use_key_cache);</div><div class='del'>-</div><div class='del'>-	set_nlink(&amp;inode-&gt;v, bch2_inode_nlink_get(bi));</div><div class='del'>-	i_uid_write(&amp;inode-&gt;v, bi-&gt;bi_uid);</div><div class='del'>-	i_gid_write(&amp;inode-&gt;v, bi-&gt;bi_gid);</div><div class='del'>-	inode-&gt;v.i_mode	= bi-&gt;bi_mode;</div><div class='del'>-</div><div class='del'>-	if (fields &amp; ATTR_ATIME)</div><div class='del'>-		inode_set_atime_to_ts(&amp;inode-&gt;v, bch2_time_to_timespec(c, bi-&gt;bi_atime));</div><div class='del'>-	if (fields &amp; ATTR_MTIME)</div><div class='del'>-		inode_set_mtime_to_ts(&amp;inode-&gt;v, bch2_time_to_timespec(c, bi-&gt;bi_mtime));</div><div class='del'>-	if (fields &amp; ATTR_CTIME)</div><div class='del'>-		inode_set_ctime_to_ts(&amp;inode-&gt;v, bch2_time_to_timespec(c, bi-&gt;bi_ctime));</div><div class='del'>-</div><div class='del'>-	inode-&gt;ei_inode		= *bi;</div><div class='del'>-</div><div class='del'>-	bch2_inode_flags_to_vfs(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __must_check bch2_write_inode(struct bch_fs *c,</div><div class='del'>-				  struct bch_inode_info *inode,</div><div class='del'>-				  inode_set_fn set,</div><div class='del'>-				  void *p, unsigned fields)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_inode_peek(trans, &amp;iter, &amp;inode_u, inode_inum(inode),</div><div class='del'>-				BTREE_ITER_INTENT) ?:</div><div class='del'>-		(set ? set(trans, inode, &amp;inode_u, p) : 0) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;iter, &amp;inode_u) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the btree node lock protects inode-&gt;ei_inode, not ei_update_lock;</div><div class='del'>-	 * this is important for inode updates via bchfs_write_index_update</div><div class='del'>-	 */</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_inode_update_after_write(trans, inode, &amp;inode_u, fields);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_fs_fatal_err_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-			     "inode %u:%llu not found when updating",</div><div class='del'>-			     inode_inum(inode).subvol,</div><div class='del'>-			     inode_inum(inode).inum);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_quota_transfer(struct bch_fs *c,</div><div class='del'>-			   struct bch_inode_info *inode,</div><div class='del'>-			   struct bch_qid new_qid,</div><div class='del'>-			   unsigned qtypes,</div><div class='del'>-			   enum quota_acct_mode mode)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	qtypes &amp;= enabled_qtypes(c);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; QTYP_NR; i++)</div><div class='del'>-		if (new_qid.q[i] == inode-&gt;ei_qid.q[i])</div><div class='del'>-			qtypes &amp;= ~(1U &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-	if (!qtypes)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-</div><div class='del'>-	ret = bch2_quota_transfer(c, qtypes, new_qid,</div><div class='del'>-				  inode-&gt;ei_qid,</div><div class='del'>-				  inode-&gt;v.i_blocks +</div><div class='del'>-				  inode-&gt;ei_quota_reserved,</div><div class='del'>-				  mode);</div><div class='del'>-	if (!ret)</div><div class='del'>-		for (i = 0; i &lt; QTYP_NR; i++)</div><div class='del'>-			if (qtypes &amp; (1 &lt;&lt; i))</div><div class='del'>-				inode-&gt;ei_qid.q[i] = new_qid.q[i];</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_iget5_test(struct inode *vinode, void *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	subvol_inum *inum = p;</div><div class='del'>-</div><div class='del'>-	return inode-&gt;ei_subvol == inum-&gt;subvol &amp;&amp;</div><div class='del'>-		inode-&gt;ei_inode.bi_inum == inum-&gt;inum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_iget5_set(struct inode *vinode, void *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	subvol_inum *inum = p;</div><div class='del'>-</div><div class='del'>-	inode-&gt;v.i_ino		= inum-&gt;inum;</div><div class='del'>-	inode-&gt;ei_subvol	= inum-&gt;subvol;</div><div class='del'>-	inode-&gt;ei_inode.bi_inum	= inum-&gt;inum;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned bch2_inode_hash(subvol_inum inum)</div><div class='del'>-{</div><div class='del'>-	return jhash_3words(inum.subvol, inum.inum &gt;&gt; 32, inum.inum, JHASH_INITVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct inode *bch2_vfs_inode_get(struct bch_fs *c, subvol_inum inum)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	struct bch_inode_info *inode;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct bch_subvolume subvol;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	inode = to_bch_ei(iget5_locked(c-&gt;vfs_sb,</div><div class='del'>-				       bch2_inode_hash(inum),</div><div class='del'>-				       bch2_iget5_test,</div><div class='del'>-				       bch2_iget5_set,</div><div class='del'>-				       &amp;inum));</div><div class='del'>-	if (unlikely(!inode))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;v.i_state &amp; I_NEW))</div><div class='del'>-		return &amp;inode-&gt;v;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-	ret = lockrestart_do(trans,</div><div class='del'>-		bch2_subvolume_get(trans, inum.subvol, true, 0, &amp;subvol) ?:</div><div class='del'>-		bch2_inode_find_by_inum_trans(trans, inum, &amp;inode_u));</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_vfs_inode_init(trans, inum, inode, &amp;inode_u, &amp;subvol);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		iget_failed(&amp;inode-&gt;v);</div><div class='del'>-		return ERR_PTR(bch2_err_class(ret));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-	list_add(&amp;inode-&gt;ei_vfs_inode_list, &amp;c-&gt;vfs_inodes_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-</div><div class='del'>-	unlock_new_inode(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	return &amp;inode-&gt;v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_inode_info *</div><div class='del'>-__bch2_create(struct mnt_idmap *idmap,</div><div class='del'>-	      struct bch_inode_info *dir, struct dentry *dentry,</div><div class='del'>-	      umode_t mode, dev_t rdev, subvol_inum snapshot_src,</div><div class='del'>-	      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = dir-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct bch_inode_unpacked dir_u;</div><div class='del'>-	struct bch_inode_info *inode, *old;</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	struct posix_acl *default_acl = NULL, *acl = NULL;</div><div class='del'>-	subvol_inum inum;</div><div class='del'>-	struct bch_subvolume subvol;</div><div class='del'>-	u64 journal_seq = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * preallocate acls + vfs inode before btree transaction, so that</div><div class='del'>-	 * nothing can fail after the transaction succeeds:</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	ret = posix_acl_create(&amp;dir-&gt;v, &amp;mode, &amp;default_acl, &amp;acl);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-#endif</div><div class='del'>-	inode = to_bch_ei(new_inode(c-&gt;vfs_sb));</div><div class='del'>-	if (unlikely(!inode)) {</div><div class='del'>-		inode = ERR_PTR(-ENOMEM);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_inode_init_early(c, &amp;inode_u);</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_CREATE_TMPFILE))</div><div class='del'>-		mutex_lock(&amp;dir-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvol_is_ro_trans(trans, dir-&gt;ei_subvol) ?:</div><div class='del'>-		bch2_create_trans(trans,</div><div class='del'>-				  inode_inum(dir), &amp;dir_u, &amp;inode_u,</div><div class='del'>-				  !(flags &amp; BCH_CREATE_TMPFILE)</div><div class='del'>-				  ? &amp;dentry-&gt;d_name : NULL,</div><div class='del'>-				  from_kuid(i_user_ns(&amp;dir-&gt;v), current_fsuid()),</div><div class='del'>-				  from_kgid(i_user_ns(&amp;dir-&gt;v), current_fsgid()),</div><div class='del'>-				  mode, rdev,</div><div class='del'>-				  default_acl, acl, snapshot_src, flags) ?:</div><div class='del'>-		bch2_quota_acct(c, bch_qid(&amp;inode_u), Q_INO, 1,</div><div class='del'>-				KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err_before_quota;</div><div class='del'>-</div><div class='del'>-	inum.subvol = inode_u.bi_subvol ?: dir-&gt;ei_subvol;</div><div class='del'>-	inum.inum = inode_u.bi_inum;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvolume_get(trans, inum.subvol, true,</div><div class='del'>-				   BTREE_ITER_WITH_UPDATES, &amp;subvol) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, &amp;journal_seq, 0);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		bch2_quota_acct(c, bch_qid(&amp;inode_u), Q_INO, -1,</div><div class='del'>-				KEY_TYPE_QUOTA_WARN);</div><div class='del'>-err_before_quota:</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto retry;</div><div class='del'>-		goto err_trans;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_CREATE_TMPFILE)) {</div><div class='del'>-		bch2_inode_update_after_write(trans, dir, &amp;dir_u,</div><div class='del'>-					      ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-		mutex_unlock(&amp;dir-&gt;ei_update_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_iget5_set(&amp;inode-&gt;v, &amp;inum);</div><div class='del'>-	bch2_vfs_inode_init(trans, inum, inode, &amp;inode_u, &amp;subvol);</div><div class='del'>-</div><div class='del'>-	set_cached_acl(&amp;inode-&gt;v, ACL_TYPE_ACCESS, acl);</div><div class='del'>-	set_cached_acl(&amp;inode-&gt;v, ACL_TYPE_DEFAULT, default_acl);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we must insert the new inode into the inode cache before calling</div><div class='del'>-	 * bch2_trans_exit() and dropping locks, else we could race with another</div><div class='del'>-	 * thread pulling the inode in and modifying it:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	inode-&gt;v.i_state |= I_CREATING;</div><div class='del'>-</div><div class='del'>-	old = to_bch_ei(inode_insert5(&amp;inode-&gt;v,</div><div class='del'>-				      bch2_inode_hash(inum),</div><div class='del'>-				      bch2_iget5_test,</div><div class='del'>-				      bch2_iget5_set,</div><div class='del'>-				      &amp;inum));</div><div class='del'>-	BUG_ON(!old);</div><div class='del'>-</div><div class='del'>-	if (unlikely(old != inode)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We raced, another process pulled the new inode into cache</div><div class='del'>-		 * before us:</div><div class='del'>-		 */</div><div class='del'>-		make_bad_inode(&amp;inode-&gt;v);</div><div class='del'>-		iput(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-		inode = old;</div><div class='del'>-	} else {</div><div class='del'>-		mutex_lock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-		list_add(&amp;inode-&gt;ei_vfs_inode_list, &amp;c-&gt;vfs_inodes_list);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-		/*</div><div class='del'>-		 * we really don't want insert_inode_locked2() to be setting</div><div class='del'>-		 * I_NEW...</div><div class='del'>-		 */</div><div class='del'>-		unlock_new_inode(&amp;inode-&gt;v);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-err:</div><div class='del'>-	posix_acl_release(default_acl);</div><div class='del'>-	posix_acl_release(acl);</div><div class='del'>-	return inode;</div><div class='del'>-err_trans:</div><div class='del'>-	if (!(flags &amp; BCH_CREATE_TMPFILE))</div><div class='del'>-		mutex_unlock(&amp;dir-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	make_bad_inode(&amp;inode-&gt;v);</div><div class='del'>-	iput(&amp;inode-&gt;v);</div><div class='del'>-	inode = ERR_PTR(ret);</div><div class='del'>-	goto err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-static struct dentry *bch2_lookup(struct inode *vdir, struct dentry *dentry,</div><div class='del'>-				  unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vdir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *dir = to_bch_ei(vdir);</div><div class='del'>-	struct bch_hash_info hash = bch2_hash_info_init(c, &amp;dir-&gt;ei_inode);</div><div class='del'>-	struct inode *vinode = NULL;</div><div class='del'>-	subvol_inum inum = { .subvol = 1 };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_lookup(c, inode_inum(dir), &amp;hash,</div><div class='del'>-				 &amp;dentry-&gt;d_name, &amp;inum);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		vinode = bch2_vfs_inode_get(c, inum);</div><div class='del'>-</div><div class='del'>-	return d_splice_alias(vinode, dentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_mknod(struct mnt_idmap *idmap,</div><div class='del'>-		      struct inode *vdir, struct dentry *dentry,</div><div class='del'>-		      umode_t mode, dev_t rdev)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode =</div><div class='del'>-		__bch2_create(idmap, to_bch_ei(vdir), dentry, mode, rdev,</div><div class='del'>-			      (subvol_inum) { 0 }, 0);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(inode))</div><div class='del'>-		return bch2_err_class(PTR_ERR(inode));</div><div class='del'>-</div><div class='del'>-	d_instantiate(dentry, &amp;inode-&gt;v);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_create(struct mnt_idmap *idmap,</div><div class='del'>-		       struct inode *vdir, struct dentry *dentry,</div><div class='del'>-		       umode_t mode, bool excl)</div><div class='del'>-{</div><div class='del'>-	return bch2_mknod(idmap, vdir, dentry, mode|S_IFREG, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_link(struct bch_fs *c,</div><div class='del'>-		       struct bch_inode_info *inode,</div><div class='del'>-		       struct bch_inode_info *dir,</div><div class='del'>-		       struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct bch_inode_unpacked dir_u, inode_u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_link_trans(trans,</div><div class='del'>-					inode_inum(dir),   &amp;dir_u,</div><div class='del'>-					inode_inum(inode), &amp;inode_u,</div><div class='del'>-					&amp;dentry-&gt;d_name));</div><div class='del'>-</div><div class='del'>-	if (likely(!ret)) {</div><div class='del'>-		bch2_inode_update_after_write(trans, dir, &amp;dir_u,</div><div class='del'>-					      ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-		bch2_inode_update_after_write(trans, inode, &amp;inode_u, ATTR_CTIME);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_link(struct dentry *old_dentry, struct inode *vdir,</div><div class='del'>-		     struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vdir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *dir = to_bch_ei(vdir);</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(old_dentry-&gt;d_inode);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;inode-&gt;v.i_rwsem);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvol_is_ro(c, dir-&gt;ei_subvol) ?:</div><div class='del'>-		bch2_subvol_is_ro(c, inode-&gt;ei_subvol) ?:</div><div class='del'>-		__bch2_link(c, inode, dir, dentry);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ihold(&amp;inode-&gt;v);</div><div class='del'>-	d_instantiate(dentry, &amp;inode-&gt;v);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_unlink(struct inode *vdir, struct dentry *dentry,</div><div class='del'>-		  bool deleting_snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vdir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *dir = to_bch_ei(vdir);</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(dentry-&gt;d_inode);</div><div class='del'>-	struct bch_inode_unpacked dir_u, inode_u;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_lock_inodes(INODE_UPDATE_LOCK, dir, inode);</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL,</div><div class='del'>-			BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		bch2_unlink_trans(trans,</div><div class='del'>-				  inode_inum(dir), &amp;dir_u,</div><div class='del'>-				  &amp;inode_u, &amp;dentry-&gt;d_name,</div><div class='del'>-				  deleting_snapshot));</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_inode_update_after_write(trans, dir, &amp;dir_u,</div><div class='del'>-				      ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-	bch2_inode_update_after_write(trans, inode, &amp;inode_u,</div><div class='del'>-				      ATTR_MTIME);</div><div class='del'>-</div><div class='del'>-	if (inode_u.bi_subvol) {</div><div class='del'>-		/*</div><div class='del'>-		 * Subvolume deletion is asynchronous, but we still want to tell</div><div class='del'>-		 * the VFS that it's been deleted here:</div><div class='del'>-		 */</div><div class='del'>-		set_nlink(&amp;inode-&gt;v, 0);</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_unlock_inodes(INODE_UPDATE_LOCK, dir, inode);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_unlink(struct inode *vdir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *dir= to_bch_ei(vdir);</div><div class='del'>-	struct bch_fs *c = dir-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	return bch2_subvol_is_ro(c, dir-&gt;ei_subvol) ?:</div><div class='del'>-		__bch2_unlink(vdir, dentry, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_symlink(struct mnt_idmap *idmap,</div><div class='del'>-			struct inode *vdir, struct dentry *dentry,</div><div class='del'>-			const char *symname)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vdir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *dir = to_bch_ei(vdir), *inode;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	inode = __bch2_create(idmap, dir, dentry, S_IFLNK|S_IRWXUGO, 0,</div><div class='del'>-			      (subvol_inum) { 0 }, BCH_CREATE_TMPFILE);</div><div class='del'>-	if (IS_ERR(inode))</div><div class='del'>-		return bch2_err_class(PTR_ERR(inode));</div><div class='del'>-</div><div class='del'>-	inode_lock(&amp;inode-&gt;v);</div><div class='del'>-	ret = page_symlink(&amp;inode-&gt;v, symname, strlen(symname) + 1);</div><div class='del'>-	inode_unlock(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = filemap_write_and_wait_range(inode-&gt;v.i_mapping, 0, LLONG_MAX);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = __bch2_link(c, inode, dir, dentry);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	d_instantiate(dentry, &amp;inode-&gt;v);</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	iput(&amp;inode-&gt;v);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_mkdir(struct mnt_idmap *idmap,</div><div class='del'>-		      struct inode *vdir, struct dentry *dentry, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	return bch2_mknod(idmap, vdir, dentry, mode|S_IFDIR, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_rename2(struct mnt_idmap *idmap,</div><div class='del'>-			struct inode *src_vdir, struct dentry *src_dentry,</div><div class='del'>-			struct inode *dst_vdir, struct dentry *dst_dentry,</div><div class='del'>-			unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = src_vdir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *src_dir = to_bch_ei(src_vdir);</div><div class='del'>-	struct bch_inode_info *dst_dir = to_bch_ei(dst_vdir);</div><div class='del'>-	struct bch_inode_info *src_inode = to_bch_ei(src_dentry-&gt;d_inode);</div><div class='del'>-	struct bch_inode_info *dst_inode = to_bch_ei(dst_dentry-&gt;d_inode);</div><div class='del'>-	struct bch_inode_unpacked dst_dir_u, src_dir_u;</div><div class='del'>-	struct bch_inode_unpacked src_inode_u, dst_inode_u;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	enum bch_rename_mode mode = flags &amp; RENAME_EXCHANGE</div><div class='del'>-		? BCH_RENAME_EXCHANGE</div><div class='del'>-		: dst_dentry-&gt;d_inode</div><div class='del'>-		? BCH_RENAME_OVERWRITE : BCH_RENAME;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; ~(RENAME_NOREPLACE|RENAME_EXCHANGE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_OVERWRITE) {</div><div class='del'>-		ret = filemap_write_and_wait_range(src_inode-&gt;v.i_mapping,</div><div class='del'>-						   0, LLONG_MAX);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	bch2_lock_inodes(INODE_UPDATE_LOCK,</div><div class='del'>-			 src_dir,</div><div class='del'>-			 dst_dir,</div><div class='del'>-			 src_inode,</div><div class='del'>-			 dst_inode);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvol_is_ro_trans(trans, src_dir-&gt;ei_subvol) ?:</div><div class='del'>-		bch2_subvol_is_ro_trans(trans, dst_dir-&gt;ei_subvol);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (inode_attr_changing(dst_dir, src_inode, Inode_opt_project)) {</div><div class='del'>-		ret = bch2_fs_quota_transfer(c, src_inode,</div><div class='del'>-					     dst_dir-&gt;ei_qid,</div><div class='del'>-					     1 &lt;&lt; QTYP_PRJ,</div><div class='del'>-					     KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode == BCH_RENAME_EXCHANGE &amp;&amp;</div><div class='del'>-	    inode_attr_changing(src_dir, dst_inode, Inode_opt_project)) {</div><div class='del'>-		ret = bch2_fs_quota_transfer(c, dst_inode,</div><div class='del'>-					     src_dir-&gt;ei_qid,</div><div class='del'>-					     1 &lt;&lt; QTYP_PRJ,</div><div class='del'>-					     KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_rename_trans(trans,</div><div class='del'>-					  inode_inum(src_dir), &amp;src_dir_u,</div><div class='del'>-					  inode_inum(dst_dir), &amp;dst_dir_u,</div><div class='del'>-					  &amp;src_inode_u,</div><div class='del'>-					  &amp;dst_inode_u,</div><div class='del'>-					  &amp;src_dentry-&gt;d_name,</div><div class='del'>-					  &amp;dst_dentry-&gt;d_name,</div><div class='del'>-					  mode));</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(src_inode-&gt;v.i_ino != src_inode_u.bi_inum);</div><div class='del'>-	BUG_ON(dst_inode &amp;&amp;</div><div class='del'>-	       dst_inode-&gt;v.i_ino != dst_inode_u.bi_inum);</div><div class='del'>-</div><div class='del'>-	bch2_inode_update_after_write(trans, src_dir, &amp;src_dir_u,</div><div class='del'>-				      ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-</div><div class='del'>-	if (src_dir != dst_dir)</div><div class='del'>-		bch2_inode_update_after_write(trans, dst_dir, &amp;dst_dir_u,</div><div class='del'>-					      ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-</div><div class='del'>-	bch2_inode_update_after_write(trans, src_inode, &amp;src_inode_u,</div><div class='del'>-				      ATTR_CTIME);</div><div class='del'>-</div><div class='del'>-	if (dst_inode)</div><div class='del'>-		bch2_inode_update_after_write(trans, dst_inode, &amp;dst_inode_u,</div><div class='del'>-					      ATTR_CTIME);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	bch2_fs_quota_transfer(c, src_inode,</div><div class='del'>-			       bch_qid(&amp;src_inode-&gt;ei_inode),</div><div class='del'>-			       1 &lt;&lt; QTYP_PRJ,</div><div class='del'>-			       KEY_TYPE_QUOTA_NOCHECK);</div><div class='del'>-	if (dst_inode)</div><div class='del'>-		bch2_fs_quota_transfer(c, dst_inode,</div><div class='del'>-				       bch_qid(&amp;dst_inode-&gt;ei_inode),</div><div class='del'>-				       1 &lt;&lt; QTYP_PRJ,</div><div class='del'>-				       KEY_TYPE_QUOTA_NOCHECK);</div><div class='del'>-</div><div class='del'>-	bch2_unlock_inodes(INODE_UPDATE_LOCK,</div><div class='del'>-			   src_dir,</div><div class='del'>-			   dst_dir,</div><div class='del'>-			   src_inode,</div><div class='del'>-			   dst_inode);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_setattr_copy(struct mnt_idmap *idmap,</div><div class='del'>-			      struct bch_inode_info *inode,</div><div class='del'>-			      struct bch_inode_unpacked *bi,</div><div class='del'>-			      struct iattr *attr)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	unsigned int ia_valid = attr-&gt;ia_valid;</div><div class='del'>-</div><div class='del'>-	if (ia_valid &amp; ATTR_UID)</div><div class='del'>-		bi-&gt;bi_uid = from_kuid(i_user_ns(&amp;inode-&gt;v), attr-&gt;ia_uid);</div><div class='del'>-	if (ia_valid &amp; ATTR_GID)</div><div class='del'>-		bi-&gt;bi_gid = from_kgid(i_user_ns(&amp;inode-&gt;v), attr-&gt;ia_gid);</div><div class='del'>-</div><div class='del'>-	if (ia_valid &amp; ATTR_SIZE)</div><div class='del'>-		bi-&gt;bi_size = attr-&gt;ia_size;</div><div class='del'>-</div><div class='del'>-	if (ia_valid &amp; ATTR_ATIME)</div><div class='del'>-		bi-&gt;bi_atime = timespec_to_bch2_time(c, attr-&gt;ia_atime);</div><div class='del'>-	if (ia_valid &amp; ATTR_MTIME)</div><div class='del'>-		bi-&gt;bi_mtime = timespec_to_bch2_time(c, attr-&gt;ia_mtime);</div><div class='del'>-	if (ia_valid &amp; ATTR_CTIME)</div><div class='del'>-		bi-&gt;bi_ctime = timespec_to_bch2_time(c, attr-&gt;ia_ctime);</div><div class='del'>-</div><div class='del'>-	if (ia_valid &amp; ATTR_MODE) {</div><div class='del'>-		umode_t mode = attr-&gt;ia_mode;</div><div class='del'>-		kgid_t gid = ia_valid &amp; ATTR_GID</div><div class='del'>-			? attr-&gt;ia_gid</div><div class='del'>-			: inode-&gt;v.i_gid;</div><div class='del'>-</div><div class='del'>-		if (!in_group_p(gid) &amp;&amp;</div><div class='del'>-		    !capable_wrt_inode_uidgid(idmap, &amp;inode-&gt;v, CAP_FSETID))</div><div class='del'>-			mode &amp;= ~S_ISGID;</div><div class='del'>-		bi-&gt;bi_mode = mode;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_setattr_nonsize(struct mnt_idmap *idmap,</div><div class='del'>-			 struct bch_inode_info *inode,</div><div class='del'>-			 struct iattr *attr)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_qid qid;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter inode_iter = { NULL };</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	struct posix_acl *acl = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	qid = inode-&gt;ei_qid;</div><div class='del'>-</div><div class='del'>-	if (attr-&gt;ia_valid &amp; ATTR_UID)</div><div class='del'>-		qid.q[QTYP_USR] = from_kuid(i_user_ns(&amp;inode-&gt;v), attr-&gt;ia_uid);</div><div class='del'>-</div><div class='del'>-	if (attr-&gt;ia_valid &amp; ATTR_GID)</div><div class='del'>-		qid.q[QTYP_GRP] = from_kgid(i_user_ns(&amp;inode-&gt;v), attr-&gt;ia_gid);</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_quota_transfer(c, inode, qid, ~0,</div><div class='del'>-				     KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-	kfree(acl);</div><div class='del'>-	acl = NULL;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;inode_iter, &amp;inode_u, inode_inum(inode),</div><div class='del'>-			      BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto btree_err;</div><div class='del'>-</div><div class='del'>-	bch2_setattr_copy(idmap, inode, &amp;inode_u, attr);</div><div class='del'>-</div><div class='del'>-	if (attr-&gt;ia_valid &amp; ATTR_MODE) {</div><div class='del'>-		ret = bch2_acl_chmod(trans, inode_inum(inode), &amp;inode_u,</div><div class='del'>-				     inode_u.bi_mode, &amp;acl);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto btree_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret =   bch2_inode_write(trans, &amp;inode_iter, &amp;inode_u) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-btree_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err_trans;</div><div class='del'>-</div><div class='del'>-	bch2_inode_update_after_write(trans, inode, &amp;inode_u, attr-&gt;ia_valid);</div><div class='del'>-</div><div class='del'>-	if (acl)</div><div class='del'>-		set_cached_acl(&amp;inode-&gt;v, ACL_TYPE_ACCESS, acl);</div><div class='del'>-err_trans:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-err:</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_getattr(struct mnt_idmap *idmap,</div><div class='del'>-			const struct path *path, struct kstat *stat,</div><div class='del'>-			u32 request_mask, unsigned query_flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(d_inode(path-&gt;dentry));</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	stat-&gt;dev	= inode-&gt;v.i_sb-&gt;s_dev;</div><div class='del'>-	stat-&gt;ino	= inode-&gt;v.i_ino;</div><div class='del'>-	stat-&gt;mode	= inode-&gt;v.i_mode;</div><div class='del'>-	stat-&gt;nlink	= inode-&gt;v.i_nlink;</div><div class='del'>-	stat-&gt;uid	= inode-&gt;v.i_uid;</div><div class='del'>-	stat-&gt;gid	= inode-&gt;v.i_gid;</div><div class='del'>-	stat-&gt;rdev	= inode-&gt;v.i_rdev;</div><div class='del'>-	stat-&gt;size	= i_size_read(&amp;inode-&gt;v);</div><div class='del'>-	stat-&gt;atime	= inode_get_atime(&amp;inode-&gt;v);</div><div class='del'>-	stat-&gt;mtime	= inode_get_mtime(&amp;inode-&gt;v);</div><div class='del'>-	stat-&gt;ctime	= inode_get_ctime(&amp;inode-&gt;v);</div><div class='del'>-	stat-&gt;blksize	= block_bytes(c);</div><div class='del'>-	stat-&gt;blocks	= inode-&gt;v.i_blocks;</div><div class='del'>-</div><div class='del'>-	if (request_mask &amp; STATX_BTIME) {</div><div class='del'>-		stat-&gt;result_mask |= STATX_BTIME;</div><div class='del'>-		stat-&gt;btime = bch2_time_to_timespec(c, inode-&gt;ei_inode.bi_otime);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;ei_inode.bi_flags &amp; BCH_INODE_immutable)</div><div class='del'>-		stat-&gt;attributes |= STATX_ATTR_IMMUTABLE;</div><div class='del'>-	stat-&gt;attributes_mask	 |= STATX_ATTR_IMMUTABLE;</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;ei_inode.bi_flags &amp; BCH_INODE_append)</div><div class='del'>-		stat-&gt;attributes |= STATX_ATTR_APPEND;</div><div class='del'>-	stat-&gt;attributes_mask	 |= STATX_ATTR_APPEND;</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;ei_inode.bi_flags &amp; BCH_INODE_nodump)</div><div class='del'>-		stat-&gt;attributes |= STATX_ATTR_NODUMP;</div><div class='del'>-	stat-&gt;attributes_mask	 |= STATX_ATTR_NODUMP;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_setattr(struct mnt_idmap *idmap,</div><div class='del'>-			struct dentry *dentry, struct iattr *iattr)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(dentry-&gt;d_inode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;inode-&gt;v.i_rwsem);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvol_is_ro(c, inode-&gt;ei_subvol) ?:</div><div class='del'>-		setattr_prepare(idmap, dentry, iattr);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return iattr-&gt;ia_valid &amp; ATTR_SIZE</div><div class='del'>-		? bchfs_truncate(idmap, inode, iattr)</div><div class='del'>-		: bch2_setattr_nonsize(idmap, inode, iattr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_tmpfile(struct mnt_idmap *idmap,</div><div class='del'>-			struct inode *vdir, struct file *file, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode =</div><div class='del'>-		__bch2_create(idmap, to_bch_ei(vdir),</div><div class='del'>-			      file-&gt;f_path.dentry, mode, 0,</div><div class='del'>-			      (subvol_inum) { 0 }, BCH_CREATE_TMPFILE);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(inode))</div><div class='del'>-		return bch2_err_class(PTR_ERR(inode));</div><div class='del'>-</div><div class='del'>-	d_mark_tmpfile(file, &amp;inode-&gt;v);</div><div class='del'>-	d_instantiate(file-&gt;f_path.dentry, &amp;inode-&gt;v);</div><div class='del'>-	return finish_open_simple(file, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fill_extent(struct bch_fs *c,</div><div class='del'>-			    struct fiemap_extent_info *info,</div><div class='del'>-			    struct bkey_s_c k, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (bkey_extent_is_direct_data(k.k)) {</div><div class='del'>-		struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-		const union bch_extent_entry *entry;</div><div class='del'>-		struct extent_ptr_decoded p;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type == KEY_TYPE_reflink_v)</div><div class='del'>-			flags |= FIEMAP_EXTENT_SHARED;</div><div class='del'>-</div><div class='del'>-		bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-			int flags2 = 0;</div><div class='del'>-			u64 offset = p.ptr.offset;</div><div class='del'>-</div><div class='del'>-			if (p.ptr.unwritten)</div><div class='del'>-				flags2 |= FIEMAP_EXTENT_UNWRITTEN;</div><div class='del'>-</div><div class='del'>-			if (p.crc.compression_type)</div><div class='del'>-				flags2 |= FIEMAP_EXTENT_ENCODED;</div><div class='del'>-			else</div><div class='del'>-				offset += p.crc.offset;</div><div class='del'>-</div><div class='del'>-			if ((offset &amp; (block_sectors(c) - 1)) ||</div><div class='del'>-			    (k.k-&gt;size &amp; (block_sectors(c) - 1)))</div><div class='del'>-				flags2 |= FIEMAP_EXTENT_NOT_ALIGNED;</div><div class='del'>-</div><div class='del'>-			ret = fiemap_fill_next_extent(info,</div><div class='del'>-						bkey_start_offset(k.k) &lt;&lt; 9,</div><div class='del'>-						offset &lt;&lt; 9,</div><div class='del'>-						k.k-&gt;size &lt;&lt; 9, flags|flags2);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (bkey_extent_is_inline_data(k.k)) {</div><div class='del'>-		return fiemap_fill_next_extent(info,</div><div class='del'>-					       bkey_start_offset(k.k) &lt;&lt; 9,</div><div class='del'>-					       0, k.k-&gt;size &lt;&lt; 9,</div><div class='del'>-					       flags|</div><div class='del'>-					       FIEMAP_EXTENT_DATA_INLINE);</div><div class='del'>-	} else if (k.k-&gt;type == KEY_TYPE_reservation) {</div><div class='del'>-		return fiemap_fill_next_extent(info,</div><div class='del'>-					       bkey_start_offset(k.k) &lt;&lt; 9,</div><div class='del'>-					       0, k.k-&gt;size &lt;&lt; 9,</div><div class='del'>-					       flags|</div><div class='del'>-					       FIEMAP_EXTENT_DELALLOC|</div><div class='del'>-					       FIEMAP_EXTENT_UNWRITTEN);</div><div class='del'>-	} else {</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fiemap(struct inode *vinode, struct fiemap_extent_info *info,</div><div class='del'>-		       u64 start, u64 len)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vinode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *ei = to_bch_ei(vinode);</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf cur, prev;</div><div class='del'>-	struct bpos end = POS(ei-&gt;v.i_ino, (start + len) &gt;&gt; 9);</div><div class='del'>-	unsigned offset_into_extent, sectors;</div><div class='del'>-	bool have_extent = false;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = fiemap_prep(&amp;ei-&gt;v, info, start, &amp;len, FIEMAP_FLAG_SYNC);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (start + len &lt; start)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	start &gt;&gt;= 9;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;cur);</div><div class='del'>-	bch2_bkey_buf_init(&amp;prev);</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, ei-&gt;ei_subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     SPOS(ei-&gt;v.i_ino, start, snapshot), 0);</div><div class='del'>-</div><div class='del'>-	while (!(ret = btree_trans_too_many_iters(trans)) &amp;&amp;</div><div class='del'>-	       (k = bch2_btree_iter_peek_upto(&amp;iter, end)).k &amp;&amp;</div><div class='del'>-	       !(ret = bkey_err(k))) {</div><div class='del'>-		enum btree_id data_btree = BTREE_ID_extents;</div><div class='del'>-</div><div class='del'>-		if (!bkey_extent_is_data(k.k) &amp;&amp;</div><div class='del'>-		    k.k-&gt;type != KEY_TYPE_reservation) {</div><div class='del'>-			bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		offset_into_extent	= iter.pos.offset -</div><div class='del'>-			bkey_start_offset(k.k);</div><div class='del'>-		sectors			= k.k-&gt;size - offset_into_extent;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;cur, c, k);</div><div class='del'>-</div><div class='del'>-		ret = bch2_read_indirect_extent(trans, &amp;data_btree,</div><div class='del'>-					&amp;offset_into_extent, &amp;cur);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		k = bkey_i_to_s_c(cur.k);</div><div class='del'>-		bch2_bkey_buf_realloc(&amp;prev, c, k.k-&gt;u64s);</div><div class='del'>-</div><div class='del'>-		sectors = min(sectors, k.k-&gt;size - offset_into_extent);</div><div class='del'>-</div><div class='del'>-		bch2_cut_front(POS(k.k-&gt;p.inode,</div><div class='del'>-				   bkey_start_offset(k.k) +</div><div class='del'>-				   offset_into_extent),</div><div class='del'>-			       cur.k);</div><div class='del'>-		bch2_key_resize(&amp;cur.k-&gt;k, sectors);</div><div class='del'>-		cur.k-&gt;k.p = iter.pos;</div><div class='del'>-		cur.k-&gt;k.p.offset += cur.k-&gt;k.size;</div><div class='del'>-</div><div class='del'>-		if (have_extent) {</div><div class='del'>-			bch2_trans_unlock(trans);</div><div class='del'>-			ret = bch2_fill_extent(c, info,</div><div class='del'>-					bkey_i_to_s_c(prev.k), 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bkey_copy(prev.k, cur.k);</div><div class='del'>-		have_extent = true;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter,</div><div class='del'>-			POS(iter.pos.inode, iter.pos.offset + sectors));</div><div class='del'>-	}</div><div class='del'>-	start = iter.pos.offset;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; have_extent) {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		ret = bch2_fill_extent(c, info, bkey_i_to_s_c(prev.k),</div><div class='del'>-				       FIEMAP_EXTENT_LAST);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;cur, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;prev, c);</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct vm_operations_struct bch_vm_ops = {</div><div class='del'>-	.fault		= bch2_page_fault,</div><div class='del'>-	.map_pages	= filemap_map_pages,</div><div class='del'>-	.page_mkwrite   = bch2_page_mkwrite,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	file_accessed(file);</div><div class='del'>-</div><div class='del'>-	vma-&gt;vm_ops = &amp;bch_vm_ops;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Directories: */</div><div class='del'>-</div><div class='del'>-static loff_t bch2_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='del'>-{</div><div class='del'>-	return generic_file_llseek_size(file, offset, whence,</div><div class='del'>-					S64_MAX, S64_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_vfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = file_bch_inode(file);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	if (!dir_emit_dots(file, ctx))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	int ret = bch2_readdir(c, inode_inum(inode), ctx);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_open(struct inode *vinode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	if (file-&gt;f_flags &amp; (O_WRONLY|O_RDWR)) {</div><div class='del'>-		struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-		struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-		int ret = bch2_subvol_is_ro(c, inode-&gt;ei_subvol);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return generic_file_open(vinode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations bch_file_operations = {</div><div class='del'>-	.open		= bch2_open,</div><div class='del'>-	.llseek		= bch2_llseek,</div><div class='del'>-	.read_iter	= bch2_read_iter,</div><div class='del'>-	.write_iter	= bch2_write_iter,</div><div class='del'>-	.mmap		= bch2_mmap,</div><div class='del'>-	.fsync		= bch2_fsync,</div><div class='del'>-	.splice_read	= filemap_splice_read,</div><div class='del'>-	.splice_write	= iter_file_splice_write,</div><div class='del'>-	.fallocate	= bch2_fallocate_dispatch,</div><div class='del'>-	.unlocked_ioctl = bch2_fs_file_ioctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl	= bch2_compat_fs_ioctl,</div><div class='del'>-#endif</div><div class='del'>-	.remap_file_range = bch2_remap_file_range,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inode_operations bch_file_inode_operations = {</div><div class='del'>-	.getattr	= bch2_getattr,</div><div class='del'>-	.setattr	= bch2_setattr,</div><div class='del'>-	.fiemap		= bch2_fiemap,</div><div class='del'>-	.listxattr	= bch2_xattr_list,</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	.get_acl	= bch2_get_acl,</div><div class='del'>-	.set_acl	= bch2_set_acl,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inode_operations bch_dir_inode_operations = {</div><div class='del'>-	.lookup		= bch2_lookup,</div><div class='del'>-	.create		= bch2_create,</div><div class='del'>-	.link		= bch2_link,</div><div class='del'>-	.unlink		= bch2_unlink,</div><div class='del'>-	.symlink	= bch2_symlink,</div><div class='del'>-	.mkdir		= bch2_mkdir,</div><div class='del'>-	.rmdir		= bch2_unlink,</div><div class='del'>-	.mknod		= bch2_mknod,</div><div class='del'>-	.rename		= bch2_rename2,</div><div class='del'>-	.getattr	= bch2_getattr,</div><div class='del'>-	.setattr	= bch2_setattr,</div><div class='del'>-	.tmpfile	= bch2_tmpfile,</div><div class='del'>-	.listxattr	= bch2_xattr_list,</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	.get_acl	= bch2_get_acl,</div><div class='del'>-	.set_acl	= bch2_set_acl,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct file_operations bch_dir_file_operations = {</div><div class='del'>-	.llseek		= bch2_dir_llseek,</div><div class='del'>-	.read		= generic_read_dir,</div><div class='del'>-	.iterate_shared	= bch2_vfs_readdir,</div><div class='del'>-	.fsync		= bch2_fsync,</div><div class='del'>-	.unlocked_ioctl = bch2_fs_file_ioctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl	= bch2_compat_fs_ioctl,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inode_operations bch_symlink_inode_operations = {</div><div class='del'>-	.get_link	= page_get_link,</div><div class='del'>-	.getattr	= bch2_getattr,</div><div class='del'>-	.setattr	= bch2_setattr,</div><div class='del'>-	.listxattr	= bch2_xattr_list,</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	.get_acl	= bch2_get_acl,</div><div class='del'>-	.set_acl	= bch2_set_acl,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inode_operations bch_special_inode_operations = {</div><div class='del'>-	.getattr	= bch2_getattr,</div><div class='del'>-	.setattr	= bch2_setattr,</div><div class='del'>-	.listxattr	= bch2_xattr_list,</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	.get_acl	= bch2_get_acl,</div><div class='del'>-	.set_acl	= bch2_set_acl,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct address_space_operations bch_address_space_operations = {</div><div class='del'>-	.read_folio	= bch2_read_folio,</div><div class='del'>-	.writepages	= bch2_writepages,</div><div class='del'>-	.readahead	= bch2_readahead,</div><div class='del'>-	.dirty_folio	= filemap_dirty_folio,</div><div class='del'>-	.write_begin	= bch2_write_begin,</div><div class='del'>-	.write_end	= bch2_write_end,</div><div class='del'>-	.invalidate_folio = bch2_invalidate_folio,</div><div class='del'>-	.release_folio	= bch2_release_folio,</div><div class='del'>-	.direct_IO	= noop_direct_IO,</div><div class='del'>-#ifdef CONFIG_MIGRATION</div><div class='del'>-	.migrate_folio	= filemap_migrate_folio,</div><div class='del'>-#endif</div><div class='del'>-	.error_remove_folio = generic_error_remove_folio,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bcachefs_fid {</div><div class='del'>-	u64		inum;</div><div class='del'>-	u32		subvol;</div><div class='del'>-	u32		gen;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct bcachefs_fid_with_parent {</div><div class='del'>-	struct bcachefs_fid	fid;</div><div class='del'>-	struct bcachefs_fid	dir;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static int bcachefs_fid_valid(int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	switch (fh_type) {</div><div class='del'>-	case FILEID_BCACHEFS_WITHOUT_PARENT:</div><div class='del'>-		return fh_len == sizeof(struct bcachefs_fid) / sizeof(u32);</div><div class='del'>-	case FILEID_BCACHEFS_WITH_PARENT:</div><div class='del'>-		return fh_len == sizeof(struct bcachefs_fid_with_parent) / sizeof(u32);</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bcachefs_fid bch2_inode_to_fid(struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	return (struct bcachefs_fid) {</div><div class='del'>-		.inum	= inode-&gt;ei_inode.bi_inum,</div><div class='del'>-		.subvol	= inode-&gt;ei_subvol,</div><div class='del'>-		.gen	= inode-&gt;ei_inode.bi_generation,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_encode_fh(struct inode *vinode, u32 *fh, int *len,</div><div class='del'>-			  struct inode *vdir)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode	= to_bch_ei(vinode);</div><div class='del'>-	struct bch_inode_info *dir	= to_bch_ei(vdir);</div><div class='del'>-	int min_len;</div><div class='del'>-</div><div class='del'>-	if (!S_ISDIR(inode-&gt;v.i_mode) &amp;&amp; dir) {</div><div class='del'>-		struct bcachefs_fid_with_parent *fid = (void *) fh;</div><div class='del'>-</div><div class='del'>-		min_len = sizeof(*fid) / sizeof(u32);</div><div class='del'>-		if (*len &lt; min_len) {</div><div class='del'>-			*len = min_len;</div><div class='del'>-			return FILEID_INVALID;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fid-&gt;fid = bch2_inode_to_fid(inode);</div><div class='del'>-		fid-&gt;dir = bch2_inode_to_fid(dir);</div><div class='del'>-</div><div class='del'>-		*len = min_len;</div><div class='del'>-		return FILEID_BCACHEFS_WITH_PARENT;</div><div class='del'>-	} else {</div><div class='del'>-		struct bcachefs_fid *fid = (void *) fh;</div><div class='del'>-</div><div class='del'>-		min_len = sizeof(*fid) / sizeof(u32);</div><div class='del'>-		if (*len &lt; min_len) {</div><div class='del'>-			*len = min_len;</div><div class='del'>-			return FILEID_INVALID;</div><div class='del'>-		}</div><div class='del'>-		*fid = bch2_inode_to_fid(inode);</div><div class='del'>-</div><div class='del'>-		*len = min_len;</div><div class='del'>-		return FILEID_BCACHEFS_WITHOUT_PARENT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct inode *bch2_nfs_get_inode(struct super_block *sb,</div><div class='del'>-					struct bcachefs_fid fid)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	struct inode *vinode = bch2_vfs_inode_get(c, (subvol_inum) {</div><div class='del'>-				    .subvol = fid.subvol,</div><div class='del'>-				    .inum = fid.inum,</div><div class='del'>-	});</div><div class='del'>-	if (!IS_ERR(vinode) &amp;&amp; vinode-&gt;i_generation != fid.gen) {</div><div class='del'>-		iput(vinode);</div><div class='del'>-		vinode = ERR_PTR(-ESTALE);</div><div class='del'>-	}</div><div class='del'>-	return vinode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *bch2_fh_to_dentry(struct super_block *sb, struct fid *_fid,</div><div class='del'>-		int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	struct bcachefs_fid *fid = (void *) _fid;</div><div class='del'>-</div><div class='del'>-	if (!bcachefs_fid_valid(fh_len, fh_type))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return d_obtain_alias(bch2_nfs_get_inode(sb, *fid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *bch2_fh_to_parent(struct super_block *sb, struct fid *_fid,</div><div class='del'>-		int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	struct bcachefs_fid_with_parent *fid = (void *) _fid;</div><div class='del'>-</div><div class='del'>-	if (!bcachefs_fid_valid(fh_len, fh_type) ||</div><div class='del'>-	    fh_type != FILEID_BCACHEFS_WITH_PARENT)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return d_obtain_alias(bch2_nfs_get_inode(sb, fid-&gt;dir));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *bch2_get_parent(struct dentry *child)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(child-&gt;d_inode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	subvol_inum parent_inum = {</div><div class='del'>-		.subvol = inode-&gt;ei_inode.bi_parent_subvol ?:</div><div class='del'>-			inode-&gt;ei_subvol,</div><div class='del'>-		.inum = inode-&gt;ei_inode.bi_dir,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return d_obtain_alias(bch2_vfs_inode_get(c, parent_inum));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_get_name(struct dentry *parent, char *name, struct dentry *child)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode	= to_bch_ei(child-&gt;d_inode);</div><div class='del'>-	struct bch_inode_info *dir	= to_bch_ei(parent-&gt;d_inode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter1;</div><div class='del'>-	struct btree_iter iter2;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_s_c_dirent d;</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	subvol_inum target;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	struct qstr dirent_name;</div><div class='del'>-	unsigned name_len = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!S_ISDIR(dir-&gt;v.i_mode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter1, BTREE_ID_dirents,</div><div class='del'>-			     POS(dir-&gt;ei_inode.bi_inum, 0), 0);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter2, BTREE_ID_dirents,</div><div class='del'>-			     POS(dir-&gt;ei_inode.bi_inum, 0), 0);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, dir-&gt;ei_subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_snapshot(&amp;iter1, snapshot);</div><div class='del'>-	bch2_btree_iter_set_snapshot(&amp;iter2, snapshot);</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_find_by_inum_trans(trans, inode_inum(inode), &amp;inode_u);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (inode_u.bi_dir == dir-&gt;ei_inode.bi_inum) {</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter1, POS(inode_u.bi_dir, inode_u.bi_dir_offset));</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;iter1);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_dirent) {</div><div class='del'>-			ret = -BCH_ERR_ENOENT_dirent_doesnt_match_inode;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d = bkey_s_c_to_dirent(k);</div><div class='del'>-		ret = bch2_dirent_read_target(trans, inode_inum(dir), d, &amp;target);</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			ret = -BCH_ERR_ENOENT_dirent_doesnt_match_inode;</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (target.subvol	== inode-&gt;ei_subvol &amp;&amp;</div><div class='del'>-		    target.inum		== inode-&gt;ei_inode.bi_inum)</div><div class='del'>-			goto found;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * File with multiple hardlinks and our backref is to the wrong</div><div class='del'>-		 * directory - linear search:</div><div class='del'>-		 */</div><div class='del'>-		for_each_btree_key_continue_norestart(iter2, 0, k, ret) {</div><div class='del'>-			if (k.k-&gt;p.inode &gt; dir-&gt;ei_inode.bi_inum)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (k.k-&gt;type != KEY_TYPE_dirent)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			d = bkey_s_c_to_dirent(k);</div><div class='del'>-			ret = bch2_dirent_read_target(trans, inode_inum(dir), d, &amp;target);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-			if (ret)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (target.subvol	== inode-&gt;ei_subvol &amp;&amp;</div><div class='del'>-			    target.inum		== inode-&gt;ei_inode.bi_inum)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = -ENOENT;</div><div class='del'>-	goto err;</div><div class='del'>-found:</div><div class='del'>-	dirent_name = bch2_dirent_get_name(d);</div><div class='del'>-</div><div class='del'>-	name_len = min_t(unsigned, dirent_name.len, NAME_MAX);</div><div class='del'>-	memcpy(name, dirent_name.name, name_len);</div><div class='del'>-	name[name_len] = '\0';</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter1);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter2);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct export_operations bch_export_ops = {</div><div class='del'>-	.encode_fh	= bch2_encode_fh,</div><div class='del'>-	.fh_to_dentry	= bch2_fh_to_dentry,</div><div class='del'>-	.fh_to_parent	= bch2_fh_to_parent,</div><div class='del'>-	.get_parent	= bch2_get_parent,</div><div class='del'>-	.get_name	= bch2_get_name,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_vfs_inode_init(struct btree_trans *trans, subvol_inum inum,</div><div class='del'>-				struct bch_inode_info *inode,</div><div class='del'>-				struct bch_inode_unpacked *bi,</div><div class='del'>-				struct bch_subvolume *subvol)</div><div class='del'>-{</div><div class='del'>-	bch2_inode_update_after_write(trans, inode, bi, ~0);</div><div class='del'>-</div><div class='del'>-	if (BCH_SUBVOLUME_SNAP(subvol))</div><div class='del'>-		set_bit(EI_INODE_SNAPSHOT, &amp;inode-&gt;ei_flags);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(EI_INODE_SNAPSHOT, &amp;inode-&gt;ei_flags);</div><div class='del'>-</div><div class='del'>-	inode-&gt;v.i_blocks	= bi-&gt;bi_sectors;</div><div class='del'>-	inode-&gt;v.i_ino		= bi-&gt;bi_inum;</div><div class='del'>-	inode-&gt;v.i_rdev		= bi-&gt;bi_dev;</div><div class='del'>-	inode-&gt;v.i_generation	= bi-&gt;bi_generation;</div><div class='del'>-	inode-&gt;v.i_size		= bi-&gt;bi_size;</div><div class='del'>-</div><div class='del'>-	inode-&gt;ei_flags		= 0;</div><div class='del'>-	inode-&gt;ei_quota_reserved = 0;</div><div class='del'>-	inode-&gt;ei_qid		= bch_qid(bi);</div><div class='del'>-	inode-&gt;ei_subvol	= inum.subvol;</div><div class='del'>-</div><div class='del'>-	inode-&gt;v.i_mapping-&gt;a_ops = &amp;bch_address_space_operations;</div><div class='del'>-</div><div class='del'>-	switch (inode-&gt;v.i_mode &amp; S_IFMT) {</div><div class='del'>-	case S_IFREG:</div><div class='del'>-		inode-&gt;v.i_op	= &amp;bch_file_inode_operations;</div><div class='del'>-		inode-&gt;v.i_fop	= &amp;bch_file_operations;</div><div class='del'>-		break;</div><div class='del'>-	case S_IFDIR:</div><div class='del'>-		inode-&gt;v.i_op	= &amp;bch_dir_inode_operations;</div><div class='del'>-		inode-&gt;v.i_fop	= &amp;bch_dir_file_operations;</div><div class='del'>-		break;</div><div class='del'>-	case S_IFLNK:</div><div class='del'>-		inode_nohighmem(&amp;inode-&gt;v);</div><div class='del'>-		inode-&gt;v.i_op	= &amp;bch_symlink_inode_operations;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		init_special_inode(&amp;inode-&gt;v, inode-&gt;v.i_mode, inode-&gt;v.i_rdev);</div><div class='del'>-		inode-&gt;v.i_op	= &amp;bch_special_inode_operations;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mapping_set_large_folios(inode-&gt;v.i_mapping);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct inode *bch2_alloc_inode(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode;</div><div class='del'>-</div><div class='del'>-	inode = kmem_cache_alloc(bch2_inode_cache, GFP_NOFS);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	inode_init_once(&amp;inode-&gt;v);</div><div class='del'>-	mutex_init(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	two_state_lock_init(&amp;inode-&gt;ei_pagecache_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;inode-&gt;ei_vfs_inode_list);</div><div class='del'>-	mutex_init(&amp;inode-&gt;ei_quota_lock);</div><div class='del'>-</div><div class='del'>-	return &amp;inode-&gt;v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_i_callback(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct inode *vinode = container_of(head, struct inode, i_rcu);</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(bch2_inode_cache, inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_destroy_inode(struct inode *vinode)</div><div class='del'>-{</div><div class='del'>-	call_rcu(&amp;vinode-&gt;i_rcu, bch2_i_callback);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int inode_update_times_fn(struct btree_trans *trans,</div><div class='del'>-				 struct bch_inode_info *inode,</div><div class='del'>-				 struct bch_inode_unpacked *bi,</div><div class='del'>-				 void *p)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	bi-&gt;bi_atime	= timespec_to_bch2_time(c, inode_get_atime(&amp;inode-&gt;v));</div><div class='del'>-	bi-&gt;bi_mtime	= timespec_to_bch2_time(c, inode_get_mtime(&amp;inode-&gt;v));</div><div class='del'>-	bi-&gt;bi_ctime	= timespec_to_bch2_time(c, inode_get_ctime(&amp;inode-&gt;v));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_vfs_write_inode(struct inode *vinode,</div><div class='del'>-				struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vinode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	ret = bch2_write_inode(c, inode, inode_update_times_fn, NULL,</div><div class='del'>-			       ATTR_ATIME|ATTR_MTIME|ATTR_CTIME);</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_evict_inode(struct inode *vinode)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = vinode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-</div><div class='del'>-	truncate_inode_pages_final(&amp;inode-&gt;v.i_data);</div><div class='del'>-</div><div class='del'>-	clear_inode(&amp;inode-&gt;v);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!is_bad_inode(&amp;inode-&gt;v) &amp;&amp; inode-&gt;ei_quota_reserved);</div><div class='del'>-</div><div class='del'>-	if (!inode-&gt;v.i_nlink &amp;&amp; !is_bad_inode(&amp;inode-&gt;v)) {</div><div class='del'>-		bch2_quota_acct(c, inode-&gt;ei_qid, Q_SPC, -((s64) inode-&gt;v.i_blocks),</div><div class='del'>-				KEY_TYPE_QUOTA_WARN);</div><div class='del'>-		bch2_quota_acct(c, inode-&gt;ei_qid, Q_INO, -1,</div><div class='del'>-				KEY_TYPE_QUOTA_WARN);</div><div class='del'>-		bch2_inode_rm(c, inode_inum(inode));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-	list_del_init(&amp;inode-&gt;ei_vfs_inode_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_evict_subvolume_inodes(struct bch_fs *c, snapshot_id_list *s)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode;</div><div class='del'>-	DARRAY(struct bch_inode_info *) grabbed;</div><div class='del'>-	bool clean_pass = false, this_pass_clean;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initially, we scan for inodes without I_DONTCACHE, then mark them to</div><div class='del'>-	 * be pruned with d_mark_dontcache().</div><div class='del'>-	 *</div><div class='del'>-	 * Once we've had a clean pass where we didn't find any inodes without</div><div class='del'>-	 * I_DONTCACHE, we wait for them to be freed:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	darray_init(&amp;grabbed);</div><div class='del'>-	darray_make_room(&amp;grabbed, 1024);</div><div class='del'>-again:</div><div class='del'>-	cond_resched();</div><div class='del'>-	this_pass_clean = true;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-	list_for_each_entry(inode, &amp;c-&gt;vfs_inodes_list, ei_vfs_inode_list) {</div><div class='del'>-		if (!snapshot_list_has_id(s, inode-&gt;ei_subvol))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!(inode-&gt;v.i_state &amp; I_DONTCACHE) &amp;&amp;</div><div class='del'>-		    !(inode-&gt;v.i_state &amp; I_FREEING) &amp;&amp;</div><div class='del'>-		    igrab(&amp;inode-&gt;v)) {</div><div class='del'>-			this_pass_clean = false;</div><div class='del'>-</div><div class='del'>-			if (darray_push_gfp(&amp;grabbed, inode, GFP_ATOMIC|__GFP_NOWARN)) {</div><div class='del'>-				iput(&amp;inode-&gt;v);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if (clean_pass &amp;&amp; this_pass_clean) {</div><div class='del'>-			wait_queue_head_t *wq = bit_waitqueue(&amp;inode-&gt;v.i_state, __I_NEW);</div><div class='del'>-			DEFINE_WAIT_BIT(wait, &amp;inode-&gt;v.i_state, __I_NEW);</div><div class='del'>-</div><div class='del'>-			prepare_to_wait(wq, &amp;wait.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='del'>-			mutex_unlock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-</div><div class='del'>-			schedule();</div><div class='del'>-			finish_wait(wq, &amp;wait.wq_entry);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-</div><div class='del'>-	darray_for_each(grabbed, i) {</div><div class='del'>-		inode = *i;</div><div class='del'>-		d_mark_dontcache(&amp;inode-&gt;v);</div><div class='del'>-		d_prune_aliases(&amp;inode-&gt;v);</div><div class='del'>-		iput(&amp;inode-&gt;v);</div><div class='del'>-	}</div><div class='del'>-	grabbed.nr = 0;</div><div class='del'>-</div><div class='del'>-	if (!clean_pass || !this_pass_clean) {</div><div class='del'>-		clean_pass = this_pass_clean;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	darray_exit(&amp;grabbed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = dentry-&gt;d_sb;</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_fs_usage_short usage = bch2_fs_usage_read_short(c);</div><div class='del'>-	unsigned shift = sb-&gt;s_blocksize_bits - 9;</div><div class='del'>-	/*</div><div class='del'>-	 * this assumes inodes take up 64 bytes, which is a decent average</div><div class='del'>-	 * number:</div><div class='del'>-	 */</div><div class='del'>-	u64 avail_inodes = ((usage.capacity - usage.used) &lt;&lt; 3);</div><div class='del'>-	u64 fsid;</div><div class='del'>-</div><div class='del'>-	buf-&gt;f_type	= BCACHEFS_STATFS_MAGIC;</div><div class='del'>-	buf-&gt;f_bsize	= sb-&gt;s_blocksize;</div><div class='del'>-	buf-&gt;f_blocks	= usage.capacity &gt;&gt; shift;</div><div class='del'>-	buf-&gt;f_bfree	= usage.free &gt;&gt; shift;</div><div class='del'>-	buf-&gt;f_bavail	= avail_factor(usage.free) &gt;&gt; shift;</div><div class='del'>-</div><div class='del'>-	buf-&gt;f_files	= usage.nr_inodes + avail_inodes;</div><div class='del'>-	buf-&gt;f_ffree	= avail_inodes;</div><div class='del'>-</div><div class='del'>-	fsid = le64_to_cpup((void *) c-&gt;sb.user_uuid.b) ^</div><div class='del'>-	       le64_to_cpup((void *) c-&gt;sb.user_uuid.b + sizeof(u64));</div><div class='del'>-	buf-&gt;f_fsid.val[0] = fsid &amp; 0xFFFFFFFFUL;</div><div class='del'>-	buf-&gt;f_fsid.val[1] = (fsid &gt;&gt; 32) &amp; 0xFFFFFFFFUL;</div><div class='del'>-	buf-&gt;f_namelen	= BCH_NAME_MAX;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sync_fs(struct super_block *sb, int wait)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.journal_flush_disabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!wait) {</div><div class='del'>-		bch2_journal_flush_async(&amp;c-&gt;journal, NULL);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_flush(&amp;c-&gt;journal);</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_fs *bch2_path_to_fs(const char *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-	dev_t dev;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = lookup_bdev(path, &amp;dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	c = bch2_dev_to_fs(dev);</div><div class='del'>-	if (c)</div><div class='del'>-		closure_put(&amp;c-&gt;cl);</div><div class='del'>-	return c ?: ERR_PTR(-ENOENT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_remount(struct super_block *sb, int *flags, char *data)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_opts opts = bch2_opts_empty();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_parse_mount_opts(c, &amp;opts, data);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	opt_set(opts, read_only, (*flags &amp; SB_RDONLY) != 0);</div><div class='del'>-</div><div class='del'>-	if (opts.read_only != c-&gt;opts.read_only) {</div><div class='del'>-		down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-		if (opts.read_only) {</div><div class='del'>-			bch2_fs_read_only(c);</div><div class='del'>-</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		} else {</div><div class='del'>-			ret = bch2_fs_read_write(c);</div><div class='del'>-			if (ret) {</div><div class='del'>-				bch_err(c, "error going rw: %i", ret);</div><div class='del'>-				up_write(&amp;c-&gt;state_lock);</div><div class='del'>-				ret = -EINVAL;</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			sb-&gt;s_flags &amp;= ~SB_RDONLY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		c-&gt;opts.read_only = opts.read_only;</div><div class='del'>-</div><div class='del'>-		up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (opt_defined(opts, errors))</div><div class='del'>-		c-&gt;opts.errors = opts.errors;</div><div class='del'>-err:</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_show_devname(struct seq_file *seq, struct dentry *root)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = root-&gt;d_sb-&gt;s_fs_info;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		if (!first)</div><div class='del'>-			seq_putc(seq, ':');</div><div class='del'>-		first = false;</div><div class='del'>-		seq_puts(seq, ca-&gt;disk_sb.sb_name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_show_options(struct seq_file *seq, struct dentry *root)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = root-&gt;d_sb-&gt;s_fs_info;</div><div class='del'>-	enum bch_opt_id i;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bch2_opts_nr; i++) {</div><div class='del'>-		const struct bch_option *opt = &amp;bch2_opt_table[i];</div><div class='del'>-		u64 v = bch2_opt_get_by_id(&amp;c-&gt;opts, i);</div><div class='del'>-</div><div class='del'>-		if (!(opt-&gt;flags &amp; OPT_MOUNT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (v == bch2_opt_get_by_id(&amp;bch2_opts_default, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		bch2_opt_to_text(&amp;buf, c, c-&gt;disk_sb.sb, opt, v,</div><div class='del'>-				 OPT_SHOW_MOUNT_STYLE);</div><div class='del'>-		seq_putc(seq, ',');</div><div class='del'>-		seq_puts(seq, buf.buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (buf.allocation_failure)</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_put_super(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	__bch2_fs_stop(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bcachefs doesn't currently integrate intwrite freeze protection but the</div><div class='del'>- * internal write references serve the same purpose. Therefore reuse the</div><div class='del'>- * read-only transition code to perform the quiesce. The caveat is that we don't</div><div class='del'>- * currently have the ability to block tasks that want a write reference while</div><div class='del'>- * the superblock is frozen. This is fine for now, but we should either add</div><div class='del'>- * blocking support or find a way to integrate sb_start_intwrite() and friends.</div><div class='del'>- */</div><div class='del'>-static int bch2_freeze(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	bch2_fs_read_only(c);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_unfreeze(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_emergency_ro, &amp;c-&gt;flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	ret = bch2_fs_read_write(c);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct super_operations bch_super_operations = {</div><div class='del'>-	.alloc_inode	= bch2_alloc_inode,</div><div class='del'>-	.destroy_inode	= bch2_destroy_inode,</div><div class='del'>-	.write_inode	= bch2_vfs_write_inode,</div><div class='del'>-	.evict_inode	= bch2_evict_inode,</div><div class='del'>-	.sync_fs	= bch2_sync_fs,</div><div class='del'>-	.statfs		= bch2_statfs,</div><div class='del'>-	.show_devname	= bch2_show_devname,</div><div class='del'>-	.show_options	= bch2_show_options,</div><div class='del'>-	.remount_fs	= bch2_remount,</div><div class='del'>-	.put_super	= bch2_put_super,</div><div class='del'>-	.freeze_fs	= bch2_freeze,</div><div class='del'>-	.unfreeze_fs	= bch2_unfreeze,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_set_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	s-&gt;s_fs_info = data;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_noset_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	return -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef DARRAY(struct bch_fs *) darray_fs;</div><div class='del'>-</div><div class='del'>-static int bch2_test_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = s-&gt;s_fs_info;</div><div class='del'>-	darray_fs *d = data;</div><div class='del'>-</div><div class='del'>-	if (!c)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	darray_for_each(*d, i)</div><div class='del'>-		if (c != *i)</div><div class='del'>-			return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *bch2_mount(struct file_system_type *fs_type,</div><div class='del'>-				 int flags, const char *dev_name, void *data)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-	struct super_block *sb;</div><div class='del'>-	struct inode *vinode;</div><div class='del'>-	struct bch_opts opts = bch2_opts_empty();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	opt_set(opts, read_only, (flags &amp; SB_RDONLY) != 0);</div><div class='del'>-</div><div class='del'>-	ret = bch2_parse_mount_opts(NULL, &amp;opts, data);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (!dev_name || strlen(dev_name) == 0)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	darray_str devs;</div><div class='del'>-	ret = bch2_split_devs(dev_name, &amp;devs);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	darray_fs devs_to_fs = {};</div><div class='del'>-	darray_for_each(devs, i) {</div><div class='del'>-		ret = darray_push(&amp;devs_to_fs, bch2_path_to_fs(*i));</div><div class='del'>-		if (ret) {</div><div class='del'>-			sb = ERR_PTR(ret);</div><div class='del'>-			goto got_sb;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb = sget(fs_type, bch2_test_super, bch2_noset_super, flags|SB_NOSEC, &amp;devs_to_fs);</div><div class='del'>-	if (!IS_ERR(sb))</div><div class='del'>-		goto got_sb;</div><div class='del'>-</div><div class='del'>-	c = bch2_fs_open(devs.data, devs.nr, opts);</div><div class='del'>-	if (IS_ERR(c)) {</div><div class='del'>-		sb = ERR_CAST(c);</div><div class='del'>-		goto got_sb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Some options can't be parsed until after the fs is started: */</div><div class='del'>-	ret = bch2_parse_mount_opts(c, &amp;opts, data);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_fs_stop(c);</div><div class='del'>-		sb = ERR_PTR(ret);</div><div class='del'>-		goto got_sb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_opts_apply(&amp;c-&gt;opts, opts);</div><div class='del'>-</div><div class='del'>-	sb = sget(fs_type, NULL, bch2_set_super, flags|SB_NOSEC, c);</div><div class='del'>-	if (IS_ERR(sb))</div><div class='del'>-		bch2_fs_stop(c);</div><div class='del'>-got_sb:</div><div class='del'>-	darray_exit(&amp;devs_to_fs);</div><div class='del'>-	bch2_darray_str_exit(&amp;devs);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(sb)) {</div><div class='del'>-		ret = PTR_ERR(sb);</div><div class='del'>-		ret = bch2_err_class(ret);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_root) {</div><div class='del'>-		if ((flags ^ sb-&gt;s_flags) &amp; SB_RDONLY) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto err_put_super;</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_blocksize		= block_bytes(c);</div><div class='del'>-	sb-&gt;s_blocksize_bits	= ilog2(block_bytes(c));</div><div class='del'>-	sb-&gt;s_maxbytes		= MAX_LFS_FILESIZE;</div><div class='del'>-	sb-&gt;s_op		= &amp;bch_super_operations;</div><div class='del'>-	sb-&gt;s_export_op		= &amp;bch_export_ops;</div><div class='del'>-#ifdef CONFIG_BCACHEFS_QUOTA</div><div class='del'>-	sb-&gt;s_qcop		= &amp;bch2_quotactl_operations;</div><div class='del'>-	sb-&gt;s_quota_types	= QTYPE_MASK_USR|QTYPE_MASK_GRP|QTYPE_MASK_PRJ;</div><div class='del'>-#endif</div><div class='del'>-	sb-&gt;s_xattr		= bch2_xattr_handlers;</div><div class='del'>-	sb-&gt;s_magic		= BCACHEFS_STATFS_MAGIC;</div><div class='del'>-	sb-&gt;s_time_gran		= c-&gt;sb.nsec_per_time_unit;</div><div class='del'>-	sb-&gt;s_time_min		= div_s64(S64_MIN, c-&gt;sb.time_units_per_sec) + 1;</div><div class='del'>-	sb-&gt;s_time_max		= div_s64(S64_MAX, c-&gt;sb.time_units_per_sec);</div><div class='del'>-	c-&gt;vfs_sb		= sb;</div><div class='del'>-	strscpy(sb-&gt;s_id, c-&gt;name, sizeof(sb-&gt;s_id));</div><div class='del'>-</div><div class='del'>-	ret = super_setup_bdi(sb);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_put_super;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_bdi-&gt;ra_pages		= VM_READAHEAD_PAGES;</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		struct block_device *bdev = ca-&gt;disk_sb.bdev;</div><div class='del'>-</div><div class='del'>-		/* XXX: create an anonymous device for multi device filesystems */</div><div class='del'>-		sb-&gt;s_bdev	= bdev;</div><div class='del'>-		sb-&gt;s_dev	= bdev-&gt;bd_dev;</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;dev = sb-&gt;s_dev;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	if (c-&gt;opts.acl)</div><div class='del'>-		sb-&gt;s_flags	|= SB_POSIXACL;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_shrink-&gt;seeks = 0;</div><div class='del'>-</div><div class='del'>-	vinode = bch2_vfs_inode_get(c, BCACHEFS_ROOT_SUBVOL_INUM);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(vinode);</div><div class='del'>-	bch_err_msg(c, ret, "mounting: error getting root inode");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_put_super;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_root = d_make_root(vinode);</div><div class='del'>-	if (!sb-&gt;s_root) {</div><div class='del'>-		bch_err(c, "error mounting: error allocating root dentry");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_put_super;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_flags |= SB_ACTIVE;</div><div class='del'>-out:</div><div class='del'>-	return dget(sb-&gt;s_root);</div><div class='del'>-</div><div class='del'>-err_put_super:</div><div class='del'>-	deactivate_locked_super(sb);</div><div class='del'>-	return ERR_PTR(bch2_err_class(ret));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_kill_sb(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	generic_shutdown_super(sb);</div><div class='del'>-	bch2_fs_free(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct file_system_type bcache_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "bcachefs",</div><div class='del'>-	.mount		= bch2_mount,</div><div class='del'>-	.kill_sb	= bch2_kill_sb,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS_FS("bcachefs");</div><div class='del'>-</div><div class='del'>-void bch2_vfs_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_filesystem(&amp;bcache_fs_type);</div><div class='del'>-	kmem_cache_destroy(bch2_inode_cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init bch2_vfs_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	bch2_inode_cache = KMEM_CACHE(bch_inode_info, SLAB_RECLAIM_ACCOUNT);</div><div class='del'>-	if (!bch2_inode_cache)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = register_filesystem(&amp;bcache_fs_type);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_vfs_exit();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/fs.h b/fs/bcachefs/fs.h<br/>deleted file mode 100644<br/>index c3af7225ff69..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,204 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FS_H</div><div class='del'>-#define _BCACHEFS_FS_H</div><div class='del'>-</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "str_hash.h"</div><div class='del'>-#include "quota_types.h"</div><div class='del'>-#include "two_state_shared_lock.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/seqlock.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-</div><div class='del'>-struct bch_inode_info {</div><div class='del'>-	struct inode		v;</div><div class='del'>-	struct list_head	ei_vfs_inode_list;</div><div class='del'>-	unsigned long		ei_flags;</div><div class='del'>-</div><div class='del'>-	struct mutex		ei_update_lock;</div><div class='del'>-	u64			ei_quota_reserved;</div><div class='del'>-	unsigned long		ei_last_dirtied;</div><div class='del'>-	two_state_lock_t	ei_pagecache_lock;</div><div class='del'>-</div><div class='del'>-	struct mutex		ei_quota_lock;</div><div class='del'>-	struct bch_qid		ei_qid;</div><div class='del'>-</div><div class='del'>-	u32			ei_subvol;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When we've been doing nocow writes we'll need to issue flushes to the</div><div class='del'>-	 * underlying block devices</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: a device may have had a flush issued by some other codepath. It</div><div class='del'>-	 * would be better to keep for each device a sequence number that's</div><div class='del'>-	 * incremented when we isusue a cache flush, and track here the sequence</div><div class='del'>-	 * number that needs flushing.</div><div class='del'>-	 */</div><div class='del'>-	struct bch_devs_mask	ei_devs_need_flush;</div><div class='del'>-</div><div class='del'>-	/* copy of inode in btree: */</div><div class='del'>-	struct bch_inode_unpacked ei_inode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define bch2_pagecache_add_put(i)	bch2_two_state_unlock(&amp;i-&gt;ei_pagecache_lock, 0)</div><div class='del'>-#define bch2_pagecache_add_tryget(i)	bch2_two_state_trylock(&amp;i-&gt;ei_pagecache_lock, 0)</div><div class='del'>-#define bch2_pagecache_add_get(i)	bch2_two_state_lock(&amp;i-&gt;ei_pagecache_lock, 0)</div><div class='del'>-</div><div class='del'>-#define bch2_pagecache_block_put(i)	bch2_two_state_unlock(&amp;i-&gt;ei_pagecache_lock, 1)</div><div class='del'>-#define bch2_pagecache_block_get(i)	bch2_two_state_lock(&amp;i-&gt;ei_pagecache_lock, 1)</div><div class='del'>-</div><div class='del'>-static inline subvol_inum inode_inum(struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	return (subvol_inum) {</div><div class='del'>-		.subvol	= inode-&gt;ei_subvol,</div><div class='del'>-		.inum	= inode-&gt;ei_inode.bi_inum,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set if we've gotten a btree error for this inode, and thus the vfs inode and</div><div class='del'>- * btree inode may be inconsistent:</div><div class='del'>- */</div><div class='del'>-#define EI_INODE_ERROR			0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set in the inode is in a snapshot subvolume - we don't do quota accounting in</div><div class='del'>- * those:</div><div class='del'>- */</div><div class='del'>-#define EI_INODE_SNAPSHOT		1</div><div class='del'>-</div><div class='del'>-#define to_bch_ei(_inode)					\</div><div class='del'>-	container_of_or_null(_inode, struct bch_inode_info, v)</div><div class='del'>-</div><div class='del'>-static inline int ptrcmp(void *l, void *r)</div><div class='del'>-{</div><div class='del'>-	return cmp_int(l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum bch_inode_lock_op {</div><div class='del'>-	INODE_PAGECACHE_BLOCK	= (1U &lt;&lt; 0),</div><div class='del'>-	INODE_UPDATE_LOCK	= (1U &lt;&lt; 1),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define bch2_lock_inodes(_locks, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	struct bch_inode_info *a[] = { NULL, __VA_ARGS__ };		\</div><div class='del'>-	unsigned i;							\</div><div class='del'>-									\</div><div class='del'>-	bubble_sort(&amp;a[1], ARRAY_SIZE(a) - 1, ptrcmp);			\</div><div class='del'>-									\</div><div class='del'>-	for (i = 1; i &lt; ARRAY_SIZE(a); i++)				\</div><div class='del'>-		if (a[i] != a[i - 1]) {					\</div><div class='del'>-			if ((_locks) &amp; INODE_PAGECACHE_BLOCK)		\</div><div class='del'>-				bch2_pagecache_block_get(a[i]);\</div><div class='del'>-			if ((_locks) &amp; INODE_UPDATE_LOCK)			\</div><div class='del'>-				mutex_lock_nested(&amp;a[i]-&gt;ei_update_lock, i);\</div><div class='del'>-		}							\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define bch2_unlock_inodes(_locks, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	struct bch_inode_info *a[] = { NULL, __VA_ARGS__ };		\</div><div class='del'>-	unsigned i;							\</div><div class='del'>-									\</div><div class='del'>-	bubble_sort(&amp;a[1], ARRAY_SIZE(a) - 1, ptrcmp);			\</div><div class='del'>-									\</div><div class='del'>-	for (i = 1; i &lt; ARRAY_SIZE(a); i++)				\</div><div class='del'>-		if (a[i] != a[i - 1]) {					\</div><div class='del'>-			if ((_locks) &amp; INODE_PAGECACHE_BLOCK)		\</div><div class='del'>-				bch2_pagecache_block_put(a[i]);\</div><div class='del'>-			if ((_locks) &amp; INODE_UPDATE_LOCK)			\</div><div class='del'>-				mutex_unlock(&amp;a[i]-&gt;ei_update_lock);	\</div><div class='del'>-		}							\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-static inline struct bch_inode_info *file_bch_inode(struct file *file)</div><div class='del'>-{</div><div class='del'>-	return to_bch_ei(file_inode(file));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool inode_attr_changing(struct bch_inode_info *dir,</div><div class='del'>-				struct bch_inode_info *inode,</div><div class='del'>-				enum inode_opt_id id)</div><div class='del'>-{</div><div class='del'>-	return !(inode-&gt;ei_inode.bi_fields_set &amp; (1 &lt;&lt; id)) &amp;&amp;</div><div class='del'>-		bch2_inode_opt_get(&amp;dir-&gt;ei_inode, id) !=</div><div class='del'>-		bch2_inode_opt_get(&amp;inode-&gt;ei_inode, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool inode_attrs_changing(struct bch_inode_info *dir,</div><div class='del'>-				 struct bch_inode_info *inode)</div><div class='del'>-{</div><div class='del'>-	unsigned id;</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; Inode_opt_nr; id++)</div><div class='del'>-		if (inode_attr_changing(dir, inode, id))</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_inode_unpacked;</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-struct bch_inode_info *</div><div class='del'>-__bch2_create(struct mnt_idmap *, struct bch_inode_info *,</div><div class='del'>-	      struct dentry *, umode_t, dev_t, subvol_inum, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_fs_quota_transfer(struct bch_fs *,</div><div class='del'>-			   struct bch_inode_info *,</div><div class='del'>-			   struct bch_qid,</div><div class='del'>-			   unsigned,</div><div class='del'>-			   enum quota_acct_mode);</div><div class='del'>-</div><div class='del'>-static inline int bch2_set_projid(struct bch_fs *c,</div><div class='del'>-				  struct bch_inode_info *inode,</div><div class='del'>-				  u32 projid)</div><div class='del'>-{</div><div class='del'>-	struct bch_qid qid = inode-&gt;ei_qid;</div><div class='del'>-</div><div class='del'>-	qid.q[QTYP_PRJ] = projid;</div><div class='del'>-</div><div class='del'>-	return bch2_fs_quota_transfer(c, inode, qid,</div><div class='del'>-				      1 &lt;&lt; QTYP_PRJ,</div><div class='del'>-				      KEY_TYPE_QUOTA_PREALLOC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct inode *bch2_vfs_inode_get(struct bch_fs *, subvol_inum);</div><div class='del'>-</div><div class='del'>-/* returns 0 if we want to do the update, or error is passed up */</div><div class='del'>-typedef int (*inode_set_fn)(struct btree_trans *,</div><div class='del'>-			    struct bch_inode_info *,</div><div class='del'>-			    struct bch_inode_unpacked *, void *);</div><div class='del'>-</div><div class='del'>-void bch2_inode_update_after_write(struct btree_trans *,</div><div class='del'>-				   struct bch_inode_info *,</div><div class='del'>-				   struct bch_inode_unpacked *,</div><div class='del'>-				   unsigned);</div><div class='del'>-int __must_check bch2_write_inode(struct bch_fs *, struct bch_inode_info *,</div><div class='del'>-				  inode_set_fn, void *, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_setattr_nonsize(struct mnt_idmap *,</div><div class='del'>-			 struct bch_inode_info *,</div><div class='del'>-			 struct iattr *);</div><div class='del'>-int __bch2_unlink(struct inode *, struct dentry *, bool);</div><div class='del'>-</div><div class='del'>-void bch2_evict_subvolume_inodes(struct bch_fs *, snapshot_id_list *);</div><div class='del'>-</div><div class='del'>-void bch2_vfs_exit(void);</div><div class='del'>-int bch2_vfs_init(void);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define bch2_inode_update_after_write(_trans, _inode, _inode_u, _fields)	({ do {} while (0); })</div><div class='del'>-</div><div class='del'>-static inline void bch2_evict_subvolume_inodes(struct bch_fs *c,</div><div class='del'>-					       snapshot_id_list *s) {}</div><div class='del'>-static inline void bch2_vfs_exit(void) {}</div><div class='del'>-static inline int bch2_vfs_init(void) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FS_H */</div><div class='head'>diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c<br/>deleted file mode 100644<br/>index 4f0ecd605675..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fsck.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fsck.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2394 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "darray.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "fs-common.h"</div><div class='del'>-#include "fsck.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bsearch.h&gt;</div><div class='del'>-#include &lt;linux/dcache.h&gt; /* struct qstr */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX: this is handling transaction restarts without returning</div><div class='del'>- * -BCH_ERR_transaction_restart_nested, this is not how we do things anymore:</div><div class='del'>- */</div><div class='del'>-static s64 bch2_count_inode_sectors(struct btree_trans *trans, u64 inum,</div><div class='del'>-				    u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	u64 sectors = 0;</div><div class='del'>-</div><div class='del'>-	int ret = for_each_btree_key_upto(trans, iter, BTREE_ID_extents,</div><div class='del'>-				SPOS(inum, 0, snapshot),</div><div class='del'>-				POS(inum, U64_MAX),</div><div class='del'>-				0, k, ({</div><div class='del'>-		if (bkey_extent_is_allocation(k.k))</div><div class='del'>-			sectors += k.k-&gt;size;</div><div class='del'>-		0;</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	return ret ?: sectors;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static s64 bch2_count_subdirs(struct btree_trans *trans, u64 inum,</div><div class='del'>-				    u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	u64 subdirs = 0;</div><div class='del'>-</div><div class='del'>-	int ret = for_each_btree_key_upto(trans, iter, BTREE_ID_dirents,</div><div class='del'>-				    SPOS(inum, 0, snapshot),</div><div class='del'>-				    POS(inum, U64_MAX),</div><div class='del'>-				    0, k, ({</div><div class='del'>-		if (k.k-&gt;type == KEY_TYPE_dirent &amp;&amp;</div><div class='del'>-		    bkey_s_c_to_dirent(k).v-&gt;d_type == DT_DIR)</div><div class='del'>-			subdirs++;</div><div class='del'>-		0;</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	return ret ?: subdirs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int subvol_lookup(struct btree_trans *trans, u32 subvol,</div><div class='del'>-			 u32 *snapshot, u64 *inum)</div><div class='del'>-{</div><div class='del'>-	struct bch_subvolume s;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get(trans, subvol, false, 0, &amp;s);</div><div class='del'>-</div><div class='del'>-	*snapshot = le32_to_cpu(s.snapshot);</div><div class='del'>-	*inum = le64_to_cpu(s.inode);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lookup_first_inode(struct btree_trans *trans, u64 inode_nr,</div><div class='del'>-			      struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			     POS(0, inode_nr),</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-	k = bch2_btree_iter_peek(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!k.k || !bkey_eq(k.k-&gt;p, POS(0, inode_nr))) {</div><div class='del'>-		ret = -BCH_ERR_ENOENT_inode;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_unpack(k, inode);</div><div class='del'>-err:</div><div class='del'>-	bch_err_msg(trans-&gt;c, ret, "fetching inode %llu", inode_nr);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lookup_inode(struct btree_trans *trans, u64 inode_nr,</div><div class='del'>-			  struct bch_inode_unpacked *inode,</div><div class='del'>-			  u32 *snapshot)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			       SPOS(0, inode_nr, *snapshot), 0);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bkey_is_inode(k.k)</div><div class='del'>-		? bch2_inode_unpack(k, inode)</div><div class='del'>-		: -BCH_ERR_ENOENT_inode;</div><div class='del'>-	if (!ret)</div><div class='del'>-		*snapshot = iter.pos.snapshot;</div><div class='del'>-err:</div><div class='del'>-	bch_err_msg(trans-&gt;c, ret, "fetching inode %llu:%u", inode_nr, *snapshot);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __lookup_dirent(struct btree_trans *trans,</div><div class='del'>-			   struct bch_hash_info hash_info,</div><div class='del'>-			   subvol_inum dir, struct qstr *name,</div><div class='del'>-			   u64 *target, unsigned *type)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c_dirent d;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_lookup(trans, &amp;iter, bch2_dirent_hash_desc,</div><div class='del'>-			       &amp;hash_info, dir, name, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	d = bkey_s_c_to_dirent(bch2_btree_iter_peek_slot(&amp;iter));</div><div class='del'>-	*target = le64_to_cpu(d.v-&gt;d_inum);</div><div class='del'>-	*type = d.v-&gt;d_type;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __write_inode(struct btree_trans *trans,</div><div class='del'>-			 struct bch_inode_unpacked *inode,</div><div class='del'>-			 u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bkey_inode_buf *inode_p =</div><div class='del'>-		bch2_trans_kmalloc(trans, sizeof(*inode_p));</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(inode_p))</div><div class='del'>-		return PTR_ERR(inode_p);</div><div class='del'>-</div><div class='del'>-	bch2_inode_pack(inode_p, inode);</div><div class='del'>-	inode_p-&gt;inode.k.p.snapshot = snapshot;</div><div class='del'>-</div><div class='del'>-	return bch2_btree_insert_nonextent(trans, BTREE_ID_inodes,</div><div class='del'>-				&amp;inode_p-&gt;inode.k_i,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fsck_write_inode(struct btree_trans *trans,</div><div class='del'>-			    struct bch_inode_unpacked *inode,</div><div class='del'>-			    u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	int ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			    __write_inode(trans, inode, snapshot));</div><div class='del'>-	bch_err_fn(trans-&gt;c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __remove_dirent(struct btree_trans *trans, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bch_inode_unpacked dir_inode;</div><div class='del'>-	struct bch_hash_info dir_hash_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = lookup_first_inode(trans, pos.inode, &amp;dir_inode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dir_hash_info = bch2_hash_info_init(c, &amp;dir_inode);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_dirents, pos, BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_delete_at(trans, bch2_dirent_hash_desc,</div><div class='del'>-				  &amp;dir_hash_info, &amp;iter,</div><div class='del'>-				  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get lost+found, create if it doesn't exist: */</div><div class='del'>-static int lookup_lostfound(struct btree_trans *trans, u32 snapshot,</div><div class='del'>-			    struct bch_inode_unpacked *lostfound)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct qstr lostfound_str = QSTR("lost+found");</div><div class='del'>-	u64 inum = 0;</div><div class='del'>-	unsigned d_type = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	struct bch_snapshot_tree st;</div><div class='del'>-	ret = bch2_snapshot_tree_lookup(trans,</div><div class='del'>-			bch2_snapshot_tree(c, snapshot), &amp;st);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	subvol_inum root_inum = { .subvol = le32_to_cpu(st.master_subvol) };</div><div class='del'>-	u32 subvol_snapshot;</div><div class='del'>-</div><div class='del'>-	ret = subvol_lookup(trans, le32_to_cpu(st.master_subvol),</div><div class='del'>-			    &amp;subvol_snapshot, &amp;root_inum.inum);</div><div class='del'>-	bch_err_msg(c, ret, "looking up root subvol");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	struct bch_inode_unpacked root_inode;</div><div class='del'>-	struct bch_hash_info root_hash_info;</div><div class='del'>-	ret = lookup_inode(trans, root_inum.inum, &amp;root_inode, &amp;snapshot);</div><div class='del'>-	bch_err_msg(c, ret, "looking up root inode");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	root_hash_info = bch2_hash_info_init(c, &amp;root_inode);</div><div class='del'>-</div><div class='del'>-	ret = __lookup_dirent(trans, root_hash_info, root_inum,</div><div class='del'>-			      &amp;lostfound_str, &amp;inum, &amp;d_type);</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		goto create_lostfound;</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (d_type != DT_DIR) {</div><div class='del'>-		bch_err(c, "error looking up lost+found: not a directory");</div><div class='del'>-		return -BCH_ERR_ENOENT_not_directory;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The bch2_check_dirents pass has already run, dangling dirents</div><div class='del'>-	 * shouldn't exist here:</div><div class='del'>-	 */</div><div class='del'>-	return lookup_inode(trans, inum, lostfound, &amp;snapshot);</div><div class='del'>-</div><div class='del'>-create_lostfound:</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: we could have a nicer log message here  if we had a nice way to</div><div class='del'>-	 * walk backpointers to print a path</div><div class='del'>-	 */</div><div class='del'>-	bch_notice(c, "creating lost+found in snapshot %u", le32_to_cpu(st.root_snapshot));</div><div class='del'>-</div><div class='del'>-	u64 now = bch2_current_time(c);</div><div class='del'>-	struct btree_iter lostfound_iter = { NULL };</div><div class='del'>-	u64 cpu = raw_smp_processor_id();</div><div class='del'>-</div><div class='del'>-	bch2_inode_init_early(c, lostfound);</div><div class='del'>-	bch2_inode_init_late(lostfound, now, 0, 0, S_IFDIR|0700, 0, &amp;root_inode);</div><div class='del'>-	lostfound-&gt;bi_dir = root_inode.bi_inum;</div><div class='del'>-</div><div class='del'>-	root_inode.bi_nlink++;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_create(trans, &amp;lostfound_iter, lostfound, snapshot, cpu);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_snapshot(&amp;lostfound_iter, snapshot);</div><div class='del'>-	ret = bch2_btree_iter_traverse(&amp;lostfound_iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret =   bch2_dirent_create_snapshot(trans,</div><div class='del'>-				root_inode.bi_inum, snapshot, &amp;root_hash_info,</div><div class='del'>-				mode_to_type(lostfound-&gt;bi_mode),</div><div class='del'>-				&amp;lostfound_str,</div><div class='del'>-				lostfound-&gt;bi_inum,</div><div class='del'>-				&amp;lostfound-&gt;bi_dir_offset,</div><div class='del'>-				BCH_HASH_SET_MUST_CREATE) ?:</div><div class='del'>-		bch2_inode_write_flags(trans, &amp;lostfound_iter, lostfound,</div><div class='del'>-				       BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-err:</div><div class='del'>-	bch_err_msg(c, ret, "creating lost+found");</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;lostfound_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reattach_inode(struct btree_trans *trans,</div><div class='del'>-			  struct bch_inode_unpacked *inode,</div><div class='del'>-			  u32 inode_snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bch_hash_info dir_hash;</div><div class='del'>-	struct bch_inode_unpacked lostfound;</div><div class='del'>-	char name_buf[20];</div><div class='del'>-	struct qstr name;</div><div class='del'>-	u64 dir_offset = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = lookup_lostfound(trans, inode_snapshot, &amp;lostfound);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (S_ISDIR(inode-&gt;bi_mode)) {</div><div class='del'>-		lostfound.bi_nlink++;</div><div class='del'>-</div><div class='del'>-		ret = __write_inode(trans, &amp;lostfound, U32_MAX);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dir_hash = bch2_hash_info_init(trans-&gt;c, &amp;lostfound);</div><div class='del'>-</div><div class='del'>-	snprintf(name_buf, sizeof(name_buf), "%llu", inode-&gt;bi_inum);</div><div class='del'>-	name = (struct qstr) QSTR(name_buf);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dirent_create_snapshot(trans,</div><div class='del'>-				lostfound.bi_inum, inode_snapshot,</div><div class='del'>-				&amp;dir_hash,</div><div class='del'>-				inode_d_type(inode),</div><div class='del'>-				&amp;name, inode-&gt;bi_inum, &amp;dir_offset,</div><div class='del'>-				BCH_HASH_SET_MUST_CREATE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	inode-&gt;bi_dir		= lostfound.bi_inum;</div><div class='del'>-	inode-&gt;bi_dir_offset	= dir_offset;</div><div class='del'>-</div><div class='del'>-	return __write_inode(trans, inode, inode_snapshot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int remove_backpointer(struct btree_trans *trans,</div><div class='del'>-			      struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c_dirent d;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	d = bch2_bkey_get_iter_typed(trans, &amp;iter, BTREE_ID_dirents,</div><div class='del'>-				     POS(inode-&gt;bi_dir, inode-&gt;bi_dir_offset), 0,</div><div class='del'>-				     dirent);</div><div class='del'>-	ret =   bkey_err(d) ?:</div><div class='del'>-		__remove_dirent(trans, d.k-&gt;p);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct snapshots_seen_entry {</div><div class='del'>-	u32				id;</div><div class='del'>-	u32				equiv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct snapshots_seen {</div><div class='del'>-	struct bpos			pos;</div><div class='del'>-	DARRAY(struct snapshots_seen_entry) ids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void snapshots_seen_exit(struct snapshots_seen *s)</div><div class='del'>-{</div><div class='del'>-	darray_exit(&amp;s-&gt;ids);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void snapshots_seen_init(struct snapshots_seen *s)</div><div class='del'>-{</div><div class='del'>-	memset(s, 0, sizeof(*s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snapshots_seen_add_inorder(struct bch_fs *c, struct snapshots_seen *s, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct snapshots_seen_entry *i, n = {</div><div class='del'>-		.id	= id,</div><div class='del'>-		.equiv	= bch2_snapshot_equiv(c, id),</div><div class='del'>-	};</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	__darray_for_each(s-&gt;ids, i) {</div><div class='del'>-		if (i-&gt;id == id)</div><div class='del'>-			return 0;</div><div class='del'>-		if (i-&gt;id &gt; id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = darray_insert_item(&amp;s-&gt;ids, i - s-&gt;ids.data, n);</div><div class='del'>-	if (ret)</div><div class='del'>-		bch_err(c, "error reallocating snapshots_seen table (size %zu)",</div><div class='del'>-			s-&gt;ids.size);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snapshots_seen_update(struct bch_fs *c, struct snapshots_seen *s,</div><div class='del'>-				 enum btree_id btree_id, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct snapshots_seen_entry n = {</div><div class='del'>-		.id	= pos.snapshot,</div><div class='del'>-		.equiv	= bch2_snapshot_equiv(c, pos.snapshot),</div><div class='del'>-	};</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!bkey_eq(s-&gt;pos, pos))</div><div class='del'>-		s-&gt;ids.nr = 0;</div><div class='del'>-</div><div class='del'>-	s-&gt;pos = pos;</div><div class='del'>-	s-&gt;pos.snapshot = n.equiv;</div><div class='del'>-</div><div class='del'>-	darray_for_each(s-&gt;ids, i) {</div><div class='del'>-		if (i-&gt;id == n.id)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We currently don't rigorously track for snapshot cleanup</div><div class='del'>-		 * needing to be run, so it shouldn't be a fsck error yet:</div><div class='del'>-		 */</div><div class='del'>-		if (i-&gt;equiv == n.equiv) {</div><div class='del'>-			bch_err(c, "snapshot deletion did not finish:\n"</div><div class='del'>-				"  duplicate keys in btree %s at %llu:%llu snapshots %u, %u (equiv %u)\n",</div><div class='del'>-				bch2_btree_id_str(btree_id),</div><div class='del'>-				pos.inode, pos.offset,</div><div class='del'>-				i-&gt;id, n.id, n.equiv);</div><div class='del'>-			set_bit(BCH_FS_need_delete_dead_snapshots, &amp;c-&gt;flags);</div><div class='del'>-			return bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_delete_dead_snapshots);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = darray_push(&amp;s-&gt;ids, n);</div><div class='del'>-	if (ret)</div><div class='del'>-		bch_err(c, "error reallocating snapshots_seen table (size %zu)",</div><div class='del'>-			s-&gt;ids.size);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * key_visible_in_snapshot - returns true if @id is a descendent of @ancestor,</div><div class='del'>- * and @ancestor hasn't been overwritten in @seen</div><div class='del'>- *</div><div class='del'>- * @c:		filesystem handle</div><div class='del'>- * @seen:	list of snapshot ids already seen at current position</div><div class='del'>- * @id:		descendent snapshot id</div><div class='del'>- * @ancestor:	ancestor snapshot id</div><div class='del'>- *</div><div class='del'>- * Returns:	whether key in @ancestor snapshot is visible in @id snapshot</div><div class='del'>- */</div><div class='del'>-static bool key_visible_in_snapshot(struct bch_fs *c, struct snapshots_seen *seen,</div><div class='del'>-				    u32 id, u32 ancestor)</div><div class='del'>-{</div><div class='del'>-	ssize_t i;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(id &gt; ancestor);</div><div class='del'>-	EBUG_ON(!bch2_snapshot_is_equiv(c, id));</div><div class='del'>-	EBUG_ON(!bch2_snapshot_is_equiv(c, ancestor));</div><div class='del'>-</div><div class='del'>-	/* @ancestor should be the snapshot most recently added to @seen */</div><div class='del'>-	EBUG_ON(ancestor != seen-&gt;pos.snapshot);</div><div class='del'>-	EBUG_ON(ancestor != seen-&gt;ids.data[seen-&gt;ids.nr - 1].equiv);</div><div class='del'>-</div><div class='del'>-	if (id == ancestor)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (!bch2_snapshot_is_ancestor(c, id, ancestor))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We know that @id is a descendant of @ancestor, we're checking if</div><div class='del'>-	 * we've seen a key that overwrote @ancestor - i.e. also a descendent of</div><div class='del'>-	 * @ascestor and with @id as a descendent.</div><div class='del'>-	 *</div><div class='del'>-	 * But we already know that we're scanning IDs between @id and @ancestor</div><div class='del'>-	 * numerically, since snapshot ID lists are kept sorted, so if we find</div><div class='del'>-	 * an id that's an ancestor of @id we're done:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = seen-&gt;ids.nr - 2;</div><div class='del'>-	     i &gt;= 0 &amp;&amp; seen-&gt;ids.data[i].equiv &gt;= id;</div><div class='del'>-	     --i)</div><div class='del'>-		if (bch2_snapshot_is_ancestor(c, id, seen-&gt;ids.data[i].equiv))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ref_visible - given a key with snapshot id @src that points to a key with</div><div class='del'>- * snapshot id @dst, test whether there is some snapshot in which @dst is</div><div class='del'>- * visible.</div><div class='del'>- *</div><div class='del'>- * @c:		filesystem handle</div><div class='del'>- * @s:		list of snapshot IDs already seen at @src</div><div class='del'>- * @src:	snapshot ID of src key</div><div class='del'>- * @dst:	snapshot ID of dst key</div><div class='del'>- * Returns:	true if there is some snapshot in which @dst is visible</div><div class='del'>- *</div><div class='del'>- * Assumes we're visiting @src keys in natural key order</div><div class='del'>- */</div><div class='del'>-static bool ref_visible(struct bch_fs *c, struct snapshots_seen *s,</div><div class='del'>-			u32 src, u32 dst)</div><div class='del'>-{</div><div class='del'>-	return dst &lt;= src</div><div class='del'>-		? key_visible_in_snapshot(c, s, dst, src)</div><div class='del'>-		: bch2_snapshot_is_ancestor(c, src, dst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ref_visible2(struct bch_fs *c,</div><div class='del'>-			u32 src, struct snapshots_seen *src_seen,</div><div class='del'>-			u32 dst, struct snapshots_seen *dst_seen)</div><div class='del'>-{</div><div class='del'>-	src = bch2_snapshot_equiv(c, src);</div><div class='del'>-	dst = bch2_snapshot_equiv(c, dst);</div><div class='del'>-</div><div class='del'>-	if (dst &gt; src) {</div><div class='del'>-		swap(dst, src);</div><div class='del'>-		swap(dst_seen, src_seen);</div><div class='del'>-	}</div><div class='del'>-	return key_visible_in_snapshot(c, src_seen, dst, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_visible_inode(_c, _s, _w, _snapshot, _i)				\</div><div class='del'>-	for (_i = (_w)-&gt;inodes.data; _i &lt; (_w)-&gt;inodes.data + (_w)-&gt;inodes.nr &amp;&amp;	\</div><div class='del'>-	     (_i)-&gt;snapshot &lt;= (_snapshot); _i++)					\</div><div class='del'>-		if (key_visible_in_snapshot(_c, _s, _i-&gt;snapshot, _snapshot))</div><div class='del'>-</div><div class='del'>-struct inode_walker_entry {</div><div class='del'>-	struct bch_inode_unpacked inode;</div><div class='del'>-	u32			snapshot;</div><div class='del'>-	bool			seen_this_pos;</div><div class='del'>-	u64			count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct inode_walker {</div><div class='del'>-	bool				first_this_inode;</div><div class='del'>-	bool				recalculate_sums;</div><div class='del'>-	struct bpos			last_pos;</div><div class='del'>-</div><div class='del'>-	DARRAY(struct inode_walker_entry) inodes;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void inode_walker_exit(struct inode_walker *w)</div><div class='del'>-{</div><div class='del'>-	darray_exit(&amp;w-&gt;inodes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct inode_walker inode_walker_init(void)</div><div class='del'>-{</div><div class='del'>-	return (struct inode_walker) { 0, };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_inode(struct bch_fs *c, struct inode_walker *w,</div><div class='del'>-		     struct bkey_s_c inode)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_inode_unpack(inode, &amp;u));</div><div class='del'>-</div><div class='del'>-	return darray_push(&amp;w-&gt;inodes, ((struct inode_walker_entry) {</div><div class='del'>-		.inode		= u,</div><div class='del'>-		.snapshot	= bch2_snapshot_equiv(c, inode.k-&gt;p.snapshot),</div><div class='del'>-	}));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_inodes_all_snapshots(struct btree_trans *trans,</div><div class='del'>-				    struct inode_walker *w, u64 inum)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	w-&gt;recalculate_sums = false;</div><div class='del'>-	w-&gt;inodes.nr = 0;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_inodes, POS(0, inum),</div><div class='del'>-				     BTREE_ITER_ALL_SNAPSHOTS, k, ret) {</div><div class='del'>-		if (k.k-&gt;p.offset != inum)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bkey_is_inode(k.k))</div><div class='del'>-			add_inode(c, w, k);</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	w-&gt;first_this_inode = true;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct inode_walker_entry *</div><div class='del'>-lookup_inode_for_snapshot(struct bch_fs *c, struct inode_walker *w,</div><div class='del'>-			  u32 snapshot, bool is_whiteout)</div><div class='del'>-{</div><div class='del'>-	struct inode_walker_entry *i;</div><div class='del'>-</div><div class='del'>-	snapshot = bch2_snapshot_equiv(c, snapshot);</div><div class='del'>-</div><div class='del'>-	__darray_for_each(w-&gt;inodes, i)</div><div class='del'>-		if (bch2_snapshot_is_ancestor(c, snapshot, i-&gt;snapshot))</div><div class='del'>-			goto found;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-found:</div><div class='del'>-	BUG_ON(snapshot &gt; i-&gt;snapshot);</div><div class='del'>-</div><div class='del'>-	if (snapshot != i-&gt;snapshot &amp;&amp; !is_whiteout) {</div><div class='del'>-		struct inode_walker_entry new = *i;</div><div class='del'>-		size_t pos;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		new.snapshot = snapshot;</div><div class='del'>-		new.count = 0;</div><div class='del'>-</div><div class='del'>-		bch_info(c, "have key for inode %llu:%u but have inode in ancestor snapshot %u",</div><div class='del'>-			 w-&gt;last_pos.inode, snapshot, i-&gt;snapshot);</div><div class='del'>-</div><div class='del'>-		while (i &gt; w-&gt;inodes.data &amp;&amp; i[-1].snapshot &gt; snapshot)</div><div class='del'>-			--i;</div><div class='del'>-</div><div class='del'>-		pos = i - w-&gt;inodes.data;</div><div class='del'>-		ret = darray_insert_item(&amp;w-&gt;inodes, pos, new);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-		i = w-&gt;inodes.data + pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct inode_walker_entry *walk_inode(struct btree_trans *trans,</div><div class='del'>-					     struct inode_walker *w, struct bpos pos,</div><div class='del'>-					     bool is_whiteout)</div><div class='del'>-{</div><div class='del'>-	if (w-&gt;last_pos.inode != pos.inode) {</div><div class='del'>-		int ret = get_inodes_all_snapshots(trans, w, pos.inode);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	} else if (bkey_cmp(w-&gt;last_pos, pos)) {</div><div class='del'>-		darray_for_each(w-&gt;inodes, i)</div><div class='del'>-			i-&gt;seen_this_pos = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	w-&gt;last_pos = pos;</div><div class='del'>-</div><div class='del'>-	return lookup_inode_for_snapshot(trans-&gt;c, w, pos.snapshot, is_whiteout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __get_visible_inodes(struct btree_trans *trans,</div><div class='del'>-				struct inode_walker *w,</div><div class='del'>-				struct snapshots_seen *s,</div><div class='del'>-				u64 inum)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	w-&gt;inodes.nr = 0;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_inodes, POS(0, inum),</div><div class='del'>-			   BTREE_ITER_ALL_SNAPSHOTS, k, ret) {</div><div class='del'>-		u32 equiv = bch2_snapshot_equiv(c, k.k-&gt;p.snapshot);</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;p.offset != inum)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!ref_visible(c, s, s-&gt;pos.snapshot, equiv))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (bkey_is_inode(k.k))</div><div class='del'>-			add_inode(c, w, k);</div><div class='del'>-</div><div class='del'>-		if (equiv &gt;= s-&gt;pos.snapshot)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_key_has_snapshot(struct btree_trans *trans,</div><div class='del'>-				  struct btree_iter *iter,</div><div class='del'>-				  struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (mustfix_fsck_err_on(!bch2_snapshot_equiv(c, k.k-&gt;p.snapshot), c,</div><div class='del'>-				bkey_in_missing_snapshot,</div><div class='del'>-				"key in missing snapshot: %s",</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf)))</div><div class='del'>-		ret = bch2_btree_delete_at(trans, iter,</div><div class='del'>-					    BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?: 1;</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hash_redo_key(struct btree_trans *trans,</div><div class='del'>-			 const struct bch_hash_desc desc,</div><div class='del'>-			 struct bch_hash_info *hash_info,</div><div class='del'>-			 struct btree_iter *k_iter, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *delete;</div><div class='del'>-	struct bkey_i *tmp;</div><div class='del'>-</div><div class='del'>-	delete = bch2_trans_kmalloc(trans, sizeof(*delete));</div><div class='del'>-	if (IS_ERR(delete))</div><div class='del'>-		return PTR_ERR(delete);</div><div class='del'>-</div><div class='del'>-	tmp = bch2_bkey_make_mut_noupdate(trans, k);</div><div class='del'>-	if (IS_ERR(tmp))</div><div class='del'>-		return PTR_ERR(tmp);</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;delete-&gt;k);</div><div class='del'>-	delete-&gt;k.p = k_iter-&gt;pos;</div><div class='del'>-	return  bch2_btree_iter_traverse(k_iter) ?:</div><div class='del'>-		bch2_trans_update(trans, k_iter, delete, 0) ?:</div><div class='del'>-		bch2_hash_set_snapshot(trans, desc, hash_info,</div><div class='del'>-				       (subvol_inum) { 0, k.k-&gt;p.inode },</div><div class='del'>-				       k.k-&gt;p.snapshot, tmp,</div><div class='del'>-				       BCH_HASH_SET_MUST_CREATE,</div><div class='del'>-				       BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hash_check_key(struct btree_trans *trans,</div><div class='del'>-			  const struct bch_hash_desc desc,</div><div class='del'>-			  struct bch_hash_info *hash_info,</div><div class='del'>-			  struct btree_iter *k_iter, struct bkey_s_c hash_k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u64 hash;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (hash_k.k-&gt;type != desc.key_type)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hash = desc.hash_bkey(hash_info, hash_k);</div><div class='del'>-</div><div class='del'>-	if (likely(hash == hash_k.k-&gt;p.offset))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (hash_k.k-&gt;p.offset &lt; hash)</div><div class='del'>-		goto bad_hash;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, desc.btree_id,</div><div class='del'>-				     SPOS(hash_k.k-&gt;p.inode, hash, hash_k.k-&gt;p.snapshot),</div><div class='del'>-				     BTREE_ITER_SLOTS, k, ret) {</div><div class='del'>-		if (bkey_eq(k.k-&gt;p, hash_k.k-&gt;p))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(k.k-&gt;type == desc.key_type &amp;&amp;</div><div class='del'>-				!desc.cmp_bkey(k, hash_k), c,</div><div class='del'>-				hash_table_key_duplicate,</div><div class='del'>-				"duplicate hash table keys:\n%s",</div><div class='del'>-				(printbuf_reset(&amp;buf),</div><div class='del'>-				 bch2_bkey_val_to_text(&amp;buf, c, hash_k),</div><div class='del'>-				 buf.buf))) {</div><div class='del'>-			ret = bch2_hash_delete_at(trans, desc, hash_info, k_iter, 0) ?: 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bkey_deleted(k.k)) {</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-			goto bad_hash;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-bad_hash:</div><div class='del'>-	if (fsck_err(c, hash_table_key_wrong_offset,</div><div class='del'>-		     "hash table key at wrong offset: btree %s inode %llu offset %llu, hashed to %llu\n%s",</div><div class='del'>-		     bch2_btree_id_str(desc.btree_id), hash_k.k-&gt;p.inode, hash_k.k-&gt;p.offset, hash,</div><div class='del'>-		     (printbuf_reset(&amp;buf),</div><div class='del'>-		      bch2_bkey_val_to_text(&amp;buf, c, hash_k), buf.buf))) {</div><div class='del'>-		ret = hash_redo_key(trans, desc, hash_info, k_iter, hash_k);</div><div class='del'>-		bch_err_fn(c, ret);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		ret = -BCH_ERR_transaction_restart_nested;</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_inode_deleted_list(struct btree_trans *trans, struct bpos p)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_deleted_inodes, p, 0);</div><div class='del'>-	int ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return k.k-&gt;type == KEY_TYPE_set;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_inode(struct btree_trans *trans,</div><div class='del'>-		       struct btree_iter *iter,</div><div class='del'>-		       struct bkey_s_c k,</div><div class='del'>-		       struct bch_inode_unpacked *prev,</div><div class='del'>-		       struct snapshots_seen *s,</div><div class='del'>-		       bool full)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-	bool do_update = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = check_key_has_snapshot(trans, iter, k);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-	if (ret)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = snapshots_seen_update(c, s, iter-&gt;btree_id, k.k-&gt;p);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!bkey_is_inode(k.k))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_inode_unpack(k, &amp;u));</div><div class='del'>-</div><div class='del'>-	if (!full &amp;&amp;</div><div class='del'>-	    !(u.bi_flags &amp; (BCH_INODE_i_size_dirty|</div><div class='del'>-			    BCH_INODE_i_sectors_dirty|</div><div class='del'>-			    BCH_INODE_unlinked)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (prev-&gt;bi_inum != u.bi_inum)</div><div class='del'>-		*prev = u;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(prev-&gt;bi_hash_seed	!= u.bi_hash_seed ||</div><div class='del'>-			inode_d_type(prev)	!= inode_d_type(&amp;u),</div><div class='del'>-			c, inode_snapshot_mismatch,</div><div class='del'>-			"inodes in different snapshots don't match")) {</div><div class='del'>-		bch_err(c, "repair not implemented yet");</div><div class='del'>-		return -BCH_ERR_fsck_repair_unimplemented;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((u.bi_flags &amp; (BCH_INODE_i_size_dirty|BCH_INODE_unlinked)) &amp;&amp;</div><div class='del'>-	    bch2_key_has_snapshot_overwrites(trans, BTREE_ID_inodes, k.k-&gt;p)) {</div><div class='del'>-		struct bpos new_min_pos;</div><div class='del'>-</div><div class='del'>-		ret = bch2_propagate_key_to_snapshot_leaves(trans, iter-&gt;btree_id, k, &amp;new_min_pos);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		u.bi_flags &amp;= ~BCH_INODE_i_size_dirty|BCH_INODE_unlinked;</div><div class='del'>-</div><div class='del'>-		ret = __write_inode(trans, &amp;u, iter-&gt;pos.snapshot);</div><div class='del'>-		bch_err_msg(c, ret, "in fsck updating inode");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (!bpos_eq(new_min_pos, POS_MIN))</div><div class='del'>-			bch2_btree_iter_set_pos(iter, bpos_predecessor(new_min_pos));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (u.bi_flags &amp; BCH_INODE_unlinked) {</div><div class='del'>-		ret = check_inode_deleted_list(trans, k.k-&gt;p);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		fsck_err_on(ret, c, unlinked_inode_not_on_deleted_list,</div><div class='del'>-			    "inode %llu:%u unlinked, but not on deleted list",</div><div class='del'>-			    u.bi_inum, k.k-&gt;p.snapshot);</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (u.bi_flags &amp; BCH_INODE_unlinked &amp;&amp;</div><div class='del'>-	    (!c-&gt;sb.clean ||</div><div class='del'>-	     fsck_err(c, inode_unlinked_but_clean,</div><div class='del'>-		      "filesystem marked clean, but inode %llu unlinked",</div><div class='del'>-		      u.bi_inum))) {</div><div class='del'>-		ret = bch2_inode_rm_snapshot(trans, u.bi_inum, iter-&gt;pos.snapshot);</div><div class='del'>-		bch_err_msg(c, ret, "in fsck deleting inode");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (u.bi_flags &amp; BCH_INODE_i_size_dirty &amp;&amp;</div><div class='del'>-	    (!c-&gt;sb.clean ||</div><div class='del'>-	     fsck_err(c, inode_i_size_dirty_but_clean,</div><div class='del'>-		      "filesystem marked clean, but inode %llu has i_size dirty",</div><div class='del'>-		      u.bi_inum))) {</div><div class='del'>-		bch_verbose(c, "truncating inode %llu", u.bi_inum);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: need to truncate partial blocks too here - or ideally</div><div class='del'>-		 * just switch units to bytes and that issue goes away</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_btree_delete_range_trans(trans, BTREE_ID_extents,</div><div class='del'>-				SPOS(u.bi_inum, round_up(u.bi_size, block_bytes(c)) &gt;&gt; 9,</div><div class='del'>-				     iter-&gt;pos.snapshot),</div><div class='del'>-				POS(u.bi_inum, U64_MAX),</div><div class='del'>-				0, NULL);</div><div class='del'>-		bch_err_msg(c, ret, "in fsck truncating inode");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We truncated without our normal sector accounting hook, just</div><div class='del'>-		 * make sure we recalculate it:</div><div class='del'>-		 */</div><div class='del'>-		u.bi_flags |= BCH_INODE_i_sectors_dirty;</div><div class='del'>-</div><div class='del'>-		u.bi_flags &amp;= ~BCH_INODE_i_size_dirty;</div><div class='del'>-		do_update = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (u.bi_flags &amp; BCH_INODE_i_sectors_dirty &amp;&amp;</div><div class='del'>-	    (!c-&gt;sb.clean ||</div><div class='del'>-	     fsck_err(c, inode_i_sectors_dirty_but_clean,</div><div class='del'>-		      "filesystem marked clean, but inode %llu has i_sectors dirty",</div><div class='del'>-		      u.bi_inum))) {</div><div class='del'>-		s64 sectors;</div><div class='del'>-</div><div class='del'>-		bch_verbose(c, "recounting sectors for inode %llu",</div><div class='del'>-			    u.bi_inum);</div><div class='del'>-</div><div class='del'>-		sectors = bch2_count_inode_sectors(trans, u.bi_inum, iter-&gt;pos.snapshot);</div><div class='del'>-		if (sectors &lt; 0) {</div><div class='del'>-			bch_err_msg(c, sectors, "in fsck recounting inode sectors");</div><div class='del'>-			return sectors;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		u.bi_sectors = sectors;</div><div class='del'>-		u.bi_flags &amp;= ~BCH_INODE_i_sectors_dirty;</div><div class='del'>-		do_update = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (u.bi_flags &amp; BCH_INODE_backptr_untrusted) {</div><div class='del'>-		u.bi_dir = 0;</div><div class='del'>-		u.bi_dir_offset = 0;</div><div class='del'>-		u.bi_flags &amp;= ~BCH_INODE_backptr_untrusted;</div><div class='del'>-		do_update = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (do_update) {</div><div class='del'>-		ret = __write_inode(trans, &amp;u, iter-&gt;pos.snapshot);</div><div class='del'>-		bch_err_msg(c, ret, "in fsck updating inode");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_inodes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bool full = c-&gt;opts.fsck;</div><div class='del'>-	struct bch_inode_unpacked prev = { 0 };</div><div class='del'>-	struct snapshots_seen s;</div><div class='del'>-</div><div class='del'>-	snapshots_seen_init(&amp;s);</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_inodes,</div><div class='del'>-				POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			check_inode(trans, &amp;iter, k, &amp;prev, &amp;s, full)));</div><div class='del'>-</div><div class='del'>-	snapshots_seen_exit(&amp;s);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c_dirent dirent_get_by_pos(struct btree_trans *trans,</div><div class='del'>-						struct btree_iter *iter,</div><div class='del'>-						struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_get_iter_typed(trans, iter, BTREE_ID_dirents, pos, 0, dirent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool inode_points_to_dirent(struct bch_inode_unpacked *inode,</div><div class='del'>-				   struct bkey_s_c_dirent d)</div><div class='del'>-{</div><div class='del'>-	return  inode-&gt;bi_dir		== d.k-&gt;p.inode &amp;&amp;</div><div class='del'>-		inode-&gt;bi_dir_offset	== d.k-&gt;p.offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool dirent_points_to_inode(struct bkey_s_c_dirent d,</div><div class='del'>-				   struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	return d.v-&gt;d_type == DT_SUBVOL</div><div class='del'>-		? le32_to_cpu(d.v-&gt;d_child_subvol)	== inode-&gt;bi_subvol</div><div class='del'>-		: le64_to_cpu(d.v-&gt;d_inum)		== inode-&gt;bi_inum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_i_sectors(struct btree_trans *trans, struct inode_walker *w)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	s64 count2;</div><div class='del'>-</div><div class='del'>-	darray_for_each(w-&gt;inodes, i) {</div><div class='del'>-		if (i-&gt;inode.bi_sectors == i-&gt;count)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		count2 = bch2_count_inode_sectors(trans, w-&gt;last_pos.inode, i-&gt;snapshot);</div><div class='del'>-</div><div class='del'>-		if (w-&gt;recalculate_sums)</div><div class='del'>-			i-&gt;count = count2;</div><div class='del'>-</div><div class='del'>-		if (i-&gt;count != count2) {</div><div class='del'>-			bch_err(c, "fsck counted i_sectors wrong for inode %llu:%u: got %llu should be %llu",</div><div class='del'>-				w-&gt;last_pos.inode, i-&gt;snapshot, i-&gt;count, count2);</div><div class='del'>-			return -BCH_ERR_internal_fsck_err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(!(i-&gt;inode.bi_flags &amp; BCH_INODE_i_sectors_dirty),</div><div class='del'>-				c, inode_i_sectors_wrong,</div><div class='del'>-				"inode %llu:%u has incorrect i_sectors: got %llu, should be %llu",</div><div class='del'>-				w-&gt;last_pos.inode, i-&gt;snapshot,</div><div class='del'>-				i-&gt;inode.bi_sectors, i-&gt;count)) {</div><div class='del'>-			i-&gt;inode.bi_sectors = i-&gt;count;</div><div class='del'>-			ret = fsck_write_inode(trans, &amp;i-&gt;inode, i-&gt;snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret ?: trans_was_restarted(trans, restart_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct extent_end {</div><div class='del'>-	u32			snapshot;</div><div class='del'>-	u64			offset;</div><div class='del'>-	struct snapshots_seen	seen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct extent_ends {</div><div class='del'>-	struct bpos			last_pos;</div><div class='del'>-	DARRAY(struct extent_end)	e;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void extent_ends_reset(struct extent_ends *extent_ends)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(extent_ends-&gt;e, i)</div><div class='del'>-		snapshots_seen_exit(&amp;i-&gt;seen);</div><div class='del'>-	extent_ends-&gt;e.nr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void extent_ends_exit(struct extent_ends *extent_ends)</div><div class='del'>-{</div><div class='del'>-	extent_ends_reset(extent_ends);</div><div class='del'>-	darray_exit(&amp;extent_ends-&gt;e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void extent_ends_init(struct extent_ends *extent_ends)</div><div class='del'>-{</div><div class='del'>-	memset(extent_ends, 0, sizeof(*extent_ends));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int extent_ends_at(struct bch_fs *c,</div><div class='del'>-			  struct extent_ends *extent_ends,</div><div class='del'>-			  struct snapshots_seen *seen,</div><div class='del'>-			  struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct extent_end *i, n = (struct extent_end) {</div><div class='del'>-		.offset		= k.k-&gt;p.offset,</div><div class='del'>-		.snapshot	= k.k-&gt;p.snapshot,</div><div class='del'>-		.seen		= *seen,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	n.seen.ids.data = kmemdup(seen-&gt;ids.data,</div><div class='del'>-			      sizeof(seen-&gt;ids.data[0]) * seen-&gt;ids.size,</div><div class='del'>-			      GFP_KERNEL);</div><div class='del'>-	if (!n.seen.ids.data)</div><div class='del'>-		return -BCH_ERR_ENOMEM_fsck_extent_ends_at;</div><div class='del'>-</div><div class='del'>-	__darray_for_each(extent_ends-&gt;e, i) {</div><div class='del'>-		if (i-&gt;snapshot == k.k-&gt;p.snapshot) {</div><div class='del'>-			snapshots_seen_exit(&amp;i-&gt;seen);</div><div class='del'>-			*i = n;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i-&gt;snapshot &gt;= k.k-&gt;p.snapshot)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return darray_insert_item(&amp;extent_ends-&gt;e, i - extent_ends-&gt;e.data, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int overlapping_extents_found(struct btree_trans *trans,</div><div class='del'>-				     enum btree_id btree,</div><div class='del'>-				     struct bpos pos1, struct snapshots_seen *pos1_seen,</div><div class='del'>-				     struct bkey pos2,</div><div class='del'>-				     bool *fixed,</div><div class='del'>-				     struct extent_end *extent_end)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct btree_iter iter1, iter2 = { NULL };</div><div class='del'>-	struct bkey_s_c k1, k2;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bkey_le(pos1, bkey_start_pos(&amp;pos2)));</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter1, btree, pos1,</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS|</div><div class='del'>-			     BTREE_ITER_NOT_EXTENTS);</div><div class='del'>-	k1 = bch2_btree_iter_peek_upto(&amp;iter1, POS(pos1.inode, U64_MAX));</div><div class='del'>-	ret = bkey_err(k1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\n  ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, k1);</div><div class='del'>-</div><div class='del'>-	if (!bpos_eq(pos1, k1.k-&gt;p)) {</div><div class='del'>-		prt_str(&amp;buf, "\n  wanted\n  ");</div><div class='del'>-		bch2_bpos_to_text(&amp;buf, pos1);</div><div class='del'>-		prt_str(&amp;buf, "\n  ");</div><div class='del'>-		bch2_bkey_to_text(&amp;buf, &amp;pos2);</div><div class='del'>-</div><div class='del'>-		bch_err(c, "%s: error finding first overlapping extent when repairing, got%s",</div><div class='del'>-			__func__, buf.buf);</div><div class='del'>-		ret = -BCH_ERR_internal_fsck_err;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_copy_iter(&amp;iter2, &amp;iter1);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		bch2_btree_iter_advance(&amp;iter2);</div><div class='del'>-</div><div class='del'>-		k2 = bch2_btree_iter_peek_upto(&amp;iter2, POS(pos1.inode, U64_MAX));</div><div class='del'>-		ret = bkey_err(k2);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (bpos_ge(k2.k-&gt;p, pos2.p))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;buf, "\n  ");</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, k2);</div><div class='del'>-</div><div class='del'>-	if (bpos_gt(k2.k-&gt;p, pos2.p) ||</div><div class='del'>-	    pos2.size != k2.k-&gt;size) {</div><div class='del'>-		bch_err(c, "%s: error finding seconding overlapping extent when repairing%s",</div><div class='del'>-			__func__, buf.buf);</div><div class='del'>-		ret = -BCH_ERR_internal_fsck_err;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "\n  overwriting %s extent",</div><div class='del'>-		   pos1.snapshot &gt;= pos2.p.snapshot ? "first" : "second");</div><div class='del'>-</div><div class='del'>-	if (fsck_err(c, extent_overlapping,</div><div class='del'>-		     "overlapping extents%s", buf.buf)) {</div><div class='del'>-		struct btree_iter *old_iter = &amp;iter1;</div><div class='del'>-		struct disk_reservation res = { 0 };</div><div class='del'>-</div><div class='del'>-		if (pos1.snapshot &lt; pos2.p.snapshot) {</div><div class='del'>-			old_iter = &amp;iter2;</div><div class='del'>-			swap(k1, k2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		trans-&gt;extra_disk_res += bch2_bkey_sectors_compressed(k2);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_trans_update_extent_overwrite(trans, old_iter,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE,</div><div class='del'>-				k1, k2) ?:</div><div class='del'>-			bch2_trans_commit(trans, &amp;res, NULL, BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-		bch2_disk_reservation_put(c, &amp;res);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		*fixed = true;</div><div class='del'>-</div><div class='del'>-		if (pos1.snapshot == pos2.p.snapshot) {</div><div class='del'>-			/*</div><div class='del'>-			 * We overwrote the first extent, and did the overwrite</div><div class='del'>-			 * in the same snapshot:</div><div class='del'>-			 */</div><div class='del'>-			extent_end-&gt;offset = bkey_start_offset(&amp;pos2);</div><div class='del'>-		} else if (pos1.snapshot &gt; pos2.p.snapshot) {</div><div class='del'>-			/*</div><div class='del'>-			 * We overwrote the first extent in pos2's snapshot:</div><div class='del'>-			 */</div><div class='del'>-			ret = snapshots_seen_add_inorder(c, pos1_seen, pos2.p.snapshot);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * We overwrote the second extent - restart</div><div class='del'>-			 * check_extent() from the top:</div><div class='del'>-			 */</div><div class='del'>-			ret = -BCH_ERR_transaction_restart_nested;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter2);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter1);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_overlapping_extents(struct btree_trans *trans,</div><div class='del'>-			      struct snapshots_seen *seen,</div><div class='del'>-			      struct extent_ends *extent_ends,</div><div class='del'>-			      struct bkey_s_c k,</div><div class='del'>-			      u32 equiv,</div><div class='del'>-			      struct btree_iter *iter,</div><div class='del'>-			      bool *fixed)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* transaction restart, running again */</div><div class='del'>-	if (bpos_eq(extent_ends-&gt;last_pos, k.k-&gt;p))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (extent_ends-&gt;last_pos.inode != k.k-&gt;p.inode)</div><div class='del'>-		extent_ends_reset(extent_ends);</div><div class='del'>-</div><div class='del'>-	darray_for_each(extent_ends-&gt;e, i) {</div><div class='del'>-		if (i-&gt;offset &lt;= bkey_start_offset(k.k))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!ref_visible2(c,</div><div class='del'>-				  k.k-&gt;p.snapshot, seen,</div><div class='del'>-				  i-&gt;snapshot, &amp;i-&gt;seen))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = overlapping_extents_found(trans, iter-&gt;btree_id,</div><div class='del'>-						SPOS(iter-&gt;pos.inode,</div><div class='del'>-						     i-&gt;offset,</div><div class='del'>-						     i-&gt;snapshot),</div><div class='del'>-						&amp;i-&gt;seen,</div><div class='del'>-						*k.k, fixed, i);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = extent_ends_at(c, extent_ends, seen, k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	extent_ends-&gt;last_pos = k.k-&gt;p;</div><div class='del'>-err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_extent_overbig(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-				struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	struct bch_extent_crc_unpacked crc;</div><div class='del'>-	const union bch_extent_entry *i;</div><div class='del'>-	unsigned encoded_extent_max_sectors = c-&gt;opts.encoded_extent_max &gt;&gt; 9;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_crc(k.k, ptrs, crc, i)</div><div class='del'>-		if (crc_is_encoded(crc) &amp;&amp;</div><div class='del'>-		    crc.uncompressed_size &gt; encoded_extent_max_sectors) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-			bch_err(c, "overbig encoded extent, please report this:\n  %s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_extent(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			struct bkey_s_c k,</div><div class='del'>-			struct inode_walker *inode,</div><div class='del'>-			struct snapshots_seen *s,</div><div class='del'>-			struct extent_ends *extent_ends)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct inode_walker_entry *i;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bpos equiv = k.k-&gt;p;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	equiv.snapshot = bch2_snapshot_equiv(c, k.k-&gt;p.snapshot);</div><div class='del'>-</div><div class='del'>-	ret = check_key_has_snapshot(trans, iter, k);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ret = ret &lt; 0 ? ret : 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;last_pos.inode != k.k-&gt;p.inode) {</div><div class='del'>-		ret = check_i_sectors(trans, inode);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = walk_inode(trans, inode, equiv, k.k-&gt;type == KEY_TYPE_whiteout);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(i);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = snapshots_seen_update(c, s, iter-&gt;btree_id, k.k-&gt;p);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_whiteout) {</div><div class='del'>-		if (fsck_err_on(!i, c, extent_in_missing_inode,</div><div class='del'>-				"extent in missing inode:\n  %s",</div><div class='del'>-				(printbuf_reset(&amp;buf),</div><div class='del'>-				 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf)))</div><div class='del'>-			goto delete;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(i &amp;&amp;</div><div class='del'>-				!S_ISREG(i-&gt;inode.bi_mode) &amp;&amp;</div><div class='del'>-				!S_ISLNK(i-&gt;inode.bi_mode),</div><div class='del'>-				c, extent_in_non_reg_inode,</div><div class='del'>-				"extent in non regular inode mode %o:\n  %s",</div><div class='del'>-				i-&gt;inode.bi_mode,</div><div class='del'>-				(printbuf_reset(&amp;buf),</div><div class='del'>-				 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf)))</div><div class='del'>-			goto delete;</div><div class='del'>-</div><div class='del'>-		ret = check_overlapping_extents(trans, s, extent_ends, k,</div><div class='del'>-						equiv.snapshot, iter,</div><div class='del'>-						&amp;inode-&gt;recalculate_sums);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check inodes in reverse order, from oldest snapshots to newest,</div><div class='del'>-	 * starting from the inode that matches this extent's snapshot. If we</div><div class='del'>-	 * didn't have one, iterate over all inodes:</div><div class='del'>-	 */</div><div class='del'>-	if (!i)</div><div class='del'>-		i = inode-&gt;inodes.data + inode-&gt;inodes.nr - 1;</div><div class='del'>-</div><div class='del'>-	for (;</div><div class='del'>-	     inode-&gt;inodes.data &amp;&amp; i &gt;= inode-&gt;inodes.data;</div><div class='del'>-	     --i) {</div><div class='del'>-		if (i-&gt;snapshot &gt; equiv.snapshot ||</div><div class='del'>-		    !key_visible_in_snapshot(c, s, i-&gt;snapshot, equiv.snapshot))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_whiteout) {</div><div class='del'>-			if (fsck_err_on(!(i-&gt;inode.bi_flags &amp; BCH_INODE_i_size_dirty) &amp;&amp;</div><div class='del'>-					k.k-&gt;p.offset &gt; round_up(i-&gt;inode.bi_size, block_bytes(c)) &gt;&gt; 9 &amp;&amp;</div><div class='del'>-					!bkey_extent_is_reservation(k),</div><div class='del'>-					c, extent_past_end_of_inode,</div><div class='del'>-					"extent type past end of inode %llu:%u, i_size %llu\n  %s",</div><div class='del'>-					i-&gt;inode.bi_inum, i-&gt;snapshot, i-&gt;inode.bi_size,</div><div class='del'>-					(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-				struct btree_iter iter2;</div><div class='del'>-</div><div class='del'>-				bch2_trans_copy_iter(&amp;iter2, iter);</div><div class='del'>-				bch2_btree_iter_set_snapshot(&amp;iter2, i-&gt;snapshot);</div><div class='del'>-				ret =   bch2_btree_iter_traverse(&amp;iter2) ?:</div><div class='del'>-					bch2_btree_delete_at(trans, &amp;iter2,</div><div class='del'>-						BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-				bch2_trans_iter_exit(trans, &amp;iter2);</div><div class='del'>-				if (ret)</div><div class='del'>-					goto err;</div><div class='del'>-</div><div class='del'>-				iter-&gt;k.type = KEY_TYPE_whiteout;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (bkey_extent_is_allocation(k.k))</div><div class='del'>-				i-&gt;count += k.k-&gt;size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i-&gt;seen_this_pos = true;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-delete:</div><div class='del'>-	ret = bch2_btree_delete_at(trans, iter, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Walk extents: verify that extents have a corresponding S_ISREG inode, and</div><div class='del'>- * that i_size an i_sectors are consistent</div><div class='del'>- */</div><div class='del'>-int bch2_check_extents(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct inode_walker w = inode_walker_init();</div><div class='del'>-	struct snapshots_seen s;</div><div class='del'>-	struct extent_ends extent_ends;</div><div class='del'>-	struct disk_reservation res = { 0 };</div><div class='del'>-</div><div class='del'>-	snapshots_seen_init(&amp;s);</div><div class='del'>-	extent_ends_init(&amp;extent_ends);</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_extents,</div><div class='del'>-				POS(BCACHEFS_ROOT_INO, 0),</div><div class='del'>-				BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				&amp;res, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc, ({</div><div class='del'>-			bch2_disk_reservation_put(c, &amp;res);</div><div class='del'>-			check_extent(trans, &amp;iter, k, &amp;w, &amp;s, &amp;extent_ends) ?:</div><div class='del'>-			check_extent_overbig(trans, &amp;iter, k);</div><div class='del'>-		})) ?:</div><div class='del'>-		check_i_sectors(trans, &amp;w));</div><div class='del'>-</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;res);</div><div class='del'>-	extent_ends_exit(&amp;extent_ends);</div><div class='del'>-	inode_walker_exit(&amp;w);</div><div class='del'>-	snapshots_seen_exit(&amp;s);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_indirect_extents(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct disk_reservation res = { 0 };</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_reflink,</div><div class='del'>-				POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH, k,</div><div class='del'>-				&amp;res, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc, ({</div><div class='del'>-			bch2_disk_reservation_put(c, &amp;res);</div><div class='del'>-			check_extent_overbig(trans, &amp;iter, k);</div><div class='del'>-		})));</div><div class='del'>-</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;res);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_subdir_count(struct btree_trans *trans, struct inode_walker *w)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	s64 count2;</div><div class='del'>-</div><div class='del'>-	darray_for_each(w-&gt;inodes, i) {</div><div class='del'>-		if (i-&gt;inode.bi_nlink == i-&gt;count)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		count2 = bch2_count_subdirs(trans, w-&gt;last_pos.inode, i-&gt;snapshot);</div><div class='del'>-		if (count2 &lt; 0)</div><div class='del'>-			return count2;</div><div class='del'>-</div><div class='del'>-		if (i-&gt;count != count2) {</div><div class='del'>-			bch_err(c, "fsck counted subdirectories wrong: got %llu should be %llu",</div><div class='del'>-				i-&gt;count, count2);</div><div class='del'>-			i-&gt;count = count2;</div><div class='del'>-			if (i-&gt;inode.bi_nlink == i-&gt;count)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(i-&gt;inode.bi_nlink != i-&gt;count,</div><div class='del'>-				c, inode_dir_wrong_nlink,</div><div class='del'>-				"directory %llu:%u with wrong i_nlink: got %u, should be %llu",</div><div class='del'>-				w-&gt;last_pos.inode, i-&gt;snapshot, i-&gt;inode.bi_nlink, i-&gt;count)) {</div><div class='del'>-			i-&gt;inode.bi_nlink = i-&gt;count;</div><div class='del'>-			ret = fsck_write_inode(trans, &amp;i-&gt;inode, i-&gt;snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret ?: trans_was_restarted(trans, restart_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_dirent_target(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       struct bkey_s_c_dirent d,</div><div class='del'>-			       struct bch_inode_unpacked *target,</div><div class='del'>-			       u32 target_snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_i_dirent *n;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct btree_iter bp_iter = { NULL };</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!target-&gt;bi_dir &amp;&amp;</div><div class='del'>-	    !target-&gt;bi_dir_offset) {</div><div class='del'>-		target-&gt;bi_dir		= d.k-&gt;p.inode;</div><div class='del'>-		target-&gt;bi_dir_offset	= d.k-&gt;p.offset;</div><div class='del'>-</div><div class='del'>-		ret = __write_inode(trans, target, target_snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!inode_points_to_dirent(target, d)) {</div><div class='del'>-		struct bkey_s_c_dirent bp_dirent = dirent_get_by_pos(trans, &amp;bp_iter,</div><div class='del'>-				      SPOS(target-&gt;bi_dir, target-&gt;bi_dir_offset, target_snapshot));</div><div class='del'>-		ret = bkey_err(bp_dirent);</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bool backpointer_exists = !ret;</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, d.s_c);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		if (backpointer_exists)</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf, c, bp_dirent.s_c);</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(S_ISDIR(target-&gt;bi_mode) &amp;&amp; backpointer_exists,</div><div class='del'>-				c, inode_dir_multiple_links,</div><div class='del'>-				"directory %llu:%u with multiple links\n%s",</div><div class='del'>-				target-&gt;bi_inum, target_snapshot, buf.buf)) {</div><div class='del'>-			ret = __remove_dirent(trans, d.k-&gt;p);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * hardlinked file with nlink 0:</div><div class='del'>-		 * We're just adjusting nlink here so check_nlinks() will pick</div><div class='del'>-		 * it up, it ignores inodes with nlink 0</div><div class='del'>-		 */</div><div class='del'>-		if (fsck_err_on(backpointer_exists &amp;&amp; !target-&gt;bi_nlink,</div><div class='del'>-				c, inode_multiple_links_but_nlink_0,</div><div class='del'>-				"inode %llu:%u type %s has multiple links but i_nlink 0\n%s",</div><div class='del'>-				target-&gt;bi_inum, target_snapshot, bch2_d_types[d.v-&gt;d_type], buf.buf)) {</div><div class='del'>-			target-&gt;bi_nlink++;</div><div class='del'>-			target-&gt;bi_flags &amp;= ~BCH_INODE_unlinked;</div><div class='del'>-</div><div class='del'>-			ret = __write_inode(trans, target, target_snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(!backpointer_exists,</div><div class='del'>-				c, inode_wrong_backpointer,</div><div class='del'>-				"inode %llu:%u has wrong backpointer:\n"</div><div class='del'>-				"got       %llu:%llu\n"</div><div class='del'>-				"should be %llu:%llu",</div><div class='del'>-				target-&gt;bi_inum, target_snapshot,</div><div class='del'>-				target-&gt;bi_dir,</div><div class='del'>-				target-&gt;bi_dir_offset,</div><div class='del'>-				d.k-&gt;p.inode,</div><div class='del'>-				d.k-&gt;p.offset)) {</div><div class='del'>-			target-&gt;bi_dir		= d.k-&gt;p.inode;</div><div class='del'>-			target-&gt;bi_dir_offset	= d.k-&gt;p.offset;</div><div class='del'>-</div><div class='del'>-			ret = __write_inode(trans, target, target_snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(d.v-&gt;d_type != inode_d_type(target),</div><div class='del'>-			c, dirent_d_type_wrong,</div><div class='del'>-			"incorrect d_type: got %s, should be %s:\n%s",</div><div class='del'>-			bch2_d_type_str(d.v-&gt;d_type),</div><div class='del'>-			bch2_d_type_str(inode_d_type(target)),</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, d.s_c), buf.buf))) {</div><div class='del'>-		n = bch2_trans_kmalloc(trans, bkey_bytes(d.k));</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(&amp;n-&gt;k_i, d.s_c);</div><div class='del'>-		n-&gt;v.d_type = inode_d_type(target);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, iter, &amp;n-&gt;k_i, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		d = dirent_i_to_s_c(n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(d.v-&gt;d_type == DT_SUBVOL &amp;&amp;</div><div class='del'>-			target-&gt;bi_parent_subvol != le32_to_cpu(d.v-&gt;d_parent_subvol),</div><div class='del'>-			c, dirent_d_parent_subvol_wrong,</div><div class='del'>-			"dirent has wrong d_parent_subvol field: got %u, should be %u",</div><div class='del'>-			le32_to_cpu(d.v-&gt;d_parent_subvol),</div><div class='del'>-			target-&gt;bi_parent_subvol)) {</div><div class='del'>-		n = bch2_trans_kmalloc(trans, bkey_bytes(d.k));</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bkey_reassemble(&amp;n-&gt;k_i, d.s_c);</div><div class='del'>-		n-&gt;v.d_parent_subvol = cpu_to_le32(target-&gt;bi_parent_subvol);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, iter, &amp;n-&gt;k_i, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		d = dirent_i_to_s_c(n);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;bp_iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			struct bkey_s_c k,</div><div class='del'>-			struct bch_hash_info *hash_info,</div><div class='del'>-			struct inode_walker *dir,</div><div class='del'>-			struct inode_walker *target,</div><div class='del'>-			struct snapshots_seen *s)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c_dirent d;</div><div class='del'>-	struct inode_walker_entry *i;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	struct bpos equiv;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = check_key_has_snapshot(trans, iter, k);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ret = ret &lt; 0 ? ret : 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	equiv = k.k-&gt;p;</div><div class='del'>-	equiv.snapshot = bch2_snapshot_equiv(c, k.k-&gt;p.snapshot);</div><div class='del'>-</div><div class='del'>-	ret = snapshots_seen_update(c, s, iter-&gt;btree_id, k.k-&gt;p);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_whiteout)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (dir-&gt;last_pos.inode != k.k-&gt;p.inode) {</div><div class='del'>-		ret = check_subdir_count(trans, dir);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!btree_iter_path(trans, iter)-&gt;should_be_locked);</div><div class='del'>-</div><div class='del'>-	i = walk_inode(trans, dir, equiv, k.k-&gt;type == KEY_TYPE_whiteout);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(i);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (dir-&gt;first_this_inode &amp;&amp; dir-&gt;inodes.nr)</div><div class='del'>-		*hash_info = bch2_hash_info_init(c, &amp;dir-&gt;inodes.data[0].inode);</div><div class='del'>-	dir-&gt;first_this_inode = false;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!i, c, dirent_in_missing_dir_inode,</div><div class='del'>-			"dirent in nonexisting directory:\n%s",</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at(trans, iter,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!i)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!S_ISDIR(i-&gt;inode.bi_mode),</div><div class='del'>-			c, dirent_in_non_dir_inode,</div><div class='del'>-			"dirent in non directory inode type %s:\n%s",</div><div class='del'>-			bch2_d_type_str(inode_d_type(&amp;i-&gt;inode)),</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at(trans, iter, 0);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = hash_check_key(trans, bch2_dirent_hash_desc, hash_info, iter, k);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-	if (ret) {</div><div class='del'>-		/* dirent has been deleted */</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_dirent)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	d = bkey_s_c_to_dirent(k);</div><div class='del'>-</div><div class='del'>-	if (d.v-&gt;d_type == DT_SUBVOL) {</div><div class='del'>-		struct bch_inode_unpacked subvol_root;</div><div class='del'>-		u32 target_subvol = le32_to_cpu(d.v-&gt;d_child_subvol);</div><div class='del'>-		u32 target_snapshot;</div><div class='del'>-		u64 target_inum;</div><div class='del'>-</div><div class='del'>-		ret = subvol_lookup(trans, target_subvol,</div><div class='del'>-				      &amp;target_snapshot, &amp;target_inum);</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(ret, c, dirent_to_missing_subvol,</div><div class='del'>-				"dirent points to missing subvolume %u",</div><div class='del'>-				le32_to_cpu(d.v-&gt;d_child_subvol))) {</div><div class='del'>-			ret = __remove_dirent(trans, d.k-&gt;p);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = lookup_inode(trans, target_inum,</div><div class='del'>-				   &amp;subvol_root, &amp;target_snapshot);</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(ret, c, subvol_to_missing_root,</div><div class='del'>-				"subvolume %u points to missing subvolume root %llu",</div><div class='del'>-				target_subvol,</div><div class='del'>-				target_inum)) {</div><div class='del'>-			bch_err(c, "repair not implemented yet");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(subvol_root.bi_subvol != target_subvol,</div><div class='del'>-				c, subvol_root_wrong_bi_subvol,</div><div class='del'>-				"subvol root %llu has wrong bi_subvol field: got %u, should be %u",</div><div class='del'>-				target_inum,</div><div class='del'>-				subvol_root.bi_subvol, target_subvol)) {</div><div class='del'>-			subvol_root.bi_subvol = target_subvol;</div><div class='del'>-			ret = __write_inode(trans, &amp;subvol_root, target_snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = check_dirent_target(trans, iter, d, &amp;subvol_root,</div><div class='del'>-					  target_snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		ret = __get_visible_inodes(trans, target, s, le64_to_cpu(d.v-&gt;d_inum));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(!target-&gt;inodes.nr,</div><div class='del'>-				c, dirent_to_missing_inode,</div><div class='del'>-				"dirent points to missing inode: (equiv %u)\n%s",</div><div class='del'>-				equiv.snapshot,</div><div class='del'>-				(printbuf_reset(&amp;buf),</div><div class='del'>-				 bch2_bkey_val_to_text(&amp;buf, c, k),</div><div class='del'>-				 buf.buf))) {</div><div class='del'>-			ret = __remove_dirent(trans, d.k-&gt;p);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		darray_for_each(target-&gt;inodes, i) {</div><div class='del'>-			ret = check_dirent_target(trans, iter, d,</div><div class='del'>-						  &amp;i-&gt;inode, i-&gt;snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d.v-&gt;d_type == DT_DIR)</div><div class='del'>-		for_each_visible_inode(c, s, dir, equiv.snapshot, i)</div><div class='del'>-			i-&gt;count++;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Walk dirents: verify that they all have a corresponding S_ISDIR inode,</div><div class='del'>- * validate d_type</div><div class='del'>- */</div><div class='del'>-int bch2_check_dirents(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct inode_walker dir = inode_walker_init();</div><div class='del'>-	struct inode_walker target = inode_walker_init();</div><div class='del'>-	struct snapshots_seen s;</div><div class='del'>-	struct bch_hash_info hash_info;</div><div class='del'>-</div><div class='del'>-	snapshots_seen_init(&amp;s);</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_dirents,</div><div class='del'>-				POS(BCACHEFS_ROOT_INO, 0),</div><div class='del'>-				BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS,</div><div class='del'>-				k,</div><div class='del'>-				NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			check_dirent(trans, &amp;iter, k, &amp;hash_info, &amp;dir, &amp;target, &amp;s)));</div><div class='del'>-</div><div class='del'>-	snapshots_seen_exit(&amp;s);</div><div class='del'>-	inode_walker_exit(&amp;dir);</div><div class='del'>-	inode_walker_exit(&amp;target);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_xattr(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-		       struct bkey_s_c k,</div><div class='del'>-		       struct bch_hash_info *hash_info,</div><div class='del'>-		       struct inode_walker *inode)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct inode_walker_entry *i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = check_key_has_snapshot(trans, iter, k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	i = walk_inode(trans, inode, k.k-&gt;p, k.k-&gt;type == KEY_TYPE_whiteout);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(i);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;first_this_inode &amp;&amp; inode-&gt;inodes.nr)</div><div class='del'>-		*hash_info = bch2_hash_info_init(c, &amp;inode-&gt;inodes.data[0].inode);</div><div class='del'>-	inode-&gt;first_this_inode = false;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!i, c, xattr_in_missing_inode,</div><div class='del'>-			"xattr for missing inode %llu",</div><div class='del'>-			k.k-&gt;p.inode))</div><div class='del'>-		return bch2_btree_delete_at(trans, iter, 0);</div><div class='del'>-</div><div class='del'>-	if (!i)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = hash_check_key(trans, bch2_xattr_hash_desc, hash_info, iter, k);</div><div class='del'>-fsck_err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Walk xattrs: verify that they all have a corresponding inode</div><div class='del'>- */</div><div class='del'>-int bch2_check_xattrs(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct inode_walker inode = inode_walker_init();</div><div class='del'>-	struct bch_hash_info hash_info;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-			POS(BCACHEFS_ROOT_INO, 0),</div><div class='del'>-			BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS,</div><div class='del'>-			k,</div><div class='del'>-			NULL, NULL,</div><div class='del'>-			BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		check_xattr(trans, &amp;iter, k, &amp;hash_info, &amp;inode)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_root_trans(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_inode_unpacked root_inode;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	u64 inum;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = subvol_lookup(trans, BCACHEFS_ROOT_SUBVOL, &amp;snapshot, &amp;inum);</div><div class='del'>-	if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (mustfix_fsck_err_on(ret, c, root_subvol_missing,</div><div class='del'>-				"root subvol missing")) {</div><div class='del'>-		struct bkey_i_subvolume root_subvol;</div><div class='del'>-</div><div class='del'>-		snapshot	= U32_MAX;</div><div class='del'>-		inum		= BCACHEFS_ROOT_INO;</div><div class='del'>-</div><div class='del'>-		bkey_subvolume_init(&amp;root_subvol.k_i);</div><div class='del'>-		root_subvol.k.p.offset = BCACHEFS_ROOT_SUBVOL;</div><div class='del'>-		root_subvol.v.flags	= 0;</div><div class='del'>-		root_subvol.v.snapshot	= cpu_to_le32(snapshot);</div><div class='del'>-		root_subvol.v.inode	= cpu_to_le64(inum);</div><div class='del'>-		ret = bch2_btree_insert_trans(trans, BTREE_ID_subvolumes, &amp;root_subvol.k_i, 0);</div><div class='del'>-		bch_err_msg(c, ret, "writing root subvol");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = lookup_inode(trans, BCACHEFS_ROOT_INO, &amp;root_inode, &amp;snapshot);</div><div class='del'>-	if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (mustfix_fsck_err_on(ret, c, root_dir_missing,</div><div class='del'>-				"root directory missing") ||</div><div class='del'>-	    mustfix_fsck_err_on(!S_ISDIR(root_inode.bi_mode),</div><div class='del'>-				c, root_inode_not_dir,</div><div class='del'>-				"root inode not a directory")) {</div><div class='del'>-		bch2_inode_init(c, &amp;root_inode, 0, 0, S_IFDIR|0755,</div><div class='del'>-				0, NULL);</div><div class='del'>-		root_inode.bi_inum = inum;</div><div class='del'>-</div><div class='del'>-		ret = __write_inode(trans, &amp;root_inode, snapshot);</div><div class='del'>-		bch_err_msg(c, ret, "writing root inode");</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get root directory, create if it doesn't exist: */</div><div class='del'>-int bch2_check_root(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_do(c, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		check_root_trans(trans));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct pathbuf_entry {</div><div class='del'>-	u64	inum;</div><div class='del'>-	u32	snapshot;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef DARRAY(struct pathbuf_entry) pathbuf;</div><div class='del'>-</div><div class='del'>-static bool path_is_dup(pathbuf *p, u64 inum, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(*p, i)</div><div class='del'>-		if (i-&gt;inum	== inum &amp;&amp;</div><div class='del'>-		    i-&gt;snapshot	== snapshot)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int path_down(struct bch_fs *c, pathbuf *p,</div><div class='del'>-		     u64 inum, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	int ret = darray_push(p, ((struct pathbuf_entry) {</div><div class='del'>-		.inum		= inum,</div><div class='del'>-		.snapshot	= snapshot,</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		bch_err(c, "fsck: error allocating memory for pathbuf, size %zu",</div><div class='del'>-			p-&gt;size);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check that a given inode is reachable from the root:</div><div class='del'>- *</div><div class='del'>- * XXX: we should also be verifying that inodes are in the right subvolumes</div><div class='del'>- */</div><div class='del'>-static int check_path(struct btree_trans *trans,</div><div class='del'>-		      pathbuf *p,</div><div class='del'>-		      struct bch_inode_unpacked *inode,</div><div class='del'>-		      u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	snapshot = bch2_snapshot_equiv(c, snapshot);</div><div class='del'>-	p-&gt;nr = 0;</div><div class='del'>-</div><div class='del'>-	while (!(inode-&gt;bi_inum == BCACHEFS_ROOT_INO &amp;&amp;</div><div class='del'>-		 inode-&gt;bi_subvol == BCACHEFS_ROOT_SUBVOL)) {</div><div class='del'>-		struct btree_iter dirent_iter;</div><div class='del'>-		struct bkey_s_c_dirent d;</div><div class='del'>-		u32 parent_snapshot = snapshot;</div><div class='del'>-</div><div class='del'>-		if (inode-&gt;bi_subvol) {</div><div class='del'>-			u64 inum;</div><div class='del'>-</div><div class='del'>-			ret = subvol_lookup(trans, inode-&gt;bi_parent_subvol,</div><div class='del'>-					    &amp;parent_snapshot, &amp;inum);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d = dirent_get_by_pos(trans, &amp;dirent_iter,</div><div class='del'>-				      SPOS(inode-&gt;bi_dir, inode-&gt;bi_dir_offset,</div><div class='del'>-					   parent_snapshot));</div><div class='del'>-		ret = bkey_err(d.s_c);</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!ret &amp;&amp; !dirent_points_to_inode(d, inode)) {</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;dirent_iter);</div><div class='del'>-			ret = -BCH_ERR_ENOENT_dirent_doesnt_match_inode;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, ENOENT)) {</div><div class='del'>-			if (fsck_err(c,  inode_unreachable,</div><div class='del'>-				     "unreachable inode %llu:%u, type %s nlink %u backptr %llu:%llu",</div><div class='del'>-				     inode-&gt;bi_inum, snapshot,</div><div class='del'>-				     bch2_d_type_str(inode_d_type(inode)),</div><div class='del'>-				     inode-&gt;bi_nlink,</div><div class='del'>-				     inode-&gt;bi_dir,</div><div class='del'>-				     inode-&gt;bi_dir_offset))</div><div class='del'>-				ret = reattach_inode(trans, inode, snapshot);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;dirent_iter);</div><div class='del'>-</div><div class='del'>-		if (!S_ISDIR(inode-&gt;bi_mode))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = path_down(c, p, inode-&gt;bi_inum, snapshot);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bch_err(c, "memory allocation failure");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		snapshot = parent_snapshot;</div><div class='del'>-</div><div class='del'>-		ret = lookup_inode(trans, inode-&gt;bi_dir, inode, &amp;snapshot);</div><div class='del'>-		if (ret) {</div><div class='del'>-			/* Should have been caught in dirents pass */</div><div class='del'>-			if (!bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				bch_err(c, "error looking up parent directory: %i", ret);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (path_is_dup(p, inode-&gt;bi_inum, snapshot)) {</div><div class='del'>-			/* XXX print path */</div><div class='del'>-			bch_err(c, "directory structure loop");</div><div class='del'>-</div><div class='del'>-			darray_for_each(*p, i)</div><div class='del'>-				pr_err("%llu:%u", i-&gt;inum, i-&gt;snapshot);</div><div class='del'>-			pr_err("%llu:%u", inode-&gt;bi_inum, snapshot);</div><div class='del'>-</div><div class='del'>-			if (!fsck_err(c, dir_loop, "directory structure loop"))</div><div class='del'>-				return 0;</div><div class='del'>-</div><div class='del'>-			ret = remove_backpointer(trans, inode);</div><div class='del'>-			if (ret &amp;&amp; !bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				bch_err_msg(c, ret, "removing dirent");</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ret = reattach_inode(trans, inode, snapshot);</div><div class='del'>-			if (ret &amp;&amp; !bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				bch_err_msg(c, ret, "reattaching inode %llu", inode-&gt;bi_inum);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check for unreachable inodes, as well as loops in the directory structure:</div><div class='del'>- * After bch2_check_dirents(), if an inode backpointer doesn't exist that means it's</div><div class='del'>- * unreachable:</div><div class='del'>- */</div><div class='del'>-int bch2_check_directory_structure(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-	pathbuf path = { 0, };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_inodes, POS_MIN,</div><div class='del'>-					  BTREE_ITER_INTENT|</div><div class='del'>-					  BTREE_ITER_PREFETCH|</div><div class='del'>-					  BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-					  NULL, NULL, BCH_TRANS_COMMIT_no_enospc, ({</div><div class='del'>-			if (!bkey_is_inode(k.k))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			BUG_ON(bch2_inode_unpack(k, &amp;u));</div><div class='del'>-</div><div class='del'>-			if (u.bi_flags &amp; BCH_INODE_unlinked)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			check_path(trans, &amp;path, &amp;u, iter.pos.snapshot);</div><div class='del'>-		})));</div><div class='del'>-	darray_exit(&amp;path);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct nlink_table {</div><div class='del'>-	size_t		nr;</div><div class='del'>-	size_t		size;</div><div class='del'>-</div><div class='del'>-	struct nlink {</div><div class='del'>-		u64	inum;</div><div class='del'>-		u32	snapshot;</div><div class='del'>-		u32	count;</div><div class='del'>-	}		*d;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int add_nlink(struct bch_fs *c, struct nlink_table *t,</div><div class='del'>-		     u64 inum, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	if (t-&gt;nr == t-&gt;size) {</div><div class='del'>-		size_t new_size = max_t(size_t, 128UL, t-&gt;size * 2);</div><div class='del'>-		void *d = kvmalloc_array(new_size, sizeof(t-&gt;d[0]), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (!d) {</div><div class='del'>-			bch_err(c, "fsck: error allocating memory for nlink_table, size %zu",</div><div class='del'>-				new_size);</div><div class='del'>-			return -BCH_ERR_ENOMEM_fsck_add_nlink;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (t-&gt;d)</div><div class='del'>-			memcpy(d, t-&gt;d, t-&gt;size * sizeof(t-&gt;d[0]));</div><div class='del'>-		kvfree(t-&gt;d);</div><div class='del'>-</div><div class='del'>-		t-&gt;d = d;</div><div class='del'>-		t-&gt;size = new_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	t-&gt;d[t-&gt;nr++] = (struct nlink) {</div><div class='del'>-		.inum		= inum,</div><div class='del'>-		.snapshot	= snapshot,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nlink_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const struct nlink *l = _l;</div><div class='del'>-	const struct nlink *r = _r;</div><div class='del'>-</div><div class='del'>-	return cmp_int(l-&gt;inum, r-&gt;inum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inc_link(struct bch_fs *c, struct snapshots_seen *s,</div><div class='del'>-		     struct nlink_table *links,</div><div class='del'>-		     u64 range_start, u64 range_end, u64 inum, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	struct nlink *link, key = {</div><div class='del'>-		.inum = inum, .snapshot = U32_MAX,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (inum &lt; range_start || inum &gt;= range_end)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	link = __inline_bsearch(&amp;key, links-&gt;d, links-&gt;nr,</div><div class='del'>-				sizeof(links-&gt;d[0]), nlink_cmp);</div><div class='del'>-	if (!link)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (link &gt; links-&gt;d &amp;&amp; link[0].inum == link[-1].inum)</div><div class='del'>-		--link;</div><div class='del'>-</div><div class='del'>-	for (; link &lt; links-&gt;d + links-&gt;nr &amp;&amp; link-&gt;inum == inum; link++)</div><div class='del'>-		if (ref_visible(c, s, snapshot, link-&gt;snapshot)) {</div><div class='del'>-			link-&gt;count++;</div><div class='del'>-			if (link-&gt;snapshot &gt;= snapshot)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline_for_stack</div><div class='del'>-static int check_nlinks_find_hardlinks(struct bch_fs *c,</div><div class='del'>-				       struct nlink_table *t,</div><div class='del'>-				       u64 start, u64 *end)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_inodes,</div><div class='del'>-				   POS(0, start),</div><div class='del'>-				   BTREE_ITER_INTENT|</div><div class='del'>-				   BTREE_ITER_PREFETCH|</div><div class='del'>-				   BTREE_ITER_ALL_SNAPSHOTS, k, ({</div><div class='del'>-			if (!bkey_is_inode(k.k))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* Should never fail, checked by bch2_inode_invalid: */</div><div class='del'>-			struct bch_inode_unpacked u;</div><div class='del'>-			BUG_ON(bch2_inode_unpack(k, &amp;u));</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Backpointer and directory structure checks are sufficient for</div><div class='del'>-			 * directories, since they can't have hardlinks:</div><div class='del'>-			 */</div><div class='del'>-			if (S_ISDIR(u.bi_mode))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!u.bi_nlink)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ret = add_nlink(c, t, k.k-&gt;p.offset, k.k-&gt;p.snapshot);</div><div class='del'>-			if (ret) {</div><div class='del'>-				*end = k.k-&gt;p.offset;</div><div class='del'>-				ret = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline_for_stack</div><div class='del'>-static int check_nlinks_walk_dirents(struct bch_fs *c, struct nlink_table *links,</div><div class='del'>-				     u64 range_start, u64 range_end)</div><div class='del'>-{</div><div class='del'>-	struct snapshots_seen s;</div><div class='del'>-</div><div class='del'>-	snapshots_seen_init(&amp;s);</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_dirents, POS_MIN,</div><div class='del'>-				   BTREE_ITER_INTENT|</div><div class='del'>-				   BTREE_ITER_PREFETCH|</div><div class='del'>-				   BTREE_ITER_ALL_SNAPSHOTS, k, ({</div><div class='del'>-			ret = snapshots_seen_update(c, &amp;s, iter.btree_id, k.k-&gt;p);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (k.k-&gt;type == KEY_TYPE_dirent) {</div><div class='del'>-				struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);</div><div class='del'>-</div><div class='del'>-				if (d.v-&gt;d_type != DT_DIR &amp;&amp;</div><div class='del'>-				    d.v-&gt;d_type != DT_SUBVOL)</div><div class='del'>-					inc_link(c, &amp;s, links, range_start, range_end,</div><div class='del'>-						 le64_to_cpu(d.v-&gt;d_inum),</div><div class='del'>-						 bch2_snapshot_equiv(c, d.k-&gt;p.snapshot));</div><div class='del'>-			}</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-</div><div class='del'>-	snapshots_seen_exit(&amp;s);</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_nlinks_update_inode(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-				     struct bkey_s_c k,</div><div class='del'>-				     struct nlink_table *links,</div><div class='del'>-				     size_t *idx, u64 range_end)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-	struct nlink *link = &amp;links-&gt;d[*idx];</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;p.offset &gt;= range_end)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (!bkey_is_inode(k.k))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_inode_unpack(k, &amp;u));</div><div class='del'>-</div><div class='del'>-	if (S_ISDIR(u.bi_mode))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!u.bi_nlink)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while ((cmp_int(link-&gt;inum, k.k-&gt;p.offset) ?:</div><div class='del'>-		cmp_int(link-&gt;snapshot, k.k-&gt;p.snapshot)) &lt; 0) {</div><div class='del'>-		BUG_ON(*idx == links-&gt;nr);</div><div class='del'>-		link = &amp;links-&gt;d[++*idx];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(bch2_inode_nlink_get(&amp;u) != link-&gt;count,</div><div class='del'>-			c, inode_wrong_nlink,</div><div class='del'>-			"inode %llu type %s has wrong i_nlink (%u, should be %u)",</div><div class='del'>-			u.bi_inum, bch2_d_types[mode_to_type(u.bi_mode)],</div><div class='del'>-			bch2_inode_nlink_get(&amp;u), link-&gt;count)) {</div><div class='del'>-		bch2_inode_nlink_set(&amp;u, link-&gt;count);</div><div class='del'>-		ret = __write_inode(trans, &amp;u, k.k-&gt;p.snapshot);</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline_for_stack</div><div class='del'>-static int check_nlinks_update_hardlinks(struct bch_fs *c,</div><div class='del'>-			       struct nlink_table *links,</div><div class='del'>-			       u64 range_start, u64 range_end)</div><div class='del'>-{</div><div class='del'>-	size_t idx = 0;</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_inodes,</div><div class='del'>-				POS(0, range_start),</div><div class='del'>-				BTREE_ITER_INTENT|BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			check_nlinks_update_inode(trans, &amp;iter, k, links, &amp;idx, range_end)));</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		bch_err(c, "error in fsck walking inodes: %s", bch2_err_str(ret));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_nlinks(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct nlink_table links = { 0 };</div><div class='del'>-	u64 this_iter_range_start, next_iter_range_start = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		this_iter_range_start = next_iter_range_start;</div><div class='del'>-		next_iter_range_start = U64_MAX;</div><div class='del'>-</div><div class='del'>-		ret = check_nlinks_find_hardlinks(c, &amp;links,</div><div class='del'>-						  this_iter_range_start,</div><div class='del'>-						  &amp;next_iter_range_start);</div><div class='del'>-</div><div class='del'>-		ret = check_nlinks_walk_dirents(c, &amp;links,</div><div class='del'>-					  this_iter_range_start,</div><div class='del'>-					  next_iter_range_start);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = check_nlinks_update_hardlinks(c, &amp;links,</div><div class='del'>-					 this_iter_range_start,</div><div class='del'>-					 next_iter_range_start);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		links.nr = 0;</div><div class='del'>-	} while (next_iter_range_start != U64_MAX);</div><div class='del'>-</div><div class='del'>-	kvfree(links.d);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fix_reflink_p_key(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			     struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_reflink_p p;</div><div class='del'>-	struct bkey_i_reflink_p *u;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_reflink_p)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = bkey_s_c_to_reflink_p(k);</div><div class='del'>-</div><div class='del'>-	if (!p.v-&gt;front_pad &amp;&amp; !p.v-&gt;back_pad)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	u = bch2_trans_kmalloc(trans, sizeof(*u));</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bkey_reassemble(&amp;u-&gt;k_i, k);</div><div class='del'>-	u-&gt;v.front_pad	= 0;</div><div class='del'>-	u-&gt;v.back_pad	= 0;</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update(trans, iter, &amp;u-&gt;k_i, BTREE_TRIGGER_NORUN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fix_reflink_p(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;sb.version &gt;= bcachefs_metadata_version_reflink_p_fix)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-				BTREE_ID_extents, POS_MIN,</div><div class='del'>-				BTREE_ITER_INTENT|BTREE_ITER_PREFETCH|</div><div class='del'>-				BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			fix_reflink_p_key(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/fsck.h b/fs/bcachefs/fsck.h<br/>deleted file mode 100644<br/>index da991e8cf27e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/fsck.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/fsck.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_FSCK_H</div><div class='del'>-#define _BCACHEFS_FSCK_H</div><div class='del'>-</div><div class='del'>-int bch2_check_inodes(struct bch_fs *);</div><div class='del'>-int bch2_check_extents(struct bch_fs *);</div><div class='del'>-int bch2_check_indirect_extents(struct bch_fs *);</div><div class='del'>-int bch2_check_dirents(struct bch_fs *);</div><div class='del'>-int bch2_check_xattrs(struct bch_fs *);</div><div class='del'>-int bch2_check_root(struct bch_fs *);</div><div class='del'>-int bch2_check_directory_structure(struct bch_fs *);</div><div class='del'>-int bch2_check_nlinks(struct bch_fs *);</div><div class='del'>-int bch2_fix_reflink_p(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_FSCK_H */</div><div class='head'>diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c<br/>deleted file mode 100644<br/>index 086f0090b03a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/inode.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1195 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "extent_update.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "str_hash.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "varint.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#define x(name, ...)	#name,</div><div class='del'>-const char * const bch2_inode_opts[] = {</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char * const bch2_inode_flag_strs[] = {</div><div class='del'>-	BCH_INODE_FLAGS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-#undef  x</div><div class='del'>-</div><div class='del'>-static const u8 byte_table[8] = { 1, 2, 3, 4, 6, 8, 10, 13 };</div><div class='del'>-</div><div class='del'>-static int inode_decode_field(const u8 *in, const u8 *end,</div><div class='del'>-			      u64 out[2], unsigned *out_bits)</div><div class='del'>-{</div><div class='del'>-	__be64 be[2] = { 0, 0 };</div><div class='del'>-	unsigned bytes, shift;</div><div class='del'>-	u8 *p;</div><div class='del'>-</div><div class='del'>-	if (in &gt;= end)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (!*in)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * position of highest set bit indicates number of bytes:</div><div class='del'>-	 * shift = number of bits to remove in high byte:</div><div class='del'>-	 */</div><div class='del'>-	shift	= 8 - __fls(*in); /* 1 &lt;= shift &lt;= 8 */</div><div class='del'>-	bytes	= byte_table[shift - 1];</div><div class='del'>-</div><div class='del'>-	if (in + bytes &gt; end)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	p = (u8 *) be + 16 - bytes;</div><div class='del'>-	memcpy(p, in, bytes);</div><div class='del'>-	*p ^= (1 &lt;&lt; 8) &gt;&gt; shift;</div><div class='del'>-</div><div class='del'>-	out[0] = be64_to_cpu(be[0]);</div><div class='del'>-	out[1] = be64_to_cpu(be[1]);</div><div class='del'>-	*out_bits = out[0] ? 64 + fls64(out[0]) : fls64(out[1]);</div><div class='del'>-</div><div class='del'>-	return bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_inode_pack_inlined(struct bkey_inode_buf *packed,</div><div class='del'>-					   const struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_inode_v3 *k = &amp;packed-&gt;inode;</div><div class='del'>-	u8 *out = k-&gt;v.fields;</div><div class='del'>-	u8 *end = (void *) &amp;packed[1];</div><div class='del'>-	u8 *last_nonzero_field = out;</div><div class='del'>-	unsigned nr_fields = 0, last_nonzero_fieldnr = 0;</div><div class='del'>-	unsigned bytes;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_inode_v3_init(&amp;packed-&gt;inode.k_i);</div><div class='del'>-	packed-&gt;inode.k.p.offset	= inode-&gt;bi_inum;</div><div class='del'>-	packed-&gt;inode.v.bi_journal_seq	= cpu_to_le64(inode-&gt;bi_journal_seq);</div><div class='del'>-	packed-&gt;inode.v.bi_hash_seed	= inode-&gt;bi_hash_seed;</div><div class='del'>-	packed-&gt;inode.v.bi_flags	= cpu_to_le64(inode-&gt;bi_flags);</div><div class='del'>-	packed-&gt;inode.v.bi_sectors	= cpu_to_le64(inode-&gt;bi_sectors);</div><div class='del'>-	packed-&gt;inode.v.bi_size		= cpu_to_le64(inode-&gt;bi_size);</div><div class='del'>-	packed-&gt;inode.v.bi_version	= cpu_to_le64(inode-&gt;bi_version);</div><div class='del'>-	SET_INODEv3_MODE(&amp;packed-&gt;inode.v, inode-&gt;bi_mode);</div><div class='del'>-	SET_INODEv3_FIELDS_START(&amp;packed-&gt;inode.v, INODEv3_FIELDS_START_CUR);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)							\</div><div class='del'>-	nr_fields++;							\</div><div class='del'>-									\</div><div class='del'>-	if (inode-&gt;_name) {						\</div><div class='del'>-		ret = bch2_varint_encode_fast(out, inode-&gt;_name);	\</div><div class='del'>-		out += ret;						\</div><div class='del'>-									\</div><div class='del'>-		if (_bits &gt; 64)						\</div><div class='del'>-			*out++ = 0;					\</div><div class='del'>-									\</div><div class='del'>-		last_nonzero_field = out;				\</div><div class='del'>-		last_nonzero_fieldnr = nr_fields;			\</div><div class='del'>-	} else {							\</div><div class='del'>-		*out++ = 0;						\</div><div class='del'>-									\</div><div class='del'>-		if (_bits &gt; 64)						\</div><div class='del'>-			*out++ = 0;					\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BCH_INODE_FIELDS_v3()</div><div class='del'>-#undef  x</div><div class='del'>-	BUG_ON(out &gt; end);</div><div class='del'>-</div><div class='del'>-	out = last_nonzero_field;</div><div class='del'>-	nr_fields = last_nonzero_fieldnr;</div><div class='del'>-</div><div class='del'>-	bytes = out - (u8 *) &amp;packed-&gt;inode.v;</div><div class='del'>-	set_bkey_val_bytes(&amp;packed-&gt;inode.k, bytes);</div><div class='del'>-	memset_u64s_tail(&amp;packed-&gt;inode.v, 0, bytes);</div><div class='del'>-</div><div class='del'>-	SET_INODEv3_NR_FIELDS(&amp;k-&gt;v, nr_fields);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG)) {</div><div class='del'>-		struct bch_inode_unpacked unpacked;</div><div class='del'>-</div><div class='del'>-		ret = bch2_inode_unpack(bkey_i_to_s_c(&amp;packed-&gt;inode.k_i), &amp;unpacked);</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-		BUG_ON(unpacked.bi_inum		!= inode-&gt;bi_inum);</div><div class='del'>-		BUG_ON(unpacked.bi_hash_seed	!= inode-&gt;bi_hash_seed);</div><div class='del'>-		BUG_ON(unpacked.bi_sectors	!= inode-&gt;bi_sectors);</div><div class='del'>-		BUG_ON(unpacked.bi_size		!= inode-&gt;bi_size);</div><div class='del'>-		BUG_ON(unpacked.bi_version	!= inode-&gt;bi_version);</div><div class='del'>-		BUG_ON(unpacked.bi_mode		!= inode-&gt;bi_mode);</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)	if (unpacked._name != inode-&gt;_name)		\</div><div class='del'>-			panic("unpacked %llu should be %llu",		\</div><div class='del'>-			      (u64) unpacked._name, (u64) inode-&gt;_name);</div><div class='del'>-		BCH_INODE_FIELDS_v3()</div><div class='del'>-#undef  x</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_pack(struct bkey_inode_buf *packed,</div><div class='del'>-		     const struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	bch2_inode_pack_inlined(packed, inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_inode_unpack_v1(struct bkey_s_c_inode inode,</div><div class='del'>-				struct bch_inode_unpacked *unpacked)</div><div class='del'>-{</div><div class='del'>-	const u8 *in = inode.v-&gt;fields;</div><div class='del'>-	const u8 *end = bkey_val_end(inode);</div><div class='del'>-	u64 field[2];</div><div class='del'>-	unsigned fieldnr = 0, field_bits;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)					\</div><div class='del'>-	if (fieldnr++ == INODE_NR_FIELDS(inode.v)) {			\</div><div class='del'>-		unsigned offset = offsetof(struct bch_inode_unpacked, _name);\</div><div class='del'>-		memset((void *) unpacked + offset, 0,			\</div><div class='del'>-		       sizeof(*unpacked) - offset);			\</div><div class='del'>-		return 0;						\</div><div class='del'>-	}								\</div><div class='del'>-									\</div><div class='del'>-	ret = inode_decode_field(in, end, field, &amp;field_bits);		\</div><div class='del'>-	if (ret &lt; 0)							\</div><div class='del'>-		return ret;						\</div><div class='del'>-									\</div><div class='del'>-	if (field_bits &gt; sizeof(unpacked-&gt;_name) * 8)			\</div><div class='del'>-		return -1;						\</div><div class='del'>-									\</div><div class='del'>-	unpacked-&gt;_name = field[1];					\</div><div class='del'>-	in += ret;</div><div class='del'>-</div><div class='del'>-	BCH_INODE_FIELDS_v2()</div><div class='del'>-#undef  x</div><div class='del'>-</div><div class='del'>-	/* XXX: signal if there were more fields than expected? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_inode_unpack_v2(struct bch_inode_unpacked *unpacked,</div><div class='del'>-				const u8 *in, const u8 *end,</div><div class='del'>-				unsigned nr_fields)</div><div class='del'>-{</div><div class='del'>-	unsigned fieldnr = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	u64 v[2];</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)							\</div><div class='del'>-	if (fieldnr &lt; nr_fields) {					\</div><div class='del'>-		ret = bch2_varint_decode_fast(in, end, &amp;v[0]);		\</div><div class='del'>-		if (ret &lt; 0)						\</div><div class='del'>-			return ret;					\</div><div class='del'>-		in += ret;						\</div><div class='del'>-									\</div><div class='del'>-		if (_bits &gt; 64) {					\</div><div class='del'>-			ret = bch2_varint_decode_fast(in, end, &amp;v[1]);	\</div><div class='del'>-			if (ret &lt; 0)					\</div><div class='del'>-				return ret;				\</div><div class='del'>-			in += ret;					\</div><div class='del'>-		} else {						\</div><div class='del'>-			v[1] = 0;					\</div><div class='del'>-		}							\</div><div class='del'>-	} else {							\</div><div class='del'>-		v[0] = v[1] = 0;					\</div><div class='del'>-	}								\</div><div class='del'>-									\</div><div class='del'>-	unpacked-&gt;_name = v[0];						\</div><div class='del'>-	if (v[1] || v[0] != unpacked-&gt;_name)				\</div><div class='del'>-		return -1;						\</div><div class='del'>-	fieldnr++;</div><div class='del'>-</div><div class='del'>-	BCH_INODE_FIELDS_v2()</div><div class='del'>-#undef  x</div><div class='del'>-</div><div class='del'>-	/* XXX: signal if there were more fields than expected? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_inode_unpack_v3(struct bkey_s_c k,</div><div class='del'>-				struct bch_inode_unpacked *unpacked)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_inode_v3 inode = bkey_s_c_to_inode_v3(k);</div><div class='del'>-	const u8 *in = inode.v-&gt;fields;</div><div class='del'>-	const u8 *end = bkey_val_end(inode);</div><div class='del'>-	unsigned nr_fields = INODEv3_NR_FIELDS(inode.v);</div><div class='del'>-	unsigned fieldnr = 0;</div><div class='del'>-	int ret;</div><div class='del'>-	u64 v[2];</div><div class='del'>-</div><div class='del'>-	unpacked-&gt;bi_inum	= inode.k-&gt;p.offset;</div><div class='del'>-	unpacked-&gt;bi_journal_seq= le64_to_cpu(inode.v-&gt;bi_journal_seq);</div><div class='del'>-	unpacked-&gt;bi_hash_seed	= inode.v-&gt;bi_hash_seed;</div><div class='del'>-	unpacked-&gt;bi_flags	= le64_to_cpu(inode.v-&gt;bi_flags);</div><div class='del'>-	unpacked-&gt;bi_sectors	= le64_to_cpu(inode.v-&gt;bi_sectors);</div><div class='del'>-	unpacked-&gt;bi_size	= le64_to_cpu(inode.v-&gt;bi_size);</div><div class='del'>-	unpacked-&gt;bi_version	= le64_to_cpu(inode.v-&gt;bi_version);</div><div class='del'>-	unpacked-&gt;bi_mode	= INODEv3_MODE(inode.v);</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)							\</div><div class='del'>-	if (fieldnr &lt; nr_fields) {					\</div><div class='del'>-		ret = bch2_varint_decode_fast(in, end, &amp;v[0]);		\</div><div class='del'>-		if (ret &lt; 0)						\</div><div class='del'>-			return ret;					\</div><div class='del'>-		in += ret;						\</div><div class='del'>-									\</div><div class='del'>-		if (_bits &gt; 64) {					\</div><div class='del'>-			ret = bch2_varint_decode_fast(in, end, &amp;v[1]);	\</div><div class='del'>-			if (ret &lt; 0)					\</div><div class='del'>-				return ret;				\</div><div class='del'>-			in += ret;					\</div><div class='del'>-		} else {						\</div><div class='del'>-			v[1] = 0;					\</div><div class='del'>-		}							\</div><div class='del'>-	} else {							\</div><div class='del'>-		v[0] = v[1] = 0;					\</div><div class='del'>-	}								\</div><div class='del'>-									\</div><div class='del'>-	unpacked-&gt;_name = v[0];						\</div><div class='del'>-	if (v[1] || v[0] != unpacked-&gt;_name)				\</div><div class='del'>-		return -1;						\</div><div class='del'>-	fieldnr++;</div><div class='del'>-</div><div class='del'>-	BCH_INODE_FIELDS_v3()</div><div class='del'>-#undef  x</div><div class='del'>-</div><div class='del'>-	/* XXX: signal if there were more fields than expected? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_inode_unpack_slowpath(struct bkey_s_c k,</div><div class='del'>-					       struct bch_inode_unpacked *unpacked)</div><div class='del'>-{</div><div class='del'>-	memset(unpacked, 0, sizeof(*unpacked));</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_inode: {</div><div class='del'>-		struct bkey_s_c_inode inode = bkey_s_c_to_inode(k);</div><div class='del'>-</div><div class='del'>-		unpacked-&gt;bi_inum	= inode.k-&gt;p.offset;</div><div class='del'>-		unpacked-&gt;bi_journal_seq= 0;</div><div class='del'>-		unpacked-&gt;bi_hash_seed	= inode.v-&gt;bi_hash_seed;</div><div class='del'>-		unpacked-&gt;bi_flags	= le32_to_cpu(inode.v-&gt;bi_flags);</div><div class='del'>-		unpacked-&gt;bi_mode	= le16_to_cpu(inode.v-&gt;bi_mode);</div><div class='del'>-</div><div class='del'>-		if (INODE_NEW_VARINT(inode.v)) {</div><div class='del'>-			return bch2_inode_unpack_v2(unpacked, inode.v-&gt;fields,</div><div class='del'>-						    bkey_val_end(inode),</div><div class='del'>-						    INODE_NR_FIELDS(inode.v));</div><div class='del'>-		} else {</div><div class='del'>-			return bch2_inode_unpack_v1(inode, unpacked);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case KEY_TYPE_inode_v2: {</div><div class='del'>-		struct bkey_s_c_inode_v2 inode = bkey_s_c_to_inode_v2(k);</div><div class='del'>-</div><div class='del'>-		unpacked-&gt;bi_inum	= inode.k-&gt;p.offset;</div><div class='del'>-		unpacked-&gt;bi_journal_seq= le64_to_cpu(inode.v-&gt;bi_journal_seq);</div><div class='del'>-		unpacked-&gt;bi_hash_seed	= inode.v-&gt;bi_hash_seed;</div><div class='del'>-		unpacked-&gt;bi_flags	= le64_to_cpu(inode.v-&gt;bi_flags);</div><div class='del'>-		unpacked-&gt;bi_mode	= le16_to_cpu(inode.v-&gt;bi_mode);</div><div class='del'>-</div><div class='del'>-		return bch2_inode_unpack_v2(unpacked, inode.v-&gt;fields,</div><div class='del'>-					    bkey_val_end(inode),</div><div class='del'>-					    INODEv2_NR_FIELDS(inode.v));</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_unpack(struct bkey_s_c k,</div><div class='del'>-		      struct bch_inode_unpacked *unpacked)</div><div class='del'>-{</div><div class='del'>-	if (likely(k.k-&gt;type == KEY_TYPE_inode_v3))</div><div class='del'>-		return bch2_inode_unpack_v3(k, unpacked);</div><div class='del'>-	return bch2_inode_unpack_slowpath(k, unpacked);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_inode_peek_nowarn(struct btree_trans *trans,</div><div class='del'>-		    struct btree_iter *iter,</div><div class='del'>-		    struct bch_inode_unpacked *inode,</div><div class='del'>-		    subvol_inum inum, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, iter, BTREE_ID_inodes,</div><div class='del'>-			       SPOS(0, inum.inum, snapshot),</div><div class='del'>-			       flags|BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bkey_is_inode(k.k) ? 0 : -BCH_ERR_ENOENT_inode;</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_unpack(k, inode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_peek(struct btree_trans *trans,</div><div class='del'>-		    struct btree_iter *iter,</div><div class='del'>-		    struct bch_inode_unpacked *inode,</div><div class='del'>-		    subvol_inum inum, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_inode_peek_nowarn(trans, iter, inode, inum, flags);</div><div class='del'>-	bch_err_msg(trans-&gt;c, ret, "looking up inum %u:%llu:", inum.subvol, inum.inum);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_write_flags(struct btree_trans *trans,</div><div class='del'>-		     struct btree_iter *iter,</div><div class='del'>-		     struct bch_inode_unpacked *inode,</div><div class='del'>-		     enum btree_update_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_inode_buf *inode_p;</div><div class='del'>-</div><div class='del'>-	inode_p = bch2_trans_kmalloc(trans, sizeof(*inode_p));</div><div class='del'>-	if (IS_ERR(inode_p))</div><div class='del'>-		return PTR_ERR(inode_p);</div><div class='del'>-</div><div class='del'>-	bch2_inode_pack_inlined(inode_p, inode);</div><div class='del'>-	inode_p-&gt;inode.k.p.snapshot = iter-&gt;snapshot;</div><div class='del'>-	return bch2_trans_update(trans, iter, &amp;inode_p-&gt;inode.k_i, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i *bch2_inode_to_v3(struct btree_trans *trans, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-	struct bkey_inode_buf *inode_p;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!bkey_is_inode(&amp;k-&gt;k))</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-</div><div class='del'>-	inode_p = bch2_trans_kmalloc(trans, sizeof(*inode_p));</div><div class='del'>-	if (IS_ERR(inode_p))</div><div class='del'>-		return ERR_CAST(inode_p);</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_unpack(bkey_i_to_s_c(k), &amp;u);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	bch2_inode_pack(inode_p, &amp;u);</div><div class='del'>-	return &amp;inode_p-&gt;inode.k_i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_inode_invalid(struct bch_fs *c, struct bkey_s_c k, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked unpacked;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(k.k-&gt;p.inode, c, err,</div><div class='del'>-			 inode_pos_inode_nonzero,</div><div class='del'>-			 "nonzero k.p.inode");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(k.k-&gt;p.offset &lt; BLOCKDEV_INODE_MAX, c, err,</div><div class='del'>-			 inode_pos_blockdev_range,</div><div class='del'>-			 "fs inode in blockdev range");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bch2_inode_unpack(k, &amp;unpacked), c, err,</div><div class='del'>-			 inode_unpack_error,</div><div class='del'>-			 "invalid variable length fields");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(unpacked.bi_data_checksum &gt;= BCH_CSUM_OPT_NR + 1, c, err,</div><div class='del'>-			 inode_checksum_type_invalid,</div><div class='del'>-			 "invalid data checksum type (%u &gt;= %u",</div><div class='del'>-			 unpacked.bi_data_checksum, BCH_CSUM_OPT_NR + 1);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(unpacked.bi_compression &amp;&amp;</div><div class='del'>-			 !bch2_compression_opt_valid(unpacked.bi_compression - 1), c, err,</div><div class='del'>-			 inode_compression_type_invalid,</div><div class='del'>-			 "invalid compression opt %u", unpacked.bi_compression - 1);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on((unpacked.bi_flags &amp; BCH_INODE_unlinked) &amp;&amp;</div><div class='del'>-			 unpacked.bi_nlink != 0, c, err,</div><div class='del'>-			 inode_unlinked_but_nlink_nonzero,</div><div class='del'>-			 "flagged as unlinked but bi_nlink != 0");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(unpacked.bi_subvol &amp;&amp; !S_ISDIR(unpacked.bi_mode), c, err,</div><div class='del'>-			 inode_subvol_root_but_not_dir,</div><div class='del'>-			 "subvolume root but not a directory");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-		       enum bkey_invalid_flags flags,</div><div class='del'>-		       struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_inode inode = bkey_s_c_to_inode(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(INODE_STR_HASH(inode.v) &gt;= BCH_STR_HASH_NR, c, err,</div><div class='del'>-			 inode_str_hash_invalid,</div><div class='del'>-			 "invalid str hash type (%llu &gt;= %u)",</div><div class='del'>-			 INODE_STR_HASH(inode.v), BCH_STR_HASH_NR);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_inode_invalid(c, k, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_v2_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_inode_v2 inode = bkey_s_c_to_inode_v2(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(INODEv2_STR_HASH(inode.v) &gt;= BCH_STR_HASH_NR, c, err,</div><div class='del'>-			 inode_str_hash_invalid,</div><div class='del'>-			 "invalid str hash type (%llu &gt;= %u)",</div><div class='del'>-			 INODEv2_STR_HASH(inode.v), BCH_STR_HASH_NR);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_inode_invalid(c, k, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_v3_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_inode_v3 inode = bkey_s_c_to_inode_v3(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(INODEv3_FIELDS_START(inode.v) &lt; INODEv3_FIELDS_START_INITIAL ||</div><div class='del'>-			 INODEv3_FIELDS_START(inode.v) &gt; bkey_val_u64s(inode.k), c, err,</div><div class='del'>-			 inode_v3_fields_start_bad,</div><div class='del'>-			 "invalid fields_start (got %llu, min %u max %zu)",</div><div class='del'>-			 INODEv3_FIELDS_START(inode.v),</div><div class='del'>-			 INODEv3_FIELDS_START_INITIAL,</div><div class='del'>-			 bkey_val_u64s(inode.k));</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(INODEv3_STR_HASH(inode.v) &gt;= BCH_STR_HASH_NR, c, err,</div><div class='del'>-			 inode_str_hash_invalid,</div><div class='del'>-			 "invalid str hash type (%llu &gt;= %u)",</div><div class='del'>-			 INODEv3_STR_HASH(inode.v), BCH_STR_HASH_NR);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_inode_invalid(c, k, err);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_inode_unpacked_to_text(struct printbuf *out,</div><div class='del'>-					  struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-	prt_printf(out, "mode=%o", inode-&gt;bi_mode);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "flags=");</div><div class='del'>-	prt_bitflags(out, bch2_inode_flag_strs, inode-&gt;bi_flags &amp; ((1U &lt;&lt; 20) - 1));</div><div class='del'>-	prt_printf(out, " (%x)", inode-&gt;bi_flags);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "journal_seq=%llu", inode-&gt;bi_journal_seq);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "bi_size=%llu", inode-&gt;bi_size);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "bi_sectors=%llu", inode-&gt;bi_sectors);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "bi_version=%llu", inode-&gt;bi_version);</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)						\</div><div class='del'>-	prt_printf(out, #_name "=%llu", (u64) inode-&gt;_name);	\</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	BCH_INODE_FIELDS_v3()</div><div class='del'>-#undef  x</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_unpacked_to_text(struct printbuf *out, struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "inum: %llu ", inode-&gt;bi_inum);</div><div class='del'>-	__bch2_inode_unpacked_to_text(out, inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked inode;</div><div class='del'>-</div><div class='del'>-	if (bch2_inode_unpack(k, &amp;inode)) {</div><div class='del'>-		prt_printf(out, "(unpack error)");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_inode_unpacked_to_text(out, &amp;inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 bkey_inode_flags(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_inode:</div><div class='del'>-		return le32_to_cpu(bkey_s_c_to_inode(k).v-&gt;bi_flags);</div><div class='del'>-	case KEY_TYPE_inode_v2:</div><div class='del'>-		return le64_to_cpu(bkey_s_c_to_inode_v2(k).v-&gt;bi_flags);</div><div class='del'>-	case KEY_TYPE_inode_v3:</div><div class='del'>-		return le64_to_cpu(bkey_s_c_to_inode_v3(k).v-&gt;bi_flags);</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bkey_is_deleted_inode(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return bkey_inode_flags(k) &amp; BCH_INODE_unlinked;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_inode(struct btree_trans *trans,</div><div class='del'>-		       enum btree_id btree_id, unsigned level,</div><div class='del'>-		       struct bkey_s_c old,</div><div class='del'>-		       struct bkey_s new,</div><div class='del'>-		       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	s64 nr = bkey_is_inode(new.k) - bkey_is_inode(old.k);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		if (nr) {</div><div class='del'>-			int ret = bch2_replicas_deltas_realloc(trans, 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			trans-&gt;fs_usage_deltas-&gt;nr_inodes += nr;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bool old_deleted = bkey_is_deleted_inode(old);</div><div class='del'>-		bool new_deleted = bkey_is_deleted_inode(new.s_c);</div><div class='del'>-		if (old_deleted != new_deleted) {</div><div class='del'>-			int ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, new.k-&gt;p, new_deleted);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; BTREE_TRIGGER_ATOMIC) &amp;&amp; (flags &amp; BTREE_TRIGGER_INSERT)) {</div><div class='del'>-		BUG_ON(!trans-&gt;journal_res.seq);</div><div class='del'>-</div><div class='del'>-		bkey_s_to_inode_v3(new).v-&gt;bi_journal_seq = cpu_to_le64(trans-&gt;journal_res.seq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_GC) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-</div><div class='del'>-		percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-		this_cpu_add(c-&gt;usage_gc-&gt;b.nr_inodes, nr);</div><div class='del'>-		percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_generation_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				  enum bkey_invalid_flags flags,</div><div class='del'>-				  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(k.k-&gt;p.inode, c, err,</div><div class='del'>-			 inode_pos_inode_nonzero,</div><div class='del'>-			 "nonzero k.p.inode");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_generation_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				   struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_inode_generation gen = bkey_s_c_to_inode_generation(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "generation: %u", le32_to_cpu(gen.v-&gt;bi_generation));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_init_early(struct bch_fs *c,</div><div class='del'>-			   struct bch_inode_unpacked *inode_u)</div><div class='del'>-{</div><div class='del'>-	enum bch_str_hash_type str_hash =</div><div class='del'>-		bch2_str_hash_opt_to_type(c, c-&gt;opts.str_hash);</div><div class='del'>-</div><div class='del'>-	memset(inode_u, 0, sizeof(*inode_u));</div><div class='del'>-</div><div class='del'>-	/* ick */</div><div class='del'>-	inode_u-&gt;bi_flags |= str_hash &lt;&lt; INODE_STR_HASH_OFFSET;</div><div class='del'>-	get_random_bytes(&amp;inode_u-&gt;bi_hash_seed,</div><div class='del'>-			 sizeof(inode_u-&gt;bi_hash_seed));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_init_late(struct bch_inode_unpacked *inode_u, u64 now,</div><div class='del'>-			  uid_t uid, gid_t gid, umode_t mode, dev_t rdev,</div><div class='del'>-			  struct bch_inode_unpacked *parent)</div><div class='del'>-{</div><div class='del'>-	inode_u-&gt;bi_mode	= mode;</div><div class='del'>-	inode_u-&gt;bi_uid		= uid;</div><div class='del'>-	inode_u-&gt;bi_gid		= gid;</div><div class='del'>-	inode_u-&gt;bi_dev		= rdev;</div><div class='del'>-	inode_u-&gt;bi_atime	= now;</div><div class='del'>-	inode_u-&gt;bi_mtime	= now;</div><div class='del'>-	inode_u-&gt;bi_ctime	= now;</div><div class='del'>-	inode_u-&gt;bi_otime	= now;</div><div class='del'>-</div><div class='del'>-	if (parent &amp;&amp; parent-&gt;bi_mode &amp; S_ISGID) {</div><div class='del'>-		inode_u-&gt;bi_gid = parent-&gt;bi_gid;</div><div class='del'>-		if (S_ISDIR(mode))</div><div class='del'>-			inode_u-&gt;bi_mode |= S_ISGID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (parent) {</div><div class='del'>-#define x(_name, ...)	inode_u-&gt;bi_##_name = parent-&gt;bi_##_name;</div><div class='del'>-		BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_init(struct bch_fs *c, struct bch_inode_unpacked *inode_u,</div><div class='del'>-		     uid_t uid, gid_t gid, umode_t mode, dev_t rdev,</div><div class='del'>-		     struct bch_inode_unpacked *parent)</div><div class='del'>-{</div><div class='del'>-	bch2_inode_init_early(c, inode_u);</div><div class='del'>-	bch2_inode_init_late(inode_u, bch2_current_time(c),</div><div class='del'>-			     uid, gid, mode, rdev, parent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bkey_generation(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_inode:</div><div class='del'>-	case KEY_TYPE_inode_v2:</div><div class='del'>-		BUG();</div><div class='del'>-	case KEY_TYPE_inode_generation:</div><div class='del'>-		return le32_to_cpu(bkey_s_c_to_inode_generation(k).v-&gt;bi_generation);</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This just finds an empty slot:</div><div class='del'>- */</div><div class='del'>-int bch2_inode_create(struct btree_trans *trans,</div><div class='del'>-		      struct btree_iter *iter,</div><div class='del'>-		      struct bch_inode_unpacked *inode_u,</div><div class='del'>-		      u32 snapshot, u64 cpu)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u64 min, max, start, pos, *hint;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned bits = (c-&gt;opts.inodes_32bit ? 31 : 63);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.shard_inode_numbers) {</div><div class='del'>-		bits -= c-&gt;inode_shard_bits;</div><div class='del'>-</div><div class='del'>-		min = (cpu &lt;&lt; bits);</div><div class='del'>-		max = (cpu &lt;&lt; bits) | ~(ULLONG_MAX &lt;&lt; bits);</div><div class='del'>-</div><div class='del'>-		min = max_t(u64, min, BLOCKDEV_INODE_MAX);</div><div class='del'>-		hint = c-&gt;unused_inode_hints + cpu;</div><div class='del'>-	} else {</div><div class='del'>-		min = BLOCKDEV_INODE_MAX;</div><div class='del'>-		max = ~(ULLONG_MAX &lt;&lt; bits);</div><div class='del'>-		hint = c-&gt;unused_inode_hints;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start = READ_ONCE(*hint);</div><div class='del'>-</div><div class='del'>-	if (start &gt;= max || start &lt; min)</div><div class='del'>-		start = min;</div><div class='del'>-</div><div class='del'>-	pos = start;</div><div class='del'>-	bch2_trans_iter_init(trans, iter, BTREE_ID_inodes, POS(0, pos),</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS|</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-again:</div><div class='del'>-	while ((k = bch2_btree_iter_peek(iter)).k &amp;&amp;</div><div class='del'>-	       !(ret = bkey_err(k)) &amp;&amp;</div><div class='del'>-	       bkey_lt(k.k-&gt;p, POS(0, max))) {</div><div class='del'>-		if (pos &lt; iter-&gt;pos.offset)</div><div class='del'>-			goto found_slot;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We don't need to iterate over keys in every snapshot once</div><div class='del'>-		 * we've found just one:</div><div class='del'>-		 */</div><div class='del'>-		pos = iter-&gt;pos.offset + 1;</div><div class='del'>-		bch2_btree_iter_set_pos(iter, POS(0, pos));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; pos &lt; max)</div><div class='del'>-		goto found_slot;</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; start == min)</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_inode_create;</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Retry from start */</div><div class='del'>-	pos = start = min;</div><div class='del'>-	bch2_btree_iter_set_pos(iter, POS(0, pos));</div><div class='del'>-	goto again;</div><div class='del'>-found_slot:</div><div class='del'>-	bch2_btree_iter_set_pos(iter, SPOS(0, pos, snapshot));</div><div class='del'>-	k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch2_trans_iter_exit(trans, iter);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*hint			= k.k-&gt;p.offset;</div><div class='del'>-	inode_u-&gt;bi_inum	= k.k-&gt;p.offset;</div><div class='del'>-	inode_u-&gt;bi_generation	= bkey_generation(k);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_inode_delete_keys(struct btree_trans *trans,</div><div class='del'>-				  subvol_inum inum, enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i delete;</div><div class='del'>-	struct bpos end = POS(inum.inum, U64_MAX);</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We're never going to be deleting partial extents, no need to use an</div><div class='del'>-	 * extent iterator:</div><div class='del'>-	 */</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, id, POS(inum.inum, 0),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;iter, snapshot);</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_upto(&amp;iter, end);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;delete.k);</div><div class='del'>-		delete.k.p = iter.pos;</div><div class='del'>-</div><div class='del'>-		if (iter.flags &amp; BTREE_ITER_IS_EXTENTS)</div><div class='del'>-			bch2_key_resize(&amp;delete.k,</div><div class='del'>-					bpos_min(end, k.k-&gt;p).offset -</div><div class='del'>-					iter.pos.offset);</div><div class='del'>-</div><div class='del'>-		ret = bch2_trans_update(trans, &amp;iter, &amp;delete, 0) ?:</div><div class='del'>-		      bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-					BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-err:</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_rm(struct bch_fs *c, subvol_inum inum)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bkey_i_inode_generation delete;</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If this was a directory, there shouldn't be any real dirents left -</div><div class='del'>-	 * but there could be whiteouts (from hash collisions) that we should</div><div class='del'>-	 * delete:</div><div class='del'>-	 *</div><div class='del'>-	 * XXX: the dirent could ideally would delete whiteouts when they're no</div><div class='del'>-	 * longer needed</div><div class='del'>-	 */</div><div class='del'>-	ret   = bch2_inode_delete_keys(trans, inum, BTREE_ID_extents) ?:</div><div class='del'>-		bch2_inode_delete_keys(trans, inum, BTREE_ID_xattrs) ?:</div><div class='del'>-		bch2_inode_delete_keys(trans, inum, BTREE_ID_dirents);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			       SPOS(0, inum.inum, snapshot),</div><div class='del'>-			       BTREE_ITER_INTENT|BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!bkey_is_inode(k.k)) {</div><div class='del'>-		bch2_fs_inconsistent(c,</div><div class='del'>-				     "inode %llu:%u not found when deleting",</div><div class='del'>-				     inum.inum, snapshot);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_inode_unpack(k, &amp;inode_u);</div><div class='del'>-</div><div class='del'>-	bkey_inode_generation_init(&amp;delete.k_i);</div><div class='del'>-	delete.k.p = iter.pos;</div><div class='del'>-	delete.v.bi_generation = cpu_to_le32(inode_u.bi_generation + 1);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_trans_update(trans, &amp;iter, &amp;delete.k_i, 0) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_find_by_inum_nowarn_trans(struct btree_trans *trans,</div><div class='del'>-				  subvol_inum inum,</div><div class='del'>-				  struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek_nowarn(trans, &amp;iter, inode, inum, 0);</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_find_by_inum_trans(struct btree_trans *trans,</div><div class='del'>-				  subvol_inum inum,</div><div class='del'>-				  struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;iter, inode, inum, 0);</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_find_by_inum(struct bch_fs *c, subvol_inum inum,</div><div class='del'>-			    struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		bch2_inode_find_by_inum_trans(trans, inum, inode));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_nlink_inc(struct bch_inode_unpacked *bi)</div><div class='del'>-{</div><div class='del'>-	if (bi-&gt;bi_flags &amp; BCH_INODE_unlinked)</div><div class='del'>-		bi-&gt;bi_flags &amp;= ~BCH_INODE_unlinked;</div><div class='del'>-	else {</div><div class='del'>-		if (bi-&gt;bi_nlink == U32_MAX)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		bi-&gt;bi_nlink++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_nlink_dec(struct btree_trans *trans, struct bch_inode_unpacked *bi)</div><div class='del'>-{</div><div class='del'>-	if (bi-&gt;bi_nlink &amp;&amp; (bi-&gt;bi_flags &amp; BCH_INODE_unlinked)) {</div><div class='del'>-		bch2_trans_inconsistent(trans, "inode %llu unlinked but link count nonzero",</div><div class='del'>-					bi-&gt;bi_inum);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_flags &amp; BCH_INODE_unlinked) {</div><div class='del'>-		bch2_trans_inconsistent(trans, "inode %llu link count underflow", bi-&gt;bi_inum);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_nlink)</div><div class='del'>-		bi-&gt;bi_nlink--;</div><div class='del'>-	else</div><div class='del'>-		bi-&gt;bi_flags |= BCH_INODE_unlinked;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_opts bch2_inode_opts_to_opts(struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	struct bch_opts ret = { 0 };</div><div class='del'>-#define x(_name, _bits)							\</div><div class='del'>-	if (inode-&gt;bi_##_name)						\</div><div class='del'>-		opt_set(ret, _name, inode-&gt;bi_##_name - 1);</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_opts_get(struct bch_io_opts *opts, struct bch_fs *c,</div><div class='del'>-			 struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-#define x(_name, _bits)		opts-&gt;_name = inode_opt_get(c, inode, _name);</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-	if (opts-&gt;nocow)</div><div class='del'>-		opts-&gt;compression = opts-&gt;background_compression = opts-&gt;data_checksum = opts-&gt;erasure_code = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inum_opts_get(struct btree_trans *trans, subvol_inum inum, struct bch_io_opts *opts)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked inode;</div><div class='del'>-	int ret = lockrestart_do(trans, bch2_inode_find_by_inum_trans(trans, inum, &amp;inode));</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_inode_opts_get(opts, trans-&gt;c, &amp;inode);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_rm_snapshot(struct btree_trans *trans, u64 inum, u32 snapshot)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bkey_i_inode_generation delete;</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret   = bch2_btree_delete_range_trans(trans, BTREE_ID_extents,</div><div class='del'>-						      SPOS(inum, 0, snapshot),</div><div class='del'>-						      SPOS(inum, U64_MAX, snapshot),</div><div class='del'>-						      0, NULL) ?:</div><div class='del'>-			bch2_btree_delete_range_trans(trans, BTREE_ID_dirents,</div><div class='del'>-						      SPOS(inum, 0, snapshot),</div><div class='del'>-						      SPOS(inum, U64_MAX, snapshot),</div><div class='del'>-						      0, NULL) ?:</div><div class='del'>-			bch2_btree_delete_range_trans(trans, BTREE_ID_xattrs,</div><div class='del'>-						      SPOS(inum, 0, snapshot),</div><div class='del'>-						      SPOS(inum, U64_MAX, snapshot),</div><div class='del'>-						      0, NULL);</div><div class='del'>-	} while (ret == -BCH_ERR_transaction_restart_nested);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			       SPOS(0, inum, snapshot), BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!bkey_is_inode(k.k)) {</div><div class='del'>-		bch2_fs_inconsistent(c,</div><div class='del'>-				     "inode %llu:%u not found when deleting",</div><div class='del'>-				     inum, snapshot);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_inode_unpack(k, &amp;inode_u);</div><div class='del'>-</div><div class='del'>-	/* Subvolume root? */</div><div class='del'>-	if (inode_u.bi_subvol)</div><div class='del'>-		bch_warn(c, "deleting inode %llu marked as unlinked, but also a subvolume root!?", inode_u.bi_inum);</div><div class='del'>-</div><div class='del'>-	bkey_inode_generation_init(&amp;delete.k_i);</div><div class='del'>-	delete.k.p = iter.pos;</div><div class='del'>-	delete.v.bi_generation = cpu_to_le32(inode_u.bi_generation + 1);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_trans_update(trans, &amp;iter, &amp;delete.k_i, 0) ?:</div><div class='del'>-		bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	return ret ?: -BCH_ERR_transaction_restart_nested;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int may_delete_deleted_inode(struct btree_trans *trans,</div><div class='del'>-				    struct btree_iter *iter,</div><div class='del'>-				    struct bpos pos,</div><div class='del'>-				    bool *need_another_pass)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter inode_iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bch_inode_unpacked inode;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;inode_iter, BTREE_ID_inodes, pos, BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bkey_is_inode(k.k) ? 0 : -BCH_ERR_ENOENT_inode;</div><div class='del'>-	if (fsck_err_on(!bkey_is_inode(k.k), c,</div><div class='del'>-			deleted_inode_missing,</div><div class='del'>-			"nonexistent inode %llu:%u in deleted_inodes btree",</div><div class='del'>-			pos.offset, pos.snapshot))</div><div class='del'>-		goto delete;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_unpack(k, &amp;inode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (S_ISDIR(inode.bi_mode)) {</div><div class='del'>-		ret = bch2_empty_dir_snapshot(trans, pos.offset, pos.snapshot);</div><div class='del'>-		if (fsck_err_on(ret == -ENOTEMPTY, c, deleted_inode_is_dir,</div><div class='del'>-				"non empty directory %llu:%u in deleted_inodes btree",</div><div class='del'>-				pos.offset, pos.snapshot))</div><div class='del'>-			goto delete;</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!(inode.bi_flags &amp; BCH_INODE_unlinked), c,</div><div class='del'>-			deleted_inode_not_unlinked,</div><div class='del'>-			"non-deleted inode %llu:%u in deleted_inodes btree",</div><div class='del'>-			pos.offset, pos.snapshot))</div><div class='del'>-		goto delete;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;sb.clean &amp;&amp;</div><div class='del'>-	    !fsck_err(c,</div><div class='del'>-		      deleted_inode_but_clean,</div><div class='del'>-		      "filesystem marked as clean but have deleted inode %llu:%u",</div><div class='del'>-		      pos.offset, pos.snapshot)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_snapshot_is_internal_node(c, pos.snapshot)) {</div><div class='del'>-		struct bpos new_min_pos;</div><div class='del'>-</div><div class='del'>-		ret = bch2_propagate_key_to_snapshot_leaves(trans, inode_iter.btree_id, k, &amp;new_min_pos);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		inode.bi_flags &amp;= ~BCH_INODE_unlinked;</div><div class='del'>-</div><div class='del'>-		ret = bch2_inode_write_flags(trans, &amp;inode_iter, &amp;inode,</div><div class='del'>-					     BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-		bch_err_msg(c, ret, "clearing inode unlinked flag");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We'll need another write buffer flush to pick up the new</div><div class='del'>-		 * unlinked inodes in the snapshot leaves:</div><div class='del'>-		 */</div><div class='del'>-		*need_another_pass = true;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 1;</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-	return ret;</div><div class='del'>-delete:</div><div class='del'>-	ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, pos, false);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_delete_dead_inodes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	bool need_another_pass;</div><div class='del'>-	int ret;</div><div class='del'>-again:</div><div class='del'>-	need_another_pass = false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Weird transaction restart handling here because on successful delete,</div><div class='del'>-	 * bch2_inode_rm_snapshot() will return a nested transaction restart,</div><div class='del'>-	 * but we can't retry because the btree write buffer won't have been</div><div class='del'>-	 * flushed and we'd spin:</div><div class='del'>-	 */</div><div class='del'>-	ret = for_each_btree_key_commit(trans, iter, BTREE_ID_deleted_inodes, POS_MIN,</div><div class='del'>-					BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-					NULL, NULL, BCH_TRANS_COMMIT_no_enospc, ({</div><div class='del'>-		ret = may_delete_deleted_inode(trans, &amp;iter, k.k-&gt;p, &amp;need_another_pass);</div><div class='del'>-		if (ret &gt; 0) {</div><div class='del'>-			bch_verbose(c, "deleting unlinked inode %llu:%u", k.k-&gt;p.offset, k.k-&gt;p.snapshot);</div><div class='del'>-</div><div class='del'>-			ret = bch2_inode_rm_snapshot(trans, k.k-&gt;p.offset, k.k-&gt;p.snapshot);</div><div class='del'>-			/*</div><div class='del'>-			 * We don't want to loop here: a transaction restart</div><div class='del'>-			 * error here means we handled a transaction restart and</div><div class='del'>-			 * we're actually done, but if we loop we'll retry the</div><div class='del'>-			 * same key because the write buffer hasn't been flushed</div><div class='del'>-			 * yet</div><div class='del'>-			 */</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-				ret = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret;</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; need_another_pass) {</div><div class='del'>-		ret = bch2_btree_write_buffer_flush_sync(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/inode.h b/fs/bcachefs/inode.h<br/>deleted file mode 100644<br/>index b63f312581cf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/inode.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,212 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_INODE_H</div><div class='del'>-#define _BCACHEFS_INODE_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-extern const char * const bch2_inode_opts[];</div><div class='del'>-</div><div class='del'>-int bch2_inode_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-		       enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_inode_v2_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_inode_v3_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_inode_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-int bch2_trigger_inode(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-			  struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_inode ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_inode_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_inode_to_text,		\</div><div class='del'>-	.trigger	= bch2_trigger_inode,		\</div><div class='del'>-	.min_val_size	= 16,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_inode_v2 ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_inode_v2_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_inode_to_text,		\</div><div class='del'>-	.trigger	= bch2_trigger_inode,		\</div><div class='del'>-	.min_val_size	= 32,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_inode_v3 ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_inode_v3_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_inode_to_text,		\</div><div class='del'>-	.trigger	= bch2_trigger_inode,		\</div><div class='del'>-	.min_val_size	= 48,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline bool bkey_is_inode(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	return  k-&gt;type == KEY_TYPE_inode ||</div><div class='del'>-		k-&gt;type == KEY_TYPE_inode_v2 ||</div><div class='del'>-		k-&gt;type == KEY_TYPE_inode_v3;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_generation_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-				  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_inode_generation_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_inode_generation ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_inode_generation_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_inode_generation_to_text,	\</div><div class='del'>-	.min_val_size	= 8,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-typedef struct {</div><div class='del'>-	u64			lo;</div><div class='del'>-	u32			hi;</div><div class='del'>-} __packed __aligned(4) u96;</div><div class='del'>-#endif</div><div class='del'>-typedef u64 u96;</div><div class='del'>-</div><div class='del'>-struct bch_inode_unpacked {</div><div class='del'>-	u64			bi_inum;</div><div class='del'>-	u64			bi_journal_seq;</div><div class='del'>-	__le64			bi_hash_seed;</div><div class='del'>-	u64			bi_size;</div><div class='del'>-	u64			bi_sectors;</div><div class='del'>-	u64			bi_version;</div><div class='del'>-	u32			bi_flags;</div><div class='del'>-	u16			bi_mode;</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)	u##_bits _name;</div><div class='del'>-	BCH_INODE_FIELDS_v3()</div><div class='del'>-#undef  x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bkey_inode_buf {</div><div class='del'>-	struct bkey_i_inode_v3	inode;</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits)		+ 8 + _bits / 8</div><div class='del'>-	u8		_pad[0 + BCH_INODE_FIELDS_v3()];</div><div class='del'>-#undef  x</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-void bch2_inode_pack(struct bkey_inode_buf *, const struct bch_inode_unpacked *);</div><div class='del'>-int bch2_inode_unpack(struct bkey_s_c, struct bch_inode_unpacked *);</div><div class='del'>-struct bkey_i *bch2_inode_to_v3(struct btree_trans *, struct bkey_i *);</div><div class='del'>-</div><div class='del'>-void bch2_inode_unpacked_to_text(struct printbuf *, struct bch_inode_unpacked *);</div><div class='del'>-</div><div class='del'>-int bch2_inode_peek(struct btree_trans *, struct btree_iter *,</div><div class='del'>-		    struct bch_inode_unpacked *, subvol_inum, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_inode_write_flags(struct btree_trans *, struct btree_iter *,</div><div class='del'>-		     struct bch_inode_unpacked *, enum btree_update_flags);</div><div class='del'>-</div><div class='del'>-static inline int bch2_inode_write(struct btree_trans *trans,</div><div class='del'>-		     struct btree_iter *iter,</div><div class='del'>-		     struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	return bch2_inode_write_flags(trans, iter, inode, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_inode_init_early(struct bch_fs *,</div><div class='del'>-			   struct bch_inode_unpacked *);</div><div class='del'>-void bch2_inode_init_late(struct bch_inode_unpacked *, u64,</div><div class='del'>-			  uid_t, gid_t, umode_t, dev_t,</div><div class='del'>-			  struct bch_inode_unpacked *);</div><div class='del'>-void bch2_inode_init(struct bch_fs *, struct bch_inode_unpacked *,</div><div class='del'>-		     uid_t, gid_t, umode_t, dev_t,</div><div class='del'>-		     struct bch_inode_unpacked *);</div><div class='del'>-</div><div class='del'>-int bch2_inode_create(struct btree_trans *, struct btree_iter *,</div><div class='del'>-		      struct bch_inode_unpacked *, u32, u64);</div><div class='del'>-</div><div class='del'>-int bch2_inode_rm(struct bch_fs *, subvol_inum);</div><div class='del'>-</div><div class='del'>-int bch2_inode_find_by_inum_nowarn_trans(struct btree_trans *,</div><div class='del'>-				  subvol_inum,</div><div class='del'>-				  struct bch_inode_unpacked *);</div><div class='del'>-int bch2_inode_find_by_inum_trans(struct btree_trans *, subvol_inum,</div><div class='del'>-				  struct bch_inode_unpacked *);</div><div class='del'>-int bch2_inode_find_by_inum(struct bch_fs *, subvol_inum,</div><div class='del'>-			    struct bch_inode_unpacked *);</div><div class='del'>-</div><div class='del'>-#define inode_opt_get(_c, _inode, _name)			\</div><div class='del'>-	((_inode)-&gt;bi_##_name ? (_inode)-&gt;bi_##_name - 1 : (_c)-&gt;opts._name)</div><div class='del'>-</div><div class='del'>-static inline void bch2_inode_opt_set(struct bch_inode_unpacked *inode,</div><div class='del'>-				      enum inode_opt_id id, u64 v)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(_name, ...)							\</div><div class='del'>-	case Inode_opt_##_name:						\</div><div class='del'>-		inode-&gt;bi_##_name = v;					\</div><div class='del'>-		break;</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 bch2_inode_opt_get(struct bch_inode_unpacked *inode,</div><div class='del'>-				     enum inode_opt_id id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(_name, ...)							\</div><div class='del'>-	case Inode_opt_##_name:						\</div><div class='del'>-		return inode-&gt;bi_##_name;</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 mode_to_type(umode_t mode)</div><div class='del'>-{</div><div class='del'>-	return (mode &gt;&gt; 12) &amp; 15;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 inode_d_type(struct bch_inode_unpacked *inode)</div><div class='del'>-{</div><div class='del'>-	return inode-&gt;bi_subvol ? DT_SUBVOL : mode_to_type(inode-&gt;bi_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* i_nlink: */</div><div class='del'>-</div><div class='del'>-static inline unsigned nlink_bias(umode_t mode)</div><div class='del'>-{</div><div class='del'>-	return S_ISDIR(mode) ? 2 : 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_inode_nlink_get(struct bch_inode_unpacked *bi)</div><div class='del'>-{</div><div class='del'>-	return bi-&gt;bi_flags &amp; BCH_INODE_unlinked</div><div class='del'>-		  ? 0</div><div class='del'>-		  : bi-&gt;bi_nlink + nlink_bias(bi-&gt;bi_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_inode_nlink_set(struct bch_inode_unpacked *bi,</div><div class='del'>-					unsigned nlink)</div><div class='del'>-{</div><div class='del'>-	if (nlink) {</div><div class='del'>-		bi-&gt;bi_nlink = nlink - nlink_bias(bi-&gt;bi_mode);</div><div class='del'>-		bi-&gt;bi_flags &amp;= ~BCH_INODE_unlinked;</div><div class='del'>-	} else {</div><div class='del'>-		bi-&gt;bi_nlink = 0;</div><div class='del'>-		bi-&gt;bi_flags |= BCH_INODE_unlinked;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_inode_nlink_inc(struct bch_inode_unpacked *);</div><div class='del'>-void bch2_inode_nlink_dec(struct btree_trans *, struct bch_inode_unpacked *);</div><div class='del'>-</div><div class='del'>-struct bch_opts bch2_inode_opts_to_opts(struct bch_inode_unpacked *);</div><div class='del'>-void bch2_inode_opts_get(struct bch_io_opts *, struct bch_fs *,</div><div class='del'>-			 struct bch_inode_unpacked *);</div><div class='del'>-int bch2_inum_opts_get(struct btree_trans*, subvol_inum, struct bch_io_opts *);</div><div class='del'>-</div><div class='del'>-int bch2_inode_rm_snapshot(struct btree_trans *, u64, u32);</div><div class='del'>-int bch2_delete_dead_inodes(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_INODE_H */</div><div class='head'>diff --git a/fs/bcachefs/inode_format.h b/fs/bcachefs/inode_format.h<br/>deleted file mode 100644<br/>index 83d107331edf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/inode_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/inode_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_INODE_FORMAT_H</div><div class='del'>-#define _BCACHEFS_INODE_FORMAT_H</div><div class='del'>-</div><div class='del'>-#define BLOCKDEV_INODE_MAX	4096</div><div class='del'>-#define BCACHEFS_ROOT_INO	4096</div><div class='del'>-</div><div class='del'>-struct bch_inode {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__le64			bi_hash_seed;</div><div class='del'>-	__le32			bi_flags;</div><div class='del'>-	__le16			bi_mode;</div><div class='del'>-	__u8			fields[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_inode_v2 {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__le64			bi_journal_seq;</div><div class='del'>-	__le64			bi_hash_seed;</div><div class='del'>-	__le64			bi_flags;</div><div class='del'>-	__le16			bi_mode;</div><div class='del'>-	__u8			fields[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_inode_v3 {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__le64			bi_journal_seq;</div><div class='del'>-	__le64			bi_hash_seed;</div><div class='del'>-	__le64			bi_flags;</div><div class='del'>-	__le64			bi_sectors;</div><div class='del'>-	__le64			bi_size;</div><div class='del'>-	__le64			bi_version;</div><div class='del'>-	__u8			fields[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#define INODEv3_FIELDS_START_INITIAL	6</div><div class='del'>-#define INODEv3_FIELDS_START_CUR	(offsetof(struct bch_inode_v3, fields) / sizeof(__u64))</div><div class='del'>-</div><div class='del'>-struct bch_inode_generation {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-</div><div class='del'>-	__le32			bi_generation;</div><div class='del'>-	__le32			pad;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bi_subvol and bi_parent_subvol are only set for subvolume roots:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define BCH_INODE_FIELDS_v2()			\</div><div class='del'>-	x(bi_atime,			96)	\</div><div class='del'>-	x(bi_ctime,			96)	\</div><div class='del'>-	x(bi_mtime,			96)	\</div><div class='del'>-	x(bi_otime,			96)	\</div><div class='del'>-	x(bi_size,			64)	\</div><div class='del'>-	x(bi_sectors,			64)	\</div><div class='del'>-	x(bi_uid,			32)	\</div><div class='del'>-	x(bi_gid,			32)	\</div><div class='del'>-	x(bi_nlink,			32)	\</div><div class='del'>-	x(bi_generation,		32)	\</div><div class='del'>-	x(bi_dev,			32)	\</div><div class='del'>-	x(bi_data_checksum,		8)	\</div><div class='del'>-	x(bi_compression,		8)	\</div><div class='del'>-	x(bi_project,			32)	\</div><div class='del'>-	x(bi_background_compression,	8)	\</div><div class='del'>-	x(bi_data_replicas,		8)	\</div><div class='del'>-	x(bi_promote_target,		16)	\</div><div class='del'>-	x(bi_foreground_target,		16)	\</div><div class='del'>-	x(bi_background_target,		16)	\</div><div class='del'>-	x(bi_erasure_code,		16)	\</div><div class='del'>-	x(bi_fields_set,		16)	\</div><div class='del'>-	x(bi_dir,			64)	\</div><div class='del'>-	x(bi_dir_offset,		64)	\</div><div class='del'>-	x(bi_subvol,			32)	\</div><div class='del'>-	x(bi_parent_subvol,		32)</div><div class='del'>-</div><div class='del'>-#define BCH_INODE_FIELDS_v3()			\</div><div class='del'>-	x(bi_atime,			96)	\</div><div class='del'>-	x(bi_ctime,			96)	\</div><div class='del'>-	x(bi_mtime,			96)	\</div><div class='del'>-	x(bi_otime,			96)	\</div><div class='del'>-	x(bi_uid,			32)	\</div><div class='del'>-	x(bi_gid,			32)	\</div><div class='del'>-	x(bi_nlink,			32)	\</div><div class='del'>-	x(bi_generation,		32)	\</div><div class='del'>-	x(bi_dev,			32)	\</div><div class='del'>-	x(bi_data_checksum,		8)	\</div><div class='del'>-	x(bi_compression,		8)	\</div><div class='del'>-	x(bi_project,			32)	\</div><div class='del'>-	x(bi_background_compression,	8)	\</div><div class='del'>-	x(bi_data_replicas,		8)	\</div><div class='del'>-	x(bi_promote_target,		16)	\</div><div class='del'>-	x(bi_foreground_target,		16)	\</div><div class='del'>-	x(bi_background_target,		16)	\</div><div class='del'>-	x(bi_erasure_code,		16)	\</div><div class='del'>-	x(bi_fields_set,		16)	\</div><div class='del'>-	x(bi_dir,			64)	\</div><div class='del'>-	x(bi_dir_offset,		64)	\</div><div class='del'>-	x(bi_subvol,			32)	\</div><div class='del'>-	x(bi_parent_subvol,		32)	\</div><div class='del'>-	x(bi_nocow,			8)</div><div class='del'>-</div><div class='del'>-/* subset of BCH_INODE_FIELDS */</div><div class='del'>-#define BCH_INODE_OPTS()			\</div><div class='del'>-	x(data_checksum,		8)	\</div><div class='del'>-	x(compression,			8)	\</div><div class='del'>-	x(project,			32)	\</div><div class='del'>-	x(background_compression,	8)	\</div><div class='del'>-	x(data_replicas,		8)	\</div><div class='del'>-	x(promote_target,		16)	\</div><div class='del'>-	x(foreground_target,		16)	\</div><div class='del'>-	x(background_target,		16)	\</div><div class='del'>-	x(erasure_code,			16)	\</div><div class='del'>-	x(nocow,			8)</div><div class='del'>-</div><div class='del'>-enum inode_opt_id {</div><div class='del'>-#define x(name, ...)				\</div><div class='del'>-	Inode_opt_##name,</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef  x</div><div class='del'>-	Inode_opt_nr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_INODE_FLAGS()			\</div><div class='del'>-	x(sync,				0)	\</div><div class='del'>-	x(immutable,			1)	\</div><div class='del'>-	x(append,			2)	\</div><div class='del'>-	x(nodump,			3)	\</div><div class='del'>-	x(noatime,			4)	\</div><div class='del'>-	x(i_size_dirty,			5)	\</div><div class='del'>-	x(i_sectors_dirty,		6)	\</div><div class='del'>-	x(unlinked,			7)	\</div><div class='del'>-	x(backptr_untrusted,		8)</div><div class='del'>-</div><div class='del'>-/* bits 20+ reserved for packed fields below: */</div><div class='del'>-</div><div class='del'>-enum bch_inode_flags {</div><div class='del'>-#define x(t, n)	BCH_INODE_##t = 1U &lt;&lt; n,</div><div class='del'>-	BCH_INODE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum __bch_inode_flags {</div><div class='del'>-#define x(t, n)	__BCH_INODE_##t = n,</div><div class='del'>-	BCH_INODE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(INODE_STR_HASH,	struct bch_inode, bi_flags, 20, 24);</div><div class='del'>-LE32_BITMASK(INODE_NR_FIELDS,	struct bch_inode, bi_flags, 24, 31);</div><div class='del'>-LE32_BITMASK(INODE_NEW_VARINT,	struct bch_inode, bi_flags, 31, 32);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(INODEv2_STR_HASH,	struct bch_inode_v2, bi_flags, 20, 24);</div><div class='del'>-LE64_BITMASK(INODEv2_NR_FIELDS,	struct bch_inode_v2, bi_flags, 24, 31);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(INODEv3_STR_HASH,	struct bch_inode_v3, bi_flags, 20, 24);</div><div class='del'>-LE64_BITMASK(INODEv3_NR_FIELDS,	struct bch_inode_v3, bi_flags, 24, 31);</div><div class='del'>-</div><div class='del'>-LE64_BITMASK(INODEv3_FIELDS_START,</div><div class='del'>-				struct bch_inode_v3, bi_flags, 31, 36);</div><div class='del'>-LE64_BITMASK(INODEv3_MODE,	struct bch_inode_v3, bi_flags, 36, 52);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_INODE_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/io_misc.c b/fs/bcachefs/io_misc.c<br/>deleted file mode 100644<br/>index 1baf78594cca..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_misc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_misc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,515 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * io_misc.c - fallocate, fpunch, truncate:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "extent_update.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_misc.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "logged_ops.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-</div><div class='del'>-/* Overwrites whatever was present with zeroes: */</div><div class='del'>-int bch2_extent_fallocate(struct btree_trans *trans,</div><div class='del'>-			  subvol_inum inum,</div><div class='del'>-			  struct btree_iter *iter,</div><div class='del'>-			  u64 sectors,</div><div class='del'>-			  struct bch_io_opts opts,</div><div class='del'>-			  s64 *i_sectors_delta,</div><div class='del'>-			  struct write_point_specifier write_point)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct disk_reservation disk_res = { 0 };</div><div class='del'>-	struct closure cl;</div><div class='del'>-	struct open_buckets open_buckets = { 0 };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf old, new;</div><div class='del'>-	unsigned sectors_allocated = 0, new_replicas;</div><div class='del'>-	bool unwritten = opts.nocow &amp;&amp;</div><div class='del'>-	    c-&gt;sb.version &gt;= bcachefs_metadata_version_unwritten_extents;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;old);</div><div class='del'>-	bch2_bkey_buf_init(&amp;new);</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	sectors = min_t(u64, sectors, k.k-&gt;p.offset - iter-&gt;pos.offset);</div><div class='del'>-	new_replicas = max(0, (int) opts.data_replicas -</div><div class='del'>-			   (int) bch2_bkey_nr_ptrs_fully_allocated(k));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get a disk reservation before (in the nocow case) calling</div><div class='del'>-	 * into the allocator:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_disk_reservation_get(c, &amp;disk_res, sectors, new_replicas, 0);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err_noprint;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;old, c, k);</div><div class='del'>-</div><div class='del'>-	if (!unwritten) {</div><div class='del'>-		struct bkey_i_reservation *reservation;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_realloc(&amp;new, c, sizeof(*reservation) / sizeof(u64));</div><div class='del'>-		reservation = bkey_reservation_init(new.k);</div><div class='del'>-		reservation-&gt;k.p = iter-&gt;pos;</div><div class='del'>-		bch2_key_resize(&amp;reservation-&gt;k, sectors);</div><div class='del'>-		reservation-&gt;v.nr_replicas = opts.data_replicas;</div><div class='del'>-	} else {</div><div class='del'>-		struct bkey_i_extent *e;</div><div class='del'>-		struct bch_devs_list devs_have;</div><div class='del'>-		struct write_point *wp;</div><div class='del'>-</div><div class='del'>-		devs_have.nr = 0;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_realloc(&amp;new, c, BKEY_EXTENT_U64s_MAX);</div><div class='del'>-</div><div class='del'>-		e = bkey_extent_init(new.k);</div><div class='del'>-		e-&gt;k.p = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-		ret = bch2_alloc_sectors_start_trans(trans,</div><div class='del'>-				opts.foreground_target,</div><div class='del'>-				false,</div><div class='del'>-				write_point,</div><div class='del'>-				&amp;devs_have,</div><div class='del'>-				opts.data_replicas,</div><div class='del'>-				opts.data_replicas,</div><div class='del'>-				BCH_WATERMARK_normal, 0, &amp;cl, &amp;wp);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_operation_blocked))</div><div class='del'>-			ret = -BCH_ERR_transaction_restart_nested;</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		sectors = min_t(u64, sectors, wp-&gt;sectors_free);</div><div class='del'>-		sectors_allocated = sectors;</div><div class='del'>-</div><div class='del'>-		bch2_key_resize(&amp;e-&gt;k, sectors);</div><div class='del'>-</div><div class='del'>-		bch2_open_bucket_get(c, wp, &amp;open_buckets);</div><div class='del'>-		bch2_alloc_sectors_append_ptrs(c, wp, &amp;e-&gt;k_i, sectors, false);</div><div class='del'>-		bch2_alloc_sectors_done(c, wp);</div><div class='del'>-</div><div class='del'>-		extent_for_each_ptr(extent_i_to_s(e), ptr)</div><div class='del'>-			ptr-&gt;unwritten = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_extent_update(trans, inum, iter, new.k, &amp;disk_res,</div><div class='del'>-				 0, i_sectors_delta, true);</div><div class='del'>-err:</div><div class='del'>-	if (!ret &amp;&amp; sectors_allocated)</div><div class='del'>-		bch2_increment_clock(c, sectors_allocated, WRITE);</div><div class='del'>-	if (should_print_err(ret))</div><div class='del'>-		bch_err_inum_offset_ratelimited(c,</div><div class='del'>-			inum.inum,</div><div class='del'>-			iter-&gt;pos.offset &lt;&lt; 9,</div><div class='del'>-			"%s(): error: %s", __func__, bch2_err_str(ret));</div><div class='del'>-err_noprint:</div><div class='del'>-	bch2_open_buckets_put(c, &amp;open_buckets);</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;disk_res);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;new, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;old, c);</div><div class='del'>-</div><div class='del'>-	if (closure_nr_remaining(&amp;cl) != 1) {</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-		closure_sync(&amp;cl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns -BCH_ERR_transacton_restart if we had to drop locks:</div><div class='del'>- */</div><div class='del'>-int bch2_fpunch_at(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-		   subvol_inum inum, u64 end,</div><div class='del'>-		   s64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c	= trans-&gt;c;</div><div class='del'>-	unsigned max_sectors	= KEY_SIZE_MAX &amp; (~0 &lt;&lt; c-&gt;block_bits);</div><div class='del'>-	struct bpos end_pos = POS(inum.inum, end);</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0, ret2 = 0;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-</div><div class='del'>-	while (!ret ||</div><div class='del'>-	       bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-		struct disk_reservation disk_res =</div><div class='del'>-			bch2_disk_reservation_init(c, 0);</div><div class='del'>-		struct bkey_i delete;</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			ret2 = ret;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(iter, snapshot);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * peek_upto() doesn't have ideal semantics for extents:</div><div class='del'>-		 */</div><div class='del'>-		k = bch2_btree_iter_peek_upto(iter, end_pos);</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;delete.k);</div><div class='del'>-		delete.k.p = iter-&gt;pos;</div><div class='del'>-</div><div class='del'>-		/* create the biggest key we can */</div><div class='del'>-		bch2_key_resize(&amp;delete.k, max_sectors);</div><div class='del'>-		bch2_cut_back(end_pos, &amp;delete);</div><div class='del'>-</div><div class='del'>-		ret = bch2_extent_update(trans, inum, iter, &amp;delete,</div><div class='del'>-				&amp;disk_res, 0, i_sectors_delta, false);</div><div class='del'>-		bch2_disk_reservation_put(c, &amp;disk_res);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret ?: ret2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fpunch(struct bch_fs *c, subvol_inum inum, u64 start, u64 end,</div><div class='del'>-		s64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     POS(inum.inum, start),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	ret = bch2_fpunch_at(trans, &amp;iter, inum, end, i_sectors_delta);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* truncate: */</div><div class='del'>-</div><div class='del'>-void bch2_logged_op_truncate_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_logged_op_truncate op = bkey_s_c_to_logged_op_truncate(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "subvol=%u", le32_to_cpu(op.v-&gt;subvol));</div><div class='del'>-	prt_printf(out, " inum=%llu", le64_to_cpu(op.v-&gt;inum));</div><div class='del'>-	prt_printf(out, " new_i_size=%llu", le64_to_cpu(op.v-&gt;new_i_size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int truncate_set_isize(struct btree_trans *trans,</div><div class='del'>-			      subvol_inum inum,</div><div class='del'>-			      u64 new_i_size)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter = { NULL };</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_inode_peek(trans, &amp;iter, &amp;inode_u, inum, BTREE_ITER_INTENT) ?:</div><div class='del'>-		(inode_u.bi_size = new_i_size, 0) ?:</div><div class='del'>-		bch2_inode_write(trans, &amp;iter, &amp;inode_u);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_resume_logged_op_truncate(struct btree_trans *trans,</div><div class='del'>-					    struct bkey_i *op_k,</div><div class='del'>-					    u64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter fpunch_iter;</div><div class='del'>-	struct bkey_i_logged_op_truncate *op = bkey_i_to_logged_op_truncate(op_k);</div><div class='del'>-	subvol_inum inum = { le32_to_cpu(op-&gt;v.subvol), le64_to_cpu(op-&gt;v.inum) };</div><div class='del'>-	u64 new_i_size = le64_to_cpu(op-&gt;v.new_i_size);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			truncate_set_isize(trans, inum, new_i_size));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;fpunch_iter, BTREE_ID_extents,</div><div class='del'>-			     POS(inum.inum, round_up(new_i_size, block_bytes(c)) &gt;&gt; 9),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	ret = bch2_fpunch_at(trans, &amp;fpunch_iter, inum, U64_MAX, i_sectors_delta);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;fpunch_iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		ret = 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_logged_op_finish(trans, op_k);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_resume_logged_op_truncate(struct btree_trans *trans, struct bkey_i *op_k)</div><div class='del'>-{</div><div class='del'>-	return __bch2_resume_logged_op_truncate(trans, op_k, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_truncate(struct bch_fs *c, subvol_inum inum, u64 new_i_size, u64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_logged_op_truncate op;</div><div class='del'>-</div><div class='del'>-	bkey_logged_op_truncate_init(&amp;op.k_i);</div><div class='del'>-	op.v.subvol	= cpu_to_le32(inum.subvol);</div><div class='del'>-	op.v.inum	= cpu_to_le64(inum.inum);</div><div class='del'>-	op.v.new_i_size	= cpu_to_le64(new_i_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Logged ops aren't atomic w.r.t. snapshot creation: creating a</div><div class='del'>-	 * snapshot while they're in progress, then crashing, will result in the</div><div class='del'>-	 * resume only proceeding in one of the snapshots</div><div class='del'>-	 */</div><div class='del'>-	down_read(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		bch2_logged_op_start(trans, &amp;op.k_i) ?:</div><div class='del'>-		__bch2_resume_logged_op_truncate(trans, &amp;op.k_i, i_sectors_delta));</div><div class='del'>-	up_read(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* finsert/fcollapse: */</div><div class='del'>-</div><div class='del'>-void bch2_logged_op_finsert_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_logged_op_finsert op = bkey_s_c_to_logged_op_finsert(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "subvol=%u",		le32_to_cpu(op.v-&gt;subvol));</div><div class='del'>-	prt_printf(out, " inum=%llu",		le64_to_cpu(op.v-&gt;inum));</div><div class='del'>-	prt_printf(out, " dst_offset=%lli",	le64_to_cpu(op.v-&gt;dst_offset));</div><div class='del'>-	prt_printf(out, " src_offset=%llu",	le64_to_cpu(op.v-&gt;src_offset));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int adjust_i_size(struct btree_trans *trans, subvol_inum inum, u64 offset, s64 len)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	offset	&lt;&lt;= 9;</div><div class='del'>-	len	&lt;&lt;= 9;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_peek(trans, &amp;iter, &amp;inode_u, inum, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (len &gt; 0) {</div><div class='del'>-		if (MAX_LFS_FILESIZE - inode_u.bi_size &lt; len) {</div><div class='del'>-			ret = -EFBIG;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (offset &gt;= inode_u.bi_size) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_u.bi_size += len;</div><div class='del'>-	inode_u.bi_mtime = inode_u.bi_ctime = bch2_current_time(trans-&gt;c);</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_write(trans, &amp;iter, &amp;inode_u);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_resume_logged_op_finsert(struct btree_trans *trans,</div><div class='del'>-					   struct bkey_i *op_k,</div><div class='del'>-					   u64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_logged_op_finsert *op = bkey_i_to_logged_op_finsert(op_k);</div><div class='del'>-	subvol_inum inum = { le32_to_cpu(op-&gt;v.subvol), le64_to_cpu(op-&gt;v.inum) };</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	u64 dst_offset = le64_to_cpu(op-&gt;v.dst_offset);</div><div class='del'>-	u64 src_offset = le64_to_cpu(op-&gt;v.src_offset);</div><div class='del'>-	s64 shift = dst_offset - src_offset;</div><div class='del'>-	u64 len = abs(shift);</div><div class='del'>-	u64 pos = le64_to_cpu(op-&gt;v.pos);</div><div class='del'>-	bool insert = shift &gt; 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inum_opts_get(trans, inum, &amp;opts);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     POS(inum.inum, 0),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	switch (op-&gt;v.state) {</div><div class='del'>-case LOGGED_OP_FINSERT_start:</div><div class='del'>-	op-&gt;v.state = LOGGED_OP_FINSERT_shift_extents;</div><div class='del'>-</div><div class='del'>-	if (insert) {</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-				adjust_i_size(trans, inum, src_offset, len) ?:</div><div class='del'>-				bch2_logged_op_update(trans, &amp;op-&gt;k_i));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter, POS(inum.inum, src_offset));</div><div class='del'>-</div><div class='del'>-		ret = bch2_fpunch_at(trans, &amp;iter, inum, src_offset + len, i_sectors_delta);</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-				bch2_logged_op_update(trans, &amp;op-&gt;k_i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fallthrough;</div><div class='del'>-case LOGGED_OP_FINSERT_shift_extents:</div><div class='del'>-	while (1) {</div><div class='del'>-		struct disk_reservation disk_res =</div><div class='del'>-			bch2_disk_reservation_init(c, 0);</div><div class='del'>-		struct bkey_i delete, *copy;</div><div class='del'>-		struct bkey_s_c k;</div><div class='del'>-		struct bpos src_pos = POS(inum.inum, src_offset);</div><div class='del'>-		u32 snapshot;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto btree_err;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;iter, snapshot);</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter, SPOS(inum.inum, pos, snapshot));</div><div class='del'>-</div><div class='del'>-		k = insert</div><div class='del'>-			? bch2_btree_iter_peek_prev(&amp;iter)</div><div class='del'>-			: bch2_btree_iter_peek_upto(&amp;iter, POS(inum.inum, U64_MAX));</div><div class='del'>-		if ((ret = bkey_err(k)))</div><div class='del'>-			goto btree_err;</div><div class='del'>-</div><div class='del'>-		if (!k.k ||</div><div class='del'>-		    k.k-&gt;p.inode != inum.inum ||</div><div class='del'>-		    bkey_le(k.k-&gt;p, POS(inum.inum, src_offset)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		copy = bch2_bkey_make_mut_noupdate(trans, k);</div><div class='del'>-		if ((ret = PTR_ERR_OR_ZERO(copy)))</div><div class='del'>-			goto btree_err;</div><div class='del'>-</div><div class='del'>-		if (insert &amp;&amp;</div><div class='del'>-		    bkey_lt(bkey_start_pos(k.k), src_pos)) {</div><div class='del'>-			bch2_cut_front(src_pos, copy);</div><div class='del'>-</div><div class='del'>-			/* Splitting compressed extent? */</div><div class='del'>-			bch2_disk_reservation_add(c, &amp;disk_res,</div><div class='del'>-					copy-&gt;k.size *</div><div class='del'>-					bch2_bkey_nr_ptrs_allocated(bkey_i_to_s_c(copy)),</div><div class='del'>-					BCH_DISK_RESERVATION_NOFAIL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bkey_init(&amp;delete.k);</div><div class='del'>-		delete.k.p = copy-&gt;k.p;</div><div class='del'>-		delete.k.p.snapshot = snapshot;</div><div class='del'>-		delete.k.size = copy-&gt;k.size;</div><div class='del'>-</div><div class='del'>-		copy-&gt;k.p.offset += shift;</div><div class='del'>-		copy-&gt;k.p.snapshot = snapshot;</div><div class='del'>-</div><div class='del'>-		op-&gt;v.pos = cpu_to_le64(insert ? bkey_start_offset(&amp;delete.k) : delete.k.p.offset);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_bkey_set_needs_rebalance(c, copy, &amp;opts) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_extents, &amp;delete, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_extents, copy, 0) ?:</div><div class='del'>-			bch2_logged_op_update(trans, &amp;op-&gt;k_i) ?:</div><div class='del'>-			bch2_trans_commit(trans, &amp;disk_res, NULL, BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-btree_err:</div><div class='del'>-		bch2_disk_reservation_put(c, &amp;disk_res);</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		pos = le64_to_cpu(op-&gt;v.pos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	op-&gt;v.state = LOGGED_OP_FINSERT_finish;</div><div class='del'>-</div><div class='del'>-	if (!insert) {</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-				adjust_i_size(trans, inum, src_offset, shift) ?:</div><div class='del'>-				bch2_logged_op_update(trans, &amp;op-&gt;k_i));</div><div class='del'>-	} else {</div><div class='del'>-		/* We need an inode update to update bi_journal_seq for fsync: */</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-				adjust_i_size(trans, inum, 0, 0) ?:</div><div class='del'>-				bch2_logged_op_update(trans, &amp;op-&gt;k_i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	break;</div><div class='del'>-case LOGGED_OP_FINSERT_finish:</div><div class='del'>-	break;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_logged_op_finish(trans, op_k);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_resume_logged_op_finsert(struct btree_trans *trans, struct bkey_i *op_k)</div><div class='del'>-{</div><div class='del'>-	return __bch2_resume_logged_op_finsert(trans, op_k, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fcollapse_finsert(struct bch_fs *c, subvol_inum inum,</div><div class='del'>-			   u64 offset, u64 len, bool insert,</div><div class='del'>-			   s64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_logged_op_finsert op;</div><div class='del'>-	s64 shift = insert ? len : -len;</div><div class='del'>-</div><div class='del'>-	bkey_logged_op_finsert_init(&amp;op.k_i);</div><div class='del'>-	op.v.subvol	= cpu_to_le32(inum.subvol);</div><div class='del'>-	op.v.inum	= cpu_to_le64(inum.inum);</div><div class='del'>-	op.v.dst_offset	= cpu_to_le64(offset + shift);</div><div class='del'>-	op.v.src_offset	= cpu_to_le64(offset);</div><div class='del'>-	op.v.pos	= cpu_to_le64(insert ? U64_MAX : offset);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Logged ops aren't atomic w.r.t. snapshot creation: creating a</div><div class='del'>-	 * snapshot while they're in progress, then crashing, will result in the</div><div class='del'>-	 * resume only proceeding in one of the snapshots</div><div class='del'>-	 */</div><div class='del'>-	down_read(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		bch2_logged_op_start(trans, &amp;op.k_i) ?:</div><div class='del'>-		__bch2_resume_logged_op_finsert(trans, &amp;op.k_i, i_sectors_delta));</div><div class='del'>-	up_read(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/io_misc.h b/fs/bcachefs/io_misc.h<br/>deleted file mode 100644<br/>index 9cb44a7c43c1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_misc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_misc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_IO_MISC_H</div><div class='del'>-#define _BCACHEFS_IO_MISC_H</div><div class='del'>-</div><div class='del'>-int bch2_extent_fallocate(struct btree_trans *, subvol_inum, struct btree_iter *,</div><div class='del'>-			  u64, struct bch_io_opts, s64 *,</div><div class='del'>-			  struct write_point_specifier);</div><div class='del'>-int bch2_fpunch_at(struct btree_trans *, struct btree_iter *,</div><div class='del'>-		   subvol_inum, u64, s64 *);</div><div class='del'>-int bch2_fpunch(struct bch_fs *c, subvol_inum, u64, u64, s64 *);</div><div class='del'>-</div><div class='del'>-void bch2_logged_op_truncate_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_logged_op_truncate ((struct bkey_ops) {	\</div><div class='del'>-	.val_to_text	= bch2_logged_op_truncate_to_text,	\</div><div class='del'>-	.min_val_size	= 24,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_resume_logged_op_truncate(struct btree_trans *, struct bkey_i *);</div><div class='del'>-</div><div class='del'>-int bch2_truncate(struct bch_fs *, subvol_inum, u64, u64 *);</div><div class='del'>-</div><div class='del'>-void bch2_logged_op_finsert_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_logged_op_finsert ((struct bkey_ops) {	\</div><div class='del'>-	.val_to_text	= bch2_logged_op_finsert_to_text,	\</div><div class='del'>-	.min_val_size	= 24,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_resume_logged_op_finsert(struct btree_trans *, struct bkey_i *);</div><div class='del'>-</div><div class='del'>-int bch2_fcollapse_finsert(struct bch_fs *, subvol_inum, u64, u64, bool, s64 *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_IO_MISC_H */</div><div class='head'>diff --git a/fs/bcachefs/io_read.c b/fs/bcachefs/io_read.c<br/>deleted file mode 100644<br/>index 3c574d8873a1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_read.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_read.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1220 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Some low level IO code, and hacks for various block layer limitations</div><div class='del'>- *</div><div class='del'>- * Copyright 2010, 2011 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "data_update.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "io_misc.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-</div><div class='del'>-static bool bch2_target_congested(struct bch_fs *c, u16 target)</div><div class='del'>-{</div><div class='del'>-	const struct bch_devs_mask *devs;</div><div class='del'>-	unsigned d, nr = 0, total = 0;</div><div class='del'>-	u64 now = local_clock(), last;</div><div class='del'>-	s64 congested;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-</div><div class='del'>-	if (!target)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	devs = bch2_target_to_mask(c, target) ?:</div><div class='del'>-		&amp;c-&gt;rw_devs[BCH_DATA_user];</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(d, devs-&gt;d, BCH_SB_MEMBERS_MAX) {</div><div class='del'>-		ca = rcu_dereference(c-&gt;devs[d]);</div><div class='del'>-		if (!ca)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		congested = atomic_read(&amp;ca-&gt;congested);</div><div class='del'>-		last = READ_ONCE(ca-&gt;congested_last);</div><div class='del'>-		if (time_after64(now, last))</div><div class='del'>-			congested -= (now - last) &gt;&gt; 12;</div><div class='del'>-</div><div class='del'>-		total += max(congested, 0LL);</div><div class='del'>-		nr++;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return bch2_rand_range(nr * CONGESTED_MAX) &lt; total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static bool bch2_target_congested(struct bch_fs *c, u16 target)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Cache promotion on read */</div><div class='del'>-</div><div class='del'>-struct promote_op {</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	u64			start_time;</div><div class='del'>-</div><div class='del'>-	struct rhash_head	hash;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-</div><div class='del'>-	struct data_update	write;</div><div class='del'>-	struct bio_vec		bi_inline_vecs[]; /* must be last */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct rhashtable_params bch_promote_params = {</div><div class='del'>-	.head_offset	= offsetof(struct promote_op, hash),</div><div class='del'>-	.key_offset	= offsetof(struct promote_op, pos),</div><div class='del'>-	.key_len	= sizeof(struct bpos),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int should_promote(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				  struct bpos pos,</div><div class='del'>-				  struct bch_io_opts opts,</div><div class='del'>-				  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!opts.promote_target);</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_READ_MAY_PROMOTE))</div><div class='del'>-		return -BCH_ERR_nopromote_may_not;</div><div class='del'>-</div><div class='del'>-	if (bch2_bkey_has_target(c, k, opts.promote_target))</div><div class='del'>-		return -BCH_ERR_nopromote_already_promoted;</div><div class='del'>-</div><div class='del'>-	if (bkey_extent_is_unwritten(k))</div><div class='del'>-		return -BCH_ERR_nopromote_unwritten;</div><div class='del'>-</div><div class='del'>-	if (bch2_target_congested(c, opts.promote_target))</div><div class='del'>-		return -BCH_ERR_nopromote_congested;</div><div class='del'>-</div><div class='del'>-	if (rhashtable_lookup_fast(&amp;c-&gt;promote_table, &amp;pos,</div><div class='del'>-				   bch_promote_params))</div><div class='del'>-		return -BCH_ERR_nopromote_in_flight;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void promote_free(struct bch_fs *c, struct promote_op *op)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_data_update_exit(&amp;op-&gt;write);</div><div class='del'>-</div><div class='del'>-	ret = rhashtable_remove_fast(&amp;c-&gt;promote_table, &amp;op-&gt;hash,</div><div class='del'>-				     bch_promote_params);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_promote);</div><div class='del'>-	kfree_rcu(op, rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void promote_done(struct bch_write_op *wop)</div><div class='del'>-{</div><div class='del'>-	struct promote_op *op =</div><div class='del'>-		container_of(wop, struct promote_op, write.op);</div><div class='del'>-	struct bch_fs *c = op-&gt;write.op.c;</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_data_promote],</div><div class='del'>-			       op-&gt;start_time);</div><div class='del'>-	promote_free(c, op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void promote_start(struct promote_op *op, struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	struct bio *bio = &amp;op-&gt;write.op.wbio.bio;</div><div class='del'>-</div><div class='del'>-	trace_and_count(op-&gt;write.op.c, read_promote, &amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-	/* we now own pages: */</div><div class='del'>-	BUG_ON(!rbio-&gt;bounce);</div><div class='del'>-	BUG_ON(rbio-&gt;bio.bi_vcnt &gt; bio-&gt;bi_max_vecs);</div><div class='del'>-</div><div class='del'>-	memcpy(bio-&gt;bi_io_vec, rbio-&gt;bio.bi_io_vec,</div><div class='del'>-	       sizeof(struct bio_vec) * rbio-&gt;bio.bi_vcnt);</div><div class='del'>-	swap(bio-&gt;bi_vcnt, rbio-&gt;bio.bi_vcnt);</div><div class='del'>-</div><div class='del'>-	bch2_data_update_read_done(&amp;op-&gt;write, rbio-&gt;pick.crc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct promote_op *__promote_alloc(struct btree_trans *trans,</div><div class='del'>-					  enum btree_id btree_id,</div><div class='del'>-					  struct bkey_s_c k,</div><div class='del'>-					  struct bpos pos,</div><div class='del'>-					  struct extent_ptr_decoded *pick,</div><div class='del'>-					  struct bch_io_opts opts,</div><div class='del'>-					  unsigned sectors,</div><div class='del'>-					  struct bch_read_bio **rbio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct promote_op *op = NULL;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	unsigned pages = DIV_ROUND_UP(sectors, PAGE_SECTORS);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_promote))</div><div class='del'>-		return ERR_PTR(-BCH_ERR_nopromote_no_writes);</div><div class='del'>-</div><div class='del'>-	op = kzalloc(sizeof(*op) + sizeof(struct bio_vec) * pages, GFP_KERNEL);</div><div class='del'>-	if (!op) {</div><div class='del'>-		ret = -BCH_ERR_nopromote_enomem;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	op-&gt;start_time = local_clock();</div><div class='del'>-	op-&gt;pos = pos;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't use the mempool here because extents that aren't</div><div class='del'>-	 * checksummed or compressed can be too big for the mempool:</div><div class='del'>-	 */</div><div class='del'>-	*rbio = kzalloc(sizeof(struct bch_read_bio) +</div><div class='del'>-			sizeof(struct bio_vec) * pages,</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!*rbio) {</div><div class='del'>-		ret = -BCH_ERR_nopromote_enomem;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rbio_init(&amp;(*rbio)-&gt;bio, opts);</div><div class='del'>-	bio_init(&amp;(*rbio)-&gt;bio, NULL, (*rbio)-&gt;bio.bi_inline_vecs, pages, 0);</div><div class='del'>-</div><div class='del'>-	if (bch2_bio_alloc_pages(&amp;(*rbio)-&gt;bio, sectors &lt;&lt; 9, GFP_KERNEL)) {</div><div class='del'>-		ret = -BCH_ERR_nopromote_enomem;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	(*rbio)-&gt;bounce		= true;</div><div class='del'>-	(*rbio)-&gt;split		= true;</div><div class='del'>-	(*rbio)-&gt;kmalloc	= true;</div><div class='del'>-</div><div class='del'>-	if (rhashtable_lookup_insert_fast(&amp;c-&gt;promote_table, &amp;op-&gt;hash,</div><div class='del'>-					  bch_promote_params)) {</div><div class='del'>-		ret = -BCH_ERR_nopromote_in_flight;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio = &amp;op-&gt;write.op.wbio.bio;</div><div class='del'>-	bio_init(bio, NULL, bio-&gt;bi_inline_vecs, pages, 0);</div><div class='del'>-</div><div class='del'>-	ret = bch2_data_update_init(trans, NULL, NULL, &amp;op-&gt;write,</div><div class='del'>-			writepoint_hashed((unsigned long) current),</div><div class='del'>-			opts,</div><div class='del'>-			(struct data_update_opts) {</div><div class='del'>-				.target		= opts.promote_target,</div><div class='del'>-				.extra_replicas	= 1,</div><div class='del'>-				.write_flags	= BCH_WRITE_ALLOC_NOWAIT|BCH_WRITE_CACHED,</div><div class='del'>-			},</div><div class='del'>-			btree_id, k);</div><div class='del'>-	/*</div><div class='del'>-	 * possible errors: -BCH_ERR_nocow_lock_blocked,</div><div class='del'>-	 * -BCH_ERR_ENOSPC_disk_reservation:</div><div class='del'>-	 */</div><div class='del'>-	if (ret) {</div><div class='del'>-		BUG_ON(rhashtable_remove_fast(&amp;c-&gt;promote_table, &amp;op-&gt;hash,</div><div class='del'>-					      bch_promote_params));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	op-&gt;write.op.end_io = promote_done;</div><div class='del'>-</div><div class='del'>-	return op;</div><div class='del'>-err:</div><div class='del'>-	if (*rbio)</div><div class='del'>-		bio_free_pages(&amp;(*rbio)-&gt;bio);</div><div class='del'>-	kfree(*rbio);</div><div class='del'>-	*rbio = NULL;</div><div class='del'>-	kfree(op);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_promote);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline</div><div class='del'>-static struct promote_op *promote_alloc(struct btree_trans *trans,</div><div class='del'>-					struct bvec_iter iter,</div><div class='del'>-					struct bkey_s_c k,</div><div class='del'>-					struct extent_ptr_decoded *pick,</div><div class='del'>-					struct bch_io_opts opts,</div><div class='del'>-					unsigned flags,</div><div class='del'>-					struct bch_read_bio **rbio,</div><div class='del'>-					bool *bounce,</div><div class='del'>-					bool *read_full)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	bool promote_full = *read_full || READ_ONCE(c-&gt;promote_whole_extents);</div><div class='del'>-	/* data might have to be decompressed in the write path: */</div><div class='del'>-	unsigned sectors = promote_full</div><div class='del'>-		? max(pick-&gt;crc.compressed_size, pick-&gt;crc.live_size)</div><div class='del'>-		: bvec_iter_sectors(iter);</div><div class='del'>-	struct bpos pos = promote_full</div><div class='del'>-		? bkey_start_pos(k.k)</div><div class='del'>-		: POS(k.k-&gt;p.inode, iter.bi_sector);</div><div class='del'>-	struct promote_op *promote;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = should_promote(c, k, pos, opts, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto nopromote;</div><div class='del'>-</div><div class='del'>-	promote = __promote_alloc(trans,</div><div class='del'>-				  k.k-&gt;type == KEY_TYPE_reflink_v</div><div class='del'>-				  ? BTREE_ID_reflink</div><div class='del'>-				  : BTREE_ID_extents,</div><div class='del'>-				  k, pos, pick, opts, sectors, rbio);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(promote);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto nopromote;</div><div class='del'>-</div><div class='del'>-	*bounce		= true;</div><div class='del'>-	*read_full	= promote_full;</div><div class='del'>-	return promote;</div><div class='del'>-nopromote:</div><div class='del'>-	trace_read_nopromote(c, ret);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read */</div><div class='del'>-</div><div class='del'>-#define READ_RETRY_AVOID	1</div><div class='del'>-#define READ_RETRY		2</div><div class='del'>-#define READ_ERR		3</div><div class='del'>-</div><div class='del'>-enum rbio_context {</div><div class='del'>-	RBIO_CONTEXT_NULL,</div><div class='del'>-	RBIO_CONTEXT_HIGHPRI,</div><div class='del'>-	RBIO_CONTEXT_UNBOUND,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bch_read_bio *</div><div class='del'>-bch2_rbio_parent(struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	return rbio-&gt;split ? rbio-&gt;parent : rbio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static void bch2_rbio_punt(struct bch_read_bio *rbio, work_func_t fn,</div><div class='del'>-			   enum rbio_context context,</div><div class='del'>-			   struct workqueue_struct *wq)</div><div class='del'>-{</div><div class='del'>-	if (context &lt;= rbio-&gt;context) {</div><div class='del'>-		fn(&amp;rbio-&gt;work);</div><div class='del'>-	} else {</div><div class='del'>-		rbio-&gt;work.func		= fn;</div><div class='del'>-		rbio-&gt;context		= context;</div><div class='del'>-		queue_work(wq, &amp;rbio-&gt;work);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_read_bio *bch2_rbio_free(struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(rbio-&gt;bounce &amp;&amp; !rbio-&gt;split);</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;promote)</div><div class='del'>-		promote_free(rbio-&gt;c, rbio-&gt;promote);</div><div class='del'>-	rbio-&gt;promote = NULL;</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;bounce)</div><div class='del'>-		bch2_bio_free_pages_pool(rbio-&gt;c, &amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;split) {</div><div class='del'>-		struct bch_read_bio *parent = rbio-&gt;parent;</div><div class='del'>-</div><div class='del'>-		if (rbio-&gt;kmalloc)</div><div class='del'>-			kfree(rbio);</div><div class='del'>-		else</div><div class='del'>-			bio_put(&amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-		rbio = parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rbio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Only called on a top level bch_read_bio to complete an entire read request,</div><div class='del'>- * not a split:</div><div class='del'>- */</div><div class='del'>-static void bch2_rbio_done(struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	if (rbio-&gt;start_time)</div><div class='del'>-		bch2_time_stats_update(&amp;rbio-&gt;c-&gt;times[BCH_TIME_data_read],</div><div class='del'>-				       rbio-&gt;start_time);</div><div class='del'>-	bio_endio(&amp;rbio-&gt;bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_read_retry_nodecode(struct bch_fs *c, struct bch_read_bio *rbio,</div><div class='del'>-				     struct bvec_iter bvec_iter,</div><div class='del'>-				     struct bch_io_failures *failed,</div><div class='del'>-				     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	flags &amp;= ~BCH_READ_LAST_FRAGMENT;</div><div class='del'>-	flags |= BCH_READ_MUST_CLONE;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, rbio-&gt;data_btree,</div><div class='del'>-			     rbio-&gt;read_pos, BTREE_ITER_SLOTS);</div><div class='del'>-retry:</div><div class='del'>-	rbio-&gt;bio.bi_status = 0;</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	if (bkey_err(k))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-	k = bkey_i_to_s_c(sk.k);</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	if (!bch2_bkey_matches_ptr(c, k,</div><div class='del'>-				   rbio-&gt;pick.ptr,</div><div class='del'>-				   rbio-&gt;data_pos.offset -</div><div class='del'>-				   rbio-&gt;pick.crc.offset)) {</div><div class='del'>-		/* extent we wanted to read no longer exists: */</div><div class='del'>-		rbio-&gt;hole = true;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __bch2_read_extent(trans, rbio, bvec_iter,</div><div class='del'>-				 rbio-&gt;read_pos,</div><div class='del'>-				 rbio-&gt;data_btree,</div><div class='del'>-				 k, 0, failed, flags);</div><div class='del'>-	if (ret == READ_RETRY)</div><div class='del'>-		goto retry;</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-out:</div><div class='del'>-	bch2_rbio_done(rbio);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	rbio-&gt;bio.bi_status = BLK_STS_IOERR;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_rbio_retry(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_read_bio *rbio =</div><div class='del'>-		container_of(work, struct bch_read_bio, work);</div><div class='del'>-	struct bch_fs *c	= rbio-&gt;c;</div><div class='del'>-	struct bvec_iter iter	= rbio-&gt;bvec_iter;</div><div class='del'>-	unsigned flags		= rbio-&gt;flags;</div><div class='del'>-	subvol_inum inum = {</div><div class='del'>-		.subvol = rbio-&gt;subvol,</div><div class='del'>-		.inum	= rbio-&gt;read_pos.inode,</div><div class='del'>-	};</div><div class='del'>-	struct bch_io_failures failed = { .nr = 0 };</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, read_retry, &amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;retry == READ_RETRY_AVOID)</div><div class='del'>-		bch2_mark_io_failure(&amp;failed, &amp;rbio-&gt;pick);</div><div class='del'>-</div><div class='del'>-	rbio-&gt;bio.bi_status = 0;</div><div class='del'>-</div><div class='del'>-	rbio = bch2_rbio_free(rbio);</div><div class='del'>-</div><div class='del'>-	flags |= BCH_READ_IN_RETRY;</div><div class='del'>-	flags &amp;= ~BCH_READ_MAY_PROMOTE;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BCH_READ_NODECODE) {</div><div class='del'>-		bch2_read_retry_nodecode(c, rbio, iter, &amp;failed, flags);</div><div class='del'>-	} else {</div><div class='del'>-		flags &amp;= ~BCH_READ_LAST_FRAGMENT;</div><div class='del'>-		flags |= BCH_READ_MUST_CLONE;</div><div class='del'>-</div><div class='del'>-		__bch2_read(c, rbio, iter, inum, &amp;failed, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_rbio_error(struct bch_read_bio *rbio, int retry,</div><div class='del'>-			    blk_status_t error)</div><div class='del'>-{</div><div class='del'>-	rbio-&gt;retry = retry;</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;flags &amp; BCH_READ_IN_RETRY)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (retry == READ_ERR) {</div><div class='del'>-		rbio = bch2_rbio_free(rbio);</div><div class='del'>-</div><div class='del'>-		rbio-&gt;bio.bi_status = error;</div><div class='del'>-		bch2_rbio_done(rbio);</div><div class='del'>-	} else {</div><div class='del'>-		bch2_rbio_punt(rbio, bch2_rbio_retry,</div><div class='del'>-			       RBIO_CONTEXT_UNBOUND, system_unbound_wq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_rbio_narrow_crcs(struct btree_trans *trans,</div><div class='del'>-				   struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = rbio-&gt;c;</div><div class='del'>-	u64 data_offset = rbio-&gt;data_pos.offset - rbio-&gt;pick.crc.offset;</div><div class='del'>-	struct bch_extent_crc_unpacked new_crc;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i *new;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (crc_is_compressed(rbio-&gt;pick.crc))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, rbio-&gt;data_btree, rbio-&gt;data_pos,</div><div class='del'>-			       BTREE_ITER_SLOTS|BTREE_ITER_INTENT);</div><div class='del'>-	if ((ret = bkey_err(k)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (bversion_cmp(k.k-&gt;version, rbio-&gt;version) ||</div><div class='del'>-	    !bch2_bkey_matches_ptr(c, k, rbio-&gt;pick.ptr, data_offset))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Extent was merged? */</div><div class='del'>-	if (bkey_start_offset(k.k) &lt; data_offset ||</div><div class='del'>-	    k.k-&gt;p.offset &gt; data_offset + rbio-&gt;pick.crc.uncompressed_size)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (bch2_rechecksum_bio(c, &amp;rbio-&gt;bio, rbio-&gt;version,</div><div class='del'>-			rbio-&gt;pick.crc, NULL, &amp;new_crc,</div><div class='del'>-			bkey_start_offset(k.k) - data_offset, k.k-&gt;size,</div><div class='del'>-			rbio-&gt;pick.crc.csum_type)) {</div><div class='del'>-		bch_err(c, "error verifying existing checksum while narrowing checksum (memory corruption?)");</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * going to be temporarily appending another checksum entry:</div><div class='del'>-	 */</div><div class='del'>-	new = bch2_trans_kmalloc(trans, bkey_bytes(k.k) +</div><div class='del'>-				 sizeof(struct bch_extent_crc128));</div><div class='del'>-	if ((ret = PTR_ERR_OR_ZERO(new)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	bkey_reassemble(new, k);</div><div class='del'>-</div><div class='del'>-	if (!bch2_bkey_narrow_crcs(new, new_crc))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, new,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void bch2_rbio_narrow_crcs(struct bch_read_bio *rbio)</div><div class='del'>-{</div><div class='del'>-	bch2_trans_do(rbio-&gt;c, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		      __bch2_rbio_narrow_crcs(trans, rbio));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Inner part that may run in process context */</div><div class='del'>-static void __bch2_read_endio(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_read_bio *rbio =</div><div class='del'>-		container_of(work, struct bch_read_bio, work);</div><div class='del'>-	struct bch_fs *c	= rbio-&gt;c;</div><div class='del'>-	struct bch_dev *ca	= bch_dev_bkey_exists(c, rbio-&gt;pick.ptr.dev);</div><div class='del'>-	struct bio *src		= &amp;rbio-&gt;bio;</div><div class='del'>-	struct bio *dst		= &amp;bch2_rbio_parent(rbio)-&gt;bio;</div><div class='del'>-	struct bvec_iter dst_iter = rbio-&gt;bvec_iter;</div><div class='del'>-	struct bch_extent_crc_unpacked crc = rbio-&gt;pick.crc;</div><div class='del'>-	struct nonce nonce = extent_nonce(rbio-&gt;version, crc);</div><div class='del'>-	unsigned nofs_flags;</div><div class='del'>-	struct bch_csum csum;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	nofs_flags = memalloc_nofs_save();</div><div class='del'>-</div><div class='del'>-	/* Reset iterator for checksumming and copying bounced data: */</div><div class='del'>-	if (rbio-&gt;bounce) {</div><div class='del'>-		src-&gt;bi_iter.bi_size		= crc.compressed_size &lt;&lt; 9;</div><div class='del'>-		src-&gt;bi_iter.bi_idx		= 0;</div><div class='del'>-		src-&gt;bi_iter.bi_bvec_done	= 0;</div><div class='del'>-	} else {</div><div class='del'>-		src-&gt;bi_iter			= rbio-&gt;bvec_iter;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	csum = bch2_checksum_bio(c, crc.csum_type, nonce, src);</div><div class='del'>-	if (bch2_crc_cmp(csum, rbio-&gt;pick.crc.csum) &amp;&amp; !c-&gt;opts.no_data_io)</div><div class='del'>-		goto csum_err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX</div><div class='del'>-	 * We need to rework the narrow_crcs path to deliver the read completion</div><div class='del'>-	 * first, and then punt to a different workqueue, otherwise we're</div><div class='del'>-	 * holding up reads while doing btree updates which is bad for memory</div><div class='del'>-	 * reclaim.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(rbio-&gt;narrow_crcs))</div><div class='del'>-		bch2_rbio_narrow_crcs(rbio);</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;flags &amp; BCH_READ_NODECODE)</div><div class='del'>-		goto nodecode;</div><div class='del'>-</div><div class='del'>-	/* Adjust crc to point to subset of data we want: */</div><div class='del'>-	crc.offset     += rbio-&gt;offset_into_extent;</div><div class='del'>-	crc.live_size	= bvec_iter_sectors(rbio-&gt;bvec_iter);</div><div class='del'>-</div><div class='del'>-	if (crc_is_compressed(crc)) {</div><div class='del'>-		ret = bch2_encrypt_bio(c, crc.csum_type, nonce, src);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto decrypt_err;</div><div class='del'>-</div><div class='del'>-		if (bch2_bio_uncompress(c, src, dst, dst_iter, crc) &amp;&amp;</div><div class='del'>-		    !c-&gt;opts.no_data_io)</div><div class='del'>-			goto decompression_err;</div><div class='del'>-	} else {</div><div class='del'>-		/* don't need to decrypt the entire bio: */</div><div class='del'>-		nonce = nonce_add(nonce, crc.offset &lt;&lt; 9);</div><div class='del'>-		bio_advance(src, crc.offset &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-		BUG_ON(src-&gt;bi_iter.bi_size &lt; dst_iter.bi_size);</div><div class='del'>-		src-&gt;bi_iter.bi_size = dst_iter.bi_size;</div><div class='del'>-</div><div class='del'>-		ret = bch2_encrypt_bio(c, crc.csum_type, nonce, src);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto decrypt_err;</div><div class='del'>-</div><div class='del'>-		if (rbio-&gt;bounce) {</div><div class='del'>-			struct bvec_iter src_iter = src-&gt;bi_iter;</div><div class='del'>-</div><div class='del'>-			bio_copy_data_iter(dst, &amp;dst_iter, src, &amp;src_iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;promote) {</div><div class='del'>-		/*</div><div class='del'>-		 * Re encrypt data we decrypted, so it's consistent with</div><div class='del'>-		 * rbio-&gt;crc:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_encrypt_bio(c, crc.csum_type, nonce, src);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto decrypt_err;</div><div class='del'>-</div><div class='del'>-		promote_start(rbio-&gt;promote, rbio);</div><div class='del'>-		rbio-&gt;promote = NULL;</div><div class='del'>-	}</div><div class='del'>-nodecode:</div><div class='del'>-	if (likely(!(rbio-&gt;flags &amp; BCH_READ_IN_RETRY))) {</div><div class='del'>-		rbio = bch2_rbio_free(rbio);</div><div class='del'>-		bch2_rbio_done(rbio);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	memalloc_nofs_restore(nofs_flags);</div><div class='del'>-	return;</div><div class='del'>-csum_err:</div><div class='del'>-	/*</div><div class='del'>-	 * Checksum error: if the bio wasn't bounced, we may have been</div><div class='del'>-	 * reading into buffers owned by userspace (that userspace can</div><div class='del'>-	 * scribble over) - retry the read, bouncing it this time:</div><div class='del'>-	 */</div><div class='del'>-	if (!rbio-&gt;bounce &amp;&amp; (rbio-&gt;flags &amp; BCH_READ_USER_MAPPED)) {</div><div class='del'>-		rbio-&gt;flags |= BCH_READ_MUST_BOUNCE;</div><div class='del'>-		bch2_rbio_error(rbio, READ_RETRY, BLK_STS_IOERR);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	buf.atomic++;</div><div class='del'>-	prt_str(&amp;buf, "data ");</div><div class='del'>-	bch2_csum_err_msg(&amp;buf, crc.csum_type, rbio-&gt;pick.crc.csum, csum);</div><div class='del'>-</div><div class='del'>-	bch_err_inum_offset_ratelimited(ca,</div><div class='del'>-		rbio-&gt;read_pos.inode,</div><div class='del'>-		rbio-&gt;read_pos.offset &lt;&lt; 9,</div><div class='del'>-		"data %s", buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-	bch2_io_error(ca, BCH_MEMBER_ERROR_checksum);</div><div class='del'>-	bch2_rbio_error(rbio, READ_RETRY_AVOID, BLK_STS_IOERR);</div><div class='del'>-	goto out;</div><div class='del'>-decompression_err:</div><div class='del'>-	bch_err_inum_offset_ratelimited(c, rbio-&gt;read_pos.inode,</div><div class='del'>-					rbio-&gt;read_pos.offset &lt;&lt; 9,</div><div class='del'>-					"decompression error");</div><div class='del'>-	bch2_rbio_error(rbio, READ_ERR, BLK_STS_IOERR);</div><div class='del'>-	goto out;</div><div class='del'>-decrypt_err:</div><div class='del'>-	bch_err_inum_offset_ratelimited(c, rbio-&gt;read_pos.inode,</div><div class='del'>-					rbio-&gt;read_pos.offset &lt;&lt; 9,</div><div class='del'>-					"decrypt error");</div><div class='del'>-	bch2_rbio_error(rbio, READ_ERR, BLK_STS_IOERR);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_read_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bch_read_bio *rbio =</div><div class='del'>-		container_of(bio, struct bch_read_bio, bio);</div><div class='del'>-	struct bch_fs *c	= rbio-&gt;c;</div><div class='del'>-	struct bch_dev *ca	= bch_dev_bkey_exists(c, rbio-&gt;pick.ptr.dev);</div><div class='del'>-	struct workqueue_struct *wq = NULL;</div><div class='del'>-	enum rbio_context context = RBIO_CONTEXT_NULL;</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;have_ioref) {</div><div class='del'>-		bch2_latency_acct(ca, rbio-&gt;submit_time, READ);</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!rbio-&gt;split)</div><div class='del'>-		rbio-&gt;bio.bi_end_io = rbio-&gt;end_io;</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_inum_io_err_on(bio-&gt;bi_status, ca, BCH_MEMBER_ERROR_read,</div><div class='del'>-				    rbio-&gt;read_pos.inode,</div><div class='del'>-				    rbio-&gt;read_pos.offset,</div><div class='del'>-				    "data read error: %s",</div><div class='del'>-			       bch2_blk_status_to_str(bio-&gt;bi_status))) {</div><div class='del'>-		bch2_rbio_error(rbio, READ_RETRY_AVOID, bio-&gt;bi_status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (((rbio-&gt;flags &amp; BCH_READ_RETRY_IF_STALE) &amp;&amp; race_fault()) ||</div><div class='del'>-	    ptr_stale(ca, &amp;rbio-&gt;pick.ptr)) {</div><div class='del'>-		trace_and_count(c, read_reuse_race, &amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-		if (rbio-&gt;flags &amp; BCH_READ_RETRY_IF_STALE)</div><div class='del'>-			bch2_rbio_error(rbio, READ_RETRY, BLK_STS_AGAIN);</div><div class='del'>-		else</div><div class='del'>-			bch2_rbio_error(rbio, READ_ERR, BLK_STS_AGAIN);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;narrow_crcs ||</div><div class='del'>-	    rbio-&gt;promote ||</div><div class='del'>-	    crc_is_compressed(rbio-&gt;pick.crc) ||</div><div class='del'>-	    bch2_csum_type_is_encryption(rbio-&gt;pick.crc.csum_type))</div><div class='del'>-		context = RBIO_CONTEXT_UNBOUND,	wq = system_unbound_wq;</div><div class='del'>-	else if (rbio-&gt;pick.crc.csum_type)</div><div class='del'>-		context = RBIO_CONTEXT_HIGHPRI,	wq = system_highpri_wq;</div><div class='del'>-</div><div class='del'>-	bch2_rbio_punt(rbio, __bch2_read_endio, context, wq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_read_indirect_extent(struct btree_trans *trans,</div><div class='del'>-				unsigned *offset_into_extent,</div><div class='del'>-				struct bkey_buf *orig_k)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u64 reflink_offset;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	reflink_offset = le64_to_cpu(bkey_i_to_reflink_p(orig_k-&gt;k)-&gt;v.idx) +</div><div class='del'>-		*offset_into_extent;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_reflink,</div><div class='del'>-			       POS(0, reflink_offset), 0);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_reflink_v &amp;&amp;</div><div class='del'>-	    k.k-&gt;type != KEY_TYPE_indirect_inline_data) {</div><div class='del'>-		bch_err_inum_offset_ratelimited(trans-&gt;c,</div><div class='del'>-			orig_k-&gt;k-&gt;k.p.inode,</div><div class='del'>-			orig_k-&gt;k-&gt;k.p.offset &lt;&lt; 9,</div><div class='del'>-			"%llu len %u points to nonexistent indirect extent %llu",</div><div class='del'>-			orig_k-&gt;k-&gt;k.p.offset,</div><div class='del'>-			orig_k-&gt;k-&gt;k.size,</div><div class='del'>-			reflink_offset);</div><div class='del'>-		bch2_inconsistent_error(trans-&gt;c);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*offset_into_extent = iter.pos.offset - bkey_start_offset(k.k);</div><div class='del'>-	bch2_bkey_buf_reassemble(orig_k, trans-&gt;c, k);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void read_from_stale_dirty_pointer(struct btree_trans *trans,</div><div class='del'>-						   struct bkey_s_c k,</div><div class='del'>-						   struct bch_extent_ptr ptr)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_dev *ca = bch_dev_bkey_exists(c, ptr.dev);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_alloc,</div><div class='del'>-			     PTR_BUCKET_POS(c, &amp;ptr),</div><div class='del'>-			     BTREE_ITER_CACHED);</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "Attempting to read from stale dirty pointer:");</div><div class='del'>-	printbuf_indent_add(&amp;buf, 2);</div><div class='del'>-	prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-	prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;buf, "memory gen: %u", *bucket_gen(ca, iter.pos.offset));</div><div class='del'>-</div><div class='del'>-	ret = lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_slot(&amp;iter)));</div><div class='del'>-	if (!ret) {</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_fs_inconsistent(c, "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_read_extent(struct btree_trans *trans, struct bch_read_bio *orig,</div><div class='del'>-		       struct bvec_iter iter, struct bpos read_pos,</div><div class='del'>-		       enum btree_id data_btree, struct bkey_s_c k,</div><div class='del'>-		       unsigned offset_into_extent,</div><div class='del'>-		       struct bch_io_failures *failed, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct extent_ptr_decoded pick;</div><div class='del'>-	struct bch_read_bio *rbio = NULL;</div><div class='del'>-	struct bch_dev *ca = NULL;</div><div class='del'>-	struct promote_op *promote = NULL;</div><div class='del'>-	bool bounce = false, read_full = false, narrow_crcs = false;</div><div class='del'>-	struct bpos data_pos = bkey_start_pos(k.k);</div><div class='del'>-	int pick_ret;</div><div class='del'>-</div><div class='del'>-	if (bkey_extent_is_inline_data(k.k)) {</div><div class='del'>-		unsigned bytes = min_t(unsigned, iter.bi_size,</div><div class='del'>-				       bkey_inline_data_bytes(k.k));</div><div class='del'>-</div><div class='del'>-		swap(iter.bi_size, bytes);</div><div class='del'>-		memcpy_to_bio(&amp;orig-&gt;bio, iter, bkey_inline_data_p(k));</div><div class='del'>-		swap(iter.bi_size, bytes);</div><div class='del'>-		bio_advance_iter(&amp;orig-&gt;bio, &amp;iter, bytes);</div><div class='del'>-		zero_fill_bio_iter(&amp;orig-&gt;bio, iter);</div><div class='del'>-		goto out_read_done;</div><div class='del'>-	}</div><div class='del'>-retry_pick:</div><div class='del'>-	pick_ret = bch2_bkey_pick_read_device(c, k, failed, &amp;pick);</div><div class='del'>-</div><div class='del'>-	/* hole or reservation - just zero fill: */</div><div class='del'>-	if (!pick_ret)</div><div class='del'>-		goto hole;</div><div class='del'>-</div><div class='del'>-	if (pick_ret &lt; 0) {</div><div class='del'>-		bch_err_inum_offset_ratelimited(c,</div><div class='del'>-				read_pos.inode, read_pos.offset &lt;&lt; 9,</div><div class='del'>-				"no device to read from");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_bkey_exists(c, pick.ptr.dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Stale dirty pointers are treated as IO errors, but @failed isn't</div><div class='del'>-	 * allocated unless we're in the retry path - so if we're not in the</div><div class='del'>-	 * retry path, don't check here, it'll be caught in bch2_read_endio()</div><div class='del'>-	 * and we'll end up in the retry path:</div><div class='del'>-	 */</div><div class='del'>-	if ((flags &amp; BCH_READ_IN_RETRY) &amp;&amp;</div><div class='del'>-	    !pick.ptr.cached &amp;&amp;</div><div class='del'>-	    unlikely(ptr_stale(ca, &amp;pick.ptr))) {</div><div class='del'>-		read_from_stale_dirty_pointer(trans, k, pick.ptr);</div><div class='del'>-		bch2_mark_io_failure(failed, &amp;pick);</div><div class='del'>-		goto retry_pick;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unlock the iterator while the btree node's lock is still in</div><div class='del'>-	 * cache, before doing the IO:</div><div class='del'>-	 */</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BCH_READ_NODECODE) {</div><div class='del'>-		/*</div><div class='del'>-		 * can happen if we retry, and the extent we were going to read</div><div class='del'>-		 * has been merged in the meantime:</div><div class='del'>-		 */</div><div class='del'>-		if (pick.crc.compressed_size &gt; orig-&gt;bio.bi_vcnt * PAGE_SECTORS)</div><div class='del'>-			goto hole;</div><div class='del'>-</div><div class='del'>-		iter.bi_size	= pick.crc.compressed_size &lt;&lt; 9;</div><div class='del'>-		goto get_bio;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; BCH_READ_LAST_FRAGMENT) ||</div><div class='del'>-	    bio_flagged(&amp;orig-&gt;bio, BIO_CHAIN))</div><div class='del'>-		flags |= BCH_READ_MUST_CLONE;</div><div class='del'>-</div><div class='del'>-	narrow_crcs = !(flags &amp; BCH_READ_IN_RETRY) &amp;&amp;</div><div class='del'>-		bch2_can_narrow_extent_crcs(k, pick.crc);</div><div class='del'>-</div><div class='del'>-	if (narrow_crcs &amp;&amp; (flags &amp; BCH_READ_USER_MAPPED))</div><div class='del'>-		flags |= BCH_READ_MUST_BOUNCE;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(offset_into_extent + bvec_iter_sectors(iter) &gt; k.k-&gt;size);</div><div class='del'>-</div><div class='del'>-	if (crc_is_compressed(pick.crc) ||</div><div class='del'>-	    (pick.crc.csum_type != BCH_CSUM_none &amp;&amp;</div><div class='del'>-	     (bvec_iter_sectors(iter) != pick.crc.uncompressed_size ||</div><div class='del'>-	      (bch2_csum_type_is_encryption(pick.crc.csum_type) &amp;&amp;</div><div class='del'>-	       (flags &amp; BCH_READ_USER_MAPPED)) ||</div><div class='del'>-	      (flags &amp; BCH_READ_MUST_BOUNCE)))) {</div><div class='del'>-		read_full = true;</div><div class='del'>-		bounce = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (orig-&gt;opts.promote_target)</div><div class='del'>-		promote = promote_alloc(trans, iter, k, &amp;pick, orig-&gt;opts, flags,</div><div class='del'>-					&amp;rbio, &amp;bounce, &amp;read_full);</div><div class='del'>-</div><div class='del'>-	if (!read_full) {</div><div class='del'>-		EBUG_ON(crc_is_compressed(pick.crc));</div><div class='del'>-		EBUG_ON(pick.crc.csum_type &amp;&amp;</div><div class='del'>-			(bvec_iter_sectors(iter) != pick.crc.uncompressed_size ||</div><div class='del'>-			 bvec_iter_sectors(iter) != pick.crc.live_size ||</div><div class='del'>-			 pick.crc.offset ||</div><div class='del'>-			 offset_into_extent));</div><div class='del'>-</div><div class='del'>-		data_pos.offset += offset_into_extent;</div><div class='del'>-		pick.ptr.offset += pick.crc.offset +</div><div class='del'>-			offset_into_extent;</div><div class='del'>-		offset_into_extent		= 0;</div><div class='del'>-		pick.crc.compressed_size	= bvec_iter_sectors(iter);</div><div class='del'>-		pick.crc.uncompressed_size	= bvec_iter_sectors(iter);</div><div class='del'>-		pick.crc.offset			= 0;</div><div class='del'>-		pick.crc.live_size		= bvec_iter_sectors(iter);</div><div class='del'>-	}</div><div class='del'>-get_bio:</div><div class='del'>-	if (rbio) {</div><div class='del'>-		/*</div><div class='del'>-		 * promote already allocated bounce rbio:</div><div class='del'>-		 * promote needs to allocate a bio big enough for uncompressing</div><div class='del'>-		 * data in the write path, but we're not going to use it all</div><div class='del'>-		 * here:</div><div class='del'>-		 */</div><div class='del'>-		EBUG_ON(rbio-&gt;bio.bi_iter.bi_size &lt;</div><div class='del'>-		       pick.crc.compressed_size &lt;&lt; 9);</div><div class='del'>-		rbio-&gt;bio.bi_iter.bi_size =</div><div class='del'>-			pick.crc.compressed_size &lt;&lt; 9;</div><div class='del'>-	} else if (bounce) {</div><div class='del'>-		unsigned sectors = pick.crc.compressed_size;</div><div class='del'>-</div><div class='del'>-		rbio = rbio_init(bio_alloc_bioset(NULL,</div><div class='del'>-						  DIV_ROUND_UP(sectors, PAGE_SECTORS),</div><div class='del'>-						  0,</div><div class='del'>-						  GFP_NOFS,</div><div class='del'>-						  &amp;c-&gt;bio_read_split),</div><div class='del'>-				 orig-&gt;opts);</div><div class='del'>-</div><div class='del'>-		bch2_bio_alloc_pages_pool(c, &amp;rbio-&gt;bio, sectors &lt;&lt; 9);</div><div class='del'>-		rbio-&gt;bounce	= true;</div><div class='del'>-		rbio-&gt;split	= true;</div><div class='del'>-	} else if (flags &amp; BCH_READ_MUST_CLONE) {</div><div class='del'>-		/*</div><div class='del'>-		 * Have to clone if there were any splits, due to error</div><div class='del'>-		 * reporting issues (if a split errored, and retrying didn't</div><div class='del'>-		 * work, when it reports the error to its parent (us) we don't</div><div class='del'>-		 * know if the error was from our bio, and we should retry, or</div><div class='del'>-		 * from the whole bio, in which case we don't want to retry and</div><div class='del'>-		 * lose the error)</div><div class='del'>-		 */</div><div class='del'>-		rbio = rbio_init(bio_alloc_clone(NULL, &amp;orig-&gt;bio, GFP_NOFS,</div><div class='del'>-						 &amp;c-&gt;bio_read_split),</div><div class='del'>-				 orig-&gt;opts);</div><div class='del'>-		rbio-&gt;bio.bi_iter = iter;</div><div class='del'>-		rbio-&gt;split	= true;</div><div class='del'>-	} else {</div><div class='del'>-		rbio = orig;</div><div class='del'>-		rbio-&gt;bio.bi_iter = iter;</div><div class='del'>-		EBUG_ON(bio_flagged(&amp;rbio-&gt;bio, BIO_CHAIN));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	EBUG_ON(bio_sectors(&amp;rbio-&gt;bio) != pick.crc.compressed_size);</div><div class='del'>-</div><div class='del'>-	rbio-&gt;c			= c;</div><div class='del'>-	rbio-&gt;submit_time	= local_clock();</div><div class='del'>-	if (rbio-&gt;split)</div><div class='del'>-		rbio-&gt;parent	= orig;</div><div class='del'>-	else</div><div class='del'>-		rbio-&gt;end_io	= orig-&gt;bio.bi_end_io;</div><div class='del'>-	rbio-&gt;bvec_iter		= iter;</div><div class='del'>-	rbio-&gt;offset_into_extent= offset_into_extent;</div><div class='del'>-	rbio-&gt;flags		= flags;</div><div class='del'>-	rbio-&gt;have_ioref	= pick_ret &gt; 0 &amp;&amp; bch2_dev_get_ioref(ca, READ);</div><div class='del'>-	rbio-&gt;narrow_crcs	= narrow_crcs;</div><div class='del'>-	rbio-&gt;hole		= 0;</div><div class='del'>-	rbio-&gt;retry		= 0;</div><div class='del'>-	rbio-&gt;context		= 0;</div><div class='del'>-	/* XXX: only initialize this if needed */</div><div class='del'>-	rbio-&gt;devs_have		= bch2_bkey_devs(k);</div><div class='del'>-	rbio-&gt;pick		= pick;</div><div class='del'>-	rbio-&gt;subvol		= orig-&gt;subvol;</div><div class='del'>-	rbio-&gt;read_pos		= read_pos;</div><div class='del'>-	rbio-&gt;data_btree	= data_btree;</div><div class='del'>-	rbio-&gt;data_pos		= data_pos;</div><div class='del'>-	rbio-&gt;version		= k.k-&gt;version;</div><div class='del'>-	rbio-&gt;promote		= promote;</div><div class='del'>-	INIT_WORK(&amp;rbio-&gt;work, NULL);</div><div class='del'>-</div><div class='del'>-	rbio-&gt;bio.bi_opf	= orig-&gt;bio.bi_opf;</div><div class='del'>-	rbio-&gt;bio.bi_iter.bi_sector = pick.ptr.offset;</div><div class='del'>-	rbio-&gt;bio.bi_end_io	= bch2_read_endio;</div><div class='del'>-</div><div class='del'>-	if (rbio-&gt;bounce)</div><div class='del'>-		trace_and_count(c, read_bounce, &amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-	this_cpu_add(c-&gt;counters[BCH_COUNTER_io_read], bio_sectors(&amp;rbio-&gt;bio));</div><div class='del'>-	bch2_increment_clock(c, bio_sectors(&amp;rbio-&gt;bio), READ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If it's being moved internally, we don't want to flag it as a cache</div><div class='del'>-	 * hit:</div><div class='del'>-	 */</div><div class='del'>-	if (pick.ptr.cached &amp;&amp; !(flags &amp; BCH_READ_NODECODE))</div><div class='del'>-		bch2_bucket_io_time_reset(trans, pick.ptr.dev,</div><div class='del'>-			PTR_BUCKET_NR(ca, &amp;pick.ptr), READ);</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; (BCH_READ_IN_RETRY|BCH_READ_LAST_FRAGMENT))) {</div><div class='del'>-		bio_inc_remaining(&amp;orig-&gt;bio);</div><div class='del'>-		trace_and_count(c, read_split, &amp;orig-&gt;bio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!rbio-&gt;pick.idx) {</div><div class='del'>-		if (!rbio-&gt;have_ioref) {</div><div class='del'>-			bch_err_inum_offset_ratelimited(c,</div><div class='del'>-					read_pos.inode,</div><div class='del'>-					read_pos.offset &lt;&lt; 9,</div><div class='del'>-					"no device to read from");</div><div class='del'>-			bch2_rbio_error(rbio, READ_RETRY_AVOID, BLK_STS_IOERR);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		this_cpu_add(ca-&gt;io_done-&gt;sectors[READ][BCH_DATA_user],</div><div class='del'>-			     bio_sectors(&amp;rbio-&gt;bio));</div><div class='del'>-		bio_set_dev(&amp;rbio-&gt;bio, ca-&gt;disk_sb.bdev);</div><div class='del'>-</div><div class='del'>-		if (unlikely(c-&gt;opts.no_data_io)) {</div><div class='del'>-			if (likely(!(flags &amp; BCH_READ_IN_RETRY)))</div><div class='del'>-				bio_endio(&amp;rbio-&gt;bio);</div><div class='del'>-		} else {</div><div class='del'>-			if (likely(!(flags &amp; BCH_READ_IN_RETRY)))</div><div class='del'>-				submit_bio(&amp;rbio-&gt;bio);</div><div class='del'>-			else</div><div class='del'>-				submit_bio_wait(&amp;rbio-&gt;bio);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We just submitted IO which may block, we expect relock fail</div><div class='del'>-		 * events and shouldn't count them:</div><div class='del'>-		 */</div><div class='del'>-		trans-&gt;notrace_relock_fail = true;</div><div class='del'>-	} else {</div><div class='del'>-		/* Attempting reconstruct read: */</div><div class='del'>-		if (bch2_ec_read_extent(trans, rbio)) {</div><div class='del'>-			bch2_rbio_error(rbio, READ_RETRY_AVOID, BLK_STS_IOERR);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (likely(!(flags &amp; BCH_READ_IN_RETRY)))</div><div class='del'>-			bio_endio(&amp;rbio-&gt;bio);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (likely(!(flags &amp; BCH_READ_IN_RETRY))) {</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		rbio-&gt;context = RBIO_CONTEXT_UNBOUND;</div><div class='del'>-		bch2_read_endio(&amp;rbio-&gt;bio);</div><div class='del'>-</div><div class='del'>-		ret = rbio-&gt;retry;</div><div class='del'>-		rbio = bch2_rbio_free(rbio);</div><div class='del'>-</div><div class='del'>-		if (ret == READ_RETRY_AVOID) {</div><div class='del'>-			bch2_mark_io_failure(failed, &amp;pick);</div><div class='del'>-			ret = READ_RETRY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!ret)</div><div class='del'>-			goto out_read_done;</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	if (flags &amp; BCH_READ_IN_RETRY)</div><div class='del'>-		return READ_ERR;</div><div class='del'>-</div><div class='del'>-	orig-&gt;bio.bi_status = BLK_STS_IOERR;</div><div class='del'>-	goto out_read_done;</div><div class='del'>-</div><div class='del'>-hole:</div><div class='del'>-	/*</div><div class='del'>-	 * won't normally happen in the BCH_READ_NODECODE</div><div class='del'>-	 * (bch2_move_extent()) path, but if we retry and the extent we wanted</div><div class='del'>-	 * to read no longer exists we have to signal that:</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; BCH_READ_NODECODE)</div><div class='del'>-		orig-&gt;hole = true;</div><div class='del'>-</div><div class='del'>-	zero_fill_bio_iter(&amp;orig-&gt;bio, iter);</div><div class='del'>-out_read_done:</div><div class='del'>-	if (flags &amp; BCH_READ_LAST_FRAGMENT)</div><div class='del'>-		bch2_rbio_done(orig);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_read(struct bch_fs *c, struct bch_read_bio *rbio,</div><div class='del'>-		 struct bvec_iter bvec_iter, subvol_inum inum,</div><div class='del'>-		 struct bch_io_failures *failed, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(flags &amp; BCH_READ_NODECODE);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-	iter = (struct btree_iter) { NULL };</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     SPOS(inum.inum, bvec_iter.bi_sector, snapshot),</div><div class='del'>-			     BTREE_ITER_SLOTS);</div><div class='del'>-	while (1) {</div><div class='del'>-		unsigned bytes, sectors, offset_into_extent;</div><div class='del'>-		enum btree_id data_btree = BTREE_ID_extents;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * read_extent -&gt; io_time_reset may cause a transaction restart</div><div class='del'>-		 * without returning an error, we need to check for that here:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_trans_relock(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter,</div><div class='del'>-				POS(inum.inum, bvec_iter.bi_sector));</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		offset_into_extent = iter.pos.offset -</div><div class='del'>-			bkey_start_offset(k.k);</div><div class='del'>-		sectors = k.k-&gt;size - offset_into_extent;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-</div><div class='del'>-		ret = bch2_read_indirect_extent(trans, &amp;data_btree,</div><div class='del'>-					&amp;offset_into_extent, &amp;sk);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		k = bkey_i_to_s_c(sk.k);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * With indirect extents, the amount of data to read is the min</div><div class='del'>-		 * of the original extent and the indirect extent:</div><div class='del'>-		 */</div><div class='del'>-		sectors = min(sectors, k.k-&gt;size - offset_into_extent);</div><div class='del'>-</div><div class='del'>-		bytes = min(sectors, bvec_iter_sectors(bvec_iter)) &lt;&lt; 9;</div><div class='del'>-		swap(bvec_iter.bi_size, bytes);</div><div class='del'>-</div><div class='del'>-		if (bvec_iter.bi_size == bytes)</div><div class='del'>-			flags |= BCH_READ_LAST_FRAGMENT;</div><div class='del'>-</div><div class='del'>-		ret = __bch2_read_extent(trans, rbio, bvec_iter, iter.pos,</div><div class='del'>-					 data_btree, k,</div><div class='del'>-					 offset_into_extent, failed, flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (flags &amp; BCH_READ_LAST_FRAGMENT)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		swap(bvec_iter.bi_size, bytes);</div><div class='del'>-		bio_advance_iter(&amp;rbio-&gt;bio, &amp;bvec_iter, bytes);</div><div class='del'>-</div><div class='del'>-		ret = btree_trans_too_many_iters(trans);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart) ||</div><div class='del'>-	    ret == READ_RETRY ||</div><div class='del'>-	    ret == READ_RETRY_AVOID)</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err_inum_offset_ratelimited(c, inum.inum,</div><div class='del'>-						bvec_iter.bi_sector &lt;&lt; 9,</div><div class='del'>-						"read error %i from btree lookup", ret);</div><div class='del'>-		rbio-&gt;bio.bi_status = BLK_STS_IOERR;</div><div class='del'>-		bch2_rbio_done(rbio);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_io_read_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;promote_table.tbl)</div><div class='del'>-		rhashtable_destroy(&amp;c-&gt;promote_table);</div><div class='del'>-	bioset_exit(&amp;c-&gt;bio_read_split);</div><div class='del'>-	bioset_exit(&amp;c-&gt;bio_read);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_io_read_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bioset_init(&amp;c-&gt;bio_read, 1, offsetof(struct bch_read_bio, bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		return -BCH_ERR_ENOMEM_bio_read_init;</div><div class='del'>-</div><div class='del'>-	if (bioset_init(&amp;c-&gt;bio_read_split, 1, offsetof(struct bch_read_bio, bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		return -BCH_ERR_ENOMEM_bio_read_split_init;</div><div class='del'>-</div><div class='del'>-	if (rhashtable_init(&amp;c-&gt;promote_table, &amp;bch_promote_params))</div><div class='del'>-		return -BCH_ERR_ENOMEM_promote_table_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/io_read.h b/fs/bcachefs/io_read.h<br/>deleted file mode 100644<br/>index d9c18bb7d403..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_read.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_read.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_IO_READ_H</div><div class='del'>-#define _BCACHEFS_IO_READ_H</div><div class='del'>-</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-</div><div class='del'>-struct bch_read_bio {</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	u64			start_time;</div><div class='del'>-	u64			submit_time;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reads will often have to be split, and if the extent being read from</div><div class='del'>-	 * was checksummed or compressed we'll also have to allocate bounce</div><div class='del'>-	 * buffers and copy the data back into the original bio.</div><div class='del'>-	 *</div><div class='del'>-	 * If we didn't have to split, we have to save and restore the original</div><div class='del'>-	 * bi_end_io - @split below indicates which:</div><div class='del'>-	 */</div><div class='del'>-	union {</div><div class='del'>-	struct bch_read_bio	*parent;</div><div class='del'>-	bio_end_io_t		*end_io;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Saved copy of bio-&gt;bi_iter, from submission time - allows us to</div><div class='del'>-	 * resubmit on IO error, and also to copy data back to the original bio</div><div class='del'>-	 * when we're bouncing:</div><div class='del'>-	 */</div><div class='del'>-	struct bvec_iter	bvec_iter;</div><div class='del'>-</div><div class='del'>-	unsigned		offset_into_extent;</div><div class='del'>-</div><div class='del'>-	u16			flags;</div><div class='del'>-	union {</div><div class='del'>-	struct {</div><div class='del'>-	u16			bounce:1,</div><div class='del'>-				split:1,</div><div class='del'>-				kmalloc:1,</div><div class='del'>-				have_ioref:1,</div><div class='del'>-				narrow_crcs:1,</div><div class='del'>-				hole:1,</div><div class='del'>-				retry:2,</div><div class='del'>-				context:2;</div><div class='del'>-	};</div><div class='del'>-	u16			_state;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct bch_devs_list	devs_have;</div><div class='del'>-</div><div class='del'>-	struct extent_ptr_decoded pick;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * pos we read from - different from data_pos for indirect extents:</div><div class='del'>-	 */</div><div class='del'>-	u32			subvol;</div><div class='del'>-	struct bpos		read_pos;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * start pos of data we read (may not be pos of data we want) - for</div><div class='del'>-	 * promote, narrow extents paths:</div><div class='del'>-	 */</div><div class='del'>-	enum btree_id		data_btree;</div><div class='del'>-	struct bpos		data_pos;</div><div class='del'>-	struct bversion		version;</div><div class='del'>-</div><div class='del'>-	struct promote_op	*promote;</div><div class='del'>-</div><div class='del'>-	struct bch_io_opts	opts;</div><div class='del'>-</div><div class='del'>-	struct work_struct	work;</div><div class='del'>-</div><div class='del'>-	struct bio		bio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define to_rbio(_bio)		container_of((_bio), struct bch_read_bio, bio)</div><div class='del'>-</div><div class='del'>-struct bch_devs_mask;</div><div class='del'>-struct cache_promote_op;</div><div class='del'>-struct extent_ptr_decoded;</div><div class='del'>-</div><div class='del'>-int __bch2_read_indirect_extent(struct btree_trans *, unsigned *,</div><div class='del'>-				struct bkey_buf *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_read_indirect_extent(struct btree_trans *trans,</div><div class='del'>-					    enum btree_id *data_btree,</div><div class='del'>-					    unsigned *offset_into_extent,</div><div class='del'>-					    struct bkey_buf *k)</div><div class='del'>-{</div><div class='del'>-	if (k-&gt;k-&gt;k.type != KEY_TYPE_reflink_p)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	*data_btree = BTREE_ID_reflink;</div><div class='del'>-	return __bch2_read_indirect_extent(trans, offset_into_extent, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum bch_read_flags {</div><div class='del'>-	BCH_READ_RETRY_IF_STALE		= 1 &lt;&lt; 0,</div><div class='del'>-	BCH_READ_MAY_PROMOTE		= 1 &lt;&lt; 1,</div><div class='del'>-	BCH_READ_USER_MAPPED		= 1 &lt;&lt; 2,</div><div class='del'>-	BCH_READ_NODECODE		= 1 &lt;&lt; 3,</div><div class='del'>-	BCH_READ_LAST_FRAGMENT		= 1 &lt;&lt; 4,</div><div class='del'>-</div><div class='del'>-	/* internal: */</div><div class='del'>-	BCH_READ_MUST_BOUNCE		= 1 &lt;&lt; 5,</div><div class='del'>-	BCH_READ_MUST_CLONE		= 1 &lt;&lt; 6,</div><div class='del'>-	BCH_READ_IN_RETRY		= 1 &lt;&lt; 7,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __bch2_read_extent(struct btree_trans *, struct bch_read_bio *,</div><div class='del'>-		       struct bvec_iter, struct bpos, enum btree_id,</div><div class='del'>-		       struct bkey_s_c, unsigned,</div><div class='del'>-		       struct bch_io_failures *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void bch2_read_extent(struct btree_trans *trans,</div><div class='del'>-			struct bch_read_bio *rbio, struct bpos read_pos,</div><div class='del'>-			enum btree_id data_btree, struct bkey_s_c k,</div><div class='del'>-			unsigned offset_into_extent, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	__bch2_read_extent(trans, rbio, rbio-&gt;bio.bi_iter, read_pos,</div><div class='del'>-			   data_btree, k, offset_into_extent, NULL, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_read(struct bch_fs *, struct bch_read_bio *, struct bvec_iter,</div><div class='del'>-		 subvol_inum, struct bch_io_failures *, unsigned flags);</div><div class='del'>-</div><div class='del'>-static inline void bch2_read(struct bch_fs *c, struct bch_read_bio *rbio,</div><div class='del'>-			     subvol_inum inum)</div><div class='del'>-{</div><div class='del'>-	struct bch_io_failures failed = { .nr = 0 };</div><div class='del'>-</div><div class='del'>-	BUG_ON(rbio-&gt;_state);</div><div class='del'>-</div><div class='del'>-	rbio-&gt;c = c;</div><div class='del'>-	rbio-&gt;start_time = local_clock();</div><div class='del'>-	rbio-&gt;subvol = inum.subvol;</div><div class='del'>-</div><div class='del'>-	__bch2_read(c, rbio, rbio-&gt;bio.bi_iter, inum, &amp;failed,</div><div class='del'>-		    BCH_READ_RETRY_IF_STALE|</div><div class='del'>-		    BCH_READ_MAY_PROMOTE|</div><div class='del'>-		    BCH_READ_USER_MAPPED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_read_bio *rbio_init(struct bio *bio,</div><div class='del'>-					     struct bch_io_opts opts)</div><div class='del'>-{</div><div class='del'>-	struct bch_read_bio *rbio = to_rbio(bio);</div><div class='del'>-</div><div class='del'>-	rbio-&gt;_state	= 0;</div><div class='del'>-	rbio-&gt;promote	= NULL;</div><div class='del'>-	rbio-&gt;opts	= opts;</div><div class='del'>-	return rbio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_io_read_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_io_read_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_IO_READ_H */</div><div class='head'>diff --git a/fs/bcachefs/io_write.c b/fs/bcachefs/io_write.c<br/>deleted file mode 100644<br/>index ef3a53f9045a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_write.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1661 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright 2010, 2011 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "bset.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extent_update.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "nocow_locking.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-</div><div class='del'>-static inline void bch2_congested_acct(struct bch_dev *ca, u64 io_latency,</div><div class='del'>-				       u64 now, int rw)</div><div class='del'>-{</div><div class='del'>-	u64 latency_capable =</div><div class='del'>-		ca-&gt;io_latency[rw].quantiles.entries[QUANTILE_IDX(1)].m;</div><div class='del'>-	/* ideally we'd be taking into account the device's variance here: */</div><div class='del'>-	u64 latency_threshold = latency_capable &lt;&lt; (rw == READ ? 2 : 3);</div><div class='del'>-	s64 latency_over = io_latency - latency_threshold;</div><div class='del'>-</div><div class='del'>-	if (latency_threshold &amp;&amp; latency_over &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * bump up congested by approximately latency_over * 4 /</div><div class='del'>-		 * latency_threshold - we don't need much accuracy here so don't</div><div class='del'>-		 * bother with the divide:</div><div class='del'>-		 */</div><div class='del'>-		if (atomic_read(&amp;ca-&gt;congested) &lt; CONGESTED_MAX)</div><div class='del'>-			atomic_add(latency_over &gt;&gt;</div><div class='del'>-				   max_t(int, ilog2(latency_threshold) - 2, 0),</div><div class='del'>-				   &amp;ca-&gt;congested);</div><div class='del'>-</div><div class='del'>-		ca-&gt;congested_last = now;</div><div class='del'>-	} else if (atomic_read(&amp;ca-&gt;congested) &gt; 0) {</div><div class='del'>-		atomic_dec(&amp;ca-&gt;congested);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw)</div><div class='del'>-{</div><div class='del'>-	atomic64_t *latency = &amp;ca-&gt;cur_latency[rw];</div><div class='del'>-	u64 now = local_clock();</div><div class='del'>-	u64 io_latency = time_after64(now, submit_time)</div><div class='del'>-		? now - submit_time</div><div class='del'>-		: 0;</div><div class='del'>-	u64 old, new, v = atomic64_read(latency);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = v;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the io latency was reasonably close to the current</div><div class='del'>-		 * latency, skip doing the update and atomic operation - most of</div><div class='del'>-		 * the time:</div><div class='del'>-		 */</div><div class='del'>-		if (abs((int) (old - io_latency)) &lt; (old &gt;&gt; 1) &amp;&amp;</div><div class='del'>-		    now &amp; ~(~0U &lt;&lt; 5))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		new = ewma_add(old, io_latency, 5);</div><div class='del'>-	} while ((v = atomic64_cmpxchg(latency, old, new)) != old);</div><div class='del'>-</div><div class='del'>-	bch2_congested_acct(ca, io_latency, now, rw);</div><div class='del'>-</div><div class='del'>-	__bch2_time_stats_update(&amp;ca-&gt;io_latency[rw], submit_time, now);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Allocate, free from mempool: */</div><div class='del'>-</div><div class='del'>-void bch2_bio_free_pages_pool(struct bch_fs *c, struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bvec_iter_all iter;</div><div class='del'>-	struct bio_vec *bv;</div><div class='del'>-</div><div class='del'>-	bio_for_each_segment_all(bv, bio, iter)</div><div class='del'>-		if (bv-&gt;bv_page != ZERO_PAGE(0))</div><div class='del'>-			mempool_free(bv-&gt;bv_page, &amp;c-&gt;bio_bounce_pages);</div><div class='del'>-	bio-&gt;bi_vcnt = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct page *__bio_alloc_page_pool(struct bch_fs *c, bool *using_mempool)</div><div class='del'>-{</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	if (likely(!*using_mempool)) {</div><div class='del'>-		page = alloc_page(GFP_NOFS);</div><div class='del'>-		if (unlikely(!page)) {</div><div class='del'>-			mutex_lock(&amp;c-&gt;bio_bounce_pages_lock);</div><div class='del'>-			*using_mempool = true;</div><div class='del'>-			goto pool_alloc;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-pool_alloc:</div><div class='del'>-		page = mempool_alloc(&amp;c-&gt;bio_bounce_pages, GFP_NOFS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bio_alloc_pages_pool(struct bch_fs *c, struct bio *bio,</div><div class='del'>-			       size_t size)</div><div class='del'>-{</div><div class='del'>-	bool using_mempool = false;</div><div class='del'>-</div><div class='del'>-	while (size) {</div><div class='del'>-		struct page *page = __bio_alloc_page_pool(c, &amp;using_mempool);</div><div class='del'>-		unsigned len = min_t(size_t, PAGE_SIZE, size);</div><div class='del'>-</div><div class='del'>-		BUG_ON(!bio_add_page(bio, page, len, 0));</div><div class='del'>-		size -= len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (using_mempool)</div><div class='del'>-		mutex_unlock(&amp;c-&gt;bio_bounce_pages_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Extent update path: */</div><div class='del'>-</div><div class='del'>-int bch2_sum_sector_overwrites(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *extent_iter,</div><div class='del'>-			       struct bkey_i *new,</div><div class='del'>-			       bool *usage_increasing,</div><div class='del'>-			       s64 *i_sectors_delta,</div><div class='del'>-			       s64 *disk_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c old;</div><div class='del'>-	unsigned new_replicas = bch2_bkey_replicas(c, bkey_i_to_s_c(new));</div><div class='del'>-	bool new_compressed = bch2_bkey_sectors_compressed(bkey_i_to_s_c(new));</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	*usage_increasing	= false;</div><div class='del'>-	*i_sectors_delta	= 0;</div><div class='del'>-	*disk_sectors_delta	= 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_copy_iter(&amp;iter, extent_iter);</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_continue_norestart(iter,</div><div class='del'>-				new-&gt;k.p, BTREE_ITER_SLOTS, old, ret) {</div><div class='del'>-		s64 sectors = min(new-&gt;k.p.offset, old.k-&gt;p.offset) -</div><div class='del'>-			max(bkey_start_offset(&amp;new-&gt;k),</div><div class='del'>-			    bkey_start_offset(old.k));</div><div class='del'>-</div><div class='del'>-		*i_sectors_delta += sectors *</div><div class='del'>-			(bkey_extent_is_allocation(&amp;new-&gt;k) -</div><div class='del'>-			 bkey_extent_is_allocation(old.k));</div><div class='del'>-</div><div class='del'>-		*disk_sectors_delta += sectors * bch2_bkey_nr_ptrs_allocated(bkey_i_to_s_c(new));</div><div class='del'>-		*disk_sectors_delta -= new-&gt;k.p.snapshot == old.k-&gt;p.snapshot</div><div class='del'>-			? sectors * bch2_bkey_nr_ptrs_fully_allocated(old)</div><div class='del'>-			: 0;</div><div class='del'>-</div><div class='del'>-		if (!*usage_increasing &amp;&amp;</div><div class='del'>-		    (new-&gt;k.p.snapshot != old.k-&gt;p.snapshot ||</div><div class='del'>-		     new_replicas &gt; bch2_bkey_replicas(c, old) ||</div><div class='del'>-		     (!new_compressed &amp;&amp; bch2_bkey_sectors_compressed(old))))</div><div class='del'>-			*usage_increasing = true;</div><div class='del'>-</div><div class='del'>-		if (bkey_ge(old.k-&gt;p, new-&gt;k.p))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_extent_update_i_size_sectors(struct btree_trans *trans,</div><div class='del'>-						    struct btree_iter *extent_iter,</div><div class='del'>-						    u64 new_i_size,</div><div class='del'>-						    s64 i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	struct bkey_i_inode_v3 *inode;</div><div class='del'>-	/*</div><div class='del'>-	 * Crazy performance optimization:</div><div class='del'>-	 * Every extent update needs to also update the inode: the inode trigger</div><div class='del'>-	 * will set bi-&gt;journal_seq to the journal sequence number of this</div><div class='del'>-	 * transaction - for fsync.</div><div class='del'>-	 *</div><div class='del'>-	 * But if that's the only reason we're updating the inode (we're not</div><div class='del'>-	 * updating bi_size or bi_sectors), then we don't need the inode update</div><div class='del'>-	 * to be journalled - if we crash, the bi_journal_seq update will be</div><div class='del'>-	 * lost, but that's fine.</div><div class='del'>-	 */</div><div class='del'>-	unsigned inode_update_flags = BTREE_UPDATE_NOJOURNAL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_mut_noupdate(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			      SPOS(0,</div><div class='del'>-				   extent_iter-&gt;pos.inode,</div><div class='del'>-				   extent_iter-&gt;snapshot),</div><div class='del'>-			      BTREE_ITER_CACHED);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(k);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(k-&gt;k.type != KEY_TYPE_inode_v3)) {</div><div class='del'>-		k = bch2_inode_to_v3(trans, k);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(k);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode = bkey_i_to_inode_v3(k);</div><div class='del'>-</div><div class='del'>-	if (!(le64_to_cpu(inode-&gt;v.bi_flags) &amp; BCH_INODE_i_size_dirty) &amp;&amp;</div><div class='del'>-	    new_i_size &gt; le64_to_cpu(inode-&gt;v.bi_size)) {</div><div class='del'>-		inode-&gt;v.bi_size = cpu_to_le64(new_i_size);</div><div class='del'>-		inode_update_flags = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i_sectors_delta) {</div><div class='del'>-		le64_add_cpu(&amp;inode-&gt;v.bi_sectors, i_sectors_delta);</div><div class='del'>-		inode_update_flags = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;k.p.snapshot != iter.snapshot) {</div><div class='del'>-		inode-&gt;k.p.snapshot = iter.snapshot;</div><div class='del'>-		inode_update_flags = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;inode-&gt;k_i,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE|</div><div class='del'>-				inode_update_flags);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_extent_update(struct btree_trans *trans,</div><div class='del'>-		       subvol_inum inum,</div><div class='del'>-		       struct btree_iter *iter,</div><div class='del'>-		       struct bkey_i *k,</div><div class='del'>-		       struct disk_reservation *disk_res,</div><div class='del'>-		       u64 new_i_size,</div><div class='del'>-		       s64 *i_sectors_delta_total,</div><div class='del'>-		       bool check_enospc)</div><div class='del'>-{</div><div class='del'>-	struct bpos next_pos;</div><div class='del'>-	bool usage_increasing;</div><div class='del'>-	s64 i_sectors_delta = 0, disk_sectors_delta = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This traverses us the iterator without changing iter-&gt;path-&gt;pos to</div><div class='del'>-	 * search_key() (which is pos + 1 for extents): we want there to be a</div><div class='del'>-	 * path already traversed at iter-&gt;pos because</div><div class='del'>-	 * bch2_trans_extent_update() will use it to attempt extent merging</div><div class='del'>-	 */</div><div class='del'>-	ret = __bch2_btree_iter_traverse(iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_extent_trim_atomic(trans, iter, k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	next_pos = k-&gt;k.p;</div><div class='del'>-</div><div class='del'>-	ret = bch2_sum_sector_overwrites(trans, iter, k,</div><div class='del'>-			&amp;usage_increasing,</div><div class='del'>-			&amp;i_sectors_delta,</div><div class='del'>-			&amp;disk_sectors_delta);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (disk_res &amp;&amp;</div><div class='del'>-	    disk_sectors_delta &gt; (s64) disk_res-&gt;sectors) {</div><div class='del'>-		ret = bch2_disk_reservation_add(trans-&gt;c, disk_res,</div><div class='del'>-					disk_sectors_delta - disk_res-&gt;sectors,</div><div class='del'>-					!check_enospc || !usage_increasing</div><div class='del'>-					? BCH_DISK_RESERVATION_NOFAIL : 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note:</div><div class='del'>-	 * We always have to do an inode update - even when i_size/i_sectors</div><div class='del'>-	 * aren't changing - for fsync to work properly; fsync relies on</div><div class='del'>-	 * inode-&gt;bi_journal_seq which is updated by the trigger code:</div><div class='del'>-	 */</div><div class='del'>-	ret =   bch2_extent_update_i_size_sectors(trans, iter,</div><div class='del'>-						  min(k-&gt;k.p.offset &lt;&lt; 9, new_i_size),</div><div class='del'>-						  i_sectors_delta) ?:</div><div class='del'>-		bch2_trans_update(trans, iter, k, 0) ?:</div><div class='del'>-		bch2_trans_commit(trans, disk_res, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_check_rw|</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (i_sectors_delta_total)</div><div class='del'>-		*i_sectors_delta_total += i_sectors_delta;</div><div class='del'>-	bch2_btree_iter_set_pos(iter, next_pos);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_write_index_default(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	struct keylist *keys = &amp;op-&gt;insert_keys;</div><div class='del'>-	struct bkey_i *k = bch2_keylist_front(keys);</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	subvol_inum inum = {</div><div class='del'>-		.subvol = op-&gt;subvol,</div><div class='del'>-		.inum	= k-&gt;k.p.inode,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!inum.subvol);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		k = bch2_keylist_front(keys);</div><div class='del'>-		bch2_bkey_buf_copy(&amp;sk, c, k);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, inum.subvol,</div><div class='del'>-						  &amp;sk.k-&gt;k.p.snapshot);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-				     bkey_start_pos(&amp;sk.k-&gt;k),</div><div class='del'>-				     BTREE_ITER_SLOTS|BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_bkey_set_needs_rebalance(c, sk.k, &amp;op-&gt;opts) ?:</div><div class='del'>-			bch2_extent_update(trans, inum, &amp;iter, sk.k,</div><div class='del'>-					&amp;op-&gt;res,</div><div class='del'>-					op-&gt;new_i_size, &amp;op-&gt;i_sectors_delta,</div><div class='del'>-					op-&gt;flags &amp; BCH_WRITE_CHECK_ENOSPC);</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bkey_ge(iter.pos, k-&gt;k.p))</div><div class='del'>-			bch2_keylist_pop_front(&amp;op-&gt;insert_keys);</div><div class='del'>-		else</div><div class='del'>-			bch2_cut_front(iter.pos, k);</div><div class='del'>-	} while (!bch2_keylist_empty(keys));</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Writes */</div><div class='del'>-</div><div class='del'>-void bch2_submit_wbio_replicas(struct bch_write_bio *wbio, struct bch_fs *c,</div><div class='del'>-			       enum bch_data_type type,</div><div class='del'>-			       const struct bkey_i *k,</div><div class='del'>-			       bool nocow)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(k));</div><div class='del'>-	struct bch_write_bio *n;</div><div class='del'>-</div><div class='del'>-	BUG_ON(c-&gt;opts.nochanges);</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-		BUG_ON(!bch2_dev_exists2(c, ptr-&gt;dev));</div><div class='del'>-</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-		if (to_entry(ptr + 1) &lt; ptrs.end) {</div><div class='del'>-			n = to_wbio(bio_alloc_clone(NULL, &amp;wbio-&gt;bio,</div><div class='del'>-						GFP_NOFS, &amp;ca-&gt;replica_set));</div><div class='del'>-</div><div class='del'>-			n-&gt;bio.bi_end_io	= wbio-&gt;bio.bi_end_io;</div><div class='del'>-			n-&gt;bio.bi_private	= wbio-&gt;bio.bi_private;</div><div class='del'>-			n-&gt;parent		= wbio;</div><div class='del'>-			n-&gt;split		= true;</div><div class='del'>-			n-&gt;bounce		= false;</div><div class='del'>-			n-&gt;put_bio		= true;</div><div class='del'>-			n-&gt;bio.bi_opf		= wbio-&gt;bio.bi_opf;</div><div class='del'>-			bio_inc_remaining(&amp;wbio-&gt;bio);</div><div class='del'>-		} else {</div><div class='del'>-			n = wbio;</div><div class='del'>-			n-&gt;split		= false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		n-&gt;c			= c;</div><div class='del'>-		n-&gt;dev			= ptr-&gt;dev;</div><div class='del'>-		n-&gt;have_ioref		= nocow || bch2_dev_get_ioref(ca,</div><div class='del'>-					type == BCH_DATA_btree ? READ : WRITE);</div><div class='del'>-		n-&gt;nocow		= nocow;</div><div class='del'>-		n-&gt;submit_time		= local_clock();</div><div class='del'>-		n-&gt;inode_offset		= bkey_start_offset(&amp;k-&gt;k);</div><div class='del'>-		n-&gt;bio.bi_iter.bi_sector = ptr-&gt;offset;</div><div class='del'>-</div><div class='del'>-		if (likely(n-&gt;have_ioref)) {</div><div class='del'>-			this_cpu_add(ca-&gt;io_done-&gt;sectors[WRITE][type],</div><div class='del'>-				     bio_sectors(&amp;n-&gt;bio));</div><div class='del'>-</div><div class='del'>-			bio_set_dev(&amp;n-&gt;bio, ca-&gt;disk_sb.bdev);</div><div class='del'>-</div><div class='del'>-			if (type != BCH_DATA_btree &amp;&amp; unlikely(c-&gt;opts.no_data_io)) {</div><div class='del'>-				bio_endio(&amp;n-&gt;bio);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			submit_bio(&amp;n-&gt;bio);</div><div class='del'>-		} else {</div><div class='del'>-			n-&gt;bio.bi_status	= BLK_STS_REMOVED;</div><div class='del'>-			bio_endio(&amp;n-&gt;bio);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_write(struct bch_write_op *);</div><div class='del'>-</div><div class='del'>-static void bch2_write_done(struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_write_op *op = container_of(cl, struct bch_write_op, cl);</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(op-&gt;open_buckets.nr);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_data_write], op-&gt;start_time);</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;op-&gt;res);</div><div class='del'>-</div><div class='del'>-	if (!(op-&gt;flags &amp; BCH_WRITE_MOVE))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_write);</div><div class='del'>-	bch2_keylist_free(&amp;op-&gt;insert_keys, op-&gt;inline_keys);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(cl-&gt;parent);</div><div class='del'>-	closure_debug_destroy(cl);</div><div class='del'>-	if (op-&gt;end_io)</div><div class='del'>-		op-&gt;end_io(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline int bch2_write_drop_io_error_ptrs(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct keylist *keys = &amp;op-&gt;insert_keys;</div><div class='del'>-	struct bch_extent_ptr *ptr;</div><div class='del'>-	struct bkey_i *src, *dst = keys-&gt;keys, *n;</div><div class='del'>-</div><div class='del'>-	for (src = keys-&gt;keys; src != keys-&gt;top; src = n) {</div><div class='del'>-		n = bkey_next(src);</div><div class='del'>-</div><div class='del'>-		if (bkey_extent_is_direct_data(&amp;src-&gt;k)) {</div><div class='del'>-			bch2_bkey_drop_ptrs(bkey_i_to_s(src), ptr,</div><div class='del'>-					    test_bit(ptr-&gt;dev, op-&gt;failed.d));</div><div class='del'>-</div><div class='del'>-			if (!bch2_bkey_nr_ptrs(bkey_i_to_s_c(src)))</div><div class='del'>-				return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dst != src)</div><div class='del'>-			memmove_u64s_down(dst, src, src-&gt;k.u64s);</div><div class='del'>-		dst = bkey_next(dst);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	keys-&gt;top = dst;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __bch2_write_index - after a write, update index to point to new data</div><div class='del'>- * @op:		bch_write_op to process</div><div class='del'>- */</div><div class='del'>-static void __bch2_write_index(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct keylist *keys = &amp;op-&gt;insert_keys;</div><div class='del'>-	unsigned dev;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (unlikely(op-&gt;flags &amp; BCH_WRITE_IO_ERROR)) {</div><div class='del'>-		ret = bch2_write_drop_io_error_ptrs(op);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_keylist_empty(keys)) {</div><div class='del'>-		u64 sectors_start = keylist_sectors(keys);</div><div class='del'>-</div><div class='del'>-		ret = !(op-&gt;flags &amp; BCH_WRITE_MOVE)</div><div class='del'>-			? bch2_write_index_default(op)</div><div class='del'>-			: bch2_data_update_index_update(op);</div><div class='del'>-</div><div class='del'>-		BUG_ON(bch2_err_matches(ret, BCH_ERR_transaction_restart));</div><div class='del'>-		BUG_ON(keylist_sectors(keys) &amp;&amp; !ret);</div><div class='del'>-</div><div class='del'>-		op-&gt;written += sectors_start - keylist_sectors(keys);</div><div class='del'>-</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, EROFS)) {</div><div class='del'>-			struct bkey_i *insert = bch2_keylist_front(&amp;op-&gt;insert_keys);</div><div class='del'>-</div><div class='del'>-			bch_err_inum_offset_ratelimited(c,</div><div class='del'>-				insert-&gt;k.p.inode, insert-&gt;k.p.offset &lt;&lt; 9,</div><div class='del'>-				"write error while doing btree update: %s",</div><div class='del'>-				bch2_err_str(ret));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	/* If some a bucket wasn't written, we can't erasure code it: */</div><div class='del'>-	for_each_set_bit(dev, op-&gt;failed.d, BCH_SB_MEMBERS_MAX)</div><div class='del'>-		bch2_open_bucket_write_error(c, &amp;op-&gt;open_buckets, dev);</div><div class='del'>-</div><div class='del'>-	bch2_open_buckets_put(c, &amp;op-&gt;open_buckets);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	keys-&gt;top = keys-&gt;keys;</div><div class='del'>-	op-&gt;error = ret;</div><div class='del'>-	op-&gt;flags |= BCH_WRITE_DONE;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __wp_update_state(struct write_point *wp, enum write_point_state state)</div><div class='del'>-{</div><div class='del'>-	if (state != wp-&gt;state) {</div><div class='del'>-		u64 now = ktime_get_ns();</div><div class='del'>-</div><div class='del'>-		if (wp-&gt;last_state_change &amp;&amp;</div><div class='del'>-		    time_after64(now, wp-&gt;last_state_change))</div><div class='del'>-			wp-&gt;time[wp-&gt;state] += now - wp-&gt;last_state_change;</div><div class='del'>-		wp-&gt;state = state;</div><div class='del'>-		wp-&gt;last_state_change = now;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void wp_update_state(struct write_point *wp, bool running)</div><div class='del'>-{</div><div class='del'>-	enum write_point_state state;</div><div class='del'>-</div><div class='del'>-	state = running			 ? WRITE_POINT_running :</div><div class='del'>-		!list_empty(&amp;wp-&gt;writes) ? WRITE_POINT_waiting_io</div><div class='del'>-					 : WRITE_POINT_stopped;</div><div class='del'>-</div><div class='del'>-	__wp_update_state(wp, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(bch2_write_index)</div><div class='del'>-{</div><div class='del'>-	closure_type(op, struct bch_write_op, cl);</div><div class='del'>-	struct write_point *wp = op-&gt;wp;</div><div class='del'>-	struct workqueue_struct *wq = index_update_wq(op);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if ((op-&gt;flags &amp; BCH_WRITE_DONE) &amp;&amp;</div><div class='del'>-	    (op-&gt;flags &amp; BCH_WRITE_MOVE))</div><div class='del'>-		bch2_bio_free_pages_pool(op-&gt;c, &amp;op-&gt;wbio.bio);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;wp-&gt;writes_lock, flags);</div><div class='del'>-	if (wp-&gt;state == WRITE_POINT_waiting_io)</div><div class='del'>-		__wp_update_state(wp, WRITE_POINT_waiting_work);</div><div class='del'>-	list_add_tail(&amp;op-&gt;wp_list, &amp;wp-&gt;writes);</div><div class='del'>-	spin_unlock_irqrestore (&amp;wp-&gt;writes_lock, flags);</div><div class='del'>-</div><div class='del'>-	queue_work(wq, &amp;wp-&gt;index_update_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_write_queue(struct bch_write_op *op, struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	op-&gt;wp = wp;</div><div class='del'>-</div><div class='del'>-	if (wp-&gt;state == WRITE_POINT_stopped) {</div><div class='del'>-		spin_lock_irq(&amp;wp-&gt;writes_lock);</div><div class='del'>-		__wp_update_state(wp, WRITE_POINT_waiting_io);</div><div class='del'>-		spin_unlock_irq(&amp;wp-&gt;writes_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_write_point_do_index_updates(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct write_point *wp =</div><div class='del'>-		container_of(work, struct write_point, index_update_work);</div><div class='del'>-	struct bch_write_op *op;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		spin_lock_irq(&amp;wp-&gt;writes_lock);</div><div class='del'>-		op = list_first_entry_or_null(&amp;wp-&gt;writes, struct bch_write_op, wp_list);</div><div class='del'>-		if (op)</div><div class='del'>-			list_del(&amp;op-&gt;wp_list);</div><div class='del'>-		wp_update_state(wp, op != NULL);</div><div class='del'>-		spin_unlock_irq(&amp;wp-&gt;writes_lock);</div><div class='del'>-</div><div class='del'>-		if (!op)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		op-&gt;flags |= BCH_WRITE_IN_WORKER;</div><div class='del'>-</div><div class='del'>-		__bch2_write_index(op);</div><div class='del'>-</div><div class='del'>-		if (!(op-&gt;flags &amp; BCH_WRITE_DONE))</div><div class='del'>-			__bch2_write(op);</div><div class='del'>-		else</div><div class='del'>-			bch2_write_done(&amp;op-&gt;cl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_write_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct closure *cl		= bio-&gt;bi_private;</div><div class='del'>-	struct bch_write_op *op		= container_of(cl, struct bch_write_op, cl);</div><div class='del'>-	struct bch_write_bio *wbio	= to_wbio(bio);</div><div class='del'>-	struct bch_write_bio *parent	= wbio-&gt;split ? wbio-&gt;parent : NULL;</div><div class='del'>-	struct bch_fs *c		= wbio-&gt;c;</div><div class='del'>-	struct bch_dev *ca		= bch_dev_bkey_exists(c, wbio-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_inum_io_err_on(bio-&gt;bi_status, ca, BCH_MEMBER_ERROR_write,</div><div class='del'>-				    op-&gt;pos.inode,</div><div class='del'>-				    wbio-&gt;inode_offset &lt;&lt; 9,</div><div class='del'>-				    "data write error: %s",</div><div class='del'>-				    bch2_blk_status_to_str(bio-&gt;bi_status))) {</div><div class='del'>-		set_bit(wbio-&gt;dev, op-&gt;failed.d);</div><div class='del'>-		op-&gt;flags |= BCH_WRITE_IO_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;nocow)</div><div class='del'>-		set_bit(wbio-&gt;dev, op-&gt;devs_need_flush-&gt;d);</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;have_ioref) {</div><div class='del'>-		bch2_latency_acct(ca, wbio-&gt;submit_time, WRITE);</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;bounce)</div><div class='del'>-		bch2_bio_free_pages_pool(c, bio);</div><div class='del'>-</div><div class='del'>-	if (wbio-&gt;put_bio)</div><div class='del'>-		bio_put(bio);</div><div class='del'>-</div><div class='del'>-	if (parent)</div><div class='del'>-		bio_endio(&amp;parent-&gt;bio);</div><div class='del'>-	else</div><div class='del'>-		closure_put(cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_append_extent(struct bch_write_op *op,</div><div class='del'>-			       struct write_point *wp,</div><div class='del'>-			       struct bversion version,</div><div class='del'>-			       struct bch_extent_crc_unpacked crc)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_extent *e;</div><div class='del'>-</div><div class='del'>-	op-&gt;pos.offset += crc.uncompressed_size;</div><div class='del'>-</div><div class='del'>-	e = bkey_extent_init(op-&gt;insert_keys.top);</div><div class='del'>-	e-&gt;k.p		= op-&gt;pos;</div><div class='del'>-	e-&gt;k.size	= crc.uncompressed_size;</div><div class='del'>-	e-&gt;k.version	= version;</div><div class='del'>-</div><div class='del'>-	if (crc.csum_type ||</div><div class='del'>-	    crc.compression_type ||</div><div class='del'>-	    crc.nonce)</div><div class='del'>-		bch2_extent_crc_append(&amp;e-&gt;k_i, crc);</div><div class='del'>-</div><div class='del'>-	bch2_alloc_sectors_append_ptrs_inlined(op-&gt;c, wp, &amp;e-&gt;k_i, crc.compressed_size,</div><div class='del'>-				       op-&gt;flags &amp; BCH_WRITE_CACHED);</div><div class='del'>-</div><div class='del'>-	bch2_keylist_push(&amp;op-&gt;insert_keys);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bio *bch2_write_bio_alloc(struct bch_fs *c,</div><div class='del'>-					struct write_point *wp,</div><div class='del'>-					struct bio *src,</div><div class='del'>-					bool *page_alloc_failed,</div><div class='del'>-					void *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_write_bio *wbio;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	unsigned output_available =</div><div class='del'>-		min(wp-&gt;sectors_free &lt;&lt; 9, src-&gt;bi_iter.bi_size);</div><div class='del'>-	unsigned pages = DIV_ROUND_UP(output_available +</div><div class='del'>-				      (buf</div><div class='del'>-				       ? ((unsigned long) buf &amp; (PAGE_SIZE - 1))</div><div class='del'>-				       : 0), PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	pages = min(pages, BIO_MAX_VECS);</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(NULL, pages, 0,</div><div class='del'>-			       GFP_NOFS, &amp;c-&gt;bio_write);</div><div class='del'>-	wbio			= wbio_init(bio);</div><div class='del'>-	wbio-&gt;put_bio		= true;</div><div class='del'>-	/* copy WRITE_SYNC flag */</div><div class='del'>-	wbio-&gt;bio.bi_opf	= src-&gt;bi_opf;</div><div class='del'>-</div><div class='del'>-	if (buf) {</div><div class='del'>-		bch2_bio_map(bio, buf, output_available);</div><div class='del'>-		return bio;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wbio-&gt;bounce		= true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't use mempool for more than c-&gt;sb.encoded_extent_max</div><div class='del'>-	 * worth of pages, but we'd like to allocate more if we can:</div><div class='del'>-	 */</div><div class='del'>-	bch2_bio_alloc_pages_pool(c, bio,</div><div class='del'>-				  min_t(unsigned, output_available,</div><div class='del'>-					c-&gt;opts.encoded_extent_max));</div><div class='del'>-</div><div class='del'>-	if (bio-&gt;bi_iter.bi_size &lt; output_available)</div><div class='del'>-		*page_alloc_failed =</div><div class='del'>-			bch2_bio_alloc_pages(bio,</div><div class='del'>-					     output_available -</div><div class='del'>-					     bio-&gt;bi_iter.bi_size,</div><div class='del'>-					     GFP_NOFS) != 0;</div><div class='del'>-</div><div class='del'>-	return bio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_write_rechecksum(struct bch_fs *c,</div><div class='del'>-				 struct bch_write_op *op,</div><div class='del'>-				 unsigned new_csum_type)</div><div class='del'>-{</div><div class='del'>-	struct bio *bio = &amp;op-&gt;wbio.bio;</div><div class='del'>-	struct bch_extent_crc_unpacked new_crc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* bch2_rechecksum_bio() can't encrypt or decrypt data: */</div><div class='del'>-</div><div class='del'>-	if (bch2_csum_type_is_encryption(op-&gt;crc.csum_type) !=</div><div class='del'>-	    bch2_csum_type_is_encryption(new_csum_type))</div><div class='del'>-		new_csum_type = op-&gt;crc.csum_type;</div><div class='del'>-</div><div class='del'>-	ret = bch2_rechecksum_bio(c, bio, op-&gt;version, op-&gt;crc,</div><div class='del'>-				  NULL, &amp;new_crc,</div><div class='del'>-				  op-&gt;crc.offset, op-&gt;crc.live_size,</div><div class='del'>-				  new_csum_type);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bio_advance(bio, op-&gt;crc.offset &lt;&lt; 9);</div><div class='del'>-	bio-&gt;bi_iter.bi_size = op-&gt;crc.live_size &lt;&lt; 9;</div><div class='del'>-	op-&gt;crc = new_crc;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_write_decrypt(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct nonce nonce = extent_nonce(op-&gt;version, op-&gt;crc);</div><div class='del'>-	struct bch_csum csum;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_csum_type_is_encryption(op-&gt;crc.csum_type))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we need to decrypt data in the write path, we'll no longer be able</div><div class='del'>-	 * to verify the existing checksum (poly1305 mac, in this case) after</div><div class='del'>-	 * it's decrypted - this is the last point we'll be able to reverify the</div><div class='del'>-	 * checksum:</div><div class='del'>-	 */</div><div class='del'>-	csum = bch2_checksum_bio(c, op-&gt;crc.csum_type, nonce, &amp;op-&gt;wbio.bio);</div><div class='del'>-	if (bch2_crc_cmp(op-&gt;crc.csum, csum) &amp;&amp; !c-&gt;opts.no_data_io)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	ret = bch2_encrypt_bio(c, op-&gt;crc.csum_type, nonce, &amp;op-&gt;wbio.bio);</div><div class='del'>-	op-&gt;crc.csum_type = 0;</div><div class='del'>-	op-&gt;crc.csum = (struct bch_csum) { 0, 0 };</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum prep_encoded_ret {</div><div class='del'>-	PREP_ENCODED_OK,</div><div class='del'>-	PREP_ENCODED_ERR,</div><div class='del'>-	PREP_ENCODED_CHECKSUM_ERR,</div><div class='del'>-	PREP_ENCODED_DO_WRITE,</div><div class='del'>-} bch2_write_prep_encoded_data(struct bch_write_op *op, struct write_point *wp)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct bio *bio = &amp;op-&gt;wbio.bio;</div><div class='del'>-</div><div class='del'>-	if (!(op-&gt;flags &amp; BCH_WRITE_DATA_ENCODED))</div><div class='del'>-		return PREP_ENCODED_OK;</div><div class='del'>-</div><div class='del'>-	BUG_ON(bio_sectors(bio) != op-&gt;crc.compressed_size);</div><div class='del'>-</div><div class='del'>-	/* Can we just write the entire extent as is? */</div><div class='del'>-	if (op-&gt;crc.uncompressed_size == op-&gt;crc.live_size &amp;&amp;</div><div class='del'>-	    op-&gt;crc.uncompressed_size &lt;= c-&gt;opts.encoded_extent_max &gt;&gt; 9 &amp;&amp;</div><div class='del'>-	    op-&gt;crc.compressed_size &lt;= wp-&gt;sectors_free &amp;&amp;</div><div class='del'>-	    (op-&gt;crc.compression_type == bch2_compression_opt_to_type(op-&gt;compression_opt) ||</div><div class='del'>-	     op-&gt;incompressible)) {</div><div class='del'>-		if (!crc_is_compressed(op-&gt;crc) &amp;&amp;</div><div class='del'>-		    op-&gt;csum_type != op-&gt;crc.csum_type &amp;&amp;</div><div class='del'>-		    bch2_write_rechecksum(c, op, op-&gt;csum_type) &amp;&amp;</div><div class='del'>-		    !c-&gt;opts.no_data_io)</div><div class='del'>-			return PREP_ENCODED_CHECKSUM_ERR;</div><div class='del'>-</div><div class='del'>-		return PREP_ENCODED_DO_WRITE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the data is compressed and we couldn't write the entire extent as</div><div class='del'>-	 * is, we have to decompress it:</div><div class='del'>-	 */</div><div class='del'>-	if (crc_is_compressed(op-&gt;crc)) {</div><div class='del'>-		struct bch_csum csum;</div><div class='del'>-</div><div class='del'>-		if (bch2_write_decrypt(op))</div><div class='del'>-			return PREP_ENCODED_CHECKSUM_ERR;</div><div class='del'>-</div><div class='del'>-		/* Last point we can still verify checksum: */</div><div class='del'>-		csum = bch2_checksum_bio(c, op-&gt;crc.csum_type,</div><div class='del'>-					 extent_nonce(op-&gt;version, op-&gt;crc),</div><div class='del'>-					 bio);</div><div class='del'>-		if (bch2_crc_cmp(op-&gt;crc.csum, csum) &amp;&amp; !c-&gt;opts.no_data_io)</div><div class='del'>-			return PREP_ENCODED_CHECKSUM_ERR;</div><div class='del'>-</div><div class='del'>-		if (bch2_bio_uncompress_inplace(c, bio, &amp;op-&gt;crc))</div><div class='del'>-			return PREP_ENCODED_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No longer have compressed data after this point - data might be</div><div class='del'>-	 * encrypted:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the data is checksummed and we're only writing a subset,</div><div class='del'>-	 * rechecksum and adjust bio to point to currently live data:</div><div class='del'>-	 */</div><div class='del'>-	if ((op-&gt;crc.live_size != op-&gt;crc.uncompressed_size ||</div><div class='del'>-	     op-&gt;crc.csum_type != op-&gt;csum_type) &amp;&amp;</div><div class='del'>-	    bch2_write_rechecksum(c, op, op-&gt;csum_type) &amp;&amp;</div><div class='del'>-	    !c-&gt;opts.no_data_io)</div><div class='del'>-		return PREP_ENCODED_CHECKSUM_ERR;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we want to compress the data, it has to be decrypted:</div><div class='del'>-	 */</div><div class='del'>-	if ((op-&gt;compression_opt ||</div><div class='del'>-	     bch2_csum_type_is_encryption(op-&gt;crc.csum_type) !=</div><div class='del'>-	     bch2_csum_type_is_encryption(op-&gt;csum_type)) &amp;&amp;</div><div class='del'>-	    bch2_write_decrypt(op))</div><div class='del'>-		return PREP_ENCODED_CHECKSUM_ERR;</div><div class='del'>-</div><div class='del'>-	return PREP_ENCODED_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_write_extent(struct bch_write_op *op, struct write_point *wp,</div><div class='del'>-			     struct bio **_dst)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct bio *src = &amp;op-&gt;wbio.bio, *dst = src;</div><div class='del'>-	struct bvec_iter saved_iter;</div><div class='del'>-	void *ec_buf;</div><div class='del'>-	unsigned total_output = 0, total_input = 0;</div><div class='del'>-	bool bounce = false;</div><div class='del'>-	bool page_alloc_failed = false;</div><div class='del'>-	int ret, more = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bio_sectors(src));</div><div class='del'>-</div><div class='del'>-	ec_buf = bch2_writepoint_ec_buf(c, wp);</div><div class='del'>-</div><div class='del'>-	switch (bch2_write_prep_encoded_data(op, wp)) {</div><div class='del'>-	case PREP_ENCODED_OK:</div><div class='del'>-		break;</div><div class='del'>-	case PREP_ENCODED_ERR:</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	case PREP_ENCODED_CHECKSUM_ERR:</div><div class='del'>-		goto csum_err;</div><div class='del'>-	case PREP_ENCODED_DO_WRITE:</div><div class='del'>-		/* XXX look for bug here */</div><div class='del'>-		if (ec_buf) {</div><div class='del'>-			dst = bch2_write_bio_alloc(c, wp, src,</div><div class='del'>-						   &amp;page_alloc_failed,</div><div class='del'>-						   ec_buf);</div><div class='del'>-			bio_copy_data(dst, src);</div><div class='del'>-			bounce = true;</div><div class='del'>-		}</div><div class='del'>-		init_append_extent(op, wp, op-&gt;version, op-&gt;crc);</div><div class='del'>-		goto do_write;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ec_buf ||</div><div class='del'>-	    op-&gt;compression_opt ||</div><div class='del'>-	    (op-&gt;csum_type &amp;&amp;</div><div class='del'>-	     !(op-&gt;flags &amp; BCH_WRITE_PAGES_STABLE)) ||</div><div class='del'>-	    (bch2_csum_type_is_encryption(op-&gt;csum_type) &amp;&amp;</div><div class='del'>-	     !(op-&gt;flags &amp; BCH_WRITE_PAGES_OWNED))) {</div><div class='del'>-		dst = bch2_write_bio_alloc(c, wp, src,</div><div class='del'>-					   &amp;page_alloc_failed,</div><div class='del'>-					   ec_buf);</div><div class='del'>-		bounce = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	saved_iter = dst-&gt;bi_iter;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct bch_extent_crc_unpacked crc = { 0 };</div><div class='del'>-		struct bversion version = op-&gt;version;</div><div class='del'>-		size_t dst_len = 0, src_len = 0;</div><div class='del'>-</div><div class='del'>-		if (page_alloc_failed &amp;&amp;</div><div class='del'>-		    dst-&gt;bi_iter.bi_size  &lt; (wp-&gt;sectors_free &lt;&lt; 9) &amp;&amp;</div><div class='del'>-		    dst-&gt;bi_iter.bi_size &lt; c-&gt;opts.encoded_extent_max)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		BUG_ON(op-&gt;compression_opt &amp;&amp;</div><div class='del'>-		       (op-&gt;flags &amp; BCH_WRITE_DATA_ENCODED) &amp;&amp;</div><div class='del'>-		       bch2_csum_type_is_encryption(op-&gt;crc.csum_type));</div><div class='del'>-		BUG_ON(op-&gt;compression_opt &amp;&amp; !bounce);</div><div class='del'>-</div><div class='del'>-		crc.compression_type = op-&gt;incompressible</div><div class='del'>-			? BCH_COMPRESSION_TYPE_incompressible</div><div class='del'>-			: op-&gt;compression_opt</div><div class='del'>-			? bch2_bio_compress(c, dst, &amp;dst_len, src, &amp;src_len,</div><div class='del'>-					    op-&gt;compression_opt)</div><div class='del'>-			: 0;</div><div class='del'>-		if (!crc_is_compressed(crc)) {</div><div class='del'>-			dst_len = min(dst-&gt;bi_iter.bi_size, src-&gt;bi_iter.bi_size);</div><div class='del'>-			dst_len = min_t(unsigned, dst_len, wp-&gt;sectors_free &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			if (op-&gt;csum_type)</div><div class='del'>-				dst_len = min_t(unsigned, dst_len,</div><div class='del'>-						c-&gt;opts.encoded_extent_max);</div><div class='del'>-</div><div class='del'>-			if (bounce) {</div><div class='del'>-				swap(dst-&gt;bi_iter.bi_size, dst_len);</div><div class='del'>-				bio_copy_data(dst, src);</div><div class='del'>-				swap(dst-&gt;bi_iter.bi_size, dst_len);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			src_len = dst_len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		BUG_ON(!src_len || !dst_len);</div><div class='del'>-</div><div class='del'>-		if (bch2_csum_type_is_encryption(op-&gt;csum_type)) {</div><div class='del'>-			if (bversion_zero(version)) {</div><div class='del'>-				version.lo = atomic64_inc_return(&amp;c-&gt;key_version);</div><div class='del'>-			} else {</div><div class='del'>-				crc.nonce = op-&gt;nonce;</div><div class='del'>-				op-&gt;nonce += src_len &gt;&gt; 9;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((op-&gt;flags &amp; BCH_WRITE_DATA_ENCODED) &amp;&amp;</div><div class='del'>-		    !crc_is_compressed(crc) &amp;&amp;</div><div class='del'>-		    bch2_csum_type_is_encryption(op-&gt;crc.csum_type) ==</div><div class='del'>-		    bch2_csum_type_is_encryption(op-&gt;csum_type)) {</div><div class='del'>-			u8 compression_type = crc.compression_type;</div><div class='del'>-			u16 nonce = crc.nonce;</div><div class='del'>-			/*</div><div class='del'>-			 * Note: when we're using rechecksum(), we need to be</div><div class='del'>-			 * checksumming @src because it has all the data our</div><div class='del'>-			 * existing checksum covers - if we bounced (because we</div><div class='del'>-			 * were trying to compress), @dst will only have the</div><div class='del'>-			 * part of the data the new checksum will cover.</div><div class='del'>-			 *</div><div class='del'>-			 * But normally we want to be checksumming post bounce,</div><div class='del'>-			 * because part of the reason for bouncing is so the</div><div class='del'>-			 * data can't be modified (by userspace) while it's in</div><div class='del'>-			 * flight.</div><div class='del'>-			 */</div><div class='del'>-			if (bch2_rechecksum_bio(c, src, version, op-&gt;crc,</div><div class='del'>-					&amp;crc, &amp;op-&gt;crc,</div><div class='del'>-					src_len &gt;&gt; 9,</div><div class='del'>-					bio_sectors(src) - (src_len &gt;&gt; 9),</div><div class='del'>-					op-&gt;csum_type))</div><div class='del'>-				goto csum_err;</div><div class='del'>-			/*</div><div class='del'>-			 * rchecksum_bio sets compression_type on crc from op-&gt;crc,</div><div class='del'>-			 * this isn't always correct as sometimes we're changing</div><div class='del'>-			 * an extent from uncompressed to incompressible.</div><div class='del'>-			 */</div><div class='del'>-			crc.compression_type = compression_type;</div><div class='del'>-			crc.nonce = nonce;</div><div class='del'>-		} else {</div><div class='del'>-			if ((op-&gt;flags &amp; BCH_WRITE_DATA_ENCODED) &amp;&amp;</div><div class='del'>-			    bch2_rechecksum_bio(c, src, version, op-&gt;crc,</div><div class='del'>-					NULL, &amp;op-&gt;crc,</div><div class='del'>-					src_len &gt;&gt; 9,</div><div class='del'>-					bio_sectors(src) - (src_len &gt;&gt; 9),</div><div class='del'>-					op-&gt;crc.csum_type))</div><div class='del'>-				goto csum_err;</div><div class='del'>-</div><div class='del'>-			crc.compressed_size	= dst_len &gt;&gt; 9;</div><div class='del'>-			crc.uncompressed_size	= src_len &gt;&gt; 9;</div><div class='del'>-			crc.live_size		= src_len &gt;&gt; 9;</div><div class='del'>-</div><div class='del'>-			swap(dst-&gt;bi_iter.bi_size, dst_len);</div><div class='del'>-			ret = bch2_encrypt_bio(c, op-&gt;csum_type,</div><div class='del'>-					       extent_nonce(version, crc), dst);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			crc.csum = bch2_checksum_bio(c, op-&gt;csum_type,</div><div class='del'>-					 extent_nonce(version, crc), dst);</div><div class='del'>-			crc.csum_type = op-&gt;csum_type;</div><div class='del'>-			swap(dst-&gt;bi_iter.bi_size, dst_len);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		init_append_extent(op, wp, version, crc);</div><div class='del'>-</div><div class='del'>-		if (dst != src)</div><div class='del'>-			bio_advance(dst, dst_len);</div><div class='del'>-		bio_advance(src, src_len);</div><div class='del'>-		total_output	+= dst_len;</div><div class='del'>-		total_input	+= src_len;</div><div class='del'>-	} while (dst-&gt;bi_iter.bi_size &amp;&amp;</div><div class='del'>-		 src-&gt;bi_iter.bi_size &amp;&amp;</div><div class='del'>-		 wp-&gt;sectors_free &amp;&amp;</div><div class='del'>-		 !bch2_keylist_realloc(&amp;op-&gt;insert_keys,</div><div class='del'>-				      op-&gt;inline_keys,</div><div class='del'>-				      ARRAY_SIZE(op-&gt;inline_keys),</div><div class='del'>-				      BKEY_EXTENT_U64s_MAX));</div><div class='del'>-</div><div class='del'>-	more = src-&gt;bi_iter.bi_size != 0;</div><div class='del'>-</div><div class='del'>-	dst-&gt;bi_iter = saved_iter;</div><div class='del'>-</div><div class='del'>-	if (dst == src &amp;&amp; more) {</div><div class='del'>-		BUG_ON(total_output != total_input);</div><div class='del'>-</div><div class='del'>-		dst = bio_split(src, total_input &gt;&gt; 9,</div><div class='del'>-				GFP_NOFS, &amp;c-&gt;bio_write);</div><div class='del'>-		wbio_init(dst)-&gt;put_bio	= true;</div><div class='del'>-		/* copy WRITE_SYNC flag */</div><div class='del'>-		dst-&gt;bi_opf		= src-&gt;bi_opf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dst-&gt;bi_iter.bi_size = total_output;</div><div class='del'>-do_write:</div><div class='del'>-	*_dst = dst;</div><div class='del'>-	return more;</div><div class='del'>-csum_err:</div><div class='del'>-	bch_err(c, "error verifying existing checksum while rewriting existing data (memory corruption?)");</div><div class='del'>-	ret = -EIO;</div><div class='del'>-err:</div><div class='del'>-	if (to_wbio(dst)-&gt;bounce)</div><div class='del'>-		bch2_bio_free_pages_pool(c, dst);</div><div class='del'>-	if (to_wbio(dst)-&gt;put_bio)</div><div class='del'>-		bio_put(dst);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_extent_is_writeable(struct bch_write_op *op,</div><div class='del'>-				     struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct bkey_s_c_extent e;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	unsigned replicas = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_extent)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	e = bkey_s_c_to_extent(k);</div><div class='del'>-	extent_for_each_ptr_decode(e, p, entry) {</div><div class='del'>-		if (crc_is_encoded(p.crc) || p.has_ec)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		replicas += bch2_extent_ptr_durability(c, &amp;p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return replicas &gt;= op-&gt;opts.data_replicas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_nocow_write_unlock(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-</div><div class='del'>-	for_each_keylist_key(&amp;op-&gt;insert_keys, k) {</div><div class='del'>-		struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(k));</div><div class='del'>-</div><div class='del'>-		bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-			bch2_bucket_nocow_unlock(&amp;c-&gt;nocow_locks,</div><div class='del'>-						 PTR_BUCKET_POS(c, ptr),</div><div class='del'>-						 BUCKET_NOCOW_LOCK_UPDATE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_nocow_write_convert_one_unwritten(struct btree_trans *trans,</div><div class='del'>-						  struct btree_iter *iter,</div><div class='del'>-						  struct bkey_i *orig,</div><div class='del'>-						  struct bkey_s_c k,</div><div class='del'>-						  u64 new_i_size)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_extents_match(bkey_i_to_s_c(orig), k)) {</div><div class='del'>-		/* trace this */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	struct bkey_i *new = bch2_bkey_make_mut_noupdate(trans, k);</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(new);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_cut_front(bkey_start_pos(&amp;orig-&gt;k), new);</div><div class='del'>-	bch2_cut_back(orig-&gt;k.p, new);</div><div class='del'>-</div><div class='del'>-	struct bkey_ptrs ptrs = bch2_bkey_ptrs(bkey_i_to_s(new));</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr)</div><div class='del'>-		ptr-&gt;unwritten = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note that we're not calling bch2_subvol_get_snapshot() in this path -</div><div class='del'>-	 * that was done when we kicked off the write, and here it's important</div><div class='del'>-	 * that we update the extent that we wrote to - even if a snapshot has</div><div class='del'>-	 * since been created. The write is still outstanding, so we're ok</div><div class='del'>-	 * w.r.t. snapshot atomicity:</div><div class='del'>-	 */</div><div class='del'>-	return  bch2_extent_update_i_size_sectors(trans, iter,</div><div class='del'>-					min(new-&gt;k.p.offset &lt;&lt; 9, new_i_size), 0) ?:</div><div class='del'>-		bch2_trans_update(trans, iter, new,</div><div class='del'>-				  BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_nocow_write_convert_unwritten(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	for_each_keylist_key(&amp;op-&gt;insert_keys, orig) {</div><div class='del'>-		int ret = for_each_btree_key_upto_commit(trans, iter, BTREE_ID_extents,</div><div class='del'>-				     bkey_start_pos(&amp;orig-&gt;k), orig-&gt;k.p,</div><div class='del'>-				     BTREE_ITER_INTENT, k,</div><div class='del'>-				     NULL, NULL, BCH_TRANS_COMMIT_no_enospc, ({</div><div class='del'>-			bch2_nocow_write_convert_one_unwritten(trans, &amp;iter, orig, k, op-&gt;new_i_size);</div><div class='del'>-		}));</div><div class='del'>-</div><div class='del'>-		if (ret &amp;&amp; !bch2_err_matches(ret, EROFS)) {</div><div class='del'>-			struct bkey_i *insert = bch2_keylist_front(&amp;op-&gt;insert_keys);</div><div class='del'>-</div><div class='del'>-			bch_err_inum_offset_ratelimited(c,</div><div class='del'>-				insert-&gt;k.p.inode, insert-&gt;k.p.offset &lt;&lt; 9,</div><div class='del'>-				"write error while doing btree update: %s",</div><div class='del'>-				bch2_err_str(ret));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret) {</div><div class='del'>-			op-&gt;error = ret;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_nocow_write_done(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	bch2_nocow_write_unlock(op);</div><div class='del'>-</div><div class='del'>-	if (unlikely(op-&gt;flags &amp; BCH_WRITE_IO_ERROR)) {</div><div class='del'>-		op-&gt;error = -EIO;</div><div class='del'>-	} else if (unlikely(op-&gt;flags &amp; BCH_WRITE_CONVERT_UNWRITTEN))</div><div class='del'>-		bch2_nocow_write_convert_unwritten(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(bch2_nocow_write_done)</div><div class='del'>-{</div><div class='del'>-	closure_type(op, struct bch_write_op, cl);</div><div class='del'>-</div><div class='del'>-	__bch2_nocow_write_done(op);</div><div class='del'>-	bch2_write_done(cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bucket_to_lock {</div><div class='del'>-	struct bpos		b;</div><div class='del'>-	unsigned		gen;</div><div class='del'>-	struct nocow_lock_bucket *l;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_nocow_write(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	DARRAY_PREALLOCATED(struct bucket_to_lock, 3) buckets;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	struct bucket_to_lock *stale_at;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (op-&gt;flags &amp; BCH_WRITE_MOVE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	darray_init(&amp;buckets);</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, op-&gt;subvol, &amp;snapshot);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     SPOS(op-&gt;pos.inode, op-&gt;pos.offset, snapshot),</div><div class='del'>-			     BTREE_ITER_SLOTS);</div><div class='del'>-	while (1) {</div><div class='del'>-		struct bio *bio = &amp;op-&gt;wbio.bio;</div><div class='del'>-</div><div class='del'>-		buckets.nr = 0;</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* fall back to normal cow write path? */</div><div class='del'>-		if (unlikely(k.k-&gt;p.snapshot != snapshot ||</div><div class='del'>-			     !bch2_extent_is_writeable(op, k)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bch2_keylist_realloc(&amp;op-&gt;insert_keys,</div><div class='del'>-					 op-&gt;inline_keys,</div><div class='del'>-					 ARRAY_SIZE(op-&gt;inline_keys),</div><div class='del'>-					 k.k-&gt;u64s))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Get iorefs before dropping btree locks: */</div><div class='del'>-		struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-		bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-			struct bpos b = PTR_BUCKET_POS(c, ptr);</div><div class='del'>-			struct nocow_lock_bucket *l =</div><div class='del'>-				bucket_nocow_lock(&amp;c-&gt;nocow_locks, bucket_to_u64(b));</div><div class='del'>-			prefetch(l);</div><div class='del'>-</div><div class='del'>-			if (unlikely(!bch2_dev_get_ioref(bch_dev_bkey_exists(c, ptr-&gt;dev), WRITE)))</div><div class='del'>-				goto err_get_ioref;</div><div class='del'>-</div><div class='del'>-			/* XXX allocating memory with btree locks held - rare */</div><div class='del'>-			darray_push_gfp(&amp;buckets, ((struct bucket_to_lock) {</div><div class='del'>-						   .b = b, .gen = ptr-&gt;gen, .l = l,</div><div class='del'>-						   }), GFP_KERNEL|__GFP_NOFAIL);</div><div class='del'>-</div><div class='del'>-			if (ptr-&gt;unwritten)</div><div class='del'>-				op-&gt;flags |= BCH_WRITE_CONVERT_UNWRITTEN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Unlock before taking nocow locks, doing IO: */</div><div class='del'>-		bkey_reassemble(op-&gt;insert_keys.top, k);</div><div class='del'>-		bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-		bch2_cut_front(op-&gt;pos, op-&gt;insert_keys.top);</div><div class='del'>-		if (op-&gt;flags &amp; BCH_WRITE_CONVERT_UNWRITTEN)</div><div class='del'>-			bch2_cut_back(POS(op-&gt;pos.inode, op-&gt;pos.offset + bio_sectors(bio)), op-&gt;insert_keys.top);</div><div class='del'>-</div><div class='del'>-		darray_for_each(buckets, i) {</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, i-&gt;b.inode);</div><div class='del'>-</div><div class='del'>-			__bch2_bucket_nocow_lock(&amp;c-&gt;nocow_locks, i-&gt;l,</div><div class='del'>-						 bucket_to_u64(i-&gt;b),</div><div class='del'>-						 BUCKET_NOCOW_LOCK_UPDATE);</div><div class='del'>-</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			bool stale = gen_after(*bucket_gen(ca, i-&gt;b.offset), i-&gt;gen);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			if (unlikely(stale)) {</div><div class='del'>-				stale_at = i;</div><div class='del'>-				goto err_bucket_stale;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bio = &amp;op-&gt;wbio.bio;</div><div class='del'>-		if (k.k-&gt;p.offset &lt; op-&gt;pos.offset + bio_sectors(bio)) {</div><div class='del'>-			bio = bio_split(bio, k.k-&gt;p.offset - op-&gt;pos.offset,</div><div class='del'>-					GFP_KERNEL, &amp;c-&gt;bio_write);</div><div class='del'>-			wbio_init(bio)-&gt;put_bio = true;</div><div class='del'>-			bio-&gt;bi_opf = op-&gt;wbio.bio.bi_opf;</div><div class='del'>-		} else {</div><div class='del'>-			op-&gt;flags |= BCH_WRITE_DONE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		op-&gt;pos.offset += bio_sectors(bio);</div><div class='del'>-		op-&gt;written += bio_sectors(bio);</div><div class='del'>-</div><div class='del'>-		bio-&gt;bi_end_io	= bch2_write_endio;</div><div class='del'>-		bio-&gt;bi_private	= &amp;op-&gt;cl;</div><div class='del'>-		bio-&gt;bi_opf |= REQ_OP_WRITE;</div><div class='del'>-		closure_get(&amp;op-&gt;cl);</div><div class='del'>-		bch2_submit_wbio_replicas(to_wbio(bio), c, BCH_DATA_user,</div><div class='del'>-					  op-&gt;insert_keys.top, true);</div><div class='del'>-</div><div class='del'>-		bch2_keylist_push(&amp;op-&gt;insert_keys);</div><div class='del'>-		if (op-&gt;flags &amp; BCH_WRITE_DONE)</div><div class='del'>-			break;</div><div class='del'>-		bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err_inum_offset_ratelimited(c,</div><div class='del'>-			op-&gt;pos.inode, op-&gt;pos.offset &lt;&lt; 9,</div><div class='del'>-			"%s: btree lookup error %s", __func__, bch2_err_str(ret));</div><div class='del'>-		op-&gt;error = ret;</div><div class='del'>-		op-&gt;flags |= BCH_WRITE_DONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	darray_exit(&amp;buckets);</div><div class='del'>-</div><div class='del'>-	/* fallback to cow write path? */</div><div class='del'>-	if (!(op-&gt;flags &amp; BCH_WRITE_DONE)) {</div><div class='del'>-		closure_sync(&amp;op-&gt;cl);</div><div class='del'>-		__bch2_nocow_write_done(op);</div><div class='del'>-		op-&gt;insert_keys.top = op-&gt;insert_keys.keys;</div><div class='del'>-	} else if (op-&gt;flags &amp; BCH_WRITE_SYNC) {</div><div class='del'>-		closure_sync(&amp;op-&gt;cl);</div><div class='del'>-		bch2_nocow_write_done(&amp;op-&gt;cl.work);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * XXX</div><div class='del'>-		 * needs to run out of process context because ei_quota_lock is</div><div class='del'>-		 * a mutex</div><div class='del'>-		 */</div><div class='del'>-		continue_at(&amp;op-&gt;cl, bch2_nocow_write_done, index_update_wq(op));</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-err_get_ioref:</div><div class='del'>-	darray_for_each(buckets, i)</div><div class='del'>-		percpu_ref_put(&amp;bch_dev_bkey_exists(c, i-&gt;b.inode)-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-	/* Fall back to COW path: */</div><div class='del'>-	goto out;</div><div class='del'>-err_bucket_stale:</div><div class='del'>-	darray_for_each(buckets, i) {</div><div class='del'>-		bch2_bucket_nocow_unlock(&amp;c-&gt;nocow_locks, i-&gt;b, BUCKET_NOCOW_LOCK_UPDATE);</div><div class='del'>-		if (i == stale_at)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We can retry this: */</div><div class='del'>-	ret = -BCH_ERR_transaction_restart;</div><div class='del'>-	goto err_get_ioref;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_write(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	struct write_point *wp = NULL;</div><div class='del'>-	struct bio *bio = NULL;</div><div class='del'>-	unsigned nofs_flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	nofs_flags = memalloc_nofs_save();</div><div class='del'>-</div><div class='del'>-	if (unlikely(op-&gt;opts.nocow &amp;&amp; c-&gt;opts.nocow_enabled)) {</div><div class='del'>-		bch2_nocow_write(op);</div><div class='del'>-		if (op-&gt;flags &amp; BCH_WRITE_DONE)</div><div class='del'>-			goto out_nofs_restore;</div><div class='del'>-	}</div><div class='del'>-again:</div><div class='del'>-	memset(&amp;op-&gt;failed, 0, sizeof(op-&gt;failed));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct bkey_i *key_to_write;</div><div class='del'>-		unsigned key_to_write_offset = op-&gt;insert_keys.top_p -</div><div class='del'>-			op-&gt;insert_keys.keys_p;</div><div class='del'>-</div><div class='del'>-		/* +1 for possible cache device: */</div><div class='del'>-		if (op-&gt;open_buckets.nr + op-&gt;nr_replicas + 1 &gt;</div><div class='del'>-		    ARRAY_SIZE(op-&gt;open_buckets.v))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bch2_keylist_realloc(&amp;op-&gt;insert_keys,</div><div class='del'>-					op-&gt;inline_keys,</div><div class='del'>-					ARRAY_SIZE(op-&gt;inline_keys),</div><div class='del'>-					BKEY_EXTENT_U64s_MAX))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The copygc thread is now global, which means it's no longer</div><div class='del'>-		 * freeing up space on specific disks, which means that</div><div class='del'>-		 * allocations for specific disks may hang arbitrarily long:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-			bch2_alloc_sectors_start_trans(trans,</div><div class='del'>-				op-&gt;target,</div><div class='del'>-				op-&gt;opts.erasure_code &amp;&amp; !(op-&gt;flags &amp; BCH_WRITE_CACHED),</div><div class='del'>-				op-&gt;write_point,</div><div class='del'>-				&amp;op-&gt;devs_have,</div><div class='del'>-				op-&gt;nr_replicas,</div><div class='del'>-				op-&gt;nr_replicas_required,</div><div class='del'>-				op-&gt;watermark,</div><div class='del'>-				op-&gt;flags,</div><div class='del'>-				(op-&gt;flags &amp; (BCH_WRITE_ALLOC_NOWAIT|</div><div class='del'>-					      BCH_WRITE_ONLY_SPECIFIED_DEVS))</div><div class='del'>-				? NULL : &amp;op-&gt;cl, &amp;wp));</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_operation_blocked))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		EBUG_ON(!wp);</div><div class='del'>-</div><div class='del'>-		bch2_open_bucket_get(c, wp, &amp;op-&gt;open_buckets);</div><div class='del'>-		ret = bch2_write_extent(op, wp, &amp;bio);</div><div class='del'>-</div><div class='del'>-		bch2_alloc_sectors_done_inlined(c, wp);</div><div class='del'>-err:</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='del'>-			op-&gt;flags |= BCH_WRITE_DONE;</div><div class='del'>-</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				if (!(op-&gt;flags &amp; BCH_WRITE_ALLOC_NOWAIT))</div><div class='del'>-					bch_err_inum_offset_ratelimited(c,</div><div class='del'>-						op-&gt;pos.inode,</div><div class='del'>-						op-&gt;pos.offset &lt;&lt; 9,</div><div class='del'>-						"%s(): error: %s", __func__, bch2_err_str(ret));</div><div class='del'>-				op-&gt;error = ret;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bio-&gt;bi_end_io	= bch2_write_endio;</div><div class='del'>-		bio-&gt;bi_private	= &amp;op-&gt;cl;</div><div class='del'>-		bio-&gt;bi_opf |= REQ_OP_WRITE;</div><div class='del'>-</div><div class='del'>-		closure_get(bio-&gt;bi_private);</div><div class='del'>-</div><div class='del'>-		key_to_write = (void *) (op-&gt;insert_keys.keys_p +</div><div class='del'>-					 key_to_write_offset);</div><div class='del'>-</div><div class='del'>-		bch2_submit_wbio_replicas(to_wbio(bio), c, BCH_DATA_user,</div><div class='del'>-					  key_to_write, false);</div><div class='del'>-	} while (ret);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sync or no?</div><div class='del'>-	 *</div><div class='del'>-	 * If we're running asynchronously, wne may still want to block</div><div class='del'>-	 * synchronously here if we weren't able to submit all of the IO at</div><div class='del'>-	 * once, as that signals backpressure to the caller.</div><div class='del'>-	 */</div><div class='del'>-	if ((op-&gt;flags &amp; BCH_WRITE_SYNC) ||</div><div class='del'>-	    (!(op-&gt;flags &amp; BCH_WRITE_DONE) &amp;&amp;</div><div class='del'>-	     !(op-&gt;flags &amp; BCH_WRITE_IN_WORKER))) {</div><div class='del'>-		closure_sync(&amp;op-&gt;cl);</div><div class='del'>-		__bch2_write_index(op);</div><div class='del'>-</div><div class='del'>-		if (!(op-&gt;flags &amp; BCH_WRITE_DONE))</div><div class='del'>-			goto again;</div><div class='del'>-		bch2_write_done(&amp;op-&gt;cl);</div><div class='del'>-	} else {</div><div class='del'>-		bch2_write_queue(op, wp);</div><div class='del'>-		continue_at(&amp;op-&gt;cl, bch2_write_index, NULL);</div><div class='del'>-	}</div><div class='del'>-out_nofs_restore:</div><div class='del'>-	memalloc_nofs_restore(nofs_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_write_data_inline(struct bch_write_op *op, unsigned data_len)</div><div class='del'>-{</div><div class='del'>-	struct bio *bio = &amp;op-&gt;wbio.bio;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-	struct bkey_i_inline_data *id;</div><div class='del'>-	unsigned sectors;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	op-&gt;flags |= BCH_WRITE_WROTE_DATA_INLINE;</div><div class='del'>-	op-&gt;flags |= BCH_WRITE_DONE;</div><div class='del'>-</div><div class='del'>-	bch2_check_set_feature(op-&gt;c, BCH_FEATURE_inline_data);</div><div class='del'>-</div><div class='del'>-	ret = bch2_keylist_realloc(&amp;op-&gt;insert_keys, op-&gt;inline_keys,</div><div class='del'>-				   ARRAY_SIZE(op-&gt;inline_keys),</div><div class='del'>-				   BKEY_U64s + DIV_ROUND_UP(data_len, 8));</div><div class='del'>-	if (ret) {</div><div class='del'>-		op-&gt;error = ret;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sectors = bio_sectors(bio);</div><div class='del'>-	op-&gt;pos.offset += sectors;</div><div class='del'>-</div><div class='del'>-	id = bkey_inline_data_init(op-&gt;insert_keys.top);</div><div class='del'>-	id-&gt;k.p		= op-&gt;pos;</div><div class='del'>-	id-&gt;k.version	= op-&gt;version;</div><div class='del'>-	id-&gt;k.size	= sectors;</div><div class='del'>-</div><div class='del'>-	iter = bio-&gt;bi_iter;</div><div class='del'>-	iter.bi_size = data_len;</div><div class='del'>-	memcpy_from_bio(id-&gt;v.data, bio, iter);</div><div class='del'>-</div><div class='del'>-	while (data_len &amp; 7)</div><div class='del'>-		id-&gt;v.data[data_len++] = '\0';</div><div class='del'>-	set_bkey_val_bytes(&amp;id-&gt;k, data_len);</div><div class='del'>-	bch2_keylist_push(&amp;op-&gt;insert_keys);</div><div class='del'>-</div><div class='del'>-	__bch2_write_index(op);</div><div class='del'>-err:</div><div class='del'>-	bch2_write_done(&amp;op-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_write() - handle a write to a cache device or flash only volume</div><div class='del'>- * @cl:		&amp;bch_write_op-&gt;cl</div><div class='del'>- *</div><div class='del'>- * This is the starting point for any data to end up in a cache device; it could</div><div class='del'>- * be from a normal write, or a writeback write, or a write to a flash only</div><div class='del'>- * volume - it's also used by the moving garbage collector to compact data in</div><div class='del'>- * mostly empty buckets.</div><div class='del'>- *</div><div class='del'>- * It first writes the data to the cache, creating a list of keys to be inserted</div><div class='del'>- * (if the data won't fit in a single open bucket, there will be multiple keys);</div><div class='del'>- * after the data is written it calls bch_journal, and after the keys have been</div><div class='del'>- * added to the next journal write they're inserted into the btree.</div><div class='del'>- *</div><div class='del'>- * If op-&gt;discard is true, instead of inserting the data it invalidates the</div><div class='del'>- * region of the cache represented by op-&gt;bio and op-&gt;inode.</div><div class='del'>- */</div><div class='del'>-CLOSURE_CALLBACK(bch2_write)</div><div class='del'>-{</div><div class='del'>-	closure_type(op, struct bch_write_op, cl);</div><div class='del'>-	struct bio *bio = &amp;op-&gt;wbio.bio;</div><div class='del'>-	struct bch_fs *c = op-&gt;c;</div><div class='del'>-	unsigned data_len;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(op-&gt;cl.parent);</div><div class='del'>-	BUG_ON(!op-&gt;nr_replicas);</div><div class='del'>-	BUG_ON(!op-&gt;write_point.v);</div><div class='del'>-	BUG_ON(bkey_eq(op-&gt;pos, POS_MAX));</div><div class='del'>-</div><div class='del'>-	op-&gt;start_time = local_clock();</div><div class='del'>-	bch2_keylist_init(&amp;op-&gt;insert_keys, op-&gt;inline_keys);</div><div class='del'>-	wbio_init(bio)-&gt;put_bio = false;</div><div class='del'>-</div><div class='del'>-	if (bio-&gt;bi_iter.bi_size &amp; (c-&gt;opts.block_size - 1)) {</div><div class='del'>-		bch_err_inum_offset_ratelimited(c,</div><div class='del'>-			op-&gt;pos.inode,</div><div class='del'>-			op-&gt;pos.offset &lt;&lt; 9,</div><div class='del'>-			"misaligned write");</div><div class='del'>-		op-&gt;error = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges) {</div><div class='del'>-		op-&gt;error = -BCH_ERR_erofs_no_writes;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(op-&gt;flags &amp; BCH_WRITE_MOVE) &amp;&amp;</div><div class='del'>-	    !bch2_write_ref_tryget(c, BCH_WRITE_REF_write)) {</div><div class='del'>-		op-&gt;error = -BCH_ERR_erofs_no_writes;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	this_cpu_add(c-&gt;counters[BCH_COUNTER_io_write], bio_sectors(bio));</div><div class='del'>-	bch2_increment_clock(c, bio_sectors(bio), WRITE);</div><div class='del'>-</div><div class='del'>-	data_len = min_t(u64, bio-&gt;bi_iter.bi_size,</div><div class='del'>-			 op-&gt;new_i_size - (op-&gt;pos.offset &lt;&lt; 9));</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.inline_data &amp;&amp;</div><div class='del'>-	    data_len &lt;= min(block_bytes(c) / 2, 1024U)) {</div><div class='del'>-		bch2_write_data_inline(op, data_len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_write(op);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	bch2_disk_reservation_put(c, &amp;op-&gt;res);</div><div class='del'>-</div><div class='del'>-	closure_debug_destroy(&amp;op-&gt;cl);</div><div class='del'>-	if (op-&gt;end_io)</div><div class='del'>-		op-&gt;end_io(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char * const bch2_write_flags[] = {</div><div class='del'>-#define x(f)	#f,</div><div class='del'>-	BCH_WRITE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_write_op_to_text(struct printbuf *out, struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	prt_str(out, "pos: ");</div><div class='del'>-	bch2_bpos_to_text(out, op-&gt;pos);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "started: ");</div><div class='del'>-	bch2_pr_time_units(out, local_clock() - op-&gt;start_time);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "flags: ");</div><div class='del'>-	prt_bitflags(out, bch2_write_flags, op-&gt;flags);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "ref: %u", closure_nr_remaining(&amp;op-&gt;cl));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_io_write_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	mempool_exit(&amp;c-&gt;bio_bounce_pages);</div><div class='del'>-	bioset_exit(&amp;c-&gt;bio_write);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_io_write_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bioset_init(&amp;c-&gt;bio_write, 1, offsetof(struct bch_write_bio, bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		return -BCH_ERR_ENOMEM_bio_write_init;</div><div class='del'>-</div><div class='del'>-	if (mempool_init_page_pool(&amp;c-&gt;bio_bounce_pages,</div><div class='del'>-				   max_t(unsigned,</div><div class='del'>-					 c-&gt;opts.btree_node_size,</div><div class='del'>-					 c-&gt;opts.encoded_extent_max) /</div><div class='del'>-				   PAGE_SIZE, 0))</div><div class='del'>-		return -BCH_ERR_ENOMEM_bio_bounce_pages_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/io_write.h b/fs/bcachefs/io_write.h<br/>deleted file mode 100644<br/>index 6c276a48f95d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_write.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_write.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_IO_WRITE_H</div><div class='del'>-#define _BCACHEFS_IO_WRITE_H</div><div class='del'>-</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "io_write_types.h"</div><div class='del'>-</div><div class='del'>-#define to_wbio(_bio)			\</div><div class='del'>-	container_of((_bio), struct bch_write_bio, bio)</div><div class='del'>-</div><div class='del'>-void bch2_bio_free_pages_pool(struct bch_fs *, struct bio *);</div><div class='del'>-void bch2_bio_alloc_pages_pool(struct bch_fs *, struct bio *, size_t);</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-void bch2_latency_acct(struct bch_dev *, u64, int);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_submit_wbio_replicas(struct bch_write_bio *, struct bch_fs *,</div><div class='del'>-			       enum bch_data_type, const struct bkey_i *, bool);</div><div class='del'>-</div><div class='del'>-#define BCH_WRITE_FLAGS()		\</div><div class='del'>-	x(ALLOC_NOWAIT)			\</div><div class='del'>-	x(CACHED)			\</div><div class='del'>-	x(DATA_ENCODED)			\</div><div class='del'>-	x(PAGES_STABLE)			\</div><div class='del'>-	x(PAGES_OWNED)			\</div><div class='del'>-	x(ONLY_SPECIFIED_DEVS)		\</div><div class='del'>-	x(WROTE_DATA_INLINE)		\</div><div class='del'>-	x(FROM_INTERNAL)		\</div><div class='del'>-	x(CHECK_ENOSPC)			\</div><div class='del'>-	x(SYNC)				\</div><div class='del'>-	x(MOVE)				\</div><div class='del'>-	x(IN_WORKER)			\</div><div class='del'>-	x(DONE)				\</div><div class='del'>-	x(IO_ERROR)			\</div><div class='del'>-	x(CONVERT_UNWRITTEN)</div><div class='del'>-</div><div class='del'>-enum __bch_write_flags {</div><div class='del'>-#define x(f)	__BCH_WRITE_##f,</div><div class='del'>-	BCH_WRITE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum bch_write_flags {</div><div class='del'>-#define x(f)	BCH_WRITE_##f = BIT(__BCH_WRITE_##f),</div><div class='del'>-	BCH_WRITE_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct workqueue_struct *index_update_wq(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	return op-&gt;watermark == BCH_WATERMARK_copygc</div><div class='del'>-		? op-&gt;c-&gt;copygc_wq</div><div class='del'>-		: op-&gt;c-&gt;btree_update_wq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sum_sector_overwrites(struct btree_trans *, struct btree_iter *,</div><div class='del'>-			       struct bkey_i *, bool *, s64 *, s64 *);</div><div class='del'>-int bch2_extent_update(struct btree_trans *, subvol_inum,</div><div class='del'>-		       struct btree_iter *, struct bkey_i *,</div><div class='del'>-		       struct disk_reservation *, u64, s64 *, bool);</div><div class='del'>-</div><div class='del'>-static inline void bch2_write_op_init(struct bch_write_op *op, struct bch_fs *c,</div><div class='del'>-				      struct bch_io_opts opts)</div><div class='del'>-{</div><div class='del'>-	op-&gt;c			= c;</div><div class='del'>-	op-&gt;end_io		= NULL;</div><div class='del'>-	op-&gt;flags		= 0;</div><div class='del'>-	op-&gt;written		= 0;</div><div class='del'>-	op-&gt;error		= 0;</div><div class='del'>-	op-&gt;csum_type		= bch2_data_checksum_type(c, opts);</div><div class='del'>-	op-&gt;compression_opt	= opts.compression;</div><div class='del'>-	op-&gt;nr_replicas		= 0;</div><div class='del'>-	op-&gt;nr_replicas_required = c-&gt;opts.data_replicas_required;</div><div class='del'>-	op-&gt;watermark		= BCH_WATERMARK_normal;</div><div class='del'>-	op-&gt;incompressible	= 0;</div><div class='del'>-	op-&gt;open_buckets.nr	= 0;</div><div class='del'>-	op-&gt;devs_have.nr	= 0;</div><div class='del'>-	op-&gt;target		= 0;</div><div class='del'>-	op-&gt;opts		= opts;</div><div class='del'>-	op-&gt;subvol		= 0;</div><div class='del'>-	op-&gt;pos			= POS_MAX;</div><div class='del'>-	op-&gt;version		= ZERO_VERSION;</div><div class='del'>-	op-&gt;write_point		= (struct write_point_specifier) { 0 };</div><div class='del'>-	op-&gt;res			= (struct disk_reservation) { 0 };</div><div class='del'>-	op-&gt;new_i_size		= U64_MAX;</div><div class='del'>-	op-&gt;i_sectors_delta	= 0;</div><div class='del'>-	op-&gt;devs_need_flush	= NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CLOSURE_CALLBACK(bch2_write);</div><div class='del'>-void bch2_write_point_do_index_updates(struct work_struct *);</div><div class='del'>-</div><div class='del'>-static inline struct bch_write_bio *wbio_init(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bch_write_bio *wbio = to_wbio(bio);</div><div class='del'>-</div><div class='del'>-	memset(&amp;wbio-&gt;wbio, 0, sizeof(wbio-&gt;wbio));</div><div class='del'>-	return wbio;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_write_op_to_text(struct printbuf *, struct bch_write_op *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_io_write_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_io_write_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_IO_WRITE_H */</div><div class='head'>diff --git a/fs/bcachefs/io_write_types.h b/fs/bcachefs/io_write_types.h<br/>deleted file mode 100644<br/>index c7f97c2c4805..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/io_write_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/io_write_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_IO_WRITE_TYPES_H</div><div class='del'>-#define _BCACHEFS_IO_WRITE_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "alloc_types.h"</div><div class='del'>-#include "btree_types.h"</div><div class='del'>-#include "buckets_types.h"</div><div class='del'>-#include "extents_types.h"</div><div class='del'>-#include "keylist_types.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "super_types.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/llist.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-struct bch_write_bio {</div><div class='del'>-	struct_group(wbio,</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	struct bch_write_bio	*parent;</div><div class='del'>-</div><div class='del'>-	u64			submit_time;</div><div class='del'>-	u64			inode_offset;</div><div class='del'>-</div><div class='del'>-	struct bch_devs_list	failed;</div><div class='del'>-	u8			dev;</div><div class='del'>-</div><div class='del'>-	unsigned		split:1,</div><div class='del'>-				bounce:1,</div><div class='del'>-				put_bio:1,</div><div class='del'>-				have_ioref:1,</div><div class='del'>-				nocow:1,</div><div class='del'>-				used_mempool:1,</div><div class='del'>-				first_btree_write:1;</div><div class='del'>-	);</div><div class='del'>-</div><div class='del'>-	struct bio		bio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_write_op {</div><div class='del'>-	struct closure		cl;</div><div class='del'>-	struct bch_fs		*c;</div><div class='del'>-	void			(*end_io)(struct bch_write_op *);</div><div class='del'>-	u64			start_time;</div><div class='del'>-</div><div class='del'>-	unsigned		written; /* sectors */</div><div class='del'>-	u16			flags;</div><div class='del'>-	s16			error; /* dio write path expects it to hold -ERESTARTSYS... */</div><div class='del'>-</div><div class='del'>-	unsigned		compression_opt:8;</div><div class='del'>-	unsigned		csum_type:4;</div><div class='del'>-	unsigned		nr_replicas:4;</div><div class='del'>-	unsigned		nr_replicas_required:4;</div><div class='del'>-	unsigned		watermark:3;</div><div class='del'>-	unsigned		incompressible:1;</div><div class='del'>-	unsigned		stripe_waited:1;</div><div class='del'>-</div><div class='del'>-	struct bch_devs_list	devs_have;</div><div class='del'>-	u16			target;</div><div class='del'>-	u16			nonce;</div><div class='del'>-	struct bch_io_opts	opts;</div><div class='del'>-</div><div class='del'>-	u32			subvol;</div><div class='del'>-	struct bpos		pos;</div><div class='del'>-	struct bversion		version;</div><div class='del'>-</div><div class='del'>-	/* For BCH_WRITE_DATA_ENCODED: */</div><div class='del'>-	struct bch_extent_crc_unpacked crc;</div><div class='del'>-</div><div class='del'>-	struct write_point_specifier write_point;</div><div class='del'>-</div><div class='del'>-	struct write_point	*wp;</div><div class='del'>-	struct list_head	wp_list;</div><div class='del'>-</div><div class='del'>-	struct disk_reservation	res;</div><div class='del'>-</div><div class='del'>-	struct open_buckets	open_buckets;</div><div class='del'>-</div><div class='del'>-	u64			new_i_size;</div><div class='del'>-	s64			i_sectors_delta;</div><div class='del'>-</div><div class='del'>-	struct bch_devs_mask	failed;</div><div class='del'>-</div><div class='del'>-	struct keylist		insert_keys;</div><div class='del'>-	u64			inline_keys[BKEY_EXTENT_U64s_MAX * 2];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Bitmask of devices that have had nocow writes issued to them since</div><div class='del'>-	 * last flush:</div><div class='del'>-	 */</div><div class='del'>-	struct bch_devs_mask	*devs_need_flush;</div><div class='del'>-</div><div class='del'>-	/* Must be last: */</div><div class='del'>-	struct bch_write_bio	wbio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_IO_WRITE_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c<br/>deleted file mode 100644<br/>index d71d26e39521..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1506 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * bcachefs journalling code, for btree insertions</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "journal_sb.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-static const char * const bch2_journal_errors[] = {</div><div class='del'>-#define x(n)	#n,</div><div class='del'>-	JOURNAL_ERRORS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_journal_buf_to_text(struct printbuf *out, struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	union journal_res_state s = READ_ONCE(j-&gt;reservations);</div><div class='del'>-	unsigned i = seq &amp; JOURNAL_BUF_MASK;</div><div class='del'>-	struct journal_buf *buf = j-&gt;buf + i;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "seq:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", seq);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "refcount:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", journal_state_count(s, i));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "size:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_u64(out, vstruct_bytes(buf-&gt;data));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "expires");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%li jiffies", buf-&gt;expires - jiffies);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_journal_bufs_to_text(struct printbuf *out, struct journal *j)</div><div class='del'>-{</div><div class='del'>-	if (!out-&gt;nr_tabstops)</div><div class='del'>-		printbuf_tabstop_push(out, 24);</div><div class='del'>-</div><div class='del'>-	for (u64 seq = journal_last_unwritten_seq(j);</div><div class='del'>-	     seq &lt;= journal_cur_seq(j);</div><div class='del'>-	     seq++)</div><div class='del'>-		bch2_journal_buf_to_text(out, j, seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool journal_seq_unwritten(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return seq &gt; j-&gt;seq_ondisk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool __journal_entry_is_open(union journal_res_state state)</div><div class='del'>-{</div><div class='del'>-	return state.cur_entry_offset &lt; JOURNAL_ENTRY_CLOSED_VAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned nr_unwritten_journal_entries(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return atomic64_read(&amp;j-&gt;seq) - j-&gt;seq_ondisk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool journal_entry_is_open(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return __journal_entry_is_open(j-&gt;reservations);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct journal_buf *</div><div class='del'>-journal_seq_to_buf(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_buf *buf = NULL;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(seq &gt; journal_cur_seq(j));</div><div class='del'>-</div><div class='del'>-	if (journal_seq_unwritten(j, seq)) {</div><div class='del'>-		buf = j-&gt;buf + (seq &amp; JOURNAL_BUF_MASK);</div><div class='del'>-		EBUG_ON(le64_to_cpu(buf-&gt;data-&gt;seq) != seq);</div><div class='del'>-	}</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_pin_list_init(struct journal_entry_pin_list *p, int count)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(p-&gt;list); i++)</div><div class='del'>-		INIT_LIST_HEAD(&amp;p-&gt;list[i]);</div><div class='del'>-	INIT_LIST_HEAD(&amp;p-&gt;flushed);</div><div class='del'>-	atomic_set(&amp;p-&gt;count, count);</div><div class='del'>-	p-&gt;devs.nr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Detect stuck journal conditions and trigger shutdown. Technically the journal</div><div class='del'>- * can end up stuck for a variety of reasons, such as a blocked I/O, journal</div><div class='del'>- * reservation lockup, etc. Since this is a fatal error with potentially</div><div class='del'>- * unpredictable characteristics, we want to be fairly conservative before we</div><div class='del'>- * decide to shut things down.</div><div class='del'>- *</div><div class='del'>- * Consider the journal stuck when it appears full with no ability to commit</div><div class='del'>- * btree transactions, to discard journal buckets, nor acquire priority</div><div class='del'>- * (reserved watermark) reservation.</div><div class='del'>- */</div><div class='del'>-static inline bool</div><div class='del'>-journal_error_check_stuck(struct journal *j, int error, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	bool stuck = false;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	if (!(error == JOURNAL_ERR_journal_full ||</div><div class='del'>-	      error == JOURNAL_ERR_journal_pin_full) ||</div><div class='del'>-	    nr_unwritten_journal_entries(j) ||</div><div class='del'>-	    (flags &amp; BCH_WATERMARK_MASK) != BCH_WATERMARK_reclaim)</div><div class='del'>-		return stuck;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (j-&gt;can_discard) {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		return stuck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stuck = true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The journal shutdown path will set -&gt;err_seq, but do it here first to</div><div class='del'>-	 * serialize against concurrent failures and avoid duplicate error</div><div class='del'>-	 * reports.</div><div class='del'>-	 */</div><div class='del'>-	if (j-&gt;err_seq) {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		return stuck;</div><div class='del'>-	}</div><div class='del'>-	j-&gt;err_seq = journal_cur_seq(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	bch_err(c, "Journal stuck! Hava a pre-reservation but journal full (error %s)",</div><div class='del'>-		bch2_journal_errors[error]);</div><div class='del'>-	bch2_journal_debug_to_text(&amp;buf, j);</div><div class='del'>-	bch_err(c, "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-	printbuf_reset(&amp;buf);</div><div class='del'>-	bch2_journal_pins_to_text(&amp;buf, j);</div><div class='del'>-	bch_err(c, "Journal pins:\n%s", buf.buf);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-	bch2_fatal_error(c);</div><div class='del'>-	dump_stack();</div><div class='del'>-</div><div class='del'>-	return stuck;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Final processing when the last reference of a journal buffer has been</div><div class='del'>- * dropped. Drop the pin list reference acquired at journal entry open and write</div><div class='del'>- * the buffer, if requested.</div><div class='del'>- */</div><div class='del'>-void bch2_journal_buf_put_final(struct journal *j, u64 seq, bool write)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (__bch2_journal_pin_put(j, seq))</div><div class='del'>-		bch2_journal_reclaim_fast(j);</div><div class='del'>-	if (write)</div><div class='del'>-		closure_call(&amp;j-&gt;io, bch2_journal_write, c-&gt;io_complete_wq, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns true if journal entry is now closed:</div><div class='del'>- *</div><div class='del'>- * We don't close a journal_buf until the next journal_buf is finished writing,</div><div class='del'>- * and can be opened again - this also initializes the next journal_buf:</div><div class='del'>- */</div><div class='del'>-static void __journal_entry_close(struct journal *j, unsigned closed_val, bool trace)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_buf *buf = journal_cur_buf(j);</div><div class='del'>-	union journal_res_state old, new;</div><div class='del'>-	u64 v = atomic64_read(&amp;j-&gt;reservations.counter);</div><div class='del'>-	unsigned sectors;</div><div class='del'>-</div><div class='del'>-	BUG_ON(closed_val != JOURNAL_ENTRY_CLOSED_VAL &amp;&amp;</div><div class='del'>-	       closed_val != JOURNAL_ENTRY_ERROR_VAL);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old.v = new.v = v;</div><div class='del'>-		new.cur_entry_offset = closed_val;</div><div class='del'>-</div><div class='del'>-		if (old.cur_entry_offset == JOURNAL_ENTRY_ERROR_VAL ||</div><div class='del'>-		    old.cur_entry_offset == new.cur_entry_offset)</div><div class='del'>-			return;</div><div class='del'>-	} while ((v = atomic64_cmpxchg(&amp;j-&gt;reservations.counter,</div><div class='del'>-				       old.v, new.v)) != old.v);</div><div class='del'>-</div><div class='del'>-	if (!__journal_entry_is_open(old))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Close out old buffer: */</div><div class='del'>-	buf-&gt;data-&gt;u64s		= cpu_to_le32(old.cur_entry_offset);</div><div class='del'>-</div><div class='del'>-	if (trace_journal_entry_close_enabled() &amp;&amp; trace) {</div><div class='del'>-		struct printbuf pbuf = PRINTBUF;</div><div class='del'>-		pbuf.atomic++;</div><div class='del'>-</div><div class='del'>-		prt_str(&amp;pbuf, "entry size: ");</div><div class='del'>-		prt_human_readable_u64(&amp;pbuf, vstruct_bytes(buf-&gt;data));</div><div class='del'>-		prt_newline(&amp;pbuf);</div><div class='del'>-		bch2_prt_task_backtrace(&amp;pbuf, current, 1);</div><div class='del'>-		trace_journal_entry_close(c, pbuf.buf);</div><div class='del'>-		printbuf_exit(&amp;pbuf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sectors = vstruct_blocks_plus(buf-&gt;data, c-&gt;block_bits,</div><div class='del'>-				      buf-&gt;u64s_reserved) &lt;&lt; c-&gt;block_bits;</div><div class='del'>-	BUG_ON(sectors &gt; buf-&gt;sectors);</div><div class='del'>-	buf-&gt;sectors = sectors;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have to set last_seq here, _before_ opening a new journal entry:</div><div class='del'>-	 *</div><div class='del'>-	 * A threads may replace an old pin with a new pin on their current</div><div class='del'>-	 * journal reservation - the expectation being that the journal will</div><div class='del'>-	 * contain either what the old pin protected or what the new pin</div><div class='del'>-	 * protects.</div><div class='del'>-	 *</div><div class='del'>-	 * After the old pin is dropped journal_last_seq() won't include the old</div><div class='del'>-	 * pin, so we can only write the updated last_seq on the entry that</div><div class='del'>-	 * contains whatever the new pin protects.</div><div class='del'>-	 *</div><div class='del'>-	 * Restated, we can _not_ update last_seq for a given entry if there</div><div class='del'>-	 * could be a newer entry open with reservations/pins that have been</div><div class='del'>-	 * taken against it.</div><div class='del'>-	 *</div><div class='del'>-	 * Hence, we want update/set last_seq on the current journal entry right</div><div class='del'>-	 * before we open a new one:</div><div class='del'>-	 */</div><div class='del'>-	buf-&gt;last_seq		= journal_last_seq(j);</div><div class='del'>-	buf-&gt;data-&gt;last_seq	= cpu_to_le64(buf-&gt;last_seq);</div><div class='del'>-	BUG_ON(buf-&gt;last_seq &gt; le64_to_cpu(buf-&gt;data-&gt;seq));</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work(&amp;j-&gt;write_work);</div><div class='del'>-</div><div class='del'>-	bch2_journal_space_available(j);</div><div class='del'>-</div><div class='del'>-	__bch2_journal_buf_put(j, old.idx, le64_to_cpu(buf-&gt;data-&gt;seq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_halt(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	__journal_entry_close(j, JOURNAL_ENTRY_ERROR_VAL, true);</div><div class='del'>-	if (!j-&gt;err_seq)</div><div class='del'>-		j-&gt;err_seq = journal_cur_seq(j);</div><div class='del'>-	journal_wake(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool journal_entry_want_write(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	bool ret = !journal_entry_is_open(j) ||</div><div class='del'>-		journal_cur_seq(j) == journal_last_unwritten_seq(j);</div><div class='del'>-</div><div class='del'>-	/* Don't close it yet if we already have a write in flight: */</div><div class='del'>-	if (ret)</div><div class='del'>-		__journal_entry_close(j, JOURNAL_ENTRY_CLOSED_VAL, true);</div><div class='del'>-	else if (nr_unwritten_journal_entries(j)) {</div><div class='del'>-		struct journal_buf *buf = journal_cur_buf(j);</div><div class='del'>-</div><div class='del'>-		if (!buf-&gt;flush_time) {</div><div class='del'>-			buf-&gt;flush_time	= local_clock() ?: 1;</div><div class='del'>-			buf-&gt;expires = jiffies;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_journal_entry_close(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	ret = journal_entry_want_write(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * should _only_ called from journal_res_get() - when we actually want a</div><div class='del'>- * journal reservation - journal entry is open means journal is dirty:</div><div class='del'>- */</div><div class='del'>-static int journal_entry_open(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_buf *buf = j-&gt;buf +</div><div class='del'>-		((journal_cur_seq(j) + 1) &amp; JOURNAL_BUF_MASK);</div><div class='del'>-	union journal_res_state old, new;</div><div class='del'>-	int u64s;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;lock);</div><div class='del'>-	BUG_ON(journal_entry_is_open(j));</div><div class='del'>-	BUG_ON(BCH_SB_CLEAN(c-&gt;disk_sb.sb));</div><div class='del'>-</div><div class='del'>-	if (j-&gt;blocked)</div><div class='del'>-		return JOURNAL_ERR_blocked;</div><div class='del'>-</div><div class='del'>-	if (j-&gt;cur_entry_error)</div><div class='del'>-		return j-&gt;cur_entry_error;</div><div class='del'>-</div><div class='del'>-	if (bch2_journal_error(j))</div><div class='del'>-		return JOURNAL_ERR_insufficient_devices; /* -EROFS */</div><div class='del'>-</div><div class='del'>-	if (!fifo_free(&amp;j-&gt;pin))</div><div class='del'>-		return JOURNAL_ERR_journal_pin_full;</div><div class='del'>-</div><div class='del'>-	if (nr_unwritten_journal_entries(j) == ARRAY_SIZE(j-&gt;buf))</div><div class='del'>-		return JOURNAL_ERR_max_in_flight;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!j-&gt;cur_entry_sectors);</div><div class='del'>-</div><div class='del'>-	buf-&gt;expires		=</div><div class='del'>-		(journal_cur_seq(j) == j-&gt;flushed_seq_ondisk</div><div class='del'>-		 ? jiffies</div><div class='del'>-		 : j-&gt;last_flush_write) +</div><div class='del'>-		msecs_to_jiffies(c-&gt;opts.journal_flush_delay);</div><div class='del'>-</div><div class='del'>-	buf-&gt;u64s_reserved	= j-&gt;entry_u64s_reserved;</div><div class='del'>-	buf-&gt;disk_sectors	= j-&gt;cur_entry_sectors;</div><div class='del'>-	buf-&gt;sectors		= min(buf-&gt;disk_sectors, buf-&gt;buf_size &gt;&gt; 9);</div><div class='del'>-</div><div class='del'>-	u64s = (int) (buf-&gt;sectors &lt;&lt; 9) / sizeof(u64) -</div><div class='del'>-		journal_entry_overhead(j);</div><div class='del'>-	u64s = clamp_t(int, u64s, 0, JOURNAL_ENTRY_CLOSED_VAL - 1);</div><div class='del'>-</div><div class='del'>-	if (u64s &lt;= (ssize_t) j-&gt;early_journal_entries.nr)</div><div class='del'>-		return JOURNAL_ERR_journal_full;</div><div class='del'>-</div><div class='del'>-	if (fifo_empty(&amp;j-&gt;pin) &amp;&amp; j-&gt;reclaim_thread)</div><div class='del'>-		wake_up_process(j-&gt;reclaim_thread);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The fifo_push() needs to happen at the same time as j-&gt;seq is</div><div class='del'>-	 * incremented for journal_last_seq() to be calculated correctly</div><div class='del'>-	 */</div><div class='del'>-	atomic64_inc(&amp;j-&gt;seq);</div><div class='del'>-	journal_pin_list_init(fifo_push_ref(&amp;j-&gt;pin), 1);</div><div class='del'>-</div><div class='del'>-	BUG_ON(j-&gt;pin.back - 1 != atomic64_read(&amp;j-&gt;seq));</div><div class='del'>-</div><div class='del'>-	BUG_ON(j-&gt;buf + (journal_cur_seq(j) &amp; JOURNAL_BUF_MASK) != buf);</div><div class='del'>-</div><div class='del'>-	bkey_extent_init(&amp;buf-&gt;key);</div><div class='del'>-	buf-&gt;noflush	= false;</div><div class='del'>-	buf-&gt;must_flush	= false;</div><div class='del'>-	buf-&gt;separate_flush = false;</div><div class='del'>-	buf-&gt;flush_time	= 0;</div><div class='del'>-	buf-&gt;need_flush_to_write_buffer = true;</div><div class='del'>-</div><div class='del'>-	memset(buf-&gt;data, 0, sizeof(*buf-&gt;data));</div><div class='del'>-	buf-&gt;data-&gt;seq	= cpu_to_le64(journal_cur_seq(j));</div><div class='del'>-	buf-&gt;data-&gt;u64s	= 0;</div><div class='del'>-</div><div class='del'>-	if (j-&gt;early_journal_entries.nr) {</div><div class='del'>-		memcpy(buf-&gt;data-&gt;_data, j-&gt;early_journal_entries.data,</div><div class='del'>-		       j-&gt;early_journal_entries.nr * sizeof(u64));</div><div class='del'>-		le32_add_cpu(&amp;buf-&gt;data-&gt;u64s, j-&gt;early_journal_entries.nr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Must be set before marking the journal entry as open:</div><div class='del'>-	 */</div><div class='del'>-	j-&gt;cur_entry_u64s = u64s;</div><div class='del'>-</div><div class='del'>-	v = atomic64_read(&amp;j-&gt;reservations.counter);</div><div class='del'>-	do {</div><div class='del'>-		old.v = new.v = v;</div><div class='del'>-</div><div class='del'>-		BUG_ON(old.cur_entry_offset == JOURNAL_ENTRY_ERROR_VAL);</div><div class='del'>-</div><div class='del'>-		new.idx++;</div><div class='del'>-		BUG_ON(journal_state_count(new, new.idx));</div><div class='del'>-		BUG_ON(new.idx != (journal_cur_seq(j) &amp; JOURNAL_BUF_MASK));</div><div class='del'>-</div><div class='del'>-		journal_state_inc(&amp;new);</div><div class='del'>-</div><div class='del'>-		/* Handle any already added entries */</div><div class='del'>-		new.cur_entry_offset = le32_to_cpu(buf-&gt;data-&gt;u64s);</div><div class='del'>-	} while ((v = atomic64_cmpxchg(&amp;j-&gt;reservations.counter,</div><div class='del'>-				       old.v, new.v)) != old.v);</div><div class='del'>-</div><div class='del'>-	mod_delayed_work(c-&gt;io_complete_wq,</div><div class='del'>-			 &amp;j-&gt;write_work,</div><div class='del'>-			 msecs_to_jiffies(c-&gt;opts.journal_flush_delay));</div><div class='del'>-	journal_wake(j);</div><div class='del'>-</div><div class='del'>-	if (j-&gt;early_journal_entries.nr)</div><div class='del'>-		darray_exit(&amp;j-&gt;early_journal_entries);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool journal_quiesced(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	bool ret = atomic64_read(&amp;j-&gt;seq) == j-&gt;seq_ondisk;</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_journal_entry_close(j);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_quiesce(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	wait_event(j-&gt;wait, journal_quiesced(j));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_write_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct journal *j = container_of(work, struct journal, write_work.work);</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	long delta;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	if (!__journal_entry_is_open(j-&gt;reservations))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	delta = journal_cur_buf(j)-&gt;expires - jiffies;</div><div class='del'>-</div><div class='del'>-	if (delta &gt; 0)</div><div class='del'>-		mod_delayed_work(c-&gt;io_complete_wq, &amp;j-&gt;write_work, delta);</div><div class='del'>-	else</div><div class='del'>-		__journal_entry_close(j, JOURNAL_ENTRY_CLOSED_VAL, true);</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __journal_res_get(struct journal *j, struct journal_res *res,</div><div class='del'>-			     unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_buf *buf;</div><div class='del'>-	bool can_discard;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	if (journal_res_get_fast(j, res, flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bch2_journal_error(j))</div><div class='del'>-		return -BCH_ERR_erofs_journal_err;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* check once more in case somebody else shut things down... */</div><div class='del'>-	if (bch2_journal_error(j)) {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		return -BCH_ERR_erofs_journal_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Recheck after taking the lock, so we don't race with another thread</div><div class='del'>-	 * that just did journal_entry_open() and call bch2_journal_entry_close()</div><div class='del'>-	 * unnecessarily</div><div class='del'>-	 */</div><div class='del'>-	if (journal_res_get_fast(j, res, flags)) {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; BCH_WATERMARK_MASK) &lt; j-&gt;watermark) {</div><div class='del'>-		/*</div><div class='del'>-		 * Don't want to close current journal entry, just need to</div><div class='del'>-		 * invoke reclaim:</div><div class='del'>-		 */</div><div class='del'>-		ret = JOURNAL_ERR_journal_full;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we couldn't get a reservation because the current buf filled up,</div><div class='del'>-	 * and we had room for a bigger entry on disk, signal that we want to</div><div class='del'>-	 * realloc the journal bufs:</div><div class='del'>-	 */</div><div class='del'>-	buf = journal_cur_buf(j);</div><div class='del'>-	if (journal_entry_is_open(j) &amp;&amp;</div><div class='del'>-	    buf-&gt;buf_size &gt;&gt; 9 &lt; buf-&gt;disk_sectors &amp;&amp;</div><div class='del'>-	    buf-&gt;buf_size &lt; JOURNAL_ENTRY_SIZE_MAX)</div><div class='del'>-		j-&gt;buf_size_want = max(j-&gt;buf_size_want, buf-&gt;buf_size &lt;&lt; 1);</div><div class='del'>-</div><div class='del'>-	__journal_entry_close(j, JOURNAL_ENTRY_CLOSED_VAL, false);</div><div class='del'>-	ret = journal_entry_open(j);</div><div class='del'>-</div><div class='del'>-	if (ret == JOURNAL_ERR_max_in_flight) {</div><div class='del'>-		track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_journal_max_in_flight],</div><div class='del'>-				   &amp;j-&gt;max_in_flight_start, true);</div><div class='del'>-		if (trace_journal_entry_full_enabled()) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-			buf.atomic++;</div><div class='del'>-</div><div class='del'>-			bch2_journal_bufs_to_text(&amp;buf, j);</div><div class='del'>-			trace_journal_entry_full(c, buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-		count_event(c, journal_entry_full);</div><div class='del'>-	}</div><div class='del'>-unlock:</div><div class='del'>-	can_discard = j-&gt;can_discard;</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto retry;</div><div class='del'>-	if (journal_error_check_stuck(j, ret, flags))</div><div class='del'>-		ret = -BCH_ERR_journal_res_get_blocked;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Journal is full - can't rely on reclaim from work item due to</div><div class='del'>-	 * freezing:</div><div class='del'>-	 */</div><div class='del'>-	if ((ret == JOURNAL_ERR_journal_full ||</div><div class='del'>-	     ret == JOURNAL_ERR_journal_pin_full) &amp;&amp;</div><div class='del'>-	    !(flags &amp; JOURNAL_RES_GET_NONBLOCK)) {</div><div class='del'>-		if (can_discard) {</div><div class='del'>-			bch2_journal_do_discards(j);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (mutex_trylock(&amp;j-&gt;reclaim_lock)) {</div><div class='del'>-			bch2_journal_reclaim(j);</div><div class='del'>-			mutex_unlock(&amp;j-&gt;reclaim_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret == JOURNAL_ERR_insufficient_devices</div><div class='del'>-		? -BCH_ERR_erofs_journal_err</div><div class='del'>-		: -BCH_ERR_journal_res_get_blocked;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Essentially the entry function to the journaling code. When bcachefs is doing</div><div class='del'>- * a btree insert, it calls this function to get the current journal write.</div><div class='del'>- * Journal write is the structure used set up journal writes. The calling</div><div class='del'>- * function will then add its keys to the structure, queuing them for the next</div><div class='del'>- * write.</div><div class='del'>- *</div><div class='del'>- * To ensure forward progress, the current task must not be holding any</div><div class='del'>- * btree node write locks.</div><div class='del'>- */</div><div class='del'>-int bch2_journal_res_get_slowpath(struct journal *j, struct journal_res *res,</div><div class='del'>-				  unsigned flags)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	closure_wait_event(&amp;j-&gt;async_wait,</div><div class='del'>-		   (ret = __journal_res_get(j, res, flags)) != -BCH_ERR_journal_res_get_blocked ||</div><div class='del'>-		   (flags &amp; JOURNAL_RES_GET_NONBLOCK));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* journal_entry_res: */</div><div class='del'>-</div><div class='del'>-void bch2_journal_entry_res_resize(struct journal *j,</div><div class='del'>-				   struct journal_entry_res *res,</div><div class='del'>-				   unsigned new_u64s)</div><div class='del'>-{</div><div class='del'>-	union journal_res_state state;</div><div class='del'>-	int d = new_u64s - res-&gt;u64s;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	j-&gt;entry_u64s_reserved += d;</div><div class='del'>-	if (d &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	j-&gt;cur_entry_u64s = max_t(int, 0, j-&gt;cur_entry_u64s - d);</div><div class='del'>-	smp_mb();</div><div class='del'>-	state = READ_ONCE(j-&gt;reservations);</div><div class='del'>-</div><div class='del'>-	if (state.cur_entry_offset &lt; JOURNAL_ENTRY_CLOSED_VAL &amp;&amp;</div><div class='del'>-	    state.cur_entry_offset &gt; j-&gt;cur_entry_u64s) {</div><div class='del'>-		j-&gt;cur_entry_u64s += d;</div><div class='del'>-		/*</div><div class='del'>-		 * Not enough room in current journal entry, have to flush it:</div><div class='del'>-		 */</div><div class='del'>-		__journal_entry_close(j, JOURNAL_ENTRY_CLOSED_VAL, true);</div><div class='del'>-	} else {</div><div class='del'>-		journal_cur_buf(j)-&gt;u64s_reserved += d;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	res-&gt;u64s += d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* journal flushing: */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_journal_flush_seq_async - wait for a journal entry to be written</div><div class='del'>- * @j:		journal object</div><div class='del'>- * @seq:	seq to flush</div><div class='del'>- * @parent:	closure object to wait with</div><div class='del'>- * Returns:	1 if @seq has already been flushed, 0 if @seq is being flushed,</div><div class='del'>- *		-EIO if @seq will never be flushed</div><div class='del'>- *</div><div class='del'>- * Like bch2_journal_wait_on_seq, except that it triggers a write immediately if</div><div class='del'>- * necessary</div><div class='del'>- */</div><div class='del'>-int bch2_journal_flush_seq_async(struct journal *j, u64 seq,</div><div class='del'>-				 struct closure *parent)</div><div class='del'>-{</div><div class='del'>-	struct journal_buf *buf;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (seq &lt;= j-&gt;flushed_seq_ondisk)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(seq &gt; journal_cur_seq(j),</div><div class='del'>-		      "requested to flush journal seq %llu, but currently at %llu",</div><div class='del'>-		      seq, journal_cur_seq(j)))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Recheck under lock: */</div><div class='del'>-	if (j-&gt;err_seq &amp;&amp; seq &gt;= j-&gt;err_seq) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (seq &lt;= j-&gt;flushed_seq_ondisk) {</div><div class='del'>-		ret = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if seq was written, but not flushed - flush a newer one instead */</div><div class='del'>-	seq = max(seq, journal_last_unwritten_seq(j));</div><div class='del'>-</div><div class='del'>-recheck_need_open:</div><div class='del'>-	if (seq &gt; journal_cur_seq(j)) {</div><div class='del'>-		struct journal_res res = { 0 };</div><div class='del'>-</div><div class='del'>-		if (journal_entry_is_open(j))</div><div class='del'>-			__journal_entry_close(j, JOURNAL_ENTRY_CLOSED_VAL, true);</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-		ret = bch2_journal_res_get(j, &amp;res, jset_u64s(0), 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		seq = res.seq;</div><div class='del'>-		buf = j-&gt;buf + (seq &amp; JOURNAL_BUF_MASK);</div><div class='del'>-		buf-&gt;must_flush = true;</div><div class='del'>-</div><div class='del'>-		if (!buf-&gt;flush_time) {</div><div class='del'>-			buf-&gt;flush_time	= local_clock() ?: 1;</div><div class='del'>-			buf-&gt;expires = jiffies;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (parent &amp;&amp; !closure_wait(&amp;buf-&gt;wait, parent))</div><div class='del'>-			BUG();</div><div class='del'>-</div><div class='del'>-		bch2_journal_res_put(j, &amp;res);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		goto want_write;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if write was kicked off without a flush, flush the next sequence</div><div class='del'>-	 * number instead</div><div class='del'>-	 */</div><div class='del'>-	buf = journal_seq_to_buf(j, seq);</div><div class='del'>-	if (buf-&gt;noflush) {</div><div class='del'>-		seq++;</div><div class='del'>-		goto recheck_need_open;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf-&gt;must_flush = true;</div><div class='del'>-</div><div class='del'>-	if (parent &amp;&amp; !closure_wait(&amp;buf-&gt;wait, parent))</div><div class='del'>-		BUG();</div><div class='del'>-want_write:</div><div class='del'>-	if (seq == journal_cur_seq(j))</div><div class='del'>-		journal_entry_want_write(j);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_flush_seq(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	u64 start_time = local_clock();</div><div class='del'>-	int ret, ret2;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't update time_stats when @seq is already flushed:</div><div class='del'>-	 */</div><div class='del'>-	if (seq &lt;= j-&gt;flushed_seq_ondisk)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = wait_event_interruptible(j-&gt;wait, (ret2 = bch2_journal_flush_seq_async(j, seq, NULL)));</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_time_stats_update(j-&gt;flush_seq_time, start_time);</div><div class='del'>-</div><div class='del'>-	return ret ?: ret2 &lt; 0 ? ret2 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch2_journal_flush_async - if there is an open journal entry, or a journal</div><div class='del'>- * still being written, write it and wait for the write to complete</div><div class='del'>- */</div><div class='del'>-void bch2_journal_flush_async(struct journal *j, struct closure *parent)</div><div class='del'>-{</div><div class='del'>-	bch2_journal_flush_seq_async(j, atomic64_read(&amp;j-&gt;seq), parent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_flush(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return bch2_journal_flush_seq(j, atomic64_read(&amp;j-&gt;seq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch2_journal_noflush_seq - tell the journal not to issue any flushes before</div><div class='del'>- * @seq</div><div class='del'>- */</div><div class='del'>-bool bch2_journal_noflush_seq(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	u64 unwritten_seq;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	if (!(c-&gt;sb.features &amp; (1ULL &lt;&lt; BCH_FEATURE_journal_no_flush)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (seq &lt;= c-&gt;journal.flushed_seq_ondisk)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	if (seq &lt;= c-&gt;journal.flushed_seq_ondisk)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for (unwritten_seq = journal_last_unwritten_seq(j);</div><div class='del'>-	     unwritten_seq &lt; seq;</div><div class='del'>-	     unwritten_seq++) {</div><div class='del'>-		struct journal_buf *buf = journal_seq_to_buf(j, unwritten_seq);</div><div class='del'>-</div><div class='del'>-		/* journal write is already in flight, and was a flush write: */</div><div class='del'>-		if (unwritten_seq == journal_last_unwritten_seq(j) &amp;&amp; !buf-&gt;noflush)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		buf-&gt;noflush = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = true;</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_meta(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct journal_buf *buf;</div><div class='del'>-	struct journal_res res;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	memset(&amp;res, 0, sizeof(res));</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_res_get(j, &amp;res, jset_u64s(0), 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	buf = j-&gt;buf + (res.seq &amp; JOURNAL_BUF_MASK);</div><div class='del'>-	buf-&gt;must_flush = true;</div><div class='del'>-</div><div class='del'>-	if (!buf-&gt;flush_time) {</div><div class='del'>-		buf-&gt;flush_time	= local_clock() ?: 1;</div><div class='del'>-		buf-&gt;expires = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_journal_res_put(j, &amp;res);</div><div class='del'>-</div><div class='del'>-	return bch2_journal_flush_seq(j, res.seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* block/unlock the journal: */</div><div class='del'>-</div><div class='del'>-void bch2_journal_unblock(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	j-&gt;blocked--;</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	journal_wake(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_block(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	j-&gt;blocked++;</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	journal_quiesce(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct journal_buf *__bch2_next_write_buffer_flush_journal_buf(struct journal *j, u64 max_seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_buf *ret = NULL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;j-&gt;buf_lock);</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	max_seq = min(max_seq, journal_cur_seq(j));</div><div class='del'>-</div><div class='del'>-	for (u64 seq = journal_last_unwritten_seq(j);</div><div class='del'>-	     seq &lt;= max_seq;</div><div class='del'>-	     seq++) {</div><div class='del'>-		unsigned idx = seq &amp; JOURNAL_BUF_MASK;</div><div class='del'>-		struct journal_buf *buf = j-&gt;buf + idx;</div><div class='del'>-</div><div class='del'>-		if (buf-&gt;need_flush_to_write_buffer) {</div><div class='del'>-			if (seq == journal_cur_seq(j))</div><div class='del'>-				__journal_entry_close(j, JOURNAL_ENTRY_CLOSED_VAL, true);</div><div class='del'>-</div><div class='del'>-			union journal_res_state s;</div><div class='del'>-			s.v = atomic64_read_acquire(&amp;j-&gt;reservations.counter);</div><div class='del'>-</div><div class='del'>-			ret = journal_state_count(s, idx)</div><div class='del'>-				? ERR_PTR(-EAGAIN)</div><div class='del'>-				: buf;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	if (IS_ERR_OR_NULL(ret))</div><div class='del'>-		mutex_unlock(&amp;j-&gt;buf_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct journal_buf *bch2_next_write_buffer_flush_journal_buf(struct journal *j, u64 max_seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_buf *ret;</div><div class='del'>-</div><div class='del'>-	wait_event(j-&gt;wait, (ret = __bch2_next_write_buffer_flush_journal_buf(j, max_seq)) != ERR_PTR(-EAGAIN));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* allocate journal on a device: */</div><div class='del'>-</div><div class='del'>-static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr,</div><div class='del'>-					 bool new_fs, struct closure *cl)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-	u64 *new_bucket_seq = NULL, *new_buckets = NULL;</div><div class='del'>-	struct open_bucket **ob = NULL;</div><div class='del'>-	long *bu = NULL;</div><div class='del'>-	unsigned i, pos, nr_got = 0, nr_want = nr - ja-&gt;nr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(nr &lt;= ja-&gt;nr);</div><div class='del'>-</div><div class='del'>-	bu		= kcalloc(nr_want, sizeof(*bu), GFP_KERNEL);</div><div class='del'>-	ob		= kcalloc(nr_want, sizeof(*ob), GFP_KERNEL);</div><div class='del'>-	new_buckets	= kcalloc(nr, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	new_bucket_seq	= kcalloc(nr, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!bu || !ob || !new_buckets || !new_bucket_seq) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_set_nr_journal_buckets;</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (nr_got = 0; nr_got &lt; nr_want; nr_got++) {</div><div class='del'>-		if (new_fs) {</div><div class='del'>-			bu[nr_got] = bch2_bucket_alloc_new_fs(ca);</div><div class='del'>-			if (bu[nr_got] &lt; 0) {</div><div class='del'>-				ret = -BCH_ERR_ENOSPC_bucket_alloc;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ob[nr_got] = bch2_bucket_alloc(c, ca, BCH_WATERMARK_normal, cl);</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(ob[nr_got]);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ret = bch2_trans_run(c,</div><div class='del'>-				bch2_trans_mark_metadata_bucket(trans, ca,</div><div class='del'>-						ob[nr_got]-&gt;bucket, BCH_DATA_journal,</div><div class='del'>-						ca-&gt;mi.bucket_size));</div><div class='del'>-			if (ret) {</div><div class='del'>-				bch2_open_bucket_put(c, ob[nr_got]);</div><div class='del'>-				bch_err_msg(c, ret, "marking new journal buckets");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bu[nr_got] = ob[nr_got]-&gt;bucket;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!nr_got)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	/* Don't return an error if we successfully allocated some buckets: */</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-	if (c) {</div><div class='del'>-		bch2_journal_flush_all_pins(&amp;c-&gt;journal);</div><div class='del'>-		bch2_journal_block(&amp;c-&gt;journal);</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(new_buckets,	ja-&gt;buckets,	ja-&gt;nr * sizeof(u64));</div><div class='del'>-	memcpy(new_bucket_seq,	ja-&gt;bucket_seq,	ja-&gt;nr * sizeof(u64));</div><div class='del'>-</div><div class='del'>-	BUG_ON(ja-&gt;discard_idx &gt; ja-&gt;nr);</div><div class='del'>-</div><div class='del'>-	pos = ja-&gt;discard_idx ?: ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-	memmove(new_buckets + pos + nr_got,</div><div class='del'>-		new_buckets + pos,</div><div class='del'>-		sizeof(new_buckets[0]) * (ja-&gt;nr - pos));</div><div class='del'>-	memmove(new_bucket_seq + pos + nr_got,</div><div class='del'>-		new_bucket_seq + pos,</div><div class='del'>-		sizeof(new_bucket_seq[0]) * (ja-&gt;nr - pos));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_got; i++) {</div><div class='del'>-		new_buckets[pos + i] = bu[i];</div><div class='del'>-		new_bucket_seq[pos + i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr = ja-&gt;nr + nr_got;</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_buckets_to_sb(c, ca, new_buckets, nr);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_unblock;</div><div class='del'>-</div><div class='del'>-	if (!new_fs)</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-</div><div class='del'>-	/* Commit: */</div><div class='del'>-	if (c)</div><div class='del'>-		spin_lock(&amp;c-&gt;journal.lock);</div><div class='del'>-</div><div class='del'>-	swap(new_buckets,	ja-&gt;buckets);</div><div class='del'>-	swap(new_bucket_seq,	ja-&gt;bucket_seq);</div><div class='del'>-	ja-&gt;nr = nr;</div><div class='del'>-</div><div class='del'>-	if (pos &lt;= ja-&gt;discard_idx)</div><div class='del'>-		ja-&gt;discard_idx = (ja-&gt;discard_idx + nr_got) % ja-&gt;nr;</div><div class='del'>-	if (pos &lt;= ja-&gt;dirty_idx_ondisk)</div><div class='del'>-		ja-&gt;dirty_idx_ondisk = (ja-&gt;dirty_idx_ondisk + nr_got) % ja-&gt;nr;</div><div class='del'>-	if (pos &lt;= ja-&gt;dirty_idx)</div><div class='del'>-		ja-&gt;dirty_idx = (ja-&gt;dirty_idx + nr_got) % ja-&gt;nr;</div><div class='del'>-	if (pos &lt;= ja-&gt;cur_idx)</div><div class='del'>-		ja-&gt;cur_idx = (ja-&gt;cur_idx + nr_got) % ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-	if (c)</div><div class='del'>-		spin_unlock(&amp;c-&gt;journal.lock);</div><div class='del'>-err_unblock:</div><div class='del'>-	if (c) {</div><div class='del'>-		bch2_journal_unblock(&amp;c-&gt;journal);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &amp;&amp; !new_fs)</div><div class='del'>-		for (i = 0; i &lt; nr_got; i++)</div><div class='del'>-			bch2_trans_run(c,</div><div class='del'>-				bch2_trans_mark_metadata_bucket(trans, ca,</div><div class='del'>-						bu[i], BCH_DATA_free, 0));</div><div class='del'>-err_free:</div><div class='del'>-	if (!new_fs)</div><div class='del'>-		for (i = 0; i &lt; nr_got; i++)</div><div class='del'>-			bch2_open_bucket_put(c, ob[i]);</div><div class='del'>-</div><div class='del'>-	kfree(new_bucket_seq);</div><div class='del'>-	kfree(new_buckets);</div><div class='del'>-	kfree(ob);</div><div class='del'>-	kfree(bu);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate more journal space at runtime - not currently making use if it, but</div><div class='del'>- * the code works:</div><div class='del'>- */</div><div class='del'>-int bch2_set_nr_journal_buckets(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-				unsigned nr)</div><div class='del'>-{</div><div class='del'>-	struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-	struct closure cl;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	/* don't handle reducing nr of buckets yet: */</div><div class='del'>-	if (nr &lt; ja-&gt;nr)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	while (ja-&gt;nr &lt; nr) {</div><div class='del'>-		struct disk_reservation disk_res = { 0, 0, 0 };</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * note: journal buckets aren't really counted as _sectors_ used yet, so</div><div class='del'>-		 * we don't need the disk reservation to avoid the BUG_ON() in buckets.c</div><div class='del'>-		 * when space used goes up without a reservation - but we do need the</div><div class='del'>-		 * reservation to ensure we'll actually be able to allocate:</div><div class='del'>-		 *</div><div class='del'>-		 * XXX: that's not right, disk reservations only ensure a</div><div class='del'>-		 * filesystem-wide allocation will succeed, this is a device</div><div class='del'>-		 * specific allocation - we can hang here:</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		ret = bch2_disk_reservation_get(c, &amp;disk_res,</div><div class='del'>-						bucket_to_sector(ca, nr - ja-&gt;nr), 1, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = __bch2_set_nr_journal_buckets(ca, nr, false, &amp;cl);</div><div class='del'>-</div><div class='del'>-		bch2_disk_reservation_put(c, &amp;disk_res);</div><div class='del'>-</div><div class='del'>-		closure_sync(&amp;cl);</div><div class='del'>-</div><div class='del'>-		if (ret &amp;&amp; ret != -BCH_ERR_bucket_alloc_blocked)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-unlock:</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_journal_alloc(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	unsigned nr;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (dynamic_fault("bcachefs:add:journal_alloc")) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_set_nr_journal_buckets;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 1/128th of the device by default: */</div><div class='del'>-	nr = ca-&gt;mi.nbuckets &gt;&gt; 7;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * clamp journal size to 8192 buckets or 8GB (in sectors), whichever</div><div class='del'>-	 * is smaller:</div><div class='del'>-	 */</div><div class='del'>-	nr = clamp_t(unsigned, nr,</div><div class='del'>-		     BCH_JOURNAL_BUCKETS_MIN,</div><div class='del'>-		     min(1 &lt;&lt; 13,</div><div class='del'>-			 (1 &lt;&lt; 24) / ca-&gt;mi.bucket_size));</div><div class='del'>-</div><div class='del'>-	ret = __bch2_set_nr_journal_buckets(ca, nr, true, NULL);</div><div class='del'>-err:</div><div class='del'>-	bch_err_fn(ca, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_journal_alloc(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		if (ca-&gt;journal.nr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		int ret = bch2_dev_journal_alloc(ca);</div><div class='del'>-		if (ret) {</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* startup/shutdown: */</div><div class='del'>-</div><div class='del'>-static bool bch2_journal_writing_to_device(struct journal *j, unsigned dev_idx)</div><div class='del'>-{</div><div class='del'>-	bool ret = false;</div><div class='del'>-	u64 seq;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	for (seq = journal_last_unwritten_seq(j);</div><div class='del'>-	     seq &lt;= journal_cur_seq(j) &amp;&amp; !ret;</div><div class='del'>-	     seq++) {</div><div class='del'>-		struct journal_buf *buf = journal_seq_to_buf(j, seq);</div><div class='del'>-</div><div class='del'>-		if (bch2_bkey_has_device_c(bkey_i_to_s_c(&amp;buf-&gt;key), dev_idx))</div><div class='del'>-			ret = true;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_journal_stop(struct journal *j, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	wait_event(j-&gt;wait, !bch2_journal_writing_to_device(j, ca-&gt;dev_idx));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_journal_stop(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	bch2_journal_reclaim_stop(j);</div><div class='del'>-	bch2_journal_flush_all_pins(j);</div><div class='del'>-</div><div class='del'>-	wait_event(j-&gt;wait, bch2_journal_entry_close(j));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Always write a new journal entry, to make sure the clock hands are up</div><div class='del'>-	 * to date (and match the superblock)</div><div class='del'>-	 */</div><div class='del'>-	bch2_journal_meta(j);</div><div class='del'>-</div><div class='del'>-	journal_quiesce(j);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!bch2_journal_error(j) &amp;&amp;</div><div class='del'>-	       test_bit(JOURNAL_REPLAY_DONE, &amp;j-&gt;flags) &amp;&amp;</div><div class='del'>-	       j-&gt;last_empty_seq != journal_cur_seq(j));</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;j-&gt;write_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_journal_start(struct journal *j, u64 cur_seq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_entry_pin_list *p;</div><div class='del'>-	struct journal_replay *i, **_i;</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-	bool had_entries = false;</div><div class='del'>-	unsigned ptr;</div><div class='del'>-	u64 last_seq = cur_seq, nr, seq;</div><div class='del'>-</div><div class='del'>-	genradix_for_each_reverse(&amp;c-&gt;journal_entries, iter, _i) {</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		last_seq = le64_to_cpu(i-&gt;j.last_seq);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr = cur_seq - last_seq;</div><div class='del'>-</div><div class='del'>-	if (nr + 1 &gt; j-&gt;pin.size) {</div><div class='del'>-		free_fifo(&amp;j-&gt;pin);</div><div class='del'>-		init_fifo(&amp;j-&gt;pin, roundup_pow_of_two(nr + 1), GFP_KERNEL);</div><div class='del'>-		if (!j-&gt;pin.data) {</div><div class='del'>-			bch_err(c, "error reallocating journal fifo (%llu open entries)", nr);</div><div class='del'>-			return -BCH_ERR_ENOMEM_journal_pin_fifo;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	j-&gt;replay_journal_seq	= last_seq;</div><div class='del'>-	j-&gt;replay_journal_seq_end = cur_seq;</div><div class='del'>-	j-&gt;last_seq_ondisk	= last_seq;</div><div class='del'>-	j-&gt;flushed_seq_ondisk	= cur_seq - 1;</div><div class='del'>-	j-&gt;seq_ondisk		= cur_seq - 1;</div><div class='del'>-	j-&gt;pin.front		= last_seq;</div><div class='del'>-	j-&gt;pin.back		= cur_seq;</div><div class='del'>-	atomic64_set(&amp;j-&gt;seq, cur_seq - 1);</div><div class='del'>-</div><div class='del'>-	fifo_for_each_entry_ptr(p, &amp;j-&gt;pin, seq)</div><div class='del'>-		journal_pin_list_init(p, 1);</div><div class='del'>-</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, iter, _i) {</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		seq = le64_to_cpu(i-&gt;j.seq);</div><div class='del'>-		BUG_ON(seq &gt;= cur_seq);</div><div class='del'>-</div><div class='del'>-		if (seq &lt; last_seq)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (journal_entry_empty(&amp;i-&gt;j))</div><div class='del'>-			j-&gt;last_empty_seq = le64_to_cpu(i-&gt;j.seq);</div><div class='del'>-</div><div class='del'>-		p = journal_seq_pin(j, seq);</div><div class='del'>-</div><div class='del'>-		p-&gt;devs.nr = 0;</div><div class='del'>-		for (ptr = 0; ptr &lt; i-&gt;nr_ptrs; ptr++)</div><div class='del'>-			bch2_dev_list_add_dev(&amp;p-&gt;devs, i-&gt;ptrs[ptr].dev);</div><div class='del'>-</div><div class='del'>-		had_entries = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!had_entries)</div><div class='del'>-		j-&gt;last_empty_seq = cur_seq;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	set_bit(JOURNAL_STARTED, &amp;j-&gt;flags);</div><div class='del'>-	j-&gt;last_flush_write = jiffies;</div><div class='del'>-</div><div class='del'>-	j-&gt;reservations.idx = j-&gt;reservations.unwritten_idx = journal_cur_seq(j);</div><div class='del'>-	j-&gt;reservations.unwritten_idx++;</div><div class='del'>-</div><div class='del'>-	c-&gt;last_bucket_seq_cleanup = journal_cur_seq(j);</div><div class='del'>-</div><div class='del'>-	bch2_journal_space_available(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return bch2_journal_reclaim_start(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* init/exit: */</div><div class='del'>-</div><div class='del'>-void bch2_dev_journal_exit(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	kfree(ca-&gt;journal.bio);</div><div class='del'>-	kfree(ca-&gt;journal.buckets);</div><div class='del'>-	kfree(ca-&gt;journal.bucket_seq);</div><div class='del'>-</div><div class='del'>-	ca-&gt;journal.bio		= NULL;</div><div class='del'>-	ca-&gt;journal.buckets	= NULL;</div><div class='del'>-	ca-&gt;journal.bucket_seq	= NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_journal_init(struct bch_dev *ca, struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-	struct bch_sb_field_journal *journal_buckets =</div><div class='del'>-		bch2_sb_field_get(sb, journal);</div><div class='del'>-	struct bch_sb_field_journal_v2 *journal_buckets_v2 =</div><div class='del'>-		bch2_sb_field_get(sb, journal_v2);</div><div class='del'>-	unsigned i, nr_bvecs;</div><div class='del'>-</div><div class='del'>-	ja-&gt;nr = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_buckets_v2) {</div><div class='del'>-		unsigned nr = bch2_sb_field_journal_v2_nr_entries(journal_buckets_v2);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nr; i++)</div><div class='del'>-			ja-&gt;nr += le64_to_cpu(journal_buckets_v2-&gt;d[i].nr);</div><div class='del'>-	} else if (journal_buckets) {</div><div class='del'>-		ja-&gt;nr = bch2_nr_journal_buckets(journal_buckets);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ja-&gt;bucket_seq = kcalloc(ja-&gt;nr, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!ja-&gt;bucket_seq)</div><div class='del'>-		return -BCH_ERR_ENOMEM_dev_journal_init;</div><div class='del'>-</div><div class='del'>-	nr_bvecs = DIV_ROUND_UP(JOURNAL_ENTRY_SIZE_MAX, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	ca-&gt;journal.bio = bio_kmalloc(nr_bvecs, GFP_KERNEL);</div><div class='del'>-	if (!ca-&gt;journal.bio)</div><div class='del'>-		return -BCH_ERR_ENOMEM_dev_journal_init;</div><div class='del'>-</div><div class='del'>-	bio_init(ca-&gt;journal.bio, NULL, ca-&gt;journal.bio-&gt;bi_inline_vecs, nr_bvecs, 0);</div><div class='del'>-</div><div class='del'>-	ja-&gt;buckets = kcalloc(ja-&gt;nr, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!ja-&gt;buckets)</div><div class='del'>-		return -BCH_ERR_ENOMEM_dev_journal_init;</div><div class='del'>-</div><div class='del'>-	if (journal_buckets_v2) {</div><div class='del'>-		unsigned nr = bch2_sb_field_journal_v2_nr_entries(journal_buckets_v2);</div><div class='del'>-		unsigned j, dst = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nr; i++)</div><div class='del'>-			for (j = 0; j &lt; le64_to_cpu(journal_buckets_v2-&gt;d[i].nr); j++)</div><div class='del'>-				ja-&gt;buckets[dst++] =</div><div class='del'>-					le64_to_cpu(journal_buckets_v2-&gt;d[i].start) + j;</div><div class='del'>-	} else if (journal_buckets) {</div><div class='del'>-		for (i = 0; i &lt; ja-&gt;nr; i++)</div><div class='del'>-			ja-&gt;buckets[i] = le64_to_cpu(journal_buckets-&gt;buckets[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_journal_exit(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	darray_exit(&amp;j-&gt;early_journal_entries);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(j-&gt;buf); i++)</div><div class='del'>-		kvpfree(j-&gt;buf[i].data, j-&gt;buf[i].buf_size);</div><div class='del'>-	free_fifo(&amp;j-&gt;pin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_journal_init(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	static struct lock_class_key res_key;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;j-&gt;buf_lock);</div><div class='del'>-	spin_lock_init(&amp;j-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;j-&gt;err_lock);</div><div class='del'>-	init_waitqueue_head(&amp;j-&gt;wait);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;j-&gt;write_work, journal_write_work);</div><div class='del'>-	init_waitqueue_head(&amp;j-&gt;reclaim_wait);</div><div class='del'>-	init_waitqueue_head(&amp;j-&gt;pin_flush_wait);</div><div class='del'>-	mutex_init(&amp;j-&gt;reclaim_lock);</div><div class='del'>-	mutex_init(&amp;j-&gt;discard_lock);</div><div class='del'>-</div><div class='del'>-	lockdep_init_map(&amp;j-&gt;res_map, "journal res", &amp;res_key, 0);</div><div class='del'>-</div><div class='del'>-	atomic64_set(&amp;j-&gt;reservations.counter,</div><div class='del'>-		((union journal_res_state)</div><div class='del'>-		 { .cur_entry_offset = JOURNAL_ENTRY_CLOSED_VAL }).v);</div><div class='del'>-</div><div class='del'>-	if (!(init_fifo(&amp;j-&gt;pin, JOURNAL_PIN, GFP_KERNEL)))</div><div class='del'>-		return -BCH_ERR_ENOMEM_journal_pin_fifo;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(j-&gt;buf); i++) {</div><div class='del'>-		j-&gt;buf[i].buf_size = JOURNAL_ENTRY_SIZE_MIN;</div><div class='del'>-		j-&gt;buf[i].data = kvpmalloc(j-&gt;buf[i].buf_size, GFP_KERNEL);</div><div class='del'>-		if (!j-&gt;buf[i].data)</div><div class='del'>-			return -BCH_ERR_ENOMEM_journal_buf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	j-&gt;pin.front = j-&gt;pin.back = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* debug: */</div><div class='del'>-</div><div class='del'>-void __bch2_journal_debug_to_text(struct printbuf *out, struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	union journal_res_state s;</div><div class='del'>-	unsigned long now = jiffies;</div><div class='del'>-	u64 nr_writes = j-&gt;nr_flush_writes + j-&gt;nr_noflush_writes;</div><div class='del'>-</div><div class='del'>-	if (!out-&gt;nr_tabstops)</div><div class='del'>-		printbuf_tabstop_push(out, 24);</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	s = READ_ONCE(j-&gt;reservations);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "dirty journal entries:\t%llu/%llu\n",	fifo_used(&amp;j-&gt;pin), j-&gt;pin.size);</div><div class='del'>-	prt_printf(out, "seq:\t\t\t%llu\n",			journal_cur_seq(j));</div><div class='del'>-	prt_printf(out, "seq_ondisk:\t\t%llu\n",		j-&gt;seq_ondisk);</div><div class='del'>-	prt_printf(out, "last_seq:\t\t%llu\n",			journal_last_seq(j));</div><div class='del'>-	prt_printf(out, "last_seq_ondisk:\t%llu\n",		j-&gt;last_seq_ondisk);</div><div class='del'>-	prt_printf(out, "flushed_seq_ondisk:\t%llu\n",		j-&gt;flushed_seq_ondisk);</div><div class='del'>-	prt_printf(out, "watermark:\t\t%s\n",			bch2_watermarks[j-&gt;watermark]);</div><div class='del'>-	prt_printf(out, "each entry reserved:\t%u\n",		j-&gt;entry_u64s_reserved);</div><div class='del'>-	prt_printf(out, "nr flush writes:\t%llu\n",		j-&gt;nr_flush_writes);</div><div class='del'>-	prt_printf(out, "nr noflush writes:\t%llu\n",		j-&gt;nr_noflush_writes);</div><div class='del'>-	prt_printf(out, "average write size:\t");</div><div class='del'>-	prt_human_readable_u64(out, nr_writes ? div64_u64(j-&gt;entry_bytes_written, nr_writes) : 0);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "nr direct reclaim:\t%llu\n",		j-&gt;nr_direct_reclaim);</div><div class='del'>-	prt_printf(out, "nr background reclaim:\t%llu\n",	j-&gt;nr_background_reclaim);</div><div class='del'>-	prt_printf(out, "reclaim kicked:\t\t%u\n",		j-&gt;reclaim_kicked);</div><div class='del'>-	prt_printf(out, "reclaim runs in:\t%u ms\n",		time_after(j-&gt;next_reclaim, now)</div><div class='del'>-	       ? jiffies_to_msecs(j-&gt;next_reclaim - jiffies) : 0);</div><div class='del'>-	prt_printf(out, "current entry sectors:\t%u\n",		j-&gt;cur_entry_sectors);</div><div class='del'>-	prt_printf(out, "current entry error:\t%s\n",		bch2_journal_errors[j-&gt;cur_entry_error]);</div><div class='del'>-	prt_printf(out, "current entry:\t\t");</div><div class='del'>-</div><div class='del'>-	switch (s.cur_entry_offset) {</div><div class='del'>-	case JOURNAL_ENTRY_ERROR_VAL:</div><div class='del'>-		prt_printf(out, "error");</div><div class='del'>-		break;</div><div class='del'>-	case JOURNAL_ENTRY_CLOSED_VAL:</div><div class='del'>-		prt_printf(out, "closed");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		prt_printf(out, "%u/%u", s.cur_entry_offset, j-&gt;cur_entry_u64s);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "unwritten entries:");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	bch2_journal_bufs_to_text(out, j);</div><div class='del'>-</div><div class='del'>-	prt_printf(out,</div><div class='del'>-	       "replay done:\t\t%i\n",</div><div class='del'>-	       test_bit(JOURNAL_REPLAY_DONE,	&amp;j-&gt;flags));</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "space:\n");</div><div class='del'>-	prt_printf(out, "\tdiscarded\t%u:%u\n",</div><div class='del'>-	       j-&gt;space[journal_space_discarded].next_entry,</div><div class='del'>-	       j-&gt;space[journal_space_discarded].total);</div><div class='del'>-	prt_printf(out, "\tclean ondisk\t%u:%u\n",</div><div class='del'>-	       j-&gt;space[journal_space_clean_ondisk].next_entry,</div><div class='del'>-	       j-&gt;space[journal_space_clean_ondisk].total);</div><div class='del'>-	prt_printf(out, "\tclean\t\t%u:%u\n",</div><div class='del'>-	       j-&gt;space[journal_space_clean].next_entry,</div><div class='del'>-	       j-&gt;space[journal_space_clean].total);</div><div class='del'>-	prt_printf(out, "\ttotal\t\t%u:%u\n",</div><div class='del'>-	       j-&gt;space[journal_space_total].next_entry,</div><div class='del'>-	       j-&gt;space[journal_space_total].total);</div><div class='del'>-</div><div class='del'>-	for_each_member_device_rcu(c, ca, &amp;c-&gt;rw_devs[BCH_DATA_journal]) {</div><div class='del'>-		struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-</div><div class='del'>-		if (!test_bit(ca-&gt;dev_idx, c-&gt;rw_devs[BCH_DATA_journal].d))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!ja-&gt;nr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "dev %u:\n",		ca-&gt;dev_idx);</div><div class='del'>-		prt_printf(out, "\tnr\t\t%u\n",		ja-&gt;nr);</div><div class='del'>-		prt_printf(out, "\tbucket size\t%u\n",	ca-&gt;mi.bucket_size);</div><div class='del'>-		prt_printf(out, "\tavailable\t%u:%u\n",	bch2_journal_dev_buckets_available(j, ja, journal_space_discarded), ja-&gt;sectors_free);</div><div class='del'>-		prt_printf(out, "\tdiscard_idx\t%u\n",	ja-&gt;discard_idx);</div><div class='del'>-		prt_printf(out, "\tdirty_ondisk\t%u (seq %llu)\n", ja-&gt;dirty_idx_ondisk,	ja-&gt;bucket_seq[ja-&gt;dirty_idx_ondisk]);</div><div class='del'>-		prt_printf(out, "\tdirty_idx\t%u (seq %llu)\n", ja-&gt;dirty_idx,		ja-&gt;bucket_seq[ja-&gt;dirty_idx]);</div><div class='del'>-		prt_printf(out, "\tcur_idx\t\t%u (seq %llu)\n", ja-&gt;cur_idx,		ja-&gt;bucket_seq[ja-&gt;cur_idx]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	--out-&gt;atomic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_debug_to_text(struct printbuf *out, struct journal *j)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	__bch2_journal_debug_to_text(out, j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_journal_seq_pins_to_text(struct printbuf *out, struct journal *j, u64 *seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_entry_pin_list *pin_list;</div><div class='del'>-	struct journal_entry_pin *pin;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	*seq = max(*seq, j-&gt;pin.front);</div><div class='del'>-</div><div class='del'>-	if (*seq &gt;= j-&gt;pin.back) {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out-&gt;atomic++;</div><div class='del'>-</div><div class='del'>-	pin_list = journal_seq_pin(j, *seq);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%llu: count %u", *seq, atomic_read(&amp;pin_list-&gt;count));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(pin_list-&gt;list); i++)</div><div class='del'>-		list_for_each_entry(pin, &amp;pin_list-&gt;list[i], list) {</div><div class='del'>-			prt_printf(out, "\t%px %ps", pin, pin-&gt;flush);</div><div class='del'>-			prt_newline(out);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;pin_list-&gt;flushed)) {</div><div class='del'>-		prt_printf(out, "flushed:");</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(pin, &amp;pin_list-&gt;flushed, list) {</div><div class='del'>-		prt_printf(out, "\t%px %ps", pin, pin-&gt;flush);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-</div><div class='del'>-	--out-&gt;atomic;</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pins_to_text(struct printbuf *out, struct journal *j)</div><div class='del'>-{</div><div class='del'>-	u64 seq = 0;</div><div class='del'>-</div><div class='del'>-	while (!bch2_journal_seq_pins_to_text(out, j, &amp;seq))</div><div class='del'>-		seq++;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h<br/>deleted file mode 100644<br/>index 4544ce24bb8a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,448 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_JOURNAL_H</div><div class='del'>-#define _BCACHEFS_JOURNAL_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * THE JOURNAL:</div><div class='del'>- *</div><div class='del'>- * The primary purpose of the journal is to log updates (insertions) to the</div><div class='del'>- * b-tree, to avoid having to do synchronous updates to the b-tree on disk.</div><div class='del'>- *</div><div class='del'>- * Without the journal, the b-tree is always internally consistent on</div><div class='del'>- * disk - and in fact, in the earliest incarnations bcache didn't have a journal</div><div class='del'>- * but did handle unclean shutdowns by doing all index updates synchronously</div><div class='del'>- * (with coalescing).</div><div class='del'>- *</div><div class='del'>- * Updates to interior nodes still happen synchronously and without the journal</div><div class='del'>- * (for simplicity) - this may change eventually but updates to interior nodes</div><div class='del'>- * are rare enough it's not a huge priority.</div><div class='del'>- *</div><div class='del'>- * This means the journal is relatively separate from the b-tree; it consists of</div><div class='del'>- * just a list of keys and journal replay consists of just redoing those</div><div class='del'>- * insertions in same order that they appear in the journal.</div><div class='del'>- *</div><div class='del'>- * PERSISTENCE:</div><div class='del'>- *</div><div class='del'>- * For synchronous updates (where we're waiting on the index update to hit</div><div class='del'>- * disk), the journal entry will be written out immediately (or as soon as</div><div class='del'>- * possible, if the write for the previous journal entry was still in flight).</div><div class='del'>- *</div><div class='del'>- * Synchronous updates are specified by passing a closure (@flush_cl) to</div><div class='del'>- * bch2_btree_insert() or bch_btree_insert_node(), which then pass that parameter</div><div class='del'>- * down to the journalling code. That closure will wait on the journal write to</div><div class='del'>- * complete (via closure_wait()).</div><div class='del'>- *</div><div class='del'>- * If the index update wasn't synchronous, the journal entry will be</div><div class='del'>- * written out after 10 ms have elapsed, by default (the delay_ms field</div><div class='del'>- * in struct journal).</div><div class='del'>- *</div><div class='del'>- * JOURNAL ENTRIES:</div><div class='del'>- *</div><div class='del'>- * A journal entry is variable size (struct jset), it's got a fixed length</div><div class='del'>- * header and then a variable number of struct jset_entry entries.</div><div class='del'>- *</div><div class='del'>- * Journal entries are identified by monotonically increasing 64 bit sequence</div><div class='del'>- * numbers - jset-&gt;seq; other places in the code refer to this sequence number.</div><div class='del'>- *</div><div class='del'>- * A jset_entry entry contains one or more bkeys (which is what gets inserted</div><div class='del'>- * into the b-tree). We need a container to indicate which b-tree the key is</div><div class='del'>- * for; also, the roots of the various b-trees are stored in jset_entry entries</div><div class='del'>- * (one for each b-tree) - this lets us add new b-tree types without changing</div><div class='del'>- * the on disk format.</div><div class='del'>- *</div><div class='del'>- * We also keep some things in the journal header that are logically part of the</div><div class='del'>- * superblock - all the things that are frequently updated. This is for future</div><div class='del'>- * bcache on raw flash support; the superblock (which will become another</div><div class='del'>- * journal) can't be moved or wear leveled, so it contains just enough</div><div class='del'>- * information to find the main journal, and the superblock only has to be</div><div class='del'>- * rewritten when we want to move/wear level the main journal.</div><div class='del'>- *</div><div class='del'>- * JOURNAL LAYOUT ON DISK:</div><div class='del'>- *</div><div class='del'>- * The journal is written to a ringbuffer of buckets (which is kept in the</div><div class='del'>- * superblock); the individual buckets are not necessarily contiguous on disk</div><div class='del'>- * which means that journal entries are not allowed to span buckets, but also</div><div class='del'>- * that we can resize the journal at runtime if desired (unimplemented).</div><div class='del'>- *</div><div class='del'>- * The journal buckets exist in the same pool as all the other buckets that are</div><div class='del'>- * managed by the allocator and garbage collection - garbage collection marks</div><div class='del'>- * the journal buckets as metadata buckets.</div><div class='del'>- *</div><div class='del'>- * OPEN/DIRTY JOURNAL ENTRIES:</div><div class='del'>- *</div><div class='del'>- * Open/dirty journal entries are journal entries that contain b-tree updates</div><div class='del'>- * that have not yet been written out to the b-tree on disk. We have to track</div><div class='del'>- * which journal entries are dirty, and we also have to avoid wrapping around</div><div class='del'>- * the journal and overwriting old but still dirty journal entries with new</div><div class='del'>- * journal entries.</div><div class='del'>- *</div><div class='del'>- * On disk, this is represented with the "last_seq" field of struct jset;</div><div class='del'>- * last_seq is the first sequence number that journal replay has to replay.</div><div class='del'>- *</div><div class='del'>- * To avoid overwriting dirty journal entries on disk, we keep a mapping (in</div><div class='del'>- * journal_device-&gt;seq) of for each journal bucket, the highest sequence number</div><div class='del'>- * any journal entry it contains. Then, by comparing that against last_seq we</div><div class='del'>- * can determine whether that journal bucket contains dirty journal entries or</div><div class='del'>- * not.</div><div class='del'>- *</div><div class='del'>- * To track which journal entries are dirty, we maintain a fifo of refcounts</div><div class='del'>- * (where each entry corresponds to a specific sequence number) - when a ref</div><div class='del'>- * goes to 0, that journal entry is no longer dirty.</div><div class='del'>- *</div><div class='del'>- * Journalling of index updates is done at the same time as the b-tree itself is</div><div class='del'>- * being modified (see btree_insert_key()); when we add the key to the journal</div><div class='del'>- * the pending b-tree write takes a ref on the journal entry the key was added</div><div class='del'>- * to. If a pending b-tree write would need to take refs on multiple dirty</div><div class='del'>- * journal entries, it only keeps the ref on the oldest one (since a newer</div><div class='del'>- * journal entry will still be replayed if an older entry was dirty).</div><div class='del'>- *</div><div class='del'>- * JOURNAL FILLING UP:</div><div class='del'>- *</div><div class='del'>- * There are two ways the journal could fill up; either we could run out of</div><div class='del'>- * space to write to, or we could have too many open journal entries and run out</div><div class='del'>- * of room in the fifo of refcounts. Since those refcounts are decremented</div><div class='del'>- * without any locking we can't safely resize that fifo, so we handle it the</div><div class='del'>- * same way.</div><div class='del'>- *</div><div class='del'>- * If the journal fills up, we start flushing dirty btree nodes until we can</div><div class='del'>- * allocate space for a journal write again - preferentially flushing btree</div><div class='del'>- * nodes that are pinning the oldest journal entries first.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/hash.h&gt;</div><div class='del'>-</div><div class='del'>-#include "journal_types.h"</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-</div><div class='del'>-static inline void journal_wake(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	wake_up(&amp;j-&gt;wait);</div><div class='del'>-	closure_wake_up(&amp;j-&gt;async_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct journal_buf *journal_cur_buf(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return j-&gt;buf + j-&gt;reservations.idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sequence number of oldest dirty journal entry */</div><div class='del'>-</div><div class='del'>-static inline u64 journal_last_seq(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return j-&gt;pin.front;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 journal_cur_seq(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return atomic64_read(&amp;j-&gt;seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 journal_last_unwritten_seq(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return j-&gt;seq_ondisk + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int journal_state_count(union journal_res_state s, int idx)</div><div class='del'>-{</div><div class='del'>-	switch (idx) {</div><div class='del'>-	case 0: return s.buf0_count;</div><div class='del'>-	case 1: return s.buf1_count;</div><div class='del'>-	case 2: return s.buf2_count;</div><div class='del'>-	case 3: return s.buf3_count;</div><div class='del'>-	}</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void journal_state_inc(union journal_res_state *s)</div><div class='del'>-{</div><div class='del'>-	s-&gt;buf0_count += s-&gt;idx == 0;</div><div class='del'>-	s-&gt;buf1_count += s-&gt;idx == 1;</div><div class='del'>-	s-&gt;buf2_count += s-&gt;idx == 2;</div><div class='del'>-	s-&gt;buf3_count += s-&gt;idx == 3;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Amount of space that will be taken up by some keys in the journal (i.e.</div><div class='del'>- * including the jset header)</div><div class='del'>- */</div><div class='del'>-static inline unsigned jset_u64s(unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	return u64s + sizeof(struct jset_entry) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int journal_entry_overhead(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return sizeof(struct jset) / sizeof(u64) + j-&gt;entry_u64s_reserved;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct jset_entry *</div><div class='del'>-bch2_journal_add_entry_noreservation(struct journal_buf *buf, size_t u64s)</div><div class='del'>-{</div><div class='del'>-	struct jset *jset = buf-&gt;data;</div><div class='del'>-	struct jset_entry *entry = vstruct_idx(jset, le32_to_cpu(jset-&gt;u64s));</div><div class='del'>-</div><div class='del'>-	memset(entry, 0, sizeof(*entry));</div><div class='del'>-	entry-&gt;u64s = cpu_to_le16(u64s);</div><div class='del'>-</div><div class='del'>-	le32_add_cpu(&amp;jset-&gt;u64s, jset_u64s(u64s));</div><div class='del'>-</div><div class='del'>-	return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct jset_entry *</div><div class='del'>-journal_res_entry(struct journal *j, struct journal_res *res)</div><div class='del'>-{</div><div class='del'>-	return vstruct_idx(j-&gt;buf[res-&gt;idx].data, res-&gt;offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned journal_entry_init(struct jset_entry *entry, unsigned type,</div><div class='del'>-					  enum btree_id id, unsigned level,</div><div class='del'>-					  unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	entry-&gt;u64s	= cpu_to_le16(u64s);</div><div class='del'>-	entry-&gt;btree_id = id;</div><div class='del'>-	entry-&gt;level	= level;</div><div class='del'>-	entry-&gt;type	= type;</div><div class='del'>-	entry-&gt;pad[0]	= 0;</div><div class='del'>-	entry-&gt;pad[1]	= 0;</div><div class='del'>-	entry-&gt;pad[2]	= 0;</div><div class='del'>-	return jset_u64s(u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned journal_entry_set(struct jset_entry *entry, unsigned type,</div><div class='del'>-					  enum btree_id id, unsigned level,</div><div class='del'>-					  const void *data, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	unsigned ret = journal_entry_init(entry, type, id, level, u64s);</div><div class='del'>-</div><div class='del'>-	memcpy_u64s_small(entry-&gt;_data, data, u64s);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct jset_entry *</div><div class='del'>-bch2_journal_add_entry(struct journal *j, struct journal_res *res,</div><div class='del'>-			 unsigned type, enum btree_id id,</div><div class='del'>-			 unsigned level, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry *entry = journal_res_entry(j, res);</div><div class='del'>-	unsigned actual = journal_entry_init(entry, type, id, level, u64s);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(!res-&gt;ref);</div><div class='del'>-	EBUG_ON(actual &gt; res-&gt;u64s);</div><div class='del'>-</div><div class='del'>-	res-&gt;offset	+= actual;</div><div class='del'>-	res-&gt;u64s	-= actual;</div><div class='del'>-	return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool journal_entry_empty(struct jset *j)</div><div class='del'>-{</div><div class='del'>-	if (j-&gt;seq != j-&gt;last_seq)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	vstruct_for_each(j, i)</div><div class='del'>-		if (i-&gt;type == BCH_JSET_ENTRY_btree_keys &amp;&amp; i-&gt;u64s)</div><div class='del'>-			return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Drop reference on a buffer index and return true if the count has hit zero.</div><div class='del'>- */</div><div class='del'>-static inline union journal_res_state journal_state_buf_put(struct journal *j, unsigned idx)</div><div class='del'>-{</div><div class='del'>-	union journal_res_state s;</div><div class='del'>-</div><div class='del'>-	s.v = atomic64_sub_return(((union journal_res_state) {</div><div class='del'>-				    .buf0_count = idx == 0,</div><div class='del'>-				    .buf1_count = idx == 1,</div><div class='del'>-				    .buf2_count = idx == 2,</div><div class='del'>-				    .buf3_count = idx == 3,</div><div class='del'>-				    }).v, &amp;j-&gt;reservations.counter);</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_journal_entry_close(struct journal *);</div><div class='del'>-void bch2_journal_buf_put_final(struct journal *, u64, bool);</div><div class='del'>-</div><div class='del'>-static inline void __bch2_journal_buf_put(struct journal *j, unsigned idx, u64 seq)</div><div class='del'>-{</div><div class='del'>-	union journal_res_state s;</div><div class='del'>-</div><div class='del'>-	s = journal_state_buf_put(j, idx);</div><div class='del'>-	if (!journal_state_count(s, idx))</div><div class='del'>-		bch2_journal_buf_put_final(j, seq, idx == s.unwritten_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_journal_buf_put(struct journal *j, unsigned idx, u64 seq)</div><div class='del'>-{</div><div class='del'>-	union journal_res_state s;</div><div class='del'>-</div><div class='del'>-	s = journal_state_buf_put(j, idx);</div><div class='del'>-	if (!journal_state_count(s, idx)) {</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		bch2_journal_buf_put_final(j, seq, idx == s.unwritten_idx);</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function releases the journal write structure so other threads can</div><div class='del'>- * then proceed to add their keys as well.</div><div class='del'>- */</div><div class='del'>-static inline void bch2_journal_res_put(struct journal *j,</div><div class='del'>-				       struct journal_res *res)</div><div class='del'>-{</div><div class='del'>-	if (!res-&gt;ref)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lock_release(&amp;j-&gt;res_map, _THIS_IP_);</div><div class='del'>-</div><div class='del'>-	while (res-&gt;u64s)</div><div class='del'>-		bch2_journal_add_entry(j, res,</div><div class='del'>-				       BCH_JSET_ENTRY_btree_keys,</div><div class='del'>-				       0, 0, 0);</div><div class='del'>-</div><div class='del'>-	bch2_journal_buf_put(j, res-&gt;idx, res-&gt;seq);</div><div class='del'>-</div><div class='del'>-	res-&gt;ref = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_res_get_slowpath(struct journal *, struct journal_res *,</div><div class='del'>-				  unsigned);</div><div class='del'>-</div><div class='del'>-/* First bits for BCH_WATERMARK: */</div><div class='del'>-enum journal_res_flags {</div><div class='del'>-	__JOURNAL_RES_GET_NONBLOCK	= BCH_WATERMARK_BITS,</div><div class='del'>-	__JOURNAL_RES_GET_CHECK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define JOURNAL_RES_GET_NONBLOCK	(1 &lt;&lt; __JOURNAL_RES_GET_NONBLOCK)</div><div class='del'>-#define JOURNAL_RES_GET_CHECK		(1 &lt;&lt; __JOURNAL_RES_GET_CHECK)</div><div class='del'>-</div><div class='del'>-static inline int journal_res_get_fast(struct journal *j,</div><div class='del'>-				       struct journal_res *res,</div><div class='del'>-				       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	union journal_res_state old, new;</div><div class='del'>-	u64 v = atomic64_read(&amp;j-&gt;reservations.counter);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old.v = new.v = v;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check if there is still room in the current journal</div><div class='del'>-		 * entry:</div><div class='del'>-		 */</div><div class='del'>-		if (new.cur_entry_offset + res-&gt;u64s &gt; j-&gt;cur_entry_u64s)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(!journal_state_count(new, new.idx));</div><div class='del'>-</div><div class='del'>-		if ((flags &amp; BCH_WATERMARK_MASK) &lt; j-&gt;watermark)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		new.cur_entry_offset += res-&gt;u64s;</div><div class='del'>-		journal_state_inc(&amp;new);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the refcount would overflow, we have to wait:</div><div class='del'>-		 * XXX - tracepoint this:</div><div class='del'>-		 */</div><div class='del'>-		if (!journal_state_count(new, new.idx))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		if (flags &amp; JOURNAL_RES_GET_CHECK)</div><div class='del'>-			return 1;</div><div class='del'>-	} while ((v = atomic64_cmpxchg(&amp;j-&gt;reservations.counter,</div><div class='del'>-				       old.v, new.v)) != old.v);</div><div class='del'>-</div><div class='del'>-	res-&gt;ref	= true;</div><div class='del'>-	res-&gt;idx	= old.idx;</div><div class='del'>-	res-&gt;offset	= old.cur_entry_offset;</div><div class='del'>-	res-&gt;seq	= le64_to_cpu(j-&gt;buf[old.idx].data-&gt;seq);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_journal_res_get(struct journal *j, struct journal_res *res,</div><div class='del'>-				       unsigned u64s, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(res-&gt;ref);</div><div class='del'>-	EBUG_ON(!test_bit(JOURNAL_STARTED, &amp;j-&gt;flags));</div><div class='del'>-</div><div class='del'>-	res-&gt;u64s = u64s;</div><div class='del'>-</div><div class='del'>-	if (journal_res_get_fast(j, res, flags))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_res_get_slowpath(j, res, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-out:</div><div class='del'>-	if (!(flags &amp; JOURNAL_RES_GET_CHECK)) {</div><div class='del'>-		lock_acquire_shared(&amp;j-&gt;res_map, 0,</div><div class='del'>-				    (flags &amp; JOURNAL_RES_GET_NONBLOCK) != 0,</div><div class='del'>-				    NULL, _THIS_IP_);</div><div class='del'>-		EBUG_ON(!res-&gt;ref);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* journal_entry_res: */</div><div class='del'>-</div><div class='del'>-void bch2_journal_entry_res_resize(struct journal *,</div><div class='del'>-				   struct journal_entry_res *,</div><div class='del'>-				   unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_journal_flush_seq_async(struct journal *, u64, struct closure *);</div><div class='del'>-void bch2_journal_flush_async(struct journal *, struct closure *);</div><div class='del'>-</div><div class='del'>-int bch2_journal_flush_seq(struct journal *, u64);</div><div class='del'>-int bch2_journal_flush(struct journal *);</div><div class='del'>-bool bch2_journal_noflush_seq(struct journal *, u64);</div><div class='del'>-int bch2_journal_meta(struct journal *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_halt(struct journal *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_journal_error(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return j-&gt;reservations.cur_entry_offset == JOURNAL_ENTRY_ERROR_VAL</div><div class='del'>-		? -EIO : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_dev;</div><div class='del'>-</div><div class='del'>-static inline void bch2_journal_set_replay_done(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!test_bit(JOURNAL_STARTED, &amp;j-&gt;flags));</div><div class='del'>-	set_bit(JOURNAL_REPLAY_DONE, &amp;j-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_unblock(struct journal *);</div><div class='del'>-void bch2_journal_block(struct journal *);</div><div class='del'>-struct journal_buf *bch2_next_write_buffer_flush_journal_buf(struct journal *j, u64 max_seq);</div><div class='del'>-</div><div class='del'>-void __bch2_journal_debug_to_text(struct printbuf *, struct journal *);</div><div class='del'>-void bch2_journal_debug_to_text(struct printbuf *, struct journal *);</div><div class='del'>-void bch2_journal_pins_to_text(struct printbuf *, struct journal *);</div><div class='del'>-bool bch2_journal_seq_pins_to_text(struct printbuf *, struct journal *, u64 *);</div><div class='del'>-</div><div class='del'>-int bch2_set_nr_journal_buckets(struct bch_fs *, struct bch_dev *,</div><div class='del'>-				unsigned nr);</div><div class='del'>-int bch2_dev_journal_alloc(struct bch_dev *);</div><div class='del'>-int bch2_fs_journal_alloc(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_dev_journal_stop(struct journal *, struct bch_dev *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_journal_stop(struct journal *);</div><div class='del'>-int bch2_fs_journal_start(struct journal *, u64);</div><div class='del'>-</div><div class='del'>-void bch2_dev_journal_exit(struct bch_dev *);</div><div class='del'>-int bch2_dev_journal_init(struct bch_dev *, struct bch_sb *);</div><div class='del'>-void bch2_fs_journal_exit(struct journal *);</div><div class='del'>-int bch2_fs_journal_init(struct journal *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_JOURNAL_H */</div><div class='head'>diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c<br/>deleted file mode 100644<br/>index 04a1e79a5ed3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2006 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "sb-clean.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-static struct nonce journal_nonce(const struct jset *jset)</div><div class='del'>-{</div><div class='del'>-	return (struct nonce) {{</div><div class='del'>-		[0] = 0,</div><div class='del'>-		[1] = ((__le32 *) &amp;jset-&gt;seq)[0],</div><div class='del'>-		[2] = ((__le32 *) &amp;jset-&gt;seq)[1],</div><div class='del'>-		[3] = BCH_NONCE_JOURNAL,</div><div class='del'>-	}};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool jset_csum_good(struct bch_fs *c, struct jset *j, struct bch_csum *csum)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_checksum_type_valid(c, JSET_CSUM_TYPE(j))) {</div><div class='del'>-		*csum = (struct bch_csum) {};</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*csum = csum_vstruct(c, JSET_CSUM_TYPE(j), journal_nonce(j), j);</div><div class='del'>-	return !bch2_crc_cmp(j-&gt;csum, *csum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 journal_entry_radix_idx(struct bch_fs *c, u64 seq)</div><div class='del'>-{</div><div class='del'>-	return (seq - c-&gt;journal_entries_base_seq) &amp; (~0U &gt;&gt; 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __journal_replay_free(struct bch_fs *c,</div><div class='del'>-				  struct journal_replay *i)</div><div class='del'>-{</div><div class='del'>-	struct journal_replay **p =</div><div class='del'>-		genradix_ptr(&amp;c-&gt;journal_entries,</div><div class='del'>-			     journal_entry_radix_idx(c, le64_to_cpu(i-&gt;j.seq)));</div><div class='del'>-</div><div class='del'>-	BUG_ON(*p != i);</div><div class='del'>-	*p = NULL;</div><div class='del'>-	kvpfree(i, offsetof(struct journal_replay, j) +</div><div class='del'>-		vstruct_bytes(&amp;i-&gt;j));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_replay_free(struct bch_fs *c, struct journal_replay *i)</div><div class='del'>-{</div><div class='del'>-	i-&gt;ignore = true;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;opts.read_entire_journal)</div><div class='del'>-		__journal_replay_free(c, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct journal_list {</div><div class='del'>-	struct closure		cl;</div><div class='del'>-	u64			last_seq;</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	int			ret;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define JOURNAL_ENTRY_ADD_OK		0</div><div class='del'>-#define JOURNAL_ENTRY_ADD_OUT_OF_RANGE	5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Given a journal entry we just read, add it to the list of journal entries to</div><div class='del'>- * be replayed:</div><div class='del'>- */</div><div class='del'>-static int journal_entry_add(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			     struct journal_ptr entry_ptr,</div><div class='del'>-			     struct journal_list *jlist, struct jset *j)</div><div class='del'>-{</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-	struct journal_replay **_i, *i, *dup;</div><div class='del'>-	struct journal_ptr *ptr;</div><div class='del'>-	size_t bytes = vstruct_bytes(j);</div><div class='del'>-	u64 last_seq = !JSET_NO_FLUSH(j) ? le64_to_cpu(j-&gt;last_seq) : 0;</div><div class='del'>-	int ret = JOURNAL_ENTRY_ADD_OK;</div><div class='del'>-</div><div class='del'>-	/* Is this entry older than the range we need? */</div><div class='del'>-	if (!c-&gt;opts.read_entire_journal &amp;&amp;</div><div class='del'>-	    le64_to_cpu(j-&gt;seq) &lt; jlist-&gt;last_seq)</div><div class='del'>-		return JOURNAL_ENTRY_ADD_OUT_OF_RANGE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * genradixes are indexed by a ulong, not a u64, so we can't index them</div><div class='del'>-	 * by sequence number directly: Assume instead that they will all fall</div><div class='del'>-	 * within the range of +-2billion of the filrst one we find.</div><div class='del'>-	 */</div><div class='del'>-	if (!c-&gt;journal_entries_base_seq)</div><div class='del'>-		c-&gt;journal_entries_base_seq = max_t(s64, 1, le64_to_cpu(j-&gt;seq) - S32_MAX);</div><div class='del'>-</div><div class='del'>-	/* Drop entries we don't need anymore */</div><div class='del'>-	if (last_seq &gt; jlist-&gt;last_seq &amp;&amp; !c-&gt;opts.read_entire_journal) {</div><div class='del'>-		genradix_for_each_from(&amp;c-&gt;journal_entries, iter, _i,</div><div class='del'>-				       journal_entry_radix_idx(c, jlist-&gt;last_seq)) {</div><div class='del'>-			i = *_i;</div><div class='del'>-</div><div class='del'>-			if (!i || i-&gt;ignore)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (le64_to_cpu(i-&gt;j.seq) &gt;= last_seq)</div><div class='del'>-				break;</div><div class='del'>-			journal_replay_free(c, i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jlist-&gt;last_seq = max(jlist-&gt;last_seq, last_seq);</div><div class='del'>-</div><div class='del'>-	_i = genradix_ptr_alloc(&amp;c-&gt;journal_entries,</div><div class='del'>-				journal_entry_radix_idx(c, le64_to_cpu(j-&gt;seq)),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!_i)</div><div class='del'>-		return -BCH_ERR_ENOMEM_journal_entry_add;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Duplicate journal entries? If so we want the one that didn't have a</div><div class='del'>-	 * checksum error:</div><div class='del'>-	 */</div><div class='del'>-	dup = *_i;</div><div class='del'>-	if (dup) {</div><div class='del'>-		if (bytes == vstruct_bytes(&amp;dup-&gt;j) &amp;&amp;</div><div class='del'>-		    !memcmp(j, &amp;dup-&gt;j, bytes)) {</div><div class='del'>-			i = dup;</div><div class='del'>-			goto found;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!entry_ptr.csum_good) {</div><div class='del'>-			i = dup;</div><div class='del'>-			goto found;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!dup-&gt;csum_good)</div><div class='del'>-			goto replace;</div><div class='del'>-</div><div class='del'>-		fsck_err(c, journal_entry_replicas_data_mismatch,</div><div class='del'>-			 "found duplicate but non identical journal entries (seq %llu)",</div><div class='del'>-			 le64_to_cpu(j-&gt;seq));</div><div class='del'>-		i = dup;</div><div class='del'>-		goto found;</div><div class='del'>-	}</div><div class='del'>-replace:</div><div class='del'>-	i = kvpmalloc(offsetof(struct journal_replay, j) + bytes, GFP_KERNEL);</div><div class='del'>-	if (!i)</div><div class='del'>-		return -BCH_ERR_ENOMEM_journal_entry_add;</div><div class='del'>-</div><div class='del'>-	i-&gt;nr_ptrs	= 0;</div><div class='del'>-	i-&gt;csum_good	= entry_ptr.csum_good;</div><div class='del'>-	i-&gt;ignore	= false;</div><div class='del'>-	unsafe_memcpy(&amp;i-&gt;j, j, bytes, "embedded variable length struct");</div><div class='del'>-	i-&gt;ptrs[i-&gt;nr_ptrs++] = entry_ptr;</div><div class='del'>-</div><div class='del'>-	if (dup) {</div><div class='del'>-		if (dup-&gt;nr_ptrs &gt;= ARRAY_SIZE(dup-&gt;ptrs)) {</div><div class='del'>-			bch_err(c, "found too many copies of journal entry %llu",</div><div class='del'>-				le64_to_cpu(i-&gt;j.seq));</div><div class='del'>-			dup-&gt;nr_ptrs = ARRAY_SIZE(dup-&gt;ptrs) - 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The first ptr should represent the jset we kept: */</div><div class='del'>-		memcpy(i-&gt;ptrs + i-&gt;nr_ptrs,</div><div class='del'>-		       dup-&gt;ptrs,</div><div class='del'>-		       sizeof(dup-&gt;ptrs[0]) * dup-&gt;nr_ptrs);</div><div class='del'>-		i-&gt;nr_ptrs += dup-&gt;nr_ptrs;</div><div class='del'>-		__journal_replay_free(c, dup);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*_i = i;</div><div class='del'>-	return 0;</div><div class='del'>-found:</div><div class='del'>-	for (ptr = i-&gt;ptrs; ptr &lt; i-&gt;ptrs + i-&gt;nr_ptrs; ptr++) {</div><div class='del'>-		if (ptr-&gt;dev == ca-&gt;dev_idx) {</div><div class='del'>-			bch_err(c, "duplicate journal entry %llu on same device",</div><div class='del'>-				le64_to_cpu(i-&gt;j.seq));</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i-&gt;nr_ptrs &gt;= ARRAY_SIZE(i-&gt;ptrs)) {</div><div class='del'>-		bch_err(c, "found too many copies of journal entry %llu",</div><div class='del'>-			le64_to_cpu(i-&gt;j.seq));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i-&gt;ptrs[i-&gt;nr_ptrs++] = entry_ptr;</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this fills in a range with empty jset_entries: */</div><div class='del'>-static void journal_entry_null_range(void *start, void *end)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry *entry;</div><div class='del'>-</div><div class='del'>-	for (entry = start; entry != end; entry = vstruct_next(entry))</div><div class='del'>-		memset(entry, 0, sizeof(*entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define JOURNAL_ENTRY_REREAD	5</div><div class='del'>-#define JOURNAL_ENTRY_NONE	6</div><div class='del'>-#define JOURNAL_ENTRY_BAD	7</div><div class='del'>-</div><div class='del'>-static void journal_entry_err_msg(struct printbuf *out,</div><div class='del'>-				  u32 version,</div><div class='del'>-				  struct jset *jset,</div><div class='del'>-				  struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	prt_str(out, "invalid journal entry, version=");</div><div class='del'>-	bch2_version_to_text(out, version);</div><div class='del'>-</div><div class='del'>-	if (entry) {</div><div class='del'>-		prt_str(out, " type=");</div><div class='del'>-		prt_str(out, bch2_jset_entry_types[entry-&gt;type]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!jset) {</div><div class='del'>-		prt_printf(out, " in superblock");</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		prt_printf(out, " seq=%llu", le64_to_cpu(jset-&gt;seq));</div><div class='del'>-</div><div class='del'>-		if (entry)</div><div class='del'>-			prt_printf(out, " offset=%zi/%u",</div><div class='del'>-				   (u64 *) entry - jset-&gt;_data,</div><div class='del'>-				   le32_to_cpu(jset-&gt;u64s));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_str(out, ": ");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define journal_entry_err(c, version, jset, entry, _err, msg, ...)	\</div><div class='del'>-({									\</div><div class='del'>-	struct printbuf _buf = PRINTBUF;				\</div><div class='del'>-									\</div><div class='del'>-	journal_entry_err_msg(&amp;_buf, version, jset, entry);		\</div><div class='del'>-	prt_printf(&amp;_buf, msg, ##__VA_ARGS__);				\</div><div class='del'>-									\</div><div class='del'>-	switch (flags &amp; BKEY_INVALID_WRITE) {				\</div><div class='del'>-	case READ:							\</div><div class='del'>-		mustfix_fsck_err(c, _err, "%s", _buf.buf);		\</div><div class='del'>-		break;							\</div><div class='del'>-	case WRITE:							\</div><div class='del'>-		bch2_sb_error_count(c, BCH_FSCK_ERR_##_err);		\</div><div class='del'>-		bch_err(c, "corrupt metadata before write: %s\n", _buf.buf);\</div><div class='del'>-		if (bch2_fs_inconsistent(c)) {				\</div><div class='del'>-			ret = -BCH_ERR_fsck_errors_not_fixed;		\</div><div class='del'>-			goto fsck_err;					\</div><div class='del'>-		}							\</div><div class='del'>-		break;							\</div><div class='del'>-	}								\</div><div class='del'>-									\</div><div class='del'>-	printbuf_exit(&amp;_buf);						\</div><div class='del'>-	true;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define journal_entry_err_on(cond, ...)					\</div><div class='del'>-	((cond) ? journal_entry_err(__VA_ARGS__) : false)</div><div class='del'>-</div><div class='del'>-#define FSCK_DELETED_KEY	5</div><div class='del'>-</div><div class='del'>-static int journal_validate_key(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned level, enum btree_id btree_id,</div><div class='del'>-				struct bkey_i *k,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	int write = flags &amp; BKEY_INVALID_WRITE;</div><div class='del'>-	void *next = vstruct_next(entry);</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(!k-&gt;k.u64s,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_bkey_u64s_0,</div><div class='del'>-				 "k-&gt;u64s 0")) {</div><div class='del'>-		entry-&gt;u64s = cpu_to_le16((u64 *) k - entry-&gt;_data);</div><div class='del'>-		journal_entry_null_range(vstruct_next(entry), next);</div><div class='del'>-		return FSCK_DELETED_KEY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on((void *) bkey_next(k) &gt;</div><div class='del'>-				 (void *) vstruct_next(entry),</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_bkey_past_end,</div><div class='del'>-				 "extends past end of journal entry")) {</div><div class='del'>-		entry-&gt;u64s = cpu_to_le16((u64 *) k - entry-&gt;_data);</div><div class='del'>-		journal_entry_null_range(vstruct_next(entry), next);</div><div class='del'>-		return FSCK_DELETED_KEY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(k-&gt;k.format != KEY_FORMAT_CURRENT,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_bkey_bad_format,</div><div class='del'>-				 "bad format %u", k-&gt;k.format)) {</div><div class='del'>-		le16_add_cpu(&amp;entry-&gt;u64s, -((u16) k-&gt;k.u64s));</div><div class='del'>-		memmove(k, bkey_next(k), next - (void *) bkey_next(k));</div><div class='del'>-		journal_entry_null_range(vstruct_next(entry), next);</div><div class='del'>-		return FSCK_DELETED_KEY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!write)</div><div class='del'>-		bch2_bkey_compat(level, btree_id, version, big_endian,</div><div class='del'>-				 write, NULL, bkey_to_packed(k));</div><div class='del'>-</div><div class='del'>-	if (bch2_bkey_invalid(c, bkey_i_to_s_c(k),</div><div class='del'>-			      __btree_node_type(level, btree_id), write, &amp;buf)) {</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		journal_entry_err_msg(&amp;buf, version, jset, entry);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		printbuf_indent_add(&amp;buf, 2);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(k));</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		bch2_bkey_invalid(c, bkey_i_to_s_c(k),</div><div class='del'>-				  __btree_node_type(level, btree_id), write, &amp;buf);</div><div class='del'>-</div><div class='del'>-		mustfix_fsck_err(c, journal_entry_bkey_invalid,</div><div class='del'>-				 "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-		le16_add_cpu(&amp;entry-&gt;u64s, -((u16) k-&gt;k.u64s));</div><div class='del'>-		memmove(k, bkey_next(k), next - (void *) bkey_next(k));</div><div class='del'>-		journal_entry_null_range(vstruct_next(entry), next);</div><div class='del'>-</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return FSCK_DELETED_KEY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write)</div><div class='del'>-		bch2_bkey_compat(level, btree_id, version, big_endian,</div><div class='del'>-				 write, NULL, bkey_to_packed(k));</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_btree_keys_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k = entry-&gt;start;</div><div class='del'>-</div><div class='del'>-	while (k != vstruct_last(entry)) {</div><div class='del'>-		int ret = journal_validate_key(c, jset, entry,</div><div class='del'>-					       entry-&gt;level,</div><div class='del'>-					       entry-&gt;btree_id,</div><div class='del'>-					       k, version, big_endian,</div><div class='del'>-					       flags|BKEY_INVALID_JOURNAL);</div><div class='del'>-		if (ret == FSCK_DELETED_KEY)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		k = bkey_next(k);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_btree_keys_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					     struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	jset_entry_for_each_key(entry, k) {</div><div class='del'>-		if (!first) {</div><div class='del'>-			prt_newline(out);</div><div class='del'>-			prt_printf(out, "%s: ", bch2_jset_entry_types[entry-&gt;type]);</div><div class='del'>-		}</div><div class='del'>-		prt_printf(out, "btree=%s l=%u ", bch2_btree_id_str(entry-&gt;btree_id), entry-&gt;level);</div><div class='del'>-		bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(k));</div><div class='del'>-		first = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_btree_root_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k = entry-&gt;start;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(!entry-&gt;u64s ||</div><div class='del'>-				 le16_to_cpu(entry-&gt;u64s) != k-&gt;k.u64s,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_btree_root_bad_size,</div><div class='del'>-				 "invalid btree root journal entry: wrong number of keys")) {</div><div class='del'>-		void *next = vstruct_next(entry);</div><div class='del'>-		/*</div><div class='del'>-		 * we don't want to null out this jset_entry,</div><div class='del'>-		 * just the contents, so that later we can tell</div><div class='del'>-		 * we were _supposed_ to have a btree root</div><div class='del'>-		 */</div><div class='del'>-		entry-&gt;u64s = 0;</div><div class='del'>-		journal_entry_null_range(vstruct_next(entry), next);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = journal_validate_key(c, jset, entry, 1, entry-&gt;btree_id, k,</div><div class='del'>-				   version, big_endian, flags);</div><div class='del'>-	if (ret == FSCK_DELETED_KEY)</div><div class='del'>-		ret = 0;</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_btree_root_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					     struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	journal_entry_btree_keys_to_text(out, c, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_prio_ptrs_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	/* obsolete, don't care: */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_prio_ptrs_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					    struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_blacklist_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(le16_to_cpu(entry-&gt;u64s) != 1,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_blacklist_bad_size,</div><div class='del'>-		"invalid journal seq blacklist entry: bad size")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_blacklist_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					    struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_blacklist *bl =</div><div class='del'>-		container_of(entry, struct jset_entry_blacklist, entry);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "seq=%llu", le64_to_cpu(bl-&gt;seq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_blacklist_v2_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_blacklist_v2 *bl_entry;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(le16_to_cpu(entry-&gt;u64s) != 2,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_blacklist_v2_bad_size,</div><div class='del'>-		"invalid journal seq blacklist entry: bad size")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bl_entry = container_of(entry, struct jset_entry_blacklist_v2, entry);</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(le64_to_cpu(bl_entry-&gt;start) &gt;</div><div class='del'>-				 le64_to_cpu(bl_entry-&gt;end),</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_blacklist_v2_start_past_end,</div><div class='del'>-		"invalid journal seq blacklist entry: start &gt; end")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_blacklist_v2_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					       struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_blacklist_v2 *bl =</div><div class='del'>-		container_of(entry, struct jset_entry_blacklist_v2, entry);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "start=%llu end=%llu",</div><div class='del'>-	       le64_to_cpu(bl-&gt;start),</div><div class='del'>-	       le64_to_cpu(bl-&gt;end));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_usage_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_usage *u =</div><div class='del'>-		container_of(entry, struct jset_entry_usage, entry);</div><div class='del'>-	unsigned bytes = jset_u64s(le16_to_cpu(entry-&gt;u64s)) * sizeof(u64);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(bytes &lt; sizeof(*u),</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_usage_bad_size,</div><div class='del'>-				 "invalid journal entry usage: bad size")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_usage_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_usage *u =</div><div class='del'>-		container_of(entry, struct jset_entry_usage, entry);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "type=%s v=%llu",</div><div class='del'>-	       bch2_fs_usage_types[u-&gt;entry.btree_id],</div><div class='del'>-	       le64_to_cpu(u-&gt;v));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_data_usage_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_data_usage *u =</div><div class='del'>-		container_of(entry, struct jset_entry_data_usage, entry);</div><div class='del'>-	unsigned bytes = jset_u64s(le16_to_cpu(entry-&gt;u64s)) * sizeof(u64);</div><div class='del'>-	struct printbuf err = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(bytes &lt; sizeof(*u) ||</div><div class='del'>-				 bytes &lt; sizeof(*u) + u-&gt;r.nr_devs,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_data_usage_bad_size,</div><div class='del'>-				 "invalid journal entry usage: bad size")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(bch2_replicas_entry_validate(&amp;u-&gt;r, c-&gt;disk_sb.sb, &amp;err),</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_data_usage_bad_size,</div><div class='del'>-				 "invalid journal entry usage: %s", err.buf)) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;err);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_data_usage_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					     struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_data_usage *u =</div><div class='del'>-		container_of(entry, struct jset_entry_data_usage, entry);</div><div class='del'>-</div><div class='del'>-	bch2_replicas_entry_to_text(out, &amp;u-&gt;r);</div><div class='del'>-	prt_printf(out, "=%llu", le64_to_cpu(u-&gt;v));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_clock_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_clock *clock =</div><div class='del'>-		container_of(entry, struct jset_entry_clock, entry);</div><div class='del'>-	unsigned bytes = jset_u64s(le16_to_cpu(entry-&gt;u64s)) * sizeof(u64);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(bytes != sizeof(*clock),</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_clock_bad_size,</div><div class='del'>-				 "bad size")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(clock-&gt;rw &gt; 1,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_clock_bad_rw,</div><div class='del'>-				 "bad rw")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_clock_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_clock *clock =</div><div class='del'>-		container_of(entry, struct jset_entry_clock, entry);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%s=%llu", clock-&gt;rw ? "write" : "read", le64_to_cpu(clock-&gt;time));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_dev_usage_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_dev_usage *u =</div><div class='del'>-		container_of(entry, struct jset_entry_dev_usage, entry);</div><div class='del'>-	unsigned bytes = jset_u64s(le16_to_cpu(entry-&gt;u64s)) * sizeof(u64);</div><div class='del'>-	unsigned expected = sizeof(*u);</div><div class='del'>-	unsigned dev;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(bytes &lt; expected,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_dev_usage_bad_size,</div><div class='del'>-				 "bad size (%u &lt; %u)",</div><div class='del'>-				 bytes, expected)) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = le32_to_cpu(u-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(!bch2_dev_exists2(c, dev),</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_dev_usage_bad_dev,</div><div class='del'>-				 "bad dev")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(u-&gt;pad,</div><div class='del'>-				 c, version, jset, entry,</div><div class='del'>-				 journal_entry_dev_usage_bad_pad,</div><div class='del'>-				 "bad pad")) {</div><div class='del'>-		journal_entry_null_range(entry, vstruct_next(entry));</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_dev_usage_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					    struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_dev_usage *u =</div><div class='del'>-		container_of(entry, struct jset_entry_dev_usage, entry);</div><div class='del'>-	unsigned i, nr_types = jset_entry_dev_usage_nr_types(u);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "dev=%u", le32_to_cpu(u-&gt;dev));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_types; i++) {</div><div class='del'>-		bch2_prt_data_type(out, i);</div><div class='del'>-		prt_printf(out, ": buckets=%llu sectors=%llu fragmented=%llu",</div><div class='del'>-		       le64_to_cpu(u-&gt;d[i].buckets),</div><div class='del'>-		       le64_to_cpu(u-&gt;d[i].sectors),</div><div class='del'>-		       le64_to_cpu(u-&gt;d[i].fragmented));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_log_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_log_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				      struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry_log *l = container_of(entry, struct jset_entry_log, entry);</div><div class='del'>-	unsigned bytes = vstruct_bytes(entry) - offsetof(struct jset_entry_log, d);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%.*s", bytes, l-&gt;d);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_overwrite_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	return journal_entry_btree_keys_validate(c, jset, entry,</div><div class='del'>-				version, big_endian, READ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_overwrite_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					    struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	journal_entry_btree_keys_to_text(out, c, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_entry_write_buffer_keys_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	return journal_entry_btree_keys_validate(c, jset, entry,</div><div class='del'>-				version, big_endian, READ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_entry_write_buffer_keys_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					    struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	journal_entry_btree_keys_to_text(out, c, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct jset_entry_ops {</div><div class='del'>-	int (*validate)(struct bch_fs *, struct jset *,</div><div class='del'>-			struct jset_entry *, unsigned, int,</div><div class='del'>-			enum bkey_invalid_flags);</div><div class='del'>-	void (*to_text)(struct printbuf *, struct bch_fs *, struct jset_entry *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct jset_entry_ops bch2_jset_entry_ops[] = {</div><div class='del'>-#define x(f, nr)						\</div><div class='del'>-	[BCH_JSET_ENTRY_##f]	= (struct jset_entry_ops) {	\</div><div class='del'>-		.validate	= journal_entry_##f##_validate,	\</div><div class='del'>-		.to_text	= journal_entry_##f##_to_text,	\</div><div class='del'>-	},</div><div class='del'>-	BCH_JSET_ENTRY_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_journal_entry_validate(struct bch_fs *c,</div><div class='del'>-				struct jset *jset,</div><div class='del'>-				struct jset_entry *entry,</div><div class='del'>-				unsigned version, int big_endian,</div><div class='del'>-				enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	return entry-&gt;type &lt; BCH_JSET_ENTRY_NR</div><div class='del'>-		? bch2_jset_entry_ops[entry-&gt;type].validate(c, jset, entry,</div><div class='del'>-				version, big_endian, flags)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_entry_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	if (entry-&gt;type &lt; BCH_JSET_ENTRY_NR) {</div><div class='del'>-		prt_printf(out, "%s: ", bch2_jset_entry_types[entry-&gt;type]);</div><div class='del'>-		bch2_jset_entry_ops[entry-&gt;type].to_text(out, c, entry);</div><div class='del'>-	} else {</div><div class='del'>-		prt_printf(out, "(unknown type %u)", entry-&gt;type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int jset_validate_entries(struct bch_fs *c, struct jset *jset,</div><div class='del'>-				 enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	unsigned version = le32_to_cpu(jset-&gt;version);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	vstruct_for_each(jset, entry) {</div><div class='del'>-		if (journal_entry_err_on(vstruct_next(entry) &gt; vstruct_last(jset),</div><div class='del'>-				c, version, jset, entry,</div><div class='del'>-				journal_entry_past_jset_end,</div><div class='del'>-				"journal entry extends past end of jset")) {</div><div class='del'>-			jset-&gt;u64s = cpu_to_le32((u64 *) entry - jset-&gt;_data);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_journal_entry_validate(c, jset, entry,</div><div class='del'>-					version, JSET_BIG_ENDIAN(jset), flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int jset_validate(struct bch_fs *c,</div><div class='del'>-			 struct bch_dev *ca,</div><div class='del'>-			 struct jset *jset, u64 sector,</div><div class='del'>-			 enum bkey_invalid_flags flags)</div><div class='del'>-{</div><div class='del'>-	unsigned version;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(jset-&gt;magic) != jset_magic(c))</div><div class='del'>-		return JOURNAL_ENTRY_NONE;</div><div class='del'>-</div><div class='del'>-	version = le32_to_cpu(jset-&gt;version);</div><div class='del'>-	if (journal_entry_err_on(!bch2_version_compatible(version),</div><div class='del'>-			c, version, jset, NULL,</div><div class='del'>-			jset_unsupported_version,</div><div class='del'>-			"%s sector %llu seq %llu: incompatible journal entry version %u.%u",</div><div class='del'>-			ca ? ca-&gt;name : c-&gt;name,</div><div class='del'>-			sector, le64_to_cpu(jset-&gt;seq),</div><div class='del'>-			BCH_VERSION_MAJOR(version),</div><div class='del'>-			BCH_VERSION_MINOR(version))) {</div><div class='del'>-		/* don't try to continue: */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(!bch2_checksum_type_valid(c, JSET_CSUM_TYPE(jset)),</div><div class='del'>-			c, version, jset, NULL,</div><div class='del'>-			jset_unknown_csum,</div><div class='del'>-			"%s sector %llu seq %llu: journal entry with unknown csum type %llu",</div><div class='del'>-			ca ? ca-&gt;name : c-&gt;name,</div><div class='del'>-			sector, le64_to_cpu(jset-&gt;seq),</div><div class='del'>-			JSET_CSUM_TYPE(jset)))</div><div class='del'>-		ret = JOURNAL_ENTRY_BAD;</div><div class='del'>-</div><div class='del'>-	/* last_seq is ignored when JSET_NO_FLUSH is true */</div><div class='del'>-	if (journal_entry_err_on(!JSET_NO_FLUSH(jset) &amp;&amp;</div><div class='del'>-				 le64_to_cpu(jset-&gt;last_seq) &gt; le64_to_cpu(jset-&gt;seq),</div><div class='del'>-				 c, version, jset, NULL,</div><div class='del'>-				 jset_last_seq_newer_than_seq,</div><div class='del'>-				 "invalid journal entry: last_seq &gt; seq (%llu &gt; %llu)",</div><div class='del'>-				 le64_to_cpu(jset-&gt;last_seq),</div><div class='del'>-				 le64_to_cpu(jset-&gt;seq))) {</div><div class='del'>-		jset-&gt;last_seq = jset-&gt;seq;</div><div class='del'>-		return JOURNAL_ENTRY_BAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = jset_validate_entries(c, jset, flags);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int jset_validate_early(struct bch_fs *c,</div><div class='del'>-			 struct bch_dev *ca,</div><div class='del'>-			 struct jset *jset, u64 sector,</div><div class='del'>-			 unsigned bucket_sectors_left,</div><div class='del'>-			 unsigned sectors_read)</div><div class='del'>-{</div><div class='del'>-	size_t bytes = vstruct_bytes(jset);</div><div class='del'>-	unsigned version;</div><div class='del'>-	enum bkey_invalid_flags flags = BKEY_INVALID_JOURNAL;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(jset-&gt;magic) != jset_magic(c))</div><div class='del'>-		return JOURNAL_ENTRY_NONE;</div><div class='del'>-</div><div class='del'>-	version = le32_to_cpu(jset-&gt;version);</div><div class='del'>-	if (journal_entry_err_on(!bch2_version_compatible(version),</div><div class='del'>-			c, version, jset, NULL,</div><div class='del'>-			jset_unsupported_version,</div><div class='del'>-			"%s sector %llu seq %llu: unknown journal entry version %u.%u",</div><div class='del'>-			ca ? ca-&gt;name : c-&gt;name,</div><div class='del'>-			sector, le64_to_cpu(jset-&gt;seq),</div><div class='del'>-			BCH_VERSION_MAJOR(version),</div><div class='del'>-			BCH_VERSION_MINOR(version))) {</div><div class='del'>-		/* don't try to continue: */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bytes &gt; (sectors_read &lt;&lt; 9) &amp;&amp;</div><div class='del'>-	    sectors_read &lt; bucket_sectors_left)</div><div class='del'>-		return JOURNAL_ENTRY_REREAD;</div><div class='del'>-</div><div class='del'>-	if (journal_entry_err_on(bytes &gt; bucket_sectors_left &lt;&lt; 9,</div><div class='del'>-			c, version, jset, NULL,</div><div class='del'>-			jset_past_bucket_end,</div><div class='del'>-			"%s sector %llu seq %llu: journal entry too big (%zu bytes)",</div><div class='del'>-			ca ? ca-&gt;name : c-&gt;name,</div><div class='del'>-			sector, le64_to_cpu(jset-&gt;seq), bytes))</div><div class='del'>-		le32_add_cpu(&amp;jset-&gt;u64s,</div><div class='del'>-			     -((bytes - (bucket_sectors_left &lt;&lt; 9)) / 8));</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct journal_read_buf {</div><div class='del'>-	void		*data;</div><div class='del'>-	size_t		size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int journal_read_buf_realloc(struct journal_read_buf *b,</div><div class='del'>-				    size_t new_size)</div><div class='del'>-{</div><div class='del'>-	void *n;</div><div class='del'>-</div><div class='del'>-	/* the bios are sized for this many pages, max: */</div><div class='del'>-	if (new_size &gt; JOURNAL_ENTRY_SIZE_MAX)</div><div class='del'>-		return -BCH_ERR_ENOMEM_journal_read_buf_realloc;</div><div class='del'>-</div><div class='del'>-	new_size = roundup_pow_of_two(new_size);</div><div class='del'>-	n = kvpmalloc(new_size, GFP_KERNEL);</div><div class='del'>-	if (!n)</div><div class='del'>-		return -BCH_ERR_ENOMEM_journal_read_buf_realloc;</div><div class='del'>-</div><div class='del'>-	kvpfree(b-&gt;data, b-&gt;size);</div><div class='del'>-	b-&gt;data = n;</div><div class='del'>-	b-&gt;size = new_size;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_read_bucket(struct bch_dev *ca,</div><div class='del'>-			       struct journal_read_buf *buf,</div><div class='del'>-			       struct journal_list *jlist,</div><div class='del'>-			       unsigned bucket)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-	struct jset *j = NULL;</div><div class='del'>-	unsigned sectors, sectors_read = 0;</div><div class='del'>-	u64 offset = bucket_to_sector(ca, ja-&gt;buckets[bucket]),</div><div class='del'>-	    end = offset + ca-&gt;mi.bucket_size;</div><div class='del'>-	bool saw_bad = false, csum_good;</div><div class='del'>-	struct printbuf err = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	pr_debug("reading %u", bucket);</div><div class='del'>-</div><div class='del'>-	while (offset &lt; end) {</div><div class='del'>-		if (!sectors_read) {</div><div class='del'>-			struct bio *bio;</div><div class='del'>-			unsigned nr_bvecs;</div><div class='del'>-reread:</div><div class='del'>-			sectors_read = min_t(unsigned,</div><div class='del'>-				end - offset, buf-&gt;size &gt;&gt; 9);</div><div class='del'>-			nr_bvecs = buf_pages(buf-&gt;data, sectors_read &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			bio = bio_kmalloc(nr_bvecs, GFP_KERNEL);</div><div class='del'>-			bio_init(bio, ca-&gt;disk_sb.bdev, bio-&gt;bi_inline_vecs, nr_bvecs, REQ_OP_READ);</div><div class='del'>-</div><div class='del'>-			bio-&gt;bi_iter.bi_sector = offset;</div><div class='del'>-			bch2_bio_map(bio, buf-&gt;data, sectors_read &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-			ret = submit_bio_wait(bio);</div><div class='del'>-			kfree(bio);</div><div class='del'>-</div><div class='del'>-			if (bch2_dev_io_err_on(ret, ca, BCH_MEMBER_ERROR_read,</div><div class='del'>-					       "journal read error: sector %llu",</div><div class='del'>-					       offset) ||</div><div class='del'>-			    bch2_meta_read_fault("journal")) {</div><div class='del'>-				/*</div><div class='del'>-				 * We don't error out of the recovery process</div><div class='del'>-				 * here, since the relevant journal entry may be</div><div class='del'>-				 * found on a different device, and missing or</div><div class='del'>-				 * no journal entries will be handled later</div><div class='del'>-				 */</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			j = buf-&gt;data;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = jset_validate_early(c, ca, j, offset,</div><div class='del'>-				    end - offset, sectors_read);</div><div class='del'>-		switch (ret) {</div><div class='del'>-		case 0:</div><div class='del'>-			sectors = vstruct_sectors(j, c-&gt;block_bits);</div><div class='del'>-			break;</div><div class='del'>-		case JOURNAL_ENTRY_REREAD:</div><div class='del'>-			if (vstruct_bytes(j) &gt; buf-&gt;size) {</div><div class='del'>-				ret = journal_read_buf_realloc(buf,</div><div class='del'>-							vstruct_bytes(j));</div><div class='del'>-				if (ret)</div><div class='del'>-					goto err;</div><div class='del'>-			}</div><div class='del'>-			goto reread;</div><div class='del'>-		case JOURNAL_ENTRY_NONE:</div><div class='del'>-			if (!saw_bad)</div><div class='del'>-				goto out;</div><div class='del'>-			/*</div><div class='del'>-			 * On checksum error we don't really trust the size</div><div class='del'>-			 * field of the journal entry we read, so try reading</div><div class='del'>-			 * again at next block boundary:</div><div class='del'>-			 */</div><div class='del'>-			sectors = block_sectors(c);</div><div class='del'>-			goto next_block;</div><div class='del'>-		default:</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This happens sometimes if we don't have discards on -</div><div class='del'>-		 * when we've partially overwritten a bucket with new</div><div class='del'>-		 * journal entries. We don't need the rest of the</div><div class='del'>-		 * bucket:</div><div class='del'>-		 */</div><div class='del'>-		if (le64_to_cpu(j-&gt;seq) &lt; ja-&gt;bucket_seq[bucket])</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ja-&gt;bucket_seq[bucket] = le64_to_cpu(j-&gt;seq);</div><div class='del'>-</div><div class='del'>-		enum bch_csum_type csum_type = JSET_CSUM_TYPE(j);</div><div class='del'>-		struct bch_csum csum;</div><div class='del'>-		csum_good = jset_csum_good(c, j, &amp;csum);</div><div class='del'>-</div><div class='del'>-		if (bch2_dev_io_err_on(!csum_good, ca, BCH_MEMBER_ERROR_checksum,</div><div class='del'>-				       "%s",</div><div class='del'>-				       (printbuf_reset(&amp;err),</div><div class='del'>-					prt_str(&amp;err, "journal "),</div><div class='del'>-					bch2_csum_err_msg(&amp;err, csum_type, j-&gt;csum, csum),</div><div class='del'>-					err.buf)))</div><div class='del'>-			saw_bad = true;</div><div class='del'>-</div><div class='del'>-		ret = bch2_encrypt(c, JSET_CSUM_TYPE(j), journal_nonce(j),</div><div class='del'>-			     j-&gt;encrypted_start,</div><div class='del'>-			     vstruct_end(j) - (void *) j-&gt;encrypted_start);</div><div class='del'>-		bch2_fs_fatal_err_on(ret, c,</div><div class='del'>-				"error decrypting journal entry: %s",</div><div class='del'>-				bch2_err_str(ret));</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;jlist-&gt;lock);</div><div class='del'>-		ret = journal_entry_add(c, ca, (struct journal_ptr) {</div><div class='del'>-					.csum_good	= csum_good,</div><div class='del'>-					.dev		= ca-&gt;dev_idx,</div><div class='del'>-					.bucket		= bucket,</div><div class='del'>-					.bucket_offset	= offset -</div><div class='del'>-						bucket_to_sector(ca, ja-&gt;buckets[bucket]),</div><div class='del'>-					.sector		= offset,</div><div class='del'>-					}, jlist, j);</div><div class='del'>-		mutex_unlock(&amp;jlist-&gt;lock);</div><div class='del'>-</div><div class='del'>-		switch (ret) {</div><div class='del'>-		case JOURNAL_ENTRY_ADD_OK:</div><div class='del'>-			break;</div><div class='del'>-		case JOURNAL_ENTRY_ADD_OUT_OF_RANGE:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-next_block:</div><div class='del'>-		pr_debug("next");</div><div class='del'>-		offset		+= sectors;</div><div class='del'>-		sectors_read	-= sectors;</div><div class='del'>-		j = ((void *) j) + (sectors &lt;&lt; 9);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-	printbuf_exit(&amp;err);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(bch2_journal_read_device)</div><div class='del'>-{</div><div class='del'>-	closure_type(ja, struct journal_device, read);</div><div class='del'>-	struct bch_dev *ca = container_of(ja, struct bch_dev, journal);</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct journal_list *jlist =</div><div class='del'>-		container_of(cl-&gt;parent, struct journal_list, cl);</div><div class='del'>-	struct journal_replay *r, **_r;</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-	struct journal_read_buf buf = { NULL, 0 };</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!ja-&gt;nr)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = journal_read_buf_realloc(&amp;buf, PAGE_SIZE);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	pr_debug("%u journal buckets", ja-&gt;nr);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ja-&gt;nr; i++) {</div><div class='del'>-		ret = journal_read_bucket(ca, &amp;buf, jlist, i);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ja-&gt;sectors_free = ca-&gt;mi.bucket_size;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;jlist-&gt;lock);</div><div class='del'>-	genradix_for_each_reverse(&amp;c-&gt;journal_entries, iter, _r) {</div><div class='del'>-		r = *_r;</div><div class='del'>-</div><div class='del'>-		if (!r)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; r-&gt;nr_ptrs; i++) {</div><div class='del'>-			if (r-&gt;ptrs[i].dev == ca-&gt;dev_idx) {</div><div class='del'>-				unsigned wrote = bucket_remainder(ca, r-&gt;ptrs[i].sector) +</div><div class='del'>-					vstruct_sectors(&amp;r-&gt;j, c-&gt;block_bits);</div><div class='del'>-</div><div class='del'>-				ja-&gt;cur_idx = r-&gt;ptrs[i].bucket;</div><div class='del'>-				ja-&gt;sectors_free = ca-&gt;mi.bucket_size - wrote;</div><div class='del'>-				goto found;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-found:</div><div class='del'>-	mutex_unlock(&amp;jlist-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (ja-&gt;bucket_seq[ja-&gt;cur_idx] &amp;&amp;</div><div class='del'>-	    ja-&gt;sectors_free == ca-&gt;mi.bucket_size) {</div><div class='del'>-#if 0</div><div class='del'>-		/*</div><div class='del'>-		 * Debug code for ZNS support, where we (probably) want to be</div><div class='del'>-		 * correlated where we stopped in the journal to the zone write</div><div class='del'>-		 * points:</div><div class='del'>-		 */</div><div class='del'>-		bch_err(c, "ja-&gt;sectors_free == ca-&gt;mi.bucket_size");</div><div class='del'>-		bch_err(c, "cur_idx %u/%u", ja-&gt;cur_idx, ja-&gt;nr);</div><div class='del'>-		for (i = 0; i &lt; 3; i++) {</div><div class='del'>-			unsigned idx = (ja-&gt;cur_idx + ja-&gt;nr - 1 + i) % ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-			bch_err(c, "bucket_seq[%u] = %llu", idx, ja-&gt;bucket_seq[idx]);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		ja-&gt;sectors_free = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set dirty_idx to indicate the entire journal is full and needs to be</div><div class='del'>-	 * reclaimed - journal reclaim will immediately reclaim whatever isn't</div><div class='del'>-	 * pinned when it first runs:</div><div class='del'>-	 */</div><div class='del'>-	ja-&gt;discard_idx = ja-&gt;dirty_idx_ondisk =</div><div class='del'>-		ja-&gt;dirty_idx = (ja-&gt;cur_idx + 1) % ja-&gt;nr;</div><div class='del'>-out:</div><div class='del'>-	bch_verbose(c, "journal read done on device %s, ret %i", ca-&gt;name, ret);</div><div class='del'>-	kvpfree(buf.data, buf.size);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-	closure_return(cl);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	mutex_lock(&amp;jlist-&gt;lock);</div><div class='del'>-	jlist-&gt;ret = ret;</div><div class='del'>-	mutex_unlock(&amp;jlist-&gt;lock);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_ptrs_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			       struct journal_replay *j)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; j-&gt;nr_ptrs; i++) {</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, j-&gt;ptrs[i].dev);</div><div class='del'>-		u64 offset;</div><div class='del'>-</div><div class='del'>-		div64_u64_rem(j-&gt;ptrs[i].sector, ca-&gt;mi.bucket_size, &amp;offset);</div><div class='del'>-</div><div class='del'>-		if (i)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-		prt_printf(out, "%u:%u:%u (sector %llu)",</div><div class='del'>-		       j-&gt;ptrs[i].dev,</div><div class='del'>-		       j-&gt;ptrs[i].bucket,</div><div class='del'>-		       j-&gt;ptrs[i].bucket_offset,</div><div class='del'>-		       j-&gt;ptrs[i].sector);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_read(struct bch_fs *c,</div><div class='del'>-		      u64 *last_seq,</div><div class='del'>-		      u64 *blacklist_seq,</div><div class='del'>-		      u64 *start_seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_list jlist;</div><div class='del'>-	struct journal_replay *i, **_i, *prev = NULL;</div><div class='del'>-	struct genradix_iter radix_iter;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool degraded = false, last_write_torn = false;</div><div class='del'>-	u64 seq;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;jlist.cl);</div><div class='del'>-	mutex_init(&amp;jlist.lock);</div><div class='del'>-	jlist.last_seq = 0;</div><div class='del'>-	jlist.ret = 0;</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		if (!c-&gt;opts.fsck &amp;&amp;</div><div class='del'>-		    !(bch2_dev_has_data(c, ca) &amp; (1 &lt;&lt; BCH_DATA_journal)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((ca-&gt;mi.state == BCH_MEMBER_STATE_rw ||</div><div class='del'>-		     ca-&gt;mi.state == BCH_MEMBER_STATE_ro) &amp;&amp;</div><div class='del'>-		    percpu_ref_tryget(&amp;ca-&gt;io_ref))</div><div class='del'>-			closure_call(&amp;ca-&gt;journal.read,</div><div class='del'>-				     bch2_journal_read_device,</div><div class='del'>-				     system_unbound_wq,</div><div class='del'>-				     &amp;jlist.cl);</div><div class='del'>-		else</div><div class='del'>-			degraded = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closure_sync(&amp;jlist.cl);</div><div class='del'>-</div><div class='del'>-	if (jlist.ret)</div><div class='del'>-		return jlist.ret;</div><div class='del'>-</div><div class='del'>-	*last_seq	= 0;</div><div class='del'>-	*start_seq	= 0;</div><div class='del'>-	*blacklist_seq	= 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Find most recent flush entry, and ignore newer non flush entries -</div><div class='del'>-	 * those entries will be blacklisted:</div><div class='del'>-	 */</div><div class='del'>-	genradix_for_each_reverse(&amp;c-&gt;journal_entries, radix_iter, _i) {</div><div class='del'>-		enum bkey_invalid_flags flags = BKEY_INVALID_JOURNAL;</div><div class='del'>-</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!*start_seq)</div><div class='del'>-			*blacklist_seq = *start_seq = le64_to_cpu(i-&gt;j.seq) + 1;</div><div class='del'>-</div><div class='del'>-		if (JSET_NO_FLUSH(&amp;i-&gt;j)) {</div><div class='del'>-			i-&gt;ignore = true;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!last_write_torn &amp;&amp; !i-&gt;csum_good) {</div><div class='del'>-			last_write_torn = true;</div><div class='del'>-			i-&gt;ignore = true;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (journal_entry_err_on(le64_to_cpu(i-&gt;j.last_seq) &gt; le64_to_cpu(i-&gt;j.seq),</div><div class='del'>-					 c, le32_to_cpu(i-&gt;j.version), &amp;i-&gt;j, NULL,</div><div class='del'>-					 jset_last_seq_newer_than_seq,</div><div class='del'>-					 "invalid journal entry: last_seq &gt; seq (%llu &gt; %llu)",</div><div class='del'>-					 le64_to_cpu(i-&gt;j.last_seq),</div><div class='del'>-					 le64_to_cpu(i-&gt;j.seq)))</div><div class='del'>-			i-&gt;j.last_seq = i-&gt;j.seq;</div><div class='del'>-</div><div class='del'>-		*last_seq	= le64_to_cpu(i-&gt;j.last_seq);</div><div class='del'>-		*blacklist_seq	= le64_to_cpu(i-&gt;j.seq) + 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*start_seq) {</div><div class='del'>-		bch_info(c, "journal read done, but no entries found");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*last_seq) {</div><div class='del'>-		fsck_err(c, dirty_but_no_journal_entries_post_drop_nonflushes,</div><div class='del'>-			 "journal read done, but no entries found after dropping non-flushes");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_info(c, "journal read done, replaying entries %llu-%llu",</div><div class='del'>-		 *last_seq, *blacklist_seq - 1);</div><div class='del'>-</div><div class='del'>-	if (*start_seq != *blacklist_seq)</div><div class='del'>-		bch_info(c, "dropped unflushed entries %llu-%llu",</div><div class='del'>-			 *blacklist_seq, *start_seq - 1);</div><div class='del'>-</div><div class='del'>-	/* Drop blacklisted entries and entries older than last_seq: */</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, radix_iter, _i) {</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		seq = le64_to_cpu(i-&gt;j.seq);</div><div class='del'>-		if (seq &lt; *last_seq) {</div><div class='del'>-			journal_replay_free(c, i);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bch2_journal_seq_is_blacklisted(c, seq, true)) {</div><div class='del'>-			fsck_err_on(!JSET_NO_FLUSH(&amp;i-&gt;j), c,</div><div class='del'>-				    jset_seq_blacklisted,</div><div class='del'>-				    "found blacklisted journal entry %llu", seq);</div><div class='del'>-			i-&gt;ignore = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for missing entries: */</div><div class='del'>-	seq = *last_seq;</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, radix_iter, _i) {</div><div class='del'>-		i = *_i;</div><div class='del'>-</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		BUG_ON(seq &gt; le64_to_cpu(i-&gt;j.seq));</div><div class='del'>-</div><div class='del'>-		while (seq &lt; le64_to_cpu(i-&gt;j.seq)) {</div><div class='del'>-			u64 missing_start, missing_end;</div><div class='del'>-			struct printbuf buf1 = PRINTBUF, buf2 = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			while (seq &lt; le64_to_cpu(i-&gt;j.seq) &amp;&amp;</div><div class='del'>-			       bch2_journal_seq_is_blacklisted(c, seq, false))</div><div class='del'>-				seq++;</div><div class='del'>-</div><div class='del'>-			if (seq == le64_to_cpu(i-&gt;j.seq))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			missing_start = seq;</div><div class='del'>-</div><div class='del'>-			while (seq &lt; le64_to_cpu(i-&gt;j.seq) &amp;&amp;</div><div class='del'>-			       !bch2_journal_seq_is_blacklisted(c, seq, false))</div><div class='del'>-				seq++;</div><div class='del'>-</div><div class='del'>-			if (prev) {</div><div class='del'>-				bch2_journal_ptrs_to_text(&amp;buf1, c, prev);</div><div class='del'>-				prt_printf(&amp;buf1, " size %zu", vstruct_sectors(&amp;prev-&gt;j, c-&gt;block_bits));</div><div class='del'>-			} else</div><div class='del'>-				prt_printf(&amp;buf1, "(none)");</div><div class='del'>-			bch2_journal_ptrs_to_text(&amp;buf2, c, i);</div><div class='del'>-</div><div class='del'>-			missing_end = seq - 1;</div><div class='del'>-			fsck_err(c, journal_entries_missing,</div><div class='del'>-				 "journal entries %llu-%llu missing! (replaying %llu-%llu)\n"</div><div class='del'>-				 "  prev at %s\n"</div><div class='del'>-				 "  next at %s",</div><div class='del'>-				 missing_start, missing_end,</div><div class='del'>-				 *last_seq, *blacklist_seq - 1,</div><div class='del'>-				 buf1.buf, buf2.buf);</div><div class='del'>-</div><div class='del'>-			printbuf_exit(&amp;buf1);</div><div class='del'>-			printbuf_exit(&amp;buf2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev = i;</div><div class='del'>-		seq++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	genradix_for_each(&amp;c-&gt;journal_entries, radix_iter, _i) {</div><div class='del'>-		struct bch_replicas_padded replicas = {</div><div class='del'>-			.e.data_type = BCH_DATA_journal,</div><div class='del'>-			.e.nr_required = 1,</div><div class='del'>-		};</div><div class='del'>-		unsigned ptr;</div><div class='del'>-</div><div class='del'>-		i = *_i;</div><div class='del'>-		if (!i || i-&gt;ignore)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (ptr = 0; ptr &lt; i-&gt;nr_ptrs; ptr++) {</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, i-&gt;ptrs[ptr].dev);</div><div class='del'>-</div><div class='del'>-			if (!i-&gt;ptrs[ptr].csum_good)</div><div class='del'>-				bch_err_dev_offset(ca, i-&gt;ptrs[ptr].sector,</div><div class='del'>-						   "invalid journal checksum, seq %llu%s",</div><div class='del'>-						   le64_to_cpu(i-&gt;j.seq),</div><div class='del'>-						   i-&gt;csum_good ? " (had good copy on another device)" : "");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = jset_validate(c,</div><div class='del'>-				    bch_dev_bkey_exists(c, i-&gt;ptrs[0].dev),</div><div class='del'>-				    &amp;i-&gt;j,</div><div class='del'>-				    i-&gt;ptrs[0].sector,</div><div class='del'>-				    READ);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		for (ptr = 0; ptr &lt; i-&gt;nr_ptrs; ptr++)</div><div class='del'>-			replicas.e.devs[replicas.e.nr_devs++] = i-&gt;ptrs[ptr].dev;</div><div class='del'>-</div><div class='del'>-		bch2_replicas_entry_sort(&amp;replicas.e);</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf);</div><div class='del'>-		bch2_replicas_entry_to_text(&amp;buf, &amp;replicas.e);</div><div class='del'>-</div><div class='del'>-		if (!degraded &amp;&amp;</div><div class='del'>-		    !bch2_replicas_marked(c, &amp;replicas.e) &amp;&amp;</div><div class='del'>-		    (le64_to_cpu(i-&gt;j.seq) == *last_seq ||</div><div class='del'>-		     fsck_err(c, journal_entry_replicas_not_marked,</div><div class='del'>-			      "superblock not marked as containing replicas for journal entry %llu\n  %s",</div><div class='del'>-			      le64_to_cpu(i-&gt;j.seq), buf.buf))) {</div><div class='del'>-			ret = bch2_mark_replicas(c, &amp;replicas.e);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* journal write: */</div><div class='del'>-</div><div class='del'>-static void __journal_write_alloc(struct journal *j,</div><div class='del'>-				  struct journal_buf *w,</div><div class='del'>-				  struct dev_alloc_list *devs_sorted,</div><div class='del'>-				  unsigned sectors,</div><div class='del'>-				  unsigned *replicas,</div><div class='del'>-				  unsigned replicas_want)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_device *ja;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (*replicas &gt;= replicas_want)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; devs_sorted-&gt;nr; i++) {</div><div class='del'>-		ca = rcu_dereference(c-&gt;devs[devs_sorted-&gt;devs[i]]);</div><div class='del'>-		if (!ca)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ja = &amp;ca-&gt;journal;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check that we can use this device, and aren't already using</div><div class='del'>-		 * it:</div><div class='del'>-		 */</div><div class='del'>-		if (!ca-&gt;mi.durability ||</div><div class='del'>-		    ca-&gt;mi.state != BCH_MEMBER_STATE_rw ||</div><div class='del'>-		    !ja-&gt;nr ||</div><div class='del'>-		    bch2_bkey_has_device_c(bkey_i_to_s_c(&amp;w-&gt;key), ca-&gt;dev_idx) ||</div><div class='del'>-		    sectors &gt; ja-&gt;sectors_free)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_dev_stripe_increment(ca, &amp;j-&gt;wp.stripe);</div><div class='del'>-</div><div class='del'>-		bch2_bkey_append_ptr(&amp;w-&gt;key,</div><div class='del'>-			(struct bch_extent_ptr) {</div><div class='del'>-				  .offset = bucket_to_sector(ca,</div><div class='del'>-					ja-&gt;buckets[ja-&gt;cur_idx]) +</div><div class='del'>-					ca-&gt;mi.bucket_size -</div><div class='del'>-					ja-&gt;sectors_free,</div><div class='del'>-				  .dev = ca-&gt;dev_idx,</div><div class='del'>-		});</div><div class='del'>-</div><div class='del'>-		ja-&gt;sectors_free -= sectors;</div><div class='del'>-		ja-&gt;bucket_seq[ja-&gt;cur_idx] = le64_to_cpu(w-&gt;data-&gt;seq);</div><div class='del'>-</div><div class='del'>-		*replicas += ca-&gt;mi.durability;</div><div class='del'>-</div><div class='del'>-		if (*replicas &gt;= replicas_want)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * journal_write_alloc - decide where to write next journal entry</div><div class='del'>- *</div><div class='del'>- * @j:		journal object</div><div class='del'>- * @w:		journal buf (entry to be written)</div><div class='del'>- *</div><div class='del'>- * Returns: 0 on success, or -EROFS on failure</div><div class='del'>- */</div><div class='del'>-static int journal_write_alloc(struct journal *j, struct journal_buf *w)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct bch_devs_mask devs;</div><div class='del'>-	struct journal_device *ja;</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct dev_alloc_list devs_sorted;</div><div class='del'>-	unsigned sectors = vstruct_sectors(w-&gt;data, c-&gt;block_bits);</div><div class='del'>-	unsigned target = c-&gt;opts.metadata_target ?:</div><div class='del'>-		c-&gt;opts.foreground_target;</div><div class='del'>-	unsigned i, replicas = 0, replicas_want =</div><div class='del'>-		READ_ONCE(c-&gt;opts.metadata_replicas);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-retry:</div><div class='del'>-	devs = target_rw_devs(c, BCH_DATA_journal, target);</div><div class='del'>-</div><div class='del'>-	devs_sorted = bch2_dev_alloc_list(c, &amp;j-&gt;wp.stripe, &amp;devs);</div><div class='del'>-</div><div class='del'>-	__journal_write_alloc(j, w, &amp;devs_sorted,</div><div class='del'>-			      sectors, &amp;replicas, replicas_want);</div><div class='del'>-</div><div class='del'>-	if (replicas &gt;= replicas_want)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; devs_sorted.nr; i++) {</div><div class='del'>-		ca = rcu_dereference(c-&gt;devs[devs_sorted.devs[i]]);</div><div class='del'>-		if (!ca)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ja = &amp;ca-&gt;journal;</div><div class='del'>-</div><div class='del'>-		if (sectors &gt; ja-&gt;sectors_free &amp;&amp;</div><div class='del'>-		    sectors &lt;= ca-&gt;mi.bucket_size &amp;&amp;</div><div class='del'>-		    bch2_journal_dev_buckets_available(j, ja,</div><div class='del'>-					journal_space_discarded)) {</div><div class='del'>-			ja-&gt;cur_idx = (ja-&gt;cur_idx + 1) % ja-&gt;nr;</div><div class='del'>-			ja-&gt;sectors_free = ca-&gt;mi.bucket_size;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * ja-&gt;bucket_seq[ja-&gt;cur_idx] must always have</div><div class='del'>-			 * something sensible:</div><div class='del'>-			 */</div><div class='del'>-			ja-&gt;bucket_seq[ja-&gt;cur_idx] = le64_to_cpu(w-&gt;data-&gt;seq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__journal_write_alloc(j, w, &amp;devs_sorted,</div><div class='del'>-			      sectors, &amp;replicas, replicas_want);</div><div class='del'>-</div><div class='del'>-	if (replicas &lt; replicas_want &amp;&amp; target) {</div><div class='del'>-		/* Retry from all devices: */</div><div class='del'>-		target = 0;</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	BUG_ON(bkey_val_u64s(&amp;w-&gt;key.k) &gt; BCH_REPLICAS_MAX);</div><div class='del'>-</div><div class='del'>-	return replicas &gt;= c-&gt;opts.metadata_replicas_required ? 0 : -EROFS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_buf_realloc(struct journal *j, struct journal_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-</div><div class='del'>-	/* we aren't holding j-&gt;lock: */</div><div class='del'>-	unsigned new_size = READ_ONCE(j-&gt;buf_size_want);</div><div class='del'>-	void *new_buf;</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;buf_size &gt;= new_size)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	size_t btree_write_buffer_size = new_size / 64;</div><div class='del'>-</div><div class='del'>-	if (bch2_btree_write_buffer_resize(c, btree_write_buffer_size))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	new_buf = kvpmalloc(new_size, GFP_NOFS|__GFP_NOWARN);</div><div class='del'>-	if (!new_buf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memcpy(new_buf, buf-&gt;data, buf-&gt;buf_size);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	swap(buf-&gt;data,		new_buf);</div><div class='del'>-	swap(buf-&gt;buf_size,	new_size);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	kvpfree(new_buf, new_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct journal_buf *journal_last_unwritten_buf(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return j-&gt;buf + (journal_last_unwritten_seq(j) &amp; JOURNAL_BUF_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(journal_write_done)</div><div class='del'>-{</div><div class='del'>-	closure_type(j, struct journal, io);</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_buf *w = journal_last_unwritten_buf(j);</div><div class='del'>-	struct bch_replicas_padded replicas;</div><div class='del'>-	union journal_res_state old, new;</div><div class='del'>-	u64 v, seq;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_update(!JSET_NO_FLUSH(w-&gt;data)</div><div class='del'>-			       ? j-&gt;flush_write_time</div><div class='del'>-			       : j-&gt;noflush_write_time, j-&gt;write_start_time);</div><div class='del'>-</div><div class='del'>-	if (!w-&gt;devs_written.nr) {</div><div class='del'>-		bch_err(c, "unable to write journal to sufficient devices");</div><div class='del'>-		err = -EIO;</div><div class='del'>-	} else {</div><div class='del'>-		bch2_devlist_to_replicas(&amp;replicas.e, BCH_DATA_journal,</div><div class='del'>-					 w-&gt;devs_written);</div><div class='del'>-		if (bch2_mark_replicas(c, &amp;replicas.e))</div><div class='del'>-			err = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		bch2_fatal_error(c);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	seq = le64_to_cpu(w-&gt;data-&gt;seq);</div><div class='del'>-</div><div class='del'>-	if (seq &gt;= j-&gt;pin.front)</div><div class='del'>-		journal_seq_pin(j, seq)-&gt;devs = w-&gt;devs_written;</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (!JSET_NO_FLUSH(w-&gt;data)) {</div><div class='del'>-			j-&gt;flushed_seq_ondisk = seq;</div><div class='del'>-			j-&gt;last_seq_ondisk = w-&gt;last_seq;</div><div class='del'>-</div><div class='del'>-			bch2_do_discards(c);</div><div class='del'>-			closure_wake_up(&amp;c-&gt;freelist_wait);</div><div class='del'>-</div><div class='del'>-			bch2_reset_alloc_cursors(c);</div><div class='del'>-		}</div><div class='del'>-	} else if (!j-&gt;err_seq || seq &lt; j-&gt;err_seq)</div><div class='del'>-		j-&gt;err_seq	= seq;</div><div class='del'>-</div><div class='del'>-	j-&gt;seq_ondisk		= seq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Updating last_seq_ondisk may let bch2_journal_reclaim_work() discard</div><div class='del'>-	 * more buckets:</div><div class='del'>-	 *</div><div class='del'>-	 * Must come before signaling write completion, for</div><div class='del'>-	 * bch2_fs_journal_stop():</div><div class='del'>-	 */</div><div class='del'>-	if (j-&gt;watermark != BCH_WATERMARK_stripe)</div><div class='del'>-		journal_reclaim_kick(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	/* also must come before signalling write completion: */</div><div class='del'>-	closure_debug_destroy(cl);</div><div class='del'>-</div><div class='del'>-	v = atomic64_read(&amp;j-&gt;reservations.counter);</div><div class='del'>-	do {</div><div class='del'>-		old.v = new.v = v;</div><div class='del'>-		BUG_ON(journal_state_count(new, new.unwritten_idx));</div><div class='del'>-</div><div class='del'>-		new.unwritten_idx++;</div><div class='del'>-	} while ((v = atomic64_cmpxchg(&amp;j-&gt;reservations.counter,</div><div class='del'>-				       old.v, new.v)) != old.v);</div><div class='del'>-</div><div class='del'>-	bch2_journal_reclaim_fast(j);</div><div class='del'>-	bch2_journal_space_available(j);</div><div class='del'>-</div><div class='del'>-	track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_journal_max_in_flight],</div><div class='del'>-			   &amp;j-&gt;max_in_flight_start, false);</div><div class='del'>-</div><div class='del'>-	closure_wake_up(&amp;w-&gt;wait);</div><div class='del'>-	journal_wake(j);</div><div class='del'>-</div><div class='del'>-	if (!journal_state_count(new, new.unwritten_idx) &amp;&amp;</div><div class='del'>-	    journal_last_unwritten_seq(j) &lt;= journal_cur_seq(j)) {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		closure_call(&amp;j-&gt;io, bch2_journal_write, c-&gt;io_complete_wq, NULL);</div><div class='del'>-	} else if (journal_last_unwritten_seq(j) == journal_cur_seq(j) &amp;&amp;</div><div class='del'>-		   new.cur_entry_offset &lt; JOURNAL_ENTRY_CLOSED_VAL) {</div><div class='del'>-		struct journal_buf *buf = journal_cur_buf(j);</div><div class='del'>-		long delta = buf-&gt;expires - jiffies;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We don't close a journal entry to write it while there's</div><div class='del'>-		 * previous entries still in flight - the current journal entry</div><div class='del'>-		 * might want to be written now:</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		mod_delayed_work(c-&gt;io_complete_wq, &amp;j-&gt;write_work, max(0L, delta));</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_write_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bio-&gt;bi_private;</div><div class='del'>-	struct journal *j = &amp;ca-&gt;fs-&gt;journal;</div><div class='del'>-	struct journal_buf *w = journal_last_unwritten_buf(j);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_io_err_on(bio-&gt;bi_status, ca, BCH_MEMBER_ERROR_write,</div><div class='del'>-			       "error writing journal entry %llu: %s",</div><div class='del'>-			       le64_to_cpu(w-&gt;data-&gt;seq),</div><div class='del'>-			       bch2_blk_status_to_str(bio-&gt;bi_status)) ||</div><div class='del'>-	    bch2_meta_write_fault("journal")) {</div><div class='del'>-		spin_lock_irqsave(&amp;j-&gt;err_lock, flags);</div><div class='del'>-		bch2_dev_list_drop_dev(&amp;w-&gt;devs_written, ca-&gt;dev_idx);</div><div class='del'>-		spin_unlock_irqrestore(&amp;j-&gt;err_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closure_put(&amp;j-&gt;io);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CLOSURE_CALLBACK(do_journal_write)</div><div class='del'>-{</div><div class='del'>-	closure_type(j, struct journal, io);</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	struct journal_buf *w = journal_last_unwritten_buf(j);</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	unsigned sectors = vstruct_sectors(w-&gt;data, c-&gt;block_bits);</div><div class='del'>-</div><div class='del'>-	extent_for_each_ptr(bkey_i_to_s_extent(&amp;w-&gt;key), ptr) {</div><div class='del'>-		ca = bch_dev_bkey_exists(c, ptr-&gt;dev);</div><div class='del'>-		if (!percpu_ref_tryget(&amp;ca-&gt;io_ref)) {</div><div class='del'>-			/* XXX: fix this */</div><div class='del'>-			bch_err(c, "missing device for journal write\n");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		this_cpu_add(ca-&gt;io_done-&gt;sectors[WRITE][BCH_DATA_journal],</div><div class='del'>-			     sectors);</div><div class='del'>-</div><div class='del'>-		bio = ca-&gt;journal.bio;</div><div class='del'>-		bio_reset(bio, ca-&gt;disk_sb.bdev, REQ_OP_WRITE|REQ_SYNC|REQ_META);</div><div class='del'>-		bio-&gt;bi_iter.bi_sector	= ptr-&gt;offset;</div><div class='del'>-		bio-&gt;bi_end_io		= journal_write_endio;</div><div class='del'>-		bio-&gt;bi_private		= ca;</div><div class='del'>-</div><div class='del'>-		BUG_ON(bio-&gt;bi_iter.bi_sector == ca-&gt;prev_journal_sector);</div><div class='del'>-		ca-&gt;prev_journal_sector = bio-&gt;bi_iter.bi_sector;</div><div class='del'>-</div><div class='del'>-		if (!JSET_NO_FLUSH(w-&gt;data))</div><div class='del'>-			bio-&gt;bi_opf    |= REQ_FUA;</div><div class='del'>-		if (!JSET_NO_FLUSH(w-&gt;data) &amp;&amp; !w-&gt;separate_flush)</div><div class='del'>-			bio-&gt;bi_opf    |= REQ_PREFLUSH;</div><div class='del'>-</div><div class='del'>-		bch2_bio_map(bio, w-&gt;data, sectors &lt;&lt; 9);</div><div class='del'>-</div><div class='del'>-		trace_and_count(c, journal_write, bio);</div><div class='del'>-		closure_bio_submit(bio, cl);</div><div class='del'>-</div><div class='del'>-		ca-&gt;journal.bucket_seq[ca-&gt;journal.cur_idx] =</div><div class='del'>-			le64_to_cpu(w-&gt;data-&gt;seq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	continue_at(cl, journal_write_done, c-&gt;io_complete_wq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_journal_write_prep(struct journal *j, struct journal_buf *w)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct jset_entry *start, *end;</div><div class='del'>-	struct jset *jset = w-&gt;data;</div><div class='del'>-	struct journal_keys_to_wb wb = { NULL };</div><div class='del'>-	unsigned sectors, bytes, u64s;</div><div class='del'>-	unsigned long btree_roots_have = 0;</div><div class='del'>-	bool validate_before_checksum = false;</div><div class='del'>-	u64 seq = le64_to_cpu(jset-&gt;seq);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Simple compaction, dropping empty jset_entries (from journal</div><div class='del'>-	 * reservations that weren't fully used) and merging jset_entries that</div><div class='del'>-	 * can be.</div><div class='del'>-	 *</div><div class='del'>-	 * If we wanted to be really fancy here, we could sort all the keys in</div><div class='del'>-	 * the jset and drop keys that were overwritten - probably not worth it:</div><div class='del'>-	 */</div><div class='del'>-	vstruct_for_each(jset, i) {</div><div class='del'>-		unsigned u64s = le16_to_cpu(i-&gt;u64s);</div><div class='del'>-</div><div class='del'>-		/* Empty entry: */</div><div class='del'>-		if (!u64s)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * New btree roots are set by journalling them; when the journal</div><div class='del'>-		 * entry gets written we have to propagate them to</div><div class='del'>-		 * c-&gt;btree_roots</div><div class='del'>-		 *</div><div class='del'>-		 * But, every journal entry we write has to contain all the</div><div class='del'>-		 * btree roots (at least for now); so after we copy btree roots</div><div class='del'>-		 * to c-&gt;btree_roots we have to get any missing btree roots and</div><div class='del'>-		 * add them to this journal entry:</div><div class='del'>-		 */</div><div class='del'>-		switch (i-&gt;type) {</div><div class='del'>-		case BCH_JSET_ENTRY_btree_root:</div><div class='del'>-			bch2_journal_entry_to_btree_root(c, i);</div><div class='del'>-			__set_bit(i-&gt;btree_id, &amp;btree_roots_have);</div><div class='del'>-			break;</div><div class='del'>-		case BCH_JSET_ENTRY_write_buffer_keys:</div><div class='del'>-			EBUG_ON(!w-&gt;need_flush_to_write_buffer);</div><div class='del'>-</div><div class='del'>-			if (!wb.wb)</div><div class='del'>-				bch2_journal_keys_to_write_buffer_start(c, &amp;wb, seq);</div><div class='del'>-</div><div class='del'>-			struct bkey_i *k;</div><div class='del'>-			jset_entry_for_each_key(i, k) {</div><div class='del'>-				ret = bch2_journal_key_to_wb(c, &amp;wb, i-&gt;btree_id, k);</div><div class='del'>-				if (ret) {</div><div class='del'>-					bch2_fs_fatal_error(c, "-ENOMEM flushing journal keys to btree write buffer");</div><div class='del'>-					bch2_journal_keys_to_write_buffer_end(c, &amp;wb);</div><div class='del'>-					return ret;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			i-&gt;type = BCH_JSET_ENTRY_btree_keys;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wb.wb)</div><div class='del'>-		bch2_journal_keys_to_write_buffer_end(c, &amp;wb);</div><div class='del'>-	w-&gt;need_flush_to_write_buffer = false;</div><div class='del'>-</div><div class='del'>-	start = end = vstruct_last(jset);</div><div class='del'>-</div><div class='del'>-	end	= bch2_btree_roots_to_journal_entries(c, end, btree_roots_have);</div><div class='del'>-</div><div class='del'>-	bch2_journal_super_entries_add_common(c, &amp;end, seq);</div><div class='del'>-	u64s	= (u64 *) end - (u64 *) start;</div><div class='del'>-	BUG_ON(u64s &gt; j-&gt;entry_u64s_reserved);</div><div class='del'>-</div><div class='del'>-	le32_add_cpu(&amp;jset-&gt;u64s, u64s);</div><div class='del'>-</div><div class='del'>-	sectors = vstruct_sectors(jset, c-&gt;block_bits);</div><div class='del'>-	bytes	= vstruct_bytes(jset);</div><div class='del'>-</div><div class='del'>-	if (sectors &gt; w-&gt;sectors) {</div><div class='del'>-		bch2_fs_fatal_error(c, "aieeee! journal write overran available space, %zu &gt; %u (extra %u reserved %u/%u)",</div><div class='del'>-				    vstruct_bytes(jset), w-&gt;sectors &lt;&lt; 9,</div><div class='del'>-				    u64s, w-&gt;u64s_reserved, j-&gt;entry_u64s_reserved);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jset-&gt;magic		= cpu_to_le64(jset_magic(c));</div><div class='del'>-	jset-&gt;version		= cpu_to_le32(c-&gt;sb.version);</div><div class='del'>-</div><div class='del'>-	SET_JSET_BIG_ENDIAN(jset, CPU_BIG_ENDIAN);</div><div class='del'>-	SET_JSET_CSUM_TYPE(jset, bch2_meta_checksum_type(c));</div><div class='del'>-</div><div class='del'>-	if (!JSET_NO_FLUSH(jset) &amp;&amp; journal_entry_empty(jset))</div><div class='del'>-		j-&gt;last_empty_seq = seq;</div><div class='del'>-</div><div class='del'>-	if (bch2_csum_type_is_encryption(JSET_CSUM_TYPE(jset)))</div><div class='del'>-		validate_before_checksum = true;</div><div class='del'>-</div><div class='del'>-	if (le32_to_cpu(jset-&gt;version) &lt; bcachefs_metadata_version_current)</div><div class='del'>-		validate_before_checksum = true;</div><div class='del'>-</div><div class='del'>-	if (validate_before_checksum &amp;&amp;</div><div class='del'>-	    (ret = jset_validate(c, NULL, jset, 0, WRITE)))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_encrypt(c, JSET_CSUM_TYPE(jset), journal_nonce(jset),</div><div class='del'>-		    jset-&gt;encrypted_start,</div><div class='del'>-		    vstruct_end(jset) - (void *) jset-&gt;encrypted_start);</div><div class='del'>-	if (bch2_fs_fatal_err_on(ret, c,</div><div class='del'>-			"error decrypting journal entry: %i", ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	jset-&gt;csum = csum_vstruct(c, JSET_CSUM_TYPE(jset),</div><div class='del'>-				  journal_nonce(jset), jset);</div><div class='del'>-</div><div class='del'>-	if (!validate_before_checksum &amp;&amp;</div><div class='del'>-	    (ret = jset_validate(c, NULL, jset, 0, WRITE)))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	memset((void *) jset + bytes, 0, (sectors &lt;&lt; 9) - bytes);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_journal_write_pick_flush(struct journal *j, struct journal_buf *w)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	int error = bch2_journal_error(j);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the journal is in an error state - we did an emergency shutdown -</div><div class='del'>-	 * we prefer to continue doing journal writes. We just mark them as</div><div class='del'>-	 * noflush so they'll never be used, but they'll still be visible by the</div><div class='del'>-	 * list_journal tool - this helps in debugging.</div><div class='del'>-	 *</div><div class='del'>-	 * There's a caveat: the first journal write after marking the</div><div class='del'>-	 * superblock dirty must always be a flush write, because on startup</div><div class='del'>-	 * from a clean shutdown we didn't necessarily read the journal and the</div><div class='del'>-	 * new journal write might overwrite whatever was in the journal</div><div class='del'>-	 * previously - we can't leave the journal without any flush writes in</div><div class='del'>-	 * it.</div><div class='del'>-	 *</div><div class='del'>-	 * So if we're in an error state, and we're still starting up, we don't</div><div class='del'>-	 * write anything at all.</div><div class='del'>-	 */</div><div class='del'>-	if (error &amp;&amp; test_bit(JOURNAL_NEED_FLUSH_WRITE, &amp;j-&gt;flags))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (error ||</div><div class='del'>-	    w-&gt;noflush ||</div><div class='del'>-	    (!w-&gt;must_flush &amp;&amp;</div><div class='del'>-	     (jiffies - j-&gt;last_flush_write) &lt; msecs_to_jiffies(c-&gt;opts.journal_flush_delay) &amp;&amp;</div><div class='del'>-	     test_bit(JOURNAL_MAY_SKIP_FLUSH, &amp;j-&gt;flags))) {</div><div class='del'>-		w-&gt;noflush = true;</div><div class='del'>-		SET_JSET_NO_FLUSH(w-&gt;data, true);</div><div class='del'>-		w-&gt;data-&gt;last_seq	= 0;</div><div class='del'>-		w-&gt;last_seq		= 0;</div><div class='del'>-</div><div class='del'>-		j-&gt;nr_noflush_writes++;</div><div class='del'>-	} else {</div><div class='del'>-		j-&gt;last_flush_write = jiffies;</div><div class='del'>-		j-&gt;nr_flush_writes++;</div><div class='del'>-		clear_bit(JOURNAL_NEED_FLUSH_WRITE, &amp;j-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CLOSURE_CALLBACK(bch2_journal_write)</div><div class='del'>-{</div><div class='del'>-	closure_type(j, struct journal, io);</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_buf *w = journal_last_unwritten_buf(j);</div><div class='del'>-	struct bch_replicas_padded replicas;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	struct printbuf journal_debug_buf = PRINTBUF;</div><div class='del'>-	unsigned nr_rw_members = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(BCH_SB_CLEAN(c-&gt;disk_sb.sb));</div><div class='del'>-</div><div class='del'>-	j-&gt;write_start_time = local_clock();</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	ret = bch2_journal_write_pick_flush(j, w);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;j-&gt;buf_lock);</div><div class='del'>-	journal_buf_realloc(j, w);</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_write_prep(j, w);</div><div class='del'>-	mutex_unlock(&amp;j-&gt;buf_lock);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	j-&gt;entry_bytes_written += vstruct_bytes(w-&gt;data);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		ret = journal_write_alloc(j, w);</div><div class='del'>-		if (!ret || !j-&gt;can_discard)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		bch2_journal_do_discards(j);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		__bch2_journal_debug_to_text(&amp;journal_debug_buf, j);</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		bch_err(c, "Unable to allocate journal write:\n%s",</div><div class='del'>-			journal_debug_buf.buf);</div><div class='del'>-		printbuf_exit(&amp;journal_debug_buf);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * write is allocated, no longer need to account for it in</div><div class='del'>-	 * bch2_journal_space_available():</div><div class='del'>-	 */</div><div class='del'>-	w-&gt;sectors = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * journal entry has been compacted and allocated, recalculate space</div><div class='del'>-	 * available:</div><div class='del'>-	 */</div><div class='del'>-	bch2_journal_space_available(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	w-&gt;devs_written = bch2_bkey_devs(bkey_i_to_s_c(&amp;w-&gt;key));</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges)</div><div class='del'>-		goto no_io;</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca)</div><div class='del'>-		nr_rw_members++;</div><div class='del'>-</div><div class='del'>-	if (nr_rw_members &gt; 1)</div><div class='del'>-		w-&gt;separate_flush = true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Mark journal replicas before we submit the write to guarantee</div><div class='del'>-	 * recovery will find the journal entries after a crash.</div><div class='del'>-	 */</div><div class='del'>-	bch2_devlist_to_replicas(&amp;replicas.e, BCH_DATA_journal,</div><div class='del'>-				 w-&gt;devs_written);</div><div class='del'>-	ret = bch2_mark_replicas(c, &amp;replicas.e);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!JSET_NO_FLUSH(w-&gt;data) &amp;&amp; w-&gt;separate_flush) {</div><div class='del'>-		for_each_rw_member(c, ca) {</div><div class='del'>-			percpu_ref_get(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-			bio = ca-&gt;journal.bio;</div><div class='del'>-			bio_reset(bio, ca-&gt;disk_sb.bdev, REQ_OP_FLUSH);</div><div class='del'>-			bio-&gt;bi_end_io		= journal_write_endio;</div><div class='del'>-			bio-&gt;bi_private		= ca;</div><div class='del'>-			closure_bio_submit(bio, cl);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	continue_at(cl, do_journal_write, c-&gt;io_complete_wq);</div><div class='del'>-	return;</div><div class='del'>-no_io:</div><div class='del'>-	continue_at(cl, journal_write_done, c-&gt;io_complete_wq);</div><div class='del'>-	return;</div><div class='del'>-err:</div><div class='del'>-	bch2_fatal_error(c);</div><div class='del'>-	continue_at(cl, journal_write_done, c-&gt;io_complete_wq);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/journal_io.h b/fs/bcachefs/journal_io.h<br/>deleted file mode 100644<br/>index c035e7c108e1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_io.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_JOURNAL_IO_H</div><div class='del'>-#define _BCACHEFS_JOURNAL_IO_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Only used for holding the journal entries we read in btree_journal_read()</div><div class='del'>- * during cache_registration</div><div class='del'>- */</div><div class='del'>-struct journal_replay {</div><div class='del'>-	struct journal_ptr {</div><div class='del'>-		bool		csum_good;</div><div class='del'>-		u8		dev;</div><div class='del'>-		u32		bucket;</div><div class='del'>-		u32		bucket_offset;</div><div class='del'>-		u64		sector;</div><div class='del'>-	}			ptrs[BCH_REPLICAS_MAX];</div><div class='del'>-	unsigned		nr_ptrs;</div><div class='del'>-</div><div class='del'>-	bool			csum_good;</div><div class='del'>-	bool			ignore;</div><div class='del'>-	/* must be last: */</div><div class='del'>-	struct jset		j;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct jset_entry *__jset_entry_type_next(struct jset *jset,</div><div class='del'>-					struct jset_entry *entry, unsigned type)</div><div class='del'>-{</div><div class='del'>-	while (entry &lt; vstruct_last(jset)) {</div><div class='del'>-		if (entry-&gt;type == type)</div><div class='del'>-			return entry;</div><div class='del'>-</div><div class='del'>-		entry = vstruct_next(entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_jset_entry_type(entry, jset, type)			\</div><div class='del'>-	for (entry = (jset)-&gt;start;					\</div><div class='del'>-	     (entry = __jset_entry_type_next(jset, entry, type));	\</div><div class='del'>-	     entry = vstruct_next(entry))</div><div class='del'>-</div><div class='del'>-#define jset_entry_for_each_key(_e, _k)					\</div><div class='del'>-	for (_k = (_e)-&gt;start;						\</div><div class='del'>-	     _k &lt; vstruct_last(_e);					\</div><div class='del'>-	     _k = bkey_next(_k))</div><div class='del'>-</div><div class='del'>-#define for_each_jset_key(k, entry, jset)				\</div><div class='del'>-	for_each_jset_entry_type(entry, jset, BCH_JSET_ENTRY_btree_keys)\</div><div class='del'>-		jset_entry_for_each_key(entry, k)</div><div class='del'>-</div><div class='del'>-int bch2_journal_entry_validate(struct bch_fs *, struct jset *,</div><div class='del'>-				struct jset_entry *, unsigned, int,</div><div class='del'>-				enum bkey_invalid_flags);</div><div class='del'>-void bch2_journal_entry_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-				struct jset_entry *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_ptrs_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			       struct journal_replay *);</div><div class='del'>-</div><div class='del'>-int bch2_journal_read(struct bch_fs *, u64 *, u64 *, u64 *);</div><div class='del'>-</div><div class='del'>-CLOSURE_CALLBACK(bch2_journal_write);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_JOURNAL_IO_H */</div><div class='head'>diff --git a/fs/bcachefs/journal_reclaim.c b/fs/bcachefs/journal_reclaim.c<br/>deleted file mode 100644<br/>index 820d25e19e5f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_reclaim.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_reclaim.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,905 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-</div><div class='del'>-/* Free space calculations: */</div><div class='del'>-</div><div class='del'>-static unsigned journal_space_from(struct journal_device *ja,</div><div class='del'>-				   enum journal_space_from from)</div><div class='del'>-{</div><div class='del'>-	switch (from) {</div><div class='del'>-	case journal_space_discarded:</div><div class='del'>-		return ja-&gt;discard_idx;</div><div class='del'>-	case journal_space_clean_ondisk:</div><div class='del'>-		return ja-&gt;dirty_idx_ondisk;</div><div class='del'>-	case journal_space_clean:</div><div class='del'>-		return ja-&gt;dirty_idx;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_journal_dev_buckets_available(struct journal *j,</div><div class='del'>-					    struct journal_device *ja,</div><div class='del'>-					    enum journal_space_from from)</div><div class='del'>-{</div><div class='del'>-	unsigned available = (journal_space_from(ja, from) -</div><div class='del'>-			      ja-&gt;cur_idx - 1 + ja-&gt;nr) % ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't use the last bucket unless writing the new last_seq</div><div class='del'>-	 * will make another bucket available:</div><div class='del'>-	 */</div><div class='del'>-	if (available &amp;&amp; ja-&gt;dirty_idx_ondisk == ja-&gt;dirty_idx)</div><div class='del'>-		--available;</div><div class='del'>-</div><div class='del'>-	return available;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_set_watermark(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	bool low_on_space = j-&gt;space[journal_space_clean].total * 4 &lt;=</div><div class='del'>-		j-&gt;space[journal_space_total].total;</div><div class='del'>-	bool low_on_pin = fifo_free(&amp;j-&gt;pin) &lt; j-&gt;pin.size / 4;</div><div class='del'>-	bool low_on_wb = bch2_btree_write_buffer_must_wait(c);</div><div class='del'>-	unsigned watermark = low_on_space || low_on_pin || low_on_wb</div><div class='del'>-		? BCH_WATERMARK_reclaim</div><div class='del'>-		: BCH_WATERMARK_stripe;</div><div class='del'>-</div><div class='del'>-	if (track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_journal_low_on_space],</div><div class='del'>-			       &amp;j-&gt;low_on_space_start, low_on_space) ||</div><div class='del'>-	    track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_journal_low_on_pin],</div><div class='del'>-			       &amp;j-&gt;low_on_pin_start, low_on_pin) ||</div><div class='del'>-	    track_event_change(&amp;c-&gt;times[BCH_TIME_blocked_write_buffer_full],</div><div class='del'>-			       &amp;j-&gt;write_buffer_full_start, low_on_wb))</div><div class='del'>-		trace_and_count(c, journal_full, c);</div><div class='del'>-</div><div class='del'>-	swap(watermark, j-&gt;watermark);</div><div class='del'>-	if (watermark &gt; j-&gt;watermark)</div><div class='del'>-		journal_wake(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct journal_space</div><div class='del'>-journal_dev_space_available(struct journal *j, struct bch_dev *ca,</div><div class='del'>-			    enum journal_space_from from)</div><div class='del'>-{</div><div class='del'>-	struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-	unsigned sectors, buckets, unwritten;</div><div class='del'>-	u64 seq;</div><div class='del'>-</div><div class='del'>-	if (from == journal_space_total)</div><div class='del'>-		return (struct journal_space) {</div><div class='del'>-			.next_entry	= ca-&gt;mi.bucket_size,</div><div class='del'>-			.total		= ca-&gt;mi.bucket_size * ja-&gt;nr,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	buckets = bch2_journal_dev_buckets_available(j, ja, from);</div><div class='del'>-	sectors = ja-&gt;sectors_free;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We that we don't allocate the space for a journal entry</div><div class='del'>-	 * until we write it out - thus, account for it here:</div><div class='del'>-	 */</div><div class='del'>-	for (seq = journal_last_unwritten_seq(j);</div><div class='del'>-	     seq &lt;= journal_cur_seq(j);</div><div class='del'>-	     seq++) {</div><div class='del'>-		unwritten = j-&gt;buf[seq &amp; JOURNAL_BUF_MASK].sectors;</div><div class='del'>-</div><div class='del'>-		if (!unwritten)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* entry won't fit on this device, skip: */</div><div class='del'>-		if (unwritten &gt; ca-&gt;mi.bucket_size)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (unwritten &gt;= sectors) {</div><div class='del'>-			if (!buckets) {</div><div class='del'>-				sectors = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			buckets--;</div><div class='del'>-			sectors = ca-&gt;mi.bucket_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sectors -= unwritten;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sectors &lt; ca-&gt;mi.bucket_size &amp;&amp; buckets) {</div><div class='del'>-		buckets--;</div><div class='del'>-		sectors = ca-&gt;mi.bucket_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (struct journal_space) {</div><div class='del'>-		.next_entry	= sectors,</div><div class='del'>-		.total		= sectors + buckets * ca-&gt;mi.bucket_size,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct journal_space __journal_space_available(struct journal *j, unsigned nr_devs_want,</div><div class='del'>-			    enum journal_space_from from)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	unsigned pos, nr_devs = 0;</div><div class='del'>-	struct journal_space space, dev_space[BCH_SB_MEMBERS_MAX];</div><div class='del'>-</div><div class='del'>-	BUG_ON(nr_devs_want &gt; ARRAY_SIZE(dev_space));</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, &amp;c-&gt;rw_devs[BCH_DATA_journal]) {</div><div class='del'>-		if (!ca-&gt;journal.nr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		space = journal_dev_space_available(j, ca, from);</div><div class='del'>-		if (!space.next_entry)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (pos = 0; pos &lt; nr_devs; pos++)</div><div class='del'>-			if (space.total &gt; dev_space[pos].total)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		array_insert_item(dev_space, nr_devs, pos, space);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	if (nr_devs &lt; nr_devs_want)</div><div class='del'>-		return (struct journal_space) { 0, 0 };</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We sorted largest to smallest, and we want the smallest out of the</div><div class='del'>-	 * @nr_devs_want largest devices:</div><div class='del'>-	 */</div><div class='del'>-	return dev_space[nr_devs_want - 1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_space_available(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	unsigned clean, clean_ondisk, total;</div><div class='del'>-	unsigned max_entry_size	 = min(j-&gt;buf[0].buf_size &gt;&gt; 9,</div><div class='del'>-				       j-&gt;buf[1].buf_size &gt;&gt; 9);</div><div class='del'>-	unsigned nr_online = 0, nr_devs_want;</div><div class='del'>-	bool can_discard = false;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, &amp;c-&gt;rw_devs[BCH_DATA_journal]) {</div><div class='del'>-		struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-</div><div class='del'>-		if (!ja-&gt;nr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		while (ja-&gt;dirty_idx != ja-&gt;cur_idx &amp;&amp;</div><div class='del'>-		       ja-&gt;bucket_seq[ja-&gt;dirty_idx] &lt; journal_last_seq(j))</div><div class='del'>-			ja-&gt;dirty_idx = (ja-&gt;dirty_idx + 1) % ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-		while (ja-&gt;dirty_idx_ondisk != ja-&gt;dirty_idx &amp;&amp;</div><div class='del'>-		       ja-&gt;bucket_seq[ja-&gt;dirty_idx_ondisk] &lt; j-&gt;last_seq_ondisk)</div><div class='del'>-			ja-&gt;dirty_idx_ondisk = (ja-&gt;dirty_idx_ondisk + 1) % ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-		if (ja-&gt;discard_idx != ja-&gt;dirty_idx_ondisk)</div><div class='del'>-			can_discard = true;</div><div class='del'>-</div><div class='del'>-		max_entry_size = min_t(unsigned, max_entry_size, ca-&gt;mi.bucket_size);</div><div class='del'>-		nr_online++;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	j-&gt;can_discard = can_discard;</div><div class='del'>-</div><div class='del'>-	if (nr_online &lt; c-&gt;opts.metadata_replicas_required) {</div><div class='del'>-		ret = JOURNAL_ERR_insufficient_devices;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr_devs_want = min_t(unsigned, nr_online, c-&gt;opts.metadata_replicas);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; journal_space_nr; i++)</div><div class='del'>-		j-&gt;space[i] = __journal_space_available(j, nr_devs_want, i);</div><div class='del'>-</div><div class='del'>-	clean_ondisk	= j-&gt;space[journal_space_clean_ondisk].total;</div><div class='del'>-	clean		= j-&gt;space[journal_space_clean].total;</div><div class='del'>-	total		= j-&gt;space[journal_space_total].total;</div><div class='del'>-</div><div class='del'>-	if (!j-&gt;space[journal_space_discarded].next_entry)</div><div class='del'>-		ret = JOURNAL_ERR_journal_full;</div><div class='del'>-</div><div class='del'>-	if ((j-&gt;space[journal_space_clean_ondisk].next_entry &lt;</div><div class='del'>-	     j-&gt;space[journal_space_clean_ondisk].total) &amp;&amp;</div><div class='del'>-	    (clean - clean_ondisk &lt;= total / 8) &amp;&amp;</div><div class='del'>-	    (clean_ondisk * 2 &gt; clean))</div><div class='del'>-		set_bit(JOURNAL_MAY_SKIP_FLUSH, &amp;j-&gt;flags);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(JOURNAL_MAY_SKIP_FLUSH, &amp;j-&gt;flags);</div><div class='del'>-</div><div class='del'>-	bch2_journal_set_watermark(j);</div><div class='del'>-out:</div><div class='del'>-	j-&gt;cur_entry_sectors	= !ret ? j-&gt;space[journal_space_discarded].next_entry : 0;</div><div class='del'>-	j-&gt;cur_entry_error	= ret;</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		journal_wake(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Discards - last part of journal reclaim: */</div><div class='del'>-</div><div class='del'>-static bool should_discard_bucket(struct journal *j, struct journal_device *ja)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	ret = ja-&gt;discard_idx != ja-&gt;dirty_idx_ondisk;</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Advance ja-&gt;discard_idx as long as it points to buckets that are no longer</div><div class='del'>- * dirty, issuing discards if necessary:</div><div class='del'>- */</div><div class='del'>-void bch2_journal_do_discards(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;j-&gt;discard_lock);</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca) {</div><div class='del'>-		struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-</div><div class='del'>-		while (should_discard_bucket(j, ja)) {</div><div class='del'>-			if (!c-&gt;opts.nochanges &amp;&amp;</div><div class='del'>-			    ca-&gt;mi.discard &amp;&amp;</div><div class='del'>-			    bdev_max_discard_sectors(ca-&gt;disk_sb.bdev))</div><div class='del'>-				blkdev_issue_discard(ca-&gt;disk_sb.bdev,</div><div class='del'>-					bucket_to_sector(ca,</div><div class='del'>-						ja-&gt;buckets[ja-&gt;discard_idx]),</div><div class='del'>-					ca-&gt;mi.bucket_size, GFP_NOFS);</div><div class='del'>-</div><div class='del'>-			spin_lock(&amp;j-&gt;lock);</div><div class='del'>-			ja-&gt;discard_idx = (ja-&gt;discard_idx + 1) % ja-&gt;nr;</div><div class='del'>-</div><div class='del'>-			bch2_journal_space_available(j);</div><div class='del'>-			spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;j-&gt;discard_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Journal entry pinning - machinery for holding a reference on a given journal</div><div class='del'>- * entry, holding it open to ensure it gets replayed during recovery:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bch2_journal_reclaim_fast(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	bool popped = false;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unpin journal entries whose reference counts reached zero, meaning</div><div class='del'>-	 * all btree nodes got written out</div><div class='del'>-	 */</div><div class='del'>-	while (!fifo_empty(&amp;j-&gt;pin) &amp;&amp;</div><div class='del'>-	       j-&gt;pin.front &lt;= j-&gt;seq_ondisk &amp;&amp;</div><div class='del'>-	       !atomic_read(&amp;fifo_peek_front(&amp;j-&gt;pin).count)) {</div><div class='del'>-		j-&gt;pin.front++;</div><div class='del'>-		popped = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (popped)</div><div class='del'>-		bch2_journal_space_available(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_journal_pin_put(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_entry_pin_list *pin_list = journal_seq_pin(j, seq);</div><div class='del'>-</div><div class='del'>-	return atomic_dec_and_test(&amp;pin_list-&gt;count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_put(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	if (__bch2_journal_pin_put(j, seq)) {</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		bch2_journal_reclaim_fast(j);</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __journal_pin_drop(struct journal *j,</div><div class='del'>-				      struct journal_entry_pin *pin)</div><div class='del'>-{</div><div class='del'>-	struct journal_entry_pin_list *pin_list;</div><div class='del'>-</div><div class='del'>-	if (!journal_pin_active(pin))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (j-&gt;flush_in_progress == pin)</div><div class='del'>-		j-&gt;flush_in_progress_dropped = true;</div><div class='del'>-</div><div class='del'>-	pin_list = journal_seq_pin(j, pin-&gt;seq);</div><div class='del'>-	pin-&gt;seq = 0;</div><div class='del'>-	list_del_init(&amp;pin-&gt;list);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unpinning a journal entry may make journal_next_bucket() succeed, if</div><div class='del'>-	 * writing a new last_seq will now make another bucket available:</div><div class='del'>-	 */</div><div class='del'>-	return atomic_dec_and_test(&amp;pin_list-&gt;count) &amp;&amp;</div><div class='del'>-		pin_list == &amp;fifo_peek_front(&amp;j-&gt;pin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_drop(struct journal *j,</div><div class='del'>-			   struct journal_entry_pin *pin)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	if (__journal_pin_drop(j, pin))</div><div class='del'>-		bch2_journal_reclaim_fast(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum journal_pin_type journal_pin_type(journal_pin_flush_fn fn)</div><div class='del'>-{</div><div class='del'>-	if (fn == bch2_btree_node_flush0 ||</div><div class='del'>-	    fn == bch2_btree_node_flush1)</div><div class='del'>-		return JOURNAL_PIN_btree;</div><div class='del'>-	else if (fn == bch2_btree_key_cache_journal_flush)</div><div class='del'>-		return JOURNAL_PIN_key_cache;</div><div class='del'>-	else</div><div class='del'>-		return JOURNAL_PIN_other;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_journal_pin_set_locked(struct journal *j, u64 seq,</div><div class='del'>-			  struct journal_entry_pin *pin,</div><div class='del'>-			  journal_pin_flush_fn flush_fn,</div><div class='del'>-			  enum journal_pin_type type)</div><div class='del'>-{</div><div class='del'>-	struct journal_entry_pin_list *pin_list = journal_seq_pin(j, seq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * flush_fn is how we identify journal pins in debugfs, so must always</div><div class='del'>-	 * exist, even if it doesn't do anything:</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(!flush_fn);</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;pin_list-&gt;count);</div><div class='del'>-	pin-&gt;seq	= seq;</div><div class='del'>-	pin-&gt;flush	= flush_fn;</div><div class='del'>-	list_add(&amp;pin-&gt;list, &amp;pin_list-&gt;list[type]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_copy(struct journal *j,</div><div class='del'>-			   struct journal_entry_pin *dst,</div><div class='del'>-			   struct journal_entry_pin *src,</div><div class='del'>-			   journal_pin_flush_fn flush_fn)</div><div class='del'>-{</div><div class='del'>-	bool reclaim;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	u64 seq = READ_ONCE(src-&gt;seq);</div><div class='del'>-</div><div class='del'>-	if (seq &lt; journal_last_seq(j)) {</div><div class='del'>-		/*</div><div class='del'>-		 * bch2_journal_pin_copy() raced with bch2_journal_pin_drop() on</div><div class='del'>-		 * the src pin - with the pin dropped, the entry to pin might no</div><div class='del'>-		 * longer to exist, but that means there's no longer anything to</div><div class='del'>-		 * copy and we can bail out here:</div><div class='del'>-		 */</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reclaim = __journal_pin_drop(j, dst);</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_set_locked(j, seq, dst, flush_fn, journal_pin_type(flush_fn));</div><div class='del'>-</div><div class='del'>-	if (reclaim)</div><div class='del'>-		bch2_journal_reclaim_fast(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the journal is currently full,  we might want to call flush_fn</div><div class='del'>-	 * immediately:</div><div class='del'>-	 */</div><div class='del'>-	journal_wake(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_set(struct journal *j, u64 seq,</div><div class='del'>-			  struct journal_entry_pin *pin,</div><div class='del'>-			  journal_pin_flush_fn flush_fn)</div><div class='del'>-{</div><div class='del'>-	bool reclaim;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(seq &lt; journal_last_seq(j));</div><div class='del'>-</div><div class='del'>-	reclaim = __journal_pin_drop(j, pin);</div><div class='del'>-</div><div class='del'>-	bch2_journal_pin_set_locked(j, seq, pin, flush_fn, journal_pin_type(flush_fn));</div><div class='del'>-</div><div class='del'>-	if (reclaim)</div><div class='del'>-		bch2_journal_reclaim_fast(j);</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the journal is currently full,  we might want to call flush_fn</div><div class='del'>-	 * immediately:</div><div class='del'>-	 */</div><div class='del'>-	journal_wake(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_journal_pin_flush: ensure journal pin callback is no longer running</div><div class='del'>- * @j:		journal object</div><div class='del'>- * @pin:	pin to flush</div><div class='del'>- */</div><div class='del'>-void bch2_journal_pin_flush(struct journal *j, struct journal_entry_pin *pin)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(journal_pin_active(pin));</div><div class='del'>-</div><div class='del'>-	wait_event(j-&gt;pin_flush_wait, j-&gt;flush_in_progress != pin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Journal reclaim: flush references to open journal entries to reclaim space in</div><div class='del'>- * the journal</div><div class='del'>- *</div><div class='del'>- * May be done by the journal code in the background as needed to free up space</div><div class='del'>- * for more journal entries, or as part of doing a clean shutdown, or to migrate</div><div class='del'>- * data off of a specific device:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct journal_entry_pin *</div><div class='del'>-journal_get_next_pin(struct journal *j,</div><div class='del'>-		     u64 seq_to_flush,</div><div class='del'>-		     unsigned allowed_below_seq,</div><div class='del'>-		     unsigned allowed_above_seq,</div><div class='del'>-		     u64 *seq)</div><div class='del'>-{</div><div class='del'>-	struct journal_entry_pin_list *pin_list;</div><div class='del'>-	struct journal_entry_pin *ret = NULL;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	fifo_for_each_entry_ptr(pin_list, &amp;j-&gt;pin, *seq) {</div><div class='del'>-		if (*seq &gt; seq_to_flush &amp;&amp; !allowed_above_seq)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; JOURNAL_PIN_NR; i++)</div><div class='del'>-			if ((((1U &lt;&lt; i) &amp; allowed_below_seq) &amp;&amp; *seq &lt;= seq_to_flush) ||</div><div class='del'>-			    ((1U &lt;&lt; i) &amp; allowed_above_seq)) {</div><div class='del'>-				ret = list_first_entry_or_null(&amp;pin_list-&gt;list[i],</div><div class='del'>-					struct journal_entry_pin, list);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns true if we did work */</div><div class='del'>-static size_t journal_flush_pins(struct journal *j,</div><div class='del'>-				 u64 seq_to_flush,</div><div class='del'>-				 unsigned allowed_below_seq,</div><div class='del'>-				 unsigned allowed_above_seq,</div><div class='del'>-				 unsigned min_any,</div><div class='del'>-				 unsigned min_key_cache)</div><div class='del'>-{</div><div class='del'>-	struct journal_entry_pin *pin;</div><div class='del'>-	size_t nr_flushed = 0;</div><div class='del'>-	journal_pin_flush_fn flush_fn;</div><div class='del'>-	u64 seq;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;reclaim_lock);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		unsigned allowed_above = allowed_above_seq;</div><div class='del'>-		unsigned allowed_below = allowed_below_seq;</div><div class='del'>-</div><div class='del'>-		if (min_any) {</div><div class='del'>-			allowed_above |= ~0;</div><div class='del'>-			allowed_below |= ~0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (min_key_cache) {</div><div class='del'>-			allowed_above |= 1U &lt;&lt; JOURNAL_PIN_key_cache;</div><div class='del'>-			allowed_below |= 1U &lt;&lt; JOURNAL_PIN_key_cache;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		j-&gt;last_flushed = jiffies;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		pin = journal_get_next_pin(j, seq_to_flush, allowed_below, allowed_above, &amp;seq);</div><div class='del'>-		if (pin) {</div><div class='del'>-			BUG_ON(j-&gt;flush_in_progress);</div><div class='del'>-			j-&gt;flush_in_progress = pin;</div><div class='del'>-			j-&gt;flush_in_progress_dropped = false;</div><div class='del'>-			flush_fn = pin-&gt;flush;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-		if (!pin)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (min_key_cache &amp;&amp; pin-&gt;flush == bch2_btree_key_cache_journal_flush)</div><div class='del'>-			min_key_cache--;</div><div class='del'>-</div><div class='del'>-		if (min_any)</div><div class='del'>-			min_any--;</div><div class='del'>-</div><div class='del'>-		err = flush_fn(j, pin, seq);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-		/* Pin might have been dropped or rearmed: */</div><div class='del'>-		if (likely(!err &amp;&amp; !j-&gt;flush_in_progress_dropped))</div><div class='del'>-			list_move(&amp;pin-&gt;list, &amp;journal_seq_pin(j, seq)-&gt;flushed);</div><div class='del'>-		j-&gt;flush_in_progress = NULL;</div><div class='del'>-		j-&gt;flush_in_progress_dropped = false;</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-		wake_up(&amp;j-&gt;pin_flush_wait);</div><div class='del'>-</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		nr_flushed++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nr_flushed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 journal_seq_to_flush(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	u64 seq_to_flush = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca) {</div><div class='del'>-		struct journal_device *ja = &amp;ca-&gt;journal;</div><div class='del'>-		unsigned nr_buckets, bucket_to_flush;</div><div class='del'>-</div><div class='del'>-		if (!ja-&gt;nr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Try to keep the journal at most half full: */</div><div class='del'>-		nr_buckets = ja-&gt;nr / 2;</div><div class='del'>-</div><div class='del'>-		nr_buckets = min(nr_buckets, ja-&gt;nr);</div><div class='del'>-</div><div class='del'>-		bucket_to_flush = (ja-&gt;cur_idx + nr_buckets) % ja-&gt;nr;</div><div class='del'>-		seq_to_flush = max(seq_to_flush,</div><div class='del'>-				   ja-&gt;bucket_seq[bucket_to_flush]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Also flush if the pin fifo is more than half full */</div><div class='del'>-	seq_to_flush = max_t(s64, seq_to_flush,</div><div class='del'>-			     (s64) journal_cur_seq(j) -</div><div class='del'>-			     (j-&gt;pin.size &gt;&gt; 1));</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return seq_to_flush;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __bch2_journal_reclaim - free up journal buckets</div><div class='del'>- * @j:		journal object</div><div class='del'>- * @direct:	direct or background reclaim?</div><div class='del'>- * @kicked:	requested to run since we last ran?</div><div class='del'>- * Returns:	0 on success, or -EIO if the journal has been shutdown</div><div class='del'>- *</div><div class='del'>- * Background journal reclaim writes out btree nodes. It should be run</div><div class='del'>- * early enough so that we never completely run out of journal buckets.</div><div class='del'>- *</div><div class='del'>- * High watermarks for triggering background reclaim:</div><div class='del'>- * - FIFO has fewer than 512 entries left</div><div class='del'>- * - fewer than 25% journal buckets free</div><div class='del'>- *</div><div class='del'>- * Background reclaim runs until low watermarks are reached:</div><div class='del'>- * - FIFO has more than 1024 entries left</div><div class='del'>- * - more than 50% journal buckets free</div><div class='del'>- *</div><div class='del'>- * As long as a reclaim can complete in the time it takes to fill up</div><div class='del'>- * 512 journal entries or 25% of all journal buckets, then</div><div class='del'>- * journal_next_bucket() should not stall.</div><div class='del'>- */</div><div class='del'>-static int __bch2_journal_reclaim(struct journal *j, bool direct, bool kicked)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	bool kthread = (current-&gt;flags &amp; PF_KTHREAD) != 0;</div><div class='del'>-	u64 seq_to_flush;</div><div class='del'>-	size_t min_nr, min_key_cache, nr_flushed;</div><div class='del'>-	unsigned flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't invoke memory reclaim while holding the reclaim_lock -</div><div class='del'>-	 * journal reclaim is required to make progress for memory reclaim</div><div class='del'>-	 * (cleaning the caches), so we can't get stuck in memory reclaim while</div><div class='del'>-	 * we're holding the reclaim lock:</div><div class='del'>-	 */</div><div class='del'>-	lockdep_assert_held(&amp;j-&gt;reclaim_lock);</div><div class='del'>-	flags = memalloc_noreclaim_save();</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (kthread &amp;&amp; kthread_should_stop())</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bch2_journal_error(j)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_journal_do_discards(j);</div><div class='del'>-</div><div class='del'>-		seq_to_flush = journal_seq_to_flush(j);</div><div class='del'>-		min_nr = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If it's been longer than j-&gt;reclaim_delay_ms since we last flushed,</div><div class='del'>-		 * make sure to flush at least one journal pin:</div><div class='del'>-		 */</div><div class='del'>-		if (time_after(jiffies, j-&gt;last_flushed +</div><div class='del'>-			       msecs_to_jiffies(c-&gt;opts.journal_reclaim_delay)))</div><div class='del'>-			min_nr = 1;</div><div class='del'>-</div><div class='del'>-		if (j-&gt;watermark != BCH_WATERMARK_stripe)</div><div class='del'>-			min_nr = 1;</div><div class='del'>-</div><div class='del'>-		if (atomic_read(&amp;c-&gt;btree_cache.dirty) * 2 &gt; c-&gt;btree_cache.used)</div><div class='del'>-			min_nr = 1;</div><div class='del'>-</div><div class='del'>-		min_key_cache = min(bch2_nr_btree_keys_need_flush(c), (size_t) 128);</div><div class='del'>-</div><div class='del'>-		trace_and_count(c, journal_reclaim_start, c,</div><div class='del'>-				direct, kicked,</div><div class='del'>-				min_nr, min_key_cache,</div><div class='del'>-				atomic_read(&amp;c-&gt;btree_cache.dirty),</div><div class='del'>-				c-&gt;btree_cache.used,</div><div class='del'>-				atomic_long_read(&amp;c-&gt;btree_key_cache.nr_dirty),</div><div class='del'>-				atomic_long_read(&amp;c-&gt;btree_key_cache.nr_keys));</div><div class='del'>-</div><div class='del'>-		nr_flushed = journal_flush_pins(j, seq_to_flush,</div><div class='del'>-						~0, 0,</div><div class='del'>-						min_nr, min_key_cache);</div><div class='del'>-</div><div class='del'>-		if (direct)</div><div class='del'>-			j-&gt;nr_direct_reclaim += nr_flushed;</div><div class='del'>-		else</div><div class='del'>-			j-&gt;nr_background_reclaim += nr_flushed;</div><div class='del'>-		trace_and_count(c, journal_reclaim_finish, c, nr_flushed);</div><div class='del'>-</div><div class='del'>-		if (nr_flushed)</div><div class='del'>-			wake_up(&amp;j-&gt;reclaim_wait);</div><div class='del'>-	} while ((min_nr || min_key_cache) &amp;&amp; nr_flushed &amp;&amp; !direct);</div><div class='del'>-</div><div class='del'>-	memalloc_noreclaim_restore(flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_reclaim(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return __bch2_journal_reclaim(j, true, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_journal_reclaim_thread(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct journal *j = arg;</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	unsigned long delay, now;</div><div class='del'>-	bool journal_empty;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	set_freezable();</div><div class='del'>-</div><div class='del'>-	j-&gt;last_flushed = jiffies;</div><div class='del'>-</div><div class='del'>-	while (!ret &amp;&amp; !kthread_should_stop()) {</div><div class='del'>-		bool kicked = j-&gt;reclaim_kicked;</div><div class='del'>-</div><div class='del'>-		j-&gt;reclaim_kicked = false;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;j-&gt;reclaim_lock);</div><div class='del'>-		ret = __bch2_journal_reclaim(j, false, kicked);</div><div class='del'>-		mutex_unlock(&amp;j-&gt;reclaim_lock);</div><div class='del'>-</div><div class='del'>-		now = jiffies;</div><div class='del'>-		delay = msecs_to_jiffies(c-&gt;opts.journal_reclaim_delay);</div><div class='del'>-		j-&gt;next_reclaim = j-&gt;last_flushed + delay;</div><div class='del'>-</div><div class='del'>-		if (!time_in_range(j-&gt;next_reclaim, now, now + delay))</div><div class='del'>-			j-&gt;next_reclaim = now + delay;</div><div class='del'>-</div><div class='del'>-		while (1) {</div><div class='del'>-			set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE);</div><div class='del'>-			if (kthread_should_stop())</div><div class='del'>-				break;</div><div class='del'>-			if (j-&gt;reclaim_kicked)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			spin_lock(&amp;j-&gt;lock);</div><div class='del'>-			journal_empty = fifo_empty(&amp;j-&gt;pin);</div><div class='del'>-			spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-			if (journal_empty)</div><div class='del'>-				schedule();</div><div class='del'>-			else if (time_after(j-&gt;next_reclaim, jiffies))</div><div class='del'>-				schedule_timeout(j-&gt;next_reclaim - jiffies);</div><div class='del'>-			else</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		__set_current_state(TASK_RUNNING);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_reclaim_stop(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p = j-&gt;reclaim_thread;</div><div class='del'>-</div><div class='del'>-	j-&gt;reclaim_thread = NULL;</div><div class='del'>-</div><div class='del'>-	if (p) {</div><div class='del'>-		kthread_stop(p);</div><div class='del'>-		put_task_struct(p);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_reclaim_start(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (j-&gt;reclaim_thread)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = kthread_create(bch2_journal_reclaim_thread, j,</div><div class='del'>-			   "bch-reclaim/%s", c-&gt;name);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(p);</div><div class='del'>-	bch_err_msg(c, ret, "creating journal reclaim thread");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	get_task_struct(p);</div><div class='del'>-	j-&gt;reclaim_thread = p;</div><div class='del'>-	wake_up_process(p);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_flush_done(struct journal *j, u64 seq_to_flush,</div><div class='del'>-			      bool *did_work)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_error(j);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;j-&gt;reclaim_lock);</div><div class='del'>-</div><div class='del'>-	if (journal_flush_pins(j, seq_to_flush,</div><div class='del'>-			       (1U &lt;&lt; JOURNAL_PIN_key_cache)|</div><div class='del'>-			       (1U &lt;&lt; JOURNAL_PIN_other), 0, 0, 0) ||</div><div class='del'>-	    journal_flush_pins(j, seq_to_flush,</div><div class='del'>-			       (1U &lt;&lt; JOURNAL_PIN_btree), 0, 0, 0))</div><div class='del'>-		*did_work = true;</div><div class='del'>-</div><div class='del'>-	if (seq_to_flush &gt; journal_cur_seq(j))</div><div class='del'>-		bch2_journal_entry_close(j);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	/*</div><div class='del'>-	 * If journal replay hasn't completed, the unreplayed journal entries</div><div class='del'>-	 * hold refs on their corresponding sequence numbers</div><div class='del'>-	 */</div><div class='del'>-	ret = !test_bit(JOURNAL_REPLAY_DONE, &amp;j-&gt;flags) ||</div><div class='del'>-		journal_last_seq(j) &gt; seq_to_flush ||</div><div class='del'>-		!fifo_used(&amp;j-&gt;pin);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-	mutex_unlock(&amp;j-&gt;reclaim_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_journal_flush_pins(struct journal *j, u64 seq_to_flush)</div><div class='del'>-{</div><div class='del'>-	/* time_stats this */</div><div class='del'>-	bool did_work = false;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(JOURNAL_STARTED, &amp;j-&gt;flags))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	closure_wait_event(&amp;j-&gt;async_wait,</div><div class='del'>-		journal_flush_done(j, seq_to_flush, &amp;did_work));</div><div class='del'>-</div><div class='del'>-	return did_work;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_flush_device_pins(struct journal *j, int dev_idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(j, struct bch_fs, journal);</div><div class='del'>-	struct journal_entry_pin_list *p;</div><div class='del'>-	u64 iter, seq = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	fifo_for_each_entry_ptr(p, &amp;j-&gt;pin, iter)</div><div class='del'>-		if (dev_idx &gt;= 0</div><div class='del'>-		    ? bch2_dev_list_has_dev(p-&gt;devs, dev_idx)</div><div class='del'>-		    : p-&gt;devs.nr &lt; c-&gt;opts.metadata_replicas)</div><div class='del'>-			seq = iter;</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-</div><div class='del'>-	bch2_journal_flush_pins(j, seq);</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_error(j);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;replicas_gc_lock);</div><div class='del'>-	bch2_replicas_gc_start(c, 1 &lt;&lt; BCH_DATA_journal);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now that we've populated replicas_gc, write to the journal to mark</div><div class='del'>-	 * active journal devices. This handles the case where the journal might</div><div class='del'>-	 * be empty. Otherwise we could clear all journal replicas and</div><div class='del'>-	 * temporarily put the fs into an unrecoverable state. Journal recovery</div><div class='del'>-	 * expects to find devices marked for journal data on unclean mount.</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_journal_meta(&amp;c-&gt;journal);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	seq = 0;</div><div class='del'>-	spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	while (!ret) {</div><div class='del'>-		struct bch_replicas_padded replicas;</div><div class='del'>-</div><div class='del'>-		seq = max(seq, journal_last_seq(j));</div><div class='del'>-		if (seq &gt;= j-&gt;pin.back)</div><div class='del'>-			break;</div><div class='del'>-		bch2_devlist_to_replicas(&amp;replicas.e, BCH_DATA_journal,</div><div class='del'>-					 journal_seq_pin(j, seq)-&gt;devs);</div><div class='del'>-		seq++;</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-		ret = bch2_mark_replicas(c, &amp;replicas.e);</div><div class='del'>-		spin_lock(&amp;j-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;j-&gt;lock);</div><div class='del'>-err:</div><div class='del'>-	ret = bch2_replicas_gc_end(c, ret);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;replicas_gc_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/journal_reclaim.h b/fs/bcachefs/journal_reclaim.h<br/>deleted file mode 100644<br/>index ec84c3345281..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_reclaim.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_reclaim.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_JOURNAL_RECLAIM_H</div><div class='del'>-#define _BCACHEFS_JOURNAL_RECLAIM_H</div><div class='del'>-</div><div class='del'>-#define JOURNAL_PIN	(32 * 1024)</div><div class='del'>-</div><div class='del'>-static inline void journal_reclaim_kick(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p = READ_ONCE(j-&gt;reclaim_thread);</div><div class='del'>-</div><div class='del'>-	j-&gt;reclaim_kicked = true;</div><div class='del'>-	if (p)</div><div class='del'>-		wake_up_process(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_journal_dev_buckets_available(struct journal *,</div><div class='del'>-					    struct journal_device *,</div><div class='del'>-					    enum journal_space_from);</div><div class='del'>-void bch2_journal_set_watermark(struct journal *);</div><div class='del'>-void bch2_journal_space_available(struct journal *);</div><div class='del'>-</div><div class='del'>-static inline bool journal_pin_active(struct journal_entry_pin *pin)</div><div class='del'>-{</div><div class='del'>-	return pin-&gt;seq != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct journal_entry_pin_list *</div><div class='del'>-journal_seq_pin(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(seq &lt; j-&gt;pin.front || seq &gt;= j-&gt;pin.back);</div><div class='del'>-</div><div class='del'>-	return &amp;j-&gt;pin.data[seq &amp; j-&gt;pin.mask];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_reclaim_fast(struct journal *);</div><div class='del'>-bool __bch2_journal_pin_put(struct journal *, u64);</div><div class='del'>-void bch2_journal_pin_put(struct journal *, u64);</div><div class='del'>-void bch2_journal_pin_drop(struct journal *, struct journal_entry_pin *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_set(struct journal *, u64, struct journal_entry_pin *,</div><div class='del'>-			  journal_pin_flush_fn);</div><div class='del'>-</div><div class='del'>-static inline void bch2_journal_pin_add(struct journal *j, u64 seq,</div><div class='del'>-					struct journal_entry_pin *pin,</div><div class='del'>-					journal_pin_flush_fn flush_fn)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!journal_pin_active(pin) || pin-&gt;seq &gt; seq))</div><div class='del'>-		bch2_journal_pin_set(j, seq, pin, flush_fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_copy(struct journal *,</div><div class='del'>-			   struct journal_entry_pin *,</div><div class='del'>-			   struct journal_entry_pin *,</div><div class='del'>-			   journal_pin_flush_fn);</div><div class='del'>-</div><div class='del'>-static inline void bch2_journal_pin_update(struct journal *j, u64 seq,</div><div class='del'>-					   struct journal_entry_pin *pin,</div><div class='del'>-					   journal_pin_flush_fn flush_fn)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!journal_pin_active(pin) || pin-&gt;seq &lt; seq))</div><div class='del'>-		bch2_journal_pin_set(j, seq, pin, flush_fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_pin_flush(struct journal *, struct journal_entry_pin *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_do_discards(struct journal *);</div><div class='del'>-int bch2_journal_reclaim(struct journal *);</div><div class='del'>-</div><div class='del'>-void bch2_journal_reclaim_stop(struct journal *);</div><div class='del'>-int bch2_journal_reclaim_start(struct journal *);</div><div class='del'>-</div><div class='del'>-bool bch2_journal_flush_pins(struct journal *, u64);</div><div class='del'>-</div><div class='del'>-static inline bool bch2_journal_flush_all_pins(struct journal *j)</div><div class='del'>-{</div><div class='del'>-	return bch2_journal_flush_pins(j, U64_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_flush_device_pins(struct journal *, int);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_JOURNAL_RECLAIM_H */</div><div class='head'>diff --git a/fs/bcachefs/journal_sb.c b/fs/bcachefs/journal_sb.c<br/>deleted file mode 100644<br/>index ae4fb8c3a2bc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_sb.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_sb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,219 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "journal_sb.h"</div><div class='del'>-#include "darray.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_journal: */</div><div class='del'>-</div><div class='del'>-static int u64_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const u64 *l = _l;</div><div class='del'>-	const u64 *r = _r;</div><div class='del'>-</div><div class='del'>-	return cmp_int(*l, *r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_journal_validate(struct bch_sb *sb,</div><div class='del'>-				    struct bch_sb_field *f,</div><div class='del'>-				    struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal *journal = field_to_type(f, journal);</div><div class='del'>-	struct bch_member m = bch2_sb_member_get(sb, sb-&gt;dev_idx);</div><div class='del'>-	int ret = -BCH_ERR_invalid_sb_journal;</div><div class='del'>-	unsigned nr;</div><div class='del'>-	unsigned i;</div><div class='del'>-	u64 *b;</div><div class='del'>-</div><div class='del'>-	nr = bch2_nr_journal_buckets(journal);</div><div class='del'>-	if (!nr)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	b = kmalloc_array(nr, sizeof(u64), GFP_KERNEL);</div><div class='del'>-	if (!b)</div><div class='del'>-		return -BCH_ERR_ENOMEM_sb_journal_validate;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		b[i] = le64_to_cpu(journal-&gt;buckets[i]);</div><div class='del'>-</div><div class='del'>-	sort(b, nr, sizeof(u64), u64_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	if (!b[0]) {</div><div class='del'>-		prt_printf(err, "journal bucket at sector 0");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b[0] &lt; le16_to_cpu(m.first_bucket)) {</div><div class='del'>-		prt_printf(err, "journal bucket %llu before first bucket %u",</div><div class='del'>-		       b[0], le16_to_cpu(m.first_bucket));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b[nr - 1] &gt;= le64_to_cpu(m.nbuckets)) {</div><div class='del'>-		prt_printf(err, "journal bucket %llu past end of device (nbuckets %llu)",</div><div class='del'>-		       b[nr - 1], le64_to_cpu(m.nbuckets));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i + 1 &lt; nr; i++)</div><div class='del'>-		if (b[i] == b[i + 1]) {</div><div class='del'>-			prt_printf(err, "duplicate journal buckets %llu", b[i]);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-	kfree(b);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_journal_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				    struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal *journal = field_to_type(f, journal);</div><div class='del'>-	unsigned i, nr = bch2_nr_journal_buckets(journal);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Buckets: ");</div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		prt_printf(out, " %llu", le64_to_cpu(journal-&gt;buckets[i]));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_journal = {</div><div class='del'>-	.validate	= bch2_sb_journal_validate,</div><div class='del'>-	.to_text	= bch2_sb_journal_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct u64_range {</div><div class='del'>-	u64	start;</div><div class='del'>-	u64	end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int u64_range_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const struct u64_range *l = _l;</div><div class='del'>-	const struct u64_range *r = _r;</div><div class='del'>-</div><div class='del'>-	return cmp_int(l-&gt;start, r-&gt;start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_journal_v2_validate(struct bch_sb *sb,</div><div class='del'>-				    struct bch_sb_field *f,</div><div class='del'>-				    struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_v2 *journal = field_to_type(f, journal_v2);</div><div class='del'>-	struct bch_member m = bch2_sb_member_get(sb, sb-&gt;dev_idx);</div><div class='del'>-	int ret = -BCH_ERR_invalid_sb_journal;</div><div class='del'>-	unsigned nr;</div><div class='del'>-	unsigned i;</div><div class='del'>-	struct u64_range *b;</div><div class='del'>-</div><div class='del'>-	nr = bch2_sb_field_journal_v2_nr_entries(journal);</div><div class='del'>-	if (!nr)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	b = kmalloc_array(nr, sizeof(*b), GFP_KERNEL);</div><div class='del'>-	if (!b)</div><div class='del'>-		return -BCH_ERR_ENOMEM_sb_journal_v2_validate;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		b[i].start = le64_to_cpu(journal-&gt;d[i].start);</div><div class='del'>-		b[i].end = b[i].start + le64_to_cpu(journal-&gt;d[i].nr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sort(b, nr, sizeof(*b), u64_range_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	if (!b[0].start) {</div><div class='del'>-		prt_printf(err, "journal bucket at sector 0");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b[0].start &lt; le16_to_cpu(m.first_bucket)) {</div><div class='del'>-		prt_printf(err, "journal bucket %llu before first bucket %u",</div><div class='del'>-		       b[0].start, le16_to_cpu(m.first_bucket));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (b[nr - 1].end &gt; le64_to_cpu(m.nbuckets)) {</div><div class='del'>-		prt_printf(err, "journal bucket %llu past end of device (nbuckets %llu)",</div><div class='del'>-		       b[nr - 1].end - 1, le64_to_cpu(m.nbuckets));</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i + 1 &lt; nr; i++) {</div><div class='del'>-		if (b[i].end &gt; b[i + 1].start) {</div><div class='del'>-			prt_printf(err, "duplicate journal buckets in ranges %llu-%llu, %llu-%llu",</div><div class='del'>-			       b[i].start, b[i].end, b[i + 1].start, b[i + 1].end);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-	kfree(b);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_journal_v2_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				    struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_v2 *journal = field_to_type(f, journal_v2);</div><div class='del'>-	unsigned i, nr = bch2_sb_field_journal_v2_nr_entries(journal);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Buckets: ");</div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		prt_printf(out, " %llu-%llu",</div><div class='del'>-		       le64_to_cpu(journal-&gt;d[i].start),</div><div class='del'>-		       le64_to_cpu(journal-&gt;d[i].start) + le64_to_cpu(journal-&gt;d[i].nr));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_journal_v2 = {</div><div class='del'>-	.validate	= bch2_sb_journal_v2_validate,</div><div class='del'>-	.to_text	= bch2_sb_journal_v2_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_journal_buckets_to_sb(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			       u64 *buckets, unsigned nr)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_v2 *j;</div><div class='del'>-	unsigned i, dst = 0, nr_compacted = 1;</div><div class='del'>-</div><div class='del'>-	if (c)</div><div class='del'>-		lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (!nr) {</div><div class='del'>-		bch2_sb_field_delete(&amp;ca-&gt;disk_sb, BCH_SB_FIELD_journal);</div><div class='del'>-		bch2_sb_field_delete(&amp;ca-&gt;disk_sb, BCH_SB_FIELD_journal_v2);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i + 1 &lt; nr; i++)</div><div class='del'>-		if (buckets[i] + 1 != buckets[i + 1])</div><div class='del'>-			nr_compacted++;</div><div class='del'>-</div><div class='del'>-	j = bch2_sb_field_resize(&amp;ca-&gt;disk_sb, journal_v2,</div><div class='del'>-			 (sizeof(*j) + sizeof(j-&gt;d[0]) * nr_compacted) / sizeof(u64));</div><div class='del'>-	if (!j)</div><div class='del'>-		return -BCH_ERR_ENOSPC_sb_journal;</div><div class='del'>-</div><div class='del'>-	bch2_sb_field_delete(&amp;ca-&gt;disk_sb, BCH_SB_FIELD_journal);</div><div class='del'>-</div><div class='del'>-	j-&gt;d[dst].start = cpu_to_le64(buckets[0]);</div><div class='del'>-	j-&gt;d[dst].nr	= cpu_to_le64(1);</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; nr; i++) {</div><div class='del'>-		if (buckets[i] == buckets[i - 1] + 1) {</div><div class='del'>-			le64_add_cpu(&amp;j-&gt;d[dst].nr, 1);</div><div class='del'>-		} else {</div><div class='del'>-			dst++;</div><div class='del'>-			j-&gt;d[dst].start = cpu_to_le64(buckets[i]);</div><div class='del'>-			j-&gt;d[dst].nr	= cpu_to_le64(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(dst + 1 != nr_compacted);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/journal_sb.h b/fs/bcachefs/journal_sb.h<br/>deleted file mode 100644<br/>index ba40a7e8d90a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_sb.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_sb.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "vstructs.h"</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_nr_journal_buckets(struct bch_sb_field_journal *j)</div><div class='del'>-{</div><div class='del'>-	return j</div><div class='del'>-		? (__le64 *) vstruct_end(&amp;j-&gt;field) - j-&gt;buckets</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_sb_field_journal_v2_nr_entries(struct bch_sb_field_journal_v2 *j)</div><div class='del'>-{</div><div class='del'>-	if (!j)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return (struct bch_sb_field_journal_v2_entry *) vstruct_end(&amp;j-&gt;field) - &amp;j-&gt;d[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_journal;</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_journal_v2;</div><div class='del'>-</div><div class='del'>-int bch2_journal_buckets_to_sb(struct bch_fs *, struct bch_dev *, u64 *, unsigned);</div><div class='head'>diff --git a/fs/bcachefs/journal_seq_blacklist.c b/fs/bcachefs/journal_seq_blacklist.c<br/>deleted file mode 100644<br/>index 0200e299cfbb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_seq_blacklist.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_seq_blacklist.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,320 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "eytzinger.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * journal_seq_blacklist machinery:</div><div class='del'>- *</div><div class='del'>- * To guarantee order of btree updates after a crash, we need to detect when a</div><div class='del'>- * btree node entry (bset) is newer than the newest journal entry that was</div><div class='del'>- * successfully written, and ignore it - effectively ignoring any btree updates</div><div class='del'>- * that didn't make it into the journal.</div><div class='del'>- *</div><div class='del'>- * If we didn't do this, we might have two btree nodes, a and b, both with</div><div class='del'>- * updates that weren't written to the journal yet: if b was updated after a,</div><div class='del'>- * but b was flushed and not a - oops; on recovery we'll find that the updates</div><div class='del'>- * to b happened, but not the updates to a that happened before it.</div><div class='del'>- *</div><div class='del'>- * Ignoring bsets that are newer than the newest journal entry is always safe,</div><div class='del'>- * because everything they contain will also have been journalled - and must</div><div class='del'>- * still be present in the journal on disk until a journal entry has been</div><div class='del'>- * written _after_ that bset was written.</div><div class='del'>- *</div><div class='del'>- * To accomplish this, bsets record the newest journal sequence number they</div><div class='del'>- * contain updates for; then, on startup, the btree code queries the journal</div><div class='del'>- * code to ask "Is this sequence number newer than the newest journal entry? If</div><div class='del'>- * so, ignore it."</div><div class='del'>- *</div><div class='del'>- * When this happens, we must blacklist that journal sequence number: the</div><div class='del'>- * journal must not write any entries with that sequence number, and it must</div><div class='del'>- * record that it was blacklisted so that a) on recovery we don't think we have</div><div class='del'>- * missing journal entries and b) so that the btree code continues to ignore</div><div class='del'>- * that bset, until that btree node is rewritten.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned sb_blacklist_u64s(unsigned nr)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_seq_blacklist *bl;</div><div class='del'>-</div><div class='del'>-	return (sizeof(*bl) + sizeof(bl-&gt;start[0]) * nr) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_sb_field_journal_seq_blacklist *</div><div class='del'>-blacklist_entry_try_merge(struct bch_fs *c,</div><div class='del'>-			  struct bch_sb_field_journal_seq_blacklist *bl,</div><div class='del'>-			  unsigned i)</div><div class='del'>-{</div><div class='del'>-	unsigned nr = blacklist_nr_entries(bl);</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(bl-&gt;start[i].end) &gt;=</div><div class='del'>-	    le64_to_cpu(bl-&gt;start[i + 1].start)) {</div><div class='del'>-		bl-&gt;start[i].end = bl-&gt;start[i + 1].end;</div><div class='del'>-		--nr;</div><div class='del'>-		memmove(&amp;bl-&gt;start[i],</div><div class='del'>-			&amp;bl-&gt;start[i + 1],</div><div class='del'>-			sizeof(bl-&gt;start[0]) * (nr - i));</div><div class='del'>-</div><div class='del'>-		bl = bch2_sb_field_resize(&amp;c-&gt;disk_sb, journal_seq_blacklist,</div><div class='del'>-					  sb_blacklist_u64s(nr));</div><div class='del'>-		BUG_ON(!bl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bl_entry_contig_or_overlaps(struct journal_seq_blacklist_entry *e,</div><div class='del'>-					u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	return !(end &lt; le64_to_cpu(e-&gt;start) || le64_to_cpu(e-&gt;end) &lt; start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_journal_seq_blacklist_add(struct bch_fs *c, u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_seq_blacklist *bl;</div><div class='del'>-	unsigned i, nr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	bl = bch2_sb_field_get(c-&gt;disk_sb.sb, journal_seq_blacklist);</div><div class='del'>-	nr = blacklist_nr_entries(bl);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		struct journal_seq_blacklist_entry *e =</div><div class='del'>-			bl-&gt;start + i;</div><div class='del'>-</div><div class='del'>-		if (bl_entry_contig_or_overlaps(e, start, end)) {</div><div class='del'>-			e-&gt;start = cpu_to_le64(min(start, le64_to_cpu(e-&gt;start)));</div><div class='del'>-			e-&gt;end	= cpu_to_le64(max(end, le64_to_cpu(e-&gt;end)));</div><div class='del'>-</div><div class='del'>-			if (i + 1 &lt; nr)</div><div class='del'>-				bl = blacklist_entry_try_merge(c,</div><div class='del'>-							bl, i);</div><div class='del'>-			if (i)</div><div class='del'>-				bl = blacklist_entry_try_merge(c,</div><div class='del'>-							bl, i - 1);</div><div class='del'>-			goto out_write_sb;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bl = bch2_sb_field_resize(&amp;c-&gt;disk_sb, journal_seq_blacklist,</div><div class='del'>-				  sb_blacklist_u64s(nr + 1));</div><div class='del'>-	if (!bl) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_sb_journal_seq_blacklist;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bl-&gt;start[nr].start	= cpu_to_le64(start);</div><div class='del'>-	bl-&gt;start[nr].end	= cpu_to_le64(end);</div><div class='del'>-out_write_sb:</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;features[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_FEATURE_journal_seq_blacklist_v3);</div><div class='del'>-</div><div class='del'>-	ret = bch2_write_super(c);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret ?: bch2_blacklist_table_initialize(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_seq_blacklist_table_cmp(const void *_l,</div><div class='del'>-					   const void *_r, size_t size)</div><div class='del'>-{</div><div class='del'>-	const struct journal_seq_blacklist_table_entry *l = _l;</div><div class='del'>-	const struct journal_seq_blacklist_table_entry *r = _r;</div><div class='del'>-</div><div class='del'>-	return cmp_int(l-&gt;start, r-&gt;start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_journal_seq_is_blacklisted(struct bch_fs *c, u64 seq,</div><div class='del'>-				     bool dirty)</div><div class='del'>-{</div><div class='del'>-	struct journal_seq_blacklist_table *t = c-&gt;journal_seq_blacklist_table;</div><div class='del'>-	struct journal_seq_blacklist_table_entry search = { .start = seq };</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	if (!t)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	idx = eytzinger0_find_le(t-&gt;entries, t-&gt;nr,</div><div class='del'>-				 sizeof(t-&gt;entries[0]),</div><div class='del'>-				 journal_seq_blacklist_table_cmp,</div><div class='del'>-				 &amp;search);</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(t-&gt;entries[idx].start &gt; seq);</div><div class='del'>-</div><div class='del'>-	if (seq &gt;= t-&gt;entries[idx].end)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (dirty)</div><div class='del'>-		t-&gt;entries[idx].dirty = true;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_blacklist_table_initialize(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_seq_blacklist *bl =</div><div class='del'>-		bch2_sb_field_get(c-&gt;disk_sb.sb, journal_seq_blacklist);</div><div class='del'>-	struct journal_seq_blacklist_table *t;</div><div class='del'>-	unsigned i, nr = blacklist_nr_entries(bl);</div><div class='del'>-</div><div class='del'>-	if (!bl)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	t = kzalloc(sizeof(*t) + sizeof(t-&gt;entries[0]) * nr,</div><div class='del'>-		    GFP_KERNEL);</div><div class='del'>-	if (!t)</div><div class='del'>-		return -BCH_ERR_ENOMEM_blacklist_table_init;</div><div class='del'>-</div><div class='del'>-	t-&gt;nr = nr;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		t-&gt;entries[i].start	= le64_to_cpu(bl-&gt;start[i].start);</div><div class='del'>-		t-&gt;entries[i].end	= le64_to_cpu(bl-&gt;start[i].end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eytzinger0_sort(t-&gt;entries,</div><div class='del'>-			t-&gt;nr,</div><div class='del'>-			sizeof(t-&gt;entries[0]),</div><div class='del'>-			journal_seq_blacklist_table_cmp,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	kfree(c-&gt;journal_seq_blacklist_table);</div><div class='del'>-	c-&gt;journal_seq_blacklist_table = t;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_journal_seq_blacklist_validate(struct bch_sb *sb,</div><div class='del'>-						  struct bch_sb_field *f,</div><div class='del'>-						  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_seq_blacklist *bl =</div><div class='del'>-		field_to_type(f, journal_seq_blacklist);</div><div class='del'>-	unsigned i, nr = blacklist_nr_entries(bl);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		struct journal_seq_blacklist_entry *e = bl-&gt;start + i;</div><div class='del'>-</div><div class='del'>-		if (le64_to_cpu(e-&gt;start) &gt;=</div><div class='del'>-		    le64_to_cpu(e-&gt;end)) {</div><div class='del'>-			prt_printf(err, "entry %u start &gt;= end (%llu &gt;= %llu)",</div><div class='del'>-			       i, le64_to_cpu(e-&gt;start), le64_to_cpu(e-&gt;end));</div><div class='del'>-			return -BCH_ERR_invalid_sb_journal_seq_blacklist;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i + 1 &lt; nr &amp;&amp;</div><div class='del'>-		    le64_to_cpu(e[0].end) &gt;</div><div class='del'>-		    le64_to_cpu(e[1].start)) {</div><div class='del'>-			prt_printf(err, "entry %u out of order with next entry (%llu &gt; %llu)",</div><div class='del'>-			       i + 1, le64_to_cpu(e[0].end), le64_to_cpu(e[1].start));</div><div class='del'>-			return -BCH_ERR_invalid_sb_journal_seq_blacklist;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_journal_seq_blacklist_to_text(struct printbuf *out,</div><div class='del'>-						  struct bch_sb *sb,</div><div class='del'>-						  struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_journal_seq_blacklist *bl =</div><div class='del'>-		field_to_type(f, journal_seq_blacklist);</div><div class='del'>-	struct journal_seq_blacklist_entry *i;</div><div class='del'>-	unsigned nr = blacklist_nr_entries(bl);</div><div class='del'>-</div><div class='del'>-	for (i = bl-&gt;start; i &lt; bl-&gt;start + nr; i++) {</div><div class='del'>-		if (i != bl-&gt;start)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "%llu-%llu",</div><div class='del'>-		       le64_to_cpu(i-&gt;start),</div><div class='del'>-		       le64_to_cpu(i-&gt;end));</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_journal_seq_blacklist = {</div><div class='del'>-	.validate	= bch2_sb_journal_seq_blacklist_validate,</div><div class='del'>-	.to_text	= bch2_sb_journal_seq_blacklist_to_text</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_blacklist_entries_gc(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work, struct bch_fs,</div><div class='del'>-					journal_seq_blacklist_gc_work);</div><div class='del'>-	struct journal_seq_blacklist_table *t;</div><div class='del'>-	struct bch_sb_field_journal_seq_blacklist *bl;</div><div class='del'>-	struct journal_seq_blacklist_entry *src, *dst;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	unsigned i, nr, new_nr;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTREE_ID_NR; i++) {</div><div class='del'>-		struct btree_iter iter;</div><div class='del'>-		struct btree *b;</div><div class='del'>-</div><div class='del'>-		bch2_trans_node_iter_init(trans, &amp;iter, i, POS_MIN,</div><div class='del'>-					  0, 0, BTREE_ITER_PREFETCH);</div><div class='del'>-retry:</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		b = bch2_btree_iter_peek_node(&amp;iter);</div><div class='del'>-</div><div class='del'>-		while (!(ret = PTR_ERR_OR_ZERO(b)) &amp;&amp;</div><div class='del'>-		       b &amp;&amp;</div><div class='del'>-		       !test_bit(BCH_FS_stopping, &amp;c-&gt;flags))</div><div class='del'>-			b = bch2_btree_iter_next_node(&amp;iter);</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	bl = bch2_sb_field_get(c-&gt;disk_sb.sb, journal_seq_blacklist);</div><div class='del'>-	if (!bl)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	nr = blacklist_nr_entries(bl);</div><div class='del'>-	dst = bl-&gt;start;</div><div class='del'>-</div><div class='del'>-	t = c-&gt;journal_seq_blacklist_table;</div><div class='del'>-	BUG_ON(nr != t-&gt;nr);</div><div class='del'>-</div><div class='del'>-	for (src = bl-&gt;start, i = eytzinger0_first(t-&gt;nr);</div><div class='del'>-	     src &lt; bl-&gt;start + nr;</div><div class='del'>-	     src++, i = eytzinger0_next(i, nr)) {</div><div class='del'>-		BUG_ON(t-&gt;entries[i].start	!= le64_to_cpu(src-&gt;start));</div><div class='del'>-		BUG_ON(t-&gt;entries[i].end	!= le64_to_cpu(src-&gt;end));</div><div class='del'>-</div><div class='del'>-		if (t-&gt;entries[i].dirty)</div><div class='del'>-			*dst++ = *src;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_nr = dst - bl-&gt;start;</div><div class='del'>-</div><div class='del'>-	bch_info(c, "nr blacklist entries was %u, now %u", nr, new_nr);</div><div class='del'>-</div><div class='del'>-	if (new_nr != nr) {</div><div class='del'>-		bl = bch2_sb_field_resize(&amp;c-&gt;disk_sb, journal_seq_blacklist,</div><div class='del'>-				new_nr ? sb_blacklist_u64s(new_nr) : 0);</div><div class='del'>-		BUG_ON(new_nr &amp;&amp; !bl);</div><div class='del'>-</div><div class='del'>-		if (!new_nr)</div><div class='del'>-			c-&gt;disk_sb.sb-&gt;features[0] &amp;= cpu_to_le64(~(1ULL &lt;&lt; BCH_FEATURE_journal_seq_blacklist_v3));</div><div class='del'>-</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/journal_seq_blacklist.h b/fs/bcachefs/journal_seq_blacklist.h<br/>deleted file mode 100644<br/>index afb886ec8e25..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_seq_blacklist.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_seq_blacklist.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_JOURNAL_SEQ_BLACKLIST_H</div><div class='del'>-#define _BCACHEFS_JOURNAL_SEQ_BLACKLIST_H</div><div class='del'>-</div><div class='del'>-static inline unsigned</div><div class='del'>-blacklist_nr_entries(struct bch_sb_field_journal_seq_blacklist *bl)</div><div class='del'>-{</div><div class='del'>-	return bl</div><div class='del'>-		? ((vstruct_end(&amp;bl-&gt;field) - (void *) &amp;bl-&gt;start[0]) /</div><div class='del'>-		   sizeof(struct journal_seq_blacklist_entry))</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_journal_seq_is_blacklisted(struct bch_fs *, u64, bool);</div><div class='del'>-int bch2_journal_seq_blacklist_add(struct bch_fs *c, u64, u64);</div><div class='del'>-int bch2_blacklist_table_initialize(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_journal_seq_blacklist;</div><div class='del'>-</div><div class='del'>-void bch2_blacklist_entries_gc(struct work_struct *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_JOURNAL_SEQ_BLACKLIST_H */</div><div class='head'>diff --git a/fs/bcachefs/journal_types.h b/fs/bcachefs/journal_types.h<br/>deleted file mode 100644<br/>index 38817c7a0851..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/journal_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/journal_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,329 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_JOURNAL_TYPES_H</div><div class='del'>-#define _BCACHEFS_JOURNAL_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-#include "alloc_types.h"</div><div class='del'>-#include "super_types.h"</div><div class='del'>-#include "fifo.h"</div><div class='del'>-</div><div class='del'>-#define JOURNAL_BUF_BITS	2</div><div class='del'>-#define JOURNAL_BUF_NR		(1U &lt;&lt; JOURNAL_BUF_BITS)</div><div class='del'>-#define JOURNAL_BUF_MASK	(JOURNAL_BUF_NR - 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We put JOURNAL_BUF_NR of these in struct journal; we used them for writes to</div><div class='del'>- * the journal that are being staged or in flight.</div><div class='del'>- */</div><div class='del'>-struct journal_buf {</div><div class='del'>-	struct jset		*data;</div><div class='del'>-</div><div class='del'>-	__BKEY_PADDED(key, BCH_REPLICAS_MAX);</div><div class='del'>-	struct bch_devs_list	devs_written;</div><div class='del'>-</div><div class='del'>-	struct closure_waitlist	wait;</div><div class='del'>-	u64			last_seq;	/* copy of data-&gt;last_seq */</div><div class='del'>-	long			expires;</div><div class='del'>-	u64			flush_time;</div><div class='del'>-</div><div class='del'>-	unsigned		buf_size;	/* size in bytes of @data */</div><div class='del'>-	unsigned		sectors;	/* maximum size for current entry */</div><div class='del'>-	unsigned		disk_sectors;	/* maximum size entry could have been, if</div><div class='del'>-						   buf_size was bigger */</div><div class='del'>-	unsigned		u64s_reserved;</div><div class='del'>-	bool			noflush;	/* write has already been kicked off, and was noflush */</div><div class='del'>-	bool			must_flush;	/* something wants a flush */</div><div class='del'>-	bool			separate_flush;</div><div class='del'>-	bool			need_flush_to_write_buffer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Something that makes a journal entry dirty - i.e. a btree node that has to be</div><div class='del'>- * flushed:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum journal_pin_type {</div><div class='del'>-	JOURNAL_PIN_btree,</div><div class='del'>-	JOURNAL_PIN_key_cache,</div><div class='del'>-	JOURNAL_PIN_other,</div><div class='del'>-	JOURNAL_PIN_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct journal_entry_pin_list {</div><div class='del'>-	struct list_head		list[JOURNAL_PIN_NR];</div><div class='del'>-	struct list_head		flushed;</div><div class='del'>-	atomic_t			count;</div><div class='del'>-	struct bch_devs_list		devs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct journal;</div><div class='del'>-struct journal_entry_pin;</div><div class='del'>-typedef int (*journal_pin_flush_fn)(struct journal *j,</div><div class='del'>-				struct journal_entry_pin *, u64);</div><div class='del'>-</div><div class='del'>-struct journal_entry_pin {</div><div class='del'>-	struct list_head		list;</div><div class='del'>-	journal_pin_flush_fn		flush;</div><div class='del'>-	u64				seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct journal_res {</div><div class='del'>-	bool			ref;</div><div class='del'>-	u8			idx;</div><div class='del'>-	u16			u64s;</div><div class='del'>-	u32			offset;</div><div class='del'>-	u64			seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union journal_res_state {</div><div class='del'>-	struct {</div><div class='del'>-		atomic64_t	counter;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u64		v;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u64		cur_entry_offset:20,</div><div class='del'>-				idx:2,</div><div class='del'>-				unwritten_idx:2,</div><div class='del'>-				buf0_count:10,</div><div class='del'>-				buf1_count:10,</div><div class='del'>-				buf2_count:10,</div><div class='del'>-				buf3_count:10;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bytes: */</div><div class='del'>-#define JOURNAL_ENTRY_SIZE_MIN		(64U &lt;&lt; 10) /* 64k */</div><div class='del'>-#define JOURNAL_ENTRY_SIZE_MAX		(4U  &lt;&lt; 20) /* 4M */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We stash some journal state as sentinal values in cur_entry_offset:</div><div class='del'>- * note - cur_entry_offset is in units of u64s</div><div class='del'>- */</div><div class='del'>-#define JOURNAL_ENTRY_OFFSET_MAX	((1U &lt;&lt; 20) - 1)</div><div class='del'>-</div><div class='del'>-#define JOURNAL_ENTRY_CLOSED_VAL	(JOURNAL_ENTRY_OFFSET_MAX - 1)</div><div class='del'>-#define JOURNAL_ENTRY_ERROR_VAL		(JOURNAL_ENTRY_OFFSET_MAX)</div><div class='del'>-</div><div class='del'>-struct journal_space {</div><div class='del'>-	/* Units of 512 bytes sectors: */</div><div class='del'>-	unsigned	next_entry; /* How big the next journal entry can be */</div><div class='del'>-	unsigned	total;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum journal_space_from {</div><div class='del'>-	journal_space_discarded,</div><div class='del'>-	journal_space_clean_ondisk,</div><div class='del'>-	journal_space_clean,</div><div class='del'>-	journal_space_total,</div><div class='del'>-	journal_space_nr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum journal_flags {</div><div class='del'>-	JOURNAL_REPLAY_DONE,</div><div class='del'>-	JOURNAL_STARTED,</div><div class='del'>-	JOURNAL_MAY_SKIP_FLUSH,</div><div class='del'>-	JOURNAL_NEED_FLUSH_WRITE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Reasons we may fail to get a journal reservation: */</div><div class='del'>-#define JOURNAL_ERRORS()		\</div><div class='del'>-	x(ok)				\</div><div class='del'>-	x(blocked)			\</div><div class='del'>-	x(max_in_flight)		\</div><div class='del'>-	x(journal_full)			\</div><div class='del'>-	x(journal_pin_full)		\</div><div class='del'>-	x(journal_stuck)		\</div><div class='del'>-	x(insufficient_devices)</div><div class='del'>-</div><div class='del'>-enum journal_errors {</div><div class='del'>-#define x(n)	JOURNAL_ERR_##n,</div><div class='del'>-	JOURNAL_ERRORS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef DARRAY(u64)		darray_u64;</div><div class='del'>-</div><div class='del'>-/* Embedded in struct bch_fs */</div><div class='del'>-struct journal {</div><div class='del'>-	/* Fastpath stuff up front: */</div><div class='del'>-	struct {</div><div class='del'>-</div><div class='del'>-	union journal_res_state reservations;</div><div class='del'>-	enum bch_watermark	watermark;</div><div class='del'>-</div><div class='del'>-	} __aligned(SMP_CACHE_BYTES);</div><div class='del'>-</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-	/* Max size of current journal entry */</div><div class='del'>-	unsigned		cur_entry_u64s;</div><div class='del'>-	unsigned		cur_entry_sectors;</div><div class='del'>-</div><div class='del'>-	/* Reserved space in journal entry to be used just prior to write */</div><div class='del'>-	unsigned		entry_u64s_reserved;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 0, or -ENOSPC if waiting on journal reclaim, or -EROFS if</div><div class='del'>-	 * insufficient devices:</div><div class='del'>-	 */</div><div class='del'>-	enum journal_errors	cur_entry_error;</div><div class='del'>-</div><div class='del'>-	unsigned		buf_size_want;</div><div class='del'>-	/*</div><div class='del'>-	 * We may queue up some things to be journalled (log messages) before</div><div class='del'>-	 * the journal has actually started - stash them here:</div><div class='del'>-	 */</div><div class='del'>-	darray_u64		early_journal_entries;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Protects journal_buf-&gt;data, when accessing without a jorunal</div><div class='del'>-	 * reservation: for synchronization between the btree write buffer code</div><div class='del'>-	 * and the journal write path:</div><div class='del'>-	 */</div><div class='del'>-	struct mutex		buf_lock;</div><div class='del'>-	/*</div><div class='del'>-	 * Two journal entries -- one is currently open for new entries, the</div><div class='del'>-	 * other is possibly being written out.</div><div class='del'>-	 */</div><div class='del'>-	struct journal_buf	buf[JOURNAL_BUF_NR];</div><div class='del'>-</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-</div><div class='del'>-	/* if nonzero, we may not open a new journal entry: */</div><div class='del'>-	unsigned		blocked;</div><div class='del'>-</div><div class='del'>-	/* Used when waiting because the journal was full */</div><div class='del'>-	wait_queue_head_t	wait;</div><div class='del'>-	struct closure_waitlist	async_wait;</div><div class='del'>-</div><div class='del'>-	struct closure		io;</div><div class='del'>-	struct delayed_work	write_work;</div><div class='del'>-</div><div class='del'>-	/* Sequence number of most recent journal entry (last entry in @pin) */</div><div class='del'>-	atomic64_t		seq;</div><div class='del'>-</div><div class='del'>-	/* seq, last_seq from the most recent journal entry successfully written */</div><div class='del'>-	u64			seq_ondisk;</div><div class='del'>-	u64			flushed_seq_ondisk;</div><div class='del'>-	u64			last_seq_ondisk;</div><div class='del'>-	u64			err_seq;</div><div class='del'>-	u64			last_empty_seq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIFO of journal entries whose btree updates have not yet been</div><div class='del'>-	 * written out.</div><div class='del'>-	 *</div><div class='del'>-	 * Each entry is a reference count. The position in the FIFO is the</div><div class='del'>-	 * entry's sequence number relative to @seq.</div><div class='del'>-	 *</div><div class='del'>-	 * The journal entry itself holds a reference count, put when the</div><div class='del'>-	 * journal entry is written out. Each btree node modified by the journal</div><div class='del'>-	 * entry also holds a reference count, put when the btree node is</div><div class='del'>-	 * written.</div><div class='del'>-	 *</div><div class='del'>-	 * When a reference count reaches zero, the journal entry is no longer</div><div class='del'>-	 * needed. When all journal entries in the oldest journal bucket are no</div><div class='del'>-	 * longer needed, the bucket can be discarded and reused.</div><div class='del'>-	 */</div><div class='del'>-	struct {</div><div class='del'>-		u64 front, back, size, mask;</div><div class='del'>-		struct journal_entry_pin_list *data;</div><div class='del'>-	}			pin;</div><div class='del'>-</div><div class='del'>-	struct journal_space	space[journal_space_nr];</div><div class='del'>-</div><div class='del'>-	u64			replay_journal_seq;</div><div class='del'>-	u64			replay_journal_seq_end;</div><div class='del'>-</div><div class='del'>-	struct write_point	wp;</div><div class='del'>-	spinlock_t		err_lock;</div><div class='del'>-</div><div class='del'>-	struct mutex		reclaim_lock;</div><div class='del'>-	/*</div><div class='del'>-	 * Used for waiting until journal reclaim has freed up space in the</div><div class='del'>-	 * journal:</div><div class='del'>-	 */</div><div class='del'>-	wait_queue_head_t	reclaim_wait;</div><div class='del'>-	struct task_struct	*reclaim_thread;</div><div class='del'>-	bool			reclaim_kicked;</div><div class='del'>-	unsigned long		next_reclaim;</div><div class='del'>-	u64			nr_direct_reclaim;</div><div class='del'>-	u64			nr_background_reclaim;</div><div class='del'>-</div><div class='del'>-	unsigned long		last_flushed;</div><div class='del'>-	struct journal_entry_pin *flush_in_progress;</div><div class='del'>-	bool			flush_in_progress_dropped;</div><div class='del'>-	wait_queue_head_t	pin_flush_wait;</div><div class='del'>-</div><div class='del'>-	/* protects advancing ja-&gt;discard_idx: */</div><div class='del'>-	struct mutex		discard_lock;</div><div class='del'>-	bool			can_discard;</div><div class='del'>-</div><div class='del'>-	unsigned long		last_flush_write;</div><div class='del'>-</div><div class='del'>-	u64			write_start_time;</div><div class='del'>-</div><div class='del'>-	u64			nr_flush_writes;</div><div class='del'>-	u64			nr_noflush_writes;</div><div class='del'>-	u64			entry_bytes_written;</div><div class='del'>-</div><div class='del'>-	u64			low_on_space_start;</div><div class='del'>-	u64			low_on_pin_start;</div><div class='del'>-	u64			max_in_flight_start;</div><div class='del'>-	u64			write_buffer_full_start;</div><div class='del'>-</div><div class='del'>-	struct bch2_time_stats	*flush_write_time;</div><div class='del'>-	struct bch2_time_stats	*noflush_write_time;</div><div class='del'>-	struct bch2_time_stats	*flush_seq_time;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='del'>-	struct lockdep_map	res_map;</div><div class='del'>-#endif</div><div class='del'>-} __aligned(SMP_CACHE_BYTES);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Embedded in struct bch_dev. First three fields refer to the array of journal</div><div class='del'>- * buckets, in bch_sb.</div><div class='del'>- */</div><div class='del'>-struct journal_device {</div><div class='del'>-	/*</div><div class='del'>-	 * For each journal bucket, contains the max sequence number of the</div><div class='del'>-	 * journal writes it contains - so we know when a bucket can be reused.</div><div class='del'>-	 */</div><div class='del'>-	u64			*bucket_seq;</div><div class='del'>-</div><div class='del'>-	unsigned		sectors_free;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * discard_idx &lt;= dirty_idx_ondisk &lt;= dirty_idx &lt;= cur_idx:</div><div class='del'>-	 */</div><div class='del'>-	unsigned		discard_idx;		/* Next bucket to discard */</div><div class='del'>-	unsigned		dirty_idx_ondisk;</div><div class='del'>-	unsigned		dirty_idx;</div><div class='del'>-	unsigned		cur_idx;		/* Journal bucket we're currently writing to */</div><div class='del'>-	unsigned		nr;</div><div class='del'>-</div><div class='del'>-	u64			*buckets;</div><div class='del'>-</div><div class='del'>-	/* Bio for journal reads/writes to this device */</div><div class='del'>-	struct bio		*bio;</div><div class='del'>-</div><div class='del'>-	/* for bch_journal_read_device */</div><div class='del'>-	struct closure		read;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * journal_entry_res - reserve space in every journal entry:</div><div class='del'>- */</div><div class='del'>-struct journal_entry_res {</div><div class='del'>-	unsigned		u64s;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_JOURNAL_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/keylist.c b/fs/bcachefs/keylist.c<br/>deleted file mode 100644<br/>index 1b828bddd11b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/keylist.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/keylist.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-</div><div class='del'>-int bch2_keylist_realloc(struct keylist *l, u64 *inline_u64s,</div><div class='del'>-			size_t nr_inline_u64s, size_t new_u64s)</div><div class='del'>-{</div><div class='del'>-	size_t oldsize = bch2_keylist_u64s(l);</div><div class='del'>-	size_t newsize = oldsize + new_u64s;</div><div class='del'>-	u64 *old_buf = l-&gt;keys_p == inline_u64s ? NULL : l-&gt;keys_p;</div><div class='del'>-	u64 *new_keys;</div><div class='del'>-</div><div class='del'>-	newsize = roundup_pow_of_two(newsize);</div><div class='del'>-</div><div class='del'>-	if (newsize &lt;= nr_inline_u64s ||</div><div class='del'>-	    (old_buf &amp;&amp; roundup_pow_of_two(oldsize) == newsize))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	new_keys = krealloc(old_buf, sizeof(u64) * newsize, GFP_NOFS);</div><div class='del'>-	if (!new_keys)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (!old_buf)</div><div class='del'>-		memcpy_u64s(new_keys, inline_u64s, oldsize);</div><div class='del'>-</div><div class='del'>-	l-&gt;keys_p = new_keys;</div><div class='del'>-	l-&gt;top_p = new_keys + oldsize;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_keylist_pop_front(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	l-&gt;top_p -= bch2_keylist_front(l)-&gt;k.u64s;</div><div class='del'>-</div><div class='del'>-	memmove_u64s_down(l-&gt;keys,</div><div class='del'>-			  bkey_next(l-&gt;keys),</div><div class='del'>-			  bch2_keylist_u64s(l));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-void bch2_verify_keylist_sorted(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	for_each_keylist_key(l, k)</div><div class='del'>-		BUG_ON(bkey_next(k) != l-&gt;top &amp;&amp;</div><div class='del'>-		       bpos_ge(k-&gt;k.p, bkey_next(k)-&gt;k.p));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/bcachefs/keylist.h b/fs/bcachefs/keylist.h<br/>deleted file mode 100644<br/>index e687e0e9aede..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/keylist.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/keylist.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_KEYLIST_H</div><div class='del'>-#define _BCACHEFS_KEYLIST_H</div><div class='del'>-</div><div class='del'>-#include "keylist_types.h"</div><div class='del'>-</div><div class='del'>-int bch2_keylist_realloc(struct keylist *, u64 *, size_t, size_t);</div><div class='del'>-void bch2_keylist_pop_front(struct keylist *);</div><div class='del'>-</div><div class='del'>-static inline void bch2_keylist_init(struct keylist *l, u64 *inline_keys)</div><div class='del'>-{</div><div class='del'>-	l-&gt;top_p = l-&gt;keys_p = inline_keys;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_keylist_free(struct keylist *l, u64 *inline_keys)</div><div class='del'>-{</div><div class='del'>-	if (l-&gt;keys_p != inline_keys)</div><div class='del'>-		kfree(l-&gt;keys_p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_keylist_push(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	l-&gt;top = bkey_next(l-&gt;top);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_keylist_add(struct keylist *l, const struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	bkey_copy(l-&gt;top, k);</div><div class='del'>-	bch2_keylist_push(l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_keylist_empty(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	return l-&gt;top == l-&gt;keys;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t bch2_keylist_u64s(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	return l-&gt;top_p - l-&gt;keys_p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t bch2_keylist_bytes(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	return bch2_keylist_u64s(l) * sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bkey_i *bch2_keylist_front(struct keylist *l)</div><div class='del'>-{</div><div class='del'>-	return l-&gt;keys;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_keylist_key(_keylist, _k)			\</div><div class='del'>-	for (struct bkey_i *_k = (_keylist)-&gt;keys;		\</div><div class='del'>-	     _k != (_keylist)-&gt;top;				\</div><div class='del'>-	     _k = bkey_next(_k))</div><div class='del'>-</div><div class='del'>-static inline u64 keylist_sectors(struct keylist *keys)</div><div class='del'>-{</div><div class='del'>-	u64 ret = 0;</div><div class='del'>-</div><div class='del'>-	for_each_keylist_key(keys, k)</div><div class='del'>-		ret += k-&gt;k.size;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-void bch2_verify_keylist_sorted(struct keylist *);</div><div class='del'>-#else</div><div class='del'>-static inline void bch2_verify_keylist_sorted(struct keylist *l) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_KEYLIST_H */</div><div class='head'>diff --git a/fs/bcachefs/keylist_types.h b/fs/bcachefs/keylist_types.h<br/>deleted file mode 100644<br/>index 4b3ff7d8a875..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/keylist_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/keylist_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_KEYLIST_TYPES_H</div><div class='del'>-#define _BCACHEFS_KEYLIST_TYPES_H</div><div class='del'>-</div><div class='del'>-struct keylist {</div><div class='del'>-	union {</div><div class='del'>-		struct bkey_i		*keys;</div><div class='del'>-		u64			*keys_p;</div><div class='del'>-	};</div><div class='del'>-	union {</div><div class='del'>-		struct bkey_i		*top;</div><div class='del'>-		u64			*top_p;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_KEYLIST_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/logged_ops.c b/fs/bcachefs/logged_ops.c<br/>deleted file mode 100644<br/>index ad598105c587..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/logged_ops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/logged_ops.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "io_misc.h"</div><div class='del'>-#include "logged_ops.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-</div><div class='del'>-struct bch_logged_op_fn {</div><div class='del'>-	u8		type;</div><div class='del'>-	int		(*resume)(struct btree_trans *, struct bkey_i *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct bch_logged_op_fn logged_op_fns[] = {</div><div class='del'>-#define x(n)		{					\</div><div class='del'>-	.type		= KEY_TYPE_logged_op_##n,		\</div><div class='del'>-	.resume		= bch2_resume_logged_op_##n,		\</div><div class='del'>-},</div><div class='del'>-	BCH_LOGGED_OPS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct bch_logged_op_fn *logged_op_fn(enum bch_bkey_type type)</div><div class='del'>-{</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(logged_op_fns); i++)</div><div class='del'>-		if (logged_op_fns[i].type == type)</div><div class='del'>-			return logged_op_fns + i;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int resume_logged_op(struct btree_trans *trans, struct btree_iter *iter,</div><div class='del'>-			    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	const struct bch_logged_op_fn *fn = logged_op_fn(k.k-&gt;type);</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!fn)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-</div><div class='del'>-	ret =   drop_locks_do(trans, (bch2_fs_lazy_rw(c), 0)) ?:</div><div class='del'>-		fn-&gt;resume(trans, sk.k) ?: trans_was_restarted(trans, restart_count);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_resume_logged_ops(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter,</div><div class='del'>-				   BTREE_ID_logged_ops, POS_MIN,</div><div class='del'>-				   BTREE_ITER_PREFETCH, k,</div><div class='del'>-			resume_logged_op(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_logged_op_start(struct btree_trans *trans, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_get_empty_slot(trans, &amp;iter, BTREE_ID_logged_ops, POS_MAX);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	k-&gt;k.p = iter.pos;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, k, 0);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_logged_op_start(struct btree_trans *trans, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	return commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			 __bch2_logged_op_start(trans, k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_logged_op_finish(struct btree_trans *trans, struct bkey_i *k)</div><div class='del'>-{</div><div class='del'>-	int ret = commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			    bch2_btree_delete(trans, BTREE_ID_logged_ops, k-&gt;k.p, 0));</div><div class='del'>-	/*</div><div class='del'>-	 * This needs to be a fatal error because we've left an unfinished</div><div class='del'>-	 * operation in the logged ops btree.</div><div class='del'>-	 *</div><div class='del'>-	 * We should only ever see an error here if the filesystem has already</div><div class='del'>-	 * been shut down, but make sure of that here:</div><div class='del'>-	 */</div><div class='del'>-	if (ret) {</div><div class='del'>-		struct bch_fs *c = trans-&gt;c;</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(k));</div><div class='del'>-		bch2_fs_fatal_error(c, "%s: error deleting logged operation %s: %s",</div><div class='del'>-				     __func__, buf.buf, bch2_err_str(ret));</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/logged_ops.h b/fs/bcachefs/logged_ops.h<br/>deleted file mode 100644<br/>index 4d1e786a27a8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/logged_ops.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/logged_ops.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_LOGGED_OPS_H</div><div class='del'>-#define _BCACHEFS_LOGGED_OPS_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-</div><div class='del'>-#define BCH_LOGGED_OPS()			\</div><div class='del'>-	x(truncate)				\</div><div class='del'>-	x(finsert)</div><div class='del'>-</div><div class='del'>-static inline int bch2_logged_op_update(struct btree_trans *trans, struct bkey_i *op)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_insert_nonextent(trans, BTREE_ID_logged_ops, op, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_resume_logged_ops(struct bch_fs *);</div><div class='del'>-int bch2_logged_op_start(struct btree_trans *, struct bkey_i *);</div><div class='del'>-void bch2_logged_op_finish(struct btree_trans *, struct bkey_i *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_LOGGED_OPS_H */</div><div class='head'>diff --git a/fs/bcachefs/logged_ops_format.h b/fs/bcachefs/logged_ops_format.h<br/>deleted file mode 100644<br/>index 6a4bf7129dba..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/logged_ops_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/logged_ops_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_LOGGED_OPS_FORMAT_H</div><div class='del'>-#define _BCACHEFS_LOGGED_OPS_FORMAT_H</div><div class='del'>-</div><div class='del'>-struct bch_logged_op_truncate {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le32			subvol;</div><div class='del'>-	__le32			pad;</div><div class='del'>-	__le64			inum;</div><div class='del'>-	__le64			new_i_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum logged_op_finsert_state {</div><div class='del'>-	LOGGED_OP_FINSERT_start,</div><div class='del'>-	LOGGED_OP_FINSERT_shift_extents,</div><div class='del'>-	LOGGED_OP_FINSERT_finish,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_logged_op_finsert {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__u8			state;</div><div class='del'>-	__u8			pad[3];</div><div class='del'>-	__le32			subvol;</div><div class='del'>-	__le64			inum;</div><div class='del'>-	__le64			dst_offset;</div><div class='del'>-	__le64			src_offset;</div><div class='del'>-	__le64			pos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_LOGGED_OPS_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/lru.c b/fs/bcachefs/lru.c<br/>deleted file mode 100644<br/>index 7a4ca5a28b3e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/lru.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/lru.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "lru.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_lru is obsolete: */</div><div class='del'>-int bch2_lru_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-		     enum bkey_invalid_flags flags,</div><div class='del'>-		     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!lru_pos_time(k.k-&gt;p), c, err,</div><div class='del'>-			 lru_entry_at_time_0,</div><div class='del'>-			 "lru entry at time=0");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_lru_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-		      struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	const struct bch_lru *lru = bkey_s_c_to_lru(k).v;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "idx %llu", le64_to_cpu(lru-&gt;idx));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_lru_pos_to_text(struct printbuf *out, struct bpos lru)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "%llu:%llu -&gt; %llu:%llu",</div><div class='del'>-		   lru_pos_id(lru),</div><div class='del'>-		   lru_pos_time(lru),</div><div class='del'>-		   u64_to_bucket(lru.offset).inode,</div><div class='del'>-		   u64_to_bucket(lru.offset).offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,</div><div class='del'>-			  u64 dev_bucket, u64 time, bool set)</div><div class='del'>-{</div><div class='del'>-	return time</div><div class='del'>-		? bch2_btree_bit_mod(trans, BTREE_ID_lru,</div><div class='del'>-				     lru_pos(lru_id, dev_bucket, time), set)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_lru_del(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)</div><div class='del'>-{</div><div class='del'>-	return __bch2_lru_set(trans, lru_id, dev_bucket, time, KEY_TYPE_deleted);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_lru_set(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)</div><div class='del'>-{</div><div class='del'>-	return __bch2_lru_set(trans, lru_id, dev_bucket, time, KEY_TYPE_set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_lru_change(struct btree_trans *trans,</div><div class='del'>-		    u16 lru_id, u64 dev_bucket,</div><div class='del'>-		    u64 old_time, u64 new_time)</div><div class='del'>-{</div><div class='del'>-	if (old_time == new_time)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return  bch2_lru_del(trans, lru_id, dev_bucket, old_time) ?:</div><div class='del'>-		bch2_lru_set(trans, lru_id, dev_bucket, new_time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char * const bch2_lru_types[] = {</div><div class='del'>-#define x(n) #n,</div><div class='del'>-	BCH_LRU_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_check_lru_key(struct btree_trans *trans,</div><div class='del'>-			      struct btree_iter *lru_iter,</div><div class='del'>-			      struct bkey_s_c lru_k,</div><div class='del'>-			      struct bpos *last_flushed_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	struct printbuf buf1 = PRINTBUF;</div><div class='del'>-	struct printbuf buf2 = PRINTBUF;</div><div class='del'>-	enum bch_lru_type type = lru_type(lru_k);</div><div class='del'>-	struct bpos alloc_pos = u64_to_bucket(lru_k.k-&gt;p.offset);</div><div class='del'>-	u64 idx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!bch2_dev_bucket_exists(c, alloc_pos), c,</div><div class='del'>-			lru_entry_to_invalid_bucket,</div><div class='del'>-			"lru key points to nonexistent device:bucket %llu:%llu",</div><div class='del'>-			alloc_pos.inode, alloc_pos.offset))</div><div class='del'>-		return bch2_btree_delete_at(trans, lru_iter, 0);</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_alloc, alloc_pos, 0);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case BCH_LRU_read:</div><div class='del'>-		idx = alloc_lru_idx_read(*a);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_LRU_fragmentation:</div><div class='del'>-		idx = a-&gt;fragmentation_lru;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lru_k.k-&gt;type != KEY_TYPE_set ||</div><div class='del'>-	    lru_pos_time(lru_k.k-&gt;p) != idx) {</div><div class='del'>-		if (!bpos_eq(*last_flushed_pos, lru_k.k-&gt;p)) {</div><div class='del'>-			*last_flushed_pos = lru_k.k-&gt;p;</div><div class='del'>-			ret = bch2_btree_write_buffer_flush_sync(trans) ?:</div><div class='del'>-				-BCH_ERR_transaction_restart_write_buffer_flush;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (c-&gt;opts.reconstruct_alloc ||</div><div class='del'>-		    fsck_err(c, lru_entry_bad,</div><div class='del'>-			     "incorrect lru entry: lru %s time %llu\n"</div><div class='del'>-			     "  %s\n"</div><div class='del'>-			     "  for %s",</div><div class='del'>-			     bch2_lru_types[type],</div><div class='del'>-			     lru_pos_time(lru_k.k-&gt;p),</div><div class='del'>-			     (bch2_bkey_val_to_text(&amp;buf1, c, lru_k), buf1.buf),</div><div class='del'>-			     (bch2_bkey_val_to_text(&amp;buf2, c, k), buf2.buf)))</div><div class='del'>-			ret = bch2_btree_delete_at(trans, lru_iter, 0);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf2);</div><div class='del'>-	printbuf_exit(&amp;buf1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_lrus(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bpos last_flushed_pos = POS_MIN;</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-				BTREE_ID_lru, POS_MIN, BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc|BCH_TRANS_COMMIT_lazy_rw,</div><div class='del'>-			bch2_check_lru_key(trans, &amp;iter, k, &amp;last_flushed_pos)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/lru.h b/fs/bcachefs/lru.h<br/>deleted file mode 100644<br/>index 429dca816df5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/lru.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/lru.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_LRU_H</div><div class='del'>-#define _BCACHEFS_LRU_H</div><div class='del'>-</div><div class='del'>-#define LRU_TIME_BITS	48</div><div class='del'>-#define LRU_TIME_MAX	((1ULL &lt;&lt; LRU_TIME_BITS) - 1)</div><div class='del'>-</div><div class='del'>-static inline u64 lru_pos_id(struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	return pos.inode &gt;&gt; LRU_TIME_BITS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 lru_pos_time(struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	return pos.inode &amp; ~(~0ULL &lt;&lt; LRU_TIME_BITS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bpos lru_pos(u16 lru_id, u64 dev_bucket, u64 time)</div><div class='del'>-{</div><div class='del'>-	struct bpos pos = POS(((u64) lru_id &lt;&lt; LRU_TIME_BITS)|time, dev_bucket);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(time &gt; LRU_TIME_MAX);</div><div class='del'>-	EBUG_ON(lru_pos_id(pos) != lru_id);</div><div class='del'>-	EBUG_ON(lru_pos_time(pos) != time);</div><div class='del'>-	EBUG_ON(pos.offset != dev_bucket);</div><div class='del'>-</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_LRU_TYPES()		\</div><div class='del'>-	x(read)			\</div><div class='del'>-	x(fragmentation)</div><div class='del'>-</div><div class='del'>-enum bch_lru_type {</div><div class='del'>-#define x(n) BCH_LRU_##n,</div><div class='del'>-	BCH_LRU_TYPES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_LRU_FRAGMENTATION_START	((1U &lt;&lt; 16) - 1)</div><div class='del'>-</div><div class='del'>-static inline enum bch_lru_type lru_type(struct bkey_s_c l)</div><div class='del'>-{</div><div class='del'>-	u16 lru_id = l.k-&gt;p.inode &gt;&gt; 48;</div><div class='del'>-</div><div class='del'>-	if (lru_id == BCH_LRU_FRAGMENTATION_START)</div><div class='del'>-		return BCH_LRU_fragmentation;</div><div class='del'>-	return BCH_LRU_read;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_lru_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-		     enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_lru_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-void bch2_lru_pos_to_text(struct printbuf *, struct bpos);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_lru ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_lru_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_lru_to_text,	\</div><div class='del'>-	.min_val_size	= 8,			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_lru_del(struct btree_trans *, u16, u64, u64);</div><div class='del'>-int bch2_lru_set(struct btree_trans *, u16, u64, u64);</div><div class='del'>-int bch2_lru_change(struct btree_trans *, u16, u64, u64, u64);</div><div class='del'>-</div><div class='del'>-int bch2_check_lrus(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_LRU_H */</div><div class='head'>diff --git a/fs/bcachefs/mean_and_variance.c b/fs/bcachefs/mean_and_variance.c<br/>deleted file mode 100644<br/>index bf0ef668fd38..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/mean_and_variance.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/mean_and_variance.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,165 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Functions for incremental mean and variance.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published by</div><div class='del'>- * the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='del'>- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>- * more details.</div><div class='del'>- *</div><div class='del'>- * Copyright © 2022 Daniel B. Hill</div><div class='del'>- *</div><div class='del'>- * Author: Daniel B. Hill &lt;daniel@gluo.nz&gt;</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *</div><div class='del'>- * This is includes some incremental algorithms for mean and variance calculation</div><div class='del'>- *</div><div class='del'>- * Derived from the paper: https://fanf2.user.srcf.net/hermes/doc/antiforgery/stats.pdf</div><div class='del'>- *</div><div class='del'>- * Create a struct and if it's the weighted variant set the w field (weight = 2^k).</div><div class='del'>- *</div><div class='del'>- * Use mean_and_variance[_weighted]_update() on the struct to update it's state.</div><div class='del'>- *</div><div class='del'>- * Use the mean_and_variance[_weighted]_get_* functions to calculate the mean and variance, some computation</div><div class='del'>- * is deferred to these functions for performance reasons.</div><div class='del'>- *</div><div class='del'>- * see lib/math/mean_and_variance_test.c for examples of usage.</div><div class='del'>- *</div><div class='del'>- * DO NOT access the mean and variance fields of the weighted variants directly.</div><div class='del'>- * DO NOT change the weight after calling update.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/limits.h&gt;</div><div class='del'>-#include &lt;linux/math.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mean_and_variance.h"</div><div class='del'>-</div><div class='del'>-u128_u u128_div(u128_u n, u64 d)</div><div class='del'>-{</div><div class='del'>-	u128_u r;</div><div class='del'>-	u64 rem;</div><div class='del'>-	u64 hi = u128_hi(n);</div><div class='del'>-	u64 lo = u128_lo(n);</div><div class='del'>-	u64  h =  hi &amp; ((u64) U32_MAX  &lt;&lt; 32);</div><div class='del'>-	u64  l = (hi &amp;  (u64) U32_MAX) &lt;&lt; 32;</div><div class='del'>-</div><div class='del'>-	r =             u128_shl(u64_to_u128(div64_u64_rem(h,                d, &amp;rem)), 64);</div><div class='del'>-	r = u128_add(r, u128_shl(u64_to_u128(div64_u64_rem(l  + (rem &lt;&lt; 32), d, &amp;rem)), 32));</div><div class='del'>-	r = u128_add(r,          u64_to_u128(div64_u64_rem(lo + (rem &lt;&lt; 32), d, &amp;rem)));</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(u128_div);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_get_mean() - get mean from @s</div><div class='del'>- * @s: mean and variance number of samples and their sums</div><div class='del'>- */</div><div class='del'>-s64 mean_and_variance_get_mean(struct mean_and_variance s)</div><div class='del'>-{</div><div class='del'>-	return s.n ? div64_u64(s.sum, s.n) : 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_get_mean);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_get_variance() -  get variance from @s1</div><div class='del'>- * @s1: mean and variance number of samples and sums</div><div class='del'>- *</div><div class='del'>- * see linked pdf equation 12.</div><div class='del'>- */</div><div class='del'>-u64 mean_and_variance_get_variance(struct mean_and_variance s1)</div><div class='del'>-{</div><div class='del'>-	if (s1.n) {</div><div class='del'>-		u128_u s2 = u128_div(s1.sum_squares, s1.n);</div><div class='del'>-		u64  s3 = abs(mean_and_variance_get_mean(s1));</div><div class='del'>-</div><div class='del'>-		return u128_lo(u128_sub(s2, u128_square(s3)));</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_get_variance);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_get_stddev() - get standard deviation from @s</div><div class='del'>- * @s: mean and variance number of samples and their sums</div><div class='del'>- */</div><div class='del'>-u32 mean_and_variance_get_stddev(struct mean_and_variance s)</div><div class='del'>-{</div><div class='del'>-	return int_sqrt64(mean_and_variance_get_variance(s));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_get_stddev);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_weighted_update() - exponentially weighted variant of mean_and_variance_update()</div><div class='del'>- * @s: mean and variance number of samples and their sums</div><div class='del'>- * @x: new value to include in the &amp;mean_and_variance_weighted</div><div class='del'>- *</div><div class='del'>- * see linked pdf: function derived from equations 140-143 where alpha = 2^w.</div><div class='del'>- * values are stored bitshifted for performance and added precision.</div><div class='del'>- */</div><div class='del'>-void mean_and_variance_weighted_update(struct mean_and_variance_weighted *s, s64 x)</div><div class='del'>-{</div><div class='del'>-	// previous weighted variance.</div><div class='del'>-	u8 w		= s-&gt;weight;</div><div class='del'>-	u64 var_w0	= s-&gt;variance;</div><div class='del'>-	// new value weighted.</div><div class='del'>-	s64 x_w		= x &lt;&lt; w;</div><div class='del'>-	s64 diff_w	= x_w - s-&gt;mean;</div><div class='del'>-	s64 diff	= fast_divpow2(diff_w, w);</div><div class='del'>-	// new mean weighted.</div><div class='del'>-	s64 u_w1	= s-&gt;mean + diff;</div><div class='del'>-</div><div class='del'>-	if (!s-&gt;init) {</div><div class='del'>-		s-&gt;mean = x_w;</div><div class='del'>-		s-&gt;variance = 0;</div><div class='del'>-	} else {</div><div class='del'>-		s-&gt;mean = u_w1;</div><div class='del'>-		s-&gt;variance = ((var_w0 &lt;&lt; w) - var_w0 + ((diff_w * (x_w - u_w1)) &gt;&gt; w)) &gt;&gt; w;</div><div class='del'>-	}</div><div class='del'>-	s-&gt;init = true;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_weighted_update);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_weighted_get_mean() - get mean from @s</div><div class='del'>- * @s: mean and variance number of samples and their sums</div><div class='del'>- */</div><div class='del'>-s64 mean_and_variance_weighted_get_mean(struct mean_and_variance_weighted s)</div><div class='del'>-{</div><div class='del'>-	return fast_divpow2(s.mean, s.weight);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_weighted_get_mean);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_weighted_get_variance() -- get variance from @s</div><div class='del'>- * @s: mean and variance number of samples and their sums</div><div class='del'>- */</div><div class='del'>-u64 mean_and_variance_weighted_get_variance(struct mean_and_variance_weighted s)</div><div class='del'>-{</div><div class='del'>-	// always positive don't need fast divpow2</div><div class='del'>-	return s.variance &gt;&gt; s.weight;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_weighted_get_variance);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_weighted_get_stddev() - get standard deviation from @s</div><div class='del'>- * @s: mean and variance number of samples and their sums</div><div class='del'>- */</div><div class='del'>-u32 mean_and_variance_weighted_get_stddev(struct mean_and_variance_weighted s)</div><div class='del'>-{</div><div class='del'>-	return int_sqrt64(mean_and_variance_weighted_get_variance(s));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(mean_and_variance_weighted_get_stddev);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Daniel B. Hill");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/bcachefs/mean_and_variance.h b/fs/bcachefs/mean_and_variance.h<br/>deleted file mode 100644<br/>index b2be565bb8f2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/mean_and_variance.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/mean_and_variance.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef MEAN_AND_VARIANCE_H_</div><div class='del'>-#define MEAN_AND_VARIANCE_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/limits.h&gt;</div><div class='del'>-#include &lt;linux/math.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-</div><div class='del'>-#define SQRT_U64_MAX 4294967295ULL</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * u128_u: u128 user mode, because not all architectures support a real int128</div><div class='del'>- * type</div><div class='del'>- *</div><div class='del'>- * We don't use this version in userspace, because in userspace we link with</div><div class='del'>- * Rust and rustc has issues with u128.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if defined(__SIZEOF_INT128__) &amp;&amp; defined(__KERNEL__)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned __int128 v;</div><div class='del'>-} __aligned(16) u128_u;</div><div class='del'>-</div><div class='del'>-static inline u128_u u64_to_u128(u64 a)</div><div class='del'>-{</div><div class='del'>-	return (u128_u) { .v = a };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 u128_lo(u128_u a)</div><div class='del'>-{</div><div class='del'>-	return a.v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 u128_hi(u128_u a)</div><div class='del'>-{</div><div class='del'>-	return a.v &gt;&gt; 64;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_add(u128_u a, u128_u b)</div><div class='del'>-{</div><div class='del'>-	a.v += b.v;</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_sub(u128_u a, u128_u b)</div><div class='del'>-{</div><div class='del'>-	a.v -= b.v;</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_shl(u128_u a, s8 shift)</div><div class='del'>-{</div><div class='del'>-	a.v &lt;&lt;= shift;</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_square(u64 a)</div><div class='del'>-{</div><div class='del'>-	u128_u b = u64_to_u128(a);</div><div class='del'>-</div><div class='del'>-	b.v *= b.v;</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u64 hi, lo;</div><div class='del'>-} __aligned(16) u128_u;</div><div class='del'>-</div><div class='del'>-/* conversions */</div><div class='del'>-</div><div class='del'>-static inline u128_u u64_to_u128(u64 a)</div><div class='del'>-{</div><div class='del'>-	return (u128_u) { .lo = a };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 u128_lo(u128_u a)</div><div class='del'>-{</div><div class='del'>-	return a.lo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 u128_hi(u128_u a)</div><div class='del'>-{</div><div class='del'>-	return a.hi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* arithmetic */</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_add(u128_u a, u128_u b)</div><div class='del'>-{</div><div class='del'>-	u128_u c;</div><div class='del'>-</div><div class='del'>-	c.lo = a.lo + b.lo;</div><div class='del'>-	c.hi = a.hi + b.hi + (c.lo &lt; a.lo);</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_sub(u128_u a, u128_u b)</div><div class='del'>-{</div><div class='del'>-	u128_u c;</div><div class='del'>-</div><div class='del'>-	c.lo = a.lo - b.lo;</div><div class='del'>-	c.hi = a.hi - b.hi - (c.lo &gt; a.lo);</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_shl(u128_u i, s8 shift)</div><div class='del'>-{</div><div class='del'>-	u128_u r;</div><div class='del'>-</div><div class='del'>-	r.lo = i.lo &lt;&lt; shift;</div><div class='del'>-	if (shift &lt; 64)</div><div class='del'>-		r.hi = (i.hi &lt;&lt; shift) | (i.lo &gt;&gt; (64 - shift));</div><div class='del'>-	else {</div><div class='del'>-		r.hi = i.lo &lt;&lt; (shift - 64);</div><div class='del'>-		r.lo = 0;</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u128_u u128_square(u64 i)</div><div class='del'>-{</div><div class='del'>-	u128_u r;</div><div class='del'>-	u64  h = i &gt;&gt; 32, l = i &amp; U32_MAX;</div><div class='del'>-</div><div class='del'>-	r =             u128_shl(u64_to_u128(h*h), 64);</div><div class='del'>-	r = u128_add(r, u128_shl(u64_to_u128(h*l), 32));</div><div class='del'>-	r = u128_add(r, u128_shl(u64_to_u128(l*h), 32));</div><div class='del'>-	r = u128_add(r,          u64_to_u128(l*l));</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline u128_u u64s_to_u128(u64 hi, u64 lo)</div><div class='del'>-{</div><div class='del'>-	u128_u c = u64_to_u128(hi);</div><div class='del'>-</div><div class='del'>-	c = u128_shl(c, 64);</div><div class='del'>-	c = u128_add(c, u64_to_u128(lo));</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u128_u u128_div(u128_u n, u64 d);</div><div class='del'>-</div><div class='del'>-struct mean_and_variance {</div><div class='del'>-	s64	n;</div><div class='del'>-	s64	sum;</div><div class='del'>-	u128_u	sum_squares;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* expontentially weighted variant */</div><div class='del'>-struct mean_and_variance_weighted {</div><div class='del'>-	bool	init;</div><div class='del'>-	u8	weight;	/* base 2 logarithim */</div><div class='del'>-	s64	mean;</div><div class='del'>-	u64	variance;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fast_divpow2() - fast approximation for n / (1 &lt;&lt; d)</div><div class='del'>- * @n: numerator</div><div class='del'>- * @d: the power of 2 denominator.</div><div class='del'>- *</div><div class='del'>- * note: this rounds towards 0.</div><div class='del'>- */</div><div class='del'>-static inline s64 fast_divpow2(s64 n, u8 d)</div><div class='del'>-{</div><div class='del'>-	return (n + ((n &lt; 0) ? ((1 &lt;&lt; d) - 1) : 0)) &gt;&gt; d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mean_and_variance_update() - update a mean_and_variance struct @s1 with a new sample @v1</div><div class='del'>- * and return it.</div><div class='del'>- * @s1: the mean_and_variance to update.</div><div class='del'>- * @v1: the new sample.</div><div class='del'>- *</div><div class='del'>- * see linked pdf equation 12.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-mean_and_variance_update(struct mean_and_variance *s, s64 v)</div><div class='del'>-{</div><div class='del'>-	s-&gt;n++;</div><div class='del'>-	s-&gt;sum += v;</div><div class='del'>-	s-&gt;sum_squares = u128_add(s-&gt;sum_squares, u128_square(abs(v)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-s64 mean_and_variance_get_mean(struct mean_and_variance s);</div><div class='del'>-u64 mean_and_variance_get_variance(struct mean_and_variance s1);</div><div class='del'>-u32 mean_and_variance_get_stddev(struct mean_and_variance s);</div><div class='del'>-</div><div class='del'>-void mean_and_variance_weighted_update(struct mean_and_variance_weighted *s, s64 v);</div><div class='del'>-</div><div class='del'>-s64 mean_and_variance_weighted_get_mean(struct mean_and_variance_weighted s);</div><div class='del'>-u64 mean_and_variance_weighted_get_variance(struct mean_and_variance_weighted s);</div><div class='del'>-u32 mean_and_variance_weighted_get_stddev(struct mean_and_variance_weighted s);</div><div class='del'>-</div><div class='del'>-#endif // MEAN_AND_VAIRANCE_H_</div><div class='head'>diff --git a/fs/bcachefs/mean_and_variance_test.c b/fs/bcachefs/mean_and_variance_test.c<br/>deleted file mode 100644<br/>index 019583c3ca0e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/mean_and_variance_test.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/mean_and_variance_test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,240 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;kunit/test.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mean_and_variance.h"</div><div class='del'>-</div><div class='del'>-#define MAX_SQR (SQRT_U64_MAX*SQRT_U64_MAX)</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_basic_test(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	struct mean_and_variance s = {};</div><div class='del'>-</div><div class='del'>-	mean_and_variance_update(&amp;s, 2);</div><div class='del'>-	mean_and_variance_update(&amp;s, 2);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_get_mean(s), 2);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_get_variance(s), 0);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, s.n, 2);</div><div class='del'>-</div><div class='del'>-	mean_and_variance_update(&amp;s, 4);</div><div class='del'>-	mean_and_variance_update(&amp;s, 4);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_get_mean(s), 3);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_get_variance(s), 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, s.n, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Test values computed using a spreadsheet from the psuedocode at the bottom:</div><div class='del'>- * https://fanf2.user.srcf.net/hermes/doc/antiforgery/stats.pdf</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_weighted_test(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	struct mean_and_variance_weighted s = { .weight = 2 };</div><div class='del'>-</div><div class='del'>-	mean_and_variance_weighted_update(&amp;s, 10);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), 10);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 0);</div><div class='del'>-</div><div class='del'>-	mean_and_variance_weighted_update(&amp;s, 20);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), 12);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 18);</div><div class='del'>-</div><div class='del'>-	mean_and_variance_weighted_update(&amp;s, 30);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), 16);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 72);</div><div class='del'>-</div><div class='del'>-	s = (struct mean_and_variance_weighted) { .weight = 2 };</div><div class='del'>-</div><div class='del'>-	mean_and_variance_weighted_update(&amp;s, -10);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), -10);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 0);</div><div class='del'>-</div><div class='del'>-	mean_and_variance_weighted_update(&amp;s, -20);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), -12);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 18);</div><div class='del'>-</div><div class='del'>-	mean_and_variance_weighted_update(&amp;s, -30);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), -16);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 72);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_weighted_advanced_test(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	struct mean_and_variance_weighted s = { .weight = 8 };</div><div class='del'>-	s64 i;</div><div class='del'>-</div><div class='del'>-	for (i = 10; i &lt;= 100; i += 10)</div><div class='del'>-		mean_and_variance_weighted_update(&amp;s, i);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), 11);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 107);</div><div class='del'>-</div><div class='del'>-	s = (struct mean_and_variance_weighted) { .weight = 8 };</div><div class='del'>-</div><div class='del'>-	for (i = -10; i &gt;= -100; i -= 10)</div><div class='del'>-		mean_and_variance_weighted_update(&amp;s, i);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(s), -11);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_variance(s), 107);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void do_mean_and_variance_test(struct kunit *test,</div><div class='del'>-				      s64 initial_value,</div><div class='del'>-				      s64 initial_n,</div><div class='del'>-				      s64 n,</div><div class='del'>-				      unsigned weight,</div><div class='del'>-				      s64 *data,</div><div class='del'>-				      s64 *mean,</div><div class='del'>-				      s64 *stddev,</div><div class='del'>-				      s64 *weighted_mean,</div><div class='del'>-				      s64 *weighted_stddev)</div><div class='del'>-{</div><div class='del'>-	struct mean_and_variance mv = {};</div><div class='del'>-	struct mean_and_variance_weighted vw = { .weight = weight };</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; initial_n; i++) {</div><div class='del'>-		mean_and_variance_update(&amp;mv, initial_value);</div><div class='del'>-		mean_and_variance_weighted_update(&amp;vw, initial_value);</div><div class='del'>-</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_get_mean(mv),		initial_value);</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_get_stddev(mv),		0);</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(vw),	initial_value);</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_stddev(vw),0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; n; i++) {</div><div class='del'>-		mean_and_variance_update(&amp;mv, data[i]);</div><div class='del'>-		mean_and_variance_weighted_update(&amp;vw, data[i]);</div><div class='del'>-</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_get_mean(mv),		mean[i]);</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_get_stddev(mv),		stddev[i]);</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_mean(vw),	weighted_mean[i]);</div><div class='del'>-		KUNIT_EXPECT_EQ(test, mean_and_variance_weighted_get_stddev(vw),weighted_stddev[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, mv.n, initial_n + n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Test behaviour with a single outlier, then back to steady state: */</div><div class='del'>-static void mean_and_variance_test_1(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	s64 d[]			= { 100, 10, 10, 10, 10, 10, 10 };</div><div class='del'>-	s64 mean[]		= {  22, 21, 20, 19, 18, 17, 16 };</div><div class='del'>-	s64 stddev[]		= {  32, 29, 28, 27, 26, 25, 24 };</div><div class='del'>-	s64 weighted_mean[]	= {  32, 27, 22, 19, 17, 15, 14 };</div><div class='del'>-	s64 weighted_stddev[]	= {  38, 35, 31, 27, 24, 21, 18 };</div><div class='del'>-</div><div class='del'>-	do_mean_and_variance_test(test, 10, 6, ARRAY_SIZE(d), 2,</div><div class='del'>-			d, mean, stddev, weighted_mean, weighted_stddev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_test_2(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	s64 d[]			= { 100, 10, 10, 10, 10, 10, 10 };</div><div class='del'>-	s64 mean[]		= {  10, 10, 10, 10, 10, 10, 10 };</div><div class='del'>-	s64 stddev[]		= {   9,  9,  9,  9,  9,  9,  9 };</div><div class='del'>-	s64 weighted_mean[]	= {  32, 27, 22, 19, 17, 15, 14 };</div><div class='del'>-	s64 weighted_stddev[]	= {  38, 35, 31, 27, 24, 21, 18 };</div><div class='del'>-</div><div class='del'>-	do_mean_and_variance_test(test, 10, 6, ARRAY_SIZE(d), 2,</div><div class='del'>-			d, mean, stddev, weighted_mean, weighted_stddev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Test behaviour where we switch from one steady state to another: */</div><div class='del'>-static void mean_and_variance_test_3(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	s64 d[]			= { 100, 100, 100, 100, 100 };</div><div class='del'>-	s64 mean[]		= {  22,  32,  40,  46,  50 };</div><div class='del'>-	s64 stddev[]		= {  32,  39,  42,  44,  45 };</div><div class='del'>-	s64 weighted_mean[]	= {  32,  49,  61,  71,  78 };</div><div class='del'>-	s64 weighted_stddev[]	= {  38,  44,  44,  41,  38 };</div><div class='del'>-</div><div class='del'>-	do_mean_and_variance_test(test, 10, 6, ARRAY_SIZE(d), 2,</div><div class='del'>-			d, mean, stddev, weighted_mean, weighted_stddev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_test_4(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	s64 d[]			= { 100, 100, 100, 100, 100 };</div><div class='del'>-	s64 mean[]		= {  10,  11,  12,  13,  14 };</div><div class='del'>-	s64 stddev[]		= {   9,  13,  15,  17,  19 };</div><div class='del'>-	s64 weighted_mean[]	= {  32,  49,  61,  71,  78 };</div><div class='del'>-	s64 weighted_stddev[]	= {  38,  44,  44,  41,  38 };</div><div class='del'>-</div><div class='del'>-	do_mean_and_variance_test(test, 10, 6, ARRAY_SIZE(d), 2,</div><div class='del'>-			d, mean, stddev, weighted_mean, weighted_stddev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_fast_divpow2(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	s64 i;</div><div class='del'>-	u8 d;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		d = 0;</div><div class='del'>-		KUNIT_EXPECT_EQ(test, fast_divpow2(i, d), div_u64(i, 1LLU &lt;&lt; d));</div><div class='del'>-		KUNIT_EXPECT_EQ(test, abs(fast_divpow2(-i, d)), div_u64(i, 1LLU &lt;&lt; d));</div><div class='del'>-		for (d = 1; d &lt; 32; d++) {</div><div class='del'>-			KUNIT_EXPECT_EQ_MSG(test, abs(fast_divpow2(i, d)),</div><div class='del'>-					    div_u64(i, 1 &lt;&lt; d), "%lld %u", i, d);</div><div class='del'>-			KUNIT_EXPECT_EQ_MSG(test, abs(fast_divpow2(-i, d)),</div><div class='del'>-					    div_u64(i, 1 &lt;&lt; d), "%lld %u", -i, d);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mean_and_variance_u128_basic_test(struct kunit *test)</div><div class='del'>-{</div><div class='del'>-	u128_u a  = u64s_to_u128(0, U64_MAX);</div><div class='del'>-	u128_u a1 = u64s_to_u128(0, 1);</div><div class='del'>-	u128_u b  = u64s_to_u128(1, 0);</div><div class='del'>-	u128_u c  = u64s_to_u128(0, 1LLU &lt;&lt; 63);</div><div class='del'>-	u128_u c2 = u64s_to_u128(U64_MAX, U64_MAX);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_add(a, a1)), 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_add(a, a1)), 0);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_add(a1, a)), 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_add(a1, a)), 0);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_sub(b, a1)), U64_MAX);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_sub(b, a1)), 0);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_shl(c, 1)), 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_shl(c, 1)), 0);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_square(U64_MAX)), U64_MAX - 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_square(U64_MAX)), 1);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_div(b, 2)), 1LLU &lt;&lt; 63);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_div(c2, 2)), U64_MAX &gt;&gt; 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_div(c2, 2)), U64_MAX);</div><div class='del'>-</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_hi(u128_div(u128_shl(u64_to_u128(U64_MAX), 32), 2)), U32_MAX &gt;&gt; 1);</div><div class='del'>-	KUNIT_EXPECT_EQ(test, u128_lo(u128_div(u128_shl(u64_to_u128(U64_MAX), 32), 2)), U64_MAX &lt;&lt; 31);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct kunit_case mean_and_variance_test_cases[] = {</div><div class='del'>-	KUNIT_CASE(mean_and_variance_fast_divpow2),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_u128_basic_test),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_basic_test),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_weighted_test),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_weighted_advanced_test),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_test_1),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_test_2),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_test_3),</div><div class='del'>-	KUNIT_CASE(mean_and_variance_test_4),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct kunit_suite mean_and_variance_test_suite = {</div><div class='del'>-	.name		= "mean and variance tests",</div><div class='del'>-	.test_cases	= mean_and_variance_test_cases</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-kunit_test_suite(mean_and_variance_test_suite);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Daniel B. Hill");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c<br/>deleted file mode 100644<br/>index 5623cee3ef86..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/migrate.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/migrate.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,176 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Code for moving data off a device.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "migrate.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-static int drop_dev_ptrs(struct bch_fs *c, struct bkey_s k,</div><div class='del'>-			 unsigned dev_idx, int flags, bool metadata)</div><div class='del'>-{</div><div class='del'>-	unsigned replicas = metadata ? c-&gt;opts.metadata_replicas : c-&gt;opts.data_replicas;</div><div class='del'>-	unsigned lost = metadata ? BCH_FORCE_IF_METADATA_LOST : BCH_FORCE_IF_DATA_LOST;</div><div class='del'>-	unsigned degraded = metadata ? BCH_FORCE_IF_METADATA_DEGRADED : BCH_FORCE_IF_DATA_DEGRADED;</div><div class='del'>-	unsigned nr_good;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_drop_device(k, dev_idx);</div><div class='del'>-</div><div class='del'>-	nr_good = bch2_bkey_durability(c, k.s_c);</div><div class='del'>-	if ((!nr_good &amp;&amp; !(flags &amp; lost)) ||</div><div class='del'>-	    (nr_good &lt; replicas &amp;&amp; !(flags &amp; degraded)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_usrdata_drop_key(struct btree_trans *trans,</div><div class='del'>-				     struct btree_iter *iter,</div><div class='del'>-				     struct bkey_s_c k,</div><div class='del'>-				     unsigned dev_idx,</div><div class='del'>-				     int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_i *n;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_bkey_has_device_c(k, dev_idx))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	n = bch2_bkey_make_mut(trans, iter, &amp;k, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = drop_dev_ptrs(c, bkey_i_to_s(n), dev_idx, flags, false);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the new extent no longer has any pointers, bch2_extent_normalize()</div><div class='del'>-	 * will do the appropriate thing with it (turning it into a</div><div class='del'>-	 * KEY_TYPE_error key, or just a discard if it was a cached extent)</div><div class='del'>-	 */</div><div class='del'>-	bch2_extent_normalize(c, bkey_i_to_s(n));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since we're not inserting through an extent iterator</div><div class='del'>-	 * (BTREE_ITER_ALL_SNAPSHOTS iterators aren't extent iterators),</div><div class='del'>-	 * we aren't using the extent overwrite path to delete, we're</div><div class='del'>-	 * just using the normal key deletion path:</div><div class='del'>-	 */</div><div class='del'>-	if (bkey_deleted(&amp;n-&gt;k))</div><div class='del'>-		n-&gt;k.size = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	enum btree_id id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; BTREE_ID_NR; id++) {</div><div class='del'>-		if (!btree_type_has_ptrs(id))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = for_each_btree_key_commit(trans, iter, id, POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_dev_usrdata_drop_key(trans, &amp;iter, k, dev_idx, flags));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_metadata_drop(struct bch_fs *c, unsigned dev_idx, int flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct closure cl;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	struct bkey_buf k;</div><div class='del'>-	unsigned id;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* don't handle this yet: */</div><div class='del'>-	if (flags &amp; BCH_FORCE_IF_METADATA_LOST)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-	bch2_bkey_buf_init(&amp;k);</div><div class='del'>-	closure_init_stack(&amp;cl);</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; BTREE_ID_NR; id++) {</div><div class='del'>-		bch2_trans_node_iter_init(trans, &amp;iter, id, POS_MIN, 0, 0,</div><div class='del'>-					  BTREE_ITER_PREFETCH);</div><div class='del'>-retry:</div><div class='del'>-		ret = 0;</div><div class='del'>-		while (bch2_trans_begin(trans),</div><div class='del'>-		       (b = bch2_btree_iter_peek_node(&amp;iter)) &amp;&amp;</div><div class='del'>-		       !(ret = PTR_ERR_OR_ZERO(b))) {</div><div class='del'>-			if (!bch2_bkey_has_device_c(bkey_i_to_s_c(&amp;b-&gt;key), dev_idx))</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_buf_copy(&amp;k, c, &amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-			ret = drop_dev_ptrs(c, bkey_i_to_s(k.k),</div><div class='del'>-					    dev_idx, flags, true);</div><div class='del'>-			if (ret) {</div><div class='del'>-				bch_err(c, "Cannot drop device without losing data");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = bch2_btree_node_update_key(trans, &amp;iter, b, k.k, 0, false);</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-				ret = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bch_err_msg(c, ret, "updating btree node key");</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-next:</div><div class='del'>-			bch2_btree_iter_next_node(&amp;iter);</div><div class='del'>-		}</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_btree_interior_updates_flush(c);</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_bkey_buf_exit(&amp;k, c);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	BUG_ON(bch2_err_matches(ret, BCH_ERR_transaction_restart));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_data_drop(struct bch_fs *c, unsigned dev_idx, int flags)</div><div class='del'>-{</div><div class='del'>-	return bch2_dev_usrdata_drop(c, dev_idx, flags) ?:</div><div class='del'>-		bch2_dev_metadata_drop(c, dev_idx, flags);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/migrate.h b/fs/bcachefs/migrate.h<br/>deleted file mode 100644<br/>index 027efaa0d575..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/migrate.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/migrate.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_MIGRATE_H</div><div class='del'>-#define _BCACHEFS_MIGRATE_H</div><div class='del'>-</div><div class='del'>-int bch2_dev_data_drop(struct bch_fs *, unsigned, int);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_MIGRATE_H */</div><div class='head'>diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c<br/>deleted file mode 100644<br/>index bf68ea49447b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/move.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/move.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1208 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioprio.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-</div><div class='del'>-const char * const bch2_data_ops_strs[] = {</div><div class='del'>-#define x(t, n, ...) [n] = #t,</div><div class='del'>-	BCH_DATA_OPS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_data_update_opts_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-					  struct bch_io_opts *io_opts,</div><div class='del'>-					  struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	printbuf_tabstop_push(out, 20);</div><div class='del'>-	prt_str(out, "rewrite ptrs:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_prt_u64_base2(out, data_opts-&gt;rewrite_ptrs);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "kill ptrs: ");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_prt_u64_base2(out, data_opts-&gt;kill_ptrs);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "target: ");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_target_to_text(out, c, data_opts-&gt;target);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "compression: ");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_compression_opt_to_text(out, background_compression(*io_opts));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "extra replicas: ");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, data_opts-&gt;extra_replicas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void trace_move_extent2(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			       struct bch_io_opts *io_opts,</div><div class='del'>-			       struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	if (trace_move_extent_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		bch2_data_update_opts_to_text(&amp;buf, c, io_opts, data_opts);</div><div class='del'>-		trace_move_extent(c, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void trace_move_extent_read2(struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	if (trace_move_extent_read_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		trace_move_extent_read(c, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct moving_io {</div><div class='del'>-	struct list_head		read_list;</div><div class='del'>-	struct list_head		io_list;</div><div class='del'>-	struct move_bucket_in_flight	*b;</div><div class='del'>-	struct closure			cl;</div><div class='del'>-	bool				read_completed;</div><div class='del'>-</div><div class='del'>-	unsigned			read_sectors;</div><div class='del'>-	unsigned			write_sectors;</div><div class='del'>-</div><div class='del'>-	struct bch_read_bio		rbio;</div><div class='del'>-</div><div class='del'>-	struct data_update		write;</div><div class='del'>-	/* Must be last since it is variable size */</div><div class='del'>-	struct bio_vec			bi_inline_vecs[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void move_free(struct moving_io *io)</div><div class='del'>-{</div><div class='del'>-	struct moving_context *ctxt = io-&gt;write.ctxt;</div><div class='del'>-</div><div class='del'>-	if (io-&gt;b)</div><div class='del'>-		atomic_dec(&amp;io-&gt;b-&gt;count);</div><div class='del'>-</div><div class='del'>-	bch2_data_update_exit(&amp;io-&gt;write);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ctxt-&gt;lock);</div><div class='del'>-	list_del(&amp;io-&gt;io_list);</div><div class='del'>-	wake_up(&amp;ctxt-&gt;wait);</div><div class='del'>-	mutex_unlock(&amp;ctxt-&gt;lock);</div><div class='del'>-</div><div class='del'>-	kfree(io);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void move_write_done(struct bch_write_op *op)</div><div class='del'>-{</div><div class='del'>-	struct moving_io *io = container_of(op, struct moving_io, write.op);</div><div class='del'>-	struct moving_context *ctxt = io-&gt;write.ctxt;</div><div class='del'>-</div><div class='del'>-	if (io-&gt;write.op.error)</div><div class='del'>-		ctxt-&gt;write_error = true;</div><div class='del'>-</div><div class='del'>-	atomic_sub(io-&gt;write_sectors, &amp;io-&gt;write.ctxt-&gt;write_sectors);</div><div class='del'>-	atomic_dec(&amp;io-&gt;write.ctxt-&gt;write_ios);</div><div class='del'>-	move_free(io);</div><div class='del'>-	closure_put(&amp;ctxt-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void move_write(struct moving_io *io)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(io-&gt;rbio.bio.bi_status || io-&gt;rbio.hole)) {</div><div class='del'>-		move_free(io);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trace_move_extent_write_enabled()) {</div><div class='del'>-		struct bch_fs *c = io-&gt;write.op.c;</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, bkey_i_to_s_c(io-&gt;write.k.k));</div><div class='del'>-		trace_move_extent_write(c, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closure_get(&amp;io-&gt;write.ctxt-&gt;cl);</div><div class='del'>-	atomic_add(io-&gt;write_sectors, &amp;io-&gt;write.ctxt-&gt;write_sectors);</div><div class='del'>-	atomic_inc(&amp;io-&gt;write.ctxt-&gt;write_ios);</div><div class='del'>-</div><div class='del'>-	bch2_data_update_read_done(&amp;io-&gt;write, io-&gt;rbio.pick.crc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct moving_io *bch2_moving_ctxt_next_pending_write(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	struct moving_io *io =</div><div class='del'>-		list_first_entry_or_null(&amp;ctxt-&gt;reads, struct moving_io, read_list);</div><div class='del'>-</div><div class='del'>-	return io &amp;&amp; io-&gt;read_completed ? io : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void move_read_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct moving_io *io = container_of(bio, struct moving_io, rbio.bio);</div><div class='del'>-	struct moving_context *ctxt = io-&gt;write.ctxt;</div><div class='del'>-</div><div class='del'>-	atomic_sub(io-&gt;read_sectors, &amp;ctxt-&gt;read_sectors);</div><div class='del'>-	atomic_dec(&amp;ctxt-&gt;read_ios);</div><div class='del'>-	io-&gt;read_completed = true;</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;ctxt-&gt;wait);</div><div class='del'>-	closure_put(&amp;ctxt-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_moving_ctxt_do_pending_writes(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	struct moving_io *io;</div><div class='del'>-</div><div class='del'>-	while ((io = bch2_moving_ctxt_next_pending_write(ctxt))) {</div><div class='del'>-		bch2_trans_unlock_long(ctxt-&gt;trans);</div><div class='del'>-		list_del(&amp;io-&gt;read_list);</div><div class='del'>-		move_write(io);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_move_ctxt_wait_for_io(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	unsigned sectors_pending = atomic_read(&amp;ctxt-&gt;write_sectors);</div><div class='del'>-</div><div class='del'>-	move_ctxt_wait_event(ctxt,</div><div class='del'>-		!atomic_read(&amp;ctxt-&gt;write_sectors) ||</div><div class='del'>-		atomic_read(&amp;ctxt-&gt;write_sectors) != sectors_pending);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_moving_ctxt_flush_all(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	move_ctxt_wait_event(ctxt, list_empty(&amp;ctxt-&gt;reads));</div><div class='del'>-	bch2_trans_unlock_long(ctxt-&gt;trans);</div><div class='del'>-	closure_sync(&amp;ctxt-&gt;cl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_moving_ctxt_exit(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ctxt-&gt;trans-&gt;c;</div><div class='del'>-</div><div class='del'>-	bch2_moving_ctxt_flush_all(ctxt);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(atomic_read(&amp;ctxt-&gt;write_sectors));</div><div class='del'>-	EBUG_ON(atomic_read(&amp;ctxt-&gt;write_ios));</div><div class='del'>-	EBUG_ON(atomic_read(&amp;ctxt-&gt;read_sectors));</div><div class='del'>-	EBUG_ON(atomic_read(&amp;ctxt-&gt;read_ios));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;moving_context_lock);</div><div class='del'>-	list_del(&amp;ctxt-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;moving_context_lock);</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(ctxt-&gt;trans);</div><div class='del'>-	memset(ctxt, 0, sizeof(*ctxt));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_moving_ctxt_init(struct moving_context *ctxt,</div><div class='del'>-			   struct bch_fs *c,</div><div class='del'>-			   struct bch_ratelimit *rate,</div><div class='del'>-			   struct bch_move_stats *stats,</div><div class='del'>-			   struct write_point_specifier wp,</div><div class='del'>-			   bool wait_on_copygc)</div><div class='del'>-{</div><div class='del'>-	memset(ctxt, 0, sizeof(*ctxt));</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;trans	= bch2_trans_get(c);</div><div class='del'>-	ctxt-&gt;fn	= (void *) _RET_IP_;</div><div class='del'>-	ctxt-&gt;rate	= rate;</div><div class='del'>-	ctxt-&gt;stats	= stats;</div><div class='del'>-	ctxt-&gt;wp	= wp;</div><div class='del'>-	ctxt-&gt;wait_on_copygc = wait_on_copygc;</div><div class='del'>-</div><div class='del'>-	closure_init_stack(&amp;ctxt-&gt;cl);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;ctxt-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ctxt-&gt;reads);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ctxt-&gt;ios);</div><div class='del'>-	init_waitqueue_head(&amp;ctxt-&gt;wait);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;moving_context_lock);</div><div class='del'>-	list_add(&amp;ctxt-&gt;list, &amp;c-&gt;moving_context_list);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;moving_context_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_move_stats_exit(struct bch_move_stats *stats, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	trace_move_data(c, stats);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_move_stats_init(struct bch_move_stats *stats, const char *name)</div><div class='del'>-{</div><div class='del'>-	memset(stats, 0, sizeof(*stats));</div><div class='del'>-	stats-&gt;data_type = BCH_DATA_user;</div><div class='del'>-	scnprintf(stats-&gt;name, sizeof(stats-&gt;name), "%s", name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_move_extent(struct moving_context *ctxt,</div><div class='del'>-		     struct move_bucket_in_flight *bucket_in_flight,</div><div class='del'>-		     struct btree_iter *iter,</div><div class='del'>-		     struct bkey_s_c k,</div><div class='del'>-		     struct bch_io_opts io_opts,</div><div class='del'>-		     struct data_update_opts data_opts)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	struct moving_io *io;</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	unsigned sectors = k.k-&gt;size, pages;</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	trace_move_extent2(c, k, &amp;io_opts, &amp;data_opts);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;stats)</div><div class='del'>-		ctxt-&gt;stats-&gt;pos = BBPOS(iter-&gt;btree_id, iter-&gt;pos);</div><div class='del'>-</div><div class='del'>-	bch2_data_update_opts_normalize(k, &amp;data_opts);</div><div class='del'>-</div><div class='del'>-	if (!data_opts.rewrite_ptrs &amp;&amp;</div><div class='del'>-	    !data_opts.extra_replicas) {</div><div class='del'>-		if (data_opts.kill_ptrs)</div><div class='del'>-			return bch2_extent_drop_ptrs(trans, iter, k, data_opts);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Before memory allocations &amp; taking nocow locks in</div><div class='del'>-	 * bch2_data_update_init():</div><div class='del'>-	 */</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-</div><div class='del'>-	/* write path might have to decompress data: */</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry)</div><div class='del'>-		sectors = max_t(unsigned, sectors, p.crc.uncompressed_size);</div><div class='del'>-</div><div class='del'>-	pages = DIV_ROUND_UP(sectors, PAGE_SECTORS);</div><div class='del'>-	io = kzalloc(sizeof(struct moving_io) +</div><div class='del'>-		     sizeof(struct bio_vec) * pages, GFP_KERNEL);</div><div class='del'>-	if (!io)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;io-&gt;io_list);</div><div class='del'>-	io-&gt;write.ctxt		= ctxt;</div><div class='del'>-	io-&gt;read_sectors	= k.k-&gt;size;</div><div class='del'>-	io-&gt;write_sectors	= k.k-&gt;size;</div><div class='del'>-</div><div class='del'>-	bio_init(&amp;io-&gt;write.op.wbio.bio, NULL, io-&gt;bi_inline_vecs, pages, 0);</div><div class='del'>-	bio_set_prio(&amp;io-&gt;write.op.wbio.bio,</div><div class='del'>-		     IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));</div><div class='del'>-</div><div class='del'>-	if (bch2_bio_alloc_pages(&amp;io-&gt;write.op.wbio.bio, sectors &lt;&lt; 9,</div><div class='del'>-				 GFP_KERNEL))</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	io-&gt;rbio.c		= c;</div><div class='del'>-	io-&gt;rbio.opts		= io_opts;</div><div class='del'>-	bio_init(&amp;io-&gt;rbio.bio, NULL, io-&gt;bi_inline_vecs, pages, 0);</div><div class='del'>-	io-&gt;rbio.bio.bi_vcnt = pages;</div><div class='del'>-	bio_set_prio(&amp;io-&gt;rbio.bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));</div><div class='del'>-	io-&gt;rbio.bio.bi_iter.bi_size = sectors &lt;&lt; 9;</div><div class='del'>-</div><div class='del'>-	io-&gt;rbio.bio.bi_opf		= REQ_OP_READ;</div><div class='del'>-	io-&gt;rbio.bio.bi_iter.bi_sector	= bkey_start_offset(k.k);</div><div class='del'>-	io-&gt;rbio.bio.bi_end_io		= move_read_endio;</div><div class='del'>-</div><div class='del'>-	ret = bch2_data_update_init(trans, iter, ctxt, &amp;io-&gt;write, ctxt-&gt;wp,</div><div class='del'>-				    io_opts, data_opts, iter-&gt;btree_id, k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_pages;</div><div class='del'>-</div><div class='del'>-	io-&gt;write.op.end_io = move_write_done;</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;rate)</div><div class='del'>-		bch2_ratelimit_increment(ctxt-&gt;rate, k.k-&gt;size);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;stats) {</div><div class='del'>-		atomic64_inc(&amp;ctxt-&gt;stats-&gt;keys_moved);</div><div class='del'>-		atomic64_add(k.k-&gt;size, &amp;ctxt-&gt;stats-&gt;sectors_moved);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bucket_in_flight) {</div><div class='del'>-		io-&gt;b = bucket_in_flight;</div><div class='del'>-		atomic_inc(&amp;io-&gt;b-&gt;count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	this_cpu_add(c-&gt;counters[BCH_COUNTER_io_move], k.k-&gt;size);</div><div class='del'>-	this_cpu_add(c-&gt;counters[BCH_COUNTER_move_extent_read], k.k-&gt;size);</div><div class='del'>-	trace_move_extent_read2(c, k);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ctxt-&gt;lock);</div><div class='del'>-	atomic_add(io-&gt;read_sectors, &amp;ctxt-&gt;read_sectors);</div><div class='del'>-	atomic_inc(&amp;ctxt-&gt;read_ios);</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;io-&gt;read_list, &amp;ctxt-&gt;reads);</div><div class='del'>-	list_add_tail(&amp;io-&gt;io_list, &amp;ctxt-&gt;ios);</div><div class='del'>-	mutex_unlock(&amp;ctxt-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * dropped by move_read_endio() - guards against use after free of</div><div class='del'>-	 * ctxt when doing wakeup</div><div class='del'>-	 */</div><div class='del'>-	closure_get(&amp;ctxt-&gt;cl);</div><div class='del'>-	bch2_read_extent(trans, &amp;io-&gt;rbio,</div><div class='del'>-			 bkey_start_pos(k.k),</div><div class='del'>-			 iter-&gt;btree_id, k, 0,</div><div class='del'>-			 BCH_READ_NODECODE|</div><div class='del'>-			 BCH_READ_LAST_FRAGMENT);</div><div class='del'>-	return 0;</div><div class='del'>-err_free_pages:</div><div class='del'>-	bio_free_pages(&amp;io-&gt;write.op.wbio.bio);</div><div class='del'>-err_free:</div><div class='del'>-	kfree(io);</div><div class='del'>-err:</div><div class='del'>-	if (ret == -BCH_ERR_data_update_done)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, EROFS) ||</div><div class='del'>-	    bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	count_event(c, move_extent_start_fail);</div><div class='del'>-</div><div class='del'>-	if (trace_move_extent_start_fail_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-		prt_str(&amp;buf, ": ");</div><div class='del'>-		prt_str(&amp;buf, bch2_err_str(ret));</div><div class='del'>-		trace_move_extent_start_fail(c, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_io_opts *bch2_move_get_io_opts(struct btree_trans *trans,</div><div class='del'>-			  struct per_snapshot_io_opts *io_opts,</div><div class='del'>-			  struct bkey_s_c extent_k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (io_opts-&gt;cur_inum != extent_k.k-&gt;p.inode) {</div><div class='del'>-		io_opts-&gt;d.nr = 0;</div><div class='del'>-</div><div class='del'>-		ret = for_each_btree_key(trans, iter, BTREE_ID_inodes, POS(0, extent_k.k-&gt;p.inode),</div><div class='del'>-					 BTREE_ITER_ALL_SNAPSHOTS, k, ({</div><div class='del'>-			if (k.k-&gt;p.offset != extent_k.k-&gt;p.inode)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (!bkey_is_inode(k.k))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			struct bch_inode_unpacked inode;</div><div class='del'>-			BUG_ON(bch2_inode_unpack(k, &amp;inode));</div><div class='del'>-</div><div class='del'>-			struct snapshot_io_opts_entry e = { .snapshot = k.k-&gt;p.snapshot };</div><div class='del'>-			bch2_inode_opts_get(&amp;e.io_opts, trans-&gt;c, &amp;inode);</div><div class='del'>-</div><div class='del'>-			darray_push(&amp;io_opts-&gt;d, e);</div><div class='del'>-		}));</div><div class='del'>-		io_opts-&gt;cur_inum = extent_k.k-&gt;p.inode;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ret ?: trans_was_restarted(trans, restart_count);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (extent_k.k-&gt;p.snapshot)</div><div class='del'>-		darray_for_each(io_opts-&gt;d, i)</div><div class='del'>-			if (bch2_snapshot_is_ancestor(c, extent_k.k-&gt;p.snapshot, i-&gt;snapshot))</div><div class='del'>-				return &amp;i-&gt;io_opts;</div><div class='del'>-</div><div class='del'>-	return &amp;io_opts-&gt;fs_io_opts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_move_get_io_opts_one(struct btree_trans *trans,</div><div class='del'>-			      struct bch_io_opts *io_opts,</div><div class='del'>-			      struct bkey_s_c extent_k)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* reflink btree? */</div><div class='del'>-	if (!extent_k.k-&gt;p.inode) {</div><div class='del'>-		*io_opts = bch2_opts_to_inode_opts(trans-&gt;c-&gt;opts);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			       SPOS(0, extent_k.k-&gt;p.inode, extent_k.k-&gt;p.snapshot),</div><div class='del'>-			       BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; bkey_is_inode(k.k)) {</div><div class='del'>-		struct bch_inode_unpacked inode;</div><div class='del'>-		bch2_inode_unpack(k, &amp;inode);</div><div class='del'>-		bch2_inode_opts_get(io_opts, trans-&gt;c, &amp;inode);</div><div class='del'>-	} else {</div><div class='del'>-		*io_opts = bch2_opts_to_inode_opts(trans-&gt;c-&gt;opts);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_move_ratelimit(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ctxt-&gt;trans-&gt;c;</div><div class='del'>-	bool is_kthread = current-&gt;flags &amp; PF_KTHREAD;</div><div class='del'>-	u64 delay;</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;wait_on_copygc &amp;&amp; c-&gt;copygc_running) {</div><div class='del'>-		bch2_moving_ctxt_flush_all(ctxt);</div><div class='del'>-		wait_event_killable(c-&gt;copygc_running_wq,</div><div class='del'>-				    !c-&gt;copygc_running ||</div><div class='del'>-				    (is_kthread &amp;&amp; kthread_should_stop()));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		delay = ctxt-&gt;rate ? bch2_ratelimit_delay(ctxt-&gt;rate) : 0;</div><div class='del'>-</div><div class='del'>-		if (is_kthread &amp;&amp; kthread_should_stop())</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		if (delay)</div><div class='del'>-			move_ctxt_wait_event_timeout(ctxt,</div><div class='del'>-					freezing(current) ||</div><div class='del'>-					(is_kthread &amp;&amp; kthread_should_stop()),</div><div class='del'>-					delay);</div><div class='del'>-</div><div class='del'>-		if (unlikely(freezing(current))) {</div><div class='del'>-			bch2_moving_ctxt_flush_all(ctxt);</div><div class='del'>-			try_to_freeze();</div><div class='del'>-		}</div><div class='del'>-	} while (delay);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: these limits really ought to be per device, SSDs and hard drives</div><div class='del'>-	 * will want different limits</div><div class='del'>-	 */</div><div class='del'>-	move_ctxt_wait_event(ctxt,</div><div class='del'>-		atomic_read(&amp;ctxt-&gt;write_sectors) &lt; c-&gt;opts.move_bytes_in_flight &gt;&gt; 9 &amp;&amp;</div><div class='del'>-		atomic_read(&amp;ctxt-&gt;read_sectors) &lt; c-&gt;opts.move_bytes_in_flight &gt;&gt; 9 &amp;&amp;</div><div class='del'>-		atomic_read(&amp;ctxt-&gt;write_ios) &lt; c-&gt;opts.move_ios_in_flight &amp;&amp;</div><div class='del'>-		atomic_read(&amp;ctxt-&gt;read_ios) &lt; c-&gt;opts.move_ios_in_flight);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_move_data_btree(struct moving_context *ctxt,</div><div class='del'>-				struct bpos start,</div><div class='del'>-				struct bpos end,</div><div class='del'>-				move_pred_fn pred, void *arg,</div><div class='del'>-				enum btree_id btree_id)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct per_snapshot_io_opts snapshot_io_opts;</div><div class='del'>-	struct bch_io_opts *io_opts;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct data_update_opts data_opts;</div><div class='del'>-	int ret = 0, ret2;</div><div class='del'>-</div><div class='del'>-	per_snapshot_io_opts_init(&amp;snapshot_io_opts, c);</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;stats) {</div><div class='del'>-		ctxt-&gt;stats-&gt;data_type	= BCH_DATA_user;</div><div class='del'>-		ctxt-&gt;stats-&gt;pos	= BBPOS(btree_id, start);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, btree_id, start,</div><div class='del'>-			     BTREE_ITER_PREFETCH|</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;rate)</div><div class='del'>-		bch2_ratelimit_reset(ctxt-&gt;rate);</div><div class='del'>-</div><div class='del'>-	while (!bch2_move_ratelimit(ctxt)) {</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		k = bch2_btree_iter_peek(&amp;iter);</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bkey_ge(bkey_start_pos(k.k), end))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (ctxt-&gt;stats)</div><div class='del'>-			ctxt-&gt;stats-&gt;pos = BBPOS(iter.btree_id, iter.pos);</div><div class='del'>-</div><div class='del'>-		if (!bkey_extent_is_direct_data(k.k))</div><div class='del'>-			goto next_nondata;</div><div class='del'>-</div><div class='del'>-		io_opts = bch2_move_get_io_opts(trans, &amp;snapshot_io_opts, k);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(io_opts);</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		memset(&amp;data_opts, 0, sizeof(data_opts));</div><div class='del'>-		if (!pred(c, arg, k, io_opts, &amp;data_opts))</div><div class='del'>-			goto next;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The iterator gets unlocked by __bch2_read_extent - need to</div><div class='del'>-		 * save a copy of @k elsewhere:</div><div class='del'>-		 */</div><div class='del'>-		bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-		k = bkey_i_to_s_c(sk.k);</div><div class='del'>-</div><div class='del'>-		ret2 = bch2_move_extent(ctxt, NULL, &amp;iter, k, *io_opts, data_opts);</div><div class='del'>-		if (ret2) {</div><div class='del'>-			if (bch2_err_matches(ret2, BCH_ERR_transaction_restart))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (ret2 == -ENOMEM) {</div><div class='del'>-				/* memory allocation failure, wait for some IO to finish */</div><div class='del'>-				bch2_move_ctxt_wait_for_io(ctxt);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* XXX signal failure */</div><div class='del'>-			goto next;</div><div class='del'>-		}</div><div class='del'>-next:</div><div class='del'>-		if (ctxt-&gt;stats)</div><div class='del'>-			atomic64_add(k.k-&gt;size, &amp;ctxt-&gt;stats-&gt;sectors_seen);</div><div class='del'>-next_nondata:</div><div class='del'>-		bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-	per_snapshot_io_opts_exit(&amp;snapshot_io_opts);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_move_data(struct moving_context *ctxt,</div><div class='del'>-		     struct bbpos start,</div><div class='del'>-		     struct bbpos end,</div><div class='del'>-		     move_pred_fn pred, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ctxt-&gt;trans-&gt;c;</div><div class='del'>-	enum btree_id id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (id = start.btree;</div><div class='del'>-	     id &lt;= min_t(unsigned, end.btree, btree_id_nr_alive(c) - 1);</div><div class='del'>-	     id++) {</div><div class='del'>-		ctxt-&gt;stats-&gt;pos = BBPOS(id, POS_MIN);</div><div class='del'>-</div><div class='del'>-		if (!btree_type_has_ptrs(id) ||</div><div class='del'>-		    !bch2_btree_id_root(c, id)-&gt;b)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = bch2_move_data_btree(ctxt,</div><div class='del'>-				       id == start.btree ? start.pos : POS_MIN,</div><div class='del'>-				       id == end.btree   ? end.pos   : POS_MAX,</div><div class='del'>-				       pred, arg, id);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_move_data(struct bch_fs *c,</div><div class='del'>-		   struct bbpos start,</div><div class='del'>-		   struct bbpos end,</div><div class='del'>-		   struct bch_ratelimit *rate,</div><div class='del'>-		   struct bch_move_stats *stats,</div><div class='del'>-		   struct write_point_specifier wp,</div><div class='del'>-		   bool wait_on_copygc,</div><div class='del'>-		   move_pred_fn pred, void *arg)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct moving_context ctxt;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_moving_ctxt_init(&amp;ctxt, c, rate, stats, wp, wait_on_copygc);</div><div class='del'>-	ret = __bch2_move_data(&amp;ctxt, start, end, pred, arg);</div><div class='del'>-	bch2_moving_ctxt_exit(&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_evacuate_bucket(struct moving_context *ctxt,</div><div class='del'>-			   struct move_bucket_in_flight *bucket_in_flight,</div><div class='del'>-			   struct bpos bucket, int gen,</div><div class='del'>-			   struct data_update_opts _data_opts)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	bool is_kthread = current-&gt;flags &amp; PF_KTHREAD;</div><div class='del'>-	struct bch_io_opts io_opts = bch2_opts_to_inode_opts(c-&gt;opts);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	struct bch_backpointer bp;</div><div class='del'>-	struct bch_alloc_v4 a_convert;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct data_update_opts data_opts;</div><div class='del'>-	unsigned dirty_sectors, bucket_size;</div><div class='del'>-	u64 fragmentation;</div><div class='del'>-	struct bpos bp_pos = POS_MIN;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	trace_bucket_evacuate(c, &amp;bucket);</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We're not run in a context that handles transaction restarts:</div><div class='del'>-	 */</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_alloc,</div><div class='del'>-			     bucket, BTREE_ITER_CACHED);</div><div class='del'>-	ret = lockrestart_do(trans,</div><div class='del'>-			bkey_err(k = bch2_btree_iter_peek_slot(&amp;iter)));</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	bch_err_msg(c, ret, "looking up alloc key");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(k, &amp;a_convert);</div><div class='del'>-	dirty_sectors = bch2_bucket_sectors_dirty(*a);</div><div class='del'>-	bucket_size = bch_dev_bkey_exists(c, bucket.inode)-&gt;mi.bucket_size;</div><div class='del'>-	fragmentation = a-&gt;fragmentation_lru;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_write_buffer_tryflush(trans);</div><div class='del'>-	bch_err_msg(c, ret, "flushing btree write buffer");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	while (!(ret = bch2_move_ratelimit(ctxt))) {</div><div class='del'>-		if (is_kthread &amp;&amp; kthread_should_stop())</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret = bch2_get_next_backpointer(trans, bucket, gen,</div><div class='del'>-						&amp;bp_pos, &amp;bp,</div><div class='del'>-						BTREE_ITER_CACHED);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-		if (bkey_eq(bp_pos, POS_MAX))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!bp.level) {</div><div class='del'>-			k = bch2_backpointer_get_key(trans, &amp;iter, bp_pos, bp, 0);</div><div class='del'>-			ret = bkey_err(k);</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				continue;</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-			if (!k.k)</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-			k = bkey_i_to_s_c(sk.k);</div><div class='del'>-</div><div class='del'>-			ret = bch2_move_get_io_opts_one(trans, &amp;io_opts, k);</div><div class='del'>-			if (ret) {</div><div class='del'>-				bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			data_opts = _data_opts;</div><div class='del'>-			data_opts.target	= io_opts.background_target;</div><div class='del'>-			data_opts.rewrite_ptrs = 0;</div><div class='del'>-</div><div class='del'>-			unsigned i = 0;</div><div class='del'>-			bkey_for_each_ptr(bch2_bkey_ptrs_c(k), ptr) {</div><div class='del'>-				if (ptr-&gt;dev == bucket.inode) {</div><div class='del'>-					data_opts.rewrite_ptrs |= 1U &lt;&lt; i;</div><div class='del'>-					if (ptr-&gt;cached) {</div><div class='del'>-						bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-						goto next;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				i++;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = bch2_move_extent(ctxt, bucket_in_flight,</div><div class='del'>-					       &amp;iter, k, io_opts, data_opts);</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				continue;</div><div class='del'>-			if (ret == -ENOMEM) {</div><div class='del'>-				/* memory allocation failure, wait for some IO to finish */</div><div class='del'>-				bch2_move_ctxt_wait_for_io(ctxt);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			if (ctxt-&gt;stats)</div><div class='del'>-				atomic64_add(k.k-&gt;size, &amp;ctxt-&gt;stats-&gt;sectors_seen);</div><div class='del'>-		} else {</div><div class='del'>-			struct btree *b;</div><div class='del'>-</div><div class='del'>-			b = bch2_backpointer_get_node(trans, &amp;iter, bp_pos, bp);</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(b);</div><div class='del'>-			if (ret == -BCH_ERR_backpointer_to_overwritten_btree_node)</div><div class='del'>-				continue;</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				continue;</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-			if (!b)</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			unsigned sectors = btree_ptr_sectors_written(&amp;b-&gt;key);</div><div class='del'>-</div><div class='del'>-			ret = bch2_btree_node_rewrite(trans, &amp;iter, b, 0);</div><div class='del'>-			bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				continue;</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			if (ctxt-&gt;rate)</div><div class='del'>-				bch2_ratelimit_increment(ctxt-&gt;rate, sectors);</div><div class='del'>-			if (ctxt-&gt;stats) {</div><div class='del'>-				atomic64_add(sectors, &amp;ctxt-&gt;stats-&gt;sectors_seen);</div><div class='del'>-				atomic64_add(sectors, &amp;ctxt-&gt;stats-&gt;sectors_moved);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-next:</div><div class='del'>-		bp_pos = bpos_nosnap_successor(bp_pos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_evacuate_bucket(c, &amp;bucket, dirty_sectors, bucket_size, fragmentation, ret);</div><div class='del'>-err:</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef bool (*move_btree_pred)(struct bch_fs *, void *,</div><div class='del'>-				struct btree *, struct bch_io_opts *,</div><div class='del'>-				struct data_update_opts *);</div><div class='del'>-</div><div class='del'>-static int bch2_move_btree(struct bch_fs *c,</div><div class='del'>-			   struct bbpos start,</div><div class='del'>-			   struct bbpos end,</div><div class='del'>-			   move_btree_pred pred, void *arg,</div><div class='del'>-			   struct bch_move_stats *stats)</div><div class='del'>-{</div><div class='del'>-	bool kthread = (current-&gt;flags &amp; PF_KTHREAD) != 0;</div><div class='del'>-	struct bch_io_opts io_opts = bch2_opts_to_inode_opts(c-&gt;opts);</div><div class='del'>-	struct moving_context ctxt;</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct btree *b;</div><div class='del'>-	enum btree_id btree;</div><div class='del'>-	struct data_update_opts data_opts;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_moving_ctxt_init(&amp;ctxt, c, NULL, stats,</div><div class='del'>-			      writepoint_ptr(&amp;c-&gt;btree_write_point),</div><div class='del'>-			      true);</div><div class='del'>-	trans = ctxt.trans;</div><div class='del'>-</div><div class='del'>-	stats-&gt;data_type = BCH_DATA_btree;</div><div class='del'>-</div><div class='del'>-	for (btree = start.btree;</div><div class='del'>-	     btree &lt;= min_t(unsigned, end.btree, btree_id_nr_alive(c) - 1);</div><div class='del'>-	     btree ++) {</div><div class='del'>-		stats-&gt;pos = BBPOS(btree, POS_MIN);</div><div class='del'>-</div><div class='del'>-		if (!bch2_btree_id_root(c, btree)-&gt;b)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_trans_node_iter_init(trans, &amp;iter, btree, POS_MIN, 0, 0,</div><div class='del'>-					  BTREE_ITER_PREFETCH);</div><div class='del'>-retry:</div><div class='del'>-		ret = 0;</div><div class='del'>-		while (bch2_trans_begin(trans),</div><div class='del'>-		       (b = bch2_btree_iter_peek_node(&amp;iter)) &amp;&amp;</div><div class='del'>-		       !(ret = PTR_ERR_OR_ZERO(b))) {</div><div class='del'>-			if (kthread &amp;&amp; kthread_should_stop())</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if ((cmp_int(btree, end.btree) ?:</div><div class='del'>-			     bpos_cmp(b-&gt;key.k.p, end.pos)) &gt; 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			stats-&gt;pos = BBPOS(iter.btree_id, iter.pos);</div><div class='del'>-</div><div class='del'>-			if (!pred(c, arg, b, &amp;io_opts, &amp;data_opts))</div><div class='del'>-				goto next;</div><div class='del'>-</div><div class='del'>-			ret = bch2_btree_node_rewrite(trans, &amp;iter, b, 0) ?: ret;</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-				continue;</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-next:</div><div class='del'>-			bch2_btree_iter_next_node(&amp;iter);</div><div class='del'>-		}</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto retry;</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-		if (kthread &amp;&amp; kthread_should_stop())</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	bch2_moving_ctxt_exit(&amp;ctxt);</div><div class='del'>-	bch2_btree_interior_updates_flush(c);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rereplicate_pred(struct bch_fs *c, void *arg,</div><div class='del'>-			     struct bkey_s_c k,</div><div class='del'>-			     struct bch_io_opts *io_opts,</div><div class='del'>-			     struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	unsigned nr_good = bch2_bkey_durability(c, k);</div><div class='del'>-	unsigned replicas = bkey_is_btree_ptr(k.k)</div><div class='del'>-		? c-&gt;opts.metadata_replicas</div><div class='del'>-		: io_opts-&gt;data_replicas;</div><div class='del'>-</div><div class='del'>-	if (!nr_good || nr_good &gt;= replicas)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	data_opts-&gt;target		= 0;</div><div class='del'>-	data_opts-&gt;extra_replicas	= replicas - nr_good;</div><div class='del'>-	data_opts-&gt;btree_insert_flags	= 0;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool migrate_pred(struct bch_fs *c, void *arg,</div><div class='del'>-			 struct bkey_s_c k,</div><div class='del'>-			 struct bch_io_opts *io_opts,</div><div class='del'>-			 struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	struct bch_ioctl_data *op = arg;</div><div class='del'>-	unsigned i = 0;</div><div class='del'>-</div><div class='del'>-	data_opts-&gt;rewrite_ptrs		= 0;</div><div class='del'>-	data_opts-&gt;target		= 0;</div><div class='del'>-	data_opts-&gt;extra_replicas	= 0;</div><div class='del'>-	data_opts-&gt;btree_insert_flags	= 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr(ptrs, ptr) {</div><div class='del'>-		if (ptr-&gt;dev == op-&gt;migrate.dev)</div><div class='del'>-			data_opts-&gt;rewrite_ptrs |= 1U &lt;&lt; i;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return data_opts-&gt;rewrite_ptrs != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rereplicate_btree_pred(struct bch_fs *c, void *arg,</div><div class='del'>-				   struct btree *b,</div><div class='del'>-				   struct bch_io_opts *io_opts,</div><div class='del'>-				   struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	return rereplicate_pred(c, arg, bkey_i_to_s_c(&amp;b-&gt;key), io_opts, data_opts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool migrate_btree_pred(struct bch_fs *c, void *arg,</div><div class='del'>-			       struct btree *b,</div><div class='del'>-			       struct bch_io_opts *io_opts,</div><div class='del'>-			       struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	return migrate_pred(c, arg, bkey_i_to_s_c(&amp;b-&gt;key), io_opts, data_opts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bformat_needs_redo(struct bkey_format *f)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; f-&gt;nr_fields; i++) {</div><div class='del'>-		unsigned unpacked_bits = bch2_bkey_format_current.bits_per_field[i];</div><div class='del'>-		u64 unpacked_mask = ~((~0ULL &lt;&lt; 1) &lt;&lt; (unpacked_bits - 1));</div><div class='del'>-		u64 field_offset = le64_to_cpu(f-&gt;field_offset[i]);</div><div class='del'>-</div><div class='del'>-		if (f-&gt;bits_per_field[i] &gt; unpacked_bits)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		if ((f-&gt;bits_per_field[i] == unpacked_bits) &amp;&amp; field_offset)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		if (((field_offset + ((1ULL &lt;&lt; f-&gt;bits_per_field[i]) - 1)) &amp;</div><div class='del'>-		     unpacked_mask) &lt;</div><div class='del'>-		    field_offset)</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rewrite_old_nodes_pred(struct bch_fs *c, void *arg,</div><div class='del'>-				   struct btree *b,</div><div class='del'>-				   struct bch_io_opts *io_opts,</div><div class='del'>-				   struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	if (b-&gt;version_ondisk != c-&gt;sb.version ||</div><div class='del'>-	    btree_node_need_rewrite(b) ||</div><div class='del'>-	    bformat_needs_redo(&amp;b-&gt;format)) {</div><div class='del'>-		data_opts-&gt;target		= 0;</div><div class='del'>-		data_opts-&gt;extra_replicas	= 0;</div><div class='del'>-		data_opts-&gt;btree_insert_flags	= 0;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_scan_old_btree_nodes(struct bch_fs *c, struct bch_move_stats *stats)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_move_btree(c,</div><div class='del'>-			      BBPOS_MIN,</div><div class='del'>-			      BBPOS_MAX,</div><div class='del'>-			      rewrite_old_nodes_pred, c, stats);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_extents_above_btree_updates_done);</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_bformat_overflow_done);</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;version_min = c-&gt;disk_sb.sb-&gt;version;</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool drop_extra_replicas_pred(struct bch_fs *c, void *arg,</div><div class='del'>-			     struct bkey_s_c k,</div><div class='del'>-			     struct bch_io_opts *io_opts,</div><div class='del'>-			     struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	unsigned durability = bch2_bkey_durability(c, k);</div><div class='del'>-	unsigned replicas = bkey_is_btree_ptr(k.k)</div><div class='del'>-		? c-&gt;opts.metadata_replicas</div><div class='del'>-		: io_opts-&gt;data_replicas;</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-	unsigned i = 0;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, bch2_bkey_ptrs_c(k), p, entry) {</div><div class='del'>-		unsigned d = bch2_extent_ptr_durability(c, &amp;p);</div><div class='del'>-</div><div class='del'>-		if (d &amp;&amp; durability - d &gt;= replicas) {</div><div class='del'>-			data_opts-&gt;kill_ptrs |= BIT(i);</div><div class='del'>-			durability -= d;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return data_opts-&gt;kill_ptrs != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool drop_extra_replicas_btree_pred(struct bch_fs *c, void *arg,</div><div class='del'>-				   struct btree *b,</div><div class='del'>-				   struct bch_io_opts *io_opts,</div><div class='del'>-				   struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	return drop_extra_replicas_pred(c, arg, bkey_i_to_s_c(&amp;b-&gt;key), io_opts, data_opts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_data_job(struct bch_fs *c,</div><div class='del'>-		  struct bch_move_stats *stats,</div><div class='del'>-		  struct bch_ioctl_data op)</div><div class='del'>-{</div><div class='del'>-	struct bbpos start	= BBPOS(op.start_btree, op.start_pos);</div><div class='del'>-	struct bbpos end	= BBPOS(op.end_btree, op.end_pos);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (op.op &gt;= BCH_DATA_OP_NR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_init(stats, bch2_data_ops_strs[op.op]);</div><div class='del'>-</div><div class='del'>-	switch (op.op) {</div><div class='del'>-	case BCH_DATA_OP_rereplicate:</div><div class='del'>-		stats-&gt;data_type = BCH_DATA_journal;</div><div class='del'>-		ret = bch2_journal_flush_device_pins(&amp;c-&gt;journal, -1);</div><div class='del'>-		ret = bch2_move_btree(c, start, end,</div><div class='del'>-				      rereplicate_btree_pred, c, stats) ?: ret;</div><div class='del'>-		ret = bch2_move_data(c, start, end,</div><div class='del'>-				     NULL,</div><div class='del'>-				     stats,</div><div class='del'>-				     writepoint_hashed((unsigned long) current),</div><div class='del'>-				     true,</div><div class='del'>-				     rereplicate_pred, c) ?: ret;</div><div class='del'>-		ret = bch2_replicas_gc2(c) ?: ret;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_OP_migrate:</div><div class='del'>-		if (op.migrate.dev &gt;= c-&gt;sb.nr_devices)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		stats-&gt;data_type = BCH_DATA_journal;</div><div class='del'>-		ret = bch2_journal_flush_device_pins(&amp;c-&gt;journal, op.migrate.dev);</div><div class='del'>-		ret = bch2_move_btree(c, start, end,</div><div class='del'>-				      migrate_btree_pred, &amp;op, stats) ?: ret;</div><div class='del'>-		ret = bch2_move_data(c, start, end,</div><div class='del'>-				     NULL,</div><div class='del'>-				     stats,</div><div class='del'>-				     writepoint_hashed((unsigned long) current),</div><div class='del'>-				     true,</div><div class='del'>-				     migrate_pred, &amp;op) ?: ret;</div><div class='del'>-		ret = bch2_replicas_gc2(c) ?: ret;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_OP_rewrite_old_nodes:</div><div class='del'>-		ret = bch2_scan_old_btree_nodes(c, stats);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_DATA_OP_drop_extra_replicas:</div><div class='del'>-		ret = bch2_move_btree(c, start, end,</div><div class='del'>-				drop_extra_replicas_btree_pred, c, stats) ?: ret;</div><div class='del'>-		ret = bch2_move_data(c, start, end, NULL, stats,</div><div class='del'>-				writepoint_hashed((unsigned long) current),</div><div class='del'>-				true,</div><div class='del'>-				drop_extra_replicas_pred, c) ?: ret;</div><div class='del'>-		ret = bch2_replicas_gc2(c) ?: ret;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_exit(stats, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_move_stats_to_text(struct printbuf *out, struct bch_move_stats *stats)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "%s: data type==", stats-&gt;name);</div><div class='del'>-	bch2_prt_data_type(out, stats-&gt;data_type);</div><div class='del'>-	prt_str(out, " pos=");</div><div class='del'>-	bch2_bbpos_to_text(out, stats-&gt;pos);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "keys moved:  ");</div><div class='del'>-	prt_u64(out, atomic64_read(&amp;stats-&gt;keys_moved));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "keys raced:  ");</div><div class='del'>-	prt_u64(out, atomic64_read(&amp;stats-&gt;keys_raced));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "bytes seen:  ");</div><div class='del'>-	prt_human_readable_u64(out, atomic64_read(&amp;stats-&gt;sectors_seen) &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "bytes moved: ");</div><div class='del'>-	prt_human_readable_u64(out, atomic64_read(&amp;stats-&gt;sectors_moved) &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "bytes raced: ");</div><div class='del'>-	prt_human_readable_u64(out, atomic64_read(&amp;stats-&gt;sectors_raced) &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_moving_ctxt_to_text(struct printbuf *out, struct bch_fs *c, struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	struct moving_io *io;</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_to_text(out, ctxt-&gt;stats);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "reads: ios %u/%u sectors %u/%u",</div><div class='del'>-		   atomic_read(&amp;ctxt-&gt;read_ios),</div><div class='del'>-		   c-&gt;opts.move_ios_in_flight,</div><div class='del'>-		   atomic_read(&amp;ctxt-&gt;read_sectors),</div><div class='del'>-		   c-&gt;opts.move_bytes_in_flight &gt;&gt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "writes: ios %u/%u sectors %u/%u",</div><div class='del'>-		   atomic_read(&amp;ctxt-&gt;write_ios),</div><div class='del'>-		   c-&gt;opts.move_ios_in_flight,</div><div class='del'>-		   atomic_read(&amp;ctxt-&gt;write_sectors),</div><div class='del'>-		   c-&gt;opts.move_bytes_in_flight &gt;&gt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ctxt-&gt;lock);</div><div class='del'>-	list_for_each_entry(io, &amp;ctxt-&gt;ios, io_list)</div><div class='del'>-		bch2_write_op_to_text(out, &amp;io-&gt;write.op);</div><div class='del'>-	mutex_unlock(&amp;ctxt-&gt;lock);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_moving_ctxts_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct moving_context *ctxt;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;moving_context_lock);</div><div class='del'>-	list_for_each_entry(ctxt, &amp;c-&gt;moving_context_list, list)</div><div class='del'>-		bch2_moving_ctxt_to_text(out, c, ctxt);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;moving_context_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_move_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;moving_context_list);</div><div class='del'>-	mutex_init(&amp;c-&gt;moving_context_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/move.h b/fs/bcachefs/move.h<br/>deleted file mode 100644<br/>index 9baf3093a678..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/move.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/move.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_MOVE_H</div><div class='del'>-#define _BCACHEFS_MOVE_H</div><div class='del'>-</div><div class='del'>-#include "bbpos.h"</div><div class='del'>-#include "bcachefs_ioctl.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "data_update.h"</div><div class='del'>-#include "move_types.h"</div><div class='del'>-</div><div class='del'>-struct bch_read_bio;</div><div class='del'>-</div><div class='del'>-struct moving_context {</div><div class='del'>-	struct btree_trans	*trans;</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	void			*fn;</div><div class='del'>-</div><div class='del'>-	struct bch_ratelimit	*rate;</div><div class='del'>-	struct bch_move_stats	*stats;</div><div class='del'>-	struct write_point_specifier wp;</div><div class='del'>-	bool			wait_on_copygc;</div><div class='del'>-	bool			write_error;</div><div class='del'>-</div><div class='del'>-	/* For waiting on outstanding reads and writes: */</div><div class='del'>-	struct closure		cl;</div><div class='del'>-</div><div class='del'>-	struct mutex		lock;</div><div class='del'>-	struct list_head	reads;</div><div class='del'>-	struct list_head	ios;</div><div class='del'>-</div><div class='del'>-	/* in flight sectors: */</div><div class='del'>-	atomic_t		read_sectors;</div><div class='del'>-	atomic_t		write_sectors;</div><div class='del'>-	atomic_t		read_ios;</div><div class='del'>-	atomic_t		write_ios;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t	wait;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define move_ctxt_wait_event_timeout(_ctxt, _cond, _timeout)			\</div><div class='del'>-({										\</div><div class='del'>-	int _ret = 0;								\</div><div class='del'>-	while (true) {								\</div><div class='del'>-		bool cond_finished = false;					\</div><div class='del'>-		bch2_moving_ctxt_do_pending_writes(_ctxt);			\</div><div class='del'>-										\</div><div class='del'>-		if (_cond)							\</div><div class='del'>-			break;							\</div><div class='del'>-		bch2_trans_unlock_long((_ctxt)-&gt;trans);				\</div><div class='del'>-		_ret = __wait_event_timeout((_ctxt)-&gt;wait,			\</div><div class='del'>-			     bch2_moving_ctxt_next_pending_write(_ctxt) ||	\</div><div class='del'>-			     (cond_finished = (_cond)), _timeout);		\</div><div class='del'>-		if (_ret || ( cond_finished))					\</div><div class='del'>-			break;							\</div><div class='del'>-	}									\</div><div class='del'>-	_ret;									\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define move_ctxt_wait_event(_ctxt, _cond)				\</div><div class='del'>-do {									\</div><div class='del'>-	bool cond_finished = false;					\</div><div class='del'>-	bch2_moving_ctxt_do_pending_writes(_ctxt);			\</div><div class='del'>-									\</div><div class='del'>-	if (_cond)							\</div><div class='del'>-		break;							\</div><div class='del'>-	bch2_trans_unlock_long((_ctxt)-&gt;trans);				\</div><div class='del'>-	__wait_event((_ctxt)-&gt;wait,					\</div><div class='del'>-		     bch2_moving_ctxt_next_pending_write(_ctxt) ||	\</div><div class='del'>-		     (cond_finished = (_cond)));			\</div><div class='del'>-	if (cond_finished)						\</div><div class='del'>-		break;							\</div><div class='del'>-} while (1)</div><div class='del'>-</div><div class='del'>-typedef bool (*move_pred_fn)(struct bch_fs *, void *, struct bkey_s_c,</div><div class='del'>-			     struct bch_io_opts *, struct data_update_opts *);</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_data_ops_strs[];</div><div class='del'>-</div><div class='del'>-void bch2_moving_ctxt_exit(struct moving_context *);</div><div class='del'>-void bch2_moving_ctxt_init(struct moving_context *, struct bch_fs *,</div><div class='del'>-			   struct bch_ratelimit *, struct bch_move_stats *,</div><div class='del'>-			   struct write_point_specifier, bool);</div><div class='del'>-struct moving_io *bch2_moving_ctxt_next_pending_write(struct moving_context *);</div><div class='del'>-void bch2_moving_ctxt_do_pending_writes(struct moving_context *);</div><div class='del'>-void bch2_moving_ctxt_flush_all(struct moving_context *);</div><div class='del'>-void bch2_move_ctxt_wait_for_io(struct moving_context *);</div><div class='del'>-int bch2_move_ratelimit(struct moving_context *);</div><div class='del'>-</div><div class='del'>-/* Inodes in different snapshots may have different IO options: */</div><div class='del'>-struct snapshot_io_opts_entry {</div><div class='del'>-	u32			snapshot;</div><div class='del'>-	struct bch_io_opts	io_opts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct per_snapshot_io_opts {</div><div class='del'>-	u64			cur_inum;</div><div class='del'>-	struct bch_io_opts	fs_io_opts;</div><div class='del'>-	DARRAY(struct snapshot_io_opts_entry) d;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void per_snapshot_io_opts_init(struct per_snapshot_io_opts *io_opts, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	memset(io_opts, 0, sizeof(*io_opts));</div><div class='del'>-	io_opts-&gt;fs_io_opts = bch2_opts_to_inode_opts(c-&gt;opts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void per_snapshot_io_opts_exit(struct per_snapshot_io_opts *io_opts)</div><div class='del'>-{</div><div class='del'>-	darray_exit(&amp;io_opts-&gt;d);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_io_opts *bch2_move_get_io_opts(struct btree_trans *,</div><div class='del'>-				struct per_snapshot_io_opts *, struct bkey_s_c);</div><div class='del'>-int bch2_move_get_io_opts_one(struct btree_trans *, struct bch_io_opts *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-int bch2_scan_old_btree_nodes(struct bch_fs *, struct bch_move_stats *);</div><div class='del'>-</div><div class='del'>-int bch2_move_extent(struct moving_context *,</div><div class='del'>-		     struct move_bucket_in_flight *,</div><div class='del'>-		     struct btree_iter *,</div><div class='del'>-		     struct bkey_s_c,</div><div class='del'>-		     struct bch_io_opts,</div><div class='del'>-		     struct data_update_opts);</div><div class='del'>-</div><div class='del'>-int __bch2_move_data(struct moving_context *,</div><div class='del'>-		     struct bbpos,</div><div class='del'>-		     struct bbpos,</div><div class='del'>-		     move_pred_fn, void *);</div><div class='del'>-int bch2_move_data(struct bch_fs *,</div><div class='del'>-		   struct bbpos start,</div><div class='del'>-		   struct bbpos end,</div><div class='del'>-		   struct bch_ratelimit *,</div><div class='del'>-		   struct bch_move_stats *,</div><div class='del'>-		   struct write_point_specifier,</div><div class='del'>-		   bool,</div><div class='del'>-		   move_pred_fn, void *);</div><div class='del'>-</div><div class='del'>-int bch2_evacuate_bucket(struct moving_context *,</div><div class='del'>-			   struct move_bucket_in_flight *,</div><div class='del'>-			   struct bpos, int,</div><div class='del'>-			   struct data_update_opts);</div><div class='del'>-int bch2_data_job(struct bch_fs *,</div><div class='del'>-		  struct bch_move_stats *,</div><div class='del'>-		  struct bch_ioctl_data);</div><div class='del'>-</div><div class='del'>-void bch2_move_stats_to_text(struct printbuf *, struct bch_move_stats *);</div><div class='del'>-void bch2_move_stats_exit(struct bch_move_stats *, struct bch_fs *);</div><div class='del'>-void bch2_move_stats_init(struct bch_move_stats *, const char *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_moving_ctxts_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_move_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_MOVE_H */</div><div class='head'>diff --git a/fs/bcachefs/move_types.h b/fs/bcachefs/move_types.h<br/>deleted file mode 100644<br/>index e22841ef31e4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/move_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/move_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_MOVE_TYPES_H</div><div class='del'>-#define _BCACHEFS_MOVE_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "bbpos_types.h"</div><div class='del'>-</div><div class='del'>-struct bch_move_stats {</div><div class='del'>-	enum bch_data_type	data_type;</div><div class='del'>-	struct bbpos		pos;</div><div class='del'>-	char			name[32];</div><div class='del'>-</div><div class='del'>-	atomic64_t		keys_moved;</div><div class='del'>-	atomic64_t		keys_raced;</div><div class='del'>-	atomic64_t		sectors_seen;</div><div class='del'>-	atomic64_t		sectors_moved;</div><div class='del'>-	atomic64_t		sectors_raced;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct move_bucket_key {</div><div class='del'>-	struct bpos		bucket;</div><div class='del'>-	u8			gen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct move_bucket {</div><div class='del'>-	struct move_bucket_key	k;</div><div class='del'>-	unsigned		sectors;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct move_bucket_in_flight {</div><div class='del'>-	struct move_bucket_in_flight *next;</div><div class='del'>-	struct rhash_head	hash;</div><div class='del'>-	struct move_bucket	bucket;</div><div class='del'>-	atomic_t		count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_MOVE_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c<br/>deleted file mode 100644<br/>index 69e06a84dad4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/movinggc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/movinggc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,436 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Moving/copying garbage collector</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "lru.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "movinggc.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/sched/task.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-struct buckets_in_flight {</div><div class='del'>-	struct rhashtable		table;</div><div class='del'>-	struct move_bucket_in_flight	*first;</div><div class='del'>-	struct move_bucket_in_flight	*last;</div><div class='del'>-	size_t				nr;</div><div class='del'>-	size_t				sectors;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct rhashtable_params bch_move_bucket_params = {</div><div class='del'>-	.head_offset	= offsetof(struct move_bucket_in_flight, hash),</div><div class='del'>-	.key_offset	= offsetof(struct move_bucket_in_flight, bucket.k),</div><div class='del'>-	.key_len	= sizeof(struct move_bucket_key),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct move_bucket_in_flight *</div><div class='del'>-move_bucket_in_flight_add(struct buckets_in_flight *list, struct move_bucket b)</div><div class='del'>-{</div><div class='del'>-	struct move_bucket_in_flight *new = kzalloc(sizeof(*new), GFP_KERNEL);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!new)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	new-&gt;bucket = b;</div><div class='del'>-</div><div class='del'>-	ret = rhashtable_lookup_insert_fast(&amp;list-&gt;table, &amp;new-&gt;hash,</div><div class='del'>-					    bch_move_bucket_params);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(new);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!list-&gt;first)</div><div class='del'>-		list-&gt;first = new;</div><div class='del'>-	else</div><div class='del'>-		list-&gt;last-&gt;next = new;</div><div class='del'>-</div><div class='del'>-	list-&gt;last = new;</div><div class='del'>-	list-&gt;nr++;</div><div class='del'>-	list-&gt;sectors += b.sectors;</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_bucket_is_movable(struct btree_trans *trans,</div><div class='del'>-				  struct move_bucket *b, u64 time)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bch_alloc_v4 _a;</div><div class='del'>-	const struct bch_alloc_v4 *a;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (bch2_bucket_is_open(trans-&gt;c,</div><div class='del'>-				b-&gt;k.bucket.inode,</div><div class='del'>-				b-&gt;k.bucket.offset))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_alloc,</div><div class='del'>-			       b-&gt;k.bucket, BTREE_ITER_CACHED);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	a = bch2_alloc_to_v4(k, &amp;_a);</div><div class='del'>-	b-&gt;k.gen	= a-&gt;gen;</div><div class='del'>-	b-&gt;sectors	= bch2_bucket_sectors_dirty(*a);</div><div class='del'>-</div><div class='del'>-	ret = data_type_movable(a-&gt;data_type) &amp;&amp;</div><div class='del'>-		a-&gt;fragmentation_lru &amp;&amp;</div><div class='del'>-		a-&gt;fragmentation_lru &lt;= time;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void move_buckets_wait(struct moving_context *ctxt,</div><div class='del'>-			      struct buckets_in_flight *list,</div><div class='del'>-			      bool flush)</div><div class='del'>-{</div><div class='del'>-	struct move_bucket_in_flight *i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	while ((i = list-&gt;first)) {</div><div class='del'>-		if (flush)</div><div class='del'>-			move_ctxt_wait_event(ctxt, !atomic_read(&amp;i-&gt;count));</div><div class='del'>-</div><div class='del'>-		if (atomic_read(&amp;i-&gt;count))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		list-&gt;first = i-&gt;next;</div><div class='del'>-		if (!list-&gt;first)</div><div class='del'>-			list-&gt;last = NULL;</div><div class='del'>-</div><div class='del'>-		list-&gt;nr--;</div><div class='del'>-		list-&gt;sectors -= i-&gt;bucket.sectors;</div><div class='del'>-</div><div class='del'>-		ret = rhashtable_remove_fast(&amp;list-&gt;table, &amp;i-&gt;hash,</div><div class='del'>-					     bch_move_bucket_params);</div><div class='del'>-		BUG_ON(ret);</div><div class='del'>-		kfree(i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock_long(ctxt-&gt;trans);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bucket_in_flight(struct buckets_in_flight *list,</div><div class='del'>-			     struct move_bucket_key k)</div><div class='del'>-{</div><div class='del'>-	return rhashtable_lookup_fast(&amp;list-&gt;table, &amp;k, bch_move_bucket_params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef DARRAY(struct move_bucket) move_buckets;</div><div class='del'>-</div><div class='del'>-static int bch2_copygc_get_buckets(struct moving_context *ctxt,</div><div class='del'>-			struct buckets_in_flight *buckets_in_flight,</div><div class='del'>-			move_buckets *buckets)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	size_t nr_to_get = max_t(size_t, 16U, buckets_in_flight-&gt;nr / 4);</div><div class='del'>-	size_t saw = 0, in_flight = 0, not_movable = 0, sectors = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	move_buckets_wait(ctxt, buckets_in_flight, false);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_write_buffer_tryflush(trans);</div><div class='del'>-	if (bch2_err_matches(ret, EROFS))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_fatal_err_on(ret, c, "%s: error %s from bch2_btree_write_buffer_tryflush()",</div><div class='del'>-				 __func__, bch2_err_str(ret)))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key_upto(trans, iter, BTREE_ID_lru,</div><div class='del'>-				  lru_pos(BCH_LRU_FRAGMENTATION_START, 0, 0),</div><div class='del'>-				  lru_pos(BCH_LRU_FRAGMENTATION_START, U64_MAX, LRU_TIME_MAX),</div><div class='del'>-				  0, k, ({</div><div class='del'>-		struct move_bucket b = { .k.bucket = u64_to_bucket(k.k-&gt;p.offset) };</div><div class='del'>-		int ret2 = 0;</div><div class='del'>-</div><div class='del'>-		saw++;</div><div class='del'>-</div><div class='del'>-		ret2 = bch2_bucket_is_movable(trans, &amp;b, lru_pos_time(k.k-&gt;p));</div><div class='del'>-		if (ret2 &lt; 0)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (!ret2)</div><div class='del'>-			not_movable++;</div><div class='del'>-		else if (bucket_in_flight(buckets_in_flight, b.k))</div><div class='del'>-			in_flight++;</div><div class='del'>-		else {</div><div class='del'>-			ret2 = darray_push(buckets, b);</div><div class='del'>-			if (ret2)</div><div class='del'>-				goto err;</div><div class='del'>-			sectors += b.sectors;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret2 = buckets-&gt;nr &gt;= nr_to_get;</div><div class='del'>-err:</div><div class='del'>-		ret2;</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	pr_debug("have: %zu (%zu) saw %zu in flight %zu not movable %zu got %zu (%zu)/%zu buckets ret %i",</div><div class='del'>-		 buckets_in_flight-&gt;nr, buckets_in_flight-&gt;sectors,</div><div class='del'>-		 saw, in_flight, not_movable, buckets-&gt;nr, sectors, nr_to_get, ret);</div><div class='del'>-</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline</div><div class='del'>-static int bch2_copygc(struct moving_context *ctxt,</div><div class='del'>-		       struct buckets_in_flight *buckets_in_flight,</div><div class='del'>-		       bool *did_work)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct data_update_opts data_opts = {</div><div class='del'>-		.btree_insert_flags = BCH_WATERMARK_copygc,</div><div class='del'>-	};</div><div class='del'>-	move_buckets buckets = { 0 };</div><div class='del'>-	struct move_bucket_in_flight *f;</div><div class='del'>-	u64 moved = atomic64_read(&amp;ctxt-&gt;stats-&gt;sectors_moved);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_copygc_get_buckets(ctxt, buckets_in_flight, &amp;buckets);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	darray_for_each(buckets, i) {</div><div class='del'>-		if (kthread_should_stop() || freezing(current))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		f = move_bucket_in_flight_add(buckets_in_flight, *i);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(f);</div><div class='del'>-		if (ret == -EEXIST) { /* rare race: copygc_get_buckets returned same bucket more than once */</div><div class='del'>-			ret = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (ret == -ENOMEM) { /* flush IO, continue later */</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_evacuate_bucket(ctxt, f, f-&gt;bucket.k.bucket,</div><div class='del'>-					     f-&gt;bucket.k.gen, data_opts);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		*did_work = true;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	darray_exit(&amp;buckets);</div><div class='del'>-</div><div class='del'>-	/* no entries in LRU btree found, or got to end: */</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0 &amp;&amp; !bch2_err_matches(ret, EROFS))</div><div class='del'>-		bch_err_msg(c, ret, "from bch2_move_data()");</div><div class='del'>-</div><div class='del'>-	moved = atomic64_read(&amp;ctxt-&gt;stats-&gt;sectors_moved) - moved;</div><div class='del'>-	trace_and_count(c, copygc, c, moved, 0, 0, 0);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copygc runs when the amount of fragmented data is above some arbitrary</div><div class='del'>- * threshold:</div><div class='del'>- *</div><div class='del'>- * The threshold at the limit - when the device is full - is the amount of space</div><div class='del'>- * we reserved in bch2_recalc_capacity; we can't have more than that amount of</div><div class='del'>- * disk space stranded due to fragmentation and store everything we have</div><div class='del'>- * promised to store.</div><div class='del'>- *</div><div class='del'>- * But we don't want to be running copygc unnecessarily when the device still</div><div class='del'>- * has plenty of free space - rather, we want copygc to smoothly run every so</div><div class='del'>- * often and continually reduce the amount of fragmented space as the device</div><div class='del'>- * fills up. So, we increase the threshold by half the current free space.</div><div class='del'>- */</div><div class='del'>-unsigned long bch2_copygc_wait_amount(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	s64 wait = S64_MAX, fragmented_allowed, fragmented;</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca) {</div><div class='del'>-		struct bch_dev_usage usage = bch2_dev_usage_read(ca);</div><div class='del'>-</div><div class='del'>-		fragmented_allowed = ((__dev_buckets_available(ca, usage, BCH_WATERMARK_stripe) *</div><div class='del'>-				       ca-&gt;mi.bucket_size) &gt;&gt; 1);</div><div class='del'>-		fragmented = 0;</div><div class='del'>-</div><div class='del'>-		for (unsigned i = 0; i &lt; BCH_DATA_NR; i++)</div><div class='del'>-			if (data_type_movable(i))</div><div class='del'>-				fragmented += usage.d[i].fragmented;</div><div class='del'>-</div><div class='del'>-		wait = min(wait, max(0LL, fragmented_allowed - fragmented));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return wait;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_copygc_wait_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "Currently waiting for:     ");</div><div class='del'>-	prt_human_readable_u64(out, max(0LL, c-&gt;copygc_wait -</div><div class='del'>-					atomic64_read(&amp;c-&gt;io_clock[WRITE].now)) &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Currently waiting since:   ");</div><div class='del'>-	prt_human_readable_u64(out, max(0LL,</div><div class='del'>-					atomic64_read(&amp;c-&gt;io_clock[WRITE].now) -</div><div class='del'>-					c-&gt;copygc_wait_at) &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Currently calculated wait: ");</div><div class='del'>-	prt_human_readable_u64(out, bch2_copygc_wait_amount(c));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_copygc_thread(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = arg;</div><div class='del'>-	struct moving_context ctxt;</div><div class='del'>-	struct bch_move_stats move_stats;</div><div class='del'>-	struct io_clock *clock = &amp;c-&gt;io_clock[WRITE];</div><div class='del'>-	struct buckets_in_flight *buckets;</div><div class='del'>-	u64 last, wait;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	buckets = kzalloc(sizeof(struct buckets_in_flight), GFP_KERNEL);</div><div class='del'>-	if (!buckets)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ret = rhashtable_init(&amp;buckets-&gt;table, &amp;bch_move_bucket_params);</div><div class='del'>-	bch_err_msg(c, ret, "allocating copygc buckets in flight");</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(buckets);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_freezable();</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_init(&amp;move_stats, "copygc");</div><div class='del'>-	bch2_moving_ctxt_init(&amp;ctxt, c, NULL, &amp;move_stats,</div><div class='del'>-			      writepoint_ptr(&amp;c-&gt;copygc_write_point),</div><div class='del'>-			      false);</div><div class='del'>-</div><div class='del'>-	while (!ret &amp;&amp; !kthread_should_stop()) {</div><div class='del'>-		bool did_work = false;</div><div class='del'>-</div><div class='del'>-		bch2_trans_unlock_long(ctxt.trans);</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		if (!c-&gt;copy_gc_enabled) {</div><div class='del'>-			move_buckets_wait(&amp;ctxt, buckets, true);</div><div class='del'>-			kthread_wait_freezable(c-&gt;copy_gc_enabled ||</div><div class='del'>-					       kthread_should_stop());</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(freezing(current))) {</div><div class='del'>-			move_buckets_wait(&amp;ctxt, buckets, true);</div><div class='del'>-			__refrigerator(false);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		last = atomic64_read(&amp;clock-&gt;now);</div><div class='del'>-		wait = bch2_copygc_wait_amount(c);</div><div class='del'>-</div><div class='del'>-		if (wait &gt; clock-&gt;max_slop) {</div><div class='del'>-			c-&gt;copygc_wait_at = last;</div><div class='del'>-			c-&gt;copygc_wait = last + wait;</div><div class='del'>-			move_buckets_wait(&amp;ctxt, buckets, true);</div><div class='del'>-			trace_and_count(c, copygc_wait, c, wait, last + wait);</div><div class='del'>-			bch2_kthread_io_clock_wait(clock, last + wait,</div><div class='del'>-					MAX_SCHEDULE_TIMEOUT);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		c-&gt;copygc_wait = 0;</div><div class='del'>-</div><div class='del'>-		c-&gt;copygc_running = true;</div><div class='del'>-		ret = bch2_copygc(&amp;ctxt, buckets, &amp;did_work);</div><div class='del'>-		c-&gt;copygc_running = false;</div><div class='del'>-</div><div class='del'>-		wake_up(&amp;c-&gt;copygc_running_wq);</div><div class='del'>-</div><div class='del'>-		if (!wait &amp;&amp; !did_work) {</div><div class='del'>-			u64 min_member_capacity = bch2_min_rw_member_capacity(c);</div><div class='del'>-</div><div class='del'>-			if (min_member_capacity == U64_MAX)</div><div class='del'>-				min_member_capacity = 128 * 2048;</div><div class='del'>-</div><div class='del'>-			bch2_trans_unlock_long(ctxt.trans);</div><div class='del'>-			bch2_kthread_io_clock_wait(clock, last + (min_member_capacity &gt;&gt; 6),</div><div class='del'>-					MAX_SCHEDULE_TIMEOUT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	move_buckets_wait(&amp;ctxt, buckets, true);</div><div class='del'>-</div><div class='del'>-	rhashtable_destroy(&amp;buckets-&gt;table);</div><div class='del'>-	kfree(buckets);</div><div class='del'>-	bch2_moving_ctxt_exit(&amp;ctxt);</div><div class='del'>-	bch2_move_stats_exit(&amp;move_stats, c);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_copygc_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;copygc_thread) {</div><div class='del'>-		kthread_stop(c-&gt;copygc_thread);</div><div class='del'>-		put_task_struct(c-&gt;copygc_thread);</div><div class='del'>-	}</div><div class='del'>-	c-&gt;copygc_thread = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_copygc_start(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *t;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;copygc_thread)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_init_fault("copygc_start"))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	t = kthread_create(bch2_copygc_thread, c, "bch-copygc/%s", c-&gt;name);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(t);</div><div class='del'>-	bch_err_msg(c, ret, "creating copygc thread");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	get_task_struct(t);</div><div class='del'>-</div><div class='del'>-	c-&gt;copygc_thread = t;</div><div class='del'>-	wake_up_process(c-&gt;copygc_thread);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_copygc_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	init_waitqueue_head(&amp;c-&gt;copygc_running_wq);</div><div class='del'>-	c-&gt;copygc_running = false;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/movinggc.h b/fs/bcachefs/movinggc.h<br/>deleted file mode 100644<br/>index ea181fef5bc9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/movinggc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/movinggc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_MOVINGGC_H</div><div class='del'>-#define _BCACHEFS_MOVINGGC_H</div><div class='del'>-</div><div class='del'>-unsigned long bch2_copygc_wait_amount(struct bch_fs *);</div><div class='del'>-void bch2_copygc_wait_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_copygc_stop(struct bch_fs *);</div><div class='del'>-int bch2_copygc_start(struct bch_fs *);</div><div class='del'>-void bch2_fs_copygc_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_MOVINGGC_H */</div><div class='head'>diff --git a/fs/bcachefs/nocow_locking.c b/fs/bcachefs/nocow_locking.c<br/>deleted file mode 100644<br/>index 3c21981a4a1c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/nocow_locking.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/nocow_locking.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,144 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "nocow_locking.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/closure.h&gt;</div><div class='del'>-</div><div class='del'>-bool bch2_bucket_nocow_is_locked(struct bucket_nocow_lock_table *t, struct bpos bucket)</div><div class='del'>-{</div><div class='del'>-	u64 dev_bucket = bucket_to_u64(bucket);</div><div class='del'>-	struct nocow_lock_bucket *l = bucket_nocow_lock(t, dev_bucket);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(l-&gt;b); i++)</div><div class='del'>-		if (l-&gt;b[i] == dev_bucket &amp;&amp; atomic_read(&amp;l-&gt;l[i]))</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define sign(v)		(v &lt; 0 ? -1 : v &gt; 0 ? 1 : 0)</div><div class='del'>-</div><div class='del'>-void bch2_bucket_nocow_unlock(struct bucket_nocow_lock_table *t, struct bpos bucket, int flags)</div><div class='del'>-{</div><div class='del'>-	u64 dev_bucket = bucket_to_u64(bucket);</div><div class='del'>-	struct nocow_lock_bucket *l = bucket_nocow_lock(t, dev_bucket);</div><div class='del'>-	int lock_val = flags ? 1 : -1;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(l-&gt;b); i++)</div><div class='del'>-		if (l-&gt;b[i] == dev_bucket) {</div><div class='del'>-			int v = atomic_sub_return(lock_val, &amp;l-&gt;l[i]);</div><div class='del'>-</div><div class='del'>-			BUG_ON(v &amp;&amp; sign(v) != lock_val);</div><div class='del'>-			if (!v)</div><div class='del'>-				closure_wake_up(&amp;l-&gt;wait);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_bucket_nocow_trylock(struct nocow_lock_bucket *l,</div><div class='del'>-				 u64 dev_bucket, int flags)</div><div class='del'>-{</div><div class='del'>-	int v, lock_val = flags ? 1 : -1;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;l-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(l-&gt;b); i++)</div><div class='del'>-		if (l-&gt;b[i] == dev_bucket)</div><div class='del'>-			goto got_entry;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(l-&gt;b); i++)</div><div class='del'>-		if (!atomic_read(&amp;l-&gt;l[i])) {</div><div class='del'>-			l-&gt;b[i] = dev_bucket;</div><div class='del'>-			goto take_lock;</div><div class='del'>-		}</div><div class='del'>-fail:</div><div class='del'>-	spin_unlock(&amp;l-&gt;lock);</div><div class='del'>-	return false;</div><div class='del'>-got_entry:</div><div class='del'>-	v = atomic_read(&amp;l-&gt;l[i]);</div><div class='del'>-	if (lock_val &gt; 0 ? v &lt; 0 : v &gt; 0)</div><div class='del'>-		goto fail;</div><div class='del'>-take_lock:</div><div class='del'>-	v = atomic_read(&amp;l-&gt;l[i]);</div><div class='del'>-	/* Overflow? */</div><div class='del'>-	if (v &amp;&amp; sign(v + lock_val) != sign(v))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	atomic_add(lock_val, &amp;l-&gt;l[i]);</div><div class='del'>-	spin_unlock(&amp;l-&gt;lock);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *t,</div><div class='del'>-			      struct nocow_lock_bucket *l,</div><div class='del'>-			      u64 dev_bucket, int flags)</div><div class='del'>-{</div><div class='del'>-	if (!__bch2_bucket_nocow_trylock(l, dev_bucket, flags)) {</div><div class='del'>-		struct bch_fs *c = container_of(t, struct bch_fs, nocow_locks);</div><div class='del'>-		u64 start_time = local_clock();</div><div class='del'>-</div><div class='del'>-		__closure_wait_event(&amp;l-&gt;wait, __bch2_bucket_nocow_trylock(l, dev_bucket, flags));</div><div class='del'>-		bch2_time_stats_update(&amp;c-&gt;times[BCH_TIME_nocow_lock_contended], start_time);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_nocow_locks_to_text(struct printbuf *out, struct bucket_nocow_lock_table *t)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	unsigned i, nr_zero = 0;</div><div class='del'>-	struct nocow_lock_bucket *l;</div><div class='del'>-</div><div class='del'>-	for (l = t-&gt;l; l &lt; t-&gt;l + ARRAY_SIZE(t-&gt;l); l++) {</div><div class='del'>-		unsigned v = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(l-&gt;l); i++)</div><div class='del'>-			v |= atomic_read(&amp;l-&gt;l[i]);</div><div class='del'>-</div><div class='del'>-		if (!v) {</div><div class='del'>-			nr_zero++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (nr_zero)</div><div class='del'>-			prt_printf(out, "(%u empty entries)\n", nr_zero);</div><div class='del'>-		nr_zero = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(l-&gt;l); i++) {</div><div class='del'>-			int v = atomic_read(&amp;l-&gt;l[i]);</div><div class='del'>-			if (v) {</div><div class='del'>-				bch2_bpos_to_text(out, u64_to_bucket(l-&gt;b[i]));</div><div class='del'>-				prt_printf(out, ": %s %u ", v &lt; 0 ? "copy" : "update", abs(v));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nr_zero)</div><div class='del'>-		prt_printf(out, "(%u empty entries)\n", nr_zero);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_nocow_locking_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bucket_nocow_lock_table *t = &amp;c-&gt;nocow_locks;</div><div class='del'>-</div><div class='del'>-	for (struct nocow_lock_bucket *l = t-&gt;l; l &lt; t-&gt;l + ARRAY_SIZE(t-&gt;l); l++)</div><div class='del'>-		for (unsigned j = 0; j &lt; ARRAY_SIZE(l-&gt;l); j++)</div><div class='del'>-			BUG_ON(atomic_read(&amp;l-&gt;l[j]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_nocow_locking_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bucket_nocow_lock_table *t = &amp;c-&gt;nocow_locks;</div><div class='del'>-</div><div class='del'>-	for (struct nocow_lock_bucket *l = t-&gt;l; l &lt; t-&gt;l + ARRAY_SIZE(t-&gt;l); l++)</div><div class='del'>-		spin_lock_init(&amp;l-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/nocow_locking.h b/fs/bcachefs/nocow_locking.h<br/>deleted file mode 100644<br/>index f9d6a426a960..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/nocow_locking.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/nocow_locking.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_NOCOW_LOCKING_H</div><div class='del'>-#define _BCACHEFS_NOCOW_LOCKING_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "nocow_locking_types.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/hash.h&gt;</div><div class='del'>-</div><div class='del'>-static inline struct nocow_lock_bucket *bucket_nocow_lock(struct bucket_nocow_lock_table *t,</div><div class='del'>-							  u64 dev_bucket)</div><div class='del'>-{</div><div class='del'>-	unsigned h = hash_64(dev_bucket, BUCKET_NOCOW_LOCKS_BITS);</div><div class='del'>-</div><div class='del'>-	return t-&gt;l + (h &amp; (BUCKET_NOCOW_LOCKS - 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BUCKET_NOCOW_LOCK_UPDATE	(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-bool bch2_bucket_nocow_is_locked(struct bucket_nocow_lock_table *, struct bpos);</div><div class='del'>-void bch2_bucket_nocow_unlock(struct bucket_nocow_lock_table *, struct bpos, int);</div><div class='del'>-bool __bch2_bucket_nocow_trylock(struct nocow_lock_bucket *, u64, int);</div><div class='del'>-void __bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *,</div><div class='del'>-			      struct nocow_lock_bucket *, u64, int);</div><div class='del'>-</div><div class='del'>-static inline void bch2_bucket_nocow_lock(struct bucket_nocow_lock_table *t,</div><div class='del'>-					  struct bpos bucket, int flags)</div><div class='del'>-{</div><div class='del'>-	u64 dev_bucket = bucket_to_u64(bucket);</div><div class='del'>-	struct nocow_lock_bucket *l = bucket_nocow_lock(t, dev_bucket);</div><div class='del'>-</div><div class='del'>-	__bch2_bucket_nocow_lock(t, l, dev_bucket, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_bucket_nocow_trylock(struct bucket_nocow_lock_table *t,</div><div class='del'>-					  struct bpos bucket, int flags)</div><div class='del'>-{</div><div class='del'>-	u64 dev_bucket = bucket_to_u64(bucket);</div><div class='del'>-	struct nocow_lock_bucket *l = bucket_nocow_lock(t, dev_bucket);</div><div class='del'>-</div><div class='del'>-	return __bch2_bucket_nocow_trylock(l, dev_bucket, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_nocow_locks_to_text(struct printbuf *, struct bucket_nocow_lock_table *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_nocow_locking_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_nocow_locking_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_NOCOW_LOCKING_H */</div><div class='head'>diff --git a/fs/bcachefs/nocow_locking_types.h b/fs/bcachefs/nocow_locking_types.h<br/>deleted file mode 100644<br/>index bd12bf677924..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/nocow_locking_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/nocow_locking_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_NOCOW_LOCKING_TYPES_H</div><div class='del'>-#define _BCACHEFS_NOCOW_LOCKING_TYPES_H</div><div class='del'>-</div><div class='del'>-#define BUCKET_NOCOW_LOCKS_BITS		10</div><div class='del'>-#define BUCKET_NOCOW_LOCKS		(1U &lt;&lt; BUCKET_NOCOW_LOCKS_BITS)</div><div class='del'>-</div><div class='del'>-struct nocow_lock_bucket {</div><div class='del'>-	struct closure_waitlist		wait;</div><div class='del'>-	spinlock_t			lock;</div><div class='del'>-	u64				b[4];</div><div class='del'>-	atomic_t			l[4];</div><div class='del'>-} __aligned(SMP_CACHE_BYTES);</div><div class='del'>-</div><div class='del'>-struct bucket_nocow_lock_table {</div><div class='del'>-	struct nocow_lock_bucket	l[BUCKET_NOCOW_LOCKS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_NOCOW_LOCKING_TYPES_H */</div><div class='del'>-</div><div class='head'>diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c<br/>deleted file mode 100644<br/>index b1ed0b9a20d3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/opts.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/opts.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,602 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#define x(t, n, ...) [n] = #t,</div><div class='del'>-</div><div class='del'>-const char * const bch2_error_actions[] = {</div><div class='del'>-	BCH_ERROR_ACTIONS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_fsck_fix_opts[] = {</div><div class='del'>-	BCH_FIX_ERRORS_OPTS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_version_upgrade_opts[] = {</div><div class='del'>-	BCH_VERSION_UPGRADE_OPTS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_sb_features[] = {</div><div class='del'>-	BCH_SB_FEATURES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_sb_compat[] = {</div><div class='del'>-	BCH_SB_COMPAT()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const __bch2_btree_ids[] = {</div><div class='del'>-	BCH_BTREE_IDS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_csum_types[] = {</div><div class='del'>-	BCH_CSUM_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_csum_opts[] = {</div><div class='del'>-	BCH_CSUM_OPTS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const __bch2_compression_types[] = {</div><div class='del'>-	BCH_COMPRESSION_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_compression_opts[] = {</div><div class='del'>-	BCH_COMPRESSION_OPTS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_str_hash_types[] = {</div><div class='del'>-	BCH_STR_HASH_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_str_hash_opts[] = {</div><div class='del'>-	BCH_STR_HASH_OPTS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const __bch2_data_types[] = {</div><div class='del'>-	BCH_DATA_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_member_states[] = {</div><div class='del'>-	BCH_MEMBER_STATES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_jset_entry_types[] = {</div><div class='del'>-	BCH_JSET_ENTRY_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char * const bch2_fs_usage_types[] = {</div><div class='del'>-	BCH_FS_USAGE_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-static int bch2_opt_fix_errors_parse(struct bch_fs *c, const char *val, u64 *res,</div><div class='del'>-				     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	if (!val) {</div><div class='del'>-		*res = FSCK_FIX_yes;</div><div class='del'>-	} else {</div><div class='del'>-		int ret = match_string(bch2_fsck_fix_opts, -1, val);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0 &amp;&amp; err)</div><div class='del'>-			prt_str(err, "fix_errors: invalid selection");</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		*res = ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_opt_fix_errors_to_text(struct printbuf *out,</div><div class='del'>-					struct bch_fs *c,</div><div class='del'>-					struct bch_sb *sb,</div><div class='del'>-					u64 v)</div><div class='del'>-{</div><div class='del'>-	prt_str(out, bch2_fsck_fix_opts[v]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define bch2_opt_fix_errors (struct bch_opt_fn) {	\</div><div class='del'>-	.parse = bch2_opt_fix_errors_parse,		\</div><div class='del'>-	.to_text = bch2_opt_fix_errors_to_text,		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char * const bch2_d_types[BCH_DT_MAX] = {</div><div class='del'>-	[DT_UNKNOWN]	= "unknown",</div><div class='del'>-	[DT_FIFO]	= "fifo",</div><div class='del'>-	[DT_CHR]	= "chr",</div><div class='del'>-	[DT_DIR]	= "dir",</div><div class='del'>-	[DT_BLK]	= "blk",</div><div class='del'>-	[DT_REG]	= "reg",</div><div class='del'>-	[DT_LNK]	= "lnk",</div><div class='del'>-	[DT_SOCK]	= "sock",</div><div class='del'>-	[DT_WHT]	= "whiteout",</div><div class='del'>-	[DT_SUBVOL]	= "subvol",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-u64 BCH2_NO_SB_OPT(const struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void SET_BCH2_NO_SB_OPT(struct bch_sb *sb, u64 v)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opts_apply(struct bch_opts *dst, struct bch_opts src)</div><div class='del'>-{</div><div class='del'>-#define x(_name, ...)						\</div><div class='del'>-	if (opt_defined(src, _name))					\</div><div class='del'>-		opt_set(*dst, _name, src._name);</div><div class='del'>-</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_opt_defined_by_id(const struct bch_opts *opts, enum bch_opt_id id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(_name, ...)						\</div><div class='del'>-	case Opt_##_name:						\</div><div class='del'>-		return opt_defined(*opts, _name);</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_opt_get_by_id(const struct bch_opts *opts, enum bch_opt_id id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(_name, ...)						\</div><div class='del'>-	case Opt_##_name:						\</div><div class='del'>-		return opts-&gt;_name;</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opt_set_by_id(struct bch_opts *opts, enum bch_opt_id id, u64 v)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(_name, ...)						\</div><div class='del'>-	case Opt_##_name:						\</div><div class='del'>-		opt_set(*opts, _name, v);				\</div><div class='del'>-		break;</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_option bch2_opt_table[] = {</div><div class='del'>-#define OPT_BOOL()		.type = BCH_OPT_BOOL, .min = 0, .max = 2</div><div class='del'>-#define OPT_UINT(_min, _max)	.type = BCH_OPT_UINT,			\</div><div class='del'>-				.min = _min, .max = _max</div><div class='del'>-#define OPT_STR(_choices)	.type = BCH_OPT_STR,			\</div><div class='del'>-				.min = 0, .max = ARRAY_SIZE(_choices),	\</div><div class='del'>-				.choices = _choices</div><div class='del'>-#define OPT_FN(_fn)		.type = BCH_OPT_FN, .fn	= _fn</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits, _flags, _type, _sb_opt, _default, _hint, _help)	\</div><div class='del'>-	[Opt_##_name] = {						\</div><div class='del'>-		.attr	= {						\</div><div class='del'>-			.name	= #_name,				\</div><div class='del'>-			.mode = (_flags) &amp; OPT_RUNTIME ? 0644 : 0444,	\</div><div class='del'>-		},							\</div><div class='del'>-		.flags	= _flags,					\</div><div class='del'>-		.hint	= _hint,					\</div><div class='del'>-		.help	= _help,					\</div><div class='del'>-		.get_sb = _sb_opt,					\</div><div class='del'>-		.set_sb	= SET_##_sb_opt,				\</div><div class='del'>-		_type							\</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_opt_lookup(const char *name)</div><div class='del'>-{</div><div class='del'>-	const struct bch_option *i;</div><div class='del'>-</div><div class='del'>-	for (i = bch2_opt_table;</div><div class='del'>-	     i &lt; bch2_opt_table + ARRAY_SIZE(bch2_opt_table);</div><div class='del'>-	     i++)</div><div class='del'>-		if (!strcmp(name, i-&gt;attr.name))</div><div class='del'>-			return i - bch2_opt_table;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct synonym {</div><div class='del'>-	const char	*s1, *s2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct synonym bch_opt_synonyms[] = {</div><div class='del'>-	{ "quota",	"usrquota" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_mount_opt_lookup(const char *name)</div><div class='del'>-{</div><div class='del'>-	const struct synonym *i;</div><div class='del'>-</div><div class='del'>-	for (i = bch_opt_synonyms;</div><div class='del'>-	     i &lt; bch_opt_synonyms + ARRAY_SIZE(bch_opt_synonyms);</div><div class='del'>-	     i++)</div><div class='del'>-		if (!strcmp(name, i-&gt;s1))</div><div class='del'>-			name = i-&gt;s2;</div><div class='del'>-</div><div class='del'>-	return bch2_opt_lookup(name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opt_validate(const struct bch_option *opt, u64 v, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	if (v &lt; opt-&gt;min) {</div><div class='del'>-		if (err)</div><div class='del'>-			prt_printf(err, "%s: too small (min %llu)",</div><div class='del'>-			       opt-&gt;attr.name, opt-&gt;min);</div><div class='del'>-		return -BCH_ERR_ERANGE_option_too_small;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;max &amp;&amp; v &gt;= opt-&gt;max) {</div><div class='del'>-		if (err)</div><div class='del'>-			prt_printf(err, "%s: too big (max %llu)",</div><div class='del'>-			       opt-&gt;attr.name, opt-&gt;max);</div><div class='del'>-		return -BCH_ERR_ERANGE_option_too_big;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((opt-&gt;flags &amp; OPT_SB_FIELD_SECTORS) &amp;&amp; (v &amp; 511)) {</div><div class='del'>-		if (err)</div><div class='del'>-			prt_printf(err, "%s: not a multiple of 512",</div><div class='del'>-			       opt-&gt;attr.name);</div><div class='del'>-		return -BCH_ERR_opt_parse_error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((opt-&gt;flags &amp; OPT_MUST_BE_POW_2) &amp;&amp; !is_power_of_2(v)) {</div><div class='del'>-		if (err)</div><div class='del'>-			prt_printf(err, "%s: must be a power of two",</div><div class='del'>-			       opt-&gt;attr.name);</div><div class='del'>-		return -BCH_ERR_opt_parse_error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;fn.validate)</div><div class='del'>-		return opt-&gt;fn.validate(v, err);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opt_parse(struct bch_fs *c,</div><div class='del'>-		   const struct bch_option *opt,</div><div class='del'>-		   const char *val, u64 *res,</div><div class='del'>-		   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	switch (opt-&gt;type) {</div><div class='del'>-	case BCH_OPT_BOOL:</div><div class='del'>-		if (val) {</div><div class='del'>-			ret = kstrtou64(val, 10, res);</div><div class='del'>-		} else {</div><div class='del'>-			ret = 0;</div><div class='del'>-			*res = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0 || (*res != 0 &amp;&amp; *res != 1)) {</div><div class='del'>-			if (err)</div><div class='del'>-				prt_printf(err, "%s: must be bool", opt-&gt;attr.name);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case BCH_OPT_UINT:</div><div class='del'>-		if (!val) {</div><div class='del'>-			prt_printf(err, "%s: required value",</div><div class='del'>-				   opt-&gt;attr.name);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = opt-&gt;flags &amp; OPT_HUMAN_READABLE</div><div class='del'>-			? bch2_strtou64_h(val, res)</div><div class='del'>-			: kstrtou64(val, 10, res);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			if (err)</div><div class='del'>-				prt_printf(err, "%s: must be a number",</div><div class='del'>-					   opt-&gt;attr.name);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case BCH_OPT_STR:</div><div class='del'>-		if (!val) {</div><div class='del'>-			prt_printf(err, "%s: required value",</div><div class='del'>-				   opt-&gt;attr.name);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = match_string(opt-&gt;choices, -1, val);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			if (err)</div><div class='del'>-				prt_printf(err, "%s: invalid selection",</div><div class='del'>-					   opt-&gt;attr.name);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*res = ret;</div><div class='del'>-		break;</div><div class='del'>-	case BCH_OPT_FN:</div><div class='del'>-		ret = opt-&gt;fn.parse(c, val, res, err);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			if (err)</div><div class='del'>-				prt_printf(err, "%s: parse error",</div><div class='del'>-					   opt-&gt;attr.name);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_opt_validate(opt, *res, err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opt_to_text(struct printbuf *out,</div><div class='del'>-		      struct bch_fs *c, struct bch_sb *sb,</div><div class='del'>-		      const struct bch_option *opt, u64 v,</div><div class='del'>-		      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; OPT_SHOW_MOUNT_STYLE) {</div><div class='del'>-		if (opt-&gt;type == BCH_OPT_BOOL) {</div><div class='del'>-			prt_printf(out, "%s%s",</div><div class='del'>-			       v ? "" : "no",</div><div class='del'>-			       opt-&gt;attr.name);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "%s=", opt-&gt;attr.name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (opt-&gt;type) {</div><div class='del'>-	case BCH_OPT_BOOL:</div><div class='del'>-	case BCH_OPT_UINT:</div><div class='del'>-		if (opt-&gt;flags &amp; OPT_HUMAN_READABLE)</div><div class='del'>-			prt_human_readable_u64(out, v);</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "%lli", v);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_OPT_STR:</div><div class='del'>-		if (flags &amp; OPT_SHOW_FULL_LIST)</div><div class='del'>-			prt_string_option(out, opt-&gt;choices, v);</div><div class='del'>-		else</div><div class='del'>-			prt_str(out, opt-&gt;choices[v]);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_OPT_FN:</div><div class='del'>-		opt-&gt;fn.to_text(out, c, sb, v);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opt_check_may_set(struct bch_fs *c, int id, u64 v)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (id) {</div><div class='del'>-	case Opt_compression:</div><div class='del'>-	case Opt_background_compression:</div><div class='del'>-		ret = bch2_check_set_has_compressed_data(c, v);</div><div class='del'>-		break;</div><div class='del'>-	case Opt_erasure_code:</div><div class='del'>-		if (v)</div><div class='del'>-			bch2_check_set_feature(c, BCH_FEATURE_ec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_opts_check_may_set(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bch2_opts_nr; i++) {</div><div class='del'>-		ret = bch2_opt_check_may_set(c, i,</div><div class='del'>-				bch2_opt_get_by_id(&amp;c-&gt;opts, i));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_parse_mount_opts(struct bch_fs *c, struct bch_opts *opts,</div><div class='del'>-			  char *options)</div><div class='del'>-{</div><div class='del'>-	char *copied_opts, *copied_opts_start;</div><div class='del'>-	char *opt, *name, *val;</div><div class='del'>-	int ret, id;</div><div class='del'>-	struct printbuf err = PRINTBUF;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * sys_fsconfig() is now occasionally providing us with option lists</div><div class='del'>-	 * starting with a comma - weird.</div><div class='del'>-	 */</div><div class='del'>-	if (*options == ',')</div><div class='del'>-		options++;</div><div class='del'>-</div><div class='del'>-	copied_opts = kstrdup(options, GFP_KERNEL);</div><div class='del'>-	if (!copied_opts)</div><div class='del'>-		return -1;</div><div class='del'>-	copied_opts_start = copied_opts;</div><div class='del'>-</div><div class='del'>-	while ((opt = strsep(&amp;copied_opts, ",")) != NULL) {</div><div class='del'>-		name	= strsep(&amp;opt, "=");</div><div class='del'>-		val	= opt;</div><div class='del'>-</div><div class='del'>-		id = bch2_mount_opt_lookup(name);</div><div class='del'>-</div><div class='del'>-		/* Check for the form "noopt", negation of a boolean opt: */</div><div class='del'>-		if (id &lt; 0 &amp;&amp;</div><div class='del'>-		    !val &amp;&amp;</div><div class='del'>-		    !strncmp("no", name, 2)) {</div><div class='del'>-			id = bch2_mount_opt_lookup(name + 2);</div><div class='del'>-			val = "0";</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Unknown options are ignored: */</div><div class='del'>-		if (id &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!(bch2_opt_table[id].flags &amp; OPT_MOUNT))</div><div class='del'>-			goto bad_opt;</div><div class='del'>-</div><div class='del'>-		if (id == Opt_acl &amp;&amp;</div><div class='del'>-		    !IS_ENABLED(CONFIG_BCACHEFS_POSIX_ACL))</div><div class='del'>-			goto bad_opt;</div><div class='del'>-</div><div class='del'>-		if ((id == Opt_usrquota ||</div><div class='del'>-		     id == Opt_grpquota) &amp;&amp;</div><div class='del'>-		    !IS_ENABLED(CONFIG_BCACHEFS_QUOTA))</div><div class='del'>-			goto bad_opt;</div><div class='del'>-</div><div class='del'>-		ret = bch2_opt_parse(c, &amp;bch2_opt_table[id], val, &amp;v, &amp;err);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto bad_val;</div><div class='del'>-</div><div class='del'>-		bch2_opt_set_by_id(opts, id, v);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-bad_opt:</div><div class='del'>-	pr_err("Bad mount option %s", name);</div><div class='del'>-	ret = -1;</div><div class='del'>-	goto out;</div><div class='del'>-bad_val:</div><div class='del'>-	pr_err("Invalid mount option %s", err.buf);</div><div class='del'>-	ret = -1;</div><div class='del'>-	goto out;</div><div class='del'>-out:</div><div class='del'>-	kfree(copied_opts_start);</div><div class='del'>-	printbuf_exit(&amp;err);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_opt_from_sb(struct bch_sb *sb, enum bch_opt_id id)</div><div class='del'>-{</div><div class='del'>-	const struct bch_option *opt = bch2_opt_table + id;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	v = opt-&gt;get_sb(sb);</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;flags &amp; OPT_SB_FIELD_ILOG2)</div><div class='del'>-		v = 1ULL &lt;&lt; v;</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;flags &amp; OPT_SB_FIELD_SECTORS)</div><div class='del'>-		v &lt;&lt;= 9;</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initial options from superblock - here we don't want any options undefined,</div><div class='del'>- * any options the superblock doesn't specify are set to 0:</div><div class='del'>- */</div><div class='del'>-int bch2_opts_from_sb(struct bch_opts *opts, struct bch_sb *sb)</div><div class='del'>-{</div><div class='del'>-	unsigned id;</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; bch2_opts_nr; id++) {</div><div class='del'>-		const struct bch_option *opt = bch2_opt_table + id;</div><div class='del'>-</div><div class='del'>-		if (opt-&gt;get_sb == BCH2_NO_SB_OPT)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_opt_set_by_id(opts, id, bch2_opt_from_sb(sb, id));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_opt_set_sb(struct bch_sb *sb, const struct bch_option *opt, u64 v)</div><div class='del'>-{</div><div class='del'>-	if (opt-&gt;set_sb == SET_BCH2_NO_SB_OPT)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;flags &amp; OPT_SB_FIELD_SECTORS)</div><div class='del'>-		v &gt;&gt;= 9;</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;flags &amp; OPT_SB_FIELD_ILOG2)</div><div class='del'>-		v = ilog2(v);</div><div class='del'>-</div><div class='del'>-	opt-&gt;set_sb(sb, v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opt_set_sb(struct bch_fs *c, const struct bch_option *opt, u64 v)</div><div class='del'>-{</div><div class='del'>-	if (opt-&gt;set_sb == SET_BCH2_NO_SB_OPT)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	__bch2_opt_set_sb(c-&gt;disk_sb.sb, opt, v);</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* io opts: */</div><div class='del'>-</div><div class='del'>-struct bch_io_opts bch2_opts_to_inode_opts(struct bch_opts src)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_io_opts) {</div><div class='del'>-#define x(_name, _bits)	._name = src._name,</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_opt_is_inode_opt(enum bch_opt_id id)</div><div class='del'>-{</div><div class='del'>-	static const enum bch_opt_id inode_opt_list[] = {</div><div class='del'>-#define x(_name, _bits)	Opt_##_name,</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	};</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(inode_opt_list); i++)</div><div class='del'>-		if (inode_opt_list[i] == id)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h<br/>deleted file mode 100644<br/>index 9a4b7faa3765..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/opts.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/opts.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,575 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_OPTS_H</div><div class='del'>-#define _BCACHEFS_OPTS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include "bcachefs_format.h"</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_error_actions[];</div><div class='del'>-extern const char * const bch2_fsck_fix_opts[];</div><div class='del'>-extern const char * const bch2_version_upgrade_opts[];</div><div class='del'>-extern const char * const bch2_sb_features[];</div><div class='del'>-extern const char * const bch2_sb_compat[];</div><div class='del'>-extern const char * const __bch2_btree_ids[];</div><div class='del'>-extern const char * const bch2_csum_types[];</div><div class='del'>-extern const char * const bch2_csum_opts[];</div><div class='del'>-extern const char * const __bch2_compression_types[];</div><div class='del'>-extern const char * const bch2_compression_opts[];</div><div class='del'>-extern const char * const bch2_str_hash_types[];</div><div class='del'>-extern const char * const bch2_str_hash_opts[];</div><div class='del'>-extern const char * const __bch2_data_types[];</div><div class='del'>-extern const char * const bch2_member_states[];</div><div class='del'>-extern const char * const bch2_jset_entry_types[];</div><div class='del'>-extern const char * const bch2_fs_usage_types[];</div><div class='del'>-extern const char * const bch2_d_types[];</div><div class='del'>-</div><div class='del'>-static inline const char *bch2_d_type_str(unsigned d_type)</div><div class='del'>-{</div><div class='del'>-	return (d_type &lt; BCH_DT_MAX ? bch2_d_types[d_type] : NULL) ?: "(bad d_type)";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mount options; we also store defaults in the superblock.</div><div class='del'>- *</div><div class='del'>- * Also exposed via sysfs: if an option is writeable, and it's also stored in</div><div class='del'>- * the superblock, changing it via sysfs (currently? might change this) also</div><div class='del'>- * updates the superblock.</div><div class='del'>- *</div><div class='del'>- * We store options as signed integers, where -1 means undefined. This means we</div><div class='del'>- * can pass the mount options to bch2_fs_alloc() as a whole struct, and then only</div><div class='del'>- * apply the options from that struct that are defined.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* dummy option, for options that aren't stored in the superblock */</div><div class='del'>-u64 BCH2_NO_SB_OPT(const struct bch_sb *);</div><div class='del'>-void SET_BCH2_NO_SB_OPT(struct bch_sb *, u64);</div><div class='del'>-</div><div class='del'>-/* When can be set: */</div><div class='del'>-enum opt_flags {</div><div class='del'>-	OPT_FS		= (1 &lt;&lt; 0),	/* Filesystem option */</div><div class='del'>-	OPT_DEVICE	= (1 &lt;&lt; 1),	/* Device option */</div><div class='del'>-	OPT_INODE	= (1 &lt;&lt; 2),	/* Inode option */</div><div class='del'>-	OPT_FORMAT	= (1 &lt;&lt; 3),	/* May be specified at format time */</div><div class='del'>-	OPT_MOUNT	= (1 &lt;&lt; 4),	/* May be specified at mount time */</div><div class='del'>-	OPT_RUNTIME	= (1 &lt;&lt; 5),	/* May be specified at runtime */</div><div class='del'>-	OPT_HUMAN_READABLE = (1 &lt;&lt; 6),</div><div class='del'>-	OPT_MUST_BE_POW_2 = (1 &lt;&lt; 7),	/* Must be power of 2 */</div><div class='del'>-	OPT_SB_FIELD_SECTORS = (1 &lt;&lt; 8),/* Superblock field is &gt;&gt; 9 of actual value */</div><div class='del'>-	OPT_SB_FIELD_ILOG2 = (1 &lt;&lt; 9),	/* Superblock field is ilog2 of actual value */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum opt_type {</div><div class='del'>-	BCH_OPT_BOOL,</div><div class='del'>-	BCH_OPT_UINT,</div><div class='del'>-	BCH_OPT_STR,</div><div class='del'>-	BCH_OPT_FN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_opt_fn {</div><div class='del'>-	int (*parse)(struct bch_fs *, const char *, u64 *, struct printbuf *);</div><div class='del'>-	void (*to_text)(struct printbuf *, struct bch_fs *, struct bch_sb *, u64);</div><div class='del'>-	int (*validate)(u64, struct printbuf *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * x(name, shortopt, type, in mem type, mode, sb_opt)</div><div class='del'>- *</div><div class='del'>- * @name	- name of mount option, sysfs attribute, and struct bch_opts</div><div class='del'>- *		  member</div><div class='del'>- *</div><div class='del'>- * @mode	- when opt may be set</div><div class='del'>- *</div><div class='del'>- * @sb_option	- name of corresponding superblock option</div><div class='del'>- *</div><div class='del'>- * @type	- one of OPT_BOOL, OPT_UINT, OPT_STR</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX: add fields for</div><div class='del'>- *  - default value</div><div class='del'>- *  - helptext</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#define RATELIMIT_ERRORS_DEFAULT true</div><div class='del'>-#else</div><div class='del'>-#define RATELIMIT_ERRORS_DEFAULT false</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-#define BCACHEFS_VERBOSE_DEFAULT	true</div><div class='del'>-#else</div><div class='del'>-#define BCACHEFS_VERBOSE_DEFAULT	false</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BCH_FIX_ERRORS_OPTS()		\</div><div class='del'>-	x(exit,	0)			\</div><div class='del'>-	x(yes,	1)			\</div><div class='del'>-	x(no,	2)			\</div><div class='del'>-	x(ask,	3)</div><div class='del'>-</div><div class='del'>-enum fsck_err_opts {</div><div class='del'>-#define x(t, n)	FSCK_FIX_##t,</div><div class='del'>-	BCH_FIX_ERRORS_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_OPTS()							\</div><div class='del'>-	x(block_size,			u16,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|						\</div><div class='del'>-	  OPT_HUMAN_READABLE|OPT_MUST_BE_POW_2|OPT_SB_FIELD_SECTORS,	\</div><div class='del'>-	  OPT_UINT(512, 1U &lt;&lt; 16),					\</div><div class='del'>-	  BCH_SB_BLOCK_SIZE,		8,				\</div><div class='del'>-	  "size",	NULL)						\</div><div class='del'>-	x(btree_node_size,		u32,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|						\</div><div class='del'>-	  OPT_HUMAN_READABLE|OPT_MUST_BE_POW_2|OPT_SB_FIELD_SECTORS,	\</div><div class='del'>-	  OPT_UINT(512, 1U &lt;&lt; 20),					\</div><div class='del'>-	  BCH_SB_BTREE_NODE_SIZE,	512,				\</div><div class='del'>-	  "size",	"Btree node size, default 256k")		\</div><div class='del'>-	x(errors,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_STR(bch2_error_actions),					\</div><div class='del'>-	  BCH_SB_ERROR_ACTION,		BCH_ON_ERROR_ro,		\</div><div class='del'>-	  NULL,		"Action to take on filesystem error")		\</div><div class='del'>-	x(metadata_replicas,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_UINT(1, BCH_REPLICAS_MAX),				\</div><div class='del'>-	  BCH_SB_META_REPLICAS_WANT,	1,				\</div><div class='del'>-	  "#",		"Number of metadata replicas")			\</div><div class='del'>-	x(data_replicas,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_UINT(1, BCH_REPLICAS_MAX),				\</div><div class='del'>-	  BCH_SB_DATA_REPLICAS_WANT,	1,				\</div><div class='del'>-	  "#",		"Number of data replicas")			\</div><div class='del'>-	x(metadata_replicas_required, u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_UINT(1, BCH_REPLICAS_MAX),				\</div><div class='del'>-	  BCH_SB_META_REPLICAS_REQ,	1,				\</div><div class='del'>-	  "#",		NULL)						\</div><div class='del'>-	x(data_replicas_required,	u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_UINT(1, BCH_REPLICAS_MAX),				\</div><div class='del'>-	  BCH_SB_DATA_REPLICAS_REQ,	1,				\</div><div class='del'>-	  "#",		NULL)						\</div><div class='del'>-	x(encoded_extent_max,		u32,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|						\</div><div class='del'>-	  OPT_HUMAN_READABLE|OPT_MUST_BE_POW_2|OPT_SB_FIELD_SECTORS|OPT_SB_FIELD_ILOG2,\</div><div class='del'>-	  OPT_UINT(4096, 2U &lt;&lt; 20),					\</div><div class='del'>-	  BCH_SB_ENCODED_EXTENT_MAX_BITS, 64 &lt;&lt; 10,			\</div><div class='del'>-	  "size",	"Maximum size of checksummed/compressed extents")\</div><div class='del'>-	x(metadata_checksum,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_STR(bch2_csum_opts),					\</div><div class='del'>-	  BCH_SB_META_CSUM_TYPE,	BCH_CSUM_OPT_crc32c,		\</div><div class='del'>-	  NULL,		NULL)						\</div><div class='del'>-	x(data_checksum,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_STR(bch2_csum_opts),					\</div><div class='del'>-	  BCH_SB_DATA_CSUM_TYPE,	BCH_CSUM_OPT_crc32c,		\</div><div class='del'>-	  NULL,		NULL)						\</div><div class='del'>-	x(compression,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_FN(bch2_opt_compression),					\</div><div class='del'>-	  BCH_SB_COMPRESSION_TYPE,	BCH_COMPRESSION_OPT_none,	\</div><div class='del'>-	  NULL,		NULL)						\</div><div class='del'>-	x(background_compression,	u8,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_FN(bch2_opt_compression),					\</div><div class='del'>-	  BCH_SB_BACKGROUND_COMPRESSION_TYPE,BCH_COMPRESSION_OPT_none,	\</div><div class='del'>-	  NULL,		NULL)						\</div><div class='del'>-	x(str_hash,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_STR(bch2_str_hash_opts),					\</div><div class='del'>-	  BCH_SB_STR_HASH_TYPE,		BCH_STR_HASH_OPT_siphash,	\</div><div class='del'>-	  NULL,		"Hash function for directory entries and xattrs")\</div><div class='del'>-	x(metadata_target,		u16,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_FN(bch2_opt_target),					\</div><div class='del'>-	  BCH_SB_METADATA_TARGET,	0,				\</div><div class='del'>-	  "(target)",	"Device or label for metadata writes")		\</div><div class='del'>-	x(foreground_target,		u16,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_FN(bch2_opt_target),					\</div><div class='del'>-	  BCH_SB_FOREGROUND_TARGET,	0,				\</div><div class='del'>-	  "(target)",	"Device or label for foreground writes")	\</div><div class='del'>-	x(background_target,		u16,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_FN(bch2_opt_target),					\</div><div class='del'>-	  BCH_SB_BACKGROUND_TARGET,	0,				\</div><div class='del'>-	  "(target)",	"Device or label to move data to in the background")\</div><div class='del'>-	x(promote_target,		u16,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_FN(bch2_opt_target),					\</div><div class='del'>-	  BCH_SB_PROMOTE_TARGET,	0,				\</div><div class='del'>-	  "(target)",	"Device or label to promote data to on read")	\</div><div class='del'>-	x(erasure_code,			u16,				\</div><div class='del'>-	  OPT_FS|OPT_INODE|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_ERASURE_CODE,		false,				\</div><div class='del'>-	  NULL,		"Enable erasure coding (DO NOT USE YET)")	\</div><div class='del'>-	x(inodes_32bit,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_INODE_32BIT,		true,				\</div><div class='del'>-	  NULL,		"Constrain inode numbers to 32 bits")		\</div><div class='del'>-	x(shard_inode_numbers,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_SHARD_INUMS,		true,				\</div><div class='del'>-	  NULL,		"Shard new inode numbers by CPU id")		\</div><div class='del'>-	x(inodes_use_key_cache,	u8,					\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_INODES_USE_KEY_CACHE,	true,				\</div><div class='del'>-	  NULL,		"Use the btree key cache for the inodes btree")	\</div><div class='del'>-	x(btree_node_mem_ptr_optimization, u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		true,				\</div><div class='del'>-	  NULL,		"Stash pointer to in memory btree node in btree ptr")\</div><div class='del'>-	x(gc_reserve_percent,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_UINT(5, 21),						\</div><div class='del'>-	  BCH_SB_GC_RESERVE,		8,				\</div><div class='del'>-	  "%",		"Percentage of disk space to reserve for copygc")\</div><div class='del'>-	x(gc_reserve_bytes,		u64,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|			\</div><div class='del'>-	  OPT_HUMAN_READABLE|OPT_SB_FIELD_SECTORS,			\</div><div class='del'>-	  OPT_UINT(0, U64_MAX),						\</div><div class='del'>-	  BCH_SB_GC_RESERVE_BYTES,	0,				\</div><div class='del'>-	  "%",		"Amount of disk space to reserve for copygc\n"	\</div><div class='del'>-			"Takes precedence over gc_reserve_percent if set")\</div><div class='del'>-	x(root_reserve_percent,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_UINT(0, 100),						\</div><div class='del'>-	  BCH_SB_ROOT_RESERVE,		0,				\</div><div class='del'>-	  "%",		"Percentage of disk space to reserve for superuser")\</div><div class='del'>-	x(wide_macs,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_128_BIT_MACS,		false,				\</div><div class='del'>-	  NULL,		"Store full 128 bits of cryptographic MACs, instead of 80")\</div><div class='del'>-	x(inline_data,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		true,				\</div><div class='del'>-	  NULL,		"Enable inline data extents")			\</div><div class='del'>-	x(acl,				u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_POSIX_ACL,		true,				\</div><div class='del'>-	  NULL,		"Enable POSIX acls")				\</div><div class='del'>-	x(usrquota,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_USRQUOTA,		false,				\</div><div class='del'>-	  NULL,		"Enable user quotas")				\</div><div class='del'>-	x(grpquota,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_GRPQUOTA,		false,				\</div><div class='del'>-	  NULL,		"Enable group quotas")				\</div><div class='del'>-	x(prjquota,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_PRJQUOTA,		false,				\</div><div class='del'>-	  NULL,		"Enable project quotas")			\</div><div class='del'>-	x(degraded,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Allow mounting in degraded mode")		\</div><div class='del'>-	x(very_degraded,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Allow mounting in when data will be missing")	\</div><div class='del'>-	x(discard,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_DEVICE,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		true,				\</div><div class='del'>-	  NULL,		"Enable discard/TRIM support")			\</div><div class='del'>-	x(verbose,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		BCACHEFS_VERBOSE_DEFAULT,	\</div><div class='del'>-	  NULL,		"Extra debugging information during mount/recovery")\</div><div class='del'>-	x(journal_flush_delay,		u32,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_UINT(1, U32_MAX),						\</div><div class='del'>-	  BCH_SB_JOURNAL_FLUSH_DELAY,	1000,				\</div><div class='del'>-	  NULL,		"Delay in milliseconds before automatic journal commits")\</div><div class='del'>-	x(journal_flush_disabled,	u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_JOURNAL_FLUSH_DISABLED,false,				\</div><div class='del'>-	  NULL,		"Disable journal flush on sync/fsync\n"		\</div><div class='del'>-			"If enabled, writes can be lost, but only since the\n"\</div><div class='del'>-			"last journal write (default 1 second)")	\</div><div class='del'>-	x(journal_reclaim_delay,	u32,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_UINT(0, U32_MAX),						\</div><div class='del'>-	  BCH_SB_JOURNAL_RECLAIM_DELAY,	100,				\</div><div class='del'>-	  NULL,		"Delay in milliseconds before automatic journal reclaim")\</div><div class='del'>-	x(move_bytes_in_flight,		u32,				\</div><div class='del'>-	  OPT_HUMAN_READABLE|OPT_FS|OPT_MOUNT|OPT_RUNTIME,		\</div><div class='del'>-	  OPT_UINT(1024, U32_MAX),					\</div><div class='del'>-	  BCH2_NO_SB_OPT,		1U &lt;&lt; 20,			\</div><div class='del'>-	  NULL,		"Maximum Amount of IO to keep in flight by the move path")\</div><div class='del'>-	x(move_ios_in_flight,		u32,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_UINT(1, 1024),						\</div><div class='del'>-	  BCH2_NO_SB_OPT,		32,				\</div><div class='del'>-	  NULL,		"Maximum number of IOs to keep in flight by the move path")\</div><div class='del'>-	x(fsck,				u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Run fsck on mount")				\</div><div class='del'>-	x(fix_errors,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_FN(bch2_opt_fix_errors),					\</div><div class='del'>-	  BCH2_NO_SB_OPT,		FSCK_FIX_exit,			\</div><div class='del'>-	  NULL,		"Fix errors during fsck without asking")	\</div><div class='del'>-	x(ratelimit_errors,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		RATELIMIT_ERRORS_DEFAULT,	\</div><div class='del'>-	  NULL,		"Ratelimit error messages during fsck")		\</div><div class='del'>-	x(nochanges,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Super read only mode - no writes at all will be issued,\n"\</div><div class='del'>-			"even if we have to replay the journal")	\</div><div class='del'>-	x(norecovery,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Don't replay the journal")			\</div><div class='del'>-	x(keep_journal,			u8,				\</div><div class='del'>-	  0,								\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Don't free journal entries/keys after startup")\</div><div class='del'>-	x(read_entire_journal,		u8,				\</div><div class='del'>-	  0,								\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Read all journal entries, not just dirty ones")\</div><div class='del'>-	x(read_journal_only,		u8,				\</div><div class='del'>-	  0,								\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Only read the journal, skip the rest of recovery")\</div><div class='del'>-	x(journal_transaction_names,	u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME,			\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_JOURNAL_TRANSACTION_NAMES, true,			\</div><div class='del'>-	  NULL,		"Log transaction function names in journal")	\</div><div class='del'>-	x(noexcl,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Don't open device in exclusive mode")		\</div><div class='del'>-	x(direct_io,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,			true,			\</div><div class='del'>-	  NULL,		"Use O_DIRECT (userspace only)")		\</div><div class='del'>-	x(sb,				u64,				\</div><div class='del'>-	  OPT_MOUNT,							\</div><div class='del'>-	  OPT_UINT(0, S64_MAX),						\</div><div class='del'>-	  BCH2_NO_SB_OPT,		BCH_SB_SECTOR,			\</div><div class='del'>-	  "offset",	"Sector offset of superblock")			\</div><div class='del'>-	x(read_only,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		NULL)						\</div><div class='del'>-	x(nostart,			u8,				\</div><div class='del'>-	  0,								\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Don\'t start filesystem, only open devices")	\</div><div class='del'>-	x(reconstruct_alloc,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Reconstruct alloc btree")			\</div><div class='del'>-	x(version_upgrade,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_STR(bch2_version_upgrade_opts),				\</div><div class='del'>-	  BCH_SB_VERSION_UPGRADE,	BCH_VERSION_UPGRADE_compatible,	\</div><div class='del'>-	  NULL,		"Set superblock to latest version,\n"		\</div><div class='del'>-			"allowing any new features to be used")		\</div><div class='del'>-	x(buckets_nouse,		u8,				\</div><div class='del'>-	  0,								\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Allocate the buckets_nouse bitmap")		\</div><div class='del'>-	x(stdio,			u64,				\</div><div class='del'>-	  0,								\</div><div class='del'>-	  OPT_UINT(0, S64_MAX),						\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Pointer to a struct stdio_redirect")		\</div><div class='del'>-	x(project,			u8,				\</div><div class='del'>-	  OPT_INODE,							\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		NULL)						\</div><div class='del'>-	x(nocow,			u8,				\</div><div class='del'>-	  OPT_FS|OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE,		\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH_SB_NOCOW,			false,				\</div><div class='del'>-	  NULL,		"Nocow mode: Writes will be done in place when possible.\n"\</div><div class='del'>-			"Snapshots and reflink will still caused writes to be COW\n"\</div><div class='del'>-			"Implicitly disables data checksumming, compression and encryption")\</div><div class='del'>-	x(nocow_enabled,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT,						\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,			true,			\</div><div class='del'>-	  NULL,		"Enable nocow mode: enables runtime locking in\n"\</div><div class='del'>-			"data move path needed if nocow will ever be in use\n")\</div><div class='del'>-	x(no_data_io,			u8,				\</div><div class='del'>-	  OPT_MOUNT,							\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		false,				\</div><div class='del'>-	  NULL,		"Skip submit_bio() for data reads and writes, "	\</div><div class='del'>-			"for performance testing purposes")		\</div><div class='del'>-	x(fs_size,			u64,				\</div><div class='del'>-	  OPT_DEVICE,							\</div><div class='del'>-	  OPT_UINT(0, S64_MAX),						\</div><div class='del'>-	  BCH2_NO_SB_OPT,		0,				\</div><div class='del'>-	  "size",	"Size of filesystem on device")			\</div><div class='del'>-	x(bucket,			u32,				\</div><div class='del'>-	  OPT_DEVICE,							\</div><div class='del'>-	  OPT_UINT(0, S64_MAX),						\</div><div class='del'>-	  BCH2_NO_SB_OPT,		0,				\</div><div class='del'>-	  "size",	"Size of filesystem on device")			\</div><div class='del'>-	x(durability,			u8,				\</div><div class='del'>-	  OPT_DEVICE,							\</div><div class='del'>-	  OPT_UINT(0, BCH_REPLICAS_MAX),				\</div><div class='del'>-	  BCH2_NO_SB_OPT,		1,				\</div><div class='del'>-	  "n",		"Data written to this device will be considered\n"\</div><div class='del'>-			"to have already been replicated n times")	\</div><div class='del'>-	x(btree_node_prefetch,		u8,				\</div><div class='del'>-	  OPT_FS|OPT_MOUNT|OPT_RUNTIME,					\</div><div class='del'>-	  OPT_BOOL(),							\</div><div class='del'>-	  BCH2_NO_SB_OPT,		true,				\</div><div class='del'>-	  NULL,		"BTREE_ITER_PREFETCH casuse btree nodes to be\n"\</div><div class='del'>-	  " prefetched sequentially")</div><div class='del'>-</div><div class='del'>-struct bch_opts {</div><div class='del'>-#define x(_name, _bits, ...)	unsigned _name##_defined:1;</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-#define x(_name, _bits, ...)	_bits	_name;</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const __maybe_unused struct bch_opts bch2_opts_default = {</div><div class='del'>-#define x(_name, _bits, _mode, _type, _sb_opt, _default, ...)		\</div><div class='del'>-	._name##_defined = true,					\</div><div class='del'>-	._name = _default,						\</div><div class='del'>-</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define opt_defined(_opts, _name)	((_opts)._name##_defined)</div><div class='del'>-</div><div class='del'>-#define opt_get(_opts, _name)						\</div><div class='del'>-	(opt_defined(_opts, _name) ? (_opts)._name : bch2_opts_default._name)</div><div class='del'>-</div><div class='del'>-#define opt_set(_opts, _name, _v)					\</div><div class='del'>-do {									\</div><div class='del'>-	(_opts)._name##_defined = true;					\</div><div class='del'>-	(_opts)._name = _v;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-static inline struct bch_opts bch2_opts_empty(void)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_opts) { 0 };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_opts_apply(struct bch_opts *, struct bch_opts);</div><div class='del'>-</div><div class='del'>-enum bch_opt_id {</div><div class='del'>-#define x(_name, ...)	Opt_##_name,</div><div class='del'>-	BCH_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-	bch2_opts_nr</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-struct printbuf;</div><div class='del'>-</div><div class='del'>-struct bch_option {</div><div class='del'>-	struct attribute	attr;</div><div class='del'>-	u64			(*get_sb)(const struct bch_sb *);</div><div class='del'>-	void			(*set_sb)(struct bch_sb *, u64);</div><div class='del'>-	enum opt_type		type;</div><div class='del'>-	enum opt_flags		flags;</div><div class='del'>-	u64			min, max;</div><div class='del'>-</div><div class='del'>-	const char * const *choices;</div><div class='del'>-</div><div class='del'>-	struct bch_opt_fn	fn;</div><div class='del'>-</div><div class='del'>-	const char		*hint;</div><div class='del'>-	const char		*help;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern const struct bch_option bch2_opt_table[];</div><div class='del'>-</div><div class='del'>-bool bch2_opt_defined_by_id(const struct bch_opts *, enum bch_opt_id);</div><div class='del'>-u64 bch2_opt_get_by_id(const struct bch_opts *, enum bch_opt_id);</div><div class='del'>-void bch2_opt_set_by_id(struct bch_opts *, enum bch_opt_id, u64);</div><div class='del'>-</div><div class='del'>-u64 bch2_opt_from_sb(struct bch_sb *, enum bch_opt_id);</div><div class='del'>-int bch2_opts_from_sb(struct bch_opts *, struct bch_sb *);</div><div class='del'>-void __bch2_opt_set_sb(struct bch_sb *, const struct bch_option *, u64);</div><div class='del'>-void bch2_opt_set_sb(struct bch_fs *, const struct bch_option *, u64);</div><div class='del'>-</div><div class='del'>-int bch2_opt_lookup(const char *);</div><div class='del'>-int bch2_opt_validate(const struct bch_option *, u64, struct printbuf *);</div><div class='del'>-int bch2_opt_parse(struct bch_fs *, const struct bch_option *,</div><div class='del'>-		   const char *, u64 *, struct printbuf *);</div><div class='del'>-</div><div class='del'>-#define OPT_SHOW_FULL_LIST	(1 &lt;&lt; 0)</div><div class='del'>-#define OPT_SHOW_MOUNT_STYLE	(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-void bch2_opt_to_text(struct printbuf *, struct bch_fs *, struct bch_sb *,</div><div class='del'>-		      const struct bch_option *, u64, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_opt_check_may_set(struct bch_fs *, int, u64);</div><div class='del'>-int bch2_opts_check_may_set(struct bch_fs *);</div><div class='del'>-int bch2_parse_mount_opts(struct bch_fs *, struct bch_opts *, char *);</div><div class='del'>-</div><div class='del'>-/* inode opts: */</div><div class='del'>-</div><div class='del'>-struct bch_io_opts {</div><div class='del'>-#define x(_name, _bits)	u##_bits _name;</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline unsigned background_compression(struct bch_io_opts opts)</div><div class='del'>-{</div><div class='del'>-	return opts.background_compression ?: opts.compression;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_io_opts bch2_opts_to_inode_opts(struct bch_opts);</div><div class='del'>-bool bch2_opt_is_inode_opt(enum bch_opt_id);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_OPTS_H */</div><div class='head'>diff --git a/fs/bcachefs/printbuf.c b/fs/bcachefs/printbuf.c<br/>deleted file mode 100644<br/>index accf246c3233..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/printbuf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/printbuf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,447 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: LGPL-2.1+</div><div class='del'>-/* Copyright (C) 2022 Kent Overstreet */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string_helpers.h&gt;</div><div class='del'>-</div><div class='del'>-#include "printbuf.h"</div><div class='del'>-</div><div class='del'>-static inline unsigned printbuf_linelen(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	return buf-&gt;pos - buf-&gt;last_newline;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_printbuf_make_room(struct printbuf *out, unsigned extra)</div><div class='del'>-{</div><div class='del'>-	unsigned new_size;</div><div class='del'>-	char *buf;</div><div class='del'>-</div><div class='del'>-	if (!out-&gt;heap_allocated)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Reserved space for terminating nul: */</div><div class='del'>-	extra += 1;</div><div class='del'>-</div><div class='del'>-	if (out-&gt;pos + extra &lt; out-&gt;size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	new_size = roundup_pow_of_two(out-&gt;size + extra);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note: output buffer must be freeable with kfree(), it's not required</div><div class='del'>-	 * that the user use printbuf_exit().</div><div class='del'>-	 */</div><div class='del'>-	buf = krealloc(out-&gt;buf, new_size, !out-&gt;atomic ? GFP_KERNEL : GFP_NOWAIT);</div><div class='del'>-</div><div class='del'>-	if (!buf) {</div><div class='del'>-		out-&gt;allocation_failure = true;</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out-&gt;buf	= buf;</div><div class='del'>-	out-&gt;size	= new_size;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_vprintf(struct printbuf *out, const char *fmt, va_list args)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		va_list args2;</div><div class='del'>-</div><div class='del'>-		va_copy(args2, args);</div><div class='del'>-		len = vsnprintf(out-&gt;buf + out-&gt;pos, printbuf_remaining(out), fmt, args2);</div><div class='del'>-	} while (len + 1 &gt;= printbuf_remaining(out) &amp;&amp;</div><div class='del'>-		 !bch2_printbuf_make_room(out, len + 1));</div><div class='del'>-</div><div class='del'>-	len = min_t(size_t, len,</div><div class='del'>-		  printbuf_remaining(out) ? printbuf_remaining(out) - 1 : 0);</div><div class='del'>-	out-&gt;pos += len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_printf(struct printbuf *out, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		va_start(args, fmt);</div><div class='del'>-		len = vsnprintf(out-&gt;buf + out-&gt;pos, printbuf_remaining(out), fmt, args);</div><div class='del'>-		va_end(args);</div><div class='del'>-	} while (len + 1 &gt;= printbuf_remaining(out) &amp;&amp;</div><div class='del'>-		 !bch2_printbuf_make_room(out, len + 1));</div><div class='del'>-</div><div class='del'>-	len = min_t(size_t, len,</div><div class='del'>-		  printbuf_remaining(out) ? printbuf_remaining(out) - 1 : 0);</div><div class='del'>-	out-&gt;pos += len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_printbuf_str() - returns printbuf's buf as a C string, guaranteed to be</div><div class='del'>- * null terminated</div><div class='del'>- * @buf:	printbuf to terminate</div><div class='del'>- * Returns:	Printbuf contents, as a nul terminated C string</div><div class='del'>- */</div><div class='del'>-const char *bch2_printbuf_str(const struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * If we've written to a printbuf then it's guaranteed to be a null</div><div class='del'>-	 * terminated string - but if we haven't, then we might not have</div><div class='del'>-	 * allocated a buffer at all:</div><div class='del'>-	 */</div><div class='del'>-	return buf-&gt;pos</div><div class='del'>-		? buf-&gt;buf</div><div class='del'>-		: "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_printbuf_exit() - exit a printbuf, freeing memory it owns and poisoning it</div><div class='del'>- * against accidental use.</div><div class='del'>- * @buf:	printbuf to exit</div><div class='del'>- */</div><div class='del'>-void bch2_printbuf_exit(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	if (buf-&gt;heap_allocated) {</div><div class='del'>-		kfree(buf-&gt;buf);</div><div class='del'>-		buf-&gt;buf = ERR_PTR(-EINTR); /* poison value */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_printbuf_tabstops_reset(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	buf-&gt;nr_tabstops = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_printbuf_tabstop_pop(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	if (buf-&gt;nr_tabstops)</div><div class='del'>-		--buf-&gt;nr_tabstops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bch2_printbuf_tabstop_set() - add a tabstop, n spaces from the previous tabstop</div><div class='del'>- *</div><div class='del'>- * @buf: printbuf to control</div><div class='del'>- * @spaces: number of spaces from previous tabpstop</div><div class='del'>- *</div><div class='del'>- * In the future this function may allocate memory if setting more than</div><div class='del'>- * PRINTBUF_INLINE_TABSTOPS or setting tabstops more than 255 spaces from start</div><div class='del'>- * of line.</div><div class='del'>- */</div><div class='del'>-int bch2_printbuf_tabstop_push(struct printbuf *buf, unsigned spaces)</div><div class='del'>-{</div><div class='del'>-	unsigned prev_tabstop = buf-&gt;nr_tabstops</div><div class='del'>-		? buf-&gt;_tabstops[buf-&gt;nr_tabstops - 1]</div><div class='del'>-		: 0;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(buf-&gt;nr_tabstops &gt;= ARRAY_SIZE(buf-&gt;_tabstops)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	buf-&gt;_tabstops[buf-&gt;nr_tabstops++] = prev_tabstop + spaces;</div><div class='del'>-	buf-&gt;has_indent_or_tabstops = true;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_printbuf_indent_add() - add to the current indent level</div><div class='del'>- *</div><div class='del'>- * @buf: printbuf to control</div><div class='del'>- * @spaces: number of spaces to add to the current indent level</div><div class='del'>- *</div><div class='del'>- * Subsequent lines, and the current line if the output position is at the start</div><div class='del'>- * of the current line, will be indented by @spaces more spaces.</div><div class='del'>- */</div><div class='del'>-void bch2_printbuf_indent_add(struct printbuf *buf, unsigned spaces)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(buf-&gt;indent + spaces &lt; buf-&gt;indent))</div><div class='del'>-		spaces = 0;</div><div class='del'>-</div><div class='del'>-	buf-&gt;indent += spaces;</div><div class='del'>-	prt_chars(buf, ' ', spaces);</div><div class='del'>-</div><div class='del'>-	buf-&gt;has_indent_or_tabstops = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_printbuf_indent_sub() - subtract from the current indent level</div><div class='del'>- *</div><div class='del'>- * @buf: printbuf to control</div><div class='del'>- * @spaces: number of spaces to subtract from the current indent level</div><div class='del'>- *</div><div class='del'>- * Subsequent lines, and the current line if the output position is at the start</div><div class='del'>- * of the current line, will be indented by @spaces less spaces.</div><div class='del'>- */</div><div class='del'>-void bch2_printbuf_indent_sub(struct printbuf *buf, unsigned spaces)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON_ONCE(spaces &gt; buf-&gt;indent))</div><div class='del'>-		spaces = buf-&gt;indent;</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;last_newline + buf-&gt;indent == buf-&gt;pos) {</div><div class='del'>-		buf-&gt;pos -= spaces;</div><div class='del'>-		printbuf_nul_terminate(buf);</div><div class='del'>-	}</div><div class='del'>-	buf-&gt;indent -= spaces;</div><div class='del'>-</div><div class='del'>-	if (!buf-&gt;indent &amp;&amp; !buf-&gt;nr_tabstops)</div><div class='del'>-		buf-&gt;has_indent_or_tabstops = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_newline(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	bch2_printbuf_make_room(buf, 1 + buf-&gt;indent);</div><div class='del'>-</div><div class='del'>-	__prt_char(buf, '\n');</div><div class='del'>-</div><div class='del'>-	buf-&gt;last_newline	= buf-&gt;pos;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; buf-&gt;indent; i++)</div><div class='del'>-		__prt_char(buf, ' ');</div><div class='del'>-</div><div class='del'>-	printbuf_nul_terminate(buf);</div><div class='del'>-</div><div class='del'>-	buf-&gt;last_field		= buf-&gt;pos;</div><div class='del'>-	buf-&gt;cur_tabstop	= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns spaces from start of line, if set, or 0 if unset:</div><div class='del'>- */</div><div class='del'>-static inline unsigned cur_tabstop(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	return buf-&gt;cur_tabstop &lt; buf-&gt;nr_tabstops</div><div class='del'>-		? buf-&gt;_tabstops[buf-&gt;cur_tabstop]</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __prt_tab(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	int spaces = max_t(int, 0, cur_tabstop(out) - printbuf_linelen(out));</div><div class='del'>-</div><div class='del'>-	prt_chars(out, ' ', spaces);</div><div class='del'>-</div><div class='del'>-	out-&gt;last_field = out-&gt;pos;</div><div class='del'>-	out-&gt;cur_tabstop++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_tab() - Advance printbuf to the next tabstop</div><div class='del'>- * @out:	printbuf to control</div><div class='del'>- *</div><div class='del'>- * Advance output to the next tabstop by printing spaces.</div><div class='del'>- */</div><div class='del'>-void bch2_prt_tab(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON(!cur_tabstop(out)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__prt_tab(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __prt_tab_rjust(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	unsigned move = buf-&gt;pos - buf-&gt;last_field;</div><div class='del'>-	int pad = (int) cur_tabstop(buf) - (int) printbuf_linelen(buf);</div><div class='del'>-</div><div class='del'>-	if (pad &gt; 0) {</div><div class='del'>-		bch2_printbuf_make_room(buf, pad);</div><div class='del'>-</div><div class='del'>-		if (buf-&gt;last_field + pad &lt; buf-&gt;size)</div><div class='del'>-			memmove(buf-&gt;buf + buf-&gt;last_field + pad,</div><div class='del'>-				buf-&gt;buf + buf-&gt;last_field,</div><div class='del'>-				min(move, buf-&gt;size - 1 - buf-&gt;last_field - pad));</div><div class='del'>-</div><div class='del'>-		if (buf-&gt;last_field &lt; buf-&gt;size)</div><div class='del'>-			memset(buf-&gt;buf + buf-&gt;last_field, ' ',</div><div class='del'>-			       min((unsigned) pad, buf-&gt;size - buf-&gt;last_field));</div><div class='del'>-</div><div class='del'>-		buf-&gt;pos += pad;</div><div class='del'>-		printbuf_nul_terminate(buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf-&gt;last_field = buf-&gt;pos;</div><div class='del'>-	buf-&gt;cur_tabstop++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_tab_rjust - Advance printbuf to the next tabstop, right justifying</div><div class='del'>- * previous output</div><div class='del'>- *</div><div class='del'>- * @buf: printbuf to control</div><div class='del'>- *</div><div class='del'>- * Advance output to the next tabstop by inserting spaces immediately after the</div><div class='del'>- * previous tabstop, right justifying previously outputted text.</div><div class='del'>- */</div><div class='del'>-void bch2_prt_tab_rjust(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON(!cur_tabstop(buf)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__prt_tab_rjust(buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_bytes_indented() - Print an array of chars, handling embedded control characters</div><div class='del'>- *</div><div class='del'>- * @out:	output printbuf</div><div class='del'>- * @str:	string to print</div><div class='del'>- * @count:	number of bytes to print</div><div class='del'>- *</div><div class='del'>- * The following contol characters are handled as so:</div><div class='del'>- *   \n: prt_newline	newline that obeys current indent level</div><div class='del'>- *   \t: prt_tab	advance to next tabstop</div><div class='del'>- *   \r: prt_tab_rjust	advance to next tabstop, with right justification</div><div class='del'>- */</div><div class='del'>-void bch2_prt_bytes_indented(struct printbuf *out, const char *str, unsigned count)</div><div class='del'>-{</div><div class='del'>-	const char *unprinted_start = str;</div><div class='del'>-	const char *end = str + count;</div><div class='del'>-</div><div class='del'>-	if (!out-&gt;has_indent_or_tabstops || out-&gt;suppress_indent_tabstop_handling) {</div><div class='del'>-		prt_bytes(out, str, count);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (str != end) {</div><div class='del'>-		switch (*str) {</div><div class='del'>-		case '\n':</div><div class='del'>-			prt_bytes(out, unprinted_start, str - unprinted_start);</div><div class='del'>-			unprinted_start = str + 1;</div><div class='del'>-			bch2_prt_newline(out);</div><div class='del'>-			break;</div><div class='del'>-		case '\t':</div><div class='del'>-			if (likely(cur_tabstop(out))) {</div><div class='del'>-				prt_bytes(out, unprinted_start, str - unprinted_start);</div><div class='del'>-				unprinted_start = str + 1;</div><div class='del'>-				__prt_tab(out);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case '\r':</div><div class='del'>-			if (likely(cur_tabstop(out))) {</div><div class='del'>-				prt_bytes(out, unprinted_start, str - unprinted_start);</div><div class='del'>-				unprinted_start = str + 1;</div><div class='del'>-				__prt_tab_rjust(out);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		str++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_bytes(out, unprinted_start, str - unprinted_start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_human_readable_u64() - Print out a u64 in human readable units</div><div class='del'>- * @out:	output printbuf</div><div class='del'>- * @v:		integer to print</div><div class='del'>- *</div><div class='del'>- * Units of 2^10 (default) or 10^3 are controlled via @out-&gt;si_units</div><div class='del'>- */</div><div class='del'>-void bch2_prt_human_readable_u64(struct printbuf *out, u64 v)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_make_room(out, 10);</div><div class='del'>-	out-&gt;pos += string_get_size(v, 1, !out-&gt;si_units,</div><div class='del'>-				    out-&gt;buf + out-&gt;pos,</div><div class='del'>-				    printbuf_remaining_size(out));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_human_readable_s64() - Print out a s64 in human readable units</div><div class='del'>- * @out:	output printbuf</div><div class='del'>- * @v:		integer to print</div><div class='del'>- *</div><div class='del'>- * Units of 2^10 (default) or 10^3 are controlled via @out-&gt;si_units</div><div class='del'>- */</div><div class='del'>-void bch2_prt_human_readable_s64(struct printbuf *out, s64 v)</div><div class='del'>-{</div><div class='del'>-	if (v &lt; 0)</div><div class='del'>-		prt_char(out, '-');</div><div class='del'>-	bch2_prt_human_readable_u64(out, abs(v));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_units_u64() - Print out a u64 according to printbuf unit options</div><div class='del'>- * @out:	output printbuf</div><div class='del'>- * @v:		integer to print</div><div class='del'>- *</div><div class='del'>- * Units are either raw (default), or human reabable units (controlled via</div><div class='del'>- * @buf-&gt;human_readable_units)</div><div class='del'>- */</div><div class='del'>-void bch2_prt_units_u64(struct printbuf *out, u64 v)</div><div class='del'>-{</div><div class='del'>-	if (out-&gt;human_readable_units)</div><div class='del'>-		bch2_prt_human_readable_u64(out, v);</div><div class='del'>-	else</div><div class='del'>-		bch2_prt_printf(out, "%llu", v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_prt_units_s64() - Print out a s64 according to printbuf unit options</div><div class='del'>- * @out:	output printbuf</div><div class='del'>- * @v:		integer to print</div><div class='del'>- *</div><div class='del'>- * Units are either raw (default), or human reabable units (controlled via</div><div class='del'>- * @buf-&gt;human_readable_units)</div><div class='del'>- */</div><div class='del'>-void bch2_prt_units_s64(struct printbuf *out, s64 v)</div><div class='del'>-{</div><div class='del'>-	if (v &lt; 0)</div><div class='del'>-		prt_char(out, '-');</div><div class='del'>-	bch2_prt_units_u64(out, abs(v));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_string_option(struct printbuf *out,</div><div class='del'>-			    const char * const list[],</div><div class='del'>-			    size_t selected)</div><div class='del'>-{</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; list[i]; i++)</div><div class='del'>-		bch2_prt_printf(out, i == selected ? "[%s] " : "%s ", list[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_bitflags(struct printbuf *out,</div><div class='del'>-		       const char * const list[], u64 flags)</div><div class='del'>-{</div><div class='del'>-	unsigned bit, nr = 0;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	while (list[nr])</div><div class='del'>-		nr++;</div><div class='del'>-</div><div class='del'>-	while (flags &amp;&amp; (bit = __ffs64(flags)) &lt; nr) {</div><div class='del'>-		if (!first)</div><div class='del'>-			bch2_prt_printf(out, ",");</div><div class='del'>-		first = false;</div><div class='del'>-		bch2_prt_printf(out, "%s", list[bit]);</div><div class='del'>-		flags ^= BIT_ULL(bit);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_bitflags_vector(struct printbuf *out,</div><div class='del'>-			      const char * const list[],</div><div class='del'>-			      unsigned long *v, unsigned nr)</div><div class='del'>-{</div><div class='del'>-	bool first = true;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		if (!list[i]) {</div><div class='del'>-			nr = i - 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(i, v, nr) {</div><div class='del'>-		if (!first)</div><div class='del'>-			bch2_prt_printf(out, ",");</div><div class='del'>-		first = false;</div><div class='del'>-		bch2_prt_printf(out, "%s", list[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/printbuf.h b/fs/bcachefs/printbuf.h<br/>deleted file mode 100644<br/>index 9a4a56c40937..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/printbuf.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/printbuf.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,286 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: LGPL-2.1+ */</div><div class='del'>-/* Copyright (C) 2022 Kent Overstreet */</div><div class='del'>-</div><div class='del'>-#ifndef _BCACHEFS_PRINTBUF_H</div><div class='del'>-#define _BCACHEFS_PRINTBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Printbufs: Simple strings for printing to, with optional heap allocation</div><div class='del'>- *</div><div class='del'>- * This code has provisions for use in userspace, to aid in making other code</div><div class='del'>- * portable between kernelspace and userspace.</div><div class='del'>- *</div><div class='del'>- * Basic example:</div><div class='del'>- *   struct printbuf buf = PRINTBUF;</div><div class='del'>- *</div><div class='del'>- *   prt_printf(&amp;buf, "foo=");</div><div class='del'>- *   foo_to_text(&amp;buf, foo);</div><div class='del'>- *   printk("%s", buf.buf);</div><div class='del'>- *   printbuf_exit(&amp;buf);</div><div class='del'>- *</div><div class='del'>- * Or</div><div class='del'>- *   struct printbuf buf = PRINTBUF_EXTERN(char_buf, char_buf_size)</div><div class='del'>- *</div><div class='del'>- * We can now write pretty printers instead of writing code that dumps</div><div class='del'>- * everything to the kernel log buffer, and then those pretty-printers can be</div><div class='del'>- * used by other code that outputs to kernel log, sysfs, debugfs, etc.</div><div class='del'>- *</div><div class='del'>- * Memory allocation: Outputing to a printbuf may allocate memory. This</div><div class='del'>- * allocation is done with GFP_KERNEL, by default: use the newer</div><div class='del'>- * memalloc_*_(save|restore) functions as needed.</div><div class='del'>- *</div><div class='del'>- * Since no equivalent yet exists for GFP_ATOMIC/GFP_NOWAIT, memory allocations</div><div class='del'>- * will be done with GFP_NOWAIT if printbuf-&gt;atomic is nonzero.</div><div class='del'>- *</div><div class='del'>- * It's allowed to grab the output buffer and free it later with kfree() instead</div><div class='del'>- * of using printbuf_exit(), if the user just needs a heap allocated string at</div><div class='del'>- * the end.</div><div class='del'>- *</div><div class='del'>- * Memory allocation failures: We don't return errors directly, because on</div><div class='del'>- * memory allocation failure we usually don't want to bail out and unwind - we</div><div class='del'>- * want to print what we've got, on a best-effort basis. But code that does want</div><div class='del'>- * to return -ENOMEM may check printbuf.allocation_failure.</div><div class='del'>- *</div><div class='del'>- * Indenting, tabstops:</div><div class='del'>- *</div><div class='del'>- * To aid is writing multi-line pretty printers spread across multiple</div><div class='del'>- * functions, printbufs track the current indent level.</div><div class='del'>- *</div><div class='del'>- * printbuf_indent_push() and printbuf_indent_pop() increase and decrease the current indent</div><div class='del'>- * level, respectively.</div><div class='del'>- *</div><div class='del'>- * To use tabstops, set printbuf-&gt;tabstops[]; they are in units of spaces, from</div><div class='del'>- * start of line. Once set, prt_tab() will output spaces up to the next tabstop.</div><div class='del'>- * prt_tab_rjust() will also advance the current line of text up to the next</div><div class='del'>- * tabstop, but it does so by shifting text since the previous tabstop up to the</div><div class='del'>- * next tabstop - right justifying it.</div><div class='del'>- *</div><div class='del'>- * Make sure you use prt_newline() instead of \n in the format string for indent</div><div class='del'>- * level and tabstops to work corretly.</div><div class='del'>- *</div><div class='del'>- * Output units: printbuf-&gt;units exists to tell pretty-printers how to output</div><div class='del'>- * numbers: a raw value (e.g. directly from a superblock field), as bytes, or as</div><div class='del'>- * human readable bytes. prt_units() obeys it.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-enum printbuf_si {</div><div class='del'>-	PRINTBUF_UNITS_2,	/* use binary powers of 2^10 */</div><div class='del'>-	PRINTBUF_UNITS_10,	/* use powers of 10^3 (standard SI) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PRINTBUF_INLINE_TABSTOPS	6</div><div class='del'>-</div><div class='del'>-struct printbuf {</div><div class='del'>-	char			*buf;</div><div class='del'>-	unsigned		size;</div><div class='del'>-	unsigned		pos;</div><div class='del'>-	unsigned		last_newline;</div><div class='del'>-	unsigned		last_field;</div><div class='del'>-	unsigned		indent;</div><div class='del'>-	/*</div><div class='del'>-	 * If nonzero, allocations will be done with GFP_ATOMIC:</div><div class='del'>-	 */</div><div class='del'>-	u8			atomic;</div><div class='del'>-	bool			allocation_failure:1;</div><div class='del'>-	bool			heap_allocated:1;</div><div class='del'>-	enum printbuf_si	si_units:1;</div><div class='del'>-	bool			human_readable_units:1;</div><div class='del'>-	bool			has_indent_or_tabstops:1;</div><div class='del'>-	bool			suppress_indent_tabstop_handling:1;</div><div class='del'>-	u8			nr_tabstops;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do not modify directly: use printbuf_tabstop_add(),</div><div class='del'>-	 * printbuf_tabstop_get()</div><div class='del'>-	 */</div><div class='del'>-	u8			cur_tabstop;</div><div class='del'>-	u8			_tabstops[PRINTBUF_INLINE_TABSTOPS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_printbuf_make_room(struct printbuf *, unsigned);</div><div class='del'>-__printf(2, 3) void bch2_prt_printf(struct printbuf *out, const char *fmt, ...);</div><div class='del'>-__printf(2, 0) void bch2_prt_vprintf(struct printbuf *out, const char *fmt, va_list);</div><div class='del'>-const char *bch2_printbuf_str(const struct printbuf *);</div><div class='del'>-void bch2_printbuf_exit(struct printbuf *);</div><div class='del'>-</div><div class='del'>-void bch2_printbuf_tabstops_reset(struct printbuf *);</div><div class='del'>-void bch2_printbuf_tabstop_pop(struct printbuf *);</div><div class='del'>-int bch2_printbuf_tabstop_push(struct printbuf *, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_printbuf_indent_add(struct printbuf *, unsigned);</div><div class='del'>-void bch2_printbuf_indent_sub(struct printbuf *, unsigned);</div><div class='del'>-</div><div class='del'>-void bch2_prt_newline(struct printbuf *);</div><div class='del'>-void bch2_prt_tab(struct printbuf *);</div><div class='del'>-void bch2_prt_tab_rjust(struct printbuf *);</div><div class='del'>-</div><div class='del'>-void bch2_prt_bytes_indented(struct printbuf *, const char *, unsigned);</div><div class='del'>-void bch2_prt_human_readable_u64(struct printbuf *, u64);</div><div class='del'>-void bch2_prt_human_readable_s64(struct printbuf *, s64);</div><div class='del'>-void bch2_prt_units_u64(struct printbuf *, u64);</div><div class='del'>-void bch2_prt_units_s64(struct printbuf *, s64);</div><div class='del'>-void bch2_prt_string_option(struct printbuf *, const char * const[], size_t);</div><div class='del'>-void bch2_prt_bitflags(struct printbuf *, const char * const[], u64);</div><div class='del'>-void bch2_prt_bitflags_vector(struct printbuf *, const char * const[],</div><div class='del'>-			      unsigned long *, unsigned);</div><div class='del'>-</div><div class='del'>-/* Initializer for a heap allocated printbuf: */</div><div class='del'>-#define PRINTBUF ((struct printbuf) { .heap_allocated = true })</div><div class='del'>-</div><div class='del'>-/* Initializer a printbuf that points to an external buffer: */</div><div class='del'>-#define PRINTBUF_EXTERN(_buf, _size)			\</div><div class='del'>-((struct printbuf) {					\</div><div class='del'>-	.buf	= _buf,					\</div><div class='del'>-	.size	= _size,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns size remaining of output buffer:</div><div class='del'>- */</div><div class='del'>-static inline unsigned printbuf_remaining_size(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	return out-&gt;pos &lt; out-&gt;size ? out-&gt;size - out-&gt;pos : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns number of characters we can print to the output buffer - i.e.</div><div class='del'>- * excluding the terminating nul:</div><div class='del'>- */</div><div class='del'>-static inline unsigned printbuf_remaining(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	return out-&gt;pos &lt; out-&gt;size ? out-&gt;size - out-&gt;pos - 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned printbuf_written(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	return out-&gt;size ? min(out-&gt;pos, out-&gt;size - 1) : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns true if output was truncated:</div><div class='del'>- */</div><div class='del'>-static inline bool printbuf_overflowed(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	return out-&gt;pos &gt;= out-&gt;size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void printbuf_nul_terminate(struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_make_room(out, 1);</div><div class='del'>-</div><div class='del'>-	if (out-&gt;pos &lt; out-&gt;size)</div><div class='del'>-		out-&gt;buf[out-&gt;pos] = 0;</div><div class='del'>-	else if (out-&gt;size)</div><div class='del'>-		out-&gt;buf[out-&gt;size - 1] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Doesn't call bch2_printbuf_make_room(), doesn't nul terminate: */</div><div class='del'>-static inline void __prt_char_reserved(struct printbuf *out, char c)</div><div class='del'>-{</div><div class='del'>-	if (printbuf_remaining(out))</div><div class='del'>-		out-&gt;buf[out-&gt;pos] = c;</div><div class='del'>-	out-&gt;pos++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Doesn't nul terminate: */</div><div class='del'>-static inline void __prt_char(struct printbuf *out, char c)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_make_room(out, 1);</div><div class='del'>-	__prt_char_reserved(out, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_char(struct printbuf *out, char c)</div><div class='del'>-{</div><div class='del'>-	__prt_char(out, c);</div><div class='del'>-	printbuf_nul_terminate(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __prt_chars_reserved(struct printbuf *out, char c, unsigned n)</div><div class='del'>-{</div><div class='del'>-	unsigned i, can_print = min(n, printbuf_remaining(out));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; can_print; i++)</div><div class='del'>-		out-&gt;buf[out-&gt;pos++] = c;</div><div class='del'>-	out-&gt;pos += n - can_print;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_chars(struct printbuf *out, char c, unsigned n)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_make_room(out, n);</div><div class='del'>-	__prt_chars_reserved(out, c, n);</div><div class='del'>-	printbuf_nul_terminate(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_bytes(struct printbuf *out, const void *b, unsigned n)</div><div class='del'>-{</div><div class='del'>-	unsigned i, can_print;</div><div class='del'>-</div><div class='del'>-	bch2_printbuf_make_room(out, n);</div><div class='del'>-</div><div class='del'>-	can_print = min(n, printbuf_remaining(out));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; can_print; i++)</div><div class='del'>-		out-&gt;buf[out-&gt;pos++] = ((char *) b)[i];</div><div class='del'>-	out-&gt;pos += n - can_print;</div><div class='del'>-</div><div class='del'>-	printbuf_nul_terminate(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_str(struct printbuf *out, const char *str)</div><div class='del'>-{</div><div class='del'>-	prt_bytes(out, str, strlen(str));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_str_indented(struct printbuf *out, const char *str)</div><div class='del'>-{</div><div class='del'>-	bch2_prt_bytes_indented(out, str, strlen(str));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_hex_byte(struct printbuf *out, u8 byte)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_make_room(out, 2);</div><div class='del'>-	__prt_char_reserved(out, hex_asc_hi(byte));</div><div class='del'>-	__prt_char_reserved(out, hex_asc_lo(byte));</div><div class='del'>-	printbuf_nul_terminate(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void prt_hex_byte_upper(struct printbuf *out, u8 byte)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_make_room(out, 2);</div><div class='del'>-	__prt_char_reserved(out, hex_asc_upper_hi(byte));</div><div class='del'>-	__prt_char_reserved(out, hex_asc_upper_lo(byte));</div><div class='del'>-	printbuf_nul_terminate(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * printbuf_reset - re-use a printbuf without freeing and re-initializing it:</div><div class='del'>- */</div><div class='del'>-static inline void printbuf_reset(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	buf-&gt;pos		= 0;</div><div class='del'>-	buf-&gt;allocation_failure	= 0;</div><div class='del'>-	buf-&gt;indent		= 0;</div><div class='del'>-	buf-&gt;nr_tabstops	= 0;</div><div class='del'>-	buf-&gt;cur_tabstop	= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * printbuf_atomic_inc - mark as entering an atomic section</div><div class='del'>- */</div><div class='del'>-static inline void printbuf_atomic_inc(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	buf-&gt;atomic++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * printbuf_atomic_inc - mark as leaving an atomic section</div><div class='del'>- */</div><div class='del'>-static inline void printbuf_atomic_dec(struct printbuf *buf)</div><div class='del'>-{</div><div class='del'>-	buf-&gt;atomic--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_PRINTBUF_H */</div><div class='head'>diff --git a/fs/bcachefs/quota.c b/fs/bcachefs/quota.c<br/>deleted file mode 100644<br/>index e68b34eab90a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/quota.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,969 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-static const char * const bch2_quota_types[] = {</div><div class='del'>-	"user",</div><div class='del'>-	"group",</div><div class='del'>-	"project",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char * const bch2_quota_counters[] = {</div><div class='del'>-	"space",</div><div class='del'>-	"inodes",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_sb_quota_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-				  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_quota *q = field_to_type(f, quota);</div><div class='del'>-</div><div class='del'>-	if (vstruct_bytes(&amp;q-&gt;field) &lt; sizeof(*q)) {</div><div class='del'>-		prt_printf(err, "wrong size (got %zu should be %zu)",</div><div class='del'>-		       vstruct_bytes(&amp;q-&gt;field), sizeof(*q));</div><div class='del'>-		return -BCH_ERR_invalid_sb_quota;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_quota_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				  struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_quota *q = field_to_type(f, quota);</div><div class='del'>-	unsigned qtyp, counter;</div><div class='del'>-</div><div class='del'>-	for (qtyp = 0; qtyp &lt; ARRAY_SIZE(q-&gt;q); qtyp++) {</div><div class='del'>-		prt_printf(out, "%s: flags %llx",</div><div class='del'>-		       bch2_quota_types[qtyp],</div><div class='del'>-		       le64_to_cpu(q-&gt;q[qtyp].flags));</div><div class='del'>-</div><div class='del'>-		for (counter = 0; counter &lt; Q_COUNTERS; counter++)</div><div class='del'>-			prt_printf(out, " %s timelimit %u warnlimit %u",</div><div class='del'>-			       bch2_quota_counters[counter],</div><div class='del'>-			       le32_to_cpu(q-&gt;q[qtyp].c[counter].timelimit),</div><div class='del'>-			       le32_to_cpu(q-&gt;q[qtyp].c[counter].warnlimit));</div><div class='del'>-</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_quota = {</div><div class='del'>-	.validate	= bch2_sb_quota_validate,</div><div class='del'>-	.to_text	= bch2_sb_quota_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_quota_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-		       enum bkey_invalid_flags flags,</div><div class='del'>-		       struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(k.k-&gt;p.inode &gt;= QTYP_NR, c, err,</div><div class='del'>-			 quota_type_invalid,</div><div class='del'>-			 "invalid quota type (%llu &gt;= %u)",</div><div class='del'>-			 k.k-&gt;p.inode, QTYP_NR);</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_quota_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_quota dq = bkey_s_c_to_quota(k);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; Q_COUNTERS; i++)</div><div class='del'>-		prt_printf(out, "%s hardlimit %llu softlimit %llu",</div><div class='del'>-		       bch2_quota_counters[i],</div><div class='del'>-		       le64_to_cpu(dq.v-&gt;c[i].hardlimit),</div><div class='del'>-		       le64_to_cpu(dq.v-&gt;c[i].softlimit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_QUOTA</div><div class='del'>-</div><div class='del'>-#include &lt;linux/cred.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/quota.h&gt;</div><div class='del'>-</div><div class='del'>-static void qc_info_to_text(struct printbuf *out, struct qc_info *i)</div><div class='del'>-{</div><div class='del'>-	printbuf_tabstops_reset(out);</div><div class='del'>-	printbuf_tabstop_push(out, 20);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_fieldmask");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%x", i-&gt;i_fieldmask);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_flags");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_flags);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_spc_timelimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_spc_timelimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_ino_timelimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_ino_timelimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_rt_spc_timelimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_rt_spc_timelimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_spc_warnlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_spc_warnlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_ino_warnlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_ino_warnlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "i_rt_spc_warnlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i-&gt;i_rt_spc_warnlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void qc_dqblk_to_text(struct printbuf *out, struct qc_dqblk *q)</div><div class='del'>-{</div><div class='del'>-	printbuf_tabstops_reset(out);</div><div class='del'>-	printbuf_tabstop_push(out, 20);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_fieldmask");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%x", q-&gt;d_fieldmask);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_spc_hardlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_spc_hardlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_spc_softlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_spc_softlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_ino_hardlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_ino_hardlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_ino_softlimit");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_ino_softlimit);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_space");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_space);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_ino_count");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_ino_count);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_ino_timer");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_ino_timer);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_spc_timer");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", q-&gt;d_spc_timer);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_ino_warns");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%i", q-&gt;d_ino_warns);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "d_spc_warns");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%i", q-&gt;d_spc_warns);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned __next_qtype(unsigned i, unsigned qtypes)</div><div class='del'>-{</div><div class='del'>-	qtypes &gt;&gt;= i;</div><div class='del'>-	return qtypes ? i + __ffs(qtypes) : QTYP_NR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_set_qtype(_c, _i, _q, _qtypes)				\</div><div class='del'>-	for (_i = 0;							\</div><div class='del'>-	     (_i = __next_qtype(_i, _qtypes),				\</div><div class='del'>-	      _q = &amp;(_c)-&gt;quotas[_i],					\</div><div class='del'>-	      _i &lt; QTYP_NR);						\</div><div class='del'>-	     _i++)</div><div class='del'>-</div><div class='del'>-static bool ignore_hardlimit(struct bch_memquota_type *q)</div><div class='del'>-{</div><div class='del'>-	if (capable(CAP_SYS_RESOURCE))</div><div class='del'>-		return true;</div><div class='del'>-#if 0</div><div class='del'>-	struct mem_dqinfo *info = &amp;sb_dqopt(dquot-&gt;dq_sb)-&gt;info[dquot-&gt;dq_id.type];</div><div class='del'>-</div><div class='del'>-	return capable(CAP_SYS_RESOURCE) &amp;&amp;</div><div class='del'>-	       (info-&gt;dqi_format-&gt;qf_fmt_id != QFMT_VFS_OLD ||</div><div class='del'>-		!(info-&gt;dqi_flags &amp; DQF_ROOT_SQUASH));</div><div class='del'>-#endif</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum quota_msg {</div><div class='del'>-	SOFTWARN,	/* Softlimit reached */</div><div class='del'>-	SOFTLONGWARN,	/* Grace time expired */</div><div class='del'>-	HARDWARN,	/* Hardlimit reached */</div><div class='del'>-</div><div class='del'>-	HARDBELOW,	/* Usage got below inode hardlimit */</div><div class='del'>-	SOFTBELOW,	/* Usage got below inode softlimit */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quota_nl[][Q_COUNTERS] = {</div><div class='del'>-	[HARDWARN][Q_SPC]	= QUOTA_NL_BHARDWARN,</div><div class='del'>-	[SOFTLONGWARN][Q_SPC]	= QUOTA_NL_BSOFTLONGWARN,</div><div class='del'>-	[SOFTWARN][Q_SPC]	= QUOTA_NL_BSOFTWARN,</div><div class='del'>-	[HARDBELOW][Q_SPC]	= QUOTA_NL_BHARDBELOW,</div><div class='del'>-	[SOFTBELOW][Q_SPC]	= QUOTA_NL_BSOFTBELOW,</div><div class='del'>-</div><div class='del'>-	[HARDWARN][Q_INO]	= QUOTA_NL_IHARDWARN,</div><div class='del'>-	[SOFTLONGWARN][Q_INO]	= QUOTA_NL_ISOFTLONGWARN,</div><div class='del'>-	[SOFTWARN][Q_INO]	= QUOTA_NL_ISOFTWARN,</div><div class='del'>-	[HARDBELOW][Q_INO]	= QUOTA_NL_IHARDBELOW,</div><div class='del'>-	[SOFTBELOW][Q_INO]	= QUOTA_NL_ISOFTBELOW,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct quota_msgs {</div><div class='del'>-	u8		nr;</div><div class='del'>-	struct {</div><div class='del'>-		u8	qtype;</div><div class='del'>-		u8	msg;</div><div class='del'>-	}		m[QTYP_NR * Q_COUNTERS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void prepare_msg(unsigned qtype,</div><div class='del'>-			enum quota_counters counter,</div><div class='del'>-			struct quota_msgs *msgs,</div><div class='del'>-			enum quota_msg msg_type)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(msgs-&gt;nr &gt;= ARRAY_SIZE(msgs-&gt;m));</div><div class='del'>-</div><div class='del'>-	msgs-&gt;m[msgs-&gt;nr].qtype	= qtype;</div><div class='del'>-	msgs-&gt;m[msgs-&gt;nr].msg	= quota_nl[msg_type][counter];</div><div class='del'>-	msgs-&gt;nr++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void prepare_warning(struct memquota_counter *qc,</div><div class='del'>-			    unsigned qtype,</div><div class='del'>-			    enum quota_counters counter,</div><div class='del'>-			    struct quota_msgs *msgs,</div><div class='del'>-			    enum quota_msg msg_type)</div><div class='del'>-{</div><div class='del'>-	if (qc-&gt;warning_issued &amp; (1 &lt;&lt; msg_type))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prepare_msg(qtype, counter, msgs, msg_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void flush_warnings(struct bch_qid qid,</div><div class='del'>-			   struct super_block *sb,</div><div class='del'>-			   struct quota_msgs *msgs)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; msgs-&gt;nr; i++)</div><div class='del'>-		quota_send_warning(make_kqid(&amp;init_user_ns, msgs-&gt;m[i].qtype, qid.q[i]),</div><div class='del'>-				   sb-&gt;s_dev, msgs-&gt;m[i].msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_quota_check_limit(struct bch_fs *c,</div><div class='del'>-				  unsigned qtype,</div><div class='del'>-				  struct bch_memquota *mq,</div><div class='del'>-				  struct quota_msgs *msgs,</div><div class='del'>-				  enum quota_counters counter,</div><div class='del'>-				  s64 v,</div><div class='del'>-				  enum quota_acct_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct bch_memquota_type *q = &amp;c-&gt;quotas[qtype];</div><div class='del'>-	struct memquota_counter *qc = &amp;mq-&gt;c[counter];</div><div class='del'>-	u64 n = qc-&gt;v + v;</div><div class='del'>-</div><div class='del'>-	BUG_ON((s64) n &lt; 0);</div><div class='del'>-</div><div class='del'>-	if (mode == KEY_TYPE_QUOTA_NOCHECK)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (v &lt;= 0) {</div><div class='del'>-		if (n &lt; qc-&gt;hardlimit &amp;&amp;</div><div class='del'>-		    (qc-&gt;warning_issued &amp; (1 &lt;&lt; HARDWARN))) {</div><div class='del'>-			qc-&gt;warning_issued &amp;= ~(1 &lt;&lt; HARDWARN);</div><div class='del'>-			prepare_msg(qtype, counter, msgs, HARDBELOW);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (n &lt; qc-&gt;softlimit &amp;&amp;</div><div class='del'>-		    (qc-&gt;warning_issued &amp; (1 &lt;&lt; SOFTWARN))) {</div><div class='del'>-			qc-&gt;warning_issued &amp;= ~(1 &lt;&lt; SOFTWARN);</div><div class='del'>-			prepare_msg(qtype, counter, msgs, SOFTBELOW);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		qc-&gt;warning_issued = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (qc-&gt;hardlimit &amp;&amp;</div><div class='del'>-	    qc-&gt;hardlimit &lt; n &amp;&amp;</div><div class='del'>-	    !ignore_hardlimit(q)) {</div><div class='del'>-		prepare_warning(qc, qtype, counter, msgs, HARDWARN);</div><div class='del'>-		return -EDQUOT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (qc-&gt;softlimit &amp;&amp;</div><div class='del'>-	    qc-&gt;softlimit &lt; n) {</div><div class='del'>-		if (qc-&gt;timer == 0) {</div><div class='del'>-			qc-&gt;timer = ktime_get_real_seconds() + q-&gt;limits[counter].timelimit;</div><div class='del'>-			prepare_warning(qc, qtype, counter, msgs, SOFTWARN);</div><div class='del'>-		} else if (ktime_get_real_seconds() &gt;= qc-&gt;timer &amp;&amp;</div><div class='del'>-			   !ignore_hardlimit(q)) {</div><div class='del'>-			prepare_warning(qc, qtype, counter, msgs, SOFTLONGWARN);</div><div class='del'>-			return -EDQUOT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_quota_acct(struct bch_fs *c, struct bch_qid qid,</div><div class='del'>-		    enum quota_counters counter, s64 v,</div><div class='del'>-		    enum quota_acct_mode mode)</div><div class='del'>-{</div><div class='del'>-	unsigned qtypes = enabled_qtypes(c);</div><div class='del'>-	struct bch_memquota_type *q;</div><div class='del'>-	struct bch_memquota *mq[QTYP_NR];</div><div class='del'>-	struct quota_msgs msgs;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	memset(&amp;msgs, 0, sizeof(msgs));</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes) {</div><div class='del'>-		mq[i] = genradix_ptr_alloc(&amp;q-&gt;table, qid.q[i], GFP_KERNEL);</div><div class='del'>-		if (!mq[i])</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes)</div><div class='del'>-		mutex_lock_nested(&amp;q-&gt;lock, i);</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes) {</div><div class='del'>-		ret = bch2_quota_check_limit(c, i, mq[i], &amp;msgs, counter, v, mode);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes)</div><div class='del'>-		mq[i]-&gt;c[counter].v += v;</div><div class='del'>-err:</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes)</div><div class='del'>-		mutex_unlock(&amp;q-&gt;lock);</div><div class='del'>-</div><div class='del'>-	flush_warnings(qid, c-&gt;vfs_sb, &amp;msgs);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_quota_transfer(struct bch_memquota *src_q,</div><div class='del'>-				  struct bch_memquota *dst_q,</div><div class='del'>-				  enum quota_counters counter, s64 v)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(v &gt; src_q-&gt;c[counter].v);</div><div class='del'>-	BUG_ON(v + dst_q-&gt;c[counter].v &lt; v);</div><div class='del'>-</div><div class='del'>-	src_q-&gt;c[counter].v -= v;</div><div class='del'>-	dst_q-&gt;c[counter].v += v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_quota_transfer(struct bch_fs *c, unsigned qtypes,</div><div class='del'>-			struct bch_qid dst,</div><div class='del'>-			struct bch_qid src, u64 space,</div><div class='del'>-			enum quota_acct_mode mode)</div><div class='del'>-{</div><div class='del'>-	struct bch_memquota_type *q;</div><div class='del'>-	struct bch_memquota *src_q[3], *dst_q[3];</div><div class='del'>-	struct quota_msgs msgs;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	qtypes &amp;= enabled_qtypes(c);</div><div class='del'>-</div><div class='del'>-	memset(&amp;msgs, 0, sizeof(msgs));</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes) {</div><div class='del'>-		src_q[i] = genradix_ptr_alloc(&amp;q-&gt;table, src.q[i], GFP_KERNEL);</div><div class='del'>-		dst_q[i] = genradix_ptr_alloc(&amp;q-&gt;table, dst.q[i], GFP_KERNEL);</div><div class='del'>-		if (!src_q[i] || !dst_q[i])</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes)</div><div class='del'>-		mutex_lock_nested(&amp;q-&gt;lock, i);</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes) {</div><div class='del'>-		ret = bch2_quota_check_limit(c, i, dst_q[i], &amp;msgs, Q_SPC,</div><div class='del'>-					     dst_q[i]-&gt;c[Q_SPC].v + space,</div><div class='del'>-					     mode);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		ret = bch2_quota_check_limit(c, i, dst_q[i], &amp;msgs, Q_INO,</div><div class='del'>-					     dst_q[i]-&gt;c[Q_INO].v + 1,</div><div class='del'>-					     mode);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes) {</div><div class='del'>-		__bch2_quota_transfer(src_q[i], dst_q[i], Q_SPC, space);</div><div class='del'>-		__bch2_quota_transfer(src_q[i], dst_q[i], Q_INO, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	for_each_set_qtype(c, i, q, qtypes)</div><div class='del'>-		mutex_unlock(&amp;q-&gt;lock);</div><div class='del'>-</div><div class='del'>-	flush_warnings(dst, c-&gt;vfs_sb, &amp;msgs);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_quota_set(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			    struct qc_dqblk *qdq)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_quota dq;</div><div class='del'>-	struct bch_memquota_type *q;</div><div class='del'>-	struct bch_memquota *mq;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(k.k-&gt;p.inode &gt;= QTYP_NR);</div><div class='del'>-</div><div class='del'>-	if (!((1U &lt;&lt; k.k-&gt;p.inode) &amp; enabled_qtypes(c)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_quota:</div><div class='del'>-		dq = bkey_s_c_to_quota(k);</div><div class='del'>-		q = &amp;c-&gt;quotas[k.k-&gt;p.inode];</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;q-&gt;lock);</div><div class='del'>-		mq = genradix_ptr_alloc(&amp;q-&gt;table, k.k-&gt;p.offset, GFP_KERNEL);</div><div class='del'>-		if (!mq) {</div><div class='del'>-			mutex_unlock(&amp;q-&gt;lock);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; Q_COUNTERS; i++) {</div><div class='del'>-			mq-&gt;c[i].hardlimit = le64_to_cpu(dq.v-&gt;c[i].hardlimit);</div><div class='del'>-			mq-&gt;c[i].softlimit = le64_to_cpu(dq.v-&gt;c[i].softlimit);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (qdq &amp;&amp; qdq-&gt;d_fieldmask &amp; QC_SPC_TIMER)</div><div class='del'>-			mq-&gt;c[Q_SPC].timer	= qdq-&gt;d_spc_timer;</div><div class='del'>-		if (qdq &amp;&amp; qdq-&gt;d_fieldmask &amp; QC_SPC_WARNS)</div><div class='del'>-			mq-&gt;c[Q_SPC].warns	= qdq-&gt;d_spc_warns;</div><div class='del'>-		if (qdq &amp;&amp; qdq-&gt;d_fieldmask &amp; QC_INO_TIMER)</div><div class='del'>-			mq-&gt;c[Q_INO].timer	= qdq-&gt;d_ino_timer;</div><div class='del'>-		if (qdq &amp;&amp; qdq-&gt;d_fieldmask &amp; QC_INO_WARNS)</div><div class='del'>-			mq-&gt;c[Q_INO].warns	= qdq-&gt;d_ino_warns;</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;q-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_quota_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;quotas); i++)</div><div class='del'>-		genradix_free(&amp;c-&gt;quotas[i].table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_quota_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;quotas); i++)</div><div class='del'>-		mutex_init(&amp;c-&gt;quotas[i].lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_sb_field_quota *bch2_sb_get_or_create_quota(struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_quota *sb_quota = bch2_sb_field_get(sb-&gt;sb, quota);</div><div class='del'>-</div><div class='del'>-	if (sb_quota)</div><div class='del'>-		return sb_quota;</div><div class='del'>-</div><div class='del'>-	sb_quota = bch2_sb_field_resize(sb, quota, sizeof(*sb_quota) / sizeof(u64));</div><div class='del'>-	if (sb_quota) {</div><div class='del'>-		unsigned qtype, qc;</div><div class='del'>-</div><div class='del'>-		for (qtype = 0; qtype &lt; QTYP_NR; qtype++)</div><div class='del'>-			for (qc = 0; qc &lt; Q_COUNTERS; qc++)</div><div class='del'>-				sb_quota-&gt;q[qtype].c[qc].timelimit =</div><div class='del'>-					cpu_to_le32(7 * 24 * 60 * 60);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sb_quota;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_quota_read(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_quota *sb_quota;</div><div class='del'>-	unsigned i, j;</div><div class='del'>-</div><div class='del'>-	sb_quota = bch2_sb_field_get(c-&gt;disk_sb.sb, quota);</div><div class='del'>-	if (!sb_quota)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; QTYP_NR; i++) {</div><div class='del'>-		struct bch_memquota_type *q = &amp;c-&gt;quotas[i];</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; Q_COUNTERS; j++) {</div><div class='del'>-			q-&gt;limits[j].timelimit =</div><div class='del'>-				le32_to_cpu(sb_quota-&gt;q[i].c[j].timelimit);</div><div class='del'>-			q-&gt;limits[j].warnlimit =</div><div class='del'>-				le32_to_cpu(sb_quota-&gt;q[i].c[j].warnlimit);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fs_quota_read_inode(struct btree_trans *trans,</div><div class='del'>-				    struct btree_iter *iter,</div><div class='del'>-				    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_inode_unpacked u;</div><div class='del'>-	struct bch_snapshot_tree s_t;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_snapshot_tree_lookup(trans,</div><div class='del'>-			bch2_snapshot_tree(c, k.k-&gt;p.snapshot), &amp;s_t);</div><div class='del'>-	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-			"%s: snapshot tree %u not found", __func__,</div><div class='del'>-			snapshot_t(c, k.k-&gt;p.snapshot)-&gt;tree);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!s_t.master_subvol)</div><div class='del'>-		goto advance;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_find_by_inum_nowarn_trans(trans,</div><div class='del'>-				(subvol_inum) {</div><div class='del'>-					le32_to_cpu(s_t.master_subvol),</div><div class='del'>-					k.k-&gt;p.offset,</div><div class='del'>-				}, &amp;u);</div><div class='del'>-	/*</div><div class='del'>-	 * Inode might be deleted in this snapshot - the easiest way to handle</div><div class='del'>-	 * that is to just skip it here:</div><div class='del'>-	 */</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		goto advance;</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_quota_acct(c, bch_qid(&amp;u), Q_SPC, u.bi_sectors,</div><div class='del'>-			KEY_TYPE_QUOTA_NOCHECK);</div><div class='del'>-	bch2_quota_acct(c, bch_qid(&amp;u), Q_INO, 1,</div><div class='del'>-			KEY_TYPE_QUOTA_NOCHECK);</div><div class='del'>-advance:</div><div class='del'>-	bch2_btree_iter_set_pos(iter, bpos_nosnap_successor(iter-&gt;pos));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_quota_read(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	struct bch_sb_field_quota *sb_quota = bch2_sb_get_or_create_quota(&amp;c-&gt;disk_sb);</div><div class='del'>-	if (!sb_quota) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		return -BCH_ERR_ENOSPC_sb_quota;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_sb_quota_read(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_quotas, POS_MIN,</div><div class='del'>-				   BTREE_ITER_PREFETCH, k,</div><div class='del'>-			__bch2_quota_set(c, k, NULL)) ?:</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_inodes, POS_MIN,</div><div class='del'>-				   BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-			bch2_fs_quota_read_inode(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Enable/disable/delete quotas for an entire filesystem: */</div><div class='del'>-</div><div class='del'>-static int bch2_quota_enable(struct super_block	*sb, unsigned uflags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_sb_field_quota *sb_quota;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_flags &amp; SB_RDONLY)</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	/* Accounting must be enabled at mount time: */</div><div class='del'>-	if (uflags &amp; (FS_QUOTA_UDQ_ACCT|FS_QUOTA_GDQ_ACCT|FS_QUOTA_PDQ_ACCT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Can't enable enforcement without accounting: */</div><div class='del'>-	if ((uflags &amp; FS_QUOTA_UDQ_ENFD) &amp;&amp; !c-&gt;opts.usrquota)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((uflags &amp; FS_QUOTA_GDQ_ENFD) &amp;&amp; !c-&gt;opts.grpquota)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_QUOTA_PDQ_ENFD &amp;&amp; !c-&gt;opts.prjquota)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	sb_quota = bch2_sb_get_or_create_quota(&amp;c-&gt;disk_sb);</div><div class='del'>-	if (!sb_quota) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_sb_quota;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_QUOTA_UDQ_ENFD)</div><div class='del'>-		SET_BCH_SB_USRQUOTA(c-&gt;disk_sb.sb, true);</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_QUOTA_GDQ_ENFD)</div><div class='del'>-		SET_BCH_SB_GRPQUOTA(c-&gt;disk_sb.sb, true);</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_QUOTA_PDQ_ENFD)</div><div class='del'>-		SET_BCH_SB_PRJQUOTA(c-&gt;disk_sb.sb, true);</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_quota_disable(struct super_block *sb, unsigned uflags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_flags &amp; SB_RDONLY)</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	if (uflags &amp; FS_QUOTA_UDQ_ENFD)</div><div class='del'>-		SET_BCH_SB_USRQUOTA(c-&gt;disk_sb.sb, false);</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_QUOTA_GDQ_ENFD)</div><div class='del'>-		SET_BCH_SB_GRPQUOTA(c-&gt;disk_sb.sb, false);</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_QUOTA_PDQ_ENFD)</div><div class='del'>-		SET_BCH_SB_PRJQUOTA(c-&gt;disk_sb.sb, false);</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_quota_remove(struct super_block *sb, unsigned uflags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_flags &amp; SB_RDONLY)</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_USER_QUOTA) {</div><div class='del'>-		if (c-&gt;opts.usrquota)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_delete_range(c, BTREE_ID_quotas,</div><div class='del'>-					      POS(QTYP_USR, 0),</div><div class='del'>-					      POS(QTYP_USR, U64_MAX),</div><div class='del'>-					      0, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_GROUP_QUOTA) {</div><div class='del'>-		if (c-&gt;opts.grpquota)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_delete_range(c, BTREE_ID_quotas,</div><div class='del'>-					      POS(QTYP_GRP, 0),</div><div class='del'>-					      POS(QTYP_GRP, U64_MAX),</div><div class='del'>-					      0, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uflags &amp; FS_PROJ_QUOTA) {</div><div class='del'>-		if (c-&gt;opts.prjquota)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_delete_range(c, BTREE_ID_quotas,</div><div class='del'>-					      POS(QTYP_PRJ, 0),</div><div class='del'>-					      POS(QTYP_PRJ, U64_MAX),</div><div class='del'>-					      0, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return quota status information, such as enforcements, quota file inode</div><div class='del'>- * numbers etc.</div><div class='del'>- */</div><div class='del'>-static int bch2_quota_get_state(struct super_block *sb, struct qc_state *state)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	unsigned qtypes = enabled_qtypes(c);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	memset(state, 0, sizeof(*state));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; QTYP_NR; i++) {</div><div class='del'>-		state-&gt;s_state[i].flags |= QCI_SYSFILE;</div><div class='del'>-</div><div class='del'>-		if (!(qtypes &amp; (1 &lt;&lt; i)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		state-&gt;s_state[i].flags |= QCI_ACCT_ENABLED;</div><div class='del'>-</div><div class='del'>-		state-&gt;s_state[i].spc_timelimit = c-&gt;quotas[i].limits[Q_SPC].timelimit;</div><div class='del'>-		state-&gt;s_state[i].spc_warnlimit = c-&gt;quotas[i].limits[Q_SPC].warnlimit;</div><div class='del'>-</div><div class='del'>-		state-&gt;s_state[i].ino_timelimit = c-&gt;quotas[i].limits[Q_INO].timelimit;</div><div class='del'>-		state-&gt;s_state[i].ino_warnlimit = c-&gt;quotas[i].limits[Q_INO].warnlimit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Adjust quota timers &amp; warnings</div><div class='del'>- */</div><div class='del'>-static int bch2_quota_set_info(struct super_block *sb, int type,</div><div class='del'>-			       struct qc_info *info)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_sb_field_quota *sb_quota;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (0) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		qc_info_to_text(&amp;buf, info);</div><div class='del'>-		pr_info("setting:\n%s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_flags &amp; SB_RDONLY)</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	if (type &gt;= QTYP_NR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!((1 &lt;&lt; type) &amp; enabled_qtypes(c)))</div><div class='del'>-		return -ESRCH;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;i_fieldmask &amp;</div><div class='del'>-	    ~(QC_SPC_TIMER|QC_INO_TIMER|QC_SPC_WARNS|QC_INO_WARNS))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	sb_quota = bch2_sb_get_or_create_quota(&amp;c-&gt;disk_sb);</div><div class='del'>-	if (!sb_quota) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_sb_quota;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;i_fieldmask &amp; QC_SPC_TIMER)</div><div class='del'>-		sb_quota-&gt;q[type].c[Q_SPC].timelimit =</div><div class='del'>-			cpu_to_le32(info-&gt;i_spc_timelimit);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;i_fieldmask &amp; QC_SPC_WARNS)</div><div class='del'>-		sb_quota-&gt;q[type].c[Q_SPC].warnlimit =</div><div class='del'>-			cpu_to_le32(info-&gt;i_spc_warnlimit);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;i_fieldmask &amp; QC_INO_TIMER)</div><div class='del'>-		sb_quota-&gt;q[type].c[Q_INO].timelimit =</div><div class='del'>-			cpu_to_le32(info-&gt;i_ino_timelimit);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;i_fieldmask &amp; QC_INO_WARNS)</div><div class='del'>-		sb_quota-&gt;q[type].c[Q_INO].warnlimit =</div><div class='del'>-			cpu_to_le32(info-&gt;i_ino_warnlimit);</div><div class='del'>-</div><div class='del'>-	bch2_sb_quota_read(c);</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get/set individual quotas: */</div><div class='del'>-</div><div class='del'>-static void __bch2_quota_get(struct qc_dqblk *dst, struct bch_memquota *src)</div><div class='del'>-{</div><div class='del'>-	dst-&gt;d_space		= src-&gt;c[Q_SPC].v &lt;&lt; 9;</div><div class='del'>-	dst-&gt;d_spc_hardlimit	= src-&gt;c[Q_SPC].hardlimit &lt;&lt; 9;</div><div class='del'>-	dst-&gt;d_spc_softlimit	= src-&gt;c[Q_SPC].softlimit &lt;&lt; 9;</div><div class='del'>-	dst-&gt;d_spc_timer	= src-&gt;c[Q_SPC].timer;</div><div class='del'>-	dst-&gt;d_spc_warns	= src-&gt;c[Q_SPC].warns;</div><div class='del'>-</div><div class='del'>-	dst-&gt;d_ino_count	= src-&gt;c[Q_INO].v;</div><div class='del'>-	dst-&gt;d_ino_hardlimit	= src-&gt;c[Q_INO].hardlimit;</div><div class='del'>-	dst-&gt;d_ino_softlimit	= src-&gt;c[Q_INO].softlimit;</div><div class='del'>-	dst-&gt;d_ino_timer	= src-&gt;c[Q_INO].timer;</div><div class='del'>-	dst-&gt;d_ino_warns	= src-&gt;c[Q_INO].warns;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_get_quota(struct super_block *sb, struct kqid kqid,</div><div class='del'>-			  struct qc_dqblk *qdq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c		= sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_memquota_type *q	= &amp;c-&gt;quotas[kqid.type];</div><div class='del'>-	qid_t qid			= from_kqid(&amp;init_user_ns, kqid);</div><div class='del'>-	struct bch_memquota *mq;</div><div class='del'>-</div><div class='del'>-	memset(qdq, 0, sizeof(*qdq));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;q-&gt;lock);</div><div class='del'>-	mq = genradix_ptr(&amp;q-&gt;table, qid);</div><div class='del'>-	if (mq)</div><div class='del'>-		__bch2_quota_get(qdq, mq);</div><div class='del'>-	mutex_unlock(&amp;q-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_get_next_quota(struct super_block *sb, struct kqid *kqid,</div><div class='del'>-			       struct qc_dqblk *qdq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c		= sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_memquota_type *q	= &amp;c-&gt;quotas[kqid-&gt;type];</div><div class='del'>-	qid_t qid			= from_kqid(&amp;init_user_ns, *kqid);</div><div class='del'>-	struct genradix_iter iter;</div><div class='del'>-	struct bch_memquota *mq;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;q-&gt;lock);</div><div class='del'>-</div><div class='del'>-	genradix_for_each_from(&amp;q-&gt;table, iter, mq, qid)</div><div class='del'>-		if (memcmp(mq, page_address(ZERO_PAGE(0)), sizeof(*mq))) {</div><div class='del'>-			__bch2_quota_get(qdq, mq);</div><div class='del'>-			*kqid = make_kqid(current_user_ns(), kqid-&gt;type, iter.pos);</div><div class='del'>-			goto found;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	ret = -ENOENT;</div><div class='del'>-found:</div><div class='del'>-	mutex_unlock(&amp;q-&gt;lock);</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_set_quota_trans(struct btree_trans *trans,</div><div class='del'>-				struct bkey_i_quota *new_quota,</div><div class='del'>-				struct qc_dqblk *qdq)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_quotas, new_quota-&gt;k.p,</div><div class='del'>-			       BTREE_ITER_SLOTS|BTREE_ITER_INTENT);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type == KEY_TYPE_quota)</div><div class='del'>-		new_quota-&gt;v = *bkey_s_c_to_quota(k).v;</div><div class='del'>-</div><div class='del'>-	if (qdq-&gt;d_fieldmask &amp; QC_SPC_SOFT)</div><div class='del'>-		new_quota-&gt;v.c[Q_SPC].softlimit = cpu_to_le64(qdq-&gt;d_spc_softlimit &gt;&gt; 9);</div><div class='del'>-	if (qdq-&gt;d_fieldmask &amp; QC_SPC_HARD)</div><div class='del'>-		new_quota-&gt;v.c[Q_SPC].hardlimit = cpu_to_le64(qdq-&gt;d_spc_hardlimit &gt;&gt; 9);</div><div class='del'>-</div><div class='del'>-	if (qdq-&gt;d_fieldmask &amp; QC_INO_SOFT)</div><div class='del'>-		new_quota-&gt;v.c[Q_INO].softlimit = cpu_to_le64(qdq-&gt;d_ino_softlimit);</div><div class='del'>-	if (qdq-&gt;d_fieldmask &amp; QC_INO_HARD)</div><div class='del'>-		new_quota-&gt;v.c[Q_INO].hardlimit = cpu_to_le64(qdq-&gt;d_ino_hardlimit);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;new_quota-&gt;k_i, 0);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_set_quota(struct super_block *sb, struct kqid qid,</div><div class='del'>-			  struct qc_dqblk *qdq)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = sb-&gt;s_fs_info;</div><div class='del'>-	struct bkey_i_quota new_quota;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (0) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		qc_dqblk_to_text(&amp;buf, qdq);</div><div class='del'>-		pr_info("setting:\n%s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_flags &amp; SB_RDONLY)</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	bkey_quota_init(&amp;new_quota.k_i);</div><div class='del'>-	new_quota.k.p = POS(qid.type, from_kqid(&amp;init_user_ns, qid));</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-			    bch2_set_quota_trans(trans, &amp;new_quota, qdq)) ?:</div><div class='del'>-		__bch2_quota_set(c, bkey_i_to_s_c(&amp;new_quota.k_i), qdq);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct quotactl_ops bch2_quotactl_operations = {</div><div class='del'>-	.quota_enable		= bch2_quota_enable,</div><div class='del'>-	.quota_disable		= bch2_quota_disable,</div><div class='del'>-	.rm_xquota		= bch2_quota_remove,</div><div class='del'>-</div><div class='del'>-	.get_state		= bch2_quota_get_state,</div><div class='del'>-	.set_info		= bch2_quota_set_info,</div><div class='del'>-</div><div class='del'>-	.get_dqblk		= bch2_get_quota,</div><div class='del'>-	.get_nextdqblk		= bch2_get_next_quota,</div><div class='del'>-	.set_dqblk		= bch2_set_quota,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BCACHEFS_QUOTA */</div><div class='head'>diff --git a/fs/bcachefs/quota.h b/fs/bcachefs/quota.h<br/>deleted file mode 100644<br/>index 884f601f41c4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/quota.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_QUOTA_H</div><div class='del'>-#define _BCACHEFS_QUOTA_H</div><div class='del'>-</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "quota_types.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_quota;</div><div class='del'>-</div><div class='del'>-int bch2_quota_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-		       enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_quota_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_quota ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_quota_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_quota_to_text,		\</div><div class='del'>-	.min_val_size	= 32,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline struct bch_qid bch_qid(struct bch_inode_unpacked *u)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_qid) {</div><div class='del'>-		.q[QTYP_USR] = u-&gt;bi_uid,</div><div class='del'>-		.q[QTYP_GRP] = u-&gt;bi_gid,</div><div class='del'>-		.q[QTYP_PRJ] = u-&gt;bi_project ? u-&gt;bi_project - 1 : 0,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned enabled_qtypes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return ((c-&gt;opts.usrquota &lt;&lt; QTYP_USR)|</div><div class='del'>-		(c-&gt;opts.grpquota &lt;&lt; QTYP_GRP)|</div><div class='del'>-		(c-&gt;opts.prjquota &lt;&lt; QTYP_PRJ));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_QUOTA</div><div class='del'>-</div><div class='del'>-int bch2_quota_acct(struct bch_fs *, struct bch_qid, enum quota_counters,</div><div class='del'>-		    s64, enum quota_acct_mode);</div><div class='del'>-</div><div class='del'>-int bch2_quota_transfer(struct bch_fs *, unsigned, struct bch_qid,</div><div class='del'>-			struct bch_qid, u64, enum quota_acct_mode);</div><div class='del'>-</div><div class='del'>-void bch2_fs_quota_exit(struct bch_fs *);</div><div class='del'>-void bch2_fs_quota_init(struct bch_fs *);</div><div class='del'>-int bch2_fs_quota_read(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-extern const struct quotactl_ops bch2_quotactl_operations;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int bch2_quota_acct(struct bch_fs *c, struct bch_qid qid,</div><div class='del'>-				  enum quota_counters counter, s64 v,</div><div class='del'>-				  enum quota_acct_mode mode)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_quota_transfer(struct bch_fs *c, unsigned qtypes,</div><div class='del'>-				      struct bch_qid dst,</div><div class='del'>-				      struct bch_qid src, u64 space,</div><div class='del'>-				      enum quota_acct_mode mode)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_fs_quota_exit(struct bch_fs *c) {}</div><div class='del'>-static inline void bch2_fs_quota_init(struct bch_fs *c) {}</div><div class='del'>-static inline int bch2_fs_quota_read(struct bch_fs *c) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_QUOTA_H */</div><div class='head'>diff --git a/fs/bcachefs/quota_format.h b/fs/bcachefs/quota_format.h<br/>deleted file mode 100644<br/>index dc34347ef6c7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/quota_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_QUOTA_FORMAT_H</div><div class='del'>-#define _BCACHEFS_QUOTA_FORMAT_H</div><div class='del'>-</div><div class='del'>-/* KEY_TYPE_quota: */</div><div class='del'>-</div><div class='del'>-enum quota_types {</div><div class='del'>-	QTYP_USR		= 0,</div><div class='del'>-	QTYP_GRP		= 1,</div><div class='del'>-	QTYP_PRJ		= 2,</div><div class='del'>-	QTYP_NR			= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum quota_counters {</div><div class='del'>-	Q_SPC			= 0,</div><div class='del'>-	Q_INO			= 1,</div><div class='del'>-	Q_COUNTERS		= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_quota_counter {</div><div class='del'>-	__le64			hardlimit;</div><div class='del'>-	__le64			softlimit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_quota {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	struct bch_quota_counter c[Q_COUNTERS];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_quota: */</div><div class='del'>-</div><div class='del'>-struct bch_sb_quota_counter {</div><div class='del'>-	__le32				timelimit;</div><div class='del'>-	__le32				warnlimit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_quota_type {</div><div class='del'>-	__le64				flags;</div><div class='del'>-	struct bch_sb_quota_counter	c[Q_COUNTERS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_quota {</div><div class='del'>-	struct bch_sb_field		field;</div><div class='del'>-	struct bch_sb_quota_type	q[QTYP_NR];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_QUOTA_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/quota_types.h b/fs/bcachefs/quota_types.h<br/>deleted file mode 100644<br/>index 6a136083d389..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/quota_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/quota_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_QUOTA_TYPES_H</div><div class='del'>-#define _BCACHEFS_QUOTA_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/generic-radix-tree.h&gt;</div><div class='del'>-</div><div class='del'>-struct bch_qid {</div><div class='del'>-	u32		q[QTYP_NR];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum quota_acct_mode {</div><div class='del'>-	KEY_TYPE_QUOTA_PREALLOC,</div><div class='del'>-	KEY_TYPE_QUOTA_WARN,</div><div class='del'>-	KEY_TYPE_QUOTA_NOCHECK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct memquota_counter {</div><div class='del'>-	u64				v;</div><div class='del'>-	u64				hardlimit;</div><div class='del'>-	u64				softlimit;</div><div class='del'>-	s64				timer;</div><div class='del'>-	int				warns;</div><div class='del'>-	int				warning_issued;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_memquota {</div><div class='del'>-	struct memquota_counter		c[Q_COUNTERS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef GENRADIX(struct bch_memquota)	bch_memquota_table;</div><div class='del'>-</div><div class='del'>-struct quota_limit {</div><div class='del'>-	u32				timelimit;</div><div class='del'>-	u32				warnlimit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_memquota_type {</div><div class='del'>-	struct quota_limit		limits[Q_COUNTERS];</div><div class='del'>-	bch_memquota_table		table;</div><div class='del'>-	struct mutex			lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_QUOTA_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/rebalance.c b/fs/bcachefs/rebalance.c<br/>deleted file mode 100644<br/>index 22d1017aa49b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/rebalance.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/rebalance.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,483 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/sched/cputime.h&gt;</div><div class='del'>-</div><div class='del'>-#define REBALANCE_WORK_SCAN_OFFSET	(U64_MAX - 1)</div><div class='del'>-</div><div class='del'>-static const char * const bch2_rebalance_state_strs[] = {</div><div class='del'>-#define x(t) #t,</div><div class='del'>-	BCH_REBALANCE_STATES()</div><div class='del'>-	NULL</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __bch2_set_rebalance_needs_scan(struct btree_trans *trans, u64 inum)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i_cookie *cookie;</div><div class='del'>-	u64 v;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_rebalance_work,</div><div class='del'>-			     SPOS(inum, REBALANCE_WORK_SCAN_OFFSET, U32_MAX),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	v = k.k-&gt;type == KEY_TYPE_cookie</div><div class='del'>-		? le64_to_cpu(bkey_s_c_to_cookie(k).v-&gt;cookie)</div><div class='del'>-		: 0;</div><div class='del'>-</div><div class='del'>-	cookie = bch2_trans_kmalloc(trans, sizeof(*cookie));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(cookie);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;cookie-&gt;k_i);</div><div class='del'>-	cookie-&gt;k.p = iter.pos;</div><div class='del'>-	cookie-&gt;v.cookie = cpu_to_le64(v + 1);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, &amp;cookie-&gt;k_i, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_set_rebalance_needs_scan(struct bch_fs *c, u64 inum)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_do(c, NULL, NULL, BCH_TRANS_COMMIT_no_enospc|BCH_TRANS_COMMIT_lazy_rw,</div><div class='del'>-			    __bch2_set_rebalance_needs_scan(trans, inum));</div><div class='del'>-	rebalance_wakeup(c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_set_fs_needs_rebalance(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return bch2_set_rebalance_needs_scan(c, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_clear_rebalance_needs_scan(struct btree_trans *trans, u64 inum, u64 cookie)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u64 v;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_rebalance_work,</div><div class='del'>-			     SPOS(inum, REBALANCE_WORK_SCAN_OFFSET, U32_MAX),</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	v = k.k-&gt;type == KEY_TYPE_cookie</div><div class='del'>-		? le64_to_cpu(bkey_s_c_to_cookie(k).v-&gt;cookie)</div><div class='del'>-		: 0;</div><div class='del'>-</div><div class='del'>-	if (v == cookie)</div><div class='del'>-		ret = bch2_btree_delete_at(trans, &amp;iter, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c next_rebalance_entry(struct btree_trans *trans,</div><div class='del'>-					    struct btree_iter *work_iter)</div><div class='del'>-{</div><div class='del'>-	return !kthread_should_stop()</div><div class='del'>-		? bch2_btree_iter_peek(work_iter)</div><div class='del'>-		: bkey_s_c_null;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_bkey_clear_needs_rebalance(struct btree_trans *trans,</div><div class='del'>-					   struct btree_iter *iter,</div><div class='del'>-					   struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *n = bch2_bkey_make_mut(trans, iter, &amp;k, 0);</div><div class='del'>-	int ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	extent_entry_drop(bkey_i_to_s(n),</div><div class='del'>-			  (void *) bch2_bkey_rebalance_opts(bkey_i_to_s_c(n)));</div><div class='del'>-	return bch2_trans_commit(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c next_rebalance_extent(struct btree_trans *trans,</div><div class='del'>-			struct bpos work_pos,</div><div class='del'>-			struct btree_iter *extent_iter,</div><div class='del'>-			struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, extent_iter);</div><div class='del'>-	bch2_trans_iter_init(trans, extent_iter,</div><div class='del'>-			     work_pos.inode ? BTREE_ID_extents : BTREE_ID_reflink,</div><div class='del'>-			     work_pos,</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(extent_iter);</div><div class='del'>-	if (bkey_err(k))</div><div class='del'>-		return k;</div><div class='del'>-</div><div class='del'>-	const struct bch_extent_rebalance *r = k.k ? bch2_bkey_rebalance_opts(k) : NULL;</div><div class='del'>-	if (!r) {</div><div class='del'>-		/* raced due to btree write buffer, nothing to do */</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(data_opts, 0, sizeof(*data_opts));</div><div class='del'>-</div><div class='del'>-	data_opts-&gt;rewrite_ptrs		=</div><div class='del'>-		bch2_bkey_ptrs_need_rebalance(c, k, r-&gt;target, r-&gt;compression);</div><div class='del'>-	data_opts-&gt;target		= r-&gt;target;</div><div class='del'>-</div><div class='del'>-	if (!data_opts-&gt;rewrite_ptrs) {</div><div class='del'>-		/*</div><div class='del'>-		 * device we would want to write to offline? devices in target</div><div class='del'>-		 * changed?</div><div class='del'>-		 *</div><div class='del'>-		 * We'll now need a full scan before this extent is picked up</div><div class='del'>-		 * again:</div><div class='del'>-		 */</div><div class='del'>-		int ret = bch2_bkey_clear_needs_rebalance(trans, extent_iter, k);</div><div class='del'>-		if (ret)</div><div class='del'>-			return bkey_s_c_err(ret);</div><div class='del'>-		return bkey_s_c_null;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (trace_rebalance_extent_enabled()) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_str(&amp;buf, "target=");</div><div class='del'>-		bch2_target_to_text(&amp;buf, c, r-&gt;target);</div><div class='del'>-		prt_str(&amp;buf, " compression=");</div><div class='del'>-		bch2_compression_opt_to_text(&amp;buf, r-&gt;compression);</div><div class='del'>-		prt_str(&amp;buf, " ");</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, k);</div><div class='del'>-</div><div class='del'>-		trace_rebalance_extent(c, buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline_for_stack</div><div class='del'>-static int do_rebalance_extent(struct moving_context *ctxt,</div><div class='del'>-			       struct bpos work_pos,</div><div class='del'>-			       struct btree_iter *extent_iter)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_fs_rebalance *r = &amp;trans-&gt;c-&gt;rebalance;</div><div class='del'>-	struct data_update_opts data_opts;</div><div class='del'>-	struct bch_io_opts io_opts;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;stats = &amp;r-&gt;work_stats;</div><div class='del'>-	r-&gt;state = BCH_REBALANCE_working;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-</div><div class='del'>-	ret = bkey_err(k = next_rebalance_extent(trans, work_pos,</div><div class='del'>-						 extent_iter, &amp;data_opts));</div><div class='del'>-	if (ret || !k.k)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_move_get_io_opts_one(trans, &amp;io_opts, k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	atomic64_add(k.k-&gt;size, &amp;ctxt-&gt;stats-&gt;sectors_seen);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The iterator gets unlocked by __bch2_read_extent - need to</div><div class='del'>-	 * save a copy of @k elsewhere:</div><div class='del'>-	 */</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-	k = bkey_i_to_s_c(sk.k);</div><div class='del'>-</div><div class='del'>-	ret = bch2_move_extent(ctxt, NULL, extent_iter, k, io_opts, data_opts);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (bch2_err_matches(ret, ENOMEM)) {</div><div class='del'>-			/* memory allocation failure, wait for some IO to finish */</div><div class='del'>-			bch2_move_ctxt_wait_for_io(ctxt);</div><div class='del'>-			ret = -BCH_ERR_transaction_restart_nested;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/* skip it and continue, XXX signal failure */</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rebalance_pred(struct bch_fs *c, void *arg,</div><div class='del'>-			   struct bkey_s_c k,</div><div class='del'>-			   struct bch_io_opts *io_opts,</div><div class='del'>-			   struct data_update_opts *data_opts)</div><div class='del'>-{</div><div class='del'>-	unsigned target, compression;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;p.inode) {</div><div class='del'>-		target		= io_opts-&gt;background_target;</div><div class='del'>-		compression	= background_compression(*io_opts);</div><div class='del'>-	} else {</div><div class='del'>-		const struct bch_extent_rebalance *r = bch2_bkey_rebalance_opts(k);</div><div class='del'>-</div><div class='del'>-		target		= r ? r-&gt;target : io_opts-&gt;background_target;</div><div class='del'>-		compression	= r ? r-&gt;compression : background_compression(*io_opts);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data_opts-&gt;rewrite_ptrs		= bch2_bkey_ptrs_need_rebalance(c, k, target, compression);</div><div class='del'>-	data_opts-&gt;target		= target;</div><div class='del'>-	return data_opts-&gt;rewrite_ptrs != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_rebalance_scan(struct moving_context *ctxt, u64 inum, u64 cookie)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs_rebalance *r = &amp;trans-&gt;c-&gt;rebalance;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_init(&amp;r-&gt;scan_stats, "rebalance_scan");</div><div class='del'>-	ctxt-&gt;stats = &amp;r-&gt;scan_stats;</div><div class='del'>-</div><div class='del'>-	if (!inum) {</div><div class='del'>-		r-&gt;scan_start	= BBPOS_MIN;</div><div class='del'>-		r-&gt;scan_end	= BBPOS_MAX;</div><div class='del'>-	} else {</div><div class='del'>-		r-&gt;scan_start	= BBPOS(BTREE_ID_extents, POS(inum, 0));</div><div class='del'>-		r-&gt;scan_end	= BBPOS(BTREE_ID_extents, POS(inum, U64_MAX));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r-&gt;state = BCH_REBALANCE_scanning;</div><div class='del'>-</div><div class='del'>-	ret = __bch2_move_data(ctxt, r-&gt;scan_start, r-&gt;scan_end, rebalance_pred, NULL) ?:</div><div class='del'>-		commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			  bch2_clear_rebalance_needs_scan(trans, inum, cookie));</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_exit(&amp;r-&gt;scan_stats, trans-&gt;c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rebalance_wait(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_rebalance *r = &amp;c-&gt;rebalance;</div><div class='del'>-	struct io_clock *clock = &amp;c-&gt;io_clock[WRITE];</div><div class='del'>-	u64 now = atomic64_read(&amp;clock-&gt;now);</div><div class='del'>-	u64 min_member_capacity = bch2_min_rw_member_capacity(c);</div><div class='del'>-</div><div class='del'>-	if (min_member_capacity == U64_MAX)</div><div class='del'>-		min_member_capacity = 128 * 2048;</div><div class='del'>-</div><div class='del'>-	r-&gt;wait_iotime_end		= now + (min_member_capacity &gt;&gt; 6);</div><div class='del'>-</div><div class='del'>-	if (r-&gt;state != BCH_REBALANCE_waiting) {</div><div class='del'>-		r-&gt;wait_iotime_start	= now;</div><div class='del'>-		r-&gt;wait_wallclock_start	= ktime_get_real_ns();</div><div class='del'>-		r-&gt;state		= BCH_REBALANCE_waiting;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_kthread_io_clock_wait(clock, r-&gt;wait_iotime_end, MAX_SCHEDULE_TIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_rebalance(struct moving_context *ctxt)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = ctxt-&gt;trans;</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_fs_rebalance *r = &amp;c-&gt;rebalance;</div><div class='del'>-	struct btree_iter rebalance_work_iter, extent_iter = { NULL };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_move_stats_init(&amp;r-&gt;work_stats, "rebalance_work");</div><div class='del'>-	bch2_move_stats_init(&amp;r-&gt;scan_stats, "rebalance_scan");</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;rebalance_work_iter,</div><div class='del'>-			     BTREE_ID_rebalance_work, POS_MIN,</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-</div><div class='del'>-	while (!bch2_move_ratelimit(ctxt)) {</div><div class='del'>-		if (!r-&gt;enabled) {</div><div class='del'>-			bch2_moving_ctxt_flush_all(ctxt);</div><div class='del'>-			kthread_wait_freezable(r-&gt;enabled ||</div><div class='del'>-					       kthread_should_stop());</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (kthread_should_stop())</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret = bkey_err(k = next_rebalance_entry(trans, &amp;rebalance_work_iter));</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret || !k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = k.k-&gt;type == KEY_TYPE_cookie</div><div class='del'>-			? do_rebalance_scan(ctxt, k.k-&gt;p.inode,</div><div class='del'>-					    le64_to_cpu(bkey_s_c_to_cookie(k).v-&gt;cookie))</div><div class='del'>-			: do_rebalance_extent(ctxt, k.k-&gt;p, &amp;extent_iter);</div><div class='del'>-</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-			continue;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_advance(&amp;rebalance_work_iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;extent_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;rebalance_work_iter);</div><div class='del'>-	bch2_move_stats_exit(&amp;r-&gt;scan_stats, c);</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp;</div><div class='del'>-	    !kthread_should_stop() &amp;&amp;</div><div class='del'>-	    !atomic64_read(&amp;r-&gt;work_stats.sectors_seen) &amp;&amp;</div><div class='del'>-	    !atomic64_read(&amp;r-&gt;scan_stats.sectors_seen)) {</div><div class='del'>-		bch2_moving_ctxt_flush_all(ctxt);</div><div class='del'>-		bch2_trans_unlock_long(trans);</div><div class='del'>-		rebalance_wait(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_err_matches(ret, EROFS))</div><div class='del'>-		bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_rebalance_thread(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = arg;</div><div class='del'>-	struct bch_fs_rebalance *r = &amp;c-&gt;rebalance;</div><div class='del'>-	struct moving_context ctxt;</div><div class='del'>-</div><div class='del'>-	set_freezable();</div><div class='del'>-</div><div class='del'>-	bch2_moving_ctxt_init(&amp;ctxt, c, NULL, &amp;r-&gt;work_stats,</div><div class='del'>-			      writepoint_ptr(&amp;c-&gt;rebalance_write_point),</div><div class='del'>-			      true);</div><div class='del'>-</div><div class='del'>-	while (!kthread_should_stop() &amp;&amp; !do_rebalance(&amp;ctxt))</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	bch2_moving_ctxt_exit(&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_rebalance_status_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_rebalance *r = &amp;c-&gt;rebalance;</div><div class='del'>-</div><div class='del'>-	prt_str(out, bch2_rebalance_state_strs[r-&gt;state]);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	switch (r-&gt;state) {</div><div class='del'>-	case BCH_REBALANCE_waiting: {</div><div class='del'>-		u64 now = atomic64_read(&amp;c-&gt;io_clock[WRITE].now);</div><div class='del'>-</div><div class='del'>-		prt_str(out, "io wait duration:  ");</div><div class='del'>-		bch2_prt_human_readable_s64(out, r-&gt;wait_iotime_end - r-&gt;wait_iotime_start);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-</div><div class='del'>-		prt_str(out, "io wait remaining: ");</div><div class='del'>-		bch2_prt_human_readable_s64(out, r-&gt;wait_iotime_end - now);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-</div><div class='del'>-		prt_str(out, "duration waited:   ");</div><div class='del'>-		bch2_pr_time_units(out, ktime_get_real_ns() - r-&gt;wait_wallclock_start);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_REBALANCE_working:</div><div class='del'>-		bch2_move_stats_to_text(out, &amp;r-&gt;work_stats);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_REBALANCE_scanning:</div><div class='del'>-		bch2_move_stats_to_text(out, &amp;r-&gt;scan_stats);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_rebalance_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-</div><div class='del'>-	c-&gt;rebalance.pd.rate.rate = UINT_MAX;</div><div class='del'>-	bch2_ratelimit_reset(&amp;c-&gt;rebalance.pd.rate);</div><div class='del'>-</div><div class='del'>-	p = rcu_dereference_protected(c-&gt;rebalance.thread, 1);</div><div class='del'>-	c-&gt;rebalance.thread = NULL;</div><div class='del'>-</div><div class='del'>-	if (p) {</div><div class='del'>-		/* for sychronizing with rebalance_wakeup() */</div><div class='del'>-		synchronize_rcu();</div><div class='del'>-</div><div class='del'>-		kthread_stop(p);</div><div class='del'>-		put_task_struct(p);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_rebalance_start(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;rebalance.thread)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = kthread_create(bch2_rebalance_thread, c, "bch-rebalance/%s", c-&gt;name);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(p);</div><div class='del'>-	bch_err_msg(c, ret, "creating rebalance thread");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	get_task_struct(p);</div><div class='del'>-	rcu_assign_pointer(c-&gt;rebalance.thread, p);</div><div class='del'>-	wake_up_process(p);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_rebalance_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bch2_pd_controller_init(&amp;c-&gt;rebalance.pd);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/rebalance.h b/fs/bcachefs/rebalance.h<br/>deleted file mode 100644<br/>index 28a52638f16c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/rebalance.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/rebalance.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_REBALANCE_H</div><div class='del'>-#define _BCACHEFS_REBALANCE_H</div><div class='del'>-</div><div class='del'>-#include "rebalance_types.h"</div><div class='del'>-</div><div class='del'>-int bch2_set_rebalance_needs_scan(struct bch_fs *, u64 inum);</div><div class='del'>-int bch2_set_fs_needs_rebalance(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-static inline void rebalance_wakeup(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	p = rcu_dereference(c-&gt;rebalance.thread);</div><div class='del'>-	if (p)</div><div class='del'>-		wake_up_process(p);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_rebalance_status_to_text(struct printbuf *, struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_rebalance_stop(struct bch_fs *);</div><div class='del'>-int bch2_rebalance_start(struct bch_fs *);</div><div class='del'>-void bch2_fs_rebalance_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_REBALANCE_H */</div><div class='head'>diff --git a/fs/bcachefs/rebalance_types.h b/fs/bcachefs/rebalance_types.h<br/>deleted file mode 100644<br/>index 0fffb536c1d0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/rebalance_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/rebalance_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_REBALANCE_TYPES_H</div><div class='del'>-#define _BCACHEFS_REBALANCE_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "bbpos_types.h"</div><div class='del'>-#include "move_types.h"</div><div class='del'>-</div><div class='del'>-#define BCH_REBALANCE_STATES()		\</div><div class='del'>-	x(waiting)			\</div><div class='del'>-	x(working)			\</div><div class='del'>-	x(scanning)</div><div class='del'>-</div><div class='del'>-enum bch_rebalance_states {</div><div class='del'>-#define x(t)	BCH_REBALANCE_##t,</div><div class='del'>-	BCH_REBALANCE_STATES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_fs_rebalance {</div><div class='del'>-	struct task_struct __rcu	*thread;</div><div class='del'>-	struct bch_pd_controller pd;</div><div class='del'>-</div><div class='del'>-	enum bch_rebalance_states	state;</div><div class='del'>-	u64				wait_iotime_start;</div><div class='del'>-	u64				wait_iotime_end;</div><div class='del'>-	u64				wait_wallclock_start;</div><div class='del'>-</div><div class='del'>-	struct bch_move_stats		work_stats;</div><div class='del'>-</div><div class='del'>-	struct bbpos			scan_start;</div><div class='del'>-	struct bbpos			scan_end;</div><div class='del'>-	struct bch_move_stats		scan_stats;</div><div class='del'>-</div><div class='del'>-	unsigned			enabled:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_REBALANCE_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c<br/>deleted file mode 100644<br/>index 9127d0e3ca2f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/recovery.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/recovery.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1220 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "backpointers.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "dirent.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "fs-common.h"</div><div class='del'>-#include "fsck.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "lru.h"</div><div class='del'>-#include "logged_ops.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "sb-clean.h"</div><div class='del'>-#include "sb-downgrade.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-</div><div class='del'>-#define QSTR(n) { { { .len = strlen(n) } }, .name = n }</div><div class='del'>-</div><div class='del'>-static bool btree_id_is_alloc(enum btree_id id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-	case BTREE_ID_alloc:</div><div class='del'>-	case BTREE_ID_backpointers:</div><div class='del'>-	case BTREE_ID_need_discard:</div><div class='del'>-	case BTREE_ID_freespace:</div><div class='del'>-	case BTREE_ID_bucket_gens:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for -o reconstruct_alloc: */</div><div class='del'>-static void drop_alloc_keys(struct journal_keys *keys)</div><div class='del'>-{</div><div class='del'>-	size_t src, dst;</div><div class='del'>-</div><div class='del'>-	for (src = 0, dst = 0; src &lt; keys-&gt;nr; src++)</div><div class='del'>-		if (!btree_id_is_alloc(keys-&gt;d[src].btree_id))</div><div class='del'>-			keys-&gt;d[dst++] = keys-&gt;d[src];</div><div class='del'>-</div><div class='del'>-	keys-&gt;nr = dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Btree node pointers have a field to stack a pointer to the in memory btree</div><div class='del'>- * node; we need to zero out this field when reading in btree nodes, or when</div><div class='del'>- * reading in keys from the journal:</div><div class='del'>- */</div><div class='del'>-static void zero_out_btree_mem_ptr(struct journal_keys *keys)</div><div class='del'>-{</div><div class='del'>-	struct journal_key *i;</div><div class='del'>-</div><div class='del'>-	for (i = keys-&gt;d; i &lt; keys-&gt;d + keys-&gt;nr; i++)</div><div class='del'>-		if (i-&gt;k-&gt;k.type == KEY_TYPE_btree_ptr_v2)</div><div class='del'>-			bkey_i_to_btree_ptr_v2(i-&gt;k)-&gt;v.mem_ptr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* journal replay: */</div><div class='del'>-</div><div class='del'>-static void replay_now_at(struct journal *j, u64 seq)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(seq &lt; j-&gt;replay_journal_seq);</div><div class='del'>-</div><div class='del'>-	seq = min(seq, j-&gt;replay_journal_seq_end);</div><div class='del'>-</div><div class='del'>-	while (j-&gt;replay_journal_seq &lt; seq)</div><div class='del'>-		bch2_journal_pin_put(j, j-&gt;replay_journal_seq++);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_journal_replay_key(struct btree_trans *trans,</div><div class='del'>-				   struct journal_key *k)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	unsigned iter_flags =</div><div class='del'>-		BTREE_ITER_INTENT|</div><div class='del'>-		BTREE_ITER_NOT_EXTENTS;</div><div class='del'>-	unsigned update_flags = BTREE_TRIGGER_NORUN;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (k-&gt;overwritten)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	trans-&gt;journal_res.seq = k-&gt;journal_seq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * BTREE_UPDATE_KEY_CACHE_RECLAIM disables key cache lookup/update to</div><div class='del'>-	 * keep the key cache coherent with the underlying btree. Nothing</div><div class='del'>-	 * besides the allocator is doing updates yet so we don't need key cache</div><div class='del'>-	 * coherency for non-alloc btrees, and key cache fills for snapshots</div><div class='del'>-	 * btrees use BTREE_ITER_FILTER_SNAPSHOTS, which isn't available until</div><div class='del'>-	 * the snapshots recovery pass runs.</div><div class='del'>-	 */</div><div class='del'>-	if (!k-&gt;level &amp;&amp; k-&gt;btree_id == BTREE_ID_alloc)</div><div class='del'>-		iter_flags |= BTREE_ITER_CACHED;</div><div class='del'>-	else</div><div class='del'>-		update_flags |= BTREE_UPDATE_KEY_CACHE_RECLAIM;</div><div class='del'>-</div><div class='del'>-	bch2_trans_node_iter_init(trans, &amp;iter, k-&gt;btree_id, k-&gt;k-&gt;k.p,</div><div class='del'>-				  BTREE_MAX_DEPTH, k-&gt;level,</div><div class='del'>-				  iter_flags);</div><div class='del'>-	ret = bch2_btree_iter_traverse(&amp;iter);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Must be checked with btree locked: */</div><div class='del'>-	if (k-&gt;overwritten)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, k-&gt;k, update_flags);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_sort_seq_cmp(const void *_l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	const struct journal_key *l = *((const struct journal_key **)_l);</div><div class='del'>-	const struct journal_key *r = *((const struct journal_key **)_r);</div><div class='del'>-</div><div class='del'>-	return cmp_int(l-&gt;journal_seq, r-&gt;journal_seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_journal_replay(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-	DARRAY(struct journal_key *) keys_sorted = { 0 };</div><div class='del'>-	struct journal *j = &amp;c-&gt;journal;</div><div class='del'>-	u64 start_seq	= c-&gt;journal_replay_seq_start;</div><div class='del'>-	u64 end_seq	= c-&gt;journal_replay_seq_start;</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (keys-&gt;nr) {</div><div class='del'>-		ret = bch2_journal_log_msg(c, "Starting journal replay (%zu keys in entries %llu-%llu)",</div><div class='del'>-					   keys-&gt;nr, start_seq, end_seq);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!atomic_read(&amp;keys-&gt;ref));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First, attempt to replay keys in sorted order. This is more</div><div class='del'>-	 * efficient - better locality of btree access -  but some might fail if</div><div class='del'>-	 * that would cause a journal deadlock.</div><div class='del'>-	 */</div><div class='del'>-	for (size_t i = 0; i &lt; keys-&gt;nr; i++) {</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		struct journal_key *k = keys-&gt;d + i;</div><div class='del'>-</div><div class='del'>-		/* Skip fastpath if we're low on space in the journal */</div><div class='del'>-		ret = c-&gt;journal.watermark ? -1 :</div><div class='del'>-			commit_do(trans, NULL, NULL,</div><div class='del'>-				  BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-				  BCH_TRANS_COMMIT_journal_reclaim|</div><div class='del'>-				  (!k-&gt;allocated ? BCH_TRANS_COMMIT_no_journal_res : 0),</div><div class='del'>-			     bch2_journal_replay_key(trans, k));</div><div class='del'>-		BUG_ON(!ret &amp;&amp; !k-&gt;overwritten);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ret = darray_push(&amp;keys_sorted, k);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now, replay any remaining keys in the order in which they appear in</div><div class='del'>-	 * the journal, unpinning those journal entries as we go:</div><div class='del'>-	 */</div><div class='del'>-	sort(keys_sorted.data, keys_sorted.nr,</div><div class='del'>-	     sizeof(keys_sorted.data[0]),</div><div class='del'>-	     journal_sort_seq_cmp, NULL);</div><div class='del'>-</div><div class='del'>-	darray_for_each(keys_sorted, kp) {</div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		struct journal_key *k = *kp;</div><div class='del'>-</div><div class='del'>-		replay_now_at(j, k-&gt;journal_seq);</div><div class='del'>-</div><div class='del'>-		ret = commit_do(trans, NULL, NULL,</div><div class='del'>-				BCH_TRANS_COMMIT_no_enospc|</div><div class='del'>-				(!k-&gt;allocated</div><div class='del'>-				 ? BCH_TRANS_COMMIT_no_journal_res|BCH_WATERMARK_reclaim</div><div class='del'>-				 : 0),</div><div class='del'>-			     bch2_journal_replay_key(trans, k));</div><div class='del'>-		bch_err_msg(c, ret, "while replaying key at btree %s level %u:",</div><div class='del'>-			    bch2_btree_id_str(k-&gt;btree_id), k-&gt;level);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		BUG_ON(!k-&gt;overwritten);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We need to put our btree_trans before calling flush_all_pins(), since</div><div class='del'>-	 * that will use a btree_trans internally</div><div class='del'>-	 */</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	trans = NULL;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;opts.keep_journal)</div><div class='del'>-		bch2_journal_keys_put_initial(c);</div><div class='del'>-</div><div class='del'>-	replay_now_at(j, j-&gt;replay_journal_seq_end);</div><div class='del'>-	j-&gt;replay_journal_seq = 0;</div><div class='del'>-</div><div class='del'>-	bch2_journal_set_replay_done(j);</div><div class='del'>-</div><div class='del'>-	if (keys-&gt;nr)</div><div class='del'>-		bch2_journal_log_msg(c, "journal replay finished");</div><div class='del'>-err:</div><div class='del'>-	if (trans)</div><div class='del'>-		bch2_trans_put(trans);</div><div class='del'>-	darray_exit(&amp;keys_sorted);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* journal replay early: */</div><div class='del'>-</div><div class='del'>-static int journal_replay_entry_early(struct bch_fs *c,</div><div class='del'>-				      struct jset_entry *entry)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (entry-&gt;type) {</div><div class='del'>-	case BCH_JSET_ENTRY_btree_root: {</div><div class='del'>-		struct btree_root *r;</div><div class='del'>-</div><div class='del'>-		while (entry-&gt;btree_id &gt;= c-&gt;btree_roots_extra.nr + BTREE_ID_NR) {</div><div class='del'>-			ret = darray_push(&amp;c-&gt;btree_roots_extra, (struct btree_root) { NULL });</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		r = bch2_btree_id_root(c, entry-&gt;btree_id);</div><div class='del'>-</div><div class='del'>-		if (entry-&gt;u64s) {</div><div class='del'>-			r-&gt;level = entry-&gt;level;</div><div class='del'>-			bkey_copy(&amp;r-&gt;key, (struct bkey_i *) entry-&gt;start);</div><div class='del'>-			r-&gt;error = 0;</div><div class='del'>-		} else {</div><div class='del'>-			r-&gt;error = -EIO;</div><div class='del'>-		}</div><div class='del'>-		r-&gt;alive = true;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_JSET_ENTRY_usage: {</div><div class='del'>-		struct jset_entry_usage *u =</div><div class='del'>-			container_of(entry, struct jset_entry_usage, entry);</div><div class='del'>-</div><div class='del'>-		switch (entry-&gt;btree_id) {</div><div class='del'>-		case BCH_FS_USAGE_reserved:</div><div class='del'>-			if (entry-&gt;level &lt; BCH_REPLICAS_MAX)</div><div class='del'>-				c-&gt;usage_base-&gt;persistent_reserved[entry-&gt;level] =</div><div class='del'>-					le64_to_cpu(u-&gt;v);</div><div class='del'>-			break;</div><div class='del'>-		case BCH_FS_USAGE_inodes:</div><div class='del'>-			c-&gt;usage_base-&gt;b.nr_inodes = le64_to_cpu(u-&gt;v);</div><div class='del'>-			break;</div><div class='del'>-		case BCH_FS_USAGE_key_version:</div><div class='del'>-			atomic64_set(&amp;c-&gt;key_version,</div><div class='del'>-				     le64_to_cpu(u-&gt;v));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_JSET_ENTRY_data_usage: {</div><div class='del'>-		struct jset_entry_data_usage *u =</div><div class='del'>-			container_of(entry, struct jset_entry_data_usage, entry);</div><div class='del'>-</div><div class='del'>-		ret = bch2_replicas_set_usage(c, &amp;u-&gt;r,</div><div class='del'>-					      le64_to_cpu(u-&gt;v));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_JSET_ENTRY_dev_usage: {</div><div class='del'>-		struct jset_entry_dev_usage *u =</div><div class='del'>-			container_of(entry, struct jset_entry_dev_usage, entry);</div><div class='del'>-		struct bch_dev *ca = bch_dev_bkey_exists(c, le32_to_cpu(u-&gt;dev));</div><div class='del'>-		unsigned i, nr_types = jset_entry_dev_usage_nr_types(u);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; min_t(unsigned, nr_types, BCH_DATA_NR); i++) {</div><div class='del'>-			ca-&gt;usage_base-&gt;d[i].buckets	= le64_to_cpu(u-&gt;d[i].buckets);</div><div class='del'>-			ca-&gt;usage_base-&gt;d[i].sectors	= le64_to_cpu(u-&gt;d[i].sectors);</div><div class='del'>-			ca-&gt;usage_base-&gt;d[i].fragmented	= le64_to_cpu(u-&gt;d[i].fragmented);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_JSET_ENTRY_blacklist: {</div><div class='del'>-		struct jset_entry_blacklist *bl_entry =</div><div class='del'>-			container_of(entry, struct jset_entry_blacklist, entry);</div><div class='del'>-</div><div class='del'>-		ret = bch2_journal_seq_blacklist_add(c,</div><div class='del'>-				le64_to_cpu(bl_entry-&gt;seq),</div><div class='del'>-				le64_to_cpu(bl_entry-&gt;seq) + 1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_JSET_ENTRY_blacklist_v2: {</div><div class='del'>-		struct jset_entry_blacklist_v2 *bl_entry =</div><div class='del'>-			container_of(entry, struct jset_entry_blacklist_v2, entry);</div><div class='del'>-</div><div class='del'>-		ret = bch2_journal_seq_blacklist_add(c,</div><div class='del'>-				le64_to_cpu(bl_entry-&gt;start),</div><div class='del'>-				le64_to_cpu(bl_entry-&gt;end) + 1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case BCH_JSET_ENTRY_clock: {</div><div class='del'>-		struct jset_entry_clock *clock =</div><div class='del'>-			container_of(entry, struct jset_entry_clock, entry);</div><div class='del'>-</div><div class='del'>-		atomic64_set(&amp;c-&gt;io_clock[clock-&gt;rw].now, le64_to_cpu(clock-&gt;time));</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_replay_early(struct bch_fs *c,</div><div class='del'>-				struct bch_sb_field_clean *clean)</div><div class='del'>-{</div><div class='del'>-	if (clean) {</div><div class='del'>-		for (struct jset_entry *entry = clean-&gt;start;</div><div class='del'>-		     entry != vstruct_end(&amp;clean-&gt;field);</div><div class='del'>-		     entry = vstruct_next(entry)) {</div><div class='del'>-			int ret = journal_replay_entry_early(c, entry);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct genradix_iter iter;</div><div class='del'>-		struct journal_replay *i, **_i;</div><div class='del'>-</div><div class='del'>-		genradix_for_each(&amp;c-&gt;journal_entries, iter, _i) {</div><div class='del'>-			i = *_i;</div><div class='del'>-</div><div class='del'>-			if (!i || i-&gt;ignore)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			vstruct_for_each(&amp;i-&gt;j, entry) {</div><div class='del'>-				int ret = journal_replay_entry_early(c, entry);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_fs_usage_initialize(c);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sb clean section: */</div><div class='del'>-</div><div class='del'>-static int read_btree_roots(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; btree_id_nr_alive(c); i++) {</div><div class='del'>-		struct btree_root *r = bch2_btree_id_root(c, i);</div><div class='del'>-</div><div class='del'>-		if (!r-&gt;alive)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (btree_id_is_alloc(i) &amp;&amp;</div><div class='del'>-		    c-&gt;opts.reconstruct_alloc) {</div><div class='del'>-			c-&gt;sb.compat &amp;= ~(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (r-&gt;error) {</div><div class='del'>-			__fsck_err(c,</div><div class='del'>-				   btree_id_is_alloc(i)</div><div class='del'>-				   ? FSCK_CAN_IGNORE : 0,</div><div class='del'>-				   btree_root_bkey_invalid,</div><div class='del'>-				   "invalid btree root %s",</div><div class='del'>-				   bch2_btree_id_str(i));</div><div class='del'>-			if (i == BTREE_ID_alloc)</div><div class='del'>-				c-&gt;sb.compat &amp;= ~(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_root_read(c, i, &amp;r-&gt;key, r-&gt;level);</div><div class='del'>-		if (ret) {</div><div class='del'>-			fsck_err(c,</div><div class='del'>-				 btree_root_read_error,</div><div class='del'>-				 "error reading btree root %s",</div><div class='del'>-				 bch2_btree_id_str(i));</div><div class='del'>-			if (btree_id_is_alloc(i))</div><div class='del'>-				c-&gt;sb.compat &amp;= ~(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTREE_ID_NR; i++) {</div><div class='del'>-		struct btree_root *r = bch2_btree_id_root(c, i);</div><div class='del'>-</div><div class='del'>-		if (!r-&gt;b) {</div><div class='del'>-			r-&gt;alive = false;</div><div class='del'>-			r-&gt;level = 0;</div><div class='del'>-			bch2_btree_root_alloc(c, i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_initialize_subvolumes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_snapshot_tree	root_tree;</div><div class='del'>-	struct bkey_i_snapshot		root_snapshot;</div><div class='del'>-	struct bkey_i_subvolume		root_volume;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_snapshot_tree_init(&amp;root_tree.k_i);</div><div class='del'>-	root_tree.k.p.offset		= 1;</div><div class='del'>-	root_tree.v.master_subvol	= cpu_to_le32(1);</div><div class='del'>-	root_tree.v.root_snapshot	= cpu_to_le32(U32_MAX);</div><div class='del'>-</div><div class='del'>-	bkey_snapshot_init(&amp;root_snapshot.k_i);</div><div class='del'>-	root_snapshot.k.p.offset = U32_MAX;</div><div class='del'>-	root_snapshot.v.flags	= 0;</div><div class='del'>-	root_snapshot.v.parent	= 0;</div><div class='del'>-	root_snapshot.v.subvol	= cpu_to_le32(BCACHEFS_ROOT_SUBVOL);</div><div class='del'>-	root_snapshot.v.tree	= cpu_to_le32(1);</div><div class='del'>-	SET_BCH_SNAPSHOT_SUBVOL(&amp;root_snapshot.v, true);</div><div class='del'>-</div><div class='del'>-	bkey_subvolume_init(&amp;root_volume.k_i);</div><div class='del'>-	root_volume.k.p.offset = BCACHEFS_ROOT_SUBVOL;</div><div class='del'>-	root_volume.v.flags	= 0;</div><div class='del'>-	root_volume.v.snapshot	= cpu_to_le32(U32_MAX);</div><div class='del'>-	root_volume.v.inode	= cpu_to_le64(BCACHEFS_ROOT_INO);</div><div class='del'>-</div><div class='del'>-	ret =   bch2_btree_insert(c, BTREE_ID_snapshot_trees,	&amp;root_tree.k_i, NULL, 0) ?:</div><div class='del'>-		bch2_btree_insert(c, BTREE_ID_snapshots,	&amp;root_snapshot.k_i, NULL, 0) ?:</div><div class='del'>-		bch2_btree_insert(c, BTREE_ID_subvolumes,	&amp;root_volume.k_i, NULL, 0);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_fs_upgrade_for_subvolumes(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bch_inode_unpacked inode;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_iter(trans, &amp;iter, BTREE_ID_inodes,</div><div class='del'>-			       SPOS(0, BCACHEFS_ROOT_INO, U32_MAX), 0);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!bkey_is_inode(k.k)) {</div><div class='del'>-		bch_err(trans-&gt;c, "root inode not found");</div><div class='del'>-		ret = -BCH_ERR_ENOENT_inode;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_unpack(k, &amp;inode);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	inode.bi_subvol = BCACHEFS_ROOT_SUBVOL;</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_write(trans, &amp;iter, &amp;inode);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set bi_subvol on root inode */</div><div class='del'>-noinline_for_stack</div><div class='del'>-static int bch2_fs_upgrade_for_subvolumes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_do(c, NULL, NULL, BCH_TRANS_COMMIT_lazy_rw,</div><div class='del'>-				__bch2_fs_upgrade_for_subvolumes(trans));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char * const bch2_recovery_passes[] = {</div><div class='del'>-#define x(_fn, ...)	#_fn,</div><div class='del'>-	BCH_RECOVERY_PASSES()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_check_allocations(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return bch2_gc(c, true, c-&gt;opts.norecovery);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_set_may_go_rw(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct journal_keys *keys = &amp;c-&gt;journal_keys;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * After we go RW, the journal keys buffer can't be modified (except for</div><div class='del'>-	 * setting journal_key-&gt;overwritten: it will be accessed by multiple</div><div class='del'>-	 * threads</div><div class='del'>-	 */</div><div class='del'>-	move_gap(keys-&gt;d, keys-&gt;nr, keys-&gt;size, keys-&gt;gap, keys-&gt;nr);</div><div class='del'>-	keys-&gt;gap = keys-&gt;nr;</div><div class='del'>-</div><div class='del'>-	set_bit(BCH_FS_may_go_rw, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	if (keys-&gt;nr || c-&gt;opts.fsck || !c-&gt;sb.clean)</div><div class='del'>-		return bch2_fs_read_write_early(c);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct recovery_pass_fn {</div><div class='del'>-	int		(*fn)(struct bch_fs *);</div><div class='del'>-	unsigned	when;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct recovery_pass_fn recovery_pass_fns[] = {</div><div class='del'>-#define x(_fn, _id, _when)	{ .fn = bch2_##_fn, .when = _when },</div><div class='del'>-	BCH_RECOVERY_PASSES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-u64 bch2_recovery_passes_to_stable(u64 v)</div><div class='del'>-{</div><div class='del'>-	static const u8 map[] = {</div><div class='del'>-#define x(n, id, ...)	[BCH_RECOVERY_PASS_##n] = BCH_RECOVERY_PASS_STABLE_##n,</div><div class='del'>-	BCH_RECOVERY_PASSES()</div><div class='del'>-#undef x</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	u64 ret = 0;</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(map); i++)</div><div class='del'>-		if (v &amp; BIT_ULL(i))</div><div class='del'>-			ret |= BIT_ULL(map[i]);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_recovery_passes_from_stable(u64 v)</div><div class='del'>-{</div><div class='del'>-	static const u8 map[] = {</div><div class='del'>-#define x(n, id, ...)	[BCH_RECOVERY_PASS_STABLE_##n] = BCH_RECOVERY_PASS_##n,</div><div class='del'>-	BCH_RECOVERY_PASSES()</div><div class='del'>-#undef x</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	u64 ret = 0;</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(map); i++)</div><div class='del'>-		if (v &amp; BIT_ULL(i))</div><div class='del'>-			ret |= BIT_ULL(map[i]);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool check_version_upgrade(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned latest_compatible = bch2_latest_compatible_version(c-&gt;sb.version);</div><div class='del'>-	unsigned latest_version	= bcachefs_metadata_version_current;</div><div class='del'>-	unsigned old_version = c-&gt;sb.version_upgrade_complete ?: c-&gt;sb.version;</div><div class='del'>-	unsigned new_version = 0;</div><div class='del'>-</div><div class='del'>-	if (old_version &lt; bcachefs_metadata_required_upgrade_below) {</div><div class='del'>-		if (c-&gt;opts.version_upgrade == BCH_VERSION_UPGRADE_incompatible ||</div><div class='del'>-		    latest_compatible &lt; bcachefs_metadata_required_upgrade_below)</div><div class='del'>-			new_version = latest_version;</div><div class='del'>-		else</div><div class='del'>-			new_version = latest_compatible;</div><div class='del'>-	} else {</div><div class='del'>-		switch (c-&gt;opts.version_upgrade) {</div><div class='del'>-		case BCH_VERSION_UPGRADE_compatible:</div><div class='del'>-			new_version = latest_compatible;</div><div class='del'>-			break;</div><div class='del'>-		case BCH_VERSION_UPGRADE_incompatible:</div><div class='del'>-			new_version = latest_version;</div><div class='del'>-			break;</div><div class='del'>-		case BCH_VERSION_UPGRADE_none:</div><div class='del'>-			new_version = old_version;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_version &gt; old_version) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		if (old_version &lt; bcachefs_metadata_required_upgrade_below)</div><div class='del'>-			prt_str(&amp;buf, "Version upgrade required:\n");</div><div class='del'>-</div><div class='del'>-		if (old_version != c-&gt;sb.version) {</div><div class='del'>-			prt_str(&amp;buf, "Version upgrade from ");</div><div class='del'>-			bch2_version_to_text(&amp;buf, c-&gt;sb.version_upgrade_complete);</div><div class='del'>-			prt_str(&amp;buf, " to ");</div><div class='del'>-			bch2_version_to_text(&amp;buf, c-&gt;sb.version);</div><div class='del'>-			prt_str(&amp;buf, " incomplete\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "Doing %s version upgrade from ",</div><div class='del'>-			   BCH_VERSION_MAJOR(old_version) != BCH_VERSION_MAJOR(new_version)</div><div class='del'>-			   ? "incompatible" : "compatible");</div><div class='del'>-		bch2_version_to_text(&amp;buf, old_version);</div><div class='del'>-		prt_str(&amp;buf, " to ");</div><div class='del'>-		bch2_version_to_text(&amp;buf, new_version);</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		struct bch_sb_field_ext *ext = bch2_sb_field_get(c-&gt;disk_sb.sb, ext);</div><div class='del'>-		__le64 passes = ext-&gt;recovery_passes_required[0];</div><div class='del'>-		bch2_sb_set_upgrade(c, old_version, new_version);</div><div class='del'>-		passes = ext-&gt;recovery_passes_required[0] &amp; ~passes;</div><div class='del'>-</div><div class='del'>-		if (passes) {</div><div class='del'>-			prt_str(&amp;buf, "  running recovery passes: ");</div><div class='del'>-			prt_bitflags(&amp;buf, bch2_recovery_passes,</div><div class='del'>-				     bch2_recovery_passes_from_stable(le64_to_cpu(passes)));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch_info(c, "%s", buf.buf);</div><div class='del'>-</div><div class='del'>-		bch2_sb_upgrade(c, new_version);</div><div class='del'>-</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_fsck_recovery_passes(void)</div><div class='del'>-{</div><div class='del'>-	u64 ret = 0;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(recovery_pass_fns); i++)</div><div class='del'>-		if (recovery_pass_fns[i].when &amp; PASS_FSCK)</div><div class='del'>-			ret |= BIT_ULL(i);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool should_run_recovery_pass(struct bch_fs *c, enum bch_recovery_pass pass)</div><div class='del'>-{</div><div class='del'>-	struct recovery_pass_fn *p = recovery_pass_fns + pass;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.norecovery &amp;&amp; pass &gt; BCH_RECOVERY_PASS_snapshots_read)</div><div class='del'>-		return false;</div><div class='del'>-	if (c-&gt;recovery_passes_explicit &amp; BIT_ULL(pass))</div><div class='del'>-		return true;</div><div class='del'>-	if ((p-&gt;when &amp; PASS_FSCK) &amp;&amp; c-&gt;opts.fsck)</div><div class='del'>-		return true;</div><div class='del'>-	if ((p-&gt;when &amp; PASS_UNCLEAN) &amp;&amp; !c-&gt;sb.clean)</div><div class='del'>-		return true;</div><div class='del'>-	if (p-&gt;when &amp; PASS_ALWAYS)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_run_recovery_pass(struct bch_fs *c, enum bch_recovery_pass pass)</div><div class='del'>-{</div><div class='del'>-	struct recovery_pass_fn *p = recovery_pass_fns + pass;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!(p-&gt;when &amp; PASS_SILENT))</div><div class='del'>-		bch2_print(c, KERN_INFO bch2_log_msg(c, "%s..."),</div><div class='del'>-			   bch2_recovery_passes[pass]);</div><div class='del'>-	ret = p-&gt;fn(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	if (!(p-&gt;when &amp; PASS_SILENT))</div><div class='del'>-		bch2_print(c, KERN_CONT " done\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_run_recovery_passes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	while (c-&gt;curr_recovery_pass &lt; ARRAY_SIZE(recovery_pass_fns)) {</div><div class='del'>-		if (should_run_recovery_pass(c, c-&gt;curr_recovery_pass)) {</div><div class='del'>-			unsigned pass = c-&gt;curr_recovery_pass;</div><div class='del'>-</div><div class='del'>-			ret = bch2_run_recovery_pass(c, c-&gt;curr_recovery_pass);</div><div class='del'>-			if (bch2_err_matches(ret, BCH_ERR_restart_recovery) ||</div><div class='del'>-			    (ret &amp;&amp; c-&gt;curr_recovery_pass &lt; pass))</div><div class='del'>-				continue;</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			c-&gt;recovery_passes_complete |= BIT_ULL(c-&gt;curr_recovery_pass);</div><div class='del'>-		}</div><div class='del'>-		c-&gt;curr_recovery_pass++;</div><div class='del'>-		c-&gt;recovery_pass_done = max(c-&gt;recovery_pass_done, c-&gt;curr_recovery_pass);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_run_online_recovery_passes(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(recovery_pass_fns); i++) {</div><div class='del'>-		struct recovery_pass_fn *p = recovery_pass_fns + i;</div><div class='del'>-</div><div class='del'>-		if (!(p-&gt;when &amp; PASS_ONLINE))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = bch2_run_recovery_pass(c, i);</div><div class='del'>-		if (bch2_err_matches(ret, BCH_ERR_restart_recovery)) {</div><div class='del'>-			i = c-&gt;curr_recovery_pass;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_recovery(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_clean *clean = NULL;</div><div class='del'>-	struct jset *last_journal_entry = NULL;</div><div class='del'>-	u64 last_seq = 0, blacklist_seq, journal_seq;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;sb.clean) {</div><div class='del'>-		clean = bch2_read_superblock_clean(c);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(clean);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bch_info(c, "recovering from clean shutdown, journal seq %llu",</div><div class='del'>-			 le64_to_cpu(clean-&gt;journal_seq));</div><div class='del'>-	} else {</div><div class='del'>-		bch_info(c, "recovering from unclean shutdown");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(c-&gt;sb.features &amp; (1ULL &lt;&lt; BCH_FEATURE_new_extent_overwrite))) {</div><div class='del'>-		bch_err(c, "feature new_extent_overwrite not set, filesystem no longer supported");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;sb.clean &amp;&amp;</div><div class='del'>-	    !(c-&gt;sb.features &amp; (1ULL &lt;&lt; BCH_FEATURE_extents_above_btree_updates))) {</div><div class='del'>-		bch_err(c, "filesystem needs recovery from older version; run fsck from older bcachefs-tools to fix");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.fsck &amp;&amp; c-&gt;opts.norecovery) {</div><div class='del'>-		bch_err(c, "cannot select both norecovery and fsck");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(c-&gt;opts.nochanges &amp;&amp; c-&gt;opts.norecovery)) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		bool write_sb = false;</div><div class='del'>-</div><div class='del'>-		struct bch_sb_field_ext *ext =</div><div class='del'>-			bch2_sb_field_get_minsize(&amp;c-&gt;disk_sb, ext, sizeof(*ext) / sizeof(u64));</div><div class='del'>-		if (!ext) {</div><div class='del'>-			ret = -BCH_ERR_ENOSPC_sb;</div><div class='del'>-			mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (BCH_SB_HAS_TOPOLOGY_ERRORS(c-&gt;disk_sb.sb)) {</div><div class='del'>-			ext-&gt;recovery_passes_required[0] |=</div><div class='del'>-				cpu_to_le64(bch2_recovery_passes_to_stable(BIT_ULL(BCH_RECOVERY_PASS_check_topology)));</div><div class='del'>-			write_sb = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		u64 sb_passes = bch2_recovery_passes_from_stable(le64_to_cpu(ext-&gt;recovery_passes_required[0]));</div><div class='del'>-		if (sb_passes) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-			prt_str(&amp;buf, "superblock requires following recovery passes to be run:\n  ");</div><div class='del'>-			prt_bitflags(&amp;buf, bch2_recovery_passes, sb_passes);</div><div class='del'>-			bch_info(c, "%s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bch2_check_version_downgrade(c)) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			prt_str(&amp;buf, "Version downgrade required:\n");</div><div class='del'>-</div><div class='del'>-			__le64 passes = ext-&gt;recovery_passes_required[0];</div><div class='del'>-			bch2_sb_set_downgrade(c,</div><div class='del'>-					BCH_VERSION_MINOR(bcachefs_metadata_version_current),</div><div class='del'>-					BCH_VERSION_MINOR(c-&gt;sb.version));</div><div class='del'>-			passes = ext-&gt;recovery_passes_required[0] &amp; ~passes;</div><div class='del'>-			if (passes) {</div><div class='del'>-				prt_str(&amp;buf, "  running recovery passes: ");</div><div class='del'>-				prt_bitflags(&amp;buf, bch2_recovery_passes,</div><div class='del'>-					     bch2_recovery_passes_from_stable(le64_to_cpu(passes)));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			bch_info(c, "%s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			write_sb = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (check_version_upgrade(c))</div><div class='del'>-			write_sb = true;</div><div class='del'>-</div><div class='del'>-		if (write_sb)</div><div class='del'>-			bch2_write_super(c);</div><div class='del'>-</div><div class='del'>-		c-&gt;recovery_passes_explicit |= bch2_recovery_passes_from_stable(le64_to_cpu(ext-&gt;recovery_passes_required[0]));</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.fsck &amp;&amp; IS_ENABLED(CONFIG_BCACHEFS_DEBUG))</div><div class='del'>-		c-&gt;recovery_passes_explicit |= BIT_ULL(BCH_RECOVERY_PASS_check_topology);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.fsck)</div><div class='del'>-		set_bit(BCH_FS_fsck_running, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	ret = bch2_blacklist_table_initialize(c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error initializing blacklist table");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;sb.clean || c-&gt;opts.fsck || c-&gt;opts.keep_journal) {</div><div class='del'>-		struct genradix_iter iter;</div><div class='del'>-		struct journal_replay **i;</div><div class='del'>-</div><div class='del'>-		bch_verbose(c, "starting journal read");</div><div class='del'>-		ret = bch2_journal_read(c, &amp;last_seq, &amp;blacklist_seq, &amp;journal_seq);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * note: cmd_list_journal needs the blacklist table fully up to date so</div><div class='del'>-		 * it can asterisk ignored journal entries:</div><div class='del'>-		 */</div><div class='del'>-		if (c-&gt;opts.read_journal_only)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		genradix_for_each_reverse(&amp;c-&gt;journal_entries, iter, i)</div><div class='del'>-			if (*i &amp;&amp; !(*i)-&gt;ignore) {</div><div class='del'>-				last_journal_entry = &amp;(*i)-&gt;j;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		if (mustfix_fsck_err_on(c-&gt;sb.clean &amp;&amp;</div><div class='del'>-					last_journal_entry &amp;&amp;</div><div class='del'>-					!journal_entry_empty(last_journal_entry), c,</div><div class='del'>-				clean_but_journal_not_empty,</div><div class='del'>-				"filesystem marked clean but journal not empty")) {</div><div class='del'>-			c-&gt;sb.compat &amp;= ~(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-			SET_BCH_SB_CLEAN(c-&gt;disk_sb.sb, false);</div><div class='del'>-			c-&gt;sb.clean = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!last_journal_entry) {</div><div class='del'>-			fsck_err_on(!c-&gt;sb.clean, c,</div><div class='del'>-				    dirty_but_no_journal_entries,</div><div class='del'>-				    "no journal entries found");</div><div class='del'>-			if (clean)</div><div class='del'>-				goto use_clean;</div><div class='del'>-</div><div class='del'>-			genradix_for_each_reverse(&amp;c-&gt;journal_entries, iter, i)</div><div class='del'>-				if (*i) {</div><div class='del'>-					last_journal_entry = &amp;(*i)-&gt;j;</div><div class='del'>-					(*i)-&gt;ignore = false;</div><div class='del'>-					/*</div><div class='del'>-					 * This was probably a NO_FLUSH entry,</div><div class='del'>-					 * so last_seq was garbage - but we know</div><div class='del'>-					 * we're only using a single journal</div><div class='del'>-					 * entry, set it here:</div><div class='del'>-					 */</div><div class='del'>-					(*i)-&gt;j.last_seq = (*i)-&gt;j.seq;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_journal_keys_sort(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (c-&gt;sb.clean &amp;&amp; last_journal_entry) {</div><div class='del'>-			ret = bch2_verify_superblock_clean(c, &amp;clean,</div><div class='del'>-						      last_journal_entry);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-use_clean:</div><div class='del'>-		if (!clean) {</div><div class='del'>-			bch_err(c, "no superblock clean section found");</div><div class='del'>-			ret = -BCH_ERR_fsck_repair_impossible;</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		blacklist_seq = journal_seq = le64_to_cpu(clean-&gt;journal_seq) + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;journal_replay_seq_start	= last_seq;</div><div class='del'>-	c-&gt;journal_replay_seq_end	= blacklist_seq - 1;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.reconstruct_alloc) {</div><div class='del'>-		c-&gt;sb.compat &amp;= ~(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-		drop_alloc_keys(&amp;c-&gt;journal_keys);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	zero_out_btree_mem_ptr(&amp;c-&gt;journal_keys);</div><div class='del'>-</div><div class='del'>-	ret = journal_replay_early(c, clean);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * After an unclean shutdown, skip then next few journal sequence</div><div class='del'>-	 * numbers as they may have been referenced by btree writes that</div><div class='del'>-	 * happened before their corresponding journal writes - those btree</div><div class='del'>-	 * writes need to be ignored, by skipping and blacklisting the next few</div><div class='del'>-	 * journal sequence numbers:</div><div class='del'>-	 */</div><div class='del'>-	if (!c-&gt;sb.clean)</div><div class='del'>-		journal_seq += 8;</div><div class='del'>-</div><div class='del'>-	if (blacklist_seq != journal_seq) {</div><div class='del'>-		ret =   bch2_journal_log_msg(c, "blacklisting entries %llu-%llu",</div><div class='del'>-					     blacklist_seq, journal_seq) ?:</div><div class='del'>-			bch2_journal_seq_blacklist_add(c,</div><div class='del'>-					blacklist_seq, journal_seq);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bch_err(c, "error creating new journal seq blacklist entry");</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret =   bch2_journal_log_msg(c, "starting journal at entry %llu, replaying %llu-%llu",</div><div class='del'>-				     journal_seq, last_seq, blacklist_seq - 1) ?:</div><div class='del'>-		bch2_fs_journal_start(&amp;c-&gt;journal, journal_seq);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.reconstruct_alloc)</div><div class='del'>-		bch2_journal_log_msg(c, "dropping alloc info");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Skip past versions that might have possibly been used (as nonces),</div><div class='del'>-	 * but hadn't had their pointers written:</div><div class='del'>-	 */</div><div class='del'>-	if (c-&gt;sb.encryption_type &amp;&amp; !c-&gt;sb.clean)</div><div class='del'>-		atomic64_add(1 &lt;&lt; 16, &amp;c-&gt;key_version);</div><div class='del'>-</div><div class='del'>-	ret = read_btree_roots(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_run_recovery_passes(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	clear_bit(BCH_FS_fsck_running, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	/* If we fixed errors, verify that fs is actually clean now: */</div><div class='del'>-	if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG) &amp;&amp;</div><div class='del'>-	    test_bit(BCH_FS_errors_fixed, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_errors_not_fixed, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_error, &amp;c-&gt;flags)) {</div><div class='del'>-		bch2_flush_fsck_errs(c);</div><div class='del'>-</div><div class='del'>-		bch_info(c, "Fixed errors, running fsck a second time to verify fs is clean");</div><div class='del'>-		clear_bit(BCH_FS_errors_fixed, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-		c-&gt;curr_recovery_pass = BCH_RECOVERY_PASS_check_alloc_info;</div><div class='del'>-</div><div class='del'>-		ret = bch2_run_recovery_passes(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (test_bit(BCH_FS_errors_fixed, &amp;c-&gt;flags) ||</div><div class='del'>-		    test_bit(BCH_FS_errors_not_fixed, &amp;c-&gt;flags)) {</div><div class='del'>-			bch_err(c, "Second fsck run was not clean");</div><div class='del'>-			set_bit(BCH_FS_errors_not_fixed, &amp;c-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_bit(BCH_FS_errors_fixed, &amp;c-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (enabled_qtypes(c)) {</div><div class='del'>-		bch_verbose(c, "reading quotas");</div><div class='del'>-		ret = bch2_fs_quota_read(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-		bch_verbose(c, "quotas done");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	bool write_sb = false;</div><div class='del'>-</div><div class='del'>-	if (BCH_SB_VERSION_UPGRADE_COMPLETE(c-&gt;disk_sb.sb) != le16_to_cpu(c-&gt;disk_sb.sb-&gt;version)) {</div><div class='del'>-		SET_BCH_SB_VERSION_UPGRADE_COMPLETE(c-&gt;disk_sb.sb, le16_to_cpu(c-&gt;disk_sb.sb-&gt;version));</div><div class='del'>-		write_sb = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_error, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !(c-&gt;disk_sb.sb-&gt;compat[0] &amp; cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_alloc_info))) {</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-		write_sb = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_error, &amp;c-&gt;flags)) {</div><div class='del'>-		struct bch_sb_field_ext *ext = bch2_sb_field_get(c-&gt;disk_sb.sb, ext);</div><div class='del'>-		if (ext &amp;&amp;</div><div class='del'>-		    (!bch2_is_zero(ext-&gt;recovery_passes_required, sizeof(ext-&gt;recovery_passes_required)) ||</div><div class='del'>-		     !bch2_is_zero(ext-&gt;errors_silent, sizeof(ext-&gt;errors_silent)))) {</div><div class='del'>-			memset(ext-&gt;recovery_passes_required, 0, sizeof(ext-&gt;recovery_passes_required));</div><div class='del'>-			memset(ext-&gt;errors_silent, 0, sizeof(ext-&gt;errors_silent));</div><div class='del'>-			write_sb = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.fsck &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_error, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_errors_not_fixed, &amp;c-&gt;flags)) {</div><div class='del'>-		SET_BCH_SB_HAS_ERRORS(c-&gt;disk_sb.sb, 0);</div><div class='del'>-		SET_BCH_SB_HAS_TOPOLOGY_ERRORS(c-&gt;disk_sb.sb, 0);</div><div class='del'>-		write_sb = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write_sb)</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (!(c-&gt;sb.compat &amp; (1ULL &lt;&lt; BCH_COMPAT_extents_above_btree_updates_done)) ||</div><div class='del'>-	    c-&gt;sb.version_min &lt; bcachefs_metadata_version_btree_ptr_sectors_written) {</div><div class='del'>-		struct bch_move_stats stats;</div><div class='del'>-</div><div class='del'>-		bch2_move_stats_init(&amp;stats, "recovery");</div><div class='del'>-</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-		bch2_version_to_text(&amp;buf, c-&gt;sb.version_min);</div><div class='del'>-		bch_info(c, "scanning for old btree nodes: min_version %s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_fs_read_write_early(c) ?:</div><div class='del'>-			bch2_scan_old_btree_nodes(c, &amp;stats);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-		bch_info(c, "scanning for old btree nodes done");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;journal_seq_blacklist_table &amp;&amp;</div><div class='del'>-	    c-&gt;journal_seq_blacklist_table-&gt;nr &gt; 128)</div><div class='del'>-		queue_work(system_long_wq, &amp;c-&gt;journal_seq_blacklist_gc_work);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	bch2_flush_fsck_errs(c);</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;opts.keep_journal &amp;&amp;</div><div class='del'>-	    test_bit(JOURNAL_REPLAY_DONE, &amp;c-&gt;journal.flags))</div><div class='del'>-		bch2_journal_keys_put_initial(c);</div><div class='del'>-	kfree(clean);</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp;</div><div class='del'>-	    test_bit(BCH_FS_need_delete_dead_snapshots, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !c-&gt;opts.nochanges) {</div><div class='del'>-		bch2_fs_read_write_early(c);</div><div class='del'>-		bch2_delete_dead_snapshots_async(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	bch2_fs_emergency_read_only(c);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_initialize(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_unpacked root_inode, lostfound_inode;</div><div class='del'>-	struct bkey_inode_buf packed_inode;</div><div class='del'>-	struct qstr lostfound = QSTR("lost+found");</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch_notice(c, "initializing new filesystem");</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_extents_above_btree_updates_done);</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_bformat_overflow_done);</div><div class='del'>-</div><div class='del'>-	bch2_check_version_downgrade(c);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.version_upgrade != BCH_VERSION_UPGRADE_none) {</div><div class='del'>-		bch2_sb_upgrade(c, bcachefs_metadata_version_current);</div><div class='del'>-		SET_BCH_SB_VERSION_UPGRADE_COMPLETE(c-&gt;disk_sb.sb, bcachefs_metadata_version_current);</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	c-&gt;curr_recovery_pass = ARRAY_SIZE(recovery_pass_fns);</div><div class='del'>-	set_bit(BCH_FS_may_go_rw, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BTREE_ID_NR; i++)</div><div class='del'>-		bch2_btree_root_alloc(c, i);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca)</div><div class='del'>-		bch2_dev_usage_init(ca);</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_journal_alloc(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * journal_res_get() will crash if called before this has</div><div class='del'>-	 * set up the journal.pin FIFO and journal.cur pointer:</div><div class='del'>-	 */</div><div class='del'>-	bch2_fs_journal_start(&amp;c-&gt;journal, 1);</div><div class='del'>-	bch2_journal_set_replay_done(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_read_write_early(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write out the superblock and journal buckets, now that we can do</div><div class='del'>-	 * btree updates</div><div class='del'>-	 */</div><div class='del'>-	bch_verbose(c, "marking superblocks");</div><div class='del'>-	ret = bch2_trans_mark_dev_sbs(c);</div><div class='del'>-	bch_err_msg(c, ret, "marking superblocks");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		ca-&gt;new_fs_bucket_idx = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_freespace_init(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_initialize_subvolumes(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch_verbose(c, "reading snapshots table");</div><div class='del'>-	ret = bch2_snapshots_read(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-	bch_verbose(c, "reading snapshots done");</div><div class='del'>-</div><div class='del'>-	bch2_inode_init(c, &amp;root_inode, 0, 0, S_IFDIR|0755, 0, NULL);</div><div class='del'>-	root_inode.bi_inum	= BCACHEFS_ROOT_INO;</div><div class='del'>-	root_inode.bi_subvol	= BCACHEFS_ROOT_SUBVOL;</div><div class='del'>-	bch2_inode_pack(&amp;packed_inode, &amp;root_inode);</div><div class='del'>-	packed_inode.inode.k.p.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_insert(c, BTREE_ID_inodes, &amp;packed_inode.inode.k_i, NULL, 0);</div><div class='del'>-	bch_err_msg(c, ret, "creating root directory");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_inode_init_early(c, &amp;lostfound_inode);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		bch2_create_trans(trans,</div><div class='del'>-				  BCACHEFS_ROOT_SUBVOL_INUM,</div><div class='del'>-				  &amp;root_inode, &amp;lostfound_inode,</div><div class='del'>-				  &amp;lostfound,</div><div class='del'>-				  0, 0, S_IFDIR|0700, 0,</div><div class='del'>-				  NULL, NULL, (subvol_inum) { 0 }, 0));</div><div class='del'>-	bch_err_msg(c, ret, "creating lost+found");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	c-&gt;recovery_pass_done = ARRAY_SIZE(recovery_pass_fns) - 1;</div><div class='del'>-</div><div class='del'>-	if (enabled_qtypes(c)) {</div><div class='del'>-		ret = bch2_fs_quota_read(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_flush(&amp;c-&gt;journal);</div><div class='del'>-	bch_err_msg(c, ret, "writing first journal entry");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	SET_BCH_SB_INITIALIZED(c-&gt;disk_sb.sb, true);</div><div class='del'>-	SET_BCH_SB_CLEAN(c-&gt;disk_sb.sb, false);</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/recovery.h b/fs/bcachefs/recovery.h<br/>deleted file mode 100644<br/>index 4e9d24719b2e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/recovery.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/recovery.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_RECOVERY_H</div><div class='del'>-#define _BCACHEFS_RECOVERY_H</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_recovery_passes[];</div><div class='del'>-</div><div class='del'>-u64 bch2_recovery_passes_to_stable(u64 v);</div><div class='del'>-u64 bch2_recovery_passes_from_stable(u64 v);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For when we need to rewind recovery passes and run a pass we skipped:</div><div class='del'>- */</div><div class='del'>-static inline int bch2_run_explicit_recovery_pass(struct bch_fs *c,</div><div class='del'>-						  enum bch_recovery_pass pass)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;recovery_passes_explicit &amp; BIT_ULL(pass))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bch_info(c, "running explicit recovery pass %s (%u), currently at %s (%u)",</div><div class='del'>-		 bch2_recovery_passes[pass], pass,</div><div class='del'>-		 bch2_recovery_passes[c-&gt;curr_recovery_pass], c-&gt;curr_recovery_pass);</div><div class='del'>-</div><div class='del'>-	c-&gt;recovery_passes_explicit |= BIT_ULL(pass);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;curr_recovery_pass &gt;= pass) {</div><div class='del'>-		c-&gt;curr_recovery_pass = pass;</div><div class='del'>-		c-&gt;recovery_passes_complete &amp;= (1ULL &lt;&lt; pass) &gt;&gt; 1;</div><div class='del'>-		return -BCH_ERR_restart_recovery;</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_run_online_recovery_passes(struct bch_fs *);</div><div class='del'>-u64 bch2_fsck_recovery_passes(void);</div><div class='del'>-</div><div class='del'>-int bch2_fs_recovery(struct bch_fs *);</div><div class='del'>-int bch2_fs_initialize(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_RECOVERY_H */</div><div class='head'>diff --git a/fs/bcachefs/recovery_types.h b/fs/bcachefs/recovery_types.h<br/>deleted file mode 100644<br/>index fa0c8efd2a1b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/recovery_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/recovery_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_RECOVERY_TYPES_H</div><div class='del'>-#define _BCACHEFS_RECOVERY_TYPES_H</div><div class='del'>-</div><div class='del'>-#define PASS_SILENT		BIT(0)</div><div class='del'>-#define PASS_FSCK		BIT(1)</div><div class='del'>-#define PASS_UNCLEAN		BIT(2)</div><div class='del'>-#define PASS_ALWAYS		BIT(3)</div><div class='del'>-#define PASS_ONLINE		BIT(4)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Passes may be reordered, but the second field is a persistent identifier and</div><div class='del'>- * must never change:</div><div class='del'>- */</div><div class='del'>-#define BCH_RECOVERY_PASSES()							\</div><div class='del'>-	x(alloc_read,				 0, PASS_ALWAYS)		\</div><div class='del'>-	x(stripes_read,				 1, PASS_ALWAYS)		\</div><div class='del'>-	x(initialize_subvolumes,		 2, 0)				\</div><div class='del'>-	x(snapshots_read,			 3, PASS_ALWAYS)		\</div><div class='del'>-	x(check_topology,			 4, 0)				\</div><div class='del'>-	x(check_allocations,			 5, PASS_FSCK)			\</div><div class='del'>-	x(trans_mark_dev_sbs,			 6, PASS_ALWAYS|PASS_SILENT)	\</div><div class='del'>-	x(fs_journal_alloc,			 7, PASS_ALWAYS|PASS_SILENT)	\</div><div class='del'>-	x(set_may_go_rw,			 8, PASS_ALWAYS|PASS_SILENT)	\</div><div class='del'>-	x(journal_replay,			 9, PASS_ALWAYS)		\</div><div class='del'>-	x(check_alloc_info,			10, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_lrus,				11, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_btree_backpointers,		12, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_backpointers_to_extents,	13, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_extents_to_backpointers,	14, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_alloc_to_lru_refs,		15, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(fs_freespace_init,			16, PASS_ALWAYS|PASS_SILENT)	\</div><div class='del'>-	x(bucket_gens_init,			17, 0)				\</div><div class='del'>-	x(check_snapshot_trees,			18, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_snapshots,			19, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_subvols,			20, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(delete_dead_snapshots,		21, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(fs_upgrade_for_subvolumes,		22, 0)				\</div><div class='del'>-	x(resume_logged_ops,			23, PASS_ALWAYS)		\</div><div class='del'>-	x(check_inodes,				24, PASS_FSCK)			\</div><div class='del'>-	x(check_extents,			25, PASS_FSCK)			\</div><div class='del'>-	x(check_indirect_extents,		26, PASS_FSCK)			\</div><div class='del'>-	x(check_dirents,			27, PASS_FSCK)			\</div><div class='del'>-	x(check_xattrs,				28, PASS_FSCK)			\</div><div class='del'>-	x(check_root,				29, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_directory_structure,		30, PASS_ONLINE|PASS_FSCK)	\</div><div class='del'>-	x(check_nlinks,				31, PASS_FSCK)			\</div><div class='del'>-	x(delete_dead_inodes,			32, PASS_FSCK|PASS_UNCLEAN)	\</div><div class='del'>-	x(fix_reflink_p,			33, 0)				\</div><div class='del'>-	x(set_fs_needs_rebalance,		34, 0)				\</div><div class='del'>-</div><div class='del'>-/* We normally enumerate recovery passes in the order we run them: */</div><div class='del'>-enum bch_recovery_pass {</div><div class='del'>-#define x(n, id, when)	BCH_RECOVERY_PASS_##n,</div><div class='del'>-	BCH_RECOVERY_PASSES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* But we also need stable identifiers that can be used in the superblock */</div><div class='del'>-enum bch_recovery_pass_stable {</div><div class='del'>-#define x(n, id, when)	BCH_RECOVERY_PASS_STABLE_##n = id,</div><div class='del'>-	BCH_RECOVERY_PASSES()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_RECOVERY_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c<br/>deleted file mode 100644<br/>index c47c66c2b394..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/reflink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/reflink.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,591 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_misc.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "reflink.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-</div><div class='del'>-static inline unsigned bkey_type_to_indirect(const struct bkey *k)</div><div class='del'>-{</div><div class='del'>-	switch (k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-		return KEY_TYPE_reflink_v;</div><div class='del'>-	case KEY_TYPE_inline_data:</div><div class='del'>-		return KEY_TYPE_indirect_inline_data;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* reflink pointers */</div><div class='del'>-</div><div class='del'>-int bch2_reflink_p_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			   enum bkey_invalid_flags flags,</div><div class='del'>-			   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(le64_to_cpu(p.v-&gt;idx) &lt; le32_to_cpu(p.v-&gt;front_pad),</div><div class='del'>-			 c, err, reflink_p_front_pad_bad,</div><div class='del'>-			 "idx &lt; front_pad (%llu &lt; %u)",</div><div class='del'>-			 le64_to_cpu(p.v-&gt;idx), le32_to_cpu(p.v-&gt;front_pad));</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_reflink_p_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "idx %llu front_pad %u back_pad %u",</div><div class='del'>-	       le64_to_cpu(p.v-&gt;idx),</div><div class='del'>-	       le32_to_cpu(p.v-&gt;front_pad),</div><div class='del'>-	       le32_to_cpu(p.v-&gt;back_pad));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_reflink_p_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_reflink_p l = bkey_s_to_reflink_p(_l);</div><div class='del'>-	struct bkey_s_c_reflink_p r = bkey_s_c_to_reflink_p(_r);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disabled for now, the triggers code needs to be reworked for merging</div><div class='del'>-	 * of reflink pointers to work:</div><div class='del'>-	 */</div><div class='del'>-	return false;</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(l.v-&gt;idx) + l.k-&gt;size != le64_to_cpu(r.v-&gt;idx))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	bch2_key_resize(l.k, l.k-&gt;size + r.k-&gt;size);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int trans_trigger_reflink_p_segment(struct btree_trans *trans,</div><div class='del'>-			struct bkey_s_c_reflink_p p,</div><div class='del'>-			u64 *idx, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	__le64 *refcount;</div><div class='del'>-	int add = !(flags &amp; BTREE_TRIGGER_OVERWRITE) ? 1 : -1;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	k = bch2_bkey_get_mut_noupdate(trans, &amp;iter,</div><div class='del'>-			BTREE_ID_reflink, POS(0, *idx),</div><div class='del'>-			BTREE_ITER_WITH_UPDATES);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	refcount = bkey_refcount(bkey_i_to_s(k));</div><div class='del'>-	if (!refcount) {</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, p.s_c);</div><div class='del'>-		bch2_trans_inconsistent(trans,</div><div class='del'>-			"nonexistent indirect extent at %llu while marking\n  %s",</div><div class='del'>-			*idx, buf.buf);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*refcount &amp;&amp; (flags &amp; BTREE_TRIGGER_OVERWRITE)) {</div><div class='del'>-		bch2_bkey_val_to_text(&amp;buf, c, p.s_c);</div><div class='del'>-		bch2_trans_inconsistent(trans,</div><div class='del'>-			"indirect extent refcount underflow at %llu while marking\n  %s",</div><div class='del'>-			*idx, buf.buf);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_INSERT) {</div><div class='del'>-		struct bch_reflink_p *v = (struct bch_reflink_p *) p.v;</div><div class='del'>-		u64 pad;</div><div class='del'>-</div><div class='del'>-		pad = max_t(s64, le32_to_cpu(v-&gt;front_pad),</div><div class='del'>-			    le64_to_cpu(v-&gt;idx) - bkey_start_offset(&amp;k-&gt;k));</div><div class='del'>-		BUG_ON(pad &gt; U32_MAX);</div><div class='del'>-		v-&gt;front_pad = cpu_to_le32(pad);</div><div class='del'>-</div><div class='del'>-		pad = max_t(s64, le32_to_cpu(v-&gt;back_pad),</div><div class='del'>-			    k-&gt;k.p.offset - p.k-&gt;size - le64_to_cpu(v-&gt;idx));</div><div class='del'>-		BUG_ON(pad &gt; U32_MAX);</div><div class='del'>-		v-&gt;back_pad = cpu_to_le32(pad);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	le64_add_cpu(refcount, add);</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_pos_to_extent_start(&amp;iter);</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, k, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	*idx = k-&gt;k.p.offset;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static s64 gc_trigger_reflink_p_segment(struct btree_trans *trans,</div><div class='del'>-				struct bkey_s_c_reflink_p p,</div><div class='del'>-				u64 *idx, unsigned flags, size_t r_idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct reflink_gc *r;</div><div class='del'>-	int add = !(flags &amp; BTREE_TRIGGER_OVERWRITE) ? 1 : -1;</div><div class='del'>-	u64 start = le64_to_cpu(p.v-&gt;idx);</div><div class='del'>-	u64 end = le64_to_cpu(p.v-&gt;idx) + p.k-&gt;size;</div><div class='del'>-	u64 next_idx = end + le32_to_cpu(p.v-&gt;back_pad);</div><div class='del'>-	s64 ret = 0;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-	if (r_idx &gt;= c-&gt;reflink_gc_nr)</div><div class='del'>-		goto not_found;</div><div class='del'>-</div><div class='del'>-	r = genradix_ptr(&amp;c-&gt;reflink_gc_table, r_idx);</div><div class='del'>-	next_idx = min(next_idx, r-&gt;offset - r-&gt;size);</div><div class='del'>-	if (*idx &lt; next_idx)</div><div class='del'>-		goto not_found;</div><div class='del'>-</div><div class='del'>-	BUG_ON((s64) r-&gt;refcount + add &lt; 0);</div><div class='del'>-</div><div class='del'>-	r-&gt;refcount += add;</div><div class='del'>-	*idx = r-&gt;offset;</div><div class='del'>-	return 0;</div><div class='del'>-not_found:</div><div class='del'>-	if (fsck_err(c, reflink_p_to_missing_reflink_v,</div><div class='del'>-		     "pointer to missing indirect extent\n"</div><div class='del'>-		     "  %s\n"</div><div class='del'>-		     "  missing range %llu-%llu",</div><div class='del'>-		     (bch2_bkey_val_to_text(&amp;buf, c, p.s_c), buf.buf),</div><div class='del'>-		     *idx, next_idx)) {</div><div class='del'>-		struct bkey_i *update = bch2_bkey_make_mut_noupdate(trans, p.s_c);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(update);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (next_idx &lt;= start) {</div><div class='del'>-			bkey_i_to_reflink_p(update)-&gt;v.front_pad = cpu_to_le32(start - next_idx);</div><div class='del'>-		} else if (*idx &gt;= end) {</div><div class='del'>-			bkey_i_to_reflink_p(update)-&gt;v.back_pad = cpu_to_le32(*idx - end);</div><div class='del'>-		} else {</div><div class='del'>-			bkey_error_init(update);</div><div class='del'>-			update-&gt;k.p		= p.k-&gt;p;</div><div class='del'>-			update-&gt;k.p.offset	= next_idx;</div><div class='del'>-			update-&gt;k.size		= next_idx - *idx;</div><div class='del'>-			set_bkey_val_u64s(&amp;update-&gt;k, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_insert_trans(trans, BTREE_ID_extents, update, BTREE_TRIGGER_NORUN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*idx = next_idx;</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __trigger_reflink_p(struct btree_trans *trans,</div><div class='del'>-			    enum btree_id btree_id, unsigned level,</div><div class='del'>-			    struct bkey_s_c k, unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	u64 idx = le64_to_cpu(p.v-&gt;idx) - le32_to_cpu(p.v-&gt;front_pad);</div><div class='del'>-	u64 end = le64_to_cpu(p.v-&gt;idx) + p.k-&gt;size + le32_to_cpu(p.v-&gt;back_pad);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_TRANSACTIONAL) {</div><div class='del'>-		while (idx &lt; end &amp;&amp; !ret)</div><div class='del'>-			ret = trans_trigger_reflink_p_segment(trans, p, &amp;idx, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; BTREE_TRIGGER_GC) {</div><div class='del'>-		size_t l = 0, r = c-&gt;reflink_gc_nr;</div><div class='del'>-</div><div class='del'>-		while (l &lt; r) {</div><div class='del'>-			size_t m = l + (r - l) / 2;</div><div class='del'>-			struct reflink_gc *ref = genradix_ptr(&amp;c-&gt;reflink_gc_table, m);</div><div class='del'>-			if (ref-&gt;offset &lt;= idx)</div><div class='del'>-				l = m + 1;</div><div class='del'>-			else</div><div class='del'>-				r = m;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while (idx &lt; end &amp;&amp; !ret)</div><div class='del'>-			ret = gc_trigger_reflink_p_segment(trans, p, &amp;idx, flags, l++);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_reflink_p(struct btree_trans *trans,</div><div class='del'>-			   enum btree_id btree_id, unsigned level,</div><div class='del'>-			   struct bkey_s_c old,</div><div class='del'>-			   struct bkey_s new,</div><div class='del'>-			   unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if ((flags &amp; BTREE_TRIGGER_TRANSACTIONAL) &amp;&amp;</div><div class='del'>-	    (flags &amp; BTREE_TRIGGER_INSERT)) {</div><div class='del'>-		struct bch_reflink_p *v = bkey_s_to_reflink_p(new).v;</div><div class='del'>-</div><div class='del'>-		v-&gt;front_pad = v-&gt;back_pad = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return trigger_run_overwrite_then_insert(__trigger_reflink_p, trans, btree_id, level, old, new, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* indirect extents */</div><div class='del'>-</div><div class='del'>-int bch2_reflink_v_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			   enum bkey_invalid_flags flags,</div><div class='del'>-			   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_ptrs_invalid(c, k, flags, err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_reflink_v_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "refcount: %llu ", le64_to_cpu(r.v-&gt;refcount));</div><div class='del'>-</div><div class='del'>-	bch2_bkey_ptrs_to_text(out, c, k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-Currently disabled, needs to be debugged:</div><div class='del'>-</div><div class='del'>-bool bch2_reflink_v_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_reflink_v   l = bkey_s_to_reflink_v(_l);</div><div class='del'>-	struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(_r);</div><div class='del'>-</div><div class='del'>-	return l.v-&gt;refcount == r.v-&gt;refcount &amp;&amp; bch2_extent_merge(c, _l, _r);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void check_indirect_extent_deleting(struct bkey_s new, unsigned *flags)</div><div class='del'>-{</div><div class='del'>-	if ((*flags &amp; BTREE_TRIGGER_INSERT) &amp;&amp; !*bkey_refcount(new)) {</div><div class='del'>-		new.k-&gt;type = KEY_TYPE_deleted;</div><div class='del'>-		new.k-&gt;size = 0;</div><div class='del'>-		set_bkey_val_u64s(new.k, 0);</div><div class='del'>-		*flags &amp;= ~BTREE_TRIGGER_INSERT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_reflink_v(struct btree_trans *trans,</div><div class='del'>-			   enum btree_id btree_id, unsigned level,</div><div class='del'>-			   struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-			   unsigned flags)</div><div class='del'>-{</div><div class='del'>-	if ((flags &amp; BTREE_TRIGGER_TRANSACTIONAL) &amp;&amp;</div><div class='del'>-	    (flags &amp; BTREE_TRIGGER_INSERT))</div><div class='del'>-		check_indirect_extent_deleting(new, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return bch2_trigger_extent(trans, btree_id, level, old, new, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* indirect inline data */</div><div class='del'>-</div><div class='del'>-int bch2_indirect_inline_data_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-				      enum bkey_invalid_flags flags,</div><div class='del'>-				      struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_indirect_inline_data_to_text(struct printbuf *out,</div><div class='del'>-				       struct bch_fs *c, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_indirect_inline_data d = bkey_s_c_to_indirect_inline_data(k);</div><div class='del'>-	unsigned datalen = bkey_inline_data_bytes(k.k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "refcount %llu datalen %u: %*phN",</div><div class='del'>-	       le64_to_cpu(d.v-&gt;refcount), datalen,</div><div class='del'>-	       min(datalen, 32U), d.v-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_trigger_indirect_inline_data(struct btree_trans *trans,</div><div class='del'>-			      enum btree_id btree_id, unsigned level,</div><div class='del'>-			      struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-			      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	check_indirect_extent_deleting(new, &amp;flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_make_extent_indirect(struct btree_trans *trans,</div><div class='del'>-				     struct btree_iter *extent_iter,</div><div class='del'>-				     struct bkey_i *orig)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter reflink_iter = { NULL };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i *r_v;</div><div class='del'>-	struct bkey_i_reflink_p *r_p;</div><div class='del'>-	__le64 *refcount;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (orig-&gt;k.type == KEY_TYPE_inline_data)</div><div class='del'>-		bch2_check_set_feature(c, BCH_FEATURE_reflink_inline_data);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;reflink_iter, BTREE_ID_reflink, POS_MAX,</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_peek_prev(&amp;reflink_iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	r_v = bch2_trans_kmalloc(trans, sizeof(__le64) + bkey_bytes(&amp;orig-&gt;k));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(r_v);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;r_v-&gt;k);</div><div class='del'>-	r_v-&gt;k.type	= bkey_type_to_indirect(&amp;orig-&gt;k);</div><div class='del'>-	r_v-&gt;k.p	= reflink_iter.pos;</div><div class='del'>-	bch2_key_resize(&amp;r_v-&gt;k, orig-&gt;k.size);</div><div class='del'>-	r_v-&gt;k.version	= orig-&gt;k.version;</div><div class='del'>-</div><div class='del'>-	set_bkey_val_bytes(&amp;r_v-&gt;k, sizeof(__le64) + bkey_val_bytes(&amp;orig-&gt;k));</div><div class='del'>-</div><div class='del'>-	refcount	= bkey_refcount(bkey_i_to_s(r_v));</div><div class='del'>-	*refcount	= 0;</div><div class='del'>-	memcpy(refcount + 1, &amp;orig-&gt;v, bkey_val_bytes(&amp;orig-&gt;k));</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;reflink_iter, r_v, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * orig is in a bkey_buf which statically allocates 5 64s for the val,</div><div class='del'>-	 * so we know it will be big enough:</div><div class='del'>-	 */</div><div class='del'>-	orig-&gt;k.type = KEY_TYPE_reflink_p;</div><div class='del'>-	r_p = bkey_i_to_reflink_p(orig);</div><div class='del'>-	set_bkey_val_bytes(&amp;r_p-&gt;k, sizeof(r_p-&gt;v));</div><div class='del'>-</div><div class='del'>-	/* FORTIFY_SOURCE is broken here, and doesn't provide unsafe_memset() */</div><div class='del'>-#if !defined(__NO_FORTIFY) &amp;&amp; defined(__OPTIMIZE__) &amp;&amp; defined(CONFIG_FORTIFY_SOURCE)</div><div class='del'>-	__underlying_memset(&amp;r_p-&gt;v, 0, sizeof(r_p-&gt;v));</div><div class='del'>-#else</div><div class='del'>-	memset(&amp;r_p-&gt;v, 0, sizeof(r_p-&gt;v));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	r_p-&gt;v.idx = cpu_to_le64(bkey_start_offset(&amp;r_v-&gt;k));</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_update(trans, extent_iter, &amp;r_p-&gt;k_i,</div><div class='del'>-				BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;reflink_iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_s_c get_next_src(struct btree_iter *iter, struct bpos end)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_continue_norestart(*iter, end, 0, k, ret) {</div><div class='del'>-		if (bkey_extent_is_unwritten(k))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (bkey_extent_is_data(k.k))</div><div class='del'>-			return k;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bkey_ge(iter-&gt;pos, end))</div><div class='del'>-		bch2_btree_iter_set_pos(iter, end);</div><div class='del'>-	return ret ? bkey_s_c_err(ret) : bkey_s_c_null;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-s64 bch2_remap_range(struct bch_fs *c,</div><div class='del'>-		     subvol_inum dst_inum, u64 dst_offset,</div><div class='del'>-		     subvol_inum src_inum, u64 src_offset,</div><div class='del'>-		     u64 remap_sectors,</div><div class='del'>-		     u64 new_i_size, s64 *i_sectors_delta)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter dst_iter, src_iter;</div><div class='del'>-	struct bkey_s_c src_k;</div><div class='del'>-	struct bkey_buf new_dst, new_src;</div><div class='del'>-	struct bpos dst_start = POS(dst_inum.inum, dst_offset);</div><div class='del'>-	struct bpos src_start = POS(src_inum.inum, src_offset);</div><div class='del'>-	struct bpos dst_end = dst_start, src_end = src_start;</div><div class='del'>-	struct bch_io_opts opts;</div><div class='del'>-	struct bpos src_want;</div><div class='del'>-	u64 dst_done = 0;</div><div class='del'>-	u32 dst_snapshot, src_snapshot;</div><div class='del'>-	int ret = 0, ret2 = 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_reflink))</div><div class='del'>-		return -BCH_ERR_erofs_no_writes;</div><div class='del'>-</div><div class='del'>-	bch2_check_set_feature(c, BCH_FEATURE_reflink);</div><div class='del'>-</div><div class='del'>-	dst_end.offset += remap_sectors;</div><div class='del'>-	src_end.offset += remap_sectors;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;new_dst);</div><div class='del'>-	bch2_bkey_buf_init(&amp;new_src);</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	ret = bch2_inum_opts_get(trans, src_inum, &amp;opts);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;src_iter, BTREE_ID_extents, src_start,</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;dst_iter, BTREE_ID_extents, dst_start,</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	while ((ret == 0 ||</div><div class='del'>-		bch2_err_matches(ret, BCH_ERR_transaction_restart)) &amp;&amp;</div><div class='del'>-	       bkey_lt(dst_iter.pos, dst_end)) {</div><div class='del'>-		struct disk_reservation disk_res = { 0 };</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='del'>-			ret = -EINTR;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, src_inum.subvol,</div><div class='del'>-						  &amp;src_snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;src_iter, src_snapshot);</div><div class='del'>-</div><div class='del'>-		ret = bch2_subvolume_get_snapshot(trans, dst_inum.subvol,</div><div class='del'>-						  &amp;dst_snapshot);</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_btree_iter_set_snapshot(&amp;dst_iter, dst_snapshot);</div><div class='del'>-</div><div class='del'>-		if (dst_inum.inum &lt; src_inum.inum) {</div><div class='del'>-			/* Avoid some lock cycle transaction restarts */</div><div class='del'>-			ret = bch2_btree_iter_traverse(&amp;dst_iter);</div><div class='del'>-			if (ret)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dst_done = dst_iter.pos.offset - dst_start.offset;</div><div class='del'>-		src_want = POS(src_start.inode, src_start.offset + dst_done);</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;src_iter, src_want);</div><div class='del'>-</div><div class='del'>-		src_k = get_next_src(&amp;src_iter, src_end);</div><div class='del'>-		ret = bkey_err(src_k);</div><div class='del'>-		if (ret)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (bkey_lt(src_want, src_iter.pos)) {</div><div class='del'>-			ret = bch2_fpunch_at(trans, &amp;dst_iter, dst_inum,</div><div class='del'>-					min(dst_end.offset,</div><div class='del'>-					    dst_iter.pos.offset +</div><div class='del'>-					    src_iter.pos.offset - src_want.offset),</div><div class='del'>-					i_sectors_delta);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (src_k.k-&gt;type != KEY_TYPE_reflink_p) {</div><div class='del'>-			bch2_btree_iter_set_pos_to_extent_start(&amp;src_iter);</div><div class='del'>-</div><div class='del'>-			bch2_bkey_buf_reassemble(&amp;new_src, c, src_k);</div><div class='del'>-			src_k = bkey_i_to_s_c(new_src.k);</div><div class='del'>-</div><div class='del'>-			ret = bch2_make_extent_indirect(trans, &amp;src_iter,</div><div class='del'>-						new_src.k);</div><div class='del'>-			if (ret)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			BUG_ON(src_k.k-&gt;type != KEY_TYPE_reflink_p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (src_k.k-&gt;type == KEY_TYPE_reflink_p) {</div><div class='del'>-			struct bkey_s_c_reflink_p src_p =</div><div class='del'>-				bkey_s_c_to_reflink_p(src_k);</div><div class='del'>-			struct bkey_i_reflink_p *dst_p =</div><div class='del'>-				bkey_reflink_p_init(new_dst.k);</div><div class='del'>-</div><div class='del'>-			u64 offset = le64_to_cpu(src_p.v-&gt;idx) +</div><div class='del'>-				(src_want.offset -</div><div class='del'>-				 bkey_start_offset(src_k.k));</div><div class='del'>-</div><div class='del'>-			dst_p-&gt;v.idx = cpu_to_le64(offset);</div><div class='del'>-		} else {</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new_dst.k-&gt;k.p = dst_iter.pos;</div><div class='del'>-		bch2_key_resize(&amp;new_dst.k-&gt;k,</div><div class='del'>-				min(src_k.k-&gt;p.offset - src_want.offset,</div><div class='del'>-				    dst_end.offset - dst_iter.pos.offset));</div><div class='del'>-</div><div class='del'>-		ret =   bch2_bkey_set_needs_rebalance(c, new_dst.k, &amp;opts) ?:</div><div class='del'>-			bch2_extent_update(trans, dst_inum, &amp;dst_iter,</div><div class='del'>-					new_dst.k, &amp;disk_res,</div><div class='del'>-					new_i_size, i_sectors_delta,</div><div class='del'>-					true);</div><div class='del'>-		bch2_disk_reservation_put(c, &amp;disk_res);</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dst_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;src_iter);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ret &amp;&amp; !bkey_eq(dst_iter.pos, dst_end));</div><div class='del'>-	BUG_ON(bkey_gt(dst_iter.pos, dst_end));</div><div class='del'>-</div><div class='del'>-	dst_done = dst_iter.pos.offset - dst_start.offset;</div><div class='del'>-	new_i_size = min(dst_iter.pos.offset &lt;&lt; 9, new_i_size);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct bch_inode_unpacked inode_u;</div><div class='del'>-		struct btree_iter inode_iter = { NULL };</div><div class='del'>-</div><div class='del'>-		bch2_trans_begin(trans);</div><div class='del'>-</div><div class='del'>-		ret2 = bch2_inode_peek(trans, &amp;inode_iter, &amp;inode_u,</div><div class='del'>-				       dst_inum, BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-		if (!ret2 &amp;&amp;</div><div class='del'>-		    inode_u.bi_size &lt; new_i_size) {</div><div class='del'>-			inode_u.bi_size = new_i_size;</div><div class='del'>-			ret2  = bch2_inode_write(trans, &amp;inode_iter, &amp;inode_u) ?:</div><div class='del'>-				bch2_trans_commit(trans, NULL, NULL,</div><div class='del'>-						  BCH_TRANS_COMMIT_no_enospc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-	} while (bch2_err_matches(ret2, BCH_ERR_transaction_restart));</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;new_src, c);</div><div class='del'>-	bch2_bkey_buf_exit(&amp;new_dst, c);</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_reflink);</div><div class='del'>-</div><div class='del'>-	return dst_done ?: ret ?: ret2;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/reflink.h b/fs/bcachefs/reflink.h<br/>deleted file mode 100644<br/>index 4d8867289717..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/reflink.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/reflink.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_REFLINK_H</div><div class='del'>-#define _BCACHEFS_REFLINK_H</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-</div><div class='del'>-int bch2_reflink_p_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			   enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_reflink_p_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			    struct bkey_s_c);</div><div class='del'>-bool bch2_reflink_p_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);</div><div class='del'>-int bch2_trigger_reflink_p(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-			   struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_reflink_p ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_reflink_p_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_reflink_p_to_text,		\</div><div class='del'>-	.key_merge	= bch2_reflink_p_merge,			\</div><div class='del'>-	.trigger	= bch2_trigger_reflink_p,		\</div><div class='del'>-	.min_val_size	= 16,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_reflink_v_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			   enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_reflink_v_to_text(struct printbuf *, struct bch_fs *,</div><div class='del'>-			    struct bkey_s_c);</div><div class='del'>-int bch2_trigger_reflink_v(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-			      struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_reflink_v ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_reflink_v_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_reflink_v_to_text,		\</div><div class='del'>-	.swab		= bch2_ptr_swab,			\</div><div class='del'>-	.trigger	= bch2_trigger_reflink_v,		\</div><div class='del'>-	.min_val_size	= 8,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_indirect_inline_data_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-				      enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_indirect_inline_data_to_text(struct printbuf *,</div><div class='del'>-				struct bch_fs *, struct bkey_s_c);</div><div class='del'>-int bch2_trigger_indirect_inline_data(struct btree_trans *,</div><div class='del'>-					 enum btree_id, unsigned,</div><div class='del'>-			      struct bkey_s_c, struct bkey_s,</div><div class='del'>-			      unsigned);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_indirect_inline_data ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_indirect_inline_data_invalid,	\</div><div class='del'>-	.val_to_text	= bch2_indirect_inline_data_to_text,	\</div><div class='del'>-	.trigger	= bch2_trigger_indirect_inline_data,	\</div><div class='del'>-	.min_val_size	= 8,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline const __le64 *bkey_refcount_c(struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-		return &amp;bkey_s_c_to_reflink_v(k).v-&gt;refcount;</div><div class='del'>-	case KEY_TYPE_indirect_inline_data:</div><div class='del'>-		return &amp;bkey_s_c_to_indirect_inline_data(k).v-&gt;refcount;</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __le64 *bkey_refcount(struct bkey_s k)</div><div class='del'>-{</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-		return &amp;bkey_s_to_reflink_v(k).v-&gt;refcount;</div><div class='del'>-	case KEY_TYPE_indirect_inline_data:</div><div class='del'>-		return &amp;bkey_s_to_indirect_inline_data(k).v-&gt;refcount;</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-s64 bch2_remap_range(struct bch_fs *, subvol_inum, u64,</div><div class='del'>-		     subvol_inum, u64, u64, u64, s64 *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_REFLINK_H */</div><div class='head'>diff --git a/fs/bcachefs/reflink_format.h b/fs/bcachefs/reflink_format.h<br/>deleted file mode 100644<br/>index 6772eebb1fc6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/reflink_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/reflink_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_REFLINK_FORMAT_H</div><div class='del'>-#define _BCACHEFS_REFLINK_FORMAT_H</div><div class='del'>-</div><div class='del'>-struct bch_reflink_p {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le64			idx;</div><div class='del'>-	/*</div><div class='del'>-	 * A reflink pointer might point to an indirect extent which is then</div><div class='del'>-	 * later split (by copygc or rebalance). If we only pointed to part of</div><div class='del'>-	 * the original indirect extent, and then one of the fragments is</div><div class='del'>-	 * outside the range we point to, we'd leak a refcount: so when creating</div><div class='del'>-	 * reflink pointers, we need to store pad values to remember the full</div><div class='del'>-	 * range we were taking a reference on.</div><div class='del'>-	 */</div><div class='del'>-	__le32			front_pad;</div><div class='del'>-	__le32			back_pad;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_reflink_v {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le64			refcount;</div><div class='del'>-	union bch_extent_entry	start[0];</div><div class='del'>-	__u64			_data[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-struct bch_indirect_inline_data {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le64			refcount;</div><div class='del'>-	u8			data[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_REFLINK_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/replicas.c b/fs/bcachefs/replicas.c<br/>deleted file mode 100644<br/>index cc2672c12031..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/replicas.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/replicas.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1053 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-static int bch2_cpu_replicas_to_sb_replicas(struct bch_fs *,</div><div class='del'>-					    struct bch_replicas_cpu *);</div><div class='del'>-</div><div class='del'>-/* Some (buggy!) compilers don't allow memcmp to be passed as a pointer */</div><div class='del'>-static int bch2_memcmp(const void *l, const void *r, size_t size)</div><div class='del'>-{</div><div class='del'>-	return memcmp(l, r, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replicas tracking - in memory: */</div><div class='del'>-</div><div class='del'>-static void verify_replicas_entry(struct bch_replicas_entry_v1 *e)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(e-&gt;data_type &gt;= BCH_DATA_NR);</div><div class='del'>-	BUG_ON(!e-&gt;nr_devs);</div><div class='del'>-	BUG_ON(e-&gt;nr_required &gt; 1 &amp;&amp;</div><div class='del'>-	       e-&gt;nr_required &gt;= e-&gt;nr_devs);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i + 1 &lt; e-&gt;nr_devs; i++)</div><div class='del'>-		BUG_ON(e-&gt;devs[i] &gt;= e-&gt;devs[i + 1]);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_replicas_entry_sort(struct bch_replicas_entry_v1 *e)</div><div class='del'>-{</div><div class='del'>-	bubble_sort(e-&gt;devs, e-&gt;nr_devs, u8_cmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_cpu_replicas_sort(struct bch_replicas_cpu *r)</div><div class='del'>-{</div><div class='del'>-	eytzinger0_sort(r-&gt;entries, r-&gt;nr, r-&gt;entry_size, bch2_memcmp, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_replicas_entry_v0_to_text(struct printbuf *out,</div><div class='del'>-					   struct bch_replicas_entry_v0 *e)</div><div class='del'>-{</div><div class='del'>-	bch2_prt_data_type(out, e-&gt;data_type);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, ": %u [", e-&gt;nr_devs);</div><div class='del'>-	for (unsigned i = 0; i &lt; e-&gt;nr_devs; i++)</div><div class='del'>-		prt_printf(out, i ? " %u" : "%u", e-&gt;devs[i]);</div><div class='del'>-	prt_printf(out, "]");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_replicas_entry_to_text(struct printbuf *out,</div><div class='del'>-				 struct bch_replicas_entry_v1 *e)</div><div class='del'>-{</div><div class='del'>-	bch2_prt_data_type(out, e-&gt;data_type);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, ": %u/%u [", e-&gt;nr_required, e-&gt;nr_devs);</div><div class='del'>-	for (unsigned i = 0; i &lt; e-&gt;nr_devs; i++)</div><div class='del'>-		prt_printf(out, i ? " %u" : "%u", e-&gt;devs[i]);</div><div class='del'>-	prt_printf(out, "]");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_entry_validate(struct bch_replicas_entry_v1 *r,</div><div class='del'>-				 struct bch_sb *sb,</div><div class='del'>-				 struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	if (!r-&gt;nr_devs) {</div><div class='del'>-		prt_printf(err, "no devices in entry ");</div><div class='del'>-		goto bad;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (r-&gt;nr_required &gt; 1 &amp;&amp;</div><div class='del'>-	    r-&gt;nr_required &gt;= r-&gt;nr_devs) {</div><div class='del'>-		prt_printf(err, "bad nr_required in entry ");</div><div class='del'>-		goto bad;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; r-&gt;nr_devs; i++)</div><div class='del'>-		if (!bch2_dev_exists(sb, r-&gt;devs[i])) {</div><div class='del'>-			prt_printf(err, "invalid device %u in entry ", r-&gt;devs[i]);</div><div class='del'>-			goto bad;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-bad:</div><div class='del'>-	bch2_replicas_entry_to_text(err, r);</div><div class='del'>-	return -BCH_ERR_invalid_replicas_entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_cpu_replicas_to_text(struct printbuf *out,</div><div class='del'>-			       struct bch_replicas_cpu *r)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_entry_v1 *e;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	for_each_cpu_replicas_entry(r, e) {</div><div class='del'>-		if (!first)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-		first = false;</div><div class='del'>-</div><div class='del'>-		bch2_replicas_entry_to_text(out, e);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void extent_to_replicas(struct bkey_s_c k,</div><div class='del'>-			       struct bch_replicas_entry_v1 *r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-	const union bch_extent_entry *entry;</div><div class='del'>-	struct extent_ptr_decoded p;</div><div class='del'>-</div><div class='del'>-	r-&gt;nr_required	= 1;</div><div class='del'>-</div><div class='del'>-	bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {</div><div class='del'>-		if (p.ptr.cached)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!p.has_ec)</div><div class='del'>-			r-&gt;devs[r-&gt;nr_devs++] = p.ptr.dev;</div><div class='del'>-		else</div><div class='del'>-			r-&gt;nr_required = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stripe_to_replicas(struct bkey_s_c k,</div><div class='del'>-			       struct bch_replicas_entry_v1 *r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_stripe s = bkey_s_c_to_stripe(k);</div><div class='del'>-	const struct bch_extent_ptr *ptr;</div><div class='del'>-</div><div class='del'>-	r-&gt;nr_required	= s.v-&gt;nr_blocks - s.v-&gt;nr_redundant;</div><div class='del'>-</div><div class='del'>-	for (ptr = s.v-&gt;ptrs;</div><div class='del'>-	     ptr &lt; s.v-&gt;ptrs + s.v-&gt;nr_blocks;</div><div class='del'>-	     ptr++)</div><div class='del'>-		r-&gt;devs[r-&gt;nr_devs++] = ptr-&gt;dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bkey_to_replicas(struct bch_replicas_entry_v1 *e,</div><div class='del'>-			   struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	e-&gt;nr_devs = 0;</div><div class='del'>-</div><div class='del'>-	switch (k.k-&gt;type) {</div><div class='del'>-	case KEY_TYPE_btree_ptr:</div><div class='del'>-	case KEY_TYPE_btree_ptr_v2:</div><div class='del'>-		e-&gt;data_type = BCH_DATA_btree;</div><div class='del'>-		extent_to_replicas(k, e);</div><div class='del'>-		break;</div><div class='del'>-	case KEY_TYPE_extent:</div><div class='del'>-	case KEY_TYPE_reflink_v:</div><div class='del'>-		e-&gt;data_type = BCH_DATA_user;</div><div class='del'>-		extent_to_replicas(k, e);</div><div class='del'>-		break;</div><div class='del'>-	case KEY_TYPE_stripe:</div><div class='del'>-		e-&gt;data_type = BCH_DATA_parity;</div><div class='del'>-		stripe_to_replicas(k, e);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_replicas_entry_sort(e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_devlist_to_replicas(struct bch_replicas_entry_v1 *e,</div><div class='del'>-			      enum bch_data_type data_type,</div><div class='del'>-			      struct bch_devs_list devs)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!data_type ||</div><div class='del'>-	       data_type == BCH_DATA_sb ||</div><div class='del'>-	       data_type &gt;= BCH_DATA_NR);</div><div class='del'>-</div><div class='del'>-	e-&gt;data_type	= data_type;</div><div class='del'>-	e-&gt;nr_devs	= 0;</div><div class='del'>-	e-&gt;nr_required	= 1;</div><div class='del'>-</div><div class='del'>-	darray_for_each(devs, i)</div><div class='del'>-		e-&gt;devs[e-&gt;nr_devs++] = *i;</div><div class='del'>-</div><div class='del'>-	bch2_replicas_entry_sort(e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_replicas_cpu</div><div class='del'>-cpu_replicas_add_entry(struct bch_fs *c,</div><div class='del'>-		       struct bch_replicas_cpu *old,</div><div class='del'>-		       struct bch_replicas_entry_v1 *new_entry)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-	struct bch_replicas_cpu new = {</div><div class='del'>-		.nr		= old-&gt;nr + 1,</div><div class='del'>-		.entry_size	= max_t(unsigned, old-&gt;entry_size,</div><div class='del'>-					replicas_entry_bytes(new_entry)),</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; new_entry-&gt;nr_devs; i++)</div><div class='del'>-		BUG_ON(!bch2_dev_exists2(c, new_entry-&gt;devs[i]));</div><div class='del'>-</div><div class='del'>-	BUG_ON(!new_entry-&gt;data_type);</div><div class='del'>-	verify_replicas_entry(new_entry);</div><div class='del'>-</div><div class='del'>-	new.entries = kcalloc(new.nr, new.entry_size, GFP_KERNEL);</div><div class='del'>-	if (!new.entries)</div><div class='del'>-		return new;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; old-&gt;nr; i++)</div><div class='del'>-		memcpy(cpu_replicas_entry(&amp;new, i),</div><div class='del'>-		       cpu_replicas_entry(old, i),</div><div class='del'>-		       old-&gt;entry_size);</div><div class='del'>-</div><div class='del'>-	memcpy(cpu_replicas_entry(&amp;new, old-&gt;nr),</div><div class='del'>-	       new_entry,</div><div class='del'>-	       replicas_entry_bytes(new_entry));</div><div class='del'>-</div><div class='del'>-	bch2_cpu_replicas_sort(&amp;new);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __replicas_entry_idx(struct bch_replicas_cpu *r,</div><div class='del'>-				       struct bch_replicas_entry_v1 *search)</div><div class='del'>-{</div><div class='del'>-	int idx, entry_size = replicas_entry_bytes(search);</div><div class='del'>-</div><div class='del'>-	if (unlikely(entry_size &gt; r-&gt;entry_size))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	verify_replicas_entry(search);</div><div class='del'>-</div><div class='del'>-#define entry_cmp(_l, _r, size)	memcmp(_l, _r, entry_size)</div><div class='del'>-	idx = eytzinger0_find(r-&gt;entries, r-&gt;nr, r-&gt;entry_size,</div><div class='del'>-			      entry_cmp, search);</div><div class='del'>-#undef entry_cmp</div><div class='del'>-</div><div class='del'>-	return idx &lt; r-&gt;nr ? idx : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_entry_idx(struct bch_fs *c,</div><div class='del'>-			    struct bch_replicas_entry_v1 *search)</div><div class='del'>-{</div><div class='del'>-	bch2_replicas_entry_sort(search);</div><div class='del'>-</div><div class='del'>-	return __replicas_entry_idx(&amp;c-&gt;replicas, search);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool __replicas_has_entry(struct bch_replicas_cpu *r,</div><div class='del'>-				 struct bch_replicas_entry_v1 *search)</div><div class='del'>-{</div><div class='del'>-	return __replicas_entry_idx(r, search) &gt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_replicas_marked(struct bch_fs *c,</div><div class='del'>-			  struct bch_replicas_entry_v1 *search)</div><div class='del'>-{</div><div class='del'>-	bool marked;</div><div class='del'>-</div><div class='del'>-	if (!search-&gt;nr_devs)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	verify_replicas_entry(search);</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	marked = __replicas_has_entry(&amp;c-&gt;replicas, search) &amp;&amp;</div><div class='del'>-		(likely((!c-&gt;replicas_gc.entries)) ||</div><div class='del'>-		 __replicas_has_entry(&amp;c-&gt;replicas_gc, search));</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	return marked;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __replicas_table_update(struct bch_fs_usage *dst,</div><div class='del'>-				    struct bch_replicas_cpu *dst_r,</div><div class='del'>-				    struct bch_fs_usage *src,</div><div class='del'>-				    struct bch_replicas_cpu *src_r)</div><div class='del'>-{</div><div class='del'>-	int src_idx, dst_idx;</div><div class='del'>-</div><div class='del'>-	*dst = *src;</div><div class='del'>-</div><div class='del'>-	for (src_idx = 0; src_idx &lt; src_r-&gt;nr; src_idx++) {</div><div class='del'>-		if (!src-&gt;replicas[src_idx])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		dst_idx = __replicas_entry_idx(dst_r,</div><div class='del'>-				cpu_replicas_entry(src_r, src_idx));</div><div class='del'>-		BUG_ON(dst_idx &lt; 0);</div><div class='del'>-</div><div class='del'>-		dst-&gt;replicas[dst_idx] = src-&gt;replicas[src_idx];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __replicas_table_update_pcpu(struct bch_fs_usage __percpu *dst_p,</div><div class='del'>-				    struct bch_replicas_cpu *dst_r,</div><div class='del'>-				    struct bch_fs_usage __percpu *src_p,</div><div class='del'>-				    struct bch_replicas_cpu *src_r)</div><div class='del'>-{</div><div class='del'>-	unsigned src_nr = sizeof(struct bch_fs_usage) / sizeof(u64) + src_r-&gt;nr;</div><div class='del'>-	struct bch_fs_usage *dst, *src = (void *)</div><div class='del'>-		bch2_acc_percpu_u64s((u64 __percpu *) src_p, src_nr);</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	dst = this_cpu_ptr(dst_p);</div><div class='del'>-	preempt_enable();</div><div class='del'>-</div><div class='del'>-	__replicas_table_update(dst, dst_r, src, src_r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Resize filesystem accounting:</div><div class='del'>- */</div><div class='del'>-static int replicas_table_update(struct bch_fs *c,</div><div class='del'>-				 struct bch_replicas_cpu *new_r)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs_usage __percpu *new_usage[JOURNAL_BUF_NR];</div><div class='del'>-	struct bch_fs_usage_online *new_scratch = NULL;</div><div class='del'>-	struct bch_fs_usage __percpu *new_gc = NULL;</div><div class='del'>-	struct bch_fs_usage *new_base = NULL;</div><div class='del'>-	unsigned i, bytes = sizeof(struct bch_fs_usage) +</div><div class='del'>-		sizeof(u64) * new_r-&gt;nr;</div><div class='del'>-	unsigned scratch_bytes = sizeof(struct bch_fs_usage_online) +</div><div class='del'>-		sizeof(u64) * new_r-&gt;nr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	memset(new_usage, 0, sizeof(new_usage));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(new_usage); i++)</div><div class='del'>-		if (!(new_usage[i] = __alloc_percpu_gfp(bytes,</div><div class='del'>-					sizeof(u64), GFP_KERNEL)))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-	if (!(new_base = kzalloc(bytes, GFP_KERNEL)) ||</div><div class='del'>-	    !(new_scratch  = kmalloc(scratch_bytes, GFP_KERNEL)) ||</div><div class='del'>-	    (c-&gt;usage_gc &amp;&amp;</div><div class='del'>-	     !(new_gc = __alloc_percpu_gfp(bytes, sizeof(u64), GFP_KERNEL))))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(new_usage); i++)</div><div class='del'>-		if (c-&gt;usage[i])</div><div class='del'>-			__replicas_table_update_pcpu(new_usage[i], new_r,</div><div class='del'>-						     c-&gt;usage[i], &amp;c-&gt;replicas);</div><div class='del'>-	if (c-&gt;usage_base)</div><div class='del'>-		__replicas_table_update(new_base,		new_r,</div><div class='del'>-					c-&gt;usage_base,		&amp;c-&gt;replicas);</div><div class='del'>-	if (c-&gt;usage_gc)</div><div class='del'>-		__replicas_table_update_pcpu(new_gc,		new_r,</div><div class='del'>-					     c-&gt;usage_gc,	&amp;c-&gt;replicas);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(new_usage); i++)</div><div class='del'>-		swap(c-&gt;usage[i],	new_usage[i]);</div><div class='del'>-	swap(c-&gt;usage_base,	new_base);</div><div class='del'>-	swap(c-&gt;usage_scratch,	new_scratch);</div><div class='del'>-	swap(c-&gt;usage_gc,	new_gc);</div><div class='del'>-	swap(c-&gt;replicas,	*new_r);</div><div class='del'>-out:</div><div class='del'>-	free_percpu(new_gc);</div><div class='del'>-	kfree(new_scratch);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(new_usage); i++)</div><div class='del'>-		free_percpu(new_usage[i]);</div><div class='del'>-	kfree(new_base);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	bch_err(c, "error updating replicas table: memory allocation failure");</div><div class='del'>-	ret = -BCH_ERR_ENOMEM_replicas_table;</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned reserve_journal_replicas(struct bch_fs *c,</div><div class='del'>-				     struct bch_replicas_cpu *r)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_entry_v1 *e;</div><div class='del'>-	unsigned journal_res_u64s = 0;</div><div class='del'>-</div><div class='del'>-	/* nr_inodes: */</div><div class='del'>-	journal_res_u64s +=</div><div class='del'>-		DIV_ROUND_UP(sizeof(struct jset_entry_usage), sizeof(u64));</div><div class='del'>-</div><div class='del'>-	/* key_version: */</div><div class='del'>-	journal_res_u64s +=</div><div class='del'>-		DIV_ROUND_UP(sizeof(struct jset_entry_usage), sizeof(u64));</div><div class='del'>-</div><div class='del'>-	/* persistent_reserved: */</div><div class='del'>-	journal_res_u64s +=</div><div class='del'>-		DIV_ROUND_UP(sizeof(struct jset_entry_usage), sizeof(u64)) *</div><div class='del'>-		BCH_REPLICAS_MAX;</div><div class='del'>-</div><div class='del'>-	for_each_cpu_replicas_entry(r, e)</div><div class='del'>-		journal_res_u64s +=</div><div class='del'>-			DIV_ROUND_UP(sizeof(struct jset_entry_data_usage) +</div><div class='del'>-				     e-&gt;nr_devs, sizeof(u64));</div><div class='del'>-	return journal_res_u64s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline</div><div class='del'>-static int bch2_mark_replicas_slowpath(struct bch_fs *c,</div><div class='del'>-				struct bch_replicas_entry_v1 *new_entry)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_cpu new_r, new_gc;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	verify_replicas_entry(new_entry);</div><div class='del'>-</div><div class='del'>-	memset(&amp;new_r, 0, sizeof(new_r));</div><div class='del'>-	memset(&amp;new_gc, 0, sizeof(new_gc));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;replicas_gc.entries &amp;&amp;</div><div class='del'>-	    !__replicas_has_entry(&amp;c-&gt;replicas_gc, new_entry)) {</div><div class='del'>-		new_gc = cpu_replicas_add_entry(c, &amp;c-&gt;replicas_gc, new_entry);</div><div class='del'>-		if (!new_gc.entries) {</div><div class='del'>-			ret = -BCH_ERR_ENOMEM_cpu_replicas;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!__replicas_has_entry(&amp;c-&gt;replicas, new_entry)) {</div><div class='del'>-		new_r = cpu_replicas_add_entry(c, &amp;c-&gt;replicas, new_entry);</div><div class='del'>-		if (!new_r.entries) {</div><div class='del'>-			ret = -BCH_ERR_ENOMEM_cpu_replicas;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = bch2_cpu_replicas_to_sb_replicas(c, &amp;new_r);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		bch2_journal_entry_res_resize(&amp;c-&gt;journal,</div><div class='del'>-				&amp;c-&gt;replicas_journal_res,</div><div class='del'>-				reserve_journal_replicas(c, &amp;new_r));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!new_r.entries &amp;&amp;</div><div class='del'>-	    !new_gc.entries)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* allocations done, now commit: */</div><div class='del'>-</div><div class='del'>-	if (new_r.entries)</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-</div><div class='del'>-	/* don't update in memory replicas until changes are persistent */</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-	if (new_r.entries)</div><div class='del'>-		ret = replicas_table_update(c, &amp;new_r);</div><div class='del'>-	if (new_gc.entries)</div><div class='del'>-		swap(new_gc, c-&gt;replicas_gc);</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	kfree(new_r.entries);</div><div class='del'>-	kfree(new_gc.entries);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	bch_err_msg(c, ret, "adding replicas entry");</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_mark_replicas(struct bch_fs *c, struct bch_replicas_entry_v1 *r)</div><div class='del'>-{</div><div class='del'>-	return likely(bch2_replicas_marked(c, r))</div><div class='del'>-		? 0 : bch2_mark_replicas_slowpath(c, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* replicas delta list: */</div><div class='del'>-</div><div class='del'>-int bch2_replicas_delta_list_mark(struct bch_fs *c,</div><div class='del'>-				  struct replicas_delta_list *r)</div><div class='del'>-{</div><div class='del'>-	struct replicas_delta *d = r-&gt;d;</div><div class='del'>-	struct replicas_delta *top = (void *) r-&gt;d + r-&gt;used;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (d = r-&gt;d; !ret &amp;&amp; d != top; d = replicas_delta_next(d))</div><div class='del'>-		ret = bch2_mark_replicas(c, &amp;d-&gt;r);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Old replicas_gc mechanism: only used for journal replicas entries now, should</div><div class='del'>- * die at some point:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int bch2_replicas_gc_end(struct bch_fs *c, int ret)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;replicas_gc_lock);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	ret =   ret ?:</div><div class='del'>-		bch2_cpu_replicas_to_sb_replicas(c, &amp;c-&gt;replicas_gc) ?:</div><div class='del'>-		replicas_table_update(c, &amp;c-&gt;replicas_gc);</div><div class='del'>-</div><div class='del'>-	kfree(c-&gt;replicas_gc.entries);</div><div class='del'>-	c-&gt;replicas_gc.entries = NULL;</div><div class='del'>-</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_gc_start(struct bch_fs *c, unsigned typemask)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_entry_v1 *e;</div><div class='del'>-	unsigned i = 0;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;replicas_gc_lock);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	BUG_ON(c-&gt;replicas_gc.entries);</div><div class='del'>-</div><div class='del'>-	c-&gt;replicas_gc.nr		= 0;</div><div class='del'>-	c-&gt;replicas_gc.entry_size	= 0;</div><div class='del'>-</div><div class='del'>-	for_each_cpu_replicas_entry(&amp;c-&gt;replicas, e)</div><div class='del'>-		if (!((1 &lt;&lt; e-&gt;data_type) &amp; typemask)) {</div><div class='del'>-			c-&gt;replicas_gc.nr++;</div><div class='del'>-			c-&gt;replicas_gc.entry_size =</div><div class='del'>-				max_t(unsigned, c-&gt;replicas_gc.entry_size,</div><div class='del'>-				      replicas_entry_bytes(e));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	c-&gt;replicas_gc.entries = kcalloc(c-&gt;replicas_gc.nr,</div><div class='del'>-					 c-&gt;replicas_gc.entry_size,</div><div class='del'>-					 GFP_KERNEL);</div><div class='del'>-	if (!c-&gt;replicas_gc.entries) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		bch_err(c, "error allocating c-&gt;replicas_gc");</div><div class='del'>-		return -BCH_ERR_ENOMEM_replicas_gc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_cpu_replicas_entry(&amp;c-&gt;replicas, e)</div><div class='del'>-		if (!((1 &lt;&lt; e-&gt;data_type) &amp; typemask))</div><div class='del'>-			memcpy(cpu_replicas_entry(&amp;c-&gt;replicas_gc, i++),</div><div class='del'>-			       e, c-&gt;replicas_gc.entry_size);</div><div class='del'>-</div><div class='del'>-	bch2_cpu_replicas_sort(&amp;c-&gt;replicas_gc);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * New much simpler mechanism for clearing out unneeded replicas entries - drop</div><div class='del'>- * replicas entries that have 0 sectors used.</div><div class='del'>- *</div><div class='del'>- * However, we don't track sector counts for journal usage, so this doesn't drop</div><div class='del'>- * any BCH_DATA_journal entries; the old bch2_replicas_gc_(start|end) mechanism</div><div class='del'>- * is retained for that.</div><div class='del'>- */</div><div class='del'>-int bch2_replicas_gc2(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_cpu new = { 0 };</div><div class='del'>-	unsigned i, nr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_journal_meta(&amp;c-&gt;journal);</div><div class='del'>-retry:</div><div class='del'>-	nr		= READ_ONCE(c-&gt;replicas.nr);</div><div class='del'>-	new.entry_size	= READ_ONCE(c-&gt;replicas.entry_size);</div><div class='del'>-	new.entries	= kcalloc(nr, new.entry_size, GFP_KERNEL);</div><div class='del'>-	if (!new.entries) {</div><div class='del'>-		bch_err(c, "error allocating c-&gt;replicas_gc");</div><div class='del'>-		return -BCH_ERR_ENOMEM_replicas_gc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (nr			!= c-&gt;replicas.nr ||</div><div class='del'>-	    new.entry_size	!= c-&gt;replicas.entry_size) {</div><div class='del'>-		percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		kfree(new.entries);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;replicas.nr; i++) {</div><div class='del'>-		struct bch_replicas_entry_v1 *e =</div><div class='del'>-			cpu_replicas_entry(&amp;c-&gt;replicas, i);</div><div class='del'>-</div><div class='del'>-		if (e-&gt;data_type == BCH_DATA_journal ||</div><div class='del'>-		    c-&gt;usage_base-&gt;replicas[i] ||</div><div class='del'>-		    percpu_u64_get(&amp;c-&gt;usage[0]-&gt;replicas[i]) ||</div><div class='del'>-		    percpu_u64_get(&amp;c-&gt;usage[1]-&gt;replicas[i]) ||</div><div class='del'>-		    percpu_u64_get(&amp;c-&gt;usage[2]-&gt;replicas[i]) ||</div><div class='del'>-		    percpu_u64_get(&amp;c-&gt;usage[3]-&gt;replicas[i]))</div><div class='del'>-			memcpy(cpu_replicas_entry(&amp;new, new.nr++),</div><div class='del'>-			       e, new.entry_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_cpu_replicas_sort(&amp;new);</div><div class='del'>-</div><div class='del'>-	ret =   bch2_cpu_replicas_to_sb_replicas(c, &amp;new) ?:</div><div class='del'>-		replicas_table_update(c, &amp;new);</div><div class='del'>-</div><div class='del'>-	kfree(new.entries);</div><div class='del'>-</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_set_usage(struct bch_fs *c,</div><div class='del'>-			    struct bch_replicas_entry_v1 *r,</div><div class='del'>-			    u64 sectors)</div><div class='del'>-{</div><div class='del'>-	int ret, idx = bch2_replicas_entry_idx(c, r);</div><div class='del'>-</div><div class='del'>-	if (idx &lt; 0) {</div><div class='del'>-		struct bch_replicas_cpu n;</div><div class='del'>-</div><div class='del'>-		n = cpu_replicas_add_entry(c, &amp;c-&gt;replicas, r);</div><div class='del'>-		if (!n.entries)</div><div class='del'>-			return -BCH_ERR_ENOMEM_cpu_replicas;</div><div class='del'>-</div><div class='del'>-		ret = replicas_table_update(c, &amp;n);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		kfree(n.entries);</div><div class='del'>-</div><div class='del'>-		idx = bch2_replicas_entry_idx(c, r);</div><div class='del'>-		BUG_ON(ret &lt; 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;usage_base-&gt;replicas[idx] = sectors;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replicas tracking - superblock: */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__bch2_sb_replicas_to_cpu_replicas(struct bch_sb_field_replicas *sb_r,</div><div class='del'>-				   struct bch_replicas_cpu *cpu_r)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_entry_v1 *e, *dst;</div><div class='del'>-	unsigned nr = 0, entry_size = 0, idx = 0;</div><div class='del'>-</div><div class='del'>-	for_each_replicas_entry(sb_r, e) {</div><div class='del'>-		entry_size = max_t(unsigned, entry_size,</div><div class='del'>-				   replicas_entry_bytes(e));</div><div class='del'>-		nr++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cpu_r-&gt;entries = kcalloc(nr, entry_size, GFP_KERNEL);</div><div class='del'>-	if (!cpu_r-&gt;entries)</div><div class='del'>-		return -BCH_ERR_ENOMEM_cpu_replicas;</div><div class='del'>-</div><div class='del'>-	cpu_r-&gt;nr		= nr;</div><div class='del'>-	cpu_r-&gt;entry_size	= entry_size;</div><div class='del'>-</div><div class='del'>-	for_each_replicas_entry(sb_r, e) {</div><div class='del'>-		dst = cpu_replicas_entry(cpu_r, idx++);</div><div class='del'>-		memcpy(dst, e, replicas_entry_bytes(e));</div><div class='del'>-		bch2_replicas_entry_sort(dst);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__bch2_sb_replicas_v0_to_cpu_replicas(struct bch_sb_field_replicas_v0 *sb_r,</div><div class='del'>-				      struct bch_replicas_cpu *cpu_r)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_entry_v0 *e;</div><div class='del'>-	unsigned nr = 0, entry_size = 0, idx = 0;</div><div class='del'>-</div><div class='del'>-	for_each_replicas_entry(sb_r, e) {</div><div class='del'>-		entry_size = max_t(unsigned, entry_size,</div><div class='del'>-				   replicas_entry_bytes(e));</div><div class='del'>-		nr++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry_size += sizeof(struct bch_replicas_entry_v1) -</div><div class='del'>-		sizeof(struct bch_replicas_entry_v0);</div><div class='del'>-</div><div class='del'>-	cpu_r-&gt;entries = kcalloc(nr, entry_size, GFP_KERNEL);</div><div class='del'>-	if (!cpu_r-&gt;entries)</div><div class='del'>-		return -BCH_ERR_ENOMEM_cpu_replicas;</div><div class='del'>-</div><div class='del'>-	cpu_r-&gt;nr		= nr;</div><div class='del'>-	cpu_r-&gt;entry_size	= entry_size;</div><div class='del'>-</div><div class='del'>-	for_each_replicas_entry(sb_r, e) {</div><div class='del'>-		struct bch_replicas_entry_v1 *dst =</div><div class='del'>-			cpu_replicas_entry(cpu_r, idx++);</div><div class='del'>-</div><div class='del'>-		dst-&gt;data_type	= e-&gt;data_type;</div><div class='del'>-		dst-&gt;nr_devs	= e-&gt;nr_devs;</div><div class='del'>-		dst-&gt;nr_required = 1;</div><div class='del'>-		memcpy(dst-&gt;devs, e-&gt;devs, e-&gt;nr_devs);</div><div class='del'>-		bch2_replicas_entry_sort(dst);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_replicas_to_cpu_replicas(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas *sb_v1;</div><div class='del'>-	struct bch_sb_field_replicas_v0 *sb_v0;</div><div class='del'>-	struct bch_replicas_cpu new_r = { 0, 0, NULL };</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if ((sb_v1 = bch2_sb_field_get(c-&gt;disk_sb.sb, replicas)))</div><div class='del'>-		ret = __bch2_sb_replicas_to_cpu_replicas(sb_v1, &amp;new_r);</div><div class='del'>-	else if ((sb_v0 = bch2_sb_field_get(c-&gt;disk_sb.sb, replicas_v0)))</div><div class='del'>-		ret = __bch2_sb_replicas_v0_to_cpu_replicas(sb_v0, &amp;new_r);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_cpu_replicas_sort(&amp;new_r);</div><div class='del'>-</div><div class='del'>-	percpu_down_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	ret = replicas_table_update(c, &amp;new_r);</div><div class='del'>-	percpu_up_write(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	kfree(new_r.entries);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_cpu_replicas_to_sb_replicas_v0(struct bch_fs *c,</div><div class='del'>-					       struct bch_replicas_cpu *r)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas_v0 *sb_r;</div><div class='del'>-	struct bch_replicas_entry_v0 *dst;</div><div class='del'>-	struct bch_replicas_entry_v1 *src;</div><div class='del'>-	size_t bytes;</div><div class='del'>-</div><div class='del'>-	bytes = sizeof(struct bch_sb_field_replicas);</div><div class='del'>-</div><div class='del'>-	for_each_cpu_replicas_entry(r, src)</div><div class='del'>-		bytes += replicas_entry_bytes(src) - 1;</div><div class='del'>-</div><div class='del'>-	sb_r = bch2_sb_field_resize(&amp;c-&gt;disk_sb, replicas_v0,</div><div class='del'>-			DIV_ROUND_UP(bytes, sizeof(u64)));</div><div class='del'>-	if (!sb_r)</div><div class='del'>-		return -BCH_ERR_ENOSPC_sb_replicas;</div><div class='del'>-</div><div class='del'>-	bch2_sb_field_delete(&amp;c-&gt;disk_sb, BCH_SB_FIELD_replicas);</div><div class='del'>-	sb_r = bch2_sb_field_get(c-&gt;disk_sb.sb, replicas_v0);</div><div class='del'>-</div><div class='del'>-	memset(&amp;sb_r-&gt;entries, 0,</div><div class='del'>-	       vstruct_end(&amp;sb_r-&gt;field) -</div><div class='del'>-	       (void *) &amp;sb_r-&gt;entries);</div><div class='del'>-</div><div class='del'>-	dst = sb_r-&gt;entries;</div><div class='del'>-	for_each_cpu_replicas_entry(r, src) {</div><div class='del'>-		dst-&gt;data_type	= src-&gt;data_type;</div><div class='del'>-		dst-&gt;nr_devs	= src-&gt;nr_devs;</div><div class='del'>-		memcpy(dst-&gt;devs, src-&gt;devs, src-&gt;nr_devs);</div><div class='del'>-</div><div class='del'>-		dst = replicas_entry_next(dst);</div><div class='del'>-</div><div class='del'>-		BUG_ON((void *) dst &gt; vstruct_end(&amp;sb_r-&gt;field));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_cpu_replicas_to_sb_replicas(struct bch_fs *c,</div><div class='del'>-					    struct bch_replicas_cpu *r)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas *sb_r;</div><div class='del'>-	struct bch_replicas_entry_v1 *dst, *src;</div><div class='del'>-	bool need_v1 = false;</div><div class='del'>-	size_t bytes;</div><div class='del'>-</div><div class='del'>-	bytes = sizeof(struct bch_sb_field_replicas);</div><div class='del'>-</div><div class='del'>-	for_each_cpu_replicas_entry(r, src) {</div><div class='del'>-		bytes += replicas_entry_bytes(src);</div><div class='del'>-		if (src-&gt;nr_required != 1)</div><div class='del'>-			need_v1 = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!need_v1)</div><div class='del'>-		return bch2_cpu_replicas_to_sb_replicas_v0(c, r);</div><div class='del'>-</div><div class='del'>-	sb_r = bch2_sb_field_resize(&amp;c-&gt;disk_sb, replicas,</div><div class='del'>-			DIV_ROUND_UP(bytes, sizeof(u64)));</div><div class='del'>-	if (!sb_r)</div><div class='del'>-		return -BCH_ERR_ENOSPC_sb_replicas;</div><div class='del'>-</div><div class='del'>-	bch2_sb_field_delete(&amp;c-&gt;disk_sb, BCH_SB_FIELD_replicas_v0);</div><div class='del'>-	sb_r = bch2_sb_field_get(c-&gt;disk_sb.sb, replicas);</div><div class='del'>-</div><div class='del'>-	memset(&amp;sb_r-&gt;entries, 0,</div><div class='del'>-	       vstruct_end(&amp;sb_r-&gt;field) -</div><div class='del'>-	       (void *) &amp;sb_r-&gt;entries);</div><div class='del'>-</div><div class='del'>-	dst = sb_r-&gt;entries;</div><div class='del'>-	for_each_cpu_replicas_entry(r, src) {</div><div class='del'>-		memcpy(dst, src, replicas_entry_bytes(src));</div><div class='del'>-</div><div class='del'>-		dst = replicas_entry_next(dst);</div><div class='del'>-</div><div class='del'>-		BUG_ON((void *) dst &gt; vstruct_end(&amp;sb_r-&gt;field));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_cpu_replicas_validate(struct bch_replicas_cpu *cpu_r,</div><div class='del'>-				      struct bch_sb *sb,</div><div class='del'>-				      struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	sort_cmp_size(cpu_r-&gt;entries,</div><div class='del'>-		      cpu_r-&gt;nr,</div><div class='del'>-		      cpu_r-&gt;entry_size,</div><div class='del'>-		      bch2_memcmp, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cpu_r-&gt;nr; i++) {</div><div class='del'>-		struct bch_replicas_entry_v1 *e =</div><div class='del'>-			cpu_replicas_entry(cpu_r, i);</div><div class='del'>-</div><div class='del'>-		int ret = bch2_replicas_entry_validate(e, sb, err);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (i + 1 &lt; cpu_r-&gt;nr) {</div><div class='del'>-			struct bch_replicas_entry_v1 *n =</div><div class='del'>-				cpu_replicas_entry(cpu_r, i + 1);</div><div class='del'>-</div><div class='del'>-			BUG_ON(memcmp(e, n, cpu_r-&gt;entry_size) &gt; 0);</div><div class='del'>-</div><div class='del'>-			if (!memcmp(e, n, cpu_r-&gt;entry_size)) {</div><div class='del'>-				prt_printf(err, "duplicate replicas entry ");</div><div class='del'>-				bch2_replicas_entry_to_text(err, e);</div><div class='del'>-				return -BCH_ERR_invalid_sb_replicas;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_replicas_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-				     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas *sb_r = field_to_type(f, replicas);</div><div class='del'>-	struct bch_replicas_cpu cpu_r;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __bch2_sb_replicas_to_cpu_replicas(sb_r, &amp;cpu_r);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_cpu_replicas_validate(&amp;cpu_r, sb, err);</div><div class='del'>-	kfree(cpu_r.entries);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_replicas_to_text(struct printbuf *out,</div><div class='del'>-				     struct bch_sb *sb,</div><div class='del'>-				     struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas *r = field_to_type(f, replicas);</div><div class='del'>-	struct bch_replicas_entry_v1 *e;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	for_each_replicas_entry(r, e) {</div><div class='del'>-		if (!first)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-		first = false;</div><div class='del'>-</div><div class='del'>-		bch2_replicas_entry_to_text(out, e);</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_replicas = {</div><div class='del'>-	.validate	= bch2_sb_replicas_validate,</div><div class='del'>-	.to_text	= bch2_sb_replicas_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_sb_replicas_v0_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-					struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas_v0 *sb_r = field_to_type(f, replicas_v0);</div><div class='del'>-	struct bch_replicas_cpu cpu_r;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __bch2_sb_replicas_v0_to_cpu_replicas(sb_r, &amp;cpu_r);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_cpu_replicas_validate(&amp;cpu_r, sb, err);</div><div class='del'>-	kfree(cpu_r.entries);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_replicas_v0_to_text(struct printbuf *out,</div><div class='del'>-					struct bch_sb *sb,</div><div class='del'>-					struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas_v0 *sb_r = field_to_type(f, replicas_v0);</div><div class='del'>-	struct bch_replicas_entry_v0 *e;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	for_each_replicas_entry(sb_r, e) {</div><div class='del'>-		if (!first)</div><div class='del'>-			prt_printf(out, " ");</div><div class='del'>-		first = false;</div><div class='del'>-</div><div class='del'>-		bch2_replicas_entry_v0_to_text(out, e);</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_replicas_v0 = {</div><div class='del'>-	.validate	= bch2_sb_replicas_v0_validate,</div><div class='del'>-	.to_text	= bch2_sb_replicas_v0_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Query replicas: */</div><div class='del'>-</div><div class='del'>-bool bch2_have_enough_devs(struct bch_fs *c, struct bch_devs_mask devs,</div><div class='del'>-			   unsigned flags, bool print)</div><div class='del'>-{</div><div class='del'>-	struct bch_replicas_entry_v1 *e;</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-	for_each_cpu_replicas_entry(&amp;c-&gt;replicas, e) {</div><div class='del'>-		unsigned i, nr_online = 0, nr_failed = 0, dflags = 0;</div><div class='del'>-		bool metadata = e-&gt;data_type &lt; BCH_DATA_user;</div><div class='del'>-</div><div class='del'>-		if (e-&gt;data_type == BCH_DATA_cached)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; e-&gt;nr_devs; i++) {</div><div class='del'>-			struct bch_dev *ca = bch_dev_bkey_exists(c, e-&gt;devs[i]);</div><div class='del'>-</div><div class='del'>-			nr_online += test_bit(e-&gt;devs[i], devs.d);</div><div class='del'>-			nr_failed += ca-&gt;mi.state == BCH_MEMBER_STATE_failed;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (nr_failed == e-&gt;nr_devs)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (nr_online &lt; e-&gt;nr_required)</div><div class='del'>-			dflags |= metadata</div><div class='del'>-				? BCH_FORCE_IF_METADATA_LOST</div><div class='del'>-				: BCH_FORCE_IF_DATA_LOST;</div><div class='del'>-</div><div class='del'>-		if (nr_online &lt; e-&gt;nr_devs)</div><div class='del'>-			dflags |= metadata</div><div class='del'>-				? BCH_FORCE_IF_METADATA_DEGRADED</div><div class='del'>-				: BCH_FORCE_IF_DATA_DEGRADED;</div><div class='del'>-</div><div class='del'>-		if (dflags &amp; ~flags) {</div><div class='del'>-			if (print) {</div><div class='del'>-				struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-				bch2_replicas_entry_to_text(&amp;buf, e);</div><div class='del'>-				bch_err(c, "insufficient devices online (%u) for replicas entry %s",</div><div class='del'>-					nr_online, buf.buf);</div><div class='del'>-				printbuf_exit(&amp;buf);</div><div class='del'>-			}</div><div class='del'>-			ret = false;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_sb_dev_has_data(struct bch_sb *sb, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_replicas *replicas;</div><div class='del'>-	struct bch_sb_field_replicas_v0 *replicas_v0;</div><div class='del'>-	unsigned i, data_has = 0;</div><div class='del'>-</div><div class='del'>-	replicas = bch2_sb_field_get(sb, replicas);</div><div class='del'>-	replicas_v0 = bch2_sb_field_get(sb, replicas_v0);</div><div class='del'>-</div><div class='del'>-	if (replicas) {</div><div class='del'>-		struct bch_replicas_entry_v1 *r;</div><div class='del'>-</div><div class='del'>-		for_each_replicas_entry(replicas, r)</div><div class='del'>-			for (i = 0; i &lt; r-&gt;nr_devs; i++)</div><div class='del'>-				if (r-&gt;devs[i] == dev)</div><div class='del'>-					data_has |= 1 &lt;&lt; r-&gt;data_type;</div><div class='del'>-	} else if (replicas_v0) {</div><div class='del'>-		struct bch_replicas_entry_v0 *r;</div><div class='del'>-</div><div class='del'>-		for_each_replicas_entry_v0(replicas_v0, r)</div><div class='del'>-			for (i = 0; i &lt; r-&gt;nr_devs; i++)</div><div class='del'>-				if (r-&gt;devs[i] == dev)</div><div class='del'>-					data_has |= 1 &lt;&lt; r-&gt;data_type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return data_has;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_dev_has_data(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	unsigned ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	ret = bch2_sb_dev_has_data(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_replicas_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	kfree(c-&gt;usage_scratch);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;usage); i++)</div><div class='del'>-		free_percpu(c-&gt;usage[i]);</div><div class='del'>-	kfree(c-&gt;usage_base);</div><div class='del'>-	kfree(c-&gt;replicas.entries);</div><div class='del'>-	kfree(c-&gt;replicas_gc.entries);</div><div class='del'>-</div><div class='del'>-	mempool_exit(&amp;c-&gt;replicas_delta_pool);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_replicas_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bch2_journal_entry_res_resize(&amp;c-&gt;journal,</div><div class='del'>-			&amp;c-&gt;replicas_journal_res,</div><div class='del'>-			reserve_journal_replicas(c, &amp;c-&gt;replicas));</div><div class='del'>-</div><div class='del'>-	return mempool_init_kmalloc_pool(&amp;c-&gt;replicas_delta_pool, 1,</div><div class='del'>-					 REPLICAS_DELTA_LIST_MAX) ?:</div><div class='del'>-		replicas_table_update(c, &amp;c-&gt;replicas);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/replicas.h b/fs/bcachefs/replicas.h<br/>deleted file mode 100644<br/>index 654a4b26d3a3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/replicas.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/replicas.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_REPLICAS_H</div><div class='del'>-#define _BCACHEFS_REPLICAS_H</div><div class='del'>-</div><div class='del'>-#include "bkey.h"</div><div class='del'>-#include "eytzinger.h"</div><div class='del'>-#include "replicas_types.h"</div><div class='del'>-</div><div class='del'>-void bch2_replicas_entry_sort(struct bch_replicas_entry_v1 *);</div><div class='del'>-void bch2_replicas_entry_to_text(struct printbuf *,</div><div class='del'>-				 struct bch_replicas_entry_v1 *);</div><div class='del'>-int bch2_replicas_entry_validate(struct bch_replicas_entry_v1 *,</div><div class='del'>-				 struct bch_sb *, struct printbuf *);</div><div class='del'>-void bch2_cpu_replicas_to_text(struct printbuf *, struct bch_replicas_cpu *);</div><div class='del'>-</div><div class='del'>-static inline struct bch_replicas_entry_v1 *</div><div class='del'>-cpu_replicas_entry(struct bch_replicas_cpu *r, unsigned i)</div><div class='del'>-{</div><div class='del'>-	return (void *) r-&gt;entries + r-&gt;entry_size * i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_entry_idx(struct bch_fs *,</div><div class='del'>-			    struct bch_replicas_entry_v1 *);</div><div class='del'>-</div><div class='del'>-void bch2_devlist_to_replicas(struct bch_replicas_entry_v1 *,</div><div class='del'>-			      enum bch_data_type,</div><div class='del'>-			      struct bch_devs_list);</div><div class='del'>-bool bch2_replicas_marked(struct bch_fs *, struct bch_replicas_entry_v1 *);</div><div class='del'>-int bch2_mark_replicas(struct bch_fs *,</div><div class='del'>-		       struct bch_replicas_entry_v1 *);</div><div class='del'>-</div><div class='del'>-static inline struct replicas_delta *</div><div class='del'>-replicas_delta_next(struct replicas_delta *d)</div><div class='del'>-{</div><div class='del'>-	return (void *) d + replicas_entry_bytes(&amp;d-&gt;r) + 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_replicas_delta_list_mark(struct bch_fs *, struct replicas_delta_list *);</div><div class='del'>-</div><div class='del'>-void bch2_bkey_to_replicas(struct bch_replicas_entry_v1 *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-static inline void bch2_replicas_entry_cached(struct bch_replicas_entry_v1 *e,</div><div class='del'>-					      unsigned dev)</div><div class='del'>-{</div><div class='del'>-	e-&gt;data_type	= BCH_DATA_cached;</div><div class='del'>-	e-&gt;nr_devs	= 1;</div><div class='del'>-	e-&gt;nr_required	= 1;</div><div class='del'>-	e-&gt;devs[0]	= dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_have_enough_devs(struct bch_fs *, struct bch_devs_mask,</div><div class='del'>-			   unsigned, bool);</div><div class='del'>-</div><div class='del'>-unsigned bch2_sb_dev_has_data(struct bch_sb *, unsigned);</div><div class='del'>-unsigned bch2_dev_has_data(struct bch_fs *, struct bch_dev *);</div><div class='del'>-</div><div class='del'>-int bch2_replicas_gc_end(struct bch_fs *, int);</div><div class='del'>-int bch2_replicas_gc_start(struct bch_fs *, unsigned);</div><div class='del'>-int bch2_replicas_gc2(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_replicas_set_usage(struct bch_fs *,</div><div class='del'>-			    struct bch_replicas_entry_v1 *,</div><div class='del'>-			    u64);</div><div class='del'>-</div><div class='del'>-#define for_each_cpu_replicas_entry(_r, _i)				\</div><div class='del'>-	for (_i = (_r)-&gt;entries;					\</div><div class='del'>-	     (void *) (_i) &lt; (void *) (_r)-&gt;entries + (_r)-&gt;nr * (_r)-&gt;entry_size;\</div><div class='del'>-	     _i = (void *) (_i) + (_r)-&gt;entry_size)</div><div class='del'>-</div><div class='del'>-/* iterate over superblock replicas - used by userspace tools: */</div><div class='del'>-</div><div class='del'>-#define replicas_entry_next(_i)						\</div><div class='del'>-	((typeof(_i)) ((void *) (_i) + replicas_entry_bytes(_i)))</div><div class='del'>-</div><div class='del'>-#define for_each_replicas_entry(_r, _i)					\</div><div class='del'>-	for (_i = (_r)-&gt;entries;					\</div><div class='del'>-	     (void *) (_i) &lt; vstruct_end(&amp;(_r)-&gt;field) &amp;&amp; (_i)-&gt;data_type;\</div><div class='del'>-	     (_i) = replicas_entry_next(_i))</div><div class='del'>-</div><div class='del'>-#define for_each_replicas_entry_v0(_r, _i)				\</div><div class='del'>-	for (_i = (_r)-&gt;entries;					\</div><div class='del'>-	     (void *) (_i) &lt; vstruct_end(&amp;(_r)-&gt;field) &amp;&amp; (_i)-&gt;data_type;\</div><div class='del'>-	     (_i) = replicas_entry_next(_i))</div><div class='del'>-</div><div class='del'>-int bch2_sb_replicas_to_cpu_replicas(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_replicas;</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_replicas_v0;</div><div class='del'>-</div><div class='del'>-void bch2_fs_replicas_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_replicas_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_REPLICAS_H */</div><div class='head'>diff --git a/fs/bcachefs/replicas_types.h b/fs/bcachefs/replicas_types.h<br/>deleted file mode 100644<br/>index ac90d142c4e8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/replicas_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/replicas_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_REPLICAS_TYPES_H</div><div class='del'>-#define _BCACHEFS_REPLICAS_TYPES_H</div><div class='del'>-</div><div class='del'>-struct bch_replicas_cpu {</div><div class='del'>-	unsigned		nr;</div><div class='del'>-	unsigned		entry_size;</div><div class='del'>-	struct bch_replicas_entry_v1 *entries;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct replicas_delta {</div><div class='del'>-	s64			delta;</div><div class='del'>-	struct bch_replicas_entry_v1 r;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct replicas_delta_list {</div><div class='del'>-	unsigned		size;</div><div class='del'>-	unsigned		used;</div><div class='del'>-</div><div class='del'>-	struct			{} memset_start;</div><div class='del'>-	u64			nr_inodes;</div><div class='del'>-	u64			persistent_reserved[BCH_REPLICAS_MAX];</div><div class='del'>-	struct			{} memset_end;</div><div class='del'>-	struct replicas_delta	d[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_REPLICAS_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/sb-clean.c b/fs/bcachefs/sb-clean.c<br/>deleted file mode 100644<br/>index b6bf0ebe7e84..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-clean.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-clean.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,392 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal_io.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "sb-clean.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BCH_SB_FIELD_clean:</div><div class='del'>- *</div><div class='del'>- * Btree roots, and a few other things, are recovered from the journal after an</div><div class='del'>- * unclean shutdown - but after a clean shutdown, to avoid having to read the</div><div class='del'>- * journal, we can store them in the superblock.</div><div class='del'>- *</div><div class='del'>- * bch_sb_field_clean simply contains a list of journal entries, stored exactly</div><div class='del'>- * as they would be in the journal:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int bch2_sb_clean_validate_late(struct bch_fs *c, struct bch_sb_field_clean *clean,</div><div class='del'>-				int write)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry *entry;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (entry = clean-&gt;start;</div><div class='del'>-	     entry &lt; (struct jset_entry *) vstruct_end(&amp;clean-&gt;field);</div><div class='del'>-	     entry = vstruct_next(entry)) {</div><div class='del'>-		ret = bch2_journal_entry_validate(c, NULL, entry,</div><div class='del'>-						  le16_to_cpu(c-&gt;disk_sb.sb-&gt;version),</div><div class='del'>-						  BCH_SB_BIG_ENDIAN(c-&gt;disk_sb.sb),</div><div class='del'>-						  write);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bkey_i *btree_root_find(struct bch_fs *c,</div><div class='del'>-				      struct bch_sb_field_clean *clean,</div><div class='del'>-				      struct jset *j,</div><div class='del'>-				      enum btree_id id, unsigned *level)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *k;</div><div class='del'>-	struct jset_entry *entry, *start, *end;</div><div class='del'>-</div><div class='del'>-	if (clean) {</div><div class='del'>-		start = clean-&gt;start;</div><div class='del'>-		end = vstruct_end(&amp;clean-&gt;field);</div><div class='del'>-	} else {</div><div class='del'>-		start = j-&gt;start;</div><div class='del'>-		end = vstruct_last(j);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (entry = start; entry &lt; end; entry = vstruct_next(entry))</div><div class='del'>-		if (entry-&gt;type == BCH_JSET_ENTRY_btree_root &amp;&amp;</div><div class='del'>-		    entry-&gt;btree_id == id)</div><div class='del'>-			goto found;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-found:</div><div class='del'>-	if (!entry-&gt;u64s)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	k = entry-&gt;start;</div><div class='del'>-	*level = entry-&gt;level;</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_verify_superblock_clean(struct bch_fs *c,</div><div class='del'>-				 struct bch_sb_field_clean **cleanp,</div><div class='del'>-				 struct jset *j)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-	struct bch_sb_field_clean *clean = *cleanp;</div><div class='del'>-	struct printbuf buf1 = PRINTBUF;</div><div class='del'>-	struct printbuf buf2 = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (mustfix_fsck_err_on(j-&gt;seq != clean-&gt;journal_seq, c,</div><div class='del'>-			sb_clean_journal_seq_mismatch,</div><div class='del'>-			"superblock journal seq (%llu) doesn't match journal (%llu) after clean shutdown",</div><div class='del'>-			le64_to_cpu(clean-&gt;journal_seq),</div><div class='del'>-			le64_to_cpu(j-&gt;seq))) {</div><div class='del'>-		kfree(clean);</div><div class='del'>-		*cleanp = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTREE_ID_NR; i++) {</div><div class='del'>-		struct bkey_i *k1, *k2;</div><div class='del'>-		unsigned l1 = 0, l2 = 0;</div><div class='del'>-</div><div class='del'>-		k1 = btree_root_find(c, clean, NULL, i, &amp;l1);</div><div class='del'>-		k2 = btree_root_find(c, NULL, j, i, &amp;l2);</div><div class='del'>-</div><div class='del'>-		if (!k1 &amp;&amp; !k2)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		printbuf_reset(&amp;buf1);</div><div class='del'>-		printbuf_reset(&amp;buf2);</div><div class='del'>-</div><div class='del'>-		if (k1)</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf1, c, bkey_i_to_s_c(k1));</div><div class='del'>-		else</div><div class='del'>-			prt_printf(&amp;buf1, "(none)");</div><div class='del'>-</div><div class='del'>-		if (k2)</div><div class='del'>-			bch2_bkey_val_to_text(&amp;buf2, c, bkey_i_to_s_c(k2));</div><div class='del'>-		else</div><div class='del'>-			prt_printf(&amp;buf2, "(none)");</div><div class='del'>-</div><div class='del'>-		mustfix_fsck_err_on(!k1 || !k2 ||</div><div class='del'>-				    IS_ERR(k1) ||</div><div class='del'>-				    IS_ERR(k2) ||</div><div class='del'>-				    k1-&gt;k.u64s != k2-&gt;k.u64s ||</div><div class='del'>-				    memcmp(k1, k2, bkey_bytes(&amp;k1-&gt;k)) ||</div><div class='del'>-				    l1 != l2, c,</div><div class='del'>-			sb_clean_btree_root_mismatch,</div><div class='del'>-			"superblock btree root %u doesn't match journal after clean shutdown\n"</div><div class='del'>-			"sb:      l=%u %s\n"</div><div class='del'>-			"journal: l=%u %s\n", i,</div><div class='del'>-			l1, buf1.buf,</div><div class='del'>-			l2, buf2.buf);</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf2);</div><div class='del'>-	printbuf_exit(&amp;buf1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_clean *bch2_read_superblock_clean(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_clean *clean, *sb_clean;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	sb_clean = bch2_sb_field_get(c-&gt;disk_sb.sb, clean);</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!sb_clean, c,</div><div class='del'>-			sb_clean_missing,</div><div class='del'>-			"superblock marked clean but clean section not present")) {</div><div class='del'>-		SET_BCH_SB_CLEAN(c-&gt;disk_sb.sb, false);</div><div class='del'>-		c-&gt;sb.clean = false;</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clean = kmemdup(sb_clean, vstruct_bytes(&amp;sb_clean-&gt;field),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!clean) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		return ERR_PTR(-BCH_ERR_ENOMEM_read_superblock_clean);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_clean_validate_late(c, clean, READ);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return clean;</div><div class='del'>-fsck_err:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct jset_entry *jset_entry_init(struct jset_entry **end, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct jset_entry *entry = *end;</div><div class='del'>-	unsigned u64s = DIV_ROUND_UP(size, sizeof(u64));</div><div class='del'>-</div><div class='del'>-	memset(entry, 0, u64s * sizeof(u64));</div><div class='del'>-	/*</div><div class='del'>-	 * The u64s field counts from the start of data, ignoring the shared</div><div class='del'>-	 * fields.</div><div class='del'>-	 */</div><div class='del'>-	entry-&gt;u64s = cpu_to_le16(u64s - 1);</div><div class='del'>-</div><div class='del'>-	*end = vstruct_next(*end);</div><div class='del'>-	return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_journal_super_entries_add_common(struct bch_fs *c,</div><div class='del'>-					   struct jset_entry **end,</div><div class='del'>-					   u64 journal_seq)</div><div class='del'>-{</div><div class='del'>-	percpu_down_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	if (!journal_seq) {</div><div class='del'>-		for (unsigned i = 0; i &lt; ARRAY_SIZE(c-&gt;usage); i++)</div><div class='del'>-			bch2_fs_usage_acc_to_base(c, i);</div><div class='del'>-	} else {</div><div class='del'>-		bch2_fs_usage_acc_to_base(c, journal_seq &amp; JOURNAL_BUF_MASK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		struct jset_entry_usage *u =</div><div class='del'>-			container_of(jset_entry_init(end, sizeof(*u)),</div><div class='del'>-				     struct jset_entry_usage, entry);</div><div class='del'>-</div><div class='del'>-		u-&gt;entry.type	= BCH_JSET_ENTRY_usage;</div><div class='del'>-		u-&gt;entry.btree_id = BCH_FS_USAGE_inodes;</div><div class='del'>-		u-&gt;v		= cpu_to_le64(c-&gt;usage_base-&gt;b.nr_inodes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		struct jset_entry_usage *u =</div><div class='del'>-			container_of(jset_entry_init(end, sizeof(*u)),</div><div class='del'>-				     struct jset_entry_usage, entry);</div><div class='del'>-</div><div class='del'>-		u-&gt;entry.type	= BCH_JSET_ENTRY_usage;</div><div class='del'>-		u-&gt;entry.btree_id = BCH_FS_USAGE_key_version;</div><div class='del'>-		u-&gt;v		= cpu_to_le64(atomic64_read(&amp;c-&gt;key_version));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_REPLICAS_MAX; i++) {</div><div class='del'>-		struct jset_entry_usage *u =</div><div class='del'>-			container_of(jset_entry_init(end, sizeof(*u)),</div><div class='del'>-				     struct jset_entry_usage, entry);</div><div class='del'>-</div><div class='del'>-		u-&gt;entry.type	= BCH_JSET_ENTRY_usage;</div><div class='del'>-		u-&gt;entry.btree_id = BCH_FS_USAGE_reserved;</div><div class='del'>-		u-&gt;entry.level	= i;</div><div class='del'>-		u-&gt;v		= cpu_to_le64(c-&gt;usage_base-&gt;persistent_reserved[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; c-&gt;replicas.nr; i++) {</div><div class='del'>-		struct bch_replicas_entry_v1 *e =</div><div class='del'>-			cpu_replicas_entry(&amp;c-&gt;replicas, i);</div><div class='del'>-		struct jset_entry_data_usage *u =</div><div class='del'>-			container_of(jset_entry_init(end, sizeof(*u) + e-&gt;nr_devs),</div><div class='del'>-				     struct jset_entry_data_usage, entry);</div><div class='del'>-</div><div class='del'>-		u-&gt;entry.type	= BCH_JSET_ENTRY_data_usage;</div><div class='del'>-		u-&gt;v		= cpu_to_le64(c-&gt;usage_base-&gt;replicas[i]);</div><div class='del'>-		unsafe_memcpy(&amp;u-&gt;r, e, replicas_entry_bytes(e),</div><div class='del'>-			      "embedded variable length struct");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		unsigned b = sizeof(struct jset_entry_dev_usage) +</div><div class='del'>-			sizeof(struct jset_entry_dev_usage_type) * BCH_DATA_NR;</div><div class='del'>-		struct jset_entry_dev_usage *u =</div><div class='del'>-			container_of(jset_entry_init(end, b),</div><div class='del'>-				     struct jset_entry_dev_usage, entry);</div><div class='del'>-</div><div class='del'>-		u-&gt;entry.type = BCH_JSET_ENTRY_dev_usage;</div><div class='del'>-		u-&gt;dev = cpu_to_le32(ca-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-		for (unsigned i = 0; i &lt; BCH_DATA_NR; i++) {</div><div class='del'>-			u-&gt;d[i].buckets = cpu_to_le64(ca-&gt;usage_base-&gt;d[i].buckets);</div><div class='del'>-			u-&gt;d[i].sectors	= cpu_to_le64(ca-&gt;usage_base-&gt;d[i].sectors);</div><div class='del'>-			u-&gt;d[i].fragmented = cpu_to_le64(ca-&gt;usage_base-&gt;d[i].fragmented);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	percpu_up_read(&amp;c-&gt;mark_lock);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct jset_entry_clock *clock =</div><div class='del'>-			container_of(jset_entry_init(end, sizeof(*clock)),</div><div class='del'>-				     struct jset_entry_clock, entry);</div><div class='del'>-</div><div class='del'>-		clock-&gt;entry.type = BCH_JSET_ENTRY_clock;</div><div class='del'>-		clock-&gt;rw	= i;</div><div class='del'>-		clock-&gt;time	= cpu_to_le64(atomic64_read(&amp;c-&gt;io_clock[i].now));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_clean_validate(struct bch_sb *sb,</div><div class='del'>-				  struct bch_sb_field *f,</div><div class='del'>-				  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_clean *clean = field_to_type(f, clean);</div><div class='del'>-</div><div class='del'>-	if (vstruct_bytes(&amp;clean-&gt;field) &lt; sizeof(*clean)) {</div><div class='del'>-		prt_printf(err, "wrong size (got %zu should be %zu)",</div><div class='del'>-		       vstruct_bytes(&amp;clean-&gt;field), sizeof(*clean));</div><div class='del'>-		return -BCH_ERR_invalid_sb_clean;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_clean_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				  struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_clean *clean = field_to_type(f, clean);</div><div class='del'>-	struct jset_entry *entry;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "flags:          %x",	le32_to_cpu(clean-&gt;flags));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "journal_seq:    %llu",	le64_to_cpu(clean-&gt;journal_seq));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	for (entry = clean-&gt;start;</div><div class='del'>-	     entry != vstruct_end(&amp;clean-&gt;field);</div><div class='del'>-	     entry = vstruct_next(entry)) {</div><div class='del'>-		if (entry-&gt;type == BCH_JSET_ENTRY_btree_keys &amp;&amp;</div><div class='del'>-		    !entry-&gt;u64s)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bch2_journal_entry_to_text(out, NULL, entry);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_clean = {</div><div class='del'>-	.validate	= bch2_sb_clean_validate,</div><div class='del'>-	.to_text	= bch2_sb_clean_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_fs_mark_dirty(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unconditionally write superblock, to verify it hasn't changed before</div><div class='del'>-	 * we go rw:</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	SET_BCH_SB_CLEAN(c-&gt;disk_sb.sb, false);</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;features[0] |= cpu_to_le64(BCH_SB_FEATURES_ALWAYS);</div><div class='del'>-</div><div class='del'>-	ret = bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_mark_clean(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_clean *sb_clean;</div><div class='del'>-	struct jset_entry *entry;</div><div class='del'>-	unsigned u64s;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	if (BCH_SB_CLEAN(c-&gt;disk_sb.sb))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	SET_BCH_SB_CLEAN(c-&gt;disk_sb.sb, true);</div><div class='del'>-</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_alloc_info);</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;compat[0] |= cpu_to_le64(1ULL &lt;&lt; BCH_COMPAT_alloc_metadata);</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;features[0] &amp;= cpu_to_le64(~(1ULL &lt;&lt; BCH_FEATURE_extents_above_btree_updates));</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;features[0] &amp;= cpu_to_le64(~(1ULL &lt;&lt; BCH_FEATURE_btree_updates_journalled));</div><div class='del'>-</div><div class='del'>-	u64s = sizeof(*sb_clean) / sizeof(u64) + c-&gt;journal.entry_u64s_reserved;</div><div class='del'>-</div><div class='del'>-	sb_clean = bch2_sb_field_resize(&amp;c-&gt;disk_sb, clean, u64s);</div><div class='del'>-	if (!sb_clean) {</div><div class='del'>-		bch_err(c, "error resizing superblock while setting filesystem clean");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb_clean-&gt;flags		= 0;</div><div class='del'>-	sb_clean-&gt;journal_seq	= cpu_to_le64(atomic64_read(&amp;c-&gt;journal.seq));</div><div class='del'>-</div><div class='del'>-	/* Trying to catch outstanding bug: */</div><div class='del'>-	BUG_ON(le64_to_cpu(sb_clean-&gt;journal_seq) &gt; S64_MAX);</div><div class='del'>-</div><div class='del'>-	entry = sb_clean-&gt;start;</div><div class='del'>-	bch2_journal_super_entries_add_common(c, &amp;entry, 0);</div><div class='del'>-	entry = bch2_btree_roots_to_journal_entries(c, entry, 0);</div><div class='del'>-	BUG_ON((void *) entry &gt; vstruct_end(&amp;sb_clean-&gt;field));</div><div class='del'>-</div><div class='del'>-	memset(entry, 0,</div><div class='del'>-	       vstruct_end(&amp;sb_clean-&gt;field) - (void *) entry);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this should be in the write path, and we should be validating every</div><div class='del'>-	 * superblock section:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_sb_clean_validate_late(c, sb_clean, WRITE);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error writing marking filesystem clean: validate error");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/sb-clean.h b/fs/bcachefs/sb-clean.h<br/>deleted file mode 100644<br/>index 71caef281239..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-clean.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-clean.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_CLEAN_H</div><div class='del'>-#define _BCACHEFS_SB_CLEAN_H</div><div class='del'>-</div><div class='del'>-int bch2_sb_clean_validate_late(struct bch_fs *, struct bch_sb_field_clean *, int);</div><div class='del'>-int bch2_verify_superblock_clean(struct bch_fs *, struct bch_sb_field_clean **,</div><div class='del'>-				 struct jset *);</div><div class='del'>-struct bch_sb_field_clean *bch2_read_superblock_clean(struct bch_fs *);</div><div class='del'>-void bch2_journal_super_entries_add_common(struct bch_fs *, struct jset_entry **, u64);</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_clean;</div><div class='del'>-</div><div class='del'>-int bch2_fs_mark_dirty(struct bch_fs *);</div><div class='del'>-void bch2_fs_mark_clean(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SB_CLEAN_H */</div><div class='head'>diff --git a/fs/bcachefs/sb-counters.c b/fs/bcachefs/sb-counters.c<br/>deleted file mode 100644<br/>index 7dc898761bb3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-counters.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-counters.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "sb-counters.h"</div><div class='del'>-</div><div class='del'>-/* BCH_SB_FIELD_counters */</div><div class='del'>-</div><div class='del'>-static const char * const bch2_counter_names[] = {</div><div class='del'>-#define x(t, n, ...) (#t),</div><div class='del'>-	BCH_PERSISTENT_COUNTERS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static size_t bch2_sb_counter_nr_entries(struct bch_sb_field_counters *ctrs)</div><div class='del'>-{</div><div class='del'>-	if (!ctrs)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return (__le64 *) vstruct_end(&amp;ctrs-&gt;field) - &amp;ctrs-&gt;d[0];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_sb_counters_validate(struct bch_sb *sb,</div><div class='del'>-				     struct bch_sb_field *f,</div><div class='del'>-				     struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-			      struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_counters *ctrs = field_to_type(f, counters);</div><div class='del'>-	unsigned int i;</div><div class='del'>-	unsigned int nr = bch2_sb_counter_nr_entries(ctrs);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		if (i &lt; BCH_COUNTER_NR)</div><div class='del'>-			prt_printf(out, "%s ", bch2_counter_names[i]);</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "(unknown)");</div><div class='del'>-</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_printf(out, "%llu", le64_to_cpu(ctrs-&gt;d[i]));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_sb_counters_to_cpu(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_counters *ctrs = bch2_sb_field_get(c-&gt;disk_sb.sb, counters);</div><div class='del'>-	unsigned int i;</div><div class='del'>-	unsigned int nr = bch2_sb_counter_nr_entries(ctrs);</div><div class='del'>-	u64 val = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_COUNTER_NR; i++)</div><div class='del'>-		c-&gt;counters_on_mount[i] = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; min_t(unsigned int, nr, BCH_COUNTER_NR); i++) {</div><div class='del'>-		val = le64_to_cpu(ctrs-&gt;d[i]);</div><div class='del'>-		percpu_u64_set(&amp;c-&gt;counters[i], val);</div><div class='del'>-		c-&gt;counters_on_mount[i] = val;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_sb_counters_from_cpu(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_counters *ctrs = bch2_sb_field_get(c-&gt;disk_sb.sb, counters);</div><div class='del'>-	struct bch_sb_field_counters *ret;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	unsigned int nr = bch2_sb_counter_nr_entries(ctrs);</div><div class='del'>-</div><div class='del'>-	if (nr &lt; BCH_COUNTER_NR) {</div><div class='del'>-		ret = bch2_sb_field_resize(&amp;c-&gt;disk_sb, counters,</div><div class='del'>-					       sizeof(*ctrs) / sizeof(u64) + BCH_COUNTER_NR);</div><div class='del'>-</div><div class='del'>-		if (ret) {</div><div class='del'>-			ctrs = ret;</div><div class='del'>-			nr = bch2_sb_counter_nr_entries(ctrs);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; min_t(unsigned int, nr, BCH_COUNTER_NR); i++)</div><div class='del'>-		ctrs-&gt;d[i] = cpu_to_le64(percpu_u64_get(&amp;c-&gt;counters[i]));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_counters_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	free_percpu(c-&gt;counters);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_counters_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	c-&gt;counters = __alloc_percpu(sizeof(u64) * BCH_COUNTER_NR, sizeof(u64));</div><div class='del'>-	if (!c-&gt;counters)</div><div class='del'>-		return -BCH_ERR_ENOMEM_fs_counters_init;</div><div class='del'>-</div><div class='del'>-	return bch2_sb_counters_to_cpu(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_counters = {</div><div class='del'>-	.validate	= bch2_sb_counters_validate,</div><div class='del'>-	.to_text	= bch2_sb_counters_to_text,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/bcachefs/sb-counters.h b/fs/bcachefs/sb-counters.h<br/>deleted file mode 100644<br/>index 81f8aec9fcb1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-counters.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-counters.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_COUNTERS_H</div><div class='del'>-#define _BCACHEFS_SB_COUNTERS_H</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-int bch2_sb_counters_to_cpu(struct bch_fs *);</div><div class='del'>-int bch2_sb_counters_from_cpu(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_counters_exit(struct bch_fs *);</div><div class='del'>-int bch2_fs_counters_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_counters;</div><div class='del'>-</div><div class='del'>-#endif // _BCACHEFS_SB_COUNTERS_H</div><div class='head'>diff --git a/fs/bcachefs/sb-counters_format.h b/fs/bcachefs/sb-counters_format.h<br/>deleted file mode 100644<br/>index 62ea478215d0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-counters_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-counters_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_COUNTERS_FORMAT_H</div><div class='del'>-#define _BCACHEFS_SB_COUNTERS_FORMAT_H</div><div class='del'>-</div><div class='del'>-#define BCH_PERSISTENT_COUNTERS()				\</div><div class='del'>-	x(io_read,					0)	\</div><div class='del'>-	x(io_write,					1)	\</div><div class='del'>-	x(io_move,					2)	\</div><div class='del'>-	x(bucket_invalidate,				3)	\</div><div class='del'>-	x(bucket_discard,				4)	\</div><div class='del'>-	x(bucket_alloc,					5)	\</div><div class='del'>-	x(bucket_alloc_fail,				6)	\</div><div class='del'>-	x(btree_cache_scan,				7)	\</div><div class='del'>-	x(btree_cache_reap,				8)	\</div><div class='del'>-	x(btree_cache_cannibalize,			9)	\</div><div class='del'>-	x(btree_cache_cannibalize_lock,			10)	\</div><div class='del'>-	x(btree_cache_cannibalize_lock_fail,		11)	\</div><div class='del'>-	x(btree_cache_cannibalize_unlock,		12)	\</div><div class='del'>-	x(btree_node_write,				13)	\</div><div class='del'>-	x(btree_node_read,				14)	\</div><div class='del'>-	x(btree_node_compact,				15)	\</div><div class='del'>-	x(btree_node_merge,				16)	\</div><div class='del'>-	x(btree_node_split,				17)	\</div><div class='del'>-	x(btree_node_rewrite,				18)	\</div><div class='del'>-	x(btree_node_alloc,				19)	\</div><div class='del'>-	x(btree_node_free,				20)	\</div><div class='del'>-	x(btree_node_set_root,				21)	\</div><div class='del'>-	x(btree_path_relock_fail,			22)	\</div><div class='del'>-	x(btree_path_upgrade_fail,			23)	\</div><div class='del'>-	x(btree_reserve_get_fail,			24)	\</div><div class='del'>-	x(journal_entry_full,				25)	\</div><div class='del'>-	x(journal_full,					26)	\</div><div class='del'>-	x(journal_reclaim_finish,			27)	\</div><div class='del'>-	x(journal_reclaim_start,			28)	\</div><div class='del'>-	x(journal_write,				29)	\</div><div class='del'>-	x(read_promote,					30)	\</div><div class='del'>-	x(read_bounce,					31)	\</div><div class='del'>-	x(read_split,					33)	\</div><div class='del'>-	x(read_retry,					32)	\</div><div class='del'>-	x(read_reuse_race,				34)	\</div><div class='del'>-	x(move_extent_read,				35)	\</div><div class='del'>-	x(move_extent_write,				36)	\</div><div class='del'>-	x(move_extent_finish,				37)	\</div><div class='del'>-	x(move_extent_fail,				38)	\</div><div class='del'>-	x(move_extent_start_fail,			39)	\</div><div class='del'>-	x(copygc,					40)	\</div><div class='del'>-	x(copygc_wait,					41)	\</div><div class='del'>-	x(gc_gens_end,					42)	\</div><div class='del'>-	x(gc_gens_start,				43)	\</div><div class='del'>-	x(trans_blocked_journal_reclaim,		44)	\</div><div class='del'>-	x(trans_restart_btree_node_reused,		45)	\</div><div class='del'>-	x(trans_restart_btree_node_split,		46)	\</div><div class='del'>-	x(trans_restart_fault_inject,			47)	\</div><div class='del'>-	x(trans_restart_iter_upgrade,			48)	\</div><div class='del'>-	x(trans_restart_journal_preres_get,		49)	\</div><div class='del'>-	x(trans_restart_journal_reclaim,		50)	\</div><div class='del'>-	x(trans_restart_journal_res_get,		51)	\</div><div class='del'>-	x(trans_restart_key_cache_key_realloced,	52)	\</div><div class='del'>-	x(trans_restart_key_cache_raced,		53)	\</div><div class='del'>-	x(trans_restart_mark_replicas,			54)	\</div><div class='del'>-	x(trans_restart_mem_realloced,			55)	\</div><div class='del'>-	x(trans_restart_memory_allocation_failure,	56)	\</div><div class='del'>-	x(trans_restart_relock,				57)	\</div><div class='del'>-	x(trans_restart_relock_after_fill,		58)	\</div><div class='del'>-	x(trans_restart_relock_key_cache_fill,		59)	\</div><div class='del'>-	x(trans_restart_relock_next_node,		60)	\</div><div class='del'>-	x(trans_restart_relock_parent_for_fill,		61)	\</div><div class='del'>-	x(trans_restart_relock_path,			62)	\</div><div class='del'>-	x(trans_restart_relock_path_intent,		63)	\</div><div class='del'>-	x(trans_restart_too_many_iters,			64)	\</div><div class='del'>-	x(trans_restart_traverse,			65)	\</div><div class='del'>-	x(trans_restart_upgrade,			66)	\</div><div class='del'>-	x(trans_restart_would_deadlock,			67)	\</div><div class='del'>-	x(trans_restart_would_deadlock_write,		68)	\</div><div class='del'>-	x(trans_restart_injected,			69)	\</div><div class='del'>-	x(trans_restart_key_cache_upgrade,		70)	\</div><div class='del'>-	x(trans_traverse_all,				71)	\</div><div class='del'>-	x(transaction_commit,				72)	\</div><div class='del'>-	x(write_super,					73)	\</div><div class='del'>-	x(trans_restart_would_deadlock_recursion_limit,	74)	\</div><div class='del'>-	x(trans_restart_write_buffer_flush,		75)	\</div><div class='del'>-	x(trans_restart_split_race,			76)	\</div><div class='del'>-	x(write_buffer_flush_slowpath,			77)	\</div><div class='del'>-	x(write_buffer_flush_sync,			78)</div><div class='del'>-</div><div class='del'>-enum bch_persistent_counters {</div><div class='del'>-#define x(t, n, ...) BCH_COUNTER_##t,</div><div class='del'>-	BCH_PERSISTENT_COUNTERS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_COUNTER_NR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_counters {</div><div class='del'>-	struct bch_sb_field	field;</div><div class='del'>-	__le64			d[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SB_COUNTERS_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/sb-downgrade.c b/fs/bcachefs/sb-downgrade.c<br/>deleted file mode 100644<br/>index 441dcb1bf160..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-downgrade.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-downgrade.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,260 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Superblock section that contains a list of recovery passes to run when</div><div class='del'>- * downgrading past a given version</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "darray.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "sb-downgrade.h"</div><div class='del'>-#include "sb-errors.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#define RECOVERY_PASS_ALL_FSCK		BIT_ULL(63)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Upgrade, downgrade tables - run certain recovery passes, fix certain errors</div><div class='del'>- *</div><div class='del'>- * x(version, recovery_passes, errors...)</div><div class='del'>- */</div><div class='del'>-#define UPGRADE_TABLE()						\</div><div class='del'>-	x(backpointers,						\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(inode_v3,						\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(unwritten_extents,					\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(bucket_gens,						\</div><div class='del'>-	  BIT_ULL(BCH_RECOVERY_PASS_bucket_gens_init)|		\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(lru_v2,						\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(fragmentation_lru,					\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(no_bps_in_alloc_keys,					\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(snapshot_trees,					\</div><div class='del'>-	  RECOVERY_PASS_ALL_FSCK)				\</div><div class='del'>-	x(snapshot_skiplists,					\</div><div class='del'>-	  BIT_ULL(BCH_RECOVERY_PASS_check_snapshots),		\</div><div class='del'>-	  BCH_FSCK_ERR_snapshot_bad_depth,			\</div><div class='del'>-	  BCH_FSCK_ERR_snapshot_bad_skiplist)			\</div><div class='del'>-	x(deleted_inodes,					\</div><div class='del'>-	  BIT_ULL(BCH_RECOVERY_PASS_check_inodes),		\</div><div class='del'>-	  BCH_FSCK_ERR_unlinked_inode_not_on_deleted_list)	\</div><div class='del'>-	x(rebalance_work,					\</div><div class='del'>-	  BIT_ULL(BCH_RECOVERY_PASS_set_fs_needs_rebalance))</div><div class='del'>-</div><div class='del'>-#define DOWNGRADE_TABLE()</div><div class='del'>-</div><div class='del'>-struct upgrade_downgrade_entry {</div><div class='del'>-	u64		recovery_passes;</div><div class='del'>-	u16		version;</div><div class='del'>-	u16		nr_errors;</div><div class='del'>-	const u16	*errors;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define x(ver, passes, ...) static const u16 upgrade_##ver##_errors[] = { __VA_ARGS__ };</div><div class='del'>-UPGRADE_TABLE()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-static const struct upgrade_downgrade_entry upgrade_table[] = {</div><div class='del'>-#define x(ver, passes, ...) {					\</div><div class='del'>-	.recovery_passes	= passes,			\</div><div class='del'>-	.version		= bcachefs_metadata_version_##ver,\</div><div class='del'>-	.nr_errors		= ARRAY_SIZE(upgrade_##ver##_errors),	\</div><div class='del'>-	.errors			= upgrade_##ver##_errors,	\</div><div class='del'>-},</div><div class='del'>-UPGRADE_TABLE()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_sb_set_upgrade(struct bch_fs *c,</div><div class='del'>-			 unsigned old_version,</div><div class='del'>-			 unsigned new_version)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field_ext *ext = bch2_sb_field_get(c-&gt;disk_sb.sb, ext);</div><div class='del'>-</div><div class='del'>-	for (const struct upgrade_downgrade_entry *i = upgrade_table;</div><div class='del'>-	     i &lt; upgrade_table + ARRAY_SIZE(upgrade_table);</div><div class='del'>-	     i++)</div><div class='del'>-		if (i-&gt;version &gt; old_version &amp;&amp; i-&gt;version &lt;= new_version) {</div><div class='del'>-			u64 passes = i-&gt;recovery_passes;</div><div class='del'>-</div><div class='del'>-			if (passes &amp; RECOVERY_PASS_ALL_FSCK)</div><div class='del'>-				passes |= bch2_fsck_recovery_passes();</div><div class='del'>-			passes &amp;= ~RECOVERY_PASS_ALL_FSCK;</div><div class='del'>-</div><div class='del'>-			ext-&gt;recovery_passes_required[0] |=</div><div class='del'>-				cpu_to_le64(bch2_recovery_passes_to_stable(passes));</div><div class='del'>-</div><div class='del'>-			for (const u16 *e = i-&gt;errors;</div><div class='del'>-			     e &lt; i-&gt;errors + i-&gt;nr_errors;</div><div class='del'>-			     e++) {</div><div class='del'>-				__set_bit(*e, c-&gt;sb.errors_silent);</div><div class='del'>-				ext-&gt;errors_silent[*e / 64] |= cpu_to_le64(BIT_ULL(*e % 64));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define x(ver, passes, ...) static const u16 downgrade_ver_##errors[] = { __VA_ARGS__ };</div><div class='del'>-DOWNGRADE_TABLE()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-static const struct upgrade_downgrade_entry downgrade_table[] = {</div><div class='del'>-#define x(ver, passes, ...) {					\</div><div class='del'>-	.recovery_passes	= passes,			\</div><div class='del'>-	.version		= bcachefs_metadata_version_##ver,\</div><div class='del'>-	.nr_errors		= ARRAY_SIZE(downgrade_##ver##_errors),	\</div><div class='del'>-	.errors			= downgrade_##ver##_errors,	\</div><div class='del'>-},</div><div class='del'>-DOWNGRADE_TABLE()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline const struct bch_sb_field_downgrade_entry *</div><div class='del'>-downgrade_entry_next_c(const struct bch_sb_field_downgrade_entry *e)</div><div class='del'>-{</div><div class='del'>-	return (void *) &amp;e-&gt;errors[le16_to_cpu(e-&gt;nr_errors)];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_downgrade_entry(_d, _i)						\</div><div class='del'>-	for (const struct bch_sb_field_downgrade_entry *_i = (_d)-&gt;entries;		\</div><div class='del'>-	     (void *) _i	&lt; vstruct_end(&amp;(_d)-&gt;field) &amp;&amp;				\</div><div class='del'>-	     (void *) &amp;_i-&gt;errors[0] &lt; vstruct_end(&amp;(_d)-&gt;field);			\</div><div class='del'>-	     _i = downgrade_entry_next_c(_i))</div><div class='del'>-</div><div class='del'>-static int bch2_sb_downgrade_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-				      struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_downgrade *e = field_to_type(f, downgrade);</div><div class='del'>-</div><div class='del'>-	for_each_downgrade_entry(e, i) {</div><div class='del'>-		if (BCH_VERSION_MAJOR(le16_to_cpu(i-&gt;version)) !=</div><div class='del'>-		    BCH_VERSION_MAJOR(le16_to_cpu(sb-&gt;version))) {</div><div class='del'>-			prt_printf(err, "downgrade entry with mismatched major version (%u != %u)",</div><div class='del'>-				   BCH_VERSION_MAJOR(le16_to_cpu(i-&gt;version)),</div><div class='del'>-				   BCH_VERSION_MAJOR(le16_to_cpu(sb-&gt;version)));</div><div class='del'>-			return -BCH_ERR_invalid_sb_downgrade;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_downgrade_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				      struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_downgrade *e = field_to_type(f, downgrade);</div><div class='del'>-</div><div class='del'>-	if (out-&gt;nr_tabstops &lt;= 1)</div><div class='del'>-		printbuf_tabstop_push(out, 16);</div><div class='del'>-</div><div class='del'>-	for_each_downgrade_entry(e, i) {</div><div class='del'>-		prt_str(out, "version:");</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		bch2_version_to_text(out, le16_to_cpu(i-&gt;version));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-</div><div class='del'>-		prt_str(out, "recovery passes:");</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_bitflags(out, bch2_recovery_passes,</div><div class='del'>-			     bch2_recovery_passes_from_stable(le64_to_cpu(i-&gt;recovery_passes[0])));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-</div><div class='del'>-		prt_str(out, "errors:");</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		bool first = true;</div><div class='del'>-		for (unsigned j = 0; j &lt; le16_to_cpu(i-&gt;nr_errors); j++) {</div><div class='del'>-			if (!first)</div><div class='del'>-				prt_char(out, ',');</div><div class='del'>-			first = false;</div><div class='del'>-			unsigned e = le16_to_cpu(i-&gt;errors[j]);</div><div class='del'>-			prt_str(out, e &lt; BCH_SB_ERR_MAX ? bch2_sb_error_strs[e] : "(unknown)");</div><div class='del'>-		}</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_downgrade = {</div><div class='del'>-	.validate	= bch2_sb_downgrade_validate,</div><div class='del'>-	.to_text	= bch2_sb_downgrade_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_sb_downgrade_update(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	darray_char table = {};</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for (const struct upgrade_downgrade_entry *src = downgrade_table;</div><div class='del'>-	     src &lt; downgrade_table + ARRAY_SIZE(downgrade_table);</div><div class='del'>-	     src++) {</div><div class='del'>-		if (BCH_VERSION_MAJOR(src-&gt;version) != BCH_VERSION_MAJOR(le16_to_cpu(c-&gt;disk_sb.sb-&gt;version)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		struct bch_sb_field_downgrade_entry *dst;</div><div class='del'>-		unsigned bytes = sizeof(*dst) + sizeof(dst-&gt;errors[0]) * src-&gt;nr_errors;</div><div class='del'>-</div><div class='del'>-		ret = darray_make_room(&amp;table, bytes);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		dst = (void *) &amp;darray_top(table);</div><div class='del'>-		dst-&gt;version = cpu_to_le16(src-&gt;version);</div><div class='del'>-		dst-&gt;recovery_passes[0]	= cpu_to_le64(src-&gt;recovery_passes);</div><div class='del'>-		dst-&gt;recovery_passes[1]	= 0;</div><div class='del'>-		dst-&gt;nr_errors		= cpu_to_le16(src-&gt;nr_errors);</div><div class='del'>-		for (unsigned i = 0; i &lt; src-&gt;nr_errors; i++)</div><div class='del'>-			dst-&gt;errors[i] = cpu_to_le16(src-&gt;errors[i]);</div><div class='del'>-</div><div class='del'>-		table.nr += bytes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field_downgrade *d = bch2_sb_field_get(c-&gt;disk_sb.sb, downgrade);</div><div class='del'>-</div><div class='del'>-	unsigned sb_u64s = DIV_ROUND_UP(sizeof(*d) + table.nr, sizeof(u64));</div><div class='del'>-</div><div class='del'>-	if (d &amp;&amp; le32_to_cpu(d-&gt;field.u64s) &gt; sb_u64s)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	d = bch2_sb_field_resize(&amp;c-&gt;disk_sb, downgrade, sb_u64s);</div><div class='del'>-	if (!d) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_sb_downgrade;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(d-&gt;entries, table.data, table.nr);</div><div class='del'>-	memset_u64s_tail(d-&gt;entries, 0, table.nr);</div><div class='del'>-out:</div><div class='del'>-	darray_exit(&amp;table);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_set_downgrade(struct bch_fs *c, unsigned new_minor, unsigned old_minor)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_downgrade *d = bch2_sb_field_get(c-&gt;disk_sb.sb, downgrade);</div><div class='del'>-	if (!d)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field_ext *ext = bch2_sb_field_get(c-&gt;disk_sb.sb, ext);</div><div class='del'>-</div><div class='del'>-	for_each_downgrade_entry(d, i) {</div><div class='del'>-		unsigned minor = BCH_VERSION_MINOR(le16_to_cpu(i-&gt;version));</div><div class='del'>-		if (new_minor &lt; minor &amp;&amp; minor &lt;= old_minor) {</div><div class='del'>-			ext-&gt;recovery_passes_required[0] |= i-&gt;recovery_passes[0];</div><div class='del'>-			ext-&gt;recovery_passes_required[1] |= i-&gt;recovery_passes[1];</div><div class='del'>-</div><div class='del'>-			for (unsigned j = 0; j &lt; le16_to_cpu(i-&gt;nr_errors); j++) {</div><div class='del'>-				unsigned e = le16_to_cpu(i-&gt;errors[j]);</div><div class='del'>-				if (e &lt; BCH_SB_ERR_MAX)</div><div class='del'>-					__set_bit(e, c-&gt;sb.errors_silent);</div><div class='del'>-				if (e &lt; sizeof(ext-&gt;errors_silent) * 8)</div><div class='del'>-					ext-&gt;errors_silent[e / 64] |= cpu_to_le64(BIT_ULL(e % 64));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/sb-downgrade.h b/fs/bcachefs/sb-downgrade.h<br/>deleted file mode 100644<br/>index 57e6c916fc73..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-downgrade.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-downgrade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_DOWNGRADE_H</div><div class='del'>-#define _BCACHEFS_SB_DOWNGRADE_H</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_downgrade;</div><div class='del'>-</div><div class='del'>-int bch2_sb_downgrade_update(struct bch_fs *);</div><div class='del'>-void bch2_sb_set_upgrade(struct bch_fs *, unsigned, unsigned);</div><div class='del'>-void bch2_sb_set_downgrade(struct bch_fs *, unsigned, unsigned);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SB_DOWNGRADE_H */</div><div class='head'>diff --git a/fs/bcachefs/sb-errors.c b/fs/bcachefs/sb-errors.c<br/>deleted file mode 100644<br/>index 5f5bcae391fb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-errors.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-errors.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,170 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "sb-errors.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-const char * const bch2_sb_error_strs[] = {</div><div class='del'>-#define x(t, n, ...) [n] = #t,</div><div class='del'>-	BCH_SB_ERRS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_sb_error_id_to_text(struct printbuf *out, enum bch_sb_error_id id)</div><div class='del'>-{</div><div class='del'>-	if (id &lt; BCH_SB_ERR_MAX)</div><div class='del'>-		prt_str(out, bch2_sb_error_strs[id]);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(unknown error %u)", id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_sb_field_errors_nr_entries(struct bch_sb_field_errors *e)</div><div class='del'>-{</div><div class='del'>-	return bch2_sb_field_nr_entries(e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned bch2_sb_field_errors_u64s(unsigned nr)</div><div class='del'>-{</div><div class='del'>-	return (sizeof(struct bch_sb_field_errors) +</div><div class='del'>-		sizeof(struct bch_sb_field_error_entry) * nr) / sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_errors_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-				   struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_errors *e = field_to_type(f, errors);</div><div class='del'>-	unsigned i, nr = bch2_sb_field_errors_nr_entries(e);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		if (!BCH_SB_ERROR_ENTRY_NR(&amp;e-&gt;entries[i])) {</div><div class='del'>-			prt_printf(err, "entry with count 0 (id ");</div><div class='del'>-			bch2_sb_error_id_to_text(err, BCH_SB_ERROR_ENTRY_ID(&amp;e-&gt;entries[i]));</div><div class='del'>-			prt_printf(err, ")");</div><div class='del'>-			return -BCH_ERR_invalid_sb_errors;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i + 1 &lt; nr &amp;&amp;</div><div class='del'>-		    BCH_SB_ERROR_ENTRY_ID(&amp;e-&gt;entries[i]) &gt;=</div><div class='del'>-		    BCH_SB_ERROR_ENTRY_ID(&amp;e-&gt;entries[i + 1])) {</div><div class='del'>-			prt_printf(err, "entries out of order");</div><div class='del'>-			return -BCH_ERR_invalid_sb_errors;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_errors_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				   struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_errors *e = field_to_type(f, errors);</div><div class='del'>-	unsigned i, nr = bch2_sb_field_errors_nr_entries(e);</div><div class='del'>-</div><div class='del'>-	if (out-&gt;nr_tabstops &lt;= 1)</div><div class='del'>-		printbuf_tabstop_push(out, 16);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		bch2_sb_error_id_to_text(out, BCH_SB_ERROR_ENTRY_ID(&amp;e-&gt;entries[i]));</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, BCH_SB_ERROR_ENTRY_NR(&amp;e-&gt;entries[i]));</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		bch2_prt_datetime(out, le64_to_cpu(e-&gt;entries[i].last_error_time));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_errors = {</div><div class='del'>-	.validate	= bch2_sb_errors_validate,</div><div class='del'>-	.to_text	= bch2_sb_errors_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_sb_error_count(struct bch_fs *c, enum bch_sb_error_id err)</div><div class='del'>-{</div><div class='del'>-	bch_sb_errors_cpu *e = &amp;c-&gt;fsck_error_counts;</div><div class='del'>-	struct bch_sb_error_entry_cpu n = {</div><div class='del'>-		.id = err,</div><div class='del'>-		.nr = 1,</div><div class='del'>-		.last_error_time = ktime_get_real_seconds()</div><div class='del'>-	};</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;fsck_error_counts_lock);</div><div class='del'>-	for (i = 0; i &lt; e-&gt;nr; i++) {</div><div class='del'>-		if (err == e-&gt;data[i].id) {</div><div class='del'>-			e-&gt;data[i].nr++;</div><div class='del'>-			e-&gt;data[i].last_error_time = n.last_error_time;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (err &lt; e-&gt;data[i].id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (darray_make_room(e, 1))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	darray_insert_item(e, i, n);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;fsck_error_counts_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_errors_from_cpu(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bch_sb_errors_cpu *src = &amp;c-&gt;fsck_error_counts;</div><div class='del'>-	struct bch_sb_field_errors *dst =</div><div class='del'>-		bch2_sb_field_resize(&amp;c-&gt;disk_sb, errors,</div><div class='del'>-				     bch2_sb_field_errors_u64s(src-&gt;nr));</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (!dst)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; src-&gt;nr; i++) {</div><div class='del'>-		SET_BCH_SB_ERROR_ENTRY_ID(&amp;dst-&gt;entries[i], src-&gt;data[i].id);</div><div class='del'>-		SET_BCH_SB_ERROR_ENTRY_NR(&amp;dst-&gt;entries[i], src-&gt;data[i].nr);</div><div class='del'>-		dst-&gt;entries[i].last_error_time = cpu_to_le64(src-&gt;data[i].last_error_time);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_errors_to_cpu(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_errors *src = bch2_sb_field_get(c-&gt;disk_sb.sb, errors);</div><div class='del'>-	bch_sb_errors_cpu *dst = &amp;c-&gt;fsck_error_counts;</div><div class='del'>-	unsigned i, nr = bch2_sb_field_errors_nr_entries(src);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!nr)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;fsck_error_counts_lock);</div><div class='del'>-	ret = darray_make_room(dst, nr);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dst-&gt;nr = nr;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		dst-&gt;data[i].id = BCH_SB_ERROR_ENTRY_ID(&amp;src-&gt;entries[i]);</div><div class='del'>-		dst-&gt;data[i].nr = BCH_SB_ERROR_ENTRY_NR(&amp;src-&gt;entries[i]);</div><div class='del'>-		dst-&gt;data[i].last_error_time = le64_to_cpu(src-&gt;entries[i].last_error_time);</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;fsck_error_counts_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_sb_errors_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	darray_exit(&amp;c-&gt;fsck_error_counts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_sb_errors_init_early(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;c-&gt;fsck_error_counts_lock);</div><div class='del'>-	darray_init(&amp;c-&gt;fsck_error_counts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_sb_errors_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return bch2_sb_errors_to_cpu(c);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/sb-errors.h b/fs/bcachefs/sb-errors.h<br/>deleted file mode 100644<br/>index 8889001e7db4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-errors.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-errors.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_ERRORS_H</div><div class='del'>-#define _BCACHEFS_SB_ERRORS_H</div><div class='del'>-</div><div class='del'>-#include "sb-errors_types.h"</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_sb_error_strs[];</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_errors;</div><div class='del'>-</div><div class='del'>-void bch2_sb_error_count(struct bch_fs *, enum bch_sb_error_id);</div><div class='del'>-</div><div class='del'>-void bch2_sb_errors_from_cpu(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_fs_sb_errors_exit(struct bch_fs *);</div><div class='del'>-void bch2_fs_sb_errors_init_early(struct bch_fs *);</div><div class='del'>-int bch2_fs_sb_errors_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SB_ERRORS_H */</div><div class='head'>diff --git a/fs/bcachefs/sb-errors_types.h b/fs/bcachefs/sb-errors_types.h<br/>deleted file mode 100644<br/>index c08aacdfd073..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-errors_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-errors_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,271 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_ERRORS_TYPES_H</div><div class='del'>-#define _BCACHEFS_SB_ERRORS_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "darray.h"</div><div class='del'>-</div><div class='del'>-#define BCH_SB_ERRS()							\</div><div class='del'>-	x(clean_but_journal_not_empty,				0)	\</div><div class='del'>-	x(dirty_but_no_journal_entries,				1)	\</div><div class='del'>-	x(dirty_but_no_journal_entries_post_drop_nonflushes,	2)	\</div><div class='del'>-	x(sb_clean_journal_seq_mismatch,			3)	\</div><div class='del'>-	x(sb_clean_btree_root_mismatch,				4)	\</div><div class='del'>-	x(sb_clean_missing,					5)	\</div><div class='del'>-	x(jset_unsupported_version,				6)	\</div><div class='del'>-	x(jset_unknown_csum,					7)	\</div><div class='del'>-	x(jset_last_seq_newer_than_seq,				8)	\</div><div class='del'>-	x(jset_past_bucket_end,					9)	\</div><div class='del'>-	x(jset_seq_blacklisted,					10)	\</div><div class='del'>-	x(journal_entries_missing,				11)	\</div><div class='del'>-	x(journal_entry_replicas_not_marked,			12)	\</div><div class='del'>-	x(journal_entry_past_jset_end,				13)	\</div><div class='del'>-	x(journal_entry_replicas_data_mismatch,			14)	\</div><div class='del'>-	x(journal_entry_bkey_u64s_0,				15)	\</div><div class='del'>-	x(journal_entry_bkey_past_end,				16)	\</div><div class='del'>-	x(journal_entry_bkey_bad_format,			17)	\</div><div class='del'>-	x(journal_entry_bkey_invalid,				18)	\</div><div class='del'>-	x(journal_entry_btree_root_bad_size,			19)	\</div><div class='del'>-	x(journal_entry_blacklist_bad_size,			20)	\</div><div class='del'>-	x(journal_entry_blacklist_v2_bad_size,			21)	\</div><div class='del'>-	x(journal_entry_blacklist_v2_start_past_end,		22)	\</div><div class='del'>-	x(journal_entry_usage_bad_size,				23)	\</div><div class='del'>-	x(journal_entry_data_usage_bad_size,			24)	\</div><div class='del'>-	x(journal_entry_clock_bad_size,				25)	\</div><div class='del'>-	x(journal_entry_clock_bad_rw,				26)	\</div><div class='del'>-	x(journal_entry_dev_usage_bad_size,			27)	\</div><div class='del'>-	x(journal_entry_dev_usage_bad_dev,			28)	\</div><div class='del'>-	x(journal_entry_dev_usage_bad_pad,			29)	\</div><div class='del'>-	x(btree_node_unreadable,				30)	\</div><div class='del'>-	x(btree_node_fault_injected,				31)	\</div><div class='del'>-	x(btree_node_bad_magic,					32)	\</div><div class='del'>-	x(btree_node_bad_seq,					33)	\</div><div class='del'>-	x(btree_node_unsupported_version,			34)	\</div><div class='del'>-	x(btree_node_bset_older_than_sb_min,			35)	\</div><div class='del'>-	x(btree_node_bset_newer_than_sb,			36)	\</div><div class='del'>-	x(btree_node_data_missing,				37)	\</div><div class='del'>-	x(btree_node_bset_after_end,				38)	\</div><div class='del'>-	x(btree_node_replicas_sectors_written_mismatch,		39)	\</div><div class='del'>-	x(btree_node_replicas_data_mismatch,			40)	\</div><div class='del'>-	x(bset_unknown_csum,					41)	\</div><div class='del'>-	x(bset_bad_csum,					42)	\</div><div class='del'>-	x(bset_past_end_of_btree_node,				43)	\</div><div class='del'>-	x(bset_wrong_sector_offset,				44)	\</div><div class='del'>-	x(bset_empty,						45)	\</div><div class='del'>-	x(bset_bad_seq,						46)	\</div><div class='del'>-	x(bset_blacklisted_journal_seq,				47)	\</div><div class='del'>-	x(first_bset_blacklisted_journal_seq,			48)	\</div><div class='del'>-	x(btree_node_bad_btree,					49)	\</div><div class='del'>-	x(btree_node_bad_level,					50)	\</div><div class='del'>-	x(btree_node_bad_min_key,				51)	\</div><div class='del'>-	x(btree_node_bad_max_key,				52)	\</div><div class='del'>-	x(btree_node_bad_format,				53)	\</div><div class='del'>-	x(btree_node_bkey_past_bset_end,			54)	\</div><div class='del'>-	x(btree_node_bkey_bad_format,				55)	\</div><div class='del'>-	x(btree_node_bad_bkey,					56)	\</div><div class='del'>-	x(btree_node_bkey_out_of_order,				57)	\</div><div class='del'>-	x(btree_root_bkey_invalid,				58)	\</div><div class='del'>-	x(btree_root_read_error,				59)	\</div><div class='del'>-	x(btree_root_bad_min_key,				60)	\</div><div class='del'>-	x(btree_root_bad_max_key,				61)	\</div><div class='del'>-	x(btree_node_read_error,				62)	\</div><div class='del'>-	x(btree_node_topology_bad_min_key,			63)	\</div><div class='del'>-	x(btree_node_topology_bad_max_key,			64)	\</div><div class='del'>-	x(btree_node_topology_overwritten_by_prev_node,		65)	\</div><div class='del'>-	x(btree_node_topology_overwritten_by_next_node,		66)	\</div><div class='del'>-	x(btree_node_topology_interior_node_empty,		67)	\</div><div class='del'>-	x(fs_usage_hidden_wrong,				68)	\</div><div class='del'>-	x(fs_usage_btree_wrong,					69)	\</div><div class='del'>-	x(fs_usage_data_wrong,					70)	\</div><div class='del'>-	x(fs_usage_cached_wrong,				71)	\</div><div class='del'>-	x(fs_usage_reserved_wrong,				72)	\</div><div class='del'>-	x(fs_usage_persistent_reserved_wrong,			73)	\</div><div class='del'>-	x(fs_usage_nr_inodes_wrong,				74)	\</div><div class='del'>-	x(fs_usage_replicas_wrong,				75)	\</div><div class='del'>-	x(dev_usage_buckets_wrong,				76)	\</div><div class='del'>-	x(dev_usage_sectors_wrong,				77)	\</div><div class='del'>-	x(dev_usage_fragmented_wrong,				78)	\</div><div class='del'>-	x(dev_usage_buckets_ec_wrong,				79)	\</div><div class='del'>-	x(bkey_version_in_future,				80)	\</div><div class='del'>-	x(bkey_u64s_too_small,					81)	\</div><div class='del'>-	x(bkey_invalid_type_for_btree,				82)	\</div><div class='del'>-	x(bkey_extent_size_zero,				83)	\</div><div class='del'>-	x(bkey_extent_size_greater_than_offset,			84)	\</div><div class='del'>-	x(bkey_size_nonzero,					85)	\</div><div class='del'>-	x(bkey_snapshot_nonzero,				86)	\</div><div class='del'>-	x(bkey_snapshot_zero,					87)	\</div><div class='del'>-	x(bkey_at_pos_max,					88)	\</div><div class='del'>-	x(bkey_before_start_of_btree_node,			89)	\</div><div class='del'>-	x(bkey_after_end_of_btree_node,				90)	\</div><div class='del'>-	x(bkey_val_size_nonzero,				91)	\</div><div class='del'>-	x(bkey_val_size_too_small,				92)	\</div><div class='del'>-	x(alloc_v1_val_size_bad,				93)	\</div><div class='del'>-	x(alloc_v2_unpack_error,				94)	\</div><div class='del'>-	x(alloc_v3_unpack_error,				95)	\</div><div class='del'>-	x(alloc_v4_val_size_bad,				96)	\</div><div class='del'>-	x(alloc_v4_backpointers_start_bad,			97)	\</div><div class='del'>-	x(alloc_key_data_type_bad,				98)	\</div><div class='del'>-	x(alloc_key_empty_but_have_data,			99)	\</div><div class='del'>-	x(alloc_key_dirty_sectors_0,				100)	\</div><div class='del'>-	x(alloc_key_data_type_inconsistency,			101)	\</div><div class='del'>-	x(alloc_key_to_missing_dev_bucket,			102)	\</div><div class='del'>-	x(alloc_key_cached_inconsistency,			103)	\</div><div class='del'>-	x(alloc_key_cached_but_read_time_zero,			104)	\</div><div class='del'>-	x(alloc_key_to_missing_lru_entry,			105)	\</div><div class='del'>-	x(alloc_key_data_type_wrong,				106)	\</div><div class='del'>-	x(alloc_key_gen_wrong,					107)	\</div><div class='del'>-	x(alloc_key_dirty_sectors_wrong,			108)	\</div><div class='del'>-	x(alloc_key_cached_sectors_wrong,			109)	\</div><div class='del'>-	x(alloc_key_stripe_wrong,				110)	\</div><div class='del'>-	x(alloc_key_stripe_redundancy_wrong,			111)	\</div><div class='del'>-	x(bucket_sector_count_overflow,				112)	\</div><div class='del'>-	x(bucket_metadata_type_mismatch,			113)	\</div><div class='del'>-	x(need_discard_key_wrong,				114)	\</div><div class='del'>-	x(freespace_key_wrong,					115)	\</div><div class='del'>-	x(freespace_hole_missing,				116)	\</div><div class='del'>-	x(bucket_gens_val_size_bad,				117)	\</div><div class='del'>-	x(bucket_gens_key_wrong,				118)	\</div><div class='del'>-	x(bucket_gens_hole_wrong,				119)	\</div><div class='del'>-	x(bucket_gens_to_invalid_dev,				120)	\</div><div class='del'>-	x(bucket_gens_to_invalid_buckets,			121)	\</div><div class='del'>-	x(bucket_gens_nonzero_for_invalid_buckets,		122)	\</div><div class='del'>-	x(need_discard_freespace_key_to_invalid_dev_bucket,	123)	\</div><div class='del'>-	x(need_discard_freespace_key_bad,			124)	\</div><div class='del'>-	x(backpointer_pos_wrong,				125)	\</div><div class='del'>-	x(backpointer_to_missing_device,			126)	\</div><div class='del'>-	x(backpointer_to_missing_alloc,				127)	\</div><div class='del'>-	x(backpointer_to_missing_ptr,				128)	\</div><div class='del'>-	x(lru_entry_at_time_0,					129)	\</div><div class='del'>-	x(lru_entry_to_invalid_bucket,				130)	\</div><div class='del'>-	x(lru_entry_bad,					131)	\</div><div class='del'>-	x(btree_ptr_val_too_big,				132)	\</div><div class='del'>-	x(btree_ptr_v2_val_too_big,				133)	\</div><div class='del'>-	x(btree_ptr_has_non_ptr,				134)	\</div><div class='del'>-	x(extent_ptrs_invalid_entry,				135)	\</div><div class='del'>-	x(extent_ptrs_no_ptrs,					136)	\</div><div class='del'>-	x(extent_ptrs_too_many_ptrs,				137)	\</div><div class='del'>-	x(extent_ptrs_redundant_crc,				138)	\</div><div class='del'>-	x(extent_ptrs_redundant_stripe,				139)	\</div><div class='del'>-	x(extent_ptrs_unwritten,				140)	\</div><div class='del'>-	x(extent_ptrs_written_and_unwritten,			141)	\</div><div class='del'>-	x(ptr_to_invalid_device,				142)	\</div><div class='del'>-	x(ptr_to_duplicate_device,				143)	\</div><div class='del'>-	x(ptr_after_last_bucket,				144)	\</div><div class='del'>-	x(ptr_before_first_bucket,				145)	\</div><div class='del'>-	x(ptr_spans_multiple_buckets,				146)	\</div><div class='del'>-	x(ptr_to_missing_backpointer,				147)	\</div><div class='del'>-	x(ptr_to_missing_alloc_key,				148)	\</div><div class='del'>-	x(ptr_to_missing_replicas_entry,			149)	\</div><div class='del'>-	x(ptr_to_missing_stripe,				150)	\</div><div class='del'>-	x(ptr_to_incorrect_stripe,				151)	\</div><div class='del'>-	x(ptr_gen_newer_than_bucket_gen,			152)	\</div><div class='del'>-	x(ptr_too_stale,					153)	\</div><div class='del'>-	x(stale_dirty_ptr,					154)	\</div><div class='del'>-	x(ptr_bucket_data_type_mismatch,			155)	\</div><div class='del'>-	x(ptr_cached_and_erasure_coded,				156)	\</div><div class='del'>-	x(ptr_crc_uncompressed_size_too_small,			157)	\</div><div class='del'>-	x(ptr_crc_csum_type_unknown,				158)	\</div><div class='del'>-	x(ptr_crc_compression_type_unknown,			159)	\</div><div class='del'>-	x(ptr_crc_redundant,					160)	\</div><div class='del'>-	x(ptr_crc_uncompressed_size_too_big,			161)	\</div><div class='del'>-	x(ptr_crc_nonce_mismatch,				162)	\</div><div class='del'>-	x(ptr_stripe_redundant,					163)	\</div><div class='del'>-	x(reservation_key_nr_replicas_invalid,			164)	\</div><div class='del'>-	x(reflink_v_refcount_wrong,				165)	\</div><div class='del'>-	x(reflink_p_to_missing_reflink_v,			166)	\</div><div class='del'>-	x(stripe_pos_bad,					167)	\</div><div class='del'>-	x(stripe_val_size_bad,					168)	\</div><div class='del'>-	x(stripe_sector_count_wrong,				169)	\</div><div class='del'>-	x(snapshot_tree_pos_bad,				170)	\</div><div class='del'>-	x(snapshot_tree_to_missing_snapshot,			171)	\</div><div class='del'>-	x(snapshot_tree_to_missing_subvol,			172)	\</div><div class='del'>-	x(snapshot_tree_to_wrong_subvol,			173)	\</div><div class='del'>-	x(snapshot_tree_to_snapshot_subvol,			174)	\</div><div class='del'>-	x(snapshot_pos_bad,					175)	\</div><div class='del'>-	x(snapshot_parent_bad,					176)	\</div><div class='del'>-	x(snapshot_children_not_normalized,			177)	\</div><div class='del'>-	x(snapshot_child_duplicate,				178)	\</div><div class='del'>-	x(snapshot_child_bad,					179)	\</div><div class='del'>-	x(snapshot_skiplist_not_normalized,			180)	\</div><div class='del'>-	x(snapshot_skiplist_bad,				181)	\</div><div class='del'>-	x(snapshot_should_not_have_subvol,			182)	\</div><div class='del'>-	x(snapshot_to_bad_snapshot_tree,			183)	\</div><div class='del'>-	x(snapshot_bad_depth,					184)	\</div><div class='del'>-	x(snapshot_bad_skiplist,				185)	\</div><div class='del'>-	x(subvol_pos_bad,					186)	\</div><div class='del'>-	x(subvol_not_master_and_not_snapshot,			187)	\</div><div class='del'>-	x(subvol_to_missing_root,				188)	\</div><div class='del'>-	x(subvol_root_wrong_bi_subvol,				189)	\</div><div class='del'>-	x(bkey_in_missing_snapshot,				190)	\</div><div class='del'>-	x(inode_pos_inode_nonzero,				191)	\</div><div class='del'>-	x(inode_pos_blockdev_range,				192)	\</div><div class='del'>-	x(inode_unpack_error,					193)	\</div><div class='del'>-	x(inode_str_hash_invalid,				194)	\</div><div class='del'>-	x(inode_v3_fields_start_bad,				195)	\</div><div class='del'>-	x(inode_snapshot_mismatch,				196)	\</div><div class='del'>-	x(inode_unlinked_but_clean,				197)	\</div><div class='del'>-	x(inode_unlinked_but_nlink_nonzero,			198)	\</div><div class='del'>-	x(inode_checksum_type_invalid,				199)	\</div><div class='del'>-	x(inode_compression_type_invalid,			200)	\</div><div class='del'>-	x(inode_subvol_root_but_not_dir,			201)	\</div><div class='del'>-	x(inode_i_size_dirty_but_clean,				202)	\</div><div class='del'>-	x(inode_i_sectors_dirty_but_clean,			203)	\</div><div class='del'>-	x(inode_i_sectors_wrong,				204)	\</div><div class='del'>-	x(inode_dir_wrong_nlink,				205)	\</div><div class='del'>-	x(inode_dir_multiple_links,				206)	\</div><div class='del'>-	x(inode_multiple_links_but_nlink_0,			207)	\</div><div class='del'>-	x(inode_wrong_backpointer,				208)	\</div><div class='del'>-	x(inode_wrong_nlink,					209)	\</div><div class='del'>-	x(inode_unreachable,					210)	\</div><div class='del'>-	x(deleted_inode_but_clean,				211)	\</div><div class='del'>-	x(deleted_inode_missing,				212)	\</div><div class='del'>-	x(deleted_inode_is_dir,					213)	\</div><div class='del'>-	x(deleted_inode_not_unlinked,				214)	\</div><div class='del'>-	x(extent_overlapping,					215)	\</div><div class='del'>-	x(extent_in_missing_inode,				216)	\</div><div class='del'>-	x(extent_in_non_reg_inode,				217)	\</div><div class='del'>-	x(extent_past_end_of_inode,				218)	\</div><div class='del'>-	x(dirent_empty_name,					219)	\</div><div class='del'>-	x(dirent_val_too_big,					220)	\</div><div class='del'>-	x(dirent_name_too_long,					221)	\</div><div class='del'>-	x(dirent_name_embedded_nul,				222)	\</div><div class='del'>-	x(dirent_name_dot_or_dotdot,				223)	\</div><div class='del'>-	x(dirent_name_has_slash,				224)	\</div><div class='del'>-	x(dirent_d_type_wrong,					225)	\</div><div class='del'>-	x(dirent_d_parent_subvol_wrong,				226)	\</div><div class='del'>-	x(dirent_in_missing_dir_inode,				227)	\</div><div class='del'>-	x(dirent_in_non_dir_inode,				228)	\</div><div class='del'>-	x(dirent_to_missing_inode,				229)	\</div><div class='del'>-	x(dirent_to_missing_subvol,				230)	\</div><div class='del'>-	x(dirent_to_itself,					231)	\</div><div class='del'>-	x(quota_type_invalid,					232)	\</div><div class='del'>-	x(xattr_val_size_too_small,				233)	\</div><div class='del'>-	x(xattr_val_size_too_big,				234)	\</div><div class='del'>-	x(xattr_invalid_type,					235)	\</div><div class='del'>-	x(xattr_name_invalid_chars,				236)	\</div><div class='del'>-	x(xattr_in_missing_inode,				237)	\</div><div class='del'>-	x(root_subvol_missing,					238)	\</div><div class='del'>-	x(root_dir_missing,					239)	\</div><div class='del'>-	x(root_inode_not_dir,					240)	\</div><div class='del'>-	x(dir_loop,						241)	\</div><div class='del'>-	x(hash_table_key_duplicate,				242)	\</div><div class='del'>-	x(hash_table_key_wrong_offset,				243)	\</div><div class='del'>-	x(unlinked_inode_not_on_deleted_list,			244)	\</div><div class='del'>-	x(reflink_p_front_pad_bad,				245)</div><div class='del'>-</div><div class='del'>-enum bch_sb_error_id {</div><div class='del'>-#define x(t, n) BCH_FSCK_ERR_##t = n,</div><div class='del'>-	BCH_SB_ERRS()</div><div class='del'>-#undef x</div><div class='del'>-	BCH_SB_ERR_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_sb_error_entry_cpu {</div><div class='del'>-	u64			id:16,</div><div class='del'>-				nr:48;</div><div class='del'>-	u64			last_error_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef DARRAY(struct bch_sb_error_entry_cpu) bch_sb_errors_cpu;</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SB_ERRORS_TYPES_H */</div><div class='del'>-</div><div class='head'>diff --git a/fs/bcachefs/sb-members.c b/fs/bcachefs/sb-members.c<br/>deleted file mode 100644<br/>index a45354d2acde..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-members.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-members.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,428 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-</div><div class='del'>-#define x(t, n, ...) [n] = #t,</div><div class='del'>-static const char * const bch2_iops_measurements[] = {</div><div class='del'>-	BCH_IOPS_MEASUREMENTS()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char * const bch2_member_error_strs[] = {</div><div class='del'>-	BCH_MEMBER_ERROR_TYPES()</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-/* Code for bch_sb_field_members_v1: */</div><div class='del'>-</div><div class='del'>-struct bch_member *bch2_members_v2_get_mut(struct bch_sb *sb, int i)</div><div class='del'>-{</div><div class='del'>-	return __bch2_members_v2_get_mut(bch2_sb_field_get(sb, members_v2), i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_member members_v2_get(struct bch_sb_field_members_v2 *mi, int i)</div><div class='del'>-{</div><div class='del'>-	struct bch_member ret, *p = __bch2_members_v2_get_mut(mi, i);</div><div class='del'>-	memset(&amp;ret, 0, sizeof(ret));</div><div class='del'>-	memcpy(&amp;ret, p, min_t(size_t, le16_to_cpu(mi-&gt;member_bytes), sizeof(ret)));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_member *members_v1_get_mut(struct bch_sb_field_members_v1 *mi, int i)</div><div class='del'>-{</div><div class='del'>-	return (void *) mi-&gt;_members + (i * BCH_MEMBER_V1_BYTES);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_member members_v1_get(struct bch_sb_field_members_v1 *mi, int i)</div><div class='del'>-{</div><div class='del'>-	struct bch_member ret, *p = members_v1_get_mut(mi, i);</div><div class='del'>-	memset(&amp;ret, 0, sizeof(ret));</div><div class='del'>-	memcpy(&amp;ret, p, min_t(size_t, BCH_MEMBER_V1_BYTES, sizeof(ret)));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_member bch2_sb_member_get(struct bch_sb *sb, int i)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v2 *mi2 = bch2_sb_field_get(sb, members_v2);</div><div class='del'>-	if (mi2)</div><div class='del'>-		return members_v2_get(mi2, i);</div><div class='del'>-	struct bch_sb_field_members_v1 *mi1 = bch2_sb_field_get(sb, members_v1);</div><div class='del'>-	return members_v1_get(mi1, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_members_v2_resize_entries(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v2 *mi = bch2_sb_field_get(c-&gt;disk_sb.sb, members_v2);</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(mi-&gt;member_bytes) &lt; sizeof(struct bch_member)) {</div><div class='del'>-		unsigned u64s = DIV_ROUND_UP((sizeof(*mi) + sizeof(mi-&gt;_members[0]) *</div><div class='del'>-					      c-&gt;disk_sb.sb-&gt;nr_devices), 8);</div><div class='del'>-</div><div class='del'>-		mi = bch2_sb_field_resize(&amp;c-&gt;disk_sb, members_v2, u64s);</div><div class='del'>-		if (!mi)</div><div class='del'>-			return -BCH_ERR_ENOSPC_sb_members_v2;</div><div class='del'>-</div><div class='del'>-		for (int i = c-&gt;disk_sb.sb-&gt;nr_devices - 1; i &gt;= 0; --i) {</div><div class='del'>-			void *dst = (void *) mi-&gt;_members + (i * sizeof(struct bch_member));</div><div class='del'>-			memmove(dst, __bch2_members_v2_get_mut(mi, i), le16_to_cpu(mi-&gt;member_bytes));</div><div class='del'>-			memset(dst + le16_to_cpu(mi-&gt;member_bytes),</div><div class='del'>-			       0, (sizeof(struct bch_member) - le16_to_cpu(mi-&gt;member_bytes)));</div><div class='del'>-		}</div><div class='del'>-		mi-&gt;member_bytes = cpu_to_le16(sizeof(struct bch_member));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_members_v2_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v1 *mi1;</div><div class='del'>-	struct bch_sb_field_members_v2 *mi2;</div><div class='del'>-</div><div class='del'>-	if (!bch2_sb_field_get(c-&gt;disk_sb.sb, members_v2)) {</div><div class='del'>-		mi2 = bch2_sb_field_resize(&amp;c-&gt;disk_sb, members_v2,</div><div class='del'>-				DIV_ROUND_UP(sizeof(*mi2) +</div><div class='del'>-					     sizeof(struct bch_member) * c-&gt;sb.nr_devices,</div><div class='del'>-					     sizeof(u64)));</div><div class='del'>-		mi1 = bch2_sb_field_get(c-&gt;disk_sb.sb, members_v1);</div><div class='del'>-		memcpy(&amp;mi2-&gt;_members[0], &amp;mi1-&gt;_members[0],</div><div class='del'>-		       BCH_MEMBER_V1_BYTES * c-&gt;sb.nr_devices);</div><div class='del'>-		memset(&amp;mi2-&gt;pad[0], 0, sizeof(mi2-&gt;pad));</div><div class='del'>-		mi2-&gt;member_bytes = cpu_to_le16(BCH_MEMBER_V1_BYTES);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sb_members_v2_resize_entries(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_members_cpy_v2_v1(struct bch_sb_handle *disk_sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v1 *mi1;</div><div class='del'>-	struct bch_sb_field_members_v2 *mi2;</div><div class='del'>-</div><div class='del'>-	mi1 = bch2_sb_field_resize(disk_sb, members_v1,</div><div class='del'>-			DIV_ROUND_UP(sizeof(*mi1) + BCH_MEMBER_V1_BYTES *</div><div class='del'>-				     disk_sb-&gt;sb-&gt;nr_devices, sizeof(u64)));</div><div class='del'>-	if (!mi1)</div><div class='del'>-		return -BCH_ERR_ENOSPC_sb_members;</div><div class='del'>-</div><div class='del'>-	mi2 = bch2_sb_field_get(disk_sb-&gt;sb, members_v2);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; disk_sb-&gt;sb-&gt;nr_devices; i++)</div><div class='del'>-		memcpy(members_v1_get_mut(mi1, i), __bch2_members_v2_get_mut(mi2, i), BCH_MEMBER_V1_BYTES);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_member(struct printbuf *err,</div><div class='del'>-			   struct bch_member m,</div><div class='del'>-			   struct bch_sb *sb,</div><div class='del'>-			   int i)</div><div class='del'>-{</div><div class='del'>-	if (le64_to_cpu(m.nbuckets) &gt; LONG_MAX) {</div><div class='del'>-		prt_printf(err, "device %u: too many buckets (got %llu, max %lu)",</div><div class='del'>-			   i, le64_to_cpu(m.nbuckets), LONG_MAX);</div><div class='del'>-		return -BCH_ERR_invalid_sb_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(m.nbuckets) -</div><div class='del'>-	    le16_to_cpu(m.first_bucket) &lt; BCH_MIN_NR_NBUCKETS) {</div><div class='del'>-		prt_printf(err, "device %u: not enough buckets (got %llu, max %u)",</div><div class='del'>-			   i, le64_to_cpu(m.nbuckets), BCH_MIN_NR_NBUCKETS);</div><div class='del'>-		return -BCH_ERR_invalid_sb_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(m.bucket_size) &lt;</div><div class='del'>-	    le16_to_cpu(sb-&gt;block_size)) {</div><div class='del'>-		prt_printf(err, "device %u: bucket size %u smaller than block size %u",</div><div class='del'>-			   i, le16_to_cpu(m.bucket_size), le16_to_cpu(sb-&gt;block_size));</div><div class='del'>-		return -BCH_ERR_invalid_sb_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(m.bucket_size) &lt;</div><div class='del'>-	    BCH_SB_BTREE_NODE_SIZE(sb)) {</div><div class='del'>-		prt_printf(err, "device %u: bucket size %u smaller than btree node size %llu",</div><div class='del'>-			   i, le16_to_cpu(m.bucket_size), BCH_SB_BTREE_NODE_SIZE(sb));</div><div class='del'>-		return -BCH_ERR_invalid_sb_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void member_to_text(struct printbuf *out,</div><div class='del'>-			   struct bch_member m,</div><div class='del'>-			   struct bch_sb_field_disk_groups *gi,</div><div class='del'>-			   struct bch_sb *sb,</div><div class='del'>-			   int i)</div><div class='del'>-{</div><div class='del'>-	unsigned data_have = bch2_sb_dev_has_data(sb, i);</div><div class='del'>-	u64 bucket_size = le16_to_cpu(m.bucket_size);</div><div class='del'>-	u64 device_size = le64_to_cpu(m.nbuckets) * bucket_size;</div><div class='del'>-</div><div class='del'>-	if (!bch2_member_exists(&amp;m))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Device:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", i);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Label:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	if (BCH_MEMBER_GROUP(&amp;m)) {</div><div class='del'>-		unsigned idx = BCH_MEMBER_GROUP(&amp;m) - 1;</div><div class='del'>-</div><div class='del'>-		if (idx &lt; disk_groups_nr(gi))</div><div class='del'>-			prt_printf(out, "%s (%u)",</div><div class='del'>-				   gi-&gt;entries[idx].label, idx);</div><div class='del'>-		else</div><div class='del'>-			prt_printf(out, "(bad disk labels section)");</div><div class='del'>-	} else {</div><div class='del'>-		prt_printf(out, "(none)");</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "UUID:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	pr_uuid(out, m.uuid.b);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Size:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_units_u64(out, device_size &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_MEMBER_ERROR_NR; i++) {</div><div class='del'>-		prt_printf(out, "%s errors:", bch2_member_error_strs[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, le64_to_cpu(m.errors[i]));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_IOPS_NR; i++) {</div><div class='del'>-		prt_printf(out, "%s iops:", bch2_iops_measurements[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_printf(out, "%u", le32_to_cpu(m.iops[i]));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Bucket size:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_units_u64(out, bucket_size &lt;&lt; 9);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "First bucket:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", le16_to_cpu(m.first_bucket));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Buckets:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", le64_to_cpu(m.nbuckets));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Last mount:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	if (m.last_mount)</div><div class='del'>-		bch2_prt_datetime(out, le64_to_cpu(m.last_mount));</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(never)");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Last superblock write:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, le64_to_cpu(m.seq));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "State:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%s",</div><div class='del'>-		   BCH_MEMBER_STATE(&amp;m) &lt; BCH_MEMBER_STATE_NR</div><div class='del'>-		   ? bch2_member_states[BCH_MEMBER_STATE(&amp;m)]</div><div class='del'>-		   : "unknown");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Data allowed:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	if (BCH_MEMBER_DATA_ALLOWED(&amp;m))</div><div class='del'>-		prt_bitflags(out, __bch2_data_types, BCH_MEMBER_DATA_ALLOWED(&amp;m));</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(none)");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Has data:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	if (data_have)</div><div class='del'>-		prt_bitflags(out, __bch2_data_types, data_have);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(none)");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Durability:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", BCH_MEMBER_DURABILITY(&amp;m) ? BCH_MEMBER_DURABILITY(&amp;m) - 1 : 1);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Discard:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", BCH_MEMBER_DISCARD(&amp;m));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Freespace initialized:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", BCH_MEMBER_FREESPACE_INITIALIZED(&amp;m));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_members_v1_validate(struct bch_sb *sb,</div><div class='del'>-				    struct bch_sb_field *f,</div><div class='del'>-				    struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v1 *mi = field_to_type(f, members_v1);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if ((void *) members_v1_get_mut(mi, sb-&gt;nr_devices) &gt; vstruct_end(&amp;mi-&gt;field)) {</div><div class='del'>-		prt_printf(err, "too many devices for section size");</div><div class='del'>-		return -BCH_ERR_invalid_sb_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sb-&gt;nr_devices; i++) {</div><div class='del'>-		struct bch_member m = members_v1_get(mi, i);</div><div class='del'>-</div><div class='del'>-		int ret = validate_member(err, m, sb, i);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_members_v1_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				       struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v1 *mi = field_to_type(f, members_v1);</div><div class='del'>-	struct bch_sb_field_disk_groups *gi = bch2_sb_field_get(sb, disk_groups);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sb-&gt;nr_devices; i++)</div><div class='del'>-		member_to_text(out, members_v1_get(mi, i), gi, sb, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_members_v1 = {</div><div class='del'>-	.validate	= bch2_sb_members_v1_validate,</div><div class='del'>-	.to_text	= bch2_sb_members_v1_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_sb_members_v2_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				       struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v2 *mi = field_to_type(f, members_v2);</div><div class='del'>-	struct bch_sb_field_disk_groups *gi = bch2_sb_field_get(sb, disk_groups);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sb-&gt;nr_devices; i++)</div><div class='del'>-		member_to_text(out, members_v2_get(mi, i), gi, sb, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_members_v2_validate(struct bch_sb *sb,</div><div class='del'>-				       struct bch_sb_field *f,</div><div class='del'>-				       struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v2 *mi = field_to_type(f, members_v2);</div><div class='del'>-	size_t mi_bytes = (void *) __bch2_members_v2_get_mut(mi, sb-&gt;nr_devices) -</div><div class='del'>-		(void *) mi;</div><div class='del'>-</div><div class='del'>-	if (mi_bytes &gt; vstruct_bytes(&amp;mi-&gt;field)) {</div><div class='del'>-		prt_printf(err, "section too small (%zu &gt; %zu)",</div><div class='del'>-			   mi_bytes, vstruct_bytes(&amp;mi-&gt;field));</div><div class='del'>-		return -BCH_ERR_invalid_sb_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; sb-&gt;nr_devices; i++) {</div><div class='del'>-		int ret = validate_member(err, members_v2_get(mi, i), sb, i);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_sb_field_ops bch_sb_field_ops_members_v2 = {</div><div class='del'>-	.validate	= bch2_sb_members_v2_validate,</div><div class='del'>-	.to_text	= bch2_sb_members_v2_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_sb_members_from_cpu(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_members_v2 *mi = bch2_sb_field_get(c-&gt;disk_sb.sb, members_v2);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, NULL) {</div><div class='del'>-		struct bch_member *m = __bch2_members_v2_get_mut(mi, ca-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-		for (unsigned e = 0; e &lt; BCH_MEMBER_ERROR_NR; e++)</div><div class='del'>-			m-&gt;errors[e] = cpu_to_le64(atomic64_read(&amp;ca-&gt;errors[e]));</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_io_errors_to_text(struct printbuf *out, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct bch_member m;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ca-&gt;fs-&gt;sb_lock);</div><div class='del'>-	m = bch2_sb_member_get(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	mutex_unlock(&amp;ca-&gt;fs-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	printbuf_tabstop_push(out, 12);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "IO errors since filesystem creation");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_MEMBER_ERROR_NR; i++) {</div><div class='del'>-		prt_printf(out, "%s:", bch2_member_error_strs[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, atomic64_read(&amp;ca-&gt;errors[i]));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "IO errors since ");</div><div class='del'>-	bch2_pr_time_units(out, (ktime_get_real_seconds() - le64_to_cpu(m.errors_reset_time)) * NSEC_PER_SEC);</div><div class='del'>-	prt_str(out, " ago");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_MEMBER_ERROR_NR; i++) {</div><div class='del'>-		prt_printf(out, "%s:", bch2_member_error_strs[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, atomic64_read(&amp;ca-&gt;errors[i]) - le64_to_cpu(m.errors_at_reset[i]));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_dev_errors_reset(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct bch_member *m;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	m = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(m-&gt;errors_at_reset); i++)</div><div class='del'>-		m-&gt;errors_at_reset[i] = cpu_to_le64(atomic64_read(&amp;ca-&gt;errors[i]));</div><div class='del'>-	m-&gt;errors_reset_time = ktime_get_real_seconds();</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/sb-members.h b/fs/bcachefs/sb-members.h<br/>deleted file mode 100644<br/>index be0a94183271..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sb-members.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sb-members.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,231 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SB_MEMBERS_H</div><div class='del'>-#define _BCACHEFS_SB_MEMBERS_H</div><div class='del'>-</div><div class='del'>-#include "darray.h"</div><div class='del'>-</div><div class='del'>-extern char * const bch2_member_error_strs[];</div><div class='del'>-</div><div class='del'>-static inline struct bch_member *</div><div class='del'>-__bch2_members_v2_get_mut(struct bch_sb_field_members_v2 *mi, unsigned i)</div><div class='del'>-{</div><div class='del'>-	return (void *) mi-&gt;_members + (i * le16_to_cpu(mi-&gt;member_bytes));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_members_v2_init(struct bch_fs *c);</div><div class='del'>-int bch2_sb_members_cpy_v2_v1(struct bch_sb_handle *disk_sb);</div><div class='del'>-struct bch_member *bch2_members_v2_get_mut(struct bch_sb *sb, int i);</div><div class='del'>-struct bch_member bch2_sb_member_get(struct bch_sb *sb, int i);</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_is_online(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	return !percpu_ref_is_zero(&amp;ca-&gt;io_ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_is_readable(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	return bch2_dev_is_online(ca) &amp;&amp;</div><div class='del'>-		ca-&gt;mi.state != BCH_MEMBER_STATE_failed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_get_ioref(struct bch_dev *ca, int rw)</div><div class='del'>-{</div><div class='del'>-	if (!percpu_ref_tryget(&amp;ca-&gt;io_ref))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.state == BCH_MEMBER_STATE_rw ||</div><div class='del'>-	    (ca-&gt;mi.state == BCH_MEMBER_STATE_ro &amp;&amp; rw == READ))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned dev_mask_nr(const struct bch_devs_mask *devs)</div><div class='del'>-{</div><div class='del'>-	return bitmap_weight(devs-&gt;d, BCH_SB_MEMBERS_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_list_has_dev(struct bch_devs_list devs,</div><div class='del'>-					 unsigned dev)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(devs, i)</div><div class='del'>-		if (*i == dev)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_dev_list_drop_dev(struct bch_devs_list *devs,</div><div class='del'>-					  unsigned dev)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(*devs, i)</div><div class='del'>-		if (*i == dev) {</div><div class='del'>-			darray_remove_item(devs, i);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_dev_list_add_dev(struct bch_devs_list *devs,</div><div class='del'>-					 unsigned dev)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_dev_list_has_dev(*devs, dev)) {</div><div class='del'>-		BUG_ON(devs-&gt;nr &gt;= ARRAY_SIZE(devs-&gt;data));</div><div class='del'>-		devs-&gt;data[devs-&gt;nr++] = dev;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_devs_list bch2_dev_list_single(unsigned dev)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_devs_list) { .nr = 1, .data[0] = dev };</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_dev *__bch2_next_dev_idx(struct bch_fs *c, unsigned idx,</div><div class='del'>-						  const struct bch_devs_mask *mask)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = NULL;</div><div class='del'>-</div><div class='del'>-	while ((idx = mask</div><div class='del'>-		? find_next_bit(mask-&gt;d, c-&gt;sb.nr_devices, idx)</div><div class='del'>-		: idx) &lt; c-&gt;sb.nr_devices &amp;&amp;</div><div class='del'>-	       !(ca = rcu_dereference_check(c-&gt;devs[idx],</div><div class='del'>-					    lockdep_is_held(&amp;c-&gt;state_lock))))</div><div class='del'>-		idx++;</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_dev *__bch2_next_dev(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-					      const struct bch_devs_mask *mask)</div><div class='del'>-{</div><div class='del'>-	return __bch2_next_dev_idx(c, ca ? ca-&gt;dev_idx + 1 : 0, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_member_device_rcu(_c, _ca, _mask)			\</div><div class='del'>-	for (struct bch_dev *_ca = NULL;				\</div><div class='del'>-	     (_ca = __bch2_next_dev((_c), _ca, (_mask)));)</div><div class='del'>-</div><div class='del'>-static inline struct bch_dev *bch2_get_next_dev(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	if (ca)</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if ((ca = __bch2_next_dev(c, ca, NULL)))</div><div class='del'>-		percpu_ref_get(&amp;ca-&gt;ref);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If you break early, you must drop your ref on the current device</div><div class='del'>- */</div><div class='del'>-#define __for_each_member_device(_c, _ca)				\</div><div class='del'>-	for (;	(_ca = bch2_get_next_dev(_c, _ca));)</div><div class='del'>-</div><div class='del'>-#define for_each_member_device(_c, _ca)					\</div><div class='del'>-	for (struct bch_dev *_ca = NULL;				\</div><div class='del'>-	     (_ca = bch2_get_next_dev(_c, _ca));)</div><div class='del'>-</div><div class='del'>-static inline struct bch_dev *bch2_get_next_online_dev(struct bch_fs *c,</div><div class='del'>-						       struct bch_dev *ca,</div><div class='del'>-						       unsigned state_mask)</div><div class='del'>-{</div><div class='del'>-	if (ca)</div><div class='del'>-		percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	while ((ca = __bch2_next_dev(c, ca, NULL)) &amp;&amp;</div><div class='del'>-	       (!((1 &lt;&lt; ca-&gt;mi.state) &amp; state_mask) ||</div><div class='del'>-		!percpu_ref_tryget(&amp;ca-&gt;io_ref)))</div><div class='del'>-		;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __for_each_online_member(_c, _ca, state_mask)			\</div><div class='del'>-	for (struct bch_dev *_ca = NULL;				\</div><div class='del'>-	     (_ca = bch2_get_next_online_dev(_c, _ca, state_mask));)</div><div class='del'>-</div><div class='del'>-#define for_each_online_member(c, ca)					\</div><div class='del'>-	__for_each_online_member(c, ca, ~0)</div><div class='del'>-</div><div class='del'>-#define for_each_rw_member(c, ca)					\</div><div class='del'>-	__for_each_online_member(c, ca, BIT(BCH_MEMBER_STATE_rw))</div><div class='del'>-</div><div class='del'>-#define for_each_readable_member(c, ca)				\</div><div class='del'>-	__for_each_online_member(c, ca,	BIT( BCH_MEMBER_STATE_rw)|BIT(BCH_MEMBER_STATE_ro))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If a key exists that references a device, the device won't be going away and</div><div class='del'>- * we can omit rcu_read_lock():</div><div class='del'>- */</div><div class='del'>-static inline struct bch_dev *bch_dev_bkey_exists(const struct bch_fs *c, unsigned idx)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(idx &gt;= c-&gt;sb.nr_devices || !c-&gt;devs[idx]);</div><div class='del'>-</div><div class='del'>-	return rcu_dereference_check(c-&gt;devs[idx], 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_dev *bch_dev_locked(struct bch_fs *c, unsigned idx)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(idx &gt;= c-&gt;sb.nr_devices || !c-&gt;devs[idx]);</div><div class='del'>-</div><div class='del'>-	return rcu_dereference_protected(c-&gt;devs[idx],</div><div class='del'>-					 lockdep_is_held(&amp;c-&gt;sb_lock) ||</div><div class='del'>-					 lockdep_is_held(&amp;c-&gt;state_lock));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* XXX kill, move to struct bch_fs */</div><div class='del'>-static inline struct bch_devs_mask bch2_online_devs(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_mask devs;</div><div class='del'>-</div><div class='del'>-	memset(&amp;devs, 0, sizeof(devs));</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		__set_bit(ca-&gt;dev_idx, devs.d);</div><div class='del'>-	return devs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_members_v1;</div><div class='del'>-extern const struct bch_sb_field_ops bch_sb_field_ops_members_v2;</div><div class='del'>-</div><div class='del'>-static inline bool bch2_member_exists(struct bch_member *m)</div><div class='del'>-{</div><div class='del'>-	return !bch2_is_zero(&amp;m-&gt;uuid, sizeof(m-&gt;uuid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_dev_exists(struct bch_sb *sb, unsigned dev)</div><div class='del'>-{</div><div class='del'>-	if (dev &lt; sb-&gt;nr_devices) {</div><div class='del'>-		struct bch_member m = bch2_sb_member_get(sb, dev);</div><div class='del'>-		return bch2_member_exists(&amp;m);</div><div class='del'>-	}</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct bch_member_cpu bch2_mi_to_cpu(struct bch_member *mi)</div><div class='del'>-{</div><div class='del'>-	return (struct bch_member_cpu) {</div><div class='del'>-		.nbuckets	= le64_to_cpu(mi-&gt;nbuckets),</div><div class='del'>-		.first_bucket	= le16_to_cpu(mi-&gt;first_bucket),</div><div class='del'>-		.bucket_size	= le16_to_cpu(mi-&gt;bucket_size),</div><div class='del'>-		.group		= BCH_MEMBER_GROUP(mi),</div><div class='del'>-		.state		= BCH_MEMBER_STATE(mi),</div><div class='del'>-		.discard	= BCH_MEMBER_DISCARD(mi),</div><div class='del'>-		.data_allowed	= BCH_MEMBER_DATA_ALLOWED(mi),</div><div class='del'>-		.durability	= BCH_MEMBER_DURABILITY(mi)</div><div class='del'>-			? BCH_MEMBER_DURABILITY(mi) - 1</div><div class='del'>-			: 1,</div><div class='del'>-		.freespace_initialized = BCH_MEMBER_FREESPACE_INITIALIZED(mi),</div><div class='del'>-		.valid		= bch2_member_exists(mi),</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_members_from_cpu(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-void bch2_dev_io_errors_to_text(struct printbuf *, struct bch_dev *);</div><div class='del'>-void bch2_dev_errors_reset(struct bch_dev *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SB_MEMBERS_H */</div><div class='head'>diff --git a/fs/bcachefs/seqmutex.h b/fs/bcachefs/seqmutex.h<br/>deleted file mode 100644<br/>index c1860d8163fb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/seqmutex.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/seqmutex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SEQMUTEX_H</div><div class='del'>-#define _BCACHEFS_SEQMUTEX_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-struct seqmutex {</div><div class='del'>-	struct mutex	lock;</div><div class='del'>-	u32		seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define seqmutex_init(_lock)	mutex_init(&amp;(_lock)-&gt;lock)</div><div class='del'>-</div><div class='del'>-static inline bool seqmutex_trylock(struct seqmutex *lock)</div><div class='del'>-{</div><div class='del'>-	return mutex_trylock(&amp;lock-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void seqmutex_lock(struct seqmutex *lock)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;lock-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void seqmutex_unlock(struct seqmutex *lock)</div><div class='del'>-{</div><div class='del'>-	lock-&gt;seq++;</div><div class='del'>-	mutex_unlock(&amp;lock-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 seqmutex_seq(struct seqmutex *lock)</div><div class='del'>-{</div><div class='del'>-	return lock-&gt;seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool seqmutex_relock(struct seqmutex *lock, u32 seq)</div><div class='del'>-{</div><div class='del'>-	if (lock-&gt;seq != seq || !mutex_trylock(&amp;lock-&gt;lock))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (lock-&gt;seq != seq) {</div><div class='del'>-		mutex_unlock(&amp;lock-&gt;lock);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SEQMUTEX_H */</div><div class='head'>diff --git a/fs/bcachefs/siphash.c b/fs/bcachefs/siphash.c<br/>deleted file mode 100644<br/>index dc1a27cc31cd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/siphash.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/siphash.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: BSD-3-Clause</div><div class='del'>-/*	$OpenBSD: siphash.c,v 1.3 2015/02/20 11:51:03 tedu Exp $ */</div><div class='del'>-</div><div class='del'>-/*-</div><div class='del'>- * Copyright (c) 2013 Andre Oppermann &lt;andre@FreeBSD.org&gt;</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions</div><div class='del'>- * are met:</div><div class='del'>- * 1. Redistributions of source code must retain the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer.</div><div class='del'>- * 2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *    documentation and/or other materials provided with the distribution.</div><div class='del'>- * 3. The name of the author may not be used to endorse or promote</div><div class='del'>- *    products derived from this software without specific prior written</div><div class='del'>- *    permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND</div><div class='del'>- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE</div><div class='del'>- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='del'>- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='del'>- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='del'>- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</div><div class='del'>- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='del'>- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='del'>- * SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SipHash is a family of PRFs SipHash-c-d where the integer parameters c and d</div><div class='del'>- * are the number of compression rounds and the number of finalization rounds.</div><div class='del'>- * A compression round is identical to a finalization round and this round</div><div class='del'>- * function is called SipRound.  Given a 128-bit key k and a (possibly empty)</div><div class='del'>- * byte string m, SipHash-c-d returns a 64-bit value SipHash-c-d(k; m).</div><div class='del'>- *</div><div class='del'>- * Implemented from the paper "SipHash: a fast short-input PRF", 2012.09.18,</div><div class='del'>- * by Jean-Philippe Aumasson and Daniel J. Bernstein,</div><div class='del'>- * Permanent Document ID b9a943a805fbfc6fde808af9fc0ecdfa</div><div class='del'>- * https://131002.net/siphash/siphash.pdf</div><div class='del'>- * https://131002.net/siphash/</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "siphash.h"</div><div class='del'>-</div><div class='del'>-static void SipHash_Rounds(SIPHASH_CTX *ctx, int rounds)</div><div class='del'>-{</div><div class='del'>-	while (rounds--) {</div><div class='del'>-		ctx-&gt;v[0] += ctx-&gt;v[1];</div><div class='del'>-		ctx-&gt;v[2] += ctx-&gt;v[3];</div><div class='del'>-		ctx-&gt;v[1] = rol64(ctx-&gt;v[1], 13);</div><div class='del'>-		ctx-&gt;v[3] = rol64(ctx-&gt;v[3], 16);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;v[1] ^= ctx-&gt;v[0];</div><div class='del'>-		ctx-&gt;v[3] ^= ctx-&gt;v[2];</div><div class='del'>-		ctx-&gt;v[0] = rol64(ctx-&gt;v[0], 32);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;v[2] += ctx-&gt;v[1];</div><div class='del'>-		ctx-&gt;v[0] += ctx-&gt;v[3];</div><div class='del'>-		ctx-&gt;v[1] = rol64(ctx-&gt;v[1], 17);</div><div class='del'>-		ctx-&gt;v[3] = rol64(ctx-&gt;v[3], 21);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;v[1] ^= ctx-&gt;v[2];</div><div class='del'>-		ctx-&gt;v[3] ^= ctx-&gt;v[0];</div><div class='del'>-		ctx-&gt;v[2] = rol64(ctx-&gt;v[2], 32);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void SipHash_CRounds(SIPHASH_CTX *ctx, const void *ptr, int rounds)</div><div class='del'>-{</div><div class='del'>-	u64 m = get_unaligned_le64(ptr);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;v[3] ^= m;</div><div class='del'>-	SipHash_Rounds(ctx, rounds);</div><div class='del'>-	ctx-&gt;v[0] ^= m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void SipHash_Init(SIPHASH_CTX *ctx, const SIPHASH_KEY *key)</div><div class='del'>-{</div><div class='del'>-	u64 k0, k1;</div><div class='del'>-</div><div class='del'>-	k0 = le64_to_cpu(key-&gt;k0);</div><div class='del'>-	k1 = le64_to_cpu(key-&gt;k1);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;v[0] = 0x736f6d6570736575ULL ^ k0;</div><div class='del'>-	ctx-&gt;v[1] = 0x646f72616e646f6dULL ^ k1;</div><div class='del'>-	ctx-&gt;v[2] = 0x6c7967656e657261ULL ^ k0;</div><div class='del'>-	ctx-&gt;v[3] = 0x7465646279746573ULL ^ k1;</div><div class='del'>-</div><div class='del'>-	memset(ctx-&gt;buf, 0, sizeof(ctx-&gt;buf));</div><div class='del'>-	ctx-&gt;bytes = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void SipHash_Update(SIPHASH_CTX *ctx, int rc, int rf,</div><div class='del'>-		    const void *src, size_t len)</div><div class='del'>-{</div><div class='del'>-	const u8 *ptr = src;</div><div class='del'>-	size_t left, used;</div><div class='del'>-</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	used = ctx-&gt;bytes % sizeof(ctx-&gt;buf);</div><div class='del'>-	ctx-&gt;bytes += len;</div><div class='del'>-</div><div class='del'>-	if (used &gt; 0) {</div><div class='del'>-		left = sizeof(ctx-&gt;buf) - used;</div><div class='del'>-</div><div class='del'>-		if (len &gt;= left) {</div><div class='del'>-			memcpy(&amp;ctx-&gt;buf[used], ptr, left);</div><div class='del'>-			SipHash_CRounds(ctx, ctx-&gt;buf, rc);</div><div class='del'>-			len -= left;</div><div class='del'>-			ptr += left;</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(&amp;ctx-&gt;buf[used], ptr, len);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (len &gt;= sizeof(ctx-&gt;buf)) {</div><div class='del'>-		SipHash_CRounds(ctx, ptr, rc);</div><div class='del'>-		len -= sizeof(ctx-&gt;buf);</div><div class='del'>-		ptr += sizeof(ctx-&gt;buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &gt; 0)</div><div class='del'>-		memcpy(&amp;ctx-&gt;buf[used], ptr, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void SipHash_Final(void *dst, SIPHASH_CTX *ctx, int rc, int rf)</div><div class='del'>-{</div><div class='del'>-	u64 r;</div><div class='del'>-</div><div class='del'>-	r = SipHash_End(ctx, rc, rf);</div><div class='del'>-</div><div class='del'>-	*((__le64 *) dst) = cpu_to_le64(r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 SipHash_End(SIPHASH_CTX *ctx, int rc, int rf)</div><div class='del'>-{</div><div class='del'>-	u64 r;</div><div class='del'>-	size_t left, used;</div><div class='del'>-</div><div class='del'>-	used = ctx-&gt;bytes % sizeof(ctx-&gt;buf);</div><div class='del'>-	left = sizeof(ctx-&gt;buf) - used;</div><div class='del'>-	memset(&amp;ctx-&gt;buf[used], 0, left - 1);</div><div class='del'>-	ctx-&gt;buf[7] = ctx-&gt;bytes;</div><div class='del'>-</div><div class='del'>-	SipHash_CRounds(ctx, ctx-&gt;buf, rc);</div><div class='del'>-	ctx-&gt;v[2] ^= 0xff;</div><div class='del'>-	SipHash_Rounds(ctx, rf);</div><div class='del'>-</div><div class='del'>-	r = (ctx-&gt;v[0] ^ ctx-&gt;v[1]) ^ (ctx-&gt;v[2] ^ ctx-&gt;v[3]);</div><div class='del'>-	memset(ctx, 0, sizeof(*ctx));</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 SipHash(const SIPHASH_KEY *key, int rc, int rf, const void *src, size_t len)</div><div class='del'>-{</div><div class='del'>-	SIPHASH_CTX ctx;</div><div class='del'>-</div><div class='del'>-	SipHash_Init(&amp;ctx, key);</div><div class='del'>-	SipHash_Update(&amp;ctx, rc, rf, src, len);</div><div class='del'>-	return SipHash_End(&amp;ctx, rc, rf);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/siphash.h b/fs/bcachefs/siphash.h<br/>deleted file mode 100644<br/>index 3dfaf34a43b2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/siphash.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/siphash.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: BSD-3-Clause */</div><div class='del'>-/* $OpenBSD: siphash.h,v 1.5 2015/02/20 11:51:03 tedu Exp $ */</div><div class='del'>-/*-</div><div class='del'>- * Copyright (c) 2013 Andre Oppermann &lt;andre@FreeBSD.org&gt;</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions</div><div class='del'>- * are met:</div><div class='del'>- * 1. Redistributions of source code must retain the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer.</div><div class='del'>- * 2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *    documentation and/or other materials provided with the distribution.</div><div class='del'>- * 3. The name of the author may not be used to endorse or promote</div><div class='del'>- *    products derived from this software without specific prior written</div><div class='del'>- *    permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND</div><div class='del'>- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE</div><div class='del'>- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='del'>- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='del'>- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='del'>- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</div><div class='del'>- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='del'>- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='del'>- * SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * $FreeBSD$</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SipHash is a family of pseudorandom functions (a.k.a. keyed hash functions)</div><div class='del'>- * optimized for speed on short messages returning a 64bit hash/digest value.</div><div class='del'>- *</div><div class='del'>- * The number of rounds is defined during the initialization:</div><div class='del'>- *  SipHash24_Init() for the fast and resonable strong version</div><div class='del'>- *  SipHash48_Init() for the strong version (half as fast)</div><div class='del'>- *</div><div class='del'>- * struct SIPHASH_CTX ctx;</div><div class='del'>- * SipHash24_Init(&amp;ctx);</div><div class='del'>- * SipHash_SetKey(&amp;ctx, "16bytes long key");</div><div class='del'>- * SipHash_Update(&amp;ctx, pointer_to_string, length_of_string);</div><div class='del'>- * SipHash_Final(output, &amp;ctx);</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SIPHASH_H_</div><div class='del'>-#define _SIPHASH_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define SIPHASH_BLOCK_LENGTH	 8</div><div class='del'>-#define SIPHASH_KEY_LENGTH	16</div><div class='del'>-#define SIPHASH_DIGEST_LENGTH	 8</div><div class='del'>-</div><div class='del'>-typedef struct _SIPHASH_CTX {</div><div class='del'>-	u64		v[4];</div><div class='del'>-	u8		buf[SIPHASH_BLOCK_LENGTH];</div><div class='del'>-	u32		bytes;</div><div class='del'>-} SIPHASH_CTX;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le64		k0;</div><div class='del'>-	__le64		k1;</div><div class='del'>-} SIPHASH_KEY;</div><div class='del'>-</div><div class='del'>-void	SipHash_Init(SIPHASH_CTX *, const SIPHASH_KEY *);</div><div class='del'>-void	SipHash_Update(SIPHASH_CTX *, int, int, const void *, size_t);</div><div class='del'>-u64	SipHash_End(SIPHASH_CTX *, int, int);</div><div class='del'>-void	SipHash_Final(void *, SIPHASH_CTX *, int, int);</div><div class='del'>-u64	SipHash(const SIPHASH_KEY *, int, int, const void *, size_t);</div><div class='del'>-</div><div class='del'>-#define SipHash24_Init(_c, _k)		SipHash_Init((_c), (_k))</div><div class='del'>-#define SipHash24_Update(_c, _p, _l)	SipHash_Update((_c), 2, 4, (_p), (_l))</div><div class='del'>-#define SipHash24_End(_d)		SipHash_End((_d), 2, 4)</div><div class='del'>-#define SipHash24_Final(_d, _c)		SipHash_Final((_d), (_c), 2, 4)</div><div class='del'>-#define SipHash24(_k, _p, _l)		SipHash((_k), 2, 4, (_p), (_l))</div><div class='del'>-</div><div class='del'>-#define SipHash48_Init(_c, _k)		SipHash_Init((_c), (_k))</div><div class='del'>-#define SipHash48_Update(_c, _p, _l)	SipHash_Update((_c), 4, 8, (_p), (_l))</div><div class='del'>-#define SipHash48_End(_d)		SipHash_End((_d), 4, 8)</div><div class='del'>-#define SipHash48_Final(_d, _c)		SipHash_Final((_d), (_c), 4, 8)</div><div class='del'>-#define SipHash48(_k, _p, _l)		SipHash((_k), 4, 8, (_p), (_l))</div><div class='del'>-</div><div class='del'>-#endif /* _SIPHASH_H_ */</div><div class='head'>diff --git a/fs/bcachefs/six.c b/fs/bcachefs/six.c<br/>deleted file mode 100644<br/>index 3a494c5d1247..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/six.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/six.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,867 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/rcupdate.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/sched/clock.h&gt;</div><div class='del'>-#include &lt;linux/sched/rt.h&gt;</div><div class='del'>-#include &lt;linux/sched/task.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;trace/events/lock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "six.h"</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#define EBUG_ON(cond)			BUG_ON(cond)</div><div class='del'>-#else</div><div class='del'>-#define EBUG_ON(cond)			do {} while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define six_acquire(l, t, r, ip)	lock_acquire(l, 0, t, r, 1, NULL, ip)</div><div class='del'>-#define six_release(l, ip)		lock_release(l, ip)</div><div class='del'>-</div><div class='del'>-static void do_six_unlock_type(struct six_lock *lock, enum six_lock_type type);</div><div class='del'>-</div><div class='del'>-#define SIX_LOCK_HELD_read_OFFSET	0</div><div class='del'>-#define SIX_LOCK_HELD_read		~(~0U &lt;&lt; 26)</div><div class='del'>-#define SIX_LOCK_HELD_intent		(1U &lt;&lt; 26)</div><div class='del'>-#define SIX_LOCK_HELD_write		(1U &lt;&lt; 27)</div><div class='del'>-#define SIX_LOCK_WAITING_read		(1U &lt;&lt; (28 + SIX_LOCK_read))</div><div class='del'>-#define SIX_LOCK_WAITING_write		(1U &lt;&lt; (28 + SIX_LOCK_write))</div><div class='del'>-#define SIX_LOCK_NOSPIN			(1U &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-struct six_lock_vals {</div><div class='del'>-	/* Value we add to the lock in order to take the lock: */</div><div class='del'>-	u32			lock_val;</div><div class='del'>-</div><div class='del'>-	/* If the lock has this value (used as a mask), taking the lock fails: */</div><div class='del'>-	u32			lock_fail;</div><div class='del'>-</div><div class='del'>-	/* Mask that indicates lock is held for this type: */</div><div class='del'>-	u32			held_mask;</div><div class='del'>-</div><div class='del'>-	/* Waitlist we wakeup when releasing the lock: */</div><div class='del'>-	enum six_lock_type	unlock_wakeup;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct six_lock_vals l[] = {</div><div class='del'>-	[SIX_LOCK_read] = {</div><div class='del'>-		.lock_val	= 1U &lt;&lt; SIX_LOCK_HELD_read_OFFSET,</div><div class='del'>-		.lock_fail	= SIX_LOCK_HELD_write,</div><div class='del'>-		.held_mask	= SIX_LOCK_HELD_read,</div><div class='del'>-		.unlock_wakeup	= SIX_LOCK_write,</div><div class='del'>-	},</div><div class='del'>-	[SIX_LOCK_intent] = {</div><div class='del'>-		.lock_val	= SIX_LOCK_HELD_intent,</div><div class='del'>-		.lock_fail	= SIX_LOCK_HELD_intent,</div><div class='del'>-		.held_mask	= SIX_LOCK_HELD_intent,</div><div class='del'>-		.unlock_wakeup	= SIX_LOCK_intent,</div><div class='del'>-	},</div><div class='del'>-	[SIX_LOCK_write] = {</div><div class='del'>-		.lock_val	= SIX_LOCK_HELD_write,</div><div class='del'>-		.lock_fail	= SIX_LOCK_HELD_read,</div><div class='del'>-		.held_mask	= SIX_LOCK_HELD_write,</div><div class='del'>-		.unlock_wakeup	= SIX_LOCK_read,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void six_set_bitmask(struct six_lock *lock, u32 mask)</div><div class='del'>-{</div><div class='del'>-	if ((atomic_read(&amp;lock-&gt;state) &amp; mask) != mask)</div><div class='del'>-		atomic_or(mask, &amp;lock-&gt;state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void six_clear_bitmask(struct six_lock *lock, u32 mask)</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(&amp;lock-&gt;state) &amp; mask)</div><div class='del'>-		atomic_and(~mask, &amp;lock-&gt;state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void six_set_owner(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-				 u32 old, struct task_struct *owner)</div><div class='del'>-{</div><div class='del'>-	if (type != SIX_LOCK_intent)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(old &amp; SIX_LOCK_HELD_intent)) {</div><div class='del'>-		EBUG_ON(lock-&gt;owner);</div><div class='del'>-		lock-&gt;owner = owner;</div><div class='del'>-	} else {</div><div class='del'>-		EBUG_ON(lock-&gt;owner != current);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned pcpu_read_count(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	unsigned read_count = 0;</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu)</div><div class='del'>-		read_count += *per_cpu_ptr(lock-&gt;readers, cpu);</div><div class='del'>-	return read_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * __do_six_trylock() - main trylock routine</div><div class='del'>- *</div><div class='del'>- * Returns 1 on success, 0 on failure</div><div class='del'>- *</div><div class='del'>- * In percpu reader mode, a failed trylock may cause a spurious trylock failure</div><div class='del'>- * for anoter thread taking the competing lock type, and we may havve to do a</div><div class='del'>- * wakeup: when a wakeup is required, we return -1 - wakeup_type.</div><div class='del'>- */</div><div class='del'>-static int __do_six_trylock(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-			    struct task_struct *task, bool try)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 old;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(type == SIX_LOCK_write &amp;&amp; lock-&gt;owner != task);</div><div class='del'>-	EBUG_ON(type == SIX_LOCK_write &amp;&amp;</div><div class='del'>-		(try != !(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_write)));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Percpu reader mode:</div><div class='del'>-	 *</div><div class='del'>-	 * The basic idea behind this algorithm is that you can implement a lock</div><div class='del'>-	 * between two threads without any atomics, just memory barriers:</div><div class='del'>-	 *</div><div class='del'>-	 * For two threads you'll need two variables, one variable for "thread a</div><div class='del'>-	 * has the lock" and another for "thread b has the lock".</div><div class='del'>-	 *</div><div class='del'>-	 * To take the lock, a thread sets its variable indicating that it holds</div><div class='del'>-	 * the lock, then issues a full memory barrier, then reads from the</div><div class='del'>-	 * other thread's variable to check if the other thread thinks it has</div><div class='del'>-	 * the lock. If we raced, we backoff and retry/sleep.</div><div class='del'>-	 *</div><div class='del'>-	 * Failure to take the lock may cause a spurious trylock failure in</div><div class='del'>-	 * another thread, because we temporarily set the lock to indicate that</div><div class='del'>-	 * we held it. This would be a problem for a thread in six_lock(), when</div><div class='del'>-	 * they are calling trylock after adding themself to the waitlist and</div><div class='del'>-	 * prior to sleeping.</div><div class='del'>-	 *</div><div class='del'>-	 * Therefore, if we fail to get the lock, and there were waiters of the</div><div class='del'>-	 * type we conflict with, we will have to issue a wakeup.</div><div class='del'>-	 *</div><div class='del'>-	 * Since we may be called under wait_lock (and by the wakeup code</div><div class='del'>-	 * itself), we return that the wakeup has to be done instead of doing it</div><div class='del'>-	 * here.</div><div class='del'>-	 */</div><div class='del'>-	if (type == SIX_LOCK_read &amp;&amp; lock-&gt;readers) {</div><div class='del'>-		preempt_disable();</div><div class='del'>-		this_cpu_inc(*lock-&gt;readers); /* signal that we own lock */</div><div class='del'>-</div><div class='del'>-		smp_mb();</div><div class='del'>-</div><div class='del'>-		old = atomic_read(&amp;lock-&gt;state);</div><div class='del'>-		ret = !(old &amp; l[type].lock_fail);</div><div class='del'>-</div><div class='del'>-		this_cpu_sub(*lock-&gt;readers, !ret);</div><div class='del'>-		preempt_enable();</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='del'>-			smp_mb();</div><div class='del'>-			if (atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_WAITING_write)</div><div class='del'>-				ret = -1 - SIX_LOCK_write;</div><div class='del'>-		}</div><div class='del'>-	} else if (type == SIX_LOCK_write &amp;&amp; lock-&gt;readers) {</div><div class='del'>-		if (try) {</div><div class='del'>-			atomic_add(SIX_LOCK_HELD_write, &amp;lock-&gt;state);</div><div class='del'>-			smp_mb__after_atomic();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = !pcpu_read_count(lock);</div><div class='del'>-</div><div class='del'>-		if (try &amp;&amp; !ret) {</div><div class='del'>-			old = atomic_sub_return(SIX_LOCK_HELD_write, &amp;lock-&gt;state);</div><div class='del'>-			if (old &amp; SIX_LOCK_WAITING_read)</div><div class='del'>-				ret = -1 - SIX_LOCK_read;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		old = atomic_read(&amp;lock-&gt;state);</div><div class='del'>-		do {</div><div class='del'>-			ret = !(old &amp; l[type].lock_fail);</div><div class='del'>-			if (!ret || (type == SIX_LOCK_write &amp;&amp; !try)) {</div><div class='del'>-				smp_mb();</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} while (!atomic_try_cmpxchg_acquire(&amp;lock-&gt;state, &amp;old, old + l[type].lock_val));</div><div class='del'>-</div><div class='del'>-		EBUG_ON(ret &amp;&amp; !(atomic_read(&amp;lock-&gt;state) &amp; l[type].held_mask));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		six_set_owner(lock, type, old, task);</div><div class='del'>-</div><div class='del'>-	EBUG_ON(type == SIX_LOCK_write &amp;&amp; try &amp;&amp; ret &lt;= 0 &amp;&amp;</div><div class='del'>-		(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_write));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __six_lock_wakeup(struct six_lock *lock, enum six_lock_type lock_type)</div><div class='del'>-{</div><div class='del'>-	struct six_lock_waiter *w, *next;</div><div class='del'>-	struct task_struct *task;</div><div class='del'>-	bool saw_one;</div><div class='del'>-	int ret;</div><div class='del'>-again:</div><div class='del'>-	ret = 0;</div><div class='del'>-	saw_one = false;</div><div class='del'>-	raw_spin_lock(&amp;lock-&gt;wait_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(w, next, &amp;lock-&gt;wait_list, list) {</div><div class='del'>-		if (w-&gt;lock_want != lock_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (saw_one &amp;&amp; lock_type != SIX_LOCK_read)</div><div class='del'>-			goto unlock;</div><div class='del'>-		saw_one = true;</div><div class='del'>-</div><div class='del'>-		ret = __do_six_trylock(lock, lock_type, w-&gt;task, false);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Similar to percpu_rwsem_wake_function(), we need to guard</div><div class='del'>-		 * against the wakee noticing w-&gt;lock_acquired, returning, and</div><div class='del'>-		 * then exiting before we do the wakeup:</div><div class='del'>-		 */</div><div class='del'>-		task = get_task_struct(w-&gt;task);</div><div class='del'>-		__list_del(w-&gt;list.prev, w-&gt;list.next);</div><div class='del'>-		/*</div><div class='del'>-		 * The release barrier here ensures the ordering of the</div><div class='del'>-		 * __list_del before setting w-&gt;lock_acquired; @w is on the</div><div class='del'>-		 * stack of the thread doing the waiting and will be reused</div><div class='del'>-		 * after it sees w-&gt;lock_acquired with no other locking:</div><div class='del'>-		 * pairs with smp_load_acquire() in six_lock_slowpath()</div><div class='del'>-		 */</div><div class='del'>-		smp_store_release(&amp;w-&gt;lock_acquired, true);</div><div class='del'>-		wake_up_process(task);</div><div class='del'>-		put_task_struct(task);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	six_clear_bitmask(lock, SIX_LOCK_WAITING_read &lt;&lt; lock_type);</div><div class='del'>-unlock:</div><div class='del'>-	raw_spin_unlock(&amp;lock-&gt;wait_lock);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		lock_type = -ret - 1;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static void six_lock_wakeup(struct six_lock *lock, u32 state,</div><div class='del'>-			    enum six_lock_type lock_type)</div><div class='del'>-{</div><div class='del'>-	if (lock_type == SIX_LOCK_write &amp;&amp; (state &amp; SIX_LOCK_HELD_read))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(state &amp; (SIX_LOCK_WAITING_read &lt;&lt; lock_type)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__six_lock_wakeup(lock, lock_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static bool do_six_trylock(struct six_lock *lock, enum six_lock_type type, bool try)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __do_six_trylock(lock, type, current, try);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		__six_lock_wakeup(lock, -ret - 1);</div><div class='del'>-</div><div class='del'>-	return ret &gt; 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_trylock_ip - attempt to take a six lock without blocking</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @ip:		ip parameter for lockdep/lockstat, i.e. _THIS_IP_</div><div class='del'>- *</div><div class='del'>- * Return: true on success, false on failure.</div><div class='del'>- */</div><div class='del'>-bool six_trylock_ip(struct six_lock *lock, enum six_lock_type type, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	if (!do_six_trylock(lock, type, true))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (type != SIX_LOCK_write)</div><div class='del'>-		six_acquire(&amp;lock-&gt;dep_map, 1, type == SIX_LOCK_read, ip);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_trylock_ip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_relock_ip - attempt to re-take a lock that was held previously</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @seq:	lock sequence number obtained from six_lock_seq() while lock was</div><div class='del'>- *		held previously</div><div class='del'>- * @ip:		ip parameter for lockdep/lockstat, i.e. _THIS_IP_</div><div class='del'>- *</div><div class='del'>- * Return: true on success, false on failure.</div><div class='del'>- */</div><div class='del'>-bool six_relock_ip(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-		   unsigned seq, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	if (six_lock_seq(lock) != seq || !six_trylock_ip(lock, type, ip))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (six_lock_seq(lock) != seq) {</div><div class='del'>-		six_unlock_ip(lock, type, ip);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_relock_ip);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN</div><div class='del'>-</div><div class='del'>-static inline bool six_owner_running(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * When there's no owner, we might have preempted between the owner</div><div class='del'>-	 * acquiring the lock and setting the owner field. If we're an RT task</div><div class='del'>-	 * that will live-lock because we won't let the owner complete.</div><div class='del'>-	 */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	struct task_struct *owner = READ_ONCE(lock-&gt;owner);</div><div class='del'>-	bool ret = owner ? owner_on_cpu(owner) : !rt_task(current);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool six_optimistic_spin(struct six_lock *lock,</div><div class='del'>-				       struct six_lock_waiter *wait,</div><div class='del'>-				       enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	unsigned loop = 0;</div><div class='del'>-	u64 end_time;</div><div class='del'>-</div><div class='del'>-	if (type == SIX_LOCK_write)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (lock-&gt;wait_list.next != &amp;wait-&gt;list)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_NOSPIN)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='del'>-	end_time = sched_clock() + 10 * NSEC_PER_USEC;</div><div class='del'>-</div><div class='del'>-	while (!need_resched() &amp;&amp; six_owner_running(lock)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Ensures that writes to the waitlist entry happen after we see</div><div class='del'>-		 * wait-&gt;lock_acquired: pairs with the smp_store_release in</div><div class='del'>-		 * __six_lock_wakeup</div><div class='del'>-		 */</div><div class='del'>-		if (smp_load_acquire(&amp;wait-&gt;lock_acquired)) {</div><div class='del'>-			preempt_enable();</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(++loop &amp; 0xf) &amp;&amp; (time_after64(sched_clock(), end_time))) {</div><div class='del'>-			six_set_bitmask(lock, SIX_LOCK_NOSPIN);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The cpu_relax() call is a compiler barrier which forces</div><div class='del'>-		 * everything in this loop to be re-loaded. We don't need</div><div class='del'>-		 * memory barriers as we'll eventually observe the right</div><div class='del'>-		 * values at the cost of a few extra spins.</div><div class='del'>-		 */</div><div class='del'>-		cpu_relax();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_LOCK_SPIN_ON_OWNER */</div><div class='del'>-</div><div class='del'>-static inline bool six_optimistic_spin(struct six_lock *lock,</div><div class='del'>-				       struct six_lock_waiter *wait,</div><div class='del'>-				       enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-noinline</div><div class='del'>-static int six_lock_slowpath(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-			     struct six_lock_waiter *wait,</div><div class='del'>-			     six_lock_should_sleep_fn should_sleep_fn, void *p,</div><div class='del'>-			     unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (type == SIX_LOCK_write) {</div><div class='del'>-		EBUG_ON(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_write);</div><div class='del'>-		atomic_add(SIX_LOCK_HELD_write, &amp;lock-&gt;state);</div><div class='del'>-		smp_mb__after_atomic();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_contention_begin(lock, 0);</div><div class='del'>-	lock_contended(&amp;lock-&gt;dep_map, ip);</div><div class='del'>-</div><div class='del'>-	wait-&gt;task		= current;</div><div class='del'>-	wait-&gt;lock_want		= type;</div><div class='del'>-	wait-&gt;lock_acquired	= false;</div><div class='del'>-</div><div class='del'>-	raw_spin_lock(&amp;lock-&gt;wait_lock);</div><div class='del'>-	six_set_bitmask(lock, SIX_LOCK_WAITING_read &lt;&lt; type);</div><div class='del'>-	/*</div><div class='del'>-	 * Retry taking the lock after taking waitlist lock, in case we raced</div><div class='del'>-	 * with an unlock:</div><div class='del'>-	 */</div><div class='del'>-	ret = __do_six_trylock(lock, type, current, false);</div><div class='del'>-	if (ret &lt;= 0) {</div><div class='del'>-		wait-&gt;start_time = local_clock();</div><div class='del'>-</div><div class='del'>-		if (!list_empty(&amp;lock-&gt;wait_list)) {</div><div class='del'>-			struct six_lock_waiter *last =</div><div class='del'>-				list_last_entry(&amp;lock-&gt;wait_list,</div><div class='del'>-					struct six_lock_waiter, list);</div><div class='del'>-</div><div class='del'>-			if (time_before_eq64(wait-&gt;start_time, last-&gt;start_time))</div><div class='del'>-				wait-&gt;start_time = last-&gt;start_time + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list_add_tail(&amp;wait-&gt;list, &amp;lock-&gt;wait_list);</div><div class='del'>-	}</div><div class='del'>-	raw_spin_unlock(&amp;lock-&gt;wait_lock);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret &gt; 0)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret &lt; 0)) {</div><div class='del'>-		__six_lock_wakeup(lock, -ret - 1);</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (six_optimistic_spin(lock, wait, type))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Ensures that writes to the waitlist entry happen after we see</div><div class='del'>-		 * wait-&gt;lock_acquired: pairs with the smp_store_release in</div><div class='del'>-		 * __six_lock_wakeup</div><div class='del'>-		 */</div><div class='del'>-		if (smp_load_acquire(&amp;wait-&gt;lock_acquired))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ret = should_sleep_fn ? should_sleep_fn(lock, p) : 0;</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			bool acquired;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * If should_sleep_fn() returns an error, we are</div><div class='del'>-			 * required to return that error even if we already</div><div class='del'>-			 * acquired the lock - should_sleep_fn() might have</div><div class='del'>-			 * modified external state (e.g. when the deadlock cycle</div><div class='del'>-			 * detector in bcachefs issued a transaction restart)</div><div class='del'>-			 */</div><div class='del'>-			raw_spin_lock(&amp;lock-&gt;wait_lock);</div><div class='del'>-			acquired = wait-&gt;lock_acquired;</div><div class='del'>-			if (!acquired)</div><div class='del'>-				list_del(&amp;wait-&gt;list);</div><div class='del'>-			raw_spin_unlock(&amp;lock-&gt;wait_lock);</div><div class='del'>-</div><div class='del'>-			if (unlikely(acquired))</div><div class='del'>-				do_six_unlock_type(lock, type);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__set_current_state(TASK_RUNNING);</div><div class='del'>-out:</div><div class='del'>-	if (ret &amp;&amp; type == SIX_LOCK_write) {</div><div class='del'>-		six_clear_bitmask(lock, SIX_LOCK_HELD_write);</div><div class='del'>-		six_lock_wakeup(lock, atomic_read(&amp;lock-&gt;state), SIX_LOCK_read);</div><div class='del'>-	}</div><div class='del'>-	trace_contention_end(lock, 0);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_ip_waiter - take a lock, with full waitlist interface</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @wait:	pointer to wait object, which will be added to lock's waitlist</div><div class='del'>- * @should_sleep_fn: callback run after adding to waitlist, immediately prior</div><div class='del'>- *		to scheduling</div><div class='del'>- * @p:		passed through to @should_sleep_fn</div><div class='del'>- * @ip:		ip parameter for lockdep/lockstat, i.e. _THIS_IP_</div><div class='del'>- *</div><div class='del'>- * This is the most general six_lock() variant, with parameters to support full</div><div class='del'>- * cycle detection for deadlock avoidance.</div><div class='del'>- *</div><div class='del'>- * The code calling this function must implement tracking of held locks, and the</div><div class='del'>- * @wait object should be embedded into the struct that tracks held locks -</div><div class='del'>- * which must also be accessible in a thread-safe way.</div><div class='del'>- *</div><div class='del'>- * @should_sleep_fn should invoke the cycle detector; it should walk each</div><div class='del'>- * lock's waiters, and for each waiter recursively walk their held locks.</div><div class='del'>- *</div><div class='del'>- * When this function must block, @wait will be added to @lock's waitlist before</div><div class='del'>- * calling trylock, and before calling @should_sleep_fn, and @wait will not be</div><div class='del'>- * removed from the lock waitlist until the lock has been successfully acquired,</div><div class='del'>- * or we abort.</div><div class='del'>- *</div><div class='del'>- * @wait.start_time will be monotonically increasing for any given waitlist, and</div><div class='del'>- * thus may be used as a loop cursor.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or the return code from @should_sleep_fn on failure.</div><div class='del'>- */</div><div class='del'>-int six_lock_ip_waiter(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-		       struct six_lock_waiter *wait,</div><div class='del'>-		       six_lock_should_sleep_fn should_sleep_fn, void *p,</div><div class='del'>-		       unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	wait-&gt;start_time = 0;</div><div class='del'>-</div><div class='del'>-	if (type != SIX_LOCK_write)</div><div class='del'>-		six_acquire(&amp;lock-&gt;dep_map, 0, type == SIX_LOCK_read, ip);</div><div class='del'>-</div><div class='del'>-	ret = do_six_trylock(lock, type, true) ? 0</div><div class='del'>-		: six_lock_slowpath(lock, type, wait, should_sleep_fn, p, ip);</div><div class='del'>-</div><div class='del'>-	if (ret &amp;&amp; type != SIX_LOCK_write)</div><div class='del'>-		six_release(&amp;lock-&gt;dep_map, ip);</div><div class='del'>-	if (!ret)</div><div class='del'>-		lock_acquired(&amp;lock-&gt;dep_map, ip);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_ip_waiter);</div><div class='del'>-</div><div class='del'>-__always_inline</div><div class='del'>-static void do_six_unlock_type(struct six_lock *lock, enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	u32 state;</div><div class='del'>-</div><div class='del'>-	if (type == SIX_LOCK_intent)</div><div class='del'>-		lock-&gt;owner = NULL;</div><div class='del'>-</div><div class='del'>-	if (type == SIX_LOCK_read &amp;&amp;</div><div class='del'>-	    lock-&gt;readers) {</div><div class='del'>-		smp_mb(); /* unlock barrier */</div><div class='del'>-		this_cpu_dec(*lock-&gt;readers);</div><div class='del'>-		smp_mb(); /* between unlocking and checking for waiters */</div><div class='del'>-		state = atomic_read(&amp;lock-&gt;state);</div><div class='del'>-	} else {</div><div class='del'>-		u32 v = l[type].lock_val;</div><div class='del'>-</div><div class='del'>-		if (type != SIX_LOCK_read)</div><div class='del'>-			v += atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_NOSPIN;</div><div class='del'>-</div><div class='del'>-		EBUG_ON(!(atomic_read(&amp;lock-&gt;state) &amp; l[type].held_mask));</div><div class='del'>-		state = atomic_sub_return_release(v, &amp;lock-&gt;state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	six_lock_wakeup(lock, state, l[type].unlock_wakeup);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_unlock_ip - drop a six lock</div><div class='del'>- * @lock:	lock to unlock</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @ip:		ip parameter for lockdep/lockstat, i.e. _THIS_IP_</div><div class='del'>- *</div><div class='del'>- * When a lock is held multiple times (because six_lock_incement()) was used),</div><div class='del'>- * this decrements the 'lock held' counter by one.</div><div class='del'>- *</div><div class='del'>- * For example:</div><div class='del'>- * six_lock_read(&amp;foo-&gt;lock);				read count 1</div><div class='del'>- * six_lock_increment(&amp;foo-&gt;lock, SIX_LOCK_read);	read count 2</div><div class='del'>- * six_lock_unlock(&amp;foo-&gt;lock, SIX_LOCK_read);		read count 1</div><div class='del'>- * six_lock_unlock(&amp;foo-&gt;lock, SIX_LOCK_read);		read count 0</div><div class='del'>- */</div><div class='del'>-void six_unlock_ip(struct six_lock *lock, enum six_lock_type type, unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(type == SIX_LOCK_write &amp;&amp;</div><div class='del'>-		!(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_intent));</div><div class='del'>-	EBUG_ON((type == SIX_LOCK_write ||</div><div class='del'>-		 type == SIX_LOCK_intent) &amp;&amp;</div><div class='del'>-		lock-&gt;owner != current);</div><div class='del'>-</div><div class='del'>-	if (type != SIX_LOCK_write)</div><div class='del'>-		six_release(&amp;lock-&gt;dep_map, ip);</div><div class='del'>-	else</div><div class='del'>-		lock-&gt;seq++;</div><div class='del'>-</div><div class='del'>-	if (type == SIX_LOCK_intent &amp;&amp;</div><div class='del'>-	    lock-&gt;intent_lock_recurse) {</div><div class='del'>-		--lock-&gt;intent_lock_recurse;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do_six_unlock_type(lock, type);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_unlock_ip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_downgrade - convert an intent lock to a read lock</div><div class='del'>- * @lock:	lock to dowgrade</div><div class='del'>- *</div><div class='del'>- * @lock will have read count incremented and intent count decremented</div><div class='del'>- */</div><div class='del'>-void six_lock_downgrade(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	six_lock_increment(lock, SIX_LOCK_read);</div><div class='del'>-	six_unlock_intent(lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_downgrade);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_tryupgrade - attempt to convert read lock to an intent lock</div><div class='del'>- * @lock:	lock to upgrade</div><div class='del'>- *</div><div class='del'>- * On success, @lock will have intent count incremented and read count</div><div class='del'>- * decremented</div><div class='del'>- *</div><div class='del'>- * Return: true on success, false on failure</div><div class='del'>- */</div><div class='del'>-bool six_lock_tryupgrade(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	u32 old = atomic_read(&amp;lock-&gt;state), new;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		new = old;</div><div class='del'>-</div><div class='del'>-		if (new &amp; SIX_LOCK_HELD_intent)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		if (!lock-&gt;readers) {</div><div class='del'>-			EBUG_ON(!(new &amp; SIX_LOCK_HELD_read));</div><div class='del'>-			new -= l[SIX_LOCK_read].lock_val;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new |= SIX_LOCK_HELD_intent;</div><div class='del'>-	} while (!atomic_try_cmpxchg_acquire(&amp;lock-&gt;state, &amp;old, new));</div><div class='del'>-</div><div class='del'>-	if (lock-&gt;readers)</div><div class='del'>-		this_cpu_dec(*lock-&gt;readers);</div><div class='del'>-</div><div class='del'>-	six_set_owner(lock, SIX_LOCK_intent, old, current);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_tryupgrade);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_trylock_convert - attempt to convert a held lock from one type to another</div><div class='del'>- * @lock:	lock to upgrade</div><div class='del'>- * @from:	SIX_LOCK_read or SIX_LOCK_intent</div><div class='del'>- * @to:		SIX_LOCK_read or SIX_LOCK_intent</div><div class='del'>- *</div><div class='del'>- * On success, @lock will have intent count incremented and read count</div><div class='del'>- * decremented</div><div class='del'>- *</div><div class='del'>- * Return: true on success, false on failure</div><div class='del'>- */</div><div class='del'>-bool six_trylock_convert(struct six_lock *lock,</div><div class='del'>-			 enum six_lock_type from,</div><div class='del'>-			 enum six_lock_type to)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(to == SIX_LOCK_write || from == SIX_LOCK_write);</div><div class='del'>-</div><div class='del'>-	if (to == from)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (to == SIX_LOCK_read) {</div><div class='del'>-		six_lock_downgrade(lock);</div><div class='del'>-		return true;</div><div class='del'>-	} else {</div><div class='del'>-		return six_lock_tryupgrade(lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_trylock_convert);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_increment - increase held lock count on a lock that is already held</div><div class='del'>- * @lock:	lock to increment</div><div class='del'>- * @type:	SIX_LOCK_read or SIX_LOCK_intent</div><div class='del'>- *</div><div class='del'>- * @lock must already be held, with a lock type that is greater than or equal to</div><div class='del'>- * @type</div><div class='del'>- *</div><div class='del'>- * A corresponding six_unlock_type() call will be required for @lock to be fully</div><div class='del'>- * unlocked.</div><div class='del'>- */</div><div class='del'>-void six_lock_increment(struct six_lock *lock, enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	six_acquire(&amp;lock-&gt;dep_map, 0, type == SIX_LOCK_read, _RET_IP_);</div><div class='del'>-</div><div class='del'>-	/* XXX: assert already locked, and that we don't overflow: */</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case SIX_LOCK_read:</div><div class='del'>-		if (lock-&gt;readers) {</div><div class='del'>-			this_cpu_inc(*lock-&gt;readers);</div><div class='del'>-		} else {</div><div class='del'>-			EBUG_ON(!(atomic_read(&amp;lock-&gt;state) &amp;</div><div class='del'>-				  (SIX_LOCK_HELD_read|</div><div class='del'>-				   SIX_LOCK_HELD_intent)));</div><div class='del'>-			atomic_add(l[type].lock_val, &amp;lock-&gt;state);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SIX_LOCK_intent:</div><div class='del'>-		EBUG_ON(!(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_intent));</div><div class='del'>-		lock-&gt;intent_lock_recurse++;</div><div class='del'>-		break;</div><div class='del'>-	case SIX_LOCK_write:</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_increment);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_wakeup_all - wake up all waiters on @lock</div><div class='del'>- * @lock:	lock to wake up waiters for</div><div class='del'>- *</div><div class='del'>- * Wakeing up waiters will cause them to re-run should_sleep_fn, which may then</div><div class='del'>- * abort the lock operation.</div><div class='del'>- *</div><div class='del'>- * This function is never needed in a bug-free program; it's only useful in</div><div class='del'>- * debug code, e.g. to determine if a cycle detector is at fault.</div><div class='del'>- */</div><div class='del'>-void six_lock_wakeup_all(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	u32 state = atomic_read(&amp;lock-&gt;state);</div><div class='del'>-	struct six_lock_waiter *w;</div><div class='del'>-</div><div class='del'>-	six_lock_wakeup(lock, state, SIX_LOCK_read);</div><div class='del'>-	six_lock_wakeup(lock, state, SIX_LOCK_intent);</div><div class='del'>-	six_lock_wakeup(lock, state, SIX_LOCK_write);</div><div class='del'>-</div><div class='del'>-	raw_spin_lock(&amp;lock-&gt;wait_lock);</div><div class='del'>-	list_for_each_entry(w, &amp;lock-&gt;wait_list, list)</div><div class='del'>-		wake_up_process(w-&gt;task);</div><div class='del'>-	raw_spin_unlock(&amp;lock-&gt;wait_lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_wakeup_all);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_counts - return held lock counts, for each lock type</div><div class='del'>- * @lock:	lock to return counters for</div><div class='del'>- *</div><div class='del'>- * Return: the number of times a lock is held for read, intent and write.</div><div class='del'>- */</div><div class='del'>-struct six_lock_count six_lock_counts(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	struct six_lock_count ret;</div><div class='del'>-</div><div class='del'>-	ret.n[SIX_LOCK_read]	= !lock-&gt;readers</div><div class='del'>-		? atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_read</div><div class='del'>-		: pcpu_read_count(lock);</div><div class='del'>-	ret.n[SIX_LOCK_intent]	= !!(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_intent) +</div><div class='del'>-		lock-&gt;intent_lock_recurse;</div><div class='del'>-	ret.n[SIX_LOCK_write]	= !!(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_write);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_counts);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_readers_add - directly manipulate reader count of a lock</div><div class='del'>- * @lock:	lock to add/subtract readers for</div><div class='del'>- * @nr:		reader count to add/subtract</div><div class='del'>- *</div><div class='del'>- * When an upper layer is implementing lock reentrency, we may have both read</div><div class='del'>- * and intent locks on the same lock.</div><div class='del'>- *</div><div class='del'>- * When we need to take a write lock, the read locks will cause self-deadlock,</div><div class='del'>- * because six locks themselves do not track which read locks are held by the</div><div class='del'>- * current thread and which are held by a different thread - it does no</div><div class='del'>- * per-thread tracking of held locks.</div><div class='del'>- *</div><div class='del'>- * The upper layer that is tracking held locks may however, if trylock() has</div><div class='del'>- * failed, count up its own read locks, subtract them, take the write lock, and</div><div class='del'>- * then re-add them.</div><div class='del'>- *</div><div class='del'>- * As in any other situation when taking a write lock, @lock must be held for</div><div class='del'>- * intent one (or more) times, so @lock will never be left unlocked.</div><div class='del'>- */</div><div class='del'>-void six_lock_readers_add(struct six_lock *lock, int nr)</div><div class='del'>-{</div><div class='del'>-	if (lock-&gt;readers) {</div><div class='del'>-		this_cpu_add(*lock-&gt;readers, nr);</div><div class='del'>-	} else {</div><div class='del'>-		EBUG_ON((int) (atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_read) + nr &lt; 0);</div><div class='del'>-		/* reader count starts at bit 0 */</div><div class='del'>-		atomic_add(nr, &amp;lock-&gt;state);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_readers_add);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_exit - release resources held by a lock prior to freeing</div><div class='del'>- * @lock:	lock to exit</div><div class='del'>- *</div><div class='del'>- * When a lock was initialized in percpu mode (SIX_OLCK_INIT_PCPU), this is</div><div class='del'>- * required to free the percpu read counts.</div><div class='del'>- */</div><div class='del'>-void six_lock_exit(struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(lock-&gt;readers &amp;&amp; pcpu_read_count(lock));</div><div class='del'>-	WARN_ON(atomic_read(&amp;lock-&gt;state) &amp; SIX_LOCK_HELD_read);</div><div class='del'>-</div><div class='del'>-	free_percpu(lock-&gt;readers);</div><div class='del'>-	lock-&gt;readers = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(six_lock_exit);</div><div class='del'>-</div><div class='del'>-void __six_lock_init(struct six_lock *lock, const char *name,</div><div class='del'>-		     struct lock_class_key *key, enum six_lock_init_flags flags)</div><div class='del'>-{</div><div class='del'>-	atomic_set(&amp;lock-&gt;state, 0);</div><div class='del'>-	raw_spin_lock_init(&amp;lock-&gt;wait_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;lock-&gt;wait_list);</div><div class='del'>-#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='del'>-	debug_check_no_locks_freed((void *) lock, sizeof(*lock));</div><div class='del'>-	lockdep_init_map(&amp;lock-&gt;dep_map, name, key, 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't assume that we have real percpu variables available in</div><div class='del'>-	 * userspace:</div><div class='del'>-	 */</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	if (flags &amp; SIX_LOCK_INIT_PCPU) {</div><div class='del'>-		/*</div><div class='del'>-		 * We don't return an error here on memory allocation failure</div><div class='del'>-		 * since percpu is an optimization, and locks will work with the</div><div class='del'>-		 * same semantics in non-percpu mode: callers can check for</div><div class='del'>-		 * failure if they wish by checking lock-&gt;readers, but generally</div><div class='del'>-		 * will not want to treat it as an error.</div><div class='del'>-		 */</div><div class='del'>-		lock-&gt;readers = alloc_percpu(unsigned);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(__six_lock_init);</div><div class='head'>diff --git a/fs/bcachefs/six.h b/fs/bcachefs/six.h<br/>deleted file mode 100644<br/>index 68d46fd7f391..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/six.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/six.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,386 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_SIX_H</div><div class='del'>-#define _LINUX_SIX_H</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * DOC: SIX locks overview</div><div class='del'>- *</div><div class='del'>- * Shared/intent/exclusive locks: sleepable read/write locks, like rw semaphores</div><div class='del'>- * but with an additional state: read/shared, intent, exclusive/write</div><div class='del'>- *</div><div class='del'>- * The purpose of the intent state is to allow for greater concurrency on tree</div><div class='del'>- * structures without deadlocking. In general, a read can't be upgraded to a</div><div class='del'>- * write lock without deadlocking, so an operation that updates multiple nodes</div><div class='del'>- * will have to take write locks for the full duration of the operation.</div><div class='del'>- *</div><div class='del'>- * But by adding an intent state, which is exclusive with other intent locks but</div><div class='del'>- * not with readers, we can take intent locks at the start of the operation,</div><div class='del'>- * and then take write locks only for the actual update to each individual</div><div class='del'>- * nodes, without deadlocking.</div><div class='del'>- *</div><div class='del'>- * Example usage:</div><div class='del'>- *   six_lock_read(&amp;foo-&gt;lock);</div><div class='del'>- *   six_unlock_read(&amp;foo-&gt;lock);</div><div class='del'>- *</div><div class='del'>- * An intent lock must be held before taking a write lock:</div><div class='del'>- *   six_lock_intent(&amp;foo-&gt;lock);</div><div class='del'>- *   six_lock_write(&amp;foo-&gt;lock);</div><div class='del'>- *   six_unlock_write(&amp;foo-&gt;lock);</div><div class='del'>- *   six_unlock_intent(&amp;foo-&gt;lock);</div><div class='del'>- *</div><div class='del'>- * Other operations:</div><div class='del'>- *   six_trylock_read()</div><div class='del'>- *   six_trylock_intent()</div><div class='del'>- *   six_trylock_write()</div><div class='del'>- *</div><div class='del'>- *   six_lock_downgrade()	convert from intent to read</div><div class='del'>- *   six_lock_tryupgrade()	attempt to convert from read to intent, may fail</div><div class='del'>- *</div><div class='del'>- * There are also interfaces that take the lock type as an enum:</div><div class='del'>- *</div><div class='del'>- *   six_lock_type(&amp;foo-&gt;lock, SIX_LOCK_read);</div><div class='del'>- *   six_trylock_convert(&amp;foo-&gt;lock, SIX_LOCK_read, SIX_LOCK_intent)</div><div class='del'>- *   six_lock_type(&amp;foo-&gt;lock, SIX_LOCK_write);</div><div class='del'>- *   six_unlock_type(&amp;foo-&gt;lock, SIX_LOCK_write);</div><div class='del'>- *   six_unlock_type(&amp;foo-&gt;lock, SIX_LOCK_intent);</div><div class='del'>- *</div><div class='del'>- * Lock sequence numbers - unlock(), relock():</div><div class='del'>- *</div><div class='del'>- *   Locks embed sequences numbers, which are incremented on write lock/unlock.</div><div class='del'>- *   This allows locks to be dropped and the retaken iff the state they protect</div><div class='del'>- *   hasn't changed; this makes it much easier to avoid holding locks while e.g.</div><div class='del'>- *   doing IO or allocating memory.</div><div class='del'>- *</div><div class='del'>- *   Example usage:</div><div class='del'>- *     six_lock_read(&amp;foo-&gt;lock);</div><div class='del'>- *     u32 seq = six_lock_seq(&amp;foo-&gt;lock);</div><div class='del'>- *     six_unlock_read(&amp;foo-&gt;lock);</div><div class='del'>- *</div><div class='del'>- *     some_operation_that_may_block();</div><div class='del'>- *</div><div class='del'>- *     if (six_relock_read(&amp;foo-&gt;lock, seq)) { ... }</div><div class='del'>- *</div><div class='del'>- *   If the relock operation succeeds, it is as if the lock was never unlocked.</div><div class='del'>- *</div><div class='del'>- * Reentrancy:</div><div class='del'>- *</div><div class='del'>- *   Six locks are not by themselves reentrant, but have counters for both the</div><div class='del'>- *   read and intent states that can be used to provide reentrancy by an upper</div><div class='del'>- *   layer that tracks held locks. If a lock is known to already be held in the</div><div class='del'>- *   read or intent state, six_lock_increment() can be used to bump the "lock</div><div class='del'>- *   held in this state" counter, increasing the number of unlock calls that</div><div class='del'>- *   will be required to fully unlock it.</div><div class='del'>- *</div><div class='del'>- *   Example usage:</div><div class='del'>- *     six_lock_read(&amp;foo-&gt;lock);</div><div class='del'>- *     six_lock_increment(&amp;foo-&gt;lock, SIX_LOCK_read);</div><div class='del'>- *     six_unlock_read(&amp;foo-&gt;lock);</div><div class='del'>- *     six_unlock_read(&amp;foo-&gt;lock);</div><div class='del'>- *   foo-&gt;lock is now fully unlocked.</div><div class='del'>- *</div><div class='del'>- *   Since the intent state supercedes read, it's legal to increment the read</div><div class='del'>- *   counter when holding an intent lock, but not the reverse.</div><div class='del'>- *</div><div class='del'>- *   A lock may only be held once for write: six_lock_increment(.., SIX_LOCK_write)</div><div class='del'>- *   is not legal.</div><div class='del'>- *</div><div class='del'>- * should_sleep_fn:</div><div class='del'>- *</div><div class='del'>- *   There is a six_lock() variant that takes a function pointer that is called</div><div class='del'>- *   immediately prior to schedule() when blocking, and may return an error to</div><div class='del'>- *   abort.</div><div class='del'>- *</div><div class='del'>- *   One possible use for this feature is when objects being locked are part of</div><div class='del'>- *   a cache and may reused, and lock ordering is based on a property of the</div><div class='del'>- *   object that will change when the object is reused - i.e. logical key order.</div><div class='del'>- *</div><div class='del'>- *   If looking up an object in the cache may race with object reuse, and lock</div><div class='del'>- *   ordering is required to prevent deadlock, object reuse may change the</div><div class='del'>- *   correct lock order for that object and cause a deadlock. should_sleep_fn</div><div class='del'>- *   can be used to check if the object is still the object we want and avoid</div><div class='del'>- *   this deadlock.</div><div class='del'>- *</div><div class='del'>- * Wait list entry interface:</div><div class='del'>- *</div><div class='del'>- *   There is a six_lock() variant, six_lock_waiter(), that takes a pointer to a</div><div class='del'>- *   wait list entry. By embedding six_lock_waiter into another object, and by</div><div class='del'>- *   traversing lock waitlists, it is then possible for an upper layer to</div><div class='del'>- *   implement full cycle detection for deadlock avoidance.</div><div class='del'>- *</div><div class='del'>- *   should_sleep_fn should be used for invoking the cycle detector, walking the</div><div class='del'>- *   graph of held locks to check for a deadlock. The upper layer must track</div><div class='del'>- *   held locks for each thread, and each thread's held locks must be reachable</div><div class='del'>- *   from its six_lock_waiter object.</div><div class='del'>- *</div><div class='del'>- *   six_lock_waiter() will add the wait object to the waitlist re-trying taking</div><div class='del'>- *   the lock, and before calling should_sleep_fn, and the wait object will not</div><div class='del'>- *   be removed from the waitlist until either the lock has been successfully</div><div class='del'>- *   acquired, or we aborted because should_sleep_fn returned an error.</div><div class='del'>- *</div><div class='del'>- *   Also, six_lock_waiter contains a timestamp, and waiters on a waitlist will</div><div class='del'>- *   have timestamps in strictly ascending order - this is so the timestamp can</div><div class='del'>- *   be used as a cursor for lock graph traverse.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/lockdep.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-enum six_lock_type {</div><div class='del'>-	SIX_LOCK_read,</div><div class='del'>-	SIX_LOCK_intent,</div><div class='del'>-	SIX_LOCK_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct six_lock {</div><div class='del'>-	atomic_t		state;</div><div class='del'>-	u32			seq;</div><div class='del'>-	unsigned		intent_lock_recurse;</div><div class='del'>-	struct task_struct	*owner;</div><div class='del'>-	unsigned __percpu	*readers;</div><div class='del'>-	raw_spinlock_t		wait_lock;</div><div class='del'>-	struct list_head	wait_list;</div><div class='del'>-#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='del'>-	struct lockdep_map	dep_map;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct six_lock_waiter {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct task_struct	*task;</div><div class='del'>-	enum six_lock_type	lock_want;</div><div class='del'>-	bool			lock_acquired;</div><div class='del'>-	u64			start_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef int (*six_lock_should_sleep_fn)(struct six_lock *lock, void *);</div><div class='del'>-</div><div class='del'>-void six_lock_exit(struct six_lock *lock);</div><div class='del'>-</div><div class='del'>-enum six_lock_init_flags {</div><div class='del'>-	SIX_LOCK_INIT_PCPU	= 1U &lt;&lt; 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __six_lock_init(struct six_lock *lock, const char *name,</div><div class='del'>-		     struct lock_class_key *key, enum six_lock_init_flags flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_init - initialize a six lock</div><div class='del'>- * @lock:	lock to initialize</div><div class='del'>- * @flags:	optional flags, i.e. SIX_LOCK_INIT_PCPU</div><div class='del'>- */</div><div class='del'>-#define six_lock_init(lock, flags)					\</div><div class='del'>-do {									\</div><div class='del'>-	static struct lock_class_key __key;				\</div><div class='del'>-									\</div><div class='del'>-	__six_lock_init((lock), #lock, &amp;__key, flags);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_seq - obtain current lock sequence number</div><div class='del'>- * @lock:	six_lock to obtain sequence number for</div><div class='del'>- *</div><div class='del'>- * @lock should be held for read or intent, and not write</div><div class='del'>- *</div><div class='del'>- * By saving the lock sequence number, we can unlock @lock and then (typically</div><div class='del'>- * after some blocking operation) attempt to relock it: the relock will succeed</div><div class='del'>- * if the sequence number hasn't changed, meaning no write locks have been taken</div><div class='del'>- * and state corresponding to what @lock protects is still valid.</div><div class='del'>- */</div><div class='del'>-static inline u32 six_lock_seq(const struct six_lock *lock)</div><div class='del'>-{</div><div class='del'>-	return lock-&gt;seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool six_trylock_ip(struct six_lock *lock, enum six_lock_type type, unsigned long ip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_trylock_type - attempt to take a six lock without blocking</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- *</div><div class='del'>- * Return: true on success, false on failure.</div><div class='del'>- */</div><div class='del'>-static inline bool six_trylock_type(struct six_lock *lock, enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	return six_trylock_ip(lock, type, _THIS_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int six_lock_ip_waiter(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-		       struct six_lock_waiter *wait,</div><div class='del'>-		       six_lock_should_sleep_fn should_sleep_fn, void *p,</div><div class='del'>-		       unsigned long ip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_waiter - take a lock, with full waitlist interface</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @wait:	pointer to wait object, which will be added to lock's waitlist</div><div class='del'>- * @should_sleep_fn: callback run after adding to waitlist, immediately prior</div><div class='del'>- *		to scheduling</div><div class='del'>- * @p:		passed through to @should_sleep_fn</div><div class='del'>- *</div><div class='del'>- * This is a convenience wrapper around six_lock_ip_waiter(), see that function</div><div class='del'>- * for full documentation.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or the return code from @should_sleep_fn on failure.</div><div class='del'>- */</div><div class='del'>-static inline int six_lock_waiter(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-				  struct six_lock_waiter *wait,</div><div class='del'>-				  six_lock_should_sleep_fn should_sleep_fn, void *p)</div><div class='del'>-{</div><div class='del'>-	return six_lock_ip_waiter(lock, type, wait, should_sleep_fn, p, _THIS_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_ip - take a six lock lock</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @should_sleep_fn: callback run after adding to waitlist, immediately prior</div><div class='del'>- *		to scheduling</div><div class='del'>- * @p:		passed through to @should_sleep_fn</div><div class='del'>- * @ip:		ip parameter for lockdep/lockstat, i.e. _THIS_IP_</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or the return code from @should_sleep_fn on failure.</div><div class='del'>- */</div><div class='del'>-static inline int six_lock_ip(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-			      six_lock_should_sleep_fn should_sleep_fn, void *p,</div><div class='del'>-			      unsigned long ip)</div><div class='del'>-{</div><div class='del'>-	struct six_lock_waiter wait;</div><div class='del'>-</div><div class='del'>-	return six_lock_ip_waiter(lock, type, &amp;wait, should_sleep_fn, p, ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_lock_type - take a six lock lock</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @should_sleep_fn: callback run after adding to waitlist, immediately prior</div><div class='del'>- *		to scheduling</div><div class='del'>- * @p:		passed through to @should_sleep_fn</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or the return code from @should_sleep_fn on failure.</div><div class='del'>- */</div><div class='del'>-static inline int six_lock_type(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-				six_lock_should_sleep_fn should_sleep_fn, void *p)</div><div class='del'>-{</div><div class='del'>-	struct six_lock_waiter wait;</div><div class='del'>-</div><div class='del'>-	return six_lock_ip_waiter(lock, type, &amp;wait, should_sleep_fn, p, _THIS_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool six_relock_ip(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-		   unsigned seq, unsigned long ip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_relock_type - attempt to re-take a lock that was held previously</div><div class='del'>- * @lock:	lock to take</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- * @seq:	lock sequence number obtained from six_lock_seq() while lock was</div><div class='del'>- *		held previously</div><div class='del'>- *</div><div class='del'>- * Return: true on success, false on failure.</div><div class='del'>- */</div><div class='del'>-static inline bool six_relock_type(struct six_lock *lock, enum six_lock_type type,</div><div class='del'>-				   unsigned seq)</div><div class='del'>-{</div><div class='del'>-	return six_relock_ip(lock, type, seq, _THIS_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void six_unlock_ip(struct six_lock *lock, enum six_lock_type type, unsigned long ip);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * six_unlock_type - drop a six lock</div><div class='del'>- * @lock:	lock to unlock</div><div class='del'>- * @type:	SIX_LOCK_read, SIX_LOCK_intent, or SIX_LOCK_write</div><div class='del'>- *</div><div class='del'>- * When a lock is held multiple times (because six_lock_incement()) was used),</div><div class='del'>- * this decrements the 'lock held' counter by one.</div><div class='del'>- *</div><div class='del'>- * For example:</div><div class='del'>- * six_lock_read(&amp;foo-&gt;lock);				read count 1</div><div class='del'>- * six_lock_increment(&amp;foo-&gt;lock, SIX_LOCK_read);	read count 2</div><div class='del'>- * six_lock_unlock(&amp;foo-&gt;lock, SIX_LOCK_read);		read count 1</div><div class='del'>- * six_lock_unlock(&amp;foo-&gt;lock, SIX_LOCK_read);		read count 0</div><div class='del'>- */</div><div class='del'>-static inline void six_unlock_type(struct six_lock *lock, enum six_lock_type type)</div><div class='del'>-{</div><div class='del'>-	six_unlock_ip(lock, type, _THIS_IP_);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __SIX_LOCK(type)						\</div><div class='del'>-static inline bool six_trylock_ip_##type(struct six_lock *lock, unsigned long ip)\</div><div class='del'>-{									\</div><div class='del'>-	return six_trylock_ip(lock, SIX_LOCK_##type, ip);		\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline bool six_trylock_##type(struct six_lock *lock)		\</div><div class='del'>-{									\</div><div class='del'>-	return six_trylock_ip(lock, SIX_LOCK_##type, _THIS_IP_);	\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline int six_lock_ip_waiter_##type(struct six_lock *lock,	\</div><div class='del'>-			   struct six_lock_waiter *wait,		\</div><div class='del'>-			   six_lock_should_sleep_fn should_sleep_fn, void *p,\</div><div class='del'>-			   unsigned long ip)				\</div><div class='del'>-{									\</div><div class='del'>-	return six_lock_ip_waiter(lock, SIX_LOCK_##type, wait, should_sleep_fn, p, ip);\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline int six_lock_ip_##type(struct six_lock *lock,		\</div><div class='del'>-		    six_lock_should_sleep_fn should_sleep_fn, void *p,	\</div><div class='del'>-		    unsigned long ip)					\</div><div class='del'>-{									\</div><div class='del'>-	return six_lock_ip(lock, SIX_LOCK_##type, should_sleep_fn, p, ip);\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline bool six_relock_ip_##type(struct six_lock *lock, u32 seq, unsigned long ip)\</div><div class='del'>-{									\</div><div class='del'>-	return six_relock_ip(lock, SIX_LOCK_##type, seq, ip);		\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline bool six_relock_##type(struct six_lock *lock, u32 seq)	\</div><div class='del'>-{									\</div><div class='del'>-	return six_relock_ip(lock, SIX_LOCK_##type, seq, _THIS_IP_);	\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline int six_lock_##type(struct six_lock *lock,		\</div><div class='del'>-				  six_lock_should_sleep_fn fn, void *p)\</div><div class='del'>-{									\</div><div class='del'>-	return six_lock_ip_##type(lock, fn, p, _THIS_IP_);		\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline void six_unlock_ip_##type(struct six_lock *lock, unsigned long ip)	\</div><div class='del'>-{									\</div><div class='del'>-	six_unlock_ip(lock, SIX_LOCK_##type, ip);			\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static inline void six_unlock_##type(struct six_lock *lock)		\</div><div class='del'>-{									\</div><div class='del'>-	six_unlock_ip(lock, SIX_LOCK_##type, _THIS_IP_);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__SIX_LOCK(read)</div><div class='del'>-__SIX_LOCK(intent)</div><div class='del'>-__SIX_LOCK(write)</div><div class='del'>-#undef __SIX_LOCK</div><div class='del'>-</div><div class='del'>-void six_lock_downgrade(struct six_lock *);</div><div class='del'>-bool six_lock_tryupgrade(struct six_lock *);</div><div class='del'>-bool six_trylock_convert(struct six_lock *, enum six_lock_type,</div><div class='del'>-			 enum six_lock_type);</div><div class='del'>-</div><div class='del'>-void six_lock_increment(struct six_lock *, enum six_lock_type);</div><div class='del'>-</div><div class='del'>-void six_lock_wakeup_all(struct six_lock *);</div><div class='del'>-</div><div class='del'>-struct six_lock_count {</div><div class='del'>-	unsigned n[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct six_lock_count six_lock_counts(struct six_lock *);</div><div class='del'>-void six_lock_readers_add(struct six_lock *, int);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_SIX_H */</div><div class='head'>diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c<br/>deleted file mode 100644<br/>index 45f67e8b29eb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/snapshot.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/snapshot.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1687 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "bkey_buf.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Snapshot trees:</div><div class='del'>- *</div><div class='del'>- * Keys in BTREE_ID_snapshot_trees identify a whole tree of snapshot nodes; they</div><div class='del'>- * exist to provide a stable identifier for the whole lifetime of a snapshot</div><div class='del'>- * tree.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bch2_snapshot_tree_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-				struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_snapshot_tree t = bkey_s_c_to_snapshot_tree(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "subvol %u root snapshot %u",</div><div class='del'>-		   le32_to_cpu(t.v-&gt;master_subvol),</div><div class='del'>-		   le32_to_cpu(t.v-&gt;root_snapshot));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_tree_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			       enum bkey_invalid_flags flags,</div><div class='del'>-			       struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_gt(k.k-&gt;p, POS(0, U32_MAX)) ||</div><div class='del'>-			 bkey_lt(k.k-&gt;p, POS(0, 1)), c, err,</div><div class='del'>-			 snapshot_tree_pos_bad,</div><div class='del'>-			 "bad pos");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_tree_lookup(struct btree_trans *trans, u32 id,</div><div class='del'>-			      struct bch_snapshot_tree *s)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_bkey_get_val_typed(trans, BTREE_ID_snapshot_trees, POS(0, id),</div><div class='del'>-					  BTREE_ITER_WITH_UPDATES, snapshot_tree, s);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		ret = -BCH_ERR_ENOENT_snapshot_tree;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bkey_i_snapshot_tree *</div><div class='del'>-__bch2_snapshot_tree_create(struct btree_trans *trans)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret = bch2_bkey_get_empty_slot(trans, &amp;iter,</div><div class='del'>-			BTREE_ID_snapshot_trees, POS(0, U32_MAX));</div><div class='del'>-	struct bkey_i_snapshot_tree *s_t;</div><div class='del'>-</div><div class='del'>-	if (ret == -BCH_ERR_ENOSPC_btree_slot)</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_snapshot_tree;</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	s_t = bch2_bkey_alloc(trans, &amp;iter, 0, snapshot_tree);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(s_t);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret ? ERR_PTR(ret) : s_t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_snapshot_tree_create(struct btree_trans *trans,</div><div class='del'>-				u32 root_id, u32 subvol_id, u32 *tree_id)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_snapshot_tree *n_tree =</div><div class='del'>-		__bch2_snapshot_tree_create(trans);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(n_tree))</div><div class='del'>-		return PTR_ERR(n_tree);</div><div class='del'>-</div><div class='del'>-	n_tree-&gt;v.master_subvol	= cpu_to_le32(subvol_id);</div><div class='del'>-	n_tree-&gt;v.root_snapshot	= cpu_to_le32(root_id);</div><div class='del'>-	*tree_id = n_tree-&gt;k.p.offset;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Snapshot nodes: */</div><div class='del'>-</div><div class='del'>-static bool bch2_snapshot_is_ancestor_early(struct bch_fs *c, u32 id, u32 ancestor)</div><div class='del'>-{</div><div class='del'>-	struct snapshot_table *t;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	t = rcu_dereference(c-&gt;snapshots);</div><div class='del'>-</div><div class='del'>-	while (id &amp;&amp; id &lt; ancestor)</div><div class='del'>-		id = __snapshot_t(t, id)-&gt;parent;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id == ancestor;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 get_ancestor_below(struct snapshot_table *t, u32 id, u32 ancestor)</div><div class='del'>-{</div><div class='del'>-	const struct snapshot_t *s = __snapshot_t(t, id);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;skip[2] &lt;= ancestor)</div><div class='del'>-		return s-&gt;skip[2];</div><div class='del'>-	if (s-&gt;skip[1] &lt;= ancestor)</div><div class='del'>-		return s-&gt;skip[1];</div><div class='del'>-	if (s-&gt;skip[0] &lt;= ancestor)</div><div class='del'>-		return s-&gt;skip[0];</div><div class='del'>-	return s-&gt;parent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_snapshot_is_ancestor(struct bch_fs *c, u32 id, u32 ancestor)</div><div class='del'>-{</div><div class='del'>-	struct snapshot_table *t;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(c-&gt;recovery_pass_done &lt;= BCH_RECOVERY_PASS_check_snapshots);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	t = rcu_dereference(c-&gt;snapshots);</div><div class='del'>-</div><div class='del'>-	while (id &amp;&amp; id &lt; ancestor - IS_ANCESTOR_BITMAP)</div><div class='del'>-		id = get_ancestor_below(t, id, ancestor);</div><div class='del'>-</div><div class='del'>-	if (id &amp;&amp; id &lt; ancestor) {</div><div class='del'>-		ret = test_bit(ancestor - id - 1, __snapshot_t(t, id)-&gt;is_ancestor);</div><div class='del'>-</div><div class='del'>-		EBUG_ON(ret != bch2_snapshot_is_ancestor_early(c, id, ancestor));</div><div class='del'>-	} else {</div><div class='del'>-		ret = id == ancestor;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline struct snapshot_t *__snapshot_t_mut(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	size_t idx = U32_MAX - id;</div><div class='del'>-	size_t new_size;</div><div class='del'>-	struct snapshot_table *new, *old;</div><div class='del'>-</div><div class='del'>-	new_size = max(16UL, roundup_pow_of_two(idx + 1));</div><div class='del'>-</div><div class='del'>-	new = kvzalloc(struct_size(new, s, new_size), GFP_KERNEL);</div><div class='del'>-	if (!new)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	old = rcu_dereference_protected(c-&gt;snapshots, true);</div><div class='del'>-	if (old)</div><div class='del'>-		memcpy(new-&gt;s,</div><div class='del'>-		       rcu_dereference_protected(c-&gt;snapshots, true)-&gt;s,</div><div class='del'>-		       sizeof(new-&gt;s[0]) * c-&gt;snapshot_table_size);</div><div class='del'>-</div><div class='del'>-	rcu_assign_pointer(c-&gt;snapshots, new);</div><div class='del'>-	c-&gt;snapshot_table_size = new_size;</div><div class='del'>-	kvfree_rcu_mightsleep(old);</div><div class='del'>-</div><div class='del'>-	return &amp;rcu_dereference_protected(c-&gt;snapshots, true)-&gt;s[idx];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct snapshot_t *snapshot_t_mut(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	size_t idx = U32_MAX - id;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-</div><div class='del'>-	if (likely(idx &lt; c-&gt;snapshot_table_size))</div><div class='del'>-		return &amp;rcu_dereference_protected(c-&gt;snapshots, true)-&gt;s[idx];</div><div class='del'>-</div><div class='del'>-	return __snapshot_t_mut(c, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_snapshot_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			   struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_snapshot s = bkey_s_c_to_snapshot(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "is_subvol %llu deleted %llu parent %10u children %10u %10u subvol %u tree %u",</div><div class='del'>-	       BCH_SNAPSHOT_SUBVOL(s.v),</div><div class='del'>-	       BCH_SNAPSHOT_DELETED(s.v),</div><div class='del'>-	       le32_to_cpu(s.v-&gt;parent),</div><div class='del'>-	       le32_to_cpu(s.v-&gt;children[0]),</div><div class='del'>-	       le32_to_cpu(s.v-&gt;children[1]),</div><div class='del'>-	       le32_to_cpu(s.v-&gt;subvol),</div><div class='del'>-	       le32_to_cpu(s.v-&gt;tree));</div><div class='del'>-</div><div class='del'>-	if (bkey_val_bytes(k.k) &gt; offsetof(struct bch_snapshot, depth))</div><div class='del'>-		prt_printf(out, " depth %u skiplist %u %u %u",</div><div class='del'>-			   le32_to_cpu(s.v-&gt;depth),</div><div class='del'>-			   le32_to_cpu(s.v-&gt;skip[0]),</div><div class='del'>-			   le32_to_cpu(s.v-&gt;skip[1]),</div><div class='del'>-			   le32_to_cpu(s.v-&gt;skip[2]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			  enum bkey_invalid_flags flags,</div><div class='del'>-			  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_snapshot s;</div><div class='del'>-	u32 i, id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_gt(k.k-&gt;p, POS(0, U32_MAX)) ||</div><div class='del'>-			 bkey_lt(k.k-&gt;p, POS(0, 1)), c, err,</div><div class='del'>-			 snapshot_pos_bad,</div><div class='del'>-			 "bad pos");</div><div class='del'>-</div><div class='del'>-	s = bkey_s_c_to_snapshot(k);</div><div class='del'>-</div><div class='del'>-	id = le32_to_cpu(s.v-&gt;parent);</div><div class='del'>-	bkey_fsck_err_on(id &amp;&amp; id &lt;= k.k-&gt;p.offset, c, err,</div><div class='del'>-			 snapshot_parent_bad,</div><div class='del'>-			 "bad parent node (%u &lt;= %llu)",</div><div class='del'>-			 id, k.k-&gt;p.offset);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(le32_to_cpu(s.v-&gt;children[0]) &lt; le32_to_cpu(s.v-&gt;children[1]), c, err,</div><div class='del'>-			 snapshot_children_not_normalized,</div><div class='del'>-			 "children not normalized");</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(s.v-&gt;children[0] &amp;&amp; s.v-&gt;children[0] == s.v-&gt;children[1], c, err,</div><div class='del'>-			 snapshot_child_duplicate,</div><div class='del'>-			 "duplicate child nodes");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		id = le32_to_cpu(s.v-&gt;children[i]);</div><div class='del'>-</div><div class='del'>-		bkey_fsck_err_on(id &gt;= k.k-&gt;p.offset, c, err,</div><div class='del'>-				 snapshot_child_bad,</div><div class='del'>-				 "bad child node (%u &gt;= %llu)",</div><div class='del'>-				 id, k.k-&gt;p.offset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bkey_val_bytes(k.k) &gt; offsetof(struct bch_snapshot, skip)) {</div><div class='del'>-		bkey_fsck_err_on(le32_to_cpu(s.v-&gt;skip[0]) &gt; le32_to_cpu(s.v-&gt;skip[1]) ||</div><div class='del'>-				 le32_to_cpu(s.v-&gt;skip[1]) &gt; le32_to_cpu(s.v-&gt;skip[2]), c, err,</div><div class='del'>-				 snapshot_skiplist_not_normalized,</div><div class='del'>-				 "skiplist not normalized");</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(s.v-&gt;skip); i++) {</div><div class='del'>-			id = le32_to_cpu(s.v-&gt;skip[i]);</div><div class='del'>-</div><div class='del'>-			bkey_fsck_err_on(id &amp;&amp; id &lt; le32_to_cpu(s.v-&gt;parent), c, err,</div><div class='del'>-					 snapshot_skiplist_bad,</div><div class='del'>-					 "bad skiplist node %u", id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __set_is_ancestor_bitmap(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct snapshot_t *t = snapshot_t_mut(c, id);</div><div class='del'>-	u32 parent = id;</div><div class='del'>-</div><div class='del'>-	while ((parent = bch2_snapshot_parent_early(c, parent)) &amp;&amp;</div><div class='del'>-	       parent - id - 1 &lt; IS_ANCESTOR_BITMAP)</div><div class='del'>-		__set_bit(parent - id - 1, t-&gt;is_ancestor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_is_ancestor_bitmap(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-	__set_is_ancestor_bitmap(c, id);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_mark_snapshot(struct btree_trans *trans,</div><div class='del'>-		       enum btree_id btree, unsigned level,</div><div class='del'>-		       struct bkey_s_c old, struct bkey_s_c new,</div><div class='del'>-		       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct snapshot_t *t;</div><div class='del'>-	u32 id = new.k-&gt;p.offset;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-</div><div class='del'>-	t = snapshot_t_mut(c, id);</div><div class='del'>-	if (!t) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_mark_snapshot;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new.k-&gt;type == KEY_TYPE_snapshot) {</div><div class='del'>-		struct bkey_s_c_snapshot s = bkey_s_c_to_snapshot(new);</div><div class='del'>-</div><div class='del'>-		t-&gt;parent	= le32_to_cpu(s.v-&gt;parent);</div><div class='del'>-		t-&gt;children[0]	= le32_to_cpu(s.v-&gt;children[0]);</div><div class='del'>-		t-&gt;children[1]	= le32_to_cpu(s.v-&gt;children[1]);</div><div class='del'>-		t-&gt;subvol	= BCH_SNAPSHOT_SUBVOL(s.v) ? le32_to_cpu(s.v-&gt;subvol) : 0;</div><div class='del'>-		t-&gt;tree		= le32_to_cpu(s.v-&gt;tree);</div><div class='del'>-</div><div class='del'>-		if (bkey_val_bytes(s.k) &gt; offsetof(struct bch_snapshot, depth)) {</div><div class='del'>-			t-&gt;depth	= le32_to_cpu(s.v-&gt;depth);</div><div class='del'>-			t-&gt;skip[0]	= le32_to_cpu(s.v-&gt;skip[0]);</div><div class='del'>-			t-&gt;skip[1]	= le32_to_cpu(s.v-&gt;skip[1]);</div><div class='del'>-			t-&gt;skip[2]	= le32_to_cpu(s.v-&gt;skip[2]);</div><div class='del'>-		} else {</div><div class='del'>-			t-&gt;depth	= 0;</div><div class='del'>-			t-&gt;skip[0]	= 0;</div><div class='del'>-			t-&gt;skip[1]	= 0;</div><div class='del'>-			t-&gt;skip[2]	= 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__set_is_ancestor_bitmap(c, id);</div><div class='del'>-</div><div class='del'>-		if (BCH_SNAPSHOT_DELETED(s.v)) {</div><div class='del'>-			set_bit(BCH_FS_need_delete_dead_snapshots, &amp;c-&gt;flags);</div><div class='del'>-			if (c-&gt;curr_recovery_pass &gt; BCH_RECOVERY_PASS_delete_dead_snapshots)</div><div class='del'>-				bch2_delete_dead_snapshots_async(c);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		memset(t, 0, sizeof(*t));</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_mark_snapshot(struct btree_trans *trans,</div><div class='del'>-		       enum btree_id btree, unsigned level,</div><div class='del'>-		       struct bkey_s_c old, struct bkey_s new,</div><div class='del'>-		       unsigned flags)</div><div class='del'>-{</div><div class='del'>-	return __bch2_mark_snapshot(trans, btree, level, old, new.s_c, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_lookup(struct btree_trans *trans, u32 id,</div><div class='del'>-			 struct bch_snapshot *s)</div><div class='del'>-{</div><div class='del'>-	return bch2_bkey_get_val_typed(trans, BTREE_ID_snapshots, POS(0, id),</div><div class='del'>-				       BTREE_ITER_WITH_UPDATES, snapshot, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_snapshot_live(struct btree_trans *trans, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct bch_snapshot v;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!id)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_snapshot_lookup(trans, id, &amp;v);</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		bch_err(trans-&gt;c, "snapshot node %u not found", id);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return !BCH_SNAPSHOT_DELETED(&amp;v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If @k is a snapshot with just one live child, it's part of a linear chain,</div><div class='del'>- * which we consider to be an equivalence class: and then after snapshot</div><div class='del'>- * deletion cleanup, there should only be a single key at a given position in</div><div class='del'>- * this equivalence class.</div><div class='del'>- *</div><div class='del'>- * This sets the equivalence class of @k to be the child's equivalence class, if</div><div class='del'>- * it's part of such a linear chain: this correctly sets equivalence classes on</div><div class='del'>- * startup if we run leaf to root (i.e. in natural key order).</div><div class='del'>- */</div><div class='del'>-static int bch2_snapshot_set_equiv(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	unsigned i, nr_live = 0, live_idx = 0;</div><div class='del'>-	struct bkey_s_c_snapshot snap;</div><div class='del'>-	u32 id = k.k-&gt;p.offset, child[2];</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_snapshot)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	snap = bkey_s_c_to_snapshot(k);</div><div class='del'>-</div><div class='del'>-	child[0] = le32_to_cpu(snap.v-&gt;children[0]);</div><div class='del'>-	child[1] = le32_to_cpu(snap.v-&gt;children[1]);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		int ret = bch2_snapshot_live(trans, child[i]);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			live_idx = i;</div><div class='del'>-		nr_live += ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-</div><div class='del'>-	snapshot_t_mut(c, id)-&gt;equiv = nr_live == 1</div><div class='del'>-		? snapshot_t_mut(c, child[live_idx])-&gt;equiv</div><div class='del'>-		: id;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fsck: */</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_child(struct bch_fs *c, u32 id, unsigned child)</div><div class='del'>-{</div><div class='del'>-	return snapshot_t(c, id)-&gt;children[child];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_left_child(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return bch2_snapshot_child(c, id, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_right_child(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return bch2_snapshot_child(c, id, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_tree_next(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	u32 n, parent;</div><div class='del'>-</div><div class='del'>-	n = bch2_snapshot_left_child(c, id);</div><div class='del'>-	if (n)</div><div class='del'>-		return n;</div><div class='del'>-</div><div class='del'>-	while ((parent = bch2_snapshot_parent(c, id))) {</div><div class='del'>-		n = bch2_snapshot_right_child(c, parent);</div><div class='del'>-		if (n &amp;&amp; n != id)</div><div class='del'>-			return n;</div><div class='del'>-		id = parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_tree_oldest_subvol(struct bch_fs *c, u32 snapshot_root)</div><div class='del'>-{</div><div class='del'>-	u32 id = snapshot_root;</div><div class='del'>-	u32 subvol = 0, s;</div><div class='del'>-</div><div class='del'>-	while (id) {</div><div class='del'>-		s = snapshot_t(c, id)-&gt;subvol;</div><div class='del'>-</div><div class='del'>-		if (s &amp;&amp; (!subvol || s &lt; subvol))</div><div class='del'>-			subvol = s;</div><div class='del'>-</div><div class='del'>-		id = bch2_snapshot_tree_next(c, id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return subvol;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_snapshot_tree_master_subvol(struct btree_trans *trans,</div><div class='del'>-					    u32 snapshot_root, u32 *subvol_id)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	bool found = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_norestart(trans, iter, BTREE_ID_subvolumes, POS_MIN,</div><div class='del'>-				     0, k, ret) {</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_subvolume)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		struct bkey_s_c_subvolume s = bkey_s_c_to_subvolume(k);</div><div class='del'>-		if (!bch2_snapshot_is_ancestor(c, le32_to_cpu(s.v-&gt;snapshot), snapshot_root))</div><div class='del'>-			continue;</div><div class='del'>-		if (!BCH_SUBVOLUME_SNAP(s.v)) {</div><div class='del'>-			*subvol_id = s.k-&gt;p.offset;</div><div class='del'>-			found = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	if (!ret &amp;&amp; !found) {</div><div class='del'>-		struct bkey_i_subvolume *u;</div><div class='del'>-</div><div class='del'>-		*subvol_id = bch2_snapshot_tree_oldest_subvol(c, snapshot_root);</div><div class='del'>-</div><div class='del'>-		u = bch2_bkey_get_mut_typed(trans, &amp;iter,</div><div class='del'>-					    BTREE_ID_subvolumes, POS(0, *subvol_id),</div><div class='del'>-					    0, subvolume);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		SET_BCH_SUBVOLUME_SNAP(&amp;u-&gt;v, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_snapshot_tree(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c_snapshot_tree st;</div><div class='del'>-	struct bch_snapshot s;</div><div class='del'>-	struct bch_subvolume subvol;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	u32 root_id;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_snapshot_tree)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	st = bkey_s_c_to_snapshot_tree(k);</div><div class='del'>-	root_id = le32_to_cpu(st.v-&gt;root_snapshot);</div><div class='del'>-</div><div class='del'>-	ret = bch2_snapshot_lookup(trans, root_id, &amp;s);</div><div class='del'>-	if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(ret ||</div><div class='del'>-			root_id != bch2_snapshot_root(c, root_id) ||</div><div class='del'>-			st.k-&gt;p.offset != le32_to_cpu(s.tree),</div><div class='del'>-			c, snapshot_tree_to_missing_snapshot,</div><div class='del'>-			"snapshot tree points to missing/incorrect snapshot:\n  %s",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, st.s_c), buf.buf))) {</div><div class='del'>-		ret = bch2_btree_delete_at(trans, iter, 0);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get(trans, le32_to_cpu(st.v-&gt;master_subvol),</div><div class='del'>-				 false, 0, &amp;subvol);</div><div class='del'>-	if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(ret,</div><div class='del'>-			c, snapshot_tree_to_missing_subvol,</div><div class='del'>-			"snapshot tree points to missing subvolume:\n  %s",</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, st.s_c), buf.buf)) ||</div><div class='del'>-	    fsck_err_on(!bch2_snapshot_is_ancestor_early(c,</div><div class='del'>-						le32_to_cpu(subvol.snapshot),</div><div class='del'>-						root_id),</div><div class='del'>-			c, snapshot_tree_to_wrong_subvol,</div><div class='del'>-			"snapshot tree points to subvolume that does not point to snapshot in this tree:\n  %s",</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, st.s_c), buf.buf)) ||</div><div class='del'>-	    fsck_err_on(BCH_SUBVOLUME_SNAP(&amp;subvol),</div><div class='del'>-			c, snapshot_tree_to_snapshot_subvol,</div><div class='del'>-			"snapshot tree points to snapshot subvolume:\n  %s",</div><div class='del'>-			(printbuf_reset(&amp;buf),</div><div class='del'>-			 bch2_bkey_val_to_text(&amp;buf, c, st.s_c), buf.buf))) {</div><div class='del'>-		struct bkey_i_snapshot_tree *u;</div><div class='del'>-		u32 subvol_id;</div><div class='del'>-</div><div class='del'>-		ret = bch2_snapshot_tree_master_subvol(trans, root_id, &amp;subvol_id);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		u = bch2_bkey_make_mut_typed(trans, iter, &amp;k, 0, snapshot_tree);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		u-&gt;v.master_subvol = cpu_to_le32(subvol_id);</div><div class='del'>-		st = snapshot_tree_i_to_s_c(u);</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For each snapshot_tree, make sure it points to the root of a snapshot tree</div><div class='del'>- * and that snapshot entry points back to it, or delete it.</div><div class='del'>- *</div><div class='del'>- * And, make sure it points to a subvolume within that snapshot tree, or correct</div><div class='del'>- * it to point to the oldest subvolume within that snapshot tree.</div><div class='del'>- */</div><div class='del'>-int bch2_check_snapshot_trees(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-			BTREE_ID_snapshot_trees, POS_MIN,</div><div class='del'>-			BTREE_ITER_PREFETCH, k,</div><div class='del'>-			NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		check_snapshot_tree(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Look up snapshot tree for @tree_id and find root,</div><div class='del'>- * make sure @snap_id is a descendent:</div><div class='del'>- */</div><div class='del'>-static int snapshot_tree_ptr_good(struct btree_trans *trans,</div><div class='del'>-				  u32 snap_id, u32 tree_id)</div><div class='del'>-{</div><div class='del'>-	struct bch_snapshot_tree s_t;</div><div class='del'>-	int ret = bch2_snapshot_tree_lookup(trans, tree_id, &amp;s_t);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		return 0;</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return bch2_snapshot_is_ancestor_early(trans-&gt;c, snap_id, le32_to_cpu(s_t.root_snapshot));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 bch2_snapshot_skiplist_get(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	const struct snapshot_t *s;</div><div class='del'>-</div><div class='del'>-	if (!id)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	s = snapshot_t(c, id);</div><div class='del'>-	if (s-&gt;parent)</div><div class='del'>-		id = bch2_snapshot_nth_parent(c, id, get_random_u32_below(s-&gt;depth));</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snapshot_skiplist_good(struct btree_trans *trans, u32 id, struct bch_snapshot s)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		if (!s.parent) {</div><div class='del'>-			if (s.skip[i])</div><div class='del'>-				return false;</div><div class='del'>-		} else {</div><div class='del'>-			if (!bch2_snapshot_is_ancestor_early(trans-&gt;c, id, le32_to_cpu(s.skip[i])))</div><div class='del'>-				return false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * snapshot_tree pointer was incorrect: look up root snapshot node, make sure</div><div class='del'>- * its snapshot_tree pointer is correct (allocate new one if necessary), then</div><div class='del'>- * update this node's pointer to root node's pointer:</div><div class='del'>- */</div><div class='del'>-static int snapshot_tree_ptr_repair(struct btree_trans *trans,</div><div class='del'>-				    struct btree_iter *iter,</div><div class='del'>-				    struct bkey_s_c k,</div><div class='del'>-				    struct bch_snapshot *s)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter root_iter;</div><div class='del'>-	struct bch_snapshot_tree s_t;</div><div class='del'>-	struct bkey_s_c_snapshot root;</div><div class='del'>-	struct bkey_i_snapshot *u;</div><div class='del'>-	u32 root_id = bch2_snapshot_root(c, k.k-&gt;p.offset), tree_id;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	root = bch2_bkey_get_iter_typed(trans, &amp;root_iter,</div><div class='del'>-			       BTREE_ID_snapshots, POS(0, root_id),</div><div class='del'>-			       BTREE_ITER_WITH_UPDATES, snapshot);</div><div class='del'>-	ret = bkey_err(root);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	tree_id = le32_to_cpu(root.v-&gt;tree);</div><div class='del'>-</div><div class='del'>-	ret = bch2_snapshot_tree_lookup(trans, tree_id, &amp;s_t);</div><div class='del'>-	if (ret &amp;&amp; !bch2_err_matches(ret, ENOENT))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ret || le32_to_cpu(s_t.root_snapshot) != root_id) {</div><div class='del'>-		u = bch2_bkey_make_mut_typed(trans, &amp;root_iter, &amp;root.s_c, 0, snapshot);</div><div class='del'>-		ret =   PTR_ERR_OR_ZERO(u) ?:</div><div class='del'>-			bch2_snapshot_tree_create(trans, root_id,</div><div class='del'>-				bch2_snapshot_tree_oldest_subvol(c, root_id),</div><div class='del'>-				&amp;tree_id);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		u-&gt;v.tree = cpu_to_le32(tree_id);</div><div class='del'>-		if (k.k-&gt;p.offset == root_id)</div><div class='del'>-			*s = u-&gt;v;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;p.offset != root_id) {</div><div class='del'>-		u = bch2_bkey_make_mut_typed(trans, iter, &amp;k, 0, snapshot);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		u-&gt;v.tree = cpu_to_le32(tree_id);</div><div class='del'>-		*s = u-&gt;v;</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;root_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_snapshot(struct btree_trans *trans,</div><div class='del'>-			  struct btree_iter *iter,</div><div class='del'>-			  struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bch_snapshot s;</div><div class='del'>-	struct bch_subvolume subvol;</div><div class='del'>-	struct bch_snapshot v;</div><div class='del'>-	struct bkey_i_snapshot *u;</div><div class='del'>-	u32 parent_id = bch2_snapshot_parent_early(c, k.k-&gt;p.offset);</div><div class='del'>-	u32 real_depth;</div><div class='del'>-	struct printbuf buf = PRINTBUF;</div><div class='del'>-	bool should_have_subvol;</div><div class='del'>-	u32 i, id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_snapshot)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	memset(&amp;s, 0, sizeof(s));</div><div class='del'>-	memcpy(&amp;s, k.v, bkey_val_bytes(k.k));</div><div class='del'>-</div><div class='del'>-	id = le32_to_cpu(s.parent);</div><div class='del'>-	if (id) {</div><div class='del'>-		ret = bch2_snapshot_lookup(trans, id, &amp;v);</div><div class='del'>-		if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-			bch_err(c, "snapshot with nonexistent parent:\n  %s",</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (le32_to_cpu(v.children[0]) != k.k-&gt;p.offset &amp;&amp;</div><div class='del'>-		    le32_to_cpu(v.children[1]) != k.k-&gt;p.offset) {</div><div class='del'>-			bch_err(c, "snapshot parent %u missing pointer to child %llu",</div><div class='del'>-				id, k.k-&gt;p.offset);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2 &amp;&amp; s.children[i]; i++) {</div><div class='del'>-		id = le32_to_cpu(s.children[i]);</div><div class='del'>-</div><div class='del'>-		ret = bch2_snapshot_lookup(trans, id, &amp;v);</div><div class='del'>-		if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-			bch_err(c, "snapshot node %llu has nonexistent child %u",</div><div class='del'>-				k.k-&gt;p.offset, id);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (le32_to_cpu(v.parent) != k.k-&gt;p.offset) {</div><div class='del'>-			bch_err(c, "snapshot child %u has wrong parent (got %u should be %llu)",</div><div class='del'>-				id, le32_to_cpu(v.parent), k.k-&gt;p.offset);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	should_have_subvol = BCH_SNAPSHOT_SUBVOL(&amp;s) &amp;&amp;</div><div class='del'>-		!BCH_SNAPSHOT_DELETED(&amp;s);</div><div class='del'>-</div><div class='del'>-	if (should_have_subvol) {</div><div class='del'>-		id = le32_to_cpu(s.subvol);</div><div class='del'>-		ret = bch2_subvolume_get(trans, id, 0, false, &amp;subvol);</div><div class='del'>-		if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-			bch_err(c, "snapshot points to nonexistent subvolume:\n  %s",</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf));</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (BCH_SNAPSHOT_SUBVOL(&amp;s) != (le32_to_cpu(subvol.snapshot) == k.k-&gt;p.offset)) {</div><div class='del'>-			bch_err(c, "snapshot node %llu has wrong BCH_SNAPSHOT_SUBVOL",</div><div class='del'>-				k.k-&gt;p.offset);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (fsck_err_on(s.subvol,</div><div class='del'>-				c, snapshot_should_not_have_subvol,</div><div class='del'>-				"snapshot should not point to subvol:\n  %s",</div><div class='del'>-				(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-			u = bch2_bkey_make_mut_typed(trans, iter, &amp;k, 0, snapshot);</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto err;</div><div class='del'>-</div><div class='del'>-			u-&gt;v.subvol = 0;</div><div class='del'>-			s = u-&gt;v;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = snapshot_tree_ptr_good(trans, k.k-&gt;p.offset, le32_to_cpu(s.tree));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!ret, c, snapshot_to_bad_snapshot_tree,</div><div class='del'>-			"snapshot points to missing/incorrect tree:\n  %s",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		ret = snapshot_tree_ptr_repair(trans, iter, k, &amp;s);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-	real_depth = bch2_snapshot_depth(c, parent_id);</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(le32_to_cpu(s.depth) != real_depth,</div><div class='del'>-			c, snapshot_bad_depth,</div><div class='del'>-			"snapshot with incorrect depth field, should be %u:\n  %s",</div><div class='del'>-			real_depth, (bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		u = bch2_bkey_make_mut_typed(trans, iter, &amp;k, 0, snapshot);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		u-&gt;v.depth = cpu_to_le32(real_depth);</div><div class='del'>-		s = u-&gt;v;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = snapshot_skiplist_good(trans, k.k-&gt;p.offset, s);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (fsck_err_on(!ret, c, snapshot_bad_skiplist,</div><div class='del'>-			"snapshot with bad skiplist field:\n  %s",</div><div class='del'>-			(bch2_bkey_val_to_text(&amp;buf, c, k), buf.buf))) {</div><div class='del'>-		u = bch2_bkey_make_mut_typed(trans, iter, &amp;k, 0, snapshot);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(u);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(u-&gt;v.skip); i++)</div><div class='del'>-			u-&gt;v.skip[i] = cpu_to_le32(bch2_snapshot_skiplist_get(c, parent_id));</div><div class='del'>-</div><div class='del'>-		bubble_sort(u-&gt;v.skip, ARRAY_SIZE(u-&gt;v.skip), cmp_le32);</div><div class='del'>-		s = u-&gt;v;</div><div class='del'>-	}</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-fsck_err:</div><div class='del'>-	printbuf_exit(&amp;buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_snapshots(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We iterate backwards as checking/fixing the depth field requires that</div><div class='del'>-	 * the parent's depth already be correct:</div><div class='del'>-	 */</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_reverse_commit(trans, iter,</div><div class='del'>-				BTREE_ID_snapshots, POS_MAX,</div><div class='del'>-				BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			check_snapshot(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mark a snapshot as deleted, for future cleanup:</div><div class='del'>- */</div><div class='del'>-int bch2_snapshot_node_set_deleted(struct btree_trans *trans, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_snapshot *s;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	s = bch2_bkey_get_mut_typed(trans, &amp;iter,</div><div class='del'>-				    BTREE_ID_snapshots, POS(0, id),</div><div class='del'>-				    0, snapshot);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(s);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT),</div><div class='del'>-					trans-&gt;c, "missing snapshot %u", id);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* already deleted? */</div><div class='del'>-	if (BCH_SNAPSHOT_DELETED(&amp;s-&gt;v))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	SET_BCH_SNAPSHOT_DELETED(&amp;s-&gt;v, true);</div><div class='del'>-	SET_BCH_SNAPSHOT_SUBVOL(&amp;s-&gt;v, false);</div><div class='del'>-	s-&gt;v.subvol = 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void normalize_snapshot_child_pointers(struct bch_snapshot *s)</div><div class='del'>-{</div><div class='del'>-	if (le32_to_cpu(s-&gt;children[0]) &lt; le32_to_cpu(s-&gt;children[1]))</div><div class='del'>-		swap(s-&gt;children[0], s-&gt;children[1]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_snapshot_node_delete(struct btree_trans *trans, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter, p_iter = (struct btree_iter) { NULL };</div><div class='del'>-	struct btree_iter c_iter = (struct btree_iter) { NULL };</div><div class='del'>-	struct btree_iter tree_iter = (struct btree_iter) { NULL };</div><div class='del'>-	struct bkey_s_c_snapshot s;</div><div class='del'>-	u32 parent_id, child_id;</div><div class='del'>-	unsigned i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	s = bch2_bkey_get_iter_typed(trans, &amp;iter, BTREE_ID_snapshots, POS(0, id),</div><div class='del'>-				     BTREE_ITER_INTENT, snapshot);</div><div class='del'>-	ret = bkey_err(s);</div><div class='del'>-	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-				"missing snapshot %u", id);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(s.v-&gt;children[1]);</div><div class='del'>-</div><div class='del'>-	parent_id = le32_to_cpu(s.v-&gt;parent);</div><div class='del'>-	child_id = le32_to_cpu(s.v-&gt;children[0]);</div><div class='del'>-</div><div class='del'>-	if (parent_id) {</div><div class='del'>-		struct bkey_i_snapshot *parent;</div><div class='del'>-</div><div class='del'>-		parent = bch2_bkey_get_mut_typed(trans, &amp;p_iter,</div><div class='del'>-				     BTREE_ID_snapshots, POS(0, parent_id),</div><div class='del'>-				     0, snapshot);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(parent);</div><div class='del'>-		bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-					"missing snapshot %u", parent_id);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		/* find entry in parent-&gt;children for node being deleted */</div><div class='del'>-		for (i = 0; i &lt; 2; i++)</div><div class='del'>-			if (le32_to_cpu(parent-&gt;v.children[i]) == id)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (bch2_fs_inconsistent_on(i == 2, c,</div><div class='del'>-					"snapshot %u missing child pointer to %u",</div><div class='del'>-					parent_id, id))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		parent-&gt;v.children[i] = cpu_to_le32(child_id);</div><div class='del'>-</div><div class='del'>-		normalize_snapshot_child_pointers(&amp;parent-&gt;v);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (child_id) {</div><div class='del'>-		struct bkey_i_snapshot *child;</div><div class='del'>-</div><div class='del'>-		child = bch2_bkey_get_mut_typed(trans, &amp;c_iter,</div><div class='del'>-				     BTREE_ID_snapshots, POS(0, child_id),</div><div class='del'>-				     0, snapshot);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(child);</div><div class='del'>-		bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-					"missing snapshot %u", child_id);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		child-&gt;v.parent = cpu_to_le32(parent_id);</div><div class='del'>-</div><div class='del'>-		if (!child-&gt;v.parent) {</div><div class='del'>-			child-&gt;v.skip[0] = 0;</div><div class='del'>-			child-&gt;v.skip[1] = 0;</div><div class='del'>-			child-&gt;v.skip[2] = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!parent_id) {</div><div class='del'>-		/*</div><div class='del'>-		 * We're deleting the root of a snapshot tree: update the</div><div class='del'>-		 * snapshot_tree entry to point to the new root, or delete it if</div><div class='del'>-		 * this is the last snapshot ID in this tree:</div><div class='del'>-		 */</div><div class='del'>-		struct bkey_i_snapshot_tree *s_t;</div><div class='del'>-</div><div class='del'>-		BUG_ON(s.v-&gt;children[1]);</div><div class='del'>-</div><div class='del'>-		s_t = bch2_bkey_get_mut_typed(trans, &amp;tree_iter,</div><div class='del'>-				BTREE_ID_snapshot_trees, POS(0, le32_to_cpu(s.v-&gt;tree)),</div><div class='del'>-				0, snapshot_tree);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(s_t);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (s.v-&gt;children[0]) {</div><div class='del'>-			s_t-&gt;v.root_snapshot = s.v-&gt;children[0];</div><div class='del'>-		} else {</div><div class='del'>-			s_t-&gt;k.type = KEY_TYPE_deleted;</div><div class='del'>-			set_bkey_val_u64s(&amp;s_t-&gt;k, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_delete_at(trans, &amp;iter, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;tree_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;p_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;c_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int create_snapids(struct btree_trans *trans, u32 parent, u32 tree,</div><div class='del'>-			  u32 *new_snapids,</div><div class='del'>-			  u32 *snapshot_subvols,</div><div class='del'>-			  unsigned nr_snapids)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_snapshot *n;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	unsigned i, j;</div><div class='del'>-	u32 depth = bch2_snapshot_depth(c, parent);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_snapshots,</div><div class='del'>-			     POS_MIN, BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_peek(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_snapids; i++) {</div><div class='del'>-		k = bch2_btree_iter_prev_slot(&amp;iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (!k.k || !k.k-&gt;p.offset) {</div><div class='del'>-			ret = -BCH_ERR_ENOSPC_snapshot_create;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		n = bch2_bkey_alloc(trans, &amp;iter, 0, snapshot);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		n-&gt;v.flags	= 0;</div><div class='del'>-		n-&gt;v.parent	= cpu_to_le32(parent);</div><div class='del'>-		n-&gt;v.subvol	= cpu_to_le32(snapshot_subvols[i]);</div><div class='del'>-		n-&gt;v.tree	= cpu_to_le32(tree);</div><div class='del'>-		n-&gt;v.depth	= cpu_to_le32(depth);</div><div class='del'>-		n-&gt;v.btime.lo	= cpu_to_le64(bch2_current_time(c));</div><div class='del'>-		n-&gt;v.btime.hi	= 0;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; ARRAY_SIZE(n-&gt;v.skip); j++)</div><div class='del'>-			n-&gt;v.skip[j] = cpu_to_le32(bch2_snapshot_skiplist_get(c, parent));</div><div class='del'>-</div><div class='del'>-		bubble_sort(n-&gt;v.skip, ARRAY_SIZE(n-&gt;v.skip), cmp_le32);</div><div class='del'>-		SET_BCH_SNAPSHOT_SUBVOL(&amp;n-&gt;v, true);</div><div class='del'>-</div><div class='del'>-		ret = __bch2_mark_snapshot(trans, BTREE_ID_snapshots, 0,</div><div class='del'>-					 bkey_s_c_null, bkey_i_to_s_c(&amp;n-&gt;k_i), 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		new_snapids[i]	= iter.pos.offset;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-		snapshot_t_mut(c, new_snapids[i])-&gt;equiv = new_snapids[i];</div><div class='del'>-		mutex_unlock(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create new snapshot IDs as children of an existing snapshot ID:</div><div class='del'>- */</div><div class='del'>-static int bch2_snapshot_node_create_children(struct btree_trans *trans, u32 parent,</div><div class='del'>-			      u32 *new_snapids,</div><div class='del'>-			      u32 *snapshot_subvols,</div><div class='del'>-			      unsigned nr_snapids)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_snapshot *n_parent;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	n_parent = bch2_bkey_get_mut_typed(trans, &amp;iter,</div><div class='del'>-			BTREE_ID_snapshots, POS(0, parent),</div><div class='del'>-			0, snapshot);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(n_parent);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-			bch_err(trans-&gt;c, "snapshot %u not found", parent);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (n_parent-&gt;v.children[0] || n_parent-&gt;v.children[1]) {</div><div class='del'>-		bch_err(trans-&gt;c, "Trying to add child snapshot nodes to parent that already has children");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = create_snapids(trans, parent, le32_to_cpu(n_parent-&gt;v.tree),</div><div class='del'>-			     new_snapids, snapshot_subvols, nr_snapids);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	n_parent-&gt;v.children[0] = cpu_to_le32(new_snapids[0]);</div><div class='del'>-	n_parent-&gt;v.children[1] = cpu_to_le32(new_snapids[1]);</div><div class='del'>-	n_parent-&gt;v.subvol = 0;</div><div class='del'>-	SET_BCH_SNAPSHOT_SUBVOL(&amp;n_parent-&gt;v, false);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create a snapshot node that is the root of a new tree:</div><div class='del'>- */</div><div class='del'>-static int bch2_snapshot_node_create_tree(struct btree_trans *trans,</div><div class='del'>-			      u32 *new_snapids,</div><div class='del'>-			      u32 *snapshot_subvols,</div><div class='del'>-			      unsigned nr_snapids)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_snapshot_tree *n_tree;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	n_tree = __bch2_snapshot_tree_create(trans);</div><div class='del'>-	ret =   PTR_ERR_OR_ZERO(n_tree) ?:</div><div class='del'>-		create_snapids(trans, 0, n_tree-&gt;k.p.offset,</div><div class='del'>-			     new_snapids, snapshot_subvols, nr_snapids);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	n_tree-&gt;v.master_subvol	= cpu_to_le32(snapshot_subvols[0]);</div><div class='del'>-	n_tree-&gt;v.root_snapshot	= cpu_to_le32(new_snapids[0]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_node_create(struct btree_trans *trans, u32 parent,</div><div class='del'>-			      u32 *new_snapids,</div><div class='del'>-			      u32 *snapshot_subvols,</div><div class='del'>-			      unsigned nr_snapids)</div><div class='del'>-{</div><div class='del'>-	BUG_ON((parent == 0) != (nr_snapids == 1));</div><div class='del'>-	BUG_ON((parent != 0) != (nr_snapids == 2));</div><div class='del'>-</div><div class='del'>-	return parent</div><div class='del'>-		? bch2_snapshot_node_create_children(trans, parent,</div><div class='del'>-				new_snapids, snapshot_subvols, nr_snapids)</div><div class='del'>-		: bch2_snapshot_node_create_tree(trans,</div><div class='del'>-				new_snapids, snapshot_subvols, nr_snapids);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If we have an unlinked inode in an internal snapshot node, and the inode</div><div class='del'>- * really has been deleted in all child snapshots, how does this get cleaned up?</div><div class='del'>- *</div><div class='del'>- * first there is the problem of how keys that have been overwritten in all</div><div class='del'>- * child snapshots get deleted (unimplemented?), but inodes may perhaps be</div><div class='del'>- * special?</div><div class='del'>- *</div><div class='del'>- * also: unlinked inode in internal snapshot appears to not be getting deleted</div><div class='del'>- * correctly if inode doesn't exist in leaf snapshots</div><div class='del'>- *</div><div class='del'>- * solution:</div><div class='del'>- *</div><div class='del'>- * for a key in an interior snapshot node that needs work to be done that</div><div class='del'>- * requires it to be mutated: iterate over all descendent leaf nodes and copy</div><div class='del'>- * that key to snapshot leaf nodes, where we can mutate it</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int snapshot_delete_key(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       struct bkey_s_c k,</div><div class='del'>-			       snapshot_id_list *deleted,</div><div class='del'>-			       snapshot_id_list *equiv_seen,</div><div class='del'>-			       struct bpos *last_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u32 equiv = bch2_snapshot_equiv(c, k.k-&gt;p.snapshot);</div><div class='del'>-</div><div class='del'>-	if (!bkey_eq(k.k-&gt;p, *last_pos))</div><div class='del'>-		equiv_seen-&gt;nr = 0;</div><div class='del'>-	*last_pos = k.k-&gt;p;</div><div class='del'>-</div><div class='del'>-	if (snapshot_list_has_id(deleted, k.k-&gt;p.snapshot) ||</div><div class='del'>-	    snapshot_list_has_id(equiv_seen, equiv)) {</div><div class='del'>-		return bch2_btree_delete_at(trans, iter,</div><div class='del'>-					    BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-	} else {</div><div class='del'>-		return snapshot_list_add(c, equiv_seen, equiv);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int move_key_to_correct_snapshot(struct btree_trans *trans,</div><div class='del'>-			       struct btree_iter *iter,</div><div class='del'>-			       struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u32 equiv = bch2_snapshot_equiv(c, k.k-&gt;p.snapshot);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When we have a linear chain of snapshot nodes, we consider</div><div class='del'>-	 * those to form an equivalence class: we're going to collapse</div><div class='del'>-	 * them all down to a single node, and keep the leaf-most node -</div><div class='del'>-	 * which has the same id as the equivalence class id.</div><div class='del'>-	 *</div><div class='del'>-	 * If there are multiple keys in different snapshots at the same</div><div class='del'>-	 * position, we're only going to keep the one in the newest</div><div class='del'>-	 * snapshot - the rest have been overwritten and are redundant,</div><div class='del'>-	 * and for the key we're going to keep we need to move it to the</div><div class='del'>-	 * equivalance class ID if it's not there already.</div><div class='del'>-	 */</div><div class='del'>-	if (equiv != k.k-&gt;p.snapshot) {</div><div class='del'>-		struct bkey_i *new = bch2_bkey_make_mut_noupdate(trans, k);</div><div class='del'>-		struct btree_iter new_iter;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(new);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		new-&gt;k.p.snapshot = equiv;</div><div class='del'>-</div><div class='del'>-		bch2_trans_iter_init(trans, &amp;new_iter, iter-&gt;btree_id, new-&gt;k.p,</div><div class='del'>-				     BTREE_ITER_ALL_SNAPSHOTS|</div><div class='del'>-				     BTREE_ITER_CACHED|</div><div class='del'>-				     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-		ret =   bch2_btree_iter_traverse(&amp;new_iter) ?:</div><div class='del'>-			bch2_trans_update(trans, &amp;new_iter, new,</div><div class='del'>-					BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?:</div><div class='del'>-			bch2_btree_delete_at(trans, iter,</div><div class='del'>-					BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);</div><div class='del'>-		bch2_trans_iter_exit(trans, &amp;new_iter);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_snapshot_needs_delete(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_snapshot snap;</div><div class='del'>-	u32 children[2];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_snapshot)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	snap = bkey_s_c_to_snapshot(k);</div><div class='del'>-	if (BCH_SNAPSHOT_DELETED(snap.v) ||</div><div class='del'>-	    BCH_SNAPSHOT_SUBVOL(snap.v))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	children[0] = le32_to_cpu(snap.v-&gt;children[0]);</div><div class='del'>-	children[1] = le32_to_cpu(snap.v-&gt;children[1]);</div><div class='del'>-</div><div class='del'>-	ret   = bch2_snapshot_live(trans, children[0]) ?:</div><div class='del'>-		bch2_snapshot_live(trans, children[1]);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return !ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For a given snapshot, if it doesn't have a subvolume that points to it, and</div><div class='del'>- * it doesn't have child snapshot nodes - it's now redundant and we can mark it</div><div class='del'>- * as deleted.</div><div class='del'>- */</div><div class='del'>-static int bch2_delete_redundant_snapshot(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_snapshot_needs_delete(trans, k);</div><div class='del'>-</div><div class='del'>-	return ret &lt;= 0</div><div class='del'>-		? ret</div><div class='del'>-		: bch2_snapshot_node_set_deleted(trans, k.k-&gt;p.offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_nth_parent_skip(struct bch_fs *c, u32 id, u32 n,</div><div class='del'>-						snapshot_id_list *skip)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	while (snapshot_list_has_id(skip, id))</div><div class='del'>-		id = __bch2_snapshot_parent(c, id);</div><div class='del'>-</div><div class='del'>-	while (n--) {</div><div class='del'>-		do {</div><div class='del'>-			id = __bch2_snapshot_parent(c, id);</div><div class='del'>-		} while (snapshot_list_has_id(skip, id));</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fix_child_of_deleted_snapshot(struct btree_trans *trans,</div><div class='del'>-					      struct btree_iter *iter, struct bkey_s_c k,</div><div class='del'>-					      snapshot_id_list *deleted)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	u32 nr_deleted_ancestors = 0;</div><div class='del'>-	struct bkey_i_snapshot *s;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_snapshot)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (snapshot_list_has_id(deleted, k.k-&gt;p.offset))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	s = bch2_bkey_make_mut_noupdate_typed(trans, k, snapshot);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(s);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	darray_for_each(*deleted, i)</div><div class='del'>-		nr_deleted_ancestors += bch2_snapshot_is_ancestor(c, s-&gt;k.p.offset, *i);</div><div class='del'>-</div><div class='del'>-	if (!nr_deleted_ancestors)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	le32_add_cpu(&amp;s-&gt;v.depth, -nr_deleted_ancestors);</div><div class='del'>-</div><div class='del'>-	if (!s-&gt;v.depth) {</div><div class='del'>-		s-&gt;v.skip[0] = 0;</div><div class='del'>-		s-&gt;v.skip[1] = 0;</div><div class='del'>-		s-&gt;v.skip[2] = 0;</div><div class='del'>-	} else {</div><div class='del'>-		u32 depth = le32_to_cpu(s-&gt;v.depth);</div><div class='del'>-		u32 parent = bch2_snapshot_parent(c, s-&gt;k.p.offset);</div><div class='del'>-</div><div class='del'>-		for (unsigned j = 0; j &lt; ARRAY_SIZE(s-&gt;v.skip); j++) {</div><div class='del'>-			u32 id = le32_to_cpu(s-&gt;v.skip[j]);</div><div class='del'>-</div><div class='del'>-			if (snapshot_list_has_id(deleted, id)) {</div><div class='del'>-				id = bch2_snapshot_nth_parent_skip(c,</div><div class='del'>-							parent,</div><div class='del'>-							depth &gt; 1</div><div class='del'>-							? get_random_u32_below(depth - 1)</div><div class='del'>-							: 0,</div><div class='del'>-							deleted);</div><div class='del'>-				s-&gt;v.skip[j] = cpu_to_le32(id);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bubble_sort(s-&gt;v.skip, ARRAY_SIZE(s-&gt;v.skip), cmp_le32);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update(trans, iter, &amp;s-&gt;k_i, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_delete_dead_snapshots(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	snapshot_id_list deleted = { 0 };</div><div class='del'>-	snapshot_id_list deleted_interior = { 0 };</div><div class='del'>-	u32 id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!test_and_clear_bit(BCH_FS_need_delete_dead_snapshots, &amp;c-&gt;flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags)) {</div><div class='del'>-		ret = bch2_fs_read_write_early(c);</div><div class='del'>-		bch_err_msg(c, ret, "deleting dead snapshots: error going rw");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For every snapshot node: If we have no live children and it's not</div><div class='del'>-	 * pointed to by a subvolume, delete it:</div><div class='del'>-	 */</div><div class='del'>-	ret = for_each_btree_key_commit(trans, iter, BTREE_ID_snapshots,</div><div class='del'>-			POS_MIN, 0, k,</div><div class='del'>-			NULL, NULL, 0,</div><div class='del'>-		bch2_delete_redundant_snapshot(trans, k));</div><div class='del'>-	bch_err_msg(c, ret, "deleting redundant snapshots");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots,</div><div class='del'>-				 POS_MIN, 0, k,</div><div class='del'>-		bch2_snapshot_set_equiv(trans, k));</div><div class='del'>-	bch_err_msg(c, ret, "in bch2_snapshots_set_equiv");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots,</div><div class='del'>-				 POS_MIN, 0, k, ({</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_snapshot)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		BCH_SNAPSHOT_DELETED(bkey_s_c_to_snapshot(k).v)</div><div class='del'>-			? snapshot_list_add(c, &amp;deleted, k.k-&gt;p.offset)</div><div class='del'>-			: 0;</div><div class='del'>-	}));</div><div class='del'>-	bch_err_msg(c, ret, "walking snapshots");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; BTREE_ID_NR; id++) {</div><div class='del'>-		struct bpos last_pos = POS_MIN;</div><div class='del'>-		snapshot_id_list equiv_seen = { 0 };</div><div class='del'>-		struct disk_reservation res = { 0 };</div><div class='del'>-</div><div class='del'>-		if (!btree_type_has_snapshots(id))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * deleted inodes btree is maintained by a trigger on the inodes</div><div class='del'>-		 * btree - no work for us to do here, and it's not safe to scan</div><div class='del'>-		 * it because we'll see out of date keys due to the btree write</div><div class='del'>-		 * buffer:</div><div class='del'>-		 */</div><div class='del'>-		if (id == BTREE_ID_deleted_inodes)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = for_each_btree_key_commit(trans, iter,</div><div class='del'>-				id, POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				&amp;res, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			snapshot_delete_key(trans, &amp;iter, k, &amp;deleted, &amp;equiv_seen, &amp;last_pos)) ?:</div><div class='del'>-		      for_each_btree_key_commit(trans, iter,</div><div class='del'>-				id, POS_MIN,</div><div class='del'>-				BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,</div><div class='del'>-				&amp;res, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			move_key_to_correct_snapshot(trans, &amp;iter, k));</div><div class='del'>-</div><div class='del'>-		bch2_disk_reservation_put(c, &amp;res);</div><div class='del'>-		darray_exit(&amp;equiv_seen);</div><div class='del'>-</div><div class='del'>-		bch_err_msg(c, ret, "deleting keys from dying snapshots");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-	down_write(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-</div><div class='del'>-	ret = for_each_btree_key(trans, iter, BTREE_ID_snapshots,</div><div class='del'>-				 POS_MIN, 0, k, ({</div><div class='del'>-		u32 snapshot = k.k-&gt;p.offset;</div><div class='del'>-		u32 equiv = bch2_snapshot_equiv(c, snapshot);</div><div class='del'>-</div><div class='del'>-		equiv != snapshot</div><div class='del'>-			? snapshot_list_add(c, &amp;deleted_interior, snapshot)</div><div class='del'>-			: 0;</div><div class='del'>-	}));</div><div class='del'>-</div><div class='del'>-	bch_err_msg(c, ret, "walking snapshots");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_create_lock;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Fixing children of deleted snapshots can't be done completely</div><div class='del'>-	 * atomically, if we crash between here and when we delete the interior</div><div class='del'>-	 * nodes some depth fields will be off:</div><div class='del'>-	 */</div><div class='del'>-	ret = for_each_btree_key_commit(trans, iter, BTREE_ID_snapshots, POS_MIN,</div><div class='del'>-				  BTREE_ITER_INTENT, k,</div><div class='del'>-				  NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-		bch2_fix_child_of_deleted_snapshot(trans, &amp;iter, k, &amp;deleted_interior));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_create_lock;</div><div class='del'>-</div><div class='del'>-	darray_for_each(deleted, i) {</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_snapshot_node_delete(trans, *i));</div><div class='del'>-		bch_err_msg(c, ret, "deleting snapshot %u", *i);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_create_lock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	darray_for_each(deleted_interior, i) {</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_snapshot_node_delete(trans, *i));</div><div class='del'>-		bch_err_msg(c, ret, "deleting snapshot %u", *i);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_create_lock;</div><div class='del'>-	}</div><div class='del'>-err_create_lock:</div><div class='del'>-	up_write(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-err:</div><div class='del'>-	darray_exit(&amp;deleted_interior);</div><div class='del'>-	darray_exit(&amp;deleted);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_delete_dead_snapshots_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work, struct bch_fs, snapshot_delete_work);</div><div class='del'>-</div><div class='del'>-	bch2_delete_dead_snapshots(c);</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_delete_dead_snapshots);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_delete_dead_snapshots_async(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (bch2_write_ref_tryget(c, BCH_WRITE_REF_delete_dead_snapshots) &amp;&amp;</div><div class='del'>-	    !queue_work(c-&gt;write_ref_wq, &amp;c-&gt;snapshot_delete_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_delete_dead_snapshots);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_key_has_snapshot_overwrites(struct btree_trans *trans,</div><div class='del'>-				       enum btree_id id,</div><div class='del'>-				       struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, id, pos,</div><div class='del'>-			     BTREE_ITER_NOT_EXTENTS|</div><div class='del'>-			     BTREE_ITER_ALL_SNAPSHOTS);</div><div class='del'>-	while (1) {</div><div class='del'>-		k = bch2_btree_iter_prev(&amp;iter);</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!k.k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!bkey_eq(pos, k.k-&gt;p))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (bch2_snapshot_is_ancestor(c, k.k-&gt;p.snapshot, pos.snapshot)) {</div><div class='del'>-			ret = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_smallest_child(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	const struct snapshot_t *s = snapshot_t(c, id);</div><div class='del'>-</div><div class='del'>-	return s-&gt;children[1] ?: s-&gt;children[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 bch2_snapshot_smallest_descendent(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	u32 child;</div><div class='del'>-</div><div class='del'>-	while ((child = bch2_snapshot_smallest_child(c, id)))</div><div class='del'>-		id = child;</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_propagate_key_to_snapshot_leaf(struct btree_trans *trans,</div><div class='del'>-					       enum btree_id btree,</div><div class='del'>-					       struct bkey_s_c interior_k,</div><div class='del'>-					       u32 leaf_id, struct bpos *new_min_pos)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bpos pos = interior_k.k-&gt;p;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i *new;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	pos.snapshot = leaf_id;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, btree, pos, BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* key already overwritten in this snapshot? */</div><div class='del'>-	if (k.k-&gt;p.snapshot != interior_k.k-&gt;p.snapshot)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (bpos_eq(*new_min_pos, POS_MIN)) {</div><div class='del'>-		*new_min_pos = k.k-&gt;p;</div><div class='del'>-		new_min_pos-&gt;snapshot = leaf_id;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new = bch2_bkey_make_mut_noupdate(trans, interior_k);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(new);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	new-&gt;k.p.snapshot = leaf_id;</div><div class='del'>-	ret = bch2_trans_update(trans, &amp;iter, new, 0);</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_propagate_key_to_snapshot_leaves(struct btree_trans *trans,</div><div class='del'>-					  enum btree_id btree,</div><div class='del'>-					  struct bkey_s_c k,</div><div class='del'>-					  struct bpos *new_min_pos)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_buf sk;</div><div class='del'>-	u32 restart_count = trans-&gt;restart_count;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_init(&amp;sk);</div><div class='del'>-	bch2_bkey_buf_reassemble(&amp;sk, c, k);</div><div class='del'>-	k = bkey_i_to_s_c(sk.k);</div><div class='del'>-</div><div class='del'>-	*new_min_pos = POS_MIN;</div><div class='del'>-</div><div class='del'>-	for (u32 id = bch2_snapshot_smallest_descendent(c, k.k-&gt;p.snapshot);</div><div class='del'>-	     id &lt; k.k-&gt;p.snapshot;</div><div class='del'>-	     id++) {</div><div class='del'>-		if (!bch2_snapshot_is_ancestor(c, id, k.k-&gt;p.snapshot) ||</div><div class='del'>-		    !bch2_snapshot_is_leaf(c, id))</div><div class='del'>-			continue;</div><div class='del'>-again:</div><div class='del'>-		ret =   btree_trans_too_many_iters(trans) ?:</div><div class='del'>-			bch2_propagate_key_to_snapshot_leaf(trans, btree, k, id, new_min_pos) ?:</div><div class='del'>-			bch2_trans_commit(trans, NULL, NULL, 0);</div><div class='del'>-		if (ret &amp;&amp; bch2_err_matches(ret, BCH_ERR_transaction_restart)) {</div><div class='del'>-			bch2_trans_begin(trans);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_bkey_buf_exit(&amp;sk, c);</div><div class='del'>-</div><div class='del'>-	return ret ?: trans_was_restarted(trans, restart_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_check_snapshot_needs_deletion(struct btree_trans *trans, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c_snapshot snap;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_snapshot)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	snap = bkey_s_c_to_snapshot(k);</div><div class='del'>-	if (BCH_SNAPSHOT_DELETED(snap.v) ||</div><div class='del'>-	    bch2_snapshot_equiv(c, k.k-&gt;p.offset) != k.k-&gt;p.offset ||</div><div class='del'>-	    (ret = bch2_snapshot_needs_delete(trans, k)) &gt; 0) {</div><div class='del'>-		set_bit(BCH_FS_need_delete_dead_snapshots, &amp;c-&gt;flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshots_read(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_snapshots,</div><div class='del'>-				   POS_MIN, 0, k,</div><div class='del'>-			__bch2_mark_snapshot(trans, BTREE_ID_snapshots, 0, bkey_s_c_null, k, 0) ?:</div><div class='del'>-			bch2_snapshot_set_equiv(trans, k) ?:</div><div class='del'>-			bch2_check_snapshot_needs_deletion(trans, k)) ?:</div><div class='del'>-		for_each_btree_key(trans, iter, BTREE_ID_snapshots,</div><div class='del'>-				   POS_MIN, 0, k,</div><div class='del'>-			   (set_is_ancestor_bitmap(c, k.k-&gt;p.offset), 0)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_snapshots_exit(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	kvfree(rcu_dereference_protected(c-&gt;snapshots, true));</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/snapshot.h b/fs/bcachefs/snapshot.h<br/>deleted file mode 100644<br/>index 7c66ffc06385..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/snapshot.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/snapshot.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,264 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SNAPSHOT_H</div><div class='del'>-#define _BCACHEFS_SNAPSHOT_H</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-</div><div class='del'>-void bch2_snapshot_tree_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-int bch2_snapshot_tree_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			       enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_snapshot_tree ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_snapshot_tree_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_snapshot_tree_to_text,		\</div><div class='del'>-	.min_val_size	= 8,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-struct bkey_i_snapshot_tree *__bch2_snapshot_tree_create(struct btree_trans *);</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_tree_lookup(struct btree_trans *, u32, struct bch_snapshot_tree *);</div><div class='del'>-</div><div class='del'>-void bch2_snapshot_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-int bch2_snapshot_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			  enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-int bch2_mark_snapshot(struct btree_trans *, enum btree_id, unsigned,</div><div class='del'>-		       struct bkey_s_c, struct bkey_s, unsigned);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_snapshot ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_snapshot_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_snapshot_to_text,		\</div><div class='del'>-	.trigger	= bch2_mark_snapshot,			\</div><div class='del'>-	.min_val_size	= 24,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline struct snapshot_t *__snapshot_t(struct snapshot_table *t, u32 id)</div><div class='del'>-{</div><div class='del'>-	return &amp;t-&gt;s[U32_MAX - id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline const struct snapshot_t *snapshot_t(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return __snapshot_t(rcu_dereference(c-&gt;snapshots), id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_tree(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	id = snapshot_t(c, id)-&gt;tree;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 __bch2_snapshot_parent_early(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return snapshot_t(c, id)-&gt;parent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_parent_early(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	id = __bch2_snapshot_parent_early(c, id);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 __bch2_snapshot_parent(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-	u32 parent = snapshot_t(c, id)-&gt;parent;</div><div class='del'>-</div><div class='del'>-	if (parent &amp;&amp;</div><div class='del'>-	    snapshot_t(c, id)-&gt;depth != snapshot_t(c, parent)-&gt;depth + 1)</div><div class='del'>-		panic("id %u depth=%u parent %u depth=%u\n",</div><div class='del'>-		      id, snapshot_t(c, id)-&gt;depth,</div><div class='del'>-		      parent, snapshot_t(c, parent)-&gt;depth);</div><div class='del'>-</div><div class='del'>-	return parent;</div><div class='del'>-#else</div><div class='del'>-	return snapshot_t(c, id)-&gt;parent;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_parent(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	id = __bch2_snapshot_parent(c, id);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_nth_parent(struct bch_fs *c, u32 id, u32 n)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	while (n--)</div><div class='del'>-		id = __bch2_snapshot_parent(c, id);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 bch2_snapshot_skiplist_get(struct bch_fs *, u32);</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_root(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	u32 parent;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	while ((parent = __bch2_snapshot_parent(c, id)))</div><div class='del'>-		id = parent;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 __bch2_snapshot_equiv(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return snapshot_t(c, id)-&gt;equiv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_equiv(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	id = __bch2_snapshot_equiv(c, id);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_snapshot_is_equiv(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return id == bch2_snapshot_equiv(c, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_snapshot_is_internal_node(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	const struct snapshot_t *s;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	s = snapshot_t(c, id);</div><div class='del'>-	ret = s-&gt;children[0];</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_is_leaf(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	return !bch2_snapshot_is_internal_node(c, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_sibling(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	const struct snapshot_t *s;</div><div class='del'>-	u32 parent = __bch2_snapshot_parent(c, id);</div><div class='del'>-</div><div class='del'>-	if (!parent)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	s = snapshot_t(c, __bch2_snapshot_parent(c, id));</div><div class='del'>-	if (id == s-&gt;children[0])</div><div class='del'>-		return s-&gt;children[1];</div><div class='del'>-	if (id == s-&gt;children[1])</div><div class='del'>-		return s-&gt;children[0];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 bch2_snapshot_depth(struct bch_fs *c, u32 parent)</div><div class='del'>-{</div><div class='del'>-	u32 depth;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	depth = parent ? snapshot_t(c, parent)-&gt;depth + 1 : 0;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return depth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool __bch2_snapshot_is_ancestor(struct bch_fs *, u32, u32);</div><div class='del'>-</div><div class='del'>-static inline bool bch2_snapshot_is_ancestor(struct bch_fs *c, u32 id, u32 ancestor)</div><div class='del'>-{</div><div class='del'>-	return id == ancestor</div><div class='del'>-		? true</div><div class='del'>-		: __bch2_snapshot_is_ancestor(c, id, ancestor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_snapshot_has_children(struct bch_fs *c, u32 id)</div><div class='del'>-{</div><div class='del'>-	const struct snapshot_t *t;</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	t = snapshot_t(c, id);</div><div class='del'>-	ret = (t-&gt;children[0]|t-&gt;children[1]) != 0;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool snapshot_list_has_id(snapshot_id_list *s, u32 id)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(*s, i)</div><div class='del'>-		if (*i == id)</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool snapshot_list_has_ancestor(struct bch_fs *c, snapshot_id_list *s, u32 id)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(*s, i)</div><div class='del'>-		if (bch2_snapshot_is_ancestor(c, id, *i))</div><div class='del'>-			return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int snapshot_list_add(struct bch_fs *c, snapshot_id_list *s, u32 id)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(snapshot_list_has_id(s, id));</div><div class='del'>-	ret = darray_push(s, id);</div><div class='del'>-	if (ret)</div><div class='del'>-		bch_err(c, "error reallocating snapshot_id_list (size %zu)", s-&gt;size);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_lookup(struct btree_trans *trans, u32 id,</div><div class='del'>-			 struct bch_snapshot *s);</div><div class='del'>-int bch2_snapshot_get_subvol(struct btree_trans *, u32,</div><div class='del'>-			     struct bch_subvolume *);</div><div class='del'>-</div><div class='del'>-/* only exported for tests: */</div><div class='del'>-int bch2_snapshot_node_create(struct btree_trans *, u32,</div><div class='del'>-			      u32 *, u32 *, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_check_snapshot_trees(struct bch_fs *);</div><div class='del'>-int bch2_check_snapshots(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_node_set_deleted(struct btree_trans *, u32);</div><div class='del'>-void bch2_delete_dead_snapshots_work(struct work_struct *);</div><div class='del'>-</div><div class='del'>-int __bch2_key_has_snapshot_overwrites(struct btree_trans *, enum btree_id, struct bpos);</div><div class='del'>-</div><div class='del'>-static inline int bch2_key_has_snapshot_overwrites(struct btree_trans *trans,</div><div class='del'>-					  enum btree_id id,</div><div class='del'>-					  struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	if (!btree_type_has_snapshots(id) ||</div><div class='del'>-	    bch2_snapshot_is_leaf(trans-&gt;c, pos.snapshot))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return __bch2_key_has_snapshot_overwrites(trans, id, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_propagate_key_to_snapshot_leaves(struct btree_trans *, enum btree_id,</div><div class='del'>-					  struct bkey_s_c, struct bpos *);</div><div class='del'>-</div><div class='del'>-int bch2_snapshots_read(struct bch_fs *);</div><div class='del'>-void bch2_fs_snapshots_exit(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SNAPSHOT_H */</div><div class='head'>diff --git a/fs/bcachefs/snapshot_format.h b/fs/bcachefs/snapshot_format.h<br/>deleted file mode 100644<br/>index aabcd3a74cd9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/snapshot_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/snapshot_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SNAPSHOT_FORMAT_H</div><div class='del'>-#define _BCACHEFS_SNAPSHOT_FORMAT_H</div><div class='del'>-</div><div class='del'>-struct bch_snapshot {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le32			flags;</div><div class='del'>-	__le32			parent;</div><div class='del'>-	__le32			children[2];</div><div class='del'>-	__le32			subvol;</div><div class='del'>-	/* corresponds to a bch_snapshot_tree in BTREE_ID_snapshot_trees */</div><div class='del'>-	__le32			tree;</div><div class='del'>-	__le32			depth;</div><div class='del'>-	__le32			skip[3];</div><div class='del'>-	bch_le128		btime;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(BCH_SNAPSHOT_DELETED,	struct bch_snapshot, flags,  0,  1)</div><div class='del'>-</div><div class='del'>-/* True if a subvolume points to this snapshot node: */</div><div class='del'>-LE32_BITMASK(BCH_SNAPSHOT_SUBVOL,	struct bch_snapshot, flags,  1,  2)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Snapshot trees:</div><div class='del'>- *</div><div class='del'>- * The snapshot_trees btree gives us persistent indentifier for each tree of</div><div class='del'>- * bch_snapshot nodes, and allow us to record and easily find the root/master</div><div class='del'>- * subvolume that other snapshots were created from:</div><div class='del'>- */</div><div class='del'>-struct bch_snapshot_tree {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le32			master_subvol;</div><div class='del'>-	__le32			root_snapshot;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SNAPSHOT_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/str_hash.h b/fs/bcachefs/str_hash.h<br/>deleted file mode 100644<br/>index 89fdb7c21134..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/str_hash.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/str_hash.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,381 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_STR_HASH_H</div><div class='del'>-#define _BCACHEFS_STR_HASH_H</div><div class='del'>-</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "siphash.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/crc32c.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-#include &lt;crypto/sha2.h&gt;</div><div class='del'>-</div><div class='del'>-typedef unsigned __bitwise bch_str_hash_flags_t;</div><div class='del'>-</div><div class='del'>-enum bch_str_hash_flags {</div><div class='del'>-	__BCH_HASH_SET_MUST_CREATE,</div><div class='del'>-	__BCH_HASH_SET_MUST_REPLACE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BCH_HASH_SET_MUST_CREATE	(__force bch_str_hash_flags_t) BIT(__BCH_HASH_SET_MUST_CREATE)</div><div class='del'>-#define BCH_HASH_SET_MUST_REPLACE	(__force bch_str_hash_flags_t) BIT(__BCH_HASH_SET_MUST_REPLACE)</div><div class='del'>-</div><div class='del'>-static inline enum bch_str_hash_type</div><div class='del'>-bch2_str_hash_opt_to_type(struct bch_fs *c, enum bch_str_hash_opts opt)</div><div class='del'>-{</div><div class='del'>-	switch (opt) {</div><div class='del'>-	case BCH_STR_HASH_OPT_crc32c:</div><div class='del'>-		return BCH_STR_HASH_crc32c;</div><div class='del'>-	case BCH_STR_HASH_OPT_crc64:</div><div class='del'>-		return BCH_STR_HASH_crc64;</div><div class='del'>-	case BCH_STR_HASH_OPT_siphash:</div><div class='del'>-		return c-&gt;sb.features &amp; (1ULL &lt;&lt; BCH_FEATURE_new_siphash)</div><div class='del'>-			? BCH_STR_HASH_siphash</div><div class='del'>-			: BCH_STR_HASH_siphash_old;</div><div class='del'>-	default:</div><div class='del'>-	     BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_hash_info {</div><div class='del'>-	u8			type;</div><div class='del'>-	/*</div><div class='del'>-	 * For crc32 or crc64 string hashes the first key value of</div><div class='del'>-	 * the siphash_key (k0) is used as the key.</div><div class='del'>-	 */</div><div class='del'>-	SIPHASH_KEY	siphash_key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct bch_hash_info</div><div class='del'>-bch2_hash_info_init(struct bch_fs *c, const struct bch_inode_unpacked *bi)</div><div class='del'>-{</div><div class='del'>-	/* XXX ick */</div><div class='del'>-	struct bch_hash_info info = {</div><div class='del'>-		.type = (bi-&gt;bi_flags &gt;&gt; INODE_STR_HASH_OFFSET) &amp;</div><div class='del'>-			~(~0U &lt;&lt; INODE_STR_HASH_BITS),</div><div class='del'>-		.siphash_key = { .k0 = bi-&gt;bi_hash_seed }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (unlikely(info.type == BCH_STR_HASH_siphash_old)) {</div><div class='del'>-		SHASH_DESC_ON_STACK(desc, c-&gt;sha256);</div><div class='del'>-		u8 digest[SHA256_DIGEST_SIZE];</div><div class='del'>-</div><div class='del'>-		desc-&gt;tfm = c-&gt;sha256;</div><div class='del'>-</div><div class='del'>-		crypto_shash_digest(desc, (void *) &amp;bi-&gt;bi_hash_seed,</div><div class='del'>-				    sizeof(bi-&gt;bi_hash_seed), digest);</div><div class='del'>-		memcpy(&amp;info.siphash_key, digest, sizeof(info.siphash_key));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_str_hash_ctx {</div><div class='del'>-	union {</div><div class='del'>-		u32		crc32c;</div><div class='del'>-		u64		crc64;</div><div class='del'>-		SIPHASH_CTX	siphash;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void bch2_str_hash_init(struct bch_str_hash_ctx *ctx,</div><div class='del'>-				     const struct bch_hash_info *info)</div><div class='del'>-{</div><div class='del'>-	switch (info-&gt;type) {</div><div class='del'>-	case BCH_STR_HASH_crc32c:</div><div class='del'>-		ctx-&gt;crc32c = crc32c(~0, &amp;info-&gt;siphash_key.k0,</div><div class='del'>-				     sizeof(info-&gt;siphash_key.k0));</div><div class='del'>-		break;</div><div class='del'>-	case BCH_STR_HASH_crc64:</div><div class='del'>-		ctx-&gt;crc64 = crc64_be(~0, &amp;info-&gt;siphash_key.k0,</div><div class='del'>-				      sizeof(info-&gt;siphash_key.k0));</div><div class='del'>-		break;</div><div class='del'>-	case BCH_STR_HASH_siphash_old:</div><div class='del'>-	case BCH_STR_HASH_siphash:</div><div class='del'>-		SipHash24_Init(&amp;ctx-&gt;siphash, &amp;info-&gt;siphash_key);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_str_hash_update(struct bch_str_hash_ctx *ctx,</div><div class='del'>-				       const struct bch_hash_info *info,</div><div class='del'>-				       const void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	switch (info-&gt;type) {</div><div class='del'>-	case BCH_STR_HASH_crc32c:</div><div class='del'>-		ctx-&gt;crc32c = crc32c(ctx-&gt;crc32c, data, len);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_STR_HASH_crc64:</div><div class='del'>-		ctx-&gt;crc64 = crc64_be(ctx-&gt;crc64, data, len);</div><div class='del'>-		break;</div><div class='del'>-	case BCH_STR_HASH_siphash_old:</div><div class='del'>-	case BCH_STR_HASH_siphash:</div><div class='del'>-		SipHash24_Update(&amp;ctx-&gt;siphash, data, len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 bch2_str_hash_end(struct bch_str_hash_ctx *ctx,</div><div class='del'>-				   const struct bch_hash_info *info)</div><div class='del'>-{</div><div class='del'>-	switch (info-&gt;type) {</div><div class='del'>-	case BCH_STR_HASH_crc32c:</div><div class='del'>-		return ctx-&gt;crc32c;</div><div class='del'>-	case BCH_STR_HASH_crc64:</div><div class='del'>-		return ctx-&gt;crc64 &gt;&gt; 1;</div><div class='del'>-	case BCH_STR_HASH_siphash_old:</div><div class='del'>-	case BCH_STR_HASH_siphash:</div><div class='del'>-		return SipHash24_End(&amp;ctx-&gt;siphash) &gt;&gt; 1;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_hash_desc {</div><div class='del'>-	enum btree_id	btree_id;</div><div class='del'>-	u8		key_type;</div><div class='del'>-</div><div class='del'>-	u64		(*hash_key)(const struct bch_hash_info *, const void *);</div><div class='del'>-	u64		(*hash_bkey)(const struct bch_hash_info *, struct bkey_s_c);</div><div class='del'>-	bool		(*cmp_key)(struct bkey_s_c, const void *);</div><div class='del'>-	bool		(*cmp_bkey)(struct bkey_s_c, struct bkey_s_c);</div><div class='del'>-	bool		(*is_visible)(subvol_inum inum, struct bkey_s_c);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool is_visible_key(struct bch_hash_desc desc, subvol_inum inum, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	return k.k-&gt;type == desc.key_type &amp;&amp;</div><div class='del'>-		(!desc.is_visible ||</div><div class='del'>-		 !inum.inum ||</div><div class='del'>-		 desc.is_visible(inum, k));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int</div><div class='del'>-bch2_hash_lookup(struct btree_trans *trans,</div><div class='del'>-		 struct btree_iter *iter,</div><div class='del'>-		 const struct bch_hash_desc desc,</div><div class='del'>-		 const struct bch_hash_info *info,</div><div class='del'>-		 subvol_inum inum, const void *key,</div><div class='del'>-		 unsigned flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, *iter, desc.btree_id,</div><div class='del'>-			   SPOS(inum.inum, desc.hash_key(info, key), snapshot),</div><div class='del'>-			   POS(inum.inum, U64_MAX),</div><div class='del'>-			   BTREE_ITER_SLOTS|flags, k, ret) {</div><div class='del'>-		if (is_visible_key(desc, inum, k)) {</div><div class='del'>-			if (!desc.cmp_key(k, key))</div><div class='del'>-				return 0;</div><div class='del'>-		} else if (k.k-&gt;type == KEY_TYPE_hash_whiteout) {</div><div class='del'>-			;</div><div class='del'>-		} else {</div><div class='del'>-			/* hole, not found */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	bch2_trans_iter_exit(trans, iter);</div><div class='del'>-</div><div class='del'>-	return ret ?: -BCH_ERR_ENOENT_str_hash_lookup;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int</div><div class='del'>-bch2_hash_hole(struct btree_trans *trans,</div><div class='del'>-	       struct btree_iter *iter,</div><div class='del'>-	       const struct bch_hash_desc desc,</div><div class='del'>-	       const struct bch_hash_info *info,</div><div class='del'>-	       subvol_inum inum, const void *key)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, *iter, desc.btree_id,</div><div class='del'>-			   SPOS(inum.inum, desc.hash_key(info, key), snapshot),</div><div class='del'>-			   POS(inum.inum, U64_MAX),</div><div class='del'>-			   BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret)</div><div class='del'>-		if (!is_visible_key(desc, inum, k))</div><div class='del'>-			return 0;</div><div class='del'>-	bch2_trans_iter_exit(trans, iter);</div><div class='del'>-</div><div class='del'>-	return ret ?: -BCH_ERR_ENOSPC_str_hash_create;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline</div><div class='del'>-int bch2_hash_needs_whiteout(struct btree_trans *trans,</div><div class='del'>-			     const struct bch_hash_desc desc,</div><div class='del'>-			     const struct bch_hash_info *info,</div><div class='del'>-			     struct btree_iter *start)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_trans_copy_iter(&amp;iter, start);</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_advance(&amp;iter);</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_continue_norestart(iter, BTREE_ITER_SLOTS, k, ret) {</div><div class='del'>-		if (k.k-&gt;type != desc.key_type &amp;&amp;</div><div class='del'>-		    k.k-&gt;type != KEY_TYPE_hash_whiteout)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type == desc.key_type &amp;&amp;</div><div class='del'>-		    desc.hash_bkey(info, k) &lt;= start-&gt;pos.offset) {</div><div class='del'>-			ret = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline</div><div class='del'>-int bch2_hash_set_snapshot(struct btree_trans *trans,</div><div class='del'>-			   const struct bch_hash_desc desc,</div><div class='del'>-			   const struct bch_hash_info *info,</div><div class='del'>-			   subvol_inum inum, u32 snapshot,</div><div class='del'>-			   struct bkey_i *insert,</div><div class='del'>-			   bch_str_hash_flags_t str_hash_flags,</div><div class='del'>-			   int update_flags)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter, slot = { NULL };</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	bool found = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, iter, desc.btree_id,</div><div class='del'>-			   SPOS(insert-&gt;k.p.inode,</div><div class='del'>-				desc.hash_bkey(info, bkey_i_to_s_c(insert)),</div><div class='del'>-				snapshot),</div><div class='del'>-			   POS(insert-&gt;k.p.inode, U64_MAX),</div><div class='del'>-			   BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) {</div><div class='del'>-		if (is_visible_key(desc, inum, k)) {</div><div class='del'>-			if (!desc.cmp_bkey(k, bkey_i_to_s_c(insert)))</div><div class='del'>-				goto found;</div><div class='del'>-</div><div class='del'>-			/* hash collision: */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!slot.path &amp;&amp;</div><div class='del'>-		    !(str_hash_flags &amp; BCH_HASH_SET_MUST_REPLACE))</div><div class='del'>-			bch2_trans_copy_iter(&amp;slot, &amp;iter);</div><div class='del'>-</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_hash_whiteout)</div><div class='del'>-			goto not_found;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_str_hash_create;</div><div class='del'>-out:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;slot);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-found:</div><div class='del'>-	found = true;</div><div class='del'>-not_found:</div><div class='del'>-</div><div class='del'>-	if (!found &amp;&amp; (str_hash_flags &amp; BCH_HASH_SET_MUST_REPLACE)) {</div><div class='del'>-		ret = -BCH_ERR_ENOENT_str_hash_set_must_replace;</div><div class='del'>-	} else if (found &amp;&amp; (str_hash_flags &amp; BCH_HASH_SET_MUST_CREATE)) {</div><div class='del'>-		ret = -EEXIST;</div><div class='del'>-	} else {</div><div class='del'>-		if (!found &amp;&amp; slot.path)</div><div class='del'>-			swap(iter, slot);</div><div class='del'>-</div><div class='del'>-		insert-&gt;k.p = iter.pos;</div><div class='del'>-		ret = bch2_trans_update(trans, &amp;iter, insert, update_flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline</div><div class='del'>-int bch2_hash_set(struct btree_trans *trans,</div><div class='del'>-		  const struct bch_hash_desc desc,</div><div class='del'>-		  const struct bch_hash_info *info,</div><div class='del'>-		  subvol_inum inum,</div><div class='del'>-		  struct bkey_i *insert,</div><div class='del'>-		  bch_str_hash_flags_t str_hash_flags)</div><div class='del'>-{</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	insert-&gt;k.p.inode = inum.inum;</div><div class='del'>-</div><div class='del'>-	return bch2_hash_set_snapshot(trans, desc, info, inum,</div><div class='del'>-				      snapshot, insert, str_hash_flags, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline</div><div class='del'>-int bch2_hash_delete_at(struct btree_trans *trans,</div><div class='del'>-			const struct bch_hash_desc desc,</div><div class='del'>-			const struct bch_hash_info *info,</div><div class='del'>-			struct btree_iter *iter,</div><div class='del'>-			unsigned update_flags)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i *delete;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	delete = bch2_trans_kmalloc(trans, sizeof(*delete));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(delete);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_needs_whiteout(trans, desc, info, iter);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bkey_init(&amp;delete-&gt;k);</div><div class='del'>-	delete-&gt;k.p = iter-&gt;pos;</div><div class='del'>-	delete-&gt;k.type = ret ? KEY_TYPE_hash_whiteout : KEY_TYPE_deleted;</div><div class='del'>-</div><div class='del'>-	return bch2_trans_update(trans, iter, delete, update_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline</div><div class='del'>-int bch2_hash_delete(struct btree_trans *trans,</div><div class='del'>-		     const struct bch_hash_desc desc,</div><div class='del'>-		     const struct bch_hash_info *info,</div><div class='del'>-		     subvol_inum inum, const void *key)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_lookup(trans, &amp;iter, desc, info, inum, key,</div><div class='del'>-				BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_delete_at(trans, desc, info, &amp;iter, 0);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_STR_HASH_H */</div><div class='head'>diff --git a/fs/bcachefs/subvolume.c b/fs/bcachefs/subvolume.c<br/>deleted file mode 100644<br/>index 7c67c28d3ef8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/subvolume.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,444 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='del'>-static int bch2_subvolume_delete(struct btree_trans *, u32);</div><div class='del'>-</div><div class='del'>-static int check_subvol(struct btree_trans *trans,</div><div class='del'>-			struct btree_iter *iter,</div><div class='del'>-			struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct bkey_s_c_subvolume subvol;</div><div class='del'>-	struct bch_snapshot snapshot;</div><div class='del'>-	unsigned snapid;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_subvolume)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	subvol = bkey_s_c_to_subvolume(k);</div><div class='del'>-	snapid = le32_to_cpu(subvol.v-&gt;snapshot);</div><div class='del'>-	ret = bch2_snapshot_lookup(trans, snapid, &amp;snapshot);</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		bch_err(c, "subvolume %llu points to nonexistent snapshot %u",</div><div class='del'>-			k.k-&gt;p.offset, snapid);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (BCH_SUBVOLUME_UNLINKED(subvol.v)) {</div><div class='del'>-		ret = bch2_subvolume_delete(trans, iter-&gt;pos.offset);</div><div class='del'>-		bch_err_msg(c, ret, "deleting subvolume %llu", iter-&gt;pos.offset);</div><div class='del'>-		return ret ?: -BCH_ERR_transaction_restart_nested;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!BCH_SUBVOLUME_SNAP(subvol.v)) {</div><div class='del'>-		u32 snapshot_root = bch2_snapshot_root(c, le32_to_cpu(subvol.v-&gt;snapshot));</div><div class='del'>-		u32 snapshot_tree;</div><div class='del'>-		struct bch_snapshot_tree st;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		snapshot_tree = snapshot_t(c, snapshot_root)-&gt;tree;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		ret = bch2_snapshot_tree_lookup(trans, snapshot_tree, &amp;st);</div><div class='del'>-</div><div class='del'>-		bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-				"%s: snapshot tree %u not found", __func__, snapshot_tree);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (fsck_err_on(le32_to_cpu(st.master_subvol) != subvol.k-&gt;p.offset,</div><div class='del'>-				c, subvol_not_master_and_not_snapshot,</div><div class='del'>-				"subvolume %llu is not set as snapshot but is not master subvolume",</div><div class='del'>-				k.k-&gt;p.offset)) {</div><div class='del'>-			struct bkey_i_subvolume *s =</div><div class='del'>-				bch2_bkey_make_mut_typed(trans, iter, &amp;subvol.s_c, 0, subvolume);</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(s);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			SET_BCH_SUBVOLUME_SNAP(&amp;s-&gt;v, true);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_check_subvols(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-				BTREE_ID_subvolumes, POS_MIN, BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			check_subvol(trans, &amp;iter, k)));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Subvolumes: */</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-			   enum bkey_invalid_flags flags, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_lt(k.k-&gt;p, SUBVOL_POS_MIN) ||</div><div class='del'>-			 bkey_gt(k.k-&gt;p, SUBVOL_POS_MAX), c, err,</div><div class='del'>-			 subvol_pos_bad,</div><div class='del'>-			 "invalid pos");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_subvolume_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			    struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_subvolume s = bkey_s_c_to_subvolume(k);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "root %llu snapshot id %u",</div><div class='del'>-		   le64_to_cpu(s.v-&gt;inode),</div><div class='del'>-		   le32_to_cpu(s.v-&gt;snapshot));</div><div class='del'>-</div><div class='del'>-	if (bkey_val_bytes(s.k) &gt; offsetof(struct bch_subvolume, parent))</div><div class='del'>-		prt_printf(out, " parent %u", le32_to_cpu(s.v-&gt;parent));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int</div><div class='del'>-bch2_subvolume_get_inlined(struct btree_trans *trans, unsigned subvol,</div><div class='del'>-			   bool inconsistent_if_not_found,</div><div class='del'>-			   int iter_flags,</div><div class='del'>-			   struct bch_subvolume *s)</div><div class='del'>-{</div><div class='del'>-	int ret = bch2_bkey_get_val_typed(trans, BTREE_ID_subvolumes, POS(0, subvol),</div><div class='del'>-					  iter_flags, subvolume, s);</div><div class='del'>-	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT) &amp;&amp;</div><div class='del'>-				inconsistent_if_not_found,</div><div class='del'>-				trans-&gt;c, "missing subvolume %u", subvol);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_get(struct btree_trans *trans, unsigned subvol,</div><div class='del'>-		       bool inconsistent_if_not_found,</div><div class='del'>-		       int iter_flags,</div><div class='del'>-		       struct bch_subvolume *s)</div><div class='del'>-{</div><div class='del'>-	return bch2_subvolume_get_inlined(trans, subvol, inconsistent_if_not_found, iter_flags, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_subvol_is_ro_trans(struct btree_trans *trans, u32 subvol)</div><div class='del'>-{</div><div class='del'>-	struct bch_subvolume s;</div><div class='del'>-	int ret = bch2_subvolume_get_inlined(trans, subvol, true, 0, &amp;s);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (BCH_SUBVOLUME_RO(&amp;s))</div><div class='del'>-		return -EROFS;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_subvol_is_ro(struct bch_fs *c, u32 subvol)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		bch2_subvol_is_ro_trans(trans, subvol));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_snapshot_get_subvol(struct btree_trans *trans, u32 snapshot,</div><div class='del'>-			     struct bch_subvolume *subvol)</div><div class='del'>-{</div><div class='del'>-	struct bch_snapshot snap;</div><div class='del'>-</div><div class='del'>-	return  bch2_snapshot_lookup(trans, snapshot, &amp;snap) ?:</div><div class='del'>-		bch2_subvolume_get(trans, le32_to_cpu(snap.subvol), true, 0, subvol);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,</div><div class='del'>-				u32 *snapid)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c_subvolume subvol;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	subvol = bch2_bkey_get_iter_typed(trans, &amp;iter,</div><div class='del'>-					  BTREE_ID_subvolumes, POS(0, subvolid),</div><div class='del'>-					  BTREE_ITER_CACHED|BTREE_ITER_WITH_UPDATES,</div><div class='del'>-					  subvolume);</div><div class='del'>-	ret = bkey_err(subvol);</div><div class='del'>-	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans-&gt;c,</div><div class='del'>-				"missing subvolume %u", subvolid);</div><div class='del'>-</div><div class='del'>-	if (likely(!ret))</div><div class='del'>-		*snapid = le32_to_cpu(subvol.v-&gt;snapshot);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_subvolume_reparent(struct btree_trans *trans,</div><div class='del'>-				   struct btree_iter *iter,</div><div class='del'>-				   struct bkey_s_c k,</div><div class='del'>-				   u32 old_parent, u32 new_parent)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_subvolume *s;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (k.k-&gt;type != KEY_TYPE_subvolume)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bkey_val_bytes(k.k) &gt; offsetof(struct bch_subvolume, parent) &amp;&amp;</div><div class='del'>-	    le32_to_cpu(bkey_s_c_to_subvolume(k).v-&gt;parent) != old_parent)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	s = bch2_bkey_make_mut_typed(trans, iter, &amp;k, 0, subvolume);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(s);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	s-&gt;v.parent = cpu_to_le32(new_parent);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Separate from the snapshot tree in the snapshots btree, we record the tree</div><div class='del'>- * structure of how snapshot subvolumes were created - the parent subvolume of</div><div class='del'>- * each snapshot subvolume.</div><div class='del'>- *</div><div class='del'>- * When a subvolume is deleted, we scan for child subvolumes and reparant them,</div><div class='del'>- * to avoid dangling references:</div><div class='del'>- */</div><div class='del'>-static int bch2_subvolumes_reparent(struct btree_trans *trans, u32 subvolid_to_delete)</div><div class='del'>-{</div><div class='del'>-	struct bch_subvolume s;</div><div class='del'>-</div><div class='del'>-	return lockrestart_do(trans,</div><div class='del'>-			bch2_subvolume_get(trans, subvolid_to_delete, true,</div><div class='del'>-				   BTREE_ITER_CACHED, &amp;s)) ?:</div><div class='del'>-		for_each_btree_key_commit(trans, iter,</div><div class='del'>-				BTREE_ID_subvolumes, POS_MIN, BTREE_ITER_PREFETCH, k,</div><div class='del'>-				NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			bch2_subvolume_reparent(trans, &amp;iter, k,</div><div class='del'>-					subvolid_to_delete, le32_to_cpu(s.parent)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Delete subvolume, mark snapshot ID as deleted, queue up snapshot</div><div class='del'>- * deletion/cleanup:</div><div class='del'>- */</div><div class='del'>-static int __bch2_subvolume_delete(struct btree_trans *trans, u32 subvolid)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c_subvolume subvol;</div><div class='del'>-	u32 snapid;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	subvol = bch2_bkey_get_iter_typed(trans, &amp;iter,</div><div class='del'>-				BTREE_ID_subvolumes, POS(0, subvolid),</div><div class='del'>-				BTREE_ITER_CACHED|BTREE_ITER_INTENT,</div><div class='del'>-				subvolume);</div><div class='del'>-	ret = bkey_err(subvol);</div><div class='del'>-	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans-&gt;c,</div><div class='del'>-				"missing subvolume %u", subvolid);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	snapid = le32_to_cpu(subvol.v-&gt;snapshot);</div><div class='del'>-</div><div class='del'>-	ret =   bch2_btree_delete_at(trans, &amp;iter, 0) ?:</div><div class='del'>-		bch2_snapshot_node_set_deleted(trans, snapid);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_subvolume_delete(struct btree_trans *trans, u32 subvolid)</div><div class='del'>-{</div><div class='del'>-	return bch2_subvolumes_reparent(trans, subvolid) ?:</div><div class='del'>-		commit_do(trans, NULL, NULL, BCH_TRANS_COMMIT_no_enospc,</div><div class='del'>-			  __bch2_subvolume_delete(trans, subvolid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_subvolume_wait_for_pagecache_and_delete(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(work, struct bch_fs,</div><div class='del'>-				snapshot_wait_for_pagecache_and_delete_work);</div><div class='del'>-	snapshot_id_list s;</div><div class='del'>-	u32 *id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	while (!ret) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;snapshots_unlinked_lock);</div><div class='del'>-		s = c-&gt;snapshots_unlinked;</div><div class='del'>-		darray_init(&amp;c-&gt;snapshots_unlinked);</div><div class='del'>-		mutex_unlock(&amp;c-&gt;snapshots_unlinked_lock);</div><div class='del'>-</div><div class='del'>-		if (!s.nr)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bch2_evict_subvolume_inodes(c, &amp;s);</div><div class='del'>-</div><div class='del'>-		for (id = s.data; id &lt; s.data + s.nr; id++) {</div><div class='del'>-			ret = bch2_trans_run(c, bch2_subvolume_delete(trans, *id));</div><div class='del'>-			bch_err_msg(c, ret, "deleting subvolume %u", *id);</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		darray_exit(&amp;s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_snapshot_delete_pagecache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct subvolume_unlink_hook {</div><div class='del'>-	struct btree_trans_commit_hook	h;</div><div class='del'>-	u32				subvol;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_subvolume_wait_for_pagecache_and_delete_hook(struct btree_trans *trans,</div><div class='del'>-						      struct btree_trans_commit_hook *_h)</div><div class='del'>-{</div><div class='del'>-	struct subvolume_unlink_hook *h = container_of(_h, struct subvolume_unlink_hook, h);</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;snapshots_unlinked_lock);</div><div class='del'>-	if (!snapshot_list_has_id(&amp;c-&gt;snapshots_unlinked, h-&gt;subvol))</div><div class='del'>-		ret = snapshot_list_add(c, &amp;c-&gt;snapshots_unlinked, h-&gt;subvol);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;snapshots_unlinked_lock);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_snapshot_delete_pagecache))</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	if (!queue_work(c-&gt;write_ref_wq, &amp;c-&gt;snapshot_wait_for_pagecache_and_delete_work))</div><div class='del'>-		bch2_write_ref_put(c, BCH_WRITE_REF_snapshot_delete_pagecache);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_unlink(struct btree_trans *trans, u32 subvolid)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_subvolume *n;</div><div class='del'>-	struct subvolume_unlink_hook *h;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	h = bch2_trans_kmalloc(trans, sizeof(*h));</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(h);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	h-&gt;h.fn		= bch2_subvolume_wait_for_pagecache_and_delete_hook;</div><div class='del'>-	h-&gt;subvol	= subvolid;</div><div class='del'>-	bch2_trans_commit_hook(trans, &amp;h-&gt;h);</div><div class='del'>-</div><div class='del'>-	n = bch2_bkey_get_mut_typed(trans, &amp;iter,</div><div class='del'>-			BTREE_ID_subvolumes, POS(0, subvolid),</div><div class='del'>-			BTREE_ITER_CACHED, subvolume);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(n);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans-&gt;c,</div><div class='del'>-					"missing subvolume %u", subvolid);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SET_BCH_SUBVOLUME_UNLINKED(&amp;n-&gt;v, true);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_create(struct btree_trans *trans, u64 inode,</div><div class='del'>-			  u32 src_subvolid,</div><div class='del'>-			  u32 *new_subvolid,</div><div class='del'>-			  u32 *new_snapshotid,</div><div class='del'>-			  bool ro)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter dst_iter, src_iter = (struct btree_iter) { NULL };</div><div class='del'>-	struct bkey_i_subvolume *new_subvol = NULL;</div><div class='del'>-	struct bkey_i_subvolume *src_subvol = NULL;</div><div class='del'>-	u32 parent = 0, new_nodes[2], snapshot_subvols[2];</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_bkey_get_empty_slot(trans, &amp;dst_iter,</div><div class='del'>-				BTREE_ID_subvolumes, POS(0, U32_MAX));</div><div class='del'>-	if (ret == -BCH_ERR_ENOSPC_btree_slot)</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_subvolume_create;</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	snapshot_subvols[0] = dst_iter.pos.offset;</div><div class='del'>-	snapshot_subvols[1] = src_subvolid;</div><div class='del'>-</div><div class='del'>-	if (src_subvolid) {</div><div class='del'>-		/* Creating a snapshot: */</div><div class='del'>-</div><div class='del'>-		src_subvol = bch2_bkey_get_mut_typed(trans, &amp;src_iter,</div><div class='del'>-				BTREE_ID_subvolumes, POS(0, src_subvolid),</div><div class='del'>-				BTREE_ITER_CACHED, subvolume);</div><div class='del'>-		ret = PTR_ERR_OR_ZERO(src_subvol);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), c,</div><div class='del'>-						"subvolume %u not found", src_subvolid);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		parent = le32_to_cpu(src_subvol-&gt;v.snapshot);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_snapshot_node_create(trans, parent, new_nodes,</div><div class='del'>-					snapshot_subvols,</div><div class='del'>-					src_subvolid ? 2 : 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (src_subvolid) {</div><div class='del'>-		src_subvol-&gt;v.snapshot = cpu_to_le32(new_nodes[1]);</div><div class='del'>-		ret = bch2_trans_update(trans, &amp;src_iter, &amp;src_subvol-&gt;k_i, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_subvol = bch2_bkey_alloc(trans, &amp;dst_iter, 0, subvolume);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(new_subvol);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	new_subvol-&gt;v.flags	= 0;</div><div class='del'>-	new_subvol-&gt;v.snapshot	= cpu_to_le32(new_nodes[0]);</div><div class='del'>-	new_subvol-&gt;v.inode	= cpu_to_le64(inode);</div><div class='del'>-	new_subvol-&gt;v.parent	= cpu_to_le32(src_subvolid);</div><div class='del'>-	new_subvol-&gt;v.otime.lo	= cpu_to_le64(bch2_current_time(c));</div><div class='del'>-	new_subvol-&gt;v.otime.hi	= 0;</div><div class='del'>-</div><div class='del'>-	SET_BCH_SUBVOLUME_RO(&amp;new_subvol-&gt;v, ro);</div><div class='del'>-	SET_BCH_SUBVOLUME_SNAP(&amp;new_subvol-&gt;v, src_subvolid != 0);</div><div class='del'>-</div><div class='del'>-	*new_subvolid	= new_subvol-&gt;k.p.offset;</div><div class='del'>-	*new_snapshotid	= new_nodes[0];</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;src_iter);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;dst_iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_subvolumes_init(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	INIT_WORK(&amp;c-&gt;snapshot_delete_work, bch2_delete_dead_snapshots_work);</div><div class='del'>-	INIT_WORK(&amp;c-&gt;snapshot_wait_for_pagecache_and_delete_work,</div><div class='del'>-		  bch2_subvolume_wait_for_pagecache_and_delete);</div><div class='del'>-	mutex_init(&amp;c-&gt;snapshots_unlinked_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/subvolume.h b/fs/bcachefs/subvolume.h<br/>deleted file mode 100644<br/>index a6f56f66e27c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/subvolume.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SUBVOLUME_H</div><div class='del'>-#define _BCACHEFS_SUBVOLUME_H</div><div class='del'>-</div><div class='del'>-#include "darray.h"</div><div class='del'>-#include "subvolume_types.h"</div><div class='del'>-</div><div class='del'>-enum bkey_invalid_flags;</div><div class='del'>-</div><div class='del'>-int bch2_check_subvols(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-			   enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_subvolume_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_subvolume ((struct bkey_ops) {		\</div><div class='del'>-	.key_invalid	= bch2_subvolume_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_subvolume_to_text,		\</div><div class='del'>-	.min_val_size	= 16,					\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_get(struct btree_trans *, unsigned,</div><div class='del'>-		       bool, int, struct bch_subvolume *);</div><div class='del'>-int bch2_subvolume_get_snapshot(struct btree_trans *, u32, u32 *);</div><div class='del'>-</div><div class='del'>-int bch2_subvol_is_ro_trans(struct btree_trans *, u32);</div><div class='del'>-int bch2_subvol_is_ro(struct bch_fs *, u32);</div><div class='del'>-</div><div class='del'>-int bch2_delete_dead_snapshots(struct bch_fs *);</div><div class='del'>-void bch2_delete_dead_snapshots_async(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_subvolume_unlink(struct btree_trans *, u32);</div><div class='del'>-int bch2_subvolume_create(struct btree_trans *, u64, u32,</div><div class='del'>-			  u32 *, u32 *, bool);</div><div class='del'>-</div><div class='del'>-int bch2_fs_subvolumes_init(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SUBVOLUME_H */</div><div class='head'>diff --git a/fs/bcachefs/subvolume_format.h b/fs/bcachefs/subvolume_format.h<br/>deleted file mode 100644<br/>index af79134b07d6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/subvolume_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SUBVOLUME_FORMAT_H</div><div class='del'>-#define _BCACHEFS_SUBVOLUME_FORMAT_H</div><div class='del'>-</div><div class='del'>-#define SUBVOL_POS_MIN		POS(0, 1)</div><div class='del'>-#define SUBVOL_POS_MAX		POS(0, S32_MAX)</div><div class='del'>-#define BCACHEFS_ROOT_SUBVOL	1</div><div class='del'>-</div><div class='del'>-struct bch_subvolume {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__le32			flags;</div><div class='del'>-	__le32			snapshot;</div><div class='del'>-	__le64			inode;</div><div class='del'>-	/*</div><div class='del'>-	 * Snapshot subvolumes form a tree, separate from the snapshot nodes</div><div class='del'>-	 * tree - if this subvolume is a snapshot, this is the ID of the</div><div class='del'>-	 * subvolume it was created from:</div><div class='del'>-	 *</div><div class='del'>-	 * This is _not_ necessarily the subvolume of the directory containing</div><div class='del'>-	 * this subvolume:</div><div class='del'>-	 */</div><div class='del'>-	__le32			parent;</div><div class='del'>-	__le32			pad;</div><div class='del'>-	bch_le128		otime;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-LE32_BITMASK(BCH_SUBVOLUME_RO,		struct bch_subvolume, flags,  0,  1)</div><div class='del'>-/*</div><div class='del'>- * We need to know whether a subvolume is a snapshot so we can know whether we</div><div class='del'>- * can delete it (or whether it should just be rm -rf'd)</div><div class='del'>- */</div><div class='del'>-LE32_BITMASK(BCH_SUBVOLUME_SNAP,	struct bch_subvolume, flags,  1,  2)</div><div class='del'>-LE32_BITMASK(BCH_SUBVOLUME_UNLINKED,	struct bch_subvolume, flags,  2,  3)</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SUBVOLUME_FORMAT_H */</div><div class='head'>diff --git a/fs/bcachefs/subvolume_types.h b/fs/bcachefs/subvolume_types.h<br/>deleted file mode 100644<br/>index ae644adfc391..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/subvolume_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/subvolume_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SUBVOLUME_TYPES_H</div><div class='del'>-#define _BCACHEFS_SUBVOLUME_TYPES_H</div><div class='del'>-</div><div class='del'>-#include "darray.h"</div><div class='del'>-</div><div class='del'>-typedef DARRAY(u32) snapshot_id_list;</div><div class='del'>-</div><div class='del'>-#define IS_ANCESTOR_BITMAP	128</div><div class='del'>-</div><div class='del'>-struct snapshot_t {</div><div class='del'>-	u32			parent;</div><div class='del'>-	u32			skip[3];</div><div class='del'>-	u32			depth;</div><div class='del'>-	u32			children[2];</div><div class='del'>-	u32			subvol; /* Nonzero only if a subvolume points to this node: */</div><div class='del'>-	u32			tree;</div><div class='del'>-	u32			equiv;</div><div class='del'>-	unsigned long		is_ancestor[BITS_TO_LONGS(IS_ANCESTOR_BITMAP)];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct snapshot_table {</div><div class='del'>-#ifndef RUST_BINDGEN</div><div class='del'>-	DECLARE_FLEX_ARRAY(struct snapshot_t, s);</div><div class='del'>-#else</div><div class='del'>-	struct snapshot_t	s[0];</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	u32		subvol;</div><div class='del'>-	u64		inum;</div><div class='del'>-} subvol_inum;</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SUBVOLUME_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c<br/>deleted file mode 100644<br/>index ce8cf2d91f84..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/super-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super-io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1394 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_sb.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "sb-clean.h"</div><div class='del'>-#include "sb-counters.h"</div><div class='del'>-#include "sb-downgrade.h"</div><div class='del'>-#include "sb-errors.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-#include "vstructs.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct blk_holder_ops bch2_sb_handle_bdev_ops = {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch2_metadata_version {</div><div class='del'>-	u16		version;</div><div class='del'>-	const char	*name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct bch2_metadata_version bch2_metadata_versions[] = {</div><div class='del'>-#define x(n, v) {		\</div><div class='del'>-	.version = v,				\</div><div class='del'>-	.name = #n,				\</div><div class='del'>-},</div><div class='del'>-	BCH_METADATA_VERSIONS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_version_to_text(struct printbuf *out, unsigned v)</div><div class='del'>-{</div><div class='del'>-	const char *str = "(unknown version)";</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(bch2_metadata_versions); i++)</div><div class='del'>-		if (bch2_metadata_versions[i].version == v) {</div><div class='del'>-			str = bch2_metadata_versions[i].name;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%u.%u: %s", BCH_VERSION_MAJOR(v), BCH_VERSION_MINOR(v), str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned bch2_latest_compatible_version(unsigned v)</div><div class='del'>-{</div><div class='del'>-	if (!BCH_VERSION_MAJOR(v))</div><div class='del'>-		return v;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(bch2_metadata_versions); i++)</div><div class='del'>-		if (bch2_metadata_versions[i].version &gt; v &amp;&amp;</div><div class='del'>-		    BCH_VERSION_MAJOR(bch2_metadata_versions[i].version) ==</div><div class='del'>-		    BCH_VERSION_MAJOR(v))</div><div class='del'>-			v = bch2_metadata_versions[i].version;</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char * const bch2_sb_fields[] = {</div><div class='del'>-#define x(name, nr)	#name,</div><div class='del'>-	BCH_SB_FIELDS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_sb_field_validate(struct bch_sb *, struct bch_sb_field *,</div><div class='del'>-				  struct printbuf *);</div><div class='del'>-</div><div class='del'>-struct bch_sb_field *bch2_sb_field_get_id(struct bch_sb *sb,</div><div class='del'>-				      enum bch_sb_field_type type)</div><div class='del'>-{</div><div class='del'>-	/* XXX: need locking around superblock to access optional fields */</div><div class='del'>-</div><div class='del'>-	vstruct_for_each(sb, f)</div><div class='del'>-		if (le32_to_cpu(f-&gt;type) == type)</div><div class='del'>-			return f;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_sb_field *__bch2_sb_field_resize(struct bch_sb_handle *sb,</div><div class='del'>-						   struct bch_sb_field *f,</div><div class='del'>-						   unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	unsigned old_u64s = f ? le32_to_cpu(f-&gt;u64s) : 0;</div><div class='del'>-	unsigned sb_u64s = le32_to_cpu(sb-&gt;sb-&gt;u64s) + u64s - old_u64s;</div><div class='del'>-</div><div class='del'>-	BUG_ON(__vstruct_bytes(struct bch_sb, sb_u64s) &gt; sb-&gt;buffer_size);</div><div class='del'>-</div><div class='del'>-	if (!f &amp;&amp; !u64s) {</div><div class='del'>-		/* nothing to do: */</div><div class='del'>-	} else if (!f) {</div><div class='del'>-		f = vstruct_last(sb-&gt;sb);</div><div class='del'>-		memset(f, 0, sizeof(u64) * u64s);</div><div class='del'>-		f-&gt;u64s = cpu_to_le32(u64s);</div><div class='del'>-		f-&gt;type = 0;</div><div class='del'>-	} else {</div><div class='del'>-		void *src, *dst;</div><div class='del'>-</div><div class='del'>-		src = vstruct_end(f);</div><div class='del'>-</div><div class='del'>-		if (u64s) {</div><div class='del'>-			f-&gt;u64s = cpu_to_le32(u64s);</div><div class='del'>-			dst = vstruct_end(f);</div><div class='del'>-		} else {</div><div class='del'>-			dst = f;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memmove(dst, src, vstruct_end(sb-&gt;sb) - src);</div><div class='del'>-</div><div class='del'>-		if (dst &gt; src)</div><div class='del'>-			memset(src, 0, dst - src);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;sb-&gt;u64s = cpu_to_le32(sb_u64s);</div><div class='del'>-</div><div class='del'>-	return u64s ? f : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_field_delete(struct bch_sb_handle *sb,</div><div class='del'>-			  enum bch_sb_field_type type)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field *f = bch2_sb_field_get_id(sb-&gt;sb, type);</div><div class='del'>-</div><div class='del'>-	if (f)</div><div class='del'>-		__bch2_sb_field_resize(sb, f, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Superblock realloc/free: */</div><div class='del'>-</div><div class='del'>-void bch2_free_super(struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	kfree(sb-&gt;bio);</div><div class='del'>-	if (!IS_ERR_OR_NULL(sb-&gt;s_bdev_file))</div><div class='del'>-		fput(sb-&gt;s_bdev_file);</div><div class='del'>-	kfree(sb-&gt;holder);</div><div class='del'>-	kfree(sb-&gt;sb_name);</div><div class='del'>-</div><div class='del'>-	kfree(sb-&gt;sb);</div><div class='del'>-	memset(sb, 0, sizeof(*sb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_realloc(struct bch_sb_handle *sb, unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	size_t new_bytes = __vstruct_bytes(struct bch_sb, u64s);</div><div class='del'>-	size_t new_buffer_size;</div><div class='del'>-	struct bch_sb *new_sb;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;bdev)</div><div class='del'>-		new_bytes = max_t(size_t, new_bytes, bdev_logical_block_size(sb-&gt;bdev));</div><div class='del'>-</div><div class='del'>-	new_buffer_size = roundup_pow_of_two(new_bytes);</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;sb &amp;&amp; sb-&gt;buffer_size &gt;= new_buffer_size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;sb &amp;&amp; sb-&gt;have_layout) {</div><div class='del'>-		u64 max_bytes = 512 &lt;&lt; sb-&gt;sb-&gt;layout.sb_max_size_bits;</div><div class='del'>-</div><div class='del'>-		if (new_bytes &gt; max_bytes) {</div><div class='del'>-			struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-			prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-			prt_printf(&amp;buf, ": superblock too big: want %zu but have %llu", new_bytes, max_bytes);</div><div class='del'>-			pr_err("%s", buf.buf);</div><div class='del'>-			printbuf_exit(&amp;buf);</div><div class='del'>-			return -BCH_ERR_ENOSPC_sb;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;buffer_size &gt;= new_buffer_size &amp;&amp; sb-&gt;sb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (dynamic_fault("bcachefs:add:super_realloc"))</div><div class='del'>-		return -BCH_ERR_ENOMEM_sb_realloc_injected;</div><div class='del'>-</div><div class='del'>-	new_sb = krealloc(sb-&gt;sb, new_buffer_size, GFP_NOFS|__GFP_ZERO);</div><div class='del'>-	if (!new_sb)</div><div class='del'>-		return -BCH_ERR_ENOMEM_sb_buf_realloc;</div><div class='del'>-</div><div class='del'>-	sb-&gt;sb = new_sb;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;have_bio) {</div><div class='del'>-		unsigned nr_bvecs = buf_pages(sb-&gt;sb, new_buffer_size);</div><div class='del'>-</div><div class='del'>-		bio = bio_kmalloc(nr_bvecs, GFP_KERNEL);</div><div class='del'>-		if (!bio)</div><div class='del'>-			return -BCH_ERR_ENOMEM_sb_bio_realloc;</div><div class='del'>-</div><div class='del'>-		bio_init(bio, NULL, bio-&gt;bi_inline_vecs, nr_bvecs, 0);</div><div class='del'>-</div><div class='del'>-		kfree(sb-&gt;bio);</div><div class='del'>-		sb-&gt;bio = bio;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;buffer_size = new_buffer_size;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_sb_field *bch2_sb_field_resize_id(struct bch_sb_handle *sb,</div><div class='del'>-					  enum bch_sb_field_type type,</div><div class='del'>-					  unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field *f = bch2_sb_field_get_id(sb-&gt;sb, type);</div><div class='del'>-	ssize_t old_u64s = f ? le32_to_cpu(f-&gt;u64s) : 0;</div><div class='del'>-	ssize_t d = -old_u64s + u64s;</div><div class='del'>-</div><div class='del'>-	if (bch2_sb_realloc(sb, le32_to_cpu(sb-&gt;sb-&gt;u64s) + d))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;fs_sb) {</div><div class='del'>-		struct bch_fs *c = container_of(sb, struct bch_fs, disk_sb);</div><div class='del'>-</div><div class='del'>-		lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-		/* XXX: we're not checking that offline device have enough space */</div><div class='del'>-</div><div class='del'>-		for_each_online_member(c, ca) {</div><div class='del'>-			struct bch_sb_handle *dev_sb = &amp;ca-&gt;disk_sb;</div><div class='del'>-</div><div class='del'>-			if (bch2_sb_realloc(dev_sb, le32_to_cpu(dev_sb-&gt;sb-&gt;u64s) + d)) {</div><div class='del'>-				percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f = bch2_sb_field_get_id(sb-&gt;sb, type);</div><div class='del'>-	f = __bch2_sb_field_resize(sb, f, u64s);</div><div class='del'>-	if (f)</div><div class='del'>-		f-&gt;type = cpu_to_le32(type);</div><div class='del'>-	return f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_sb_field *bch2_sb_field_get_minsize_id(struct bch_sb_handle *sb,</div><div class='del'>-						  enum bch_sb_field_type type,</div><div class='del'>-						  unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field *f = bch2_sb_field_get_id(sb-&gt;sb, type);</div><div class='del'>-</div><div class='del'>-	if (!f || le32_to_cpu(f-&gt;u64s) &lt; u64s)</div><div class='del'>-		f = bch2_sb_field_resize_id(sb, type, u64s);</div><div class='del'>-	return f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Superblock validate: */</div><div class='del'>-</div><div class='del'>-static int validate_sb_layout(struct bch_sb_layout *layout, struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	u64 offset, prev_offset, max_sectors;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct bch_sb_layout) != 512);</div><div class='del'>-</div><div class='del'>-	if (!uuid_equal(&amp;layout-&gt;magic, &amp;BCACHE_MAGIC) &amp;&amp;</div><div class='del'>-	    !uuid_equal(&amp;layout-&gt;magic, &amp;BCHFS_MAGIC)) {</div><div class='del'>-		prt_printf(out, "Not a bcachefs superblock layout");</div><div class='del'>-		return -BCH_ERR_invalid_sb_layout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (layout-&gt;layout_type != 0) {</div><div class='del'>-		prt_printf(out, "Invalid superblock layout type %u",</div><div class='del'>-		       layout-&gt;layout_type);</div><div class='del'>-		return -BCH_ERR_invalid_sb_layout_type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!layout-&gt;nr_superblocks) {</div><div class='del'>-		prt_printf(out, "Invalid superblock layout: no superblocks");</div><div class='del'>-		return -BCH_ERR_invalid_sb_layout_nr_superblocks;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (layout-&gt;nr_superblocks &gt; ARRAY_SIZE(layout-&gt;sb_offset)) {</div><div class='del'>-		prt_printf(out, "Invalid superblock layout: too many superblocks");</div><div class='del'>-		return -BCH_ERR_invalid_sb_layout_nr_superblocks;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	max_sectors = 1 &lt;&lt; layout-&gt;sb_max_size_bits;</div><div class='del'>-</div><div class='del'>-	prev_offset = le64_to_cpu(layout-&gt;sb_offset[0]);</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; layout-&gt;nr_superblocks; i++) {</div><div class='del'>-		offset = le64_to_cpu(layout-&gt;sb_offset[i]);</div><div class='del'>-</div><div class='del'>-		if (offset &lt; prev_offset + max_sectors) {</div><div class='del'>-			prt_printf(out, "Invalid superblock layout: superblocks overlap\n"</div><div class='del'>-			       "  (sb %u ends at %llu next starts at %llu",</div><div class='del'>-			       i - 1, prev_offset + max_sectors, offset);</div><div class='del'>-			return -BCH_ERR_invalid_sb_layout_superblocks_overlap;</div><div class='del'>-		}</div><div class='del'>-		prev_offset = offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_compatible(struct bch_sb *sb, struct printbuf *out)</div><div class='del'>-{</div><div class='del'>-	u16 version		= le16_to_cpu(sb-&gt;version);</div><div class='del'>-	u16 version_min		= le16_to_cpu(sb-&gt;version_min);</div><div class='del'>-</div><div class='del'>-	if (!bch2_version_compatible(version)) {</div><div class='del'>-		prt_str(out, "Unsupported superblock version ");</div><div class='del'>-		bch2_version_to_text(out, version);</div><div class='del'>-		prt_str(out, " (min ");</div><div class='del'>-		bch2_version_to_text(out, bcachefs_metadata_version_min);</div><div class='del'>-		prt_str(out, ", max ");</div><div class='del'>-		bch2_version_to_text(out, bcachefs_metadata_version_current);</div><div class='del'>-		prt_str(out, ")");</div><div class='del'>-		return -BCH_ERR_invalid_sb_version;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_version_compatible(version_min)) {</div><div class='del'>-		prt_str(out, "Unsupported superblock version_min ");</div><div class='del'>-		bch2_version_to_text(out, version_min);</div><div class='del'>-		prt_str(out, " (min ");</div><div class='del'>-		bch2_version_to_text(out, bcachefs_metadata_version_min);</div><div class='del'>-		prt_str(out, ", max ");</div><div class='del'>-		bch2_version_to_text(out, bcachefs_metadata_version_current);</div><div class='del'>-		prt_str(out, ")");</div><div class='del'>-		return -BCH_ERR_invalid_sb_version;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (version_min &gt; version) {</div><div class='del'>-		prt_str(out, "Bad minimum version ");</div><div class='del'>-		bch2_version_to_text(out, version_min);</div><div class='del'>-		prt_str(out, ", greater than version field ");</div><div class='del'>-		bch2_version_to_text(out, version);</div><div class='del'>-		return -BCH_ERR_invalid_sb_version;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,</div><div class='del'>-			    int rw)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb *sb = disk_sb-&gt;sb;</div><div class='del'>-	struct bch_sb_field_members_v1 *mi;</div><div class='del'>-	enum bch_opt_id opt_id;</div><div class='del'>-	u16 block_size;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_compatible(sb, out);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;features[1] ||</div><div class='del'>-	    (le64_to_cpu(sb-&gt;features[0]) &amp; (~0ULL &lt;&lt; BCH_FEATURE_NR))) {</div><div class='del'>-		prt_printf(out, "Filesystem has incompatible features");</div><div class='del'>-		return -BCH_ERR_invalid_sb_features;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	block_size = le16_to_cpu(sb-&gt;block_size);</div><div class='del'>-</div><div class='del'>-	if (block_size &gt; PAGE_SECTORS) {</div><div class='del'>-		prt_printf(out, "Block size too big (got %u, max %u)",</div><div class='del'>-		       block_size, PAGE_SECTORS);</div><div class='del'>-		return -BCH_ERR_invalid_sb_block_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_is_zero(sb-&gt;user_uuid.b, sizeof(sb-&gt;user_uuid))) {</div><div class='del'>-		prt_printf(out, "Bad user UUID (got zeroes)");</div><div class='del'>-		return -BCH_ERR_invalid_sb_uuid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_is_zero(sb-&gt;uuid.b, sizeof(sb-&gt;uuid))) {</div><div class='del'>-		prt_printf(out, "Bad internal UUID (got zeroes)");</div><div class='del'>-		return -BCH_ERR_invalid_sb_uuid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sb-&gt;nr_devices ||</div><div class='del'>-	    sb-&gt;nr_devices &gt; BCH_SB_MEMBERS_MAX) {</div><div class='del'>-		prt_printf(out, "Bad number of member devices %u (max %u)",</div><div class='del'>-		       sb-&gt;nr_devices, BCH_SB_MEMBERS_MAX);</div><div class='del'>-		return -BCH_ERR_invalid_sb_too_many_members;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;dev_idx &gt;= sb-&gt;nr_devices) {</div><div class='del'>-		prt_printf(out, "Bad dev_idx (got %u, nr_devices %u)",</div><div class='del'>-		       sb-&gt;dev_idx, sb-&gt;nr_devices);</div><div class='del'>-		return -BCH_ERR_invalid_sb_dev_idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sb-&gt;time_precision ||</div><div class='del'>-	    le32_to_cpu(sb-&gt;time_precision) &gt; NSEC_PER_SEC) {</div><div class='del'>-		prt_printf(out, "Invalid time precision: %u (min 1, max %lu)",</div><div class='del'>-		       le32_to_cpu(sb-&gt;time_precision), NSEC_PER_SEC);</div><div class='del'>-		return -BCH_ERR_invalid_sb_time_precision;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rw == READ) {</div><div class='del'>-		/*</div><div class='del'>-		 * Been seeing a bug where these are getting inexplicably</div><div class='del'>-		 * zeroed, so we're now validating them, but we have to be</div><div class='del'>-		 * careful not to preven people's filesystems from mounting:</div><div class='del'>-		 */</div><div class='del'>-		if (!BCH_SB_JOURNAL_FLUSH_DELAY(sb))</div><div class='del'>-			SET_BCH_SB_JOURNAL_FLUSH_DELAY(sb, 1000);</div><div class='del'>-		if (!BCH_SB_JOURNAL_RECLAIM_DELAY(sb))</div><div class='del'>-			SET_BCH_SB_JOURNAL_RECLAIM_DELAY(sb, 1000);</div><div class='del'>-</div><div class='del'>-		if (!BCH_SB_VERSION_UPGRADE_COMPLETE(sb))</div><div class='del'>-			SET_BCH_SB_VERSION_UPGRADE_COMPLETE(sb, le16_to_cpu(sb-&gt;version));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (opt_id = 0; opt_id &lt; bch2_opts_nr; opt_id++) {</div><div class='del'>-		const struct bch_option *opt = bch2_opt_table + opt_id;</div><div class='del'>-</div><div class='del'>-		if (opt-&gt;get_sb != BCH2_NO_SB_OPT) {</div><div class='del'>-			u64 v = bch2_opt_from_sb(sb, opt_id);</div><div class='del'>-</div><div class='del'>-			prt_printf(out, "Invalid option ");</div><div class='del'>-			ret = bch2_opt_validate(opt, v, out);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			printbuf_reset(out);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* validate layout */</div><div class='del'>-	ret = validate_sb_layout(&amp;sb-&gt;layout, out);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	vstruct_for_each(sb, f) {</div><div class='del'>-		if (!f-&gt;u64s) {</div><div class='del'>-			prt_printf(out, "Invalid superblock: optional field with size 0 (type %u)",</div><div class='del'>-			       le32_to_cpu(f-&gt;type));</div><div class='del'>-			return -BCH_ERR_invalid_sb_field_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vstruct_next(f) &gt; vstruct_last(sb)) {</div><div class='del'>-			prt_printf(out, "Invalid superblock: optional field extends past end of superblock (type %u)",</div><div class='del'>-			       le32_to_cpu(f-&gt;type));</div><div class='del'>-			return -BCH_ERR_invalid_sb_field_size;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* members must be validated first: */</div><div class='del'>-	mi = bch2_sb_field_get(sb, members_v1);</div><div class='del'>-	if (!mi) {</div><div class='del'>-		prt_printf(out, "Invalid superblock: member info area missing");</div><div class='del'>-		return -BCH_ERR_invalid_sb_members_missing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_field_validate(sb, &amp;mi-&gt;field, out);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	vstruct_for_each(sb, f) {</div><div class='del'>-		if (le32_to_cpu(f-&gt;type) == BCH_SB_FIELD_members_v1)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = bch2_sb_field_validate(sb, f, out);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* device open: */</div><div class='del'>-</div><div class='del'>-static unsigned long le_ulong_to_cpu(unsigned long v)</div><div class='del'>-{</div><div class='del'>-	return sizeof(unsigned long) == 8</div><div class='del'>-		? le64_to_cpu(v)</div><div class='del'>-		: le32_to_cpu(v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void le_bitvector_to_cpu(unsigned long *dst, unsigned long *src, unsigned nr)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(nr &amp; (BITS_PER_TYPE(long) - 1));</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; BITS_TO_LONGS(nr); i++)</div><div class='del'>-		dst[i] = le_ulong_to_cpu(src[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_update(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb *src = c-&gt;disk_sb.sb;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	c-&gt;sb.uuid		= src-&gt;uuid;</div><div class='del'>-	c-&gt;sb.user_uuid		= src-&gt;user_uuid;</div><div class='del'>-	c-&gt;sb.version		= le16_to_cpu(src-&gt;version);</div><div class='del'>-	c-&gt;sb.version_min	= le16_to_cpu(src-&gt;version_min);</div><div class='del'>-	c-&gt;sb.version_upgrade_complete = BCH_SB_VERSION_UPGRADE_COMPLETE(src);</div><div class='del'>-	c-&gt;sb.nr_devices	= src-&gt;nr_devices;</div><div class='del'>-	c-&gt;sb.clean		= BCH_SB_CLEAN(src);</div><div class='del'>-	c-&gt;sb.encryption_type	= BCH_SB_ENCRYPTION_TYPE(src);</div><div class='del'>-</div><div class='del'>-	c-&gt;sb.nsec_per_time_unit = le32_to_cpu(src-&gt;time_precision);</div><div class='del'>-	c-&gt;sb.time_units_per_sec = NSEC_PER_SEC / c-&gt;sb.nsec_per_time_unit;</div><div class='del'>-</div><div class='del'>-	/* XXX this is wrong, we need a 96 or 128 bit integer type */</div><div class='del'>-	c-&gt;sb.time_base_lo	= div_u64(le64_to_cpu(src-&gt;time_base_lo),</div><div class='del'>-					  c-&gt;sb.nsec_per_time_unit);</div><div class='del'>-	c-&gt;sb.time_base_hi	= le32_to_cpu(src-&gt;time_base_hi);</div><div class='del'>-</div><div class='del'>-	c-&gt;sb.features		= le64_to_cpu(src-&gt;features[0]);</div><div class='del'>-	c-&gt;sb.compat		= le64_to_cpu(src-&gt;compat[0]);</div><div class='del'>-</div><div class='del'>-	memset(c-&gt;sb.errors_silent, 0, sizeof(c-&gt;sb.errors_silent));</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field_ext *ext = bch2_sb_field_get(src, ext);</div><div class='del'>-	if (ext)</div><div class='del'>-		le_bitvector_to_cpu(c-&gt;sb.errors_silent, (void *) ext-&gt;errors_silent,</div><div class='del'>-				    sizeof(c-&gt;sb.errors_silent) * 8);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		struct bch_member m = bch2_sb_member_get(src, ca-&gt;dev_idx);</div><div class='del'>-		ca-&gt;mi = bch2_mi_to_cpu(&amp;m);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __copy_super(struct bch_sb_handle *dst_handle, struct bch_sb *src)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field *src_f, *dst_f;</div><div class='del'>-	struct bch_sb *dst = dst_handle-&gt;sb;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	dst-&gt;version		= src-&gt;version;</div><div class='del'>-	dst-&gt;version_min	= src-&gt;version_min;</div><div class='del'>-	dst-&gt;seq		= src-&gt;seq;</div><div class='del'>-	dst-&gt;uuid		= src-&gt;uuid;</div><div class='del'>-	dst-&gt;user_uuid		= src-&gt;user_uuid;</div><div class='del'>-	memcpy(dst-&gt;label,	src-&gt;label, sizeof(dst-&gt;label));</div><div class='del'>-</div><div class='del'>-	dst-&gt;block_size		= src-&gt;block_size;</div><div class='del'>-	dst-&gt;nr_devices		= src-&gt;nr_devices;</div><div class='del'>-</div><div class='del'>-	dst-&gt;time_base_lo	= src-&gt;time_base_lo;</div><div class='del'>-	dst-&gt;time_base_hi	= src-&gt;time_base_hi;</div><div class='del'>-	dst-&gt;time_precision	= src-&gt;time_precision;</div><div class='del'>-	dst-&gt;write_time		= src-&gt;write_time;</div><div class='del'>-</div><div class='del'>-	memcpy(dst-&gt;flags,	src-&gt;flags,	sizeof(dst-&gt;flags));</div><div class='del'>-	memcpy(dst-&gt;features,	src-&gt;features,	sizeof(dst-&gt;features));</div><div class='del'>-	memcpy(dst-&gt;compat,	src-&gt;compat,	sizeof(dst-&gt;compat));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_SB_FIELD_NR; i++) {</div><div class='del'>-		int d;</div><div class='del'>-</div><div class='del'>-		if ((1U &lt;&lt; i) &amp; BCH_SINGLE_DEVICE_SB_FIELDS)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		src_f = bch2_sb_field_get_id(src, i);</div><div class='del'>-		dst_f = bch2_sb_field_get_id(dst, i);</div><div class='del'>-</div><div class='del'>-		d = (src_f ? le32_to_cpu(src_f-&gt;u64s) : 0) -</div><div class='del'>-		    (dst_f ? le32_to_cpu(dst_f-&gt;u64s) : 0);</div><div class='del'>-		if (d &gt; 0) {</div><div class='del'>-			int ret = bch2_sb_realloc(dst_handle,</div><div class='del'>-					le32_to_cpu(dst_handle-&gt;sb-&gt;u64s) + d);</div><div class='del'>-</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			dst = dst_handle-&gt;sb;</div><div class='del'>-			dst_f = bch2_sb_field_get_id(dst, i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dst_f = __bch2_sb_field_resize(dst_handle, dst_f,</div><div class='del'>-				src_f ? le32_to_cpu(src_f-&gt;u64s) : 0);</div><div class='del'>-</div><div class='del'>-		if (src_f)</div><div class='del'>-			memcpy(dst_f, src_f, vstruct_bytes(src_f));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_to_fs(struct bch_fs *c, struct bch_sb *src)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	ret =   bch2_sb_realloc(&amp;c-&gt;disk_sb, 0) ?:</div><div class='del'>-		__copy_super(&amp;c-&gt;disk_sb, src) ?:</div><div class='del'>-		bch2_sb_replicas_to_cpu_replicas(c) ?:</div><div class='del'>-		bch2_sb_disk_groups_to_cpu(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_sb_update(c);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_from_fs(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	return __copy_super(&amp;ca-&gt;disk_sb, c-&gt;disk_sb.sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read superblock: */</div><div class='del'>-</div><div class='del'>-static int read_one_super(struct bch_sb_handle *sb, u64 offset, struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	size_t bytes;</div><div class='del'>-	int ret;</div><div class='del'>-reread:</div><div class='del'>-	bio_reset(sb-&gt;bio, sb-&gt;bdev, REQ_OP_READ|REQ_SYNC|REQ_META);</div><div class='del'>-	sb-&gt;bio-&gt;bi_iter.bi_sector = offset;</div><div class='del'>-	bch2_bio_map(sb-&gt;bio, sb-&gt;sb, sb-&gt;buffer_size);</div><div class='del'>-</div><div class='del'>-	ret = submit_bio_wait(sb-&gt;bio);</div><div class='del'>-	if (ret) {</div><div class='del'>-		prt_printf(err, "IO error: %i", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!uuid_equal(&amp;sb-&gt;sb-&gt;magic, &amp;BCACHE_MAGIC) &amp;&amp;</div><div class='del'>-	    !uuid_equal(&amp;sb-&gt;sb-&gt;magic, &amp;BCHFS_MAGIC)) {</div><div class='del'>-		prt_str(err, "Not a bcachefs superblock (got magic ");</div><div class='del'>-		pr_uuid(err, sb-&gt;sb-&gt;magic.b);</div><div class='del'>-		prt_str(err, ")");</div><div class='del'>-		return -BCH_ERR_invalid_sb_magic;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_compatible(sb-&gt;sb, err);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bytes = vstruct_bytes(sb-&gt;sb);</div><div class='del'>-</div><div class='del'>-	if (bytes &gt; 512 &lt;&lt; sb-&gt;sb-&gt;layout.sb_max_size_bits) {</div><div class='del'>-		prt_printf(err, "Invalid superblock: too big (got %zu bytes, layout max %lu)",</div><div class='del'>-		       bytes, 512UL &lt;&lt; sb-&gt;sb-&gt;layout.sb_max_size_bits);</div><div class='del'>-		return -BCH_ERR_invalid_sb_too_big;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bytes &gt; sb-&gt;buffer_size) {</div><div class='del'>-		ret = bch2_sb_realloc(sb, le32_to_cpu(sb-&gt;sb-&gt;u64s));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		goto reread;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	enum bch_csum_type csum_type = BCH_SB_CSUM_TYPE(sb-&gt;sb);</div><div class='del'>-	if (csum_type &gt;= BCH_CSUM_NR) {</div><div class='del'>-		prt_printf(err, "unknown checksum type %llu", BCH_SB_CSUM_TYPE(sb-&gt;sb));</div><div class='del'>-		return -BCH_ERR_invalid_sb_csum_type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX: verify MACs */</div><div class='del'>-	struct bch_csum csum = csum_vstruct(NULL, csum_type, null_nonce(), sb-&gt;sb);</div><div class='del'>-	if (bch2_crc_cmp(csum, sb-&gt;sb-&gt;csum)) {</div><div class='del'>-		bch2_csum_err_msg(err, csum_type, sb-&gt;sb-&gt;csum, csum);</div><div class='del'>-		return -BCH_ERR_invalid_sb_csum;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;seq = le64_to_cpu(sb-&gt;sb-&gt;seq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_read_super(const char *path, struct bch_opts *opts,</div><div class='del'>-		    struct bch_sb_handle *sb, bool ignore_notbchfs_msg)</div><div class='del'>-{</div><div class='del'>-	u64 offset = opt_get(*opts, sb);</div><div class='del'>-	struct bch_sb_layout layout;</div><div class='del'>-	struct printbuf err = PRINTBUF;</div><div class='del'>-	struct printbuf err2 = PRINTBUF;</div><div class='del'>-	__le64 *i;</div><div class='del'>-	int ret;</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-retry:</div><div class='del'>-#endif</div><div class='del'>-	memset(sb, 0, sizeof(*sb));</div><div class='del'>-	sb-&gt;mode	= BLK_OPEN_READ;</div><div class='del'>-	sb-&gt;have_bio	= true;</div><div class='del'>-	sb-&gt;holder	= kmalloc(1, GFP_KERNEL);</div><div class='del'>-	if (!sb-&gt;holder)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	sb-&gt;sb_name = kstrdup(path, GFP_KERNEL);</div><div class='del'>-	if (!sb-&gt;sb_name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-	if (opt_get(*opts, direct_io) == false)</div><div class='del'>-		sb-&gt;mode |= BLK_OPEN_BUFFERED;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!opt_get(*opts, noexcl))</div><div class='del'>-		sb-&gt;mode |= BLK_OPEN_EXCL;</div><div class='del'>-</div><div class='del'>-	if (!opt_get(*opts, nochanges))</div><div class='del'>-		sb-&gt;mode |= BLK_OPEN_WRITE;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_bdev_file = bdev_file_open_by_path(path, sb-&gt;mode, sb-&gt;holder, &amp;bch2_sb_handle_bdev_ops);</div><div class='del'>-	if (IS_ERR(sb-&gt;s_bdev_file) &amp;&amp;</div><div class='del'>-	    PTR_ERR(sb-&gt;s_bdev_file) == -EACCES &amp;&amp;</div><div class='del'>-	    opt_get(*opts, read_only)) {</div><div class='del'>-		sb-&gt;mode &amp;= ~BLK_OPEN_WRITE;</div><div class='del'>-</div><div class='del'>-		sb-&gt;s_bdev_file = bdev_file_open_by_path(path, sb-&gt;mode, sb-&gt;holder, &amp;bch2_sb_handle_bdev_ops);</div><div class='del'>-		if (!IS_ERR(sb-&gt;s_bdev_file))</div><div class='del'>-			opt_set(*opts, nochanges, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(sb-&gt;s_bdev_file)) {</div><div class='del'>-		ret = PTR_ERR(sb-&gt;s_bdev_file);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	sb-&gt;bdev = file_bdev(sb-&gt;s_bdev_file);</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_realloc(sb, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		prt_printf(&amp;err, "error allocating memory for superblock");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_init_fault("read_super")) {</div><div class='del'>-		prt_printf(&amp;err, "dynamic fault");</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = read_one_super(sb, offset, &amp;err);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto got_super;</div><div class='del'>-</div><div class='del'>-	if (opt_defined(*opts, sb))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	prt_printf(&amp;err2, "bcachefs (%s): error reading default superblock: %s\n",</div><div class='del'>-	       path, err.buf);</div><div class='del'>-	if (ret == -BCH_ERR_invalid_sb_magic &amp;&amp; ignore_notbchfs_msg)</div><div class='del'>-		printk(KERN_INFO "%s", err2.buf);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "%s", err2.buf);</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;err2);</div><div class='del'>-	printbuf_reset(&amp;err);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Error reading primary superblock - read location of backup</div><div class='del'>-	 * superblocks:</div><div class='del'>-	 */</div><div class='del'>-	bio_reset(sb-&gt;bio, sb-&gt;bdev, REQ_OP_READ|REQ_SYNC|REQ_META);</div><div class='del'>-	sb-&gt;bio-&gt;bi_iter.bi_sector = BCH_SB_LAYOUT_SECTOR;</div><div class='del'>-	/*</div><div class='del'>-	 * use sb buffer to read layout, since sb buffer is page aligned but</div><div class='del'>-	 * layout won't be:</div><div class='del'>-	 */</div><div class='del'>-	bch2_bio_map(sb-&gt;bio, sb-&gt;sb, sizeof(struct bch_sb_layout));</div><div class='del'>-</div><div class='del'>-	ret = submit_bio_wait(sb-&gt;bio);</div><div class='del'>-	if (ret) {</div><div class='del'>-		prt_printf(&amp;err, "IO error: %i", ret);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;layout, sb-&gt;sb, sizeof(layout));</div><div class='del'>-	ret = validate_sb_layout(&amp;layout, &amp;err);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = layout.sb_offset;</div><div class='del'>-	     i &lt; layout.sb_offset + layout.nr_superblocks; i++) {</div><div class='del'>-		offset = le64_to_cpu(*i);</div><div class='del'>-</div><div class='del'>-		if (offset == opt_get(*opts, sb))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = read_one_super(sb, offset, &amp;err);</div><div class='del'>-		if (!ret)</div><div class='del'>-			goto got_super;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	goto err;</div><div class='del'>-</div><div class='del'>-got_super:</div><div class='del'>-	if (le16_to_cpu(sb-&gt;sb-&gt;block_size) &lt;&lt; 9 &lt;</div><div class='del'>-	    bdev_logical_block_size(sb-&gt;bdev) &amp;&amp;</div><div class='del'>-	    opt_get(*opts, direct_io)) {</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-		opt_set(*opts, direct_io, false);</div><div class='del'>-		bch2_free_super(sb);</div><div class='del'>-		goto retry;</div><div class='del'>-#endif</div><div class='del'>-		prt_printf(&amp;err, "block size (%u) smaller than device block size (%u)",</div><div class='del'>-		       le16_to_cpu(sb-&gt;sb-&gt;block_size) &lt;&lt; 9,</div><div class='del'>-		       bdev_logical_block_size(sb-&gt;bdev));</div><div class='del'>-		ret = -BCH_ERR_block_size_too_small;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-	sb-&gt;have_layout = true;</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_validate(sb, &amp;err, READ);</div><div class='del'>-	if (ret) {</div><div class='del'>-		printk(KERN_ERR "bcachefs (%s): error validating superblock: %s\n",</div><div class='del'>-		       path, err.buf);</div><div class='del'>-		goto err_no_print;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	printbuf_exit(&amp;err);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	printk(KERN_ERR "bcachefs (%s): error reading superblock: %s\n",</div><div class='del'>-	       path, err.buf);</div><div class='del'>-err_no_print:</div><div class='del'>-	bch2_free_super(sb);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_read_super(const char *path, struct bch_opts *opts,</div><div class='del'>-		    struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	return __bch2_read_super(path, opts, sb, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* provide a silenced version for mount.bcachefs */</div><div class='del'>-</div><div class='del'>-int bch2_read_super_silent(const char *path, struct bch_opts *opts,</div><div class='del'>-		    struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	return __bch2_read_super(path, opts, sb, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write superblock: */</div><div class='del'>-</div><div class='del'>-static void write_super_endio(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = bio-&gt;bi_private;</div><div class='del'>-</div><div class='del'>-	/* XXX: return errors directly */</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_io_err_on(bio-&gt;bi_status, ca,</div><div class='del'>-			       bio_data_dir(bio)</div><div class='del'>-			       ? BCH_MEMBER_ERROR_write</div><div class='del'>-			       : BCH_MEMBER_ERROR_read,</div><div class='del'>-			       "superblock %s error: %s",</div><div class='del'>-			       bio_data_dir(bio) ? "write" : "read",</div><div class='del'>-			       bch2_blk_status_to_str(bio-&gt;bi_status)))</div><div class='del'>-		ca-&gt;sb_write_error = 1;</div><div class='del'>-</div><div class='del'>-	closure_put(&amp;ca-&gt;fs-&gt;sb_write);</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void read_back_super(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb *sb = ca-&gt;disk_sb.sb;</div><div class='del'>-	struct bio *bio = ca-&gt;disk_sb.bio;</div><div class='del'>-</div><div class='del'>-	bio_reset(bio, ca-&gt;disk_sb.bdev, REQ_OP_READ|REQ_SYNC|REQ_META);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector	= le64_to_cpu(sb-&gt;layout.sb_offset[0]);</div><div class='del'>-	bio-&gt;bi_end_io		= write_super_endio;</div><div class='del'>-	bio-&gt;bi_private		= ca;</div><div class='del'>-	bch2_bio_map(bio, ca-&gt;sb_read_scratch, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	this_cpu_add(ca-&gt;io_done-&gt;sectors[READ][BCH_DATA_sb],</div><div class='del'>-		     bio_sectors(bio));</div><div class='del'>-</div><div class='del'>-	percpu_ref_get(&amp;ca-&gt;io_ref);</div><div class='del'>-	closure_bio_submit(bio, &amp;c-&gt;sb_write);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void write_one_super(struct bch_fs *c, struct bch_dev *ca, unsigned idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb *sb = ca-&gt;disk_sb.sb;</div><div class='del'>-	struct bio *bio = ca-&gt;disk_sb.bio;</div><div class='del'>-</div><div class='del'>-	sb-&gt;offset = sb-&gt;layout.sb_offset[idx];</div><div class='del'>-</div><div class='del'>-	SET_BCH_SB_CSUM_TYPE(sb, bch2_csum_opt_to_type(c-&gt;opts.metadata_checksum, false));</div><div class='del'>-	sb-&gt;csum = csum_vstruct(c, BCH_SB_CSUM_TYPE(sb),</div><div class='del'>-				null_nonce(), sb);</div><div class='del'>-</div><div class='del'>-	bio_reset(bio, ca-&gt;disk_sb.bdev, REQ_OP_WRITE|REQ_SYNC|REQ_META);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector	= le64_to_cpu(sb-&gt;offset);</div><div class='del'>-	bio-&gt;bi_end_io		= write_super_endio;</div><div class='del'>-	bio-&gt;bi_private		= ca;</div><div class='del'>-	bch2_bio_map(bio, sb,</div><div class='del'>-		     roundup((size_t) vstruct_bytes(sb),</div><div class='del'>-			     bdev_logical_block_size(ca-&gt;disk_sb.bdev)));</div><div class='del'>-</div><div class='del'>-	this_cpu_add(ca-&gt;io_done-&gt;sectors[WRITE][BCH_DATA_sb],</div><div class='del'>-		     bio_sectors(bio));</div><div class='del'>-</div><div class='del'>-	percpu_ref_get(&amp;ca-&gt;io_ref);</div><div class='del'>-	closure_bio_submit(bio, &amp;c-&gt;sb_write);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_write_super(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct closure *cl = &amp;c-&gt;sb_write;</div><div class='del'>-	struct printbuf err = PRINTBUF;</div><div class='del'>-	unsigned sb = 0, nr_wrote;</div><div class='del'>-	struct bch_devs_mask sb_written;</div><div class='del'>-	bool wrote, can_mount_without_written, can_mount_with_written;</div><div class='del'>-	unsigned degraded_flags = BCH_FORCE_IF_DEGRADED;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	trace_and_count(c, write_super, c, _RET_IP_);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.very_degraded)</div><div class='del'>-		degraded_flags |= BCH_FORCE_IF_LOST;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	closure_init_stack(cl);</div><div class='del'>-	memset(&amp;sb_written, 0, sizeof(sb_written));</div><div class='del'>-</div><div class='del'>-	/* Make sure we're using the new magic numbers: */</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;magic = BCHFS_MAGIC;</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;layout.magic = BCHFS_MAGIC;</div><div class='del'>-</div><div class='del'>-	le64_add_cpu(&amp;c-&gt;disk_sb.sb-&gt;seq, 1);</div><div class='del'>-</div><div class='del'>-	struct bch_sb_field_members_v2 *mi = bch2_sb_field_get(c-&gt;disk_sb.sb, members_v2);</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		__bch2_members_v2_get_mut(mi, ca-&gt;dev_idx)-&gt;seq = c-&gt;disk_sb.sb-&gt;seq;</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;write_time = cpu_to_le64(ktime_get_real_seconds());</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_error, &amp;c-&gt;flags))</div><div class='del'>-		SET_BCH_SB_HAS_ERRORS(c-&gt;disk_sb.sb, 1);</div><div class='del'>-	if (test_bit(BCH_FS_topology_error, &amp;c-&gt;flags))</div><div class='del'>-		SET_BCH_SB_HAS_TOPOLOGY_ERRORS(c-&gt;disk_sb.sb, 1);</div><div class='del'>-</div><div class='del'>-	SET_BCH_SB_BIG_ENDIAN(c-&gt;disk_sb.sb, CPU_BIG_ENDIAN);</div><div class='del'>-</div><div class='del'>-	bch2_sb_counters_from_cpu(c);</div><div class='del'>-	bch2_sb_members_from_cpu(c);</div><div class='del'>-	bch2_sb_members_cpy_v2_v1(&amp;c-&gt;disk_sb);</div><div class='del'>-	bch2_sb_errors_from_cpu(c);</div><div class='del'>-	bch2_sb_downgrade_update(c);</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		bch2_sb_from_fs(c, ca);</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		printbuf_reset(&amp;err);</div><div class='del'>-</div><div class='del'>-		ret = bch2_sb_validate(&amp;ca-&gt;disk_sb, &amp;err, WRITE);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bch2_fs_inconsistent(c, "sb invalid before write: %s", err.buf);</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Defer writing the superblock until filesystem initialization is</div><div class='del'>-	 * complete - don't write out a partly initialized superblock:</div><div class='del'>-	 */</div><div class='del'>-	if (!BCH_SB_INITIALIZED(c-&gt;disk_sb.sb))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(c-&gt;disk_sb.sb-&gt;version) &gt; bcachefs_metadata_version_current) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-		prt_printf(&amp;buf, "attempting to write superblock that wasn't version downgraded (");</div><div class='del'>-		bch2_version_to_text(&amp;buf, le16_to_cpu(c-&gt;disk_sb.sb-&gt;version));</div><div class='del'>-		prt_str(&amp;buf, " &gt; ");</div><div class='del'>-		bch2_version_to_text(&amp;buf, bcachefs_metadata_version_current);</div><div class='del'>-		prt_str(&amp;buf, ")");</div><div class='del'>-		bch2_fs_fatal_error(c, "%s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return -BCH_ERR_sb_not_downgraded;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		__set_bit(ca-&gt;dev_idx, sb_written.d);</div><div class='del'>-		ca-&gt;sb_write_error = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		read_back_super(c, ca);</div><div class='del'>-	closure_sync(cl);</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		if (ca-&gt;sb_write_error)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (le64_to_cpu(ca-&gt;sb_read_scratch-&gt;seq) &lt; ca-&gt;disk_sb.seq) {</div><div class='del'>-			bch2_fs_fatal_error(c,</div><div class='del'>-				"Superblock write was silently dropped! (seq %llu expected %llu)",</div><div class='del'>-				le64_to_cpu(ca-&gt;sb_read_scratch-&gt;seq),</div><div class='del'>-				ca-&gt;disk_sb.seq);</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-			ret = -BCH_ERR_erofs_sb_err;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (le64_to_cpu(ca-&gt;sb_read_scratch-&gt;seq) &gt; ca-&gt;disk_sb.seq) {</div><div class='del'>-			bch2_fs_fatal_error(c,</div><div class='del'>-				"Superblock modified by another process (seq %llu expected %llu)",</div><div class='del'>-				le64_to_cpu(ca-&gt;sb_read_scratch-&gt;seq),</div><div class='del'>-				ca-&gt;disk_sb.seq);</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;io_ref);</div><div class='del'>-			ret = -BCH_ERR_erofs_sb_err;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		wrote = false;</div><div class='del'>-		for_each_online_member(c, ca)</div><div class='del'>-			if (!ca-&gt;sb_write_error &amp;&amp;</div><div class='del'>-			    sb &lt; ca-&gt;disk_sb.sb-&gt;layout.nr_superblocks) {</div><div class='del'>-				write_one_super(c, ca, sb);</div><div class='del'>-				wrote = true;</div><div class='del'>-			}</div><div class='del'>-		closure_sync(cl);</div><div class='del'>-		sb++;</div><div class='del'>-	} while (wrote);</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca) {</div><div class='del'>-		if (ca-&gt;sb_write_error)</div><div class='del'>-			__clear_bit(ca-&gt;dev_idx, sb_written.d);</div><div class='del'>-		else</div><div class='del'>-			ca-&gt;disk_sb.seq = le64_to_cpu(ca-&gt;disk_sb.sb-&gt;seq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr_wrote = dev_mask_nr(&amp;sb_written);</div><div class='del'>-</div><div class='del'>-	can_mount_with_written =</div><div class='del'>-		bch2_have_enough_devs(c, sb_written, degraded_flags, false);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(sb_written.d); i++)</div><div class='del'>-		sb_written.d[i] = ~sb_written.d[i];</div><div class='del'>-</div><div class='del'>-	can_mount_without_written =</div><div class='del'>-		bch2_have_enough_devs(c, sb_written, degraded_flags, false);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we would be able to mount _without_ the devices we successfully</div><div class='del'>-	 * wrote superblocks to, we weren't able to write to enough devices:</div><div class='del'>-	 *</div><div class='del'>-	 * Exception: if we can mount without the successes because we haven't</div><div class='del'>-	 * written anything (new filesystem), we continue if we'd be able to</div><div class='del'>-	 * mount with the devices we did successfully write to:</div><div class='del'>-	 */</div><div class='del'>-	if (bch2_fs_fatal_err_on(!nr_wrote ||</div><div class='del'>-				 !can_mount_with_written ||</div><div class='del'>-				 (can_mount_without_written &amp;&amp;</div><div class='del'>-				  !can_mount_with_written), c,</div><div class='del'>-		"Unable to write superblock to sufficient devices (from %ps)",</div><div class='del'>-		(void *) _RET_IP_))</div><div class='del'>-		ret = -1;</div><div class='del'>-out:</div><div class='del'>-	/* Make new options visible after they're persistent: */</div><div class='del'>-	bch2_sb_update(c);</div><div class='del'>-	printbuf_exit(&amp;err);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_check_set_feature(struct bch_fs *c, unsigned feat)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	if (!(c-&gt;sb.features &amp; (1ULL &lt;&lt; feat))) {</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;features[0] |= cpu_to_le64(1ULL &lt;&lt; feat);</div><div class='del'>-</div><div class='del'>-		bch2_write_super(c);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Downgrade if superblock is at a higher version than currently supported: */</div><div class='del'>-bool bch2_check_version_downgrade(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bool ret = bcachefs_metadata_version_current &lt; c-&gt;sb.version;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Downgrade, if superblock is at a higher version than currently</div><div class='del'>-	 * supported:</div><div class='del'>-	 *</div><div class='del'>-	 * c-&gt;sb will be checked before we write the superblock, so update it as</div><div class='del'>-	 * well:</div><div class='del'>-	 */</div><div class='del'>-	if (BCH_SB_VERSION_UPGRADE_COMPLETE(c-&gt;disk_sb.sb) &gt; bcachefs_metadata_version_current) {</div><div class='del'>-		SET_BCH_SB_VERSION_UPGRADE_COMPLETE(c-&gt;disk_sb.sb, bcachefs_metadata_version_current);</div><div class='del'>-		c-&gt;sb.version_upgrade_complete = bcachefs_metadata_version_current;</div><div class='del'>-	}</div><div class='del'>-	if (c-&gt;sb.version &gt; bcachefs_metadata_version_current) {</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;version = cpu_to_le16(bcachefs_metadata_version_current);</div><div class='del'>-		c-&gt;sb.version = bcachefs_metadata_version_current;</div><div class='del'>-	}</div><div class='del'>-	if (c-&gt;sb.version_min &gt; bcachefs_metadata_version_current) {</div><div class='del'>-		c-&gt;disk_sb.sb-&gt;version_min = cpu_to_le16(bcachefs_metadata_version_current);</div><div class='del'>-		c-&gt;sb.version_min = bcachefs_metadata_version_current;</div><div class='del'>-	}</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;compat[0] &amp;= cpu_to_le64((1ULL &lt;&lt; BCH_COMPAT_NR) - 1);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_upgrade(struct bch_fs *c, unsigned new_version)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (BCH_VERSION_MAJOR(new_version) &gt;</div><div class='del'>-	    BCH_VERSION_MAJOR(le16_to_cpu(c-&gt;disk_sb.sb-&gt;version)))</div><div class='del'>-		bch2_sb_field_resize(&amp;c-&gt;disk_sb, downgrade, 0);</div><div class='del'>-</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;version = cpu_to_le16(new_version);</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;features[0] |= cpu_to_le64(BCH_SB_FEATURES_ALL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_ext_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-				struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	if (vstruct_bytes(f) &lt; 88) {</div><div class='del'>-		prt_printf(err, "field too small (%zu &lt; %u)", vstruct_bytes(f), 88);</div><div class='del'>-		return -BCH_ERR_invalid_sb_ext;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_sb_ext_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-				struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	struct bch_sb_field_ext *e = field_to_type(f, ext);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Recovery passes required:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_bitflags(out, bch2_recovery_passes,</div><div class='del'>-		     bch2_recovery_passes_from_stable(le64_to_cpu(e-&gt;recovery_passes_required[0])));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	unsigned long *errors_silent = kmalloc(sizeof(e-&gt;errors_silent), GFP_KERNEL);</div><div class='del'>-	if (errors_silent) {</div><div class='del'>-		le_bitvector_to_cpu(errors_silent, (void *) e-&gt;errors_silent, sizeof(e-&gt;errors_silent) * 8);</div><div class='del'>-</div><div class='del'>-		prt_printf(out, "Errors to silently fix:");</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_bitflags_vector(out, bch2_sb_error_strs, errors_silent, sizeof(e-&gt;errors_silent) * 8);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-</div><div class='del'>-		kfree(errors_silent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct bch_sb_field_ops bch_sb_field_ops_ext = {</div><div class='del'>-	.validate	= bch2_sb_ext_validate,</div><div class='del'>-	.to_text	= bch2_sb_ext_to_text,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct bch_sb_field_ops *bch2_sb_field_ops[] = {</div><div class='del'>-#define x(f, nr)					\</div><div class='del'>-	[BCH_SB_FIELD_##f] = &amp;bch_sb_field_ops_##f,</div><div class='del'>-	BCH_SB_FIELDS()</div><div class='del'>-#undef x</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct bch_sb_field_ops bch2_sb_field_null_ops;</div><div class='del'>-</div><div class='del'>-static const struct bch_sb_field_ops *bch2_sb_field_type_ops(unsigned type)</div><div class='del'>-{</div><div class='del'>-	return likely(type &lt; ARRAY_SIZE(bch2_sb_field_ops))</div><div class='del'>-		? bch2_sb_field_ops[type]</div><div class='del'>-		: &amp;bch2_sb_field_null_ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_sb_field_validate(struct bch_sb *sb, struct bch_sb_field *f,</div><div class='del'>-				  struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	unsigned type = le32_to_cpu(f-&gt;type);</div><div class='del'>-	struct printbuf field_err = PRINTBUF;</div><div class='del'>-	const struct bch_sb_field_ops *ops = bch2_sb_field_type_ops(type);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = ops-&gt;validate ? ops-&gt;validate(sb, f, &amp;field_err) : 0;</div><div class='del'>-	if (ret) {</div><div class='del'>-		prt_printf(err, "Invalid superblock section %s: %s",</div><div class='del'>-			   bch2_sb_fields[type], field_err.buf);</div><div class='del'>-		prt_newline(err);</div><div class='del'>-		bch2_sb_field_to_text(err, sb, f);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;field_err);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_sb_field_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-			     struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	unsigned type = le32_to_cpu(f-&gt;type);</div><div class='del'>-	const struct bch_sb_field_ops *ops = bch2_sb_field_type_ops(type);</div><div class='del'>-</div><div class='del'>-	if (!out-&gt;nr_tabstops)</div><div class='del'>-		printbuf_tabstop_push(out, 32);</div><div class='del'>-</div><div class='del'>-	if (ops-&gt;to_text)</div><div class='del'>-		ops-&gt;to_text(out, sb, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_field_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-			   struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	unsigned type = le32_to_cpu(f-&gt;type);</div><div class='del'>-</div><div class='del'>-	if (type &lt; BCH_SB_FIELD_NR)</div><div class='del'>-		prt_printf(out, "%s", bch2_sb_fields[type]);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(unknown field %u)", type);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, " (size %zu):", vstruct_bytes(f));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	__bch2_sb_field_to_text(out, sb, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_layout_to_text(struct printbuf *out, struct bch_sb_layout *l)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Type:                    %u", l-&gt;layout_type);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Superblock max size:     ");</div><div class='del'>-	prt_units_u64(out, 512 &lt;&lt; l-&gt;sb_max_size_bits);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Nr superblocks:          %u", l-&gt;nr_superblocks);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Offsets:                 ");</div><div class='del'>-	for (i = 0; i &lt; l-&gt;nr_superblocks; i++) {</div><div class='del'>-		if (i)</div><div class='del'>-			prt_str(out, ", ");</div><div class='del'>-		prt_printf(out, "%llu", le64_to_cpu(l-&gt;sb_offset[i]));</div><div class='del'>-	}</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_sb_to_text(struct printbuf *out, struct bch_sb *sb,</div><div class='del'>-		     bool print_layout, unsigned fields)</div><div class='del'>-{</div><div class='del'>-	u64 fields_have = 0;</div><div class='del'>-	unsigned nr_devices = 0;</div><div class='del'>-</div><div class='del'>-	if (!out-&gt;nr_tabstops)</div><div class='del'>-		printbuf_tabstop_push(out, 44);</div><div class='del'>-</div><div class='del'>-	for (int i = 0; i &lt; sb-&gt;nr_devices; i++)</div><div class='del'>-		nr_devices += bch2_dev_exists(sb, i);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "External UUID:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	pr_uuid(out, sb-&gt;user_uuid.b);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Internal UUID:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	pr_uuid(out, sb-&gt;uuid.b);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Magic number:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	pr_uuid(out, sb-&gt;magic.b);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Device index:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", sb-&gt;dev_idx);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Label:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%.*s", (int) sizeof(sb-&gt;label), sb-&gt;label);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Version:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_version_to_text(out, le16_to_cpu(sb-&gt;version));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "Version upgrade complete:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_version_to_text(out, BCH_SB_VERSION_UPGRADE_COMPLETE(sb));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Oldest version on disk:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_version_to_text(out, le16_to_cpu(sb-&gt;version_min));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Created:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	if (sb-&gt;time_base_lo)</div><div class='del'>-		bch2_prt_datetime(out, div_u64(le64_to_cpu(sb-&gt;time_base_lo), NSEC_PER_SEC));</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(not set)");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Sequence number:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", le64_to_cpu(sb-&gt;seq));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Time of last write:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_prt_datetime(out, le64_to_cpu(sb-&gt;write_time));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Superblock size:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_units_u64(out, vstruct_bytes(sb));</div><div class='del'>-	prt_str(out, "/");</div><div class='del'>-	prt_units_u64(out, 512ULL &lt;&lt; sb-&gt;layout.sb_max_size_bits);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Clean:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu", BCH_SB_CLEAN(sb));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Devices:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%u", nr_devices);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Sections:");</div><div class='del'>-	vstruct_for_each(sb, f)</div><div class='del'>-		fields_have |= 1 &lt;&lt; le32_to_cpu(f-&gt;type);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_bitflags(out, bch2_sb_fields, fields_have);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Features:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_bitflags(out, bch2_sb_features, le64_to_cpu(sb-&gt;features[0]));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "Compat features:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_bitflags(out, bch2_sb_compat, le64_to_cpu(sb-&gt;compat[0]));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	prt_printf(out, "Options:");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-	{</div><div class='del'>-		enum bch_opt_id id;</div><div class='del'>-</div><div class='del'>-		for (id = 0; id &lt; bch2_opts_nr; id++) {</div><div class='del'>-			const struct bch_option *opt = bch2_opt_table + id;</div><div class='del'>-</div><div class='del'>-			if (opt-&gt;get_sb != BCH2_NO_SB_OPT) {</div><div class='del'>-				u64 v = bch2_opt_from_sb(sb, id);</div><div class='del'>-</div><div class='del'>-				prt_printf(out, "%s:", opt-&gt;attr.name);</div><div class='del'>-				prt_tab(out);</div><div class='del'>-				bch2_opt_to_text(out, NULL, sb, opt, v,</div><div class='del'>-						 OPT_HUMAN_READABLE|OPT_SHOW_FULL_LIST);</div><div class='del'>-				prt_newline(out);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-</div><div class='del'>-	if (print_layout) {</div><div class='del'>-		prt_newline(out);</div><div class='del'>-		prt_printf(out, "layout:");</div><div class='del'>-		prt_newline(out);</div><div class='del'>-		printbuf_indent_add(out, 2);</div><div class='del'>-		bch2_sb_layout_to_text(out, &amp;sb-&gt;layout);</div><div class='del'>-		printbuf_indent_sub(out, 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vstruct_for_each(sb, f)</div><div class='del'>-		if (fields &amp; (1 &lt;&lt; le32_to_cpu(f-&gt;type))) {</div><div class='del'>-			prt_newline(out);</div><div class='del'>-			bch2_sb_field_to_text(out, sb, f);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/super-io.h b/fs/bcachefs/super-io.h<br/>deleted file mode 100644<br/>index 95e80e06316b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/super-io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super-io.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SUPER_IO_H</div><div class='del'>-#define _BCACHEFS_SUPER_IO_H</div><div class='del'>-</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "eytzinger.h"</div><div class='del'>-#include "super_types.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-static inline bool bch2_version_compatible(u16 version)</div><div class='del'>-{</div><div class='del'>-	return BCH_VERSION_MAJOR(version) &lt;= BCH_VERSION_MAJOR(bcachefs_metadata_version_current) &amp;&amp;</div><div class='del'>-		version &gt;= bcachefs_metadata_version_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_version_to_text(struct printbuf *, unsigned);</div><div class='del'>-unsigned bch2_latest_compatible_version(unsigned);</div><div class='del'>-</div><div class='del'>-static inline size_t bch2_sb_field_bytes(struct bch_sb_field *f)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(f-&gt;u64s) * sizeof(u64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define field_to_type(_f, _name)					\</div><div class='del'>-	container_of_or_null(_f, struct bch_sb_field_##_name, field)</div><div class='del'>-</div><div class='del'>-struct bch_sb_field *bch2_sb_field_get_id(struct bch_sb *, enum bch_sb_field_type);</div><div class='del'>-#define bch2_sb_field_get(_sb, _name)					\</div><div class='del'>-	field_to_type(bch2_sb_field_get_id(_sb, BCH_SB_FIELD_##_name), _name)</div><div class='del'>-</div><div class='del'>-struct bch_sb_field *bch2_sb_field_resize_id(struct bch_sb_handle *,</div><div class='del'>-					     enum bch_sb_field_type, unsigned);</div><div class='del'>-#define bch2_sb_field_resize(_sb, _name, _u64s)				\</div><div class='del'>-	field_to_type(bch2_sb_field_resize_id(_sb, BCH_SB_FIELD_##_name, _u64s), _name)</div><div class='del'>-</div><div class='del'>-struct bch_sb_field *bch2_sb_field_get_minsize_id(struct bch_sb_handle *,</div><div class='del'>-					enum bch_sb_field_type, unsigned);</div><div class='del'>-#define bch2_sb_field_get_minsize(_sb, _name, _u64s)				\</div><div class='del'>-	field_to_type(bch2_sb_field_get_minsize_id(_sb, BCH_SB_FIELD_##_name, _u64s), _name)</div><div class='del'>-</div><div class='del'>-#define bch2_sb_field_nr_entries(_f)					\</div><div class='del'>-	(_f ? ((bch2_sb_field_bytes(&amp;_f-&gt;field) - sizeof(*_f)) /	\</div><div class='del'>-	       sizeof(_f-&gt;entries[0]))					\</div><div class='del'>-	    : 0)</div><div class='del'>-</div><div class='del'>-void bch2_sb_field_delete(struct bch_sb_handle *, enum bch_sb_field_type);</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_sb_fields[];</div><div class='del'>-</div><div class='del'>-struct bch_sb_field_ops {</div><div class='del'>-	int	(*validate)(struct bch_sb *, struct bch_sb_field *, struct printbuf *);</div><div class='del'>-	void	(*to_text)(struct printbuf *, struct bch_sb *, struct bch_sb_field *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline __le64 bch2_sb_magic(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	__le64 ret;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;ret, &amp;c-&gt;sb.uuid, sizeof(ret));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u64 jset_magic(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return __le64_to_cpu(bch2_sb_magic(c) ^ JSET_MAGIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u64 bset_magic(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	return __le64_to_cpu(bch2_sb_magic(c) ^ BSET_MAGIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_sb_to_fs(struct bch_fs *, struct bch_sb *);</div><div class='del'>-int bch2_sb_from_fs(struct bch_fs *, struct bch_dev *);</div><div class='del'>-</div><div class='del'>-void bch2_free_super(struct bch_sb_handle *);</div><div class='del'>-int bch2_sb_realloc(struct bch_sb_handle *, unsigned);</div><div class='del'>-</div><div class='del'>-int bch2_read_super(const char *, struct bch_opts *, struct bch_sb_handle *);</div><div class='del'>-int bch2_read_super_silent(const char *, struct bch_opts *, struct bch_sb_handle *);</div><div class='del'>-int bch2_write_super(struct bch_fs *);</div><div class='del'>-void __bch2_check_set_feature(struct bch_fs *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void bch2_check_set_feature(struct bch_fs *c, unsigned feat)</div><div class='del'>-{</div><div class='del'>-	if (!(c-&gt;sb.features &amp; (1ULL &lt;&lt; feat)))</div><div class='del'>-		__bch2_check_set_feature(c, feat);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_check_version_downgrade(struct bch_fs *);</div><div class='del'>-void bch2_sb_upgrade(struct bch_fs *, unsigned);</div><div class='del'>-</div><div class='del'>-void __bch2_sb_field_to_text(struct printbuf *, struct bch_sb *,</div><div class='del'>-			     struct bch_sb_field *);</div><div class='del'>-void bch2_sb_field_to_text(struct printbuf *, struct bch_sb *,</div><div class='del'>-			   struct bch_sb_field *);</div><div class='del'>-void bch2_sb_layout_to_text(struct printbuf *, struct bch_sb_layout *);</div><div class='del'>-void bch2_sb_to_text(struct printbuf *, struct bch_sb *, bool, unsigned);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SUPER_IO_H */</div><div class='head'>diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c<br/>deleted file mode 100644<br/>index b9911402b175..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2124 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * bcachefs setup/teardown code, and some metadata io - read a superblock and</div><div class='del'>- * figure out what to do with it.</div><div class='del'>- *</div><div class='del'>- * Copyright 2010, 2011 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "bkey_sort.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "btree_journal_iter.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_write_buffer.h"</div><div class='del'>-#include "buckets_waiting_for_journal.h"</div><div class='del'>-#include "chardev.h"</div><div class='del'>-#include "checksum.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "errcode.h"</div><div class='del'>-#include "error.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "fs-io.h"</div><div class='del'>-#include "fs-io-buffered.h"</div><div class='del'>-#include "fs-io-direct.h"</div><div class='del'>-#include "fsck.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "io_read.h"</div><div class='del'>-#include "io_write.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "journal_seq_blacklist.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "migrate.h"</div><div class='del'>-#include "movinggc.h"</div><div class='del'>-#include "nocow_locking.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "recovery.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "sb-clean.h"</div><div class='del'>-#include "sb-counters.h"</div><div class='del'>-#include "sb-errors.h"</div><div class='del'>-#include "sb-members.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "subvolume.h"</div><div class='del'>-#include "super.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "sysfs.h"</div><div class='del'>-#include "trace.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Kent Overstreet &lt;kent.overstreet@gmail.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("bcachefs filesystem");</div><div class='del'>-MODULE_SOFTDEP("pre: crc32c");</div><div class='del'>-MODULE_SOFTDEP("pre: crc64");</div><div class='del'>-MODULE_SOFTDEP("pre: sha256");</div><div class='del'>-MODULE_SOFTDEP("pre: chacha20");</div><div class='del'>-MODULE_SOFTDEP("pre: poly1305");</div><div class='del'>-MODULE_SOFTDEP("pre: xxhash");</div><div class='del'>-</div><div class='del'>-const char * const bch2_fs_flag_strs[] = {</div><div class='del'>-#define x(n)		#n,</div><div class='del'>-	BCH_FS_FLAGS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __bch2_print(struct bch_fs *c, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct stdio_redirect *stdio = bch2_fs_stdio_redirect(c);</div><div class='del'>-</div><div class='del'>-	va_list args;</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	if (likely(!stdio)) {</div><div class='del'>-		vprintk(fmt, args);</div><div class='del'>-	} else {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		if (fmt[0] == KERN_SOH[0])</div><div class='del'>-			fmt += 2;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;stdio-&gt;output_lock, flags);</div><div class='del'>-		prt_vprintf(&amp;stdio-&gt;output_buf, fmt, args);</div><div class='del'>-		spin_unlock_irqrestore(&amp;stdio-&gt;output_lock, flags);</div><div class='del'>-</div><div class='del'>-		wake_up(&amp;stdio-&gt;output_wait);</div><div class='del'>-	}</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define KTYPE(type)							\</div><div class='del'>-static const struct attribute_group type ## _group = {			\</div><div class='del'>-	.attrs = type ## _files						\</div><div class='del'>-};									\</div><div class='del'>-									\</div><div class='del'>-static const struct attribute_group *type ## _groups[] = {		\</div><div class='del'>-	&amp;type ## _group,						\</div><div class='del'>-	NULL								\</div><div class='del'>-};									\</div><div class='del'>-									\</div><div class='del'>-static const struct kobj_type type ## _ktype = {			\</div><div class='del'>-	.release	= type ## _release,				\</div><div class='del'>-	.sysfs_ops	= &amp;type ## _sysfs_ops,				\</div><div class='del'>-	.default_groups = type ## _groups				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_release(struct kobject *);</div><div class='del'>-static void bch2_dev_release(struct kobject *);</div><div class='del'>-static void bch2_fs_counters_release(struct kobject *k)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_internal_release(struct kobject *k)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_opts_dir_release(struct kobject *k)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_time_stats_release(struct kobject *k)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-KTYPE(bch2_fs);</div><div class='del'>-KTYPE(bch2_fs_counters);</div><div class='del'>-KTYPE(bch2_fs_internal);</div><div class='del'>-KTYPE(bch2_fs_opts_dir);</div><div class='del'>-KTYPE(bch2_fs_time_stats);</div><div class='del'>-KTYPE(bch2_dev);</div><div class='del'>-</div><div class='del'>-static struct kset *bcachefs_kset;</div><div class='del'>-static LIST_HEAD(bch_fs_list);</div><div class='del'>-static DEFINE_MUTEX(bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-DECLARE_WAIT_QUEUE_HEAD(bch2_read_only_wait);</div><div class='del'>-</div><div class='del'>-static void bch2_dev_free(struct bch_dev *);</div><div class='del'>-static int bch2_dev_alloc(struct bch_fs *, unsigned);</div><div class='del'>-static int bch2_dev_sysfs_online(struct bch_fs *, struct bch_dev *);</div><div class='del'>-static void __bch2_dev_read_only(struct bch_fs *, struct bch_dev *);</div><div class='del'>-</div><div class='del'>-struct bch_fs *bch2_dev_to_fs(dev_t dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bch_fs_list_lock);</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(c, &amp;bch_fs_list, list)</div><div class='del'>-		for_each_member_device_rcu(c, ca, NULL)</div><div class='del'>-			if (ca-&gt;disk_sb.bdev &amp;&amp; ca-&gt;disk_sb.bdev-&gt;bd_dev == dev) {</div><div class='del'>-				closure_get(&amp;c-&gt;cl);</div><div class='del'>-				goto found;</div><div class='del'>-			}</div><div class='del'>-	c = NULL;</div><div class='del'>-found:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	mutex_unlock(&amp;bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_fs *__bch2_uuid_to_fs(__uuid_t uuid)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(c, &amp;bch_fs_list, list)</div><div class='del'>-		if (!memcmp(&amp;c-&gt;disk_sb.sb-&gt;uuid, &amp;uuid, sizeof(uuid)))</div><div class='del'>-			return c;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_fs *bch2_uuid_to_fs(__uuid_t uuid)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bch_fs_list_lock);</div><div class='del'>-	c = __bch2_uuid_to_fs(uuid);</div><div class='del'>-	if (c)</div><div class='del'>-		closure_get(&amp;c-&gt;cl);</div><div class='del'>-	mutex_unlock(&amp;bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dev_usage_journal_reserve(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned nr = 0, u64s =</div><div class='del'>-		((sizeof(struct jset_entry_dev_usage) +</div><div class='del'>-		  sizeof(struct jset_entry_dev_usage_type) * BCH_DATA_NR)) /</div><div class='del'>-		sizeof(u64);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, NULL)</div><div class='del'>-		nr++;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	bch2_journal_entry_res_resize(&amp;c-&gt;journal,</div><div class='del'>-			&amp;c-&gt;dev_usage_journal_res, u64s * nr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Filesystem RO/RW: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For startup/shutdown of RW stuff, the dependencies are:</div><div class='del'>- *</div><div class='del'>- * - foreground writes depend on copygc and rebalance (to free up space)</div><div class='del'>- *</div><div class='del'>- * - copygc and rebalance depend on mark and sweep gc (they actually probably</div><div class='del'>- *   don't because they either reserve ahead of time or don't block if</div><div class='del'>- *   allocations fail, but allocations can require mark and sweep gc to run</div><div class='del'>- *   because of generation number wraparound)</div><div class='del'>- *</div><div class='del'>- * - all of the above depends on the allocator threads</div><div class='del'>- *</div><div class='del'>- * - allocator depends on the journal (when it rewrites prios and gens)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __bch2_fs_read_only(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned clean_passes = 0;</div><div class='del'>-	u64 seq = 0;</div><div class='del'>-</div><div class='del'>-	bch2_fs_ec_stop(c);</div><div class='del'>-	bch2_open_buckets_stop(c, NULL, true);</div><div class='del'>-	bch2_rebalance_stop(c);</div><div class='del'>-	bch2_copygc_stop(c);</div><div class='del'>-	bch2_gc_thread_stop(c);</div><div class='del'>-	bch2_fs_ec_flush(c);</div><div class='del'>-</div><div class='del'>-	bch_verbose(c, "flushing journal and stopping allocators, journal seq %llu",</div><div class='del'>-		    journal_cur_seq(&amp;c-&gt;journal));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		clean_passes++;</div><div class='del'>-</div><div class='del'>-		if (bch2_btree_interior_updates_flush(c) ||</div><div class='del'>-		    bch2_journal_flush_all_pins(&amp;c-&gt;journal) ||</div><div class='del'>-		    bch2_btree_flush_all_writes(c) ||</div><div class='del'>-		    seq != atomic64_read(&amp;c-&gt;journal.seq)) {</div><div class='del'>-			seq = atomic64_read(&amp;c-&gt;journal.seq);</div><div class='del'>-			clean_passes = 0;</div><div class='del'>-		}</div><div class='del'>-	} while (clean_passes &lt; 2);</div><div class='del'>-</div><div class='del'>-	bch_verbose(c, "flushing journal and stopping allocators complete, journal seq %llu",</div><div class='del'>-		    journal_cur_seq(&amp;c-&gt;journal));</div><div class='del'>-</div><div class='del'>-	if (test_bit(JOURNAL_REPLAY_DONE, &amp;c-&gt;journal.flags) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_emergency_ro, &amp;c-&gt;flags))</div><div class='del'>-		set_bit(BCH_FS_clean_shutdown, &amp;c-&gt;flags);</div><div class='del'>-	bch2_fs_journal_stop(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * After stopping journal:</div><div class='del'>-	 */</div><div class='del'>-	for_each_member_device(c, ca)</div><div class='del'>-		bch2_dev_allocator_remove(c, ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef BCH_WRITE_REF_DEBUG</div><div class='del'>-static void bch2_writes_disabled(struct percpu_ref *writes)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(writes, struct bch_fs, writes);</div><div class='del'>-</div><div class='del'>-	set_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags);</div><div class='del'>-	wake_up(&amp;bch2_read_only_wait);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_fs_read_only(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (!test_bit(BCH_FS_rw, &amp;c-&gt;flags)) {</div><div class='del'>-		bch2_journal_reclaim_stop(&amp;c-&gt;journal);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(test_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags));</div><div class='del'>-</div><div class='del'>-	bch_verbose(c, "going read-only");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Block new foreground-end write operations from starting - any new</div><div class='del'>-	 * writes will return -EROFS:</div><div class='del'>-	 */</div><div class='del'>-	set_bit(BCH_FS_going_ro, &amp;c-&gt;flags);</div><div class='del'>-#ifndef BCH_WRITE_REF_DEBUG</div><div class='del'>-	percpu_ref_kill(&amp;c-&gt;writes);</div><div class='del'>-#else</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_WRITE_REF_NR; i++)</div><div class='del'>-		bch2_write_ref_put(c, i);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're not doing an emergency shutdown, we want to wait on</div><div class='del'>-	 * outstanding writes to complete so they don't see spurious errors due</div><div class='del'>-	 * to shutting down the allocator:</div><div class='del'>-	 *</div><div class='del'>-	 * If we are doing an emergency shutdown outstanding writes may</div><div class='del'>-	 * hang until we shutdown the allocator so we don't want to wait</div><div class='del'>-	 * on outstanding writes before shutting everything down - but</div><div class='del'>-	 * we do need to wait on them before returning and signalling</div><div class='del'>-	 * that going RO is complete:</div><div class='del'>-	 */</div><div class='del'>-	wait_event(bch2_read_only_wait,</div><div class='del'>-		   test_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags) ||</div><div class='del'>-		   test_bit(BCH_FS_emergency_ro, &amp;c-&gt;flags));</div><div class='del'>-</div><div class='del'>-	bool writes_disabled = test_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags);</div><div class='del'>-	if (writes_disabled)</div><div class='del'>-		bch_verbose(c, "finished waiting for writes to stop");</div><div class='del'>-</div><div class='del'>-	__bch2_fs_read_only(c);</div><div class='del'>-</div><div class='del'>-	wait_event(bch2_read_only_wait,</div><div class='del'>-		   test_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags));</div><div class='del'>-</div><div class='del'>-	if (!writes_disabled)</div><div class='del'>-		bch_verbose(c, "finished waiting for writes to stop");</div><div class='del'>-</div><div class='del'>-	clear_bit(BCH_FS_write_disable_complete, &amp;c-&gt;flags);</div><div class='del'>-	clear_bit(BCH_FS_going_ro, &amp;c-&gt;flags);</div><div class='del'>-	clear_bit(BCH_FS_rw, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	if (!bch2_journal_error(&amp;c-&gt;journal) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_error, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_emergency_ro, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    test_bit(BCH_FS_started, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    test_bit(BCH_FS_clean_shutdown, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !c-&gt;opts.norecovery) {</div><div class='del'>-		BUG_ON(c-&gt;journal.last_empty_seq != journal_cur_seq(&amp;c-&gt;journal));</div><div class='del'>-		BUG_ON(atomic_read(&amp;c-&gt;btree_cache.dirty));</div><div class='del'>-		BUG_ON(atomic_long_read(&amp;c-&gt;btree_key_cache.nr_dirty));</div><div class='del'>-		BUG_ON(c-&gt;btree_write_buffer.inc.keys.nr);</div><div class='del'>-		BUG_ON(c-&gt;btree_write_buffer.flushing.keys.nr);</div><div class='del'>-</div><div class='del'>-		bch_verbose(c, "marking filesystem clean");</div><div class='del'>-		bch2_fs_mark_clean(c);</div><div class='del'>-	} else {</div><div class='del'>-		bch_verbose(c, "done going read-only, filesystem not clean");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_read_only_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c =</div><div class='del'>-		container_of(work, struct bch_fs, read_only_work);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	bch2_fs_read_only(c);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_read_only_async(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	queue_work(system_long_wq, &amp;c-&gt;read_only_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_fs_emergency_read_only(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bool ret = !test_and_set_bit(BCH_FS_emergency_ro, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	bch2_journal_halt(&amp;c-&gt;journal);</div><div class='del'>-	bch2_fs_read_only_async(c);</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;bch2_read_only_wait);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fs_read_write_late(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Data move operations can't run until after check_snapshots has</div><div class='del'>-	 * completed, and bch2_snapshot_is_ancestor() is available.</div><div class='del'>-	 *</div><div class='del'>-	 * Ideally we'd start copygc/rebalance earlier instead of waiting for</div><div class='del'>-	 * all of recovery/fsck to complete:</div><div class='del'>-	 */</div><div class='del'>-	ret = bch2_copygc_start(c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error starting copygc thread");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_rebalance_start(c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error starting rebalance thread");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_fs_read_write(struct bch_fs *c, bool early)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_initial_gc_unfixed, &amp;c-&gt;flags)) {</div><div class='del'>-		bch_err(c, "cannot go rw, unfixed btree errors");</div><div class='del'>-		return -BCH_ERR_erofs_unfixed_errors;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(BCH_FS_rw, &amp;c-&gt;flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bch_info(c, "going read-write");</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_members_v2_init(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_mark_dirty(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	clear_bit(BCH_FS_clean_shutdown, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First journal write must be a flush write: after a clean shutdown we</div><div class='del'>-	 * don't read the journal, so the first journal write may end up</div><div class='del'>-	 * overwriting whatever was there previously, and there must always be</div><div class='del'>-	 * at least one non-flush write in the journal or recovery will fail:</div><div class='del'>-	 */</div><div class='del'>-	set_bit(JOURNAL_NEED_FLUSH_WRITE, &amp;c-&gt;journal.flags);</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca)</div><div class='del'>-		bch2_dev_allocator_add(c, ca);</div><div class='del'>-	bch2_recalc_capacity(c);</div><div class='del'>-</div><div class='del'>-	set_bit(BCH_FS_rw, &amp;c-&gt;flags);</div><div class='del'>-	set_bit(BCH_FS_was_rw, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-#ifndef BCH_WRITE_REF_DEBUG</div><div class='del'>-	percpu_ref_reinit(&amp;c-&gt;writes);</div><div class='del'>-#else</div><div class='del'>-	for (unsigned i = 0; i &lt; BCH_WRITE_REF_NR; i++) {</div><div class='del'>-		BUG_ON(atomic_long_read(&amp;c-&gt;writes[i]));</div><div class='del'>-		atomic_long_inc(&amp;c-&gt;writes[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ret = bch2_gc_thread_start(c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error starting gc thread");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_reclaim_start(&amp;c-&gt;journal);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!early) {</div><div class='del'>-		ret = bch2_fs_read_write_late(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_do_discards(c);</div><div class='del'>-	bch2_do_invalidates(c);</div><div class='del'>-	bch2_do_stripe_deletes(c);</div><div class='del'>-	bch2_do_pending_node_rewrites(c);</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	if (test_bit(BCH_FS_rw, &amp;c-&gt;flags))</div><div class='del'>-		bch2_fs_read_only(c);</div><div class='del'>-	else</div><div class='del'>-		__bch2_fs_read_only(c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_read_write(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;opts.norecovery)</div><div class='del'>-		return -BCH_ERR_erofs_norecovery;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.nochanges)</div><div class='del'>-		return -BCH_ERR_erofs_nochanges;</div><div class='del'>-</div><div class='del'>-	return __bch2_fs_read_write(c, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_read_write_early(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return __bch2_fs_read_write(c, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Filesystem startup/shutdown: */</div><div class='del'>-</div><div class='del'>-static void __bch2_fs_free(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_TIME_STAT_NR; i++)</div><div class='del'>-		bch2_time_stats_exit(&amp;c-&gt;times[i]);</div><div class='del'>-</div><div class='del'>-	bch2_free_pending_node_rewrites(c);</div><div class='del'>-	bch2_fs_sb_errors_exit(c);</div><div class='del'>-	bch2_fs_counters_exit(c);</div><div class='del'>-	bch2_fs_snapshots_exit(c);</div><div class='del'>-	bch2_fs_quota_exit(c);</div><div class='del'>-	bch2_fs_fs_io_direct_exit(c);</div><div class='del'>-	bch2_fs_fs_io_buffered_exit(c);</div><div class='del'>-	bch2_fs_fsio_exit(c);</div><div class='del'>-	bch2_fs_ec_exit(c);</div><div class='del'>-	bch2_fs_encryption_exit(c);</div><div class='del'>-	bch2_fs_nocow_locking_exit(c);</div><div class='del'>-	bch2_fs_io_write_exit(c);</div><div class='del'>-	bch2_fs_io_read_exit(c);</div><div class='del'>-	bch2_fs_buckets_waiting_for_journal_exit(c);</div><div class='del'>-	bch2_fs_btree_interior_update_exit(c);</div><div class='del'>-	bch2_fs_btree_iter_exit(c);</div><div class='del'>-	bch2_fs_btree_key_cache_exit(&amp;c-&gt;btree_key_cache);</div><div class='del'>-	bch2_fs_btree_cache_exit(c);</div><div class='del'>-	bch2_fs_replicas_exit(c);</div><div class='del'>-	bch2_fs_journal_exit(&amp;c-&gt;journal);</div><div class='del'>-	bch2_io_clock_exit(&amp;c-&gt;io_clock[WRITE]);</div><div class='del'>-	bch2_io_clock_exit(&amp;c-&gt;io_clock[READ]);</div><div class='del'>-	bch2_fs_compress_exit(c);</div><div class='del'>-	bch2_journal_keys_put_initial(c);</div><div class='del'>-	BUG_ON(atomic_read(&amp;c-&gt;journal_keys.ref));</div><div class='del'>-	bch2_fs_btree_write_buffer_exit(c);</div><div class='del'>-	percpu_free_rwsem(&amp;c-&gt;mark_lock);</div><div class='del'>-	free_percpu(c-&gt;online_reserved);</div><div class='del'>-</div><div class='del'>-	darray_exit(&amp;c-&gt;btree_roots_extra);</div><div class='del'>-	free_percpu(c-&gt;pcpu);</div><div class='del'>-	mempool_exit(&amp;c-&gt;large_bkey_pool);</div><div class='del'>-	mempool_exit(&amp;c-&gt;btree_bounce_pool);</div><div class='del'>-	bioset_exit(&amp;c-&gt;btree_bio);</div><div class='del'>-	mempool_exit(&amp;c-&gt;fill_iter);</div><div class='del'>-#ifndef BCH_WRITE_REF_DEBUG</div><div class='del'>-	percpu_ref_exit(&amp;c-&gt;writes);</div><div class='del'>-#endif</div><div class='del'>-	kfree(rcu_dereference_protected(c-&gt;disk_groups, 1));</div><div class='del'>-	kfree(c-&gt;journal_seq_blacklist_table);</div><div class='del'>-	kfree(c-&gt;unused_inode_hints);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;write_ref_wq)</div><div class='del'>-		destroy_workqueue(c-&gt;write_ref_wq);</div><div class='del'>-	if (c-&gt;io_complete_wq)</div><div class='del'>-		destroy_workqueue(c-&gt;io_complete_wq);</div><div class='del'>-	if (c-&gt;copygc_wq)</div><div class='del'>-		destroy_workqueue(c-&gt;copygc_wq);</div><div class='del'>-	if (c-&gt;btree_io_complete_wq)</div><div class='del'>-		destroy_workqueue(c-&gt;btree_io_complete_wq);</div><div class='del'>-	if (c-&gt;btree_update_wq)</div><div class='del'>-		destroy_workqueue(c-&gt;btree_update_wq);</div><div class='del'>-</div><div class='del'>-	bch2_free_super(&amp;c-&gt;disk_sb);</div><div class='del'>-	kvpfree(c, sizeof(*c));</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_fs_release(struct kobject *kobj)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, kobj);</div><div class='del'>-</div><div class='del'>-	__bch2_fs_free(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_fs_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bch_verbose(c, "shutting down");</div><div class='del'>-</div><div class='del'>-	set_bit(BCH_FS_stopping, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	cancel_work_sync(&amp;c-&gt;journal_seq_blacklist_gc_work);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	bch2_fs_read_only(c);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca)</div><div class='del'>-		if (ca-&gt;kobj.state_in_sysfs &amp;&amp;</div><div class='del'>-		    ca-&gt;disk_sb.bdev)</div><div class='del'>-			sysfs_remove_link(bdev_kobj(ca-&gt;disk_sb.bdev), "bcachefs");</div><div class='del'>-</div><div class='del'>-	if (c-&gt;kobj.state_in_sysfs)</div><div class='del'>-		kobject_del(&amp;c-&gt;kobj);</div><div class='del'>-</div><div class='del'>-	bch2_fs_debug_exit(c);</div><div class='del'>-	bch2_fs_chardev_exit(c);</div><div class='del'>-</div><div class='del'>-	bch2_ro_ref_put(c);</div><div class='del'>-	wait_event(c-&gt;ro_ref_wait, !refcount_read(&amp;c-&gt;ro_ref));</div><div class='del'>-</div><div class='del'>-	kobject_put(&amp;c-&gt;counters_kobj);</div><div class='del'>-	kobject_put(&amp;c-&gt;time_stats);</div><div class='del'>-	kobject_put(&amp;c-&gt;opts_dir);</div><div class='del'>-	kobject_put(&amp;c-&gt;internal);</div><div class='del'>-</div><div class='del'>-	/* btree prefetch might have kicked off reads in the background: */</div><div class='del'>-	bch2_btree_flush_all_reads(c);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca)</div><div class='del'>-		cancel_work_sync(&amp;ca-&gt;io_error_work);</div><div class='del'>-</div><div class='del'>-	cancel_work_sync(&amp;c-&gt;read_only_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_free(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bch_fs_list_lock);</div><div class='del'>-	list_del(&amp;c-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-	closure_sync(&amp;c-&gt;cl);</div><div class='del'>-	closure_debug_destroy(&amp;c-&gt;cl);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;sb.nr_devices; i++) {</div><div class='del'>-		struct bch_dev *ca = rcu_dereference_protected(c-&gt;devs[i], true);</div><div class='del'>-</div><div class='del'>-		if (ca) {</div><div class='del'>-			bch2_free_super(&amp;ca-&gt;disk_sb);</div><div class='del'>-			bch2_dev_free(ca);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_verbose(c, "shutdown complete");</div><div class='del'>-</div><div class='del'>-	kobject_put(&amp;c-&gt;kobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_fs_stop(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	__bch2_fs_stop(c);</div><div class='del'>-	bch2_fs_free(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_fs_online(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-	if (__bch2_uuid_to_fs(c-&gt;sb.uuid)) {</div><div class='del'>-		bch_err(c, "filesystem UUID already open");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_chardev_init(c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error creating character device");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_fs_debug_init(c);</div><div class='del'>-</div><div class='del'>-	ret = kobject_add(&amp;c-&gt;kobj, NULL, "%pU", c-&gt;sb.user_uuid.b) ?:</div><div class='del'>-	    kobject_add(&amp;c-&gt;internal, &amp;c-&gt;kobj, "internal") ?:</div><div class='del'>-	    kobject_add(&amp;c-&gt;opts_dir, &amp;c-&gt;kobj, "options") ?:</div><div class='del'>-#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-	    kobject_add(&amp;c-&gt;time_stats, &amp;c-&gt;kobj, "time_stats") ?:</div><div class='del'>-#endif</div><div class='del'>-	    kobject_add(&amp;c-&gt;counters_kobj, &amp;c-&gt;kobj, "counters") ?:</div><div class='del'>-	    bch2_opts_create_sysfs_files(&amp;c-&gt;opts_dir);</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(c, "error creating sysfs objects");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	for_each_member_device(c, ca) {</div><div class='del'>-		ret = bch2_dev_sysfs_online(c, ca);</div><div class='del'>-		if (ret) {</div><div class='del'>-			bch_err(c, "error creating sysfs objects");</div><div class='del'>-			percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!list_empty(&amp;c-&gt;list));</div><div class='del'>-	list_add(&amp;c-&gt;list, &amp;bch_fs_list);</div><div class='del'>-err:</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c;</div><div class='del'>-	struct printbuf name = PRINTBUF;</div><div class='del'>-	unsigned i, iter_size;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	c = kvpmalloc(sizeof(struct bch_fs), GFP_KERNEL|__GFP_ZERO);</div><div class='del'>-	if (!c) {</div><div class='del'>-		c = ERR_PTR(-BCH_ERR_ENOMEM_fs_alloc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;stdio = (void *)(unsigned long) opts.stdio;</div><div class='del'>-</div><div class='del'>-	__module_get(THIS_MODULE);</div><div class='del'>-</div><div class='del'>-	closure_init(&amp;c-&gt;cl, NULL);</div><div class='del'>-</div><div class='del'>-	c-&gt;kobj.kset = bcachefs_kset;</div><div class='del'>-	kobject_init(&amp;c-&gt;kobj, &amp;bch2_fs_ktype);</div><div class='del'>-	kobject_init(&amp;c-&gt;internal, &amp;bch2_fs_internal_ktype);</div><div class='del'>-	kobject_init(&amp;c-&gt;opts_dir, &amp;bch2_fs_opts_dir_ktype);</div><div class='del'>-	kobject_init(&amp;c-&gt;time_stats, &amp;bch2_fs_time_stats_ktype);</div><div class='del'>-	kobject_init(&amp;c-&gt;counters_kobj, &amp;bch2_fs_counters_ktype);</div><div class='del'>-</div><div class='del'>-	c-&gt;minor		= -1;</div><div class='del'>-	c-&gt;disk_sb.fs_sb	= true;</div><div class='del'>-</div><div class='del'>-	init_rwsem(&amp;c-&gt;state_lock);</div><div class='del'>-	mutex_init(&amp;c-&gt;sb_lock);</div><div class='del'>-	mutex_init(&amp;c-&gt;replicas_gc_lock);</div><div class='del'>-	mutex_init(&amp;c-&gt;btree_root_lock);</div><div class='del'>-	INIT_WORK(&amp;c-&gt;read_only_work, bch2_fs_read_only_work);</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;c-&gt;ro_ref, 1);</div><div class='del'>-	init_waitqueue_head(&amp;c-&gt;ro_ref_wait);</div><div class='del'>-	sema_init(&amp;c-&gt;online_fsck_mutex, 1);</div><div class='del'>-</div><div class='del'>-	init_rwsem(&amp;c-&gt;gc_lock);</div><div class='del'>-	mutex_init(&amp;c-&gt;gc_gens_lock);</div><div class='del'>-	atomic_set(&amp;c-&gt;journal_keys.ref, 1);</div><div class='del'>-	c-&gt;journal_keys.initial_ref_held = true;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BCH_TIME_STAT_NR; i++)</div><div class='del'>-		bch2_time_stats_init(&amp;c-&gt;times[i]);</div><div class='del'>-</div><div class='del'>-	bch2_fs_copygc_init(c);</div><div class='del'>-	bch2_fs_btree_key_cache_init_early(&amp;c-&gt;btree_key_cache);</div><div class='del'>-	bch2_fs_btree_iter_init_early(c);</div><div class='del'>-	bch2_fs_btree_interior_update_init_early(c);</div><div class='del'>-	bch2_fs_allocator_background_init(c);</div><div class='del'>-	bch2_fs_allocator_foreground_init(c);</div><div class='del'>-	bch2_fs_rebalance_init(c);</div><div class='del'>-	bch2_fs_quota_init(c);</div><div class='del'>-	bch2_fs_ec_init_early(c);</div><div class='del'>-	bch2_fs_move_init(c);</div><div class='del'>-	bch2_fs_sb_errors_init_early(c);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;list);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;c-&gt;usage_scratch_lock);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;c-&gt;bio_bounce_pages_lock);</div><div class='del'>-	mutex_init(&amp;c-&gt;snapshot_table_lock);</div><div class='del'>-	init_rwsem(&amp;c-&gt;snapshot_create_lock);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;c-&gt;btree_write_error_lock);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;c-&gt;journal_seq_blacklist_gc_work,</div><div class='del'>-		  bch2_blacklist_entries_gc);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;journal_iters);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;fsck_error_msgs);</div><div class='del'>-	mutex_init(&amp;c-&gt;fsck_error_msgs_lock);</div><div class='del'>-</div><div class='del'>-	seqcount_init(&amp;c-&gt;gc_pos_lock);</div><div class='del'>-</div><div class='del'>-	seqcount_init(&amp;c-&gt;usage_lock);</div><div class='del'>-</div><div class='del'>-	sema_init(&amp;c-&gt;io_in_flight, 128);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;c-&gt;vfs_inodes_list);</div><div class='del'>-	mutex_init(&amp;c-&gt;vfs_inodes_lock);</div><div class='del'>-</div><div class='del'>-	c-&gt;copy_gc_enabled		= 1;</div><div class='del'>-	c-&gt;rebalance.enabled		= 1;</div><div class='del'>-	c-&gt;promote_whole_extents	= true;</div><div class='del'>-</div><div class='del'>-	c-&gt;journal.flush_write_time	= &amp;c-&gt;times[BCH_TIME_journal_flush_write];</div><div class='del'>-	c-&gt;journal.noflush_write_time	= &amp;c-&gt;times[BCH_TIME_journal_noflush_write];</div><div class='del'>-	c-&gt;journal.flush_seq_time	= &amp;c-&gt;times[BCH_TIME_journal_flush_seq];</div><div class='del'>-</div><div class='del'>-	bch2_fs_btree_cache_init_early(&amp;c-&gt;btree_cache);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;c-&gt;sectors_available_lock);</div><div class='del'>-</div><div class='del'>-	ret = percpu_init_rwsem(&amp;c-&gt;mark_lock);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	ret = bch2_sb_to_fs(c, sb);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	pr_uuid(&amp;name, c-&gt;sb.user_uuid.b);</div><div class='del'>-	strscpy(c-&gt;name, name.buf, sizeof(c-&gt;name));</div><div class='del'>-	printbuf_exit(&amp;name);</div><div class='del'>-</div><div class='del'>-	ret = name.allocation_failure ? -BCH_ERR_ENOMEM_fs_name_alloc : 0;</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	/* Compat: */</div><div class='del'>-	if (le16_to_cpu(sb-&gt;version) &lt;= bcachefs_metadata_version_inode_v2 &amp;&amp;</div><div class='del'>-	    !BCH_SB_JOURNAL_FLUSH_DELAY(sb))</div><div class='del'>-		SET_BCH_SB_JOURNAL_FLUSH_DELAY(sb, 1000);</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(sb-&gt;version) &lt;= bcachefs_metadata_version_inode_v2 &amp;&amp;</div><div class='del'>-	    !BCH_SB_JOURNAL_RECLAIM_DELAY(sb))</div><div class='del'>-		SET_BCH_SB_JOURNAL_RECLAIM_DELAY(sb, 100);</div><div class='del'>-</div><div class='del'>-	c-&gt;opts = bch2_opts_default;</div><div class='del'>-	ret = bch2_opts_from_sb(&amp;c-&gt;opts, sb);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_opts_apply(&amp;c-&gt;opts, opts);</div><div class='del'>-</div><div class='del'>-	c-&gt;btree_key_cache_btrees |= 1U &lt;&lt; BTREE_ID_alloc;</div><div class='del'>-	if (c-&gt;opts.inodes_use_key_cache)</div><div class='del'>-		c-&gt;btree_key_cache_btrees |= 1U &lt;&lt; BTREE_ID_inodes;</div><div class='del'>-	c-&gt;btree_key_cache_btrees |= 1U &lt;&lt; BTREE_ID_logged_ops;</div><div class='del'>-</div><div class='del'>-	c-&gt;block_bits		= ilog2(block_sectors(c));</div><div class='del'>-	c-&gt;btree_foreground_merge_threshold = BTREE_FOREGROUND_MERGE_THRESHOLD(c);</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_init_fault("fs_alloc")) {</div><div class='del'>-		bch_err(c, "fs_alloc fault injected");</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iter_size = sizeof(struct sort_iter) +</div><div class='del'>-		(btree_blocks(c) + 1) * 2 *</div><div class='del'>-		sizeof(struct sort_iter_set);</div><div class='del'>-</div><div class='del'>-	c-&gt;inode_shard_bits = ilog2(roundup_pow_of_two(num_possible_cpus()));</div><div class='del'>-</div><div class='del'>-	if (!(c-&gt;btree_update_wq = alloc_workqueue("bcachefs",</div><div class='del'>-				WQ_FREEZABLE|WQ_UNBOUND|WQ_MEM_RECLAIM, 512)) ||</div><div class='del'>-	    !(c-&gt;btree_io_complete_wq = alloc_workqueue("bcachefs_btree_io",</div><div class='del'>-				WQ_FREEZABLE|WQ_MEM_RECLAIM, 1)) ||</div><div class='del'>-	    !(c-&gt;copygc_wq = alloc_workqueue("bcachefs_copygc",</div><div class='del'>-				WQ_FREEZABLE|WQ_MEM_RECLAIM|WQ_CPU_INTENSIVE, 1)) ||</div><div class='del'>-	    !(c-&gt;io_complete_wq = alloc_workqueue("bcachefs_io",</div><div class='del'>-				WQ_FREEZABLE|WQ_HIGHPRI|WQ_MEM_RECLAIM, 512)) ||</div><div class='del'>-	    !(c-&gt;write_ref_wq = alloc_workqueue("bcachefs_write_ref",</div><div class='del'>-				WQ_FREEZABLE, 0)) ||</div><div class='del'>-#ifndef BCH_WRITE_REF_DEBUG</div><div class='del'>-	    percpu_ref_init(&amp;c-&gt;writes, bch2_writes_disabled,</div><div class='del'>-			    PERCPU_REF_INIT_DEAD, GFP_KERNEL) ||</div><div class='del'>-#endif</div><div class='del'>-	    mempool_init_kmalloc_pool(&amp;c-&gt;fill_iter, 1, iter_size) ||</div><div class='del'>-	    bioset_init(&amp;c-&gt;btree_bio, 1,</div><div class='del'>-			max(offsetof(struct btree_read_bio, bio),</div><div class='del'>-			    offsetof(struct btree_write_bio, wbio.bio)),</div><div class='del'>-			BIOSET_NEED_BVECS) ||</div><div class='del'>-	    !(c-&gt;pcpu = alloc_percpu(struct bch_fs_pcpu)) ||</div><div class='del'>-	    !(c-&gt;online_reserved = alloc_percpu(u64)) ||</div><div class='del'>-	    mempool_init_kvpmalloc_pool(&amp;c-&gt;btree_bounce_pool, 1,</div><div class='del'>-					c-&gt;opts.btree_node_size) ||</div><div class='del'>-	    mempool_init_kmalloc_pool(&amp;c-&gt;large_bkey_pool, 1, 2048) ||</div><div class='del'>-	    !(c-&gt;unused_inode_hints = kcalloc(1U &lt;&lt; c-&gt;inode_shard_bits,</div><div class='del'>-					      sizeof(u64), GFP_KERNEL))) {</div><div class='del'>-		ret = -BCH_ERR_ENOMEM_fs_other_alloc;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_counters_init(c) ?:</div><div class='del'>-	    bch2_fs_sb_errors_init(c) ?:</div><div class='del'>-	    bch2_io_clock_init(&amp;c-&gt;io_clock[READ]) ?:</div><div class='del'>-	    bch2_io_clock_init(&amp;c-&gt;io_clock[WRITE]) ?:</div><div class='del'>-	    bch2_fs_journal_init(&amp;c-&gt;journal) ?:</div><div class='del'>-	    bch2_fs_replicas_init(c) ?:</div><div class='del'>-	    bch2_fs_btree_cache_init(c) ?:</div><div class='del'>-	    bch2_fs_btree_key_cache_init(&amp;c-&gt;btree_key_cache) ?:</div><div class='del'>-	    bch2_fs_btree_iter_init(c) ?:</div><div class='del'>-	    bch2_fs_btree_interior_update_init(c) ?:</div><div class='del'>-	    bch2_fs_buckets_waiting_for_journal_init(c) ?:</div><div class='del'>-	    bch2_fs_btree_write_buffer_init(c) ?:</div><div class='del'>-	    bch2_fs_subvolumes_init(c) ?:</div><div class='del'>-	    bch2_fs_io_read_init(c) ?:</div><div class='del'>-	    bch2_fs_io_write_init(c) ?:</div><div class='del'>-	    bch2_fs_nocow_locking_init(c) ?:</div><div class='del'>-	    bch2_fs_encryption_init(c) ?:</div><div class='del'>-	    bch2_fs_compress_init(c) ?:</div><div class='del'>-	    bch2_fs_ec_init(c) ?:</div><div class='del'>-	    bch2_fs_fsio_init(c) ?:</div><div class='del'>-	    bch2_fs_fs_io_buffered_init(c) ?:</div><div class='del'>-	    bch2_fs_fs_io_direct_init(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;sb.nr_devices; i++)</div><div class='del'>-		if (bch2_dev_exists(c-&gt;disk_sb.sb, i) &amp;&amp;</div><div class='del'>-		    bch2_dev_alloc(c, i)) {</div><div class='del'>-			ret = -EEXIST;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	bch2_journal_entry_res_resize(&amp;c-&gt;journal,</div><div class='del'>-			&amp;c-&gt;btree_root_journal_res,</div><div class='del'>-			BTREE_ID_NR * (JSET_KEYS_U64s + BKEY_BTREE_PTR_U64s_MAX));</div><div class='del'>-	bch2_dev_usage_journal_reserve(c);</div><div class='del'>-	bch2_journal_entry_res_resize(&amp;c-&gt;journal,</div><div class='del'>-			&amp;c-&gt;clock_journal_res,</div><div class='del'>-			(sizeof(struct jset_entry_clock) / sizeof(u64)) * 2);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bch_fs_list_lock);</div><div class='del'>-	ret = bch2_fs_online(c);</div><div class='del'>-	mutex_unlock(&amp;bch_fs_list_lock);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-out:</div><div class='del'>-	return c;</div><div class='del'>-err:</div><div class='del'>-	bch2_fs_free(c);</div><div class='del'>-	c = ERR_PTR(ret);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-noinline_for_stack</div><div class='del'>-static void print_mount_opts(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	enum bch_opt_id i;</div><div class='del'>-	struct printbuf p = PRINTBUF;</div><div class='del'>-	bool first = true;</div><div class='del'>-</div><div class='del'>-	prt_str(&amp;p, "mounting version ");</div><div class='del'>-	bch2_version_to_text(&amp;p, c-&gt;sb.version);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.read_only) {</div><div class='del'>-		prt_str(&amp;p, " opts=");</div><div class='del'>-		first = false;</div><div class='del'>-		prt_printf(&amp;p, "ro");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bch2_opts_nr; i++) {</div><div class='del'>-		const struct bch_option *opt = &amp;bch2_opt_table[i];</div><div class='del'>-		u64 v = bch2_opt_get_by_id(&amp;c-&gt;opts, i);</div><div class='del'>-</div><div class='del'>-		if (!(opt-&gt;flags &amp; OPT_MOUNT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (v == bch2_opt_get_by_id(&amp;bch2_opts_default, i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		prt_str(&amp;p, first ? " opts=" : ",");</div><div class='del'>-		first = false;</div><div class='del'>-		bch2_opt_to_text(&amp;p, c, c-&gt;disk_sb.sb, opt, v, OPT_SHOW_MOUNT_STYLE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch_info(c, "%s", p.buf);</div><div class='del'>-	printbuf_exit(&amp;p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_fs_start(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	time64_t now = ktime_get_real_seconds();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	print_mount_opts(c);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(test_bit(BCH_FS_started, &amp;c-&gt;flags));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_members_v2_init(c);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_online_member(c, ca)</div><div class='del'>-		bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx)-&gt;last_mount = cpu_to_le64(now);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	for_each_rw_member(c, ca)</div><div class='del'>-		bch2_dev_allocator_add(c, ca);</div><div class='del'>-	bch2_recalc_capacity(c);</div><div class='del'>-</div><div class='del'>-	ret = BCH_SB_INITIALIZED(c-&gt;disk_sb.sb)</div><div class='del'>-		? bch2_fs_recovery(c)</div><div class='del'>-		: bch2_fs_initialize(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_opts_check_may_set(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_init_fault("fs_start")) {</div><div class='del'>-		bch_err(c, "fs_start fault injected");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(BCH_FS_started, &amp;c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.read_only) {</div><div class='del'>-		bch2_fs_read_only(c);</div><div class='del'>-	} else {</div><div class='del'>-		ret = !test_bit(BCH_FS_rw, &amp;c-&gt;flags)</div><div class='del'>-			? bch2_fs_read_write(c)</div><div class='del'>-			: bch2_fs_read_write_late(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-err:</div><div class='del'>-	if (ret)</div><div class='del'>-		bch_err_msg(c, ret, "starting filesystem");</div><div class='del'>-	else</div><div class='del'>-		bch_verbose(c, "done starting filesystem");</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_may_add(struct bch_sb *sb, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_member m = bch2_sb_member_get(sb, sb-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(sb-&gt;block_size) != block_sectors(c))</div><div class='del'>-		return -BCH_ERR_mismatched_block_size;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(m.bucket_size) &lt;</div><div class='del'>-	    BCH_SB_BTREE_NODE_SIZE(c-&gt;disk_sb.sb))</div><div class='del'>-		return -BCH_ERR_bucket_size_too_small;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_in_fs(struct bch_sb_handle *fs,</div><div class='del'>-			  struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	if (fs == sb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!uuid_equal(&amp;fs-&gt;sb-&gt;uuid, &amp;sb-&gt;sb-&gt;uuid))</div><div class='del'>-		return -BCH_ERR_device_not_a_member_of_filesystem;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_exists(fs-&gt;sb, sb-&gt;sb-&gt;dev_idx))</div><div class='del'>-		return -BCH_ERR_device_has_been_removed;</div><div class='del'>-</div><div class='del'>-	if (fs-&gt;sb-&gt;block_size != sb-&gt;sb-&gt;block_size)</div><div class='del'>-		return -BCH_ERR_mismatched_block_size;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(fs-&gt;sb-&gt;version) &lt; bcachefs_metadata_version_member_seq ||</div><div class='del'>-	    le16_to_cpu(sb-&gt;sb-&gt;version) &lt; bcachefs_metadata_version_member_seq)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (fs-&gt;sb-&gt;seq == sb-&gt;sb-&gt;seq &amp;&amp;</div><div class='del'>-	    fs-&gt;sb-&gt;write_time != sb-&gt;sb-&gt;write_time) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_str(&amp;buf, "Split brain detected between ");</div><div class='del'>-		prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-		prt_str(&amp;buf, " and ");</div><div class='del'>-		prt_bdevname(&amp;buf, fs-&gt;bdev);</div><div class='del'>-		prt_char(&amp;buf, ':');</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-		prt_printf(&amp;buf, "seq=%llu but write_time different, got", le64_to_cpu(sb-&gt;sb-&gt;seq));</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_bdevname(&amp;buf, fs-&gt;bdev);</div><div class='del'>-		prt_char(&amp;buf, ' ');</div><div class='del'>-		bch2_prt_datetime(&amp;buf, le64_to_cpu(fs-&gt;sb-&gt;write_time));;</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-		prt_char(&amp;buf, ' ');</div><div class='del'>-		bch2_prt_datetime(&amp;buf, le64_to_cpu(sb-&gt;sb-&gt;write_time));;</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_printf(&amp;buf, "Not using older sb");</div><div class='del'>-</div><div class='del'>-		pr_err("%s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return -BCH_ERR_device_splitbrain;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	struct bch_member m = bch2_sb_member_get(fs-&gt;sb, sb-&gt;sb-&gt;dev_idx);</div><div class='del'>-	u64 seq_from_fs		= le64_to_cpu(m.seq);</div><div class='del'>-	u64 seq_from_member	= le64_to_cpu(sb-&gt;sb-&gt;seq);</div><div class='del'>-</div><div class='del'>-	if (seq_from_fs &amp;&amp; seq_from_fs &lt; seq_from_member) {</div><div class='del'>-		struct printbuf buf = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_str(&amp;buf, "Split brain detected between ");</div><div class='del'>-		prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-		prt_str(&amp;buf, " and ");</div><div class='del'>-		prt_bdevname(&amp;buf, fs-&gt;bdev);</div><div class='del'>-		prt_char(&amp;buf, ':');</div><div class='del'>-		prt_newline(&amp;buf);</div><div class='del'>-</div><div class='del'>-		prt_bdevname(&amp;buf, fs-&gt;bdev);</div><div class='del'>-		prt_str(&amp;buf, "believes seq of ");</div><div class='del'>-		prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-		prt_printf(&amp;buf, " to be %llu, but ", seq_from_fs);</div><div class='del'>-		prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-		prt_printf(&amp;buf, " has %llu\n", seq_from_member);</div><div class='del'>-		prt_str(&amp;buf, "Not using ");</div><div class='del'>-		prt_bdevname(&amp;buf, sb-&gt;bdev);</div><div class='del'>-</div><div class='del'>-		pr_err("%s", buf.buf);</div><div class='del'>-		printbuf_exit(&amp;buf);</div><div class='del'>-		return -BCH_ERR_device_splitbrain;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Device startup/shutdown: */</div><div class='del'>-</div><div class='del'>-static void bch2_dev_release(struct kobject *kobj)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = container_of(kobj, struct bch_dev, kobj);</div><div class='del'>-</div><div class='del'>-	kfree(ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dev_free(struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	cancel_work_sync(&amp;ca-&gt;io_error_work);</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;kobj.state_in_sysfs &amp;&amp;</div><div class='del'>-	    ca-&gt;disk_sb.bdev)</div><div class='del'>-		sysfs_remove_link(bdev_kobj(ca-&gt;disk_sb.bdev), "bcachefs");</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;kobj.state_in_sysfs)</div><div class='del'>-		kobject_del(&amp;ca-&gt;kobj);</div><div class='del'>-</div><div class='del'>-	bch2_free_super(&amp;ca-&gt;disk_sb);</div><div class='del'>-	bch2_dev_journal_exit(ca);</div><div class='del'>-</div><div class='del'>-	free_percpu(ca-&gt;io_done);</div><div class='del'>-	bioset_exit(&amp;ca-&gt;replica_set);</div><div class='del'>-	bch2_dev_buckets_free(ca);</div><div class='del'>-	free_page((unsigned long) ca-&gt;sb_read_scratch);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_exit(&amp;ca-&gt;io_latency[WRITE]);</div><div class='del'>-	bch2_time_stats_exit(&amp;ca-&gt;io_latency[READ]);</div><div class='del'>-</div><div class='del'>-	percpu_ref_exit(&amp;ca-&gt;io_ref);</div><div class='del'>-	percpu_ref_exit(&amp;ca-&gt;ref);</div><div class='del'>-	kobject_put(&amp;ca-&gt;kobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_dev_offline(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	if (percpu_ref_is_zero(&amp;ca-&gt;io_ref))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__bch2_dev_read_only(c, ca);</div><div class='del'>-</div><div class='del'>-	reinit_completion(&amp;ca-&gt;io_ref_completion);</div><div class='del'>-	percpu_ref_kill(&amp;ca-&gt;io_ref);</div><div class='del'>-	wait_for_completion(&amp;ca-&gt;io_ref_completion);</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;kobj.state_in_sysfs) {</div><div class='del'>-		sysfs_remove_link(bdev_kobj(ca-&gt;disk_sb.bdev), "bcachefs");</div><div class='del'>-		sysfs_remove_link(&amp;ca-&gt;kobj, "block");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_free_super(&amp;ca-&gt;disk_sb);</div><div class='del'>-	bch2_dev_journal_exit(ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dev_ref_complete(struct percpu_ref *ref)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = container_of(ref, struct bch_dev, ref);</div><div class='del'>-</div><div class='del'>-	complete(&amp;ca-&gt;ref_completion);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dev_io_ref_complete(struct percpu_ref *ref)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = container_of(ref, struct bch_dev, io_ref);</div><div class='del'>-</div><div class='del'>-	complete(&amp;ca-&gt;io_ref_completion);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_sysfs_online(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;kobj.state_in_sysfs)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!ca-&gt;kobj.state_in_sysfs) {</div><div class='del'>-		ret = kobject_add(&amp;ca-&gt;kobj, &amp;c-&gt;kobj,</div><div class='del'>-				  "dev-%u", ca-&gt;dev_idx);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;disk_sb.bdev) {</div><div class='del'>-		struct kobject *block = bdev_kobj(ca-&gt;disk_sb.bdev);</div><div class='del'>-</div><div class='del'>-		ret = sysfs_create_link(block, &amp;ca-&gt;kobj, "bcachefs");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = sysfs_create_link(&amp;ca-&gt;kobj, block, "block");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct bch_dev *__bch2_dev_alloc(struct bch_fs *c,</div><div class='del'>-					struct bch_member *member)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	ca = kzalloc(sizeof(*ca), GFP_KERNEL);</div><div class='del'>-	if (!ca)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	kobject_init(&amp;ca-&gt;kobj, &amp;bch2_dev_ktype);</div><div class='del'>-	init_completion(&amp;ca-&gt;ref_completion);</div><div class='del'>-	init_completion(&amp;ca-&gt;io_ref_completion);</div><div class='del'>-</div><div class='del'>-	init_rwsem(&amp;ca-&gt;bucket_lock);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;ca-&gt;io_error_work, bch2_io_error_work);</div><div class='del'>-</div><div class='del'>-	bch2_time_stats_init(&amp;ca-&gt;io_latency[READ]);</div><div class='del'>-	bch2_time_stats_init(&amp;ca-&gt;io_latency[WRITE]);</div><div class='del'>-</div><div class='del'>-	ca-&gt;mi = bch2_mi_to_cpu(member);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(member-&gt;errors); i++)</div><div class='del'>-		atomic64_set(&amp;ca-&gt;errors[i], le64_to_cpu(member-&gt;errors[i]));</div><div class='del'>-</div><div class='del'>-	ca-&gt;uuid = member-&gt;uuid;</div><div class='del'>-</div><div class='del'>-	ca-&gt;nr_btree_reserve = DIV_ROUND_UP(BTREE_NODE_RESERVE,</div><div class='del'>-			     ca-&gt;mi.bucket_size / btree_sectors(c));</div><div class='del'>-</div><div class='del'>-	if (percpu_ref_init(&amp;ca-&gt;ref, bch2_dev_ref_complete,</div><div class='del'>-			    0, GFP_KERNEL) ||</div><div class='del'>-	    percpu_ref_init(&amp;ca-&gt;io_ref, bch2_dev_io_ref_complete,</div><div class='del'>-			    PERCPU_REF_INIT_DEAD, GFP_KERNEL) ||</div><div class='del'>-	    !(ca-&gt;sb_read_scratch = (void *) __get_free_page(GFP_KERNEL)) ||</div><div class='del'>-	    bch2_dev_buckets_alloc(c, ca) ||</div><div class='del'>-	    bioset_init(&amp;ca-&gt;replica_set, 4,</div><div class='del'>-			offsetof(struct bch_write_bio, bio), 0) ||</div><div class='del'>-	    !(ca-&gt;io_done	= alloc_percpu(*ca-&gt;io_done)))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-err:</div><div class='del'>-	bch2_dev_free(ca);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_dev_attach(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			    unsigned dev_idx)</div><div class='del'>-{</div><div class='del'>-	ca-&gt;dev_idx = dev_idx;</div><div class='del'>-	__set_bit(ca-&gt;dev_idx, ca-&gt;self.d);</div><div class='del'>-	scnprintf(ca-&gt;name, sizeof(ca-&gt;name), "dev-%u", dev_idx);</div><div class='del'>-</div><div class='del'>-	ca-&gt;fs = c;</div><div class='del'>-	rcu_assign_pointer(c-&gt;devs[ca-&gt;dev_idx], ca);</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_sysfs_online(c, ca))</div><div class='del'>-		pr_warn("error creating sysfs objects");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_alloc(struct bch_fs *c, unsigned dev_idx)</div><div class='del'>-{</div><div class='del'>-	struct bch_member member = bch2_sb_member_get(c-&gt;disk_sb.sb, dev_idx);</div><div class='del'>-	struct bch_dev *ca = NULL;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (bch2_fs_init_fault("dev_alloc"))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ca = __bch2_dev_alloc(c, &amp;member);</div><div class='del'>-	if (!ca)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ca-&gt;fs = c;</div><div class='del'>-</div><div class='del'>-	bch2_dev_attach(c, ca, dev_idx);</div><div class='del'>-	return ret;</div><div class='del'>-err:</div><div class='del'>-	if (ca)</div><div class='del'>-		bch2_dev_free(ca);</div><div class='del'>-	return -BCH_ERR_ENOMEM_dev_alloc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_dev_attach_bdev(struct bch_dev *ca, struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	unsigned ret;</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_is_online(ca)) {</div><div class='del'>-		bch_err(ca, "already have device online in slot %u",</div><div class='del'>-			sb-&gt;sb-&gt;dev_idx);</div><div class='del'>-		return -BCH_ERR_device_already_online;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (get_capacity(sb-&gt;bdev-&gt;bd_disk) &lt;</div><div class='del'>-	    ca-&gt;mi.bucket_size * ca-&gt;mi.nbuckets) {</div><div class='del'>-		bch_err(ca, "cannot online: device too small");</div><div class='del'>-		return -BCH_ERR_device_size_too_small;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(!percpu_ref_is_zero(&amp;ca-&gt;io_ref));</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_journal_init(ca, sb-&gt;sb);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Commit: */</div><div class='del'>-	ca-&gt;disk_sb = *sb;</div><div class='del'>-	memset(sb, 0, sizeof(*sb));</div><div class='del'>-</div><div class='del'>-	ca-&gt;dev = ca-&gt;disk_sb.bdev-&gt;bd_dev;</div><div class='del'>-</div><div class='del'>-	percpu_ref_reinit(&amp;ca-&gt;io_ref);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_dev_attach_bdev(struct bch_fs *c, struct bch_sb_handle *sb)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(sb-&gt;sb-&gt;seq) &gt;</div><div class='del'>-	    le64_to_cpu(c-&gt;disk_sb.sb-&gt;seq))</div><div class='del'>-		bch2_sb_to_fs(c, sb-&gt;sb);</div><div class='del'>-</div><div class='del'>-	BUG_ON(sb-&gt;sb-&gt;dev_idx &gt;= c-&gt;sb.nr_devices ||</div><div class='del'>-	       !c-&gt;devs[sb-&gt;sb-&gt;dev_idx]);</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_locked(c, sb-&gt;sb-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_dev_attach_bdev(ca, sb);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	bch2_dev_sysfs_online(c, ca);</div><div class='del'>-</div><div class='del'>-	struct printbuf name = PRINTBUF;</div><div class='del'>-	prt_bdevname(&amp;name, ca-&gt;disk_sb.bdev);</div><div class='del'>-</div><div class='del'>-	if (c-&gt;sb.nr_devices == 1)</div><div class='del'>-		strscpy(c-&gt;name, name.buf, sizeof(c-&gt;name));</div><div class='del'>-	strscpy(ca-&gt;name, name.buf, sizeof(ca-&gt;name));</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;name);</div><div class='del'>-</div><div class='del'>-	rebalance_wakeup(c);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Device management: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note: this function is also used by the error paths - when a particular</div><div class='del'>- * device sees an error, we call it to determine whether we can just set the</div><div class='del'>- * device RO, or - if this function returns false - we'll set the whole</div><div class='del'>- * filesystem RO:</div><div class='del'>- *</div><div class='del'>- * XXX: maybe we should be more explicit about whether we're changing state</div><div class='del'>- * because we got an error or what have you?</div><div class='del'>- */</div><div class='del'>-bool bch2_dev_state_allowed(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			    enum bch_member_state new_state, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_devs_mask new_online_devs;</div><div class='del'>-	int nr_rw = 0, required;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	switch (new_state) {</div><div class='del'>-	case BCH_MEMBER_STATE_rw:</div><div class='del'>-		return true;</div><div class='del'>-	case BCH_MEMBER_STATE_ro:</div><div class='del'>-		if (ca-&gt;mi.state != BCH_MEMBER_STATE_rw)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		/* do we have enough devices to write to?  */</div><div class='del'>-		for_each_member_device(c, ca2)</div><div class='del'>-			if (ca2 != ca)</div><div class='del'>-				nr_rw += ca2-&gt;mi.state == BCH_MEMBER_STATE_rw;</div><div class='del'>-</div><div class='del'>-		required = max(!(flags &amp; BCH_FORCE_IF_METADATA_DEGRADED)</div><div class='del'>-			       ? c-&gt;opts.metadata_replicas</div><div class='del'>-			       : c-&gt;opts.metadata_replicas_required,</div><div class='del'>-			       !(flags &amp; BCH_FORCE_IF_DATA_DEGRADED)</div><div class='del'>-			       ? c-&gt;opts.data_replicas</div><div class='del'>-			       : c-&gt;opts.data_replicas_required);</div><div class='del'>-</div><div class='del'>-		return nr_rw &gt;= required;</div><div class='del'>-	case BCH_MEMBER_STATE_failed:</div><div class='del'>-	case BCH_MEMBER_STATE_spare:</div><div class='del'>-		if (ca-&gt;mi.state != BCH_MEMBER_STATE_rw &amp;&amp;</div><div class='del'>-		    ca-&gt;mi.state != BCH_MEMBER_STATE_ro)</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		/* do we have enough devices to read from?  */</div><div class='del'>-		new_online_devs = bch2_online_devs(c);</div><div class='del'>-		__clear_bit(ca-&gt;dev_idx, new_online_devs.d);</div><div class='del'>-</div><div class='del'>-		return bch2_have_enough_devs(c, new_online_devs, flags, false);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool bch2_fs_may_start(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	unsigned i, flags = 0;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.very_degraded)</div><div class='del'>-		flags |= BCH_FORCE_IF_DEGRADED|BCH_FORCE_IF_LOST;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;opts.degraded)</div><div class='del'>-		flags |= BCH_FORCE_IF_DEGRADED;</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;opts.degraded &amp;&amp;</div><div class='del'>-	    !c-&gt;opts.very_degraded) {</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; c-&gt;disk_sb.sb-&gt;nr_devices; i++) {</div><div class='del'>-			if (!bch2_dev_exists(c-&gt;disk_sb.sb, i))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ca = bch_dev_locked(c, i);</div><div class='del'>-</div><div class='del'>-			if (!bch2_dev_is_online(ca) &amp;&amp;</div><div class='del'>-			    (ca-&gt;mi.state == BCH_MEMBER_STATE_rw ||</div><div class='del'>-			     ca-&gt;mi.state == BCH_MEMBER_STATE_ro)) {</div><div class='del'>-				mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-				return false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bch2_have_enough_devs(c, bch2_online_devs(c), flags, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_dev_read_only(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * The allocator thread itself allocates btree nodes, so stop it first:</div><div class='del'>-	 */</div><div class='del'>-	bch2_dev_allocator_remove(c, ca);</div><div class='del'>-	bch2_dev_journal_stop(&amp;c-&gt;journal, ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_dev_read_write(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(ca-&gt;mi.state != BCH_MEMBER_STATE_rw);</div><div class='del'>-</div><div class='del'>-	bch2_dev_allocator_add(c, ca);</div><div class='del'>-	bch2_recalc_capacity(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __bch2_dev_set_state(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-			 enum bch_member_state new_state, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_member *m;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.state == new_state)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_state_allowed(c, ca, new_state, flags))</div><div class='del'>-		return -BCH_ERR_device_state_not_allowed;</div><div class='del'>-</div><div class='del'>-	if (new_state != BCH_MEMBER_STATE_rw)</div><div class='del'>-		__bch2_dev_read_only(c, ca);</div><div class='del'>-</div><div class='del'>-	bch_notice(ca, "%s", bch2_member_states[new_state]);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	m = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	SET_BCH_MEMBER_STATE(m, new_state);</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (new_state == BCH_MEMBER_STATE_rw)</div><div class='del'>-		__bch2_dev_read_write(c, ca);</div><div class='del'>-</div><div class='del'>-	rebalance_wakeup(c);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_set_state(struct bch_fs *c, struct bch_dev *ca,</div><div class='del'>-		       enum bch_member_state new_state, int flags)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	ret = __bch2_dev_set_state(c, ca, new_state, flags);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Device add/removal: */</div><div class='del'>-</div><div class='del'>-static int bch2_dev_remove_alloc(struct bch_fs *c, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bpos start	= POS(ca-&gt;dev_idx, 0);</div><div class='del'>-	struct bpos end		= POS(ca-&gt;dev_idx, U64_MAX);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We clear the LRU and need_discard btrees first so that we don't race</div><div class='del'>-	 * with bch2_do_invalidates() and bch2_do_discards()</div><div class='del'>-	 */</div><div class='del'>-	ret =   bch2_btree_delete_range(c, BTREE_ID_lru, start, end,</div><div class='del'>-					BTREE_TRIGGER_NORUN, NULL) ?:</div><div class='del'>-		bch2_btree_delete_range(c, BTREE_ID_need_discard, start, end,</div><div class='del'>-					BTREE_TRIGGER_NORUN, NULL) ?:</div><div class='del'>-		bch2_btree_delete_range(c, BTREE_ID_freespace, start, end,</div><div class='del'>-					BTREE_TRIGGER_NORUN, NULL) ?:</div><div class='del'>-		bch2_btree_delete_range(c, BTREE_ID_backpointers, start, end,</div><div class='del'>-					BTREE_TRIGGER_NORUN, NULL) ?:</div><div class='del'>-		bch2_btree_delete_range(c, BTREE_ID_alloc, start, end,</div><div class='del'>-					BTREE_TRIGGER_NORUN, NULL) ?:</div><div class='del'>-		bch2_btree_delete_range(c, BTREE_ID_bucket_gens, start, end,</div><div class='del'>-					BTREE_TRIGGER_NORUN, NULL);</div><div class='del'>-	bch_err_msg(c, ret, "removing dev alloc info");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_remove(struct bch_fs *c, struct bch_dev *ca, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_member *m;</div><div class='del'>-	unsigned dev_idx = ca-&gt;dev_idx, data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We consume a reference to ca-&gt;ref, regardless of whether we succeed</div><div class='del'>-	 * or fail:</div><div class='del'>-	 */</div><div class='del'>-	percpu_ref_put(&amp;ca-&gt;ref);</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_state_allowed(c, ca, BCH_MEMBER_STATE_failed, flags)) {</div><div class='del'>-		bch_err(ca, "Cannot remove without losing data");</div><div class='del'>-		ret = -BCH_ERR_device_state_not_allowed;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_dev_read_only(c, ca);</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_data_drop(c, ca-&gt;dev_idx, flags);</div><div class='del'>-	bch_err_msg(ca, ret, "dropping data");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_remove_alloc(c, ca);</div><div class='del'>-	bch_err_msg(ca, ret, "deleting alloc info");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_flush_device_pins(&amp;c-&gt;journal, ca-&gt;dev_idx);</div><div class='del'>-	bch_err_msg(ca, ret, "flushing journal");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_journal_flush(&amp;c-&gt;journal);</div><div class='del'>-	bch_err(ca, "journal error");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_replicas_gc2(c);</div><div class='del'>-	bch_err_msg(ca, ret, "in replicas_gc2()");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	data = bch2_dev_has_data(c, ca);</div><div class='del'>-	if (data) {</div><div class='del'>-		struct printbuf data_has = PRINTBUF;</div><div class='del'>-</div><div class='del'>-		prt_bitflags(&amp;data_has, __bch2_data_types, data);</div><div class='del'>-		bch_err(ca, "Remove failed, still has data (%s)", data_has.buf);</div><div class='del'>-		printbuf_exit(&amp;data_has);</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_dev_offline(c, ca);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	rcu_assign_pointer(c-&gt;devs[ca-&gt;dev_idx], NULL);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	percpu_ref_kill(&amp;ca-&gt;ref);</div><div class='del'>-	wait_for_completion(&amp;ca-&gt;ref_completion);</div><div class='del'>-</div><div class='del'>-	bch2_dev_free(ca);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * At this point the device object has been removed in-core, but the</div><div class='del'>-	 * on-disk journal might still refer to the device index via sb device</div><div class='del'>-	 * usage entries. Recovery fails if it sees usage information for an</div><div class='del'>-	 * invalid device. Flush journal pins to push the back of the journal</div><div class='del'>-	 * past now invalid device index references before we update the</div><div class='del'>-	 * superblock, but after the device object has been removed so any</div><div class='del'>-	 * further journal writes elide usage info for the device.</div><div class='del'>-	 */</div><div class='del'>-	bch2_journal_flush_all_pins(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Free this device's slot in the bch_member array - all pointers to</div><div class='del'>-	 * this device must be gone:</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	m = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, dev_idx);</div><div class='del'>-	memset(&amp;m-&gt;uuid, 0, sizeof(m-&gt;uuid));</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_journal_reserve(c);</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	if (ca-&gt;mi.state == BCH_MEMBER_STATE_rw &amp;&amp;</div><div class='del'>-	    !percpu_ref_is_zero(&amp;ca-&gt;io_ref))</div><div class='del'>-		__bch2_dev_read_write(c, ca);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add new device to running filesystem: */</div><div class='del'>-int bch2_dev_add(struct bch_fs *c, const char *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_opts opts = bch2_opts_empty();</div><div class='del'>-	struct bch_sb_handle sb;</div><div class='del'>-	struct bch_dev *ca = NULL;</div><div class='del'>-	struct bch_sb_field_members_v2 *mi;</div><div class='del'>-	struct bch_member dev_mi;</div><div class='del'>-	unsigned dev_idx, nr_devices, u64s;</div><div class='del'>-	struct printbuf errbuf = PRINTBUF;</div><div class='del'>-	struct printbuf label = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_read_super(path, &amp;opts, &amp;sb);</div><div class='del'>-	bch_err_msg(c, ret, "reading super");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	dev_mi = bch2_sb_member_get(sb.sb, sb.sb-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-	if (BCH_MEMBER_GROUP(&amp;dev_mi)) {</div><div class='del'>-		bch2_disk_path_to_text_sb(&amp;label, sb.sb, BCH_MEMBER_GROUP(&amp;dev_mi) - 1);</div><div class='del'>-		if (label.allocation_failure) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_may_add(sb.sb, c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ca = __bch2_dev_alloc(c, &amp;dev_mi);</div><div class='del'>-	if (!ca) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_init(ca);</div><div class='del'>-</div><div class='del'>-	ret = __bch2_dev_attach_bdev(ca, &amp;sb);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_journal_alloc(ca);</div><div class='del'>-	bch_err_msg(c, ret, "allocating journal");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	ret = bch2_sb_from_fs(c, ca);</div><div class='del'>-	bch_err_msg(c, ret, "setting up new superblock");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_unlock;</div><div class='del'>-</div><div class='del'>-	if (dynamic_fault("bcachefs:add:no_slot"))</div><div class='del'>-		goto no_slot;</div><div class='del'>-</div><div class='del'>-	for (dev_idx = 0; dev_idx &lt; BCH_SB_MEMBERS_MAX; dev_idx++)</div><div class='del'>-		if (!bch2_dev_exists(c-&gt;disk_sb.sb, dev_idx))</div><div class='del'>-			goto have_slot;</div><div class='del'>-no_slot:</div><div class='del'>-	ret = -BCH_ERR_ENOSPC_sb_members;</div><div class='del'>-	bch_err_msg(c, ret, "setting up new superblock");</div><div class='del'>-	goto err_unlock;</div><div class='del'>-</div><div class='del'>-have_slot:</div><div class='del'>-	nr_devices = max_t(unsigned, dev_idx + 1, c-&gt;sb.nr_devices);</div><div class='del'>-</div><div class='del'>-	mi = bch2_sb_field_get(c-&gt;disk_sb.sb, members_v2);</div><div class='del'>-	u64s = DIV_ROUND_UP(sizeof(struct bch_sb_field_members_v2) +</div><div class='del'>-			    le16_to_cpu(mi-&gt;member_bytes) * nr_devices, sizeof(u64));</div><div class='del'>-</div><div class='del'>-	mi = bch2_sb_field_resize(&amp;c-&gt;disk_sb, members_v2, u64s);</div><div class='del'>-	if (!mi) {</div><div class='del'>-		ret = -BCH_ERR_ENOSPC_sb_members;</div><div class='del'>-		bch_err_msg(c, ret, "setting up new superblock");</div><div class='del'>-		goto err_unlock;</div><div class='del'>-	}</div><div class='del'>-	struct bch_member *m = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, dev_idx);</div><div class='del'>-</div><div class='del'>-	/* success: */</div><div class='del'>-</div><div class='del'>-	*m = dev_mi;</div><div class='del'>-	m-&gt;last_mount = cpu_to_le64(ktime_get_real_seconds());</div><div class='del'>-	c-&gt;disk_sb.sb-&gt;nr_devices	= nr_devices;</div><div class='del'>-</div><div class='del'>-	ca-&gt;disk_sb.sb-&gt;dev_idx	= dev_idx;</div><div class='del'>-	bch2_dev_attach(c, ca, dev_idx);</div><div class='del'>-</div><div class='del'>-	if (BCH_MEMBER_GROUP(&amp;dev_mi)) {</div><div class='del'>-		ret = __bch2_dev_group_set(c, ca, label.buf);</div><div class='del'>-		bch_err_msg(c, ret, "creating new label");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_journal_reserve(c);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_mark_dev_sb(c, ca);</div><div class='del'>-	bch_err_msg(ca, ret, "marking new superblock");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_late;</div><div class='del'>-</div><div class='del'>-	ret = bch2_fs_freespace_init(c);</div><div class='del'>-	bch_err_msg(ca, ret, "initializing free space");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_late;</div><div class='del'>-</div><div class='del'>-	ca-&gt;new_fs_bucket_idx = 0;</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.state == BCH_MEMBER_STATE_rw)</div><div class='del'>-		__bch2_dev_read_write(c, ca);</div><div class='del'>-</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_unlock:</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-err:</div><div class='del'>-	if (ca)</div><div class='del'>-		bch2_dev_free(ca);</div><div class='del'>-	bch2_free_super(&amp;sb);</div><div class='del'>-	printbuf_exit(&amp;label);</div><div class='del'>-	printbuf_exit(&amp;errbuf);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-err_late:</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	ca = NULL;</div><div class='del'>-	goto err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hot add existing device to running filesystem: */</div><div class='del'>-int bch2_dev_online(struct bch_fs *c, const char *path)</div><div class='del'>-{</div><div class='del'>-	struct bch_opts opts = bch2_opts_empty();</div><div class='del'>-	struct bch_sb_handle sb = { NULL };</div><div class='del'>-	struct bch_dev *ca;</div><div class='del'>-	unsigned dev_idx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	ret = bch2_read_super(path, &amp;opts, &amp;sb);</div><div class='del'>-	if (ret) {</div><div class='del'>-		up_write(&amp;c-&gt;state_lock);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_idx = sb.sb-&gt;dev_idx;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_in_fs(&amp;c-&gt;disk_sb, &amp;sb);</div><div class='del'>-	bch_err_msg(c, ret, "bringing %s online", path);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_attach_bdev(c, &amp;sb);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ca = bch_dev_locked(c, dev_idx);</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_mark_dev_sb(c, ca);</div><div class='del'>-	bch_err_msg(c, ret, "bringing %s online: error from bch2_trans_mark_dev_sb", path);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.state == BCH_MEMBER_STATE_rw)</div><div class='del'>-		__bch2_dev_read_write(c, ca);</div><div class='del'>-</div><div class='del'>-	if (!ca-&gt;mi.freespace_initialized) {</div><div class='del'>-		ret = bch2_dev_freespace_init(c, ca, 0, ca-&gt;mi.nbuckets);</div><div class='del'>-		bch_err_msg(ca, ret, "initializing free space");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ca-&gt;journal.nr) {</div><div class='del'>-		ret = bch2_dev_journal_alloc(ca);</div><div class='del'>-		bch_err_msg(ca, ret, "allocating journal");</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx)-&gt;last_mount =</div><div class='del'>-		cpu_to_le64(ktime_get_real_seconds());</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	bch2_free_super(&amp;sb);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_offline(struct bch_fs *c, struct bch_dev *ca, int flags)</div><div class='del'>-{</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_is_online(ca)) {</div><div class='del'>-		bch_err(ca, "Already offline");</div><div class='del'>-		up_write(&amp;c-&gt;state_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!bch2_dev_state_allowed(c, ca, BCH_MEMBER_STATE_failed, flags)) {</div><div class='del'>-		bch_err(ca, "Cannot offline required disk");</div><div class='del'>-		up_write(&amp;c-&gt;state_lock);</div><div class='del'>-		return -BCH_ERR_device_state_not_allowed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__bch2_dev_offline(c, ca);</div><div class='del'>-</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_dev_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets)</div><div class='del'>-{</div><div class='del'>-	struct bch_member *m;</div><div class='del'>-	u64 old_nbuckets;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	old_nbuckets = ca-&gt;mi.nbuckets;</div><div class='del'>-</div><div class='del'>-	if (nbuckets &lt; ca-&gt;mi.nbuckets) {</div><div class='del'>-		bch_err(ca, "Cannot shrink yet");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_dev_is_online(ca) &amp;&amp;</div><div class='del'>-	    get_capacity(ca-&gt;disk_sb.bdev-&gt;bd_disk) &lt;</div><div class='del'>-	    ca-&gt;mi.bucket_size * nbuckets) {</div><div class='del'>-		bch_err(ca, "New size larger than device");</div><div class='del'>-		ret = -BCH_ERR_device_size_too_small;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_dev_buckets_resize(c, ca, nbuckets);</div><div class='del'>-	bch_err_msg(ca, ret, "resizing buckets");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_mark_dev_sb(c, ca);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-	m = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-	m-&gt;nbuckets = cpu_to_le64(nbuckets);</div><div class='del'>-</div><div class='del'>-	bch2_write_super(c);</div><div class='del'>-	mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;mi.freespace_initialized) {</div><div class='del'>-		ret = bch2_dev_freespace_init(c, ca, old_nbuckets, nbuckets);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: this is all wrong transactionally - we'll be able to do</div><div class='del'>-		 * this correctly after the disk space accounting rewrite</div><div class='del'>-		 */</div><div class='del'>-		ca-&gt;usage_base-&gt;d[BCH_DATA_free].buckets += nbuckets - old_nbuckets;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_recalc_capacity(c);</div><div class='del'>-err:</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return with ref on ca-&gt;ref: */</div><div class='del'>-struct bch_dev *bch2_dev_lookup(struct bch_fs *c, const char *name)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for_each_member_device_rcu(c, ca, NULL)</div><div class='del'>-		if (!strcmp(name, ca-&gt;name)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			return ca;</div><div class='del'>-		}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return ERR_PTR(-BCH_ERR_ENOENT_dev_not_found);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Filesystem open: */</div><div class='del'>-</div><div class='del'>-static inline int sb_cmp(struct bch_sb *l, struct bch_sb *r)</div><div class='del'>-{</div><div class='del'>-	return  cmp_int(le64_to_cpu(l-&gt;seq), le64_to_cpu(r-&gt;seq)) ?:</div><div class='del'>-		cmp_int(le64_to_cpu(l-&gt;write_time), le64_to_cpu(r-&gt;write_time));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct bch_fs *bch2_fs_open(char * const *devices, unsigned nr_devices,</div><div class='del'>-			    struct bch_opts opts)</div><div class='del'>-{</div><div class='del'>-	DARRAY(struct bch_sb_handle) sbs = { 0 };</div><div class='del'>-	struct bch_fs *c = NULL;</div><div class='del'>-	struct bch_sb_handle *best = NULL;</div><div class='del'>-	struct printbuf errbuf = PRINTBUF;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!try_module_get(THIS_MODULE))</div><div class='del'>-		return ERR_PTR(-ENODEV);</div><div class='del'>-</div><div class='del'>-	if (!nr_devices) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = darray_make_room(&amp;sbs, nr_devices);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; nr_devices; i++) {</div><div class='del'>-		struct bch_sb_handle sb = { NULL };</div><div class='del'>-</div><div class='del'>-		ret = bch2_read_super(devices[i], &amp;opts, &amp;sb);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		BUG_ON(darray_push(&amp;sbs, sb));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (opts.nochanges &amp;&amp; !opts.read_only) {</div><div class='del'>-		ret = -BCH_ERR_erofs_nochanges;</div><div class='del'>-		goto err_print;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	darray_for_each(sbs, sb)</div><div class='del'>-		if (!best || sb_cmp(sb-&gt;sb, best-&gt;sb) &gt; 0)</div><div class='del'>-			best = sb;</div><div class='del'>-</div><div class='del'>-	darray_for_each_reverse(sbs, sb) {</div><div class='del'>-		ret = bch2_dev_in_fs(best, sb);</div><div class='del'>-</div><div class='del'>-		if (ret == -BCH_ERR_device_has_been_removed ||</div><div class='del'>-		    ret == -BCH_ERR_device_splitbrain) {</div><div class='del'>-			bch2_free_super(sb);</div><div class='del'>-			darray_remove_item(&amp;sbs, sb);</div><div class='del'>-			best -= best &gt; sb;</div><div class='del'>-			ret = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_print;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c = bch2_fs_alloc(best-&gt;sb, opts);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(c);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;c-&gt;state_lock);</div><div class='del'>-	darray_for_each(sbs, sb) {</div><div class='del'>-		ret = bch2_dev_attach_bdev(c, sb);</div><div class='del'>-		if (ret) {</div><div class='del'>-			up_write(&amp;c-&gt;state_lock);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;c-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	if (!bch2_fs_may_start(c)) {</div><div class='del'>-		ret = -BCH_ERR_insufficient_devices_to_start;</div><div class='del'>-		goto err_print;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!c-&gt;opts.nostart) {</div><div class='del'>-		ret = bch2_fs_start(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	darray_for_each(sbs, sb)</div><div class='del'>-		bch2_free_super(sb);</div><div class='del'>-	darray_exit(&amp;sbs);</div><div class='del'>-	printbuf_exit(&amp;errbuf);</div><div class='del'>-	module_put(THIS_MODULE);</div><div class='del'>-	return c;</div><div class='del'>-err_print:</div><div class='del'>-	pr_err("bch_fs_open err opening %s: %s",</div><div class='del'>-	       devices[0], bch2_err_str(ret));</div><div class='del'>-err:</div><div class='del'>-	if (!IS_ERR_OR_NULL(c))</div><div class='del'>-		bch2_fs_stop(c);</div><div class='del'>-	c = ERR_PTR(ret);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Global interfaces/init */</div><div class='del'>-</div><div class='del'>-static void bcachefs_exit(void)</div><div class='del'>-{</div><div class='del'>-	bch2_debug_exit();</div><div class='del'>-	bch2_vfs_exit();</div><div class='del'>-	bch2_chardev_exit();</div><div class='del'>-	bch2_btree_key_cache_exit();</div><div class='del'>-	if (bcachefs_kset)</div><div class='del'>-		kset_unregister(bcachefs_kset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init bcachefs_init(void)</div><div class='del'>-{</div><div class='del'>-	bch2_bkey_pack_test();</div><div class='del'>-</div><div class='del'>-	if (!(bcachefs_kset = kset_create_and_add("bcachefs", NULL, fs_kobj)) ||</div><div class='del'>-	    bch2_btree_key_cache_init() ||</div><div class='del'>-	    bch2_chardev_init() ||</div><div class='del'>-	    bch2_vfs_init() ||</div><div class='del'>-	    bch2_debug_init())</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	bcachefs_exit();</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BCH_DEBUG_PARAM(name, description)			\</div><div class='del'>-	bool bch2_##name;					\</div><div class='del'>-	module_param_named(name, bch2_##name, bool, 0644);	\</div><div class='del'>-	MODULE_PARM_DESC(name, description);</div><div class='del'>-BCH_DEBUG_PARAMS()</div><div class='del'>-#undef BCH_DEBUG_PARAM</div><div class='del'>-</div><div class='del'>-__maybe_unused</div><div class='del'>-static unsigned bch2_metadata_version = bcachefs_metadata_version_current;</div><div class='del'>-module_param_named(version, bch2_metadata_version, uint, 0400);</div><div class='del'>-</div><div class='del'>-module_exit(bcachefs_exit);</div><div class='del'>-module_init(bcachefs_init);</div><div class='head'>diff --git a/fs/bcachefs/super.h b/fs/bcachefs/super.h<br/>deleted file mode 100644<br/>index dada09331d2e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/super.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SUPER_H</div><div class='del'>-#define _BCACHEFS_SUPER_H</div><div class='del'>-</div><div class='del'>-#include "extents.h"</div><div class='del'>-</div><div class='del'>-#include "bcachefs_ioctl.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-</div><div class='del'>-extern const char * const bch2_fs_flag_strs[];</div><div class='del'>-</div><div class='del'>-struct bch_fs *bch2_dev_to_fs(dev_t);</div><div class='del'>-struct bch_fs *bch2_uuid_to_fs(__uuid_t);</div><div class='del'>-</div><div class='del'>-bool bch2_dev_state_allowed(struct bch_fs *, struct bch_dev *,</div><div class='del'>-			   enum bch_member_state, int);</div><div class='del'>-int __bch2_dev_set_state(struct bch_fs *, struct bch_dev *,</div><div class='del'>-			enum bch_member_state, int);</div><div class='del'>-int bch2_dev_set_state(struct bch_fs *, struct bch_dev *,</div><div class='del'>-		      enum bch_member_state, int);</div><div class='del'>-</div><div class='del'>-int bch2_dev_fail(struct bch_dev *, int);</div><div class='del'>-int bch2_dev_remove(struct bch_fs *, struct bch_dev *, int);</div><div class='del'>-int bch2_dev_add(struct bch_fs *, const char *);</div><div class='del'>-int bch2_dev_online(struct bch_fs *, const char *);</div><div class='del'>-int bch2_dev_offline(struct bch_fs *, struct bch_dev *, int);</div><div class='del'>-int bch2_dev_resize(struct bch_fs *, struct bch_dev *, u64);</div><div class='del'>-struct bch_dev *bch2_dev_lookup(struct bch_fs *, const char *);</div><div class='del'>-</div><div class='del'>-bool bch2_fs_emergency_read_only(struct bch_fs *);</div><div class='del'>-void bch2_fs_read_only(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_fs_read_write(struct bch_fs *);</div><div class='del'>-int bch2_fs_read_write_early(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Only for use in the recovery/fsck path:</div><div class='del'>- */</div><div class='del'>-static inline void bch2_fs_lazy_rw(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	if (!test_bit(BCH_FS_rw, &amp;c-&gt;flags) &amp;&amp;</div><div class='del'>-	    !test_bit(BCH_FS_was_rw, &amp;c-&gt;flags))</div><div class='del'>-		bch2_fs_read_write_early(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_fs_stop(struct bch_fs *);</div><div class='del'>-void bch2_fs_free(struct bch_fs *);</div><div class='del'>-void bch2_fs_stop(struct bch_fs *);</div><div class='del'>-</div><div class='del'>-int bch2_fs_start(struct bch_fs *);</div><div class='del'>-struct bch_fs *bch2_fs_open(char * const *, unsigned, struct bch_opts);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SUPER_H */</div><div class='head'>diff --git a/fs/bcachefs/super_types.h b/fs/bcachefs/super_types.h<br/>deleted file mode 100644<br/>index ec784d975f66..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/super_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/super_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SUPER_TYPES_H</div><div class='del'>-#define _BCACHEFS_SUPER_TYPES_H</div><div class='del'>-</div><div class='del'>-struct bch_sb_handle {</div><div class='del'>-	struct bch_sb		*sb;</div><div class='del'>-	struct file		*s_bdev_file;</div><div class='del'>-	struct block_device	*bdev;</div><div class='del'>-	char			*sb_name;</div><div class='del'>-	struct bio		*bio;</div><div class='del'>-	void			*holder;</div><div class='del'>-	size_t			buffer_size;</div><div class='del'>-	blk_mode_t		mode;</div><div class='del'>-	unsigned		have_layout:1;</div><div class='del'>-	unsigned		have_bio:1;</div><div class='del'>-	unsigned		fs_sb:1;</div><div class='del'>-	u64			seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_devs_mask {</div><div class='del'>-	unsigned long d[BITS_TO_LONGS(BCH_SB_MEMBERS_MAX)];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_devs_list {</div><div class='del'>-	u8			nr;</div><div class='del'>-	u8			data[BCH_BKEY_PTRS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch_member_cpu {</div><div class='del'>-	u64			nbuckets;	/* device size */</div><div class='del'>-	u16			first_bucket;   /* index of first bucket used */</div><div class='del'>-	u16			bucket_size;	/* sectors */</div><div class='del'>-	u16			group;</div><div class='del'>-	u8			state;</div><div class='del'>-	u8			discard;</div><div class='del'>-	u8			data_allowed;</div><div class='del'>-	u8			durability;</div><div class='del'>-	u8			freespace_initialized;</div><div class='del'>-	u8			valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_SUPER_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c<br/>deleted file mode 100644<br/>index cee80c47feea..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sysfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1029 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * bcache sysfs interfaces</div><div class='del'>- *</div><div class='del'>- * Copyright 2010, 2011 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_SYSFS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_background.h"</div><div class='del'>-#include "alloc_foreground.h"</div><div class='del'>-#include "sysfs.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_io.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_key_cache.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "btree_gc.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "clock.h"</div><div class='del'>-#include "compress.h"</div><div class='del'>-#include "disk_groups.h"</div><div class='del'>-#include "ec.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "journal.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "move.h"</div><div class='del'>-#include "movinggc.h"</div><div class='del'>-#include "nocow_locking.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "replicas.h"</div><div class='del'>-#include "super-io.h"</div><div class='del'>-#include "tests.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='del'>-#include &lt;linux/sched/clock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-#define SYSFS_OPS(type)							\</div><div class='del'>-const struct sysfs_ops type ## _sysfs_ops = {				\</div><div class='del'>-	.show	= type ## _show,					\</div><div class='del'>-	.store	= type ## _store					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SHOW(fn)							\</div><div class='del'>-static ssize_t fn ## _to_text(struct printbuf *,			\</div><div class='del'>-			      struct kobject *, struct attribute *);	\</div><div class='del'>-									\</div><div class='del'>-static ssize_t fn ## _show(struct kobject *kobj, struct attribute *attr,\</div><div class='del'>-			   char *buf)					\</div><div class='del'>-{									\</div><div class='del'>-	struct printbuf out = PRINTBUF;					\</div><div class='del'>-	ssize_t ret = fn ## _to_text(&amp;out, kobj, attr);			\</div><div class='del'>-									\</div><div class='del'>-	if (out.pos &amp;&amp; out.buf[out.pos - 1] != '\n')			\</div><div class='del'>-		prt_newline(&amp;out);					\</div><div class='del'>-									\</div><div class='del'>-	if (!ret &amp;&amp; out.allocation_failure)				\</div><div class='del'>-		ret = -ENOMEM;						\</div><div class='del'>-									\</div><div class='del'>-	if (!ret) {							\</div><div class='del'>-		ret = min_t(size_t, out.pos, PAGE_SIZE - 1);		\</div><div class='del'>-		memcpy(buf, out.buf, ret);				\</div><div class='del'>-	}								\</div><div class='del'>-	printbuf_exit(&amp;out);						\</div><div class='del'>-	return bch2_err_class(ret);					\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static ssize_t fn ## _to_text(struct printbuf *out, struct kobject *kobj,\</div><div class='del'>-			      struct attribute *attr)</div><div class='del'>-</div><div class='del'>-#define STORE(fn)							\</div><div class='del'>-static ssize_t fn ## _store_inner(struct kobject *, struct attribute *,\</div><div class='del'>-			    const char *, size_t);			\</div><div class='del'>-									\</div><div class='del'>-static ssize_t fn ## _store(struct kobject *kobj, struct attribute *attr,\</div><div class='del'>-			    const char *buf, size_t size)		\</div><div class='del'>-{									\</div><div class='del'>-	return bch2_err_class(fn##_store_inner(kobj, attr, buf, size));	\</div><div class='del'>-}									\</div><div class='del'>-									\</div><div class='del'>-static ssize_t fn ## _store_inner(struct kobject *kobj, struct attribute *attr,\</div><div class='del'>-				  const char *buf, size_t size)</div><div class='del'>-</div><div class='del'>-#define __sysfs_attribute(_name, _mode)					\</div><div class='del'>-	static struct attribute sysfs_##_name =				\</div><div class='del'>-		{ .name = #_name, .mode = _mode }</div><div class='del'>-</div><div class='del'>-#define write_attribute(n)	__sysfs_attribute(n, 0200)</div><div class='del'>-#define read_attribute(n)	__sysfs_attribute(n, 0444)</div><div class='del'>-#define rw_attribute(n)		__sysfs_attribute(n, 0644)</div><div class='del'>-</div><div class='del'>-#define sysfs_printf(file, fmt, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	if (attr == &amp;sysfs_ ## file)					\</div><div class='del'>-		prt_printf(out, fmt "\n", __VA_ARGS__);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sysfs_print(file, var)						\</div><div class='del'>-do {									\</div><div class='del'>-	if (attr == &amp;sysfs_ ## file)					\</div><div class='del'>-		snprint(out, var);					\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sysfs_hprint(file, val)						\</div><div class='del'>-do {									\</div><div class='del'>-	if (attr == &amp;sysfs_ ## file)					\</div><div class='del'>-		prt_human_readable_s64(out, val);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sysfs_strtoul(file, var)					\</div><div class='del'>-do {									\</div><div class='del'>-	if (attr == &amp;sysfs_ ## file)					\</div><div class='del'>-		return strtoul_safe(buf, var) ?: (ssize_t) size;	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sysfs_strtoul_clamp(file, var, min, max)			\</div><div class='del'>-do {									\</div><div class='del'>-	if (attr == &amp;sysfs_ ## file)					\</div><div class='del'>-		return strtoul_safe_clamp(buf, var, min, max)		\</div><div class='del'>-			?: (ssize_t) size;				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define strtoul_or_return(cp)						\</div><div class='del'>-({									\</div><div class='del'>-	unsigned long _v;						\</div><div class='del'>-	int _r = kstrtoul(cp, 10, &amp;_v);					\</div><div class='del'>-	if (_r)								\</div><div class='del'>-		return _r;						\</div><div class='del'>-	_v;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-write_attribute(trigger_gc);</div><div class='del'>-write_attribute(trigger_discards);</div><div class='del'>-write_attribute(trigger_invalidates);</div><div class='del'>-write_attribute(prune_cache);</div><div class='del'>-write_attribute(btree_wakeup);</div><div class='del'>-rw_attribute(btree_gc_periodic);</div><div class='del'>-rw_attribute(gc_gens_pos);</div><div class='del'>-</div><div class='del'>-read_attribute(uuid);</div><div class='del'>-read_attribute(minor);</div><div class='del'>-read_attribute(flags);</div><div class='del'>-read_attribute(bucket_size);</div><div class='del'>-read_attribute(first_bucket);</div><div class='del'>-read_attribute(nbuckets);</div><div class='del'>-rw_attribute(durability);</div><div class='del'>-read_attribute(io_done);</div><div class='del'>-read_attribute(io_errors);</div><div class='del'>-write_attribute(io_errors_reset);</div><div class='del'>-</div><div class='del'>-read_attribute(io_latency_read);</div><div class='del'>-read_attribute(io_latency_write);</div><div class='del'>-read_attribute(io_latency_stats_read);</div><div class='del'>-read_attribute(io_latency_stats_write);</div><div class='del'>-read_attribute(congested);</div><div class='del'>-</div><div class='del'>-read_attribute(btree_write_stats);</div><div class='del'>-</div><div class='del'>-read_attribute(btree_cache_size);</div><div class='del'>-read_attribute(compression_stats);</div><div class='del'>-read_attribute(journal_debug);</div><div class='del'>-read_attribute(btree_updates);</div><div class='del'>-read_attribute(btree_cache);</div><div class='del'>-read_attribute(btree_key_cache);</div><div class='del'>-read_attribute(stripes_heap);</div><div class='del'>-read_attribute(open_buckets);</div><div class='del'>-read_attribute(open_buckets_partial);</div><div class='del'>-read_attribute(write_points);</div><div class='del'>-read_attribute(nocow_lock_table);</div><div class='del'>-</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-read_attribute(write_refs);</div><div class='del'>-</div><div class='del'>-static const char * const bch2_write_refs[] = {</div><div class='del'>-#define x(n)	#n,</div><div class='del'>-	BCH_WRITE_REFS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bch2_write_refs_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	bch2_printbuf_tabstop_push(out, 24);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(c-&gt;writes); i++) {</div><div class='del'>-		prt_str(out, bch2_write_refs[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_printf(out, "%li", atomic_long_read(&amp;c-&gt;writes[i]));</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-read_attribute(internal_uuid);</div><div class='del'>-read_attribute(disk_groups);</div><div class='del'>-</div><div class='del'>-read_attribute(has_data);</div><div class='del'>-read_attribute(alloc_debug);</div><div class='del'>-</div><div class='del'>-#define x(t, n, ...) read_attribute(t);</div><div class='del'>-BCH_PERSISTENT_COUNTERS()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-rw_attribute(discard);</div><div class='del'>-rw_attribute(label);</div><div class='del'>-</div><div class='del'>-rw_attribute(copy_gc_enabled);</div><div class='del'>-read_attribute(copy_gc_wait);</div><div class='del'>-</div><div class='del'>-rw_attribute(rebalance_enabled);</div><div class='del'>-sysfs_pd_controller_attribute(rebalance);</div><div class='del'>-read_attribute(rebalance_status);</div><div class='del'>-rw_attribute(promote_whole_extents);</div><div class='del'>-</div><div class='del'>-read_attribute(new_stripes);</div><div class='del'>-</div><div class='del'>-read_attribute(io_timers_read);</div><div class='del'>-read_attribute(io_timers_write);</div><div class='del'>-</div><div class='del'>-read_attribute(moving_ctxts);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_TESTS</div><div class='del'>-write_attribute(perf_test);</div><div class='del'>-#endif /* CONFIG_BCACHEFS_TESTS */</div><div class='del'>-</div><div class='del'>-#define x(_name)						\</div><div class='del'>-	static struct attribute sysfs_time_stat_##_name =		\</div><div class='del'>-		{ .name = #_name, .mode = 0444 };</div><div class='del'>-	BCH_TIME_STATS()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-static struct attribute sysfs_state_rw = {</div><div class='del'>-	.name = "state",</div><div class='del'>-	.mode =  0444,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static size_t bch2_btree_cache_size(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	size_t ret = 0;</div><div class='del'>-	struct btree *b;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	list_for_each_entry(b, &amp;c-&gt;btree_cache.live, list)</div><div class='del'>-		ret += btree_buf_bytes(b);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;c-&gt;btree_cache.lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_compression_stats_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	enum btree_id id;</div><div class='del'>-	struct compression_type_stats {</div><div class='del'>-		u64		nr_extents;</div><div class='del'>-		u64		sectors_compressed;</div><div class='del'>-		u64		sectors_uncompressed;</div><div class='del'>-	} s[BCH_COMPRESSION_TYPE_NR];</div><div class='del'>-	u64 compressed_incompressible = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	memset(s, 0, sizeof(s));</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; BTREE_ID_NR; id++) {</div><div class='del'>-		if (!btree_type_has_ptrs(id))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = for_each_btree_key(trans, iter, id, POS_MIN,</div><div class='del'>-					 BTREE_ITER_ALL_SNAPSHOTS, k, ({</div><div class='del'>-			struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);</div><div class='del'>-			struct bch_extent_crc_unpacked crc;</div><div class='del'>-			const union bch_extent_entry *entry;</div><div class='del'>-			bool compressed = false, incompressible = false;</div><div class='del'>-</div><div class='del'>-			bkey_for_each_crc(k.k, ptrs, crc, entry) {</div><div class='del'>-				incompressible	|= crc.compression_type == BCH_COMPRESSION_TYPE_incompressible;</div><div class='del'>-				compressed	|= crc_is_compressed(crc);</div><div class='del'>-</div><div class='del'>-				if (crc_is_compressed(crc)) {</div><div class='del'>-					s[crc.compression_type].nr_extents++;</div><div class='del'>-					s[crc.compression_type].sectors_compressed += crc.compressed_size;</div><div class='del'>-					s[crc.compression_type].sectors_uncompressed += crc.uncompressed_size;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			compressed_incompressible += compressed &amp;&amp; incompressible;</div><div class='del'>-</div><div class='del'>-			if (!compressed) {</div><div class='del'>-				unsigned t = incompressible ? BCH_COMPRESSION_TYPE_incompressible : 0;</div><div class='del'>-</div><div class='del'>-				s[t].nr_extents++;</div><div class='del'>-				s[t].sectors_compressed += k.k-&gt;size;</div><div class='del'>-				s[t].sectors_uncompressed += k.k-&gt;size;</div><div class='del'>-			}</div><div class='del'>-			0;</div><div class='del'>-		}));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	prt_str(out, "type");</div><div class='del'>-	printbuf_tabstop_push(out, 12);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "compressed");</div><div class='del'>-	printbuf_tabstop_push(out, 16);</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "uncompressed");</div><div class='del'>-	printbuf_tabstop_push(out, 16);</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "average extent size");</div><div class='del'>-	printbuf_tabstop_push(out, 24);</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	for (unsigned i = 0; i &lt; ARRAY_SIZE(s); i++) {</div><div class='del'>-		bch2_prt_compression_type(out, i);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-</div><div class='del'>-		prt_human_readable_u64(out, s[i].sectors_compressed &lt;&lt; 9);</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-</div><div class='del'>-		prt_human_readable_u64(out, s[i].sectors_uncompressed &lt;&lt; 9);</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-</div><div class='del'>-		prt_human_readable_u64(out, s[i].nr_extents</div><div class='del'>-				       ? div_u64(s[i].sectors_uncompressed &lt;&lt; 9, s[i].nr_extents)</div><div class='del'>-				       : 0);</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (compressed_incompressible) {</div><div class='del'>-		prt_printf(out, "%llu compressed &amp; incompressible extents", compressed_incompressible);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_gc_gens_pos_to_text(struct printbuf *out, struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	prt_printf(out, "%s: ", bch2_btree_id_str(c-&gt;gc_gens_btree));</div><div class='del'>-	bch2_bpos_to_text(out, c-&gt;gc_gens_pos);</div><div class='del'>-	prt_printf(out, "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_btree_wakeup_all(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-</div><div class='del'>-	seqmutex_lock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-	list_for_each_entry(trans, &amp;c-&gt;btree_trans_list, list) {</div><div class='del'>-		struct btree_bkey_cached_common *b = READ_ONCE(trans-&gt;locking);</div><div class='del'>-</div><div class='del'>-		if (b)</div><div class='del'>-			six_lock_wakeup_all(&amp;b-&gt;lock);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	seqmutex_unlock(&amp;c-&gt;btree_trans_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SHOW(bch2_fs)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, kobj);</div><div class='del'>-</div><div class='del'>-	sysfs_print(minor,			c-&gt;minor);</div><div class='del'>-	sysfs_printf(internal_uuid, "%pU",	c-&gt;sb.uuid.b);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_flags)</div><div class='del'>-		prt_bitflags(out, bch2_fs_flag_strs, c-&gt;flags);</div><div class='del'>-</div><div class='del'>-	sysfs_hprint(btree_cache_size,		bch2_btree_cache_size(c));</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_btree_write_stats)</div><div class='del'>-		bch2_btree_write_stats_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	sysfs_printf(btree_gc_periodic, "%u",	(int) c-&gt;btree_gc_periodic);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_gc_gens_pos)</div><div class='del'>-		bch2_gc_gens_pos_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	sysfs_printf(copy_gc_enabled, "%i", c-&gt;copy_gc_enabled);</div><div class='del'>-</div><div class='del'>-	sysfs_printf(rebalance_enabled,		"%i", c-&gt;rebalance.enabled);</div><div class='del'>-	sysfs_pd_controller_show(rebalance,	&amp;c-&gt;rebalance.pd); /* XXX */</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_copy_gc_wait)</div><div class='del'>-		bch2_copygc_wait_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_rebalance_status)</div><div class='del'>-		bch2_rebalance_status_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	sysfs_print(promote_whole_extents,	c-&gt;promote_whole_extents);</div><div class='del'>-</div><div class='del'>-	/* Debugging: */</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_journal_debug)</div><div class='del'>-		bch2_journal_debug_to_text(out, &amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_btree_updates)</div><div class='del'>-		bch2_btree_updates_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_btree_cache)</div><div class='del'>-		bch2_btree_cache_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_btree_key_cache)</div><div class='del'>-		bch2_btree_key_cache_to_text(out, &amp;c-&gt;btree_key_cache);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_stripes_heap)</div><div class='del'>-		bch2_stripes_heap_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_open_buckets)</div><div class='del'>-		bch2_open_buckets_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_open_buckets_partial)</div><div class='del'>-		bch2_open_buckets_partial_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_write_points)</div><div class='del'>-		bch2_write_points_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_compression_stats)</div><div class='del'>-		bch2_compression_stats_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_new_stripes)</div><div class='del'>-		bch2_new_stripes_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_timers_read)</div><div class='del'>-		bch2_io_timers_to_text(out, &amp;c-&gt;io_clock[READ]);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_timers_write)</div><div class='del'>-		bch2_io_timers_to_text(out, &amp;c-&gt;io_clock[WRITE]);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_moving_ctxts)</div><div class='del'>-		bch2_fs_moving_ctxts_to_text(out, c);</div><div class='del'>-</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	if (attr == &amp;sysfs_write_refs)</div><div class='del'>-		bch2_write_refs_to_text(out, c);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_nocow_lock_table)</div><div class='del'>-		bch2_nocow_locks_to_text(out, &amp;c-&gt;nocow_locks);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_disk_groups)</div><div class='del'>-		bch2_disk_groups_to_text(out, c);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STORE(bch2_fs)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, kobj);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_btree_gc_periodic) {</div><div class='del'>-		ssize_t ret = strtoul_safe(buf, c-&gt;btree_gc_periodic)</div><div class='del'>-			?: (ssize_t) size;</div><div class='del'>-</div><div class='del'>-		wake_up_process(c-&gt;gc_thread);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_copy_gc_enabled) {</div><div class='del'>-		ssize_t ret = strtoul_safe(buf, c-&gt;copy_gc_enabled)</div><div class='del'>-			?: (ssize_t) size;</div><div class='del'>-</div><div class='del'>-		if (c-&gt;copygc_thread)</div><div class='del'>-			wake_up_process(c-&gt;copygc_thread);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_rebalance_enabled) {</div><div class='del'>-		ssize_t ret = strtoul_safe(buf, c-&gt;rebalance.enabled)</div><div class='del'>-			?: (ssize_t) size;</div><div class='del'>-</div><div class='del'>-		rebalance_wakeup(c);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sysfs_pd_controller_store(rebalance,	&amp;c-&gt;rebalance.pd);</div><div class='del'>-</div><div class='del'>-	sysfs_strtoul(promote_whole_extents,	c-&gt;promote_whole_extents);</div><div class='del'>-</div><div class='del'>-	/* Debugging: */</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_started, &amp;c-&gt;flags))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	/* Debugging: */</div><div class='del'>-</div><div class='del'>-	if (!test_bit(BCH_FS_rw, &amp;c-&gt;flags))</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_prune_cache) {</div><div class='del'>-		struct shrink_control sc;</div><div class='del'>-</div><div class='del'>-		sc.gfp_mask = GFP_KERNEL;</div><div class='del'>-		sc.nr_to_scan = strtoul_or_return(buf);</div><div class='del'>-		c-&gt;btree_cache.shrink-&gt;scan_objects(c-&gt;btree_cache.shrink, &amp;sc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_btree_wakeup)</div><div class='del'>-		bch2_btree_wakeup_all(c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_trigger_gc) {</div><div class='del'>-		/*</div><div class='del'>-		 * Full gc is currently incompatible with btree key cache:</div><div class='del'>-		 */</div><div class='del'>-#if 0</div><div class='del'>-		down_read(&amp;c-&gt;state_lock);</div><div class='del'>-		bch2_gc(c, false, false);</div><div class='del'>-		up_read(&amp;c-&gt;state_lock);</div><div class='del'>-#else</div><div class='del'>-		bch2_gc_gens(c);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_trigger_discards)</div><div class='del'>-		bch2_do_discards(c);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_trigger_invalidates)</div><div class='del'>-		bch2_do_invalidates(c);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_TESTS</div><div class='del'>-	if (attr == &amp;sysfs_perf_test) {</div><div class='del'>-		char *tmp = kstrdup(buf, GFP_KERNEL), *p = tmp;</div><div class='del'>-		char *test		= strsep(&amp;p, " \t\n");</div><div class='del'>-		char *nr_str		= strsep(&amp;p, " \t\n");</div><div class='del'>-		char *threads_str	= strsep(&amp;p, " \t\n");</div><div class='del'>-		unsigned threads;</div><div class='del'>-		u64 nr;</div><div class='del'>-		int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (threads_str &amp;&amp;</div><div class='del'>-		    !(ret = kstrtouint(threads_str, 10, &amp;threads)) &amp;&amp;</div><div class='del'>-		    !(ret = bch2_strtoull_h(nr_str, &amp;nr)))</div><div class='del'>-			ret = bch2_btree_perf_test(c, test, nr, threads);</div><div class='del'>-		kfree(tmp);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			size = ret;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-SYSFS_OPS(bch2_fs);</div><div class='del'>-</div><div class='del'>-struct attribute *bch2_fs_files[] = {</div><div class='del'>-	&amp;sysfs_minor,</div><div class='del'>-	&amp;sysfs_btree_cache_size,</div><div class='del'>-	&amp;sysfs_btree_write_stats,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_promote_whole_extents,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_compression_stats,</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_TESTS</div><div class='del'>-	&amp;sysfs_perf_test,</div><div class='del'>-#endif</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* counters dir */</div><div class='del'>-</div><div class='del'>-SHOW(bch2_fs_counters)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, counters_kobj);</div><div class='del'>-	u64 counter = 0;</div><div class='del'>-	u64 counter_since_mount = 0;</div><div class='del'>-</div><div class='del'>-	printbuf_tabstop_push(out, 32);</div><div class='del'>-</div><div class='del'>-	#define x(t, ...) \</div><div class='del'>-		if (attr == &amp;sysfs_##t) {					\</div><div class='del'>-			counter             = percpu_u64_get(&amp;c-&gt;counters[BCH_COUNTER_##t]);\</div><div class='del'>-			counter_since_mount = counter - c-&gt;counters_on_mount[BCH_COUNTER_##t];\</div><div class='del'>-			prt_printf(out, "since mount:");				\</div><div class='del'>-			prt_tab(out);						\</div><div class='del'>-			prt_human_readable_u64(out, counter_since_mount);	\</div><div class='del'>-			prt_newline(out);					\</div><div class='del'>-										\</div><div class='del'>-			prt_printf(out, "since filesystem creation:");		\</div><div class='del'>-			prt_tab(out);						\</div><div class='del'>-			prt_human_readable_u64(out, counter);			\</div><div class='del'>-			prt_newline(out);					\</div><div class='del'>-		}</div><div class='del'>-	BCH_PERSISTENT_COUNTERS()</div><div class='del'>-	#undef x</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STORE(bch2_fs_counters) {</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SYSFS_OPS(bch2_fs_counters);</div><div class='del'>-</div><div class='del'>-struct attribute *bch2_fs_counters_files[] = {</div><div class='del'>-#define x(t, ...) \</div><div class='del'>-	&amp;sysfs_##t,</div><div class='del'>-	BCH_PERSISTENT_COUNTERS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-/* internal dir - just a wrapper */</div><div class='del'>-</div><div class='del'>-SHOW(bch2_fs_internal)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, internal);</div><div class='del'>-</div><div class='del'>-	return bch2_fs_to_text(out, &amp;c-&gt;kobj, attr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STORE(bch2_fs_internal)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, internal);</div><div class='del'>-</div><div class='del'>-	return bch2_fs_store(&amp;c-&gt;kobj, attr, buf, size);</div><div class='del'>-}</div><div class='del'>-SYSFS_OPS(bch2_fs_internal);</div><div class='del'>-</div><div class='del'>-struct attribute *bch2_fs_internal_files[] = {</div><div class='del'>-	&amp;sysfs_flags,</div><div class='del'>-	&amp;sysfs_journal_debug,</div><div class='del'>-	&amp;sysfs_btree_updates,</div><div class='del'>-	&amp;sysfs_btree_cache,</div><div class='del'>-	&amp;sysfs_btree_key_cache,</div><div class='del'>-	&amp;sysfs_new_stripes,</div><div class='del'>-	&amp;sysfs_stripes_heap,</div><div class='del'>-	&amp;sysfs_open_buckets,</div><div class='del'>-	&amp;sysfs_open_buckets_partial,</div><div class='del'>-	&amp;sysfs_write_points,</div><div class='del'>-#ifdef BCH_WRITE_REF_DEBUG</div><div class='del'>-	&amp;sysfs_write_refs,</div><div class='del'>-#endif</div><div class='del'>-	&amp;sysfs_nocow_lock_table,</div><div class='del'>-	&amp;sysfs_io_timers_read,</div><div class='del'>-	&amp;sysfs_io_timers_write,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_trigger_gc,</div><div class='del'>-	&amp;sysfs_trigger_discards,</div><div class='del'>-	&amp;sysfs_trigger_invalidates,</div><div class='del'>-	&amp;sysfs_prune_cache,</div><div class='del'>-	&amp;sysfs_btree_wakeup,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_gc_gens_pos,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_copy_gc_enabled,</div><div class='del'>-	&amp;sysfs_copy_gc_wait,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_rebalance_enabled,</div><div class='del'>-	&amp;sysfs_rebalance_status,</div><div class='del'>-	sysfs_pd_controller_files(rebalance),</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_moving_ctxts,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_internal_uuid,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_disk_groups,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* options */</div><div class='del'>-</div><div class='del'>-SHOW(bch2_fs_opts_dir)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, opts_dir);</div><div class='del'>-	const struct bch_option *opt = container_of(attr, struct bch_option, attr);</div><div class='del'>-	int id = opt - bch2_opt_table;</div><div class='del'>-	u64 v = bch2_opt_get_by_id(&amp;c-&gt;opts, id);</div><div class='del'>-</div><div class='del'>-	bch2_opt_to_text(out, c, c-&gt;disk_sb.sb, opt, v, OPT_SHOW_FULL_LIST);</div><div class='del'>-	prt_char(out, '\n');</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STORE(bch2_fs_opts_dir)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, opts_dir);</div><div class='del'>-	const struct bch_option *opt = container_of(attr, struct bch_option, attr);</div><div class='del'>-	int ret, id = opt - bch2_opt_table;</div><div class='del'>-	char *tmp;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't need to take c-&gt;writes for correctness, but it eliminates an</div><div class='del'>-	 * unsightly error message in the dmesg log when we're RO:</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!bch2_write_ref_tryget(c, BCH_WRITE_REF_sysfs)))</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	tmp = kstrdup(buf, GFP_KERNEL);</div><div class='del'>-	if (!tmp) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_opt_parse(c, opt, strim(tmp), &amp;v, NULL);</div><div class='del'>-	kfree(tmp);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_opt_check_may_set(c, id, v);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_opt_set_sb(c, opt, v);</div><div class='del'>-	bch2_opt_set_by_id(&amp;c-&gt;opts, id, v);</div><div class='del'>-</div><div class='del'>-	if (v &amp;&amp;</div><div class='del'>-	    (id == Opt_background_target ||</div><div class='del'>-	     id == Opt_background_compression ||</div><div class='del'>-	     (id == Opt_compression &amp;&amp; !c-&gt;opts.background_compression)))</div><div class='del'>-		bch2_set_rebalance_needs_scan(c, 0);</div><div class='del'>-</div><div class='del'>-	ret = size;</div><div class='del'>-err:</div><div class='del'>-	bch2_write_ref_put(c, BCH_WRITE_REF_sysfs);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-SYSFS_OPS(bch2_fs_opts_dir);</div><div class='del'>-</div><div class='del'>-struct attribute *bch2_fs_opts_dir_files[] = { NULL };</div><div class='del'>-</div><div class='del'>-int bch2_opts_create_sysfs_files(struct kobject *kobj)</div><div class='del'>-{</div><div class='del'>-	const struct bch_option *i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (i = bch2_opt_table;</div><div class='del'>-	     i &lt; bch2_opt_table + bch2_opts_nr;</div><div class='del'>-	     i++) {</div><div class='del'>-		if (!(i-&gt;flags &amp; OPT_FS))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = sysfs_create_file(kobj, &amp;i-&gt;attr);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* time stats */</div><div class='del'>-</div><div class='del'>-SHOW(bch2_fs_time_stats)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = container_of(kobj, struct bch_fs, time_stats);</div><div class='del'>-</div><div class='del'>-#define x(name)								\</div><div class='del'>-	if (attr == &amp;sysfs_time_stat_##name)				\</div><div class='del'>-		bch2_time_stats_to_text(out, &amp;c-&gt;times[BCH_TIME_##name]);</div><div class='del'>-	BCH_TIME_STATS()</div><div class='del'>-#undef x</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STORE(bch2_fs_time_stats)</div><div class='del'>-{</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-SYSFS_OPS(bch2_fs_time_stats);</div><div class='del'>-</div><div class='del'>-struct attribute *bch2_fs_time_stats_files[] = {</div><div class='del'>-#define x(name)						\</div><div class='del'>-	&amp;sysfs_time_stat_##name,</div><div class='del'>-	BCH_TIME_STATS()</div><div class='del'>-#undef x</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dev_alloc_debug_to_text(struct printbuf *out, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct bch_dev_usage stats = bch2_dev_usage_read(ca);</div><div class='del'>-	unsigned i, nr[BCH_DATA_NR];</div><div class='del'>-</div><div class='del'>-	memset(nr, 0, sizeof(nr));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(c-&gt;open_buckets); i++)</div><div class='del'>-		nr[c-&gt;open_buckets[i].data_type]++;</div><div class='del'>-</div><div class='del'>-	printbuf_tabstop_push(out, 8);</div><div class='del'>-	printbuf_tabstop_push(out, 16);</div><div class='del'>-	printbuf_tabstop_push(out, 16);</div><div class='del'>-	printbuf_tabstop_push(out, 16);</div><div class='del'>-	printbuf_tabstop_push(out, 16);</div><div class='del'>-</div><div class='del'>-	bch2_dev_usage_to_text(out, &amp;stats);</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "reserves:");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	for (i = 0; i &lt; BCH_WATERMARK_NR; i++) {</div><div class='del'>-		prt_str(out, bch2_watermarks[i]);</div><div class='del'>-		prt_tab(out);</div><div class='del'>-		prt_u64(out, bch2_dev_buckets_reserved(ca, i));</div><div class='del'>-		prt_tab_rjust(out);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_tabstops_reset(out);</div><div class='del'>-	printbuf_tabstop_push(out, 24);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "freelist_wait");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_str(out, c-&gt;freelist_wait.list.first ? "waiting" : "empty");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "open buckets allocated");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, OPEN_BUCKETS_COUNT - c-&gt;open_buckets_nr_free);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "open buckets this dev");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, ca-&gt;nr_open_buckets);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "open buckets total");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, OPEN_BUCKETS_COUNT);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "open_buckets_wait");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_str(out, c-&gt;open_buckets_wait.list.first ? "waiting" : "empty");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "open_buckets_btree");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, nr[BCH_DATA_btree]);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "open_buckets_user");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, nr[BCH_DATA_user]);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "buckets_to_invalidate");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, should_invalidate_buckets(ca, stats));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_str(out, "btree reserve cache");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_u64(out, c-&gt;btree_reserve_cache_nr);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char * const bch2_rw[] = {</div><div class='del'>-	"read",</div><div class='del'>-	"write",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void dev_io_done_to_text(struct printbuf *out, struct bch_dev *ca)</div><div class='del'>-{</div><div class='del'>-	int rw, i;</div><div class='del'>-</div><div class='del'>-	for (rw = 0; rw &lt; 2; rw++) {</div><div class='del'>-		prt_printf(out, "%s:\n", bch2_rw[rw]);</div><div class='del'>-</div><div class='del'>-		for (i = 1; i &lt; BCH_DATA_NR; i++)</div><div class='del'>-			prt_printf(out, "%-12s:%12llu\n",</div><div class='del'>-			       bch2_data_type_str(i),</div><div class='del'>-			       percpu_u64_get(&amp;ca-&gt;io_done-&gt;sectors[rw][i]) &lt;&lt; 9);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SHOW(bch2_dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = container_of(kobj, struct bch_dev, kobj);</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-</div><div class='del'>-	sysfs_printf(uuid,		"%pU\n", ca-&gt;uuid.b);</div><div class='del'>-</div><div class='del'>-	sysfs_print(bucket_size,	bucket_bytes(ca));</div><div class='del'>-	sysfs_print(first_bucket,	ca-&gt;mi.first_bucket);</div><div class='del'>-	sysfs_print(nbuckets,		ca-&gt;mi.nbuckets);</div><div class='del'>-	sysfs_print(durability,		ca-&gt;mi.durability);</div><div class='del'>-	sysfs_print(discard,		ca-&gt;mi.discard);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_label) {</div><div class='del'>-		if (ca-&gt;mi.group)</div><div class='del'>-			bch2_disk_path_to_text(out, c, ca-&gt;mi.group - 1);</div><div class='del'>-		prt_char(out, '\n');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_has_data) {</div><div class='del'>-		prt_bitflags(out, __bch2_data_types, bch2_dev_has_data(c, ca));</div><div class='del'>-		prt_char(out, '\n');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_state_rw) {</div><div class='del'>-		prt_string_option(out, bch2_member_states, ca-&gt;mi.state);</div><div class='del'>-		prt_char(out, '\n');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_done)</div><div class='del'>-		dev_io_done_to_text(out, ca);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_errors)</div><div class='del'>-		bch2_dev_io_errors_to_text(out, ca);</div><div class='del'>-</div><div class='del'>-	sysfs_print(io_latency_read,		atomic64_read(&amp;ca-&gt;cur_latency[READ]));</div><div class='del'>-	sysfs_print(io_latency_write,		atomic64_read(&amp;ca-&gt;cur_latency[WRITE]));</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_latency_stats_read)</div><div class='del'>-		bch2_time_stats_to_text(out, &amp;ca-&gt;io_latency[READ]);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_latency_stats_write)</div><div class='del'>-		bch2_time_stats_to_text(out, &amp;ca-&gt;io_latency[WRITE]);</div><div class='del'>-</div><div class='del'>-	sysfs_printf(congested,			"%u%%",</div><div class='del'>-		     clamp(atomic_read(&amp;ca-&gt;congested), 0, CONGESTED_MAX)</div><div class='del'>-		     * 100 / CONGESTED_MAX);</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_alloc_debug)</div><div class='del'>-		dev_alloc_debug_to_text(out, ca);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STORE(bch2_dev)</div><div class='del'>-{</div><div class='del'>-	struct bch_dev *ca = container_of(kobj, struct bch_dev, kobj);</div><div class='del'>-	struct bch_fs *c = ca-&gt;fs;</div><div class='del'>-	struct bch_member *mi;</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_discard) {</div><div class='del'>-		bool v = strtoul_or_return(buf);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		mi = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-		if (v != BCH_MEMBER_DISCARD(mi)) {</div><div class='del'>-			SET_BCH_MEMBER_DISCARD(mi, v);</div><div class='del'>-			bch2_write_super(c);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_durability) {</div><div class='del'>-		u64 v = strtoul_or_return(buf);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;c-&gt;sb_lock);</div><div class='del'>-		mi = bch2_members_v2_get_mut(c-&gt;disk_sb.sb, ca-&gt;dev_idx);</div><div class='del'>-</div><div class='del'>-		if (v + 1 != BCH_MEMBER_DURABILITY(mi)) {</div><div class='del'>-			SET_BCH_MEMBER_DURABILITY(mi, v + 1);</div><div class='del'>-			bch2_write_super(c);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;c-&gt;sb_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_label) {</div><div class='del'>-		char *tmp;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		tmp = kstrdup(buf, GFP_KERNEL);</div><div class='del'>-		if (!tmp)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		ret = bch2_dev_group_set(c, ca, strim(tmp));</div><div class='del'>-		kfree(tmp);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attr == &amp;sysfs_io_errors_reset)</div><div class='del'>-		bch2_dev_errors_reset(ca);</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-SYSFS_OPS(bch2_dev);</div><div class='del'>-</div><div class='del'>-struct attribute *bch2_dev_files[] = {</div><div class='del'>-	&amp;sysfs_uuid,</div><div class='del'>-	&amp;sysfs_bucket_size,</div><div class='del'>-	&amp;sysfs_first_bucket,</div><div class='del'>-	&amp;sysfs_nbuckets,</div><div class='del'>-	&amp;sysfs_durability,</div><div class='del'>-</div><div class='del'>-	/* settings: */</div><div class='del'>-	&amp;sysfs_discard,</div><div class='del'>-	&amp;sysfs_state_rw,</div><div class='del'>-	&amp;sysfs_label,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_has_data,</div><div class='del'>-	&amp;sysfs_io_done,</div><div class='del'>-	&amp;sysfs_io_errors,</div><div class='del'>-	&amp;sysfs_io_errors_reset,</div><div class='del'>-</div><div class='del'>-	&amp;sysfs_io_latency_read,</div><div class='del'>-	&amp;sysfs_io_latency_write,</div><div class='del'>-	&amp;sysfs_io_latency_stats_read,</div><div class='del'>-	&amp;sysfs_io_latency_stats_write,</div><div class='del'>-	&amp;sysfs_congested,</div><div class='del'>-</div><div class='del'>-	/* debug: */</div><div class='del'>-	&amp;sysfs_alloc_debug,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif  /* _BCACHEFS_SYSFS_H_ */</div><div class='head'>diff --git a/fs/bcachefs/sysfs.h b/fs/bcachefs/sysfs.h<br/>deleted file mode 100644<br/>index 222cd5062702..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/sysfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/sysfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_SYSFS_H_</div><div class='del'>-#define _BCACHEFS_SYSFS_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_SYSFS</div><div class='del'>-</div><div class='del'>-struct attribute;</div><div class='del'>-struct sysfs_ops;</div><div class='del'>-</div><div class='del'>-extern struct attribute *bch2_fs_files[];</div><div class='del'>-extern struct attribute *bch2_fs_counters_files[];</div><div class='del'>-extern struct attribute *bch2_fs_internal_files[];</div><div class='del'>-extern struct attribute *bch2_fs_opts_dir_files[];</div><div class='del'>-extern struct attribute *bch2_fs_time_stats_files[];</div><div class='del'>-extern struct attribute *bch2_dev_files[];</div><div class='del'>-</div><div class='del'>-extern const struct sysfs_ops bch2_fs_sysfs_ops;</div><div class='del'>-extern const struct sysfs_ops bch2_fs_counters_sysfs_ops;</div><div class='del'>-extern const struct sysfs_ops bch2_fs_internal_sysfs_ops;</div><div class='del'>-extern const struct sysfs_ops bch2_fs_opts_dir_sysfs_ops;</div><div class='del'>-extern const struct sysfs_ops bch2_fs_time_stats_sysfs_ops;</div><div class='del'>-extern const struct sysfs_ops bch2_dev_sysfs_ops;</div><div class='del'>-</div><div class='del'>-int bch2_opts_create_sysfs_files(struct kobject *);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static struct attribute *bch2_fs_files[] = {};</div><div class='del'>-static struct attribute *bch2_fs_counters_files[] = {};</div><div class='del'>-static struct attribute *bch2_fs_internal_files[] = {};</div><div class='del'>-static struct attribute *bch2_fs_opts_dir_files[] = {};</div><div class='del'>-static struct attribute *bch2_fs_time_stats_files[] = {};</div><div class='del'>-static struct attribute *bch2_dev_files[] = {};</div><div class='del'>-</div><div class='del'>-static const struct sysfs_ops bch2_fs_sysfs_ops;</div><div class='del'>-static const struct sysfs_ops bch2_fs_counters_sysfs_ops;</div><div class='del'>-static const struct sysfs_ops bch2_fs_internal_sysfs_ops;</div><div class='del'>-static const struct sysfs_ops bch2_fs_opts_dir_sysfs_ops;</div><div class='del'>-static const struct sysfs_ops bch2_fs_time_stats_sysfs_ops;</div><div class='del'>-static const struct sysfs_ops bch2_dev_sysfs_ops;</div><div class='del'>-</div><div class='del'>-static inline int bch2_opts_create_sysfs_files(struct kobject *kobj) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_SYSFS */</div><div class='del'>-</div><div class='del'>-#endif  /* _BCACHEFS_SYSFS_H_ */</div><div class='head'>diff --git a/fs/bcachefs/tests.c b/fs/bcachefs/tests.c<br/>deleted file mode 100644<br/>index b3fe9fc57747..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/tests.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,882 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifdef CONFIG_BCACHEFS_TESTS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "journal_reclaim.h"</div><div class='del'>-#include "snapshot.h"</div><div class='del'>-#include "tests.h"</div><div class='del'>-</div><div class='del'>-#include "linux/kthread.h"</div><div class='del'>-#include "linux/random.h"</div><div class='del'>-</div><div class='del'>-static void delete_test_keys(struct bch_fs *c)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_delete_range(c, BTREE_ID_extents,</div><div class='del'>-				      SPOS(0, 0, U32_MAX),</div><div class='del'>-				      POS(0, U64_MAX),</div><div class='del'>-				      0, NULL);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_delete_range(c, BTREE_ID_xattrs,</div><div class='del'>-				      SPOS(0, 0, U32_MAX),</div><div class='del'>-				      POS(0, U64_MAX),</div><div class='del'>-				      0, NULL);</div><div class='del'>-	BUG_ON(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unit tests */</div><div class='del'>-</div><div class='del'>-static int test_delete(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_cookie k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;k.k_i);</div><div class='del'>-	k.k.p.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs, k.k.p,</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-		bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_trans_update(trans, &amp;iter, &amp;k.k_i, 0));</div><div class='del'>-	bch_err_msg(c, ret, "update error");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	pr_info("deleting once");</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-		bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_btree_delete_at(trans, &amp;iter, 0));</div><div class='del'>-	bch_err_msg(c, ret, "delete error (first)");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	pr_info("deleting twice");</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-		bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_btree_delete_at(trans, &amp;iter, 0));</div><div class='del'>-	bch_err_msg(c, ret, "delete error (second)");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_delete_written(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_cookie k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;k.k_i);</div><div class='del'>-	k.k.p.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs, k.k.p,</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-		bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_trans_update(trans, &amp;iter, &amp;k.k_i, 0));</div><div class='del'>-	bch_err_msg(c, ret, "update error");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	bch2_trans_unlock(trans);</div><div class='del'>-	bch2_journal_flush_all_pins(&amp;c-&gt;journal);</div><div class='del'>-</div><div class='del'>-	ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-		bch2_btree_iter_traverse(&amp;iter) ?:</div><div class='del'>-		bch2_btree_delete_at(trans, &amp;iter, 0));</div><div class='del'>-	bch_err_msg(c, ret, "delete error");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_iterate(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	u64 i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	delete_test_keys(c);</div><div class='del'>-</div><div class='del'>-	pr_info("inserting test keys");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		struct bkey_i_cookie ck;</div><div class='del'>-</div><div class='del'>-		bkey_cookie_init(&amp;ck.k_i);</div><div class='del'>-		ck.k.p.offset = i;</div><div class='del'>-		ck.k.p.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_insert(c, BTREE_ID_xattrs, &amp;ck.k_i, NULL, 0);</div><div class='del'>-		bch_err_msg(c, ret, "insert error");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("iterating forwards");</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-					SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-					0, k, ({</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset != i++);</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating forwards");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i != nr);</div><div class='del'>-</div><div class='del'>-	pr_info("iterating backwards");</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_reverse(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-				SPOS(0, U64_MAX, U32_MAX), 0, k, ({</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset != --i);</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating backwards");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_iterate_extents(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	u64 i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	delete_test_keys(c);</div><div class='del'>-</div><div class='del'>-	pr_info("inserting test extents");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i += 8) {</div><div class='del'>-		struct bkey_i_cookie ck;</div><div class='del'>-</div><div class='del'>-		bkey_cookie_init(&amp;ck.k_i);</div><div class='del'>-		ck.k.p.offset = i + 8;</div><div class='del'>-		ck.k.p.snapshot = U32_MAX;</div><div class='del'>-		ck.k.size = 8;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_insert(c, BTREE_ID_extents, &amp;ck.k_i, NULL, 0);</div><div class='del'>-		bch_err_msg(c, ret, "insert error");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("iterating forwards");</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_extents,</div><div class='del'>-					SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-					0, k, ({</div><div class='del'>-			BUG_ON(bkey_start_offset(k.k) != i);</div><div class='del'>-			i = k.k-&gt;p.offset;</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating forwards");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i != nr);</div><div class='del'>-</div><div class='del'>-	pr_info("iterating backwards");</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_reverse(trans, iter, BTREE_ID_extents,</div><div class='del'>-				SPOS(0, U64_MAX, U32_MAX), 0, k, ({</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset != i);</div><div class='del'>-			i = bkey_start_offset(k.k);</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating backwards");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_iterate_slots(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	u64 i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	delete_test_keys(c);</div><div class='del'>-</div><div class='del'>-	pr_info("inserting test keys");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		struct bkey_i_cookie ck;</div><div class='del'>-</div><div class='del'>-		bkey_cookie_init(&amp;ck.k_i);</div><div class='del'>-		ck.k.p.offset = i * 2;</div><div class='del'>-		ck.k.p.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_insert(c, BTREE_ID_xattrs, &amp;ck.k_i, NULL, 0);</div><div class='del'>-		bch_err_msg(c, ret, "insert error");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("iterating forwards");</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-					  SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-					  0, k, ({</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset != i);</div><div class='del'>-			i += 2;</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating forwards");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i != nr * 2);</div><div class='del'>-</div><div class='del'>-	pr_info("iterating forwards by slots");</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-					SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-					BTREE_ITER_SLOTS, k, ({</div><div class='del'>-			if (i &gt;= nr * 2)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			BUG_ON(k.k-&gt;p.offset != i);</div><div class='del'>-			BUG_ON(bkey_deleted(k.k) != (i &amp; 1));</div><div class='del'>-</div><div class='del'>-			i++;</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating forwards by slots");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_iterate_slots_extents(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	u64 i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	delete_test_keys(c);</div><div class='del'>-</div><div class='del'>-	pr_info("inserting test keys");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i += 16) {</div><div class='del'>-		struct bkey_i_cookie ck;</div><div class='del'>-</div><div class='del'>-		bkey_cookie_init(&amp;ck.k_i);</div><div class='del'>-		ck.k.p.offset = i + 16;</div><div class='del'>-		ck.k.p.snapshot = U32_MAX;</div><div class='del'>-		ck.k.size = 8;</div><div class='del'>-</div><div class='del'>-		ret = bch2_btree_insert(c, BTREE_ID_extents, &amp;ck.k_i, NULL, 0);</div><div class='del'>-		bch_err_msg(c, ret, "insert error");</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("iterating forwards");</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_extents,</div><div class='del'>-					SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-					0, k, ({</div><div class='del'>-			BUG_ON(bkey_start_offset(k.k) != i + 8);</div><div class='del'>-			BUG_ON(k.k-&gt;size != 8);</div><div class='del'>-			i += 16;</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating forwards");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(i != nr);</div><div class='del'>-</div><div class='del'>-	pr_info("iterating forwards by slots");</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_extents,</div><div class='del'>-					SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-					BTREE_ITER_SLOTS, k, ({</div><div class='del'>-			if (i == nr)</div><div class='del'>-				break;</div><div class='del'>-			BUG_ON(bkey_deleted(k.k) != !(i % 16));</div><div class='del'>-</div><div class='del'>-			BUG_ON(bkey_start_offset(k.k) != i);</div><div class='del'>-			BUG_ON(k.k-&gt;size != 8);</div><div class='del'>-			i = k.k-&gt;p.offset;</div><div class='del'>-			0;</div><div class='del'>-		})));</div><div class='del'>-	bch_err_msg(c, ret, "error iterating forwards by slots");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX: we really want to make sure we've got a btree with depth &gt; 0 for these</div><div class='del'>- * tests</div><div class='del'>- */</div><div class='del'>-static int test_peek_end(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs,</div><div class='del'>-			     SPOS(0, 0, U32_MAX), 0);</div><div class='del'>-</div><div class='del'>-	lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_upto(&amp;iter, POS(0, U64_MAX))));</div><div class='del'>-	BUG_ON(k.k);</div><div class='del'>-</div><div class='del'>-	lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_upto(&amp;iter, POS(0, U64_MAX))));</div><div class='del'>-	BUG_ON(k.k);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_peek_end_extents(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_extents,</div><div class='del'>-			     SPOS(0, 0, U32_MAX), 0);</div><div class='del'>-</div><div class='del'>-	lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_upto(&amp;iter, POS(0, U64_MAX))));</div><div class='del'>-	BUG_ON(k.k);</div><div class='del'>-</div><div class='del'>-	lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_upto(&amp;iter, POS(0, U64_MAX))));</div><div class='del'>-	BUG_ON(k.k);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* extent unit tests */</div><div class='del'>-</div><div class='del'>-static u64 test_version;</div><div class='del'>-</div><div class='del'>-static int insert_test_extent(struct bch_fs *c,</div><div class='del'>-			      u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_cookie k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;k.k_i);</div><div class='del'>-	k.k_i.k.p.offset = end;</div><div class='del'>-	k.k_i.k.p.snapshot = U32_MAX;</div><div class='del'>-	k.k_i.k.size = end - start;</div><div class='del'>-	k.k_i.k.version.lo = test_version++;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_insert(c, BTREE_ID_extents, &amp;k.k_i, NULL, 0);</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __test_extent_overwrite(struct bch_fs *c,</div><div class='del'>-				    u64 e1_start, u64 e1_end,</div><div class='del'>-				    u64 e2_start, u64 e2_end)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret   = insert_test_extent(c, e1_start, e1_end) ?:</div><div class='del'>-		insert_test_extent(c, e2_start, e2_end);</div><div class='del'>-</div><div class='del'>-	delete_test_keys(c);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_extent_overwrite_front(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return  __test_extent_overwrite(c, 0, 64, 0, 32) ?:</div><div class='del'>-		__test_extent_overwrite(c, 8, 64, 0, 32);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_extent_overwrite_back(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return  __test_extent_overwrite(c, 0, 64, 32, 64) ?:</div><div class='del'>-		__test_extent_overwrite(c, 0, 64, 32, 72);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_extent_overwrite_middle(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return __test_extent_overwrite(c, 0, 64, 32, 40);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_extent_overwrite_all(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return  __test_extent_overwrite(c, 32, 64,  0,  64) ?:</div><div class='del'>-		__test_extent_overwrite(c, 32, 64,  0, 128) ?:</div><div class='del'>-		__test_extent_overwrite(c, 32, 64, 32,  64) ?:</div><div class='del'>-		__test_extent_overwrite(c, 32, 64, 32, 128);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int insert_test_overlapping_extent(struct bch_fs *c, u64 inum, u64 start, u32 len, u32 snapid)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_cookie k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;k.k_i);</div><div class='del'>-	k.k_i.k.p.inode	= inum;</div><div class='del'>-	k.k_i.k.p.offset = start + len;</div><div class='del'>-	k.k_i.k.p.snapshot = snapid;</div><div class='del'>-	k.k_i.k.size = len;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		bch2_btree_insert_nonextent(trans, BTREE_ID_extents, &amp;k.k_i,</div><div class='del'>-					    BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE));</div><div class='del'>-	bch_err_fn(c, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_extent_create_overlapping(struct bch_fs *c, u64 inum)</div><div class='del'>-{</div><div class='del'>-	return  insert_test_overlapping_extent(c, inum,  0, 16, U32_MAX - 2) ?: /* overwrite entire */</div><div class='del'>-		insert_test_overlapping_extent(c, inum,  2,  8, U32_MAX - 2) ?:</div><div class='del'>-		insert_test_overlapping_extent(c, inum,  4,  4, U32_MAX) ?:</div><div class='del'>-		insert_test_overlapping_extent(c, inum, 32,  8, U32_MAX - 2) ?: /* overwrite front/back */</div><div class='del'>-		insert_test_overlapping_extent(c, inum, 36,  8, U32_MAX) ?:</div><div class='del'>-		insert_test_overlapping_extent(c, inum, 60,  8, U32_MAX - 2) ?:</div><div class='del'>-		insert_test_overlapping_extent(c, inum, 64,  8, U32_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* snapshot unit tests */</div><div class='del'>-</div><div class='del'>-/* Test skipping over keys in unrelated snapshots: */</div><div class='del'>-static int test_snapshot_filter(struct bch_fs *c, u32 snapid_lo, u32 snapid_hi)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans;</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct bkey_i_cookie cookie;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;cookie.k_i);</div><div class='del'>-	cookie.k.p.snapshot = snapid_hi;</div><div class='del'>-	ret = bch2_btree_insert(c, BTREE_ID_xattrs, &amp;cookie.k_i, NULL, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	trans = bch2_trans_get(c);</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs,</div><div class='del'>-			     SPOS(0, 0, snapid_lo), 0);</div><div class='del'>-	lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek_upto(&amp;iter, POS(0, U64_MAX))));</div><div class='del'>-</div><div class='del'>-	BUG_ON(k.k-&gt;p.snapshot != U32_MAX);</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_snapshots(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_cookie cookie;</div><div class='del'>-	u32 snapids[2];</div><div class='del'>-	u32 snapid_subvols[2] = { 1, 1 };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;cookie.k_i);</div><div class='del'>-	cookie.k.p.snapshot = U32_MAX;</div><div class='del'>-	ret = bch2_btree_insert(c, BTREE_ID_xattrs, &amp;cookie.k_i, NULL, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		      bch2_snapshot_node_create(trans, U32_MAX,</div><div class='del'>-						snapids,</div><div class='del'>-						snapid_subvols,</div><div class='del'>-						2));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (snapids[0] &gt; snapids[1])</div><div class='del'>-		swap(snapids[0], snapids[1]);</div><div class='del'>-</div><div class='del'>-	ret = test_snapshot_filter(c, snapids[0], snapids[1]);</div><div class='del'>-	bch_err_msg(c, ret, "from test_snapshot_filter");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perf tests */</div><div class='del'>-</div><div class='del'>-static u64 test_rand(void)</div><div class='del'>-{</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	get_random_bytes(&amp;v, sizeof(v));</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rand_insert(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct bkey_i_cookie k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		bkey_cookie_init(&amp;k.k_i);</div><div class='del'>-		k.k.p.offset = test_rand();</div><div class='del'>-		k.k.p.snapshot = U32_MAX;</div><div class='del'>-</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k.k_i, 0));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rand_insert_multi(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct bkey_i_cookie k[8];</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned j;</div><div class='del'>-	u64 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i += ARRAY_SIZE(k)) {</div><div class='del'>-		for (j = 0; j &lt; ARRAY_SIZE(k); j++) {</div><div class='del'>-			bkey_cookie_init(&amp;k[j].k_i);</div><div class='del'>-			k[j].k.p.offset = test_rand();</div><div class='del'>-			k[j].k.p.snapshot = U32_MAX;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[0].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[1].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[2].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[3].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[4].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[5].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[6].k_i, 0) ?:</div><div class='del'>-			bch2_btree_insert_trans(trans, BTREE_ID_xattrs, &amp;k[7].k_i, 0));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rand_lookup(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 i;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs,</div><div class='del'>-			     SPOS(0, 0, U32_MAX), 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		bch2_btree_iter_set_pos(&amp;iter, SPOS(0, test_rand(), U32_MAX));</div><div class='del'>-</div><div class='del'>-		lockrestart_do(trans, bkey_err(k = bch2_btree_iter_peek(&amp;iter)));</div><div class='del'>-		ret = bkey_err(k);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rand_mixed_trans(struct btree_trans *trans,</div><div class='del'>-			    struct btree_iter *iter,</div><div class='del'>-			    struct bkey_i_cookie *cookie,</div><div class='del'>-			    u64 i, u64 pos)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bch2_btree_iter_set_pos(iter, SPOS(0, pos, U32_MAX));</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek(iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	bch_err_msg(trans-&gt;c, ret, "lookup error");</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!(i &amp; 3) &amp;&amp; k.k) {</div><div class='del'>-		bkey_cookie_init(&amp;cookie-&gt;k_i);</div><div class='del'>-		cookie-&gt;k.p = iter-&gt;pos;</div><div class='del'>-		ret = bch2_trans_update(trans, iter, &amp;cookie-&gt;k_i, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rand_mixed(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_i_cookie cookie;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 i, rand;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs,</div><div class='del'>-			     SPOS(0, 0, U32_MAX), 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		rand = test_rand();</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			rand_mixed_trans(trans, &amp;iter, &amp;cookie, i, rand));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __do_delete(struct btree_trans *trans, struct bpos pos)</div><div class='del'>-{</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bch2_trans_iter_init(trans, &amp;iter, BTREE_ID_xattrs, pos,</div><div class='del'>-			     BTREE_ITER_INTENT);</div><div class='del'>-	k = bch2_btree_iter_peek(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	if (!k.k)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bch2_btree_delete_at(trans, &amp;iter, 0);</div><div class='del'>-err:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rand_delete(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		struct bpos pos = SPOS(0, test_rand(), U32_MAX);</div><div class='del'>-</div><div class='del'>-		ret = commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			__do_delete(trans, pos));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_insert(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	struct bkey_i_cookie insert;</div><div class='del'>-</div><div class='del'>-	bkey_cookie_init(&amp;insert.k_i);</div><div class='del'>-</div><div class='del'>-	return bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-					SPOS(0, 0, U32_MAX),</div><div class='del'>-					BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k,</div><div class='del'>-					NULL, NULL, 0, ({</div><div class='del'>-			if (iter.pos.offset &gt;= nr)</div><div class='del'>-				break;</div><div class='del'>-			insert.k.p = iter.pos;</div><div class='del'>-			bch2_trans_update(trans, &amp;iter, &amp;insert.k_i, 0);</div><div class='del'>-		})));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_lookup(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_upto(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-				  SPOS(0, 0, U32_MAX), POS(0, U64_MAX),</div><div class='del'>-				  0, k,</div><div class='del'>-		0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_overwrite(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return bch2_trans_run(c,</div><div class='del'>-		for_each_btree_key_commit(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-					SPOS(0, 0, U32_MAX),</div><div class='del'>-					BTREE_ITER_INTENT, k,</div><div class='del'>-					NULL, NULL, 0, ({</div><div class='del'>-			struct bkey_i_cookie u;</div><div class='del'>-</div><div class='del'>-			bkey_reassemble(&amp;u.k_i, k);</div><div class='del'>-			bch2_trans_update(trans, &amp;iter, &amp;u.k_i, 0);</div><div class='del'>-		})));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_delete(struct bch_fs *c, u64 nr)</div><div class='del'>-{</div><div class='del'>-	return bch2_btree_delete_range(c, BTREE_ID_xattrs,</div><div class='del'>-				      SPOS(0, 0, U32_MAX),</div><div class='del'>-				      POS(0, U64_MAX),</div><div class='del'>-				      0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*perf_test_fn)(struct bch_fs *, u64);</div><div class='del'>-</div><div class='del'>-struct test_job {</div><div class='del'>-	struct bch_fs			*c;</div><div class='del'>-	u64				nr;</div><div class='del'>-	unsigned			nr_threads;</div><div class='del'>-	perf_test_fn			fn;</div><div class='del'>-</div><div class='del'>-	atomic_t			ready;</div><div class='del'>-	wait_queue_head_t		ready_wait;</div><div class='del'>-</div><div class='del'>-	atomic_t			done;</div><div class='del'>-	struct completion		done_completion;</div><div class='del'>-</div><div class='del'>-	u64				start;</div><div class='del'>-	u64				finish;</div><div class='del'>-	int				ret;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int btree_perf_test_thread(void *data)</div><div class='del'>-{</div><div class='del'>-	struct test_job *j = data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;j-&gt;ready)) {</div><div class='del'>-		wake_up(&amp;j-&gt;ready_wait);</div><div class='del'>-		j-&gt;start = sched_clock();</div><div class='del'>-	} else {</div><div class='del'>-		wait_event(j-&gt;ready_wait, !atomic_read(&amp;j-&gt;ready));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = j-&gt;fn(j-&gt;c, div64_u64(j-&gt;nr, j-&gt;nr_threads));</div><div class='del'>-	if (ret) {</div><div class='del'>-		bch_err(j-&gt;c, "%ps: error %s", j-&gt;fn, bch2_err_str(ret));</div><div class='del'>-		j-&gt;ret = ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;j-&gt;done)) {</div><div class='del'>-		j-&gt;finish = sched_clock();</div><div class='del'>-		complete(&amp;j-&gt;done_completion);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_btree_perf_test(struct bch_fs *c, const char *testname,</div><div class='del'>-			 u64 nr, unsigned nr_threads)</div><div class='del'>-{</div><div class='del'>-	struct test_job j = { .c = c, .nr = nr, .nr_threads = nr_threads };</div><div class='del'>-	char name_buf[20];</div><div class='del'>-	struct printbuf nr_buf = PRINTBUF;</div><div class='del'>-	struct printbuf per_sec_buf = PRINTBUF;</div><div class='del'>-	unsigned i;</div><div class='del'>-	u64 time;</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;j.ready, nr_threads);</div><div class='del'>-	init_waitqueue_head(&amp;j.ready_wait);</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;j.done, nr_threads);</div><div class='del'>-	init_completion(&amp;j.done_completion);</div><div class='del'>-</div><div class='del'>-#define perf_test(_test)				\</div><div class='del'>-	if (!strcmp(testname, #_test)) j.fn = _test</div><div class='del'>-</div><div class='del'>-	perf_test(rand_insert);</div><div class='del'>-	perf_test(rand_insert_multi);</div><div class='del'>-	perf_test(rand_lookup);</div><div class='del'>-	perf_test(rand_mixed);</div><div class='del'>-	perf_test(rand_delete);</div><div class='del'>-</div><div class='del'>-	perf_test(seq_insert);</div><div class='del'>-	perf_test(seq_lookup);</div><div class='del'>-	perf_test(seq_overwrite);</div><div class='del'>-	perf_test(seq_delete);</div><div class='del'>-</div><div class='del'>-	/* a unit test, not a perf test: */</div><div class='del'>-	perf_test(test_delete);</div><div class='del'>-	perf_test(test_delete_written);</div><div class='del'>-	perf_test(test_iterate);</div><div class='del'>-	perf_test(test_iterate_extents);</div><div class='del'>-	perf_test(test_iterate_slots);</div><div class='del'>-	perf_test(test_iterate_slots_extents);</div><div class='del'>-	perf_test(test_peek_end);</div><div class='del'>-	perf_test(test_peek_end_extents);</div><div class='del'>-</div><div class='del'>-	perf_test(test_extent_overwrite_front);</div><div class='del'>-	perf_test(test_extent_overwrite_back);</div><div class='del'>-	perf_test(test_extent_overwrite_middle);</div><div class='del'>-	perf_test(test_extent_overwrite_all);</div><div class='del'>-	perf_test(test_extent_create_overlapping);</div><div class='del'>-</div><div class='del'>-	perf_test(test_snapshots);</div><div class='del'>-</div><div class='del'>-	if (!j.fn) {</div><div class='del'>-		pr_err("unknown test %s", testname);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	//pr_info("running test %s:", testname);</div><div class='del'>-</div><div class='del'>-	if (nr_threads == 1)</div><div class='del'>-		btree_perf_test_thread(&amp;j);</div><div class='del'>-	else</div><div class='del'>-		for (i = 0; i &lt; nr_threads; i++)</div><div class='del'>-			kthread_run(btree_perf_test_thread, &amp;j,</div><div class='del'>-				    "bcachefs perf test[%u]", i);</div><div class='del'>-</div><div class='del'>-	while (wait_for_completion_interruptible(&amp;j.done_completion))</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	time = j.finish - j.start;</div><div class='del'>-</div><div class='del'>-	scnprintf(name_buf, sizeof(name_buf), "%s:", testname);</div><div class='del'>-	prt_human_readable_u64(&amp;nr_buf, nr);</div><div class='del'>-	prt_human_readable_u64(&amp;per_sec_buf, div64_u64(nr * NSEC_PER_SEC, time));</div><div class='del'>-	printk(KERN_INFO "%-12s %s with %u threads in %5llu sec, %5llu nsec per iter, %5s per sec\n",</div><div class='del'>-		name_buf, nr_buf.buf, nr_threads,</div><div class='del'>-		div_u64(time, NSEC_PER_SEC),</div><div class='del'>-		div_u64(time * nr_threads, nr),</div><div class='del'>-		per_sec_buf.buf);</div><div class='del'>-	printbuf_exit(&amp;per_sec_buf);</div><div class='del'>-	printbuf_exit(&amp;nr_buf);</div><div class='del'>-	return j.ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BCACHEFS_TESTS */</div><div class='head'>diff --git a/fs/bcachefs/tests.h b/fs/bcachefs/tests.h<br/>deleted file mode 100644<br/>index c73b18aea7e0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/tests.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/tests.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_TEST_H</div><div class='del'>-#define _BCACHEFS_TEST_H</div><div class='del'>-</div><div class='del'>-struct bch_fs;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_TESTS</div><div class='del'>-</div><div class='del'>-int bch2_btree_perf_test(struct bch_fs *, const char *, u64, unsigned);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BCACHEFS_TESTS */</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_TEST_H */</div><div class='head'>diff --git a/fs/bcachefs/thread_with_file.c b/fs/bcachefs/thread_with_file.c<br/>deleted file mode 100644<br/>index b1c867aa2b58..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/thread_with_file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/thread_with_file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,299 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "printbuf.h"</div><div class='del'>-#include "thread_with_file.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/anon_inodes.h&gt;</div><div class='del'>-#include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-</div><div class='del'>-void bch2_thread_with_file_exit(struct thread_with_file *thr)</div><div class='del'>-{</div><div class='del'>-	if (thr-&gt;task) {</div><div class='del'>-		kthread_stop(thr-&gt;task);</div><div class='del'>-		put_task_struct(thr-&gt;task);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_run_thread_with_file(struct thread_with_file *thr,</div><div class='del'>-			      const struct file_operations *fops,</div><div class='del'>-			      int (*fn)(void *))</div><div class='del'>-{</div><div class='del'>-	struct file *file = NULL;</div><div class='del'>-	int ret, fd = -1;</div><div class='del'>-	unsigned fd_flags = O_CLOEXEC;</div><div class='del'>-</div><div class='del'>-	if (fops-&gt;read &amp;&amp; fops-&gt;write)</div><div class='del'>-		fd_flags |= O_RDWR;</div><div class='del'>-	else if (fops-&gt;read)</div><div class='del'>-		fd_flags |= O_RDONLY;</div><div class='del'>-	else if (fops-&gt;write)</div><div class='del'>-		fd_flags |= O_WRONLY;</div><div class='del'>-</div><div class='del'>-	char name[TASK_COMM_LEN];</div><div class='del'>-	get_task_comm(name, current);</div><div class='del'>-</div><div class='del'>-	thr-&gt;ret = 0;</div><div class='del'>-	thr-&gt;task = kthread_create(fn, thr, "%s", name);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(thr-&gt;task);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = get_unused_fd_flags(fd_flags);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-	fd = ret;</div><div class='del'>-</div><div class='del'>-	file = anon_inode_getfile(name, fops, thr, fd_flags);</div><div class='del'>-	ret = PTR_ERR_OR_ZERO(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	fd_install(fd, file);</div><div class='del'>-	get_task_struct(thr-&gt;task);</div><div class='del'>-	wake_up_process(thr-&gt;task);</div><div class='del'>-	return fd;</div><div class='del'>-err:</div><div class='del'>-	if (fd &gt;= 0)</div><div class='del'>-		put_unused_fd(fd);</div><div class='del'>-	if (thr-&gt;task)</div><div class='del'>-		kthread_stop(thr-&gt;task);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool thread_with_stdio_has_output(struct thread_with_stdio *thr)</div><div class='del'>-{</div><div class='del'>-	return thr-&gt;stdio.output_buf.pos ||</div><div class='del'>-		thr-&gt;output2.nr ||</div><div class='del'>-		thr-&gt;thr.done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t thread_with_stdio_read(struct file *file, char __user *buf,</div><div class='del'>-				      size_t len, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct thread_with_stdio *thr =</div><div class='del'>-		container_of(file-&gt;private_data, struct thread_with_stdio, thr);</div><div class='del'>-	size_t copied = 0, b;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if ((file-&gt;f_flags &amp; O_NONBLOCK) &amp;&amp;</div><div class='del'>-	    !thread_with_stdio_has_output(thr))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	ret = wait_event_interruptible(thr-&gt;stdio.output_wait,</div><div class='del'>-		thread_with_stdio_has_output(thr));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (thr-&gt;thr.done)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while (len) {</div><div class='del'>-		ret = darray_make_room(&amp;thr-&gt;output2, thr-&gt;stdio.output_buf.pos);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;thr-&gt;stdio.output_lock);</div><div class='del'>-		b = min_t(size_t, darray_room(thr-&gt;output2), thr-&gt;stdio.output_buf.pos);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;darray_top(thr-&gt;output2), thr-&gt;stdio.output_buf.buf, b);</div><div class='del'>-		memmove(thr-&gt;stdio.output_buf.buf,</div><div class='del'>-			thr-&gt;stdio.output_buf.buf + b,</div><div class='del'>-			thr-&gt;stdio.output_buf.pos - b);</div><div class='del'>-</div><div class='del'>-		thr-&gt;output2.nr += b;</div><div class='del'>-		thr-&gt;stdio.output_buf.pos -= b;</div><div class='del'>-		spin_unlock_irq(&amp;thr-&gt;stdio.output_lock);</div><div class='del'>-</div><div class='del'>-		b = min(len, thr-&gt;output2.nr);</div><div class='del'>-		if (!b)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		b -= copy_to_user(buf, thr-&gt;output2.data, b);</div><div class='del'>-		if (!b) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		copied	+= b;</div><div class='del'>-		buf	+= b;</div><div class='del'>-		len	-= b;</div><div class='del'>-</div><div class='del'>-		memmove(thr-&gt;output2.data,</div><div class='del'>-			thr-&gt;output2.data + b,</div><div class='del'>-			thr-&gt;output2.nr - b);</div><div class='del'>-		thr-&gt;output2.nr -= b;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return copied ?: ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int thread_with_stdio_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct thread_with_stdio *thr =</div><div class='del'>-		container_of(file-&gt;private_data, struct thread_with_stdio, thr);</div><div class='del'>-</div><div class='del'>-	bch2_thread_with_file_exit(&amp;thr-&gt;thr);</div><div class='del'>-	printbuf_exit(&amp;thr-&gt;stdio.input_buf);</div><div class='del'>-	printbuf_exit(&amp;thr-&gt;stdio.output_buf);</div><div class='del'>-	darray_exit(&amp;thr-&gt;output2);</div><div class='del'>-	thr-&gt;exit(thr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define WRITE_BUFFER		4096</div><div class='del'>-</div><div class='del'>-static inline bool thread_with_stdio_has_input_space(struct thread_with_stdio *thr)</div><div class='del'>-{</div><div class='del'>-	return thr-&gt;stdio.input_buf.pos &lt; WRITE_BUFFER || thr-&gt;thr.done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t thread_with_stdio_write(struct file *file, const char __user *ubuf,</div><div class='del'>-				       size_t len, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct thread_with_stdio *thr =</div><div class='del'>-		container_of(file-&gt;private_data, struct thread_with_stdio, thr);</div><div class='del'>-	struct printbuf *buf = &amp;thr-&gt;stdio.input_buf;</div><div class='del'>-	size_t copied = 0;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-</div><div class='del'>-	while (len) {</div><div class='del'>-		if (thr-&gt;thr.done) {</div><div class='del'>-			ret = -EPIPE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		size_t b = len - fault_in_readable(ubuf, len);</div><div class='del'>-		if (!b) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;thr-&gt;stdio.input_lock);</div><div class='del'>-		if (buf-&gt;pos &lt; WRITE_BUFFER)</div><div class='del'>-			bch2_printbuf_make_room(buf, min(b, WRITE_BUFFER - buf-&gt;pos));</div><div class='del'>-		b = min(len, printbuf_remaining_size(buf));</div><div class='del'>-</div><div class='del'>-		if (b &amp;&amp; !copy_from_user_nofault(&amp;buf-&gt;buf[buf-&gt;pos], ubuf, b)) {</div><div class='del'>-			ubuf += b;</div><div class='del'>-			len -= b;</div><div class='del'>-			copied += b;</div><div class='del'>-			buf-&gt;pos += b;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;thr-&gt;stdio.input_lock);</div><div class='del'>-</div><div class='del'>-		if (b) {</div><div class='del'>-			wake_up(&amp;thr-&gt;stdio.input_wait);</div><div class='del'>-		} else {</div><div class='del'>-			if ((file-&gt;f_flags &amp; O_NONBLOCK)) {</div><div class='del'>-				ret = -EAGAIN;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = wait_event_interruptible(thr-&gt;stdio.input_wait,</div><div class='del'>-					thread_with_stdio_has_input_space(thr));</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return copied ?: ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __poll_t thread_with_stdio_poll(struct file *file, struct poll_table_struct *wait)</div><div class='del'>-{</div><div class='del'>-	struct thread_with_stdio *thr =</div><div class='del'>-		container_of(file-&gt;private_data, struct thread_with_stdio, thr);</div><div class='del'>-</div><div class='del'>-	poll_wait(file, &amp;thr-&gt;stdio.output_wait, wait);</div><div class='del'>-	poll_wait(file, &amp;thr-&gt;stdio.input_wait, wait);</div><div class='del'>-</div><div class='del'>-	__poll_t mask = 0;</div><div class='del'>-</div><div class='del'>-	if (thread_with_stdio_has_output(thr))</div><div class='del'>-		mask |= EPOLLIN;</div><div class='del'>-	if (thread_with_stdio_has_input_space(thr))</div><div class='del'>-		mask |= EPOLLOUT;</div><div class='del'>-	if (thr-&gt;thr.done)</div><div class='del'>-		mask |= EPOLLHUP|EPOLLERR;</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations thread_with_stdio_fops = {</div><div class='del'>-	.release	= thread_with_stdio_release,</div><div class='del'>-	.read		= thread_with_stdio_read,</div><div class='del'>-	.write		= thread_with_stdio_write,</div><div class='del'>-	.poll		= thread_with_stdio_poll,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_run_thread_with_stdio(struct thread_with_stdio *thr,</div><div class='del'>-			       void (*exit)(struct thread_with_stdio *),</div><div class='del'>-			       int (*fn)(void *))</div><div class='del'>-{</div><div class='del'>-	thr-&gt;stdio.input_buf = PRINTBUF;</div><div class='del'>-	thr-&gt;stdio.input_buf.atomic++;</div><div class='del'>-	spin_lock_init(&amp;thr-&gt;stdio.input_lock);</div><div class='del'>-	init_waitqueue_head(&amp;thr-&gt;stdio.input_wait);</div><div class='del'>-</div><div class='del'>-	thr-&gt;stdio.output_buf = PRINTBUF;</div><div class='del'>-	thr-&gt;stdio.output_buf.atomic++;</div><div class='del'>-	spin_lock_init(&amp;thr-&gt;stdio.output_lock);</div><div class='del'>-	init_waitqueue_head(&amp;thr-&gt;stdio.output_wait);</div><div class='del'>-</div><div class='del'>-	darray_init(&amp;thr-&gt;output2);</div><div class='del'>-	thr-&gt;exit = exit;</div><div class='del'>-</div><div class='del'>-	return bch2_run_thread_with_file(&amp;thr-&gt;thr, &amp;thread_with_stdio_fops, fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_stdio_redirect_read(struct stdio_redirect *stdio, char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	wait_event(stdio-&gt;input_wait,</div><div class='del'>-		   stdio-&gt;input_buf.pos || stdio-&gt;done);</div><div class='del'>-</div><div class='del'>-	if (stdio-&gt;done)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;stdio-&gt;input_lock);</div><div class='del'>-	int ret = min(len, stdio-&gt;input_buf.pos);</div><div class='del'>-	stdio-&gt;input_buf.pos -= ret;</div><div class='del'>-	memcpy(buf, stdio-&gt;input_buf.buf, ret);</div><div class='del'>-	memmove(stdio-&gt;input_buf.buf,</div><div class='del'>-		stdio-&gt;input_buf.buf + ret,</div><div class='del'>-		stdio-&gt;input_buf.pos);</div><div class='del'>-	spin_unlock(&amp;stdio-&gt;input_lock);</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;stdio-&gt;input_wait);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_stdio_redirect_readline(struct stdio_redirect *stdio, char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	wait_event(stdio-&gt;input_wait,</div><div class='del'>-		   stdio-&gt;input_buf.pos || stdio-&gt;done);</div><div class='del'>-</div><div class='del'>-	if (stdio-&gt;done)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;stdio-&gt;input_lock);</div><div class='del'>-	int ret = min(len, stdio-&gt;input_buf.pos);</div><div class='del'>-	char *n = memchr(stdio-&gt;input_buf.buf, '\n', ret);</div><div class='del'>-	if (n)</div><div class='del'>-		ret = min(ret, n + 1 - stdio-&gt;input_buf.buf);</div><div class='del'>-	stdio-&gt;input_buf.pos -= ret;</div><div class='del'>-	memcpy(buf, stdio-&gt;input_buf.buf, ret);</div><div class='del'>-	memmove(stdio-&gt;input_buf.buf,</div><div class='del'>-		stdio-&gt;input_buf.buf + ret,</div><div class='del'>-		stdio-&gt;input_buf.pos);</div><div class='del'>-	spin_unlock(&amp;stdio-&gt;input_lock);</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;stdio-&gt;input_wait);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='head'>diff --git a/fs/bcachefs/thread_with_file.h b/fs/bcachefs/thread_with_file.h<br/>deleted file mode 100644<br/>index 05879c5048c8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/thread_with_file.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/thread_with_file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_THREAD_WITH_FILE_H</div><div class='del'>-#define _BCACHEFS_THREAD_WITH_FILE_H</div><div class='del'>-</div><div class='del'>-#include "thread_with_file_types.h"</div><div class='del'>-</div><div class='del'>-struct task_struct;</div><div class='del'>-</div><div class='del'>-struct thread_with_file {</div><div class='del'>-	struct task_struct	*task;</div><div class='del'>-	int			ret;</div><div class='del'>-	bool			done;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_thread_with_file_exit(struct thread_with_file *);</div><div class='del'>-int bch2_run_thread_with_file(struct thread_with_file *,</div><div class='del'>-			      const struct file_operations *,</div><div class='del'>-			      int (*fn)(void *));</div><div class='del'>-</div><div class='del'>-struct thread_with_stdio {</div><div class='del'>-	struct thread_with_file	thr;</div><div class='del'>-	struct stdio_redirect	stdio;</div><div class='del'>-	DARRAY(char)		output2;</div><div class='del'>-	void			(*exit)(struct thread_with_stdio *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void thread_with_stdio_done(struct thread_with_stdio *thr)</div><div class='del'>-{</div><div class='del'>-	thr-&gt;thr.done = true;</div><div class='del'>-	thr-&gt;stdio.done = true;</div><div class='del'>-	wake_up(&amp;thr-&gt;stdio.input_wait);</div><div class='del'>-	wake_up(&amp;thr-&gt;stdio.output_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_run_thread_with_stdio(struct thread_with_stdio *,</div><div class='del'>-			       void (*exit)(struct thread_with_stdio *),</div><div class='del'>-			       int (*fn)(void *));</div><div class='del'>-int bch2_stdio_redirect_read(struct stdio_redirect *, char *, size_t);</div><div class='del'>-int bch2_stdio_redirect_readline(struct stdio_redirect *, char *, size_t);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_THREAD_WITH_FILE_H */</div><div class='head'>diff --git a/fs/bcachefs/thread_with_file_types.h b/fs/bcachefs/thread_with_file_types.h<br/>deleted file mode 100644<br/>index 90b5e645e98c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/thread_with_file_types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/thread_with_file_types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_THREAD_WITH_FILE_TYPES_H</div><div class='del'>-#define _BCACHEFS_THREAD_WITH_FILE_TYPES_H</div><div class='del'>-</div><div class='del'>-struct stdio_redirect {</div><div class='del'>-	spinlock_t		output_lock;</div><div class='del'>-	wait_queue_head_t	output_wait;</div><div class='del'>-	struct printbuf		output_buf;</div><div class='del'>-</div><div class='del'>-	spinlock_t		input_lock;</div><div class='del'>-	wait_queue_head_t	input_wait;</div><div class='del'>-	struct printbuf		input_buf;</div><div class='del'>-	bool			done;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_THREAD_WITH_FILE_TYPES_H */</div><div class='head'>diff --git a/fs/bcachefs/trace.c b/fs/bcachefs/trace.c<br/>deleted file mode 100644<br/>index dc48b52b01b4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/trace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/trace.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "alloc_types.h"</div><div class='del'>-#include "buckets.h"</div><div class='del'>-#include "btree_cache.h"</div><div class='del'>-#include "btree_iter.h"</div><div class='del'>-#include "btree_locking.h"</div><div class='del'>-#include "btree_update_interior.h"</div><div class='del'>-#include "keylist.h"</div><div class='del'>-#include "move_types.h"</div><div class='del'>-#include "opts.h"</div><div class='del'>-#include "six.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/blktrace_api.h&gt;</div><div class='del'>-</div><div class='del'>-#define CREATE_TRACE_POINTS</div><div class='del'>-#include "trace.h"</div><div class='head'>diff --git a/fs/bcachefs/trace.h b/fs/bcachefs/trace.h<br/>deleted file mode 100644<br/>index 293b90d704fb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/trace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/trace.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1443 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#undef TRACE_SYSTEM</div><div class='del'>-#define TRACE_SYSTEM bcachefs</div><div class='del'>-</div><div class='del'>-#if !defined(_TRACE_BCACHEFS_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='del'>-#define _TRACE_BCACHEFS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/tracepoint.h&gt;</div><div class='del'>-</div><div class='del'>-#define TRACE_BPOS_entries(name)				\</div><div class='del'>-	__field(u64,			name##_inode	)	\</div><div class='del'>-	__field(u64,			name##_offset	)	\</div><div class='del'>-	__field(u32,			name##_snapshot	)</div><div class='del'>-</div><div class='del'>-#define TRACE_BPOS_assign(dst, src)				\</div><div class='del'>-	__entry-&gt;dst##_inode		= (src).inode;		\</div><div class='del'>-	__entry-&gt;dst##_offset		= (src).offset;		\</div><div class='del'>-	__entry-&gt;dst##_snapshot		= (src).snapshot</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(bpos,</div><div class='del'>-	TP_PROTO(const struct bpos *p),</div><div class='del'>-	TP_ARGS(p),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		TRACE_BPOS_entries(p)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		TRACE_BPOS_assign(p, *p);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%llu:%llu:%u", __entry-&gt;p_inode, __entry-&gt;p_offset, __entry-&gt;p_snapshot)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(fs_str,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__string(str,		str			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__assign_str(str, str);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d\n%s", MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev), __get_str(str))</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(trans_str,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, unsigned long caller_ip, const char *str),</div><div class='del'>-	TP_ARGS(trans, caller_ip, str),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__array(char,		trans_fn, 32		)</div><div class='del'>-		__field(unsigned long,	caller_ip		)</div><div class='del'>-		__string(str,		str			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= trans-&gt;c-&gt;dev;</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__assign_str(str, str);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d %s %pS %s",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;trans_fn, (void *) __entry-&gt;caller_ip, __get_str(str))</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(trans_str_nocaller,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, const char *str),</div><div class='del'>-	TP_ARGS(trans, str),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__array(char,		trans_fn, 32		)</div><div class='del'>-		__string(str,		str			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= trans-&gt;c-&gt;dev;</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__assign_str(str, str);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d %s %s",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;trans_fn, __get_str(str))</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(btree_node_nofs,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, struct btree *b),</div><div class='del'>-	TP_ARGS(c, b),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u8,		level			)</div><div class='del'>-		__field(u8,		btree_id		)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;level		= b-&gt;c.level;</div><div class='del'>-		__entry-&gt;btree_id	= b-&gt;c.btree_id;</div><div class='del'>-		TRACE_BPOS_assign(pos, b-&gt;key.k.p);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d %u %s %llu:%llu:%u",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;level,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode, __entry-&gt;pos_offset, __entry-&gt;pos_snapshot)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(btree_node,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__array(char,		trans_fn, 32		)</div><div class='del'>-		__field(u8,		level			)</div><div class='del'>-		__field(u8,		btree_id		)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= trans-&gt;c-&gt;dev;</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;level		= b-&gt;c.level;</div><div class='del'>-		__entry-&gt;btree_id	= b-&gt;c.btree_id;</div><div class='del'>-		TRACE_BPOS_assign(pos, b-&gt;key.k.p);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d %s %u %s %llu:%llu:%u",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev), __entry-&gt;trans_fn,</div><div class='del'>-		  __entry-&gt;level,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode, __entry-&gt;pos_offset, __entry-&gt;pos_snapshot)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(bch_fs,</div><div class='del'>-	TP_PROTO(struct bch_fs *c),</div><div class='del'>-	TP_ARGS(c),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d", MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev))</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(btree_trans,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans),</div><div class='del'>-	TP_ARGS(trans),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__array(char,		trans_fn, 32		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= trans-&gt;c-&gt;dev;</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d %s", MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev), __entry-&gt;trans_fn)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(bio,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(sector_t,	sector			)</div><div class='del'>-		__field(unsigned int,	nr_sector		)</div><div class='del'>-		__array(char,		rwbs,	6		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= bio-&gt;bi_bdev ? bio_dev(bio) : 0;</div><div class='del'>-		__entry-&gt;sector		= bio-&gt;bi_iter.bi_sector;</div><div class='del'>-		__entry-&gt;nr_sector	= bio-&gt;bi_iter.bi_size &gt;&gt; 9;</div><div class='del'>-		blk_fill_rwbs(__entry-&gt;rwbs, bio-&gt;bi_opf);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d  %s %llu + %u",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev), __entry-&gt;rwbs,</div><div class='del'>-		  (unsigned long long)__entry-&gt;sector, __entry-&gt;nr_sector)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* super-io.c: */</div><div class='del'>-TRACE_EVENT(write_super,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, unsigned long ip),</div><div class='del'>-	TP_ARGS(c, ip),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev	)</div><div class='del'>-		__field(unsigned long,	ip	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;ip		= ip;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d for %pS",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  (void *) __entry-&gt;ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* io.c: */</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bio, read_promote,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(read_nopromote,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, int ret),</div><div class='del'>-	TP_ARGS(c, ret),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev		)</div><div class='del'>-		__array(char,		ret, 32		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		strscpy(__entry-&gt;ret, bch2_err_str(ret), sizeof(__entry-&gt;ret));</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d ret %s",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;ret)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bio, read_bounce,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bio, read_split,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bio, read_retry,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bio, read_reuse_race,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* Journal */</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bch_fs, journal_full,</div><div class='del'>-	TP_PROTO(struct bch_fs *c),</div><div class='del'>-	TP_ARGS(c)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, journal_entry_full,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, journal_entry_close,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bio, journal_write,</div><div class='del'>-	TP_PROTO(struct bio *bio),</div><div class='del'>-	TP_ARGS(bio)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(journal_reclaim_start,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, bool direct, bool kicked,</div><div class='del'>-		 u64 min_nr, u64 min_key_cache,</div><div class='del'>-		 u64 btree_cache_dirty, u64 btree_cache_total,</div><div class='del'>-		 u64 btree_key_cache_dirty, u64 btree_key_cache_total),</div><div class='del'>-	TP_ARGS(c, direct, kicked, min_nr, min_key_cache,</div><div class='del'>-		btree_cache_dirty, btree_cache_total,</div><div class='del'>-		btree_key_cache_dirty, btree_key_cache_total),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(bool,		direct			)</div><div class='del'>-		__field(bool,		kicked			)</div><div class='del'>-		__field(u64,		min_nr			)</div><div class='del'>-		__field(u64,		min_key_cache		)</div><div class='del'>-		__field(u64,		btree_cache_dirty	)</div><div class='del'>-		__field(u64,		btree_cache_total	)</div><div class='del'>-		__field(u64,		btree_key_cache_dirty	)</div><div class='del'>-		__field(u64,		btree_key_cache_total	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev			= c-&gt;dev;</div><div class='del'>-		__entry-&gt;direct			= direct;</div><div class='del'>-		__entry-&gt;kicked			= kicked;</div><div class='del'>-		__entry-&gt;min_nr			= min_nr;</div><div class='del'>-		__entry-&gt;min_key_cache		= min_key_cache;</div><div class='del'>-		__entry-&gt;btree_cache_dirty	= btree_cache_dirty;</div><div class='del'>-		__entry-&gt;btree_cache_total	= btree_cache_total;</div><div class='del'>-		__entry-&gt;btree_key_cache_dirty	= btree_key_cache_dirty;</div><div class='del'>-		__entry-&gt;btree_key_cache_total	= btree_key_cache_total;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d direct %u kicked %u min %llu key cache %llu btree cache %llu/%llu key cache %llu/%llu",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;direct,</div><div class='del'>-		  __entry-&gt;kicked,</div><div class='del'>-		  __entry-&gt;min_nr,</div><div class='del'>-		  __entry-&gt;min_key_cache,</div><div class='del'>-		  __entry-&gt;btree_cache_dirty,</div><div class='del'>-		  __entry-&gt;btree_cache_total,</div><div class='del'>-		  __entry-&gt;btree_key_cache_dirty,</div><div class='del'>-		  __entry-&gt;btree_key_cache_total)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(journal_reclaim_finish,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, u64 nr_flushed),</div><div class='del'>-	TP_ARGS(c, nr_flushed),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u64,		nr_flushed		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;nr_flushed	= nr_flushed;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d flushed %llu",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;nr_flushed)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* bset.c: */</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bpos, bkey_pack_pos_fail,</div><div class='del'>-	TP_PROTO(const struct bpos *p),</div><div class='del'>-	TP_ARGS(p)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* Btree cache: */</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(btree_cache_scan,</div><div class='del'>-	TP_PROTO(long nr_to_scan, long can_free, long ret),</div><div class='del'>-	TP_ARGS(nr_to_scan, can_free, ret),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(long,	nr_to_scan		)</div><div class='del'>-		__field(long,	can_free		)</div><div class='del'>-		__field(long,	ret			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;nr_to_scan	= nr_to_scan;</div><div class='del'>-		__entry-&gt;can_free	= can_free;</div><div class='del'>-		__entry-&gt;ret		= ret;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("scanned for %li nodes, can free %li, ret %li",</div><div class='del'>-		  __entry-&gt;nr_to_scan, __entry-&gt;can_free, __entry-&gt;ret)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node_nofs, btree_cache_reap,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, struct btree *b),</div><div class='del'>-	TP_ARGS(c, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_trans, btree_cache_cannibalize_lock_fail,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans),</div><div class='del'>-	TP_ARGS(trans)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_trans, btree_cache_cannibalize_lock,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans),</div><div class='del'>-	TP_ARGS(trans)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_trans, btree_cache_cannibalize,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans),</div><div class='del'>-	TP_ARGS(trans)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_trans, btree_cache_cannibalize_unlock,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans),</div><div class='del'>-	TP_ARGS(trans)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* Btree */</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_read,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(btree_node_write,</div><div class='del'>-	TP_PROTO(struct btree *b, unsigned bytes, unsigned sectors),</div><div class='del'>-	TP_ARGS(b, bytes, sectors),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(enum btree_node_type,	type)</div><div class='del'>-		__field(unsigned,	bytes			)</div><div class='del'>-		__field(unsigned,	sectors			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;type	= btree_node_type(b);</div><div class='del'>-		__entry-&gt;bytes	= bytes;</div><div class='del'>-		__entry-&gt;sectors = sectors;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("bkey type %u bytes %u sectors %u",</div><div class='del'>-		  __entry-&gt;type , __entry-&gt;bytes, __entry-&gt;sectors)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_alloc,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_free,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(btree_reserve_get_fail,</div><div class='del'>-	TP_PROTO(const char *trans_fn,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 size_t required,</div><div class='del'>-		 int ret),</div><div class='del'>-	TP_ARGS(trans_fn, caller_ip, required, ret),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(size_t,			required	)</div><div class='del'>-		__array(char,			ret, 32		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans_fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip	= caller_ip;</div><div class='del'>-		__entry-&gt;required	= required;</div><div class='del'>-		strscpy(__entry-&gt;ret, bch2_err_str(ret), sizeof(__entry-&gt;ret));</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS required %zu ret %s",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  __entry-&gt;required,</div><div class='del'>-		  __entry-&gt;ret)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_compact,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_merge,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_split,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_rewrite,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(btree_node, btree_node_set_root,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, struct btree *b),</div><div class='del'>-	TP_ARGS(trans, b)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(btree_path_relock_fail,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path,</div><div class='del'>-		 unsigned level),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path, level),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(u8,			btree_id	)</div><div class='del'>-		__field(u8,			level		)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-		__array(char,			node, 24	)</div><div class='del'>-		__field(u8,			self_read_count	)</div><div class='del'>-		__field(u8,			self_intent_count)</div><div class='del'>-		__field(u8,			read_count	)</div><div class='del'>-		__field(u8,			intent_count	)</div><div class='del'>-		__field(u32,			iter_lock_seq	)</div><div class='del'>-		__field(u32,			node_lock_seq	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		struct btree *b = btree_path_node(path, level);</div><div class='del'>-		struct six_lock_count c;</div><div class='del'>-</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;btree_id		= path-&gt;btree_id;</div><div class='del'>-		__entry-&gt;level			= path-&gt;level;</div><div class='del'>-		TRACE_BPOS_assign(pos, path-&gt;pos);</div><div class='del'>-</div><div class='del'>-		c = bch2_btree_node_lock_counts(trans, NULL, &amp;path-&gt;l[level].b-&gt;c, level);</div><div class='del'>-		__entry-&gt;self_read_count	= c.n[SIX_LOCK_read];</div><div class='del'>-		__entry-&gt;self_intent_count	= c.n[SIX_LOCK_intent];</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(b)) {</div><div class='del'>-			strscpy(__entry-&gt;node, bch2_err_str(PTR_ERR(b)), sizeof(__entry-&gt;node));</div><div class='del'>-		} else {</div><div class='del'>-			c = six_lock_counts(&amp;path-&gt;l[level].b-&gt;c.lock);</div><div class='del'>-			__entry-&gt;read_count	= c.n[SIX_LOCK_read];</div><div class='del'>-			__entry-&gt;intent_count	= c.n[SIX_LOCK_intent];</div><div class='del'>-			scnprintf(__entry-&gt;node, sizeof(__entry-&gt;node), "%px", b);</div><div class='del'>-		}</div><div class='del'>-		__entry-&gt;iter_lock_seq		= path-&gt;l[level].lock_seq;</div><div class='del'>-		__entry-&gt;node_lock_seq		= is_btree_node(path, level)</div><div class='del'>-			? six_lock_seq(&amp;path-&gt;l[level].b-&gt;c.lock)</div><div class='del'>-			: 0;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS btree %s pos %llu:%llu:%u level %u node %s held %u:%u lock count %u:%u iter seq %u lock seq %u",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode,</div><div class='del'>-		  __entry-&gt;pos_offset,</div><div class='del'>-		  __entry-&gt;pos_snapshot,</div><div class='del'>-		  __entry-&gt;level,</div><div class='del'>-		  __entry-&gt;node,</div><div class='del'>-		  __entry-&gt;self_read_count,</div><div class='del'>-		  __entry-&gt;self_intent_count,</div><div class='del'>-		  __entry-&gt;read_count,</div><div class='del'>-		  __entry-&gt;intent_count,</div><div class='del'>-		  __entry-&gt;iter_lock_seq,</div><div class='del'>-		  __entry-&gt;node_lock_seq)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(btree_path_upgrade_fail,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path,</div><div class='del'>-		 unsigned level),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path, level),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(u8,			btree_id	)</div><div class='del'>-		__field(u8,			level		)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-		__field(u8,			locked		)</div><div class='del'>-		__field(u8,			self_read_count	)</div><div class='del'>-		__field(u8,			self_intent_count)</div><div class='del'>-		__field(u8,			read_count	)</div><div class='del'>-		__field(u8,			intent_count	)</div><div class='del'>-		__field(u32,			iter_lock_seq	)</div><div class='del'>-		__field(u32,			node_lock_seq	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		struct six_lock_count c;</div><div class='del'>-</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;btree_id		= path-&gt;btree_id;</div><div class='del'>-		__entry-&gt;level			= level;</div><div class='del'>-		TRACE_BPOS_assign(pos, path-&gt;pos);</div><div class='del'>-		__entry-&gt;locked			= btree_node_locked(path, level);</div><div class='del'>-</div><div class='del'>-		c = bch2_btree_node_lock_counts(trans, NULL, &amp;path-&gt;l[level].b-&gt;c, level),</div><div class='del'>-		__entry-&gt;self_read_count	= c.n[SIX_LOCK_read];</div><div class='del'>-		__entry-&gt;self_intent_count	= c.n[SIX_LOCK_intent];</div><div class='del'>-		c = six_lock_counts(&amp;path-&gt;l[level].b-&gt;c.lock);</div><div class='del'>-		__entry-&gt;read_count		= c.n[SIX_LOCK_read];</div><div class='del'>-		__entry-&gt;intent_count		= c.n[SIX_LOCK_intent];</div><div class='del'>-		__entry-&gt;iter_lock_seq		= path-&gt;l[level].lock_seq;</div><div class='del'>-		__entry-&gt;node_lock_seq		= is_btree_node(path, level)</div><div class='del'>-			? six_lock_seq(&amp;path-&gt;l[level].b-&gt;c.lock)</div><div class='del'>-			: 0;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS btree %s pos %llu:%llu:%u level %u locked %u held %u:%u lock count %u:%u iter seq %u lock seq %u",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode,</div><div class='del'>-		  __entry-&gt;pos_offset,</div><div class='del'>-		  __entry-&gt;pos_snapshot,</div><div class='del'>-		  __entry-&gt;level,</div><div class='del'>-		  __entry-&gt;locked,</div><div class='del'>-		  __entry-&gt;self_read_count,</div><div class='del'>-		  __entry-&gt;self_intent_count,</div><div class='del'>-		  __entry-&gt;read_count,</div><div class='del'>-		  __entry-&gt;intent_count,</div><div class='del'>-		  __entry-&gt;iter_lock_seq,</div><div class='del'>-		  __entry-&gt;node_lock_seq)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* Garbage collection */</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bch_fs, gc_gens_start,</div><div class='del'>-	TP_PROTO(struct bch_fs *c),</div><div class='del'>-	TP_ARGS(c)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bch_fs, gc_gens_end,</div><div class='del'>-	TP_PROTO(struct bch_fs *c),</div><div class='del'>-	TP_ARGS(c)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* Allocator */</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(bucket_alloc,</div><div class='del'>-	TP_PROTO(struct bch_dev *ca, const char *alloc_reserve,</div><div class='del'>-		 u64 bucket,</div><div class='del'>-		 u64 free,</div><div class='del'>-		 u64 avail,</div><div class='del'>-		 u64 copygc_wait_amount,</div><div class='del'>-		 s64 copygc_waiting_for,</div><div class='del'>-		 struct bucket_alloc_state *s,</div><div class='del'>-		 bool nonblocking,</div><div class='del'>-		 const char *err),</div><div class='del'>-	TP_ARGS(ca, alloc_reserve, bucket, free, avail,</div><div class='del'>-		copygc_wait_amount, copygc_waiting_for,</div><div class='del'>-		s, nonblocking, err),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(u8,			dev			)</div><div class='del'>-		__array(char,	reserve,	16			)</div><div class='del'>-		__field(u64,			bucket	)</div><div class='del'>-		__field(u64,			free			)</div><div class='del'>-		__field(u64,			avail			)</div><div class='del'>-		__field(u64,			copygc_wait_amount	)</div><div class='del'>-		__field(s64,			copygc_waiting_for	)</div><div class='del'>-		__field(u64,			seen			)</div><div class='del'>-		__field(u64,			open			)</div><div class='del'>-		__field(u64,			need_journal_commit	)</div><div class='del'>-		__field(u64,			nouse			)</div><div class='del'>-		__field(bool,			nonblocking		)</div><div class='del'>-		__field(u64,			nocow			)</div><div class='del'>-		__array(char,			err,	32		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= ca-&gt;dev_idx;</div><div class='del'>-		strscpy(__entry-&gt;reserve, alloc_reserve, sizeof(__entry-&gt;reserve));</div><div class='del'>-		__entry-&gt;bucket		= bucket;</div><div class='del'>-		__entry-&gt;free		= free;</div><div class='del'>-		__entry-&gt;avail		= avail;</div><div class='del'>-		__entry-&gt;copygc_wait_amount	= copygc_wait_amount;</div><div class='del'>-		__entry-&gt;copygc_waiting_for	= copygc_waiting_for;</div><div class='del'>-		__entry-&gt;seen		= s-&gt;buckets_seen;</div><div class='del'>-		__entry-&gt;open		= s-&gt;skipped_open;</div><div class='del'>-		__entry-&gt;need_journal_commit = s-&gt;skipped_need_journal_commit;</div><div class='del'>-		__entry-&gt;nouse		= s-&gt;skipped_nouse;</div><div class='del'>-		__entry-&gt;nonblocking	= nonblocking;</div><div class='del'>-		__entry-&gt;nocow		= s-&gt;skipped_nocow;</div><div class='del'>-		strscpy(__entry-&gt;err, err, sizeof(__entry-&gt;err));</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("reserve %s bucket %u:%llu free %llu avail %llu copygc_wait %llu/%lli seen %llu open %llu need_journal_commit %llu nouse %llu nocow %llu nonblocking %u err %s",</div><div class='del'>-		  __entry-&gt;reserve,</div><div class='del'>-		  __entry-&gt;dev,</div><div class='del'>-		  __entry-&gt;bucket,</div><div class='del'>-		  __entry-&gt;free,</div><div class='del'>-		  __entry-&gt;avail,</div><div class='del'>-		  __entry-&gt;copygc_wait_amount,</div><div class='del'>-		  __entry-&gt;copygc_waiting_for,</div><div class='del'>-		  __entry-&gt;seen,</div><div class='del'>-		  __entry-&gt;open,</div><div class='del'>-		  __entry-&gt;need_journal_commit,</div><div class='del'>-		  __entry-&gt;nouse,</div><div class='del'>-		  __entry-&gt;nocow,</div><div class='del'>-		  __entry-&gt;nonblocking,</div><div class='del'>-		  __entry-&gt;err)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bucket_alloc, bucket_alloc,</div><div class='del'>-	TP_PROTO(struct bch_dev *ca, const char *alloc_reserve,</div><div class='del'>-		 u64 bucket,</div><div class='del'>-		 u64 free,</div><div class='del'>-		 u64 avail,</div><div class='del'>-		 u64 copygc_wait_amount,</div><div class='del'>-		 s64 copygc_waiting_for,</div><div class='del'>-		 struct bucket_alloc_state *s,</div><div class='del'>-		 bool nonblocking,</div><div class='del'>-		 const char *err),</div><div class='del'>-	TP_ARGS(ca, alloc_reserve, bucket, free, avail,</div><div class='del'>-		copygc_wait_amount, copygc_waiting_for,</div><div class='del'>-		s, nonblocking, err)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(bucket_alloc, bucket_alloc_fail,</div><div class='del'>-	TP_PROTO(struct bch_dev *ca, const char *alloc_reserve,</div><div class='del'>-		 u64 bucket,</div><div class='del'>-		 u64 free,</div><div class='del'>-		 u64 avail,</div><div class='del'>-		 u64 copygc_wait_amount,</div><div class='del'>-		 s64 copygc_waiting_for,</div><div class='del'>-		 struct bucket_alloc_state *s,</div><div class='del'>-		 bool nonblocking,</div><div class='del'>-		 const char *err),</div><div class='del'>-	TP_ARGS(ca, alloc_reserve, bucket, free, avail,</div><div class='del'>-		copygc_wait_amount, copygc_waiting_for,</div><div class='del'>-		s, nonblocking, err)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(discard_buckets,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, u64 seen, u64 open,</div><div class='del'>-		 u64 need_journal_commit, u64 discarded, const char *err),</div><div class='del'>-	TP_ARGS(c, seen, open, need_journal_commit, discarded, err),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u64,		seen			)</div><div class='del'>-		__field(u64,		open			)</div><div class='del'>-		__field(u64,		need_journal_commit	)</div><div class='del'>-		__field(u64,		discarded		)</div><div class='del'>-		__array(char,		err,	16		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev			= c-&gt;dev;</div><div class='del'>-		__entry-&gt;seen			= seen;</div><div class='del'>-		__entry-&gt;open			= open;</div><div class='del'>-		__entry-&gt;need_journal_commit	= need_journal_commit;</div><div class='del'>-		__entry-&gt;discarded		= discarded;</div><div class='del'>-		strscpy(__entry-&gt;err, err, sizeof(__entry-&gt;err));</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d%d seen %llu open %llu need_journal_commit %llu discarded %llu err %s",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;seen,</div><div class='del'>-		  __entry-&gt;open,</div><div class='del'>-		  __entry-&gt;need_journal_commit,</div><div class='del'>-		  __entry-&gt;discarded,</div><div class='del'>-		  __entry-&gt;err)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(bucket_invalidate,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, unsigned dev, u64 bucket, u32 sectors),</div><div class='del'>-	TP_ARGS(c, dev, bucket, sectors),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u32,		dev_idx			)</div><div class='del'>-		__field(u32,		sectors			)</div><div class='del'>-		__field(u64,		bucket			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;dev_idx	= dev;</div><div class='del'>-		__entry-&gt;sectors	= sectors;</div><div class='del'>-		__entry-&gt;bucket		= bucket;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d:%d invalidated %u:%llu cached sectors %u",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;dev_idx, __entry-&gt;bucket,</div><div class='del'>-		  __entry-&gt;sectors)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* Moving IO */</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(bucket_evacuate,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, struct bpos *bucket),</div><div class='del'>-	TP_ARGS(c, bucket),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u32,		dev_idx			)</div><div class='del'>-		__field(u64,		bucket			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;dev_idx	= bucket-&gt;inode;</div><div class='del'>-		__entry-&gt;bucket		= bucket-&gt;offset;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d:%d %u:%llu",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;dev_idx, __entry-&gt;bucket)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, move_extent,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, move_extent_read,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, move_extent_write,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, move_extent_finish,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, move_extent_fail,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, move_extent_start_fail,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(move_data,</div><div class='del'>-	TP_PROTO(struct bch_fs *c,</div><div class='del'>-		 struct bch_move_stats *stats),</div><div class='del'>-	TP_ARGS(c, stats),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev		)</div><div class='del'>-		__field(u64,		keys_moved	)</div><div class='del'>-		__field(u64,		keys_raced	)</div><div class='del'>-		__field(u64,		sectors_seen	)</div><div class='del'>-		__field(u64,		sectors_moved	)</div><div class='del'>-		__field(u64,		sectors_raced	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;keys_moved	= atomic64_read(&amp;stats-&gt;keys_moved);</div><div class='del'>-		__entry-&gt;keys_raced	= atomic64_read(&amp;stats-&gt;keys_raced);</div><div class='del'>-		__entry-&gt;sectors_seen	= atomic64_read(&amp;stats-&gt;sectors_seen);</div><div class='del'>-		__entry-&gt;sectors_moved	= atomic64_read(&amp;stats-&gt;sectors_moved);</div><div class='del'>-		__entry-&gt;sectors_raced	= atomic64_read(&amp;stats-&gt;sectors_raced);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d keys moved %llu raced %llu"</div><div class='del'>-		  "sectors seen %llu moved %llu raced %llu",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;keys_moved,</div><div class='del'>-		  __entry-&gt;keys_raced,</div><div class='del'>-		  __entry-&gt;sectors_seen,</div><div class='del'>-		  __entry-&gt;sectors_moved,</div><div class='del'>-		  __entry-&gt;sectors_raced)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(evacuate_bucket,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, struct bpos *bucket,</div><div class='del'>-		 unsigned sectors, unsigned bucket_size,</div><div class='del'>-		 u64 fragmentation, int ret),</div><div class='del'>-	TP_ARGS(c, bucket, sectors, bucket_size, fragmentation, ret),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev		)</div><div class='del'>-		__field(u64,		member		)</div><div class='del'>-		__field(u64,		bucket		)</div><div class='del'>-		__field(u32,		sectors		)</div><div class='del'>-		__field(u32,		bucket_size	)</div><div class='del'>-		__field(u64,		fragmentation	)</div><div class='del'>-		__field(int,		ret		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev			= c-&gt;dev;</div><div class='del'>-		__entry-&gt;member			= bucket-&gt;inode;</div><div class='del'>-		__entry-&gt;bucket			= bucket-&gt;offset;</div><div class='del'>-		__entry-&gt;sectors		= sectors;</div><div class='del'>-		__entry-&gt;bucket_size		= bucket_size;</div><div class='del'>-		__entry-&gt;fragmentation		= fragmentation;</div><div class='del'>-		__entry-&gt;ret			= ret;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d %llu:%llu sectors %u/%u fragmentation %llu ret %i",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;member, __entry-&gt;bucket,</div><div class='del'>-		  __entry-&gt;sectors, __entry-&gt;bucket_size,</div><div class='del'>-		  __entry-&gt;fragmentation, __entry-&gt;ret)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(copygc,</div><div class='del'>-	TP_PROTO(struct bch_fs *c,</div><div class='del'>-		 u64 sectors_moved, u64 sectors_not_moved,</div><div class='del'>-		 u64 buckets_moved, u64 buckets_not_moved),</div><div class='del'>-	TP_ARGS(c,</div><div class='del'>-		sectors_moved, sectors_not_moved,</div><div class='del'>-		buckets_moved, buckets_not_moved),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u64,		sectors_moved		)</div><div class='del'>-		__field(u64,		sectors_not_moved	)</div><div class='del'>-		__field(u64,		buckets_moved		)</div><div class='del'>-		__field(u64,		buckets_not_moved	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev			= c-&gt;dev;</div><div class='del'>-		__entry-&gt;sectors_moved		= sectors_moved;</div><div class='del'>-		__entry-&gt;sectors_not_moved	= sectors_not_moved;</div><div class='del'>-		__entry-&gt;buckets_moved		= buckets_moved;</div><div class='del'>-		__entry-&gt;buckets_not_moved = buckets_moved;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%d sectors moved %llu remain %llu buckets moved %llu remain %llu",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;sectors_moved, __entry-&gt;sectors_not_moved,</div><div class='del'>-		  __entry-&gt;buckets_moved, __entry-&gt;buckets_not_moved)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(copygc_wait,</div><div class='del'>-	TP_PROTO(struct bch_fs *c,</div><div class='del'>-		 u64 wait_amount, u64 until),</div><div class='del'>-	TP_ARGS(c, wait_amount, until),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(dev_t,		dev			)</div><div class='del'>-		__field(u64,		wait_amount		)</div><div class='del'>-		__field(u64,		until			)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;dev		= c-&gt;dev;</div><div class='del'>-		__entry-&gt;wait_amount	= wait_amount;</div><div class='del'>-		__entry-&gt;until		= until;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%d,%u waiting for %llu sectors until %llu",</div><div class='del'>-		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='del'>-		  __entry-&gt;wait_amount, __entry-&gt;until)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-/* btree transactions: */</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(transaction_event,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS", __entry-&gt;trans_fn, (void *) __entry-&gt;caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	transaction_commit,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_restart_injected,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(trans_restart_split_race,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree *b),</div><div class='del'>-	TP_ARGS(trans, caller_ip, b),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(u8,			level		)</div><div class='del'>-		__field(u16,			written		)</div><div class='del'>-		__field(u16,			blocks		)</div><div class='del'>-		__field(u16,			u64s_remaining	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;level		= b-&gt;c.level;</div><div class='del'>-		__entry-&gt;written	= b-&gt;written;</div><div class='del'>-		__entry-&gt;blocks		= btree_blocks(trans-&gt;c);</div><div class='del'>-		__entry-&gt;u64s_remaining	= bch2_btree_keys_u64s_remaining(b);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS l=%u written %u/%u u64s remaining %u",</div><div class='del'>-		  __entry-&gt;trans_fn, (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  __entry-&gt;level,</div><div class='del'>-		  __entry-&gt;written, __entry-&gt;blocks,</div><div class='del'>-		  __entry-&gt;u64s_remaining)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_blocked_journal_reclaim,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(trans_restart_journal_preres_get,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 unsigned flags),</div><div class='del'>-	TP_ARGS(trans, caller_ip, flags),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(unsigned,		flags		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;flags			= flags;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS %x", __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  __entry-&gt;flags)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_restart_fault_inject,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_traverse_all,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_restart_key_cache_raced,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(trans_str, trans_restart_too_many_iters,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 const char *paths),</div><div class='del'>-	TP_ARGS(trans, caller_ip, paths)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DECLARE_EVENT_CLASS(transaction_restart_iter,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(u8,			btree_id	)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;btree_id		= path-&gt;btree_id;</div><div class='del'>-		TRACE_BPOS_assign(pos, path-&gt;pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS btree %s pos %llu:%llu:%u",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode,</div><div class='del'>-		  __entry-&gt;pos_offset,</div><div class='del'>-		  __entry-&gt;pos_snapshot)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_btree_node_reused,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_btree_node_split,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(trans_restart_upgrade,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path,</div><div class='del'>-		 unsigned old_locks_want,</div><div class='del'>-		 unsigned new_locks_want,</div><div class='del'>-		 struct get_locks_fail *f),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path, old_locks_want, new_locks_want, f),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(u8,			btree_id	)</div><div class='del'>-		__field(u8,			old_locks_want	)</div><div class='del'>-		__field(u8,			new_locks_want	)</div><div class='del'>-		__field(u8,			level		)</div><div class='del'>-		__field(u32,			path_seq	)</div><div class='del'>-		__field(u32,			node_seq	)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;btree_id		= path-&gt;btree_id;</div><div class='del'>-		__entry-&gt;old_locks_want		= old_locks_want;</div><div class='del'>-		__entry-&gt;new_locks_want		= new_locks_want;</div><div class='del'>-		__entry-&gt;level			= f-&gt;l;</div><div class='del'>-		__entry-&gt;path_seq		= path-&gt;l[f-&gt;l].lock_seq;</div><div class='del'>-		__entry-&gt;node_seq		= IS_ERR_OR_NULL(f-&gt;b) ? 0 : f-&gt;b-&gt;c.lock.seq;</div><div class='del'>-		TRACE_BPOS_assign(pos, path-&gt;pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS btree %s pos %llu:%llu:%u locks_want %u -&gt; %u level %u path seq %u node seq %u",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode,</div><div class='del'>-		  __entry-&gt;pos_offset,</div><div class='del'>-		  __entry-&gt;pos_snapshot,</div><div class='del'>-		  __entry-&gt;old_locks_want,</div><div class='del'>-		  __entry-&gt;new_locks_want,</div><div class='del'>-		  __entry-&gt;level,</div><div class='del'>-		  __entry-&gt;path_seq,</div><div class='del'>-		  __entry-&gt;node_seq)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(trans_str,	trans_restart_relock,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, unsigned long caller_ip, const char *str),</div><div class='del'>-	TP_ARGS(trans, caller_ip, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock_next_node,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock_parent_for_fill,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock_after_fill,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_restart_key_cache_upgrade,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock_key_cache_fill,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock_path,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock_path_intent,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_traverse,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_restart_iter,	trans_restart_memory_allocation_failure,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(trans_str_nocaller, trans_restart_would_deadlock,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 const char *cycle),</div><div class='del'>-	TP_ARGS(trans, cycle)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_restart_would_deadlock_recursion_limit,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(trans_restart_would_deadlock_write,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans),</div><div class='del'>-	TP_ARGS(trans),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s", __entry-&gt;trans_fn)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(trans_restart_mem_realloced,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 unsigned long bytes),</div><div class='del'>-	TP_ARGS(trans, caller_ip, bytes),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(unsigned long,		bytes		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip	= caller_ip;</div><div class='del'>-		__entry-&gt;bytes		= bytes;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS bytes %lu",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  __entry-&gt;bytes)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(trans_restart_key_cache_key_realloced,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path,</div><div class='del'>-		 unsigned old_u64s,</div><div class='del'>-		 unsigned new_u64s),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path, old_u64s, new_u64s),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(enum btree_id,		btree_id	)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-		__field(u32,			old_u64s	)</div><div class='del'>-		__field(u32,			new_u64s	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-</div><div class='del'>-		__entry-&gt;btree_id	= path-&gt;btree_id;</div><div class='del'>-		TRACE_BPOS_assign(pos, path-&gt;pos);</div><div class='del'>-		__entry-&gt;old_u64s	= old_u64s;</div><div class='del'>-		__entry-&gt;new_u64s	= new_u64s;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS btree %s pos %llu:%llu:%u old_u64s %u new_u64s %u",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree_id),</div><div class='del'>-		  __entry-&gt;pos_inode,</div><div class='del'>-		  __entry-&gt;pos_offset,</div><div class='del'>-		  __entry-&gt;pos_snapshot,</div><div class='del'>-		  __entry-&gt;old_u64s,</div><div class='del'>-		  __entry-&gt;new_u64s)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(path_downgrade,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip,</div><div class='del'>-		 struct btree_path *path,</div><div class='del'>-		 unsigned old_locks_want),</div><div class='del'>-	TP_ARGS(trans, caller_ip, path, old_locks_want),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-		__field(unsigned,		old_locks_want	)</div><div class='del'>-		__field(unsigned,		new_locks_want	)</div><div class='del'>-		__field(unsigned,		btree		)</div><div class='del'>-		TRACE_BPOS_entries(pos)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-		__entry-&gt;old_locks_want		= old_locks_want;</div><div class='del'>-		__entry-&gt;new_locks_want		= path-&gt;locks_want;</div><div class='del'>-		__entry-&gt;btree			= path-&gt;btree_id;</div><div class='del'>-		TRACE_BPOS_assign(pos, path-&gt;pos);</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS locks_want %u -&gt; %u %s %llu:%llu:%u",</div><div class='del'>-		  __entry-&gt;trans_fn,</div><div class='del'>-		  (void *) __entry-&gt;caller_ip,</div><div class='del'>-		  __entry-&gt;old_locks_want,</div><div class='del'>-		  __entry-&gt;new_locks_want,</div><div class='del'>-		  bch2_btree_id_str(__entry-&gt;btree),</div><div class='del'>-		  __entry-&gt;pos_inode,</div><div class='del'>-		  __entry-&gt;pos_offset,</div><div class='del'>-		  __entry-&gt;pos_snapshot)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(transaction_event,	trans_restart_write_buffer_flush,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans,</div><div class='del'>-		 unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(write_buffer_flush,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, size_t nr, size_t skipped, size_t fast, size_t size),</div><div class='del'>-	TP_ARGS(trans, nr, skipped, fast, size),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(size_t,		nr		)</div><div class='del'>-		__field(size_t,		skipped		)</div><div class='del'>-		__field(size_t,		fast		)</div><div class='del'>-		__field(size_t,		size		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;nr	= nr;</div><div class='del'>-		__entry-&gt;skipped = skipped;</div><div class='del'>-		__entry-&gt;fast	= fast;</div><div class='del'>-		__entry-&gt;size	= size;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%zu/%zu skipped %zu fast %zu",</div><div class='del'>-		  __entry-&gt;nr, __entry-&gt;size, __entry-&gt;skipped, __entry-&gt;fast)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(write_buffer_flush_sync,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, unsigned long caller_ip),</div><div class='del'>-	TP_ARGS(trans, caller_ip),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__array(char,			trans_fn, 32	)</div><div class='del'>-		__field(unsigned long,		caller_ip	)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		strscpy(__entry-&gt;trans_fn, trans-&gt;fn, sizeof(__entry-&gt;trans_fn));</div><div class='del'>-		__entry-&gt;caller_ip		= caller_ip;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%s %pS", __entry-&gt;trans_fn, (void *) __entry-&gt;caller_ip)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(write_buffer_flush_slowpath,</div><div class='del'>-	TP_PROTO(struct btree_trans *trans, size_t slowpath, size_t total),</div><div class='del'>-	TP_ARGS(trans, slowpath, total),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(size_t,		slowpath	)</div><div class='del'>-		__field(size_t,		total		)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;slowpath	= slowpath;</div><div class='del'>-		__entry-&gt;total		= total;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("%zu/%zu", __entry-&gt;slowpath, __entry-&gt;total)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, rebalance_extent,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-DEFINE_EVENT(fs_str, data_update,</div><div class='del'>-	TP_PROTO(struct bch_fs *c, const char *str),</div><div class='del'>-	TP_ARGS(c, str)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-#endif /* _TRACE_BCACHEFS_H */</div><div class='del'>-</div><div class='del'>-/* This part must be outside protection */</div><div class='del'>-#undef TRACE_INCLUDE_PATH</div><div class='del'>-#define TRACE_INCLUDE_PATH ../../fs/bcachefs</div><div class='del'>-</div><div class='del'>-#undef TRACE_INCLUDE_FILE</div><div class='del'>-#define TRACE_INCLUDE_FILE trace</div><div class='del'>-</div><div class='del'>-#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/fs/bcachefs/two_state_shared_lock.c b/fs/bcachefs/two_state_shared_lock.c<br/>deleted file mode 100644<br/>index 9764c2e6a910..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/two_state_shared_lock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/two_state_shared_lock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "two_state_shared_lock.h"</div><div class='del'>-</div><div class='del'>-void __bch2_two_state_lock(two_state_lock_t *lock, int s)</div><div class='del'>-{</div><div class='del'>-	__wait_event(lock-&gt;wait, bch2_two_state_trylock(lock, s));</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/two_state_shared_lock.h b/fs/bcachefs/two_state_shared_lock.h<br/>deleted file mode 100644<br/>index 905801772002..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/two_state_shared_lock.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/two_state_shared_lock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_TWO_STATE_LOCK_H</div><div class='del'>-#define _BCACHEFS_TWO_STATE_LOCK_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Two-state lock - can be taken for add or block - both states are shared,</div><div class='del'>- * like read side of rwsem, but conflict with other state:</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	atomic_long_t		v;</div><div class='del'>-	wait_queue_head_t	wait;</div><div class='del'>-} two_state_lock_t;</div><div class='del'>-</div><div class='del'>-static inline void two_state_lock_init(two_state_lock_t *lock)</div><div class='del'>-{</div><div class='del'>-	atomic_long_set(&amp;lock-&gt;v, 0);</div><div class='del'>-	init_waitqueue_head(&amp;lock-&gt;wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_two_state_unlock(two_state_lock_t *lock, int s)</div><div class='del'>-{</div><div class='del'>-	long i = s ? 1 : -1;</div><div class='del'>-</div><div class='del'>-	EBUG_ON(atomic_long_read(&amp;lock-&gt;v) == 0);</div><div class='del'>-</div><div class='del'>-	if (atomic_long_sub_return_release(i, &amp;lock-&gt;v) == 0)</div><div class='del'>-		wake_up_all(&amp;lock-&gt;wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bch2_two_state_trylock(two_state_lock_t *lock, int s)</div><div class='del'>-{</div><div class='del'>-	long i = s ? 1 : -1;</div><div class='del'>-	long v = atomic_long_read(&amp;lock-&gt;v), old;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		old = v;</div><div class='del'>-</div><div class='del'>-		if (i &gt; 0 ? v &lt; 0 : v &gt; 0)</div><div class='del'>-			return false;</div><div class='del'>-	} while ((v = atomic_long_cmpxchg_acquire(&amp;lock-&gt;v,</div><div class='del'>-					old, old + i)) != old);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_two_state_lock(two_state_lock_t *, int);</div><div class='del'>-</div><div class='del'>-static inline void bch2_two_state_lock(two_state_lock_t *lock, int s)</div><div class='del'>-{</div><div class='del'>-	if (!bch2_two_state_trylock(lock, s))</div><div class='del'>-		__bch2_two_state_lock(lock, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_TWO_STATE_LOCK_H */</div><div class='head'>diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c<br/>deleted file mode 100644<br/>index a135136adeee..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/util.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1217 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * random utiility code, for bcache but in theory not specific to bcache</div><div class='del'>- *</div><div class='del'>- * Copyright 2010, 2011 Kent Overstreet &lt;kent.overstreet@gmail.com&gt;</div><div class='del'>- * Copyright 2012 Google, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched/clock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "eytzinger.h"</div><div class='del'>-#include "mean_and_variance.h"</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-static const char si_units[] = "?kMGTPEZY";</div><div class='del'>-</div><div class='del'>-/* string_get_size units: */</div><div class='del'>-static const char *const units_2[] = {</div><div class='del'>-	"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"</div><div class='del'>-};</div><div class='del'>-static const char *const units_10[] = {</div><div class='del'>-	"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int parse_u64(const char *cp, u64 *res)</div><div class='del'>-{</div><div class='del'>-	const char *start = cp;</div><div class='del'>-	u64 v = 0;</div><div class='del'>-</div><div class='del'>-	if (!isdigit(*cp))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (v &gt; U64_MAX / 10)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		v *= 10;</div><div class='del'>-		if (v &gt; U64_MAX - (*cp - '0'))</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		v += *cp - '0';</div><div class='del'>-		cp++;</div><div class='del'>-	} while (isdigit(*cp));</div><div class='del'>-</div><div class='del'>-	*res = v;</div><div class='del'>-	return cp - start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_pow(u64 n, u64 p, u64 *res)</div><div class='del'>-{</div><div class='del'>-	*res = 1;</div><div class='del'>-</div><div class='del'>-	while (p--) {</div><div class='del'>-		if (*res &gt; div_u64(U64_MAX, n))</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		*res *= n;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int parse_unit_suffix(const char *cp, u64 *res)</div><div class='del'>-{</div><div class='del'>-	const char *start = cp;</div><div class='del'>-	u64 base = 1024;</div><div class='del'>-	unsigned u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (*cp == ' ')</div><div class='del'>-		cp++;</div><div class='del'>-</div><div class='del'>-	for (u = 1; u &lt; strlen(si_units); u++)</div><div class='del'>-		if (*cp == si_units[u]) {</div><div class='del'>-			cp++;</div><div class='del'>-			goto got_unit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	for (u = 0; u &lt; ARRAY_SIZE(units_2); u++)</div><div class='del'>-		if (!strncmp(cp, units_2[u], strlen(units_2[u]))) {</div><div class='del'>-			cp += strlen(units_2[u]);</div><div class='del'>-			goto got_unit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	for (u = 0; u &lt; ARRAY_SIZE(units_10); u++)</div><div class='del'>-		if (!strncmp(cp, units_10[u], strlen(units_10[u]))) {</div><div class='del'>-			cp += strlen(units_10[u]);</div><div class='del'>-			base = 1000;</div><div class='del'>-			goto got_unit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	*res = 1;</div><div class='del'>-	return 0;</div><div class='del'>-got_unit:</div><div class='del'>-	ret = bch2_pow(base, u, res);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return cp - start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define parse_or_ret(cp, _f)			\</div><div class='del'>-do {						\</div><div class='del'>-	int _ret = _f;				\</div><div class='del'>-	if (_ret &lt; 0)				\</div><div class='del'>-		return _ret;			\</div><div class='del'>-	cp += _ret;				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-static int __bch2_strtou64_h(const char *cp, u64 *res)</div><div class='del'>-{</div><div class='del'>-	const char *start = cp;</div><div class='del'>-	u64 v = 0, b, f_n = 0, f_d = 1;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	parse_or_ret(cp, parse_u64(cp, &amp;v));</div><div class='del'>-</div><div class='del'>-	if (*cp == '.') {</div><div class='del'>-		cp++;</div><div class='del'>-		ret = parse_u64(cp, &amp;f_n);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		cp += ret;</div><div class='del'>-</div><div class='del'>-		ret = bch2_pow(10, ret, &amp;f_d);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parse_or_ret(cp, parse_unit_suffix(cp, &amp;b));</div><div class='del'>-</div><div class='del'>-	if (v &gt; div_u64(U64_MAX, b))</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	v *= b;</div><div class='del'>-</div><div class='del'>-	if (f_n &gt; div_u64(U64_MAX, b))</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	f_n = div_u64(f_n * b, f_d);</div><div class='del'>-	if (v + f_n &lt; v)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	v += f_n;</div><div class='del'>-</div><div class='del'>-	*res = v;</div><div class='del'>-	return cp - start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_strtoh(const char *cp, u64 *res,</div><div class='del'>-			 u64 t_max, bool t_signed)</div><div class='del'>-{</div><div class='del'>-	bool positive = *cp != '-';</div><div class='del'>-	u64 v = 0;</div><div class='del'>-</div><div class='del'>-	if (*cp == '+' || *cp == '-')</div><div class='del'>-		cp++;</div><div class='del'>-</div><div class='del'>-	parse_or_ret(cp, __bch2_strtou64_h(cp, &amp;v));</div><div class='del'>-</div><div class='del'>-	if (*cp == '\n')</div><div class='del'>-		cp++;</div><div class='del'>-	if (*cp)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (positive) {</div><div class='del'>-		if (v &gt; t_max)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-	} else {</div><div class='del'>-		if (v &amp;&amp; !t_signed)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-</div><div class='del'>-		if (v &gt; t_max + 1)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		v = -v;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*res = v;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define STRTO_H(name, type)					\</div><div class='del'>-int bch2_ ## name ## _h(const char *cp, type *res)		\</div><div class='del'>-{								\</div><div class='del'>-	u64 v = 0;						\</div><div class='del'>-	int ret = __bch2_strtoh(cp, &amp;v, ANYSINT_MAX(type),	\</div><div class='del'>-			ANYSINT_MAX(type) != ((type) ~0ULL));	\</div><div class='del'>-	*res = v;						\</div><div class='del'>-	return ret;						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-STRTO_H(strtoint, int)</div><div class='del'>-STRTO_H(strtouint, unsigned int)</div><div class='del'>-STRTO_H(strtoll, long long)</div><div class='del'>-STRTO_H(strtoull, unsigned long long)</div><div class='del'>-STRTO_H(strtou64, u64)</div><div class='del'>-</div><div class='del'>-u64 bch2_read_flag_list(char *opt, const char * const list[])</div><div class='del'>-{</div><div class='del'>-	u64 ret = 0;</div><div class='del'>-	char *p, *s, *d = kstrdup(opt, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!d)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	s = strim(d);</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;s, ","))) {</div><div class='del'>-		int flag = match_string(list, -1, p);</div><div class='del'>-</div><div class='del'>-		if (flag &lt; 0) {</div><div class='del'>-			ret = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret |= 1 &lt;&lt; flag;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(d);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool bch2_is_zero(const void *_p, size_t n)</div><div class='del'>-{</div><div class='del'>-	const char *p = _p;</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++)</div><div class='del'>-		if (p[i])</div><div class='del'>-			return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_u64_base2_nbits(struct printbuf *out, u64 v, unsigned nr_bits)</div><div class='del'>-{</div><div class='del'>-	while (nr_bits)</div><div class='del'>-		prt_char(out, '0' + ((v &gt;&gt; --nr_bits) &amp; 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_u64_base2(struct printbuf *out, u64 v)</div><div class='del'>-{</div><div class='del'>-	bch2_prt_u64_base2_nbits(out, v, fls64(v) ?: 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_print_string_as_lines(const char *prefix, const char *lines)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	if (!lines) {</div><div class='del'>-		printk("%s (null)\n", prefix);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	console_lock();</div><div class='del'>-	while (1) {</div><div class='del'>-		p = strchrnul(lines, '\n');</div><div class='del'>-		printk("%s%.*s\n", prefix, (int) (p - lines), lines);</div><div class='del'>-		if (!*p)</div><div class='del'>-			break;</div><div class='del'>-		lines = p + 1;</div><div class='del'>-	}</div><div class='del'>-	console_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_save_backtrace(bch_stacktrace *stack, struct task_struct *task, unsigned skipnr)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_STACKTRACE</div><div class='del'>-	unsigned nr_entries = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	stack-&gt;nr = 0;</div><div class='del'>-	ret = darray_make_room(stack, 32);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!down_read_trylock(&amp;task-&gt;signal-&gt;exec_update_lock))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		nr_entries = stack_trace_save_tsk(task, stack-&gt;data, stack-&gt;size, skipnr + 1);</div><div class='del'>-	} while (nr_entries == stack-&gt;size &amp;&amp;</div><div class='del'>-		 !(ret = darray_make_room(stack, stack-&gt;size * 2)));</div><div class='del'>-</div><div class='del'>-	stack-&gt;nr = nr_entries;</div><div class='del'>-	up_read(&amp;task-&gt;signal-&gt;exec_update_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_prt_backtrace(struct printbuf *out, bch_stacktrace *stack)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(*stack, i) {</div><div class='del'>-		prt_printf(out, "[&lt;0&gt;] %pB", (void *) *i);</div><div class='del'>-		prt_newline(out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_prt_task_backtrace(struct printbuf *out, struct task_struct *task, unsigned skipnr)</div><div class='del'>-{</div><div class='del'>-	bch_stacktrace stack = { 0 };</div><div class='del'>-	int ret = bch2_save_backtrace(&amp;stack, task, skipnr + 1);</div><div class='del'>-</div><div class='del'>-	bch2_prt_backtrace(out, &amp;stack);</div><div class='del'>-	darray_exit(&amp;stack);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-void bch2_prt_datetime(struct printbuf *out, time64_t sec)</div><div class='del'>-{</div><div class='del'>-	time_t t = sec;</div><div class='del'>-	char buf[64];</div><div class='del'>-	ctime_r(&amp;t, buf);</div><div class='del'>-	strim(buf);</div><div class='del'>-	prt_str(out, buf);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-void bch2_prt_datetime(struct printbuf *out, time64_t sec)</div><div class='del'>-{</div><div class='del'>-	char buf[64];</div><div class='del'>-	snprintf(buf, sizeof(buf), "%ptT", &amp;sec);</div><div class='del'>-	prt_u64(out, sec);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct time_unit {</div><div class='del'>-	const char	*name;</div><div class='del'>-	u64		nsecs;</div><div class='del'>-} time_units[] = {</div><div class='del'>-	{ "ns",		1		 },</div><div class='del'>-	{ "us",		NSEC_PER_USEC	 },</div><div class='del'>-	{ "ms",		NSEC_PER_MSEC	 },</div><div class='del'>-	{ "s",		NSEC_PER_SEC	 },</div><div class='del'>-	{ "m",          (u64) NSEC_PER_SEC * 60},</div><div class='del'>-	{ "h",          (u64) NSEC_PER_SEC * 3600},</div><div class='del'>-	{ "eon",        U64_MAX          },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct time_unit *pick_time_units(u64 ns)</div><div class='del'>-{</div><div class='del'>-	const struct time_unit *u;</div><div class='del'>-</div><div class='del'>-	for (u = time_units;</div><div class='del'>-	     u + 1 &lt; time_units + ARRAY_SIZE(time_units) &amp;&amp;</div><div class='del'>-	     ns &gt;= u[1].nsecs &lt;&lt; 1;</div><div class='del'>-	     u++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	return u;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_pr_time_units(struct printbuf *out, u64 ns)</div><div class='del'>-{</div><div class='del'>-	const struct time_unit *u = pick_time_units(ns);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%llu %s", div_u64(ns, u-&gt;nsecs), u-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* time stats: */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-static void bch2_quantiles_update(struct bch2_quantiles *q, u64 v)</div><div class='del'>-{</div><div class='del'>-	unsigned i = 0;</div><div class='del'>-</div><div class='del'>-	while (i &lt; ARRAY_SIZE(q-&gt;entries)) {</div><div class='del'>-		struct bch2_quantile_entry *e = q-&gt;entries + i;</div><div class='del'>-</div><div class='del'>-		if (unlikely(!e-&gt;step)) {</div><div class='del'>-			e-&gt;m = v;</div><div class='del'>-			e-&gt;step = max_t(unsigned, v / 2, 1024);</div><div class='del'>-		} else if (e-&gt;m &gt; v) {</div><div class='del'>-			e-&gt;m = e-&gt;m &gt;= e-&gt;step</div><div class='del'>-				? e-&gt;m - e-&gt;step</div><div class='del'>-				: 0;</div><div class='del'>-		} else if (e-&gt;m &lt; v) {</div><div class='del'>-			e-&gt;m = e-&gt;m + e-&gt;step &gt; e-&gt;m</div><div class='del'>-				? e-&gt;m + e-&gt;step</div><div class='del'>-				: U32_MAX;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((e-&gt;m &gt; v ? e-&gt;m - v : v - e-&gt;m) &lt; e-&gt;step)</div><div class='del'>-			e-&gt;step = max_t(unsigned, e-&gt;step / 2, 1);</div><div class='del'>-</div><div class='del'>-		if (v &gt;= e-&gt;m)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		i = eytzinger0_child(i, v &gt; e-&gt;m);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bch2_time_stats_update_one(struct bch2_time_stats *stats,</div><div class='del'>-					      u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	u64 duration, freq;</div><div class='del'>-</div><div class='del'>-	if (time_after64(end, start)) {</div><div class='del'>-		duration = end - start;</div><div class='del'>-		mean_and_variance_update(&amp;stats-&gt;duration_stats, duration);</div><div class='del'>-		mean_and_variance_weighted_update(&amp;stats-&gt;duration_stats_weighted, duration);</div><div class='del'>-		stats-&gt;max_duration = max(stats-&gt;max_duration, duration);</div><div class='del'>-		stats-&gt;min_duration = min(stats-&gt;min_duration, duration);</div><div class='del'>-		stats-&gt;total_duration += duration;</div><div class='del'>-		bch2_quantiles_update(&amp;stats-&gt;quantiles, duration);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (time_after64(end, stats-&gt;last_event)) {</div><div class='del'>-		freq = end - stats-&gt;last_event;</div><div class='del'>-		mean_and_variance_update(&amp;stats-&gt;freq_stats, freq);</div><div class='del'>-		mean_and_variance_weighted_update(&amp;stats-&gt;freq_stats_weighted, freq);</div><div class='del'>-		stats-&gt;max_freq = max(stats-&gt;max_freq, freq);</div><div class='del'>-		stats-&gt;min_freq = min(stats-&gt;min_freq, freq);</div><div class='del'>-		stats-&gt;last_event = end;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bch2_time_stats_clear_buffer(struct bch2_time_stats *stats,</div><div class='del'>-					   struct bch2_time_stat_buffer *b)</div><div class='del'>-{</div><div class='del'>-	for (struct bch2_time_stat_buffer_entry *i = b-&gt;entries;</div><div class='del'>-	     i &lt; b-&gt;entries + ARRAY_SIZE(b-&gt;entries);</div><div class='del'>-	     i++)</div><div class='del'>-		bch2_time_stats_update_one(stats, i-&gt;start, i-&gt;end);</div><div class='del'>-	b-&gt;nr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static noinline void bch2_time_stats_clear_buffer(struct bch2_time_stats *stats,</div><div class='del'>-						  struct bch2_time_stat_buffer *b)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;stats-&gt;lock, flags);</div><div class='del'>-	__bch2_time_stats_clear_buffer(stats, b);</div><div class='del'>-	spin_unlock_irqrestore(&amp;stats-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __bch2_time_stats_update(struct bch2_time_stats *stats, u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	WARN_ONCE(!stats-&gt;duration_stats_weighted.weight ||</div><div class='del'>-		  !stats-&gt;freq_stats_weighted.weight,</div><div class='del'>-		  "uninitialized time_stats");</div><div class='del'>-</div><div class='del'>-	if (!stats-&gt;buffer) {</div><div class='del'>-		spin_lock_irqsave(&amp;stats-&gt;lock, flags);</div><div class='del'>-		bch2_time_stats_update_one(stats, start, end);</div><div class='del'>-</div><div class='del'>-		if (mean_and_variance_weighted_get_mean(stats-&gt;freq_stats_weighted) &lt; 32 &amp;&amp;</div><div class='del'>-		    stats-&gt;duration_stats.n &gt; 1024)</div><div class='del'>-			stats-&gt;buffer =</div><div class='del'>-				alloc_percpu_gfp(struct bch2_time_stat_buffer,</div><div class='del'>-						 GFP_ATOMIC);</div><div class='del'>-		spin_unlock_irqrestore(&amp;stats-&gt;lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		struct bch2_time_stat_buffer *b;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		b = this_cpu_ptr(stats-&gt;buffer);</div><div class='del'>-</div><div class='del'>-		BUG_ON(b-&gt;nr &gt;= ARRAY_SIZE(b-&gt;entries));</div><div class='del'>-		b-&gt;entries[b-&gt;nr++] = (struct bch2_time_stat_buffer_entry) {</div><div class='del'>-			.start = start,</div><div class='del'>-			.end = end</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		if (unlikely(b-&gt;nr == ARRAY_SIZE(b-&gt;entries)))</div><div class='del'>-			bch2_time_stats_clear_buffer(stats, b);</div><div class='del'>-		preempt_enable();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bch2_pr_time_units_aligned(struct printbuf *out, u64 ns)</div><div class='del'>-{</div><div class='del'>-	const struct time_unit *u = pick_time_units(ns);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%llu ", div64_u64(ns, u-&gt;nsecs));</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_printf(out, "%s", u-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void pr_name_and_units(struct printbuf *out, const char *name, u64 ns)</div><div class='del'>-{</div><div class='del'>-	prt_str(out, name);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, ns);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define TABSTOP_SIZE 12</div><div class='del'>-</div><div class='del'>-void bch2_time_stats_to_text(struct printbuf *out, struct bch2_time_stats *stats)</div><div class='del'>-{</div><div class='del'>-	const struct time_unit *u;</div><div class='del'>-	s64 f_mean = 0, d_mean = 0;</div><div class='del'>-	u64 q, last_q = 0, f_stddev = 0, d_stddev = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (stats-&gt;buffer) {</div><div class='del'>-		int cpu;</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;stats-&gt;lock);</div><div class='del'>-		for_each_possible_cpu(cpu)</div><div class='del'>-			__bch2_time_stats_clear_buffer(stats, per_cpu_ptr(stats-&gt;buffer, cpu));</div><div class='del'>-		spin_unlock_irq(&amp;stats-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * avoid divide by zero</div><div class='del'>-	 */</div><div class='del'>-	if (stats-&gt;freq_stats.n) {</div><div class='del'>-		f_mean = mean_and_variance_get_mean(stats-&gt;freq_stats);</div><div class='del'>-		f_stddev = mean_and_variance_get_stddev(stats-&gt;freq_stats);</div><div class='del'>-		d_mean = mean_and_variance_get_mean(stats-&gt;duration_stats);</div><div class='del'>-		d_stddev = mean_and_variance_get_stddev(stats-&gt;duration_stats);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_tabstop_push(out, out-&gt;indent + TABSTOP_SIZE);</div><div class='del'>-	prt_printf(out, "count:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llu ",</div><div class='del'>-			 stats-&gt;duration_stats.n);</div><div class='del'>-	printbuf_tabstop_pop(out);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_tabstops_reset(out);</div><div class='del'>-</div><div class='del'>-	printbuf_tabstop_push(out, out-&gt;indent + 20);</div><div class='del'>-	printbuf_tabstop_push(out, TABSTOP_SIZE + 2);</div><div class='del'>-	printbuf_tabstop_push(out, 0);</div><div class='del'>-	printbuf_tabstop_push(out, TABSTOP_SIZE + 2);</div><div class='del'>-</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "since mount");</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "recent");</div><div class='del'>-	prt_tab_rjust(out);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_tabstops_reset(out);</div><div class='del'>-	printbuf_tabstop_push(out, out-&gt;indent + 20);</div><div class='del'>-	printbuf_tabstop_push(out, TABSTOP_SIZE);</div><div class='del'>-	printbuf_tabstop_push(out, 2);</div><div class='del'>-	printbuf_tabstop_push(out, TABSTOP_SIZE);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "duration of events");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	pr_name_and_units(out, "min:", stats-&gt;min_duration);</div><div class='del'>-	pr_name_and_units(out, "max:", stats-&gt;max_duration);</div><div class='del'>-	pr_name_and_units(out, "total:", stats-&gt;total_duration);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "mean:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, d_mean);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, mean_and_variance_weighted_get_mean(stats-&gt;duration_stats_weighted));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "stddev:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, d_stddev);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, mean_and_variance_weighted_get_stddev(stats-&gt;duration_stats_weighted));</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "time between events");</div><div class='del'>-	prt_newline(out);</div><div class='del'>-	printbuf_indent_add(out, 2);</div><div class='del'>-</div><div class='del'>-	pr_name_and_units(out, "min:", stats-&gt;min_freq);</div><div class='del'>-	pr_name_and_units(out, "max:", stats-&gt;max_freq);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "mean:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, f_mean);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, mean_and_variance_weighted_get_mean(stats-&gt;freq_stats_weighted));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "stddev:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, f_stddev);</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	bch2_pr_time_units_aligned(out, mean_and_variance_weighted_get_stddev(stats-&gt;freq_stats_weighted));</div><div class='del'>-</div><div class='del'>-	printbuf_indent_sub(out, 2);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	printbuf_tabstops_reset(out);</div><div class='del'>-</div><div class='del'>-	i = eytzinger0_first(NR_QUANTILES);</div><div class='del'>-	u = pick_time_units(stats-&gt;quantiles.entries[i].m);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "quantiles (%s):\t", u-&gt;name);</div><div class='del'>-	eytzinger0_for_each(i, NR_QUANTILES) {</div><div class='del'>-		bool is_last = eytzinger0_next(i, NR_QUANTILES) == -1;</div><div class='del'>-</div><div class='del'>-		q = max(stats-&gt;quantiles.entries[i].m, last_q);</div><div class='del'>-		prt_printf(out, "%llu ",</div><div class='del'>-		       div_u64(q, u-&gt;nsecs));</div><div class='del'>-		if (is_last)</div><div class='del'>-			prt_newline(out);</div><div class='del'>-		last_q = q;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-void bch2_time_stats_to_text(struct printbuf *out, struct bch2_time_stats *stats) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_time_stats_exit(struct bch2_time_stats *stats)</div><div class='del'>-{</div><div class='del'>-	free_percpu(stats-&gt;buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_time_stats_init(struct bch2_time_stats *stats)</div><div class='del'>-{</div><div class='del'>-	memset(stats, 0, sizeof(*stats));</div><div class='del'>-	stats-&gt;duration_stats_weighted.weight = 8;</div><div class='del'>-	stats-&gt;freq_stats_weighted.weight = 8;</div><div class='del'>-	stats-&gt;min_duration = U64_MAX;</div><div class='del'>-	stats-&gt;min_freq = U64_MAX;</div><div class='del'>-	spin_lock_init(&amp;stats-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ratelimit: */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_ratelimit_delay() - return how long to delay until the next time to do</div><div class='del'>- *		some work</div><div class='del'>- * @d:		the struct bch_ratelimit to update</div><div class='del'>- * Returns:	the amount of time to delay by, in jiffies</div><div class='del'>- */</div><div class='del'>-u64 bch2_ratelimit_delay(struct bch_ratelimit *d)</div><div class='del'>-{</div><div class='del'>-	u64 now = local_clock();</div><div class='del'>-</div><div class='del'>-	return time_after64(d-&gt;next, now)</div><div class='del'>-		? nsecs_to_jiffies(d-&gt;next - now)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_ratelimit_increment() - increment @d by the amount of work done</div><div class='del'>- * @d:		the struct bch_ratelimit to update</div><div class='del'>- * @done:	the amount of work done, in arbitrary units</div><div class='del'>- */</div><div class='del'>-void bch2_ratelimit_increment(struct bch_ratelimit *d, u64 done)</div><div class='del'>-{</div><div class='del'>-	u64 now = local_clock();</div><div class='del'>-</div><div class='del'>-	d-&gt;next += div_u64(done * NSEC_PER_SEC, d-&gt;rate);</div><div class='del'>-</div><div class='del'>-	if (time_before64(now + NSEC_PER_SEC, d-&gt;next))</div><div class='del'>-		d-&gt;next = now + NSEC_PER_SEC;</div><div class='del'>-</div><div class='del'>-	if (time_after64(now - NSEC_PER_SEC * 2, d-&gt;next))</div><div class='del'>-		d-&gt;next = now - NSEC_PER_SEC * 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pd controller: */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Updates pd_controller. Attempts to scale inputed values to units per second.</div><div class='del'>- * @target: desired value</div><div class='del'>- * @actual: current value</div><div class='del'>- *</div><div class='del'>- * @sign: 1 or -1; 1 if increasing the rate makes actual go up, -1 if increasing</div><div class='del'>- * it makes actual go down.</div><div class='del'>- */</div><div class='del'>-void bch2_pd_controller_update(struct bch_pd_controller *pd,</div><div class='del'>-			      s64 target, s64 actual, int sign)</div><div class='del'>-{</div><div class='del'>-	s64 proportional, derivative, change;</div><div class='del'>-</div><div class='del'>-	unsigned long seconds_since_update = (jiffies - pd-&gt;last_update) / HZ;</div><div class='del'>-</div><div class='del'>-	if (seconds_since_update == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pd-&gt;last_update = jiffies;</div><div class='del'>-</div><div class='del'>-	proportional = actual - target;</div><div class='del'>-	proportional *= seconds_since_update;</div><div class='del'>-	proportional = div_s64(proportional, pd-&gt;p_term_inverse);</div><div class='del'>-</div><div class='del'>-	derivative = actual - pd-&gt;last_actual;</div><div class='del'>-	derivative = div_s64(derivative, seconds_since_update);</div><div class='del'>-	derivative = ewma_add(pd-&gt;smoothed_derivative, derivative,</div><div class='del'>-			      (pd-&gt;d_term / seconds_since_update) ?: 1);</div><div class='del'>-	derivative = derivative * pd-&gt;d_term;</div><div class='del'>-	derivative = div_s64(derivative, pd-&gt;p_term_inverse);</div><div class='del'>-</div><div class='del'>-	change = proportional + derivative;</div><div class='del'>-</div><div class='del'>-	/* Don't increase rate if not keeping up */</div><div class='del'>-	if (change &gt; 0 &amp;&amp;</div><div class='del'>-	    pd-&gt;backpressure &amp;&amp;</div><div class='del'>-	    time_after64(local_clock(),</div><div class='del'>-			 pd-&gt;rate.next + NSEC_PER_MSEC))</div><div class='del'>-		change = 0;</div><div class='del'>-</div><div class='del'>-	change *= (sign * -1);</div><div class='del'>-</div><div class='del'>-	pd-&gt;rate.rate = clamp_t(s64, (s64) pd-&gt;rate.rate + change,</div><div class='del'>-				1, UINT_MAX);</div><div class='del'>-</div><div class='del'>-	pd-&gt;last_actual		= actual;</div><div class='del'>-	pd-&gt;last_derivative	= derivative;</div><div class='del'>-	pd-&gt;last_proportional	= proportional;</div><div class='del'>-	pd-&gt;last_change		= change;</div><div class='del'>-	pd-&gt;last_target		= target;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_pd_controller_init(struct bch_pd_controller *pd)</div><div class='del'>-{</div><div class='del'>-	pd-&gt;rate.rate		= 1024;</div><div class='del'>-	pd-&gt;last_update		= jiffies;</div><div class='del'>-	pd-&gt;p_term_inverse	= 6000;</div><div class='del'>-	pd-&gt;d_term		= 30;</div><div class='del'>-	pd-&gt;d_smooth		= pd-&gt;d_term;</div><div class='del'>-	pd-&gt;backpressure	= 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_pd_controller_debug_to_text(struct printbuf *out, struct bch_pd_controller *pd)</div><div class='del'>-{</div><div class='del'>-	if (!out-&gt;nr_tabstops)</div><div class='del'>-		printbuf_tabstop_push(out, 20);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "rate:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_s64(out, pd-&gt;rate.rate);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "target:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_u64(out, pd-&gt;last_target);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "actual:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_u64(out, pd-&gt;last_actual);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "proportional:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_s64(out, pd-&gt;last_proportional);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "derivative:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_s64(out, pd-&gt;last_derivative);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "change:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_human_readable_s64(out, pd-&gt;last_change);</div><div class='del'>-	prt_newline(out);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "next io:");</div><div class='del'>-	prt_tab(out);</div><div class='del'>-	prt_printf(out, "%llims", div64_s64(pd-&gt;rate.next - local_clock(), NSEC_PER_MSEC));</div><div class='del'>-	prt_newline(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* misc: */</div><div class='del'>-</div><div class='del'>-void bch2_bio_map(struct bio *bio, void *base, size_t size)</div><div class='del'>-{</div><div class='del'>-	while (size) {</div><div class='del'>-		struct page *page = is_vmalloc_addr(base)</div><div class='del'>-				? vmalloc_to_page(base)</div><div class='del'>-				: virt_to_page(base);</div><div class='del'>-		unsigned offset = offset_in_page(base);</div><div class='del'>-		unsigned len = min_t(size_t, PAGE_SIZE - offset, size);</div><div class='del'>-</div><div class='del'>-		BUG_ON(!bio_add_page(bio, page, len, offset));</div><div class='del'>-		size -= len;</div><div class='del'>-		base += len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_bio_alloc_pages(struct bio *bio, size_t size, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	while (size) {</div><div class='del'>-		struct page *page = alloc_pages(gfp_mask, 0);</div><div class='del'>-		unsigned len = min_t(size_t, PAGE_SIZE, size);</div><div class='del'>-</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		if (unlikely(!bio_add_page(bio, page, len, 0))) {</div><div class='del'>-			__free_page(page);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		size -= len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t bch2_rand_range(size_t max)</div><div class='del'>-{</div><div class='del'>-	size_t rand;</div><div class='del'>-</div><div class='del'>-	if (!max)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		rand = get_random_long();</div><div class='del'>-		rand &amp;= roundup_pow_of_two(max) - 1;</div><div class='del'>-	} while (rand &gt;= max);</div><div class='del'>-</div><div class='del'>-	return rand;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void memcpy_to_bio(struct bio *dst, struct bvec_iter dst_iter, const void *src)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bv;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-</div><div class='del'>-	__bio_for_each_segment(bv, dst, iter, dst_iter) {</div><div class='del'>-		void *dstp = kmap_local_page(bv.bv_page);</div><div class='del'>-</div><div class='del'>-		memcpy(dstp + bv.bv_offset, src, bv.bv_len);</div><div class='del'>-		kunmap_local(dstp);</div><div class='del'>-</div><div class='del'>-		src += bv.bv_len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void memcpy_from_bio(void *dst, struct bio *src, struct bvec_iter src_iter)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bv;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-</div><div class='del'>-	__bio_for_each_segment(bv, src, iter, src_iter) {</div><div class='del'>-		void *srcp = kmap_local_page(bv.bv_page);</div><div class='del'>-</div><div class='del'>-		memcpy(dst, srcp + bv.bv_offset, bv.bv_len);</div><div class='del'>-		kunmap_local(srcp);</div><div class='del'>-</div><div class='del'>-		dst += bv.bv_len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alignment_ok(const void *base, size_t align)</div><div class='del'>-{</div><div class='del'>-	return IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ||</div><div class='del'>-		((unsigned long)base &amp; (align - 1)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void u32_swap(void *a, void *b, size_t size)</div><div class='del'>-{</div><div class='del'>-	u32 t = *(u32 *)a;</div><div class='del'>-	*(u32 *)a = *(u32 *)b;</div><div class='del'>-	*(u32 *)b = t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void u64_swap(void *a, void *b, size_t size)</div><div class='del'>-{</div><div class='del'>-	u64 t = *(u64 *)a;</div><div class='del'>-	*(u64 *)a = *(u64 *)b;</div><div class='del'>-	*(u64 *)b = t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void generic_swap(void *a, void *b, size_t size)</div><div class='del'>-{</div><div class='del'>-	char t;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		t = *(char *)a;</div><div class='del'>-		*(char *)a++ = *(char *)b;</div><div class='del'>-		*(char *)b++ = t;</div><div class='del'>-	} while (--size &gt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int do_cmp(void *base, size_t n, size_t size,</div><div class='del'>-			 int (*cmp_func)(const void *, const void *, size_t),</div><div class='del'>-			 size_t l, size_t r)</div><div class='del'>-{</div><div class='del'>-	return cmp_func(base + inorder_to_eytzinger0(l, n) * size,</div><div class='del'>-			base + inorder_to_eytzinger0(r, n) * size,</div><div class='del'>-			size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void do_swap(void *base, size_t n, size_t size,</div><div class='del'>-			   void (*swap_func)(void *, void *, size_t),</div><div class='del'>-			   size_t l, size_t r)</div><div class='del'>-{</div><div class='del'>-	swap_func(base + inorder_to_eytzinger0(l, n) * size,</div><div class='del'>-		  base + inorder_to_eytzinger0(r, n) * size,</div><div class='del'>-		  size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void eytzinger0_sort(void *base, size_t n, size_t size,</div><div class='del'>-		     int (*cmp_func)(const void *, const void *, size_t),</div><div class='del'>-		     void (*swap_func)(void *, void *, size_t))</div><div class='del'>-{</div><div class='del'>-	int i, c, r;</div><div class='del'>-</div><div class='del'>-	if (!swap_func) {</div><div class='del'>-		if (size == 4 &amp;&amp; alignment_ok(base, 4))</div><div class='del'>-			swap_func = u32_swap;</div><div class='del'>-		else if (size == 8 &amp;&amp; alignment_ok(base, 8))</div><div class='del'>-			swap_func = u64_swap;</div><div class='del'>-		else</div><div class='del'>-			swap_func = generic_swap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* heapify */</div><div class='del'>-	for (i = n / 2 - 1; i &gt;= 0; --i) {</div><div class='del'>-		for (r = i; r * 2 + 1 &lt; n; r = c) {</div><div class='del'>-			c = r * 2 + 1;</div><div class='del'>-</div><div class='del'>-			if (c + 1 &lt; n &amp;&amp;</div><div class='del'>-			    do_cmp(base, n, size, cmp_func, c, c + 1) &lt; 0)</div><div class='del'>-				c++;</div><div class='del'>-</div><div class='del'>-			if (do_cmp(base, n, size, cmp_func, r, c) &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			do_swap(base, n, size, swap_func, r, c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sort */</div><div class='del'>-	for (i = n - 1; i &gt; 0; --i) {</div><div class='del'>-		do_swap(base, n, size, swap_func, 0, i);</div><div class='del'>-</div><div class='del'>-		for (r = 0; r * 2 + 1 &lt; i; r = c) {</div><div class='del'>-			c = r * 2 + 1;</div><div class='del'>-</div><div class='del'>-			if (c + 1 &lt; i &amp;&amp;</div><div class='del'>-			    do_cmp(base, n, size, cmp_func, c, c + 1) &lt; 0)</div><div class='del'>-				c++;</div><div class='del'>-</div><div class='del'>-			if (do_cmp(base, n, size, cmp_func, r, c) &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			do_swap(base, n, size, swap_func, r, c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sort_cmp_size(void *base, size_t num, size_t size,</div><div class='del'>-	  int (*cmp_func)(const void *, const void *, size_t),</div><div class='del'>-	  void (*swap_func)(void *, void *, size_t size))</div><div class='del'>-{</div><div class='del'>-	/* pre-scale counters for performance */</div><div class='del'>-	int i = (num/2 - 1) * size, n = num * size, c, r;</div><div class='del'>-</div><div class='del'>-	if (!swap_func) {</div><div class='del'>-		if (size == 4 &amp;&amp; alignment_ok(base, 4))</div><div class='del'>-			swap_func = u32_swap;</div><div class='del'>-		else if (size == 8 &amp;&amp; alignment_ok(base, 8))</div><div class='del'>-			swap_func = u64_swap;</div><div class='del'>-		else</div><div class='del'>-			swap_func = generic_swap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* heapify */</div><div class='del'>-	for ( ; i &gt;= 0; i -= size) {</div><div class='del'>-		for (r = i; r * 2 + size &lt; n; r  = c) {</div><div class='del'>-			c = r * 2 + size;</div><div class='del'>-			if (c &lt; n - size &amp;&amp;</div><div class='del'>-			    cmp_func(base + c, base + c + size, size) &lt; 0)</div><div class='del'>-				c += size;</div><div class='del'>-			if (cmp_func(base + r, base + c, size) &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-			swap_func(base + r, base + c, size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sort */</div><div class='del'>-	for (i = n - size; i &gt; 0; i -= size) {</div><div class='del'>-		swap_func(base, base + i, size);</div><div class='del'>-		for (r = 0; r * 2 + size &lt; i; r = c) {</div><div class='del'>-			c = r * 2 + size;</div><div class='del'>-			if (c &lt; i - size &amp;&amp;</div><div class='del'>-			    cmp_func(base + c, base + c + size, size) &lt; 0)</div><div class='del'>-				c += size;</div><div class='del'>-			if (cmp_func(base + r, base + c, size) &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-			swap_func(base + r, base + c, size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mempool_free_vp(void *element, void *pool_data)</div><div class='del'>-{</div><div class='del'>-	size_t size = (size_t) pool_data;</div><div class='del'>-</div><div class='del'>-	vpfree(element, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *mempool_alloc_vp(gfp_t gfp_mask, void *pool_data)</div><div class='del'>-{</div><div class='del'>-	size_t size = (size_t) pool_data;</div><div class='del'>-</div><div class='del'>-	return vpmalloc(size, gfp_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mempool_init_kvpmalloc_pool(mempool_t *pool, int min_nr, size_t size)</div><div class='del'>-{</div><div class='del'>-	return size &lt; PAGE_SIZE</div><div class='del'>-		? mempool_init_kmalloc_pool(pool, min_nr, size)</div><div class='del'>-		: mempool_init(pool, min_nr, mempool_alloc_vp,</div><div class='del'>-			       mempool_free_vp, (void *) size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-void eytzinger1_test(void)</div><div class='del'>-{</div><div class='del'>-	unsigned inorder, eytz, size;</div><div class='del'>-</div><div class='del'>-	pr_info("1 based eytzinger test:");</div><div class='del'>-</div><div class='del'>-	for (size = 2;</div><div class='del'>-	     size &lt; 65536;</div><div class='del'>-	     size++) {</div><div class='del'>-		unsigned extra = eytzinger1_extra(size);</div><div class='del'>-</div><div class='del'>-		if (!(size % 4096))</div><div class='del'>-			pr_info("tree size %u", size);</div><div class='del'>-</div><div class='del'>-		BUG_ON(eytzinger1_prev(0, size) != eytzinger1_last(size));</div><div class='del'>-		BUG_ON(eytzinger1_next(0, size) != eytzinger1_first(size));</div><div class='del'>-</div><div class='del'>-		BUG_ON(eytzinger1_prev(eytzinger1_first(size), size)	!= 0);</div><div class='del'>-		BUG_ON(eytzinger1_next(eytzinger1_last(size), size)	!= 0);</div><div class='del'>-</div><div class='del'>-		inorder = 1;</div><div class='del'>-		eytzinger1_for_each(eytz, size) {</div><div class='del'>-			BUG_ON(__inorder_to_eytzinger1(inorder, size, extra) != eytz);</div><div class='del'>-			BUG_ON(__eytzinger1_to_inorder(eytz, size, extra) != inorder);</div><div class='del'>-			BUG_ON(eytz != eytzinger1_last(size) &amp;&amp;</div><div class='del'>-			       eytzinger1_prev(eytzinger1_next(eytz, size), size) != eytz);</div><div class='del'>-</div><div class='del'>-			inorder++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void eytzinger0_test(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	unsigned inorder, eytz, size;</div><div class='del'>-</div><div class='del'>-	pr_info("0 based eytzinger test:");</div><div class='del'>-</div><div class='del'>-	for (size = 1;</div><div class='del'>-	     size &lt; 65536;</div><div class='del'>-	     size++) {</div><div class='del'>-		unsigned extra = eytzinger0_extra(size);</div><div class='del'>-</div><div class='del'>-		if (!(size % 4096))</div><div class='del'>-			pr_info("tree size %u", size);</div><div class='del'>-</div><div class='del'>-		BUG_ON(eytzinger0_prev(-1, size) != eytzinger0_last(size));</div><div class='del'>-		BUG_ON(eytzinger0_next(-1, size) != eytzinger0_first(size));</div><div class='del'>-</div><div class='del'>-		BUG_ON(eytzinger0_prev(eytzinger0_first(size), size)	!= -1);</div><div class='del'>-		BUG_ON(eytzinger0_next(eytzinger0_last(size), size)	!= -1);</div><div class='del'>-</div><div class='del'>-		inorder = 0;</div><div class='del'>-		eytzinger0_for_each(eytz, size) {</div><div class='del'>-			BUG_ON(__inorder_to_eytzinger0(inorder, size, extra) != eytz);</div><div class='del'>-			BUG_ON(__eytzinger0_to_inorder(eytz, size, extra) != inorder);</div><div class='del'>-			BUG_ON(eytz != eytzinger0_last(size) &amp;&amp;</div><div class='del'>-			       eytzinger0_prev(eytzinger0_next(eytz, size), size) != eytz);</div><div class='del'>-</div><div class='del'>-			inorder++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int cmp_u16(const void *_l, const void *_r, size_t size)</div><div class='del'>-{</div><div class='del'>-	const u16 *l = _l, *r = _r;</div><div class='del'>-</div><div class='del'>-	return (*l &gt; *r) - (*r - *l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void eytzinger0_find_test_val(u16 *test_array, unsigned nr, u16 search)</div><div class='del'>-{</div><div class='del'>-	int i, c1 = -1, c2 = -1;</div><div class='del'>-	ssize_t r;</div><div class='del'>-</div><div class='del'>-	r = eytzinger0_find_le(test_array, nr,</div><div class='del'>-			       sizeof(test_array[0]),</div><div class='del'>-			       cmp_u16, &amp;search);</div><div class='del'>-	if (r &gt;= 0)</div><div class='del'>-		c1 = test_array[r];</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		if (test_array[i] &lt;= search &amp;&amp; test_array[i] &gt; c2)</div><div class='del'>-			c2 = test_array[i];</div><div class='del'>-</div><div class='del'>-	if (c1 != c2) {</div><div class='del'>-		eytzinger0_for_each(i, nr)</div><div class='del'>-			pr_info("[%3u] = %12u", i, test_array[i]);</div><div class='del'>-		pr_info("find_le(%2u) -&gt; [%2zi] = %2i should be %2i",</div><div class='del'>-			i, r, c1, c2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void eytzinger0_find_test(void)</div><div class='del'>-{</div><div class='del'>-	unsigned i, nr, allocated = 1 &lt;&lt; 12;</div><div class='del'>-	u16 *test_array = kmalloc_array(allocated, sizeof(test_array[0]), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	for (nr = 1; nr &lt; allocated; nr++) {</div><div class='del'>-		pr_info("testing %u elems", nr);</div><div class='del'>-</div><div class='del'>-		get_random_bytes(test_array, nr * sizeof(test_array[0]));</div><div class='del'>-		eytzinger0_sort(test_array, nr, sizeof(test_array[0]), cmp_u16, NULL);</div><div class='del'>-</div><div class='del'>-		/* verify array is sorted correctly: */</div><div class='del'>-		eytzinger0_for_each(i, nr)</div><div class='del'>-			BUG_ON(i != eytzinger0_last(nr) &amp;&amp;</div><div class='del'>-			       test_array[i] &gt; test_array[eytzinger0_next(i, nr)]);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; U16_MAX; i += 1 &lt;&lt; 12)</div><div class='del'>-			eytzinger0_find_test_val(test_array, nr, i);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nr; i++) {</div><div class='del'>-			eytzinger0_find_test_val(test_array, nr, test_array[i] - 1);</div><div class='del'>-			eytzinger0_find_test_val(test_array, nr, test_array[i]);</div><div class='del'>-			eytzinger0_find_test_val(test_array, nr, test_array[i] + 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(test_array);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Accumulate percpu counters onto one cpu's copy - only valid when access</div><div class='del'>- * against any percpu counter is guarded against</div><div class='del'>- */</div><div class='del'>-u64 *bch2_acc_percpu_u64s(u64 __percpu *p, unsigned nr)</div><div class='del'>-{</div><div class='del'>-	u64 *ret;</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	/* access to pcpu vars has to be blocked by other locking */</div><div class='del'>-	preempt_disable();</div><div class='del'>-	ret = this_cpu_ptr(p);</div><div class='del'>-	preempt_enable();</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		u64 *i = per_cpu_ptr(p, cpu);</div><div class='del'>-</div><div class='del'>-		if (i != ret) {</div><div class='del'>-			acc_u64s(ret, i, nr);</div><div class='del'>-			memset(i, 0, nr * sizeof(u64));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_darray_str_exit(darray_str *d)</div><div class='del'>-{</div><div class='del'>-	darray_for_each(*d, i)</div><div class='del'>-		kfree(*i);</div><div class='del'>-	darray_exit(d);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_split_devs(const char *_dev_name, darray_str *ret)</div><div class='del'>-{</div><div class='del'>-	darray_init(ret);</div><div class='del'>-</div><div class='del'>-	char *dev_name, *s, *orig;</div><div class='del'>-</div><div class='del'>-	dev_name = orig = kstrdup(_dev_name, GFP_KERNEL);</div><div class='del'>-	if (!dev_name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	while ((s = strsep(&amp;dev_name, ":"))) {</div><div class='del'>-		char *p = kstrdup(s, GFP_KERNEL);</div><div class='del'>-		if (!p)</div><div class='del'>-			goto err;</div><div class='del'>-</div><div class='del'>-		if (darray_push(ret, p)) {</div><div class='del'>-			kfree(p);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(orig);</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	bch2_darray_str_exit(ret);</div><div class='del'>-	kfree(orig);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h<br/>deleted file mode 100644<br/>index df67bf55fe2b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/util.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,879 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_UTIL_H</div><div class='del'>-#define _BCACHEFS_UTIL_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/closure.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched/clock.h&gt;</div><div class='del'>-#include &lt;linux/llist.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/ratelimit.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mean_and_variance.h"</div><div class='del'>-</div><div class='del'>-#include "darray.h"</div><div class='del'>-</div><div class='del'>-struct closure;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BCACHEFS_DEBUG</div><div class='del'>-#define EBUG_ON(cond)		BUG_ON(cond)</div><div class='del'>-#else</div><div class='del'>-#define EBUG_ON(cond)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='del'>-#define CPU_BIG_ENDIAN		0</div><div class='del'>-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__</div><div class='del'>-#define CPU_BIG_ENDIAN		1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* type hackery */</div><div class='del'>-</div><div class='del'>-#define type_is_exact(_val, _type)					\</div><div class='del'>-	__builtin_types_compatible_p(typeof(_val), _type)</div><div class='del'>-</div><div class='del'>-#define type_is(_val, _type)						\</div><div class='del'>-	(__builtin_types_compatible_p(typeof(_val), _type) ||		\</div><div class='del'>-	 __builtin_types_compatible_p(typeof(_val), const _type))</div><div class='del'>-</div><div class='del'>-/* Userspace doesn't align allocations as nicely as the kernel allocators: */</div><div class='del'>-static inline size_t buf_pages(void *p, size_t len)</div><div class='del'>-{</div><div class='del'>-	return DIV_ROUND_UP(len +</div><div class='del'>-			    ((unsigned long) p &amp; (PAGE_SIZE - 1)),</div><div class='del'>-			    PAGE_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void vpfree(void *p, size_t size)</div><div class='del'>-{</div><div class='del'>-	if (is_vmalloc_addr(p))</div><div class='del'>-		vfree(p);</div><div class='del'>-	else</div><div class='del'>-		free_pages((unsigned long) p, get_order(size));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *vpmalloc(size_t size, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	return (void *) __get_free_pages(gfp_mask|__GFP_NOWARN,</div><div class='del'>-					 get_order(size)) ?:</div><div class='del'>-		__vmalloc(size, gfp_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void kvpfree(void *p, size_t size)</div><div class='del'>-{</div><div class='del'>-	if (size &lt; PAGE_SIZE)</div><div class='del'>-		kfree(p);</div><div class='del'>-	else</div><div class='del'>-		vpfree(p, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *kvpmalloc(size_t size, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	return size &lt; PAGE_SIZE</div><div class='del'>-		? kmalloc(size, gfp_mask)</div><div class='del'>-		: vpmalloc(size, gfp_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mempool_init_kvpmalloc_pool(mempool_t *, int, size_t);</div><div class='del'>-</div><div class='del'>-#define HEAP(type)							\</div><div class='del'>-struct {								\</div><div class='del'>-	size_t size, used;						\</div><div class='del'>-	type *data;							\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DECLARE_HEAP(type, name) HEAP(type) name</div><div class='del'>-</div><div class='del'>-#define init_heap(heap, _size, gfp)					\</div><div class='del'>-({									\</div><div class='del'>-	(heap)-&gt;used = 0;						\</div><div class='del'>-	(heap)-&gt;size = (_size);						\</div><div class='del'>-	(heap)-&gt;data = kvpmalloc((heap)-&gt;size * sizeof((heap)-&gt;data[0]),\</div><div class='del'>-				 (gfp));				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define free_heap(heap)							\</div><div class='del'>-do {									\</div><div class='del'>-	kvpfree((heap)-&gt;data, (heap)-&gt;size * sizeof((heap)-&gt;data[0]));	\</div><div class='del'>-	(heap)-&gt;data = NULL;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define heap_set_backpointer(h, i, _fn)					\</div><div class='del'>-do {									\</div><div class='del'>-	void (*fn)(typeof(h), size_t) = _fn;				\</div><div class='del'>-	if (fn)								\</div><div class='del'>-		fn(h, i);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define heap_swap(h, i, j, set_backpointer)				\</div><div class='del'>-do {									\</div><div class='del'>-	swap((h)-&gt;data[i], (h)-&gt;data[j]);				\</div><div class='del'>-	heap_set_backpointer(h, i, set_backpointer);			\</div><div class='del'>-	heap_set_backpointer(h, j, set_backpointer);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define heap_peek(h)							\</div><div class='del'>-({									\</div><div class='del'>-	EBUG_ON(!(h)-&gt;used);						\</div><div class='del'>-	(h)-&gt;data[0];							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define heap_full(h)	((h)-&gt;used == (h)-&gt;size)</div><div class='del'>-</div><div class='del'>-#define heap_sift_down(h, i, cmp, set_backpointer)			\</div><div class='del'>-do {									\</div><div class='del'>-	size_t _c, _j = i;						\</div><div class='del'>-									\</div><div class='del'>-	for (; _j * 2 + 1 &lt; (h)-&gt;used; _j = _c) {			\</div><div class='del'>-		_c = _j * 2 + 1;					\</div><div class='del'>-		if (_c + 1 &lt; (h)-&gt;used &amp;&amp;				\</div><div class='del'>-		    cmp(h, (h)-&gt;data[_c], (h)-&gt;data[_c + 1]) &gt;= 0)	\</div><div class='del'>-			_c++;						\</div><div class='del'>-									\</div><div class='del'>-		if (cmp(h, (h)-&gt;data[_c], (h)-&gt;data[_j]) &gt;= 0)		\</div><div class='del'>-			break;						\</div><div class='del'>-		heap_swap(h, _c, _j, set_backpointer);			\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define heap_sift_up(h, i, cmp, set_backpointer)			\</div><div class='del'>-do {									\</div><div class='del'>-	while (i) {							\</div><div class='del'>-		size_t p = (i - 1) / 2;					\</div><div class='del'>-		if (cmp(h, (h)-&gt;data[i], (h)-&gt;data[p]) &gt;= 0)		\</div><div class='del'>-			break;						\</div><div class='del'>-		heap_swap(h, i, p, set_backpointer);			\</div><div class='del'>-		i = p;							\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define __heap_add(h, d, cmp, set_backpointer)				\</div><div class='del'>-({									\</div><div class='del'>-	size_t _i = (h)-&gt;used++;					\</div><div class='del'>-	(h)-&gt;data[_i] = d;						\</div><div class='del'>-	heap_set_backpointer(h, _i, set_backpointer);			\</div><div class='del'>-									\</div><div class='del'>-	heap_sift_up(h, _i, cmp, set_backpointer);			\</div><div class='del'>-	_i;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define heap_add(h, d, cmp, set_backpointer)				\</div><div class='del'>-({									\</div><div class='del'>-	bool _r = !heap_full(h);					\</div><div class='del'>-	if (_r)								\</div><div class='del'>-		__heap_add(h, d, cmp, set_backpointer);			\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define heap_add_or_replace(h, new, cmp, set_backpointer)		\</div><div class='del'>-do {									\</div><div class='del'>-	if (!heap_add(h, new, cmp, set_backpointer) &amp;&amp;			\</div><div class='del'>-	    cmp(h, new, heap_peek(h)) &gt;= 0) {				\</div><div class='del'>-		(h)-&gt;data[0] = new;					\</div><div class='del'>-		heap_set_backpointer(h, 0, set_backpointer);		\</div><div class='del'>-		heap_sift_down(h, 0, cmp, set_backpointer);		\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define heap_del(h, i, cmp, set_backpointer)				\</div><div class='del'>-do {									\</div><div class='del'>-	size_t _i = (i);						\</div><div class='del'>-									\</div><div class='del'>-	BUG_ON(_i &gt;= (h)-&gt;used);					\</div><div class='del'>-	(h)-&gt;used--;							\</div><div class='del'>-	if ((_i) &lt; (h)-&gt;used) {						\</div><div class='del'>-		heap_swap(h, _i, (h)-&gt;used, set_backpointer);		\</div><div class='del'>-		heap_sift_up(h, _i, cmp, set_backpointer);		\</div><div class='del'>-		heap_sift_down(h, _i, cmp, set_backpointer);		\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define heap_pop(h, d, cmp, set_backpointer)				\</div><div class='del'>-({									\</div><div class='del'>-	bool _r = (h)-&gt;used;						\</div><div class='del'>-	if (_r) {							\</div><div class='del'>-		(d) = (h)-&gt;data[0];					\</div><div class='del'>-		heap_del(h, 0, cmp, set_backpointer);			\</div><div class='del'>-	}								\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define heap_resort(heap, cmp, set_backpointer)				\</div><div class='del'>-do {									\</div><div class='del'>-	ssize_t _i;							\</div><div class='del'>-	for (_i = (ssize_t) (heap)-&gt;used / 2 -  1; _i &gt;= 0; --_i)	\</div><div class='del'>-		heap_sift_down(heap, _i, cmp, set_backpointer);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define ANYSINT_MAX(t)							\</div><div class='del'>-	((((t) 1 &lt;&lt; (sizeof(t) * 8 - 2)) - (t) 1) * (t) 2 + (t) 1)</div><div class='del'>-</div><div class='del'>-#include "printbuf.h"</div><div class='del'>-</div><div class='del'>-#define prt_vprintf(_out, ...)		bch2_prt_vprintf(_out, __VA_ARGS__)</div><div class='del'>-#define prt_printf(_out, ...)		bch2_prt_printf(_out, __VA_ARGS__)</div><div class='del'>-#define printbuf_str(_buf)		bch2_printbuf_str(_buf)</div><div class='del'>-#define printbuf_exit(_buf)		bch2_printbuf_exit(_buf)</div><div class='del'>-</div><div class='del'>-#define printbuf_tabstops_reset(_buf)	bch2_printbuf_tabstops_reset(_buf)</div><div class='del'>-#define printbuf_tabstop_pop(_buf)	bch2_printbuf_tabstop_pop(_buf)</div><div class='del'>-#define printbuf_tabstop_push(_buf, _n)	bch2_printbuf_tabstop_push(_buf, _n)</div><div class='del'>-</div><div class='del'>-#define printbuf_indent_add(_out, _n)	bch2_printbuf_indent_add(_out, _n)</div><div class='del'>-#define printbuf_indent_sub(_out, _n)	bch2_printbuf_indent_sub(_out, _n)</div><div class='del'>-</div><div class='del'>-#define prt_newline(_out)		bch2_prt_newline(_out)</div><div class='del'>-#define prt_tab(_out)			bch2_prt_tab(_out)</div><div class='del'>-#define prt_tab_rjust(_out)		bch2_prt_tab_rjust(_out)</div><div class='del'>-</div><div class='del'>-#define prt_bytes_indented(...)		bch2_prt_bytes_indented(__VA_ARGS__)</div><div class='del'>-#define prt_u64(_out, _v)		prt_printf(_out, "%llu", (u64) (_v))</div><div class='del'>-#define prt_human_readable_u64(...)	bch2_prt_human_readable_u64(__VA_ARGS__)</div><div class='del'>-#define prt_human_readable_s64(...)	bch2_prt_human_readable_s64(__VA_ARGS__)</div><div class='del'>-#define prt_units_u64(...)		bch2_prt_units_u64(__VA_ARGS__)</div><div class='del'>-#define prt_units_s64(...)		bch2_prt_units_s64(__VA_ARGS__)</div><div class='del'>-#define prt_string_option(...)		bch2_prt_string_option(__VA_ARGS__)</div><div class='del'>-#define prt_bitflags(...)		bch2_prt_bitflags(__VA_ARGS__)</div><div class='del'>-#define prt_bitflags_vector(...)	bch2_prt_bitflags_vector(__VA_ARGS__)</div><div class='del'>-</div><div class='del'>-void bch2_pr_time_units(struct printbuf *, u64);</div><div class='del'>-void bch2_prt_datetime(struct printbuf *, time64_t);</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-static inline void uuid_unparse_lower(u8 *uuid, char *out)</div><div class='del'>-{</div><div class='del'>-	sprintf(out, "%pUb", uuid);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#include &lt;uuid/uuid.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void pr_uuid(struct printbuf *out, u8 *uuid)</div><div class='del'>-{</div><div class='del'>-	char uuid_str[40];</div><div class='del'>-</div><div class='del'>-	uuid_unparse_lower(uuid, uuid_str);</div><div class='del'>-	prt_printf(out, "%s", uuid_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_strtoint_h(const char *, int *);</div><div class='del'>-int bch2_strtouint_h(const char *, unsigned int *);</div><div class='del'>-int bch2_strtoll_h(const char *, long long *);</div><div class='del'>-int bch2_strtoull_h(const char *, unsigned long long *);</div><div class='del'>-int bch2_strtou64_h(const char *, u64 *);</div><div class='del'>-</div><div class='del'>-static inline int bch2_strtol_h(const char *cp, long *res)</div><div class='del'>-{</div><div class='del'>-#if BITS_PER_LONG == 32</div><div class='del'>-	return bch2_strtoint_h(cp, (int *) res);</div><div class='del'>-#else</div><div class='del'>-	return bch2_strtoll_h(cp, (long long *) res);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bch2_strtoul_h(const char *cp, long *res)</div><div class='del'>-{</div><div class='del'>-#if BITS_PER_LONG == 32</div><div class='del'>-	return bch2_strtouint_h(cp, (unsigned int *) res);</div><div class='del'>-#else</div><div class='del'>-	return bch2_strtoull_h(cp, (unsigned long long *) res);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define strtoi_h(cp, res)						\</div><div class='del'>-	( type_is(*res, int)		? bch2_strtoint_h(cp, (void *) res)\</div><div class='del'>-	: type_is(*res, long)		? bch2_strtol_h(cp, (void *) res)\</div><div class='del'>-	: type_is(*res, long long)	? bch2_strtoll_h(cp, (void *) res)\</div><div class='del'>-	: type_is(*res, unsigned)	? bch2_strtouint_h(cp, (void *) res)\</div><div class='del'>-	: type_is(*res, unsigned long)	? bch2_strtoul_h(cp, (void *) res)\</div><div class='del'>-	: type_is(*res, unsigned long long) ? bch2_strtoull_h(cp, (void *) res)\</div><div class='del'>-	: -EINVAL)</div><div class='del'>-</div><div class='del'>-#define strtoul_safe(cp, var)						\</div><div class='del'>-({									\</div><div class='del'>-	unsigned long _v;						\</div><div class='del'>-	int _r = kstrtoul(cp, 10, &amp;_v);					\</div><div class='del'>-	if (!_r)							\</div><div class='del'>-		var = _v;						\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define strtoul_safe_clamp(cp, var, min, max)				\</div><div class='del'>-({									\</div><div class='del'>-	unsigned long _v;						\</div><div class='del'>-	int _r = kstrtoul(cp, 10, &amp;_v);					\</div><div class='del'>-	if (!_r)							\</div><div class='del'>-		var = clamp_t(typeof(var), _v, min, max);		\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define strtoul_safe_restrict(cp, var, min, max)			\</div><div class='del'>-({									\</div><div class='del'>-	unsigned long _v;						\</div><div class='del'>-	int _r = kstrtoul(cp, 10, &amp;_v);					\</div><div class='del'>-	if (!_r &amp;&amp; _v &gt;= min &amp;&amp; _v &lt;= max)				\</div><div class='del'>-		var = _v;						\</div><div class='del'>-	else								\</div><div class='del'>-		_r = -EINVAL;						\</div><div class='del'>-	_r;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define snprint(out, var)						\</div><div class='del'>-	prt_printf(out,							\</div><div class='del'>-		   type_is(var, int)		? "%i\n"		\</div><div class='del'>-		 : type_is(var, unsigned)	? "%u\n"		\</div><div class='del'>-		 : type_is(var, long)		? "%li\n"		\</div><div class='del'>-		 : type_is(var, unsigned long)	? "%lu\n"		\</div><div class='del'>-		 : type_is(var, s64)		? "%lli\n"		\</div><div class='del'>-		 : type_is(var, u64)		? "%llu\n"		\</div><div class='del'>-		 : type_is(var, char *)		? "%s\n"		\</div><div class='del'>-		 : "%i\n", var)</div><div class='del'>-</div><div class='del'>-bool bch2_is_zero(const void *, size_t);</div><div class='del'>-</div><div class='del'>-u64 bch2_read_flag_list(char *, const char * const[]);</div><div class='del'>-</div><div class='del'>-void bch2_prt_u64_base2_nbits(struct printbuf *, u64, unsigned);</div><div class='del'>-void bch2_prt_u64_base2(struct printbuf *, u64);</div><div class='del'>-</div><div class='del'>-void bch2_print_string_as_lines(const char *prefix, const char *lines);</div><div class='del'>-</div><div class='del'>-typedef DARRAY(unsigned long) bch_stacktrace;</div><div class='del'>-int bch2_save_backtrace(bch_stacktrace *stack, struct task_struct *, unsigned);</div><div class='del'>-void bch2_prt_backtrace(struct printbuf *, bch_stacktrace *);</div><div class='del'>-int bch2_prt_task_backtrace(struct printbuf *, struct task_struct *, unsigned);</div><div class='del'>-</div><div class='del'>-static inline void prt_bdevname(struct printbuf *out, struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-	prt_printf(out, "%pg", bdev);</div><div class='del'>-#else</div><div class='del'>-	prt_str(out, bdev-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define NR_QUANTILES	15</div><div class='del'>-#define QUANTILE_IDX(i)	inorder_to_eytzinger0(i, NR_QUANTILES)</div><div class='del'>-#define QUANTILE_FIRST	eytzinger0_first(NR_QUANTILES)</div><div class='del'>-#define QUANTILE_LAST	eytzinger0_last(NR_QUANTILES)</div><div class='del'>-</div><div class='del'>-struct bch2_quantiles {</div><div class='del'>-	struct bch2_quantile_entry {</div><div class='del'>-		u64	m;</div><div class='del'>-		u64	step;</div><div class='del'>-	}		entries[NR_QUANTILES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch2_time_stat_buffer {</div><div class='del'>-	unsigned	nr;</div><div class='del'>-	struct bch2_time_stat_buffer_entry {</div><div class='del'>-		u64	start;</div><div class='del'>-		u64	end;</div><div class='del'>-	}		entries[32];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bch2_time_stats {</div><div class='del'>-	spinlock_t	lock;</div><div class='del'>-	/* all fields are in nanoseconds */</div><div class='del'>-	u64             min_duration;</div><div class='del'>-	u64		max_duration;</div><div class='del'>-	u64		total_duration;</div><div class='del'>-	u64             max_freq;</div><div class='del'>-	u64             min_freq;</div><div class='del'>-	u64		last_event;</div><div class='del'>-	struct bch2_quantiles quantiles;</div><div class='del'>-</div><div class='del'>-	struct mean_and_variance	  duration_stats;</div><div class='del'>-	struct mean_and_variance_weighted duration_stats_weighted;</div><div class='del'>-	struct mean_and_variance	  freq_stats;</div><div class='del'>-	struct mean_and_variance_weighted freq_stats_weighted;</div><div class='del'>-	struct bch2_time_stat_buffer __percpu *buffer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT</div><div class='del'>-void __bch2_time_stats_update(struct bch2_time_stats *stats, u64, u64);</div><div class='del'>-</div><div class='del'>-static inline void bch2_time_stats_update(struct bch2_time_stats *stats, u64 start)</div><div class='del'>-{</div><div class='del'>-	__bch2_time_stats_update(stats, start, local_clock());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool track_event_change(struct bch2_time_stats *stats,</div><div class='del'>-				      u64 *start, bool v)</div><div class='del'>-{</div><div class='del'>-	if (v != !!*start) {</div><div class='del'>-		if (!v) {</div><div class='del'>-			bch2_time_stats_update(stats, *start);</div><div class='del'>-			*start = 0;</div><div class='del'>-		} else {</div><div class='del'>-			*start = local_clock() ?: 1;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void __bch2_time_stats_update(struct bch2_time_stats *stats, u64 start, u64 end) {}</div><div class='del'>-static inline void bch2_time_stats_update(struct bch2_time_stats *stats, u64 start) {}</div><div class='del'>-static inline bool track_event_change(struct bch2_time_stats *stats,</div><div class='del'>-				      u64 *start, bool v)</div><div class='del'>-{</div><div class='del'>-	bool ret = v &amp;&amp; !*start;</div><div class='del'>-	*start = v;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void bch2_time_stats_to_text(struct printbuf *, struct bch2_time_stats *);</div><div class='del'>-</div><div class='del'>-void bch2_time_stats_exit(struct bch2_time_stats *);</div><div class='del'>-void bch2_time_stats_init(struct bch2_time_stats *);</div><div class='del'>-</div><div class='del'>-#define ewma_add(ewma, val, weight)					\</div><div class='del'>-({									\</div><div class='del'>-	typeof(ewma) _ewma = (ewma);					\</div><div class='del'>-	typeof(weight) _weight = (weight);				\</div><div class='del'>-									\</div><div class='del'>-	(((_ewma &lt;&lt; _weight) - _ewma) + (val)) &gt;&gt; _weight;		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-struct bch_ratelimit {</div><div class='del'>-	/* Next time we want to do some work, in nanoseconds */</div><div class='del'>-	u64			next;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Rate at which we want to do work, in units per nanosecond</div><div class='del'>-	 * The units here correspond to the units passed to</div><div class='del'>-	 * bch2_ratelimit_increment()</div><div class='del'>-	 */</div><div class='del'>-	unsigned		rate;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void bch2_ratelimit_reset(struct bch_ratelimit *d)</div><div class='del'>-{</div><div class='del'>-	d-&gt;next = local_clock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 bch2_ratelimit_delay(struct bch_ratelimit *);</div><div class='del'>-void bch2_ratelimit_increment(struct bch_ratelimit *, u64);</div><div class='del'>-</div><div class='del'>-struct bch_pd_controller {</div><div class='del'>-	struct bch_ratelimit	rate;</div><div class='del'>-	unsigned long		last_update;</div><div class='del'>-</div><div class='del'>-	s64			last_actual;</div><div class='del'>-	s64			smoothed_derivative;</div><div class='del'>-</div><div class='del'>-	unsigned		p_term_inverse;</div><div class='del'>-	unsigned		d_smooth;</div><div class='del'>-	unsigned		d_term;</div><div class='del'>-</div><div class='del'>-	/* for exporting to sysfs (no effect on behavior) */</div><div class='del'>-	s64			last_derivative;</div><div class='del'>-	s64			last_proportional;</div><div class='del'>-	s64			last_change;</div><div class='del'>-	s64			last_target;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If true, the rate will not increase if bch2_ratelimit_delay()</div><div class='del'>-	 * is not being called often enough.</div><div class='del'>-	 */</div><div class='del'>-	bool			backpressure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bch2_pd_controller_update(struct bch_pd_controller *, s64, s64, int);</div><div class='del'>-void bch2_pd_controller_init(struct bch_pd_controller *);</div><div class='del'>-void bch2_pd_controller_debug_to_text(struct printbuf *, struct bch_pd_controller *);</div><div class='del'>-</div><div class='del'>-#define sysfs_pd_controller_attribute(name)				\</div><div class='del'>-	rw_attribute(name##_rate);					\</div><div class='del'>-	rw_attribute(name##_rate_bytes);				\</div><div class='del'>-	rw_attribute(name##_rate_d_term);				\</div><div class='del'>-	rw_attribute(name##_rate_p_term_inverse);			\</div><div class='del'>-	read_attribute(name##_rate_debug)</div><div class='del'>-</div><div class='del'>-#define sysfs_pd_controller_files(name)					\</div><div class='del'>-	&amp;sysfs_##name##_rate,						\</div><div class='del'>-	&amp;sysfs_##name##_rate_bytes,					\</div><div class='del'>-	&amp;sysfs_##name##_rate_d_term,					\</div><div class='del'>-	&amp;sysfs_##name##_rate_p_term_inverse,				\</div><div class='del'>-	&amp;sysfs_##name##_rate_debug</div><div class='del'>-</div><div class='del'>-#define sysfs_pd_controller_show(name, var)				\</div><div class='del'>-do {									\</div><div class='del'>-	sysfs_hprint(name##_rate,		(var)-&gt;rate.rate);	\</div><div class='del'>-	sysfs_print(name##_rate_bytes,		(var)-&gt;rate.rate);	\</div><div class='del'>-	sysfs_print(name##_rate_d_term,		(var)-&gt;d_term);		\</div><div class='del'>-	sysfs_print(name##_rate_p_term_inverse,	(var)-&gt;p_term_inverse);	\</div><div class='del'>-									\</div><div class='del'>-	if (attr == &amp;sysfs_##name##_rate_debug)				\</div><div class='del'>-		bch2_pd_controller_debug_to_text(out, var);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define sysfs_pd_controller_store(name, var)				\</div><div class='del'>-do {									\</div><div class='del'>-	sysfs_strtoul_clamp(name##_rate,				\</div><div class='del'>-			    (var)-&gt;rate.rate, 1, UINT_MAX);		\</div><div class='del'>-	sysfs_strtoul_clamp(name##_rate_bytes,				\</div><div class='del'>-			    (var)-&gt;rate.rate, 1, UINT_MAX);		\</div><div class='del'>-	sysfs_strtoul(name##_rate_d_term,	(var)-&gt;d_term);		\</div><div class='del'>-	sysfs_strtoul_clamp(name##_rate_p_term_inverse,			\</div><div class='del'>-			    (var)-&gt;p_term_inverse, 1, INT_MAX);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define container_of_or_null(ptr, type, member)				\</div><div class='del'>-({									\</div><div class='del'>-	typeof(ptr) _ptr = ptr;						\</div><div class='del'>-	_ptr ? container_of(_ptr, type, member) : NULL;			\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/* Does linear interpolation between powers of two */</div><div class='del'>-static inline unsigned fract_exp_two(unsigned x, unsigned fract_bits)</div><div class='del'>-{</div><div class='del'>-	unsigned fract = x &amp; ~(~0 &lt;&lt; fract_bits);</div><div class='del'>-</div><div class='del'>-	x &gt;&gt;= fract_bits;</div><div class='del'>-	x   = 1 &lt;&lt; x;</div><div class='del'>-	x  += (x * fract) &gt;&gt; fract_bits;</div><div class='del'>-</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_bio_map(struct bio *bio, void *base, size_t);</div><div class='del'>-int bch2_bio_alloc_pages(struct bio *, size_t, gfp_t);</div><div class='del'>-</div><div class='del'>-static inline sector_t bdev_sectors(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	return bdev-&gt;bd_inode-&gt;i_size &gt;&gt; 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define closure_bio_submit(bio, cl)					\</div><div class='del'>-do {									\</div><div class='del'>-	closure_get(cl);						\</div><div class='del'>-	submit_bio(bio);						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define kthread_wait(cond)						\</div><div class='del'>-({									\</div><div class='del'>-	int _ret = 0;							\</div><div class='del'>-									\</div><div class='del'>-	while (1) {							\</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);			\</div><div class='del'>-		if (kthread_should_stop()) {				\</div><div class='del'>-			_ret = -1;					\</div><div class='del'>-			break;						\</div><div class='del'>-		}							\</div><div class='del'>-									\</div><div class='del'>-		if (cond)						\</div><div class='del'>-			break;						\</div><div class='del'>-									\</div><div class='del'>-		schedule();						\</div><div class='del'>-	}								\</div><div class='del'>-	set_current_state(TASK_RUNNING);				\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define kthread_wait_freezable(cond)					\</div><div class='del'>-({									\</div><div class='del'>-	int _ret = 0;							\</div><div class='del'>-	while (1) {							\</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);			\</div><div class='del'>-		if (kthread_should_stop()) {				\</div><div class='del'>-			_ret = -1;					\</div><div class='del'>-			break;						\</div><div class='del'>-		}							\</div><div class='del'>-									\</div><div class='del'>-		if (cond)						\</div><div class='del'>-			break;						\</div><div class='del'>-									\</div><div class='del'>-		schedule();						\</div><div class='del'>-		try_to_freeze();					\</div><div class='del'>-	}								\</div><div class='del'>-	set_current_state(TASK_RUNNING);				\</div><div class='del'>-	_ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-size_t bch2_rand_range(size_t);</div><div class='del'>-</div><div class='del'>-void memcpy_to_bio(struct bio *, struct bvec_iter, const void *);</div><div class='del'>-void memcpy_from_bio(void *, struct bio *, struct bvec_iter);</div><div class='del'>-</div><div class='del'>-static inline void memcpy_u64s_small(void *dst, const void *src,</div><div class='del'>-				     unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	u64 *d = dst;</div><div class='del'>-	const u64 *s = src;</div><div class='del'>-</div><div class='del'>-	while (u64s--)</div><div class='del'>-		*d++ = *s++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __memcpy_u64s(void *dst, const void *src,</div><div class='del'>-				 unsigned u64s)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	long d0, d1, d2;</div><div class='del'>-</div><div class='del'>-	asm volatile("rep ; movsq"</div><div class='del'>-		     : "=&amp;c" (d0), "=&amp;D" (d1), "=&amp;S" (d2)</div><div class='del'>-		     : "0" (u64s), "1" (dst), "2" (src)</div><div class='del'>-		     : "memory");</div><div class='del'>-#else</div><div class='del'>-	u64 *d = dst;</div><div class='del'>-	const u64 *s = src;</div><div class='del'>-</div><div class='del'>-	while (u64s--)</div><div class='del'>-		*d++ = *s++;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void memcpy_u64s(void *dst, const void *src,</div><div class='del'>-			       unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(!(dst &gt;= src + u64s * sizeof(u64) ||</div><div class='del'>-		 dst + u64s * sizeof(u64) &lt;= src));</div><div class='del'>-</div><div class='del'>-	__memcpy_u64s(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __memmove_u64s_down(void *dst, const void *src,</div><div class='del'>-				       unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	__memcpy_u64s(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void memmove_u64s_down(void *dst, const void *src,</div><div class='del'>-				     unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(dst &gt; src);</div><div class='del'>-</div><div class='del'>-	__memmove_u64s_down(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __memmove_u64s_down_small(void *dst, const void *src,</div><div class='del'>-				       unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	memcpy_u64s_small(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void memmove_u64s_down_small(void *dst, const void *src,</div><div class='del'>-				     unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(dst &gt; src);</div><div class='del'>-</div><div class='del'>-	__memmove_u64s_down_small(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __memmove_u64s_up_small(void *_dst, const void *_src,</div><div class='del'>-					   unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	u64 *dst = (u64 *) _dst + u64s;</div><div class='del'>-	u64 *src = (u64 *) _src + u64s;</div><div class='del'>-</div><div class='del'>-	while (u64s--)</div><div class='del'>-		*--dst = *--src;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void memmove_u64s_up_small(void *dst, const void *src,</div><div class='del'>-					 unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(dst &lt; src);</div><div class='del'>-</div><div class='del'>-	__memmove_u64s_up_small(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __memmove_u64s_up(void *_dst, const void *_src,</div><div class='del'>-				     unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	u64 *dst = (u64 *) _dst + u64s - 1;</div><div class='del'>-	u64 *src = (u64 *) _src + u64s - 1;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	long d0, d1, d2;</div><div class='del'>-</div><div class='del'>-	asm volatile("std ;\n"</div><div class='del'>-		     "rep ; movsq\n"</div><div class='del'>-		     "cld ;\n"</div><div class='del'>-		     : "=&amp;c" (d0), "=&amp;D" (d1), "=&amp;S" (d2)</div><div class='del'>-		     : "0" (u64s), "1" (dst), "2" (src)</div><div class='del'>-		     : "memory");</div><div class='del'>-#else</div><div class='del'>-	while (u64s--)</div><div class='del'>-		*dst-- = *src--;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void memmove_u64s_up(void *dst, const void *src,</div><div class='del'>-				   unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	EBUG_ON(dst &lt; src);</div><div class='del'>-</div><div class='del'>-	__memmove_u64s_up(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void memmove_u64s(void *dst, const void *src,</div><div class='del'>-				unsigned u64s)</div><div class='del'>-{</div><div class='del'>-	if (dst &lt; src)</div><div class='del'>-		__memmove_u64s_down(dst, src, u64s);</div><div class='del'>-	else</div><div class='del'>-		__memmove_u64s_up(dst, src, u64s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set the last few bytes up to a u64 boundary given an offset into a buffer. */</div><div class='del'>-static inline void memset_u64s_tail(void *s, int c, unsigned bytes)</div><div class='del'>-{</div><div class='del'>-	unsigned rem = round_up(bytes, sizeof(u64)) - bytes;</div><div class='del'>-</div><div class='del'>-	memset(s + bytes, c, rem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sort_cmp_size(void *base, size_t num, size_t size,</div><div class='del'>-	  int (*cmp_func)(const void *, const void *, size_t),</div><div class='del'>-	  void (*swap_func)(void *, void *, size_t));</div><div class='del'>-</div><div class='del'>-/* just the memmove, doesn't update @_nr */</div><div class='del'>-#define __array_insert_item(_array, _nr, _pos)				\</div><div class='del'>-	memmove(&amp;(_array)[(_pos) + 1],					\</div><div class='del'>-		&amp;(_array)[(_pos)],					\</div><div class='del'>-		sizeof((_array)[0]) * ((_nr) - (_pos)))</div><div class='del'>-</div><div class='del'>-#define array_insert_item(_array, _nr, _pos, _new_item)			\</div><div class='del'>-do {									\</div><div class='del'>-	__array_insert_item(_array, _nr, _pos);				\</div><div class='del'>-	(_nr)++;							\</div><div class='del'>-	(_array)[(_pos)] = (_new_item);					\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define array_remove_items(_array, _nr, _pos, _nr_to_remove)		\</div><div class='del'>-do {									\</div><div class='del'>-	(_nr) -= (_nr_to_remove);					\</div><div class='del'>-	memmove(&amp;(_array)[(_pos)],					\</div><div class='del'>-		&amp;(_array)[(_pos) + (_nr_to_remove)],			\</div><div class='del'>-		sizeof((_array)[0]) * ((_nr) - (_pos)));		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define array_remove_item(_array, _nr, _pos)				\</div><div class='del'>-	array_remove_items(_array, _nr, _pos, 1)</div><div class='del'>-</div><div class='del'>-static inline void __move_gap(void *array, size_t element_size,</div><div class='del'>-			      size_t nr, size_t size,</div><div class='del'>-			      size_t old_gap, size_t new_gap)</div><div class='del'>-{</div><div class='del'>-	size_t gap_end = old_gap + size - nr;</div><div class='del'>-</div><div class='del'>-	if (new_gap &lt; old_gap) {</div><div class='del'>-		size_t move = old_gap - new_gap;</div><div class='del'>-</div><div class='del'>-		memmove(array + element_size * (gap_end - move),</div><div class='del'>-			array + element_size * (old_gap - move),</div><div class='del'>-				element_size * move);</div><div class='del'>-	} else if (new_gap &gt; old_gap) {</div><div class='del'>-		size_t move = new_gap - old_gap;</div><div class='del'>-</div><div class='del'>-		memmove(array + element_size * old_gap,</div><div class='del'>-			array + element_size * gap_end,</div><div class='del'>-				element_size * move);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Move the gap in a gap buffer: */</div><div class='del'>-#define move_gap(_array, _nr, _size, _old_gap, _new_gap)	\</div><div class='del'>-	__move_gap(_array, sizeof(_array[0]), _nr, _size, _old_gap, _new_gap)</div><div class='del'>-</div><div class='del'>-#define bubble_sort(_base, _nr, _cmp)					\</div><div class='del'>-do {									\</div><div class='del'>-	ssize_t _i, _last;						\</div><div class='del'>-	bool _swapped = true;						\</div><div class='del'>-									\</div><div class='del'>-	for (_last= (ssize_t) (_nr) - 1; _last &gt; 0 &amp;&amp; _swapped; --_last) {\</div><div class='del'>-		_swapped = false;					\</div><div class='del'>-		for (_i = 0; _i &lt; _last; _i++)				\</div><div class='del'>-			if (_cmp((_base)[_i], (_base)[_i + 1]) &gt; 0) {	\</div><div class='del'>-				swap((_base)[_i], (_base)[_i + 1]);	\</div><div class='del'>-				_swapped = true;			\</div><div class='del'>-			}						\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-static inline u64 percpu_u64_get(u64 __percpu *src)</div><div class='del'>-{</div><div class='del'>-	u64 ret = 0;</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu)</div><div class='del'>-		ret += *per_cpu_ptr(src, cpu);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void percpu_u64_set(u64 __percpu *dst, u64 src)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu)</div><div class='del'>-		*per_cpu_ptr(dst, cpu) = 0;</div><div class='del'>-	this_cpu_write(*dst, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void acc_u64s(u64 *acc, const u64 *src, unsigned nr)</div><div class='del'>-{</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		acc[i] += src[i];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void acc_u64s_percpu(u64 *acc, const u64 __percpu *src,</div><div class='del'>-				   unsigned nr)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu)</div><div class='del'>-		acc_u64s(acc, per_cpu_ptr(src, cpu), nr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void percpu_memset(void __percpu *p, int c, size_t bytes)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu)</div><div class='del'>-		memset(per_cpu_ptr(p, cpu), c, bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u64 *bch2_acc_percpu_u64s(u64 __percpu *, unsigned);</div><div class='del'>-</div><div class='del'>-#define cmp_int(l, r)		((l &gt; r) - (l &lt; r))</div><div class='del'>-</div><div class='del'>-static inline int u8_cmp(u8 l, u8 r)</div><div class='del'>-{</div><div class='del'>-	return cmp_int(l, r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int cmp_le32(__le32 l, __le32 r)</div><div class='del'>-{</div><div class='del'>-	return cmp_int(le32_to_cpu(l), le32_to_cpu(r));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uuid.h&gt;</div><div class='del'>-</div><div class='del'>-#define QSTR(n) { { { .len = strlen(n) } }, .name = n }</div><div class='del'>-</div><div class='del'>-static inline bool qstr_eq(const struct qstr l, const struct qstr r)</div><div class='del'>-{</div><div class='del'>-	return l.len == r.len &amp;&amp; !memcmp(l.name, r.name, l.len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_darray_str_exit(darray_str *);</div><div class='del'>-int bch2_split_devs(const char *, darray_str *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_UTIL_H */</div><div class='head'>diff --git a/fs/bcachefs/varint.c b/fs/bcachefs/varint.c<br/>deleted file mode 100644<br/>index cb4f33ed9ab3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/varint.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/varint.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,129 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/math.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_VALGRIND</div><div class='del'>-#include &lt;valgrind/memcheck.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "varint.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_varint_encode - encode a variable length integer</div><div class='del'>- * @out:	destination to encode to</div><div class='del'>- * @v:		unsigned integer to encode</div><div class='del'>- * Returns:	size in bytes of the encoded integer - at most 9 bytes</div><div class='del'>- */</div><div class='del'>-int bch2_varint_encode(u8 *out, u64 v)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = fls64(v|1);</div><div class='del'>-	unsigned bytes = DIV_ROUND_UP(bits, 7);</div><div class='del'>-	__le64 v_le;</div><div class='del'>-</div><div class='del'>-	if (likely(bytes &lt; 9)) {</div><div class='del'>-		v &lt;&lt;= bytes;</div><div class='del'>-		v |= ~(~0 &lt;&lt; (bytes - 1));</div><div class='del'>-		v_le = cpu_to_le64(v);</div><div class='del'>-		memcpy(out, &amp;v_le, bytes);</div><div class='del'>-	} else {</div><div class='del'>-		*out++ = 255;</div><div class='del'>-		bytes = 9;</div><div class='del'>-		put_unaligned_le64(v, out);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_varint_decode - encode a variable length integer</div><div class='del'>- * @in:		varint to decode</div><div class='del'>- * @end:	end of buffer to decode from</div><div class='del'>- * @out:	on success, decoded integer</div><div class='del'>- * Returns:	size in bytes of the decoded integer - or -1 on failure (would</div><div class='del'>- * have read past the end of the buffer)</div><div class='del'>- */</div><div class='del'>-int bch2_varint_decode(const u8 *in, const u8 *end, u64 *out)</div><div class='del'>-{</div><div class='del'>-	unsigned bytes = likely(in &lt; end)</div><div class='del'>-		? ffz(*in &amp; 255) + 1</div><div class='del'>-		: 1;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	if (unlikely(in + bytes &gt; end))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (likely(bytes &lt; 9)) {</div><div class='del'>-		__le64 v_le = 0;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;v_le, in, bytes);</div><div class='del'>-		v = le64_to_cpu(v_le);</div><div class='del'>-		v &gt;&gt;= bytes;</div><div class='del'>-	} else {</div><div class='del'>-		v = get_unaligned_le64(++in);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out = v;</div><div class='del'>-	return bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_varint_encode_fast - fast version of bch2_varint_encode</div><div class='del'>- * @out:	destination to encode to</div><div class='del'>- * @v:		unsigned integer to encode</div><div class='del'>- * Returns:	size in bytes of the encoded integer - at most 9 bytes</div><div class='del'>- *</div><div class='del'>- * This version assumes it's always safe to write 8 bytes to @out, even if the</div><div class='del'>- * encoded integer would be smaller.</div><div class='del'>- */</div><div class='del'>-int bch2_varint_encode_fast(u8 *out, u64 v)</div><div class='del'>-{</div><div class='del'>-	unsigned bits = fls64(v|1);</div><div class='del'>-	unsigned bytes = DIV_ROUND_UP(bits, 7);</div><div class='del'>-</div><div class='del'>-	if (likely(bytes &lt; 9)) {</div><div class='del'>-		v &lt;&lt;= bytes;</div><div class='del'>-		v |= ~(~0 &lt;&lt; (bytes - 1));</div><div class='del'>-	} else {</div><div class='del'>-		*out++ = 255;</div><div class='del'>-		bytes = 9;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	put_unaligned_le64(v, out);</div><div class='del'>-	return bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * bch2_varint_decode_fast - fast version of bch2_varint_decode</div><div class='del'>- * @in:		varint to decode</div><div class='del'>- * @end:	end of buffer to decode from</div><div class='del'>- * @out:	on success, decoded integer</div><div class='del'>- * Returns:	size in bytes of the decoded integer - or -1 on failure (would</div><div class='del'>- * have read past the end of the buffer)</div><div class='del'>- *</div><div class='del'>- * This version assumes that it is safe to read at most 8 bytes past the end of</div><div class='del'>- * @end (we still return an error if the varint extends past @end).</div><div class='del'>- */</div><div class='del'>-int bch2_varint_decode_fast(const u8 *in, const u8 *end, u64 *out)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_VALGRIND</div><div class='del'>-	VALGRIND_MAKE_MEM_DEFINED(in, 8);</div><div class='del'>-#endif</div><div class='del'>-	u64 v = get_unaligned_le64(in);</div><div class='del'>-	unsigned bytes = ffz(*in) + 1;</div><div class='del'>-</div><div class='del'>-	if (unlikely(in + bytes &gt; end))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (likely(bytes &lt; 9)) {</div><div class='del'>-		v &gt;&gt;= bytes;</div><div class='del'>-		v &amp;= ~(~0ULL &lt;&lt; (7 * bytes));</div><div class='del'>-	} else {</div><div class='del'>-		v = get_unaligned_le64(++in);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out = v;</div><div class='del'>-	return bytes;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/varint.h b/fs/bcachefs/varint.h<br/>deleted file mode 100644<br/>index 92a182fb3d7a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/varint.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/varint.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_VARINT_H</div><div class='del'>-#define _BCACHEFS_VARINT_H</div><div class='del'>-</div><div class='del'>-int bch2_varint_encode(u8 *, u64);</div><div class='del'>-int bch2_varint_decode(const u8 *, const u8 *, u64 *);</div><div class='del'>-</div><div class='del'>-int bch2_varint_encode_fast(u8 *, u64);</div><div class='del'>-int bch2_varint_decode_fast(const u8 *, const u8 *, u64 *);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_VARINT_H */</div><div class='head'>diff --git a/fs/bcachefs/vstructs.h b/fs/bcachefs/vstructs.h<br/>deleted file mode 100644<br/>index 2ad338e282da..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/vstructs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/vstructs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _VSTRUCTS_H</div><div class='del'>-#define _VSTRUCTS_H</div><div class='del'>-</div><div class='del'>-#include "util.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE: we can't differentiate between __le64 and u64 with type_is - this</div><div class='del'>- * assumes u64 is little endian:</div><div class='del'>- */</div><div class='del'>-#define __vstruct_u64s(_s)						\</div><div class='del'>-({									\</div><div class='del'>-	( type_is((_s)-&gt;u64s, u64) ? le64_to_cpu((__force __le64) (_s)-&gt;u64s)		\</div><div class='del'>-	: type_is((_s)-&gt;u64s, u32) ? le32_to_cpu((__force __le32) (_s)-&gt;u64s)		\</div><div class='del'>-	: type_is((_s)-&gt;u64s, u16) ? le16_to_cpu((__force __le16) (_s)-&gt;u64s)		\</div><div class='del'>-	: ((__force u8) ((_s)-&gt;u64s)));						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define __vstruct_bytes(_type, _u64s)					\</div><div class='del'>-({									\</div><div class='del'>-	BUILD_BUG_ON(offsetof(_type, _data) % sizeof(u64));		\</div><div class='del'>-									\</div><div class='del'>-	(size_t) (offsetof(_type, _data) + (_u64s) * sizeof(u64));	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define vstruct_bytes(_s)						\</div><div class='del'>-	__vstruct_bytes(typeof(*(_s)), __vstruct_u64s(_s))</div><div class='del'>-</div><div class='del'>-#define __vstruct_blocks(_type, _sector_block_bits, _u64s)		\</div><div class='del'>-	(round_up(__vstruct_bytes(_type, _u64s),			\</div><div class='del'>-		  512 &lt;&lt; (_sector_block_bits)) &gt;&gt; (9 + (_sector_block_bits)))</div><div class='del'>-</div><div class='del'>-#define vstruct_blocks(_s, _sector_block_bits)				\</div><div class='del'>-	__vstruct_blocks(typeof(*(_s)), _sector_block_bits, __vstruct_u64s(_s))</div><div class='del'>-</div><div class='del'>-#define vstruct_blocks_plus(_s, _sector_block_bits, _u64s)		\</div><div class='del'>-	__vstruct_blocks(typeof(*(_s)), _sector_block_bits,		\</div><div class='del'>-			 __vstruct_u64s(_s) + (_u64s))</div><div class='del'>-</div><div class='del'>-#define vstruct_sectors(_s, _sector_block_bits)				\</div><div class='del'>-	(round_up(vstruct_bytes(_s), 512 &lt;&lt; (_sector_block_bits)) &gt;&gt; 9)</div><div class='del'>-</div><div class='del'>-#define vstruct_next(_s)						\</div><div class='del'>-	((typeof(_s))			((u64 *) (_s)-&gt;_data + __vstruct_u64s(_s)))</div><div class='del'>-#define vstruct_last(_s)						\</div><div class='del'>-	((typeof(&amp;(_s)-&gt;start[0]))	((u64 *) (_s)-&gt;_data + __vstruct_u64s(_s)))</div><div class='del'>-#define vstruct_end(_s)							\</div><div class='del'>-	((void *)			((u64 *) (_s)-&gt;_data + __vstruct_u64s(_s)))</div><div class='del'>-</div><div class='del'>-#define vstruct_for_each(_s, _i)					\</div><div class='del'>-	for (typeof(&amp;(_s)-&gt;start[0]) _i = (_s)-&gt;start;			\</div><div class='del'>-	     _i &lt; vstruct_last(_s);					\</div><div class='del'>-	     _i = vstruct_next(_i))</div><div class='del'>-</div><div class='del'>-#define vstruct_for_each_safe(_s, _i)					\</div><div class='del'>-	for (typeof(&amp;(_s)-&gt;start[0]) _next, _i = (_s)-&gt;start;		\</div><div class='del'>-	     _i &lt; vstruct_last(_s) &amp;&amp; (_next = vstruct_next(_i), true);	\</div><div class='del'>-	     _i = _next)</div><div class='del'>-</div><div class='del'>-#define vstruct_idx(_s, _idx)						\</div><div class='del'>-	((typeof(&amp;(_s)-&gt;start[0])) ((_s)-&gt;_data + (_idx)))</div><div class='del'>-</div><div class='del'>-#endif /* _VSTRUCTS_H */</div><div class='head'>diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c<br/>deleted file mode 100644<br/>index 9c0d2316031b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/xattr.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,654 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include "bcachefs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "bkey_methods.h"</div><div class='del'>-#include "btree_update.h"</div><div class='del'>-#include "extents.h"</div><div class='del'>-#include "fs.h"</div><div class='del'>-#include "rebalance.h"</div><div class='del'>-#include "str_hash.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dcache.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl_xattr.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler *bch2_xattr_type_to_handler(unsigned);</div><div class='del'>-</div><div class='del'>-static u64 bch2_xattr_hash(const struct bch_hash_info *info,</div><div class='del'>-			  const struct xattr_search_key *key)</div><div class='del'>-{</div><div class='del'>-	struct bch_str_hash_ctx ctx;</div><div class='del'>-</div><div class='del'>-	bch2_str_hash_init(&amp;ctx, info);</div><div class='del'>-	bch2_str_hash_update(&amp;ctx, info, &amp;key-&gt;type, sizeof(key-&gt;type));</div><div class='del'>-	bch2_str_hash_update(&amp;ctx, info, key-&gt;name.name, key-&gt;name.len);</div><div class='del'>-</div><div class='del'>-	return bch2_str_hash_end(&amp;ctx, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 xattr_hash_key(const struct bch_hash_info *info, const void *key)</div><div class='del'>-{</div><div class='del'>-	return bch2_xattr_hash(info, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 xattr_hash_bkey(const struct bch_hash_info *info, struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_xattr x = bkey_s_c_to_xattr(k);</div><div class='del'>-</div><div class='del'>-	return bch2_xattr_hash(info,</div><div class='del'>-		 &amp;X_SEARCH(x.v-&gt;x_type, x.v-&gt;x_name, x.v-&gt;x_name_len));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool xattr_cmp_key(struct bkey_s_c _l, const void *_r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_xattr l = bkey_s_c_to_xattr(_l);</div><div class='del'>-	const struct xattr_search_key *r = _r;</div><div class='del'>-</div><div class='del'>-	return l.v-&gt;x_type != r-&gt;type ||</div><div class='del'>-		l.v-&gt;x_name_len != r-&gt;name.len ||</div><div class='del'>-		memcmp(l.v-&gt;x_name, r-&gt;name.name, r-&gt;name.len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool xattr_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_xattr l = bkey_s_c_to_xattr(_l);</div><div class='del'>-	struct bkey_s_c_xattr r = bkey_s_c_to_xattr(_r);</div><div class='del'>-</div><div class='del'>-	return l.v-&gt;x_type != r.v-&gt;x_type ||</div><div class='del'>-		l.v-&gt;x_name_len != r.v-&gt;x_name_len ||</div><div class='del'>-		memcmp(l.v-&gt;x_name, r.v-&gt;x_name, r.v-&gt;x_name_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct bch_hash_desc bch2_xattr_hash_desc = {</div><div class='del'>-	.btree_id	= BTREE_ID_xattrs,</div><div class='del'>-	.key_type	= KEY_TYPE_xattr,</div><div class='del'>-	.hash_key	= xattr_hash_key,</div><div class='del'>-	.hash_bkey	= xattr_hash_bkey,</div><div class='del'>-	.cmp_key	= xattr_cmp_key,</div><div class='del'>-	.cmp_bkey	= xattr_cmp_bkey,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int bch2_xattr_invalid(struct bch_fs *c, struct bkey_s_c k,</div><div class='del'>-		       enum bkey_invalid_flags flags,</div><div class='del'>-		       struct printbuf *err)</div><div class='del'>-{</div><div class='del'>-	struct bkey_s_c_xattr xattr = bkey_s_c_to_xattr(k);</div><div class='del'>-	unsigned val_u64s = xattr_val_u64s(xattr.v-&gt;x_name_len,</div><div class='del'>-					   le16_to_cpu(xattr.v-&gt;x_val_len));</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(k.k) &lt; val_u64s, c, err,</div><div class='del'>-			 xattr_val_size_too_small,</div><div class='del'>-			 "value too small (%zu &lt; %u)",</div><div class='del'>-			 bkey_val_u64s(k.k), val_u64s);</div><div class='del'>-</div><div class='del'>-	/* XXX why +4 ? */</div><div class='del'>-	val_u64s = xattr_val_u64s(xattr.v-&gt;x_name_len,</div><div class='del'>-				  le16_to_cpu(xattr.v-&gt;x_val_len) + 4);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(bkey_val_u64s(k.k) &gt; val_u64s, c, err,</div><div class='del'>-			 xattr_val_size_too_big,</div><div class='del'>-			 "value too big (%zu &gt; %u)",</div><div class='del'>-			 bkey_val_u64s(k.k), val_u64s);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(!bch2_xattr_type_to_handler(xattr.v-&gt;x_type), c, err,</div><div class='del'>-			 xattr_invalid_type,</div><div class='del'>-			 "invalid type (%u)", xattr.v-&gt;x_type);</div><div class='del'>-</div><div class='del'>-	bkey_fsck_err_on(memchr(xattr.v-&gt;x_name, '\0', xattr.v-&gt;x_name_len), c, err,</div><div class='del'>-			 xattr_name_invalid_chars,</div><div class='del'>-			 "xattr name has invalid characters");</div><div class='del'>-fsck_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bch2_xattr_to_text(struct printbuf *out, struct bch_fs *c,</div><div class='del'>-			struct bkey_s_c k)</div><div class='del'>-{</div><div class='del'>-	const struct xattr_handler *handler;</div><div class='del'>-	struct bkey_s_c_xattr xattr = bkey_s_c_to_xattr(k);</div><div class='del'>-</div><div class='del'>-	handler = bch2_xattr_type_to_handler(xattr.v-&gt;x_type);</div><div class='del'>-	if (handler &amp;&amp; handler-&gt;prefix)</div><div class='del'>-		prt_printf(out, "%s", handler-&gt;prefix);</div><div class='del'>-	else if (handler)</div><div class='del'>-		prt_printf(out, "(type %u)", xattr.v-&gt;x_type);</div><div class='del'>-	else</div><div class='del'>-		prt_printf(out, "(unknown type %u)", xattr.v-&gt;x_type);</div><div class='del'>-</div><div class='del'>-	prt_printf(out, "%.*s:%.*s",</div><div class='del'>-	       xattr.v-&gt;x_name_len,</div><div class='del'>-	       xattr.v-&gt;x_name,</div><div class='del'>-	       le16_to_cpu(xattr.v-&gt;x_val_len),</div><div class='del'>-	       (char *) xattr_val(xattr.v));</div><div class='del'>-</div><div class='del'>-	if (xattr.v-&gt;x_type == KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS ||</div><div class='del'>-	    xattr.v-&gt;x_type == KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT) {</div><div class='del'>-		prt_char(out, ' ');</div><div class='del'>-		bch2_acl_to_text(out, xattr_val(xattr.v),</div><div class='del'>-				 le16_to_cpu(xattr.v-&gt;x_val_len));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_get_trans(struct btree_trans *trans, struct bch_inode_info *inode,</div><div class='del'>-				const char *name, void *buffer, size_t size, int type)</div><div class='del'>-{</div><div class='del'>-	struct bch_hash_info hash = bch2_hash_info_init(trans-&gt;c, &amp;inode-&gt;ei_inode);</div><div class='del'>-	struct xattr_search_key search = X_SEARCH(type, name, strlen(name));</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c_xattr xattr;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_hash_lookup(trans, &amp;iter, bch2_xattr_hash_desc, &amp;hash,</div><div class='del'>-			       inode_inum(inode), &amp;search, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	k = bch2_btree_iter_peek_slot(&amp;iter);</div><div class='del'>-	ret = bkey_err(k);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err2;</div><div class='del'>-</div><div class='del'>-	xattr = bkey_s_c_to_xattr(k);</div><div class='del'>-	ret = le16_to_cpu(xattr.v-&gt;x_val_len);</div><div class='del'>-	if (buffer) {</div><div class='del'>-		if (ret &gt; size)</div><div class='del'>-			ret = -ERANGE;</div><div class='del'>-		else</div><div class='del'>-			memcpy(buffer, xattr_val(xattr.v), ret);</div><div class='del'>-	}</div><div class='del'>-err2:</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err1:</div><div class='del'>-	return ret &lt; 0 &amp;&amp; bch2_err_matches(ret, ENOENT) ? -ENODATA : ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bch2_xattr_set(struct btree_trans *trans, subvol_inum inum,</div><div class='del'>-		   struct bch_inode_unpacked *inode_u,</div><div class='del'>-		   const struct bch_hash_info *hash_info,</div><div class='del'>-		   const char *name, const void *value, size_t size,</div><div class='del'>-		   int type, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = trans-&gt;c;</div><div class='del'>-	struct btree_iter inode_iter = { NULL };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret   = bch2_subvol_is_ro_trans(trans, inum.subvol) ?:</div><div class='del'>-		bch2_inode_peek(trans, &amp;inode_iter, inode_u, inum, BTREE_ITER_INTENT);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	inode_u-&gt;bi_ctime = bch2_current_time(c);</div><div class='del'>-</div><div class='del'>-	ret = bch2_inode_write(trans, &amp;inode_iter, inode_u);</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;inode_iter);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		struct bkey_i_xattr *xattr;</div><div class='del'>-		unsigned namelen = strlen(name);</div><div class='del'>-		unsigned u64s = BKEY_U64s +</div><div class='del'>-			xattr_val_u64s(namelen, size);</div><div class='del'>-</div><div class='del'>-		if (u64s &gt; U8_MAX)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-</div><div class='del'>-		xattr = bch2_trans_kmalloc(trans, u64s * sizeof(u64));</div><div class='del'>-		if (IS_ERR(xattr))</div><div class='del'>-			return PTR_ERR(xattr);</div><div class='del'>-</div><div class='del'>-		bkey_xattr_init(&amp;xattr-&gt;k_i);</div><div class='del'>-		xattr-&gt;k.u64s		= u64s;</div><div class='del'>-		xattr-&gt;v.x_type		= type;</div><div class='del'>-		xattr-&gt;v.x_name_len	= namelen;</div><div class='del'>-		xattr-&gt;v.x_val_len	= cpu_to_le16(size);</div><div class='del'>-		memcpy(xattr-&gt;v.x_name, name, namelen);</div><div class='del'>-		memcpy(xattr_val(&amp;xattr-&gt;v), value, size);</div><div class='del'>-</div><div class='del'>-		ret = bch2_hash_set(trans, bch2_xattr_hash_desc, hash_info,</div><div class='del'>-			      inum, &amp;xattr-&gt;k_i,</div><div class='del'>-			      (flags &amp; XATTR_CREATE ? BCH_HASH_SET_MUST_CREATE : 0)|</div><div class='del'>-			      (flags &amp; XATTR_REPLACE ? BCH_HASH_SET_MUST_REPLACE : 0));</div><div class='del'>-	} else {</div><div class='del'>-		struct xattr_search_key search =</div><div class='del'>-			X_SEARCH(type, name, strlen(name));</div><div class='del'>-</div><div class='del'>-		ret = bch2_hash_delete(trans, bch2_xattr_hash_desc,</div><div class='del'>-				       hash_info, inum, &amp;search);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bch2_err_matches(ret, ENOENT))</div><div class='del'>-		ret = flags &amp; XATTR_REPLACE ? -ENODATA : 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct xattr_buf {</div><div class='del'>-	char		*buf;</div><div class='del'>-	size_t		len;</div><div class='del'>-	size_t		used;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __bch2_xattr_emit(const char *prefix,</div><div class='del'>-			     const char *name, size_t name_len,</div><div class='del'>-			     struct xattr_buf *buf)</div><div class='del'>-{</div><div class='del'>-	const size_t prefix_len = strlen(prefix);</div><div class='del'>-	const size_t total_len = prefix_len + name_len + 1;</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;buf) {</div><div class='del'>-		if (buf-&gt;used + total_len &gt; buf-&gt;len)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-</div><div class='del'>-		memcpy(buf-&gt;buf + buf-&gt;used, prefix, prefix_len);</div><div class='del'>-		memcpy(buf-&gt;buf + buf-&gt;used + prefix_len,</div><div class='del'>-		       name, name_len);</div><div class='del'>-		buf-&gt;buf[buf-&gt;used + prefix_len + name_len] = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf-&gt;used += total_len;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_emit(struct dentry *dentry,</div><div class='del'>-			    const struct bch_xattr *xattr,</div><div class='del'>-			    struct xattr_buf *buf)</div><div class='del'>-{</div><div class='del'>-	const struct xattr_handler *handler =</div><div class='del'>-		bch2_xattr_type_to_handler(xattr-&gt;x_type);</div><div class='del'>-</div><div class='del'>-	return handler &amp;&amp; (!handler-&gt;list || handler-&gt;list(dentry))</div><div class='del'>-		? __bch2_xattr_emit(handler-&gt;prefix ?: handler-&gt;name,</div><div class='del'>-				    xattr-&gt;x_name, xattr-&gt;x_name_len, buf)</div><div class='del'>-		: 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_list_bcachefs(struct bch_fs *c,</div><div class='del'>-				    struct bch_inode_unpacked *inode,</div><div class='del'>-				    struct xattr_buf *buf,</div><div class='del'>-				    bool all)</div><div class='del'>-{</div><div class='del'>-	const char *prefix = all ? "bcachefs_effective." : "bcachefs.";</div><div class='del'>-	unsigned id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	for (id = 0; id &lt; Inode_opt_nr; id++) {</div><div class='del'>-		v = bch2_inode_opt_get(inode, id);</div><div class='del'>-		if (!v)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!all &amp;&amp;</div><div class='del'>-		    !(inode-&gt;bi_fields_set &amp; (1 &lt;&lt; id)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = __bch2_xattr_emit(prefix, bch2_inode_opts[id],</div><div class='del'>-					strlen(bch2_inode_opts[id]), buf);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t bch2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)</div><div class='del'>-{</div><div class='del'>-	struct bch_fs *c = dentry-&gt;d_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(dentry-&gt;d_inode);</div><div class='del'>-	struct btree_trans *trans = bch2_trans_get(c);</div><div class='del'>-	struct btree_iter iter;</div><div class='del'>-	struct bkey_s_c k;</div><div class='del'>-	struct xattr_buf buf = { .buf = buffer, .len = buffer_size };</div><div class='del'>-	u64 offset = 0, inum = inode-&gt;ei_inode.bi_inum;</div><div class='del'>-	u32 snapshot;</div><div class='del'>-	int ret;</div><div class='del'>-retry:</div><div class='del'>-	bch2_trans_begin(trans);</div><div class='del'>-	iter = (struct btree_iter) { NULL };</div><div class='del'>-</div><div class='del'>-	ret = bch2_subvolume_get_snapshot(trans, inode-&gt;ei_subvol, &amp;snapshot);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	for_each_btree_key_upto_norestart(trans, iter, BTREE_ID_xattrs,</div><div class='del'>-			   SPOS(inum, offset, snapshot),</div><div class='del'>-			   POS(inum, U64_MAX), 0, k, ret) {</div><div class='del'>-		if (k.k-&gt;type != KEY_TYPE_xattr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = bch2_xattr_emit(dentry, bkey_s_c_to_xattr(k).v, &amp;buf);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	offset = iter.pos.offset;</div><div class='del'>-	bch2_trans_iter_exit(trans, &amp;iter);</div><div class='del'>-err:</div><div class='del'>-	if (bch2_err_matches(ret, BCH_ERR_transaction_restart))</div><div class='del'>-		goto retry;</div><div class='del'>-</div><div class='del'>-	bch2_trans_put(trans);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_xattr_list_bcachefs(c, &amp;inode-&gt;ei_inode, &amp;buf, false);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = bch2_xattr_list_bcachefs(c, &amp;inode-&gt;ei_inode, &amp;buf, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	return buf.used;</div><div class='del'>-out:</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_get_handler(const struct xattr_handler *handler,</div><div class='del'>-				  struct dentry *dentry, struct inode *vinode,</div><div class='del'>-				  const char *name, void *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	int ret = bch2_trans_do(c, NULL, NULL, 0,</div><div class='del'>-		bch2_xattr_get_trans(trans, inode, name, buffer, size, handler-&gt;flags));</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_set_handler(const struct xattr_handler *handler,</div><div class='del'>-				  struct mnt_idmap *idmap,</div><div class='del'>-				  struct dentry *dentry, struct inode *vinode,</div><div class='del'>-				  const char *name, const void *value,</div><div class='del'>-				  size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_hash_info hash = bch2_hash_info_init(c, &amp;inode-&gt;ei_inode);</div><div class='del'>-	struct bch_inode_unpacked inode_u;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bch2_trans_run(c,</div><div class='del'>-		commit_do(trans, NULL, NULL, 0,</div><div class='del'>-			bch2_xattr_set(trans, inode_inum(inode), &amp;inode_u,</div><div class='del'>-				       &amp;hash, name, value, size,</div><div class='del'>-				       handler-&gt;flags, flags)) ?:</div><div class='del'>-		(bch2_inode_update_after_write(trans, inode, &amp;inode_u, ATTR_CTIME), 0));</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler bch_xattr_user_handler = {</div><div class='del'>-	.prefix	= XATTR_USER_PREFIX,</div><div class='del'>-	.get	= bch2_xattr_get_handler,</div><div class='del'>-	.set	= bch2_xattr_set_handler,</div><div class='del'>-	.flags	= KEY_TYPE_XATTR_INDEX_USER,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool bch2_xattr_trusted_list(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	return capable(CAP_SYS_ADMIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler bch_xattr_trusted_handler = {</div><div class='del'>-	.prefix	= XATTR_TRUSTED_PREFIX,</div><div class='del'>-	.list	= bch2_xattr_trusted_list,</div><div class='del'>-	.get	= bch2_xattr_get_handler,</div><div class='del'>-	.set	= bch2_xattr_set_handler,</div><div class='del'>-	.flags	= KEY_TYPE_XATTR_INDEX_TRUSTED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler bch_xattr_security_handler = {</div><div class='del'>-	.prefix	= XATTR_SECURITY_PREFIX,</div><div class='del'>-	.get	= bch2_xattr_get_handler,</div><div class='del'>-	.set	= bch2_xattr_set_handler,</div><div class='del'>-	.flags	= KEY_TYPE_XATTR_INDEX_SECURITY,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-</div><div class='del'>-static int opt_to_inode_opt(int id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-#define x(name, ...)				\</div><div class='del'>-	case Opt_##name: return Inode_opt_##name;</div><div class='del'>-	BCH_INODE_OPTS()</div><div class='del'>-#undef  x</div><div class='del'>-	default:</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __bch2_xattr_bcachefs_get(const struct xattr_handler *handler,</div><div class='del'>-				struct dentry *dentry, struct inode *vinode,</div><div class='del'>-				const char *name, void *buffer, size_t size,</div><div class='del'>-				bool all)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	struct bch_opts opts =</div><div class='del'>-		bch2_inode_opts_to_opts(&amp;inode-&gt;ei_inode);</div><div class='del'>-	const struct bch_option *opt;</div><div class='del'>-	int id, inode_opt_id;</div><div class='del'>-	struct printbuf out = PRINTBUF;</div><div class='del'>-	int ret;</div><div class='del'>-	u64 v;</div><div class='del'>-</div><div class='del'>-	id = bch2_opt_lookup(name);</div><div class='del'>-	if (id &lt; 0 || !bch2_opt_is_inode_opt(id))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	inode_opt_id = opt_to_inode_opt(id);</div><div class='del'>-	if (inode_opt_id &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	opt = bch2_opt_table + id;</div><div class='del'>-</div><div class='del'>-	if (!bch2_opt_defined_by_id(&amp;opts, id))</div><div class='del'>-		return -ENODATA;</div><div class='del'>-</div><div class='del'>-	if (!all &amp;&amp;</div><div class='del'>-	    !(inode-&gt;ei_inode.bi_fields_set &amp; (1 &lt;&lt; inode_opt_id)))</div><div class='del'>-		return -ENODATA;</div><div class='del'>-</div><div class='del'>-	v = bch2_opt_get_by_id(&amp;opts, id);</div><div class='del'>-	bch2_opt_to_text(&amp;out, c, c-&gt;disk_sb.sb, opt, v, 0);</div><div class='del'>-</div><div class='del'>-	ret = out.pos;</div><div class='del'>-</div><div class='del'>-	if (out.allocation_failure) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-	} else if (buffer) {</div><div class='del'>-		if (out.pos &gt; size)</div><div class='del'>-			ret = -ERANGE;</div><div class='del'>-		else</div><div class='del'>-			memcpy(buffer, out.buf, out.pos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printbuf_exit(&amp;out);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_bcachefs_get(const struct xattr_handler *handler,</div><div class='del'>-				   struct dentry *dentry, struct inode *vinode,</div><div class='del'>-				   const char *name, void *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	return __bch2_xattr_bcachefs_get(handler, dentry, vinode,</div><div class='del'>-					 name, buffer, size, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct inode_opt_set {</div><div class='del'>-	int			id;</div><div class='del'>-	u64			v;</div><div class='del'>-	bool			defined;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int inode_opt_set_fn(struct btree_trans *trans,</div><div class='del'>-			    struct bch_inode_info *inode,</div><div class='del'>-			    struct bch_inode_unpacked *bi,</div><div class='del'>-			    void *p)</div><div class='del'>-{</div><div class='del'>-	struct inode_opt_set *s = p;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;defined)</div><div class='del'>-		bi-&gt;bi_fields_set |= 1U &lt;&lt; s-&gt;id;</div><div class='del'>-	else</div><div class='del'>-		bi-&gt;bi_fields_set &amp;= ~(1U &lt;&lt; s-&gt;id);</div><div class='del'>-</div><div class='del'>-	bch2_inode_opt_set(bi, s-&gt;id, s-&gt;v);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_bcachefs_set(const struct xattr_handler *handler,</div><div class='del'>-				   struct mnt_idmap *idmap,</div><div class='del'>-				   struct dentry *dentry, struct inode *vinode,</div><div class='del'>-				   const char *name, const void *value,</div><div class='del'>-				   size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	struct bch_inode_info *inode = to_bch_ei(vinode);</div><div class='del'>-	struct bch_fs *c = inode-&gt;v.i_sb-&gt;s_fs_info;</div><div class='del'>-	const struct bch_option *opt;</div><div class='del'>-	char *buf;</div><div class='del'>-	struct inode_opt_set s;</div><div class='del'>-	int opt_id, inode_opt_id, ret;</div><div class='del'>-</div><div class='del'>-	opt_id = bch2_opt_lookup(name);</div><div class='del'>-	if (opt_id &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	opt = bch2_opt_table + opt_id;</div><div class='del'>-</div><div class='del'>-	inode_opt_id = opt_to_inode_opt(opt_id);</div><div class='del'>-	if (inode_opt_id &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	s.id = inode_opt_id;</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		u64 v = 0;</div><div class='del'>-</div><div class='del'>-		buf = kmalloc(size + 1, GFP_KERNEL);</div><div class='del'>-		if (!buf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		memcpy(buf, value, size);</div><div class='del'>-		buf[size] = '\0';</div><div class='del'>-</div><div class='del'>-		ret = bch2_opt_parse(c, opt, buf, &amp;v, NULL);</div><div class='del'>-		kfree(buf);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = bch2_opt_check_may_set(c, opt_id, v);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		s.v = v + 1;</div><div class='del'>-		s.defined = true;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Check if this option was set on the parent - if so, switched</div><div class='del'>-		 * back to inheriting from the parent:</div><div class='del'>-		 *</div><div class='del'>-		 * rename() also has to deal with keeping inherited options up</div><div class='del'>-		 * to date - see bch2_reinherit_attrs()</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		if (!IS_ROOT(dentry)) {</div><div class='del'>-			struct bch_inode_info *dir =</div><div class='del'>-				to_bch_ei(d_inode(dentry-&gt;d_parent));</div><div class='del'>-</div><div class='del'>-			s.v = bch2_inode_opt_get(&amp;dir-&gt;ei_inode, inode_opt_id);</div><div class='del'>-		} else {</div><div class='del'>-			s.v = 0;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-</div><div class='del'>-		s.defined = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-	if (inode_opt_id == Inode_opt_project) {</div><div class='del'>-		/*</div><div class='del'>-		 * inode fields accessible via the xattr interface are stored</div><div class='del'>-		 * with a +1 bias, so that 0 means unset:</div><div class='del'>-		 */</div><div class='del'>-		ret = bch2_set_projid(c, inode, s.v ? s.v - 1 : 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = bch2_write_inode(c, inode, inode_opt_set_fn, &amp;s, 0);</div><div class='del'>-err:</div><div class='del'>-	mutex_unlock(&amp;inode-&gt;ei_update_lock);</div><div class='del'>-</div><div class='del'>-	if (value &amp;&amp;</div><div class='del'>-	    (opt_id == Opt_background_target ||</div><div class='del'>-	     opt_id == Opt_background_compression ||</div><div class='del'>-	     (opt_id == Opt_compression &amp;&amp; !inode_opt_get(c, &amp;inode-&gt;ei_inode, background_compression))))</div><div class='del'>-		bch2_set_rebalance_needs_scan(c, inode-&gt;ei_inode.bi_inum);</div><div class='del'>-</div><div class='del'>-	return bch2_err_class(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler bch_xattr_bcachefs_handler = {</div><div class='del'>-	.prefix	= "bcachefs.",</div><div class='del'>-	.get	= bch2_xattr_bcachefs_get,</div><div class='del'>-	.set	= bch2_xattr_bcachefs_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bch2_xattr_bcachefs_get_effective(</div><div class='del'>-				const struct xattr_handler *handler,</div><div class='del'>-				struct dentry *dentry, struct inode *vinode,</div><div class='del'>-				const char *name, void *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	return __bch2_xattr_bcachefs_get(handler, dentry, vinode,</div><div class='del'>-					 name, buffer, size, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler bch_xattr_bcachefs_effective_handler = {</div><div class='del'>-	.prefix	= "bcachefs_effective.",</div><div class='del'>-	.get	= bch2_xattr_bcachefs_get_effective,</div><div class='del'>-	.set	= bch2_xattr_bcachefs_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* NO_BCACHEFS_FS */</div><div class='del'>-</div><div class='del'>-const struct xattr_handler *bch2_xattr_handlers[] = {</div><div class='del'>-	&amp;bch_xattr_user_handler,</div><div class='del'>-#ifdef CONFIG_BCACHEFS_POSIX_ACL</div><div class='del'>-	&amp;nop_posix_acl_access,</div><div class='del'>-	&amp;nop_posix_acl_default,</div><div class='del'>-#endif</div><div class='del'>-	&amp;bch_xattr_trusted_handler,</div><div class='del'>-	&amp;bch_xattr_security_handler,</div><div class='del'>-#ifndef NO_BCACHEFS_FS</div><div class='del'>-	&amp;bch_xattr_bcachefs_handler,</div><div class='del'>-	&amp;bch_xattr_bcachefs_effective_handler,</div><div class='del'>-#endif</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler *bch_xattr_handler_map[] = {</div><div class='del'>-	[KEY_TYPE_XATTR_INDEX_USER]			= &amp;bch_xattr_user_handler,</div><div class='del'>-	[KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS]	=</div><div class='del'>-		&amp;nop_posix_acl_access,</div><div class='del'>-	[KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT]	=</div><div class='del'>-		&amp;nop_posix_acl_default,</div><div class='del'>-	[KEY_TYPE_XATTR_INDEX_TRUSTED]		= &amp;bch_xattr_trusted_handler,</div><div class='del'>-	[KEY_TYPE_XATTR_INDEX_SECURITY]		= &amp;bch_xattr_security_handler,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct xattr_handler *bch2_xattr_type_to_handler(unsigned type)</div><div class='del'>-{</div><div class='del'>-	return type &lt; ARRAY_SIZE(bch_xattr_handler_map)</div><div class='del'>-		? bch_xattr_handler_map[type]</div><div class='del'>-		: NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/bcachefs/xattr.h b/fs/bcachefs/xattr.h<br/>deleted file mode 100644<br/>index 1337f31a5c49..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/xattr.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_XATTR_H</div><div class='del'>-#define _BCACHEFS_XATTR_H</div><div class='del'>-</div><div class='del'>-#include "str_hash.h"</div><div class='del'>-</div><div class='del'>-extern const struct bch_hash_desc bch2_xattr_hash_desc;</div><div class='del'>-</div><div class='del'>-int bch2_xattr_invalid(struct bch_fs *, struct bkey_s_c,</div><div class='del'>-		       enum bkey_invalid_flags, struct printbuf *);</div><div class='del'>-void bch2_xattr_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);</div><div class='del'>-</div><div class='del'>-#define bch2_bkey_ops_xattr ((struct bkey_ops) {	\</div><div class='del'>-	.key_invalid	= bch2_xattr_invalid,		\</div><div class='del'>-	.val_to_text	= bch2_xattr_to_text,		\</div><div class='del'>-	.min_val_size	= 8,				\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static inline unsigned xattr_val_u64s(unsigned name_len, unsigned val_len)</div><div class='del'>-{</div><div class='del'>-	return DIV_ROUND_UP(offsetof(struct bch_xattr, x_name) +</div><div class='del'>-			    name_len + val_len, sizeof(u64));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define xattr_val(_xattr)					\</div><div class='del'>-	((void *) (_xattr)-&gt;x_name + (_xattr)-&gt;x_name_len)</div><div class='del'>-</div><div class='del'>-struct xattr_search_key {</div><div class='del'>-	u8		type;</div><div class='del'>-	struct qstr	name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define X_SEARCH(_type, _name, _len) ((struct xattr_search_key)	\</div><div class='del'>-	{ .type = _type, .name = QSTR_INIT(_name, _len) })</div><div class='del'>-</div><div class='del'>-struct dentry;</div><div class='del'>-struct xattr_handler;</div><div class='del'>-struct bch_hash_info;</div><div class='del'>-struct bch_inode_info;</div><div class='del'>-</div><div class='del'>-/* Exported for cmd_migrate.c in tools: */</div><div class='del'>-int bch2_xattr_set(struct btree_trans *, subvol_inum,</div><div class='del'>-		   struct bch_inode_unpacked *, const struct bch_hash_info *,</div><div class='del'>-		   const char *, const void *, size_t, int, int);</div><div class='del'>-</div><div class='del'>-ssize_t bch2_xattr_list(struct dentry *, char *, size_t);</div><div class='del'>-</div><div class='del'>-extern const struct xattr_handler *bch2_xattr_handlers[];</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_XATTR_H */</div><div class='head'>diff --git a/fs/bcachefs/xattr_format.h b/fs/bcachefs/xattr_format.h<br/>deleted file mode 100644<br/>index e9f810539552..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bcachefs/xattr_format.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bcachefs/xattr_format.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _BCACHEFS_XATTR_FORMAT_H</div><div class='del'>-#define _BCACHEFS_XATTR_FORMAT_H</div><div class='del'>-</div><div class='del'>-#define KEY_TYPE_XATTR_INDEX_USER		0</div><div class='del'>-#define KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS	1</div><div class='del'>-#define KEY_TYPE_XATTR_INDEX_POSIX_ACL_DEFAULT	2</div><div class='del'>-#define KEY_TYPE_XATTR_INDEX_TRUSTED		3</div><div class='del'>-#define KEY_TYPE_XATTR_INDEX_SECURITY	        4</div><div class='del'>-</div><div class='del'>-struct bch_xattr {</div><div class='del'>-	struct bch_val		v;</div><div class='del'>-	__u8			x_type;</div><div class='del'>-	__u8			x_name_len;</div><div class='del'>-	__le16			x_val_len;</div><div class='del'>-	__u8			x_name[];</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-#endif /* _BCACHEFS_XATTR_FORMAT_H */</div><div class='head'>diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c<br/>index 2b4dda047450..9fcfdd6b8189 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/befs/linuxvfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/befs/linuxvfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/befs/linuxvfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/befs/linuxvfs.c</a></div><div class='hunk'>@@ -11,12 +11,13 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/nls.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='hunk'>@@ -54,22 +55,20 @@ static int befs_utf2nls(struct super_block *sb, const char *in, int in_len,</div><div class='ctx'> static int befs_nls2utf(struct super_block *sb, const char *in, int in_len,</div><div class='ctx'> 			char **out, int *out_len);</div><div class='ctx'> static void befs_put_super(struct super_block *);</div><div class='del'>-static int befs_remount(struct super_block *, int *, char *);</div><div class='ctx'> static int befs_statfs(struct dentry *, struct kstatfs *);</div><div class='ctx'> static int befs_show_options(struct seq_file *, struct dentry *);</div><div class='del'>-static int parse_options(char *, struct befs_mount_options *);</div><div class='ctx'> static struct dentry *befs_fh_to_dentry(struct super_block *sb,</div><div class='ctx'> 				struct fid *fid, int fh_len, int fh_type);</div><div class='ctx'> static struct dentry *befs_fh_to_parent(struct super_block *sb,</div><div class='ctx'> 				struct fid *fid, int fh_len, int fh_type);</div><div class='ctx'> static struct dentry *befs_get_parent(struct dentry *child);</div><div class='add'>+static void befs_free_fc(struct fs_context *fc);</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations befs_sops = {</div><div class='ctx'> 	.alloc_inode	= befs_alloc_inode,	/* allocate a new inode */</div><div class='ctx'> 	.free_inode	= befs_free_inode, /* deallocate an inode */</div><div class='ctx'> 	.put_super	= befs_put_super,	/* uninit super */</div><div class='ctx'> 	.statfs		= befs_statfs,	/* statfs */</div><div class='del'>-	.remount_fs	= befs_remount,</div><div class='ctx'> 	.show_options	= befs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -308,7 +307,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	befs_ino = BEFS_I(inode);</div><div class='hunk'>@@ -435,8 +434,7 @@ befs_init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	befs_inode_cachep = kmem_cache_create_usercopy("befs_inode_cache",</div><div class='ctx'> 				sizeof(struct befs_inode_info), 0,</div><div class='del'>-				(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-					SLAB_ACCOUNT),</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='ctx'> 				offsetof(struct befs_inode_info,</div><div class='ctx'> 					i_data.symlink),</div><div class='ctx'> 				sizeof_field(struct befs_inode_info,</div><div class='hunk'>@@ -476,6 +474,7 @@ static int befs_symlink_read_folio(struct file *unused, struct folio *folio)</div><div class='ctx'> 	befs_data_stream *data = &amp;befs_ino-&gt;i_data.ds;</div><div class='ctx'> 	befs_off_t len = data-&gt;size;</div><div class='ctx'> 	char *link = folio_address(folio);</div><div class='add'>+	int err = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (len == 0 || len &gt; PAGE_SIZE) {</div><div class='ctx'> 		befs_error(sb, "Long symlink with illegal length");</div><div class='hunk'>@@ -488,13 +487,10 @@ static int befs_symlink_read_folio(struct file *unused, struct folio *folio)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	link[len - 1] = '\0';</div><div class='del'>-	folio_mark_uptodate(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return 0;</div><div class='add'>+	err = 0;</div><div class='ctx'> fail:</div><div class='del'>-	folio_set_error(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return -EIO;</div><div class='add'>+	folio_end_read(folio, err == 0);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -675,92 +671,53 @@ static struct dentry *befs_get_parent(struct dentry *child)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_uid, Opt_gid, Opt_charset, Opt_debug, Opt_err,</div><div class='add'>+	Opt_uid, Opt_gid, Opt_charset, Opt_debug,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t befs_tokens = {</div><div class='del'>-	{Opt_uid, "uid=%d"},</div><div class='del'>-	{Opt_gid, "gid=%d"},</div><div class='del'>-	{Opt_charset, "iocharset=%s"},</div><div class='del'>-	{Opt_debug, "debug"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct fs_parameter_spec befs_param_spec[] = {</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_string	("iocharset",	Opt_charset),</div><div class='add'>+	fsparam_flag	("debug",	Opt_debug),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-parse_options(char *options, struct befs_mount_options *opts)</div><div class='add'>+befs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-</div><div class='del'>-	/* Initialize options */</div><div class='del'>-	opts-&gt;uid = GLOBAL_ROOT_UID;</div><div class='del'>-	opts-&gt;gid = GLOBAL_ROOT_GID;</div><div class='del'>-	opts-&gt;use_uid = 0;</div><div class='del'>-	opts-&gt;use_gid = 0;</div><div class='del'>-	opts-&gt;iocharset = NULL;</div><div class='del'>-	opts-&gt;debug = 0;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, befs_tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			uid = INVALID_UID;</div><div class='del'>-			if (option &gt;= 0)</div><div class='del'>-				uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(uid)) {</div><div class='del'>-				pr_err("Invalid uid %d, "</div><div class='del'>-				       "using default\n", option);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			opts-&gt;uid = uid;</div><div class='del'>-			opts-&gt;use_uid = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			gid = INVALID_GID;</div><div class='del'>-			if (option &gt;= 0)</div><div class='del'>-				gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(gid)) {</div><div class='del'>-				pr_err("Invalid gid %d, "</div><div class='del'>-				       "using default\n", option);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			opts-&gt;gid = gid;</div><div class='del'>-			opts-&gt;use_gid = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_charset:</div><div class='del'>-			kfree(opts-&gt;iocharset);</div><div class='del'>-			opts-&gt;iocharset = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!opts-&gt;iocharset) {</div><div class='del'>-				pr_err("allocation failure for "</div><div class='del'>-				       "iocharset string\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_debug:</div><div class='del'>-			opts-&gt;debug = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_err("Unrecognized mount option \"%s\" "</div><div class='del'>-			       "or missing value\n", p);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	struct befs_mount_options *opts = fc-&gt;fs_private;</div><div class='add'>+	int token;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+</div><div class='add'>+	/* befs ignores all options on remount */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	token = fs_parse(fc, befs_param_spec, param, &amp;result);</div><div class='add'>+	if (token &lt; 0)</div><div class='add'>+		return token;</div><div class='add'>+</div><div class='add'>+	switch (token) {</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		opts-&gt;uid = result.uid;</div><div class='add'>+		opts-&gt;use_uid = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		opts-&gt;gid = result.gid;</div><div class='add'>+		opts-&gt;use_gid = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_charset:</div><div class='add'>+		kfree(opts-&gt;iocharset);</div><div class='add'>+		opts-&gt;iocharset = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_debug:</div><div class='add'>+		opts-&gt;debug = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int befs_show_options(struct seq_file *m, struct dentry *root)</div><div class='hunk'>@@ -796,6 +753,21 @@ befs_put_super(struct super_block *sb)</div><div class='ctx'> 	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Copy the parsed options into the sbi mount_options member</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+befs_set_options(struct befs_sb_info *sbi, struct befs_mount_options *opts)</div><div class='add'>+{</div><div class='add'>+	sbi-&gt;mount_opts.uid = opts-&gt;uid;</div><div class='add'>+	sbi-&gt;mount_opts.gid = opts-&gt;gid;</div><div class='add'>+	sbi-&gt;mount_opts.use_uid = opts-&gt;use_uid;</div><div class='add'>+	sbi-&gt;mount_opts.use_gid = opts-&gt;use_gid;</div><div class='add'>+	sbi-&gt;mount_opts.debug = opts-&gt;debug;</div><div class='add'>+	sbi-&gt;mount_opts.iocharset = opts-&gt;iocharset;</div><div class='add'>+	opts-&gt;iocharset = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Allocate private field of the superblock, fill it.</div><div class='ctx'>  *</div><div class='ctx'>  * Finish filling the public superblock fields</div><div class='hunk'>@@ -803,7 +775,7 @@ befs_put_super(struct super_block *sb)</div><div class='ctx'>  * Load a set of NLS translations if needed.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+befs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct befs_sb_info *befs_sb;</div><div class='hunk'>@@ -813,6 +785,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	const unsigned long sb_block = 0;</div><div class='ctx'> 	const off_t x86_sb_off = 512;</div><div class='ctx'> 	int blocksize;</div><div class='add'>+	struct befs_mount_options *parsed_opts = fc-&gt;fs_private;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_fs_info = kzalloc(sizeof(*befs_sb), GFP_KERNEL);</div><div class='ctx'> 	if (sb-&gt;s_fs_info == NULL)</div><div class='hunk'>@@ -820,11 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	befs_sb = BEFS_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (!parse_options((char *) data, &amp;befs_sb-&gt;mount_opts)) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			befs_error(sb, "cannot parse mount options");</div><div class='del'>-		goto unacquire_priv_sbp;</div><div class='del'>-	}</div><div class='add'>+	befs_set_options(befs_sb, parsed_opts);</div><div class='ctx'> </div><div class='ctx'> 	befs_debug(sb, "---&gt; %s", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -937,10 +907,10 @@ unacquire_none:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-befs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+befs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	if (!(*flags &amp; SB_RDONLY))</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	if (!(fc-&gt;sb_flags &amp; SB_RDONLY))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -968,19 +938,51 @@ befs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *</div><div class='del'>-befs_mount(struct file_system_type *fs_type, int flags, const char *dev_name,</div><div class='del'>-	    void *data)</div><div class='add'>+static int befs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, befs_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, befs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations befs_context_ops = {</div><div class='add'>+	.parse_param	= befs_parse_param,</div><div class='add'>+	.get_tree	= befs_get_tree,</div><div class='add'>+	.reconfigure	= befs_reconfigure,</div><div class='add'>+	.free		= befs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int befs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct befs_mount_options *opts;</div><div class='add'>+</div><div class='add'>+	opts = kzalloc(sizeof(*opts), GFP_KERNEL);</div><div class='add'>+	if (!opts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Initialize options */</div><div class='add'>+	opts-&gt;uid = GLOBAL_ROOT_UID;</div><div class='add'>+	opts-&gt;gid = GLOBAL_ROOT_GID;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = opts;</div><div class='add'>+	fc-&gt;ops = &amp;befs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void befs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct befs_mount_options *opts = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	kfree(opts-&gt;iocharset);</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type befs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "befs",</div><div class='del'>-	.mount		= befs_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = befs_init_fs_context,</div><div class='add'>+	.parameters	= befs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("befs");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/bfs/file.c b/fs/bfs/file.c<br/>index a778411574a9..d33d6bde992b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/bfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/bfs/file.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ const struct file_operations bfs_file_operations = {</div><div class='ctx'> 	.llseek 	= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -170,13 +170,14 @@ static void bfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 		truncate_pagecache(inode, inode-&gt;i_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int bfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned len,</div><div class='add'>+			   struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = block_write_begin(mapping, pos, len, pagep, bfs_get_block);</div><div class='add'>+	ret = block_write_begin(mapping, pos, len, foliop, bfs_get_block);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		bfs_write_failed(mapping, pos + len);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c<br/>index 355957dbce39..ce6f83234b67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/bfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/bfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/bfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/bfs/inode.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include "bfs.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Tigran Aivazian &lt;aivazian.tigran@gmail.com&gt;");</div><div class='hunk'>@@ -41,7 +42,7 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	if ((ino &lt; BFS_ROOT_INO) || (ino &gt; BFS_SB(inode-&gt;i_sb)-&gt;si_lasti)) {</div><div class='hunk'>@@ -60,7 +61,19 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	off = (ino - BFS_ROOT_INO) % BFS_INODES_PER_BLOCK;</div><div class='ctx'> 	di = (struct bfs_inode *)bh-&gt;b_data + off;</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_mode = 0x0000FFFF &amp; le32_to_cpu(di-&gt;i_mode);</div><div class='add'>+	/*</div><div class='add'>+	 * https://martin.hinner.info/fs/bfs/bfs-structure.html explains that</div><div class='add'>+	 * BFS in SCO UnixWare environment used only lower 9 bits of di-&gt;i_mode</div><div class='add'>+	 * value. This means that, although bfs_write_inode() saves whole</div><div class='add'>+	 * inode-&gt;i_mode bits (which include S_IFMT bits and S_IS{UID,GID,VTX}</div><div class='add'>+	 * bits), middle 7 bits of di-&gt;i_mode value can be garbage when these</div><div class='add'>+	 * bits were not saved by bfs_write_inode().</div><div class='add'>+	 * Since we can't tell whether middle 7 bits are garbage, use only</div><div class='add'>+	 * lower 12 bits (i.e. tolerate S_IS{UID,GID,VTX} bits possibly being</div><div class='add'>+	 * garbage) and reconstruct S_IFMT bits for Linux environment from</div><div class='add'>+	 * di-&gt;i_vtype value.</div><div class='add'>+	 */</div><div class='add'>+	inode-&gt;i_mode = 0x00000FFF &amp; le32_to_cpu(di-&gt;i_mode);</div><div class='ctx'> 	if (le32_to_cpu(di-&gt;i_vtype) == BFS_VDIR) {</div><div class='ctx'> 		inode-&gt;i_mode |= S_IFDIR;</div><div class='ctx'> 		inode-&gt;i_op = &amp;bfs_dir_inops;</div><div class='hunk'>@@ -70,6 +83,11 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 		inode-&gt;i_op = &amp;bfs_file_inops;</div><div class='ctx'> 		inode-&gt;i_fop = &amp;bfs_file_operations;</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = &amp;bfs_aops;</div><div class='add'>+	} else {</div><div class='add'>+		brelse(bh);</div><div class='add'>+		printf("Unknown vtype=%u %s:%08lx\n",</div><div class='add'>+		       le32_to_cpu(di-&gt;i_vtype), inode-&gt;i_sb-&gt;s_id, ino);</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BFS_I(inode)-&gt;i_sblock =  le32_to_cpu(di-&gt;i_sblock);</div><div class='hunk'>@@ -259,7 +277,7 @@ static int __init init_inodecache(void)</div><div class='ctx'> 	bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",</div><div class='ctx'> 					     sizeof(struct bfs_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (bfs_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -305,7 +323,7 @@ void bfs_dump_imap(const char *prefix, struct super_block *s)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bfs_fill_super(struct super_block *s, void *data, int silent)</div><div class='add'>+static int bfs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh, *sbh;</div><div class='ctx'> 	struct bfs_super_block *bfs_sb;</div><div class='hunk'>@@ -314,6 +332,7 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	struct bfs_sb_info *info;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> 	unsigned long i_sblock, i_eblock, i_eoff, s_size;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='ctx'> 	if (!info)</div><div class='hunk'>@@ -446,18 +465,28 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *bfs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int bfs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, bfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations bfs_context_ops = {</div><div class='add'>+	.get_tree = bfs_get_tree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, bfs_fill_super);</div><div class='add'>+	fc-&gt;ops = &amp;bfs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type bfs_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "bfs",</div><div class='del'>-	.mount		= bfs_mount,</div><div class='del'>-	.kill_sb	= kill_block_super,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "bfs",</div><div class='add'>+	.init_fs_context	= bfs_init_fs_context,</div><div class='add'>+	.kill_sb		= kill_block_super,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("bfs");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c<br/>index 5397b552fbeb..3eb734c192e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/binfmt_elf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_elf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/binfmt_elf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/binfmt_elf.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/dax.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/rseq.h&gt;</div><div class='add'>+#include &lt;uapi/linux/rseq.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -68,12 +68,6 @@</div><div class='ctx'> </div><div class='ctx'> static int load_elf_binary(struct linux_binprm *bprm);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USELIB</div><div class='del'>-static int load_elf_library(struct file *);</div><div class='del'>-#else</div><div class='del'>-#define load_elf_library NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * If we don't support core dumping, then supply a NULL so we</div><div class='ctx'>  * don't even try.</div><div class='hunk'>@@ -101,7 +95,6 @@ static int elf_core_dump(struct coredump_params *cprm);</div><div class='ctx'> static struct linux_binfmt elf_format = {</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> 	.load_binary	= load_elf_binary,</div><div class='del'>-	.load_shlib	= load_elf_library,</div><div class='ctx'> #ifdef CONFIG_COREDUMP</div><div class='ctx'> 	.core_dump	= elf_core_dump,</div><div class='ctx'> 	.min_coredump	= ELF_EXEC_PAGESIZE,</div><div class='hunk'>@@ -110,6 +103,21 @@ static struct linux_binfmt elf_format = {</div><div class='ctx'> </div><div class='ctx'> #define BAD_ADDR(x) (unlikely((unsigned long)(x) &gt;= TASK_SIZE))</div><div class='ctx'> </div><div class='add'>+static inline void elf_coredump_set_mm_eflags(struct mm_struct *mm, u32 flags)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_ELF_CORE_EFLAGS</div><div class='add'>+	mm-&gt;saved_e_flags = flags;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 elf_coredump_get_mm_eflags(struct mm_struct *mm, u32 flags)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_ELF_CORE_EFLAGS</div><div class='add'>+	flags = mm-&gt;saved_e_flags;</div><div class='add'>+#endif</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We need to explicitly zero any trailing portion of the page that follows</div><div class='ctx'>  * p_filesz when it ends before the page ends (e.g. bss), otherwise this</div><div class='hunk'>@@ -258,6 +266,12 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,</div><div class='ctx'> #ifdef ELF_HWCAP2</div><div class='ctx'> 	NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef ELF_HWCAP3</div><div class='add'>+	NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP3);</div><div class='add'>+#endif</div><div class='add'>+#ifdef ELF_HWCAP4</div><div class='add'>+	NEW_AUX_ENT(AT_HWCAP4, ELF_HWCAP4);</div><div class='add'>+#endif</div><div class='ctx'> 	NEW_AUX_ENT(AT_EXECFN, bprm-&gt;exec);</div><div class='ctx'> 	if (k_platform) {</div><div class='ctx'> 		NEW_AUX_ENT(AT_PLATFORM,</div><div class='hunk'>@@ -520,7 +534,7 @@ static struct elf_phdr *load_elf_phdrs(const struct elfhdr *elf_ex,</div><div class='ctx'> 	/* Sanity check the number of program headers... */</div><div class='ctx'> 	/* ...and their total size. */</div><div class='ctx'> 	size = sizeof(struct elf_phdr) * elf_ex-&gt;e_phnum;</div><div class='del'>-	if (size == 0 || size &gt; 65536 || size &gt; ELF_MIN_ALIGN)</div><div class='add'>+	if (size == 0 || size &gt; 65536)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	elf_phdata = kmalloc(size, GFP_KERNEL);</div><div class='hunk'>@@ -647,7 +661,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,</div><div class='ctx'> 	if (!elf_check_arch(interp_elf_ex) ||</div><div class='ctx'> 	    elf_check_fdpic(interp_elf_ex))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (!interpreter-&gt;f_op-&gt;mmap)</div><div class='add'>+	if (!can_mmap_file(interpreter))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	total_size = total_mapping_size(interp_elf_phdata,</div><div class='hunk'>@@ -756,8 +770,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define NOTE_DATA_SZ SZ_1K</div><div class='del'>-#define GNU_PROPERTY_TYPE_0_NAME "GNU"</div><div class='del'>-#define NOTE_NAME_SZ (sizeof(GNU_PROPERTY_TYPE_0_NAME))</div><div class='add'>+#define NOTE_NAME_SZ (sizeof(NN_GNU_PROPERTY_TYPE_0))</div><div class='ctx'> </div><div class='ctx'> static int parse_elf_properties(struct file *f, const struct elf_phdr *phdr,</div><div class='ctx'> 				struct arch_elf_state *arch)</div><div class='hunk'>@@ -794,7 +807,7 @@ static int parse_elf_properties(struct file *f, const struct elf_phdr *phdr,</div><div class='ctx'> 	if (note.nhdr.n_type != NT_GNU_PROPERTY_TYPE_0 ||</div><div class='ctx'> 	    note.nhdr.n_namesz != NOTE_NAME_SZ ||</div><div class='ctx'> 	    strncmp(note.data + sizeof(note.nhdr),</div><div class='del'>-		    GNU_PROPERTY_TYPE_0_NAME, n - sizeof(note.nhdr)))</div><div class='add'>+		    NN_GNU_PROPERTY_TYPE_0, n - sizeof(note.nhdr)))</div><div class='ctx'> 		return -ENOEXEC;</div><div class='ctx'> </div><div class='ctx'> 	off = round_up(sizeof(note.nhdr) + NOTE_NAME_SZ,</div><div class='hunk'>@@ -825,6 +838,7 @@ static int load_elf_binary(struct linux_binprm *bprm)</div><div class='ctx'> 	struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;</div><div class='ctx'> 	struct elf_phdr *elf_property_phdata = NULL;</div><div class='ctx'> 	unsigned long elf_brk;</div><div class='add'>+	bool brk_moved = false;</div><div class='ctx'> 	int retval, i;</div><div class='ctx'> 	unsigned long elf_entry;</div><div class='ctx'> 	unsigned long e_entry;</div><div class='hunk'>@@ -849,7 +863,7 @@ static int load_elf_binary(struct linux_binprm *bprm)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (elf_check_fdpic(elf_ex))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (!bprm-&gt;file-&gt;f_op-&gt;mmap)</div><div class='add'>+	if (!can_mmap_file(bprm-&gt;file))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	elf_phdata = load_elf_phdrs(elf_ex, bprm-&gt;file);</div><div class='hunk'>@@ -1003,7 +1017,8 @@ out_free_interp:</div><div class='ctx'> 	if (elf_read_implies_exec(*elf_ex, executable_stack))</div><div class='ctx'> 		current-&gt;personality |= READ_IMPLIES_EXEC;</div><div class='ctx'> </div><div class='del'>-	if (!(current-&gt;personality &amp; ADDR_NO_RANDOMIZE) &amp;&amp; randomize_va_space)</div><div class='add'>+	const int snapshot_randomize_va_space = READ_ONCE(randomize_va_space);</div><div class='add'>+	if (!(current-&gt;personality &amp; ADDR_NO_RANDOMIZE) &amp;&amp; snapshot_randomize_va_space)</div><div class='ctx'> 		current-&gt;flags |= PF_RANDOMIZE;</div><div class='ctx'> </div><div class='ctx'> 	setup_new_exec(bprm);</div><div class='hunk'>@@ -1061,15 +1076,49 @@ out_free_interp:</div><div class='ctx'> 			 * Header for ET_DYN binaries to calculate the</div><div class='ctx'> 			 * randomization (load_bias) for all the LOAD</div><div class='ctx'> 			 * Program Headers.</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Calculate the entire size of the ELF mapping</div><div class='add'>+			 * (total_size), used for the initial mapping,</div><div class='add'>+			 * due to load_addr_set which is set to true later</div><div class='add'>+			 * once the initial mapping is performed.</div><div class='add'>+			 *</div><div class='add'>+			 * Note that this is only sensible when the LOAD</div><div class='add'>+			 * segments are contiguous (or overlapping). If</div><div class='add'>+			 * used for LOADs that are far apart, this would</div><div class='add'>+			 * cause the holes between LOADs to be mapped,</div><div class='add'>+			 * running the risk of having the mapping fail,</div><div class='add'>+			 * as it would be larger than the ELF file itself.</div><div class='add'>+			 *</div><div class='add'>+			 * As a result, only ET_DYN does this, since</div><div class='add'>+			 * some ET_EXEC (e.g. ia64) may have large virtual</div><div class='add'>+			 * memory holes between LOADs.</div><div class='ctx'> 			 *</div><div class='del'>-			 * There are effectively two types of ET_DYN</div><div class='del'>-			 * binaries: programs (i.e. PIE: ET_DYN with INTERP)</div><div class='del'>-			 * and loaders (ET_DYN without INTERP, since they</div><div class='del'>-			 * _are_ the ELF interpreter). The loaders must</div><div class='del'>-			 * be loaded away from programs since the program</div><div class='del'>-			 * may otherwise collide with the loader (especially</div><div class='del'>-			 * for ET_EXEC which does not have a randomized</div><div class='del'>-			 * position). For example to handle invocations of</div><div class='add'>+			 */</div><div class='add'>+			total_size = total_mapping_size(elf_phdata,</div><div class='add'>+							elf_ex-&gt;e_phnum);</div><div class='add'>+			if (!total_size) {</div><div class='add'>+				retval = -EINVAL;</div><div class='add'>+				goto out_free_dentry;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Calculate any requested alignment. */</div><div class='add'>+			alignment = maximum_alignment(elf_phdata, elf_ex-&gt;e_phnum);</div><div class='add'>+</div><div class='add'>+			/**</div><div class='add'>+			 * DOC: PIE handling</div><div class='add'>+			 *</div><div class='add'>+			 * There are effectively two types of ET_DYN ELF</div><div class='add'>+			 * binaries: programs (i.e. PIE: ET_DYN with</div><div class='add'>+			 * PT_INTERP) and loaders (i.e. static PIE: ET_DYN</div><div class='add'>+			 * without PT_INTERP, usually the ELF interpreter</div><div class='add'>+			 * itself). Loaders must be loaded away from programs</div><div class='add'>+			 * since the program may otherwise collide with the</div><div class='add'>+			 * loader (especially for ET_EXEC which does not have</div><div class='add'>+			 * a randomized position).</div><div class='add'>+			 *</div><div class='add'>+			 * For example, to handle invocations of</div><div class='ctx'> 			 * "./ld.so someprog" to test out a new version of</div><div class='ctx'> 			 * the loader, the subsequent program that the</div><div class='ctx'> 			 * loader loads must avoid the loader itself, so</div><div class='hunk'>@@ -1082,17 +1131,49 @@ out_free_interp:</div><div class='ctx'> 			 * ELF_ET_DYN_BASE and loaders are loaded into the</div><div class='ctx'> 			 * independently randomized mmap region (0 load_bias</div><div class='ctx'> 			 * without MAP_FIXED nor MAP_FIXED_NOREPLACE).</div><div class='add'>+			 *</div><div class='add'>+			 * See below for "brk" handling details, which is</div><div class='add'>+			 * also affected by program vs loader and ASLR.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (interpreter) {</div><div class='add'>+				/* On ET_DYN with PT_INTERP, we do the ASLR. */</div><div class='ctx'> 				load_bias = ELF_ET_DYN_BASE;</div><div class='ctx'> 				if (current-&gt;flags &amp; PF_RANDOMIZE)</div><div class='ctx'> 					load_bias += arch_mmap_rnd();</div><div class='del'>-				alignment = maximum_alignment(elf_phdata, elf_ex-&gt;e_phnum);</div><div class='add'>+				/* Adjust alignment as requested. */</div><div class='ctx'> 				if (alignment)</div><div class='ctx'> 					load_bias &amp;= ~(alignment - 1);</div><div class='ctx'> 				elf_flags |= MAP_FIXED_NOREPLACE;</div><div class='del'>-			} else</div><div class='del'>-				load_bias = 0;</div><div class='add'>+			} else {</div><div class='add'>+				/*</div><div class='add'>+				 * For ET_DYN without PT_INTERP, we rely on</div><div class='add'>+				 * the architectures's (potentially ASLR) mmap</div><div class='add'>+				 * base address (via a load_bias of 0).</div><div class='add'>+				 *</div><div class='add'>+				 * When a large alignment is requested, we</div><div class='add'>+				 * must do the allocation at address "0" right</div><div class='add'>+				 * now to discover where things will load so</div><div class='add'>+				 * that we can adjust the resulting alignment.</div><div class='add'>+				 * In this case (load_bias != 0), we can use</div><div class='add'>+				 * MAP_FIXED_NOREPLACE to make sure the mapping</div><div class='add'>+				 * doesn't collide with anything.</div><div class='add'>+				 */</div><div class='add'>+				if (alignment &gt; ELF_MIN_ALIGN) {</div><div class='add'>+					load_bias = elf_load(bprm-&gt;file, 0, elf_ppnt,</div><div class='add'>+							     elf_prot, elf_flags, total_size);</div><div class='add'>+					if (BAD_ADDR(load_bias)) {</div><div class='add'>+						retval = IS_ERR_VALUE(load_bias) ?</div><div class='add'>+							 PTR_ERR((void*)load_bias) : -EINVAL;</div><div class='add'>+						goto out_free_dentry;</div><div class='add'>+					}</div><div class='add'>+					vm_munmap(load_bias, total_size);</div><div class='add'>+					/* Adjust alignment as requested. */</div><div class='add'>+					if (alignment)</div><div class='add'>+						load_bias &amp;= ~(alignment - 1);</div><div class='add'>+					elf_flags |= MAP_FIXED_NOREPLACE;</div><div class='add'>+				} else</div><div class='add'>+					load_bias = 0;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Since load_bias is used for all subsequent loading</div><div class='hunk'>@@ -1102,31 +1183,6 @@ out_free_interp:</div><div class='ctx'> 			 * is then page aligned.</div><div class='ctx'> 			 */</div><div class='ctx'> 			load_bias = ELF_PAGESTART(load_bias - vaddr);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Calculate the entire size of the ELF mapping</div><div class='del'>-			 * (total_size), used for the initial mapping,</div><div class='del'>-			 * due to load_addr_set which is set to true later</div><div class='del'>-			 * once the initial mapping is performed.</div><div class='del'>-			 *</div><div class='del'>-			 * Note that this is only sensible when the LOAD</div><div class='del'>-			 * segments are contiguous (or overlapping). If</div><div class='del'>-			 * used for LOADs that are far apart, this would</div><div class='del'>-			 * cause the holes between LOADs to be mapped,</div><div class='del'>-			 * running the risk of having the mapping fail,</div><div class='del'>-			 * as it would be larger than the ELF file itself.</div><div class='del'>-			 *</div><div class='del'>-			 * As a result, only ET_DYN does this, since</div><div class='del'>-			 * some ET_EXEC (e.g. ia64) may have large virtual</div><div class='del'>-			 * memory holes between LOADs.</div><div class='del'>-			 *</div><div class='del'>-			 */</div><div class='del'>-			total_size = total_mapping_size(elf_phdata,</div><div class='del'>-							elf_ex-&gt;e_phnum);</div><div class='del'>-			if (!total_size) {</div><div class='del'>-				retval = -EINVAL;</div><div class='del'>-				goto out_free_dentry;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		error = elf_load(bprm-&gt;file, load_bias + vaddr, elf_ppnt,</div><div class='hunk'>@@ -1194,8 +1250,6 @@ out_free_interp:</div><div class='ctx'> 	start_data += load_bias;</div><div class='ctx'> 	end_data += load_bias;</div><div class='ctx'> </div><div class='del'>-	current-&gt;mm-&gt;start_brk = current-&gt;mm-&gt;brk = ELF_PAGEALIGN(elf_brk);</div><div class='del'>-</div><div class='ctx'> 	if (interpreter) {</div><div class='ctx'> 		elf_entry = load_elf_interp(interp_elf_ex,</div><div class='ctx'> 					    interpreter,</div><div class='hunk'>@@ -1216,7 +1270,7 @@ out_free_interp:</div><div class='ctx'> 		}</div><div class='ctx'> 		reloc_func_desc = interp_load_addr;</div><div class='ctx'> </div><div class='del'>-		allow_write_access(interpreter);</div><div class='add'>+		exe_file_allow_write_access(interpreter);</div><div class='ctx'> 		fput(interpreter);</div><div class='ctx'> </div><div class='ctx'> 		kfree(interp_elf_ex);</div><div class='hunk'>@@ -1251,24 +1305,46 @@ out_free_interp:</div><div class='ctx'> 	mm-&gt;end_data = end_data;</div><div class='ctx'> 	mm-&gt;start_stack = bprm-&gt;p;</div><div class='ctx'> </div><div class='del'>-	if ((current-&gt;flags &amp; PF_RANDOMIZE) &amp;&amp; (randomize_va_space &gt; 1)) {</div><div class='add'>+	elf_coredump_set_mm_eflags(mm, elf_ex-&gt;e_flags);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * DOC: "brk" handling</div><div class='add'>+	 *</div><div class='add'>+	 * For architectures with ELF randomization, when executing a</div><div class='add'>+	 * loader directly (i.e. static PIE: ET_DYN without PT_INTERP),</div><div class='add'>+	 * move the brk area out of the mmap region and into the unused</div><div class='add'>+	 * ELF_ET_DYN_BASE region. Since "brk" grows up it may collide</div><div class='add'>+	 * early with the stack growing down or other regions being put</div><div class='add'>+	 * into the mmap region by the kernel (e.g. vdso).</div><div class='add'>+	 *</div><div class='add'>+	 * In the CONFIG_COMPAT_BRK case, though, everything is turned</div><div class='add'>+	 * off because we're not allowed to move the brk at all.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_COMPAT_BRK) &amp;&amp;</div><div class='add'>+	    IS_ENABLED(CONFIG_ARCH_HAS_ELF_RANDOMIZE) &amp;&amp;</div><div class='add'>+	    elf_ex-&gt;e_type == ET_DYN &amp;&amp; !interpreter) {</div><div class='add'>+		elf_brk = ELF_ET_DYN_BASE;</div><div class='add'>+		/* This counts as moving the brk, so let brk(2) know. */</div><div class='add'>+		brk_moved = true;</div><div class='add'>+	}</div><div class='add'>+	mm-&gt;start_brk = mm-&gt;brk = ELF_PAGEALIGN(elf_brk);</div><div class='add'>+</div><div class='add'>+	if ((current-&gt;flags &amp; PF_RANDOMIZE) &amp;&amp; snapshot_randomize_va_space &gt; 1) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * For architectures with ELF randomization, when executing</div><div class='del'>-		 * a loader directly (i.e. no interpreter listed in ELF</div><div class='del'>-		 * headers), move the brk area out of the mmap region</div><div class='del'>-		 * (since it grows up, and may collide early with the stack</div><div class='del'>-		 * growing down), and into the unused ELF_ET_DYN_BASE region.</div><div class='add'>+		 * If we didn't move the brk to ELF_ET_DYN_BASE (above),</div><div class='add'>+		 * leave a gap between .bss and brk.</div><div class='ctx'> 		 */</div><div class='del'>-		if (IS_ENABLED(CONFIG_ARCH_HAS_ELF_RANDOMIZE) &amp;&amp;</div><div class='del'>-		    elf_ex-&gt;e_type == ET_DYN &amp;&amp; !interpreter) {</div><div class='del'>-			mm-&gt;brk = mm-&gt;start_brk = ELF_ET_DYN_BASE;</div><div class='del'>-		}</div><div class='add'>+		if (!brk_moved)</div><div class='add'>+			mm-&gt;brk = mm-&gt;start_brk = mm-&gt;brk + PAGE_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		mm-&gt;brk = mm-&gt;start_brk = arch_randomize_brk(mm);</div><div class='add'>+		brk_moved = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef compat_brk_randomized</div><div class='add'>+	if (brk_moved)</div><div class='ctx'> 		current-&gt;brk_randomized = 1;</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (current-&gt;personality &amp; MMAP_PAGE_ZERO) {</div><div class='ctx'> 		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,</div><div class='hunk'>@@ -1277,6 +1353,11 @@ out_free_interp:</div><div class='ctx'> 		   emulate the SVr4 behavior. Sigh. */</div><div class='ctx'> 		error = vm_mmap(NULL, 0, PAGE_SIZE, PROT_READ | PROT_EXEC,</div><div class='ctx'> 				MAP_FIXED | MAP_PRIVATE, 0);</div><div class='add'>+</div><div class='add'>+		retval = do_mseal(0, PAGE_SIZE, 0);</div><div class='add'>+		if (retval)</div><div class='add'>+			pr_warn_ratelimited("pid=%d, couldn't seal address 0, ret=%d.\n",</div><div class='add'>+					    task_pid_nr(current), retval);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	regs = current_pt_regs();</div><div class='hunk'>@@ -1305,7 +1386,7 @@ out_free_dentry:</div><div class='ctx'> 	kfree(interp_elf_ex);</div><div class='ctx'> 	kfree(interp_elf_phdata);</div><div class='ctx'> out_free_file:</div><div class='del'>-	allow_write_access(interpreter);</div><div class='add'>+	exe_file_allow_write_access(interpreter);</div><div class='ctx'> 	if (interpreter)</div><div class='ctx'> 		fput(interpreter);</div><div class='ctx'> out_free_ph:</div><div class='hunk'>@@ -1313,75 +1394,6 @@ out_free_ph:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USELIB</div><div class='del'>-/* This is really simpleminded and specialized - we are loading an</div><div class='del'>-   a.out library that is given an ELF header. */</div><div class='del'>-static int load_elf_library(struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct elf_phdr *elf_phdata;</div><div class='del'>-	struct elf_phdr *eppnt;</div><div class='del'>-	int retval, error, i, j;</div><div class='del'>-	struct elfhdr elf_ex;</div><div class='del'>-</div><div class='del'>-	error = -ENOEXEC;</div><div class='del'>-	retval = elf_read(file, &amp;elf_ex, sizeof(elf_ex), 0);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (memcmp(elf_ex.e_ident, ELFMAG, SELFMAG) != 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* First of all, some simple consistency checks */</div><div class='del'>-	if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum &gt; 2 ||</div><div class='del'>-	    !elf_check_arch(&amp;elf_ex) || !file-&gt;f_op-&gt;mmap)</div><div class='del'>-		goto out;</div><div class='del'>-	if (elf_check_fdpic(&amp;elf_ex))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Now read in all of the header information */</div><div class='del'>-</div><div class='del'>-	j = sizeof(struct elf_phdr) * elf_ex.e_phnum;</div><div class='del'>-	/* j &lt; ELF_MIN_ALIGN because elf_ex.e_phnum &lt;= 2 */</div><div class='del'>-</div><div class='del'>-	error = -ENOMEM;</div><div class='del'>-	elf_phdata = kmalloc(j, GFP_KERNEL);</div><div class='del'>-	if (!elf_phdata)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	eppnt = elf_phdata;</div><div class='del'>-	error = -ENOEXEC;</div><div class='del'>-	retval = elf_read(file, eppnt, j, elf_ex.e_phoff);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto out_free_ph;</div><div class='del'>-</div><div class='del'>-	for (j = 0, i = 0; i&lt;elf_ex.e_phnum; i++)</div><div class='del'>-		if ((eppnt + i)-&gt;p_type == PT_LOAD)</div><div class='del'>-			j++;</div><div class='del'>-	if (j != 1)</div><div class='del'>-		goto out_free_ph;</div><div class='del'>-</div><div class='del'>-	while (eppnt-&gt;p_type != PT_LOAD)</div><div class='del'>-		eppnt++;</div><div class='del'>-</div><div class='del'>-	/* Now use mmap to map the library into memory. */</div><div class='del'>-	error = elf_load(file, ELF_PAGESTART(eppnt-&gt;p_vaddr),</div><div class='del'>-			eppnt,</div><div class='del'>-			PROT_READ | PROT_WRITE | PROT_EXEC,</div><div class='del'>-			MAP_FIXED_NOREPLACE | MAP_PRIVATE,</div><div class='del'>-			0);</div><div class='del'>-</div><div class='del'>-	if (error != ELF_PAGESTART(eppnt-&gt;p_vaddr))</div><div class='del'>-		goto out_free_ph;</div><div class='del'>-</div><div class='del'>-	error = 0;</div><div class='del'>-</div><div class='del'>-out_free_ph:</div><div class='del'>-	kfree(elf_phdata);</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-#endif /* #ifdef CONFIG_USELIB */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_ELF_CORE</div><div class='ctx'> /*</div><div class='ctx'>  * ELF core dumper</div><div class='hunk'>@@ -1455,8 +1467,8 @@ static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)</div><div class='ctx'> 	phdr-&gt;p_align = 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fill_note(struct memelfnote *note, const char *name, int type,</div><div class='del'>-		unsigned int sz, void *data)</div><div class='add'>+static void __fill_note(struct memelfnote *note, const char *name, int type,</div><div class='add'>+			unsigned int sz, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	note-&gt;name = name;</div><div class='ctx'> 	note-&gt;type = type;</div><div class='hunk'>@@ -1464,6 +1476,9 @@ static void fill_note(struct memelfnote *note, const char *name, int type,</div><div class='ctx'> 	note-&gt;data = data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define fill_note(note, type, sz, data) \</div><div class='add'>+	__fill_note(note, NN_ ## type, NT_ ## type, sz, data)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * fill up all the fields in prstatus from the given task struct, except</div><div class='ctx'>  * registers which need to be filled up separately.</div><div class='hunk'>@@ -1554,17 +1569,16 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)</div><div class='ctx'> 	do</div><div class='ctx'> 		i += 2;</div><div class='ctx'> 	while (auxv[i - 2] != AT_NULL);</div><div class='del'>-	fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);</div><div class='add'>+	fill_note(note, AUXV, i * sizeof(elf_addr_t), auxv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,</div><div class='ctx'> 		const kernel_siginfo_t *siginfo)</div><div class='ctx'> {</div><div class='ctx'> 	copy_siginfo_to_external(csigdata, siginfo);</div><div class='del'>-	fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);</div><div class='add'>+	fill_note(note, SIGINFO, sizeof(*csigdata), csigdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MAX_FILE_NOTE_SIZE (4*1024*1024)</div><div class='ctx'> /*</div><div class='ctx'>  * Format of NT_FILE note:</div><div class='ctx'>  *</div><div class='hunk'>@@ -1592,8 +1606,12 @@ static int fill_files_note(struct memelfnote *note, struct coredump_params *cprm</div><div class='ctx'> </div><div class='ctx'> 	names_ofs = (2 + 3 * count) * sizeof(data[0]);</div><div class='ctx'>  alloc:</div><div class='del'>-	if (size &gt;= MAX_FILE_NOTE_SIZE) /* paranoia check */</div><div class='add'>+	/* paranoia check */</div><div class='add'>+	if (size &gt;= core_file_note_size_limit) {</div><div class='add'>+		pr_warn_once("coredump Note size too large: %u (does kernel.core_file_note_size_limit sysctl need adjustment?\n",</div><div class='add'>+			      size);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	size = round_up(size, PAGE_SIZE);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * "size" can be 0 here legitimately.</div><div class='hunk'>@@ -1654,7 +1672,7 @@ static int fill_files_note(struct memelfnote *note, struct coredump_params *cprm</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = name_curpos - (char *)data;</div><div class='del'>-	fill_note(note, "CORE", NT_FILE, size, data);</div><div class='add'>+	fill_note(note, FILE, size, data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1715,8 +1733,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,</div><div class='ctx'> 	regset_get(t-&gt;task, &amp;view-&gt;regsets[0],</div><div class='ctx'> 		   sizeof(t-&gt;prstatus.pr_reg), &amp;t-&gt;prstatus.pr_reg);</div><div class='ctx'> </div><div class='del'>-	fill_note(&amp;t-&gt;notes[0], "CORE", NT_PRSTATUS,</div><div class='del'>-		  PRSTATUS_SIZE, &amp;t-&gt;prstatus);</div><div class='add'>+	fill_note(&amp;t-&gt;notes[0], PRSTATUS, PRSTATUS_SIZE, &amp;t-&gt;prstatus);</div><div class='ctx'> 	info-&gt;size += notesize(&amp;t-&gt;notes[0]);</div><div class='ctx'> </div><div class='ctx'> 	do_thread_regset_writeback(t-&gt;task, &amp;view-&gt;regsets[0]);</div><div class='hunk'>@@ -1729,6 +1746,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,</div><div class='ctx'> 	for (view_iter = 1; view_iter &lt; view-&gt;n; ++view_iter) {</div><div class='ctx'> 		const struct user_regset *regset = &amp;view-&gt;regsets[view_iter];</div><div class='ctx'> 		int note_type = regset-&gt;core_note_type;</div><div class='add'>+		const char *note_name = regset-&gt;core_note_name;</div><div class='ctx'> 		bool is_fpreg = note_type == NT_PRFPREG;</div><div class='ctx'> 		void *data;</div><div class='ctx'> 		int ret;</div><div class='hunk'>@@ -1749,8 +1767,16 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,</div><div class='ctx'> 		if (is_fpreg)</div><div class='ctx'> 			SET_PR_FPVALID(&amp;t-&gt;prstatus);</div><div class='ctx'> </div><div class='del'>-		fill_note(&amp;t-&gt;notes[note_iter], is_fpreg ? "CORE" : "LINUX",</div><div class='del'>-			  note_type, ret, data);</div><div class='add'>+		/* There should be a note name, but if not, guess: */</div><div class='add'>+		if (WARN_ON_ONCE(!note_name))</div><div class='add'>+			note_name = "LINUX";</div><div class='add'>+		else</div><div class='add'>+			/* Warn on non-legacy-compatible names, for now. */</div><div class='add'>+			WARN_ON_ONCE(strcmp(note_name,</div><div class='add'>+					    is_fpreg ? "CORE" : "LINUX"));</div><div class='add'>+</div><div class='add'>+		__fill_note(&amp;t-&gt;notes[note_iter], note_name, note_type,</div><div class='add'>+			    ret, data);</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;size += notesize(&amp;t-&gt;notes[note_iter]);</div><div class='ctx'> 		note_iter++;</div><div class='hunk'>@@ -1769,8 +1795,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,</div><div class='ctx'> 	fill_prstatus(&amp;t-&gt;prstatus.common, p, signr);</div><div class='ctx'> 	elf_core_copy_task_regs(p, &amp;t-&gt;prstatus.pr_reg);</div><div class='ctx'> </div><div class='del'>-	fill_note(&amp;t-&gt;notes[0], "CORE", NT_PRSTATUS, sizeof(t-&gt;prstatus),</div><div class='del'>-		  &amp;(t-&gt;prstatus));</div><div class='add'>+	fill_note(&amp;t-&gt;notes[0], PRSTATUS, sizeof(t-&gt;prstatus), &amp;t-&gt;prstatus);</div><div class='ctx'> 	info-&gt;size += notesize(&amp;t-&gt;notes[0]);</div><div class='ctx'> </div><div class='ctx'> 	fpu = kzalloc(sizeof(elf_fpregset_t), GFP_KERNEL);</div><div class='hunk'>@@ -1780,7 +1805,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;prstatus.pr_fpvalid = 1;</div><div class='del'>-	fill_note(&amp;t-&gt;notes[1], "CORE", NT_PRFPREG, sizeof(*fpu), fpu);</div><div class='add'>+	fill_note(&amp;t-&gt;notes[1], PRFPREG, sizeof(*fpu), fpu);</div><div class='ctx'> 	info-&gt;size += notesize(&amp;t-&gt;notes[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1796,11 +1821,13 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,</div><div class='ctx'> 	struct elf_thread_core_info *t;</div><div class='ctx'> 	struct elf_prpsinfo *psinfo;</div><div class='ctx'> 	struct core_thread *ct;</div><div class='add'>+	u16 machine;</div><div class='add'>+	u32 flags;</div><div class='ctx'> </div><div class='ctx'> 	psinfo = kmalloc(sizeof(*psinfo), GFP_KERNEL);</div><div class='ctx'> 	if (!psinfo)</div><div class='ctx'> 		return 0;</div><div class='del'>-	fill_note(&amp;info-&gt;psinfo, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='add'>+	fill_note(&amp;info-&gt;psinfo, PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='ctx'> </div><div class='ctx'> #ifdef CORE_DUMP_USE_REGSET</div><div class='ctx'> 	view = task_user_regset_view(dump_task);</div><div class='hunk'>@@ -1823,30 +1850,37 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Initialize the ELF file header.</div><div class='del'>-	 */</div><div class='del'>-	fill_elf_header(elf, phdrs,</div><div class='del'>-			view-&gt;e_machine, view-&gt;e_flags);</div><div class='add'>+	machine = view-&gt;e_machine;</div><div class='add'>+	flags = view-&gt;e_flags;</div><div class='ctx'> #else</div><div class='ctx'> 	view = NULL;</div><div class='ctx'> 	info-&gt;thread_notes = 2;</div><div class='del'>-	fill_elf_header(elf, phdrs, ELF_ARCH, ELF_CORE_EFLAGS);</div><div class='add'>+	machine = ELF_ARCH;</div><div class='add'>+	flags = ELF_CORE_EFLAGS;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Override ELF e_flags with value taken from process,</div><div class='add'>+	 * if arch needs that.</div><div class='add'>+	 */</div><div class='add'>+	flags = elf_coredump_get_mm_eflags(dump_task-&gt;mm, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the ELF file header.</div><div class='add'>+	 */</div><div class='add'>+	fill_elf_header(elf, phdrs, machine, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Allocate a structure for each thread.</div><div class='ctx'> 	 */</div><div class='del'>-	info-&gt;thread = kzalloc(offsetof(struct elf_thread_core_info,</div><div class='del'>-				     notes[info-&gt;thread_notes]),</div><div class='del'>-			    GFP_KERNEL);</div><div class='add'>+	info-&gt;thread = kzalloc(struct_size(info-&gt;thread, notes, info-&gt;thread_notes),</div><div class='add'>+			       GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!info-&gt;thread))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;thread-&gt;task = dump_task;</div><div class='ctx'> 	for (ct = dump_task-&gt;signal-&gt;core_state-&gt;dumper.next; ct; ct = ct-&gt;next) {</div><div class='del'>-		t = kzalloc(offsetof(struct elf_thread_core_info,</div><div class='del'>-				     notes[info-&gt;thread_notes]),</div><div class='add'>+		t = kzalloc(struct_size(t, notes, info-&gt;thread_notes),</div><div class='ctx'> 			    GFP_KERNEL);</div><div class='ctx'> 		if (unlikely(!t))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1928,7 +1962,7 @@ static void free_note_info(struct elf_note_info *info)</div><div class='ctx'> 		threads = t-&gt;next;</div><div class='ctx'> 		WARN_ON(t-&gt;notes[0].data &amp;&amp; t-&gt;notes[0].data != &amp;t-&gt;prstatus);</div><div class='ctx'> 		for (i = 1; i &lt; info-&gt;thread_notes; ++i)</div><div class='del'>-			kfree(t-&gt;notes[i].data);</div><div class='add'>+			kvfree(t-&gt;notes[i].data);</div><div class='ctx'> 		kfree(t);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(info-&gt;psinfo.data);</div><div class='hunk'>@@ -2000,7 +2034,7 @@ static int elf_core_dump(struct coredump_params *cprm)</div><div class='ctx'> 	{</div><div class='ctx'> 		size_t sz = info.size;</div><div class='ctx'> </div><div class='del'>-		/* For cell spufs */</div><div class='add'>+		/* For cell spufs and x86 xstate */</div><div class='ctx'> 		sz += elf_coredump_extra_notes_size();</div><div class='ctx'> </div><div class='ctx'> 		phdr4note = kmalloc(sizeof(*phdr4note), GFP_KERNEL);</div><div class='hunk'>@@ -2064,7 +2098,7 @@ static int elf_core_dump(struct coredump_params *cprm)</div><div class='ctx'> 	if (!write_note_info(&amp;info, cprm))</div><div class='ctx'> 		goto end_coredump;</div><div class='ctx'> </div><div class='del'>-	/* For cell spufs */</div><div class='add'>+	/* For cell spufs and x86 xstate */</div><div class='ctx'> 	if (elf_coredump_extra_notes_write(cprm))</div><div class='ctx'> 		goto end_coredump;</div><div class='ctx'> </div><div class='hunk'>@@ -2111,5 +2145,5 @@ core_initcall(init_elf_binfmt);</div><div class='ctx'> module_exit(exit_elf_binfmt);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BINFMT_ELF_KUNIT_TEST</div><div class='del'>-#include "binfmt_elf_test.c"</div><div class='add'>+#include "tests/binfmt_elf_kunit.c"</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c<br/>index fefc642541cb..48fd2de3bca0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/binfmt_elf_fdpic.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_elf_fdpic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/binfmt_elf_fdpic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/binfmt_elf_fdpic.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static int is_elf(struct elfhdr *hdr, struct file *file)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (!elf_check_arch(hdr))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!file-&gt;f_op-&gt;mmap)</div><div class='add'>+	if (!can_mmap_file(file))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -320,7 +320,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)</div><div class='ctx'> 	else</div><div class='ctx'> 		executable_stack = EXSTACK_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	if (stack_size == 0) {</div><div class='add'>+	if (stack_size == 0 &amp;&amp; interp_params.flags &amp; ELF_FDPIC_FLAG_PRESENT) {</div><div class='ctx'> 		stack_size = interp_params.stack_size;</div><div class='ctx'> 		if (interp_params.flags &amp; ELF_FDPIC_FLAG_EXEC_STACK)</div><div class='ctx'> 			executable_stack = EXSTACK_ENABLE_X;</div><div class='hunk'>@@ -394,7 +394,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		allow_write_access(interpreter);</div><div class='add'>+		exe_file_allow_write_access(interpreter);</div><div class='ctx'> 		fput(interpreter);</div><div class='ctx'> 		interpreter = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -467,7 +467,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	if (interpreter) {</div><div class='del'>-		allow_write_access(interpreter);</div><div class='add'>+		exe_file_allow_write_access(interpreter);</div><div class='ctx'> 		fput(interpreter);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(interpreter_name);</div><div class='hunk'>@@ -505,8 +505,9 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	char *k_platform, *k_base_platform;</div><div class='ctx'> 	char __user *u_platform, *u_base_platform, *p;</div><div class='ctx'> 	int loop;</div><div class='del'>-	int nr;	/* reset for each csp adjustment */</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='add'>+	int ei_index;</div><div class='add'>+	elf_addr_t *elf_info;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	/* In some cases (e.g. Hyper-Threading), we want to avoid L1 evictions</div><div class='hunk'>@@ -591,6 +592,9 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> </div><div class='ctx'> 	if (bprm-&gt;have_execfd)</div><div class='ctx'> 		nitems++;</div><div class='add'>+#ifdef ELF_HWCAP2</div><div class='add'>+	nitems++;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	csp = sp;</div><div class='ctx'> 	sp -= nitems * 2 * sizeof(unsigned long);</div><div class='hunk'>@@ -601,48 +605,34 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	csp -= sp &amp; 15UL;</div><div class='ctx'> 	sp -= sp &amp; 15UL;</div><div class='ctx'> </div><div class='del'>-	/* put the ELF interpreter info on the stack */</div><div class='del'>-#define NEW_AUX_ENT(id, val)						\</div><div class='del'>-	do {								\</div><div class='del'>-		struct { unsigned long _id, _val; } __user *ent, v;	\</div><div class='del'>-									\</div><div class='del'>-		ent = (void __user *) csp;				\</div><div class='del'>-		v._id = (id);						\</div><div class='del'>-		v._val = (val);						\</div><div class='del'>-		if (copy_to_user(ent + nr, &amp;v, sizeof(v)))		\</div><div class='del'>-			return -EFAULT;					\</div><div class='del'>-		nr++;							\</div><div class='add'>+	/* Create the ELF interpreter info */</div><div class='add'>+	elf_info = (elf_addr_t *)mm-&gt;saved_auxv;</div><div class='add'>+	/* update AT_VECTOR_SIZE_BASE if the number of NEW_AUX_ENT() changes */</div><div class='add'>+#define NEW_AUX_ENT(id, val) \</div><div class='add'>+	do { \</div><div class='add'>+		*elf_info++ = id; \</div><div class='add'>+		*elf_info++ = val; \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-	nr = 0;</div><div class='del'>-	csp -= 2 * sizeof(unsigned long);</div><div class='del'>-	NEW_AUX_ENT(AT_NULL, 0);</div><div class='del'>-	if (k_platform) {</div><div class='del'>-		nr = 0;</div><div class='del'>-		csp -= 2 * sizeof(unsigned long);</div><div class='del'>-		NEW_AUX_ENT(AT_PLATFORM,</div><div class='del'>-			    (elf_addr_t) (unsigned long) u_platform);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k_base_platform) {</div><div class='del'>-		nr = 0;</div><div class='del'>-		csp -= 2 * sizeof(unsigned long);</div><div class='del'>-		NEW_AUX_ENT(AT_BASE_PLATFORM,</div><div class='del'>-			    (elf_addr_t) (unsigned long) u_base_platform);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bprm-&gt;have_execfd) {</div><div class='del'>-		nr = 0;</div><div class='del'>-		csp -= 2 * sizeof(unsigned long);</div><div class='del'>-		NEW_AUX_ENT(AT_EXECFD, bprm-&gt;execfd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr = 0;</div><div class='del'>-	csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);</div><div class='add'>+#ifdef ARCH_DLINFO</div><div class='add'>+	/*</div><div class='add'>+	 * ARCH_DLINFO must come first so PPC can do its special alignment of</div><div class='add'>+	 * AUXV.</div><div class='add'>+	 * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in</div><div class='add'>+	 * ARCH_DLINFO changes</div><div class='add'>+	 */</div><div class='add'>+	ARCH_DLINFO;</div><div class='add'>+#endif</div><div class='ctx'> 	NEW_AUX_ENT(AT_HWCAP,	ELF_HWCAP);</div><div class='ctx'> #ifdef ELF_HWCAP2</div><div class='ctx'> 	NEW_AUX_ENT(AT_HWCAP2,	ELF_HWCAP2);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef ELF_HWCAP3</div><div class='add'>+	NEW_AUX_ENT(AT_HWCAP3,	ELF_HWCAP3);</div><div class='add'>+#endif</div><div class='add'>+#ifdef ELF_HWCAP4</div><div class='add'>+	NEW_AUX_ENT(AT_HWCAP4,	ELF_HWCAP4);</div><div class='add'>+#endif</div><div class='ctx'> 	NEW_AUX_ENT(AT_PAGESZ,	PAGE_SIZE);</div><div class='ctx'> 	NEW_AUX_ENT(AT_CLKTCK,	CLOCKS_PER_SEC);</div><div class='ctx'> 	NEW_AUX_ENT(AT_PHDR,	exec_params-&gt;ph_addr);</div><div class='hunk'>@@ -659,17 +649,29 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	NEW_AUX_ENT(AT_EGID,	(elf_addr_t) from_kgid_munged(cred-&gt;user_ns, cred-&gt;egid));</div><div class='ctx'> 	NEW_AUX_ENT(AT_SECURE,	bprm-&gt;secureexec);</div><div class='ctx'> 	NEW_AUX_ENT(AT_EXECFN,	bprm-&gt;exec);</div><div class='add'>+	if (k_platform)</div><div class='add'>+		NEW_AUX_ENT(AT_PLATFORM,</div><div class='add'>+			    (elf_addr_t)(unsigned long)u_platform);</div><div class='add'>+	if (k_base_platform)</div><div class='add'>+		NEW_AUX_ENT(AT_BASE_PLATFORM,</div><div class='add'>+			    (elf_addr_t)(unsigned long)u_base_platform);</div><div class='add'>+	if (bprm-&gt;have_execfd)</div><div class='add'>+		NEW_AUX_ENT(AT_EXECFD, bprm-&gt;execfd);</div><div class='add'>+#undef NEW_AUX_ENT</div><div class='add'>+	/* AT_NULL is zero; clear the rest too */</div><div class='add'>+	memset(elf_info, 0, (char *)mm-&gt;saved_auxv +</div><div class='add'>+	       sizeof(mm-&gt;saved_auxv) - (char *)elf_info);</div><div class='ctx'> </div><div class='del'>-#ifdef ARCH_DLINFO</div><div class='del'>-	nr = 0;</div><div class='del'>-	csp -= AT_VECTOR_SIZE_ARCH * 2 * sizeof(unsigned long);</div><div class='add'>+	/* And advance past the AT_NULL entry.  */</div><div class='add'>+	elf_info += 2;</div><div class='ctx'> </div><div class='del'>-	/* ARCH_DLINFO must come last so platform specific code can enforce</div><div class='del'>-	 * special alignment requirements on the AUXV if necessary (eg. PPC).</div><div class='del'>-	 */</div><div class='del'>-	ARCH_DLINFO;</div><div class='del'>-#endif</div><div class='del'>-#undef NEW_AUX_ENT</div><div class='add'>+	ei_index = elf_info - (elf_addr_t *)mm-&gt;saved_auxv;</div><div class='add'>+	csp -= ei_index * sizeof(elf_addr_t);</div><div class='add'>+</div><div class='add'>+	/* Put the elf_info on the stack in the right place.  */</div><div class='add'>+	if (copy_to_user((void __user *)csp, mm-&gt;saved_auxv,</div><div class='add'>+			 ei_index * sizeof(elf_addr_t)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate room for argv[] and envv[] */</div><div class='ctx'> 	csp -= (bprm-&gt;envc + 1) * sizeof(elf_caddr_t);</div><div class='hunk'>@@ -1022,7 +1024,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 	/* deal with each load segment separately */</div><div class='ctx'> 	phdr = params-&gt;phdrs;</div><div class='ctx'> 	for (loop = 0; loop &lt; params-&gt;hdr.e_phnum; loop++, phdr++) {</div><div class='del'>-		unsigned long maddr, disp, excess, excess1;</div><div class='add'>+		unsigned long maddr, disp, excess;</div><div class='ctx'> 		int prot = 0, flags;</div><div class='ctx'> </div><div class='ctx'> 		if (phdr-&gt;p_type != PT_LOAD)</div><div class='hunk'>@@ -1118,9 +1120,10 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 		 *   extant in the file</div><div class='ctx'> 		 */</div><div class='ctx'> 		excess = phdr-&gt;p_memsz - phdr-&gt;p_filesz;</div><div class='del'>-		excess1 = PAGE_SIZE - ((maddr + phdr-&gt;p_filesz) &amp; ~PAGE_MASK);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='add'>+		unsigned long excess1</div><div class='add'>+			= PAGE_SIZE - ((maddr + phdr-&gt;p_filesz) &amp; ~PAGE_MASK);</div><div class='ctx'> 		if (excess &gt; excess1) {</div><div class='ctx'> 			unsigned long xaddr = maddr + phdr-&gt;p_filesz + excess1;</div><div class='ctx'> 			unsigned long xmaddr;</div><div class='hunk'>@@ -1272,8 +1275,8 @@ static inline void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offs</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void fill_note(struct memelfnote *note, const char *name, int type,</div><div class='del'>-		unsigned int sz, void *data)</div><div class='add'>+static inline void __fill_note(struct memelfnote *note, const char *name, int type,</div><div class='add'>+			       unsigned int sz, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	note-&gt;name = name;</div><div class='ctx'> 	note-&gt;type = type;</div><div class='hunk'>@@ -1282,6 +1285,9 @@ static inline void fill_note(struct memelfnote *note, const char *name, int type</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define fill_note(note, type, sz, data) \</div><div class='add'>+	__fill_note(note, NN_ ## type, NT_ ## type, sz, data)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * fill up all the fields in prstatus from the given task struct, except</div><div class='ctx'>  * registers which need to be filled up separately.</div><div class='hunk'>@@ -1359,7 +1365,7 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,</div><div class='ctx'> 	SET_UID(psinfo-&gt;pr_uid, from_kuid_munged(cred-&gt;user_ns, cred-&gt;uid));</div><div class='ctx'> 	SET_GID(psinfo-&gt;pr_gid, from_kgid_munged(cred-&gt;user_ns, cred-&gt;gid));</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	strncpy(psinfo-&gt;pr_fname, p-&gt;comm, sizeof(psinfo-&gt;pr_fname));</div><div class='add'>+	get_task_comm(psinfo-&gt;pr_fname, p);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1395,8 +1401,7 @@ static struct elf_thread_status *elf_dump_thread_status(long signr, struct task_</div><div class='ctx'> 	regset_get(p, &amp;view-&gt;regsets[0],</div><div class='ctx'> 		   sizeof(t-&gt;prstatus.pr_reg), &amp;t-&gt;prstatus.pr_reg);</div><div class='ctx'> </div><div class='del'>-	fill_note(&amp;t-&gt;notes[0], "CORE", NT_PRSTATUS, sizeof(t-&gt;prstatus),</div><div class='del'>-		  &amp;t-&gt;prstatus);</div><div class='add'>+	fill_note(&amp;t-&gt;notes[0], PRSTATUS, sizeof(t-&gt;prstatus), &amp;t-&gt;prstatus);</div><div class='ctx'> 	t-&gt;num_notes++;</div><div class='ctx'> 	*sz += notesize(&amp;t-&gt;notes[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -1413,8 +1418,7 @@ static struct elf_thread_status *elf_dump_thread_status(long signr, struct task_</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;prstatus.pr_fpvalid) {</div><div class='del'>-		fill_note(&amp;t-&gt;notes[1], "CORE", NT_PRFPREG, sizeof(t-&gt;fpu),</div><div class='del'>-			  &amp;t-&gt;fpu);</div><div class='add'>+		fill_note(&amp;t-&gt;notes[1], PRFPREG, sizeof(t-&gt;fpu), &amp;t-&gt;fpu);</div><div class='ctx'> 		t-&gt;num_notes++;</div><div class='ctx'> 		*sz += notesize(&amp;t-&gt;notes[1]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1528,7 +1532,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	fill_psinfo(psinfo, current-&gt;group_leader, current-&gt;mm);</div><div class='del'>-	fill_note(&amp;psinfo_note, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='add'>+	fill_note(&amp;psinfo_note, PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='ctx'> 	thread_status_size += notesize(&amp;psinfo_note);</div><div class='ctx'> </div><div class='ctx'> 	auxv = (elf_addr_t *) current-&gt;mm-&gt;saved_auxv;</div><div class='hunk'>@@ -1536,7 +1540,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)</div><div class='ctx'> 	do</div><div class='ctx'> 		i += 2;</div><div class='ctx'> 	while (auxv[i - 2] != AT_NULL);</div><div class='del'>-	fill_note(&amp;auxv_note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);</div><div class='add'>+	fill_note(&amp;auxv_note, AUXV, i * sizeof(elf_addr_t), auxv);</div><div class='ctx'> 	thread_status_size += notesize(&amp;auxv_note);</div><div class='ctx'> </div><div class='ctx'> 	offset = sizeof(*elf);				/* ELF header */</div><div class='head'>diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c<br/>index c26545d71d39..b5b5ca1a44f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/binfmt_flat.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_flat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/binfmt_flat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/binfmt_flat.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/flat.h&gt;</div><div class='hunk'>@@ -72,8 +72,10 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET</div><div class='ctx'> #define DATA_START_OFFSET_WORDS		(0)</div><div class='add'>+#define MAX_SHARED_LIBS_UPDATE		(0)</div><div class='ctx'> #else</div><div class='ctx'> #define DATA_START_OFFSET_WORDS		(MAX_SHARED_LIBS)</div><div class='add'>+#define MAX_SHARED_LIBS_UPDATE		(MAX_SHARED_LIBS)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct lib_info {</div><div class='hunk'>@@ -476,7 +478,7 @@ static int load_flat_file(struct linux_binprm *bprm,</div><div class='ctx'> 	 * 28 bits (256 MB) is way more than reasonable in this case.</div><div class='ctx'> 	 * If some top bits are set we have probable binary corruption.</div><div class='ctx'> 	*/</div><div class='del'>-	if ((text_len | data_len | bss_len | stack_len | full_data) &gt;&gt; 28) {</div><div class='add'>+	if ((text_len | data_len | bss_len | stack_len | relocs | full_data) &gt;&gt; 28) {</div><div class='ctx'> 		pr_err("bad header\n");</div><div class='ctx'> 		ret = -ENOEXEC;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -880,7 +882,7 @@ static int load_flat_binary(struct linux_binprm *bprm)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	/* Update data segment pointers for all libraries */</div><div class='del'>-	for (i = 0; i &lt; MAX_SHARED_LIBS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_SHARED_LIBS_UPDATE; i++) {</div><div class='ctx'> 		if (!libinfo.lib_list[i].loaded)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		for (j = 0; j &lt; MAX_SHARED_LIBS; j++) {</div><div class='head'>diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c<br/>index 68fa225f89e5..8cb1a94339b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/binfmt_misc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_misc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/binfmt_misc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/binfmt_misc.c</a></div><div class='hunk'>@@ -675,44 +675,6 @@ static void bm_evict_inode(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * unlink_binfmt_dentry - remove the dentry for the binary type handler</div><div class='del'>- * @dentry: dentry associated with the binary type handler</div><div class='del'>- *</div><div class='del'>- * Do the actual filesystem work to remove a dentry for a registered binary</div><div class='del'>- * type handler. Since binfmt_misc only allows simple files to be created</div><div class='del'>- * directly under the root dentry of the filesystem we ensure that we are</div><div class='del'>- * indeed passed a dentry directly beneath the root dentry, that the inode</div><div class='del'>- * associated with the root dentry is locked, and that it is a regular file we</div><div class='del'>- * are asked to remove.</div><div class='del'>- */</div><div class='del'>-static void unlink_binfmt_dentry(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct dentry *parent = dentry-&gt;d_parent;</div><div class='del'>-	struct inode *inode, *parent_inode;</div><div class='del'>-</div><div class='del'>-	/* All entries are immediate descendants of the root dentry. */</div><div class='del'>-	if (WARN_ON_ONCE(dentry-&gt;d_sb-&gt;s_root != parent))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We only expect to be called on regular files. */</div><div class='del'>-	inode = d_inode(dentry);</div><div class='del'>-	if (WARN_ON_ONCE(!S_ISREG(inode-&gt;i_mode)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The parent inode must be locked. */</div><div class='del'>-	parent_inode = d_inode(parent);</div><div class='del'>-	if (WARN_ON_ONCE(!inode_is_locked(parent_inode)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (simple_positive(dentry)) {</div><div class='del'>-		dget(dentry);</div><div class='del'>-		simple_unlink(parent_inode, dentry);</div><div class='del'>-		d_delete(dentry);</div><div class='del'>-		dput(dentry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * remove_binfmt_handler - remove a binary type handler</div><div class='ctx'>  * @misc: handle to binfmt_misc instance</div><div class='ctx'>  * @e: binary type handler to remove</div><div class='hunk'>@@ -729,7 +691,7 @@ static void remove_binfmt_handler(struct binfmt_misc *misc, Node *e)</div><div class='ctx'> 	write_lock(&amp;misc-&gt;entries_lock);</div><div class='ctx'> 	list_del_init(&amp;e-&gt;list);</div><div class='ctx'> 	write_unlock(&amp;misc-&gt;entries_lock);</div><div class='del'>-	unlink_binfmt_dentry(e-&gt;dentry);</div><div class='add'>+	locked_recursive_removal(e-&gt;dentry, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* /&lt;entry&gt; */</div><div class='hunk'>@@ -772,7 +734,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		/* Delete this handler. */</div><div class='ctx'> 		inode = d_inode(inode-&gt;i_sb-&gt;s_root);</div><div class='del'>-		inode_lock(inode);</div><div class='add'>+		inode_lock_nested(inode, I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In order to add new element or remove elements from the list</div><div class='hunk'>@@ -803,14 +765,41 @@ static const struct file_operations bm_entry_operations = {</div><div class='ctx'> </div><div class='ctx'> /* /register */</div><div class='ctx'> </div><div class='add'>+/* add to filesystem */</div><div class='add'>+static int add_entry(Node *e, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry = simple_start_creating(sb-&gt;s_root, e-&gt;name);</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct binfmt_misc *misc;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='add'>+</div><div class='add'>+	inode = bm_get_inode(sb, S_IFREG | 0644);</div><div class='add'>+	if (unlikely(!inode)) {</div><div class='add'>+		simple_done_creating(dentry);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;e-&gt;users, 1);</div><div class='add'>+	e-&gt;dentry = dentry;</div><div class='add'>+	inode-&gt;i_private = e;</div><div class='add'>+	inode-&gt;i_fop = &amp;bm_entry_operations;</div><div class='add'>+</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+	misc = i_binfmt_misc(inode);</div><div class='add'>+	write_lock(&amp;misc-&gt;entries_lock);</div><div class='add'>+	list_add(&amp;e-&gt;list, &amp;misc-&gt;entries);</div><div class='add'>+	write_unlock(&amp;misc-&gt;entries_lock);</div><div class='add'>+	simple_done_creating(dentry);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t bm_register_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 			       size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	Node *e;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	struct super_block *sb = file_inode(file)-&gt;i_sb;</div><div class='del'>-	struct dentry *root = sb-&gt;s_root, *dentry;</div><div class='del'>-	struct binfmt_misc *misc;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct file *f = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -820,8 +809,6 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 		return PTR_ERR(e);</div><div class='ctx'> </div><div class='ctx'> 	if (e-&gt;flags &amp; MISC_FMT_OPEN_FILE) {</div><div class='del'>-		const struct cred *old_cred;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Now that we support unprivileged binfmt_misc mounts make</div><div class='ctx'> 		 * sure we use the credentials that the register @file was</div><div class='hunk'>@@ -829,9 +816,8 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 		 * didn't matter much as only a privileged process could open</div><div class='ctx'> 		 * the register file.</div><div class='ctx'> 		 */</div><div class='del'>-		old_cred = override_creds(file-&gt;f_cred);</div><div class='del'>-		f = open_exec(e-&gt;interpreter);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		scoped_with_creds(file-&gt;f_cred)</div><div class='add'>+			f = open_exec(e-&gt;interpreter);</div><div class='ctx'> 		if (IS_ERR(f)) {</div><div class='ctx'> 			pr_notice("register: failed to install interpreter file %s\n",</div><div class='ctx'> 				 e-&gt;interpreter);</div><div class='hunk'>@@ -841,42 +827,12 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 		e-&gt;interp_file = f;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_lock(d_inode(root));</div><div class='del'>-	dentry = lookup_one_len(e-&gt;name, root, strlen(e-&gt;name));</div><div class='del'>-	err = PTR_ERR(dentry);</div><div class='del'>-	if (IS_ERR(dentry))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = -EEXIST;</div><div class='del'>-	if (d_really_is_positive(dentry))</div><div class='del'>-		goto out2;</div><div class='del'>-</div><div class='del'>-	inode = bm_get_inode(sb, S_IFREG | 0644);</div><div class='del'>-</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	if (!inode)</div><div class='del'>-		goto out2;</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;e-&gt;users, 1);</div><div class='del'>-	e-&gt;dentry = dget(dentry);</div><div class='del'>-	inode-&gt;i_private = e;</div><div class='del'>-	inode-&gt;i_fop = &amp;bm_entry_operations;</div><div class='del'>-</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	misc = i_binfmt_misc(inode);</div><div class='del'>-	write_lock(&amp;misc-&gt;entries_lock);</div><div class='del'>-	list_add(&amp;e-&gt;list, &amp;misc-&gt;entries);</div><div class='del'>-	write_unlock(&amp;misc-&gt;entries_lock);</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-out2:</div><div class='del'>-	dput(dentry);</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(d_inode(root));</div><div class='del'>-</div><div class='add'>+	err = add_entry(e, sb);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (f)</div><div class='add'>+		if (f) {</div><div class='add'>+			exe_file_allow_write_access(f);</div><div class='ctx'> 			filp_close(f, NULL);</div><div class='add'>+		}</div><div class='ctx'> 		kfree(e);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -922,7 +878,7 @@ static ssize_t bm_status_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		/* Delete all handlers. */</div><div class='ctx'> 		inode = d_inode(file_inode(file)-&gt;i_sb-&gt;s_root);</div><div class='del'>-		inode_lock(inode);</div><div class='add'>+		inode_lock_nested(inode, I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In order to add new element or remove elements from the list</div><div class='hunk'>@@ -1001,7 +957,7 @@ static int bm_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If it turns out that most user namespaces actually want to</div><div class='ctx'> 		 * register their own binary type handler and therefore all</div><div class='del'>-		 * create their own separate binfm_misc mounts we should</div><div class='add'>+		 * create their own separate binfmt_misc mounts we should</div><div class='ctx'> 		 * consider turning this into a kmem cache.</div><div class='ctx'> 		 */</div><div class='ctx'> 		misc = kzalloc(sizeof(struct binfmt_misc), GFP_KERNEL);</div><div class='hunk'>@@ -1066,7 +1022,7 @@ static struct file_system_type bm_fs_type = {</div><div class='ctx'> 	.name		= "binfmt_misc",</div><div class='ctx'> 	.init_fs_context = bm_init_fs_context,</div><div class='ctx'> 	.fs_flags	= FS_USERNS_MOUNT,</div><div class='del'>-	.kill_sb	= kill_litter_super,</div><div class='add'>+	.kill_sb	= kill_anon_super,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("binfmt_misc");</div><div class='ctx'> </div><div class='hunk'>@@ -1086,4 +1042,5 @@ static void __exit exit_misc_binfmt(void)</div><div class='ctx'> </div><div class='ctx'> core_initcall(init_misc_binfmt);</div><div class='ctx'> module_exit(exit_misc_binfmt);</div><div class='add'>+MODULE_DESCRIPTION("Kernel support for miscellaneous binaries");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c<br/>index 1b6625e95958..637daf6e4d45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/binfmt_script.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/binfmt_script.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/binfmt_script.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/binfmt_script.c</a></div><div class='hunk'>@@ -155,4 +155,5 @@ static void __exit exit_script_binfmt(void)</div><div class='ctx'> </div><div class='ctx'> core_initcall(init_script_binfmt);</div><div class='ctx'> module_exit(exit_script_binfmt);</div><div class='add'>+MODULE_DESCRIPTION("Kernel support for scripts starting with #!");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/bpf_fs_kfuncs.c b/fs/bpf_fs_kfuncs.c<br/>new file mode 100644<br/>index 000000000000..5ace2511fec5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/bpf_fs_kfuncs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/bpf_fs_kfuncs.c</a></div><div class='hunk'>@@ -0,0 +1,422 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2024 Google LLC. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/bpf_lsm.h&gt;</div><div class='add'>+#include &lt;linux/btf.h&gt;</div><div class='add'>+#include &lt;linux/btf_ids.h&gt;</div><div class='add'>+#include &lt;linux/dcache.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fsnotify.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_get_task_exe_file - get a reference on the exe_file struct file member of</div><div class='add'>+ *                         the mm_struct that is nested within the supplied</div><div class='add'>+ *                         task_struct</div><div class='add'>+ * @task: task_struct of which the nested mm_struct exe_file member to get a</div><div class='add'>+ * reference on</div><div class='add'>+ *</div><div class='add'>+ * Get a reference on the exe_file struct file member field of the mm_struct</div><div class='add'>+ * nested within the supplied *task*. The referenced file pointer acquired by</div><div class='add'>+ * this BPF kfunc must be released using bpf_put_file(). Failing to call</div><div class='add'>+ * bpf_put_file() on the returned referenced struct file pointer that has been</div><div class='add'>+ * acquired by this BPF kfunc will result in the BPF program being rejected by</div><div class='add'>+ * the BPF verifier.</div><div class='add'>+ *</div><div class='add'>+ * This BPF kfunc may only be called from BPF LSM programs.</div><div class='add'>+ *</div><div class='add'>+ * Internally, this BPF kfunc leans on get_task_exe_file(), such that calling</div><div class='add'>+ * bpf_get_task_exe_file() would be analogous to calling get_task_exe_file()</div><div class='add'>+ * directly in kernel context.</div><div class='add'>+ *</div><div class='add'>+ * Return: A referenced struct file pointer to the exe_file member of the</div><div class='add'>+ * mm_struct that is nested within the supplied *task*. On error, NULL is</div><div class='add'>+ * returned.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc struct file *bpf_get_task_exe_file(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return get_task_exe_file(task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_put_file - put a reference on the supplied file</div><div class='add'>+ * @file: file to put a reference on</div><div class='add'>+ *</div><div class='add'>+ * Put a reference on the supplied *file*. Only referenced file pointers may be</div><div class='add'>+ * passed to this BPF kfunc. Attempting to pass an unreferenced file pointer, or</div><div class='add'>+ * any other arbitrary pointer for that matter, will result in the BPF program</div><div class='add'>+ * being rejected by the BPF verifier.</div><div class='add'>+ *</div><div class='add'>+ * This BPF kfunc may only be called from BPF LSM programs.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc void bpf_put_file(struct file *file)</div><div class='add'>+{</div><div class='add'>+	fput(file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_path_d_path - resolve the pathname for the supplied path</div><div class='add'>+ * @path: path to resolve the pathname for</div><div class='add'>+ * @buf: buffer to return the resolved pathname in</div><div class='add'>+ * @buf__sz: length of the supplied buffer</div><div class='add'>+ *</div><div class='add'>+ * Resolve the pathname for the supplied *path* and store it in *buf*. This BPF</div><div class='add'>+ * kfunc is the safer variant of the legacy bpf_d_path() helper and should be</div><div class='add'>+ * used in place of bpf_d_path() whenever possible. It enforces KF_TRUSTED_ARGS</div><div class='add'>+ * semantics, meaning that the supplied *path* must itself hold a valid</div><div class='add'>+ * reference, or else the BPF program will be outright rejected by the BPF</div><div class='add'>+ * verifier.</div><div class='add'>+ *</div><div class='add'>+ * This BPF kfunc may only be called from BPF LSM programs.</div><div class='add'>+ *</div><div class='add'>+ * Return: A positive integer corresponding to the length of the resolved</div><div class='add'>+ * pathname in *buf*, including the NUL termination character. On error, a</div><div class='add'>+ * negative integer is returned.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_path_d_path(const struct path *path, char *buf, size_t buf__sz)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	char *ret;</div><div class='add'>+</div><div class='add'>+	if (!buf__sz)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = d_path(path, buf, buf__sz);</div><div class='add'>+	if (IS_ERR(ret))</div><div class='add'>+		return PTR_ERR(ret);</div><div class='add'>+</div><div class='add'>+	len = buf + buf__sz - ret;</div><div class='add'>+	memmove(buf, ret, len);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool match_security_bpf_prefix(const char *name__str)</div><div class='add'>+{</div><div class='add'>+	return !strncmp(name__str, XATTR_NAME_BPF_LSM, XATTR_NAME_BPF_LSM_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_xattr_read_permission(const char *name, struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!inode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Allow reading xattr with user. and security.bpf. prefix */</div><div class='add'>+	if (strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) &amp;&amp;</div><div class='add'>+	    !match_security_bpf_prefix(name))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return inode_permission(&amp;nop_mnt_idmap, inode, MAY_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_get_dentry_xattr - get xattr of a dentry</div><div class='add'>+ * @dentry: dentry to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ * @value_p: output buffer of the xattr value</div><div class='add'>+ *</div><div class='add'>+ * Get xattr *name__str* of *dentry* and store the output in *value_ptr*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefixes "user." or</div><div class='add'>+ * "security.bpf." are allowed.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the xattr value on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_get_dentry_xattr(struct dentry *dentry, const char *name__str,</div><div class='add'>+				     struct bpf_dynptr *value_p)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr_kern *value_ptr = (struct bpf_dynptr_kern *)value_p;</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	u32 value_len;</div><div class='add'>+	void *value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	value_len = __bpf_dynptr_size(value_ptr);</div><div class='add'>+	value = __bpf_dynptr_data_rw(value_ptr, value_len);</div><div class='add'>+	if (!value)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xattr_read_permission(name__str, inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return __vfs_getxattr(dentry, inode, name__str, value, value_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_get_file_xattr - get xattr of a file</div><div class='add'>+ * @file: file to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ * @value_p: output buffer of the xattr value</div><div class='add'>+ *</div><div class='add'>+ * Get xattr *name__str* of *file* and store the output in *value_ptr*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefixes "user." or</div><div class='add'>+ * "security.bpf." are allowed.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the xattr value on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_get_file_xattr(struct file *file, const char *name__str,</div><div class='add'>+				   struct bpf_dynptr *value_p)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	dentry = file_dentry(file);</div><div class='add'>+	return bpf_get_dentry_xattr(dentry, name__str, value_p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+static int bpf_xattr_write_permission(const char *name, struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!inode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Only allow setting and removing security.bpf. xattrs */</div><div class='add'>+	if (!match_security_bpf_prefix(name))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return inode_permission(&amp;nop_mnt_idmap, inode, MAY_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_set_dentry_xattr_locked - set a xattr of a dentry</div><div class='add'>+ * @dentry: dentry to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ * @value_p: xattr value</div><div class='add'>+ * @flags: flags to pass into filesystem operations</div><div class='add'>+ *</div><div class='add'>+ * Set xattr *name__str* of *dentry* to the value in *value_ptr*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefix "security.bpf."</div><div class='add'>+ * is allowed.</div><div class='add'>+ *</div><div class='add'>+ * The caller already locked dentry-&gt;d_inode.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+int bpf_set_dentry_xattr_locked(struct dentry *dentry, const char *name__str,</div><div class='add'>+				const struct bpf_dynptr *value_p, int flags)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct bpf_dynptr_kern *value_ptr = (struct bpf_dynptr_kern *)value_p;</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	const void *value;</div><div class='add'>+	u32 value_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	value_len = __bpf_dynptr_size(value_ptr);</div><div class='add'>+	value = __bpf_dynptr_data(value_ptr, value_len);</div><div class='add'>+	if (!value)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xattr_write_permission(name__str, inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = __vfs_setxattr(&amp;nop_mnt_idmap, dentry, inode, name__str,</div><div class='add'>+			     value, value_len, flags);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		fsnotify_xattr(dentry);</div><div class='add'>+</div><div class='add'>+		/* This xattr is set by BPF LSM, so we do not call</div><div class='add'>+		 * security_inode_post_setxattr. Otherwise, we would</div><div class='add'>+		 * risk deadlocks by calling back to the same kfunc.</div><div class='add'>+		 *</div><div class='add'>+		 * This is the same as security_inode_setsecurity().</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_remove_dentry_xattr_locked - remove a xattr of a dentry</div><div class='add'>+ * @dentry: dentry to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ *</div><div class='add'>+ * Rmove xattr *name__str* of *dentry*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefix "security.bpf."</div><div class='add'>+ * is allowed.</div><div class='add'>+ *</div><div class='add'>+ * The caller already locked dentry-&gt;d_inode.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+int bpf_remove_dentry_xattr_locked(struct dentry *dentry, const char *name__str)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xattr_write_permission(name__str, inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = __vfs_removexattr(&amp;nop_mnt_idmap, dentry, name__str);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		fsnotify_xattr(dentry);</div><div class='add'>+</div><div class='add'>+		/* This xattr is removed by BPF LSM, so we do not call</div><div class='add'>+		 * security_inode_post_removexattr. Otherwise, we would</div><div class='add'>+		 * risk deadlocks by calling back to the same kfunc.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_start_defs();</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_set_dentry_xattr - set a xattr of a dentry</div><div class='add'>+ * @dentry: dentry to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ * @value_p: xattr value</div><div class='add'>+ * @flags: flags to pass into filesystem operations</div><div class='add'>+ *</div><div class='add'>+ * Set xattr *name__str* of *dentry* to the value in *value_ptr*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefix "security.bpf."</div><div class='add'>+ * is allowed.</div><div class='add'>+ *</div><div class='add'>+ * The caller has not locked dentry-&gt;d_inode.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_set_dentry_xattr(struct dentry *dentry, const char *name__str,</div><div class='add'>+				     const struct bpf_dynptr *value_p, int flags)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	ret = bpf_set_dentry_xattr_locked(dentry, name__str, value_p, flags);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bpf_remove_dentry_xattr - remove a xattr of a dentry</div><div class='add'>+ * @dentry: dentry to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ *</div><div class='add'>+ * Rmove xattr *name__str* of *dentry*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefix "security.bpf."</div><div class='add'>+ * is allowed.</div><div class='add'>+ *</div><div class='add'>+ * The caller has not locked dentry-&gt;d_inode.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_remove_dentry_xattr(struct dentry *dentry, const char *name__str)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	ret = bpf_remove_dentry_xattr_locked(dentry, name__str);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+/**</div><div class='add'>+ * bpf_cgroup_read_xattr - read xattr of a cgroup's node in cgroupfs</div><div class='add'>+ * @cgroup: cgroup to get xattr from</div><div class='add'>+ * @name__str: name of the xattr</div><div class='add'>+ * @value_p: output buffer of the xattr value</div><div class='add'>+ *</div><div class='add'>+ * Get xattr *name__str* of *cgroup* and store the output in *value_ptr*.</div><div class='add'>+ *</div><div class='add'>+ * For security reasons, only *name__str* with prefix "user." is allowed.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the xattr value on success, a negative value on error.</div><div class='add'>+ */</div><div class='add'>+__bpf_kfunc int bpf_cgroup_read_xattr(struct cgroup *cgroup, const char *name__str,</div><div class='add'>+					struct bpf_dynptr *value_p)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr_kern *value_ptr = (struct bpf_dynptr_kern *)value_p;</div><div class='add'>+	u32 value_len;</div><div class='add'>+	void *value;</div><div class='add'>+</div><div class='add'>+	/* Only allow reading "user.*" xattrs */</div><div class='add'>+	if (strncmp(name__str, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	value_len = __bpf_dynptr_size(value_ptr);</div><div class='add'>+	value = __bpf_dynptr_data_rw(value_ptr, value_len);</div><div class='add'>+	if (!value)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return kernfs_xattr_get(cgroup-&gt;kn, name__str, value, value_len);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_CGROUPS */</div><div class='add'>+</div><div class='add'>+__bpf_kfunc_end_defs();</div><div class='add'>+</div><div class='add'>+BTF_KFUNCS_START(bpf_fs_kfunc_set_ids)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_get_task_exe_file,</div><div class='add'>+	     KF_ACQUIRE | KF_TRUSTED_ARGS | KF_RET_NULL)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_put_file, KF_RELEASE)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_path_d_path, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_get_dentry_xattr, KF_SLEEPABLE | KF_TRUSTED_ARGS)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_get_file_xattr, KF_SLEEPABLE | KF_TRUSTED_ARGS)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_set_dentry_xattr, KF_SLEEPABLE | KF_TRUSTED_ARGS)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_remove_dentry_xattr, KF_SLEEPABLE | KF_TRUSTED_ARGS)</div><div class='add'>+BTF_KFUNCS_END(bpf_fs_kfunc_set_ids)</div><div class='add'>+</div><div class='add'>+static int bpf_fs_kfuncs_filter(const struct bpf_prog *prog, u32 kfunc_id)</div><div class='add'>+{</div><div class='add'>+	if (!btf_id_set8_contains(&amp;bpf_fs_kfunc_set_ids, kfunc_id) ||</div><div class='add'>+	    prog-&gt;type == BPF_PROG_TYPE_LSM)</div><div class='add'>+		return 0;</div><div class='add'>+	return -EACCES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* bpf_[set|remove]_dentry_xattr.* hooks have KF_TRUSTED_ARGS and</div><div class='add'>+ * KF_SLEEPABLE, so they are only available to sleepable hooks with</div><div class='add'>+ * dentry arguments.</div><div class='add'>+ *</div><div class='add'>+ * Setting and removing xattr requires exclusive lock on dentry-&gt;d_inode.</div><div class='add'>+ * Some hooks already locked d_inode, while some hooks have not locked</div><div class='add'>+ * d_inode. Therefore, we need different kfuncs for different hooks.</div><div class='add'>+ * Specifically, hooks in the following list (d_inode_locked_hooks)</div><div class='add'>+ * should call bpf_[set|remove]_dentry_xattr_locked; while other hooks</div><div class='add'>+ * should call bpf_[set|remove]_dentry_xattr.</div><div class='add'>+ */</div><div class='add'>+BTF_SET_START(d_inode_locked_hooks)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_post_removexattr)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_post_setattr)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_post_setxattr)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_removexattr)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_rmdir)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_setattr)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_setxattr)</div><div class='add'>+BTF_ID(func, bpf_lsm_inode_unlink)</div><div class='add'>+#ifdef CONFIG_SECURITY_PATH</div><div class='add'>+BTF_ID(func, bpf_lsm_path_unlink)</div><div class='add'>+BTF_ID(func, bpf_lsm_path_rmdir)</div><div class='add'>+#endif /* CONFIG_SECURITY_PATH */</div><div class='add'>+BTF_SET_END(d_inode_locked_hooks)</div><div class='add'>+</div><div class='add'>+bool bpf_lsm_has_d_inode_locked(const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	return btf_id_set_contains(&amp;d_inode_locked_hooks, prog-&gt;aux-&gt;attach_btf_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct btf_kfunc_id_set bpf_fs_kfunc_set = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.set = &amp;bpf_fs_kfunc_set_ids,</div><div class='add'>+	.filter = bpf_fs_kfuncs_filter,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bpf_fs_kfuncs_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_btf_kfunc_id_set(BPF_PROG_TYPE_LSM, &amp;bpf_fs_kfunc_set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(bpf_fs_kfuncs_init);</div><div class='head'>diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig<br/>index 4fb925e8c981..4438637c8900 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/Kconfig</a></div><div class='hunk'>@@ -3,9 +3,9 @@</div><div class='ctx'> config BTRFS_FS</div><div class='ctx'> 	tristate "Btrfs filesystem support"</div><div class='ctx'> 	select BLK_CGROUP_PUNT_BIO</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select CRYPTO</div><div class='ctx'> 	select CRYPTO_CRC32C</div><div class='del'>-	select LIBCRC32C</div><div class='ctx'> 	select CRYPTO_XXHASH</div><div class='ctx'> 	select CRYPTO_SHA256</div><div class='ctx'> 	select CRYPTO_BLAKE2B</div><div class='hunk'>@@ -52,20 +52,24 @@ config BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> 	bool "Btrfs will run sanity tests upon loading"</div><div class='ctx'> 	depends on BTRFS_FS</div><div class='ctx'> 	help</div><div class='del'>-	  This will run some basic sanity tests on the free space cache</div><div class='del'>-	  code to make sure it is acting as it should.  These are mostly</div><div class='del'>-	  regression tests and are only really interesting to btrfs</div><div class='del'>-	  developers.</div><div class='add'>+	  This will run sanity tests for core functionality like free space,</div><div class='add'>+	  extent maps, extent io, extent buffers, inodes, qgroups and others,</div><div class='add'>+	  at module load time.  These are mostly regression tests and are only</div><div class='add'>+	  interesting to developers.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config BTRFS_DEBUG</div><div class='ctx'> 	bool "Btrfs debugging support"</div><div class='ctx'> 	depends on BTRFS_FS</div><div class='add'>+	select REF_TRACKER if STACKTRACE_SUPPORT</div><div class='ctx'> 	help</div><div class='del'>-	  Enable run-time debugging support for the btrfs filesystem. This may</div><div class='del'>-	  enable additional and expensive checks with negative impact on</div><div class='del'>-	  performance, or export extra information via sysfs.</div><div class='add'>+	  Enable run-time debugging support for the btrfs filesystem.</div><div class='add'>+</div><div class='add'>+	  Additional potentially expensive checks, debugging functionality or</div><div class='add'>+	  sysfs exported information is enabled, like leak checks of internal</div><div class='add'>+	  objects, optional forced space fragmentation and /sys/fs/btrfs/debug .</div><div class='add'>+	  This has negative impact on performance.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -73,18 +77,44 @@ config BTRFS_ASSERT</div><div class='ctx'> 	bool "Btrfs assert support"</div><div class='ctx'> 	depends on BTRFS_FS</div><div class='ctx'> 	help</div><div class='del'>-	  Enable run-time assertion checking.  This will result in panics if</div><div class='del'>-	  any of the assertions trip.  This is meant for btrfs developers only.</div><div class='add'>+	  Enable run-time assertion checking. Additional safety checks are</div><div class='add'>+	  done, simple enough not to affect performance but verify invariants</div><div class='add'>+	  and assumptions of code to run properly. This may result in panics,</div><div class='add'>+	  and is meant for developers but can be enabled in general.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-config BTRFS_FS_REF_VERIFY</div><div class='del'>-	bool "Btrfs with the ref verify tool compiled in"</div><div class='add'>+config BTRFS_EXPERIMENTAL</div><div class='add'>+	bool "Btrfs experimental features"</div><div class='ctx'> 	depends on BTRFS_FS</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='del'>-	  Enable run-time extent reference verification instrumentation.  This</div><div class='del'>-	  is meant to be used by btrfs developers for tracking down extent</div><div class='del'>-	  reference problems or verifying they didn't break something.</div><div class='add'>+	  Enable experimental features.  These features may not be stable enough</div><div class='add'>+	  for end users.  This is meant for btrfs developers or users who wish</div><div class='add'>+	  to test the functionality and report problems.</div><div class='add'>+</div><div class='add'>+	  Current list:</div><div class='add'>+</div><div class='add'>+	  - COW fixup worker warning - last warning before removing the</div><div class='add'>+				       functionality catching out-of-band page</div><div class='add'>+				       dirtying, not necessary since 5.8</div><div class='add'>+</div><div class='add'>+	  - RAID mirror read policy - additional read policies for balancing</div><div class='add'>+				      reading from redundant block group</div><div class='add'>+				      profiles (currently: pid, round-robin,</div><div class='add'>+				      fixed devid)</div><div class='add'>+</div><div class='add'>+	  - send stream protocol v3 - fs-verity support</div><div class='add'>+</div><div class='add'>+	  - checksum offload mode - sysfs knob to affect when checksums are</div><div class='add'>+	                            calculated (at IO time, or in a thread)</div><div class='add'>+</div><div class='add'>+	  - raid-stripe-tree - additional mapping of extents to devices to</div><div class='add'>+			       support RAID1* profiles on zoned devices,</div><div class='add'>+			       RAID56 not yet supported</div><div class='add'>+</div><div class='add'>+	  - extent tree v2 - complex rework of extent tracking</div><div class='add'>+</div><div class='add'>+	  - large folio support</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='head'>diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile<br/>index 525af975f61c..743d7677b175 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/Makefile</a></div><div class='hunk'>@@ -33,14 +33,15 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \</div><div class='ctx'> 	   uuid-tree.o props.o free-space-tree.o tree-checker.o space-info.o \</div><div class='ctx'> 	   block-rsv.o delalloc-space.o block-group.o discard.o reflink.o \</div><div class='ctx'> 	   subpage.o tree-mod-log.o extent-io-tree.o fs.o messages.o bio.o \</div><div class='del'>-	   lru_cache.o raid-stripe-tree.o</div><div class='add'>+	   lru_cache.o raid-stripe-tree.o fiemap.o direct-io.o</div><div class='ctx'> </div><div class='ctx'> btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o</div><div class='del'>-btrfs-$(CONFIG_BTRFS_FS_REF_VERIFY) += ref-verify.o</div><div class='add'>+btrfs-$(CONFIG_BTRFS_DEBUG) += ref-verify.o</div><div class='ctx'> btrfs-$(CONFIG_BLK_DEV_ZONED) += zoned.o</div><div class='ctx'> btrfs-$(CONFIG_FS_VERITY) += verity.o</div><div class='ctx'> </div><div class='ctx'> btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \</div><div class='ctx'> 	tests/extent-buffer-tests.o tests/btrfs-tests.o \</div><div class='ctx'> 	tests/extent-io-tests.o tests/inode-tests.o tests/qgroup-tests.o \</div><div class='del'>-	tests/free-space-tree-tests.o tests/extent-map-tests.o</div><div class='add'>+	tests/free-space-tree-tests.o tests/extent-map-tests.o \</div><div class='add'>+	tests/raid-stripe-tree-tests.o tests/delayed-refs-tests.o</div><div class='head'>diff --git a/fs/btrfs/accessors.c b/fs/btrfs/accessors.c<br/>index 1925a0919ca6..1248aa2535d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/accessors.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/accessors.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/accessors.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/accessors.c</a></div><div class='hunk'>@@ -3,32 +3,30 @@</div><div class='ctx'>  * Copyright (C) 2007 Oracle.  All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "ctree.h"</div><div class='add'>+#include "extent_io.h"</div><div class='add'>+#include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> </div><div class='del'>-static bool check_setget_bounds(const struct extent_buffer *eb,</div><div class='del'>-				const void *ptr, unsigned off, int size)</div><div class='add'>+static void __cold report_setget_bounds(const struct extent_buffer *eb,</div><div class='add'>+					const void *ptr, unsigned off, int size)</div><div class='ctx'> {</div><div class='del'>-	const unsigned long member_offset = (unsigned long)ptr + off;</div><div class='add'>+	unsigned long member_offset = (unsigned long)ptr + off;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(member_offset + size &gt; eb-&gt;len)) {</div><div class='del'>-		btrfs_warn(eb-&gt;fs_info,</div><div class='del'>-		"bad eb member %s: ptr 0x%lx start %llu member offset %lu size %d",</div><div class='del'>-			(member_offset &gt; eb-&gt;len ? "start" : "end"),</div><div class='del'>-			(unsigned long)ptr, eb-&gt;start, member_offset, size);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='add'>+	btrfs_warn(eb-&gt;fs_info,</div><div class='add'>+		   "bad eb member %s: ptr 0x%lx start %llu member offset %lu size %d",</div><div class='add'>+		   (member_offset &gt; eb-&gt;len ? "start" : "end"),</div><div class='add'>+		   (unsigned long)ptr, eb-&gt;start, member_offset, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *eb)</div><div class='add'>+/* Copy bytes from @src1 and @src2 to @dest. */</div><div class='add'>+static __always_inline void memcpy_split_src(char *dest, const char *src1,</div><div class='add'>+					     const char *src2, const size_t len1,</div><div class='add'>+					     const size_t total)</div><div class='ctx'> {</div><div class='del'>-	token-&gt;eb = eb;</div><div class='del'>-	token-&gt;kaddr = folio_address(eb-&gt;folios[0]);</div><div class='del'>-	token-&gt;offset = 0;</div><div class='add'>+	memcpy(dest, src1, len1);</div><div class='add'>+	memcpy(dest + len1, src2, total - len1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -40,134 +38,77 @@ void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *e</div><div class='ctx'>  * - btrfs_set_8 (for 8/16/32/64)</div><div class='ctx'>  * - btrfs_get_8 (for 8/16/32/64)</div><div class='ctx'>  *</div><div class='del'>- * Generic helpers with a token (cached address of the most recently accessed</div><div class='del'>- * page):</div><div class='del'>- * - btrfs_set_token_8 (for 8/16/32/64)</div><div class='del'>- * - btrfs_get_token_8 (for 8/16/32/64)</div><div class='del'>- *</div><div class='ctx'>  * The set/get functions handle data spanning two pages transparently, in case</div><div class='ctx'>  * metadata block size is larger than page.  Every pointer to metadata items is</div><div class='ctx'>  * an offset into the extent buffer page array, cast to a specific type.  This</div><div class='ctx'>  * gives us all the type checking.</div><div class='ctx'>  *</div><div class='ctx'>  * The extent buffer pages stored in the array folios may not form a contiguous</div><div class='del'>- * phyusical range, but the API functions assume the linear offset to the range</div><div class='add'>+ * physical range, but the API functions assume the linear offset to the range</div><div class='ctx'>  * from 0 to metadata node size.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_BTRFS_SETGET_BITS(bits)					\</div><div class='del'>-u##bits btrfs_get_token_##bits(struct btrfs_map_token *token,		\</div><div class='del'>-			       const void *ptr, unsigned long off)	\</div><div class='del'>-{									\</div><div class='del'>-	const unsigned long member_offset = (unsigned long)ptr + off;	\</div><div class='del'>-	const unsigned long idx = get_eb_folio_index(token-&gt;eb, member_offset); \</div><div class='del'>-	const unsigned long oil = get_eb_offset_in_folio(token-&gt;eb,	\</div><div class='del'>-							 member_offset);\</div><div class='del'>-	const int unit_size = folio_size(token-&gt;eb-&gt;folios[0]);		\</div><div class='del'>-	const int unit_shift = folio_shift(token-&gt;eb-&gt;folios[0]);	\</div><div class='del'>-	const int size = sizeof(u##bits);				\</div><div class='del'>-	u8 lebytes[sizeof(u##bits)];					\</div><div class='del'>-	const int part = unit_size - oil;				\</div><div class='del'>-									\</div><div class='del'>-	ASSERT(token);							\</div><div class='del'>-	ASSERT(token-&gt;kaddr);						\</div><div class='del'>-	ASSERT(check_setget_bounds(token-&gt;eb, ptr, off, size));		\</div><div class='del'>-	if (token-&gt;offset &lt;= member_offset &amp;&amp;				\</div><div class='del'>-	    member_offset + size &lt;= token-&gt;offset + unit_size) {	\</div><div class='del'>-		return get_unaligned_le##bits(token-&gt;kaddr + oil);	\</div><div class='del'>-	}								\</div><div class='del'>-	token-&gt;kaddr = folio_address(token-&gt;eb-&gt;folios[idx]);		\</div><div class='del'>-	token-&gt;offset = idx &lt;&lt; unit_shift;				\</div><div class='del'>-	if (INLINE_EXTENT_BUFFER_PAGES == 1 || oil + size &lt;= unit_size) \</div><div class='del'>-		return get_unaligned_le##bits(token-&gt;kaddr + oil);	\</div><div class='del'>-									\</div><div class='del'>-	memcpy(lebytes, token-&gt;kaddr + oil, part);			\</div><div class='del'>-	token-&gt;kaddr = folio_address(token-&gt;eb-&gt;folios[idx + 1]);	\</div><div class='del'>-	token-&gt;offset = (idx + 1) &lt;&lt; unit_shift;			\</div><div class='del'>-	memcpy(lebytes + part, token-&gt;kaddr, size - part);		\</div><div class='del'>-	return get_unaligned_le##bits(lebytes);				\</div><div class='del'>-}									\</div><div class='ctx'> u##bits btrfs_get_##bits(const struct extent_buffer *eb,		\</div><div class='ctx'> 			 const void *ptr, unsigned long off)		\</div><div class='ctx'> {									\</div><div class='ctx'> 	const unsigned long member_offset = (unsigned long)ptr + off;	\</div><div class='ctx'> 	const unsigned long idx = get_eb_folio_index(eb, member_offset);\</div><div class='del'>-	const unsigned long oil = get_eb_offset_in_folio(eb,		\</div><div class='del'>-							 member_offset);\</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);		\</div><div class='del'>-	char *kaddr = folio_address(eb-&gt;folios[idx]);			\</div><div class='del'>-	const int size = sizeof(u##bits);				\</div><div class='del'>-	const int part = unit_size - oil;				\</div><div class='del'>-	u8 lebytes[sizeof(u##bits)];					\</div><div class='del'>-									\</div><div class='del'>-	ASSERT(check_setget_bounds(eb, ptr, off, size));		\</div><div class='del'>-	if (INLINE_EXTENT_BUFFER_PAGES == 1 || oil + size &lt;= unit_size)	\</div><div class='del'>-		return get_unaligned_le##bits(kaddr + oil);		\</div><div class='del'>-									\</div><div class='del'>-	memcpy(lebytes, kaddr + oil, part);				\</div><div class='del'>-	kaddr = folio_address(eb-&gt;folios[idx + 1]);			\</div><div class='del'>-	memcpy(lebytes + part, kaddr, size - part);			\</div><div class='del'>-	return get_unaligned_le##bits(lebytes);				\</div><div class='del'>-}									\</div><div class='del'>-void btrfs_set_token_##bits(struct btrfs_map_token *token,		\</div><div class='del'>-			    const void *ptr, unsigned long off,		\</div><div class='del'>-			    u##bits val)				\</div><div class='del'>-{									\</div><div class='del'>-	const unsigned long member_offset = (unsigned long)ptr + off;	\</div><div class='del'>-	const unsigned long idx = get_eb_folio_index(token-&gt;eb, member_offset); \</div><div class='del'>-	const unsigned long oil = get_eb_offset_in_folio(token-&gt;eb,	\</div><div class='add'>+	const unsigned long oif = get_eb_offset_in_folio(eb,		\</div><div class='ctx'> 							 member_offset);\</div><div class='del'>-	const int unit_size = folio_size(token-&gt;eb-&gt;folios[0]);		\</div><div class='del'>-	const int unit_shift = folio_shift(token-&gt;eb-&gt;folios[0]);	\</div><div class='del'>-	const int size = sizeof(u##bits);				\</div><div class='add'>+	char *kaddr = folio_address(eb-&gt;folios[idx]) + oif;		\</div><div class='add'>+	const int part = eb-&gt;folio_size - oif;				\</div><div class='ctx'> 	u8 lebytes[sizeof(u##bits)];					\</div><div class='del'>-	const int part = unit_size - oil;				\</div><div class='ctx'> 									\</div><div class='del'>-	ASSERT(token);							\</div><div class='del'>-	ASSERT(token-&gt;kaddr);						\</div><div class='del'>-	ASSERT(check_setget_bounds(token-&gt;eb, ptr, off, size));		\</div><div class='del'>-	if (token-&gt;offset &lt;= member_offset &amp;&amp;				\</div><div class='del'>-	    member_offset + size &lt;= token-&gt;offset + unit_size) {	\</div><div class='del'>-		put_unaligned_le##bits(val, token-&gt;kaddr + oil);	\</div><div class='del'>-		return;							\</div><div class='add'>+	if (unlikely(member_offset + sizeof(u##bits) &gt; eb-&gt;len)) {	\</div><div class='add'>+		report_setget_bounds(eb, ptr, off, sizeof(u##bits));	\</div><div class='add'>+		return 0;						\</div><div class='ctx'> 	}								\</div><div class='del'>-	token-&gt;kaddr = folio_address(token-&gt;eb-&gt;folios[idx]);		\</div><div class='del'>-	token-&gt;offset = idx &lt;&lt; unit_shift;				\</div><div class='del'>-	if (INLINE_EXTENT_BUFFER_PAGES == 1 ||				\</div><div class='del'>-	    oil + size &lt;= unit_size) {					\</div><div class='del'>-		put_unaligned_le##bits(val, token-&gt;kaddr + oil);	\</div><div class='del'>-		return;							\</div><div class='add'>+	if (INLINE_EXTENT_BUFFER_PAGES == 1 || sizeof(u##bits) == 1 ||	\</div><div class='add'>+	    likely(sizeof(u##bits) &lt;= part))				\</div><div class='add'>+		return get_unaligned_le##bits(kaddr);			\</div><div class='add'>+									\</div><div class='add'>+	if (sizeof(u##bits) == 2) {					\</div><div class='add'>+		lebytes[0] = *kaddr;					\</div><div class='add'>+		kaddr = folio_address(eb-&gt;folios[idx + 1]);		\</div><div class='add'>+		lebytes[1] = *kaddr;					\</div><div class='add'>+	} else {							\</div><div class='add'>+		memcpy_split_src(lebytes, kaddr,			\</div><div class='add'>+				 folio_address(eb-&gt;folios[idx + 1]),	\</div><div class='add'>+				 part, sizeof(u##bits));		\</div><div class='ctx'> 	}								\</div><div class='del'>-	put_unaligned_le##bits(val, lebytes);				\</div><div class='del'>-	memcpy(token-&gt;kaddr + oil, lebytes, part);			\</div><div class='del'>-	token-&gt;kaddr = folio_address(token-&gt;eb-&gt;folios[idx + 1]);	\</div><div class='del'>-	token-&gt;offset = (idx + 1) &lt;&lt; unit_shift;			\</div><div class='del'>-	memcpy(token-&gt;kaddr, lebytes + part, size - part);		\</div><div class='add'>+	return get_unaligned_le##bits(lebytes);				\</div><div class='ctx'> }									\</div><div class='ctx'> void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr,	\</div><div class='ctx'> 		      unsigned long off, u##bits val)			\</div><div class='ctx'> {									\</div><div class='ctx'> 	const unsigned long member_offset = (unsigned long)ptr + off;	\</div><div class='ctx'> 	const unsigned long idx = get_eb_folio_index(eb, member_offset);\</div><div class='del'>-	const unsigned long oil = get_eb_offset_in_folio(eb,		\</div><div class='add'>+	const unsigned long oif = get_eb_offset_in_folio(eb,		\</div><div class='ctx'> 							 member_offset);\</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);		\</div><div class='del'>-	char *kaddr = folio_address(eb-&gt;folios[idx]);			\</div><div class='del'>-	const int size = sizeof(u##bits);				\</div><div class='del'>-	const int part = unit_size - oil;				\</div><div class='add'>+	char *kaddr = folio_address(eb-&gt;folios[idx]) + oif;		\</div><div class='add'>+	const int part = eb-&gt;folio_size - oif;				\</div><div class='ctx'> 	u8 lebytes[sizeof(u##bits)];					\</div><div class='ctx'> 									\</div><div class='del'>-	ASSERT(check_setget_bounds(eb, ptr, off, size));		\</div><div class='del'>-	if (INLINE_EXTENT_BUFFER_PAGES == 1 ||				\</div><div class='del'>-	    oil + size &lt;= unit_size) {					\</div><div class='del'>-		put_unaligned_le##bits(val, kaddr + oil);		\</div><div class='add'>+	if (unlikely(member_offset + sizeof(u##bits) &gt; eb-&gt;len)) {	\</div><div class='add'>+		report_setget_bounds(eb, ptr, off, sizeof(u##bits));	\</div><div class='add'>+		return;							\</div><div class='add'>+	}								\</div><div class='add'>+	if (INLINE_EXTENT_BUFFER_PAGES == 1 || sizeof(u##bits) == 1 ||	\</div><div class='add'>+	    likely(sizeof(u##bits) &lt;= part)) {				\</div><div class='add'>+		put_unaligned_le##bits(val, kaddr);			\</div><div class='ctx'> 		return;							\</div><div class='ctx'> 	}								\</div><div class='del'>-									\</div><div class='ctx'> 	put_unaligned_le##bits(val, lebytes);				\</div><div class='del'>-	memcpy(kaddr + oil, lebytes, part);				\</div><div class='del'>-	kaddr = folio_address(eb-&gt;folios[idx + 1]);			\</div><div class='del'>-	memcpy(kaddr, lebytes + part, size - part);			\</div><div class='add'>+	if (sizeof(u##bits) == 2) {					\</div><div class='add'>+		*kaddr = lebytes[0];					\</div><div class='add'>+		kaddr = folio_address(eb-&gt;folios[idx + 1]);		\</div><div class='add'>+		*kaddr = lebytes[1];					\</div><div class='add'>+	} else {							\</div><div class='add'>+		memcpy(kaddr, lebytes, part);				\</div><div class='add'>+		kaddr = folio_address(eb-&gt;folios[idx + 1]);		\</div><div class='add'>+		memcpy(kaddr, lebytes + part, sizeof(u##bits) - part);	\</div><div class='add'>+	}								\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEFINE_BTRFS_SETGET_BITS(8)</div><div class='head'>diff --git a/fs/btrfs/accessors.h b/fs/btrfs/accessors.h<br/>index ed7aa32972ad..78721412951c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/accessors.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/accessors.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/accessors.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/accessors.h</a></div><div class='hunk'>@@ -3,16 +3,19 @@</div><div class='ctx'> #ifndef BTRFS_ACCESSORS_H</div><div class='ctx'> #define BTRFS_ACCESSORS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-struct btrfs_map_token {</div><div class='del'>-	struct extent_buffer *eb;</div><div class='del'>-	char *kaddr;</div><div class='del'>-	unsigned long offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *eb);</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/align.h&gt;</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "extent_io.h"</div><div class='add'>+</div><div class='add'>+struct extent_buffer;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some macros to generate set/get functions for the struct fields.  This</div><div class='hunk'>@@ -25,7 +28,7 @@ void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *e</div><div class='ctx'> </div><div class='ctx'> static inline u8 get_unaligned_le8(const void *p)</div><div class='ctx'> {</div><div class='del'>-       return *(u8 *)p;</div><div class='add'>+       return *(const u8 *)p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void put_unaligned_le8(u8 val, void *p)</div><div class='hunk'>@@ -39,18 +42,13 @@ static inline void put_unaligned_le8(u8 val, void *p)</div><div class='ctx'> 			    offsetof(type, member),			\</div><div class='ctx'> 			    sizeof_field(type, member)))</div><div class='ctx'> </div><div class='del'>-#define write_eb_member(eb, ptr, type, member, result) (\</div><div class='del'>-	write_extent_buffer(eb, (char *)(result),			\</div><div class='add'>+#define write_eb_member(eb, ptr, type, member, source) (		\</div><div class='add'>+	write_extent_buffer(eb, (const char *)(source),			\</div><div class='ctx'> 			   ((unsigned long)(ptr)) +			\</div><div class='ctx'> 			    offsetof(type, member),			\</div><div class='ctx'> 			    sizeof_field(type, member)))</div><div class='ctx'> </div><div class='ctx'> #define DECLARE_BTRFS_SETGET_BITS(bits)					\</div><div class='del'>-u##bits btrfs_get_token_##bits(struct btrfs_map_token *token,		\</div><div class='del'>-			       const void *ptr, unsigned long off);	\</div><div class='del'>-void btrfs_set_token_##bits(struct btrfs_map_token *token,		\</div><div class='del'>-			    const void *ptr, unsigned long off,		\</div><div class='del'>-			    u##bits val);				\</div><div class='ctx'> u##bits btrfs_get_##bits(const struct extent_buffer *eb,		\</div><div class='ctx'> 			 const void *ptr, unsigned long off);		\</div><div class='ctx'> void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr,	\</div><div class='hunk'>@@ -73,18 +71,6 @@ static inline void btrfs_set_##name(const struct extent_buffer *eb, type *s, \</div><div class='ctx'> {									\</div><div class='ctx'> 	static_assert(sizeof(u##bits) == sizeof_field(type, member));	\</div><div class='ctx'> 	btrfs_set_##bits(eb, s, offsetof(type, member), val);		\</div><div class='del'>-}									\</div><div class='del'>-static inline u##bits btrfs_token_##name(struct btrfs_map_token *token,	\</div><div class='del'>-					 const type *s)			\</div><div class='del'>-{									\</div><div class='del'>-	static_assert(sizeof(u##bits) == sizeof_field(type, member));	\</div><div class='del'>-	return btrfs_get_token_##bits(token, s, offsetof(type, member));\</div><div class='del'>-}									\</div><div class='del'>-static inline void btrfs_set_token_##name(struct btrfs_map_token *token,\</div><div class='del'>-					  type *s, u##bits val)		\</div><div class='del'>-{									\</div><div class='del'>-	static_assert(sizeof(u##bits) == sizeof_field(type, member));	\</div><div class='del'>-	btrfs_set_token_##bits(token, s, offsetof(type, member), val);	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_SETGET_HEADER_FUNCS(name, type, member, bits)		\</div><div class='hunk'>@@ -306,11 +292,8 @@ BTRFS_SETGET_FUNCS(timespec_nsec, struct btrfs_timespec, nsec, 32);</div><div class='ctx'> BTRFS_SETGET_STACK_FUNCS(stack_timespec_sec, struct btrfs_timespec, sec, 64);</div><div class='ctx'> BTRFS_SETGET_STACK_FUNCS(stack_timespec_nsec, struct btrfs_timespec, nsec, 32);</div><div class='ctx'> </div><div class='del'>-BTRFS_SETGET_FUNCS(stripe_extent_encoding, struct btrfs_stripe_extent, encoding, 8);</div><div class='ctx'> BTRFS_SETGET_FUNCS(raid_stride_devid, struct btrfs_raid_stride, devid, 64);</div><div class='ctx'> BTRFS_SETGET_FUNCS(raid_stride_physical, struct btrfs_raid_stride, physical, 64);</div><div class='del'>-BTRFS_SETGET_STACK_FUNCS(stack_stripe_extent_encoding,</div><div class='del'>-			 struct btrfs_stripe_extent, encoding, 8);</div><div class='ctx'> BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_devid, struct btrfs_raid_stride, devid, 64);</div><div class='ctx'> BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_physical, struct btrfs_raid_stride, physical, 64);</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +327,7 @@ static inline void btrfs_tree_block_key(const struct extent_buffer *eb,</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_set_tree_block_key(const struct extent_buffer *eb,</div><div class='ctx'> 					    struct btrfs_tree_block_info *item,</div><div class='del'>-					    struct btrfs_disk_key *key)</div><div class='add'>+					    const struct btrfs_disk_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	write_eb_member(eb, item, struct btrfs_tree_block_info, key, key);</div><div class='ctx'> }</div><div class='hunk'>@@ -437,7 +420,7 @@ void btrfs_node_key(const struct extent_buffer *eb,</div><div class='ctx'> 		    struct btrfs_disk_key *disk_key, int nr);</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_set_node_key(const struct extent_buffer *eb,</div><div class='del'>-				      struct btrfs_disk_key *disk_key, int nr)</div><div class='add'>+				      const struct btrfs_disk_key *disk_key, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -472,18 +455,6 @@ static inline void btrfs_set_item_##member(const struct extent_buffer *eb,	\</div><div class='ctx'> 					   int slot, u32 val)			\</div><div class='ctx'> {										\</div><div class='ctx'> 	btrfs_set_raw_item_##member(eb, btrfs_item_nr(eb, slot), val);		\</div><div class='del'>-}										\</div><div class='del'>-static inline u32 btrfs_token_item_##member(struct btrfs_map_token *token,	\</div><div class='del'>-					    int slot)				\</div><div class='del'>-{										\</div><div class='del'>-	struct btrfs_item *item = btrfs_item_nr(token-&gt;eb, slot);		\</div><div class='del'>-	return btrfs_token_raw_item_##member(token, item);			\</div><div class='del'>-}										\</div><div class='del'>-static inline void btrfs_set_token_item_##member(struct btrfs_map_token *token,	\</div><div class='del'>-						 int slot, u32 val)		\</div><div class='del'>-{										\</div><div class='del'>-	struct btrfs_item *item = btrfs_item_nr(token-&gt;eb, slot);		\</div><div class='del'>-	btrfs_set_token_raw_item_##member(token, item, val);			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BTRFS_ITEM_SETGET_FUNCS(offset)</div><div class='hunk'>@@ -503,7 +474,7 @@ static inline void btrfs_item_key(const struct extent_buffer *eb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_set_item_key(struct extent_buffer *eb,</div><div class='del'>-				      struct btrfs_disk_key *disk_key, int nr)</div><div class='add'>+				      const struct btrfs_disk_key *disk_key, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_item *item = btrfs_item_nr(eb, nr);</div><div class='ctx'> </div><div class='hunk'>@@ -844,45 +815,6 @@ static inline void btrfs_set_balance_sys(struct extent_buffer *eb,</div><div class='ctx'> 	write_eb_member(eb, bi, struct btrfs_balance_item, sys, ba);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,</div><div class='del'>-			       const struct btrfs_disk_balance_args *disk)</div><div class='del'>-{</div><div class='del'>-	memset(cpu, 0, sizeof(*cpu));</div><div class='del'>-</div><div class='del'>-	cpu-&gt;profiles = le64_to_cpu(disk-&gt;profiles);</div><div class='del'>-	cpu-&gt;usage = le64_to_cpu(disk-&gt;usage);</div><div class='del'>-	cpu-&gt;devid = le64_to_cpu(disk-&gt;devid);</div><div class='del'>-	cpu-&gt;pstart = le64_to_cpu(disk-&gt;pstart);</div><div class='del'>-	cpu-&gt;pend = le64_to_cpu(disk-&gt;pend);</div><div class='del'>-	cpu-&gt;vstart = le64_to_cpu(disk-&gt;vstart);</div><div class='del'>-	cpu-&gt;vend = le64_to_cpu(disk-&gt;vend);</div><div class='del'>-	cpu-&gt;target = le64_to_cpu(disk-&gt;target);</div><div class='del'>-	cpu-&gt;flags = le64_to_cpu(disk-&gt;flags);</div><div class='del'>-	cpu-&gt;limit = le64_to_cpu(disk-&gt;limit);</div><div class='del'>-	cpu-&gt;stripes_min = le32_to_cpu(disk-&gt;stripes_min);</div><div class='del'>-	cpu-&gt;stripes_max = le32_to_cpu(disk-&gt;stripes_max);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_cpu_balance_args_to_disk(</div><div class='del'>-				struct btrfs_disk_balance_args *disk,</div><div class='del'>-				const struct btrfs_balance_args *cpu)</div><div class='del'>-{</div><div class='del'>-	memset(disk, 0, sizeof(*disk));</div><div class='del'>-</div><div class='del'>-	disk-&gt;profiles = cpu_to_le64(cpu-&gt;profiles);</div><div class='del'>-	disk-&gt;usage = cpu_to_le64(cpu-&gt;usage);</div><div class='del'>-	disk-&gt;devid = cpu_to_le64(cpu-&gt;devid);</div><div class='del'>-	disk-&gt;pstart = cpu_to_le64(cpu-&gt;pstart);</div><div class='del'>-	disk-&gt;pend = cpu_to_le64(cpu-&gt;pend);</div><div class='del'>-	disk-&gt;vstart = cpu_to_le64(cpu-&gt;vstart);</div><div class='del'>-	disk-&gt;vend = cpu_to_le64(cpu-&gt;vend);</div><div class='del'>-	disk-&gt;target = cpu_to_le64(cpu-&gt;target);</div><div class='del'>-	disk-&gt;flags = cpu_to_le64(cpu-&gt;flags);</div><div class='del'>-	disk-&gt;limit = cpu_to_le64(cpu-&gt;limit);</div><div class='del'>-	disk-&gt;stripes_min = cpu_to_le32(cpu-&gt;stripes_min);</div><div class='del'>-	disk-&gt;stripes_max = cpu_to_le32(cpu-&gt;stripes_max);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* struct btrfs_super_block */</div><div class='ctx'> BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64);</div><div class='ctx'> BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64);</div><div class='head'>diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c<br/>index 7427449a04a3..c336e2ab7f8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/acl.c</a></div><div class='hunk'>@@ -12,15 +12,15 @@</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='del'>-#include "btrfs_inode.h"</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> #include "acl.h"</div><div class='add'>+#include "misc.h"</div><div class='ctx'> </div><div class='ctx'> struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu)</div><div class='ctx'> {</div><div class='ctx'> 	int size;</div><div class='ctx'> 	const char *name;</div><div class='del'>-	char *value = NULL;</div><div class='add'>+	char AUTO_KFREE(value);</div><div class='ctx'> 	struct posix_acl *acl;</div><div class='ctx'> </div><div class='ctx'> 	if (rcu)</div><div class='hunk'>@@ -50,7 +50,6 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu)</div><div class='ctx'> 		acl = NULL;</div><div class='ctx'> 	else</div><div class='ctx'> 		acl = ERR_PTR(size);</div><div class='del'>-	kfree(value);</div><div class='ctx'> </div><div class='ctx'> 	return acl;</div><div class='ctx'> }</div><div class='hunk'>@@ -60,7 +59,7 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	int ret, size = 0;</div><div class='ctx'> 	const char *name;</div><div class='del'>-	char *value = NULL;</div><div class='add'>+	char AUTO_KFREE(value);</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ACL_TYPE_ACCESS:</div><div class='hunk'>@@ -86,28 +85,23 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		nofs_flag = memalloc_nofs_save();</div><div class='ctx'> 		value = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 		memalloc_nofs_restore(nofs_flag);</div><div class='del'>-		if (!value) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (!value)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		ret = posix_acl_to_xattr(&amp;init_user_ns, acl, value, size);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (trans)</div><div class='ctx'> 		ret = btrfs_setxattr(trans, inode, name, value, size, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = btrfs_setxattr_trans(inode, name, value, size, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	kfree(value);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		set_cached_acl(inode, type, acl);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	set_cached_acl(inode, type, acl);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='head'>diff --git a/fs/btrfs/acl.h b/fs/btrfs/acl.h<br/>index a270e71ec05f..0458cd51ed48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/acl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/acl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/acl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/acl.h</a></div><div class='hunk'>@@ -3,8 +3,17 @@</div><div class='ctx'> #ifndef BTRFS_ACL_H</div><div class='ctx'> #define BTRFS_ACL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct posix_acl;</div><div class='add'>+struct inode;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_POSIX_ACL</div><div class='ctx'> </div><div class='add'>+struct mnt_idmap;</div><div class='add'>+struct dentry;</div><div class='add'>+</div><div class='ctx'> struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu);</div><div class='ctx'> int btrfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		  struct posix_acl *acl, int type);</div><div class='hunk'>@@ -13,6 +22,10 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+</div><div class='ctx'> #define btrfs_get_acl NULL</div><div class='ctx'> #define btrfs_set_acl NULL</div><div class='ctx'> static inline int __btrfs_set_acl(struct btrfs_trans_handle *trans,</div><div class='head'>diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c<br/>index 9e261aac671e..6c6f3bb58f4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/async-thread.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/async-thread.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/async-thread.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/async-thread.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;trace/events/btrfs.h&gt;</div><div class='ctx'> #include "async-thread.h"</div><div class='del'>-#include "ctree.h"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	WORK_DONE_BIT,</div><div class='hunk'>@@ -19,7 +18,7 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NO_THRESHOLD (-1)</div><div class='del'>-#define DFT_THRESHOLD (32)</div><div class='add'>+#define DEFAULT_THRESHOLD (32)</div><div class='ctx'> </div><div class='ctx'> struct btrfs_workqueue {</div><div class='ctx'> 	struct workqueue_struct *normal_wq;</div><div class='hunk'>@@ -95,9 +94,9 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	ret-&gt;limit_active = limit_active;</div><div class='ctx'> 	if (thresh == 0)</div><div class='del'>-		thresh = DFT_THRESHOLD;</div><div class='add'>+		thresh = DEFAULT_THRESHOLD;</div><div class='ctx'> 	/* For low threshold, disabling threshold is a better choice */</div><div class='del'>-	if (thresh &lt; DFT_THRESHOLD) {</div><div class='add'>+	if (thresh &lt; DEFAULT_THRESHOLD) {</div><div class='ctx'> 		ret-&gt;current_active = limit_active;</div><div class='ctx'> 		ret-&gt;thresh = NO_THRESHOLD;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -169,7 +168,7 @@ static inline void thresh_exec_hook(struct btrfs_workqueue *wq)</div><div class='ctx'> {</div><div class='ctx'> 	int new_current_active;</div><div class='ctx'> 	long pending;</div><div class='del'>-	int need_change = 0;</div><div class='add'>+	bool need_change = false;</div><div class='ctx'> </div><div class='ctx'> 	if (wq-&gt;thresh == NO_THRESHOLD)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -197,15 +196,14 @@ static inline void thresh_exec_hook(struct btrfs_workqueue *wq)</div><div class='ctx'> 		new_current_active--;</div><div class='ctx'> 	new_current_active = clamp_val(new_current_active, 1, wq-&gt;limit_active);</div><div class='ctx'> 	if (new_current_active != wq-&gt;current_active)  {</div><div class='del'>-		need_change = 1;</div><div class='add'>+		need_change = true;</div><div class='ctx'> 		wq-&gt;current_active = new_current_active;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;wq-&gt;thres_lock);</div><div class='ctx'> </div><div class='del'>-	if (need_change) {</div><div class='add'>+	if (need_change)</div><div class='ctx'> 		workqueue_set_max_active(wq-&gt;normal_wq, wq-&gt;current_active);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_ordered_work(struct btrfs_workqueue *wq,</div><div class='hunk'>@@ -221,8 +219,7 @@ static void run_ordered_work(struct btrfs_workqueue *wq,</div><div class='ctx'> 		spin_lock_irqsave(lock, flags);</div><div class='ctx'> 		if (list_empty(list))</div><div class='ctx'> 			break;</div><div class='del'>-		work = list_entry(list-&gt;next, struct btrfs_work,</div><div class='del'>-				  ordered_list);</div><div class='add'>+		work = list_first_entry(list, struct btrfs_work, ordered_list);</div><div class='ctx'> 		if (!test_bit(WORK_DONE_BIT, &amp;work-&gt;flags))</div><div class='ctx'> 			break;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -297,7 +294,7 @@ static void btrfs_work_helper(struct work_struct *normal_work)</div><div class='ctx'> 	struct btrfs_work *work = container_of(normal_work, struct btrfs_work,</div><div class='ctx'> 					       normal_work);</div><div class='ctx'> 	struct btrfs_workqueue *wq = work-&gt;wq;</div><div class='del'>-	int need_order = 0;</div><div class='add'>+	bool need_order = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We should not touch things inside work in the following cases:</div><div class='hunk'>@@ -308,7 +305,7 @@ static void btrfs_work_helper(struct work_struct *normal_work)</div><div class='ctx'> 	 * So we save the needed things here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (work-&gt;ordered_func)</div><div class='del'>-		need_order = 1;</div><div class='add'>+		need_order = true;</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_work_sched(work);</div><div class='ctx'> 	thresh_exec_hook(wq);</div><div class='head'>diff --git a/fs/btrfs/async-thread.h b/fs/btrfs/async-thread.h<br/>index 62b8a0d57898..04c2f3175828 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/async-thread.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/async-thread.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/async-thread.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/async-thread.h</a></div><div class='hunk'>@@ -7,11 +7,14 @@</div><div class='ctx'> #ifndef BTRFS_ASYNC_THREAD_H</div><div class='ctx'> #define BTRFS_ASYNC_THREAD_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct btrfs_fs_info;</div><div class='ctx'> struct btrfs_workqueue;</div><div class='ctx'> struct btrfs_work;</div><div class='add'>+</div><div class='ctx'> typedef void (*btrfs_func_t)(struct btrfs_work *arg);</div><div class='ctx'> typedef void (*btrfs_ordered_func_t)(struct btrfs_work *arg, bool);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c<br/>index beed7e459dab..78da47a3d00e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/backref.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/backref.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/backref.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/backref.c</a></div><div class='hunk'>@@ -198,10 +198,7 @@ static struct kmem_cache *btrfs_prelim_ref_cache;</div><div class='ctx'> int __init btrfs_prelim_ref_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref",</div><div class='del'>-					sizeof(struct prelim_ref),</div><div class='del'>-					0,</div><div class='del'>-					SLAB_MEM_SPREAD,</div><div class='del'>-					NULL);</div><div class='add'>+					sizeof(struct prelim_ref), 0, 0, NULL);</div><div class='ctx'> 	if (!btrfs_prelim_ref_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -222,8 +219,8 @@ static void free_pref(struct prelim_ref *ref)</div><div class='ctx'>  * A -1 return indicates ref1 is a 'lower' block than ref2, while 1</div><div class='ctx'>  * indicates a 'higher' block.</div><div class='ctx'>  */</div><div class='del'>-static int prelim_ref_compare(struct prelim_ref *ref1,</div><div class='del'>-			      struct prelim_ref *ref2)</div><div class='add'>+static int prelim_ref_compare(const struct prelim_ref *ref1,</div><div class='add'>+			      const struct prelim_ref *ref2)</div><div class='ctx'> {</div><div class='ctx'> 	if (ref1-&gt;level &lt; ref2-&gt;level)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -253,8 +250,23 @@ static int prelim_ref_compare(struct prelim_ref *ref1,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int prelim_ref_rb_add_cmp(const struct rb_node *new,</div><div class='add'>+				 const struct rb_node *exist)</div><div class='add'>+{</div><div class='add'>+	const struct prelim_ref *ref_new =</div><div class='add'>+		rb_entry(new, struct prelim_ref, rbnode);</div><div class='add'>+	const struct prelim_ref *ref_exist =</div><div class='add'>+		rb_entry(exist, struct prelim_ref, rbnode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * prelim_ref_compare() expects the first parameter as the existing one,</div><div class='add'>+	 * different from the rb_find_add_cached() order.</div><div class='add'>+	 */</div><div class='add'>+	return prelim_ref_compare(ref_exist, ref_new);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void update_share_count(struct share_check *sc, int oldcount,</div><div class='del'>-			       int newcount, struct prelim_ref *newref)</div><div class='add'>+			       int newcount, const struct prelim_ref *newref)</div><div class='ctx'> {</div><div class='ctx'> 	if ((!sc) || (oldcount == 0 &amp;&amp; newcount &lt; 1))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -264,7 +276,7 @@ static void update_share_count(struct share_check *sc, int oldcount,</div><div class='ctx'> 	else if (oldcount &lt; 1 &amp;&amp; newcount &gt; 0)</div><div class='ctx'> 		sc-&gt;share_count++;</div><div class='ctx'> </div><div class='del'>-	if (newref-&gt;root_id == sc-&gt;root-&gt;root_key.objectid &amp;&amp;</div><div class='add'>+	if (newref-&gt;root_id == btrfs_root_id(sc-&gt;root) &amp;&amp;</div><div class='ctx'> 	    newref-&gt;wanted_disk_byte == sc-&gt;data_bytenr &amp;&amp;</div><div class='ctx'> 	    newref-&gt;key_for_search.objectid == sc-&gt;inum)</div><div class='ctx'> 		sc-&gt;self_ref_count += newref-&gt;count;</div><div class='hunk'>@@ -281,55 +293,39 @@ static void prelim_ref_insert(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			      struct share_check *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_root_cached *root;</div><div class='del'>-	struct rb_node **p;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	struct prelim_ref *ref;</div><div class='del'>-	int result;</div><div class='del'>-	bool leftmost = true;</div><div class='add'>+	struct rb_node *exist;</div><div class='ctx'> </div><div class='ctx'> 	root = &amp;preftree-&gt;root;</div><div class='del'>-	p = &amp;root-&gt;rb_root.rb_node;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		ref = rb_entry(parent, struct prelim_ref, rbnode);</div><div class='del'>-		result = prelim_ref_compare(ref, newref);</div><div class='del'>-		if (result &lt; 0) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (result &gt; 0) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else {</div><div class='del'>-			/* Identical refs, merge them and free @newref */</div><div class='del'>-			struct extent_inode_elem *eie = ref-&gt;inode_list;</div><div class='add'>+	exist = rb_find_add_cached(&amp;newref-&gt;rbnode, root, prelim_ref_rb_add_cmp);</div><div class='add'>+	if (exist) {</div><div class='add'>+		struct prelim_ref *ref = rb_entry(exist, struct prelim_ref, rbnode);</div><div class='add'>+		/* Identical refs, merge them and free @newref */</div><div class='add'>+		struct extent_inode_elem *eie = ref-&gt;inode_list;</div><div class='ctx'> </div><div class='del'>-			while (eie &amp;&amp; eie-&gt;next)</div><div class='del'>-				eie = eie-&gt;next;</div><div class='add'>+		while (eie &amp;&amp; eie-&gt;next)</div><div class='add'>+			eie = eie-&gt;next;</div><div class='ctx'> </div><div class='del'>-			if (!eie)</div><div class='del'>-				ref-&gt;inode_list = newref-&gt;inode_list;</div><div class='del'>-			else</div><div class='del'>-				eie-&gt;next = newref-&gt;inode_list;</div><div class='del'>-			trace_btrfs_prelim_ref_merge(fs_info, ref, newref,</div><div class='del'>-						     preftree-&gt;count);</div><div class='del'>-			/*</div><div class='del'>-			 * A delayed ref can have newref-&gt;count &lt; 0.</div><div class='del'>-			 * The ref-&gt;count is updated to follow any</div><div class='del'>-			 * BTRFS_[ADD|DROP]_DELAYED_REF actions.</div><div class='del'>-			 */</div><div class='del'>-			update_share_count(sc, ref-&gt;count,</div><div class='del'>-					   ref-&gt;count + newref-&gt;count, newref);</div><div class='del'>-			ref-&gt;count += newref-&gt;count;</div><div class='del'>-			free_pref(newref);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+		if (!eie)</div><div class='add'>+			ref-&gt;inode_list = newref-&gt;inode_list;</div><div class='add'>+		else</div><div class='add'>+			eie-&gt;next = newref-&gt;inode_list;</div><div class='add'>+		trace_btrfs_prelim_ref_merge(fs_info, ref, newref,</div><div class='add'>+							preftree-&gt;count);</div><div class='add'>+		/*</div><div class='add'>+		 * A delayed ref can have newref-&gt;count &lt; 0.</div><div class='add'>+		 * The ref-&gt;count is updated to follow any</div><div class='add'>+		 * BTRFS_[ADD|DROP]_DELAYED_REF actions.</div><div class='add'>+		 */</div><div class='add'>+		update_share_count(sc, ref-&gt;count,</div><div class='add'>+					ref-&gt;count + newref-&gt;count, newref);</div><div class='add'>+		ref-&gt;count += newref-&gt;count;</div><div class='add'>+		free_pref(newref);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	update_share_count(sc, 0, newref-&gt;count, newref);</div><div class='ctx'> 	preftree-&gt;count++;</div><div class='ctx'> 	trace_btrfs_prelim_ref_insert(fs_info, newref, NULL, preftree-&gt;count);</div><div class='del'>-	rb_link_node(&amp;newref-&gt;rbnode, parent, p);</div><div class='del'>-	rb_insert_color_cached(&amp;newref-&gt;rbnode, root, leftmost);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -670,10 +666,9 @@ static int resolve_indirect_ref(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 		ret = btrfs_search_old_slot(root, &amp;search_key, path, ctx-&gt;time_seq);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_debug(ctx-&gt;fs_info,</div><div class='del'>-		"search slot in root %llu (level %d, ref count %d) returned %d for key (%llu %u %llu)",</div><div class='del'>-		 ref-&gt;root_id, level, ref-&gt;count, ret,</div><div class='del'>-		 ref-&gt;key_for_search.objectid, ref-&gt;key_for_search.type,</div><div class='del'>-		 ref-&gt;key_for_search.offset);</div><div class='add'>+"search slot in root %llu (level %d, ref count %d) returned %d for key " BTRFS_KEY_FMT,</div><div class='add'>+		    ref-&gt;root_id, level, ref-&gt;count, ret,</div><div class='add'>+		    BTRFS_KEY_FMT_VALUE(&amp;ref-&gt;key_for_search));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -737,7 +732,6 @@ static int resolve_indirect_refs(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 				 struct preftrees *preftrees,</div><div class='ctx'> 				 struct share_check *sc)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct ulist *parents;</div><div class='ctx'> 	struct ulist_node *node;</div><div class='hunk'>@@ -756,6 +750,7 @@ static int resolve_indirect_refs(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while ((rnode = rb_first_cached(&amp;preftrees-&gt;indirect.root))) {</div><div class='ctx'> 		struct prelim_ref *ref;</div><div class='add'>+		int ret2;</div><div class='ctx'> </div><div class='ctx'> 		ref = rb_entry(rnode, struct prelim_ref, rbnode);</div><div class='ctx'> 		if (WARN(ref-&gt;parent,</div><div class='hunk'>@@ -772,23 +767,23 @@ static int resolve_indirect_refs(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (sc &amp;&amp; ref-&gt;root_id != sc-&gt;root-&gt;root_key.objectid) {</div><div class='add'>+		if (sc &amp;&amp; ref-&gt;root_id != btrfs_root_id(sc-&gt;root)) {</div><div class='ctx'> 			free_pref(ref);</div><div class='ctx'> 			ret = BACKREF_FOUND_SHARED;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		err = resolve_indirect_ref(ctx, path, preftrees, ref, parents);</div><div class='add'>+		ret2 = resolve_indirect_ref(ctx, path, preftrees, ref, parents);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * we can only tolerate ENOENT,otherwise,we should catch error</div><div class='ctx'> 		 * and return directly.</div><div class='ctx'> 		 */</div><div class='del'>-		if (err == -ENOENT) {</div><div class='add'>+		if (ret2 == -ENOENT) {</div><div class='ctx'> 			prelim_ref_insert(ctx-&gt;fs_info, &amp;preftrees-&gt;direct, ref,</div><div class='ctx'> 					  NULL);</div><div class='ctx'> 			continue;</div><div class='del'>-		} else if (err) {</div><div class='add'>+		} else if (ret2) {</div><div class='ctx'> 			free_pref(ref);</div><div class='del'>-			ret = err;</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -863,7 +858,7 @@ static int add_missing_keys(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			free_pref(ref);</div><div class='ctx'> 			return PTR_ERR(eb);</div><div class='ctx'> 		}</div><div class='del'>-		if (!extent_buffer_uptodate(eb)) {</div><div class='add'>+		if (unlikely(!extent_buffer_uptodate(eb))) {</div><div class='ctx'> 			free_pref(ref);</div><div class='ctx'> 			free_extent_buffer(eb);</div><div class='ctx'> 			return -EIO;</div><div class='hunk'>@@ -922,40 +917,38 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		switch (node-&gt;type) {</div><div class='ctx'> 		case BTRFS_TREE_BLOCK_REF_KEY: {</div><div class='ctx'> 			/* NORMAL INDIRECT METADATA backref */</div><div class='del'>-			struct btrfs_delayed_tree_ref *ref;</div><div class='ctx'> 			struct btrfs_key *key_ptr = NULL;</div><div class='add'>+			/* The owner of a tree block ref is the level. */</div><div class='add'>+			int level = btrfs_delayed_ref_owner(node);</div><div class='ctx'> </div><div class='ctx'> 			if (head-&gt;extent_op &amp;&amp; head-&gt;extent_op-&gt;update_key) {</div><div class='ctx'> 				btrfs_disk_key_to_cpu(&amp;key, &amp;head-&gt;extent_op-&gt;key);</div><div class='ctx'> 				key_ptr = &amp;key;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ref = btrfs_delayed_node_to_tree_ref(node);</div><div class='del'>-			ret = add_indirect_ref(fs_info, preftrees, ref-&gt;root,</div><div class='del'>-					       key_ptr, ref-&gt;level + 1,</div><div class='del'>-					       node-&gt;bytenr, count, sc,</div><div class='del'>-					       GFP_ATOMIC);</div><div class='add'>+			ret = add_indirect_ref(fs_info, preftrees, node-&gt;ref_root,</div><div class='add'>+					       key_ptr, level + 1, node-&gt;bytenr,</div><div class='add'>+					       count, sc, GFP_ATOMIC);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		case BTRFS_SHARED_BLOCK_REF_KEY: {</div><div class='del'>-			/* SHARED DIRECT METADATA backref */</div><div class='del'>-			struct btrfs_delayed_tree_ref *ref;</div><div class='del'>-</div><div class='del'>-			ref = btrfs_delayed_node_to_tree_ref(node);</div><div class='add'>+			/*</div><div class='add'>+			 * SHARED DIRECT METADATA backref</div><div class='add'>+			 *</div><div class='add'>+			 * The owner of a tree block ref is the level.</div><div class='add'>+			 */</div><div class='add'>+			int level = btrfs_delayed_ref_owner(node);</div><div class='ctx'> </div><div class='del'>-			ret = add_direct_ref(fs_info, preftrees, ref-&gt;level + 1,</div><div class='del'>-					     ref-&gt;parent, node-&gt;bytenr, count,</div><div class='add'>+			ret = add_direct_ref(fs_info, preftrees, level + 1,</div><div class='add'>+					     node-&gt;parent, node-&gt;bytenr, count,</div><div class='ctx'> 					     sc, GFP_ATOMIC);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		case BTRFS_EXTENT_DATA_REF_KEY: {</div><div class='ctx'> 			/* NORMAL INDIRECT DATA backref */</div><div class='del'>-			struct btrfs_delayed_data_ref *ref;</div><div class='del'>-			ref = btrfs_delayed_node_to_data_ref(node);</div><div class='del'>-</div><div class='del'>-			key.objectid = ref-&gt;objectid;</div><div class='add'>+			key.objectid = btrfs_delayed_ref_owner(node);</div><div class='ctx'> 			key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='del'>-			key.offset = ref-&gt;offset;</div><div class='add'>+			key.offset = btrfs_delayed_ref_offset(node);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we have a share check context and a reference for</div><div class='hunk'>@@ -975,18 +968,14 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			if (sc &amp;&amp; count &lt; 0)</div><div class='ctx'> 				sc-&gt;have_delayed_delete_refs = true;</div><div class='ctx'> </div><div class='del'>-			ret = add_indirect_ref(fs_info, preftrees, ref-&gt;root,</div><div class='add'>+			ret = add_indirect_ref(fs_info, preftrees, node-&gt;ref_root,</div><div class='ctx'> 					       &amp;key, 0, node-&gt;bytenr, count, sc,</div><div class='ctx'> 					       GFP_ATOMIC);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		case BTRFS_SHARED_DATA_REF_KEY: {</div><div class='ctx'> 			/* SHARED DIRECT FULL backref */</div><div class='del'>-			struct btrfs_delayed_data_ref *ref;</div><div class='del'>-</div><div class='del'>-			ref = btrfs_delayed_node_to_data_ref(node);</div><div class='del'>-</div><div class='del'>-			ret = add_direct_ref(fs_info, preftrees, 0, ref-&gt;parent,</div><div class='add'>+			ret = add_direct_ref(fs_info, preftrees, 0, node-&gt;parent,</div><div class='ctx'> 					     node-&gt;bytenr, count, sc,</div><div class='ctx'> 					     GFP_ATOMIC);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1036,8 +1025,6 @@ static int add_inline_refs(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='ctx'> </div><div class='ctx'> 	item_size = btrfs_item_size(leaf, slot);</div><div class='del'>-	BUG_ON(item_size &lt; sizeof(*ei));</div><div class='del'>-</div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, slot, struct btrfs_extent_item);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;check_extent_item) {</div><div class='hunk'>@@ -1074,7 +1061,7 @@ static int add_inline_refs(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 		iref = (struct btrfs_extent_inline_ref *)ptr;</div><div class='ctx'> 		type = btrfs_get_extent_inline_ref_type(leaf, iref,</div><div class='ctx'> 							BTRFS_REF_TYPE_ANY);</div><div class='del'>-		if (type == BTRFS_REF_TYPE_INVALID)</div><div class='add'>+		if (unlikely(type == BTRFS_REF_TYPE_INVALID))</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> </div><div class='ctx'> 		offset = btrfs_extent_inline_ref_offset(leaf, iref);</div><div class='hunk'>@@ -1411,22 +1398,22 @@ static int find_parent_nodes(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 		ASSERT(ctx-&gt;roots == NULL);</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = ctx-&gt;bytenr;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	if (btrfs_fs_incompat(ctx-&gt;fs_info, SKINNY_METADATA))</div><div class='ctx'> 		key.type = BTRFS_METADATA_ITEM_KEY;</div><div class='ctx'> 	else</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (!ctx-&gt;trans) {</div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='add'>+		path-&gt;search_commit_root = true;</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;time_seq == BTRFS_SEQ_LAST)</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	head = NULL;</div><div class='hunk'>@@ -1434,9 +1421,11 @@ again:</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		/* This shouldn't happen, indicates a bug or fs corruption. */</div><div class='del'>-		ASSERT(ret != 0);</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist an extent</div><div class='add'>+		 * item with such offset, but this is out of the valid range.</div><div class='add'>+		 */</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1451,7 +1440,8 @@ again:</div><div class='ctx'> 		 */</div><div class='ctx'> 		delayed_refs = &amp;ctx-&gt;trans-&gt;transaction-&gt;delayed_refs;</div><div class='ctx'> 		spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-		head = btrfs_find_delayed_ref_head(delayed_refs, ctx-&gt;bytenr);</div><div class='add'>+		head = btrfs_find_delayed_ref_head(ctx-&gt;fs_info, delayed_refs,</div><div class='add'>+						   ctx-&gt;bytenr);</div><div class='ctx'> 		if (head) {</div><div class='ctx'> 			if (!mutex_trylock(&amp;head-&gt;mutex)) {</div><div class='ctx'> 				refcount_inc(&amp;head-&gt;refs);</div><div class='hunk'>@@ -1570,7 +1560,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	ret = add_missing_keys(ctx-&gt;fs_info, &amp;preftrees, path-&gt;skip_locking == 0);</div><div class='add'>+	ret = add_missing_keys(ctx-&gt;fs_info, &amp;preftrees, !path-&gt;skip_locking);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1623,7 +1613,7 @@ again:</div><div class='ctx'> 					ret = PTR_ERR(eb);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				if (!extent_buffer_uptodate(eb)) {</div><div class='add'>+				if (unlikely(!extent_buffer_uptodate(eb))) {</div><div class='ctx'> 					free_extent_buffer(eb);</div><div class='ctx'> 					ret = -EIO;</div><div class='ctx'> 					goto out;</div><div class='hunk'>@@ -1661,7 +1651,7 @@ again:</div><div class='ctx'> 				 * case.</div><div class='ctx'> 				 */</div><div class='ctx'> 				ASSERT(eie);</div><div class='del'>-				if (!eie) {</div><div class='add'>+				if (unlikely(!eie)) {</div><div class='ctx'> 					ret = -EUCLEAN;</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1699,7 +1689,7 @@ out:</div><div class='ctx'>  * @ctx-&gt;bytenr and @ctx-&gt;extent_item_pos. The bytenr of the found leaves are</div><div class='ctx'>  * added to the ulist at @ctx-&gt;refs, and that ulist is allocated by this</div><div class='ctx'>  * function. The caller should free the ulist with free_leaf_list() if</div><div class='del'>- * @ctx-&gt;ignore_extent_item_pos is false, otherwise a fimple ulist_free() is</div><div class='add'>+ * @ctx-&gt;ignore_extent_item_pos is false, otherwise a simple ulist_free() is</div><div class='ctx'>  * enough.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success and &lt; 0 on error. On error @ctx-&gt;refs is not allocated.</div><div class='hunk'>@@ -2210,21 +2200,27 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> 	u64 size = 0;</div><div class='del'>-	u32 item_size;</div><div class='ctx'> 	const struct extent_buffer *eb;</div><div class='ctx'> 	struct btrfs_extent_item *ei;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='add'>+	key.objectid = logical;</div><div class='ctx'> 	if (btrfs_fs_incompat(fs_info, SKINNY_METADATA))</div><div class='ctx'> 		key.type = BTRFS_METADATA_ITEM_KEY;</div><div class='ctx'> 	else</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='del'>-	key.objectid = logical;</div><div class='ctx'> 	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, extent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist an extent</div><div class='add'>+		 * item with such offset, but this is out of the valid range.</div><div class='add'>+		 */</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_previous_extent_item(extent_root, path, 0);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -2246,8 +2242,6 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	eb = path-&gt;nodes[0];</div><div class='del'>-	item_size = btrfs_item_size(eb, path-&gt;slots[0]);</div><div class='del'>-	BUG_ON(item_size &lt; sizeof(*ei));</div><div class='ctx'> </div><div class='ctx'> 	ei = btrfs_item_ptr(eb, path-&gt;slots[0], struct btrfs_extent_item);</div><div class='ctx'> 	flags = btrfs_extent_flags(eb, ei);</div><div class='hunk'>@@ -2255,7 +2249,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> 	btrfs_debug(fs_info,</div><div class='ctx'> 		"logical %llu is at position %llu within the extent (%llu EXTENT_ITEM %llu) flags %#llx size %u",</div><div class='ctx'> 		 logical, logical - found_key-&gt;objectid, found_key-&gt;objectid,</div><div class='del'>-		 found_key-&gt;offset, flags, item_size);</div><div class='add'>+		 found_key-&gt;offset, flags, btrfs_item_size(eb, path-&gt;slots[0]));</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!flags_ret);</div><div class='ctx'> 	if (flags_ret) {</div><div class='hunk'>@@ -2317,7 +2311,7 @@ static int get_extent_inline_ref(unsigned long *ptr,</div><div class='ctx'> 	*out_eiref = (struct btrfs_extent_inline_ref *)(*ptr);</div><div class='ctx'> 	*out_type = btrfs_get_extent_inline_ref_type(eb, *out_eiref,</div><div class='ctx'> 						     BTRFS_REF_TYPE_ANY);</div><div class='del'>-	if (*out_type == BTRFS_REF_TYPE_INVALID)</div><div class='add'>+	if (unlikely(*out_type == BTRFS_REF_TYPE_INVALID))</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> </div><div class='ctx'> 	*ptr += btrfs_extent_inline_ref_size(*out_type);</div><div class='hunk'>@@ -2551,17 +2545,20 @@ static int build_ino_list(u64 inum, u64 offset, u64 num_bytes, u64 root, void *c</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_path *path,</div><div class='ctx'> 				void *ctx, bool ignore_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_backref_walk_ctx walk_ctx = { 0 };</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 flags = 0;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	int search_commit_root = path-&gt;search_commit_root;</div><div class='add'>+	struct btrfs_path *path;</div><div class='add'>+</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = extent_from_logical(fs_info, logical, path, &amp;found_key, &amp;flags);</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_free_path(path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (flags &amp; BTRFS_EXTENT_FLAG_TREE_BLOCK)</div><div class='hunk'>@@ -2574,8 +2571,7 @@ int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		walk_ctx.extent_item_pos = logical - found_key.objectid;</div><div class='ctx'> 	walk_ctx.fs_info = fs_info;</div><div class='ctx'> </div><div class='del'>-	return iterate_extent_inodes(&amp;walk_ctx, search_commit_root,</div><div class='del'>-				     build_ino_list, ctx);</div><div class='add'>+	return iterate_extent_inodes(&amp;walk_ctx, false, build_ino_list, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inode_to_path(u64 inum, u32 name_len, unsigned long name_off,</div><div class='hunk'>@@ -2626,7 +2622,7 @@ static int iterate_inode_refs(u64 inum, struct inode_fs_paths *ipath)</div><div class='ctx'> 			btrfs_debug(fs_root-&gt;fs_info,</div><div class='ctx'> 				"following ref at offset %u for inode %llu in tree %llu",</div><div class='ctx'> 				cur, found_key.objectid,</div><div class='del'>-				fs_root-&gt;root_key.objectid);</div><div class='add'>+				btrfs_root_id(fs_root));</div><div class='ctx'> 			ret = inode_to_path(parent, name_len,</div><div class='ctx'> 				      (unsigned long)(iref + 1), eb, ipath);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -2773,20 +2769,14 @@ struct btrfs_data_container *init_data_container(u32 total_bytes)</div><div class='ctx'> 	size_t alloc_bytes;</div><div class='ctx'> </div><div class='ctx'> 	alloc_bytes = max_t(size_t, total_bytes, sizeof(*data));</div><div class='del'>-	data = kvmalloc(alloc_bytes, GFP_KERNEL);</div><div class='add'>+	data = kvzalloc(alloc_bytes, GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (total_bytes &gt;= sizeof(*data)) {</div><div class='add'>+	if (total_bytes &gt;= sizeof(*data))</div><div class='ctx'> 		data-&gt;bytes_left = total_bytes - sizeof(*data);</div><div class='del'>-		data-&gt;bytes_missing = 0;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		data-&gt;bytes_missing = sizeof(*data) - total_bytes;</div><div class='del'>-		data-&gt;bytes_left = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data-&gt;elem_cnt = 0;</div><div class='del'>-	data-&gt;elem_missed = 0;</div><div class='ctx'> </div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='hunk'>@@ -2795,7 +2785,7 @@ struct btrfs_data_container *init_data_container(u32 total_bytes)</div><div class='ctx'>  * allocates space to return multiple file system paths for an inode.</div><div class='ctx'>  * total_bytes to allocate are passed, note that space usable for actual path</div><div class='ctx'>  * information will be total_bytes - sizeof(struct inode_fs_paths).</div><div class='del'>- * the returned pointer must be freed with free_ipath() in the end.</div><div class='add'>+ * the returned pointer must be freed with __free_inode_fs_paths() in the end.</div><div class='ctx'>  */</div><div class='ctx'> struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,</div><div class='ctx'> 					struct btrfs_path *path)</div><div class='hunk'>@@ -2820,14 +2810,6 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,</div><div class='ctx'> 	return ifp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void free_ipath(struct inode_fs_paths *ipath)</div><div class='del'>-{</div><div class='del'>-	if (!ipath)</div><div class='del'>-		return;</div><div class='del'>-	kvfree(ipath-&gt;fspath);</div><div class='del'>-	kfree(ipath);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_backref_iter *ret;</div><div class='hunk'>@@ -2843,13 +2825,23 @@ struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_inf</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Current backref iterator only supports iteration in commit root */</div><div class='del'>-	ret-&gt;path-&gt;search_commit_root = 1;</div><div class='del'>-	ret-&gt;path-&gt;skip_locking = 1;</div><div class='add'>+	ret-&gt;path-&gt;search_commit_root = true;</div><div class='add'>+	ret-&gt;path-&gt;skip_locking = true;</div><div class='ctx'> 	ret-&gt;fs_info = fs_info;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void btrfs_backref_iter_release(struct btrfs_backref_iter *iter)</div><div class='add'>+{</div><div class='add'>+	iter-&gt;bytenr = 0;</div><div class='add'>+	iter-&gt;item_ptr = 0;</div><div class='add'>+	iter-&gt;cur_ptr = 0;</div><div class='add'>+	iter-&gt;end_ptr = 0;</div><div class='add'>+	btrfs_release_path(iter-&gt;path);</div><div class='add'>+	memset(&amp;iter-&gt;cur_key, 0, sizeof(iter-&gt;cur_key));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = iter-&gt;fs_info;</div><div class='hunk'>@@ -2867,12 +2859,16 @@ int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr)</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, extent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (ret == 0) {</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist an extent</div><div class='add'>+		 * item with such offset, but this is out of the valid range.</div><div class='add'>+		 */</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto release;</div><div class='ctx'> 	}</div><div class='del'>-	if (path-&gt;slots[0] == 0) {</div><div class='del'>-		WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='add'>+	if (unlikely(path-&gt;slots[0] == 0)) {</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto release;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2938,6 +2934,14 @@ release:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool btrfs_backref_iter_is_inline_ref(struct btrfs_backref_iter *iter)</div><div class='add'>+{</div><div class='add'>+	if (iter-&gt;cur_key.type == BTRFS_EXTENT_ITEM_KEY ||</div><div class='add'>+	    iter-&gt;cur_key.type == BTRFS_METADATA_ITEM_KEY)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Go to the next backref item of current bytenr, can be either inlined or</div><div class='ctx'>  * keyed.</div><div class='hunk'>@@ -2950,7 +2954,7 @@ release:</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_backref_iter_next(struct btrfs_backref_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	struct extent_buffer *eb = btrfs_backref_get_eb(iter);</div><div class='add'>+	struct extent_buffer *eb = iter-&gt;path-&gt;nodes[0];</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='ctx'> 	struct btrfs_path *path = iter-&gt;path;</div><div class='ctx'> 	struct btrfs_extent_inline_ref *iref;</div><div class='hunk'>@@ -3008,9 +3012,6 @@ void btrfs_backref_init_cache(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	cache-&gt;rb_root = RB_ROOT;</div><div class='ctx'> 	for (i = 0; i &lt; BTRFS_MAX_LEVEL; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cache-&gt;pending[i]);</div><div class='del'>-	INIT_LIST_HEAD(&amp;cache-&gt;changed);</div><div class='del'>-	INIT_LIST_HEAD(&amp;cache-&gt;detached);</div><div class='del'>-	INIT_LIST_HEAD(&amp;cache-&gt;leaves);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cache-&gt;pending_edge);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cache-&gt;useless_node);</div><div class='ctx'> 	cache-&gt;fs_info = fs_info;</div><div class='hunk'>@@ -3038,6 +3039,19 @@ struct btrfs_backref_node *btrfs_backref_alloc_node(</div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_backref_free_node(struct btrfs_backref_cache *cache,</div><div class='add'>+			     struct btrfs_backref_node *node)</div><div class='add'>+{</div><div class='add'>+	if (node) {</div><div class='add'>+		ASSERT(list_empty(&amp;node-&gt;list));</div><div class='add'>+		ASSERT(list_empty(&amp;node-&gt;lower));</div><div class='add'>+		ASSERT(node-&gt;eb == NULL);</div><div class='add'>+		cache-&gt;nr_nodes--;</div><div class='add'>+		btrfs_put_root(node-&gt;root);</div><div class='add'>+		kfree(node);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct btrfs_backref_edge *btrfs_backref_alloc_edge(</div><div class='ctx'> 		struct btrfs_backref_cache *cache)</div><div class='ctx'> {</div><div class='hunk'>@@ -3049,6 +3063,52 @@ struct btrfs_backref_edge *btrfs_backref_alloc_edge(</div><div class='ctx'> 	return edge;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_backref_free_edge(struct btrfs_backref_cache *cache,</div><div class='add'>+			     struct btrfs_backref_edge *edge)</div><div class='add'>+{</div><div class='add'>+	if (edge) {</div><div class='add'>+		cache-&gt;nr_edges--;</div><div class='add'>+		kfree(edge);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_backref_unlock_node_buffer(struct btrfs_backref_node *node)</div><div class='add'>+{</div><div class='add'>+	if (node-&gt;locked) {</div><div class='add'>+		btrfs_tree_unlock(node-&gt;eb);</div><div class='add'>+		node-&gt;locked = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_backref_drop_node_buffer(struct btrfs_backref_node *node)</div><div class='add'>+{</div><div class='add'>+	if (node-&gt;eb) {</div><div class='add'>+		btrfs_backref_unlock_node_buffer(node);</div><div class='add'>+		free_extent_buffer(node-&gt;eb);</div><div class='add'>+		node-&gt;eb = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Drop the backref node from cache without cleaning up its children</div><div class='add'>+ * edges.</div><div class='add'>+ *</div><div class='add'>+ * This can only be called on node without parent edges.</div><div class='add'>+ * The children edges are still kept as is.</div><div class='add'>+ */</div><div class='add'>+void btrfs_backref_drop_node(struct btrfs_backref_cache *tree,</div><div class='add'>+			     struct btrfs_backref_node *node)</div><div class='add'>+{</div><div class='add'>+	ASSERT(list_empty(&amp;node-&gt;upper));</div><div class='add'>+</div><div class='add'>+	btrfs_backref_drop_node_buffer(node);</div><div class='add'>+	list_del_init(&amp;node-&gt;list);</div><div class='add'>+	list_del_init(&amp;node-&gt;lower);</div><div class='add'>+	if (!RB_EMPTY_NODE(&amp;node-&gt;rb_node))</div><div class='add'>+		rb_erase(&amp;node-&gt;rb_node, &amp;tree-&gt;rb_root);</div><div class='add'>+	btrfs_backref_free_node(tree, node);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Drop the backref node from cache, also cleaning up all its</div><div class='ctx'>  * upper edges and any uncached nodes in the path.</div><div class='hunk'>@@ -3059,29 +3119,17 @@ struct btrfs_backref_edge *btrfs_backref_alloc_edge(</div><div class='ctx'> void btrfs_backref_cleanup_node(struct btrfs_backref_cache *cache,</div><div class='ctx'> 				struct btrfs_backref_node *node)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_backref_node *upper;</div><div class='ctx'> 	struct btrfs_backref_edge *edge;</div><div class='ctx'> </div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!node-&gt;lowest &amp;&amp; !node-&gt;detached);</div><div class='ctx'> 	while (!list_empty(&amp;node-&gt;upper)) {</div><div class='del'>-		edge = list_entry(node-&gt;upper.next, struct btrfs_backref_edge,</div><div class='del'>-				  list[LOWER]);</div><div class='del'>-		upper = edge-&gt;node[UPPER];</div><div class='add'>+		edge = list_first_entry(&amp;node-&gt;upper, struct btrfs_backref_edge,</div><div class='add'>+					list[LOWER]);</div><div class='ctx'> 		list_del(&amp;edge-&gt;list[LOWER]);</div><div class='ctx'> 		list_del(&amp;edge-&gt;list[UPPER]);</div><div class='ctx'> 		btrfs_backref_free_edge(cache, edge);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Add the node to leaf node list if no other child block</div><div class='del'>-		 * cached.</div><div class='del'>-		 */</div><div class='del'>-		if (list_empty(&amp;upper-&gt;lower)) {</div><div class='del'>-			list_add_tail(&amp;upper-&gt;lower, &amp;cache-&gt;leaves);</div><div class='del'>-			upper-&gt;lowest = 1;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_backref_drop_node(cache, node);</div><div class='hunk'>@@ -3093,33 +3141,26 @@ void btrfs_backref_cleanup_node(struct btrfs_backref_cache *cache,</div><div class='ctx'> void btrfs_backref_release_cache(struct btrfs_backref_cache *cache)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_backref_node *node;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;cache-&gt;detached)) {</div><div class='del'>-		node = list_entry(cache-&gt;detached.next,</div><div class='del'>-				  struct btrfs_backref_node, list);</div><div class='add'>+	while ((node = rb_entry_safe(rb_first(&amp;cache-&gt;rb_root),</div><div class='add'>+				     struct btrfs_backref_node, rb_node)))</div><div class='ctx'> 		btrfs_backref_cleanup_node(cache, node);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;cache-&gt;leaves)) {</div><div class='del'>-		node = list_entry(cache-&gt;leaves.next,</div><div class='del'>-				  struct btrfs_backref_node, lower);</div><div class='del'>-		btrfs_backref_cleanup_node(cache, node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cache-&gt;last_trans = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTRFS_MAX_LEVEL; i++)</div><div class='del'>-		ASSERT(list_empty(&amp;cache-&gt;pending[i]));</div><div class='ctx'> 	ASSERT(list_empty(&amp;cache-&gt;pending_edge));</div><div class='ctx'> 	ASSERT(list_empty(&amp;cache-&gt;useless_node));</div><div class='del'>-	ASSERT(list_empty(&amp;cache-&gt;changed));</div><div class='del'>-	ASSERT(list_empty(&amp;cache-&gt;detached));</div><div class='del'>-	ASSERT(RB_EMPTY_ROOT(&amp;cache-&gt;rb_root));</div><div class='ctx'> 	ASSERT(!cache-&gt;nr_nodes);</div><div class='ctx'> 	ASSERT(!cache-&gt;nr_edges);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void btrfs_backref_link_edge(struct btrfs_backref_edge *edge,</div><div class='add'>+				    struct btrfs_backref_node *lower,</div><div class='add'>+				    struct btrfs_backref_node *upper)</div><div class='add'>+{</div><div class='add'>+	ASSERT(upper &amp;&amp; lower &amp;&amp; upper-&gt;level == lower-&gt;level + 1);</div><div class='add'>+	edge-&gt;node[LOWER] = lower;</div><div class='add'>+	edge-&gt;node[UPPER] = upper;</div><div class='add'>+	list_add_tail(&amp;edge-&gt;list[LOWER], &amp;lower-&gt;upper);</div><div class='add'>+}</div><div class='ctx'> /*</div><div class='ctx'>  * Handle direct tree backref</div><div class='ctx'>  *</div><div class='hunk'>@@ -3188,7 +3229,7 @@ static int handle_direct_tree_backref(struct btrfs_backref_cache *cache,</div><div class='ctx'> 		ASSERT(upper-&gt;checked);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;edge-&gt;list[UPPER]);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_backref_link_edge(edge, cur, upper, LINK_LOWER);</div><div class='add'>+	btrfs_backref_link_edge(edge, cur, upper);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3226,8 +3267,12 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	root = btrfs_get_fs_root(fs_info, ref_key-&gt;offset, false);</div><div class='ctx'> 	if (IS_ERR(root))</div><div class='ctx'> 		return PTR_ERR(root);</div><div class='del'>-	if (!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))</div><div class='del'>-		cur-&gt;cowonly = 1;</div><div class='add'>+</div><div class='add'>+	/* We shouldn't be using backref cache for non-shareable roots. */</div><div class='add'>+	if (unlikely(!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))) {</div><div class='add'>+		btrfs_put_root(root);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_root_level(&amp;root-&gt;root_item) == cur-&gt;level) {</div><div class='ctx'> 		/* Tree root */</div><div class='hunk'>@@ -3254,8 +3299,8 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	level = cur-&gt;level + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Search the tree to find parent blocks referring to the block */</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> 	path-&gt;lowest_level = level;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, tree_key, path, 0, 0);</div><div class='ctx'> 	path-&gt;lowest_level = 0;</div><div class='hunk'>@@ -3269,9 +3314,9 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	eb = path-&gt;nodes[level];</div><div class='ctx'> 	if (btrfs_node_blockptr(eb, path-&gt;slots[level]) != cur-&gt;bytenr) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='del'>-"couldn't find block (%llu) (level %d) in tree (%llu) with key (%llu %u %llu)",</div><div class='del'>-			  cur-&gt;bytenr, level - 1, root-&gt;root_key.objectid,</div><div class='del'>-			  tree_key-&gt;objectid, tree_key-&gt;type, tree_key-&gt;offset);</div><div class='add'>+"couldn't find block (%llu) (level %d) in tree (%llu) with key " BTRFS_KEY_FMT,</div><div class='add'>+			  cur-&gt;bytenr, level - 1, btrfs_root_id(root),</div><div class='add'>+			  BTRFS_KEY_FMT_VALUE(tree_key));</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3313,8 +3358,15 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			upper-&gt;owner = btrfs_header_owner(eb);</div><div class='del'>-			if (!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))</div><div class='del'>-				upper-&gt;cowonly = 1;</div><div class='add'>+</div><div class='add'>+			/* We shouldn't be using backref cache for non shareable roots. */</div><div class='add'>+			if (unlikely(!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))) {</div><div class='add'>+				btrfs_put_root(root);</div><div class='add'>+				btrfs_backref_free_edge(cache, edge);</div><div class='add'>+				btrfs_backref_free_node(cache, upper);</div><div class='add'>+				ret = -EUCLEAN;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we know the block isn't shared we can avoid</div><div class='hunk'>@@ -3347,7 +3399,7 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			if (!upper-&gt;owner)</div><div class='ctx'> 				upper-&gt;owner = btrfs_header_owner(eb);</div><div class='ctx'> 		}</div><div class='del'>-		btrfs_backref_link_edge(edge, lower, upper, LINK_LOWER);</div><div class='add'>+		btrfs_backref_link_edge(edge, lower, upper);</div><div class='ctx'> </div><div class='ctx'> 		if (rb_node) {</div><div class='ctx'> 			btrfs_put_root(root);</div><div class='hunk'>@@ -3396,7 +3448,7 @@ int btrfs_backref_add_tree_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		/* No extra backref? This means the tree block is corrupted */</div><div class='del'>-		if (ret &gt; 0) {</div><div class='add'>+		if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3408,8 +3460,8 @@ int btrfs_backref_add_tree_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * type BTRFS_TREE_BLOCK_REF_KEY</div><div class='ctx'> 		 */</div><div class='ctx'> 		ASSERT(list_is_singular(&amp;cur-&gt;upper));</div><div class='del'>-		edge = list_entry(cur-&gt;upper.next, struct btrfs_backref_edge,</div><div class='del'>-				  list[LOWER]);</div><div class='add'>+		edge = list_first_entry(&amp;cur-&gt;upper, struct btrfs_backref_edge,</div><div class='add'>+					list[LOWER]);</div><div class='ctx'> 		ASSERT(list_empty(&amp;edge-&gt;list[UPPER]));</div><div class='ctx'> 		exist = edge-&gt;node[UPPER];</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3428,7 +3480,7 @@ int btrfs_backref_add_tree_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		int type;</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='del'>-		eb = btrfs_backref_get_eb(iter);</div><div class='add'>+		eb = iter-&gt;path-&gt;nodes[0];</div><div class='ctx'> </div><div class='ctx'> 		key.objectid = iter-&gt;bytenr;</div><div class='ctx'> 		if (btrfs_backref_iter_is_inline_ref(iter)) {</div><div class='hunk'>@@ -3439,7 +3491,7 @@ int btrfs_backref_add_tree_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				((unsigned long)iter-&gt;cur_ptr);</div><div class='ctx'> 			type = btrfs_get_extent_inline_ref_type(eb, iref,</div><div class='ctx'> 							BTRFS_REF_TYPE_BLOCK);</div><div class='del'>-			if (type == BTRFS_REF_TYPE_INVALID) {</div><div class='add'>+			if (unlikely(type == BTRFS_REF_TYPE_INVALID)) {</div><div class='ctx'> 				ret = -EUCLEAN;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3505,15 +3557,9 @@ int btrfs_backref_finish_upper_links(struct btrfs_backref_cache *cache,</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(start-&gt;checked);</div><div class='ctx'> </div><div class='del'>-	/* Insert this node to cache if it's not COW-only */</div><div class='del'>-	if (!start-&gt;cowonly) {</div><div class='del'>-		rb_node = rb_simple_insert(&amp;cache-&gt;rb_root, start-&gt;bytenr,</div><div class='del'>-					   &amp;start-&gt;rb_node);</div><div class='del'>-		if (rb_node)</div><div class='del'>-			btrfs_backref_panic(cache-&gt;fs_info, start-&gt;bytenr,</div><div class='del'>-					    -EEXIST);</div><div class='del'>-		list_add_tail(&amp;start-&gt;lower, &amp;cache-&gt;leaves);</div><div class='del'>-	}</div><div class='add'>+	rb_node = rb_simple_insert(&amp;cache-&gt;rb_root, &amp;start-&gt;simple_node);</div><div class='add'>+	if (rb_node)</div><div class='add'>+		btrfs_backref_panic(cache-&gt;fs_info, start-&gt;bytenr, -EEXIST);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Use breadth first search to iterate all related edges.</div><div class='hunk'>@@ -3552,38 +3598,22 @@ int btrfs_backref_finish_upper_links(struct btrfs_backref_cache *cache,</div><div class='ctx'> 		 * parents have already been linked.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!RB_EMPTY_NODE(&amp;upper-&gt;rb_node)) {</div><div class='del'>-			if (upper-&gt;lowest) {</div><div class='del'>-				list_del_init(&amp;upper-&gt;lower);</div><div class='del'>-				upper-&gt;lowest = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='ctx'> 			list_add_tail(&amp;edge-&gt;list[UPPER], &amp;upper-&gt;lower);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Sanity check, we shouldn't have any unchecked nodes */</div><div class='del'>-		if (!upper-&gt;checked) {</div><div class='del'>-			ASSERT(0);</div><div class='add'>+		if (unlikely(!upper-&gt;checked)) {</div><div class='add'>+			DEBUG_WARN("we should not have any unchecked nodes");</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Sanity check, COW-only node has non-COW-only parent */</div><div class='del'>-		if (start-&gt;cowonly != upper-&gt;cowonly) {</div><div class='del'>-			ASSERT(0);</div><div class='add'>+		rb_node = rb_simple_insert(&amp;cache-&gt;rb_root, &amp;upper-&gt;simple_node);</div><div class='add'>+		if (unlikely(rb_node)) {</div><div class='add'>+			btrfs_backref_panic(cache-&gt;fs_info, upper-&gt;bytenr, -EEXIST);</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Only cache non-COW-only (subvolume trees) tree blocks */</div><div class='del'>-		if (!upper-&gt;cowonly) {</div><div class='del'>-			rb_node = rb_simple_insert(&amp;cache-&gt;rb_root, upper-&gt;bytenr,</div><div class='del'>-						   &amp;upper-&gt;rb_node);</div><div class='del'>-			if (rb_node) {</div><div class='del'>-				btrfs_backref_panic(cache-&gt;fs_info,</div><div class='del'>-						upper-&gt;bytenr, -EEXIST);</div><div class='del'>-				return -EUCLEAN;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		list_add_tail(&amp;edge-&gt;list[UPPER], &amp;upper-&gt;lower);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='head'>diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h<br/>index ab4ca0eda605..1d009b0f4c69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/backref.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/backref.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/backref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/backref.h</a></div><div class='hunk'>@@ -6,11 +6,23 @@</div><div class='ctx'> #ifndef BTRFS_BACKREF_H</div><div class='ctx'> #define BTRFS_BACKREF_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/btrfs.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "ulist.h"</div><div class='add'>+#include "locking.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "extent_io.h"</div><div class='add'>+#include "ctree.h"</div><div class='add'>+</div><div class='add'>+struct extent_inode_elem;</div><div class='add'>+struct ulist;</div><div class='add'>+struct btrfs_extent_item;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Used by implementations of iterate_extent_inodes_t (see definition below) to</div><div class='hunk'>@@ -178,7 +190,7 @@ struct btrfs_backref_share_check_ctx {</div><div class='ctx'> 	 * It's very common to have several file extent items that point to the</div><div class='ctx'> 	 * same extent (bytenr) but with different offsets and lengths. This</div><div class='ctx'> 	 * typically happens for COW writes, partial writes into prealloc</div><div class='del'>-	 * extents, NOCOW writes after snapshoting a root, hole punching or</div><div class='add'>+	 * extents, NOCOW writes after snapshotting a root, hole punching or</div><div class='ctx'> 	 * reflinking within the same file (less common perhaps).</div><div class='ctx'> 	 * So keep a small cache with the lookup results for the extent pointed</div><div class='ctx'> 	 * by the last few file extent items. This cache is checked, with a</div><div class='hunk'>@@ -214,8 +226,7 @@ int iterate_extent_inodes(struct btrfs_backref_walk_ctx *ctx,</div><div class='ctx'> 			  iterate_extent_inodes_t *iterate, void *user_ctx);</div><div class='ctx'> </div><div class='ctx'> int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_path *path, void *ctx,</div><div class='del'>-				bool ignore_offset);</div><div class='add'>+				void *ctx, bool ignore_offset);</div><div class='ctx'> </div><div class='ctx'> int paths_from_inode(u64 inum, struct inode_fs_paths *ipath);</div><div class='ctx'> </div><div class='hunk'>@@ -230,7 +241,12 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,</div><div class='ctx'> struct btrfs_data_container *init_data_container(u32 total_bytes);</div><div class='ctx'> struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,</div><div class='ctx'> 					struct btrfs_path *path);</div><div class='del'>-void free_ipath(struct inode_fs_paths *ipath);</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(inode_fs_paths, struct inode_fs_paths *,</div><div class='add'>+	if (_T) {</div><div class='add'>+		kvfree(_T-&gt;fspath);</div><div class='add'>+		kfree(_T);</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid,</div><div class='ctx'> 			  u64 start_off, struct btrfs_path *path,</div><div class='hunk'>@@ -271,22 +287,6 @@ struct btrfs_backref_iter {</div><div class='ctx'> </div><div class='ctx'> struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_info);</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_backref_iter_free(struct btrfs_backref_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (!iter)</div><div class='del'>-		return;</div><div class='del'>-	btrfs_free_path(iter-&gt;path);</div><div class='del'>-	kfree(iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct extent_buffer *btrfs_backref_get_eb(</div><div class='del'>-		struct btrfs_backref_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (!iter)</div><div class='del'>-		return NULL;</div><div class='del'>-	return iter-&gt;path-&gt;nodes[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * For metadata with EXTENT_ITEM key (non-skinny) case, the first inline data</div><div class='ctx'>  * is btrfs_tree_block_info, without a btrfs_extent_inline_ref header.</div><div class='hunk'>@@ -306,25 +306,6 @@ int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr);</div><div class='ctx'> </div><div class='ctx'> int btrfs_backref_iter_next(struct btrfs_backref_iter *iter);</div><div class='ctx'> </div><div class='del'>-static inline bool btrfs_backref_iter_is_inline_ref(</div><div class='del'>-		struct btrfs_backref_iter *iter)</div><div class='del'>-{</div><div class='del'>-	if (iter-&gt;cur_key.type == BTRFS_EXTENT_ITEM_KEY ||</div><div class='del'>-	    iter-&gt;cur_key.type == BTRFS_METADATA_ITEM_KEY)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_backref_iter_release(struct btrfs_backref_iter *iter)</div><div class='del'>-{</div><div class='del'>-	iter-&gt;bytenr = 0;</div><div class='del'>-	iter-&gt;item_ptr = 0;</div><div class='del'>-	iter-&gt;cur_ptr = 0;</div><div class='del'>-	iter-&gt;end_ptr = 0;</div><div class='del'>-	btrfs_release_path(iter-&gt;path);</div><div class='del'>-	memset(&amp;iter-&gt;cur_key, 0, sizeof(iter-&gt;cur_key));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Backref cache related structures</div><div class='ctx'>  *</div><div class='hunk'>@@ -336,11 +317,22 @@ static inline void btrfs_backref_iter_release(struct btrfs_backref_iter *iter)</div><div class='ctx'>  * Represent a tree block in the backref cache</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_backref_node {</div><div class='del'>-	struct {</div><div class='del'>-		struct rb_node rb_node;</div><div class='del'>-		u64 bytenr;</div><div class='del'>-	}; /* Use rb_simple_node for search/insert */</div><div class='add'>+	union{</div><div class='add'>+		/* Use rb_simple_node for search/insert */</div><div class='add'>+		struct {</div><div class='add'>+			struct rb_node rb_node;</div><div class='add'>+			u64 bytenr;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='add'>+		struct rb_simple_node simple_node;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is a sanity check, whenever we COW a block we will update</div><div class='add'>+	 * new_bytenr with it's current location, and we will check this in</div><div class='add'>+	 * various places to validate that the cache makes sense, it shouldn't</div><div class='add'>+	 * be used for anything else.</div><div class='add'>+	 */</div><div class='ctx'> 	u64 new_bytenr;</div><div class='ctx'> 	/* Objectid of tree block owner, can be not uptodate */</div><div class='ctx'> 	u64 owner;</div><div class='hunk'>@@ -358,10 +350,6 @@ struct btrfs_backref_node {</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	/* Level of the tree block */</div><div class='ctx'> 	unsigned int level:8;</div><div class='del'>-	/* Is the block in a non-shareable tree */</div><div class='del'>-	unsigned int cowonly:1;</div><div class='del'>-	/* 1 if no child node is in the cache */</div><div class='del'>-	unsigned int lowest:1;</div><div class='ctx'> 	/* Is the extent buffer locked */</div><div class='ctx'> 	unsigned int locked:1;</div><div class='ctx'> 	/* Has the block been processed */</div><div class='hunk'>@@ -414,12 +402,6 @@ struct btrfs_backref_cache {</div><div class='ctx'> 	 * level blocks may not reflect the new location</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head pending[BTRFS_MAX_LEVEL];</div><div class='del'>-	/* List of backref nodes with no child node */</div><div class='del'>-	struct list_head leaves;</div><div class='del'>-	/* List of blocks that have been COWed in current transaction */</div><div class='del'>-	struct list_head changed;</div><div class='del'>-	/* List of detached backref node. */</div><div class='del'>-	struct list_head detached;</div><div class='ctx'> </div><div class='ctx'> 	u64 last_trans;</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +419,7 @@ struct btrfs_backref_cache {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Whether this cache is for relocation</div><div class='ctx'> 	 *</div><div class='del'>-	 * Reloction backref cache require more info for reloc root compared</div><div class='add'>+	 * Relocation backref cache require more info for reloc root compared</div><div class='ctx'> 	 * to generic backref cache.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool is_reloc;</div><div class='hunk'>@@ -450,85 +432,17 @@ struct btrfs_backref_node *btrfs_backref_alloc_node(</div><div class='ctx'> struct btrfs_backref_edge *btrfs_backref_alloc_edge(</div><div class='ctx'> 		struct btrfs_backref_cache *cache);</div><div class='ctx'> </div><div class='del'>-#define		LINK_LOWER	(1 &lt;&lt; 0)</div><div class='del'>-#define		LINK_UPPER	(1 &lt;&lt; 1)</div><div class='del'>-static inline void btrfs_backref_link_edge(struct btrfs_backref_edge *edge,</div><div class='del'>-					   struct btrfs_backref_node *lower,</div><div class='del'>-					   struct btrfs_backref_node *upper,</div><div class='del'>-					   int link_which)</div><div class='del'>-{</div><div class='del'>-	ASSERT(upper &amp;&amp; lower &amp;&amp; upper-&gt;level == lower-&gt;level + 1);</div><div class='del'>-	edge-&gt;node[LOWER] = lower;</div><div class='del'>-	edge-&gt;node[UPPER] = upper;</div><div class='del'>-	if (link_which &amp; LINK_LOWER)</div><div class='del'>-		list_add_tail(&amp;edge-&gt;list[LOWER], &amp;lower-&gt;upper);</div><div class='del'>-	if (link_which &amp; LINK_UPPER)</div><div class='del'>-		list_add_tail(&amp;edge-&gt;list[UPPER], &amp;upper-&gt;lower);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_backref_free_node(struct btrfs_backref_cache *cache,</div><div class='del'>-					   struct btrfs_backref_node *node)</div><div class='del'>-{</div><div class='del'>-	if (node) {</div><div class='del'>-		ASSERT(list_empty(&amp;node-&gt;list));</div><div class='del'>-		ASSERT(list_empty(&amp;node-&gt;lower));</div><div class='del'>-		ASSERT(node-&gt;eb == NULL);</div><div class='del'>-		cache-&gt;nr_nodes--;</div><div class='del'>-		btrfs_put_root(node-&gt;root);</div><div class='del'>-		kfree(node);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_backref_free_edge(struct btrfs_backref_cache *cache,</div><div class='del'>-					   struct btrfs_backref_edge *edge)</div><div class='del'>-{</div><div class='del'>-	if (edge) {</div><div class='del'>-		cache-&gt;nr_edges--;</div><div class='del'>-		kfree(edge);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_backref_unlock_node_buffer(</div><div class='del'>-		struct btrfs_backref_node *node)</div><div class='del'>-{</div><div class='del'>-	if (node-&gt;locked) {</div><div class='del'>-		btrfs_tree_unlock(node-&gt;eb);</div><div class='del'>-		node-&gt;locked = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_backref_drop_node_buffer(</div><div class='del'>-		struct btrfs_backref_node *node)</div><div class='del'>-{</div><div class='del'>-	if (node-&gt;eb) {</div><div class='del'>-		btrfs_backref_unlock_node_buffer(node);</div><div class='del'>-		free_extent_buffer(node-&gt;eb);</div><div class='del'>-		node-&gt;eb = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Drop the backref node from cache without cleaning up its children</div><div class='del'>- * edges.</div><div class='del'>- *</div><div class='del'>- * This can only be called on node without parent edges.</div><div class='del'>- * The children edges are still kept as is.</div><div class='del'>- */</div><div class='del'>-static inline void btrfs_backref_drop_node(struct btrfs_backref_cache *tree,</div><div class='del'>-					   struct btrfs_backref_node *node)</div><div class='del'>-{</div><div class='del'>-	ASSERT(list_empty(&amp;node-&gt;upper));</div><div class='del'>-</div><div class='del'>-	btrfs_backref_drop_node_buffer(node);</div><div class='del'>-	list_del_init(&amp;node-&gt;list);</div><div class='del'>-	list_del_init(&amp;node-&gt;lower);</div><div class='del'>-	if (!RB_EMPTY_NODE(&amp;node-&gt;rb_node))</div><div class='del'>-		rb_erase(&amp;node-&gt;rb_node, &amp;tree-&gt;rb_root);</div><div class='del'>-	btrfs_backref_free_node(tree, node);</div><div class='del'>-}</div><div class='add'>+void btrfs_backref_free_node(struct btrfs_backref_cache *cache,</div><div class='add'>+			     struct btrfs_backref_node *node);</div><div class='add'>+void btrfs_backref_free_edge(struct btrfs_backref_cache *cache,</div><div class='add'>+			     struct btrfs_backref_edge *edge);</div><div class='add'>+void btrfs_backref_unlock_node_buffer(struct btrfs_backref_node *node);</div><div class='add'>+void btrfs_backref_drop_node_buffer(struct btrfs_backref_node *node);</div><div class='ctx'> </div><div class='ctx'> void btrfs_backref_cleanup_node(struct btrfs_backref_cache *cache,</div><div class='ctx'> 				struct btrfs_backref_node *node);</div><div class='add'>+void btrfs_backref_drop_node(struct btrfs_backref_cache *tree,</div><div class='add'>+			     struct btrfs_backref_node *node);</div><div class='ctx'> </div><div class='ctx'> void btrfs_backref_release_cache(struct btrfs_backref_cache *cache);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c<br/>index 928f512cdb4a..fa1d321a2fb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/bio.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/bio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/bio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/bio.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include "raid56.h"</div><div class='ctx'> #include "async-thread.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "zoned.h"</div><div class='ctx'> #include "file-item.h"</div><div class='ctx'> #include "raid-stripe-tree.h"</div><div class='hunk'>@@ -28,12 +27,12 @@ struct btrfs_failed_bio {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Is this a data path I/O that needs storage layer checksum and repair? */</div><div class='del'>-static inline bool is_data_bbio(struct btrfs_bio *bbio)</div><div class='add'>+static inline bool is_data_bbio(const struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='del'>-	return bbio-&gt;inode &amp;&amp; is_data_inode(&amp;bbio-&gt;inode-&gt;vfs_inode);</div><div class='add'>+	return bbio-&gt;inode &amp;&amp; is_data_inode(bbio-&gt;inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool bbio_has_ordered_extent(struct btrfs_bio *bbio)</div><div class='add'>+static bool bbio_has_ordered_extent(const struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	return is_data_bbio(bbio) &amp;&amp; btrfs_op(&amp;bbio-&gt;bio) == BTRFS_MAP_WRITE;</div><div class='ctx'> }</div><div class='hunk'>@@ -42,25 +41,30 @@ static bool bbio_has_ordered_extent(struct btrfs_bio *bbio)</div><div class='ctx'>  * Initialize a btrfs_bio structure.  This skips the embedded bio itself as it</div><div class='ctx'>  * is already initialized by the block layer.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_bio_init(struct btrfs_bio *bbio, struct btrfs_fs_info *fs_info,</div><div class='add'>+void btrfs_bio_init(struct btrfs_bio *bbio, struct btrfs_inode *inode, u64 file_offset,</div><div class='ctx'> 		    btrfs_bio_end_io_t end_io, void *private)</div><div class='ctx'> {</div><div class='add'>+	/* @inode parameter is mandatory. */</div><div class='add'>+	ASSERT(inode);</div><div class='add'>+</div><div class='ctx'> 	memset(bbio, 0, offsetof(struct btrfs_bio, bio));</div><div class='del'>-	bbio-&gt;fs_info = fs_info;</div><div class='add'>+	bbio-&gt;inode = inode;</div><div class='ctx'> 	bbio-&gt;end_io = end_io;</div><div class='ctx'> 	bbio-&gt;private = private;</div><div class='add'>+	bbio-&gt;file_offset = file_offset;</div><div class='ctx'> 	atomic_set(&amp;bbio-&gt;pending_ios, 1);</div><div class='add'>+	WRITE_ONCE(bbio-&gt;status, BLK_STS_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a btrfs_bio structure.  The btrfs_bio is the main I/O container for</div><div class='del'>- * btrfs, and is used for all I/O submitted through btrfs_submit_bio.</div><div class='add'>+ * btrfs, and is used for all I/O submitted through btrfs_submit_bbio().</div><div class='ctx'>  *</div><div class='ctx'>  * Just like the underlying bio_alloc_bioset it will not fail as it is backed by</div><div class='ctx'>  * a mempool.</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_bio *btrfs_bio_alloc(unsigned int nr_vecs, blk_opf_t opf,</div><div class='del'>-				  struct btrfs_fs_info *fs_info,</div><div class='add'>+				  struct btrfs_inode *inode, u64 file_offset,</div><div class='ctx'> 				  btrfs_bio_end_io_t end_io, void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='hunk'>@@ -68,109 +72,87 @@ struct btrfs_bio *btrfs_bio_alloc(unsigned int nr_vecs, blk_opf_t opf,</div><div class='ctx'> </div><div class='ctx'> 	bio = bio_alloc_bioset(NULL, nr_vecs, opf, GFP_NOFS, &amp;btrfs_bioset);</div><div class='ctx'> 	bbio = btrfs_bio(bio);</div><div class='del'>-	btrfs_bio_init(bbio, fs_info, end_io, private);</div><div class='add'>+	btrfs_bio_init(bbio, inode, file_offset, end_io, private);</div><div class='ctx'> 	return bbio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_bio *btrfs_split_bio(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					 struct btrfs_bio *orig_bbio,</div><div class='del'>-					 u64 map_length, bool use_append)</div><div class='add'>+					 u64 map_length)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='del'>-	if (use_append) {</div><div class='del'>-		unsigned int nr_segs;</div><div class='add'>+	bio = bio_split(&amp;orig_bbio-&gt;bio, map_length &gt;&gt; SECTOR_SHIFT, GFP_NOFS,</div><div class='add'>+			&amp;btrfs_clone_bioset);</div><div class='add'>+	if (IS_ERR(bio))</div><div class='add'>+		return ERR_CAST(bio);</div><div class='ctx'> </div><div class='del'>-		bio = bio_split_rw(&amp;orig_bbio-&gt;bio, &amp;fs_info-&gt;limits, &amp;nr_segs,</div><div class='del'>-				   &amp;btrfs_clone_bioset, map_length);</div><div class='del'>-	} else {</div><div class='del'>-		bio = bio_split(&amp;orig_bbio-&gt;bio, map_length &gt;&gt; SECTOR_SHIFT,</div><div class='del'>-				GFP_NOFS, &amp;btrfs_clone_bioset);</div><div class='del'>-	}</div><div class='ctx'> 	bbio = btrfs_bio(bio);</div><div class='del'>-	btrfs_bio_init(bbio, fs_info, NULL, orig_bbio);</div><div class='del'>-	bbio-&gt;inode = orig_bbio-&gt;inode;</div><div class='del'>-	bbio-&gt;file_offset = orig_bbio-&gt;file_offset;</div><div class='add'>+	btrfs_bio_init(bbio, orig_bbio-&gt;inode, orig_bbio-&gt;file_offset, NULL, orig_bbio);</div><div class='ctx'> 	orig_bbio-&gt;file_offset += map_length;</div><div class='ctx'> 	if (bbio_has_ordered_extent(bbio)) {</div><div class='ctx'> 		refcount_inc(&amp;orig_bbio-&gt;ordered-&gt;refs);</div><div class='ctx'> 		bbio-&gt;ordered = orig_bbio-&gt;ordered;</div><div class='add'>+		bbio-&gt;orig_logical = orig_bbio-&gt;orig_logical;</div><div class='add'>+		orig_bbio-&gt;orig_logical += map_length;</div><div class='ctx'> 	}</div><div class='add'>+	bbio-&gt;csum_search_commit_root = orig_bbio-&gt;csum_search_commit_root;</div><div class='ctx'> 	atomic_inc(&amp;orig_bbio-&gt;pending_ios);</div><div class='ctx'> 	return bbio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Free a bio that was never submitted to the underlying device. */</div><div class='del'>-static void btrfs_cleanup_bio(struct btrfs_bio *bbio)</div><div class='add'>+void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status)</div><div class='ctx'> {</div><div class='del'>-	if (bbio_has_ordered_extent(bbio))</div><div class='del'>-		btrfs_put_ordered_extent(bbio-&gt;ordered);</div><div class='del'>-	bio_put(&amp;bbio-&gt;bio);</div><div class='del'>-}</div><div class='add'>+	/* Make sure we're already in task context. */</div><div class='add'>+	ASSERT(in_task());</div><div class='ctx'> </div><div class='del'>-static void __btrfs_bio_end_io(struct btrfs_bio *bbio)</div><div class='del'>-{</div><div class='del'>-	if (bbio_has_ordered_extent(bbio)) {</div><div class='del'>-		struct btrfs_ordered_extent *ordered = bbio-&gt;ordered;</div><div class='add'>+	if (bbio-&gt;async_csum)</div><div class='add'>+		wait_for_completion(&amp;bbio-&gt;csum_done);</div><div class='ctx'> </div><div class='del'>-		bbio-&gt;end_io(bbio);</div><div class='del'>-		btrfs_put_ordered_extent(ordered);</div><div class='del'>-	} else {</div><div class='del'>-		bbio-&gt;end_io(bbio);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status)</div><div class='del'>-{</div><div class='ctx'> 	bbio-&gt;bio.bi_status = status;</div><div class='del'>-	__btrfs_bio_end_io(bbio);</div><div class='del'>-}</div><div class='add'>+	if (bbio-&gt;bio.bi_pool == &amp;btrfs_clone_bioset) {</div><div class='add'>+		struct btrfs_bio *orig_bbio = bbio-&gt;private;</div><div class='ctx'> </div><div class='del'>-static void btrfs_orig_write_end_io(struct bio *bio);</div><div class='add'>+		/* Free bio that was never submitted to the underlying device. */</div><div class='add'>+		if (bbio_has_ordered_extent(bbio))</div><div class='add'>+			btrfs_put_ordered_extent(bbio-&gt;ordered);</div><div class='add'>+		bio_put(&amp;bbio-&gt;bio);</div><div class='add'>+</div><div class='add'>+		bbio = orig_bbio;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void btrfs_bbio_propagate_error(struct btrfs_bio *bbio,</div><div class='del'>-				       struct btrfs_bio *orig_bbio)</div><div class='del'>-{</div><div class='ctx'> 	/*</div><div class='del'>-	 * For writes we tolerate nr_mirrors - 1 write failures, so we can't</div><div class='del'>-	 * just blindly propagate a write failure here.  Instead increment the</div><div class='del'>-	 * error count in the original I/O context so that it is guaranteed to</div><div class='del'>-	 * be larger than the error tolerance.</div><div class='add'>+	 * At this point, bbio always points to the original btrfs_bio. Save</div><div class='add'>+	 * the first error in it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (bbio-&gt;bio.bi_end_io == &amp;btrfs_orig_write_end_io) {</div><div class='del'>-		struct btrfs_io_stripe *orig_stripe = orig_bbio-&gt;bio.bi_private;</div><div class='del'>-		struct btrfs_io_context *orig_bioc = orig_stripe-&gt;bioc;</div><div class='add'>+	if (status != BLK_STS_OK)</div><div class='add'>+		cmpxchg(&amp;bbio-&gt;status, BLK_STS_OK, status);</div><div class='ctx'> </div><div class='del'>-		atomic_add(orig_bioc-&gt;max_errors, &amp;orig_bioc-&gt;error);</div><div class='del'>-	} else {</div><div class='del'>-		orig_bbio-&gt;bio.bi_status = bbio-&gt;bio.bi_status;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	if (atomic_dec_and_test(&amp;bbio-&gt;pending_ios)) {</div><div class='add'>+		/* Load split bio's error which might be set above. */</div><div class='add'>+		if (status == BLK_STS_OK)</div><div class='add'>+			bbio-&gt;bio.bi_status = READ_ONCE(bbio-&gt;status);</div><div class='ctx'> </div><div class='del'>-static void btrfs_orig_bbio_end_io(struct btrfs_bio *bbio)</div><div class='del'>-{</div><div class='del'>-	if (bbio-&gt;bio.bi_pool == &amp;btrfs_clone_bioset) {</div><div class='del'>-		struct btrfs_bio *orig_bbio = bbio-&gt;private;</div><div class='add'>+		if (bbio_has_ordered_extent(bbio)) {</div><div class='add'>+			struct btrfs_ordered_extent *ordered = bbio-&gt;ordered;</div><div class='ctx'> </div><div class='del'>-		if (bbio-&gt;bio.bi_status)</div><div class='del'>-			btrfs_bbio_propagate_error(bbio, orig_bbio);</div><div class='del'>-		btrfs_cleanup_bio(bbio);</div><div class='del'>-		bbio = orig_bbio;</div><div class='add'>+			bbio-&gt;end_io(bbio);</div><div class='add'>+			btrfs_put_ordered_extent(ordered);</div><div class='add'>+		} else {</div><div class='add'>+			bbio-&gt;end_io(bbio);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;bbio-&gt;pending_ios))</div><div class='del'>-		__btrfs_bio_end_io(bbio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int next_repair_mirror(struct btrfs_failed_bio *fbio, int cur_mirror)</div><div class='add'>+static int next_repair_mirror(const struct btrfs_failed_bio *fbio, int cur_mirror)</div><div class='ctx'> {</div><div class='ctx'> 	if (cur_mirror == fbio-&gt;num_copies)</div><div class='ctx'> 		return cur_mirror + 1 - fbio-&gt;num_copies;</div><div class='ctx'> 	return cur_mirror + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prev_repair_mirror(struct btrfs_failed_bio *fbio, int cur_mirror)</div><div class='add'>+static int prev_repair_mirror(const struct btrfs_failed_bio *fbio, int cur_mirror)</div><div class='ctx'> {</div><div class='ctx'> 	if (cur_mirror == 1)</div><div class='ctx'> 		return fbio-&gt;num_copies;</div><div class='hunk'>@@ -180,7 +162,7 @@ static int prev_repair_mirror(struct btrfs_failed_bio *fbio, int cur_mirror)</div><div class='ctx'> static void btrfs_repair_done(struct btrfs_failed_bio *fbio)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;fbio-&gt;repair_count)) {</div><div class='del'>-		btrfs_orig_bbio_end_io(fbio-&gt;bbio);</div><div class='add'>+		btrfs_bio_end_io(fbio-&gt;bbio, fbio-&gt;bbio-&gt;bio.bi_status);</div><div class='ctx'> 		mempool_free(fbio, &amp;btrfs_failed_bio_pool);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -191,17 +173,30 @@ static void btrfs_end_repair_bio(struct btrfs_bio *repair_bbio,</div><div class='ctx'> 	struct btrfs_failed_bio *fbio = repair_bbio-&gt;private;</div><div class='ctx'> 	struct btrfs_inode *inode = repair_bbio-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	struct bio_vec *bv = bio_first_bvec_all(&amp;repair_bbio-&gt;bio);</div><div class='del'>-	int mirror = repair_bbio-&gt;mirror_num;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * We can only trigger this for data bio, which doesn't support larger</div><div class='del'>-	 * folios yet.</div><div class='add'>+	 * We can not move forward the saved_iter, as it will be later</div><div class='add'>+	 * utilized by repair_bbio again.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(folio_order(page_folio(bv-&gt;bv_page)) == 0);</div><div class='add'>+	struct bvec_iter saved_iter = repair_bbio-&gt;saved_iter;</div><div class='add'>+	const u32 step = min(fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+	const u64 logical = repair_bbio-&gt;saved_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+	const u32 nr_steps = repair_bbio-&gt;saved_iter.bi_size / step;</div><div class='add'>+	int mirror = repair_bbio-&gt;mirror_num;</div><div class='add'>+	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];</div><div class='add'>+	phys_addr_t paddr;</div><div class='add'>+	unsigned int slot = 0;</div><div class='add'>+</div><div class='add'>+	/* Repair bbio should be eaxctly one block sized. */</div><div class='add'>+	ASSERT(repair_bbio-&gt;saved_iter.bi_size == fs_info-&gt;sectorsize);</div><div class='add'>+</div><div class='add'>+	btrfs_bio_for_each_block(paddr, &amp;repair_bbio-&gt;bio, &amp;saved_iter, step) {</div><div class='add'>+		ASSERT(slot &lt; nr_steps);</div><div class='add'>+		paddrs[slot] = paddr;</div><div class='add'>+		slot++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (repair_bbio-&gt;bio.bi_status ||</div><div class='del'>-	    !btrfs_data_csum_ok(repair_bbio, dev, 0, bv)) {</div><div class='add'>+	    !btrfs_data_csum_ok(repair_bbio, dev, 0, paddrs)) {</div><div class='ctx'> 		bio_reset(&amp;repair_bbio-&gt;bio, NULL, REQ_OP_READ);</div><div class='ctx'> 		repair_bbio-&gt;bio.bi_iter = repair_bbio-&gt;saved_iter;</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +207,7 @@ static void btrfs_end_repair_bio(struct btrfs_bio *repair_bbio,</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		btrfs_submit_bio(repair_bbio, mirror);</div><div class='add'>+		btrfs_submit_bbio(repair_bbio, mirror);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -220,8 +215,7 @@ static void btrfs_end_repair_bio(struct btrfs_bio *repair_bbio,</div><div class='ctx'> 		mirror = prev_repair_mirror(fbio, mirror);</div><div class='ctx'> 		btrfs_repair_io_failure(fs_info, btrfs_ino(inode),</div><div class='ctx'> 				  repair_bbio-&gt;file_offset, fs_info-&gt;sectorsize,</div><div class='del'>-				  repair_bbio-&gt;saved_iter.bi_sector &lt;&lt; SECTOR_SHIFT,</div><div class='del'>-				  page_folio(bv-&gt;bv_page), bv-&gt;bv_offset, mirror);</div><div class='add'>+				  logical, paddrs, step, mirror);</div><div class='ctx'> 	} while (mirror != fbio-&gt;bbio-&gt;mirror_num);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -238,13 +232,20 @@ done:</div><div class='ctx'>  */</div><div class='ctx'> static struct btrfs_failed_bio *repair_one_sector(struct btrfs_bio *failed_bbio,</div><div class='ctx'> 						  u32 bio_offset,</div><div class='del'>-						  struct bio_vec *bv,</div><div class='add'>+						  phys_addr_t paddrs[],</div><div class='ctx'> 						  struct btrfs_failed_bio *fbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = failed_bbio-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='del'>-	const u64 logical = (failed_bbio-&gt;saved_iter.bi_sector &lt;&lt; SECTOR_SHIFT);</div><div class='add'>+	const u32 step = min(fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = sectorsize / step;</div><div class='add'>+	/*</div><div class='add'>+	 * For bs &gt; ps cases, the saved_iter can be partially moved forward.</div><div class='add'>+	 * In that case we should round it down to the block boundary.</div><div class='add'>+	 */</div><div class='add'>+	const u64 logical = round_down(failed_bbio-&gt;saved_iter.bi_sector &lt;&lt; SECTOR_SHIFT,</div><div class='add'>+				       sectorsize);</div><div class='ctx'> 	struct btrfs_bio *repair_bbio;</div><div class='ctx'> 	struct bio *repair_bio;</div><div class='ctx'> 	int num_copies;</div><div class='hunk'>@@ -269,19 +270,26 @@ static struct btrfs_failed_bio *repair_one_sector(struct btrfs_bio *failed_bbio,</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;fbio-&gt;repair_count);</div><div class='ctx'> </div><div class='del'>-	repair_bio = bio_alloc_bioset(NULL, 1, REQ_OP_READ, GFP_NOFS,</div><div class='add'>+	repair_bio = bio_alloc_bioset(NULL, nr_steps, REQ_OP_READ, GFP_NOFS,</div><div class='ctx'> 				      &amp;btrfs_repair_bioset);</div><div class='del'>-	repair_bio-&gt;bi_iter.bi_sector = failed_bbio-&gt;saved_iter.bi_sector;</div><div class='del'>-	__bio_add_page(repair_bio, bv-&gt;bv_page, bv-&gt;bv_len, bv-&gt;bv_offset);</div><div class='add'>+	repair_bio-&gt;bi_iter.bi_sector = logical &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+	for (int i = 0; i &lt; nr_steps; i++) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ASSERT(offset_in_page(paddrs[i]) + step &lt;= PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		ret = bio_add_page(repair_bio, phys_to_page(paddrs[i]), step,</div><div class='add'>+				   offset_in_page(paddrs[i]));</div><div class='add'>+		ASSERT(ret == step);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	repair_bbio = btrfs_bio(repair_bio);</div><div class='del'>-	btrfs_bio_init(repair_bbio, fs_info, NULL, fbio);</div><div class='del'>-	repair_bbio-&gt;inode = failed_bbio-&gt;inode;</div><div class='del'>-	repair_bbio-&gt;file_offset = failed_bbio-&gt;file_offset + bio_offset;</div><div class='add'>+	btrfs_bio_init(repair_bbio, failed_bbio-&gt;inode, failed_bbio-&gt;file_offset + bio_offset,</div><div class='add'>+		       NULL, fbio);</div><div class='ctx'> </div><div class='ctx'> 	mirror = next_repair_mirror(fbio, failed_bbio-&gt;mirror_num);</div><div class='ctx'> 	btrfs_debug(fs_info, "submitting repair read to mirror %d", mirror);</div><div class='del'>-	btrfs_submit_bio(repair_bbio, mirror);</div><div class='add'>+	btrfs_submit_bbio(repair_bbio, mirror);</div><div class='ctx'> 	return fbio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -289,10 +297,14 @@ static void btrfs_check_read_bio(struct btrfs_bio *bbio, struct btrfs_device *de</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(sectorsize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = sectorsize / step;</div><div class='ctx'> 	struct bvec_iter *iter = &amp;bbio-&gt;saved_iter;</div><div class='ctx'> 	blk_status_t status = bbio-&gt;bio.bi_status;</div><div class='ctx'> 	struct btrfs_failed_bio *fbio = NULL;</div><div class='add'>+	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];</div><div class='add'>+	phys_addr_t paddr;</div><div class='ctx'> 	u32 offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Read-repair requires the inode field to be set by the submitter. */</div><div class='hunk'>@@ -310,27 +322,27 @@ static void btrfs_check_read_bio(struct btrfs_bio *bbio, struct btrfs_device *de</div><div class='ctx'> 	/* Clear the I/O error. A failed repair will reset it. */</div><div class='ctx'> 	bbio-&gt;bio.bi_status = BLK_STS_OK;</div><div class='ctx'> </div><div class='del'>-	while (iter-&gt;bi_size) {</div><div class='del'>-		struct bio_vec bv = bio_iter_iovec(&amp;bbio-&gt;bio, *iter);</div><div class='add'>+	btrfs_bio_for_each_block(paddr, &amp;bbio-&gt;bio, iter, step) {</div><div class='add'>+		paddrs[(offset / step) % nr_steps] = paddr;</div><div class='add'>+		offset += step;</div><div class='ctx'> </div><div class='del'>-		bv.bv_len = min(bv.bv_len, sectorsize);</div><div class='del'>-		if (status || !btrfs_data_csum_ok(bbio, dev, offset, &amp;bv))</div><div class='del'>-			fbio = repair_one_sector(bbio, offset, &amp;bv, fbio);</div><div class='del'>-</div><div class='del'>-		bio_advance_iter_single(&amp;bbio-&gt;bio, iter, sectorsize);</div><div class='del'>-		offset += sectorsize;</div><div class='add'>+		if (IS_ALIGNED(offset, sectorsize)) {</div><div class='add'>+			if (status ||</div><div class='add'>+			    !btrfs_data_csum_ok(bbio, dev, offset - sectorsize, paddrs))</div><div class='add'>+				fbio = repair_one_sector(bbio, offset - sectorsize,</div><div class='add'>+							 paddrs, fbio);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	if (bbio-&gt;csum != bbio-&gt;csum_inline)</div><div class='del'>-		kfree(bbio-&gt;csum);</div><div class='add'>+		kvfree(bbio-&gt;csum);</div><div class='ctx'> </div><div class='ctx'> 	if (fbio)</div><div class='ctx'> 		btrfs_repair_done(fbio);</div><div class='ctx'> 	else</div><div class='del'>-		btrfs_orig_bbio_end_io(bbio);</div><div class='add'>+		btrfs_bio_end_io(bbio, bbio-&gt;bio.bi_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_log_dev_io_error(struct bio *bio, struct btrfs_device *dev)</div><div class='add'>+static void btrfs_log_dev_io_error(const struct bio *bio, struct btrfs_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!dev || !dev-&gt;bdev)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -345,44 +357,43 @@ static void btrfs_log_dev_io_error(struct bio *bio, struct btrfs_device *dev)</div><div class='ctx'> 		btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_FLUSH_ERRS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct workqueue_struct *btrfs_end_io_wq(struct btrfs_fs_info *fs_info,</div><div class='del'>-						struct bio *bio)</div><div class='add'>+static struct workqueue_struct *btrfs_end_io_wq(const struct btrfs_fs_info *fs_info,</div><div class='add'>+						const struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	if (bio-&gt;bi_opf &amp; REQ_META)</div><div class='ctx'> 		return fs_info-&gt;endio_meta_workers;</div><div class='ctx'> 	return fs_info-&gt;endio_workers;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_end_bio_work(struct work_struct *work)</div><div class='add'>+static void simple_end_io_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_bio *bbio = container_of(work, struct btrfs_bio, end_io_work);</div><div class='add'>+	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='ctx'> </div><div class='del'>-	/* Metadata reads are checked and repaired by the submitter. */</div><div class='del'>-	if (is_data_bbio(bbio))</div><div class='del'>-		btrfs_check_read_bio(bbio, bbio-&gt;bio.bi_private);</div><div class='del'>-	else</div><div class='del'>-		btrfs_orig_bbio_end_io(bbio);</div><div class='add'>+	if (bio_op(bio) == REQ_OP_READ) {</div><div class='add'>+		/* Metadata reads are checked and repaired by the submitter. */</div><div class='add'>+		if (is_data_bbio(bbio))</div><div class='add'>+			return btrfs_check_read_bio(bbio, bbio-&gt;bio.bi_private);</div><div class='add'>+		return btrfs_bio_end_io(bbio, bbio-&gt;bio.bi_status);</div><div class='add'>+	}</div><div class='add'>+	if (bio_is_zone_append(bio) &amp;&amp; !bio-&gt;bi_status)</div><div class='add'>+		btrfs_record_physical_zoned(bbio);</div><div class='add'>+	btrfs_bio_end_io(bbio, bbio-&gt;bio.bi_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btrfs_simple_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='ctx'> 	struct btrfs_device *dev = bio-&gt;bi_private;</div><div class='del'>-	struct btrfs_fs_info *fs_info = bbio-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_bio_counter_dec(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	if (bio-&gt;bi_status)</div><div class='ctx'> 		btrfs_log_dev_io_error(bio, dev);</div><div class='ctx'> </div><div class='del'>-	if (bio_op(bio) == REQ_OP_READ) {</div><div class='del'>-		INIT_WORK(&amp;bbio-&gt;end_io_work, btrfs_end_bio_work);</div><div class='del'>-		queue_work(btrfs_end_io_wq(fs_info, bio), &amp;bbio-&gt;end_io_work);</div><div class='del'>-	} else {</div><div class='del'>-		if (bio_op(bio) == REQ_OP_ZONE_APPEND &amp;&amp; !bio-&gt;bi_status)</div><div class='del'>-			btrfs_record_physical_zoned(bbio);</div><div class='del'>-		btrfs_orig_bbio_end_io(bbio);</div><div class='del'>-	}</div><div class='add'>+	INIT_WORK(&amp;bbio-&gt;end_io_work, simple_end_io_work);</div><div class='add'>+	queue_work(btrfs_end_io_wq(fs_info, bio), &amp;bbio-&gt;end_io_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btrfs_raid56_end_io(struct bio *bio)</div><div class='hunk'>@@ -390,21 +401,25 @@ static void btrfs_raid56_end_io(struct bio *bio)</div><div class='ctx'> 	struct btrfs_io_context *bioc = bio-&gt;bi_private;</div><div class='ctx'> 	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='ctx'> </div><div class='add'>+	/* RAID56 endio is always handled in workqueue. */</div><div class='add'>+	ASSERT(in_task());</div><div class='add'>+</div><div class='ctx'> 	btrfs_bio_counter_dec(bioc-&gt;fs_info);</div><div class='ctx'> 	bbio-&gt;mirror_num = bioc-&gt;mirror_num;</div><div class='ctx'> 	if (bio_op(bio) == REQ_OP_READ &amp;&amp; is_data_bbio(bbio))</div><div class='ctx'> 		btrfs_check_read_bio(bbio, NULL);</div><div class='ctx'> 	else</div><div class='del'>-		btrfs_orig_bbio_end_io(bbio);</div><div class='add'>+		btrfs_bio_end_io(bbio, bbio-&gt;bio.bi_status);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_bioc(bioc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_orig_write_end_io(struct bio *bio)</div><div class='add'>+static void orig_write_end_io_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_bio *bbio = container_of(work, struct btrfs_bio, end_io_work);</div><div class='add'>+	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='ctx'> 	struct btrfs_io_stripe *stripe = bio-&gt;bi_private;</div><div class='ctx'> 	struct btrfs_io_context *bioc = stripe-&gt;bioc;</div><div class='del'>-	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_bio_counter_dec(bioc-&gt;fs_info);</div><div class='ctx'> </div><div class='hunk'>@@ -422,21 +437,31 @@ static void btrfs_orig_write_end_io(struct bio *bio)</div><div class='ctx'> 	else</div><div class='ctx'> 		bio-&gt;bi_status = BLK_STS_OK;</div><div class='ctx'> </div><div class='del'>-	if (bio_op(bio) == REQ_OP_ZONE_APPEND &amp;&amp; !bio-&gt;bi_status)</div><div class='add'>+	if (bio_is_zone_append(bio) &amp;&amp; !bio-&gt;bi_status)</div><div class='ctx'> 		stripe-&gt;physical = bio-&gt;bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> </div><div class='del'>-	btrfs_orig_bbio_end_io(bbio);</div><div class='add'>+	btrfs_bio_end_io(bbio, bbio-&gt;bio.bi_status);</div><div class='ctx'> 	btrfs_put_bioc(bioc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_clone_write_end_io(struct bio *bio)</div><div class='add'>+static void btrfs_orig_write_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;bbio-&gt;end_io_work, orig_write_end_io_work);</div><div class='add'>+	queue_work(btrfs_end_io_wq(bbio-&gt;inode-&gt;root-&gt;fs_info, bio), &amp;bbio-&gt;end_io_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clone_write_end_io_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_bio *bbio = container_of(work, struct btrfs_bio, end_io_work);</div><div class='add'>+	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='ctx'> 	struct btrfs_io_stripe *stripe = bio-&gt;bi_private;</div><div class='ctx'> </div><div class='ctx'> 	if (bio-&gt;bi_status) {</div><div class='ctx'> 		atomic_inc(&amp;stripe-&gt;bioc-&gt;error);</div><div class='ctx'> 		btrfs_log_dev_io_error(bio, stripe-&gt;dev);</div><div class='del'>-	} else if (bio_op(bio) == REQ_OP_ZONE_APPEND) {</div><div class='add'>+	} else if (bio_is_zone_append(bio)) {</div><div class='ctx'> 		stripe-&gt;physical = bio-&gt;bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -445,6 +470,14 @@ static void btrfs_clone_write_end_io(struct bio *bio)</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void btrfs_clone_write_end_io(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;bbio-&gt;end_io_work, clone_write_end_io_work);</div><div class='add'>+	queue_work(btrfs_end_io_wq(bbio-&gt;inode-&gt;root-&gt;fs_info, bio), &amp;bbio-&gt;end_io_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	if (!dev || !dev-&gt;bdev ||</div><div class='hunk'>@@ -468,12 +501,20 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)</div><div class='ctx'> 		ASSERT(btrfs_dev_is_sequential(dev, physical));</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = zone_start &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_debug_in_rcu(dev-&gt;fs_info,</div><div class='add'>+	btrfs_debug(dev-&gt;fs_info,</div><div class='ctx'> 	"%s: rw %d 0x%x, sector=%llu, dev=%lu (%s id %llu), size=%u",</div><div class='ctx'> 		__func__, bio_op(bio), bio-&gt;bi_opf, bio-&gt;bi_iter.bi_sector,</div><div class='ctx'> 		(unsigned long)dev-&gt;bdev-&gt;bd_dev, btrfs_dev_name(dev),</div><div class='ctx'> 		dev-&gt;devid, bio-&gt;bi_iter.bi_size);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Track reads if tracking is enabled; ignore I/O operations before the</div><div class='add'>+	 * filesystem is fully initialized.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;fs_devices-&gt;collect_fs_stats &amp;&amp; bio_op(bio) == REQ_OP_READ &amp;&amp; dev-&gt;fs_info)</div><div class='add'>+		percpu_counter_add(&amp;dev-&gt;fs_info-&gt;stats_read_blocks,</div><div class='add'>+				   bio-&gt;bi_iter.bi_size &gt;&gt; dev-&gt;fs_info-&gt;sectorsize_bits);</div><div class='add'>+</div><div class='ctx'> 	if (bio-&gt;bi_opf &amp; REQ_BTRFS_CGROUP_PUNT)</div><div class='ctx'> 		blkcg_punt_bio_submit(bio);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -483,6 +524,7 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)</div><div class='ctx'> static void btrfs_submit_mirrored_bio(struct btrfs_io_context *bioc, int dev_nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *orig_bio = bioc-&gt;orig_bio, *bio;</div><div class='add'>+	struct btrfs_bio *orig_bbio = btrfs_bio(orig_bio);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(bio_op(orig_bio) != REQ_OP_READ);</div><div class='ctx'> </div><div class='hunk'>@@ -491,8 +533,11 @@ static void btrfs_submit_mirrored_bio(struct btrfs_io_context *bioc, int dev_nr)</div><div class='ctx'> 		bio = orig_bio;</div><div class='ctx'> 		bio-&gt;bi_end_io = btrfs_orig_write_end_io;</div><div class='ctx'> 	} else {</div><div class='del'>-		bio = bio_alloc_clone(NULL, orig_bio, GFP_NOFS, &amp;fs_bio_set);</div><div class='add'>+		/* We need to use endio_work to run end_io in task context. */</div><div class='add'>+		bio = bio_alloc_clone(NULL, orig_bio, GFP_NOFS, &amp;btrfs_bioset);</div><div class='ctx'> 		bio_inc_remaining(orig_bio);</div><div class='add'>+		btrfs_bio_init(btrfs_bio(bio), orig_bbio-&gt;inode,</div><div class='add'>+			       orig_bbio-&gt;file_offset, NULL, NULL);</div><div class='ctx'> 		bio-&gt;bi_end_io = btrfs_clone_write_end_io;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -503,14 +548,12 @@ static void btrfs_submit_mirrored_bio(struct btrfs_io_context *bioc, int dev_nr)</div><div class='ctx'> 	btrfs_submit_dev_bio(bioc-&gt;stripes[dev_nr].dev, bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __btrfs_submit_bio(struct bio *bio, struct btrfs_io_context *bioc,</div><div class='del'>-			       struct btrfs_io_stripe *smap, int mirror_num)</div><div class='add'>+static void btrfs_submit_bio(struct bio *bio, struct btrfs_io_context *bioc,</div><div class='add'>+			     struct btrfs_io_stripe *smap, int mirror_num)</div><div class='ctx'> {</div><div class='ctx'> 	if (!bioc) {</div><div class='ctx'> 		/* Single mirror read/write fast path. */</div><div class='ctx'> 		btrfs_bio(bio)-&gt;mirror_num = mirror_num;</div><div class='del'>-		if (bio_op(bio) != REQ_OP_READ)</div><div class='del'>-			btrfs_bio(bio)-&gt;orig_physical = smap-&gt;physical;</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = smap-&gt;physical &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 		if (bio_op(bio) != REQ_OP_READ)</div><div class='ctx'> 			btrfs_bio(bio)-&gt;orig_physical = smap-&gt;physical;</div><div class='hunk'>@@ -535,11 +578,15 @@ static void __btrfs_submit_bio(struct bio *bio, struct btrfs_io_context *bioc,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static blk_status_t btrfs_bio_csum(struct btrfs_bio *bbio)</div><div class='add'>+static int btrfs_bio_csum(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	if (bbio-&gt;bio.bi_opf &amp; REQ_META)</div><div class='ctx'> 		return btree_csum_one_bio(bbio);</div><div class='del'>-	return btrfs_csum_one_bio(bbio);</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	return btrfs_csum_one_bio(bbio, true);</div><div class='add'>+#else</div><div class='add'>+	return btrfs_csum_one_bio(bbio, false);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -566,11 +613,11 @@ static void run_one_async_start(struct btrfs_work *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct async_submit_bio *async =</div><div class='ctx'> 		container_of(work, struct async_submit_bio, work);</div><div class='del'>-	blk_status_t ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_bio_csum(async-&gt;bbio);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		async-&gt;bbio-&gt;bio.bi_status = ret;</div><div class='add'>+		async-&gt;bbio-&gt;bio.bi_status = errno_to_blk_status(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -596,7 +643,7 @@ static void run_one_async_done(struct btrfs_work *work, bool do_free)</div><div class='ctx'> </div><div class='ctx'> 	/* If an error occurred we just want to clean up the bio and move on. */</div><div class='ctx'> 	if (bio-&gt;bi_status) {</div><div class='del'>-		btrfs_orig_bbio_end_io(async-&gt;bbio);</div><div class='add'>+		btrfs_bio_end_io(async-&gt;bbio, bio-&gt;bi_status);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -606,13 +653,30 @@ static void run_one_async_done(struct btrfs_work *work, bool do_free)</div><div class='ctx'> 	 * context.  This changes nothing when cgroups aren't in use.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bio-&gt;bi_opf |= REQ_BTRFS_CGROUP_PUNT;</div><div class='del'>-	__btrfs_submit_bio(bio, async-&gt;bioc, &amp;async-&gt;smap, async-&gt;mirror_num);</div><div class='add'>+	btrfs_submit_bio(bio, async-&gt;bioc, &amp;async-&gt;smap, async-&gt;mirror_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool should_async_write(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='add'>+	bool auto_csum_mode = true;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	struct btrfs_fs_devices *fs_devices = fs_info-&gt;fs_devices;</div><div class='add'>+	enum btrfs_offload_csum_mode csum_mode = READ_ONCE(fs_devices-&gt;offload_csum_mode);</div><div class='add'>+</div><div class='add'>+	if (csum_mode == BTRFS_OFFLOAD_CSUM_FORCE_ON)</div><div class='add'>+		return true;</div><div class='add'>+	/*</div><div class='add'>+	 * Write bios will calculate checksum and submit bio at the same time.</div><div class='add'>+	 * Unless explicitly required don't offload serial csum calculate and bio</div><div class='add'>+	 * submit into a workqueue.</div><div class='add'>+	 */</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Submit synchronously if the checksum implementation is fast. */</div><div class='del'>-	if (test_bit(BTRFS_FS_CSUM_IMPL_FAST, &amp;bbio-&gt;fs_info-&gt;flags))</div><div class='add'>+	if (auto_csum_mode &amp;&amp; test_bit(BTRFS_FS_CSUM_IMPL_FAST, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -623,7 +687,7 @@ static bool should_async_write(struct btrfs_bio *bbio)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Zoned devices require I/O to be submitted in order. */</div><div class='del'>-	if ((bbio-&gt;bio.bi_opf &amp; REQ_META) &amp;&amp; btrfs_is_zoned(bbio-&gt;fs_info))</div><div class='add'>+	if ((bbio-&gt;bio.bi_opf &amp; REQ_META) &amp;&amp; btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -638,7 +702,7 @@ static bool btrfs_wq_submit_bio(struct btrfs_bio *bbio,</div><div class='ctx'> 				struct btrfs_io_context *bioc,</div><div class='ctx'> 				struct btrfs_io_stripe *smap, int mirror_num)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = bbio-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct async_submit_bio *async;</div><div class='ctx'> </div><div class='ctx'> 	async = kmalloc(sizeof(*async), GFP_NOFS);</div><div class='hunk'>@@ -655,11 +719,30 @@ static bool btrfs_wq_submit_bio(struct btrfs_bio *bbio,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 btrfs_append_map_length(struct btrfs_bio *bbio, u64 map_length)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='add'>+	unsigned int nr_segs;</div><div class='add'>+	int sector_offset;</div><div class='add'>+</div><div class='add'>+	map_length = min(map_length, fs_info-&gt;max_zone_append_size);</div><div class='add'>+	sector_offset = bio_split_rw_at(&amp;bbio-&gt;bio, &amp;fs_info-&gt;limits,</div><div class='add'>+					&amp;nr_segs, map_length);</div><div class='add'>+	if (sector_offset) {</div><div class='add'>+		/*</div><div class='add'>+		 * bio_split_rw_at() could split at a size smaller than our</div><div class='add'>+		 * sectorsize and thus cause unaligned I/Os.  Fix that by</div><div class='add'>+		 * always rounding down to the nearest boundary.</div><div class='add'>+		 */</div><div class='add'>+		return ALIGN_DOWN(sector_offset &lt;&lt; SECTOR_SHIFT, fs_info-&gt;sectorsize);</div><div class='add'>+	}</div><div class='add'>+	return map_length;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='del'>-	struct btrfs_fs_info *fs_info = bbio-&gt;fs_info;</div><div class='del'>-	struct btrfs_bio *orig_bbio = bbio;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='ctx'> 	u64 logical = bio-&gt;bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> 	u64 length = bio-&gt;bi_iter.bi_size;</div><div class='hunk'>@@ -667,25 +750,45 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> 	bool use_append = btrfs_use_zone_append(bbio);</div><div class='ctx'> 	struct btrfs_io_context *bioc = NULL;</div><div class='ctx'> 	struct btrfs_io_stripe smap;</div><div class='del'>-	blk_status_t ret;</div><div class='del'>-	int error;</div><div class='add'>+	blk_status_t status;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	smap.is_scrub = !bbio-&gt;inode;</div><div class='add'>+	if (bbio-&gt;is_scrub || btrfs_is_data_reloc_root(inode-&gt;root))</div><div class='add'>+		smap.rst_search_commit_root = true;</div><div class='add'>+	else</div><div class='add'>+		smap.rst_search_commit_root = false;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_bio_counter_inc_blocked(fs_info);</div><div class='del'>-	error = btrfs_map_block(fs_info, btrfs_op(bio), logical, &amp;map_length,</div><div class='del'>-				&amp;bioc, &amp;smap, &amp;mirror_num);</div><div class='del'>-	if (error) {</div><div class='del'>-		ret = errno_to_blk_status(error);</div><div class='del'>-		goto fail;</div><div class='add'>+	ret = btrfs_map_block(fs_info, btrfs_op(bio), logical, &amp;map_length,</div><div class='add'>+			      &amp;bioc, &amp;smap, &amp;mirror_num);</div><div class='add'>+	if (ret) {</div><div class='add'>+		status = errno_to_blk_status(ret);</div><div class='add'>+		btrfs_bio_counter_dec(fs_info);</div><div class='add'>+		goto end_bbio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * For fscrypt writes we will get the encrypted bio after we've remapped</div><div class='add'>+	 * our bio to the physical disk location, so we need to save the</div><div class='add'>+	 * original bytenr so we know what we're checksumming.</div><div class='add'>+	 */</div><div class='add'>+	if (bio_op(bio) == REQ_OP_WRITE &amp;&amp; is_data_bbio(bbio))</div><div class='add'>+		bbio-&gt;orig_logical = logical;</div><div class='add'>+</div><div class='ctx'> 	map_length = min(map_length, length);</div><div class='ctx'> 	if (use_append)</div><div class='del'>-		map_length = min(map_length, fs_info-&gt;max_zone_append_size);</div><div class='add'>+		map_length = btrfs_append_map_length(bbio, map_length);</div><div class='ctx'> </div><div class='ctx'> 	if (map_length &lt; length) {</div><div class='del'>-		bbio = btrfs_split_bio(fs_info, bbio, map_length, use_append);</div><div class='add'>+		struct btrfs_bio *split;</div><div class='add'>+</div><div class='add'>+		split = btrfs_split_bio(fs_info, bbio, map_length);</div><div class='add'>+		if (IS_ERR(split)) {</div><div class='add'>+			status = errno_to_blk_status(PTR_ERR(split));</div><div class='add'>+			btrfs_bio_counter_dec(fs_info);</div><div class='add'>+			goto end_bbio;</div><div class='add'>+		}</div><div class='add'>+		bbio = split;</div><div class='ctx'> 		bio = &amp;bbio-&gt;bio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -696,8 +799,9 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> 	if (bio_op(bio) == REQ_OP_READ &amp;&amp; is_data_bbio(bbio)) {</div><div class='ctx'> 		bbio-&gt;saved_iter = bio-&gt;bi_iter;</div><div class='ctx'> 		ret = btrfs_lookup_bio_sums(bbio);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto fail_put_bio;</div><div class='add'>+		status = errno_to_blk_status(ret);</div><div class='add'>+		if (status)</div><div class='add'>+			goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_op(bio) == BTRFS_MAP_WRITE) {</div><div class='hunk'>@@ -706,8 +810,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> 			bio-&gt;bi_opf |= REQ_OP_ZONE_APPEND;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (is_data_bbio(bbio) &amp;&amp; bioc &amp;&amp;</div><div class='del'>-		    btrfs_need_stripe_tree_update(bioc-&gt;fs_info, bioc-&gt;map_type)) {</div><div class='add'>+		if (is_data_bbio(bbio) &amp;&amp; bioc &amp;&amp; bioc-&gt;use_rst) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * No locking for the list update, as we only add to</div><div class='ctx'> 			 * the list in the I/O submission path, and list</div><div class='hunk'>@@ -722,42 +825,85 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> 		 * Csum items for reloc roots have already been cloned at this</div><div class='ctx'> 		 * point, so they are handled as part of the no-checksum case.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode &amp;&amp; !(inode-&gt;flags &amp; BTRFS_INODE_NODATASUM) &amp;&amp;</div><div class='del'>-		    !test_bit(BTRFS_FS_STATE_NO_CSUMS, &amp;fs_info-&gt;fs_state) &amp;&amp;</div><div class='add'>+		if (!(inode-&gt;flags &amp; BTRFS_INODE_NODATASUM) &amp;&amp;</div><div class='add'>+		    !test_bit(BTRFS_FS_STATE_NO_DATA_CSUMS, &amp;fs_info-&gt;fs_state) &amp;&amp;</div><div class='ctx'> 		    !btrfs_is_data_reloc_root(inode-&gt;root)) {</div><div class='ctx'> 			if (should_async_write(bbio) &amp;&amp;</div><div class='ctx'> 			    btrfs_wq_submit_bio(bbio, bioc, &amp;smap, mirror_num))</div><div class='ctx'> 				goto done;</div><div class='ctx'> </div><div class='ctx'> 			ret = btrfs_bio_csum(bbio);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto fail_put_bio;</div><div class='del'>-		} else if (use_append) {</div><div class='add'>+			status = errno_to_blk_status(ret);</div><div class='add'>+			if (status)</div><div class='add'>+				goto fail;</div><div class='add'>+		} else if (use_append ||</div><div class='add'>+			   (btrfs_is_zoned(fs_info) &amp;&amp; inode &amp;&amp;</div><div class='add'>+			    inode-&gt;flags &amp; BTRFS_INODE_NODATASUM)) {</div><div class='ctx'> 			ret = btrfs_alloc_dummy_sum(bbio);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto fail_put_bio;</div><div class='add'>+			status = errno_to_blk_status(ret);</div><div class='add'>+			if (status)</div><div class='add'>+				goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__btrfs_submit_bio(bio, bioc, &amp;smap, mirror_num);</div><div class='add'>+	btrfs_submit_bio(bio, bioc, &amp;smap, mirror_num);</div><div class='ctx'> done:</div><div class='ctx'> 	return map_length == length;</div><div class='ctx'> </div><div class='del'>-fail_put_bio:</div><div class='del'>-	if (map_length &lt; length)</div><div class='del'>-		btrfs_cleanup_bio(bbio);</div><div class='ctx'> fail:</div><div class='ctx'> 	btrfs_bio_counter_dec(fs_info);</div><div class='del'>-	btrfs_bio_end_io(orig_bbio, ret);</div><div class='add'>+	/*</div><div class='add'>+	 * We have split the original bbio, now we have to end both the current</div><div class='add'>+	 * @bbio and remaining one, as the remaining one will never be submitted.</div><div class='add'>+	 */</div><div class='add'>+	if (map_length &lt; length) {</div><div class='add'>+		struct btrfs_bio *remaining = bbio-&gt;private;</div><div class='add'>+</div><div class='add'>+		ASSERT(bbio-&gt;bio.bi_pool == &amp;btrfs_clone_bioset);</div><div class='add'>+		ASSERT(remaining);</div><div class='add'>+</div><div class='add'>+		btrfs_bio_end_io(remaining, status);</div><div class='add'>+	}</div><div class='add'>+end_bbio:</div><div class='add'>+	btrfs_bio_end_io(bbio, status);</div><div class='ctx'> 	/* Do not submit another chunk */</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_submit_bio(struct btrfs_bio *bbio, int mirror_num)</div><div class='add'>+static void assert_bbio_alignment(struct btrfs_bio *bbio)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BTRFS_ASSERT</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct bio_vec bvec;</div><div class='add'>+	struct bvec_iter iter;</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 alignment = min(blocksize, PAGE_SIZE);</div><div class='add'>+	const u64 logical = bbio-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+	const u32 length = bbio-&gt;bio.bi_iter.bi_size;</div><div class='add'>+</div><div class='add'>+	/* The logical and length should still be aligned to blocksize. */</div><div class='add'>+	ASSERT(IS_ALIGNED(logical, blocksize) &amp;&amp; IS_ALIGNED(length, blocksize) &amp;&amp;</div><div class='add'>+	       length != 0, "root=%llu inode=%llu logical=%llu length=%u",</div><div class='add'>+	       btrfs_root_id(bbio-&gt;inode-&gt;root),</div><div class='add'>+	       btrfs_ino(bbio-&gt;inode), logical, length);</div><div class='add'>+</div><div class='add'>+	bio_for_each_bvec(bvec, &amp;bbio-&gt;bio, iter)</div><div class='add'>+		ASSERT(IS_ALIGNED(bvec.bv_offset, alignment) &amp;&amp;</div><div class='add'>+		       IS_ALIGNED(bvec.bv_len, alignment),</div><div class='add'>+		"root=%llu inode=%llu logical=%llu length=%u index=%u bv_offset=%u bv_len=%u",</div><div class='add'>+		btrfs_root_id(bbio-&gt;inode-&gt;root),</div><div class='add'>+		btrfs_ino(bbio-&gt;inode), logical, length, iter.bi_idx,</div><div class='add'>+		bvec.bv_offset, bvec.bv_len);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_submit_bbio(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> {</div><div class='ctx'> 	/* If bbio-&gt;inode is not populated, its file_offset must be 0. */</div><div class='ctx'> 	ASSERT(bbio-&gt;inode || bbio-&gt;file_offset == 0);</div><div class='ctx'> </div><div class='add'>+	assert_bbio_alignment(bbio);</div><div class='add'>+</div><div class='ctx'> 	while (!btrfs_submit_chunk(bbio, mirror_num))</div><div class='ctx'> 		;</div><div class='ctx'> }</div><div class='hunk'>@@ -765,25 +911,42 @@ void btrfs_submit_bio(struct btrfs_bio *bbio, int mirror_num)</div><div class='ctx'> /*</div><div class='ctx'>  * Submit a repair write.</div><div class='ctx'>  *</div><div class='del'>- * This bypasses btrfs_submit_bio deliberately, as that writes all copies in a</div><div class='add'>+ * This bypasses btrfs_submit_bbio() deliberately, as that writes all copies in a</div><div class='ctx'>  * RAID setup.  Here we only want to write the one bad copy, so we do the</div><div class='ctx'>  * mapping ourselves and submit the bio directly.</div><div class='ctx'>  *</div><div class='ctx'>  * The I/O is issued synchronously to block the repair read completion from</div><div class='ctx'>  * freeing the bio.</div><div class='add'>+ *</div><div class='add'>+ * @ino:	Offending inode number</div><div class='add'>+ * @fileoff:	File offset inside the inode</div><div class='add'>+ * @length:	Length of the repair write</div><div class='add'>+ * @logical:	Logical address of the range</div><div class='add'>+ * @paddrs:	Physical address array of the content</div><div class='add'>+ * @step:	Length of for each paddrs</div><div class='add'>+ * @mirror_num: Mirror number to write to. Must not be zero</div><div class='ctx'>  */</div><div class='del'>-int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,</div><div class='del'>-			    u64 length, u64 logical, struct folio *folio,</div><div class='del'>-			    unsigned int folio_offset, int mirror_num)</div><div class='add'>+int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 fileoff,</div><div class='add'>+			    u32 length, u64 logical, const phys_addr_t paddrs[],</div><div class='add'>+			    unsigned int step, int mirror_num)</div><div class='ctx'> {</div><div class='add'>+	const u32 nr_steps = DIV_ROUND_UP_POW2(length, step);</div><div class='ctx'> 	struct btrfs_io_stripe smap = { 0 };</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	struct bio bio;</div><div class='add'>+	struct bio *bio = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(!(fs_info-&gt;sb-&gt;s_flags &amp; SB_RDONLY));</div><div class='ctx'> 	BUG_ON(!mirror_num);</div><div class='ctx'> </div><div class='add'>+	/* Basic alignment checks. */</div><div class='add'>+	ASSERT(IS_ALIGNED(logical, fs_info-&gt;sectorsize));</div><div class='add'>+	ASSERT(IS_ALIGNED(length, fs_info-&gt;sectorsize));</div><div class='add'>+	ASSERT(IS_ALIGNED(fileoff, fs_info-&gt;sectorsize));</div><div class='add'>+	/* Either it's a single data or metadata block. */</div><div class='add'>+	ASSERT(length &lt;= BTRFS_MAX_BLOCKSIZE);</div><div class='add'>+	ASSERT(step &lt;= length);</div><div class='add'>+	ASSERT(is_power_of_2(step));</div><div class='add'>+</div><div class='ctx'> 	if (btrfs_repair_one_zone(fs_info, logical))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -797,31 +960,33 @@ int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_counter_dec;</div><div class='ctx'> </div><div class='del'>-	if (!smap.dev-&gt;bdev ||</div><div class='del'>-	    !test_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;smap.dev-&gt;dev_state)) {</div><div class='add'>+	if (unlikely(!smap.dev-&gt;bdev ||</div><div class='add'>+		     !test_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;smap.dev-&gt;dev_state))) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out_counter_dec;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bio_init(&amp;bio, smap.dev-&gt;bdev, &amp;bvec, 1, REQ_OP_WRITE | REQ_SYNC);</div><div class='del'>-	bio.bi_iter.bi_sector = smap.physical &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	ret = bio_add_folio(&amp;bio, folio, length, folio_offset);</div><div class='del'>-	ASSERT(ret);</div><div class='del'>-	ret = submit_bio_wait(&amp;bio);</div><div class='add'>+	bio = bio_alloc(smap.dev-&gt;bdev, nr_steps, REQ_OP_WRITE | REQ_SYNC, GFP_NOFS);</div><div class='add'>+	bio-&gt;bi_iter.bi_sector = smap.physical &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+	for (int i = 0; i &lt; nr_steps; i++) {</div><div class='add'>+		ret = bio_add_page(bio, phys_to_page(paddrs[i]), step, offset_in_page(paddrs[i]));</div><div class='add'>+		/* We should have allocated enough slots to contain all the different pages. */</div><div class='add'>+		ASSERT(ret == step);</div><div class='add'>+	}</div><div class='add'>+	ret = submit_bio_wait(bio);</div><div class='add'>+	bio_put(bio);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* try to remap that extent elsewhere? */</div><div class='ctx'> 		btrfs_dev_stat_inc_and_print(smap.dev, BTRFS_DEV_STAT_WRITE_ERRS);</div><div class='del'>-		goto out_bio_uninit;</div><div class='add'>+		goto out_counter_dec;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_info_rl_in_rcu(fs_info,</div><div class='add'>+	btrfs_info_rl(fs_info,</div><div class='ctx'> 		"read error corrected: ino %llu off %llu (dev %s sector %llu)",</div><div class='del'>-			     ino, start, btrfs_dev_name(smap.dev),</div><div class='add'>+			     ino, fileoff, btrfs_dev_name(smap.dev),</div><div class='ctx'> 			     smap.physical &gt;&gt; SECTOR_SHIFT);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='del'>-out_bio_uninit:</div><div class='del'>-	bio_uninit(&amp;bio);</div><div class='ctx'> out_counter_dec:</div><div class='ctx'> 	btrfs_bio_counter_dec(fs_info);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -834,16 +999,16 @@ out_counter_dec:</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_submit_repair_write(struct btrfs_bio *bbio, int mirror_num, bool dev_replace)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = bbio-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	u64 logical = bbio-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> 	u64 length = bbio-&gt;bio.bi_iter.bi_size;</div><div class='ctx'> 	struct btrfs_io_stripe smap = { 0 };</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(fs_info);</div><div class='ctx'> 	ASSERT(mirror_num &gt; 0);</div><div class='ctx'> 	ASSERT(btrfs_op(&amp;bbio-&gt;bio) == BTRFS_MAP_WRITE);</div><div class='del'>-	ASSERT(!bbio-&gt;inode);</div><div class='add'>+	ASSERT(!is_data_inode(bbio-&gt;inode));</div><div class='add'>+	ASSERT(bbio-&gt;is_scrub);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_bio_counter_inc_blocked(fs_info);</div><div class='ctx'> 	ret = btrfs_map_repair_block(fs_info, &amp;smap, logical, length, mirror_num);</div><div class='hunk'>@@ -854,7 +1019,7 @@ void btrfs_submit_repair_write(struct btrfs_bio *bbio, int mirror_num, bool dev_</div><div class='ctx'> 		ASSERT(smap.dev == fs_info-&gt;dev_replace.srcdev);</div><div class='ctx'> 		smap.dev = fs_info-&gt;dev_replace.tgtdev;</div><div class='ctx'> 	}</div><div class='del'>-	__btrfs_submit_bio(&amp;bbio-&gt;bio, NULL, &amp;smap, mirror_num);</div><div class='add'>+	btrfs_submit_bio(&amp;bbio-&gt;bio, NULL, &amp;smap, mirror_num);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='hunk'>@@ -870,22 +1035,18 @@ int __init btrfs_bioset_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (bioset_init(&amp;btrfs_clone_bioset, BIO_POOL_SIZE,</div><div class='ctx'> 			offsetof(struct btrfs_bio, bio), 0))</div><div class='del'>-		goto out_free_bioset;</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (bioset_init(&amp;btrfs_repair_bioset, BIO_POOL_SIZE,</div><div class='ctx'> 			offsetof(struct btrfs_bio, bio),</div><div class='ctx'> 			BIOSET_NEED_BVECS))</div><div class='del'>-		goto out_free_clone_bioset;</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (mempool_init_kmalloc_pool(&amp;btrfs_failed_bio_pool, BIO_POOL_SIZE,</div><div class='ctx'> 				      sizeof(struct btrfs_failed_bio)))</div><div class='del'>-		goto out_free_repair_bioset;</div><div class='add'>+		goto out;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_free_repair_bioset:</div><div class='del'>-	bioset_exit(&amp;btrfs_repair_bioset);</div><div class='del'>-out_free_clone_bioset:</div><div class='del'>-	bioset_exit(&amp;btrfs_clone_bioset);</div><div class='del'>-out_free_bioset:</div><div class='del'>-	bioset_exit(&amp;btrfs_bioset);</div><div class='add'>+out:</div><div class='add'>+	btrfs_bioset_exit();</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/bio.h b/fs/btrfs/bio.h<br/>index bbaed317161a..1be74209f0b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/bio.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/bio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/bio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/bio.h</a></div><div class='hunk'>@@ -7,32 +7,30 @@</div><div class='ctx'> #ifndef BTRFS_BIO_H</div><div class='ctx'> #define BTRFS_BIO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include "tree-checker.h"</div><div class='ctx'> </div><div class='ctx'> struct btrfs_bio;</div><div class='ctx'> struct btrfs_fs_info;</div><div class='add'>+struct btrfs_inode;</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_BIO_INLINE_CSUM_SIZE	64</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Maximum number of sectors for a single bio to limit the size of the</div><div class='del'>- * checksum array.  This matches the number of bio_vecs per bio and thus the</div><div class='del'>- * I/O size for buffered I/O.</div><div class='del'>- */</div><div class='del'>-#define BTRFS_MAX_BIO_SECTORS		(256)</div><div class='del'>-</div><div class='ctx'> typedef void (*btrfs_bio_end_io_t)(struct btrfs_bio *bbio);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Highlevel btrfs I/O structure.  It is allocated by btrfs_bio_alloc and</div><div class='del'>- * passed to btrfs_submit_bio for mapping to the physical devices.</div><div class='add'>+ * passed to btrfs_submit_bbio() for mapping to the physical devices.</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_bio {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Inode and offset into it that this I/O operates on.</div><div class='del'>-	 * Only set for data I/O.</div><div class='add'>+	 *</div><div class='add'>+	 * If the inode is a data one, csum verification and read-repair</div><div class='add'>+	 * will be done automatically.</div><div class='add'>+	 * If the inode is a metadata one, everything is handled by the caller.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct btrfs_inode *inode;</div><div class='ctx'> 	u64 file_offset;</div><div class='hunk'>@@ -40,7 +38,7 @@ struct btrfs_bio {</div><div class='ctx'> 	union {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For data reads: checksumming and original I/O information.</div><div class='del'>-		 * (for internal use in the btrfs_submit_bio machinery only)</div><div class='add'>+		 * (for internal use in the btrfs_submit_bbio() machinery only)</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 *csum;</div><div class='hunk'>@@ -54,11 +52,16 @@ struct btrfs_bio {</div><div class='ctx'> 		 * - pointer to the checksums for this bio</div><div class='ctx'> 		 * - original physical address from the allocator</div><div class='ctx'> 		 *   (for zone append only)</div><div class='add'>+		 * - original logical address, used for checksumming fscrypt bios</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct btrfs_ordered_extent *ordered;</div><div class='ctx'> 			struct btrfs_ordered_sum *sums;</div><div class='add'>+			struct work_struct csum_work;</div><div class='add'>+			struct completion csum_done;</div><div class='add'>+			struct bvec_iter csum_saved_iter;</div><div class='ctx'> 			u64 orig_physical;</div><div class='add'>+			u64 orig_logical;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* For metadata reads: parentness verification. */</div><div class='hunk'>@@ -74,8 +77,20 @@ struct btrfs_bio {</div><div class='ctx'> 	atomic_t pending_ios;</div><div class='ctx'> 	struct work_struct end_io_work;</div><div class='ctx'> </div><div class='del'>-	/* File system that this I/O operates on. */</div><div class='del'>-	struct btrfs_fs_info *fs_info;</div><div class='add'>+	/* Save the first error status of split bio. */</div><div class='add'>+	blk_status_t status;</div><div class='add'>+</div><div class='add'>+	/* Use the commit root to look up csums (data read bio only). */</div><div class='add'>+	bool csum_search_commit_root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since scrub will reuse btree inode, we need this flag to distinguish</div><div class='add'>+	 * scrub bios.</div><div class='add'>+	 */</div><div class='add'>+	bool is_scrub;</div><div class='add'>+</div><div class='add'>+	/* Whether the csum generation for data write is async. */</div><div class='add'>+	bool async_csum;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This member must come last, bio_alloc_bioset will allocate enough</div><div class='hunk'>@@ -92,20 +107,20 @@ static inline struct btrfs_bio *btrfs_bio(struct bio *bio)</div><div class='ctx'> int __init btrfs_bioset_init(void);</div><div class='ctx'> void __cold btrfs_bioset_exit(void);</div><div class='ctx'> </div><div class='del'>-void btrfs_bio_init(struct btrfs_bio *bbio, struct btrfs_fs_info *fs_info,</div><div class='add'>+void btrfs_bio_init(struct btrfs_bio *bbio, struct btrfs_inode *inode, u64 file_offset,</div><div class='ctx'> 		    btrfs_bio_end_io_t end_io, void *private);</div><div class='ctx'> struct btrfs_bio *btrfs_bio_alloc(unsigned int nr_vecs, blk_opf_t opf,</div><div class='del'>-				  struct btrfs_fs_info *fs_info,</div><div class='add'>+				  struct btrfs_inode *inode, u64 file_offset,</div><div class='ctx'> 				  btrfs_bio_end_io_t end_io, void *private);</div><div class='ctx'> void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status);</div><div class='ctx'> </div><div class='ctx'> /* Submit using blkcg_punt_bio_submit. */</div><div class='ctx'> #define REQ_BTRFS_CGROUP_PUNT			REQ_FS_PRIVATE</div><div class='ctx'> </div><div class='del'>-void btrfs_submit_bio(struct btrfs_bio *bbio, int mirror_num);</div><div class='add'>+void btrfs_submit_bbio(struct btrfs_bio *bbio, int mirror_num);</div><div class='ctx'> void btrfs_submit_repair_write(struct btrfs_bio *bbio, int mirror_num, bool dev_replace);</div><div class='del'>-int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,</div><div class='del'>-			    u64 length, u64 logical, struct folio *folio,</div><div class='del'>-			    unsigned int folio_offset, int mirror_num);</div><div class='add'>+int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 fileoff,</div><div class='add'>+			    u32 length, u64 logical, const phys_addr_t paddrs[],</div><div class='add'>+			    unsigned int step, int mirror_num);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c<br/>index a9be9ac99222..08b14449fabe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-group.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-group.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-group.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/block-group.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include "extent-tree.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='del'>-int btrfs_should_fragment_free_space(struct btrfs_block_group *block_group)</div><div class='add'>+int btrfs_should_fragment_free_space(const struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> </div><div class='hunk'>@@ -34,15 +34,28 @@ int btrfs_should_fragment_free_space(struct btrfs_block_group *block_group)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline bool has_unwritten_metadata(struct btrfs_block_group *block_group)</div><div class='add'>+{</div><div class='add'>+	/* The meta_write_pointer is available only on the zoned setup. */</div><div class='add'>+	if (!btrfs_is_zoned(block_group-&gt;fs_info))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return block_group-&gt;start + block_group-&gt;alloc_offset &gt;</div><div class='add'>+		block_group-&gt;meta_write_pointer;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Return target flags in extended format or 0 if restripe for this chunk_type</div><div class='ctx'>  * is not in progress</div><div class='ctx'>  *</div><div class='ctx'>  * Should be called with balance_lock held</div><div class='ctx'>  */</div><div class='del'>-static u64 get_restripe_target(struct btrfs_fs_info *fs_info, u64 flags)</div><div class='add'>+static u64 get_restripe_target(const struct btrfs_fs_info *fs_info, u64 flags)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_balance_control *bctl = fs_info-&gt;balance_ctl;</div><div class='add'>+	const struct btrfs_balance_control *bctl = fs_info-&gt;balance_ctl;</div><div class='ctx'> 	u64 target = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!bctl)</div><div class='hunk'>@@ -173,43 +186,41 @@ void btrfs_put_block_group(struct btrfs_block_group *cache)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int btrfs_bg_start_cmp(const struct rb_node *new,</div><div class='add'>+			      const struct rb_node *exist)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_block_group *new_bg =</div><div class='add'>+		rb_entry(new, struct btrfs_block_group, cache_node);</div><div class='add'>+	const struct btrfs_block_group *exist_bg =</div><div class='add'>+		rb_entry(exist, struct btrfs_block_group, cache_node);</div><div class='add'>+</div><div class='add'>+	if (new_bg-&gt;start &lt; exist_bg-&gt;start)</div><div class='add'>+		return -1;</div><div class='add'>+	if (new_bg-&gt;start &gt; exist_bg-&gt;start)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This adds the block group to the fs_info rb tree for the block group cache</div><div class='ctx'>  */</div><div class='del'>-static int btrfs_add_block_group_cache(struct btrfs_fs_info *info,</div><div class='del'>-				       struct btrfs_block_group *block_group)</div><div class='add'>+static int btrfs_add_block_group_cache(struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	struct btrfs_block_group *cache;</div><div class='del'>-	bool leftmost = true;</div><div class='add'>+	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='add'>+	struct rb_node *exist;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(block_group-&gt;length != 0);</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;info-&gt;block_group_cache_lock);</div><div class='del'>-	p = &amp;info-&gt;block_group_cache_tree.rb_root.rb_node;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		cache = rb_entry(parent, struct btrfs_block_group, cache_node);</div><div class='del'>-		if (block_group-&gt;start &lt; cache-&gt;start) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (block_group-&gt;start &gt; cache-&gt;start) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else {</div><div class='del'>-			write_unlock(&amp;info-&gt;block_group_cache_lock);</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_link_node(&amp;block_group-&gt;cache_node, parent, p);</div><div class='del'>-	rb_insert_color_cached(&amp;block_group-&gt;cache_node,</div><div class='del'>-			       &amp;info-&gt;block_group_cache_tree, leftmost);</div><div class='add'>+	write_lock(&amp;fs_info-&gt;block_group_cache_lock);</div><div class='ctx'> </div><div class='del'>-	write_unlock(&amp;info-&gt;block_group_cache_lock);</div><div class='add'>+	exist = rb_find_add_cached(&amp;block_group-&gt;cache_node,</div><div class='add'>+			&amp;fs_info-&gt;block_group_cache_tree, btrfs_bg_start_cmp);</div><div class='add'>+	if (exist)</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+	write_unlock(&amp;fs_info-&gt;block_group_cache_lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -418,7 +429,7 @@ struct btrfs_caching_control *btrfs_get_caching_control(</div><div class='ctx'> 	return ctl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_put_caching_control(struct btrfs_caching_control *ctl)</div><div class='add'>+static void btrfs_put_caching_control(struct btrfs_caching_control *ctl)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;ctl-&gt;count))</div><div class='ctx'> 		kfree(ctl);</div><div class='hunk'>@@ -527,10 +538,9 @@ int btrfs_add_new_free_space(struct btrfs_block_group *block_group, u64 start,</div><div class='ctx'> 		*total_added_ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (start &lt; end) {</div><div class='del'>-		if (!find_first_extent_bit(&amp;info-&gt;excluded_extents, start,</div><div class='del'>-					   &amp;extent_start, &amp;extent_end,</div><div class='del'>-					   EXTENT_DIRTY | EXTENT_UPTODATE,</div><div class='del'>-					   NULL))</div><div class='add'>+		if (!btrfs_find_first_extent_bit(&amp;info-&gt;excluded_extents, start,</div><div class='add'>+						 &amp;extent_start, &amp;extent_end,</div><div class='add'>+						 EXTENT_DIRTY, NULL))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (extent_start &lt;= start) {</div><div class='hunk'>@@ -586,7 +596,7 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='ctx'> 	u64 search_offset;</div><div class='ctx'> 	u64 search_end = block_group-&gt;start + block_group-&gt;length;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key search_key;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -603,8 +613,8 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_</div><div class='ctx'> 	extent_root = btrfs_extent_root(fs_info, max_t(u64, block_group-&gt;start,</div><div class='ctx'> 						       BTRFS_SUPER_INFO_OFFSET));</div><div class='ctx'> </div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='ctx'> 	search_offset = index * div_u64(block_group-&gt;length, max_index);</div><div class='hunk'>@@ -628,7 +638,6 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;caching_ctl-&gt;mutex);</div><div class='ctx'> 	lockdep_assert_held_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -704,7 +713,7 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl)</div><div class='ctx'> 	struct btrfs_block_group *block_group = caching_ctl-&gt;block_group;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 total_found = 0;</div><div class='hunk'>@@ -735,13 +744,13 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl)</div><div class='ctx'> 	 * root to add free space.  So we skip locking and search the commit</div><div class='ctx'> 	 * root, since its read-only</div><div class='ctx'> 	 */</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = last;</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> next:</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, extent_root, &amp;key, path, 0, 0);</div><div class='hunk'>@@ -787,8 +796,8 @@ next:</div><div class='ctx'> </div><div class='ctx'> 		if (key.objectid &lt; last) {</div><div class='ctx'> 			key.objectid = last;</div><div class='del'>-			key.offset = 0;</div><div class='ctx'> 			key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+			key.offset = 0;</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -831,14 +840,13 @@ next:</div><div class='ctx'> 				       block_group-&gt;start + block_group-&gt;length,</div><div class='ctx'> 				       NULL);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_free_excluded_extents(const struct btrfs_block_group *bg)</div><div class='ctx'> {</div><div class='del'>-	clear_extent_bits(&amp;bg-&gt;fs_info-&gt;excluded_extents, bg-&gt;start,</div><div class='del'>-			  bg-&gt;start + bg-&gt;length - 1, EXTENT_UPTODATE);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;bg-&gt;fs_info-&gt;excluded_extents, bg-&gt;start,</div><div class='add'>+			       bg-&gt;start + bg-&gt;length - 1, EXTENT_DIRTY, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline void caching_thread(struct btrfs_work *work)</div><div class='hunk'>@@ -882,7 +890,7 @@ static noinline void caching_thread(struct btrfs_work *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE) &amp;&amp;</div><div class='ctx'> 	    !(test_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &amp;fs_info-&gt;flags)))</div><div class='del'>-		ret = load_free_space_tree(caching_ctl);</div><div class='add'>+		ret = btrfs_load_free_space_tree(caching_ctl);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = load_extent_tree_free(caching_ctl);</div><div class='ctx'> done:</div><div class='hunk'>@@ -1022,6 +1030,13 @@ static void clear_incompat_bg_bits(struct btrfs_fs_info *fs_info, u64 flags)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	if (btrfs_fs_compat_ro(fs_info, BLOCK_GROUP_TREE))</div><div class='add'>+		return fs_info-&gt;block_group_root;</div><div class='add'>+	return btrfs_extent_root(fs_info, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int remove_block_group_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   struct btrfs_path *path,</div><div class='ctx'> 				   struct btrfs_block_group *block_group)</div><div class='hunk'>@@ -1050,7 +1065,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_chunk_map *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='ctx'> 	struct btrfs_free_cluster *cluster;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -1063,7 +1078,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	bool remove_rsv = false;</div><div class='ctx'> </div><div class='ctx'> 	block_group = btrfs_lookup_block_group(fs_info, map-&gt;start);</div><div class='del'>-	BUG_ON(!block_group);</div><div class='add'>+	if (!block_group)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!block_group-&gt;ro);</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_remove_block_group(block_group);</div><div class='hunk'>@@ -1214,8 +1231,8 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	block_group-&gt;space_info-&gt;total_bytes -= block_group-&gt;length;</div><div class='ctx'> 	block_group-&gt;space_info-&gt;bytes_readonly -=</div><div class='ctx'> 		(block_group-&gt;length - block_group-&gt;zone_unusable);</div><div class='del'>-	block_group-&gt;space_info-&gt;bytes_zone_unusable -=</div><div class='del'>-		block_group-&gt;zone_unusable;</div><div class='add'>+	btrfs_space_info_update_bytes_zone_unusable(block_group-&gt;space_info,</div><div class='add'>+						    -block_group-&gt;zone_unusable);</div><div class='ctx'> 	block_group-&gt;space_info-&gt;disk_total -= block_group-&gt;length * factor;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;block_group-&gt;space_info-&gt;lock);</div><div class='hunk'>@@ -1231,7 +1248,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * another task to attempt to create another block group with the same</div><div class='ctx'> 	 * item key (and failing with -EEXIST and a transaction abort).</div><div class='ctx'> 	 */</div><div class='del'>-	ret = remove_block_group_free_space(trans, block_group);</div><div class='add'>+	ret = btrfs_remove_block_group_free_space(trans, block_group);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1240,6 +1257,15 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;block_group-&gt;lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Hitting this WARN means we removed a block group with an unwritten</div><div class='add'>+	 * region. It will cause "unable to find chunk map for logical" errors.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(has_unwritten_metadata(block_group)))</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='add'>+			   "block group %llu is removed before metadata write out",</div><div class='add'>+			   block_group-&gt;start);</div><div class='add'>+</div><div class='ctx'> 	set_bit(BLOCK_GROUP_FLAG_REMOVED, &amp;block_group-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1279,7 +1305,6 @@ out:</div><div class='ctx'> 	btrfs_put_block_group(block_group);</div><div class='ctx'> 	if (remove_rsv)</div><div class='ctx'> 		btrfs_dec_delayed_refs_rsv_bg_updates(fs_info);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1332,7 +1357,7 @@ struct btrfs_trans_handle *btrfs_start_trans_remove_block_group(</div><div class='ctx'>  * data in this block group. That check should be done by relocation routine,</div><div class='ctx'>  * not this function.</div><div class='ctx'>  */</div><div class='del'>-static int inc_block_group_ro(struct btrfs_block_group *cache, int force)</div><div class='add'>+static int inc_block_group_ro(struct btrfs_block_group *cache, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_space_info *sinfo = cache-&gt;space_info;</div><div class='ctx'> 	u64 num_bytes;</div><div class='hunk'>@@ -1377,8 +1402,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)</div><div class='ctx'> 		 * BTRFS_RESERVE_NO_FLUSH to give ourselves the most amount of</div><div class='ctx'> 		 * leeway to allow us to mark this block group as read only.</div><div class='ctx'> 		 */</div><div class='del'>-		if (btrfs_can_overcommit(cache-&gt;fs_info, sinfo, num_bytes,</div><div class='del'>-					 BTRFS_RESERVE_NO_FLUSH))</div><div class='add'>+		if (btrfs_can_overcommit(sinfo, num_bytes, BTRFS_RESERVE_NO_FLUSH))</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1387,7 +1411,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)</div><div class='ctx'> 		if (btrfs_is_zoned(cache-&gt;fs_info)) {</div><div class='ctx'> 			/* Migrate zone_unusable bytes to readonly */</div><div class='ctx'> 			sinfo-&gt;bytes_readonly += cache-&gt;zone_unusable;</div><div class='del'>-			sinfo-&gt;bytes_zone_unusable -= cache-&gt;zone_unusable;</div><div class='add'>+			btrfs_space_info_update_bytes_zone_unusable(sinfo, -cache-&gt;zone_unusable);</div><div class='ctx'> 			cache-&gt;zone_unusable = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		cache-&gt;ro++;</div><div class='hunk'>@@ -1399,24 +1423,23 @@ out:</div><div class='ctx'> 	if (ret == -ENOSPC &amp;&amp; btrfs_test_opt(cache-&gt;fs_info, ENOSPC_DEBUG)) {</div><div class='ctx'> 		btrfs_info(cache-&gt;fs_info,</div><div class='ctx'> 			"unable to make block group %llu ro", cache-&gt;start);</div><div class='del'>-		btrfs_dump_space_info(cache-&gt;fs_info, cache-&gt;space_info, 0, 0);</div><div class='add'>+		btrfs_dump_space_info(cache-&gt;space_info, 0, false);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool clean_pinned_extents(struct btrfs_trans_handle *trans,</div><div class='del'>-				 struct btrfs_block_group *bg)</div><div class='add'>+				 const struct btrfs_block_group *bg)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_transaction *prev_trans = NULL;</div><div class='ctx'> 	const u64 start = bg-&gt;start;</div><div class='ctx'> 	const u64 end = start + bg-&gt;length - 1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='del'>-	if (trans-&gt;transaction-&gt;list.prev != &amp;fs_info-&gt;trans_list) {</div><div class='del'>-		prev_trans = list_last_entry(&amp;trans-&gt;transaction-&gt;list,</div><div class='del'>-					     struct btrfs_transaction, list);</div><div class='add'>+	if (!list_is_first(&amp;trans-&gt;transaction-&gt;list, &amp;fs_info-&gt;trans_list)) {</div><div class='add'>+		prev_trans = list_prev_entry(trans-&gt;transaction, list);</div><div class='ctx'> 		refcount_inc(&amp;prev_trans-&gt;use_count);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='hunk'>@@ -1429,18 +1452,18 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * group in pinned_extents before we were able to clear the whole block</div><div class='ctx'> 	 * group range from pinned_extents. This means that task can lookup for</div><div class='ctx'> 	 * the block group after we unpinned it from pinned_extents and removed</div><div class='del'>-	 * it, leading to a BUG_ON() at unpin_extent_range().</div><div class='add'>+	 * it, leading to an error at unpin_extent_range().</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='ctx'> 	if (prev_trans) {</div><div class='del'>-		ret = clear_extent_bits(&amp;prev_trans-&gt;pinned_extents, start, end,</div><div class='del'>-					EXTENT_DIRTY);</div><div class='add'>+		ret = btrfs_clear_extent_bit(&amp;prev_trans-&gt;pinned_extents, start, end,</div><div class='add'>+					     EXTENT_DIRTY, NULL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = clear_extent_bits(&amp;trans-&gt;transaction-&gt;pinned_extents, start, end,</div><div class='del'>-				EXTENT_DIRTY);</div><div class='add'>+	ret = btrfs_clear_extent_bit(&amp;trans-&gt;transaction-&gt;pinned_extents, start, end,</div><div class='add'>+				     EXTENT_DIRTY, NULL);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='ctx'> 	if (prev_trans)</div><div class='hunk'>@@ -1450,11 +1473,38 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Link the block_group to a list via bg_list.</div><div class='add'>+ *</div><div class='add'>+ * @bg:       The block_group to link to the list.</div><div class='add'>+ * @list:     The list to link it to.</div><div class='add'>+ *</div><div class='add'>+ * Use this rather than list_add_tail() directly to ensure proper respect</div><div class='add'>+ * to locking and refcounting.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the bg was linked with a refcount bump and false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool btrfs_link_bg_list(struct btrfs_block_group *bg, struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='add'>+	bool added = false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+	if (list_empty(&amp;bg-&gt;bg_list)) {</div><div class='add'>+		btrfs_get_block_group(bg);</div><div class='add'>+		list_add_tail(&amp;bg-&gt;bg_list, list);</div><div class='add'>+		added = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+	return added;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Process the unused_bgs list and remove any that don't have any allocated</div><div class='ctx'>  * space inside of them.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(retry_list);</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='ctx'> 	struct btrfs_space_info *space_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='hunk'>@@ -1476,6 +1526,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	while (!list_empty(&amp;fs_info-&gt;unused_bgs)) {</div><div class='add'>+		u64 used;</div><div class='ctx'> 		int trimming;</div><div class='ctx'> </div><div class='ctx'> 		block_group = list_first_entry(&amp;fs_info-&gt;unused_bgs,</div><div class='hunk'>@@ -1511,22 +1562,69 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		spin_lock(&amp;block_group-&gt;lock);</div><div class='del'>-		if (block_group-&gt;reserved || block_group-&gt;pinned ||</div><div class='del'>-		    block_group-&gt;used || block_group-&gt;ro ||</div><div class='add'>+		if (btrfs_is_block_group_used(block_group) || block_group-&gt;ro ||</div><div class='ctx'> 		    list_is_singular(&amp;block_group-&gt;list)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We want to bail if we made new allocations or have</div><div class='ctx'> 			 * outstanding allocations in this block group.  We do</div><div class='ctx'> 			 * the ro check in case balance is currently acting on</div><div class='ctx'> 			 * this block group.</div><div class='add'>+			 *</div><div class='add'>+			 * Also bail out if this is the only block group for its</div><div class='add'>+			 * type, because otherwise we would lose profile</div><div class='add'>+			 * information from fs_info-&gt;avail_*_alloc_bits and the</div><div class='add'>+			 * next block group of this type would be created with a</div><div class='add'>+			 * "single" profile (even if we're in a raid fs) because</div><div class='add'>+			 * fs_info-&gt;avail_*_alloc_bits would be 0.</div><div class='add'>+			 */</div><div class='add'>+			trace_btrfs_skip_unused_block_group(block_group);</div><div class='add'>+			spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+			up_write(&amp;space_info-&gt;groups_sem);</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The block group may be unused but there may be space reserved</div><div class='add'>+		 * accounting with the existence of that block group, that is,</div><div class='add'>+		 * space_info-&gt;bytes_may_use was incremented by a task but no</div><div class='add'>+		 * space was yet allocated from the block group by the task.</div><div class='add'>+		 * That space may or may not be allocated, as we are generally</div><div class='add'>+		 * pessimistic about space reservation for metadata as well as</div><div class='add'>+		 * for data when using compression (as we reserve space based on</div><div class='add'>+		 * the worst case, when data can't be compressed, and before</div><div class='add'>+		 * actually attempting compression, before starting writeback).</div><div class='add'>+		 *</div><div class='add'>+		 * So check if the total space of the space_info minus the size</div><div class='add'>+		 * of this block group is less than the used space of the</div><div class='add'>+		 * space_info - if that's the case, then it means we have tasks</div><div class='add'>+		 * that might be relying on the block group in order to allocate</div><div class='add'>+		 * extents, and add back the block group to the unused list when</div><div class='add'>+		 * we finish, so that we retry later in case no tasks ended up</div><div class='add'>+		 * needing to allocate extents from the block group.</div><div class='add'>+		 */</div><div class='add'>+		used = btrfs_space_info_used(space_info, true);</div><div class='add'>+		if ((space_info-&gt;total_bytes - block_group-&gt;length &lt; used &amp;&amp;</div><div class='add'>+		     block_group-&gt;zone_unusable &lt; block_group-&gt;length) ||</div><div class='add'>+		    has_unwritten_metadata(block_group)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Add a reference for the list, compensate for the ref</div><div class='add'>+			 * drop under the "next" label for the</div><div class='add'>+			 * fs_info-&gt;unused_bgs list.</div><div class='ctx'> 			 */</div><div class='add'>+			btrfs_link_bg_list(block_group, &amp;retry_list);</div><div class='add'>+</div><div class='ctx'> 			trace_btrfs_skip_unused_block_group(block_group);</div><div class='ctx'> 			spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			up_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/* We don't want to force the issue, only flip if it's ok. */</div><div class='ctx'> 		ret = inc_block_group_ro(block_group, 0);</div><div class='hunk'>@@ -1539,8 +1637,10 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		ret = btrfs_zone_finish(block_group);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			btrfs_dec_block_group_ro(block_group);</div><div class='del'>-			if (ret == -EAGAIN)</div><div class='add'>+			if (ret == -EAGAIN) {</div><div class='add'>+				btrfs_link_bg_list(block_group, &amp;retry_list);</div><div class='ctx'> 				ret = 0;</div><div class='add'>+			}</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1586,8 +1686,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		btrfs_space_info_update_bytes_pinned(fs_info, space_info,</div><div class='del'>-						     -block_group-&gt;pinned);</div><div class='add'>+		btrfs_space_info_update_bytes_pinned(space_info, -block_group-&gt;pinned);</div><div class='ctx'> 		space_info-&gt;bytes_readonly += block_group-&gt;pinned;</div><div class='ctx'> 		block_group-&gt;pinned = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1650,12 +1749,16 @@ next:</div><div class='ctx'> 		btrfs_put_block_group(block_group);</div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	}</div><div class='add'>+	list_splice_tail(&amp;retry_list, &amp;fs_info-&gt;unused_bgs);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> flip_async:</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+	list_splice_tail(&amp;retry_list, &amp;fs_info-&gt;unused_bgs);</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 	btrfs_put_block_group(block_group);</div><div class='ctx'> 	btrfs_discard_punt_unused_bgs_list(fs_info);</div><div class='hunk'>@@ -1690,36 +1793,40 @@ static int reclaim_bgs_cmp(void *unused, const struct list_head *a,</div><div class='ctx'> 	bg1 = list_entry(a, struct btrfs_block_group, bg_list);</div><div class='ctx'> 	bg2 = list_entry(b, struct btrfs_block_group, bg_list);</div><div class='ctx'> </div><div class='del'>-	return bg1-&gt;used &gt; bg2-&gt;used;</div><div class='add'>+	/*</div><div class='add'>+	 * Some other task may be updating the -&gt;used field concurrently, but it</div><div class='add'>+	 * is not serious if we get a stale value or load/store tearing issues,</div><div class='add'>+	 * as sorting the list of block groups to reclaim is not critical and an</div><div class='add'>+	 * occasional imperfect order is ok. So silence KCSAN and avoid the</div><div class='add'>+	 * overhead of locking or any other synchronization.</div><div class='add'>+	 */</div><div class='add'>+	return data_race(bg1-&gt;used &gt; bg2-&gt;used);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool btrfs_should_reclaim(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline bool btrfs_should_reclaim(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return btrfs_zoned_should_reclaim(fs_info);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool should_reclaim_block_group(struct btrfs_block_group *bg, u64 bytes_freed)</div><div class='add'>+static bool should_reclaim_block_group(const struct btrfs_block_group *bg, u64 bytes_freed)</div><div class='ctx'> {</div><div class='del'>-	const struct btrfs_space_info *space_info = bg-&gt;space_info;</div><div class='del'>-	const int reclaim_thresh = READ_ONCE(space_info-&gt;bg_reclaim_threshold);</div><div class='add'>+	const int thresh_pct = btrfs_calc_reclaim_threshold(bg-&gt;space_info);</div><div class='add'>+	u64 thresh_bytes = mult_perc(bg-&gt;length, thresh_pct);</div><div class='ctx'> 	const u64 new_val = bg-&gt;used;</div><div class='ctx'> 	const u64 old_val = new_val + bytes_freed;</div><div class='del'>-	u64 thresh;</div><div class='ctx'> </div><div class='del'>-	if (reclaim_thresh == 0)</div><div class='add'>+	if (thresh_bytes == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	thresh = mult_perc(bg-&gt;length, reclaim_thresh);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we were below the threshold before don't reclaim, we are likely a</div><div class='ctx'> 	 * brand new block group and we don't want to relocate new block groups.</div><div class='ctx'> 	 */</div><div class='del'>-	if (old_val &lt; thresh)</div><div class='add'>+	if (old_val &lt; thresh_bytes)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (new_val &gt;= thresh)</div><div class='add'>+	if (new_val &gt;= thresh_bytes)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -1730,6 +1837,7 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 		container_of(work, struct btrfs_fs_info, reclaim_bgs_work);</div><div class='ctx'> 	struct btrfs_block_group *bg;</div><div class='ctx'> 	struct btrfs_space_info *space_info;</div><div class='add'>+	LIST_HEAD(retry_list);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(BTRFS_FS_OPEN, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1740,12 +1848,10 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 	if (!btrfs_should_reclaim(fs_info))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	sb_start_write(fs_info-&gt;sb);</div><div class='add'>+	guard(super_write)(fs_info-&gt;sb);</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE)) {</div><div class='del'>-		sb_end_write(fs_info-&gt;sb);</div><div class='add'>+	if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Long running balances can keep us blocked here for eternity, so</div><div class='hunk'>@@ -1753,7 +1859,6 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!mutex_trylock(&amp;fs_info-&gt;reclaim_bgs_lock)) {</div><div class='ctx'> 		btrfs_exclop_finish(fs_info);</div><div class='del'>-		sb_end_write(fs_info-&gt;sb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1765,7 +1870,8 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_sort(NULL, &amp;fs_info-&gt;reclaim_bgs, reclaim_bgs_cmp);</div><div class='ctx'> 	while (!list_empty(&amp;fs_info-&gt;reclaim_bgs)) {</div><div class='del'>-		u64 zone_unusable;</div><div class='add'>+		u64 used;</div><div class='add'>+		u64 reserved;</div><div class='ctx'> 		int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 		bg = list_first_entry(&amp;fs_info-&gt;reclaim_bgs,</div><div class='hunk'>@@ -1779,6 +1885,7 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 		/* Don't race with allocators so take the groups_sem */</div><div class='ctx'> 		down_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> </div><div class='add'>+		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		spin_lock(&amp;bg-&gt;lock);</div><div class='ctx'> 		if (bg-&gt;reserved || bg-&gt;pinned || bg-&gt;ro) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1788,6 +1895,7 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 			 * this block group.</div><div class='ctx'> 			 */</div><div class='ctx'> 			spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			up_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1806,6 +1914,7 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 			if (!btrfs_test_opt(fs_info, DISCARD_ASYNC))</div><div class='ctx'> 				btrfs_mark_bg_unused(bg);</div><div class='ctx'> 			spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			up_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='hunk'>@@ -1822,15 +1931,18 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!should_reclaim_block_group(bg, bg-&gt;length)) {</div><div class='ctx'> 			spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			up_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Get out fast, in case we're read-only or unmounting the</div><div class='ctx'> 		 * filesystem. It is OK to drop block groups from the list even</div><div class='del'>-		 * for the read-only case. As we did sb_start_write(),</div><div class='add'>+		 * for the read-only case. As we did take the super write lock,</div><div class='ctx'> 		 * "mount -o remount,ro" won't happen and read-only filesystem</div><div class='ctx'> 		 * means it is forced read-only due to a fatal error. So, it</div><div class='ctx'> 		 * never gets back to read-write to let us reclaim again.</div><div class='hunk'>@@ -1840,34 +1952,56 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Cache the zone_unusable value before turning the block group</div><div class='del'>-		 * to read only. As soon as the blog group is read only it's</div><div class='del'>-		 * zone_unusable value gets moved to the block group's read-only</div><div class='del'>-		 * bytes and isn't available for calculations anymore.</div><div class='del'>-		 */</div><div class='del'>-		zone_unusable = bg-&gt;zone_unusable;</div><div class='ctx'> 		ret = inc_block_group_ro(bg, 0);</div><div class='ctx'> 		up_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='del'>-		btrfs_info(fs_info,</div><div class='del'>-			"reclaiming chunk %llu with %llu%% used %llu%% unusable",</div><div class='del'>-				bg-&gt;start,</div><div class='del'>-				div64_u64(bg-&gt;used * 100, bg-&gt;length),</div><div class='del'>-				div64_u64(zone_unusable * 100, bg-&gt;length));</div><div class='add'>+		/*</div><div class='add'>+		 * The amount of bytes reclaimed corresponds to the sum of the</div><div class='add'>+		 * "used" and "reserved" counters. We have set the block group</div><div class='add'>+		 * to RO above, which prevents reservations from happening but</div><div class='add'>+		 * we may have existing reservations for which allocation has</div><div class='add'>+		 * not yet been done - btrfs_update_block_group() was not yet</div><div class='add'>+		 * called, which is where we will transfer a reserved extent's</div><div class='add'>+		 * size from the "reserved" counter to the "used" counter - this</div><div class='add'>+		 * happens when running delayed references. When we relocate the</div><div class='add'>+		 * chunk below, relocation first flushes delalloc, waits for</div><div class='add'>+		 * ordered extent completion (which is where we create delayed</div><div class='add'>+		 * references for data extents) and commits the current</div><div class='add'>+		 * transaction (which runs delayed references), and only after</div><div class='add'>+		 * it does the actual work to move extents out of the block</div><div class='add'>+		 * group. So the reported amount of reclaimed bytes is</div><div class='add'>+		 * effectively the sum of the 'used' and 'reserved' counters.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+		used = bg-&gt;used;</div><div class='add'>+		reserved = bg-&gt;reserved;</div><div class='add'>+		spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 		trace_btrfs_reclaim_block_group(bg);</div><div class='del'>-		ret = btrfs_relocate_chunk(fs_info, bg-&gt;start);</div><div class='add'>+		ret = btrfs_relocate_chunk(fs_info, bg-&gt;start, false);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			btrfs_dec_block_group_ro(bg);</div><div class='ctx'> 			btrfs_err(fs_info, "error relocating chunk %llu",</div><div class='ctx'> 				  bg-&gt;start);</div><div class='add'>+			used = 0;</div><div class='add'>+			reserved = 0;</div><div class='add'>+			spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+			space_info-&gt;reclaim_errors++;</div><div class='add'>+			if (READ_ONCE(space_info-&gt;periodic_reclaim))</div><div class='add'>+				space_info-&gt;periodic_reclaim_ready = false;</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		}</div><div class='add'>+		spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+		space_info-&gt;reclaim_count++;</div><div class='add'>+		space_info-&gt;reclaim_bytes += used;</div><div class='add'>+		space_info-&gt;reclaim_bytes += reserved;</div><div class='add'>+		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> next:</div><div class='del'>-		if (ret)</div><div class='del'>-			btrfs_mark_bg_to_reclaim(bg);</div><div class='add'>+		if (ret &amp;&amp; !READ_ONCE(space_info-&gt;periodic_reclaim))</div><div class='add'>+			btrfs_link_bg_list(bg, &amp;retry_list);</div><div class='ctx'> 		btrfs_put_block_group(bg);</div><div class='ctx'> </div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='hunk'>@@ -1887,15 +2021,18 @@ next:</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> end:</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+	list_splice_tail(&amp;retry_list, &amp;fs_info-&gt;reclaim_bgs);</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	btrfs_exclop_finish(fs_info);</div><div class='del'>-	sb_end_write(fs_info-&gt;sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_reclaim_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	btrfs_reclaim_sweep(fs_info);</div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	if (!list_empty(&amp;fs_info-&gt;reclaim_bgs))</div><div class='del'>-		queue_work(system_unbound_wq, &amp;fs_info-&gt;reclaim_bgs_work);</div><div class='add'>+		queue_work(system_dfl_wq, &amp;fs_info-&gt;reclaim_bgs_work);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1903,17 +2040,12 @@ void btrfs_mark_bg_to_reclaim(struct btrfs_block_group *bg)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='del'>-	if (list_empty(&amp;bg-&gt;bg_list)) {</div><div class='del'>-		btrfs_get_block_group(bg);</div><div class='add'>+	if (btrfs_link_bg_list(bg, &amp;fs_info-&gt;reclaim_bgs))</div><div class='ctx'> 		trace_btrfs_add_reclaim_block_group(bg);</div><div class='del'>-		list_add_tail(&amp;bg-&gt;bg_list, &amp;fs_info-&gt;reclaim_bgs);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int read_bg_from_eb(struct btrfs_fs_info *fs_info, struct btrfs_key *key,</div><div class='del'>-			   struct btrfs_path *path)</div><div class='add'>+static int read_bg_from_eb(struct btrfs_fs_info *fs_info, const struct btrfs_key *key,</div><div class='add'>+			   const struct btrfs_path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_chunk_map *map;</div><div class='ctx'> 	struct btrfs_block_group_item bg;</div><div class='hunk'>@@ -1933,7 +2065,7 @@ static int read_bg_from_eb(struct btrfs_fs_info *fs_info, struct btrfs_key *key,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (map-&gt;start != key-&gt;objectid || map-&gt;chunk_len != key-&gt;offset) {</div><div class='add'>+	if (unlikely(map-&gt;start != key-&gt;objectid || map-&gt;chunk_len != key-&gt;offset)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			"block group %llu len %llu mismatch with chunk %llu len %llu",</div><div class='ctx'> 			  key-&gt;objectid, key-&gt;offset, map-&gt;start, map-&gt;chunk_len);</div><div class='hunk'>@@ -1946,7 +2078,7 @@ static int read_bg_from_eb(struct btrfs_fs_info *fs_info, struct btrfs_key *key,</div><div class='ctx'> 	flags = btrfs_stack_block_group_flags(&amp;bg) &amp;</div><div class='ctx'> 		BTRFS_BLOCK_GROUP_TYPE_MASK;</div><div class='ctx'> </div><div class='del'>-	if (flags != (map-&gt;type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK)) {</div><div class='add'>+	if (unlikely(flags != (map-&gt;type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK))) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "block group %llu len %llu type flags 0x%llx mismatch with chunk type flags 0x%llx",</div><div class='ctx'> 			  key-&gt;objectid, key-&gt;offset, flags,</div><div class='hunk'>@@ -1961,7 +2093,7 @@ out_free_map:</div><div class='ctx'> </div><div class='ctx'> static int find_first_block_group(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				  struct btrfs_path *path,</div><div class='del'>-				  struct btrfs_key *key)</div><div class='add'>+				  const struct btrfs_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_block_group_root(fs_info);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2092,9 +2224,9 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)</div><div class='ctx'> 	if (cache-&gt;start &lt; BTRFS_SUPER_INFO_OFFSET) {</div><div class='ctx'> 		stripe_len = BTRFS_SUPER_INFO_OFFSET - cache-&gt;start;</div><div class='ctx'> 		cache-&gt;bytes_super += stripe_len;</div><div class='del'>-		ret = set_extent_bit(&amp;fs_info-&gt;excluded_extents, cache-&gt;start,</div><div class='del'>-				     cache-&gt;start + stripe_len - 1,</div><div class='del'>-				     EXTENT_UPTODATE, NULL);</div><div class='add'>+		ret = btrfs_set_extent_bit(&amp;fs_info-&gt;excluded_extents, cache-&gt;start,</div><div class='add'>+					   cache-&gt;start + stripe_len - 1,</div><div class='add'>+					   EXTENT_DIRTY, NULL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2107,7 +2239,7 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		/* Shouldn't have super stripes in sequential zones */</div><div class='del'>-		if (zoned &amp;&amp; nr) {</div><div class='add'>+		if (unlikely(zoned &amp;&amp; nr)) {</div><div class='ctx'> 			kfree(logical);</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 			"zoned: block group %llu must not contain super block",</div><div class='hunk'>@@ -2120,9 +2252,9 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)</div><div class='ctx'> 				cache-&gt;start + cache-&gt;length - logical[nr]);</div><div class='ctx'> </div><div class='ctx'> 			cache-&gt;bytes_super += len;</div><div class='del'>-			ret = set_extent_bit(&amp;fs_info-&gt;excluded_extents, logical[nr],</div><div class='del'>-					     logical[nr] + len - 1,</div><div class='del'>-					     EXTENT_UPTODATE, NULL);</div><div class='add'>+			ret = btrfs_set_extent_bit(&amp;fs_info-&gt;excluded_extents,</div><div class='add'>+						   logical[nr], logical[nr] + len - 1,</div><div class='add'>+						   EXTENT_DIRTY, NULL);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				kfree(logical);</div><div class='ctx'> 				return ret;</div><div class='hunk'>@@ -2198,7 +2330,7 @@ static int check_chunk_block_group_mappings(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		bg = btrfs_lookup_block_group(fs_info, map-&gt;start);</div><div class='del'>-		if (!bg) {</div><div class='add'>+		if (unlikely(!bg)) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 	"chunk start=%llu len=%llu doesn't have corresponding block group",</div><div class='ctx'> 				     map-&gt;start, map-&gt;chunk_len);</div><div class='hunk'>@@ -2206,9 +2338,9 @@ static int check_chunk_block_group_mappings(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 			btrfs_free_chunk_map(map);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (bg-&gt;start != map-&gt;start || bg-&gt;length != map-&gt;chunk_len ||</div><div class='del'>-		    (bg-&gt;flags &amp; BTRFS_BLOCK_GROUP_TYPE_MASK) !=</div><div class='del'>-		    (map-&gt;type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK)) {</div><div class='add'>+		if (unlikely(bg-&gt;start != map-&gt;start || bg-&gt;length != map-&gt;chunk_len ||</div><div class='add'>+			     (bg-&gt;flags &amp; BTRFS_BLOCK_GROUP_TYPE_MASK) !=</div><div class='add'>+			     (map-&gt;type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> "chunk start=%llu len=%llu flags=0x%llx doesn't match block group start=%llu len=%llu flags=0x%llx",</div><div class='ctx'> 				map-&gt;start, map-&gt;chunk_len,</div><div class='hunk'>@@ -2247,8 +2379,9 @@ static int read_one_block_group(struct btrfs_fs_info *info,</div><div class='ctx'> 	cache-&gt;commit_used = cache-&gt;used;</div><div class='ctx'> 	cache-&gt;flags = btrfs_stack_block_group_flags(bgi);</div><div class='ctx'> 	cache-&gt;global_root_id = btrfs_stack_block_group_chunk_objectid(bgi);</div><div class='add'>+	cache-&gt;space_info = btrfs_find_space_info(info, cache-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	set_free_space_tree_thresholds(cache);</div><div class='add'>+	btrfs_set_free_space_tree_thresholds(cache);</div><div class='ctx'> </div><div class='ctx'> 	if (need_clear) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2320,11 +2453,12 @@ static int read_one_block_group(struct btrfs_fs_info *info,</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_add_block_group_cache(info, cache);</div><div class='add'>+	ret = btrfs_add_block_group_cache(cache);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_remove_free_space_cache(cache);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	trace_btrfs_add_block_group(info, cache, 0);</div><div class='ctx'> 	btrfs_add_bg_to_space_info(info, cache);</div><div class='ctx'> </div><div class='hunk'>@@ -2369,7 +2503,8 @@ static int fill_dummy_bgs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		bg-&gt;cached = BTRFS_CACHE_FINISHED;</div><div class='ctx'> 		bg-&gt;used = map-&gt;chunk_len;</div><div class='ctx'> 		bg-&gt;flags = map-&gt;type;</div><div class='del'>-		ret = btrfs_add_block_group_cache(fs_info, bg);</div><div class='add'>+		bg-&gt;space_info = btrfs_find_space_info(fs_info, bg-&gt;flags);</div><div class='add'>+		ret = btrfs_add_block_group_cache(bg);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We may have some valid block group cache added already, in</div><div class='ctx'> 		 * that case we skip to the next one.</div><div class='hunk'>@@ -2419,8 +2554,8 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)</div><div class='ctx'> 		return fill_dummy_bgs(info);</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = 0;</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2546,12 +2681,12 @@ static int insert_block_group_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int insert_dev_extent(struct btrfs_trans_handle *trans,</div><div class='del'>-			    struct btrfs_device *device, u64 chunk_offset,</div><div class='del'>-			    u64 start, u64 num_bytes)</div><div class='add'>+			     const struct btrfs_device *device, u64 chunk_offset,</div><div class='add'>+			     u64 start, u64 num_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = device-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;dev_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dev_extent *extent;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -2568,7 +2703,7 @@ static int insert_dev_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	key.offset = start;</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;key, sizeof(*extent));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	extent = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_dev_extent);</div><div class='hunk'>@@ -2576,11 +2711,8 @@ static int insert_dev_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_dev_extent_chunk_objectid(leaf, extent,</div><div class='ctx'> 					    BTRFS_FIRST_CHUNK_TREE_OBJECTID);</div><div class='ctx'> 	btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);</div><div class='del'>-</div><div class='ctx'> 	btrfs_set_dev_extent_length(leaf, extent, num_bytes);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2668,7 +2800,7 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 					 block_group-&gt;length);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-		add_block_group_free_space(trans, block_group);</div><div class='add'>+		btrfs_add_block_group_free_space(trans, block_group);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we restriped during balance, we may have added a new raid</div><div class='hunk'>@@ -2682,8 +2814,43 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		/* Already aborted the transaction if it failed. */</div><div class='ctx'> next:</div><div class='ctx'> 		btrfs_dec_delayed_refs_rsv_bg_inserts(fs_info);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 		list_del_init(&amp;block_group-&gt;bg_list);</div><div class='ctx'> 		clear_bit(BLOCK_GROUP_FLAG_NEW, &amp;block_group-&gt;runtime_flags);</div><div class='add'>+		btrfs_put_block_group(block_group);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the block group is still unused, add it to the list of</div><div class='add'>+		 * unused block groups. The block group may have been created in</div><div class='add'>+		 * order to satisfy a space reservation, in which case the</div><div class='add'>+		 * extent allocation only happens later. But often we don't</div><div class='add'>+		 * actually need to allocate space that we previously reserved,</div><div class='add'>+		 * so the block group may become unused for a long time. For</div><div class='add'>+		 * example for metadata we generally reserve space for a worst</div><div class='add'>+		 * possible scenario, but then don't end up allocating all that</div><div class='add'>+		 * space or none at all (due to no need to COW, extent buffers</div><div class='add'>+		 * were already COWed in the current transaction and still</div><div class='add'>+		 * unwritten, tree heights lower than the maximum possible</div><div class='add'>+		 * height, etc). For data we generally reserve the exact amount</div><div class='add'>+		 * of space we are going to allocate later, the exception is</div><div class='add'>+		 * when using compression, as we must reserve space based on the</div><div class='add'>+		 * uncompressed data size, because the compression is only done</div><div class='add'>+		 * when writeback triggered and we don't know how much space we</div><div class='add'>+		 * are actually going to need, so we reserve the uncompressed</div><div class='add'>+		 * size because the data may be incompressible in the worst case.</div><div class='add'>+		 */</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			bool used;</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;block_group-&gt;lock);</div><div class='add'>+			used = btrfs_is_block_group_used(block_group);</div><div class='add'>+			spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+</div><div class='add'>+			if (!used)</div><div class='add'>+				btrfs_mark_bg_unused(block_group);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_trans_release_chunk_metadata(trans);</div><div class='ctx'> }</div><div class='hunk'>@@ -2692,7 +2859,7 @@ next:</div><div class='ctx'>  * For extent tree v2 we use the block_group_item-&gt;chunk_offset to point at our</div><div class='ctx'>  * global root id.  For v1 it's always set to BTRFS_FIRST_CHUNK_TREE_OBJECTID.</div><div class='ctx'>  */</div><div class='del'>-static u64 calculate_global_root_id(struct btrfs_fs_info *fs_info, u64 offset)</div><div class='add'>+static u64 calculate_global_root_id(const struct btrfs_fs_info *fs_info, u64 offset)</div><div class='ctx'> {</div><div class='ctx'> 	u64 div = SZ_1G;</div><div class='ctx'> 	u64 index;</div><div class='hunk'>@@ -2710,8 +2877,8 @@ static u64 calculate_global_root_id(struct btrfs_fs_info *fs_info, u64 offset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trans,</div><div class='del'>-						 u64 type,</div><div class='del'>-						 u64 chunk_offset, u64 size)</div><div class='add'>+						 struct btrfs_space_info *space_info,</div><div class='add'>+						 u64 type, u64 chunk_offset, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='hunk'>@@ -2731,7 +2898,7 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran</div><div class='ctx'> 	set_bit(BLOCK_GROUP_FLAG_NEW, &amp;cache-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	cache-&gt;length = size;</div><div class='del'>-	set_free_space_tree_thresholds(cache);</div><div class='add'>+	btrfs_set_free_space_tree_thresholds(cache);</div><div class='ctx'> 	cache-&gt;flags = type;</div><div class='ctx'> 	cache-&gt;cached = BTRFS_CACHE_FINISHED;</div><div class='ctx'> 	cache-&gt;global_root_id = calculate_global_root_id(fs_info, cache-&gt;start);</div><div class='hunk'>@@ -2765,10 +2932,10 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran</div><div class='ctx'> 	 * assigned to our block group. We want our bg to be added to the rbtree</div><div class='ctx'> 	 * with its -&gt;space_info set.</div><div class='ctx'> 	 */</div><div class='del'>-	cache-&gt;space_info = btrfs_find_space_info(fs_info, cache-&gt;flags);</div><div class='add'>+	cache-&gt;space_info = space_info;</div><div class='ctx'> 	ASSERT(cache-&gt;space_info);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_add_block_group_cache(fs_info, cache);</div><div class='add'>+	ret = btrfs_add_block_group_cache(cache);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_remove_free_space_cache(cache);</div><div class='ctx'> 		btrfs_put_block_group(cache);</div><div class='hunk'>@@ -2790,7 +2957,7 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;cache-&gt;bg_list, &amp;trans-&gt;new_bgs);</div><div class='add'>+	btrfs_link_bg_list(cache, &amp;trans-&gt;new_bgs);</div><div class='ctx'> 	btrfs_inc_delayed_refs_rsv_bg_inserts(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	set_avail_alloc_bits(fs_info, type);</div><div class='hunk'>@@ -2810,6 +2977,7 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,</div><div class='ctx'> 			     bool do_chunk_alloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = cache-&gt;fs_info;</div><div class='add'>+	struct btrfs_space_info *space_info = cache-&gt;space_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root = btrfs_block_group_root(fs_info);</div><div class='ctx'> 	u64 alloc_flags;</div><div class='hunk'>@@ -2862,7 +3030,7 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,</div><div class='ctx'> 		 */</div><div class='ctx'> 		alloc_flags = btrfs_get_alloc_profile(fs_info, cache-&gt;flags);</div><div class='ctx'> 		if (alloc_flags != cache-&gt;flags) {</div><div class='del'>-			ret = btrfs_chunk_alloc(trans, alloc_flags,</div><div class='add'>+			ret = btrfs_chunk_alloc(trans, space_info, alloc_flags,</div><div class='ctx'> 						CHUNK_ALLOC_FORCE);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * ENOSPC is allowed here, we may have enough space</div><div class='hunk'>@@ -2890,15 +3058,15 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,</div><div class='ctx'> 	    (cache-&gt;flags &amp; BTRFS_BLOCK_GROUP_SYSTEM))</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> </div><div class='del'>-	alloc_flags = btrfs_get_alloc_profile(fs_info, cache-&gt;space_info-&gt;flags);</div><div class='del'>-	ret = btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE);</div><div class='add'>+	alloc_flags = btrfs_get_alloc_profile(fs_info, space_info-&gt;flags);</div><div class='add'>+	ret = btrfs_chunk_alloc(trans, space_info, alloc_flags, CHUNK_ALLOC_FORCE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have allocated a new chunk. We also need to activate that chunk to</div><div class='ctx'> 	 * grant metadata tickets for zoned filesystem.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_zoned_activate_one_bg(fs_info, cache-&gt;space_info, true);</div><div class='add'>+	ret = btrfs_zoned_activate_one_bg(space_info, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2932,9 +3100,10 @@ void btrfs_dec_block_group_ro(struct btrfs_block_group *cache)</div><div class='ctx'> 		if (btrfs_is_zoned(cache-&gt;fs_info)) {</div><div class='ctx'> 			/* Migrate zone_unusable bytes back */</div><div class='ctx'> 			cache-&gt;zone_unusable =</div><div class='del'>-				(cache-&gt;alloc_offset - cache-&gt;used) +</div><div class='add'>+				(cache-&gt;alloc_offset - cache-&gt;used - cache-&gt;pinned -</div><div class='add'>+				 cache-&gt;reserved) +</div><div class='ctx'> 				(cache-&gt;length - cache-&gt;zone_capacity);</div><div class='del'>-			sinfo-&gt;bytes_zone_unusable += cache-&gt;zone_unusable;</div><div class='add'>+			btrfs_space_info_update_bytes_zone_unusable(sinfo, cache-&gt;zone_unusable);</div><div class='ctx'> 			sinfo-&gt;bytes_readonly -= cache-&gt;zone_unusable;</div><div class='ctx'> 		}</div><div class='ctx'> 		num_bytes = cache-&gt;length - cache-&gt;reserved -</div><div class='hunk'>@@ -2996,7 +3165,6 @@ static int update_block_group_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 						   cache-&gt;global_root_id);</div><div class='ctx'> 	btrfs_set_stack_block_group_flags(&amp;bgi, cache-&gt;flags);</div><div class='ctx'> 	write_extent_buffer(leaf, &amp;bgi, bi, sizeof(bgi));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> fail:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3074,7 +3242,7 @@ again:</div><div class='ctx'> 	 */</div><div class='ctx'> 	BTRFS_I(inode)-&gt;generation = 0;</div><div class='ctx'> 	ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * So theoretically we could recover from this, simply set the</div><div class='ctx'> 		 * super cache generation to 0 so we know to invalidate the</div><div class='hunk'>@@ -3186,7 +3354,7 @@ int btrfs_setup_space_cache(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_group *cache, *tmp;</div><div class='ctx'> 	struct btrfs_transaction *cur_trans = trans-&gt;transaction;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;cur_trans-&gt;dirty_bgs) ||</div><div class='ctx'> 	    !btrfs_test_opt(fs_info, SPACE_CACHE))</div><div class='hunk'>@@ -3203,7 +3371,6 @@ int btrfs_setup_space_cache(struct btrfs_trans_handle *trans)</div><div class='ctx'> 			cache_save_setup(cache, trans, path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3226,7 +3393,7 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_transaction *cur_trans = trans-&gt;transaction;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int should_put;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	LIST_HEAD(dirty);</div><div class='ctx'> 	struct list_head *io = &amp;cur_trans-&gt;io_bgs;</div><div class='ctx'> 	int loops = 0;</div><div class='hunk'>@@ -3381,7 +3548,6 @@ out:</div><div class='ctx'> 		btrfs_cleanup_dirty_bgs(cur_trans, fs_info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3392,7 +3558,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_transaction *cur_trans = trans-&gt;transaction;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int should_put;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct list_head *io = &amp;cur_trans-&gt;io_bgs;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -3479,9 +3645,11 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 				wait_event(cur_trans-&gt;writer_wait,</div><div class='ctx'> 				   atomic_read(&amp;cur_trans-&gt;num_writers) == 1);</div><div class='ctx'> 				ret = update_block_group_item(trans, path, cache);</div><div class='del'>-			}</div><div class='del'>-			if (ret)</div><div class='add'>+				if (ret)</div><div class='add'>+					btrfs_abort_transaction(trans, ret);</div><div class='add'>+			} else if (ret) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* If its not on the io list, we need to put the block group */</div><div class='hunk'>@@ -3504,7 +3672,6 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		btrfs_put_block_group(cache);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3560,26 +3727,31 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		old_val += num_bytes;</div><div class='ctx'> 		cache-&gt;used = old_val;</div><div class='ctx'> 		cache-&gt;reserved -= num_bytes;</div><div class='add'>+		cache-&gt;reclaim_mark = 0;</div><div class='ctx'> 		space_info-&gt;bytes_reserved -= num_bytes;</div><div class='ctx'> 		space_info-&gt;bytes_used += num_bytes;</div><div class='ctx'> 		space_info-&gt;disk_used += num_bytes * factor;</div><div class='add'>+		if (READ_ONCE(space_info-&gt;periodic_reclaim))</div><div class='add'>+			btrfs_space_info_update_reclaimable(space_info, -num_bytes);</div><div class='ctx'> 		spin_unlock(&amp;cache-&gt;lock);</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		old_val -= num_bytes;</div><div class='ctx'> 		cache-&gt;used = old_val;</div><div class='ctx'> 		cache-&gt;pinned += num_bytes;</div><div class='del'>-		btrfs_space_info_update_bytes_pinned(info, space_info, num_bytes);</div><div class='add'>+		btrfs_space_info_update_bytes_pinned(space_info, num_bytes);</div><div class='ctx'> 		space_info-&gt;bytes_used -= num_bytes;</div><div class='ctx'> 		space_info-&gt;disk_used -= num_bytes * factor;</div><div class='del'>-</div><div class='del'>-		reclaim = should_reclaim_block_group(cache, num_bytes);</div><div class='add'>+		if (READ_ONCE(space_info-&gt;periodic_reclaim))</div><div class='add'>+			btrfs_space_info_update_reclaimable(space_info, num_bytes);</div><div class='add'>+		else</div><div class='add'>+			reclaim = should_reclaim_block_group(cache, num_bytes);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;cache-&gt;lock);</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		set_extent_bit(&amp;trans-&gt;transaction-&gt;pinned_extents, bytenr,</div><div class='del'>-			       bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);</div><div class='add'>+		btrfs_set_extent_bit(&amp;trans-&gt;transaction-&gt;pinned_extents, bytenr,</div><div class='add'>+				     bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;trans-&gt;transaction-&gt;dirty_bgs_lock);</div><div class='hunk'>@@ -3625,7 +3797,7 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * reservation and return -EAGAIN, otherwise this function always succeeds.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,</div><div class='del'>-			     u64 ram_bytes, u64 num_bytes, int delalloc,</div><div class='add'>+			     u64 ram_bytes, u64 num_bytes, bool delalloc,</div><div class='ctx'> 			     bool force_wrong_size_class)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_space_info *space_info = cache-&gt;space_info;</div><div class='hunk'>@@ -3636,31 +3808,38 @@ int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,</div><div class='ctx'> 	spin_lock(&amp;cache-&gt;lock);</div><div class='ctx'> 	if (cache-&gt;ro) {</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_block_group_should_use_size_class(cache)) {</div><div class='ctx'> 		size_class = btrfs_calc_block_group_size_class(num_bytes);</div><div class='ctx'> 		ret = btrfs_use_block_group_size_class(cache, size_class, force_wrong_size_class);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_error;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	cache-&gt;reserved += num_bytes;</div><div class='del'>-	space_info-&gt;bytes_reserved += num_bytes;</div><div class='del'>-	trace_btrfs_space_reservation(cache-&gt;fs_info, "space_info",</div><div class='del'>-				      space_info-&gt;flags, num_bytes, 1);</div><div class='del'>-	btrfs_space_info_update_bytes_may_use(cache-&gt;fs_info,</div><div class='del'>-					      space_info, -ram_bytes);</div><div class='ctx'> 	if (delalloc)</div><div class='ctx'> 		cache-&gt;delalloc_bytes += num_bytes;</div><div class='ctx'> </div><div class='add'>+	trace_btrfs_space_reservation(cache-&gt;fs_info, "space_info",</div><div class='add'>+				      space_info-&gt;flags, num_bytes, 1);</div><div class='add'>+	spin_unlock(&amp;cache-&gt;lock);</div><div class='add'>+</div><div class='add'>+	space_info-&gt;bytes_reserved += num_bytes;</div><div class='add'>+	btrfs_space_info_update_bytes_may_use(space_info, -ram_bytes);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Compression can use less space than we reserved, so wake tickets if</div><div class='ctx'> 	 * that happens.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (num_bytes &lt; ram_bytes)</div><div class='del'>-		btrfs_try_granting_tickets(cache-&gt;fs_info, space_info);</div><div class='del'>-out:</div><div class='add'>+		btrfs_try_granting_tickets(space_info);</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='ctx'> 	spin_unlock(&amp;cache-&gt;lock);</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3669,33 +3848,38 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * Update the block_group and space info counters.</div><div class='ctx'>  *</div><div class='del'>- * @cache:      The cache we are manipulating</div><div class='del'>- * @num_bytes:  The number of bytes in question</div><div class='del'>- * @delalloc:   The blocks are allocated for the delalloc write</div><div class='add'>+ * @cache:       The cache we are manipulating.</div><div class='add'>+ * @num_bytes:   The number of bytes in question.</div><div class='add'>+ * @is_delalloc: Whether the blocks are allocated for a delalloc write.</div><div class='ctx'>  *</div><div class='ctx'>  * This is called by somebody who is freeing space that was never actually used</div><div class='ctx'>  * on disk.  For example if you reserve some space for a new leaf in transaction</div><div class='ctx'>  * A and before transaction A commits you free that leaf, you call this with</div><div class='ctx'>  * reserve set to 0 in order to clear the reservation.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_free_reserved_bytes(struct btrfs_block_group *cache,</div><div class='del'>-			       u64 num_bytes, int delalloc)</div><div class='add'>+void btrfs_free_reserved_bytes(struct btrfs_block_group *cache, u64 num_bytes,</div><div class='add'>+			       bool is_delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_space_info *space_info = cache-&gt;space_info;</div><div class='add'>+	bool bg_ro;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	spin_lock(&amp;cache-&gt;lock);</div><div class='del'>-	if (cache-&gt;ro)</div><div class='del'>-		space_info-&gt;bytes_readonly += num_bytes;</div><div class='add'>+	bg_ro = cache-&gt;ro;</div><div class='ctx'> 	cache-&gt;reserved -= num_bytes;</div><div class='del'>-	space_info-&gt;bytes_reserved -= num_bytes;</div><div class='del'>-	space_info-&gt;max_extent_size = 0;</div><div class='del'>-</div><div class='del'>-	if (delalloc)</div><div class='add'>+	if (is_delalloc)</div><div class='ctx'> 		cache-&gt;delalloc_bytes -= num_bytes;</div><div class='ctx'> 	spin_unlock(&amp;cache-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	btrfs_try_granting_tickets(cache-&gt;fs_info, space_info);</div><div class='add'>+	if (bg_ro)</div><div class='add'>+		space_info-&gt;bytes_readonly += num_bytes;</div><div class='add'>+	else if (btrfs_is_zoned(cache-&gt;fs_info))</div><div class='add'>+		space_info-&gt;bytes_zone_unusable += num_bytes;</div><div class='add'>+</div><div class='add'>+	space_info-&gt;bytes_reserved -= num_bytes;</div><div class='add'>+	space_info-&gt;max_extent_size = 0;</div><div class='add'>+</div><div class='add'>+	btrfs_try_granting_tickets(space_info);</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3710,14 +3894,14 @@ static void force_metadata_allocation(struct btrfs_fs_info *info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int should_alloc_chunk(struct btrfs_fs_info *fs_info,</div><div class='del'>-			      struct btrfs_space_info *sinfo, int force)</div><div class='add'>+static bool should_alloc_chunk(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			       const struct btrfs_space_info *sinfo, int force)</div><div class='ctx'> {</div><div class='ctx'> 	u64 bytes_used = btrfs_space_info_used(sinfo, false);</div><div class='ctx'> 	u64 thresh;</div><div class='ctx'> </div><div class='ctx'> 	if (force == CHUNK_ALLOC_FORCE)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * in limited mode, we want to have some free space up to</div><div class='hunk'>@@ -3728,22 +3912,31 @@ static int should_alloc_chunk(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		thresh = max_t(u64, SZ_64M, mult_perc(thresh, 1));</div><div class='ctx'> </div><div class='ctx'> 		if (sinfo-&gt;total_bytes - bytes_used &lt; thresh)</div><div class='del'>-			return 1;</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bytes_used + SZ_2M &lt; mult_perc(sinfo-&gt;total_bytes, 80))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans, u64 type)</div><div class='ctx'> {</div><div class='ctx'> 	u64 alloc_flags = btrfs_get_alloc_profile(trans-&gt;fs_info, type);</div><div class='add'>+	struct btrfs_space_info *space_info;</div><div class='add'>+</div><div class='add'>+	space_info = btrfs_find_space_info(trans-&gt;fs_info, type);</div><div class='add'>+	if (!space_info) {</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE);</div><div class='add'>+	return btrfs_chunk_alloc(trans, space_info, alloc_flags, CHUNK_ALLOC_FORCE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct btrfs_block_group *do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags)</div><div class='add'>+static struct btrfs_block_group *do_chunk_alloc(struct btrfs_trans_handle *trans,</div><div class='add'>+						struct btrfs_space_info *space_info,</div><div class='add'>+						u64 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *bg;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3756,7 +3949,7 @@ static struct btrfs_block_group *do_chunk_alloc(struct btrfs_trans_handle *trans</div><div class='ctx'> 	 */</div><div class='ctx'> 	check_system_chunk(trans, flags);</div><div class='ctx'> </div><div class='del'>-	bg = btrfs_create_chunk(trans, flags);</div><div class='add'>+	bg = btrfs_create_chunk(trans, space_info, flags);</div><div class='ctx'> 	if (IS_ERR(bg)) {</div><div class='ctx'> 		ret = PTR_ERR(bg);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3804,8 +3997,16 @@ static struct btrfs_block_group *do_chunk_alloc(struct btrfs_trans_handle *trans</div><div class='ctx'> 	if (ret == -ENOSPC) {</div><div class='ctx'> 		const u64 sys_flags = btrfs_system_alloc_profile(trans-&gt;fs_info);</div><div class='ctx'> 		struct btrfs_block_group *sys_bg;</div><div class='add'>+		struct btrfs_space_info *sys_space_info;</div><div class='ctx'> </div><div class='del'>-		sys_bg = btrfs_create_chunk(trans, sys_flags);</div><div class='add'>+		sys_space_info = btrfs_find_space_info(trans-&gt;fs_info, sys_flags);</div><div class='add'>+		if (unlikely(!sys_space_info)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sys_bg = btrfs_create_chunk(trans, sys_space_info, sys_flags);</div><div class='ctx'> 		if (IS_ERR(sys_bg)) {</div><div class='ctx'> 			ret = PTR_ERR(sys_bg);</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -3813,17 +4014,17 @@ static struct btrfs_block_group *do_chunk_alloc(struct btrfs_trans_handle *trans</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_chunk_alloc_add_chunk_item(trans, sys_bg);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_chunk_alloc_add_chunk_item(trans, bg);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ret) {</div><div class='add'>+	} else if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3936,6 +4137,8 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * This function, btrfs_chunk_alloc(), belongs to phase 1.</div><div class='ctx'>  *</div><div class='add'>+ * @space_info: specify which space_info the new chunk should belong to.</div><div class='add'>+ *</div><div class='ctx'>  * If @force is CHUNK_ALLOC_FORCE:</div><div class='ctx'>  *    - return 1 if it successfully allocates a chunk,</div><div class='ctx'>  *    - return errors including -ENOSPC otherwise.</div><div class='hunk'>@@ -3944,11 +4147,11 @@ out:</div><div class='ctx'>  *    - return 1 if it successfully allocates a chunk,</div><div class='ctx'>  *    - return errors including -ENOSPC otherwise.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='add'>+int btrfs_chunk_alloc(struct btrfs_trans_handle *trans,</div><div class='add'>+		      struct btrfs_space_info *space_info, u64 flags,</div><div class='ctx'> 		      enum btrfs_chunk_alloc_enum force)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_space_info *space_info;</div><div class='ctx'> 	struct btrfs_block_group *ret_bg;</div><div class='ctx'> 	bool wait_for_alloc = false;</div><div class='ctx'> 	bool should_alloc = false;</div><div class='hunk'>@@ -3987,9 +4190,6 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='ctx'> 	if (flags &amp; BTRFS_BLOCK_GROUP_SYSTEM)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	space_info = btrfs_find_space_info(fs_info, flags);</div><div class='del'>-	ASSERT(space_info);</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		if (force &lt; space_info-&gt;force_alloc)</div><div class='hunk'>@@ -3997,11 +4197,11 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='ctx'> 		should_alloc = should_alloc_chunk(fs_info, space_info, force);</div><div class='ctx'> 		if (space_info-&gt;full) {</div><div class='ctx'> 			/* No more free physical space */</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			if (should_alloc)</div><div class='ctx'> 				ret = -ENOSPC;</div><div class='ctx'> 			else</div><div class='ctx'> 				ret = 0;</div><div class='del'>-			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		} else if (!should_alloc) {</div><div class='ctx'> 			spin_unlock(&amp;space_info-&gt;lock);</div><div class='hunk'>@@ -4013,16 +4213,16 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='ctx'> 			 * recheck if we should continue with our allocation</div><div class='ctx'> 			 * attempt.</div><div class='ctx'> 			 */</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			wait_for_alloc = true;</div><div class='ctx'> 			force = CHUNK_ALLOC_NO_FORCE;</div><div class='del'>-			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			mutex_lock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 			mutex_unlock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Proceed with allocation */</div><div class='del'>-			space_info-&gt;chunk_alloc = 1;</div><div class='del'>-			wait_for_alloc = false;</div><div class='add'>+			space_info-&gt;chunk_alloc = true;</div><div class='ctx'> 			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+			wait_for_alloc = false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -4050,7 +4250,7 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='ctx'> 			force_metadata_allocation(fs_info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret_bg = do_chunk_alloc(trans, flags);</div><div class='add'>+	ret_bg = do_chunk_alloc(trans, space_info, flags);</div><div class='ctx'> 	trans-&gt;allocating_chunk = false;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(ret_bg)) {</div><div class='hunk'>@@ -4069,7 +4269,7 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (ret == -ENOSPC)</div><div class='del'>-			space_info-&gt;full = 1;</div><div class='add'>+			space_info-&gt;full = true;</div><div class='ctx'> 		else</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4079,14 +4279,14 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='ctx'> </div><div class='ctx'> 	space_info-&gt;force_alloc = CHUNK_ALLOC_NO_FORCE;</div><div class='ctx'> out:</div><div class='del'>-	space_info-&gt;chunk_alloc = 0;</div><div class='add'>+	space_info-&gt;chunk_alloc = false;</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 get_profile_num_devs(struct btrfs_fs_info *fs_info, u64 type)</div><div class='add'>+static u64 get_profile_num_devs(const struct btrfs_fs_info *fs_info, u64 type)</div><div class='ctx'> {</div><div class='ctx'> 	u64 num_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -4120,12 +4320,16 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (left &lt; bytes &amp;&amp; btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {</div><div class='ctx'> 		btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",</div><div class='ctx'> 			   left, bytes, type);</div><div class='del'>-		btrfs_dump_space_info(fs_info, info, 0, 0);</div><div class='add'>+		btrfs_dump_space_info(info, 0, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (left &lt; bytes) {</div><div class='ctx'> 		u64 flags = btrfs_system_alloc_profile(fs_info);</div><div class='ctx'> 		struct btrfs_block_group *bg;</div><div class='add'>+		struct btrfs_space_info *space_info;</div><div class='add'>+</div><div class='add'>+		space_info = btrfs_find_space_info(fs_info, flags);</div><div class='add'>+		ASSERT(space_info);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ignore failure to create system chunk. We might end up not</div><div class='hunk'>@@ -4133,7 +4337,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * the paths we visit in the chunk tree (they were already COWed</div><div class='ctx'> 		 * or created in the current transaction for example).</div><div class='ctx'> 		 */</div><div class='del'>-		bg = btrfs_create_chunk(trans, flags);</div><div class='add'>+		bg = btrfs_create_chunk(trans, space_info, flags);</div><div class='ctx'> 		if (IS_ERR(bg)) {</div><div class='ctx'> 			ret = PTR_ERR(bg);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -4141,7 +4345,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 * We have a new chunk. We also need to activate it for</div><div class='ctx'> 			 * zoned filesystem.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = btrfs_zoned_activate_one_bg(fs_info, info, true);</div><div class='add'>+			ret = btrfs_zoned_activate_one_bg(info, true);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return;</div><div class='ctx'> </div><div class='hunk'>@@ -4227,13 +4431,13 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info)</div><div class='ctx'> 		spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> 		if (test_and_clear_bit(BLOCK_GROUP_FLAG_IREF,</div><div class='ctx'> 				       &amp;block_group-&gt;runtime_flags)) {</div><div class='del'>-			struct inode *inode = block_group-&gt;inode;</div><div class='add'>+			struct btrfs_inode *inode = block_group-&gt;inode;</div><div class='ctx'> </div><div class='ctx'> 			block_group-&gt;inode = NULL;</div><div class='ctx'> 			spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 			ASSERT(block_group-&gt;io_ctl.inode == NULL);</div><div class='del'>-			iput(inode);</div><div class='add'>+			iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4241,6 +4445,43 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void check_removing_space_info(struct btrfs_space_info *space_info)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *info = space_info-&gt;fs_info;</div><div class='add'>+</div><div class='add'>+	if (space_info-&gt;subgroup_id == BTRFS_SUB_GROUP_PRIMARY) {</div><div class='add'>+		/* This is a top space_info, proceed with its children first. */</div><div class='add'>+		for (int i = 0; i &lt; BTRFS_SPACE_INFO_SUB_GROUP_MAX; i++) {</div><div class='add'>+			if (space_info-&gt;sub_group[i]) {</div><div class='add'>+				check_removing_space_info(space_info-&gt;sub_group[i]);</div><div class='add'>+				kfree(space_info-&gt;sub_group[i]);</div><div class='add'>+				space_info-&gt;sub_group[i] = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not hide this behind enospc_debug, this is actually important and</div><div class='add'>+	 * indicates a real bug if this happens.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(space_info-&gt;bytes_pinned &gt; 0 || space_info-&gt;bytes_may_use &gt; 0))</div><div class='add'>+		btrfs_dump_space_info(space_info, 0, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there was a failure to cleanup a log tree, very likely due to an</div><div class='add'>+	 * IO failure on a writeback attempt of one or more of its extent</div><div class='add'>+	 * buffers, we could not do proper (and cheap) unaccounting of their</div><div class='add'>+	 * reserved space, so don't warn on bytes_reserved &gt; 0 in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!(space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_METADATA) ||</div><div class='add'>+	    !BTRFS_FS_LOG_CLEANUP_ERROR(info)) {</div><div class='add'>+		if (WARN_ON(space_info-&gt;bytes_reserved &gt; 0))</div><div class='add'>+			btrfs_dump_space_info(space_info, 0, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(space_info-&gt;reclaim_size &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Must be called only after stopping all workers, since we could have block</div><div class='ctx'>  * group caching kthreads running, and therefore they could race with us if we</div><div class='hunk'>@@ -4266,8 +4507,8 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;info-&gt;block_group_cache_lock);</div><div class='ctx'> 	while (!list_empty(&amp;info-&gt;caching_block_groups)) {</div><div class='del'>-		caching_ctl = list_entry(info-&gt;caching_block_groups.next,</div><div class='del'>-					 struct btrfs_caching_control, list);</div><div class='add'>+		caching_ctl = list_first_entry(&amp;info-&gt;caching_block_groups,</div><div class='add'>+					       struct btrfs_caching_control, list);</div><div class='ctx'> 		list_del(&amp;caching_ctl-&gt;list);</div><div class='ctx'> 		btrfs_put_caching_control(caching_ctl);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4338,32 +4579,10 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)</div><div class='ctx'> 	btrfs_release_global_block_rsv(info);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;info-&gt;space_info)) {</div><div class='del'>-		space_info = list_entry(info-&gt;space_info.next,</div><div class='del'>-					struct btrfs_space_info,</div><div class='del'>-					list);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Do not hide this behind enospc_debug, this is actually</div><div class='del'>-		 * important and indicates a real bug if this happens.</div><div class='del'>-		 */</div><div class='del'>-		if (WARN_ON(space_info-&gt;bytes_pinned &gt; 0 ||</div><div class='del'>-			    space_info-&gt;bytes_may_use &gt; 0))</div><div class='del'>-			btrfs_dump_space_info(info, space_info, 0, 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If there was a failure to cleanup a log tree, very likely due</div><div class='del'>-		 * to an IO failure on a writeback attempt of one or more of its</div><div class='del'>-		 * extent buffers, we could not do proper (and cheap) unaccounting</div><div class='del'>-		 * of their reserved space, so don't warn on bytes_reserved &gt; 0 in</div><div class='del'>-		 * that case.</div><div class='del'>-		 */</div><div class='del'>-		if (!(space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_METADATA) ||</div><div class='del'>-		    !BTRFS_FS_LOG_CLEANUP_ERROR(info)) {</div><div class='del'>-			if (WARN_ON(space_info-&gt;bytes_reserved &gt; 0))</div><div class='del'>-				btrfs_dump_space_info(info, space_info, 0, 0);</div><div class='del'>-		}</div><div class='add'>+		space_info = list_first_entry(&amp;info-&gt;space_info,</div><div class='add'>+					      struct btrfs_space_info, list);</div><div class='ctx'> </div><div class='del'>-		WARN_ON(space_info-&gt;reclaim_size &gt; 0);</div><div class='add'>+		check_removing_space_info(space_info);</div><div class='ctx'> 		list_del(&amp;space_info-&gt;list);</div><div class='ctx'> 		btrfs_sysfs_remove_space_info(space_info);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4490,7 +4709,7 @@ int btrfs_use_block_group_size_class(struct btrfs_block_group *bg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_block_group_should_use_size_class(struct btrfs_block_group *bg)</div><div class='add'>+bool btrfs_block_group_should_use_size_class(const struct btrfs_block_group *bg)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_is_zoned(bg-&gt;fs_info))</div><div class='ctx'> 		return false;</div><div class='head'>diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h<br/>index c4a1f01cc1c2..5f933455118c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-group.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-group.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-group.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/block-group.h</a></div><div class='hunk'>@@ -3,9 +3,22 @@</div><div class='ctx'> #ifndef BTRFS_BLOCK_GROUP_H</div><div class='ctx'> #define BTRFS_BLOCK_GROUP_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> #include "free-space-cache.h"</div><div class='ctx'> </div><div class='ctx'> struct btrfs_chunk_map;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='ctx'> enum btrfs_disk_cache_state {</div><div class='ctx'> 	BTRFS_DC_WRITTEN,</div><div class='hunk'>@@ -50,7 +63,7 @@ enum btrfs_discard_state {</div><div class='ctx'>  * CHUNK_ALLOC_FORCE means it must try to allocate one</div><div class='ctx'>  *</div><div class='ctx'>  * CHUNK_ALLOC_FORCE_FOR_EXTENT like CHUNK_ALLOC_FORCE but called from</div><div class='del'>- * find_free_extent() that also activaes the zone</div><div class='add'>+ * find_free_extent() that also activates the zone</div><div class='ctx'>  */</div><div class='ctx'> enum btrfs_chunk_alloc_enum {</div><div class='ctx'> 	CHUNK_ALLOC_NO_FORCE,</div><div class='hunk'>@@ -70,6 +83,8 @@ enum btrfs_block_group_flags {</div><div class='ctx'> 	BLOCK_GROUP_FLAG_ZONED_DATA_RELOC,</div><div class='ctx'> 	/* Does the block group need to be added to the free space tree? */</div><div class='ctx'> 	BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE,</div><div class='add'>+	/* Set after we add a new block group to the free space tree. */</div><div class='add'>+	BLOCK_GROUP_FLAG_FREE_SPACE_ADDED,</div><div class='ctx'> 	/* Indicate that the block group is placed on a sequential zone */</div><div class='ctx'> 	BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -102,7 +117,7 @@ struct btrfs_caching_control {</div><div class='ctx'> </div><div class='ctx'> struct btrfs_block_group {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	u64 start;</div><div class='ctx'> 	u64 length;</div><div class='hunk'>@@ -231,6 +246,11 @@ struct btrfs_block_group {</div><div class='ctx'> 	/* Lock for free space tree operations. */</div><div class='ctx'> 	struct mutex free_space_lock;</div><div class='ctx'> </div><div class='add'>+	/* Protected by @free_space_lock. */</div><div class='add'>+	bool using_free_space_bitmaps;</div><div class='add'>+	/* Protected by @free_space_lock. */</div><div class='add'>+	bool using_free_space_bitmaps_cached;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Number of extents in this block group used for swap files.</div><div class='ctx'> 	 * All accesses protected by the spinlock 'lock'.</div><div class='hunk'>@@ -250,15 +270,22 @@ struct btrfs_block_group {</div><div class='ctx'> 	struct work_struct zone_finish_work;</div><div class='ctx'> 	struct extent_buffer *last_eb;</div><div class='ctx'> 	enum btrfs_block_group_size_class size_class;</div><div class='add'>+	u64 reclaim_mark;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline u64 btrfs_block_group_end(struct btrfs_block_group *block_group)</div><div class='add'>+static inline u64 btrfs_block_group_end(const struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	return (block_group-&gt;start + block_group-&gt;length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool btrfs_is_block_group_data_only(</div><div class='del'>-					struct btrfs_block_group *block_group)</div><div class='add'>+static inline bool btrfs_is_block_group_used(const struct btrfs_block_group *bg)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;bg-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return (bg-&gt;used &gt; 0 || bg-&gt;reserved &gt; 0 || bg-&gt;pinned &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool btrfs_is_block_group_data_only(const struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In mixed mode the fragmentation is expected to be high, lowering the</div><div class='hunk'>@@ -269,7 +296,7 @@ static inline bool btrfs_is_block_group_data_only(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='del'>-int btrfs_should_fragment_free_space(struct btrfs_block_group *block_group);</div><div class='add'>+int btrfs_should_fragment_free_space(const struct btrfs_block_group *block_group);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct btrfs_block_group *btrfs_lookup_first_block_group(</div><div class='hunk'>@@ -290,7 +317,6 @@ void btrfs_wait_nocow_writers(struct btrfs_block_group *bg);</div><div class='ctx'> void btrfs_wait_block_group_cache_progress(struct btrfs_block_group *cache,</div><div class='ctx'> 				           u64 num_bytes);</div><div class='ctx'> int btrfs_cache_block_group(struct btrfs_block_group *cache, bool wait);</div><div class='del'>-void btrfs_put_caching_control(struct btrfs_caching_control *ctl);</div><div class='ctx'> struct btrfs_caching_control *btrfs_get_caching_control(</div><div class='ctx'> 		struct btrfs_block_group *cache);</div><div class='ctx'> int btrfs_add_new_free_space(struct btrfs_block_group *block_group,</div><div class='hunk'>@@ -307,8 +333,8 @@ void btrfs_reclaim_bgs(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_mark_bg_to_reclaim(struct btrfs_block_group *bg);</div><div class='ctx'> int btrfs_read_block_groups(struct btrfs_fs_info *info);</div><div class='ctx'> struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trans,</div><div class='del'>-						 u64 type,</div><div class='del'>-						 u64 chunk_offset, u64 size);</div><div class='add'>+						 struct btrfs_space_info *space_info,</div><div class='add'>+						 u64 type, u64 chunk_offset, u64 size);</div><div class='ctx'> void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans);</div><div class='ctx'> int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,</div><div class='ctx'> 			     bool do_chunk_alloc);</div><div class='hunk'>@@ -319,11 +345,12 @@ int btrfs_setup_space_cache(struct btrfs_trans_handle *trans);</div><div class='ctx'> int btrfs_update_block_group(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     u64 bytenr, u64 num_bytes, bool alloc);</div><div class='ctx'> int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,</div><div class='del'>-			     u64 ram_bytes, u64 num_bytes, int delalloc,</div><div class='add'>+			     u64 ram_bytes, u64 num_bytes, bool delalloc,</div><div class='ctx'> 			     bool force_wrong_size_class);</div><div class='del'>-void btrfs_free_reserved_bytes(struct btrfs_block_group *cache,</div><div class='del'>-			       u64 num_bytes, int delalloc);</div><div class='del'>-int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,</div><div class='add'>+void btrfs_free_reserved_bytes(struct btrfs_block_group *cache, u64 num_bytes,</div><div class='add'>+			       bool is_delalloc);</div><div class='add'>+int btrfs_chunk_alloc(struct btrfs_trans_handle *trans,</div><div class='add'>+		      struct btrfs_space_info *space_info, u64 flags,</div><div class='ctx'> 		      enum btrfs_chunk_alloc_enum force);</div><div class='ctx'> int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans, u64 type);</div><div class='ctx'> void check_system_chunk(struct btrfs_trans_handle *trans, const u64 type);</div><div class='hunk'>@@ -350,7 +377,7 @@ static inline u64 btrfs_system_alloc_profile(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return btrfs_get_alloc_profile(fs_info, BTRFS_BLOCK_GROUP_SYSTEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int btrfs_block_group_done(struct btrfs_block_group *cache)</div><div class='add'>+static inline int btrfs_block_group_done(const struct btrfs_block_group *cache)</div><div class='ctx'> {</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	return cache-&gt;cached == BTRFS_CACHE_FINISHED ||</div><div class='hunk'>@@ -367,6 +394,6 @@ enum btrfs_block_group_size_class btrfs_calc_block_group_size_class(u64 size);</div><div class='ctx'> int btrfs_use_block_group_size_class(struct btrfs_block_group *bg,</div><div class='ctx'> 				     enum btrfs_block_group_size_class size_class,</div><div class='ctx'> 				     bool force_wrong_size_class);</div><div class='del'>-bool btrfs_block_group_should_use_size_class(struct btrfs_block_group *bg);</div><div class='add'>+bool btrfs_block_group_should_use_size_class(const struct btrfs_block_group *bg);</div><div class='ctx'> </div><div class='ctx'> #endif /* BTRFS_BLOCK_GROUP_H */</div><div class='head'>diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c<br/>index ceb5f586a2d5..96cf7a162987 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-rsv.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-rsv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-rsv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/block-rsv.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include "space-info.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "block-group.h"</div><div class='del'>-#include "disk-io.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> </div><div class='hunk'>@@ -151,9 +150,7 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			spin_unlock(&amp;dest-&gt;lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (num_bytes)</div><div class='del'>-			btrfs_space_info_free_bytes_may_use(fs_info,</div><div class='del'>-							    space_info,</div><div class='del'>-							    num_bytes);</div><div class='add'>+			btrfs_space_info_free_bytes_may_use(space_info, num_bytes);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (qgroup_to_release_ret)</div><div class='ctx'> 		*qgroup_to_release_ret = qgroup_to_release;</div><div class='hunk'>@@ -221,8 +218,7 @@ int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (num_bytes == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv-&gt;space_info,</div><div class='del'>-					   num_bytes, flush);</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(block_rsv-&gt;space_info, num_bytes, flush);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		btrfs_block_rsv_add_bytes(block_rsv, num_bytes, true);</div><div class='ctx'> </div><div class='hunk'>@@ -262,8 +258,7 @@ int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv-&gt;space_info,</div><div class='del'>-					   num_bytes, flush);</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(block_rsv-&gt;space_info, num_bytes, flush);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		btrfs_block_rsv_add_bytes(block_rsv, num_bytes, false);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -342,9 +337,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	read_lock(&amp;fs_info-&gt;global_root_lock);</div><div class='ctx'> 	rbtree_postorder_for_each_entry_safe(root, tmp, &amp;fs_info-&gt;global_root_tree,</div><div class='ctx'> 					     rb_node) {</div><div class='del'>-		if (root-&gt;root_key.objectid == BTRFS_EXTENT_TREE_OBJECTID ||</div><div class='del'>-		    root-&gt;root_key.objectid == BTRFS_CSUM_TREE_OBJECTID ||</div><div class='del'>-		    root-&gt;root_key.objectid == BTRFS_FREE_SPACE_TREE_OBJECTID) {</div><div class='add'>+		if (btrfs_root_id(root) == BTRFS_EXTENT_TREE_OBJECTID ||</div><div class='add'>+		    btrfs_root_id(root) == BTRFS_CSUM_TREE_OBJECTID ||</div><div class='add'>+		    btrfs_root_id(root) == BTRFS_FREE_SPACE_TREE_OBJECTID) {</div><div class='ctx'> 			num_bytes += btrfs_root_used(&amp;root-&gt;root_item);</div><div class='ctx'> 			min_items++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -384,15 +379,13 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	if (block_rsv-&gt;reserved &lt; block_rsv-&gt;size) {</div><div class='ctx'> 		num_bytes = block_rsv-&gt;size - block_rsv-&gt;reserved;</div><div class='del'>-		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,</div><div class='del'>-						      num_bytes);</div><div class='add'>+		btrfs_space_info_update_bytes_may_use(sinfo, num_bytes);</div><div class='ctx'> 		block_rsv-&gt;reserved = block_rsv-&gt;size;</div><div class='ctx'> 	} else if (block_rsv-&gt;reserved &gt; block_rsv-&gt;size) {</div><div class='ctx'> 		num_bytes = block_rsv-&gt;reserved - block_rsv-&gt;size;</div><div class='del'>-		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,</div><div class='del'>-						      -num_bytes);</div><div class='add'>+		btrfs_space_info_update_bytes_may_use(sinfo, -num_bytes);</div><div class='ctx'> 		block_rsv-&gt;reserved = block_rsv-&gt;size;</div><div class='del'>-		btrfs_try_granting_tickets(fs_info, sinfo);</div><div class='add'>+		btrfs_try_granting_tickets(sinfo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	block_rsv-&gt;full = (block_rsv-&gt;reserved == block_rsv-&gt;size);</div><div class='hunk'>@@ -407,7 +400,7 @@ void btrfs_init_root_block_rsv(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='del'>-	switch (root-&gt;root_key.objectid) {</div><div class='add'>+	switch (btrfs_root_id(root)) {</div><div class='ctx'> 	case BTRFS_CSUM_TREE_OBJECTID:</div><div class='ctx'> 	case BTRFS_EXTENT_TREE_OBJECTID:</div><div class='ctx'> 	case BTRFS_FREE_SPACE_TREE_OBJECTID:</div><div class='hunk'>@@ -423,6 +416,9 @@ void btrfs_init_root_block_rsv(struct btrfs_root *root)</div><div class='ctx'> 	case BTRFS_CHUNK_TREE_OBJECTID:</div><div class='ctx'> 		root-&gt;block_rsv = &amp;fs_info-&gt;chunk_block_rsv;</div><div class='ctx'> 		break;</div><div class='add'>+	case BTRFS_TREE_LOG_OBJECTID:</div><div class='add'>+		root-&gt;block_rsv = &amp;fs_info-&gt;treelog_rsv;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		root-&gt;block_rsv = NULL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -443,6 +439,14 @@ void btrfs_init_global_block_rsv(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	fs_info-&gt;delayed_block_rsv.space_info = space_info;</div><div class='ctx'> 	fs_info-&gt;delayed_refs_rsv.space_info = space_info;</div><div class='ctx'> </div><div class='add'>+	/* The treelog_rsv uses a dedicated space_info on the zoned mode. */</div><div class='add'>+	if (!btrfs_is_zoned(fs_info)) {</div><div class='add'>+		fs_info-&gt;treelog_rsv.space_info = space_info;</div><div class='add'>+	} else {</div><div class='add'>+		ASSERT(space_info-&gt;sub_group[0]-&gt;subgroup_id == BTRFS_SUB_GROUP_TREELOG);</div><div class='add'>+		fs_info-&gt;treelog_rsv.space_info = space_info-&gt;sub_group[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	btrfs_update_global_block_rsv(fs_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -469,8 +473,7 @@ static struct btrfs_block_rsv *get_block_rsv(</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) ||</div><div class='ctx'> 	    (root == fs_info-&gt;uuid_root) ||</div><div class='del'>-	    (trans-&gt;adding_csums &amp;&amp;</div><div class='del'>-	     root-&gt;root_key.objectid == BTRFS_CSUM_TREE_OBJECTID))</div><div class='add'>+	    (trans-&gt;adding_csums &amp;&amp; btrfs_root_id(root) == BTRFS_CSUM_TREE_OBJECTID))</div><div class='ctx'> 		block_rsv = trans-&gt;block_rsv;</div><div class='ctx'> </div><div class='ctx'> 	if (!block_rsv)</div><div class='hunk'>@@ -494,7 +497,7 @@ struct btrfs_block_rsv *btrfs_use_block_rsv(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	block_rsv = get_block_rsv(trans, root);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(block_rsv-&gt;size == 0))</div><div class='add'>+	if (unlikely(btrfs_block_rsv_size(block_rsv) == 0))</div><div class='ctx'> 		goto try_reserve;</div><div class='ctx'> again:</div><div class='ctx'> 	ret = btrfs_block_rsv_use_bytes(block_rsv, blocksize);</div><div class='hunk'>@@ -525,8 +528,8 @@ again:</div><div class='ctx'> 				block_rsv-&gt;type, ret);</div><div class='ctx'> 	}</div><div class='ctx'> try_reserve:</div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv-&gt;space_info,</div><div class='del'>-					   blocksize, BTRFS_RESERVE_NO_FLUSH);</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(block_rsv-&gt;space_info, blocksize,</div><div class='add'>+					   BTRFS_RESERVE_NO_FLUSH);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return block_rsv;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -547,7 +550,7 @@ try_reserve:</div><div class='ctx'> 	 * one last time to force a reservation if there's enough actual space</div><div class='ctx'> 	 * on disk to make the reservation.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv-&gt;space_info, blocksize,</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(block_rsv-&gt;space_info, blocksize,</div><div class='ctx'> 					   BTRFS_RESERVE_FLUSH_EMERGENCY);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return block_rsv;</div><div class='hunk'>@@ -555,7 +558,7 @@ try_reserve:</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_check_trunc_cache_free_space(struct btrfs_fs_info *fs_info,</div><div class='add'>+int btrfs_check_trunc_cache_free_space(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				       struct btrfs_block_rsv *rsv)</div><div class='ctx'> {</div><div class='ctx'> 	u64 needed_bytes;</div><div class='head'>diff --git a/fs/btrfs/block-rsv.h b/fs/btrfs/block-rsv.h<br/>index b0bd12b8652f..79ae9d05cd91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-rsv.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/block-rsv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/block-rsv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/block-rsv.h</a></div><div class='hunk'>@@ -3,8 +3,15 @@</div><div class='ctx'> #ifndef BTRFS_BLOCK_RSV_H</div><div class='ctx'> #define BTRFS_BLOCK_RSV_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='ctx'> struct btrfs_root;</div><div class='add'>+struct btrfs_space_info;</div><div class='add'>+struct btrfs_block_rsv;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> enum btrfs_reserve_flush_enum;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -17,6 +24,7 @@ enum btrfs_rsv_type {</div><div class='ctx'> 	BTRFS_BLOCK_RSV_CHUNK,</div><div class='ctx'> 	BTRFS_BLOCK_RSV_DELOPS,</div><div class='ctx'> 	BTRFS_BLOCK_RSV_DELREFS,</div><div class='add'>+	BTRFS_BLOCK_RSV_TREELOG,</div><div class='ctx'> 	BTRFS_BLOCK_RSV_EMPTY,</div><div class='ctx'> 	BTRFS_BLOCK_RSV_TEMP,</div><div class='ctx'> };</div><div class='hunk'>@@ -82,7 +90,7 @@ void btrfs_release_global_block_rsv(struct btrfs_fs_info *fs_info);</div><div class='ctx'> struct btrfs_block_rsv *btrfs_use_block_rsv(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					    struct btrfs_root *root,</div><div class='ctx'> 					    u32 blocksize);</div><div class='del'>-int btrfs_check_trunc_cache_free_space(struct btrfs_fs_info *fs_info,</div><div class='add'>+int btrfs_check_trunc_cache_free_space(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				       struct btrfs_block_rsv *rsv);</div><div class='ctx'> static inline void btrfs_unuse_block_rsv(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					 struct btrfs_block_rsv *block_rsv,</div><div class='hunk'>@@ -101,4 +109,36 @@ static inline bool btrfs_block_rsv_full(const struct btrfs_block_rsv *rsv)</div><div class='ctx'> 	return data_race(rsv-&gt;full);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Get the reserved mount of a block reserve in a context where getting a stale</div><div class='add'>+ * value is acceptable, instead of accessing it directly and trigger data race</div><div class='add'>+ * warning from KCSAN.</div><div class='add'>+ */</div><div class='add'>+static inline u64 btrfs_block_rsv_reserved(struct btrfs_block_rsv *rsv)</div><div class='add'>+{</div><div class='add'>+	u64 ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rsv-&gt;lock);</div><div class='add'>+	ret = rsv-&gt;reserved;</div><div class='add'>+	spin_unlock(&amp;rsv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the size of a block reserve in a context where getting a stale value is</div><div class='add'>+ * acceptable, instead of accessing it directly and trigger data race warning</div><div class='add'>+ * from KCSAN.</div><div class='add'>+ */</div><div class='add'>+static inline u64 btrfs_block_rsv_size(struct btrfs_block_rsv *rsv)</div><div class='add'>+{</div><div class='add'>+	u64 ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rsv-&gt;lock);</div><div class='add'>+	ret = rsv-&gt;size;</div><div class='add'>+	spin_unlock(&amp;rsv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* BTRFS_BLOCK_RSV_H */</div><div class='head'>diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h<br/>index 7f7c5a92d2b8..73602ee8de3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/btrfs_inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/btrfs_inode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/btrfs_inode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/btrfs_inode.h</a></div><div class='hunk'>@@ -8,12 +8,30 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/fscrypt.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> #include &lt;trace/events/btrfs.h&gt;</div><div class='add'>+#include "ctree.h"</div><div class='add'>+#include "block-rsv.h"</div><div class='ctx'> #include "extent_map.h"</div><div class='del'>-#include "extent_io.h"</div><div class='del'>-#include "ordered-data.h"</div><div class='del'>-#include "delayed-inode.h"</div><div class='add'>+#include "extent-io-tree.h"</div><div class='add'>+</div><div class='add'>+struct posix_acl;</div><div class='add'>+struct iov_iter;</div><div class='add'>+struct writeback_control;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_bio;</div><div class='add'>+struct btrfs_file_extent;</div><div class='add'>+struct btrfs_delayed_node;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Since we search a directory based on f_pos (struct dir_context::pos) we have</div><div class='hunk'>@@ -41,7 +59,6 @@ enum {</div><div class='ctx'> 	  */</div><div class='ctx'> 	BTRFS_INODE_NEEDS_FULL_SYNC,</div><div class='ctx'> 	BTRFS_INODE_COPY_EVERYTHING,</div><div class='del'>-	BTRFS_INODE_IN_DELALLOC_LIST,</div><div class='ctx'> 	BTRFS_INODE_HAS_PROPS,</div><div class='ctx'> 	BTRFS_INODE_SNAPSHOT_FLUSH,</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -71,6 +88,39 @@ enum {</div><div class='ctx'> 	BTRFS_INODE_FREE_SPACE_INODE,</div><div class='ctx'> 	/* Set when there are no capabilities in XATTs for the inode. */</div><div class='ctx'> 	BTRFS_INODE_NO_CAP_XATTR,</div><div class='add'>+	/*</div><div class='add'>+	 * Set if an error happened when doing a COW write before submitting a</div><div class='add'>+	 * bio or during writeback. Used for both buffered writes and direct IO</div><div class='add'>+	 * writes. This is to signal a fast fsync that it has to wait for</div><div class='add'>+	 * ordered extents to complete and therefore not log extent maps that</div><div class='add'>+	 * point to unwritten extents (when an ordered extent completes and it</div><div class='add'>+	 * has the BTRFS_ORDERED_IOERR flag set, it drops extent maps in its</div><div class='add'>+	 * range).</div><div class='add'>+	 */</div><div class='add'>+	BTRFS_INODE_COW_WRITE_ERROR,</div><div class='add'>+	/*</div><div class='add'>+	 * Indicate this is a directory that points to a subvolume for which</div><div class='add'>+	 * there is no root reference item. That's a case like the following:</div><div class='add'>+	 *</div><div class='add'>+	 *   $ btrfs subvolume create /mnt/parent</div><div class='add'>+	 *   $ btrfs subvolume create /mnt/parent/child</div><div class='add'>+	 *   $ btrfs subvolume snapshot /mnt/parent /mnt/snap</div><div class='add'>+	 *</div><div class='add'>+	 * If subvolume "parent" is root 256, subvolume "child" is root 257 and</div><div class='add'>+	 * snapshot "snap" is root 258, then there's no root reference item (key</div><div class='add'>+	 * BTRFS_ROOT_REF_KEY in the root tree) for the subvolume "child"</div><div class='add'>+	 * associated to root 258 (the snapshot) - there's only for the root</div><div class='add'>+	 * of the "parent" subvolume (root 256). In the chunk root we have a</div><div class='add'>+	 * (256 BTRFS_ROOT_REF_KEY 257) key but we don't have a</div><div class='add'>+	 * (258 BTRFS_ROOT_REF_KEY 257) key - the sames goes for backrefs, we</div><div class='add'>+	 * have a (257 BTRFS_ROOT_BACKREF_KEY 256) but we don't have a</div><div class='add'>+	 * (257 BTRFS_ROOT_BACKREF_KEY 258) key.</div><div class='add'>+	 *</div><div class='add'>+	 * So when opening the "child" dentry from the snapshot's directory,</div><div class='add'>+	 * we don't find a root ref item and we create a stub inode. This is</div><div class='add'>+	 * done at new_simple_dir(), called from btrfs_lookup_dentry().</div><div class='add'>+	 */</div><div class='add'>+	BTRFS_INODE_ROOT_STUB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* in memory btrfs inode */</div><div class='hunk'>@@ -78,10 +128,14 @@ struct btrfs_inode {</div><div class='ctx'> 	/* which subvolume this inode belongs to */</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> </div><div class='del'>-	/* key used to find this inode on disk.  This is used by the code</div><div class='del'>-	 * to read in roots of subvolumes</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	/*</div><div class='add'>+	 * The objectid of the corresponding BTRFS_INODE_ITEM_KEY.</div><div class='add'>+	 * On 64 bits platforms we can get it from vfs_inode.i_ino, which is an</div><div class='add'>+	 * unsigned long and therefore 64 bits on such platforms.</div><div class='ctx'> 	 */</div><div class='del'>-	struct btrfs_key location;</div><div class='add'>+	u64 objectid;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Cached value of inode property 'compression'. */</div><div class='ctx'> 	u8 prop_compress;</div><div class='hunk'>@@ -91,6 +145,7 @@ struct btrfs_inode {</div><div class='ctx'> 	 * different from prop_compress and takes precedence if set.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 defrag_compress;</div><div class='add'>+	s8 defrag_compress_level;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Lock for counters and all fields used to determine if the inode is in</div><div class='hunk'>@@ -98,6 +153,7 @@ struct btrfs_inode {</div><div class='ctx'> 	 * logged_trans), to access/update delalloc_bytes, new_delalloc_bytes,</div><div class='ctx'> 	 * defrag_bytes, disk_i_size, outstanding_extents, csum_bytes and to</div><div class='ctx'> 	 * update the VFS' inode number of bytes used.</div><div class='add'>+	 * Also protects setting struct file::private_data.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -137,9 +193,6 @@ struct btrfs_inode {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head delalloc_inodes;</div><div class='ctx'> </div><div class='del'>-	/* node for the red-black tree that links inodes in subvolume root */</div><div class='del'>-	struct rb_node rb_node;</div><div class='del'>-</div><div class='ctx'> 	unsigned long runtime_flags;</div><div class='ctx'> </div><div class='ctx'> 	/* full 64 bit generation number, struct vfs_inode doesn't have a big</div><div class='hunk'>@@ -195,16 +248,25 @@ struct btrfs_inode {</div><div class='ctx'> 		u64 new_delalloc_bytes;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The offset of the last dir index key that was logged.</div><div class='del'>-		 * This is used only for directories.</div><div class='add'>+		 * This is used only for directories. Protected by 'log_mutex'.</div><div class='ctx'> 		 */</div><div class='ctx'> 		u64 last_dir_index_offset;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Total number of bytes pending defrag, used by stat to check whether</div><div class='del'>-	 * it needs COW. Protected by 'lock'.</div><div class='del'>-	 */</div><div class='del'>-	u64 defrag_bytes;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * Total number of bytes pending defrag, used by stat to check whether</div><div class='add'>+		 * it needs COW. Protected by 'lock'.</div><div class='add'>+		 * Used by inodes other than the data relocation inode.</div><div class='add'>+		 */</div><div class='add'>+		u64 defrag_bytes;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Logical address of the block group being relocated.</div><div class='add'>+		 * Used only by the data relocation inode.</div><div class='add'>+		 */</div><div class='add'>+		u64 reloc_block_group_start;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The size of the file stored in the metadata on disk.  data=ordered</div><div class='hunk'>@@ -213,12 +275,21 @@ struct btrfs_inode {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64 disk_i_size;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If this is a directory then index_cnt is the counter for the index</div><div class='del'>-	 * number for new files that are created. For an empty directory, this</div><div class='del'>-	 * must be initialized to BTRFS_DIR_START_INDEX.</div><div class='del'>-	 */</div><div class='del'>-	u64 index_cnt;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a directory then index_cnt is the counter for the</div><div class='add'>+		 * index number for new files that are created. For an empty</div><div class='add'>+		 * directory, this must be initialized to BTRFS_DIR_START_INDEX.</div><div class='add'>+		 */</div><div class='add'>+		u64 index_cnt;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this is not a directory, this is the number of bytes</div><div class='add'>+		 * outstanding that are going to need csums. This is used in</div><div class='add'>+		 * ENOSPC accounting. Protected by 'lock'.</div><div class='add'>+		 */</div><div class='add'>+		u64 csum_bytes;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* Cache the directory index number to speed the dir/file remove */</div><div class='ctx'> 	u64 dir_index;</div><div class='hunk'>@@ -230,22 +301,25 @@ struct btrfs_inode {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64 last_unlink_trans;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The id/generation of the last transaction where this inode was</div><div class='del'>-	 * either the source or the destination of a clone/dedupe operation.</div><div class='del'>-	 * Used when logging an inode to know if there are shared extents that</div><div class='del'>-	 * need special care when logging checksum items, to avoid duplicate</div><div class='del'>-	 * checksum items in a log (which can lead to a corruption where we end</div><div class='del'>-	 * up with missing checksum ranges after log replay).</div><div class='del'>-	 * Protected by the vfs inode lock.</div><div class='del'>-	 */</div><div class='del'>-	u64 last_reflink_trans;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * The id/generation of the last transaction where this inode</div><div class='add'>+		 * was either the source or the destination of a clone/dedupe</div><div class='add'>+		 * operation. Used when logging an inode to know if there are</div><div class='add'>+		 * shared extents that need special care when logging checksum</div><div class='add'>+		 * items, to avoid duplicate checksum items in a log (which can</div><div class='add'>+		 * lead to a corruption where we end up with missing checksum</div><div class='add'>+		 * ranges after log replay). Protected by the VFS inode lock.</div><div class='add'>+		 * Used for regular files only.</div><div class='add'>+		 */</div><div class='add'>+		u64 last_reflink_trans;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Number of bytes outstanding that are going to need csums.  This is</div><div class='del'>-	 * used in ENOSPC accounting. Protected by 'lock'.</div><div class='del'>-	 */</div><div class='del'>-	u64 csum_bytes;</div><div class='add'>+		/*</div><div class='add'>+		 * In case this a root stub inode (BTRFS_INODE_ROOT_STUB flag set),</div><div class='add'>+		 * the ID of that root.</div><div class='add'>+		 */</div><div class='add'>+		u64 ref_root_id;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* Backwards incompatible flags, lower half of inode_item::flags  */</div><div class='ctx'> 	u32 flags;</div><div class='hunk'>@@ -264,6 +338,11 @@ struct btrfs_inode {</div><div class='ctx'> 	struct list_head delayed_iput;</div><div class='ctx'> </div><div class='ctx'> 	struct rw_semaphore i_mmap_lock;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	struct fsverity_info *i_verity_info;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	struct inode vfs_inode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -278,10 +357,12 @@ static inline void btrfs_set_first_dir_index_to_log(struct btrfs_inode *inode,</div><div class='ctx'> 	WRITE_ONCE(inode-&gt;first_dir_index_to_log, index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct btrfs_inode *BTRFS_I(const struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return container_of(inode, struct btrfs_inode, vfs_inode);</div><div class='del'>-}</div><div class='add'>+/* Type checked and const-preserving VFS inode -&gt; btrfs inode. */</div><div class='add'>+#define BTRFS_I(_inode)								\</div><div class='add'>+	_Generic(_inode,							\</div><div class='add'>+		 struct inode *: container_of(_inode, struct btrfs_inode, vfs_inode),	\</div><div class='add'>+		 const struct inode *: (const struct btrfs_inode *)container_of(	\</div><div class='add'>+					_inode, const struct btrfs_inode, vfs_inode))</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long btrfs_inode_hash(u64 objectid,</div><div class='ctx'> 					     const struct btrfs_root *root)</div><div class='hunk'>@@ -303,10 +384,9 @@ static inline unsigned long btrfs_inode_hash(u64 objectid,</div><div class='ctx'>  */</div><div class='ctx'> static inline u64 btrfs_ino(const struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	u64 ino = inode-&gt;location.objectid;</div><div class='add'>+	u64 ino = inode-&gt;objectid;</div><div class='ctx'> </div><div class='del'>-	/* type == BTRFS_ROOT_ITEM_KEY: subvol dir */</div><div class='del'>-	if (inode-&gt;location.type == BTRFS_ROOT_ITEM_KEY)</div><div class='add'>+	if (test_bit(BTRFS_INODE_ROOT_STUB, &amp;inode-&gt;runtime_flags))</div><div class='ctx'> 		ino = inode-&gt;vfs_inode.i_ino;</div><div class='ctx'> 	return ino;</div><div class='ctx'> }</div><div class='hunk'>@@ -320,20 +400,36 @@ static inline u64 btrfs_ino(const struct btrfs_inode *inode)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline void btrfs_get_inode_key(const struct btrfs_inode *inode,</div><div class='add'>+				       struct btrfs_key *key)</div><div class='add'>+{</div><div class='add'>+	key-&gt;objectid = btrfs_ino(inode);</div><div class='add'>+	key-&gt;type = BTRFS_INODE_ITEM_KEY;</div><div class='add'>+	key-&gt;offset = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_set_inode_number(struct btrfs_inode *inode, u64 ino)</div><div class='add'>+{</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	inode-&gt;objectid = ino;</div><div class='add'>+#endif</div><div class='add'>+	inode-&gt;vfs_inode.i_ino = ino;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void btrfs_i_size_write(struct btrfs_inode *inode, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	i_size_write(&amp;inode-&gt;vfs_inode, size);</div><div class='ctx'> 	inode-&gt;disk_i_size = size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool btrfs_is_free_space_inode(struct btrfs_inode *inode)</div><div class='add'>+static inline bool btrfs_is_free_space_inode(const struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(BTRFS_INODE_FREE_SPACE_INODE, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_data_inode(struct inode *inode)</div><div class='add'>+static inline bool is_data_inode(const struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return btrfs_ino(BTRFS_I(inode)) != BTRFS_BTREE_INODE_OBJECTID;</div><div class='add'>+	return btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_mod_outstanding_extents(struct btrfs_inode *inode,</div><div class='hunk'>@@ -363,9 +459,11 @@ static inline void btrfs_set_inode_last_sub_trans(struct btrfs_inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Should be called while holding the inode's VFS lock in exclusive mode or in a</div><div class='del'>- * context where no one else can access the inode concurrently (during inode</div><div class='del'>- * creation or when loading an inode from disk).</div><div class='add'>+ * Should be called while holding the inode's VFS lock in exclusive mode, or</div><div class='add'>+ * while holding the inode's mmap lock (struct btrfs_inode::i_mmap_lock) in</div><div class='add'>+ * either shared or exclusive mode, or in a context where no one else can access</div><div class='add'>+ * the inode concurrently (during inode creation or when loading an inode from</div><div class='add'>+ * disk).</div><div class='ctx'>  */</div><div class='ctx'> static inline void btrfs_set_inode_full_sync(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -416,19 +514,48 @@ static inline bool btrfs_inode_can_compress(const struct btrfs_inode *inode)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Array of bytes with variable length, hexadecimal format 0x1234 */</div><div class='del'>-#define CSUM_FMT				"0x%*phN"</div><div class='del'>-#define CSUM_FMT_VALUE(size, bytes)		size, bytes</div><div class='add'>+static inline void btrfs_assert_inode_locked(struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	/* Immediately trigger a crash if the inode is not locked. */</div><div class='add'>+	ASSERT(inode_is_locked(&amp;inode-&gt;vfs_inode));</div><div class='add'>+	/* Trigger a splat in dmesg if this task is not holding the lock. */</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;vfs_inode.i_rwsem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_update_inode_mapping_flags(struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_NODATASUM)</div><div class='add'>+		mapping_clear_stable_writes(inode-&gt;vfs_inode.i_mapping);</div><div class='add'>+	else</div><div class='add'>+		mapping_set_stable_writes(inode-&gt;vfs_inode.i_mapping);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_set_inode_mapping_order(struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	/* Metadata inode should not reach here. */</div><div class='add'>+	ASSERT(is_data_inode(inode));</div><div class='add'>+</div><div class='add'>+	/* We only allow BITS_PER_LONGS blocks for each bitmap. */</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	mapping_set_folio_order_range(inode-&gt;vfs_inode.i_mapping,</div><div class='add'>+				      inode-&gt;root-&gt;fs_info-&gt;block_min_order,</div><div class='add'>+				      inode-&gt;root-&gt;fs_info-&gt;block_max_order);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,</div><div class='del'>-			    u32 pgoff, u8 *csum, const u8 * const csum_expected);</div><div class='add'>+void btrfs_calculate_block_csum_folio(struct btrfs_fs_info *fs_info,</div><div class='add'>+				      const phys_addr_t paddr, u8 *dest);</div><div class='add'>+void btrfs_calculate_block_csum_pages(struct btrfs_fs_info *fs_info,</div><div class='add'>+				      const phys_addr_t paddrs[], u8 *dest);</div><div class='add'>+int btrfs_check_block_csum(struct btrfs_fs_info *fs_info, phys_addr_t paddr, u8 *csum,</div><div class='add'>+			   const u8 * const csum_expected);</div><div class='ctx'> bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev,</div><div class='del'>-			u32 bio_offset, struct bio_vec *bv);</div><div class='del'>-noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,</div><div class='del'>-			      u64 *orig_start, u64 *orig_block_len,</div><div class='del'>-			      u64 *ram_bytes, bool nowait, bool strict);</div><div class='add'>+			u32 bio_offset, const phys_addr_t paddrs[]);</div><div class='add'>+noinline int can_nocow_extent(struct btrfs_inode *inode, u64 offset, u64 *len,</div><div class='add'>+			      struct btrfs_file_extent *file_extent,</div><div class='add'>+			      bool nowait);</div><div class='ctx'> </div><div class='del'>-void __btrfs_del_delalloc_inode(struct btrfs_root *root, struct btrfs_inode *inode);</div><div class='add'>+void btrfs_del_delalloc_inode(struct btrfs_inode *inode);</div><div class='ctx'> struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry);</div><div class='ctx'> int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index);</div><div class='ctx'> int btrfs_unlink_inode(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -436,10 +563,9 @@ int btrfs_unlink_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		       const struct fscrypt_str *name);</div><div class='ctx'> int btrfs_add_link(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		   struct btrfs_inode *parent_inode, struct btrfs_inode *inode,</div><div class='del'>-		   const struct fscrypt_str *name, int add_backref, u64 index);</div><div class='add'>+		   const struct fscrypt_str *name, bool add_backref, u64 index);</div><div class='ctx'> int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry);</div><div class='del'>-int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,</div><div class='del'>-			 int front);</div><div class='add'>+int btrfs_truncate_block(struct btrfs_inode *inode, u64 offset, u64 start, u64 end);</div><div class='ctx'> </div><div class='ctx'> int btrfs_start_delalloc_snapshot(struct btrfs_root *root, bool in_reclaim_context);</div><div class='ctx'> int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,</div><div class='hunk'>@@ -477,8 +603,6 @@ void btrfs_merge_delalloc_extent(struct btrfs_inode *inode, struct extent_state</div><div class='ctx'> 				 struct extent_state *other);</div><div class='ctx'> void btrfs_split_delalloc_extent(struct btrfs_inode *inode,</div><div class='ctx'> 				 struct extent_state *orig, u64 split);</div><div class='del'>-void btrfs_set_range_writeback(struct btrfs_inode *inode, u64 start, u64 end);</div><div class='del'>-vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf);</div><div class='ctx'> void btrfs_evict_inode(struct inode *inode);</div><div class='ctx'> struct inode *btrfs_alloc_inode(struct super_block *sb);</div><div class='ctx'> void btrfs_destroy_inode(struct inode *inode);</div><div class='hunk'>@@ -486,12 +610,11 @@ void btrfs_free_inode(struct inode *inode);</div><div class='ctx'> int btrfs_drop_inode(struct inode *inode);</div><div class='ctx'> int __init btrfs_init_cachep(void);</div><div class='ctx'> void __cold btrfs_destroy_cachep(void);</div><div class='del'>-struct inode *btrfs_iget_path(struct super_block *s, u64 ino,</div><div class='del'>-			      struct btrfs_root *root, struct btrfs_path *path);</div><div class='del'>-struct inode *btrfs_iget(struct super_block *s, u64 ino, struct btrfs_root *root);</div><div class='add'>+struct btrfs_inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,</div><div class='add'>+				    struct btrfs_path *path);</div><div class='add'>+struct btrfs_inode *btrfs_iget(u64 ino, struct btrfs_root *root);</div><div class='ctx'> struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,</div><div class='del'>-				    struct page *page, size_t pg_offset,</div><div class='del'>-				    u64 start, u64 len);</div><div class='add'>+				    struct folio *folio, u64 start, u64 len);</div><div class='ctx'> int btrfs_update_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		       struct btrfs_inode *inode);</div><div class='ctx'> int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -509,24 +632,27 @@ int btrfs_prealloc_file_range_trans(struct inode *inode,</div><div class='ctx'> 				    struct btrfs_trans_handle *trans, int mode,</div><div class='ctx'> 				    u64 start, u64 num_bytes, u64 min_size,</div><div class='ctx'> 				    loff_t actual_len, u64 *alloc_hint);</div><div class='del'>-int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page,</div><div class='add'>+int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_folio,</div><div class='ctx'> 			     u64 start, u64 end, struct writeback_control *wbc);</div><div class='del'>-int btrfs_writepage_cow_fixup(struct page *page);</div><div class='add'>+int btrfs_writepage_cow_fixup(struct folio *folio);</div><div class='ctx'> int btrfs_encoded_io_compression_from_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					     int compress_type);</div><div class='ctx'> int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,</div><div class='del'>-					  u64 file_offset, u64 disk_bytenr,</div><div class='del'>-					  u64 disk_io_size,</div><div class='del'>-					  struct page **pages);</div><div class='add'>+					  u64 disk_bytenr, u64 disk_io_size,</div><div class='add'>+					  struct page **pages, void *uring_ctx);</div><div class='ctx'> ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter,</div><div class='del'>-			   struct btrfs_ioctl_encoded_io_args *encoded);</div><div class='add'>+			   struct btrfs_ioctl_encoded_io_args *encoded,</div><div class='add'>+			   struct extent_state **cached_state,</div><div class='add'>+			   u64 *disk_bytenr, u64 *disk_io_size);</div><div class='add'>+ssize_t btrfs_encoded_read_regular(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+				   u64 start, u64 lockend,</div><div class='add'>+				   struct extent_state **cached_state,</div><div class='add'>+				   u64 disk_bytenr, u64 disk_io_size,</div><div class='add'>+				   size_t count, bool compressed, bool *unlocked);</div><div class='ctx'> ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 			       const struct btrfs_ioctl_encoded_io_args *encoded);</div><div class='ctx'> </div><div class='del'>-ssize_t btrfs_dio_read(struct kiocb *iocb, struct iov_iter *iter,</div><div class='del'>-		       size_t done_before);</div><div class='del'>-struct iomap_dio *btrfs_dio_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='del'>-				  size_t done_before);</div><div class='add'>+struct btrfs_inode *btrfs_find_first_inode(struct btrfs_root *root, u64 min_ino);</div><div class='ctx'> </div><div class='ctx'> extern const struct dentry_operations btrfs_dentry_operations;</div><div class='ctx'> </div><div class='hunk'>@@ -542,5 +668,10 @@ void btrfs_inode_unlock(struct btrfs_inode *inode, unsigned int ilock_flags);</div><div class='ctx'> void btrfs_update_inode_bytes(struct btrfs_inode *inode, const u64 add_bytes,</div><div class='ctx'> 			      const u64 del_bytes);</div><div class='ctx'> void btrfs_assert_inode_range_clean(struct btrfs_inode *inode, u64 start, u64 end);</div><div class='add'>+u64 btrfs_get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,</div><div class='add'>+				     u64 num_bytes);</div><div class='add'>+struct extent_map *btrfs_create_io_em(struct btrfs_inode *inode, u64 start,</div><div class='add'>+				      const struct btrfs_file_extent *file_extent,</div><div class='add'>+				      int type);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c<br/>index 193168214eeb..6b3357287b42 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/compression.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/compression.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/compression.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/compression.c</a></div><div class='hunk'>@@ -25,8 +25,6 @@</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "fs.h"</div><div class='del'>-#include "disk-io.h"</div><div class='del'>-#include "transaction.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> #include "bio.h"</div><div class='ctx'> #include "ordered-data.h"</div><div class='hunk'>@@ -34,8 +32,7 @@</div><div class='ctx'> #include "extent_io.h"</div><div class='ctx'> #include "extent_map.h"</div><div class='ctx'> #include "subpage.h"</div><div class='del'>-#include "zoned.h"</div><div class='del'>-#include "file-item.h"</div><div class='add'>+#include "messages.h"</div><div class='ctx'> #include "super.h"</div><div class='ctx'> </div><div class='ctx'> static struct bio_set btrfs_compressed_bioset;</div><div class='hunk'>@@ -70,9 +67,7 @@ static struct compressed_bio *alloc_compressed_bio(struct btrfs_inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	bbio = btrfs_bio(bio_alloc_bioset(NULL, BTRFS_MAX_COMPRESSED_PAGES, op,</div><div class='ctx'> 					  GFP_NOFS, &amp;btrfs_compressed_bioset));</div><div class='del'>-	btrfs_bio_init(bbio, inode-&gt;root-&gt;fs_info, end_io, NULL);</div><div class='del'>-	bbio-&gt;inode = inode;</div><div class='del'>-	bbio-&gt;file_offset = start;</div><div class='add'>+	btrfs_bio_init(bbio, inode, start, end_io, NULL);</div><div class='ctx'> 	return to_compressed_bio(bbio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -93,20 +88,20 @@ bool btrfs_compress_is_valid_type(const char *str, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int compression_compress_pages(int type, struct list_head *ws,</div><div class='del'>-               struct address_space *mapping, u64 start, struct page **pages,</div><div class='del'>-               unsigned long *out_pages, unsigned long *total_in,</div><div class='del'>-               unsigned long *total_out)</div><div class='add'>+				      struct btrfs_inode *inode, u64 start,</div><div class='add'>+				      struct folio **folios, unsigned long *out_folios,</div><div class='add'>+				      unsigned long *total_in, unsigned long *total_out)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case BTRFS_COMPRESS_ZLIB:</div><div class='del'>-		return zlib_compress_pages(ws, mapping, start, pages,</div><div class='del'>-				out_pages, total_in, total_out);</div><div class='add'>+		return zlib_compress_folios(ws, inode, start, folios,</div><div class='add'>+					    out_folios, total_in, total_out);</div><div class='ctx'> 	case BTRFS_COMPRESS_LZO:</div><div class='del'>-		return lzo_compress_pages(ws, mapping, start, pages,</div><div class='del'>-				out_pages, total_in, total_out);</div><div class='add'>+		return lzo_compress_folios(ws, inode, start, folios,</div><div class='add'>+					   out_folios, total_in, total_out);</div><div class='ctx'> 	case BTRFS_COMPRESS_ZSTD:</div><div class='del'>-		return zstd_compress_pages(ws, mapping, start, pages,</div><div class='del'>-				out_pages, total_in, total_out);</div><div class='add'>+		return zstd_compress_folios(ws, inode, start, folios,</div><div class='add'>+					    out_folios, total_in, total_out);</div><div class='ctx'> 	case BTRFS_COMPRESS_NONE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -118,7 +113,7 @@ static int compression_compress_pages(int type, struct list_head *ws,</div><div class='ctx'> 		 * Not a big deal, just need to inform caller that we</div><div class='ctx'> 		 * haven't allocated any pages yet.</div><div class='ctx'> 		 */</div><div class='del'>-		*out_pages = 0;</div><div class='add'>+		*out_folios = 0;</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -141,16 +136,16 @@ static int compression_decompress_bio(struct list_head *ws,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int compression_decompress(int type, struct list_head *ws,</div><div class='del'>-               const u8 *data_in, struct page *dest_page,</div><div class='del'>-               unsigned long start_byte, size_t srclen, size_t destlen)</div><div class='add'>+		const u8 *data_in, struct folio *dest_folio,</div><div class='add'>+		unsigned long dest_pgoff, size_t srclen, size_t destlen)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case BTRFS_COMPRESS_ZLIB: return zlib_decompress(ws, data_in, dest_page,</div><div class='del'>-						start_byte, srclen, destlen);</div><div class='del'>-	case BTRFS_COMPRESS_LZO:  return lzo_decompress(ws, data_in, dest_page,</div><div class='del'>-						start_byte, srclen, destlen);</div><div class='del'>-	case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, dest_page,</div><div class='del'>-						start_byte, srclen, destlen);</div><div class='add'>+	case BTRFS_COMPRESS_ZLIB: return zlib_decompress(ws, data_in, dest_folio,</div><div class='add'>+						dest_pgoff, srclen, destlen);</div><div class='add'>+	case BTRFS_COMPRESS_LZO:  return lzo_decompress(ws, data_in, dest_folio,</div><div class='add'>+						dest_pgoff, srclen, destlen);</div><div class='add'>+	case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, dest_folio,</div><div class='add'>+						dest_pgoff, srclen, destlen);</div><div class='ctx'> 	case BTRFS_COMPRESS_NONE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -161,11 +156,11 @@ static int compression_decompress(int type, struct list_head *ws,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_free_compressed_pages(struct compressed_bio *cb)</div><div class='add'>+static void btrfs_free_compressed_folios(struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='del'>-	for (unsigned int i = 0; i &lt; cb-&gt;nr_pages; i++)</div><div class='del'>-		btrfs_free_compr_page(cb-&gt;compressed_pages[i]);</div><div class='del'>-	kfree(cb-&gt;compressed_pages);</div><div class='add'>+	for (unsigned int i = 0; i &lt; cb-&gt;nr_folios; i++)</div><div class='add'>+		btrfs_free_compr_folio(cb-&gt;compressed_folios[i]);</div><div class='add'>+	kfree(cb-&gt;compressed_folios);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_decompress_bio(struct compressed_bio *cb);</div><div class='hunk'>@@ -197,15 +192,13 @@ static unsigned long btrfs_compr_pool_count(struct shrinker *sh, struct shrink_c</div><div class='ctx'> </div><div class='ctx'> static unsigned long btrfs_compr_pool_scan(struct shrinker *sh, struct shrink_control *sc)</div><div class='ctx'> {</div><div class='del'>-	struct list_head remove;</div><div class='add'>+	LIST_HEAD(remove);</div><div class='ctx'> 	struct list_head *tmp, *next;</div><div class='ctx'> 	int freed;</div><div class='ctx'> </div><div class='ctx'> 	if (compr_pool.count == 0)</div><div class='ctx'> 		return SHRINK_STOP;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;remove);</div><div class='del'>-</div><div class='ctx'> 	/* For now, just simply drain the whole list. */</div><div class='ctx'> 	spin_lock(&amp;compr_pool.lock);</div><div class='ctx'> 	list_splice_init(&amp;compr_pool.list, &amp;remove);</div><div class='hunk'>@@ -226,33 +219,42 @@ static unsigned long btrfs_compr_pool_scan(struct shrinker *sh, struct shrink_co</div><div class='ctx'> /*</div><div class='ctx'>  * Common wrappers for page allocation from compression wrappers</div><div class='ctx'>  */</div><div class='del'>-struct page *btrfs_alloc_compr_page(void)</div><div class='add'>+struct folio *btrfs_alloc_compr_folio(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+</div><div class='add'>+	/* For bs &gt; ps cases, no cached folio pool for now. */</div><div class='add'>+	if (fs_info-&gt;block_min_order)</div><div class='add'>+		goto alloc;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;compr_pool.lock);</div><div class='ctx'> 	if (compr_pool.count &gt; 0) {</div><div class='del'>-		page = list_first_entry(&amp;compr_pool.list, struct page, lru);</div><div class='del'>-		list_del_init(&amp;page-&gt;lru);</div><div class='add'>+		folio = list_first_entry(&amp;compr_pool.list, struct folio, lru);</div><div class='add'>+		list_del_init(&amp;folio-&gt;lru);</div><div class='ctx'> 		compr_pool.count--;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;compr_pool.lock);</div><div class='ctx'> </div><div class='del'>-	if (page)</div><div class='del'>-		return page;</div><div class='add'>+	if (folio)</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='del'>-	return alloc_page(GFP_NOFS);</div><div class='add'>+alloc:</div><div class='add'>+	return folio_alloc(GFP_NOFS, fs_info-&gt;block_min_order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_free_compr_page(struct page *page)</div><div class='add'>+void btrfs_free_compr_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	bool do_free = false;</div><div class='ctx'> </div><div class='add'>+	/* The folio is from bs &gt; ps fs, no cached pool for now. */</div><div class='add'>+	if (folio_order(folio))</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;compr_pool.lock);</div><div class='ctx'> 	if (compr_pool.count &gt; compr_pool.thresh) {</div><div class='ctx'> 		do_free = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		list_add(&amp;page-&gt;lru, &amp;compr_pool.list);</div><div class='add'>+		list_add(&amp;folio-&gt;lru, &amp;compr_pool.list);</div><div class='ctx'> 		compr_pool.count++;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;compr_pool.lock);</div><div class='hunk'>@@ -260,11 +262,12 @@ void btrfs_free_compr_page(struct page *page)</div><div class='ctx'> 	if (!do_free)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ASSERT(page_ref_count(page) == 1);</div><div class='del'>-	put_page(page);</div><div class='add'>+free:</div><div class='add'>+	ASSERT(folio_ref_count(folio) == 1);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void end_bbio_comprssed_read(struct btrfs_bio *bbio)</div><div class='add'>+static void end_bbio_compressed_read(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct compressed_bio *cb = to_compressed_bio(bbio);</div><div class='ctx'> 	blk_status_t status = bbio-&gt;bio.bi_status;</div><div class='hunk'>@@ -272,7 +275,7 @@ static void end_bbio_comprssed_read(struct btrfs_bio *bbio)</div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		status = errno_to_blk_status(btrfs_decompress_bio(cb));</div><div class='ctx'> </div><div class='del'>-	btrfs_free_compressed_pages(cb);</div><div class='add'>+	btrfs_free_compressed_folios(cb);</div><div class='ctx'> 	btrfs_bio_end_io(cb-&gt;orig_bbio, status);</div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> }</div><div class='hunk'>@@ -284,16 +287,16 @@ static void end_bbio_comprssed_read(struct btrfs_bio *bbio)</div><div class='ctx'> static noinline void end_compressed_writeback(const struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = &amp;cb-&gt;bbio.inode-&gt;vfs_inode;</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	unsigned long index = cb-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long end_index = (cb-&gt;start + cb-&gt;len - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	pgoff_t index = cb-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const pgoff_t end_index = (cb-&gt;start + cb-&gt;len - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='del'>-	const int error = blk_status_to_errno(cb-&gt;bbio.bio.bi_status);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (error)</div><div class='del'>-		mapping_set_error(inode-&gt;i_mapping, error);</div><div class='add'>+	ret = blk_status_to_errno(cb-&gt;bbio.bio.bi_status);</div><div class='add'>+	if (ret)</div><div class='add'>+		mapping_set_error(inode-&gt;i_mapping, ret);</div><div class='ctx'> </div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='ctx'> 	while (index &lt;= end_index) {</div><div class='hunk'>@@ -314,22 +317,6 @@ static noinline void end_compressed_writeback(const struct compressed_bio *cb)</div><div class='ctx'> 	/* the inode may be gone now */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_finish_compressed_write_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct compressed_bio *cb =</div><div class='del'>-		container_of(work, struct compressed_bio, write_end_work);</div><div class='del'>-</div><div class='del'>-	btrfs_finish_ordered_extent(cb-&gt;bbio.ordered, NULL, cb-&gt;start, cb-&gt;len,</div><div class='del'>-				    cb-&gt;bbio.bio.bi_status == BLK_STS_OK);</div><div class='del'>-</div><div class='del'>-	if (cb-&gt;writeback)</div><div class='del'>-		end_compressed_writeback(cb);</div><div class='del'>-	/* Note, our inode could be gone now */</div><div class='del'>-</div><div class='del'>-	btrfs_free_compressed_pages(cb);</div><div class='del'>-	bio_put(&amp;cb-&gt;bbio.bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Do the cleanup once all the compressed pages hit the disk.  This will clear</div><div class='ctx'>  * writeback on the file pages and free the compressed pages.</div><div class='hunk'>@@ -337,26 +324,36 @@ static void btrfs_finish_compressed_write_work(struct work_struct *work)</div><div class='ctx'>  * This also calls the writeback end hooks for the file pages so that metadata</div><div class='ctx'>  * and checksums can be updated in the file.</div><div class='ctx'>  */</div><div class='del'>-static void end_bbio_comprssed_write(struct btrfs_bio *bbio)</div><div class='add'>+static void end_bbio_compressed_write(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct compressed_bio *cb = to_compressed_bio(bbio);</div><div class='del'>-	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='del'>-	queue_work(fs_info-&gt;compressed_write_workers, &amp;cb-&gt;write_end_work);</div><div class='add'>+	btrfs_finish_ordered_extent(cb-&gt;bbio.ordered, NULL, cb-&gt;start, cb-&gt;len,</div><div class='add'>+				    cb-&gt;bbio.bio.bi_status == BLK_STS_OK);</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;writeback)</div><div class='add'>+		end_compressed_writeback(cb);</div><div class='add'>+	/* Note, our inode could be gone now. */</div><div class='add'>+	btrfs_free_compressed_folios(cb);</div><div class='add'>+	bio_put(&amp;cb-&gt;bbio.bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_add_compressed_bio_pages(struct compressed_bio *cb)</div><div class='add'>+static void btrfs_add_compressed_bio_folios(struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = &amp;cb-&gt;bbio.bio;</div><div class='ctx'> 	u32 offset = 0;</div><div class='add'>+	unsigned int findex = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (offset &lt; cb-&gt;compressed_len) {</div><div class='del'>-		u32 len = min_t(u32, cb-&gt;compressed_len - offset, PAGE_SIZE);</div><div class='add'>+		struct folio *folio = cb-&gt;compressed_folios[findex];</div><div class='add'>+		u32 len = min_t(u32, cb-&gt;compressed_len - offset, folio_size(folio));</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='ctx'> 		/* Maximum compressed extent is smaller than bio size limit. */</div><div class='del'>-		__bio_add_page(bio, cb-&gt;compressed_pages[offset &gt;&gt; PAGE_SHIFT],</div><div class='del'>-			       len, 0);</div><div class='add'>+		ret = bio_add_folio(bio, folio, len, 0);</div><div class='add'>+		ASSERT(ret);</div><div class='ctx'> 		offset += len;</div><div class='add'>+		findex++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -370,12 +367,12 @@ static void btrfs_add_compressed_bio_pages(struct compressed_bio *cb)</div><div class='ctx'>  * the end io hooks.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_submit_compressed_write(struct btrfs_ordered_extent *ordered,</div><div class='del'>-				   struct page **compressed_pages,</div><div class='del'>-				   unsigned int nr_pages,</div><div class='add'>+				   struct folio **compressed_folios,</div><div class='add'>+				   unsigned int nr_folios,</div><div class='ctx'> 				   blk_opf_t write_flags,</div><div class='ctx'> 				   bool writeback)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct compressed_bio *cb;</div><div class='ctx'> </div><div class='hunk'>@@ -384,19 +381,18 @@ void btrfs_submit_compressed_write(struct btrfs_ordered_extent *ordered,</div><div class='ctx'> </div><div class='ctx'> 	cb = alloc_compressed_bio(inode, ordered-&gt;file_offset,</div><div class='ctx'> 				  REQ_OP_WRITE | write_flags,</div><div class='del'>-				  end_bbio_comprssed_write);</div><div class='add'>+				  end_bbio_compressed_write);</div><div class='ctx'> 	cb-&gt;start = ordered-&gt;file_offset;</div><div class='ctx'> 	cb-&gt;len = ordered-&gt;num_bytes;</div><div class='del'>-	cb-&gt;compressed_pages = compressed_pages;</div><div class='add'>+	cb-&gt;compressed_folios = compressed_folios;</div><div class='ctx'> 	cb-&gt;compressed_len = ordered-&gt;disk_num_bytes;</div><div class='ctx'> 	cb-&gt;writeback = writeback;</div><div class='del'>-	INIT_WORK(&amp;cb-&gt;write_end_work, btrfs_finish_compressed_write_work);</div><div class='del'>-	cb-&gt;nr_pages = nr_pages;</div><div class='add'>+	cb-&gt;nr_folios = nr_folios;</div><div class='ctx'> 	cb-&gt;bbio.bio.bi_iter.bi_sector = ordered-&gt;disk_bytenr &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 	cb-&gt;bbio.ordered = ordered;</div><div class='del'>-	btrfs_add_compressed_bio_pages(cb);</div><div class='add'>+	btrfs_add_compressed_bio_folios(cb);</div><div class='ctx'> </div><div class='del'>-	btrfs_submit_bio(&amp;cb-&gt;bbio, 0);</div><div class='add'>+	btrfs_submit_bbio(&amp;cb-&gt;bbio, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -415,13 +411,13 @@ static noinline int add_ra_bio_pages(struct inode *inode,</div><div class='ctx'> 				     struct compressed_bio *cb,</div><div class='ctx'> 				     int *memstall, unsigned long *pflags)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	unsigned long end_index;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	pgoff_t end_index;</div><div class='ctx'> 	struct bio *orig_bio = &amp;cb-&gt;orig_bbio-&gt;bio;</div><div class='ctx'> 	u64 cur = cb-&gt;orig_bbio-&gt;file_offset + orig_bio-&gt;bi_iter.bi_size;</div><div class='ctx'> 	u64 isize = i_size_read(inode);</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	struct extent_map_tree *em_tree;</div><div class='hunk'>@@ -441,22 +437,30 @@ static noinline int add_ra_bio_pages(struct inode *inode,</div><div class='ctx'> 	 * This makes readahead less effective, so here disable readahead for</div><div class='ctx'> 	 * subpage for now, until full compressed write is supported.</div><div class='ctx'> 	 */</div><div class='del'>-	if (btrfs_sb(inode-&gt;i_sb)-&gt;sectorsize &lt; PAGE_SIZE)</div><div class='add'>+	if (fs_info-&gt;sectorsize &lt; PAGE_SIZE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* For bs &gt; ps cases, we don't support readahead for compressed folios for now. */</div><div class='add'>+	if (fs_info-&gt;block_min_order)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	end_index = (i_size_read(inode) - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	while (cur &lt; compressed_end) {</div><div class='del'>-		u64 page_end;</div><div class='del'>-		u64 pg_index = cur &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		pgoff_t page_end;</div><div class='add'>+		pgoff_t pg_index = cur &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		u32 add_size;</div><div class='ctx'> </div><div class='ctx'> 		if (pg_index &gt; end_index)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		page = xa_load(&amp;mapping-&gt;i_pages, pg_index);</div><div class='del'>-		if (page &amp;&amp; !xa_is_value(page)) {</div><div class='del'>-			sectors_missed += (PAGE_SIZE - offset_in_page(cur)) &gt;&gt;</div><div class='add'>+		folio = filemap_get_folio(mapping, pg_index);</div><div class='add'>+		if (!IS_ERR(folio)) {</div><div class='add'>+			u64 folio_sz = folio_size(folio);</div><div class='add'>+			u64 offset = offset_in_folio(folio, cur);</div><div class='add'>+</div><div class='add'>+			folio_put(folio);</div><div class='add'>+			sectors_missed += (folio_sz - offset) &gt;&gt;</div><div class='ctx'> 					  fs_info-&gt;sectorsize_bits;</div><div class='ctx'> </div><div class='ctx'> 			/* Beyond threshold, no need to continue */</div><div class='hunk'>@@ -467,38 +471,38 @@ static noinline int add_ra_bio_pages(struct inode *inode,</div><div class='ctx'> 			 * Jump to next page start as we already have page for</div><div class='ctx'> 			 * current offset.</div><div class='ctx'> 			 */</div><div class='del'>-			cur = (pg_index &lt;&lt; PAGE_SHIFT) + PAGE_SIZE;</div><div class='add'>+			cur += (folio_sz - offset);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		page = __page_cache_alloc(mapping_gfp_constraint(mapping,</div><div class='del'>-								 ~__GFP_FS));</div><div class='del'>-		if (!page)</div><div class='add'>+		folio = filemap_alloc_folio(mapping_gfp_constraint(mapping, ~__GFP_FS),</div><div class='add'>+					    0, NULL);</div><div class='add'>+		if (!folio)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (add_to_page_cache_lru(page, mapping, pg_index, GFP_NOFS)) {</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (filemap_add_folio(mapping, folio, pg_index, GFP_NOFS)) {</div><div class='ctx'> 			/* There is already a page, skip to page end */</div><div class='del'>-			cur = (pg_index &lt;&lt; PAGE_SHIFT) + PAGE_SIZE;</div><div class='add'>+			cur += folio_size(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!*memstall &amp;&amp; PageWorkingset(page)) {</div><div class='add'>+		if (!*memstall &amp;&amp; folio_test_workingset(folio)) {</div><div class='ctx'> 			psi_memstall_enter(pflags);</div><div class='ctx'> 			*memstall = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = set_page_extent_mapped(page);</div><div class='add'>+		ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		page_end = (pg_index &lt;&lt; PAGE_SHIFT) + PAGE_SIZE - 1;</div><div class='del'>-		lock_extent(tree, cur, page_end, NULL);</div><div class='add'>+		page_end = (pg_index &lt;&lt; PAGE_SHIFT) + folio_size(folio) - 1;</div><div class='add'>+		btrfs_lock_extent(tree, cur, page_end, NULL);</div><div class='ctx'> 		read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-		em = lookup_extent_mapping(em_tree, cur, page_end + 1 - cur);</div><div class='add'>+		em = btrfs_lookup_extent_mapping(em_tree, cur, page_end + 1 - cur);</div><div class='ctx'> 		read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -507,32 +511,33 @@ static noinline int add_ra_bio_pages(struct inode *inode,</div><div class='ctx'> 		 * to this compressed extent on disk.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!em || cur &lt; em-&gt;start ||</div><div class='del'>-		    (cur + fs_info-&gt;sectorsize &gt; extent_map_end(em)) ||</div><div class='del'>-		    (em-&gt;block_start &gt;&gt; SECTOR_SHIFT) != orig_bio-&gt;bi_iter.bi_sector) {</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-			unlock_extent(tree, cur, page_end, NULL);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+		    (cur + fs_info-&gt;sectorsize &gt; btrfs_extent_map_end(em)) ||</div><div class='add'>+		    (btrfs_extent_map_block_start(em) &gt;&gt; SECTOR_SHIFT) !=</div><div class='add'>+		    orig_bio-&gt;bi_iter.bi_sector) {</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			btrfs_unlock_extent(tree, cur, page_end, NULL);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		add_size = min(em-&gt;start + em-&gt;len, page_end + 1) - cur;</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+		btrfs_unlock_extent(tree, cur, page_end, NULL);</div><div class='ctx'> </div><div class='del'>-		if (page-&gt;index == end_index) {</div><div class='del'>-			size_t zero_offset = offset_in_page(isize);</div><div class='add'>+		if (folio_contains(folio, end_index)) {</div><div class='add'>+			size_t zero_offset = offset_in_folio(folio, isize);</div><div class='ctx'> </div><div class='ctx'> 			if (zero_offset) {</div><div class='ctx'> 				int zeros;</div><div class='del'>-				zeros = PAGE_SIZE - zero_offset;</div><div class='del'>-				memzero_page(page, zero_offset, zeros);</div><div class='add'>+				zeros = folio_size(folio) - zero_offset;</div><div class='add'>+				folio_zero_range(folio, zero_offset, zeros);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		add_size = min(em-&gt;start + em-&gt;len, page_end + 1) - cur;</div><div class='del'>-		ret = bio_add_page(orig_bio, page, add_size, offset_in_page(cur));</div><div class='del'>-		if (ret != add_size) {</div><div class='del'>-			unlock_extent(tree, cur, page_end, NULL);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (!bio_add_folio(orig_bio, folio, add_size,</div><div class='add'>+				   offset_in_folio(folio, cur))) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -541,9 +546,8 @@ static noinline int add_ra_bio_pages(struct inode *inode,</div><div class='ctx'> 		 * subpage::readers and to unlock the page.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (fs_info-&gt;sectorsize &lt; PAGE_SIZE)</div><div class='del'>-			btrfs_subpage_start_reader(fs_info, page_folio(page),</div><div class='del'>-						   cur, add_size);</div><div class='del'>-		put_page(page);</div><div class='add'>+			btrfs_folio_set_lock(fs_info, folio, cur, add_size);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		cur += add_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -573,45 +577,47 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	unsigned long pflags;</div><div class='ctx'> 	int memstall = 0;</div><div class='del'>-	blk_status_t ret;</div><div class='del'>-	int ret2;</div><div class='add'>+	blk_status_t status;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* we need the actual starting offset of this extent in the file */</div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, file_offset, fs_info-&gt;sectorsize);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, file_offset, fs_info-&gt;sectorsize);</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (!em) {</div><div class='del'>-		ret = BLK_STS_IOERR;</div><div class='add'>+		status = BLK_STS_IOERR;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(extent_map_is_compressed(em));</div><div class='del'>-	compressed_len = em-&gt;block_len;</div><div class='add'>+	ASSERT(btrfs_extent_map_is_compressed(em));</div><div class='add'>+	compressed_len = em-&gt;disk_num_bytes;</div><div class='ctx'> </div><div class='ctx'> 	cb = alloc_compressed_bio(inode, file_offset, REQ_OP_READ,</div><div class='del'>-				  end_bbio_comprssed_read);</div><div class='add'>+				  end_bbio_compressed_read);</div><div class='ctx'> </div><div class='del'>-	cb-&gt;start = em-&gt;orig_start;</div><div class='add'>+	cb-&gt;start = em-&gt;start - em-&gt;offset;</div><div class='ctx'> 	em_len = em-&gt;len;</div><div class='ctx'> 	em_start = em-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	cb-&gt;len = bbio-&gt;bio.bi_iter.bi_size;</div><div class='ctx'> 	cb-&gt;compressed_len = compressed_len;</div><div class='del'>-	cb-&gt;compress_type = extent_map_compression(em);</div><div class='add'>+	cb-&gt;compress_type = btrfs_extent_map_compression(em);</div><div class='ctx'> 	cb-&gt;orig_bbio = bbio;</div><div class='add'>+	cb-&gt;bbio.csum_search_commit_root = bbio-&gt;csum_search_commit_root;</div><div class='ctx'> </div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	cb-&gt;nr_pages = DIV_ROUND_UP(compressed_len, PAGE_SIZE);</div><div class='del'>-	cb-&gt;compressed_pages = kcalloc(cb-&gt;nr_pages, sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	if (!cb-&gt;compressed_pages) {</div><div class='del'>-		ret = BLK_STS_RESOURCE;</div><div class='add'>+	cb-&gt;nr_folios = DIV_ROUND_UP(compressed_len, btrfs_min_folio_size(fs_info));</div><div class='add'>+	cb-&gt;compressed_folios = kcalloc(cb-&gt;nr_folios, sizeof(struct folio *), GFP_NOFS);</div><div class='add'>+	if (!cb-&gt;compressed_folios) {</div><div class='add'>+		status = BLK_STS_RESOURCE;</div><div class='ctx'> 		goto out_free_bio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret2 = btrfs_alloc_page_array(cb-&gt;nr_pages, cb-&gt;compressed_pages, 0);</div><div class='del'>-	if (ret2) {</div><div class='del'>-		ret = BLK_STS_RESOURCE;</div><div class='add'>+	ret = btrfs_alloc_folio_array(cb-&gt;nr_folios, fs_info-&gt;block_min_order,</div><div class='add'>+				      cb-&gt;compressed_folios);</div><div class='add'>+	if (ret) {</div><div class='add'>+		status = BLK_STS_RESOURCE;</div><div class='ctx'> 		goto out_free_compressed_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -621,20 +627,20 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)</div><div class='ctx'> 	/* include any pages we added in add_ra-bio_pages */</div><div class='ctx'> 	cb-&gt;len = bbio-&gt;bio.bi_iter.bi_size;</div><div class='ctx'> 	cb-&gt;bbio.bio.bi_iter.bi_sector = bbio-&gt;bio.bi_iter.bi_sector;</div><div class='del'>-	btrfs_add_compressed_bio_pages(cb);</div><div class='add'>+	btrfs_add_compressed_bio_folios(cb);</div><div class='ctx'> </div><div class='ctx'> 	if (memstall)</div><div class='ctx'> 		psi_memstall_leave(&amp;pflags);</div><div class='ctx'> </div><div class='del'>-	btrfs_submit_bio(&amp;cb-&gt;bbio, 0);</div><div class='add'>+	btrfs_submit_bbio(&amp;cb-&gt;bbio, 0);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_free_compressed_pages:</div><div class='del'>-	kfree(cb-&gt;compressed_pages);</div><div class='add'>+	kfree(cb-&gt;compressed_folios);</div><div class='ctx'> out_free_bio:</div><div class='ctx'> 	bio_put(&amp;cb-&gt;bbio.bio);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_bio_end_io(bbio, ret);</div><div class='add'>+	btrfs_bio_end_io(bbio, status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -684,8 +690,6 @@ struct heuristic_ws {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct workspace_manager heuristic_wsm;</div><div class='del'>-</div><div class='ctx'> static void free_heuristic_ws(struct list_head *ws)</div><div class='ctx'> {</div><div class='ctx'> 	struct heuristic_ws *workspace;</div><div class='hunk'>@@ -698,7 +702,7 @@ static void free_heuristic_ws(struct list_head *ws)</div><div class='ctx'> 	kfree(workspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct list_head *alloc_heuristic_ws(unsigned int level)</div><div class='add'>+static struct list_head *alloc_heuristic_ws(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct heuristic_ws *ws;</div><div class='ctx'> </div><div class='hunk'>@@ -725,11 +729,9 @@ fail:</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct btrfs_compress_op btrfs_heuristic_compress = {</div><div class='del'>-	.workspace_manager = &amp;heuristic_wsm,</div><div class='del'>-};</div><div class='add'>+const struct btrfs_compress_levels btrfs_heuristic_compress = { 0 };</div><div class='ctx'> </div><div class='del'>-static const struct btrfs_compress_op * const btrfs_compress_op[] = {</div><div class='add'>+static const struct btrfs_compress_levels * const btrfs_compress_levels[] = {</div><div class='ctx'> 	/* The heuristic is represented as compression type 0 */</div><div class='ctx'> 	&amp;btrfs_heuristic_compress,</div><div class='ctx'> 	&amp;btrfs_zlib_compress,</div><div class='hunk'>@@ -737,13 +739,13 @@ static const struct btrfs_compress_op * const btrfs_compress_op[] = {</div><div class='ctx'> 	&amp;btrfs_zstd_compress,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct list_head *alloc_workspace(int type, unsigned int level)</div><div class='add'>+static struct list_head *alloc_workspace(struct btrfs_fs_info *fs_info, int type, int level)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case BTRFS_COMPRESS_NONE: return alloc_heuristic_ws(level);</div><div class='del'>-	case BTRFS_COMPRESS_ZLIB: return zlib_alloc_workspace(level);</div><div class='del'>-	case BTRFS_COMPRESS_LZO:  return lzo_alloc_workspace(level);</div><div class='del'>-	case BTRFS_COMPRESS_ZSTD: return zstd_alloc_workspace(level);</div><div class='add'>+	case BTRFS_COMPRESS_NONE: return alloc_heuristic_ws(fs_info);</div><div class='add'>+	case BTRFS_COMPRESS_ZLIB: return zlib_alloc_workspace(fs_info, level);</div><div class='add'>+	case BTRFS_COMPRESS_LZO:  return lzo_alloc_workspace(fs_info);</div><div class='add'>+	case BTRFS_COMPRESS_ZSTD: return zstd_alloc_workspace(fs_info, level);</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This can't happen, the type is validated several times</div><div class='hunk'>@@ -769,44 +771,58 @@ static void free_workspace(int type, struct list_head *ws)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_init_workspace_manager(int type)</div><div class='add'>+static int alloc_workspace_manager(struct btrfs_fs_info *fs_info,</div><div class='add'>+				   enum btrfs_compression_type type)</div><div class='ctx'> {</div><div class='del'>-	struct workspace_manager *wsm;</div><div class='add'>+	struct workspace_manager *gwsm;</div><div class='ctx'> 	struct list_head *workspace;</div><div class='ctx'> </div><div class='del'>-	wsm = btrfs_compress_op[type]-&gt;workspace_manager;</div><div class='del'>-	INIT_LIST_HEAD(&amp;wsm-&gt;idle_ws);</div><div class='del'>-	spin_lock_init(&amp;wsm-&gt;ws_lock);</div><div class='del'>-	atomic_set(&amp;wsm-&gt;total_ws, 0);</div><div class='del'>-	init_waitqueue_head(&amp;wsm-&gt;ws_wait);</div><div class='add'>+	ASSERT(fs_info-&gt;compr_wsm[type] == NULL);</div><div class='add'>+	gwsm = kzalloc(sizeof(*gwsm), GFP_KERNEL);</div><div class='add'>+	if (!gwsm)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;gwsm-&gt;idle_ws);</div><div class='add'>+	spin_lock_init(&amp;gwsm-&gt;ws_lock);</div><div class='add'>+	atomic_set(&amp;gwsm-&gt;total_ws, 0);</div><div class='add'>+	init_waitqueue_head(&amp;gwsm-&gt;ws_wait);</div><div class='add'>+	fs_info-&gt;compr_wsm[type] = gwsm;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Preallocate one workspace for each compression type so we can</div><div class='ctx'> 	 * guarantee forward progress in the worst case</div><div class='ctx'> 	 */</div><div class='del'>-	workspace = alloc_workspace(type, 0);</div><div class='add'>+	workspace = alloc_workspace(fs_info, type, 0);</div><div class='ctx'> 	if (IS_ERR(workspace)) {</div><div class='del'>-		pr_warn(</div><div class='del'>-	"BTRFS: cannot preallocate compression workspace, will try later\n");</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='add'>+	"cannot preallocate compression workspace for %s, will try later",</div><div class='add'>+			   btrfs_compress_type2str(type));</div><div class='ctx'> 	} else {</div><div class='del'>-		atomic_set(&amp;wsm-&gt;total_ws, 1);</div><div class='del'>-		wsm-&gt;free_ws = 1;</div><div class='del'>-		list_add(workspace, &amp;wsm-&gt;idle_ws);</div><div class='add'>+		atomic_set(&amp;gwsm-&gt;total_ws, 1);</div><div class='add'>+		gwsm-&gt;free_ws = 1;</div><div class='add'>+		list_add(workspace, &amp;gwsm-&gt;idle_ws);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_cleanup_workspace_manager(int type)</div><div class='add'>+static void free_workspace_manager(struct btrfs_fs_info *fs_info,</div><div class='add'>+				   enum btrfs_compression_type type)</div><div class='ctx'> {</div><div class='del'>-	struct workspace_manager *wsman;</div><div class='ctx'> 	struct list_head *ws;</div><div class='add'>+	struct workspace_manager *gwsm = fs_info-&gt;compr_wsm[type];</div><div class='ctx'> </div><div class='del'>-	wsman = btrfs_compress_op[type]-&gt;workspace_manager;</div><div class='del'>-	while (!list_empty(&amp;wsman-&gt;idle_ws)) {</div><div class='del'>-		ws = wsman-&gt;idle_ws.next;</div><div class='add'>+	/* ZSTD uses its own workspace manager, should enter here. */</div><div class='add'>+	ASSERT(type != BTRFS_COMPRESS_ZSTD &amp;&amp; type &lt; BTRFS_NR_COMPRESS_TYPES);</div><div class='add'>+	if (!gwsm)</div><div class='add'>+		return;</div><div class='add'>+	fs_info-&gt;compr_wsm[type] = NULL;</div><div class='add'>+	while (!list_empty(&amp;gwsm-&gt;idle_ws)) {</div><div class='add'>+		ws = gwsm-&gt;idle_ws.next;</div><div class='ctx'> 		list_del(ws);</div><div class='ctx'> 		free_workspace(type, ws);</div><div class='del'>-		atomic_dec(&amp;wsman-&gt;total_ws);</div><div class='add'>+		atomic_dec(&amp;gwsm-&gt;total_ws);</div><div class='ctx'> 	}</div><div class='add'>+	kfree(gwsm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -815,9 +831,9 @@ static void btrfs_cleanup_workspace_manager(int type)</div><div class='ctx'>  * Preallocation makes a forward progress guarantees and we do not return</div><div class='ctx'>  * errors.</div><div class='ctx'>  */</div><div class='del'>-struct list_head *btrfs_get_workspace(int type, unsigned int level)</div><div class='add'>+struct list_head *btrfs_get_workspace(struct btrfs_fs_info *fs_info, int type, int level)</div><div class='ctx'> {</div><div class='del'>-	struct workspace_manager *wsm;</div><div class='add'>+	struct workspace_manager *wsm = fs_info-&gt;compr_wsm[type];</div><div class='ctx'> 	struct list_head *workspace;</div><div class='ctx'> 	int cpus = num_online_cpus();</div><div class='ctx'> 	unsigned nofs_flag;</div><div class='hunk'>@@ -827,7 +843,7 @@ struct list_head *btrfs_get_workspace(int type, unsigned int level)</div><div class='ctx'> 	wait_queue_head_t *ws_wait;</div><div class='ctx'> 	int *free_ws;</div><div class='ctx'> </div><div class='del'>-	wsm = btrfs_compress_op[type]-&gt;workspace_manager;</div><div class='add'>+	ASSERT(wsm);</div><div class='ctx'> 	idle_ws	 = &amp;wsm-&gt;idle_ws;</div><div class='ctx'> 	ws_lock	 = &amp;wsm-&gt;ws_lock;</div><div class='ctx'> 	total_ws = &amp;wsm-&gt;total_ws;</div><div class='hunk'>@@ -863,7 +879,7 @@ again:</div><div class='ctx'> 	 * context of btrfs_compress_bio/btrfs_compress_pages</div><div class='ctx'> 	 */</div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='del'>-	workspace = alloc_workspace(type, level);</div><div class='add'>+	workspace = alloc_workspace(fs_info, type, level);</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flag);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(workspace)) {</div><div class='hunk'>@@ -885,22 +901,22 @@ again:</div><div class='ctx'> 					/* once per minute */ 60 * HZ,</div><div class='ctx'> 					/* no burst */ 1);</div><div class='ctx'> </div><div class='del'>-			if (__ratelimit(&amp;_rs)) {</div><div class='del'>-				pr_warn("BTRFS: no compression workspaces, low memory, retrying\n");</div><div class='del'>-			}</div><div class='add'>+			if (__ratelimit(&amp;_rs))</div><div class='add'>+				btrfs_warn(fs_info,</div><div class='add'>+				"no compression workspaces, low memory, retrying");</div><div class='ctx'> 		}</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> 	return workspace;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct list_head *get_workspace(int type, int level)</div><div class='add'>+static struct list_head *get_workspace(struct btrfs_fs_info *fs_info, int type, int level)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case BTRFS_COMPRESS_NONE: return btrfs_get_workspace(type, level);</div><div class='del'>-	case BTRFS_COMPRESS_ZLIB: return zlib_get_workspace(level);</div><div class='del'>-	case BTRFS_COMPRESS_LZO:  return btrfs_get_workspace(type, level);</div><div class='del'>-	case BTRFS_COMPRESS_ZSTD: return zstd_get_workspace(level);</div><div class='add'>+	case BTRFS_COMPRESS_NONE: return btrfs_get_workspace(fs_info, type, level);</div><div class='add'>+	case BTRFS_COMPRESS_ZLIB: return zlib_get_workspace(fs_info, level);</div><div class='add'>+	case BTRFS_COMPRESS_LZO:  return btrfs_get_workspace(fs_info, type, level);</div><div class='add'>+	case BTRFS_COMPRESS_ZSTD: return zstd_get_workspace(fs_info, level);</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This can't happen, the type is validated several times</div><div class='hunk'>@@ -914,21 +930,21 @@ static struct list_head *get_workspace(int type, int level)</div><div class='ctx'>  * put a workspace struct back on the list or free it if we have enough</div><div class='ctx'>  * idle ones sitting around</div><div class='ctx'>  */</div><div class='del'>-void btrfs_put_workspace(int type, struct list_head *ws)</div><div class='add'>+void btrfs_put_workspace(struct btrfs_fs_info *fs_info, int type, struct list_head *ws)</div><div class='ctx'> {</div><div class='del'>-	struct workspace_manager *wsm;</div><div class='add'>+	struct workspace_manager *gwsm = fs_info-&gt;compr_wsm[type];</div><div class='ctx'> 	struct list_head *idle_ws;</div><div class='ctx'> 	spinlock_t *ws_lock;</div><div class='ctx'> 	atomic_t *total_ws;</div><div class='ctx'> 	wait_queue_head_t *ws_wait;</div><div class='ctx'> 	int *free_ws;</div><div class='ctx'> </div><div class='del'>-	wsm = btrfs_compress_op[type]-&gt;workspace_manager;</div><div class='del'>-	idle_ws	 = &amp;wsm-&gt;idle_ws;</div><div class='del'>-	ws_lock	 = &amp;wsm-&gt;ws_lock;</div><div class='del'>-	total_ws = &amp;wsm-&gt;total_ws;</div><div class='del'>-	ws_wait	 = &amp;wsm-&gt;ws_wait;</div><div class='del'>-	free_ws	 = &amp;wsm-&gt;free_ws;</div><div class='add'>+	ASSERT(gwsm);</div><div class='add'>+	idle_ws	 = &amp;gwsm-&gt;idle_ws;</div><div class='add'>+	ws_lock	 = &amp;gwsm-&gt;ws_lock;</div><div class='add'>+	total_ws = &amp;gwsm-&gt;total_ws;</div><div class='add'>+	ws_wait	 = &amp;gwsm-&gt;ws_wait;</div><div class='add'>+	free_ws	 = &amp;gwsm-&gt;free_ws;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(ws_lock);</div><div class='ctx'> 	if (*free_ws &lt;= num_online_cpus()) {</div><div class='hunk'>@@ -945,13 +961,13 @@ wake:</div><div class='ctx'> 	cond_wake_up(ws_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void put_workspace(int type, struct list_head *ws)</div><div class='add'>+static void put_workspace(struct btrfs_fs_info *fs_info, int type, struct list_head *ws)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case BTRFS_COMPRESS_NONE: return btrfs_put_workspace(type, ws);</div><div class='del'>-	case BTRFS_COMPRESS_ZLIB: return btrfs_put_workspace(type, ws);</div><div class='del'>-	case BTRFS_COMPRESS_LZO:  return btrfs_put_workspace(type, ws);</div><div class='del'>-	case BTRFS_COMPRESS_ZSTD: return zstd_put_workspace(ws);</div><div class='add'>+	case BTRFS_COMPRESS_NONE: return btrfs_put_workspace(fs_info, type, ws);</div><div class='add'>+	case BTRFS_COMPRESS_ZLIB: return btrfs_put_workspace(fs_info, type, ws);</div><div class='add'>+	case BTRFS_COMPRESS_LZO:  return btrfs_put_workspace(fs_info, type, ws);</div><div class='add'>+	case BTRFS_COMPRESS_ZSTD: return zstd_put_workspace(fs_info, ws);</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This can't happen, the type is validated several times</div><div class='hunk'>@@ -965,19 +981,52 @@ static void put_workspace(int type, struct list_head *ws)</div><div class='ctx'>  * Adjust @level according to the limits of the compression algorithm or</div><div class='ctx'>  * fallback to default</div><div class='ctx'>  */</div><div class='del'>-static unsigned int btrfs_compress_set_level(int type, unsigned level)</div><div class='add'>+static int btrfs_compress_set_level(unsigned int type, int level)</div><div class='ctx'> {</div><div class='del'>-	const struct btrfs_compress_op *ops = btrfs_compress_op[type];</div><div class='add'>+	const struct btrfs_compress_levels *levels = btrfs_compress_levels[type];</div><div class='ctx'> </div><div class='ctx'> 	if (level == 0)</div><div class='del'>-		level = ops-&gt;default_level;</div><div class='add'>+		level = levels-&gt;default_level;</div><div class='ctx'> 	else</div><div class='del'>-		level = min(level, ops-&gt;max_level);</div><div class='add'>+		level = clamp(level, levels-&gt;min_level, levels-&gt;max_level);</div><div class='ctx'> </div><div class='ctx'> 	return level;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Check whether the @level is within the valid range for the given type.</div><div class='add'>+ */</div><div class='add'>+bool btrfs_compress_level_valid(unsigned int type, int level)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_compress_levels *levels = btrfs_compress_levels[type];</div><div class='add'>+</div><div class='add'>+	return levels-&gt;min_level &lt;= level &amp;&amp; level &lt;= levels-&gt;max_level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wrapper around find_get_page(), with extra error message. */</div><div class='add'>+int btrfs_compress_filemap_get_folio(struct address_space *mapping, u64 start,</div><div class='add'>+				     struct folio **in_folio_ret)</div><div class='add'>+{</div><div class='add'>+	struct folio *in_folio;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The compressed write path should have the folio locked already, thus</div><div class='add'>+	 * we only need to grab one reference.</div><div class='add'>+	 */</div><div class='add'>+	in_folio = filemap_get_folio(mapping, start &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	if (IS_ERR(in_folio)) {</div><div class='add'>+		struct btrfs_inode *inode = BTRFS_I(mapping-&gt;host);</div><div class='add'>+</div><div class='add'>+		btrfs_crit(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"failed to get page cache, root %lld ino %llu file offset %llu",</div><div class='add'>+			   btrfs_root_id(inode-&gt;root), btrfs_ino(inode), start);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	*in_folio_ret = in_folio;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Given an address space and start and length, compress the bytes into @pages</div><div class='ctx'>  * that are allocated on demand.</div><div class='ctx'>  *</div><div class='hunk'>@@ -986,45 +1035,46 @@ static unsigned int btrfs_compress_set_level(int type, unsigned level)</div><div class='ctx'>  * - compression algo are 0-3</div><div class='ctx'>  * - the level are bits 4-7</div><div class='ctx'>  *</div><div class='del'>- * @out_pages is an in/out parameter, holds maximum number of pages to allocate</div><div class='del'>- * and returns number of actually allocated pages</div><div class='add'>+ * @out_folios is an in/out parameter, holds maximum number of folios to allocate</div><div class='add'>+ * and returns number of actually allocated folios</div><div class='ctx'>  *</div><div class='ctx'>  * @total_in is used to return the number of bytes actually read.  It</div><div class='ctx'>  * may be smaller than the input length if we had to exit early because we</div><div class='del'>- * ran out of room in the pages array or because we cross the</div><div class='add'>+ * ran out of room in the folios array or because we cross the</div><div class='ctx'>  * max_out threshold.</div><div class='ctx'>  *</div><div class='ctx'>  * @total_out is an in/out parameter, must be set to the input length and will</div><div class='ctx'>  * be also used to return the total number of compressed bytes</div><div class='ctx'>  */</div><div class='del'>-int btrfs_compress_pages(unsigned int type_level, struct address_space *mapping,</div><div class='del'>-			 u64 start, struct page **pages,</div><div class='del'>-			 unsigned long *out_pages,</div><div class='del'>-			 unsigned long *total_in,</div><div class='del'>-			 unsigned long *total_out)</div><div class='add'>+int btrfs_compress_folios(unsigned int type, int level, struct btrfs_inode *inode,</div><div class='add'>+			 u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='add'>+			 unsigned long *total_in, unsigned long *total_out)</div><div class='ctx'> {</div><div class='del'>-	int type = btrfs_compress_type(type_level);</div><div class='del'>-	int level = btrfs_compress_level(type_level);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	const unsigned long orig_len = *total_out;</div><div class='ctx'> 	struct list_head *workspace;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	level = btrfs_compress_set_level(type, level);</div><div class='del'>-	workspace = get_workspace(type, level);</div><div class='del'>-	ret = compression_compress_pages(type, workspace, mapping, start, pages,</div><div class='del'>-					 out_pages, total_in, total_out);</div><div class='del'>-	put_workspace(type, workspace);</div><div class='add'>+	workspace = get_workspace(fs_info, type, level);</div><div class='add'>+	ret = compression_compress_pages(type, workspace, inode, start, folios,</div><div class='add'>+					 out_folios, total_in, total_out);</div><div class='add'>+	/* The total read-in bytes should be no larger than the input. */</div><div class='add'>+	ASSERT(*total_in &lt;= orig_len);</div><div class='add'>+	put_workspace(fs_info, type, workspace);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_decompress_bio(struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = cb_to_fs_info(cb);</div><div class='ctx'> 	struct list_head *workspace;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int type = cb-&gt;compress_type;</div><div class='ctx'> </div><div class='del'>-	workspace = get_workspace(type, 0);</div><div class='add'>+	workspace = get_workspace(fs_info, type, 0);</div><div class='ctx'> 	ret = compression_decompress_bio(workspace, cb);</div><div class='del'>-	put_workspace(type, workspace);</div><div class='add'>+	put_workspace(fs_info, type, workspace);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		zero_fill_bio(&amp;cb-&gt;orig_bbio-&gt;bio);</div><div class='hunk'>@@ -1034,22 +1084,62 @@ static int btrfs_decompress_bio(struct compressed_bio *cb)</div><div class='ctx'> /*</div><div class='ctx'>  * a less complex decompression routine.  Our compressed data fits in a</div><div class='ctx'>  * single page, and we want to read a single page out of it.</div><div class='del'>- * start_byte tells us the offset into the compressed data we're interested in</div><div class='add'>+ * dest_pgoff tells us the offset into the destination folio where we write the</div><div class='add'>+ * decompressed data.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_decompress(int type, const u8 *data_in, struct page *dest_page,</div><div class='del'>-		     unsigned long start_byte, size_t srclen, size_t destlen)</div><div class='add'>+int btrfs_decompress(int type, const u8 *data_in, struct folio *dest_folio,</div><div class='add'>+		     unsigned long dest_pgoff, size_t srclen, size_t destlen)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(dest_folio);</div><div class='ctx'> 	struct list_head *workspace;</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	workspace = get_workspace(type, 0);</div><div class='del'>-	ret = compression_decompress(type, workspace, data_in, dest_page,</div><div class='del'>-				     start_byte, srclen, destlen);</div><div class='del'>-	put_workspace(type, workspace);</div><div class='add'>+	/*</div><div class='add'>+	 * The full destination folio range should not exceed the folio size.</div><div class='add'>+	 * And the @destlen should not exceed sectorsize, as this is only called for</div><div class='add'>+	 * inline file extents, which should not exceed sectorsize.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(dest_pgoff + destlen &lt;= folio_size(dest_folio) &amp;&amp; destlen &lt;= sectorsize);</div><div class='add'>+</div><div class='add'>+	workspace = get_workspace(fs_info, type, 0);</div><div class='add'>+	ret = compression_decompress(type, workspace, data_in, dest_folio,</div><div class='add'>+				     dest_pgoff, srclen, destlen);</div><div class='add'>+	put_workspace(fs_info, type, workspace);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int btrfs_alloc_compress_wsm(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = alloc_workspace_manager(fs_info, BTRFS_COMPRESS_NONE);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = alloc_workspace_manager(fs_info, BTRFS_COMPRESS_ZLIB);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = alloc_workspace_manager(fs_info, BTRFS_COMPRESS_LZO);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	ret = zstd_alloc_workspace_manager(fs_info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	btrfs_free_compress_wsm(fs_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_free_compress_wsm(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	free_workspace_manager(fs_info, BTRFS_COMPRESS_NONE);</div><div class='add'>+	free_workspace_manager(fs_info, BTRFS_COMPRESS_ZLIB);</div><div class='add'>+	free_workspace_manager(fs_info, BTRFS_COMPRESS_LZO);</div><div class='add'>+	zstd_free_workspace_manager(fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init btrfs_init_compress(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (bioset_init(&amp;btrfs_compressed_bioset, BIO_POOL_SIZE,</div><div class='hunk'>@@ -1061,11 +1151,6 @@ int __init btrfs_init_compress(void)</div><div class='ctx'> 	if (!compr_pool.shrinker)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	btrfs_init_workspace_manager(BTRFS_COMPRESS_NONE);</div><div class='del'>-	btrfs_init_workspace_manager(BTRFS_COMPRESS_ZLIB);</div><div class='del'>-	btrfs_init_workspace_manager(BTRFS_COMPRESS_LZO);</div><div class='del'>-	zstd_init_workspace_manager();</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;compr_pool.lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;compr_pool.list);</div><div class='ctx'> 	compr_pool.count = 0;</div><div class='hunk'>@@ -1086,14 +1171,26 @@ void __cold btrfs_exit_compress(void)</div><div class='ctx'> 	btrfs_compr_pool_scan(NULL, NULL);</div><div class='ctx'> 	shrinker_free(compr_pool.shrinker);</div><div class='ctx'> </div><div class='del'>-	btrfs_cleanup_workspace_manager(BTRFS_COMPRESS_NONE);</div><div class='del'>-	btrfs_cleanup_workspace_manager(BTRFS_COMPRESS_ZLIB);</div><div class='del'>-	btrfs_cleanup_workspace_manager(BTRFS_COMPRESS_LZO);</div><div class='del'>-	zstd_cleanup_workspace_manager();</div><div class='ctx'> 	bioset_exit(&amp;btrfs_compressed_bioset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The bvec is a single page bvec from a bio that contains folios from a filemap.</div><div class='add'>+ *</div><div class='add'>+ * Since the folio may be a large one, and if the bv_page is not a head page of</div><div class='add'>+ * a large folio, then page-&gt;index is unreliable.</div><div class='add'>+ *</div><div class='add'>+ * Thus we need this helper to grab the proper file offset.</div><div class='add'>+ */</div><div class='add'>+static u64 file_offset_from_bvec(const struct bio_vec *bvec)</div><div class='add'>+{</div><div class='add'>+	const struct page *page = bvec-&gt;bv_page;</div><div class='add'>+	const struct folio *folio = page_folio(page);</div><div class='add'>+</div><div class='add'>+	return (page_pgoff(folio, page) &lt;&lt; PAGE_SHIFT) + bvec-&gt;bv_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Copy decompressed data from working buffer to pages.</div><div class='ctx'>  *</div><div class='ctx'>  * @buf:		The decompressed data buffer</div><div class='hunk'>@@ -1138,13 +1235,14 @@ int btrfs_decompress_buf2page(const char *buf, u32 buf_len,</div><div class='ctx'> 		u32 copy_start;</div><div class='ctx'> 		/* Offset inside the full decompressed extent */</div><div class='ctx'> 		u32 bvec_offset;</div><div class='add'>+		void *kaddr;</div><div class='ctx'> </div><div class='ctx'> 		bvec = bio_iter_iovec(orig_bio, orig_bio-&gt;bi_iter);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * cb-&gt;start may underflow, but subtracting that value can still</div><div class='ctx'> 		 * give us correct offset inside the full decompressed extent.</div><div class='ctx'> 		 */</div><div class='del'>-		bvec_offset = page_offset(bvec.bv_page) + bvec.bv_offset - cb-&gt;start;</div><div class='add'>+		bvec_offset = file_offset_from_bvec(&amp;bvec) - cb-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		/* Haven't reached the bvec range, exit */</div><div class='ctx'> 		if (decompressed + buf_len &lt;= bvec_offset)</div><div class='hunk'>@@ -1160,10 +1258,12 @@ int btrfs_decompress_buf2page(const char *buf, u32 buf_len,</div><div class='ctx'> 		 * @buf + @buf_len.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ASSERT(copy_start - decompressed &lt; buf_len);</div><div class='del'>-		memcpy_to_page(bvec.bv_page, bvec.bv_offset,</div><div class='del'>-			       buf + copy_start - decompressed, copy_len);</div><div class='del'>-		cur_offset += copy_len;</div><div class='ctx'> </div><div class='add'>+		kaddr = bvec_kmap_local(&amp;bvec);</div><div class='add'>+		memcpy(kaddr, buf + copy_start - decompressed, copy_len);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='add'>+</div><div class='add'>+		cur_offset += copy_len;</div><div class='ctx'> 		bio_advance(orig_bio, copy_len);</div><div class='ctx'> 		/* Finished the bio */</div><div class='ctx'> 		if (!orig_bio-&gt;bi_iter.bi_size)</div><div class='hunk'>@@ -1193,7 +1293,7 @@ int btrfs_decompress_buf2page(const char *buf, u32 buf_len,</div><div class='ctx'> #define ENTROPY_LVL_HIGH		(80)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * For increasead precision in shannon_entropy calculation,</div><div class='add'>+ * For increased precision in shannon_entropy calculation,</div><div class='ctx'>  * let's do pow(n, M) to save more digits after comma:</div><div class='ctx'>  *</div><div class='ctx'>  * - maximum int bit length is 64</div><div class='hunk'>@@ -1419,7 +1519,7 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end,</div><div class='ctx'> 				     struct heuristic_ws *ws)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	u64 index, index_end;</div><div class='add'>+	pgoff_t index, index_end;</div><div class='ctx'> 	u32 i, curr_sample_pos;</div><div class='ctx'> 	u8 *in_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1470,11 +1570,6 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end,</div><div class='ctx'> /*</div><div class='ctx'>  * Compression heuristic.</div><div class='ctx'>  *</div><div class='del'>- * For now is's a naive and optimistic 'return true', we'll extend the logic to</div><div class='del'>- * quickly (compared to direct compression) detect data characteristics</div><div class='del'>- * (compressible/incompressible) to avoid wasting CPU time on incompressible</div><div class='del'>- * data.</div><div class='del'>- *</div><div class='ctx'>  * The following types of analysis can be performed:</div><div class='ctx'>  * - detect mostly zero data</div><div class='ctx'>  * - detect data with low "byte set" size (text, etc)</div><div class='hunk'>@@ -1482,9 +1577,10 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end,</div><div class='ctx'>  *</div><div class='ctx'>  * Return non-zero if the compression should be done, 0 otherwise.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end)</div><div class='add'>+int btrfs_compress_heuristic(struct btrfs_inode *inode, u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *ws_list = get_workspace(0, 0);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct list_head *ws_list = get_workspace(fs_info, 0, 0);</div><div class='ctx'> 	struct heuristic_ws *ws;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	u8 byte;</div><div class='hunk'>@@ -1492,7 +1588,7 @@ int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end)</div><div class='ctx'> </div><div class='ctx'> 	ws = list_entry(ws_list, struct heuristic_ws, list);</div><div class='ctx'> </div><div class='del'>-	heuristic_collect_sample(inode, start, end, ws);</div><div class='add'>+	heuristic_collect_sample(&amp;inode-&gt;vfs_inode, start, end, ws);</div><div class='ctx'> </div><div class='ctx'> 	if (sample_repeated_patterns(ws)) {</div><div class='ctx'> 		ret = 1;</div><div class='hunk'>@@ -1553,29 +1649,34 @@ int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	put_workspace(0, ws_list);</div><div class='add'>+	put_workspace(fs_info, 0, ws_list);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Convert the compression suffix (eg. after "zlib" starting with ":") to</div><div class='del'>- * level, unrecognized string will set the default level</div><div class='add'>+ * Convert the compression suffix (eg. after "zlib" starting with ":") to level.</div><div class='add'>+ *</div><div class='add'>+ * If the resulting level exceeds the algo's supported levels, it will be clamped.</div><div class='add'>+ *</div><div class='add'>+ * Return &lt;0 if no valid string can be found.</div><div class='add'>+ * Return 0 if everything is fine.</div><div class='ctx'>  */</div><div class='del'>-unsigned int btrfs_compress_str2level(unsigned int type, const char *str)</div><div class='add'>+int btrfs_compress_str2level(unsigned int type, const char *str, int *level_ret)</div><div class='ctx'> {</div><div class='del'>-	unsigned int level = 0;</div><div class='add'>+	int level = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!type)</div><div class='add'>+	if (!type) {</div><div class='add'>+		*level_ret = btrfs_compress_set_level(type, level);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (str[0] == ':') {</div><div class='del'>-		ret = kstrtouint(str + 1, 10, &amp;level);</div><div class='add'>+		ret = kstrtoint(str + 1, 10, &amp;level);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			level = 0;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	level = btrfs_compress_set_level(type, level);</div><div class='del'>-</div><div class='del'>-	return level;</div><div class='add'>+	*level_ret = btrfs_compress_set_level(type, level);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h<br/>index 93cc92974dee..e0228017e861 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/compression.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/compression.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/compression.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/compression.h</a></div><div class='hunk'>@@ -7,8 +7,17 @@</div><div class='ctx'> #define BTRFS_COMPRESSION_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include "bio.h"</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "btrfs_inode.h"</div><div class='ctx'> </div><div class='add'>+struct address_space;</div><div class='add'>+struct inode;</div><div class='ctx'> struct btrfs_inode;</div><div class='ctx'> struct btrfs_ordered_extent;</div><div class='ctx'> </div><div class='hunk'>@@ -32,14 +41,12 @@ static_assert((BTRFS_MAX_COMPRESSED % PAGE_SIZE) == 0);</div><div class='ctx'> </div><div class='ctx'> #define	BTRFS_ZLIB_DEFAULT_LEVEL		3</div><div class='ctx'> </div><div class='del'>-struct page;</div><div class='del'>-</div><div class='ctx'> struct compressed_bio {</div><div class='del'>-	/* Number of compressed pages in the array */</div><div class='del'>-	unsigned int nr_pages;</div><div class='add'>+	/* Number of compressed folios in the array. */</div><div class='add'>+	unsigned int nr_folios;</div><div class='ctx'> </div><div class='del'>-	/* the pages with the compressed data on them */</div><div class='del'>-	struct page **compressed_pages;</div><div class='add'>+	/* The folios with the compressed data on them. */</div><div class='add'>+	struct folio **compressed_folios;</div><div class='ctx'> </div><div class='ctx'> 	/* starting offset in the inode for our pages */</div><div class='ctx'> 	u64 start;</div><div class='hunk'>@@ -56,58 +63,52 @@ struct compressed_bio {</div><div class='ctx'> 	/* Whether this is a write for writeback. */</div><div class='ctx'> 	bool writeback;</div><div class='ctx'> </div><div class='del'>-	union {</div><div class='del'>-		/* For reads, this is the bio we are copying the data into */</div><div class='del'>-		struct btrfs_bio *orig_bbio;</div><div class='del'>-		struct work_struct write_end_work;</div><div class='del'>-	};</div><div class='add'>+	/* For reads, this is the bio we are copying the data into. */</div><div class='add'>+	struct btrfs_bio *orig_bbio;</div><div class='ctx'> </div><div class='ctx'> 	/* Must be last. */</div><div class='ctx'> 	struct btrfs_bio bbio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline unsigned int btrfs_compress_type(unsigned int type_level)</div><div class='add'>+static inline struct btrfs_fs_info *cb_to_fs_info(const struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='del'>-	return (type_level &amp; 0xF);</div><div class='add'>+	return cb-&gt;bbio.inode-&gt;root-&gt;fs_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int btrfs_compress_level(unsigned int type_level)</div><div class='add'>+/* @range_end must be exclusive. */</div><div class='add'>+static inline u32 btrfs_calc_input_length(struct folio *folio, u64 range_end, u64 cur)</div><div class='ctx'> {</div><div class='del'>-	return ((type_level &amp; 0xF0) &gt;&gt; 4);</div><div class='add'>+	/* @cur must be inside the folio. */</div><div class='add'>+	ASSERT(folio_pos(folio) &lt;= cur);</div><div class='add'>+	ASSERT(cur &lt; folio_next_pos(folio));</div><div class='add'>+	return umin(range_end, folio_next_pos(folio)) - cur;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int btrfs_alloc_compress_wsm(struct btrfs_fs_info *fs_info);</div><div class='add'>+void btrfs_free_compress_wsm(struct btrfs_fs_info *fs_info);</div><div class='add'>+</div><div class='ctx'> int __init btrfs_init_compress(void);</div><div class='ctx'> void __cold btrfs_exit_compress(void);</div><div class='ctx'> </div><div class='del'>-int btrfs_compress_pages(unsigned int type_level, struct address_space *mapping,</div><div class='del'>-			 u64 start, struct page **pages,</div><div class='del'>-			 unsigned long *out_pages,</div><div class='del'>-			 unsigned long *total_in,</div><div class='del'>-			 unsigned long *total_out);</div><div class='del'>-int btrfs_decompress(int type, const u8 *data_in, struct page *dest_page,</div><div class='del'>-		     unsigned long start_byte, size_t srclen, size_t destlen);</div><div class='add'>+bool btrfs_compress_level_valid(unsigned int type, int level);</div><div class='add'>+int btrfs_compress_folios(unsigned int type, int level, struct btrfs_inode *inode,</div><div class='add'>+			  u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='add'>+			 unsigned long *total_in, unsigned long *total_out);</div><div class='add'>+int btrfs_decompress(int type, const u8 *data_in, struct folio *dest_folio,</div><div class='add'>+		     unsigned long dest_pgoff, size_t srclen, size_t destlen);</div><div class='ctx'> int btrfs_decompress_buf2page(const char *buf, u32 buf_len,</div><div class='ctx'> 			      struct compressed_bio *cb, u32 decompressed);</div><div class='ctx'> </div><div class='ctx'> void btrfs_submit_compressed_write(struct btrfs_ordered_extent *ordered,</div><div class='del'>-				  struct page **compressed_pages,</div><div class='del'>-				  unsigned int nr_pages,</div><div class='del'>-				  blk_opf_t write_flags,</div><div class='del'>-				  bool writeback);</div><div class='add'>+				   struct folio **compressed_folios,</div><div class='add'>+				   unsigned int nr_folios, blk_opf_t write_flags,</div><div class='add'>+				   bool writeback);</div><div class='ctx'> void btrfs_submit_compressed_read(struct btrfs_bio *bbio);</div><div class='ctx'> </div><div class='del'>-unsigned int btrfs_compress_str2level(unsigned int type, const char *str);</div><div class='add'>+int btrfs_compress_str2level(unsigned int type, const char *str, int *level_ret);</div><div class='ctx'> </div><div class='del'>-struct page *btrfs_alloc_compr_page(void);</div><div class='del'>-void btrfs_free_compr_page(struct page *page);</div><div class='del'>-</div><div class='del'>-enum btrfs_compression_type {</div><div class='del'>-	BTRFS_COMPRESS_NONE  = 0,</div><div class='del'>-	BTRFS_COMPRESS_ZLIB  = 1,</div><div class='del'>-	BTRFS_COMPRESS_LZO   = 2,</div><div class='del'>-	BTRFS_COMPRESS_ZSTD  = 3,</div><div class='del'>-	BTRFS_NR_COMPRESS_TYPES = 4,</div><div class='del'>-};</div><div class='add'>+struct folio *btrfs_alloc_compr_folio(struct btrfs_fs_info *fs_info);</div><div class='add'>+void btrfs_free_compr_folio(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> struct workspace_manager {</div><div class='ctx'> 	struct list_head idle_ws;</div><div class='hunk'>@@ -120,62 +121,65 @@ struct workspace_manager {</div><div class='ctx'> 	wait_queue_head_t ws_wait;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct list_head *btrfs_get_workspace(int type, unsigned int level);</div><div class='del'>-void btrfs_put_workspace(int type, struct list_head *ws);</div><div class='add'>+struct list_head *btrfs_get_workspace(struct btrfs_fs_info *fs_info, int type, int level);</div><div class='add'>+void btrfs_put_workspace(struct btrfs_fs_info *fs_info, int type, struct list_head *ws);</div><div class='ctx'> </div><div class='del'>-struct btrfs_compress_op {</div><div class='del'>-	struct workspace_manager *workspace_manager;</div><div class='add'>+struct btrfs_compress_levels {</div><div class='ctx'> 	/* Maximum level supported by the compression algorithm */</div><div class='del'>-	unsigned int max_level;</div><div class='del'>-	unsigned int default_level;</div><div class='add'>+	int min_level;</div><div class='add'>+	int max_level;</div><div class='add'>+	int default_level;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The heuristic workspaces are managed via the 0th workspace manager */</div><div class='ctx'> #define BTRFS_NR_WORKSPACE_MANAGERS	BTRFS_NR_COMPRESS_TYPES</div><div class='ctx'> </div><div class='del'>-extern const struct btrfs_compress_op btrfs_heuristic_compress;</div><div class='del'>-extern const struct btrfs_compress_op btrfs_zlib_compress;</div><div class='del'>-extern const struct btrfs_compress_op btrfs_lzo_compress;</div><div class='del'>-extern const struct btrfs_compress_op btrfs_zstd_compress;</div><div class='add'>+extern const struct btrfs_compress_levels btrfs_heuristic_compress;</div><div class='add'>+extern const struct btrfs_compress_levels btrfs_zlib_compress;</div><div class='add'>+extern const struct btrfs_compress_levels btrfs_lzo_compress;</div><div class='add'>+extern const struct btrfs_compress_levels btrfs_zstd_compress;</div><div class='ctx'> </div><div class='ctx'> const char* btrfs_compress_type2str(enum btrfs_compression_type type);</div><div class='ctx'> bool btrfs_compress_is_valid_type(const char *str, size_t len);</div><div class='ctx'> </div><div class='del'>-int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end);</div><div class='add'>+int btrfs_compress_heuristic(struct btrfs_inode *inode, u64 start, u64 end);</div><div class='add'>+</div><div class='add'>+int btrfs_compress_filemap_get_folio(struct address_space *mapping, u64 start,</div><div class='add'>+				     struct folio **in_folio_ret);</div><div class='ctx'> </div><div class='del'>-int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='del'>-		u64 start, struct page **pages, unsigned long *out_pages,</div><div class='add'>+int zlib_compress_folios(struct list_head *ws, struct btrfs_inode *inode,</div><div class='add'>+			 u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='ctx'> 		unsigned long *total_in, unsigned long *total_out);</div><div class='ctx'> int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb);</div><div class='ctx'> int zlib_decompress(struct list_head *ws, const u8 *data_in,</div><div class='del'>-		struct page *dest_page, unsigned long start_byte, size_t srclen,</div><div class='add'>+		struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,</div><div class='ctx'> 		size_t destlen);</div><div class='del'>-struct list_head *zlib_alloc_workspace(unsigned int level);</div><div class='add'>+struct list_head *zlib_alloc_workspace(struct btrfs_fs_info *fs_info, unsigned int level);</div><div class='ctx'> void zlib_free_workspace(struct list_head *ws);</div><div class='del'>-struct list_head *zlib_get_workspace(unsigned int level);</div><div class='add'>+struct list_head *zlib_get_workspace(struct btrfs_fs_info *fs_info, unsigned int level);</div><div class='ctx'> </div><div class='del'>-int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='del'>-		u64 start, struct page **pages, unsigned long *out_pages,</div><div class='add'>+int lzo_compress_folios(struct list_head *ws, struct btrfs_inode *inode,</div><div class='add'>+			u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='ctx'> 		unsigned long *total_in, unsigned long *total_out);</div><div class='ctx'> int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb);</div><div class='ctx'> int lzo_decompress(struct list_head *ws, const u8 *data_in,</div><div class='del'>-		struct page *dest_page, unsigned long start_byte, size_t srclen,</div><div class='add'>+		struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,</div><div class='ctx'> 		size_t destlen);</div><div class='del'>-struct list_head *lzo_alloc_workspace(unsigned int level);</div><div class='add'>+struct list_head *lzo_alloc_workspace(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void lzo_free_workspace(struct list_head *ws);</div><div class='ctx'> </div><div class='del'>-int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='del'>-		u64 start, struct page **pages, unsigned long *out_pages,</div><div class='add'>+int zstd_compress_folios(struct list_head *ws, struct btrfs_inode *inode,</div><div class='add'>+			 u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='ctx'> 		unsigned long *total_in, unsigned long *total_out);</div><div class='ctx'> int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb);</div><div class='ctx'> int zstd_decompress(struct list_head *ws, const u8 *data_in,</div><div class='del'>-		struct page *dest_page, unsigned long start_byte, size_t srclen,</div><div class='add'>+		struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,</div><div class='ctx'> 		size_t destlen);</div><div class='del'>-void zstd_init_workspace_manager(void);</div><div class='del'>-void zstd_cleanup_workspace_manager(void);</div><div class='del'>-struct list_head *zstd_alloc_workspace(unsigned int level);</div><div class='add'>+int zstd_alloc_workspace_manager(struct btrfs_fs_info *fs_info);</div><div class='add'>+void zstd_free_workspace_manager(struct btrfs_fs_info *fs_info);</div><div class='add'>+struct list_head *zstd_alloc_workspace(struct btrfs_fs_info *fs_info, int level);</div><div class='ctx'> void zstd_free_workspace(struct list_head *ws);</div><div class='del'>-struct list_head *zstd_get_workspace(unsigned int level);</div><div class='del'>-void zstd_put_workspace(struct list_head *ws);</div><div class='add'>+struct list_head *zstd_get_workspace(struct btrfs_fs_info *fs_info, int level);</div><div class='add'>+void zstd_put_workspace(struct btrfs_fs_info *fs_info, struct list_head *ws);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c<br/>index e65e012bac55..a48b4befbee7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ctree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ctree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ctree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ctree.c</a></div><div class='hunk'>@@ -30,26 +30,13 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 		      *root, struct btrfs_path *path, int level);</div><div class='ctx'> static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		      const struct btrfs_key *ins_key, struct btrfs_path *path,</div><div class='del'>-		      int data_size, int extend);</div><div class='add'>+		      int data_size, bool extend);</div><div class='ctx'> static int push_node_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  struct extent_buffer *dst,</div><div class='del'>-			  struct extent_buffer *src, int empty);</div><div class='add'>+			  struct extent_buffer *src, bool empty);</div><div class='ctx'> static int balance_node_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      struct extent_buffer *dst_buf,</div><div class='ctx'> 			      struct extent_buffer *src_buf);</div><div class='del'>-</div><div class='del'>-static const struct btrfs_csums {</div><div class='del'>-	u16		size;</div><div class='del'>-	const char	name[10];</div><div class='del'>-	const char	driver[12];</div><div class='del'>-} btrfs_csums[] = {</div><div class='del'>-	[BTRFS_CSUM_TYPE_CRC32] = { .size = 4, .name = "crc32c" },</div><div class='del'>-	[BTRFS_CSUM_TYPE_XXHASH] = { .size = 8, .name = "xxhash64" },</div><div class='del'>-	[BTRFS_CSUM_TYPE_SHA256] = { .size = 32, .name = "sha256" },</div><div class='del'>-	[BTRFS_CSUM_TYPE_BLAKE2] = { .size = 32, .name = "blake2b",</div><div class='del'>-				     .driver = "blake2b-256" },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The leaf data grows from end-to-front in the node.  this returns the address</div><div class='ctx'>  * of the start of the last item, which is the stop of the leaf data stack.</div><div class='hunk'>@@ -148,44 +135,6 @@ static inline void copy_leaf_items(const struct extent_buffer *dst,</div><div class='ctx'> 			      nr_items * sizeof(struct btrfs_item));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This exists for btrfs-progs usages. */</div><div class='del'>-u16 btrfs_csum_type_size(u16 type)</div><div class='del'>-{</div><div class='del'>-	return btrfs_csums[type].size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int btrfs_super_csum_size(const struct btrfs_super_block *s)</div><div class='del'>-{</div><div class='del'>-	u16 t = btrfs_super_csum_type(s);</div><div class='del'>-	/*</div><div class='del'>-	 * csum type is validated at mount time</div><div class='del'>-	 */</div><div class='del'>-	return btrfs_csum_type_size(t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *btrfs_super_csum_name(u16 csum_type)</div><div class='del'>-{</div><div class='del'>-	/* csum type is validated at mount time */</div><div class='del'>-	return btrfs_csums[csum_type].name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return driver name if defined, otherwise the name that's also a valid driver</div><div class='del'>- * name</div><div class='del'>- */</div><div class='del'>-const char *btrfs_super_csum_driver(u16 csum_type)</div><div class='del'>-{</div><div class='del'>-	/* csum type is validated at mount time */</div><div class='del'>-	return btrfs_csums[csum_type].driver[0] ?</div><div class='del'>-		btrfs_csums[csum_type].driver :</div><div class='del'>-		btrfs_csums[csum_type].name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t __attribute_const__ btrfs_get_num_csums(void)</div><div class='del'>-{</div><div class='del'>-	return ARRAY_SIZE(btrfs_csums);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct btrfs_path *btrfs_alloc_path(void)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='hunk'>@@ -226,22 +175,6 @@ noinline void btrfs_release_path(struct btrfs_path *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We want the transaction abort to print stack trace only for errors where the</div><div class='del'>- * cause could be a bug, eg. due to ENOSPC, and not for common errors that are</div><div class='del'>- * caused by external factors.</div><div class='del'>- */</div><div class='del'>-bool __cold abort_should_print_stack(int error)</div><div class='del'>-{</div><div class='del'>-	switch (error) {</div><div class='del'>-	case -EIO:</div><div class='del'>-	case -EROFS:</div><div class='del'>-	case -ENOMEM:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * safely gets a reference on the root node of a tree.  A lock</div><div class='ctx'>  * is not taken, so a concurrent writer may put a different node</div><div class='ctx'>  * at the root of the tree.  See btrfs_lock_root_node for the</div><div class='hunk'>@@ -265,7 +198,7 @@ struct extent_buffer *btrfs_root_node(struct btrfs_root *root)</div><div class='ctx'> 		 * the inc_not_zero dance and if it doesn't work then</div><div class='ctx'> 		 * synchronize_rcu and try again.</div><div class='ctx'> 		 */</div><div class='del'>-		if (atomic_inc_not_zero(&amp;eb-&gt;refs)) {</div><div class='add'>+		if (refcount_inc_not_zero(&amp;eb-&gt;refs)) {</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -291,7 +224,7 @@ static void add_root_to_dirty_list(struct btrfs_root *root)</div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> 	if (!test_and_set_bit(BTRFS_ROOT_DIRTY, &amp;root-&gt;state)) {</div><div class='ctx'> 		/* Want the extent tree to be the last on the list */</div><div class='del'>-		if (root-&gt;root_key.objectid == BTRFS_EXTENT_TREE_OBJECTID)</div><div class='add'>+		if (btrfs_root_id(root) == BTRFS_EXTENT_TREE_OBJECTID)</div><div class='ctx'> 			list_move_tail(&amp;root-&gt;dirty_list,</div><div class='ctx'> 				       &amp;fs_info-&gt;dirty_cowonly_roots);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -321,7 +254,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	WARN_ON(test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) &amp;&amp;</div><div class='ctx'> 		trans-&gt;transid != fs_info-&gt;running_transaction-&gt;transid);</div><div class='ctx'> 	WARN_ON(test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) &amp;&amp;</div><div class='del'>-		trans-&gt;transid != root-&gt;last_trans);</div><div class='add'>+		trans-&gt;transid != btrfs_get_root_last_trans(root));</div><div class='ctx'> </div><div class='ctx'> 	level = btrfs_header_level(buf);</div><div class='ctx'> 	if (level == 0)</div><div class='hunk'>@@ -350,15 +283,26 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	write_extent_buffer_fsid(cow, fs_info-&gt;fs_devices-&gt;metadata_uuid);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(btrfs_header_generation(buf) &gt; trans-&gt;transid);</div><div class='del'>-	if (new_root_objectid == BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+	if (unlikely(btrfs_header_generation(buf) &gt; trans-&gt;transid)) {</div><div class='add'>+		btrfs_tree_unlock(cow);</div><div class='add'>+		free_extent_buffer(cow);</div><div class='add'>+		ret = -EUCLEAN;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_root_objectid == BTRFS_TREE_RELOC_OBJECTID) {</div><div class='ctx'> 		ret = btrfs_inc_ref(trans, root, cow, 1);</div><div class='del'>-	else</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+	} else {</div><div class='ctx'> 		ret = btrfs_inc_ref(trans, root, cow, 0);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_tree_unlock(cow);</div><div class='ctx'> 		free_extent_buffer(cow);</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -370,9 +314,9 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> /*</div><div class='ctx'>  * check if the tree block can be shared by multiple trees</div><div class='ctx'>  */</div><div class='del'>-bool btrfs_block_can_be_shared(struct btrfs_trans_handle *trans,</div><div class='del'>-			       struct btrfs_root *root,</div><div class='del'>-			       struct extent_buffer *buf)</div><div class='add'>+bool btrfs_block_can_be_shared(const struct btrfs_trans_handle *trans,</div><div class='add'>+			       const struct btrfs_root *root,</div><div class='add'>+			       const struct extent_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	const u64 buf_gen = btrfs_header_generation(buf);</div><div class='ctx'> </div><div class='hunk'>@@ -417,7 +361,6 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u64 refs;</div><div class='ctx'> 	u64 owner;</div><div class='ctx'> 	u64 flags;</div><div class='del'>-	u64 new_flags = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -454,7 +397,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		refs = 1;</div><div class='del'>-		if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID ||</div><div class='add'>+		if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID ||</div><div class='ctx'> 		    btrfs_header_backref_rev(buf) &lt; BTRFS_MIXED_BACKREF_REV)</div><div class='ctx'> 			flags = BTRFS_BLOCK_FLAG_FULL_BACKREF;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -462,19 +405,26 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	owner = btrfs_header_owner(buf);</div><div class='del'>-	BUG_ON(owner == BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='del'>-	       !(flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF));</div><div class='add'>+	if (unlikely(owner == BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='add'>+		     !(flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF))) {</div><div class='add'>+		btrfs_crit(fs_info,</div><div class='add'>+"found tree block at bytenr %llu level %d root %llu refs %llu flags %llx without full backref flag set",</div><div class='add'>+			   buf-&gt;start, btrfs_header_level(buf),</div><div class='add'>+			   btrfs_root_id(root), refs, flags);</div><div class='add'>+		ret = -EUCLEAN;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (refs &gt; 1) {</div><div class='del'>-		if ((owner == root-&gt;root_key.objectid ||</div><div class='del'>-		     root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) &amp;&amp;</div><div class='add'>+		if ((owner == btrfs_root_id(root) ||</div><div class='add'>+		     btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) &amp;&amp;</div><div class='ctx'> 		    !(flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF)) {</div><div class='ctx'> 			ret = btrfs_inc_ref(trans, root, buf, 1);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='del'>-			if (root-&gt;root_key.objectid ==</div><div class='del'>-			    BTRFS_TREE_RELOC_OBJECTID) {</div><div class='add'>+			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) {</div><div class='ctx'> 				ret = btrfs_dec_ref(trans, root, buf, 0);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='hunk'>@@ -482,26 +432,22 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 			}</div><div class='del'>-			new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;</div><div class='add'>+			ret = btrfs_set_disk_extent_flags(trans, buf,</div><div class='add'>+						  BTRFS_BLOCK_FLAG_FULL_BACKREF);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='ctx'> 		} else {</div><div class='ctx'> </div><div class='del'>-			if (root-&gt;root_key.objectid ==</div><div class='del'>-			    BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='ctx'> 				ret = btrfs_inc_ref(trans, root, cow, 1);</div><div class='ctx'> 			else</div><div class='ctx'> 				ret = btrfs_inc_ref(trans, root, cow, 0);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='del'>-		if (new_flags != 0) {</div><div class='del'>-			ret = btrfs_set_disk_extent_flags(trans, buf, new_flags);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF) {</div><div class='del'>-			if (root-&gt;root_key.objectid ==</div><div class='del'>-			    BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='ctx'> 				ret = btrfs_inc_ref(trans, root, cow, 1);</div><div class='ctx'> 			else</div><div class='ctx'> 				ret = btrfs_inc_ref(trans, root, cow, 0);</div><div class='hunk'>@@ -554,7 +500,7 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	WARN_ON(test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) &amp;&amp;</div><div class='ctx'> 		trans-&gt;transid != fs_info-&gt;running_transaction-&gt;transid);</div><div class='ctx'> 	WARN_ON(test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) &amp;&amp;</div><div class='del'>-		trans-&gt;transid != root-&gt;last_trans);</div><div class='add'>+		trans-&gt;transid != btrfs_get_root_last_trans(root));</div><div class='ctx'> </div><div class='ctx'> 	level = btrfs_header_level(buf);</div><div class='ctx'> </div><div class='hunk'>@@ -563,13 +509,13 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	else</div><div class='ctx'> 		btrfs_node_key(buf, &amp;disk_key, 0);</div><div class='ctx'> </div><div class='del'>-	if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) {</div><div class='ctx'> 		if (parent)</div><div class='ctx'> 			parent_start = parent-&gt;start;</div><div class='ctx'> 		reloc_src_root = btrfs_header_owner(buf);</div><div class='ctx'> 	}</div><div class='ctx'> 	cow = btrfs_alloc_tree_block(trans, root, parent_start,</div><div class='del'>-				     root-&gt;root_key.objectid, &amp;disk_key, level,</div><div class='add'>+				     btrfs_root_id(root), &amp;disk_key, level,</div><div class='ctx'> 				     search_start, empty_size, reloc_src_root, nest);</div><div class='ctx'> 	if (IS_ERR(cow))</div><div class='ctx'> 		return PTR_ERR(cow);</div><div class='hunk'>@@ -582,60 +528,56 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV);</div><div class='ctx'> 	btrfs_clear_header_flag(cow, BTRFS_HEADER_FLAG_WRITTEN |</div><div class='ctx'> 				     BTRFS_HEADER_FLAG_RELOC);</div><div class='del'>-	if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='ctx'> 		btrfs_set_header_flag(cow, BTRFS_HEADER_FLAG_RELOC);</div><div class='ctx'> 	else</div><div class='del'>-		btrfs_set_header_owner(cow, root-&gt;root_key.objectid);</div><div class='add'>+		btrfs_set_header_owner(cow, btrfs_root_id(root));</div><div class='ctx'> </div><div class='ctx'> 	write_extent_buffer_fsid(cow, fs_info-&gt;fs_devices-&gt;metadata_uuid);</div><div class='ctx'> </div><div class='ctx'> 	ret = update_ref_for_cow(trans, root, buf, cow, &amp;last_ref);</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_tree_unlock(cow);</div><div class='del'>-		free_extent_buffer(cow);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto error_unlock_cow;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state)) {</div><div class='ctx'> 		ret = btrfs_reloc_cow_block(trans, root, buf, cow);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_tree_unlock(cow);</div><div class='del'>-			free_extent_buffer(cow);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			return ret;</div><div class='add'>+			goto error_unlock_cow;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (buf == root-&gt;node) {</div><div class='ctx'> 		WARN_ON(parent &amp;&amp; parent != buf);</div><div class='del'>-		if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID ||</div><div class='add'>+		if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID ||</div><div class='ctx'> 		    btrfs_header_backref_rev(buf) &lt; BTRFS_MIXED_BACKREF_REV)</div><div class='ctx'> 			parent_start = buf-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_tree_mod_log_insert_root(root-&gt;node, cow, true);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			btrfs_tree_unlock(cow);</div><div class='del'>-			free_extent_buffer(cow);</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			return ret;</div><div class='add'>+			goto error_unlock_cow;</div><div class='ctx'> 		}</div><div class='del'>-		atomic_inc(&amp;cow-&gt;refs);</div><div class='add'>+		refcount_inc(&amp;cow-&gt;refs);</div><div class='ctx'> 		rcu_assign_pointer(root-&gt;node, cow);</div><div class='ctx'> </div><div class='del'>-		btrfs_free_tree_block(trans, btrfs_root_id(root), buf,</div><div class='del'>-				      parent_start, last_ref);</div><div class='add'>+		ret = btrfs_free_tree_block(trans, btrfs_root_id(root), buf,</div><div class='add'>+					    parent_start, last_ref);</div><div class='ctx'> 		free_extent_buffer(buf);</div><div class='ctx'> 		add_root_to_dirty_list(root);</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto error_unlock_cow;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON(trans-&gt;transid != btrfs_header_generation(parent));</div><div class='ctx'> 		ret = btrfs_tree_mod_log_insert_key(parent, parent_slot,</div><div class='ctx'> 						    BTRFS_MOD_LOG_KEY_REPLACE);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_tree_unlock(cow);</div><div class='del'>-			free_extent_buffer(cow);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			return ret;</div><div class='add'>+			goto error_unlock_cow;</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_set_node_blockptr(parent, parent_slot,</div><div class='ctx'> 					cow-&gt;start);</div><div class='hunk'>@@ -644,33 +586,39 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_mark_buffer_dirty(trans, parent);</div><div class='ctx'> 		if (last_ref) {</div><div class='ctx'> 			ret = btrfs_tree_mod_log_free_eb(buf);</div><div class='del'>-			if (ret) {</div><div class='del'>-				btrfs_tree_unlock(cow);</div><div class='del'>-				free_extent_buffer(cow);</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='del'>-				return ret;</div><div class='add'>+				goto error_unlock_cow;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		btrfs_free_tree_block(trans, btrfs_root_id(root), buf,</div><div class='del'>-				      parent_start, last_ref);</div><div class='add'>+		ret = btrfs_free_tree_block(trans, btrfs_root_id(root), buf,</div><div class='add'>+					    parent_start, last_ref);</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto error_unlock_cow;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	trace_btrfs_cow_block(root, buf, cow);</div><div class='ctx'> 	if (unlock_orig)</div><div class='ctx'> 		btrfs_tree_unlock(buf);</div><div class='ctx'> 	free_extent_buffer_stale(buf);</div><div class='ctx'> 	btrfs_mark_buffer_dirty(trans, cow);</div><div class='ctx'> 	*cow_ret = cow;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error_unlock_cow:</div><div class='add'>+	btrfs_tree_unlock(cow);</div><div class='add'>+	free_extent_buffer(cow);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int should_cow_block(struct btrfs_trans_handle *trans,</div><div class='del'>-				   struct btrfs_root *root,</div><div class='del'>-				   struct extent_buffer *buf)</div><div class='add'>+static inline bool should_cow_block(const struct btrfs_trans_handle *trans,</div><div class='add'>+				    const struct btrfs_root *root,</div><div class='add'>+				    const struct extent_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_is_testing(root-&gt;fs_info))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Ensure we can see the FORCE_COW bit */</div><div class='del'>-	smp_mb__before_atomic();</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We do not need to cow a block if</div><div class='hunk'>@@ -683,13 +631,25 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 *    after we've finished copying src root, we must COW the shared</div><div class='ctx'> 	 *    block to ensure the metadata consistency.</div><div class='ctx'> 	 */</div><div class='del'>-	if (btrfs_header_generation(buf) == trans-&gt;transid &amp;&amp;</div><div class='del'>-	    !btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN) &amp;&amp;</div><div class='del'>-	    !(root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='del'>-	      btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC)) &amp;&amp;</div><div class='del'>-	    !test_bit(BTRFS_ROOT_FORCE_COW, &amp;root-&gt;state))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='add'>+</div><div class='add'>+	if (btrfs_header_generation(buf) != trans-&gt;transid)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Ensure we can see the FORCE_COW bit. */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	if (test_bit(BTRFS_ROOT_FORCE_COW, &amp;root-&gt;state))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -705,7 +665,6 @@ int btrfs_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	u64 search_start;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_bit(BTRFS_ROOT_DELETING, &amp;root-&gt;state))) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, -EUCLEAN);</div><div class='hunk'>@@ -746,12 +705,8 @@ int btrfs_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * Also We don't care about the error, as it's handled internally.</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_qgroup_trace_subtree_after_cow(trans, root, buf);</div><div class='del'>-	ret = btrfs_force_cow_block(trans, root, buf, parent, parent_slot,</div><div class='del'>-				    cow_ret, search_start, 0, nest);</div><div class='del'>-</div><div class='del'>-	trace_btrfs_cow_block(root, buf, *cow_ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_force_cow_block(trans, root, buf, parent, parent_slot,</div><div class='add'>+				     cow_ret, search_start, 0, nest);</div><div class='ctx'> }</div><div class='ctx'> ALLOW_ERROR_INJECTION(btrfs_cow_block, ERRNO);</div><div class='ctx'> </div><div class='hunk'>@@ -789,7 +744,7 @@ int __pure btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_ke</div><div class='ctx'>  * Slot may point to the total number of items (i.e. one position beyond the last</div><div class='ctx'>  * key) if the key is bigger than the last key in the extent buffer.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_bin_search(struct extent_buffer *eb, int first_slot,</div><div class='add'>+int btrfs_bin_search(const struct extent_buffer *eb, int first_slot,</div><div class='ctx'> 		     const struct btrfs_key *key, int *slot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long p;</div><div class='hunk'>@@ -820,7 +775,7 @@ int btrfs_bin_search(struct extent_buffer *eb, int first_slot,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (low &lt; high) {</div><div class='del'>-		const int unit_size = folio_size(eb-&gt;folios[0]);</div><div class='add'>+		const int unit_size = eb-&gt;folio_size;</div><div class='ctx'> 		unsigned long oil;</div><div class='ctx'> 		unsigned long offset;</div><div class='ctx'> 		struct btrfs_disk_key *tmp;</div><div class='hunk'>@@ -898,7 +853,7 @@ struct extent_buffer *btrfs_read_node_slot(struct extent_buffer *parent,</div><div class='ctx'> 			     &amp;check);</div><div class='ctx'> 	if (IS_ERR(eb))</div><div class='ctx'> 		return eb;</div><div class='del'>-	if (!extent_buffer_uptodate(eb)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(eb))) {</div><div class='ctx'> 		free_extent_buffer(eb);</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -907,6 +862,75 @@ struct extent_buffer *btrfs_read_node_slot(struct extent_buffer *parent,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Promote a child node to become the new tree root.</div><div class='add'>+ *</div><div class='add'>+ * @trans:   Transaction handle</div><div class='add'>+ * @root:    Tree root structure to update</div><div class='add'>+ * @path:    Path holding nodes and locks</div><div class='add'>+ * @level:   Level of the parent (old root)</div><div class='add'>+ * @parent:  The parent (old root) with exactly one item</div><div class='add'>+ *</div><div class='add'>+ * This helper is called during rebalancing when the root node contains only</div><div class='add'>+ * a single item (nritems == 1).  We can reduce the tree height by promoting</div><div class='add'>+ * that child to become the new root and freeing the old root node.  The path</div><div class='add'>+ * locks and references are updated accordingly.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative errno on failure.  The transaction is aborted</div><div class='add'>+ * on critical errors.</div><div class='add'>+ */</div><div class='add'>+static int promote_child_to_root(struct btrfs_trans_handle *trans,</div><div class='add'>+				 struct btrfs_root *root, struct btrfs_path *path,</div><div class='add'>+				 int level, struct extent_buffer *parent)</div><div class='add'>+{</div><div class='add'>+	struct extent_buffer *child;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT(btrfs_header_nritems(parent) == 1);</div><div class='add'>+</div><div class='add'>+	child = btrfs_read_node_slot(parent, 0);</div><div class='add'>+	if (IS_ERR(child))</div><div class='add'>+		return PTR_ERR(child);</div><div class='add'>+</div><div class='add'>+	btrfs_tree_lock(child);</div><div class='add'>+	ret = btrfs_cow_block(trans, root, child, parent, 0, &amp;child, BTRFS_NESTING_COW);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_tree_unlock(child);</div><div class='add'>+		free_extent_buffer(child);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_tree_mod_log_insert_root(root-&gt;node, child, true);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		btrfs_tree_unlock(child);</div><div class='add'>+		free_extent_buffer(child);</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	rcu_assign_pointer(root-&gt;node, child);</div><div class='add'>+</div><div class='add'>+	add_root_to_dirty_list(root);</div><div class='add'>+	btrfs_tree_unlock(child);</div><div class='add'>+</div><div class='add'>+	path-&gt;locks[level] = 0;</div><div class='add'>+	path-&gt;nodes[level] = NULL;</div><div class='add'>+	btrfs_clear_buffer_dirty(trans, parent);</div><div class='add'>+	btrfs_tree_unlock(parent);</div><div class='add'>+	/* Once for the path. */</div><div class='add'>+	free_extent_buffer(parent);</div><div class='add'>+</div><div class='add'>+	root_sub_used_bytes(root);</div><div class='add'>+	ret = btrfs_free_tree_block(trans, btrfs_root_id(root), parent, 0, 1);</div><div class='add'>+	/* Once for the root ptr. */</div><div class='add'>+	free_extent_buffer_stale(parent);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * node level balancing, used to make sure nodes are in proper order for</div><div class='ctx'>  * item deletion.  We balance from the top down, so we have to make sure</div><div class='ctx'>  * that a deletion won't leave an node completely empty later on.</div><div class='hunk'>@@ -945,51 +969,10 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * by promoting the node below to a root</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!parent) {</div><div class='del'>-		struct extent_buffer *child;</div><div class='del'>-</div><div class='ctx'> 		if (btrfs_header_nritems(mid) != 1)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		/* promote the child to a root */</div><div class='del'>-		child = btrfs_read_node_slot(mid, 0);</div><div class='del'>-		if (IS_ERR(child)) {</div><div class='del'>-			ret = PTR_ERR(child);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		btrfs_tree_lock(child);</div><div class='del'>-		ret = btrfs_cow_block(trans, root, child, mid, 0, &amp;child,</div><div class='del'>-				      BTRFS_NESTING_COW);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_tree_unlock(child);</div><div class='del'>-			free_extent_buffer(child);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = btrfs_tree_mod_log_insert_root(root-&gt;node, child, true);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			btrfs_tree_unlock(child);</div><div class='del'>-			free_extent_buffer(child);</div><div class='del'>-			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		rcu_assign_pointer(root-&gt;node, child);</div><div class='del'>-</div><div class='del'>-		add_root_to_dirty_list(root);</div><div class='del'>-		btrfs_tree_unlock(child);</div><div class='del'>-</div><div class='del'>-		path-&gt;locks[level] = 0;</div><div class='del'>-		path-&gt;nodes[level] = NULL;</div><div class='del'>-		btrfs_clear_buffer_dirty(trans, mid);</div><div class='del'>-		btrfs_tree_unlock(mid);</div><div class='del'>-		/* once for the path */</div><div class='del'>-		free_extent_buffer(mid);</div><div class='del'>-</div><div class='del'>-		root_sub_used_bytes(root);</div><div class='del'>-		btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);</div><div class='del'>-		/* once for the root ptr */</div><div class='del'>-		free_extent_buffer_stale(mid);</div><div class='del'>-		return 0;</div><div class='add'>+		return promote_child_to_root(trans, root, path, level, mid);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (btrfs_header_nritems(mid) &gt;</div><div class='ctx'> 	    BTRFS_NODEPTRS_PER_BLOCK(fs_info) / 4)</div><div class='hunk'>@@ -1003,7 +986,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		__btrfs_tree_lock(left, BTRFS_NESTING_LEFT);</div><div class='add'>+		btrfs_tree_lock_nested(left, BTRFS_NESTING_LEFT);</div><div class='ctx'> 		wret = btrfs_cow_block(trans, root, left,</div><div class='ctx'> 				       parent, pslot - 1, &amp;left,</div><div class='ctx'> 				       BTRFS_NESTING_LEFT_COW);</div><div class='hunk'>@@ -1021,7 +1004,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		__btrfs_tree_lock(right, BTRFS_NESTING_RIGHT);</div><div class='add'>+		btrfs_tree_lock_nested(right, BTRFS_NESTING_RIGHT);</div><div class='ctx'> 		wret = btrfs_cow_block(trans, root, right,</div><div class='ctx'> 				       parent, pslot + 1, &amp;right,</div><div class='ctx'> 				       BTRFS_NESTING_RIGHT_COW);</div><div class='hunk'>@@ -1056,16 +1039,20 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			root_sub_used_bytes(root);</div><div class='del'>-			btrfs_free_tree_block(trans, btrfs_root_id(root), right,</div><div class='del'>-					      0, 1);</div><div class='add'>+			ret = btrfs_free_tree_block(trans, btrfs_root_id(root),</div><div class='add'>+						    right, 0, 1);</div><div class='ctx'> 			free_extent_buffer_stale(right);</div><div class='ctx'> 			right = NULL;</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct btrfs_disk_key right_key;</div><div class='ctx'> 			btrfs_node_key(right, &amp;right_key, 0);</div><div class='ctx'> 			ret = btrfs_tree_mod_log_insert_key(parent, pslot + 1,</div><div class='ctx'> 					BTRFS_MOD_LOG_KEY_REPLACE);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1114,16 +1101,20 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		root_sub_used_bytes(root);</div><div class='del'>-		btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);</div><div class='add'>+		ret = btrfs_free_tree_block(trans, btrfs_root_id(root), mid, 0, 1);</div><div class='ctx'> 		free_extent_buffer_stale(mid);</div><div class='ctx'> 		mid = NULL;</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* update the parent key to reflect our changes */</div><div class='ctx'> 		struct btrfs_disk_key mid_key;</div><div class='ctx'> 		btrfs_node_key(mid, &amp;mid_key, 0);</div><div class='ctx'> 		ret = btrfs_tree_mod_log_insert_key(parent, pslot,</div><div class='ctx'> 						    BTRFS_MOD_LOG_KEY_REPLACE);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1134,11 +1125,12 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* update the path */</div><div class='ctx'> 	if (left) {</div><div class='ctx'> 		if (btrfs_header_nritems(left) &gt; orig_slot) {</div><div class='del'>-			atomic_inc(&amp;left-&gt;refs);</div><div class='ctx'> 			/* left was locked after cow */</div><div class='ctx'> 			path-&gt;nodes[level] = left;</div><div class='ctx'> 			path-&gt;slots[level + 1] -= 1;</div><div class='ctx'> 			path-&gt;slots[level] = orig_slot;</div><div class='add'>+			/* Left is now owned by path. */</div><div class='add'>+			left = NULL;</div><div class='ctx'> 			if (mid) {</div><div class='ctx'> 				btrfs_tree_unlock(mid);</div><div class='ctx'> 				free_extent_buffer(mid);</div><div class='hunk'>@@ -1158,8 +1150,7 @@ out:</div><div class='ctx'> 		free_extent_buffer(right);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (left) {</div><div class='del'>-		if (path-&gt;nodes[level] != left)</div><div class='del'>-			btrfs_tree_unlock(left);</div><div class='add'>+		btrfs_tree_unlock(left);</div><div class='ctx'> 		free_extent_buffer(left);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1205,7 +1196,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (IS_ERR(left))</div><div class='ctx'> 			return PTR_ERR(left);</div><div class='ctx'> </div><div class='del'>-		__btrfs_tree_lock(left, BTRFS_NESTING_LEFT);</div><div class='add'>+		btrfs_tree_lock_nested(left, BTRFS_NESTING_LEFT);</div><div class='ctx'> </div><div class='ctx'> 		left_nr = btrfs_header_nritems(left);</div><div class='ctx'> 		if (left_nr &gt;= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) {</div><div class='hunk'>@@ -1228,7 +1219,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			btrfs_node_key(mid, &amp;disk_key, 0);</div><div class='ctx'> 			ret = btrfs_tree_mod_log_insert_key(parent, pslot,</div><div class='ctx'> 					BTRFS_MOD_LOG_KEY_REPLACE);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_tree_unlock(left);</div><div class='ctx'> 				free_extent_buffer(left);</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -1265,7 +1256,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (IS_ERR(right))</div><div class='ctx'> 			return PTR_ERR(right);</div><div class='ctx'> </div><div class='del'>-		__btrfs_tree_lock(right, BTRFS_NESTING_RIGHT);</div><div class='add'>+		btrfs_tree_lock_nested(right, BTRFS_NESTING_RIGHT);</div><div class='ctx'> </div><div class='ctx'> 		right_nr = btrfs_header_nritems(right);</div><div class='ctx'> 		if (right_nr &gt;= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) {</div><div class='hunk'>@@ -1288,7 +1279,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			btrfs_node_key(right, &amp;disk_key, 0);</div><div class='ctx'> 			ret = btrfs_tree_mod_log_insert_key(parent, pslot + 1,</div><div class='ctx'> 					BTRFS_MOD_LOG_KEY_REPLACE);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_tree_unlock(right);</div><div class='ctx'> 				free_extent_buffer(right);</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -1321,7 +1312,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * to the block in 'slot', and triggering ra on them.</div><div class='ctx'>  */</div><div class='ctx'> static void reada_for_search(struct btrfs_fs_info *fs_info,</div><div class='del'>-			     struct btrfs_path *path,</div><div class='add'>+			     const struct btrfs_path *path,</div><div class='ctx'> 			     int level, int slot, u64 objectid)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *node;</div><div class='hunk'>@@ -1403,7 +1394,7 @@ static void reada_for_search(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void reada_for_balance(struct btrfs_path *path, int level)</div><div class='add'>+static noinline void reada_for_balance(const struct btrfs_path *path, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *parent;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -1468,8 +1459,8 @@ static noinline void unlock_up(struct btrfs_path *path, int level,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (i &gt;= lowest_unlock &amp;&amp; i &gt; skip_level) {</div><div class='del'>-			check_skip = false;</div><div class='ctx'> 			btrfs_tree_unlock_rw(path-&gt;nodes[i], path-&gt;locks[i]);</div><div class='add'>+			check_skip = false;</div><div class='ctx'> 			path-&gt;locks[i] = 0;</div><div class='ctx'> 			if (write_lock_level &amp;&amp;</div><div class='ctx'> 			    i &gt; min_write_lock_level &amp;&amp;</div><div class='hunk'>@@ -1491,27 +1482,27 @@ static noinline void unlock_up(struct btrfs_path *path, int level,</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> read_block_for_search(struct btrfs_root *root, struct btrfs_path *p,</div><div class='del'>-		      struct extent_buffer **eb_ret, int level, int slot,</div><div class='add'>+		      struct extent_buffer **eb_ret, int slot,</div><div class='ctx'> 		      const struct btrfs_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_tree_parent_check check = { 0 };</div><div class='ctx'> 	u64 blocknr;</div><div class='del'>-	u64 gen;</div><div class='del'>-	struct extent_buffer *tmp;</div><div class='del'>-	int ret;</div><div class='add'>+	struct extent_buffer *tmp = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int ret2;</div><div class='ctx'> 	int parent_level;</div><div class='del'>-	bool unlock_up;</div><div class='add'>+	bool read_tmp = false;</div><div class='add'>+	bool tmp_locked = false;</div><div class='add'>+	bool path_released = false;</div><div class='ctx'> </div><div class='del'>-	unlock_up = ((level + 1 &lt; BTRFS_MAX_LEVEL) &amp;&amp; p-&gt;locks[level + 1]);</div><div class='ctx'> 	blocknr = btrfs_node_blockptr(*eb_ret, slot);</div><div class='del'>-	gen = btrfs_node_ptr_generation(*eb_ret, slot);</div><div class='ctx'> 	parent_level = btrfs_header_level(*eb_ret);</div><div class='ctx'> 	btrfs_node_key_to_cpu(*eb_ret, &amp;check.first_key, slot);</div><div class='ctx'> 	check.has_first_key = true;</div><div class='ctx'> 	check.level = parent_level - 1;</div><div class='del'>-	check.transid = gen;</div><div class='del'>-	check.owner_root = root-&gt;root_key.objectid;</div><div class='add'>+	check.transid = btrfs_node_ptr_generation(*eb_ret, slot);</div><div class='add'>+	check.owner_root = btrfs_root_id(root);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we need to read an extent buffer from disk and we are holding locks</div><div class='hunk'>@@ -1523,84 +1514,117 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p,</div><div class='ctx'> 	tmp = find_extent_buffer(fs_info, blocknr);</div><div class='ctx'> 	if (tmp) {</div><div class='ctx'> 		if (p-&gt;reada == READA_FORWARD_ALWAYS)</div><div class='del'>-			reada_for_search(fs_info, p, level, slot, key-&gt;objectid);</div><div class='add'>+			reada_for_search(fs_info, p, parent_level, slot, key-&gt;objectid);</div><div class='ctx'> </div><div class='ctx'> 		/* first we do an atomic uptodate check */</div><div class='del'>-		if (btrfs_buffer_uptodate(tmp, gen, 1) &gt; 0) {</div><div class='add'>+		if (btrfs_buffer_uptodate(tmp, check.transid, true) &gt; 0) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Do extra check for first_key, eb can be stale due to</div><div class='ctx'> 			 * being cached, read from scrub, or have multiple</div><div class='ctx'> 			 * parents (shared tree blocks).</div><div class='ctx'> 			 */</div><div class='del'>-			if (btrfs_verify_level_key(tmp,</div><div class='del'>-					parent_level - 1, &amp;check.first_key, gen)) {</div><div class='del'>-				free_extent_buffer(tmp);</div><div class='del'>-				return -EUCLEAN;</div><div class='add'>+			if (unlikely(btrfs_verify_level_key(tmp, &amp;check))) {</div><div class='add'>+				ret = -EUCLEAN;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			*eb_ret = tmp;</div><div class='del'>-			return 0;</div><div class='add'>+			tmp = NULL;</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (p-&gt;nowait) {</div><div class='del'>-			free_extent_buffer(tmp);</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlock_up)</div><div class='del'>-			btrfs_unlock_up_safe(p, level + 1);</div><div class='del'>-</div><div class='del'>-		/* now we're allowed to do a blocking uptodate check */</div><div class='del'>-		ret = btrfs_read_extent_buffer(tmp, &amp;check);</div><div class='del'>-		if (ret) {</div><div class='del'>-			free_extent_buffer(tmp);</div><div class='del'>-			btrfs_release_path(p);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (btrfs_check_eb_owner(tmp, root-&gt;root_key.objectid)) {</div><div class='del'>-			free_extent_buffer(tmp);</div><div class='add'>+		if (!p-&gt;skip_locking) {</div><div class='add'>+			btrfs_unlock_up_safe(p, parent_level + 1);</div><div class='add'>+			btrfs_maybe_reset_lockdep_class(root, tmp);</div><div class='add'>+			tmp_locked = true;</div><div class='add'>+			btrfs_tree_read_lock(tmp);</div><div class='ctx'> 			btrfs_release_path(p);</div><div class='del'>-			return -EUCLEAN;</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			path_released = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlock_up)</div><div class='del'>-			ret = -EAGAIN;</div><div class='add'>+		/* Now we're allowed to do a blocking uptodate check. */</div><div class='add'>+		ret2 = btrfs_read_extent_buffer(tmp, &amp;check);</div><div class='add'>+		if (ret2) {</div><div class='add'>+			ret = ret2;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ASSERT(!tmp_locked);</div><div class='add'>+			*eb_ret = tmp;</div><div class='add'>+			tmp = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (p-&gt;nowait) {</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlock_up) {</div><div class='del'>-		btrfs_unlock_up_safe(p, level + 1);</div><div class='add'>+	if (!p-&gt;skip_locking) {</div><div class='add'>+		btrfs_unlock_up_safe(p, parent_level + 1);</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='del'>-	} else {</div><div class='del'>-		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;reada != READA_NONE)</div><div class='del'>-		reada_for_search(fs_info, p, level, slot, key-&gt;objectid);</div><div class='add'>+		reada_for_search(fs_info, p, parent_level, slot, key-&gt;objectid);</div><div class='ctx'> </div><div class='del'>-	tmp = read_tree_block(fs_info, blocknr, &amp;check);</div><div class='add'>+	tmp = btrfs_find_create_tree_block(fs_info, blocknr, check.owner_root, check.level);</div><div class='ctx'> 	if (IS_ERR(tmp)) {</div><div class='add'>+		ret = PTR_ERR(tmp);</div><div class='add'>+		tmp = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	read_tmp = true;</div><div class='add'>+</div><div class='add'>+	if (!p-&gt;skip_locking) {</div><div class='add'>+		ASSERT(ret == -EAGAIN);</div><div class='add'>+		btrfs_maybe_reset_lockdep_class(root, tmp);</div><div class='add'>+		tmp_locked = true;</div><div class='add'>+		btrfs_tree_read_lock(tmp);</div><div class='ctx'> 		btrfs_release_path(p);</div><div class='del'>-		return PTR_ERR(tmp);</div><div class='add'>+		path_released = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we're allowed to do a blocking uptodate check. */</div><div class='add'>+	ret2 = btrfs_read_extent_buffer(tmp, &amp;check);</div><div class='add'>+	if (ret2) {</div><div class='add'>+		ret = ret2;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the read above didn't mark this buffer up to date,</div><div class='ctx'> 	 * it will never end up being up to date.  Set ret to EIO now</div><div class='ctx'> 	 * and give up so that our caller doesn't loop forever</div><div class='ctx'> 	 * on our EAGAINs.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!extent_buffer_uptodate(tmp))</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(tmp))) {</div><div class='ctx'> 		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	if (ret == 0) {</div><div class='add'>+		ASSERT(!tmp_locked);</div><div class='ctx'> 		*eb_ret = tmp;</div><div class='del'>-	} else {</div><div class='del'>-		free_extent_buffer(tmp);</div><div class='del'>-		btrfs_release_path(p);</div><div class='add'>+		tmp = NULL;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	if (tmp) {</div><div class='add'>+		if (tmp_locked)</div><div class='add'>+			btrfs_tree_read_unlock(tmp);</div><div class='add'>+		if (read_tmp &amp;&amp; ret &amp;&amp; ret != -EAGAIN)</div><div class='add'>+			free_extent_buffer_stale(tmp);</div><div class='add'>+		else</div><div class='add'>+			free_extent_buffer(tmp);</div><div class='add'>+	}</div><div class='add'>+	if (ret &amp;&amp; !path_released)</div><div class='add'>+		btrfs_release_path(p);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1705,13 +1729,13 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;search_commit_root) {</div><div class='ctx'> 		b = root-&gt;commit_root;</div><div class='del'>-		atomic_inc(&amp;b-&gt;refs);</div><div class='add'>+		refcount_inc(&amp;b-&gt;refs);</div><div class='ctx'> 		level = btrfs_header_level(b);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ensure that all callers have set skip_locking when</div><div class='del'>-		 * p-&gt;search_commit_root = 1.</div><div class='add'>+		 * p-&gt;search_commit_root is true.</div><div class='ctx'> 		 */</div><div class='del'>-		ASSERT(p-&gt;skip_locking == 1);</div><div class='add'>+		ASSERT(p-&gt;skip_locking);</div><div class='ctx'> </div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1761,7 +1785,7 @@ out:</div><div class='ctx'> 	 * The root may have failed to write out at some point, and thus is no</div><div class='ctx'> 	 * longer valid, return an error in this case.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!extent_buffer_uptodate(b)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(b))) {</div><div class='ctx'> 		if (root_lock)</div><div class='ctx'> 			btrfs_tree_unlock_rw(b, root_lock);</div><div class='ctx'> 		free_extent_buffer(b);</div><div class='hunk'>@@ -1814,7 +1838,7 @@ static int finish_need_commit_sem_search(struct btrfs_path *path)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int search_for_key_slot(struct extent_buffer *eb,</div><div class='add'>+static inline int search_for_key_slot(const struct extent_buffer *eb,</div><div class='ctx'> 				      int search_low_slot,</div><div class='ctx'> 				      const struct btrfs_key *key,</div><div class='ctx'> 				      int prev_cmp,</div><div class='hunk'>@@ -1948,15 +1972,14 @@ static int search_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ASSERT(leaf_free_space &gt;= 0);</div><div class='ctx'> </div><div class='ctx'> 		if (leaf_free_space &lt; ins_len) {</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			err = split_leaf(trans, root, key, path, ins_len,</div><div class='del'>-					 (ret == 0));</div><div class='del'>-			ASSERT(err &lt;= 0);</div><div class='del'>-			if (WARN_ON(err &gt; 0))</div><div class='del'>-				err = -EUCLEAN;</div><div class='del'>-			if (err)</div><div class='del'>-				ret = err;</div><div class='add'>+			int ret2;</div><div class='add'>+</div><div class='add'>+			ret2 = split_leaf(trans, root, key, path, ins_len, (ret == 0));</div><div class='add'>+			ASSERT(ret2 &lt;= 0);</div><div class='add'>+			if (WARN_ON(ret2 &gt; 0))</div><div class='add'>+				ret2 = -EUCLEAN;</div><div class='add'>+			if (ret2)</div><div class='add'>+				ret = ret2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1998,11 +2021,10 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		      const struct btrfs_key *key, struct btrfs_path *p,</div><div class='ctx'> 		      int ins_len, int cow)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='ctx'> 	struct extent_buffer *b;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int err;</div><div class='ctx'> 	int level;</div><div class='ctx'> 	int lowest_unlock = 1;</div><div class='ctx'> 	/* everything at write_lock_level or lower must be write locked */</div><div class='hunk'>@@ -2011,6 +2033,10 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 	int min_write_lock_level;</div><div class='ctx'> 	int prev_cmp;</div><div class='ctx'> </div><div class='add'>+	if (!root)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fs_info = root-&gt;fs_info;</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='ctx'> 	lowest_level = p-&gt;lowest_level;</div><div class='hunk'>@@ -2069,6 +2095,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	while (b) {</div><div class='ctx'> 		int dec = 0;</div><div class='add'>+		int ret2;</div><div class='ctx'> </div><div class='ctx'> 		level = btrfs_header_level(b);</div><div class='ctx'> </div><div class='hunk'>@@ -2097,16 +2124,15 @@ again:</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (last_level)</div><div class='del'>-				err = btrfs_cow_block(trans, root, b, NULL, 0,</div><div class='del'>-						      &amp;b,</div><div class='del'>-						      BTRFS_NESTING_COW);</div><div class='add'>+				ret2 = btrfs_cow_block(trans, root, b, NULL, 0,</div><div class='add'>+						       &amp;b, BTRFS_NESTING_COW);</div><div class='ctx'> 			else</div><div class='del'>-				err = btrfs_cow_block(trans, root, b,</div><div class='del'>-						      p-&gt;nodes[level + 1],</div><div class='del'>-						      p-&gt;slots[level + 1], &amp;b,</div><div class='del'>-						      BTRFS_NESTING_COW);</div><div class='del'>-			if (err) {</div><div class='del'>-				ret = err;</div><div class='add'>+				ret2 = btrfs_cow_block(trans, root, b,</div><div class='add'>+						       p-&gt;nodes[level + 1],</div><div class='add'>+						       p-&gt;slots[level + 1], &amp;b,</div><div class='add'>+						       BTRFS_NESTING_COW);</div><div class='add'>+			if (ret2) {</div><div class='add'>+				ret = ret2;</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2154,12 +2180,12 @@ cow_done:</div><div class='ctx'> 			slot--;</div><div class='ctx'> 		}</div><div class='ctx'> 		p-&gt;slots[level] = slot;</div><div class='del'>-		err = setup_nodes_for_search(trans, root, p, b, level, ins_len,</div><div class='del'>-					     &amp;write_lock_level);</div><div class='del'>-		if (err == -EAGAIN)</div><div class='add'>+		ret2 = setup_nodes_for_search(trans, root, p, b, level, ins_len,</div><div class='add'>+					      &amp;write_lock_level);</div><div class='add'>+		if (ret2 == -EAGAIN)</div><div class='ctx'> 			goto again;</div><div class='del'>-		if (err) {</div><div class='del'>-			ret = err;</div><div class='add'>+		if (ret2) {</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		b = p-&gt;nodes[level];</div><div class='hunk'>@@ -2185,11 +2211,11 @@ cow_done:</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = read_block_for_search(root, p, &amp;b, level, slot, key);</div><div class='del'>-		if (err == -EAGAIN)</div><div class='add'>+		ret2 = read_block_for_search(root, p, &amp;b, slot, key);</div><div class='add'>+		if (ret2 == -EAGAIN &amp;&amp; !p-&gt;nowait)</div><div class='ctx'> 			goto again;</div><div class='del'>-		if (err) {</div><div class='del'>-			ret = err;</div><div class='add'>+		if (ret2) {</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2252,7 +2278,6 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,</div><div class='ctx'> 	struct extent_buffer *b;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int err;</div><div class='ctx'> 	int level;</div><div class='ctx'> 	int lowest_unlock = 1;</div><div class='ctx'> 	u8 lowest_level = 0;</div><div class='hunk'>@@ -2268,7 +2293,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	b = btrfs_get_old_root(root, time_seq);</div><div class='del'>-	if (!b) {</div><div class='add'>+	if (unlikely(!b)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2277,6 +2302,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	while (b) {</div><div class='ctx'> 		int dec = 0;</div><div class='add'>+		int ret2;</div><div class='ctx'> </div><div class='ctx'> 		level = btrfs_header_level(b);</div><div class='ctx'> 		p-&gt;nodes[level] = b;</div><div class='hunk'>@@ -2312,17 +2338,17 @@ again:</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = read_block_for_search(root, p, &amp;b, level, slot, key);</div><div class='del'>-		if (err == -EAGAIN)</div><div class='add'>+		ret2 = read_block_for_search(root, p, &amp;b, slot, key);</div><div class='add'>+		if (ret2 == -EAGAIN &amp;&amp; !p-&gt;nowait)</div><div class='ctx'> 			goto again;</div><div class='del'>-		if (err) {</div><div class='del'>-			ret = err;</div><div class='add'>+		if (ret2) {</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		level = btrfs_header_level(b);</div><div class='ctx'> 		btrfs_tree_read_lock(b);</div><div class='del'>-		b = btrfs_tree_mod_log_rewind(fs_info, p, b, time_seq);</div><div class='add'>+		b = btrfs_tree_mod_log_rewind(fs_info, b, time_seq);</div><div class='ctx'> 		if (!b) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -2552,8 +2578,8 @@ int btrfs_get_next_valid_item(struct btrfs_root *root, struct btrfs_key *key,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static void fixup_low_keys(struct btrfs_trans_handle *trans,</div><div class='del'>-			   struct btrfs_path *path,</div><div class='del'>-			   struct btrfs_disk_key *key, int level)</div><div class='add'>+			   const struct btrfs_path *path,</div><div class='add'>+			   const struct btrfs_disk_key *key, int level)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct extent_buffer *t;</div><div class='hunk'>@@ -2582,7 +2608,7 @@ static void fixup_low_keys(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * that the new key won't break the order</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,</div><div class='del'>-			     struct btrfs_path *path,</div><div class='add'>+			     const struct btrfs_path *path,</div><div class='ctx'> 			     const struct btrfs_key *new_key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='hunk'>@@ -2597,12 +2623,11 @@ void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (unlikely(btrfs_comp_keys(&amp;disk_key, new_key) &gt;= 0)) {</div><div class='ctx'> 			btrfs_print_leaf(eb);</div><div class='ctx'> 			btrfs_crit(fs_info,</div><div class='del'>-		"slot %u key (%llu %u %llu) new key (%llu %u %llu)",</div><div class='add'>+		"slot %u key " BTRFS_KEY_FMT " new key " BTRFS_KEY_FMT,</div><div class='ctx'> 				   slot, btrfs_disk_key_objectid(&amp;disk_key),</div><div class='ctx'> 				   btrfs_disk_key_type(&amp;disk_key),</div><div class='ctx'> 				   btrfs_disk_key_offset(&amp;disk_key),</div><div class='del'>-				   new_key-&gt;objectid, new_key-&gt;type,</div><div class='del'>-				   new_key-&gt;offset);</div><div class='add'>+				   BTRFS_KEY_FMT_VALUE(new_key));</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2611,12 +2636,11 @@ void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (unlikely(btrfs_comp_keys(&amp;disk_key, new_key) &lt;= 0)) {</div><div class='ctx'> 			btrfs_print_leaf(eb);</div><div class='ctx'> 			btrfs_crit(fs_info,</div><div class='del'>-		"slot %u key (%llu %u %llu) new key (%llu %u %llu)",</div><div class='add'>+		"slot %u key " BTRFS_KEY_FMT " new key " BTRFS_KEY_FMT,</div><div class='ctx'> 				   slot, btrfs_disk_key_objectid(&amp;disk_key),</div><div class='ctx'> 				   btrfs_disk_key_type(&amp;disk_key),</div><div class='ctx'> 				   btrfs_disk_key_offset(&amp;disk_key),</div><div class='del'>-				   new_key-&gt;objectid, new_key-&gt;type,</div><div class='del'>-				   new_key-&gt;offset);</div><div class='add'>+				   BTRFS_KEY_FMT_VALUE(new_key));</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2648,8 +2672,8 @@ void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * is correct, we only need to bother the last key of @left and the first</div><div class='ctx'>  * key of @right.</div><div class='ctx'>  */</div><div class='del'>-static bool check_sibling_keys(struct extent_buffer *left,</div><div class='del'>-			       struct extent_buffer *right)</div><div class='add'>+static bool check_sibling_keys(const struct extent_buffer *left,</div><div class='add'>+			       const struct extent_buffer *right)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_key left_last;</div><div class='ctx'> 	struct btrfs_key right_first;</div><div class='hunk'>@@ -2675,10 +2699,9 @@ static bool check_sibling_keys(struct extent_buffer *left,</div><div class='ctx'> 		btrfs_crit(left-&gt;fs_info, "right extent buffer:");</div><div class='ctx'> 		btrfs_print_tree(right, false);</div><div class='ctx'> 		btrfs_crit(left-&gt;fs_info,</div><div class='del'>-"bad key order, sibling blocks, left last (%llu %u %llu) right first (%llu %u %llu)",</div><div class='del'>-			   left_last.objectid, left_last.type,</div><div class='del'>-			   left_last.offset, right_first.objectid,</div><div class='del'>-			   right_first.type, right_first.offset);</div><div class='add'>+"bad key order, sibling blocks, left last " BTRFS_KEY_FMT " right first " BTRFS_KEY_FMT,</div><div class='add'>+			   BTRFS_KEY_FMT_VALUE(&amp;left_last),</div><div class='add'>+			   BTRFS_KEY_FMT_VALUE(&amp;right_first));</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -2693,7 +2716,7 @@ static bool check_sibling_keys(struct extent_buffer *left,</div><div class='ctx'>  */</div><div class='ctx'> static int push_node_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  struct extent_buffer *dst,</div><div class='del'>-			  struct extent_buffer *src, int empty)</div><div class='add'>+			  struct extent_buffer *src, bool empty)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	int push_items = 0;</div><div class='hunk'>@@ -2729,13 +2752,13 @@ static int push_node_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		push_items = min(src_nritems - 8, push_items);</div><div class='ctx'> </div><div class='ctx'> 	/* dst is the left eb, src is the middle eb */</div><div class='del'>-	if (check_sibling_keys(dst, src)) {</div><div class='add'>+	if (unlikely(check_sibling_keys(dst, src))) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = btrfs_tree_mod_log_eb_copy(dst, src, dst_nritems, 0, push_items);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2803,7 +2826,7 @@ static int balance_node_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		push_items = max_push;</div><div class='ctx'> </div><div class='ctx'> 	/* dst is the right eb, src is the middle eb */</div><div class='del'>-	if (check_sibling_keys(src, dst)) {</div><div class='add'>+	if (unlikely(check_sibling_keys(src, dst))) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2820,7 +2843,7 @@ static int balance_node_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_tree_mod_log_eb_copy(dst, src, 0, src_nritems - push_items,</div><div class='ctx'> 					 push_items);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2865,7 +2888,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	else</div><div class='ctx'> 		btrfs_node_key(lower, &amp;lower_key, 0);</div><div class='ctx'> </div><div class='del'>-	c = btrfs_alloc_tree_block(trans, root, 0, root-&gt;root_key.objectid,</div><div class='add'>+	c = btrfs_alloc_tree_block(trans, root, 0, btrfs_root_id(root),</div><div class='ctx'> 				   &amp;lower_key, level, root-&gt;node-&gt;start, 0,</div><div class='ctx'> 				   0, BTRFS_NESTING_NEW_ROOT);</div><div class='ctx'> 	if (IS_ERR(c))</div><div class='hunk'>@@ -2886,7 +2909,12 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	old = root-&gt;node;</div><div class='ctx'> 	ret = btrfs_tree_mod_log_insert_root(root-&gt;node, c, false);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_free_tree_block(trans, btrfs_root_id(root), c, 0, 1);</div><div class='add'>+		int ret2;</div><div class='add'>+</div><div class='add'>+		btrfs_clear_buffer_dirty(trans, c);</div><div class='add'>+		ret2 = btrfs_free_tree_block(trans, btrfs_root_id(root), c, 0, 1);</div><div class='add'>+		if (unlikely(ret2 &lt; 0))</div><div class='add'>+			btrfs_abort_transaction(trans, ret2);</div><div class='ctx'> 		btrfs_tree_unlock(c);</div><div class='ctx'> 		free_extent_buffer(c);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2897,7 +2925,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	free_extent_buffer(old);</div><div class='ctx'> </div><div class='ctx'> 	add_root_to_dirty_list(root);</div><div class='del'>-	atomic_inc(&amp;c-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;c-&gt;refs);</div><div class='ctx'> 	path-&gt;nodes[level] = c;</div><div class='ctx'> 	path-&gt;locks[level] = BTRFS_WRITE_LOCK;</div><div class='ctx'> 	path-&gt;slots[level] = 0;</div><div class='hunk'>@@ -2912,8 +2940,8 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * blocknr is the block the key points to.</div><div class='ctx'>  */</div><div class='ctx'> static int insert_ptr(struct btrfs_trans_handle *trans,</div><div class='del'>-		      struct btrfs_path *path,</div><div class='del'>-		      struct btrfs_disk_key *key, u64 bytenr,</div><div class='add'>+		      const struct btrfs_path *path,</div><div class='add'>+		      const struct btrfs_disk_key *key, u64 bytenr,</div><div class='ctx'> 		      int slot, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *lower;</div><div class='hunk'>@@ -2930,7 +2958,7 @@ static int insert_ptr(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (level) {</div><div class='ctx'> 			ret = btrfs_tree_mod_log_insert_move(lower, slot + 1,</div><div class='ctx'> 					slot, nritems - slot);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2943,7 +2971,7 @@ static int insert_ptr(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (level) {</div><div class='ctx'> 		ret = btrfs_tree_mod_log_insert_key(lower, slot,</div><div class='ctx'> 						    BTRFS_MOD_LOG_KEY_ADD);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3009,7 +3037,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	mid = (c_nritems + 1) / 2;</div><div class='ctx'> 	btrfs_node_key(c, &amp;disk_key, mid);</div><div class='ctx'> </div><div class='del'>-	split = btrfs_alloc_tree_block(trans, root, 0, root-&gt;root_key.objectid,</div><div class='add'>+	split = btrfs_alloc_tree_block(trans, root, 0, btrfs_root_id(root),</div><div class='ctx'> 				       &amp;disk_key, level, c-&gt;start, 0,</div><div class='ctx'> 				       0, BTRFS_NESTING_SPLIT);</div><div class='ctx'> 	if (IS_ERR(split))</div><div class='hunk'>@@ -3019,7 +3047,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ASSERT(btrfs_header_level(c) == level);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_tree_mod_log_eb_copy(split, c, 0, mid, c_nritems - mid);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_tree_unlock(split);</div><div class='ctx'> 		free_extent_buffer(split);</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -3088,7 +3116,7 @@ int btrfs_leaf_free_space(const struct extent_buffer *leaf)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = BTRFS_LEAF_DATA_SIZE(fs_info) - leaf_space_used(leaf, 0, nritems);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='ctx'> 			   "leaf free space ret %d, leaf data size %lu, used %d nritems %d",</div><div class='ctx'> 			   ret,</div><div class='hunk'>@@ -3104,7 +3132,7 @@ int btrfs_leaf_free_space(const struct extent_buffer *leaf)</div><div class='ctx'>  */</div><div class='ctx'> static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				      struct btrfs_path *path,</div><div class='del'>-				      int data_size, int empty,</div><div class='add'>+				      int data_size, bool empty,</div><div class='ctx'> 				      struct extent_buffer *right,</div><div class='ctx'> 				      int free_space, u32 left_nritems,</div><div class='ctx'> 				      u32 min_slot)</div><div class='hunk'>@@ -3112,7 +3140,6 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = right-&gt;fs_info;</div><div class='ctx'> 	struct extent_buffer *left = path-&gt;nodes[0];</div><div class='ctx'> 	struct extent_buffer *upper = path-&gt;nodes[1];</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> 	struct btrfs_disk_key disk_key;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -3186,13 +3213,12 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	copy_leaf_items(right, left, 0, left_nritems - push_items, push_items);</div><div class='ctx'> </div><div class='ctx'> 	/* update the item pointers */</div><div class='del'>-	btrfs_init_map_token(&amp;token, right);</div><div class='ctx'> 	right_nritems += push_items;</div><div class='ctx'> 	btrfs_set_header_nritems(right, right_nritems);</div><div class='ctx'> 	push_space = BTRFS_LEAF_DATA_SIZE(fs_info);</div><div class='ctx'> 	for (i = 0; i &lt; right_nritems; i++) {</div><div class='del'>-		push_space -= btrfs_token_item_size(&amp;token, i);</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, i, push_space);</div><div class='add'>+		push_space -= btrfs_item_size(right, i);</div><div class='add'>+		btrfs_set_item_offset(right, i, push_space);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	left_nritems -= push_items;</div><div class='hunk'>@@ -3212,10 +3238,8 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* then fixup the leaf pointer in the path */</div><div class='ctx'> 	if (path-&gt;slots[0] &gt;= left_nritems) {</div><div class='ctx'> 		path-&gt;slots[0] -= left_nritems;</div><div class='del'>-		if (btrfs_header_nritems(path-&gt;nodes[0]) == 0)</div><div class='del'>-			btrfs_clear_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='del'>-		btrfs_tree_unlock(path-&gt;nodes[0]);</div><div class='del'>-		free_extent_buffer(path-&gt;nodes[0]);</div><div class='add'>+		btrfs_tree_unlock(left);</div><div class='add'>+		free_extent_buffer(left);</div><div class='ctx'> 		path-&gt;nodes[0] = right;</div><div class='ctx'> 		path-&gt;slots[1] += 1;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -3243,7 +3267,7 @@ out_unlock:</div><div class='ctx'> static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 			   *root, struct btrfs_path *path,</div><div class='ctx'> 			   int min_data_size, int data_size,</div><div class='del'>-			   int empty, u32 min_slot)</div><div class='add'>+			   bool empty, u32 min_slot)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *left = path-&gt;nodes[0];</div><div class='ctx'> 	struct extent_buffer *right;</div><div class='hunk'>@@ -3267,7 +3291,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 	if (IS_ERR(right))</div><div class='ctx'> 		return PTR_ERR(right);</div><div class='ctx'> </div><div class='del'>-	__btrfs_tree_lock(right, BTRFS_NESTING_RIGHT);</div><div class='add'>+	btrfs_tree_lock_nested(right, BTRFS_NESTING_RIGHT);</div><div class='ctx'> </div><div class='ctx'> 	free_space = btrfs_leaf_free_space(right);</div><div class='ctx'> 	if (free_space &lt; data_size)</div><div class='hunk'>@@ -3282,7 +3306,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 	if (left_nritems == 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	if (check_sibling_keys(left, right)) {</div><div class='add'>+	if (unlikely(check_sibling_keys(left, right))) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		btrfs_tree_unlock(right);</div><div class='hunk'>@@ -3320,7 +3344,7 @@ out_unlock:</div><div class='ctx'>  */</div><div class='ctx'> static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     struct btrfs_path *path, int data_size,</div><div class='del'>-				     int empty, struct extent_buffer *left,</div><div class='add'>+				     bool empty, struct extent_buffer *left,</div><div class='ctx'> 				     int free_space, u32 right_nritems,</div><div class='ctx'> 				     u32 max_slot)</div><div class='ctx'> {</div><div class='hunk'>@@ -3335,7 +3359,6 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 this_item_size;</div><div class='ctx'> 	u32 old_left_item_size;</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> </div><div class='ctx'> 	if (empty)</div><div class='ctx'> 		nr = min(right_nritems, max_slot);</div><div class='hunk'>@@ -3383,21 +3406,24 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	old_left_nritems = btrfs_header_nritems(left);</div><div class='ctx'> 	BUG_ON(old_left_nritems &lt;= 0);</div><div class='ctx'> </div><div class='del'>-	btrfs_init_map_token(&amp;token, left);</div><div class='ctx'> 	old_left_item_size = btrfs_item_offset(left, old_left_nritems - 1);</div><div class='ctx'> 	for (i = old_left_nritems; i &lt; old_left_nritems + push_items; i++) {</div><div class='ctx'> 		u32 ioff;</div><div class='ctx'> </div><div class='del'>-		ioff = btrfs_token_item_offset(&amp;token, i);</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, i,</div><div class='add'>+		ioff = btrfs_item_offset(left, i);</div><div class='add'>+		btrfs_set_item_offset(left, i,</div><div class='ctx'> 		      ioff - (BTRFS_LEAF_DATA_SIZE(fs_info) - old_left_item_size));</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_set_header_nritems(left, old_left_nritems + push_items);</div><div class='ctx'> </div><div class='ctx'> 	/* fixup right node */</div><div class='del'>-	if (push_items &gt; right_nritems)</div><div class='del'>-		WARN(1, KERN_CRIT "push items %d nr %u\n", push_items,</div><div class='del'>-		       right_nritems);</div><div class='add'>+	if (unlikely(push_items &gt; right_nritems)) {</div><div class='add'>+		ret = -EUCLEAN;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_crit(fs_info, "push items (%d) &gt; right leaf items (%u)",</div><div class='add'>+			   push_items, right_nritems);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (push_items &lt; right_nritems) {</div><div class='ctx'> 		push_space = btrfs_item_offset(right, push_items - 1) -</div><div class='hunk'>@@ -3410,13 +3436,12 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   btrfs_header_nritems(right) - push_items);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_init_map_token(&amp;token, right);</div><div class='ctx'> 	right_nritems -= push_items;</div><div class='ctx'> 	btrfs_set_header_nritems(right, right_nritems);</div><div class='ctx'> 	push_space = BTRFS_LEAF_DATA_SIZE(fs_info);</div><div class='ctx'> 	for (i = 0; i &lt; right_nritems; i++) {</div><div class='del'>-		push_space = push_space - btrfs_token_item_size(&amp;token, i);</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, i, push_space);</div><div class='add'>+		push_space = push_space - btrfs_item_size(right, i);</div><div class='add'>+		btrfs_set_item_offset(right, i, push_space);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_mark_buffer_dirty(trans, left);</div><div class='hunk'>@@ -3431,8 +3456,8 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* then fixup the leaf pointer in the path */</div><div class='ctx'> 	if (path-&gt;slots[0] &lt; push_items) {</div><div class='ctx'> 		path-&gt;slots[0] += old_left_nritems;</div><div class='del'>-		btrfs_tree_unlock(path-&gt;nodes[0]);</div><div class='del'>-		free_extent_buffer(path-&gt;nodes[0]);</div><div class='add'>+		btrfs_tree_unlock(right);</div><div class='add'>+		free_extent_buffer(right);</div><div class='ctx'> 		path-&gt;nodes[0] = left;</div><div class='ctx'> 		path-&gt;slots[1] -= 1;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -3483,7 +3508,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 	if (IS_ERR(left))</div><div class='ctx'> 		return PTR_ERR(left);</div><div class='ctx'> </div><div class='del'>-	__btrfs_tree_lock(left, BTRFS_NESTING_LEFT);</div><div class='add'>+	btrfs_tree_lock_nested(left, BTRFS_NESTING_LEFT);</div><div class='ctx'> </div><div class='ctx'> 	free_space = btrfs_leaf_free_space(left);</div><div class='ctx'> 	if (free_space &lt; data_size) {</div><div class='hunk'>@@ -3501,7 +3526,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (check_sibling_keys(left, right)) {</div><div class='add'>+	if (unlikely(check_sibling_keys(left, right))) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3530,7 +3555,6 @@ static noinline int copy_for_split(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_disk_key disk_key;</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> </div><div class='ctx'> 	nritems = nritems - mid;</div><div class='ctx'> 	btrfs_set_header_nritems(right, nritems);</div><div class='hunk'>@@ -3543,12 +3567,11 @@ static noinline int copy_for_split(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	rt_data_off = BTRFS_LEAF_DATA_SIZE(fs_info) - btrfs_item_data_end(l, mid);</div><div class='ctx'> </div><div class='del'>-	btrfs_init_map_token(&amp;token, right);</div><div class='ctx'> 	for (i = 0; i &lt; nritems; i++) {</div><div class='ctx'> 		u32 ioff;</div><div class='ctx'> </div><div class='del'>-		ioff = btrfs_token_item_offset(&amp;token, i);</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, i, ioff + rt_data_off);</div><div class='add'>+		ioff = btrfs_item_offset(right, i);</div><div class='add'>+		btrfs_set_item_offset(right, i, ioff + rt_data_off);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_header_nritems(l, mid);</div><div class='hunk'>@@ -3651,7 +3674,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_root *root,</div><div class='ctx'> 			       const struct btrfs_key *ins_key,</div><div class='ctx'> 			       struct btrfs_path *path, int data_size,</div><div class='del'>-			       int extend)</div><div class='add'>+			       bool extend)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_disk_key disk_key;</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='hunk'>@@ -3761,7 +3784,7 @@ again:</div><div class='ctx'> 	 * BTRFS_NESTING_SPLIT_THE_SPLITTENING if we need to, but for now just</div><div class='ctx'> 	 * use BTRFS_NESTING_NEW_ROOT.</div><div class='ctx'> 	 */</div><div class='del'>-	right = btrfs_alloc_tree_block(trans, root, 0, root-&gt;root_key.objectid,</div><div class='add'>+	right = btrfs_alloc_tree_block(trans, root, 0, btrfs_root_id(root),</div><div class='ctx'> 				       &amp;disk_key, 0, l-&gt;start, 0, 0,</div><div class='ctx'> 				       num_doubles ? BTRFS_NESTING_NEW_ROOT :</div><div class='ctx'> 				       BTRFS_NESTING_SPLIT);</div><div class='hunk'>@@ -3847,6 +3870,7 @@ static noinline int setup_leaf_for_split(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(key.type != BTRFS_EXTENT_DATA_KEY &amp;&amp;</div><div class='add'>+	       key.type != BTRFS_RAID_STRIPE_KEY &amp;&amp;</div><div class='ctx'> 	       key.type != BTRFS_EXTENT_CSUM_KEY);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_leaf_free_space(leaf) &gt;= ins_len)</div><div class='hunk'>@@ -3860,10 +3884,10 @@ static noinline int setup_leaf_for_split(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	path-&gt;keep_locks = 1;</div><div class='del'>-	path-&gt;search_for_split = 1;</div><div class='add'>+	path-&gt;keep_locks = true;</div><div class='add'>+	path-&gt;search_for_split = true;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, 0, 1);</div><div class='del'>-	path-&gt;search_for_split = 0;</div><div class='add'>+	path-&gt;search_for_split = false;</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -3890,11 +3914,11 @@ static noinline int setup_leaf_for_split(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	path-&gt;keep_locks = 0;</div><div class='add'>+	path-&gt;keep_locks = false;</div><div class='ctx'> 	btrfs_unlock_up_safe(path, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='del'>-	path-&gt;keep_locks = 0;</div><div class='add'>+	path-&gt;keep_locks = false;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4003,7 +4027,7 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * the front.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_truncate_item(struct btrfs_trans_handle *trans,</div><div class='del'>-			 struct btrfs_path *path, u32 new_size, int from_end)</div><div class='add'>+			 const struct btrfs_path *path, u32 new_size, int from_end)</div><div class='ctx'> {</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -4013,7 +4037,6 @@ void btrfs_truncate_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	unsigned int old_size;</div><div class='ctx'> 	unsigned int size_diff;</div><div class='ctx'> 	int i;</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -4036,12 +4059,11 @@ void btrfs_truncate_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * item0..itemN ... dataN.offset..dataN.size .. data0.size</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* first correct the data pointers */</div><div class='del'>-	btrfs_init_map_token(&amp;token, leaf);</div><div class='ctx'> 	for (i = slot; i &lt; nritems; i++) {</div><div class='ctx'> 		u32 ioff;</div><div class='ctx'> </div><div class='del'>-		ioff = btrfs_token_item_offset(&amp;token, i);</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, i, ioff + size_diff);</div><div class='add'>+		ioff = btrfs_item_offset(leaf, i);</div><div class='add'>+		btrfs_set_item_offset(leaf, i, ioff + size_diff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* shift the data */</div><div class='hunk'>@@ -4085,7 +4107,7 @@ void btrfs_truncate_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_item_size(leaf, slot, new_size);</div><div class='ctx'> 	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_leaf_free_space(leaf) &lt; 0) {</div><div class='add'>+	if (unlikely(btrfs_leaf_free_space(leaf) &lt; 0)) {</div><div class='ctx'> 		btrfs_print_leaf(leaf);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4095,7 +4117,7 @@ void btrfs_truncate_item(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * make the item pointed to by the path bigger, data_size is the added size.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_extend_item(struct btrfs_trans_handle *trans,</div><div class='del'>-		       struct btrfs_path *path, u32 data_size)</div><div class='add'>+		       const struct btrfs_path *path, u32 data_size)</div><div class='ctx'> {</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -4104,14 +4126,13 @@ void btrfs_extend_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	unsigned int old_data;</div><div class='ctx'> 	unsigned int old_size;</div><div class='ctx'> 	int i;</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> </div><div class='ctx'> 	nritems = btrfs_header_nritems(leaf);</div><div class='ctx'> 	data_end = leaf_data_end(leaf);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_leaf_free_space(leaf) &lt; data_size) {</div><div class='add'>+	if (unlikely(btrfs_leaf_free_space(leaf) &lt; data_size)) {</div><div class='ctx'> 		btrfs_print_leaf(leaf);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4119,7 +4140,7 @@ void btrfs_extend_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	old_data = btrfs_item_data_end(leaf, slot);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(slot &lt; 0);</div><div class='del'>-	if (slot &gt;= nritems) {</div><div class='add'>+	if (unlikely(slot &gt;= nritems)) {</div><div class='ctx'> 		btrfs_print_leaf(leaf);</div><div class='ctx'> 		btrfs_crit(leaf-&gt;fs_info, "slot %d too large, nritems %d",</div><div class='ctx'> 			   slot, nritems);</div><div class='hunk'>@@ -4130,24 +4151,22 @@ void btrfs_extend_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * item0..itemN ... dataN.offset..dataN.size .. data0.size</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* first correct the data pointers */</div><div class='del'>-	btrfs_init_map_token(&amp;token, leaf);</div><div class='ctx'> 	for (i = slot; i &lt; nritems; i++) {</div><div class='ctx'> 		u32 ioff;</div><div class='ctx'> </div><div class='del'>-		ioff = btrfs_token_item_offset(&amp;token, i);</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, i, ioff - data_size);</div><div class='add'>+		ioff = btrfs_item_offset(leaf, i);</div><div class='add'>+		btrfs_set_item_offset(leaf, i, ioff - data_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* shift the data */</div><div class='ctx'> 	memmove_leaf_data(leaf, data_end - data_size, data_end,</div><div class='ctx'> 			  old_data - data_end);</div><div class='ctx'> </div><div class='del'>-	data_end = old_data;</div><div class='ctx'> 	old_size = btrfs_item_size(leaf, slot);</div><div class='ctx'> 	btrfs_set_item_size(leaf, slot, old_size + data_size);</div><div class='ctx'> 	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_leaf_free_space(leaf) &lt; 0) {</div><div class='add'>+	if (unlikely(btrfs_leaf_free_space(leaf) &lt; 0)) {</div><div class='ctx'> 		btrfs_print_leaf(leaf);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4175,7 +4194,6 @@ static void setup_items_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_disk_key disk_key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	int slot;</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> 	u32 total_size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4196,18 +4214,17 @@ static void setup_items_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	data_end = leaf_data_end(leaf);</div><div class='ctx'> 	total_size = batch-&gt;total_data_size + (batch-&gt;nr * sizeof(struct btrfs_item));</div><div class='ctx'> </div><div class='del'>-	if (btrfs_leaf_free_space(leaf) &lt; total_size) {</div><div class='add'>+	if (unlikely(btrfs_leaf_free_space(leaf) &lt; total_size)) {</div><div class='ctx'> 		btrfs_print_leaf(leaf);</div><div class='ctx'> 		btrfs_crit(fs_info, "not enough freespace need %u have %d",</div><div class='ctx'> 			   total_size, btrfs_leaf_free_space(leaf));</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_init_map_token(&amp;token, leaf);</div><div class='ctx'> 	if (slot != nritems) {</div><div class='ctx'> 		unsigned int old_data = btrfs_item_data_end(leaf, slot);</div><div class='ctx'> </div><div class='del'>-		if (old_data &lt; data_end) {</div><div class='add'>+		if (unlikely(old_data &lt; data_end)) {</div><div class='ctx'> 			btrfs_print_leaf(leaf);</div><div class='ctx'> 			btrfs_crit(fs_info,</div><div class='ctx'> 		"item at slot %d with data offset %u beyond data end of leaf %u",</div><div class='hunk'>@@ -4221,8 +4238,8 @@ static void setup_items_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		for (i = slot; i &lt; nritems; i++) {</div><div class='ctx'> 			u32 ioff;</div><div class='ctx'> </div><div class='del'>-			ioff = btrfs_token_item_offset(&amp;token, i);</div><div class='del'>-			btrfs_set_token_item_offset(&amp;token, i,</div><div class='add'>+			ioff = btrfs_item_offset(leaf, i);</div><div class='add'>+			btrfs_set_item_offset(leaf, i,</div><div class='ctx'> 						       ioff - batch-&gt;total_data_size);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* shift the items */</div><div class='hunk'>@@ -4239,14 +4256,14 @@ static void setup_items_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_cpu_key_to_disk(&amp;disk_key, &amp;batch-&gt;keys[i]);</div><div class='ctx'> 		btrfs_set_item_key(leaf, &amp;disk_key, slot + i);</div><div class='ctx'> 		data_end -= batch-&gt;data_sizes[i];</div><div class='del'>-		btrfs_set_token_item_offset(&amp;token, slot + i, data_end);</div><div class='del'>-		btrfs_set_token_item_size(&amp;token, slot + i, batch-&gt;data_sizes[i]);</div><div class='add'>+		btrfs_set_item_offset(leaf, slot + i, data_end);</div><div class='add'>+		btrfs_set_item_size(leaf, slot + i, batch-&gt;data_sizes[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_header_nritems(leaf, nritems + batch-&gt;nr);</div><div class='ctx'> 	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_leaf_free_space(leaf) &lt; 0) {</div><div class='add'>+	if (unlikely(btrfs_leaf_free_space(leaf) &lt; 0)) {</div><div class='ctx'> 		btrfs_print_leaf(leaf);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4280,6 +4297,10 @@ void btrfs_setup_item_for_insert(struct btrfs_trans_handle *trans,</div><div class='ctx'> /*</div><div class='ctx'>  * Given a key and some data, insert items into the tree.</div><div class='ctx'>  * This does all the path init required, making room in the tree if needed.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0        on success</div><div class='add'>+ *          -EEXIST  if the first key already exists</div><div class='add'>+ *          &lt; 0      on other errors</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_root *root,</div><div class='hunk'>@@ -4313,7 +4334,7 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		      u32 data_size)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	unsigned long ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -4327,7 +4348,6 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		write_extent_buffer(leaf, data, ptr, data_size);</div><div class='ctx'> 		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4385,7 +4405,7 @@ int btrfs_del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		if (level) {</div><div class='ctx'> 			ret = btrfs_tree_mod_log_insert_move(parent, slot,</div><div class='ctx'> 					slot + 1, nritems - slot - 1);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4398,7 +4418,7 @@ int btrfs_del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 	} else if (level) {</div><div class='ctx'> 		ret = btrfs_tree_mod_log_insert_key(parent, slot,</div><div class='ctx'> 						    BTRFS_MOD_LOG_KEY_REMOVE);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4450,10 +4470,13 @@ static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	root_sub_used_bytes(root);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;leaf-&gt;refs);</div><div class='del'>-	btrfs_free_tree_block(trans, btrfs_root_id(root), leaf, 0, 1);</div><div class='add'>+	refcount_inc(&amp;leaf-&gt;refs);</div><div class='add'>+	ret = btrfs_free_tree_block(trans, btrfs_root_id(root), leaf, 0, 1);</div><div class='ctx'> 	free_extent_buffer_stale(leaf);</div><div class='del'>-	return 0;</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> /*</div><div class='ctx'>  * delete the item at the leaf level in path.  If that empties</div><div class='hunk'>@@ -4474,7 +4497,6 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 	if (slot + nr != nritems) {</div><div class='ctx'> 		const u32 last_off = btrfs_item_offset(leaf, slot + nr - 1);</div><div class='ctx'> 		const int data_end = leaf_data_end(leaf);</div><div class='del'>-		struct btrfs_map_token token;</div><div class='ctx'> 		u32 dsize = 0;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='hunk'>@@ -4484,12 +4506,11 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		memmove_leaf_data(leaf, data_end + dsize, data_end,</div><div class='ctx'> 				  last_off - data_end);</div><div class='ctx'> </div><div class='del'>-		btrfs_init_map_token(&amp;token, leaf);</div><div class='ctx'> 		for (i = slot + nr; i &lt; nritems; i++) {</div><div class='ctx'> 			u32 ioff;</div><div class='ctx'> </div><div class='del'>-			ioff = btrfs_token_item_offset(&amp;token, i);</div><div class='del'>-			btrfs_set_token_item_offset(&amp;token, i, ioff + dsize);</div><div class='add'>+			ioff = btrfs_item_offset(leaf, i);</div><div class='add'>+			btrfs_set_item_offset(leaf, i, ioff + dsize);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		memmove_leaf_items(leaf, slot, slot + nr, nritems - slot - nr);</div><div class='hunk'>@@ -4499,9 +4520,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> 	/* delete the leaf if we've emptied it */</div><div class='ctx'> 	if (nritems == 0) {</div><div class='del'>-		if (leaf == root-&gt;node) {</div><div class='del'>-			btrfs_set_header_level(leaf, 0);</div><div class='del'>-		} else {</div><div class='add'>+		if (leaf != root-&gt;node) {</div><div class='ctx'> 			btrfs_clear_buffer_dirty(trans, leaf);</div><div class='ctx'> 			ret = btrfs_del_leaf(trans, root, path, leaf);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='hunk'>@@ -4532,7 +4551,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 			 * for possible call to btrfs_del_ptr below</div><div class='ctx'> 			 */</div><div class='ctx'> 			slot = path-&gt;slots[1];</div><div class='del'>-			atomic_inc(&amp;leaf-&gt;refs);</div><div class='add'>+			refcount_inc(&amp;leaf-&gt;refs);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We want to be able to at least push one item to the</div><div class='ctx'> 			 * left neighbour leaf, and that's the first item.</div><div class='hunk'>@@ -4567,10 +4586,9 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 			if (btrfs_header_nritems(leaf) == 0) {</div><div class='ctx'> 				path-&gt;slots[1] = slot;</div><div class='ctx'> 				ret = btrfs_del_leaf(trans, root, path, leaf);</div><div class='add'>+				free_extent_buffer(leaf);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					return ret;</div><div class='del'>-				free_extent_buffer(leaf);</div><div class='del'>-				ret = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* if we're still in the path, make sure</div><div class='ctx'> 				 * we're dirty.  Otherwise, one of the</div><div class='hunk'>@@ -4590,16 +4608,13 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A helper function to walk down the tree starting at min_key, and looking</div><div class='del'>- * for nodes or leaves that are have a minimum transaction id.</div><div class='add'>+ * for leaves that have a minimum transaction id.</div><div class='ctx'>  * This is used by the btree defrag code, and tree logging</div><div class='ctx'>  *</div><div class='ctx'>  * This does not cow, but it does stuff the starting key it finds back</div><div class='ctx'>  * into min_key, so you can call btrfs_search_slot with cow=1 on the</div><div class='ctx'>  * key and get a writable path.</div><div class='ctx'>  *</div><div class='del'>- * This honors path-&gt;lowest_level to prevent descent past a given level</div><div class='del'>- * of the tree.</div><div class='del'>- *</div><div class='ctx'>  * min_trans indicates the oldest transaction that you are interested</div><div class='ctx'>  * in walking through.  Any nodes or leaves older than min_trans are</div><div class='ctx'>  * skipped over (without reading them).</div><div class='hunk'>@@ -4612,16 +4627,16 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key,</div><div class='ctx'> 			 u64 min_trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *cur;</div><div class='del'>-	struct btrfs_key found_key;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	int sret;</div><div class='ctx'> 	u32 nritems;</div><div class='ctx'> 	int level;</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	int keep_locks = path-&gt;keep_locks;</div><div class='add'>+	const bool keep_locks = path-&gt;keep_locks;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(!path-&gt;nowait);</div><div class='del'>-	path-&gt;keep_locks = 1;</div><div class='add'>+	ASSERT(path-&gt;lowest_level == 0);</div><div class='add'>+	path-&gt;keep_locks = true;</div><div class='ctx'> again:</div><div class='ctx'> 	cur = btrfs_read_lock_root_node(root);</div><div class='ctx'> 	level = btrfs_header_level(cur);</div><div class='hunk'>@@ -4642,13 +4657,14 @@ again:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* at the lowest level, we're done, setup the path and exit */</div><div class='del'>-		if (level == path-&gt;lowest_level) {</div><div class='add'>+		/* At level 0 we're done, setup the path and exit. */</div><div class='add'>+		if (level == 0) {</div><div class='ctx'> 			if (slot &gt;= nritems)</div><div class='ctx'> 				goto find_next_key;</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			path-&gt;slots[level] = slot;</div><div class='del'>-			btrfs_item_key_to_cpu(cur, &amp;found_key, slot);</div><div class='add'>+			/* Save our key for returning back. */</div><div class='add'>+			btrfs_item_key_to_cpu(cur, min_key, slot);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sret &amp;&amp; slot &gt; 0)</div><div class='hunk'>@@ -4672,8 +4688,8 @@ find_next_key:</div><div class='ctx'> 		 * we didn't find a candidate key in this node, walk forward</div><div class='ctx'> 		 * and find another one</div><div class='ctx'> 		 */</div><div class='add'>+		path-&gt;slots[level] = slot;</div><div class='ctx'> 		if (slot &gt;= nritems) {</div><div class='del'>-			path-&gt;slots[level] = slot;</div><div class='ctx'> 			sret = btrfs_find_next_key(root, path, min_key, level,</div><div class='ctx'> 						  min_trans);</div><div class='ctx'> 			if (sret == 0) {</div><div class='hunk'>@@ -4683,13 +4699,6 @@ find_next_key:</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		/* save our key for returning back */</div><div class='del'>-		btrfs_node_key_to_cpu(cur, &amp;found_key, slot);</div><div class='del'>-		path-&gt;slots[level] = slot;</div><div class='del'>-		if (level == path-&gt;lowest_level) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='ctx'> 		cur = btrfs_read_node_slot(cur, slot);</div><div class='ctx'> 		if (IS_ERR(cur)) {</div><div class='ctx'> 			ret = PTR_ERR(cur);</div><div class='hunk'>@@ -4704,10 +4713,8 @@ find_next_key:</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	path-&gt;keep_locks = keep_locks;</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		btrfs_unlock_up_safe(path, path-&gt;lowest_level + 1);</div><div class='del'>-		memcpy(min_key, &amp;found_key, sizeof(found_key));</div><div class='del'>-	}</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		btrfs_unlock_up_safe(path, 1);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4719,7 +4726,7 @@ out:</div><div class='ctx'>  * 0 is returned if another key is found, &lt; 0 if there are any errors</div><div class='ctx'>  * and 1 is returned if there are no higher keys in the tree</div><div class='ctx'>  *</div><div class='del'>- * path-&gt;keep_locks should be set to 1 on the search made before</div><div class='add'>+ * path-&gt;keep_locks should be set to true on the search made before</div><div class='ctx'>  * calling this function.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_find_next_key(struct btrfs_root *root, struct btrfs_path *path,</div><div class='hunk'>@@ -4818,13 +4825,13 @@ again:</div><div class='ctx'> 	next = NULL;</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	path-&gt;keep_locks = 1;</div><div class='add'>+	path-&gt;keep_locks = true;</div><div class='ctx'> </div><div class='ctx'> 	if (time_seq) {</div><div class='ctx'> 		ret = btrfs_search_old_slot(root, &amp;key, path, time_seq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (path-&gt;need_commit_sem) {</div><div class='del'>-			path-&gt;need_commit_sem = 0;</div><div class='add'>+			path-&gt;need_commit_sem = false;</div><div class='ctx'> 			need_commit_sem = true;</div><div class='ctx'> 			if (path-&gt;nowait) {</div><div class='ctx'> 				if (!down_read_trylock(&amp;fs_info-&gt;commit_root_sem)) {</div><div class='hunk'>@@ -4837,41 +4844,30 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	}</div><div class='del'>-	path-&gt;keep_locks = 0;</div><div class='add'>+	path-&gt;keep_locks = false;</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	nritems = btrfs_header_nritems(path-&gt;nodes[0]);</div><div class='ctx'> 	/*</div><div class='del'>-	 * by releasing the path above we dropped all our locks.  A balance</div><div class='del'>-	 * could have added more items next to the key that used to be</div><div class='del'>-	 * at the very end of the block.  So, check again here and</div><div class='del'>-	 * advance the path if there are now more items available.</div><div class='del'>-	 */</div><div class='del'>-	if (nritems &gt; 0 &amp;&amp; path-&gt;slots[0] &lt; nritems - 1) {</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			path-&gt;slots[0]++;</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * So the above check misses one case:</div><div class='del'>-	 * - after releasing the path above, someone has removed the item that</div><div class='del'>-	 *   used to be at the very end of the block, and balance between leafs</div><div class='del'>-	 *   gets another one with bigger key.offset to replace it.</div><div class='add'>+	 * By releasing the path above we dropped all our locks.  A balance</div><div class='add'>+	 * could have happened and</div><div class='ctx'> 	 *</div><div class='del'>-	 * This one should be returned as well, or we can get leaf corruption</div><div class='del'>-	 * later(esp. in __btrfs_drop_extents()).</div><div class='add'>+	 * 1. added more items after the previous last item</div><div class='add'>+	 * 2. deleted the previous last item</div><div class='ctx'> 	 *</div><div class='del'>-	 * And a bit more explanation about this check,</div><div class='del'>-	 * with ret &gt; 0, the key isn't found, the path points to the slot</div><div class='del'>-	 * where it should be inserted, so the path-&gt;slots[0] item must be the</div><div class='del'>-	 * bigger one.</div><div class='add'>+	 * So, check again here and advance the path if there are now more</div><div class='add'>+	 * items available.</div><div class='ctx'> 	 */</div><div class='del'>-	if (nritems &gt; 0 &amp;&amp; ret &gt; 0 &amp;&amp; path-&gt;slots[0] == nritems - 1) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto done;</div><div class='add'>+	if (nritems &gt; 0 &amp;&amp; path-&gt;slots[0] &lt;= nritems - 1) {</div><div class='add'>+		if (ret == 0 &amp;&amp; path-&gt;slots[0] != nritems - 1) {</div><div class='add'>+			path-&gt;slots[0]++;</div><div class='add'>+			goto done;</div><div class='add'>+		} else if (ret &gt; 0) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (level &lt; BTRFS_MAX_LEVEL) {</div><div class='hunk'>@@ -4907,8 +4903,7 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		next = c;</div><div class='del'>-		ret = read_block_for_search(root, path, &amp;next, level,</div><div class='del'>-					    slot, &amp;key);</div><div class='add'>+		ret = read_block_for_search(root, path, &amp;next, slot, &amp;key);</div><div class='ctx'> 		if (ret == -EAGAIN &amp;&amp; !path-&gt;nowait)</div><div class='ctx'> 			goto again;</div><div class='ctx'> </div><div class='hunk'>@@ -4951,8 +4946,7 @@ again:</div><div class='ctx'> 		if (!level)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = read_block_for_search(root, path, &amp;next, level,</div><div class='del'>-					    0, &amp;key);</div><div class='add'>+		ret = read_block_for_search(root, path, &amp;next, 0, &amp;key);</div><div class='ctx'> 		if (ret == -EAGAIN &amp;&amp; !path-&gt;nowait)</div><div class='ctx'> 			goto again;</div><div class='ctx'> </div><div class='hunk'>@@ -4978,7 +4972,7 @@ done:</div><div class='ctx'> 	if (need_commit_sem) {</div><div class='ctx'> 		int ret2;</div><div class='ctx'> </div><div class='del'>-		path-&gt;need_commit_sem = 1;</div><div class='add'>+		path-&gt;need_commit_sem = true;</div><div class='ctx'> 		ret2 = finish_need_commit_sem_search(path);</div><div class='ctx'> 		up_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> 		if (ret2)</div><div class='hunk'>@@ -5082,9 +5076,7 @@ int btrfs_previous_extent_item(struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_ctree_init(void)</div><div class='ctx'> {</div><div class='del'>-	btrfs_path_cachep = kmem_cache_create("btrfs_path",</div><div class='del'>-			sizeof(struct btrfs_path), 0,</div><div class='del'>-			SLAB_MEM_SPREAD, NULL);</div><div class='add'>+	btrfs_path_cachep = KMEM_CACHE(btrfs_path, 0);</div><div class='ctx'> 	if (!btrfs_path_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h<br/>index 70e828d33177..692370fc07b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ctree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ctree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ctree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ctree.h</a></div><div class='hunk'>@@ -6,26 +6,23 @@</div><div class='ctx'> #ifndef BTRFS_CTREE_H</div><div class='ctx'> #define BTRFS_CTREE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/xarray.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> #include "locking.h"</div><div class='del'>-#include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> </div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_block_rsv;</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='del'>-struct btrfs_transaction;</div><div class='del'>-struct btrfs_pending_snapshot;</div><div class='del'>-struct btrfs_delayed_ref_root;</div><div class='del'>-struct btrfs_space_info;</div><div class='ctx'> struct btrfs_block_group;</div><div class='del'>-struct btrfs_ordered_sum;</div><div class='del'>-struct btrfs_ref;</div><div class='del'>-struct btrfs_bio;</div><div class='del'>-struct btrfs_ioctl_encoded_io_args;</div><div class='del'>-struct btrfs_device;</div><div class='del'>-struct btrfs_fs_devices;</div><div class='del'>-struct btrfs_balance_control;</div><div class='del'>-struct btrfs_delayed_root;</div><div class='del'>-struct reloc_control;</div><div class='ctx'> </div><div class='ctx'> /* Read ahead values for struct btrfs_path.reada */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -62,29 +59,32 @@ struct btrfs_path {</div><div class='ctx'> 	/* if there is real range locking, this locks field will change */</div><div class='ctx'> 	u8 locks[BTRFS_MAX_LEVEL];</div><div class='ctx'> 	u8 reada;</div><div class='del'>-	/* keep some upper locks as we walk down */</div><div class='ctx'> 	u8 lowest_level;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set by btrfs_split_item, tells search_slot to keep all locks</div><div class='ctx'> 	 * and to force calls to keep space in the nodes</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int search_for_split:1;</div><div class='del'>-	unsigned int keep_locks:1;</div><div class='del'>-	unsigned int skip_locking:1;</div><div class='del'>-	unsigned int search_commit_root:1;</div><div class='del'>-	unsigned int need_commit_sem:1;</div><div class='del'>-	unsigned int skip_release_on_error:1;</div><div class='add'>+	bool search_for_split:1;</div><div class='add'>+	/* Keep some upper locks as we walk down. */</div><div class='add'>+	bool keep_locks:1;</div><div class='add'>+	bool skip_locking:1;</div><div class='add'>+	bool search_commit_root:1;</div><div class='add'>+	bool need_commit_sem:1;</div><div class='add'>+	bool skip_release_on_error:1;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Indicate that new item (btrfs_search_slot) is extending already</div><div class='ctx'> 	 * existing item and ins_len contains only the data size and not item</div><div class='ctx'> 	 * header (ie. sizeof(struct btrfs_item) is not included).</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int search_for_extension:1;</div><div class='add'>+	bool search_for_extension:1;</div><div class='ctx'> 	/* Stop search if any locks need to be taken (for read) */</div><div class='del'>-	unsigned int nowait:1;</div><div class='add'>+	bool nowait:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BTRFS_PATH_AUTO_FREE(path_name)					\</div><div class='add'>+	struct btrfs_path *path_name __free(btrfs_free_path) = NULL</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The state of btrfs root</div><div class='ctx'>  */</div><div class='hunk'>@@ -222,14 +222,10 @@ struct btrfs_root {</div><div class='ctx'> </div><div class='ctx'> 	struct list_head root_list;</div><div class='ctx'> </div><div class='del'>-	spinlock_t inode_lock;</div><div class='del'>-	/* red-black tree that keeps track of in-memory inodes */</div><div class='del'>-	struct rb_root inode_tree;</div><div class='add'>+	/* Xarray that keeps track of in-memory inodes. */</div><div class='add'>+	struct xarray inodes;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Xarray that keeps track of delayed nodes of every inode, protected</div><div class='del'>-	 * by @inode_lock.</div><div class='del'>-	 */</div><div class='add'>+	/* Xarray that keeps track of delayed nodes of every inode. */</div><div class='ctx'> 	struct xarray delayed_nodes;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * right now this just gets used so that a root has its own devid</div><div class='hunk'>@@ -355,6 +351,35 @@ static inline void btrfs_set_root_last_log_commit(struct btrfs_root *root, int c</div><div class='ctx'> 	WRITE_ONCE(root-&gt;last_log_commit, commit_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 btrfs_get_root_last_trans(const struct btrfs_root *root)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(root-&gt;last_trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_set_root_last_trans(struct btrfs_root *root, u64 transid)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(root-&gt;last_trans, transid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return the generation this root started with.</div><div class='add'>+ *</div><div class='add'>+ * Every normal root that is created with root-&gt;root_key.offset set to it's</div><div class='add'>+ * originating generation.  If it is a snapshot it is the generation when the</div><div class='add'>+ * snapshot was created.</div><div class='add'>+ *</div><div class='add'>+ * However for TREE_RELOC roots root_key.offset is the objectid of the owning</div><div class='add'>+ * tree root.  Thankfully we copy the root item of the owning tree root, which</div><div class='add'>+ * has it's last_snapshot set to what we would have root_key.offset set to, so</div><div class='add'>+ * return that if this is a TREE_RELOC root.</div><div class='add'>+ */</div><div class='add'>+static inline u64 btrfs_root_origin_generation(const struct btrfs_root *root)</div><div class='add'>+{</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+		return btrfs_root_last_snapshot(&amp;root-&gt;root_item);</div><div class='add'>+	return root-&gt;root_key.offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Structure that conveys information about an extent that is going to replace</div><div class='ctx'>  * all the extents in a file range.</div><div class='hunk'>@@ -448,6 +473,8 @@ struct btrfs_file_private {</div><div class='ctx'> 	void *filldir_buf;</div><div class='ctx'> 	u64 last_index;</div><div class='ctx'> 	struct extent_state *llseek_cached_state;</div><div class='add'>+	/* Task that allocated this structure. */</div><div class='add'>+	struct task_struct *owner_task;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32 BTRFS_LEAF_DATA_SIZE(const struct btrfs_fs_info *info)</div><div class='hunk'>@@ -470,25 +497,10 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)</div><div class='ctx'> 	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \</div><div class='del'>-				((bytes) &gt;&gt; (fs_info)-&gt;sectorsize_bits)</div><div class='del'>-</div><div class='del'>-static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)</div><div class='del'>-{</div><div class='del'>-	return mapping_gfp_constraint(mapping, ~__GFP_FS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info,</div><div class='del'>-				   u64 start, u64 end);</div><div class='del'>-int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,</div><div class='del'>-			 u64 num_bytes, u64 *actual_bytes);</div><div class='del'>-int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range);</div><div class='del'>-</div><div class='del'>-/* ctree.c */</div><div class='ctx'> int __init btrfs_ctree_init(void);</div><div class='ctx'> void __cold btrfs_ctree_exit(void);</div><div class='ctx'> </div><div class='del'>-int btrfs_bin_search(struct extent_buffer *eb, int first_slot,</div><div class='add'>+int btrfs_bin_search(const struct extent_buffer *eb, int first_slot,</div><div class='ctx'> 		     const struct btrfs_key *key, int *slot);</div><div class='ctx'> </div><div class='ctx'> int __pure btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_key *k2);</div><div class='hunk'>@@ -528,7 +540,7 @@ int btrfs_previous_item(struct btrfs_root *root,</div><div class='ctx'> int btrfs_previous_extent_item(struct btrfs_root *root,</div><div class='ctx'> 			struct btrfs_path *path, u64 min_objectid);</div><div class='ctx'> void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,</div><div class='del'>-			     struct btrfs_path *path,</div><div class='add'>+			     const struct btrfs_path *path,</div><div class='ctx'> 			     const struct btrfs_key *new_key);</div><div class='ctx'> struct extent_buffer *btrfs_root_node(struct btrfs_root *root);</div><div class='ctx'> int btrfs_find_next_key(struct btrfs_root *root, struct btrfs_path *path,</div><div class='hunk'>@@ -556,15 +568,15 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		      struct btrfs_root *root,</div><div class='ctx'> 		      struct extent_buffer *buf,</div><div class='ctx'> 		      struct extent_buffer **cow_ret, u64 new_root_objectid);</div><div class='del'>-bool btrfs_block_can_be_shared(struct btrfs_trans_handle *trans,</div><div class='del'>-			       struct btrfs_root *root,</div><div class='del'>-			       struct extent_buffer *buf);</div><div class='add'>+bool btrfs_block_can_be_shared(const struct btrfs_trans_handle *trans,</div><div class='add'>+			       const struct btrfs_root *root,</div><div class='add'>+			       const struct extent_buffer *buf);</div><div class='ctx'> int btrfs_del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		  struct btrfs_path *path, int level, int slot);</div><div class='ctx'> void btrfs_extend_item(struct btrfs_trans_handle *trans,</div><div class='del'>-		       struct btrfs_path *path, u32 data_size);</div><div class='add'>+		       const struct btrfs_path *path, u32 data_size);</div><div class='ctx'> void btrfs_truncate_item(struct btrfs_trans_handle *trans,</div><div class='del'>-			 struct btrfs_path *path, u32 new_size, int from_end);</div><div class='add'>+			 const struct btrfs_path *path, u32 new_size, int from_end);</div><div class='ctx'> int btrfs_split_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		     struct btrfs_root *root,</div><div class='ctx'> 		     struct btrfs_path *path,</div><div class='hunk'>@@ -588,6 +600,7 @@ int btrfs_search_slot_for_read(struct btrfs_root *root,</div><div class='ctx'> void btrfs_release_path(struct btrfs_path *p);</div><div class='ctx'> struct btrfs_path *btrfs_alloc_path(void);</div><div class='ctx'> void btrfs_free_path(struct btrfs_path *p);</div><div class='add'>+DEFINE_FREE(btrfs_free_path, struct btrfs_path *, btrfs_free_path(_T))</div><div class='ctx'> </div><div class='ctx'> int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 		   struct btrfs_path *path, int slot, int nr);</div><div class='hunk'>@@ -706,13 +719,18 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p)</div><div class='ctx'> }</div><div class='ctx'> int btrfs_leaf_free_space(const struct extent_buffer *leaf);</div><div class='ctx'> </div><div class='del'>-static inline int is_fstree(u64 rootid)</div><div class='add'>+static inline bool btrfs_is_fstree(u64 rootid)</div><div class='ctx'> {</div><div class='del'>-	if (rootid == BTRFS_FS_TREE_OBJECTID ||</div><div class='del'>-	    ((s64)rootid &gt;= (s64)BTRFS_FIRST_FREE_OBJECTID &amp;&amp;</div><div class='del'>-	      !btrfs_qgroup_level(rootid)))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+	if (rootid == BTRFS_FS_TREE_OBJECTID)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if ((s64)rootid &lt; (s64)BTRFS_FIRST_FREE_OBJECTID)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (btrfs_qgroup_level(rootid) != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root)</div><div class='hunk'>@@ -720,23 +738,4 @@ static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root)</div><div class='ctx'> 	return root-&gt;root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 btrfs_csum_type_size(u16 type);</div><div class='del'>-int btrfs_super_csum_size(const struct btrfs_super_block *s);</div><div class='del'>-const char *btrfs_super_csum_name(u16 csum_type);</div><div class='del'>-const char *btrfs_super_csum_driver(u16 csum_type);</div><div class='del'>-size_t __attribute_const__ btrfs_get_num_csums(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We use page status Private2 to indicate there is an ordered extent with</div><div class='del'>- * unfinished IO.</div><div class='del'>- *</div><div class='del'>- * Rename the Private2 accessors to Ordered, to improve readability.</div><div class='del'>- */</div><div class='del'>-#define PageOrdered(page)		PagePrivate2(page)</div><div class='del'>-#define SetPageOrdered(page)		SetPagePrivate2(page)</div><div class='del'>-#define ClearPageOrdered(page)		ClearPagePrivate2(page)</div><div class='del'>-#define folio_test_ordered(folio)	folio_test_private_2(folio)</div><div class='del'>-#define folio_set_ordered(folio)	folio_set_private_2(folio)</div><div class='del'>-#define folio_clear_ordered(folio)	folio_clear_private_2(folio)</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c<br/>index c276b136ab63..b81e224d4a27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/defrag.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/defrag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/defrag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/defrag.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "locking.h"</div><div class='ctx'> #include "accessors.h"</div><div class='hunk'>@@ -16,6 +15,7 @@</div><div class='ctx'> #include "defrag.h"</div><div class='ctx'> #include "file-item.h"</div><div class='ctx'> #include "super.h"</div><div class='add'>+#include "compression.h"</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *btrfs_inode_defrag_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -46,8 +46,8 @@ struct inode_defrag {</div><div class='ctx'> 	u32 extent_thresh;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __compare_inode_defrag(struct inode_defrag *defrag1,</div><div class='del'>-				  struct inode_defrag *defrag2)</div><div class='add'>+static int compare_inode_defrag(const struct inode_defrag *defrag1,</div><div class='add'>+				const struct inode_defrag *defrag2)</div><div class='ctx'> {</div><div class='ctx'> 	if (defrag1-&gt;root &gt; defrag2-&gt;root)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -61,94 +61,80 @@ static int __compare_inode_defrag(struct inode_defrag *defrag1,</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int inode_defrag_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	const struct inode_defrag *new_defrag = rb_entry(new, struct inode_defrag, rb_node);</div><div class='add'>+	const struct inode_defrag *existing_defrag = rb_entry(existing, struct inode_defrag, rb_node);</div><div class='add'>+</div><div class='add'>+	return compare_inode_defrag(new_defrag, existing_defrag);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Pop a record for an inode into the defrag tree.  The lock must be held</div><div class='add'>+ * Insert a record for an inode into the defrag tree.  The lock must be held</div><div class='ctx'>  * already.</div><div class='ctx'>  *</div><div class='ctx'>  * If you're inserting a record for an older transid than an existing record,</div><div class='ctx'>  * the transid already in the tree is lowered.</div><div class='del'>- *</div><div class='del'>- * If an existing record is found the defrag item you pass in is freed.</div><div class='ctx'>  */</div><div class='del'>-static int __btrfs_add_inode_defrag(struct btrfs_inode *inode,</div><div class='del'>-				    struct inode_defrag *defrag)</div><div class='add'>+static int btrfs_insert_inode_defrag(struct btrfs_inode *inode,</div><div class='add'>+				     struct inode_defrag *defrag)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	struct inode_defrag *entry;</div><div class='del'>-	struct rb_node **p;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	int ret;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	p = &amp;fs_info-&gt;defrag_inodes.rb_node;</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		entry = rb_entry(parent, struct inode_defrag, rb_node);</div><div class='add'>+	node = rb_find_add(&amp;defrag-&gt;rb_node, &amp;fs_info-&gt;defrag_inodes, inode_defrag_cmp);</div><div class='add'>+	if (node) {</div><div class='add'>+		struct inode_defrag *entry;</div><div class='ctx'> </div><div class='del'>-		ret = __compare_inode_defrag(defrag, entry);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			p = &amp;parent-&gt;rb_left;</div><div class='del'>-		else if (ret &gt; 0)</div><div class='del'>-			p = &amp;parent-&gt;rb_right;</div><div class='del'>-		else {</div><div class='del'>-			/*</div><div class='del'>-			 * If we're reinserting an entry for an old defrag run,</div><div class='del'>-			 * make sure to lower the transid of our existing</div><div class='del'>-			 * record.</div><div class='del'>-			 */</div><div class='del'>-			if (defrag-&gt;transid &lt; entry-&gt;transid)</div><div class='del'>-				entry-&gt;transid = defrag-&gt;transid;</div><div class='del'>-			entry-&gt;extent_thresh = min(defrag-&gt;extent_thresh,</div><div class='del'>-						   entry-&gt;extent_thresh);</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		}</div><div class='add'>+		entry = rb_entry(node, struct inode_defrag, rb_node);</div><div class='add'>+		/*</div><div class='add'>+		 * If we're reinserting an entry for an old defrag run, make</div><div class='add'>+		 * sure to lower the transid of our existing record.</div><div class='add'>+		 */</div><div class='add'>+		if (defrag-&gt;transid &lt; entry-&gt;transid)</div><div class='add'>+			entry-&gt;transid = defrag-&gt;transid;</div><div class='add'>+		entry-&gt;extent_thresh = min(defrag-&gt;extent_thresh, entry-&gt;extent_thresh);</div><div class='add'>+		return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_bit(BTRFS_INODE_IN_DEFRAG, &amp;inode-&gt;runtime_flags);</div><div class='del'>-	rb_link_node(&amp;defrag-&gt;rb_node, parent, p);</div><div class='del'>-	rb_insert_color(&amp;defrag-&gt;rb_node, &amp;fs_info-&gt;defrag_inodes);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int __need_auto_defrag(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline bool need_auto_defrag(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	if (!btrfs_test_opt(fs_info, AUTO_DEFRAG))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_fs_closing(fs_info))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Insert a defrag record for this inode if auto defrag is enabled.</div><div class='add'>+ * Insert a defrag record for this inode if auto defrag is enabled. No errors</div><div class='add'>+ * returned as they're not considered fatal.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,</div><div class='del'>-			   struct btrfs_inode *inode, u32 extent_thresh)</div><div class='add'>+void btrfs_add_inode_defrag(struct btrfs_inode *inode, u32 extent_thresh)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct inode_defrag *defrag;</div><div class='del'>-	u64 transid;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!__need_auto_defrag(fs_info))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!need_auto_defrag(fs_info))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_INODE_IN_DEFRAG, &amp;inode-&gt;runtime_flags))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (trans)</div><div class='del'>-		transid = trans-&gt;transid;</div><div class='del'>-	else</div><div class='del'>-		transid = inode-&gt;root-&gt;last_trans;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	defrag = kmem_cache_zalloc(btrfs_inode_defrag_cachep, GFP_NOFS);</div><div class='ctx'> 	if (!defrag)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	defrag-&gt;ino = btrfs_ino(inode);</div><div class='del'>-	defrag-&gt;transid = transid;</div><div class='del'>-	defrag-&gt;root = root-&gt;root_key.objectid;</div><div class='add'>+	defrag-&gt;transid = btrfs_get_root_last_trans(root);</div><div class='add'>+	defrag-&gt;root = btrfs_root_id(root);</div><div class='ctx'> 	defrag-&gt;extent_thresh = extent_thresh;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;defrag_inodes_lock);</div><div class='hunk'>@@ -158,18 +144,17 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * and then re-read this inode, this new inode doesn't have</div><div class='ctx'> 		 * IN_DEFRAG flag. At the case, we may find the existed defrag.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = __btrfs_add_inode_defrag(inode, defrag);</div><div class='add'>+		ret = btrfs_insert_inode_defrag(inode, defrag);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			kmem_cache_free(btrfs_inode_defrag_cachep, defrag);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kmem_cache_free(btrfs_inode_defrag_cachep, defrag);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;defrag_inodes_lock);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Pick the defragable inode that we want, if it doesn't exist, we will get the</div><div class='add'>+ * Pick the defraggable inode that we want, if it doesn't exist, we will get the</div><div class='ctx'>  * next one.</div><div class='ctx'>  */</div><div class='ctx'> static struct inode_defrag *btrfs_pick_defrag_inode(</div><div class='hunk'>@@ -190,7 +175,7 @@ static struct inode_defrag *btrfs_pick_defrag_inode(</div><div class='ctx'> 		parent = p;</div><div class='ctx'> 		entry = rb_entry(parent, struct inode_defrag, rb_node);</div><div class='ctx'> </div><div class='del'>-		ret = __compare_inode_defrag(&amp;tmp, entry);</div><div class='add'>+		ret = compare_inode_defrag(&amp;tmp, entry);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			p = parent-&gt;rb_left;</div><div class='ctx'> 		else if (ret &gt; 0)</div><div class='hunk'>@@ -199,12 +184,9 @@ static struct inode_defrag *btrfs_pick_defrag_inode(</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (parent &amp;&amp; __compare_inode_defrag(&amp;tmp, entry) &gt; 0) {</div><div class='add'>+	if (parent &amp;&amp; compare_inode_defrag(&amp;tmp, entry) &gt; 0) {</div><div class='ctx'> 		parent = rb_next(parent);</div><div class='del'>-		if (parent)</div><div class='del'>-			entry = rb_entry(parent, struct inode_defrag, rb_node);</div><div class='del'>-		else</div><div class='del'>-			entry = NULL;</div><div class='add'>+		entry = rb_entry_safe(parent, struct inode_defrag, rb_node);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (entry)</div><div class='hunk'>@@ -215,30 +197,27 @@ out:</div><div class='ctx'> </div><div class='ctx'> void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct inode_defrag *defrag;</div><div class='del'>-	struct rb_node *node;</div><div class='add'>+	struct inode_defrag *defrag, *next;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;defrag_inodes_lock);</div><div class='del'>-	node = rb_first(&amp;fs_info-&gt;defrag_inodes);</div><div class='del'>-	while (node) {</div><div class='del'>-		rb_erase(node, &amp;fs_info-&gt;defrag_inodes);</div><div class='del'>-		defrag = rb_entry(node, struct inode_defrag, rb_node);</div><div class='add'>+</div><div class='add'>+	rbtree_postorder_for_each_entry_safe(defrag, next,</div><div class='add'>+					     &amp;fs_info-&gt;defrag_inodes, rb_node)</div><div class='ctx'> 		kmem_cache_free(btrfs_inode_defrag_cachep, defrag);</div><div class='ctx'> </div><div class='del'>-		cond_resched_lock(&amp;fs_info-&gt;defrag_inodes_lock);</div><div class='add'>+	fs_info-&gt;defrag_inodes = RB_ROOT;</div><div class='ctx'> </div><div class='del'>-		node = rb_first(&amp;fs_info-&gt;defrag_inodes);</div><div class='del'>-	}</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;defrag_inodes_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_DEFRAG_BATCH	1024</div><div class='ctx'> </div><div class='del'>-static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct inode_defrag *defrag)</div><div class='add'>+static int btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,</div><div class='add'>+				  struct inode_defrag *defrag,</div><div class='add'>+				  struct file_ra_state *ra)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *inode_root;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct btrfs_ioctl_defrag_range_args range;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u64 cur = 0;</div><div class='hunk'>@@ -246,7 +225,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,</div><div class='ctx'> again:</div><div class='ctx'> 	if (test_bit(BTRFS_FS_STATE_REMOUNTING, &amp;fs_info-&gt;fs_state))</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	if (!__need_auto_defrag(fs_info))</div><div class='add'>+	if (!need_auto_defrag(fs_info))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the inode */</div><div class='hunk'>@@ -256,30 +235,30 @@ again:</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(fs_info-&gt;sb, defrag-&gt;ino, inode_root);</div><div class='add'>+	inode = btrfs_iget(defrag-&gt;ino, inode_root);</div><div class='ctx'> 	btrfs_put_root(inode_root);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		ret = PTR_ERR(inode);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cur &gt;= i_size_read(inode)) {</div><div class='del'>-		iput(inode);</div><div class='add'>+	if (cur &gt;= i_size_read(&amp;inode-&gt;vfs_inode)) {</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do a chunk of defrag */</div><div class='del'>-	clear_bit(BTRFS_INODE_IN_DEFRAG, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+	clear_bit(BTRFS_INODE_IN_DEFRAG, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> 	memset(&amp;range, 0, sizeof(range));</div><div class='ctx'> 	range.len = (u64)-1;</div><div class='ctx'> 	range.start = cur;</div><div class='ctx'> 	range.extent_thresh = defrag-&gt;extent_thresh;</div><div class='add'>+	file_ra_state_init(ra, inode-&gt;vfs_inode.i_mapping);</div><div class='ctx'> </div><div class='del'>-	sb_start_write(fs_info-&gt;sb);</div><div class='del'>-	ret = btrfs_defrag_file(inode, NULL, &amp;range, defrag-&gt;transid,</div><div class='del'>-				       BTRFS_DEFRAG_BATCH);</div><div class='del'>-	sb_end_write(fs_info-&gt;sb);</div><div class='del'>-	iput(inode);</div><div class='add'>+	scoped_guard(super_write, fs_info-&gt;sb)</div><div class='add'>+		ret = btrfs_defrag_file(inode, ra, &amp;range,</div><div class='add'>+					defrag-&gt;transid, BTRFS_DEFRAG_BATCH);</div><div class='add'>+	iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -303,11 +282,13 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;fs_info-&gt;defrag_running);</div><div class='ctx'> 	while (1) {</div><div class='add'>+		struct file_ra_state ra = { 0 };</div><div class='add'>+</div><div class='ctx'> 		/* Pause the auto defragger. */</div><div class='ctx'> 		if (test_bit(BTRFS_FS_STATE_REMOUNTING, &amp;fs_info-&gt;fs_state))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!__need_auto_defrag(fs_info))</div><div class='add'>+		if (!need_auto_defrag(fs_info))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* find an inode to defrag */</div><div class='hunk'>@@ -325,7 +306,7 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		first_ino = defrag-&gt;ino + 1;</div><div class='ctx'> 		root_objectid = defrag-&gt;root;</div><div class='ctx'> </div><div class='del'>-		__btrfs_run_defrag_inode(fs_info, defrag);</div><div class='add'>+		btrfs_run_defrag_inode(fs_info, defrag, &amp;ra);</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_dec(&amp;fs_info-&gt;defrag_running);</div><div class='ctx'> </div><div class='hunk'>@@ -490,7 +471,7 @@ static int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		memcpy(&amp;key, &amp;root-&gt;defrag_progress, sizeof(key));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	path-&gt;keep_locks = 1;</div><div class='add'>+	path-&gt;keep_locks = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_forward(root, &amp;key, path, BTRFS_OLDEST_GENERATION);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -521,7 +502,7 @@ static int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * keep_locks set and lowest_level is 1, regardless of the value of</div><div class='ctx'> 	 * path-&gt;slots[1].</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(path-&gt;locks[1] == 0);</div><div class='add'>+	ASSERT(path-&gt;locks[1] != 0);</div><div class='ctx'> 	ret = btrfs_realloc_node(trans, root,</div><div class='ctx'> 				 path-&gt;nodes[1], 0,</div><div class='ctx'> 				 &amp;last_ret,</div><div class='hunk'>@@ -533,7 +514,7 @@ static int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now that we reallocated the node we can find the next key. Note that</div><div class='ctx'> 	 * btrfs_find_next_key() can release our path and do another search</div><div class='del'>-	 * without COWing, this is because even with path-&gt;keep_locks = 1,</div><div class='add'>+	 * without COWing, this is because even with path-&gt;keep_locks == true,</div><div class='ctx'> 	 * btrfs_search_slot() / ctree.c:unlock_up() does not keeps a lock on a</div><div class='ctx'> 	 * node when path-&gt;slots[node_level - 1] does not point to the last</div><div class='ctx'> 	 * item or a slot beyond the last item (ctree.c:unlock_up()). Therefore</div><div class='hunk'>@@ -634,7 +615,7 @@ static struct extent_map *defrag_get_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	u64 ino = btrfs_ino(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -708,8 +689,10 @@ iterate:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (key.offset &gt; start) {</div><div class='ctx'> 			em-&gt;start = start;</div><div class='del'>-			em-&gt;orig_start = start;</div><div class='del'>-			em-&gt;block_start = EXTENT_MAP_HOLE;</div><div class='add'>+			em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='add'>+			em-&gt;disk_num_bytes = 0;</div><div class='add'>+			em-&gt;ram_bytes = 0;</div><div class='add'>+			em-&gt;offset = 0;</div><div class='ctx'> 			em-&gt;len = key.offset - start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -742,12 +725,12 @@ next:</div><div class='ctx'> </div><div class='ctx'> not_found:</div><div class='ctx'> 	btrfs_release_path(&amp;path);</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	btrfs_release_path(&amp;path);</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -764,20 +747,20 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start,</div><div class='ctx'> 	 * full extent lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, start, sectorsize);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, start, sectorsize);</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can get a merged extent, in that case, we need to re-search</div><div class='ctx'> 	 * tree to get the original em for defrag.</div><div class='ctx'> 	 *</div><div class='del'>-	 * If @newer_than is 0 or em::generation &lt; newer_than, we can trust</div><div class='del'>-	 * this em, as either we don't care about the generation, or the</div><div class='del'>-	 * merged extent map will be rejected anyway.</div><div class='add'>+	 * This is because even if we have adjacent extents that are contiguous</div><div class='add'>+	 * and compatible (same type and flags), we still want to defrag them</div><div class='add'>+	 * so that we use less metadata (extent items in the extent tree and</div><div class='add'>+	 * file extent items in the inode's subvolume tree).</div><div class='ctx'> 	 */</div><div class='del'>-	if (em &amp;&amp; (em-&gt;flags &amp; EXTENT_FLAG_MERGED) &amp;&amp;</div><div class='del'>-	    newer_than &amp;&amp; em-&gt;generation &gt;= newer_than) {</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+	if (em &amp;&amp; (em-&gt;flags &amp; EXTENT_FLAG_MERGED)) {</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		em = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -787,10 +770,10 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start,</div><div class='ctx'> </div><div class='ctx'> 		/* Get the big lock and read metadata off disk. */</div><div class='ctx'> 		if (!locked)</div><div class='del'>-			lock_extent(io_tree, start, end, &amp;cached);</div><div class='add'>+			btrfs_lock_extent(io_tree, start, end, &amp;cached);</div><div class='ctx'> 		em = defrag_get_extent(BTRFS_I(inode), start, newer_than);</div><div class='ctx'> 		if (!locked)</div><div class='del'>-			unlock_extent(io_tree, start, end, &amp;cached);</div><div class='add'>+			btrfs_unlock_extent(io_tree, start, end, &amp;cached);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(em))</div><div class='ctx'> 			return NULL;</div><div class='hunk'>@@ -802,7 +785,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start,</div><div class='ctx'> static u32 get_extent_max_capacity(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				   const struct extent_map *em)</div><div class='ctx'> {</div><div class='del'>-	if (extent_map_is_compressed(em))</div><div class='add'>+	if (btrfs_extent_map_is_compressed(em))</div><div class='ctx'> 		return BTRFS_MAX_COMPRESSED;</div><div class='ctx'> 	return fs_info-&gt;max_extent_size;</div><div class='ctx'> }</div><div class='hunk'>@@ -810,7 +793,7 @@ static u32 get_extent_max_capacity(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> static bool defrag_check_next_extent(struct inode *inode, struct extent_map *em,</div><div class='ctx'> 				     u32 extent_thresh, u64 newer_than, bool locked)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct extent_map *next;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='hunk'>@@ -826,7 +809,7 @@ static bool defrag_check_next_extent(struct inode *inode, struct extent_map *em,</div><div class='ctx'> 	 */</div><div class='ctx'> 	next = defrag_lookup_extent(inode, em-&gt;start + em-&gt;len, newer_than, locked);</div><div class='ctx'> 	/* No more em or hole */</div><div class='del'>-	if (!next || next-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE)</div><div class='add'>+	if (!next || next-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (next-&gt;flags &amp; EXTENT_FLAG_PREALLOC)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -845,7 +828,7 @@ static bool defrag_check_next_extent(struct inode *inode, struct extent_map *em,</div><div class='ctx'> </div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map(next);</div><div class='add'>+	btrfs_free_extent_map(next);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -861,64 +844,70 @@ out:</div><div class='ctx'>  * NOTE: Caller should also wait for page writeback after the cluster is</div><div class='ctx'>  * prepared, here we don't do writeback wait for each page.</div><div class='ctx'>  */</div><div class='del'>-static struct page *defrag_prepare_one_page(struct btrfs_inode *inode, pgoff_t index)</div><div class='add'>+static struct folio *defrag_prepare_one_folio(struct btrfs_inode *inode, pgoff_t index)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='ctx'> 	gfp_t mask = btrfs_alloc_write_mask(mapping);</div><div class='del'>-	u64 page_start = (u64)index &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	u64 page_end = page_start + PAGE_SIZE - 1;</div><div class='add'>+	u64 lock_start;</div><div class='add'>+	u64 lock_end;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	page = find_or_create_page(mapping, index, mask);</div><div class='del'>-	if (!page)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	/* TODO: Add order fgp order flags when large folios are fully enabled. */</div><div class='add'>+	folio = __filemap_get_folio(mapping, index,</div><div class='add'>+				    FGP_LOCK | FGP_ACCESSED | FGP_CREAT, mask);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since we can defragment files opened read-only, we can encounter</div><div class='del'>-	 * transparent huge pages here (see CONFIG_READ_ONLY_THP_FOR_FS). We</div><div class='del'>-	 * can't do I/O using huge pages yet, so return an error for now.</div><div class='add'>+	 * transparent huge pages here (see CONFIG_READ_ONLY_THP_FOR_FS).</div><div class='add'>+	 *</div><div class='add'>+	 * The IO for such large folios is not fully tested, thus return</div><div class='add'>+	 * an error to reject such folios unless it's an experimental build.</div><div class='add'>+	 *</div><div class='ctx'> 	 * Filesystem transparent huge pages are typically only used for</div><div class='ctx'> 	 * executables that explicitly enable them, so this isn't very</div><div class='ctx'> 	 * restrictive.</div><div class='ctx'> 	 */</div><div class='del'>-	if (PageCompound(page)) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BTRFS_EXPERIMENTAL) &amp;&amp; folio_test_large(folio)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		return ERR_PTR(-ETXTBSY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = set_page_extent_mapped(page);</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	lock_start = folio_pos(folio);</div><div class='add'>+	lock_end = folio_next_pos(folio) - 1;</div><div class='ctx'> 	/* Wait for any existing ordered extent in the range */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct btrfs_ordered_extent *ordered;</div><div class='ctx'> </div><div class='del'>-		lock_extent(&amp;inode-&gt;io_tree, page_start, page_end, &amp;cached_state);</div><div class='del'>-		ordered = btrfs_lookup_ordered_range(inode, page_start, PAGE_SIZE);</div><div class='del'>-		unlock_extent(&amp;inode-&gt;io_tree, page_start, page_end,</div><div class='del'>-			      &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, lock_start, lock_end, &amp;cached_state);</div><div class='add'>+		ordered = btrfs_lookup_ordered_range(inode, lock_start, folio_size(folio));</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, lock_start, lock_end, &amp;cached_state);</div><div class='ctx'> 		if (!ordered)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		btrfs_start_ordered_extent(ordered);</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='del'>-		lock_page(page);</div><div class='add'>+		folio_lock(folio);</div><div class='ctx'> 		/*</div><div class='del'>-		 * We unlocked the page above, so we need check if it was</div><div class='add'>+		 * We unlocked the folio above, so we need check if it was</div><div class='ctx'> 		 * released or not.</div><div class='ctx'> 		 */</div><div class='del'>-		if (page-&gt;mapping != mapping || !PagePrivate(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (folio-&gt;mapping != mapping || !folio-&gt;private) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -927,21 +916,21 @@ again:</div><div class='ctx'> 	 * Now the page range has no ordered extent any more.  Read the page to</div><div class='ctx'> 	 * make it uptodate.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		btrfs_read_folio(NULL, page_folio(page));</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (page-&gt;mapping != mapping || !PagePrivate(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='add'>+		btrfs_read_folio(NULL, folio);</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (folio-&gt;mapping != mapping || !folio-&gt;private) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (unlikely(!folio_test_uptodate(folio))) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			return ERR_PTR(-EIO);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct defrag_target_range {</div><div class='hunk'>@@ -958,7 +947,7 @@ struct defrag_target_range {</div><div class='ctx'>  * @extent_thresh: file extent size threshold, any extent size &gt;= this value</div><div class='ctx'>  *		   will be ignored</div><div class='ctx'>  * @newer_than:    only defrag extents newer than this value</div><div class='del'>- * @do_compress:   whether the defrag is doing compression</div><div class='add'>+ * @do_compress:   whether the defrag is doing compression or no-compression</div><div class='ctx'>  *		   if true, @extent_thresh will be ignored and all regular</div><div class='ctx'>  *		   file extents meeting @newer_than will be targets.</div><div class='ctx'>  * @locked:	   if the range has already held extent lock</div><div class='hunk'>@@ -992,12 +981,12 @@ static int defrag_collect_targets(struct btrfs_inode *inode,</div><div class='ctx'> 		 * This is for users who want to convert inline extents to</div><div class='ctx'> 		 * regular ones through max_inline= mount option.</div><div class='ctx'> 		 */</div><div class='del'>-		if (em-&gt;block_start == EXTENT_MAP_INLINE &amp;&amp;</div><div class='add'>+		if (em-&gt;disk_bytenr == EXTENT_MAP_INLINE &amp;&amp;</div><div class='ctx'> 		    em-&gt;len &lt;= inode-&gt;root-&gt;fs_info-&gt;max_inline)</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='ctx'> 		/* Skip holes and preallocated extents. */</div><div class='del'>-		if (em-&gt;block_start == EXTENT_MAP_HOLE ||</div><div class='add'>+		if (em-&gt;disk_bytenr == EXTENT_MAP_HOLE ||</div><div class='ctx'> 		    (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC))</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='hunk'>@@ -1034,8 +1023,8 @@ static int defrag_collect_targets(struct btrfs_inode *inode,</div><div class='ctx'> 		 *    very likely resulting in a larger extent after writeback is</div><div class='ctx'> 		 *    triggered (except in a case of free space fragmentation).</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_range_bit_exists(&amp;inode-&gt;io_tree, cur, cur + range_len - 1,</div><div class='del'>-					  EXTENT_DELALLOC))</div><div class='add'>+		if (btrfs_test_range_bit_exists(&amp;inode-&gt;io_tree, cur, cur + range_len - 1,</div><div class='add'>+						EXTENT_DELALLOC))</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1046,7 +1035,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode,</div><div class='ctx'> 			goto add;</div><div class='ctx'> </div><div class='ctx'> 		/* Skip too large extent */</div><div class='del'>-		if (range_len &gt;= extent_thresh)</div><div class='add'>+		if (em-&gt;len &gt;= extent_thresh)</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1062,7 +1051,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode,</div><div class='ctx'> 		 * So if an inline extent passed all above checks, just add it</div><div class='ctx'> 		 * for defrag, and be converted to regular extents.</div><div class='ctx'> 		 */</div><div class='del'>-		if (em-&gt;block_start == EXTENT_MAP_INLINE)</div><div class='add'>+		if (em-&gt;disk_bytenr == EXTENT_MAP_INLINE)</div><div class='ctx'> 			goto add;</div><div class='ctx'> </div><div class='ctx'> 		next_mergeable = defrag_check_next_extent(&amp;inode-&gt;vfs_inode, em,</div><div class='hunk'>@@ -1073,8 +1062,8 @@ static int defrag_collect_targets(struct btrfs_inode *inode,</div><div class='ctx'> 			/* Empty target list, no way to merge with last entry */</div><div class='ctx'> 			if (list_empty(target_list))</div><div class='ctx'> 				goto next;</div><div class='del'>-			last = list_entry(target_list-&gt;prev,</div><div class='del'>-					  struct defrag_target_range, list);</div><div class='add'>+			last = list_last_entry(target_list,</div><div class='add'>+					       struct defrag_target_range, list);</div><div class='ctx'> 			/* Not mergeable with last entry */</div><div class='ctx'> 			if (last-&gt;start + last-&gt;len != cur)</div><div class='ctx'> 				goto next;</div><div class='hunk'>@@ -1084,7 +1073,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode,</div><div class='ctx'> </div><div class='ctx'> add:</div><div class='ctx'> 		last_is_target = true;</div><div class='del'>-		range_len = min(extent_map_end(em), start + len) - cur;</div><div class='add'>+		range_len = min(btrfs_extent_map_end(em), start + len) - cur;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This one is a good target, check if it can be merged into</div><div class='ctx'> 		 * last range of the target list.</div><div class='hunk'>@@ -1092,8 +1081,8 @@ add:</div><div class='ctx'> 		if (!list_empty(target_list)) {</div><div class='ctx'> 			struct defrag_target_range *last;</div><div class='ctx'> </div><div class='del'>-			last = list_entry(target_list-&gt;prev,</div><div class='del'>-					  struct defrag_target_range, list);</div><div class='add'>+			last = list_last_entry(target_list,</div><div class='add'>+					       struct defrag_target_range, list);</div><div class='ctx'> 			ASSERT(last-&gt;start + last-&gt;len &lt;= cur);</div><div class='ctx'> 			if (last-&gt;start + last-&gt;len == cur) {</div><div class='ctx'> 				/* Mergeable, enlarge the last entry */</div><div class='hunk'>@@ -1106,7 +1095,7 @@ add:</div><div class='ctx'> 		/* Allocate new defrag_target_range */</div><div class='ctx'> 		new = kmalloc(sizeof(*new), GFP_NOFS);</div><div class='ctx'> 		if (!new) {</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1115,8 +1104,8 @@ add:</div><div class='ctx'> 		list_add_tail(&amp;new-&gt;list, target_list);</div><div class='ctx'> </div><div class='ctx'> next:</div><div class='del'>-		cur = extent_map_end(em);</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		cur = btrfs_extent_map_end(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		struct defrag_target_range *entry;</div><div class='hunk'>@@ -1162,34 +1151,38 @@ static_assert(PAGE_ALIGNED(CLUSTER_SIZE));</div><div class='ctx'>  */</div><div class='ctx'> static int defrag_one_locked_target(struct btrfs_inode *inode,</div><div class='ctx'> 				    struct defrag_target_range *target,</div><div class='del'>-				    struct page **pages, int nr_pages,</div><div class='add'>+				    struct folio **folios, int nr_pages,</div><div class='ctx'> 				    struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct extent_changeset *data_reserved = NULL;</div><div class='ctx'> 	const u64 start = target-&gt;start;</div><div class='ctx'> 	const u64 len = target-&gt;len;</div><div class='del'>-	unsigned long last_index = (start + len - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long start_index = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long first_index = page_index(pages[0]);</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ASSERT(last_index - first_index + 1 &lt;= nr_pages);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_delalloc_reserve_space(inode, &amp;data_reserved, start, len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	clear_extent_bit(&amp;inode-&gt;io_tree, start, start + len - 1,</div><div class='del'>-			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |</div><div class='del'>-			 EXTENT_DEFRAG, cached_state);</div><div class='del'>-	set_extent_bit(&amp;inode-&gt;io_tree, start, start + len - 1,</div><div class='del'>-		       EXTENT_DELALLOC | EXTENT_DEFRAG, cached_state);</div><div class='del'>-</div><div class='del'>-	/* Update the page status */</div><div class='del'>-	for (i = start_index - first_index; i &lt;= last_index - first_index; i++) {</div><div class='del'>-		ClearPageChecked(pages[i]);</div><div class='del'>-		btrfs_folio_clamp_set_dirty(fs_info, page_folio(pages[i]), start, len);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, start, start + len - 1,</div><div class='add'>+			       EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |</div><div class='add'>+			       EXTENT_DEFRAG, cached_state);</div><div class='add'>+	btrfs_set_extent_bit(&amp;inode-&gt;io_tree, start, start + len - 1,</div><div class='add'>+			     EXTENT_DELALLOC | EXTENT_DEFRAG, cached_state);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update the page status.</div><div class='add'>+	 * Due to possible large folios, we have to check all folios one by one.</div><div class='add'>+	 */</div><div class='add'>+	for (int i = 0; i &lt; nr_pages &amp;&amp; folios[i]; i++) {</div><div class='add'>+		struct folio *folio = folios[i];</div><div class='add'>+</div><div class='add'>+		if (!folio)</div><div class='add'>+			break;</div><div class='add'>+		if (start &gt;= folio_next_pos(folio) ||</div><div class='add'>+		    start + len &lt;= folio_pos(folio))</div><div class='add'>+			continue;</div><div class='add'>+		btrfs_folio_clamp_clear_checked(fs_info, folio, start, len);</div><div class='add'>+		btrfs_folio_clamp_set_dirty(fs_info, folio, start, len);</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_delalloc_release_extents(inode, len);</div><div class='ctx'> 	extent_changeset_free(data_reserved);</div><div class='hunk'>@@ -1205,37 +1198,40 @@ static int defrag_one_range(struct btrfs_inode *inode, u64 start, u32 len,</div><div class='ctx'> 	struct defrag_target_range *entry;</div><div class='ctx'> 	struct defrag_target_range *tmp;</div><div class='ctx'> 	LIST_HEAD(target_list);</div><div class='del'>-	struct page **pages;</div><div class='add'>+	struct folio **folios;</div><div class='ctx'> 	const u32 sectorsize = inode-&gt;root-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	u64 last_index = (start + len - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	u64 start_index = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned int nr_pages = last_index - start_index + 1;</div><div class='add'>+	u64 cur = start;</div><div class='add'>+	const unsigned int nr_pages = ((start + len - 1) &gt;&gt; PAGE_SHIFT) -</div><div class='add'>+				      (start &gt;&gt; PAGE_SHIFT) + 1;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(nr_pages &lt;= CLUSTER_SIZE / PAGE_SIZE);</div><div class='ctx'> 	ASSERT(IS_ALIGNED(start, sectorsize) &amp;&amp; IS_ALIGNED(len, sectorsize));</div><div class='ctx'> </div><div class='del'>-	pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	if (!pages)</div><div class='add'>+	folios = kcalloc(nr_pages, sizeof(struct folio *), GFP_NOFS);</div><div class='add'>+	if (!folios)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare all pages */</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		pages[i] = defrag_prepare_one_page(inode, start_index + i);</div><div class='del'>-		if (IS_ERR(pages[i])) {</div><div class='del'>-			ret = PTR_ERR(pages[i]);</div><div class='del'>-			pages[i] = NULL;</div><div class='del'>-			goto free_pages;</div><div class='add'>+	for (int i = 0; cur &lt; start + len &amp;&amp; i &lt; nr_pages; i++) {</div><div class='add'>+		folios[i] = defrag_prepare_one_folio(inode, cur &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		if (IS_ERR(folios[i])) {</div><div class='add'>+			ret = PTR_ERR(folios[i]);</div><div class='add'>+			folios[i] = NULL;</div><div class='add'>+			goto free_folios;</div><div class='ctx'> 		}</div><div class='add'>+		cur = folio_next_pos(folios[i]);</div><div class='add'>+	}</div><div class='add'>+	for (int i = 0; i &lt; nr_pages; i++) {</div><div class='add'>+		if (!folios[i])</div><div class='add'>+			break;</div><div class='add'>+		folio_wait_writeback(folios[i]);</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++)</div><div class='del'>-		wait_on_page_writeback(pages[i]);</div><div class='ctx'> </div><div class='add'>+	/* We should get at least one folio. */</div><div class='add'>+	ASSERT(folios[0]);</div><div class='ctx'> 	/* Lock the pages range */</div><div class='del'>-	lock_extent(&amp;inode-&gt;io_tree, start_index &lt;&lt; PAGE_SHIFT,</div><div class='del'>-		    (last_index &lt;&lt; PAGE_SHIFT) + PAGE_SIZE - 1,</div><div class='del'>-		    &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, folio_pos(folios[0]), cur - 1, &amp;cached_state);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now we have a consistent view about the extent map, re-check</div><div class='ctx'> 	 * which range really needs to be defragged.</div><div class='hunk'>@@ -1250,7 +1246,7 @@ static int defrag_one_range(struct btrfs_inode *inode, u64 start, u32 len,</div><div class='ctx'> 		goto unlock_extent;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;target_list, list) {</div><div class='del'>-		ret = defrag_one_locked_target(inode, entry, pages, nr_pages,</div><div class='add'>+		ret = defrag_one_locked_target(inode, entry, folios, nr_pages,</div><div class='ctx'> 					       &amp;cached_state);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1261,17 +1257,15 @@ static int defrag_one_range(struct btrfs_inode *inode, u64 start, u32 len,</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 	}</div><div class='ctx'> unlock_extent:</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, start_index &lt;&lt; PAGE_SHIFT,</div><div class='del'>-		      (last_index &lt;&lt; PAGE_SHIFT) + PAGE_SIZE - 1,</div><div class='del'>-		      &amp;cached_state);</div><div class='del'>-free_pages:</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		if (pages[i]) {</div><div class='del'>-			unlock_page(pages[i]);</div><div class='del'>-			put_page(pages[i]);</div><div class='del'>-		}</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, folio_pos(folios[0]), cur - 1, &amp;cached_state);</div><div class='add'>+free_folios:</div><div class='add'>+	for (int i = 0; i &lt; nr_pages; i++) {</div><div class='add'>+		if (!folios[i])</div><div class='add'>+			break;</div><div class='add'>+		folio_unlock(folios[i]);</div><div class='add'>+		folio_put(folios[i]);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(pages);</div><div class='add'>+	kfree(folios);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1317,8 +1311,7 @@ static int defrag_one_cluster(struct btrfs_inode *inode,</div><div class='ctx'> 		if (entry-&gt;start + range_len &lt;= *last_scanned_ret)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (ra)</div><div class='del'>-			page_cache_sync_readahead(inode-&gt;vfs_inode.i_mapping,</div><div class='add'>+		page_cache_sync_readahead(inode-&gt;vfs_inode.i_mapping,</div><div class='ctx'> 				ra, NULL, entry-&gt;start &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 				((entry-&gt;start + range_len - 1) &gt;&gt; PAGE_SHIFT) -</div><div class='ctx'> 				(entry-&gt;start &gt;&gt; PAGE_SHIFT) + 1);</div><div class='hunk'>@@ -1350,7 +1343,7 @@ out:</div><div class='ctx'>  * Entry point to file defragmentation.</div><div class='ctx'>  *</div><div class='ctx'>  * @inode:	   inode to be defragged</div><div class='del'>- * @ra:		   readahead state (can be NUL)</div><div class='add'>+ * @ra:		   readahead state</div><div class='ctx'>  * @range:	   defrag options including range and flags</div><div class='ctx'>  * @newer_than:	   minimum transid to defrag</div><div class='ctx'>  * @max_to_defrag: max number of sectors to be defragged, if 0, the whole inode</div><div class='hunk'>@@ -1362,22 +1355,25 @@ out:</div><div class='ctx'>  * (Mostly for autodefrag, which sets @max_to_defrag thus we may exit early without</div><div class='ctx'>  *  defragging all the range).</div><div class='ctx'>  */</div><div class='del'>-int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='add'>+int btrfs_defrag_file(struct btrfs_inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 		      struct btrfs_ioctl_defrag_range_args *range,</div><div class='ctx'> 		      u64 newer_than, unsigned long max_to_defrag)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	unsigned long sectors_defragged = 0;</div><div class='del'>-	u64 isize = i_size_read(inode);</div><div class='add'>+	u64 isize = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	u64 cur;</div><div class='ctx'> 	u64 last_byte;</div><div class='ctx'> 	bool do_compress = (range-&gt;flags &amp; BTRFS_DEFRAG_RANGE_COMPRESS);</div><div class='del'>-	bool ra_allocated = false;</div><div class='add'>+	bool no_compress = (range-&gt;flags &amp; BTRFS_DEFRAG_RANGE_NOCOMPRESS);</div><div class='ctx'> 	int compress_type = BTRFS_COMPRESS_ZLIB;</div><div class='add'>+	int compress_level = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 extent_thresh = range-&gt;extent_thresh;</div><div class='ctx'> 	pgoff_t start_index;</div><div class='ctx'> </div><div class='add'>+	ASSERT(ra);</div><div class='add'>+</div><div class='ctx'> 	if (isize == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1385,10 +1381,24 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (do_compress) {</div><div class='del'>-		if (range-&gt;compress_type &gt;= BTRFS_NR_COMPRESS_TYPES)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (range-&gt;compress_type)</div><div class='del'>-			compress_type = range-&gt;compress_type;</div><div class='add'>+		if (range-&gt;flags &amp; BTRFS_DEFRAG_RANGE_COMPRESS_LEVEL) {</div><div class='add'>+			if (range-&gt;compress.type &gt;= BTRFS_NR_COMPRESS_TYPES)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (range-&gt;compress.type) {</div><div class='add'>+				compress_type  = range-&gt;compress.type;</div><div class='add'>+				compress_level = range-&gt;compress.level;</div><div class='add'>+				if (!btrfs_compress_level_valid(compress_type, compress_level))</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (range-&gt;compress_type &gt;= BTRFS_NR_COMPRESS_TYPES)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (range-&gt;compress_type)</div><div class='add'>+				compress_type = range-&gt;compress_type;</div><div class='add'>+		}</div><div class='add'>+	} else if (range-&gt;flags &amp; BTRFS_DEFRAG_RANGE_NOCOMPRESS) {</div><div class='add'>+		compress_type = BTRFS_DEFRAG_DONT_COMPRESS;</div><div class='add'>+		compress_level = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (extent_thresh == 0)</div><div class='hunk'>@@ -1407,24 +1417,12 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 	last_byte = round_up(last_byte, fs_info-&gt;sectorsize) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If we were not given a ra, allocate a readahead context. As</div><div class='del'>-	 * readahead is just an optimization, defrag will work without it so</div><div class='del'>-	 * we don't error out.</div><div class='del'>-	 */</div><div class='del'>-	if (!ra) {</div><div class='del'>-		ra_allocated = true;</div><div class='del'>-		ra = kzalloc(sizeof(*ra), GFP_KERNEL);</div><div class='del'>-		if (ra)</div><div class='del'>-			file_ra_state_init(ra, inode-&gt;i_mapping);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Make writeback start from the beginning of the range, so that the</div><div class='ctx'> 	 * defrag range can be written sequentially.</div><div class='ctx'> 	 */</div><div class='ctx'> 	start_index = cur &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if (start_index &lt; inode-&gt;i_mapping-&gt;writeback_index)</div><div class='del'>-		inode-&gt;i_mapping-&gt;writeback_index = start_index;</div><div class='add'>+	if (start_index &lt; inode-&gt;vfs_inode.i_mapping-&gt;writeback_index)</div><div class='add'>+		inode-&gt;vfs_inode.i_mapping-&gt;writeback_index = start_index;</div><div class='ctx'> </div><div class='ctx'> 	while (cur &lt; last_byte) {</div><div class='ctx'> 		const unsigned long prev_sectors_defragged = sectors_defragged;</div><div class='hunk'>@@ -1441,27 +1439,30 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 			       (SZ_256K &gt;&gt; PAGE_SHIFT)) &lt;&lt; PAGE_SHIFT) - 1;</div><div class='ctx'> 		cluster_end = min(cluster_end, last_byte);</div><div class='ctx'> </div><div class='del'>-		btrfs_inode_lock(BTRFS_I(inode), 0);</div><div class='del'>-		if (IS_SWAPFILE(inode)) {</div><div class='add'>+		btrfs_inode_lock(inode, 0);</div><div class='add'>+		if (IS_SWAPFILE(&amp;inode-&gt;vfs_inode)) {</div><div class='ctx'> 			ret = -ETXTBSY;</div><div class='del'>-			btrfs_inode_unlock(BTRFS_I(inode), 0);</div><div class='add'>+			btrfs_inode_unlock(inode, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!(inode-&gt;i_sb-&gt;s_flags &amp; SB_ACTIVE)) {</div><div class='del'>-			btrfs_inode_unlock(BTRFS_I(inode), 0);</div><div class='add'>+		if (!(inode-&gt;vfs_inode.i_sb-&gt;s_flags &amp; SB_ACTIVE)) {</div><div class='add'>+			btrfs_inode_unlock(inode, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (do_compress)</div><div class='del'>-			BTRFS_I(inode)-&gt;defrag_compress = compress_type;</div><div class='del'>-		ret = defrag_one_cluster(BTRFS_I(inode), ra, cur,</div><div class='add'>+		if (do_compress || no_compress) {</div><div class='add'>+			inode-&gt;defrag_compress = compress_type;</div><div class='add'>+			inode-&gt;defrag_compress_level = compress_level;</div><div class='add'>+		}</div><div class='add'>+		ret = defrag_one_cluster(inode, ra, cur,</div><div class='ctx'> 				cluster_end + 1 - cur, extent_thresh,</div><div class='del'>-				newer_than, do_compress, &amp;sectors_defragged,</div><div class='add'>+				newer_than, do_compress || no_compress,</div><div class='add'>+				&amp;sectors_defragged,</div><div class='ctx'> 				max_to_defrag, &amp;last_scanned);</div><div class='ctx'> </div><div class='ctx'> 		if (sectors_defragged &gt; prev_sectors_defragged)</div><div class='del'>-			balance_dirty_pages_ratelimited(inode-&gt;i_mapping);</div><div class='add'>+			balance_dirty_pages_ratelimited(inode-&gt;vfs_inode.i_mapping);</div><div class='ctx'> </div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), 0);</div><div class='add'>+		btrfs_inode_unlock(inode, 0);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		cur = max(cluster_end + 1, last_scanned);</div><div class='hunk'>@@ -1472,8 +1473,6 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ra_allocated)</div><div class='del'>-		kfree(ra);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update range.start for autodefrag, this will indicate where to start</div><div class='ctx'> 	 * in next run.</div><div class='hunk'>@@ -1485,10 +1484,10 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 		 * need to be written back immediately.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (range-&gt;flags &amp; BTRFS_DEFRAG_RANGE_START_IO) {</div><div class='del'>-			filemap_flush(inode-&gt;i_mapping);</div><div class='add'>+			filemap_flush(inode-&gt;vfs_inode.i_mapping);</div><div class='ctx'> 			if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,</div><div class='del'>-				     &amp;BTRFS_I(inode)-&gt;runtime_flags))</div><div class='del'>-				filemap_flush(inode-&gt;i_mapping);</div><div class='add'>+				     &amp;inode-&gt;runtime_flags))</div><div class='add'>+				filemap_flush(inode-&gt;vfs_inode.i_mapping);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (range-&gt;compress_type == BTRFS_COMPRESS_LZO)</div><div class='ctx'> 			btrfs_set_fs_incompat(fs_info, COMPRESS_LZO);</div><div class='hunk'>@@ -1496,10 +1495,10 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 			btrfs_set_fs_incompat(fs_info, COMPRESS_ZSTD);</div><div class='ctx'> 		ret = sectors_defragged;</div><div class='ctx'> 	}</div><div class='del'>-	if (do_compress) {</div><div class='del'>-		btrfs_inode_lock(BTRFS_I(inode), 0);</div><div class='del'>-		BTRFS_I(inode)-&gt;defrag_compress = BTRFS_COMPRESS_NONE;</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), 0);</div><div class='add'>+	if (do_compress || no_compress) {</div><div class='add'>+		btrfs_inode_lock(inode, 0);</div><div class='add'>+		inode-&gt;defrag_compress = BTRFS_COMPRESS_NONE;</div><div class='add'>+		btrfs_inode_unlock(inode, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1512,9 +1511,7 @@ void __cold btrfs_auto_defrag_exit(void)</div><div class='ctx'> int __init btrfs_auto_defrag_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_inode_defrag_cachep = kmem_cache_create("btrfs_inode_defrag",</div><div class='del'>-					sizeof(struct inode_defrag), 0,</div><div class='del'>-					SLAB_MEM_SPREAD,</div><div class='del'>-					NULL);</div><div class='add'>+					sizeof(struct inode_defrag), 0, 0, NULL);</div><div class='ctx'> 	if (!btrfs_inode_defrag_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/defrag.h b/fs/btrfs/defrag.h<br/>index 5a62763528d1..a7f917a38dbf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/defrag.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/defrag.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/defrag.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/defrag.h</a></div><div class='hunk'>@@ -3,13 +3,22 @@</div><div class='ctx'> #ifndef BTRFS_DEFRAG_H</div><div class='ctx'> #define BTRFS_DEFRAG_H</div><div class='ctx'> </div><div class='del'>-int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+</div><div class='add'>+struct file_ra_state;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_ioctl_defrag_range_args;</div><div class='add'>+</div><div class='add'>+int btrfs_defrag_file(struct btrfs_inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 		      struct btrfs_ioctl_defrag_range_args *range,</div><div class='ctx'> 		      u64 newer_than, unsigned long max_to_defrag);</div><div class='ctx'> int __init btrfs_auto_defrag_init(void);</div><div class='ctx'> void __cold btrfs_auto_defrag_exit(void);</div><div class='del'>-int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,</div><div class='del'>-			   struct btrfs_inode *inode, u32 extent_thresh);</div><div class='add'>+void btrfs_add_inode_defrag(struct btrfs_inode *inode, u32 extent_thresh);</div><div class='ctx'> int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_defrag_root(struct btrfs_root *root);</div><div class='head'>diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c<br/>index 2833e8ef4c09..0970799d0aa4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delalloc-space.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delalloc-space.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delalloc-space.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/delalloc-space.c</a></div><div class='hunk'>@@ -6,9 +6,7 @@</div><div class='ctx'> #include "block-rsv.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> #include "space-info.h"</div><div class='del'>-#include "transaction.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='del'>-#include "block-group.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -113,7 +111,19 @@</div><div class='ctx'>  *  making error handling and cleanup easier.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes)</div><div class='add'>+static inline struct btrfs_space_info *data_sinfo_for_inode(const struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+</div><div class='add'>+	if (btrfs_is_zoned(fs_info) &amp;&amp; btrfs_is_data_reloc_root(inode-&gt;root)) {</div><div class='add'>+		ASSERT(fs_info-&gt;data_sinfo-&gt;sub_group[0]-&gt;subgroup_id ==</div><div class='add'>+		       BTRFS_SUB_GROUP_DATA_RELOC);</div><div class='add'>+		return fs_info-&gt;data_sinfo-&gt;sub_group[0];</div><div class='add'>+	}</div><div class='add'>+	return fs_info-&gt;data_sinfo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_alloc_data_chunk_ondemand(const struct btrfs_inode *inode, u64 bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='hunk'>@@ -125,7 +135,7 @@ int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes)</div><div class='ctx'> 	if (btrfs_is_free_space_inode(inode))</div><div class='ctx'> 		flush = BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE;</div><div class='ctx'> </div><div class='del'>-	return btrfs_reserve_data_bytes(fs_info, bytes, flush);</div><div class='add'>+	return btrfs_reserve_data_bytes(data_sinfo_for_inode(inode), bytes, flush);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_check_data_free_space(struct btrfs_inode *inode,</div><div class='hunk'>@@ -146,14 +156,14 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode,</div><div class='ctx'> 	else if (btrfs_is_free_space_inode(inode))</div><div class='ctx'> 		flush = BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_reserve_data_bytes(fs_info, len, flush);</div><div class='add'>+	ret = btrfs_reserve_data_bytes(data_sinfo_for_inode(inode), len, flush);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */</div><div class='ctx'> 	ret = btrfs_qgroup_reserve_data(inode, reserved, start, len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_free_reserved_data_space_noquota(fs_info, len);</div><div class='add'>+		btrfs_free_reserved_data_space_noquota(inode, len);</div><div class='ctx'> 		extent_changeset_free(*reserved);</div><div class='ctx'> 		*reserved = NULL;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -170,15 +180,13 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode,</div><div class='ctx'>  * which we can't sleep and is sure it won't affect qgroup reserved space.</div><div class='ctx'>  * Like clear_bit_hook().</div><div class='ctx'>  */</div><div class='del'>-void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info,</div><div class='del'>-					    u64 len)</div><div class='add'>+void btrfs_free_reserved_data_space_noquota(struct btrfs_inode *inode, u64 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_space_info *data_sinfo;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(IS_ALIGNED(len, fs_info-&gt;sectorsize));</div><div class='ctx'> </div><div class='del'>-	data_sinfo = fs_info-&gt;data_sinfo;</div><div class='del'>-	btrfs_space_info_free_bytes_may_use(fs_info, data_sinfo, len);</div><div class='add'>+	btrfs_space_info_free_bytes_may_use(data_sinfo_for_inode(inode), len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -198,7 +206,7 @@ void btrfs_free_reserved_data_space(struct btrfs_inode *inode,</div><div class='ctx'> 	      round_down(start, fs_info-&gt;sectorsize);</div><div class='ctx'> 	start = round_down(start, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='del'>-	btrfs_free_reserved_data_space_noquota(fs_info, len);</div><div class='add'>+	btrfs_free_reserved_data_space_noquota(inode, len);</div><div class='ctx'> 	btrfs_qgroup_free_data(inode, reserved, start, len, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -245,7 +253,6 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct btrfs_block_rsv *block_rsv = &amp;inode-&gt;block_rsv;</div><div class='ctx'> 	u64 reserve_size = 0;</div><div class='ctx'> 	u64 qgroup_rsv_size = 0;</div><div class='del'>-	u64 csum_leaves;</div><div class='ctx'> 	unsigned outstanding_extents;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;inode-&gt;lock);</div><div class='hunk'>@@ -260,10 +267,12 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 						outstanding_extents);</div><div class='ctx'> 		reserve_size += btrfs_calc_metadata_size(fs_info, 1);</div><div class='ctx'> 	}</div><div class='del'>-	csum_leaves = btrfs_csum_bytes_to_leaves(fs_info,</div><div class='del'>-						 inode-&gt;csum_bytes);</div><div class='del'>-	reserve_size += btrfs_calc_insert_metadata_size(fs_info,</div><div class='del'>-							csum_leaves);</div><div class='add'>+	if (!(inode-&gt;flags &amp; BTRFS_INODE_NODATASUM)) {</div><div class='add'>+		u64 csum_leaves;</div><div class='add'>+</div><div class='add'>+		csum_leaves = btrfs_csum_bytes_to_leaves(fs_info, inode-&gt;csum_bytes);</div><div class='add'>+		reserve_size += btrfs_calc_insert_metadata_size(fs_info, csum_leaves);</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For qgroup rsv, the calculation is very simple:</div><div class='ctx'> 	 * account one nodesize for each outstanding extent</div><div class='hunk'>@@ -278,14 +287,20 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	spin_unlock(&amp;block_rsv-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void calc_inode_reservations(struct btrfs_fs_info *fs_info,</div><div class='add'>+static void calc_inode_reservations(struct btrfs_inode *inode,</div><div class='ctx'> 				    u64 num_bytes, u64 disk_num_bytes,</div><div class='ctx'> 				    u64 *meta_reserve, u64 *qgroup_reserve)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	u64 nr_extents = count_max_extents(fs_info, num_bytes);</div><div class='del'>-	u64 csum_leaves = btrfs_csum_bytes_to_leaves(fs_info, disk_num_bytes);</div><div class='add'>+	u64 csum_leaves;</div><div class='ctx'> 	u64 inode_update = btrfs_calc_metadata_size(fs_info, 1);</div><div class='ctx'> </div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_NODATASUM)</div><div class='add'>+		csum_leaves = 0;</div><div class='add'>+	else</div><div class='add'>+		csum_leaves = btrfs_csum_bytes_to_leaves(fs_info, disk_num_bytes);</div><div class='add'>+</div><div class='ctx'> 	*meta_reserve = btrfs_calc_insert_metadata_size(fs_info,</div><div class='ctx'> 						nr_extents + csum_leaves);</div><div class='ctx'> </div><div class='hunk'>@@ -337,14 +352,14 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,</div><div class='ctx'> 	 * everything out and try again, which is bad.  This way we just</div><div class='ctx'> 	 * over-reserve slightly, and clean up the mess when we are done.</div><div class='ctx'> 	 */</div><div class='del'>-	calc_inode_reservations(fs_info, num_bytes, disk_num_bytes,</div><div class='add'>+	calc_inode_reservations(inode, num_bytes, disk_num_bytes,</div><div class='ctx'> 				&amp;meta_reserve, &amp;qgroup_reserve);</div><div class='ctx'> 	ret = btrfs_qgroup_reserve_meta_prealloc(root, qgroup_reserve, true,</div><div class='ctx'> 						 noflush);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv-&gt;space_info,</div><div class='del'>-					   meta_reserve, flush);</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(block_rsv-&gt;space_info, meta_reserve,</div><div class='add'>+					   flush);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_qgroup_free_meta_prealloc(root, qgroup_reserve);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -359,7 +374,8 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,</div><div class='ctx'> 	nr_extents = count_max_extents(fs_info, num_bytes);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 	btrfs_mod_outstanding_extents(inode, nr_extents);</div><div class='del'>-	inode-&gt;csum_bytes += disk_num_bytes;</div><div class='add'>+	if (!(inode-&gt;flags &amp; BTRFS_INODE_NODATASUM))</div><div class='add'>+		inode-&gt;csum_bytes += disk_num_bytes;</div><div class='ctx'> 	btrfs_calculate_inode_block_rsv_size(fs_info, inode);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +409,8 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,</div><div class='ctx'> </div><div class='ctx'> 	num_bytes = ALIGN(num_bytes, fs_info-&gt;sectorsize);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;lock);</div><div class='del'>-	inode-&gt;csum_bytes -= num_bytes;</div><div class='add'>+	if (!(inode-&gt;flags &amp; BTRFS_INODE_NODATASUM))</div><div class='add'>+		inode-&gt;csum_bytes -= num_bytes;</div><div class='ctx'> 	btrfs_calculate_inode_block_rsv_size(fs_info, inode);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -432,6 +449,29 @@ void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes)</div><div class='ctx'> 	btrfs_inode_rsv_release(inode, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Shrink a previously reserved extent to a new length. */</div><div class='add'>+void btrfs_delalloc_shrink_extents(struct btrfs_inode *inode, u64 reserved_len, u64 new_len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	const u32 reserved_num_extents = count_max_extents(fs_info, reserved_len);</div><div class='add'>+	const u32 new_num_extents = count_max_extents(fs_info, new_len);</div><div class='add'>+	const int diff_num_extents = new_num_extents - reserved_num_extents;</div><div class='add'>+</div><div class='add'>+	ASSERT(new_len &lt;= reserved_len);</div><div class='add'>+	if (new_num_extents == reserved_num_extents)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;lock);</div><div class='add'>+	btrfs_mod_outstanding_extents(inode, diff_num_extents);</div><div class='add'>+	btrfs_calculate_inode_block_rsv_size(fs_info, inode);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (btrfs_is_testing(fs_info))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	btrfs_inode_rsv_release(inode, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Reserve data and metadata space for delalloc</div><div class='ctx'>  *</div><div class='head'>diff --git a/fs/btrfs/delalloc-space.h b/fs/btrfs/delalloc-space.h<br/>index c5d573f2366e..6119c0d3f883 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delalloc-space.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delalloc-space.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delalloc-space.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/delalloc-space.h</a></div><div class='hunk'>@@ -3,9 +3,13 @@</div><div class='ctx'> #ifndef BTRFS_DELALLOC_SPACE_H</div><div class='ctx'> #define BTRFS_DELALLOC_SPACE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> struct extent_changeset;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> </div><div class='del'>-int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes);</div><div class='add'>+int btrfs_alloc_data_chunk_ondemand(const struct btrfs_inode *inode, u64 bytes);</div><div class='ctx'> int btrfs_check_data_free_space(struct btrfs_inode *inode,</div><div class='ctx'> 			struct extent_changeset **reserved, u64 start, u64 len,</div><div class='ctx'> 			bool noflush);</div><div class='hunk'>@@ -14,8 +18,7 @@ void btrfs_free_reserved_data_space(struct btrfs_inode *inode,</div><div class='ctx'> void btrfs_delalloc_release_space(struct btrfs_inode *inode,</div><div class='ctx'> 				  struct extent_changeset *reserved,</div><div class='ctx'> 				  u64 start, u64 len, bool qgroup_free);</div><div class='del'>-void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info,</div><div class='del'>-					    u64 len);</div><div class='add'>+void btrfs_free_reserved_data_space_noquota(struct btrfs_inode *inode, u64 len);</div><div class='ctx'> void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,</div><div class='ctx'> 				     bool qgroup_free);</div><div class='ctx'> int btrfs_delalloc_reserve_space(struct btrfs_inode *inode,</div><div class='hunk'>@@ -23,5 +26,6 @@ int btrfs_delalloc_reserve_space(struct btrfs_inode *inode,</div><div class='ctx'> int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,</div><div class='ctx'> 				    u64 disk_num_bytes, bool noflush);</div><div class='ctx'> void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes);</div><div class='add'>+void btrfs_delalloc_shrink_extents(struct btrfs_inode *inode, u64 reserved_len, u64 new_len);</div><div class='ctx'> </div><div class='ctx'> #endif /* BTRFS_DELALLOC_SPACE_H */</div><div class='head'>diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c<br/>index 08102883f560..ce6e9f8812e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/delayed-inode.c</a></div><div class='hunk'>@@ -28,11 +28,7 @@ static struct kmem_cache *delayed_node_cache;</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_delayed_inode_init(void)</div><div class='ctx'> {</div><div class='del'>-	delayed_node_cache = kmem_cache_create("btrfs_delayed_node",</div><div class='del'>-					sizeof(struct btrfs_delayed_node),</div><div class='del'>-					0,</div><div class='del'>-					SLAB_MEM_SPREAD,</div><div class='del'>-					NULL);</div><div class='add'>+	delayed_node_cache = KMEM_CACHE(btrfs_delayed_node, 0);</div><div class='ctx'> 	if (!delayed_node_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -43,6 +39,17 @@ void __cold btrfs_delayed_inode_exit(void)</div><div class='ctx'> 	kmem_cache_destroy(delayed_node_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_init_delayed_root(struct btrfs_delayed_root *delayed_root)</div><div class='add'>+{</div><div class='add'>+	atomic_set(&amp;delayed_root-&gt;items, 0);</div><div class='add'>+	atomic_set(&amp;delayed_root-&gt;items_seq, 0);</div><div class='add'>+	delayed_root-&gt;nodes = 0;</div><div class='add'>+	spin_lock_init(&amp;delayed_root-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;delayed_root-&gt;wait);</div><div class='add'>+	INIT_LIST_HEAD(&amp;delayed_root-&gt;node_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;delayed_root-&gt;prepare_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void btrfs_init_delayed_node(</div><div class='ctx'> 				struct btrfs_delayed_node *delayed_node,</div><div class='ctx'> 				struct btrfs_root *root, u64 inode_id)</div><div class='hunk'>@@ -50,6 +57,7 @@ static inline void btrfs_init_delayed_node(</div><div class='ctx'> 	delayed_node-&gt;root = root;</div><div class='ctx'> 	delayed_node-&gt;inode_id = inode_id;</div><div class='ctx'> 	refcount_set(&amp;delayed_node-&gt;refs, 0);</div><div class='add'>+	btrfs_delayed_node_ref_tracker_dir_init(delayed_node);</div><div class='ctx'> 	delayed_node-&gt;ins_root = RB_ROOT_CACHED;</div><div class='ctx'> 	delayed_node-&gt;del_root = RB_ROOT_CACHED;</div><div class='ctx'> 	mutex_init(&amp;delayed_node-&gt;mutex);</div><div class='hunk'>@@ -58,7 +66,8 @@ static inline void btrfs_init_delayed_node(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_node *btrfs_get_delayed_node(</div><div class='del'>-		struct btrfs_inode *btrfs_inode)</div><div class='add'>+		struct btrfs_inode *btrfs_inode,</div><div class='add'>+		struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_inode-&gt;root;</div><div class='ctx'> 	u64 ino = btrfs_ino(btrfs_inode);</div><div class='hunk'>@@ -67,17 +76,19 @@ static struct btrfs_delayed_node *btrfs_get_delayed_node(</div><div class='ctx'> 	node = READ_ONCE(btrfs_inode-&gt;delayed_node);</div><div class='ctx'> 	if (node) {</div><div class='ctx'> 		refcount_inc(&amp;node-&gt;refs);</div><div class='add'>+		btrfs_delayed_node_ref_tracker_alloc(node, tracker, GFP_NOFS);</div><div class='ctx'> 		return node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;root-&gt;inode_lock);</div><div class='add'>+	xa_lock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 	node = xa_load(&amp;root-&gt;delayed_nodes, ino);</div><div class='ctx'> </div><div class='ctx'> 	if (node) {</div><div class='ctx'> 		if (btrfs_inode-&gt;delayed_node) {</div><div class='ctx'> 			refcount_inc(&amp;node-&gt;refs);	/* can be accessed */</div><div class='add'>+			btrfs_delayed_node_ref_tracker_alloc(node, tracker, GFP_ATOMIC);</div><div class='ctx'> 			BUG_ON(btrfs_inode-&gt;delayed_node != node);</div><div class='del'>-			spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+			xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 			return node;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -99,22 +110,31 @@ static struct btrfs_delayed_node *btrfs_get_delayed_node(</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (refcount_inc_not_zero(&amp;node-&gt;refs)) {</div><div class='ctx'> 			refcount_inc(&amp;node-&gt;refs);</div><div class='add'>+			btrfs_delayed_node_ref_tracker_alloc(node, tracker, GFP_ATOMIC);</div><div class='add'>+			btrfs_delayed_node_ref_tracker_alloc(node, &amp;node-&gt;inode_cache_tracker,</div><div class='add'>+							     GFP_ATOMIC);</div><div class='ctx'> 			btrfs_inode-&gt;delayed_node = node;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			node = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+		xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 		return node;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+	xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Will return either the node or PTR_ERR(-ENOMEM) */</div><div class='add'>+/*</div><div class='add'>+ * Look up an existing delayed node associated with @btrfs_inode or create a new</div><div class='add'>+ * one and insert it to the delayed nodes of the root.</div><div class='add'>+ *</div><div class='add'>+ * Return the delayed node, or error pointer on failure.</div><div class='add'>+ */</div><div class='ctx'> static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(</div><div class='del'>-		struct btrfs_inode *btrfs_inode)</div><div class='add'>+		struct btrfs_inode *btrfs_inode,</div><div class='add'>+		struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_node *node;</div><div class='ctx'> 	struct btrfs_root *root = btrfs_inode-&gt;root;</div><div class='hunk'>@@ -123,7 +143,7 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	node = btrfs_get_delayed_node(btrfs_inode);</div><div class='add'>+	node = btrfs_get_delayed_node(btrfs_inode, tracker);</div><div class='ctx'> 	if (node)</div><div class='ctx'> 		return node;</div><div class='ctx'> </div><div class='hunk'>@@ -132,30 +152,35 @@ again:</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	btrfs_init_delayed_node(node, root, ino);</div><div class='ctx'> </div><div class='del'>-	/* Cached in the inode and can be accessed. */</div><div class='del'>-	refcount_set(&amp;node-&gt;refs, 2);</div><div class='del'>-</div><div class='ctx'> 	/* Allocate and reserve the slot, from now it can return a NULL from xa_load(). */</div><div class='ctx'> 	ret = xa_reserve(&amp;root-&gt;delayed_nodes, ino, GFP_NOFS);</div><div class='ctx'> 	if (ret == -ENOMEM) {</div><div class='add'>+		btrfs_delayed_node_ref_tracker_dir_exit(node);</div><div class='ctx'> 		kmem_cache_free(delayed_node_cache, node);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;root-&gt;inode_lock);</div><div class='add'>+	xa_lock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 	ptr = xa_load(&amp;root-&gt;delayed_nodes, ino);</div><div class='ctx'> 	if (ptr) {</div><div class='ctx'> 		/* Somebody inserted it, go back and read it. */</div><div class='del'>-		spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+		xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='add'>+		btrfs_delayed_node_ref_tracker_dir_exit(node);</div><div class='ctx'> 		kmem_cache_free(delayed_node_cache, node);</div><div class='ctx'> 		node = NULL;</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='del'>-	ptr = xa_store(&amp;root-&gt;delayed_nodes, ino, node, GFP_ATOMIC);</div><div class='add'>+	ptr = __xa_store(&amp;root-&gt;delayed_nodes, ino, node, GFP_ATOMIC);</div><div class='ctx'> 	ASSERT(xa_err(ptr) != -EINVAL);</div><div class='ctx'> 	ASSERT(xa_err(ptr) != -ENOMEM);</div><div class='ctx'> 	ASSERT(ptr == NULL);</div><div class='add'>+</div><div class='add'>+	/* Cached in the inode and can be accessed. */</div><div class='add'>+	refcount_set(&amp;node-&gt;refs, 2);</div><div class='add'>+	btrfs_delayed_node_ref_tracker_alloc(node, tracker, GFP_ATOMIC);</div><div class='add'>+	btrfs_delayed_node_ref_tracker_alloc(node, &amp;node-&gt;inode_cache_tracker, GFP_ATOMIC);</div><div class='add'>+</div><div class='ctx'> 	btrfs_inode-&gt;delayed_node = node;</div><div class='del'>-	spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+	xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> </div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='hunk'>@@ -179,6 +204,8 @@ static void btrfs_queue_delayed_node(struct btrfs_delayed_root *root,</div><div class='ctx'> 		list_add_tail(&amp;node-&gt;n_list, &amp;root-&gt;node_list);</div><div class='ctx'> 		list_add_tail(&amp;node-&gt;p_list, &amp;root-&gt;prepare_list);</div><div class='ctx'> 		refcount_inc(&amp;node-&gt;refs);	/* inserted into list */</div><div class='add'>+		btrfs_delayed_node_ref_tracker_alloc(node, &amp;node-&gt;node_list_tracker,</div><div class='add'>+						     GFP_ATOMIC);</div><div class='ctx'> 		root-&gt;nodes++;</div><div class='ctx'> 		set_bit(BTRFS_DELAYED_NODE_IN_LIST, &amp;node-&gt;flags);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -192,6 +219,7 @@ static void btrfs_dequeue_delayed_node(struct btrfs_delayed_root *root,</div><div class='ctx'> 	spin_lock(&amp;root-&gt;lock);</div><div class='ctx'> 	if (test_bit(BTRFS_DELAYED_NODE_IN_LIST, &amp;node-&gt;flags)) {</div><div class='ctx'> 		root-&gt;nodes--;</div><div class='add'>+		btrfs_delayed_node_ref_tracker_free(node, &amp;node-&gt;node_list_tracker);</div><div class='ctx'> 		refcount_dec(&amp;node-&gt;refs);	/* not in the list */</div><div class='ctx'> 		list_del_init(&amp;node-&gt;n_list);</div><div class='ctx'> 		if (!list_empty(&amp;node-&gt;p_list))</div><div class='hunk'>@@ -202,26 +230,26 @@ static void btrfs_dequeue_delayed_node(struct btrfs_delayed_root *root,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_node *btrfs_first_delayed_node(</div><div class='del'>-			struct btrfs_delayed_root *delayed_root)</div><div class='add'>+			struct btrfs_delayed_root *delayed_root,</div><div class='add'>+			struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *p;</div><div class='del'>-	struct btrfs_delayed_node *node = NULL;</div><div class='add'>+	struct btrfs_delayed_node *node;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;delayed_root-&gt;lock);</div><div class='del'>-	if (list_empty(&amp;delayed_root-&gt;node_list))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	p = delayed_root-&gt;node_list.next;</div><div class='del'>-	node = list_entry(p, struct btrfs_delayed_node, n_list);</div><div class='del'>-	refcount_inc(&amp;node-&gt;refs);</div><div class='del'>-out:</div><div class='add'>+	node = list_first_entry_or_null(&amp;delayed_root-&gt;node_list,</div><div class='add'>+					struct btrfs_delayed_node, n_list);</div><div class='add'>+	if (node) {</div><div class='add'>+		refcount_inc(&amp;node-&gt;refs);</div><div class='add'>+		btrfs_delayed_node_ref_tracker_alloc(node, tracker, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;delayed_root-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_node *btrfs_next_delayed_node(</div><div class='del'>-						struct btrfs_delayed_node *node)</div><div class='add'>+						struct btrfs_delayed_node *node,</div><div class='add'>+						struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_root *delayed_root;</div><div class='ctx'> 	struct list_head *p;</div><div class='hunk'>@@ -241,6 +269,7 @@ static struct btrfs_delayed_node *btrfs_next_delayed_node(</div><div class='ctx'> </div><div class='ctx'> 	next = list_entry(p, struct btrfs_delayed_node, n_list);</div><div class='ctx'> 	refcount_inc(&amp;next-&gt;refs);</div><div class='add'>+	btrfs_delayed_node_ref_tracker_alloc(next, tracker, GFP_ATOMIC);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;delayed_root-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +278,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void __btrfs_release_delayed_node(</div><div class='ctx'> 				struct btrfs_delayed_node *delayed_node,</div><div class='del'>-				int mod)</div><div class='add'>+				int mod, struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_root *delayed_root;</div><div class='ctx'> </div><div class='hunk'>@@ -265,50 +294,51 @@ static void __btrfs_release_delayed_node(</div><div class='ctx'> 		btrfs_dequeue_delayed_node(delayed_root, delayed_node);</div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	btrfs_delayed_node_ref_tracker_free(delayed_node, tracker);</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;delayed_node-&gt;refs)) {</div><div class='ctx'> 		struct btrfs_root *root = delayed_node-&gt;root;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;root-&gt;inode_lock);</div><div class='add'>+		xa_erase(&amp;root-&gt;delayed_nodes, delayed_node-&gt;inode_id);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Once our refcount goes to zero, nobody is allowed to bump it</div><div class='ctx'> 		 * back up.  We can delete it now.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ASSERT(refcount_read(&amp;delayed_node-&gt;refs) == 0);</div><div class='del'>-		xa_erase(&amp;root-&gt;delayed_nodes, delayed_node-&gt;inode_id);</div><div class='del'>-		spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+		btrfs_delayed_node_ref_tracker_dir_exit(delayed_node);</div><div class='ctx'> 		kmem_cache_free(delayed_node_cache, delayed_node);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_release_delayed_node(struct btrfs_delayed_node *node)</div><div class='add'>+static inline void btrfs_release_delayed_node(struct btrfs_delayed_node *node,</div><div class='add'>+					      struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='del'>-	__btrfs_release_delayed_node(node, 0);</div><div class='add'>+	__btrfs_release_delayed_node(node, 0, tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_node *btrfs_first_prepared_delayed_node(</div><div class='del'>-					struct btrfs_delayed_root *delayed_root)</div><div class='add'>+					struct btrfs_delayed_root *delayed_root,</div><div class='add'>+					struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *p;</div><div class='del'>-	struct btrfs_delayed_node *node = NULL;</div><div class='add'>+	struct btrfs_delayed_node *node;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;delayed_root-&gt;lock);</div><div class='del'>-	if (list_empty(&amp;delayed_root-&gt;prepare_list))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	p = delayed_root-&gt;prepare_list.next;</div><div class='del'>-	list_del_init(p);</div><div class='del'>-	node = list_entry(p, struct btrfs_delayed_node, p_list);</div><div class='del'>-	refcount_inc(&amp;node-&gt;refs);</div><div class='del'>-out:</div><div class='add'>+	node = list_first_entry_or_null(&amp;delayed_root-&gt;prepare_list,</div><div class='add'>+					struct btrfs_delayed_node, p_list);</div><div class='add'>+	if (node) {</div><div class='add'>+		list_del_init(&amp;node-&gt;p_list);</div><div class='add'>+		refcount_inc(&amp;node-&gt;refs);</div><div class='add'>+		btrfs_delayed_node_ref_tracker_alloc(node, tracker, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;delayed_root-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_release_prepared_delayed_node(</div><div class='del'>-					struct btrfs_delayed_node *node)</div><div class='add'>+					struct btrfs_delayed_node *node,</div><div class='add'>+					struct btrfs_ref_tracker *tracker)</div><div class='ctx'> {</div><div class='del'>-	__btrfs_release_delayed_node(node, 1);</div><div class='add'>+	__btrfs_release_delayed_node(node, 1, tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_item *btrfs_alloc_delayed_item(u16 data_len,</div><div class='hunk'>@@ -331,6 +361,20 @@ static struct btrfs_delayed_item *btrfs_alloc_delayed_item(u16 data_len,</div><div class='ctx'> 	return item;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int delayed_item_index_cmp(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 *index = key;</div><div class='add'>+	const struct btrfs_delayed_item *delayed_item = rb_entry(node,</div><div class='add'>+						 struct btrfs_delayed_item, rb_node);</div><div class='add'>+</div><div class='add'>+	if (delayed_item-&gt;index &lt; *index)</div><div class='add'>+		return 1;</div><div class='add'>+	else if (delayed_item-&gt;index &gt; *index)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Look up the delayed item by key.</div><div class='ctx'>  *</div><div class='hunk'>@@ -344,57 +388,35 @@ static struct btrfs_delayed_item *__btrfs_lookup_delayed_item(</div><div class='ctx'> 				struct rb_root *root,</div><div class='ctx'> 				u64 index)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *node = root-&gt;rb_node;</div><div class='del'>-	struct btrfs_delayed_item *delayed_item = NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	while (node) {</div><div class='del'>-		delayed_item = rb_entry(node, struct btrfs_delayed_item,</div><div class='del'>-					rb_node);</div><div class='del'>-		if (delayed_item-&gt;index &lt; index)</div><div class='del'>-			node = node-&gt;rb_right;</div><div class='del'>-		else if (delayed_item-&gt;index &gt; index)</div><div class='del'>-			node = node-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return delayed_item;</div><div class='del'>-	}</div><div class='add'>+	node = rb_find(&amp;index, root, delayed_item_index_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct btrfs_delayed_item, rb_node);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+static int btrfs_delayed_item_cmp(const struct rb_node *new,</div><div class='add'>+				  const struct rb_node *exist)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_delayed_item *new_item =</div><div class='add'>+		rb_entry(new, struct btrfs_delayed_item, rb_node);</div><div class='add'>+</div><div class='add'>+	return delayed_item_index_cmp(&amp;new_item-&gt;index, exist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __btrfs_add_delayed_item(struct btrfs_delayed_node *delayed_node,</div><div class='ctx'> 				    struct btrfs_delayed_item *ins)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p, *node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='ctx'> 	struct rb_root_cached *root;</div><div class='del'>-	struct btrfs_delayed_item *item;</div><div class='del'>-	bool leftmost = true;</div><div class='add'>+	struct rb_node *exist;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;type == BTRFS_DELAYED_INSERTION_ITEM)</div><div class='ctx'> 		root = &amp;delayed_node-&gt;ins_root;</div><div class='ctx'> 	else</div><div class='ctx'> 		root = &amp;delayed_node-&gt;del_root;</div><div class='ctx'> </div><div class='del'>-	p = &amp;root-&gt;rb_root.rb_node;</div><div class='del'>-	node = &amp;ins-&gt;rb_node;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		item = rb_entry(parent_node, struct btrfs_delayed_item,</div><div class='del'>-				 rb_node);</div><div class='del'>-</div><div class='del'>-		if (item-&gt;index &lt; ins-&gt;index) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else if (item-&gt;index &gt; ins-&gt;index) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else {</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_link_node(node, parent_node, p);</div><div class='del'>-	rb_insert_color_cached(node, root, leftmost);</div><div class='add'>+	exist = rb_find_add_cached(&amp;ins-&gt;rb_node, root, btrfs_delayed_item_cmp);</div><div class='add'>+	if (exist)</div><div class='add'>+		return -EEXIST;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;type == BTRFS_DELAYED_INSERTION_ITEM &amp;&amp;</div><div class='ctx'> 	    ins-&gt;index &gt;= delayed_node-&gt;index_cnt)</div><div class='hunk'>@@ -430,8 +452,6 @@ static void __btrfs_remove_delayed_item(struct btrfs_delayed_item *delayed_item)</div><div class='ctx'> </div><div class='ctx'> 	delayed_root = delayed_node-&gt;root-&gt;fs_info-&gt;delayed_root;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!delayed_root);</div><div class='del'>-</div><div class='ctx'> 	if (delayed_item-&gt;type == BTRFS_DELAYED_INSERTION_ITEM)</div><div class='ctx'> 		root = &amp;delayed_node-&gt;ins_root;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -456,40 +476,25 @@ static void btrfs_release_delayed_item(struct btrfs_delayed_item *item)</div><div class='ctx'> static struct btrfs_delayed_item *__btrfs_first_delayed_insertion_item(</div><div class='ctx'> 					struct btrfs_delayed_node *delayed_node)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *p;</div><div class='del'>-	struct btrfs_delayed_item *item = NULL;</div><div class='add'>+	struct rb_node *p = rb_first_cached(&amp;delayed_node-&gt;ins_root);</div><div class='ctx'> </div><div class='del'>-	p = rb_first_cached(&amp;delayed_node-&gt;ins_root);</div><div class='del'>-	if (p)</div><div class='del'>-		item = rb_entry(p, struct btrfs_delayed_item, rb_node);</div><div class='del'>-</div><div class='del'>-	return item;</div><div class='add'>+	return rb_entry_safe(p, struct btrfs_delayed_item, rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_item *__btrfs_first_delayed_deletion_item(</div><div class='ctx'> 					struct btrfs_delayed_node *delayed_node)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *p;</div><div class='del'>-	struct btrfs_delayed_item *item = NULL;</div><div class='del'>-</div><div class='del'>-	p = rb_first_cached(&amp;delayed_node-&gt;del_root);</div><div class='del'>-	if (p)</div><div class='del'>-		item = rb_entry(p, struct btrfs_delayed_item, rb_node);</div><div class='add'>+	struct rb_node *p = rb_first_cached(&amp;delayed_node-&gt;del_root);</div><div class='ctx'> </div><div class='del'>-	return item;</div><div class='add'>+	return rb_entry_safe(p, struct btrfs_delayed_item, rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_item *__btrfs_next_delayed_item(</div><div class='ctx'> 						struct btrfs_delayed_item *item)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *p;</div><div class='del'>-	struct btrfs_delayed_item *next = NULL;</div><div class='del'>-</div><div class='del'>-	p = rb_next(&amp;item-&gt;rb_node);</div><div class='del'>-	if (p)</div><div class='del'>-		next = rb_entry(p, struct btrfs_delayed_item, rb_node);</div><div class='add'>+	struct rb_node *p = rb_next(&amp;item-&gt;rb_node);</div><div class='ctx'> </div><div class='del'>-	return next;</div><div class='add'>+	return rb_entry_safe(p, struct btrfs_delayed_item, rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -663,7 +668,7 @@ static int btrfs_insert_delayed_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_key first_key;</div><div class='ctx'> 	const u32 first_data_size = first_item-&gt;data_len;</div><div class='ctx'> 	int total_size;</div><div class='del'>-	char *ins_data = NULL;</div><div class='add'>+	char AUTO_KFREE(ins_data);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool continuous_keys_only = false;</div><div class='ctx'> </div><div class='hunk'>@@ -733,12 +738,10 @@ static int btrfs_insert_delayed_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		u32 *ins_sizes;</div><div class='ctx'> 		int i = 0;</div><div class='ctx'> </div><div class='del'>-		ins_data = kmalloc(batch.nr * sizeof(u32) +</div><div class='del'>-				   batch.nr * sizeof(struct btrfs_key), GFP_NOFS);</div><div class='del'>-		if (!ins_data) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		ins_data = kmalloc_array(batch.nr,</div><div class='add'>+					 sizeof(u32) + sizeof(struct btrfs_key), GFP_NOFS);</div><div class='add'>+		if (!ins_data)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		ins_sizes = (u32 *)ins_data;</div><div class='ctx'> 		ins_keys = (struct btrfs_key *)(ins_data + batch.nr * sizeof(u32));</div><div class='ctx'> 		batch.keys = ins_keys;</div><div class='hunk'>@@ -754,7 +757,7 @@ static int btrfs_insert_delayed_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_items(trans, root, path, &amp;batch);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(curr, &amp;item_list, tree_list) {</div><div class='ctx'> 		char *data_ptr;</div><div class='hunk'>@@ -809,9 +812,8 @@ static int btrfs_insert_delayed_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		list_del(&amp;curr-&gt;tree_list);</div><div class='ctx'> 		btrfs_release_delayed_item(curr);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	kfree(ins_data);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_insert_delayed_items(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -980,7 +982,7 @@ static void btrfs_release_delayed_inode(struct btrfs_delayed_node *delayed_node)</div><div class='ctx'> </div><div class='ctx'> 	if (delayed_node &amp;&amp;</div><div class='ctx'> 	    test_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &amp;delayed_node-&gt;flags)) {</div><div class='del'>-		BUG_ON(!delayed_node-&gt;root);</div><div class='add'>+		ASSERT(delayed_node-&gt;root);</div><div class='ctx'> 		clear_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &amp;delayed_node-&gt;flags);</div><div class='ctx'> 		delayed_node-&gt;count--;</div><div class='ctx'> </div><div class='hunk'>@@ -1027,15 +1029,22 @@ static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = btrfs_lookup_inode(trans, root, path, &amp;key, mod);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we fail to update the delayed inode we need to abort the</div><div class='add'>+		 * transaction, because we could leave the inode with the</div><div class='add'>+		 * improper counts behind.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(ret != -ENOENT))</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	inode_item = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 				    struct btrfs_inode_item);</div><div class='ctx'> 	write_extent_buffer(leaf, &amp;node-&gt;inode_item, (unsigned long)inode_item,</div><div class='ctx'> 			    sizeof(struct btrfs_inode_item));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(BTRFS_DELAYED_NODE_DEL_IREF, &amp;node-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1054,8 +1063,10 @@ static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto err_out;</div><div class='add'>+		}</div><div class='ctx'> 		ASSERT(ret &gt; 0);</div><div class='ctx'> 		ASSERT(path-&gt;slots[0] &gt; 0);</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -1077,21 +1088,14 @@ static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * in the same item doesn't exist.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_del_item(trans, root, path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_release_delayed_iref(node);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> err_out:</div><div class='ctx'> 	btrfs_delayed_inode_release_metadata(fs_info, node, (ret &lt; 0));</div><div class='ctx'> 	btrfs_release_delayed_inode(node);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we fail to update the delayed inode we need to abort the</div><div class='del'>-	 * transaction, because we could leave the inode with the improper</div><div class='del'>-	 * counts behind.</div><div class='del'>-	 */</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOENT)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1128,6 +1132,9 @@ __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = btrfs_record_root_in_trans(trans, node-&gt;root);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = btrfs_update_delayed_inode(trans, node-&gt;root, path, node);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1143,6 +1150,7 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_delayed_root *delayed_root;</div><div class='ctx'> 	struct btrfs_delayed_node *curr_node, *prev_node;</div><div class='add'>+	struct btrfs_ref_tracker curr_delayed_node_tracker, prev_delayed_node_tracker;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct btrfs_block_rsv *block_rsv;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1160,17 +1168,18 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr)</div><div class='ctx'> </div><div class='ctx'> 	delayed_root = fs_info-&gt;delayed_root;</div><div class='ctx'> </div><div class='del'>-	curr_node = btrfs_first_delayed_node(delayed_root);</div><div class='add'>+	curr_node = btrfs_first_delayed_node(delayed_root, &amp;curr_delayed_node_tracker);</div><div class='ctx'> 	while (curr_node &amp;&amp; (!count || nr--)) {</div><div class='ctx'> 		ret = __btrfs_commit_inode_delayed_items(trans, path,</div><div class='ctx'> 							 curr_node);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		prev_node = curr_node;</div><div class='del'>-		curr_node = btrfs_next_delayed_node(curr_node);</div><div class='add'>+		prev_delayed_node_tracker = curr_delayed_node_tracker;</div><div class='add'>+		curr_node = btrfs_next_delayed_node(curr_node, &amp;curr_delayed_node_tracker);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * See the comment below about releasing path before releasing</div><div class='ctx'> 		 * node. If the commit of delayed items was successful the path</div><div class='hunk'>@@ -1178,7 +1187,7 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr)</div><div class='ctx'> 		 * point to locked extent buffers (a leaf at the very least).</div><div class='ctx'> 		 */</div><div class='ctx'> 		ASSERT(path-&gt;nodes[0] == NULL);</div><div class='del'>-		btrfs_release_delayed_node(prev_node);</div><div class='add'>+		btrfs_release_delayed_node(prev_node, &amp;prev_delayed_node_tracker);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1191,7 +1200,7 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr)</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (curr_node)</div><div class='del'>-		btrfs_release_delayed_node(curr_node);</div><div class='add'>+		btrfs_release_delayed_node(curr_node, &amp;curr_delayed_node_tracker);</div><div class='ctx'> 	trans-&gt;block_rsv = block_rsv;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1210,8 +1219,10 @@ int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, int nr)</div><div class='ctx'> int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='add'>+	struct btrfs_delayed_node *delayed_node =</div><div class='add'>+		btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_block_rsv *block_rsv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1221,14 +1232,14 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	mutex_lock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> 	if (!delayed_node-&gt;count) {</div><div class='ctx'> 		mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-		btrfs_release_delayed_node(delayed_node);</div><div class='add'>+		btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		btrfs_release_delayed_node(delayed_node);</div><div class='add'>+		btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1237,8 +1248,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = __btrfs_commit_inode_delayed_items(trans, path, delayed_node);</div><div class='ctx'> </div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	trans-&gt;block_rsv = block_rsv;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1248,18 +1258,20 @@ int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='add'>+	struct btrfs_delayed_node *delayed_node;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct btrfs_block_rsv *block_rsv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	delayed_node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!delayed_node)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> 	if (!test_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &amp;delayed_node-&gt;flags)) {</div><div class='ctx'> 		mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-		btrfs_release_delayed_node(delayed_node);</div><div class='add'>+		btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='hunk'>@@ -1293,7 +1305,7 @@ trans_out:</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1307,7 +1319,8 @@ void btrfs_remove_delayed_node(struct btrfs_inode *inode)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;delayed_node = NULL;</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node-&gt;inode_cache_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_async_delayed_work {</div><div class='hunk'>@@ -1323,6 +1336,7 @@ static void btrfs_async_run_delayed_root(struct btrfs_work *work)</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node = NULL;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	struct btrfs_block_rsv *block_rsv;</div><div class='ctx'> 	int total_done = 0;</div><div class='hunk'>@@ -1339,7 +1353,8 @@ static void btrfs_async_run_delayed_root(struct btrfs_work *work)</div><div class='ctx'> 		    BTRFS_DELAYED_BACKGROUND / 2)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		delayed_node = btrfs_first_prepared_delayed_node(delayed_root);</div><div class='add'>+		delayed_node = btrfs_first_prepared_delayed_node(delayed_root,</div><div class='add'>+								 &amp;delayed_node_tracker);</div><div class='ctx'> 		if (!delayed_node)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1348,7 +1363,8 @@ static void btrfs_async_run_delayed_root(struct btrfs_work *work)</div><div class='ctx'> 		trans = btrfs_join_transaction(root);</div><div class='ctx'> 		if (IS_ERR(trans)) {</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='del'>-			btrfs_release_prepared_delayed_node(delayed_node);</div><div class='add'>+			btrfs_release_prepared_delayed_node(delayed_node,</div><div class='add'>+							    &amp;delayed_node_tracker);</div><div class='ctx'> 			total_done++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1363,7 +1379,8 @@ static void btrfs_async_run_delayed_root(struct btrfs_work *work)</div><div class='ctx'> 		btrfs_btree_balance_dirty_nodelay(root-&gt;fs_info);</div><div class='ctx'> </div><div class='ctx'> 		btrfs_release_path(path);</div><div class='del'>-		btrfs_release_prepared_delayed_node(delayed_node);</div><div class='add'>+		btrfs_release_prepared_delayed_node(delayed_node,</div><div class='add'>+						    &amp;delayed_node_tracker);</div><div class='ctx'> 		total_done++;</div><div class='ctx'> </div><div class='ctx'> 	} while ((async_work-&gt;nr == 0 &amp;&amp; total_done &lt; BTRFS_DELAYED_WRITEBACK)</div><div class='hunk'>@@ -1395,20 +1412,28 @@ static int btrfs_wq_run_delayed_node(struct btrfs_delayed_root *delayed_root,</div><div class='ctx'> </div><div class='ctx'> void btrfs_assert_delayed_root_empty(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(btrfs_first_delayed_node(fs_info-&gt;delayed_root));</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='add'>+	struct btrfs_delayed_node *node;</div><div class='add'>+</div><div class='add'>+	node = btrfs_first_delayed_node( fs_info-&gt;delayed_root, &amp;delayed_node_tracker);</div><div class='add'>+	if (WARN_ON(node)) {</div><div class='add'>+		btrfs_delayed_node_ref_tracker_free(node,</div><div class='add'>+						    &amp;delayed_node_tracker);</div><div class='add'>+		refcount_dec(&amp;node-&gt;refs);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)</div><div class='add'>+static bool could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)</div><div class='ctx'> {</div><div class='ctx'> 	int val = atomic_read(&amp;delayed_root-&gt;items_seq);</div><div class='ctx'> </div><div class='ctx'> 	if (val &lt; seq || val &gt;= seq + BTRFS_DELAYED_BATCH)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;delayed_root-&gt;items) &lt; BTRFS_DELAYED_BACKGROUND)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info)</div><div class='hunk'>@@ -1463,19 +1488,20 @@ static void btrfs_release_dir_index_item_space(struct btrfs_trans_handle *trans)</div><div class='ctx'> int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   const char *name, int name_len,</div><div class='ctx'> 				   struct btrfs_inode *dir,</div><div class='del'>-				   struct btrfs_disk_key *disk_key, u8 flags,</div><div class='add'>+				   const struct btrfs_disk_key *disk_key, u8 flags,</div><div class='ctx'> 				   u64 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	const unsigned int leaf_data_size = BTRFS_LEAF_DATA_SIZE(fs_info);</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> 	struct btrfs_delayed_item *delayed_item;</div><div class='ctx'> 	struct btrfs_dir_item *dir_item;</div><div class='ctx'> 	bool reserve_leaf_space;</div><div class='ctx'> 	u32 data_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	delayed_node = btrfs_get_or_create_delayed_node(dir);</div><div class='add'>+	delayed_node = btrfs_get_or_create_delayed_node(dir, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (IS_ERR(delayed_node))</div><div class='ctx'> 		return PTR_ERR(delayed_node);</div><div class='ctx'> </div><div class='hunk'>@@ -1551,13 +1577,12 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> release_node:</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int btrfs_delete_delayed_insertion_item(struct btrfs_fs_info *fs_info,</div><div class='del'>-					       struct btrfs_delayed_node *node,</div><div class='del'>-					       u64 index)</div><div class='add'>+static bool btrfs_delete_delayed_insertion_item(struct btrfs_delayed_node *node,</div><div class='add'>+						u64 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_item *item;</div><div class='ctx'> </div><div class='hunk'>@@ -1565,7 +1590,7 @@ static int btrfs_delete_delayed_insertion_item(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	item = __btrfs_lookup_delayed_item(&amp;node-&gt;ins_root.rb_root, index);</div><div class='ctx'> 	if (!item) {</div><div class='ctx'> 		mutex_unlock(&amp;node-&gt;mutex);</div><div class='del'>-		return 1;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1600,23 +1625,25 @@ static int btrfs_delete_delayed_insertion_item(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;node-&gt;mutex);</div><div class='del'>-	return 0;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   struct btrfs_inode *dir, u64 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_node *node;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> 	struct btrfs_delayed_item *item;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	node = btrfs_get_or_create_delayed_node(dir);</div><div class='add'>+	node = btrfs_get_or_create_delayed_node(dir, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (IS_ERR(node))</div><div class='ctx'> 		return PTR_ERR(node);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_delete_delayed_insertion_item(trans-&gt;fs_info, node, index);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (btrfs_delete_delayed_insertion_item(node, index)) {</div><div class='add'>+		ret = 0;</div><div class='ctx'> 		goto end;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	item = btrfs_alloc_delayed_item(0, node, BTRFS_DELAYED_DELETION_ITEM);</div><div class='ctx'> 	if (!item) {</div><div class='hunk'>@@ -1633,7 +1660,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		btrfs_err(trans-&gt;fs_info,</div><div class='del'>-"metadata reservation failed for delayed dir item deltiona, should have been reserved");</div><div class='add'>+"metadata reservation failed for delayed dir item deletion, index: %llu, root: %llu, inode: %llu, error: %d",</div><div class='add'>+			  index, btrfs_root_id(node-&gt;root), node-&gt;inode_id, ret);</div><div class='ctx'> 		btrfs_release_delayed_item(item);</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1642,22 +1670,23 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = __btrfs_add_delayed_item(node, item);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_err(trans-&gt;fs_info,</div><div class='del'>-			  "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",</div><div class='del'>-			  index, node-&gt;root-&gt;root_key.objectid,</div><div class='del'>-			  node-&gt;inode_id, ret);</div><div class='add'>+"failed to add delayed dir index item, root: %llu, inode: %llu, index: %llu, error: %d",</div><div class='add'>+			  index, btrfs_root_id(node-&gt;root), node-&gt;inode_id, ret);</div><div class='ctx'> 		btrfs_delayed_item_release_metadata(dir-&gt;root, item);</div><div class='ctx'> 		btrfs_release_delayed_item(item);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;node-&gt;mutex);</div><div class='ctx'> end:</div><div class='del'>-	btrfs_release_delayed_node(node);</div><div class='add'>+	btrfs_release_delayed_node(node, &amp;delayed_node_tracker);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='add'>+	struct btrfs_delayed_node *delayed_node;</div><div class='ctx'> </div><div class='add'>+	delayed_node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!delayed_node)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -1667,24 +1696,25 @@ int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode)</div><div class='ctx'> 	 * is updated now. So we needn't lock the delayed node.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!delayed_node-&gt;index_cnt) {</div><div class='del'>-		btrfs_release_delayed_node(delayed_node);</div><div class='add'>+		btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;index_cnt = delayed_node-&gt;index_cnt;</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_readdir_get_delayed_items(struct inode *inode,</div><div class='add'>+bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 				     u64 last_index,</div><div class='ctx'> 				     struct list_head *ins_list,</div><div class='ctx'> 				     struct list_head *del_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node;</div><div class='ctx'> 	struct btrfs_delayed_item *item;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> </div><div class='del'>-	delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));</div><div class='add'>+	delayed_node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!delayed_node)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -1692,8 +1722,8 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,</div><div class='ctx'> 	 * We can only do one readdir with delayed items at a time because of</div><div class='ctx'> 	 * item-&gt;readdir_list.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_SHARED);</div><div class='del'>-	btrfs_inode_lock(BTRFS_I(inode), 0);</div><div class='add'>+	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+	btrfs_inode_lock(inode, 0);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> 	item = __btrfs_first_delayed_insertion_item(delayed_node);</div><div class='hunk'>@@ -1719,12 +1749,13 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode,</div><div class='ctx'> 	 * insert/delete delayed items in this period. So we also needn't</div><div class='ctx'> 	 * requeue or dequeue this delayed node.</div><div class='ctx'> 	 */</div><div class='add'>+	btrfs_delayed_node_ref_tracker_free(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	refcount_dec(&amp;delayed_node-&gt;refs);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_readdir_put_delayed_items(struct inode *inode,</div><div class='add'>+void btrfs_readdir_put_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 				     struct list_head *ins_list,</div><div class='ctx'> 				     struct list_head *del_list)</div><div class='ctx'> {</div><div class='hunk'>@@ -1746,20 +1777,19 @@ void btrfs_readdir_put_delayed_items(struct inode *inode,</div><div class='ctx'> 	 * The VFS is going to do up_read(), so we need to downgrade back to a</div><div class='ctx'> 	 * read lock.</div><div class='ctx'> 	 */</div><div class='del'>-	downgrade_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	downgrade_write(&amp;inode-&gt;vfs_inode.i_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_should_delete_dir_index(struct list_head *del_list,</div><div class='del'>-				  u64 index)</div><div class='add'>+bool btrfs_should_delete_dir_index(const struct list_head *del_list, u64 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_item *curr;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(curr, del_list, readdir_list) {</div><div class='ctx'> 		if (curr-&gt;index &gt; index)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (curr-&gt;index == index) {</div><div class='del'>-			ret = 1;</div><div class='add'>+			ret = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1769,15 +1799,14 @@ int btrfs_should_delete_dir_index(struct list_head *del_list,</div><div class='ctx'> /*</div><div class='ctx'>  * Read dir info stored in the delayed tree.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,</div><div class='del'>-				    struct list_head *ins_list)</div><div class='add'>+bool btrfs_readdir_delayed_dir_index(struct dir_context *ctx,</div><div class='add'>+				     const struct list_head *ins_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct btrfs_delayed_item *curr, *next;</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	int name_len;</div><div class='del'>-	int over = 0;</div><div class='ctx'> 	unsigned char d_type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1786,6 +1815,8 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,</div><div class='ctx'> 	 * directory, nobody can delete any directory indexes now.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry_safe(curr, next, ins_list, readdir_list) {</div><div class='add'>+		bool over;</div><div class='add'>+</div><div class='ctx'> 		list_del(&amp;curr-&gt;readdir_list);</div><div class='ctx'> </div><div class='ctx'> 		if (curr-&gt;index &lt; ctx-&gt;pos) {</div><div class='hunk'>@@ -1803,115 +1834,112 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,</div><div class='ctx'> 		d_type = fs_ftype_to_dtype(btrfs_dir_flags_to_ftype(di-&gt;type));</div><div class='ctx'> 		btrfs_disk_key_to_cpu(&amp;location, &amp;di-&gt;location);</div><div class='ctx'> </div><div class='del'>-		over = !dir_emit(ctx, name, name_len,</div><div class='del'>-			       location.objectid, d_type);</div><div class='add'>+		over = !dir_emit(ctx, name, name_len, location.objectid, d_type);</div><div class='ctx'> </div><div class='ctx'> 		if (refcount_dec_and_test(&amp;curr-&gt;refs))</div><div class='ctx'> 			kfree(curr);</div><div class='ctx'> </div><div class='ctx'> 		if (over)</div><div class='del'>-			return 1;</div><div class='add'>+			return true;</div><div class='ctx'> 		ctx-&gt;pos++;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fill_stack_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				  struct btrfs_inode_item *inode_item,</div><div class='del'>-				  struct inode *inode)</div><div class='add'>+				  struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct inode *vfs_inode = &amp;inode-&gt;vfs_inode;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> </div><div class='del'>-	btrfs_set_stack_inode_uid(inode_item, i_uid_read(inode));</div><div class='del'>-	btrfs_set_stack_inode_gid(inode_item, i_gid_read(inode));</div><div class='del'>-	btrfs_set_stack_inode_size(inode_item, BTRFS_I(inode)-&gt;disk_i_size);</div><div class='del'>-	btrfs_set_stack_inode_mode(inode_item, inode-&gt;i_mode);</div><div class='del'>-	btrfs_set_stack_inode_nlink(inode_item, inode-&gt;i_nlink);</div><div class='del'>-	btrfs_set_stack_inode_nbytes(inode_item, inode_get_bytes(inode));</div><div class='del'>-	btrfs_set_stack_inode_generation(inode_item,</div><div class='del'>-					 BTRFS_I(inode)-&gt;generation);</div><div class='add'>+	btrfs_set_stack_inode_uid(inode_item, i_uid_read(vfs_inode));</div><div class='add'>+	btrfs_set_stack_inode_gid(inode_item, i_gid_read(vfs_inode));</div><div class='add'>+	btrfs_set_stack_inode_size(inode_item, inode-&gt;disk_i_size);</div><div class='add'>+	btrfs_set_stack_inode_mode(inode_item, vfs_inode-&gt;i_mode);</div><div class='add'>+	btrfs_set_stack_inode_nlink(inode_item, vfs_inode-&gt;i_nlink);</div><div class='add'>+	btrfs_set_stack_inode_nbytes(inode_item, inode_get_bytes(vfs_inode));</div><div class='add'>+	btrfs_set_stack_inode_generation(inode_item, inode-&gt;generation);</div><div class='ctx'> 	btrfs_set_stack_inode_sequence(inode_item,</div><div class='del'>-				       inode_peek_iversion(inode));</div><div class='add'>+				       inode_peek_iversion(vfs_inode));</div><div class='ctx'> 	btrfs_set_stack_inode_transid(inode_item, trans-&gt;transid);</div><div class='del'>-	btrfs_set_stack_inode_rdev(inode_item, inode-&gt;i_rdev);</div><div class='del'>-	flags = btrfs_inode_combine_flags(BTRFS_I(inode)-&gt;flags,</div><div class='del'>-					  BTRFS_I(inode)-&gt;ro_flags);</div><div class='add'>+	btrfs_set_stack_inode_rdev(inode_item, vfs_inode-&gt;i_rdev);</div><div class='add'>+	flags = btrfs_inode_combine_flags(inode-&gt;flags, inode-&gt;ro_flags);</div><div class='ctx'> 	btrfs_set_stack_inode_flags(inode_item, flags);</div><div class='ctx'> 	btrfs_set_stack_inode_block_group(inode_item, 0);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_stack_timespec_sec(&amp;inode_item-&gt;atime,</div><div class='del'>-				     inode_get_atime_sec(inode));</div><div class='add'>+				     inode_get_atime_sec(vfs_inode));</div><div class='ctx'> 	btrfs_set_stack_timespec_nsec(&amp;inode_item-&gt;atime,</div><div class='del'>-				      inode_get_atime_nsec(inode));</div><div class='add'>+				      inode_get_atime_nsec(vfs_inode));</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_stack_timespec_sec(&amp;inode_item-&gt;mtime,</div><div class='del'>-				     inode_get_mtime_sec(inode));</div><div class='add'>+				     inode_get_mtime_sec(vfs_inode));</div><div class='ctx'> 	btrfs_set_stack_timespec_nsec(&amp;inode_item-&gt;mtime,</div><div class='del'>-				      inode_get_mtime_nsec(inode));</div><div class='add'>+				      inode_get_mtime_nsec(vfs_inode));</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_stack_timespec_sec(&amp;inode_item-&gt;ctime,</div><div class='del'>-				     inode_get_ctime_sec(inode));</div><div class='add'>+				     inode_get_ctime_sec(vfs_inode));</div><div class='ctx'> 	btrfs_set_stack_timespec_nsec(&amp;inode_item-&gt;ctime,</div><div class='del'>-				      inode_get_ctime_nsec(inode));</div><div class='add'>+				      inode_get_ctime_nsec(vfs_inode));</div><div class='ctx'> </div><div class='del'>-	btrfs_set_stack_timespec_sec(&amp;inode_item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_sec);</div><div class='del'>-	btrfs_set_stack_timespec_nsec(&amp;inode_item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_nsec);</div><div class='add'>+	btrfs_set_stack_timespec_sec(&amp;inode_item-&gt;otime, inode-&gt;i_otime_sec);</div><div class='add'>+	btrfs_set_stack_timespec_nsec(&amp;inode_item-&gt;otime, inode-&gt;i_otime_nsec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_fill_inode(struct inode *inode, u32 *rdev)</div><div class='add'>+int btrfs_fill_inode(struct btrfs_inode *inode, u32 *rdev)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = BTRFS_I(inode)-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='add'>+	struct inode *vfs_inode = &amp;inode-&gt;vfs_inode;</div><div class='ctx'> </div><div class='del'>-	delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));</div><div class='add'>+	delayed_node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!delayed_node)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> 	if (!test_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &amp;delayed_node-&gt;flags)) {</div><div class='ctx'> 		mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-		btrfs_release_delayed_node(delayed_node);</div><div class='add'>+		btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode_item = &amp;delayed_node-&gt;inode_item;</div><div class='ctx'> </div><div class='del'>-	i_uid_write(inode, btrfs_stack_inode_uid(inode_item));</div><div class='del'>-	i_gid_write(inode, btrfs_stack_inode_gid(inode_item));</div><div class='del'>-	btrfs_i_size_write(BTRFS_I(inode), btrfs_stack_inode_size(inode_item));</div><div class='del'>-	btrfs_inode_set_file_extent_range(BTRFS_I(inode), 0,</div><div class='del'>-			round_up(i_size_read(inode), fs_info-&gt;sectorsize));</div><div class='del'>-	inode-&gt;i_mode = btrfs_stack_inode_mode(inode_item);</div><div class='del'>-	set_nlink(inode, btrfs_stack_inode_nlink(inode_item));</div><div class='del'>-	inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item));</div><div class='del'>-	BTRFS_I(inode)-&gt;generation = btrfs_stack_inode_generation(inode_item);</div><div class='del'>-        BTRFS_I(inode)-&gt;last_trans = btrfs_stack_inode_transid(inode_item);</div><div class='del'>-</div><div class='del'>-	inode_set_iversion_queried(inode,</div><div class='del'>-				   btrfs_stack_inode_sequence(inode_item));</div><div class='del'>-	inode-&gt;i_rdev = 0;</div><div class='add'>+	i_uid_write(vfs_inode, btrfs_stack_inode_uid(inode_item));</div><div class='add'>+	i_gid_write(vfs_inode, btrfs_stack_inode_gid(inode_item));</div><div class='add'>+	btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item));</div><div class='add'>+	vfs_inode-&gt;i_mode = btrfs_stack_inode_mode(inode_item);</div><div class='add'>+	set_nlink(vfs_inode, btrfs_stack_inode_nlink(inode_item));</div><div class='add'>+	inode_set_bytes(vfs_inode, btrfs_stack_inode_nbytes(inode_item));</div><div class='add'>+	inode-&gt;generation = btrfs_stack_inode_generation(inode_item);</div><div class='add'>+	inode-&gt;last_trans = btrfs_stack_inode_transid(inode_item);</div><div class='add'>+</div><div class='add'>+	inode_set_iversion_queried(vfs_inode, btrfs_stack_inode_sequence(inode_item));</div><div class='add'>+	vfs_inode-&gt;i_rdev = 0;</div><div class='ctx'> 	*rdev = btrfs_stack_inode_rdev(inode_item);</div><div class='ctx'> 	btrfs_inode_split_flags(btrfs_stack_inode_flags(inode_item),</div><div class='del'>-				&amp;BTRFS_I(inode)-&gt;flags, &amp;BTRFS_I(inode)-&gt;ro_flags);</div><div class='add'>+				&amp;inode-&gt;flags, &amp;inode-&gt;ro_flags);</div><div class='ctx'> </div><div class='del'>-	inode_set_atime(inode, btrfs_stack_timespec_sec(&amp;inode_item-&gt;atime),</div><div class='add'>+	inode_set_atime(vfs_inode, btrfs_stack_timespec_sec(&amp;inode_item-&gt;atime),</div><div class='ctx'> 			btrfs_stack_timespec_nsec(&amp;inode_item-&gt;atime));</div><div class='ctx'> </div><div class='del'>-	inode_set_mtime(inode, btrfs_stack_timespec_sec(&amp;inode_item-&gt;mtime),</div><div class='add'>+	inode_set_mtime(vfs_inode, btrfs_stack_timespec_sec(&amp;inode_item-&gt;mtime),</div><div class='ctx'> 			btrfs_stack_timespec_nsec(&amp;inode_item-&gt;mtime));</div><div class='ctx'> </div><div class='del'>-	inode_set_ctime(inode, btrfs_stack_timespec_sec(&amp;inode_item-&gt;ctime),</div><div class='add'>+	inode_set_ctime(vfs_inode, btrfs_stack_timespec_sec(&amp;inode_item-&gt;ctime),</div><div class='ctx'> 			btrfs_stack_timespec_nsec(&amp;inode_item-&gt;ctime));</div><div class='ctx'> </div><div class='del'>-	BTRFS_I(inode)-&gt;i_otime_sec = btrfs_stack_timespec_sec(&amp;inode_item-&gt;otime);</div><div class='del'>-	BTRFS_I(inode)-&gt;i_otime_nsec = btrfs_stack_timespec_nsec(&amp;inode_item-&gt;otime);</div><div class='add'>+	inode-&gt;i_otime_sec = btrfs_stack_timespec_sec(&amp;inode_item-&gt;otime);</div><div class='add'>+	inode-&gt;i_otime_nsec = btrfs_stack_timespec_nsec(&amp;inode_item-&gt;otime);</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_generation = BTRFS_I(inode)-&gt;generation;</div><div class='del'>-	BTRFS_I(inode)-&gt;index_cnt = (u64)-1;</div><div class='add'>+	vfs_inode-&gt;i_generation = inode-&gt;generation;</div><div class='add'>+	if (S_ISDIR(vfs_inode-&gt;i_mode))</div><div class='add'>+		inode-&gt;index_cnt = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1920,16 +1948,16 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	delayed_node = btrfs_get_or_create_delayed_node(inode);</div><div class='add'>+	delayed_node = btrfs_get_or_create_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (IS_ERR(delayed_node))</div><div class='ctx'> 		return PTR_ERR(delayed_node);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;delayed_node-&gt;mutex);</div><div class='ctx'> 	if (test_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &amp;delayed_node-&gt;flags)) {</div><div class='del'>-		fill_stack_inode_item(trans, &amp;delayed_node-&gt;inode_item,</div><div class='del'>-				      &amp;inode-&gt;vfs_inode);</div><div class='add'>+		fill_stack_inode_item(trans, &amp;delayed_node-&gt;inode_item, inode);</div><div class='ctx'> 		goto release_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1937,13 +1965,13 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto release_node;</div><div class='ctx'> </div><div class='del'>-	fill_stack_inode_item(trans, &amp;delayed_node-&gt;inode_item, &amp;inode-&gt;vfs_inode);</div><div class='add'>+	fill_stack_inode_item(trans, &amp;delayed_node-&gt;inode_item, inode);</div><div class='ctx'> 	set_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &amp;delayed_node-&gt;flags);</div><div class='ctx'> 	delayed_node-&gt;count++;</div><div class='ctx'> 	atomic_inc(&amp;root-&gt;fs_info-&gt;delayed_root-&gt;items);</div><div class='ctx'> release_node:</div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1951,6 +1979,7 @@ int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we don't do delayed inode updates during log recovery because it</div><div class='hunk'>@@ -1960,7 +1989,7 @@ int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode)</div><div class='ctx'> 	if (test_bit(BTRFS_FS_LOG_RECOVERING, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	delayed_node = btrfs_get_or_create_delayed_node(inode);</div><div class='add'>+	delayed_node = btrfs_get_or_create_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (IS_ERR(delayed_node))</div><div class='ctx'> 		return PTR_ERR(delayed_node);</div><div class='ctx'> </div><div class='hunk'>@@ -1979,15 +2008,12 @@ int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode)</div><div class='ctx'> 	 *   It is very rare.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-	if (test_bit(BTRFS_DELAYED_NODE_DEL_IREF, &amp;delayed_node-&gt;flags))</div><div class='del'>-		goto release_node;</div><div class='del'>-</div><div class='del'>-	set_bit(BTRFS_DELAYED_NODE_DEL_IREF, &amp;delayed_node-&gt;flags);</div><div class='del'>-	delayed_node-&gt;count++;</div><div class='del'>-	atomic_inc(&amp;fs_info-&gt;delayed_root-&gt;items);</div><div class='del'>-release_node:</div><div class='add'>+	if (!test_and_set_bit(BTRFS_DELAYED_NODE_DEL_IREF, &amp;delayed_node-&gt;flags)) {</div><div class='add'>+		delayed_node-&gt;count++;</div><div class='add'>+		atomic_inc(&amp;fs_info-&gt;delayed_root-&gt;items);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;delayed_node-&gt;mutex);</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2031,27 +2057,29 @@ static void __btrfs_kill_delayed_node(struct btrfs_delayed_node *delayed_node)</div><div class='ctx'> void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_node;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> </div><div class='del'>-	delayed_node = btrfs_get_delayed_node(inode);</div><div class='add'>+	delayed_node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!delayed_node)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	__btrfs_kill_delayed_node(delayed_node);</div><div class='del'>-	btrfs_release_delayed_node(delayed_node);</div><div class='add'>+	btrfs_release_delayed_node(delayed_node, &amp;delayed_node_tracker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_kill_all_delayed_nodes(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long index = 0;</div><div class='ctx'> 	struct btrfs_delayed_node *delayed_nodes[8];</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_trackers[8];</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct btrfs_delayed_node *node;</div><div class='ctx'> 		int count;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;root-&gt;inode_lock);</div><div class='add'>+		xa_lock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 		if (xa_empty(&amp;root-&gt;delayed_nodes)) {</div><div class='del'>-			spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+			xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2062,18 +2090,23 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root)</div><div class='ctx'> 			 * about to be removed from the tree in the loop below</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (refcount_inc_not_zero(&amp;node-&gt;refs)) {</div><div class='add'>+				btrfs_delayed_node_ref_tracker_alloc(node,</div><div class='add'>+						     &amp;delayed_node_trackers[count],</div><div class='add'>+						     GFP_ATOMIC);</div><div class='ctx'> 				delayed_nodes[count] = node;</div><div class='ctx'> 				count++;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (count &gt;= ARRAY_SIZE(delayed_nodes))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+		xa_unlock(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 		index++;</div><div class='ctx'> </div><div class='ctx'> 		for (int i = 0; i &lt; count; i++) {</div><div class='ctx'> 			__btrfs_kill_delayed_node(delayed_nodes[i]);</div><div class='del'>-			btrfs_release_delayed_node(delayed_nodes[i]);</div><div class='add'>+			btrfs_delayed_node_ref_tracker_dir_print(delayed_nodes[i]);</div><div class='add'>+			btrfs_release_delayed_node(delayed_nodes[i],</div><div class='add'>+						   &amp;delayed_node_trackers[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2081,14 +2114,17 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root)</div><div class='ctx'> void btrfs_destroy_delayed_inodes(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_node *curr_node, *prev_node;</div><div class='add'>+	struct btrfs_ref_tracker curr_delayed_node_tracker, prev_delayed_node_tracker;</div><div class='ctx'> </div><div class='del'>-	curr_node = btrfs_first_delayed_node(fs_info-&gt;delayed_root);</div><div class='add'>+	curr_node = btrfs_first_delayed_node(fs_info-&gt;delayed_root,</div><div class='add'>+					     &amp;curr_delayed_node_tracker);</div><div class='ctx'> 	while (curr_node) {</div><div class='ctx'> 		__btrfs_kill_delayed_node(curr_node);</div><div class='ctx'> </div><div class='ctx'> 		prev_node = curr_node;</div><div class='del'>-		curr_node = btrfs_next_delayed_node(curr_node);</div><div class='del'>-		btrfs_release_delayed_node(prev_node);</div><div class='add'>+		prev_delayed_node_tracker = curr_delayed_node_tracker;</div><div class='add'>+		curr_node = btrfs_next_delayed_node(curr_node, &amp;curr_delayed_node_tracker);</div><div class='add'>+		btrfs_release_delayed_node(prev_node, &amp;prev_delayed_node_tracker);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2098,8 +2134,9 @@ void btrfs_log_get_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_node *node;</div><div class='ctx'> 	struct btrfs_delayed_item *item;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> </div><div class='del'>-	node = btrfs_get_delayed_node(inode);</div><div class='add'>+	node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2157,6 +2194,7 @@ void btrfs_log_get_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 	 * delete delayed items.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(refcount_read(&amp;node-&gt;refs) &gt; 1);</div><div class='add'>+	btrfs_delayed_node_ref_tracker_free(node, &amp;delayed_node_tracker);</div><div class='ctx'> 	refcount_dec(&amp;node-&gt;refs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2167,8 +2205,9 @@ void btrfs_log_put_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 	struct btrfs_delayed_node *node;</div><div class='ctx'> 	struct btrfs_delayed_item *item;</div><div class='ctx'> 	struct btrfs_delayed_item *next;</div><div class='add'>+	struct btrfs_ref_tracker delayed_node_tracker;</div><div class='ctx'> </div><div class='del'>-	node = btrfs_get_delayed_node(inode);</div><div class='add'>+	node = btrfs_get_delayed_node(inode, &amp;delayed_node_tracker);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2200,5 +2239,6 @@ void btrfs_log_put_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 	 * delete delayed items.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(refcount_read(&amp;node-&gt;refs) &gt; 1);</div><div class='add'>+	btrfs_delayed_node_ref_tracker_free(node, &amp;delayed_node_tracker);</div><div class='ctx'> 	refcount_dec(&amp;node-&gt;refs);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h<br/>index 5cceb31bbd16..b09d4ec8c77d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-inode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-inode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/delayed-inode.h</a></div><div class='hunk'>@@ -7,15 +7,24 @@</div><div class='ctx'> #ifndef BTRFS_DELAYED_INODE_H</div><div class='ctx'> #define BTRFS_DELAYED_INODE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/ref_tracker.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> </div><div class='add'>+struct btrfs_disk_key;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+</div><div class='ctx'> enum btrfs_delayed_item_type {</div><div class='ctx'> 	BTRFS_DELAYED_INSERTION_ITEM,</div><div class='ctx'> 	BTRFS_DELAYED_DELETION_ITEM</div><div class='hunk'>@@ -36,6 +45,22 @@ struct btrfs_delayed_root {</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct btrfs_ref_tracker_dir {</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+	struct ref_tracker_dir dir;</div><div class='add'>+#else</div><div class='add'>+	struct {} tracker;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct btrfs_ref_tracker {</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+	struct ref_tracker *tracker;</div><div class='add'>+#else</div><div class='add'>+	struct {} tracker;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define BTRFS_DELAYED_NODE_IN_LIST	0</div><div class='ctx'> #define BTRFS_DELAYED_NODE_INODE_DIRTY	1</div><div class='ctx'> #define BTRFS_DELAYED_NODE_DEL_IREF	2</div><div class='hunk'>@@ -56,9 +81,9 @@ struct btrfs_delayed_node {</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> 	struct btrfs_inode_item inode_item;</div><div class='ctx'> 	refcount_t refs;</div><div class='add'>+	int count;</div><div class='ctx'> 	u64 index_cnt;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int count;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The size of the next batch of dir index items to insert (if this</div><div class='ctx'> 	 * node is from a directory inode). Protected by @mutex.</div><div class='hunk'>@@ -70,6 +95,12 @@ struct btrfs_delayed_node {</div><div class='ctx'> 	 * actual number of leaves we end up using. Protected by @mutex.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 index_item_leaves;</div><div class='add'>+	/* Track all references to this delayed node. */</div><div class='add'>+	struct btrfs_ref_tracker_dir ref_dir;</div><div class='add'>+	/* Track delayed node reference stored in node list. */</div><div class='add'>+	struct btrfs_ref_tracker node_list_tracker;</div><div class='add'>+	/* Track delayed node reference stored in inode cache. */</div><div class='add'>+	struct btrfs_ref_tracker inode_cache_tracker;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct btrfs_delayed_item {</div><div class='hunk'>@@ -98,22 +129,11 @@ struct btrfs_delayed_item {</div><div class='ctx'> 	char data[] __counted_by(data_len);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_init_delayed_root(</div><div class='del'>-				struct btrfs_delayed_root *delayed_root)</div><div class='del'>-{</div><div class='del'>-	atomic_set(&amp;delayed_root-&gt;items, 0);</div><div class='del'>-	atomic_set(&amp;delayed_root-&gt;items_seq, 0);</div><div class='del'>-	delayed_root-&gt;nodes = 0;</div><div class='del'>-	spin_lock_init(&amp;delayed_root-&gt;lock);</div><div class='del'>-	init_waitqueue_head(&amp;delayed_root-&gt;wait);</div><div class='del'>-	INIT_LIST_HEAD(&amp;delayed_root-&gt;node_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;delayed_root-&gt;prepare_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+void btrfs_init_delayed_root(struct btrfs_delayed_root *delayed_root);</div><div class='ctx'> int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   const char *name, int name_len,</div><div class='ctx'> 				   struct btrfs_inode *dir,</div><div class='del'>-				   struct btrfs_disk_key *disk_key, u8 flags,</div><div class='add'>+				   const struct btrfs_disk_key *disk_key, u8 flags,</div><div class='ctx'> 				   u64 index);</div><div class='ctx'> </div><div class='ctx'> int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -136,7 +156,7 @@ int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode);</div><div class='ctx'> </div><div class='ctx'> int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_inode *inode);</div><div class='del'>-int btrfs_fill_inode(struct inode *inode, u32 *rdev);</div><div class='add'>+int btrfs_fill_inode(struct btrfs_inode *inode, u32 *rdev);</div><div class='ctx'> int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode);</div><div class='ctx'> </div><div class='ctx'> /* Used for drop dead root */</div><div class='hunk'>@@ -146,17 +166,16 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root);</div><div class='ctx'> void btrfs_destroy_delayed_inodes(struct btrfs_fs_info *fs_info);</div><div class='ctx'> </div><div class='ctx'> /* Used for readdir() */</div><div class='del'>-bool btrfs_readdir_get_delayed_items(struct inode *inode,</div><div class='add'>+bool btrfs_readdir_get_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 				     u64 last_index,</div><div class='ctx'> 				     struct list_head *ins_list,</div><div class='ctx'> 				     struct list_head *del_list);</div><div class='del'>-void btrfs_readdir_put_delayed_items(struct inode *inode,</div><div class='add'>+void btrfs_readdir_put_delayed_items(struct btrfs_inode *inode,</div><div class='ctx'> 				     struct list_head *ins_list,</div><div class='ctx'> 				     struct list_head *del_list);</div><div class='del'>-int btrfs_should_delete_dir_index(struct list_head *del_list,</div><div class='del'>-				  u64 index);</div><div class='del'>-int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,</div><div class='del'>-				    struct list_head *ins_list);</div><div class='add'>+bool btrfs_should_delete_dir_index(const struct list_head *del_list, u64 index);</div><div class='add'>+bool btrfs_readdir_delayed_dir_index(struct dir_context *ctx,</div><div class='add'>+				     const struct list_head *ins_list);</div><div class='ctx'> </div><div class='ctx'> /* Used during directory logging. */</div><div class='ctx'> void btrfs_log_get_delayed_items(struct btrfs_inode *inode,</div><div class='hunk'>@@ -173,4 +192,81 @@ void __cold btrfs_delayed_inode_exit(void);</div><div class='ctx'> /* for debugging */</div><div class='ctx'> void btrfs_assert_delayed_root_empty(struct btrfs_fs_info *fs_info);</div><div class='ctx'> </div><div class='add'>+#define BTRFS_DELAYED_NODE_REF_TRACKER_QUARANTINE_COUNT		16</div><div class='add'>+#define BTRFS_DELAYED_NODE_REF_TRACKER_DISPLAY_LIMIT		16</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+static inline void btrfs_delayed_node_ref_tracker_dir_init(struct btrfs_delayed_node *node)</div><div class='add'>+{</div><div class='add'>+	if (!btrfs_test_opt(node-&gt;root-&gt;fs_info, REF_TRACKER))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ref_tracker_dir_init(&amp;node-&gt;ref_dir.dir,</div><div class='add'>+			     BTRFS_DELAYED_NODE_REF_TRACKER_QUARANTINE_COUNT,</div><div class='add'>+			     "delayed_node");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_delayed_node_ref_tracker_dir_exit(struct btrfs_delayed_node *node)</div><div class='add'>+{</div><div class='add'>+	if (!btrfs_test_opt(node-&gt;root-&gt;fs_info, REF_TRACKER))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ref_tracker_dir_exit(&amp;node-&gt;ref_dir.dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_delayed_node_ref_tracker_dir_print(struct btrfs_delayed_node *node)</div><div class='add'>+{</div><div class='add'>+	if (!btrfs_test_opt(node-&gt;root-&gt;fs_info, REF_TRACKER))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only print if there are leaked references. The caller is</div><div class='add'>+	 * holding one reference, so if refs == 1 there is no leak.</div><div class='add'>+	 */</div><div class='add'>+	if (refcount_read(&amp;node-&gt;refs) == 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ref_tracker_dir_print(&amp;node-&gt;ref_dir.dir,</div><div class='add'>+			      BTRFS_DELAYED_NODE_REF_TRACKER_DISPLAY_LIMIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int btrfs_delayed_node_ref_tracker_alloc(struct btrfs_delayed_node *node,</div><div class='add'>+						       struct btrfs_ref_tracker *tracker,</div><div class='add'>+						       gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	if (!btrfs_test_opt(node-&gt;root-&gt;fs_info, REF_TRACKER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ref_tracker_alloc(&amp;node-&gt;ref_dir.dir, &amp;tracker-&gt;tracker, gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int btrfs_delayed_node_ref_tracker_free(struct btrfs_delayed_node *node,</div><div class='add'>+						      struct btrfs_ref_tracker *tracker)</div><div class='add'>+{</div><div class='add'>+	if (!btrfs_test_opt(node-&gt;root-&gt;fs_info, REF_TRACKER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ref_tracker_free(&amp;node-&gt;ref_dir.dir, &amp;tracker-&gt;tracker);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void btrfs_delayed_node_ref_tracker_dir_init(struct btrfs_delayed_node *node) { }</div><div class='add'>+</div><div class='add'>+static inline void btrfs_delayed_node_ref_tracker_dir_exit(struct btrfs_delayed_node *node) { }</div><div class='add'>+</div><div class='add'>+static inline void btrfs_delayed_node_ref_tracker_dir_print(struct btrfs_delayed_node *node) { }</div><div class='add'>+</div><div class='add'>+static inline int btrfs_delayed_node_ref_tracker_alloc(struct btrfs_delayed_node *node,</div><div class='add'>+						       struct btrfs_ref_tracker *tracker,</div><div class='add'>+						       gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int btrfs_delayed_node_ref_tracker_free(struct btrfs_delayed_node *node,</div><div class='add'>+						      struct btrfs_ref_tracker *tracker)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c<br/>index 891ea2fa263c..e8bc37453336 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-ref.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-ref.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-ref.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/delayed-ref.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "delayed-ref.h"</div><div class='add'>+#include "extent-tree.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "space-info.h"</div><div class='hunk'>@@ -16,8 +17,7 @@</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> </div><div class='ctx'> struct kmem_cache *btrfs_delayed_ref_head_cachep;</div><div class='del'>-struct kmem_cache *btrfs_delayed_tree_ref_cachep;</div><div class='del'>-struct kmem_cache *btrfs_delayed_data_ref_cachep;</div><div class='add'>+struct kmem_cache *btrfs_delayed_ref_node_cachep;</div><div class='ctx'> struct kmem_cache *btrfs_delayed_extent_op_cachep;</div><div class='ctx'> /*</div><div class='ctx'>  * delayed back reference update tracking.  For subvolume trees</div><div class='hunk'>@@ -93,6 +93,9 @@ void btrfs_update_delayed_refs_rsv(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	u64 num_bytes;</div><div class='ctx'> 	u64 reserved_bytes;</div><div class='ctx'> </div><div class='add'>+	if (btrfs_is_testing(fs_info))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	num_bytes = btrfs_calc_delayed_ref_bytes(fs_info, trans-&gt;delayed_ref_updates);</div><div class='ctx'> 	num_bytes += btrfs_calc_delayed_ref_csum_bytes(fs_info,</div><div class='ctx'> 						       trans-&gt;delayed_ref_csum_deletions);</div><div class='hunk'>@@ -196,48 +199,6 @@ void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Transfer bytes to our delayed refs rsv.</div><div class='del'>- *</div><div class='del'>- * @fs_info:   the filesystem</div><div class='del'>- * @num_bytes: number of bytes to transfer</div><div class='del'>- *</div><div class='del'>- * This transfers up to the num_bytes amount, previously reserved, to the</div><div class='del'>- * delayed_refs_rsv.  Any extra bytes are returned to the space info.</div><div class='del'>- */</div><div class='del'>-void btrfs_migrate_to_delayed_refs_rsv(struct btrfs_fs_info *fs_info,</div><div class='del'>-				       u64 num_bytes)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_block_rsv *delayed_refs_rsv = &amp;fs_info-&gt;delayed_refs_rsv;</div><div class='del'>-	u64 to_free = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;delayed_refs_rsv-&gt;lock);</div><div class='del'>-	if (delayed_refs_rsv-&gt;size &gt; delayed_refs_rsv-&gt;reserved) {</div><div class='del'>-		u64 delta = delayed_refs_rsv-&gt;size -</div><div class='del'>-			delayed_refs_rsv-&gt;reserved;</div><div class='del'>-		if (num_bytes &gt; delta) {</div><div class='del'>-			to_free = num_bytes - delta;</div><div class='del'>-			num_bytes = delta;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		to_free = num_bytes;</div><div class='del'>-		num_bytes = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (num_bytes)</div><div class='del'>-		delayed_refs_rsv-&gt;reserved += num_bytes;</div><div class='del'>-	if (delayed_refs_rsv-&gt;reserved &gt;= delayed_refs_rsv-&gt;size)</div><div class='del'>-		delayed_refs_rsv-&gt;full = true;</div><div class='del'>-	spin_unlock(&amp;delayed_refs_rsv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (num_bytes)</div><div class='del'>-		trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv",</div><div class='del'>-					      0, num_bytes, 1);</div><div class='del'>-	if (to_free)</div><div class='del'>-		btrfs_space_info_free_bytes_may_use(fs_info,</div><div class='del'>-				delayed_refs_rsv-&gt;space_info, to_free);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Refill based on our delayed refs usage.</div><div class='ctx'>  *</div><div class='ctx'>  * @fs_info: the filesystem</div><div class='hunk'>@@ -267,7 +228,7 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (!num_bytes)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, space_info, num_bytes, flush);</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(space_info, num_bytes, flush);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -296,7 +257,7 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	spin_unlock(&amp;block_rsv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (to_free &gt; 0)</div><div class='del'>-		btrfs_space_info_free_bytes_may_use(fs_info, space_info, to_free);</div><div class='add'>+		btrfs_space_info_free_bytes_may_use(space_info, to_free);</div><div class='ctx'> </div><div class='ctx'> 	if (refilled_bytes &gt; 0)</div><div class='ctx'> 		trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv", 0,</div><div class='hunk'>@@ -305,55 +266,24 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * compare two delayed tree backrefs with same bytenr and type</div><div class='del'>- */</div><div class='del'>-static int comp_tree_refs(struct btrfs_delayed_tree_ref *ref1,</div><div class='del'>-			  struct btrfs_delayed_tree_ref *ref2)</div><div class='del'>-{</div><div class='del'>-	if (ref1-&gt;node.type == BTRFS_TREE_BLOCK_REF_KEY) {</div><div class='del'>-		if (ref1-&gt;root &lt; ref2-&gt;root)</div><div class='del'>-			return -1;</div><div class='del'>-		if (ref1-&gt;root &gt; ref2-&gt;root)</div><div class='del'>-			return 1;</div><div class='del'>-	} else {</div><div class='del'>-		if (ref1-&gt;parent &lt; ref2-&gt;parent)</div><div class='del'>-			return -1;</div><div class='del'>-		if (ref1-&gt;parent &gt; ref2-&gt;parent)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * compare two delayed data backrefs with same bytenr and type</div><div class='ctx'>  */</div><div class='del'>-static int comp_data_refs(struct btrfs_delayed_data_ref *ref1,</div><div class='del'>-			  struct btrfs_delayed_data_ref *ref2)</div><div class='add'>+static int comp_data_refs(const struct btrfs_delayed_ref_node *ref1,</div><div class='add'>+			  const struct btrfs_delayed_ref_node *ref2)</div><div class='ctx'> {</div><div class='del'>-	if (ref1-&gt;node.type == BTRFS_EXTENT_DATA_REF_KEY) {</div><div class='del'>-		if (ref1-&gt;root &lt; ref2-&gt;root)</div><div class='del'>-			return -1;</div><div class='del'>-		if (ref1-&gt;root &gt; ref2-&gt;root)</div><div class='del'>-			return 1;</div><div class='del'>-		if (ref1-&gt;objectid &lt; ref2-&gt;objectid)</div><div class='del'>-			return -1;</div><div class='del'>-		if (ref1-&gt;objectid &gt; ref2-&gt;objectid)</div><div class='del'>-			return 1;</div><div class='del'>-		if (ref1-&gt;offset &lt; ref2-&gt;offset)</div><div class='del'>-			return -1;</div><div class='del'>-		if (ref1-&gt;offset &gt; ref2-&gt;offset)</div><div class='del'>-			return 1;</div><div class='del'>-	} else {</div><div class='del'>-		if (ref1-&gt;parent &lt; ref2-&gt;parent)</div><div class='del'>-			return -1;</div><div class='del'>-		if (ref1-&gt;parent &gt; ref2-&gt;parent)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='add'>+	if (ref1-&gt;data_ref.objectid &lt; ref2-&gt;data_ref.objectid)</div><div class='add'>+		return -1;</div><div class='add'>+	if (ref1-&gt;data_ref.objectid &gt; ref2-&gt;data_ref.objectid)</div><div class='add'>+		return 1;</div><div class='add'>+	if (ref1-&gt;data_ref.offset &lt; ref2-&gt;data_ref.offset)</div><div class='add'>+		return -1;</div><div class='add'>+	if (ref1-&gt;data_ref.offset &gt; ref2-&gt;data_ref.offset)</div><div class='add'>+		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int comp_refs(struct btrfs_delayed_ref_node *ref1,</div><div class='del'>-		     struct btrfs_delayed_ref_node *ref2,</div><div class='add'>+static int comp_refs(const struct btrfs_delayed_ref_node *ref1,</div><div class='add'>+		     const struct btrfs_delayed_ref_node *ref2,</div><div class='ctx'> 		     bool check_seq)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -362,13 +292,20 @@ static int comp_refs(struct btrfs_delayed_ref_node *ref1,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	if (ref1-&gt;type &gt; ref2-&gt;type)</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (ref1-&gt;type == BTRFS_TREE_BLOCK_REF_KEY ||</div><div class='del'>-	    ref1-&gt;type == BTRFS_SHARED_BLOCK_REF_KEY)</div><div class='del'>-		ret = comp_tree_refs(btrfs_delayed_node_to_tree_ref(ref1),</div><div class='del'>-				     btrfs_delayed_node_to_tree_ref(ref2));</div><div class='del'>-	else</div><div class='del'>-		ret = comp_data_refs(btrfs_delayed_node_to_data_ref(ref1),</div><div class='del'>-				     btrfs_delayed_node_to_data_ref(ref2));</div><div class='add'>+	if (ref1-&gt;type == BTRFS_SHARED_BLOCK_REF_KEY ||</div><div class='add'>+	    ref1-&gt;type == BTRFS_SHARED_DATA_REF_KEY) {</div><div class='add'>+		if (ref1-&gt;parent &lt; ref2-&gt;parent)</div><div class='add'>+			return -1;</div><div class='add'>+		if (ref1-&gt;parent &gt; ref2-&gt;parent)</div><div class='add'>+			return 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (ref1-&gt;ref_root &lt; ref2-&gt;ref_root)</div><div class='add'>+			return -1;</div><div class='add'>+		if (ref1-&gt;ref_root &gt; ref2-&gt;ref_root)</div><div class='add'>+			return 1;</div><div class='add'>+		if (ref1-&gt;type == BTRFS_EXTENT_DATA_REF_KEY)</div><div class='add'>+			ret = comp_data_refs(ref1, ref2);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (check_seq) {</div><div class='hunk'>@@ -380,142 +317,54 @@ static int comp_refs(struct btrfs_delayed_ref_node *ref1,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* insert a new ref to head ref rbtree */</div><div class='del'>-static struct btrfs_delayed_ref_head *htree_insert(struct rb_root_cached *root,</div><div class='del'>-						   struct rb_node *node)</div><div class='add'>+static int cmp_refs_node(const struct rb_node *new, const struct rb_node *exist)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_root.rb_node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='del'>-	struct btrfs_delayed_ref_head *entry;</div><div class='del'>-	struct btrfs_delayed_ref_head *ins;</div><div class='del'>-	u64 bytenr;</div><div class='del'>-	bool leftmost = true;</div><div class='del'>-</div><div class='del'>-	ins = rb_entry(node, struct btrfs_delayed_ref_head, href_node);</div><div class='del'>-	bytenr = ins-&gt;bytenr;</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		entry = rb_entry(parent_node, struct btrfs_delayed_ref_head,</div><div class='del'>-				 href_node);</div><div class='del'>-</div><div class='del'>-		if (bytenr &lt; entry-&gt;bytenr) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (bytenr &gt; entry-&gt;bytenr) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else {</div><div class='del'>-			return entry;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	const struct btrfs_delayed_ref_node *new_node =</div><div class='add'>+		rb_entry(new, struct btrfs_delayed_ref_node, ref_node);</div><div class='add'>+	const struct btrfs_delayed_ref_node *exist_node =</div><div class='add'>+		rb_entry(exist, struct btrfs_delayed_ref_node, ref_node);</div><div class='ctx'> </div><div class='del'>-	rb_link_node(node, parent_node, p);</div><div class='del'>-	rb_insert_color_cached(node, root, leftmost);</div><div class='del'>-	return NULL;</div><div class='add'>+	return comp_refs(new_node, exist_node, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_ref_node* tree_insert(struct rb_root_cached *root,</div><div class='ctx'> 		struct btrfs_delayed_ref_node *ins)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_root.rb_node;</div><div class='ctx'> 	struct rb_node *node = &amp;ins-&gt;ref_node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='del'>-	struct btrfs_delayed_ref_node *entry;</div><div class='del'>-	bool leftmost = true;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		int comp;</div><div class='del'>-</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		entry = rb_entry(parent_node, struct btrfs_delayed_ref_node,</div><div class='del'>-				 ref_node);</div><div class='del'>-		comp = comp_refs(ins, entry, true);</div><div class='del'>-		if (comp &lt; 0) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (comp &gt; 0) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else {</div><div class='del'>-			return entry;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct rb_node *exist = rb_find_add_cached(node, root, cmp_refs_node);</div><div class='ctx'> </div><div class='del'>-	rb_link_node(node, parent_node, p);</div><div class='del'>-	rb_insert_color_cached(node, root, leftmost);</div><div class='del'>-	return NULL;</div><div class='add'>+	return rb_entry_safe(exist, struct btrfs_delayed_ref_node, ref_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_delayed_ref_head *find_first_ref_head(</div><div class='ctx'> 		struct btrfs_delayed_ref_root *dr)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-	struct btrfs_delayed_ref_head *entry;</div><div class='add'>+	unsigned long from = 0;</div><div class='ctx'> </div><div class='del'>-	n = rb_first_cached(&amp;dr-&gt;href_root);</div><div class='del'>-	if (!n)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	entry = rb_entry(n, struct btrfs_delayed_ref_head, href_node);</div><div class='add'>+	lockdep_assert_held(&amp;dr-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return entry;</div><div class='add'>+	return xa_find(&amp;dr-&gt;head_refs, &amp;from, ULONG_MAX, XA_PRESENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Find a head entry based on bytenr. This returns the delayed ref head if it</div><div class='del'>- * was able to find one, or NULL if nothing was in that spot.  If return_bigger</div><div class='del'>- * is given, the next bigger entry is returned if no exact match is found.</div><div class='del'>- */</div><div class='del'>-static struct btrfs_delayed_ref_head *find_ref_head(</div><div class='del'>-		struct btrfs_delayed_ref_root *dr, u64 bytenr,</div><div class='del'>-		bool return_bigger)</div><div class='del'>-{</div><div class='del'>-	struct rb_root *root = &amp;dr-&gt;href_root.rb_root;</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-	struct btrfs_delayed_ref_head *entry;</div><div class='del'>-</div><div class='del'>-	n = root-&gt;rb_node;</div><div class='del'>-	entry = NULL;</div><div class='del'>-	while (n) {</div><div class='del'>-		entry = rb_entry(n, struct btrfs_delayed_ref_head, href_node);</div><div class='del'>-</div><div class='del'>-		if (bytenr &lt; entry-&gt;bytenr)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else if (bytenr &gt; entry-&gt;bytenr)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='del'>-	if (entry &amp;&amp; return_bigger) {</div><div class='del'>-		if (bytenr &gt; entry-&gt;bytenr) {</div><div class='del'>-			n = rb_next(&amp;entry-&gt;href_node);</div><div class='del'>-			if (!n)</div><div class='del'>-				return NULL;</div><div class='del'>-			entry = rb_entry(n, struct btrfs_delayed_ref_head,</div><div class='del'>-					 href_node);</div><div class='del'>-		}</div><div class='del'>-		return entry;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='del'>-			   struct btrfs_delayed_ref_head *head)</div><div class='add'>+static bool btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+				   struct btrfs_delayed_ref_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> 	if (mutex_trylock(&amp;head-&gt;mutex))</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	refcount_inc(&amp;head-&gt;refs);</div><div class='ctx'> 	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;head-&gt;mutex);</div><div class='ctx'> 	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	if (RB_EMPTY_NODE(&amp;head-&gt;href_node)) {</div><div class='add'>+	if (!head-&gt;tracked) {</div><div class='ctx'> 		mutex_unlock(&amp;head-&gt;mutex);</div><div class='ctx'> 		btrfs_put_delayed_ref_head(head);</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_put_delayed_ref_head(head);</div><div class='del'>-	return 0;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void drop_delayed_ref(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -529,7 +378,6 @@ static inline void drop_delayed_ref(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (!list_empty(&amp;ref-&gt;add_list))</div><div class='ctx'> 		list_del(&amp;ref-&gt;add_list);</div><div class='ctx'> 	btrfs_put_delayed_ref(ref);</div><div class='del'>-	atomic_dec(&amp;delayed_refs-&gt;num_entries);</div><div class='ctx'> 	btrfs_delayed_refs_rsv_release(fs_info, 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -625,33 +473,31 @@ int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_delayed_ref_head *btrfs_select_ref_head(</div><div class='add'>+		const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		struct btrfs_delayed_ref_root *delayed_refs)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_ref_head *head;</div><div class='add'>+	unsigned long start_index;</div><div class='add'>+	unsigned long found_index;</div><div class='add'>+	bool found_head = false;</div><div class='add'>+	bool locked;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> again:</div><div class='del'>-	head = find_ref_head(delayed_refs, delayed_refs-&gt;run_delayed_start,</div><div class='del'>-			     true);</div><div class='del'>-	if (!head &amp;&amp; delayed_refs-&gt;run_delayed_start != 0) {</div><div class='del'>-		delayed_refs-&gt;run_delayed_start = 0;</div><div class='del'>-		head = find_first_ref_head(delayed_refs);</div><div class='add'>+	start_index = (delayed_refs-&gt;run_delayed_start &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	xa_for_each_start(&amp;delayed_refs-&gt;head_refs, found_index, head, start_index) {</div><div class='add'>+		if (!head-&gt;processing) {</div><div class='add'>+			found_head = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!head)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	while (head-&gt;processing) {</div><div class='del'>-		struct rb_node *node;</div><div class='del'>-</div><div class='del'>-		node = rb_next(&amp;head-&gt;href_node);</div><div class='del'>-		if (!node) {</div><div class='del'>-			if (delayed_refs-&gt;run_delayed_start == 0)</div><div class='del'>-				return NULL;</div><div class='del'>-			delayed_refs-&gt;run_delayed_start = 0;</div><div class='del'>-			goto again;</div><div class='add'>+	if (!found_head) {</div><div class='add'>+		if (delayed_refs-&gt;run_delayed_start == 0) {</div><div class='add'>+			spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		head = rb_entry(node, struct btrfs_delayed_ref_head,</div><div class='del'>-				href_node);</div><div class='add'>+		delayed_refs-&gt;run_delayed_start = 0;</div><div class='add'>+		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	head-&gt;processing = true;</div><div class='hunk'>@@ -659,23 +505,73 @@ again:</div><div class='ctx'> 	delayed_refs-&gt;num_heads_ready--;</div><div class='ctx'> 	delayed_refs-&gt;run_delayed_start = head-&gt;bytenr +</div><div class='ctx'> 		head-&gt;num_bytes;</div><div class='add'>+</div><div class='add'>+	locked = btrfs_delayed_ref_lock(delayed_refs, head);</div><div class='add'>+	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We may have dropped the spin lock to get the head mutex lock, and</div><div class='add'>+	 * that might have given someone else time to free the head.  If that's</div><div class='add'>+	 * true, it has been removed from our list and we can move on.</div><div class='add'>+	 */</div><div class='add'>+	if (!locked)</div><div class='add'>+		return ERR_PTR(-EAGAIN);</div><div class='add'>+</div><div class='ctx'> 	return head;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_delete_ref_head(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+void btrfs_unselect_ref_head(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+			     struct btrfs_delayed_ref_head *head)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	head-&gt;processing = false;</div><div class='add'>+	delayed_refs-&gt;num_heads_ready++;</div><div class='add'>+	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	btrfs_delayed_ref_unlock(head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_delete_ref_head(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			   struct btrfs_delayed_ref_root *delayed_refs,</div><div class='ctx'> 			   struct btrfs_delayed_ref_head *head)</div><div class='ctx'> {</div><div class='add'>+	const unsigned long index = (head-&gt;bytenr &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> 	lockdep_assert_held(&amp;head-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	rb_erase_cached(&amp;head-&gt;href_node, &amp;delayed_refs-&gt;href_root);</div><div class='del'>-	RB_CLEAR_NODE(&amp;head-&gt;href_node);</div><div class='del'>-	atomic_dec(&amp;delayed_refs-&gt;num_entries);</div><div class='add'>+	xa_erase(&amp;delayed_refs-&gt;head_refs, index);</div><div class='add'>+	head-&gt;tracked = false;</div><div class='ctx'> 	delayed_refs-&gt;num_heads--;</div><div class='ctx'> 	if (!head-&gt;processing)</div><div class='ctx'> 		delayed_refs-&gt;num_heads_ready--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct btrfs_delayed_ref_node *btrfs_select_delayed_ref(struct btrfs_delayed_ref_head *head)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_delayed_ref_node *ref;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;head-&gt;mutex);</div><div class='add'>+	lockdep_assert_held(&amp;head-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (RB_EMPTY_ROOT(&amp;head-&gt;ref_tree.rb_root))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Select a delayed ref of type BTRFS_ADD_DELAYED_REF first.</div><div class='add'>+	 * This is to prevent a ref count from going down to zero, which deletes</div><div class='add'>+	 * the extent item from the extent tree, when there still are references</div><div class='add'>+	 * to add, which would fail because they would not find the extent item.</div><div class='add'>+	 */</div><div class='add'>+	if (!list_empty(&amp;head-&gt;ref_add_list))</div><div class='add'>+		return list_first_entry(&amp;head-&gt;ref_add_list,</div><div class='add'>+					struct btrfs_delayed_ref_node, add_list);</div><div class='add'>+</div><div class='add'>+	ref = rb_entry(rb_first_cached(&amp;head-&gt;ref_tree),</div><div class='add'>+		       struct btrfs_delayed_ref_node, ref_node);</div><div class='add'>+	ASSERT(list_empty(&amp;ref-&gt;add_list));</div><div class='add'>+	return ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Helper to insert the ref_node to the tail or merge with tail.</div><div class='ctx'>  *</div><div class='hunk'>@@ -696,7 +592,6 @@ static bool insert_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!exist) {</div><div class='ctx'> 		if (ref-&gt;action == BTRFS_ADD_DELAYED_REF)</div><div class='ctx'> 			list_add_tail(&amp;ref-&gt;add_list, &amp;href-&gt;ref_add_list);</div><div class='del'>-		atomic_inc(&amp;root-&gt;num_entries);</div><div class='ctx'> 		spin_unlock(&amp;href-&gt;lock);</div><div class='ctx'> 		trans-&gt;delayed_ref_updates++;</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -716,7 +611,7 @@ static bool insert_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					      &amp;href-&gt;ref_add_list);</div><div class='ctx'> 			else if (ref-&gt;action == BTRFS_DROP_DELAYED_REF) {</div><div class='ctx'> 				ASSERT(!list_empty(&amp;exist-&gt;add_list));</div><div class='del'>-				list_del(&amp;exist-&gt;add_list);</div><div class='add'>+				list_del_init(&amp;exist-&gt;add_list);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ASSERT(0);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -828,18 +723,20 @@ static noinline void update_existing_head_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref,</div><div class='add'>+				  struct btrfs_ref *generic_ref,</div><div class='ctx'> 				  struct btrfs_qgroup_extent_record *qrecord,</div><div class='del'>-				  u64 bytenr, u64 num_bytes, u64 ref_root,</div><div class='del'>-				  u64 reserved, int action, bool is_data,</div><div class='del'>-				  bool is_system, u64 owning_root)</div><div class='add'>+				  u64 reserved)</div><div class='ctx'> {</div><div class='ctx'> 	int count_mod = 1;</div><div class='ctx'> 	bool must_insert_reserved = false;</div><div class='ctx'> </div><div class='ctx'> 	/* If reserved is provided, it must be a data extent. */</div><div class='del'>-	BUG_ON(!is_data &amp;&amp; reserved);</div><div class='add'>+	BUG_ON(generic_ref-&gt;type != BTRFS_REF_DATA &amp;&amp; reserved);</div><div class='ctx'> </div><div class='del'>-	switch (action) {</div><div class='add'>+	switch (generic_ref-&gt;action) {</div><div class='add'>+	case BTRFS_ADD_DELAYED_REF:</div><div class='add'>+		/* count_mod is already set to 1. */</div><div class='add'>+		break;</div><div class='ctx'> 	case BTRFS_UPDATE_DELAYED_HEAD:</div><div class='ctx'> 		count_mod = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -868,37 +765,48 @@ static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	refcount_set(&amp;head_ref-&gt;refs, 1);</div><div class='del'>-	head_ref-&gt;bytenr = bytenr;</div><div class='del'>-	head_ref-&gt;num_bytes = num_bytes;</div><div class='add'>+	head_ref-&gt;bytenr = generic_ref-&gt;bytenr;</div><div class='add'>+	head_ref-&gt;num_bytes = generic_ref-&gt;num_bytes;</div><div class='ctx'> 	head_ref-&gt;ref_mod = count_mod;</div><div class='ctx'> 	head_ref-&gt;reserved_bytes = reserved;</div><div class='ctx'> 	head_ref-&gt;must_insert_reserved = must_insert_reserved;</div><div class='del'>-	head_ref-&gt;owning_root = owning_root;</div><div class='del'>-	head_ref-&gt;is_data = is_data;</div><div class='del'>-	head_ref-&gt;is_system = is_system;</div><div class='add'>+	head_ref-&gt;owning_root = generic_ref-&gt;owning_root;</div><div class='add'>+	head_ref-&gt;is_data = (generic_ref-&gt;type == BTRFS_REF_DATA);</div><div class='add'>+	head_ref-&gt;is_system = (generic_ref-&gt;ref_root == BTRFS_CHUNK_TREE_OBJECTID);</div><div class='ctx'> 	head_ref-&gt;ref_tree = RB_ROOT_CACHED;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;head_ref-&gt;ref_add_list);</div><div class='del'>-	RB_CLEAR_NODE(&amp;head_ref-&gt;href_node);</div><div class='add'>+	head_ref-&gt;tracked = false;</div><div class='ctx'> 	head_ref-&gt;processing = false;</div><div class='ctx'> 	head_ref-&gt;total_ref_mod = count_mod;</div><div class='ctx'> 	spin_lock_init(&amp;head_ref-&gt;lock);</div><div class='ctx'> 	mutex_init(&amp;head_ref-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	/* If not metadata set an impossible level to help debugging. */</div><div class='add'>+	if (generic_ref-&gt;type == BTRFS_REF_METADATA)</div><div class='add'>+		head_ref-&gt;level = generic_ref-&gt;tree_ref.level;</div><div class='add'>+	else</div><div class='add'>+		head_ref-&gt;level = U8_MAX;</div><div class='add'>+</div><div class='ctx'> 	if (qrecord) {</div><div class='del'>-		if (ref_root &amp;&amp; reserved) {</div><div class='add'>+		if (generic_ref-&gt;ref_root &amp;&amp; reserved) {</div><div class='ctx'> 			qrecord-&gt;data_rsv = reserved;</div><div class='del'>-			qrecord-&gt;data_rsv_refroot = ref_root;</div><div class='add'>+			qrecord-&gt;data_rsv_refroot = generic_ref-&gt;ref_root;</div><div class='ctx'> 		}</div><div class='del'>-		qrecord-&gt;bytenr = bytenr;</div><div class='del'>-		qrecord-&gt;num_bytes = num_bytes;</div><div class='add'>+		qrecord-&gt;num_bytes = generic_ref-&gt;num_bytes;</div><div class='ctx'> 		qrecord-&gt;old_roots = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * helper function to actually insert a head node into the rbtree.</div><div class='del'>- * this does all the dirty work in terms of maintaining the correct</div><div class='del'>- * overall modification count.</div><div class='add'>+ * Helper function to actually insert a head node into the xarray. This does all</div><div class='add'>+ * the dirty work in terms of maintaining the correct overall modification</div><div class='add'>+ * count.</div><div class='add'>+ *</div><div class='add'>+ * The caller is responsible for calling kfree() on @qrecord. More specifically,</div><div class='add'>+ * if this function reports that it did not insert it as noted in</div><div class='add'>+ * @qrecord_inserted_ret, then it's safe to call kfree() on it.</div><div class='add'>+ *</div><div class='add'>+ * Returns an error pointer in case of an error.</div><div class='ctx'>  */</div><div class='ctx'> static noinline struct btrfs_delayed_ref_head *</div><div class='ctx'> add_delayed_ref_head(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -906,25 +814,59 @@ add_delayed_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		     struct btrfs_qgroup_extent_record *qrecord,</div><div class='ctx'> 		     int action, bool *qrecord_inserted_ret)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_delayed_ref_head *existing;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='del'>-	bool qrecord_inserted = false;</div><div class='add'>+	const unsigned long index = (head_ref-&gt;bytenr &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If 'qrecord_inserted_ret' is provided, then the first thing we need</div><div class='add'>+	 * to do is to initialize it to false just in case we have an exit</div><div class='add'>+	 * before trying to insert the record.</div><div class='add'>+	 */</div><div class='add'>+	if (qrecord_inserted_ret)</div><div class='add'>+		*qrecord_inserted_ret = false;</div><div class='ctx'> </div><div class='ctx'> 	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+	lockdep_assert_held(&amp;delayed_refs-&gt;lock);</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	if (head_ref-&gt;bytenr &gt;= MAX_LFS_FILESIZE) {</div><div class='add'>+		if (qrecord)</div><div class='add'>+			xa_release(&amp;delayed_refs-&gt;dirty_extents, index);</div><div class='add'>+		btrfs_err_rl(fs_info,</div><div class='add'>+"delayed ref head %llu is beyond 32bit page cache and xarray index limit",</div><div class='add'>+			     head_ref-&gt;bytenr);</div><div class='add'>+		btrfs_err_32bit_limit(fs_info);</div><div class='add'>+		return ERR_PTR(-EOVERFLOW);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Record qgroup extent info if provided */</div><div class='ctx'> 	if (qrecord) {</div><div class='del'>-		if (btrfs_qgroup_trace_extent_nolock(trans-&gt;fs_info,</div><div class='del'>-					delayed_refs, qrecord))</div><div class='del'>-			kfree(qrecord);</div><div class='del'>-		else</div><div class='del'>-			qrecord_inserted = true;</div><div class='add'>+		/*</div><div class='add'>+		 * Setting 'qrecord' but not 'qrecord_inserted_ret' will likely</div><div class='add'>+		 * result in a memory leakage.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(qrecord_inserted_ret != NULL);</div><div class='add'>+</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_qgroup_trace_extent_nolock(fs_info, delayed_refs, qrecord,</div><div class='add'>+						       head_ref-&gt;bytenr);</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* Clean up if insertion fails or item exists. */</div><div class='add'>+			xa_release(&amp;delayed_refs-&gt;dirty_extents, index);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ERR_PTR(ret);</div><div class='add'>+		} else if (qrecord_inserted_ret) {</div><div class='add'>+			*qrecord_inserted_ret = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trace_add_delayed_ref_head(trans-&gt;fs_info, head_ref, action);</div><div class='add'>+	trace_add_delayed_ref_head(fs_info, head_ref, action);</div><div class='ctx'> </div><div class='del'>-	existing = htree_insert(&amp;delayed_refs-&gt;href_root,</div><div class='del'>-				&amp;head_ref-&gt;href_node);</div><div class='add'>+	existing = xa_load(&amp;delayed_refs-&gt;head_refs, index);</div><div class='ctx'> 	if (existing) {</div><div class='ctx'> 		update_existing_head_ref(trans, existing, head_ref);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -934,6 +876,19 @@ add_delayed_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);</div><div class='ctx'> 		head_ref = existing;</div><div class='ctx'> 	} else {</div><div class='add'>+		existing = xa_store(&amp;delayed_refs-&gt;head_refs, index, head_ref, GFP_ATOMIC);</div><div class='add'>+		if (xa_is_err(existing)) {</div><div class='add'>+			/* Memory was preallocated by the caller. */</div><div class='add'>+			ASSERT(xa_err(existing) != -ENOMEM);</div><div class='add'>+			return ERR_PTR(xa_err(existing));</div><div class='add'>+		} else if (WARN_ON(existing)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Shouldn't happen we just did a lookup before under</div><div class='add'>+			 * delayed_refs-&gt;lock.</div><div class='add'>+			 */</div><div class='add'>+			return ERR_PTR(-EEXIST);</div><div class='add'>+		}</div><div class='add'>+		head_ref-&gt;tracked = true;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We reserve the amount of bytes needed to delete csums when</div><div class='ctx'> 		 * adding the ref head and not when adding individual drop refs</div><div class='hunk'>@@ -943,21 +898,17 @@ add_delayed_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (head_ref-&gt;is_data &amp;&amp; head_ref-&gt;ref_mod &lt; 0) {</div><div class='ctx'> 			delayed_refs-&gt;pending_csums += head_ref-&gt;num_bytes;</div><div class='ctx'> 			trans-&gt;delayed_ref_csum_deletions +=</div><div class='del'>-				btrfs_csum_bytes_to_leaves(trans-&gt;fs_info,</div><div class='del'>-							   head_ref-&gt;num_bytes);</div><div class='add'>+				btrfs_csum_bytes_to_leaves(fs_info, head_ref-&gt;num_bytes);</div><div class='ctx'> 		}</div><div class='ctx'> 		delayed_refs-&gt;num_heads++;</div><div class='ctx'> 		delayed_refs-&gt;num_heads_ready++;</div><div class='del'>-		atomic_inc(&amp;delayed_refs-&gt;num_entries);</div><div class='ctx'> 	}</div><div class='del'>-	if (qrecord_inserted_ret)</div><div class='del'>-		*qrecord_inserted_ret = qrecord_inserted;</div><div class='ctx'> </div><div class='ctx'> 	return head_ref;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Initialize the structure which represents a modification to a an extent.</div><div class='add'>+ * Initialize the structure which represents a modification to an extent.</div><div class='ctx'>  *</div><div class='ctx'>  * @fs_info:    Internal to the mounted filesystem mount structure.</div><div class='ctx'>  *</div><div class='hunk'>@@ -982,102 +933,148 @@ add_delayed_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'>  */</div><div class='ctx'> static void init_delayed_ref_common(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				    struct btrfs_delayed_ref_node *ref,</div><div class='del'>-				    u64 bytenr, u64 num_bytes, u64 ref_root,</div><div class='del'>-				    int action, u8 ref_type)</div><div class='add'>+				    struct btrfs_ref *generic_ref)</div><div class='ctx'> {</div><div class='add'>+	int action = generic_ref-&gt;action;</div><div class='ctx'> 	u64 seq = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (action == BTRFS_ADD_DELAYED_EXTENT)</div><div class='ctx'> 		action = BTRFS_ADD_DELAYED_REF;</div><div class='ctx'> </div><div class='del'>-	if (is_fstree(ref_root))</div><div class='add'>+	if (btrfs_is_fstree(generic_ref-&gt;ref_root))</div><div class='ctx'> 		seq = atomic64_read(&amp;fs_info-&gt;tree_mod_seq);</div><div class='ctx'> </div><div class='ctx'> 	refcount_set(&amp;ref-&gt;refs, 1);</div><div class='del'>-	ref-&gt;bytenr = bytenr;</div><div class='del'>-	ref-&gt;num_bytes = num_bytes;</div><div class='add'>+	ref-&gt;bytenr = generic_ref-&gt;bytenr;</div><div class='add'>+	ref-&gt;num_bytes = generic_ref-&gt;num_bytes;</div><div class='ctx'> 	ref-&gt;ref_mod = 1;</div><div class='ctx'> 	ref-&gt;action = action;</div><div class='ctx'> 	ref-&gt;seq = seq;</div><div class='del'>-	ref-&gt;type = ref_type;</div><div class='add'>+	ref-&gt;type = btrfs_ref_type(generic_ref);</div><div class='add'>+	ref-&gt;ref_root = generic_ref-&gt;ref_root;</div><div class='add'>+	ref-&gt;parent = generic_ref-&gt;parent;</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;ref-&gt;ref_node);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ref-&gt;add_list);</div><div class='add'>+</div><div class='add'>+	if (generic_ref-&gt;type == BTRFS_REF_DATA)</div><div class='add'>+		ref-&gt;data_ref = generic_ref-&gt;data_ref;</div><div class='add'>+	else</div><div class='add'>+		ref-&gt;tree_ref = generic_ref-&gt;tree_ref;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * add a delayed tree ref.  This does all of the accounting required</div><div class='del'>- * to make sure the delayed ref is eventually processed before this</div><div class='del'>- * transaction commits.</div><div class='del'>- */</div><div class='del'>-int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,</div><div class='del'>-			       struct btrfs_ref *generic_ref,</div><div class='del'>-			       struct btrfs_delayed_extent_op *extent_op)</div><div class='add'>+void btrfs_init_tree_ref(struct btrfs_ref *generic_ref, int level, u64 mod_root,</div><div class='add'>+			 bool skip_qgroup)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+	/* If @real_root not set, use @root as fallback */</div><div class='add'>+	generic_ref-&gt;real_root = mod_root ?: generic_ref-&gt;ref_root;</div><div class='add'>+#endif</div><div class='add'>+	generic_ref-&gt;tree_ref.level = level;</div><div class='add'>+	generic_ref-&gt;type = BTRFS_REF_METADATA;</div><div class='add'>+	if (skip_qgroup || !(btrfs_is_fstree(generic_ref-&gt;ref_root) &amp;&amp;</div><div class='add'>+			     (!mod_root || btrfs_is_fstree(mod_root))))</div><div class='add'>+		generic_ref-&gt;skip_qgroup = true;</div><div class='add'>+	else</div><div class='add'>+		generic_ref-&gt;skip_qgroup = false;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_init_data_ref(struct btrfs_ref *generic_ref, u64 ino, u64 offset,</div><div class='add'>+			 u64 mod_root, bool skip_qgroup)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+	/* If @real_root not set, use @root as fallback */</div><div class='add'>+	generic_ref-&gt;real_root = mod_root ?: generic_ref-&gt;ref_root;</div><div class='add'>+#endif</div><div class='add'>+	generic_ref-&gt;data_ref.objectid = ino;</div><div class='add'>+	generic_ref-&gt;data_ref.offset = offset;</div><div class='add'>+	generic_ref-&gt;type = BTRFS_REF_DATA;</div><div class='add'>+	if (skip_qgroup || !(btrfs_is_fstree(generic_ref-&gt;ref_root) &amp;&amp;</div><div class='add'>+			     (!mod_root || btrfs_is_fstree(mod_root))))</div><div class='add'>+		generic_ref-&gt;skip_qgroup = true;</div><div class='add'>+	else</div><div class='add'>+		generic_ref-&gt;skip_qgroup = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='add'>+			   struct btrfs_ref *generic_ref,</div><div class='add'>+			   struct btrfs_delayed_extent_op *extent_op,</div><div class='add'>+			   u64 reserved)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_delayed_tree_ref *ref;</div><div class='add'>+	struct btrfs_delayed_ref_node *node;</div><div class='ctx'> 	struct btrfs_delayed_ref_head *head_ref;</div><div class='add'>+	struct btrfs_delayed_ref_head *new_head_ref;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='ctx'> 	struct btrfs_qgroup_extent_record *record = NULL;</div><div class='add'>+	const unsigned long index = (generic_ref-&gt;bytenr &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	bool qrecord_reserved = false;</div><div class='ctx'> 	bool qrecord_inserted;</div><div class='del'>-	bool is_system;</div><div class='del'>-	bool merged;</div><div class='ctx'> 	int action = generic_ref-&gt;action;</div><div class='del'>-	int level = generic_ref-&gt;tree_ref.level;</div><div class='del'>-	u64 bytenr = generic_ref-&gt;bytenr;</div><div class='del'>-	u64 num_bytes = generic_ref-&gt;len;</div><div class='del'>-	u64 parent = generic_ref-&gt;parent;</div><div class='del'>-	u8 ref_type;</div><div class='del'>-</div><div class='del'>-	is_system = (generic_ref-&gt;tree_ref.ref_root == BTRFS_CHUNK_TREE_OBJECTID);</div><div class='add'>+	bool merged;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(generic_ref-&gt;type == BTRFS_REF_METADATA &amp;&amp; generic_ref-&gt;action);</div><div class='del'>-	ref = kmem_cache_alloc(btrfs_delayed_tree_ref_cachep, GFP_NOFS);</div><div class='del'>-	if (!ref)</div><div class='add'>+	node = kmem_cache_alloc(btrfs_delayed_ref_node_cachep, GFP_NOFS);</div><div class='add'>+	if (!node)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);</div><div class='ctx'> 	if (!head_ref) {</div><div class='del'>-		kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+</div><div class='ctx'> 	if (btrfs_qgroup_full_accounting(fs_info) &amp;&amp; !generic_ref-&gt;skip_qgroup) {</div><div class='ctx'> 		record = kzalloc(sizeof(*record), GFP_NOFS);</div><div class='ctx'> 		if (!record) {</div><div class='del'>-			kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);</div><div class='del'>-			kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto free_head_ref;</div><div class='add'>+		}</div><div class='add'>+		if (xa_reserve(&amp;delayed_refs-&gt;dirty_extents, index, GFP_NOFS)) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto free_record;</div><div class='ctx'> 		}</div><div class='add'>+		qrecord_reserved = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (parent)</div><div class='del'>-		ref_type = BTRFS_SHARED_BLOCK_REF_KEY;</div><div class='del'>-	else</div><div class='del'>-		ref_type = BTRFS_TREE_BLOCK_REF_KEY;</div><div class='del'>-</div><div class='del'>-	init_delayed_ref_common(fs_info, &amp;ref-&gt;node, bytenr, num_bytes,</div><div class='del'>-				generic_ref-&gt;tree_ref.ref_root, action,</div><div class='del'>-				ref_type);</div><div class='del'>-	ref-&gt;root = generic_ref-&gt;tree_ref.ref_root;</div><div class='del'>-	ref-&gt;parent = parent;</div><div class='del'>-	ref-&gt;level = level;</div><div class='del'>-</div><div class='del'>-	init_delayed_ref_head(head_ref, record, bytenr, num_bytes,</div><div class='del'>-			      generic_ref-&gt;tree_ref.ref_root, 0, action,</div><div class='del'>-			      false, is_system, generic_ref-&gt;owning_root);</div><div class='add'>+	ret = xa_reserve(&amp;delayed_refs-&gt;head_refs, index, GFP_NOFS);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (qrecord_reserved)</div><div class='add'>+			xa_release(&amp;delayed_refs-&gt;dirty_extents, index);</div><div class='add'>+		goto free_record;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_delayed_ref_common(fs_info, node, generic_ref);</div><div class='add'>+	init_delayed_ref_head(head_ref, generic_ref, record, reserved);</div><div class='ctx'> 	head_ref-&gt;extent_op = extent_op;</div><div class='ctx'> </div><div class='del'>-	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='ctx'> 	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * insert both the head node and the new ref without dropping</div><div class='ctx'> 	 * the spin lock</div><div class='ctx'> 	 */</div><div class='del'>-	head_ref = add_delayed_ref_head(trans, head_ref, record,</div><div class='del'>-					action, &amp;qrecord_inserted);</div><div class='add'>+	new_head_ref = add_delayed_ref_head(trans, head_ref, record,</div><div class='add'>+					    action, &amp;qrecord_inserted);</div><div class='add'>+	if (IS_ERR(new_head_ref)) {</div><div class='add'>+		xa_release(&amp;delayed_refs-&gt;head_refs, index);</div><div class='add'>+		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+		ret = PTR_ERR(new_head_ref);</div><div class='ctx'> </div><div class='del'>-	merged = insert_delayed_ref(trans, head_ref, &amp;ref-&gt;node);</div><div class='add'>+		/*</div><div class='add'>+		 * It's only safe to call kfree() on 'qrecord' if</div><div class='add'>+		 * add_delayed_ref_head() has _not_ inserted it for</div><div class='add'>+		 * tracing. Otherwise we need to handle this here.</div><div class='add'>+		 */</div><div class='add'>+		if (!qrecord_reserved || qrecord_inserted)</div><div class='add'>+			goto free_head_ref;</div><div class='add'>+		goto free_record;</div><div class='add'>+	}</div><div class='add'>+	head_ref = new_head_ref;</div><div class='add'>+</div><div class='add'>+	merged = insert_delayed_ref(trans, head_ref, node);</div><div class='ctx'> 	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1086,16 +1083,38 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_update_delayed_refs_rsv(trans);</div><div class='ctx'> </div><div class='del'>-	trace_add_delayed_tree_ref(fs_info, &amp;ref-&gt;node, ref,</div><div class='del'>-				   action == BTRFS_ADD_DELAYED_EXTENT ?</div><div class='del'>-				   BTRFS_ADD_DELAYED_REF : action);</div><div class='add'>+	if (generic_ref-&gt;type == BTRFS_REF_DATA)</div><div class='add'>+		trace_add_delayed_data_ref(trans-&gt;fs_info, node);</div><div class='add'>+	else</div><div class='add'>+		trace_add_delayed_tree_ref(trans-&gt;fs_info, node);</div><div class='ctx'> 	if (merged)</div><div class='del'>-		kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);</div><div class='add'>+		kmem_cache_free(btrfs_delayed_ref_node_cachep, node);</div><div class='ctx'> </div><div class='ctx'> 	if (qrecord_inserted)</div><div class='del'>-		btrfs_qgroup_trace_extent_post(trans, record);</div><div class='add'>+		return btrfs_qgroup_trace_extent_post(trans, record, generic_ref-&gt;bytenr);</div><div class='ctx'> </div><div class='add'>+	kfree(record);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_record:</div><div class='add'>+	kfree(record);</div><div class='add'>+free_head_ref:</div><div class='add'>+	kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);</div><div class='add'>+free_node:</div><div class='add'>+	kmem_cache_free(btrfs_delayed_ref_node_cachep, node);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add a delayed tree ref. This does all of the accounting required to make sure</div><div class='add'>+ * the delayed ref is eventually processed before this transaction commits.</div><div class='add'>+ */</div><div class='add'>+int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,</div><div class='add'>+			       struct btrfs_ref *generic_ref,</div><div class='add'>+			       struct btrfs_delayed_extent_op *extent_op)</div><div class='add'>+{</div><div class='add'>+	ASSERT(generic_ref-&gt;type == BTRFS_REF_METADATA &amp;&amp; generic_ref-&gt;action);</div><div class='add'>+	return add_delayed_ref(trans, generic_ref, extent_op, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1105,111 +1124,51 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_ref *generic_ref,</div><div class='ctx'> 			       u64 reserved)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_delayed_data_ref *ref;</div><div class='del'>-	struct btrfs_delayed_ref_head *head_ref;</div><div class='del'>-	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='del'>-	struct btrfs_qgroup_extent_record *record = NULL;</div><div class='del'>-	bool qrecord_inserted;</div><div class='del'>-	int action = generic_ref-&gt;action;</div><div class='del'>-	bool merged;</div><div class='del'>-	u64 bytenr = generic_ref-&gt;bytenr;</div><div class='del'>-	u64 num_bytes = generic_ref-&gt;len;</div><div class='del'>-	u64 parent = generic_ref-&gt;parent;</div><div class='del'>-	u64 ref_root = generic_ref-&gt;data_ref.ref_root;</div><div class='del'>-	u64 owner = generic_ref-&gt;data_ref.ino;</div><div class='del'>-	u64 offset = generic_ref-&gt;data_ref.offset;</div><div class='del'>-	u8 ref_type;</div><div class='del'>-</div><div class='del'>-	ASSERT(generic_ref-&gt;type == BTRFS_REF_DATA &amp;&amp; action);</div><div class='del'>-	ref = kmem_cache_alloc(btrfs_delayed_data_ref_cachep, GFP_NOFS);</div><div class='del'>-	if (!ref)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (parent)</div><div class='del'>-	        ref_type = BTRFS_SHARED_DATA_REF_KEY;</div><div class='del'>-	else</div><div class='del'>-	        ref_type = BTRFS_EXTENT_DATA_REF_KEY;</div><div class='del'>-	init_delayed_ref_common(fs_info, &amp;ref-&gt;node, bytenr, num_bytes,</div><div class='del'>-				ref_root, action, ref_type);</div><div class='del'>-	ref-&gt;root = ref_root;</div><div class='del'>-	ref-&gt;parent = parent;</div><div class='del'>-	ref-&gt;objectid = owner;</div><div class='del'>-	ref-&gt;offset = offset;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);</div><div class='del'>-	if (!head_ref) {</div><div class='del'>-		kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btrfs_qgroup_full_accounting(fs_info) &amp;&amp; !generic_ref-&gt;skip_qgroup) {</div><div class='del'>-		record = kzalloc(sizeof(*record), GFP_NOFS);</div><div class='del'>-		if (!record) {</div><div class='del'>-			kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);</div><div class='del'>-			kmem_cache_free(btrfs_delayed_ref_head_cachep,</div><div class='del'>-					head_ref);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_delayed_ref_head(head_ref, record, bytenr, num_bytes, ref_root,</div><div class='del'>-			      reserved, action, true, false, generic_ref-&gt;owning_root);</div><div class='del'>-	head_ref-&gt;extent_op = NULL;</div><div class='del'>-</div><div class='del'>-	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='del'>-	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * insert both the head node and the new ref without dropping</div><div class='del'>-	 * the spin lock</div><div class='del'>-	 */</div><div class='del'>-	head_ref = add_delayed_ref_head(trans, head_ref, record,</div><div class='del'>-					action, &amp;qrecord_inserted);</div><div class='del'>-</div><div class='del'>-	merged = insert_delayed_ref(trans, head_ref, &amp;ref-&gt;node);</div><div class='del'>-	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Need to update the delayed_refs_rsv with any changes we may have</div><div class='del'>-	 * made.</div><div class='del'>-	 */</div><div class='del'>-	btrfs_update_delayed_refs_rsv(trans);</div><div class='del'>-</div><div class='del'>-	trace_add_delayed_data_ref(trans-&gt;fs_info, &amp;ref-&gt;node, ref,</div><div class='del'>-				   action == BTRFS_ADD_DELAYED_EXTENT ?</div><div class='del'>-				   BTRFS_ADD_DELAYED_REF : action);</div><div class='del'>-	if (merged)</div><div class='del'>-		kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (qrecord_inserted)</div><div class='del'>-		return btrfs_qgroup_trace_extent_post(trans, record);</div><div class='del'>-	return 0;</div><div class='add'>+	ASSERT(generic_ref-&gt;type == BTRFS_REF_DATA &amp;&amp; generic_ref-&gt;action);</div><div class='add'>+	return add_delayed_ref(trans, generic_ref, NULL, reserved);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans,</div><div class='del'>-				u64 bytenr, u64 num_bytes,</div><div class='add'>+				u64 bytenr, u64 num_bytes, u8 level,</div><div class='ctx'> 				struct btrfs_delayed_extent_op *extent_op)</div><div class='ctx'> {</div><div class='add'>+	const unsigned long index = (bytenr &gt;&gt; trans-&gt;fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	struct btrfs_delayed_ref_head *head_ref;</div><div class='add'>+	struct btrfs_delayed_ref_head *head_ref_ret;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='add'>+	struct btrfs_ref generic_ref = {</div><div class='add'>+		.type = BTRFS_REF_METADATA,</div><div class='add'>+		.action = BTRFS_UPDATE_DELAYED_HEAD,</div><div class='add'>+		.bytenr = bytenr,</div><div class='add'>+		.num_bytes = num_bytes,</div><div class='add'>+		.tree_ref.level = level,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);</div><div class='ctx'> 	if (!head_ref)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	init_delayed_ref_head(head_ref, NULL, bytenr, num_bytes, 0, 0,</div><div class='del'>-			      BTRFS_UPDATE_DELAYED_HEAD, false, false, 0);</div><div class='add'>+	init_delayed_ref_head(head_ref, &amp;generic_ref, NULL, 0);</div><div class='ctx'> 	head_ref-&gt;extent_op = extent_op;</div><div class='ctx'> </div><div class='ctx'> 	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='del'>-	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	add_delayed_ref_head(trans, head_ref, NULL, BTRFS_UPDATE_DELAYED_HEAD,</div><div class='del'>-			     NULL);</div><div class='add'>+	ret = xa_reserve(&amp;delayed_refs-&gt;head_refs, index, GFP_NOFS);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	head_ref_ret = add_delayed_ref_head(trans, head_ref, NULL,</div><div class='add'>+					    BTRFS_UPDATE_DELAYED_HEAD, NULL);</div><div class='add'>+	if (IS_ERR(head_ref_ret)) {</div><div class='add'>+		xa_release(&amp;delayed_refs-&gt;head_refs, index);</div><div class='add'>+		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+		kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);</div><div class='add'>+		return PTR_ERR(head_ref_ret);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1220,53 +1179,192 @@ int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_put_delayed_ref(struct btrfs_delayed_ref_node *ref)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;ref-&gt;refs)) {</div><div class='add'>+		WARN_ON(!RB_EMPTY_NODE(&amp;ref-&gt;ref_node));</div><div class='add'>+		kmem_cache_free(btrfs_delayed_ref_node_cachep, ref);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This does a simple search for the head node for a given extent.  Returns the</div><div class='ctx'>  * head node if found, or NULL if not.</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_delayed_ref_head *</div><div class='del'>-btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs, u64 bytenr)</div><div class='add'>+btrfs_find_delayed_ref_head(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			    struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+			    u64 bytenr)</div><div class='ctx'> {</div><div class='add'>+	const unsigned long index = (bytenr &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return find_ref_head(delayed_refs, bytenr, false);</div><div class='add'>+	return xa_load(&amp;delayed_refs-&gt;head_refs, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int find_comp(struct btrfs_delayed_ref_node *entry, u64 root, u64 parent)</div><div class='add'>+{</div><div class='add'>+	int type = parent ? BTRFS_SHARED_BLOCK_REF_KEY : BTRFS_TREE_BLOCK_REF_KEY;</div><div class='add'>+</div><div class='add'>+	if (type &lt; entry-&gt;type)</div><div class='add'>+		return -1;</div><div class='add'>+	if (type &gt; entry-&gt;type)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (type == BTRFS_TREE_BLOCK_REF_KEY) {</div><div class='add'>+		if (root &lt; entry-&gt;ref_root)</div><div class='add'>+			return -1;</div><div class='add'>+		if (root &gt; entry-&gt;ref_root)</div><div class='add'>+			return 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (parent &lt; entry-&gt;parent)</div><div class='add'>+			return -1;</div><div class='add'>+		if (parent &gt; entry-&gt;parent)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check to see if a given root/parent reference is attached to the head.  This</div><div class='add'>+ * only checks for BTRFS_ADD_DELAYED_REF references that match, as that</div><div class='add'>+ * indicates the reference exists for the given root or parent.  This is for</div><div class='add'>+ * tree blocks only.</div><div class='add'>+ *</div><div class='add'>+ * @head: the head of the bytenr we're searching.</div><div class='add'>+ * @root: the root objectid of the reference if it is a normal reference.</div><div class='add'>+ * @parent: the parent if this is a shared backref.</div><div class='add'>+ */</div><div class='add'>+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,</div><div class='add'>+				 u64 root, u64 parent)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	bool found = false;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;head-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = head-&gt;ref_tree.rb_root.rb_node;</div><div class='add'>+	while (node) {</div><div class='add'>+		struct btrfs_delayed_ref_node *entry;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		entry = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);</div><div class='add'>+		ret = find_comp(entry, root, parent);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='add'>+		} else if (ret &gt; 0) {</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * We only want to count ADD actions, as drops mean the</div><div class='add'>+			 * ref doesn't exist.</div><div class='add'>+			 */</div><div class='add'>+			if (entry-&gt;action == BTRFS_ADD_DELAYED_REF)</div><div class='add'>+				found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_delayed_ref_root *delayed_refs = &amp;trans-&gt;delayed_refs;</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	while (true) {</div><div class='add'>+		struct btrfs_delayed_ref_head *head;</div><div class='add'>+		struct rb_node *n;</div><div class='add'>+		bool pin_bytes = false;</div><div class='add'>+</div><div class='add'>+		head = find_first_ref_head(delayed_refs);</div><div class='add'>+		if (!head)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!btrfs_delayed_ref_lock(delayed_refs, head))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;head-&gt;lock);</div><div class='add'>+		while ((n = rb_first_cached(&amp;head-&gt;ref_tree)) != NULL) {</div><div class='add'>+			struct btrfs_delayed_ref_node *ref;</div><div class='add'>+</div><div class='add'>+			ref = rb_entry(n, struct btrfs_delayed_ref_node, ref_node);</div><div class='add'>+			drop_delayed_ref(fs_info, delayed_refs, head, ref);</div><div class='add'>+		}</div><div class='add'>+		if (head-&gt;must_insert_reserved)</div><div class='add'>+			pin_bytes = true;</div><div class='add'>+		btrfs_free_delayed_extent_op(head-&gt;extent_op);</div><div class='add'>+		btrfs_delete_ref_head(fs_info, delayed_refs, head);</div><div class='add'>+		spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;head-&gt;mutex);</div><div class='add'>+</div><div class='add'>+		if (!btrfs_is_testing(fs_info) &amp;&amp; pin_bytes) {</div><div class='add'>+			struct btrfs_block_group *bg;</div><div class='add'>+</div><div class='add'>+			bg = btrfs_lookup_block_group(fs_info, head-&gt;bytenr);</div><div class='add'>+			if (WARN_ON_ONCE(bg == NULL)) {</div><div class='add'>+				/*</div><div class='add'>+				 * Unexpected and there's nothing we can do here</div><div class='add'>+				 * because we are in a transaction abort path,</div><div class='add'>+				 * so any errors can only be ignored or reported</div><div class='add'>+				 * while attempting to cleanup all resources.</div><div class='add'>+				 */</div><div class='add'>+				btrfs_err(fs_info,</div><div class='add'>+"block group for delayed ref at %llu was not found while destroying ref head",</div><div class='add'>+					  head-&gt;bytenr);</div><div class='add'>+			} else {</div><div class='add'>+				spin_lock(&amp;bg-&gt;space_info-&gt;lock);</div><div class='add'>+				spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+				bg-&gt;pinned += head-&gt;num_bytes;</div><div class='add'>+				btrfs_space_info_update_bytes_pinned(bg-&gt;space_info,</div><div class='add'>+								     head-&gt;num_bytes);</div><div class='add'>+				bg-&gt;reserved -= head-&gt;num_bytes;</div><div class='add'>+				bg-&gt;space_info-&gt;bytes_reserved -= head-&gt;num_bytes;</div><div class='add'>+				spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+				spin_unlock(&amp;bg-&gt;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+				btrfs_put_block_group(bg);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			btrfs_error_unpin_extent_range(fs_info, head-&gt;bytenr,</div><div class='add'>+				head-&gt;bytenr + head-&gt;num_bytes - 1);</div><div class='add'>+		}</div><div class='add'>+		if (!btrfs_is_testing(fs_info))</div><div class='add'>+			btrfs_cleanup_ref_head_accounting(fs_info, delayed_refs, head);</div><div class='add'>+		btrfs_put_delayed_ref_head(head);</div><div class='add'>+		cond_resched();</div><div class='add'>+		spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_testing(fs_info))</div><div class='add'>+		btrfs_qgroup_destroy_extent_records(trans);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __cold btrfs_delayed_ref_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	kmem_cache_destroy(btrfs_delayed_ref_head_cachep);</div><div class='del'>-	kmem_cache_destroy(btrfs_delayed_tree_ref_cachep);</div><div class='del'>-	kmem_cache_destroy(btrfs_delayed_data_ref_cachep);</div><div class='add'>+	kmem_cache_destroy(btrfs_delayed_ref_node_cachep);</div><div class='ctx'> 	kmem_cache_destroy(btrfs_delayed_extent_op_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_delayed_ref_init(void)</div><div class='ctx'> {</div><div class='del'>-	btrfs_delayed_ref_head_cachep = kmem_cache_create(</div><div class='del'>-				"btrfs_delayed_ref_head",</div><div class='del'>-				sizeof(struct btrfs_delayed_ref_head), 0,</div><div class='del'>-				SLAB_MEM_SPREAD, NULL);</div><div class='add'>+	btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head, 0);</div><div class='ctx'> 	if (!btrfs_delayed_ref_head_cachep)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	btrfs_delayed_tree_ref_cachep = kmem_cache_create(</div><div class='del'>-				"btrfs_delayed_tree_ref",</div><div class='del'>-				sizeof(struct btrfs_delayed_tree_ref), 0,</div><div class='del'>-				SLAB_MEM_SPREAD, NULL);</div><div class='del'>-	if (!btrfs_delayed_tree_ref_cachep)</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	btrfs_delayed_data_ref_cachep = kmem_cache_create(</div><div class='del'>-				"btrfs_delayed_data_ref",</div><div class='del'>-				sizeof(struct btrfs_delayed_data_ref), 0,</div><div class='del'>-				SLAB_MEM_SPREAD, NULL);</div><div class='del'>-	if (!btrfs_delayed_data_ref_cachep)</div><div class='add'>+	btrfs_delayed_ref_node_cachep = KMEM_CACHE(btrfs_delayed_ref_node, 0);</div><div class='add'>+	if (!btrfs_delayed_ref_node_cachep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	btrfs_delayed_extent_op_cachep = kmem_cache_create(</div><div class='del'>-				"btrfs_delayed_extent_op",</div><div class='del'>-				sizeof(struct btrfs_delayed_extent_op), 0,</div><div class='del'>-				SLAB_MEM_SPREAD, NULL);</div><div class='add'>+	btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op, 0);</div><div class='ctx'> 	if (!btrfs_delayed_extent_op_cachep)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h<br/>index 62d679d40f4f..5ce940532144 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-ref.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/delayed-ref.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/delayed-ref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/delayed-ref.h</a></div><div class='hunk'>@@ -6,7 +6,19 @@</div><div class='ctx'> #ifndef BTRFS_DELAYED_REF_H</div><div class='ctx'> #define BTRFS_DELAYED_REF_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "messages.h"</div><div class='add'>+</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> </div><div class='ctx'> /* these are the possible values of struct btrfs_delayed_ref_node-&gt;action */</div><div class='ctx'> enum btrfs_delayed_ref_action {</div><div class='hunk'>@@ -20,12 +32,39 @@ enum btrfs_delayed_ref_action {</div><div class='ctx'> 	BTRFS_UPDATE_DELAYED_HEAD,</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct btrfs_data_ref {</div><div class='add'>+	/* For EXTENT_DATA_REF */</div><div class='add'>+</div><div class='add'>+	/* Inode which refers to this data extent */</div><div class='add'>+	u64 objectid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * file_offset - extent_offset</div><div class='add'>+	 *</div><div class='add'>+	 * file_offset is the key.offset of the EXTENT_DATA key.</div><div class='add'>+	 * extent_offset is btrfs_file_extent_offset() of the EXTENT_DATA data.</div><div class='add'>+	 */</div><div class='add'>+	u64 offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct btrfs_tree_ref {</div><div class='add'>+	/*</div><div class='add'>+	 * Level of this tree block.</div><div class='add'>+	 *</div><div class='add'>+	 * Shared for skinny (TREE_BLOCK_REF) and normal tree ref.</div><div class='add'>+	 */</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	/* For non-skinny metadata, no special member needed */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct btrfs_delayed_ref_node {</div><div class='ctx'> 	struct rb_node ref_node;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If action is BTRFS_ADD_DELAYED_REF, also link this node to</div><div class='ctx'> 	 * ref_head-&gt;ref_add_list, then we do not need to iterate the</div><div class='del'>-	 * whole ref_head-&gt;ref_list to find BTRFS_ADD_DELAYED_REF nodes.</div><div class='add'>+	 * refs rbtree in the corresponding delayed ref head</div><div class='add'>+	 * (struct btrfs_delayed_ref_head::ref_tree).</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head add_list;</div><div class='ctx'> </div><div class='hunk'>@@ -38,6 +77,15 @@ struct btrfs_delayed_ref_node {</div><div class='ctx'> 	/* seq number to keep track of insertion order */</div><div class='ctx'> 	u64 seq;</div><div class='ctx'> </div><div class='add'>+	/* The ref_root for this ref */</div><div class='add'>+	u64 ref_root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The parent for this ref, if this isn't set the ref_root is the</div><div class='add'>+	 * reference owner.</div><div class='add'>+	 */</div><div class='add'>+	u64 parent;</div><div class='add'>+</div><div class='ctx'> 	/* ref count on this data structure */</div><div class='ctx'> 	refcount_t refs;</div><div class='ctx'> </div><div class='hunk'>@@ -54,11 +102,15 @@ struct btrfs_delayed_ref_node {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int action:8;</div><div class='ctx'> 	unsigned int type:8;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct btrfs_tree_ref tree_ref;</div><div class='add'>+		struct btrfs_data_ref data_ref;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct btrfs_delayed_extent_op {</div><div class='ctx'> 	struct btrfs_disk_key key;</div><div class='del'>-	u8 level;</div><div class='ctx'> 	bool update_key;</div><div class='ctx'> 	bool update_flags;</div><div class='ctx'> 	u64 flags_to_set;</div><div class='hunk'>@@ -74,12 +126,6 @@ struct btrfs_delayed_ref_head {</div><div class='ctx'> 	u64 bytenr;</div><div class='ctx'> 	u64 num_bytes;</div><div class='ctx'> 	/*</div><div class='del'>-	 * For insertion into struct btrfs_delayed_ref_root::href_root.</div><div class='del'>-	 * Keep it in the same cache line as 'bytenr' for more efficient</div><div class='del'>-	 * searches in the rbtree.</div><div class='del'>-	 */</div><div class='del'>-	struct rb_node href_node;</div><div class='del'>-	/*</div><div class='ctx'> 	 * the mutex is held while running the refs, and it is also</div><div class='ctx'> 	 * held when checking the sum of reference modifications.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -122,6 +168,9 @@ struct btrfs_delayed_ref_head {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64 reserved_bytes;</div><div class='ctx'> </div><div class='add'>+	/* Tree block level, for metadata only. */</div><div class='add'>+	u8 level;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * when a new extent is allocated, it is just reserved in memory</div><div class='ctx'> 	 * The actual extent isn't inserted into the extent allocation tree</div><div class='hunk'>@@ -139,21 +188,11 @@ struct btrfs_delayed_ref_head {</div><div class='ctx'> 	bool is_data;</div><div class='ctx'> 	bool is_system;</div><div class='ctx'> 	bool processing;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btrfs_delayed_tree_ref {</div><div class='del'>-	struct btrfs_delayed_ref_node node;</div><div class='del'>-	u64 root;</div><div class='del'>-	u64 parent;</div><div class='del'>-	int level;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btrfs_delayed_data_ref {</div><div class='del'>-	struct btrfs_delayed_ref_node node;</div><div class='del'>-	u64 root;</div><div class='del'>-	u64 parent;</div><div class='del'>-	u64 objectid;</div><div class='del'>-	u64 offset;</div><div class='add'>+	/*</div><div class='add'>+	 * Indicate if it's currently in the data structure that tracks head</div><div class='add'>+	 * refs (struct btrfs_delayed_ref_root::head_refs).</div><div class='add'>+	 */</div><div class='add'>+	bool tracked;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum btrfs_delayed_ref_flags {</div><div class='hunk'>@@ -162,30 +201,52 @@ enum btrfs_delayed_ref_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct btrfs_delayed_ref_root {</div><div class='del'>-	/* head ref rbtree */</div><div class='del'>-	struct rb_root_cached href_root;</div><div class='del'>-</div><div class='del'>-	/* dirty extent records */</div><div class='del'>-	struct rb_root dirty_extent_root;</div><div class='add'>+	/*</div><div class='add'>+	 * Track head references.</div><div class='add'>+	 * The keys correspond to the logical address of the extent ("bytenr")</div><div class='add'>+	 * right shifted by fs_info-&gt;sectorsize_bits. This is both to get a more</div><div class='add'>+	 * dense index space (optimizes xarray structure) and because indexes in</div><div class='add'>+	 * xarrays are of "unsigned long" type, meaning they are 32 bits wide on</div><div class='add'>+	 * 32 bits platforms, limiting the extent range to 4G which is too low</div><div class='add'>+	 * and makes it unusable (truncated index values) on 32 bits platforms.</div><div class='add'>+	 * Protected by the spinlock 'lock' defined below.</div><div class='add'>+	 */</div><div class='add'>+	struct xarray head_refs;</div><div class='ctx'> </div><div class='del'>-	/* this spin lock protects the rbtree and the entries inside */</div><div class='del'>-	spinlock_t lock;</div><div class='add'>+	/*</div><div class='add'>+	 * Track dirty extent records.</div><div class='add'>+	 * The keys correspond to the logical address of the extent ("bytenr")</div><div class='add'>+	 * right shifted by fs_info-&gt;sectorsize_bits, for same reasons as above.</div><div class='add'>+	 */</div><div class='add'>+	struct xarray dirty_extents;</div><div class='ctx'> </div><div class='del'>-	/* how many delayed ref updates we've queued, used by the</div><div class='del'>-	 * throttling code</div><div class='add'>+	/*</div><div class='add'>+	 * Protects the xarray head_refs, its entries and the following fields:</div><div class='add'>+	 * num_heads, num_heads_ready, pending_csums and run_delayed_start.</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_t num_entries;</div><div class='add'>+	spinlock_t lock;</div><div class='ctx'> </div><div class='del'>-	/* total number of head nodes in tree */</div><div class='add'>+	/* Total number of head refs, protected by the spinlock 'lock'. */</div><div class='ctx'> 	unsigned long num_heads;</div><div class='ctx'> </div><div class='del'>-	/* total number of head nodes ready for processing */</div><div class='add'>+	/*</div><div class='add'>+	 * Total number of head refs ready for processing, protected by the</div><div class='add'>+	 * spinlock 'lock'.</div><div class='add'>+	 */</div><div class='ctx'> 	unsigned long num_heads_ready;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Track space reserved for deleting csums of data extents.</div><div class='add'>+	 * Protected by the spinlock 'lock'.</div><div class='add'>+	 */</div><div class='ctx'> 	u64 pending_csums;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Track from which bytenr to start searching ref heads.</div><div class='add'>+	 * Protected by the spinlock 'lock'.</div><div class='add'>+	 */</div><div class='ctx'> 	u64 run_delayed_start;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -201,45 +262,8 @@ enum btrfs_ref_type {</div><div class='ctx'> 	BTRFS_REF_NOT_SET,</div><div class='ctx'> 	BTRFS_REF_DATA,</div><div class='ctx'> 	BTRFS_REF_METADATA,</div><div class='del'>-	BTRFS_REF_LAST,</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct btrfs_data_ref {</div><div class='del'>-	/* For EXTENT_DATA_REF */</div><div class='del'>-</div><div class='del'>-	/* Root which owns this data reference. */</div><div class='del'>-	u64 ref_root;</div><div class='del'>-</div><div class='del'>-	/* Inode which refers to this data extent */</div><div class='del'>-	u64 ino;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * file_offset - extent_offset</div><div class='del'>-	 *</div><div class='del'>-	 * file_offset is the key.offset of the EXTENT_DATA key.</div><div class='del'>-	 * extent_offset is btrfs_file_extent_offset() of the EXTENT_DATA data.</div><div class='del'>-	 */</div><div class='del'>-	u64 offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btrfs_tree_ref {</div><div class='del'>-	/*</div><div class='del'>-	 * Level of this tree block</div><div class='del'>-	 *</div><div class='del'>-	 * Shared for skinny (TREE_BLOCK_REF) and normal tree ref.</div><div class='del'>-	 */</div><div class='del'>-	int level;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Root which owns this tree block reference.</div><div class='del'>-	 *</div><div class='del'>-	 * For TREE_BLOCK_REF (skinny metadata, either inline or keyed)</div><div class='del'>-	 */</div><div class='del'>-	u64 ref_root;</div><div class='del'>-</div><div class='del'>-	/* For non-skinny metadata, no special member needed */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct btrfs_ref {</div><div class='ctx'> 	enum btrfs_ref_type type;</div><div class='ctx'> 	enum btrfs_delayed_ref_action action;</div><div class='hunk'>@@ -252,25 +276,31 @@ struct btrfs_ref {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool skip_qgroup;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='del'>-	/* Through which root is this modification. */</div><div class='del'>-	u64 real_root;</div><div class='del'>-#endif</div><div class='ctx'> 	u64 bytenr;</div><div class='del'>-	u64 len;</div><div class='add'>+	u64 num_bytes;</div><div class='ctx'> 	u64 owning_root;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The root that owns the reference for this reference, this will be set</div><div class='add'>+	 * or -&gt;parent will be set, depending on what type of reference this is.</div><div class='add'>+	 */</div><div class='add'>+	u64 ref_root;</div><div class='add'>+</div><div class='ctx'> 	/* Bytenr of the parent tree block */</div><div class='ctx'> 	u64 parent;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct btrfs_data_ref data_ref;</div><div class='ctx'> 		struct btrfs_tree_ref tree_ref;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+	/* Through which root is this modification. */</div><div class='add'>+	u64 real_root;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *btrfs_delayed_ref_head_cachep;</div><div class='del'>-extern struct kmem_cache *btrfs_delayed_tree_ref_cachep;</div><div class='del'>-extern struct kmem_cache *btrfs_delayed_data_ref_cachep;</div><div class='add'>+extern struct kmem_cache *btrfs_delayed_ref_node_cachep;</div><div class='ctx'> extern struct kmem_cache *btrfs_delayed_extent_op_cachep;</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_delayed_ref_init(void);</div><div class='hunk'>@@ -308,53 +338,10 @@ static inline u64 btrfs_calc_delayed_ref_csum_bytes(const struct btrfs_fs_info *</div><div class='ctx'> 	return btrfs_calc_metadata_size(fs_info, num_csum_items);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_init_generic_ref(struct btrfs_ref *generic_ref,</div><div class='del'>-					  int action, u64 bytenr, u64 len,</div><div class='del'>-					  u64 parent, u64 owning_root)</div><div class='del'>-{</div><div class='del'>-	generic_ref-&gt;action = action;</div><div class='del'>-	generic_ref-&gt;bytenr = bytenr;</div><div class='del'>-	generic_ref-&gt;len = len;</div><div class='del'>-	generic_ref-&gt;parent = parent;</div><div class='del'>-	generic_ref-&gt;owning_root = owning_root;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_init_tree_ref(struct btrfs_ref *generic_ref, int level,</div><div class='del'>-				       u64 root, u64 mod_root, bool skip_qgroup)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='del'>-	/* If @real_root not set, use @root as fallback */</div><div class='del'>-	generic_ref-&gt;real_root = mod_root ?: root;</div><div class='del'>-#endif</div><div class='del'>-	generic_ref-&gt;tree_ref.level = level;</div><div class='del'>-	generic_ref-&gt;tree_ref.ref_root = root;</div><div class='del'>-	generic_ref-&gt;type = BTRFS_REF_METADATA;</div><div class='del'>-	if (skip_qgroup || !(is_fstree(root) &amp;&amp;</div><div class='del'>-			     (!mod_root || is_fstree(mod_root))))</div><div class='del'>-		generic_ref-&gt;skip_qgroup = true;</div><div class='del'>-	else</div><div class='del'>-		generic_ref-&gt;skip_qgroup = false;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_init_data_ref(struct btrfs_ref *generic_ref,</div><div class='del'>-				u64 ref_root, u64 ino, u64 offset, u64 mod_root,</div><div class='del'>-				bool skip_qgroup)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='del'>-	/* If @real_root not set, use @root as fallback */</div><div class='del'>-	generic_ref-&gt;real_root = mod_root ?: ref_root;</div><div class='del'>-#endif</div><div class='del'>-	generic_ref-&gt;data_ref.ref_root = ref_root;</div><div class='del'>-	generic_ref-&gt;data_ref.ino = ino;</div><div class='del'>-	generic_ref-&gt;data_ref.offset = offset;</div><div class='del'>-	generic_ref-&gt;type = BTRFS_REF_DATA;</div><div class='del'>-	if (skip_qgroup || !(is_fstree(ref_root) &amp;&amp;</div><div class='del'>-			     (!mod_root || is_fstree(mod_root))))</div><div class='del'>-		generic_ref-&gt;skip_qgroup = true;</div><div class='del'>-	else</div><div class='del'>-		generic_ref-&gt;skip_qgroup = false;</div><div class='del'>-}</div><div class='add'>+void btrfs_init_tree_ref(struct btrfs_ref *generic_ref, int level, u64 mod_root,</div><div class='add'>+			 bool skip_qgroup);</div><div class='add'>+void btrfs_init_data_ref(struct btrfs_ref *generic_ref, u64 ino, u64 offset,</div><div class='add'>+			 u64 mod_root, bool skip_qgroup);</div><div class='ctx'> </div><div class='ctx'> static inline struct btrfs_delayed_extent_op *</div><div class='ctx'> btrfs_alloc_delayed_extent_op(void)</div><div class='hunk'>@@ -369,24 +356,7 @@ btrfs_free_delayed_extent_op(struct btrfs_delayed_extent_op *op)</div><div class='ctx'> 		kmem_cache_free(btrfs_delayed_extent_op_cachep, op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_put_delayed_ref(struct btrfs_delayed_ref_node *ref)</div><div class='del'>-{</div><div class='del'>-	if (refcount_dec_and_test(&amp;ref-&gt;refs)) {</div><div class='del'>-		WARN_ON(!RB_EMPTY_NODE(&amp;ref-&gt;ref_node));</div><div class='del'>-		switch (ref-&gt;type) {</div><div class='del'>-		case BTRFS_TREE_BLOCK_REF_KEY:</div><div class='del'>-		case BTRFS_SHARED_BLOCK_REF_KEY:</div><div class='del'>-			kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);</div><div class='del'>-			break;</div><div class='del'>-		case BTRFS_EXTENT_DATA_REF_KEY:</div><div class='del'>-		case BTRFS_SHARED_DATA_REF_KEY:</div><div class='del'>-			kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+void btrfs_put_delayed_ref(struct btrfs_delayed_ref_node *ref);</div><div class='ctx'> </div><div class='ctx'> static inline u64 btrfs_ref_head_to_space_flags(</div><div class='ctx'> 				struct btrfs_delayed_ref_head *head_ref)</div><div class='hunk'>@@ -411,26 +381,30 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_ref *generic_ref,</div><div class='ctx'> 			       u64 reserved);</div><div class='ctx'> int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans,</div><div class='del'>-				u64 bytenr, u64 num_bytes,</div><div class='add'>+				u64 bytenr, u64 num_bytes, u8 level,</div><div class='ctx'> 				struct btrfs_delayed_extent_op *extent_op);</div><div class='ctx'> void btrfs_merge_delayed_refs(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			      struct btrfs_delayed_ref_root *delayed_refs,</div><div class='ctx'> 			      struct btrfs_delayed_ref_head *head);</div><div class='ctx'> </div><div class='ctx'> struct btrfs_delayed_ref_head *</div><div class='del'>-btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+btrfs_find_delayed_ref_head(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			    struct btrfs_delayed_ref_root *delayed_refs,</div><div class='ctx'> 			    u64 bytenr);</div><div class='del'>-int btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='del'>-			   struct btrfs_delayed_ref_head *head);</div><div class='ctx'> static inline void btrfs_delayed_ref_unlock(struct btrfs_delayed_ref_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_unlock(&amp;head-&gt;mutex);</div><div class='ctx'> }</div><div class='del'>-void btrfs_delete_ref_head(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+void btrfs_delete_ref_head(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			   struct btrfs_delayed_ref_root *delayed_refs,</div><div class='ctx'> 			   struct btrfs_delayed_ref_head *head);</div><div class='ctx'> </div><div class='ctx'> struct btrfs_delayed_ref_head *btrfs_select_ref_head(</div><div class='add'>+		const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		struct btrfs_delayed_ref_root *delayed_refs);</div><div class='add'>+void btrfs_unselect_ref_head(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+			     struct btrfs_delayed_ref_head *head);</div><div class='add'>+struct btrfs_delayed_ref_node *btrfs_select_delayed_ref(struct btrfs_delayed_ref_head *head);</div><div class='ctx'> </div><div class='ctx'> int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq);</div><div class='ctx'> </div><div class='hunk'>@@ -442,23 +416,44 @@ void btrfs_inc_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				  enum btrfs_reserve_flush_enum flush);</div><div class='del'>-void btrfs_migrate_to_delayed_refs_rsv(struct btrfs_fs_info *fs_info,</div><div class='del'>-				       u64 num_bytes);</div><div class='ctx'> bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);</div><div class='add'>+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,</div><div class='add'>+				 u64 root, u64 parent);</div><div class='add'>+void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * helper functions to cast a node into its container</div><div class='del'>- */</div><div class='del'>-static inline struct btrfs_delayed_tree_ref *</div><div class='del'>-btrfs_delayed_node_to_tree_ref(struct btrfs_delayed_ref_node *node)</div><div class='add'>+static inline u64 btrfs_delayed_ref_owner(const struct btrfs_delayed_ref_node *node)</div><div class='add'>+{</div><div class='add'>+	if (node-&gt;type == BTRFS_EXTENT_DATA_REF_KEY ||</div><div class='add'>+	    node-&gt;type == BTRFS_SHARED_DATA_REF_KEY)</div><div class='add'>+		return node-&gt;data_ref.objectid;</div><div class='add'>+	return node-&gt;tree_ref.level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 btrfs_delayed_ref_offset(const struct btrfs_delayed_ref_node *node)</div><div class='ctx'> {</div><div class='del'>-	return container_of(node, struct btrfs_delayed_tree_ref, node);</div><div class='add'>+	if (node-&gt;type == BTRFS_EXTENT_DATA_REF_KEY ||</div><div class='add'>+	    node-&gt;type == BTRFS_SHARED_DATA_REF_KEY)</div><div class='add'>+		return node-&gt;data_ref.offset;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct btrfs_delayed_data_ref *</div><div class='del'>-btrfs_delayed_node_to_data_ref(struct btrfs_delayed_ref_node *node)</div><div class='add'>+static inline u8 btrfs_ref_type(const struct btrfs_ref *ref)</div><div class='ctx'> {</div><div class='del'>-	return container_of(node, struct btrfs_delayed_data_ref, node);</div><div class='add'>+	ASSERT(ref-&gt;type == BTRFS_REF_DATA || ref-&gt;type == BTRFS_REF_METADATA);</div><div class='add'>+</div><div class='add'>+	if (ref-&gt;type == BTRFS_REF_DATA) {</div><div class='add'>+		if (ref-&gt;parent)</div><div class='add'>+			return BTRFS_SHARED_DATA_REF_KEY;</div><div class='add'>+		else</div><div class='add'>+			return BTRFS_EXTENT_DATA_REF_KEY;</div><div class='add'>+	} else {</div><div class='add'>+		if (ref-&gt;parent)</div><div class='add'>+			return BTRFS_SHARED_BLOCK_REF_KEY;</div><div class='add'>+		else</div><div class='add'>+			return BTRFS_TREE_BLOCK_REF_KEY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c<br/>index 2eb11fe4bd05..b6c7da8e1bc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dev-replace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dev-replace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dev-replace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/dev-replace.c</a></div><div class='hunk'>@@ -11,10 +11,8 @@</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='del'>-#include "extent_map.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "transaction.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "async-thread.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='hunk'>@@ -47,7 +45,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * - Copy existing extents</div><div class='ctx'>  *</div><div class='del'>- *   This happens by re-using scrub facility, as scrub also iterates through</div><div class='add'>+ *   This happens by reusing scrub facility, as scrub also iterates through</div><div class='ctx'>  *   existing extents from commit root.</div><div class='ctx'>  *</div><div class='ctx'>  *   Location:		scrub_write_block_to_dev_replace() from</div><div class='hunk'>@@ -78,7 +76,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int item_size;</div><div class='ctx'> 	struct btrfs_dev_replace_item *ptr;</div><div class='ctx'> 	u64 src_devid;</div><div class='hunk'>@@ -87,10 +85,8 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = 0;</div><div class='ctx'> 	key.type = BTRFS_DEV_REPLACE_KEY;</div><div class='hunk'>@@ -102,13 +98,11 @@ no_valid_dev_replace_entry_found:</div><div class='ctx'> 		 * We don't have a replace item or it's corrupted.  If there is</div><div class='ctx'> 		 * a replace target, fail the mount.</div><div class='ctx'> 		 */</div><div class='del'>-		if (btrfs_find_device(fs_info-&gt;fs_devices, &amp;args)) {</div><div class='add'>+		if (unlikely(btrfs_find_device(fs_info-&gt;fs_devices, &amp;args))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 			"found replace target device without a valid replace item");</div><div class='del'>-			ret = -EUCLEAN;</div><div class='del'>-			goto out;</div><div class='add'>+			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='del'>-		ret = 0;</div><div class='ctx'> 		dev_replace-&gt;replace_state =</div><div class='ctx'> 			BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED;</div><div class='ctx'> 		dev_replace-&gt;cont_reading_from_srcdev_mode =</div><div class='hunk'>@@ -125,7 +119,7 @@ no_valid_dev_replace_entry_found:</div><div class='ctx'> 		dev_replace-&gt;tgtdev = NULL;</div><div class='ctx'> 		dev_replace-&gt;is_valid = 0;</div><div class='ctx'> 		dev_replace-&gt;item_needs_writeback = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='ctx'> 	eb = path-&gt;nodes[0];</div><div class='hunk'>@@ -164,7 +158,7 @@ no_valid_dev_replace_entry_found:</div><div class='ctx'> 		 * We don't have an active replace item but if there is a</div><div class='ctx'> 		 * replace target, fail the mount.</div><div class='ctx'> 		 */</div><div class='del'>-		if (btrfs_find_device(fs_info-&gt;fs_devices, &amp;args)) {</div><div class='add'>+		if (unlikely(btrfs_find_device(fs_info-&gt;fs_devices, &amp;args))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> "replace without active item, run 'device scan --forget' on the target device");</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='hunk'>@@ -183,8 +177,7 @@ no_valid_dev_replace_entry_found:</div><div class='ctx'> 		 * allow 'btrfs dev replace_cancel' if src/tgt device is</div><div class='ctx'> 		 * missing</div><div class='ctx'> 		 */</div><div class='del'>-		if (!dev_replace-&gt;srcdev &amp;&amp;</div><div class='del'>-		    !btrfs_test_opt(fs_info, DEGRADED)) {</div><div class='add'>+		if (unlikely(!dev_replace-&gt;srcdev &amp;&amp; !btrfs_test_opt(fs_info, DEGRADED))) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 			   "cannot mount because device replace operation is ongoing and");</div><div class='hunk'>@@ -192,8 +185,7 @@ no_valid_dev_replace_entry_found:</div><div class='ctx'> 			   "srcdev (devid %llu) is missing, need to run 'btrfs dev scan'?",</div><div class='ctx'> 			   src_devid);</div><div class='ctx'> 		}</div><div class='del'>-		if (!dev_replace-&gt;tgtdev &amp;&amp;</div><div class='del'>-		    !btrfs_test_opt(fs_info, DEGRADED)) {</div><div class='add'>+		if (unlikely(!dev_replace-&gt;tgtdev &amp;&amp; !btrfs_test_opt(fs_info, DEGRADED))) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 			   "cannot mount because device replace operation is ongoing and");</div><div class='hunk'>@@ -228,8 +220,6 @@ no_valid_dev_replace_entry_found:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +248,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bdev_file = bdev_file_open_by_path(device_path, BLK_OPEN_WRITE,</div><div class='del'>-					fs_info-&gt;bdev_holder, NULL);</div><div class='add'>+					   fs_info-&gt;sb, &amp;fs_holder_ops);</div><div class='ctx'> 	if (IS_ERR(bdev_file)) {</div><div class='ctx'> 		btrfs_err(fs_info, "target device %s is invalid!", device_path);</div><div class='ctx'> 		return PTR_ERR(bdev_file);</div><div class='hunk'>@@ -318,7 +308,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &amp;device-&gt;dev_state);</div><div class='ctx'> 	set_bit(BTRFS_DEV_STATE_REPLACE_TGT, &amp;device-&gt;dev_state);</div><div class='ctx'> 	device-&gt;dev_stats_valid = 1;</div><div class='del'>-	set_blocksize(device-&gt;bdev, BTRFS_BDEV_BLOCKSIZE);</div><div class='add'>+	set_blocksize(bdev_file, BTRFS_BDEV_BLOCKSIZE);</div><div class='ctx'> 	device-&gt;fs_devices = fs_devices;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_get_dev_zone_info(device, false);</div><div class='hunk'>@@ -335,7 +325,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -348,7 +338,7 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_root *dev_root = fs_info-&gt;dev_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	struct btrfs_dev_replace_item *ptr;</div><div class='hunk'>@@ -367,16 +357,15 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	ret = btrfs_search_slot(trans, dev_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 			   "error %d while searching for dev_replace item!",</div><div class='ctx'> 			   ret);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0 &amp;&amp;</div><div class='hunk'>@@ -397,7 +386,7 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "delete too small dev_replace item failed %d!",</div><div class='ctx'> 				   ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -410,7 +399,7 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "insert dev_replace item failed %d!", ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -443,11 +432,6 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	dev_replace-&gt;item_needs_writeback = 0;</div><div class='ctx'> 	up_write(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, eb);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -505,8 +489,8 @@ static int mark_block_group_to_copy(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = src_dev-&gt;devid;</div><div class='ctx'> 	key.type = BTRFS_DEV_EXTENT_KEY;</div><div class='hunk'>@@ -614,7 +598,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return PTR_ERR(src_device);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_pinned_by_swapfile(fs_info, src_device)) {</div><div class='del'>-		btrfs_warn_in_rcu(fs_info,</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='ctx'> 	  "cannot replace device %s (devid %llu) due to active swapfile",</div><div class='ctx'> 			btrfs_dev_name(src_device), src_device-&gt;devid);</div><div class='ctx'> 		return -ETXTBSY;</div><div class='hunk'>@@ -643,6 +627,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;dev_replace-&gt;rwsem);</div><div class='add'>+	dev_replace-&gt;replace_task = current;</div><div class='ctx'> 	switch (dev_replace-&gt;replace_state) {</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED:</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED:</div><div class='hunk'>@@ -650,7 +635,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN("unexpected STARTED or SUSPENDED dev-replace state");</div><div class='ctx'> 		ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED;</div><div class='ctx'> 		up_write(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 		goto leave;</div><div class='hunk'>@@ -660,7 +645,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	dev_replace-&gt;srcdev = src_device;</div><div class='ctx'> 	dev_replace-&gt;tgtdev = tgt_device;</div><div class='ctx'> </div><div class='del'>-	btrfs_info_in_rcu(fs_info,</div><div class='add'>+	btrfs_info(fs_info,</div><div class='ctx'> 		      "dev_replace from %s (devid %llu) to %s started",</div><div class='ctx'> 		      btrfs_dev_name(src_device),</div><div class='ctx'> 		      src_device-&gt;devid,</div><div class='hunk'>@@ -686,7 +671,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_err(fs_info, "kobj add dev failed %d", ret);</div><div class='ctx'> </div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Commit dev_replace state and reserve 1 item for it.</div><div class='hunk'>@@ -725,6 +710,23 @@ leave:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int btrfs_check_replace_dev_names(struct btrfs_ioctl_dev_replace_args *args)</div><div class='add'>+{</div><div class='add'>+	if (args-&gt;start.srcdevid == 0) {</div><div class='add'>+		if (memchr(args-&gt;start.srcdev_name, 0,</div><div class='add'>+			   sizeof(args-&gt;start.srcdev_name)) == NULL)</div><div class='add'>+			return -ENAMETOOLONG;</div><div class='add'>+	} else {</div><div class='add'>+		args-&gt;start.srcdev_name[0] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memchr(args-&gt;start.tgtdev_name, 0,</div><div class='add'>+		   sizeof(args-&gt;start.tgtdev_name)) == NULL)</div><div class='add'>+	    return -ENAMETOOLONG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			    struct btrfs_ioctl_dev_replace_args *args)</div><div class='ctx'> {</div><div class='hunk'>@@ -737,10 +739,9 @@ int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if ((args-&gt;start.srcdevid == 0 &amp;&amp; args-&gt;start.srcdev_name[0] == '\0') ||</div><div class='del'>-	    args-&gt;start.tgtdev_name[0] == '\0')</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = btrfs_check_replace_dev_names(args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_dev_replace_start(fs_info, args-&gt;start.tgtdev_name,</div><div class='ctx'> 					args-&gt;start.srcdevid,</div><div class='hunk'>@@ -791,17 +792,17 @@ static int btrfs_set_target_alloc_state(struct btrfs_device *srcdev,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;srcdev-&gt;fs_info-&gt;chunk_mutex);</div><div class='ctx'> </div><div class='del'>-	while (find_first_extent_bit(&amp;srcdev-&gt;alloc_state, start,</div><div class='del'>-				     &amp;found_start, &amp;found_end,</div><div class='del'>-				     CHUNK_ALLOCATED, &amp;cached_state)) {</div><div class='del'>-		ret = set_extent_bit(&amp;tgtdev-&gt;alloc_state, found_start,</div><div class='del'>-				     found_end, CHUNK_ALLOCATED, NULL);</div><div class='add'>+	while (btrfs_find_first_extent_bit(&amp;srcdev-&gt;alloc_state, start,</div><div class='add'>+					   &amp;found_start, &amp;found_end,</div><div class='add'>+					   CHUNK_ALLOCATED, &amp;cached_state)) {</div><div class='add'>+		ret = btrfs_set_extent_bit(&amp;tgtdev-&gt;alloc_state, found_start,</div><div class='add'>+					   found_end, CHUNK_ALLOCATED, NULL);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 		start = found_end + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	free_extent_state(cached_state);</div><div class='add'>+	btrfs_free_extent_state(cached_state);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -810,22 +811,45 @@ static void btrfs_dev_replace_update_device_in_mapping_tree(</div><div class='ctx'> 						struct btrfs_device *srcdev,</div><div class='ctx'> 						struct btrfs_device *tgtdev)</div><div class='ctx'> {</div><div class='del'>-	u64 start = 0;</div><div class='del'>-	int i;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The chunk mutex must be held so that no new chunks can be created</div><div class='add'>+	 * while we are updating existing chunks. This guarantees we don't miss</div><div class='add'>+	 * any new chunk that gets created for a range that falls before the</div><div class='add'>+	 * range of the last chunk we processed.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_held(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='del'>-	do {</div><div class='add'>+	node = rb_first_cached(&amp;fs_info-&gt;mapping_tree);</div><div class='add'>+	while (node) {</div><div class='add'>+		struct rb_node *next = rb_next(node);</div><div class='ctx'> 		struct btrfs_chunk_map *map;</div><div class='add'>+		u64 next_start;</div><div class='ctx'> </div><div class='del'>-		map = btrfs_find_chunk_map_nolock(fs_info, start, U64_MAX);</div><div class='del'>-		if (!map)</div><div class='del'>-			break;</div><div class='del'>-		for (i = 0; i &lt; map-&gt;num_stripes; i++)</div><div class='add'>+		map = rb_entry(node, struct btrfs_chunk_map, rb_node);</div><div class='add'>+		next_start = map-&gt;start + map-&gt;chunk_len;</div><div class='add'>+</div><div class='add'>+		for (int i = 0; i &lt; map-&gt;num_stripes; i++)</div><div class='ctx'> 			if (srcdev == map-&gt;stripes[i].dev)</div><div class='ctx'> 				map-&gt;stripes[i].dev = tgtdev;</div><div class='del'>-		start = map-&gt;start + map-&gt;chunk_len;</div><div class='del'>-		btrfs_free_chunk_map(map);</div><div class='del'>-	} while (start);</div><div class='add'>+</div><div class='add'>+		if (cond_resched_rwlock_write(&amp;fs_info-&gt;mapping_tree_lock)) {</div><div class='add'>+			map = btrfs_find_chunk_map_nolock(fs_info, next_start, U64_MAX);</div><div class='add'>+			if (!map)</div><div class='add'>+				break;</div><div class='add'>+			node = &amp;map-&gt;rb_node;</div><div class='add'>+			/*</div><div class='add'>+			 * Drop the lookup reference since we are holding the</div><div class='add'>+			 * lock in write mode and no one can remove the chunk</div><div class='add'>+			 * map from the tree and drop its tree reference.</div><div class='add'>+			 */</div><div class='add'>+			btrfs_free_chunk_map(map);</div><div class='add'>+		} else {</div><div class='add'>+			node = next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	write_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -866,7 +890,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		mutex_unlock(&amp;dev_replace-&gt;lock_finishing_cancel_unmount);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to use this loop approach because at this point src_device</div><div class='hunk'>@@ -917,7 +941,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 								tgt_device);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (scrub_ret != -ECANCELED)</div><div class='del'>-			btrfs_err_in_rcu(fs_info,</div><div class='add'>+			btrfs_err(fs_info,</div><div class='ctx'> 				 "btrfs_scrub_dev(%s, %llu, %s) failed %d",</div><div class='ctx'> 				 btrfs_dev_name(src_device),</div><div class='ctx'> 				 src_device-&gt;devid,</div><div class='hunk'>@@ -935,7 +959,7 @@ error:</div><div class='ctx'> 		return scrub_ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_info_in_rcu(fs_info,</div><div class='add'>+	btrfs_info(fs_info,</div><div class='ctx'> 			  "dev_replace from %s (devid %llu) to %s finished",</div><div class='ctx'> 			  btrfs_dev_name(src_device),</div><div class='ctx'> 			  src_device-&gt;devid,</div><div class='hunk'>@@ -957,6 +981,7 @@ error:</div><div class='ctx'> 	list_add(&amp;tgt_device-&gt;dev_alloc_list, &amp;fs_devices-&gt;alloc_list);</div><div class='ctx'> 	fs_devices-&gt;rw_devices++;</div><div class='ctx'> </div><div class='add'>+	dev_replace-&gt;replace_task = NULL;</div><div class='ctx'> 	up_write(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 	btrfs_rm_dev_replace_blocked(fs_info);</div><div class='ctx'> </div><div class='hunk'>@@ -984,8 +1009,7 @@ error:</div><div class='ctx'> 	btrfs_sysfs_remove_device(src_device);</div><div class='ctx'> 	btrfs_sysfs_update_devid(tgt_device);</div><div class='ctx'> 	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;src_device-&gt;dev_state))</div><div class='del'>-		btrfs_scratch_superblocks(fs_info, src_device-&gt;bdev,</div><div class='del'>-					  src_device-&gt;name-&gt;str);</div><div class='add'>+		btrfs_scratch_superblocks(fs_info, src_device);</div><div class='ctx'> </div><div class='ctx'> 	/* write back the superblocks */</div><div class='ctx'> 	trans = btrfs_start_transaction(root, 0);</div><div class='hunk'>@@ -1083,7 +1107,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 			 * btrfs_dev_replace_finishing() will handle the</div><div class='ctx'> 			 * cleanup part</div><div class='ctx'> 			 */</div><div class='del'>-			btrfs_info_in_rcu(fs_info,</div><div class='add'>+			btrfs_info(fs_info,</div><div class='ctx'> 				"dev_replace from %s (devid %llu) to %s canceled",</div><div class='ctx'> 				btrfs_dev_name(src_device), src_device-&gt;devid,</div><div class='ctx'> 				btrfs_dev_name(tgt_device));</div><div class='hunk'>@@ -1117,7 +1141,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		ret = btrfs_commit_transaction(trans);</div><div class='ctx'> 		WARN_ON(ret);</div><div class='ctx'> </div><div class='del'>-		btrfs_info_in_rcu(fs_info,</div><div class='add'>+		btrfs_info(fs_info,</div><div class='ctx'> 		"suspended dev_replace from %s (devid %llu) to %s canceled",</div><div class='ctx'> 			btrfs_dev_name(src_device), src_device-&gt;devid,</div><div class='ctx'> 			btrfs_dev_name(tgt_device));</div><div class='hunk'>@@ -1221,7 +1245,7 @@ static int btrfs_dev_replace_kthread(void *data)</div><div class='ctx'> </div><div class='ctx'> 	progress = btrfs_dev_replace_progress(fs_info);</div><div class='ctx'> 	progress = div_u64(progress, 10);</div><div class='del'>-	btrfs_info_in_rcu(fs_info,</div><div class='add'>+	btrfs_info(fs_info,</div><div class='ctx'> 		"continuing dev_replace from %s (devid %llu) to target %s @%u%%",</div><div class='ctx'> 		btrfs_dev_name(dev_replace-&gt;srcdev),</div><div class='ctx'> 		dev_replace-&gt;srcdev-&gt;devid,</div><div class='hunk'>@@ -1239,16 +1263,16 @@ static int btrfs_dev_replace_kthread(void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace)</div><div class='add'>+bool __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace)</div><div class='ctx'> {</div><div class='ctx'> 	if (!dev_replace-&gt;is_valid)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	switch (dev_replace-&gt;replace_state) {</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED:</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED:</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED:</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:</div><div class='ctx'> 	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1263,7 +1287,7 @@ int __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace)</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount)</div><div class='head'>diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h<br/>index 675082ccec89..b35cecf388f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dev-replace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dev-replace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dev-replace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/dev-replace.h</a></div><div class='hunk'>@@ -6,11 +6,15 @@</div><div class='ctx'> #ifndef BTRFS_DEV_REPLACE_H</div><div class='ctx'> #define BTRFS_DEV_REPLACE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+</div><div class='ctx'> struct btrfs_ioctl_dev_replace_args;</div><div class='ctx'> struct btrfs_fs_info;</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='ctx'> struct btrfs_dev_replace;</div><div class='ctx'> struct btrfs_block_group;</div><div class='add'>+struct btrfs_device;</div><div class='ctx'> </div><div class='ctx'> int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_run_dev_replace(struct btrfs_trans_handle *trans);</div><div class='hunk'>@@ -21,7 +25,7 @@ void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,</div><div class='ctx'> int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_dev_replace_suspend_for_unmount(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info);</div><div class='del'>-int __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace);</div><div class='add'>+bool __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace);</div><div class='ctx'> bool btrfs_finish_block_group_to_copy(struct btrfs_device *srcdev,</div><div class='ctx'> 				      struct btrfs_block_group *cache,</div><div class='ctx'> 				      u64 physical);</div><div class='head'>diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c<br/>index 9c07d5c3e5ad..085a83ae9e62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dir-item.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dir-item.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dir-item.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/dir-item.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "dir-item.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * insert a name into a directory, doing overflow properly if there is a hash</div><div class='hunk'>@@ -22,12 +23,11 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle</div><div class='ctx'> 						   *trans,</div><div class='ctx'> 						   struct btrfs_root *root,</div><div class='ctx'> 						   struct btrfs_path *path,</div><div class='del'>-						   struct btrfs_key *cpu_key,</div><div class='add'>+						   const struct btrfs_key *cpu_key,</div><div class='ctx'> 						   u32 data_size,</div><div class='ctx'> 						   const char *name,</div><div class='ctx'> 						   int name_len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char *ptr;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -35,7 +35,7 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);</div><div class='ctx'> 	if (ret == -EEXIST) {</div><div class='ctx'> 		struct btrfs_dir_item *di;</div><div class='del'>-		di = btrfs_match_dir_item_name(fs_info, path, name, name_len);</div><div class='add'>+		di = btrfs_match_dir_item_name(path, name, name_len);</div><div class='ctx'> 		if (di)</div><div class='ctx'> 			return ERR_PTR(-EEXIST);</div><div class='ctx'> 		btrfs_extend_item(trans, path, data_size);</div><div class='hunk'>@@ -93,7 +93,6 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	write_extent_buffer(leaf, name, name_ptr, name_len);</div><div class='ctx'> 	write_extent_buffer(leaf, data, data_ptr, data_len);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -108,12 +107,12 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  const struct fscrypt_str *name, struct btrfs_inode *dir,</div><div class='del'>-			  struct btrfs_key *location, u8 type, u64 index)</div><div class='add'>+			  const struct btrfs_key *location, u8 type, u64 index)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int ret2 = 0;</div><div class='ctx'> 	struct btrfs_root *root = dir-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dir_item *dir_item;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	unsigned long name_ptr;</div><div class='hunk'>@@ -153,7 +152,6 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	name_ptr = (unsigned long)(dir_item + 1);</div><div class='ctx'> </div><div class='ctx'> 	write_extent_buffer(leaf, name-&gt;name, name_ptr, name-&gt;len);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='ctx'> second_insert:</div><div class='ctx'> 	/* FIXME, use some real flag for selecting the extra index */</div><div class='hunk'>@@ -166,7 +164,6 @@ second_insert:</div><div class='ctx'> 	ret2 = btrfs_insert_delayed_dir_index(trans, name-&gt;name, name-&gt;len, dir,</div><div class='ctx'> 					      &amp;disk_key, type, index);</div><div class='ctx'> out_free:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (ret2)</div><div class='hunk'>@@ -190,7 +187,7 @@ static struct btrfs_dir_item *btrfs_lookup_match_dir(</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='del'>-	return btrfs_match_dir_item_name(root-&gt;fs_info, path, name, name_len);</div><div class='add'>+	return btrfs_match_dir_item_name(path, name, name_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -230,7 +227,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return di;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,</div><div class='add'>+int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino,</div><div class='ctx'> 				   const struct fscrypt_str *name)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -239,13 +236,13 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,</div><div class='ctx'> 	int data_size;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	int slot;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	key.objectid = dir;</div><div class='add'>+	key.objectid = dir_ino;</div><div class='ctx'> 	key.type = BTRFS_DIR_ITEM_KEY;</div><div class='ctx'> 	key.offset = btrfs_name_hash(name-&gt;name, name-&gt;len);</div><div class='ctx'> </div><div class='hunk'>@@ -254,20 +251,17 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,</div><div class='ctx'> 	if (IS_ERR(di)) {</div><div class='ctx'> 		ret = PTR_ERR(di);</div><div class='ctx'> 		/* Nothing found, we're safe */</div><div class='del'>-		if (ret == -ENOENT) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* we found an item, look for our name in the item */</div><div class='ctx'> 	if (di) {</div><div class='ctx'> 		/* our exact name was found */</div><div class='del'>-		ret = -EEXIST;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* See if there is room in the item to insert this name. */</div><div class='hunk'>@@ -276,14 +270,11 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='ctx'> 	if (data_size + btrfs_item_size(leaf, slot) +</div><div class='ctx'> 	    sizeof(struct btrfs_item) &gt; BTRFS_LEAF_DATA_SIZE(root-&gt;fs_info)) {</div><div class='del'>-		ret = -EOVERFLOW;</div><div class='del'>-	} else {</div><div class='del'>-		/* plenty of insertion room */</div><div class='del'>-		ret = 0;</div><div class='add'>+		return -EOVERFLOW;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	/* Plenty of insertion room. */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -341,14 +332,13 @@ btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 		if (key.objectid != dirid || key.type != BTRFS_DIR_INDEX_KEY)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		di = btrfs_match_dir_item_name(root-&gt;fs_info, path,</div><div class='del'>-					       name-&gt;name, name-&gt;len);</div><div class='add'>+		di = btrfs_match_dir_item_name(path, name-&gt;name, name-&gt;len);</div><div class='ctx'> 		if (di)</div><div class='ctx'> 			return di;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Adjust return code if the key was not found in the next leaf. */</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		ret = 0;</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -378,8 +368,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * this walks through all the entries in a dir item and finds one</div><div class='ctx'>  * for a specific name.</div><div class='ctx'>  */</div><div class='del'>-struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,</div><div class='del'>-						 struct btrfs_path *path,</div><div class='add'>+struct btrfs_dir_item *btrfs_match_dir_item_name(const struct btrfs_path *path,</div><div class='ctx'> 						 const char *name, int name_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dir_item *dir_item;</div><div class='hunk'>@@ -417,7 +406,7 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,</div><div class='ctx'> int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      struct btrfs_root *root,</div><div class='ctx'> 			      struct btrfs_path *path,</div><div class='del'>-			      struct btrfs_dir_item *di)</div><div class='add'>+			      const struct btrfs_dir_item *di)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='head'>diff --git a/fs/btrfs/dir-item.h b/fs/btrfs/dir-item.h<br/>index e40a226373d7..e52174a8baf9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dir-item.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/dir-item.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/dir-item.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/dir-item.h</a></div><div class='hunk'>@@ -3,15 +3,22 @@</div><div class='ctx'> #ifndef BTRFS_DIR_ITEM_H</div><div class='ctx'> #define BTRFS_DIR_ITEM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/crc32c.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fscrypt_str;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_key;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='del'>-int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,</div><div class='add'>+int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino,</div><div class='ctx'> 			  const struct fscrypt_str *name);</div><div class='ctx'> int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  const struct fscrypt_str *name, struct btrfs_inode *dir,</div><div class='del'>-			  struct btrfs_key *location, u8 type, u64 index);</div><div class='add'>+			  const struct btrfs_key *location, u8 type, u64 index);</div><div class='ctx'> struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					     struct btrfs_root *root,</div><div class='ctx'> 					     struct btrfs_path *path, u64 dir,</div><div class='hunk'>@@ -27,7 +34,7 @@ struct btrfs_dir_item *btrfs_search_dir_index_item(struct btrfs_root *root,</div><div class='ctx'> int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      struct btrfs_root *root,</div><div class='ctx'> 			      struct btrfs_path *path,</div><div class='del'>-			      struct btrfs_dir_item *di);</div><div class='add'>+			      const struct btrfs_dir_item *di);</div><div class='ctx'> int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_root *root,</div><div class='ctx'> 			    struct btrfs_path *path, u64 objectid,</div><div class='hunk'>@@ -38,8 +45,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					  struct btrfs_path *path, u64 dir,</div><div class='ctx'> 					  const char *name, u16 name_len,</div><div class='ctx'> 					  int mod);</div><div class='del'>-struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,</div><div class='del'>-						 struct btrfs_path *path,</div><div class='add'>+struct btrfs_dir_item *btrfs_match_dir_item_name(const struct btrfs_path *path,</div><div class='ctx'> 						 const char *name,</div><div class='ctx'> 						 int name_len);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/direct-io.c b/fs/btrfs/direct-io.c<br/>new file mode 100644<br/>index 000000000000..07e19e88ba4b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/direct-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/direct-io.c</a></div><div class='hunk'>@@ -0,0 +1,1106 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fsverity.h&gt;</div><div class='add'>+#include &lt;linux/iomap.h&gt;</div><div class='add'>+#include "ctree.h"</div><div class='add'>+#include "delalloc-space.h"</div><div class='add'>+#include "direct-io.h"</div><div class='add'>+#include "extent-tree.h"</div><div class='add'>+#include "file.h"</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "transaction.h"</div><div class='add'>+#include "volumes.h"</div><div class='add'>+#include "bio.h"</div><div class='add'>+#include "ordered-data.h"</div><div class='add'>+</div><div class='add'>+struct btrfs_dio_data {</div><div class='add'>+	ssize_t submitted;</div><div class='add'>+	struct extent_changeset *data_reserved;</div><div class='add'>+	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	bool data_space_reserved;</div><div class='add'>+	bool nocow_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct btrfs_dio_private {</div><div class='add'>+	/* Range of I/O */</div><div class='add'>+	u64 file_offset;</div><div class='add'>+	u32 bytes;</div><div class='add'>+</div><div class='add'>+	/* This must be last */</div><div class='add'>+	struct btrfs_bio bbio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bio_set btrfs_dio_bioset;</div><div class='add'>+</div><div class='add'>+static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,</div><div class='add'>+			      struct extent_state **cached_state,</div><div class='add'>+			      unsigned int iomap_flags)</div><div class='add'>+{</div><div class='add'>+	const bool writing = (iomap_flags &amp; IOMAP_WRITE);</div><div class='add'>+	const bool nowait = (iomap_flags &amp; IOMAP_NOWAIT);</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='add'>+	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Direct lock must be taken before the extent lock. */</div><div class='add'>+	if (nowait) {</div><div class='add'>+		if (!btrfs_try_lock_dio_extent(io_tree, lockstart, lockend, cached_state))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+	} else {</div><div class='add'>+		btrfs_lock_dio_extent(io_tree, lockstart, lockend, cached_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (nowait) {</div><div class='add'>+			if (!btrfs_try_lock_extent(io_tree, lockstart, lockend,</div><div class='add'>+						   cached_state)) {</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			btrfs_lock_extent(io_tree, lockstart, lockend, cached_state);</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * We're concerned with the entire range that we're going to be</div><div class='add'>+		 * doing DIO to, so we need to make sure there's no ordered</div><div class='add'>+		 * extents in this range.</div><div class='add'>+		 */</div><div class='add'>+		ordered = btrfs_lookup_ordered_range(BTRFS_I(inode), lockstart,</div><div class='add'>+						     lockend - lockstart + 1);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to make sure there are no buffered pages in this</div><div class='add'>+		 * range either, we could have raced between the invalidate in</div><div class='add'>+		 * generic_file_direct_write and locking the extent.  The</div><div class='add'>+		 * invalidate needs to happen so that reads after a write do not</div><div class='add'>+		 * get stale data.</div><div class='add'>+		 */</div><div class='add'>+		if (!ordered &amp;&amp;</div><div class='add'>+		    (!writing || !filemap_range_has_page(inode-&gt;i_mapping,</div><div class='add'>+							 lockstart, lockend)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		btrfs_unlock_extent(io_tree, lockstart, lockend, cached_state);</div><div class='add'>+</div><div class='add'>+		if (ordered) {</div><div class='add'>+			if (nowait) {</div><div class='add'>+				btrfs_put_ordered_extent(ordered);</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * If we are doing a DIO read and the ordered extent we</div><div class='add'>+			 * found is for a buffered write, we can not wait for it</div><div class='add'>+			 * to complete and retry, because if we do so we can</div><div class='add'>+			 * deadlock with concurrent buffered writes on page</div><div class='add'>+			 * locks. This happens only if our DIO read covers more</div><div class='add'>+			 * than one extent map, if at this point has already</div><div class='add'>+			 * created an ordered extent for a previous extent map</div><div class='add'>+			 * and locked its range in the inode's io tree, and a</div><div class='add'>+			 * concurrent write against that previous extent map's</div><div class='add'>+			 * range and this range started (we unlock the ranges</div><div class='add'>+			 * in the io tree only when the bios complete and</div><div class='add'>+			 * buffered writes always lock pages before attempting</div><div class='add'>+			 * to lock range in the io tree).</div><div class='add'>+			 */</div><div class='add'>+			if (writing ||</div><div class='add'>+			    test_bit(BTRFS_ORDERED_DIRECT, &amp;ordered-&gt;flags))</div><div class='add'>+				btrfs_start_ordered_extent(ordered);</div><div class='add'>+			else</div><div class='add'>+				ret = nowait ? -EAGAIN : -ENOTBLK;</div><div class='add'>+			btrfs_put_ordered_extent(ordered);</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * We could trigger writeback for this range (and wait</div><div class='add'>+			 * for it to complete) and then invalidate the pages for</div><div class='add'>+			 * this range (through invalidate_inode_pages2_range()),</div><div class='add'>+			 * but that can lead us to a deadlock with a concurrent</div><div class='add'>+			 * call to readahead (a buffered read or a defrag call</div><div class='add'>+			 * triggered a readahead) on a page lock due to an</div><div class='add'>+			 * ordered dio extent we created before but did not have</div><div class='add'>+			 * yet a corresponding bio submitted (whence it can not</div><div class='add'>+			 * complete), which makes readahead wait for that</div><div class='add'>+			 * ordered extent to complete while holding a lock on</div><div class='add'>+			 * that page.</div><div class='add'>+			 */</div><div class='add'>+			ret = nowait ? -EAGAIN : -ENOTBLK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		btrfs_unlock_dio_extent(io_tree, lockstart, lockend, cached_state);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct extent_map *btrfs_create_dio_extent(struct btrfs_inode *inode,</div><div class='add'>+						  struct btrfs_dio_data *dio_data,</div><div class='add'>+						  const u64 start,</div><div class='add'>+						  const struct btrfs_file_extent *file_extent,</div><div class='add'>+						  const int type)</div><div class='add'>+{</div><div class='add'>+	struct extent_map *em = NULL;</div><div class='add'>+	struct btrfs_ordered_extent *ordered;</div><div class='add'>+</div><div class='add'>+	if (type != BTRFS_ORDERED_NOCOW) {</div><div class='add'>+		em = btrfs_create_io_em(inode, start, file_extent, type);</div><div class='add'>+		if (IS_ERR(em))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ordered = btrfs_alloc_ordered_extent(inode, start, file_extent,</div><div class='add'>+					     (1U &lt;&lt; type) |</div><div class='add'>+					     (1U &lt;&lt; BTRFS_ORDERED_DIRECT));</div><div class='add'>+	if (IS_ERR(ordered)) {</div><div class='add'>+		if (em) {</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			btrfs_drop_extent_map_range(inode, start,</div><div class='add'>+					start + file_extent-&gt;num_bytes - 1, false);</div><div class='add'>+		}</div><div class='add'>+		em = ERR_CAST(ordered);</div><div class='add'>+	} else {</div><div class='add'>+		ASSERT(!dio_data-&gt;ordered);</div><div class='add'>+		dio_data-&gt;ordered = ordered;</div><div class='add'>+	}</div><div class='add'>+ out:</div><div class='add'>+</div><div class='add'>+	return em;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct extent_map *btrfs_new_extent_direct(struct btrfs_inode *inode,</div><div class='add'>+						  struct btrfs_dio_data *dio_data,</div><div class='add'>+						  u64 start, u64 len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	struct btrfs_file_extent file_extent;</div><div class='add'>+	struct extent_map *em;</div><div class='add'>+	struct btrfs_key ins;</div><div class='add'>+	u64 alloc_hint;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	alloc_hint = btrfs_get_extent_allocation_hint(inode, start, len);</div><div class='add'>+again:</div><div class='add'>+	ret = btrfs_reserve_extent(root, len, len, fs_info-&gt;sectorsize,</div><div class='add'>+				   0, alloc_hint, &amp;ins, true, true);</div><div class='add'>+	if (ret == -EAGAIN) {</div><div class='add'>+		ASSERT(btrfs_is_zoned(fs_info));</div><div class='add'>+		wait_on_bit_io(&amp;inode-&gt;root-&gt;fs_info-&gt;flags, BTRFS_FS_NEED_ZONE_FINISH,</div><div class='add'>+			       TASK_UNINTERRUPTIBLE);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	file_extent.disk_bytenr = ins.objectid;</div><div class='add'>+	file_extent.disk_num_bytes = ins.offset;</div><div class='add'>+	file_extent.num_bytes = ins.offset;</div><div class='add'>+	file_extent.ram_bytes = ins.offset;</div><div class='add'>+	file_extent.offset = 0;</div><div class='add'>+	file_extent.compression = BTRFS_COMPRESS_NONE;</div><div class='add'>+	em = btrfs_create_dio_extent(inode, dio_data, start, &amp;file_extent,</div><div class='add'>+				     BTRFS_ORDERED_REGULAR);</div><div class='add'>+	btrfs_dec_block_group_reservations(fs_info, ins.objectid);</div><div class='add'>+	if (IS_ERR(em))</div><div class='add'>+		btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);</div><div class='add'>+</div><div class='add'>+	return em;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_get_blocks_direct_write(struct extent_map **map,</div><div class='add'>+					 struct inode *inode,</div><div class='add'>+					 struct btrfs_dio_data *dio_data,</div><div class='add'>+					 u64 start, u64 *lenp,</div><div class='add'>+					 unsigned int iomap_flags)</div><div class='add'>+{</div><div class='add'>+	const bool nowait = (iomap_flags &amp; IOMAP_NOWAIT);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	struct btrfs_file_extent file_extent;</div><div class='add'>+	struct extent_map *em = *map;</div><div class='add'>+	int type;</div><div class='add'>+	u64 block_start;</div><div class='add'>+	struct btrfs_block_group *bg;</div><div class='add'>+	bool can_nocow = false;</div><div class='add'>+	bool space_reserved = false;</div><div class='add'>+	u64 len = *lenp;</div><div class='add'>+	u64 prev_len;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't allocate a new extent in the following cases</div><div class='add'>+	 *</div><div class='add'>+	 * 1) The inode is marked as NODATACOW. In this case we'll just use the</div><div class='add'>+	 * existing extent.</div><div class='add'>+	 * 2) The extent is marked as PREALLOC. We're good to go here and can</div><div class='add'>+	 * just use the extent.</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	if ((em-&gt;flags &amp; EXTENT_FLAG_PREALLOC) ||</div><div class='add'>+	    ((BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_NODATACOW) &amp;&amp;</div><div class='add'>+	     em-&gt;disk_bytenr != EXTENT_MAP_HOLE)) {</div><div class='add'>+		if (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC)</div><div class='add'>+			type = BTRFS_ORDERED_PREALLOC;</div><div class='add'>+		else</div><div class='add'>+			type = BTRFS_ORDERED_NOCOW;</div><div class='add'>+		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='add'>+		block_start = btrfs_extent_map_block_start(em) + (start - em-&gt;start);</div><div class='add'>+</div><div class='add'>+		if (can_nocow_extent(BTRFS_I(inode), start, &amp;len, &amp;file_extent,</div><div class='add'>+				     false) == 1) {</div><div class='add'>+			bg = btrfs_inc_nocow_writers(fs_info, block_start);</div><div class='add'>+			if (bg)</div><div class='add'>+				can_nocow = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prev_len = len;</div><div class='add'>+	if (can_nocow) {</div><div class='add'>+		struct extent_map *em2;</div><div class='add'>+</div><div class='add'>+		/* We can NOCOW, so only need to reserve metadata space. */</div><div class='add'>+		ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len, len,</div><div class='add'>+						      nowait);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			/* Our caller expects us to free the input extent map. */</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			*map = NULL;</div><div class='add'>+			btrfs_dec_nocow_writers(bg);</div><div class='add'>+			if (nowait &amp;&amp; (ret == -ENOSPC || ret == -EDQUOT))</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		space_reserved = true;</div><div class='add'>+</div><div class='add'>+		em2 = btrfs_create_dio_extent(BTRFS_I(inode), dio_data, start,</div><div class='add'>+					      &amp;file_extent, type);</div><div class='add'>+		btrfs_dec_nocow_writers(bg);</div><div class='add'>+		if (type == BTRFS_ORDERED_PREALLOC) {</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			*map = em2;</div><div class='add'>+			em = em2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(em2)) {</div><div class='add'>+			ret = PTR_ERR(em2);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dio_data-&gt;nocow_done = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* Our caller expects us to free the input extent map. */</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+		*map = NULL;</div><div class='add'>+</div><div class='add'>+		if (nowait) {</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we could not allocate data space before locking the file</div><div class='add'>+		 * range and we can't do a NOCOW write, then we have to fail.</div><div class='add'>+		 */</div><div class='add'>+		if (!dio_data-&gt;data_space_reserved) {</div><div class='add'>+			ret = -ENOSPC;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We have to COW and we have already reserved data space before,</div><div class='add'>+		 * so now we reserve only metadata.</div><div class='add'>+		 */</div><div class='add'>+		ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len, len,</div><div class='add'>+						      false);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		space_reserved = true;</div><div class='add'>+</div><div class='add'>+		em = btrfs_new_extent_direct(BTRFS_I(inode), dio_data, start, len);</div><div class='add'>+		if (IS_ERR(em)) {</div><div class='add'>+			ret = PTR_ERR(em);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		*map = em;</div><div class='add'>+		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='add'>+		if (len &lt; prev_len)</div><div class='add'>+			btrfs_delalloc_release_metadata(BTRFS_I(inode),</div><div class='add'>+							prev_len - len, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have created our ordered extent, so we can now release our reservation</div><div class='add'>+	 * for an outstanding extent.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_delalloc_release_extents(BTRFS_I(inode), prev_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Need to update the i_size under the extent lock so buffered</div><div class='add'>+	 * readers will get the updated i_size when we unlock.</div><div class='add'>+	 */</div><div class='add'>+	if (start + len &gt; i_size_read(inode))</div><div class='add'>+		i_size_write(inode, start + len);</div><div class='add'>+out:</div><div class='add'>+	if (ret &amp;&amp; space_reserved) {</div><div class='add'>+		btrfs_delalloc_release_extents(BTRFS_I(inode), len);</div><div class='add'>+		btrfs_delalloc_release_metadata(BTRFS_I(inode), len, true);</div><div class='add'>+	}</div><div class='add'>+	*lenp = len;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,</div><div class='add'>+		loff_t length, unsigned int flags, struct iomap *iomap,</div><div class='add'>+		struct iomap *srcmap)</div><div class='add'>+{</div><div class='add'>+	struct iomap_iter *iter = container_of(iomap, struct iomap_iter, iomap);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	struct extent_map *em;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	struct btrfs_dio_data *dio_data = iter-&gt;private;</div><div class='add'>+	u64 lockstart, lockend;</div><div class='add'>+	const bool write = !!(flags &amp; IOMAP_WRITE);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u64 len = length;</div><div class='add'>+	const u64 data_alloc_len = length;</div><div class='add'>+	u32 unlock_bits = EXTENT_LOCKED;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could potentially fault if we have a buffer &gt; PAGE_SIZE, and if</div><div class='add'>+	 * we're NOWAIT we may submit a bio for a partial range and return</div><div class='add'>+	 * EIOCBQUEUED, which would result in an errant short read.</div><div class='add'>+	 *</div><div class='add'>+	 * The best way to handle this would be to allow for partial completions</div><div class='add'>+	 * of iocb's, so we could submit the partial bio, return and fault in</div><div class='add'>+	 * the rest of the pages, and then submit the io for the rest of the</div><div class='add'>+	 * range.  However we don't have that currently, so simply return</div><div class='add'>+	 * -EAGAIN at this point so that the normal path is used.</div><div class='add'>+	 */</div><div class='add'>+	if (!write &amp;&amp; (flags &amp; IOMAP_NOWAIT) &amp;&amp; length &gt; PAGE_SIZE)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cap the size of reads to that usually seen in buffered I/O as we need</div><div class='add'>+	 * to allocate a contiguous array for the checksums.</div><div class='add'>+	 */</div><div class='add'>+	if (!write)</div><div class='add'>+		len = min_t(u64, len, fs_info-&gt;sectorsize * BIO_MAX_VECS);</div><div class='add'>+</div><div class='add'>+	lockstart = start;</div><div class='add'>+	lockend = start + len - 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * iomap_dio_rw() only does filemap_write_and_wait_range(), which isn't</div><div class='add'>+	 * enough if we've written compressed pages to this area, so we need to</div><div class='add'>+	 * flush the dirty pages again to make absolutely sure that any</div><div class='add'>+	 * outstanding dirty pages are on disk - the first flush only starts</div><div class='add'>+	 * compression on the data, while keeping the pages locked, so by the</div><div class='add'>+	 * time the second flush returns we know bios for the compressed pages</div><div class='add'>+	 * were submitted and finished, and the pages no longer under writeback.</div><div class='add'>+	 *</div><div class='add'>+	 * If we have a NOWAIT request and we have any pages in the range that</div><div class='add'>+	 * are locked, likely due to compression still in progress, we don't want</div><div class='add'>+	 * to block on page locks. We also don't want to block on pages marked as</div><div class='add'>+	 * dirty or under writeback (same as for the non-compression case).</div><div class='add'>+	 * iomap_dio_rw() did the same check, but after that and before we got</div><div class='add'>+	 * here, mmap'ed writes may have happened or buffered reads started</div><div class='add'>+	 * (readpage() and readahead(), which lock pages), as we haven't locked</div><div class='add'>+	 * the file range yet.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,</div><div class='add'>+		     &amp;BTRFS_I(inode)-&gt;runtime_flags)) {</div><div class='add'>+		if (flags &amp; IOMAP_NOWAIT) {</div><div class='add'>+			if (filemap_range_needs_writeback(inode-&gt;i_mapping,</div><div class='add'>+							  lockstart, lockend))</div><div class='add'>+				return -EAGAIN;</div><div class='add'>+		} else {</div><div class='add'>+			ret = filemap_fdatawrite_range(inode-&gt;i_mapping, start,</div><div class='add'>+						       start + length - 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(dio_data, 0, sizeof(*dio_data));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We always try to allocate data space and must do it before locking</div><div class='add'>+	 * the file range, to avoid deadlocks with concurrent writes to the same</div><div class='add'>+	 * range if the range has several extents and the writes don't expand the</div><div class='add'>+	 * current i_size (the inode lock is taken in shared mode). If we fail to</div><div class='add'>+	 * allocate data space here we continue and later, after locking the</div><div class='add'>+	 * file range, we fail with ENOSPC only if we figure out we can not do a</div><div class='add'>+	 * NOCOW write.</div><div class='add'>+	 */</div><div class='add'>+	if (write &amp;&amp; !(flags &amp; IOMAP_NOWAIT)) {</div><div class='add'>+		ret = btrfs_check_data_free_space(BTRFS_I(inode),</div><div class='add'>+						  &amp;dio_data-&gt;data_reserved,</div><div class='add'>+						  start, data_alloc_len, false);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dio_data-&gt;data_space_reserved = true;</div><div class='add'>+		else if (!(BTRFS_I(inode)-&gt;flags &amp;</div><div class='add'>+			   (BTRFS_INODE_NODATACOW | BTRFS_INODE_PREALLOC)))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this errors out it's because we couldn't invalidate pagecache for</div><div class='add'>+	 * this range and we need to fallback to buffered IO, or we are doing a</div><div class='add'>+	 * NOWAIT read/write and we need to block.</div><div class='add'>+	 */</div><div class='add'>+	ret = lock_extent_direct(inode, lockstart, lockend, &amp;cached_state, flags);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, start, len);</div><div class='add'>+	if (IS_ERR(em)) {</div><div class='add'>+		ret = PTR_ERR(em);</div><div class='add'>+		goto unlock_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ok for INLINE and COMPRESSED extents we need to fallback on buffered</div><div class='add'>+	 * io.  INLINE is special, and we could probably kludge it in here, but</div><div class='add'>+	 * it's still buffered so for safety lets just fall back to the generic</div><div class='add'>+	 * buffered path.</div><div class='add'>+	 *</div><div class='add'>+	 * For COMPRESSED we _have_ to read the entire extent in so we can</div><div class='add'>+	 * decompress it, so there will be buffering required no matter what we</div><div class='add'>+	 * do, so go ahead and fallback to buffered.</div><div class='add'>+	 *</div><div class='add'>+	 * We return -ENOTBLK because that's what makes DIO go ahead and go back</div><div class='add'>+	 * to buffered IO.  Don't blame me, this is the price we pay for using</div><div class='add'>+	 * the generic code.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_extent_map_is_compressed(em) || em-&gt;disk_bytenr == EXTENT_MAP_INLINE) {</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+		/*</div><div class='add'>+		 * If we are in a NOWAIT context, return -EAGAIN in order to</div><div class='add'>+		 * fallback to buffered IO. This is not only because we can</div><div class='add'>+		 * block with buffered IO (no support for NOWAIT semantics at</div><div class='add'>+		 * the moment) but also to avoid returning short reads to user</div><div class='add'>+		 * space - this happens if we were able to read some data from</div><div class='add'>+		 * previous non-compressed extents and then when we fallback to</div><div class='add'>+		 * buffered IO, at btrfs_file_read_iter() by calling</div><div class='add'>+		 * filemap_read(), we fail to fault in pages for the read buffer,</div><div class='add'>+		 * in which case filemap_read() returns a short read (the number</div><div class='add'>+		 * of bytes previously read is &gt; 0, so it does not return -EFAULT).</div><div class='add'>+		 */</div><div class='add'>+		ret = (flags &amp; IOMAP_NOWAIT) ? -EAGAIN : -ENOTBLK;</div><div class='add'>+		goto unlock_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we have a NOWAIT request and the range contains multiple extents</div><div class='add'>+	 * (or a mix of extents and holes), then we return -EAGAIN to make the</div><div class='add'>+	 * caller fallback to a context where it can do a blocking (without</div><div class='add'>+	 * NOWAIT) request. This way we avoid doing partial IO and returning</div><div class='add'>+	 * success to the caller, which is not optimal for writes and for reads</div><div class='add'>+	 * it can result in unexpected behaviour for an application.</div><div class='add'>+	 *</div><div class='add'>+	 * When doing a read, because we use IOMAP_DIO_PARTIAL when calling</div><div class='add'>+	 * iomap_dio_rw(), we can end up returning less data then what the caller</div><div class='add'>+	 * asked for, resulting in an unexpected, and incorrect, short read.</div><div class='add'>+	 * That is, the caller asked to read N bytes and we return less than that,</div><div class='add'>+	 * which is wrong unless we are crossing EOF. This happens if we get a</div><div class='add'>+	 * page fault error when trying to fault in pages for the buffer that is</div><div class='add'>+	 * associated to the struct iov_iter passed to iomap_dio_rw(), and we</div><div class='add'>+	 * have previously submitted bios for other extents in the range, in</div><div class='add'>+	 * which case iomap_dio_rw() may return us EIOCBQUEUED if not all of</div><div class='add'>+	 * those bios have completed by the time we get the page fault error,</div><div class='add'>+	 * which we return back to our caller - we should only return EIOCBQUEUED</div><div class='add'>+	 * after we have submitted bios for all the extents in the range.</div><div class='add'>+	 */</div><div class='add'>+	if ((flags &amp; IOMAP_NOWAIT) &amp;&amp; len &lt; length) {</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto unlock_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (write) {</div><div class='add'>+		ret = btrfs_get_blocks_direct_write(&amp;em, inode, dio_data,</div><div class='add'>+						    start, &amp;len, flags);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto unlock_err;</div><div class='add'>+		/* Recalc len in case the new em is smaller than requested */</div><div class='add'>+		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='add'>+		if (dio_data-&gt;data_space_reserved) {</div><div class='add'>+			u64 release_offset;</div><div class='add'>+			u64 release_len = 0;</div><div class='add'>+</div><div class='add'>+			if (dio_data-&gt;nocow_done) {</div><div class='add'>+				release_offset = start;</div><div class='add'>+				release_len = data_alloc_len;</div><div class='add'>+			} else if (len &lt; data_alloc_len) {</div><div class='add'>+				release_offset = start + len;</div><div class='add'>+				release_len = data_alloc_len - len;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (release_len &gt; 0)</div><div class='add'>+				btrfs_free_reserved_data_space(BTRFS_I(inode),</div><div class='add'>+							       dio_data-&gt;data_reserved,</div><div class='add'>+							       release_offset,</div><div class='add'>+							       release_len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Translate extent map information to iomap.</div><div class='add'>+	 * We trim the extents (and move the addr) even though iomap code does</div><div class='add'>+	 * that, since we have locked only the parts we are performing I/O in.</div><div class='add'>+	 */</div><div class='add'>+	if ((em-&gt;disk_bytenr == EXTENT_MAP_HOLE) ||</div><div class='add'>+	    ((em-&gt;flags &amp; EXTENT_FLAG_PREALLOC) &amp;&amp; !write)) {</div><div class='add'>+		iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='add'>+		iomap-&gt;type = IOMAP_HOLE;</div><div class='add'>+	} else {</div><div class='add'>+		iomap-&gt;addr = btrfs_extent_map_block_start(em) + (start - em-&gt;start);</div><div class='add'>+		iomap-&gt;type = IOMAP_MAPPED;</div><div class='add'>+	}</div><div class='add'>+	iomap-&gt;offset = start;</div><div class='add'>+	iomap-&gt;bdev = fs_info-&gt;fs_devices-&gt;latest_dev-&gt;bdev;</div><div class='add'>+	iomap-&gt;length = len;</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reads will hold the EXTENT_DIO_LOCKED bit until the io is completed,</div><div class='add'>+	 * writes only hold it for this part.  We hold the extent lock until</div><div class='add'>+	 * we're completely done with the extent map to make sure it remains</div><div class='add'>+	 * valid.</div><div class='add'>+	 */</div><div class='add'>+	if (write)</div><div class='add'>+		unlock_bits |= EXTENT_DIO_LOCKED;</div><div class='add'>+</div><div class='add'>+	btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='add'>+			       unlock_bits, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	/* We didn't use everything, unlock the dio extent for the remainder. */</div><div class='add'>+	if (!write &amp;&amp; (start + len) &lt; lockend)</div><div class='add'>+		btrfs_unlock_dio_extent(&amp;BTRFS_I(inode)-&gt;io_tree, start + len,</div><div class='add'>+					lockend, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unlock_err:</div><div class='add'>+	/*</div><div class='add'>+	 * Don't use EXTENT_LOCK_BITS here in case we extend it later and forget</div><div class='add'>+	 * to update this, be explicit that we expect EXTENT_LOCKED and</div><div class='add'>+	 * EXTENT_DIO_LOCKED to be set here, and so that's what we're clearing.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='add'>+			       EXTENT_LOCKED | EXTENT_DIO_LOCKED, &amp;cached_state);</div><div class='add'>+err:</div><div class='add'>+	if (dio_data-&gt;data_space_reserved) {</div><div class='add'>+		btrfs_free_reserved_data_space(BTRFS_I(inode),</div><div class='add'>+					       dio_data-&gt;data_reserved,</div><div class='add'>+					       start, data_alloc_len);</div><div class='add'>+		extent_changeset_free(dio_data-&gt;data_reserved);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length,</div><div class='add'>+		ssize_t written, unsigned int flags, struct iomap *iomap)</div><div class='add'>+{</div><div class='add'>+	struct iomap_iter *iter = container_of(iomap, struct iomap_iter, iomap);</div><div class='add'>+	struct btrfs_dio_data *dio_data = iter-&gt;private;</div><div class='add'>+	size_t submitted = dio_data-&gt;submitted;</div><div class='add'>+	const bool write = !!(flags &amp; IOMAP_WRITE);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!write &amp;&amp; (iomap-&gt;type == IOMAP_HOLE)) {</div><div class='add'>+		/* If reading from a hole, unlock and return */</div><div class='add'>+		btrfs_unlock_dio_extent(&amp;BTRFS_I(inode)-&gt;io_tree, pos,</div><div class='add'>+					pos + length - 1, NULL);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (submitted &lt; length) {</div><div class='add'>+		pos += submitted;</div><div class='add'>+		length -= submitted;</div><div class='add'>+		if (write)</div><div class='add'>+			btrfs_finish_ordered_extent(dio_data-&gt;ordered, NULL,</div><div class='add'>+						    pos, length, false);</div><div class='add'>+		else</div><div class='add'>+			btrfs_unlock_dio_extent(&amp;BTRFS_I(inode)-&gt;io_tree, pos,</div><div class='add'>+						pos + length - 1, NULL);</div><div class='add'>+		ret = -ENOTBLK;</div><div class='add'>+	}</div><div class='add'>+	if (write) {</div><div class='add'>+		btrfs_put_ordered_extent(dio_data-&gt;ordered);</div><div class='add'>+		dio_data-&gt;ordered = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (write)</div><div class='add'>+		extent_changeset_free(dio_data-&gt;data_reserved);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btrfs_dio_end_io(struct btrfs_bio *bbio)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_dio_private *dip =</div><div class='add'>+		container_of(bbio, struct btrfs_dio_private, bbio);</div><div class='add'>+	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='add'>+	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='add'>+</div><div class='add'>+	if (bio-&gt;bi_status) {</div><div class='add'>+		btrfs_warn(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"direct IO failed ino %llu op 0x%0x offset %#llx len %u err no %d",</div><div class='add'>+			   btrfs_ino(inode), bio-&gt;bi_opf,</div><div class='add'>+			   dip-&gt;file_offset, dip-&gt;bytes, bio-&gt;bi_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (btrfs_op(bio) == BTRFS_MAP_WRITE) {</div><div class='add'>+		btrfs_finish_ordered_extent(bbio-&gt;ordered, NULL,</div><div class='add'>+					    dip-&gt;file_offset, dip-&gt;bytes,</div><div class='add'>+					    !bio-&gt;bi_status);</div><div class='add'>+	} else {</div><div class='add'>+		btrfs_unlock_dio_extent(&amp;inode-&gt;io_tree, dip-&gt;file_offset,</div><div class='add'>+					dip-&gt;file_offset + dip-&gt;bytes - 1, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bbio-&gt;bio.bi_private = bbio-&gt;private;</div><div class='add'>+	iomap_dio_bio_end_io(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_extract_ordered_extent(struct btrfs_bio *bbio,</div><div class='add'>+					struct btrfs_ordered_extent *ordered)</div><div class='add'>+{</div><div class='add'>+	u64 start = (u64)bbio-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+	u64 len = bbio-&gt;bio.bi_iter.bi_size;</div><div class='add'>+	struct btrfs_ordered_extent *new;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Must always be called for the beginning of an ordered extent. */</div><div class='add'>+	if (WARN_ON_ONCE(start != ordered-&gt;disk_bytenr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* No need to split if the ordered extent covers the entire bio. */</div><div class='add'>+	if (ordered-&gt;disk_num_bytes == len) {</div><div class='add'>+		refcount_inc(&amp;ordered-&gt;refs);</div><div class='add'>+		bbio-&gt;ordered = ordered;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't split the extent_map for NOCOW extents, as we're writing into</div><div class='add'>+	 * a pre-existing one.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered-&gt;flags)) {</div><div class='add'>+		ret = btrfs_split_extent_map(bbio-&gt;inode, bbio-&gt;file_offset,</div><div class='add'>+					     ordered-&gt;num_bytes, len,</div><div class='add'>+					     ordered-&gt;disk_bytenr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new = btrfs_split_ordered_extent(ordered, len);</div><div class='add'>+	if (IS_ERR(new))</div><div class='add'>+		return PTR_ERR(new);</div><div class='add'>+	bbio-&gt;ordered = new;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio,</div><div class='add'>+				loff_t file_offset)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='add'>+	struct btrfs_dio_private *dip =</div><div class='add'>+		container_of(bbio, struct btrfs_dio_private, bbio);</div><div class='add'>+	struct btrfs_dio_data *dio_data = iter-&gt;private;</div><div class='add'>+</div><div class='add'>+	btrfs_bio_init(bbio, BTRFS_I(iter-&gt;inode), file_offset,</div><div class='add'>+		       btrfs_dio_end_io, bio-&gt;bi_private);</div><div class='add'>+</div><div class='add'>+	dip-&gt;file_offset = file_offset;</div><div class='add'>+	dip-&gt;bytes = bio-&gt;bi_iter.bi_size;</div><div class='add'>+</div><div class='add'>+	dio_data-&gt;submitted += bio-&gt;bi_iter.bi_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if we are doing a partial write.  If we are, we need to split</div><div class='add'>+	 * the ordered extent to match the submitted bio.  Hang on to the</div><div class='add'>+	 * remaining unfinishable ordered_extent in dio_data so that it can be</div><div class='add'>+	 * cancelled in iomap_end to avoid a deadlock wherein faulting the</div><div class='add'>+	 * remaining pages is blocked on the outstanding ordered extent.</div><div class='add'>+	 */</div><div class='add'>+	if (iter-&gt;flags &amp; IOMAP_WRITE) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_extract_ordered_extent(bbio, dio_data-&gt;ordered);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_finish_ordered_extent(dio_data-&gt;ordered, NULL,</div><div class='add'>+						    file_offset, dip-&gt;bytes,</div><div class='add'>+						    !ret);</div><div class='add'>+			bio-&gt;bi_status = errno_to_blk_status(ret);</div><div class='add'>+			iomap_dio_bio_end_io(bio);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_submit_bbio(bbio, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iomap_ops btrfs_dio_iomap_ops = {</div><div class='add'>+	.iomap_begin            = btrfs_dio_iomap_begin,</div><div class='add'>+	.iomap_end              = btrfs_dio_iomap_end,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iomap_dio_ops btrfs_dio_ops = {</div><div class='add'>+	.submit_io		= btrfs_dio_submit_io,</div><div class='add'>+	.bio_set		= &amp;btrfs_dio_bioset,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t btrfs_dio_read(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+			      size_t done_before)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_dio_data data = { 0 };</div><div class='add'>+</div><div class='add'>+	return iomap_dio_rw(iocb, iter, &amp;btrfs_dio_iomap_ops, &amp;btrfs_dio_ops,</div><div class='add'>+			    IOMAP_DIO_PARTIAL, &amp;data, done_before);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iomap_dio *btrfs_dio_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+					 size_t done_before)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_dio_data data = { 0 };</div><div class='add'>+</div><div class='add'>+	return __iomap_dio_rw(iocb, iter, &amp;btrfs_dio_iomap_ops, &amp;btrfs_dio_ops,</div><div class='add'>+			    IOMAP_DIO_PARTIAL, &amp;data, done_before);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t check_direct_IO(struct btrfs_fs_info *fs_info,</div><div class='add'>+			       const struct iov_iter *iter, loff_t offset)</div><div class='add'>+{</div><div class='add'>+	const u32 blocksize_mask = fs_info-&gt;sectorsize - 1;</div><div class='add'>+</div><div class='add'>+	if (offset &amp; blocksize_mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (iov_iter_alignment(iter) &amp; blocksize_mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For bs &gt; ps support, we heavily rely on large folios to make sure no</div><div class='add'>+	 * block will cross large folio boundaries.</div><div class='add'>+	 *</div><div class='add'>+	 * But memory provided by direct IO is only virtually contiguous, not</div><div class='add'>+	 * physically contiguous, and will break the btrfs' large folio requirement.</div><div class='add'>+	 *</div><div class='add'>+	 * So for bs &gt; ps support, all direct IOs should fallback to buffered ones.</div><div class='add'>+	 */</div><div class='add'>+	if (fs_info-&gt;sectorsize &gt; PAGE_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+{</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	loff_t pos;</div><div class='add'>+	ssize_t written = 0;</div><div class='add'>+	ssize_t written_buffered;</div><div class='add'>+	size_t prev_left = 0;</div><div class='add'>+	loff_t endbyte;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	unsigned int ilock_flags = 0;</div><div class='add'>+	struct iomap_dio *dio;</div><div class='add'>+</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT)</div><div class='add'>+		ilock_flags |= BTRFS_ILOCK_TRY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the write DIO is within EOF, use a shared lock and also only if</div><div class='add'>+	 * security bits will likely not be dropped by file_remove_privs() called</div><div class='add'>+	 * from btrfs_write_check(). Either will need to be rechecked after the</div><div class='add'>+	 * lock was acquired.</div><div class='add'>+	 */</div><div class='add'>+	if (iocb-&gt;ki_pos + iov_iter_count(from) &lt;= i_size_read(inode) &amp;&amp; IS_NOSEC(inode))</div><div class='add'>+		ilock_flags |= BTRFS_ILOCK_SHARED;</div><div class='add'>+</div><div class='add'>+relock:</div><div class='add'>+	ret = btrfs_inode_lock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Shared lock cannot be used with security bits set. */</div><div class='add'>+	if ((ilock_flags &amp; BTRFS_ILOCK_SHARED) &amp;&amp; !IS_NOSEC(inode)) {</div><div class='add'>+		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+		ilock_flags &amp;= ~BTRFS_ILOCK_SHARED;</div><div class='add'>+		goto relock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = generic_write_checks(iocb, from);</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_write_check(iocb, ret);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = iocb-&gt;ki_pos;</div><div class='add'>+	/*</div><div class='add'>+	 * Re-check since file size may have changed just before taking the</div><div class='add'>+	 * lock or pos may have changed because of O_APPEND in generic_write_check()</div><div class='add'>+	 */</div><div class='add'>+	if ((ilock_flags &amp; BTRFS_ILOCK_SHARED) &amp;&amp;</div><div class='add'>+	    pos + iov_iter_count(from) &gt; i_size_read(inode)) {</div><div class='add'>+		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+		ilock_flags &amp;= ~BTRFS_ILOCK_SHARED;</div><div class='add'>+		goto relock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (check_direct_IO(fs_info, from, pos)) {</div><div class='add'>+		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+		goto buffered;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * We can't control the folios being passed in, applications can write</div><div class='add'>+	 * to them while a direct IO write is in progress.  This means the</div><div class='add'>+	 * content might change after we calculated the data checksum.</div><div class='add'>+	 * Therefore we can end up storing a checksum that doesn't match the</div><div class='add'>+	 * persisted data.</div><div class='add'>+	 *</div><div class='add'>+	 * To be extra safe and avoid false data checksum mismatch, if the</div><div class='add'>+	 * inode requires data checksum, just fallback to buffered IO.</div><div class='add'>+	 * For buffered IO we have full control of page cache and can ensure</div><div class='add'>+	 * no one is modifying the content during writeback.</div><div class='add'>+	 */</div><div class='add'>+	if (!(BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_NODATASUM)) {</div><div class='add'>+		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+		goto buffered;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The iov_iter can be mapped to the same file range we are writing to.</div><div class='add'>+	 * If that's the case, then we will deadlock in the iomap code, because</div><div class='add'>+	 * it first calls our callback btrfs_dio_iomap_begin(), which will create</div><div class='add'>+	 * an ordered extent, and after that it will fault in the pages that the</div><div class='add'>+	 * iov_iter refers to. During the fault in we end up in the readahead</div><div class='add'>+	 * pages code (starting at btrfs_readahead()), which will lock the range,</div><div class='add'>+	 * find that ordered extent and then wait for it to complete (at</div><div class='add'>+	 * btrfs_lock_and_flush_ordered_range()), resulting in a deadlock since</div><div class='add'>+	 * obviously the ordered extent can never complete as we didn't submit</div><div class='add'>+	 * yet the respective bio(s). This always happens when the buffer is</div><div class='add'>+	 * memory mapped to the same file range, since the iomap DIO code always</div><div class='add'>+	 * invalidates pages in the target file range (after starting and waiting</div><div class='add'>+	 * for any writeback).</div><div class='add'>+	 *</div><div class='add'>+	 * So here we disable page faults in the iov_iter and then retry if we</div><div class='add'>+	 * got -EFAULT, faulting in the pages before the retry.</div><div class='add'>+	 */</div><div class='add'>+again:</div><div class='add'>+	from-&gt;nofault = true;</div><div class='add'>+	dio = btrfs_dio_write(iocb, from, written);</div><div class='add'>+	from-&gt;nofault = false;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(dio)) {</div><div class='add'>+		ret = PTR_ERR_OR_ZERO(dio);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * If we have a synchronous write, we must make sure the fsync</div><div class='add'>+		 * triggered by the iomap_dio_complete() call below doesn't</div><div class='add'>+		 * deadlock on the inode lock - we are already holding it and we</div><div class='add'>+		 * can't call it after unlocking because we may need to complete</div><div class='add'>+		 * partial writes due to the input buffer (or parts of it) not</div><div class='add'>+		 * being already faulted in.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(current-&gt;journal_info == NULL);</div><div class='add'>+		current-&gt;journal_info = BTRFS_TRANS_DIO_WRITE_STUB;</div><div class='add'>+		ret = iomap_dio_complete(dio);</div><div class='add'>+		current-&gt;journal_info = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No increment (+=) because iomap returns a cumulative value. */</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		written = ret;</div><div class='add'>+</div><div class='add'>+	if (iov_iter_count(from) &gt; 0 &amp;&amp; (ret == -EFAULT || ret &gt; 0)) {</div><div class='add'>+		const size_t left = iov_iter_count(from);</div><div class='add'>+		/*</div><div class='add'>+		 * We have more data left to write. Try to fault in as many as</div><div class='add'>+		 * possible of the remainder pages and retry. We do this without</div><div class='add'>+		 * releasing and locking again the inode, to prevent races with</div><div class='add'>+		 * truncate.</div><div class='add'>+		 *</div><div class='add'>+		 * Also, in case the iov refers to pages in the file range of the</div><div class='add'>+		 * file we want to write to (due to a mmap), we could enter an</div><div class='add'>+		 * infinite loop if we retry after faulting the pages in, since</div><div class='add'>+		 * iomap will invalidate any pages in the range early on, before</div><div class='add'>+		 * it tries to fault in the pages of the iov. So we keep track of</div><div class='add'>+		 * how much was left of iov in the previous EFAULT and fallback</div><div class='add'>+		 * to buffered IO in case we haven't made any progress.</div><div class='add'>+		 */</div><div class='add'>+		if (left == prev_left) {</div><div class='add'>+			ret = -ENOTBLK;</div><div class='add'>+		} else {</div><div class='add'>+			fault_in_iov_iter_readable(from, left);</div><div class='add'>+			prev_left = left;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If 'ret' is -ENOTBLK or we have not written all data, then it means</div><div class='add'>+	 * we must fallback to buffered IO.</div><div class='add'>+	 */</div><div class='add'>+	if ((ret &lt; 0 &amp;&amp; ret != -ENOTBLK) || !iov_iter_count(from))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+buffered:</div><div class='add'>+	/*</div><div class='add'>+	 * If we are in a NOWAIT context, then return -EAGAIN to signal the caller</div><div class='add'>+	 * it must retry the operation in a context where blocking is acceptable,</div><div class='add'>+	 * because even if we end up not blocking during the buffered IO attempt</div><div class='add'>+	 * below, we will block when flushing and waiting for the IO.</div><div class='add'>+	 */</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = iocb-&gt;ki_pos;</div><div class='add'>+	written_buffered = btrfs_buffered_write(iocb, from);</div><div class='add'>+	if (written_buffered &lt; 0) {</div><div class='add'>+		ret = written_buffered;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure all data is persisted. We want the next direct IO read to be</div><div class='add'>+	 * able to read what was just written.</div><div class='add'>+	 */</div><div class='add'>+	endbyte = pos + written_buffered - 1;</div><div class='add'>+	ret = btrfs_fdatawrite_range(BTRFS_I(inode), pos, endbyte);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = filemap_fdatawait_range(inode-&gt;i_mapping, pos, endbyte);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	written += written_buffered;</div><div class='add'>+	iocb-&gt;ki_pos = pos + written_buffered;</div><div class='add'>+	invalidate_mapping_pages(file-&gt;f_mapping, pos &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				 endbyte &gt;&gt; PAGE_SHIFT);</div><div class='add'>+out:</div><div class='add'>+	return ret &lt; 0 ? ret : written;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_direct_read(struct btrfs_fs_info *fs_info,</div><div class='add'>+			     const struct iov_iter *iter, loff_t offset)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int i, seg;</div><div class='add'>+</div><div class='add'>+	ret = check_direct_IO(fs_info, iter, offset);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!iter_is_iovec(iter))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (seg = 0; seg &lt; iter-&gt;nr_segs; seg++) {</div><div class='add'>+		for (i = seg + 1; i &lt; iter-&gt;nr_segs; i++) {</div><div class='add'>+			const struct iovec *iov1 = iter_iov(iter) + seg;</div><div class='add'>+			const struct iovec *iov2 = iter_iov(iter) + i;</div><div class='add'>+</div><div class='add'>+			if (iov1-&gt;iov_base == iov2-&gt;iov_base)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+	size_t prev_left = 0;</div><div class='add'>+	ssize_t read = 0;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (fsverity_active(inode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (check_direct_read(inode_to_fs_info(inode), to, iocb-&gt;ki_pos))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	btrfs_inode_lock(BTRFS_I(inode), BTRFS_ILOCK_SHARED);</div><div class='add'>+again:</div><div class='add'>+	/*</div><div class='add'>+	 * This is similar to what we do for direct IO writes, see the comment</div><div class='add'>+	 * at btrfs_direct_write(), but we also disable page faults in addition</div><div class='add'>+	 * to disabling them only at the iov_iter level. This is because when</div><div class='add'>+	 * reading from a hole or prealloc extent, iomap calls iov_iter_zero(),</div><div class='add'>+	 * which can still trigger page fault ins despite having set -&gt;nofault</div><div class='add'>+	 * to true of our 'to' iov_iter.</div><div class='add'>+	 *</div><div class='add'>+	 * The difference to direct IO writes is that we deadlock when trying</div><div class='add'>+	 * to lock the extent range in the inode's tree during he page reads</div><div class='add'>+	 * triggered by the fault in (while for writes it is due to waiting for</div><div class='add'>+	 * our own ordered extent). This is because for direct IO reads,</div><div class='add'>+	 * btrfs_dio_iomap_begin() returns with the extent range locked, which</div><div class='add'>+	 * is only unlocked in the endio callback (end_bio_extent_readpage()).</div><div class='add'>+	 */</div><div class='add'>+	pagefault_disable();</div><div class='add'>+	to-&gt;nofault = true;</div><div class='add'>+	ret = btrfs_dio_read(iocb, to, read);</div><div class='add'>+	to-&gt;nofault = false;</div><div class='add'>+	pagefault_enable();</div><div class='add'>+</div><div class='add'>+	/* No increment (+=) because iomap returns a cumulative value. */</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		read = ret;</div><div class='add'>+</div><div class='add'>+	if (iov_iter_count(to) &gt; 0 &amp;&amp; (ret == -EFAULT || ret &gt; 0)) {</div><div class='add'>+		const size_t left = iov_iter_count(to);</div><div class='add'>+</div><div class='add'>+		if (left == prev_left) {</div><div class='add'>+			/*</div><div class='add'>+			 * We didn't make any progress since the last attempt,</div><div class='add'>+			 * fallback to a buffered read for the remainder of the</div><div class='add'>+			 * range. This is just to avoid any possibility of looping</div><div class='add'>+			 * for too long.</div><div class='add'>+			 */</div><div class='add'>+			ret = read;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * We made some progress since the last retry or this is</div><div class='add'>+			 * the first time we are retrying. Fault in as many pages</div><div class='add'>+			 * as possible and retry.</div><div class='add'>+			 */</div><div class='add'>+			fault_in_iov_iter_writeable(to, left);</div><div class='add'>+			prev_left = left;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_SHARED);</div><div class='add'>+	return ret &lt; 0 ? ret : read;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init btrfs_init_dio(void)</div><div class='add'>+{</div><div class='add'>+	if (bioset_init(&amp;btrfs_dio_bioset, BIO_POOL_SIZE,</div><div class='add'>+			offsetof(struct btrfs_dio_private, bbio.bio),</div><div class='add'>+			BIOSET_NEED_BVECS))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cold btrfs_destroy_dio(void)</div><div class='add'>+{</div><div class='add'>+	bioset_exit(&amp;btrfs_dio_bioset);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/direct-io.h b/fs/btrfs/direct-io.h<br/>new file mode 100644<br/>index 000000000000..df5d45ee6de7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/direct-io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/direct-io.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef BTRFS_DIRECT_IO_H</div><div class='add'>+#define BTRFS_DIRECT_IO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct kiocb;</div><div class='add'>+</div><div class='add'>+int __init btrfs_init_dio(void);</div><div class='add'>+void __cold btrfs_destroy_dio(void);</div><div class='add'>+</div><div class='add'>+ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from);</div><div class='add'>+ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to);</div><div class='add'>+</div><div class='add'>+#endif /* BTRFS_DIRECT_IO_H */</div><div class='head'>diff --git a/fs/btrfs/discard.c b/fs/btrfs/discard.c<br/>index 944a7340f6a4..89fe85778115 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/discard.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/discard.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/discard.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/discard.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ static int discard_minlen[BTRFS_NR_DISCARD_LISTS] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct list_head *get_discard_list(struct btrfs_discard_ctl *discard_ctl,</div><div class='del'>-					  struct btrfs_block_group *block_group)</div><div class='add'>+					  const struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;discard_ctl-&gt;discard_list[block_group-&gt;discard_index];</div><div class='ctx'> }</div><div class='hunk'>@@ -80,7 +80,7 @@ static struct list_head *get_discard_list(struct btrfs_discard_ctl *discard_ctl,</div><div class='ctx'>  *</div><div class='ctx'>  * Check if the file system is writeable and BTRFS_FS_DISCARD_RUNNING is set.</div><div class='ctx'>  */</div><div class='del'>-static bool btrfs_run_discard_work(struct btrfs_discard_ctl *discard_ctl)</div><div class='add'>+static bool btrfs_run_discard_work(const struct btrfs_discard_ctl *discard_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = container_of(discard_ctl,</div><div class='ctx'> 						     struct btrfs_fs_info,</div><div class='hunk'>@@ -94,8 +94,6 @@ static void __add_to_discard_list(struct btrfs_discard_ctl *discard_ctl,</div><div class='ctx'> 				  struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;discard_ctl-&gt;lock);</div><div class='del'>-	if (!btrfs_run_discard_work(discard_ctl))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;block_group-&gt;discard_list) ||</div><div class='ctx'> 	    block_group-&gt;discard_index == BTRFS_DISCARD_INDEX_UNUSED) {</div><div class='hunk'>@@ -118,6 +116,9 @@ static void add_to_discard_list(struct btrfs_discard_ctl *discard_ctl,</div><div class='ctx'> 	if (!btrfs_is_block_group_data_only(block_group))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_run_discard_work(discard_ctl))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;discard_ctl-&gt;lock);</div><div class='ctx'> 	__add_to_discard_list(discard_ctl, block_group);</div><div class='ctx'> 	spin_unlock(&amp;discard_ctl-&gt;lock);</div><div class='hunk'>@@ -167,13 +168,7 @@ static bool remove_from_discard_list(struct btrfs_discard_ctl *discard_ctl,</div><div class='ctx'> 	block_group-&gt;discard_eligible_time = 0;</div><div class='ctx'> 	queued = !list_empty(&amp;block_group-&gt;discard_list);</div><div class='ctx'> 	list_del_init(&amp;block_group-&gt;discard_list);</div><div class='del'>-	/*</div><div class='del'>-	 * If the block group is currently running in the discard workfn, we</div><div class='del'>-	 * don't want to deref it, since it's still being used by the workfn.</div><div class='del'>-	 * The workfn will notice this case and deref the block group when it is</div><div class='del'>-	 * finished.</div><div class='del'>-	 */</div><div class='del'>-	if (queued &amp;&amp; !running)</div><div class='add'>+	if (queued)</div><div class='ctx'> 		btrfs_put_block_group(block_group);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;discard_ctl-&gt;lock);</div><div class='hunk'>@@ -250,6 +245,20 @@ again:</div><div class='ctx'> 		    block_group-&gt;used != 0) {</div><div class='ctx'> 			if (btrfs_is_block_group_data_only(block_group)) {</div><div class='ctx'> 				__add_to_discard_list(discard_ctl, block_group);</div><div class='add'>+				/*</div><div class='add'>+				 * The block group must have been moved to other</div><div class='add'>+				 * discard list even if discard was disabled in</div><div class='add'>+				 * the meantime or a transaction abort happened,</div><div class='add'>+				 * otherwise we can end up in an infinite loop,</div><div class='add'>+				 * always jumping into the 'again' label and</div><div class='add'>+				 * keep getting this block group over and over</div><div class='add'>+				 * in case there are no other block groups in</div><div class='add'>+				 * the discard lists.</div><div class='add'>+				 */</div><div class='add'>+				ASSERT(block_group-&gt;discard_index !=</div><div class='add'>+				       BTRFS_DISCARD_INDEX_UNUSED,</div><div class='add'>+				       "discard_index=%d",</div><div class='add'>+				       block_group-&gt;discard_index);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				list_del_init(&amp;block_group-&gt;discard_list);</div><div class='ctx'> 				btrfs_put_block_group(block_group);</div><div class='hunk'>@@ -260,9 +269,10 @@ again:</div><div class='ctx'> 			block_group-&gt;discard_cursor = block_group-&gt;start;</div><div class='ctx'> 			block_group-&gt;discard_state = BTRFS_DISCARD_EXTENTS;</div><div class='ctx'> 		}</div><div class='del'>-		discard_ctl-&gt;block_group = block_group;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (block_group) {</div><div class='add'>+		btrfs_get_block_group(block_group);</div><div class='add'>+		discard_ctl-&gt;block_group = block_group;</div><div class='ctx'> 		*discard_state = block_group-&gt;discard_state;</div><div class='ctx'> 		*discard_index = block_group-&gt;discard_index;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -493,9 +503,20 @@ static void btrfs_discard_workfn(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	block_group = peek_discard_list(discard_ctl, &amp;discard_state,</div><div class='ctx'> 					&amp;discard_index, now);</div><div class='del'>-	if (!block_group || !btrfs_run_discard_work(discard_ctl))</div><div class='add'>+	if (!block_group)</div><div class='add'>+		return;</div><div class='add'>+	if (!btrfs_run_discard_work(discard_ctl)) {</div><div class='add'>+		spin_lock(&amp;discard_ctl-&gt;lock);</div><div class='add'>+		btrfs_put_block_group(block_group);</div><div class='add'>+		discard_ctl-&gt;block_group = NULL;</div><div class='add'>+		spin_unlock(&amp;discard_ctl-&gt;lock);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (now &lt; block_group-&gt;discard_eligible_time) {</div><div class='add'>+		spin_lock(&amp;discard_ctl-&gt;lock);</div><div class='add'>+		btrfs_put_block_group(block_group);</div><div class='add'>+		discard_ctl-&gt;block_group = NULL;</div><div class='add'>+		spin_unlock(&amp;discard_ctl-&gt;lock);</div><div class='ctx'> 		btrfs_discard_schedule_work(discard_ctl, false);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -547,15 +568,7 @@ static void btrfs_discard_workfn(struct work_struct *work)</div><div class='ctx'> 	spin_lock(&amp;discard_ctl-&gt;lock);</div><div class='ctx'> 	discard_ctl-&gt;prev_discard = trimmed;</div><div class='ctx'> 	discard_ctl-&gt;prev_discard_time = now;</div><div class='del'>-	/*</div><div class='del'>-	 * If the block group was removed from the discard list while it was</div><div class='del'>-	 * running in this workfn, then we didn't deref it, since this function</div><div class='del'>-	 * still owned that reference. But we set the discard_ctl-&gt;block_group</div><div class='del'>-	 * back to NULL, so we can use that condition to know that now we need</div><div class='del'>-	 * to deref the block_group.</div><div class='del'>-	 */</div><div class='del'>-	if (discard_ctl-&gt;block_group == NULL)</div><div class='del'>-		btrfs_put_block_group(block_group);</div><div class='add'>+	btrfs_put_block_group(block_group);</div><div class='ctx'> 	discard_ctl-&gt;block_group = NULL;</div><div class='ctx'> 	__btrfs_discard_schedule_work(discard_ctl, now, false);</div><div class='ctx'> 	spin_unlock(&amp;discard_ctl-&gt;lock);</div><div class='head'>diff --git a/fs/btrfs/discard.h b/fs/btrfs/discard.h<br/>index dddb0f9101ba..2c5e85394092 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/discard.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/discard.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/discard.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/discard.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #ifndef BTRFS_DISCARD_H</div><div class='ctx'> #define BTRFS_DISCARD_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct btrfs_fs_info;</div><div class='head'>diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c<br/>index c6907d533fe8..89149fac804c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/disk-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/disk-io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/disk-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/disk-io.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/error-injection.h&gt;</div><div class='ctx'> #include &lt;linux/crc32c.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include "tree-log.h"</div><div class='ctx'> #include "free-space-cache.h"</div><div class='ctx'> #include "free-space-tree.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='ctx'> #include "raid56.h"</div><div class='ctx'> #include "sysfs.h"</div><div class='hunk'>@@ -51,6 +50,7 @@</div><div class='ctx'> #include "relocation.h"</div><div class='ctx'> #include "scrub.h"</div><div class='ctx'> #include "super.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN |\</div><div class='ctx'> 				 BTRFS_HEADER_FLAG_RELOC |\</div><div class='hunk'>@@ -117,7 +117,7 @@ static void csum_tree_block(struct extent_buffer *buf, u8 *result)</div><div class='ctx'>  * detect blocks that either didn't get written at all or got written</div><div class='ctx'>  * in the wrong place.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_buffer_uptodate(struct extent_buffer *eb, u64 parent_transid, int atomic)</div><div class='add'>+int btrfs_buffer_uptodate(struct extent_buffer *eb, u64 parent_transid, bool atomic)</div><div class='ctx'> {</div><div class='ctx'> 	if (!extent_buffer_uptodate(eb))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -183,26 +183,33 @@ static int btrfs_repair_eb_io_failure(const struct extent_buffer *eb,</div><div class='ctx'> 				      int mirror_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='del'>-	int num_folios = num_extent_folios(eb);</div><div class='add'>+	const u32 step = min(fs_info-&gt;nodesize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = eb-&gt;len / step;</div><div class='add'>+	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sb_rdonly(fs_info-&gt;sb))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='add'>+	for (int i = 0; i &lt; num_extent_pages(eb); i++) {</div><div class='ctx'> 		struct folio *folio = eb-&gt;folios[i];</div><div class='del'>-		u64 start = max_t(u64, eb-&gt;start, folio_pos(folio));</div><div class='del'>-		u64 end = min_t(u64, eb-&gt;start + eb-&gt;len,</div><div class='del'>-				folio_pos(folio) + folio_size(folio));</div><div class='del'>-		u32 len = end - start;</div><div class='del'>-</div><div class='del'>-		ret = btrfs_repair_io_failure(fs_info, 0, start, len,</div><div class='del'>-					      start, folio, offset_in_folio(folio, start),</div><div class='del'>-					      mirror_num);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='add'>+</div><div class='add'>+		/* No large folio support yet. */</div><div class='add'>+		ASSERT(folio_order(folio) == 0);</div><div class='add'>+		ASSERT(i &lt; nr_steps);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For nodesize &lt; page size, there is just one paddr, with some</div><div class='add'>+		 * offset inside the page.</div><div class='add'>+		 *</div><div class='add'>+		 * For nodesize &gt;= page size, it's one or more paddrs, and eb-&gt;start</div><div class='add'>+		 * must be aligned to page boundary.</div><div class='add'>+		 */</div><div class='add'>+		paddrs[i] = page_to_phys(&amp;folio-&gt;page) + offset_in_page(eb-&gt;start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = btrfs_repair_io_failure(fs_info, 0, eb-&gt;start, eb-&gt;len, eb-&gt;start,</div><div class='add'>+				      paddrs, step, mirror_num);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -214,7 +221,7 @@ static int btrfs_repair_eb_io_failure(const struct extent_buffer *eb,</div><div class='ctx'>  *			structure for details.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_read_extent_buffer(struct extent_buffer *eb,</div><div class='del'>-			     struct btrfs_tree_parent_check *check)</div><div class='add'>+			     const struct btrfs_tree_parent_check *check)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	int failed = 0;</div><div class='hunk'>@@ -226,8 +233,7 @@ int btrfs_read_extent_buffer(struct extent_buffer *eb,</div><div class='ctx'> 	ASSERT(check);</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		clear_bit(EXTENT_BUFFER_CORRUPT, &amp;eb-&gt;bflags);</div><div class='del'>-		ret = read_extent_buffer_pages(eb, WAIT_COMPLETE, mirror_num, check);</div><div class='add'>+		ret = read_extent_buffer_pages(eb, mirror_num, check);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +264,7 @@ int btrfs_read_extent_buffer(struct extent_buffer *eb,</div><div class='ctx'> /*</div><div class='ctx'>  * Checksum a dirty tree block before IO.</div><div class='ctx'>  */</div><div class='del'>-blk_status_t btree_csum_one_bio(struct btrfs_bio *bbio)</div><div class='add'>+int btree_csum_one_bio(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb = bbio-&gt;private;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='hunk'>@@ -269,9 +275,9 @@ blk_status_t btree_csum_one_bio(struct btrfs_bio *bbio)</div><div class='ctx'> </div><div class='ctx'> 	/* Btree blocks are always contiguous on disk. */</div><div class='ctx'> 	if (WARN_ON_ONCE(bbio-&gt;file_offset != eb-&gt;start))</div><div class='del'>-		return BLK_STS_IOERR;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	if (WARN_ON_ONCE(bbio-&gt;bio.bi_iter.bi_size != eb-&gt;len))</div><div class='del'>-		return BLK_STS_IOERR;</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If an extent_buffer is marked as EXTENT_BUFFER_ZONED_ZEROOUT, don't</div><div class='hunk'>@@ -280,14 +286,13 @@ blk_status_t btree_csum_one_bio(struct btrfs_bio *bbio)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_bit(EXTENT_BUFFER_ZONED_ZEROOUT, &amp;eb-&gt;bflags)) {</div><div class='ctx'> 		memzero_extent_buffer(eb, 0, eb-&gt;len);</div><div class='del'>-		return BLK_STS_OK;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(found_start != eb-&gt;start))</div><div class='del'>-		return BLK_STS_IOERR;</div><div class='del'>-	if (WARN_ON(!btrfs_folio_test_uptodate(fs_info, eb-&gt;folios[0],</div><div class='del'>-					       eb-&gt;start, eb-&gt;len)))</div><div class='del'>-		return BLK_STS_IOERR;</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (WARN_ON(!btrfs_meta_folio_test_uptodate(eb-&gt;folios[0], eb)))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(memcmp_extent_buffer(eb, fs_info-&gt;fs_devices-&gt;metadata_uuid,</div><div class='ctx'> 				    offsetof(struct btrfs_header, fsid),</div><div class='hunk'>@@ -315,7 +320,7 @@ blk_status_t btree_csum_one_bio(struct btrfs_bio *bbio)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	write_extent_buffer(eb, result, 0, fs_info-&gt;csum_size);</div><div class='del'>-	return BLK_STS_OK;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	btrfs_print_tree(eb, 0);</div><div class='hunk'>@@ -329,7 +334,7 @@ error:</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG) ||</div><div class='ctx'> 		btrfs_header_owner(eb) == BTRFS_TREE_LOG_OBJECTID);</div><div class='del'>-	return errno_to_blk_status(ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool check_tree_block_fsid(struct extent_buffer *eb)</div><div class='hunk'>@@ -359,7 +364,7 @@ static bool check_tree_block_fsid(struct extent_buffer *eb)</div><div class='ctx'> </div><div class='ctx'> /* Do basic extent buffer checks at read time */</div><div class='ctx'> int btrfs_validate_extent_buffer(struct extent_buffer *eb,</div><div class='del'>-				 struct btrfs_tree_parent_check *check)</div><div class='add'>+				 const struct btrfs_tree_parent_check *check)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	u64 found_start;</div><div class='hunk'>@@ -368,25 +373,26 @@ int btrfs_validate_extent_buffer(struct extent_buffer *eb,</div><div class='ctx'> 	u8 result[BTRFS_CSUM_SIZE];</div><div class='ctx'> 	const u8 *header_csum;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	const bool ignore_csum = btrfs_test_opt(fs_info, IGNOREMETACSUMS);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(check);</div><div class='ctx'> </div><div class='ctx'> 	found_start = btrfs_header_bytenr(eb);</div><div class='del'>-	if (found_start != eb-&gt;start) {</div><div class='add'>+	if (unlikely(found_start != eb-&gt;start)) {</div><div class='ctx'> 		btrfs_err_rl(fs_info,</div><div class='ctx'> 			"bad tree block start, mirror %u want %llu have %llu",</div><div class='ctx'> 			     eb-&gt;read_mirror, eb-&gt;start, found_start);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (check_tree_block_fsid(eb)) {</div><div class='add'>+	if (unlikely(check_tree_block_fsid(eb))) {</div><div class='ctx'> 		btrfs_err_rl(fs_info, "bad fsid on logical %llu mirror %u",</div><div class='ctx'> 			     eb-&gt;start, eb-&gt;read_mirror);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	found_level = btrfs_header_level(eb);</div><div class='del'>-	if (found_level &gt;= BTRFS_MAX_LEVEL) {</div><div class='add'>+	if (unlikely(found_level &gt;= BTRFS_MAX_LEVEL)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			"bad tree block level, mirror %u level %d on logical %llu",</div><div class='ctx'> 			eb-&gt;read_mirror, btrfs_header_level(eb), eb-&gt;start);</div><div class='hunk'>@@ -400,16 +406,19 @@ int btrfs_validate_extent_buffer(struct extent_buffer *eb,</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(result, header_csum, csum_size) != 0) {</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-"checksum verify failed on logical %llu mirror %u wanted " CSUM_FMT " found " CSUM_FMT " level %d",</div><div class='add'>+"checksum verify failed on logical %llu mirror %u wanted " BTRFS_CSUM_FMT " found " BTRFS_CSUM_FMT " level %d%s",</div><div class='ctx'> 			      eb-&gt;start, eb-&gt;read_mirror,</div><div class='del'>-			      CSUM_FMT_VALUE(csum_size, header_csum),</div><div class='del'>-			      CSUM_FMT_VALUE(csum_size, result),</div><div class='del'>-			      btrfs_header_level(eb));</div><div class='del'>-		ret = -EUCLEAN;</div><div class='del'>-		goto out;</div><div class='add'>+			      BTRFS_CSUM_FMT_VALUE(csum_size, header_csum),</div><div class='add'>+			      BTRFS_CSUM_FMT_VALUE(csum_size, result),</div><div class='add'>+			      btrfs_header_level(eb),</div><div class='add'>+			      ignore_csum ? ", ignored" : "");</div><div class='add'>+		if (unlikely(!ignore_csum)) {</div><div class='add'>+			ret = -EUCLEAN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (found_level != check-&gt;level) {</div><div class='add'>+	if (unlikely(found_level != check-&gt;level)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 		"level verify failed on logical %llu mirror %u wanted %u found %u",</div><div class='ctx'> 			  eb-&gt;start, eb-&gt;read_mirror, check-&gt;level, found_level);</div><div class='hunk'>@@ -426,7 +435,7 @@ int btrfs_validate_extent_buffer(struct extent_buffer *eb,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (check-&gt;has_first_key) {</div><div class='del'>-		struct btrfs_key *expect_key = &amp;check-&gt;first_key;</div><div class='add'>+		const struct btrfs_key *expect_key = &amp;check-&gt;first_key;</div><div class='ctx'> 		struct btrfs_key found_key;</div><div class='ctx'> </div><div class='ctx'> 		if (found_level)</div><div class='hunk'>@@ -451,15 +460,9 @@ int btrfs_validate_extent_buffer(struct extent_buffer *eb,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If this is a leaf block and it is corrupt, set the corrupt bit so</div><div class='del'>-	 * that we don't try and read the other copies of this block, just</div><div class='del'>-	 * return -EIO.</div><div class='del'>-	 */</div><div class='del'>-	if (found_level == 0 &amp;&amp; btrfs_check_leaf(eb)) {</div><div class='del'>-		set_bit(EXTENT_BUFFER_CORRUPT, &amp;eb-&gt;bflags);</div><div class='add'>+	/* If this is a leaf block and it is corrupt, just return -EIO. */</div><div class='add'>+	if (found_level == 0 &amp;&amp; btrfs_check_leaf(eb))</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (found_level &gt; 0 &amp;&amp; btrfs_check_node(eb))</div><div class='ctx'> 		ret = -EIO;</div><div class='hunk'>@@ -498,15 +501,15 @@ static int btree_migrate_folio(struct address_space *mapping,</div><div class='ctx'> static int btree_writepages(struct address_space *mapping,</div><div class='ctx'> 			    struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_NONE) {</div><div class='add'>+		struct btrfs_fs_info *fs_info;</div><div class='ctx'> </div><div class='ctx'> 		if (wbc-&gt;for_kupdate)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		fs_info = BTRFS_I(mapping-&gt;host)-&gt;root-&gt;fs_info;</div><div class='add'>+		fs_info = inode_to_fs_info(mapping-&gt;host);</div><div class='ctx'> 		/* this is a bit racy, but that's ok */</div><div class='ctx'> 		ret = __percpu_counter_compare(&amp;fs_info-&gt;dirty_metadata_bytes,</div><div class='ctx'> 					     BTRFS_DIRTY_METADATA_THRESH,</div><div class='hunk'>@@ -522,18 +525,19 @@ static bool btree_release_folio(struct folio *folio, gfp_t gfp_flags)</div><div class='ctx'> 	if (folio_test_writeback(folio) || folio_test_dirty(folio))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return try_release_extent_buffer(&amp;folio-&gt;page);</div><div class='add'>+	return try_release_extent_buffer(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btree_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 				 size_t length)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_io_tree *tree;</div><div class='del'>-	tree = &amp;BTRFS_I(folio-&gt;mapping-&gt;host)-&gt;io_tree;</div><div class='add'>+</div><div class='add'>+	tree = &amp;folio_to_inode(folio)-&gt;io_tree;</div><div class='ctx'> 	extent_invalidate_folio(tree, folio, offset);</div><div class='ctx'> 	btree_release_folio(folio, GFP_NOFS);</div><div class='ctx'> 	if (folio_get_private(folio)) {</div><div class='del'>-		btrfs_warn(BTRFS_I(folio-&gt;mapping-&gt;host)-&gt;root-&gt;fs_info,</div><div class='add'>+		btrfs_warn(folio_to_fs_info(folio),</div><div class='ctx'> 			   "folio private not zero on folio %llu",</div><div class='ctx'> 			   (unsigned long long)folio_pos(folio));</div><div class='ctx'> 		folio_detach_private(folio);</div><div class='hunk'>@@ -544,7 +548,7 @@ static void btree_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> static bool btree_dirty_folio(struct address_space *mapping,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(mapping-&gt;host-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(mapping-&gt;host);</div><div class='ctx'> 	struct btrfs_subpage_info *spi = fs_info-&gt;subpage_info;</div><div class='ctx'> 	struct btrfs_subpage *subpage;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='hunk'>@@ -635,36 +639,25 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,</div><div class='ctx'> 		free_extent_buffer_stale(buf);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='del'>-	if (btrfs_check_eb_owner(buf, check-&gt;owner_root)) {</div><div class='del'>-		free_extent_buffer_stale(buf);</div><div class='del'>-		return ERR_PTR(-EUCLEAN);</div><div class='del'>-	}</div><div class='ctx'> 	return buf;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,</div><div class='del'>-			 u64 objectid)</div><div class='add'>+static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info,</div><div class='add'>+					   u64 objectid, gfp_t flags)</div><div class='ctx'> {</div><div class='del'>-	bool dummy = test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state);</div><div class='add'>+	struct btrfs_root *root;</div><div class='add'>+</div><div class='add'>+	root = kzalloc(sizeof(*root), flags);</div><div class='add'>+	if (!root)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;root-&gt;root_key, 0, sizeof(root-&gt;root_key));</div><div class='del'>-	memset(&amp;root-&gt;root_item, 0, sizeof(root-&gt;root_item));</div><div class='del'>-	memset(&amp;root-&gt;defrag_progress, 0, sizeof(root-&gt;defrag_progress));</div><div class='ctx'> 	root-&gt;fs_info = fs_info;</div><div class='ctx'> 	root-&gt;root_key.objectid = objectid;</div><div class='del'>-	root-&gt;node = NULL;</div><div class='del'>-	root-&gt;commit_root = NULL;</div><div class='del'>-	root-&gt;state = 0;</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;root-&gt;rb_node);</div><div class='ctx'> </div><div class='del'>-	root-&gt;last_trans = 0;</div><div class='del'>-	root-&gt;free_objectid = 0;</div><div class='del'>-	root-&gt;nr_delalloc_inodes = 0;</div><div class='del'>-	root-&gt;nr_ordered_extents = 0;</div><div class='del'>-	root-&gt;inode_tree = RB_ROOT;</div><div class='del'>-	/* GFP flags are compatible with XA_FLAGS_*. */</div><div class='del'>-	xa_init_flags(&amp;root-&gt;delayed_nodes, GFP_ATOMIC);</div><div class='add'>+	xa_init(&amp;root-&gt;inodes);</div><div class='add'>+	xa_init(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_init_root_block_rsv(root);</div><div class='ctx'> </div><div class='hunk'>@@ -675,7 +668,6 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;root-&gt;ordered_extents);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;root-&gt;ordered_root);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;root-&gt;reloc_dirty_list);</div><div class='del'>-	spin_lock_init(&amp;root-&gt;inode_lock);</div><div class='ctx'> 	spin_lock_init(&amp;root-&gt;delalloc_lock);</div><div class='ctx'> 	spin_lock_init(&amp;root-&gt;ordered_extent_lock);</div><div class='ctx'> 	spin_lock_init(&amp;root-&gt;accounting_lock);</div><div class='hunk'>@@ -697,15 +689,12 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	refcount_set(&amp;root-&gt;refs, 1);</div><div class='ctx'> 	atomic_set(&amp;root-&gt;snapshot_force_cow, 0);</div><div class='ctx'> 	atomic_set(&amp;root-&gt;nr_swapfiles, 0);</div><div class='del'>-	btrfs_set_root_log_transid(root, 0);</div><div class='ctx'> 	root-&gt;log_transid_committed = -1;</div><div class='del'>-	btrfs_set_root_last_log_commit(root, 0);</div><div class='del'>-	root-&gt;anon_dev = 0;</div><div class='del'>-	if (!dummy) {</div><div class='del'>-		extent_io_tree_init(fs_info, &amp;root-&gt;dirty_log_pages,</div><div class='del'>-				    IO_TREE_ROOT_DIRTY_LOG_PAGES);</div><div class='del'>-		extent_io_tree_init(fs_info, &amp;root-&gt;log_csum_range,</div><div class='del'>-				    IO_TREE_LOG_CSUM_RANGE);</div><div class='add'>+	if (!btrfs_is_testing(fs_info)) {</div><div class='add'>+		btrfs_extent_io_tree_init(fs_info, &amp;root-&gt;dirty_log_pages,</div><div class='add'>+					  IO_TREE_ROOT_DIRTY_LOG_PAGES);</div><div class='add'>+		btrfs_extent_io_tree_init(fs_info, &amp;root-&gt;log_csum_range,</div><div class='add'>+					  IO_TREE_LOG_CSUM_RANGE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;root-&gt;root_item_lock);</div><div class='hunk'>@@ -716,14 +705,7 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	list_add_tail(&amp;root-&gt;leak_list, &amp;fs_info-&gt;allocated_roots);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> #endif</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info,</div><div class='del'>-					   u64 objectid, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_root *root = kzalloc(sizeof(*root), flags);</div><div class='del'>-	if (root)</div><div class='del'>-		__setup_root(root, fs_info, objectid);</div><div class='ctx'> 	return root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -776,7 +758,7 @@ int btrfs_global_root_insert(struct btrfs_root *root)</div><div class='ctx'> 	if (tmp) {</div><div class='ctx'> 		ret = -EEXIST;</div><div class='ctx'> 		btrfs_warn(fs_info, "global root %llu %llu already exists",</div><div class='del'>-				root-&gt;root_key.objectid, root-&gt;root_key.offset);</div><div class='add'>+			   btrfs_root_id(root), root-&gt;root_key.offset);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -848,13 +830,6 @@ struct btrfs_root *btrfs_extent_root(struct btrfs_fs_info *fs_info, u64 bytenr)</div><div class='ctx'> 	return btrfs_global_root(fs_info, &amp;key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	if (btrfs_fs_compat_ro(fs_info, BLOCK_GROUP_TREE))</div><div class='del'>-		return fs_info-&gt;block_group_root;</div><div class='del'>-	return btrfs_extent_root(fs_info, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     u64 objectid)</div><div class='ctx'> {</div><div class='hunk'>@@ -903,7 +878,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_root_used(&amp;root-&gt;root_item, leaf-&gt;len);</div><div class='ctx'> 	btrfs_set_root_last_snapshot(&amp;root-&gt;root_item, 0);</div><div class='ctx'> 	btrfs_set_root_dirid(&amp;root-&gt;root_item, 0);</div><div class='del'>-	if (is_fstree(objectid))</div><div class='add'>+	if (btrfs_is_fstree(objectid))</div><div class='ctx'> 		generate_random_guid(root-&gt;root_item.uuid);</div><div class='ctx'> 	else</div><div class='ctx'> 		export_guid(root-&gt;root_item.uuid, &amp;guid_null);</div><div class='hunk'>@@ -926,8 +901,7 @@ fail:</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-					 struct btrfs_fs_info *fs_info)</div><div class='add'>+static struct btrfs_root *alloc_log_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> </div><div class='hunk'>@@ -975,7 +949,7 @@ int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *log_root;</div><div class='ctx'> </div><div class='del'>-	log_root = alloc_log_tree(trans, fs_info);</div><div class='add'>+	log_root = alloc_log_tree(fs_info);</div><div class='ctx'> 	if (IS_ERR(log_root))</div><div class='ctx'> 		return PTR_ERR(log_root);</div><div class='ctx'> </div><div class='hunk'>@@ -1001,7 +975,7 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	log_root = alloc_log_tree(trans, fs_info);</div><div class='add'>+	log_root = alloc_log_tree(fs_info);</div><div class='ctx'> 	if (IS_ERR(log_root))</div><div class='ctx'> 		return PTR_ERR(log_root);</div><div class='ctx'> </div><div class='hunk'>@@ -1011,8 +985,8 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	log_root-&gt;last_trans = trans-&gt;transid;</div><div class='del'>-	log_root-&gt;root_key.offset = root-&gt;root_key.objectid;</div><div class='add'>+	btrfs_set_root_last_trans(log_root, trans-&gt;transid);</div><div class='add'>+	log_root-&gt;root_key.offset = btrfs_root_id(root);</div><div class='ctx'> </div><div class='ctx'> 	inode_item = &amp;log_root-&gt;root_item.inode;</div><div class='ctx'> 	btrfs_set_stack_inode_generation(inode_item, 1);</div><div class='hunk'>@@ -1034,7 +1008,7 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_root *read_tree_root_path(struct btrfs_root *tree_root,</div><div class='ctx'> 					      struct btrfs_path *path,</div><div class='del'>-					      struct btrfs_key *key)</div><div class='add'>+					      const struct btrfs_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	struct btrfs_tree_parent_check check = { 0 };</div><div class='hunk'>@@ -1067,7 +1041,7 @@ static struct btrfs_root *read_tree_root_path(struct btrfs_root *tree_root,</div><div class='ctx'> 		root-&gt;node = NULL;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='del'>-	if (!btrfs_buffer_uptodate(root-&gt;node, generation, 0)) {</div><div class='add'>+	if (unlikely(!btrfs_buffer_uptodate(root-&gt;node, generation, false))) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1076,15 +1050,15 @@ static struct btrfs_root *read_tree_root_path(struct btrfs_root *tree_root,</div><div class='ctx'> 	 * For real fs, and not log/reloc trees, root owner must</div><div class='ctx'> 	 * match its root node owner</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state) &amp;&amp;</div><div class='del'>-	    root-&gt;root_key.objectid != BTRFS_TREE_LOG_OBJECTID &amp;&amp;</div><div class='del'>-	    root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='del'>-	    root-&gt;root_key.objectid != btrfs_header_owner(root-&gt;node)) {</div><div class='add'>+	if (unlikely(!btrfs_is_testing(fs_info) &amp;&amp;</div><div class='add'>+		     btrfs_root_id(root) != BTRFS_TREE_LOG_OBJECTID &amp;&amp;</div><div class='add'>+		     btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='add'>+		     btrfs_root_id(root) != btrfs_header_owner(root-&gt;node))) {</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='ctx'> "root=%llu block=%llu, tree root owner mismatch, have %llu expect %llu",</div><div class='del'>-			   root-&gt;root_key.objectid, root-&gt;node-&gt;start,</div><div class='add'>+			   btrfs_root_id(root), root-&gt;node-&gt;start,</div><div class='ctx'> 			   btrfs_header_owner(root-&gt;node),</div><div class='del'>-			   root-&gt;root_key.objectid);</div><div class='add'>+			   btrfs_root_id(root));</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1096,24 +1070,25 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,</div><div class='del'>-					struct btrfs_key *key)</div><div class='add'>+					const struct btrfs_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	root = read_tree_root_path(tree_root, path, key);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	return root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Initialize subvolume root in-memory structure</div><div class='add'>+ * Initialize subvolume root in-memory structure.</div><div class='ctx'>  *</div><div class='ctx'>  * @anon_dev:	anonymous device to attach to the root, if zero, allocate new</div><div class='add'>+ *</div><div class='add'>+ * In case of failure the caller is responsible to call btrfs_free_fs_root()</div><div class='ctx'>  */</div><div class='ctx'> static int btrfs_init_fs_root(struct btrfs_root *root, dev_t anon_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1121,9 +1096,9 @@ static int btrfs_init_fs_root(struct btrfs_root *root, dev_t anon_dev)</div><div class='ctx'> </div><div class='ctx'> 	btrfs_drew_lock_init(&amp;root-&gt;snapshot_lock);</div><div class='ctx'> </div><div class='del'>-	if (root-&gt;root_key.objectid != BTRFS_TREE_LOG_OBJECTID &amp;&amp;</div><div class='add'>+	if (btrfs_root_id(root) != BTRFS_TREE_LOG_OBJECTID &amp;&amp;</div><div class='ctx'> 	    !btrfs_is_data_reloc_root(root) &amp;&amp;</div><div class='del'>-	    is_fstree(root-&gt;root_key.objectid)) {</div><div class='add'>+	    btrfs_is_fstree(btrfs_root_id(root))) {</div><div class='ctx'> 		set_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state);</div><div class='ctx'> 		btrfs_check_and_init_root_item(&amp;root-&gt;root_item);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1132,12 +1107,12 @@ static int btrfs_init_fs_root(struct btrfs_root *root, dev_t anon_dev)</div><div class='ctx'> 	 * Don't assign anonymous block device to roots that are not exposed to</div><div class='ctx'> 	 * userspace, the id pool is limited to 1M</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_fstree(root-&gt;root_key.objectid) &amp;&amp;</div><div class='add'>+	if (btrfs_is_fstree(btrfs_root_id(root)) &amp;&amp;</div><div class='ctx'> 	    btrfs_root_refs(&amp;root-&gt;root_item) &gt; 0) {</div><div class='ctx'> 		if (!anon_dev) {</div><div class='ctx'> 			ret = get_anon_bdev(&amp;root-&gt;anon_dev);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto fail;</div><div class='add'>+				return ret;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			root-&gt;anon_dev = anon_dev;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1147,7 +1122,7 @@ static int btrfs_init_fs_root(struct btrfs_root *root, dev_t anon_dev)</div><div class='ctx'> 	ret = btrfs_init_root_free_objectid(root);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		mutex_unlock(&amp;root-&gt;objectid_mutex);</div><div class='del'>-		goto fail;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(root-&gt;free_objectid &lt;= BTRFS_LAST_FREE_OBJECTID);</div><div class='hunk'>@@ -1155,9 +1130,6 @@ static int btrfs_init_fs_root(struct btrfs_root *root, dev_t anon_dev)</div><div class='ctx'> 	mutex_unlock(&amp;root-&gt;objectid_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-fail:</div><div class='del'>-	/* The caller is responsible to call btrfs_free_fs_root */</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_root *btrfs_lookup_fs_root(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -1219,7 +1191,7 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> 	ret = radix_tree_insert(&amp;fs_info-&gt;fs_roots_radix,</div><div class='del'>-				(unsigned long)root-&gt;root_key.objectid,</div><div class='add'>+				(unsigned long)btrfs_root_id(root),</div><div class='ctx'> 				root);</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		btrfs_grab_root(root);</div><div class='hunk'>@@ -1231,7 +1203,7 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info)</div><div class='add'>+void btrfs_check_leaked_roots(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='hunk'>@@ -1244,6 +1216,7 @@ void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		btrfs_err(fs_info, "leaked root %s refcount %d",</div><div class='ctx'> 			  btrfs_root_name(&amp;root-&gt;root_key, buf),</div><div class='ctx'> 			  refcount_read(&amp;root-&gt;refs));</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='ctx'> 		while (refcount_read(&amp;root-&gt;refs) &gt; 1)</div><div class='ctx'> 			btrfs_put_root(root);</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='hunk'>@@ -1265,9 +1238,18 @@ static void free_global_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	struct percpu_counter *em_counter = &amp;fs_info-&gt;evictable_extent_maps;</div><div class='add'>+</div><div class='add'>+	if (fs_info-&gt;fs_devices)</div><div class='add'>+		btrfs_close_devices(fs_info-&gt;fs_devices);</div><div class='add'>+	btrfs_free_compress_wsm(fs_info);</div><div class='add'>+	percpu_counter_destroy(&amp;fs_info-&gt;stats_read_blocks);</div><div class='ctx'> 	percpu_counter_destroy(&amp;fs_info-&gt;dirty_metadata_bytes);</div><div class='ctx'> 	percpu_counter_destroy(&amp;fs_info-&gt;delalloc_bytes);</div><div class='ctx'> 	percpu_counter_destroy(&amp;fs_info-&gt;ordered_bytes);</div><div class='add'>+	if (percpu_counter_initialized(em_counter))</div><div class='add'>+		ASSERT(percpu_counter_sum_positive(em_counter) == 0);</div><div class='add'>+	percpu_counter_destroy(em_counter);</div><div class='ctx'> 	percpu_counter_destroy(&amp;fs_info-&gt;dev_replace.bio_counter);</div><div class='ctx'> 	btrfs_free_csum_hash(fs_info);</div><div class='ctx'> 	btrfs_free_stripe_hash_table(fs_info);</div><div class='hunk'>@@ -1288,7 +1270,6 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_extent_buffer_leak_debug_check(fs_info);</div><div class='ctx'> 	kfree(fs_info-&gt;super_copy);</div><div class='ctx'> 	kfree(fs_info-&gt;super_for_commit);</div><div class='del'>-	kfree(fs_info-&gt;subpage_info);</div><div class='ctx'> 	kvfree(fs_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1307,12 +1288,12 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'>  *</div><div class='ctx'>  * @objectid:	root id</div><div class='ctx'>  * @anon_dev:	preallocated anonymous block device number for new roots,</div><div class='del'>- * 		pass 0 for new allocation.</div><div class='add'>+ *		pass NULL for a new allocation.</div><div class='ctx'>  * @check_ref:	whether to check root item references, If true, return -ENOENT</div><div class='ctx'>  *		for orphan roots</div><div class='ctx'>  */</div><div class='ctx'> static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,</div><div class='del'>-					     u64 objectid, dev_t anon_dev,</div><div class='add'>+					     u64 objectid, dev_t *anon_dev,</div><div class='ctx'> 					     bool check_ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='hunk'>@@ -1331,13 +1312,22 @@ static struct btrfs_root *btrfs_get_root_ref(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * This is namely for free-space-tree and quota tree, which can change</div><div class='ctx'> 	 * at runtime and should only be grabbed from fs_info.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_fstree(objectid) &amp;&amp; objectid != BTRFS_DATA_RELOC_TREE_OBJECTID)</div><div class='add'>+	if (!btrfs_is_fstree(objectid) &amp;&amp; objectid != BTRFS_DATA_RELOC_TREE_OBJECTID)</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> again:</div><div class='ctx'> 	root = btrfs_lookup_fs_root(fs_info, objectid);</div><div class='ctx'> 	if (root) {</div><div class='del'>-		/* Shouldn't get preallocated anon_dev for cached roots */</div><div class='del'>-		ASSERT(!anon_dev);</div><div class='add'>+		/*</div><div class='add'>+		 * Some other caller may have read out the newly inserted</div><div class='add'>+		 * subvolume already (for things like backref walk etc).  Not</div><div class='add'>+		 * that common but still possible.  In that case, we just need</div><div class='add'>+		 * to free the anon_dev.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(anon_dev &amp;&amp; *anon_dev)) {</div><div class='add'>+			free_anon_bdev(*anon_dev);</div><div class='add'>+			*anon_dev = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (check_ref &amp;&amp; btrfs_root_refs(&amp;root-&gt;root_item) == 0) {</div><div class='ctx'> 			btrfs_put_root(root);</div><div class='ctx'> 			return ERR_PTR(-ENOENT);</div><div class='hunk'>@@ -1357,7 +1347,7 @@ again:</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_init_fs_root(root, anon_dev);</div><div class='add'>+	ret = btrfs_init_fs_root(root, anon_dev ? *anon_dev : 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -1393,7 +1383,7 @@ fail:</div><div class='ctx'> 	 * root's anon_dev to 0 to avoid a double free, once by btrfs_put_root()</div><div class='ctx'> 	 * and once again by our caller.</div><div class='ctx'> 	 */</div><div class='del'>-	if (anon_dev)</div><div class='add'>+	if (anon_dev &amp;&amp; *anon_dev)</div><div class='ctx'> 		root-&gt;anon_dev = 0;</div><div class='ctx'> 	btrfs_put_root(root);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -1409,7 +1399,7 @@ fail:</div><div class='ctx'> struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				     u64 objectid, bool check_ref)</div><div class='ctx'> {</div><div class='del'>-	return btrfs_get_root_ref(fs_info, objectid, 0, check_ref);</div><div class='add'>+	return btrfs_get_root_ref(fs_info, objectid, NULL, check_ref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1417,11 +1407,11 @@ struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * the anonymous block device id</div><div class='ctx'>  *</div><div class='ctx'>  * @objectid:	tree objectid</div><div class='del'>- * @anon_dev:	if zero, allocate a new anonymous block device or use the</div><div class='del'>- *		parameter value</div><div class='add'>+ * @anon_dev:	if NULL, allocate a new anonymous block device or use the</div><div class='add'>+ *		parameter value if not NULL</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_root *btrfs_get_new_fs_root(struct btrfs_fs_info *fs_info,</div><div class='del'>-					 u64 objectid, dev_t anon_dev)</div><div class='add'>+					 u64 objectid, dev_t *anon_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return btrfs_get_root_ref(fs_info, objectid, anon_dev, true);</div><div class='ctx'> }</div><div class='hunk'>@@ -1563,7 +1553,7 @@ static int transaction_kthread(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		cannot_commit = false;</div><div class='del'>-		delay = msecs_to_jiffies(fs_info-&gt;commit_interval * 1000);</div><div class='add'>+		delay = secs_to_jiffies(fs_info-&gt;commit_interval);</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;transaction_kthread_mutex);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='hunk'>@@ -1578,9 +1568,9 @@ static int transaction_kthread(void *arg)</div><div class='ctx'> 		    cur-&gt;state &lt; TRANS_STATE_COMMIT_PREP &amp;&amp;</div><div class='ctx'> 		    delta &lt; fs_info-&gt;commit_interval) {</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='del'>-			delay -= msecs_to_jiffies((delta - 1) * 1000);</div><div class='add'>+			delay -= secs_to_jiffies(delta - 1);</div><div class='ctx'> 			delay = min(delay,</div><div class='del'>-				    msecs_to_jiffies(fs_info-&gt;commit_interval * 1000));</div><div class='add'>+				    secs_to_jiffies(fs_info-&gt;commit_interval));</div><div class='ctx'> 			goto sleep;</div><div class='ctx'> 		}</div><div class='ctx'> 		transid = cur-&gt;transid;</div><div class='hunk'>@@ -1778,8 +1768,6 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		destroy_workqueue(fs_info-&gt;endio_workers);</div><div class='ctx'> 	if (fs_info-&gt;rmw_workers)</div><div class='ctx'> 		destroy_workqueue(fs_info-&gt;rmw_workers);</div><div class='del'>-	if (fs_info-&gt;compressed_write_workers)</div><div class='del'>-		destroy_workqueue(fs_info-&gt;compressed_write_workers);</div><div class='ctx'> 	btrfs_destroy_workqueue(fs_info-&gt;endio_write_workers);</div><div class='ctx'> 	btrfs_destroy_workqueue(fs_info-&gt;endio_freespace_worker);</div><div class='ctx'> 	btrfs_destroy_workqueue(fs_info-&gt;delayed_workers);</div><div class='hunk'>@@ -1840,7 +1828,10 @@ void btrfs_put_root(struct btrfs_root *root)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (refcount_dec_and_test(&amp;root-&gt;refs)) {</div><div class='del'>-		WARN_ON(!RB_EMPTY_ROOT(&amp;root-&gt;inode_tree));</div><div class='add'>+		if (WARN_ON(!xa_empty(&amp;root-&gt;inodes)))</div><div class='add'>+			xa_destroy(&amp;root-&gt;inodes);</div><div class='add'>+		if (WARN_ON(!xa_empty(&amp;root-&gt;delayed_nodes)))</div><div class='add'>+			xa_destroy(&amp;root-&gt;delayed_nodes);</div><div class='ctx'> 		WARN_ON(test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &amp;root-&gt;state));</div><div class='ctx'> 		if (root-&gt;anon_dev)</div><div class='ctx'> 			free_anon_bdev(root-&gt;anon_dev);</div><div class='hunk'>@@ -1861,8 +1852,8 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;fs_info-&gt;dead_roots)) {</div><div class='del'>-		gang[0] = list_entry(fs_info-&gt;dead_roots.next,</div><div class='del'>-				     struct btrfs_root, root_list);</div><div class='add'>+		gang[0] = list_first_entry(&amp;fs_info-&gt;dead_roots,</div><div class='add'>+					   struct btrfs_root, root_list);</div><div class='ctx'> 		list_del(&amp;gang[0]-&gt;root_list);</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(BTRFS_ROOT_IN_RADIX, &amp;gang[0]-&gt;state))</div><div class='hunk'>@@ -1914,7 +1905,7 @@ static int btrfs_init_btree_inode(struct super_block *sb)</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_ino = BTRFS_BTREE_INODE_OBJECTID;</div><div class='add'>+	btrfs_set_inode_number(BTRFS_I(inode), BTRFS_BTREE_INODE_OBJECTID);</div><div class='ctx'> 	set_nlink(inode, 1);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we set the i_size on the btree inode to the max possible int.</div><div class='hunk'>@@ -1925,17 +1916,14 @@ static int btrfs_init_btree_inode(struct super_block *sb)</div><div class='ctx'> 	inode-&gt;i_mapping-&gt;a_ops = &amp;btree_aops;</div><div class='ctx'> 	mapping_set_gfp_mask(inode-&gt;i_mapping, GFP_NOFS);</div><div class='ctx'> </div><div class='del'>-	RB_CLEAR_NODE(&amp;BTRFS_I(inode)-&gt;rb_node);</div><div class='del'>-	extent_io_tree_init(fs_info, &amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-			    IO_TREE_BTREE_INODE_IO);</div><div class='del'>-	extent_map_tree_init(&amp;BTRFS_I(inode)-&gt;extent_tree);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='add'>+				  IO_TREE_BTREE_INODE_IO);</div><div class='add'>+	btrfs_extent_map_tree_init(&amp;BTRFS_I(inode)-&gt;extent_tree);</div><div class='ctx'> </div><div class='ctx'> 	BTRFS_I(inode)-&gt;root = btrfs_grab_root(fs_info-&gt;tree_root);</div><div class='del'>-	BTRFS_I(inode)-&gt;location.objectid = BTRFS_BTREE_INODE_OBJECTID;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.type = 0;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.offset = 0;</div><div class='ctx'> 	set_bit(BTRFS_INODE_DUMMY, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='ctx'> 	__insert_inode_hash(inode, hash);</div><div class='add'>+	set_bit(AS_KERNEL_FILE, &amp;inode-&gt;i_mapping-&gt;flags);</div><div class='ctx'> 	fs_info-&gt;btree_inode = inode;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1955,9 +1943,8 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	fs_info-&gt;qgroup_tree = RB_ROOT;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fs_info-&gt;dirty_qgroups);</div><div class='ctx'> 	fs_info-&gt;qgroup_seq = 1;</div><div class='del'>-	fs_info-&gt;qgroup_ulist = NULL;</div><div class='ctx'> 	fs_info-&gt;qgroup_rescan_running = false;</div><div class='del'>-	fs_info-&gt;qgroup_drop_subtree_thres = BTRFS_MAX_LEVEL;</div><div class='add'>+	fs_info-&gt;qgroup_drop_subtree_thres = BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT;</div><div class='ctx'> 	mutex_init(&amp;fs_info-&gt;qgroup_rescan_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1965,7 +1952,7 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	u32 max_active = fs_info-&gt;thread_pool_size;</div><div class='ctx'> 	unsigned int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND;</div><div class='del'>-	unsigned int ordered_flags = WQ_MEM_RECLAIM | WQ_FREEZABLE;</div><div class='add'>+	unsigned int ordered_flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_PERCPU;</div><div class='ctx'> </div><div class='ctx'> 	fs_info-&gt;workers =</div><div class='ctx'> 		btrfs_alloc_workqueue(fs_info, "worker", flags, max_active, 16);</div><div class='hunk'>@@ -1992,8 +1979,6 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	fs_info-&gt;endio_write_workers =</div><div class='ctx'> 		btrfs_alloc_workqueue(fs_info, "endio-write", flags,</div><div class='ctx'> 				      max_active, 2);</div><div class='del'>-	fs_info-&gt;compressed_write_workers =</div><div class='del'>-		alloc_workqueue("btrfs-compressed-write", flags, max_active);</div><div class='ctx'> 	fs_info-&gt;endio_freespace_worker =</div><div class='ctx'> 		btrfs_alloc_workqueue(fs_info, "freespace-write", flags,</div><div class='ctx'> 				      max_active, 0);</div><div class='hunk'>@@ -2004,12 +1989,11 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		btrfs_alloc_ordered_workqueue(fs_info, "qgroup-rescan",</div><div class='ctx'> 					      ordered_flags);</div><div class='ctx'> 	fs_info-&gt;discard_ctl.discard_workers =</div><div class='del'>-		alloc_ordered_workqueue("btrfs_discard", WQ_FREEZABLE);</div><div class='add'>+		alloc_ordered_workqueue("btrfs-discard", WQ_FREEZABLE);</div><div class='ctx'> </div><div class='ctx'> 	if (!(fs_info-&gt;workers &amp;&amp;</div><div class='ctx'> 	      fs_info-&gt;delalloc_workers &amp;&amp; fs_info-&gt;flush_workers &amp;&amp;</div><div class='ctx'> 	      fs_info-&gt;endio_workers &amp;&amp; fs_info-&gt;endio_meta_workers &amp;&amp;</div><div class='del'>-	      fs_info-&gt;compressed_write_workers &amp;&amp;</div><div class='ctx'> 	      fs_info-&gt;endio_write_workers &amp;&amp;</div><div class='ctx'> 	      fs_info-&gt;endio_freespace_worker &amp;&amp; fs_info-&gt;rmw_workers &amp;&amp;</div><div class='ctx'> 	      fs_info-&gt;caching_workers &amp;&amp; fs_info-&gt;fixup_workers &amp;&amp;</div><div class='hunk'>@@ -2036,14 +2020,10 @@ static int btrfs_init_csum_hash(struct btrfs_fs_info *fs_info, u16 csum_type)</div><div class='ctx'> </div><div class='ctx'> 	fs_info-&gt;csum_shash = csum_shash;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check if the checksum implementation is a fast accelerated one.</div><div class='del'>-	 * As-is this is a bit of a hack and should be replaced once the csum</div><div class='del'>-	 * implementations provide that information themselves.</div><div class='del'>-	 */</div><div class='add'>+	/* Check if the checksum implementation is a fast accelerated one. */</div><div class='ctx'> 	switch (csum_type) {</div><div class='ctx'> 	case BTRFS_CSUM_TYPE_CRC32:</div><div class='del'>-		if (!strstr(crypto_shash_driver_name(csum_shash), "generic"))</div><div class='add'>+		if (crc32_optimizations() &amp; CRC32C_OPTIMIZATION)</div><div class='ctx'> 			set_bit(BTRFS_FS_CSUM_IMPL_FAST, &amp;fs_info-&gt;flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_CSUM_TYPE_XXHASH:</div><div class='hunk'>@@ -2069,7 +2049,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	u64 bytenr = btrfs_super_log_root(disk_super);</div><div class='ctx'> 	int level = btrfs_super_log_root_level(disk_super);</div><div class='ctx'> </div><div class='del'>-	if (fs_devices-&gt;rw_devices == 0) {</div><div class='add'>+	if (unlikely(fs_devices-&gt;rw_devices == 0)) {</div><div class='ctx'> 		btrfs_warn(fs_info, "log replay required on RO media");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2090,7 +2070,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		btrfs_put_root(log_tree_root);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	if (!extent_buffer_uptodate(log_tree_root-&gt;node)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(log_tree_root-&gt;node))) {</div><div class='ctx'> 		btrfs_err(fs_info, "failed to read log tree");</div><div class='ctx'> 		btrfs_put_root(log_tree_root);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -2098,10 +2078,10 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	/* returns with log_tree_root freed on success */</div><div class='ctx'> 	ret = btrfs_recover_log_trees(log_tree_root);</div><div class='add'>+	btrfs_put_root(log_tree_root);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_handle_fs_error(fs_info, ret,</div><div class='ctx'> 				      "Failed to recover log tree");</div><div class='del'>-		btrfs_put_root(log_tree_root);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2132,7 +2112,7 @@ static int load_global_roots_objectid(struct btrfs_root *tree_root,</div><div class='ctx'> 	/* If we have IGNOREDATACSUMS skip loading these roots. */</div><div class='ctx'> 	if (objectid == BTRFS_CSUM_TREE_OBJECTID &amp;&amp;</div><div class='ctx'> 	    btrfs_test_opt(fs_info, IGNOREDATACSUMS)) {</div><div class='del'>-		set_bit(BTRFS_FS_STATE_NO_CSUMS, &amp;fs_info-&gt;fs_state);</div><div class='add'>+		set_bit(BTRFS_FS_STATE_NO_DATA_CSUMS, &amp;fs_info-&gt;fs_state);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2166,8 +2146,7 @@ static int load_global_roots_objectid(struct btrfs_root *tree_root,</div><div class='ctx'> 		found = true;</div><div class='ctx'> 		root = read_tree_root_path(tree_root, path, &amp;key);</div><div class='ctx'> 		if (IS_ERR(root)) {</div><div class='del'>-			if (!btrfs_test_opt(fs_info, IGNOREBADROOTS))</div><div class='del'>-				ret = PTR_ERR(root);</div><div class='add'>+			ret = PTR_ERR(root);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		set_bit(BTRFS_ROOT_TRACK_DIRTY, &amp;root-&gt;state);</div><div class='hunk'>@@ -2185,7 +2164,7 @@ static int load_global_roots_objectid(struct btrfs_root *tree_root,</div><div class='ctx'> </div><div class='ctx'> 	if (!found || ret) {</div><div class='ctx'> 		if (objectid == BTRFS_CSUM_TREE_OBJECTID)</div><div class='del'>-			set_bit(BTRFS_FS_STATE_NO_CSUMS, &amp;fs_info-&gt;fs_state);</div><div class='add'>+			set_bit(BTRFS_FS_STATE_NO_DATA_CSUMS, &amp;fs_info-&gt;fs_state);</div><div class='ctx'> </div><div class='ctx'> 		if (!btrfs_test_opt(fs_info, IGNOREBADROOTS))</div><div class='ctx'> 			ret = ret ? ret : -ENOENT;</div><div class='hunk'>@@ -2198,8 +2177,8 @@ static int load_global_roots_objectid(struct btrfs_root *tree_root,</div><div class='ctx'> </div><div class='ctx'> static int load_global_roots(struct btrfs_root *tree_root)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -2208,18 +2187,17 @@ static int load_global_roots(struct btrfs_root *tree_root)</div><div class='ctx'> 	ret = load_global_roots_objectid(tree_root, path,</div><div class='ctx'> 					 BTRFS_EXTENT_TREE_OBJECTID, "extent");</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = load_global_roots_objectid(tree_root, path,</div><div class='ctx'> 					 BTRFS_CSUM_TREE_OBJECTID, "csum");</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (!btrfs_fs_compat_ro(tree_root-&gt;fs_info, FREE_SPACE_TREE))</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = load_global_roots_objectid(tree_root, path,</div><div class='ctx'> 					 BTRFS_FREE_SPACE_TREE_OBJECTID,</div><div class='ctx'> 					 "free space");</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2230,7 +2208,7 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!fs_info-&gt;tree_root);</div><div class='add'>+	ASSERT(fs_info-&gt;tree_root);</div><div class='ctx'> </div><div class='ctx'> 	ret = load_global_roots(tree_root);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2326,6 +2304,71 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int validate_sys_chunk_array(const struct btrfs_fs_info *fs_info,</div><div class='add'>+				    const struct btrfs_super_block *sb)</div><div class='add'>+{</div><div class='add'>+	unsigned int cur = 0; /* Offset inside the sys chunk array */</div><div class='add'>+	/*</div><div class='add'>+	 * At sb read time, fs_info is not fully initialized. Thus we have</div><div class='add'>+	 * to use super block sectorsize, which should have been validated.</div><div class='add'>+	 */</div><div class='add'>+	const u32 sectorsize = btrfs_super_sectorsize(sb);</div><div class='add'>+	u32 sys_array_size = btrfs_super_sys_array_size(sb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(sys_array_size &gt; BTRFS_SYSTEM_CHUNK_ARRAY_SIZE)) {</div><div class='add'>+		btrfs_err(fs_info, "system chunk array too big %u &gt; %u",</div><div class='add'>+			  sys_array_size, BTRFS_SYSTEM_CHUNK_ARRAY_SIZE);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (cur &lt; sys_array_size) {</div><div class='add'>+		struct btrfs_disk_key *disk_key;</div><div class='add'>+		struct btrfs_chunk *chunk;</div><div class='add'>+		struct btrfs_key key;</div><div class='add'>+		u64 type;</div><div class='add'>+		u16 num_stripes;</div><div class='add'>+		u32 len;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		disk_key = (struct btrfs_disk_key *)(sb-&gt;sys_chunk_array + cur);</div><div class='add'>+		len = sizeof(*disk_key);</div><div class='add'>+</div><div class='add'>+		if (unlikely(cur + len &gt; sys_array_size))</div><div class='add'>+			goto short_read;</div><div class='add'>+		cur += len;</div><div class='add'>+</div><div class='add'>+		btrfs_disk_key_to_cpu(&amp;key, disk_key);</div><div class='add'>+		if (unlikely(key.type != BTRFS_CHUNK_ITEM_KEY)) {</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+			    "unexpected item type %u in sys_array at offset %u",</div><div class='add'>+				  key.type, cur);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+		chunk = (struct btrfs_chunk *)(sb-&gt;sys_chunk_array + cur);</div><div class='add'>+		num_stripes = btrfs_stack_chunk_num_stripes(chunk);</div><div class='add'>+		if (unlikely(cur + btrfs_chunk_item_size(num_stripes) &gt; sys_array_size))</div><div class='add'>+			goto short_read;</div><div class='add'>+		type = btrfs_stack_chunk_type(chunk);</div><div class='add'>+		if (unlikely(!(type &amp; BTRFS_BLOCK_GROUP_SYSTEM))) {</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+			"invalid chunk type %llu in sys_array at offset %u",</div><div class='add'>+				  type, cur);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+		ret = btrfs_check_chunk_valid(fs_info, NULL, chunk, key.offset,</div><div class='add'>+					      sectorsize);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		cur += btrfs_chunk_item_size(num_stripes);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+short_read:</div><div class='add'>+	btrfs_err(fs_info,</div><div class='add'>+	"super block sys chunk array short read, cur=%u sys_array_size=%u",</div><div class='add'>+		  cur, sys_array_size);</div><div class='add'>+	return -EUCLEAN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Real super block validation</div><div class='ctx'>  * NOTE: super csum type and incompat features will not be checked here.</div><div class='hunk'>@@ -2336,21 +2379,29 @@ out:</div><div class='ctx'>  * 		1, 2	2nd and 3rd backup copy</div><div class='ctx'>  * 	       -1	skip bytenr check</div><div class='ctx'>  */</div><div class='del'>-int btrfs_validate_super(struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct btrfs_super_block *sb, int mirror_num)</div><div class='add'>+int btrfs_validate_super(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			 const struct btrfs_super_block *sb, int mirror_num)</div><div class='ctx'> {</div><div class='ctx'> 	u64 nodesize = btrfs_super_nodesize(sb);</div><div class='ctx'> 	u64 sectorsize = btrfs_super_sectorsize(sb);</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	const bool ignore_flags = btrfs_test_opt(fs_info, IGNORESUPERFLAGS);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_super_magic(sb) != BTRFS_MAGIC) {</div><div class='ctx'> 		btrfs_err(fs_info, "no valid FS found");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (btrfs_super_flags(sb) &amp; ~BTRFS_SUPER_FLAG_SUPP) {</div><div class='del'>-		btrfs_err(fs_info, "unrecognized or unsupported super flag: %llu",</div><div class='del'>-				btrfs_super_flags(sb) &amp; ~BTRFS_SUPER_FLAG_SUPP);</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	if ((btrfs_super_flags(sb) &amp; ~BTRFS_SUPER_FLAG_SUPP)) {</div><div class='add'>+		if (!ignore_flags) {</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+			"unrecognized or unsupported super flag 0x%llx",</div><div class='add'>+				  btrfs_super_flags(sb) &amp; ~BTRFS_SUPER_FLAG_SUPP);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			btrfs_info(fs_info,</div><div class='add'>+			"unrecognized or unsupported super flags: 0x%llx, ignored",</div><div class='add'>+				   btrfs_super_flags(sb) &amp; ~BTRFS_SUPER_FLAG_SUPP);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (btrfs_super_root_level(sb) &gt;= BTRFS_MAX_LEVEL) {</div><div class='ctx'> 		btrfs_err(fs_info, "tree_root level too big: %d &gt;= %d",</div><div class='hunk'>@@ -2372,21 +2423,13 @@ int btrfs_validate_super(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * Check sectorsize and nodesize first, other check will need it.</div><div class='ctx'> 	 * Check all possible sectorsize(4K, 8K, 16K, 32K, 64K) here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_power_of_2(sectorsize) || sectorsize &lt; 4096 ||</div><div class='add'>+	if (!is_power_of_2(sectorsize) || sectorsize &lt; BTRFS_MIN_BLOCKSIZE ||</div><div class='ctx'> 	    sectorsize &gt; BTRFS_MAX_METADATA_BLOCKSIZE) {</div><div class='ctx'> 		btrfs_err(fs_info, "invalid sectorsize %llu", sectorsize);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We only support at most two sectorsizes: 4K and PAGE_SIZE.</div><div class='del'>-	 *</div><div class='del'>-	 * We can support 16K sectorsize with 64K page size without problem,</div><div class='del'>-	 * but such sectorsize/pagesize combination doesn't make much sense.</div><div class='del'>-	 * 4K will be our future standard, PAGE_SIZE is supported from the very</div><div class='del'>-	 * beginning.</div><div class='del'>-	 */</div><div class='del'>-	if (sectorsize &gt; PAGE_SIZE || (sectorsize != SZ_4K &amp;&amp; sectorsize != PAGE_SIZE)) {</div><div class='add'>+	if (!btrfs_supported_blocksize(sectorsize)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			"sectorsize %llu not yet supported for page size %lu",</div><div class='ctx'> 			sectorsize, PAGE_SIZE);</div><div class='hunk'>@@ -2453,7 +2496,7 @@ int btrfs_validate_super(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	    (!btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID) ||</div><div class='ctx'> 	     !btrfs_fs_incompat(fs_info, NO_HOLES))) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='del'>-		"block-group-tree feature requires fres-space-tree and no-holes");</div><div class='add'>+		"block-group-tree feature requires free-space-tree and no-holes");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2486,6 +2529,11 @@ int btrfs_validate_super(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = validate_sys_chunk_array(fs_info, sb);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Obvious sys_chunk_array corruptions, it must hold at least one key</div><div class='ctx'> 	 * and one chunk</div><div class='hunk'>@@ -2548,13 +2596,13 @@ static int btrfs_validate_write_super(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	ret = btrfs_validate_super(fs_info, sb, -1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (!btrfs_supported_super_csum(btrfs_super_csum_type(sb))) {</div><div class='add'>+	if (unlikely(!btrfs_supported_super_csum(btrfs_super_csum_type(sb)))) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_err(fs_info, "invalid csum type, has %u want %u",</div><div class='ctx'> 			  btrfs_super_csum_type(sb), BTRFS_CSUM_TYPE_CRC32);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (btrfs_super_incompat_flags(sb) &amp; ~BTRFS_FEATURE_INCOMPAT_SUPP) {</div><div class='add'>+	if (unlikely(btrfs_super_incompat_flags(sb) &amp; ~BTRFS_FEATURE_INCOMPAT_SUPP)) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 		"invalid incompat flags, has 0x%llx valid mask 0x%llx",</div><div class='hunk'>@@ -2574,7 +2622,7 @@ static int load_super_root(struct btrfs_root *root, u64 bytenr, u64 gen, int lev</div><div class='ctx'> 	struct btrfs_tree_parent_check check = {</div><div class='ctx'> 		.level = level,</div><div class='ctx'> 		.transid = gen,</div><div class='del'>-		.owner_root = root-&gt;root_key.objectid</div><div class='add'>+		.owner_root = btrfs_root_id(root)</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2584,7 +2632,7 @@ static int load_super_root(struct btrfs_root *root, u64 bytenr, u64 gen, int lev</div><div class='ctx'> 		root-&gt;node = NULL;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	if (!extent_buffer_uptodate(root-&gt;node)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(root-&gt;node))) {</div><div class='ctx'> 		free_extent_buffer(root-&gt;node);</div><div class='ctx'> 		root-&gt;node = NULL;</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -2688,10 +2736,21 @@ static int __cold init_tree_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Lockdep gets confused between our buffer_tree which requires IRQ locking because</div><div class='add'>+ * we modify marks in the IRQ context, and our delayed inode xarray which doesn't</div><div class='add'>+ * have these requirements. Use a class key so lockdep doesn't get them mixed up.</div><div class='add'>+ */</div><div class='add'>+static struct lock_class_key buffer_xa_class;</div><div class='add'>+</div><div class='ctx'> void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_RADIX_TREE(&amp;fs_info-&gt;fs_roots_radix, GFP_ATOMIC);</div><div class='del'>-	INIT_RADIX_TREE(&amp;fs_info-&gt;buffer_radix, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	/* Use the same flags as mapping-&gt;i_pages. */</div><div class='add'>+	xa_init_flags(&amp;fs_info-&gt;buffer_tree, XA_FLAGS_LOCK_IRQ | XA_FLAGS_ACCOUNT);</div><div class='add'>+	lockdep_set_class(&amp;fs_info-&gt;buffer_tree.xa_lock, &amp;buffer_xa_class);</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fs_info-&gt;trans_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fs_info-&gt;dead_roots);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fs_info-&gt;delayed_iputs);</div><div class='hunk'>@@ -2703,7 +2762,6 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	spin_lock_init(&amp;fs_info-&gt;delayed_iput_lock);</div><div class='ctx'> 	spin_lock_init(&amp;fs_info-&gt;defrag_inodes_lock);</div><div class='ctx'> 	spin_lock_init(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	spin_lock_init(&amp;fs_info-&gt;buffer_lock);</div><div class='ctx'> 	spin_lock_init(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 	spin_lock_init(&amp;fs_info-&gt;treelog_bg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='hunk'>@@ -2748,6 +2806,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 			     BTRFS_BLOCK_RSV_GLOBAL);</div><div class='ctx'> 	btrfs_init_block_rsv(&amp;fs_info-&gt;trans_block_rsv, BTRFS_BLOCK_RSV_TRANS);</div><div class='ctx'> 	btrfs_init_block_rsv(&amp;fs_info-&gt;chunk_block_rsv, BTRFS_BLOCK_RSV_CHUNK);</div><div class='add'>+	btrfs_init_block_rsv(&amp;fs_info-&gt;treelog_rsv, BTRFS_BLOCK_RSV_TREELOG);</div><div class='ctx'> 	btrfs_init_block_rsv(&amp;fs_info-&gt;empty_block_rsv, BTRFS_BLOCK_RSV_EMPTY);</div><div class='ctx'> 	btrfs_init_block_rsv(&amp;fs_info-&gt;delayed_block_rsv,</div><div class='ctx'> 			     BTRFS_BLOCK_RSV_DELOPS);</div><div class='hunk'>@@ -2776,12 +2835,13 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_init_scrub(fs_info);</div><div class='ctx'> 	btrfs_init_balance(fs_info);</div><div class='ctx'> 	btrfs_init_async_reclaim_work(fs_info);</div><div class='add'>+	btrfs_init_extent_map_shrinker_work(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	rwlock_init(&amp;fs_info-&gt;block_group_cache_lock);</div><div class='ctx'> 	fs_info-&gt;block_group_cache_tree = RB_ROOT_CACHED;</div><div class='ctx'> </div><div class='del'>-	extent_io_tree_init(fs_info, &amp;fs_info-&gt;excluded_extents,</div><div class='del'>-			    IO_TREE_FS_EXCLUDED_EXTENTS);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;fs_info-&gt;excluded_extents,</div><div class='add'>+				  IO_TREE_FS_EXCLUDED_EXTENTS);</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;fs_info-&gt;ordered_operations_mutex);</div><div class='ctx'> 	mutex_init(&amp;fs_info-&gt;tree_log_mutex);</div><div class='hunk'>@@ -2830,6 +2890,7 @@ static int init_mount_fs_info(struct btrfs_fs_info *fs_info, struct super_block</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	fs_info-&gt;sb = sb;</div><div class='add'>+	/* Temporary fixed values for block size until we read the superblock. */</div><div class='ctx'> 	sb-&gt;s_blocksize = BTRFS_BDEV_BLOCKSIZE;</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = blksize_bits(BTRFS_BDEV_BLOCKSIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -2837,10 +2898,18 @@ static int init_mount_fs_info(struct btrfs_fs_info *fs_info, struct super_block</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = percpu_counter_init(&amp;fs_info-&gt;evictable_extent_maps, 0, GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = percpu_counter_init(&amp;fs_info-&gt;dirty_metadata_bytes, 0, GFP_KERNEL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = percpu_counter_init(&amp;fs_info-&gt;stats_read_blocks, 0, GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	fs_info-&gt;dirty_metadata_batch = PAGE_SIZE *</div><div class='ctx'> 					(1 + ilog2(nr_cpu_ids));</div><div class='ctx'> </div><div class='hunk'>@@ -2861,6 +2930,8 @@ static int init_mount_fs_info(struct btrfs_fs_info *fs_info, struct super_block</div><div class='ctx'> </div><div class='ctx'> 	if (sb_rdonly(sb))</div><div class='ctx'> 		set_bit(BTRFS_FS_STATE_RO, &amp;fs_info-&gt;fs_state);</div><div class='add'>+	if (btrfs_test_opt(fs_info, IGNOREMETACSUMS))</div><div class='add'>+		set_bit(BTRFS_FS_STATE_SKIP_META_CSUMS, &amp;fs_info-&gt;fs_state);</div><div class='ctx'> </div><div class='ctx'> 	return btrfs_alloc_stripe_hash_table(fs_info);</div><div class='ctx'> }</div><div class='hunk'>@@ -2906,22 +2977,22 @@ static int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	u64 root_objectid = 0;</div><div class='ctx'> 	struct btrfs_root *gang[8];</div><div class='del'>-	int i = 0;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned int ret = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='add'>+		unsigned int found;</div><div class='add'>+</div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='del'>-		ret = radix_tree_gang_lookup(&amp;fs_info-&gt;fs_roots_radix,</div><div class='add'>+		found = radix_tree_gang_lookup(&amp;fs_info-&gt;fs_roots_radix,</div><div class='ctx'> 					     (void **)gang, root_objectid,</div><div class='ctx'> 					     ARRAY_SIZE(gang));</div><div class='del'>-		if (!ret) {</div><div class='add'>+		if (!found) {</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		root_objectid = gang[ret - 1]-&gt;root_key.objectid + 1;</div><div class='add'>+		root_objectid = btrfs_root_id(gang[found - 1]) + 1;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ret; i++) {</div><div class='add'>+		for (int i = 0; i &lt; found; i++) {</div><div class='ctx'> 			/* Avoid to grab roots in dead_roots. */</div><div class='ctx'> 			if (btrfs_root_refs(&amp;gang[i]-&gt;root_item) == 0) {</div><div class='ctx'> 				gang[i] = NULL;</div><div class='hunk'>@@ -2932,24 +3003,25 @@ static int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ret; i++) {</div><div class='add'>+		for (int i = 0; i &lt; found; i++) {</div><div class='ctx'> 			if (!gang[i])</div><div class='ctx'> 				continue;</div><div class='del'>-			root_objectid = gang[i]-&gt;root_key.objectid;</div><div class='del'>-			err = btrfs_orphan_cleanup(gang[i]);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+			root_objectid = btrfs_root_id(gang[i]);</div><div class='add'>+			/*</div><div class='add'>+			 * Continue to release the remaining roots after the first</div><div class='add'>+			 * error without cleanup and preserve the first error</div><div class='add'>+			 * for the return.</div><div class='add'>+			 */</div><div class='add'>+			if (!ret)</div><div class='add'>+				ret = btrfs_orphan_cleanup(gang[i]);</div><div class='ctx'> 			btrfs_put_root(gang[i]);</div><div class='ctx'> 		}</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		root_objectid++;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	/* Release the uncleaned roots due to error. */</div><div class='del'>-	for (; i &lt; ret; i++) {</div><div class='del'>-		if (gang[i])</div><div class='del'>-			btrfs_put_root(gang[i]);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3161,13 +3233,13 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Subpage runtime limitation on v1 cache.</div><div class='add'>+	 * Subpage/bs &gt; ps runtime limitation on v1 cache.</div><div class='ctx'> 	 *</div><div class='del'>-	 * V1 space cache still has some hard codeed PAGE_SIZE usage, while</div><div class='add'>+	 * V1 space cache still has some hard coded PAGE_SIZE usage, while</div><div class='ctx'> 	 * we're already defaulting to v2 cache, no need to bother v1 as it's</div><div class='ctx'> 	 * going to be deprecated anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	if (fs_info-&gt;sectorsize &lt; PAGE_SIZE &amp;&amp; btrfs_test_opt(fs_info, SPACE_CACHE)) {</div><div class='add'>+	if (fs_info-&gt;sectorsize != PAGE_SIZE &amp;&amp; btrfs_test_opt(fs_info, SPACE_CACHE)) {</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 	"v1 space cache is not supported for page size %lu with sectorsize %u",</div><div class='ctx'> 			   PAGE_SIZE, fs_info-&gt;sectorsize);</div><div class='hunk'>@@ -3182,8 +3254,7 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices,</div><div class='del'>-		      char *options)</div><div class='add'>+int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices)</div><div class='ctx'> {</div><div class='ctx'> 	u32 sectorsize;</div><div class='ctx'> 	u32 nodesize;</div><div class='hunk'>@@ -3222,7 +3293,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read super block and check the signature bytes only</div><div class='ctx'> 	 */</div><div class='del'>-	disk_super = btrfs_read_dev_super(fs_devices-&gt;latest_dev-&gt;bdev);</div><div class='add'>+	disk_super = btrfs_read_disk_super(fs_devices-&gt;latest_dev-&gt;bdev, 0, false);</div><div class='ctx'> 	if (IS_ERR(disk_super)) {</div><div class='ctx'> 		ret = PTR_ERR(disk_super);</div><div class='ctx'> 		goto fail_alloc;</div><div class='hunk'>@@ -3299,11 +3370,19 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device</div><div class='ctx'> 	fs_info-&gt;delalloc_batch = sectorsize * 512 * (1 + ilog2(nr_cpu_ids));</div><div class='ctx'> </div><div class='ctx'> 	fs_info-&gt;nodesize = nodesize;</div><div class='add'>+	fs_info-&gt;nodesize_bits = ilog2(nodesize);</div><div class='ctx'> 	fs_info-&gt;sectorsize = sectorsize;</div><div class='ctx'> 	fs_info-&gt;sectorsize_bits = ilog2(sectorsize);</div><div class='add'>+	fs_info-&gt;block_min_order = ilog2(round_up(sectorsize, PAGE_SIZE) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	fs_info-&gt;block_max_order = ilog2((BITS_PER_LONG &lt;&lt; fs_info-&gt;sectorsize_bits) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	fs_info-&gt;csums_per_leaf = BTRFS_MAX_ITEM_SIZE(fs_info) / fs_info-&gt;csum_size;</div><div class='ctx'> 	fs_info-&gt;stripesize = stripesize;</div><div class='add'>+	fs_info-&gt;fs_devices-&gt;fs_info = fs_info;</div><div class='ctx'> </div><div class='add'>+	if (fs_info-&gt;sectorsize &gt; PAGE_SIZE)</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='add'>+			   "support for block size %u with page size %lu is experimental, some features may be missing",</div><div class='add'>+			   fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Handle the space caching options appropriately now that we have the</div><div class='ctx'> 	 * super block loaded and validated.</div><div class='hunk'>@@ -3325,21 +3404,9 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device</div><div class='ctx'> 	 */</div><div class='ctx'> 	fs_info-&gt;max_inline = min_t(u64, fs_info-&gt;max_inline, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='del'>-	if (sectorsize &lt; PAGE_SIZE) {</div><div class='del'>-		struct btrfs_subpage_info *subpage_info;</div><div class='del'>-</div><div class='del'>-		btrfs_warn(fs_info,</div><div class='del'>-		"read-write for sector size %u with page size %lu is experimental",</div><div class='del'>-			   sectorsize, PAGE_SIZE);</div><div class='del'>-		subpage_info = kzalloc(sizeof(*subpage_info), GFP_KERNEL);</div><div class='del'>-		if (!subpage_info) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto fail_alloc;</div><div class='del'>-		}</div><div class='del'>-		btrfs_init_subpage_info(subpage_info, sectorsize);</div><div class='del'>-		fs_info-&gt;subpage_info = subpage_info;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	ret = btrfs_alloc_compress_wsm(fs_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_sb_buffer;</div><div class='ctx'> 	ret = btrfs_init_workqueues(fs_info);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail_sb_buffer;</div><div class='hunk'>@@ -3347,6 +3414,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device</div><div class='ctx'> 	sb-&gt;s_bdi-&gt;ra_pages *= btrfs_super_num_devices(disk_super);</div><div class='ctx'> 	sb-&gt;s_bdi-&gt;ra_pages = max(sb-&gt;s_bdi-&gt;ra_pages, SZ_4M / PAGE_SIZE);</div><div class='ctx'> </div><div class='add'>+	/* Update the values for the current filesystem. */</div><div class='ctx'> 	sb-&gt;s_blocksize = sectorsize;</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = blksize_bits(sectorsize);</div><div class='ctx'> 	memcpy(&amp;sb-&gt;s_uuid, fs_info-&gt;fs_devices-&gt;fsid, BTRFS_FSID_SIZE);</div><div class='hunk'>@@ -3386,7 +3454,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device</div><div class='ctx'> 	 * below in btrfs_init_dev_replace().</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_free_extra_devids(fs_devices);</div><div class='del'>-	if (!fs_devices-&gt;latest_dev-&gt;bdev) {</div><div class='add'>+	if (unlikely(!fs_devices-&gt;latest_dev-&gt;bdev)) {</div><div class='ctx'> 		btrfs_err(fs_info, "failed to read devices");</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto fail_tree_roots;</div><div class='hunk'>@@ -3477,6 +3545,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device</div><div class='ctx'> 		goto fail_sysfs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	btrfs_zoned_reserve_data_reloc_bg(fs_info);</div><div class='ctx'> 	btrfs_free_zone_cache(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_check_active_zone_reservation(fs_info);</div><div class='hunk'>@@ -3597,7 +3666,6 @@ fail_alloc:</div><div class='ctx'> </div><div class='ctx'> 	iput(fs_info-&gt;btree_inode);</div><div class='ctx'> fail:</div><div class='del'>-	btrfs_close_devices(fs_info-&gt;fs_devices);</div><div class='ctx'> 	ASSERT(ret &lt; 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3606,142 +3674,62 @@ ALLOW_ERROR_INJECTION(open_ctree, ERRNO);</div><div class='ctx'> static void btrfs_end_super_write(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_device *device = bio-&gt;bi_private;</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		page = bvec-&gt;bv_page;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> </div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='ctx'> 		if (bio-&gt;bi_status) {</div><div class='del'>-			btrfs_warn_rl_in_rcu(device-&gt;fs_info,</div><div class='del'>-				"lost page write due to IO error on %s (%d)",</div><div class='add'>+			btrfs_warn_rl(device-&gt;fs_info,</div><div class='add'>+				"lost super block write due to IO error on %s (%d)",</div><div class='ctx'> 				btrfs_dev_name(device),</div><div class='ctx'> 				blk_status_to_errno(bio-&gt;bi_status));</div><div class='del'>-			ClearPageUptodate(page);</div><div class='del'>-			SetPageError(page);</div><div class='ctx'> 			btrfs_dev_stat_inc_and_print(device,</div><div class='ctx'> 						     BTRFS_DEV_STAT_WRITE_ERRS);</div><div class='del'>-		} else {</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+			/* Ensure failure if the primary sb fails. */</div><div class='add'>+			if (bio-&gt;bi_opf &amp; REQ_FUA)</div><div class='add'>+				atomic_add(BTRFS_SUPER_PRIMARY_WRITE_ERROR,</div><div class='add'>+					   &amp;device-&gt;sb_write_errors);</div><div class='add'>+			else</div><div class='add'>+				atomic_inc(&amp;device-&gt;sb_write_errors);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		put_page(page);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(fi.folio);</div><div class='add'>+		folio_put(fi.folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct btrfs_super_block *btrfs_read_dev_one_super(struct block_device *bdev,</div><div class='del'>-						   int copy_num, bool drop_cache)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_super_block *super;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u64 bytenr, bytenr_orig;</div><div class='del'>-	struct address_space *mapping = bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bytenr_orig = btrfs_sb_offset(copy_num);</div><div class='del'>-	ret = btrfs_sb_log_location_bdev(bdev, copy_num, READ, &amp;bytenr);</div><div class='del'>-	if (ret == -ENOENT)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	else if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	if (bytenr + BTRFS_SUPER_INFO_SIZE &gt;= bdev_nr_bytes(bdev))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	if (drop_cache) {</div><div class='del'>-		/* This should only be called with the primary sb. */</div><div class='del'>-		ASSERT(copy_num == 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Drop the page of the primary superblock, so later read will</div><div class='del'>-		 * always read from the device.</div><div class='del'>-		 */</div><div class='del'>-		invalidate_inode_pages2_range(mapping,</div><div class='del'>-				bytenr &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				(bytenr + BTRFS_SUPER_INFO_SIZE) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	page = read_cache_page_gfp(mapping, bytenr &gt;&gt; PAGE_SHIFT, GFP_NOFS);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return ERR_CAST(page);</div><div class='del'>-</div><div class='del'>-	super = page_address(page);</div><div class='del'>-	if (btrfs_super_magic(super) != BTRFS_MAGIC) {</div><div class='del'>-		btrfs_release_disk_super(super);</div><div class='del'>-		return ERR_PTR(-ENODATA);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btrfs_super_bytenr(super) != bytenr_orig) {</div><div class='del'>-		btrfs_release_disk_super(super);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return super;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct btrfs_super_block *btrfs_read_dev_super(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_super_block *super, *latest = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	u64 transid = 0;</div><div class='del'>-</div><div class='del'>-	/* we would like to check all the supers, but that would make</div><div class='del'>-	 * a btrfs mount succeed after a mkfs from a different FS.</div><div class='del'>-	 * So, we need to add a special mount option to scan for</div><div class='del'>-	 * later supers, using BTRFS_SUPER_MIRROR_MAX instead</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; 1; i++) {</div><div class='del'>-		super = btrfs_read_dev_one_super(bdev, i, false);</div><div class='del'>-		if (IS_ERR(super))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!latest || btrfs_super_generation(super) &gt; transid) {</div><div class='del'>-			if (latest)</div><div class='del'>-				btrfs_release_disk_super(super);</div><div class='del'>-</div><div class='del'>-			latest = super;</div><div class='del'>-			transid = btrfs_super_generation(super);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return super;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Write superblock @sb to the @device. Do not wait for completion, all the</div><div class='del'>- * pages we use for writing are locked.</div><div class='add'>+ * folios we use for writing are locked.</div><div class='ctx'>  *</div><div class='ctx'>  * Write @max_mirrors copies of the superblock, where 0 means default that fit</div><div class='ctx'>  * the expected device size at commit time. Note that max_mirrors must be</div><div class='ctx'>  * same for write and wait phases.</div><div class='ctx'>  *</div><div class='del'>- * Return number of errors when page is not found or submission fails.</div><div class='add'>+ * Return number of errors when folio is not found or submission fails.</div><div class='ctx'>  */</div><div class='ctx'> static int write_dev_supers(struct btrfs_device *device,</div><div class='ctx'> 			    struct btrfs_super_block *sb, int max_mirrors)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = device-&gt;fs_info;</div><div class='del'>-	struct address_space *mapping = device-&gt;bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *mapping = device-&gt;bdev-&gt;bd_mapping;</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, fs_info-&gt;csum_shash);</div><div class='ctx'> 	int i;</div><div class='del'>-	int errors = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 bytenr, bytenr_orig;</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;device-&gt;sb_write_errors, 0);</div><div class='add'>+</div><div class='ctx'> 	if (max_mirrors == 0)</div><div class='ctx'> 		max_mirrors = BTRFS_SUPER_MIRROR_MAX;</div><div class='ctx'> </div><div class='ctx'> 	shash-&gt;tfm = fs_info-&gt;csum_shash;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_mirrors; i++) {</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		struct bio *bio;</div><div class='ctx'> 		struct btrfs_super_block *disk_super;</div><div class='add'>+		size_t offset;</div><div class='ctx'> </div><div class='ctx'> 		bytenr_orig = btrfs_sb_offset(i);</div><div class='ctx'> 		ret = btrfs_sb_log_location(device, i, WRITE, &amp;bytenr);</div><div class='hunk'>@@ -3749,9 +3737,9 @@ static int write_dev_supers(struct btrfs_device *device,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		} else if (ret &lt; 0) {</div><div class='ctx'> 			btrfs_err(device-&gt;fs_info,</div><div class='del'>-				"couldn't get super block location for mirror %d",</div><div class='del'>-				i);</div><div class='del'>-			errors++;</div><div class='add'>+			  "couldn't get super block location for mirror %d error %d",</div><div class='add'>+			  i, ret);</div><div class='add'>+			atomic_inc(&amp;device-&gt;sb_write_errors);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (bytenr + BTRFS_SUPER_INFO_SIZE &gt;=</div><div class='hunk'>@@ -3764,20 +3752,19 @@ static int write_dev_supers(struct btrfs_device *device,</div><div class='ctx'> 				    BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE,</div><div class='ctx'> 				    sb-&gt;csum);</div><div class='ctx'> </div><div class='del'>-		page = find_or_create_page(mapping, bytenr &gt;&gt; PAGE_SHIFT,</div><div class='del'>-					   GFP_NOFS);</div><div class='del'>-		if (!page) {</div><div class='add'>+		folio = __filemap_get_folio(mapping, bytenr &gt;&gt; PAGE_SHIFT,</div><div class='add'>+					    FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					    GFP_NOFS);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='ctx'> 			btrfs_err(device-&gt;fs_info,</div><div class='del'>-			    "couldn't get super block page for bytenr %llu",</div><div class='del'>-			    bytenr);</div><div class='del'>-			errors++;</div><div class='add'>+			  "couldn't get super block page for bytenr %llu error %ld",</div><div class='add'>+			  bytenr, PTR_ERR(folio));</div><div class='add'>+			atomic_inc(&amp;device-&gt;sb_write_errors);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Bump the refcount for wait_dev_supers() */</div><div class='del'>-		get_page(page);</div><div class='del'>-</div><div class='del'>-		disk_super = page_address(page);</div><div class='add'>+		offset = offset_in_folio(folio, bytenr);</div><div class='add'>+		disk_super = folio_address(folio) + offset;</div><div class='ctx'> 		memcpy(disk_super, sb, BTRFS_SUPER_INFO_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3791,8 +3778,7 @@ static int write_dev_supers(struct btrfs_device *device,</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = bytenr &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 		bio-&gt;bi_private = device;</div><div class='ctx'> 		bio-&gt;bi_end_io = btrfs_end_super_write;</div><div class='del'>-		__bio_add_page(bio, page, BTRFS_SUPER_INFO_SIZE,</div><div class='del'>-			       offset_in_page(bytenr));</div><div class='add'>+		bio_add_folio_nofail(bio, folio, BTRFS_SUPER_INFO_SIZE, offset);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We FUA only the first super block.  The others we allow to</div><div class='hunk'>@@ -3804,17 +3790,17 @@ static int write_dev_supers(struct btrfs_device *device,</div><div class='ctx'> 		submit_bio(bio);</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_advance_sb_log(device, i))</div><div class='del'>-			errors++;</div><div class='add'>+			atomic_inc(&amp;device-&gt;sb_write_errors);</div><div class='ctx'> 	}</div><div class='del'>-	return errors &lt; i ? 0 : -1;</div><div class='add'>+	return atomic_read(&amp;device-&gt;sb_write_errors) &lt; i ? 0 : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Wait for write completion of superblocks done by write_dev_supers,</div><div class='ctx'>  * @max_mirrors same for write and wait phases.</div><div class='ctx'>  *</div><div class='del'>- * Return number of errors when page is not found or not marked up to</div><div class='del'>- * date.</div><div class='add'>+ * Return -1 if primary super block write failed or when there were no super block</div><div class='add'>+ * copies written. Otherwise 0.</div><div class='ctx'>  */</div><div class='ctx'> static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)</div><div class='ctx'> {</div><div class='hunk'>@@ -3828,7 +3814,7 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)</div><div class='ctx'> 		max_mirrors = BTRFS_SUPER_MIRROR_MAX;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_mirrors; i++) {</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_sb_log_location(device, i, READ, &amp;bytenr);</div><div class='ctx'> 		if (ret == -ENOENT) {</div><div class='hunk'>@@ -3843,30 +3829,20 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors)</div><div class='ctx'> 		    device-&gt;commit_total_bytes)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		page = find_get_page(device-&gt;bdev-&gt;bd_inode-&gt;i_mapping,</div><div class='del'>-				     bytenr &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		if (!page) {</div><div class='del'>-			errors++;</div><div class='del'>-			if (i == 0)</div><div class='del'>-				primary_failed = true;</div><div class='add'>+		folio = filemap_get_folio(device-&gt;bdev-&gt;bd_mapping,</div><div class='add'>+					  bytenr &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		/* If the folio has been removed, then we know it completed. */</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='del'>-		/* Page is submitted locked and unlocked once the IO completes */</div><div class='del'>-		wait_on_page_locked(page);</div><div class='del'>-		if (PageError(page)) {</div><div class='del'>-			errors++;</div><div class='del'>-			if (i == 0)</div><div class='del'>-				primary_failed = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Drop our reference */</div><div class='del'>-		put_page(page);</div><div class='ctx'> </div><div class='del'>-		/* Drop the reference from the writing run */</div><div class='del'>-		put_page(page);</div><div class='add'>+		/* Folio will be unlocked once the write completes. */</div><div class='add'>+		folio_wait_locked(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* log error, force error return */</div><div class='add'>+	errors += atomic_read(&amp;device-&gt;sb_write_errors);</div><div class='add'>+	if (errors &gt;= BTRFS_SUPER_PRIMARY_WRITE_ERROR)</div><div class='add'>+		primary_failed = true;</div><div class='ctx'> 	if (primary_failed) {</div><div class='ctx'> 		btrfs_err(device-&gt;fs_info, "error writing primary super block to device %llu",</div><div class='ctx'> 			  device-&gt;devid);</div><div class='hunk'>@@ -3972,7 +3948,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info)</div><div class='ctx'> 	 * Checks last_flush_error of disks in order to determine the device</div><div class='ctx'> 	 * state.</div><div class='ctx'> 	 */</div><div class='del'>-	if (errors_wait &amp;&amp; !btrfs_check_rw_degradable(info, NULL))</div><div class='add'>+	if (unlikely(errors_wait &amp;&amp; !btrfs_check_rw_degradable(info, NULL)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4000,7 +3976,7 @@ int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (min_tolerated == INT_MAX) {</div><div class='del'>-		pr_warn("BTRFS: unknown raid flag: %llu", flags);</div><div class='add'>+		btrfs_warn(NULL, "unknown raid flag: %llu", flags);</div><div class='ctx'> 		min_tolerated = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4074,7 +4050,7 @@ int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors)</div><div class='ctx'> 		btrfs_set_super_flags(sb, flags | BTRFS_HEADER_FLAG_WRITTEN);</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_validate_write_super(fs_info, sb);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> 			btrfs_handle_fs_error(fs_info, -EUCLEAN,</div><div class='ctx'> 				"unexpected superblock corruption detected");</div><div class='hunk'>@@ -4085,7 +4061,7 @@ int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			total_errors++;</div><div class='ctx'> 	}</div><div class='del'>-	if (total_errors &gt; max_errors) {</div><div class='add'>+	if (unlikely(total_errors &gt; max_errors)) {</div><div class='ctx'> 		btrfs_err(fs_info, "%d errors while writing supers",</div><div class='ctx'> 			  total_errors);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='hunk'>@@ -4110,7 +4086,7 @@ int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors)</div><div class='ctx'> 			total_errors++;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='del'>-	if (total_errors &gt; max_errors) {</div><div class='add'>+	if (unlikely(total_errors &gt; max_errors)) {</div><div class='ctx'> 		btrfs_handle_fs_error(fs_info, -EIO,</div><div class='ctx'> 				      "%d errors while writing supers",</div><div class='ctx'> 				      total_errors);</div><div class='hunk'>@@ -4127,7 +4103,7 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> 	radix_tree_delete(&amp;fs_info-&gt;fs_roots_radix,</div><div class='del'>-			  (unsigned long)root-&gt;root_key.objectid);</div><div class='add'>+			  (unsigned long)btrfs_root_id(root));</div><div class='ctx'> 	if (test_and_clear_bit(BTRFS_ROOT_IN_RADIX, &amp;root-&gt;state))</div><div class='ctx'> 		drop_ref = true;</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='hunk'>@@ -4146,9 +4122,6 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> int btrfs_commit_super(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='ctx'> 	btrfs_run_delayed_iputs(fs_info);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='hunk'>@@ -4158,10 +4131,7 @@ int btrfs_commit_super(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	down_write(&amp;fs_info-&gt;cleanup_work_sem);</div><div class='ctx'> 	up_write(&amp;fs_info-&gt;cleanup_work_sem);</div><div class='ctx'> </div><div class='del'>-	trans = btrfs_join_transaction(root);</div><div class='del'>-	if (IS_ERR(trans))</div><div class='del'>-		return PTR_ERR(trans);</div><div class='del'>-	return btrfs_commit_transaction(trans);</div><div class='add'>+	return btrfs_commit_current_transaction(fs_info-&gt;tree_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void warn_about_uncommitted_trans(struct btrfs_fs_info *fs_info)</div><div class='hunk'>@@ -4170,9 +4140,6 @@ static void warn_about_uncommitted_trans(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_transaction *tmp;</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;fs_info-&gt;trans_list))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function is only called at the very end of close_ctree(),</div><div class='ctx'> 	 * thus no other running transaction, no need to take trans_lock.</div><div class='hunk'>@@ -4186,15 +4153,16 @@ static void warn_about_uncommitted_trans(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		u64 found_end;</div><div class='ctx'> </div><div class='ctx'> 		found = true;</div><div class='del'>-		while (find_first_extent_bit(&amp;trans-&gt;dirty_pages, cur,</div><div class='del'>-			&amp;found_start, &amp;found_end, EXTENT_DIRTY, &amp;cached)) {</div><div class='add'>+		while (btrfs_find_first_extent_bit(&amp;trans-&gt;dirty_pages, cur,</div><div class='add'>+						   &amp;found_start, &amp;found_end,</div><div class='add'>+						   EXTENT_DIRTY, &amp;cached)) {</div><div class='ctx'> 			dirty_bytes += found_end + 1 - found_start;</div><div class='ctx'> 			cur = found_end + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 	"transaction %llu (with %llu dirty metadata bytes) is not committed",</div><div class='ctx'> 			   trans-&gt;transid, dirty_bytes);</div><div class='del'>-		btrfs_cleanup_one_transaction(trans, fs_info);</div><div class='add'>+		btrfs_cleanup_one_transaction(trans);</div><div class='ctx'> </div><div class='ctx'> 		if (trans == fs_info-&gt;running_transaction)</div><div class='ctx'> 			fs_info-&gt;running_transaction = NULL;</div><div class='hunk'>@@ -4264,6 +4232,59 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_cleanup_defrag_inodes(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Handle the error fs first, as it will flush and wait for all ordered</div><div class='add'>+	 * extents.  This will generate delayed iputs, thus we want to handle</div><div class='add'>+	 * it first.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(BTRFS_FS_ERROR(fs_info)))</div><div class='add'>+		btrfs_error_commit_super(fs_info);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for any fixup workers to complete.</div><div class='add'>+	 * If we don't wait for them here and they are still running by the time</div><div class='add'>+	 * we call kthread_stop() against the cleaner kthread further below, we</div><div class='add'>+	 * get an use-after-free on the cleaner because the fixup worker adds an</div><div class='add'>+	 * inode to the list of delayed iputs and then attempts to wakeup the</div><div class='add'>+	 * cleaner kthread, which was already stopped and destroyed. We parked</div><div class='add'>+	 * already the cleaner, but below we run all pending delayed iputs.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_flush_workqueue(fs_info-&gt;fixup_workers);</div><div class='add'>+	/*</div><div class='add'>+	 * Similar case here, we have to wait for delalloc workers before we</div><div class='add'>+	 * proceed below and stop the cleaner kthread, otherwise we trigger a</div><div class='add'>+	 * use-after-tree on the cleaner kthread task_struct when a delalloc</div><div class='add'>+	 * worker running submit_compressed_extents() adds a delayed iput, which</div><div class='add'>+	 * does a wake up on the cleaner kthread, which was already freed below</div><div class='add'>+	 * when we call kthread_stop().</div><div class='add'>+	 */</div><div class='add'>+	btrfs_flush_workqueue(fs_info-&gt;delalloc_workers);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can have ordered extents getting their last reference dropped from</div><div class='add'>+	 * the fs_info-&gt;workers queue because for async writes for data bios we</div><div class='add'>+	 * queue a work for that queue, at btrfs_wq_submit_bio(), that runs</div><div class='add'>+	 * run_one_async_done() which calls btrfs_bio_end_io() in case the bio</div><div class='add'>+	 * has an error, and that later function can do the final</div><div class='add'>+	 * btrfs_put_ordered_extent() on the ordered extent attached to the bio,</div><div class='add'>+	 * which adds a delayed iput for the inode. So we must flush the queue</div><div class='add'>+	 * so that we don't have delayed iputs after committing the current</div><div class='add'>+	 * transaction below and stopping the cleaner and transaction kthreads.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_flush_workqueue(fs_info-&gt;workers);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When finishing a compressed write bio we schedule a work queue item</div><div class='add'>+	 * to finish an ordered extent - end_bbio_compressed_write()</div><div class='add'>+	 * calls btrfs_finish_ordered_extent() which in turns does a call to</div><div class='add'>+	 * btrfs_queue_ordered_fn(), and that queues the ordered extent</div><div class='add'>+	 * completion either in the endio_write_workers work queue or in the</div><div class='add'>+	 * fs_info-&gt;endio_freespace_worker work queue. We flush those queues</div><div class='add'>+	 * below, so before we flush them we must flush this queue for the</div><div class='add'>+	 * workers of compressed writes.</div><div class='add'>+	 */</div><div class='add'>+	flush_workqueue(fs_info-&gt;endio_workers);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * After we parked the cleaner kthread, ordered extents may have</div><div class='ctx'> 	 * completed and created new delayed iputs. If one of the async reclaim</div><div class='ctx'> 	 * tasks is running and in the RUN_DELAYED_IPUTS flush state, then we</div><div class='hunk'>@@ -4274,8 +4295,8 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * So wait for all ongoing ordered extents to complete and then run</div><div class='ctx'> 	 * delayed iputs. This works because once we reach this point no one</div><div class='del'>-	 * can either create new ordered extents nor create delayed iputs</div><div class='del'>-	 * through some other means.</div><div class='add'>+	 * can create new ordered extents, but delayed iputs can still be added</div><div class='add'>+	 * by a reclaim worker (see comments further below).</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Also note that btrfs_wait_ordered_roots() is not safe here, because</div><div class='ctx'> 	 * it waits for BTRFS_ORDERED_COMPLETE to be set on an ordered extent,</div><div class='hunk'>@@ -4286,11 +4307,28 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_flush_workqueue(fs_info-&gt;endio_write_workers);</div><div class='ctx'> 	/* Ordered extents for free space inodes. */</div><div class='ctx'> 	btrfs_flush_workqueue(fs_info-&gt;endio_freespace_worker);</div><div class='add'>+	/*</div><div class='add'>+	 * Run delayed iputs in case an async reclaim worker is waiting for them</div><div class='add'>+	 * to be run as mentioned above.</div><div class='add'>+	 */</div><div class='ctx'> 	btrfs_run_delayed_iputs(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;fs_info-&gt;async_reclaim_work);</div><div class='ctx'> 	cancel_work_sync(&amp;fs_info-&gt;async_data_reclaim_work);</div><div class='ctx'> 	cancel_work_sync(&amp;fs_info-&gt;preempt_reclaim_work);</div><div class='add'>+	cancel_work_sync(&amp;fs_info-&gt;em_shrinker_work);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Run delayed iputs again because an async reclaim worker may have</div><div class='add'>+	 * added new ones if it was flushing delalloc:</div><div class='add'>+	 *</div><div class='add'>+	 * shrink_delalloc() -&gt; btrfs_start_delalloc_roots() -&gt;</div><div class='add'>+	 *    start_delalloc_inodes() -&gt; btrfs_add_delayed_iput()</div><div class='add'>+	 */</div><div class='add'>+	btrfs_run_delayed_iputs(fs_info);</div><div class='add'>+</div><div class='add'>+	/* There should be no more workload to generate new delayed iputs. */</div><div class='add'>+	set_bit(BTRFS_FS_STATE_NO_DELAYED_IPUT, &amp;fs_info-&gt;fs_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Cancel or finish ongoing discard work */</div><div class='ctx'> 	btrfs_discard_cleanup(fs_info);</div><div class='hunk'>@@ -4320,9 +4358,6 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 			btrfs_err(fs_info, "commit super ret %d", ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (BTRFS_FS_ERROR(fs_info))</div><div class='del'>-		btrfs_error_commit_super(fs_info);</div><div class='del'>-</div><div class='ctx'> 	kthread_stop(fs_info-&gt;transaction_kthread);</div><div class='ctx'> 	kthread_stop(fs_info-&gt;cleaner_kthread);</div><div class='ctx'> </div><div class='hunk'>@@ -4330,7 +4365,7 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	set_bit(BTRFS_FS_CLOSING_DONE, &amp;fs_info-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_check_quota_leak(fs_info)) {</div><div class='del'>-		WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='add'>+		DEBUG_WARN("qgroup reserved space leaked");</div><div class='ctx'> 		btrfs_err(fs_info, "qgroup reserved space leaked");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4377,7 +4412,6 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	iput(fs_info-&gt;btree_inode);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_mapping_tree_free(fs_info);</div><div class='del'>-	btrfs_close_devices(fs_info-&gt;fs_devices);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_mark_buffer_dirty(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -4445,10 +4479,6 @@ static void btrfs_error_commit_super(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	/* cleanup FS via transaction */</div><div class='ctx'> 	btrfs_cleanup_transaction(fs_info);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='del'>-	btrfs_run_delayed_iputs(fs_info);</div><div class='del'>-	mutex_unlock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='del'>-</div><div class='ctx'> 	down_write(&amp;fs_info-&gt;cleanup_work_sem);</div><div class='ctx'> 	up_write(&amp;fs_info-&gt;cleanup_work_sem);</div><div class='ctx'> }</div><div class='hunk'>@@ -4472,7 +4502,7 @@ static void btrfs_drop_all_logs(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		for (i = 0; i &lt; ret; i++) {</div><div class='ctx'> 			if (!gang[i])</div><div class='ctx'> 				continue;</div><div class='del'>-			root_objectid = gang[i]-&gt;root_key.objectid;</div><div class='add'>+			root_objectid = btrfs_root_id(gang[i]);</div><div class='ctx'> 			btrfs_free_log(NULL, gang[i]);</div><div class='ctx'> 			btrfs_put_root(gang[i]);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4525,84 +4555,7 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	 * extents that haven't had their dirty pages IO start writeout yet</div><div class='ctx'> 	 * actually get run and error out properly.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,</div><div class='del'>-				       struct btrfs_fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *node;</div><div class='del'>-	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='del'>-	struct btrfs_delayed_ref_node *ref;</div><div class='del'>-</div><div class='del'>-	delayed_refs = &amp;trans-&gt;delayed_refs;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	if (atomic_read(&amp;delayed_refs-&gt;num_entries) == 0) {</div><div class='del'>-		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-		btrfs_debug(fs_info, "delayed_refs has NO entry");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((node = rb_first_cached(&amp;delayed_refs-&gt;href_root)) != NULL) {</div><div class='del'>-		struct btrfs_delayed_ref_head *head;</div><div class='del'>-		struct rb_node *n;</div><div class='del'>-		bool pin_bytes = false;</div><div class='del'>-</div><div class='del'>-		head = rb_entry(node, struct btrfs_delayed_ref_head,</div><div class='del'>-				href_node);</div><div class='del'>-		if (btrfs_delayed_ref_lock(delayed_refs, head))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;head-&gt;lock);</div><div class='del'>-		while ((n = rb_first_cached(&amp;head-&gt;ref_tree)) != NULL) {</div><div class='del'>-			ref = rb_entry(n, struct btrfs_delayed_ref_node,</div><div class='del'>-				       ref_node);</div><div class='del'>-			rb_erase_cached(&amp;ref-&gt;ref_node, &amp;head-&gt;ref_tree);</div><div class='del'>-			RB_CLEAR_NODE(&amp;ref-&gt;ref_node);</div><div class='del'>-			if (!list_empty(&amp;ref-&gt;add_list))</div><div class='del'>-				list_del(&amp;ref-&gt;add_list);</div><div class='del'>-			atomic_dec(&amp;delayed_refs-&gt;num_entries);</div><div class='del'>-			btrfs_put_delayed_ref(ref);</div><div class='del'>-			btrfs_delayed_refs_rsv_release(fs_info, 1, 0);</div><div class='del'>-		}</div><div class='del'>-		if (head-&gt;must_insert_reserved)</div><div class='del'>-			pin_bytes = true;</div><div class='del'>-		btrfs_free_delayed_extent_op(head-&gt;extent_op);</div><div class='del'>-		btrfs_delete_ref_head(delayed_refs, head);</div><div class='del'>-		spin_unlock(&amp;head-&gt;lock);</div><div class='del'>-		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-		mutex_unlock(&amp;head-&gt;mutex);</div><div class='del'>-</div><div class='del'>-		if (pin_bytes) {</div><div class='del'>-			struct btrfs_block_group *cache;</div><div class='del'>-</div><div class='del'>-			cache = btrfs_lookup_block_group(fs_info, head-&gt;bytenr);</div><div class='del'>-			BUG_ON(!cache);</div><div class='del'>-</div><div class='del'>-			spin_lock(&amp;cache-&gt;space_info-&gt;lock);</div><div class='del'>-			spin_lock(&amp;cache-&gt;lock);</div><div class='del'>-			cache-&gt;pinned += head-&gt;num_bytes;</div><div class='del'>-			btrfs_space_info_update_bytes_pinned(fs_info,</div><div class='del'>-				cache-&gt;space_info, head-&gt;num_bytes);</div><div class='del'>-			cache-&gt;reserved -= head-&gt;num_bytes;</div><div class='del'>-			cache-&gt;space_info-&gt;bytes_reserved -= head-&gt;num_bytes;</div><div class='del'>-			spin_unlock(&amp;cache-&gt;lock);</div><div class='del'>-			spin_unlock(&amp;cache-&gt;space_info-&gt;lock);</div><div class='del'>-</div><div class='del'>-			btrfs_put_block_group(cache);</div><div class='del'>-</div><div class='del'>-			btrfs_error_unpin_extent_range(fs_info, head-&gt;bytenr,</div><div class='del'>-				head-&gt;bytenr + head-&gt;num_bytes - 1);</div><div class='del'>-		}</div><div class='del'>-		btrfs_cleanup_ref_head_accounting(fs_info, delayed_refs, head);</div><div class='del'>-		btrfs_put_delayed_ref_head(head);</div><div class='del'>-		cond_resched();</div><div class='del'>-		spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-	btrfs_qgroup_destroy_extent_records(trans);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)</div><div class='hunk'>@@ -4617,7 +4570,7 @@ static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)</div><div class='ctx'> 		struct inode *inode = NULL;</div><div class='ctx'> 		btrfs_inode = list_first_entry(&amp;splice, struct btrfs_inode,</div><div class='ctx'> 					       delalloc_inodes);</div><div class='del'>-		__btrfs_del_delalloc_inode(root, btrfs_inode);</div><div class='add'>+		btrfs_del_delalloc_inode(btrfs_inode);</div><div class='ctx'> 		spin_unlock(&amp;root-&gt;delalloc_lock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -4668,9 +4621,9 @@ static void btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	u64 start = 0;</div><div class='ctx'> 	u64 end;</div><div class='ctx'> </div><div class='del'>-	while (find_first_extent_bit(dirty_pages, start, &amp;start, &amp;end,</div><div class='del'>-				     mark, NULL)) {</div><div class='del'>-		clear_extent_bits(dirty_pages, start, end, mark);</div><div class='add'>+	while (btrfs_find_first_extent_bit(dirty_pages, start, &amp;start, &amp;end,</div><div class='add'>+					   mark, NULL)) {</div><div class='add'>+		btrfs_clear_extent_bit(dirty_pages, start, end, mark, NULL);</div><div class='ctx'> 		while (start &lt;= end) {</div><div class='ctx'> 			eb = find_extent_buffer(fs_info, start);</div><div class='ctx'> 			start += fs_info-&gt;nodesize;</div><div class='hunk'>@@ -4703,14 +4656,14 @@ static void btrfs_destroy_pinned_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		 * the same extent range.</div><div class='ctx'> 		 */</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='del'>-		if (!find_first_extent_bit(unpin, 0, &amp;start, &amp;end,</div><div class='del'>-					   EXTENT_DIRTY, &amp;cached_state)) {</div><div class='add'>+		if (!btrfs_find_first_extent_bit(unpin, 0, &amp;start, &amp;end,</div><div class='add'>+						 EXTENT_DIRTY, &amp;cached_state)) {</div><div class='ctx'> 			mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		clear_extent_dirty(unpin, start, end, &amp;cached_state);</div><div class='del'>-		free_extent_state(cached_state);</div><div class='add'>+		btrfs_clear_extent_dirty(unpin, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='ctx'> 		btrfs_error_unpin_extent_range(fs_info, start, end);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -4803,16 +4756,16 @@ static void btrfs_free_all_qgroup_pertrans(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 			btrfs_qgroup_free_meta_all_pertrans(root);</div><div class='ctx'> 			radix_tree_tag_clear(&amp;fs_info-&gt;fs_roots_radix,</div><div class='del'>-					(unsigned long)root-&gt;root_key.objectid,</div><div class='add'>+					(unsigned long)btrfs_root_id(root),</div><div class='ctx'> 					BTRFS_ROOT_TRANS_TAG);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,</div><div class='del'>-				   struct btrfs_fs_info *fs_info)</div><div class='add'>+void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = cur_trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_device *dev, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_cleanup_dirty_bgs(cur_trans, fs_info);</div><div class='hunk'>@@ -4824,7 +4777,7 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,</div><div class='ctx'> 		list_del_init(&amp;dev-&gt;post_commit_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_destroy_delayed_refs(cur_trans, fs_info);</div><div class='add'>+	btrfs_destroy_delayed_refs(cur_trans);</div><div class='ctx'> </div><div class='ctx'> 	cur_trans-&gt;state = TRANS_STATE_COMMIT_START;</div><div class='ctx'> 	wake_up(&amp;fs_info-&gt;transaction_blocked_wait);</div><div class='hunk'>@@ -4832,14 +4785,10 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,</div><div class='ctx'> 	cur_trans-&gt;state = TRANS_STATE_UNBLOCKED;</div><div class='ctx'> 	wake_up(&amp;fs_info-&gt;transaction_wait);</div><div class='ctx'> </div><div class='del'>-	btrfs_destroy_delayed_inodes(fs_info);</div><div class='del'>-</div><div class='ctx'> 	btrfs_destroy_marked_extents(fs_info, &amp;cur_trans-&gt;dirty_pages,</div><div class='ctx'> 				     EXTENT_DIRTY);</div><div class='ctx'> 	btrfs_destroy_pinned_extent(fs_info, &amp;cur_trans-&gt;pinned_extents);</div><div class='ctx'> </div><div class='del'>-	btrfs_free_all_qgroup_pertrans(fs_info);</div><div class='del'>-</div><div class='ctx'> 	cur_trans-&gt;state =TRANS_STATE_COMPLETED;</div><div class='ctx'> 	wake_up(&amp;cur_trans-&gt;commit_wait);</div><div class='ctx'> }</div><div class='hunk'>@@ -4874,7 +4823,7 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> 		}</div><div class='del'>-		btrfs_cleanup_one_transaction(t, fs_info);</div><div class='add'>+		btrfs_cleanup_one_transaction(t);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> 		if (t == fs_info-&gt;running_transaction)</div><div class='hunk'>@@ -4892,6 +4841,7 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_assert_delayed_root_empty(fs_info);</div><div class='ctx'> 	btrfs_destroy_all_delalloc_inodes(fs_info);</div><div class='ctx'> 	btrfs_drop_all_logs(fs_info);</div><div class='add'>+	btrfs_free_all_qgroup_pertrans(fs_info);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;transaction_kthread_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4899,7 +4849,7 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> int btrfs_init_root_free_objectid(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='ctx'> 	struct btrfs_key search_key;</div><div class='hunk'>@@ -4915,8 +4865,14 @@ int btrfs_init_root_free_objectid(struct btrfs_root *root)</div><div class='ctx'> 	search_key.offset = (u64)-1;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;search_key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	BUG_ON(ret == 0); /* Corruption */</div><div class='add'>+		return ret;</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist a root</div><div class='add'>+		 * with such id, but this is out of valid range.</div><div class='add'>+		 */</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> 	if (path-&gt;slots[0] &gt; 0) {</div><div class='ctx'> 		slot = path-&gt;slots[0] - 1;</div><div class='ctx'> 		l = path-&gt;nodes[0];</div><div class='hunk'>@@ -4926,10 +4882,8 @@ int btrfs_init_root_free_objectid(struct btrfs_root *root)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		root-&gt;free_objectid = BTRFS_FIRST_FREE_OBJECTID;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-error:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_get_free_objectid(struct btrfs_root *root, u64 *objectid)</div><div class='hunk'>@@ -4940,7 +4894,7 @@ int btrfs_get_free_objectid(struct btrfs_root *root, u64 *objectid)</div><div class='ctx'> 	if (unlikely(root-&gt;free_objectid &gt;= BTRFS_LAST_FREE_OBJECTID)) {</div><div class='ctx'> 		btrfs_warn(root-&gt;fs_info,</div><div class='ctx'> 			   "the objectid of root %llu reaches its highest value",</div><div class='del'>-			   root-&gt;root_key.objectid);</div><div class='add'>+			   btrfs_root_id(root));</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h<br/>index 9413726b329b..5320da83d0cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/disk-io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/disk-io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/disk-io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/disk-io.h</a></div><div class='hunk'>@@ -6,6 +6,23 @@</div><div class='ctx'> #ifndef BTRFS_DISK_IO_H</div><div class='ctx'> #define BTRFS_DISK_IO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+#include "ctree.h"</div><div class='add'>+#include "bio.h"</div><div class='add'>+#include "ordered-data.h"</div><div class='add'>+</div><div class='add'>+struct block_device;</div><div class='add'>+struct super_block;</div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_device;</div><div class='add'>+struct btrfs_fs_devices;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_super_block;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_tree_parent_check;</div><div class='add'>+struct btrfs_transaction;</div><div class='add'>+</div><div class='ctx'> #define BTRFS_SUPER_MIRROR_MAX	 3</div><div class='ctx'> #define BTRFS_SUPER_MIRROR_SHIFT 12</div><div class='ctx'> </div><div class='hunk'>@@ -25,11 +42,7 @@ static inline u64 btrfs_sb_offset(int mirror)</div><div class='ctx'> 	return BTRFS_SUPER_INFO_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct btrfs_device;</div><div class='del'>-struct btrfs_fs_devices;</div><div class='del'>-struct btrfs_tree_parent_check;</div><div class='del'>-</div><div class='del'>-void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info);</div><div class='add'>+void btrfs_check_leaked_roots(const struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_init_fs_info(struct btrfs_fs_info *fs_info);</div><div class='ctx'> struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,</div><div class='ctx'> 				      struct btrfs_tree_parent_check *check);</div><div class='hunk'>@@ -40,20 +53,15 @@ struct extent_buffer *btrfs_find_create_tree_block(</div><div class='ctx'> int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			   const struct btrfs_super_block *disk_sb);</div><div class='del'>-int __cold open_ctree(struct super_block *sb,</div><div class='del'>-	       struct btrfs_fs_devices *fs_devices,</div><div class='del'>-	       char *options);</div><div class='add'>+int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devices);</div><div class='ctx'> void __cold close_ctree(struct btrfs_fs_info *fs_info);</div><div class='del'>-int btrfs_validate_super(struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct btrfs_super_block *sb, int mirror_num);</div><div class='add'>+int btrfs_validate_super(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			 const struct btrfs_super_block *sb, int mirror_num);</div><div class='ctx'> int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount);</div><div class='ctx'> int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors);</div><div class='del'>-struct btrfs_super_block *btrfs_read_dev_super(struct block_device *bdev);</div><div class='del'>-struct btrfs_super_block *btrfs_read_dev_one_super(struct block_device *bdev,</div><div class='del'>-						   int copy_num, bool drop_cache);</div><div class='ctx'> int btrfs_commit_super(struct btrfs_fs_info *fs_info);</div><div class='ctx'> struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,</div><div class='del'>-					struct btrfs_key *key);</div><div class='add'>+					const struct btrfs_key *key);</div><div class='ctx'> int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			 struct btrfs_root *root);</div><div class='ctx'> void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info);</div><div class='hunk'>@@ -61,7 +69,7 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info);</div><div class='ctx'> struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				     u64 objectid, bool check_ref);</div><div class='ctx'> struct btrfs_root *btrfs_get_new_fs_root(struct btrfs_fs_info *fs_info,</div><div class='del'>-					 u64 objectid, dev_t anon_dev);</div><div class='add'>+					 u64 objectid, dev_t *anon_dev);</div><div class='ctx'> struct btrfs_root *btrfs_get_fs_root_commit_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 						 struct btrfs_path *path,</div><div class='ctx'> 						 u64 objectid);</div><div class='hunk'>@@ -71,7 +79,6 @@ struct btrfs_root *btrfs_global_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				     struct btrfs_key *key);</div><div class='ctx'> struct btrfs_root *btrfs_csum_root(struct btrfs_fs_info *fs_info, u64 bytenr);</div><div class='ctx'> struct btrfs_root *btrfs_extent_root(struct btrfs_fs_info *fs_info, u64 bytenr);</div><div class='del'>-struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info);</div><div class='ctx'> </div><div class='ctx'> void btrfs_free_fs_info(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info);</div><div class='hunk'>@@ -79,7 +86,7 @@ void btrfs_btree_balance_dirty_nodelay(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 struct btrfs_root *root);</div><div class='ctx'> int btrfs_validate_extent_buffer(struct extent_buffer *eb,</div><div class='del'>-				 struct btrfs_tree_parent_check *check);</div><div class='add'>+				 const struct btrfs_tree_parent_check *check);</div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> struct btrfs_root *btrfs_alloc_dummy_root(struct btrfs_fs_info *fs_info);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -87,9 +94,6 @@ struct btrfs_root *btrfs_alloc_dummy_root(struct btrfs_fs_info *fs_info);</div><div class='ctx'> /*</div><div class='ctx'>  * This function is used to grab the root, and avoid it is freed when we</div><div class='ctx'>  * access it. But it doesn't ensure that the tree is not dropped.</div><div class='del'>- *</div><div class='del'>- * If you want to ensure the whole tree is safe, you should use</div><div class='del'>- * 	fs_info-&gt;subvol_srcu</div><div class='ctx'>  */</div><div class='ctx'> static inline struct btrfs_root *btrfs_grab_root(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='hunk'>@@ -103,12 +107,11 @@ static inline struct btrfs_root *btrfs_grab_root(struct btrfs_root *root)</div><div class='ctx'> void btrfs_put_root(struct btrfs_root *root);</div><div class='ctx'> void btrfs_mark_buffer_dirty(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct extent_buffer *buf);</div><div class='del'>-int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,</div><div class='del'>-			  int atomic);</div><div class='add'>+int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid, bool atomic);</div><div class='ctx'> int btrfs_read_extent_buffer(struct extent_buffer *buf,</div><div class='del'>-			     struct btrfs_tree_parent_check *check);</div><div class='add'>+			     const struct btrfs_tree_parent_check *check);</div><div class='ctx'> </div><div class='del'>-blk_status_t btree_csum_one_bio(struct btrfs_bio *bbio);</div><div class='add'>+int btree_csum_one_bio(struct btrfs_bio *bbio);</div><div class='ctx'> int btrfs_alloc_log_tree_node(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      struct btrfs_root *root);</div><div class='ctx'> int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -117,8 +120,7 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		       struct btrfs_root *root);</div><div class='ctx'> void btrfs_cleanup_dirty_bgs(struct btrfs_transaction *trans,</div><div class='ctx'> 			     struct btrfs_fs_info *fs_info);</div><div class='del'>-void btrfs_cleanup_one_transaction(struct btrfs_transaction *trans,</div><div class='del'>-				  struct btrfs_fs_info *fs_info);</div><div class='add'>+void btrfs_cleanup_one_transaction(struct btrfs_transaction *trans);</div><div class='ctx'> struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     u64 objectid);</div><div class='ctx'> int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags);</div><div class='head'>diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c<br/>index 744a02b7fd67..230d9326b685 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/export.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "export.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "super.h"</div><div class='hunk'>@@ -24,7 +23,11 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='ctx'> 	if (parent &amp;&amp; (len &lt; BTRFS_FID_SIZE_CONNECTABLE)) {</div><div class='del'>-		*max_len = BTRFS_FID_SIZE_CONNECTABLE;</div><div class='add'>+		if (btrfs_root_id(BTRFS_I(inode)-&gt;root) !=</div><div class='add'>+		    btrfs_root_id(BTRFS_I(parent)-&gt;root))</div><div class='add'>+			*max_len = BTRFS_FID_SIZE_CONNECTABLE_ROOT;</div><div class='add'>+		else</div><div class='add'>+			*max_len = BTRFS_FID_SIZE_CONNECTABLE;</div><div class='ctx'> 		return FILEID_INVALID;</div><div class='ctx'> 	} else if (len &lt; BTRFS_FID_SIZE_NON_CONNECTABLE) {</div><div class='ctx'> 		*max_len = BTRFS_FID_SIZE_NON_CONNECTABLE;</div><div class='hunk'>@@ -35,17 +38,19 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,</div><div class='ctx'> 	type = FILEID_BTRFS_WITHOUT_PARENT;</div><div class='ctx'> </div><div class='ctx'> 	fid-&gt;objectid = btrfs_ino(BTRFS_I(inode));</div><div class='del'>-	fid-&gt;root_objectid = BTRFS_I(inode)-&gt;root-&gt;root_key.objectid;</div><div class='add'>+	fid-&gt;root_objectid = btrfs_root_id(BTRFS_I(inode)-&gt;root);</div><div class='ctx'> 	fid-&gt;gen = inode-&gt;i_generation;</div><div class='ctx'> </div><div class='ctx'> 	if (parent) {</div><div class='ctx'> 		u64 parent_root_id;</div><div class='ctx'> </div><div class='del'>-		fid-&gt;parent_objectid = BTRFS_I(parent)-&gt;location.objectid;</div><div class='add'>+		fid-&gt;parent_objectid = btrfs_ino(BTRFS_I(parent));</div><div class='ctx'> 		fid-&gt;parent_gen = parent-&gt;i_generation;</div><div class='del'>-		parent_root_id = BTRFS_I(parent)-&gt;root-&gt;root_key.objectid;</div><div class='add'>+		parent_root_id = btrfs_root_id(BTRFS_I(parent)-&gt;root);</div><div class='ctx'> </div><div class='ctx'> 		if (parent_root_id != fid-&gt;root_objectid) {</div><div class='add'>+			if (*max_len &lt; BTRFS_FID_SIZE_CONNECTABLE_ROOT)</div><div class='add'>+				return FILEID_INVALID;</div><div class='ctx'> 			fid-&gt;parent_root_objectid = parent_root_id;</div><div class='ctx'> 			len = BTRFS_FID_SIZE_CONNECTABLE_ROOT;</div><div class='ctx'> 			type = FILEID_BTRFS_WITH_PARENT_ROOT;</div><div class='hunk'>@@ -76,7 +81,7 @@ struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	if (objectid &lt; BTRFS_FIRST_FREE_OBJECTID)</div><div class='ctx'> 		return ERR_PTR(-ESTALE);</div><div class='hunk'>@@ -85,17 +90,17 @@ struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,</div><div class='ctx'> 	if (IS_ERR(root))</div><div class='ctx'> 		return ERR_CAST(root);</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(sb, objectid, root);</div><div class='add'>+	inode = btrfs_iget(objectid, root);</div><div class='ctx'> 	btrfs_put_root(root);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return ERR_CAST(inode);</div><div class='ctx'> </div><div class='del'>-	if (generation != 0 &amp;&amp; generation != inode-&gt;i_generation) {</div><div class='del'>-		iput(inode);</div><div class='add'>+	if (generation != 0 &amp;&amp; generation != inode-&gt;vfs_inode.i_generation) {</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 		return ERR_PTR(-ESTALE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return d_obtain_alias(inode);</div><div class='add'>+	return d_obtain_alias(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *btrfs_fh_to_parent(struct super_block *sb, struct fid *fh,</div><div class='hunk'>@@ -146,9 +151,10 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,</div><div class='ctx'> </div><div class='ctx'> struct dentry *btrfs_get_parent(struct dentry *child)</div><div class='ctx'> {</div><div class='del'>-	struct inode *dir = d_inode(child);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='add'>+	struct btrfs_inode *dir = BTRFS_I(d_inode(child));</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	struct btrfs_root *root = dir-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_root_ref *ref;</div><div class='hunk'>@@ -160,13 +166,13 @@ struct dentry *btrfs_get_parent(struct dentry *child)</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_ino(BTRFS_I(dir)) == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='del'>-		key.objectid = root-&gt;root_key.objectid;</div><div class='add'>+	if (btrfs_ino(dir) == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+		key.objectid = btrfs_root_id(root);</div><div class='ctx'> 		key.type = BTRFS_ROOT_BACKREF_KEY;</div><div class='ctx'> 		key.offset = (u64)-1;</div><div class='ctx'> 		root = fs_info-&gt;tree_root;</div><div class='ctx'> 	} else {</div><div class='del'>-		key.objectid = btrfs_ino(BTRFS_I(dir));</div><div class='add'>+		key.objectid = btrfs_ino(dir);</div><div class='ctx'> 		key.type = BTRFS_INODE_REF_KEY;</div><div class='ctx'> 		key.offset = (u64)-1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -174,8 +180,15 @@ struct dentry *btrfs_get_parent(struct dentry *child)</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset of -1 found, there would have to exist an</div><div class='add'>+		 * inode with such number or a root with such id.</div><div class='add'>+		 */</div><div class='add'>+		ret = -EUCLEAN;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(ret == 0); /* Key with offset of -1 found */</div><div class='ctx'> 	if (path-&gt;slots[0] == 0) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -204,7 +217,11 @@ struct dentry *btrfs_get_parent(struct dentry *child)</div><div class='ctx'> 					found_key.offset, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return d_obtain_alias(btrfs_iget(fs_info-&gt;sb, key.objectid, root));</div><div class='add'>+	inode = btrfs_iget(key.objectid, root);</div><div class='add'>+	if (IS_ERR(inode))</div><div class='add'>+		return ERR_CAST(inode);</div><div class='add'>+</div><div class='add'>+	return d_obtain_alias(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> fail:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -213,11 +230,11 @@ fail:</div><div class='ctx'> static int btrfs_get_name(struct dentry *parent, char *name,</div><div class='ctx'> 			  struct dentry *child)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = d_inode(child);</div><div class='del'>-	struct inode *dir = d_inode(parent);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(d_inode(child));</div><div class='add'>+	struct btrfs_inode *dir = BTRFS_I(d_inode(parent));</div><div class='add'>+	struct btrfs_root *root = dir-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_inode_ref *iref;</div><div class='ctx'> 	struct btrfs_root_ref *rref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -227,37 +244,34 @@ static int btrfs_get_name(struct dentry *parent, char *name,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 ino;</div><div class='ctx'> </div><div class='del'>-	if (!S_ISDIR(dir-&gt;i_mode))</div><div class='add'>+	if (!S_ISDIR(dir-&gt;vfs_inode.i_mode))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ino = btrfs_ino(BTRFS_I(inode));</div><div class='add'>+	ino = btrfs_ino(inode);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (ino == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='del'>-		key.objectid = BTRFS_I(inode)-&gt;root-&gt;root_key.objectid;</div><div class='add'>+		key.objectid = btrfs_root_id(inode-&gt;root);</div><div class='ctx'> 		key.type = BTRFS_ROOT_BACKREF_KEY;</div><div class='ctx'> 		key.offset = (u64)-1;</div><div class='ctx'> 		root = fs_info-&gt;tree_root;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		key.objectid = ino;</div><div class='del'>-		key.offset = btrfs_ino(BTRFS_I(dir));</div><div class='ctx'> 		key.type = BTRFS_INODE_REF_KEY;</div><div class='add'>+		key.offset = btrfs_ino(dir);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	} else if (ret &gt; 0) {</div><div class='del'>-		if (ino == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+		if (ino == BTRFS_FIRST_FREE_OBJECTID)</div><div class='ctx'> 			path-&gt;slots[0]--;</div><div class='del'>-		} else {</div><div class='del'>-			btrfs_free_path(path);</div><div class='add'>+		else</div><div class='ctx'> 			return -ENOENT;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> </div><div class='hunk'>@@ -274,7 +288,6 @@ static int btrfs_get_name(struct dentry *parent, char *name,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	read_extent_buffer(leaf, name, name_ptr, name_len);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * have to add the null termination to make sure that reconnect_path</div><div class='head'>diff --git a/fs/btrfs/export.h b/fs/btrfs/export.h<br/>index eba6bc4f5a61..464582273af9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/export.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/export.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/export.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/export.h</a></div><div class='hunk'>@@ -4,6 +4,10 @@</div><div class='ctx'> #define BTRFS_EXPORT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct dentry;</div><div class='add'>+struct super_block;</div><div class='ctx'> </div><div class='ctx'> extern const struct export_operations btrfs_export_ops;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c<br/>index e3ee5449cc4a..bb2ca1c9c7b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-io-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-io-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-io-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent-io-tree.c</a></div><div class='hunk'>@@ -4,9 +4,9 @@</div><div class='ctx'> #include &lt;trace/events/btrfs.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='add'>+#include "extent_io.h"</div><div class='ctx'> #include "extent-io-tree.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='del'>-#include "misc.h"</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *extent_state_cache;</div><div class='ctx'> </div><div class='hunk'>@@ -42,12 +42,14 @@ static inline void btrfs_extent_state_leak_debug_check(void)</div><div class='ctx'> 	struct extent_state *state;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;states)) {</div><div class='del'>-		state = list_entry(states.next, struct extent_state, leak_list);</div><div class='del'>-		pr_err("BTRFS: state leak: start %llu end %llu state %u in tree %d refs %d\n",</div><div class='add'>+		state = list_first_entry(&amp;states, struct extent_state, leak_list);</div><div class='add'>+		btrfs_err(NULL,</div><div class='add'>+		       "state leak: start %llu end %llu state %u in tree %d refs %d",</div><div class='ctx'> 		       state-&gt;start, state-&gt;end, state-&gt;state,</div><div class='ctx'> 		       extent_state_in_tree(state),</div><div class='ctx'> 		       refcount_read(&amp;state-&gt;refs));</div><div class='ctx'> 		list_del(&amp;state-&gt;leak_list);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='ctx'> 		kmem_cache_free(extent_state_cache, state);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -58,13 +60,12 @@ static inline void __btrfs_debug_check_extent_io_range(const char *caller,</div><div class='ctx'> 						       struct extent_io_tree *tree,</div><div class='ctx'> 						       u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-	const struct btrfs_inode *inode;</div><div class='add'>+	const struct btrfs_inode *inode = tree-&gt;inode;</div><div class='ctx'> 	u64 isize;</div><div class='ctx'> </div><div class='ctx'> 	if (tree-&gt;owner != IO_TREE_INODE_IO)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	inode = extent_io_tree_to_inode_const(tree);</div><div class='ctx'> 	isize = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	if (end &gt;= PAGE_SIZE &amp;&amp; (end % 2) == 0 &amp;&amp; end != isize - 1) {</div><div class='ctx'> 		btrfs_debug_rl(inode-&gt;root-&gt;fs_info,</div><div class='hunk'>@@ -79,25 +80,8 @@ static inline void __btrfs_debug_check_extent_io_range(const char *caller,</div><div class='ctx'> #define btrfs_debug_check_extent_io_range(c, s, e)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The only tree allowed to set the inode is IO_TREE_INODE_IO.</div><div class='del'>- */</div><div class='del'>-static bool is_inode_io_tree(const struct extent_io_tree *tree)</div><div class='del'>-{</div><div class='del'>-	return tree-&gt;owner == IO_TREE_INODE_IO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return the inode if it's valid for the given tree, otherwise NULL. */</div><div class='del'>-struct btrfs_inode *extent_io_tree_to_inode(struct extent_io_tree *tree)</div><div class='del'>-{</div><div class='del'>-	if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='del'>-		return tree-&gt;inode;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Read-only access to the inode. */</div><div class='del'>-const struct btrfs_inode *extent_io_tree_to_inode_const(const struct extent_io_tree *tree)</div><div class='add'>+const struct btrfs_inode *btrfs_extent_io_tree_to_inode(const struct extent_io_tree *tree)</div><div class='ctx'> {</div><div class='ctx'> 	if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='ctx'> 		return tree-&gt;inode;</div><div class='hunk'>@@ -105,15 +89,15 @@ const struct btrfs_inode *extent_io_tree_to_inode_const(const struct extent_io_t</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* For read-only access to fs_info. */</div><div class='del'>-const struct btrfs_fs_info *extent_io_tree_to_fs_info(const struct extent_io_tree *tree)</div><div class='add'>+const struct btrfs_fs_info *btrfs_extent_io_tree_to_fs_info(const struct extent_io_tree *tree)</div><div class='ctx'> {</div><div class='ctx'> 	if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='ctx'> 		return tree-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	return tree-&gt;fs_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void extent_io_tree_init(struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct extent_io_tree *tree, unsigned int owner)</div><div class='add'>+void btrfs_extent_io_tree_init(struct btrfs_fs_info *fs_info,</div><div class='add'>+			       struct extent_io_tree *tree, unsigned int owner)</div><div class='ctx'> {</div><div class='ctx'> 	tree-&gt;state = RB_ROOT;</div><div class='ctx'> 	spin_lock_init(&amp;tree-&gt;lock);</div><div class='hunk'>@@ -125,10 +109,10 @@ void extent_io_tree_init(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * Empty an io tree, removing and freeing every extent state record from the</div><div class='ctx'>  * tree. This should be called once we are sure no other task can access the</div><div class='ctx'>  * tree anymore, so no tree updates happen after we empty the tree and there</div><div class='del'>- * aren't any waiters on any extent state record (EXTENT_LOCKED bit is never</div><div class='add'>+ * aren't any waiters on any extent state record (EXTENT_LOCK_BITS are never</div><div class='ctx'>  * set on any extent state when calling this function).</div><div class='ctx'>  */</div><div class='del'>-void extent_io_tree_release(struct extent_io_tree *tree)</div><div class='add'>+void btrfs_extent_io_tree_release(struct extent_io_tree *tree)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_root root;</div><div class='ctx'> 	struct extent_state *state;</div><div class='hunk'>@@ -140,14 +124,14 @@ void extent_io_tree_release(struct extent_io_tree *tree)</div><div class='ctx'> 	rbtree_postorder_for_each_entry_safe(state, tmp, &amp;root, rb_node) {</div><div class='ctx'> 		/* Clear node to keep free_extent_state() happy. */</div><div class='ctx'> 		RB_CLEAR_NODE(&amp;state-&gt;rb_node);</div><div class='del'>-		ASSERT(!(state-&gt;state &amp; EXTENT_LOCKED));</div><div class='add'>+		ASSERT(!(state-&gt;state &amp; EXTENT_LOCK_BITS));</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No need for a memory barrier here, as we are holding the tree</div><div class='ctx'> 		 * lock and we only change the waitqueue while holding that lock</div><div class='ctx'> 		 * (see wait_extent_bit()).</div><div class='ctx'> 		 */</div><div class='ctx'> 		ASSERT(!waitqueue_active(&amp;state-&gt;wq));</div><div class='del'>-		free_extent_state(state);</div><div class='add'>+		btrfs_free_extent_state(state);</div><div class='ctx'> 		cond_resched_lock(&amp;tree-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -175,7 +159,7 @@ static struct extent_state *alloc_extent_state(gfp_t mask)</div><div class='ctx'> 	btrfs_leak_debug_add_state(state);</div><div class='ctx'> 	refcount_set(&amp;state-&gt;refs, 1);</div><div class='ctx'> 	init_waitqueue_head(&amp;state-&gt;wq);</div><div class='del'>-	trace_alloc_extent_state(state, mask, _RET_IP_);</div><div class='add'>+	trace_btrfs_alloc_extent_state(state, mask, _RET_IP_);</div><div class='ctx'> 	return state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,14 +171,14 @@ static struct extent_state *alloc_extent_state_atomic(struct extent_state *preal</div><div class='ctx'> 	return prealloc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void free_extent_state(struct extent_state *state)</div><div class='add'>+void btrfs_free_extent_state(struct extent_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	if (!state)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;state-&gt;refs)) {</div><div class='ctx'> 		WARN_ON(extent_state_in_tree(state));</div><div class='ctx'> 		btrfs_leak_debug_del_state(state);</div><div class='del'>-		trace_free_extent_state(state, _RET_IP_);</div><div class='add'>+		trace_btrfs_free_extent_state(state, _RET_IP_);</div><div class='ctx'> 		kmem_cache_free(extent_state_cache, state);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -221,38 +205,34 @@ static inline struct extent_state *next_state(struct extent_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *next = rb_next(&amp;state-&gt;rb_node);</div><div class='ctx'> </div><div class='del'>-	if (next)</div><div class='del'>-		return rb_entry(next, struct extent_state, rb_node);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='add'>+	return rb_entry_safe(next, struct extent_state, rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct extent_state *prev_state(struct extent_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *next = rb_prev(&amp;state-&gt;rb_node);</div><div class='ctx'> </div><div class='del'>-	if (next)</div><div class='del'>-		return rb_entry(next, struct extent_state, rb_node);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='add'>+	return rb_entry_safe(next, struct extent_state, rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Search @tree for an entry that contains @offset. Such entry would have</div><div class='del'>- * entry-&gt;start &lt;= offset &amp;&amp; entry-&gt;end &gt;= offset.</div><div class='add'>+ * Search @tree for an entry that contains @offset or if none exists for the</div><div class='add'>+ * first entry that starts and ends after that offset.</div><div class='ctx'>  *</div><div class='ctx'>  * @tree:       the tree to search</div><div class='del'>- * @offset:     offset that should fall within an entry in @tree</div><div class='add'>+ * @offset:     search offset</div><div class='ctx'>  * @node_ret:   pointer where new node should be anchored (used when inserting an</div><div class='ctx'>  *	        entry in the tree)</div><div class='ctx'>  * @parent_ret: points to entry which would have been the parent of the entry,</div><div class='ctx'>  *               containing @offset</div><div class='ctx'>  *</div><div class='del'>- * Return a pointer to the entry that contains @offset byte address and don't change</div><div class='del'>- * @node_ret and @parent_ret.</div><div class='add'>+ * Return a pointer to the entry that contains @offset byte address.</div><div class='add'>+ *</div><div class='add'>+ * If no such entry exists, return the first entry that starts and ends after</div><div class='add'>+ * @offset if one exists, otherwise NULL.</div><div class='ctx'>  *</div><div class='del'>- * If no such entry exists, return pointer to entry that ends before @offset</div><div class='del'>- * and fill parameters @node_ret and @parent_ret, ie. does not return NULL.</div><div class='add'>+ * If the returned entry starts at @offset, then @node_ret and @parent_ret</div><div class='add'>+ * aren't changed.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct extent_state *tree_search_for_insert(struct extent_io_tree *tree,</div><div class='ctx'> 							  u64 offset,</div><div class='hunk'>@@ -281,7 +261,11 @@ static inline struct extent_state *tree_search_for_insert(struct extent_io_tree</div><div class='ctx'> 	if (parent_ret)</div><div class='ctx'> 		*parent_ret = prev;</div><div class='ctx'> </div><div class='del'>-	/* Search neighbors until we find the first one past the end */</div><div class='add'>+	/*</div><div class='add'>+	 * Return either the current entry if it contains offset (it ends after</div><div class='add'>+	 * or at offset) or the first entry that starts and ends after offset if</div><div class='add'>+	 * one exists, or NULL.</div><div class='add'>+	 */</div><div class='ctx'> 	while (entry &amp;&amp; offset &gt; entry-&gt;end)</div><div class='ctx'> 		entry = next_state(entry);</div><div class='ctx'> </div><div class='hunk'>@@ -345,12 +329,12 @@ static inline struct extent_state *tree_search(struct extent_io_tree *tree, u64</div><div class='ctx'> 	return tree_search_for_insert(tree, offset, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void extent_io_tree_panic(const struct extent_io_tree *tree,</div><div class='del'>-				 const struct extent_state *state,</div><div class='del'>-				 const char *opname,</div><div class='del'>-				 int err)</div><div class='add'>+static void __cold extent_io_tree_panic(const struct extent_io_tree *tree,</div><div class='add'>+					const struct extent_state *state,</div><div class='add'>+					const char *opname,</div><div class='add'>+					int err)</div><div class='ctx'> {</div><div class='del'>-	btrfs_panic(extent_io_tree_to_fs_info(tree), err,</div><div class='add'>+	btrfs_panic(btrfs_extent_io_tree_to_fs_info(tree), err,</div><div class='ctx'> 		    "extent io tree error on %s state start %llu end %llu",</div><div class='ctx'> 		    opname, state-&gt;start, state-&gt;end);</div><div class='ctx'> }</div><div class='hunk'>@@ -361,13 +345,12 @@ static void merge_prev_state(struct extent_io_tree *tree, struct extent_state *s</div><div class='ctx'> </div><div class='ctx'> 	prev = prev_state(state);</div><div class='ctx'> 	if (prev &amp;&amp; prev-&gt;end == state-&gt;start - 1 &amp;&amp; prev-&gt;state == state-&gt;state) {</div><div class='del'>-		if (is_inode_io_tree(tree))</div><div class='del'>-			btrfs_merge_delalloc_extent(extent_io_tree_to_inode(tree),</div><div class='del'>-						    state, prev);</div><div class='add'>+		if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+			btrfs_merge_delalloc_extent(tree-&gt;inode, state, prev);</div><div class='ctx'> 		state-&gt;start = prev-&gt;start;</div><div class='ctx'> 		rb_erase(&amp;prev-&gt;rb_node, &amp;tree-&gt;state);</div><div class='ctx'> 		RB_CLEAR_NODE(&amp;prev-&gt;rb_node);</div><div class='del'>-		free_extent_state(prev);</div><div class='add'>+		btrfs_free_extent_state(prev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -377,13 +360,12 @@ static void merge_next_state(struct extent_io_tree *tree, struct extent_state *s</div><div class='ctx'> </div><div class='ctx'> 	next = next_state(state);</div><div class='ctx'> 	if (next &amp;&amp; next-&gt;start == state-&gt;end + 1 &amp;&amp; next-&gt;state == state-&gt;state) {</div><div class='del'>-		if (is_inode_io_tree(tree))</div><div class='del'>-			btrfs_merge_delalloc_extent(extent_io_tree_to_inode(tree),</div><div class='del'>-						    state, next);</div><div class='add'>+		if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+			btrfs_merge_delalloc_extent(tree-&gt;inode, state, next);</div><div class='ctx'> 		state-&gt;end = next-&gt;end;</div><div class='ctx'> 		rb_erase(&amp;next-&gt;rb_node, &amp;tree-&gt;state);</div><div class='ctx'> 		RB_CLEAR_NODE(&amp;next-&gt;rb_node);</div><div class='del'>-		free_extent_state(next);</div><div class='add'>+		btrfs_free_extent_state(next);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -398,7 +380,7 @@ static void merge_next_state(struct extent_io_tree *tree, struct extent_state *s</div><div class='ctx'>  */</div><div class='ctx'> static void merge_state(struct extent_io_tree *tree, struct extent_state *state)</div><div class='ctx'> {</div><div class='del'>-	if (state-&gt;state &amp; (EXTENT_LOCKED | EXTENT_BOUNDARY))</div><div class='add'>+	if (state-&gt;state &amp; (EXTENT_LOCK_BITS | EXTENT_BOUNDARY))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	merge_prev_state(tree, state);</div><div class='hunk'>@@ -412,8 +394,8 @@ static void set_state_bits(struct extent_io_tree *tree,</div><div class='ctx'> 	u32 bits_to_set = bits &amp; ~EXTENT_CTLBITS;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (is_inode_io_tree(tree))</div><div class='del'>-		btrfs_set_delalloc_extent(extent_io_tree_to_inode(tree), state, bits);</div><div class='add'>+	if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+		btrfs_set_delalloc_extent(tree-&gt;inode, state, bits);</div><div class='ctx'> </div><div class='ctx'> 	ret = add_extent_changeset(state, bits_to_set, changeset, 1);</div><div class='ctx'> 	BUG_ON(ret &lt; 0);</div><div class='hunk'>@@ -444,7 +426,7 @@ static struct extent_state *insert_state(struct extent_io_tree *tree,</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='ctx'> 	const u64 start = state-&gt;start - 1;</div><div class='ctx'> 	const u64 end = state-&gt;end + 1;</div><div class='del'>-	const bool try_merge = !(bits &amp; (EXTENT_LOCKED | EXTENT_BOUNDARY));</div><div class='add'>+	const bool try_merge = !(bits &amp; (EXTENT_LOCK_BITS | EXTENT_BOUNDARY));</div><div class='ctx'> </div><div class='ctx'> 	set_state_bits(tree, state, bits, changeset);</div><div class='ctx'> </div><div class='hunk'>@@ -458,10 +440,9 @@ static struct extent_state *insert_state(struct extent_io_tree *tree,</div><div class='ctx'> 		if (state-&gt;end &lt; entry-&gt;start) {</div><div class='ctx'> 			if (try_merge &amp;&amp; end == entry-&gt;start &amp;&amp;</div><div class='ctx'> 			    state-&gt;state == entry-&gt;state) {</div><div class='del'>-				if (is_inode_io_tree(tree))</div><div class='del'>-					btrfs_merge_delalloc_extent(</div><div class='del'>-							extent_io_tree_to_inode(tree),</div><div class='del'>-							state, entry);</div><div class='add'>+				if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+					btrfs_merge_delalloc_extent(tree-&gt;inode,</div><div class='add'>+								    state, entry);</div><div class='ctx'> 				entry-&gt;start = state-&gt;start;</div><div class='ctx'> 				merge_prev_state(tree, entry);</div><div class='ctx'> 				state-&gt;state = 0;</div><div class='hunk'>@@ -471,10 +452,9 @@ static struct extent_state *insert_state(struct extent_io_tree *tree,</div><div class='ctx'> 		} else if (state-&gt;end &gt; entry-&gt;end) {</div><div class='ctx'> 			if (try_merge &amp;&amp; entry-&gt;end == start &amp;&amp;</div><div class='ctx'> 			    state-&gt;state == entry-&gt;state) {</div><div class='del'>-				if (is_inode_io_tree(tree))</div><div class='del'>-					btrfs_merge_delalloc_extent(</div><div class='del'>-							extent_io_tree_to_inode(tree),</div><div class='del'>-							state, entry);</div><div class='add'>+				if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+					btrfs_merge_delalloc_extent(tree-&gt;inode,</div><div class='add'>+								    state, entry);</div><div class='ctx'> 				entry-&gt;end = state-&gt;end;</div><div class='ctx'> 				merge_next_state(tree, entry);</div><div class='ctx'> 				state-&gt;state = 0;</div><div class='hunk'>@@ -526,9 +506,8 @@ static int split_state(struct extent_io_tree *tree, struct extent_state *orig,</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='ctx'> 	struct rb_node **node;</div><div class='ctx'> </div><div class='del'>-	if (is_inode_io_tree(tree))</div><div class='del'>-		btrfs_split_delalloc_extent(extent_io_tree_to_inode(tree), orig,</div><div class='del'>-					    split);</div><div class='add'>+	if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+		btrfs_split_delalloc_extent(tree-&gt;inode, orig, split);</div><div class='ctx'> </div><div class='ctx'> 	prealloc-&gt;start = orig-&gt;start;</div><div class='ctx'> 	prealloc-&gt;end = split - 1;</div><div class='hunk'>@@ -548,7 +527,7 @@ static int split_state(struct extent_io_tree *tree, struct extent_state *orig,</div><div class='ctx'> 		} else if (prealloc-&gt;end &gt; entry-&gt;end) {</div><div class='ctx'> 			node = &amp;(*node)-&gt;rb_right;</div><div class='ctx'> 		} else {</div><div class='del'>-			free_extent_state(prealloc);</div><div class='add'>+			btrfs_free_extent_state(prealloc);</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -560,6 +539,18 @@ static int split_state(struct extent_io_tree *tree, struct extent_state *orig,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Use this during tree iteration to avoid doing next node searches when it's</div><div class='add'>+ * not needed (the current record ends at or after the target range's end).</div><div class='add'>+ */</div><div class='add'>+static inline struct extent_state *next_search_state(struct extent_state *state, u64 end)</div><div class='add'>+{</div><div class='add'>+	if (state-&gt;end &lt; end)</div><div class='add'>+		return next_state(state);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Utility function to clear some bits in an extent state struct.  It will</div><div class='ctx'>  * optionally wake up anyone waiting on this state (wake == 1).</div><div class='ctx'>  *</div><div class='hunk'>@@ -568,16 +559,15 @@ static int split_state(struct extent_io_tree *tree, struct extent_state *orig,</div><div class='ctx'>  */</div><div class='ctx'> static struct extent_state *clear_state_bit(struct extent_io_tree *tree,</div><div class='ctx'> 					    struct extent_state *state,</div><div class='del'>-					    u32 bits, int wake,</div><div class='add'>+					    u32 bits, int wake, u64 end,</div><div class='ctx'> 					    struct extent_changeset *changeset)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *next;</div><div class='ctx'> 	u32 bits_to_clear = bits &amp; ~EXTENT_CTLBITS;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (is_inode_io_tree(tree))</div><div class='del'>-		btrfs_clear_delalloc_extent(extent_io_tree_to_inode(tree), state,</div><div class='del'>-					    bits);</div><div class='add'>+	if (tree-&gt;owner == IO_TREE_INODE_IO)</div><div class='add'>+		btrfs_clear_delalloc_extent(tree-&gt;inode, state, bits);</div><div class='ctx'> </div><div class='ctx'> 	ret = add_extent_changeset(state, bits_to_clear, changeset, 0);</div><div class='ctx'> 	BUG_ON(ret &lt; 0);</div><div class='hunk'>@@ -585,17 +575,17 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree,</div><div class='ctx'> 	if (wake)</div><div class='ctx'> 		wake_up(&amp;state-&gt;wq);</div><div class='ctx'> 	if (state-&gt;state == 0) {</div><div class='del'>-		next = next_state(state);</div><div class='add'>+		next = next_search_state(state, end);</div><div class='ctx'> 		if (extent_state_in_tree(state)) {</div><div class='ctx'> 			rb_erase(&amp;state-&gt;rb_node, &amp;tree-&gt;state);</div><div class='ctx'> 			RB_CLEAR_NODE(&amp;state-&gt;rb_node);</div><div class='del'>-			free_extent_state(state);</div><div class='add'>+			btrfs_free_extent_state(state);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			WARN_ON(1);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		merge_state(tree, state);</div><div class='del'>-		next = next_state(state);</div><div class='add'>+		next = next_search_state(state, end);</div><div class='ctx'> 	}</div><div class='ctx'> 	return next;</div><div class='ctx'> }</div><div class='hunk'>@@ -615,25 +605,22 @@ static void set_gfp_mask_from_bits(u32 *bits, gfp_t *mask)</div><div class='ctx'>  * inserting elements in the tree, so the gfp mask is used to indicate which</div><div class='ctx'>  * allocations or sleeping are allowed.</div><div class='ctx'>  *</div><div class='del'>- * Pass 'wake' == 1 to kick any sleepers, and 'delete' == 1 to remove the given</div><div class='del'>- * range from the tree regardless of state (ie for truncate).</div><div class='del'>- *</div><div class='ctx'>  * The range [start, end] is inclusive.</div><div class='ctx'>  *</div><div class='ctx'>  * This takes the tree lock, and returns 0 on success and &lt; 0 on error.</div><div class='ctx'>  */</div><div class='del'>-int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		       u32 bits, struct extent_state **cached_state,</div><div class='del'>-		       struct extent_changeset *changeset)</div><div class='add'>+int btrfs_clear_extent_bit_changeset(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				     u32 bits, struct extent_state **cached_state,</div><div class='add'>+				     struct extent_changeset *changeset)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state;</div><div class='ctx'> 	struct extent_state *cached;</div><div class='ctx'> 	struct extent_state *prealloc = NULL;</div><div class='ctx'> 	u64 last_end;</div><div class='del'>-	int err;</div><div class='del'>-	int clear = 0;</div><div class='del'>-	int wake;</div><div class='del'>-	int delete = (bits &amp; EXTENT_CLEAR_ALL_BITS);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool clear;</div><div class='add'>+	bool wake;</div><div class='add'>+	const bool delete = (bits &amp; EXTENT_CLEAR_ALL_BITS);</div><div class='ctx'> 	gfp_t mask;</div><div class='ctx'> </div><div class='ctx'> 	set_gfp_mask_from_bits(&amp;bits, &amp;mask);</div><div class='hunk'>@@ -646,9 +633,8 @@ int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='ctx'> 	if (bits &amp; EXTENT_DELALLOC)</div><div class='ctx'> 		bits |= EXTENT_NORESERVE;</div><div class='ctx'> </div><div class='del'>-	wake = (bits &amp; EXTENT_LOCKED) ? 1 : 0;</div><div class='del'>-	if (bits &amp; (EXTENT_LOCKED | EXTENT_BOUNDARY))</div><div class='del'>-		clear = 1;</div><div class='add'>+	wake = (bits &amp; EXTENT_LOCK_BITS);</div><div class='add'>+	clear = (bits &amp; (EXTENT_LOCK_BITS | EXTENT_BOUNDARY));</div><div class='ctx'> again:</div><div class='ctx'> 	if (!prealloc) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -678,7 +664,7 @@ again:</div><div class='ctx'> 			goto hit_next;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (clear)</div><div class='del'>-			free_extent_state(cached);</div><div class='add'>+			btrfs_free_extent_state(cached);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This search will find the extents that end after our range starts. */</div><div class='hunk'>@@ -693,7 +679,7 @@ hit_next:</div><div class='ctx'> </div><div class='ctx'> 	/* The state doesn't have the wanted bits, go ahead. */</div><div class='ctx'> 	if (!(state-&gt;state &amp; bits)) {</div><div class='del'>-		state = next_state(state);</div><div class='add'>+		state = next_search_state(state, end);</div><div class='ctx'> 		goto next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -716,18 +702,24 @@ hit_next:</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc)</div><div class='ctx'> 			goto search_again;</div><div class='del'>-		err = split_state(tree, state, prealloc, start);</div><div class='del'>-		if (err)</div><div class='del'>-			extent_io_tree_panic(tree, state, "split", err);</div><div class='del'>-</div><div class='add'>+		ret = split_state(tree, state, prealloc, start);</div><div class='ctx'> 		prealloc = NULL;</div><div class='del'>-		if (err)</div><div class='add'>+		if (ret) {</div><div class='add'>+			extent_io_tree_panic(tree, state, "split", ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		if (state-&gt;end &lt;= end) {</div><div class='del'>-			state = clear_state_bit(tree, state, bits, wake, changeset);</div><div class='add'>+			state = clear_state_bit(tree, state, bits, wake, end,</div><div class='add'>+						changeset);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='del'>-		goto search_again;</div><div class='add'>+		if (need_resched())</div><div class='add'>+			goto search_again;</div><div class='add'>+		/*</div><div class='add'>+		 * Fallthrough and try atomic extent state allocation if needed.</div><div class='add'>+		 * If it fails we'll jump to 'search_again' retry the allocation</div><div class='add'>+		 * in non-atomic mode and start the search again.</div><div class='add'>+		 */</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * | ---- desired range ---- |</div><div class='hunk'>@@ -738,30 +730,31 @@ hit_next:</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc)</div><div class='ctx'> 			goto search_again;</div><div class='del'>-		err = split_state(tree, state, prealloc, end + 1);</div><div class='del'>-		if (err)</div><div class='del'>-			extent_io_tree_panic(tree, state, "split", err);</div><div class='add'>+		ret = split_state(tree, state, prealloc, end + 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			extent_io_tree_panic(tree, state, "split", ret);</div><div class='add'>+			prealloc = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (wake)</div><div class='ctx'> 			wake_up(&amp;state-&gt;wq);</div><div class='ctx'> </div><div class='del'>-		clear_state_bit(tree, prealloc, bits, wake, changeset);</div><div class='add'>+		clear_state_bit(tree, prealloc, bits, wake, end, changeset);</div><div class='ctx'> </div><div class='ctx'> 		prealloc = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	state = clear_state_bit(tree, state, bits, wake, changeset);</div><div class='add'>+	state = clear_state_bit(tree, state, bits, wake, end, changeset);</div><div class='ctx'> next:</div><div class='del'>-	if (last_end == (u64)-1)</div><div class='add'>+	if (last_end &gt;= end)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	start = last_end + 1;</div><div class='del'>-	if (start &lt;= end &amp;&amp; state &amp;&amp; !need_resched())</div><div class='add'>+	if (state &amp;&amp; !need_resched())</div><div class='ctx'> 		goto hit_next;</div><div class='ctx'> </div><div class='ctx'> search_again:</div><div class='del'>-	if (start &gt; end)</div><div class='del'>-		goto out;</div><div class='ctx'> 	spin_unlock(&amp;tree-&gt;lock);</div><div class='ctx'> 	if (gfpflags_allow_blocking(mask))</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -769,10 +762,9 @@ search_again:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;tree-&gt;lock);</div><div class='del'>-	if (prealloc)</div><div class='del'>-		free_extent_state(prealloc);</div><div class='add'>+	btrfs_free_extent_state(prealloc);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -822,7 +814,7 @@ process_node:</div><div class='ctx'> 			schedule();</div><div class='ctx'> 			spin_lock(&amp;tree-&gt;lock);</div><div class='ctx'> 			finish_wait(&amp;state-&gt;wq, &amp;wait);</div><div class='del'>-			free_extent_state(state);</div><div class='add'>+			btrfs_free_extent_state(state);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 		start = state-&gt;end + 1;</div><div class='hunk'>@@ -840,7 +832,7 @@ out:</div><div class='ctx'> 	if (cached_state &amp;&amp; *cached_state) {</div><div class='ctx'> 		state = *cached_state;</div><div class='ctx'> 		*cached_state = NULL;</div><div class='del'>-		free_extent_state(state);</div><div class='add'>+		btrfs_free_extent_state(state);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;tree-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -860,8 +852,7 @@ static void cache_state_if_flags(struct extent_state *state,</div><div class='ctx'> static void cache_state(struct extent_state *state,</div><div class='ctx'> 			struct extent_state **cached_ptr)</div><div class='ctx'> {</div><div class='del'>-	return cache_state_if_flags(state, cached_ptr,</div><div class='del'>-				    EXTENT_LOCKED | EXTENT_BOUNDARY);</div><div class='add'>+	return cache_state_if_flags(state, cached_ptr, EXTENT_LOCK_BITS | EXTENT_BOUNDARY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -880,7 +871,7 @@ static struct extent_state *find_first_extent_bit_state(struct extent_io_tree *t</div><div class='ctx'> 	 */</div><div class='ctx'> 	state = tree_search(tree, start);</div><div class='ctx'> 	while (state) {</div><div class='del'>-		if (state-&gt;end &gt;= start &amp;&amp; (state-&gt;state &amp; bits))</div><div class='add'>+		if (state-&gt;state &amp; bits)</div><div class='ctx'> 			return state;</div><div class='ctx'> 		state = next_state(state);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -895,9 +886,9 @@ static struct extent_state *find_first_extent_bit_state(struct extent_io_tree *t</div><div class='ctx'>  * Return true if we find something, and update @start_ret and @end_ret.</div><div class='ctx'>  * Return false if we found nothing.</div><div class='ctx'>  */</div><div class='del'>-bool find_first_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-			   u64 *start_ret, u64 *end_ret, u32 bits,</div><div class='del'>-			   struct extent_state **cached_state)</div><div class='add'>+bool btrfs_find_first_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+				 u64 *start_ret, u64 *end_ret, u32 bits,</div><div class='add'>+				 struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state;</div><div class='ctx'> 	bool ret = false;</div><div class='hunk'>@@ -917,13 +908,13 @@ bool find_first_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='ctx'> 			 * again. If we haven't found any, clear as well since</div><div class='ctx'> 			 * it's now useless.</div><div class='ctx'> 			 */</div><div class='del'>-			free_extent_state(*cached_state);</div><div class='add'>+			btrfs_free_extent_state(*cached_state);</div><div class='ctx'> 			*cached_state = NULL;</div><div class='ctx'> 			if (state)</div><div class='ctx'> 				goto got_it;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		free_extent_state(*cached_state);</div><div class='add'>+		btrfs_free_extent_state(*cached_state);</div><div class='ctx'> 		*cached_state = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -955,14 +946,17 @@ out:</div><div class='ctx'>  * contiguous area for given bits.  We will search to the first bit we find, and</div><div class='ctx'>  * then walk down the tree until we find a non-contiguous area.  The area</div><div class='ctx'>  * returned will be the full contiguous area with the bits set.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if we found a range with the given bits set, in which case</div><div class='add'>+ * @start_ret and @end_ret are updated, or false if no range was found.</div><div class='ctx'>  */</div><div class='del'>-int find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-			       u64 *start_ret, u64 *end_ret, u32 bits)</div><div class='add'>+bool btrfs_find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+				      u64 *start_ret, u64 *end_ret, u32 bits)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state;</div><div class='del'>-	int ret = 1;</div><div class='add'>+	bool ret = false;</div><div class='ctx'> </div><div class='del'>-	ASSERT(!btrfs_fs_incompat(extent_io_tree_to_fs_info(tree), NO_HOLES));</div><div class='add'>+	ASSERT(!btrfs_fs_incompat(btrfs_extent_io_tree_to_fs_info(tree), NO_HOLES));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tree-&gt;lock);</div><div class='ctx'> 	state = find_first_extent_bit_state(tree, start, bits);</div><div class='hunk'>@@ -974,7 +968,7 @@ int find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='ctx'> 				break;</div><div class='ctx'> 			*end_ret = state-&gt;end;</div><div class='ctx'> 		}</div><div class='del'>-		ret = 0;</div><div class='add'>+		ret = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;tree-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1049,20 +1043,20 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * [start, end] is inclusive This takes the tree lock.</div><div class='ctx'>  */</div><div class='del'>-static int __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-			    u32 bits, u64 *failed_start,</div><div class='del'>-			    struct extent_state **failed_state,</div><div class='del'>-			    struct extent_state **cached_state,</div><div class='del'>-			    struct extent_changeset *changeset)</div><div class='add'>+static int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+			  u32 bits, u64 *failed_start,</div><div class='add'>+			  struct extent_state **failed_state,</div><div class='add'>+			  struct extent_state **cached_state,</div><div class='add'>+			  struct extent_changeset *changeset)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state;</div><div class='ctx'> 	struct extent_state *prealloc = NULL;</div><div class='ctx'> 	struct rb_node **p = NULL;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u64 last_start;</div><div class='ctx'> 	u64 last_end;</div><div class='del'>-	u32 exclusive_bits = (bits &amp; EXTENT_LOCKED);</div><div class='add'>+	u32 exclusive_bits = (bits &amp; EXTENT_LOCK_BITS);</div><div class='ctx'> 	gfp_t mask;</div><div class='ctx'> </div><div class='ctx'> 	set_gfp_mask_from_bits(&amp;bits, &amp;mask);</div><div class='hunk'>@@ -1084,6 +1078,9 @@ again:</div><div class='ctx'> 		 */</div><div class='ctx'> 		prealloc = alloc_extent_state(mask);</div><div class='ctx'> 	}</div><div class='add'>+	/* Optimistically preallocate the extent changeset ulist node. */</div><div class='add'>+	if (changeset)</div><div class='add'>+		extent_changeset_prealloc(changeset, mask);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tree-&gt;lock);</div><div class='ctx'> 	if (cached_state &amp;&amp; *cached_state) {</div><div class='hunk'>@@ -1122,19 +1119,18 @@ hit_next:</div><div class='ctx'> 		if (state-&gt;state &amp; exclusive_bits) {</div><div class='ctx'> 			*failed_start = state-&gt;start;</div><div class='ctx'> 			cache_state(state, failed_state);</div><div class='del'>-			err = -EEXIST;</div><div class='add'>+			ret = -EEXIST;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		set_state_bits(tree, state, bits, changeset);</div><div class='ctx'> 		cache_state(state, cached_state);</div><div class='ctx'> 		merge_state(tree, state);</div><div class='del'>-		if (last_end == (u64)-1)</div><div class='add'>+		if (last_end &gt;= end)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		start = last_end + 1;</div><div class='ctx'> 		state = next_state(state);</div><div class='del'>-		if (start &lt; end &amp;&amp; state &amp;&amp; state-&gt;start == start &amp;&amp;</div><div class='del'>-		    !need_resched())</div><div class='add'>+		if (state &amp;&amp; state-&gt;start == start &amp;&amp; !need_resched())</div><div class='ctx'> 			goto hit_next;</div><div class='ctx'> 		goto search_again;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1158,7 +1154,7 @@ hit_next:</div><div class='ctx'> 		if (state-&gt;state &amp; exclusive_bits) {</div><div class='ctx'> 			*failed_start = start;</div><div class='ctx'> 			cache_state(state, failed_state);</div><div class='del'>-			err = -EEXIST;</div><div class='add'>+			ret = -EEXIST;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1175,23 +1171,22 @@ hit_next:</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc)</div><div class='ctx'> 			goto search_again;</div><div class='del'>-		err = split_state(tree, state, prealloc, start);</div><div class='del'>-		if (err)</div><div class='del'>-			extent_io_tree_panic(tree, state, "split", err);</div><div class='add'>+		ret = split_state(tree, state, prealloc, start);</div><div class='add'>+		if (ret)</div><div class='add'>+			extent_io_tree_panic(tree, state, "split", ret);</div><div class='ctx'> </div><div class='ctx'> 		prealloc = NULL;</div><div class='del'>-		if (err)</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (state-&gt;end &lt;= end) {</div><div class='ctx'> 			set_state_bits(tree, state, bits, changeset);</div><div class='ctx'> 			cache_state(state, cached_state);</div><div class='ctx'> 			merge_state(tree, state);</div><div class='del'>-			if (last_end == (u64)-1)</div><div class='add'>+			if (last_end &gt;= end)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			start = last_end + 1;</div><div class='ctx'> 			state = next_state(state);</div><div class='del'>-			if (start &lt; end &amp;&amp; state &amp;&amp; state-&gt;start == start &amp;&amp;</div><div class='del'>-			    !need_resched())</div><div class='add'>+			if (state &amp;&amp; state-&gt;start == start &amp;&amp; !need_resched())</div><div class='ctx'> 				goto hit_next;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto search_again;</div><div class='hunk'>@@ -1204,14 +1199,8 @@ hit_next:</div><div class='ctx'> 	 * extent we found.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (state-&gt;start &gt; start) {</div><div class='del'>-		u64 this_end;</div><div class='ctx'> 		struct extent_state *inserted_state;</div><div class='ctx'> </div><div class='del'>-		if (end &lt; last_start)</div><div class='del'>-			this_end = end;</div><div class='del'>-		else</div><div class='del'>-			this_end = last_start - 1;</div><div class='del'>-</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc)</div><div class='ctx'> 			goto search_again;</div><div class='hunk'>@@ -1221,17 +1210,38 @@ hit_next:</div><div class='ctx'> 		 * extent.</div><div class='ctx'> 		 */</div><div class='ctx'> 		prealloc-&gt;start = start;</div><div class='del'>-		prealloc-&gt;end = this_end;</div><div class='add'>+		if (end &lt; last_start)</div><div class='add'>+			prealloc-&gt;end = end;</div><div class='add'>+		else</div><div class='add'>+			prealloc-&gt;end = last_start - 1;</div><div class='add'>+</div><div class='ctx'> 		inserted_state = insert_state(tree, prealloc, bits, changeset);</div><div class='ctx'> 		if (IS_ERR(inserted_state)) {</div><div class='del'>-			err = PTR_ERR(inserted_state);</div><div class='del'>-			extent_io_tree_panic(tree, prealloc, "insert", err);</div><div class='add'>+			ret = PTR_ERR(inserted_state);</div><div class='add'>+			extent_io_tree_panic(tree, prealloc, "insert", ret);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		cache_state(inserted_state, cached_state);</div><div class='ctx'> 		if (inserted_state == prealloc)</div><div class='ctx'> 			prealloc = NULL;</div><div class='del'>-		start = this_end + 1;</div><div class='add'>+		start = inserted_state-&gt;end + 1;</div><div class='add'>+</div><div class='add'>+		/* Beyond target range, stop. */</div><div class='add'>+		if (start &gt; end)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (need_resched())</div><div class='add'>+			goto search_again;</div><div class='add'>+</div><div class='add'>+		state = next_search_state(inserted_state, end);</div><div class='add'>+		/*</div><div class='add'>+		 * If there's a next state, whether contiguous or not, we don't</div><div class='add'>+		 * need to unlock and start search again. If it's not contiguous</div><div class='add'>+		 * we will end up here and try to allocate a prealloc state and insert.</div><div class='add'>+		 */</div><div class='add'>+		if (state)</div><div class='add'>+			goto hit_next;</div><div class='ctx'> 		goto search_again;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1244,16 +1254,19 @@ hit_next:</div><div class='ctx'> 		if (state-&gt;state &amp; exclusive_bits) {</div><div class='ctx'> 			*failed_start = start;</div><div class='ctx'> 			cache_state(state, failed_state);</div><div class='del'>-			err = -EEXIST;</div><div class='add'>+			ret = -EEXIST;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc)</div><div class='ctx'> 			goto search_again;</div><div class='del'>-		err = split_state(tree, state, prealloc, end + 1);</div><div class='del'>-		if (err)</div><div class='del'>-			extent_io_tree_panic(tree, state, "split", err);</div><div class='add'>+		ret = split_state(tree, state, prealloc, end + 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			extent_io_tree_panic(tree, state, "split", ret);</div><div class='add'>+			prealloc = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		set_state_bits(tree, prealloc, bits, changeset);</div><div class='ctx'> 		cache_state(prealloc, cached_state);</div><div class='hunk'>@@ -1272,18 +1285,16 @@ search_again:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;tree-&gt;lock);</div><div class='del'>-	if (prealloc)</div><div class='del'>-		free_extent_state(prealloc);</div><div class='add'>+	btrfs_free_extent_state(prealloc);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		   u32 bits, struct extent_state **cached_state)</div><div class='add'>+int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+			 u32 bits, struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='del'>-	return __set_extent_bit(tree, start, end, bits, NULL, NULL,</div><div class='del'>-				cached_state, NULL);</div><div class='add'>+	return set_extent_bit(tree, start, end, bits, NULL, NULL, cached_state, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1304,15 +1315,15 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='ctx'>  *</div><div class='ctx'>  * All allocations are done with GFP_NOFS.</div><div class='ctx'>  */</div><div class='del'>-int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		       u32 bits, u32 clear_bits,</div><div class='del'>-		       struct extent_state **cached_state)</div><div class='add'>+int btrfs_convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+			     u32 bits, u32 clear_bits,</div><div class='add'>+			     struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state;</div><div class='ctx'> 	struct extent_state *prealloc = NULL;</div><div class='ctx'> 	struct rb_node **p = NULL;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u64 last_start;</div><div class='ctx'> 	u64 last_end;</div><div class='ctx'> 	bool first_iteration = true;</div><div class='hunk'>@@ -1351,7 +1362,7 @@ again:</div><div class='ctx'> 	if (!state) {</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		prealloc-&gt;start = start;</div><div class='hunk'>@@ -1374,12 +1385,11 @@ hit_next:</div><div class='ctx'> 	if (state-&gt;start == start &amp;&amp; state-&gt;end &lt;= end) {</div><div class='ctx'> 		set_state_bits(tree, state, bits, NULL);</div><div class='ctx'> 		cache_state(state, cached_state);</div><div class='del'>-		state = clear_state_bit(tree, state, clear_bits, 0, NULL);</div><div class='del'>-		if (last_end == (u64)-1)</div><div class='add'>+		state = clear_state_bit(tree, state, clear_bits, 0, end, NULL);</div><div class='add'>+		if (last_end &gt;= end)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		start = last_end + 1;</div><div class='del'>-		if (start &lt; end &amp;&amp; state &amp;&amp; state-&gt;start == start &amp;&amp;</div><div class='del'>-		    !need_resched())</div><div class='add'>+		if (state &amp;&amp; state-&gt;start == start &amp;&amp; !need_resched())</div><div class='ctx'> 			goto hit_next;</div><div class='ctx'> 		goto search_again;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1402,24 +1412,23 @@ hit_next:</div><div class='ctx'> 	if (state-&gt;start &lt; start) {</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		err = split_state(tree, state, prealloc, start);</div><div class='del'>-		if (err)</div><div class='del'>-			extent_io_tree_panic(tree, state, "split", err);</div><div class='add'>+		ret = split_state(tree, state, prealloc, start);</div><div class='ctx'> 		prealloc = NULL;</div><div class='del'>-		if (err)</div><div class='add'>+		if (ret) {</div><div class='add'>+			extent_io_tree_panic(tree, state, "split", ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		if (state-&gt;end &lt;= end) {</div><div class='ctx'> 			set_state_bits(tree, state, bits, NULL);</div><div class='ctx'> 			cache_state(state, cached_state);</div><div class='del'>-			state = clear_state_bit(tree, state, clear_bits, 0, NULL);</div><div class='del'>-			if (last_end == (u64)-1)</div><div class='add'>+			state = clear_state_bit(tree, state, clear_bits, 0, end, NULL);</div><div class='add'>+			if (last_end &gt;= end)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			start = last_end + 1;</div><div class='del'>-			if (start &lt; end &amp;&amp; state &amp;&amp; state-&gt;start == start &amp;&amp;</div><div class='del'>-			    !need_resched())</div><div class='add'>+			if (state &amp;&amp; state-&gt;start == start &amp;&amp; !need_resched())</div><div class='ctx'> 				goto hit_next;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto search_again;</div><div class='hunk'>@@ -1432,17 +1441,11 @@ hit_next:</div><div class='ctx'> 	 * extent we found.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (state-&gt;start &gt; start) {</div><div class='del'>-		u64 this_end;</div><div class='ctx'> 		struct extent_state *inserted_state;</div><div class='ctx'> </div><div class='del'>-		if (end &lt; last_start)</div><div class='del'>-			this_end = end;</div><div class='del'>-		else</div><div class='del'>-			this_end = last_start - 1;</div><div class='del'>-</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1451,16 +1454,37 @@ hit_next:</div><div class='ctx'> 		 * extent.</div><div class='ctx'> 		 */</div><div class='ctx'> 		prealloc-&gt;start = start;</div><div class='del'>-		prealloc-&gt;end = this_end;</div><div class='add'>+		if (end &lt; last_start)</div><div class='add'>+			prealloc-&gt;end = end;</div><div class='add'>+		else</div><div class='add'>+			prealloc-&gt;end = last_start - 1;</div><div class='add'>+</div><div class='ctx'> 		inserted_state = insert_state(tree, prealloc, bits, NULL);</div><div class='ctx'> 		if (IS_ERR(inserted_state)) {</div><div class='del'>-			err = PTR_ERR(inserted_state);</div><div class='del'>-			extent_io_tree_panic(tree, prealloc, "insert", err);</div><div class='add'>+			ret = PTR_ERR(inserted_state);</div><div class='add'>+			extent_io_tree_panic(tree, prealloc, "insert", ret);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		cache_state(inserted_state, cached_state);</div><div class='ctx'> 		if (inserted_state == prealloc)</div><div class='ctx'> 			prealloc = NULL;</div><div class='del'>-		start = this_end + 1;</div><div class='add'>+		start = inserted_state-&gt;end + 1;</div><div class='add'>+</div><div class='add'>+		/* Beyond target range, stop. */</div><div class='add'>+		if (start &gt; end)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (need_resched())</div><div class='add'>+			goto search_again;</div><div class='add'>+</div><div class='add'>+		state = next_search_state(inserted_state, end);</div><div class='add'>+		/*</div><div class='add'>+		 * If there's a next state, whether contiguous or not, we don't</div><div class='add'>+		 * need to unlock and start search again. If it's not contiguous</div><div class='add'>+		 * we will end up here and try to allocate a prealloc state and insert.</div><div class='add'>+		 */</div><div class='add'>+		if (state)</div><div class='add'>+			goto hit_next;</div><div class='ctx'> 		goto search_again;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1472,17 +1496,20 @@ hit_next:</div><div class='ctx'> 	if (state-&gt;start &lt;= end &amp;&amp; state-&gt;end &gt; end) {</div><div class='ctx'> 		prealloc = alloc_extent_state_atomic(prealloc);</div><div class='ctx'> 		if (!prealloc) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = split_state(tree, state, prealloc, end + 1);</div><div class='del'>-		if (err)</div><div class='del'>-			extent_io_tree_panic(tree, state, "split", err);</div><div class='add'>+		ret = split_state(tree, state, prealloc, end + 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			extent_io_tree_panic(tree, state, "split", ret);</div><div class='add'>+			prealloc = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		set_state_bits(tree, prealloc, bits, NULL);</div><div class='ctx'> 		cache_state(prealloc, cached_state);</div><div class='del'>-		clear_state_bit(tree, prealloc, clear_bits, 0, NULL);</div><div class='add'>+		clear_state_bit(tree, prealloc, clear_bits, 0, end, NULL);</div><div class='ctx'> 		prealloc = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1497,10 +1524,9 @@ search_again:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;tree-&gt;lock);</div><div class='del'>-	if (prealloc)</div><div class='del'>-		free_extent_state(prealloc);</div><div class='add'>+	btrfs_free_extent_state(prealloc);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1518,8 +1544,8 @@ out:</div><div class='ctx'>  * spans (last_range_end, end of device]. In this case it's up to the caller to</div><div class='ctx'>  * trim @end_ret to the appropriate size.</div><div class='ctx'>  */</div><div class='del'>-void find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-				 u64 *start_ret, u64 *end_ret, u32 bits)</div><div class='add'>+void btrfs_find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+				       u64 *start_ret, u64 *end_ret, u32 bits)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state;</div><div class='ctx'> 	struct extent_state *prev = NULL, *next = NULL;</div><div class='hunk'>@@ -1636,10 +1662,10 @@ out:</div><div class='ctx'>  * all given bits set. If the returned number of bytes is greater than zero</div><div class='ctx'>  * then @start is updated with the offset of the first byte with the bits set.</div><div class='ctx'>  */</div><div class='del'>-u64 count_range_bits(struct extent_io_tree *tree,</div><div class='del'>-		     u64 *start, u64 search_end, u64 max_bytes,</div><div class='del'>-		     u32 bits, int contig,</div><div class='del'>-		     struct extent_state **cached_state)</div><div class='add'>+u64 btrfs_count_range_bits(struct extent_io_tree *tree,</div><div class='add'>+			   u64 *start, u64 search_end, u64 max_bytes,</div><div class='add'>+			   u32 bits, bool contig,</div><div class='add'>+			   struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *state = NULL;</div><div class='ctx'> 	struct extent_state *cached;</div><div class='hunk'>@@ -1710,7 +1736,7 @@ search:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cached_state) {</div><div class='del'>-		free_extent_state(*cached_state);</div><div class='add'>+		btrfs_free_extent_state(*cached_state);</div><div class='ctx'> 		*cached_state = state;</div><div class='ctx'> 		if (state)</div><div class='ctx'> 			refcount_inc(&amp;state-&gt;refs);</div><div class='hunk'>@@ -1724,16 +1750,16 @@ search:</div><div class='ctx'> /*</div><div class='ctx'>  * Check if the single @bit exists in the given range.</div><div class='ctx'>  */</div><div class='del'>-bool test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit)</div><div class='add'>+bool btrfs_test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit)</div><div class='ctx'> {</div><div class='del'>-	struct extent_state *state = NULL;</div><div class='add'>+	struct extent_state *state;</div><div class='ctx'> 	bool bitset = false;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(is_power_of_2(bit));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tree-&gt;lock);</div><div class='ctx'> 	state = tree_search(tree, start);</div><div class='del'>-	while (state &amp;&amp; start &lt;= end) {</div><div class='add'>+	while (state) {</div><div class='ctx'> 		if (state-&gt;start &gt; end)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1742,9 +1768,7 @@ bool test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* If state-&gt;end is (u64)-1, start will overflow to 0 */</div><div class='del'>-		start = state-&gt;end + 1;</div><div class='del'>-		if (start &gt; end || start == 0)</div><div class='add'>+		if (state-&gt;end &gt;= end)</div><div class='ctx'> 			break;</div><div class='ctx'> 		state = next_state(state);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1752,16 +1776,51 @@ bool test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32</div><div class='ctx'> 	return bitset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_get_range_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 *bits,</div><div class='add'>+			  struct extent_state **cached_state)</div><div class='add'>+{</div><div class='add'>+	struct extent_state *state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The cached state is currently mandatory and not used to start the</div><div class='add'>+	 * search, only to cache the first state record found in the range.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(cached_state != NULL);</div><div class='add'>+	ASSERT(*cached_state == NULL);</div><div class='add'>+</div><div class='add'>+	*bits = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tree-&gt;lock);</div><div class='add'>+	state = tree_search(tree, start);</div><div class='add'>+	if (state &amp;&amp; state-&gt;start &lt; end) {</div><div class='add'>+		*cached_state = state;</div><div class='add'>+		refcount_inc(&amp;state-&gt;refs);</div><div class='add'>+	}</div><div class='add'>+	while (state) {</div><div class='add'>+		if (state-&gt;start &gt; end)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		*bits |= state-&gt;state;</div><div class='add'>+</div><div class='add'>+		if (state-&gt;end &gt;= end)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		state = next_state(state);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;tree-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Check if the whole range [@start,@end) contains the single @bit set.</div><div class='ctx'>  */</div><div class='del'>-bool test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,</div><div class='del'>-		    struct extent_state *cached)</div><div class='add'>+bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,</div><div class='add'>+			  struct extent_state *cached)</div><div class='ctx'> {</div><div class='del'>-	struct extent_state *state = NULL;</div><div class='add'>+	struct extent_state *state;</div><div class='ctx'> 	bool bitset = true;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(is_power_of_2(bit));</div><div class='add'>+	ASSERT(start &lt; end);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tree-&gt;lock);</div><div class='ctx'> 	if (cached &amp;&amp; extent_state_in_tree(cached) &amp;&amp; cached-&gt;start &lt;= start &amp;&amp;</div><div class='hunk'>@@ -1769,30 +1828,22 @@ bool test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,</div><div class='ctx'> 		state = cached;</div><div class='ctx'> 	else</div><div class='ctx'> 		state = tree_search(tree, start);</div><div class='del'>-	while (state &amp;&amp; start &lt;= end) {</div><div class='add'>+	while (state) {</div><div class='ctx'> 		if (state-&gt;start &gt; start) {</div><div class='ctx'> 			bitset = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (state-&gt;start &gt; end)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		if ((state-&gt;state &amp; bit) == 0) {</div><div class='ctx'> 			bitset = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (state-&gt;end == (u64)-1)</div><div class='add'>+		if (state-&gt;end &gt;= end)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Last entry (if state-&gt;end is (u64)-1 and overflow happens),</div><div class='del'>-		 * or next entry starts after the range.</div><div class='del'>-		 */</div><div class='add'>+		/* Next state must start where this one ends. */</div><div class='ctx'> 		start = state-&gt;end + 1;</div><div class='del'>-		if (start &gt; end || start == 0)</div><div class='del'>-			break;</div><div class='ctx'> 		state = next_state(state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1804,44 +1855,42 @@ bool test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Wrappers around set/clear extent bit */</div><div class='del'>-int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-			   u32 bits, struct extent_changeset *changeset)</div><div class='add'>+int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				 u32 bits, struct extent_changeset *changeset)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * We don't support EXTENT_LOCKED yet, as current changeset will</div><div class='del'>-	 * record any bits changed, so for EXTENT_LOCKED case, it will</div><div class='del'>-	 * either fail with -EEXIST or changeset will record the whole</div><div class='del'>-	 * range.</div><div class='add'>+	 * We don't support EXTENT_LOCK_BITS yet, as current changeset will</div><div class='add'>+	 * record any bits changed, so for EXTENT_LOCK_BITS case, it will either</div><div class='add'>+	 * fail with -EEXIST or changeset will record the whole range.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(!(bits &amp; EXTENT_LOCKED));</div><div class='add'>+	ASSERT(!(bits &amp; EXTENT_LOCK_BITS));</div><div class='ctx'> </div><div class='del'>-	return __set_extent_bit(tree, start, end, bits, NULL, NULL, NULL, changeset);</div><div class='add'>+	return set_extent_bit(tree, start, end, bits, NULL, NULL, NULL, changeset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-			     u32 bits, struct extent_changeset *changeset)</div><div class='add'>+int btrfs_clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				   u32 bits, struct extent_changeset *changeset)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Don't support EXTENT_LOCKED case, same reason as</div><div class='add'>+	 * Don't support EXTENT_LOCK_BITS case, same reason as</div><div class='ctx'> 	 * set_record_extent_bits().</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(!(bits &amp; EXTENT_LOCKED));</div><div class='add'>+	ASSERT(!(bits &amp; EXTENT_LOCK_BITS));</div><div class='ctx'> </div><div class='del'>-	return __clear_extent_bit(tree, start, end, bits, NULL, changeset);</div><div class='add'>+	return btrfs_clear_extent_bit_changeset(tree, start, end, bits, NULL, changeset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		    struct extent_state **cached)</div><div class='add'>+bool btrfs_try_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				u32 bits, struct extent_state **cached)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u64 failed_start;</div><div class='ctx'> </div><div class='del'>-	err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, &amp;failed_start,</div><div class='del'>-			       NULL, cached, NULL);</div><div class='del'>-	if (err == -EEXIST) {</div><div class='add'>+	ret = set_extent_bit(tree, start, end, bits, &amp;failed_start, NULL, cached, NULL);</div><div class='add'>+	if (ret == -EEXIST) {</div><div class='ctx'> 		if (failed_start &gt; start)</div><div class='del'>-			clear_extent_bit(tree, start, failed_start - 1,</div><div class='del'>-					 EXTENT_LOCKED, cached);</div><div class='add'>+			btrfs_clear_extent_bit(tree, start, failed_start - 1,</div><div class='add'>+					       bits, cached);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1851,40 +1900,58 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='ctx'>  * Either insert or lock state struct between start and end use mask to tell</div><div class='ctx'>  * us if waiting is desired.</div><div class='ctx'>  */</div><div class='del'>-int lock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		struct extent_state **cached_state)</div><div class='add'>+int btrfs_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 bits,</div><div class='add'>+			   struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_state *failed_state = NULL;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u64 failed_start;</div><div class='ctx'> </div><div class='del'>-	err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, &amp;failed_start,</div><div class='del'>-			       &amp;failed_state, cached_state, NULL);</div><div class='del'>-	while (err == -EEXIST) {</div><div class='add'>+	ret = set_extent_bit(tree, start, end, bits, &amp;failed_start,</div><div class='add'>+			     &amp;failed_state, cached_state, NULL);</div><div class='add'>+	while (ret == -EEXIST) {</div><div class='ctx'> 		if (failed_start != start)</div><div class='del'>-			clear_extent_bit(tree, start, failed_start - 1,</div><div class='del'>-					 EXTENT_LOCKED, cached_state);</div><div class='del'>-</div><div class='del'>-		wait_extent_bit(tree, failed_start, end, EXTENT_LOCKED,</div><div class='del'>-				&amp;failed_state);</div><div class='del'>-		err = __set_extent_bit(tree, start, end, EXTENT_LOCKED,</div><div class='del'>-				       &amp;failed_start, &amp;failed_state,</div><div class='del'>-				       cached_state, NULL);</div><div class='add'>+			btrfs_clear_extent_bit(tree, start, failed_start - 1,</div><div class='add'>+					       bits, cached_state);</div><div class='add'>+</div><div class='add'>+		wait_extent_bit(tree, failed_start, end, bits, &amp;failed_state);</div><div class='add'>+		ret = set_extent_bit(tree, start, end, bits, &amp;failed_start,</div><div class='add'>+				     &amp;failed_state, cached_state, NULL);</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the extent state that follows the given extent state.</div><div class='add'>+ * This is meant to be used in a context where we know no other tasks can</div><div class='add'>+ * concurrently modify the tree.</div><div class='add'>+ */</div><div class='add'>+struct extent_state *btrfs_next_extent_state(struct extent_io_tree *tree,</div><div class='add'>+					     struct extent_state *state)</div><div class='add'>+{</div><div class='add'>+	struct extent_state *next;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tree-&gt;lock);</div><div class='add'>+	ASSERT(extent_state_in_tree(state));</div><div class='add'>+	next = next_state(state);</div><div class='add'>+	if (next)</div><div class='add'>+		refcount_inc(&amp;next-&gt;refs);</div><div class='add'>+	spin_unlock(&amp;tree-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cold extent_state_free_cachep(void)</div><div class='add'>+void __cold btrfs_extent_state_free_cachep(void)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_extent_state_leak_debug_check();</div><div class='ctx'> 	kmem_cache_destroy(extent_state_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init extent_state_init_cachep(void)</div><div class='add'>+int __init btrfs_extent_state_init_cachep(void)</div><div class='ctx'> {</div><div class='ctx'> 	extent_state_cache = kmem_cache_create("btrfs_extent_state",</div><div class='del'>-			sizeof(struct extent_state), 0,</div><div class='del'>-			SLAB_MEM_SPREAD, NULL);</div><div class='add'>+					       sizeof(struct extent_state), 0, 0,</div><div class='add'>+					       NULL);</div><div class='ctx'> 	if (!extent_state_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h<br/>index ebe6390d65e9..6f07b965e8da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-io-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-io-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-io-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent-io-tree.h</a></div><div class='hunk'>@@ -3,16 +3,24 @@</div><div class='ctx'> #ifndef BTRFS_EXTENT_IO_TREE_H</div><div class='ctx'> #define BTRFS_EXTENT_IO_TREE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> </div><div class='ctx'> struct extent_changeset;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_inode;</div><div class='ctx'> </div><div class='ctx'> /* Bits for the extent state */</div><div class='ctx'> enum {</div><div class='ctx'> 	ENUM_BIT(EXTENT_DIRTY),</div><div class='del'>-	ENUM_BIT(EXTENT_UPTODATE),</div><div class='ctx'> 	ENUM_BIT(EXTENT_LOCKED),</div><div class='del'>-	ENUM_BIT(EXTENT_NEW),</div><div class='add'>+	ENUM_BIT(EXTENT_DIO_LOCKED),</div><div class='add'>+	ENUM_BIT(EXTENT_DIRTY_LOG1),</div><div class='add'>+	ENUM_BIT(EXTENT_DIRTY_LOG2),</div><div class='ctx'> 	ENUM_BIT(EXTENT_DELALLOC),</div><div class='ctx'> 	ENUM_BIT(EXTENT_DEFRAG),</div><div class='ctx'> 	ENUM_BIT(EXTENT_BOUNDARY),</div><div class='hunk'>@@ -31,6 +39,11 @@ enum {</div><div class='ctx'> 	 */</div><div class='ctx'> 	ENUM_BIT(EXTENT_DELALLOC_NEW),</div><div class='ctx'> 	/*</div><div class='add'>+	 * Mark that a range is being locked for finishing an ordered extent.</div><div class='add'>+	 * Used together with EXTENT_LOCKED.</div><div class='add'>+	 */</div><div class='add'>+	ENUM_BIT(EXTENT_FINISHING_ORDERED),</div><div class='add'>+	/*</div><div class='ctx'> 	 * When an ordered extent successfully completes for a region marked as</div><div class='ctx'> 	 * a new delalloc range, use this flag when clearing a new delalloc</div><div class='ctx'> 	 * range to indicate that the VFS' inode number of bytes should be</div><div class='hunk'>@@ -60,6 +73,8 @@ enum {</div><div class='ctx'> 				 EXTENT_ADD_INODE_BYTES | \</div><div class='ctx'> 				 EXTENT_CLEAR_ALL_BITS)</div><div class='ctx'> </div><div class='add'>+#define EXTENT_LOCK_BITS	(EXTENT_LOCKED | EXTENT_DIO_LOCKED)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Redefined bits above which are used only in the device allocation tree,</div><div class='ctx'>  * shouldn't be using EXTENT_LOCKED / EXTENT_BOUNDARY / EXTENT_CLEAR_META_RESV</div><div class='hunk'>@@ -120,90 +135,110 @@ struct extent_state {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct btrfs_inode *extent_io_tree_to_inode(struct extent_io_tree *tree);</div><div class='del'>-const struct btrfs_inode *extent_io_tree_to_inode_const(const struct extent_io_tree *tree);</div><div class='del'>-const struct btrfs_fs_info *extent_io_tree_to_fs_info(const struct extent_io_tree *tree);</div><div class='del'>-</div><div class='del'>-void extent_io_tree_init(struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct extent_io_tree *tree, unsigned int owner);</div><div class='del'>-void extent_io_tree_release(struct extent_io_tree *tree);</div><div class='del'>-</div><div class='del'>-int lock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		struct extent_state **cached);</div><div class='del'>-</div><div class='del'>-int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		    struct extent_state **cached);</div><div class='del'>-</div><div class='del'>-int __init extent_state_init_cachep(void);</div><div class='del'>-void __cold extent_state_free_cachep(void);</div><div class='del'>-</div><div class='del'>-u64 count_range_bits(struct extent_io_tree *tree,</div><div class='del'>-		     u64 *start, u64 search_end,</div><div class='del'>-		     u64 max_bytes, u32 bits, int contig,</div><div class='del'>-		     struct extent_state **cached_state);</div><div class='del'>-</div><div class='del'>-void free_extent_state(struct extent_state *state);</div><div class='del'>-bool test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,</div><div class='del'>-		    struct extent_state *cached_state);</div><div class='del'>-bool test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit);</div><div class='del'>-int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-			     u32 bits, struct extent_changeset *changeset);</div><div class='del'>-int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		       u32 bits, struct extent_state **cached,</div><div class='del'>-		       struct extent_changeset *changeset);</div><div class='del'>-</div><div class='del'>-static inline int clear_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-				   u64 end, u32 bits,</div><div class='del'>-				   struct extent_state **cached)</div><div class='del'>-{</div><div class='del'>-	return __clear_extent_bit(tree, start, end, bits, cached, NULL);</div><div class='del'>-}</div><div class='add'>+const struct btrfs_inode *btrfs_extent_io_tree_to_inode(const struct extent_io_tree *tree);</div><div class='add'>+const struct btrfs_fs_info *btrfs_extent_io_tree_to_fs_info(const struct extent_io_tree *tree);</div><div class='add'>+</div><div class='add'>+void btrfs_extent_io_tree_init(struct btrfs_fs_info *fs_info,</div><div class='add'>+			       struct extent_io_tree *tree, unsigned int owner);</div><div class='add'>+void btrfs_extent_io_tree_release(struct extent_io_tree *tree);</div><div class='add'>+int btrfs_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 bits,</div><div class='add'>+			   struct extent_state **cached);</div><div class='add'>+bool btrfs_try_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				u32 bits, struct extent_state **cached);</div><div class='ctx'> </div><div class='del'>-static inline int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-				struct extent_state **cached)</div><div class='add'>+static inline int btrfs_lock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				    struct extent_state **cached)</div><div class='ctx'> {</div><div class='del'>-	return __clear_extent_bit(tree, start, end, EXTENT_LOCKED, cached, NULL);</div><div class='add'>+	return btrfs_lock_extent_bits(tree, start, end, EXTENT_LOCKED, cached);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start,</div><div class='del'>-				    u64 end, u32 bits)</div><div class='add'>+static inline bool btrfs_try_lock_extent(struct extent_io_tree *tree, u64 start,</div><div class='add'>+					 u64 end, struct extent_state **cached)</div><div class='ctx'> {</div><div class='del'>-	return clear_extent_bit(tree, start, end, bits, NULL);</div><div class='add'>+	return btrfs_try_lock_extent_bits(tree, start, end, EXTENT_LOCKED, cached);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-			   u32 bits, struct extent_changeset *changeset);</div><div class='del'>-int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		   u32 bits, struct extent_state **cached_state);</div><div class='add'>+int __init btrfs_extent_state_init_cachep(void);</div><div class='add'>+void __cold btrfs_extent_state_free_cachep(void);</div><div class='ctx'> </div><div class='del'>-static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,</div><div class='del'>-		u64 end, struct extent_state **cached_state)</div><div class='add'>+u64 btrfs_count_range_bits(struct extent_io_tree *tree,</div><div class='add'>+			   u64 *start, u64 search_end,</div><div class='add'>+			   u64 max_bytes, u32 bits, bool contig,</div><div class='add'>+			   struct extent_state **cached_state);</div><div class='add'>+</div><div class='add'>+void btrfs_free_extent_state(struct extent_state *state);</div><div class='add'>+bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,</div><div class='add'>+			  struct extent_state *cached_state);</div><div class='add'>+bool btrfs_test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit);</div><div class='add'>+void btrfs_get_range_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 *bits,</div><div class='add'>+			  struct extent_state **cached_state);</div><div class='add'>+int btrfs_clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				   u32 bits, struct extent_changeset *changeset);</div><div class='add'>+int btrfs_clear_extent_bit_changeset(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				     u32 bits, struct extent_state **cached,</div><div class='add'>+				     struct extent_changeset *changeset);</div><div class='add'>+</div><div class='add'>+static inline int btrfs_clear_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+					 u64 end, u32 bits,</div><div class='add'>+					 struct extent_state **cached)</div><div class='ctx'> {</div><div class='del'>-	return __clear_extent_bit(tree, start, end, EXTENT_UPTODATE,</div><div class='del'>-				  cached_state, NULL);</div><div class='add'>+	return btrfs_clear_extent_bit_changeset(tree, start, end, bits, cached, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,</div><div class='del'>-				     u64 end, struct extent_state **cached)</div><div class='add'>+static inline int btrfs_unlock_extent(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				      struct extent_state **cached)</div><div class='ctx'> {</div><div class='del'>-	return clear_extent_bit(tree, start, end,</div><div class='del'>-				EXTENT_DIRTY | EXTENT_DELALLOC |</div><div class='del'>-				EXTENT_DO_ACCOUNTING, cached);</div><div class='add'>+	return btrfs_clear_extent_bit_changeset(tree, start, end, EXTENT_LOCKED,</div><div class='add'>+						cached, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='del'>-		       u32 bits, u32 clear_bits,</div><div class='del'>-		       struct extent_state **cached_state);</div><div class='add'>+int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+				 u32 bits, struct extent_changeset *changeset);</div><div class='add'>+int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+			 u32 bits, struct extent_state **cached_state);</div><div class='ctx'> </div><div class='del'>-bool find_first_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-			   u64 *start_ret, u64 *end_ret, u32 bits,</div><div class='del'>-			   struct extent_state **cached_state);</div><div class='del'>-void find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-				 u64 *start_ret, u64 *end_ret, u32 bits);</div><div class='del'>-int find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='del'>-			       u64 *start_ret, u64 *end_ret, u32 bits);</div><div class='add'>+static inline int btrfs_clear_extent_dirty(struct extent_io_tree *tree, u64 start,</div><div class='add'>+					   u64 end, struct extent_state **cached)</div><div class='add'>+{</div><div class='add'>+	return btrfs_clear_extent_bit(tree, start, end,</div><div class='add'>+				      EXTENT_DIRTY | EXTENT_DELALLOC |</div><div class='add'>+				      EXTENT_DO_ACCOUNTING, cached);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,</div><div class='add'>+			     u32 bits, u32 clear_bits,</div><div class='add'>+			     struct extent_state **cached_state);</div><div class='add'>+</div><div class='add'>+bool btrfs_find_first_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+				 u64 *start_ret, u64 *end_ret, u32 bits,</div><div class='add'>+				 struct extent_state **cached_state);</div><div class='add'>+void btrfs_find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+				       u64 *start_ret, u64 *end_ret, u32 bits);</div><div class='add'>+bool btrfs_find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,</div><div class='add'>+				      u64 *start_ret, u64 *end_ret, u32 bits);</div><div class='ctx'> bool btrfs_find_delalloc_range(struct extent_io_tree *tree, u64 *start,</div><div class='ctx'> 			       u64 *end, u64 max_bytes,</div><div class='ctx'> 			       struct extent_state **cached_state);</div><div class='add'>+static inline int btrfs_lock_dio_extent(struct extent_io_tree *tree, u64 start,</div><div class='add'>+					u64 end, struct extent_state **cached)</div><div class='add'>+{</div><div class='add'>+	return btrfs_lock_extent_bits(tree, start, end, EXTENT_DIO_LOCKED, cached);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool btrfs_try_lock_dio_extent(struct extent_io_tree *tree, u64 start,</div><div class='add'>+					     u64 end, struct extent_state **cached)</div><div class='add'>+{</div><div class='add'>+	return btrfs_try_lock_extent_bits(tree, start, end, EXTENT_DIO_LOCKED, cached);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int btrfs_unlock_dio_extent(struct extent_io_tree *tree, u64 start,</div><div class='add'>+					  u64 end, struct extent_state **cached)</div><div class='add'>+{</div><div class='add'>+	return btrfs_clear_extent_bit_changeset(tree, start, end, EXTENT_DIO_LOCKED,</div><div class='add'>+						cached, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct extent_state *btrfs_next_extent_state(struct extent_io_tree *tree,</div><div class='add'>+					     struct extent_state *state);</div><div class='ctx'> </div><div class='ctx'> #endif /* BTRFS_EXTENT_IO_TREE_H */</div><div class='head'>diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c<br/>index f396aba92c57..e4cae34620d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent-tree.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/crc32c.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "extent-tree.h"</div><div class='del'>-#include "tree-log.h"</div><div class='add'>+#include "transaction.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "print-tree.h"</div><div class='ctx'> #include "volumes.h"</div><div class='hunk'>@@ -26,14 +26,11 @@</div><div class='ctx'> #include "locking.h"</div><div class='ctx'> #include "free-space-cache.h"</div><div class='ctx'> #include "free-space-tree.h"</div><div class='del'>-#include "sysfs.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "ref-verify.h"</div><div class='ctx'> #include "space-info.h"</div><div class='ctx'> #include "block-rsv.h"</div><div class='del'>-#include "delalloc-space.h"</div><div class='ctx'> #include "discard.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "zoned.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='ctx'> #include "fs.h"</div><div class='hunk'>@@ -43,15 +40,14 @@</div><div class='ctx'> #include "orphan.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='ctx'> #include "raid-stripe-tree.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='ctx'> </div><div class='ctx'> #undef SCRAMBLE_DELAYED_REFS</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_delayed_ref_head *href,</div><div class='del'>-			       struct btrfs_delayed_ref_node *node, u64 parent,</div><div class='del'>-			       u64 root_objectid, u64 owner_objectid,</div><div class='del'>-			       u64 owner_offset,</div><div class='add'>+			       const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 			       struct btrfs_delayed_extent_op *extra_op);</div><div class='ctx'> static void __run_delayed_extent_op(struct btrfs_delayed_extent_op *extent_op,</div><div class='ctx'> 				    struct extent_buffer *leaf,</div><div class='hunk'>@@ -61,12 +57,12 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				      u64 flags, u64 owner, u64 offset,</div><div class='ctx'> 				      struct btrfs_key *ins, int ref_mod, u64 oref_root);</div><div class='ctx'> static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,</div><div class='del'>-				     struct btrfs_delayed_ref_node *node,</div><div class='add'>+				     const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 				     struct btrfs_delayed_extent_op *extent_op);</div><div class='del'>-static int find_next_key(struct btrfs_path *path, int level,</div><div class='add'>+static int find_next_key(const struct btrfs_path *path, int level,</div><div class='ctx'> 			 struct btrfs_key *key);</div><div class='ctx'> </div><div class='del'>-static int block_group_bits(struct btrfs_block_group *cache, u64 bits)</div><div class='add'>+static int block_group_bits(const struct btrfs_block_group *cache, u64 bits)</div><div class='ctx'> {</div><div class='ctx'> 	return (cache-&gt;flags &amp; bits) == bits;</div><div class='ctx'> }</div><div class='hunk'>@@ -75,20 +71,17 @@ static int block_group_bits(struct btrfs_block_group *cache, u64 bits)</div><div class='ctx'> int btrfs_lookup_data_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_extent_root(fs_info, start);</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = start;</div><div class='del'>-	key.offset = len;</div><div class='ctx'> 	key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='del'>-	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	key.offset = len;</div><div class='add'>+	return btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -108,11 +101,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='ctx'> 	struct btrfs_delayed_ref_head *head;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	struct btrfs_extent_item *ei;</div><div class='del'>-	struct extent_buffer *leaf;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	u32 item_size;</div><div class='ctx'> 	u64 num_refs;</div><div class='ctx'> 	u64 extent_flags;</div><div class='ctx'> 	u64 owner = 0;</div><div class='hunk'>@@ -131,25 +121,20 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!trans) {</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> search_again:</div><div class='ctx'> 	key.objectid = bytenr;</div><div class='del'>-	key.offset = offset;</div><div class='ctx'> 	if (metadata)</div><div class='ctx'> 		key.type = BTRFS_METADATA_ITEM_KEY;</div><div class='ctx'> 	else</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+	key.offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	extent_root = btrfs_extent_root(fs_info, bytenr);</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, extent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0 &amp;&amp; metadata &amp;&amp; key.type == BTRFS_METADATA_ITEM_KEY) {</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; key.type == BTRFS_METADATA_ITEM_KEY) {</div><div class='ctx'> 		if (path-&gt;slots[0]) {</div><div class='ctx'> 			path-&gt;slots[0]--;</div><div class='ctx'> 			btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key,</div><div class='hunk'>@@ -162,41 +147,40 @@ search_again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		leaf = path-&gt;nodes[0];</div><div class='del'>-		item_size = btrfs_item_size(leaf, path-&gt;slots[0]);</div><div class='del'>-		if (item_size &gt;= sizeof(*ei)) {</div><div class='del'>-			ei = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='del'>-					    struct btrfs_extent_item);</div><div class='del'>-			num_refs = btrfs_extent_refs(leaf, ei);</div><div class='del'>-			extent_flags = btrfs_extent_flags(leaf, ei);</div><div class='del'>-			owner = btrfs_get_extent_owner_root(fs_info, leaf,</div><div class='del'>-							    path-&gt;slots[0]);</div><div class='del'>-		} else {</div><div class='add'>+		struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='add'>+		struct btrfs_extent_item *ei;</div><div class='add'>+		const u32 item_size = btrfs_item_size(leaf, path-&gt;slots[0]);</div><div class='add'>+</div><div class='add'>+		if (unlikely(item_size &lt; sizeof(*ei))) {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 			"unexpected extent item size, has %u expect &gt;= %zu",</div><div class='ctx'> 				  item_size, sizeof(*ei));</div><div class='del'>-			if (trans)</div><div class='del'>-				btrfs_abort_transaction(trans, ret);</div><div class='del'>-			else</div><div class='del'>-				btrfs_handle_fs_error(fs_info, ret, NULL);</div><div class='del'>-</div><div class='del'>-			goto out_free;</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		BUG_ON(num_refs == 0);</div><div class='add'>+		ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_extent_item);</div><div class='add'>+		num_refs = btrfs_extent_refs(leaf, ei);</div><div class='add'>+		if (unlikely(num_refs == 0)) {</div><div class='add'>+			ret = -EUCLEAN;</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+		"unexpected zero reference count for extent item " BTRFS_KEY_FMT,</div><div class='add'>+				  BTRFS_KEY_FMT_VALUE(&amp;key));</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		extent_flags = btrfs_extent_flags(leaf, ei);</div><div class='add'>+		owner = btrfs_get_extent_owner_root(fs_info, leaf, path-&gt;slots[0]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		num_refs = 0;</div><div class='ctx'> 		extent_flags = 0;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!trans)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='ctx'> 	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);</div><div class='add'>+	head = btrfs_find_delayed_ref_head(fs_info, delayed_refs, bytenr);</div><div class='ctx'> 	if (head) {</div><div class='ctx'> 		if (!mutex_trylock(&amp;head-&gt;mutex)) {</div><div class='ctx'> 			refcount_inc(&amp;head-&gt;refs);</div><div class='hunk'>@@ -216,15 +200,13 @@ search_again:</div><div class='ctx'> 		spin_lock(&amp;head-&gt;lock);</div><div class='ctx'> 		if (head-&gt;extent_op &amp;&amp; head-&gt;extent_op-&gt;update_flags)</div><div class='ctx'> 			extent_flags |= head-&gt;extent_op-&gt;flags_to_set;</div><div class='del'>-		else</div><div class='del'>-			BUG_ON(num_refs == 0);</div><div class='ctx'> </div><div class='ctx'> 		num_refs += head-&gt;ref_mod;</div><div class='ctx'> 		spin_unlock(&amp;head-&gt;lock);</div><div class='ctx'> 		mutex_unlock(&amp;head-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(num_refs == 0);</div><div class='ctx'> 	if (refs)</div><div class='ctx'> 		*refs = num_refs;</div><div class='hunk'>@@ -232,8 +214,7 @@ out:</div><div class='ctx'> 		*flags = extent_flags;</div><div class='ctx'> 	if (owning_root)</div><div class='ctx'> 		*owning_root = owner;</div><div class='del'>-out_free:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,11 +326,11 @@ out_free:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * is_data == BTRFS_REF_TYPE_BLOCK, tree block type is required,</div><div class='del'>- * is_data == BTRFS_REF_TYPE_DATA, data type is requiried,</div><div class='add'>+ * is_data == BTRFS_REF_TYPE_DATA, data type is required,</div><div class='ctx'>  * is_data == BTRFS_REF_TYPE_ANY, either type is OK.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_get_extent_inline_ref_type(const struct extent_buffer *eb,</div><div class='del'>-				     struct btrfs_extent_inline_ref *iref,</div><div class='add'>+				     const struct btrfs_extent_inline_ref *iref,</div><div class='ctx'> 				     enum btrfs_inline_ref_type is_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='hunk'>@@ -421,23 +402,23 @@ u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset)</div><div class='ctx'> 	return ((u64)high_crc &lt;&lt; 31) ^ (u64)low_crc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 hash_extent_data_ref_item(struct extent_buffer *leaf,</div><div class='del'>-				     struct btrfs_extent_data_ref *ref)</div><div class='add'>+static u64 hash_extent_data_ref_item(const struct extent_buffer *leaf,</div><div class='add'>+				     const struct btrfs_extent_data_ref *ref)</div><div class='ctx'> {</div><div class='ctx'> 	return hash_extent_data_ref(btrfs_extent_data_ref_root(leaf, ref),</div><div class='ctx'> 				    btrfs_extent_data_ref_objectid(leaf, ref),</div><div class='ctx'> 				    btrfs_extent_data_ref_offset(leaf, ref));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int match_extent_data_ref(struct extent_buffer *leaf,</div><div class='del'>-				 struct btrfs_extent_data_ref *ref,</div><div class='del'>-				 u64 root_objectid, u64 owner, u64 offset)</div><div class='add'>+static bool match_extent_data_ref(const struct extent_buffer *leaf,</div><div class='add'>+				  const struct btrfs_extent_data_ref *ref,</div><div class='add'>+				  u64 root_objectid, u64 owner, u64 offset)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_extent_data_ref_root(leaf, ref) != root_objectid ||</div><div class='ctx'> 	    btrfs_extent_data_ref_objectid(leaf, ref) != owner ||</div><div class='ctx'> 	    btrfs_extent_data_ref_offset(leaf, ref) != offset)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -451,9 +432,8 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_extent_data_ref *ref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	u32 nritems;</div><div class='del'>-	int ret;</div><div class='ctx'> 	int recow;</div><div class='del'>-	int err = -ENOENT;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = bytenr;</div><div class='ctx'> 	if (parent) {</div><div class='hunk'>@@ -467,26 +447,26 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> again:</div><div class='ctx'> 	recow = 0;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		err = ret;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (parent) {</div><div class='del'>-		if (!ret)</div><div class='del'>-			return 0;</div><div class='del'>-		goto fail;</div><div class='add'>+		if (ret)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = -ENOENT;</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	nritems = btrfs_header_nritems(leaf);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (path-&gt;slots[0] &gt;= nritems) {</div><div class='ctx'> 			ret = btrfs_next_leaf(root, path);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				err = ret;</div><div class='del'>-			if (ret)</div><div class='del'>-				goto fail;</div><div class='add'>+			if (ret) {</div><div class='add'>+				if (ret &gt; 0)</div><div class='add'>+					return -ENOENT;</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			leaf = path-&gt;nodes[0];</div><div class='ctx'> 			nritems = btrfs_header_nritems(leaf);</div><div class='hunk'>@@ -507,37 +487,37 @@ again:</div><div class='ctx'> 				btrfs_release_path(path);</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			}</div><div class='del'>-			err = 0;</div><div class='add'>+			ret = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		path-&gt;slots[0]++;</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					   struct btrfs_path *path,</div><div class='del'>-					   u64 bytenr, u64 parent,</div><div class='del'>-					   u64 root_objectid, u64 owner,</div><div class='del'>-					   u64 offset, int refs_to_add)</div><div class='add'>+					   const struct btrfs_delayed_ref_node *node,</div><div class='add'>+					   u64 bytenr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_extent_root(trans-&gt;fs_info, bytenr);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='add'>+	u64 owner = btrfs_delayed_ref_owner(node);</div><div class='add'>+	u64 offset = btrfs_delayed_ref_offset(node);</div><div class='ctx'> 	u32 size;</div><div class='ctx'> 	u32 num_refs;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = bytenr;</div><div class='del'>-	if (parent) {</div><div class='add'>+	if (node-&gt;parent) {</div><div class='ctx'> 		key.type = BTRFS_SHARED_DATA_REF_KEY;</div><div class='del'>-		key.offset = parent;</div><div class='add'>+		key.offset = node-&gt;parent;</div><div class='ctx'> 		size = sizeof(struct btrfs_shared_data_ref);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		key.type = BTRFS_EXTENT_DATA_REF_KEY;</div><div class='del'>-		key.offset = hash_extent_data_ref(root_objectid,</div><div class='del'>-						  owner, offset);</div><div class='add'>+		key.offset = hash_extent_data_ref(node-&gt;ref_root, owner, offset);</div><div class='ctx'> 		size = sizeof(struct btrfs_extent_data_ref);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -546,15 +526,15 @@ static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='del'>-	if (parent) {</div><div class='add'>+	if (node-&gt;parent) {</div><div class='ctx'> 		struct btrfs_shared_data_ref *ref;</div><div class='ctx'> 		ref = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 				     struct btrfs_shared_data_ref);</div><div class='ctx'> 		if (ret == 0) {</div><div class='del'>-			btrfs_set_shared_data_ref_count(leaf, ref, refs_to_add);</div><div class='add'>+			btrfs_set_shared_data_ref_count(leaf, ref, node-&gt;ref_mod);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			num_refs = btrfs_shared_data_ref_count(leaf, ref);</div><div class='del'>-			num_refs += refs_to_add;</div><div class='add'>+			num_refs += node-&gt;ref_mod;</div><div class='ctx'> 			btrfs_set_shared_data_ref_count(leaf, ref, num_refs);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -562,7 +542,7 @@ static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		while (ret == -EEXIST) {</div><div class='ctx'> 			ref = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 					     struct btrfs_extent_data_ref);</div><div class='del'>-			if (match_extent_data_ref(leaf, ref, root_objectid,</div><div class='add'>+			if (match_extent_data_ref(leaf, ref, node-&gt;ref_root,</div><div class='ctx'> 						  owner, offset))</div><div class='ctx'> 				break;</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='hunk'>@@ -577,18 +557,16 @@ static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ref = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 				     struct btrfs_extent_data_ref);</div><div class='ctx'> 		if (ret == 0) {</div><div class='del'>-			btrfs_set_extent_data_ref_root(leaf, ref,</div><div class='del'>-						       root_objectid);</div><div class='add'>+			btrfs_set_extent_data_ref_root(leaf, ref, node-&gt;ref_root);</div><div class='ctx'> 			btrfs_set_extent_data_ref_objectid(leaf, ref, owner);</div><div class='ctx'> 			btrfs_set_extent_data_ref_offset(leaf, ref, offset);</div><div class='del'>-			btrfs_set_extent_data_ref_count(leaf, ref, refs_to_add);</div><div class='add'>+			btrfs_set_extent_data_ref_count(leaf, ref, node-&gt;ref_mod);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			num_refs = btrfs_extent_data_ref_count(leaf, ref);</div><div class='del'>-			num_refs += refs_to_add;</div><div class='add'>+			num_refs += node-&gt;ref_mod;</div><div class='ctx'> 			btrfs_set_extent_data_ref_count(leaf, ref, num_refs);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> fail:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='hunk'>@@ -620,8 +598,8 @@ static noinline int remove_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		num_refs = btrfs_shared_data_ref_count(leaf, ref2);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_err(trans-&gt;fs_info,</div><div class='del'>-			  "unrecognized backref key (%llu %u %llu)",</div><div class='del'>-			  key.objectid, key.type, key.offset);</div><div class='add'>+			  "unrecognized backref key " BTRFS_KEY_FMT,</div><div class='add'>+			  BTRFS_KEY_FMT_VALUE(&amp;key));</div><div class='ctx'> 		btrfs_abort_transaction(trans, -EUCLEAN);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -636,18 +614,17 @@ static noinline int remove_extent_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			btrfs_set_extent_data_ref_count(leaf, ref1, num_refs);</div><div class='ctx'> 		else if (key.type == BTRFS_SHARED_DATA_REF_KEY)</div><div class='ctx'> 			btrfs_set_shared_data_ref_count(leaf, ref2, num_refs);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline u32 extent_data_ref_count(struct btrfs_path *path,</div><div class='del'>-					  struct btrfs_extent_inline_ref *iref)</div><div class='add'>+static noinline u32 extent_data_ref_count(const struct btrfs_path *path,</div><div class='add'>+					  const struct btrfs_extent_inline_ref *iref)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_extent_data_ref *ref1;</div><div class='del'>-	struct btrfs_shared_data_ref *ref2;</div><div class='add'>+	const struct btrfs_extent_data_ref *ref1;</div><div class='add'>+	const struct btrfs_shared_data_ref *ref2;</div><div class='ctx'> 	u32 num_refs = 0;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='hunk'>@@ -662,10 +639,10 @@ static noinline u32 extent_data_ref_count(struct btrfs_path *path,</div><div class='ctx'> 		type = btrfs_get_extent_inline_ref_type(leaf, iref, BTRFS_REF_TYPE_DATA);</div><div class='ctx'> 		ASSERT(type != BTRFS_REF_TYPE_INVALID);</div><div class='ctx'> 		if (type == BTRFS_EXTENT_DATA_REF_KEY) {</div><div class='del'>-			ref1 = (struct btrfs_extent_data_ref *)(&amp;iref-&gt;offset);</div><div class='add'>+			ref1 = (const struct btrfs_extent_data_ref *)(&amp;iref-&gt;offset);</div><div class='ctx'> 			num_refs = btrfs_extent_data_ref_count(leaf, ref1);</div><div class='ctx'> 		} else {</div><div class='del'>-			ref2 = (struct btrfs_shared_data_ref *)(iref + 1);</div><div class='add'>+			ref2 = (const struct btrfs_shared_data_ref *)(iref + 1);</div><div class='ctx'> 			num_refs = btrfs_shared_data_ref_count(leaf, ref2);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (key.type == BTRFS_EXTENT_DATA_REF_KEY) {</div><div class='hunk'>@@ -708,20 +685,20 @@ static noinline int lookup_tree_block_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> static noinline int insert_tree_block_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					  struct btrfs_path *path,</div><div class='del'>-					  u64 bytenr, u64 parent,</div><div class='del'>-					  u64 root_objectid)</div><div class='add'>+					  const struct btrfs_delayed_ref_node *node,</div><div class='add'>+					  u64 bytenr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_extent_root(trans-&gt;fs_info, bytenr);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = bytenr;</div><div class='del'>-	if (parent) {</div><div class='add'>+	if (node-&gt;parent) {</div><div class='ctx'> 		key.type = BTRFS_SHARED_BLOCK_REF_KEY;</div><div class='del'>-		key.offset = parent;</div><div class='add'>+		key.offset = node-&gt;parent;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		key.type = BTRFS_TREE_BLOCK_REF_KEY;</div><div class='del'>-		key.offset = root_objectid;</div><div class='add'>+		key.offset = node-&gt;ref_root;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='hunk'>@@ -746,7 +723,7 @@ static inline int extent_ref_type(u64 parent, u64 owner)</div><div class='ctx'> 	return type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int find_next_key(struct btrfs_path *path, int level,</div><div class='add'>+static int find_next_key(const struct btrfs_path *path, int level,</div><div class='ctx'> 			 struct btrfs_key *key)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='hunk'>@@ -812,8 +789,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	want = extent_ref_type(parent, owner);</div><div class='ctx'> 	if (insert) {</div><div class='ctx'> 		extra_size = btrfs_extent_inline_ref_size(want);</div><div class='del'>-		path-&gt;search_for_extension = 1;</div><div class='del'>-		path-&gt;keep_locks = 1;</div><div class='add'>+		path-&gt;search_for_extension = true;</div><div class='ctx'> 	} else</div><div class='ctx'> 		extra_size = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -904,7 +880,7 @@ again:</div><div class='ctx'> 			ptr += btrfs_extent_inline_ref_size(type);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (type == BTRFS_REF_TYPE_INVALID) {</div><div class='add'>+		if (unlikely(type == BTRFS_REF_TYPE_INVALID)) {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -964,6 +940,25 @@ again:</div><div class='ctx'> 			ret = -EAGAIN;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (path-&gt;slots[0] + 1 &lt; btrfs_header_nritems(path-&gt;nodes[0])) {</div><div class='add'>+			struct btrfs_key tmp_key;</div><div class='add'>+</div><div class='add'>+			btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;tmp_key, path-&gt;slots[0] + 1);</div><div class='add'>+			if (tmp_key.objectid == bytenr &amp;&amp;</div><div class='add'>+			    tmp_key.type &lt; BTRFS_BLOCK_GROUP_ITEM_KEY) {</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			goto out_no_entry;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!path-&gt;keep_locks) {</div><div class='add'>+			btrfs_release_path(path);</div><div class='add'>+			path-&gt;keep_locks = true;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * To add new inline back ref, we have to make sure</div><div class='ctx'> 		 * there is no corresponding back ref item.</div><div class='hunk'>@@ -977,13 +972,15 @@ again:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+out_no_entry:</div><div class='ctx'> 	*ref_ret = (struct btrfs_extent_inline_ref *)ptr;</div><div class='ctx'> out:</div><div class='del'>-	if (insert) {</div><div class='del'>-		path-&gt;keep_locks = 0;</div><div class='del'>-		path-&gt;search_for_extension = 0;</div><div class='add'>+	if (path-&gt;keep_locks) {</div><div class='add'>+		path-&gt;keep_locks = false;</div><div class='ctx'> 		btrfs_unlock_up_safe(path, 1);</div><div class='ctx'> 	}</div><div class='add'>+	if (insert)</div><div class='add'>+		path-&gt;search_for_extension = false;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1048,7 +1045,6 @@ void setup_inline_extent_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_set_extent_inline_ref_offset(leaf, iref, root_objectid);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lookup_extent_backref(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -1193,7 +1189,6 @@ static noinline_for_stack int update_inline_extent_backref(</div><div class='ctx'> 		item_size -= size;</div><div class='ctx'> 		btrfs_truncate_item(trans, path, item_size, 1);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1216,7 +1211,7 @@ int insert_inline_extent_backref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * We're adding refs to a tree block we already own, this</div><div class='ctx'> 		 * should not happen at all.</div><div class='ctx'> 		 */</div><div class='del'>-		if (owner &lt; BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+		if (unlikely(owner &lt; BTRFS_FIRST_FREE_OBJECTID)) {</div><div class='ctx'> 			btrfs_print_leaf(path-&gt;nodes[0]);</div><div class='ctx'> 			btrfs_crit(trans-&gt;fs_info,</div><div class='ctx'> "adding refs to an existing tree ref, bytenr %llu num_bytes %llu root_objectid %llu slot %u",</div><div class='hunk'>@@ -1258,11 +1253,12 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,</div><div class='ctx'> {</div><div class='ctx'> 	int j, ret = 0;</div><div class='ctx'> 	u64 bytes_left, end;</div><div class='del'>-	u64 aligned_start = ALIGN(start, 1 &lt;&lt; SECTOR_SHIFT);</div><div class='add'>+	u64 aligned_start = ALIGN(start, SECTOR_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(start != aligned_start)) {</div><div class='add'>+	/* Adjust the range to be aligned to 512B sectors if necessary. */</div><div class='add'>+	if (start != aligned_start) {</div><div class='ctx'> 		len -= aligned_start - start;</div><div class='del'>-		len = round_down(len, 1 &lt;&lt; SECTOR_SHIFT);</div><div class='add'>+		len = round_down(len, SECTOR_SIZE);</div><div class='ctx'> 		start = aligned_start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1317,13 +1313,29 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,</div><div class='ctx'> 		bytes_left = end - start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bytes_left) {</div><div class='add'>+	while (bytes_left) {</div><div class='add'>+		u64 bytes_to_discard = min(BTRFS_MAX_DISCARD_CHUNK_SIZE, bytes_left);</div><div class='add'>+</div><div class='ctx'> 		ret = blkdev_issue_discard(bdev, start &gt;&gt; SECTOR_SHIFT,</div><div class='del'>-					   bytes_left &gt;&gt; SECTOR_SHIFT,</div><div class='add'>+					   bytes_to_discard &gt;&gt; SECTOR_SHIFT,</div><div class='ctx'> 					   GFP_NOFS);</div><div class='del'>-		if (!ret)</div><div class='del'>-			*discarded_bytes += bytes_left;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret != -EOPNOTSUPP)</div><div class='add'>+				break;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		start += bytes_to_discard;</div><div class='add'>+		bytes_left -= bytes_to_discard;</div><div class='add'>+		*discarded_bytes += bytes_to_discard;</div><div class='add'>+</div><div class='add'>+		if (btrfs_trim_interrupted()) {</div><div class='add'>+			ret = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1441,7 +1453,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ASSERT(generic_ref-&gt;type != BTRFS_REF_NOT_SET &amp;&amp;</div><div class='ctx'> 	       generic_ref-&gt;action);</div><div class='ctx'> 	BUG_ON(generic_ref-&gt;type == BTRFS_REF_METADATA &amp;&amp;</div><div class='del'>-	       generic_ref-&gt;tree_ref.ref_root == BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	       generic_ref-&gt;ref_root == BTRFS_TREE_LOG_OBJECTID);</div><div class='ctx'> </div><div class='ctx'> 	if (generic_ref-&gt;type == BTRFS_REF_METADATA)</div><div class='ctx'> 		ret = btrfs_add_delayed_tree_ref(trans, generic_ref, NULL);</div><div class='hunk'>@@ -1464,42 +1476,22 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * @node:	    The delayed ref node used to get the bytenr/length for</div><div class='ctx'>  *		    extent whose references are incremented.</div><div class='ctx'>  *</div><div class='del'>- * @parent:	    If this is a shared extent (BTRFS_SHARED_DATA_REF_KEY/</div><div class='del'>- *		    BTRFS_SHARED_BLOCK_REF_KEY) then it holds the logical</div><div class='del'>- *		    bytenr of the parent block. Since new extents are always</div><div class='del'>- *		    created with indirect references, this will only be the case</div><div class='del'>- *		    when relocating a shared extent. In that case, root_objectid</div><div class='del'>- *		    will be BTRFS_TREE_RELOC_OBJECTID. Otherwise, parent must</div><div class='del'>- *		    be 0</div><div class='del'>- *</div><div class='del'>- * @root_objectid:  The id of the root where this modification has originated,</div><div class='del'>- *		    this can be either one of the well-known metadata trees or</div><div class='del'>- *		    the subvolume id which references this extent.</div><div class='del'>- *</div><div class='del'>- * @owner:	    For data extents it is the inode number of the owning file.</div><div class='del'>- *		    For metadata extents this parameter holds the level in the</div><div class='del'>- *		    tree of the extent.</div><div class='del'>- *</div><div class='del'>- * @offset:	    For metadata extents the offset is ignored and is currently</div><div class='del'>- *		    always passed as 0. For data extents it is the fileoffset</div><div class='del'>- *		    this extent belongs to.</div><div class='del'>- *</div><div class='ctx'>  * @extent_op       Pointer to a structure, holding information necessary when</div><div class='ctx'>  *                  updating a tree block's flags</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_delayed_ref_node *node,</div><div class='del'>-				  u64 parent, u64 root_objectid,</div><div class='del'>-				  u64 owner, u64 offset,</div><div class='add'>+				  const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 				  struct btrfs_delayed_extent_op *extent_op)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_extent_item *item;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 bytenr = node-&gt;bytenr;</div><div class='ctx'> 	u64 num_bytes = node-&gt;num_bytes;</div><div class='add'>+	u64 owner = btrfs_delayed_ref_owner(node);</div><div class='add'>+	u64 offset = btrfs_delayed_ref_offset(node);</div><div class='ctx'> 	u64 refs;</div><div class='ctx'> 	int refs_to_add = node-&gt;ref_mod;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1510,10 +1502,10 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* this will setup the path even if it fails to insert the back ref */</div><div class='ctx'> 	ret = insert_inline_extent_backref(trans, path, bytenr, num_bytes,</div><div class='del'>-					   parent, root_objectid, owner,</div><div class='add'>+					   node-&gt;parent, node-&gt;ref_root, owner,</div><div class='ctx'> 					   offset, refs_to_add, extent_op);</div><div class='ctx'> 	if ((ret &lt; 0 &amp;&amp; ret != -EAGAIN) || !ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ok we had -EAGAIN which means we didn't have space to insert and</div><div class='hunk'>@@ -1528,27 +1520,24 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (extent_op)</div><div class='ctx'> 		__run_delayed_extent_op(extent_op, leaf, item);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	/* now insert the actual backref */</div><div class='del'>-	if (owner &lt; BTRFS_FIRST_FREE_OBJECTID)</div><div class='del'>-		ret = insert_tree_block_ref(trans, path, bytenr, parent,</div><div class='del'>-					    root_objectid);</div><div class='del'>-	else</div><div class='del'>-		ret = insert_extent_data_ref(trans, path, bytenr, parent,</div><div class='del'>-					     root_objectid, owner, offset,</div><div class='del'>-					     refs_to_add);</div><div class='add'>+	if (owner &lt; BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+		ret = insert_tree_block_ref(trans, path, node, bytenr);</div><div class='add'>+		if (ret)</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+	} else {</div><div class='add'>+		ret = insert_extent_data_ref(trans, path, node, bytenr);</div><div class='add'>+		if (ret)</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_head_ref_squota_rsv(struct btrfs_fs_info *fs_info,</div><div class='del'>-				     struct btrfs_delayed_ref_head *href)</div><div class='add'>+				     const struct btrfs_delayed_ref_head *href)</div><div class='ctx'> {</div><div class='ctx'> 	u64 root = href-&gt;owning_root;</div><div class='ctx'> </div><div class='hunk'>@@ -1557,7 +1546,7 @@ static void free_head_ref_squota_rsv(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * where it has already been unset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) != BTRFS_QGROUP_MODE_SIMPLE ||</div><div class='del'>-	    !href-&gt;is_data || !is_fstree(root))</div><div class='add'>+	    !href-&gt;is_data || !btrfs_is_fstree(root))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_qgroup_free_refroot(fs_info, root, href-&gt;reserved_bytes,</div><div class='hunk'>@@ -1566,20 +1555,18 @@ static void free_head_ref_squota_rsv(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static int run_delayed_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct btrfs_delayed_ref_head *href,</div><div class='del'>-				struct btrfs_delayed_ref_node *node,</div><div class='add'>+				const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 				struct btrfs_delayed_extent_op *extent_op,</div><div class='ctx'> 				bool insert_reserved)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct btrfs_delayed_data_ref *ref;</div><div class='ctx'> 	u64 parent = 0;</div><div class='ctx'> 	u64 flags = 0;</div><div class='ctx'> </div><div class='del'>-	ref = btrfs_delayed_node_to_data_ref(node);</div><div class='del'>-	trace_run_delayed_data_ref(trans-&gt;fs_info, node, ref, node-&gt;action);</div><div class='add'>+	trace_run_delayed_data_ref(trans-&gt;fs_info, node);</div><div class='ctx'> </div><div class='ctx'> 	if (node-&gt;type == BTRFS_SHARED_DATA_REF_KEY)</div><div class='del'>-		parent = ref-&gt;parent;</div><div class='add'>+		parent = node-&gt;parent;</div><div class='ctx'> </div><div class='ctx'> 	if (node-&gt;action == BTRFS_ADD_DELAYED_REF &amp;&amp; insert_reserved) {</div><div class='ctx'> 		struct btrfs_key key;</div><div class='hunk'>@@ -1590,6 +1577,8 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			.is_inc	= true,</div><div class='ctx'> 			.generation = trans-&gt;transid,</div><div class='ctx'> 		};</div><div class='add'>+		u64 owner = btrfs_delayed_ref_owner(node);</div><div class='add'>+		u64 offset = btrfs_delayed_ref_offset(node);</div><div class='ctx'> </div><div class='ctx'> 		if (extent_op)</div><div class='ctx'> 			flags |= extent_op-&gt;flags_to_set;</div><div class='hunk'>@@ -1598,21 +1587,17 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='ctx'> 		key.offset = node-&gt;num_bytes;</div><div class='ctx'> </div><div class='del'>-		ret = alloc_reserved_file_extent(trans, parent, ref-&gt;root,</div><div class='del'>-						 flags, ref-&gt;objectid,</div><div class='del'>-						 ref-&gt;offset, &amp;key,</div><div class='del'>-						 node-&gt;ref_mod, href-&gt;owning_root);</div><div class='add'>+		ret = alloc_reserved_file_extent(trans, parent, node-&gt;ref_root,</div><div class='add'>+						 flags, owner, offset, &amp;key,</div><div class='add'>+						 node-&gt;ref_mod,</div><div class='add'>+						 href-&gt;owning_root);</div><div class='ctx'> 		free_head_ref_squota_rsv(trans-&gt;fs_info, href);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = btrfs_record_squota_delta(trans-&gt;fs_info, &amp;delta);</div><div class='ctx'> 	} else if (node-&gt;action == BTRFS_ADD_DELAYED_REF) {</div><div class='del'>-		ret = __btrfs_inc_extent_ref(trans, node, parent, ref-&gt;root,</div><div class='del'>-					     ref-&gt;objectid, ref-&gt;offset,</div><div class='del'>-					     extent_op);</div><div class='add'>+		ret = __btrfs_inc_extent_ref(trans, node, extent_op);</div><div class='ctx'> 	} else if (node-&gt;action == BTRFS_DROP_DELAYED_REF) {</div><div class='del'>-		ret = __btrfs_free_extent(trans, href, node, parent,</div><div class='del'>-					  ref-&gt;root, ref-&gt;objectid,</div><div class='del'>-					  ref-&gt;offset, extent_op);</div><div class='add'>+		ret = __btrfs_free_extent(trans, href, node, extent_op);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1638,13 +1623,13 @@ static void __run_delayed_extent_op(struct btrfs_delayed_extent_op *extent_op,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int run_delayed_extent_op(struct btrfs_trans_handle *trans,</div><div class='del'>-				 struct btrfs_delayed_ref_head *head,</div><div class='add'>+				 const struct btrfs_delayed_ref_head *head,</div><div class='ctx'> 				 struct btrfs_delayed_extent_op *extent_op)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_extent_item *ei;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	u32 item_size;</div><div class='hunk'>@@ -1665,7 +1650,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (metadata) {</div><div class='ctx'> 		key.type = BTRFS_METADATA_ITEM_KEY;</div><div class='del'>-		key.offset = extent_op-&gt;level;</div><div class='add'>+		key.offset = head-&gt;level;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='ctx'> 		key.offset = head-&gt;num_bytes;</div><div class='hunk'>@@ -1675,7 +1660,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans,</div><div class='ctx'> again:</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else if (ret &gt; 0) {</div><div class='ctx'> 		if (metadata) {</div><div class='ctx'> 			if (path-&gt;slots[0] &gt; 0) {</div><div class='hunk'>@@ -1692,16 +1677,16 @@ again:</div><div class='ctx'> 				metadata = 0;</div><div class='ctx'> </div><div class='ctx'> 				key.objectid = head-&gt;bytenr;</div><div class='del'>-				key.offset = head-&gt;num_bytes;</div><div class='ctx'> 				key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+				key.offset = head-&gt;num_bytes;</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 		  "missing extent item for extent %llu num_bytes %llu level %d",</div><div class='del'>-				  head-&gt;bytenr, head-&gt;num_bytes, extent_op-&gt;level);</div><div class='del'>-			goto out;</div><div class='add'>+				  head-&gt;bytenr, head-&gt;num_bytes, head-&gt;level);</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1714,36 +1699,31 @@ again:</div><div class='ctx'> 			  "unexpected extent item size, has %u expect &gt;= %zu",</div><div class='ctx'> 			  item_size, sizeof(*ei));</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_extent_item);</div><div class='ctx'> 	__run_delayed_extent_op(extent_op, leaf, ei);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct btrfs_delayed_ref_head *href,</div><div class='del'>-				struct btrfs_delayed_ref_node *node,</div><div class='add'>+				const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 				struct btrfs_delayed_extent_op *extent_op,</div><div class='ctx'> 				bool insert_reserved)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_delayed_tree_ref *ref;</div><div class='ctx'> 	u64 parent = 0;</div><div class='ctx'> 	u64 ref_root = 0;</div><div class='ctx'> </div><div class='del'>-	ref = btrfs_delayed_node_to_tree_ref(node);</div><div class='del'>-	trace_run_delayed_tree_ref(trans-&gt;fs_info, node, ref, node-&gt;action);</div><div class='add'>+	trace_run_delayed_tree_ref(trans-&gt;fs_info, node);</div><div class='ctx'> </div><div class='ctx'> 	if (node-&gt;type == BTRFS_SHARED_BLOCK_REF_KEY)</div><div class='del'>-		parent = ref-&gt;parent;</div><div class='del'>-	ref_root = ref-&gt;root;</div><div class='add'>+		parent = node-&gt;parent;</div><div class='add'>+	ref_root = node-&gt;ref_root;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(node-&gt;ref_mod != 1)) {</div><div class='ctx'> 		btrfs_err(trans-&gt;fs_info,</div><div class='hunk'>@@ -1761,16 +1741,13 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			.generation = trans-&gt;transid,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		BUG_ON(!extent_op || !extent_op-&gt;update_flags);</div><div class='ctx'> 		ret = alloc_reserved_tree_block(trans, node, extent_op);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			btrfs_record_squota_delta(fs_info, &amp;delta);</div><div class='ctx'> 	} else if (node-&gt;action == BTRFS_ADD_DELAYED_REF) {</div><div class='del'>-		ret = __btrfs_inc_extent_ref(trans, node, parent, ref_root,</div><div class='del'>-					     ref-&gt;level, 0, extent_op);</div><div class='add'>+		ret = __btrfs_inc_extent_ref(trans, node, extent_op);</div><div class='ctx'> 	} else if (node-&gt;action == BTRFS_DROP_DELAYED_REF) {</div><div class='del'>-		ret = __btrfs_free_extent(trans, href, node, parent, ref_root,</div><div class='del'>-					  ref-&gt;level, 0, extent_op);</div><div class='add'>+		ret = __btrfs_free_extent(trans, href, node, extent_op);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1780,7 +1757,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> /* helper function to actually process a single delayed ref entry */</div><div class='ctx'> static int run_one_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_delayed_ref_head *href,</div><div class='del'>-			       struct btrfs_delayed_ref_node *node,</div><div class='add'>+			       const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 			       struct btrfs_delayed_extent_op *extent_op,</div><div class='ctx'> 			       bool insert_reserved)</div><div class='ctx'> {</div><div class='hunk'>@@ -1788,7 +1765,7 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (TRANS_ABORTED(trans)) {</div><div class='ctx'> 		if (insert_reserved) {</div><div class='del'>-			btrfs_pin_extent(trans, node-&gt;bytenr, node-&gt;num_bytes, 1);</div><div class='add'>+			btrfs_pin_extent(trans, node-&gt;bytenr, node-&gt;num_bytes);</div><div class='ctx'> 			free_head_ref_squota_rsv(trans-&gt;fs_info, href);</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1807,7 +1784,7 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	if (ret &amp;&amp; insert_reserved)</div><div class='del'>-		btrfs_pin_extent(trans, node-&gt;bytenr, node-&gt;num_bytes, 1);</div><div class='add'>+		btrfs_pin_extent(trans, node-&gt;bytenr, node-&gt;num_bytes);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		btrfs_err(trans-&gt;fs_info,</div><div class='ctx'> "failed to run delayed ref for logical %llu num_bytes %llu type %u action %u ref_mod %d: %d",</div><div class='hunk'>@@ -1816,40 +1793,6 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct btrfs_delayed_ref_node *</div><div class='del'>-select_delayed_ref(struct btrfs_delayed_ref_head *head)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_delayed_ref_node *ref;</div><div class='del'>-</div><div class='del'>-	if (RB_EMPTY_ROOT(&amp;head-&gt;ref_tree.rb_root))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Select a delayed ref of type BTRFS_ADD_DELAYED_REF first.</div><div class='del'>-	 * This is to prevent a ref count from going down to zero, which deletes</div><div class='del'>-	 * the extent item from the extent tree, when there still are references</div><div class='del'>-	 * to add, which would fail because they would not find the extent item.</div><div class='del'>-	 */</div><div class='del'>-	if (!list_empty(&amp;head-&gt;ref_add_list))</div><div class='del'>-		return list_first_entry(&amp;head-&gt;ref_add_list,</div><div class='del'>-				struct btrfs_delayed_ref_node, add_list);</div><div class='del'>-</div><div class='del'>-	ref = rb_entry(rb_first_cached(&amp;head-&gt;ref_tree),</div><div class='del'>-		       struct btrfs_delayed_ref_node, ref_node);</div><div class='del'>-	ASSERT(list_empty(&amp;ref-&gt;add_list));</div><div class='del'>-	return ref;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unselect_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs,</div><div class='del'>-				      struct btrfs_delayed_ref_head *head)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	head-&gt;processing = false;</div><div class='del'>-	delayed_refs-&gt;num_heads_ready++;</div><div class='del'>-	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	btrfs_delayed_ref_unlock(head);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct btrfs_delayed_extent_op *cleanup_extent_op(</div><div class='ctx'> 				struct btrfs_delayed_ref_head *head)</div><div class='ctx'> {</div><div class='hunk'>@@ -1924,7 +1867,7 @@ static int cleanup_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = run_and_cleanup_extent_op(trans, head);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		unselect_delayed_ref_head(delayed_refs, head);</div><div class='add'>+		btrfs_unselect_ref_head(delayed_refs, head);</div><div class='ctx'> 		btrfs_debug(fs_info, "run_delayed_extent_op returned %d", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	} else if (ret) {</div><div class='hunk'>@@ -1943,12 +1886,12 @@ static int cleanup_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_delete_ref_head(delayed_refs, head);</div><div class='add'>+	btrfs_delete_ref_head(fs_info, delayed_refs, head);</div><div class='ctx'> 	spin_unlock(&amp;head-&gt;lock);</div><div class='ctx'> 	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (head-&gt;must_insert_reserved) {</div><div class='del'>-		btrfs_pin_extent(trans, head-&gt;bytenr, head-&gt;num_bytes, 1);</div><div class='add'>+		btrfs_pin_extent(trans, head-&gt;bytenr, head-&gt;num_bytes);</div><div class='ctx'> 		if (head-&gt;is_data) {</div><div class='ctx'> 			struct btrfs_root *csum_root;</div><div class='ctx'> </div><div class='hunk'>@@ -1966,39 +1909,6 @@ static int cleanup_ref_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct btrfs_delayed_ref_head *btrfs_obtain_ref_head(</div><div class='del'>-					struct btrfs_trans_handle *trans)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_delayed_ref_root *delayed_refs =</div><div class='del'>-		&amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='del'>-	struct btrfs_delayed_ref_head *head = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	head = btrfs_select_ref_head(delayed_refs);</div><div class='del'>-	if (!head) {</div><div class='del'>-		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-		return head;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Grab the lock that says we are going to process all the refs for</div><div class='del'>-	 * this head</div><div class='del'>-	 */</div><div class='del'>-	ret = btrfs_delayed_ref_lock(delayed_refs, head);</div><div class='del'>-	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We may have dropped the spin lock to get the head mutex lock, and</div><div class='del'>-	 * that might have given someone else time to free the head.  If that's</div><div class='del'>-	 * true, it has been removed from our list and we can move on.</div><div class='del'>-	 */</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		head = ERR_PTR(-EAGAIN);</div><div class='del'>-</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					   struct btrfs_delayed_ref_head *locked_ref,</div><div class='ctx'> 					   u64 *bytes_released)</div><div class='hunk'>@@ -2015,11 +1925,11 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	lockdep_assert_held(&amp;locked_ref-&gt;mutex);</div><div class='ctx'> 	lockdep_assert_held(&amp;locked_ref-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	while ((ref = select_delayed_ref(locked_ref))) {</div><div class='add'>+	while ((ref = btrfs_select_delayed_ref(locked_ref))) {</div><div class='ctx'> 		if (ref-&gt;seq &amp;&amp;</div><div class='ctx'> 		    btrfs_check_delayed_seq(fs_info, ref-&gt;seq)) {</div><div class='ctx'> 			spin_unlock(&amp;locked_ref-&gt;lock);</div><div class='del'>-			unselect_delayed_ref_head(delayed_refs, locked_ref);</div><div class='add'>+			btrfs_unselect_ref_head(delayed_refs, locked_ref);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2042,7 +1952,6 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		default:</div><div class='ctx'> 			WARN_ON(1);</div><div class='ctx'> 		}</div><div class='del'>-		atomic_dec(&amp;delayed_refs-&gt;num_entries);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Record the must_insert_reserved flag before we drop the</div><div class='hunk'>@@ -2068,7 +1977,7 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		btrfs_free_delayed_extent_op(extent_op);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			unselect_delayed_ref_head(delayed_refs, locked_ref);</div><div class='add'>+			btrfs_unselect_ref_head(delayed_refs, locked_ref);</div><div class='ctx'> 			btrfs_put_delayed_ref(ref);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2100,13 +2009,18 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='ctx'> 	if (min_bytes == 0) {</div><div class='del'>-		max_count = delayed_refs-&gt;num_heads_ready;</div><div class='add'>+		/*</div><div class='add'>+		 * We may be subject to a harmless race if some task is</div><div class='add'>+		 * concurrently adding or removing a delayed ref, so silence</div><div class='add'>+		 * KCSAN and similar tools.</div><div class='add'>+		 */</div><div class='add'>+		max_count = data_race(delayed_refs-&gt;num_heads_ready);</div><div class='ctx'> 		min_bytes = U64_MAX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!locked_ref) {</div><div class='del'>-			locked_ref = btrfs_obtain_ref_head(trans);</div><div class='add'>+			locked_ref = btrfs_select_ref_head(fs_info, delayed_refs);</div><div class='ctx'> 			if (IS_ERR_OR_NULL(locked_ref)) {</div><div class='ctx'> 				if (PTR_ERR(locked_ref) == -EAGAIN) {</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -2244,7 +2158,7 @@ again:</div><div class='ctx'> 	delayed_refs-&gt;run_delayed_start = find_middle(&amp;delayed_refs-&gt;root);</div><div class='ctx'> #endif</div><div class='ctx'> 	ret = __btrfs_run_delayed_refs(trans, min_bytes);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2253,7 +2167,7 @@ again:</div><div class='ctx'> 		btrfs_create_pending_block_groups(trans);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-		if (RB_EMPTY_ROOT(&amp;delayed_refs-&gt;href_root.rb_root)) {</div><div class='add'>+		if (xa_empty(&amp;delayed_refs-&gt;head_refs)) {</div><div class='ctx'> 			spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2270,7 +2184,6 @@ int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct extent_buffer *eb, u64 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_delayed_extent_op *extent_op;</div><div class='del'>-	int level = btrfs_header_level(eb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	extent_op = btrfs_alloc_delayed_extent_op();</div><div class='hunk'>@@ -2280,21 +2193,21 @@ int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	extent_op-&gt;flags_to_set = flags;</div><div class='ctx'> 	extent_op-&gt;update_flags = true;</div><div class='ctx'> 	extent_op-&gt;update_key = false;</div><div class='del'>-	extent_op-&gt;level = level;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_add_delayed_extent_op(trans, eb-&gt;start, eb-&gt;len, extent_op);</div><div class='add'>+	ret = btrfs_add_delayed_extent_op(trans, eb-&gt;start, eb-&gt;len,</div><div class='add'>+					  btrfs_header_level(eb), extent_op);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_free_delayed_extent_op(extent_op);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int check_delayed_ref(struct btrfs_root *root,</div><div class='add'>+static noinline int check_delayed_ref(struct btrfs_inode *inode,</div><div class='ctx'> 				      struct btrfs_path *path,</div><div class='del'>-				      u64 objectid, u64 offset, u64 bytenr)</div><div class='add'>+				      u64 offset, u64 bytenr)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_delayed_ref_head *head;</div><div class='ctx'> 	struct btrfs_delayed_ref_node *ref;</div><div class='del'>-	struct btrfs_delayed_data_ref *data_ref;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='ctx'> 	struct btrfs_transaction *cur_trans;</div><div class='ctx'> 	struct rb_node *node;</div><div class='hunk'>@@ -2310,7 +2223,7 @@ static noinline int check_delayed_ref(struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> 	delayed_refs = &amp;cur_trans-&gt;delayed_refs;</div><div class='ctx'> 	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);</div><div class='add'>+	head = btrfs_find_delayed_ref_head(root-&gt;fs_info, delayed_refs, bytenr);</div><div class='ctx'> 	if (!head) {</div><div class='ctx'> 		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='ctx'> 		btrfs_put_transaction(cur_trans);</div><div class='hunk'>@@ -2348,6 +2261,9 @@ static noinline int check_delayed_ref(struct btrfs_root *root,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (node = rb_first_cached(&amp;head-&gt;ref_tree); node;</div><div class='ctx'> 	     node = rb_next(node)) {</div><div class='add'>+		u64 ref_owner;</div><div class='add'>+		u64 ref_offset;</div><div class='add'>+</div><div class='ctx'> 		ref = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);</div><div class='ctx'> 		/* If it's a shared ref we know a cross reference exists */</div><div class='ctx'> 		if (ref-&gt;type != BTRFS_EXTENT_DATA_REF_KEY) {</div><div class='hunk'>@@ -2355,15 +2271,15 @@ static noinline int check_delayed_ref(struct btrfs_root *root,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		data_ref = btrfs_delayed_node_to_data_ref(ref);</div><div class='add'>+		ref_owner = btrfs_delayed_ref_owner(ref);</div><div class='add'>+		ref_offset = btrfs_delayed_ref_offset(ref);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If our ref doesn't match the one we're currently looking at</div><div class='ctx'> 		 * then we have a cross reference.</div><div class='ctx'> 		 */</div><div class='del'>-		if (data_ref-&gt;root != root-&gt;root_key.objectid ||</div><div class='del'>-		    data_ref-&gt;objectid != objectid ||</div><div class='del'>-		    data_ref-&gt;offset != offset) {</div><div class='add'>+		if (ref-&gt;ref_root != btrfs_root_id(root) ||</div><div class='add'>+		    ref_owner != btrfs_ino(inode) || ref_offset != offset) {</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2374,11 +2290,53 @@ static noinline int check_delayed_ref(struct btrfs_root *root,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int check_committed_ref(struct btrfs_root *root,</div><div class='add'>+/*</div><div class='add'>+ * Check if there are references for a data extent other than the one belonging</div><div class='add'>+ * to the given inode and offset.</div><div class='add'>+ *</div><div class='add'>+ * @inode:     The only inode we expect to find associated with the data extent.</div><div class='add'>+ * @path:      A path to use for searching the extent tree.</div><div class='add'>+ * @offset:    The only offset we expect to find associated with the data extent.</div><div class='add'>+ * @bytenr:    The logical address of the data extent.</div><div class='add'>+ *</div><div class='add'>+ * When the extent does not have any other references other than the one we</div><div class='add'>+ * expect to find, we always return a value of 0 with the path having a locked</div><div class='add'>+ * leaf that contains the extent's extent item - this is necessary to ensure</div><div class='add'>+ * we don't race with a task running delayed references, and our caller must</div><div class='add'>+ * have such a path when calling check_delayed_ref() - it must lock a delayed</div><div class='add'>+ * ref head while holding the leaf locked. In case the extent item is not found</div><div class='add'>+ * in the extent tree, we return -ENOENT with the path having the leaf (locked)</div><div class='add'>+ * where the extent item should be, in order to prevent races with another task</div><div class='add'>+ * running delayed references, so that we don't miss any reference when calling</div><div class='add'>+ * check_delayed_ref().</div><div class='add'>+ *</div><div class='add'>+ * Note: this may return false positives, and this is because we want to be</div><div class='add'>+ *       quick here as we're called in write paths (when flushing delalloc and</div><div class='add'>+ *       in the direct IO write path). For example we can have an extent with</div><div class='add'>+ *       a single reference but that reference is not inlined, or we may have</div><div class='add'>+ *       many references in the extent tree but we also have delayed references</div><div class='add'>+ *       that cancel all the reference except the one for our inode and offset,</div><div class='add'>+ *       but it would be expensive to do such checks and complex due to all</div><div class='add'>+ *       locking to avoid races between the checks and flushing delayed refs,</div><div class='add'>+ *       plus non-inline references may be located on leaves other than the one</div><div class='add'>+ *       that contains the extent item in the extent tree. The important thing</div><div class='add'>+ *       here is to not return false negatives and that the false positives are</div><div class='add'>+ *       not very common.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if there are no cross references and with the path having a locked</div><div class='add'>+ *          leaf from the extent tree that contains the extent's extent item.</div><div class='add'>+ *</div><div class='add'>+ *          1 if there are cross references (false positives can happen).</div><div class='add'>+ *</div><div class='add'>+ *          &lt; 0 in case of an error. In case of -ENOENT the leaf in the extent</div><div class='add'>+ *          tree where the extent item should be located at is read locked and</div><div class='add'>+ *          accessible in the given path.</div><div class='add'>+ */</div><div class='add'>+static noinline int check_committed_ref(struct btrfs_inode *inode,</div><div class='ctx'> 					struct btrfs_path *path,</div><div class='del'>-					u64 objectid, u64 offset, u64 bytenr,</div><div class='del'>-					bool strict)</div><div class='add'>+					u64 offset, u64 bytenr)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *extent_root = btrfs_extent_root(fs_info, bytenr);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -2392,33 +2350,37 @@ static noinline int check_committed_ref(struct btrfs_root *root,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = bytenr;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, extent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	BUG_ON(ret == 0); /* Corruption */</div><div class='add'>+		return ret;</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist an extent</div><div class='add'>+		 * item with such offset, but this is out of the valid range.</div><div class='add'>+		 */</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = -ENOENT;</div><div class='ctx'> 	if (path-&gt;slots[0] == 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;slots[0]--;</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='ctx'> 	if (key.objectid != bytenr || key.type != BTRFS_EXTENT_ITEM_KEY)</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ret = 1;</div><div class='ctx'> 	item_size = btrfs_item_size(leaf, path-&gt;slots[0]);</div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_extent_item);</div><div class='ctx'> 	expected_size = sizeof(*ei) + btrfs_extent_inline_ref_size(BTRFS_EXTENT_DATA_REF_KEY);</div><div class='ctx'> </div><div class='ctx'> 	/* No inline refs; we need to bail before checking for owner ref. */</div><div class='ctx'> 	if (item_size == sizeof(*ei))</div><div class='del'>-		goto out;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for an owner ref; skip over it to the real inline refs. */</div><div class='ctx'> 	iref = (struct btrfs_extent_inline_ref *)(ei + 1);</div><div class='hunk'>@@ -2426,57 +2388,69 @@ static noinline int check_committed_ref(struct btrfs_root *root,</div><div class='ctx'> 	if (btrfs_fs_incompat(fs_info, SIMPLE_QUOTA) &amp;&amp; type == BTRFS_EXTENT_OWNER_REF_KEY) {</div><div class='ctx'> 		expected_size += btrfs_extent_inline_ref_size(BTRFS_EXTENT_OWNER_REF_KEY);</div><div class='ctx'> 		iref = (struct btrfs_extent_inline_ref *)(iref + 1);</div><div class='add'>+		type = btrfs_get_extent_inline_ref_type(leaf, iref, BTRFS_REF_TYPE_DATA);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If extent item has more than 1 inline ref then it's shared */</div><div class='ctx'> 	if (item_size != expected_size)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If extent created before last snapshot =&gt; it's shared unless the</div><div class='del'>-	 * snapshot has been deleted. Use the heuristic if strict is false.</div><div class='del'>-	 */</div><div class='del'>-	if (!strict &amp;&amp;</div><div class='del'>-	    (btrfs_extent_generation(leaf, ei) &lt;=</div><div class='del'>-	     btrfs_root_last_snapshot(&amp;root-&gt;root_item)))</div><div class='del'>-		goto out;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* If this extent has SHARED_DATA_REF then it's shared */</div><div class='del'>-	type = btrfs_get_extent_inline_ref_type(leaf, iref, BTRFS_REF_TYPE_DATA);</div><div class='ctx'> 	if (type != BTRFS_EXTENT_DATA_REF_KEY)</div><div class='del'>-		goto out;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	ref = (struct btrfs_extent_data_ref *)(&amp;iref-&gt;offset);</div><div class='ctx'> 	if (btrfs_extent_refs(leaf, ei) !=</div><div class='ctx'> 	    btrfs_extent_data_ref_count(leaf, ref) ||</div><div class='del'>-	    btrfs_extent_data_ref_root(leaf, ref) !=</div><div class='del'>-	    root-&gt;root_key.objectid ||</div><div class='del'>-	    btrfs_extent_data_ref_objectid(leaf, ref) != objectid ||</div><div class='add'>+	    btrfs_extent_data_ref_root(leaf, ref) != btrfs_root_id(root) ||</div><div class='add'>+	    btrfs_extent_data_ref_objectid(leaf, ref) != btrfs_ino(inode) ||</div><div class='ctx'> 	    btrfs_extent_data_ref_offset(leaf, ref) != offset)</div><div class='del'>-		goto out;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset,</div><div class='del'>-			  u64 bytenr, bool strict, struct btrfs_path *path)</div><div class='add'>+int btrfs_cross_ref_exist(struct btrfs_inode *inode, u64 offset,</div><div class='add'>+			  u64 bytenr, struct btrfs_path *path)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		ret = check_committed_ref(root, path, objectid,</div><div class='del'>-					  offset, bytenr, strict);</div><div class='add'>+		ret = check_committed_ref(inode, path, offset, bytenr);</div><div class='ctx'> 		if (ret &amp;&amp; ret != -ENOENT)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		ret = check_delayed_ref(root, path, objectid, offset, bytenr);</div><div class='del'>-	} while (ret == -EAGAIN);</div><div class='add'>+		/*</div><div class='add'>+		 * The path must have a locked leaf from the extent tree where</div><div class='add'>+		 * the extent item for our extent is located, in case it exists,</div><div class='add'>+		 * or where it should be located in case it doesn't exist yet</div><div class='add'>+		 * because it's new and its delayed ref was not yet flushed.</div><div class='add'>+		 * We need to lock the delayed ref head at check_delayed_ref(),</div><div class='add'>+		 * if one exists, while holding the leaf locked in order to not</div><div class='add'>+		 * race with delayed ref flushing, missing references and</div><div class='add'>+		 * incorrectly reporting that the extent is not shared.</div><div class='add'>+		 */</div><div class='add'>+		if (IS_ENABLED(CONFIG_BTRFS_ASSERT)) {</div><div class='add'>+			struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='add'>+</div><div class='add'>+			ASSERT(leaf != NULL);</div><div class='add'>+			btrfs_assert_tree_read_locked(leaf);</div><div class='add'>+</div><div class='add'>+			if (ret != -ENOENT) {</div><div class='add'>+				struct btrfs_key key;</div><div class='add'>+</div><div class='add'>+				btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='add'>+				ASSERT(key.objectid == bytenr);</div><div class='add'>+				ASSERT(key.type == BTRFS_EXTENT_ITEM_KEY);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = check_delayed_ref(inode, path, offset, bytenr);</div><div class='add'>+	} while (ret == -EAGAIN &amp;&amp; !path-&gt;nowait);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	if (btrfs_is_data_reloc_root(root))</div><div class='add'>+	if (btrfs_is_data_reloc_root(inode-&gt;root))</div><div class='ctx'> 		WARN_ON(ret &gt; 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2484,17 +2458,14 @@ out:</div><div class='ctx'> static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			   struct btrfs_root *root,</div><div class='ctx'> 			   struct extent_buffer *buf,</div><div class='del'>-			   int full_backref, int inc)</div><div class='add'>+			   bool full_backref, bool inc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	u64 bytenr;</div><div class='del'>-	u64 num_bytes;</div><div class='ctx'> 	u64 parent;</div><div class='ctx'> 	u64 ref_root;</div><div class='ctx'> 	u32 nritems;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='del'>-	struct btrfs_ref generic_ref = { 0 };</div><div class='ctx'> 	bool for_reloc = btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int action;</div><div class='hunk'>@@ -2521,6 +2492,12 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		action = BTRFS_DROP_DELAYED_REF;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nritems; i++) {</div><div class='add'>+		struct btrfs_ref ref = {</div><div class='add'>+			.action = action,</div><div class='add'>+			.parent = parent,</div><div class='add'>+			.ref_root = ref_root,</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		if (level == 0) {</div><div class='ctx'> 			btrfs_item_key_to_cpu(buf, &amp;key, i);</div><div class='ctx'> 			if (key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='hunk'>@@ -2530,35 +2507,33 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			if (btrfs_file_extent_type(buf, fi) ==</div><div class='ctx'> 			    BTRFS_FILE_EXTENT_INLINE)</div><div class='ctx'> 				continue;</div><div class='del'>-			bytenr = btrfs_file_extent_disk_bytenr(buf, fi);</div><div class='del'>-			if (bytenr == 0)</div><div class='add'>+			ref.bytenr = btrfs_file_extent_disk_bytenr(buf, fi);</div><div class='add'>+			if (ref.bytenr == 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			num_bytes = btrfs_file_extent_disk_num_bytes(buf, fi);</div><div class='add'>+			ref.num_bytes = btrfs_file_extent_disk_num_bytes(buf, fi);</div><div class='add'>+			ref.owning_root = ref_root;</div><div class='add'>+</div><div class='ctx'> 			key.offset -= btrfs_file_extent_offset(buf, fi);</div><div class='del'>-			btrfs_init_generic_ref(&amp;generic_ref, action, bytenr,</div><div class='del'>-					       num_bytes, parent, ref_root);</div><div class='del'>-			btrfs_init_data_ref(&amp;generic_ref, ref_root, key.objectid,</div><div class='del'>-					    key.offset, root-&gt;root_key.objectid,</div><div class='del'>-					    for_reloc);</div><div class='add'>+			btrfs_init_data_ref(&amp;ref, key.objectid, key.offset,</div><div class='add'>+					    btrfs_root_id(root), for_reloc);</div><div class='ctx'> 			if (inc)</div><div class='del'>-				ret = btrfs_inc_extent_ref(trans, &amp;generic_ref);</div><div class='add'>+				ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='ctx'> 			else</div><div class='del'>-				ret = btrfs_free_extent(trans, &amp;generic_ref);</div><div class='add'>+				ret = btrfs_free_extent(trans, &amp;ref);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 		} else {</div><div class='del'>-			bytenr = btrfs_node_blockptr(buf, i);</div><div class='del'>-			num_bytes = fs_info-&gt;nodesize;</div><div class='del'>-			/* We don't know the owning_root, use 0. */</div><div class='del'>-			btrfs_init_generic_ref(&amp;generic_ref, action, bytenr,</div><div class='del'>-					       num_bytes, parent, 0);</div><div class='del'>-			btrfs_init_tree_ref(&amp;generic_ref, level - 1, ref_root,</div><div class='del'>-					    root-&gt;root_key.objectid, for_reloc);</div><div class='add'>+			/* We don't know the owning_root, leave as 0. */</div><div class='add'>+			ref.bytenr = btrfs_node_blockptr(buf, i);</div><div class='add'>+			ref.num_bytes = fs_info-&gt;nodesize;</div><div class='add'>+</div><div class='add'>+			btrfs_init_tree_ref(&amp;ref, level - 1,</div><div class='add'>+					    btrfs_root_id(root), for_reloc);</div><div class='ctx'> 			if (inc)</div><div class='del'>-				ret = btrfs_inc_extent_ref(trans, &amp;generic_ref);</div><div class='add'>+				ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='ctx'> 			else</div><div class='del'>-				ret = btrfs_free_extent(trans, &amp;generic_ref);</div><div class='add'>+				ret = btrfs_free_extent(trans, &amp;ref);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2569,15 +2544,15 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='del'>-		  struct extent_buffer *buf, int full_backref)</div><div class='add'>+		  struct extent_buffer *buf, bool full_backref)</div><div class='ctx'> {</div><div class='del'>-	return __btrfs_mod_ref(trans, root, buf, full_backref, 1);</div><div class='add'>+	return __btrfs_mod_ref(trans, root, buf, full_backref, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='del'>-		  struct extent_buffer *buf, int full_backref)</div><div class='add'>+		  struct extent_buffer *buf, bool full_backref)</div><div class='ctx'> {</div><div class='del'>-	return __btrfs_mod_ref(trans, root, buf, full_backref, 0);</div><div class='add'>+	return __btrfs_mod_ref(trans, root, buf, full_backref, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)</div><div class='hunk'>@@ -2617,37 +2592,34 @@ static u64 first_logical_byte(struct btrfs_fs_info *fs_info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pin_down_extent(struct btrfs_trans_handle *trans,</div><div class='del'>-			   struct btrfs_block_group *cache,</div><div class='del'>-			   u64 bytenr, u64 num_bytes, int reserved)</div><div class='add'>+			   struct btrfs_block_group *bg,</div><div class='add'>+			   u64 bytenr, u64 num_bytes, bool reserved)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = cache-&gt;fs_info;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;cache-&gt;space_info-&gt;lock);</div><div class='del'>-	spin_lock(&amp;cache-&gt;lock);</div><div class='del'>-	cache-&gt;pinned += num_bytes;</div><div class='del'>-	btrfs_space_info_update_bytes_pinned(fs_info, cache-&gt;space_info,</div><div class='del'>-					     num_bytes);</div><div class='del'>-	if (reserved) {</div><div class='del'>-		cache-&gt;reserved -= num_bytes;</div><div class='del'>-		cache-&gt;space_info-&gt;bytes_reserved -= num_bytes;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;cache-&gt;lock);</div><div class='del'>-	spin_unlock(&amp;cache-&gt;space_info-&gt;lock);</div><div class='del'>-</div><div class='del'>-	set_extent_bit(&amp;trans-&gt;transaction-&gt;pinned_extents, bytenr,</div><div class='del'>-		       bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);</div><div class='add'>+	struct btrfs_space_info *space_info = bg-&gt;space_info;</div><div class='add'>+	const u64 reserved_bytes = (reserved ? num_bytes : 0);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+	bg-&gt;pinned += num_bytes;</div><div class='add'>+	bg-&gt;reserved -= reserved_bytes;</div><div class='add'>+	spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+	space_info-&gt;bytes_reserved -= reserved_bytes;</div><div class='add'>+	btrfs_space_info_update_bytes_pinned(space_info, num_bytes);</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	btrfs_set_extent_bit(&amp;trans-&gt;transaction-&gt;pinned_extents, bytenr,</div><div class='add'>+			     bytenr + num_bytes - 1, EXTENT_DIRTY, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_pin_extent(struct btrfs_trans_handle *trans,</div><div class='del'>-		     u64 bytenr, u64 num_bytes, int reserved)</div><div class='add'>+int btrfs_pin_extent(struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='ctx'> </div><div class='ctx'> 	cache = btrfs_lookup_block_group(trans-&gt;fs_info, bytenr);</div><div class='ctx'> 	BUG_ON(!cache); /* Logic error */</div><div class='ctx'> </div><div class='del'>-	pin_down_extent(trans, cache, bytenr, num_bytes, reserved);</div><div class='add'>+	pin_down_extent(trans, cache, bytenr, num_bytes, true);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2671,7 +2643,7 @@ int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	pin_down_extent(trans, cache, eb-&gt;start, eb-&gt;len, 0);</div><div class='add'>+	pin_down_extent(trans, cache, eb-&gt;start, eb-&gt;len, false);</div><div class='ctx'> </div><div class='ctx'> 	/* remove us from the free space cache (if we're there at all) */</div><div class='ctx'> 	ret = btrfs_remove_free_space(cache, eb-&gt;start, eb-&gt;len);</div><div class='hunk'>@@ -2773,22 +2745,24 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *cache = NULL;</div><div class='ctx'> 	struct btrfs_space_info *space_info;</div><div class='del'>-	struct btrfs_block_rsv *global_rsv = &amp;fs_info-&gt;global_block_rsv;</div><div class='ctx'> 	struct btrfs_free_cluster *cluster = NULL;</div><div class='del'>-	u64 len;</div><div class='ctx'> 	u64 total_unpinned = 0;</div><div class='ctx'> 	u64 empty_cluster = 0;</div><div class='del'>-	bool readonly;</div><div class='ctx'> </div><div class='ctx'> 	while (start &lt;= end) {</div><div class='del'>-		readonly = false;</div><div class='add'>+		u64 len;</div><div class='add'>+		bool readonly;</div><div class='add'>+</div><div class='ctx'> 		if (!cache ||</div><div class='ctx'> 		    start &gt;= cache-&gt;start + cache-&gt;length) {</div><div class='ctx'> 			if (cache)</div><div class='ctx'> 				btrfs_put_block_group(cache);</div><div class='ctx'> 			total_unpinned = 0;</div><div class='ctx'> 			cache = btrfs_lookup_block_group(fs_info, start);</div><div class='del'>-			BUG_ON(!cache); /* Logic error */</div><div class='add'>+			if (unlikely(cache == NULL)) {</div><div class='add'>+				/* Logic error, something removed the block group. */</div><div class='add'>+				return -EUCLEAN;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			cluster = fetch_cluster_info(fs_info,</div><div class='ctx'> 						     cache-&gt;space_info,</div><div class='hunk'>@@ -2821,42 +2795,27 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		spin_lock(&amp;cache-&gt;lock);</div><div class='add'>+		readonly = cache-&gt;ro;</div><div class='ctx'> 		cache-&gt;pinned -= len;</div><div class='del'>-		btrfs_space_info_update_bytes_pinned(fs_info, space_info, -len);</div><div class='add'>+		spin_unlock(&amp;cache-&gt;lock);</div><div class='add'>+</div><div class='add'>+		btrfs_space_info_update_bytes_pinned(space_info, -len);</div><div class='ctx'> 		space_info-&gt;max_extent_size = 0;</div><div class='del'>-		if (cache-&gt;ro) {</div><div class='add'>+</div><div class='add'>+		if (readonly) {</div><div class='ctx'> 			space_info-&gt;bytes_readonly += len;</div><div class='del'>-			readonly = true;</div><div class='ctx'> 		} else if (btrfs_is_zoned(fs_info)) {</div><div class='ctx'> 			/* Need reset before reusing in a zoned block group */</div><div class='del'>-			space_info-&gt;bytes_zone_unusable += len;</div><div class='del'>-			readonly = true;</div><div class='add'>+			btrfs_space_info_update_bytes_zone_unusable(space_info, len);</div><div class='add'>+		} else if (return_free_space) {</div><div class='add'>+			btrfs_return_free_space(space_info, len);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;cache-&gt;lock);</div><div class='del'>-		if (!readonly &amp;&amp; return_free_space &amp;&amp;</div><div class='del'>-		    global_rsv-&gt;space_info == space_info) {</div><div class='del'>-			spin_lock(&amp;global_rsv-&gt;lock);</div><div class='del'>-			if (!global_rsv-&gt;full) {</div><div class='del'>-				u64 to_add = min(len, global_rsv-&gt;size -</div><div class='del'>-						      global_rsv-&gt;reserved);</div><div class='del'>-</div><div class='del'>-				global_rsv-&gt;reserved += to_add;</div><div class='del'>-				btrfs_space_info_update_bytes_may_use(fs_info,</div><div class='del'>-						space_info, to_add);</div><div class='del'>-				if (global_rsv-&gt;reserved &gt;= global_rsv-&gt;size)</div><div class='del'>-					global_rsv-&gt;full = 1;</div><div class='del'>-				len -= to_add;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock(&amp;global_rsv-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-		/* Add to any tickets we may have */</div><div class='del'>-		if (!readonly &amp;&amp; return_free_space &amp;&amp; len)</div><div class='del'>-			btrfs_try_granting_tickets(fs_info, space_info);</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cache)</div><div class='ctx'> 		btrfs_put_block_group(cache);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2865,33 +2824,63 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_group *block_group, *tmp;</div><div class='ctx'> 	struct list_head *deleted_bgs;</div><div class='del'>-	struct extent_io_tree *unpin;</div><div class='add'>+	struct extent_io_tree *unpin = &amp;trans-&gt;transaction-&gt;pinned_extents;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 start;</div><div class='ctx'> 	u64 end;</div><div class='add'>+	int unpin_error = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	unpin = &amp;trans-&gt;transaction-&gt;pinned_extents;</div><div class='del'>-</div><div class='del'>-	while (!TRANS_ABORTED(trans)) {</div><div class='del'>-		struct extent_state *cached_state = NULL;</div><div class='add'>+	mutex_lock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='add'>+	btrfs_find_first_extent_bit(unpin, 0, &amp;start, &amp;end, EXTENT_DIRTY, &amp;cached_state);</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='del'>-		if (!find_first_extent_bit(unpin, 0, &amp;start, &amp;end,</div><div class='del'>-					   EXTENT_DIRTY, &amp;cached_state)) {</div><div class='del'>-			mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	while (!TRANS_ABORTED(trans) &amp;&amp; cached_state) {</div><div class='add'>+		struct extent_state *next_state;</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_test_opt(fs_info, DISCARD_SYNC))</div><div class='ctx'> 			ret = btrfs_discard_extent(fs_info, start,</div><div class='ctx'> 						   end + 1 - start, NULL);</div><div class='ctx'> </div><div class='del'>-		clear_extent_dirty(unpin, start, end, &amp;cached_state);</div><div class='del'>-		unpin_extent_range(fs_info, start, end, true);</div><div class='del'>-		mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='del'>-		free_extent_state(cached_state);</div><div class='del'>-		cond_resched();</div><div class='add'>+		next_state = btrfs_next_extent_state(unpin, cached_state);</div><div class='add'>+		btrfs_clear_extent_dirty(unpin, start, end, &amp;cached_state);</div><div class='add'>+		ret = unpin_extent_range(fs_info, start, end, true);</div><div class='add'>+		/*</div><div class='add'>+		 * If we get an error unpinning an extent range, store the first</div><div class='add'>+		 * error to return later after trying to unpin all ranges and do</div><div class='add'>+		 * the sync discards. Our caller will abort the transaction</div><div class='add'>+		 * (which already wrote new superblocks) and on the next mount</div><div class='add'>+		 * the space will be available as it was pinned by in-memory</div><div class='add'>+		 * only structures in this phase.</div><div class='add'>+		 */</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_err_rl(fs_info,</div><div class='add'>+"failed to unpin extent range [%llu, %llu] when committing transaction %llu: %s (%d)",</div><div class='add'>+				     start, end, trans-&gt;transid,</div><div class='add'>+				     btrfs_decode_error(ret), ret);</div><div class='add'>+			if (!unpin_error)</div><div class='add'>+				unpin_error = ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='add'>+</div><div class='add'>+		if (need_resched()) {</div><div class='add'>+			btrfs_free_extent_state(next_state);</div><div class='add'>+			mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='add'>+			cond_resched();</div><div class='add'>+			cached_state = NULL;</div><div class='add'>+			mutex_lock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='add'>+			btrfs_find_first_extent_bit(unpin, 0, &amp;start, &amp;end,</div><div class='add'>+						    EXTENT_DIRTY, &amp;cached_state);</div><div class='add'>+		} else {</div><div class='add'>+			cached_state = next_state;</div><div class='add'>+			if (cached_state) {</div><div class='add'>+				start = cached_state-&gt;start;</div><div class='add'>+				end = cached_state-&gt;end;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;fs_info-&gt;unused_bg_unpin_mutex);</div><div class='add'>+	btrfs_free_extent_state(cached_state);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_test_opt(fs_info, DISCARD_ASYNC)) {</div><div class='ctx'> 		btrfs_discard_calc_delay(&amp;fs_info-&gt;discard_ctl);</div><div class='hunk'>@@ -2905,16 +2894,20 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 */</div><div class='ctx'> 	deleted_bgs = &amp;trans-&gt;transaction-&gt;deleted_bgs;</div><div class='ctx'> 	list_for_each_entry_safe(block_group, tmp, deleted_bgs, bg_list) {</div><div class='del'>-		u64 trimmed = 0;</div><div class='del'>-</div><div class='ctx'> 		ret = -EROFS;</div><div class='ctx'> 		if (!TRANS_ABORTED(trans))</div><div class='del'>-			ret = btrfs_discard_extent(fs_info,</div><div class='del'>-						   block_group-&gt;start,</div><div class='del'>-						   block_group-&gt;length,</div><div class='del'>-						   &amp;trimmed);</div><div class='add'>+			ret = btrfs_discard_extent(fs_info, block_group-&gt;start,</div><div class='add'>+						   block_group-&gt;length, NULL);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Not strictly necessary to lock, as the block_group should be</div><div class='add'>+		 * read-only from btrfs_delete_unused_bgs().</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(block_group-&gt;ro);</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 		list_del_init(&amp;block_group-&gt;bg_list);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+</div><div class='ctx'> 		btrfs_unfreeze_block_group(block_group);</div><div class='ctx'> 		btrfs_put_block_group(block_group);</div><div class='ctx'> </div><div class='hunk'>@@ -2926,7 +2919,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return unpin_error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2988,26 +2981,26 @@ static int do_free_extent_accounting(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		csum_root = btrfs_csum_root(trans-&gt;fs_info, bytenr);</div><div class='ctx'> 		ret = btrfs_del_csums(trans, csum_root, bytenr, num_bytes);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_delete_raid_extent(trans, bytenr, num_bytes);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_record_squota_delta(trans-&gt;fs_info, delta);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = add_to_free_space_tree(trans, bytenr, num_bytes);</div><div class='del'>-	if (ret) {</div><div class='add'>+	ret = btrfs_add_to_free_space_tree(trans, bytenr, num_bytes);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3087,14 +3080,12 @@ static int do_free_extent_accounting(struct btrfs_trans_handle *trans,</div><div class='ctx'>  */</div><div class='ctx'> static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_delayed_ref_head *href,</div><div class='del'>-			       struct btrfs_delayed_ref_node *node, u64 parent,</div><div class='del'>-			       u64 root_objectid, u64 owner_objectid,</div><div class='del'>-			       u64 owner_offset,</div><div class='add'>+			       const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 			       struct btrfs_delayed_extent_op *extent_op)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_extent_item *ei;</div><div class='hunk'>@@ -3109,6 +3100,8 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u64 refs;</div><div class='ctx'> 	u64 bytenr = node-&gt;bytenr;</div><div class='ctx'> 	u64 num_bytes = node-&gt;num_bytes;</div><div class='add'>+	u64 owner_objectid = btrfs_delayed_ref_owner(node);</div><div class='add'>+	u64 owner_offset = btrfs_delayed_ref_offset(node);</div><div class='ctx'> 	bool skinny_metadata = btrfs_fs_incompat(info, SKINNY_METADATA);</div><div class='ctx'> 	u64 delayed_ref_root = href-&gt;owning_root;</div><div class='ctx'> </div><div class='hunk'>@@ -3121,20 +3114,20 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	is_data = owner_objectid &gt;= BTRFS_FIRST_FREE_OBJECTID;</div><div class='ctx'> </div><div class='del'>-	if (!is_data &amp;&amp; refs_to_drop != 1) {</div><div class='add'>+	if (unlikely(!is_data &amp;&amp; refs_to_drop != 1)) {</div><div class='ctx'> 		btrfs_crit(info,</div><div class='ctx'> "invalid refs_to_drop, dropping more than 1 refs for tree block %llu refs_to_drop %u",</div><div class='ctx'> 			   node-&gt;bytenr, refs_to_drop);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_data)</div><div class='ctx'> 		skinny_metadata = false;</div><div class='ctx'> </div><div class='ctx'> 	ret = lookup_extent_backref(trans, path, &amp;iref, bytenr, num_bytes,</div><div class='del'>-				    parent, root_objectid, owner_objectid,</div><div class='add'>+				    node-&gt;parent, node-&gt;ref_root, owner_objectid,</div><div class='ctx'> 				    owner_offset);</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3161,26 +3154,25 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* Quick path didn't find the EXTEMT/METADATA_ITEM */</div><div class='add'>+			/* Quick path didn't find the EXTENT/METADATA_ITEM */</div><div class='ctx'> 			if (path-&gt;slots[0] - extent_slot &gt; 5)</div><div class='ctx'> 				break;</div><div class='ctx'> 			extent_slot--;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!found_extent) {</div><div class='del'>-			if (iref) {</div><div class='add'>+			if (unlikely(iref)) {</div><div class='ctx'> 				abort_and_dump(trans, path,</div><div class='ctx'> "invalid iref slot %u, no EXTENT/METADATA_ITEM found but has inline extent ref",</div><div class='ctx'> 					   path-&gt;slots[0]);</div><div class='del'>-				ret = -EUCLEAN;</div><div class='del'>-				goto out;</div><div class='add'>+				return -EUCLEAN;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Must be SHARED_* item, remove the backref first */</div><div class='ctx'> 			ret = remove_extent_backref(trans, extent_root, path,</div><div class='ctx'> 						    NULL, refs_to_drop, is_data);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='ctx'> </div><div class='hunk'>@@ -3227,21 +3219,21 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			"umm, got %d back from search, was looking for %llu, slot %d",</div><div class='ctx'> 					  ret, bytenr, path-&gt;slots[0]);</div><div class='ctx'> 			}</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> 			extent_slot = path-&gt;slots[0];</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (WARN_ON(ret == -ENOENT)) {</div><div class='ctx'> 		abort_and_dump(trans, path,</div><div class='ctx'> "unable to find ref byte nr %llu parent %llu root %llu owner %llu offset %llu slot %d",</div><div class='del'>-			       bytenr, parent, root_objectid, owner_objectid,</div><div class='add'>+			       bytenr, node-&gt;parent, node-&gt;ref_root, owner_objectid,</div><div class='ctx'> 			       owner_offset, path-&gt;slots[0]);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -3252,7 +3244,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  "unexpected extent item size, has %u expect &gt;= %zu",</div><div class='ctx'> 			  item_size, sizeof(*ei));</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, extent_slot,</div><div class='ctx'> 			    struct btrfs_extent_item);</div><div class='hunk'>@@ -3260,26 +3252,24 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	    key.type == BTRFS_EXTENT_ITEM_KEY) {</div><div class='ctx'> 		struct btrfs_tree_block_info *bi;</div><div class='ctx'> </div><div class='del'>-		if (item_size &lt; sizeof(*ei) + sizeof(*bi)) {</div><div class='add'>+		if (unlikely(item_size &lt; sizeof(*ei) + sizeof(*bi))) {</div><div class='ctx'> 			abort_and_dump(trans, path,</div><div class='ctx'> "invalid extent item size for key (%llu, %u, %llu) slot %u owner %llu, has %u expect &gt;= %zu",</div><div class='ctx'> 				       key.objectid, key.type, key.offset,</div><div class='ctx'> 				       path-&gt;slots[0], owner_objectid, item_size,</div><div class='ctx'> 				       sizeof(*ei) + sizeof(*bi));</div><div class='del'>-			ret = -EUCLEAN;</div><div class='del'>-			goto out;</div><div class='add'>+			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> 		bi = (struct btrfs_tree_block_info *)(ei + 1);</div><div class='ctx'> 		WARN_ON(owner_objectid != btrfs_tree_block_level(leaf, bi));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	refs = btrfs_extent_refs(leaf, ei);</div><div class='del'>-	if (refs &lt; refs_to_drop) {</div><div class='add'>+	if (unlikely(refs &lt; refs_to_drop)) {</div><div class='ctx'> 		abort_and_dump(trans, path,</div><div class='ctx'> 		"trying to drop %d refs but we only have %llu for bytenr %llu slot %u",</div><div class='ctx'> 			       refs_to_drop, refs, bytenr, path-&gt;slots[0]);</div><div class='del'>-		ret = -EUCLEAN;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	refs -= refs_to_drop;</div><div class='ctx'> </div><div class='hunk'>@@ -3291,23 +3281,21 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * be updated by remove_extent_backref</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (iref) {</div><div class='del'>-			if (!found_extent) {</div><div class='add'>+			if (unlikely(!found_extent)) {</div><div class='ctx'> 				abort_and_dump(trans, path,</div><div class='ctx'> "invalid iref, got inlined extent ref but no EXTENT/METADATA_ITEM found, slot %u",</div><div class='ctx'> 					       path-&gt;slots[0]);</div><div class='del'>-				ret = -EUCLEAN;</div><div class='del'>-				goto out;</div><div class='add'>+				return -EUCLEAN;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			btrfs_set_extent_refs(leaf, ei, refs);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (found_extent) {</div><div class='ctx'> 			ret = remove_extent_backref(trans, extent_root, path,</div><div class='ctx'> 						    iref, refs_to_drop, is_data);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -3321,23 +3309,21 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		/* In this branch refs == 1 */</div><div class='ctx'> 		if (found_extent) {</div><div class='del'>-			if (is_data &amp;&amp; refs_to_drop !=</div><div class='del'>-			    extent_data_ref_count(path, iref)) {</div><div class='add'>+			if (unlikely(is_data &amp;&amp; refs_to_drop !=</div><div class='add'>+				     extent_data_ref_count(path, iref))) {</div><div class='ctx'> 				abort_and_dump(trans, path,</div><div class='ctx'> 		"invalid refs_to_drop, current refs %u refs_to_drop %u slot %u",</div><div class='ctx'> 					       extent_data_ref_count(path, iref),</div><div class='ctx'> 					       refs_to_drop, path-&gt;slots[0]);</div><div class='del'>-				ret = -EUCLEAN;</div><div class='del'>-				goto out;</div><div class='add'>+				return -EUCLEAN;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (iref) {</div><div class='del'>-				if (path-&gt;slots[0] != extent_slot) {</div><div class='add'>+				if (unlikely(path-&gt;slots[0] != extent_slot)) {</div><div class='ctx'> 					abort_and_dump(trans, path,</div><div class='del'>-"invalid iref, extent item key (%llu %u %llu) slot %u doesn't have wanted iref",</div><div class='del'>-						       key.objectid, key.type,</div><div class='del'>-						       key.offset, path-&gt;slots[0]);</div><div class='del'>-					ret = -EUCLEAN;</div><div class='del'>-					goto out;</div><div class='add'>+"invalid iref, extent item key " BTRFS_KEY_FMT " slot %u doesn't have wanted iref",</div><div class='add'>+						       BTRFS_KEY_FMT_VALUE(&amp;key),</div><div class='add'>+						       path-&gt;slots[0]);</div><div class='add'>+					return -EUCLEAN;</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -3346,12 +3332,11 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 * |	extent_slot	  ||extent_slot + 1|</div><div class='ctx'> 				 * [ EXTENT/METADATA_ITEM ][ SHARED_* ITEM ]</div><div class='ctx'> 				 */</div><div class='del'>-				if (path-&gt;slots[0] != extent_slot + 1) {</div><div class='add'>+				if (unlikely(path-&gt;slots[0] != extent_slot + 1)) {</div><div class='ctx'> 					abort_and_dump(trans, path,</div><div class='ctx'> 	"invalid SHARED_* item slot %u, previous item is not EXTENT/METADATA_ITEM",</div><div class='ctx'> 						       path-&gt;slots[0]);</div><div class='del'>-					ret = -EUCLEAN;</div><div class='del'>-					goto out;</div><div class='add'>+					return -EUCLEAN;</div><div class='ctx'> 				}</div><div class='ctx'> 				path-&gt;slots[0] = extent_slot;</div><div class='ctx'> 				num_to_del = 2;</div><div class='hunk'>@@ -3370,9 +3355,9 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_items(trans, extent_root, path, path-&gt;slots[0],</div><div class='ctx'> 				      num_to_del);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> </div><div class='hunk'>@@ -3380,8 +3365,6 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3394,13 +3377,14 @@ out:</div><div class='ctx'> static noinline int check_ref_cleanup(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				      u64 bytenr)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_delayed_ref_head *head;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='ctx'> 	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);</div><div class='add'>+	head = btrfs_find_delayed_ref_head(fs_info, delayed_refs, bytenr);</div><div class='ctx'> 	if (!head)</div><div class='ctx'> 		goto out_delayed_unlock;</div><div class='ctx'> </div><div class='hunk'>@@ -3418,7 +3402,7 @@ static noinline int check_ref_cleanup(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!mutex_trylock(&amp;head-&gt;mutex))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	btrfs_delete_ref_head(delayed_refs, head);</div><div class='add'>+	btrfs_delete_ref_head(fs_info, delayed_refs, head);</div><div class='ctx'> 	head-&gt;processing = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;head-&gt;lock);</div><div class='hunk'>@@ -3428,7 +3412,7 @@ static noinline int check_ref_cleanup(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (head-&gt;must_insert_reserved)</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> </div><div class='del'>-	btrfs_cleanup_ref_head_accounting(trans-&gt;fs_info, delayed_refs, head);</div><div class='add'>+	btrfs_cleanup_ref_head_accounting(fs_info, delayed_refs, head);</div><div class='ctx'> 	mutex_unlock(&amp;head-&gt;mutex);</div><div class='ctx'> 	btrfs_put_delayed_ref_head(head);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3440,29 +3424,42 @@ out_delayed_unlock:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='del'>-			   u64 root_id,</div><div class='del'>-			   struct extent_buffer *buf,</div><div class='del'>-			   u64 parent, int last_ref)</div><div class='add'>+int btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='add'>+			  u64 root_id,</div><div class='add'>+			  struct extent_buffer *buf,</div><div class='add'>+			  u64 parent, int last_ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_ref generic_ref = { 0 };</div><div class='ctx'> 	struct btrfs_block_group *bg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_init_generic_ref(&amp;generic_ref, BTRFS_DROP_DELAYED_REF,</div><div class='del'>-			       buf-&gt;start, buf-&gt;len, parent, btrfs_header_owner(buf));</div><div class='del'>-	btrfs_init_tree_ref(&amp;generic_ref, btrfs_header_level(buf),</div><div class='del'>-			    root_id, 0, false);</div><div class='del'>-</div><div class='ctx'> 	if (root_id != BTRFS_TREE_LOG_OBJECTID) {</div><div class='add'>+		struct btrfs_ref generic_ref = {</div><div class='add'>+			.action = BTRFS_DROP_DELAYED_REF,</div><div class='add'>+			.bytenr = buf-&gt;start,</div><div class='add'>+			.num_bytes = buf-&gt;len,</div><div class='add'>+			.parent = parent,</div><div class='add'>+			.owning_root = btrfs_header_owner(buf),</div><div class='add'>+			.ref_root = root_id,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Assert that the extent buffer is not cleared due to</div><div class='add'>+		 * EXTENT_BUFFER_ZONED_ZEROOUT. Please refer</div><div class='add'>+		 * btrfs_clear_buffer_dirty() and btree_csum_one_bio() for</div><div class='add'>+		 * detail.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(btrfs_header_bytenr(buf) != 0);</div><div class='add'>+</div><div class='add'>+		btrfs_init_tree_ref(&amp;generic_ref, btrfs_header_level(buf), 0, false);</div><div class='ctx'> 		btrfs_ref_tree_mod(fs_info, &amp;generic_ref);</div><div class='ctx'> 		ret = btrfs_add_delayed_tree_ref(trans, &amp;generic_ref, NULL);</div><div class='del'>-		BUG_ON(ret); /* -ENOMEM */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!last_ref)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_header_generation(buf) != trans-&gt;transid)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3476,7 +3473,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	bg = btrfs_lookup_block_group(fs_info, buf-&gt;start);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) {</div><div class='del'>-		pin_down_extent(trans, bg, buf-&gt;start, buf-&gt;len, 1);</div><div class='add'>+		pin_down_extent(trans, bg, buf-&gt;start, buf-&gt;len, true);</div><div class='ctx'> 		btrfs_put_block_group(bg);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3500,7 +3497,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_FS_TREE_MOD_LOG_USERS, &amp;fs_info-&gt;flags)</div><div class='ctx'> 		     || btrfs_is_zoned(fs_info)) {</div><div class='del'>-		pin_down_extent(trans, bg, buf-&gt;start, buf-&gt;len, 1);</div><div class='add'>+		pin_down_extent(trans, bg, buf-&gt;start, buf-&gt;len, true);</div><div class='ctx'> 		btrfs_put_block_group(bg);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3508,17 +3505,12 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	WARN_ON(test_bit(EXTENT_BUFFER_DIRTY, &amp;buf-&gt;bflags));</div><div class='ctx'> </div><div class='ctx'> 	btrfs_add_free_space(bg, buf-&gt;start, buf-&gt;len);</div><div class='del'>-	btrfs_free_reserved_bytes(bg, buf-&gt;len, 0);</div><div class='add'>+	btrfs_free_reserved_bytes(bg, buf-&gt;len, false);</div><div class='ctx'> 	btrfs_put_block_group(bg);</div><div class='ctx'> 	trace_btrfs_reserved_extent_free(fs_info, buf-&gt;start, buf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Deleting the buffer, clear the corrupt flag since it doesn't</div><div class='del'>-	 * matter anymore.</div><div class='del'>-	 */</div><div class='del'>-	clear_bit(EXTENT_BUFFER_CORRUPT, &amp;buf-&gt;bflags);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Can return -ENOMEM */</div><div class='hunk'>@@ -3534,11 +3526,8 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref)</div><div class='ctx'> 	 * tree log blocks never actually go into the extent allocation</div><div class='ctx'> 	 * tree, just update pinning info and exit early.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((ref-&gt;type == BTRFS_REF_METADATA &amp;&amp;</div><div class='del'>-	     ref-&gt;tree_ref.ref_root == BTRFS_TREE_LOG_OBJECTID) ||</div><div class='del'>-	    (ref-&gt;type == BTRFS_REF_DATA &amp;&amp;</div><div class='del'>-	     ref-&gt;data_ref.ref_root == BTRFS_TREE_LOG_OBJECTID)) {</div><div class='del'>-		btrfs_pin_extent(trans, ref-&gt;bytenr, ref-&gt;len, 1);</div><div class='add'>+	if (ref-&gt;ref_root == BTRFS_TREE_LOG_OBJECTID) {</div><div class='add'>+		btrfs_pin_extent(trans, ref-&gt;bytenr, ref-&gt;num_bytes);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else if (ref-&gt;type == BTRFS_REF_METADATA) {</div><div class='ctx'> 		ret = btrfs_add_delayed_tree_ref(trans, ref, NULL);</div><div class='hunk'>@@ -3546,10 +3535,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref)</div><div class='ctx'> 		ret = btrfs_add_delayed_data_ref(trans, ref, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!((ref-&gt;type == BTRFS_REF_METADATA &amp;&amp;</div><div class='del'>-	       ref-&gt;tree_ref.ref_root == BTRFS_TREE_LOG_OBJECTID) ||</div><div class='del'>-	      (ref-&gt;type == BTRFS_REF_DATA &amp;&amp;</div><div class='del'>-	       ref-&gt;data_ref.ref_root == BTRFS_TREE_LOG_OBJECTID)))</div><div class='add'>+	if (ref-&gt;ref_root != BTRFS_TREE_LOG_OBJECTID)</div><div class='ctx'> 		btrfs_ref_tree_mod(fs_info, ref);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3592,15 +3578,14 @@ enum btrfs_loop_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-btrfs_lock_block_group(struct btrfs_block_group *cache,</div><div class='del'>-		       int delalloc)</div><div class='add'>+btrfs_lock_block_group(struct btrfs_block_group *cache, bool delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	if (delalloc)</div><div class='ctx'> 		down_read(&amp;cache-&gt;data_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_grab_block_group(struct btrfs_block_group *cache,</div><div class='del'>-		       int delalloc)</div><div class='add'>+					  bool delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_get_block_group(cache);</div><div class='ctx'> 	if (delalloc)</div><div class='hunk'>@@ -3610,7 +3595,7 @@ static inline void btrfs_grab_block_group(struct btrfs_block_group *cache,</div><div class='ctx'> static struct btrfs_block_group *btrfs_lock_cluster(</div><div class='ctx'> 		   struct btrfs_block_group *block_group,</div><div class='ctx'> 		   struct btrfs_free_cluster *cluster,</div><div class='del'>-		   int delalloc)</div><div class='add'>+		   bool delalloc)</div><div class='ctx'> 	__acquires(&amp;cluster-&gt;refill_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *used_bg = NULL;</div><div class='hunk'>@@ -3647,14 +3632,28 @@ static struct btrfs_block_group *btrfs_lock_cluster(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-btrfs_release_block_group(struct btrfs_block_group *cache,</div><div class='del'>-			 int delalloc)</div><div class='add'>+btrfs_release_block_group(struct btrfs_block_group *cache, bool delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	if (delalloc)</div><div class='ctx'> 		up_read(&amp;cache-&gt;data_rwsem);</div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool find_free_extent_check_size_class(const struct find_free_extent_ctl *ffe_ctl,</div><div class='add'>+					      const struct btrfs_block_group *bg)</div><div class='add'>+{</div><div class='add'>+	if (ffe_ctl-&gt;policy == BTRFS_EXTENT_ALLOC_ZONED)</div><div class='add'>+		return true;</div><div class='add'>+	if (!btrfs_block_group_should_use_size_class(bg))</div><div class='add'>+		return true;</div><div class='add'>+	if (ffe_ctl-&gt;loop &gt;= LOOP_WRONG_SIZE_CLASS)</div><div class='add'>+		return true;</div><div class='add'>+	if (ffe_ctl-&gt;loop &gt;= LOOP_UNSET_SIZE_CLASS &amp;&amp;</div><div class='add'>+	    bg-&gt;size_class == BTRFS_BG_SZ_NONE)</div><div class='add'>+		return true;</div><div class='add'>+	return ffe_ctl-&gt;size_class == bg-&gt;size_class;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Helper function for find_free_extent().</div><div class='ctx'>  *</div><div class='hunk'>@@ -3676,7 +3675,8 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,</div><div class='ctx'> 	if (!cluster_bg)</div><div class='ctx'> 		goto refill_cluster;</div><div class='ctx'> 	if (cluster_bg != bg &amp;&amp; (cluster_bg-&gt;ro ||</div><div class='del'>-	    !block_group_bits(cluster_bg, ffe_ctl-&gt;flags)))</div><div class='add'>+	    !block_group_bits(cluster_bg, ffe_ctl-&gt;flags) ||</div><div class='add'>+	    !find_free_extent_check_size_class(ffe_ctl, cluster_bg)))</div><div class='ctx'> 		goto release_cluster;</div><div class='ctx'> </div><div class='ctx'> 	offset = btrfs_alloc_from_cluster(cluster_bg, last_ptr,</div><div class='hunk'>@@ -4022,7 +4022,7 @@ static int do_allocation(struct btrfs_block_group *block_group,</div><div class='ctx'> </div><div class='ctx'> static void release_block_group(struct btrfs_block_group *block_group,</div><div class='ctx'> 				struct find_free_extent_ctl *ffe_ctl,</div><div class='del'>-				int delalloc)</div><div class='add'>+				bool delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	switch (ffe_ctl-&gt;policy) {</div><div class='ctx'> 	case BTRFS_EXTENT_ALLOC_CLUSTERED:</div><div class='hunk'>@@ -4141,6 +4141,7 @@ static int can_allocate_chunk(struct btrfs_fs_info *fs_info,</div><div class='ctx'> static int find_free_extent_update_loop(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					struct btrfs_key *ins,</div><div class='ctx'> 					struct find_free_extent_ctl *ffe_ctl,</div><div class='add'>+					struct btrfs_space_info *space_info,</div><div class='ctx'> 					bool full_search)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;chunk_root;</div><div class='hunk'>@@ -4195,7 +4196,7 @@ static int find_free_extent_update_loop(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = btrfs_chunk_alloc(trans, ffe_ctl-&gt;flags,</div><div class='add'>+			ret = btrfs_chunk_alloc(trans, space_info, ffe_ctl-&gt;flags,</div><div class='ctx'> 						CHUNK_ALLOC_FORCE_FOR_EXTENT);</div><div class='ctx'> </div><div class='ctx'> 			/* Do not bail out on ENOSPC since we can do more. */</div><div class='hunk'>@@ -4232,21 +4233,6 @@ static int find_free_extent_update_loop(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool find_free_extent_check_size_class(struct find_free_extent_ctl *ffe_ctl,</div><div class='del'>-					      struct btrfs_block_group *bg)</div><div class='del'>-{</div><div class='del'>-	if (ffe_ctl-&gt;policy == BTRFS_EXTENT_ALLOC_ZONED)</div><div class='del'>-		return true;</div><div class='del'>-	if (!btrfs_block_group_should_use_size_class(bg))</div><div class='del'>-		return true;</div><div class='del'>-	if (ffe_ctl-&gt;loop &gt;= LOOP_WRONG_SIZE_CLASS)</div><div class='del'>-		return true;</div><div class='del'>-	if (ffe_ctl-&gt;loop &gt;= LOOP_UNSET_SIZE_CLASS &amp;&amp;</div><div class='del'>-	    bg-&gt;size_class == BTRFS_BG_SZ_NONE)</div><div class='del'>-		return true;</div><div class='del'>-	return ffe_ctl-&gt;size_class == bg-&gt;size_class;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int prepare_allocation_clustered(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					struct find_free_extent_ctl *ffe_ctl,</div><div class='ctx'> 					struct btrfs_space_info *space_info,</div><div class='hunk'>@@ -4298,6 +4284,44 @@ static int prepare_allocation_clustered(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int prepare_allocation_zoned(struct btrfs_fs_info *fs_info,</div><div class='add'>+				    struct find_free_extent_ctl *ffe_ctl,</div><div class='add'>+				    struct btrfs_space_info *space_info)</div><div class='add'>+{</div><div class='add'>+	if (ffe_ctl-&gt;for_treelog) {</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;treelog_bg_lock);</div><div class='add'>+		if (fs_info-&gt;treelog_bg)</div><div class='add'>+			ffe_ctl-&gt;hint_byte = fs_info-&gt;treelog_bg;</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;treelog_bg_lock);</div><div class='add'>+	} else if (ffe_ctl-&gt;for_data_reloc) {</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;relocation_bg_lock);</div><div class='add'>+		if (fs_info-&gt;data_reloc_bg)</div><div class='add'>+			ffe_ctl-&gt;hint_byte = fs_info-&gt;data_reloc_bg;</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;relocation_bg_lock);</div><div class='add'>+	} else if (ffe_ctl-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA) {</div><div class='add'>+		struct btrfs_block_group *block_group;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='add'>+		list_for_each_entry(block_group, &amp;fs_info-&gt;zone_active_bgs, active_bg_list) {</div><div class='add'>+			/*</div><div class='add'>+			 * No lock is OK here because avail is monotonically</div><div class='add'>+			 * decreasing, and this is just a hint.</div><div class='add'>+			 */</div><div class='add'>+			u64 avail = block_group-&gt;zone_capacity - block_group-&gt;alloc_offset;</div><div class='add'>+</div><div class='add'>+			if (block_group_bits(block_group, ffe_ctl-&gt;flags) &amp;&amp;</div><div class='add'>+			    block_group-&gt;space_info == space_info &amp;&amp;</div><div class='add'>+			    avail &gt;= ffe_ctl-&gt;num_bytes) {</div><div class='add'>+				ffe_ctl-&gt;hint_byte = block_group-&gt;start;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int prepare_allocation(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			      struct find_free_extent_ctl *ffe_ctl,</div><div class='ctx'> 			      struct btrfs_space_info *space_info,</div><div class='hunk'>@@ -4308,19 +4332,7 @@ static int prepare_allocation(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return prepare_allocation_clustered(fs_info, ffe_ctl,</div><div class='ctx'> 						    space_info, ins);</div><div class='ctx'> 	case BTRFS_EXTENT_ALLOC_ZONED:</div><div class='del'>-		if (ffe_ctl-&gt;for_treelog) {</div><div class='del'>-			spin_lock(&amp;fs_info-&gt;treelog_bg_lock);</div><div class='del'>-			if (fs_info-&gt;treelog_bg)</div><div class='del'>-				ffe_ctl-&gt;hint_byte = fs_info-&gt;treelog_bg;</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;treelog_bg_lock);</div><div class='del'>-		}</div><div class='del'>-		if (ffe_ctl-&gt;for_data_reloc) {</div><div class='del'>-			spin_lock(&amp;fs_info-&gt;relocation_bg_lock);</div><div class='del'>-			if (fs_info-&gt;data_reloc_bg)</div><div class='del'>-				ffe_ctl-&gt;hint_byte = fs_info-&gt;data_reloc_bg;</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;relocation_bg_lock);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='add'>+		return prepare_allocation_zoned(fs_info, ffe_ctl, space_info);</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4388,11 +4400,22 @@ static noinline int find_free_extent(struct btrfs_root *root,</div><div class='ctx'> 	ins-&gt;objectid = 0;</div><div class='ctx'> 	ins-&gt;offset = 0;</div><div class='ctx'> </div><div class='del'>-	trace_find_free_extent(root, ffe_ctl);</div><div class='add'>+	trace_btrfs_find_free_extent(root, ffe_ctl);</div><div class='ctx'> </div><div class='ctx'> 	space_info = btrfs_find_space_info(fs_info, ffe_ctl-&gt;flags);</div><div class='add'>+	if (btrfs_is_zoned(fs_info) &amp;&amp; space_info) {</div><div class='add'>+		/* Use dedicated sub-space_info for dedicated block group users. */</div><div class='add'>+		if (ffe_ctl-&gt;for_data_reloc) {</div><div class='add'>+			space_info = space_info-&gt;sub_group[0];</div><div class='add'>+			ASSERT(space_info-&gt;subgroup_id == BTRFS_SUB_GROUP_DATA_RELOC);</div><div class='add'>+		} else if (ffe_ctl-&gt;for_treelog) {</div><div class='add'>+			space_info = space_info-&gt;sub_group[0];</div><div class='add'>+			ASSERT(space_info-&gt;subgroup_id == BTRFS_SUB_GROUP_TREELOG);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (!space_info) {</div><div class='del'>-		btrfs_err(fs_info, "No space info for %llu", ffe_ctl-&gt;flags);</div><div class='add'>+		btrfs_err(fs_info, "no space info for %llu, tree-log %d, relocation %d",</div><div class='add'>+			  ffe_ctl-&gt;flags, ffe_ctl-&gt;for_treelog, ffe_ctl-&gt;for_data_reloc);</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4414,6 +4437,7 @@ static noinline int find_free_extent(struct btrfs_root *root,</div><div class='ctx'> 		 * picked out then we don't care that the block group is cached.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (block_group &amp;&amp; block_group_bits(block_group, ffe_ctl-&gt;flags) &amp;&amp;</div><div class='add'>+		    block_group-&gt;space_info == space_info &amp;&amp;</div><div class='ctx'> 		    block_group-&gt;cached != BTRFS_CACHE_NO) {</div><div class='ctx'> 			down_read(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 			if (list_empty(&amp;block_group-&gt;list) ||</div><div class='hunk'>@@ -4439,7 +4463,7 @@ static noinline int find_free_extent(struct btrfs_root *root,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> search:</div><div class='del'>-	trace_find_free_extent_search_loop(root, ffe_ctl);</div><div class='add'>+	trace_btrfs_find_free_extent_search_loop(root, ffe_ctl);</div><div class='ctx'> 	ffe_ctl-&gt;have_caching_bg = false;</div><div class='ctx'> 	if (ffe_ctl-&gt;index == btrfs_bg_flags_to_raid_index(ffe_ctl-&gt;flags) ||</div><div class='ctx'> 	    ffe_ctl-&gt;index == 0)</div><div class='hunk'>@@ -4491,7 +4515,7 @@ search:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> have_block_group:</div><div class='del'>-		trace_find_free_extent_have_block_group(root, ffe_ctl, block_group);</div><div class='add'>+		trace_btrfs_find_free_extent_have_block_group(root, ffe_ctl, block_group);</div><div class='ctx'> 		ffe_ctl-&gt;cached = btrfs_block_group_done(block_group);</div><div class='ctx'> 		if (unlikely(!ffe_ctl-&gt;cached)) {</div><div class='ctx'> 			ffe_ctl-&gt;have_caching_bg = true;</div><div class='hunk'>@@ -4584,7 +4608,8 @@ loop:</div><div class='ctx'> 	}</div><div class='ctx'> 	up_read(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> </div><div class='del'>-	ret = find_free_extent_update_loop(fs_info, ins, ffe_ctl, full_search);</div><div class='add'>+	ret = find_free_extent_update_loop(fs_info, ins, ffe_ctl, space_info,</div><div class='add'>+					   full_search);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		goto search;</div><div class='ctx'> </div><div class='hunk'>@@ -4653,14 +4678,14 @@ loop:</div><div class='ctx'> int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,</div><div class='ctx'> 			 u64 num_bytes, u64 min_alloc_size,</div><div class='ctx'> 			 u64 empty_size, u64 hint_byte,</div><div class='del'>-			 struct btrfs_key *ins, int is_data, int delalloc)</div><div class='add'>+			 struct btrfs_key *ins, bool is_data, bool delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct find_free_extent_ctl ffe_ctl = {};</div><div class='ctx'> 	bool final_tried = num_bytes == min_alloc_size;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool for_treelog = (root-&gt;root_key.objectid == BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	bool for_treelog = (btrfs_root_id(root) == BTRFS_TREE_LOG_OBJECTID);</div><div class='ctx'> 	bool for_data_reloc = (btrfs_is_data_reloc_root(root) &amp;&amp; is_data);</div><div class='ctx'> </div><div class='ctx'> 	flags = get_alloc_profile_by_root(root, is_data);</div><div class='hunk'>@@ -4698,16 +4723,15 @@ again:</div><div class='ctx'> 	"allocation failed flags %llu, wanted %llu tree-log %d, relocation: %d",</div><div class='ctx'> 				  flags, num_bytes, for_treelog, for_data_reloc);</div><div class='ctx'> 			if (sinfo)</div><div class='del'>-				btrfs_dump_space_info(fs_info, sinfo,</div><div class='del'>-						      num_bytes, 1);</div><div class='add'>+				btrfs_dump_space_info(sinfo, num_bytes, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       u64 start, u64 len, int delalloc)</div><div class='add'>+int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len,</div><div class='add'>+			       bool is_delalloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='ctx'> </div><div class='hunk'>@@ -4719,7 +4743,7 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_add_free_space(cache, start, len);</div><div class='del'>-	btrfs_free_reserved_bytes(cache, len, delalloc);</div><div class='add'>+	btrfs_free_reserved_bytes(cache, len, is_delalloc);</div><div class='ctx'> 	trace_btrfs_reserved_extent_free(fs_info, start, len);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='hunk'>@@ -4739,7 +4763,7 @@ int btrfs_pin_reserved_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = pin_down_extent(trans, cache, eb-&gt;start, eb-&gt;len, 1);</div><div class='add'>+	ret = pin_down_extent(trans, cache, eb-&gt;start, eb-&gt;len, true);</div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4750,7 +4774,7 @@ static int alloc_reserved_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = remove_from_free_space_tree(trans, bytenr, num_bytes);</div><div class='add'>+	ret = btrfs_remove_from_free_space_tree(trans, bytenr, num_bytes);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -4835,14 +4859,13 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_set_extent_data_ref_count(leaf, ref, ref_mod);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	return alloc_reserved_extent(trans, ins-&gt;objectid, ins-&gt;offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,</div><div class='del'>-				     struct btrfs_delayed_ref_node *node,</div><div class='add'>+				     const struct btrfs_delayed_ref_node *node,</div><div class='ctx'> 				     struct btrfs_delayed_extent_op *extent_op)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='hunk'>@@ -4854,16 +4877,16 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_extent_inline_ref *iref;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_delayed_tree_ref *ref;</div><div class='ctx'> 	u32 size = sizeof(*extent_item) + sizeof(*iref);</div><div class='del'>-	u64 flags = extent_op-&gt;flags_to_set;</div><div class='add'>+	const u64 flags = (extent_op ? extent_op-&gt;flags_to_set : 0);</div><div class='add'>+	/* The owner of a tree block is the level. */</div><div class='add'>+	int level = btrfs_delayed_ref_owner(node);</div><div class='ctx'> 	bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);</div><div class='ctx'> </div><div class='del'>-	ref = btrfs_delayed_node_to_tree_ref(node);</div><div class='del'>-</div><div class='ctx'> 	extent_key.objectid = node-&gt;bytenr;</div><div class='ctx'> 	if (skinny_metadata) {</div><div class='del'>-		extent_key.offset = ref-&gt;level;</div><div class='add'>+		/* The owner of a tree block is the level. */</div><div class='add'>+		extent_key.offset = level;</div><div class='ctx'> 		extent_key.type = BTRFS_METADATA_ITEM_KEY;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		extent_key.offset = node-&gt;num_bytes;</div><div class='hunk'>@@ -4896,21 +4919,20 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		block_info = (struct btrfs_tree_block_info *)(extent_item + 1);</div><div class='ctx'> 		btrfs_set_tree_block_key(leaf, block_info, &amp;extent_op-&gt;key);</div><div class='del'>-		btrfs_set_tree_block_level(leaf, block_info, ref-&gt;level);</div><div class='add'>+		btrfs_set_tree_block_level(leaf, block_info, level);</div><div class='ctx'> 		iref = (struct btrfs_extent_inline_ref *)(block_info + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (node-&gt;type == BTRFS_SHARED_BLOCK_REF_KEY) {</div><div class='ctx'> 		btrfs_set_extent_inline_ref_type(leaf, iref,</div><div class='ctx'> 						 BTRFS_SHARED_BLOCK_REF_KEY);</div><div class='del'>-		btrfs_set_extent_inline_ref_offset(leaf, iref, ref-&gt;parent);</div><div class='add'>+		btrfs_set_extent_inline_ref_offset(leaf, iref, node-&gt;parent);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_set_extent_inline_ref_type(leaf, iref,</div><div class='ctx'> 						 BTRFS_TREE_BLOCK_REF_KEY);</div><div class='del'>-		btrfs_set_extent_inline_ref_offset(leaf, iref, ref-&gt;root);</div><div class='add'>+		btrfs_set_extent_inline_ref_offset(leaf, iref, node-&gt;ref_root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	return alloc_reserved_extent(trans, node-&gt;bytenr, fs_info-&gt;nodesize);</div><div class='hunk'>@@ -4921,19 +4943,20 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     u64 offset, u64 ram_bytes,</div><div class='ctx'> 				     struct btrfs_key *ins)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_ref generic_ref = { 0 };</div><div class='del'>-	u64 root_objectid = root-&gt;root_key.objectid;</div><div class='del'>-	u64 owning_root = root_objectid;</div><div class='add'>+	struct btrfs_ref generic_ref = {</div><div class='add'>+		.action = BTRFS_ADD_DELAYED_EXTENT,</div><div class='add'>+		.bytenr = ins-&gt;objectid,</div><div class='add'>+		.num_bytes = ins-&gt;offset,</div><div class='add'>+		.owning_root = btrfs_root_id(root),</div><div class='add'>+		.ref_root = btrfs_root_id(root),</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	BUG_ON(root_objectid == BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	ASSERT(generic_ref.ref_root != BTRFS_TREE_LOG_OBJECTID);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_is_data_reloc_root(root) &amp;&amp; is_fstree(root-&gt;relocation_src_root))</div><div class='del'>-		owning_root = root-&gt;relocation_src_root;</div><div class='add'>+	if (btrfs_is_data_reloc_root(root) &amp;&amp; btrfs_is_fstree(root-&gt;relocation_src_root))</div><div class='add'>+		generic_ref.owning_root = root-&gt;relocation_src_root;</div><div class='ctx'> </div><div class='del'>-	btrfs_init_generic_ref(&amp;generic_ref, BTRFS_ADD_DELAYED_EXTENT,</div><div class='del'>-			       ins-&gt;objectid, ins-&gt;offset, 0, owning_root);</div><div class='del'>-	btrfs_init_data_ref(&amp;generic_ref, root_objectid, owner,</div><div class='del'>-			    offset, 0, false);</div><div class='add'>+	btrfs_init_data_ref(&amp;generic_ref, owner, offset, 0, false);</div><div class='ctx'> 	btrfs_ref_tree_mod(root-&gt;fs_info, &amp;generic_ref);</div><div class='ctx'> </div><div class='ctx'> 	return btrfs_add_delayed_data_ref(trans, &amp;generic_ref, ram_bytes);</div><div class='hunk'>@@ -4952,7 +4975,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='ctx'> 	struct btrfs_space_info *space_info;</div><div class='del'>-	struct btrfs_squota_delta delta = {</div><div class='add'>+	const struct btrfs_squota_delta delta = {</div><div class='ctx'> 		.root = root_objectid,</div><div class='ctx'> 		.num_bytes = ins-&gt;offset,</div><div class='ctx'> 		.generation = trans-&gt;transid,</div><div class='hunk'>@@ -4986,7 +5009,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = alloc_reserved_file_extent(trans, 0, root_objectid, 0, owner,</div><div class='ctx'> 					 offset, ins, 1, root_objectid);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		btrfs_pin_extent(trans, ins-&gt;objectid, ins-&gt;offset, 1);</div><div class='add'>+		btrfs_pin_extent(trans, ins-&gt;objectid, ins-&gt;offset);</div><div class='ctx'> 	ret = btrfs_record_squota_delta(fs_info, &amp;delta);</div><div class='ctx'> 	btrfs_put_block_group(block_group);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -5027,7 +5050,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 	if (IS_ERR(buf))</div><div class='ctx'> 		return buf;</div><div class='ctx'> </div><div class='del'>-	if (check_eb_lock_owner(buf)) {</div><div class='add'>+	if (unlikely(check_eb_lock_owner(buf))) {</div><div class='ctx'> 		free_extent_buffer(buf);</div><div class='ctx'> 		return ERR_PTR(-EUCLEAN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5056,7 +5079,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_set_buffer_lockdep_class(lockdep_owner, buf, level);</div><div class='ctx'> </div><div class='del'>-	__btrfs_tree_lock(buf, nest);</div><div class='add'>+	btrfs_tree_lock_nested(buf, nest);</div><div class='ctx'> 	btrfs_clear_buffer_dirty(trans, buf);</div><div class='ctx'> 	clear_bit(EXTENT_BUFFER_STALE, &amp;buf-&gt;bflags);</div><div class='ctx'> 	clear_bit(EXTENT_BUFFER_ZONED_ZEROOUT, &amp;buf-&gt;bflags);</div><div class='hunk'>@@ -5071,24 +5094,24 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='ctx'> 	btrfs_set_header_owner(buf, owner);</div><div class='ctx'> 	write_extent_buffer_fsid(buf, fs_info-&gt;fs_devices-&gt;metadata_uuid);</div><div class='ctx'> 	write_extent_buffer_chunk_tree_uuid(buf, fs_info-&gt;chunk_tree_uuid);</div><div class='del'>-	if (root-&gt;root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_LOG_OBJECTID) {</div><div class='ctx'> 		buf-&gt;log_index = root-&gt;log_transid % 2;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * we allow two log transactions at a time, use different</div><div class='ctx'> 		 * EXTENT bit to differentiate dirty pages.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (buf-&gt;log_index == 0)</div><div class='del'>-			set_extent_bit(&amp;root-&gt;dirty_log_pages, buf-&gt;start,</div><div class='del'>-				       buf-&gt;start + buf-&gt;len - 1,</div><div class='del'>-				       EXTENT_DIRTY, NULL);</div><div class='add'>+			btrfs_set_extent_bit(&amp;root-&gt;dirty_log_pages, buf-&gt;start,</div><div class='add'>+					     buf-&gt;start + buf-&gt;len - 1,</div><div class='add'>+					     EXTENT_DIRTY_LOG1, NULL);</div><div class='ctx'> 		else</div><div class='del'>-			set_extent_bit(&amp;root-&gt;dirty_log_pages, buf-&gt;start,</div><div class='del'>-				       buf-&gt;start + buf-&gt;len - 1,</div><div class='del'>-				       EXTENT_NEW, NULL);</div><div class='add'>+			btrfs_set_extent_bit(&amp;root-&gt;dirty_log_pages, buf-&gt;start,</div><div class='add'>+					     buf-&gt;start + buf-&gt;len - 1,</div><div class='add'>+					     EXTENT_DIRTY_LOG2, NULL);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buf-&gt;log_index = -1;</div><div class='del'>-		set_extent_bit(&amp;trans-&gt;transaction-&gt;dirty_pages, buf-&gt;start,</div><div class='del'>-			       buf-&gt;start + buf-&gt;len - 1, EXTENT_DIRTY, NULL);</div><div class='add'>+		btrfs_set_extent_bit(&amp;trans-&gt;transaction-&gt;dirty_pages, buf-&gt;start,</div><div class='add'>+				     buf-&gt;start + buf-&gt;len - 1, EXTENT_DIRTY, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* this returns a buffer locked for blocking */</div><div class='ctx'> 	return buf;</div><div class='hunk'>@@ -5111,8 +5134,6 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_key ins;</div><div class='ctx'> 	struct btrfs_block_rsv *block_rsv;</div><div class='ctx'> 	struct extent_buffer *buf;</div><div class='del'>-	struct btrfs_delayed_extent_op *extent_op;</div><div class='del'>-	struct btrfs_ref generic_ref = { 0 };</div><div class='ctx'> 	u64 flags = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 blocksize = fs_info-&gt;nodesize;</div><div class='hunk'>@@ -5134,7 +5155,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return ERR_CAST(block_rsv);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_reserve_extent(root, blocksize, blocksize, blocksize,</div><div class='del'>-				   empty_size, hint, &amp;ins, 0, 0);</div><div class='add'>+				   empty_size, hint, &amp;ins, false, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unuse;</div><div class='ctx'> </div><div class='hunk'>@@ -5155,38 +5176,48 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		BUG_ON(parent &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 	if (root_objectid != BTRFS_TREE_LOG_OBJECTID) {</div><div class='del'>-		extent_op = btrfs_alloc_delayed_extent_op();</div><div class='del'>-		if (!extent_op) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out_free_buf;</div><div class='add'>+		struct btrfs_delayed_extent_op *extent_op;</div><div class='add'>+		struct btrfs_ref generic_ref = {</div><div class='add'>+			.action = BTRFS_ADD_DELAYED_EXTENT,</div><div class='add'>+			.bytenr = ins.objectid,</div><div class='add'>+			.num_bytes = ins.offset,</div><div class='add'>+			.parent = parent,</div><div class='add'>+			.owning_root = owning_root,</div><div class='add'>+			.ref_root = root_objectid,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (!skinny_metadata || flags != 0) {</div><div class='add'>+			extent_op = btrfs_alloc_delayed_extent_op();</div><div class='add'>+			if (!extent_op) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out_free_buf;</div><div class='add'>+			}</div><div class='add'>+			if (key)</div><div class='add'>+				memcpy(&amp;extent_op-&gt;key, key, sizeof(extent_op-&gt;key));</div><div class='add'>+			else</div><div class='add'>+				memset(&amp;extent_op-&gt;key, 0, sizeof(extent_op-&gt;key));</div><div class='add'>+			extent_op-&gt;flags_to_set = flags;</div><div class='add'>+			extent_op-&gt;update_key = (skinny_metadata ? false : true);</div><div class='add'>+			extent_op-&gt;update_flags = (flags != 0);</div><div class='add'>+		} else {</div><div class='add'>+			extent_op = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		if (key)</div><div class='del'>-			memcpy(&amp;extent_op-&gt;key, key, sizeof(extent_op-&gt;key));</div><div class='del'>-		else</div><div class='del'>-			memset(&amp;extent_op-&gt;key, 0, sizeof(extent_op-&gt;key));</div><div class='del'>-		extent_op-&gt;flags_to_set = flags;</div><div class='del'>-		extent_op-&gt;update_key = skinny_metadata ? false : true;</div><div class='del'>-		extent_op-&gt;update_flags = true;</div><div class='del'>-		extent_op-&gt;level = level;</div><div class='del'>-</div><div class='del'>-		btrfs_init_generic_ref(&amp;generic_ref, BTRFS_ADD_DELAYED_EXTENT,</div><div class='del'>-				       ins.objectid, ins.offset, parent, owning_root);</div><div class='del'>-		btrfs_init_tree_ref(&amp;generic_ref, level, root_objectid,</div><div class='del'>-				    root-&gt;root_key.objectid, false);</div><div class='add'>+</div><div class='add'>+		btrfs_init_tree_ref(&amp;generic_ref, level, btrfs_root_id(root), false);</div><div class='ctx'> 		btrfs_ref_tree_mod(fs_info, &amp;generic_ref);</div><div class='ctx'> 		ret = btrfs_add_delayed_tree_ref(trans, &amp;generic_ref, extent_op);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_free_delayed;</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_free_delayed_extent_op(extent_op);</div><div class='add'>+			goto out_free_buf;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return buf;</div><div class='ctx'> </div><div class='del'>-out_free_delayed:</div><div class='del'>-	btrfs_free_delayed_extent_op(extent_op);</div><div class='ctx'> out_free_buf:</div><div class='ctx'> 	btrfs_tree_unlock(buf);</div><div class='ctx'> 	free_extent_buffer(buf);</div><div class='ctx'> out_free_reserved:</div><div class='del'>-	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 0);</div><div class='add'>+	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, false);</div><div class='ctx'> out_unuse:</div><div class='ctx'> 	btrfs_unuse_block_rsv(fs_info, block_rsv, blocksize);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -5206,11 +5237,99 @@ struct walk_control {</div><div class='ctx'> 	int reada_slot;</div><div class='ctx'> 	int reada_count;</div><div class='ctx'> 	int restarted;</div><div class='add'>+	/* Indicate that extent info needs to be looked up when walking the tree. */</div><div class='add'>+	int lookup_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This is our normal stage.  We are traversing blocks the current snapshot owns</div><div class='add'>+ * and we are dropping any of our references to any children we are able to, and</div><div class='add'>+ * then freeing the block once we've processed all of the children.</div><div class='add'>+ */</div><div class='ctx'> #define DROP_REFERENCE	1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We enter this stage when we have to walk into a child block (meaning we can't</div><div class='add'>+ * simply drop our reference to it from our current parent node) and there are</div><div class='add'>+ * more than one reference on it.  If we are the owner of any of the children</div><div class='add'>+ * blocks from the current parent node then we have to do the FULL_BACKREF dance</div><div class='add'>+ * on them in order to drop our normal ref and add the shared ref.</div><div class='add'>+ */</div><div class='ctx'> #define UPDATE_BACKREF	2</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Decide if we need to walk down into this node to adjust the references.</div><div class='add'>+ *</div><div class='add'>+ * @root:	the root we are currently deleting</div><div class='add'>+ * @wc:		the walk control for this deletion</div><div class='add'>+ * @eb:		the parent eb that we're currently visiting</div><div class='add'>+ * @refs:	the number of refs for wc-&gt;level - 1</div><div class='add'>+ * @flags:	the flags for wc-&gt;level - 1</div><div class='add'>+ * @slot:	the slot in the eb that we're currently checking</div><div class='add'>+ *</div><div class='add'>+ * This is meant to be called when we're evaluating if a node we point to at</div><div class='add'>+ * wc-&gt;level should be read and walked into, or if we can simply delete our</div><div class='add'>+ * reference to it.  We return true if we should walk into the node, false if we</div><div class='add'>+ * can skip it.</div><div class='add'>+ *</div><div class='add'>+ * We have assertions in here to make sure this is called correctly.  We assume</div><div class='add'>+ * that sanity checking on the blocks read to this point has been done, so any</div><div class='add'>+ * corrupted file systems must have been caught before calling this function.</div><div class='add'>+ */</div><div class='add'>+static bool visit_node_for_delete(struct btrfs_root *root, struct walk_control *wc,</div><div class='add'>+				  struct extent_buffer *eb, u64 flags, int slot)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+	u64 generation;</div><div class='add'>+	int level = wc-&gt;level;</div><div class='add'>+</div><div class='add'>+	ASSERT(level &gt; 0);</div><div class='add'>+	ASSERT(wc-&gt;refs[level - 1] &gt; 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The update backref stage we only want to skip if we already have</div><div class='add'>+	 * FULL_BACKREF set, otherwise we need to read.</div><div class='add'>+	 */</div><div class='add'>+	if (wc-&gt;stage == UPDATE_BACKREF) {</div><div class='add'>+		if (level == 1 &amp;&amp; flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF)</div><div class='add'>+			return false;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're the last ref on this block, we must walk into it and process</div><div class='add'>+	 * any refs it's pointing at.</div><div class='add'>+	 */</div><div class='add'>+	if (wc-&gt;refs[level - 1] == 1)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we're already FULL_BACKREF then we know we can just drop our</div><div class='add'>+	 * current reference.</div><div class='add'>+	 */</div><div class='add'>+	if (level == 1 &amp;&amp; flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This block is older than our creation generation, we can drop our</div><div class='add'>+	 * reference to it.</div><div class='add'>+	 */</div><div class='add'>+	generation = btrfs_node_ptr_generation(eb, slot);</div><div class='add'>+	if (!wc-&gt;update_ref || generation &lt;= btrfs_root_origin_generation(root))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This block was processed from a previous snapshot deletion run, we</div><div class='add'>+	 * can skip it.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_node_key_to_cpu(eb, &amp;key, slot);</div><div class='add'>+	if (btrfs_comp_cpu_keys(&amp;key, &amp;wc-&gt;update_progress) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* All other cases we need to wander into the node. */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static noinline void reada_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     struct btrfs_root *root,</div><div class='ctx'> 				     struct walk_control *wc,</div><div class='hunk'>@@ -5222,7 +5341,6 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u64 refs;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> 	u32 nritems;</div><div class='del'>-	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -5252,7 +5370,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto reada;</div><div class='ctx'> </div><div class='ctx'> 		if (wc-&gt;stage == UPDATE_BACKREF &amp;&amp;</div><div class='del'>-		    generation &lt;= root-&gt;root_key.offset)</div><div class='add'>+		    generation &lt;= btrfs_root_origin_generation(root))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* We don't lock the tree block, it's OK to be racy here */</div><div class='hunk'>@@ -5262,28 +5380,19 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		/* We don't care about errors in readahead. */</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			continue;</div><div class='del'>-		BUG_ON(refs == 0);</div><div class='ctx'> </div><div class='del'>-		if (wc-&gt;stage == DROP_REFERENCE) {</div><div class='del'>-			if (refs == 1)</div><div class='del'>-				goto reada;</div><div class='add'>+		/*</div><div class='add'>+		 * This could be racey, it's conceivable that we raced and end</div><div class='add'>+		 * up with a bogus refs count, if that's the case just skip, if</div><div class='add'>+		 * we are actually corrupt we will notice when we look up</div><div class='add'>+		 * everything again with our locks.</div><div class='add'>+		 */</div><div class='add'>+		if (refs == 0)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			if (wc-&gt;level == 1 &amp;&amp;</div><div class='del'>-			    (flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF))</div><div class='del'>-				continue;</div><div class='del'>-			if (!wc-&gt;update_ref ||</div><div class='del'>-			    generation &lt;= root-&gt;root_key.offset)</div><div class='del'>-				continue;</div><div class='del'>-			btrfs_node_key_to_cpu(eb, &amp;key, slot);</div><div class='del'>-			ret = btrfs_comp_cpu_keys(&amp;key,</div><div class='del'>-						  &amp;wc-&gt;update_progress);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-		} else {</div><div class='del'>-			if (wc-&gt;level == 1 &amp;&amp;</div><div class='del'>-			    (flags &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF))</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='add'>+		/* If we don't need to visit this node don't reada. */</div><div class='add'>+		if (!visit_node_for_delete(root, wc, eb, flags, slot))</div><div class='add'>+			continue;</div><div class='ctx'> reada:</div><div class='ctx'> 		btrfs_readahead_node_child(eb, slot);</div><div class='ctx'> 		nread++;</div><div class='hunk'>@@ -5302,7 +5411,7 @@ reada:</div><div class='ctx'> static noinline int walk_down_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   struct btrfs_root *root,</div><div class='ctx'> 				   struct btrfs_path *path,</div><div class='del'>-				   struct walk_control *wc, int lookup_info)</div><div class='add'>+				   struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int level = wc-&gt;level;</div><div class='hunk'>@@ -5310,27 +5419,29 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u64 flag = BTRFS_BLOCK_FLAG_FULL_BACKREF;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (wc-&gt;stage == UPDATE_BACKREF &amp;&amp;</div><div class='del'>-	    btrfs_header_owner(eb) != root-&gt;root_key.objectid)</div><div class='add'>+	if (wc-&gt;stage == UPDATE_BACKREF &amp;&amp; btrfs_header_owner(eb) != btrfs_root_id(root))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * when reference count of tree block is 1, it won't increase</div><div class='ctx'> 	 * again. once full backref flag is set, we never clear it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (lookup_info &amp;&amp;</div><div class='add'>+	if (wc-&gt;lookup_info &amp;&amp;</div><div class='ctx'> 	    ((wc-&gt;stage == DROP_REFERENCE &amp;&amp; wc-&gt;refs[level] != 1) ||</div><div class='ctx'> 	     (wc-&gt;stage == UPDATE_BACKREF &amp;&amp; !(wc-&gt;flags[level] &amp; flag)))) {</div><div class='del'>-		BUG_ON(!path-&gt;locks[level]);</div><div class='add'>+		ASSERT(path-&gt;locks[level]);</div><div class='ctx'> 		ret = btrfs_lookup_extent_info(trans, fs_info,</div><div class='ctx'> 					       eb-&gt;start, level, 1,</div><div class='ctx'> 					       &amp;wc-&gt;refs[level],</div><div class='ctx'> 					       &amp;wc-&gt;flags[level],</div><div class='ctx'> 					       NULL);</div><div class='del'>-		BUG_ON(ret == -ENOMEM);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		BUG_ON(wc-&gt;refs[level] == 0);</div><div class='add'>+		if (unlikely(wc-&gt;refs[level] == 0)) {</div><div class='add'>+			btrfs_err(fs_info, "bytenr %llu has 0 references, expect &gt; 0",</div><div class='add'>+				  eb-&gt;start);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wc-&gt;stage == DROP_REFERENCE) {</div><div class='hunk'>@@ -5346,13 +5457,22 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* wc-&gt;stage == UPDATE_BACKREF */</div><div class='ctx'> 	if (!(wc-&gt;flags[level] &amp; flag)) {</div><div class='del'>-		BUG_ON(!path-&gt;locks[level]);</div><div class='add'>+		ASSERT(path-&gt;locks[level]);</div><div class='ctx'> 		ret = btrfs_inc_ref(trans, root, eb, 1);</div><div class='del'>-		BUG_ON(ret); /* -ENOMEM */</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 		ret = btrfs_dec_ref(trans, root, eb, 0);</div><div class='del'>-		BUG_ON(ret); /* -ENOMEM */</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 		ret = btrfs_set_disk_extent_flags(trans, eb, flag);</div><div class='del'>-		BUG_ON(ret); /* -ENOMEM */</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 		wc-&gt;flags[level] |= flag;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5375,23 +5495,186 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_root *root, u64 bytenr, u64 parent,</div><div class='ctx'> 			    int level)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='add'>+	struct btrfs_delayed_ref_head *head;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_extent_inline_ref *iref;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool exists = false;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='add'>+again:</div><div class='ctx'> 	ret = lookup_extent_backref(trans, path, &amp;iref, bytenr,</div><div class='ctx'> 				    root-&gt;fs_info-&gt;nodesize, parent,</div><div class='del'>-				    root-&gt;root_key.objectid, level, 0);</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	if (ret == -ENOENT)</div><div class='add'>+				    btrfs_root_id(root), level, 0);</div><div class='add'>+	if (ret != -ENOENT) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we get 0 then we found our reference, return 1, else</div><div class='add'>+		 * return the error if it's not -ENOENT;</div><div class='add'>+		 */</div><div class='add'>+		return (ret &lt; 0 ) ? ret : 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could have a delayed ref with this reference, so look it up while</div><div class='add'>+	 * we're holding the path open to make sure we don't race with the</div><div class='add'>+	 * delayed ref running.</div><div class='add'>+	 */</div><div class='add'>+	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	head = btrfs_find_delayed_ref_head(root-&gt;fs_info, delayed_refs, bytenr);</div><div class='add'>+	if (!head)</div><div class='add'>+		goto out;</div><div class='add'>+	if (!mutex_trylock(&amp;head-&gt;mutex)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We're contended, means that the delayed ref is running, get a</div><div class='add'>+		 * reference and wait for the ref head to be complete and then</div><div class='add'>+		 * try again.</div><div class='add'>+		 */</div><div class='add'>+		refcount_inc(&amp;head-&gt;refs);</div><div class='add'>+		spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+</div><div class='add'>+		btrfs_release_path(path);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;head-&gt;mutex);</div><div class='add'>+		mutex_unlock(&amp;head-&gt;mutex);</div><div class='add'>+		btrfs_put_delayed_ref_head(head);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	exists = btrfs_find_delayed_tree_ref(head, btrfs_root_id(root), parent);</div><div class='add'>+	mutex_unlock(&amp;head-&gt;mutex);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	return exists ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We may not have an uptodate block, so if we are going to walk down into this</div><div class='add'>+ * block we need to drop the lock, read it off of the disk, re-lock it and</div><div class='add'>+ * return to continue dropping the snapshot.</div><div class='add'>+ */</div><div class='add'>+static int check_next_block_uptodate(struct btrfs_trans_handle *trans,</div><div class='add'>+				     struct btrfs_root *root,</div><div class='add'>+				     struct btrfs_path *path,</div><div class='add'>+				     struct walk_control *wc,</div><div class='add'>+				     struct extent_buffer *next)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_tree_parent_check check = { 0 };</div><div class='add'>+	u64 generation;</div><div class='add'>+	int level = wc-&gt;level;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	btrfs_assert_tree_write_locked(next);</div><div class='add'>+</div><div class='add'>+	generation = btrfs_node_ptr_generation(path-&gt;nodes[level], path-&gt;slots[level]);</div><div class='add'>+</div><div class='add'>+	if (btrfs_buffer_uptodate(next, generation, false))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+</div><div class='add'>+	check.level = level - 1;</div><div class='add'>+	check.transid = generation;</div><div class='add'>+	check.owner_root = btrfs_root_id(root);</div><div class='add'>+	check.has_first_key = true;</div><div class='add'>+	btrfs_node_key_to_cpu(path-&gt;nodes[level], &amp;check.first_key, path-&gt;slots[level]);</div><div class='add'>+</div><div class='add'>+	btrfs_tree_unlock(next);</div><div class='add'>+	if (level == 1)</div><div class='add'>+		reada_walk_down(trans, root, wc, path);</div><div class='add'>+	ret = btrfs_read_extent_buffer(next, &amp;check);</div><div class='add'>+	if (ret) {</div><div class='add'>+		free_extent_buffer(next);</div><div class='ctx'> 		return ret;</div><div class='del'>-	return 1;</div><div class='add'>+	}</div><div class='add'>+	btrfs_tree_lock(next);</div><div class='add'>+	wc-&gt;lookup_info = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If we determine that we don't have to visit wc-&gt;level - 1 then we need to</div><div class='add'>+ * determine if we can drop our reference.</div><div class='add'>+ *</div><div class='add'>+ * If we are UPDATE_BACKREF then we will not, we need to update our backrefs.</div><div class='add'>+ *</div><div class='add'>+ * If we are DROP_REFERENCE this will figure out if we need to drop our current</div><div class='add'>+ * reference, skipping it if we dropped it from a previous uncompleted drop, or</div><div class='add'>+ * dropping it if we still have a reference to it.</div><div class='add'>+ */</div><div class='add'>+static int maybe_drop_reference(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='add'>+				struct btrfs_path *path, struct walk_control *wc,</div><div class='add'>+				struct extent_buffer *next, u64 owner_root)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_ref ref = {</div><div class='add'>+		.action = BTRFS_DROP_DELAYED_REF,</div><div class='add'>+		.bytenr = next-&gt;start,</div><div class='add'>+		.num_bytes = root-&gt;fs_info-&gt;nodesize,</div><div class='add'>+		.owning_root = owner_root,</div><div class='add'>+		.ref_root = btrfs_root_id(root),</div><div class='add'>+	};</div><div class='add'>+	int level = wc-&gt;level;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We are UPDATE_BACKREF, we're not dropping anything. */</div><div class='add'>+	if (wc-&gt;stage == UPDATE_BACKREF)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (wc-&gt;flags[level] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF) {</div><div class='add'>+		ref.parent = path-&gt;nodes[level]-&gt;start;</div><div class='add'>+	} else {</div><div class='add'>+		ASSERT(btrfs_root_id(root) == btrfs_header_owner(path-&gt;nodes[level]));</div><div class='add'>+		if (unlikely(btrfs_root_id(root) != btrfs_header_owner(path-&gt;nodes[level]))) {</div><div class='add'>+			btrfs_err(root-&gt;fs_info, "mismatched block owner");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we had a drop_progress we need to verify the refs are set as</div><div class='add'>+	 * expected.  If we find our ref then we know that from here on out</div><div class='add'>+	 * everything should be correct, and we can clear the</div><div class='add'>+	 * -&gt;restarted flag.</div><div class='add'>+	 */</div><div class='add'>+	if (wc-&gt;restarted) {</div><div class='add'>+		ret = check_ref_exists(trans, root, next-&gt;start, ref.parent,</div><div class='add'>+				       level - 1);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = 0;</div><div class='add'>+		wc-&gt;restarted = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reloc tree doesn't contribute to qgroup numbers, and we have already</div><div class='add'>+	 * accounted them at merge time (replace_path), thus we could skip</div><div class='add'>+	 * expensive subtree trace here.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='add'>+	    wc-&gt;refs[level - 1] &gt; 1) {</div><div class='add'>+		u64 generation = btrfs_node_ptr_generation(path-&gt;nodes[level],</div><div class='add'>+							   path-&gt;slots[level]);</div><div class='add'>+</div><div class='add'>+		ret = btrfs_qgroup_trace_subtree(trans, next, generation, level - 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_err_rl(root-&gt;fs_info,</div><div class='add'>+"error %d accounting shared subtree, quota is out of sync, rescan required",</div><div class='add'>+				     ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to update the next key in our walk control so we can update</div><div class='add'>+	 * the drop_progress key accordingly.  We don't care if find_next_key</div><div class='add'>+	 * doesn't find a key because that means we're at the end and are going</div><div class='add'>+	 * to clean up now.</div><div class='add'>+	 */</div><div class='add'>+	wc-&gt;drop_level = level;</div><div class='add'>+	find_next_key(path, level, &amp;wc-&gt;drop_progress);</div><div class='add'>+</div><div class='add'>+	btrfs_init_tree_ref(&amp;ref, level - 1, 0, false);</div><div class='add'>+	return btrfs_free_extent(trans, &amp;ref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5410,21 +5693,15 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,</div><div class='ctx'> static noinline int do_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct btrfs_root *root,</div><div class='ctx'> 				 struct btrfs_path *path,</div><div class='del'>-				 struct walk_control *wc, int *lookup_info)</div><div class='add'>+				 struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	u64 bytenr;</div><div class='ctx'> 	u64 generation;</div><div class='del'>-	u64 parent;</div><div class='ctx'> 	u64 owner_root = 0;</div><div class='del'>-	struct btrfs_tree_parent_check check = { 0 };</div><div class='del'>-	struct btrfs_key key;</div><div class='del'>-	struct btrfs_ref ref = { 0 };</div><div class='ctx'> 	struct extent_buffer *next;</div><div class='ctx'> 	int level = wc-&gt;level;</div><div class='del'>-	int reada = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	bool need_account = false;</div><div class='ctx'> </div><div class='ctx'> 	generation = btrfs_node_ptr_generation(path-&gt;nodes[level],</div><div class='ctx'> 					       path-&gt;slots[level]);</div><div class='hunk'>@@ -5434,28 +5711,18 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * for the subtree</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (wc-&gt;stage == UPDATE_BACKREF &amp;&amp;</div><div class='del'>-	    generation &lt;= root-&gt;root_key.offset) {</div><div class='del'>-		*lookup_info = 1;</div><div class='add'>+	    generation &lt;= btrfs_root_origin_generation(root)) {</div><div class='add'>+		wc-&gt;lookup_info = 1;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bytenr = btrfs_node_blockptr(path-&gt;nodes[level], path-&gt;slots[level]);</div><div class='ctx'> </div><div class='del'>-	check.level = level - 1;</div><div class='del'>-	check.transid = generation;</div><div class='del'>-	check.owner_root = root-&gt;root_key.objectid;</div><div class='del'>-	check.has_first_key = true;</div><div class='del'>-	btrfs_node_key_to_cpu(path-&gt;nodes[level], &amp;check.first_key,</div><div class='del'>-			      path-&gt;slots[level]);</div><div class='add'>+	next = btrfs_find_create_tree_block(fs_info, bytenr, btrfs_root_id(root),</div><div class='add'>+					    level - 1);</div><div class='add'>+	if (IS_ERR(next))</div><div class='add'>+		return PTR_ERR(next);</div><div class='ctx'> </div><div class='del'>-	next = find_extent_buffer(fs_info, bytenr);</div><div class='del'>-	if (!next) {</div><div class='del'>-		next = btrfs_find_create_tree_block(fs_info, bytenr,</div><div class='del'>-				root-&gt;root_key.objectid, level - 1);</div><div class='del'>-		if (IS_ERR(next))</div><div class='del'>-			return PTR_ERR(next);</div><div class='del'>-		reada = 1;</div><div class='del'>-	}</div><div class='ctx'> 	btrfs_tree_lock(next);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_lookup_extent_info(trans, fs_info, bytenr, level - 1, 1,</div><div class='hunk'>@@ -5466,61 +5733,35 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(wc-&gt;refs[level - 1] == 0)) {</div><div class='del'>-		btrfs_err(fs_info, "Missing references.");</div><div class='del'>-		ret = -EIO;</div><div class='add'>+		btrfs_err(fs_info, "bytenr %llu has 0 references, expect &gt; 0",</div><div class='add'>+			  bytenr);</div><div class='add'>+		ret = -EUCLEAN;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	*lookup_info = 0;</div><div class='add'>+	wc-&gt;lookup_info = 0;</div><div class='ctx'> </div><div class='del'>-	if (wc-&gt;stage == DROP_REFERENCE) {</div><div class='del'>-		if (wc-&gt;refs[level - 1] &gt; 1) {</div><div class='del'>-			need_account = true;</div><div class='del'>-			if (level == 1 &amp;&amp;</div><div class='del'>-			    (wc-&gt;flags[0] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF))</div><div class='del'>-				goto skip;</div><div class='del'>-</div><div class='del'>-			if (!wc-&gt;update_ref ||</div><div class='del'>-			    generation &lt;= root-&gt;root_key.offset)</div><div class='del'>-				goto skip;</div><div class='del'>-</div><div class='del'>-			btrfs_node_key_to_cpu(path-&gt;nodes[level], &amp;key,</div><div class='del'>-					      path-&gt;slots[level]);</div><div class='del'>-			ret = btrfs_comp_cpu_keys(&amp;key, &amp;wc-&gt;update_progress);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto skip;</div><div class='add'>+	/* If we don't have to walk into this node skip it. */</div><div class='add'>+	if (!visit_node_for_delete(root, wc, path-&gt;nodes[level],</div><div class='add'>+				   wc-&gt;flags[level - 1], path-&gt;slots[level]))</div><div class='add'>+		goto skip;</div><div class='ctx'> </div><div class='del'>-			wc-&gt;stage = UPDATE_BACKREF;</div><div class='del'>-			wc-&gt;shared_level = level - 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (level == 1 &amp;&amp;</div><div class='del'>-		    (wc-&gt;flags[0] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF))</div><div class='del'>-			goto skip;</div><div class='add'>+	/*</div><div class='add'>+	 * We have to walk down into this node, and if we're currently at the</div><div class='add'>+	 * DROP_REFERENCE stage and this block is shared then we need to switch</div><div class='add'>+	 * to the UPDATE_BACKREF stage in order to convert to FULL_BACKREF.</div><div class='add'>+	 */</div><div class='add'>+	if (wc-&gt;stage == DROP_REFERENCE &amp;&amp; wc-&gt;refs[level - 1] &gt; 1) {</div><div class='add'>+		wc-&gt;stage = UPDATE_BACKREF;</div><div class='add'>+		wc-&gt;shared_level = level - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_buffer_uptodate(next, generation, 0)) {</div><div class='del'>-		btrfs_tree_unlock(next);</div><div class='del'>-		free_extent_buffer(next);</div><div class='del'>-		next = NULL;</div><div class='del'>-		*lookup_info = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!next) {</div><div class='del'>-		if (reada &amp;&amp; level == 1)</div><div class='del'>-			reada_walk_down(trans, root, wc, path);</div><div class='del'>-		next = read_tree_block(fs_info, bytenr, &amp;check);</div><div class='del'>-		if (IS_ERR(next)) {</div><div class='del'>-			return PTR_ERR(next);</div><div class='del'>-		} else if (!extent_buffer_uptodate(next)) {</div><div class='del'>-			free_extent_buffer(next);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		btrfs_tree_lock(next);</div><div class='del'>-	}</div><div class='add'>+	ret = check_next_block_uptodate(trans, root, path, wc, next);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	level--;</div><div class='ctx'> 	ASSERT(level == btrfs_header_level(next));</div><div class='del'>-	if (level != btrfs_header_level(next)) {</div><div class='add'>+	if (unlikely(level != btrfs_header_level(next))) {</div><div class='ctx'> 		btrfs_err(root-&gt;fs_info, "mismatched level");</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -5533,76 +5774,12 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		wc-&gt;reada_slot = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> skip:</div><div class='add'>+	ret = maybe_drop_reference(trans, root, path, wc, next, owner_root);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	wc-&gt;refs[level - 1] = 0;</div><div class='ctx'> 	wc-&gt;flags[level - 1] = 0;</div><div class='del'>-	if (wc-&gt;stage == DROP_REFERENCE) {</div><div class='del'>-		if (wc-&gt;flags[level] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF) {</div><div class='del'>-			parent = path-&gt;nodes[level]-&gt;start;</div><div class='del'>-		} else {</div><div class='del'>-			ASSERT(root-&gt;root_key.objectid ==</div><div class='del'>-			       btrfs_header_owner(path-&gt;nodes[level]));</div><div class='del'>-			if (root-&gt;root_key.objectid !=</div><div class='del'>-			    btrfs_header_owner(path-&gt;nodes[level])) {</div><div class='del'>-				btrfs_err(root-&gt;fs_info,</div><div class='del'>-						"mismatched block owner");</div><div class='del'>-				ret = -EIO;</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='del'>-			parent = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we had a drop_progress we need to verify the refs are set</div><div class='del'>-		 * as expected.  If we find our ref then we know that from here</div><div class='del'>-		 * on out everything should be correct, and we can clear the</div><div class='del'>-		 * -&gt;restarted flag.</div><div class='del'>-		 */</div><div class='del'>-		if (wc-&gt;restarted) {</div><div class='del'>-			ret = check_ref_exists(trans, root, bytenr, parent,</div><div class='del'>-					       level - 1);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			if (ret == 0)</div><div class='del'>-				goto no_delete;</div><div class='del'>-			ret = 0;</div><div class='del'>-			wc-&gt;restarted = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Reloc tree doesn't contribute to qgroup numbers, and we have</div><div class='del'>-		 * already accounted them at merge time (replace_path),</div><div class='del'>-		 * thus we could skip expensive subtree trace here.</div><div class='del'>-		 */</div><div class='del'>-		if (root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='del'>-		    need_account) {</div><div class='del'>-			ret = btrfs_qgroup_trace_subtree(trans, next,</div><div class='del'>-							 generation, level - 1);</div><div class='del'>-			if (ret) {</div><div class='del'>-				btrfs_err_rl(fs_info,</div><div class='del'>-					     "Error %d accounting shared subtree. Quota is out of sync, rescan required.",</div><div class='del'>-					     ret);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to update the next key in our walk control so we can</div><div class='del'>-		 * update the drop_progress key accordingly.  We don't care if</div><div class='del'>-		 * find_next_key doesn't find a key because that means we're at</div><div class='del'>-		 * the end and are going to clean up now.</div><div class='del'>-		 */</div><div class='del'>-		wc-&gt;drop_level = level;</div><div class='del'>-		find_next_key(path, level, &amp;wc-&gt;drop_progress);</div><div class='del'>-</div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_DROP_DELAYED_REF, bytenr,</div><div class='del'>-				       fs_info-&gt;nodesize, parent, owner_root);</div><div class='del'>-		btrfs_init_tree_ref(&amp;ref, level - 1, root-&gt;root_key.objectid,</div><div class='del'>-				    0, false);</div><div class='del'>-		ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-no_delete:</div><div class='del'>-	*lookup_info = 1;</div><div class='add'>+	wc-&gt;lookup_info = 1;</div><div class='ctx'> 	ret = 1;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -5630,13 +5807,13 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	int level = wc-&gt;level;</div><div class='ctx'> 	struct extent_buffer *eb = path-&gt;nodes[level];</div><div class='ctx'> 	u64 parent = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (wc-&gt;stage == UPDATE_BACKREF) {</div><div class='del'>-		BUG_ON(wc-&gt;shared_level &lt; level);</div><div class='add'>+		ASSERT(wc-&gt;shared_level &gt;= level);</div><div class='ctx'> 		if (level &lt; wc-&gt;shared_level)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -5654,7 +5831,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * count is one.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!path-&gt;locks[level]) {</div><div class='del'>-			BUG_ON(level == 0);</div><div class='add'>+			ASSERT(level &gt; 0);</div><div class='ctx'> 			btrfs_tree_lock(eb);</div><div class='ctx'> 			path-&gt;locks[level] = BTRFS_WRITE_LOCK;</div><div class='ctx'> </div><div class='hunk'>@@ -5668,7 +5845,12 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				path-&gt;locks[level] = 0;</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			}</div><div class='del'>-			BUG_ON(wc-&gt;refs[level] == 0);</div><div class='add'>+			if (unlikely(wc-&gt;refs[level] == 0)) {</div><div class='add'>+				btrfs_tree_unlock_rw(eb, path-&gt;locks[level]);</div><div class='add'>+				btrfs_err(fs_info, "bytenr %llu has 0 references, expect &gt; 0",</div><div class='add'>+					  eb-&gt;start);</div><div class='add'>+				return -EUCLEAN;</div><div class='add'>+			}</div><div class='ctx'> 			if (wc-&gt;refs[level] == 1) {</div><div class='ctx'> 				btrfs_tree_unlock_rw(eb, path-&gt;locks[level]);</div><div class='ctx'> 				path-&gt;locks[level] = 0;</div><div class='hunk'>@@ -5678,16 +5860,24 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* wc-&gt;stage == DROP_REFERENCE */</div><div class='del'>-	BUG_ON(wc-&gt;refs[level] &gt; 1 &amp;&amp; !path-&gt;locks[level]);</div><div class='add'>+	ASSERT(path-&gt;locks[level] || wc-&gt;refs[level] == 1);</div><div class='ctx'> </div><div class='ctx'> 	if (wc-&gt;refs[level] == 1) {</div><div class='ctx'> 		if (level == 0) {</div><div class='del'>-			if (wc-&gt;flags[level] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF)</div><div class='add'>+			if (wc-&gt;flags[level] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF) {</div><div class='ctx'> 				ret = btrfs_dec_ref(trans, root, eb, 1);</div><div class='del'>-			else</div><div class='add'>+				if (ret) {</div><div class='add'>+					btrfs_abort_transaction(trans, ret);</div><div class='add'>+					return ret;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='ctx'> 				ret = btrfs_dec_ref(trans, root, eb, 0);</div><div class='del'>-			BUG_ON(ret); /* -ENOMEM */</div><div class='del'>-			if (is_fstree(root-&gt;root_key.objectid)) {</div><div class='add'>+				if (unlikely(ret)) {</div><div class='add'>+					btrfs_abort_transaction(trans, ret);</div><div class='add'>+					return ret;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (btrfs_is_fstree(btrfs_root_id(root))) {</div><div class='ctx'> 				ret = btrfs_qgroup_trace_leaf_items(trans, eb);</div><div class='ctx'> 				if (ret) {</div><div class='ctx'> 					btrfs_err_rl(fs_info,</div><div class='hunk'>@@ -5707,40 +5897,63 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (eb == root-&gt;node) {</div><div class='ctx'> 		if (wc-&gt;flags[level] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF)</div><div class='ctx'> 			parent = eb-&gt;start;</div><div class='del'>-		else if (root-&gt;root_key.objectid != btrfs_header_owner(eb))</div><div class='add'>+		else if (unlikely(btrfs_root_id(root) != btrfs_header_owner(eb)))</div><div class='ctx'> 			goto owner_mismatch;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (wc-&gt;flags[level + 1] &amp; BTRFS_BLOCK_FLAG_FULL_BACKREF)</div><div class='ctx'> 			parent = path-&gt;nodes[level + 1]-&gt;start;</div><div class='del'>-		else if (root-&gt;root_key.objectid !=</div><div class='del'>-			 btrfs_header_owner(path-&gt;nodes[level + 1]))</div><div class='add'>+		else if (unlikely(btrfs_root_id(root) !=</div><div class='add'>+				  btrfs_header_owner(path-&gt;nodes[level + 1])))</div><div class='ctx'> 			goto owner_mismatch;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_tree_block(trans, btrfs_root_id(root), eb, parent,</div><div class='del'>-			      wc-&gt;refs[level] == 1);</div><div class='add'>+	ret = btrfs_free_tree_block(trans, btrfs_root_id(root), eb, parent,</div><div class='add'>+				    wc-&gt;refs[level] == 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> out:</div><div class='ctx'> 	wc-&gt;refs[level] = 0;</div><div class='ctx'> 	wc-&gt;flags[level] = 0;</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> owner_mismatch:</div><div class='ctx'> 	btrfs_err_rl(fs_info, "unexpected tree owner, have %llu expect %llu",</div><div class='del'>-		     btrfs_header_owner(eb), root-&gt;root_key.objectid);</div><div class='add'>+		     btrfs_header_owner(eb), btrfs_root_id(root));</div><div class='ctx'> 	return -EUCLEAN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * walk_down_tree consists of two steps.</div><div class='add'>+ *</div><div class='add'>+ * walk_down_proc().  Look up the reference count and reference of our current</div><div class='add'>+ * wc-&gt;level.  At this point path-&gt;nodes[wc-&gt;level] should be populated and</div><div class='add'>+ * uptodate, and in most cases should already be locked.  If we are in</div><div class='add'>+ * DROP_REFERENCE and our refcount is &gt; 1 then we've entered a shared node and</div><div class='add'>+ * we can walk back up the tree.  If we are UPDATE_BACKREF we have to set</div><div class='add'>+ * FULL_BACKREF on this node if it's not already set, and then do the</div><div class='add'>+ * FULL_BACKREF conversion dance, which is to drop the root reference and add</div><div class='add'>+ * the shared reference to all of this nodes children.</div><div class='add'>+ *</div><div class='add'>+ * do_walk_down().  This is where we actually start iterating on the children of</div><div class='add'>+ * our current path-&gt;nodes[wc-&gt;level].  For DROP_REFERENCE that means dropping</div><div class='add'>+ * our reference to the children that return false from visit_node_for_delete(),</div><div class='add'>+ * which has various conditions where we know we can just drop our reference</div><div class='add'>+ * without visiting the node.  For UPDATE_BACKREF we will skip any children that</div><div class='add'>+ * visit_node_for_delete() returns false for, only walking down when necessary.</div><div class='add'>+ * The bulk of the work for UPDATE_BACKREF occurs in the walk_up_tree() part of</div><div class='add'>+ * snapshot deletion.</div><div class='add'>+ */</div><div class='ctx'> static noinline int walk_down_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   struct btrfs_root *root,</div><div class='ctx'> 				   struct btrfs_path *path,</div><div class='ctx'> 				   struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	int level = wc-&gt;level;</div><div class='del'>-	int lookup_info = 1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	wc-&gt;lookup_info = 1;</div><div class='ctx'> 	while (level &gt;= 0) {</div><div class='del'>-		ret = walk_down_proc(trans, root, path, wc, lookup_info);</div><div class='add'>+		ret = walk_down_proc(trans, root, path, wc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -5751,7 +5964,7 @@ static noinline int walk_down_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		    btrfs_header_nritems(path-&gt;nodes[level]))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = do_walk_down(trans, root, path, wc, &amp;lookup_info);</div><div class='add'>+		ret = do_walk_down(trans, root, path, wc);</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			path-&gt;slots[level]++;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -5762,6 +5975,23 @@ static noinline int walk_down_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return (ret == 1) ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * walk_up_tree() is responsible for making sure we visit every slot on our</div><div class='add'>+ * current node, and if we're at the end of that node then we call</div><div class='add'>+ * walk_up_proc() on our current node which will do one of a few things based on</div><div class='add'>+ * our stage.</div><div class='add'>+ *</div><div class='add'>+ * UPDATE_BACKREF.  If we wc-&gt;level is currently less than our wc-&gt;shared_level</div><div class='add'>+ * then we need to walk back up the tree, and then going back down into the</div><div class='add'>+ * other slots via walk_down_tree to update any other children from our original</div><div class='add'>+ * wc-&gt;shared_level.  Once we're at or above our wc-&gt;shared_level we can switch</div><div class='add'>+ * back to DROP_REFERENCE, lookup the current nodes refs and flags, and carry on.</div><div class='add'>+ *</div><div class='add'>+ * DROP_REFERENCE. If our refs == 1 then we're going to free this tree block.</div><div class='add'>+ * If we're level 0 then we need to btrfs_dec_ref() on all of the data extents</div><div class='add'>+ * in our current leaf.  After that we call btrfs_free_tree_block() on the</div><div class='add'>+ * current node and walk up to the next node to walk down the next slot.</div><div class='add'>+ */</div><div class='ctx'> static noinline int walk_up_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct btrfs_root *root,</div><div class='ctx'> 				 struct btrfs_path *path,</div><div class='hunk'>@@ -5808,38 +6038,36 @@ static noinline int walk_up_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * also make sure backrefs for the shared block and all lower level</div><div class='ctx'>  * blocks are properly updated.</div><div class='ctx'>  *</div><div class='del'>- * If called with for_reloc == 0, may exit early with -EAGAIN</div><div class='add'>+ * If called with for_reloc set, may exit early with -EAGAIN</div><div class='ctx'>  */</div><div class='del'>-int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='add'>+int btrfs_drop_snapshot(struct btrfs_root *root, bool update_ref, bool for_reloc)</div><div class='ctx'> {</div><div class='del'>-	const bool is_reloc_root = (root-&gt;root_key.objectid ==</div><div class='del'>-				    BTRFS_TREE_RELOC_OBJECTID);</div><div class='add'>+	const bool is_reloc_root = (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *tree_root = fs_info-&gt;tree_root;</div><div class='ctx'> 	struct btrfs_root_item *root_item = &amp;root-&gt;root_item;</div><div class='del'>-	struct walk_control *wc;</div><div class='add'>+	struct walk_control AUTO_KFREE(wc);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int ret;</div><div class='add'>+	const u64 rootid = btrfs_root_id(root);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	int level;</div><div class='ctx'> 	bool root_dropped = false;</div><div class='ctx'> 	bool unfinished_drop = false;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "Drop subvolume %llu", root-&gt;root_key.objectid);</div><div class='add'>+	btrfs_debug(fs_info, "Drop subvolume %llu", btrfs_root_id(root));</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wc = kzalloc(sizeof(*wc), GFP_NOFS);</div><div class='ctx'> 	if (!wc) {</div><div class='del'>-		btrfs_free_path(path);</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5851,12 +6079,12 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 	else</div><div class='ctx'> 		trans = btrfs_start_transaction(tree_root, 0);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = btrfs_run_delayed_items(trans);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_run_delayed_items(trans);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_end_trans;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5887,11 +6115,11 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 		path-&gt;lowest_level = level;</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 		path-&gt;lowest_level = 0;</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			err = ret;</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out_end_trans;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		WARN_ON(ret &gt; 0);</div><div class='add'>+		ret = 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * unlock our path, this is safe because only this</div><div class='hunk'>@@ -5904,14 +6132,17 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 			btrfs_tree_lock(path-&gt;nodes[level]);</div><div class='ctx'> 			path-&gt;locks[level] = BTRFS_WRITE_LOCK;</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * btrfs_lookup_extent_info() returns 0 for success,</div><div class='add'>+			 * or &lt; 0 for error.</div><div class='add'>+			 */</div><div class='ctx'> 			ret = btrfs_lookup_extent_info(trans, fs_info,</div><div class='ctx'> 						path-&gt;nodes[level]-&gt;start,</div><div class='ctx'> 						level, 1, &amp;wc-&gt;refs[level],</div><div class='ctx'> 						&amp;wc-&gt;flags[level], NULL);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				err = ret;</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				goto out_end_trans;</div><div class='del'>-			}</div><div class='add'>+</div><div class='ctx'> 			BUG_ON(wc-&gt;refs[level] == 0);</div><div class='ctx'> </div><div class='ctx'> 			if (level == btrfs_root_drop_level(root_item))</div><div class='hunk'>@@ -5935,21 +6166,20 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> </div><div class='ctx'> 		ret = walk_down_tree(trans, root, path, wc);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			err = ret;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = walk_up_tree(trans, root, path, wc, BTRFS_MAX_LEVEL);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			err = ret;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			BUG_ON(wc-&gt;stage != DROP_REFERENCE);</div><div class='add'>+			ret = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5969,9 +6199,8 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 			ret = btrfs_update_root(trans, tree_root,</div><div class='ctx'> 						&amp;root-&gt;root_key,</div><div class='ctx'> 						root_item);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='del'>-				err = ret;</div><div class='ctx'> 				goto out_end_trans;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -5982,7 +6211,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 			if (!for_reloc &amp;&amp; btrfs_need_cleaner_sleep(fs_info)) {</div><div class='ctx'> 				btrfs_debug(fs_info,</div><div class='ctx'> 					    "drop snapshot early exit");</div><div class='del'>-				err = -EAGAIN;</div><div class='add'>+				ret = -EAGAIN;</div><div class='ctx'> 				goto out_free;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -5996,37 +6225,36 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)</div><div class='ctx'> 			else</div><div class='ctx'> 				trans = btrfs_start_transaction(tree_root, 0);</div><div class='ctx'> 			if (IS_ERR(trans)) {</div><div class='del'>-				err = PTR_ERR(trans);</div><div class='add'>+				ret = PTR_ERR(trans);</div><div class='ctx'> 				goto out_free;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	if (err)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_end_trans;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_root(trans, &amp;root-&gt;root_key);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		err = ret;</div><div class='ctx'> 		goto out_end_trans;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!is_reloc_root) {</div><div class='ctx'> 		ret = btrfs_find_root(tree_root, &amp;root-&gt;root_key, path,</div><div class='ctx'> 				      NULL, NULL);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			err = ret;</div><div class='ctx'> 			goto out_end_trans;</div><div class='ctx'> 		} else if (ret &gt; 0) {</div><div class='del'>-			/* if we fail to delete the orphan item this time</div><div class='add'>+			ret = 0;</div><div class='add'>+			/*</div><div class='add'>+			 * If we fail to delete the orphan item this time</div><div class='ctx'> 			 * around, it'll get picked up the next time.</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * The most common failure here is just -ENOENT.</div><div class='ctx'> 			 */</div><div class='del'>-			btrfs_del_orphan_item(trans, tree_root,</div><div class='del'>-					      root-&gt;root_key.objectid);</div><div class='add'>+			btrfs_del_orphan_item(trans, tree_root, btrfs_root_id(root));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6049,14 +6277,21 @@ out_end_trans:</div><div class='ctx'> </div><div class='ctx'> 	btrfs_end_transaction_throttle(trans);</div><div class='ctx'> out_free:</div><div class='del'>-	kfree(wc);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> out:</div><div class='add'>+	if (!ret &amp;&amp; root_dropped) {</div><div class='add'>+		ret = btrfs_qgroup_cleanup_dropped_subvolume(fs_info, rootid);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			btrfs_warn_rl(fs_info,</div><div class='add'>+				      "failed to cleanup qgroup 0/%llu: %d",</div><div class='add'>+				      rootid, ret);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We were an unfinished drop root, check to see if there are any</div><div class='ctx'> 	 * pending, and if not clear and wake up any waiters.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!err &amp;&amp; unfinished_drop)</div><div class='add'>+	if (!ret &amp;&amp; unfinished_drop)</div><div class='ctx'> 		btrfs_maybe_wake_unfinished_drop(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -6068,7 +6303,7 @@ out:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!for_reloc &amp;&amp; !root_dropped)</div><div class='ctx'> 		btrfs_add_dead_root(root);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -6083,28 +6318,25 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			struct extent_buffer *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	struct walk_control *wc;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+	struct walk_control AUTO_KFREE(wc);</div><div class='ctx'> 	int level;</div><div class='ctx'> 	int parent_level;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int wret;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID);</div><div class='add'>+	BUG_ON(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	wc = kzalloc(sizeof(*wc), GFP_NOFS);</div><div class='del'>-	if (!wc) {</div><div class='del'>-		btrfs_free_path(path);</div><div class='add'>+	if (!wc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_assert_tree_write_locked(parent);</div><div class='ctx'> 	parent_level = btrfs_header_level(parent);</div><div class='del'>-	atomic_inc(&amp;parent-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;parent-&gt;refs);</div><div class='ctx'> 	path-&gt;nodes[parent_level] = parent;</div><div class='ctx'> 	path-&gt;slots[parent_level] = btrfs_header_nritems(parent);</div><div class='ctx'> </div><div class='hunk'>@@ -6124,28 +6356,28 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	wc-&gt;reada_count = BTRFS_NODEPTRS_PER_BLOCK(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		wret = walk_down_tree(trans, root, path, wc);</div><div class='del'>-		if (wret &lt; 0) {</div><div class='del'>-			ret = wret;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		ret = walk_down_tree(trans, root, path, wc);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		wret = walk_up_tree(trans, root, path, wc, parent_level);</div><div class='del'>-		if (wret &lt; 0)</div><div class='del'>-			ret = wret;</div><div class='del'>-		if (wret != 0)</div><div class='add'>+		ret = walk_up_tree(trans, root, path, wc, parent_level);</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(wc);</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info,</div><div class='del'>-				   u64 start, u64 end)</div><div class='add'>+/*</div><div class='add'>+ * Unpin the extent range in an error context and don't add the space back.</div><div class='add'>+ * Errors are not propagated further.</div><div class='add'>+ */</div><div class='add'>+void btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info, u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-	return unpin_extent_range(fs_info, start, end, false);</div><div class='add'>+	unpin_extent_range(fs_info, start, end, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -6197,14 +6429,14 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		find_first_clear_extent_bit(&amp;device-&gt;alloc_state, start,</div><div class='del'>-					    &amp;start, &amp;end,</div><div class='del'>-					    CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='add'>+		btrfs_find_first_clear_extent_bit(&amp;device-&gt;alloc_state, start,</div><div class='add'>+						  &amp;start, &amp;end,</div><div class='add'>+						  CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> 		/* Check if there are any CHUNK_* bits left */</div><div class='ctx'> 		if (start &gt; device-&gt;total_bytes) {</div><div class='del'>-			WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='del'>-			btrfs_warn_in_rcu(fs_info,</div><div class='add'>+			DEBUG_WARN();</div><div class='add'>+			btrfs_warn(fs_info,</div><div class='ctx'> "ignoring attempt to trim beyond device size: offset %llu length %llu device %s device size %llu",</div><div class='ctx'> 					  start, end - start + 1,</div><div class='ctx'> 					  btrfs_dev_name(device),</div><div class='hunk'>@@ -6236,8 +6468,8 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)</div><div class='ctx'> 		ret = btrfs_issue_discard(device-&gt;bdev, start, len,</div><div class='ctx'> 					  &amp;bytes);</div><div class='ctx'> 		if (!ret)</div><div class='del'>-			set_extent_bit(&amp;device-&gt;alloc_state, start,</div><div class='del'>-				       start + bytes - 1, CHUNK_TRIMMED, NULL);</div><div class='add'>+			btrfs_set_extent_bit(&amp;device-&gt;alloc_state, start,</div><div class='add'>+					     start + bytes - 1, CHUNK_TRIMMED, NULL);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -6246,7 +6478,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)</div><div class='ctx'> 		start += len;</div><div class='ctx'> 		*trimmed += bytes;</div><div class='ctx'> </div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='add'>+		if (btrfs_trim_interrupted()) {</div><div class='ctx'> 			ret = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6338,13 +6570,13 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_trim_free_extents(device, &amp;group_trimmed);</div><div class='add'>+</div><div class='add'>+		trimmed += group_trimmed;</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_failed++;</div><div class='ctx'> 			dev_ret = ret;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		trimmed += group_trimmed;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/extent-tree.h b/fs/btrfs/extent-tree.h<br/>index 2e066035ccee..71bb8109c969 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent-tree.h</a></div><div class='hunk'>@@ -3,11 +3,20 @@</div><div class='ctx'> #ifndef BTRFS_EXTENT_TREE_H</div><div class='ctx'> #define BTRFS_EXTENT_TREE_H</div><div class='ctx'> </div><div class='del'>-#include "misc.h"</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include "block-group.h"</div><div class='add'>+#include "locking.h"</div><div class='ctx'> </div><div class='add'>+struct extent_buffer;</div><div class='ctx'> struct btrfs_free_cluster;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_ref;</div><div class='add'>+struct btrfs_disk_key;</div><div class='ctx'> struct btrfs_delayed_ref_head;</div><div class='add'>+struct btrfs_delayed_ref_root;</div><div class='add'>+struct btrfs_extent_inline_ref;</div><div class='ctx'> </div><div class='ctx'> enum btrfs_extent_allocation_policy {</div><div class='ctx'> 	BTRFS_EXTENT_ALLOC_CLUSTERED,</div><div class='hunk'>@@ -21,7 +30,6 @@ struct find_free_extent_ctl {</div><div class='ctx'> 	u64 min_alloc_size;</div><div class='ctx'> 	u64 empty_size;</div><div class='ctx'> 	u64 flags;</div><div class='del'>-	int delalloc;</div><div class='ctx'> </div><div class='ctx'> 	/* Where to start the search inside the bg */</div><div class='ctx'> 	u64 search_start;</div><div class='hunk'>@@ -31,6 +39,7 @@ struct find_free_extent_ctl {</div><div class='ctx'> 	struct btrfs_free_cluster *last_ptr;</div><div class='ctx'> 	bool use_cluster;</div><div class='ctx'> </div><div class='add'>+	bool delalloc;</div><div class='ctx'> 	bool have_caching_bg;</div><div class='ctx'> 	bool orig_have_caching_bg;</div><div class='ctx'> </div><div class='hunk'>@@ -40,6 +49,16 @@ struct find_free_extent_ctl {</div><div class='ctx'> 	/* Allocation is called for data relocation */</div><div class='ctx'> 	bool for_data_reloc;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Set to true if we're retrying the allocation on this block group</div><div class='add'>+	 * after waiting for caching progress, this is so that we retry only</div><div class='add'>+	 * once before moving on to another block group.</div><div class='add'>+	 */</div><div class='add'>+	bool retry_uncached;</div><div class='add'>+</div><div class='add'>+	/* Whether or not the allocator is currently following a hint. */</div><div class='add'>+	bool hinted;</div><div class='add'>+</div><div class='ctx'> 	/* RAID index, converted from flags */</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='hunk'>@@ -48,13 +67,6 @@ struct find_free_extent_ctl {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int loop;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Set to true if we're retrying the allocation on this block group</div><div class='del'>-	 * after waiting for caching progress, this is so that we retry only</div><div class='del'>-	 * once before moving on to another block group.</div><div class='del'>-	 */</div><div class='del'>-	bool retry_uncached;</div><div class='del'>-</div><div class='ctx'> 	/* If current block group is cached */</div><div class='ctx'> 	int cached;</div><div class='ctx'> </div><div class='hunk'>@@ -73,9 +85,6 @@ struct find_free_extent_ctl {</div><div class='ctx'> 	/* Allocation policy */</div><div class='ctx'> 	enum btrfs_extent_allocation_policy policy;</div><div class='ctx'> </div><div class='del'>-	/* Whether or not the allocator is currently following a hint */</div><div class='del'>-	bool hinted;</div><div class='del'>-</div><div class='ctx'> 	/* Size class of block groups to prefer in early loops */</div><div class='ctx'> 	enum btrfs_block_group_size_class size_class;</div><div class='ctx'> };</div><div class='hunk'>@@ -88,7 +97,7 @@ enum btrfs_inline_ref_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int btrfs_get_extent_inline_ref_type(const struct extent_buffer *eb,</div><div class='del'>-				     struct btrfs_extent_inline_ref *iref,</div><div class='add'>+				     const struct btrfs_extent_inline_ref *iref,</div><div class='ctx'> 				     enum btrfs_inline_ref_type is_data);</div><div class='ctx'> u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset);</div><div class='ctx'> </div><div class='hunk'>@@ -101,13 +110,11 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_fs_info *fs_info, u64 bytenr,</div><div class='ctx'> 			     u64 offset, int metadata, u64 *refs, u64 *flags,</div><div class='ctx'> 			     u64 *owner_root);</div><div class='del'>-int btrfs_pin_extent(struct btrfs_trans_handle *trans, u64 bytenr, u64 num,</div><div class='del'>-		     int reserved);</div><div class='add'>+int btrfs_pin_extent(struct btrfs_trans_handle *trans, u64 bytenr, u64 num);</div><div class='ctx'> int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    const struct extent_buffer *eb);</div><div class='ctx'> int btrfs_exclude_logged_extents(struct extent_buffer *eb);</div><div class='del'>-int btrfs_cross_ref_exist(struct btrfs_root *root,</div><div class='del'>-			  u64 objectid, u64 offset, u64 bytenr, bool strict,</div><div class='add'>+int btrfs_cross_ref_exist(struct btrfs_inode *inode, u64 offset, u64 bytenr,</div><div class='ctx'> 			  struct btrfs_path *path);</div><div class='ctx'> struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					     struct btrfs_root *root,</div><div class='hunk'>@@ -117,10 +124,10 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					     u64 empty_size,</div><div class='ctx'> 					     u64 reloc_src_root,</div><div class='ctx'> 					     enum btrfs_lock_nesting nest);</div><div class='del'>-void btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='del'>-			   u64 root_id,</div><div class='del'>-			   struct extent_buffer *buf,</div><div class='del'>-			   u64 parent, int last_ref);</div><div class='add'>+int btrfs_free_tree_block(struct btrfs_trans_handle *trans,</div><div class='add'>+			  u64 root_id,</div><div class='add'>+			  struct extent_buffer *buf,</div><div class='add'>+			  u64 parent, int last_ref);</div><div class='ctx'> int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     struct btrfs_root *root, u64 owner,</div><div class='ctx'> 				     u64 offset, u64 ram_bytes,</div><div class='hunk'>@@ -130,28 +137,31 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   struct btrfs_key *ins);</div><div class='ctx'> int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes, u64 num_bytes,</div><div class='ctx'> 			 u64 min_alloc_size, u64 empty_size, u64 hint_byte,</div><div class='del'>-			 struct btrfs_key *ins, int is_data, int delalloc);</div><div class='add'>+			 struct btrfs_key *ins, bool is_data, bool delalloc);</div><div class='ctx'> int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='del'>-		  struct extent_buffer *buf, int full_backref);</div><div class='add'>+		  struct extent_buffer *buf, bool full_backref);</div><div class='ctx'> int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,</div><div class='del'>-		  struct extent_buffer *buf, int full_backref);</div><div class='add'>+		  struct extent_buffer *buf, bool full_backref);</div><div class='ctx'> int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct extent_buffer *eb, u64 flags);</div><div class='ctx'> int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);</div><div class='ctx'> </div><div class='ctx'> u64 btrfs_get_extent_owner_root(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				struct extent_buffer *leaf, int slot);</div><div class='del'>-int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       u64 start, u64 len, int delalloc);</div><div class='add'>+int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len,</div><div class='add'>+			       bool is_delalloc);</div><div class='ctx'> int btrfs_pin_reserved_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      const struct extent_buffer *eb);</div><div class='ctx'> int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);</div><div class='ctx'> int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, struct btrfs_ref *generic_ref);</div><div class='del'>-int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref,</div><div class='del'>-				     int for_reloc);</div><div class='add'>+int btrfs_drop_snapshot(struct btrfs_root *root, bool update_ref, bool for_reloc);</div><div class='ctx'> int btrfs_drop_subtree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			struct btrfs_root *root,</div><div class='ctx'> 			struct extent_buffer *node,</div><div class='ctx'> 			struct extent_buffer *parent);</div><div class='add'>+void btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info, u64 start, u64 end);</div><div class='add'>+int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,</div><div class='add'>+			 u64 num_bytes, u64 *actual_bytes);</div><div class='add'>+int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c<br/>index cfd2967f04a2..629fd5af4286 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent_io.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/pagevec.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/fsverity.h&gt;</div><div class='del'>-#include "misc.h"</div><div class='ctx'> #include "extent_io.h"</div><div class='ctx'> #include "extent-io-tree.h"</div><div class='ctx'> #include "extent_map.h"</div><div class='hunk'>@@ -22,7 +21,6 @@</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> #include "bio.h"</div><div class='ctx'> #include "locking.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "backref.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "subpage.h"</div><div class='hunk'>@@ -77,11 +75,12 @@ void btrfs_extent_buffer_leak_debug_check(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	while (!list_empty(&amp;fs_info-&gt;allocated_ebs)) {</div><div class='ctx'> 		eb = list_first_entry(&amp;fs_info-&gt;allocated_ebs,</div><div class='ctx'> 				      struct extent_buffer, leak_list);</div><div class='del'>-		pr_err(</div><div class='del'>-	"BTRFS: buffer leak start %llu len %lu refs %d bflags %lu owner %llu\n",</div><div class='del'>-		       eb-&gt;start, eb-&gt;len, atomic_read(&amp;eb-&gt;refs), eb-&gt;bflags,</div><div class='add'>+		btrfs_err(fs_info,</div><div class='add'>+		       "buffer leak start %llu len %u refs %d bflags %lu owner %llu",</div><div class='add'>+		       eb-&gt;start, eb-&gt;len, refcount_read(&amp;eb-&gt;refs), eb-&gt;bflags,</div><div class='ctx'> 		       btrfs_header_owner(eb));</div><div class='ctx'> 		list_del(&amp;eb-&gt;leak_list);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='ctx'> 		kmem_cache_free(extent_buffer_cache, eb);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fs_info-&gt;eb_leak_lock, flags);</div><div class='hunk'>@@ -97,13 +96,81 @@ void btrfs_extent_buffer_leak_debug_check(struct btrfs_fs_info *fs_info)</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_bio_ctrl {</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='add'>+	/* Last byte contained in bbio + 1 . */</div><div class='add'>+	loff_t next_file_offset;</div><div class='ctx'> 	enum btrfs_compression_type compress_type;</div><div class='ctx'> 	u32 len_to_oe_boundary;</div><div class='ctx'> 	blk_opf_t opf;</div><div class='add'>+	/*</div><div class='add'>+	 * For data read bios, we attempt to optimize csum lookups if the extent</div><div class='add'>+	 * generation is older than the current one. To make this possible, we</div><div class='add'>+	 * need to track the maximum generation of an extent in a bio_ctrl to</div><div class='add'>+	 * make the decision when submitting the bio.</div><div class='add'>+	 *</div><div class='add'>+	 * The pattern between do_readpage(), submit_one_bio() and</div><div class='add'>+	 * submit_extent_folio() is quite subtle, so tracking this is tricky.</div><div class='add'>+	 *</div><div class='add'>+	 * As we process extent E, we might submit a bio with existing built up</div><div class='add'>+	 * extents before adding E to a new bio, or we might just add E to the</div><div class='add'>+	 * bio. As a result, E's generation could apply to the current bio or</div><div class='add'>+	 * to the next one, so we need to be careful to update the bio_ctrl's</div><div class='add'>+	 * generation with E's only when we are sure E is added to bio_ctrl-&gt;bbio</div><div class='add'>+	 * in submit_extent_folio().</div><div class='add'>+	 *</div><div class='add'>+	 * See the comment in btrfs_lookup_bio_sums() for more detail on the</div><div class='add'>+	 * need for this optimization.</div><div class='add'>+	 */</div><div class='add'>+	u64 generation;</div><div class='ctx'> 	btrfs_bio_end_io_t end_io_func;</div><div class='ctx'> 	struct writeback_control *wbc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The sectors of the page which are going to be submitted by</div><div class='add'>+	 * extent_writepage_io().</div><div class='add'>+	 * This is to avoid touching ranges covered by compression/inline.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long submit_bitmap;</div><div class='add'>+	struct readahead_control *ractl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The start offset of the last used extent map by a read operation.</div><div class='add'>+	 *</div><div class='add'>+	 * This is for proper compressed read merge.</div><div class='add'>+	 * U64_MAX means we are starting the read and have made no progress yet.</div><div class='add'>+	 *</div><div class='add'>+	 * The current btrfs_bio_is_contig() only uses disk_bytenr as</div><div class='add'>+	 * the condition to check if the read can be merged with previous</div><div class='add'>+	 * bio, which is not correct. E.g. two file extents pointing to the</div><div class='add'>+	 * same extent but with different offset.</div><div class='add'>+	 *</div><div class='add'>+	 * So here we need to do extra checks to only merge reads that are</div><div class='add'>+	 * covered by the same extent map.</div><div class='add'>+	 * Just extent_map::start will be enough, as they are unique</div><div class='add'>+	 * inside the same inode.</div><div class='add'>+	 */</div><div class='add'>+	u64 last_em_start;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Helper to set the csum search commit root option for a bio_ctrl's bbio</div><div class='add'>+ * before submitting the bio.</div><div class='add'>+ *</div><div class='add'>+ * Only for use by submit_one_bio().</div><div class='add'>+ */</div><div class='add'>+static void bio_set_csum_search_commit_root(struct btrfs_bio_ctrl *bio_ctrl)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_bio *bbio = bio_ctrl-&gt;bbio;</div><div class='add'>+</div><div class='add'>+	ASSERT(bbio);</div><div class='add'>+</div><div class='add'>+	if (!(btrfs_op(&amp;bbio-&gt;bio) == BTRFS_MAP_READ &amp;&amp; is_data_inode(bbio-&gt;inode)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bio_ctrl-&gt;bbio-&gt;csum_search_commit_root =</div><div class='add'>+		(bio_ctrl-&gt;generation &amp;&amp;</div><div class='add'>+		 bio_ctrl-&gt;generation &lt; btrfs_get_fs_generation(bbio-&gt;inode-&gt;root-&gt;fs_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_bio *bbio = bio_ctrl-&gt;bbio;</div><div class='hunk'>@@ -114,14 +181,22 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)</div><div class='ctx'> 	/* Caller should ensure the bio has at least some range added */</div><div class='ctx'> 	ASSERT(bbio-&gt;bio.bi_iter.bi_size);</div><div class='ctx'> </div><div class='add'>+	bio_set_csum_search_commit_root(bio_ctrl);</div><div class='add'>+</div><div class='ctx'> 	if (btrfs_op(&amp;bbio-&gt;bio) == BTRFS_MAP_READ &amp;&amp;</div><div class='ctx'> 	    bio_ctrl-&gt;compress_type != BTRFS_COMPRESS_NONE)</div><div class='ctx'> 		btrfs_submit_compressed_read(bbio);</div><div class='ctx'> 	else</div><div class='del'>-		btrfs_submit_bio(bbio, 0);</div><div class='add'>+		btrfs_submit_bbio(bbio, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* The bbio is owned by the end_io handler now */</div><div class='ctx'> 	bio_ctrl-&gt;bbio = NULL;</div><div class='add'>+	/*</div><div class='add'>+	 * We used the generation to decide whether to lookup csums in the</div><div class='add'>+	 * commit_root or not when we called bio_set_csum_search_commit_root()</div><div class='add'>+	 * above. Now, reset the generation for the next bio.</div><div class='add'>+	 */</div><div class='add'>+	bio_ctrl-&gt;generation = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -147,8 +222,8 @@ static void submit_write_bio(struct btrfs_bio_ctrl *bio_ctrl, int ret)</div><div class='ctx'> int __init extent_buffer_init_cachep(void)</div><div class='ctx'> {</div><div class='ctx'> 	extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer",</div><div class='del'>-			sizeof(struct extent_buffer), 0,</div><div class='del'>-			SLAB_MEM_SPREAD, NULL);</div><div class='add'>+						sizeof(struct extent_buffer), 0, 0,</div><div class='add'>+						NULL);</div><div class='ctx'> 	if (!extent_buffer_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -165,26 +240,10 @@ void __cold extent_buffer_free_cachep(void)</div><div class='ctx'> 	kmem_cache_destroy(extent_buffer_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	unsigned long index = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	while (index &lt;= end_index) {</div><div class='del'>-		page = find_get_page(inode-&gt;i_mapping, index);</div><div class='del'>-		BUG_ON(!page); /* Pages should be in the extent_io_tree */</div><div class='del'>-		clear_page_dirty_for_io(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void process_one_page(struct btrfs_fs_info *fs_info,</div><div class='del'>-			     struct page *page, struct page *locked_page,</div><div class='del'>-			     unsigned long page_ops, u64 start, u64 end)</div><div class='add'>+static void process_one_folio(struct btrfs_fs_info *fs_info,</div><div class='add'>+			      struct folio *folio, const struct folio *locked_folio,</div><div class='add'>+			      unsigned long page_ops, u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	u32 len;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(end + 1 - start != 0 &amp;&amp; end + 1 - start &lt; U32_MAX);</div><div class='hunk'>@@ -199,18 +258,17 @@ static void process_one_page(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (page_ops &amp; PAGE_END_WRITEBACK)</div><div class='ctx'> 		btrfs_folio_clamp_clear_writeback(fs_info, folio, start, len);</div><div class='ctx'> </div><div class='del'>-	if (page != locked_page &amp;&amp; (page_ops &amp; PAGE_UNLOCK))</div><div class='del'>-		btrfs_folio_end_writer_lock(fs_info, folio, start, len);</div><div class='add'>+	if (folio != locked_folio &amp;&amp; (page_ops &amp; PAGE_UNLOCK))</div><div class='add'>+		btrfs_folio_end_lock(fs_info, folio, start, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __process_pages_contig(struct address_space *mapping,</div><div class='del'>-				   struct page *locked_page, u64 start, u64 end,</div><div class='del'>-				   unsigned long page_ops)</div><div class='add'>+static void __process_folios_contig(struct address_space *mapping,</div><div class='add'>+				    const struct folio *locked_folio, u64 start,</div><div class='add'>+				    u64 end, unsigned long page_ops)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(mapping-&gt;host-&gt;i_sb);</div><div class='del'>-	pgoff_t start_index = start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(mapping-&gt;host);</div><div class='add'>+	pgoff_t index = start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	pgoff_t end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t index = start_index;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -223,45 +281,35 @@ static void __process_pages_contig(struct address_space *mapping,</div><div class='ctx'> 		for (i = 0; i &lt; found_folios; i++) {</div><div class='ctx'> 			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> </div><div class='del'>-			process_one_page(fs_info, &amp;folio-&gt;page, locked_page,</div><div class='del'>-					 page_ops, start, end);</div><div class='add'>+			process_one_folio(fs_info, folio, locked_folio,</div><div class='add'>+					  page_ops, start, end);</div><div class='ctx'> 		}</div><div class='ctx'> 		folio_batch_release(&amp;fbatch);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void __unlock_for_delalloc(struct inode *inode,</div><div class='del'>-					   struct page *locked_page,</div><div class='add'>+static noinline void unlock_delalloc_folio(const struct inode *inode,</div><div class='add'>+					   struct folio *locked_folio,</div><div class='ctx'> 					   u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-	unsigned long index = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	ASSERT(locked_page);</div><div class='del'>-	if (index == locked_page-&gt;index &amp;&amp; end_index == index)</div><div class='del'>-		return;</div><div class='add'>+	ASSERT(locked_folio);</div><div class='ctx'> </div><div class='del'>-	__process_pages_contig(inode-&gt;i_mapping, locked_page, start, end,</div><div class='del'>-			       PAGE_UNLOCK);</div><div class='add'>+	__process_folios_contig(inode-&gt;i_mapping, locked_folio, start, end,</div><div class='add'>+				PAGE_UNLOCK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int lock_delalloc_pages(struct inode *inode,</div><div class='del'>-					struct page *locked_page,</div><div class='del'>-					u64 start,</div><div class='del'>-					u64 end)</div><div class='add'>+static noinline int lock_delalloc_folios(struct inode *inode,</div><div class='add'>+					 struct folio *locked_folio,</div><div class='add'>+					 u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	pgoff_t start_index = start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t index = start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	pgoff_t end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t index = start_index;</div><div class='ctx'> 	u64 processed_end = start;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> </div><div class='del'>-	if (index == locked_page-&gt;index &amp;&amp; index == end_index)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='ctx'> 	while (index &lt;= end_index) {</div><div class='ctx'> 		unsigned int found_folios, i;</div><div class='hunk'>@@ -273,23 +321,22 @@ static noinline int lock_delalloc_pages(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; found_folios; i++) {</div><div class='ctx'> 			struct folio *folio = fbatch.folios[i];</div><div class='del'>-			struct page *page = folio_page(folio, 0);</div><div class='del'>-			u32 len = end + 1 - start;</div><div class='add'>+			u64 range_start;</div><div class='add'>+			u32 range_len;</div><div class='ctx'> </div><div class='del'>-			if (page == locked_page)</div><div class='add'>+			if (folio == locked_folio)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (btrfs_folio_start_writer_lock(fs_info, folio, start,</div><div class='del'>-							  len))</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			if (!PageDirty(page) || page-&gt;mapping != mapping) {</div><div class='del'>-				btrfs_folio_end_writer_lock(fs_info, folio, start,</div><div class='del'>-							    len);</div><div class='add'>+			folio_lock(folio);</div><div class='add'>+			if (!folio_test_dirty(folio) || folio-&gt;mapping != mapping) {</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='add'>+			range_start = max_t(u64, folio_pos(folio), start);</div><div class='add'>+			range_len = min_t(u64, folio_next_pos(folio), end + 1) - range_start;</div><div class='add'>+			btrfs_folio_set_lock(fs_info, folio, range_start, range_len);</div><div class='ctx'> </div><div class='del'>-			processed_end = page_offset(page) + PAGE_SIZE - 1;</div><div class='add'>+			processed_end = range_start + range_len - 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		folio_batch_release(&amp;fbatch);</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -299,7 +346,7 @@ static noinline int lock_delalloc_pages(struct inode *inode,</div><div class='ctx'> out:</div><div class='ctx'> 	folio_batch_release(&amp;fbatch);</div><div class='ctx'> 	if (processed_end &gt; start)</div><div class='del'>-		__unlock_for_delalloc(inode, locked_page, start, processed_end);</div><div class='add'>+		unlock_delalloc_folio(inode, locked_folio, start, processed_end);</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -320,15 +367,14 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='ctx'> noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,</div><div class='del'>-				    struct page *locked_page, u64 *start,</div><div class='del'>-				    u64 *end)</div><div class='add'>+						 struct folio *locked_folio,</div><div class='add'>+						 u64 *start, u64 *end)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct extent_io_tree *tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='ctx'> 	const u64 orig_start = *start;</div><div class='ctx'> 	const u64 orig_end = *end;</div><div class='del'>-	/* The sanity tests may not set a valid fs_info. */</div><div class='del'>-	u64 max_bytes = fs_info ? fs_info-&gt;max_extent_size : BTRFS_MAX_EXTENT_SIZE;</div><div class='add'>+	u64 max_bytes = fs_info-&gt;max_extent_size;</div><div class='ctx'> 	u64 delalloc_start;</div><div class='ctx'> 	u64 delalloc_end;</div><div class='ctx'> 	bool found;</div><div class='hunk'>@@ -339,13 +385,20 @@ noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,</div><div class='ctx'> 	/* Caller should pass a valid @end to indicate the search range end */</div><div class='ctx'> 	ASSERT(orig_end &gt; orig_start);</div><div class='ctx'> </div><div class='del'>-	/* The range should at least cover part of the page */</div><div class='del'>-	ASSERT(!(orig_start &gt;= page_offset(locked_page) + PAGE_SIZE ||</div><div class='del'>-		 orig_end &lt;= page_offset(locked_page)));</div><div class='add'>+	/* The range should at least cover part of the folio */</div><div class='add'>+	ASSERT(!(orig_start &gt;= folio_next_pos(locked_folio) ||</div><div class='add'>+		 orig_end &lt;= folio_pos(locked_folio)));</div><div class='ctx'> again:</div><div class='ctx'> 	/* step one, find a bunch of delalloc bytes starting at start */</div><div class='ctx'> 	delalloc_start = *start;</div><div class='ctx'> 	delalloc_end = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If @max_bytes is smaller than a block, btrfs_find_delalloc_range() can</div><div class='add'>+	 * return early without handling any dirty ranges.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(max_bytes &gt;= fs_info-&gt;sectorsize);</div><div class='add'>+</div><div class='ctx'> 	found = btrfs_find_delalloc_range(tree, &amp;delalloc_start, &amp;delalloc_end,</div><div class='ctx'> 					  max_bytes, &amp;cached_state);</div><div class='ctx'> 	if (!found || delalloc_end &lt;= *start || delalloc_start &gt; orig_end) {</div><div class='hunk'>@@ -353,36 +406,37 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		/* @delalloc_end can be -1, never go beyond @orig_end */</div><div class='ctx'> 		*end = min(delalloc_end, orig_end);</div><div class='del'>-		free_extent_state(cached_state);</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * start comes from the offset of locked_page.  We have to lock</div><div class='del'>-	 * pages in order, so we can't process delalloc bytes before</div><div class='del'>-	 * locked_page</div><div class='add'>+	 * start comes from the offset of locked_folio.  We have to lock</div><div class='add'>+	 * folios in order, so we can't process delalloc bytes before</div><div class='add'>+	 * locked_folio</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (delalloc_start &lt; *start)</div><div class='ctx'> 		delalloc_start = *start;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * make sure to limit the number of pages we try to lock down</div><div class='add'>+	 * make sure to limit the number of folios we try to lock down</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (delalloc_end + 1 - delalloc_start &gt; max_bytes)</div><div class='ctx'> 		delalloc_end = delalloc_start + max_bytes - 1;</div><div class='ctx'> </div><div class='del'>-	/* step two, lock all the pages after the page that has start */</div><div class='del'>-	ret = lock_delalloc_pages(inode, locked_page,</div><div class='del'>-				  delalloc_start, delalloc_end);</div><div class='add'>+	/* step two, lock all the folios after the folios that has start */</div><div class='add'>+	ret = lock_delalloc_folios(inode, locked_folio, delalloc_start,</div><div class='add'>+				   delalloc_end);</div><div class='ctx'> 	ASSERT(!ret || ret == -EAGAIN);</div><div class='ctx'> 	if (ret == -EAGAIN) {</div><div class='del'>-		/* some of the pages are gone, lets avoid looping by</div><div class='del'>-		 * shortening the size of the delalloc range we're searching</div><div class='add'>+		/*</div><div class='add'>+		 * Some of the folios are gone, lets avoid looping by</div><div class='add'>+		 * shortening the size of the delalloc range we're searching.</div><div class='ctx'> 		 */</div><div class='del'>-		free_extent_state(cached_state);</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='ctx'> 		cached_state = NULL;</div><div class='ctx'> 		if (!loops) {</div><div class='del'>-			max_bytes = PAGE_SIZE;</div><div class='add'>+			max_bytes = fs_info-&gt;sectorsize;</div><div class='ctx'> 			loops = 1;</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -392,20 +446,19 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* step three, lock the state bits for the whole range */</div><div class='del'>-	lock_extent(tree, delalloc_start, delalloc_end, &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(tree, delalloc_start, delalloc_end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	/* then test to make sure it is all still delalloc */</div><div class='del'>-	ret = test_range_bit(tree, delalloc_start, delalloc_end,</div><div class='del'>-			     EXTENT_DELALLOC, cached_state);</div><div class='add'>+	ret = btrfs_test_range_bit(tree, delalloc_start, delalloc_end,</div><div class='add'>+				   EXTENT_DELALLOC, cached_state);</div><div class='add'>+</div><div class='add'>+	btrfs_unlock_extent(tree, delalloc_start, delalloc_end, &amp;cached_state);</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		unlock_extent(tree, delalloc_start, delalloc_end,</div><div class='del'>-			      &amp;cached_state);</div><div class='del'>-		__unlock_for_delalloc(inode, locked_page,</div><div class='del'>-			      delalloc_start, delalloc_end);</div><div class='add'>+		unlock_delalloc_folio(inode, locked_folio, delalloc_start,</div><div class='add'>+				      delalloc_end);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_state(cached_state);</div><div class='ctx'> 	*start = delalloc_start;</div><div class='ctx'> 	*end = delalloc_end;</div><div class='ctx'> out_failed:</div><div class='hunk'>@@ -413,41 +466,43 @@ out_failed:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='del'>-				  struct page *locked_page,</div><div class='add'>+				  const struct folio *locked_folio,</div><div class='add'>+				  struct extent_state **cached,</div><div class='ctx'> 				  u32 clear_bits, unsigned long page_ops)</div><div class='ctx'> {</div><div class='del'>-	clear_extent_bit(&amp;inode-&gt;io_tree, start, end, clear_bits, NULL);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, start, end, clear_bits, cached);</div><div class='ctx'> </div><div class='del'>-	__process_pages_contig(inode-&gt;vfs_inode.i_mapping, locked_page,</div><div class='del'>-			       start, end, page_ops);</div><div class='add'>+	__process_folios_contig(inode-&gt;vfs_inode.i_mapping, locked_folio, start,</div><div class='add'>+				end, page_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool btrfs_verify_page(struct page *page, u64 start)</div><div class='add'>+static bool btrfs_verify_folio(struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	if (!fsverity_active(page-&gt;mapping-&gt;host) ||</div><div class='del'>-	    PageUptodate(page) ||</div><div class='del'>-	    start &gt;= i_size_read(page-&gt;mapping-&gt;host))</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);</div><div class='add'>+</div><div class='add'>+	if (!fsverity_active(folio-&gt;mapping-&gt;host) ||</div><div class='add'>+	    btrfs_folio_test_uptodate(fs_info, folio, start, len) ||</div><div class='add'>+	    start &gt;= i_size_read(folio-&gt;mapping-&gt;host))</div><div class='ctx'> 		return true;</div><div class='del'>-	return fsverity_verify_page(page);</div><div class='add'>+	return fsverity_verify_folio(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)</div><div class='add'>+static void end_folio_read(struct folio *folio, bool uptodate, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);</div><div class='ctx'> </div><div class='del'>-	ASSERT(page_offset(page) &lt;= start &amp;&amp;</div><div class='del'>-	       start + len &lt;= page_offset(page) + PAGE_SIZE);</div><div class='add'>+	ASSERT(folio_pos(folio) &lt;= start &amp;&amp;</div><div class='add'>+	       start + len &lt;= folio_next_pos(folio));</div><div class='ctx'> </div><div class='del'>-	if (uptodate &amp;&amp; btrfs_verify_page(page, start))</div><div class='add'>+	if (uptodate &amp;&amp; btrfs_verify_folio(folio, start, len))</div><div class='ctx'> 		btrfs_folio_set_uptodate(fs_info, folio, start, len);</div><div class='ctx'> 	else</div><div class='ctx'> 		btrfs_folio_clear_uptodate(fs_info, folio, start, len);</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_is_subpage(fs_info, page-&gt;mapping))</div><div class='del'>-		unlock_page(page);</div><div class='add'>+	if (!btrfs_is_subpage(fs_info, folio))</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	else</div><div class='del'>-		btrfs_subpage_end_reader(fs_info, folio, start, len);</div><div class='add'>+		btrfs_folio_end_lock(fs_info, folio, start, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -462,22 +517,18 @@ static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)</div><div class='ctx'>  */</div><div class='ctx'> static void end_bbio_data_write(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='ctx'> 	int error = blk_status_to_errno(bio-&gt;bi_status);</div><div class='ctx'> 	struct folio_iter fi;</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(!bio_flagged(bio, BIO_CLONED));</div><div class='ctx'> 	bio_for_each_folio_all(fi, bio) {</div><div class='ctx'> 		struct folio *folio = fi.folio;</div><div class='del'>-		struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-		struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-		const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 		u64 start = folio_pos(folio) + fi.offset;</div><div class='ctx'> 		u32 len = fi.length;</div><div class='ctx'> </div><div class='del'>-		/* Only order 0 (single page) folios are allowed for data. */</div><div class='del'>-		ASSERT(folio_order(folio) == 0);</div><div class='del'>-</div><div class='ctx'> 		/* Our read/write should always be sector aligned. */</div><div class='ctx'> 		if (!IS_ALIGNED(fi.offset, sectorsize))</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='hunk'>@@ -488,8 +539,8 @@ static void end_bbio_data_write(struct btrfs_bio *bbio)</div><div class='ctx'> 		"incomplete page write with offset %zu and length %zu",</div><div class='ctx'> 				   fi.offset, fi.length);</div><div class='ctx'> </div><div class='del'>-		btrfs_finish_ordered_extent(bbio-&gt;ordered,</div><div class='del'>-				folio_page(folio, 0), start, len, !error);</div><div class='add'>+		btrfs_finish_ordered_extent(bbio-&gt;ordered, folio, start, len,</div><div class='add'>+					    !error);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			mapping_set_error(folio-&gt;mapping, error);</div><div class='ctx'> 		btrfs_folio_clear_writeback(fs_info, folio, start, len);</div><div class='hunk'>@@ -498,85 +549,14 @@ static void end_bbio_data_write(struct btrfs_bio *bbio)</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Record previously processed extent range</div><div class='del'>- *</div><div class='del'>- * For endio_readpage_release_extent() to handle a full extent range, reducing</div><div class='del'>- * the extent io operations.</div><div class='del'>- */</div><div class='del'>-struct processed_extent {</div><div class='del'>-	struct btrfs_inode *inode;</div><div class='del'>-	/* Start of the range in @inode */</div><div class='del'>-	u64 start;</div><div class='del'>-	/* End of the range in @inode */</div><div class='del'>-	u64 end;</div><div class='del'>-	bool uptodate;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Try to release processed extent range</div><div class='del'>- *</div><div class='del'>- * May not release the extent range right now if the current range is</div><div class='del'>- * contiguous to processed extent.</div><div class='del'>- *</div><div class='del'>- * Will release processed extent when any of @inode, @uptodate, the range is</div><div class='del'>- * no longer contiguous to the processed range.</div><div class='del'>- *</div><div class='del'>- * Passing @inode == NULL will force processed extent to be released.</div><div class='del'>- */</div><div class='del'>-static void endio_readpage_release_extent(struct processed_extent *processed,</div><div class='del'>-			      struct btrfs_inode *inode, u64 start, u64 end,</div><div class='del'>-			      bool uptodate)</div><div class='add'>+static void begin_folio_read(struct btrfs_fs_info *fs_info, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct extent_state *cached = NULL;</div><div class='del'>-	struct extent_io_tree *tree;</div><div class='del'>-</div><div class='del'>-	/* The first extent, initialize @processed */</div><div class='del'>-	if (!processed-&gt;inode)</div><div class='del'>-		goto update;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Contiguous to processed extent, just uptodate the end.</div><div class='del'>-	 *</div><div class='del'>-	 * Several things to notice:</div><div class='del'>-	 *</div><div class='del'>-	 * - bio can be merged as long as on-disk bytenr is contiguous</div><div class='del'>-	 *   This means we can have page belonging to other inodes, thus need to</div><div class='del'>-	 *   check if the inode still matches.</div><div class='del'>-	 * - bvec can contain range beyond current page for multi-page bvec</div><div class='del'>-	 *   Thus we need to do processed-&gt;end + 1 &gt;= start check</div><div class='del'>-	 */</div><div class='del'>-	if (processed-&gt;inode == inode &amp;&amp; processed-&gt;uptodate == uptodate &amp;&amp;</div><div class='del'>-	    processed-&gt;end + 1 &gt;= start &amp;&amp; end &gt;= processed-&gt;end) {</div><div class='del'>-		processed-&gt;end = end;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tree = &amp;processed-&gt;inode-&gt;io_tree;</div><div class='del'>-	/*</div><div class='del'>-	 * Now we don't have range contiguous to the processed range, release</div><div class='del'>-	 * the processed range now.</div><div class='del'>-	 */</div><div class='del'>-	unlock_extent(tree, processed-&gt;start, processed-&gt;end, &amp;cached);</div><div class='del'>-</div><div class='del'>-update:</div><div class='del'>-	/* Update processed to current range */</div><div class='del'>-	processed-&gt;inode = inode;</div><div class='del'>-	processed-&gt;start = start;</div><div class='del'>-	processed-&gt;end = end;</div><div class='del'>-	processed-&gt;uptodate = uptodate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void begin_page_read(struct btrfs_fs_info *fs_info, struct page *page)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-</div><div class='ctx'> 	ASSERT(folio_test_locked(folio));</div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping))</div><div class='add'>+	if (!btrfs_is_subpage(fs_info, folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(folio_test_private(folio));</div><div class='del'>-	btrfs_subpage_start_reader(fs_info, folio, page_offset(page), PAGE_SIZE);</div><div class='add'>+	btrfs_folio_set_lock(fs_info, folio, folio_pos(folio), folio_size(folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -593,56 +573,26 @@ static void begin_page_read(struct btrfs_fs_info *fs_info, struct page *page)</div><div class='ctx'>  */</div><div class='ctx'> static void end_bbio_data_read(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='del'>-	struct processed_extent processed = { 0 };</div><div class='ctx'> 	struct folio_iter fi;</div><div class='del'>-	/*</div><div class='del'>-	 * The offset to the beginning of a bio, since one bio can never be</div><div class='del'>-	 * larger than UINT_MAX, u32 here is enough.</div><div class='del'>-	 */</div><div class='del'>-	u32 bio_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(!bio_flagged(bio, BIO_CLONED));</div><div class='ctx'> 	bio_for_each_folio_all(fi, &amp;bbio-&gt;bio) {</div><div class='ctx'> 		bool uptodate = !bio-&gt;bi_status;</div><div class='ctx'> 		struct folio *folio = fi.folio;</div><div class='ctx'> 		struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-		struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-		const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='del'>-		u64 start;</div><div class='del'>-		u64 end;</div><div class='del'>-		u32 len;</div><div class='del'>-</div><div class='del'>-		/* For now only order 0 folios are supported for data. */</div><div class='del'>-		ASSERT(folio_order(folio) == 0);</div><div class='add'>+		u64 start = folio_pos(folio) + fi.offset;</div><div class='add'>+</div><div class='ctx'> 		btrfs_debug(fs_info,</div><div class='ctx'> 			"%s: bi_sector=%llu, err=%d, mirror=%u",</div><div class='ctx'> 			__func__, bio-&gt;bi_iter.bi_sector, bio-&gt;bi_status,</div><div class='ctx'> 			bbio-&gt;mirror_num);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * We always issue full-sector reads, but if some block in a</div><div class='del'>-		 * folio fails to read, blk_update_request() will advance</div><div class='del'>-		 * bv_offset and adjust bv_len to compensate.  Print a warning</div><div class='del'>-		 * for unaligned offsets, and an error if they don't add up to</div><div class='del'>-		 * a full sector.</div><div class='del'>-		 */</div><div class='del'>-		if (!IS_ALIGNED(fi.offset, sectorsize))</div><div class='del'>-			btrfs_err(fs_info,</div><div class='del'>-		"partial page read in btrfs with offset %zu and length %zu",</div><div class='del'>-				  fi.offset, fi.length);</div><div class='del'>-		else if (!IS_ALIGNED(fi.offset + fi.length, sectorsize))</div><div class='del'>-			btrfs_info(fs_info,</div><div class='del'>-		"incomplete page read with offset %zu and length %zu",</div><div class='del'>-				   fi.offset, fi.length);</div><div class='del'>-</div><div class='del'>-		start = folio_pos(folio) + fi.offset;</div><div class='del'>-		end = start + fi.length - 1;</div><div class='del'>-		len = fi.length;</div><div class='ctx'> </div><div class='ctx'> 		if (likely(uptodate)) {</div><div class='add'>+			u64 end = start + fi.length - 1;</div><div class='ctx'> 			loff_t i_size = i_size_read(inode);</div><div class='del'>-			pgoff_t end_index = i_size &gt;&gt; folio_shift(folio);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Zero out the remaining part if this range straddles</div><div class='hunk'>@@ -651,9 +601,11 @@ static void end_bbio_data_read(struct btrfs_bio *bbio)</div><div class='ctx'> 			 * Here we should only zero the range inside the folio,</div><div class='ctx'> 			 * not touch anything else.</div><div class='ctx'> 			 *</div><div class='del'>-			 * NOTE: i_size is exclusive while end is inclusive.</div><div class='add'>+			 * NOTE: i_size is exclusive while end is inclusive and</div><div class='add'>+			 * folio_contains() takes PAGE_SIZE units.</div><div class='ctx'> 			 */</div><div class='del'>-			if (folio_index(folio) == end_index &amp;&amp; i_size &lt;= end) {</div><div class='add'>+			if (folio_contains(folio, i_size &gt;&gt; PAGE_SHIFT) &amp;&amp;</div><div class='add'>+			    i_size &lt;= end) {</div><div class='ctx'> 				u32 zero_start = max(offset_in_folio(folio, i_size),</div><div class='ctx'> 						     offset_in_folio(folio, start));</div><div class='ctx'> 				u32 zero_len = offset_in_folio(folio, end) + 1 -</div><div class='hunk'>@@ -664,59 +616,73 @@ static void end_bbio_data_read(struct btrfs_bio *bbio)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Update page status and unlock. */</div><div class='del'>-		end_page_read(folio_page(folio, 0), uptodate, start, len);</div><div class='del'>-		endio_readpage_release_extent(&amp;processed, BTRFS_I(inode),</div><div class='del'>-					      start, end, uptodate);</div><div class='del'>-</div><div class='del'>-		ASSERT(bio_offset + len &gt; bio_offset);</div><div class='del'>-		bio_offset += len;</div><div class='del'>-</div><div class='add'>+		end_folio_read(folio, uptodate, start, fi.length);</div><div class='ctx'> 	}</div><div class='del'>-	/* Release the last extent */</div><div class='del'>-	endio_readpage_release_extent(&amp;processed, NULL, 0, 0, false);</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Populate every free slot in a provided array with pages.</div><div class='add'>+ * Populate every free slot in a provided array with folios using GFP_NOFS.</div><div class='add'>+ *</div><div class='add'>+ * @nr_folios:   number of folios to allocate</div><div class='add'>+ * @order:	 the order of the folios to be allocated</div><div class='add'>+ * @folio_array: the array to fill with folios; any existing non-NULL entries in</div><div class='add'>+ *		 the array will be skipped</div><div class='add'>+ *</div><div class='add'>+ * Return: 0        if all folios were able to be allocated;</div><div class='add'>+ *         -ENOMEM  otherwise, the partially allocated folios would be freed and</div><div class='add'>+ *                  the array slots zeroed</div><div class='add'>+ */</div><div class='add'>+int btrfs_alloc_folio_array(unsigned int nr_folios, unsigned int order,</div><div class='add'>+			    struct folio **folio_array)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; nr_folios; i++) {</div><div class='add'>+		if (folio_array[i])</div><div class='add'>+			continue;</div><div class='add'>+		folio_array[i] = folio_alloc(GFP_NOFS, order);</div><div class='add'>+		if (!folio_array[i])</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	for (int i = 0; i &lt; nr_folios; i++) {</div><div class='add'>+		if (folio_array[i])</div><div class='add'>+			folio_put(folio_array[i]);</div><div class='add'>+		folio_array[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Populate every free slot in a provided array with pages, using GFP_NOFS.</div><div class='ctx'>  *</div><div class='ctx'>  * @nr_pages:   number of pages to allocate</div><div class='ctx'>  * @page_array: the array to fill with pages; any existing non-null entries in</div><div class='del'>- * 		the array will be skipped</div><div class='del'>- * @extra_gfp:	the extra GFP flags for the allocation.</div><div class='add'>+ *		the array will be skipped</div><div class='add'>+ * @nofail:	whether using __GFP_NOFAIL flag</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0        if all pages were able to be allocated;</div><div class='ctx'>  *         -ENOMEM  otherwise, the partially allocated pages would be freed and</div><div class='ctx'>  *                  the array slots zeroed</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array,</div><div class='del'>-			   gfp_t extra_gfp)</div><div class='add'>+			   bool nofail)</div><div class='ctx'> {</div><div class='add'>+	const gfp_t gfp = nofail ? (GFP_NOFS | __GFP_NOFAIL) : GFP_NOFS;</div><div class='ctx'> 	unsigned int allocated;</div><div class='ctx'> </div><div class='ctx'> 	for (allocated = 0; allocated &lt; nr_pages;) {</div><div class='ctx'> 		unsigned int last = allocated;</div><div class='ctx'> </div><div class='del'>-		allocated = alloc_pages_bulk_array(GFP_NOFS | extra_gfp,</div><div class='del'>-						   nr_pages, page_array);</div><div class='del'>-</div><div class='del'>-		if (allocated == nr_pages)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * During this iteration, no page could be allocated, even</div><div class='del'>-		 * though alloc_pages_bulk_array() falls back to alloc_page()</div><div class='del'>-		 * if  it could not bulk-allocate. So we must be out of memory.</div><div class='del'>-		 */</div><div class='del'>-		if (allocated == last) {</div><div class='add'>+		allocated = alloc_pages_bulk(gfp, nr_pages, page_array);</div><div class='add'>+		if (unlikely(allocated == last)) {</div><div class='add'>+			/* No progress, fail and do cleanup. */</div><div class='ctx'> 			for (int i = 0; i &lt; allocated; i++) {</div><div class='ctx'> 				__free_page(page_array[i]);</div><div class='ctx'> 				page_array[i] = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		memalloc_retry_wait(GFP_NOFS);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -726,27 +692,27 @@ int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array,</div><div class='ctx'>  *</div><div class='ctx'>  * For now, the folios populated are always in order 0 (aka, single page).</div><div class='ctx'>  */</div><div class='del'>-static int alloc_eb_folio_array(struct extent_buffer *eb, gfp_t extra_gfp)</div><div class='add'>+static int alloc_eb_folio_array(struct extent_buffer *eb, bool nofail)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page_array[INLINE_EXTENT_BUFFER_PAGES] = { 0 };</div><div class='ctx'> 	int num_pages = num_extent_pages(eb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_alloc_page_array(num_pages, page_array, extra_gfp);</div><div class='add'>+	ret = btrfs_alloc_page_array(num_pages, page_array, nofail);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	for (int i = 0; i &lt; num_pages; i++)</div><div class='ctx'> 		eb-&gt;folios[i] = page_folio(page_array[i]);</div><div class='add'>+	eb-&gt;folio_size = PAGE_SIZE;</div><div class='add'>+	eb-&gt;folio_shift = PAGE_SHIFT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool btrfs_bio_is_contig(struct btrfs_bio_ctrl *bio_ctrl,</div><div class='del'>-				struct page *page, u64 disk_bytenr,</div><div class='del'>-				unsigned int pg_offset)</div><div class='add'>+				u64 disk_bytenr, loff_t file_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = &amp;bio_ctrl-&gt;bbio-&gt;bio;</div><div class='del'>-	struct bio_vec *bvec = bio_last_bvec_all(bio);</div><div class='ctx'> 	const sector_t sector = disk_bytenr &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (bio_ctrl-&gt;compress_type != BTRFS_COMPRESS_NONE) {</div><div class='hunk'>@@ -758,19 +724,11 @@ static bool btrfs_bio_is_contig(struct btrfs_bio_ctrl *bio_ctrl,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The contig check requires the following conditions to be met:</div><div class='del'>-	 *</div><div class='del'>-	 * 1) The pages are belonging to the same inode</div><div class='del'>-	 *    This is implied by the call chain.</div><div class='del'>-	 *</div><div class='del'>-	 * 2) The range has adjacent logical bytenr</div><div class='del'>-	 *</div><div class='del'>-	 * 3) The range has adjacent file offset</div><div class='del'>-	 *    This is required for the usage of btrfs_bio-&gt;file_offset.</div><div class='add'>+	 * To merge into a bio both the disk sector and the logical offset in</div><div class='add'>+	 * the file need to be contiguous.</div><div class='ctx'> 	 */</div><div class='del'>-	return bio_end_sector(bio) == sector &amp;&amp;</div><div class='del'>-		page_offset(bvec-&gt;bv_page) + bvec-&gt;bv_offset + bvec-&gt;bv_len ==</div><div class='del'>-		page_offset(page) + pg_offset;</div><div class='add'>+	return bio_ctrl-&gt;next_file_offset == file_offset &amp;&amp;</div><div class='add'>+		bio_end_sector(bio) == sector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alloc_new_bio(struct btrfs_inode *inode,</div><div class='hunk'>@@ -780,13 +738,13 @@ static void alloc_new_bio(struct btrfs_inode *inode,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='ctx'> </div><div class='del'>-	bbio = btrfs_bio_alloc(BIO_MAX_VECS, bio_ctrl-&gt;opf, fs_info,</div><div class='del'>-			       bio_ctrl-&gt;end_io_func, NULL);</div><div class='add'>+	bbio = btrfs_bio_alloc(BIO_MAX_VECS, bio_ctrl-&gt;opf, inode,</div><div class='add'>+			       file_offset, bio_ctrl-&gt;end_io_func, NULL);</div><div class='ctx'> 	bbio-&gt;bio.bi_iter.bi_sector = disk_bytenr &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	bbio-&gt;inode = inode;</div><div class='del'>-	bbio-&gt;file_offset = file_offset;</div><div class='add'>+	bbio-&gt;bio.bi_write_hint = inode-&gt;vfs_inode.i_write_hint;</div><div class='ctx'> 	bio_ctrl-&gt;bbio = bbio;</div><div class='ctx'> 	bio_ctrl-&gt;len_to_oe_boundary = U32_MAX;</div><div class='add'>+	bio_ctrl-&gt;next_file_offset = file_offset;</div><div class='ctx'> </div><div class='ctx'> 	/* Limit data write bios to the ordered boundary. */</div><div class='ctx'> 	if (bio_ctrl-&gt;wbc) {</div><div class='hunk'>@@ -817,56 +775,65 @@ static void alloc_new_bio(struct btrfs_inode *inode,</div><div class='ctx'>  * @size:	portion of page that we want to write to</div><div class='ctx'>  * @pg_offset:	offset of the new bio or to check whether we are adding</div><div class='ctx'>  *              a contiguous page to the previous one</div><div class='add'>+ * @read_em_generation: generation of the extent_map we are submitting</div><div class='add'>+ *			(only used for read)</div><div class='ctx'>  *</div><div class='ctx'>  * The will either add the page into the existing @bio_ctrl-&gt;bbio, or allocate a</div><div class='ctx'>  * new one in @bio_ctrl-&gt;bbio.</div><div class='del'>- * The mirror number for this IO should already be initizlied in</div><div class='add'>+ * The mirror number for this IO should already be initialized in</div><div class='ctx'>  * @bio_ctrl-&gt;mirror_num.</div><div class='ctx'>  */</div><div class='del'>-static void submit_extent_page(struct btrfs_bio_ctrl *bio_ctrl,</div><div class='del'>-			       u64 disk_bytenr, struct page *page,</div><div class='del'>-			       size_t size, unsigned long pg_offset)</div><div class='add'>+static void submit_extent_folio(struct btrfs_bio_ctrl *bio_ctrl,</div><div class='add'>+			       u64 disk_bytenr, struct folio *folio,</div><div class='add'>+			       size_t size, unsigned long pg_offset,</div><div class='add'>+			       u64 read_em_generation)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(page-&gt;mapping-&gt;host);</div><div class='add'>+	struct btrfs_inode *inode = folio_to_inode(folio);</div><div class='add'>+	loff_t file_offset = folio_pos(folio) + pg_offset;</div><div class='ctx'> </div><div class='del'>-	ASSERT(pg_offset + size &lt;= PAGE_SIZE);</div><div class='add'>+	ASSERT(pg_offset + size &lt;= folio_size(folio));</div><div class='ctx'> 	ASSERT(bio_ctrl-&gt;end_io_func);</div><div class='ctx'> </div><div class='ctx'> 	if (bio_ctrl-&gt;bbio &amp;&amp;</div><div class='del'>-	    !btrfs_bio_is_contig(bio_ctrl, page, disk_bytenr, pg_offset))</div><div class='add'>+	    !btrfs_bio_is_contig(bio_ctrl, disk_bytenr, file_offset))</div><div class='ctx'> 		submit_one_bio(bio_ctrl);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		u32 len = size;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate new bio if needed */</div><div class='del'>-		if (!bio_ctrl-&gt;bbio) {</div><div class='del'>-			alloc_new_bio(inode, bio_ctrl, disk_bytenr,</div><div class='del'>-				      page_offset(page) + pg_offset);</div><div class='del'>-		}</div><div class='add'>+		if (!bio_ctrl-&gt;bbio)</div><div class='add'>+			alloc_new_bio(inode, bio_ctrl, disk_bytenr, file_offset);</div><div class='ctx'> </div><div class='ctx'> 		/* Cap to the current ordered extent boundary if there is one. */</div><div class='ctx'> 		if (len &gt; bio_ctrl-&gt;len_to_oe_boundary) {</div><div class='ctx'> 			ASSERT(bio_ctrl-&gt;compress_type == BTRFS_COMPRESS_NONE);</div><div class='del'>-			ASSERT(is_data_inode(&amp;inode-&gt;vfs_inode));</div><div class='add'>+			ASSERT(is_data_inode(inode));</div><div class='ctx'> 			len = bio_ctrl-&gt;len_to_oe_boundary;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (bio_add_page(&amp;bio_ctrl-&gt;bbio-&gt;bio, page, len, pg_offset) != len) {</div><div class='add'>+		if (!bio_add_folio(&amp;bio_ctrl-&gt;bbio-&gt;bio, folio, len, pg_offset)) {</div><div class='ctx'> 			/* bio full: move on to a new one */</div><div class='ctx'> 			submit_one_bio(bio_ctrl);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * Now that the folio is definitely added to the bio, include its</div><div class='add'>+		 * generation in the max generation calculation.</div><div class='add'>+		 */</div><div class='add'>+		bio_ctrl-&gt;generation = max(bio_ctrl-&gt;generation, read_em_generation);</div><div class='add'>+		bio_ctrl-&gt;next_file_offset += len;</div><div class='ctx'> </div><div class='ctx'> 		if (bio_ctrl-&gt;wbc)</div><div class='del'>-			wbc_account_cgroup_owner(bio_ctrl-&gt;wbc, page, len);</div><div class='add'>+			wbc_account_cgroup_owner(bio_ctrl-&gt;wbc, folio, len);</div><div class='ctx'> </div><div class='ctx'> 		size -= len;</div><div class='ctx'> 		pg_offset += len;</div><div class='ctx'> 		disk_bytenr += len;</div><div class='add'>+		file_offset += len;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * len_to_oe_boundary defaults to U32_MAX, which isn't page or</div><div class='add'>+		 * len_to_oe_boundary defaults to U32_MAX, which isn't folio or</div><div class='ctx'> 		 * sector aligned.  alloc_new_bio() then sets it to the end of</div><div class='ctx'> 		 * our ordered extent for writes into zoned devices.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -876,15 +843,15 @@ static void submit_extent_page(struct btrfs_bio_ctrl *bio_ctrl,</div><div class='ctx'> 		 * boundary is correct.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * When len_to_oe_boundary is U32_MAX, the cap above would</div><div class='del'>-		 * result in a 4095 byte IO for the last page right before</div><div class='del'>-		 * we hit the bio limit of UINT_MAX.  bio_add_page() has all</div><div class='add'>+		 * result in a 4095 byte IO for the last folio right before</div><div class='add'>+		 * we hit the bio limit of UINT_MAX.  bio_add_folio() has all</div><div class='ctx'> 		 * the checks required to make sure we don't overflow the bio,</div><div class='ctx'> 		 * and we should just ignore len_to_oe_boundary completely</div><div class='ctx'> 		 * unless we're using it to track an ordered extent.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * It's pretty hard to make a bio sized U32_MAX, but it can</div><div class='ctx'> 		 * happen when the page cache is able to feed us contiguous</div><div class='del'>-		 * pages for large extents.</div><div class='add'>+		 * folios for large extents.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (bio_ctrl-&gt;len_to_oe_boundary != U32_MAX)</div><div class='ctx'> 			bio_ctrl-&gt;len_to_oe_boundary -= len;</div><div class='hunk'>@@ -897,7 +864,7 @@ static void submit_extent_page(struct btrfs_bio_ctrl *bio_ctrl,</div><div class='ctx'> </div><div class='ctx'> static int attach_extent_buffer_folio(struct extent_buffer *eb,</div><div class='ctx'> 				      struct folio *folio,</div><div class='del'>-				      struct btrfs_subpage *prealloc)</div><div class='add'>+				      struct btrfs_folio_state *prealloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -911,7 +878,7 @@ static int attach_extent_buffer_folio(struct extent_buffer *eb,</div><div class='ctx'> 	if (folio-&gt;mapping)</div><div class='ctx'> 		lockdep_assert_held(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='del'>-	if (fs_info-&gt;nodesize &gt;= PAGE_SIZE) {</div><div class='add'>+	if (!btrfs_meta_is_subpage(fs_info)) {</div><div class='ctx'> 		if (!folio_test_private(folio))</div><div class='ctx'> 			folio_attach_private(folio, eb);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -921,7 +888,7 @@ static int attach_extent_buffer_folio(struct extent_buffer *eb,</div><div class='ctx'> </div><div class='ctx'> 	/* Already mapped, just free prealloc */</div><div class='ctx'> 	if (folio_test_private(folio)) {</div><div class='del'>-		btrfs_free_subpage(prealloc);</div><div class='add'>+		btrfs_free_folio_state(prealloc);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -930,72 +897,92 @@ static int attach_extent_buffer_folio(struct extent_buffer *eb,</div><div class='ctx'> 		folio_attach_private(folio, prealloc);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* Do new allocation to attach subpage */</div><div class='del'>-		ret = btrfs_attach_subpage(fs_info, folio, BTRFS_SUBPAGE_METADATA);</div><div class='add'>+		ret = btrfs_attach_folio_state(fs_info, folio, BTRFS_SUBPAGE_METADATA);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int set_page_extent_mapped(struct page *page)</div><div class='add'>+int set_folio_extent_mapped(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> </div><div class='del'>-	ASSERT(page-&gt;mapping);</div><div class='add'>+	ASSERT(folio-&gt;mapping);</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_private(folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fs_info = btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='add'>+	fs_info = folio_to_fs_info(folio);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_is_subpage(fs_info, page-&gt;mapping))</div><div class='del'>-		return btrfs_attach_subpage(fs_info, folio, BTRFS_SUBPAGE_DATA);</div><div class='add'>+	if (btrfs_is_subpage(fs_info, folio))</div><div class='add'>+		return btrfs_attach_folio_state(fs_info, folio, BTRFS_SUBPAGE_DATA);</div><div class='ctx'> </div><div class='ctx'> 	folio_attach_private(folio, (void *)EXTENT_FOLIO_PRIVATE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void clear_page_extent_mapped(struct page *page)</div><div class='add'>+void clear_folio_extent_mapped(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> </div><div class='del'>-	ASSERT(page-&gt;mapping);</div><div class='add'>+	ASSERT(folio-&gt;mapping);</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_private(folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fs_info = btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='del'>-	if (btrfs_is_subpage(fs_info, page-&gt;mapping))</div><div class='del'>-		return btrfs_detach_subpage(fs_info, folio);</div><div class='add'>+	fs_info = folio_to_fs_info(folio);</div><div class='add'>+	if (btrfs_is_subpage(fs_info, folio))</div><div class='add'>+		return btrfs_detach_folio_state(fs_info, folio, BTRFS_SUBPAGE_DATA);</div><div class='ctx'> </div><div class='ctx'> 	folio_detach_private(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct extent_map *</div><div class='del'>-__get_extent_map(struct inode *inode, struct page *page, size_t pg_offset,</div><div class='del'>-		 u64 start, u64 len, struct extent_map **em_cached)</div><div class='add'>+static struct extent_map *get_extent_map(struct btrfs_inode *inode,</div><div class='add'>+					 struct folio *folio, u64 start,</div><div class='add'>+					 u64 len, struct extent_map **em_cached)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> </div><div class='del'>-	if (em_cached &amp;&amp; *em_cached) {</div><div class='add'>+	ASSERT(em_cached);</div><div class='add'>+</div><div class='add'>+	if (*em_cached) {</div><div class='ctx'> 		em = *em_cached;</div><div class='del'>-		if (extent_map_in_tree(em) &amp;&amp; start &gt;= em-&gt;start &amp;&amp;</div><div class='del'>-		    start &lt; extent_map_end(em)) {</div><div class='add'>+		if (btrfs_extent_map_in_tree(em) &amp;&amp; start &gt;= em-&gt;start &amp;&amp;</div><div class='add'>+		    start &lt; btrfs_extent_map_end(em)) {</div><div class='ctx'> 			refcount_inc(&amp;em-&gt;refs);</div><div class='ctx'> 			return em;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		*em_cached = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), page, pg_offset, start, len);</div><div class='del'>-	if (em_cached &amp;&amp; !IS_ERR(em)) {</div><div class='add'>+	em = btrfs_get_extent(inode, folio, start, len);</div><div class='add'>+	if (!IS_ERR(em)) {</div><div class='ctx'> 		BUG_ON(*em_cached);</div><div class='ctx'> 		refcount_inc(&amp;em-&gt;refs);</div><div class='ctx'> 		*em_cached = em;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return em;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void btrfs_readahead_expand(struct readahead_control *ractl,</div><div class='add'>+				   const struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	const u64 ra_pos = readahead_pos(ractl);</div><div class='add'>+	const u64 ra_end = ra_pos + readahead_length(ractl);</div><div class='add'>+	const u64 em_end = em-&gt;start + em-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* No expansion for holes and inline extents. */</div><div class='add'>+	if (em-&gt;disk_bytenr &gt; EXTENT_MAP_LAST_BYTE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ASSERT(em_end &gt;= ra_pos,</div><div class='add'>+	       "extent_map %llu %llu ends before current readahead position %llu",</div><div class='add'>+	       em-&gt;start, em-&gt;len, ra_pos);</div><div class='add'>+	if (em_end &gt; ra_end)</div><div class='add'>+		readahead_expand(ractl, ra_pos, em_end - ra_pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * basic readpage implementation.  Locked extent state structs are inserted</div><div class='ctx'>  * into the tree that are removed when the IO is done (by the end_io</div><div class='hunk'>@@ -1003,76 +990,82 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset,</div><div class='ctx'>  * XXX JDM: This needs looking at to ensure proper page locking</div><div class='ctx'>  * return 0 on success, otherwise return error</div><div class='ctx'>  */</div><div class='del'>-static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,</div><div class='del'>-		      struct btrfs_bio_ctrl *bio_ctrl, u64 *prev_em_start)</div><div class='add'>+static int btrfs_do_readpage(struct folio *folio, struct extent_map **em_cached,</div><div class='add'>+			     struct btrfs_bio_ctrl *bio_ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	u64 start = page_offset(page);</div><div class='del'>-	const u64 end = start + PAGE_SIZE - 1;</div><div class='del'>-	u64 cur = start;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	u64 start = folio_pos(folio);</div><div class='add'>+	const u64 end = start + folio_size(folio) - 1;</div><div class='ctx'> 	u64 extent_offset;</div><div class='ctx'> 	u64 last_byte = i_size_read(inode);</div><div class='del'>-	u64 block_start;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	size_t pg_offset = 0;</div><div class='del'>-	size_t iosize;</div><div class='del'>-	size_t blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	struct extent_io_tree *tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='add'>+	const size_t blocksize = fs_info-&gt;sectorsize;</div><div class='ctx'> </div><div class='del'>-	ret = set_page_extent_mapped(page);</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		unlock_extent(tree, start, end, NULL);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page-&gt;index == last_byte &gt;&gt; PAGE_SHIFT) {</div><div class='del'>-		size_t zero_offset = offset_in_page(last_byte);</div><div class='add'>+	if (folio_contains(folio, last_byte &gt;&gt; PAGE_SHIFT)) {</div><div class='add'>+		size_t zero_offset = offset_in_folio(folio, last_byte);</div><div class='ctx'> </div><div class='del'>-		if (zero_offset) {</div><div class='del'>-			iosize = PAGE_SIZE - zero_offset;</div><div class='del'>-			memzero_page(page, zero_offset, iosize);</div><div class='del'>-		}</div><div class='add'>+		if (zero_offset)</div><div class='add'>+			folio_zero_range(folio, zero_offset,</div><div class='add'>+					 folio_size(folio) - zero_offset);</div><div class='ctx'> 	}</div><div class='ctx'> 	bio_ctrl-&gt;end_io_func = end_bbio_data_read;</div><div class='del'>-	begin_page_read(fs_info, page);</div><div class='del'>-	while (cur &lt;= end) {</div><div class='add'>+	begin_folio_read(fs_info, folio);</div><div class='add'>+	for (u64 cur = start; cur &lt;= end; cur += blocksize) {</div><div class='ctx'> 		enum btrfs_compression_type compress_type = BTRFS_COMPRESS_NONE;</div><div class='add'>+		unsigned long pg_offset = offset_in_folio(folio, cur);</div><div class='ctx'> 		bool force_bio_submit = false;</div><div class='ctx'> 		u64 disk_bytenr;</div><div class='add'>+		u64 block_start;</div><div class='add'>+		u64 em_gen;</div><div class='ctx'> </div><div class='ctx'> 		ASSERT(IS_ALIGNED(cur, fs_info-&gt;sectorsize));</div><div class='ctx'> 		if (cur &gt;= last_byte) {</div><div class='del'>-			iosize = PAGE_SIZE - pg_offset;</div><div class='del'>-			memzero_page(page, pg_offset, iosize);</div><div class='del'>-			unlock_extent(tree, cur, cur + iosize - 1, NULL);</div><div class='del'>-			end_page_read(page, true, cur, iosize);</div><div class='add'>+			folio_zero_range(folio, pg_offset, end - cur + 1);</div><div class='add'>+			end_folio_read(folio, true, cur, end - cur + 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		em = __get_extent_map(inode, page, pg_offset, cur,</div><div class='del'>-				      end - cur + 1, em_cached);</div><div class='add'>+		if (btrfs_folio_test_uptodate(fs_info, folio, cur, blocksize)) {</div><div class='add'>+			end_folio_read(folio, true, cur, blocksize);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		em = get_extent_map(BTRFS_I(inode), folio, cur, end - cur + 1, em_cached);</div><div class='ctx'> 		if (IS_ERR(em)) {</div><div class='del'>-			unlock_extent(tree, cur, end, NULL);</div><div class='del'>-			end_page_read(page, false, cur, end + 1 - cur);</div><div class='add'>+			end_folio_read(folio, false, cur, end + 1 - cur);</div><div class='ctx'> 			return PTR_ERR(em);</div><div class='ctx'> 		}</div><div class='ctx'> 		extent_offset = cur - em-&gt;start;</div><div class='del'>-		BUG_ON(extent_map_end(em) &lt;= cur);</div><div class='add'>+		BUG_ON(btrfs_extent_map_end(em) &lt;= cur);</div><div class='ctx'> 		BUG_ON(end &lt; cur);</div><div class='ctx'> </div><div class='del'>-		compress_type = extent_map_compression(em);</div><div class='add'>+		compress_type = btrfs_extent_map_compression(em);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Only expand readahead for extents which are already creating</div><div class='add'>+		 * the pages anyway in add_ra_bio_pages, which is compressed</div><div class='add'>+		 * extents in the non subpage case.</div><div class='add'>+		 */</div><div class='add'>+		if (bio_ctrl-&gt;ractl &amp;&amp;</div><div class='add'>+		    !btrfs_is_subpage(fs_info, folio) &amp;&amp;</div><div class='add'>+		    compress_type != BTRFS_COMPRESS_NONE)</div><div class='add'>+			btrfs_readahead_expand(bio_ctrl-&gt;ractl, em);</div><div class='ctx'> </div><div class='del'>-		iosize = min(extent_map_end(em) - cur, end - cur + 1);</div><div class='del'>-		iosize = ALIGN(iosize, blocksize);</div><div class='ctx'> 		if (compress_type != BTRFS_COMPRESS_NONE)</div><div class='del'>-			disk_bytenr = em-&gt;block_start;</div><div class='add'>+			disk_bytenr = em-&gt;disk_bytenr;</div><div class='ctx'> 		else</div><div class='del'>-			disk_bytenr = em-&gt;block_start + extent_offset;</div><div class='del'>-		block_start = em-&gt;block_start;</div><div class='add'>+			disk_bytenr = btrfs_extent_map_block_start(em) + extent_offset;</div><div class='add'>+</div><div class='ctx'> 		if (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC)</div><div class='ctx'> 			block_start = EXTENT_MAP_HOLE;</div><div class='add'>+		else</div><div class='add'>+			block_start = btrfs_extent_map_block_start(em);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we have a file range that points to a compressed extent</div><div class='hunk'>@@ -1080,8 +1073,8 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,</div><div class='ctx'> 		 * to the same compressed extent (possibly with a different</div><div class='ctx'> 		 * offset and/or length, so it either points to the whole extent</div><div class='ctx'> 		 * or only part of it), we must make sure we do not submit a</div><div class='del'>-		 * single bio to populate the pages for the 2 ranges because</div><div class='del'>-		 * this makes the compressed extent read zero out the pages</div><div class='add'>+		 * single bio to populate the folios for the 2 ranges because</div><div class='add'>+		 * this makes the compressed extent read zero out the folios</div><div class='ctx'> 		 * belonging to the 2nd range. Imagine the following scenario:</div><div class='ctx'> 		 *</div><div class='ctx'> 		 *  File layout</div><div class='hunk'>@@ -1094,13 +1087,13 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,</div><div class='ctx'> 		 * [extent X, compressed length = 4K uncompressed length = 16K]</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * If the bio to read the compressed extent covers both ranges,</div><div class='del'>-		 * it will decompress extent X into the pages belonging to the</div><div class='add'>+		 * it will decompress extent X into the folios belonging to the</div><div class='ctx'> 		 * first range and then it will stop, zeroing out the remaining</div><div class='del'>-		 * pages that belong to the other range that points to extent X.</div><div class='add'>+		 * folios that belong to the other range that points to extent X.</div><div class='ctx'> 		 * So here we make sure we submit 2 bios, one for the first</div><div class='ctx'> 		 * range and another one for the third range. Both will target</div><div class='ctx'> 		 * the same physical extent from disk, but we can't currently</div><div class='del'>-		 * make the compressed bio endio callback populate the pages</div><div class='add'>+		 * make the compressed bio endio callback populate the folios</div><div class='ctx'> 		 * for both ranges because each compressed bio is tightly</div><div class='ctx'> 		 * coupled with a single extent map, and each range can have</div><div class='ctx'> 		 * an extent map with a different offset value relative to the</div><div class='hunk'>@@ -1109,32 +1102,25 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,</div><div class='ctx'> 		 * non-optimal behavior (submitting 2 bios for the same extent).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (compress_type != BTRFS_COMPRESS_NONE &amp;&amp;</div><div class='del'>-		    prev_em_start &amp;&amp; *prev_em_start != (u64)-1 &amp;&amp;</div><div class='del'>-		    *prev_em_start != em-&gt;start)</div><div class='add'>+		    bio_ctrl-&gt;last_em_start != U64_MAX &amp;&amp;</div><div class='add'>+		    bio_ctrl-&gt;last_em_start != em-&gt;start)</div><div class='ctx'> 			force_bio_submit = true;</div><div class='ctx'> </div><div class='del'>-		if (prev_em_start)</div><div class='del'>-			*prev_em_start = em-&gt;start;</div><div class='add'>+		bio_ctrl-&gt;last_em_start = em-&gt;start;</div><div class='ctx'> </div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		em_gen = em-&gt;generation;</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		em = NULL;</div><div class='ctx'> </div><div class='ctx'> 		/* we've found a hole, just zero and go on */</div><div class='ctx'> 		if (block_start == EXTENT_MAP_HOLE) {</div><div class='del'>-			memzero_page(page, pg_offset, iosize);</div><div class='del'>-</div><div class='del'>-			unlock_extent(tree, cur, cur + iosize - 1, NULL);</div><div class='del'>-			end_page_read(page, true, cur, iosize);</div><div class='del'>-			cur = cur + iosize;</div><div class='del'>-			pg_offset += iosize;</div><div class='add'>+			folio_zero_range(folio, pg_offset, blocksize);</div><div class='add'>+			end_folio_read(folio, true, cur, blocksize);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		/* the get_extent function already copied into the page */</div><div class='add'>+		/* the get_extent function already copied into the folio */</div><div class='ctx'> 		if (block_start == EXTENT_MAP_INLINE) {</div><div class='del'>-			unlock_extent(tree, cur, cur + iosize - 1, NULL);</div><div class='del'>-			end_page_read(page, true, cur, iosize);</div><div class='del'>-			cur = cur + iosize;</div><div class='del'>-			pg_offset += iosize;</div><div class='add'>+			end_folio_read(folio, true, cur, blocksize);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1145,27 +1131,209 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,</div><div class='ctx'> </div><div class='ctx'> 		if (force_bio_submit)</div><div class='ctx'> 			submit_one_bio(bio_ctrl);</div><div class='del'>-		submit_extent_page(bio_ctrl, disk_bytenr, page, iosize,</div><div class='del'>-				   pg_offset);</div><div class='del'>-		cur = cur + iosize;</div><div class='del'>-		pg_offset += iosize;</div><div class='add'>+		submit_extent_folio(bio_ctrl, disk_bytenr, folio, blocksize,</div><div class='add'>+				    pg_offset, em_gen);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check if we can skip waiting the @ordered extent covering the block at @fileoff.</div><div class='add'>+ *</div><div class='add'>+ * @fileoff:	Both input and output.</div><div class='add'>+ *		Input as the file offset where the check should start at.</div><div class='add'>+ *		Output as where the next check should start at,</div><div class='add'>+ *		if the function returns true.</div><div class='add'>+ *</div><div class='add'>+ * Return true if we can skip to @fileoff. The caller needs to check the new</div><div class='add'>+ * @fileoff value to make sure it covers the full range, before skipping the</div><div class='add'>+ * full OE.</div><div class='add'>+ *</div><div class='add'>+ * Return false if we must wait for the ordered extent.</div><div class='add'>+ */</div><div class='add'>+static bool can_skip_one_ordered_range(struct btrfs_inode *inode,</div><div class='add'>+				       struct btrfs_ordered_extent *ordered,</div><div class='add'>+				       u64 *fileoff)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	u64 cur = *fileoff;</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	folio = filemap_get_folio(inode-&gt;vfs_inode.i_mapping, cur &gt;&gt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We should have locked the folio(s) for range [start, end], thus</div><div class='add'>+	 * there must be a folio and it must be locked.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(!IS_ERR(folio));</div><div class='add'>+	ASSERT(folio_test_locked(folio));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There are several cases for the folio and OE combination:</div><div class='add'>+	 *</div><div class='add'>+	 * 1) Folio has no private flag</div><div class='add'>+	 *    The OE has all its IO done but not yet finished, and folio got</div><div class='add'>+	 *    invalidated.</div><div class='add'>+	 *</div><div class='add'>+	 * Have we have to wait for the OE to finish, as it may contain the</div><div class='add'>+	 * to-be-inserted data checksum.</div><div class='add'>+	 * Without the data checksum inserted into the csum tree, read will</div><div class='add'>+	 * just fail with missing csum.</div><div class='add'>+	 */</div><div class='add'>+	if (!folio_test_private(folio)) {</div><div class='add'>+		ret = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2) The first block is DIRTY.</div><div class='add'>+	 *</div><div class='add'>+	 * This means the OE is created by some other folios whose file pos is</div><div class='add'>+	 * before this one. And since we are holding the folio lock, the writeback</div><div class='add'>+	 * of this folio cannot start.</div><div class='add'>+	 *</div><div class='add'>+	 * We must skip the whole OE, because it will never start until we</div><div class='add'>+	 * finished our folio read and unlocked the folio.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_folio_test_dirty(fs_info, folio, cur, blocksize)) {</div><div class='add'>+		u64 range_len = umin(folio_next_pos(folio),</div><div class='add'>+				    ordered-&gt;file_offset + ordered-&gt;num_bytes) - cur;</div><div class='add'>+</div><div class='add'>+		ret = true;</div><div class='add'>+		/*</div><div class='add'>+		 * At least inside the folio, all the remaining blocks should</div><div class='add'>+		 * also be dirty.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(btrfs_folio_test_dirty(fs_info, folio, cur, range_len));</div><div class='add'>+		*fileoff = ordered-&gt;file_offset + ordered-&gt;num_bytes;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3) The first block is uptodate.</div><div class='add'>+	 *</div><div class='add'>+	 * At least the first block can be skipped, but we are still not fully</div><div class='add'>+	 * sure. E.g. if the OE has some other folios in the range that cannot</div><div class='add'>+	 * be skipped.</div><div class='add'>+	 * So we return true and update @next_ret to the OE/folio boundary.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_folio_test_uptodate(fs_info, folio, cur, blocksize)) {</div><div class='add'>+		u64 range_len = umin(folio_next_pos(folio),</div><div class='add'>+				    ordered-&gt;file_offset + ordered-&gt;num_bytes) - cur;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The whole range to the OE end or folio boundary should also</div><div class='add'>+		 * be uptodate.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(btrfs_folio_test_uptodate(fs_info, folio, cur, range_len));</div><div class='add'>+		ret = true;</div><div class='add'>+		*fileoff = cur + range_len;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4) The first block is not uptodate.</div><div class='add'>+	 *</div><div class='add'>+	 * This means the folio is invalidated after the writeback was finished,</div><div class='add'>+	 * but by some other operations (e.g. block aligned buffered write) the</div><div class='add'>+	 * folio is inserted into filemap.</div><div class='add'>+	 * Very much the same as case 1).</div><div class='add'>+	 */</div><div class='add'>+	ret = false;</div><div class='add'>+out:</div><div class='add'>+	folio_put(folio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool can_skip_ordered_extent(struct btrfs_inode *inode,</div><div class='add'>+				    struct btrfs_ordered_extent *ordered,</div><div class='add'>+				    u64 start, u64 end)</div><div class='add'>+{</div><div class='add'>+	const u64 range_end = min(end, ordered-&gt;file_offset + ordered-&gt;num_bytes - 1);</div><div class='add'>+	u64 cur = max(start, ordered-&gt;file_offset);</div><div class='add'>+</div><div class='add'>+	while (cur &lt; range_end) {</div><div class='add'>+		bool can_skip;</div><div class='add'>+</div><div class='add'>+		can_skip = can_skip_one_ordered_range(inode, ordered, &amp;cur);</div><div class='add'>+		if (!can_skip)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Locking helper to make sure we get a stable view of extent maps for the</div><div class='add'>+ * involved range.</div><div class='add'>+ *</div><div class='add'>+ * This is for folio read paths (read and readahead), thus the involved range</div><div class='add'>+ * should have all the folios locked.</div><div class='add'>+ */</div><div class='add'>+static void lock_extents_for_read(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='add'>+				  struct extent_state **cached_state)</div><div class='add'>+{</div><div class='add'>+	u64 cur_pos;</div><div class='add'>+</div><div class='add'>+	/* Caller must provide a valid @cached_state. */</div><div class='add'>+	ASSERT(cached_state);</div><div class='add'>+</div><div class='add'>+	/* The range must at least be page aligned, as all read paths are folio based. */</div><div class='add'>+	ASSERT(IS_ALIGNED(start, PAGE_SIZE));</div><div class='add'>+	ASSERT(IS_ALIGNED(end + 1, PAGE_SIZE));</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, start, end, cached_state);</div><div class='add'>+	cur_pos = start;</div><div class='add'>+	while (cur_pos &lt; end) {</div><div class='add'>+		struct btrfs_ordered_extent *ordered;</div><div class='add'>+</div><div class='add'>+		ordered = btrfs_lookup_ordered_range(inode, cur_pos,</div><div class='add'>+						     end - cur_pos + 1);</div><div class='add'>+		/*</div><div class='add'>+		 * No ordered extents in the range, and we hold the extent lock,</div><div class='add'>+		 * no one can modify the extent maps in the range, we're safe to return.</div><div class='add'>+		 */</div><div class='add'>+		if (!ordered)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Check if we can skip waiting for the whole OE. */</div><div class='add'>+		if (can_skip_ordered_extent(inode, ordered, start, end)) {</div><div class='add'>+			cur_pos = min(ordered-&gt;file_offset + ordered-&gt;num_bytes,</div><div class='add'>+				      end + 1);</div><div class='add'>+			btrfs_put_ordered_extent(ordered);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now wait for the OE to finish. */</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, cached_state);</div><div class='add'>+		btrfs_start_ordered_extent_nowriteback(ordered, start, end + 1 - start);</div><div class='add'>+		btrfs_put_ordered_extent(ordered);</div><div class='add'>+		/* We have unlocked the whole range, restart from the beginning. */</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(page-&gt;mapping-&gt;host);</div><div class='del'>-	u64 start = page_offset(page);</div><div class='del'>-	u64 end = start + PAGE_SIZE - 1;</div><div class='del'>-	struct btrfs_bio_ctrl bio_ctrl = { .opf = REQ_OP_READ };</div><div class='add'>+	struct btrfs_inode *inode = folio_to_inode(folio);</div><div class='add'>+	const u64 start = folio_pos(folio);</div><div class='add'>+	const u64 end = start + folio_size(folio) - 1;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	struct btrfs_bio_ctrl bio_ctrl = {</div><div class='add'>+		.opf = REQ_OP_READ,</div><div class='add'>+		.last_em_start = U64_MAX,</div><div class='add'>+	};</div><div class='add'>+	struct extent_map *em_cached = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);</div><div class='add'>+	lock_extents_for_read(inode, start, end, &amp;cached_state);</div><div class='add'>+	ret = btrfs_do_readpage(folio, &amp;em_cached, &amp;bio_ctrl);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	btrfs_free_extent_map(em_cached);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_do_readpage(page, NULL, &amp;bio_ctrl, NULL);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If btrfs_do_readpage() failed we will want to submit the assembled</div><div class='ctx'> 	 * bio to do the cleanup.</div><div class='hunk'>@@ -1174,72 +1342,244 @@ int btrfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void contiguous_readpages(struct page *pages[], int nr_pages,</div><div class='del'>-					u64 start, u64 end,</div><div class='del'>-					struct extent_map **em_cached,</div><div class='del'>-					struct btrfs_bio_ctrl *bio_ctrl,</div><div class='del'>-					u64 *prev_em_start)</div><div class='add'>+static void set_delalloc_bitmap(struct folio *folio, unsigned long *delalloc_bitmap,</div><div class='add'>+				u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(pages[0]-&gt;mapping-&gt;host);</div><div class='del'>-	int index;</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);</div><div class='add'>+	const u64 folio_start = folio_pos(folio);</div><div class='add'>+	unsigned int start_bit;</div><div class='add'>+	unsigned int nbits;</div><div class='add'>+</div><div class='add'>+	ASSERT(start &gt;= folio_start &amp;&amp; start + len &lt;= folio_start + folio_size(folio));</div><div class='add'>+	start_bit = (start - folio_start) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	nbits = len &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	ASSERT(bitmap_test_range_all_zero(delalloc_bitmap, start_bit, nbits));</div><div class='add'>+	bitmap_set(delalloc_bitmap, start_bit, nbits);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);</div><div class='add'>+static bool find_next_delalloc_bitmap(struct folio *folio,</div><div class='add'>+				      unsigned long *delalloc_bitmap, u64 start,</div><div class='add'>+				      u64 *found_start, u32 *found_len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);</div><div class='add'>+	const u64 folio_start = folio_pos(folio);</div><div class='add'>+	const unsigned int bitmap_size = btrfs_blocks_per_folio(fs_info, folio);</div><div class='add'>+	unsigned int start_bit;</div><div class='add'>+	unsigned int first_zero;</div><div class='add'>+	unsigned int first_set;</div><div class='add'>+</div><div class='add'>+	ASSERT(start &gt;= folio_start &amp;&amp; start &lt; folio_start + folio_size(folio));</div><div class='add'>+</div><div class='add'>+	start_bit = (start - folio_start) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	first_set = find_next_bit(delalloc_bitmap, bitmap_size, start_bit);</div><div class='add'>+	if (first_set &gt;= bitmap_size)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	for (index = 0; index &lt; nr_pages; index++) {</div><div class='del'>-		btrfs_do_readpage(pages[index], em_cached, bio_ctrl,</div><div class='del'>-				  prev_em_start);</div><div class='del'>-		put_page(pages[index]);</div><div class='del'>-	}</div><div class='add'>+	*found_start = folio_start + (first_set &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	first_zero = find_next_zero_bit(delalloc_bitmap, bitmap_size, first_set);</div><div class='add'>+	*found_len = (first_zero - first_set) &lt;&lt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * helper for __extent_writepage, doing all of the delayed allocation setup.</div><div class='add'>+ * Do all of the delayed allocation setup.</div><div class='ctx'>  *</div><div class='del'>- * This returns 1 if btrfs_run_delalloc_range function did all the work required</div><div class='del'>- * to write the page (copy into inline extent).  In this case the IO has</div><div class='del'>- * been started and the page is already unlocked.</div><div class='add'>+ * Return &gt;0 if all the dirty blocks are submitted async (compression) or inlined.</div><div class='add'>+ * The @folio should no longer be touched (treat it as already unlocked).</div><div class='ctx'>  *</div><div class='del'>- * This returns 0 if all went well (page still locked)</div><div class='del'>- * This returns &lt; 0 if there were errors (page still locked)</div><div class='add'>+ * Return 0 if there is still dirty block that needs to be submitted through</div><div class='add'>+ * extent_writepage_io().</div><div class='add'>+ * bio_ctrl-&gt;submit_bitmap will indicate which blocks of the folio should be</div><div class='add'>+ * submitted, and @folio is still kept locked.</div><div class='add'>+ *</div><div class='add'>+ * Return &lt;0 if there is any error hit.</div><div class='add'>+ * Any allocated ordered extent range covering this folio will be marked</div><div class='add'>+ * finished (IOERR), and @folio is still kept locked.</div><div class='ctx'>  */</div><div class='ctx'> static noinline_for_stack int writepage_delalloc(struct btrfs_inode *inode,</div><div class='del'>-		struct page *page, struct writeback_control *wbc)</div><div class='add'>+						 struct folio *folio,</div><div class='add'>+						 struct btrfs_bio_ctrl *bio_ctrl)</div><div class='ctx'> {</div><div class='del'>-	const u64 page_start = page_offset(page);</div><div class='del'>-	const u64 page_end = page_start + PAGE_SIZE - 1;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	struct writeback_control *wbc = bio_ctrl-&gt;wbc;</div><div class='add'>+	const bool is_subpage = btrfs_is_subpage(fs_info, folio);</div><div class='add'>+	const u64 page_start = folio_pos(folio);</div><div class='add'>+	const u64 page_end = page_start + folio_size(folio) - 1;</div><div class='add'>+	const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);</div><div class='add'>+	unsigned long delalloc_bitmap = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * Save the last found delalloc end. As the delalloc end can go beyond</div><div class='add'>+	 * page boundary, thus we cannot rely on subpage bitmap to locate the</div><div class='add'>+	 * last delalloc end.</div><div class='add'>+	 */</div><div class='add'>+	u64 last_delalloc_end = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * The range end (exclusive) of the last successfully finished delalloc</div><div class='add'>+	 * range.</div><div class='add'>+	 * Any range covered by ordered extent must either be manually marked</div><div class='add'>+	 * finished (error handling), or has IO submitted (and finish the</div><div class='add'>+	 * ordered extent normally).</div><div class='add'>+	 *</div><div class='add'>+	 * This records the end of ordered extent cleanup if we hit an error.</div><div class='add'>+	 */</div><div class='add'>+	u64 last_finished_delalloc_end = page_start;</div><div class='ctx'> 	u64 delalloc_start = page_start;</div><div class='ctx'> 	u64 delalloc_end = page_end;</div><div class='ctx'> 	u64 delalloc_to_write = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int bit;</div><div class='add'>+</div><div class='add'>+	/* Save the dirty bitmap as our submission bitmap will be a subset of it. */</div><div class='add'>+	if (btrfs_is_subpage(fs_info, folio)) {</div><div class='add'>+		ASSERT(blocks_per_folio &gt; 1);</div><div class='add'>+		btrfs_get_subpage_dirty_bitmap(fs_info, folio, &amp;bio_ctrl-&gt;submit_bitmap);</div><div class='add'>+	} else {</div><div class='add'>+		bio_ctrl-&gt;submit_bitmap = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for_each_set_bit(bit, &amp;bio_ctrl-&gt;submit_bitmap, blocks_per_folio) {</div><div class='add'>+		u64 start = page_start + (bit &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+</div><div class='add'>+		btrfs_folio_set_lock(fs_info, folio, start, fs_info-&gt;sectorsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Lock all (subpage) delalloc ranges inside the folio first. */</div><div class='ctx'> 	while (delalloc_start &lt; page_end) {</div><div class='ctx'> 		delalloc_end = page_end;</div><div class='del'>-		if (!find_lock_delalloc_range(&amp;inode-&gt;vfs_inode, page,</div><div class='add'>+		if (!find_lock_delalloc_range(&amp;inode-&gt;vfs_inode, folio,</div><div class='ctx'> 					      &amp;delalloc_start, &amp;delalloc_end)) {</div><div class='ctx'> 			delalloc_start = delalloc_end + 1;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		ret = btrfs_run_delalloc_range(inode, page, delalloc_start,</div><div class='del'>-					       delalloc_end, wbc);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='add'>+		set_delalloc_bitmap(folio, &amp;delalloc_bitmap, delalloc_start,</div><div class='add'>+				    min(delalloc_end, page_end) + 1 - delalloc_start);</div><div class='add'>+		last_delalloc_end = delalloc_end;</div><div class='ctx'> 		delalloc_start = delalloc_end + 1;</div><div class='ctx'> 	}</div><div class='add'>+	delalloc_start = page_start;</div><div class='add'>+</div><div class='add'>+	if (!last_delalloc_end)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Run the delalloc ranges for the above locked ranges. */</div><div class='add'>+	while (delalloc_start &lt; page_end) {</div><div class='add'>+		u64 found_start;</div><div class='add'>+		u32 found_len;</div><div class='add'>+		bool found;</div><div class='ctx'> </div><div class='add'>+		if (!is_subpage) {</div><div class='add'>+			/*</div><div class='add'>+			 * For non-subpage case, the found delalloc range must</div><div class='add'>+			 * cover this folio and there must be only one locked</div><div class='add'>+			 * delalloc range.</div><div class='add'>+			 */</div><div class='add'>+			found_start = page_start;</div><div class='add'>+			found_len = last_delalloc_end + 1 - found_start;</div><div class='add'>+			found = true;</div><div class='add'>+		} else {</div><div class='add'>+			found = find_next_delalloc_bitmap(folio, &amp;delalloc_bitmap,</div><div class='add'>+					delalloc_start, &amp;found_start, &amp;found_len);</div><div class='add'>+		}</div><div class='add'>+		if (!found)</div><div class='add'>+			break;</div><div class='add'>+		/*</div><div class='add'>+		 * The subpage range covers the last sector, the delalloc range may</div><div class='add'>+		 * end beyond the folio boundary, use the saved delalloc_end</div><div class='add'>+		 * instead.</div><div class='add'>+		 */</div><div class='add'>+		if (found_start + found_len &gt;= page_end)</div><div class='add'>+			found_len = last_delalloc_end + 1 - found_start;</div><div class='add'>+</div><div class='add'>+		if (ret &gt;= 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Some delalloc range may be created by previous folios.</div><div class='add'>+			 * Thus we still need to clean up this range during error</div><div class='add'>+			 * handling.</div><div class='add'>+			 */</div><div class='add'>+			last_finished_delalloc_end = found_start;</div><div class='add'>+			/* No errors hit so far, run the current delalloc range. */</div><div class='add'>+			ret = btrfs_run_delalloc_range(inode, folio,</div><div class='add'>+						       found_start,</div><div class='add'>+						       found_start + found_len - 1,</div><div class='add'>+						       wbc);</div><div class='add'>+			if (ret &gt;= 0)</div><div class='add'>+				last_finished_delalloc_end = found_start + found_len;</div><div class='add'>+			if (unlikely(ret &lt; 0))</div><div class='add'>+				btrfs_err_rl(fs_info,</div><div class='add'>+"failed to run delalloc range, root=%lld ino=%llu folio=%llu submit_bitmap=%*pbl start=%llu len=%u: %d",</div><div class='add'>+					     btrfs_root_id(inode-&gt;root),</div><div class='add'>+					     btrfs_ino(inode),</div><div class='add'>+					     folio_pos(folio),</div><div class='add'>+					     blocks_per_folio,</div><div class='add'>+					     &amp;bio_ctrl-&gt;submit_bitmap,</div><div class='add'>+					     found_start, found_len, ret);</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * We've hit an error during previous delalloc range,</div><div class='add'>+			 * have to cleanup the remaining locked ranges.</div><div class='add'>+			 */</div><div class='add'>+			btrfs_unlock_extent(&amp;inode-&gt;io_tree, found_start,</div><div class='add'>+					    found_start + found_len - 1, NULL);</div><div class='add'>+			unlock_delalloc_folio(&amp;inode-&gt;vfs_inode, folio,</div><div class='add'>+					      found_start,</div><div class='add'>+					      found_start + found_len - 1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We have some ranges that's going to be submitted asynchronously</div><div class='add'>+		 * (compression or inline).  These range have their own control</div><div class='add'>+		 * on when to unlock the pages.  We should not touch them</div><div class='add'>+		 * anymore, so clear the range from the submission bitmap.</div><div class='add'>+		 */</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			unsigned int start_bit = (found_start - page_start) &gt;&gt;</div><div class='add'>+						 fs_info-&gt;sectorsize_bits;</div><div class='add'>+			unsigned int end_bit = (min(page_end + 1, found_start + found_len) -</div><div class='add'>+						page_start) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+			bitmap_clear(&amp;bio_ctrl-&gt;submit_bitmap, start_bit, end_bit - start_bit);</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Above btrfs_run_delalloc_range() may have unlocked the folio,</div><div class='add'>+		 * thus for the last range, we cannot touch the folio anymore.</div><div class='add'>+		 */</div><div class='add'>+		if (found_start + found_len &gt;= last_delalloc_end + 1)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		delalloc_start = found_start + found_len;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * It's possible we had some ordered extents created before we hit</div><div class='add'>+	 * an error, cleanup non-async successfully created delalloc ranges.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		unsigned int bitmap_size = min(</div><div class='add'>+				(last_finished_delalloc_end - page_start) &gt;&gt;</div><div class='add'>+				fs_info-&gt;sectorsize_bits,</div><div class='add'>+				blocks_per_folio);</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(bit, &amp;bio_ctrl-&gt;submit_bitmap, bitmap_size)</div><div class='add'>+			btrfs_mark_ordered_io_finished(inode, folio,</div><div class='add'>+				page_start + (bit &lt;&lt; fs_info-&gt;sectorsize_bits),</div><div class='add'>+				fs_info-&gt;sectorsize, false);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (last_delalloc_end)</div><div class='add'>+		delalloc_end = last_delalloc_end;</div><div class='add'>+	else</div><div class='add'>+		delalloc_end = page_end;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * delalloc_end is already one less than the total length, so</div><div class='del'>-	 * we don't subtract one from PAGE_SIZE</div><div class='add'>+	 * we don't subtract one from PAGE_SIZE.</div><div class='ctx'> 	 */</div><div class='ctx'> 	delalloc_to_write +=</div><div class='ctx'> 		DIV_ROUND_UP(delalloc_end + 1 - page_start, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If btrfs_run_dealloc_range() already started I/O and unlocked</div><div class='del'>-	 * the pages, we just need to account for them here.</div><div class='add'>+	 * If all ranges are submitted asynchronously, we just need to account</div><div class='add'>+	 * for them here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ret == 1) {</div><div class='add'>+	if (bitmap_empty(&amp;bio_ctrl-&gt;submit_bitmap, blocks_per_folio)) {</div><div class='ctx'> 		wbc-&gt;nr_to_write -= delalloc_to_write;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1257,180 +1597,201 @@ static noinline_for_stack int writepage_delalloc(struct btrfs_inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Find the first byte we need to write.</div><div class='del'>- *</div><div class='del'>- * For subpage, one page can contain several sectors, and</div><div class='del'>- * __extent_writepage_io() will just grab all extent maps in the page</div><div class='del'>- * range and try to submit all non-inline/non-compressed extents.</div><div class='add'>+ * Return 0 if we have submitted or queued the sector for submission.</div><div class='add'>+ * Return &lt;0 for critical errors, and the sector will have its dirty flag cleared.</div><div class='ctx'>  *</div><div class='del'>- * This is a big problem for subpage, we shouldn't re-submit already written</div><div class='del'>- * data at all.</div><div class='del'>- * This function will lookup subpage dirty bit to find which range we really</div><div class='del'>- * need to submit.</div><div class='del'>- *</div><div class='del'>- * Return the next dirty range in [@start, @end).</div><div class='del'>- * If no dirty range is found, @start will be page_offset(page) + PAGE_SIZE.</div><div class='add'>+ * Caller should make sure filepos &lt; i_size and handle filepos &gt;= i_size case.</div><div class='ctx'>  */</div><div class='del'>-static void find_next_dirty_byte(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct page *page, u64 *start, u64 *end)</div><div class='add'>+static int submit_one_sector(struct btrfs_inode *inode,</div><div class='add'>+			     struct folio *folio,</div><div class='add'>+			     u64 filepos, struct btrfs_bio_ctrl *bio_ctrl,</div><div class='add'>+			     loff_t i_size)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='del'>-	struct btrfs_subpage_info *spi = fs_info-&gt;subpage_info;</div><div class='del'>-	u64 orig_start = *start;</div><div class='del'>-	/* Declare as unsigned long so we can use bitmap ops */</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int range_start_bit;</div><div class='del'>-	int range_end_bit;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct extent_map *em;</div><div class='add'>+	u64 block_start;</div><div class='add'>+	u64 disk_bytenr;</div><div class='add'>+	u64 extent_offset;</div><div class='add'>+	u64 em_end;</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For regular sector size == page size case, since one page only</div><div class='del'>-	 * contains one sector, we return the page offset directly.</div><div class='del'>-	 */</div><div class='del'>-	if (!btrfs_is_subpage(fs_info, page-&gt;mapping)) {</div><div class='del'>-		*start = page_offset(page);</div><div class='del'>-		*end = page_offset(page) + PAGE_SIZE;</div><div class='del'>-		return;</div><div class='add'>+	ASSERT(IS_ALIGNED(filepos, sectorsize));</div><div class='add'>+</div><div class='add'>+	/* @filepos &gt;= i_size case should be handled by the caller. */</div><div class='add'>+	ASSERT(filepos &lt; i_size);</div><div class='add'>+</div><div class='add'>+	em = btrfs_get_extent(inode, NULL, filepos, sectorsize);</div><div class='add'>+	if (IS_ERR(em)) {</div><div class='add'>+		/*</div><div class='add'>+		 * When submission failed, we should still clear the folio dirty.</div><div class='add'>+		 * Or the folio will be written back again but without any</div><div class='add'>+		 * ordered extent.</div><div class='add'>+		 */</div><div class='add'>+		btrfs_folio_clear_dirty(fs_info, folio, filepos, sectorsize);</div><div class='add'>+		btrfs_folio_set_writeback(fs_info, folio, filepos, sectorsize);</div><div class='add'>+		btrfs_folio_clear_writeback(fs_info, folio, filepos, sectorsize);</div><div class='add'>+		return PTR_ERR(em);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	range_start_bit = spi-&gt;dirty_offset +</div><div class='del'>-			  (offset_in_page(orig_start) &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	extent_offset = filepos - em-&gt;start;</div><div class='add'>+	em_end = btrfs_extent_map_end(em);</div><div class='add'>+	ASSERT(filepos &lt;= em_end);</div><div class='add'>+	ASSERT(IS_ALIGNED(em-&gt;start, sectorsize));</div><div class='add'>+	ASSERT(IS_ALIGNED(em-&gt;len, sectorsize));</div><div class='ctx'> </div><div class='del'>-	/* We should have the page locked, but just in case */</div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_next_set_region(subpage-&gt;bitmaps, &amp;range_start_bit, &amp;range_end_bit,</div><div class='del'>-			       spi-&gt;dirty_offset + spi-&gt;bitmap_nr_bits);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	block_start = btrfs_extent_map_block_start(em);</div><div class='add'>+	disk_bytenr = btrfs_extent_map_block_start(em) + extent_offset;</div><div class='ctx'> </div><div class='del'>-	range_start_bit -= spi-&gt;dirty_offset;</div><div class='del'>-	range_end_bit -= spi-&gt;dirty_offset;</div><div class='add'>+	ASSERT(!btrfs_extent_map_is_compressed(em));</div><div class='add'>+	ASSERT(block_start != EXTENT_MAP_HOLE);</div><div class='add'>+	ASSERT(block_start != EXTENT_MAP_INLINE);</div><div class='ctx'> </div><div class='del'>-	*start = page_offset(page) + range_start_bit * fs_info-&gt;sectorsize;</div><div class='del'>-	*end = page_offset(page) + range_end_bit * fs_info-&gt;sectorsize;</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+	em = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Although the PageDirty bit is cleared before entering this</div><div class='add'>+	 * function, subpage dirty bit is not cleared.</div><div class='add'>+	 * So clear subpage dirty bit here so next time we won't submit</div><div class='add'>+	 * a folio for a range already written to disk.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_folio_clear_dirty(fs_info, folio, filepos, sectorsize);</div><div class='add'>+	btrfs_folio_set_writeback(fs_info, folio, filepos, sectorsize);</div><div class='add'>+	/*</div><div class='add'>+	 * Above call should set the whole folio with writeback flag, even</div><div class='add'>+	 * just for a single subpage sector.</div><div class='add'>+	 * As long as the folio is properly locked and the range is correct,</div><div class='add'>+	 * we should always get the folio with writeback flag.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(folio_test_writeback(folio));</div><div class='add'>+</div><div class='add'>+	submit_extent_folio(bio_ctrl, disk_bytenr, folio,</div><div class='add'>+			    sectorsize, filepos - folio_pos(folio), 0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * helper for __extent_writepage.  This calls the writepage start hooks,</div><div class='add'>+ * Helper for extent_writepage().  This calls the writepage start hooks,</div><div class='ctx'>  * and does the loop to map the page into extents and bios.</div><div class='ctx'>  *</div><div class='ctx'>  * We return 1 if the IO is started and the page is unlocked,</div><div class='ctx'>  * 0 if all went well (page still locked)</div><div class='ctx'>  * &lt; 0 if there were errors (page still locked)</div><div class='ctx'>  */</div><div class='del'>-static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,</div><div class='del'>-				 struct page *page,</div><div class='del'>-				 struct btrfs_bio_ctrl *bio_ctrl,</div><div class='del'>-				 loff_t i_size,</div><div class='del'>-				 int *nr_ret)</div><div class='add'>+static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,</div><div class='add'>+						  struct folio *folio,</div><div class='add'>+						  u64 start, u32 len,</div><div class='add'>+						  struct btrfs_bio_ctrl *bio_ctrl,</div><div class='add'>+						  loff_t i_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	u64 cur = page_offset(page);</div><div class='del'>-	u64 end = cur + PAGE_SIZE - 1;</div><div class='del'>-	u64 extent_offset;</div><div class='del'>-	u64 block_start;</div><div class='del'>-	struct extent_map *em;</div><div class='add'>+	unsigned long range_bitmap = 0;</div><div class='add'>+	bool submitted_io = false;</div><div class='add'>+	int found_error = 0;</div><div class='add'>+	const u64 end = start + len;</div><div class='add'>+	const u64 folio_start = folio_pos(folio);</div><div class='add'>+	const u64 folio_end = folio_start + folio_size(folio);</div><div class='add'>+	const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);</div><div class='add'>+	u64 cur;</div><div class='add'>+	int bit;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int nr = 0;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_writepage_cow_fixup(page);</div><div class='del'>-	if (ret) {</div><div class='add'>+	ASSERT(start &gt;= folio_start, "start=%llu folio_start=%llu", start, folio_start);</div><div class='add'>+	ASSERT(end &lt;= folio_end, "start=%llu len=%u folio_start=%llu folio_size=%zu",</div><div class='add'>+	       start, len, folio_start, folio_size(folio));</div><div class='add'>+</div><div class='add'>+	ret = btrfs_writepage_cow_fixup(folio);</div><div class='add'>+	if (ret == -EAGAIN) {</div><div class='ctx'> 		/* Fixup worker will requeue */</div><div class='del'>-		redirty_page_for_writepage(bio_ctrl-&gt;wbc, page);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_redirty_for_writepage(bio_ctrl-&gt;wbc, folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_folio_clear_dirty(fs_info, folio, start, len);</div><div class='add'>+		btrfs_folio_set_writeback(fs_info, folio, start, len);</div><div class='add'>+		btrfs_folio_clear_writeback(fs_info, folio, start, len);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (cur = start; cur &lt; end; cur += fs_info-&gt;sectorsize)</div><div class='add'>+		set_bit((cur - folio_start) &gt;&gt; fs_info-&gt;sectorsize_bits, &amp;range_bitmap);</div><div class='add'>+	bitmap_and(&amp;bio_ctrl-&gt;submit_bitmap, &amp;bio_ctrl-&gt;submit_bitmap, &amp;range_bitmap,</div><div class='add'>+		   blocks_per_folio);</div><div class='ctx'> </div><div class='ctx'> 	bio_ctrl-&gt;end_io_func = end_bbio_data_write;</div><div class='del'>-	while (cur &lt;= end) {</div><div class='del'>-		u32 len = end - cur + 1;</div><div class='del'>-		u64 disk_bytenr;</div><div class='del'>-		u64 em_end;</div><div class='del'>-		u64 dirty_range_start = cur;</div><div class='del'>-		u64 dirty_range_end;</div><div class='del'>-		u32 iosize;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, &amp;bio_ctrl-&gt;submit_bitmap, blocks_per_folio) {</div><div class='add'>+		cur = folio_pos(folio) + (bit &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> </div><div class='ctx'> 		if (cur &gt;= i_size) {</div><div class='del'>-			btrfs_mark_ordered_io_finished(inode, page, cur, len,</div><div class='del'>-						       true);</div><div class='add'>+			struct btrfs_ordered_extent *ordered;</div><div class='add'>+</div><div class='add'>+			ordered = btrfs_lookup_first_ordered_range(inode, cur,</div><div class='add'>+								   folio_end - cur);</div><div class='add'>+			/*</div><div class='add'>+			 * We have just run delalloc before getting here, so</div><div class='add'>+			 * there must be an ordered extent.</div><div class='add'>+			 */</div><div class='add'>+			ASSERT(ordered != NULL);</div><div class='add'>+			spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+			set_bit(BTRFS_ORDERED_TRUNCATED, &amp;ordered-&gt;flags);</div><div class='add'>+			ordered-&gt;truncated_len = min(ordered-&gt;truncated_len,</div><div class='add'>+						     cur - ordered-&gt;file_offset);</div><div class='add'>+			spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+			btrfs_put_ordered_extent(ordered);</div><div class='add'>+</div><div class='add'>+			btrfs_mark_ordered_io_finished(inode, folio, cur,</div><div class='add'>+						       end - cur, true);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This range is beyond i_size, thus we don't need to</div><div class='ctx'> 			 * bother writing back.</div><div class='ctx'> 			 * But we still need to clear the dirty subpage bit, or</div><div class='del'>-			 * the next time the page gets dirtied, we will try to</div><div class='add'>+			 * the next time the folio gets dirtied, we will try to</div><div class='ctx'> 			 * writeback the sectors with subpage dirty bits,</div><div class='ctx'> 			 * causing writeback without ordered extent.</div><div class='ctx'> 			 */</div><div class='del'>-			btrfs_folio_clear_dirty(fs_info, page_folio(page), cur, len);</div><div class='add'>+			btrfs_folio_clear_dirty(fs_info, folio, cur, end - cur);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		find_next_dirty_byte(fs_info, page, &amp;dirty_range_start,</div><div class='del'>-				     &amp;dirty_range_end);</div><div class='del'>-		if (cur &lt; dirty_range_start) {</div><div class='del'>-			cur = dirty_range_start;</div><div class='add'>+		ret = submit_one_sector(inode, folio, cur, bio_ctrl, i_size);</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			/*</div><div class='add'>+			 * bio_ctrl may contain a bio crossing several folios.</div><div class='add'>+			 * Submit it immediately so that the bio has a chance</div><div class='add'>+			 * to finish normally, other than marked as error.</div><div class='add'>+			 */</div><div class='add'>+			submit_one_bio(bio_ctrl);</div><div class='add'>+			/*</div><div class='add'>+			 * Failed to grab the extent map which should be very rare.</div><div class='add'>+			 * Since there is no bio submitted to finish the ordered</div><div class='add'>+			 * extent, we have to manually finish this sector.</div><div class='add'>+			 */</div><div class='add'>+			btrfs_mark_ordered_io_finished(inode, folio, cur,</div><div class='add'>+						       fs_info-&gt;sectorsize, false);</div><div class='add'>+			if (!found_error)</div><div class='add'>+				found_error = ret;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		em = btrfs_get_extent(inode, NULL, 0, cur, len);</div><div class='del'>-		if (IS_ERR(em)) {</div><div class='del'>-			ret = PTR_ERR_OR_ZERO(em);</div><div class='del'>-			goto out_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		extent_offset = cur - em-&gt;start;</div><div class='del'>-		em_end = extent_map_end(em);</div><div class='del'>-		ASSERT(cur &lt;= em_end);</div><div class='del'>-		ASSERT(cur &lt; end);</div><div class='del'>-		ASSERT(IS_ALIGNED(em-&gt;start, fs_info-&gt;sectorsize));</div><div class='del'>-		ASSERT(IS_ALIGNED(em-&gt;len, fs_info-&gt;sectorsize));</div><div class='del'>-</div><div class='del'>-		block_start = em-&gt;block_start;</div><div class='del'>-		disk_bytenr = em-&gt;block_start + extent_offset;</div><div class='del'>-</div><div class='del'>-		ASSERT(!extent_map_is_compressed(em));</div><div class='del'>-		ASSERT(block_start != EXTENT_MAP_HOLE);</div><div class='del'>-		ASSERT(block_start != EXTENT_MAP_INLINE);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Note that em_end from extent_map_end() and dirty_range_end from</div><div class='del'>-		 * find_next_dirty_byte() are all exclusive</div><div class='del'>-		 */</div><div class='del'>-		iosize = min(min(em_end, end + 1), dirty_range_end) - cur;</div><div class='del'>-		free_extent_map(em);</div><div class='del'>-		em = NULL;</div><div class='del'>-</div><div class='del'>-		btrfs_set_range_writeback(inode, cur, cur + iosize - 1);</div><div class='del'>-		if (!PageWriteback(page)) {</div><div class='del'>-			btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='del'>-				   "page %lu not writeback, cur %llu end %llu",</div><div class='del'>-			       page-&gt;index, cur, end);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Although the PageDirty bit is cleared before entering this</div><div class='del'>-		 * function, subpage dirty bit is not cleared.</div><div class='del'>-		 * So clear subpage dirty bit here so next time we won't submit</div><div class='del'>-		 * page for range already written to disk.</div><div class='del'>-		 */</div><div class='del'>-		btrfs_folio_clear_dirty(fs_info, page_folio(page), cur, iosize);</div><div class='del'>-</div><div class='del'>-		submit_extent_page(bio_ctrl, disk_bytenr, page, iosize,</div><div class='del'>-				   cur - page_offset(page));</div><div class='del'>-		cur += iosize;</div><div class='del'>-		nr++;</div><div class='add'>+		submitted_io = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_folio_assert_not_dirty(fs_info, page_folio(page));</div><div class='del'>-	*nr_ret = nr;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_error:</div><div class='ctx'> 	/*</div><div class='del'>-	 * If we finish without problem, we should not only clear page dirty,</div><div class='del'>-	 * but also empty subpage dirty bits</div><div class='add'>+	 * If we didn't submitted any sector (&gt;= i_size), folio dirty get</div><div class='add'>+	 * cleared but PAGECACHE_TAG_DIRTY is not cleared (only cleared</div><div class='add'>+	 * by folio_start_writeback() if the folio is not dirty).</div><div class='add'>+	 *</div><div class='add'>+	 * Here we set writeback and clear for the range. If the full folio</div><div class='add'>+	 * is no longer dirty then we clear the PAGECACHE_TAG_DIRTY tag.</div><div class='add'>+	 *</div><div class='add'>+	 * If we hit any error, the corresponding sector will have its dirty</div><div class='add'>+	 * flag cleared and writeback finished, thus no need to handle the error case.</div><div class='ctx'> 	 */</div><div class='del'>-	*nr_ret = nr;</div><div class='del'>-	return ret;</div><div class='add'>+	if (!submitted_io &amp;&amp; !found_error) {</div><div class='add'>+		btrfs_folio_set_writeback(fs_info, folio, start, len);</div><div class='add'>+		btrfs_folio_clear_writeback(fs_info, folio, start, len);</div><div class='add'>+	}</div><div class='add'>+	return found_error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1442,70 +1803,95 @@ out_error:</div><div class='ctx'>  * Return 0 if everything goes well.</div><div class='ctx'>  * Return &lt;0 for error.</div><div class='ctx'>  */</div><div class='del'>-static int __extent_writepage(struct page *page, struct btrfs_bio_ctrl *bio_ctrl)</div><div class='add'>+static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	const u64 page_start = page_offset(page);</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(folio-&gt;mapping-&gt;host);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int nr = 0;</div><div class='ctx'> 	size_t pg_offset;</div><div class='del'>-	loff_t i_size = i_size_read(inode);</div><div class='del'>-	unsigned long end_index = i_size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	loff_t i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	const pgoff_t end_index = i_size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);</div><div class='ctx'> </div><div class='del'>-	trace___extent_writepage(page, inode, bio_ctrl-&gt;wbc);</div><div class='add'>+	trace_extent_writepage(folio, &amp;inode-&gt;vfs_inode, bio_ctrl-&gt;wbc);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!PageLocked(page));</div><div class='add'>+	WARN_ON(!folio_test_locked(folio));</div><div class='ctx'> </div><div class='del'>-	pg_offset = offset_in_page(i_size);</div><div class='del'>-	if (page-&gt;index &gt; end_index ||</div><div class='del'>-	   (page-&gt;index == end_index &amp;&amp; !pg_offset)) {</div><div class='add'>+	pg_offset = offset_in_folio(folio, i_size);</div><div class='add'>+	if (folio-&gt;index &gt; end_index ||</div><div class='add'>+	   (folio-&gt;index == end_index &amp;&amp; !pg_offset)) {</div><div class='ctx'> 		folio_invalidate(folio, 0, folio_size(folio));</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page-&gt;index == end_index)</div><div class='del'>-		memzero_page(page, pg_offset, PAGE_SIZE - pg_offset);</div><div class='add'>+	if (folio_contains(folio, end_index))</div><div class='add'>+		folio_zero_range(folio, pg_offset, folio_size(folio) - pg_offset);</div><div class='ctx'> </div><div class='del'>-	ret = set_page_extent_mapped(page);</div><div class='add'>+	/*</div><div class='add'>+	 * Default to unlock the whole folio.</div><div class='add'>+	 * The proper bitmap can only be initialized until writepage_delalloc().</div><div class='add'>+	 */</div><div class='add'>+	bio_ctrl-&gt;submit_bitmap = (unsigned long)-1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the page is dirty but without private set, it's marked dirty</div><div class='add'>+	 * without informing the fs.</div><div class='add'>+	 * Nowadays that is a bug, since the introduction of</div><div class='add'>+	 * pin_user_pages*().</div><div class='add'>+	 *</div><div class='add'>+	 * So here we check if the page has private set to rule out such</div><div class='add'>+	 * case.</div><div class='add'>+	 * But we also have a long history of relying on the COW fixup,</div><div class='add'>+	 * so here we only enable this check for experimental builds until</div><div class='add'>+	 * we're sure it's safe.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_EXPERIMENTAL) &amp;&amp;</div><div class='add'>+	    unlikely(!folio_test_private(folio))) {</div><div class='add'>+		WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='add'>+		btrfs_err_rl(fs_info,</div><div class='add'>+	"root %lld ino %llu folio %llu is marked dirty without notifying the fs",</div><div class='add'>+			     btrfs_root_id(inode-&gt;root),</div><div class='add'>+			     btrfs_ino(inode), folio_pos(folio));</div><div class='add'>+		ret = -EUCLEAN;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	ret = writepage_delalloc(BTRFS_I(inode), page, bio_ctrl-&gt;wbc);</div><div class='add'>+	ret = writepage_delalloc(inode, folio, bio_ctrl);</div><div class='ctx'> 	if (ret == 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	ret = __extent_writepage_io(BTRFS_I(inode), page, bio_ctrl, i_size, &amp;nr);</div><div class='add'>+	ret = extent_writepage_io(inode, folio, folio_pos(folio),</div><div class='add'>+				  folio_size(folio), bio_ctrl, i_size);</div><div class='ctx'> 	if (ret == 1)</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		btrfs_err_rl(fs_info,</div><div class='add'>+"failed to submit blocks, root=%lld inode=%llu folio=%llu submit_bitmap=%*pbl: %d",</div><div class='add'>+			     btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+			     folio_pos(folio), blocks_per_folio,</div><div class='add'>+			     &amp;bio_ctrl-&gt;submit_bitmap, ret);</div><div class='ctx'> </div><div class='ctx'> 	bio_ctrl-&gt;wbc-&gt;nr_to_write--;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	if (nr == 0) {</div><div class='del'>-		/* make sure the mapping tag for page dirty gets cleared */</div><div class='del'>-		set_page_writeback(page);</div><div class='del'>-		end_page_writeback(page);</div><div class='del'>-	}</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_mark_ordered_io_finished(BTRFS_I(inode), page, page_start,</div><div class='del'>-					       PAGE_SIZE, !ret);</div><div class='del'>-		mapping_set_error(page-&gt;mapping, ret);</div><div class='del'>-	}</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		mapping_set_error(folio-&gt;mapping, ret);</div><div class='add'>+	/*</div><div class='add'>+	 * Only unlock ranges that are submitted. As there can be some async</div><div class='add'>+	 * submitted ranges inside the folio.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_folio_end_lock_bitmap(fs_info, folio, bio_ctrl-&gt;submit_bitmap);</div><div class='ctx'> 	ASSERT(ret &lt;= 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wait_on_extent_buffer_writeback(struct extent_buffer *eb)</div><div class='del'>-{</div><div class='del'>-	wait_on_bit_io(&amp;eb-&gt;bflags, EXTENT_BUFFER_WRITEBACK,</div><div class='del'>-		       TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Lock extent buffer status and pages for writeback.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1535,8 +1921,19 @@ static noinline_for_stack bool lock_extent_buffer_for_io(struct extent_buffer *e</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;eb-&gt;refs_lock);</div><div class='ctx'> 	if (test_and_clear_bit(EXTENT_BUFFER_DIRTY, &amp;eb-&gt;bflags)) {</div><div class='add'>+		XA_STATE(xas, &amp;fs_info-&gt;buffer_tree, eb-&gt;start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 		set_bit(EXTENT_BUFFER_WRITEBACK, &amp;eb-&gt;bflags);</div><div class='ctx'> 		spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='add'>+</div><div class='add'>+		xas_lock_irqsave(&amp;xas, flags);</div><div class='add'>+		xas_load(&amp;xas);</div><div class='add'>+		xas_set_mark(&amp;xas, PAGECACHE_TAG_WRITEBACK);</div><div class='add'>+		xas_clear_mark(&amp;xas, PAGECACHE_TAG_DIRTY);</div><div class='add'>+		xas_clear_mark(&amp;xas, PAGECACHE_TAG_TOWRITE);</div><div class='add'>+		xas_unlock_irqrestore(&amp;xas, flags);</div><div class='add'>+</div><div class='ctx'> 		btrfs_set_header_flag(eb, BTRFS_HEADER_FLAG_WRITTEN);</div><div class='ctx'> 		percpu_counter_add_batch(&amp;fs_info-&gt;dirty_metadata_bytes,</div><div class='ctx'> 					 -eb-&gt;len,</div><div class='hunk'>@@ -1581,7 +1978,7 @@ static void set_btree_ioerr(struct extent_buffer *eb)</div><div class='ctx'> 	 * can be no longer dirty nor marked anymore for writeback (if a</div><div class='ctx'> 	 * subsequent modification to the extent buffer didn't happen before the</div><div class='ctx'> 	 * transaction commit), which makes filemap_fdata[write|wait]_range not</div><div class='del'>-	 * able to find the pages tagged with SetPageError at transaction</div><div class='add'>+	 * able to find the pages which contain errors at transaction</div><div class='ctx'> 	 * commit time. So if this happens we must abort the transaction,</div><div class='ctx'> 	 * otherwise we commit a super block with btree roots that point to</div><div class='ctx'> 	 * btree nodes/leafs whose content on disk is invalid - either garbage</div><div class='hunk'>@@ -1622,6 +2019,135 @@ static void set_btree_ioerr(struct extent_buffer *eb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void buffer_tree_set_mark(const struct extent_buffer *eb, xa_mark_t mark)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='add'>+	XA_STATE(xas, &amp;fs_info-&gt;buffer_tree, eb-&gt;start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	xas_lock_irqsave(&amp;xas, flags);</div><div class='add'>+	xas_load(&amp;xas);</div><div class='add'>+	xas_set_mark(&amp;xas, mark);</div><div class='add'>+	xas_unlock_irqrestore(&amp;xas, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void buffer_tree_clear_mark(const struct extent_buffer *eb, xa_mark_t mark)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='add'>+	XA_STATE(xas, &amp;fs_info-&gt;buffer_tree, eb-&gt;start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	xas_lock_irqsave(&amp;xas, flags);</div><div class='add'>+	xas_load(&amp;xas);</div><div class='add'>+	xas_clear_mark(&amp;xas, mark);</div><div class='add'>+	xas_unlock_irqrestore(&amp;xas, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void buffer_tree_tag_for_writeback(struct btrfs_fs_info *fs_info,</div><div class='add'>+					  unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	XA_STATE(xas, &amp;fs_info-&gt;buffer_tree, start);</div><div class='add'>+	unsigned int tagged = 0;</div><div class='add'>+	void *eb;</div><div class='add'>+</div><div class='add'>+	xas_lock_irq(&amp;xas);</div><div class='add'>+	xas_for_each_marked(&amp;xas, eb, end, PAGECACHE_TAG_DIRTY) {</div><div class='add'>+		xas_set_mark(&amp;xas, PAGECACHE_TAG_TOWRITE);</div><div class='add'>+		if (++tagged % XA_CHECK_SCHED)</div><div class='add'>+			continue;</div><div class='add'>+		xas_pause(&amp;xas);</div><div class='add'>+		xas_unlock_irq(&amp;xas);</div><div class='add'>+		cond_resched();</div><div class='add'>+		xas_lock_irq(&amp;xas);</div><div class='add'>+	}</div><div class='add'>+	xas_unlock_irq(&amp;xas);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct eb_batch {</div><div class='add'>+	unsigned int nr;</div><div class='add'>+	unsigned int cur;</div><div class='add'>+	struct extent_buffer *ebs[PAGEVEC_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool eb_batch_add(struct eb_batch *batch, struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	batch-&gt;ebs[batch-&gt;nr++] = eb;</div><div class='add'>+	return (batch-&gt;nr &lt; PAGEVEC_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void eb_batch_init(struct eb_batch *batch)</div><div class='add'>+{</div><div class='add'>+	batch-&gt;nr = 0;</div><div class='add'>+	batch-&gt;cur = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct extent_buffer *eb_batch_next(struct eb_batch *batch)</div><div class='add'>+{</div><div class='add'>+	if (batch-&gt;cur &gt;= batch-&gt;nr)</div><div class='add'>+		return NULL;</div><div class='add'>+	return batch-&gt;ebs[batch-&gt;cur++];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void eb_batch_release(struct eb_batch *batch)</div><div class='add'>+{</div><div class='add'>+	for (unsigned int i = 0; i &lt; batch-&gt;nr; i++)</div><div class='add'>+		free_extent_buffer(batch-&gt;ebs[i]);</div><div class='add'>+	eb_batch_init(batch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct extent_buffer *find_get_eb(struct xa_state *xas, unsigned long max,</div><div class='add'>+						xa_mark_t mark)</div><div class='add'>+{</div><div class='add'>+	struct extent_buffer *eb;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	eb = xas_find_marked(xas, max, mark);</div><div class='add'>+</div><div class='add'>+	if (xas_retry(xas, eb))</div><div class='add'>+		goto retry;</div><div class='add'>+</div><div class='add'>+	if (!eb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!refcount_inc_not_zero(&amp;eb-&gt;refs)) {</div><div class='add'>+		xas_reset(xas);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(eb != xas_reload(xas))) {</div><div class='add'>+		free_extent_buffer(eb);</div><div class='add'>+		xas_reset(xas);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return eb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int buffer_tree_get_ebs_tag(struct btrfs_fs_info *fs_info,</div><div class='add'>+					    unsigned long *start,</div><div class='add'>+					    unsigned long end, xa_mark_t tag,</div><div class='add'>+					    struct eb_batch *batch)</div><div class='add'>+{</div><div class='add'>+	XA_STATE(xas, &amp;fs_info-&gt;buffer_tree, *start);</div><div class='add'>+	struct extent_buffer *eb;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	while ((eb = find_get_eb(&amp;xas, end, tag)) != NULL) {</div><div class='add'>+		if (!eb_batch_add(batch, eb)) {</div><div class='add'>+			*start = ((eb-&gt;start + eb-&gt;len) &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (end == ULONG_MAX)</div><div class='add'>+		*start = ULONG_MAX;</div><div class='add'>+	else</div><div class='add'>+		*start = end + 1;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return batch-&gt;nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The endio specific version which won't touch any unsafe spinlock in endio</div><div class='ctx'>  * context.</div><div class='hunk'>@@ -1630,42 +2156,30 @@ static struct extent_buffer *find_extent_buffer_nolock(</div><div class='ctx'> 		struct btrfs_fs_info *fs_info, u64 start)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='add'>+	unsigned long index = (start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	eb = radix_tree_lookup(&amp;fs_info-&gt;buffer_radix,</div><div class='del'>-			       start &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	if (eb &amp;&amp; atomic_inc_not_zero(&amp;eb-&gt;refs)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return eb;</div><div class='del'>-	}</div><div class='add'>+	eb = xa_load(&amp;fs_info-&gt;buffer_tree, index);</div><div class='add'>+	if (eb &amp;&amp; !refcount_inc_not_zero(&amp;eb-&gt;refs))</div><div class='add'>+		eb = NULL;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	return NULL;</div><div class='add'>+	return eb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void end_bbio_meta_write(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb = bbio-&gt;private;</div><div class='del'>-	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='del'>-	bool uptodate = !bbio-&gt;bio.bi_status;</div><div class='ctx'> 	struct folio_iter fi;</div><div class='del'>-	u32 bio_offset = 0;</div><div class='ctx'> </div><div class='del'>-	if (!uptodate)</div><div class='add'>+	if (bbio-&gt;bio.bi_status != BLK_STS_OK)</div><div class='ctx'> 		set_btree_ioerr(eb);</div><div class='ctx'> </div><div class='ctx'> 	bio_for_each_folio_all(fi, &amp;bbio-&gt;bio) {</div><div class='del'>-		u64 start = eb-&gt;start + bio_offset;</div><div class='del'>-		struct folio *folio = fi.folio;</div><div class='del'>-		u32 len = fi.length;</div><div class='del'>-</div><div class='del'>-		btrfs_folio_clear_writeback(fs_info, folio, start, len);</div><div class='del'>-		bio_offset += len;</div><div class='add'>+		btrfs_meta_folio_clear_writeback(fi.folio, eb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clear_bit(EXTENT_BUFFER_WRITEBACK, &amp;eb-&gt;bflags);</div><div class='del'>-	smp_mb__after_atomic();</div><div class='del'>-	wake_up_bit(&amp;eb-&gt;bflags, EXTENT_BUFFER_WRITEBACK);</div><div class='del'>-</div><div class='add'>+	buffer_tree_clear_mark(eb, PAGECACHE_TAG_WRITEBACK);</div><div class='add'>+	clear_and_wake_up_bit(EXTENT_BUFFER_WRITEBACK, &amp;eb-&gt;bflags);</div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1707,237 +2221,100 @@ static noinline_for_stack void write_one_eb(struct extent_buffer *eb,</div><div class='ctx'> </div><div class='ctx'> 	bbio = btrfs_bio_alloc(INLINE_EXTENT_BUFFER_PAGES,</div><div class='ctx'> 			       REQ_OP_WRITE | REQ_META | wbc_to_write_flags(wbc),</div><div class='del'>-			       eb-&gt;fs_info, end_bbio_meta_write, eb);</div><div class='add'>+			       BTRFS_I(fs_info-&gt;btree_inode), eb-&gt;start,</div><div class='add'>+			       end_bbio_meta_write, eb);</div><div class='ctx'> 	bbio-&gt;bio.bi_iter.bi_sector = eb-&gt;start &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 	bio_set_dev(&amp;bbio-&gt;bio, fs_info-&gt;fs_devices-&gt;latest_dev-&gt;bdev);</div><div class='ctx'> 	wbc_init_bio(wbc, &amp;bbio-&gt;bio);</div><div class='del'>-	bbio-&gt;inode = BTRFS_I(eb-&gt;fs_info-&gt;btree_inode);</div><div class='del'>-	bbio-&gt;file_offset = eb-&gt;start;</div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE) {</div><div class='del'>-		struct folio *folio = eb-&gt;folios[0];</div><div class='del'>-		bool ret;</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='add'>+		struct folio *folio = eb-&gt;folios[i];</div><div class='add'>+		u64 range_start = max_t(u64, eb-&gt;start, folio_pos(folio));</div><div class='add'>+		u32 range_len = min_t(u64, folio_next_pos(folio),</div><div class='add'>+				      eb-&gt;start + eb-&gt;len) - range_start;</div><div class='ctx'> </div><div class='ctx'> 		folio_lock(folio);</div><div class='del'>-		btrfs_subpage_set_writeback(fs_info, folio, eb-&gt;start, eb-&gt;len);</div><div class='del'>-		if (btrfs_subpage_clear_and_test_dirty(fs_info, folio, eb-&gt;start,</div><div class='del'>-						       eb-&gt;len)) {</div><div class='del'>-			folio_clear_dirty_for_io(folio);</div><div class='del'>-			wbc-&gt;nr_to_write--;</div><div class='del'>-		}</div><div class='del'>-		ret = bio_add_folio(&amp;bbio-&gt;bio, folio, eb-&gt;len,</div><div class='del'>-				    eb-&gt;start - folio_pos(folio));</div><div class='del'>-		ASSERT(ret);</div><div class='del'>-		wbc_account_cgroup_owner(wbc, folio_page(folio, 0), eb-&gt;len);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-	} else {</div><div class='del'>-		int num_folios = num_extent_folios(eb);</div><div class='del'>-</div><div class='del'>-		for (int i = 0; i &lt; num_folios; i++) {</div><div class='del'>-			struct folio *folio = eb-&gt;folios[i];</div><div class='del'>-			bool ret;</div><div class='del'>-</div><div class='del'>-			folio_lock(folio);</div><div class='del'>-			folio_clear_dirty_for_io(folio);</div><div class='del'>-			folio_start_writeback(folio);</div><div class='del'>-			ret = bio_add_folio(&amp;bbio-&gt;bio, folio, folio_size(folio), 0);</div><div class='del'>-			ASSERT(ret);</div><div class='del'>-			wbc_account_cgroup_owner(wbc, folio_page(folio, 0),</div><div class='del'>-						 folio_size(folio));</div><div class='add'>+		btrfs_meta_folio_clear_dirty(folio, eb);</div><div class='add'>+		btrfs_meta_folio_set_writeback(folio, eb);</div><div class='add'>+		if (!folio_test_dirty(folio))</div><div class='ctx'> 			wbc-&gt;nr_to_write -= folio_nr_pages(folio);</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-		}</div><div class='add'>+		bio_add_folio_nofail(&amp;bbio-&gt;bio, folio, range_len,</div><div class='add'>+				     offset_in_folio(folio, range_start));</div><div class='add'>+		wbc_account_cgroup_owner(wbc, folio, range_len);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_submit_bio(bbio, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Submit one subpage btree page.</div><div class='del'>- *</div><div class='del'>- * The main difference to submit_eb_page() is:</div><div class='del'>- * - Page locking</div><div class='del'>- *   For subpage, we don't rely on page locking at all.</div><div class='del'>- *</div><div class='del'>- * - Flush write bio</div><div class='del'>- *   We only flush bio if we may be unable to fit current extent buffers into</div><div class='del'>- *   current bio.</div><div class='del'>- *</div><div class='del'>- * Return &gt;=0 for the number of submitted extent buffers.</div><div class='del'>- * Return &lt;0 for fatal error.</div><div class='del'>- */</div><div class='del'>-static int submit_eb_subpage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	int submitted = 0;</div><div class='del'>-	u64 page_start = page_offset(page);</div><div class='del'>-	int bit_start = 0;</div><div class='del'>-	int sectors_per_node = fs_info-&gt;nodesize &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-</div><div class='del'>-	/* Lock and write each dirty extent buffers in the range */</div><div class='del'>-	while (bit_start &lt; fs_info-&gt;subpage_info-&gt;bitmap_nr_bits) {</div><div class='del'>-		struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='del'>-		struct extent_buffer *eb;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		u64 start;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Take private lock to ensure the subpage won't be detached</div><div class='del'>-		 * in the meantime.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='del'>-		if (!folio_test_private(folio)) {</div><div class='del'>-			spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-		if (!test_bit(bit_start + fs_info-&gt;subpage_info-&gt;dirty_offset,</div><div class='del'>-			      subpage-&gt;bitmaps)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='del'>-			spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='del'>-			bit_start++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		start = page_start + bit_start * fs_info-&gt;sectorsize;</div><div class='del'>-		bit_start += sectors_per_node;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Here we just want to grab the eb without touching extra</div><div class='del'>-		 * spin locks, so call find_extent_buffer_nolock().</div><div class='del'>-		 */</div><div class='del'>-		eb = find_extent_buffer_nolock(fs_info, start);</div><div class='del'>-		spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='del'>-		spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The eb has already reached 0 refs thus find_extent_buffer()</div><div class='del'>-		 * doesn't return it. We don't need to write back such eb</div><div class='del'>-		 * anyway.</div><div class='del'>-		 */</div><div class='del'>-		if (!eb)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (lock_extent_buffer_for_io(eb, wbc)) {</div><div class='del'>-			write_one_eb(eb, wbc);</div><div class='del'>-			submitted++;</div><div class='del'>-		}</div><div class='del'>-		free_extent_buffer(eb);</div><div class='add'>+	/*</div><div class='add'>+	 * If the fs is already in error status, do not submit any writeback</div><div class='add'>+	 * but immediately finish it.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(BTRFS_FS_ERROR(fs_info))) {</div><div class='add'>+		btrfs_bio_end_io(bbio, errno_to_blk_status(BTRFS_FS_ERROR(fs_info)));</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	return submitted;</div><div class='add'>+	btrfs_submit_bbio(bbio, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Submit all page(s) of one extent buffer.</div><div class='del'>- *</div><div class='del'>- * @page:	the page of one extent buffer</div><div class='del'>- * @eb_context:	to determine if we need to submit this page, if current page</div><div class='del'>- *		belongs to this eb, we don't need to submit</div><div class='del'>- *</div><div class='del'>- * The caller should pass each page in their bytenr order, and here we use</div><div class='del'>- * @eb_context to determine if we have submitted pages of one extent buffer.</div><div class='add'>+ * Wait for all eb writeback in the given range to finish.</div><div class='ctx'>  *</div><div class='del'>- * If we have, we just skip until we hit a new page that doesn't belong to</div><div class='del'>- * current @eb_context.</div><div class='del'>- *</div><div class='del'>- * If not, we submit all the page(s) of the extent buffer.</div><div class='del'>- *</div><div class='del'>- * Return &gt;0 if we have submitted the extent buffer successfully.</div><div class='del'>- * Return 0 if we don't need to submit the page, as it's already submitted by</div><div class='del'>- * previous call.</div><div class='del'>- * Return &lt;0 for fatal error.</div><div class='add'>+ * @fs_info:	The fs_info for this file system.</div><div class='add'>+ * @start:	The offset of the range to start waiting on writeback.</div><div class='add'>+ * @end:	The end of the range, inclusive. This is meant to be used in</div><div class='add'>+ *		conjunction with wait_marked_extents, so this will usually be</div><div class='add'>+ *		the_next_eb-&gt;start - 1.</div><div class='ctx'>  */</div><div class='del'>-static int submit_eb_page(struct page *page, struct btrfs_eb_write_context *ctx)</div><div class='add'>+void btrfs_btree_wait_writeback_range(struct btrfs_fs_info *fs_info, u64 start,</div><div class='add'>+				      u64 end)</div><div class='ctx'> {</div><div class='del'>-	struct writeback_control *wbc = ctx-&gt;wbc;</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct extent_buffer *eb;</div><div class='del'>-	int ret;</div><div class='add'>+	struct eb_batch batch;</div><div class='add'>+	unsigned long start_index = (start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+	unsigned long end_index = (end &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='ctx'> </div><div class='del'>-	if (!folio_test_private(folio))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb)-&gt;nodesize &lt; PAGE_SIZE)</div><div class='del'>-		return submit_eb_subpage(page, wbc);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-	if (!folio_test_private(folio)) {</div><div class='del'>-		spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eb = folio_get_private(folio);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Shouldn't happen and normally this would be a BUG_ON but no point</div><div class='del'>-	 * crashing the machine for something we can survive anyway.</div><div class='del'>-	 */</div><div class='del'>-	if (WARN_ON(!eb)) {</div><div class='del'>-		spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eb == ctx-&gt;eb) {</div><div class='del'>-		spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ret = atomic_inc_not_zero(&amp;eb-&gt;refs);</div><div class='del'>-	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;eb = eb;</div><div class='add'>+	eb_batch_init(&amp;batch);</div><div class='add'>+	while (start_index &lt;= end_index) {</div><div class='add'>+		struct extent_buffer *eb;</div><div class='add'>+		unsigned int nr_ebs;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_check_meta_write_pointer(eb-&gt;fs_info, ctx);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (ret == -EBUSY)</div><div class='del'>-			ret = 0;</div><div class='del'>-		free_extent_buffer(eb);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+		nr_ebs = buffer_tree_get_ebs_tag(fs_info, &amp;start_index, end_index,</div><div class='add'>+						 PAGECACHE_TAG_WRITEBACK, &amp;batch);</div><div class='add'>+		if (!nr_ebs)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	if (!lock_extent_buffer_for_io(eb, wbc)) {</div><div class='del'>-		free_extent_buffer(eb);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* Implies write in zoned mode. */</div><div class='del'>-	if (ctx-&gt;zoned_bg) {</div><div class='del'>-		/* Mark the last eb in the block group. */</div><div class='del'>-		btrfs_schedule_zone_finish_bg(ctx-&gt;zoned_bg, eb);</div><div class='del'>-		ctx-&gt;zoned_bg-&gt;meta_write_pointer += eb-&gt;len;</div><div class='add'>+		while ((eb = eb_batch_next(&amp;batch)) != NULL)</div><div class='add'>+			wait_on_extent_buffer_writeback(eb);</div><div class='add'>+		eb_batch_release(&amp;batch);</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	write_one_eb(eb, wbc);</div><div class='del'>-	free_extent_buffer(eb);</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btree_write_cache_pages(struct address_space *mapping,</div><div class='ctx'> 				   struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_eb_write_context ctx = { .wbc = wbc };</div><div class='del'>-	struct btrfs_fs_info *fs_info = BTRFS_I(mapping-&gt;host)-&gt;root-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(mapping-&gt;host);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int done = 0;</div><div class='ctx'> 	int nr_to_write_done = 0;</div><div class='del'>-	struct folio_batch fbatch;</div><div class='del'>-	unsigned int nr_folios;</div><div class='del'>-	pgoff_t index;</div><div class='del'>-	pgoff_t end;		/* Inclusive */</div><div class='add'>+	struct eb_batch batch;</div><div class='add'>+	unsigned int nr_ebs;</div><div class='add'>+	unsigned long index;</div><div class='add'>+	unsigned long end;</div><div class='ctx'> 	int scanned = 0;</div><div class='ctx'> 	xa_mark_t tag;</div><div class='ctx'> </div><div class='del'>-	folio_batch_init(&amp;fbatch);</div><div class='add'>+	eb_batch_init(&amp;batch);</div><div class='ctx'> 	if (wbc-&gt;range_cyclic) {</div><div class='del'>-		index = mapping-&gt;writeback_index; /* Start from prev offset */</div><div class='add'>+		index = ((mapping-&gt;writeback_index &lt;&lt; PAGE_SHIFT) &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='ctx'> 		end = -1;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Start from the beginning does not need to cycle over the</div><div class='ctx'> 		 * range, mark it as scanned.</div><div class='ctx'> 		 */</div><div class='ctx'> 		scanned = (index == 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		index = wbc-&gt;range_start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		end = wbc-&gt;range_end &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		index = (wbc-&gt;range_start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+		end = (wbc-&gt;range_end &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+</div><div class='ctx'> 		scanned = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL)</div><div class='hunk'>@@ -1947,31 +2324,39 @@ int btree_write_cache_pages(struct address_space *mapping,</div><div class='ctx'> 	btrfs_zoned_meta_io_lock(fs_info);</div><div class='ctx'> retry:</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL)</div><div class='del'>-		tag_pages_for_writeback(mapping, index, end);</div><div class='add'>+		buffer_tree_tag_for_writeback(fs_info, index, end);</div><div class='ctx'> 	while (!done &amp;&amp; !nr_to_write_done &amp;&amp; (index &lt;= end) &amp;&amp;</div><div class='del'>-	       (nr_folios = filemap_get_folios_tag(mapping, &amp;index, end,</div><div class='del'>-					    tag, &amp;fbatch))) {</div><div class='del'>-		unsigned i;</div><div class='add'>+	       (nr_ebs = buffer_tree_get_ebs_tag(fs_info, &amp;index, end, tag, &amp;batch))) {</div><div class='add'>+		struct extent_buffer *eb;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; nr_folios; i++) {</div><div class='del'>-			struct folio *folio = fbatch.folios[i];</div><div class='add'>+		while ((eb = eb_batch_next(&amp;batch)) != NULL) {</div><div class='add'>+			ctx.eb = eb;</div><div class='ctx'> </div><div class='del'>-			ret = submit_eb_page(&amp;folio-&gt;page, &amp;ctx);</div><div class='del'>-			if (ret == 0)</div><div class='add'>+			ret = btrfs_check_meta_write_pointer(eb-&gt;fs_info, &amp;ctx);</div><div class='add'>+			if (ret) {</div><div class='add'>+				if (ret == -EBUSY)</div><div class='add'>+					ret = 0;</div><div class='add'>+</div><div class='add'>+				if (ret) {</div><div class='add'>+					done = 1;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 				continue;</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				done = 1;</div><div class='del'>-				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * the filesystem may choose to bump up nr_to_write.</div><div class='del'>-			 * We have to make sure to honor the new nr_to_write</div><div class='del'>-			 * at any time</div><div class='del'>-			 */</div><div class='del'>-			nr_to_write_done = wbc-&gt;nr_to_write &lt;= 0;</div><div class='add'>+			if (!lock_extent_buffer_for_io(eb, wbc))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Implies write in zoned mode. */</div><div class='add'>+			if (ctx.zoned_bg) {</div><div class='add'>+				/* Mark the last eb in the block group. */</div><div class='add'>+				btrfs_schedule_zone_finish_bg(ctx.zoned_bg, eb);</div><div class='add'>+				ctx.zoned_bg-&gt;meta_write_pointer += eb-&gt;len;</div><div class='add'>+			}</div><div class='add'>+			write_one_eb(eb, wbc);</div><div class='ctx'> 		}</div><div class='del'>-		folio_batch_release(&amp;fbatch);</div><div class='add'>+		nr_to_write_done = (wbc-&gt;nr_to_write &lt;= 0);</div><div class='add'>+		eb_batch_release(&amp;batch);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!scanned &amp;&amp; !done) {</div><div class='hunk'>@@ -2010,7 +2395,7 @@ retry:</div><div class='ctx'> 	 *   extent io tree. Thus we don't want to submit such wild eb</div><div class='ctx'> 	 *   if the fs already has error.</div><div class='ctx'> 	 *</div><div class='del'>-	 * We can get ret &gt; 0 from submit_extent_page() indicating how many ebs</div><div class='add'>+	 * We can get ret &gt; 0 from submit_extent_folio() indicating how many ebs</div><div class='ctx'> 	 * were submitted. Reset it to 0 to avoid false alerts for the caller.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -2097,10 +2482,7 @@ static int extent_write_cache_pages(struct address_space *mapping,</div><div class='ctx'> 			       &amp;BTRFS_I(inode)-&gt;runtime_flags))</div><div class='ctx'> 		wbc-&gt;tagged_writepages = 1;</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='del'>-		tag = PAGECACHE_TAG_TOWRITE;</div><div class='del'>-	else</div><div class='del'>-		tag = PAGECACHE_TAG_DIRTY;</div><div class='add'>+	tag = wbc_to_tag(wbc);</div><div class='ctx'> retry:</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='ctx'> 		tag_pages_for_writeback(mapping, index, end);</div><div class='hunk'>@@ -2116,10 +2498,8 @@ retry:</div><div class='ctx'> 			done_index = folio_next_index(folio);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * At this point we hold neither the i_pages lock nor</div><div class='del'>-			 * the page lock: the page may be truncated or</div><div class='del'>-			 * invalidated (changing page-&gt;mapping to NULL),</div><div class='del'>-			 * or even swizzled back from swapper_space to</div><div class='del'>-			 * tmpfs file mapping</div><div class='add'>+			 * the folio lock: the folio may be truncated or</div><div class='add'>+			 * invalidated (changing folio-&gt;mapping to NULL).</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!folio_trylock(folio)) {</div><div class='ctx'> 				submit_write_bio(bio_ctrl, 0);</div><div class='hunk'>@@ -2137,7 +2517,27 @@ retry:</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (wbc-&gt;sync_mode != WB_SYNC_NONE) {</div><div class='add'>+			/*</div><div class='add'>+			 * For subpage case, compression can lead to mixed</div><div class='add'>+			 * writeback and dirty flags, e.g:</div><div class='add'>+			 * 0     32K    64K    96K    128K</div><div class='add'>+			 * |     |//////||/////|   |//|</div><div class='add'>+			 *</div><div class='add'>+			 * In above case, [32K, 96K) is asynchronously submitted</div><div class='add'>+			 * for compression, and [124K, 128K) needs to be written back.</div><div class='add'>+			 *</div><div class='add'>+			 * If we didn't wait writeback for page 64K, [128K, 128K)</div><div class='add'>+			 * won't be submitted as the page still has writeback flag</div><div class='add'>+			 * and will be skipped in the next check.</div><div class='add'>+			 *</div><div class='add'>+			 * This mixed writeback and dirty case is only possible for</div><div class='add'>+			 * subpage case.</div><div class='add'>+			 *</div><div class='add'>+			 * TODO: Remove this check after migrating compression to</div><div class='add'>+			 * regular submission.</div><div class='add'>+			 */</div><div class='add'>+			if (wbc-&gt;sync_mode != WB_SYNC_NONE ||</div><div class='add'>+			    btrfs_is_subpage(inode_to_fs_info(inode), folio)) {</div><div class='ctx'> 				if (folio_test_writeback(folio))</div><div class='ctx'> 					submit_write_bio(bio_ctrl, 0);</div><div class='ctx'> 				folio_wait_writeback(folio);</div><div class='hunk'>@@ -2149,7 +2549,7 @@ retry:</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = __extent_writepage(&amp;folio-&gt;page, bio_ctrl);</div><div class='add'>+			ret = extent_writepage(folio, bio_ctrl);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				done = 1;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2196,14 +2596,14 @@ retry:</div><div class='ctx'>  * already been ran (aka, ordered extent inserted) and all pages are still</div><div class='ctx'>  * locked.</div><div class='ctx'>  */</div><div class='del'>-void extent_write_locked_range(struct inode *inode, struct page *locked_page,</div><div class='add'>+void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,</div><div class='ctx'> 			       u64 start, u64 end, struct writeback_control *wbc,</div><div class='ctx'> 			       bool pages_dirty)</div><div class='ctx'> {</div><div class='ctx'> 	bool found_error = false;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	loff_t i_size = i_size_read(inode);</div><div class='ctx'> 	u64 cur = start;</div><div class='hunk'>@@ -2218,46 +2618,57 @@ void extent_write_locked_range(struct inode *inode, struct page *locked_page,</div><div class='ctx'> 	ASSERT(IS_ALIGNED(start, sectorsize) &amp;&amp; IS_ALIGNED(end + 1, sectorsize));</div><div class='ctx'> </div><div class='ctx'> 	while (cur &lt;= end) {</div><div class='del'>-		u64 cur_end = min(round_down(cur, PAGE_SIZE) + PAGE_SIZE - 1, end);</div><div class='del'>-		u32 cur_len = cur_end + 1 - cur;</div><div class='del'>-		struct page *page;</div><div class='del'>-		int nr = 0;</div><div class='del'>-</div><div class='del'>-		page = find_get_page(mapping, cur &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		ASSERT(PageLocked(page));</div><div class='del'>-		if (pages_dirty &amp;&amp; page != locked_page) {</div><div class='del'>-			ASSERT(PageDirty(page));</div><div class='del'>-			clear_page_dirty_for_io(page);</div><div class='add'>+		u64 cur_end;</div><div class='add'>+		u32 cur_len;</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='add'>+		folio = filemap_get_folio(mapping, cur &gt;&gt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This shouldn't happen, the pages are pinned and locked, this</div><div class='add'>+		 * code is just in case, but shouldn't actually be run.</div><div class='add'>+		 */</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			cur_end = min(round_down(cur, PAGE_SIZE) + PAGE_SIZE - 1, end);</div><div class='add'>+			cur_len = cur_end + 1 - cur;</div><div class='add'>+			btrfs_mark_ordered_io_finished(BTRFS_I(inode), NULL,</div><div class='add'>+						       cur, cur_len, false);</div><div class='add'>+			mapping_set_error(mapping, PTR_ERR(folio));</div><div class='add'>+			cur = cur_end;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = __extent_writepage_io(BTRFS_I(inode), page, &amp;bio_ctrl,</div><div class='del'>-					    i_size, &amp;nr);</div><div class='add'>+		cur_end = min_t(u64, folio_next_pos(folio) - 1, end);</div><div class='add'>+		cur_len = cur_end + 1 - cur;</div><div class='add'>+</div><div class='add'>+		ASSERT(folio_test_locked(folio));</div><div class='add'>+		if (pages_dirty &amp;&amp; folio != locked_folio)</div><div class='add'>+			ASSERT(folio_test_dirty(folio));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set the submission bitmap to submit all sectors.</div><div class='add'>+		 * extent_writepage_io() will do the truncation correctly.</div><div class='add'>+		 */</div><div class='add'>+		bio_ctrl.submit_bitmap = (unsigned long)-1;</div><div class='add'>+		ret = extent_writepage_io(BTRFS_I(inode), folio, cur, cur_len,</div><div class='add'>+					  &amp;bio_ctrl, i_size);</div><div class='ctx'> 		if (ret == 1)</div><div class='ctx'> 			goto next_page;</div><div class='ctx'> </div><div class='del'>-		/* Make sure the mapping tag for page dirty gets cleared. */</div><div class='del'>-		if (nr == 0) {</div><div class='del'>-			set_page_writeback(page);</div><div class='del'>-			end_page_writeback(page);</div><div class='del'>-		}</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_mark_ordered_io_finished(BTRFS_I(inode), page,</div><div class='del'>-						       cur, cur_len, !ret);</div><div class='del'>-			mapping_set_error(page-&gt;mapping, ret);</div><div class='del'>-		}</div><div class='del'>-		btrfs_folio_unlock_writer(fs_info, page_folio(page), cur, cur_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			mapping_set_error(mapping, ret);</div><div class='add'>+		btrfs_folio_end_lock(fs_info, folio, cur, cur_len);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			found_error = true;</div><div class='ctx'> next_page:</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		cur = cur_end + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	submit_write_bio(&amp;bio_ctrl, found_error ? ret : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int extent_writepages(struct address_space *mapping,</div><div class='del'>-		      struct writeback_control *wbc)</div><div class='add'>+int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -2277,24 +2688,29 @@ int extent_writepages(struct address_space *mapping,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void extent_readahead(struct readahead_control *rac)</div><div class='add'>+void btrfs_readahead(struct readahead_control *rac)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_bio_ctrl bio_ctrl = { .opf = REQ_OP_READ | REQ_RAHEAD };</div><div class='del'>-	struct page *pagepool[16];</div><div class='add'>+	struct btrfs_bio_ctrl bio_ctrl = {</div><div class='add'>+		.opf = REQ_OP_READ | REQ_RAHEAD,</div><div class='add'>+		.ractl = rac,</div><div class='add'>+		.last_em_start = U64_MAX,</div><div class='add'>+	};</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(rac-&gt;mapping-&gt;host);</div><div class='add'>+	const u64 start = readahead_pos(rac);</div><div class='add'>+	const u64 end = start + readahead_length(rac) - 1;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	struct extent_map *em_cached = NULL;</div><div class='del'>-	u64 prev_em_start = (u64)-1;</div><div class='del'>-	int nr;</div><div class='ctx'> </div><div class='del'>-	while ((nr = readahead_page_batch(rac, pagepool))) {</div><div class='del'>-		u64 contig_start = readahead_pos(rac);</div><div class='del'>-		u64 contig_end = contig_start + readahead_batch_length(rac) - 1;</div><div class='add'>+	lock_extents_for_read(inode, start, end, &amp;cached_state);</div><div class='ctx'> </div><div class='del'>-		contiguous_readpages(pagepool, nr, contig_start, contig_end,</div><div class='del'>-				&amp;em_cached, &amp;bio_ctrl, &amp;prev_em_start);</div><div class='del'>-	}</div><div class='add'>+	while ((folio = readahead_folio(rac)) != NULL)</div><div class='add'>+		btrfs_do_readpage(folio, &amp;em_cached, &amp;bio_ctrl);</div><div class='add'>+</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	if (em_cached)</div><div class='del'>-		free_extent_map(em_cached);</div><div class='add'>+		btrfs_free_extent_map(em_cached);</div><div class='ctx'> 	submit_one_bio(&amp;bio_ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2309,7 +2725,7 @@ int extent_invalidate_folio(struct extent_io_tree *tree,</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 start = folio_pos(folio);</div><div class='ctx'> 	u64 end = start + folio_size(folio) - 1;</div><div class='del'>-	size_t blocksize = folio-&gt;mapping-&gt;host-&gt;i_sb-&gt;s_blocksize;</div><div class='add'>+	size_t blocksize = folio_to_fs_info(folio)-&gt;sectorsize;</div><div class='ctx'> </div><div class='ctx'> 	/* This function is only called for the btree inode */</div><div class='ctx'> 	ASSERT(tree-&gt;owner == IO_TREE_BTREE_INODE_IO);</div><div class='hunk'>@@ -2318,7 +2734,7 @@ int extent_invalidate_folio(struct extent_io_tree *tree,</div><div class='ctx'> 	if (start &gt; end)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	lock_extent(tree, start, end, &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(tree, start, end, &amp;cached_state);</div><div class='ctx'> 	folio_wait_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2326,774 +2742,137 @@ int extent_invalidate_folio(struct extent_io_tree *tree,</div><div class='ctx'> 	 * so here we only need to unlock the extent range to free any</div><div class='ctx'> 	 * existing extent state.</div><div class='ctx'> 	 */</div><div class='del'>-	unlock_extent(tree, start, end, &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(tree, start, end, &amp;cached_state);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * a helper for release_folio, this tests for areas of the page that</div><div class='del'>- * are locked or under IO and drops the related state bits if it is safe</div><div class='del'>- * to drop the page.</div><div class='del'>- */</div><div class='del'>-static int try_release_extent_state(struct extent_io_tree *tree,</div><div class='del'>-				    struct page *page, gfp_t mask)</div><div class='del'>-{</div><div class='del'>-	u64 start = page_offset(page);</div><div class='del'>-	u64 end = start + PAGE_SIZE - 1;</div><div class='del'>-	int ret = 1;</div><div class='del'>-</div><div class='del'>-	if (test_range_bit_exists(tree, start, end, EXTENT_LOCKED)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else {</div><div class='del'>-		u32 clear_bits = ~(EXTENT_LOCKED | EXTENT_NODATASUM |</div><div class='del'>-				   EXTENT_DELALLOC_NEW | EXTENT_CTLBITS |</div><div class='del'>-				   EXTENT_QGROUP_RESERVED);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * At this point we can safely clear everything except the</div><div class='del'>-		 * locked bit, the nodatasum bit and the delalloc new bit.</div><div class='del'>-		 * The delalloc new bit will be cleared by ordered extent</div><div class='del'>-		 * completion.</div><div class='del'>-		 */</div><div class='del'>-		ret = __clear_extent_bit(tree, start, end, clear_bits, NULL, NULL);</div><div class='del'>-</div><div class='del'>-		/* if clear_extent_bit failed for enomem reasons,</div><div class='del'>-		 * we can't allow the release to continue.</div><div class='del'>-		 */</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			ret = 0;</div><div class='del'>-		else</div><div class='del'>-			ret = 1;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * a helper for release_folio.  As long as there are no locked extents</div><div class='del'>- * in the range corresponding to the page, both state records and extent</div><div class='del'>- * map records are removed</div><div class='add'>+ * A helper for struct address_space_operations::release_folio, this tests for</div><div class='add'>+ * areas of the folio that are locked or under IO and drops the related state</div><div class='add'>+ * bits if it is safe to drop the folio.</div><div class='ctx'>  */</div><div class='del'>-int try_release_extent_mapping(struct page *page, gfp_t mask)</div><div class='add'>+static bool try_release_extent_state(struct extent_io_tree *tree,</div><div class='add'>+				     struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct extent_map *em;</div><div class='del'>-	u64 start = page_offset(page);</div><div class='del'>-	u64 end = start + PAGE_SIZE - 1;</div><div class='del'>-	struct btrfs_inode *btrfs_inode = BTRFS_I(page-&gt;mapping-&gt;host);</div><div class='del'>-	struct extent_io_tree *tree = &amp;btrfs_inode-&gt;io_tree;</div><div class='del'>-	struct extent_map_tree *map = &amp;btrfs_inode-&gt;extent_tree;</div><div class='del'>-</div><div class='del'>-	if (gfpflags_allow_blocking(mask) &amp;&amp;</div><div class='del'>-	    page-&gt;mapping-&gt;host-&gt;i_size &gt; SZ_16M) {</div><div class='del'>-		u64 len;</div><div class='del'>-		while (start &lt;= end) {</div><div class='del'>-			struct btrfs_fs_info *fs_info;</div><div class='del'>-			u64 cur_gen;</div><div class='del'>-</div><div class='del'>-			len = end - start + 1;</div><div class='del'>-			write_lock(&amp;map-&gt;lock);</div><div class='del'>-			em = lookup_extent_mapping(map, start, len);</div><div class='del'>-			if (!em) {</div><div class='del'>-				write_unlock(&amp;map-&gt;lock);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if ((em-&gt;flags &amp; EXTENT_FLAG_PINNED) ||</div><div class='del'>-			    em-&gt;start != start) {</div><div class='del'>-				write_unlock(&amp;map-&gt;lock);</div><div class='del'>-				free_extent_map(em);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (test_range_bit_exists(tree, em-&gt;start,</div><div class='del'>-						  extent_map_end(em) - 1,</div><div class='del'>-						  EXTENT_LOCKED))</div><div class='del'>-				goto next;</div><div class='del'>-			/*</div><div class='del'>-			 * If it's not in the list of modified extents, used</div><div class='del'>-			 * by a fast fsync, we can remove it. If it's being</div><div class='del'>-			 * logged we can safely remove it since fsync took an</div><div class='del'>-			 * extra reference on the em.</div><div class='del'>-			 */</div><div class='del'>-			if (list_empty(&amp;em-&gt;list) ||</div><div class='del'>-			    (em-&gt;flags &amp; EXTENT_FLAG_LOGGING))</div><div class='del'>-				goto remove_em;</div><div class='del'>-			/*</div><div class='del'>-			 * If it's in the list of modified extents, remove it</div><div class='del'>-			 * only if its generation is older then the current one,</div><div class='del'>-			 * in which case we don't need it for a fast fsync.</div><div class='del'>-			 * Otherwise don't remove it, we could be racing with an</div><div class='del'>-			 * ongoing fast fsync that could miss the new extent.</div><div class='del'>-			 */</div><div class='del'>-			fs_info = btrfs_inode-&gt;root-&gt;fs_info;</div><div class='del'>-			spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='del'>-			cur_gen = fs_info-&gt;generation;</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='del'>-			if (em-&gt;generation &gt;= cur_gen)</div><div class='del'>-				goto next;</div><div class='del'>-remove_em:</div><div class='del'>-			/*</div><div class='del'>-			 * We only remove extent maps that are not in the list of</div><div class='del'>-			 * modified extents or that are in the list but with a</div><div class='del'>-			 * generation lower then the current generation, so there</div><div class='del'>-			 * is no need to set the full fsync flag on the inode (it</div><div class='del'>-			 * hurts the fsync performance for workloads with a data</div><div class='del'>-			 * size that exceeds or is close to the system's memory).</div><div class='del'>-			 */</div><div class='del'>-			remove_extent_mapping(map, em);</div><div class='del'>-			/* once for the rb tree */</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-next:</div><div class='del'>-			start = extent_map_end(em);</div><div class='del'>-			write_unlock(&amp;map-&gt;lock);</div><div class='del'>-</div><div class='del'>-			/* once for us */</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-</div><div class='del'>-			cond_resched(); /* Allow large-extent preemption. */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return try_release_extent_state(tree, page, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * To cache previous fiemap extent</div><div class='del'>- *</div><div class='del'>- * Will be used for merging fiemap extent</div><div class='del'>- */</div><div class='del'>-struct fiemap_cache {</div><div class='del'>-	u64 offset;</div><div class='del'>-	u64 phys;</div><div class='del'>-	u64 len;</div><div class='del'>-	u32 flags;</div><div class='del'>-	bool cached;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Helper to submit fiemap extent.</div><div class='del'>- *</div><div class='del'>- * Will try to merge current fiemap extent specified by @offset, @phys,</div><div class='del'>- * @len and @flags with cached one.</div><div class='del'>- * And only when we fails to merge, cached one will be submitted as</div><div class='del'>- * fiemap extent.</div><div class='del'>- *</div><div class='del'>- * Return value is the same as fiemap_fill_next_extent().</div><div class='del'>- */</div><div class='del'>-static int emit_fiemap_extent(struct fiemap_extent_info *fieinfo,</div><div class='del'>-				struct fiemap_cache *cache,</div><div class='del'>-				u64 offset, u64 phys, u64 len, u32 flags)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* Set at the end of extent_fiemap(). */</div><div class='del'>-	ASSERT((flags &amp; FIEMAP_EXTENT_LAST) == 0);</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	u64 start = folio_pos(folio);</div><div class='add'>+	u64 end = start + folio_size(folio) - 1;</div><div class='add'>+	u32 range_bits;</div><div class='add'>+	u32 clear_bits;</div><div class='add'>+	bool ret = false;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='del'>-	if (!cache-&gt;cached)</div><div class='del'>-		goto assign;</div><div class='add'>+	btrfs_get_range_bits(tree, start, end, &amp;range_bits, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Sanity check, extent_fiemap() should have ensured that new</div><div class='del'>-	 * fiemap extent won't overlap with cached one.</div><div class='del'>-	 * Not recoverable.</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE: Physical address can overlap, due to compression</div><div class='add'>+	 * We can release the folio if it's locked only for ordered extent</div><div class='add'>+	 * completion, since that doesn't require using the folio.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cache-&gt;offset + cache-&gt;len &gt; offset) {</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Only merges fiemap extents if</div><div class='del'>-	 * 1) Their logical addresses are continuous</div><div class='del'>-	 *</div><div class='del'>-	 * 2) Their physical addresses are continuous</div><div class='del'>-	 *    So truly compressed (physical size smaller than logical size)</div><div class='del'>-	 *    extents won't get merged with each other</div><div class='del'>-	 *</div><div class='del'>-	 * 3) Share same flags</div><div class='del'>-	 */</div><div class='del'>-	if (cache-&gt;offset + cache-&gt;len  == offset &amp;&amp;</div><div class='del'>-	    cache-&gt;phys + cache-&gt;len == phys  &amp;&amp;</div><div class='del'>-	    cache-&gt;flags == flags) {</div><div class='del'>-		cache-&gt;len += len;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Not mergeable, need to submit cached one */</div><div class='del'>-	ret = fiemap_fill_next_extent(fieinfo, cache-&gt;offset, cache-&gt;phys,</div><div class='del'>-				      cache-&gt;len, cache-&gt;flags);</div><div class='del'>-	cache-&gt;cached = false;</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-assign:</div><div class='del'>-	cache-&gt;cached = true;</div><div class='del'>-	cache-&gt;offset = offset;</div><div class='del'>-	cache-&gt;phys = phys;</div><div class='del'>-	cache-&gt;len = len;</div><div class='del'>-	cache-&gt;flags = flags;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Emit last fiemap cache</div><div class='del'>- *</div><div class='del'>- * The last fiemap cache may still be cached in the following case:</div><div class='del'>- * 0		      4k		    8k</div><div class='del'>- * |&lt;- Fiemap range -&gt;|</div><div class='del'>- * |&lt;------------  First extent -----------&gt;|</div><div class='del'>- *</div><div class='del'>- * In this case, the first extent range will be cached but not emitted.</div><div class='del'>- * So we must emit it before ending extent_fiemap().</div><div class='del'>- */</div><div class='del'>-static int emit_last_fiemap_cache(struct fiemap_extent_info *fieinfo,</div><div class='del'>-				  struct fiemap_cache *cache)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!cache-&gt;cached)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = fiemap_fill_next_extent(fieinfo, cache-&gt;offset, cache-&gt;phys,</div><div class='del'>-				      cache-&gt;len, cache-&gt;flags);</div><div class='del'>-	cache-&gt;cached = false;</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		ret = 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fiemap_next_leaf_item(struct btrfs_inode *inode, struct btrfs_path *path)</div><div class='del'>-{</div><div class='del'>-	struct extent_buffer *clone;</div><div class='del'>-	struct btrfs_key key;</div><div class='del'>-	int slot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	path-&gt;slots[0]++;</div><div class='del'>-	if (path-&gt;slots[0] &lt; btrfs_header_nritems(path-&gt;nodes[0]))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = btrfs_next_leaf(inode-&gt;root, path);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return ret;</div><div class='add'>+	if ((range_bits &amp; EXTENT_LOCKED) &amp;&amp;</div><div class='add'>+	    !(range_bits &amp; EXTENT_FINISHING_ORDERED))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='add'>+	clear_bits = ~(EXTENT_LOCKED | EXTENT_NODATASUM | EXTENT_DELALLOC_NEW |</div><div class='add'>+		       EXTENT_CTLBITS | EXTENT_QGROUP_RESERVED |</div><div class='add'>+		       EXTENT_FINISHING_ORDERED);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Don't bother with cloning if there are no more file extent items for</div><div class='del'>-	 * our inode.</div><div class='add'>+	 * At this point we can safely clear everything except the locked,</div><div class='add'>+	 * nodatasum, delalloc new and finishing ordered bits. The delalloc new</div><div class='add'>+	 * bit will be cleared by ordered extent completion.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='del'>-	if (key.objectid != btrfs_ino(inode) || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* See the comment at fiemap_search_slot() about why we clone. */</div><div class='del'>-	clone = btrfs_clone_extent_buffer(path-&gt;nodes[0]);</div><div class='del'>-	if (!clone)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	slot = path-&gt;slots[0];</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	path-&gt;nodes[0] = clone;</div><div class='del'>-	path-&gt;slots[0] = slot;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Search for the first file extent item that starts at a given file offset or</div><div class='del'>- * the one that starts immediately before that offset.</div><div class='del'>- * Returns: 0 on success, &lt; 0 on error, 1 if not found.</div><div class='del'>- */</div><div class='del'>-static int fiemap_search_slot(struct btrfs_inode *inode, struct btrfs_path *path,</div><div class='del'>-			      u64 file_offset)</div><div class='del'>-{</div><div class='del'>-	const u64 ino = btrfs_ino(inode);</div><div class='del'>-	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	struct extent_buffer *clone;</div><div class='del'>-	struct btrfs_key key;</div><div class='del'>-	int slot;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	key.objectid = ino;</div><div class='del'>-	key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='del'>-	key.offset = file_offset;</div><div class='del'>-</div><div class='del'>-	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ret &gt; 0 &amp;&amp; path-&gt;slots[0] &gt; 0) {</div><div class='del'>-		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0] - 1);</div><div class='del'>-		if (key.objectid == ino &amp;&amp; key.type == BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-			path-&gt;slots[0]--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (path-&gt;slots[0] &gt;= btrfs_header_nritems(path-&gt;nodes[0])) {</div><div class='del'>-		ret = btrfs_next_leaf(root, path);</div><div class='del'>-		if (ret != 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='del'>-		if (key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	ret2 = btrfs_clear_extent_bit(tree, start, end, clear_bits, &amp;cached_state);</div><div class='ctx'> 	/*</div><div class='del'>-	 * We clone the leaf and use it during fiemap. This is because while</div><div class='del'>-	 * using the leaf we do expensive things like checking if an extent is</div><div class='del'>-	 * shared, which can take a long time. In order to prevent blocking</div><div class='del'>-	 * other tasks for too long, we use a clone of the leaf. We have locked</div><div class='del'>-	 * the file range in the inode's io tree, so we know none of our file</div><div class='del'>-	 * extent items can change. This way we avoid blocking other tasks that</div><div class='del'>-	 * want to insert items for other inodes in the same leaf or b+tree</div><div class='del'>-	 * rebalance operations (triggered for example when someone is trying</div><div class='del'>-	 * to push items into this leaf when trying to insert an item in a</div><div class='del'>-	 * neighbour leaf).</div><div class='del'>-	 * We also need the private clone because holding a read lock on an</div><div class='del'>-	 * extent buffer of the subvolume's b+tree will make lockdep unhappy</div><div class='del'>-	 * when we call fiemap_fill_next_extent(), because that may cause a page</div><div class='del'>-	 * fault when filling the user space buffer with fiemap data.</div><div class='add'>+	 * If clear_extent_bit failed for enomem reasons, we can't allow the</div><div class='add'>+	 * release to continue.</div><div class='ctx'> 	 */</div><div class='del'>-	clone = btrfs_clone_extent_buffer(path-&gt;nodes[0]);</div><div class='del'>-	if (!clone)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	slot = path-&gt;slots[0];</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	path-&gt;nodes[0] = clone;</div><div class='del'>-	path-&gt;slots[0] = slot;</div><div class='add'>+	if (ret2 == 0)</div><div class='add'>+		ret = true;</div><div class='add'>+out:</div><div class='add'>+	btrfs_free_extent_state(cached_state);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Process a range which is a hole or a prealloc extent in the inode's subvolume</div><div class='del'>- * btree. If @disk_bytenr is 0, we are dealing with a hole, otherwise a prealloc</div><div class='del'>- * extent. The end offset (@end) is inclusive.</div><div class='add'>+ * a helper for release_folio.  As long as there are no locked extents</div><div class='add'>+ * in the range corresponding to the page, both state records and extent</div><div class='add'>+ * map records are removed</div><div class='ctx'>  */</div><div class='del'>-static int fiemap_process_hole(struct btrfs_inode *inode,</div><div class='del'>-			       struct fiemap_extent_info *fieinfo,</div><div class='del'>-			       struct fiemap_cache *cache,</div><div class='del'>-			       struct extent_state **delalloc_cached_state,</div><div class='del'>-			       struct btrfs_backref_share_check_ctx *backref_ctx,</div><div class='del'>-			       u64 disk_bytenr, u64 extent_offset,</div><div class='del'>-			       u64 extent_gen,</div><div class='del'>-			       u64 start, u64 end)</div><div class='add'>+bool try_release_extent_mapping(struct folio *folio, gfp_t mask)</div><div class='ctx'> {</div><div class='del'>-	const u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='del'>-	u64 cur_offset = start;</div><div class='del'>-	u64 last_delalloc_end = 0;</div><div class='del'>-	u32 prealloc_flags = FIEMAP_EXTENT_UNWRITTEN;</div><div class='del'>-	bool checked_extent_shared = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * There can be no delalloc past i_size, so don't waste time looking for</div><div class='del'>-	 * it beyond i_size.</div><div class='del'>-	 */</div><div class='del'>-	while (cur_offset &lt; end &amp;&amp; cur_offset &lt; i_size) {</div><div class='del'>-		u64 delalloc_start;</div><div class='del'>-		u64 delalloc_end;</div><div class='del'>-		u64 prealloc_start;</div><div class='del'>-		u64 prealloc_len = 0;</div><div class='del'>-		bool delalloc;</div><div class='del'>-</div><div class='del'>-		delalloc = btrfs_find_delalloc_in_range(inode, cur_offset, end,</div><div class='del'>-							delalloc_cached_state,</div><div class='del'>-							&amp;delalloc_start,</div><div class='del'>-							&amp;delalloc_end);</div><div class='del'>-		if (!delalloc)</div><div class='add'>+	u64 start = folio_pos(folio);</div><div class='add'>+	u64 end = start + folio_size(folio) - 1;</div><div class='add'>+	struct btrfs_inode *inode = folio_to_inode(folio);</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='add'>+</div><div class='add'>+	while (start &lt;= end) {</div><div class='add'>+		const u64 cur_gen = btrfs_get_fs_generation(inode-&gt;root-&gt;fs_info);</div><div class='add'>+		const u64 len = end - start + 1;</div><div class='add'>+		struct extent_map_tree *extent_tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+		struct extent_map *em;</div><div class='add'>+</div><div class='add'>+		write_lock(&amp;extent_tree-&gt;lock);</div><div class='add'>+		em = btrfs_lookup_extent_mapping(extent_tree, start, len);</div><div class='add'>+		if (!em) {</div><div class='add'>+			write_unlock(&amp;extent_tree-&gt;lock);</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If this is a prealloc extent we have to report every section</div><div class='del'>-		 * of it that has no delalloc.</div><div class='del'>-		 */</div><div class='del'>-		if (disk_bytenr != 0) {</div><div class='del'>-			if (last_delalloc_end == 0) {</div><div class='del'>-				prealloc_start = start;</div><div class='del'>-				prealloc_len = delalloc_start - start;</div><div class='del'>-			} else {</div><div class='del'>-				prealloc_start = last_delalloc_end + 1;</div><div class='del'>-				prealloc_len = delalloc_start - prealloc_start;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (prealloc_len &gt; 0) {</div><div class='del'>-			if (!checked_extent_shared &amp;&amp; fieinfo-&gt;fi_extents_max) {</div><div class='del'>-				ret = btrfs_is_data_extent_shared(inode,</div><div class='del'>-								  disk_bytenr,</div><div class='del'>-								  extent_gen,</div><div class='del'>-								  backref_ctx);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					return ret;</div><div class='del'>-				else if (ret &gt; 0)</div><div class='del'>-					prealloc_flags |= FIEMAP_EXTENT_SHARED;</div><div class='del'>-</div><div class='del'>-				checked_extent_shared = true;</div><div class='del'>-			}</div><div class='del'>-			ret = emit_fiemap_extent(fieinfo, cache, prealloc_start,</div><div class='del'>-						 disk_bytenr + extent_offset,</div><div class='del'>-						 prealloc_len, prealloc_flags);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			extent_offset += prealloc_len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = emit_fiemap_extent(fieinfo, cache, delalloc_start, 0,</div><div class='del'>-					 delalloc_end + 1 - delalloc_start,</div><div class='del'>-					 FIEMAP_EXTENT_DELALLOC |</div><div class='del'>-					 FIEMAP_EXTENT_UNKNOWN);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		last_delalloc_end = delalloc_end;</div><div class='del'>-		cur_offset = delalloc_end + 1;</div><div class='del'>-		extent_offset += cur_offset - delalloc_start;</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Either we found no delalloc for the whole prealloc extent or we have</div><div class='del'>-	 * a prealloc extent that spans i_size or starts at or after i_size.</div><div class='del'>-	 */</div><div class='del'>-	if (disk_bytenr != 0 &amp;&amp; last_delalloc_end &lt; end) {</div><div class='del'>-		u64 prealloc_start;</div><div class='del'>-		u64 prealloc_len;</div><div class='del'>-</div><div class='del'>-		if (last_delalloc_end == 0) {</div><div class='del'>-			prealloc_start = start;</div><div class='del'>-			prealloc_len = end + 1 - start;</div><div class='del'>-		} else {</div><div class='del'>-			prealloc_start = last_delalloc_end + 1;</div><div class='del'>-			prealloc_len = end + 1 - prealloc_start;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!checked_extent_shared &amp;&amp; fieinfo-&gt;fi_extents_max) {</div><div class='del'>-			ret = btrfs_is_data_extent_shared(inode,</div><div class='del'>-							  disk_bytenr,</div><div class='del'>-							  extent_gen,</div><div class='del'>-							  backref_ctx);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			else if (ret &gt; 0)</div><div class='del'>-				prealloc_flags |= FIEMAP_EXTENT_SHARED;</div><div class='ctx'> 		}</div><div class='del'>-		ret = emit_fiemap_extent(fieinfo, cache, prealloc_start,</div><div class='del'>-					 disk_bytenr + extent_offset,</div><div class='del'>-					 prealloc_len, prealloc_flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fiemap_find_last_extent_offset(struct btrfs_inode *inode,</div><div class='del'>-					  struct btrfs_path *path,</div><div class='del'>-					  u64 *last_extent_end_ret)</div><div class='del'>-{</div><div class='del'>-	const u64 ino = btrfs_ino(inode);</div><div class='del'>-	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_file_extent_item *ei;</div><div class='del'>-	struct btrfs_key key;</div><div class='del'>-	u64 disk_bytenr;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Lookup the last file extent. We're not using i_size here because</div><div class='del'>-	 * there might be preallocation past i_size.</div><div class='del'>-	 */</div><div class='del'>-	ret = btrfs_lookup_file_extent(NULL, root, path, ino, (u64)-1, 0);</div><div class='del'>-	/* There can't be a file extent item at offset (u64)-1 */</div><div class='del'>-	ASSERT(ret != 0);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For a non-existing key, btrfs_search_slot() always leaves us at a</div><div class='del'>-	 * slot &gt; 0, except if the btree is empty, which is impossible because</div><div class='del'>-	 * at least it has the inode item for this inode and all the items for</div><div class='del'>-	 * the root inode 256.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT(path-&gt;slots[0] &gt; 0);</div><div class='del'>-	path-&gt;slots[0]--;</div><div class='del'>-	leaf = path-&gt;nodes[0];</div><div class='del'>-	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='del'>-	if (key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY) {</div><div class='del'>-		/* No file extent items in the subvolume tree. */</div><div class='del'>-		*last_extent_end_ret = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For an inline extent, the disk_bytenr is where inline data starts at,</div><div class='del'>-	 * so first check if we have an inline extent item before checking if we</div><div class='del'>-	 * have an implicit hole (disk_bytenr == 0).</div><div class='del'>-	 */</div><div class='del'>-	ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='del'>-	if (btrfs_file_extent_type(leaf, ei) == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-		*last_extent_end_ret = btrfs_file_extent_end(path);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Find the last file extent item that is not a hole (when NO_HOLES is</div><div class='del'>-	 * not enabled). This should take at most 2 iterations in the worst</div><div class='del'>-	 * case: we have one hole file extent item at slot 0 of a leaf and</div><div class='del'>-	 * another hole file extent item as the last item in the previous leaf.</div><div class='del'>-	 * This is because we merge file extent items that represent holes.</div><div class='del'>-	 */</div><div class='del'>-	disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='del'>-	while (disk_bytenr == 0) {</div><div class='del'>-		ret = btrfs_previous_item(root, path, ino, BTRFS_EXTENT_DATA_KEY);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			return ret;</div><div class='del'>-		} else if (ret &gt; 0) {</div><div class='del'>-			/* No file extent items that are not holes. */</div><div class='del'>-			*last_extent_end_ret = 0;</div><div class='del'>-			return 0;</div><div class='add'>+		if ((em-&gt;flags &amp; EXTENT_FLAG_PINNED) || em-&gt;start != start) {</div><div class='add'>+			write_unlock(&amp;extent_tree-&gt;lock);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		leaf = path-&gt;nodes[0];</div><div class='del'>-		ei = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='del'>-				    struct btrfs_file_extent_item);</div><div class='del'>-		disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*last_extent_end_ret = btrfs_file_extent_end(path);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int extent_fiemap(struct btrfs_inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='del'>-		  u64 start, u64 len)</div><div class='del'>-{</div><div class='del'>-	const u64 ino = btrfs_ino(inode);</div><div class='del'>-	struct extent_state *cached_state = NULL;</div><div class='del'>-	struct extent_state *delalloc_cached_state = NULL;</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	struct fiemap_cache cache = { 0 };</div><div class='del'>-	struct btrfs_backref_share_check_ctx *backref_ctx;</div><div class='del'>-	u64 last_extent_end;</div><div class='del'>-	u64 prev_extent_end;</div><div class='del'>-	u64 lockstart;</div><div class='del'>-	u64 lockend;</div><div class='del'>-	bool stopped = false;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	backref_ctx = btrfs_alloc_backref_share_check_ctx();</div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!backref_ctx || !path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lockstart = round_down(start, inode-&gt;root-&gt;fs_info-&gt;sectorsize);</div><div class='del'>-	lockend = round_up(start + len, inode-&gt;root-&gt;fs_info-&gt;sectorsize);</div><div class='del'>-	prev_extent_end = lockstart;</div><div class='del'>-</div><div class='del'>-	btrfs_inode_lock(inode, BTRFS_ILOCK_SHARED);</div><div class='del'>-	lock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='del'>-</div><div class='del'>-	ret = fiemap_find_last_extent_offset(inode, path, &amp;last_extent_end);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-</div><div class='del'>-	path-&gt;reada = READA_FORWARD;</div><div class='del'>-	ret = fiemap_search_slot(inode, path, lockstart);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	} else if (ret &gt; 0) {</div><div class='add'>+		if (btrfs_test_range_bit_exists(io_tree, em-&gt;start,</div><div class='add'>+						btrfs_extent_map_end(em) - 1,</div><div class='add'>+						EXTENT_LOCKED))</div><div class='add'>+			goto next;</div><div class='ctx'> 		/*</div><div class='del'>-		 * No file extent item found, but we may have delalloc between</div><div class='del'>-		 * the current offset and i_size. So check for that.</div><div class='add'>+		 * If it's not in the list of modified extents, used by a fast</div><div class='add'>+		 * fsync, we can remove it. If it's being logged we can safely</div><div class='add'>+		 * remove it since fsync took an extra reference on the em.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto check_eof_delalloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (prev_extent_end &lt; lockend) {</div><div class='del'>-		struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='del'>-		struct btrfs_file_extent_item *ei;</div><div class='del'>-		struct btrfs_key key;</div><div class='del'>-		u64 extent_end;</div><div class='del'>-		u64 extent_len;</div><div class='del'>-		u64 extent_offset = 0;</div><div class='del'>-		u64 extent_gen;</div><div class='del'>-		u64 disk_bytenr = 0;</div><div class='del'>-		u64 flags = 0;</div><div class='del'>-		int extent_type;</div><div class='del'>-		u8 compression;</div><div class='del'>-</div><div class='del'>-		btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='del'>-		if (key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		extent_end = btrfs_file_extent_end(path);</div><div class='del'>-</div><div class='add'>+		if (list_empty(&amp;em-&gt;list) || (em-&gt;flags &amp; EXTENT_FLAG_LOGGING))</div><div class='add'>+			goto remove_em;</div><div class='ctx'> 		/*</div><div class='del'>-		 * The first iteration can leave us at an extent item that ends</div><div class='del'>-		 * before our range's start. Move to the next item.</div><div class='add'>+		 * If it's in the list of modified extents, remove it only if</div><div class='add'>+		 * its generation is older then the current one, in which case</div><div class='add'>+		 * we don't need it for a fast fsync. Otherwise don't remove it,</div><div class='add'>+		 * we could be racing with an ongoing fast fsync that could miss</div><div class='add'>+		 * the new extent.</div><div class='ctx'> 		 */</div><div class='del'>-		if (extent_end &lt;= lockstart)</div><div class='del'>-			goto next_item;</div><div class='del'>-</div><div class='del'>-		backref_ctx-&gt;curr_leaf_bytenr = leaf-&gt;start;</div><div class='del'>-</div><div class='del'>-		/* We have in implicit hole (NO_HOLES feature enabled). */</div><div class='del'>-		if (prev_extent_end &lt; key.offset) {</div><div class='del'>-			const u64 range_end = min(key.offset, lockend) - 1;</div><div class='add'>+		if (em-&gt;generation &gt;= cur_gen)</div><div class='add'>+			goto next;</div><div class='add'>+remove_em:</div><div class='add'>+		/*</div><div class='add'>+		 * We only remove extent maps that are not in the list of</div><div class='add'>+		 * modified extents or that are in the list but with a</div><div class='add'>+		 * generation lower then the current generation, so there is no</div><div class='add'>+		 * need to set the full fsync flag on the inode (it hurts the</div><div class='add'>+		 * fsync performance for workloads with a data size that exceeds</div><div class='add'>+		 * or is close to the system's memory).</div><div class='add'>+		 */</div><div class='add'>+		btrfs_remove_extent_mapping(inode, em);</div><div class='add'>+		/* Once for the inode's extent map tree. */</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+next:</div><div class='add'>+		start = btrfs_extent_map_end(em);</div><div class='add'>+		write_unlock(&amp;extent_tree-&gt;lock);</div><div class='ctx'> </div><div class='del'>-			ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='del'>-						  &amp;delalloc_cached_state,</div><div class='del'>-						  backref_ctx, 0, 0, 0,</div><div class='del'>-						  prev_extent_end, range_end);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			} else if (ret &gt; 0) {</div><div class='del'>-				/* fiemap_fill_next_extent() told us to stop. */</div><div class='del'>-				stopped = true;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		/* Once for us, for the lookup_extent_mapping() reference. */</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-			/* We've reached the end of the fiemap range, stop. */</div><div class='del'>-			if (key.offset &gt;= lockend) {</div><div class='del'>-				stopped = true;</div><div class='add'>+		if (need_resched()) {</div><div class='add'>+			/*</div><div class='add'>+			 * If we need to resched but we can't block just exit</div><div class='add'>+			 * and leave any remaining extent maps.</div><div class='add'>+			 */</div><div class='add'>+			if (!gfpflags_allow_blocking(mask))</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		extent_len = extent_end - key.offset;</div><div class='del'>-		ei = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='del'>-				    struct btrfs_file_extent_item);</div><div class='del'>-		compression = btrfs_file_extent_compression(leaf, ei);</div><div class='del'>-		extent_type = btrfs_file_extent_type(leaf, ei);</div><div class='del'>-		extent_gen = btrfs_file_extent_generation(leaf, ei);</div><div class='del'>-</div><div class='del'>-		if (extent_type != BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-			disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='del'>-			if (compression == BTRFS_COMPRESS_NONE)</div><div class='del'>-				extent_offset = btrfs_file_extent_offset(leaf, ei);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (compression != BTRFS_COMPRESS_NONE)</div><div class='del'>-			flags |= FIEMAP_EXTENT_ENCODED;</div><div class='del'>-</div><div class='del'>-		if (extent_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-			flags |= FIEMAP_EXTENT_DATA_INLINE;</div><div class='del'>-			flags |= FIEMAP_EXTENT_NOT_ALIGNED;</div><div class='del'>-			ret = emit_fiemap_extent(fieinfo, &amp;cache, key.offset, 0,</div><div class='del'>-						 extent_len, flags);</div><div class='del'>-		} else if (extent_type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='del'>-			ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='del'>-						  &amp;delalloc_cached_state,</div><div class='del'>-						  backref_ctx,</div><div class='del'>-						  disk_bytenr, extent_offset,</div><div class='del'>-						  extent_gen, key.offset,</div><div class='del'>-						  extent_end - 1);</div><div class='del'>-		} else if (disk_bytenr == 0) {</div><div class='del'>-			/* We have an explicit hole. */</div><div class='del'>-			ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='del'>-						  &amp;delalloc_cached_state,</div><div class='del'>-						  backref_ctx, 0, 0, 0,</div><div class='del'>-						  key.offset, extent_end - 1);</div><div class='del'>-		} else {</div><div class='del'>-			/* We have a regular extent. */</div><div class='del'>-			if (fieinfo-&gt;fi_extents_max) {</div><div class='del'>-				ret = btrfs_is_data_extent_shared(inode,</div><div class='del'>-								  disk_bytenr,</div><div class='del'>-								  extent_gen,</div><div class='del'>-								  backref_ctx);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					goto out_unlock;</div><div class='del'>-				else if (ret &gt; 0)</div><div class='del'>-					flags |= FIEMAP_EXTENT_SHARED;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ret = emit_fiemap_extent(fieinfo, &amp;cache, key.offset,</div><div class='del'>-						 disk_bytenr + extent_offset,</div><div class='del'>-						 extent_len, flags);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		} else if (ret &gt; 0) {</div><div class='del'>-			/* fiemap_fill_next_extent() told us to stop. */</div><div class='del'>-			stopped = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev_extent_end = extent_end;</div><div class='del'>-next_item:</div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='del'>-			ret = -EINTR;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = fiemap_next_leaf_item(inode, path);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		} else if (ret &gt; 0) {</div><div class='del'>-			/* No more file extent items for this inode. */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-check_eof_delalloc:</div><div class='del'>-	/*</div><div class='del'>-	 * Release (and free) the path before emitting any final entries to</div><div class='del'>-	 * fiemap_fill_next_extent() to keep lockdep happy. This is because</div><div class='del'>-	 * once we find no more file extent items exist, we may have a</div><div class='del'>-	 * non-cloned leaf, and fiemap_fill_next_extent() can trigger page</div><div class='del'>-	 * faults when copying data to the user space buffer.</div><div class='del'>-	 */</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	path = NULL;</div><div class='del'>-</div><div class='del'>-	if (!stopped &amp;&amp; prev_extent_end &lt; lockend) {</div><div class='del'>-		ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='del'>-					  &amp;delalloc_cached_state, backref_ctx,</div><div class='del'>-					  0, 0, 0, prev_extent_end, lockend - 1);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		prev_extent_end = lockend;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cache.cached &amp;&amp; cache.offset + cache.len &gt;= last_extent_end) {</div><div class='del'>-		const u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='del'>-</div><div class='del'>-		if (prev_extent_end &lt; i_size) {</div><div class='del'>-			u64 delalloc_start;</div><div class='del'>-			u64 delalloc_end;</div><div class='del'>-			bool delalloc;</div><div class='del'>-</div><div class='del'>-			delalloc = btrfs_find_delalloc_in_range(inode,</div><div class='del'>-								prev_extent_end,</div><div class='del'>-								i_size - 1,</div><div class='del'>-								&amp;delalloc_cached_state,</div><div class='del'>-								&amp;delalloc_start,</div><div class='del'>-								&amp;delalloc_end);</div><div class='del'>-			if (!delalloc)</div><div class='del'>-				cache.flags |= FIEMAP_EXTENT_LAST;</div><div class='del'>-		} else {</div><div class='del'>-			cache.flags |= FIEMAP_EXTENT_LAST;</div><div class='add'>+			cond_resched();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ret = emit_last_fiemap_cache(fieinfo, &amp;cache);</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='del'>-	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='del'>-out:</div><div class='del'>-	free_extent_state(delalloc_cached_state);</div><div class='del'>-	btrfs_free_backref_share_ctx(backref_ctx);</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __free_extent_buffer(struct extent_buffer *eb)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(extent_buffer_cache, eb);</div><div class='add'>+	return try_release_extent_state(io_tree, folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int extent_buffer_under_io(const struct extent_buffer *eb)</div><div class='hunk'>@@ -3102,29 +2881,24 @@ static int extent_buffer_under_io(const struct extent_buffer *eb)</div><div class='ctx'> 		test_bit(EXTENT_BUFFER_DIRTY, &amp;eb-&gt;bflags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool folio_range_has_eb(struct btrfs_fs_info *fs_info, struct folio *folio)</div><div class='add'>+static bool folio_range_has_eb(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_private(folio)) {</div><div class='del'>-		subpage = folio_get_private(folio);</div><div class='del'>-		if (atomic_read(&amp;subpage-&gt;eb_refs))</div><div class='del'>-			return true;</div><div class='del'>-		/*</div><div class='del'>-		 * Even there is no eb refs here, we may still have</div><div class='del'>-		 * end_page_read() call relying on page::private.</div><div class='del'>-		 */</div><div class='del'>-		if (atomic_read(&amp;subpage-&gt;readers))</div><div class='add'>+		bfs = folio_get_private(folio);</div><div class='add'>+		if (atomic_read(&amp;bfs-&gt;eb_refs))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void detach_extent_buffer_folio(struct extent_buffer *eb, struct folio *folio)</div><div class='add'>+static void detach_extent_buffer_folio(const struct extent_buffer *eb, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	const bool mapped = !test_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3132,21 +2906,20 @@ static void detach_extent_buffer_folio(struct extent_buffer *eb, struct folio *f</div><div class='ctx'> 	 * be done under the i_private_lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mapped)</div><div class='del'>-		spin_lock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+		spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_private(folio)) {</div><div class='ctx'> 		if (mapped)</div><div class='del'>-			spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+			spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fs_info-&gt;nodesize &gt;= PAGE_SIZE) {</div><div class='add'>+	if (!btrfs_meta_is_subpage(fs_info)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * We do this since we'll remove the pages after we've</div><div class='del'>-		 * removed the eb from the radix tree, so we could race</div><div class='del'>-		 * and have this page now attached to the new eb.  So</div><div class='del'>-		 * only clear folio if it's still connected to</div><div class='del'>-		 * this eb.</div><div class='add'>+		 * We do this since we'll remove the pages after we've removed</div><div class='add'>+		 * the eb from the xarray, so we could race and have this page</div><div class='add'>+		 * now attached to the new eb.  So only clear folio if it's</div><div class='add'>+		 * still connected to this eb.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (folio_test_private(folio) &amp;&amp; folio_get_private(folio) == eb) {</div><div class='ctx'> 			BUG_ON(test_bit(EXTENT_BUFFER_DIRTY, &amp;eb-&gt;bflags));</div><div class='hunk'>@@ -3156,7 +2929,7 @@ static void detach_extent_buffer_folio(struct extent_buffer *eb, struct folio *f</div><div class='ctx'> 			folio_detach_private(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mapped)</div><div class='del'>-			spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+			spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3166,7 +2939,7 @@ static void detach_extent_buffer_folio(struct extent_buffer *eb, struct folio *f</div><div class='ctx'> 	 * attached to one dummy eb, no sharing.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!mapped) {</div><div class='del'>-		btrfs_detach_subpage(fs_info, folio);</div><div class='add'>+		btrfs_detach_folio_state(fs_info, folio, BTRFS_SUBPAGE_METADATA);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3176,14 +2949,14 @@ static void detach_extent_buffer_folio(struct extent_buffer *eb, struct folio *f</div><div class='ctx'> 	 * We can only detach the folio private if there are no other ebs in the</div><div class='ctx'> 	 * page range and no unfinished IO.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!folio_range_has_eb(fs_info, folio))</div><div class='del'>-		btrfs_detach_subpage(fs_info, folio);</div><div class='add'>+	if (!folio_range_has_eb(folio))</div><div class='add'>+		btrfs_detach_folio_state(fs_info, folio, BTRFS_SUBPAGE_METADATA);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Release all pages attached to the extent buffer */</div><div class='del'>-static void btrfs_release_extent_buffer_pages(struct extent_buffer *eb)</div><div class='add'>+/* Release all folios attached to the extent buffer */</div><div class='add'>+static void btrfs_release_extent_buffer_folios(const struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	ASSERT(!extent_buffer_under_io(eb));</div><div class='ctx'> </div><div class='hunk'>@@ -3194,9 +2967,6 @@ static void btrfs_release_extent_buffer_pages(struct extent_buffer *eb)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		detach_extent_buffer_folio(eb, folio);</div><div class='del'>-</div><div class='del'>-		/* One for when we allocated the folio. */</div><div class='del'>-		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3205,40 +2975,57 @@ static void btrfs_release_extent_buffer_pages(struct extent_buffer *eb)</div><div class='ctx'>  */</div><div class='ctx'> static inline void btrfs_release_extent_buffer(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='del'>-	btrfs_release_extent_buffer_pages(eb);</div><div class='add'>+	btrfs_release_extent_buffer_folios(eb);</div><div class='ctx'> 	btrfs_leak_debug_del_eb(eb);</div><div class='del'>-	__free_extent_buffer(eb);</div><div class='add'>+	kmem_cache_free(extent_buffer_cache, eb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct extent_buffer *</div><div class='del'>-__alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start,</div><div class='del'>-		      unsigned long len)</div><div class='add'>+static struct extent_buffer *__alloc_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='add'>+						   u64 start)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	eb = kmem_cache_zalloc(extent_buffer_cache, GFP_NOFS|__GFP_NOFAIL);</div><div class='ctx'> 	eb-&gt;start = start;</div><div class='del'>-	eb-&gt;len = len;</div><div class='add'>+	eb-&gt;len = fs_info-&gt;nodesize;</div><div class='ctx'> 	eb-&gt;fs_info = fs_info;</div><div class='ctx'> 	init_rwsem(&amp;eb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_leak_debug_add_eb(eb);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;eb-&gt;refs_lock);</div><div class='del'>-	atomic_set(&amp;eb-&gt;refs, 1);</div><div class='add'>+	refcount_set(&amp;eb-&gt;refs, 1);</div><div class='ctx'> </div><div class='del'>-	ASSERT(len &lt;= BTRFS_MAX_METADATA_BLOCKSIZE);</div><div class='add'>+	ASSERT(eb-&gt;len &lt;= BTRFS_MAX_METADATA_BLOCKSIZE);</div><div class='ctx'> </div><div class='ctx'> 	return eb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For use in eb allocation error cleanup paths, as btrfs_release_extent_buffer()</div><div class='add'>+ * does not call folio_put(), and we need to set the folios to NULL so that</div><div class='add'>+ * btrfs_release_extent_buffer() will not detach them a second time.</div><div class='add'>+ */</div><div class='add'>+static void cleanup_extent_buffer_folios(struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	const int num_folios = num_extent_folios(eb);</div><div class='add'>+</div><div class='add'>+	/* We cannot use num_extent_folios() as loop bound as eb-&gt;folios changes. */</div><div class='add'>+	for (int i = 0; i &lt; num_folios; i++) {</div><div class='add'>+		ASSERT(eb-&gt;folios[i]);</div><div class='add'>+		detach_extent_buffer_folio(eb, eb-&gt;folios[i]);</div><div class='add'>+		folio_put(eb-&gt;folios[i]);</div><div class='add'>+		eb-&gt;folios[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *new;</div><div class='del'>-	int num_folios = num_extent_folios(src);</div><div class='add'>+	int num_folios;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	new = __alloc_extent_buffer(src-&gt;fs_info, src-&gt;start, src-&gt;len);</div><div class='add'>+	new = __alloc_extent_buffer(src-&gt;fs_info, src-&gt;start);</div><div class='ctx'> 	if (new == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -3249,80 +3036,79 @@ struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src)</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_bit(EXTENT_BUFFER_UNMAPPED, &amp;new-&gt;bflags);</div><div class='ctx'> </div><div class='del'>-	ret = alloc_eb_folio_array(new, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_release_extent_buffer(new);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	ret = alloc_eb_folio_array(new, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto release_eb;</div><div class='ctx'> </div><div class='add'>+	ASSERT(num_extent_folios(src) == num_extent_folios(new),</div><div class='add'>+	       "%d != %d", num_extent_folios(src), num_extent_folios(new));</div><div class='add'>+	/* Explicitly use the cached num_extent value from now on. */</div><div class='add'>+	num_folios = num_extent_folios(src);</div><div class='ctx'> 	for (int i = 0; i &lt; num_folios; i++) {</div><div class='ctx'> 		struct folio *folio = new-&gt;folios[i];</div><div class='del'>-		int ret;</div><div class='ctx'> </div><div class='ctx'> 		ret = attach_extent_buffer_folio(new, folio, NULL);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			btrfs_release_extent_buffer(new);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto cleanup_folios;</div><div class='ctx'> 		WARN_ON(folio_test_dirty(folio));</div><div class='ctx'> 	}</div><div class='add'>+	for (int i = 0; i &lt; num_folios; i++)</div><div class='add'>+		folio_put(new-&gt;folios[i]);</div><div class='add'>+</div><div class='ctx'> 	copy_extent_buffer_full(new, src);</div><div class='ctx'> 	set_extent_buffer_uptodate(new);</div><div class='ctx'> </div><div class='ctx'> 	return new;</div><div class='add'>+</div><div class='add'>+cleanup_folios:</div><div class='add'>+	cleanup_extent_buffer_folios(new);</div><div class='add'>+release_eb:</div><div class='add'>+	btrfs_release_extent_buffer(new);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='del'>-						  u64 start, unsigned long len)</div><div class='add'>+struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='add'>+						u64 start)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='del'>-	int num_folios = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	eb = __alloc_extent_buffer(fs_info, start, len);</div><div class='add'>+	eb = __alloc_extent_buffer(fs_info, start);</div><div class='ctx'> 	if (!eb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	ret = alloc_eb_folio_array(eb, 0);</div><div class='add'>+	ret = alloc_eb_folio_array(eb, false);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err;</div><div class='add'>+		goto release_eb;</div><div class='ctx'> </div><div class='del'>-	num_folios = num_extent_folios(eb);</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='ctx'> 		ret = attach_extent_buffer_folio(eb, eb-&gt;folios[i], NULL);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto err;</div><div class='add'>+			goto cleanup_folios;</div><div class='ctx'> 	}</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++)</div><div class='add'>+		folio_put(eb-&gt;folios[i]);</div><div class='ctx'> </div><div class='ctx'> 	set_extent_buffer_uptodate(eb);</div><div class='ctx'> 	btrfs_set_header_nritems(eb, 0);</div><div class='ctx'> 	set_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags);</div><div class='ctx'> </div><div class='ctx'> 	return eb;</div><div class='del'>-err:</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='del'>-		if (eb-&gt;folios[i]) {</div><div class='del'>-			detach_extent_buffer_folio(eb, eb-&gt;folios[i]);</div><div class='del'>-			__folio_put(eb-&gt;folios[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	__free_extent_buffer(eb);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='del'>-						u64 start)</div><div class='del'>-{</div><div class='del'>-	return __alloc_dummy_extent_buffer(fs_info, start, fs_info-&gt;nodesize);</div><div class='add'>+cleanup_folios:</div><div class='add'>+	cleanup_extent_buffer_folios(eb);</div><div class='add'>+release_eb:</div><div class='add'>+	btrfs_release_extent_buffer(eb);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void check_buffer_tree_ref(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	int refs;</div><div class='ctx'> 	/*</div><div class='del'>-	 * The TREE_REF bit is first set when the extent_buffer is added</div><div class='del'>-	 * to the radix tree. It is also reset, if unset, when a new reference</div><div class='del'>-	 * is created by find_extent_buffer.</div><div class='add'>+	 * The TREE_REF bit is first set when the extent_buffer is added to the</div><div class='add'>+	 * xarray. It is also reset, if unset, when a new reference is created</div><div class='add'>+	 * by find_extent_buffer.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * It is only cleared in two cases: freeing the last non-tree</div><div class='ctx'> 	 * reference to the extent_buffer when its STALE bit is set or</div><div class='hunk'>@@ -3334,31 +3120,28 @@ static void check_buffer_tree_ref(struct extent_buffer *eb)</div><div class='ctx'> 	 * conditions between the calls to check_buffer_tree_ref in those</div><div class='ctx'> 	 * codepaths and clearing TREE_REF in try_release_extent_buffer.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The actual lifetime of the extent_buffer in the radix tree is</div><div class='del'>-	 * adequately protected by the refcount, but the TREE_REF bit and</div><div class='del'>-	 * its corresponding reference are not. To protect against this</div><div class='del'>-	 * class of races, we call check_buffer_tree_ref from the codepaths</div><div class='del'>-	 * which trigger io. Note that once io is initiated, TREE_REF can no</div><div class='del'>-	 * longer be cleared, so that is the moment at which any such race is</div><div class='del'>-	 * best fixed.</div><div class='add'>+	 * The actual lifetime of the extent_buffer in the xarray is adequately</div><div class='add'>+	 * protected by the refcount, but the TREE_REF bit and its corresponding</div><div class='add'>+	 * reference are not. To protect against this class of races, we call</div><div class='add'>+	 * check_buffer_tree_ref() from the code paths which trigger io. Note that</div><div class='add'>+	 * once io is initiated, TREE_REF can no longer be cleared, so that is</div><div class='add'>+	 * the moment at which any such race is best fixed.</div><div class='ctx'> 	 */</div><div class='del'>-	refs = atomic_read(&amp;eb-&gt;refs);</div><div class='add'>+	refs = refcount_read(&amp;eb-&gt;refs);</div><div class='ctx'> 	if (refs &gt;= 2 &amp;&amp; test_bit(EXTENT_BUFFER_TREE_REF, &amp;eb-&gt;bflags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;eb-&gt;refs_lock);</div><div class='ctx'> 	if (!test_and_set_bit(EXTENT_BUFFER_TREE_REF, &amp;eb-&gt;bflags))</div><div class='del'>-		atomic_inc(&amp;eb-&gt;refs);</div><div class='add'>+		refcount_inc(&amp;eb-&gt;refs);</div><div class='ctx'> 	spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mark_extent_buffer_accessed(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='del'>-	int num_folios= num_extent_folios(eb);</div><div class='del'>-</div><div class='ctx'> 	check_buffer_tree_ref(eb);</div><div class='ctx'> </div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++)</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++)</div><div class='ctx'> 		folio_mark_accessed(eb-&gt;folios[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3391,10 +3174,10 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return eb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					u64 start)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> 	struct extent_buffer *eb, *exists = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3406,45 +3189,48 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	eb-&gt;fs_info = fs_info;</div><div class='ctx'> again:</div><div class='del'>-	ret = radix_tree_preload(GFP_NOFS);</div><div class='del'>-	if (ret) {</div><div class='del'>-		exists = ERR_PTR(ret);</div><div class='del'>-		goto free_eb;</div><div class='add'>+	xa_lock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+	exists = __xa_cmpxchg(&amp;fs_info-&gt;buffer_tree, start &gt;&gt; fs_info-&gt;nodesize_bits,</div><div class='add'>+			      NULL, eb, GFP_NOFS);</div><div class='add'>+	if (xa_is_err(exists)) {</div><div class='add'>+		ret = xa_err(exists);</div><div class='add'>+		xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+		btrfs_release_extent_buffer(eb);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-	ret = radix_tree_insert(&amp;fs_info-&gt;buffer_radix,</div><div class='del'>-				start &gt;&gt; fs_info-&gt;sectorsize_bits, eb);</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-	radix_tree_preload_end();</div><div class='del'>-	if (ret == -EEXIST) {</div><div class='del'>-		exists = find_extent_buffer(fs_info, start);</div><div class='del'>-		if (exists)</div><div class='del'>-			goto free_eb;</div><div class='del'>-		else</div><div class='add'>+	if (exists) {</div><div class='add'>+		if (!refcount_inc_not_zero(&amp;exists-&gt;refs)) {</div><div class='add'>+			/* The extent buffer is being freed, retry. */</div><div class='add'>+			xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='ctx'> 			goto again;</div><div class='add'>+		}</div><div class='add'>+		xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+		btrfs_release_extent_buffer(eb);</div><div class='add'>+		return exists;</div><div class='ctx'> 	}</div><div class='add'>+	xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='ctx'> 	check_buffer_tree_ref(eb);</div><div class='del'>-	set_bit(EXTENT_BUFFER_IN_TREE, &amp;eb-&gt;bflags);</div><div class='ctx'> </div><div class='ctx'> 	return eb;</div><div class='del'>-free_eb:</div><div class='del'>-	btrfs_release_extent_buffer(eb);</div><div class='del'>-	return exists;</div><div class='del'>-}</div><div class='add'>+#else</div><div class='add'>+	/* Stub to avoid linker error when compiled with optimizations turned off. */</div><div class='add'>+	return NULL;</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct extent_buffer *grab_extent_buffer(</div><div class='del'>-		struct btrfs_fs_info *fs_info, struct page *page)</div><div class='add'>+static struct extent_buffer *grab_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='add'>+						struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct extent_buffer *exists;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * For subpage case, we completely rely on radix tree to ensure we</div><div class='del'>-	 * don't try to insert two ebs for the same bytenr.  So here we always</div><div class='del'>-	 * return NULL and just continue.</div><div class='add'>+	 * For subpage case, we completely rely on xarray to ensure we don't try</div><div class='add'>+	 * to insert two ebs for the same bytenr.  So here we always return NULL</div><div class='add'>+	 * and just continue.</div><div class='ctx'> 	 */</div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE)</div><div class='add'>+	if (btrfs_meta_is_subpage(fs_info))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Page not yet attached to an extent buffer */</div><div class='hunk'>@@ -3452,51 +3238,53 @@ static struct extent_buffer *grab_extent_buffer(</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We could have already allocated an eb for this page and attached one</div><div class='add'>+	 * We could have already allocated an eb for this folio and attached one</div><div class='ctx'> 	 * so lets see if we can get a ref on the existing eb, and if we can we</div><div class='ctx'> 	 * know it's good and we can just return that one, else we know we can</div><div class='ctx'> 	 * just overwrite folio private.</div><div class='ctx'> 	 */</div><div class='ctx'> 	exists = folio_get_private(folio);</div><div class='del'>-	if (atomic_inc_not_zero(&amp;exists-&gt;refs))</div><div class='add'>+	if (refcount_inc_not_zero(&amp;exists-&gt;refs))</div><div class='ctx'> 		return exists;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(PageDirty(page));</div><div class='add'>+	WARN_ON(folio_test_dirty(folio));</div><div class='ctx'> 	folio_detach_private(folio);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_eb_alignment(struct btrfs_fs_info *fs_info, u64 start)</div><div class='add'>+/*</div><div class='add'>+ * Validate alignment constraints of eb at logical address @start.</div><div class='add'>+ */</div><div class='add'>+static bool check_eb_alignment(struct btrfs_fs_info *fs_info, u64 start)</div><div class='ctx'> {</div><div class='del'>-	if (!IS_ALIGNED(start, fs_info-&gt;sectorsize)) {</div><div class='add'>+	const u32 nodesize = fs_info-&gt;nodesize;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!IS_ALIGNED(start, fs_info-&gt;sectorsize))) {</div><div class='ctx'> 		btrfs_err(fs_info, "bad tree block start %llu", start);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE &amp;&amp;</div><div class='del'>-	    offset_in_page(start) + fs_info-&gt;nodesize &gt; PAGE_SIZE) {</div><div class='add'>+	if (unlikely(nodesize &lt; PAGE_SIZE &amp;&amp; !IS_ALIGNED(start, nodesize))) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='del'>-		"tree block crosses page boundary, start %llu nodesize %u",</div><div class='del'>-			  start, fs_info-&gt;nodesize);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		"tree block is not nodesize aligned, start %llu nodesize %u",</div><div class='add'>+			  start, nodesize);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-	if (fs_info-&gt;nodesize &gt;= PAGE_SIZE &amp;&amp;</div><div class='del'>-	    !PAGE_ALIGNED(start)) {</div><div class='add'>+	if (unlikely(nodesize &gt;= PAGE_SIZE &amp;&amp; !PAGE_ALIGNED(start))) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 		"tree block is not page aligned, start %llu nodesize %u",</div><div class='del'>-			  start, fs_info-&gt;nodesize);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+			  start, nodesize);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-	if (!IS_ALIGNED(start, fs_info-&gt;nodesize) &amp;&amp;</div><div class='del'>-	    !test_and_set_bit(BTRFS_FS_UNALIGNED_TREE_BLOCK, &amp;fs_info-&gt;flags)) {</div><div class='add'>+	if (unlikely(!IS_ALIGNED(start, nodesize) &amp;&amp;</div><div class='add'>+		     !test_and_set_bit(BTRFS_FS_UNALIGNED_TREE_BLOCK, &amp;fs_info-&gt;flags))) {</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> "tree block not nodesize aligned, start %llu nodesize %u, can be resolved by a full metadata balance",</div><div class='del'>-			      start, fs_info-&gt;nodesize);</div><div class='add'>+			      start, nodesize);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Return 0 if eb-&gt;folios[i] is attached to btree inode successfully.</div><div class='ctx'>  * Return &gt;0 if there is already another extent buffer for the range,</div><div class='hunk'>@@ -3506,12 +3294,13 @@ static int check_eb_alignment(struct btrfs_fs_info *fs_info, u64 start)</div><div class='ctx'>  * The caller needs to free the existing folios and retry using the same order.</div><div class='ctx'>  */</div><div class='ctx'> static int attach_eb_folio_to_filemap(struct extent_buffer *eb, int i,</div><div class='add'>+				      struct btrfs_folio_state *prealloc,</div><div class='ctx'> 				      struct extent_buffer **found_eb_ret)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	struct address_space *mapping = fs_info-&gt;btree_inode-&gt;i_mapping;</div><div class='del'>-	const unsigned long index = eb-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const pgoff_t index = eb-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct folio *existing_folio;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3521,10 +3310,11 @@ static int attach_eb_folio_to_filemap(struct extent_buffer *eb, int i,</div><div class='ctx'> 	ASSERT(eb-&gt;folios[i]);</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='add'>+	existing_folio = NULL;</div><div class='ctx'> 	ret = filemap_add_folio(mapping, eb-&gt;folios[i], index + i,</div><div class='ctx'> 				GFP_NOFS | __GFP_NOFAIL);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		return 0;</div><div class='add'>+		goto finish;</div><div class='ctx'> </div><div class='ctx'> 	existing_folio = filemap_lock_folio(mapping, index + i);</div><div class='ctx'> 	/* The page cache only exists for a very short time, just retry. */</div><div class='hunk'>@@ -3534,27 +3324,26 @@ retry:</div><div class='ctx'> 	/* For now, we should only have single-page folios for btree inode. */</div><div class='ctx'> 	ASSERT(folio_nr_pages(existing_folio) == 1);</div><div class='ctx'> </div><div class='del'>-	if (folio_size(existing_folio) != folio_size(eb-&gt;folios[0])) {</div><div class='add'>+	if (folio_size(existing_folio) != eb-&gt;folio_size) {</div><div class='ctx'> 		folio_unlock(existing_folio);</div><div class='ctx'> 		folio_put(existing_folio);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE) {</div><div class='del'>-		/*</div><div class='del'>-		 * We're going to reuse the existing page, can drop our page</div><div class='del'>-		 * and subpage structure now.</div><div class='del'>-		 */</div><div class='add'>+finish:</div><div class='add'>+	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='add'>+	if (existing_folio &amp;&amp; btrfs_meta_is_subpage(fs_info)) {</div><div class='add'>+		/* We're going to reuse the existing page, can drop our folio now. */</div><div class='ctx'> 		__free_page(folio_page(eb-&gt;folios[i], 0));</div><div class='ctx'> 		eb-&gt;folios[i] = existing_folio;</div><div class='del'>-	} else {</div><div class='add'>+	} else if (existing_folio) {</div><div class='ctx'> 		struct extent_buffer *existing_eb;</div><div class='ctx'> </div><div class='del'>-		existing_eb = grab_extent_buffer(fs_info,</div><div class='del'>-						 folio_page(existing_folio, 0));</div><div class='add'>+		existing_eb = grab_extent_buffer(fs_info, existing_folio);</div><div class='ctx'> 		if (existing_eb) {</div><div class='ctx'> 			/* The extent buffer still exists, we can use it directly. */</div><div class='ctx'> 			*found_eb_ret = existing_eb;</div><div class='add'>+			spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> 			folio_unlock(existing_folio);</div><div class='ctx'> 			folio_put(existing_folio);</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -3563,19 +3352,32 @@ retry:</div><div class='ctx'> 		__free_page(folio_page(eb-&gt;folios[i], 0));</div><div class='ctx'> 		eb-&gt;folios[i] = existing_folio;</div><div class='ctx'> 	}</div><div class='add'>+	eb-&gt;folio_size = folio_size(eb-&gt;folios[i]);</div><div class='add'>+	eb-&gt;folio_shift = folio_shift(eb-&gt;folios[i]);</div><div class='add'>+	/* Should not fail, as we have preallocated the memory. */</div><div class='add'>+	ret = attach_extent_buffer_folio(eb, eb-&gt;folios[i], prealloc);</div><div class='add'>+	ASSERT(!ret);</div><div class='add'>+	/*</div><div class='add'>+	 * To inform we have an extra eb under allocation, so that</div><div class='add'>+	 * detach_extent_buffer_page() won't release the folio private when the</div><div class='add'>+	 * eb hasn't been inserted into the xarray yet.</div><div class='add'>+	 *</div><div class='add'>+	 * The ref will be decreased when the eb releases the page, in</div><div class='add'>+	 * detach_extent_buffer_page().  Thus needs no special handling in the</div><div class='add'>+	 * error path.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_folio_inc_eb_refs(fs_info, eb-&gt;folios[i]);</div><div class='add'>+	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					  u64 start, u64 owner_root, int level)</div><div class='ctx'> {</div><div class='del'>-	unsigned long len = fs_info-&gt;nodesize;</div><div class='del'>-	int num_folios;</div><div class='ctx'> 	int attached = 0;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	struct extent_buffer *existing_eb = NULL;</div><div class='del'>-	struct address_space *mapping = fs_info-&gt;btree_inode-&gt;i_mapping;</div><div class='del'>-	struct btrfs_subpage *prealloc = NULL;</div><div class='add'>+	struct btrfs_folio_state *prealloc = NULL;</div><div class='ctx'> 	u64 lockdep_owner = owner_root;</div><div class='ctx'> 	bool page_contig = true;</div><div class='ctx'> 	int uptodate = 1;</div><div class='hunk'>@@ -3599,7 +3401,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (eb)</div><div class='ctx'> 		return eb;</div><div class='ctx'> </div><div class='del'>-	eb = __alloc_extent_buffer(fs_info, start, len);</div><div class='add'>+	eb = __alloc_extent_buffer(fs_info, start);</div><div class='ctx'> 	if (!eb)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -3619,8 +3421,8 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * The memory will be freed by attach_extent_buffer_page() or freed</div><div class='ctx'> 	 * manually if we exit earlier.</div><div class='ctx'> 	 */</div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE) {</div><div class='del'>-		prealloc = btrfs_alloc_subpage(fs_info, BTRFS_SUBPAGE_METADATA);</div><div class='add'>+	if (btrfs_meta_is_subpage(fs_info)) {</div><div class='add'>+		prealloc = btrfs_alloc_folio_state(fs_info, PAGE_SIZE, BTRFS_SUBPAGE_METADATA);</div><div class='ctx'> 		if (IS_ERR(prealloc)) {</div><div class='ctx'> 			ret = PTR_ERR(prealloc);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3629,18 +3431,17 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> reallocate:</div><div class='ctx'> 	/* Allocate all pages first. */</div><div class='del'>-	ret = alloc_eb_folio_array(eb, __GFP_NOFAIL);</div><div class='add'>+	ret = alloc_eb_folio_array(eb, true);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_free_subpage(prealloc);</div><div class='add'>+		btrfs_free_folio_state(prealloc);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	num_folios = num_extent_folios(eb);</div><div class='ctx'> 	/* Attach all pages to the filemap. */</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='ctx'> 		struct folio *folio;</div><div class='ctx'> </div><div class='del'>-		ret = attach_eb_folio_to_filemap(eb, i, &amp;existing_eb);</div><div class='add'>+		ret = attach_eb_folio_to_filemap(eb, i, prealloc, &amp;existing_eb);</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			ASSERT(existing_eb);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3666,7 +3467,7 @@ reallocate:</div><div class='ctx'> 		 * using 0-order folios.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (unlikely(ret == -EAGAIN)) {</div><div class='del'>-			ASSERT(0);</div><div class='add'>+			DEBUG_WARN("folio order mismatch between new eb and filemap");</div><div class='ctx'> 			goto reallocate;</div><div class='ctx'> 		}</div><div class='ctx'> 		attached++;</div><div class='hunk'>@@ -3677,23 +3478,7 @@ reallocate:</div><div class='ctx'> 		 * and free the allocated page.</div><div class='ctx'> 		 */</div><div class='ctx'> 		folio = eb-&gt;folios[i];</div><div class='del'>-		spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		/* Should not fail, as we have preallocated the memory */</div><div class='del'>-		ret = attach_extent_buffer_folio(eb, folio, prealloc);</div><div class='del'>-		ASSERT(!ret);</div><div class='del'>-		/*</div><div class='del'>-		 * To inform we have extra eb under allocation, so that</div><div class='del'>-		 * detach_extent_buffer_page() won't release the folio private</div><div class='del'>-		 * when the eb hasn't yet been inserted into radix tree.</div><div class='del'>-		 *</div><div class='del'>-		 * The ref will be decreased when the eb released the page, in</div><div class='del'>-		 * detach_extent_buffer_page().</div><div class='del'>-		 * Thus needs no special handling in error path.</div><div class='del'>-		 */</div><div class='del'>-		btrfs_folio_inc_eb_refs(fs_info, folio);</div><div class='del'>-		spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-</div><div class='del'>-		WARN_ON(btrfs_folio_test_dirty(fs_info, folio, eb-&gt;start, eb-&gt;len));</div><div class='add'>+		WARN_ON(btrfs_meta_folio_test_dirty(folio, eb));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check if the current page is physically contiguous with previous eb</div><div class='hunk'>@@ -3704,15 +3489,14 @@ reallocate:</div><div class='ctx'> 		if (i &amp;&amp; folio_page(eb-&gt;folios[i - 1], 0) + 1 != folio_page(folio, 0))</div><div class='ctx'> 			page_contig = false;</div><div class='ctx'> </div><div class='del'>-		if (!btrfs_folio_test_uptodate(fs_info, folio, eb-&gt;start, eb-&gt;len))</div><div class='add'>+		if (!btrfs_meta_folio_test_uptodate(folio, eb))</div><div class='ctx'> 			uptodate = 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can't unlock the pages just yet since the extent buffer</div><div class='del'>-		 * hasn't been properly inserted in the radix tree, this</div><div class='del'>-		 * opens a race with btree_release_folio which can free a page</div><div class='del'>-		 * while we are still filling in all pages for the buffer and</div><div class='del'>-		 * we could crash.</div><div class='add'>+		 * hasn't been properly inserted into the xarray, this opens a</div><div class='add'>+		 * race with btree_release_folio() which can free a page while we</div><div class='add'>+		 * are still filling in all pages for the buffer and we could crash.</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uptodate)</div><div class='hunk'>@@ -3721,38 +3505,46 @@ reallocate:</div><div class='ctx'> 	if (page_contig)</div><div class='ctx'> 		eb-&gt;addr = folio_address(eb-&gt;folios[0]) + offset_in_page(eb-&gt;start);</div><div class='ctx'> again:</div><div class='del'>-	ret = radix_tree_preload(GFP_NOFS);</div><div class='del'>-	if (ret)</div><div class='add'>+	xa_lock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+	existing_eb = __xa_cmpxchg(&amp;fs_info-&gt;buffer_tree,</div><div class='add'>+				   start &gt;&gt; fs_info-&gt;nodesize_bits, NULL, eb,</div><div class='add'>+				   GFP_NOFS);</div><div class='add'>+	if (xa_is_err(existing_eb)) {</div><div class='add'>+		ret = xa_err(existing_eb);</div><div class='add'>+		xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='ctx'> 		goto out;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-	ret = radix_tree_insert(&amp;fs_info-&gt;buffer_radix,</div><div class='del'>-				start &gt;&gt; fs_info-&gt;sectorsize_bits, eb);</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-	radix_tree_preload_end();</div><div class='del'>-	if (ret == -EEXIST) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		existing_eb = find_extent_buffer(fs_info, start);</div><div class='del'>-		if (existing_eb)</div><div class='del'>-			goto out;</div><div class='del'>-		else</div><div class='add'>+	}</div><div class='add'>+	if (existing_eb) {</div><div class='add'>+		if (!refcount_inc_not_zero(&amp;existing_eb-&gt;refs)) {</div><div class='add'>+			xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='ctx'> 			goto again;</div><div class='add'>+		}</div><div class='add'>+		xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+</div><div class='ctx'> 	/* add one reference for the tree */</div><div class='ctx'> 	check_buffer_tree_ref(eb);</div><div class='del'>-	set_bit(EXTENT_BUFFER_IN_TREE, &amp;eb-&gt;bflags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now it's safe to unlock the pages because any calls to</div><div class='ctx'> 	 * btree_release_folio will correctly detect that a page belongs to a</div><div class='ctx'> 	 * live buffer and won't free them prematurely.</div><div class='ctx'> 	 */</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++)</div><div class='del'>-		unlock_page(folio_page(eb-&gt;folios[i], 0));</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='add'>+		folio_unlock(eb-&gt;folios[i]);</div><div class='add'>+		/*</div><div class='add'>+		 * A folio that has been added to an address_space mapping</div><div class='add'>+		 * should not continue holding the refcount from its original</div><div class='add'>+		 * allocation indefinitely.</div><div class='add'>+		 */</div><div class='add'>+		folio_put(eb-&gt;folios[i]);</div><div class='add'>+	}</div><div class='ctx'> 	return eb;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	WARN_ON(!atomic_dec_and_test(&amp;eb-&gt;refs));</div><div class='add'>+	WARN_ON(!refcount_dec_and_test(&amp;eb-&gt;refs));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Any attached folios need to be detached before we unlock them.  This</div><div class='hunk'>@@ -3762,26 +3554,22 @@ out:</div><div class='ctx'> 	 * want that to grab this eb, as we're getting ready to free it.  So we</div><div class='ctx'> 	 * have to detach it first and then unlock it.</div><div class='ctx'> 	 *</div><div class='del'>-	 * We have to drop our reference and NULL it out here because in the</div><div class='del'>-	 * subpage case detaching does a btrfs_folio_dec_eb_refs() for our eb.</div><div class='del'>-	 * Below when we call btrfs_release_extent_buffer() we will call</div><div class='del'>-	 * detach_extent_buffer_folio() on our remaining pages in the !subpage</div><div class='del'>-	 * case.  If we left eb-&gt;folios[i] populated in the subpage case we'd</div><div class='del'>-	 * double put our reference and be super sad.</div><div class='add'>+	 * Note: the bounds is num_extent_pages() as we need to go through all slots.</div><div class='ctx'> 	 */</div><div class='del'>-	for (int i = 0; i &lt; attached; i++) {</div><div class='del'>-		ASSERT(eb-&gt;folios[i]);</div><div class='del'>-		detach_extent_buffer_folio(eb, eb-&gt;folios[i]);</div><div class='del'>-		unlock_page(folio_page(eb-&gt;folios[i], 0));</div><div class='del'>-		folio_put(eb-&gt;folios[i]);</div><div class='add'>+	for (int i = 0; i &lt; num_extent_pages(eb); i++) {</div><div class='add'>+		struct folio *folio = eb-&gt;folios[i];</div><div class='add'>+</div><div class='add'>+		if (i &lt; attached) {</div><div class='add'>+			ASSERT(folio);</div><div class='add'>+			detach_extent_buffer_folio(eb, folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+		} else if (!folio) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		eb-&gt;folios[i] = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * Now all pages of that extent buffer is unmapped, set UNMAPPED flag,</div><div class='del'>-	 * so it can be cleaned up without utlizing page-&gt;mapping.</div><div class='del'>-	 */</div><div class='del'>-	set_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags);</div><div class='del'>-</div><div class='ctx'> 	btrfs_release_extent_buffer(eb);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='hunk'>@@ -3794,7 +3582,7 @@ static inline void btrfs_release_extent_buffer_rcu(struct rcu_head *head)</div><div class='ctx'> 	struct extent_buffer *eb =</div><div class='ctx'> 			container_of(head, struct extent_buffer, rcu_head);</div><div class='ctx'> </div><div class='del'>-	__free_extent_buffer(eb);</div><div class='add'>+	kmem_cache_free(extent_buffer_cache, eb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int release_extent_buffer(struct extent_buffer *eb)</div><div class='hunk'>@@ -3802,27 +3590,35 @@ static int release_extent_buffer(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;eb-&gt;refs_lock);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(atomic_read(&amp;eb-&gt;refs) == 0);</div><div class='del'>-	if (atomic_dec_and_test(&amp;eb-&gt;refs)) {</div><div class='del'>-		if (test_and_clear_bit(EXTENT_BUFFER_IN_TREE, &amp;eb-&gt;bflags)) {</div><div class='del'>-			struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='add'>+	if (refcount_dec_and_test(&amp;eb-&gt;refs)) {</div><div class='add'>+		struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> </div><div class='del'>-			spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='add'>+		spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='ctx'> </div><div class='del'>-			spin_lock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-			radix_tree_delete(&amp;fs_info-&gt;buffer_radix,</div><div class='del'>-					  eb-&gt;start &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-		} else {</div><div class='del'>-			spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='del'>-		}</div><div class='add'>+		/*</div><div class='add'>+		 * We're erasing, theoretically there will be no allocations, so</div><div class='add'>+		 * just use GFP_ATOMIC.</div><div class='add'>+		 *</div><div class='add'>+		 * We use cmpxchg instead of erase because we do not know if</div><div class='add'>+		 * this eb is actually in the tree or not, we could be cleaning</div><div class='add'>+		 * up an eb that we allocated but never inserted into the tree.</div><div class='add'>+		 * Thus use cmpxchg to remove it from the tree if it is there,</div><div class='add'>+		 * or leave the other entry if this isn't in the tree.</div><div class='add'>+		 *</div><div class='add'>+		 * The documentation says that putting a NULL value is the same</div><div class='add'>+		 * as erase as long as XA_FLAGS_ALLOC is not set, which it isn't</div><div class='add'>+		 * in this case.</div><div class='add'>+		 */</div><div class='add'>+		xa_cmpxchg_irq(&amp;fs_info-&gt;buffer_tree,</div><div class='add'>+			       eb-&gt;start &gt;&gt; fs_info-&gt;nodesize_bits, eb, NULL,</div><div class='add'>+			       GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 		btrfs_leak_debug_del_eb(eb);</div><div class='del'>-		/* Should be safe to release our pages at this point */</div><div class='del'>-		btrfs_release_extent_buffer_pages(eb);</div><div class='add'>+		/* Should be safe to release folios at this point. */</div><div class='add'>+		btrfs_release_extent_buffer_folios(eb);</div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> 		if (unlikely(test_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags))) {</div><div class='del'>-			__free_extent_buffer(eb);</div><div class='add'>+			kmem_cache_free(extent_buffer_cache, eb);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3840,22 +3636,26 @@ void free_extent_buffer(struct extent_buffer *eb)</div><div class='ctx'> 	if (!eb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	refs = atomic_read(&amp;eb-&gt;refs);</div><div class='add'>+	refs = refcount_read(&amp;eb-&gt;refs);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if ((!test_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags) &amp;&amp; refs &lt;= 3)</div><div class='del'>-		    || (test_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags) &amp;&amp;</div><div class='del'>-			refs == 1))</div><div class='add'>+		if (test_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags)) {</div><div class='add'>+			if (refs == 1)</div><div class='add'>+				break;</div><div class='add'>+		} else if (refs &lt;= 3) {</div><div class='ctx'> 			break;</div><div class='del'>-		if (atomic_try_cmpxchg(&amp;eb-&gt;refs, &amp;refs, refs - 1))</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Optimization to avoid locking eb-&gt;refs_lock. */</div><div class='add'>+		if (atomic_try_cmpxchg(&amp;eb-&gt;refs.refs, &amp;refs, refs - 1))</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;eb-&gt;refs_lock);</div><div class='del'>-	if (atomic_read(&amp;eb-&gt;refs) == 2 &amp;&amp;</div><div class='add'>+	if (refcount_read(&amp;eb-&gt;refs) == 2 &amp;&amp;</div><div class='ctx'> 	    test_bit(EXTENT_BUFFER_STALE, &amp;eb-&gt;bflags) &amp;&amp;</div><div class='ctx'> 	    !extent_buffer_under_io(eb) &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(EXTENT_BUFFER_TREE_REF, &amp;eb-&gt;bflags))</div><div class='del'>-		atomic_dec(&amp;eb-&gt;refs);</div><div class='add'>+		refcount_dec(&amp;eb-&gt;refs);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * I know this is terrible, but it's temporary until we stop tracking</div><div class='hunk'>@@ -3872,44 +3672,27 @@ void free_extent_buffer_stale(struct extent_buffer *eb)</div><div class='ctx'> 	spin_lock(&amp;eb-&gt;refs_lock);</div><div class='ctx'> 	set_bit(EXTENT_BUFFER_STALE, &amp;eb-&gt;bflags);</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;eb-&gt;refs) == 2 &amp;&amp; !extent_buffer_under_io(eb) &amp;&amp;</div><div class='add'>+	if (refcount_read(&amp;eb-&gt;refs) == 2 &amp;&amp; !extent_buffer_under_io(eb) &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(EXTENT_BUFFER_TREE_REF, &amp;eb-&gt;bflags))</div><div class='del'>-		atomic_dec(&amp;eb-&gt;refs);</div><div class='add'>+		refcount_dec(&amp;eb-&gt;refs);</div><div class='ctx'> 	release_extent_buffer(eb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btree_clear_folio_dirty(struct folio *folio)</div><div class='add'>+static void btree_clear_folio_dirty_tag(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	ASSERT(folio_test_dirty(folio));</div><div class='add'>+	ASSERT(!folio_test_dirty(folio));</div><div class='ctx'> 	ASSERT(folio_test_locked(folio));</div><div class='del'>-	folio_clear_dirty_for_io(folio);</div><div class='ctx'> 	xa_lock_irq(&amp;folio-&gt;mapping-&gt;i_pages);</div><div class='ctx'> 	if (!folio_test_dirty(folio))</div><div class='del'>-		__xa_clear_mark(&amp;folio-&gt;mapping-&gt;i_pages,</div><div class='del'>-				folio_index(folio), PAGECACHE_TAG_DIRTY);</div><div class='add'>+		__xa_clear_mark(&amp;folio-&gt;mapping-&gt;i_pages, folio-&gt;index,</div><div class='add'>+				PAGECACHE_TAG_DIRTY);</div><div class='ctx'> 	xa_unlock_irq(&amp;folio-&gt;mapping-&gt;i_pages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void clear_subpage_extent_buffer_dirty(const struct extent_buffer *eb)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='del'>-	struct folio *folio = eb-&gt;folios[0];</div><div class='del'>-	bool last;</div><div class='del'>-</div><div class='del'>-	/* btree_clear_folio_dirty() needs page locked. */</div><div class='del'>-	folio_lock(folio);</div><div class='del'>-	last = btrfs_subpage_clear_and_test_dirty(fs_info, folio, eb-&gt;start, eb-&gt;len);</div><div class='del'>-	if (last)</div><div class='del'>-		btree_clear_folio_dirty(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	WARN_ON(atomic_read(&amp;eb-&gt;refs) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='del'>-	int num_folios;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_assert_tree_write_locked(eb);</div><div class='ctx'> </div><div class='hunk'>@@ -3925,7 +3708,7 @@ void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * The actual zeroout of the buffer will happen later in</div><div class='ctx'> 	 * btree_csum_one_bio.</div><div class='ctx'> 	 */</div><div class='del'>-	if (btrfs_is_zoned(fs_info)) {</div><div class='add'>+	if (btrfs_is_zoned(fs_info) &amp;&amp; test_bit(EXTENT_BUFFER_DIRTY, &amp;eb-&gt;bflags)) {</div><div class='ctx'> 		set_bit(EXTENT_BUFFER_ZONED_ZEROOUT, &amp;eb-&gt;bflags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3933,121 +3716,106 @@ void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!test_and_clear_bit(EXTENT_BUFFER_DIRTY, &amp;eb-&gt;bflags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	buffer_tree_clear_mark(eb, PAGECACHE_TAG_DIRTY);</div><div class='ctx'> 	percpu_counter_add_batch(&amp;fs_info-&gt;dirty_metadata_bytes, -eb-&gt;len,</div><div class='ctx'> 				 fs_info-&gt;dirty_metadata_batch);</div><div class='ctx'> </div><div class='del'>-	if (eb-&gt;fs_info-&gt;nodesize &lt; PAGE_SIZE)</div><div class='del'>-		return clear_subpage_extent_buffer_dirty(eb);</div><div class='del'>-</div><div class='del'>-	num_folios = num_extent_folios(eb);</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='ctx'> 		struct folio *folio = eb-&gt;folios[i];</div><div class='add'>+		bool last;</div><div class='ctx'> </div><div class='ctx'> 		if (!folio_test_dirty(folio))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		folio_lock(folio);</div><div class='del'>-		btree_clear_folio_dirty(folio);</div><div class='add'>+		last = btrfs_meta_folio_clear_and_test_dirty(folio, eb);</div><div class='add'>+		if (last)</div><div class='add'>+			btree_clear_folio_dirty_tag(folio);</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='del'>-	WARN_ON(atomic_read(&amp;eb-&gt;refs) == 0);</div><div class='add'>+	WARN_ON(refcount_read(&amp;eb-&gt;refs) == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void set_extent_buffer_dirty(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='del'>-	int num_folios;</div><div class='ctx'> 	bool was_dirty;</div><div class='ctx'> </div><div class='ctx'> 	check_buffer_tree_ref(eb);</div><div class='ctx'> </div><div class='ctx'> 	was_dirty = test_and_set_bit(EXTENT_BUFFER_DIRTY, &amp;eb-&gt;bflags);</div><div class='ctx'> </div><div class='del'>-	num_folios = num_extent_folios(eb);</div><div class='del'>-	WARN_ON(atomic_read(&amp;eb-&gt;refs) == 0);</div><div class='add'>+	WARN_ON(refcount_read(&amp;eb-&gt;refs) == 0);</div><div class='ctx'> 	WARN_ON(!test_bit(EXTENT_BUFFER_TREE_REF, &amp;eb-&gt;bflags));</div><div class='add'>+	WARN_ON(test_bit(EXTENT_BUFFER_ZONED_ZEROOUT, &amp;eb-&gt;bflags));</div><div class='ctx'> </div><div class='ctx'> 	if (!was_dirty) {</div><div class='del'>-		bool subpage = eb-&gt;fs_info-&gt;nodesize &lt; PAGE_SIZE;</div><div class='add'>+		bool subpage = btrfs_meta_is_subpage(eb-&gt;fs_info);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For subpage case, we can have other extent buffers in the</div><div class='del'>-		 * same page, and in clear_subpage_extent_buffer_dirty() we</div><div class='add'>+		 * same page, and in clear_extent_buffer_dirty() we</div><div class='ctx'> 		 * have to clear page dirty without subpage lock held.</div><div class='ctx'> 		 * This can cause race where our page gets dirty cleared after</div><div class='ctx'> 		 * we just set it.</div><div class='ctx'> 		 *</div><div class='del'>-		 * Thankfully, clear_subpage_extent_buffer_dirty() has locked</div><div class='add'>+		 * Thankfully, clear_extent_buffer_dirty() has locked</div><div class='ctx'> 		 * its page for other reasons, we can use page lock to prevent</div><div class='ctx'> 		 * the above race.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (subpage)</div><div class='del'>-			lock_page(folio_page(eb-&gt;folios[0], 0));</div><div class='del'>-		for (int i = 0; i &lt; num_folios; i++)</div><div class='del'>-			btrfs_folio_set_dirty(eb-&gt;fs_info, eb-&gt;folios[i],</div><div class='del'>-					      eb-&gt;start, eb-&gt;len);</div><div class='add'>+			folio_lock(eb-&gt;folios[0]);</div><div class='add'>+		for (int i = 0; i &lt; num_extent_folios(eb); i++)</div><div class='add'>+			btrfs_meta_folio_set_dirty(eb-&gt;folios[i], eb);</div><div class='add'>+		buffer_tree_set_mark(eb, PAGECACHE_TAG_DIRTY);</div><div class='ctx'> 		if (subpage)</div><div class='del'>-			unlock_page(folio_page(eb-&gt;folios[0], 0));</div><div class='add'>+			folio_unlock(eb-&gt;folios[0]);</div><div class='ctx'> 		percpu_counter_add_batch(&amp;eb-&gt;fs_info-&gt;dirty_metadata_bytes,</div><div class='ctx'> 					 eb-&gt;len,</div><div class='ctx'> 					 eb-&gt;fs_info-&gt;dirty_metadata_batch);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++)</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++)</div><div class='ctx'> 		ASSERT(folio_test_dirty(eb-&gt;folios[i]));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void clear_extent_buffer_uptodate(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='del'>-	int num_folios = num_extent_folios(eb);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags);</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='ctx'> 		struct folio *folio = eb-&gt;folios[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!folio)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This is special handling for metadata subpage, as regular</div><div class='del'>-		 * btrfs_is_subpage() can not handle cloned/dummy metadata.</div><div class='del'>-		 */</div><div class='del'>-		if (fs_info-&gt;nodesize &gt;= PAGE_SIZE)</div><div class='del'>-			folio_clear_uptodate(folio);</div><div class='del'>-		else</div><div class='del'>-			btrfs_subpage_clear_uptodate(fs_info, folio,</div><div class='del'>-						     eb-&gt;start, eb-&gt;len);</div><div class='add'>+		btrfs_meta_folio_clear_uptodate(folio, eb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void set_extent_buffer_uptodate(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='del'>-	int num_folios = num_extent_folios(eb);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags);</div><div class='del'>-	for (int i = 0; i &lt; num_folios; i++) {</div><div class='del'>-		struct folio *folio = eb-&gt;folios[i];</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++)</div><div class='add'>+		btrfs_meta_folio_set_uptodate(eb-&gt;folios[i], eb);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This is special handling for metadata subpage, as regular</div><div class='del'>-		 * btrfs_is_subpage() can not handle cloned/dummy metadata.</div><div class='del'>-		 */</div><div class='del'>-		if (fs_info-&gt;nodesize &gt;= PAGE_SIZE)</div><div class='del'>-			folio_mark_uptodate(folio);</div><div class='del'>-		else</div><div class='del'>-			btrfs_subpage_set_uptodate(fs_info, folio,</div><div class='del'>-						   eb-&gt;start, eb-&gt;len);</div><div class='del'>-	}</div><div class='add'>+static void clear_extent_buffer_reading(struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	clear_and_wake_up_bit(EXTENT_BUFFER_READING, &amp;eb-&gt;bflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void end_bbio_meta_read(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb = bbio-&gt;private;</div><div class='del'>-	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	bool uptodate = !bbio-&gt;bio.bi_status;</div><div class='del'>-	struct folio_iter fi;</div><div class='del'>-	u32 bio_offset = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the extent buffer is marked UPTODATE before the read operation</div><div class='add'>+	 * completes, other calls to read_extent_buffer_pages() will return</div><div class='add'>+	 * early without waiting for the read to finish, causing data races.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(test_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags));</div><div class='ctx'> </div><div class='ctx'> 	eb-&gt;read_mirror = bbio-&gt;mirror_num;</div><div class='ctx'> </div><div class='hunk'>@@ -4055,39 +3823,22 @@ static void end_bbio_meta_read(struct btrfs_bio *bbio)</div><div class='ctx'> 	    btrfs_validate_extent_buffer(eb, &amp;bbio-&gt;parent_check) &lt; 0)</div><div class='ctx'> 		uptodate = false;</div><div class='ctx'> </div><div class='del'>-	if (uptodate) {</div><div class='add'>+	if (uptodate)</div><div class='ctx'> 		set_extent_buffer_uptodate(eb);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		clear_extent_buffer_uptodate(eb);</div><div class='del'>-		set_bit(EXTENT_BUFFER_READ_ERR, &amp;eb-&gt;bflags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bio_for_each_folio_all(fi, &amp;bbio-&gt;bio) {</div><div class='del'>-		struct folio *folio = fi.folio;</div><div class='del'>-		u64 start = eb-&gt;start + bio_offset;</div><div class='del'>-		u32 len = fi.length;</div><div class='ctx'> </div><div class='del'>-		if (uptodate)</div><div class='del'>-			btrfs_folio_set_uptodate(fs_info, folio, start, len);</div><div class='del'>-		else</div><div class='del'>-			btrfs_folio_clear_uptodate(fs_info, folio, start, len);</div><div class='del'>-</div><div class='del'>-		bio_offset += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_bit(EXTENT_BUFFER_READING, &amp;eb-&gt;bflags);</div><div class='del'>-	smp_mb__after_atomic();</div><div class='del'>-	wake_up_bit(&amp;eb-&gt;bflags, EXTENT_BUFFER_READING);</div><div class='add'>+	clear_extent_buffer_reading(eb);</div><div class='ctx'> 	free_extent_buffer(eb);</div><div class='ctx'> </div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int read_extent_buffer_pages(struct extent_buffer *eb, int wait, int mirror_num,</div><div class='del'>-			     struct btrfs_tree_parent_check *check)</div><div class='add'>+int read_extent_buffer_pages_nowait(struct extent_buffer *eb, int mirror_num,</div><div class='add'>+				    const struct btrfs_tree_parent_check *check)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='del'>-	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -4102,43 +3853,53 @@ int read_extent_buffer_pages(struct extent_buffer *eb, int wait, int mirror_num,</div><div class='ctx'> </div><div class='ctx'> 	/* Someone else is already reading the buffer, just wait for it. */</div><div class='ctx'> 	if (test_and_set_bit(EXTENT_BUFFER_READING, &amp;eb-&gt;bflags))</div><div class='del'>-		goto done;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Between the initial test_bit(EXTENT_BUFFER_UPTODATE) and the above</div><div class='add'>+	 * test_and_set_bit(EXTENT_BUFFER_READING), someone else could have</div><div class='add'>+	 * started and finished reading the same eb.  In this case, UPTODATE</div><div class='add'>+	 * will now be set, and we shouldn't read it in again.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(test_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags))) {</div><div class='add'>+		clear_extent_buffer_reading(eb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	clear_bit(EXTENT_BUFFER_READ_ERR, &amp;eb-&gt;bflags);</div><div class='ctx'> 	eb-&gt;read_mirror = 0;</div><div class='ctx'> 	check_buffer_tree_ref(eb);</div><div class='del'>-	atomic_inc(&amp;eb-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;eb-&gt;refs);</div><div class='ctx'> </div><div class='ctx'> 	bbio = btrfs_bio_alloc(INLINE_EXTENT_BUFFER_PAGES,</div><div class='del'>-			       REQ_OP_READ | REQ_META, eb-&gt;fs_info,</div><div class='del'>-			       end_bbio_meta_read, eb);</div><div class='add'>+			       REQ_OP_READ | REQ_META, BTRFS_I(fs_info-&gt;btree_inode),</div><div class='add'>+			       eb-&gt;start, end_bbio_meta_read, eb);</div><div class='ctx'> 	bbio-&gt;bio.bi_iter.bi_sector = eb-&gt;start &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	bbio-&gt;inode = BTRFS_I(eb-&gt;fs_info-&gt;btree_inode);</div><div class='del'>-	bbio-&gt;file_offset = eb-&gt;start;</div><div class='ctx'> 	memcpy(&amp;bbio-&gt;parent_check, check, sizeof(*check));</div><div class='del'>-	if (eb-&gt;fs_info-&gt;nodesize &lt; PAGE_SIZE) {</div><div class='del'>-		ret = bio_add_folio(&amp;bbio-&gt;bio, eb-&gt;folios[0], eb-&gt;len,</div><div class='del'>-				    eb-&gt;start - folio_pos(eb-&gt;folios[0]));</div><div class='del'>-		ASSERT(ret);</div><div class='del'>-	} else {</div><div class='del'>-		int num_folios = num_extent_folios(eb);</div><div class='del'>-</div><div class='del'>-		for (int i = 0; i &lt; num_folios; i++) {</div><div class='del'>-			struct folio *folio = eb-&gt;folios[i];</div><div class='add'>+	for (int i = 0; i &lt; num_extent_folios(eb); i++) {</div><div class='add'>+		struct folio *folio = eb-&gt;folios[i];</div><div class='add'>+		u64 range_start = max_t(u64, eb-&gt;start, folio_pos(folio));</div><div class='add'>+		u32 range_len = min_t(u64, folio_next_pos(folio),</div><div class='add'>+				      eb-&gt;start + eb-&gt;len) - range_start;</div><div class='ctx'> </div><div class='del'>-			ret = bio_add_folio(&amp;bbio-&gt;bio, folio, folio_size(folio), 0);</div><div class='del'>-			ASSERT(ret);</div><div class='del'>-		}</div><div class='add'>+		bio_add_folio_nofail(&amp;bbio-&gt;bio, folio, range_len,</div><div class='add'>+				     offset_in_folio(folio, range_start));</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_submit_bio(bbio, mirror_num);</div><div class='add'>+	btrfs_submit_bbio(bbio, mirror_num);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	if (wait == WAIT_COMPLETE) {</div><div class='del'>-		wait_on_bit_io(&amp;eb-&gt;bflags, EXTENT_BUFFER_READING, TASK_UNINTERRUPTIBLE);</div><div class='del'>-		if (!test_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags))</div><div class='del'>-			return -EIO;</div><div class='del'>-	}</div><div class='add'>+int read_extent_buffer_pages(struct extent_buffer *eb, int mirror_num,</div><div class='add'>+			     const struct btrfs_tree_parent_check *check)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = read_extent_buffer_pages_nowait(eb, mirror_num, check);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	wait_on_bit_io(&amp;eb-&gt;bflags, EXTENT_BUFFER_READING, TASK_UNINTERRUPTIBLE);</div><div class='add'>+	if (unlikely(!test_bit(EXTENT_BUFFER_UPTODATE, &amp;eb-&gt;bflags)))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4146,9 +3907,9 @@ static bool report_eb_range(const struct extent_buffer *eb, unsigned long start,</div><div class='ctx'> 			    unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_warn(eb-&gt;fs_info,</div><div class='del'>-		"access to eb bytenr %llu len %lu out of range start %lu len %lu",</div><div class='add'>+		"access to eb bytenr %llu len %u out of range start %lu len %lu",</div><div class='ctx'> 		eb-&gt;start, eb-&gt;len, start, len);</div><div class='del'>-	WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='add'>+	DEBUG_WARN();</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -4175,7 +3936,7 @@ static inline int check_eb_range(const struct extent_buffer *eb,</div><div class='ctx'> void read_extent_buffer(const struct extent_buffer *eb, void *dstv,</div><div class='ctx'> 			unsigned long start, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);</div><div class='add'>+	const int unit_size = eb-&gt;folio_size;</div><div class='ctx'> 	size_t cur;</div><div class='ctx'> 	size_t offset;</div><div class='ctx'> 	char *dst = (char *)dstv;</div><div class='hunk'>@@ -4215,7 +3976,7 @@ int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,</div><div class='ctx'> 				       void __user *dstv,</div><div class='ctx'> 				       unsigned long start, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);</div><div class='add'>+	const int unit_size = eb-&gt;folio_size;</div><div class='ctx'> 	size_t cur;</div><div class='ctx'> 	size_t offset;</div><div class='ctx'> 	char __user *dst = (char __user *)dstv;</div><div class='hunk'>@@ -4255,7 +4016,7 @@ int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,</div><div class='ctx'> int memcmp_extent_buffer(const struct extent_buffer *eb, const void *ptrv,</div><div class='ctx'> 			 unsigned long start, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);</div><div class='add'>+	const int unit_size = eb-&gt;folio_size;</div><div class='ctx'> 	size_t cur;</div><div class='ctx'> 	size_t offset;</div><div class='ctx'> 	char *kaddr;</div><div class='hunk'>@@ -4310,9 +4071,8 @@ static void assert_eb_folio_uptodate(const struct extent_buffer *eb, int i)</div><div class='ctx'> 	if (test_bit(EXTENT_BUFFER_WRITE_ERR, &amp;eb-&gt;bflags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE) {</div><div class='del'>-		struct folio *folio = eb-&gt;folios[0];</div><div class='del'>-</div><div class='add'>+	if (btrfs_meta_is_subpage(fs_info)) {</div><div class='add'>+		folio = eb-&gt;folios[0];</div><div class='ctx'> 		ASSERT(i == 0);</div><div class='ctx'> 		if (WARN_ON(!btrfs_subpage_test_uptodate(fs_info, folio,</div><div class='ctx'> 							 eb-&gt;start, eb-&gt;len)))</div><div class='hunk'>@@ -4326,11 +4086,11 @@ static void __write_extent_buffer(const struct extent_buffer *eb,</div><div class='ctx'> 				  const void *srcv, unsigned long start,</div><div class='ctx'> 				  unsigned long len, bool use_memmove)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);</div><div class='add'>+	const int unit_size = eb-&gt;folio_size;</div><div class='ctx'> 	size_t cur;</div><div class='ctx'> 	size_t offset;</div><div class='ctx'> 	char *kaddr;</div><div class='del'>-	char *src = (char *)srcv;</div><div class='add'>+	const char *src = (const char *)srcv;</div><div class='ctx'> 	unsigned long i = get_eb_folio_index(eb, start);</div><div class='ctx'> 	/* For unmapped (dummy) ebs, no need to check their uptodate status. */</div><div class='ctx'> 	const bool check_uptodate = !test_bit(EXTENT_BUFFER_UNMAPPED, &amp;eb-&gt;bflags);</div><div class='hunk'>@@ -4375,7 +4135,7 @@ void write_extent_buffer(const struct extent_buffer *eb, const void *srcv,</div><div class='ctx'> static void memset_extent_buffer(const struct extent_buffer *eb, int c,</div><div class='ctx'> 				 unsigned long start, unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(eb-&gt;folios[0]);</div><div class='add'>+	const int unit_size = eb-&gt;folio_size;</div><div class='ctx'> 	unsigned long cur = start;</div><div class='ctx'> </div><div class='ctx'> 	if (eb-&gt;addr) {</div><div class='hunk'>@@ -4406,7 +4166,7 @@ void memzero_extent_buffer(const struct extent_buffer *eb, unsigned long start,</div><div class='ctx'> void copy_extent_buffer_full(const struct extent_buffer *dst,</div><div class='ctx'> 			     const struct extent_buffer *src)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(src-&gt;folios[0]);</div><div class='add'>+	const int unit_size = src-&gt;folio_size;</div><div class='ctx'> 	unsigned long cur = 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(dst-&gt;len == src-&gt;len);</div><div class='hunk'>@@ -4428,7 +4188,7 @@ void copy_extent_buffer(const struct extent_buffer *dst,</div><div class='ctx'> 			unsigned long dst_offset, unsigned long src_offset,</div><div class='ctx'> 			unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(dst-&gt;folios[0]);</div><div class='add'>+	const int unit_size = dst-&gt;folio_size;</div><div class='ctx'> 	u64 dst_len = dst-&gt;len;</div><div class='ctx'> 	size_t cur;</div><div class='ctx'> 	size_t offset;</div><div class='hunk'>@@ -4484,10 +4244,10 @@ static inline void eb_bitmap_offset(const struct extent_buffer *eb,</div><div class='ctx'> 	 * the bitmap item in the extent buffer + the offset of the byte in the</div><div class='ctx'> 	 * bitmap item.</div><div class='ctx'> 	 */</div><div class='del'>-	offset = start + offset_in_folio(eb-&gt;folios[0], eb-&gt;start) + byte_offset;</div><div class='add'>+	offset = start + offset_in_eb_folio(eb, eb-&gt;start) + byte_offset;</div><div class='ctx'> </div><div class='del'>-	*folio_index = offset &gt;&gt; folio_shift(eb-&gt;folios[0]);</div><div class='del'>-	*folio_offset = offset_in_folio(eb-&gt;folios[0], offset);</div><div class='add'>+	*folio_index = offset &gt;&gt; eb-&gt;folio_shift;</div><div class='add'>+	*folio_offset = offset_in_eb_folio(eb, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4497,8 +4257,8 @@ static inline void eb_bitmap_offset(const struct extent_buffer *eb,</div><div class='ctx'>  * @start:  offset of the bitmap item in the extent buffer</div><div class='ctx'>  * @nr:     bit number to test</div><div class='ctx'>  */</div><div class='del'>-int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,</div><div class='del'>-			   unsigned long nr)</div><div class='add'>+bool extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,</div><div class='add'>+			    unsigned long nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> 	size_t offset;</div><div class='hunk'>@@ -4601,7 +4361,7 @@ void memcpy_extent_buffer(const struct extent_buffer *dst,</div><div class='ctx'> 			  unsigned long dst_offset, unsigned long src_offset,</div><div class='ctx'> 			  unsigned long len)</div><div class='ctx'> {</div><div class='del'>-	const int unit_size = folio_size(dst-&gt;folios[0]);</div><div class='add'>+	const int unit_size = dst-&gt;folio_size;</div><div class='ctx'> 	unsigned long cur_off = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (check_eb_range(dst, dst_offset, len) ||</div><div class='hunk'>@@ -4685,82 +4445,29 @@ void memmove_extent_buffer(const struct extent_buffer *dst,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define GANG_LOOKUP_SIZE	16</div><div class='del'>-static struct extent_buffer *get_next_extent_buffer(</div><div class='del'>-		struct btrfs_fs_info *fs_info, struct page *page, u64 bytenr)</div><div class='add'>+static int try_release_subpage_extent_buffer(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct extent_buffer *gang[GANG_LOOKUP_SIZE];</div><div class='del'>-	struct extent_buffer *found = NULL;</div><div class='del'>-	u64 page_start = page_offset(page);</div><div class='del'>-	u64 cur = page_start;</div><div class='del'>-</div><div class='del'>-	ASSERT(in_range(bytenr, page_start, PAGE_SIZE));</div><div class='del'>-	lockdep_assert_held(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-</div><div class='del'>-	while (cur &lt; page_start + PAGE_SIZE) {</div><div class='del'>-		int ret;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		ret = radix_tree_gang_lookup(&amp;fs_info-&gt;buffer_radix,</div><div class='del'>-				(void **)gang, cur &gt;&gt; fs_info-&gt;sectorsize_bits,</div><div class='del'>-				min_t(unsigned int, GANG_LOOKUP_SIZE,</div><div class='del'>-				      PAGE_SIZE / fs_info-&gt;nodesize));</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			goto out;</div><div class='del'>-		for (i = 0; i &lt; ret; i++) {</div><div class='del'>-			/* Already beyond page end */</div><div class='del'>-			if (gang[i]-&gt;start &gt;= page_start + PAGE_SIZE)</div><div class='del'>-				goto out;</div><div class='del'>-			/* Found one */</div><div class='del'>-			if (gang[i]-&gt;start &gt;= bytenr) {</div><div class='del'>-				found = gang[i];</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		cur = gang[ret - 1]-&gt;start + gang[ret - 1]-&gt;len;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int try_release_subpage_extent_buffer(struct page *page)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='del'>-	u64 cur = page_offset(page);</div><div class='del'>-	const u64 end = page_offset(page) + PAGE_SIZE;</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);</div><div class='add'>+	struct extent_buffer *eb;</div><div class='add'>+	unsigned long start = (folio_pos(folio) &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='add'>+	unsigned long index = start;</div><div class='add'>+	unsigned long end = index + (PAGE_SIZE &gt;&gt; fs_info-&gt;nodesize_bits) - 1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	while (cur &lt; end) {</div><div class='del'>-		struct extent_buffer *eb = NULL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Unlike try_release_extent_buffer() which uses folio private</div><div class='del'>-		 * to grab buffer, for subpage case we rely on radix tree, thus</div><div class='del'>-		 * we need to ensure radix tree consistency.</div><div class='del'>-		 *</div><div class='del'>-		 * We also want an atomic snapshot of the radix tree, thus go</div><div class='del'>-		 * with spinlock rather than RCU.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-		eb = get_next_extent_buffer(fs_info, page, cur);</div><div class='del'>-		if (!eb) {</div><div class='del'>-			/* No more eb in the page range after or at cur */</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cur = eb-&gt;start + eb-&gt;len;</div><div class='del'>-</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	xa_for_each_range(&amp;fs_info-&gt;buffer_tree, index, eb, start, end) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The same as try_release_extent_buffer(), to ensure the eb</div><div class='ctx'> 		 * won't disappear out from under us.</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock(&amp;eb-&gt;refs_lock);</div><div class='del'>-		if (atomic_read(&amp;eb-&gt;refs) != 1 || extent_buffer_under_io(eb)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (refcount_read(&amp;eb-&gt;refs) != 1 || extent_buffer_under_io(eb)) {</div><div class='ctx'> 			spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-			break;</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If tree ref isn't set then we know the ref on this eb is a</div><div class='hunk'>@@ -4778,36 +4485,37 @@ static int try_release_subpage_extent_buffer(struct page *page)</div><div class='ctx'> 		 * release_extent_buffer() will release the refs_lock.</div><div class='ctx'> 		 */</div><div class='ctx'> 		release_extent_buffer(eb);</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Finally to check if we have cleared folio private, as if we have</div><div class='ctx'> 	 * released all ebs in the page, the folio private should be cleared now.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='del'>-	if (!folio_test_private(page_folio(page)))</div><div class='add'>+	spin_lock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+	if (!folio_test_private(folio))</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='del'>-	spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+	spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> 	return ret;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int try_release_extent_buffer(struct page *page)</div><div class='add'>+int try_release_extent_buffer(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb)-&gt;nodesize &lt; PAGE_SIZE)</div><div class='del'>-		return try_release_subpage_extent_buffer(page);</div><div class='add'>+	if (btrfs_meta_is_subpage(folio_to_fs_info(folio)))</div><div class='add'>+		return try_release_subpage_extent_buffer(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to make sure nobody is changing folio private, as we rely on</div><div class='ctx'> 	 * folio private as the pointer to extent buffer.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+	spin_lock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> 	if (!folio_test_private(folio)) {</div><div class='del'>-		spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+		spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4820,12 +4528,12 @@ int try_release_extent_buffer(struct page *page)</div><div class='ctx'> 	 * this page.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;eb-&gt;refs_lock);</div><div class='del'>-	if (atomic_read(&amp;eb-&gt;refs) != 1 || extent_buffer_under_io(eb)) {</div><div class='add'>+	if (refcount_read(&amp;eb-&gt;refs) != 1 || extent_buffer_under_io(eb)) {</div><div class='ctx'> 		spin_unlock(&amp;eb-&gt;refs_lock);</div><div class='del'>-		spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+		spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;page-&gt;mapping-&gt;i_private_lock);</div><div class='add'>+	spin_unlock(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If tree ref isn't set then we know the ref on this eb is a real ref,</div><div class='hunk'>@@ -4856,7 +4564,6 @@ void btrfs_readahead_tree_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				u64 bytenr, u64 owner_root, u64 gen, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_tree_parent_check check = {</div><div class='del'>-		.has_first_key = 0,</div><div class='ctx'> 		.level = level,</div><div class='ctx'> 		.transid = gen</div><div class='ctx'> 	};</div><div class='hunk'>@@ -4867,12 +4574,12 @@ void btrfs_readahead_tree_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (IS_ERR(eb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_buffer_uptodate(eb, gen, 1)) {</div><div class='add'>+	if (btrfs_buffer_uptodate(eb, gen, true)) {</div><div class='ctx'> 		free_extent_buffer(eb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = read_extent_buffer_pages(eb, WAIT_NONE, 0, &amp;check);</div><div class='add'>+	ret = read_extent_buffer_pages_nowait(eb, 0, &amp;check);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		free_extent_buffer_stale(eb);</div><div class='ctx'> 	else</div><div class='head'>diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h<br/>index 46050500529b..02ebb2f238af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent_io.h</a></div><div class='hunk'>@@ -7,25 +7,40 @@</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='ctx'> #include &lt;linux/fiemap.h&gt;</div><div class='ctx'> #include &lt;linux/btrfs_tree.h&gt;</div><div class='del'>-#include "compression.h"</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "messages.h"</div><div class='ctx'> #include "ulist.h"</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> </div><div class='add'>+struct page;</div><div class='add'>+struct file;</div><div class='add'>+struct folio;</div><div class='add'>+struct inode;</div><div class='add'>+struct fiemap_extent_info;</div><div class='add'>+struct readahead_control;</div><div class='add'>+struct address_space;</div><div class='add'>+struct writeback_control;</div><div class='add'>+struct extent_io_tree;</div><div class='add'>+struct extent_map_tree;</div><div class='add'>+struct extent_state;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_root;</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_tree_parent_check;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	EXTENT_BUFFER_UPTODATE,</div><div class='ctx'> 	EXTENT_BUFFER_DIRTY,</div><div class='del'>-	EXTENT_BUFFER_CORRUPT,</div><div class='del'>-	/* this got triggered by readahead */</div><div class='del'>-	EXTENT_BUFFER_READAHEAD,</div><div class='ctx'> 	EXTENT_BUFFER_TREE_REF,</div><div class='ctx'> 	EXTENT_BUFFER_STALE,</div><div class='ctx'> 	EXTENT_BUFFER_WRITEBACK,</div><div class='del'>-	/* read IO error */</div><div class='del'>-	EXTENT_BUFFER_READ_ERR,</div><div class='ctx'> 	EXTENT_BUFFER_UNMAPPED,</div><div class='del'>-	EXTENT_BUFFER_IN_TREE,</div><div class='ctx'> 	/* write IO error */</div><div class='ctx'> 	EXTENT_BUFFER_WRITE_ERR,</div><div class='ctx'> 	/* Indicate the extent buffer is written zeroed out (for zoned) */</div><div class='hunk'>@@ -57,17 +72,12 @@ enum {</div><div class='ctx'>  *    single word in a bitmap may straddle two pages in the extent buffer.</div><div class='ctx'>  */</div><div class='ctx'> #define BIT_BYTE(nr) ((nr) / BITS_PER_BYTE)</div><div class='del'>-#define BYTE_MASK ((1 &lt;&lt; BITS_PER_BYTE) - 1)</div><div class='add'>+#define BYTE_MASK ((1U &lt;&lt; BITS_PER_BYTE) - 1)</div><div class='ctx'> #define BITMAP_FIRST_BYTE_MASK(start) \</div><div class='ctx'> 	((BYTE_MASK &lt;&lt; ((start) &amp; (BITS_PER_BYTE - 1))) &amp; BYTE_MASK)</div><div class='ctx'> #define BITMAP_LAST_BYTE_MASK(nbits) \</div><div class='ctx'> 	(BYTE_MASK &gt;&gt; (-(nbits) &amp; (BITS_PER_BYTE - 1)))</div><div class='ctx'> </div><div class='del'>-struct btrfs_root;</div><div class='del'>-struct btrfs_inode;</div><div class='del'>-struct btrfs_fs_info;</div><div class='del'>-struct extent_io_tree;</div><div class='del'>-struct btrfs_tree_parent_check;</div><div class='ctx'> </div><div class='ctx'> int __init extent_buffer_init_cachep(void);</div><div class='ctx'> void __cold extent_buffer_free_cachep(void);</div><div class='hunk'>@@ -75,7 +85,8 @@ void __cold extent_buffer_free_cachep(void);</div><div class='ctx'> #define INLINE_EXTENT_BUFFER_PAGES     (BTRFS_MAX_METADATA_BLOCKSIZE / PAGE_SIZE)</div><div class='ctx'> struct extent_buffer {</div><div class='ctx'> 	u64 start;</div><div class='del'>-	unsigned long len;</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 folio_size;</div><div class='ctx'> 	unsigned long bflags;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> </div><div class='hunk'>@@ -86,10 +97,11 @@ struct extent_buffer {</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t refs_lock;</div><div class='del'>-	atomic_t refs;</div><div class='add'>+	refcount_t refs;</div><div class='ctx'> 	int read_mirror;</div><div class='ctx'> 	/* &gt;= 0 if eb belongs to a log tree, -1 otherwise */</div><div class='ctx'> 	s8 log_index;</div><div class='add'>+	u8 folio_shift;</div><div class='ctx'> 	struct rcu_head rcu_head;</div><div class='ctx'> </div><div class='ctx'> 	struct rw_semaphore lock;</div><div class='hunk'>@@ -113,6 +125,13 @@ struct btrfs_eb_write_context {</div><div class='ctx'> 	struct btrfs_block_group *zoned_bg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline unsigned long offset_in_eb_folio(const struct extent_buffer *eb,</div><div class='add'>+					       u64 start)</div><div class='add'>+{</div><div class='add'>+	ASSERT(eb-&gt;folio_size);</div><div class='add'>+	return start &amp; (eb-&gt;folio_size - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get the correct offset inside the page of extent buffer.</div><div class='ctx'>  *</div><div class='hunk'>@@ -151,13 +170,13 @@ static inline unsigned long get_eb_folio_index(const struct extent_buffer *eb,</div><div class='ctx'> 	 *	   the folio_shift would be large enough to always make us</div><div class='ctx'> 	 *	   return 0 as index.</div><div class='ctx'> 	 *    1.2) Several page sized folios</div><div class='del'>-	 *         The folio_shift() would be PAGE_SHIFT, giving us the correct</div><div class='add'>+	 *         The folio_shift would be PAGE_SHIFT, giving us the correct</div><div class='ctx'> 	 *         index.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * 2) sectorsize &lt; PAGE_SIZE and nodesize &lt; PAGE_SIZE case</div><div class='ctx'> 	 *    The folio would only be page sized, and always give us 0 as index.</div><div class='ctx'> 	 */</div><div class='del'>-	return offset &gt;&gt; folio_shift(eb-&gt;folios[0]);</div><div class='add'>+	return offset &gt;&gt; eb-&gt;folio_shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -189,6 +208,11 @@ static inline struct extent_changeset *extent_changeset_alloc(void)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void extent_changeset_prealloc(struct extent_changeset *changeset, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	ulist_prealloc(&amp;changeset-&gt;range_changed, gfp_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void extent_changeset_release(struct extent_changeset *changeset)</div><div class='ctx'> {</div><div class='ctx'> 	if (!changeset)</div><div class='hunk'>@@ -205,29 +229,23 @@ static inline void extent_changeset_free(struct extent_changeset *changeset)</div><div class='ctx'> 	kfree(changeset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct extent_map_tree;</div><div class='del'>-</div><div class='del'>-int try_release_extent_mapping(struct page *page, gfp_t mask);</div><div class='del'>-int try_release_extent_buffer(struct page *page);</div><div class='add'>+bool try_release_extent_mapping(struct folio *folio, gfp_t mask);</div><div class='add'>+int try_release_extent_buffer(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> int btrfs_read_folio(struct file *file, struct folio *folio);</div><div class='del'>-void extent_write_locked_range(struct inode *inode, struct page *locked_page,</div><div class='add'>+void extent_write_locked_range(struct inode *inode, const struct folio *locked_folio,</div><div class='ctx'> 			       u64 start, u64 end, struct writeback_control *wbc,</div><div class='ctx'> 			       bool pages_dirty);</div><div class='del'>-int extent_writepages(struct address_space *mapping,</div><div class='del'>-		      struct writeback_control *wbc);</div><div class='add'>+int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc);</div><div class='ctx'> int btree_write_cache_pages(struct address_space *mapping,</div><div class='ctx'> 			    struct writeback_control *wbc);</div><div class='del'>-void extent_readahead(struct readahead_control *rac);</div><div class='del'>-int extent_fiemap(struct btrfs_inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='del'>-		  u64 start, u64 len);</div><div class='del'>-int set_page_extent_mapped(struct page *page);</div><div class='del'>-void clear_page_extent_mapped(struct page *page);</div><div class='add'>+void btrfs_btree_wait_writeback_range(struct btrfs_fs_info *fs_info, u64 start, u64 end);</div><div class='add'>+void btrfs_readahead(struct readahead_control *rac);</div><div class='add'>+int set_folio_extent_mapped(struct folio *folio);</div><div class='add'>+void clear_folio_extent_mapped(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					  u64 start, u64 owner_root, int level);</div><div class='del'>-struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='del'>-						  u64 start, unsigned long len);</div><div class='ctx'> struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 						u64 start);</div><div class='ctx'> struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src);</div><div class='hunk'>@@ -235,17 +253,23 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					 u64 start);</div><div class='ctx'> void free_extent_buffer(struct extent_buffer *eb);</div><div class='ctx'> void free_extent_buffer_stale(struct extent_buffer *eb);</div><div class='del'>-#define WAIT_NONE	0</div><div class='del'>-#define WAIT_COMPLETE	1</div><div class='del'>-#define WAIT_PAGE_LOCK	2</div><div class='del'>-int read_extent_buffer_pages(struct extent_buffer *eb, int wait, int mirror_num,</div><div class='del'>-			     struct btrfs_tree_parent_check *parent_check);</div><div class='del'>-void wait_on_extent_buffer_writeback(struct extent_buffer *eb);</div><div class='add'>+int read_extent_buffer_pages(struct extent_buffer *eb, int mirror_num,</div><div class='add'>+			     const struct btrfs_tree_parent_check *parent_check);</div><div class='add'>+int read_extent_buffer_pages_nowait(struct extent_buffer *eb, int mirror_num,</div><div class='add'>+				    const struct btrfs_tree_parent_check *parent_check);</div><div class='add'>+</div><div class='add'>+static inline void wait_on_extent_buffer_writeback(struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	wait_on_bit_io(&amp;eb-&gt;bflags, EXTENT_BUFFER_WRITEBACK,</div><div class='add'>+		       TASK_UNINTERRUPTIBLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void btrfs_readahead_tree_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				u64 bytenr, u64 owner_root, u64 gen, int level);</div><div class='ctx'> void btrfs_readahead_node_child(struct extent_buffer *node, int slot);</div><div class='ctx'> </div><div class='del'>-static inline int num_extent_pages(const struct extent_buffer *eb)</div><div class='add'>+/* Note: this can be used in for loops without caching the value in a variable. */</div><div class='add'>+static inline int __pure num_extent_pages(const struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For sectorsize == PAGE_SIZE case, since nodesize is always aligned to</div><div class='hunk'>@@ -263,9 +287,13 @@ static inline int num_extent_pages(const struct extent_buffer *eb)</div><div class='ctx'>  * As we can have either one large folio covering the whole eb</div><div class='ctx'>  * (either nodesize &lt;= PAGE_SIZE, or high order folio), or multiple</div><div class='ctx'>  * single-paged folios.</div><div class='add'>+ *</div><div class='add'>+ * Note: this can be used in for loops without caching the value in a variable.</div><div class='ctx'>  */</div><div class='del'>-static inline int num_extent_folios(const struct extent_buffer *eb)</div><div class='add'>+static inline int __pure num_extent_folios(const struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='add'>+	if (!eb-&gt;folios[0])</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (folio_order(eb-&gt;folios[0]))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return num_extent_pages(eb);</div><div class='hunk'>@@ -316,8 +344,8 @@ void memmove_extent_buffer(const struct extent_buffer *dst,</div><div class='ctx'> 			   unsigned long len);</div><div class='ctx'> void memzero_extent_buffer(const struct extent_buffer *eb, unsigned long start,</div><div class='ctx'> 			   unsigned long len);</div><div class='del'>-int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,</div><div class='del'>-			   unsigned long pos);</div><div class='add'>+bool extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,</div><div class='add'>+			    unsigned long pos);</div><div class='ctx'> void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long start,</div><div class='ctx'> 			      unsigned long pos, unsigned long len);</div><div class='ctx'> void extent_buffer_bitmap_clear(const struct extent_buffer *eb,</div><div class='hunk'>@@ -326,9 +354,9 @@ void extent_buffer_bitmap_clear(const struct extent_buffer *eb,</div><div class='ctx'> void set_extent_buffer_dirty(struct extent_buffer *eb);</div><div class='ctx'> void set_extent_buffer_uptodate(struct extent_buffer *eb);</div><div class='ctx'> void clear_extent_buffer_uptodate(struct extent_buffer *eb);</div><div class='del'>-void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end);</div><div class='ctx'> void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='del'>-				  struct page *locked_page,</div><div class='add'>+				  const struct folio *locked_folio,</div><div class='add'>+				  struct extent_state **cached,</div><div class='ctx'> 				  u32 bits_to_clear, unsigned long page_ops);</div><div class='ctx'> int extent_invalidate_folio(struct extent_io_tree *tree,</div><div class='ctx'> 			    struct folio *folio, size_t offset);</div><div class='hunk'>@@ -336,11 +364,13 @@ void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			      struct extent_buffer *buf);</div><div class='ctx'> </div><div class='ctx'> int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array,</div><div class='del'>-			   gfp_t extra_gfp);</div><div class='add'>+			   bool nofail);</div><div class='add'>+int btrfs_alloc_folio_array(unsigned int nr_folios, unsigned int order,</div><div class='add'>+			    struct folio **folio_array);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> bool find_lock_delalloc_range(struct inode *inode,</div><div class='del'>-			     struct page *locked_page, u64 *start,</div><div class='add'>+			      struct folio *locked_folio, u64 *start,</div><div class='ctx'> 			     u64 *end);</div><div class='ctx'> #endif</div><div class='ctx'> struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,</div><div class='head'>diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c<br/>index b61099bf97a8..7e38c23a0c1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_map.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent_map.c</a></div><div class='hunk'>@@ -5,25 +5,24 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='del'>-#include "volumes.h"</div><div class='ctx'> #include "extent_map.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='add'>+#include "disk-io.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *extent_map_cache;</div><div class='ctx'> </div><div class='del'>-int __init extent_map_init(void)</div><div class='add'>+int __init btrfs_extent_map_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	extent_map_cache = kmem_cache_create("btrfs_extent_map",</div><div class='del'>-			sizeof(struct extent_map), 0,</div><div class='del'>-			SLAB_MEM_SPREAD, NULL);</div><div class='add'>+					     sizeof(struct extent_map), 0, 0, NULL);</div><div class='ctx'> 	if (!extent_map_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __cold extent_map_exit(void)</div><div class='add'>+void __cold btrfs_extent_map_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	kmem_cache_destroy(extent_map_cache);</div><div class='ctx'> }</div><div class='hunk'>@@ -32,9 +31,9 @@ void __cold extent_map_exit(void)</div><div class='ctx'>  * Initialize the extent tree @tree.  Should be called for each new inode or</div><div class='ctx'>  * other user of the extent_map interface.</div><div class='ctx'>  */</div><div class='del'>-void extent_map_tree_init(struct extent_map_tree *tree)</div><div class='add'>+void btrfs_extent_map_tree_init(struct extent_map_tree *tree)</div><div class='ctx'> {</div><div class='del'>-	tree-&gt;map = RB_ROOT_CACHED;</div><div class='add'>+	tree-&gt;root = RB_ROOT;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;tree-&gt;modified_extents);</div><div class='ctx'> 	rwlock_init(&amp;tree-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -43,7 +42,7 @@ void extent_map_tree_init(struct extent_map_tree *tree)</div><div class='ctx'>  * Allocate a new extent_map structure.  The new structure is returned with a</div><div class='ctx'>  * reference count of one and needs to be freed using free_extent_map()</div><div class='ctx'>  */</div><div class='del'>-struct extent_map *alloc_extent_map(void)</div><div class='add'>+struct extent_map *btrfs_alloc_extent_map(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	em = kmem_cache_zalloc(extent_map_cache, GFP_NOFS);</div><div class='hunk'>@@ -59,12 +58,12 @@ struct extent_map *alloc_extent_map(void)</div><div class='ctx'>  * Drop the reference out on @em by one and free the structure if the reference</div><div class='ctx'>  * count hits zero.</div><div class='ctx'>  */</div><div class='del'>-void free_extent_map(struct extent_map *em)</div><div class='add'>+void btrfs_free_extent_map(struct extent_map *em)</div><div class='ctx'> {</div><div class='ctx'> 	if (!em)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;em-&gt;refs)) {</div><div class='del'>-		WARN_ON(extent_map_in_tree(em));</div><div class='add'>+		WARN_ON(btrfs_extent_map_in_tree(em));</div><div class='ctx'> 		WARN_ON(!list_empty(&amp;em-&gt;list));</div><div class='ctx'> 		kmem_cache_free(extent_map_cache, em);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -78,36 +77,44 @@ static u64 range_end(u64 start, u64 len)</div><div class='ctx'> 	return start + len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tree_insert(struct rb_root_cached *root, struct extent_map *em)</div><div class='add'>+static void remove_em(struct btrfs_inode *inode, struct extent_map *em)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_root.rb_node;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;em-&gt;rb_node, &amp;inode-&gt;extent_tree.root);</div><div class='add'>+	RB_CLEAR_NODE(&amp;em-&gt;rb_node);</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_testing(fs_info) &amp;&amp; btrfs_is_fstree(btrfs_root_id(inode-&gt;root)))</div><div class='add'>+		percpu_counter_dec(&amp;fs_info-&gt;evictable_extent_maps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tree_insert(struct rb_root *root, struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='ctx'> 	struct extent_map *entry = NULL;</div><div class='ctx'> 	struct rb_node *orig_parent = NULL;</div><div class='ctx'> 	u64 end = range_end(em-&gt;start, em-&gt;len);</div><div class='del'>-	bool leftmost = true;</div><div class='ctx'> </div><div class='ctx'> 	while (*p) {</div><div class='ctx'> 		parent = *p;</div><div class='ctx'> 		entry = rb_entry(parent, struct extent_map, rb_node);</div><div class='ctx'> </div><div class='del'>-		if (em-&gt;start &lt; entry-&gt;start) {</div><div class='add'>+		if (em-&gt;start &lt; entry-&gt;start)</div><div class='ctx'> 			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (em-&gt;start &gt;= extent_map_end(entry)) {</div><div class='add'>+		else if (em-&gt;start &gt;= btrfs_extent_map_end(entry))</div><div class='ctx'> 			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else {</div><div class='add'>+		else</div><div class='ctx'> 			return -EEXIST;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	orig_parent = parent;</div><div class='del'>-	while (parent &amp;&amp; em-&gt;start &gt;= extent_map_end(entry)) {</div><div class='add'>+	while (parent &amp;&amp; em-&gt;start &gt;= btrfs_extent_map_end(entry)) {</div><div class='ctx'> 		parent = rb_next(parent);</div><div class='ctx'> 		entry = rb_entry(parent, struct extent_map, rb_node);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (parent)</div><div class='del'>-		if (end &gt; entry-&gt;start &amp;&amp; em-&gt;start &lt; extent_map_end(entry))</div><div class='add'>+		if (end &gt; entry-&gt;start &amp;&amp; em-&gt;start &lt; btrfs_extent_map_end(entry))</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> </div><div class='ctx'> 	parent = orig_parent;</div><div class='hunk'>@@ -117,11 +124,11 @@ static int tree_insert(struct rb_root_cached *root, struct extent_map *em)</div><div class='ctx'> 		entry = rb_entry(parent, struct extent_map, rb_node);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (parent)</div><div class='del'>-		if (end &gt; entry-&gt;start &amp;&amp; em-&gt;start &lt; extent_map_end(entry))</div><div class='add'>+		if (end &gt; entry-&gt;start &amp;&amp; em-&gt;start &lt; btrfs_extent_map_end(entry))</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> </div><div class='ctx'> 	rb_link_node(&amp;em-&gt;rb_node, orig_parent, p);</div><div class='del'>-	rb_insert_color_cached(&amp;em-&gt;rb_node, root, leftmost);</div><div class='add'>+	rb_insert_color(&amp;em-&gt;rb_node, root);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,8 +136,8 @@ static int tree_insert(struct rb_root_cached *root, struct extent_map *em)</div><div class='ctx'>  * Search through the tree for an extent_map with a given offset.  If it can't</div><div class='ctx'>  * be found, try to find some neighboring extents</div><div class='ctx'>  */</div><div class='del'>-static struct rb_node *__tree_search(struct rb_root *root, u64 offset,</div><div class='del'>-				     struct rb_node **prev_or_next_ret)</div><div class='add'>+static struct rb_node *tree_search(struct rb_root *root, u64 offset,</div><div class='add'>+				   struct rb_node **prev_or_next_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *n = root-&gt;rb_node;</div><div class='ctx'> 	struct rb_node *prev = NULL;</div><div class='hunk'>@@ -147,14 +154,14 @@ static struct rb_node *__tree_search(struct rb_root *root, u64 offset,</div><div class='ctx'> </div><div class='ctx'> 		if (offset &lt; entry-&gt;start)</div><div class='ctx'> 			n = n-&gt;rb_left;</div><div class='del'>-		else if (offset &gt;= extent_map_end(entry))</div><div class='add'>+		else if (offset &gt;= btrfs_extent_map_end(entry))</div><div class='ctx'> 			n = n-&gt;rb_right;</div><div class='ctx'> 		else</div><div class='ctx'> 			return n;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	orig_prev = prev;</div><div class='del'>-	while (prev &amp;&amp; offset &gt;= extent_map_end(prev_entry)) {</div><div class='add'>+	while (prev &amp;&amp; offset &gt;= btrfs_extent_map_end(prev_entry)) {</div><div class='ctx'> 		prev = rb_next(prev);</div><div class='ctx'> 		prev_entry = rb_entry(prev, struct extent_map, rb_node);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -179,11 +186,22 @@ static struct rb_node *__tree_search(struct rb_root *root, u64 offset,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 extent_map_block_len(const struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	if (btrfs_extent_map_is_compressed(em))</div><div class='add'>+		return em-&gt;disk_num_bytes;</div><div class='add'>+	return em-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u64 extent_map_block_end(const struct extent_map *em)</div><div class='ctx'> {</div><div class='del'>-	if (em-&gt;block_start + em-&gt;block_len &lt; em-&gt;block_start)</div><div class='add'>+	const u64 block_start = btrfs_extent_map_block_start(em);</div><div class='add'>+	const u64 block_end = block_start + extent_map_block_len(em);</div><div class='add'>+</div><div class='add'>+	if (block_end &lt; block_start)</div><div class='ctx'> 		return (u64)-1;</div><div class='del'>-	return em-&gt;block_start + em-&gt;block_len;</div><div class='add'>+</div><div class='add'>+	return block_end;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool can_merge_extent_map(const struct extent_map *em)</div><div class='hunk'>@@ -192,7 +210,7 @@ static bool can_merge_extent_map(const struct extent_map *em)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't merge compressed extents, we need to know their actual size. */</div><div class='del'>-	if (extent_map_is_compressed(em))</div><div class='add'>+	if (btrfs_extent_map_is_compressed(em))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (em-&gt;flags &amp; EXTENT_FLAG_LOGGING)</div><div class='hunk'>@@ -212,21 +230,118 @@ static bool can_merge_extent_map(const struct extent_map *em)</div><div class='ctx'> /* Check to see if two extent_map structs are adjacent and safe to merge. */</div><div class='ctx'> static bool mergeable_maps(const struct extent_map *prev, const struct extent_map *next)</div><div class='ctx'> {</div><div class='del'>-	if (extent_map_end(prev) != next-&gt;start)</div><div class='add'>+	if (btrfs_extent_map_end(prev) != next-&gt;start)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (prev-&gt;flags != next-&gt;flags)</div><div class='add'>+	/*</div><div class='add'>+	 * The merged flag is not an on-disk flag, it just indicates we had the</div><div class='add'>+	 * extent maps of 2 (or more) adjacent extents merged, so factor it out.</div><div class='add'>+	 */</div><div class='add'>+	if ((prev-&gt;flags &amp; ~EXTENT_FLAG_MERGED) !=</div><div class='add'>+	    (next-&gt;flags &amp; ~EXTENT_FLAG_MERGED))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (next-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE - 1)</div><div class='del'>-		return next-&gt;block_start == extent_map_block_end(prev);</div><div class='add'>+	if (next-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE - 1)</div><div class='add'>+		return btrfs_extent_map_block_start(next) == extent_map_block_end(prev);</div><div class='ctx'> </div><div class='ctx'> 	/* HOLES and INLINE extents. */</div><div class='del'>-	return next-&gt;block_start == prev-&gt;block_start;</div><div class='add'>+	return next-&gt;disk_bytenr == prev-&gt;disk_bytenr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)</div><div class='add'>+/*</div><div class='add'>+ * Handle the on-disk data extents merge for @prev and @next.</div><div class='add'>+ *</div><div class='add'>+ * @prev:    left extent to merge</div><div class='add'>+ * @next:    right extent to merge</div><div class='add'>+ * @merged:  the extent we will not discard after the merge; updated with new values</div><div class='add'>+ *</div><div class='add'>+ * After this, one of the two extents is the new merged extent and the other is</div><div class='add'>+ * removed from the tree and likely freed. Note that @merged is one of @prev/@next</div><div class='add'>+ * so there is const/non-const aliasing occurring here.</div><div class='add'>+ *</div><div class='add'>+ * Only touches disk_bytenr/disk_num_bytes/offset/ram_bytes.</div><div class='add'>+ * For now only uncompressed regular extent can be merged.</div><div class='add'>+ */</div><div class='add'>+static void merge_ondisk_extents(const struct extent_map *prev, const struct extent_map *next,</div><div class='add'>+				 struct extent_map *merged)</div><div class='ctx'> {</div><div class='add'>+	u64 new_disk_bytenr;</div><div class='add'>+	u64 new_disk_num_bytes;</div><div class='add'>+	u64 new_offset;</div><div class='add'>+</div><div class='add'>+	/* @prev and @next should not be compressed. */</div><div class='add'>+	ASSERT(!btrfs_extent_map_is_compressed(prev));</div><div class='add'>+	ASSERT(!btrfs_extent_map_is_compressed(next));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There are two different cases where @prev and @next can be merged.</div><div class='add'>+	 *</div><div class='add'>+	 * 1) They are referring to the same data extent:</div><div class='add'>+	 *</div><div class='add'>+	 * |&lt;----- data extent A -----&gt;|</div><div class='add'>+	 *    |&lt;- prev -&gt;|&lt;- next -&gt;|</div><div class='add'>+	 *</div><div class='add'>+	 * 2) They are referring to different data extents but still adjacent:</div><div class='add'>+	 *</div><div class='add'>+	 * |&lt;-- data extent A --&gt;|&lt;-- data extent B --&gt;|</div><div class='add'>+	 *            |&lt;- prev -&gt;|&lt;- next -&gt;|</div><div class='add'>+	 *</div><div class='add'>+	 * The calculation here always merges the data extents first, then updates</div><div class='add'>+	 * @offset using the new data extents.</div><div class='add'>+	 *</div><div class='add'>+	 * For case 1), the merged data extent would be the same.</div><div class='add'>+	 * For case 2), we just merge the two data extents into one.</div><div class='add'>+	 */</div><div class='add'>+	new_disk_bytenr = min(prev-&gt;disk_bytenr, next-&gt;disk_bytenr);</div><div class='add'>+	new_disk_num_bytes = max(prev-&gt;disk_bytenr + prev-&gt;disk_num_bytes,</div><div class='add'>+				 next-&gt;disk_bytenr + next-&gt;disk_num_bytes) -</div><div class='add'>+			     new_disk_bytenr;</div><div class='add'>+	new_offset = prev-&gt;disk_bytenr + prev-&gt;offset - new_disk_bytenr;</div><div class='add'>+</div><div class='add'>+	merged-&gt;disk_bytenr = new_disk_bytenr;</div><div class='add'>+	merged-&gt;disk_num_bytes = new_disk_num_bytes;</div><div class='add'>+	merged-&gt;ram_bytes = new_disk_num_bytes;</div><div class='add'>+	merged-&gt;offset = new_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_extent_map(struct btrfs_fs_info *fs_info, const char *prefix,</div><div class='add'>+			    struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BTRFS_DEBUG))</div><div class='add'>+		return;</div><div class='add'>+	btrfs_crit(fs_info,</div><div class='add'>+"%s, start=%llu len=%llu disk_bytenr=%llu disk_num_bytes=%llu ram_bytes=%llu offset=%llu flags=0x%x",</div><div class='add'>+		prefix, em-&gt;start, em-&gt;len, em-&gt;disk_bytenr, em-&gt;disk_num_bytes,</div><div class='add'>+		em-&gt;ram_bytes, em-&gt;offset, em-&gt;flags);</div><div class='add'>+	ASSERT(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Internal sanity checks for btrfs debug builds. */</div><div class='add'>+static void validate_extent_map(struct btrfs_fs_info *fs_info, struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BTRFS_DEBUG))</div><div class='add'>+		return;</div><div class='add'>+	if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		if (em-&gt;disk_num_bytes == 0)</div><div class='add'>+			dump_extent_map(fs_info, "zero disk_num_bytes", em);</div><div class='add'>+		if (em-&gt;offset + em-&gt;len &gt; em-&gt;ram_bytes)</div><div class='add'>+			dump_extent_map(fs_info, "ram_bytes too small", em);</div><div class='add'>+		if (em-&gt;offset + em-&gt;len &gt; em-&gt;disk_num_bytes &amp;&amp;</div><div class='add'>+		    !btrfs_extent_map_is_compressed(em))</div><div class='add'>+			dump_extent_map(fs_info, "disk_num_bytes too small", em);</div><div class='add'>+		if (!btrfs_extent_map_is_compressed(em) &amp;&amp;</div><div class='add'>+		    em-&gt;ram_bytes != em-&gt;disk_num_bytes)</div><div class='add'>+			dump_extent_map(fs_info,</div><div class='add'>+		"ram_bytes mismatch with disk_num_bytes for non-compressed em",</div><div class='add'>+					em);</div><div class='add'>+	} else if (em-&gt;offset) {</div><div class='add'>+		dump_extent_map(fs_info, "non-zero offset for hole/inline", em);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void try_merge_map(struct btrfs_inode *inode, struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct extent_map *merge = NULL;</div><div class='ctx'> 	struct rb_node *rb;</div><div class='ctx'> </div><div class='hunk'>@@ -246,37 +361,35 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)</div><div class='ctx'> </div><div class='ctx'> 	if (em-&gt;start != 0) {</div><div class='ctx'> 		rb = rb_prev(&amp;em-&gt;rb_node);</div><div class='del'>-		if (rb)</div><div class='del'>-			merge = rb_entry(rb, struct extent_map, rb_node);</div><div class='add'>+		merge = rb_entry_safe(rb, struct extent_map, rb_node);</div><div class='add'>+</div><div class='ctx'> 		if (rb &amp;&amp; can_merge_extent_map(merge) &amp;&amp; mergeable_maps(merge, em)) {</div><div class='ctx'> 			em-&gt;start = merge-&gt;start;</div><div class='del'>-			em-&gt;orig_start = merge-&gt;orig_start;</div><div class='ctx'> 			em-&gt;len += merge-&gt;len;</div><div class='del'>-			em-&gt;block_len += merge-&gt;block_len;</div><div class='del'>-			em-&gt;block_start = merge-&gt;block_start;</div><div class='del'>-			em-&gt;mod_len = (em-&gt;mod_len + em-&gt;mod_start) - merge-&gt;mod_start;</div><div class='del'>-			em-&gt;mod_start = merge-&gt;mod_start;</div><div class='ctx'> 			em-&gt;generation = max(em-&gt;generation, merge-&gt;generation);</div><div class='add'>+</div><div class='add'>+			if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE)</div><div class='add'>+				merge_ondisk_extents(merge, em, em);</div><div class='ctx'> 			em-&gt;flags |= EXTENT_FLAG_MERGED;</div><div class='ctx'> </div><div class='del'>-			rb_erase_cached(&amp;merge-&gt;rb_node, &amp;tree-&gt;map);</div><div class='del'>-			RB_CLEAR_NODE(&amp;merge-&gt;rb_node);</div><div class='del'>-			free_extent_map(merge);</div><div class='add'>+			validate_extent_map(fs_info, em);</div><div class='add'>+			remove_em(inode, merge);</div><div class='add'>+			btrfs_free_extent_map(merge);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rb = rb_next(&amp;em-&gt;rb_node);</div><div class='del'>-	if (rb)</div><div class='del'>-		merge = rb_entry(rb, struct extent_map, rb_node);</div><div class='add'>+	merge = rb_entry_safe(rb, struct extent_map, rb_node);</div><div class='add'>+</div><div class='ctx'> 	if (rb &amp;&amp; can_merge_extent_map(merge) &amp;&amp; mergeable_maps(em, merge)) {</div><div class='ctx'> 		em-&gt;len += merge-&gt;len;</div><div class='del'>-		em-&gt;block_len += merge-&gt;block_len;</div><div class='del'>-		rb_erase_cached(&amp;merge-&gt;rb_node, &amp;tree-&gt;map);</div><div class='del'>-		RB_CLEAR_NODE(&amp;merge-&gt;rb_node);</div><div class='del'>-		em-&gt;mod_len = (merge-&gt;mod_start + merge-&gt;mod_len) - em-&gt;mod_start;</div><div class='add'>+		if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE)</div><div class='add'>+			merge_ondisk_extents(em, merge, em);</div><div class='add'>+		validate_extent_map(fs_info, em);</div><div class='ctx'> 		em-&gt;generation = max(em-&gt;generation, merge-&gt;generation);</div><div class='ctx'> 		em-&gt;flags |= EXTENT_FLAG_MERGED;</div><div class='del'>-		free_extent_map(merge);</div><div class='add'>+		remove_em(inode, merge);</div><div class='add'>+		btrfs_free_extent_map(merge);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -291,120 +404,119 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)</div><div class='ctx'>  * Called after an extent has been written to disk properly.  Set the generation</div><div class='ctx'>  * to the generation that actually added the file item to the inode so we know</div><div class='ctx'>  * we need to sync this extent when we call fsync().</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0	     on success</div><div class='add'>+ * 	    -ENOENT  when the extent is not found in the tree</div><div class='add'>+ * 	    -EUCLEAN if the found extent does not match the expected start</div><div class='ctx'>  */</div><div class='del'>-int unpin_extent_cache(struct btrfs_inode *inode, u64 start, u64 len, u64 gen)</div><div class='add'>+int btrfs_unpin_extent_cache(struct btrfs_inode *inode, u64 start, u64 len, u64 gen)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct extent_map *em;</div><div class='del'>-	bool prealloc = false;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(tree, start, len);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(tree, start, len);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!em)) {</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> "no extent map found for inode %llu (root %lld) when unpinning extent range [%llu, %llu), generation %llu",</div><div class='ctx'> 			   btrfs_ino(inode), btrfs_root_id(inode-&gt;root),</div><div class='del'>-			   start, len, gen);</div><div class='add'>+			   start, start + len, gen);</div><div class='add'>+		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(em-&gt;start != start))</div><div class='add'>+	if (WARN_ON(em-&gt;start != start)) {</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> "found extent map for inode %llu (root %lld) with unexpected start offset %llu when unpinning extent range [%llu, %llu), generation %llu",</div><div class='ctx'> 			   btrfs_ino(inode), btrfs_root_id(inode-&gt;root),</div><div class='del'>-			   em-&gt;start, start, len, gen);</div><div class='add'>+			   em-&gt;start, start, start + len, gen);</div><div class='add'>+		ret = -EUCLEAN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;generation = gen;</div><div class='ctx'> 	em-&gt;flags &amp;= ~EXTENT_FLAG_PINNED;</div><div class='del'>-	em-&gt;mod_start = em-&gt;start;</div><div class='del'>-	em-&gt;mod_len = em-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (em-&gt;flags &amp; EXTENT_FLAG_FILLING) {</div><div class='del'>-		prealloc = true;</div><div class='del'>-		em-&gt;flags &amp;= ~EXTENT_FLAG_FILLING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	try_merge_map(tree, em);</div><div class='ctx'> </div><div class='del'>-	if (prealloc) {</div><div class='del'>-		em-&gt;mod_start = em-&gt;start;</div><div class='del'>-		em-&gt;mod_len = em-&gt;len;</div><div class='del'>-	}</div><div class='add'>+	try_merge_map(inode, em);</div><div class='ctx'> </div><div class='del'>-	free_extent_map(em);</div><div class='ctx'> out:</div><div class='ctx'> 	write_unlock(&amp;tree-&gt;lock);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em)</div><div class='add'>+void btrfs_clear_em_logging(struct btrfs_inode *inode, struct extent_map *em)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held_write(&amp;tree-&gt;lock);</div><div class='add'>+	lockdep_assert_held_write(&amp;inode-&gt;extent_tree.lock);</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;flags &amp;= ~EXTENT_FLAG_LOGGING;</div><div class='del'>-	if (extent_map_in_tree(em))</div><div class='del'>-		try_merge_map(tree, em);</div><div class='add'>+	if (btrfs_extent_map_in_tree(em))</div><div class='add'>+		try_merge_map(inode, em);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void setup_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+static inline void setup_extent_mapping(struct btrfs_inode *inode,</div><div class='ctx'> 					struct extent_map *em,</div><div class='del'>-					int modified)</div><div class='add'>+					bool modified)</div><div class='ctx'> {</div><div class='ctx'> 	refcount_inc(&amp;em-&gt;refs);</div><div class='del'>-	em-&gt;mod_start = em-&gt;start;</div><div class='del'>-	em-&gt;mod_len = em-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(list_empty(&amp;em-&gt;list));</div><div class='ctx'> </div><div class='ctx'> 	if (modified)</div><div class='del'>-		list_add(&amp;em-&gt;list, &amp;tree-&gt;modified_extents);</div><div class='add'>+		list_add(&amp;em-&gt;list, &amp;inode-&gt;extent_tree.modified_extents);</div><div class='ctx'> 	else</div><div class='del'>-		try_merge_map(tree, em);</div><div class='add'>+		try_merge_map(inode, em);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Add new extent map to the extent tree</div><div class='add'>+ * Add a new extent map to an inode's extent map tree.</div><div class='ctx'>  *</div><div class='del'>- * @tree:	tree to insert new map in</div><div class='add'>+ * @inode:	the target inode</div><div class='ctx'>  * @em:		map to insert</div><div class='ctx'>  * @modified:	indicate whether the given @em should be added to the</div><div class='ctx'>  *	        modified list, which indicates the extent needs to be logged</div><div class='ctx'>  *</div><div class='del'>- * Insert @em into @tree or perform a simple forward/backward merge with</div><div class='del'>- * existing mappings.  The extent_map struct passed in will be inserted</div><div class='del'>- * into the tree directly, with an additional reference taken, or a</div><div class='del'>- * reference dropped if the merge attempt was successful.</div><div class='add'>+ * Insert @em into the @inode's extent map tree or perform a simple</div><div class='add'>+ * forward/backward merge with existing mappings.  The extent_map struct passed</div><div class='add'>+ * in will be inserted into the tree directly, with an additional reference</div><div class='add'>+ * taken, or a reference dropped if the merge attempt was successful.</div><div class='ctx'>  */</div><div class='del'>-static int add_extent_mapping(struct extent_map_tree *tree,</div><div class='del'>-			      struct extent_map *em, int modified)</div><div class='add'>+static int add_extent_mapping(struct btrfs_inode *inode,</div><div class='add'>+			      struct extent_map *em, bool modified)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held_write(&amp;tree-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	ret = tree_insert(&amp;tree-&gt;map, em);</div><div class='add'>+	validate_extent_map(fs_info, em);</div><div class='add'>+	ret = tree_insert(&amp;tree-&gt;root, em);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	setup_extent_mapping(tree, em, modified);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	setup_extent_mapping(inode, em, modified);</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_testing(fs_info) &amp;&amp; btrfs_is_fstree(btrfs_root_id(root)))</div><div class='add'>+		percpu_counter_inc(&amp;fs_info-&gt;evictable_extent_maps);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct extent_map *</div><div class='del'>-__lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='del'>-			u64 start, u64 len, int strict)</div><div class='add'>+static struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+						u64 start, u64 len, bool strict)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	struct rb_node *rb_node;</div><div class='ctx'> 	struct rb_node *prev_or_next = NULL;</div><div class='ctx'> 	u64 end = range_end(start, len);</div><div class='ctx'> </div><div class='del'>-	rb_node = __tree_search(&amp;tree-&gt;map.rb_root, start, &amp;prev_or_next);</div><div class='add'>+	rb_node = tree_search(&amp;tree-&gt;root, start, &amp;prev_or_next);</div><div class='ctx'> 	if (!rb_node) {</div><div class='ctx'> 		if (prev_or_next)</div><div class='ctx'> 			rb_node = prev_or_next;</div><div class='hunk'>@@ -414,7 +526,7 @@ __lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='ctx'> </div><div class='ctx'> 	em = rb_entry(rb_node, struct extent_map, rb_node);</div><div class='ctx'> </div><div class='del'>-	if (strict &amp;&amp; !(end &gt; em-&gt;start &amp;&amp; start &lt; extent_map_end(em)))</div><div class='add'>+	if (strict &amp;&amp; !(end &gt; em-&gt;start &amp;&amp; start &lt; btrfs_extent_map_end(em)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	refcount_inc(&amp;em-&gt;refs);</div><div class='hunk'>@@ -433,10 +545,10 @@ __lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='ctx'>  * intersect, so check the object returned carefully to make sure that no</div><div class='ctx'>  * additional lookups are needed.</div><div class='ctx'>  */</div><div class='del'>-struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='del'>-					 u64 start, u64 len)</div><div class='add'>+struct extent_map *btrfs_lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+					       u64 start, u64 len)</div><div class='ctx'> {</div><div class='del'>-	return __lookup_extent_mapping(tree, start, len, 1);</div><div class='add'>+	return lookup_extent_mapping(tree, start, len, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -451,47 +563,54 @@ struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='ctx'>  *</div><div class='ctx'>  * If one can't be found, any nearby extent may be returned</div><div class='ctx'>  */</div><div class='del'>-struct extent_map *search_extent_mapping(struct extent_map_tree *tree,</div><div class='del'>-					 u64 start, u64 len)</div><div class='add'>+struct extent_map *btrfs_search_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+					       u64 start, u64 len)</div><div class='ctx'> {</div><div class='del'>-	return __lookup_extent_mapping(tree, start, len, 0);</div><div class='add'>+	return lookup_extent_mapping(tree, start, len, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Remove an extent_map from the extent tree.</div><div class='add'>+ * Remove an extent_map from its inode's extent tree.</div><div class='ctx'>  *</div><div class='del'>- * @tree:	extent tree to remove from</div><div class='add'>+ * @inode:	the inode the extent map belongs to</div><div class='ctx'>  * @em:		extent map being removed</div><div class='ctx'>  *</div><div class='del'>- * Remove @em from @tree.  No reference counts are dropped, and no checks</div><div class='del'>- * are done to see if the range is in use.</div><div class='add'>+ * Remove @em from the extent tree of @inode.  No reference counts are dropped,</div><div class='add'>+ * and no checks are done to see if the range is in use.</div><div class='ctx'>  */</div><div class='del'>-void remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em)</div><div class='add'>+void btrfs_remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *em)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held_write(&amp;tree-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(em-&gt;flags &amp; EXTENT_FLAG_PINNED);</div><div class='del'>-	rb_erase_cached(&amp;em-&gt;rb_node, &amp;tree-&gt;map);</div><div class='ctx'> 	if (!(em-&gt;flags &amp; EXTENT_FLAG_LOGGING))</div><div class='ctx'> 		list_del_init(&amp;em-&gt;list);</div><div class='del'>-	RB_CLEAR_NODE(&amp;em-&gt;rb_node);</div><div class='add'>+</div><div class='add'>+	remove_em(inode, em);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void replace_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+static void replace_extent_mapping(struct btrfs_inode *inode,</div><div class='ctx'> 				   struct extent_map *cur,</div><div class='ctx'> 				   struct extent_map *new,</div><div class='del'>-				   int modified)</div><div class='add'>+				   bool modified)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held_write(&amp;tree-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	validate_extent_map(fs_info, new);</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(cur-&gt;flags &amp; EXTENT_FLAG_PINNED);</div><div class='del'>-	ASSERT(extent_map_in_tree(cur));</div><div class='add'>+	ASSERT(btrfs_extent_map_in_tree(cur));</div><div class='ctx'> 	if (!(cur-&gt;flags &amp; EXTENT_FLAG_LOGGING))</div><div class='ctx'> 		list_del_init(&amp;cur-&gt;list);</div><div class='del'>-	rb_replace_node_cached(&amp;cur-&gt;rb_node, &amp;new-&gt;rb_node, &amp;tree-&gt;map);</div><div class='add'>+	rb_replace_node(&amp;cur-&gt;rb_node, &amp;new-&gt;rb_node, &amp;tree-&gt;root);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;cur-&gt;rb_node);</div><div class='ctx'> </div><div class='del'>-	setup_extent_mapping(tree, new, modified);</div><div class='add'>+	setup_extent_mapping(inode, new, modified);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct extent_map *next_extent_map(const struct extent_map *em)</div><div class='hunk'>@@ -520,7 +639,7 @@ static struct extent_map *prev_extent_map(struct extent_map *em)</div><div class='ctx'>  * and an extent that you want to insert, deal with overlap and insert</div><div class='ctx'>  * the best fitted new extent into the tree.</div><div class='ctx'>  */</div><div class='del'>-static noinline int merge_extent_mapping(struct extent_map_tree *em_tree,</div><div class='add'>+static noinline int merge_extent_mapping(struct btrfs_inode *inode,</div><div class='ctx'> 					 struct extent_map *existing,</div><div class='ctx'> 					 struct extent_map *em,</div><div class='ctx'> 					 u64 map_start)</div><div class='hunk'>@@ -531,7 +650,8 @@ static noinline int merge_extent_mapping(struct extent_map_tree *em_tree,</div><div class='ctx'> 	u64 end;</div><div class='ctx'> 	u64 start_diff;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(map_start &lt; em-&gt;start || map_start &gt;= extent_map_end(em));</div><div class='add'>+	if (map_start &lt; em-&gt;start || map_start &gt;= btrfs_extent_map_end(em))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (existing-&gt;start &gt; map_start) {</div><div class='ctx'> 		next = existing;</div><div class='hunk'>@@ -541,26 +661,22 @@ static noinline int merge_extent_mapping(struct extent_map_tree *em_tree,</div><div class='ctx'> 		next = next_extent_map(prev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	start = prev ? extent_map_end(prev) : em-&gt;start;</div><div class='add'>+	start = prev ? btrfs_extent_map_end(prev) : em-&gt;start;</div><div class='ctx'> 	start = max_t(u64, start, em-&gt;start);</div><div class='del'>-	end = next ? next-&gt;start : extent_map_end(em);</div><div class='del'>-	end = min_t(u64, end, extent_map_end(em));</div><div class='add'>+	end = next ? next-&gt;start : btrfs_extent_map_end(em);</div><div class='add'>+	end = min_t(u64, end, btrfs_extent_map_end(em));</div><div class='ctx'> 	start_diff = start - em-&gt;start;</div><div class='ctx'> 	em-&gt;start = start;</div><div class='ctx'> 	em-&gt;len = end - start;</div><div class='del'>-	if (em-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE &amp;&amp;</div><div class='del'>-	    !extent_map_is_compressed(em)) {</div><div class='del'>-		em-&gt;block_start += start_diff;</div><div class='del'>-		em-&gt;block_len = em-&gt;len;</div><div class='del'>-	}</div><div class='del'>-	return add_extent_mapping(em_tree, em, 0);</div><div class='add'>+	if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE)</div><div class='add'>+		em-&gt;offset += start_diff;</div><div class='add'>+	return add_extent_mapping(inode, em, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Add extent mapping into em_tree.</div><div class='add'>+ * Add extent mapping into an inode's extent map tree.</div><div class='ctx'>  *</div><div class='del'>- * @fs_info:  the filesystem</div><div class='del'>- * @em_tree:  extent tree into which we want to insert the extent mapping</div><div class='add'>+ * @inode:    target inode</div><div class='ctx'>  * @em_in:    extent we are inserting</div><div class='ctx'>  * @start:    start of the logical range btrfs_get_extent() is requesting</div><div class='ctx'>  * @len:      length of the logical range btrfs_get_extent() is requesting</div><div class='hunk'>@@ -568,8 +684,8 @@ static noinline int merge_extent_mapping(struct extent_map_tree *em_tree,</div><div class='ctx'>  * Note that @em_in's range may be different from [start, start+len),</div><div class='ctx'>  * but they must be overlapped.</div><div class='ctx'>  *</div><div class='del'>- * Insert @em_in into @em_tree. In case there is an overlapping range, handle</div><div class='del'>- * the -EEXIST by either:</div><div class='add'>+ * Insert @em_in into the inode's extent map tree. In case there is an</div><div class='add'>+ * overlapping range, handle the -EEXIST by either:</div><div class='ctx'>  * a) Returning the existing extent in @em_in if @start is within the</div><div class='ctx'>  *    existing em.</div><div class='ctx'>  * b) Merge the existing extent with @em_in passed in.</div><div class='hunk'>@@ -577,21 +693,21 @@ static noinline int merge_extent_mapping(struct extent_map_tree *em_tree,</div><div class='ctx'>  * Return 0 on success, otherwise -EEXIST.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,</div><div class='del'>-			     struct extent_map_tree *em_tree,</div><div class='add'>+int btrfs_add_extent_mapping(struct btrfs_inode *inode,</div><div class='ctx'> 			     struct extent_map **em_in, u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct extent_map *em = *em_in;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tree-checker should have rejected any inline extent with non-zero</div><div class='ctx'> 	 * file offset. Here just do a sanity check.</div><div class='ctx'> 	 */</div><div class='del'>-	if (em-&gt;block_start == EXTENT_MAP_INLINE)</div><div class='add'>+	if (em-&gt;disk_bytenr == EXTENT_MAP_INLINE)</div><div class='ctx'> 		ASSERT(em-&gt;start == 0);</div><div class='ctx'> </div><div class='del'>-	ret = add_extent_mapping(em_tree, em, 0);</div><div class='add'>+	ret = add_extent_mapping(inode, em, false);</div><div class='ctx'> 	/* it is possible that someone inserted the extent into the tree</div><div class='ctx'> 	 * while we had the lock dropped.  It is also possible that</div><div class='ctx'> 	 * an overlapping map exists in the tree</div><div class='hunk'>@@ -599,7 +715,7 @@ int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (ret == -EEXIST) {</div><div class='ctx'> 		struct extent_map *existing;</div><div class='ctx'> </div><div class='del'>-		existing = search_extent_mapping(em_tree, start, len);</div><div class='add'>+		existing = btrfs_search_extent_mapping(&amp;inode-&gt;extent_tree, start, len);</div><div class='ctx'> </div><div class='ctx'> 		trace_btrfs_handle_em_exist(fs_info, existing, em, start, len);</div><div class='ctx'> </div><div class='hunk'>@@ -608,8 +724,8 @@ int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		 * extent causing the -EEXIST.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (start &gt;= existing-&gt;start &amp;&amp;</div><div class='del'>-		    start &lt; extent_map_end(existing)) {</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+		    start &lt; btrfs_extent_map_end(existing)) {</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 			*em_in = existing;</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -620,17 +736,16 @@ int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			 * The existing extent map is the one nearest to</div><div class='ctx'> 			 * the [start, start + len) range which overlaps</div><div class='ctx'> 			 */</div><div class='del'>-			ret = merge_extent_mapping(em_tree, existing,</div><div class='del'>-						   em, start);</div><div class='del'>-			if (ret) {</div><div class='del'>-				free_extent_map(em);</div><div class='add'>+			ret = merge_extent_mapping(inode, existing, em, start);</div><div class='add'>+			if (WARN_ON(ret)) {</div><div class='add'>+				btrfs_free_extent_map(em);</div><div class='ctx'> 				*em_in = NULL;</div><div class='del'>-				WARN_ONCE(ret,</div><div class='del'>-"unexpected error %d: merge existing(start %llu len %llu) with em(start %llu len %llu)\n",</div><div class='del'>-					  ret, existing-&gt;start, existing-&gt;len,</div><div class='del'>-					  orig_start, orig_len);</div><div class='add'>+				btrfs_warn(fs_info,</div><div class='add'>+"extent map merge error existing [%llu, %llu) with em [%llu, %llu) start %llu",</div><div class='add'>+					   existing-&gt;start, btrfs_extent_map_end(existing),</div><div class='add'>+					   orig_start, orig_start + orig_len, start);</div><div class='ctx'> 			}</div><div class='del'>-			free_extent_map(existing);</div><div class='add'>+			btrfs_free_extent_map(existing);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -643,19 +758,26 @@ int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * if needed. This avoids searching the tree, from the root down to the first</div><div class='ctx'>  * extent map, before each deletion.</div><div class='ctx'>  */</div><div class='del'>-static void drop_all_extent_maps_fast(struct extent_map_tree *tree)</div><div class='add'>+static void drop_all_extent_maps_fast(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='ctx'> 	write_lock(&amp;tree-&gt;lock);</div><div class='del'>-	while (!RB_EMPTY_ROOT(&amp;tree-&gt;map.rb_root)) {</div><div class='add'>+	node = rb_first(&amp;tree-&gt;root);</div><div class='add'>+	while (node) {</div><div class='ctx'> 		struct extent_map *em;</div><div class='del'>-		struct rb_node *node;</div><div class='add'>+		struct rb_node *next = rb_next(node);</div><div class='ctx'> </div><div class='del'>-		node = rb_first_cached(&amp;tree-&gt;map);</div><div class='ctx'> 		em = rb_entry(node, struct extent_map, rb_node);</div><div class='ctx'> 		em-&gt;flags &amp;= ~(EXTENT_FLAG_PINNED | EXTENT_FLAG_LOGGING);</div><div class='del'>-		remove_extent_mapping(tree, em);</div><div class='del'>-		free_extent_map(em);</div><div class='del'>-		cond_resched_rwlock_write(&amp;tree-&gt;lock);</div><div class='add'>+		btrfs_remove_extent_mapping(inode, em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+</div><div class='add'>+		if (cond_resched_rwlock_write(&amp;tree-&gt;lock))</div><div class='add'>+			node = rb_first(&amp;tree-&gt;root);</div><div class='add'>+		else</div><div class='add'>+			node = next;</div><div class='ctx'> 	}</div><div class='ctx'> 	write_unlock(&amp;tree-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -686,7 +808,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 	WARN_ON(end &lt; start);</div><div class='ctx'> 	if (end == (u64)-1) {</div><div class='ctx'> 		if (start == 0 &amp;&amp; !skip_pinned) {</div><div class='del'>-			drop_all_extent_maps_fast(em_tree);</div><div class='add'>+			drop_all_extent_maps_fast(inode);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		len = (u64)-1;</div><div class='hunk'>@@ -703,20 +825,19 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 	 * range ends after our range (and they might be the same extent map),</div><div class='ctx'> 	 * because we need to split those two extent maps at the boundaries.</div><div class='ctx'> 	 */</div><div class='del'>-	split = alloc_extent_map();</div><div class='del'>-	split2 = alloc_extent_map();</div><div class='add'>+	split = btrfs_alloc_extent_map();</div><div class='add'>+	split2 = btrfs_alloc_extent_map();</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, start, len);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, start, len);</div><div class='ctx'> </div><div class='ctx'> 	while (em) {</div><div class='ctx'> 		/* extent_map_end() returns exclusive value (last byte + 1). */</div><div class='del'>-		const u64 em_end = extent_map_end(em);</div><div class='add'>+		const u64 em_end = btrfs_extent_map_end(em);</div><div class='ctx'> 		struct extent_map *next_em = NULL;</div><div class='ctx'> 		u64 gen;</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> 		bool modified;</div><div class='del'>-		bool compressed;</div><div class='ctx'> </div><div class='ctx'> 		if (em_end &lt; end) {</div><div class='ctx'> 			next_em = next_extent_map(em);</div><div class='hunk'>@@ -750,7 +871,6 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 			goto remove_em;</div><div class='ctx'> </div><div class='ctx'> 		gen = em-&gt;generation;</div><div class='del'>-		compressed = extent_map_is_compressed(em);</div><div class='ctx'> </div><div class='ctx'> 		if (em-&gt;start &lt; start) {</div><div class='ctx'> 			if (!split) {</div><div class='hunk'>@@ -762,29 +882,22 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 			split-&gt;start = em-&gt;start;</div><div class='ctx'> 			split-&gt;len = start - em-&gt;start;</div><div class='ctx'> </div><div class='del'>-			if (em-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-				split-&gt;orig_start = em-&gt;orig_start;</div><div class='del'>-				split-&gt;block_start = em-&gt;block_start;</div><div class='del'>-</div><div class='del'>-				if (compressed)</div><div class='del'>-					split-&gt;block_len = em-&gt;block_len;</div><div class='del'>-				else</div><div class='del'>-					split-&gt;block_len = split-&gt;len;</div><div class='del'>-				split-&gt;orig_block_len = max(split-&gt;block_len,</div><div class='del'>-						em-&gt;orig_block_len);</div><div class='add'>+			if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+				split-&gt;disk_bytenr = em-&gt;disk_bytenr;</div><div class='add'>+				split-&gt;disk_num_bytes = em-&gt;disk_num_bytes;</div><div class='add'>+				split-&gt;offset = em-&gt;offset;</div><div class='ctx'> 				split-&gt;ram_bytes = em-&gt;ram_bytes;</div><div class='ctx'> 			} else {</div><div class='del'>-				split-&gt;orig_start = split-&gt;start;</div><div class='del'>-				split-&gt;block_len = 0;</div><div class='del'>-				split-&gt;block_start = em-&gt;block_start;</div><div class='del'>-				split-&gt;orig_block_len = 0;</div><div class='add'>+				split-&gt;disk_bytenr = em-&gt;disk_bytenr;</div><div class='add'>+				split-&gt;disk_num_bytes = 0;</div><div class='add'>+				split-&gt;offset = 0;</div><div class='ctx'> 				split-&gt;ram_bytes = split-&gt;len;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			split-&gt;generation = gen;</div><div class='ctx'> 			split-&gt;flags = flags;</div><div class='del'>-			replace_extent_mapping(em_tree, em, split, modified);</div><div class='del'>-			free_extent_map(split);</div><div class='add'>+			replace_extent_mapping(inode, em, split, modified);</div><div class='add'>+			btrfs_free_extent_map(split);</div><div class='ctx'> 			split = split2;</div><div class='ctx'> 			split2 = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -797,50 +910,36 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 			}</div><div class='ctx'> 			split-&gt;start = end;</div><div class='ctx'> 			split-&gt;len = em_end - end;</div><div class='del'>-			split-&gt;block_start = em-&gt;block_start;</div><div class='add'>+			split-&gt;disk_bytenr = em-&gt;disk_bytenr;</div><div class='ctx'> 			split-&gt;flags = flags;</div><div class='ctx'> 			split-&gt;generation = gen;</div><div class='ctx'> </div><div class='del'>-			if (em-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-				split-&gt;orig_block_len = max(em-&gt;block_len,</div><div class='del'>-						    em-&gt;orig_block_len);</div><div class='del'>-</div><div class='add'>+			if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+				split-&gt;disk_num_bytes = em-&gt;disk_num_bytes;</div><div class='add'>+				split-&gt;offset = em-&gt;offset + end - em-&gt;start;</div><div class='ctx'> 				split-&gt;ram_bytes = em-&gt;ram_bytes;</div><div class='del'>-				if (compressed) {</div><div class='del'>-					split-&gt;block_len = em-&gt;block_len;</div><div class='del'>-					split-&gt;orig_start = em-&gt;orig_start;</div><div class='del'>-				} else {</div><div class='del'>-					const u64 diff = start + len - em-&gt;start;</div><div class='del'>-</div><div class='del'>-					split-&gt;block_len = split-&gt;len;</div><div class='del'>-					split-&gt;block_start += diff;</div><div class='del'>-					split-&gt;orig_start = em-&gt;orig_start;</div><div class='del'>-				}</div><div class='ctx'> 			} else {</div><div class='add'>+				split-&gt;disk_num_bytes = 0;</div><div class='add'>+				split-&gt;offset = 0;</div><div class='ctx'> 				split-&gt;ram_bytes = split-&gt;len;</div><div class='del'>-				split-&gt;orig_start = split-&gt;start;</div><div class='del'>-				split-&gt;block_len = 0;</div><div class='del'>-				split-&gt;orig_block_len = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (extent_map_in_tree(em)) {</div><div class='del'>-				replace_extent_mapping(em_tree, em, split,</div><div class='del'>-						       modified);</div><div class='add'>+			if (btrfs_extent_map_in_tree(em)) {</div><div class='add'>+				replace_extent_mapping(inode, em, split, modified);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				int ret;</div><div class='ctx'> </div><div class='del'>-				ret = add_extent_mapping(em_tree, split,</div><div class='del'>-							 modified);</div><div class='add'>+				ret = add_extent_mapping(inode, split, modified);</div><div class='ctx'> 				/* Logic error, shouldn't happen. */</div><div class='ctx'> 				ASSERT(ret == 0);</div><div class='ctx'> 				if (WARN_ON(ret != 0) &amp;&amp; modified)</div><div class='ctx'> 					btrfs_set_inode_full_sync(inode);</div><div class='ctx'> 			}</div><div class='del'>-			free_extent_map(split);</div><div class='add'>+			btrfs_free_extent_map(split);</div><div class='ctx'> 			split = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> remove_em:</div><div class='del'>-		if (extent_map_in_tree(em)) {</div><div class='add'>+		if (btrfs_extent_map_in_tree(em)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If the extent map is still in the tree it means that</div><div class='ctx'> 			 * either of the following is true:</div><div class='hunk'>@@ -865,25 +964,25 @@ remove_em:</div><div class='ctx'> 				ASSERT(!split);</div><div class='ctx'> 				btrfs_set_inode_full_sync(inode);</div><div class='ctx'> 			}</div><div class='del'>-			remove_extent_mapping(em_tree, em);</div><div class='add'>+			btrfs_remove_extent_mapping(inode, em);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Once for the tree reference (we replaced or removed the</div><div class='ctx'> 		 * extent map from the tree).</div><div class='ctx'> 		 */</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> next:</div><div class='ctx'> 		/* Once for us (for our lookup reference). */</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 		em = next_em;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	free_extent_map(split);</div><div class='del'>-	free_extent_map(split2);</div><div class='add'>+	btrfs_free_extent_map(split);</div><div class='add'>+	btrfs_free_extent_map(split2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -907,7 +1006,7 @@ int btrfs_replace_extent_map_range(struct btrfs_inode *inode,</div><div class='ctx'> 	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(!extent_map_in_tree(new_em));</div><div class='add'>+	ASSERT(!btrfs_extent_map_in_tree(new_em));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The caller has locked an appropriate file range in the inode's io</div><div class='hunk'>@@ -920,7 +1019,7 @@ int btrfs_replace_extent_map_range(struct btrfs_inode *inode,</div><div class='ctx'> 	do {</div><div class='ctx'> 		btrfs_drop_extent_map_range(inode, new_em-&gt;start, end, false);</div><div class='ctx'> 		write_lock(&amp;tree-&gt;lock);</div><div class='del'>-		ret = add_extent_mapping(tree, new_em, modified);</div><div class='add'>+		ret = add_extent_mapping(inode, new_em, modified);</div><div class='ctx'> 		write_unlock(&amp;tree-&gt;lock);</div><div class='ctx'> 	} while (ret == -EEXIST);</div><div class='ctx'> </div><div class='hunk'>@@ -933,8 +1032,8 @@ int btrfs_replace_extent_map_range(struct btrfs_inode *inode,</div><div class='ctx'>  *</div><div class='ctx'>  * This function is used when an ordered_extent needs to be split.</div><div class='ctx'>  */</div><div class='del'>-int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='del'>-		     u64 new_logical)</div><div class='add'>+int btrfs_split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='add'>+			   u64 new_logical)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='hunk'>@@ -946,26 +1045,26 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='ctx'> 	ASSERT(pre != 0);</div><div class='ctx'> 	ASSERT(pre &lt; len);</div><div class='ctx'> </div><div class='del'>-	split_pre = alloc_extent_map();</div><div class='add'>+	split_pre = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!split_pre)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	split_mid = alloc_extent_map();</div><div class='add'>+	split_mid = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!split_mid) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_free_pre;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lock_extent(&amp;inode-&gt;io_tree, start, start + len - 1, NULL);</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, start, start + len - 1, NULL);</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, start, len);</div><div class='del'>-	if (!em) {</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, start, len);</div><div class='add'>+	if (unlikely(!em)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(em-&gt;len == len);</div><div class='del'>-	ASSERT(!extent_map_is_compressed(em));</div><div class='del'>-	ASSERT(em-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE);</div><div class='add'>+	ASSERT(!btrfs_extent_map_is_compressed(em));</div><div class='add'>+	ASSERT(em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE);</div><div class='ctx'> 	ASSERT(em-&gt;flags &amp; EXTENT_FLAG_PINNED);</div><div class='ctx'> 	ASSERT(!(em-&gt;flags &amp; EXTENT_FLAG_LOGGING));</div><div class='ctx'> 	ASSERT(!list_empty(&amp;em-&gt;list));</div><div class='hunk'>@@ -976,15 +1075,14 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='ctx'> 	/* First, replace the em with a new extent_map starting from * em-&gt;start */</div><div class='ctx'> 	split_pre-&gt;start = em-&gt;start;</div><div class='ctx'> 	split_pre-&gt;len = pre;</div><div class='del'>-	split_pre-&gt;orig_start = split_pre-&gt;start;</div><div class='del'>-	split_pre-&gt;block_start = new_logical;</div><div class='del'>-	split_pre-&gt;block_len = split_pre-&gt;len;</div><div class='del'>-	split_pre-&gt;orig_block_len = split_pre-&gt;block_len;</div><div class='add'>+	split_pre-&gt;disk_bytenr = new_logical;</div><div class='add'>+	split_pre-&gt;disk_num_bytes = split_pre-&gt;len;</div><div class='add'>+	split_pre-&gt;offset = 0;</div><div class='ctx'> 	split_pre-&gt;ram_bytes = split_pre-&gt;len;</div><div class='ctx'> 	split_pre-&gt;flags = flags;</div><div class='ctx'> 	split_pre-&gt;generation = em-&gt;generation;</div><div class='ctx'> </div><div class='del'>-	replace_extent_mapping(em_tree, em, split_pre, 1);</div><div class='add'>+	replace_extent_mapping(inode, em, split_pre, true);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now we only have an extent_map at:</div><div class='hunk'>@@ -994,25 +1092,291 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='ctx'> 	/* Insert the middle extent_map. */</div><div class='ctx'> 	split_mid-&gt;start = em-&gt;start + pre;</div><div class='ctx'> 	split_mid-&gt;len = em-&gt;len - pre;</div><div class='del'>-	split_mid-&gt;orig_start = split_mid-&gt;start;</div><div class='del'>-	split_mid-&gt;block_start = em-&gt;block_start + pre;</div><div class='del'>-	split_mid-&gt;block_len = split_mid-&gt;len;</div><div class='del'>-	split_mid-&gt;orig_block_len = split_mid-&gt;block_len;</div><div class='add'>+	split_mid-&gt;disk_bytenr = btrfs_extent_map_block_start(em) + pre;</div><div class='add'>+	split_mid-&gt;disk_num_bytes = split_mid-&gt;len;</div><div class='add'>+	split_mid-&gt;offset = 0;</div><div class='ctx'> 	split_mid-&gt;ram_bytes = split_mid-&gt;len;</div><div class='ctx'> 	split_mid-&gt;flags = flags;</div><div class='ctx'> 	split_mid-&gt;generation = em-&gt;generation;</div><div class='del'>-	add_extent_mapping(em_tree, split_mid, 1);</div><div class='add'>+	add_extent_mapping(inode, split_mid, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Once for us */</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	/* Once for the tree */</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, start, start + len - 1, NULL);</div><div class='del'>-	free_extent_map(split_mid);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, start + len - 1, NULL);</div><div class='add'>+	btrfs_free_extent_map(split_mid);</div><div class='ctx'> out_free_pre:</div><div class='del'>-	free_extent_map(split_pre);</div><div class='add'>+	btrfs_free_extent_map(split_pre);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct btrfs_em_shrink_ctx {</div><div class='add'>+	long nr_to_scan;</div><div class='add'>+	long scanned;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static long btrfs_scan_inode(struct btrfs_inode *inode, struct btrfs_em_shrink_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	const u64 cur_fs_gen = btrfs_get_fs_generation(fs_info);</div><div class='add'>+	struct extent_map_tree *tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+	long nr_dropped = 0;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_write(&amp;tree-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Take the mmap lock so that we serialize with the inode logging phase</div><div class='add'>+	 * of fsync because we may need to set the full sync flag on the inode,</div><div class='add'>+	 * in case we have to remove extent maps in the tree's list of modified</div><div class='add'>+	 * extents. If we set the full sync flag in the inode while an fsync is</div><div class='add'>+	 * in progress, we may risk missing new extents because before the flag</div><div class='add'>+	 * is set, fsync decides to only wait for writeback to complete and then</div><div class='add'>+	 * during inode logging it sees the flag set and uses the subvolume tree</div><div class='add'>+	 * to find new extents, which may not be there yet because ordered</div><div class='add'>+	 * extents haven't completed yet.</div><div class='add'>+	 *</div><div class='add'>+	 * We also do a try lock because we don't want to block for too long and</div><div class='add'>+	 * we are holding the extent map tree's lock in write mode.</div><div class='add'>+	 */</div><div class='add'>+	if (!down_read_trylock(&amp;inode-&gt;i_mmap_lock))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	node = rb_first(&amp;tree-&gt;root);</div><div class='add'>+	while (node) {</div><div class='add'>+		struct rb_node *next = rb_next(node);</div><div class='add'>+		struct extent_map *em;</div><div class='add'>+</div><div class='add'>+		em = rb_entry(node, struct extent_map, rb_node);</div><div class='add'>+		ctx-&gt;scanned++;</div><div class='add'>+</div><div class='add'>+		if (em-&gt;flags &amp; EXTENT_FLAG_PINNED)</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the inode is in the list of modified extents (new) and its</div><div class='add'>+		 * generation is the same (or is greater than) the current fs</div><div class='add'>+		 * generation, it means it was not yet persisted so we have to</div><div class='add'>+		 * set the full sync flag so that the next fsync will not miss</div><div class='add'>+		 * it.</div><div class='add'>+		 */</div><div class='add'>+		if (!list_empty(&amp;em-&gt;list) &amp;&amp; em-&gt;generation &gt;= cur_fs_gen)</div><div class='add'>+			btrfs_set_inode_full_sync(inode);</div><div class='add'>+</div><div class='add'>+		btrfs_remove_extent_mapping(inode, em);</div><div class='add'>+		trace_btrfs_extent_map_shrinker_remove_em(inode, em);</div><div class='add'>+		/* Drop the reference for the tree. */</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+		nr_dropped++;</div><div class='add'>+next:</div><div class='add'>+		if (ctx-&gt;scanned &gt;= ctx-&gt;nr_to_scan)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Stop if we need to reschedule or there's contention on the</div><div class='add'>+		 * lock. This is to avoid slowing other tasks trying to take the</div><div class='add'>+		 * lock.</div><div class='add'>+		 */</div><div class='add'>+		if (need_resched() || rwlock_needbreak(&amp;tree-&gt;lock) ||</div><div class='add'>+		    btrfs_fs_closing(fs_info))</div><div class='add'>+			break;</div><div class='add'>+		node = next;</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+</div><div class='add'>+	return nr_dropped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct btrfs_inode *find_first_inode_to_shrink(struct btrfs_root *root,</div><div class='add'>+						      u64 min_ino)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	unsigned long from = min_ino;</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;root-&gt;inodes);</div><div class='add'>+	while (true) {</div><div class='add'>+		struct extent_map_tree *tree;</div><div class='add'>+</div><div class='add'>+		inode = xa_find(&amp;root-&gt;inodes, &amp;from, ULONG_MAX, XA_PRESENT);</div><div class='add'>+		if (!inode)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We want to be fast so if the lock is busy we don't want to</div><div class='add'>+		 * spend time waiting for it (some task is about to do IO for</div><div class='add'>+		 * the inode).</div><div class='add'>+		 */</div><div class='add'>+		if (!write_trylock(&amp;tree-&gt;lock))</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Skip inode if it doesn't have loaded extent maps, so we avoid</div><div class='add'>+		 * getting a reference and doing an iput later. This includes</div><div class='add'>+		 * cases like files that were opened for things like stat(2), or</div><div class='add'>+		 * files with all extent maps previously released through the</div><div class='add'>+		 * release folio callback (btrfs_release_folio()) or released in</div><div class='add'>+		 * a previous run, or directories which never have extent maps.</div><div class='add'>+		 */</div><div class='add'>+		if (RB_EMPTY_ROOT(&amp;tree-&gt;root)) {</div><div class='add'>+			write_unlock(&amp;tree-&gt;lock);</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (igrab(&amp;inode-&gt;vfs_inode))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		write_unlock(&amp;tree-&gt;lock);</div><div class='add'>+next:</div><div class='add'>+		from = btrfs_ino(inode) + 1;</div><div class='add'>+		cond_resched_lock(&amp;root-&gt;inodes.xa_lock);</div><div class='add'>+	}</div><div class='add'>+	xa_unlock(&amp;root-&gt;inodes);</div><div class='add'>+</div><div class='add'>+	return inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long btrfs_scan_root(struct btrfs_root *root, struct btrfs_em_shrink_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	long nr_dropped = 0;</div><div class='add'>+	u64 min_ino = fs_info-&gt;em_shrinker_last_ino + 1;</div><div class='add'>+</div><div class='add'>+	inode = find_first_inode_to_shrink(root, min_ino);</div><div class='add'>+	while (inode) {</div><div class='add'>+		nr_dropped += btrfs_scan_inode(inode, ctx);</div><div class='add'>+		write_unlock(&amp;inode-&gt;extent_tree.lock);</div><div class='add'>+</div><div class='add'>+		min_ino = btrfs_ino(inode) + 1;</div><div class='add'>+		fs_info-&gt;em_shrinker_last_ino = btrfs_ino(inode);</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;scanned &gt;= ctx-&gt;nr_to_scan || btrfs_fs_closing(fs_info))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='add'>+</div><div class='add'>+		inode = find_first_inode_to_shrink(root, min_ino);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inode) {</div><div class='add'>+		/*</div><div class='add'>+		 * There are still inodes in this root or we happened to process</div><div class='add'>+		 * the last one and reached the scan limit. In either case set</div><div class='add'>+		 * the current root to this one, so we'll resume from the next</div><div class='add'>+		 * inode if there is one or we will find out this was the last</div><div class='add'>+		 * one and move to the next root.</div><div class='add'>+		 */</div><div class='add'>+		fs_info-&gt;em_shrinker_last_root = btrfs_root_id(root);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * No more inodes in this root, set extent_map_shrinker_last_ino to 0 so</div><div class='add'>+		 * that when processing the next root we start from its first inode.</div><div class='add'>+		 */</div><div class='add'>+		fs_info-&gt;em_shrinker_last_ino = 0;</div><div class='add'>+		fs_info-&gt;em_shrinker_last_root = btrfs_root_id(root) + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nr_dropped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btrfs_extent_map_shrinker_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	struct btrfs_em_shrink_ctx ctx;</div><div class='add'>+	u64 start_root_id;</div><div class='add'>+	u64 next_root_id;</div><div class='add'>+	bool cycled = false;</div><div class='add'>+	long nr_dropped = 0;</div><div class='add'>+</div><div class='add'>+	fs_info = container_of(work, struct btrfs_fs_info, em_shrinker_work);</div><div class='add'>+</div><div class='add'>+	ctx.scanned = 0;</div><div class='add'>+	ctx.nr_to_scan = atomic64_read(&amp;fs_info-&gt;em_shrinker_nr_to_scan);</div><div class='add'>+</div><div class='add'>+	start_root_id = fs_info-&gt;em_shrinker_last_root;</div><div class='add'>+	next_root_id = fs_info-&gt;em_shrinker_last_root;</div><div class='add'>+</div><div class='add'>+	if (trace_btrfs_extent_map_shrinker_scan_enter_enabled()) {</div><div class='add'>+		s64 nr = percpu_counter_sum_positive(&amp;fs_info-&gt;evictable_extent_maps);</div><div class='add'>+</div><div class='add'>+		trace_btrfs_extent_map_shrinker_scan_enter(fs_info, nr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (ctx.scanned &lt; ctx.nr_to_scan &amp;&amp; !btrfs_fs_closing(fs_info)) {</div><div class='add'>+		struct btrfs_root *root;</div><div class='add'>+		unsigned long count;</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='add'>+		count = radix_tree_gang_lookup(&amp;fs_info-&gt;fs_roots_radix,</div><div class='add'>+					       (void **)&amp;root,</div><div class='add'>+					       (unsigned long)next_root_id, 1);</div><div class='add'>+		if (count == 0) {</div><div class='add'>+			spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='add'>+			if (start_root_id &gt; 0 &amp;&amp; !cycled) {</div><div class='add'>+				next_root_id = 0;</div><div class='add'>+				fs_info-&gt;em_shrinker_last_root = 0;</div><div class='add'>+				fs_info-&gt;em_shrinker_last_ino = 0;</div><div class='add'>+				cycled = true;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		next_root_id = btrfs_root_id(root) + 1;</div><div class='add'>+		root = btrfs_grab_root(root);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='add'>+</div><div class='add'>+		if (!root)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (btrfs_is_fstree(btrfs_root_id(root)))</div><div class='add'>+			nr_dropped += btrfs_scan_root(root, &amp;ctx);</div><div class='add'>+</div><div class='add'>+		btrfs_put_root(root);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trace_btrfs_extent_map_shrinker_scan_exit_enabled()) {</div><div class='add'>+		s64 nr = percpu_counter_sum_positive(&amp;fs_info-&gt;evictable_extent_maps);</div><div class='add'>+</div><div class='add'>+		trace_btrfs_extent_map_shrinker_scan_exit(fs_info, nr_dropped, nr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic64_set(&amp;fs_info-&gt;em_shrinker_nr_to_scan, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_free_extent_maps(struct btrfs_fs_info *fs_info, long nr_to_scan)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Do nothing if the shrinker is already running. In case of high memory</div><div class='add'>+	 * pressure we can have a lot of tasks calling us and all passing the</div><div class='add'>+	 * same nr_to_scan value, but in reality we may need only to free</div><div class='add'>+	 * nr_to_scan extent maps (or less). In case we need to free more than</div><div class='add'>+	 * that, we will be called again by the fs shrinker, so no worries about</div><div class='add'>+	 * not doing enough work to reclaim memory from extent maps.</div><div class='add'>+	 * We can also be repeatedly called with the same nr_to_scan value</div><div class='add'>+	 * simply because the shrinker runs asynchronously and multiple calls</div><div class='add'>+	 * to this function are made before the shrinker does enough progress.</div><div class='add'>+	 *</div><div class='add'>+	 * That's why we set the atomic counter to nr_to_scan only if its</div><div class='add'>+	 * current value is zero, instead of incrementing the counter by</div><div class='add'>+	 * nr_to_scan.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic64_cmpxchg(&amp;fs_info-&gt;em_shrinker_nr_to_scan, 0, nr_to_scan) != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	queue_work(system_dfl_wq, &amp;fs_info-&gt;em_shrinker_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_init_extent_map_shrinker_work(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	atomic64_set(&amp;fs_info-&gt;em_shrinker_nr_to_scan, 0);</div><div class='add'>+	INIT_WORK(&amp;fs_info-&gt;em_shrinker_work, btrfs_extent_map_shrinker_worker);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h<br/>index e380fc08bbe4..6f685f3c9327 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_map.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/extent_map.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/extent_map.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/extent_map.h</a></div><div class='hunk'>@@ -3,9 +3,15 @@</div><div class='ctx'> #ifndef BTRFS_EXTENT_MAP_H</div><div class='ctx'> #define BTRFS_EXTENT_MAP_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+#include &lt;linux/spinlock_types.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='del'>-#include "compression.h"</div><div class='add'>+#include "fs.h"</div><div class='add'>+</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> </div><div class='ctx'> #define EXTENT_MAP_LAST_BYTE ((u64)-4)</div><div class='ctx'> #define EXTENT_MAP_HOLE ((u64)-3)</div><div class='hunk'>@@ -22,29 +28,65 @@ enum {</div><div class='ctx'> 	ENUM_BIT(EXTENT_FLAG_PREALLOC),</div><div class='ctx'> 	/* Logging this extent */</div><div class='ctx'> 	ENUM_BIT(EXTENT_FLAG_LOGGING),</div><div class='del'>-	/* Filling in a preallocated extent */</div><div class='del'>-	ENUM_BIT(EXTENT_FLAG_FILLING),</div><div class='ctx'> 	/* This em is merged from two or more physically adjacent ems */</div><div class='ctx'> 	ENUM_BIT(EXTENT_FLAG_MERGED),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This structure represents file extents and holes.</div><div class='add'>+ *</div><div class='add'>+ * Unlike on-disk file extent items, extent maps can be merged to save memory.</div><div class='add'>+ * This means members only match file extent items before any merging.</div><div class='add'>+ *</div><div class='ctx'>  * Keep this structure as compact as possible, as we can have really large</div><div class='ctx'>  * amounts of allocated extent maps at any time.</div><div class='ctx'>  */</div><div class='ctx'> struct extent_map {</div><div class='ctx'> 	struct rb_node rb_node;</div><div class='ctx'> </div><div class='del'>-	/* all of these are in bytes */</div><div class='add'>+	/* All of these are in bytes. */</div><div class='add'>+</div><div class='add'>+	/* File offset matching the offset of a BTRFS_EXTENT_ITEM_KEY key. */</div><div class='ctx'> 	u64 start;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Length of the file extent.</div><div class='add'>+	 *</div><div class='add'>+	 * For non-inlined file extents it's btrfs_file_extent_item::num_bytes.</div><div class='add'>+	 * For inline extents it's sectorsize, since inline data starts at</div><div class='add'>+	 * offsetof(struct btrfs_file_extent_item, disk_bytenr) thus</div><div class='add'>+	 * btrfs_file_extent_item::num_bytes is not valid.</div><div class='add'>+	 */</div><div class='ctx'> 	u64 len;</div><div class='del'>-	u64 mod_start;</div><div class='del'>-	u64 mod_len;</div><div class='del'>-	u64 orig_start;</div><div class='del'>-	u64 orig_block_len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The bytenr of the full on-disk extent.</div><div class='add'>+	 *</div><div class='add'>+	 * For regular extents it's btrfs_file_extent_item::disk_bytenr.</div><div class='add'>+	 * For holes it's EXTENT_MAP_HOLE and for inline extents it's</div><div class='add'>+	 * EXTENT_MAP_INLINE.</div><div class='add'>+	 */</div><div class='add'>+	u64 disk_bytenr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The full on-disk extent length, matching</div><div class='add'>+	 * btrfs_file_extent_item::disk_num_bytes.</div><div class='add'>+	 */</div><div class='add'>+	u64 disk_num_bytes;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Offset inside the decompressed extent.</div><div class='add'>+	 *</div><div class='add'>+	 * For regular extents it's btrfs_file_extent_item::offset.</div><div class='add'>+	 * For holes and inline extents it's 0.</div><div class='add'>+	 */</div><div class='add'>+	u64 offset;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressed size of the whole on-disk extent, matching</div><div class='add'>+	 * btrfs_file_extent_item::ram_bytes.</div><div class='add'>+	 */</div><div class='ctx'> 	u64 ram_bytes;</div><div class='del'>-	u64 block_start;</div><div class='del'>-	u64 block_len;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Generation of the extent map, for merged em it's the highest</div><div class='hunk'>@@ -58,15 +100,15 @@ struct extent_map {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct extent_map_tree {</div><div class='del'>-	struct rb_root_cached map;</div><div class='add'>+	struct rb_root root;</div><div class='ctx'> 	struct list_head modified_extents;</div><div class='ctx'> 	rwlock_t lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct btrfs_inode;</div><div class='ctx'> </div><div class='del'>-static inline void extent_map_set_compression(struct extent_map *em,</div><div class='del'>-					      enum btrfs_compression_type type)</div><div class='add'>+static inline void btrfs_extent_map_set_compression(struct extent_map *em,</div><div class='add'>+						    enum btrfs_compression_type type)</div><div class='ctx'> {</div><div class='ctx'> 	if (type == BTRFS_COMPRESS_ZLIB)</div><div class='ctx'> 		em-&gt;flags |= EXTENT_FLAG_COMPRESS_ZLIB;</div><div class='hunk'>@@ -76,7 +118,8 @@ static inline void extent_map_set_compression(struct extent_map *em,</div><div class='ctx'> 		em-&gt;flags |= EXTENT_FLAG_COMPRESS_ZSTD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline enum btrfs_compression_type extent_map_compression(const struct extent_map *em)</div><div class='add'>+static inline enum btrfs_compression_type btrfs_extent_map_compression(</div><div class='add'>+						       const struct extent_map *em)</div><div class='ctx'> {</div><div class='ctx'> 	if (em-&gt;flags &amp; EXTENT_FLAG_COMPRESS_ZLIB)</div><div class='ctx'> 		return BTRFS_COMPRESS_ZLIB;</div><div class='hunk'>@@ -94,42 +137,51 @@ static inline enum btrfs_compression_type extent_map_compression(const struct ex</div><div class='ctx'>  * More efficient way to determine if extent is compressed, instead of using</div><div class='ctx'>  * 'extent_map_compression() != BTRFS_COMPRESS_NONE'.</div><div class='ctx'>  */</div><div class='del'>-static inline bool extent_map_is_compressed(const struct extent_map *em)</div><div class='add'>+static inline bool btrfs_extent_map_is_compressed(const struct extent_map *em)</div><div class='ctx'> {</div><div class='ctx'> 	return (em-&gt;flags &amp; (EXTENT_FLAG_COMPRESS_ZLIB |</div><div class='ctx'> 			     EXTENT_FLAG_COMPRESS_LZO |</div><div class='ctx'> 			     EXTENT_FLAG_COMPRESS_ZSTD)) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int extent_map_in_tree(const struct extent_map *em)</div><div class='add'>+static inline int btrfs_extent_map_in_tree(const struct extent_map *em)</div><div class='ctx'> {</div><div class='ctx'> 	return !RB_EMPTY_NODE(&amp;em-&gt;rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 extent_map_end(const struct extent_map *em)</div><div class='add'>+static inline u64 btrfs_extent_map_block_start(const struct extent_map *em)</div><div class='add'>+{</div><div class='add'>+	if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		if (btrfs_extent_map_is_compressed(em))</div><div class='add'>+			return em-&gt;disk_bytenr;</div><div class='add'>+		return em-&gt;disk_bytenr + em-&gt;offset;</div><div class='add'>+	}</div><div class='add'>+	return em-&gt;disk_bytenr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 btrfs_extent_map_end(const struct extent_map *em)</div><div class='ctx'> {</div><div class='ctx'> 	if (em-&gt;start + em-&gt;len &lt; em-&gt;start)</div><div class='ctx'> 		return (u64)-1;</div><div class='ctx'> 	return em-&gt;start + em-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void extent_map_tree_init(struct extent_map_tree *tree);</div><div class='del'>-struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='del'>-					 u64 start, u64 len);</div><div class='del'>-void remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em);</div><div class='del'>-int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='del'>-		     u64 new_logical);</div><div class='del'>-</div><div class='del'>-struct extent_map *alloc_extent_map(void);</div><div class='del'>-void free_extent_map(struct extent_map *em);</div><div class='del'>-int __init extent_map_init(void);</div><div class='del'>-void __cold extent_map_exit(void);</div><div class='del'>-int unpin_extent_cache(struct btrfs_inode *inode, u64 start, u64 len, u64 gen);</div><div class='del'>-void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em);</div><div class='del'>-struct extent_map *search_extent_mapping(struct extent_map_tree *tree,</div><div class='del'>-					 u64 start, u64 len);</div><div class='del'>-int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,</div><div class='del'>-			     struct extent_map_tree *em_tree,</div><div class='add'>+void btrfs_extent_map_tree_init(struct extent_map_tree *tree);</div><div class='add'>+struct extent_map *btrfs_lookup_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+					       u64 start, u64 len);</div><div class='add'>+void btrfs_remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *em);</div><div class='add'>+int btrfs_split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,</div><div class='add'>+			   u64 new_logical);</div><div class='add'>+</div><div class='add'>+struct extent_map *btrfs_alloc_extent_map(void);</div><div class='add'>+void btrfs_free_extent_map(struct extent_map *em);</div><div class='add'>+int __init btrfs_extent_map_init(void);</div><div class='add'>+void __cold btrfs_extent_map_exit(void);</div><div class='add'>+int btrfs_unpin_extent_cache(struct btrfs_inode *inode, u64 start, u64 len, u64 gen);</div><div class='add'>+void btrfs_clear_em_logging(struct btrfs_inode *inode, struct extent_map *em);</div><div class='add'>+struct extent_map *btrfs_search_extent_mapping(struct extent_map_tree *tree,</div><div class='add'>+					       u64 start, u64 len);</div><div class='add'>+int btrfs_add_extent_mapping(struct btrfs_inode *inode,</div><div class='ctx'> 			     struct extent_map **em_in, u64 start, u64 len);</div><div class='ctx'> void btrfs_drop_extent_map_range(struct btrfs_inode *inode,</div><div class='ctx'> 				 u64 start, u64 end,</div><div class='hunk'>@@ -137,5 +189,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode,</div><div class='ctx'> int btrfs_replace_extent_map_range(struct btrfs_inode *inode,</div><div class='ctx'> 				   struct extent_map *new_em,</div><div class='ctx'> 				   bool modified);</div><div class='add'>+void btrfs_free_extent_maps(struct btrfs_fs_info *fs_info, long nr_to_scan);</div><div class='add'>+void btrfs_init_extent_map_shrinker_work(struct btrfs_fs_info *fs_info);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/fiemap.c b/fs/btrfs/fiemap.c<br/>new file mode 100644<br/>index 000000000000..f2eaaef8422b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/fiemap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/fiemap.c</a></div><div class='hunk'>@@ -0,0 +1,929 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "backref.h"</div><div class='add'>+#include "btrfs_inode.h"</div><div class='add'>+#include "fiemap.h"</div><div class='add'>+#include "file.h"</div><div class='add'>+#include "file-item.h"</div><div class='add'>+</div><div class='add'>+struct btrfs_fiemap_entry {</div><div class='add'>+	u64 offset;</div><div class='add'>+	u64 phys;</div><div class='add'>+	u64 len;</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Indicate the caller of emit_fiemap_extent() that it needs to unlock the file</div><div class='add'>+ * range from the inode's io tree, unlock the subvolume tree search path, flush</div><div class='add'>+ * the fiemap cache and relock the file range and research the subvolume tree.</div><div class='add'>+ * The value here is something negative that can't be confused with a valid</div><div class='add'>+ * errno value and different from 1 because that's also a return value from</div><div class='add'>+ * fiemap_fill_next_extent() and also it's often used to mean some btree search</div><div class='add'>+ * did not find a key, so make it some distinct negative value.</div><div class='add'>+ */</div><div class='add'>+#define BTRFS_FIEMAP_FLUSH_CACHE (-(MAX_ERRNO + 1))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used to:</div><div class='add'>+ *</div><div class='add'>+ * - Cache the next entry to be emitted to the fiemap buffer, so that we can</div><div class='add'>+ *   merge extents that are contiguous and can be grouped as a single one;</div><div class='add'>+ *</div><div class='add'>+ * - Store extents ready to be written to the fiemap buffer in an intermediary</div><div class='add'>+ *   buffer. This intermediary buffer is to ensure that in case the fiemap</div><div class='add'>+ *   buffer is memory mapped to the fiemap target file, we don't deadlock</div><div class='add'>+ *   during btrfs_page_mkwrite(). This is because during fiemap we are locking</div><div class='add'>+ *   an extent range in order to prevent races with delalloc flushing and</div><div class='add'>+ *   ordered extent completion, which is needed in order to reliably detect</div><div class='add'>+ *   delalloc in holes and prealloc extents. And this can lead to a deadlock</div><div class='add'>+ *   if the fiemap buffer is memory mapped to the file we are running fiemap</div><div class='add'>+ *   against (a silly, useless in practice scenario, but possible) because</div><div class='add'>+ *   btrfs_page_mkwrite() will try to lock the same extent range.</div><div class='add'>+ */</div><div class='add'>+struct fiemap_cache {</div><div class='add'>+	/* An array of ready fiemap entries. */</div><div class='add'>+	struct btrfs_fiemap_entry *entries;</div><div class='add'>+	/* Number of entries in the entries array. */</div><div class='add'>+	int entries_size;</div><div class='add'>+	/* Index of the next entry in the entries array to write to. */</div><div class='add'>+	int entries_pos;</div><div class='add'>+	/*</div><div class='add'>+	 * Once the entries array is full, this indicates what's the offset for</div><div class='add'>+	 * the next file extent item we must search for in the inode's subvolume</div><div class='add'>+	 * tree after unlocking the extent range in the inode's io tree and</div><div class='add'>+	 * releasing the search path.</div><div class='add'>+	 */</div><div class='add'>+	u64 next_search_offset;</div><div class='add'>+	/*</div><div class='add'>+	 * This matches struct fiemap_extent_info::fi_mapped_extents, we use it</div><div class='add'>+	 * to count ourselves emitted extents and stop instead of relying on</div><div class='add'>+	 * fiemap_fill_next_extent() because we buffer ready fiemap entries at</div><div class='add'>+	 * the @entries array, and we want to stop as soon as we hit the max</div><div class='add'>+	 * amount of extents to map, not just to save time but also to make the</div><div class='add'>+	 * logic at extent_fiemap() simpler.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int extents_mapped;</div><div class='add'>+	/* Fields for the cached extent (unsubmitted, not ready, extent). */</div><div class='add'>+	u64 offset;</div><div class='add'>+	u64 phys;</div><div class='add'>+	u64 len;</div><div class='add'>+	u32 flags;</div><div class='add'>+	bool cached;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int flush_fiemap_cache(struct fiemap_extent_info *fieinfo,</div><div class='add'>+			      struct fiemap_cache *cache)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; cache-&gt;entries_pos; i++) {</div><div class='add'>+		struct btrfs_fiemap_entry *entry = &amp;cache-&gt;entries[i];</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = fiemap_fill_next_extent(fieinfo, entry-&gt;offset,</div><div class='add'>+					      entry-&gt;phys, entry-&gt;len,</div><div class='add'>+					      entry-&gt;flags);</div><div class='add'>+		/*</div><div class='add'>+		 * Ignore 1 (reached max entries) because we keep track of that</div><div class='add'>+		 * ourselves in emit_fiemap_extent().</div><div class='add'>+		 */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	cache-&gt;entries_pos = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper to submit fiemap extent.</div><div class='add'>+ *</div><div class='add'>+ * Will try to merge current fiemap extent specified by @offset, @phys,</div><div class='add'>+ * @len and @flags with cached one.</div><div class='add'>+ * And only when we fails to merge, cached one will be submitted as</div><div class='add'>+ * fiemap extent.</div><div class='add'>+ *</div><div class='add'>+ * Return value is the same as fiemap_fill_next_extent().</div><div class='add'>+ */</div><div class='add'>+static int emit_fiemap_extent(struct fiemap_extent_info *fieinfo,</div><div class='add'>+				struct fiemap_cache *cache,</div><div class='add'>+				u64 offset, u64 phys, u64 len, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fiemap_entry *entry;</div><div class='add'>+	u64 cache_end;</div><div class='add'>+</div><div class='add'>+	/* Set at the end of extent_fiemap(). */</div><div class='add'>+	ASSERT((flags &amp; FIEMAP_EXTENT_LAST) == 0);</div><div class='add'>+</div><div class='add'>+	if (!cache-&gt;cached)</div><div class='add'>+		goto assign;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When iterating the extents of the inode, at extent_fiemap(), we may</div><div class='add'>+	 * find an extent that starts at an offset behind the end offset of the</div><div class='add'>+	 * previous extent we processed. This happens if fiemap is called</div><div class='add'>+	 * without FIEMAP_FLAG_SYNC and there are ordered extents completing</div><div class='add'>+	 * after we had to unlock the file range, release the search path, emit</div><div class='add'>+	 * the fiemap extents stored in the buffer (cache-&gt;entries array) and</div><div class='add'>+	 * the lock the remainder of the range and re-search the btree.</div><div class='add'>+	 *</div><div class='add'>+	 * For example we are in leaf X processing its last item, which is the</div><div class='add'>+	 * file extent item for file range [512K, 1M[, and after</div><div class='add'>+	 * btrfs_next_leaf() releases the path, there's an ordered extent that</div><div class='add'>+	 * completes for the file range [768K, 2M[, and that results in trimming</div><div class='add'>+	 * the file extent item so that it now corresponds to the file range</div><div class='add'>+	 * [512K, 768K[ and a new file extent item is inserted for the file</div><div class='add'>+	 * range [768K, 2M[, which may end up as the last item of leaf X or as</div><div class='add'>+	 * the first item of the next leaf - in either case btrfs_next_leaf()</div><div class='add'>+	 * will leave us with a path pointing to the new extent item, for the</div><div class='add'>+	 * file range [768K, 2M[, since that's the first key that follows the</div><div class='add'>+	 * last one we processed. So in order not to report overlapping extents</div><div class='add'>+	 * to user space, we trim the length of the previously cached extent and</div><div class='add'>+	 * emit it.</div><div class='add'>+	 *</div><div class='add'>+	 * Upon calling btrfs_next_leaf() we may also find an extent with an</div><div class='add'>+	 * offset smaller than or equals to cache-&gt;offset, and this happens</div><div class='add'>+	 * when we had a hole or prealloc extent with several delalloc ranges in</div><div class='add'>+	 * it, but after btrfs_next_leaf() released the path, delalloc was</div><div class='add'>+	 * flushed and the resulting ordered extents were completed, so we can</div><div class='add'>+	 * now have found a file extent item for an offset that is smaller than</div><div class='add'>+	 * or equals to what we have in cache-&gt;offset. We deal with this as</div><div class='add'>+	 * described below.</div><div class='add'>+	 */</div><div class='add'>+	cache_end = cache-&gt;offset + cache-&gt;len;</div><div class='add'>+	if (cache_end &gt; offset) {</div><div class='add'>+		if (offset == cache-&gt;offset) {</div><div class='add'>+			/*</div><div class='add'>+			 * We cached a delalloc range (found in the io tree) for</div><div class='add'>+			 * a hole or prealloc extent and we have now found a</div><div class='add'>+			 * file extent item for the same offset. What we have</div><div class='add'>+			 * now is more recent and up to date, so discard what</div><div class='add'>+			 * we had in the cache and use what we have just found.</div><div class='add'>+			 */</div><div class='add'>+			goto assign;</div><div class='add'>+		} else if (offset &gt; cache-&gt;offset) {</div><div class='add'>+			/*</div><div class='add'>+			 * The extent range we previously found ends after the</div><div class='add'>+			 * offset of the file extent item we found and that</div><div class='add'>+			 * offset falls somewhere in the middle of that previous</div><div class='add'>+			 * extent range. So adjust the range we previously found</div><div class='add'>+			 * to end at the offset of the file extent item we have</div><div class='add'>+			 * just found, since this extent is more up to date.</div><div class='add'>+			 * Emit that adjusted range and cache the file extent</div><div class='add'>+			 * item we have just found. This corresponds to the case</div><div class='add'>+			 * where a previously found file extent item was split</div><div class='add'>+			 * due to an ordered extent completing.</div><div class='add'>+			 */</div><div class='add'>+			cache-&gt;len = offset - cache-&gt;offset;</div><div class='add'>+			goto emit;</div><div class='add'>+		} else {</div><div class='add'>+			const u64 range_end = offset + len;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * The offset of the file extent item we have just found</div><div class='add'>+			 * is behind the cached offset. This means we were</div><div class='add'>+			 * processing a hole or prealloc extent for which we</div><div class='add'>+			 * have found delalloc ranges (in the io tree), so what</div><div class='add'>+			 * we have in the cache is the last delalloc range we</div><div class='add'>+			 * found while the file extent item we found can be</div><div class='add'>+			 * either for a whole delalloc range we previously</div><div class='add'>+			 * emitted or only a part of that range.</div><div class='add'>+			 *</div><div class='add'>+			 * We have two cases here:</div><div class='add'>+			 *</div><div class='add'>+			 * 1) The file extent item's range ends at or behind the</div><div class='add'>+			 *    cached extent's end. In this case just ignore the</div><div class='add'>+			 *    current file extent item because we don't want to</div><div class='add'>+			 *    overlap with previous ranges that may have been</div><div class='add'>+			 *    emitted already;</div><div class='add'>+			 *</div><div class='add'>+			 * 2) The file extent item starts behind the currently</div><div class='add'>+			 *    cached extent but its end offset goes beyond the</div><div class='add'>+			 *    end offset of the cached extent. We don't want to</div><div class='add'>+			 *    overlap with a previous range that may have been</div><div class='add'>+			 *    emitted already, so we emit the currently cached</div><div class='add'>+			 *    extent and then partially store the current file</div><div class='add'>+			 *    extent item's range in the cache, for the subrange</div><div class='add'>+			 *    going the cached extent's end to the end of the</div><div class='add'>+			 *    file extent item.</div><div class='add'>+			 */</div><div class='add'>+			if (range_end &lt;= cache_end)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			if (!(flags &amp; (FIEMAP_EXTENT_ENCODED | FIEMAP_EXTENT_DELALLOC)))</div><div class='add'>+				phys += cache_end - offset;</div><div class='add'>+</div><div class='add'>+			offset = cache_end;</div><div class='add'>+			len = range_end - cache_end;</div><div class='add'>+			goto emit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only merges fiemap extents if</div><div class='add'>+	 * 1) Their logical addresses are continuous</div><div class='add'>+	 *</div><div class='add'>+	 * 2) Their physical addresses are continuous</div><div class='add'>+	 *    So truly compressed (physical size smaller than logical size)</div><div class='add'>+	 *    extents won't get merged with each other</div><div class='add'>+	 *</div><div class='add'>+	 * 3) Share same flags</div><div class='add'>+	 */</div><div class='add'>+	if (cache-&gt;offset + cache-&gt;len  == offset &amp;&amp;</div><div class='add'>+	    cache-&gt;phys + cache-&gt;len == phys  &amp;&amp;</div><div class='add'>+	    cache-&gt;flags == flags) {</div><div class='add'>+		cache-&gt;len += len;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+emit:</div><div class='add'>+	/* Not mergeable, need to submit cached one */</div><div class='add'>+</div><div class='add'>+	if (cache-&gt;entries_pos == cache-&gt;entries_size) {</div><div class='add'>+		/*</div><div class='add'>+		 * We will need to research for the end offset of the last</div><div class='add'>+		 * stored extent and not from the current offset, because after</div><div class='add'>+		 * unlocking the range and releasing the path, if there's a hole</div><div class='add'>+		 * between that end offset and this current offset, a new extent</div><div class='add'>+		 * may have been inserted due to a new write, so we don't want</div><div class='add'>+		 * to miss it.</div><div class='add'>+		 */</div><div class='add'>+		entry = &amp;cache-&gt;entries[cache-&gt;entries_size - 1];</div><div class='add'>+		cache-&gt;next_search_offset = entry-&gt;offset + entry-&gt;len;</div><div class='add'>+		cache-&gt;cached = false;</div><div class='add'>+</div><div class='add'>+		return BTRFS_FIEMAP_FLUSH_CACHE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry = &amp;cache-&gt;entries[cache-&gt;entries_pos];</div><div class='add'>+	entry-&gt;offset = cache-&gt;offset;</div><div class='add'>+	entry-&gt;phys = cache-&gt;phys;</div><div class='add'>+	entry-&gt;len = cache-&gt;len;</div><div class='add'>+	entry-&gt;flags = cache-&gt;flags;</div><div class='add'>+	cache-&gt;entries_pos++;</div><div class='add'>+	cache-&gt;extents_mapped++;</div><div class='add'>+</div><div class='add'>+	if (cache-&gt;extents_mapped == fieinfo-&gt;fi_extents_max) {</div><div class='add'>+		cache-&gt;cached = false;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+assign:</div><div class='add'>+	cache-&gt;cached = true;</div><div class='add'>+	cache-&gt;offset = offset;</div><div class='add'>+	cache-&gt;phys = phys;</div><div class='add'>+	cache-&gt;len = len;</div><div class='add'>+	cache-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Emit last fiemap cache</div><div class='add'>+ *</div><div class='add'>+ * The last fiemap cache may still be cached in the following case:</div><div class='add'>+ * 0		      4k		    8k</div><div class='add'>+ * |&lt;- Fiemap range -&gt;|</div><div class='add'>+ * |&lt;------------  First extent -----------&gt;|</div><div class='add'>+ *</div><div class='add'>+ * In this case, the first extent range will be cached but not emitted.</div><div class='add'>+ * So we must emit it before ending extent_fiemap().</div><div class='add'>+ */</div><div class='add'>+static int emit_last_fiemap_cache(struct fiemap_extent_info *fieinfo,</div><div class='add'>+				  struct fiemap_cache *cache)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cache-&gt;cached)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = fiemap_fill_next_extent(fieinfo, cache-&gt;offset, cache-&gt;phys,</div><div class='add'>+				      cache-&gt;len, cache-&gt;flags);</div><div class='add'>+	cache-&gt;cached = false;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		ret = 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fiemap_next_leaf_item(struct btrfs_inode *inode, struct btrfs_path *path)</div><div class='add'>+{</div><div class='add'>+	struct extent_buffer *clone = path-&gt;nodes[0];</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+	int slot;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	path-&gt;slots[0]++;</div><div class='add'>+	if (path-&gt;slots[0] &lt; btrfs_header_nritems(path-&gt;nodes[0]))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add a temporary extra ref to an already cloned extent buffer to</div><div class='add'>+	 * prevent btrfs_next_leaf() freeing it, we want to reuse it to avoid</div><div class='add'>+	 * the cost of allocating a new one.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(test_bit(EXTENT_BUFFER_UNMAPPED, &amp;clone-&gt;bflags));</div><div class='add'>+	refcount_inc(&amp;clone-&gt;refs);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_next_leaf(inode-&gt;root, path);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't bother with cloning if there are no more file extent items for</div><div class='add'>+	 * our inode.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='add'>+	if (key.objectid != btrfs_ino(inode) || key.type != BTRFS_EXTENT_DATA_KEY) {</div><div class='add'>+		ret = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Important to preserve the start field, for the optimizations when</div><div class='add'>+	 * checking if extents are shared (see extent_fiemap()).</div><div class='add'>+	 *</div><div class='add'>+	 * We must set -&gt;start before calling copy_extent_buffer_full().  If we</div><div class='add'>+	 * are on sub-pagesize blocksize, we use -&gt;start to determine the offset</div><div class='add'>+	 * into the folio where our eb exists, and if we update -&gt;start after</div><div class='add'>+	 * the fact then any subsequent reads of the eb may read from a</div><div class='add'>+	 * different offset in the folio than where we originally copied into.</div><div class='add'>+	 */</div><div class='add'>+	clone-&gt;start = path-&gt;nodes[0]-&gt;start;</div><div class='add'>+	/* See the comment at fiemap_search_slot() about why we clone. */</div><div class='add'>+	copy_extent_buffer_full(clone, path-&gt;nodes[0]);</div><div class='add'>+</div><div class='add'>+	slot = path-&gt;slots[0];</div><div class='add'>+	btrfs_release_path(path);</div><div class='add'>+	path-&gt;nodes[0] = clone;</div><div class='add'>+	path-&gt;slots[0] = slot;</div><div class='add'>+out:</div><div class='add'>+	if (ret)</div><div class='add'>+		free_extent_buffer(clone);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Search for the first file extent item that starts at a given file offset or</div><div class='add'>+ * the one that starts immediately before that offset.</div><div class='add'>+ * Returns: 0 on success, &lt; 0 on error, 1 if not found.</div><div class='add'>+ */</div><div class='add'>+static int fiemap_search_slot(struct btrfs_inode *inode, struct btrfs_path *path,</div><div class='add'>+			      u64 file_offset)</div><div class='add'>+{</div><div class='add'>+	const u64 ino = btrfs_ino(inode);</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct extent_buffer *clone;</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+	int slot;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	key.objectid = ino;</div><div class='add'>+	key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+	key.offset = file_offset;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; path-&gt;slots[0] &gt; 0) {</div><div class='add'>+		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0] - 1);</div><div class='add'>+		if (key.objectid == ino &amp;&amp; key.type == BTRFS_EXTENT_DATA_KEY)</div><div class='add'>+			path-&gt;slots[0]--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (path-&gt;slots[0] &gt;= btrfs_header_nritems(path-&gt;nodes[0])) {</div><div class='add'>+		ret = btrfs_next_leaf(root, path);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='add'>+		if (key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We clone the leaf and use it during fiemap. This is because while</div><div class='add'>+	 * using the leaf we do expensive things like checking if an extent is</div><div class='add'>+	 * shared, which can take a long time. In order to prevent blocking</div><div class='add'>+	 * other tasks for too long, we use a clone of the leaf. We have locked</div><div class='add'>+	 * the file range in the inode's io tree, so we know none of our file</div><div class='add'>+	 * extent items can change. This way we avoid blocking other tasks that</div><div class='add'>+	 * want to insert items for other inodes in the same leaf or b+tree</div><div class='add'>+	 * rebalance operations (triggered for example when someone is trying</div><div class='add'>+	 * to push items into this leaf when trying to insert an item in a</div><div class='add'>+	 * neighbour leaf).</div><div class='add'>+	 * We also need the private clone because holding a read lock on an</div><div class='add'>+	 * extent buffer of the subvolume's b+tree will make lockdep unhappy</div><div class='add'>+	 * when we check if extents are shared, as backref walking may need to</div><div class='add'>+	 * lock the same leaf we are processing.</div><div class='add'>+	 */</div><div class='add'>+	clone = btrfs_clone_extent_buffer(path-&gt;nodes[0]);</div><div class='add'>+	if (!clone)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	slot = path-&gt;slots[0];</div><div class='add'>+	btrfs_release_path(path);</div><div class='add'>+	path-&gt;nodes[0] = clone;</div><div class='add'>+	path-&gt;slots[0] = slot;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process a range which is a hole or a prealloc extent in the inode's subvolume</div><div class='add'>+ * btree. If @disk_bytenr is 0, we are dealing with a hole, otherwise a prealloc</div><div class='add'>+ * extent. The end offset (@end) is inclusive.</div><div class='add'>+ */</div><div class='add'>+static int fiemap_process_hole(struct btrfs_inode *inode,</div><div class='add'>+			       struct fiemap_extent_info *fieinfo,</div><div class='add'>+			       struct fiemap_cache *cache,</div><div class='add'>+			       struct extent_state **delalloc_cached_state,</div><div class='add'>+			       struct btrfs_backref_share_check_ctx *backref_ctx,</div><div class='add'>+			       u64 disk_bytenr, u64 extent_offset,</div><div class='add'>+			       u64 extent_gen,</div><div class='add'>+			       u64 start, u64 end)</div><div class='add'>+{</div><div class='add'>+	const u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	u64 cur_offset = start;</div><div class='add'>+	u64 last_delalloc_end = 0;</div><div class='add'>+	u32 prealloc_flags = FIEMAP_EXTENT_UNWRITTEN;</div><div class='add'>+	bool checked_extent_shared = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There can be no delalloc past i_size, so don't waste time looking for</div><div class='add'>+	 * it beyond i_size.</div><div class='add'>+	 */</div><div class='add'>+	while (cur_offset &lt; end &amp;&amp; cur_offset &lt; i_size) {</div><div class='add'>+		u64 delalloc_start;</div><div class='add'>+		u64 delalloc_end;</div><div class='add'>+		u64 prealloc_start;</div><div class='add'>+		u64 prealloc_len = 0;</div><div class='add'>+		bool delalloc;</div><div class='add'>+</div><div class='add'>+		delalloc = btrfs_find_delalloc_in_range(inode, cur_offset, end,</div><div class='add'>+							delalloc_cached_state,</div><div class='add'>+							&amp;delalloc_start,</div><div class='add'>+							&amp;delalloc_end);</div><div class='add'>+		if (!delalloc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a prealloc extent we have to report every section</div><div class='add'>+		 * of it that has no delalloc.</div><div class='add'>+		 */</div><div class='add'>+		if (disk_bytenr != 0) {</div><div class='add'>+			if (last_delalloc_end == 0) {</div><div class='add'>+				prealloc_start = start;</div><div class='add'>+				prealloc_len = delalloc_start - start;</div><div class='add'>+			} else {</div><div class='add'>+				prealloc_start = last_delalloc_end + 1;</div><div class='add'>+				prealloc_len = delalloc_start - prealloc_start;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (prealloc_len &gt; 0) {</div><div class='add'>+			if (!checked_extent_shared &amp;&amp; fieinfo-&gt;fi_extents_max) {</div><div class='add'>+				ret = btrfs_is_data_extent_shared(inode,</div><div class='add'>+								  disk_bytenr,</div><div class='add'>+								  extent_gen,</div><div class='add'>+								  backref_ctx);</div><div class='add'>+				if (ret &lt; 0)</div><div class='add'>+					return ret;</div><div class='add'>+				else if (ret &gt; 0)</div><div class='add'>+					prealloc_flags |= FIEMAP_EXTENT_SHARED;</div><div class='add'>+</div><div class='add'>+				checked_extent_shared = true;</div><div class='add'>+			}</div><div class='add'>+			ret = emit_fiemap_extent(fieinfo, cache, prealloc_start,</div><div class='add'>+						 disk_bytenr + extent_offset,</div><div class='add'>+						 prealloc_len, prealloc_flags);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			extent_offset += prealloc_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = emit_fiemap_extent(fieinfo, cache, delalloc_start, 0,</div><div class='add'>+					 delalloc_end + 1 - delalloc_start,</div><div class='add'>+					 FIEMAP_EXTENT_DELALLOC |</div><div class='add'>+					 FIEMAP_EXTENT_UNKNOWN);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		last_delalloc_end = delalloc_end;</div><div class='add'>+		cur_offset = delalloc_end + 1;</div><div class='add'>+		extent_offset += cur_offset - delalloc_start;</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Either we found no delalloc for the whole prealloc extent or we have</div><div class='add'>+	 * a prealloc extent that spans i_size or starts at or after i_size.</div><div class='add'>+	 */</div><div class='add'>+	if (disk_bytenr != 0 &amp;&amp; last_delalloc_end &lt; end) {</div><div class='add'>+		u64 prealloc_start;</div><div class='add'>+		u64 prealloc_len;</div><div class='add'>+</div><div class='add'>+		if (last_delalloc_end == 0) {</div><div class='add'>+			prealloc_start = start;</div><div class='add'>+			prealloc_len = end + 1 - start;</div><div class='add'>+		} else {</div><div class='add'>+			prealloc_start = last_delalloc_end + 1;</div><div class='add'>+			prealloc_len = end + 1 - prealloc_start;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!checked_extent_shared &amp;&amp; fieinfo-&gt;fi_extents_max) {</div><div class='add'>+			ret = btrfs_is_data_extent_shared(inode,</div><div class='add'>+							  disk_bytenr,</div><div class='add'>+							  extent_gen,</div><div class='add'>+							  backref_ctx);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			else if (ret &gt; 0)</div><div class='add'>+				prealloc_flags |= FIEMAP_EXTENT_SHARED;</div><div class='add'>+		}</div><div class='add'>+		ret = emit_fiemap_extent(fieinfo, cache, prealloc_start,</div><div class='add'>+					 disk_bytenr + extent_offset,</div><div class='add'>+					 prealloc_len, prealloc_flags);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fiemap_find_last_extent_offset(struct btrfs_inode *inode,</div><div class='add'>+					  struct btrfs_path *path,</div><div class='add'>+					  u64 *last_extent_end_ret)</div><div class='add'>+{</div><div class='add'>+	const u64 ino = btrfs_ino(inode);</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct extent_buffer *leaf;</div><div class='add'>+	struct btrfs_file_extent_item *ei;</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+	u64 disk_bytenr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Lookup the last file extent. We're not using i_size here because</div><div class='add'>+	 * there might be preallocation past i_size.</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_lookup_file_extent(NULL, root, path, ino, (u64)-1, 0);</div><div class='add'>+	/* There can't be a file extent item at offset (u64)-1 */</div><div class='add'>+	ASSERT(ret != 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For a non-existing key, btrfs_search_slot() always leaves us at a</div><div class='add'>+	 * slot &gt; 0, except if the btree is empty, which is impossible because</div><div class='add'>+	 * at least it has the inode item for this inode and all the items for</div><div class='add'>+	 * the root inode 256.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(path-&gt;slots[0] &gt; 0);</div><div class='add'>+	path-&gt;slots[0]--;</div><div class='add'>+	leaf = path-&gt;nodes[0];</div><div class='add'>+	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='add'>+	if (key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY) {</div><div class='add'>+		/* No file extent items in the subvolume tree. */</div><div class='add'>+		*last_extent_end_ret = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For an inline extent, the disk_bytenr is where inline data starts at,</div><div class='add'>+	 * so first check if we have an inline extent item before checking if we</div><div class='add'>+	 * have an implicit hole (disk_bytenr == 0).</div><div class='add'>+	 */</div><div class='add'>+	ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='add'>+	if (btrfs_file_extent_type(leaf, ei) == BTRFS_FILE_EXTENT_INLINE) {</div><div class='add'>+		*last_extent_end_ret = btrfs_file_extent_end(path);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find the last file extent item that is not a hole (when NO_HOLES is</div><div class='add'>+	 * not enabled). This should take at most 2 iterations in the worst</div><div class='add'>+	 * case: we have one hole file extent item at slot 0 of a leaf and</div><div class='add'>+	 * another hole file extent item as the last item in the previous leaf.</div><div class='add'>+	 * This is because we merge file extent items that represent holes.</div><div class='add'>+	 */</div><div class='add'>+	disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='add'>+	while (disk_bytenr == 0) {</div><div class='add'>+		ret = btrfs_previous_item(root, path, ino, BTRFS_EXTENT_DATA_KEY);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			return ret;</div><div class='add'>+		} else if (ret &gt; 0) {</div><div class='add'>+			/* No file extent items that are not holes. */</div><div class='add'>+			*last_extent_end_ret = 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		leaf = path-&gt;nodes[0];</div><div class='add'>+		ei = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='add'>+				    struct btrfs_file_extent_item);</div><div class='add'>+		disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*last_extent_end_ret = btrfs_file_extent_end(path);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int extent_fiemap(struct btrfs_inode *inode,</div><div class='add'>+			 struct fiemap_extent_info *fieinfo,</div><div class='add'>+			 u64 start, u64 len)</div><div class='add'>+{</div><div class='add'>+	const u64 ino = btrfs_ino(inode);</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	struct extent_state *delalloc_cached_state = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+	struct fiemap_cache cache = { 0 };</div><div class='add'>+	struct btrfs_backref_share_check_ctx *backref_ctx;</div><div class='add'>+	u64 last_extent_end = 0;</div><div class='add'>+	u64 prev_extent_end;</div><div class='add'>+	u64 range_start;</div><div class='add'>+	u64 range_end;</div><div class='add'>+	const u64 sectorsize = inode-&gt;root-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+	bool stopped = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cache.entries_size = PAGE_SIZE / sizeof(struct btrfs_fiemap_entry);</div><div class='add'>+	cache.entries = kmalloc_array(cache.entries_size,</div><div class='add'>+				      sizeof(struct btrfs_fiemap_entry),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	backref_ctx = btrfs_alloc_backref_share_check_ctx();</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!cache.entries || !backref_ctx || !path) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	range_start = round_down(start, sectorsize);</div><div class='add'>+	range_end = round_up(start + len, sectorsize);</div><div class='add'>+	prev_extent_end = range_start;</div><div class='add'>+</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, range_start, range_end, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	ret = fiemap_find_last_extent_offset(inode, path, &amp;last_extent_end);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	btrfs_release_path(path);</div><div class='add'>+</div><div class='add'>+	path-&gt;reada = READA_FORWARD;</div><div class='add'>+	ret = fiemap_search_slot(inode, path, range_start);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	} else if (ret &gt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * No file extent item found, but we may have delalloc between</div><div class='add'>+		 * the current offset and i_size. So check for that.</div><div class='add'>+		 */</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto check_eof_delalloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (prev_extent_end &lt; range_end) {</div><div class='add'>+		struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='add'>+		struct btrfs_file_extent_item *ei;</div><div class='add'>+		struct btrfs_key key;</div><div class='add'>+		u64 extent_end;</div><div class='add'>+		u64 extent_len;</div><div class='add'>+		u64 extent_offset = 0;</div><div class='add'>+		u64 extent_gen;</div><div class='add'>+		u64 disk_bytenr = 0;</div><div class='add'>+		u64 flags = 0;</div><div class='add'>+		int extent_type;</div><div class='add'>+		u8 compression;</div><div class='add'>+</div><div class='add'>+		btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='add'>+		if (key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		extent_end = btrfs_file_extent_end(path);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The first iteration can leave us at an extent item that ends</div><div class='add'>+		 * before our range's start. Move to the next item.</div><div class='add'>+		 */</div><div class='add'>+		if (extent_end &lt;= range_start)</div><div class='add'>+			goto next_item;</div><div class='add'>+</div><div class='add'>+		backref_ctx-&gt;curr_leaf_bytenr = leaf-&gt;start;</div><div class='add'>+</div><div class='add'>+		/* We have in implicit hole (NO_HOLES feature enabled). */</div><div class='add'>+		if (prev_extent_end &lt; key.offset) {</div><div class='add'>+			const u64 hole_end = min(key.offset, range_end) - 1;</div><div class='add'>+</div><div class='add'>+			ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='add'>+						  &amp;delalloc_cached_state,</div><div class='add'>+						  backref_ctx, 0, 0, 0,</div><div class='add'>+						  prev_extent_end, hole_end);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				goto out_unlock;</div><div class='add'>+			} else if (ret &gt; 0) {</div><div class='add'>+				/* fiemap_fill_next_extent() told us to stop. */</div><div class='add'>+				stopped = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* We've reached the end of the fiemap range, stop. */</div><div class='add'>+			if (key.offset &gt;= range_end) {</div><div class='add'>+				stopped = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		extent_len = extent_end - key.offset;</div><div class='add'>+		ei = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='add'>+				    struct btrfs_file_extent_item);</div><div class='add'>+		compression = btrfs_file_extent_compression(leaf, ei);</div><div class='add'>+		extent_type = btrfs_file_extent_type(leaf, ei);</div><div class='add'>+		extent_gen = btrfs_file_extent_generation(leaf, ei);</div><div class='add'>+</div><div class='add'>+		if (extent_type != BTRFS_FILE_EXTENT_INLINE) {</div><div class='add'>+			disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='add'>+			if (compression == BTRFS_COMPRESS_NONE)</div><div class='add'>+				extent_offset = btrfs_file_extent_offset(leaf, ei);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (compression != BTRFS_COMPRESS_NONE)</div><div class='add'>+			flags |= FIEMAP_EXTENT_ENCODED;</div><div class='add'>+</div><div class='add'>+		if (extent_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='add'>+			flags |= FIEMAP_EXTENT_DATA_INLINE;</div><div class='add'>+			flags |= FIEMAP_EXTENT_NOT_ALIGNED;</div><div class='add'>+			ret = emit_fiemap_extent(fieinfo, &amp;cache, key.offset, 0,</div><div class='add'>+						 extent_len, flags);</div><div class='add'>+		} else if (extent_type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='add'>+			ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='add'>+						  &amp;delalloc_cached_state,</div><div class='add'>+						  backref_ctx,</div><div class='add'>+						  disk_bytenr, extent_offset,</div><div class='add'>+						  extent_gen, key.offset,</div><div class='add'>+						  extent_end - 1);</div><div class='add'>+		} else if (disk_bytenr == 0) {</div><div class='add'>+			/* We have an explicit hole. */</div><div class='add'>+			ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='add'>+						  &amp;delalloc_cached_state,</div><div class='add'>+						  backref_ctx, 0, 0, 0,</div><div class='add'>+						  key.offset, extent_end - 1);</div><div class='add'>+		} else {</div><div class='add'>+			/* We have a regular extent. */</div><div class='add'>+			if (fieinfo-&gt;fi_extents_max) {</div><div class='add'>+				ret = btrfs_is_data_extent_shared(inode,</div><div class='add'>+								  disk_bytenr,</div><div class='add'>+								  extent_gen,</div><div class='add'>+								  backref_ctx);</div><div class='add'>+				if (ret &lt; 0)</div><div class='add'>+					goto out_unlock;</div><div class='add'>+				else if (ret &gt; 0)</div><div class='add'>+					flags |= FIEMAP_EXTENT_SHARED;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = emit_fiemap_extent(fieinfo, &amp;cache, key.offset,</div><div class='add'>+						 disk_bytenr + extent_offset,</div><div class='add'>+						 extent_len, flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		} else if (ret &gt; 0) {</div><div class='add'>+			/* emit_fiemap_extent() told us to stop. */</div><div class='add'>+			stopped = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		prev_extent_end = extent_end;</div><div class='add'>+next_item:</div><div class='add'>+		if (fatal_signal_pending(current)) {</div><div class='add'>+			ret = -EINTR;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = fiemap_next_leaf_item(inode, path);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		} else if (ret &gt; 0) {</div><div class='add'>+			/* No more file extent items for this inode. */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+check_eof_delalloc:</div><div class='add'>+	if (!stopped &amp;&amp; prev_extent_end &lt; range_end) {</div><div class='add'>+		ret = fiemap_process_hole(inode, fieinfo, &amp;cache,</div><div class='add'>+					  &amp;delalloc_cached_state, backref_ctx,</div><div class='add'>+					  0, 0, 0, prev_extent_end, range_end - 1);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		prev_extent_end = range_end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cache.cached &amp;&amp; cache.offset + cache.len &gt;= last_extent_end) {</div><div class='add'>+		const u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='add'>+</div><div class='add'>+		if (prev_extent_end &lt; i_size) {</div><div class='add'>+			u64 delalloc_start;</div><div class='add'>+			u64 delalloc_end;</div><div class='add'>+			bool delalloc;</div><div class='add'>+</div><div class='add'>+			delalloc = btrfs_find_delalloc_in_range(inode,</div><div class='add'>+								prev_extent_end,</div><div class='add'>+								i_size - 1,</div><div class='add'>+								&amp;delalloc_cached_state,</div><div class='add'>+								&amp;delalloc_start,</div><div class='add'>+								&amp;delalloc_end);</div><div class='add'>+			if (!delalloc)</div><div class='add'>+				cache.flags |= FIEMAP_EXTENT_LAST;</div><div class='add'>+		} else {</div><div class='add'>+			cache.flags |= FIEMAP_EXTENT_LAST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, range_start, range_end, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	if (ret == BTRFS_FIEMAP_FLUSH_CACHE) {</div><div class='add'>+		btrfs_release_path(path);</div><div class='add'>+		ret = flush_fiemap_cache(fieinfo, &amp;cache);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		len -= cache.next_search_offset - start;</div><div class='add'>+		start = cache.next_search_offset;</div><div class='add'>+		goto restart;</div><div class='add'>+	} else if (ret &lt; 0) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Must free the path before emitting to the fiemap buffer because we</div><div class='add'>+	 * may have a non-cloned leaf and if the fiemap buffer is memory mapped</div><div class='add'>+	 * to a file, a write into it (through btrfs_page_mkwrite()) may trigger</div><div class='add'>+	 * waiting for an ordered extent that in order to complete needs to</div><div class='add'>+	 * modify that leaf, therefore leading to a deadlock.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_free_path(path);</div><div class='add'>+	path = NULL;</div><div class='add'>+</div><div class='add'>+	ret = flush_fiemap_cache(fieinfo, &amp;cache);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = emit_last_fiemap_cache(fieinfo, &amp;cache);</div><div class='add'>+out:</div><div class='add'>+	btrfs_free_extent_state(delalloc_cached_state);</div><div class='add'>+	kfree(cache.entries);</div><div class='add'>+	btrfs_free_backref_share_ctx(backref_ctx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='add'>+		 u64 start, u64 len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode *btrfs_inode = BTRFS_I(inode);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fiemap_prep(inode, fieinfo, start, &amp;len, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * fiemap_prep() called filemap_write_and_wait() for the whole possible</div><div class='add'>+	 * file range (0 to LLONG_MAX), but that is not enough if we have</div><div class='add'>+	 * compression enabled. The first filemap_fdatawrite_range() only kicks</div><div class='add'>+	 * in the compression of data (in an async thread) and will return</div><div class='add'>+	 * before the compression is done and writeback is started. A second</div><div class='add'>+	 * filemap_fdatawrite_range() is needed to wait for the compression to</div><div class='add'>+	 * complete and writeback to start. We also need to wait for ordered</div><div class='add'>+	 * extents to complete, because our fiemap implementation uses mainly</div><div class='add'>+	 * file extent items to list the extents, searching for extent maps</div><div class='add'>+	 * only for file ranges with holes or prealloc extents to figure out</div><div class='add'>+	 * if we have delalloc in those ranges.</div><div class='add'>+	 */</div><div class='add'>+	if (fieinfo-&gt;fi_flags &amp; FIEMAP_FLAG_SYNC) {</div><div class='add'>+		ret = btrfs_wait_ordered_range(btrfs_inode, 0, LLONG_MAX);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_inode_lock(btrfs_inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We did an initial flush to avoid holding the inode's lock while</div><div class='add'>+	 * triggering writeback and waiting for the completion of IO and ordered</div><div class='add'>+	 * extents. Now after we locked the inode we do it again, because it's</div><div class='add'>+	 * possible a new write may have happened in between those two steps.</div><div class='add'>+	 */</div><div class='add'>+	if (fieinfo-&gt;fi_flags &amp; FIEMAP_FLAG_SYNC) {</div><div class='add'>+		ret = btrfs_wait_ordered_range(btrfs_inode, 0, LLONG_MAX);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_inode_unlock(btrfs_inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = extent_fiemap(btrfs_inode, fieinfo, start, len);</div><div class='add'>+	btrfs_inode_unlock(btrfs_inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/fiemap.h b/fs/btrfs/fiemap.h<br/>new file mode 100644<br/>index 000000000000..cfd74b35988f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/fiemap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/fiemap.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef BTRFS_FIEMAP_H</div><div class='add'>+#define BTRFS_FIEMAP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fiemap.h&gt;</div><div class='add'>+</div><div class='add'>+int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='add'>+		 u64 start, u64 len);</div><div class='add'>+</div><div class='add'>+#endif /* BTRFS_FIEMAP_H */</div><div class='head'>diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c<br/>index 81ac1d474bf1..14e5257f0f04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file-item.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file-item.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file-item.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/file-item.c</a></div><div class='hunk'>@@ -10,17 +10,15 @@</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "bio.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "file-item.h"</div><div class='del'>-#include "super.h"</div><div class='add'>+#include "volumes.h"</div><div class='ctx'> </div><div class='ctx'> #define __MAX_CSUM_ITEMS(r, size) ((unsigned long)(((BTRFS_LEAF_DATA_SIZE(r) - \</div><div class='ctx'> 				   sizeof(struct btrfs_item) * 2) / \</div><div class='hunk'>@@ -48,20 +46,19 @@</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_inode_safe_disk_i_size_write(struct btrfs_inode *inode, u64 new_i_size)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	u64 start, end, i_size;</div><div class='del'>-	int ret;</div><div class='add'>+	bool found;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 	i_size = new_i_size ?: i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='del'>-	if (btrfs_fs_incompat(fs_info, NO_HOLES)) {</div><div class='add'>+	if (!inode-&gt;file_extent_tree) {</div><div class='ctx'> 		inode-&gt;disk_i_size = i_size;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = find_contiguous_extent_bit(inode-&gt;file_extent_tree, 0, &amp;start,</div><div class='del'>-					 &amp;end, EXTENT_DIRTY);</div><div class='del'>-	if (!ret &amp;&amp; start == 0)</div><div class='add'>+	found = btrfs_find_contiguous_extent_bit(inode-&gt;file_extent_tree, 0, &amp;start,</div><div class='add'>+						 &amp;end, EXTENT_DIRTY);</div><div class='add'>+	if (found &amp;&amp; start == 0)</div><div class='ctx'> 		i_size = min(i_size, end + 1);</div><div class='ctx'> 	else</div><div class='ctx'> 		i_size = 0;</div><div class='hunk'>@@ -87,15 +84,16 @@ out_unlock:</div><div class='ctx'> int btrfs_inode_set_file_extent_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 				      u64 len)</div><div class='ctx'> {</div><div class='add'>+	if (!inode-&gt;file_extent_tree)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(IS_ALIGNED(start + len, inode-&gt;root-&gt;fs_info-&gt;sectorsize));</div><div class='ctx'> </div><div class='del'>-	if (btrfs_fs_incompat(inode-&gt;root-&gt;fs_info, NO_HOLES))</div><div class='del'>-		return 0;</div><div class='del'>-	return set_extent_bit(inode-&gt;file_extent_tree, start, start + len - 1,</div><div class='del'>-			      EXTENT_DIRTY, NULL);</div><div class='add'>+	return btrfs_set_extent_bit(inode-&gt;file_extent_tree, start, start + len - 1,</div><div class='add'>+				    EXTENT_DIRTY, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -115,16 +113,17 @@ int btrfs_inode_set_file_extent_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> int btrfs_inode_clear_file_extent_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 					u64 len)</div><div class='ctx'> {</div><div class='add'>+	if (!inode-&gt;file_extent_tree)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(IS_ALIGNED(start + len, inode-&gt;root-&gt;fs_info-&gt;sectorsize) ||</div><div class='ctx'> 	       len == (u64)-1);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_fs_incompat(inode-&gt;root-&gt;fs_info, NO_HOLES))</div><div class='del'>-		return 0;</div><div class='del'>-	return clear_extent_bit(inode-&gt;file_extent_tree, start,</div><div class='del'>-				start + len - 1, EXTENT_DIRTY, NULL);</div><div class='add'>+	return btrfs_clear_extent_bit(inode-&gt;file_extent_tree, start,</div><div class='add'>+				      start + len - 1, EXTENT_DIRTY, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t bytes_to_csum_size(const struct btrfs_fs_info *fs_info, u32 bytes)</div><div class='hunk'>@@ -153,7 +152,7 @@ static inline u32 max_ordered_sum_bytes(const struct btrfs_fs_info *fs_info)</div><div class='ctx'>  * Calculate the total size needed to allocate for an ordered sum structure</div><div class='ctx'>  * spanning @bytes in the file.</div><div class='ctx'>  */</div><div class='del'>-static int btrfs_ordered_sum_size(struct btrfs_fs_info *fs_info, unsigned long bytes)</div><div class='add'>+static int btrfs_ordered_sum_size(const struct btrfs_fs_info *fs_info, unsigned long bytes)</div><div class='ctx'> {</div><div class='ctx'> 	return sizeof(struct btrfs_ordered_sum) + bytes_to_csum_size(fs_info, bytes);</div><div class='ctx'> }</div><div class='hunk'>@@ -165,21 +164,21 @@ int btrfs_insert_hole_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_file_extent_item *item;</div><div class='ctx'> 	struct btrfs_key file_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	file_key.objectid = objectid;</div><div class='del'>-	file_key.offset = pos;</div><div class='ctx'> 	file_key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+	file_key.offset = pos;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;file_key,</div><div class='ctx'> 				      sizeof(*item));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	BUG_ON(ret); /* Can't happen */</div><div class='add'>+		return ret;</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	item = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 			      struct btrfs_file_extent_item);</div><div class='hunk'>@@ -194,9 +193,6 @@ int btrfs_insert_hole_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_file_extent_encryption(leaf, item, 0);</div><div class='ctx'> 	btrfs_set_file_extent_other_encoding(leaf, item, 0);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -217,8 +213,8 @@ btrfs_lookup_csum(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int csums_in_item;</div><div class='ctx'> </div><div class='ctx'> 	file_key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;</div><div class='del'>-	file_key.offset = bytenr;</div><div class='ctx'> 	file_key.type = BTRFS_EXTENT_CSUM_KEY;</div><div class='add'>+	file_key.offset = bytenr;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;file_key, path, 0, cow);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -264,8 +260,8 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int cow = mod != 0;</div><div class='ctx'> </div><div class='ctx'> 	file_key.objectid = objectid;</div><div class='del'>-	file_key.offset = offset;</div><div class='ctx'> 	file_key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+	file_key.offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	return btrfs_search_slot(trans, root, &amp;file_key, path, ins_len, cow);</div><div class='ctx'> }</div><div class='hunk'>@@ -341,23 +337,23 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Return: BLK_STS_RESOURCE if allocating memory fails, BLK_STS_OK otherwise.</div><div class='ctx'>  */</div><div class='del'>-blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='add'>+int btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	const u32 csum_size = fs_info-&gt;csum_size;</div><div class='ctx'> 	u32 orig_len = bio-&gt;bi_iter.bi_size;</div><div class='ctx'> 	u64 orig_disk_bytenr = bio-&gt;bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> 	const unsigned int nblocks = orig_len &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-	blk_status_t ret = BLK_STS_OK;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u32 bio_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((inode-&gt;flags &amp; BTRFS_INODE_NODATASUM) ||</div><div class='del'>-	    test_bit(BTRFS_FS_STATE_NO_CSUMS, &amp;fs_info-&gt;fs_state))</div><div class='del'>-		return BLK_STS_OK;</div><div class='add'>+	    test_bit(BTRFS_FS_STATE_NO_DATA_CSUMS, &amp;fs_info-&gt;fs_state))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function is only called for read bio.</div><div class='hunk'>@@ -374,14 +370,12 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='ctx'> 	ASSERT(bio_op(bio) == REQ_OP_READ);</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='del'>-		return BLK_STS_RESOURCE;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (nblocks * csum_size &gt; BTRFS_BIO_INLINE_CSUM_SIZE) {</div><div class='del'>-		bbio-&gt;csum = kmalloc_array(nblocks, csum_size, GFP_NOFS);</div><div class='del'>-		if (!bbio-&gt;csum) {</div><div class='del'>-			btrfs_free_path(path);</div><div class='del'>-			return BLK_STS_RESOURCE;</div><div class='del'>-		}</div><div class='add'>+		bbio-&gt;csum = kvcalloc(nblocks, csum_size, GFP_NOFS);</div><div class='add'>+		if (!bbio-&gt;csum)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bbio-&gt;csum = bbio-&gt;csum_inline;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -400,8 +394,38 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='ctx'> 	 * between reading the free space cache and updating the csum tree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (btrfs_is_free_space_inode(inode)) {</div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='add'>+		path-&gt;search_commit_root = true;</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are searching for a csum of an extent from a past</div><div class='add'>+	 * transaction, we can search in the commit root and reduce</div><div class='add'>+	 * lock contention on the csum tree extent buffers.</div><div class='add'>+	 *</div><div class='add'>+	 * This is important because that lock is an rwsem which gets</div><div class='add'>+	 * pretty heavy write load under memory pressure and sustained</div><div class='add'>+	 * csum overwrites, unlike the commit_root_sem. (Memory pressure</div><div class='add'>+	 * makes us writeback the nodes multiple times per transaction,</div><div class='add'>+	 * which makes us cow them each time, taking the write lock.)</div><div class='add'>+	 *</div><div class='add'>+	 * Due to how rwsem is implemented, there is a possible</div><div class='add'>+	 * priority inversion where the readers holding the lock don't</div><div class='add'>+	 * get scheduled (say they're in a cgroup stuck in heavy reclaim)</div><div class='add'>+	 * which then blocks writers, including transaction commit. By</div><div class='add'>+	 * using a semaphore with fewer writers (only a commit switching</div><div class='add'>+	 * the roots), we make this issue less likely.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that we don't rely on btrfs_search_slot to lock the</div><div class='add'>+	 * commit root csum. We call search_slot multiple times, which would</div><div class='add'>+	 * create a potential race where a commit comes in between searches</div><div class='add'>+	 * while we are not holding the commit_root_sem, and we get csums</div><div class='add'>+	 * from across transactions.</div><div class='add'>+	 */</div><div class='add'>+	if (bbio-&gt;csum_search_commit_root) {</div><div class='add'>+		path-&gt;search_commit_root = true;</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='add'>+		down_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (bio_offset &lt; orig_len) {</div><div class='hunk'>@@ -413,9 +437,9 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='ctx'> 		count = search_csum_tree(fs_info, path, cur_disk_bytenr,</div><div class='ctx'> 					 orig_len - bio_offset, csum_dst);</div><div class='ctx'> 		if (count &lt; 0) {</div><div class='del'>-			ret = errno_to_blk_status(count);</div><div class='add'>+			ret = count;</div><div class='ctx'> 			if (bbio-&gt;csum != bbio-&gt;csum_inline)</div><div class='del'>-				kfree(bbio-&gt;csum);</div><div class='add'>+				kvfree(bbio-&gt;csum);</div><div class='ctx'> 			bbio-&gt;csum = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -434,13 +458,12 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='ctx'> 			memset(csum_dst, 0, csum_size);</div><div class='ctx'> 			count = 1;</div><div class='ctx'> </div><div class='del'>-			if (inode-&gt;root-&gt;root_key.objectid ==</div><div class='del'>-			    BTRFS_DATA_RELOC_TREE_OBJECTID) {</div><div class='add'>+			if (btrfs_is_data_reloc_root(inode-&gt;root)) {</div><div class='ctx'> 				u64 file_offset = bbio-&gt;file_offset + bio_offset;</div><div class='ctx'> </div><div class='del'>-				set_extent_bit(&amp;inode-&gt;io_tree, file_offset,</div><div class='del'>-					       file_offset + sectorsize - 1,</div><div class='del'>-					       EXTENT_NODATASUM, NULL);</div><div class='add'>+				btrfs_set_extent_bit(&amp;inode-&gt;io_tree, file_offset,</div><div class='add'>+						     file_offset + sectorsize - 1,</div><div class='add'>+						     EXTENT_NODATASUM, NULL);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				btrfs_warn_rl(fs_info,</div><div class='ctx'> 			"csum hole found for disk bytenr range [%llu, %llu)",</div><div class='hunk'>@@ -450,13 +473,27 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)</div><div class='ctx'> 		bio_offset += count * sectorsize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	if (bbio-&gt;csum_search_commit_root)</div><div class='add'>+		up_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Search for checksums for a given logical range.</div><div class='add'>+ *</div><div class='add'>+ * @root:		The root where to look for checksums.</div><div class='add'>+ * @start:		Logical address of target checksum range.</div><div class='add'>+ * @end:		End offset (inclusive) of the target checksum range.</div><div class='add'>+ * @list:		List for adding each checksum that was found.</div><div class='add'>+ *			Can be NULL in case the caller only wants to check if</div><div class='add'>+ *			there any checksums for the range.</div><div class='add'>+ * @nowait:		Indicate if the search must be non-blocking or not.</div><div class='add'>+ *</div><div class='add'>+ * Return &lt; 0 on error, 0 if no checksums were found, or 1 if checksums were</div><div class='add'>+ * found.</div><div class='add'>+ */</div><div class='ctx'> int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='del'>-			    struct list_head *list, int search_commit,</div><div class='del'>-			    bool nowait)</div><div class='add'>+			    struct list_head *list, bool nowait)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -464,8 +501,8 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_ordered_sum *sums;</div><div class='ctx'> 	struct btrfs_csum_item *item;</div><div class='del'>-	LIST_HEAD(tmplist);</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool found_csums = false;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(IS_ALIGNED(start, fs_info-&gt;sectorsize) &amp;&amp;</div><div class='ctx'> 	       IS_ALIGNED(end + 1, fs_info-&gt;sectorsize));</div><div class='hunk'>@@ -475,19 +512,14 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;nowait = nowait;</div><div class='del'>-	if (search_commit) {</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='del'>-		path-&gt;reada = READA_FORWARD;</div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;</div><div class='del'>-	key.offset = start;</div><div class='ctx'> 	key.type = BTRFS_EXTENT_CSUM_KEY;</div><div class='add'>+	key.offset = start;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (ret &gt; 0 &amp;&amp; path-&gt;slots[0] &gt; 0) {</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0] - 1);</div><div class='hunk'>@@ -522,7 +554,7 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 		if (path-&gt;slots[0] &gt;= btrfs_header_nritems(leaf)) {</div><div class='ctx'> 			ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto fail;</div><div class='add'>+				goto out;</div><div class='ctx'> 			if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -544,6 +576,10 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		found_csums = true;</div><div class='add'>+		if (!list)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 		csum_end = min(csum_end, end + 1);</div><div class='ctx'> 		item = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='ctx'> 				      struct btrfs_csum_item);</div><div class='hunk'>@@ -557,7 +593,7 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 				       GFP_NOFS);</div><div class='ctx'> 			if (!sums) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='del'>-				goto fail;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			sums-&gt;logical = start;</div><div class='hunk'>@@ -571,21 +607,24 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 					   bytes_to_csum_size(fs_info, size));</div><div class='ctx'> </div><div class='ctx'> 			start += size;</div><div class='del'>-			list_add_tail(&amp;sums-&gt;list, &amp;tmplist);</div><div class='add'>+			list_add_tail(&amp;sums-&gt;list, list);</div><div class='ctx'> 		}</div><div class='ctx'> 		path-&gt;slots[0]++;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-fail:</div><div class='del'>-	while (ret &lt; 0 &amp;&amp; !list_empty(&amp;tmplist)) {</div><div class='del'>-		sums = list_entry(tmplist.next, struct btrfs_ordered_sum, list);</div><div class='del'>-		list_del(&amp;sums-&gt;list);</div><div class='del'>-		kfree(sums);</div><div class='add'>+out:</div><div class='add'>+	btrfs_free_path(path);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (list) {</div><div class='add'>+			struct btrfs_ordered_sum *tmp_sums;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry_safe(sums, tmp_sums, list, list)</div><div class='add'>+				kfree(sums);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	list_splice_tail(&amp;tmplist, list);</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return found_csums ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -726,23 +765,55 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void csum_one_bio(struct btrfs_bio *bbio, struct bvec_iter *src)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	SHASH_DESC_ON_STACK(shash, fs_info-&gt;csum_shash);</div><div class='add'>+	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='add'>+	struct btrfs_ordered_sum *sums = bbio-&gt;sums;</div><div class='add'>+	struct bvec_iter iter = *src;</div><div class='add'>+	phys_addr_t paddr;</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(blocksize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = blocksize / step;</div><div class='add'>+	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	int index = 0;</div><div class='add'>+</div><div class='add'>+	shash-&gt;tfm = fs_info-&gt;csum_shash;</div><div class='add'>+</div><div class='add'>+	btrfs_bio_for_each_block(paddr, bio, &amp;iter, step) {</div><div class='add'>+		paddrs[(offset / step) % nr_steps] = paddr;</div><div class='add'>+		offset += step;</div><div class='add'>+</div><div class='add'>+		if (IS_ALIGNED(offset, blocksize)) {</div><div class='add'>+			btrfs_calculate_block_csum_pages(fs_info, paddrs, sums-&gt;sums + index);</div><div class='add'>+			index += fs_info-&gt;csum_size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void csum_one_bio_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_bio *bbio = container_of(work, struct btrfs_bio, csum_work);</div><div class='add'>+</div><div class='add'>+	ASSERT(btrfs_op(&amp;bbio-&gt;bio) == BTRFS_MAP_WRITE);</div><div class='add'>+	ASSERT(bbio-&gt;async_csum == true);</div><div class='add'>+	csum_one_bio(bbio, &amp;bbio-&gt;csum_saved_iter);</div><div class='add'>+	complete(&amp;bbio-&gt;csum_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Calculate checksums of the data contained inside a bio.</div><div class='ctx'>  */</div><div class='del'>-blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)</div><div class='add'>+int btrfs_csum_one_bio(struct btrfs_bio *bbio, bool async)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered = bbio-&gt;ordered;</div><div class='ctx'> 	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	SHASH_DESC_ON_STACK(shash, fs_info-&gt;csum_shash);</div><div class='ctx'> 	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='ctx'> 	struct btrfs_ordered_sum *sums;</div><div class='del'>-	char *data;</div><div class='del'>-	struct bvec_iter iter;</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	int index;</div><div class='del'>-	unsigned int blockcount;</div><div class='del'>-	int i;</div><div class='ctx'> 	unsigned nofs_flag;</div><div class='ctx'> </div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='hunk'>@@ -751,35 +822,23 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flag);</div><div class='ctx'> </div><div class='ctx'> 	if (!sums)</div><div class='del'>-		return BLK_STS_RESOURCE;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	sums-&gt;logical = bbio-&gt;orig_logical;</div><div class='ctx'> 	sums-&gt;len = bio-&gt;bi_iter.bi_size;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sums-&gt;list);</div><div class='del'>-</div><div class='del'>-	sums-&gt;logical = bio-&gt;bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='del'>-	index = 0;</div><div class='del'>-</div><div class='del'>-	shash-&gt;tfm = fs_info-&gt;csum_shash;</div><div class='del'>-</div><div class='del'>-	bio_for_each_segment(bvec, bio, iter) {</div><div class='del'>-		blockcount = BTRFS_BYTES_TO_BLKS(fs_info,</div><div class='del'>-						 bvec.bv_len + fs_info-&gt;sectorsize</div><div class='del'>-						 - 1);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; blockcount; i++) {</div><div class='del'>-			data = bvec_kmap_local(&amp;bvec);</div><div class='del'>-			crypto_shash_digest(shash,</div><div class='del'>-					    data + (i * fs_info-&gt;sectorsize),</div><div class='del'>-					    fs_info-&gt;sectorsize,</div><div class='del'>-					    sums-&gt;sums + index);</div><div class='del'>-			kunmap_local(data);</div><div class='del'>-			index += fs_info-&gt;csum_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bbio-&gt;sums = sums;</div><div class='ctx'> 	btrfs_add_ordered_sum(ordered, sums);</div><div class='add'>+</div><div class='add'>+	if (!async) {</div><div class='add'>+		csum_one_bio(bbio, &amp;bbio-&gt;bio.bi_iter);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	init_completion(&amp;bbio-&gt;csum_done);</div><div class='add'>+	bbio-&gt;async_csum = true;</div><div class='add'>+	bbio-&gt;csum_saved_iter = bbio-&gt;bio.bi_iter;</div><div class='add'>+	INIT_WORK(&amp;bbio-&gt;csum_work, csum_one_bio_work);</div><div class='add'>+	schedule_work(&amp;bbio-&gt;csum_work);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -788,11 +847,11 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)</div><div class='ctx'>  * record the updated logical address on Zone Append completion.</div><div class='ctx'>  * Allocate just the structure with an empty sums array here for that case.</div><div class='ctx'>  */</div><div class='del'>-blk_status_t btrfs_alloc_dummy_sum(struct btrfs_bio *bbio)</div><div class='add'>+int btrfs_alloc_dummy_sum(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	bbio-&gt;sums = kmalloc(sizeof(*bbio-&gt;sums), GFP_NOFS);</div><div class='ctx'> 	if (!bbio-&gt;sums)</div><div class='del'>-		return BLK_STS_RESOURCE;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	bbio-&gt;sums-&gt;len = bbio-&gt;bio.bi_iter.bi_size;</div><div class='ctx'> 	bbio-&gt;sums-&gt;logical = bbio-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> 	btrfs_add_ordered_sum(bbio-&gt;ordered, bbio-&gt;sums);</div><div class='hunk'>@@ -865,7 +924,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		    struct btrfs_root *root, u64 bytenr, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 end_byte = bytenr + len;</div><div class='ctx'> 	u64 csum_end;</div><div class='hunk'>@@ -874,8 +933,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	const u32 csum_size = fs_info-&gt;csum_size;</div><div class='ctx'> 	u32 blocksize_bits = fs_info-&gt;sectorsize_bits;</div><div class='ctx'> </div><div class='del'>-	ASSERT(root-&gt;root_key.objectid == BTRFS_CSUM_TREE_OBJECTID ||</div><div class='del'>-	       root-&gt;root_key.objectid == BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	ASSERT(btrfs_root_id(root) == BTRFS_CSUM_TREE_OBJECTID ||</div><div class='add'>+	       btrfs_root_id(root) == BTRFS_TREE_LOG_OBJECTID);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -883,8 +942,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;</div><div class='del'>-		key.offset = end_byte - 1;</div><div class='ctx'> 		key.type = BTRFS_EXTENT_CSUM_KEY;</div><div class='add'>+		key.offset = end_byte - 1;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='hunk'>@@ -987,7 +1046,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 * item changed size or key</div><div class='ctx'> 			 */</div><div class='ctx'> 			ret = btrfs_split_item(trans, root, path, &amp;key, offset);</div><div class='del'>-			if (ret &amp;&amp; ret != -EAGAIN) {</div><div class='add'>+			if (unlikely(ret &amp;&amp; ret != -EAGAIN)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1001,7 +1060,6 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1043,7 +1101,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key file_key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_csum_item *item;</div><div class='ctx'> 	struct btrfs_csum_item *item_end;</div><div class='ctx'> 	struct extent_buffer *leaf = NULL;</div><div class='hunk'>@@ -1065,8 +1123,8 @@ again:</div><div class='ctx'> 	found_next = 0;</div><div class='ctx'> 	bytenr = sums-&gt;logical + total_bytes;</div><div class='ctx'> 	file_key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;</div><div class='del'>-	file_key.offset = bytenr;</div><div class='ctx'> 	file_key.type = BTRFS_EXTENT_CSUM_KEY;</div><div class='add'>+	file_key.offset = bytenr;</div><div class='ctx'> </div><div class='ctx'> 	item = btrfs_lookup_csum(trans, root, path, bytenr, 1);</div><div class='ctx'> 	if (!IS_ERR(item)) {</div><div class='hunk'>@@ -1119,10 +1177,10 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	path-&gt;search_for_extension = 1;</div><div class='add'>+	path-&gt;search_for_extension = true;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;file_key, path,</div><div class='ctx'> 				csum_size, 1);</div><div class='del'>-	path-&gt;search_for_extension = 0;</div><div class='add'>+	path-&gt;search_for_extension = false;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1175,7 +1233,7 @@ extend_csum:</div><div class='ctx'> 		 * search, etc, because log trees are temporary anyway and it</div><div class='ctx'> 		 * would only save a few bytes of leaf space.</div><div class='ctx'> 		 */</div><div class='del'>-		if (root-&gt;root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {</div><div class='add'>+		if (btrfs_root_id(root) == BTRFS_TREE_LOG_OBJECTID) {</div><div class='ctx'> 			if (path-&gt;slots[0] + 1 &gt;=</div><div class='ctx'> 			    btrfs_header_nritems(path-&gt;nodes[0])) {</div><div class='ctx'> 				ret = find_next_csum_offset(root, path, &amp;next_offset);</div><div class='hunk'>@@ -1229,8 +1287,6 @@ insert:</div><div class='ctx'> 				      ins_size);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (WARN_ON(ret != 0))</div><div class='del'>-		goto out;</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> csum:</div><div class='ctx'> 	item = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_csum_item);</div><div class='hunk'>@@ -1250,20 +1306,18 @@ found:</div><div class='ctx'> 	ins_size /= csum_size;</div><div class='ctx'> 	total_bytes += ins_size * fs_info-&gt;sectorsize;</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> 	if (total_bytes &lt; sums-&gt;len) {</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,</div><div class='ctx'> 				     const struct btrfs_path *path,</div><div class='del'>-				     struct btrfs_file_extent_item *fi,</div><div class='add'>+				     const struct btrfs_file_extent_item *fi,</div><div class='ctx'> 				     struct extent_map *em)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='hunk'>@@ -1271,55 +1325,56 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,</div><div class='ctx'> 	struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='ctx'> 	const int slot = path-&gt;slots[0];</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	u64 extent_start, extent_end;</div><div class='del'>-	u64 bytenr;</div><div class='add'>+	u64 extent_start;</div><div class='ctx'> 	u8 type = btrfs_file_extent_type(leaf, fi);</div><div class='ctx'> 	int compress_type = btrfs_file_extent_compression(leaf, fi);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, slot);</div><div class='ctx'> 	extent_start = key.offset;</div><div class='del'>-	extent_end = btrfs_file_extent_end(path);</div><div class='ctx'> 	em-&gt;ram_bytes = btrfs_file_extent_ram_bytes(leaf, fi);</div><div class='ctx'> 	em-&gt;generation = btrfs_file_extent_generation(leaf, fi);</div><div class='ctx'> 	if (type == BTRFS_FILE_EXTENT_REG ||</div><div class='ctx'> 	    type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='add'>+		const u64 disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);</div><div class='add'>+</div><div class='ctx'> 		em-&gt;start = extent_start;</div><div class='del'>-		em-&gt;len = extent_end - extent_start;</div><div class='del'>-		em-&gt;orig_start = extent_start -</div><div class='del'>-			btrfs_file_extent_offset(leaf, fi);</div><div class='del'>-		em-&gt;orig_block_len = btrfs_file_extent_disk_num_bytes(leaf, fi);</div><div class='del'>-		bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);</div><div class='del'>-		if (bytenr == 0) {</div><div class='del'>-			em-&gt;block_start = EXTENT_MAP_HOLE;</div><div class='add'>+		em-&gt;len = btrfs_file_extent_end(path) - extent_start;</div><div class='add'>+		if (disk_bytenr == 0) {</div><div class='add'>+			em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='add'>+			em-&gt;disk_num_bytes = 0;</div><div class='add'>+			em-&gt;offset = 0;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+		em-&gt;disk_bytenr = disk_bytenr;</div><div class='add'>+		em-&gt;disk_num_bytes = btrfs_file_extent_disk_num_bytes(leaf, fi);</div><div class='add'>+		em-&gt;offset = btrfs_file_extent_offset(leaf, fi);</div><div class='ctx'> 		if (compress_type != BTRFS_COMPRESS_NONE) {</div><div class='del'>-			extent_map_set_compression(em, compress_type);</div><div class='del'>-			em-&gt;block_start = bytenr;</div><div class='del'>-			em-&gt;block_len = em-&gt;orig_block_len;</div><div class='add'>+			btrfs_extent_map_set_compression(em, compress_type);</div><div class='ctx'> 		} else {</div><div class='del'>-			bytenr += btrfs_file_extent_offset(leaf, fi);</div><div class='del'>-			em-&gt;block_start = bytenr;</div><div class='del'>-			em-&gt;block_len = em-&gt;len;</div><div class='add'>+			/*</div><div class='add'>+			 * Older kernels can create regular non-hole data</div><div class='add'>+			 * extents with ram_bytes smaller than disk_num_bytes.</div><div class='add'>+			 * Not a big deal, just always use disk_num_bytes</div><div class='add'>+			 * for ram_bytes.</div><div class='add'>+			 */</div><div class='add'>+			em-&gt;ram_bytes = em-&gt;disk_num_bytes;</div><div class='ctx'> 			if (type == BTRFS_FILE_EXTENT_PREALLOC)</div><div class='ctx'> 				em-&gt;flags |= EXTENT_FLAG_PREALLOC;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-		em-&gt;block_start = EXTENT_MAP_INLINE;</div><div class='del'>-		em-&gt;start = extent_start;</div><div class='del'>-		em-&gt;len = extent_end - extent_start;</div><div class='del'>-		/*</div><div class='del'>-		 * Initialize orig_start and block_len with the same values</div><div class='del'>-		 * as in inode.c:btrfs_get_extent().</div><div class='del'>-		 */</div><div class='del'>-		em-&gt;orig_start = EXTENT_MAP_HOLE;</div><div class='del'>-		em-&gt;block_len = (u64)-1;</div><div class='del'>-		extent_map_set_compression(em, compress_type);</div><div class='add'>+		/* Tree-checker has ensured this. */</div><div class='add'>+		ASSERT(extent_start == 0);</div><div class='add'>+</div><div class='add'>+		em-&gt;disk_bytenr = EXTENT_MAP_INLINE;</div><div class='add'>+		em-&gt;start = 0;</div><div class='add'>+		em-&gt;len = fs_info-&gt;sectorsize;</div><div class='add'>+		em-&gt;offset = 0;</div><div class='add'>+		btrfs_extent_map_set_compression(em, compress_type);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "unknown file extent item type %d, inode %llu, offset %llu, "</div><div class='ctx'> 			  "root %llu", type, btrfs_ino(inode), extent_start,</div><div class='del'>-			  root-&gt;root_key.objectid);</div><div class='add'>+			  btrfs_root_id(root));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1340,12 +1395,10 @@ u64 btrfs_file_extent_end(const struct btrfs_path *path)</div><div class='ctx'> 	ASSERT(key.type == BTRFS_EXTENT_DATA_KEY);</div><div class='ctx'> 	fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item);</div><div class='ctx'> </div><div class='del'>-	if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-		end = btrfs_file_extent_ram_bytes(leaf, fi);</div><div class='del'>-		end = ALIGN(key.offset + end, leaf-&gt;fs_info-&gt;sectorsize);</div><div class='del'>-	} else {</div><div class='add'>+	if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE)</div><div class='add'>+		end = leaf-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+	else</div><div class='ctx'> 		end = key.offset + btrfs_file_extent_num_bytes(leaf, fi);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return end;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/file-item.h b/fs/btrfs/file-item.h<br/>index 04bd2d34efb1..5645c5e3abdb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file-item.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file-item.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file-item.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/file-item.h</a></div><div class='hunk'>@@ -3,7 +3,22 @@</div><div class='ctx'> #ifndef BTRFS_FILE_ITEM_H</div><div class='ctx'> #define BTRFS_FILE_ITEM_H</div><div class='ctx'> </div><div class='del'>-#include "accessors.h"</div><div class='add'>+#include &lt;linux/blk_types.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='add'>+#include "ctree.h"</div><div class='add'>+#include "ordered-data.h"</div><div class='add'>+</div><div class='add'>+struct extent_map;</div><div class='add'>+struct btrfs_file_extent_item;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_bio;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_ordered_sum;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_inode;</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_FILE_EXTENT_INLINE_DATA_START		\</div><div class='ctx'> 		(offsetof(struct btrfs_file_extent_item, disk_bytenr))</div><div class='hunk'>@@ -38,7 +53,7 @@ static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize)</div><div class='ctx'> </div><div class='ctx'> int btrfs_del_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		    struct btrfs_root *root, u64 bytenr, u64 len);</div><div class='del'>-blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio);</div><div class='add'>+int btrfs_lookup_bio_sums(struct btrfs_bio *bbio);</div><div class='ctx'> int btrfs_insert_hole_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_root *root, u64 objectid, u64 pos,</div><div class='ctx'> 			     u64 num_bytes);</div><div class='hunk'>@@ -49,20 +64,19 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			   struct btrfs_root *root,</div><div class='ctx'> 			   struct btrfs_ordered_sum *sums);</div><div class='del'>-blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio);</div><div class='del'>-blk_status_t btrfs_alloc_dummy_sum(struct btrfs_bio *bbio);</div><div class='add'>+int btrfs_csum_one_bio(struct btrfs_bio *bbio, bool async);</div><div class='add'>+int btrfs_alloc_dummy_sum(struct btrfs_bio *bbio);</div><div class='ctx'> int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,</div><div class='ctx'> 			     struct list_head *list, int search_commit,</div><div class='ctx'> 			     bool nowait);</div><div class='ctx'> int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,</div><div class='del'>-			    struct list_head *list, int search_commit,</div><div class='del'>-			    bool nowait);</div><div class='add'>+			    struct list_head *list, bool nowait);</div><div class='ctx'> int btrfs_lookup_csums_bitmap(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 			      u64 start, u64 end, u8 *csum_buf,</div><div class='ctx'> 			      unsigned long *csum_bitmap);</div><div class='ctx'> void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,</div><div class='ctx'> 				     const struct btrfs_path *path,</div><div class='del'>-				     struct btrfs_file_extent_item *fi,</div><div class='add'>+				     const struct btrfs_file_extent_item *fi,</div><div class='ctx'> 				     struct extent_map *em);</div><div class='ctx'> int btrfs_inode_clear_file_extent_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 					u64 len);</div><div class='head'>diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c<br/>index 38dfcac47609..7a501e73d880 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/file.c</a></div><div class='hunk'>@@ -17,15 +17,13 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='ctx'> #include &lt;linux/fsverity.h&gt;</div><div class='del'>-#include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='add'>+#include "direct-io.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "tree-log.h"</div><div class='ctx'> #include "locking.h"</div><div class='del'>-#include "volumes.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "delalloc-space.h"</div><div class='hunk'>@@ -38,104 +36,46 @@</div><div class='ctx'> #include "ioctl.h"</div><div class='ctx'> #include "file.h"</div><div class='ctx'> #include "super.h"</div><div class='del'>-</div><div class='del'>-/* simple helper to fault in pages and copy.  This should go away</div><div class='del'>- * and be replaced with calls into generic code.</div><div class='del'>- */</div><div class='del'>-static noinline int btrfs_copy_from_user(loff_t pos, size_t write_bytes,</div><div class='del'>-					 struct page **prepared_pages,</div><div class='del'>-					 struct iov_iter *i)</div><div class='del'>-{</div><div class='del'>-	size_t copied = 0;</div><div class='del'>-	size_t total_copied = 0;</div><div class='del'>-	int pg = 0;</div><div class='del'>-	int offset = offset_in_page(pos);</div><div class='del'>-</div><div class='del'>-	while (write_bytes &gt; 0) {</div><div class='del'>-		size_t count = min_t(size_t,</div><div class='del'>-				     PAGE_SIZE - offset, write_bytes);</div><div class='del'>-		struct page *page = prepared_pages[pg];</div><div class='del'>-		/*</div><div class='del'>-		 * Copy data from userspace to the current page</div><div class='del'>-		 */</div><div class='del'>-		copied = copy_page_from_iter_atomic(page, offset, count, i);</div><div class='del'>-</div><div class='del'>-		/* Flush processor's dcache for this page */</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if we get a partial write, we can end up with</div><div class='del'>-		 * partially up to date pages.  These add</div><div class='del'>-		 * a lot of complexity, so make sure they don't</div><div class='del'>-		 * happen by forcing this copy to be retried.</div><div class='del'>-		 *</div><div class='del'>-		 * The rest of the btrfs_file_write code will fall</div><div class='del'>-		 * back to page at a time copies after we return 0.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(copied &lt; count)) {</div><div class='del'>-			if (!PageUptodate(page)) {</div><div class='del'>-				iov_iter_revert(i, copied);</div><div class='del'>-				copied = 0;</div><div class='del'>-			}</div><div class='del'>-			if (!copied)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		write_bytes -= copied;</div><div class='del'>-		total_copied += copied;</div><div class='del'>-		offset += copied;</div><div class='del'>-		if (offset == PAGE_SIZE) {</div><div class='del'>-			pg++;</div><div class='del'>-			offset = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return total_copied;</div><div class='del'>-}</div><div class='add'>+#include "print-tree.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * unlocks pages after btrfs_file_write is done with them</div><div class='add'>+ * Unlock folio after btrfs_file_write() is done with it.</div><div class='ctx'>  */</div><div class='del'>-static void btrfs_drop_pages(struct btrfs_fs_info *fs_info,</div><div class='del'>-			     struct page **pages, size_t num_pages,</div><div class='add'>+static void btrfs_drop_folio(struct btrfs_fs_info *fs_info, struct folio *folio,</div><div class='ctx'> 			     u64 pos, u64 copied)</div><div class='ctx'> {</div><div class='del'>-	size_t i;</div><div class='ctx'> 	u64 block_start = round_down(pos, fs_info-&gt;sectorsize);</div><div class='ctx'> 	u64 block_len = round_up(pos + copied, fs_info-&gt;sectorsize) - block_start;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(block_len &lt;= U32_MAX);</div><div class='del'>-	for (i = 0; i &lt; num_pages; i++) {</div><div class='del'>-		/* page checked is some magic around finding pages that</div><div class='del'>-		 * have been modified without going through btrfs_set_page_dirty</div><div class='del'>-		 * clear it here. There should be no need to mark the pages</div><div class='del'>-		 * accessed as prepare_pages should have marked them accessed</div><div class='del'>-		 * in prepare_pages via find_or_create_page()</div><div class='del'>-		 */</div><div class='del'>-		btrfs_folio_clamp_clear_checked(fs_info, page_folio(pages[i]),</div><div class='del'>-						block_start, block_len);</div><div class='del'>-		unlock_page(pages[i]);</div><div class='del'>-		put_page(pages[i]);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Folio checked is some magic around finding folios that have been</div><div class='add'>+	 * modified without going through btrfs_dirty_folio().  Clear it here.</div><div class='add'>+	 * There should be no need to mark the pages accessed as</div><div class='add'>+	 * prepare_one_folio() should have marked them accessed in</div><div class='add'>+	 * prepare_one_folio() via find_or_create_page()</div><div class='add'>+	 */</div><div class='add'>+	btrfs_folio_clamp_clear_checked(fs_info, folio, block_start, block_len);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * After btrfs_copy_from_user(), update the following things for delalloc:</div><div class='del'>- * - Mark newly dirtied pages as DELALLOC in the io tree.</div><div class='add'>+ * After copy_folio_from_iter_atomic(), update the following things for delalloc:</div><div class='add'>+ * - Mark newly dirtied folio as DELALLOC in the io tree.</div><div class='ctx'>  *   Used to advise which range is to be written back.</div><div class='del'>- * - Mark modified pages as Uptodate/Dirty and not needing COW fixup</div><div class='add'>+ * - Mark modified folio as Uptodate/Dirty and not needing COW fixup</div><div class='ctx'>  * - Update inode size for past EOF write</div><div class='ctx'>  */</div><div class='del'>-int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,</div><div class='del'>-		      size_t num_pages, loff_t pos, size_t write_bytes,</div><div class='del'>-		      struct extent_state **cached, bool noreserve)</div><div class='add'>+int btrfs_dirty_folio(struct btrfs_inode *inode, struct folio *folio, loff_t pos,</div><div class='add'>+		      size_t write_bytes, struct extent_state **cached, bool noreserve)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int i;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u64 num_bytes;</div><div class='ctx'> 	u64 start_pos;</div><div class='ctx'> 	u64 end_of_last_block;</div><div class='del'>-	u64 end_pos = pos + write_bytes;</div><div class='add'>+	const u64 end_pos = pos + write_bytes;</div><div class='ctx'> 	loff_t isize = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	unsigned int extra_bits = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -146,9 +86,9 @@ int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'> 		extra_bits |= EXTENT_NORESERVE;</div><div class='ctx'> </div><div class='ctx'> 	start_pos = round_down(pos, fs_info-&gt;sectorsize);</div><div class='del'>-	num_bytes = round_up(write_bytes + pos - start_pos,</div><div class='del'>-			     fs_info-&gt;sectorsize);</div><div class='add'>+	num_bytes = round_up(end_pos - start_pos, fs_info-&gt;sectorsize);</div><div class='ctx'> 	ASSERT(num_bytes &lt;= U32_MAX);</div><div class='add'>+	ASSERT(folio_pos(folio) &lt;= pos &amp;&amp; folio_next_pos(folio) &gt;= end_pos);</div><div class='ctx'> </div><div class='ctx'> 	end_of_last_block = start_pos + num_bytes - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -156,25 +96,18 @@ int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'> 	 * The pages may have already been dirty, clear out old accounting so</div><div class='ctx'> 	 * we can set things up properly</div><div class='ctx'> 	 */</div><div class='del'>-	clear_extent_bit(&amp;inode-&gt;io_tree, start_pos, end_of_last_block,</div><div class='del'>-			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,</div><div class='del'>-			 cached);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, start_pos, end_of_last_block,</div><div class='add'>+			       EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,</div><div class='add'>+			       cached);</div><div class='ctx'> </div><div class='del'>-	err = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block,</div><div class='add'>+	ret = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block,</div><div class='ctx'> 					extra_bits, cached);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_pages; i++) {</div><div class='del'>-		struct page *p = pages[i];</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		btrfs_folio_clamp_set_uptodate(fs_info, page_folio(p),</div><div class='del'>-					       start_pos, num_bytes);</div><div class='del'>-		btrfs_folio_clamp_clear_checked(fs_info, page_folio(p),</div><div class='del'>-						start_pos, num_bytes);</div><div class='del'>-		btrfs_folio_clamp_set_dirty(fs_info, page_folio(p),</div><div class='del'>-					    start_pos, num_bytes);</div><div class='del'>-	}</div><div class='add'>+	btrfs_folio_clamp_set_uptodate(fs_info, folio, start_pos, num_bytes);</div><div class='add'>+	btrfs_folio_clamp_clear_checked(fs_info, folio, start_pos, num_bytes);</div><div class='add'>+	btrfs_folio_clamp_set_dirty(fs_info, folio, start_pos, num_bytes);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we've only changed i_size in ram, and we haven't updated</div><div class='hunk'>@@ -208,7 +141,6 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='del'>-	struct btrfs_ref ref = { 0 };</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key new_key;</div><div class='ctx'> 	u64 ino = btrfs_ino(inode);</div><div class='hunk'>@@ -245,10 +177,10 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (args-&gt;drop_cache)</div><div class='ctx'> 		btrfs_drop_extent_map_range(inode, args-&gt;start, args-&gt;end - 1, false);</div><div class='ctx'> </div><div class='del'>-	if (args-&gt;start &gt;= inode-&gt;disk_i_size &amp;&amp; !args-&gt;replace_extent)</div><div class='add'>+	if (data_race(args-&gt;start &gt;= inode-&gt;disk_i_size) &amp;&amp; !args-&gt;replace_extent)</div><div class='ctx'> 		modify_tree = 0;</div><div class='ctx'> </div><div class='del'>-	update_refs = (root-&gt;root_key.objectid != BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	update_refs = (btrfs_root_id(root) != BTRFS_TREE_LOG_OBJECTID);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		recow = 0;</div><div class='ctx'> 		ret = btrfs_lookup_file_extent(trans, root, path, ino,</div><div class='hunk'>@@ -266,7 +198,11 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> next_slot:</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		if (path-&gt;slots[0] &gt;= btrfs_header_nritems(leaf)) {</div><div class='del'>-			BUG_ON(del_nr &gt; 0);</div><div class='add'>+			if (WARN_ON(del_nr &gt; 0)) {</div><div class='add'>+				btrfs_print_leaf(leaf);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -342,7 +278,11 @@ next_slot:</div><div class='ctx'> 		 *  | -------- extent -------- |</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (args-&gt;start &gt; key.offset &amp;&amp; args-&gt;end &lt; extent_end) {</div><div class='del'>-			BUG_ON(del_nr &gt; 0);</div><div class='add'>+			if (WARN_ON(del_nr &gt; 0)) {</div><div class='add'>+				btrfs_print_leaf(leaf);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			if (extent_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='ctx'> 				ret = -EOPNOTSUPP;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -372,20 +312,21 @@ next_slot:</div><div class='ctx'> 			btrfs_set_file_extent_offset(leaf, fi, extent_offset);</div><div class='ctx'> 			btrfs_set_file_extent_num_bytes(leaf, fi,</div><div class='ctx'> 							extent_end - args-&gt;start);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='ctx'> 			if (update_refs &amp;&amp; disk_bytenr &gt; 0) {</div><div class='del'>-				btrfs_init_generic_ref(&amp;ref,</div><div class='del'>-						BTRFS_ADD_DELAYED_REF,</div><div class='del'>-						disk_bytenr, num_bytes, 0,</div><div class='del'>-						root-&gt;root_key.objectid);</div><div class='del'>-				btrfs_init_data_ref(&amp;ref,</div><div class='del'>-						root-&gt;root_key.objectid,</div><div class='del'>-						new_key.objectid,</div><div class='del'>-						args-&gt;start - extent_offset,</div><div class='del'>-						0, false);</div><div class='add'>+				struct btrfs_ref ref = {</div><div class='add'>+					.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+					.bytenr = disk_bytenr,</div><div class='add'>+					.num_bytes = num_bytes,</div><div class='add'>+					.parent = 0,</div><div class='add'>+					.owning_root = btrfs_root_id(root),</div><div class='add'>+					.ref_root = btrfs_root_id(root),</div><div class='add'>+				};</div><div class='add'>+				btrfs_init_data_ref(&amp;ref, new_key.objectid,</div><div class='add'>+						    args-&gt;start - extent_offset,</div><div class='add'>+						    0, false);</div><div class='ctx'> 				ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='del'>-				if (ret) {</div><div class='add'>+				if (unlikely(ret)) {</div><div class='ctx'> 					btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -416,7 +357,6 @@ next_slot:</div><div class='ctx'> 			btrfs_set_file_extent_offset(leaf, fi, extent_offset);</div><div class='ctx'> 			btrfs_set_file_extent_num_bytes(leaf, fi,</div><div class='ctx'> 							extent_end - args-&gt;end);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 			if (update_refs &amp;&amp; disk_bytenr &gt; 0)</div><div class='ctx'> 				args-&gt;bytes_found += args-&gt;end - key.offset;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -428,7 +368,11 @@ next_slot:</div><div class='ctx'> 		 *  | -------- extent -------- |</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (args-&gt;start &gt; key.offset &amp;&amp; args-&gt;end &gt;= extent_end) {</div><div class='del'>-			BUG_ON(del_nr &gt; 0);</div><div class='add'>+			if (WARN_ON(del_nr &gt; 0)) {</div><div class='add'>+				btrfs_print_leaf(leaf);</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			if (extent_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='ctx'> 				ret = -EOPNOTSUPP;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -436,7 +380,6 @@ next_slot:</div><div class='ctx'> </div><div class='ctx'> 			btrfs_set_file_extent_num_bytes(leaf, fi,</div><div class='ctx'> 							args-&gt;start - key.offset);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 			if (update_refs &amp;&amp; disk_bytenr &gt; 0)</div><div class='ctx'> 				args-&gt;bytes_found += extent_end - args-&gt;start;</div><div class='ctx'> 			if (args-&gt;end == extent_end)</div><div class='hunk'>@@ -456,7 +399,11 @@ delete_extent_item:</div><div class='ctx'> 				del_slot = path-&gt;slots[0];</div><div class='ctx'> 				del_nr = 1;</div><div class='ctx'> 			} else {</div><div class='del'>-				BUG_ON(del_slot + del_nr != path-&gt;slots[0]);</div><div class='add'>+				if (WARN_ON(del_slot + del_nr != path-&gt;slots[0])) {</div><div class='add'>+					btrfs_print_leaf(leaf);</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 				del_nr++;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -466,17 +413,19 @@ delete_extent_item:</div><div class='ctx'> 				extent_end = ALIGN(extent_end,</div><div class='ctx'> 						   fs_info-&gt;sectorsize);</div><div class='ctx'> 			} else if (update_refs &amp;&amp; disk_bytenr &gt; 0) {</div><div class='del'>-				btrfs_init_generic_ref(&amp;ref,</div><div class='del'>-						BTRFS_DROP_DELAYED_REF,</div><div class='del'>-						disk_bytenr, num_bytes, 0,</div><div class='del'>-						root-&gt;root_key.objectid);</div><div class='del'>-				btrfs_init_data_ref(&amp;ref,</div><div class='del'>-						root-&gt;root_key.objectid,</div><div class='del'>-						key.objectid,</div><div class='del'>-						key.offset - extent_offset, 0,</div><div class='del'>-						false);</div><div class='add'>+				struct btrfs_ref ref = {</div><div class='add'>+					.action = BTRFS_DROP_DELAYED_REF,</div><div class='add'>+					.bytenr = disk_bytenr,</div><div class='add'>+					.num_bytes = num_bytes,</div><div class='add'>+					.parent = 0,</div><div class='add'>+					.owning_root = btrfs_root_id(root),</div><div class='add'>+					.ref_root = btrfs_root_id(root),</div><div class='add'>+				};</div><div class='add'>+				btrfs_init_data_ref(&amp;ref, key.objectid,</div><div class='add'>+						    key.offset - extent_offset,</div><div class='add'>+						    0, false);</div><div class='ctx'> 				ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-				if (ret) {</div><div class='add'>+				if (unlikely(ret)) {</div><div class='ctx'> 					btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -493,7 +442,7 @@ delete_extent_item:</div><div class='ctx'> </div><div class='ctx'> 			ret = btrfs_del_items(trans, root, path, del_slot,</div><div class='ctx'> 					      del_nr);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -557,20 +506,19 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int extent_mergeable(struct extent_buffer *leaf, int slot,</div><div class='del'>-			    u64 objectid, u64 bytenr, u64 orig_offset,</div><div class='del'>-			    u64 *start, u64 *end)</div><div class='add'>+static bool extent_mergeable(struct extent_buffer *leaf, int slot, u64 objectid,</div><div class='add'>+			     u64 bytenr, u64 orig_offset, u64 *start, u64 *end)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 extent_end;</div><div class='ctx'> </div><div class='ctx'> 	if (slot &lt; 0 || slot &gt;= btrfs_header_nritems(leaf))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, slot);</div><div class='ctx'> 	if (key.objectid != objectid || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item);</div><div class='ctx'> 	if (btrfs_file_extent_type(leaf, fi) != BTRFS_FILE_EXTENT_REG ||</div><div class='hunk'>@@ -579,15 +527,15 @@ static int extent_mergeable(struct extent_buffer *leaf, int slot,</div><div class='ctx'> 	    btrfs_file_extent_compression(leaf, fi) ||</div><div class='ctx'> 	    btrfs_file_extent_encryption(leaf, fi) ||</div><div class='ctx'> 	    btrfs_file_extent_other_encoding(leaf, fi))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	extent_end = key.offset + btrfs_file_extent_num_bytes(leaf, fi);</div><div class='ctx'> 	if ((*start &amp;&amp; *start != key.offset) || (*end &amp;&amp; *end != extent_end))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	*start = key.offset;</div><div class='ctx'> 	*end = extent_end;</div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -602,7 +550,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct btrfs_ref ref = { 0 };</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -638,21 +586,20 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='del'>-	if (key.objectid != ino ||</div><div class='del'>-	    key.type != BTRFS_EXTENT_DATA_KEY) {</div><div class='add'>+	if (unlikely(key.objectid != ino || key.type != BTRFS_EXTENT_DATA_KEY)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	fi = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 			    struct btrfs_file_extent_item);</div><div class='del'>-	if (btrfs_file_extent_type(leaf, fi) != BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='add'>+	if (unlikely(btrfs_file_extent_type(leaf, fi) != BTRFS_FILE_EXTENT_PREALLOC)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	extent_end = key.offset + btrfs_file_extent_num_bytes(leaf, fi);</div><div class='del'>-	if (key.offset &gt; start || extent_end &lt; end) {</div><div class='add'>+	if (unlikely(key.offset &gt; start || extent_end &lt; end)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -685,7 +632,6 @@ again:</div><div class='ctx'> 							 trans-&gt;transid);</div><div class='ctx'> 			btrfs_set_file_extent_num_bytes(leaf, fi,</div><div class='ctx'> 							end - other_start);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -714,7 +660,6 @@ again:</div><div class='ctx'> 							other_end - start);</div><div class='ctx'> 			btrfs_set_file_extent_offset(leaf, fi,</div><div class='ctx'> 						     start - orig_offset);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -729,7 +674,7 @@ again:</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -748,14 +693,16 @@ again:</div><div class='ctx'> 		btrfs_set_file_extent_offset(leaf, fi, split - orig_offset);</div><div class='ctx'> 		btrfs_set_file_extent_num_bytes(leaf, fi,</div><div class='ctx'> 						extent_end - split);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_ADD_DELAYED_REF, bytenr,</div><div class='del'>-				       num_bytes, 0, root-&gt;root_key.objectid);</div><div class='del'>-		btrfs_init_data_ref(&amp;ref, root-&gt;root_key.objectid, ino,</div><div class='del'>-				    orig_offset, 0, false);</div><div class='add'>+		ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+		ref.bytenr = bytenr;</div><div class='add'>+		ref.num_bytes = num_bytes;</div><div class='add'>+		ref.parent = 0;</div><div class='add'>+		ref.owning_root = btrfs_root_id(root);</div><div class='add'>+		ref.ref_root = btrfs_root_id(root);</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, ino, orig_offset, 0, false);</div><div class='ctx'> 		ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -763,7 +710,7 @@ again:</div><div class='ctx'> 		if (split == start) {</div><div class='ctx'> 			key.offset = start;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (start != key.offset) {</div><div class='add'>+			if (unlikely(start != key.offset)) {</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -776,10 +723,14 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	other_start = end;</div><div class='ctx'> 	other_end = 0;</div><div class='del'>-	btrfs_init_generic_ref(&amp;ref, BTRFS_DROP_DELAYED_REF, bytenr,</div><div class='del'>-			       num_bytes, 0, root-&gt;root_key.objectid);</div><div class='del'>-	btrfs_init_data_ref(&amp;ref, root-&gt;root_key.objectid, ino, orig_offset,</div><div class='del'>-			    0, false);</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	ref.bytenr = bytenr;</div><div class='add'>+	ref.num_bytes = num_bytes;</div><div class='add'>+	ref.parent = 0;</div><div class='add'>+	ref.owning_root = btrfs_root_id(root);</div><div class='add'>+	ref.ref_root = btrfs_root_id(root);</div><div class='add'>+	btrfs_init_data_ref(&amp;ref, ino, orig_offset, 0, false);</div><div class='ctx'> 	if (extent_mergeable(leaf, path-&gt;slots[0] + 1,</div><div class='ctx'> 			     ino, bytenr, orig_offset,</div><div class='ctx'> 			     &amp;other_start, &amp;other_end)) {</div><div class='hunk'>@@ -791,7 +742,7 @@ again:</div><div class='ctx'> 		del_slot = path-&gt;slots[0] + 1;</div><div class='ctx'> 		del_nr++;</div><div class='ctx'> 		ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -809,7 +760,7 @@ again:</div><div class='ctx'> 		del_slot = path-&gt;slots[0];</div><div class='ctx'> 		del_nr++;</div><div class='ctx'> 		ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -820,7 +771,6 @@ again:</div><div class='ctx'> 		btrfs_set_file_extent_type(leaf, fi,</div><div class='ctx'> 					   BTRFS_FILE_EXTENT_REG);</div><div class='ctx'> 		btrfs_set_file_extent_generation(leaf, fi, trans-&gt;transid);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fi = btrfs_item_ptr(leaf, del_slot - 1,</div><div class='ctx'> 			   struct btrfs_file_extent_item);</div><div class='hunk'>@@ -829,67 +779,59 @@ again:</div><div class='ctx'> 		btrfs_set_file_extent_generation(leaf, fi, trans-&gt;transid);</div><div class='ctx'> 		btrfs_set_file_extent_num_bytes(leaf, fi,</div><div class='ctx'> 						extent_end - key.offset);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, del_slot, del_nr);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * on error we return an unlocked page and the error value</div><div class='del'>- * on success we return a locked page and 0</div><div class='add'>+ * On error return an unlocked folio and the error value</div><div class='add'>+ * On success return a locked folio and 0</div><div class='ctx'>  */</div><div class='del'>-static int prepare_uptodate_page(struct inode *inode,</div><div class='del'>-				 struct page *page, u64 pos,</div><div class='del'>-				 bool force_uptodate)</div><div class='add'>+static int prepare_uptodate_folio(struct inode *inode, struct folio *folio, u64 pos,</div><div class='add'>+				  u64 len)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='add'>+	u64 clamp_start = max_t(u64, pos, folio_pos(folio));</div><div class='add'>+	u64 clamp_end = min_t(u64, pos + len, folio_next_pos(folio));</div><div class='add'>+	const u32 blocksize = inode_to_fs_info(inode)-&gt;sectorsize;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (((pos &amp; (PAGE_SIZE - 1)) || force_uptodate) &amp;&amp;</div><div class='del'>-	    !PageUptodate(page)) {</div><div class='del'>-		ret = btrfs_read_folio(NULL, folio);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Since btrfs_read_folio() will unlock the folio before it</div><div class='del'>-		 * returns, there is a window where btrfs_release_folio() can be</div><div class='del'>-		 * called to release the page.  Here we check both inode</div><div class='del'>-		 * mapping and PagePrivate() to make sure the page was not</div><div class='del'>-		 * released.</div><div class='del'>-		 *</div><div class='del'>-		 * The private flag check is essential for subpage as we need</div><div class='del'>-		 * to store extra bitmap using folio private.</div><div class='del'>-		 */</div><div class='del'>-		if (page-&gt;mapping != inode-&gt;i_mapping || !folio_test_private(folio)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-static fgf_t get_prepare_fgp_flags(bool nowait)</div><div class='del'>-{</div><div class='del'>-	fgf_t fgp_flags = FGP_LOCK | FGP_ACCESSED | FGP_CREAT;</div><div class='add'>+	if (IS_ALIGNED(clamp_start, blocksize) &amp;&amp;</div><div class='add'>+	    IS_ALIGNED(clamp_end, blocksize))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (nowait)</div><div class='del'>-		fgp_flags |= FGP_NOWAIT;</div><div class='add'>+	ret = btrfs_read_folio(NULL, folio);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	if (unlikely(!folio_test_uptodate(folio))) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return fgp_flags;</div><div class='add'>+	/*</div><div class='add'>+	 * Since btrfs_read_folio() will unlock the folio before it returns,</div><div class='add'>+	 * there is a window where btrfs_release_folio() can be called to</div><div class='add'>+	 * release the page.  Here we check both inode mapping and page</div><div class='add'>+	 * private to make sure the page was not released.</div><div class='add'>+	 *</div><div class='add'>+	 * The private flag check is essential for subpage as we need to store</div><div class='add'>+	 * extra bitmap using folio private.</div><div class='add'>+	 */</div><div class='add'>+	if (folio-&gt;mapping != inode-&gt;i_mapping || !folio_test_private(folio)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static gfp_t get_prepare_gfp_flags(struct inode *inode, bool nowait)</div><div class='hunk'>@@ -906,89 +848,62 @@ static gfp_t get_prepare_gfp_flags(struct inode *inode, bool nowait)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * this just gets pages into the page cache and locks them down.</div><div class='add'>+ * Get folio into the page cache and lock it.</div><div class='ctx'>  */</div><div class='del'>-static noinline int prepare_pages(struct inode *inode, struct page **pages,</div><div class='del'>-				  size_t num_pages, loff_t pos,</div><div class='del'>-				  size_t write_bytes, bool force_uptodate,</div><div class='del'>-				  bool nowait)</div><div class='add'>+static noinline int prepare_one_folio(struct inode *inode, struct folio **folio_ret,</div><div class='add'>+				      loff_t pos, size_t write_bytes,</div><div class='add'>+				      bool nowait)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long index = pos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	gfp_t mask = get_prepare_gfp_flags(inode, nowait);</div><div class='del'>-	fgf_t fgp_flags = get_prepare_fgp_flags(nowait);</div><div class='del'>-	int err = 0;</div><div class='del'>-	int faili;</div><div class='add'>+	fgf_t fgp_flags = (nowait ? FGP_WRITEBEGIN | FGP_NOWAIT : FGP_WRITEBEGIN) |</div><div class='add'>+			  fgf_set_order(write_bytes);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_pages; i++) {</div><div class='ctx'> again:</div><div class='del'>-		pages[i] = pagecache_get_page(inode-&gt;i_mapping, index + i,</div><div class='del'>-					      fgp_flags, mask | __GFP_WRITE);</div><div class='del'>-		if (!pages[i]) {</div><div class='del'>-			faili = i - 1;</div><div class='del'>-			if (nowait)</div><div class='del'>-				err = -EAGAIN;</div><div class='del'>-			else</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = set_page_extent_mapped(pages[i]);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			faili = i;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i == 0)</div><div class='del'>-			err = prepare_uptodate_page(inode, pages[i], pos,</div><div class='del'>-						    force_uptodate);</div><div class='del'>-		if (!err &amp;&amp; i == num_pages - 1)</div><div class='del'>-			err = prepare_uptodate_page(inode, pages[i],</div><div class='del'>-						    pos + write_bytes, false);</div><div class='del'>-		if (err) {</div><div class='del'>-			put_page(pages[i]);</div><div class='del'>-			if (!nowait &amp;&amp; err == -EAGAIN) {</div><div class='del'>-				err = 0;</div><div class='del'>-				goto again;</div><div class='del'>-			}</div><div class='del'>-			faili = i - 1;</div><div class='del'>-			goto fail;</div><div class='add'>+	folio = __filemap_get_folio(inode-&gt;i_mapping, index, fgp_flags, mask);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = prepare_uptodate_folio(inode, folio, pos, write_bytes);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* The folio is already unlocked. */</div><div class='add'>+		folio_put(folio);</div><div class='add'>+		if (!nowait &amp;&amp; ret == -EAGAIN) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto again;</div><div class='ctx'> 		}</div><div class='del'>-		wait_on_page_writeback(pages[i]);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	*folio_ret = folio;</div><div class='ctx'> 	return 0;</div><div class='del'>-fail:</div><div class='del'>-	while (faili &gt;= 0) {</div><div class='del'>-		unlock_page(pages[faili]);</div><div class='del'>-		put_page(pages[faili]);</div><div class='del'>-		faili--;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function locks the extent and properly waits for data=ordered extents</div><div class='del'>- * to finish before allowing the pages to be modified if need.</div><div class='add'>+ * Locks the extent and properly waits for data=ordered extents to finish</div><div class='add'>+ * before allowing the folios to be modified if need.</div><div class='ctx'>  *</div><div class='del'>- * The return value:</div><div class='add'>+ * Return:</div><div class='ctx'>  * 1 - the extent is locked</div><div class='ctx'>  * 0 - the extent is not locked, and everything is OK</div><div class='del'>- * -EAGAIN - need re-prepare the pages</div><div class='del'>- * the other &lt; 0 number - Something wrong happens</div><div class='add'>+ * -EAGAIN - need to prepare the folios again</div><div class='ctx'>  */</div><div class='ctx'> static noinline int</div><div class='del'>-lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,</div><div class='del'>-				size_t num_pages, loff_t pos,</div><div class='del'>-				size_t write_bytes,</div><div class='add'>+lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct folio *folio,</div><div class='add'>+				loff_t pos, size_t write_bytes,</div><div class='ctx'> 				u64 *lockstart, u64 *lockend, bool nowait,</div><div class='ctx'> 				struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	u64 start_pos;</div><div class='ctx'> 	u64 last_pos;</div><div class='del'>-	int i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	start_pos = round_down(pos, fs_info-&gt;sectorsize);</div><div class='hunk'>@@ -998,18 +913,15 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'> 		struct btrfs_ordered_extent *ordered;</div><div class='ctx'> </div><div class='ctx'> 		if (nowait) {</div><div class='del'>-			if (!try_lock_extent(&amp;inode-&gt;io_tree, start_pos, last_pos,</div><div class='del'>-					     cached_state)) {</div><div class='del'>-				for (i = 0; i &lt; num_pages; i++) {</div><div class='del'>-					unlock_page(pages[i]);</div><div class='del'>-					put_page(pages[i]);</div><div class='del'>-					pages[i] = NULL;</div><div class='del'>-				}</div><div class='del'>-</div><div class='add'>+			if (!btrfs_try_lock_extent(&amp;inode-&gt;io_tree, start_pos,</div><div class='add'>+						   last_pos, cached_state)) {</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				folio_put(folio);</div><div class='ctx'> 				return -EAGAIN;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			lock_extent(&amp;inode-&gt;io_tree, start_pos, last_pos, cached_state);</div><div class='add'>+			btrfs_lock_extent(&amp;inode-&gt;io_tree, start_pos, last_pos,</div><div class='add'>+					  cached_state);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ordered = btrfs_lookup_ordered_range(inode, start_pos,</div><div class='hunk'>@@ -1017,12 +929,10 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'> 		if (ordered &amp;&amp;</div><div class='ctx'> 		    ordered-&gt;file_offset + ordered-&gt;num_bytes &gt; start_pos &amp;&amp;</div><div class='ctx'> 		    ordered-&gt;file_offset &lt;= last_pos) {</div><div class='del'>-			unlock_extent(&amp;inode-&gt;io_tree, start_pos, last_pos,</div><div class='del'>-				      cached_state);</div><div class='del'>-			for (i = 0; i &lt; num_pages; i++) {</div><div class='del'>-				unlock_page(pages[i]);</div><div class='del'>-				put_page(pages[i]);</div><div class='del'>-			}</div><div class='add'>+			btrfs_unlock_extent(&amp;inode-&gt;io_tree, start_pos, last_pos,</div><div class='add'>+					    cached_state);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			btrfs_start_ordered_extent(ordered);</div><div class='ctx'> 			btrfs_put_ordered_extent(ordered);</div><div class='ctx'> 			return -EAGAIN;</div><div class='hunk'>@@ -1036,11 +946,10 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We should be called after prepare_pages() which should have locked</div><div class='add'>+	 * We should be called after prepare_one_folio() which should have locked</div><div class='ctx'> 	 * all pages in the range.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; num_pages; i++)</div><div class='del'>-		WARN_ON(!PageLocked(pages[i]));</div><div class='add'>+	WARN_ON(!folio_test_locked(folio));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1051,6 +960,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'>  * @pos:         File offset.</div><div class='ctx'>  * @write_bytes: The length to write, will be updated to the nocow writeable</div><div class='ctx'>  *               range.</div><div class='add'>+ * @nowait:      Indicate if we can block or not (non-blocking IO context).</div><div class='ctx'>  *</div><div class='ctx'>  * This function will flush ordered extents in the range to ensure proper</div><div class='ctx'>  * nocow checks.</div><div class='hunk'>@@ -1058,8 +968,9 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,</div><div class='ctx'>  * Return:</div><div class='ctx'>  * &gt; 0          If we can nocow, and updates @write_bytes.</div><div class='ctx'>  *  0           If we can't do a nocow write.</div><div class='del'>- * -EAGAIN      If we can't do a nocow write because snapshoting of the inode's</div><div class='del'>- *              root is in progress.</div><div class='add'>+ * -EAGAIN      If we can't do a nocow write because snapshotting of the inode's</div><div class='add'>+ *              root is in progress or because we are in a non-blocking IO</div><div class='add'>+ *              context and need to block (@nowait is true).</div><div class='ctx'>  * &lt; 0          If an error happened.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: Callers need to call btrfs_check_nocow_unlock() if we return &gt; 0.</div><div class='hunk'>@@ -1071,8 +982,8 @@ int btrfs_check_nocow_lock(struct btrfs_inode *inode, loff_t pos,</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 lockstart, lockend;</div><div class='del'>-	u64 num_bytes;</div><div class='del'>-	int ret;</div><div class='add'>+	u64 cur_offset;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(inode-&gt;flags &amp; (BTRFS_INODE_NODATACOW | BTRFS_INODE_PREALLOC)))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1083,7 +994,6 @@ int btrfs_check_nocow_lock(struct btrfs_inode *inode, loff_t pos,</div><div class='ctx'> 	lockstart = round_down(pos, fs_info-&gt;sectorsize);</div><div class='ctx'> 	lockend = round_up(pos + *write_bytes,</div><div class='ctx'> 			   fs_info-&gt;sectorsize) - 1;</div><div class='del'>-	num_bytes = lockend - lockstart + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (nowait) {</div><div class='ctx'> 		if (!btrfs_try_lock_ordered_range(inode, lockstart, lockend,</div><div class='hunk'>@@ -1095,14 +1005,35 @@ int btrfs_check_nocow_lock(struct btrfs_inode *inode, loff_t pos,</div><div class='ctx'> 		btrfs_lock_and_flush_ordered_range(inode, lockstart, lockend,</div><div class='ctx'> 						   &amp;cached_state);</div><div class='ctx'> 	}</div><div class='del'>-	ret = can_nocow_extent(&amp;inode-&gt;vfs_inode, lockstart, &amp;num_bytes,</div><div class='del'>-			NULL, NULL, NULL, nowait, false);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		btrfs_drew_write_unlock(&amp;root-&gt;snapshot_lock);</div><div class='del'>-	else</div><div class='del'>-		*write_bytes = min_t(size_t, *write_bytes ,</div><div class='del'>-				     num_bytes - pos + lockstart);</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	cur_offset = lockstart;</div><div class='add'>+	while (cur_offset &lt; lockend) {</div><div class='add'>+		u64 num_bytes = lockend - cur_offset + 1;</div><div class='add'>+</div><div class='add'>+		ret = can_nocow_extent(inode, cur_offset, &amp;num_bytes, NULL, nowait);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * If cur_offset == lockstart it means we haven't found</div><div class='add'>+			 * any extent against which we can NOCOW, so unlock the</div><div class='add'>+			 * snapshot lock.</div><div class='add'>+			 */</div><div class='add'>+			if (cur_offset == lockstart)</div><div class='add'>+				btrfs_drew_write_unlock(&amp;root-&gt;snapshot_lock);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cur_offset += num_bytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * cur_offset &gt; lockstart means there's at least a partial range we can</div><div class='add'>+	 * NOCOW, and that range can cover one or more extents.</div><div class='add'>+	 */</div><div class='add'>+	if (cur_offset &gt; lockstart) {</div><div class='add'>+		*write_bytes = min_t(size_t, *write_bytes, cur_offset - pos);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1112,36 +1043,14 @@ void btrfs_check_nocow_unlock(struct btrfs_inode *inode)</div><div class='ctx'> 	btrfs_drew_write_unlock(&amp;inode-&gt;root-&gt;snapshot_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void update_time_for_write(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct timespec64 now, ts;</div><div class='del'>-</div><div class='del'>-	if (IS_NOCMTIME(inode))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	now = current_time(inode);</div><div class='del'>-	ts = inode_get_mtime(inode);</div><div class='del'>-	if (!timespec64_equal(&amp;ts, &amp;now))</div><div class='del'>-		inode_set_mtime_to_ts(inode, now);</div><div class='del'>-</div><div class='del'>-	ts = inode_get_ctime(inode);</div><div class='del'>-	if (!timespec64_equal(&amp;ts, &amp;now))</div><div class='del'>-		inode_set_ctime_to_ts(inode, now);</div><div class='del'>-</div><div class='del'>-	if (IS_I_VERSION(inode))</div><div class='del'>-		inode_inc_iversion(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btrfs_write_check(struct kiocb *iocb, struct iov_iter *from,</div><div class='del'>-			     size_t count)</div><div class='add'>+int btrfs_write_check(struct kiocb *iocb, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	loff_t pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	loff_t oldsize;</div><div class='del'>-	loff_t start_pos;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Quickly bail out on NOWAIT writes if we don't have the nodatacow or</div><div class='hunk'>@@ -1163,11 +1072,13 @@ static int btrfs_write_check(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	 * need to start yet another transaction to update the inode as we will</div><div class='ctx'> 	 * update the inode when we finish writing whatever data we write.</div><div class='ctx'> 	 */</div><div class='del'>-	update_time_for_write(inode);</div><div class='add'>+	if (!IS_NOCMTIME(inode)) {</div><div class='add'>+		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='add'>+		inode_inc_iversion(inode);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	start_pos = round_down(pos, fs_info-&gt;sectorsize);</div><div class='ctx'> 	oldsize = i_size_read(inode);</div><div class='del'>-	if (start_pos &gt; oldsize) {</div><div class='add'>+	if (pos &gt; oldsize) {</div><div class='ctx'> 		/* Expand hole size to cover write data, preventing empty gap */</div><div class='ctx'> 		loff_t end_pos = round_up(pos + count, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='hunk'>@@ -1179,456 +1090,316 @@ static int btrfs_write_check(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,</div><div class='del'>-					       struct iov_iter *i)</div><div class='add'>+static void release_space(struct btrfs_inode *inode, struct extent_changeset *data_reserved,</div><div class='add'>+			  u64 start, u64 len, bool only_release_metadata)</div><div class='ctx'> {</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	loff_t pos;</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct page **pages = NULL;</div><div class='del'>-	struct extent_changeset *data_reserved = NULL;</div><div class='del'>-	u64 release_bytes = 0;</div><div class='del'>-	u64 lockstart;</div><div class='del'>-	u64 lockend;</div><div class='del'>-	size_t num_written = 0;</div><div class='del'>-	int nrptrs;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	bool only_release_metadata = false;</div><div class='del'>-	bool force_page_uptodate = false;</div><div class='del'>-	loff_t old_isize = i_size_read(inode);</div><div class='del'>-	unsigned int ilock_flags = 0;</div><div class='del'>-	const bool nowait = (iocb-&gt;ki_flags &amp; IOCB_NOWAIT);</div><div class='del'>-	unsigned int bdp_flags = (nowait ? BDP_ASYNC : 0);</div><div class='del'>-</div><div class='del'>-	if (nowait)</div><div class='del'>-		ilock_flags |= BTRFS_ILOCK_TRY;</div><div class='add'>+	if (len == 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_inode_lock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	if (only_release_metadata) {</div><div class='add'>+		btrfs_check_nocow_unlock(inode);</div><div class='add'>+		btrfs_delalloc_release_metadata(inode, len, true);</div><div class='add'>+	} else {</div><div class='add'>+		const struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='del'>-	ret = generic_write_checks(iocb, i);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_delalloc_release_space(inode, data_reserved,</div><div class='add'>+					     round_down(start, fs_info-&gt;sectorsize),</div><div class='add'>+					     len, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_write_check(iocb, i, ret);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+/*</div><div class='add'>+ * Reserve data and metadata space for this buffered write range.</div><div class='add'>+ *</div><div class='add'>+ * Return &gt;0 for the number of bytes reserved, which is always block aligned.</div><div class='add'>+ * Return &lt;0 for error.</div><div class='add'>+ */</div><div class='add'>+static ssize_t reserve_space(struct btrfs_inode *inode,</div><div class='add'>+			     struct extent_changeset **data_reserved,</div><div class='add'>+			     u64 start, size_t *len, bool nowait,</div><div class='add'>+			     bool *only_release_metadata)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	const unsigned int block_offset = (start &amp; (fs_info-&gt;sectorsize - 1));</div><div class='add'>+	size_t reserve_bytes;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	pos = iocb-&gt;ki_pos;</div><div class='del'>-	nrptrs = min(DIV_ROUND_UP(iov_iter_count(i), PAGE_SIZE),</div><div class='del'>-			PAGE_SIZE / (sizeof(struct page *)));</div><div class='del'>-	nrptrs = min(nrptrs, current-&gt;nr_dirtied_pause - current-&gt;nr_dirtied);</div><div class='del'>-	nrptrs = max(nrptrs, 8);</div><div class='del'>-	pages = kmalloc_array(nrptrs, sizeof(struct page *), GFP_KERNEL);</div><div class='del'>-	if (!pages) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	ret = btrfs_check_data_free_space(inode, data_reserved, start, *len, nowait);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		int can_nocow;</div><div class='ctx'> </div><div class='del'>-	while (iov_iter_count(i) &gt; 0) {</div><div class='del'>-		struct extent_state *cached_state = NULL;</div><div class='del'>-		size_t offset = offset_in_page(pos);</div><div class='del'>-		size_t sector_offset;</div><div class='del'>-		size_t write_bytes = min(iov_iter_count(i),</div><div class='del'>-					 nrptrs * (size_t)PAGE_SIZE -</div><div class='del'>-					 offset);</div><div class='del'>-		size_t num_pages;</div><div class='del'>-		size_t reserve_bytes;</div><div class='del'>-		size_t dirty_pages;</div><div class='del'>-		size_t copied;</div><div class='del'>-		size_t dirty_sectors;</div><div class='del'>-		size_t num_sectors;</div><div class='del'>-		int extents_locked;</div><div class='add'>+		if (nowait &amp;&amp; (ret == -ENOSPC || ret == -EAGAIN))</div><div class='add'>+			return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Fault pages before locking them in prepare_pages</div><div class='del'>-		 * to avoid recursive lock</div><div class='add'>+		 * If we don't have to COW at the offset, reserve metadata only.</div><div class='add'>+		 * write_bytes may get smaller than requested here.</div><div class='ctx'> 		 */</div><div class='del'>-		if (unlikely(fault_in_iov_iter_readable(i, write_bytes))) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		only_release_metadata = false;</div><div class='del'>-		sector_offset = pos &amp; (fs_info-&gt;sectorsize - 1);</div><div class='del'>-</div><div class='del'>-		extent_changeset_release(data_reserved);</div><div class='del'>-		ret = btrfs_check_data_free_space(BTRFS_I(inode),</div><div class='del'>-						  &amp;data_reserved, pos,</div><div class='del'>-						  write_bytes, nowait);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			int can_nocow;</div><div class='del'>-</div><div class='del'>-			if (nowait &amp;&amp; (ret == -ENOSPC || ret == -EAGAIN)) {</div><div class='del'>-				ret = -EAGAIN;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		can_nocow = btrfs_check_nocow_lock(inode, start, len, nowait);</div><div class='add'>+		if (can_nocow &lt; 0)</div><div class='add'>+			ret = can_nocow;</div><div class='add'>+		if (can_nocow &gt; 0)</div><div class='add'>+			ret = 0;</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		*only_release_metadata = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * If we don't have to COW at the offset, reserve</div><div class='del'>-			 * metadata only. write_bytes may get smaller than</div><div class='del'>-			 * requested here.</div><div class='del'>-			 */</div><div class='del'>-			can_nocow = btrfs_check_nocow_lock(BTRFS_I(inode), pos,</div><div class='del'>-							   &amp;write_bytes, nowait);</div><div class='del'>-			if (can_nocow &lt; 0)</div><div class='del'>-				ret = can_nocow;</div><div class='del'>-			if (can_nocow &gt; 0)</div><div class='del'>-				ret = 0;</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-			only_release_metadata = true;</div><div class='del'>-		}</div><div class='add'>+	reserve_bytes = round_up(*len + block_offset, fs_info-&gt;sectorsize);</div><div class='add'>+	WARN_ON(reserve_bytes == 0);</div><div class='add'>+	ret = btrfs_delalloc_reserve_metadata(inode, reserve_bytes,</div><div class='add'>+					      reserve_bytes, nowait);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (!*only_release_metadata)</div><div class='add'>+			btrfs_free_reserved_data_space(inode, *data_reserved,</div><div class='add'>+						       start, *len);</div><div class='add'>+		else</div><div class='add'>+			btrfs_check_nocow_unlock(inode);</div><div class='ctx'> </div><div class='del'>-		num_pages = DIV_ROUND_UP(write_bytes + offset, PAGE_SIZE);</div><div class='del'>-		WARN_ON(num_pages &gt; nrptrs);</div><div class='del'>-		reserve_bytes = round_up(write_bytes + sector_offset,</div><div class='del'>-					 fs_info-&gt;sectorsize);</div><div class='del'>-		WARN_ON(reserve_bytes == 0);</div><div class='del'>-		ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode),</div><div class='del'>-						      reserve_bytes,</div><div class='del'>-						      reserve_bytes, nowait);</div><div class='del'>-		if (ret) {</div><div class='del'>-			if (!only_release_metadata)</div><div class='del'>-				btrfs_free_reserved_data_space(BTRFS_I(inode),</div><div class='del'>-						data_reserved, pos,</div><div class='del'>-						write_bytes);</div><div class='del'>-			else</div><div class='del'>-				btrfs_check_nocow_unlock(BTRFS_I(inode));</div><div class='add'>+		if (nowait &amp;&amp; ret == -ENOSPC)</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return reserve_bytes;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (nowait &amp;&amp; ret == -ENOSPC)</div><div class='del'>-				ret = -EAGAIN;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+/* Shrink the reserved data and metadata space from @reserved_len to @new_len. */</div><div class='add'>+static void shrink_reserved_space(struct btrfs_inode *inode,</div><div class='add'>+				  struct extent_changeset *data_reserved,</div><div class='add'>+				  u64 reserved_start, u64 reserved_len,</div><div class='add'>+				  u64 new_len, bool only_release_metadata)</div><div class='add'>+{</div><div class='add'>+	const u64 diff = reserved_len - new_len;</div><div class='ctx'> </div><div class='del'>-		release_bytes = reserve_bytes;</div><div class='del'>-again:</div><div class='del'>-		ret = balance_dirty_pages_ratelimited_flags(inode-&gt;i_mapping, bdp_flags);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	ASSERT(new_len &lt;= reserved_len);</div><div class='add'>+	btrfs_delalloc_shrink_extents(inode, reserved_len, new_len);</div><div class='add'>+	if (only_release_metadata)</div><div class='add'>+		btrfs_delalloc_release_metadata(inode, diff, true);</div><div class='add'>+	else</div><div class='add'>+		btrfs_delalloc_release_space(inode, data_reserved,</div><div class='add'>+					     reserved_start + new_len, diff, true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This is going to setup the pages array with the number of</div><div class='del'>-		 * pages we want, so we don't really need to worry about the</div><div class='del'>-		 * contents of pages from loop to loop</div><div class='del'>-		 */</div><div class='del'>-		ret = prepare_pages(inode, pages, num_pages,</div><div class='del'>-				    pos, write_bytes, force_page_uptodate, false);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_delalloc_release_extents(BTRFS_I(inode),</div><div class='del'>-						       reserve_bytes);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+/* Calculate the maximum amount of bytes we can write into one folio. */</div><div class='add'>+static size_t calc_write_bytes(const struct btrfs_inode *inode,</div><div class='add'>+			       const struct iov_iter *iter, u64 start)</div><div class='add'>+{</div><div class='add'>+	const size_t max_folio_size = mapping_max_folio_size(inode-&gt;vfs_inode.i_mapping);</div><div class='ctx'> </div><div class='del'>-		extents_locked = lock_and_cleanup_extent_if_need(</div><div class='del'>-				BTRFS_I(inode), pages,</div><div class='del'>-				num_pages, pos, write_bytes, &amp;lockstart,</div><div class='del'>-				&amp;lockend, nowait, &amp;cached_state);</div><div class='del'>-		if (extents_locked &lt; 0) {</div><div class='del'>-			if (!nowait &amp;&amp; extents_locked == -EAGAIN)</div><div class='del'>-				goto again;</div><div class='add'>+	return min(max_folio_size - (start &amp; (max_folio_size - 1)),</div><div class='add'>+		   iov_iter_count(iter));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			btrfs_delalloc_release_extents(BTRFS_I(inode),</div><div class='del'>-						       reserve_bytes);</div><div class='del'>-			ret = extents_locked;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+/*</div><div class='add'>+ * Do the heavy-lifting work to copy one range into one folio of the page cache.</div><div class='add'>+ *</div><div class='add'>+ * Return &gt; 0 in case we copied all bytes or just some of them.</div><div class='add'>+ * Return 0 if no bytes were copied, in which case the caller should retry.</div><div class='add'>+ * Return &lt;0 on error.</div><div class='add'>+ */</div><div class='add'>+static int copy_one_range(struct btrfs_inode *inode, struct iov_iter *iter,</div><div class='add'>+			  struct extent_changeset **data_reserved, u64 start,</div><div class='add'>+			  bool nowait)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	size_t write_bytes = calc_write_bytes(inode, iter, start);</div><div class='add'>+	size_t copied;</div><div class='add'>+	const u64 reserved_start = round_down(start, fs_info-&gt;sectorsize);</div><div class='add'>+	u64 reserved_len;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int extents_locked;</div><div class='add'>+	u64 lockstart;</div><div class='add'>+	u64 lockend;</div><div class='add'>+	bool only_release_metadata = false;</div><div class='add'>+	const unsigned int bdp_flags = (nowait ? BDP_ASYNC : 0);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-		copied = btrfs_copy_from_user(pos, write_bytes, pages, i);</div><div class='add'>+	/*</div><div class='add'>+	 * Fault all pages before locking them in prepare_one_folio() to avoid</div><div class='add'>+	 * recursive lock.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(fault_in_iov_iter_readable(iter, write_bytes)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	extent_changeset_release(*data_reserved);</div><div class='add'>+	ret = reserve_space(inode, data_reserved, start, &amp;write_bytes, nowait,</div><div class='add'>+			    &amp;only_release_metadata);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	reserved_len = ret;</div><div class='add'>+	/* Write range must be inside the reserved range. */</div><div class='add'>+	ASSERT(reserved_start &lt;= start);</div><div class='add'>+	ASSERT(start + write_bytes &lt;= reserved_start + reserved_len);</div><div class='ctx'> </div><div class='del'>-		num_sectors = BTRFS_BYTES_TO_BLKS(fs_info, reserve_bytes);</div><div class='del'>-		dirty_sectors = round_up(copied + sector_offset,</div><div class='del'>-					fs_info-&gt;sectorsize);</div><div class='del'>-		dirty_sectors = BTRFS_BYTES_TO_BLKS(fs_info, dirty_sectors);</div><div class='add'>+again:</div><div class='add'>+	ret = balance_dirty_pages_ratelimited_flags(inode-&gt;vfs_inode.i_mapping,</div><div class='add'>+						    bdp_flags);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_delalloc_release_extents(inode, reserved_len);</div><div class='add'>+		release_space(inode, *data_reserved, reserved_start, reserved_len,</div><div class='add'>+			      only_release_metadata);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * if we have trouble faulting in the pages, fall</div><div class='del'>-		 * back to one page at a time</div><div class='del'>-		 */</div><div class='del'>-		if (copied &lt; write_bytes)</div><div class='del'>-			nrptrs = 1;</div><div class='add'>+	ret = prepare_one_folio(&amp;inode-&gt;vfs_inode, &amp;folio, start, write_bytes, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_delalloc_release_extents(inode, reserved_len);</div><div class='add'>+		release_space(inode, *data_reserved, reserved_start, reserved_len,</div><div class='add'>+			      only_release_metadata);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (copied == 0) {</div><div class='del'>-			force_page_uptodate = true;</div><div class='del'>-			dirty_sectors = 0;</div><div class='del'>-			dirty_pages = 0;</div><div class='del'>-		} else {</div><div class='del'>-			force_page_uptodate = false;</div><div class='del'>-			dirty_pages = DIV_ROUND_UP(copied + offset,</div><div class='del'>-						   PAGE_SIZE);</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * The reserved range goes beyond the current folio, shrink the reserved</div><div class='add'>+	 * space to the folio boundary.</div><div class='add'>+	 */</div><div class='add'>+	if (reserved_start + reserved_len &gt; folio_next_pos(folio)) {</div><div class='add'>+		const u64 last_block = folio_next_pos(folio);</div><div class='add'>+</div><div class='add'>+		shrink_reserved_space(inode, *data_reserved, reserved_start,</div><div class='add'>+				      reserved_len, last_block - reserved_start,</div><div class='add'>+				      only_release_metadata);</div><div class='add'>+		write_bytes = last_block - start;</div><div class='add'>+		reserved_len = last_block - reserved_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	extents_locked = lock_and_cleanup_extent_if_need(inode, folio, start,</div><div class='add'>+							 write_bytes, &amp;lockstart,</div><div class='add'>+							 &amp;lockend, nowait,</div><div class='add'>+							 &amp;cached_state);</div><div class='add'>+	if (extents_locked &lt; 0) {</div><div class='add'>+		if (!nowait &amp;&amp; extents_locked == -EAGAIN)</div><div class='add'>+			goto again;</div><div class='ctx'> </div><div class='del'>-		if (num_sectors &gt; dirty_sectors) {</div><div class='del'>-			/* release everything except the sectors we dirtied */</div><div class='del'>-			release_bytes -= dirty_sectors &lt;&lt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-			if (only_release_metadata) {</div><div class='del'>-				btrfs_delalloc_release_metadata(BTRFS_I(inode),</div><div class='del'>-							release_bytes, true);</div><div class='del'>-			} else {</div><div class='del'>-				u64 __pos;</div><div class='del'>-</div><div class='del'>-				__pos = round_down(pos,</div><div class='del'>-						   fs_info-&gt;sectorsize) +</div><div class='del'>-					(dirty_pages &lt;&lt; PAGE_SHIFT);</div><div class='del'>-				btrfs_delalloc_release_space(BTRFS_I(inode),</div><div class='del'>-						data_reserved, __pos,</div><div class='del'>-						release_bytes, true);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		btrfs_delalloc_release_extents(inode, reserved_len);</div><div class='add'>+		release_space(inode, *data_reserved, reserved_start, reserved_len,</div><div class='add'>+			      only_release_metadata);</div><div class='add'>+		ret = extents_locked;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		release_bytes = round_up(copied + sector_offset,</div><div class='del'>-					fs_info-&gt;sectorsize);</div><div class='add'>+	copied = copy_folio_from_iter_atomic(folio, offset_in_folio(folio, start),</div><div class='add'>+					     write_bytes, iter);</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_dirty_pages(BTRFS_I(inode), pages,</div><div class='del'>-					dirty_pages, pos, copied,</div><div class='del'>-					&amp;cached_state, only_release_metadata);</div><div class='add'>+	if (unlikely(copied &lt; write_bytes)) {</div><div class='add'>+		u64 last_block;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * If we have not locked the extent range, because the range's</div><div class='del'>-		 * start offset is &gt;= i_size, we might still have a non-NULL</div><div class='del'>-		 * cached extent state, acquired while marking the extent range</div><div class='del'>-		 * as delalloc through btrfs_dirty_pages(). Therefore free any</div><div class='del'>-		 * possible cached extent state to avoid a memory leak.</div><div class='add'>+		 * The original write range doesn't need an uptodate folio as</div><div class='add'>+		 * the range is block aligned. But now a short copy happened.</div><div class='add'>+		 * We cannot handle it without an uptodate folio.</div><div class='add'>+		 *</div><div class='add'>+		 * So just revert the range and we will retry.</div><div class='ctx'> 		 */</div><div class='del'>-		if (extents_locked)</div><div class='del'>-			unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart,</div><div class='del'>-				      lockend, &amp;cached_state);</div><div class='del'>-		else</div><div class='del'>-			free_extent_state(cached_state);</div><div class='del'>-</div><div class='del'>-		btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_drop_pages(fs_info, pages, num_pages, pos, copied);</div><div class='del'>-			break;</div><div class='add'>+		if (!folio_test_uptodate(folio)) {</div><div class='add'>+			iov_iter_revert(iter, copied);</div><div class='add'>+			copied = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		release_bytes = 0;</div><div class='del'>-		if (only_release_metadata)</div><div class='del'>-			btrfs_check_nocow_unlock(BTRFS_I(inode));</div><div class='add'>+		/* No copied bytes, unlock, release reserved space and exit. */</div><div class='add'>+		if (copied == 0) {</div><div class='add'>+			if (extents_locked)</div><div class='add'>+				btrfs_unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend,</div><div class='add'>+						    &amp;cached_state);</div><div class='add'>+			else</div><div class='add'>+				btrfs_free_extent_state(cached_state);</div><div class='add'>+			btrfs_delalloc_release_extents(inode, reserved_len);</div><div class='add'>+			release_space(inode, *data_reserved, reserved_start, reserved_len,</div><div class='add'>+				      only_release_metadata);</div><div class='add'>+			btrfs_drop_folio(fs_info, folio, start, copied);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		btrfs_drop_pages(fs_info, pages, num_pages, pos, copied);</div><div class='add'>+		/* Release the reserved space beyond the last block. */</div><div class='add'>+		last_block = round_up(start + copied, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='del'>-		cond_resched();</div><div class='del'>-</div><div class='del'>-		pos += copied;</div><div class='del'>-		num_written += copied;</div><div class='add'>+		shrink_reserved_space(inode, *data_reserved, reserved_start,</div><div class='add'>+				      reserved_len, last_block - reserved_start,</div><div class='add'>+				      only_release_metadata);</div><div class='add'>+		reserved_len = last_block - reserved_start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(pages);</div><div class='add'>+	ret = btrfs_dirty_folio(inode, folio, start, copied, &amp;cached_state,</div><div class='add'>+				only_release_metadata);</div><div class='add'>+	/*</div><div class='add'>+	 * If we have not locked the extent range, because the range's start</div><div class='add'>+	 * offset is &gt;= i_size, we might still have a non-NULL cached extent</div><div class='add'>+	 * state, acquired while marking the extent range as delalloc through</div><div class='add'>+	 * btrfs_dirty_page(). Therefore free any possible cached extent state</div><div class='add'>+	 * to avoid a memory leak.</div><div class='add'>+	 */</div><div class='add'>+	if (extents_locked)</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='add'>+	else</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='ctx'> </div><div class='del'>-	if (release_bytes) {</div><div class='del'>-		if (only_release_metadata) {</div><div class='del'>-			btrfs_check_nocow_unlock(BTRFS_I(inode));</div><div class='del'>-			btrfs_delalloc_release_metadata(BTRFS_I(inode),</div><div class='del'>-					release_bytes, true);</div><div class='del'>-		} else {</div><div class='del'>-			btrfs_delalloc_release_space(BTRFS_I(inode),</div><div class='del'>-					data_reserved,</div><div class='del'>-					round_down(pos, fs_info-&gt;sectorsize),</div><div class='del'>-					release_bytes, true);</div><div class='del'>-		}</div><div class='add'>+	btrfs_delalloc_release_extents(inode, reserved_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_drop_folio(fs_info, folio, start, copied);</div><div class='add'>+		release_space(inode, *data_reserved, reserved_start, reserved_len,</div><div class='add'>+			      only_release_metadata);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	if (only_release_metadata)</div><div class='add'>+		btrfs_check_nocow_unlock(inode);</div><div class='ctx'> </div><div class='del'>-	extent_changeset_free(data_reserved);</div><div class='del'>-	if (num_written &gt; 0) {</div><div class='del'>-		pagecache_isize_extended(inode, old_isize, iocb-&gt;ki_pos);</div><div class='del'>-		iocb-&gt;ki_pos += num_written;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-	return num_written ? num_written : ret;</div><div class='add'>+	btrfs_drop_folio(fs_info, folio, start, copied);</div><div class='add'>+	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t check_direct_IO(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       const struct iov_iter *iter, loff_t offset)</div><div class='del'>-{</div><div class='del'>-	const u32 blocksize_mask = fs_info-&gt;sectorsize - 1;</div><div class='del'>-</div><div class='del'>-	if (offset &amp; blocksize_mask)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (iov_iter_alignment(iter) &amp; blocksize_mask)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+ssize_t btrfs_buffered_write(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='ctx'> 	loff_t pos;</div><div class='del'>-	ssize_t written = 0;</div><div class='del'>-	ssize_t written_buffered;</div><div class='del'>-	size_t prev_left = 0;</div><div class='del'>-	loff_t endbyte;</div><div class='del'>-	ssize_t err;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct extent_changeset *data_reserved = NULL;</div><div class='add'>+	size_t num_written = 0;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	loff_t old_isize;</div><div class='ctx'> 	unsigned int ilock_flags = 0;</div><div class='del'>-	struct iomap_dio *dio;</div><div class='add'>+	const bool nowait = (iocb-&gt;ki_flags &amp; IOCB_NOWAIT);</div><div class='ctx'> </div><div class='del'>-	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT)</div><div class='add'>+	if (nowait)</div><div class='ctx'> 		ilock_flags |= BTRFS_ILOCK_TRY;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If the write DIO is within EOF, use a shared lock and also only if</div><div class='del'>-	 * security bits will likely not be dropped by file_remove_privs() called</div><div class='del'>-	 * from btrfs_write_check(). Either will need to be rechecked after the</div><div class='del'>-	 * lock was acquired.</div><div class='del'>-	 */</div><div class='del'>-	if (iocb-&gt;ki_pos + iov_iter_count(from) &lt;= i_size_read(inode) &amp;&amp; IS_NOSEC(inode))</div><div class='del'>-		ilock_flags |= BTRFS_ILOCK_SHARED;</div><div class='del'>-</div><div class='del'>-relock:</div><div class='del'>-	err = btrfs_inode_lock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Shared lock cannot be used with security bits set. */</div><div class='del'>-	if ((ilock_flags &amp; BTRFS_ILOCK_SHARED) &amp;&amp; !IS_NOSEC(inode)) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-		ilock_flags &amp;= ~BTRFS_ILOCK_SHARED;</div><div class='del'>-		goto relock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = generic_write_checks(iocb, from);</div><div class='del'>-	if (err &lt;= 0) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = btrfs_write_check(iocb, from, err);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = iocb-&gt;ki_pos;</div><div class='del'>-	/*</div><div class='del'>-	 * Re-check since file size may have changed just before taking the</div><div class='del'>-	 * lock or pos may have changed because of O_APPEND in generic_write_check()</div><div class='del'>-	 */</div><div class='del'>-	if ((ilock_flags &amp; BTRFS_ILOCK_SHARED) &amp;&amp;</div><div class='del'>-	    pos + iov_iter_count(from) &gt; i_size_read(inode)) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-		ilock_flags &amp;= ~BTRFS_ILOCK_SHARED;</div><div class='del'>-		goto relock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (check_direct_IO(fs_info, from, pos)) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-		goto buffered;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The iov_iter can be mapped to the same file range we are writing to.</div><div class='del'>-	 * If that's the case, then we will deadlock in the iomap code, because</div><div class='del'>-	 * it first calls our callback btrfs_dio_iomap_begin(), which will create</div><div class='del'>-	 * an ordered extent, and after that it will fault in the pages that the</div><div class='del'>-	 * iov_iter refers to. During the fault in we end up in the readahead</div><div class='del'>-	 * pages code (starting at btrfs_readahead()), which will lock the range,</div><div class='del'>-	 * find that ordered extent and then wait for it to complete (at</div><div class='del'>-	 * btrfs_lock_and_flush_ordered_range()), resulting in a deadlock since</div><div class='del'>-	 * obviously the ordered extent can never complete as we didn't submit</div><div class='del'>-	 * yet the respective bio(s). This always happens when the buffer is</div><div class='del'>-	 * memory mapped to the same file range, since the iomap DIO code always</div><div class='del'>-	 * invalidates pages in the target file range (after starting and waiting</div><div class='del'>-	 * for any writeback).</div><div class='del'>-	 *</div><div class='del'>-	 * So here we disable page faults in the iov_iter and then retry if we</div><div class='del'>-	 * got -EFAULT, faulting in the pages before the retry.</div><div class='del'>-	 */</div><div class='del'>-	from-&gt;nofault = true;</div><div class='del'>-	dio = btrfs_dio_write(iocb, from, written);</div><div class='del'>-	from-&gt;nofault = false;</div><div class='add'>+	ret = btrfs_inode_lock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * iomap_dio_complete() will call btrfs_sync_file() if we have a dsync</div><div class='del'>-	 * iocb, and that needs to lock the inode. So unlock it before calling</div><div class='del'>-	 * iomap_dio_complete() to avoid a deadlock.</div><div class='add'>+	 * We can only trust the isize with inode lock held, or it can race with</div><div class='add'>+	 * other buffered writes and cause incorrect call of</div><div class='add'>+	 * pagecache_isize_extended() to overwrite existing data.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_OR_NULL(dio))</div><div class='del'>-		err = PTR_ERR_OR_ZERO(dio);</div><div class='del'>-	else</div><div class='del'>-		err = iomap_dio_complete(dio);</div><div class='del'>-</div><div class='del'>-	/* No increment (+=) because iomap returns a cumulative value. */</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		written = err;</div><div class='del'>-</div><div class='del'>-	if (iov_iter_count(from) &gt; 0 &amp;&amp; (err == -EFAULT || err &gt; 0)) {</div><div class='del'>-		const size_t left = iov_iter_count(from);</div><div class='del'>-		/*</div><div class='del'>-		 * We have more data left to write. Try to fault in as many as</div><div class='del'>-		 * possible of the remainder pages and retry. We do this without</div><div class='del'>-		 * releasing and locking again the inode, to prevent races with</div><div class='del'>-		 * truncate.</div><div class='del'>-		 *</div><div class='del'>-		 * Also, in case the iov refers to pages in the file range of the</div><div class='del'>-		 * file we want to write to (due to a mmap), we could enter an</div><div class='del'>-		 * infinite loop if we retry after faulting the pages in, since</div><div class='del'>-		 * iomap will invalidate any pages in the range early on, before</div><div class='del'>-		 * it tries to fault in the pages of the iov. So we keep track of</div><div class='del'>-		 * how much was left of iov in the previous EFAULT and fallback</div><div class='del'>-		 * to buffered IO in case we haven't made any progress.</div><div class='del'>-		 */</div><div class='del'>-		if (left == prev_left) {</div><div class='del'>-			err = -ENOTBLK;</div><div class='del'>-		} else {</div><div class='del'>-			fault_in_iov_iter_readable(from, left);</div><div class='del'>-			prev_left = left;</div><div class='del'>-			goto relock;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	old_isize = i_size_read(inode);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If 'err' is -ENOTBLK or we have not written all data, then it means</div><div class='del'>-	 * we must fallback to buffered IO.</div><div class='del'>-	 */</div><div class='del'>-	if ((err &lt; 0 &amp;&amp; err != -ENOTBLK) || !iov_iter_count(from))</div><div class='add'>+	ret = generic_write_checks(iocb, iter);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-buffered:</div><div class='del'>-	/*</div><div class='del'>-	 * If we are in a NOWAIT context, then return -EAGAIN to signal the caller</div><div class='del'>-	 * it must retry the operation in a context where blocking is acceptable,</div><div class='del'>-	 * because even if we end up not blocking during the buffered IO attempt</div><div class='del'>-	 * below, we will block when flushing and waiting for the IO.</div><div class='del'>-	 */</div><div class='del'>-	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT) {</div><div class='del'>-		err = -EAGAIN;</div><div class='add'>+	ret = btrfs_write_check(iocb, ret);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pos = iocb-&gt;ki_pos;</div><div class='del'>-	written_buffered = btrfs_buffered_write(iocb, from);</div><div class='del'>-	if (written_buffered &lt; 0) {</div><div class='del'>-		err = written_buffered;</div><div class='del'>-		goto out;</div><div class='add'>+	while (iov_iter_count(iter) &gt; 0) {</div><div class='add'>+		ret = copy_one_range(BTRFS_I(inode), iter, &amp;data_reserved, pos, nowait);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		pos += ret;</div><div class='add'>+		num_written += ret;</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	extent_changeset_free(data_reserved);</div><div class='add'>+	if (num_written &gt; 0) {</div><div class='add'>+		pagecache_isize_extended(inode, old_isize, iocb-&gt;ki_pos);</div><div class='add'>+		iocb-&gt;ki_pos += num_written;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure all data is persisted. We want the next direct IO read to be</div><div class='del'>-	 * able to read what was just written.</div><div class='del'>-	 */</div><div class='del'>-	endbyte = pos + written_buffered - 1;</div><div class='del'>-	err = btrfs_fdatawrite_range(inode, pos, endbyte);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	err = filemap_fdatawait_range(inode-&gt;i_mapping, pos, endbyte);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	written += written_buffered;</div><div class='del'>-	iocb-&gt;ki_pos = pos + written_buffered;</div><div class='del'>-	invalidate_mapping_pages(file-&gt;f_mapping, pos &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				 endbyte &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> out:</div><div class='del'>-	return err &lt; 0 ? err : written;</div><div class='add'>+	btrfs_inode_unlock(BTRFS_I(inode), ilock_flags);</div><div class='add'>+	return num_written ? num_written : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t btrfs_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='hunk'>@@ -1652,7 +1423,7 @@ static ssize_t btrfs_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	if (ret || encoded-&gt;len == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_write_check(iocb, from, encoded-&gt;len);</div><div class='add'>+	ret = btrfs_write_check(iocb, encoded-&gt;len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1669,6 +1440,8 @@ ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	struct btrfs_inode *inode = BTRFS_I(file_inode(file));</div><div class='ctx'> 	ssize_t num_written, num_sync;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode-&gt;root-&gt;fs_info)))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the fs flips readonly due to some impossible error, although we</div><div class='ctx'> 	 * have opened a file as writable, we have to stop this write operation</div><div class='hunk'>@@ -1713,7 +1486,7 @@ int btrfs_release_file(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	if (private) {</div><div class='ctx'> 		kfree(private-&gt;filldir_buf);</div><div class='del'>-		free_extent_state(private-&gt;llseek_cached_state);</div><div class='add'>+		btrfs_free_extent_state(private-&gt;llseek_cached_state);</div><div class='ctx'> 		kfree(private);</div><div class='ctx'> 		filp-&gt;private_data = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1730,7 +1503,7 @@ int btrfs_release_file(struct inode *inode, struct file *filp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int start_ordered_ops(struct inode *inode, loff_t start, loff_t end)</div><div class='add'>+static int start_ordered_ops(struct btrfs_inode *inode, loff_t start, loff_t end)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct blk_plug plug;</div><div class='hunk'>@@ -1750,7 +1523,7 @@ static int start_ordered_ops(struct inode *inode, loff_t start, loff_t end)</div><div class='ctx'> </div><div class='ctx'> static inline bool skip_inode_logging(const struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ctx-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ctx-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_inode_in_log(inode, btrfs_get_fs_generation(fs_info)) &amp;&amp;</div><div class='hunk'>@@ -1786,14 +1559,21 @@ static inline bool skip_inode_logging(const struct btrfs_log_ctx *ctx)</div><div class='ctx'> int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = file_dentry(file);</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_log_ctx ctx;</div><div class='ctx'> 	int ret = 0, err;</div><div class='ctx'> 	u64 len;</div><div class='ctx'> 	bool full_sync;</div><div class='add'>+	bool skip_ilock = false;</div><div class='add'>+</div><div class='add'>+	if (current-&gt;journal_info == BTRFS_TRANS_DIO_WRITE_STUB) {</div><div class='add'>+		skip_ilock = true;</div><div class='add'>+		current-&gt;journal_info = NULL;</div><div class='add'>+		btrfs_assert_inode_locked(inode);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_sync_file(file, datasync);</div><div class='ctx'> </div><div class='hunk'>@@ -1821,7 +1601,10 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	btrfs_inode_lock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='add'>+	if (skip_ilock)</div><div class='add'>+		down_write(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+	else</div><div class='add'>+		btrfs_inode_lock(inode, BTRFS_ILOCK_MMAP);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;root-&gt;log_batch);</div><div class='ctx'> </div><div class='hunk'>@@ -1845,7 +1628,10 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = start_ordered_ops(inode, start, end);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='add'>+		if (skip_ilock)</div><div class='add'>+			up_write(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+		else</div><div class='add'>+			btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1857,8 +1643,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	 * running delalloc the full sync flag may be set if we need to drop</div><div class='ctx'> 	 * extra extent map ranges due to temporary memory allocation failures.</div><div class='ctx'> 	 */</div><div class='del'>-	full_sync = test_bit(BTRFS_INODE_NEEDS_FULL_SYNC,</div><div class='del'>-			     &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+	full_sync = test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to do this here to avoid the priority inversion of waiting on</div><div class='hunk'>@@ -1877,15 +1662,29 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (full_sync || btrfs_is_zoned(fs_info)) {</div><div class='ctx'> 		ret = btrfs_wait_ordered_range(inode, start, len);</div><div class='add'>+		clear_bit(BTRFS_INODE_COW_WRITE_ERROR, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Get our ordered extents as soon as possible to avoid doing</div><div class='ctx'> 		 * checksum lookups in the csum tree, and use instead the</div><div class='ctx'> 		 * checksums attached to the ordered extents.</div><div class='ctx'> 		 */</div><div class='del'>-		btrfs_get_ordered_extents_for_logging(BTRFS_I(inode),</div><div class='del'>-						      &amp;ctx.ordered_extents);</div><div class='del'>-		ret = filemap_fdatawait_range(inode-&gt;i_mapping, start, end);</div><div class='add'>+		btrfs_get_ordered_extents_for_logging(inode, &amp;ctx.ordered_extents);</div><div class='add'>+		ret = filemap_fdatawait_range(inode-&gt;vfs_inode.i_mapping, start, end);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_release_extents;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check and clear the BTRFS_INODE_COW_WRITE_ERROR now after</div><div class='add'>+		 * starting and waiting for writeback, because for buffered IO</div><div class='add'>+		 * it may have been set during the end IO callback</div><div class='add'>+		 * (end_bbio_data_write() -&gt; btrfs_finish_ordered_extent()) in</div><div class='add'>+		 * case an error happened and we need to wait for ordered</div><div class='add'>+		 * extents to complete so that any extent maps that point to</div><div class='add'>+		 * unwritten locations are dropped and we don't log them.</div><div class='add'>+		 */</div><div class='add'>+		if (test_and_clear_bit(BTRFS_INODE_COW_WRITE_ERROR, &amp;inode-&gt;runtime_flags))</div><div class='add'>+			ret = btrfs_wait_ordered_range(inode, start, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1899,8 +1698,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 		 * modified so clear this flag in case it was set for whatever</div><div class='ctx'> 		 * reason, it's no longer relevant.</div><div class='ctx'> 		 */</div><div class='del'>-		clear_bit(BTRFS_INODE_NEEDS_FULL_SYNC,</div><div class='del'>-			  &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+		clear_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * An ordered extent might have started before and completed</div><div class='ctx'> 		 * already with io errors, in which case the inode was not</div><div class='hunk'>@@ -1908,10 +1706,12 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 		 * for any errors that might have happened since we last</div><div class='ctx'> 		 * checked called fsync.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = filemap_check_wb_err(inode-&gt;i_mapping, file-&gt;f_wb_err);</div><div class='add'>+		ret = filemap_check_wb_err(inode-&gt;vfs_inode.i_mapping, file-&gt;f_wb_err);</div><div class='ctx'> 		goto out_release_extents;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	btrfs_init_log_ctx_scratch_eb(&amp;ctx);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We use start here because we will need to wait on the IO to complete</div><div class='ctx'> 	 * in btrfs_sync_log, which could require joining a transaction (for</div><div class='hunk'>@@ -1931,6 +1731,15 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	trans-&gt;in_fsync = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_log_dentry_safe(trans, dentry, &amp;ctx);</div><div class='add'>+	/*</div><div class='add'>+	 * Scratch eb no longer needed, release before syncing log or commit</div><div class='add'>+	 * transaction, to avoid holding unnecessary memory during such long</div><div class='add'>+	 * operations.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx.scratch_eb) {</div><div class='add'>+		free_extent_buffer(ctx.scratch_eb);</div><div class='add'>+		ctx.scratch_eb = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	btrfs_release_log_ctx_extents(&amp;ctx);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		/* Fallthrough and commit/free transaction. */</div><div class='hunk'>@@ -1947,7 +1756,10 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	 * file again, but that will end up using the synchronization</div><div class='ctx'> 	 * inside btrfs_sync_log to keep things safe.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='add'>+	if (skip_ilock)</div><div class='add'>+		up_write(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+	else</div><div class='add'>+		btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);</div><div class='ctx'> </div><div class='ctx'> 	if (ret == BTRFS_NO_LOG_SYNC) {</div><div class='ctx'> 		ret = btrfs_end_transaction(trans);</div><div class='hunk'>@@ -2006,6 +1818,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_commit_transaction(trans);</div><div class='ctx'> out:</div><div class='add'>+	free_extent_buffer(ctx.scratch_eb);</div><div class='ctx'> 	ASSERT(list_empty(&amp;ctx.list));</div><div class='ctx'> 	ASSERT(list_empty(&amp;ctx.conflict_inodes));</div><div class='ctx'> 	err = file_check_and_advance_wb_err(file);</div><div class='hunk'>@@ -2015,56 +1828,260 @@ out:</div><div class='ctx'> </div><div class='ctx'> out_release_extents:</div><div class='ctx'> 	btrfs_release_log_ctx_extents(&amp;ctx);</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='add'>+	if (skip_ilock)</div><div class='add'>+		up_write(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+	else</div><div class='add'>+		btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * btrfs_page_mkwrite() is not allowed to change the file size as it gets</div><div class='add'>+ * called from a page fault handler when a page is first dirtied. Hence we must</div><div class='add'>+ * be careful to check for EOF conditions here. We set the page up correctly</div><div class='add'>+ * for a written page which means we get ENOSPC checking when writing into</div><div class='add'>+ * holes and correct delalloc and unwritten extent mapping on filesystems that</div><div class='add'>+ * support these features.</div><div class='add'>+ *</div><div class='add'>+ * We are not allowed to take the i_mutex here so we have to play games to</div><div class='add'>+ * protect against truncate races as the page could now be beyond EOF.  Because</div><div class='add'>+ * truncate_setsize() writes the inode size before removing pages, once we have</div><div class='add'>+ * the page lock we can determine safely if the page is beyond EOF. If it is not</div><div class='add'>+ * beyond EOF, then the page is guaranteed safe against truncation until we</div><div class='add'>+ * unlock the page.</div><div class='add'>+ */</div><div class='add'>+static vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct page *page = vmf-&gt;page;</div><div class='add'>+	struct folio *folio = page_folio(page);</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(file_inode(vmf-&gt;vma-&gt;vm_file));</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='add'>+	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	struct extent_changeset *data_reserved = NULL;</div><div class='add'>+	unsigned long zero_start;</div><div class='add'>+	loff_t size;</div><div class='add'>+	size_t fsize = folio_size(folio);</div><div class='add'>+	int ret;</div><div class='add'>+	bool only_release_metadata = false;</div><div class='add'>+	u64 reserved_space;</div><div class='add'>+	u64 page_start;</div><div class='add'>+	u64 page_end;</div><div class='add'>+	u64 end;</div><div class='add'>+</div><div class='add'>+	reserved_space = fsize;</div><div class='add'>+</div><div class='add'>+	sb_start_pagefault(inode-&gt;vfs_inode.i_sb);</div><div class='add'>+	page_start = folio_pos(folio);</div><div class='add'>+	page_end = page_start + folio_size(folio) - 1;</div><div class='add'>+	end = page_end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reserving delalloc space after obtaining the page lock can lead to</div><div class='add'>+	 * deadlock. For example, if a dirty page is locked by this function</div><div class='add'>+	 * and the call to btrfs_delalloc_reserve_space() ends up triggering</div><div class='add'>+	 * dirty page write out, then the btrfs_writepages() function could</div><div class='add'>+	 * end up waiting indefinitely to get a lock on the page currently</div><div class='add'>+	 * being processed by btrfs_page_mkwrite() function.</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_check_data_free_space(inode, &amp;data_reserved, page_start,</div><div class='add'>+					  reserved_space, false);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		size_t write_bytes = reserved_space;</div><div class='add'>+</div><div class='add'>+		if (btrfs_check_nocow_lock(inode, page_start, &amp;write_bytes, false) &lt;= 0)</div><div class='add'>+			goto out_noreserve;</div><div class='add'>+</div><div class='add'>+		only_release_metadata = true;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Can't write the whole range, there may be shared extents or</div><div class='add'>+		 * holes in the range, bail out with @only_release_metadata set</div><div class='add'>+		 * to true so that we unlock the nocow lock before returning the</div><div class='add'>+		 * error.</div><div class='add'>+		 */</div><div class='add'>+		if (write_bytes &lt; reserved_space)</div><div class='add'>+			goto out_noreserve;</div><div class='add'>+	}</div><div class='add'>+	ret = btrfs_delalloc_reserve_metadata(inode, reserved_space,</div><div class='add'>+					      reserved_space, false);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (!only_release_metadata)</div><div class='add'>+			btrfs_free_reserved_data_space(inode, data_reserved,</div><div class='add'>+						       page_start, reserved_space);</div><div class='add'>+		goto out_noreserve;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = file_update_time(vmf-&gt;vma-&gt;vm_file);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+again:</div><div class='add'>+	down_read(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='add'>+</div><div class='add'>+	if ((folio-&gt;mapping != inode-&gt;vfs_inode.i_mapping) ||</div><div class='add'>+	    (page_start &gt;= size)) {</div><div class='add'>+		/* Page got truncated out from underneath us. */</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='add'>+</div><div class='add'>+	btrfs_lock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can't set the delalloc bits if there are pending ordered</div><div class='add'>+	 * extents.  Drop our locks and wait for them to finish.</div><div class='add'>+	 */</div><div class='add'>+	ordered = btrfs_lookup_ordered_range(inode, page_start, fsize);</div><div class='add'>+	if (ordered) {</div><div class='add'>+		btrfs_unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		up_read(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+		btrfs_start_ordered_extent(ordered);</div><div class='add'>+		btrfs_put_ordered_extent(ordered);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (folio_contains(folio, (size - 1) &gt;&gt; PAGE_SHIFT)) {</div><div class='add'>+		reserved_space = round_up(size - page_start, fs_info-&gt;sectorsize);</div><div class='add'>+		if (reserved_space &lt; fsize) {</div><div class='add'>+			const u64 to_free = fsize - reserved_space;</div><div class='add'>+</div><div class='add'>+			end = page_start + reserved_space - 1;</div><div class='add'>+			if (only_release_metadata)</div><div class='add'>+				btrfs_delalloc_release_metadata(inode, to_free, true);</div><div class='add'>+			else</div><div class='add'>+				btrfs_delalloc_release_space(inode, data_reserved,</div><div class='add'>+							     end + 1, to_free, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * page_mkwrite gets called when the page is firstly dirtied after it's</div><div class='add'>+	 * faulted in, but write(2) could also dirty a page and set delalloc</div><div class='add'>+	 * bits, thus in this case for space account reason, we still need to</div><div class='add'>+	 * clear any delalloc bits within this page range since we have to</div><div class='add'>+	 * reserve data&amp;meta space before lock_page() (see above comments).</div><div class='add'>+	 */</div><div class='add'>+	btrfs_clear_extent_bit(io_tree, page_start, end,</div><div class='add'>+			       EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |</div><div class='add'>+			       EXTENT_DEFRAG, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_set_extent_delalloc(inode, page_start, end, 0, &amp;cached_state);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Page is wholly or partially inside EOF. */</div><div class='add'>+	if (page_start + folio_size(folio) &gt; size)</div><div class='add'>+		zero_start = offset_in_folio(folio, size);</div><div class='add'>+	else</div><div class='add'>+		zero_start = fsize;</div><div class='add'>+</div><div class='add'>+	if (zero_start != fsize)</div><div class='add'>+		folio_zero_range(folio, zero_start, folio_size(folio) - zero_start);</div><div class='add'>+</div><div class='add'>+	btrfs_folio_clear_checked(fs_info, folio, page_start, fsize);</div><div class='add'>+	btrfs_folio_set_dirty(fs_info, folio, page_start, end + 1 - page_start);</div><div class='add'>+	btrfs_folio_set_uptodate(fs_info, folio, page_start, end + 1 - page_start);</div><div class='add'>+</div><div class='add'>+	btrfs_set_inode_last_sub_trans(inode);</div><div class='add'>+</div><div class='add'>+	if (only_release_metadata)</div><div class='add'>+		btrfs_set_extent_bit(io_tree, page_start, end, EXTENT_NORESERVE,</div><div class='add'>+				     &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	btrfs_unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+	up_read(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+</div><div class='add'>+	btrfs_delalloc_release_extents(inode, fsize);</div><div class='add'>+	if (only_release_metadata)</div><div class='add'>+		btrfs_check_nocow_unlock(inode);</div><div class='add'>+	sb_end_pagefault(inode-&gt;vfs_inode.i_sb);</div><div class='add'>+	extent_changeset_free(data_reserved);</div><div class='add'>+	return VM_FAULT_LOCKED;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	up_read(&amp;inode-&gt;i_mmap_lock);</div><div class='add'>+out:</div><div class='add'>+	btrfs_delalloc_release_extents(inode, fsize);</div><div class='add'>+	if (only_release_metadata)</div><div class='add'>+		btrfs_delalloc_release_metadata(inode, reserved_space, true);</div><div class='add'>+	else</div><div class='add'>+		btrfs_delalloc_release_space(inode, data_reserved, page_start,</div><div class='add'>+					     reserved_space, true);</div><div class='add'>+	extent_changeset_free(data_reserved);</div><div class='add'>+out_noreserve:</div><div class='add'>+	if (only_release_metadata)</div><div class='add'>+		btrfs_check_nocow_unlock(inode);</div><div class='add'>+</div><div class='add'>+	sb_end_pagefault(inode-&gt;vfs_inode.i_sb);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return vmf_error(ret);</div><div class='add'>+</div><div class='add'>+	/* Make the VM retry the fault. */</div><div class='add'>+	return VM_FAULT_NOPAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct vm_operations_struct btrfs_file_vm_ops = {</div><div class='ctx'> 	.fault		= filemap_fault,</div><div class='ctx'> 	.map_pages	= filemap_map_pages,</div><div class='ctx'> 	.page_mkwrite	= btrfs_page_mkwrite,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int btrfs_file_mmap(struct file	*filp, struct vm_area_struct *vma)</div><div class='add'>+static int btrfs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *filp = desc-&gt;file;</div><div class='ctx'> 	struct address_space *mapping = filp-&gt;f_mapping;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(file_inode(filp)))))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	if (!mapping-&gt;a_ops-&gt;read_folio)</div><div class='ctx'> 		return -ENOEXEC;</div><div class='ctx'> </div><div class='ctx'> 	file_accessed(filp);</div><div class='del'>-	vma-&gt;vm_ops = &amp;btrfs_file_vm_ops;</div><div class='add'>+	desc-&gt;vm_ops = &amp;btrfs_file_vm_ops;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hole_mergeable(struct btrfs_inode *inode, struct extent_buffer *leaf,</div><div class='del'>-			  int slot, u64 start, u64 end)</div><div class='add'>+static bool hole_mergeable(struct btrfs_inode *inode, struct extent_buffer *leaf,</div><div class='add'>+			   int slot, u64 start, u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	if (slot &lt; 0 || slot &gt;= btrfs_header_nritems(leaf))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, slot);</div><div class='ctx'> 	if (key.objectid != btrfs_ino(inode) ||</div><div class='ctx'> 	    key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_file_extent_type(leaf, fi) != BTRFS_FILE_EXTENT_REG)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_file_extent_disk_bytenr(leaf, fi))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (key.offset == end)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> 	if (key.offset + btrfs_file_extent_num_bytes(leaf, fi) == start)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fill_holes(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -2110,7 +2127,6 @@ static int fill_holes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_set_file_extent_ram_bytes(leaf, fi, num_bytes);</div><div class='ctx'> 		btrfs_set_file_extent_offset(leaf, fi, 0);</div><div class='ctx'> 		btrfs_set_file_extent_generation(leaf, fi, trans-&gt;transid);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2127,7 +2143,6 @@ static int fill_holes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_set_file_extent_ram_bytes(leaf, fi, num_bytes);</div><div class='ctx'> 		btrfs_set_file_extent_offset(leaf, fi, 0);</div><div class='ctx'> 		btrfs_set_file_extent_generation(leaf, fi, trans-&gt;transid);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='hunk'>@@ -2140,7 +2155,7 @@ static int fill_holes(struct btrfs_trans_handle *trans,</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	hole_em = alloc_extent_map();</div><div class='add'>+	hole_em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!hole_em) {</div><div class='ctx'> 		btrfs_drop_extent_map_range(inode, offset, end - 1, false);</div><div class='ctx'> 		btrfs_set_inode_full_sync(inode);</div><div class='hunk'>@@ -2148,15 +2163,13 @@ out:</div><div class='ctx'> 		hole_em-&gt;start = offset;</div><div class='ctx'> 		hole_em-&gt;len = end - offset;</div><div class='ctx'> 		hole_em-&gt;ram_bytes = hole_em-&gt;len;</div><div class='del'>-		hole_em-&gt;orig_start = offset;</div><div class='ctx'> </div><div class='del'>-		hole_em-&gt;block_start = EXTENT_MAP_HOLE;</div><div class='del'>-		hole_em-&gt;block_len = 0;</div><div class='del'>-		hole_em-&gt;orig_block_len = 0;</div><div class='add'>+		hole_em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='add'>+		hole_em-&gt;disk_num_bytes = 0;</div><div class='ctx'> 		hole_em-&gt;generation = trans-&gt;transid;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_replace_extent_map_range(inode, hole_em, true);</div><div class='del'>-		free_extent_map(hole_em);</div><div class='add'>+		btrfs_free_extent_map(hole_em);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			btrfs_set_inode_full_sync(inode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2176,28 +2189,46 @@ static int find_first_non_hole(struct btrfs_inode *inode, u64 *start, u64 *len)</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(inode, NULL, 0,</div><div class='add'>+	em = btrfs_get_extent(inode, NULL,</div><div class='ctx'> 			      round_down(*start, fs_info-&gt;sectorsize),</div><div class='ctx'> 			      round_up(*len, fs_info-&gt;sectorsize));</div><div class='ctx'> 	if (IS_ERR(em))</div><div class='ctx'> 		return PTR_ERR(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Hole or vacuum extent(only exists in no-hole mode) */</div><div class='del'>-	if (em-&gt;block_start == EXTENT_MAP_HOLE) {</div><div class='add'>+	if (em-&gt;disk_bytenr == EXTENT_MAP_HOLE) {</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 		*len = em-&gt;start + em-&gt;len &gt; *start + *len ?</div><div class='ctx'> 		       0 : *start + *len - em-&gt;start - em-&gt;len;</div><div class='ctx'> 		*start = em-&gt;start + em-&gt;len;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_punch_hole_lock_range(struct inode *inode,</div><div class='del'>-					const u64 lockstart,</div><div class='del'>-					const u64 lockend,</div><div class='del'>-					struct extent_state **cached_state)</div><div class='add'>+/*</div><div class='add'>+ * Check if there is no folio in the range.</div><div class='add'>+ *</div><div class='add'>+ * We cannot utilize filemap_range_has_page() in a filemap with large folios</div><div class='add'>+ * as we can hit the following false positive:</div><div class='add'>+ *</div><div class='add'>+ *        start                            end</div><div class='add'>+ *        |                                |</div><div class='add'>+ *  |//|//|//|//|  |  |  |  |  |  |  |  |//|//|</div><div class='add'>+ *   \         /                         \   /</div><div class='add'>+ *    Folio A                            Folio B</div><div class='add'>+ *</div><div class='add'>+ * That large folio A and B cover the start and end indexes.</div><div class='add'>+ * In that case filemap_range_has_page() will always return true, but the above</div><div class='add'>+ * case is fine for btrfs_punch_hole_lock_range() usage.</div><div class='add'>+ *</div><div class='add'>+ * So here we only ensure that no other folios is in the range, excluding the</div><div class='add'>+ * head/tail large folio.</div><div class='add'>+ */</div><div class='add'>+static bool check_range_has_page(struct inode *inode, u64 start, u64 end)</div><div class='ctx'> {</div><div class='add'>+	struct folio_batch fbatch;</div><div class='add'>+	bool ret = false;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For subpage case, if the range is not at page boundary, we could</div><div class='ctx'> 	 * have pages at the leading/tailing part of the range.</div><div class='hunk'>@@ -2205,15 +2236,48 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,</div><div class='ctx'> 	 * will always return true.</div><div class='ctx'> 	 * So here we need to do extra page alignment for</div><div class='ctx'> 	 * filemap_range_has_page().</div><div class='add'>+	 *</div><div class='add'>+	 * And do not decrease page_lockend right now, as it can be 0.</div><div class='ctx'> 	 */</div><div class='del'>-	const u64 page_lockstart = round_up(lockstart, PAGE_SIZE);</div><div class='del'>-	const u64 page_lockend = round_down(lockend + 1, PAGE_SIZE) - 1;</div><div class='add'>+	const u64 page_lockstart = round_up(start, PAGE_SIZE);</div><div class='add'>+	const u64 page_lockend = round_down(end + 1, PAGE_SIZE);</div><div class='add'>+	const pgoff_t start_index = page_lockstart &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const pgoff_t end_index = (page_lockend - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t tmp = start_index;</div><div class='add'>+	int found_folios;</div><div class='add'>+</div><div class='add'>+	/* The same page or adjacent pages. */</div><div class='add'>+	if (page_lockend &lt;= page_lockstart)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	folio_batch_init(&amp;fbatch);</div><div class='add'>+	found_folios = filemap_get_folios(inode-&gt;i_mapping, &amp;tmp, end_index, &amp;fbatch);</div><div class='add'>+	for (int i = 0; i &lt; found_folios; i++) {</div><div class='add'>+		struct folio *folio = fbatch.folios[i];</div><div class='add'>+</div><div class='add'>+		/* A large folio begins before the start. Not a target. */</div><div class='add'>+		if (folio-&gt;index &lt; start_index)</div><div class='add'>+			continue;</div><div class='add'>+		/* A large folio extends beyond the end. Not a target. */</div><div class='add'>+		if (folio_next_index(folio) &gt; end_index)</div><div class='add'>+			continue;</div><div class='add'>+		/* A folio doesn't cover the head/tail index. Found a target. */</div><div class='add'>+		ret = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	folio_batch_release(&amp;fbatch);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void btrfs_punch_hole_lock_range(struct inode *inode,</div><div class='add'>+					const u64 lockstart, const u64 lockend,</div><div class='add'>+					struct extent_state **cached_state)</div><div class='add'>+{</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		truncate_pagecache_range(inode, lockstart, lockend);</div><div class='ctx'> </div><div class='del'>-		lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='del'>-			    cached_state);</div><div class='add'>+		btrfs_lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='add'>+				  cached_state);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can't have ordered extents in the range, nor dirty/writeback</div><div class='ctx'> 		 * pages, because we have locked the inode's VFS lock in exclusive</div><div class='hunk'>@@ -2224,12 +2288,11 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,</div><div class='ctx'> 		 * locking the range check if we have pages in the range, and if</div><div class='ctx'> 		 * we do, unlock the range and retry.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!filemap_range_has_page(inode-&gt;i_mapping, page_lockstart,</div><div class='del'>-					    page_lockend))</div><div class='add'>+		if (!check_range_has_page(inode, lockstart, lockend))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='del'>-			      cached_state);</div><div class='add'>+		btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='add'>+				    cached_state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_assert_inode_range_clean(BTRFS_I(inode), lockstart, lockend);</div><div class='hunk'>@@ -2248,7 +2311,6 @@ static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int slot;</div><div class='del'>-	struct btrfs_ref ref = { 0 };</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (replace_len == 0)</div><div class='hunk'>@@ -2278,7 +2340,6 @@ static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_file_extent_num_bytes(leaf, extent, replace_len);</div><div class='ctx'> 	if (extent_info-&gt;is_new_extent)</div><div class='ctx'> 		btrfs_set_file_extent_generation(leaf, extent, trans-&gt;transid);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_inode_set_file_extent_range(inode, extent_info-&gt;file_offset,</div><div class='hunk'>@@ -2304,15 +2365,17 @@ static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 						       extent_info-&gt;qgroup_reserved,</div><div class='ctx'> 						       &amp;key);</div><div class='ctx'> 	} else {</div><div class='add'>+		struct btrfs_ref ref = {</div><div class='add'>+			.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+			.bytenr = extent_info-&gt;disk_offset,</div><div class='add'>+			.num_bytes = extent_info-&gt;disk_len,</div><div class='add'>+			.owning_root = btrfs_root_id(root),</div><div class='add'>+			.ref_root = btrfs_root_id(root),</div><div class='add'>+		};</div><div class='ctx'> 		u64 ref_offset;</div><div class='ctx'> </div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_ADD_DELAYED_REF,</div><div class='del'>-				       extent_info-&gt;disk_offset,</div><div class='del'>-				       extent_info-&gt;disk_len, 0,</div><div class='del'>-				       root-&gt;root_key.objectid);</div><div class='ctx'> 		ref_offset = extent_info-&gt;file_offset - extent_info-&gt;data_offset;</div><div class='del'>-		btrfs_init_data_ref(&amp;ref, root-&gt;root_key.objectid,</div><div class='del'>-				    btrfs_ino(inode), ref_offset, 0, false);</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, btrfs_ino(inode), ref_offset, 0, false);</div><div class='ctx'> 		ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2342,7 +2405,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 	u64 min_size = btrfs_calc_insert_metadata_size(fs_info, 1);</div><div class='ctx'> 	u64 ino_size = round_up(inode-&gt;vfs_inode.i_size, fs_info-&gt;sectorsize);</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='del'>-	struct btrfs_block_rsv *rsv;</div><div class='add'>+	struct btrfs_block_rsv rsv;</div><div class='ctx'> 	unsigned int rsv_count;</div><div class='ctx'> 	u64 cur_offset;</div><div class='ctx'> 	u64 len = end - start;</div><div class='hunk'>@@ -2351,13 +2414,9 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 	if (end &lt;= start)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rsv = btrfs_alloc_block_rsv(fs_info, BTRFS_BLOCK_RSV_TEMP);</div><div class='del'>-	if (!rsv) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	rsv-&gt;size = btrfs_calc_insert_metadata_size(fs_info, 1);</div><div class='del'>-	rsv-&gt;failfast = true;</div><div class='add'>+	btrfs_init_metadata_block_rsv(fs_info, &amp;rsv, BTRFS_BLOCK_RSV_TEMP);</div><div class='add'>+	rsv.size = btrfs_calc_insert_metadata_size(fs_info, 1);</div><div class='add'>+	rsv.failfast = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1 - update the inode</div><div class='hunk'>@@ -2374,14 +2433,14 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='ctx'> 		ret = PTR_ERR(trans);</div><div class='ctx'> 		trans = NULL;</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto out_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_block_rsv_migrate(&amp;fs_info-&gt;trans_block_rsv, rsv,</div><div class='add'>+	ret = btrfs_block_rsv_migrate(&amp;fs_info-&gt;trans_block_rsv, &amp;rsv,</div><div class='ctx'> 				      min_size, false);</div><div class='ctx'> 	if (WARN_ON(ret))</div><div class='ctx'> 		goto out_trans;</div><div class='del'>-	trans-&gt;block_rsv = rsv;</div><div class='add'>+	trans-&gt;block_rsv = &amp;rsv;</div><div class='ctx'> </div><div class='ctx'> 	cur_offset = start;</div><div class='ctx'> 	drop_args.path = path;</div><div class='hunk'>@@ -2403,9 +2462,9 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 			 * got EOPNOTSUPP via prealloc then we messed up and</div><div class='ctx'> 			 * need to abort.</div><div class='ctx'> 			 */</div><div class='del'>-			if (ret &amp;&amp;</div><div class='del'>-			    (ret != -EOPNOTSUPP ||</div><div class='del'>-			     (extent_info &amp;&amp; extent_info-&gt;is_new_extent)))</div><div class='add'>+			if (unlikely(ret &amp;&amp;</div><div class='add'>+				     (ret != -EOPNOTSUPP ||</div><div class='add'>+				      (extent_info &amp;&amp; extent_info-&gt;is_new_extent))))</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2416,7 +2475,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 		    cur_offset &lt; ino_size) {</div><div class='ctx'> 			ret = fill_holes(trans, inode, path, cur_offset,</div><div class='ctx'> 					 drop_args.drop_end);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * If we failed then we didn't insert our hole</div><div class='ctx'> 				 * entries for the area we dropped, so now the</div><div class='hunk'>@@ -2436,7 +2495,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 			ret = btrfs_inode_clear_file_extent_range(inode,</div><div class='ctx'> 					cur_offset,</div><div class='ctx'> 					drop_args.drop_end - cur_offset);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * We couldn't clear our area, so we could</div><div class='ctx'> 				 * presumably adjust up and corrupt the fs, so</div><div class='hunk'>@@ -2455,7 +2514,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 			ret = btrfs_insert_replace_extent(trans, inode,	path,</div><div class='ctx'> 					extent_info, replace_len,</div><div class='ctx'> 					drop_args.bytes_found);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2497,10 +2556,10 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_block_rsv_migrate(&amp;fs_info-&gt;trans_block_rsv,</div><div class='del'>-					      rsv, min_size, false);</div><div class='add'>+					      &amp;rsv, min_size, false);</div><div class='ctx'> 		if (WARN_ON(ret))</div><div class='ctx'> 			break;</div><div class='del'>-		trans-&gt;block_rsv = rsv;</div><div class='add'>+		trans-&gt;block_rsv = &amp;rsv;</div><div class='ctx'> </div><div class='ctx'> 		cur_offset = drop_args.drop_end;</div><div class='ctx'> 		len = end - cur_offset;</div><div class='hunk'>@@ -2550,7 +2609,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 	    cur_offset &lt; drop_args.drop_end) {</div><div class='ctx'> 		ret = fill_holes(trans, inode, path, cur_offset,</div><div class='ctx'> 				 drop_args.drop_end);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			/* Same comment as above. */</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_trans;</div><div class='hunk'>@@ -2559,7 +2618,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 		/* See the comment in the loop above for the reasoning here. */</div><div class='ctx'> 		ret = btrfs_inode_clear_file_extent_range(inode, cur_offset,</div><div class='ctx'> 					drop_args.drop_end - cur_offset);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_trans;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2569,7 +2628,7 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> 		ret = btrfs_insert_replace_extent(trans, inode, path,</div><div class='ctx'> 				extent_info, extent_info-&gt;data_len,</div><div class='ctx'> 				drop_args.bytes_found);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_trans;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2577,23 +2636,22 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,</div><div class='ctx'> </div><div class='ctx'> out_trans:</div><div class='ctx'> 	if (!trans)</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto out_release;</div><div class='ctx'> </div><div class='ctx'> 	trans-&gt;block_rsv = &amp;fs_info-&gt;trans_block_rsv;</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	else</div><div class='ctx'> 		*trans_out = trans;</div><div class='del'>-out_free:</div><div class='del'>-	btrfs_free_block_rsv(fs_info, rsv);</div><div class='del'>-out:</div><div class='add'>+out_release:</div><div class='add'>+	btrfs_block_rsv_release(fs_info, &amp;rsv, (u64)-1, NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='hunk'>@@ -2602,7 +2660,8 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	u64 lockend;</div><div class='ctx'> 	u64 tail_start;</div><div class='ctx'> 	u64 tail_len;</div><div class='del'>-	u64 orig_start = offset;</div><div class='add'>+	const u64 orig_start = offset;</div><div class='add'>+	const u64 orig_end = offset + len - 1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	bool same_block;</div><div class='ctx'> 	u64 ino_size;</div><div class='hunk'>@@ -2611,7 +2670,7 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> </div><div class='ctx'> 	btrfs_inode_lock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_wait_ordered_range(inode, offset, len);</div><div class='add'>+	ret = btrfs_wait_ordered_range(BTRFS_I(inode), offset, len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_only_mutex;</div><div class='ctx'> </div><div class='hunk'>@@ -2634,18 +2693,14 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	same_block = (BTRFS_BYTES_TO_BLKS(fs_info, offset))</div><div class='ctx'> 		== (BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1));</div><div class='ctx'> 	/*</div><div class='del'>-	 * We needn't truncate any block which is beyond the end of the file</div><div class='del'>-	 * because we are sure there is no data there.</div><div class='del'>-	 */</div><div class='del'>-	/*</div><div class='ctx'> 	 * Only do this if we are in the same block and we aren't doing the</div><div class='ctx'> 	 * entire block.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (same_block &amp;&amp; len &lt; fs_info-&gt;sectorsize) {</div><div class='ctx'> 		if (offset &lt; ino_size) {</div><div class='ctx'> 			truncated_block = true;</div><div class='del'>-			ret = btrfs_truncate_block(BTRFS_I(inode), offset, len,</div><div class='del'>-						   0);</div><div class='add'>+			ret = btrfs_truncate_block(BTRFS_I(inode), offset + len - 1,</div><div class='add'>+						   orig_start, orig_end);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2655,7 +2710,7 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	/* zero back part of the first block */</div><div class='ctx'> 	if (offset &lt; ino_size) {</div><div class='ctx'> 		truncated_block = true;</div><div class='del'>-		ret = btrfs_truncate_block(BTRFS_I(inode), offset, 0, 0);</div><div class='add'>+		ret = btrfs_truncate_block(BTRFS_I(inode), offset, orig_start, orig_end);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -2692,8 +2747,8 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 			if (tail_start + tail_len &lt; ino_size) {</div><div class='ctx'> 				truncated_block = true;</div><div class='ctx'> 				ret = btrfs_truncate_block(BTRFS_I(inode),</div><div class='del'>-							tail_start + tail_len,</div><div class='del'>-							0, 1);</div><div class='add'>+							tail_start + tail_len - 1,</div><div class='add'>+							orig_start, orig_end);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto out_only_mutex;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2727,8 +2782,8 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> out:</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='del'>-		      &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='add'>+			    &amp;cached_state);</div><div class='ctx'> out_only_mutex:</div><div class='ctx'> 	if (!updated_inode &amp;&amp; truncated_block &amp;&amp; !ret) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2802,12 +2857,22 @@ static int btrfs_fallocate_update_isize(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='add'>+	u64 range_start;</div><div class='add'>+	u64 range_end;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int ret2;</div><div class='ctx'> </div><div class='ctx'> 	if (mode &amp; FALLOC_FL_KEEP_SIZE || end &lt;= i_size_read(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	range_start = round_down(i_size_read(inode), root-&gt;fs_info-&gt;sectorsize);</div><div class='add'>+	range_end = round_up(end, root-&gt;fs_info-&gt;sectorsize);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_inode_set_file_extent_range(BTRFS_I(inode), range_start,</div><div class='add'>+						range_end - range_start);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	trans = btrfs_start_transaction(root, 1);</div><div class='ctx'> 	if (IS_ERR(trans))</div><div class='ctx'> 		return PTR_ERR(trans);</div><div class='hunk'>@@ -2835,18 +2900,18 @@ static int btrfs_zero_range_check_range_boundary(struct btrfs_inode *inode,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	offset = round_down(offset, sectorsize);</div><div class='del'>-	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(inode, NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em))</div><div class='ctx'> 		return PTR_ERR(em);</div><div class='ctx'> </div><div class='del'>-	if (em-&gt;block_start == EXTENT_MAP_HOLE)</div><div class='add'>+	if (em-&gt;disk_bytenr == EXTENT_MAP_HOLE)</div><div class='ctx'> 		ret = RANGE_BOUNDARY_HOLE;</div><div class='ctx'> 	else if (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC)</div><div class='ctx'> 		ret = RANGE_BOUNDARY_PREALLOC_EXTENT;</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = RANGE_BOUNDARY_WRITTEN_EXTENT;</div><div class='ctx'> </div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2861,12 +2926,14 @@ static int btrfs_zero_range(struct inode *inode,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 alloc_hint = 0;</div><div class='ctx'> 	const u64 sectorsize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u64 orig_start = offset;</div><div class='add'>+	const u64 orig_end = offset + len - 1;</div><div class='ctx'> 	u64 alloc_start = round_down(offset, sectorsize);</div><div class='ctx'> 	u64 alloc_end = round_up(offset + len, sectorsize);</div><div class='ctx'> 	u64 bytes_to_reserve = 0;</div><div class='ctx'> 	bool space_reserved = false;</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, alloc_start,</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, alloc_start,</div><div class='ctx'> 			      alloc_end - alloc_start);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		ret = PTR_ERR(em);</div><div class='hunk'>@@ -2890,7 +2957,7 @@ static int btrfs_zero_range(struct inode *inode,</div><div class='ctx'> 			 * do nothing except updating the inode's i_size if</div><div class='ctx'> 			 * needed.</div><div class='ctx'> 			 */</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 			ret = btrfs_fallocate_update_isize(inode, offset + len,</div><div class='ctx'> 							   mode);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2903,36 +2970,35 @@ static int btrfs_zero_range(struct inode *inode,</div><div class='ctx'> 		ASSERT(IS_ALIGNED(alloc_start, sectorsize));</div><div class='ctx'> 		len = offset + len - alloc_start;</div><div class='ctx'> 		offset = alloc_start;</div><div class='del'>-		alloc_hint = em-&gt;block_start + em-&gt;len;</div><div class='add'>+		alloc_hint = btrfs_extent_map_block_start(em) + em-&gt;len;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	if (BTRFS_BYTES_TO_BLKS(fs_info, offset) ==</div><div class='ctx'> 	    BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1)) {</div><div class='del'>-		em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, alloc_start,</div><div class='del'>-				      sectorsize);</div><div class='add'>+		em = btrfs_get_extent(BTRFS_I(inode), NULL, alloc_start, sectorsize);</div><div class='ctx'> 		if (IS_ERR(em)) {</div><div class='ctx'> 			ret = PTR_ERR(em);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC) {</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 			ret = btrfs_fallocate_update_isize(inode, offset + len,</div><div class='ctx'> 							   mode);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (len &lt; sectorsize &amp;&amp; em-&gt;block_start != EXTENT_MAP_HOLE) {</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-			ret = btrfs_truncate_block(BTRFS_I(inode), offset, len,</div><div class='del'>-						   0);</div><div class='add'>+		if (len &lt; sectorsize &amp;&amp; em-&gt;disk_bytenr != EXTENT_MAP_HOLE) {</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			ret = btrfs_truncate_block(BTRFS_I(inode), offset + len - 1,</div><div class='add'>+						   orig_start, orig_end);</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				ret = btrfs_fallocate_update_isize(inode,</div><div class='ctx'> 								   offset + len,</div><div class='ctx'> 								   mode);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		alloc_start = round_down(offset, sectorsize);</div><div class='ctx'> 		alloc_end = alloc_start + sectorsize;</div><div class='ctx'> 		goto reserve_space;</div><div class='hunk'>@@ -2956,7 +3022,8 @@ static int btrfs_zero_range(struct inode *inode,</div><div class='ctx'> 			alloc_start = round_down(offset, sectorsize);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		} else if (ret == RANGE_BOUNDARY_WRITTEN_EXTENT) {</div><div class='del'>-			ret = btrfs_truncate_block(BTRFS_I(inode), offset, 0, 0);</div><div class='add'>+			ret = btrfs_truncate_block(BTRFS_I(inode), offset,</div><div class='add'>+						   orig_start, orig_end);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2973,8 +3040,8 @@ static int btrfs_zero_range(struct inode *inode,</div><div class='ctx'> 			alloc_end = round_up(offset + len, sectorsize);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		} else if (ret == RANGE_BOUNDARY_WRITTEN_EXTENT) {</div><div class='del'>-			ret = btrfs_truncate_block(BTRFS_I(inode), offset + len,</div><div class='del'>-						   0, 1);</div><div class='add'>+			ret = btrfs_truncate_block(BTRFS_I(inode), offset + len - 1,</div><div class='add'>+						   orig_start, orig_end);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2999,16 +3066,16 @@ reserve_space:</div><div class='ctx'> 		ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), &amp;data_reserved,</div><div class='ctx'> 						alloc_start, bytes_to_reserve);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart,</div><div class='del'>-				      lockend, &amp;cached_state);</div><div class='add'>+			btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart,</div><div class='add'>+					    lockend, &amp;cached_state);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = btrfs_prealloc_file_range(inode, mode, alloc_start,</div><div class='ctx'> 						alloc_end - alloc_start,</div><div class='del'>-						i_blocksize(inode),</div><div class='add'>+						fs_info-&gt;sectorsize,</div><div class='ctx'> 						offset + len, &amp;alloc_hint);</div><div class='del'>-		unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='del'>-			      &amp;cached_state);</div><div class='add'>+		btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='add'>+				    &amp;cached_state);</div><div class='ctx'> 		/* btrfs_prealloc_file_range releases reserved space on error */</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			space_reserved = false;</div><div class='hunk'>@@ -3048,8 +3115,11 @@ static long btrfs_fallocate(struct file *file, int mode,</div><div class='ctx'> 	int blocksize = BTRFS_I(inode)-&gt;root-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(inode))))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	/* Do not allow fallocate in ZONED mode */</div><div class='del'>-	if (btrfs_is_zoned(btrfs_sb(inode-&gt;i_sb)))</div><div class='add'>+	if (btrfs_is_zoned(inode_to_fs_info(inode)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	alloc_start = round_down(offset, blocksize);</div><div class='hunk'>@@ -3094,7 +3164,8 @@ static long btrfs_fallocate(struct file *file, int mode,</div><div class='ctx'> 		 * need to zero out the end of the block if i_size lands in the</div><div class='ctx'> 		 * middle of a block.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = btrfs_truncate_block(BTRFS_I(inode), inode-&gt;i_size, 0, 0);</div><div class='add'>+		ret = btrfs_truncate_block(BTRFS_I(inode), inode-&gt;i_size,</div><div class='add'>+					   inode-&gt;i_size, (u64)-1);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3107,7 +3178,7 @@ static long btrfs_fallocate(struct file *file, int mode,</div><div class='ctx'> 	 * the file range and, due to the previous locking we did, we know there</div><div class='ctx'> 	 * can't be more delalloc or ordered extents in the range.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_wait_ordered_range(inode, alloc_start,</div><div class='add'>+	ret = btrfs_wait_ordered_range(BTRFS_I(inode), alloc_start,</div><div class='ctx'> 				       alloc_end - alloc_start);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3119,42 +3190,42 @@ static long btrfs_fallocate(struct file *file, int mode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	locked_end = alloc_end - 1;</div><div class='del'>-	lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, alloc_start, locked_end,</div><div class='del'>-		    &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, alloc_start, locked_end,</div><div class='add'>+			  &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_assert_inode_range_clean(BTRFS_I(inode), alloc_start, locked_end);</div><div class='ctx'> </div><div class='ctx'> 	/* First, check if we exceed the qgroup limit */</div><div class='ctx'> 	while (cur_offset &lt; alloc_end) {</div><div class='del'>-		em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, cur_offset,</div><div class='add'>+		em = btrfs_get_extent(BTRFS_I(inode), NULL, cur_offset,</div><div class='ctx'> 				      alloc_end - cur_offset);</div><div class='ctx'> 		if (IS_ERR(em)) {</div><div class='ctx'> 			ret = PTR_ERR(em);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		last_byte = min(extent_map_end(em), alloc_end);</div><div class='del'>-		actual_end = min_t(u64, extent_map_end(em), offset + len);</div><div class='add'>+		last_byte = min(btrfs_extent_map_end(em), alloc_end);</div><div class='add'>+		actual_end = min_t(u64, btrfs_extent_map_end(em), offset + len);</div><div class='ctx'> 		last_byte = ALIGN(last_byte, blocksize);</div><div class='del'>-		if (em-&gt;block_start == EXTENT_MAP_HOLE ||</div><div class='add'>+		if (em-&gt;disk_bytenr == EXTENT_MAP_HOLE ||</div><div class='ctx'> 		    (cur_offset &gt;= inode-&gt;i_size &amp;&amp;</div><div class='ctx'> 		     !(em-&gt;flags &amp; EXTENT_FLAG_PREALLOC))) {</div><div class='ctx'> 			const u64 range_len = last_byte - cur_offset;</div><div class='ctx'> </div><div class='ctx'> 			ret = add_falloc_range(&amp;reserve_list, cur_offset, range_len);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='del'>-				free_extent_map(em);</div><div class='add'>+				btrfs_free_extent_map(em);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			ret = btrfs_qgroup_reserve_data(BTRFS_I(inode),</div><div class='ctx'> 					&amp;data_reserved, cur_offset, range_len);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='del'>-				free_extent_map(em);</div><div class='add'>+				btrfs_free_extent_map(em);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			qgroup_reserved += range_len;</div><div class='ctx'> 			data_space_needed += range_len;</div><div class='ctx'> 		}</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		cur_offset = last_byte;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3177,7 +3248,7 @@ static long btrfs_fallocate(struct file *file, int mode,</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			ret = btrfs_prealloc_file_range(inode, mode,</div><div class='ctx'> 					range-&gt;start,</div><div class='del'>-					range-&gt;len, i_blocksize(inode),</div><div class='add'>+					range-&gt;len, blocksize,</div><div class='ctx'> 					offset + len, &amp;alloc_hint);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * btrfs_prealloc_file_range() releases space even</div><div class='hunk'>@@ -3208,8 +3279,8 @@ static long btrfs_fallocate(struct file *file, int mode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_fallocate_update_isize(inode, actual_end, mode);</div><div class='ctx'> out_unlock:</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, alloc_start, locked_end,</div><div class='del'>-		      &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, alloc_start, locked_end,</div><div class='add'>+			    &amp;cached_state);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_MMAP);</div><div class='ctx'> 	extent_changeset_free(data_reserved);</div><div class='hunk'>@@ -3243,10 +3314,10 @@ static bool find_delalloc_subrange(struct btrfs_inode *inode, u64 start, u64 end</div><div class='ctx'> 		if (inode-&gt;delalloc_bytes &gt; 0) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> 			*delalloc_start_ret = start;</div><div class='del'>-			delalloc_len = count_range_bits(&amp;inode-&gt;io_tree,</div><div class='del'>-							delalloc_start_ret, end,</div><div class='del'>-							len, EXTENT_DELALLOC, 1,</div><div class='del'>-							cached_state);</div><div class='add'>+			delalloc_len = btrfs_count_range_bits(&amp;inode-&gt;io_tree,</div><div class='add'>+							      delalloc_start_ret, end,</div><div class='add'>+							      len, EXTENT_DELALLOC, 1,</div><div class='add'>+							      cached_state);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3289,7 +3360,7 @@ static bool find_delalloc_subrange(struct btrfs_inode *inode, u64 start, u64 end</div><div class='ctx'> 	 * We could also use the extent map tree to find such delalloc that is</div><div class='ctx'> 	 * being flushed, but using the ordered extents tree is more efficient</div><div class='ctx'> 	 * because it's usually much smaller as ordered extents are removed from</div><div class='del'>-	 * the tree once they complete. With the extent maps, we mau have them</div><div class='add'>+	 * the tree once they complete. With the extent maps, we may have them</div><div class='ctx'> 	 * in the extent map tree for a very long time, and they were either</div><div class='ctx'> 	 * created by previous writes or loaded by read operations.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3460,7 +3531,7 @@ static bool find_desired_extent_in_hole(struct btrfs_inode *inode, int whence,</div><div class='ctx'> static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = BTRFS_I(file-&gt;f_mapping-&gt;host);</div><div class='del'>-	struct btrfs_file_private *private = file-&gt;private_data;</div><div class='add'>+	struct btrfs_file_private *private;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	struct extent_state **delalloc_cached_state;</div><div class='hunk'>@@ -3488,7 +3559,19 @@ static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	    inode_get_bytes(&amp;inode-&gt;vfs_inode) == i_size)</div><div class='ctx'> 		return i_size;</div><div class='ctx'> </div><div class='del'>-	if (!private) {</div><div class='add'>+	spin_lock(&amp;inode-&gt;lock);</div><div class='add'>+	private = file-&gt;private_data;</div><div class='add'>+	spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (private &amp;&amp; private-&gt;owner_task != current) {</div><div class='add'>+		/*</div><div class='add'>+		 * Not allocated by us, don't use it as its cached state is used</div><div class='add'>+		 * by the task that allocated it and we don't want neither to</div><div class='add'>+		 * mess with it nor get incorrect results because it reflects an</div><div class='add'>+		 * invalid state for the current task.</div><div class='add'>+		 */</div><div class='add'>+		private = NULL;</div><div class='add'>+	} else if (!private) {</div><div class='ctx'> 		private = kzalloc(sizeof(*private), GFP_KERNEL);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No worries if memory allocation failed.</div><div class='hunk'>@@ -3496,7 +3579,23 @@ static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 		 * lseek SEEK_HOLE/DATA calls to a file when there's delalloc,</div><div class='ctx'> 		 * so everything will still be correct.</div><div class='ctx'> 		 */</div><div class='del'>-		file-&gt;private_data = private;</div><div class='add'>+		if (private) {</div><div class='add'>+			bool free = false;</div><div class='add'>+</div><div class='add'>+			private-&gt;owner_task = current;</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;inode-&gt;lock);</div><div class='add'>+			if (file-&gt;private_data)</div><div class='add'>+				free = true;</div><div class='add'>+			else</div><div class='add'>+				file-&gt;private_data = private;</div><div class='add'>+			spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+</div><div class='add'>+			if (free) {</div><div class='add'>+				kfree(private);</div><div class='add'>+				private = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (private)</div><div class='hunk'>@@ -3527,7 +3626,7 @@ static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)</div><div class='ctx'> </div><div class='ctx'> 	last_extent_end = lockstart;</div><div class='ctx'> </div><div class='del'>-	lock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -3673,7 +3772,7 @@ static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, lockstart, lockend, &amp;cached_state);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -3710,8 +3809,10 @@ static int btrfs_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	filp-&gt;f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC | FMODE_BUF_WASYNC |</div><div class='del'>-		        FMODE_CAN_ODIRECT;</div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(inode))))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	filp-&gt;f_mode |= FMODE_NOWAIT | FMODE_CAN_ODIRECT;</div><div class='ctx'> </div><div class='ctx'> 	ret = fsverity_file_open(inode, filp);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3719,101 +3820,13 @@ static int btrfs_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	return generic_file_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_direct_read(struct btrfs_fs_info *fs_info,</div><div class='del'>-			     const struct iov_iter *iter, loff_t offset)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int i, seg;</div><div class='del'>-</div><div class='del'>-	ret = check_direct_IO(fs_info, iter, offset);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!iter_is_iovec(iter))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (seg = 0; seg &lt; iter-&gt;nr_segs; seg++) {</div><div class='del'>-		for (i = seg + 1; i &lt; iter-&gt;nr_segs; i++) {</div><div class='del'>-			const struct iovec *iov1 = iter_iov(iter) + seg;</div><div class='del'>-			const struct iovec *iov2 = iter_iov(iter) + i;</div><div class='del'>-</div><div class='del'>-			if (iov1-&gt;iov_base == iov2-&gt;iov_base)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='del'>-	size_t prev_left = 0;</div><div class='del'>-	ssize_t read = 0;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (fsverity_active(inode))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (check_direct_read(btrfs_sb(inode-&gt;i_sb), to, iocb-&gt;ki_pos))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	btrfs_inode_lock(BTRFS_I(inode), BTRFS_ILOCK_SHARED);</div><div class='del'>-again:</div><div class='del'>-	/*</div><div class='del'>-	 * This is similar to what we do for direct IO writes, see the comment</div><div class='del'>-	 * at btrfs_direct_write(), but we also disable page faults in addition</div><div class='del'>-	 * to disabling them only at the iov_iter level. This is because when</div><div class='del'>-	 * reading from a hole or prealloc extent, iomap calls iov_iter_zero(),</div><div class='del'>-	 * which can still trigger page fault ins despite having set -&gt;nofault</div><div class='del'>-	 * to true of our 'to' iov_iter.</div><div class='del'>-	 *</div><div class='del'>-	 * The difference to direct IO writes is that we deadlock when trying</div><div class='del'>-	 * to lock the extent range in the inode's tree during he page reads</div><div class='del'>-	 * triggered by the fault in (while for writes it is due to waiting for</div><div class='del'>-	 * our own ordered extent). This is because for direct IO reads,</div><div class='del'>-	 * btrfs_dio_iomap_begin() returns with the extent range locked, which</div><div class='del'>-	 * is only unlocked in the endio callback (end_bio_extent_readpage()).</div><div class='del'>-	 */</div><div class='del'>-	pagefault_disable();</div><div class='del'>-	to-&gt;nofault = true;</div><div class='del'>-	ret = btrfs_dio_read(iocb, to, read);</div><div class='del'>-	to-&gt;nofault = false;</div><div class='del'>-	pagefault_enable();</div><div class='del'>-</div><div class='del'>-	/* No increment (+=) because iomap returns a cumulative value. */</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		read = ret;</div><div class='del'>-</div><div class='del'>-	if (iov_iter_count(to) &gt; 0 &amp;&amp; (ret == -EFAULT || ret &gt; 0)) {</div><div class='del'>-		const size_t left = iov_iter_count(to);</div><div class='del'>-</div><div class='del'>-		if (left == prev_left) {</div><div class='del'>-			/*</div><div class='del'>-			 * We didn't make any progress since the last attempt,</div><div class='del'>-			 * fallback to a buffered read for the remainder of the</div><div class='del'>-			 * range. This is just to avoid any possibility of looping</div><div class='del'>-			 * for too long.</div><div class='del'>-			 */</div><div class='del'>-			ret = read;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * We made some progress since the last retry or this is</div><div class='del'>-			 * the first time we are retrying. Fault in as many pages</div><div class='del'>-			 * as possible and retry.</div><div class='del'>-			 */</div><div class='del'>-			fault_in_iov_iter_writeable(to, left);</div><div class='del'>-			prev_left = left;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(inode), BTRFS_ILOCK_SHARED);</div><div class='del'>-	return ret &lt; 0 ? ret : read;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(file_inode(iocb-&gt;ki_filp)))))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='ctx'> 		ret = btrfs_direct_read(iocb, to);</div><div class='ctx'> 		if (ret &lt; 0 || !iov_iter_count(to) ||</div><div class='hunk'>@@ -3824,13 +3837,23 @@ static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	return filemap_read(iocb, to, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t btrfs_file_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+				      struct pipe_inode_info *pipe,</div><div class='add'>+				      size_t len, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(file_inode(in)))))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return filemap_splice_read(in, ppos, pipe, len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations btrfs_file_operations = {</div><div class='ctx'> 	.llseek		= btrfs_file_llseek,</div><div class='ctx'> 	.read_iter      = btrfs_file_read_iter,</div><div class='del'>-	.splice_read	= filemap_splice_read,</div><div class='add'>+	.splice_read	= btrfs_file_splice_read,</div><div class='ctx'> 	.write_iter	= btrfs_file_write_iter,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='del'>-	.mmap		= btrfs_file_mmap,</div><div class='add'>+	.mmap_prepare	= btrfs_file_mmap_prepare,</div><div class='ctx'> 	.open		= btrfs_file_open,</div><div class='ctx'> 	.release	= btrfs_release_file,</div><div class='ctx'> 	.get_unmapped_area = thp_get_unmapped_area,</div><div class='hunk'>@@ -3841,10 +3864,13 @@ const struct file_operations btrfs_file_operations = {</div><div class='ctx'> 	.compat_ioctl	= btrfs_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.remap_file_range = btrfs_remap_file_range,</div><div class='add'>+	.uring_cmd	= btrfs_uring_cmd,</div><div class='add'>+	.fop_flags	= FOP_BUFFER_RASYNC | FOP_BUFFER_WASYNC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end)</div><div class='add'>+int btrfs_fdatawrite_range(struct btrfs_inode *inode, loff_t start, loff_t end)</div><div class='ctx'> {</div><div class='add'>+	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3861,10 +3887,9 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end)</div><div class='ctx'> 	 * know better and pull this out at some point in the future, it is</div><div class='ctx'> 	 * right and you are wrong.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = filemap_fdatawrite_range(inode-&gt;i_mapping, start, end);</div><div class='del'>-	if (!ret &amp;&amp; test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,</div><div class='del'>-			     &amp;BTRFS_I(inode)-&gt;runtime_flags))</div><div class='del'>-		ret = filemap_fdatawrite_range(inode-&gt;i_mapping, start, end);</div><div class='add'>+	ret = filemap_fdatawrite_range(mapping, start, end);</div><div class='add'>+	if (!ret &amp;&amp; test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT, &amp;inode-&gt;runtime_flags))</div><div class='add'>+		ret = filemap_fdatawrite_range(mapping, start, end);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/file.h b/fs/btrfs/file.h<br/>index 82b34fbb295f..d7df81388cbe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/file.h</a></div><div class='hunk'>@@ -3,6 +3,23 @@</div><div class='ctx'> #ifndef BTRFS_FILE_H</div><div class='ctx'> #define BTRFS_FILE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct file;</div><div class='add'>+struct extent_state;</div><div class='add'>+struct kiocb;</div><div class='add'>+struct iov_iter;</div><div class='add'>+struct inode;</div><div class='add'>+struct folio;</div><div class='add'>+struct page;</div><div class='add'>+struct btrfs_ioctl_encoded_io_args;</div><div class='add'>+struct btrfs_drop_extents_args;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_replace_extent_info;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+</div><div class='ctx'> extern const struct file_operations btrfs_file_operations;</div><div class='ctx'> </div><div class='ctx'> int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);</div><div class='hunk'>@@ -19,15 +36,16 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,</div><div class='ctx'> ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 			    const struct btrfs_ioctl_encoded_io_args *encoded);</div><div class='ctx'> int btrfs_release_file(struct inode *inode, struct file *file);</div><div class='del'>-int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,</div><div class='del'>-		      size_t num_pages, loff_t pos, size_t write_bytes,</div><div class='del'>-		      struct extent_state **cached, bool noreserve);</div><div class='del'>-int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);</div><div class='add'>+int btrfs_dirty_folio(struct btrfs_inode *inode, struct folio *folio, loff_t pos,</div><div class='add'>+		      size_t write_bytes, struct extent_state **cached, bool noreserve);</div><div class='add'>+int btrfs_fdatawrite_range(struct btrfs_inode *inode, loff_t start, loff_t end);</div><div class='ctx'> int btrfs_check_nocow_lock(struct btrfs_inode *inode, loff_t pos,</div><div class='ctx'> 			   size_t *write_bytes, bool nowait);</div><div class='ctx'> void btrfs_check_nocow_unlock(struct btrfs_inode *inode);</div><div class='ctx'> bool btrfs_find_delalloc_in_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 				  struct extent_state **cached_state,</div><div class='ctx'> 				  u64 *delalloc_start_ret, u64 *delalloc_end_ret);</div><div class='add'>+int btrfs_write_check(struct kiocb *iocb, size_t count);</div><div class='add'>+ssize_t btrfs_buffered_write(struct kiocb *iocb, struct iov_iter *i);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c<br/>index d372c7ce0e6b..f0f72850fab2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/free-space-cache.c</a></div><div class='hunk'>@@ -11,7 +11,8 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/error-injection.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='del'>-#include "ctree.h"</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='add'>+#include "extent-tree.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "misc.h"</div><div class='hunk'>@@ -19,9 +20,7 @@</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "extent_io.h"</div><div class='del'>-#include "volumes.h"</div><div class='ctx'> #include "space-info.h"</div><div class='del'>-#include "delalloc-space.h"</div><div class='ctx'> #include "block-group.h"</div><div class='ctx'> #include "discard.h"</div><div class='ctx'> #include "subpage.h"</div><div class='hunk'>@@ -84,19 +83,18 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,</div><div class='ctx'> 					       struct btrfs_path *path,</div><div class='ctx'> 					       u64 offset)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> 	struct btrfs_disk_key disk_key;</div><div class='ctx'> 	struct btrfs_free_space_header *header;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	unsigned nofs_flag;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_FREE_SPACE_OBJECTID;</div><div class='del'>-	key.offset = offset;</div><div class='ctx'> 	key.type = 0;</div><div class='add'>+	key.offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -118,17 +116,17 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,</div><div class='ctx'> 	 * sure NOFS is set to keep us from deadlocking.</div><div class='ctx'> 	 */</div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='del'>-	inode = btrfs_iget_path(fs_info-&gt;sb, location.objectid, root, path);</div><div class='add'>+	inode = btrfs_iget_path(location.objectid, root, path);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flag);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='del'>-		return inode;</div><div class='add'>+		return ERR_CAST(inode);</div><div class='ctx'> </div><div class='del'>-	mapping_set_gfp_mask(inode-&gt;i_mapping,</div><div class='del'>-			mapping_gfp_constraint(inode-&gt;i_mapping,</div><div class='add'>+	mapping_set_gfp_mask(inode-&gt;vfs_inode.i_mapping,</div><div class='add'>+			mapping_gfp_constraint(inode-&gt;vfs_inode.i_mapping,</div><div class='ctx'> 			~(__GFP_FS | __GFP_HIGHMEM)));</div><div class='ctx'> </div><div class='del'>-	return inode;</div><div class='add'>+	return &amp;inode-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,</div><div class='hunk'>@@ -140,7 +138,7 @@ struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> 	if (block_group-&gt;inode)</div><div class='del'>-		inode = igrab(block_group-&gt;inode);</div><div class='add'>+		inode = igrab(&amp;block_group-&gt;inode-&gt;vfs_inode);</div><div class='ctx'> 	spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 	if (inode)</div><div class='ctx'> 		return inode;</div><div class='hunk'>@@ -159,7 +157,7 @@ struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_set_bit(BLOCK_GROUP_FLAG_IREF, &amp;block_group-&gt;runtime_flags))</div><div class='del'>-		block_group-&gt;inode = igrab(inode);</div><div class='add'>+		block_group-&gt;inode = BTRFS_I(igrab(inode));</div><div class='ctx'> 	spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -200,12 +198,11 @@ static int __create_free_space_inode(struct btrfs_root *root,</div><div class='ctx'> 	btrfs_set_inode_nlink(leaf, inode_item, 1);</div><div class='ctx'> 	btrfs_set_inode_transid(leaf, inode_item, trans-&gt;transid);</div><div class='ctx'> 	btrfs_set_inode_block_group(leaf, inode_item, offset);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_FREE_SPACE_OBJECTID;</div><div class='del'>-	key.offset = offset;</div><div class='ctx'> 	key.type = 0;</div><div class='add'>+	key.offset = offset;</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;key,</div><div class='ctx'> 				      sizeof(struct btrfs_free_space_header));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -218,7 +215,6 @@ static int __create_free_space_inode(struct btrfs_root *root,</div><div class='ctx'> 				struct btrfs_free_space_header);</div><div class='ctx'> 	memzero_extent_buffer(leaf, (unsigned long)header, sizeof(*header));</div><div class='ctx'> 	btrfs_set_free_space_key(leaf, header, &amp;disk_key);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -248,7 +244,7 @@ int btrfs_remove_free_space_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				  struct inode *inode,</div><div class='ctx'> 				  struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -261,12 +257,12 @@ int btrfs_remove_free_space_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		if (PTR_ERR(inode) != -ENOENT)</div><div class='ctx'> 			ret = PTR_ERR(inode);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = btrfs_orphan_add(trans, BTRFS_I(inode));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_nlink(inode);</div><div class='ctx'> 	/* One for the block groups ref */</div><div class='hunk'>@@ -289,12 +285,9 @@ int btrfs_remove_free_space_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = btrfs_del_item(trans, trans-&gt;fs_info-&gt;tree_root, path);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_del_item(trans, trans-&gt;fs_info-&gt;tree_root, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -315,8 +308,9 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	bool locked = false;</div><div class='ctx'> </div><div class='ctx'> 	if (block_group) {</div><div class='del'>-		struct btrfs_path *path = btrfs_alloc_path();</div><div class='add'>+		BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='add'>+		path = btrfs_alloc_path();</div><div class='ctx'> 		if (!path) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto fail;</div><div class='hunk'>@@ -337,13 +331,12 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> 		block_group-&gt;disk_cache_state = BTRFS_DC_CLEAR;</div><div class='ctx'> 		spin_unlock(&amp;block_group-&gt;lock);</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_i_size_write(inode, 0);</div><div class='ctx'> 	truncate_pagecache(vfs_inode, 0);</div><div class='ctx'> </div><div class='del'>-	lock_extent(&amp;inode-&gt;io_tree, 0, (u64)-1, &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, 0, (u64)-1, &amp;cached_state);</div><div class='ctx'> 	btrfs_drop_extent_map_range(inode, 0, (u64)-1, false);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -355,7 +348,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	inode_sub_bytes(&amp;inode-&gt;vfs_inode, control.sub_bytes);</div><div class='ctx'> 	btrfs_inode_safe_disk_i_size_write(inode, control.last_size);</div><div class='ctx'> </div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, 0, (u64)-1, &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, 0, (u64)-1, &amp;cached_state);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -373,7 +366,7 @@ fail:</div><div class='ctx'> static void readahead_cache(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_ra_state ra;</div><div class='del'>-	unsigned long last_index;</div><div class='add'>+	pgoff_t last_index;</div><div class='ctx'> </div><div class='ctx'> 	file_ra_state_init(&amp;ra, inode-&gt;i_mapping);</div><div class='ctx'> 	last_index = (i_size_read(inode) - 1) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -399,7 +392,7 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	io_ctl-&gt;num_pages = num_pages;</div><div class='del'>-	io_ctl-&gt;fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	io_ctl-&gt;fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	io_ctl-&gt;inode = inode;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -451,7 +444,7 @@ static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl)</div><div class='ctx'> </div><div class='ctx'> static int io_ctl_prepare_pages(struct btrfs_io_ctl *io_ctl, bool uptodate)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct inode *inode = io_ctl-&gt;inode;</div><div class='ctx'> 	gfp_t mask = btrfs_alloc_write_mask(inode-&gt;i_mapping);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -459,31 +452,33 @@ static int io_ctl_prepare_pages(struct btrfs_io_ctl *io_ctl, bool uptodate)</div><div class='ctx'> 	for (i = 0; i &lt; io_ctl-&gt;num_pages; i++) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		page = find_or_create_page(inode-&gt;i_mapping, i, mask);</div><div class='del'>-		if (!page) {</div><div class='add'>+		folio = __filemap_get_folio(inode-&gt;i_mapping, i,</div><div class='add'>+					    FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					    mask);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='ctx'> 			io_ctl_drop_pages(io_ctl);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = set_page_extent_mapped(page);</div><div class='add'>+		ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			io_ctl_drop_pages(io_ctl);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		io_ctl-&gt;pages[i] = page;</div><div class='del'>-		if (uptodate &amp;&amp; !PageUptodate(page)) {</div><div class='del'>-			btrfs_read_folio(NULL, page_folio(page));</div><div class='del'>-			lock_page(page);</div><div class='del'>-			if (page-&gt;mapping != inode-&gt;i_mapping) {</div><div class='add'>+		io_ctl-&gt;pages[i] = &amp;folio-&gt;page;</div><div class='add'>+		if (uptodate &amp;&amp; !folio_test_uptodate(folio)) {</div><div class='add'>+			btrfs_read_folio(NULL, folio);</div><div class='add'>+			folio_lock(folio);</div><div class='add'>+			if (folio-&gt;mapping != inode-&gt;i_mapping) {</div><div class='ctx'> 				btrfs_err(BTRFS_I(inode)-&gt;root-&gt;fs_info,</div><div class='ctx'> 					  "free space cache page truncated");</div><div class='ctx'> 				io_ctl_drop_pages(io_ctl);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='del'>-			if (!PageUptodate(page)) {</div><div class='add'>+			if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 				btrfs_err(BTRFS_I(inode)-&gt;root-&gt;fs_info,</div><div class='ctx'> 					   "error reading free space cache");</div><div class='ctx'> 				io_ctl_drop_pages(io_ctl);</div><div class='hunk'>@@ -757,8 +752,8 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_FREE_SPACE_OBJECTID;</div><div class='del'>-	key.offset = offset;</div><div class='ctx'> 	key.type = 0;</div><div class='add'>+	key.offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -860,6 +855,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,</div><div class='ctx'> 				spin_unlock(&amp;ctl-&gt;tree_lock);</div><div class='ctx'> 				btrfs_err(fs_info,</div><div class='ctx'> 					"Duplicate entries in free space cache, dumping");</div><div class='add'>+				kmem_cache_free(btrfs_free_space_bitmap_cachep, e-&gt;bitmap);</div><div class='ctx'> 				kmem_cache_free(btrfs_free_space_cachep, e);</div><div class='ctx'> 				goto free_cache;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -972,8 +968,8 @@ int load_free_space_cache(struct btrfs_block_group *block_group)</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return 0;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must pass a path with search_commit_root set to btrfs_iget in</div><div class='hunk'>@@ -1084,9 +1080,8 @@ int write_cache_extent_entries(struct btrfs_io_ctl *io_ctl,</div><div class='ctx'> </div><div class='ctx'> 	/* Get the cluster for this block_group if it exists */</div><div class='ctx'> 	if (block_group &amp;&amp; !list_empty(&amp;block_group-&gt;cluster_list)) {</div><div class='del'>-		cluster = list_entry(block_group-&gt;cluster_list.next,</div><div class='del'>-				     struct btrfs_free_cluster,</div><div class='del'>-				     block_group_list);</div><div class='add'>+		cluster = list_first_entry(&amp;block_group-&gt;cluster_list,</div><div class='add'>+					   struct btrfs_free_cluster, block_group_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!node &amp;&amp; cluster) {</div><div class='hunk'>@@ -1159,13 +1154,13 @@ update_cache_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_FREE_SPACE_OBJECTID;</div><div class='del'>-	key.offset = offset;</div><div class='ctx'> 	key.type = 0;</div><div class='add'>+	key.offset = offset;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, inode-&gt;i_size - 1,</div><div class='del'>-				 EXTENT_DELALLOC, NULL);</div><div class='add'>+		btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, inode-&gt;i_size - 1,</div><div class='add'>+				       EXTENT_DELALLOC, NULL);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -1176,9 +1171,9 @@ update_cache_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;found_key, path-&gt;slots[0]);</div><div class='ctx'> 		if (found_key.objectid != BTRFS_FREE_SPACE_OBJECTID ||</div><div class='ctx'> 		    found_key.offset != offset) {</div><div class='del'>-			clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0,</div><div class='del'>-					 inode-&gt;i_size - 1, EXTENT_DELALLOC,</div><div class='del'>-					 NULL);</div><div class='add'>+			btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0,</div><div class='add'>+					       inode-&gt;i_size - 1, EXTENT_DELALLOC,</div><div class='add'>+					       NULL);</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1190,7 +1185,6 @@ update_cache_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_free_space_entries(leaf, header, entries);</div><div class='ctx'> 	btrfs_set_free_space_bitmaps(leaf, header, bitmaps);</div><div class='ctx'> 	btrfs_set_free_space_generation(leaf, header, trans-&gt;transid);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1224,9 +1218,9 @@ static noinline_for_stack int write_pinned_extent_entries(</div><div class='ctx'> 	start = block_group-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	while (start &lt; block_group-&gt;start + block_group-&gt;length) {</div><div class='del'>-		if (!find_first_extent_bit(unpin, start,</div><div class='del'>-					   &amp;extent_start, &amp;extent_end,</div><div class='del'>-					   EXTENT_DIRTY, NULL))</div><div class='add'>+		if (!btrfs_find_first_extent_bit(unpin, start,</div><div class='add'>+						 &amp;extent_start, &amp;extent_end,</div><div class='add'>+						 EXTENT_DIRTY, NULL))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		/* This pinned extent is out of our range */</div><div class='hunk'>@@ -1270,10 +1264,10 @@ static int flush_dirty_cache(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_wait_ordered_range(inode, 0, (u64)-1);</div><div class='add'>+	ret = btrfs_wait_ordered_range(BTRFS_I(inode), 0, (u64)-1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, inode-&gt;i_size - 1,</div><div class='del'>-				 EXTENT_DELALLOC, NULL);</div><div class='add'>+		btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, inode-&gt;i_size - 1,</div><div class='add'>+				       EXTENT_DELALLOC, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1293,8 +1287,8 @@ cleanup_write_cache_enospc(struct inode *inode,</div><div class='ctx'> 			   struct extent_state **cached_state)</div><div class='ctx'> {</div><div class='ctx'> 	io_ctl_drop_pages(io_ctl);</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, 0, i_size_read(inode) - 1,</div><div class='del'>-		      cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, 0, i_size_read(inode) - 1,</div><div class='add'>+			    cached_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __btrfs_wait_cache_io(struct btrfs_root *root,</div><div class='hunk'>@@ -1389,6 +1383,7 @@ static int __btrfs_write_out_cache(struct inode *inode,</div><div class='ctx'> 	int bitmaps = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int must_iput = 0;</div><div class='add'>+	int i_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!i_size_read(inode))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -1418,8 +1413,8 @@ static int __btrfs_write_out_cache(struct inode *inode,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, 0, i_size_read(inode) - 1,</div><div class='del'>-		    &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, 0, i_size_read(inode) - 1,</div><div class='add'>+			  &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	io_ctl_set_generation(io_ctl, trans-&gt;transid);</div><div class='ctx'> </div><div class='hunk'>@@ -1459,11 +1454,16 @@ static int __btrfs_write_out_cache(struct inode *inode,</div><div class='ctx'> 	io_ctl_zero_remaining_pages(io_ctl);</div><div class='ctx'> </div><div class='ctx'> 	/* Everything is written out, now we dirty the pages in the file. */</div><div class='del'>-	ret = btrfs_dirty_pages(BTRFS_I(inode), io_ctl-&gt;pages,</div><div class='del'>-				io_ctl-&gt;num_pages, 0, i_size_read(inode),</div><div class='del'>-				&amp;cached_state, false);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_nospc;</div><div class='add'>+	i_size = i_size_read(inode);</div><div class='add'>+	for (int i = 0; i &lt; round_up(i_size, PAGE_SIZE) / PAGE_SIZE; i++) {</div><div class='add'>+		u64 dirty_start = i * PAGE_SIZE;</div><div class='add'>+		u64 dirty_len = min_t(u64, dirty_start + PAGE_SIZE, i_size) - dirty_start;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_dirty_folio(BTRFS_I(inode), page_folio(io_ctl-&gt;pages[i]),</div><div class='add'>+					dirty_start, dirty_len, &amp;cached_state, false);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_nospc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (block_group &amp;&amp; (block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA))</div><div class='ctx'> 		up_write(&amp;block_group-&gt;data_rwsem);</div><div class='hunk'>@@ -1474,8 +1474,8 @@ static int __btrfs_write_out_cache(struct inode *inode,</div><div class='ctx'> 	io_ctl_drop_pages(io_ctl);</div><div class='ctx'> 	io_ctl_free(io_ctl);</div><div class='ctx'> </div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, 0, i_size_read(inode) - 1,</div><div class='del'>-		      &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, 0, i_size_read(inode) - 1,</div><div class='add'>+			    &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * at this point the pages are under IO and we're happy,</div><div class='hunk'>@@ -1485,7 +1485,7 @@ static int __btrfs_write_out_cache(struct inode *inode,</div><div class='ctx'> 	io_ctl-&gt;entries = entries;</div><div class='ctx'> 	io_ctl-&gt;bitmaps = bitmaps;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_fdatawrite_range(inode, 0, (u64)-1);</div><div class='add'>+	ret = btrfs_fdatawrite_range(BTRFS_I(inode), 0, (u64)-1);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1913,9 +1913,9 @@ static inline void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl,</div><div class='ctx'> 		ctl-&gt;free_space -= bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bitmap_set_bits(struct btrfs_free_space_ctl *ctl,</div><div class='del'>-			    struct btrfs_free_space *info, u64 offset,</div><div class='del'>-			    u64 bytes)</div><div class='add'>+static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl,</div><div class='add'>+				  struct btrfs_free_space *info, u64 offset,</div><div class='add'>+				  u64 bytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long start, count, end;</div><div class='ctx'> 	int extent_delta = 1;</div><div class='hunk'>@@ -2251,7 +2251,7 @@ static u64 add_bytes_to_bitmap(struct btrfs_free_space_ctl *ctl,</div><div class='ctx'> </div><div class='ctx'> 	bytes_to_set = min(end - offset, bytes);</div><div class='ctx'> </div><div class='del'>-	bitmap_set_bits(ctl, info, offset, bytes_to_set);</div><div class='add'>+	btrfs_bitmap_set_bits(ctl, info, offset, bytes_to_set);</div><div class='ctx'> </div><div class='ctx'> 	return bytes_to_set;</div><div class='ctx'> </div><div class='hunk'>@@ -2282,7 +2282,7 @@ static bool use_bitmap(struct btrfs_free_space_ctl *ctl,</div><div class='ctx'> 		 * If this block group has some small extents we don't want to</div><div class='ctx'> 		 * use up all of our free slots in the cache with them, we want</div><div class='ctx'> 		 * to reserve them to larger extents, however if we have plenty</div><div class='del'>-		 * of cache left then go ahead an dadd them, no sense in adding</div><div class='add'>+		 * of cache left then go ahead and add them, no sense in adding</div><div class='ctx'> 		 * the overhead of a bitmap if we don't have to.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (info-&gt;bytes &lt;= fs_info-&gt;sectorsize * 8) {</div><div class='hunk'>@@ -2341,9 +2341,8 @@ again:</div><div class='ctx'> 		struct rb_node *node;</div><div class='ctx'> 		struct btrfs_free_space *entry;</div><div class='ctx'> </div><div class='del'>-		cluster = list_entry(block_group-&gt;cluster_list.next,</div><div class='del'>-				     struct btrfs_free_cluster,</div><div class='del'>-				     block_group_list);</div><div class='add'>+		cluster = list_first_entry(&amp;block_group-&gt;cluster_list,</div><div class='add'>+					   struct btrfs_free_cluster, block_group_list);</div><div class='ctx'> 		spin_lock(&amp;cluster-&gt;lock);</div><div class='ctx'> 		node = rb_first(&amp;cluster-&gt;root);</div><div class='ctx'> 		if (!node) {</div><div class='hunk'>@@ -2621,7 +2620,7 @@ static void steal_from_bitmap(struct btrfs_free_space_ctl *ctl,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __btrfs_add_free_space(struct btrfs_block_group *block_group,</div><div class='add'>+static int __btrfs_add_free_space(struct btrfs_block_group *block_group,</div><div class='ctx'> 			   u64 offset, u64 bytes,</div><div class='ctx'> 			   enum btrfs_trim_state trim_state)</div><div class='ctx'> {</div><div class='hunk'>@@ -2699,15 +2698,16 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,</div><div class='ctx'> 	u64 offset = bytenr - block_group-&gt;start;</div><div class='ctx'> 	u64 to_free, to_unusable;</div><div class='ctx'> 	int bg_reclaim_threshold = 0;</div><div class='del'>-	bool initial = (size == block_group-&gt;length);</div><div class='add'>+	bool initial;</div><div class='ctx'> 	u64 reclaimable_unusable;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!initial &amp;&amp; offset + size &gt; block_group-&gt;zone_capacity);</div><div class='add'>+	spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	initial = ((size == block_group-&gt;length) &amp;&amp; (block_group-&gt;alloc_offset == 0));</div><div class='add'>+	WARN_ON(!initial &amp;&amp; offset + size &gt; block_group-&gt;zone_capacity);</div><div class='ctx'> 	if (!initial)</div><div class='ctx'> 		bg_reclaim_threshold = READ_ONCE(sinfo-&gt;bg_reclaim_threshold);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ctl-&gt;tree_lock);</div><div class='ctx'> 	if (!used)</div><div class='ctx'> 		to_free = size;</div><div class='ctx'> 	else if (initial)</div><div class='hunk'>@@ -2720,18 +2720,19 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,</div><div class='ctx'> 		to_free = offset + size - block_group-&gt;alloc_offset;</div><div class='ctx'> 	to_unusable = size - to_free;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;ctl-&gt;tree_lock);</div><div class='ctx'> 	ctl-&gt;free_space += to_free;</div><div class='add'>+	spin_unlock(&amp;ctl-&gt;tree_lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the block group is read-only, we should account freed space into</div><div class='ctx'> 	 * bytes_readonly.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!block_group-&gt;ro)</div><div class='add'>+	if (!block_group-&gt;ro) {</div><div class='ctx'> 		block_group-&gt;zone_unusable += to_unusable;</div><div class='del'>-	spin_unlock(&amp;ctl-&gt;tree_lock);</div><div class='add'>+		WARN_ON(block_group-&gt;zone_unusable &gt; block_group-&gt;length);</div><div class='add'>+	}</div><div class='ctx'> 	if (!used) {</div><div class='del'>-		spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> 		block_group-&gt;alloc_offset -= size;</div><div class='del'>-		spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	reclaimable_unusable = block_group-&gt;zone_unusable -</div><div class='hunk'>@@ -2745,6 +2746,8 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,</div><div class='ctx'> 		btrfs_mark_bg_to_reclaim(block_group);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2934,12 +2937,11 @@ void btrfs_dump_free_space(struct btrfs_block_group *block_group,</div><div class='ctx'> 		if (info-&gt;bytes &gt;= bytes &amp;&amp; !block_group-&gt;ro)</div><div class='ctx'> 			count++;</div><div class='ctx'> 		btrfs_crit(fs_info, "entry offset %llu, bytes %llu, bitmap %s",</div><div class='del'>-			   info-&gt;offset, info-&gt;bytes,</div><div class='del'>-		       (info-&gt;bitmap) ? "yes" : "no");</div><div class='add'>+			   info-&gt;offset, info-&gt;bytes, str_yes_no(info-&gt;bitmap));</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ctl-&gt;tree_lock);</div><div class='ctx'> 	btrfs_info(fs_info, "block group has cluster?: %s",</div><div class='del'>-	       list_empty(&amp;block_group-&gt;cluster_list) ? "no" : "yes");</div><div class='add'>+	       str_no_yes(list_empty(&amp;block_group-&gt;cluster_list)));</div><div class='ctx'> 	btrfs_info(fs_info,</div><div class='ctx'> 		   "%d free space entries at or bigger than %llu bytes",</div><div class='ctx'> 		   count, bytes);</div><div class='hunk'>@@ -3190,7 +3192,7 @@ static u64 btrfs_alloc_from_bitmap(struct btrfs_block_group *block_group,</div><div class='ctx'> 				   u64 *max_extent_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_free_space_ctl *ctl = block_group-&gt;free_space_ctl;</div><div class='del'>-	int err;</div><div class='add'>+	int ret2;</div><div class='ctx'> 	u64 search_start = cluster-&gt;window_start;</div><div class='ctx'> 	u64 search_bytes = bytes;</div><div class='ctx'> 	u64 ret = 0;</div><div class='hunk'>@@ -3198,8 +3200,8 @@ static u64 btrfs_alloc_from_bitmap(struct btrfs_block_group *block_group,</div><div class='ctx'> 	search_start = min_start;</div><div class='ctx'> 	search_bytes = bytes;</div><div class='ctx'> </div><div class='del'>-	err = search_bitmap(ctl, entry, &amp;search_start, &amp;search_bytes, true);</div><div class='del'>-	if (err) {</div><div class='add'>+	ret2 = search_bitmap(ctl, entry, &amp;search_start, &amp;search_bytes, true);</div><div class='add'>+	if (ret2) {</div><div class='ctx'> 		*max_extent_size = max(get_max_extent_size(entry),</div><div class='ctx'> 				       *max_extent_size);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -3654,7 +3656,7 @@ static int do_trimming(struct btrfs_block_group *block_group,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_free_space_ctl *ctl = block_group-&gt;free_space_ctl;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int update = 0;</div><div class='add'>+	bool bg_ro;</div><div class='ctx'> 	const u64 end = start + bytes;</div><div class='ctx'> 	const u64 reserved_end = reserved_start + reserved_bytes;</div><div class='ctx'> 	enum btrfs_trim_state trim_state = BTRFS_TRIM_STATE_UNTRIMMED;</div><div class='hunk'>@@ -3662,12 +3664,14 @@ static int do_trimming(struct btrfs_block_group *block_group,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	spin_lock(&amp;block_group-&gt;lock);</div><div class='del'>-	if (!block_group-&gt;ro) {</div><div class='add'>+	bg_ro = block_group-&gt;ro;</div><div class='add'>+	if (!bg_ro) {</div><div class='ctx'> 		block_group-&gt;reserved += reserved_bytes;</div><div class='add'>+		spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 		space_info-&gt;bytes_reserved += reserved_bytes;</div><div class='del'>-		update = 1;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_discard_extent(fs_info, start, bytes, &amp;trimmed);</div><div class='hunk'>@@ -3688,14 +3692,16 @@ static int do_trimming(struct btrfs_block_group *block_group,</div><div class='ctx'> 	list_del(&amp;trim_entry-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;ctl-&gt;cache_writeout_mutex);</div><div class='ctx'> </div><div class='del'>-	if (update) {</div><div class='add'>+	if (!bg_ro) {</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		spin_lock(&amp;block_group-&gt;lock);</div><div class='del'>-		if (block_group-&gt;ro)</div><div class='del'>-			space_info-&gt;bytes_readonly += reserved_bytes;</div><div class='add'>+		bg_ro = block_group-&gt;ro;</div><div class='ctx'> 		block_group-&gt;reserved -= reserved_bytes;</div><div class='del'>-		space_info-&gt;bytes_reserved -= reserved_bytes;</div><div class='ctx'> 		spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+</div><div class='add'>+		space_info-&gt;bytes_reserved -= reserved_bytes;</div><div class='add'>+		if (bg_ro)</div><div class='add'>+			space_info-&gt;bytes_readonly += reserved_bytes;</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3807,7 +3813,7 @@ next:</div><div class='ctx'> 		if (async &amp;&amp; *total_trimmed)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='add'>+		if (btrfs_trim_interrupted()) {</div><div class='ctx'> 			ret = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3827,7 +3833,7 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If we break out of trimming a bitmap prematurely, we should reset the</div><div class='del'>- * trimming bit.  In a rather contrieved case, it's possible to race here so</div><div class='add'>+ * trimming bit.  In a rather contrived case, it's possible to race here so</div><div class='ctx'>  * reset the state to BTRFS_TRIM_STATE_UNTRIMMED.</div><div class='ctx'>  *</div><div class='ctx'>  * start = start of bitmap</div><div class='hunk'>@@ -3998,7 +4004,7 @@ next:</div><div class='ctx'> 		}</div><div class='ctx'> 		block_group-&gt;discard_cursor = start;</div><div class='ctx'> </div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='add'>+		if (btrfs_trim_interrupted()) {</div><div class='ctx'> 			if (start != offset)</div><div class='ctx'> 				reset_trimming_bitmap(ctl, offset);</div><div class='ctx'> 			ret = -ERESTARTSYS;</div><div class='hunk'>@@ -4140,7 +4146,7 @@ int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool act</div><div class='ctx'> 	if (!active) {</div><div class='ctx'> 		set_bit(BTRFS_FS_CLEANUP_SPACE_CACHE_V1, &amp;fs_info-&gt;flags);</div><div class='ctx'> 		ret = cleanup_free_space_cache_v1(fs_info, trans);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -4156,15 +4162,13 @@ out:</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_free_space_init(void)</div><div class='ctx'> {</div><div class='del'>-	btrfs_free_space_cachep = kmem_cache_create("btrfs_free_space",</div><div class='del'>-			sizeof(struct btrfs_free_space), 0,</div><div class='del'>-			SLAB_MEM_SPREAD, NULL);</div><div class='add'>+	btrfs_free_space_cachep = KMEM_CACHE(btrfs_free_space, 0);</div><div class='ctx'> 	if (!btrfs_free_space_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_free_space_bitmap_cachep = kmem_cache_create("btrfs_free_space_bitmap",</div><div class='ctx'> 							PAGE_SIZE, PAGE_SIZE,</div><div class='del'>-							SLAB_MEM_SPREAD, NULL);</div><div class='add'>+							0, NULL);</div><div class='ctx'> 	if (!btrfs_free_space_bitmap_cachep) {</div><div class='ctx'> 		kmem_cache_destroy(btrfs_free_space_cachep);</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/btrfs/free-space-cache.h b/fs/btrfs/free-space-cache.h<br/>index 33b4da3271b1..9f1dbfdee8ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-cache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/free-space-cache.h</a></div><div class='hunk'>@@ -6,6 +6,20 @@</div><div class='ctx'> #ifndef BTRFS_FREE_SPACE_CACHE_H</div><div class='ctx'> #define BTRFS_FREE_SPACE_CACHE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/freezer.h&gt;</div><div class='add'>+#include "fs.h"</div><div class='add'>+</div><div class='add'>+struct inode;</div><div class='add'>+struct page;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_trim_block_group;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the trim state of an extent or bitmap.</div><div class='ctx'>  *</div><div class='hunk'>@@ -43,6 +57,11 @@ static inline bool btrfs_free_space_trimming_bitmap(</div><div class='ctx'> 	return (info-&gt;trim_state == BTRFS_TRIM_STATE_TRIMMING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool btrfs_trim_interrupted(void)</div><div class='add'>+{</div><div class='add'>+	return fatal_signal_pending(current) || freezing(current);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Deltas are an effective way to populate global statistics.  Give macro names</div><div class='ctx'>  * to make it clear what we're doing.  An example is discard_extents in</div><div class='hunk'>@@ -114,8 +133,6 @@ int btrfs_write_out_cache(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> void btrfs_init_free_space_ctl(struct btrfs_block_group *block_group,</div><div class='ctx'> 			       struct btrfs_free_space_ctl *ctl);</div><div class='del'>-int __btrfs_add_free_space(struct btrfs_block_group *block_group, u64 bytenr,</div><div class='del'>-			   u64 size, enum btrfs_trim_state trim_state);</div><div class='ctx'> int btrfs_add_free_space(struct btrfs_block_group *block_group,</div><div class='ctx'> 			 u64 bytenr, u64 size);</div><div class='ctx'> int btrfs_add_free_space_unused(struct btrfs_block_group *block_group,</div><div class='head'>diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c<br/>index 7b598b070700..1ad2ad384b9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/free-space-tree.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ static struct btrfs_root *btrfs_free_space_root(</div><div class='ctx'> 	return btrfs_global_root(block_group-&gt;fs_info, &amp;key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void set_free_space_tree_thresholds(struct btrfs_block_group *cache)</div><div class='add'>+void btrfs_set_free_space_tree_thresholds(struct btrfs_block_group *cache)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bitmap_range;</div><div class='ctx'> 	size_t bitmap_size;</div><div class='hunk'>@@ -82,23 +82,19 @@ static int add_new_free_space_info(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;key, sizeof(*info));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	info = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 			      struct btrfs_free_space_info);</div><div class='ctx'> 	btrfs_set_free_space_extent_count(leaf, info, 0);</div><div class='ctx'> 	btrfs_set_free_space_flags(leaf, info, 0);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='del'>-struct btrfs_free_space_info *search_free_space_info(</div><div class='add'>+struct btrfs_free_space_info *btrfs_search_free_space_info(</div><div class='ctx'> 		struct btrfs_trans_handle *trans,</div><div class='ctx'> 		struct btrfs_block_group *block_group,</div><div class='ctx'> 		struct btrfs_path *path, int cow)</div><div class='hunk'>@@ -118,7 +114,7 @@ struct btrfs_free_space_info *search_free_space_info(</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		btrfs_warn(fs_info, "missing free space info for %llu",</div><div class='ctx'> 			   block_group-&gt;start);</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -141,13 +137,13 @@ static int btrfs_search_prev_slot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;slots[0] == 0) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+	if (unlikely(p-&gt;slots[0] == 0)) {</div><div class='add'>+		DEBUG_WARN("no previous slot found");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	p-&gt;slots[0]--;</div><div class='hunk'>@@ -169,11 +165,9 @@ static unsigned long *alloc_bitmap(u32 bitmap_size)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * GFP_NOFS doesn't work with kvmalloc(), but we really can't recurse</div><div class='del'>-	 * into the filesystem as the free space bitmap can be modified in the</div><div class='del'>-	 * critical section of a transaction commit.</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: push the memalloc_nofs_{save,restore}() to the caller where we</div><div class='del'>-	 * know that recursion is unsafe.</div><div class='add'>+	 * into the filesystem here. All callers hold a transaction handle</div><div class='add'>+	 * open, so if a GFP_KERNEL allocation recurses into the filesystem</div><div class='add'>+	 * and triggers a transaction commit, we would deadlock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='ctx'> 	ret = kvzalloc(bitmap_rounded_size, GFP_KERNEL);</div><div class='hunk'>@@ -202,9 +196,9 @@ static void le_bitmap_set(unsigned long *map, unsigned int start, int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='del'>-int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group,</div><div class='del'>-				  struct btrfs_path *path)</div><div class='add'>+int btrfs_convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group,</div><div class='add'>+					struct btrfs_path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = btrfs_free_space_root(block_group);</div><div class='hunk'>@@ -222,10 +216,8 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	bitmap_size = free_space_bitmap_size(fs_info, block_group-&gt;length);</div><div class='ctx'> 	bitmap = alloc_bitmap(bitmap_size);</div><div class='del'>-	if (!bitmap) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(!bitmap))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	start = block_group-&gt;start;</div><div class='ctx'> 	end = block_group-&gt;start + block_group-&gt;length;</div><div class='hunk'>@@ -236,8 +228,10 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	while (!done) {</div><div class='ctx'> 		ret = btrfs_search_prev_slot(trans, root, &amp;key, path, -1, 1);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		nr = 0;</div><div class='hunk'>@@ -272,31 +266,35 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, path-&gt;slots[0], nr);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(trans, block_group, path, 1);</div><div class='add'>+	info = btrfs_search_free_space_info(trans, block_group, path, 1);</div><div class='ctx'> 	if (IS_ERR(info)) {</div><div class='ctx'> 		ret = PTR_ERR(info);</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	flags = btrfs_free_space_flags(leaf, info);</div><div class='ctx'> 	flags |= BTRFS_FREE_SPACE_USING_BITMAPS;</div><div class='add'>+	block_group-&gt;using_free_space_bitmaps = true;</div><div class='add'>+	block_group-&gt;using_free_space_bitmaps_cached = true;</div><div class='ctx'> 	btrfs_set_free_space_flags(leaf, info, flags);</div><div class='ctx'> 	expected_extent_count = btrfs_free_space_extent_count(leaf, info);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	if (extent_count != expected_extent_count) {</div><div class='add'>+	if (unlikely(extent_count != expected_extent_count)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "incorrect extent count for %llu; counted %u, expected %u",</div><div class='ctx'> 			  block_group-&gt;start, extent_count,</div><div class='ctx'> 			  expected_extent_count);</div><div class='del'>-		ASSERT(0);</div><div class='ctx'> 		ret = -EIO;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -317,14 +315,15 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path, &amp;key,</div><div class='ctx'> 					      data_size);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='ctx'> 		write_extent_buffer(leaf, bitmap_cursor, ptr,</div><div class='ctx'> 				    data_size);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 		i += extent_size;</div><div class='hunk'>@@ -334,15 +333,13 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	kvfree(bitmap);</div><div class='del'>-	if (ret)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='del'>-int convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group,</div><div class='del'>-				  struct btrfs_path *path)</div><div class='add'>+int btrfs_convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group,</div><div class='add'>+					struct btrfs_path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = btrfs_free_space_root(block_group);</div><div class='hunk'>@@ -359,10 +356,8 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	bitmap_size = free_space_bitmap_size(fs_info, block_group-&gt;length);</div><div class='ctx'> 	bitmap = alloc_bitmap(bitmap_size);</div><div class='del'>-	if (!bitmap) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(!bitmap))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	start = block_group-&gt;start;</div><div class='ctx'> 	end = block_group-&gt;start + block_group-&gt;length;</div><div class='hunk'>@@ -373,8 +368,10 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	while (!done) {</div><div class='ctx'> 		ret = btrfs_search_prev_slot(trans, root, &amp;key, path, -1, 1);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		nr = 0;</div><div class='hunk'>@@ -403,50 +400,56 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				data_size = free_space_bitmap_size(fs_info,</div><div class='ctx'> 								found_key.offset);</div><div class='ctx'> </div><div class='del'>-				ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0] - 1);</div><div class='add'>+				path-&gt;slots[0]--;</div><div class='add'>+				ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='ctx'> 				read_extent_buffer(leaf, bitmap_cursor, ptr,</div><div class='ctx'> 						   data_size);</div><div class='ctx'> </div><div class='ctx'> 				nr++;</div><div class='del'>-				path-&gt;slots[0]--;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ASSERT(0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, path-&gt;slots[0], nr);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(trans, block_group, path, 1);</div><div class='add'>+	info = btrfs_search_free_space_info(trans, block_group, path, 1);</div><div class='ctx'> 	if (IS_ERR(info)) {</div><div class='ctx'> 		ret = PTR_ERR(info);</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	flags = btrfs_free_space_flags(leaf, info);</div><div class='ctx'> 	flags &amp;= ~BTRFS_FREE_SPACE_USING_BITMAPS;</div><div class='add'>+	block_group-&gt;using_free_space_bitmaps = false;</div><div class='add'>+	block_group-&gt;using_free_space_bitmaps_cached = true;</div><div class='ctx'> 	btrfs_set_free_space_flags(leaf, info, flags);</div><div class='ctx'> 	expected_extent_count = btrfs_free_space_extent_count(leaf, info);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	nrbits = block_group-&gt;length &gt;&gt; block_group-&gt;fs_info-&gt;sectorsize_bits;</div><div class='add'>+	nrbits = block_group-&gt;length &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	start_bit = find_next_bit_le(bitmap, nrbits, 0);</div><div class='ctx'> </div><div class='ctx'> 	while (start_bit &lt; nrbits) {</div><div class='ctx'> 		end_bit = find_next_zero_bit_le(bitmap, nrbits, start_bit);</div><div class='ctx'> 		ASSERT(start_bit &lt; end_bit);</div><div class='ctx'> </div><div class='del'>-		key.objectid = start + start_bit * block_group-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+		key.objectid = start + start_bit * fs_info-&gt;sectorsize;</div><div class='ctx'> 		key.type = BTRFS_FREE_SPACE_EXTENT_KEY;</div><div class='del'>-		key.offset = (end_bit - start_bit) * block_group-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+		key.offset = (end_bit - start_bit) * fs_info-&gt;sectorsize;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 		extent_count++;</div><div class='hunk'>@@ -454,21 +457,19 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		start_bit = find_next_bit_le(bitmap, nrbits, end_bit);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (extent_count != expected_extent_count) {</div><div class='add'>+	if (unlikely(extent_count != expected_extent_count)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "incorrect extent count for %llu; counted %u, expected %u",</div><div class='ctx'> 			  block_group-&gt;start, extent_count,</div><div class='ctx'> 			  expected_extent_count);</div><div class='del'>-		ASSERT(0);</div><div class='ctx'> 		ret = -EIO;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	kvfree(bitmap);</div><div class='del'>-	if (ret)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -485,34 +486,31 @@ static int update_free_space_extent_count(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (new_extents == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(trans, block_group, path, 1);</div><div class='del'>-	if (IS_ERR(info)) {</div><div class='del'>-		ret = PTR_ERR(info);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	info = btrfs_search_free_space_info(trans, block_group, path, 1);</div><div class='add'>+	if (IS_ERR(info))</div><div class='add'>+		return PTR_ERR(info);</div><div class='add'>+</div><div class='ctx'> 	flags = btrfs_free_space_flags(path-&gt;nodes[0], info);</div><div class='ctx'> 	extent_count = btrfs_free_space_extent_count(path-&gt;nodes[0], info);</div><div class='ctx'> </div><div class='ctx'> 	extent_count += new_extents;</div><div class='ctx'> 	btrfs_set_free_space_extent_count(path-&gt;nodes[0], info, extent_count);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (!(flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS) &amp;&amp;</div><div class='ctx'> 	    extent_count &gt; block_group-&gt;bitmap_high_thresh) {</div><div class='del'>-		ret = convert_free_space_to_bitmaps(trans, block_group, path);</div><div class='add'>+		ret = btrfs_convert_free_space_to_bitmaps(trans, block_group, path);</div><div class='ctx'> 	} else if ((flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS) &amp;&amp;</div><div class='ctx'> 		   extent_count &lt; block_group-&gt;bitmap_low_thresh) {</div><div class='del'>-		ret = convert_free_space_to_extents(trans, block_group, path);</div><div class='add'>+		ret = btrfs_convert_free_space_to_extents(trans, block_group, path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='del'>-int free_space_test_bit(struct btrfs_block_group *block_group,</div><div class='del'>-			struct btrfs_path *path, u64 offset)</div><div class='add'>+bool btrfs_free_space_test_bit(struct btrfs_block_group *block_group,</div><div class='add'>+			       struct btrfs_path *path, u64 offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -530,13 +528,13 @@ int free_space_test_bit(struct btrfs_block_group *block_group,</div><div class='ctx'> 	ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='ctx'> 	i = div_u64(offset - found_start,</div><div class='ctx'> 		    block_group-&gt;fs_info-&gt;sectorsize);</div><div class='del'>-	return !!extent_buffer_test_bit(leaf, ptr, i);</div><div class='add'>+	return extent_buffer_test_bit(leaf, ptr, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_space_set_bits(struct btrfs_trans_handle *trans,</div><div class='del'>-				struct btrfs_block_group *block_group,</div><div class='del'>-				struct btrfs_path *path, u64 *start, u64 *size,</div><div class='del'>-				int bit)</div><div class='add'>+static void free_space_modify_bits(struct btrfs_trans_handle *trans,</div><div class='add'>+				   struct btrfs_block_group *block_group,</div><div class='add'>+				   struct btrfs_path *path, u64 *start, u64 *size,</div><div class='add'>+				   bool set_bits)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -560,7 +558,7 @@ static void free_space_set_bits(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='ctx'> 	first = (*start - found_start) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	last = (end - found_start) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-	if (bit)</div><div class='add'>+	if (set_bits)</div><div class='ctx'> 		extent_buffer_bitmap_set(leaf, ptr, first, last - first);</div><div class='ctx'> 	else</div><div class='ctx'> 		extent_buffer_bitmap_clear(leaf, ptr, first, last - first);</div><div class='hunk'>@@ -604,13 +602,14 @@ static int free_space_next_bitmap(struct btrfs_trans_handle *trans,</div><div class='ctx'> static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    struct btrfs_block_group *block_group,</div><div class='ctx'> 				    struct btrfs_path *path,</div><div class='del'>-				    u64 start, u64 size, int remove)</div><div class='add'>+				    u64 start, u64 size, bool remove)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_free_space_root(block_group);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 end = start + size;</div><div class='ctx'> 	u64 cur_start, cur_size;</div><div class='del'>-	int prev_bit, next_bit;</div><div class='add'>+	bool prev_bit_set = false;</div><div class='add'>+	bool next_bit_set = false;</div><div class='ctx'> 	int new_extents;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -627,16 +626,16 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_search_prev_slot(trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		prev_bit = free_space_test_bit(block_group, path, prev_block);</div><div class='add'>+		prev_bit_set = btrfs_free_space_test_bit(block_group, path, prev_block);</div><div class='ctx'> </div><div class='ctx'> 		/* The previous block may have been in the previous bitmap. */</div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 		if (start &gt;= key.objectid + key.offset) {</div><div class='ctx'> 			ret = free_space_next_bitmap(trans, root, path);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		key.objectid = start;</div><div class='hunk'>@@ -645,9 +644,7 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_search_prev_slot(trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		prev_bit = -1;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -657,13 +654,13 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	cur_start = start;</div><div class='ctx'> 	cur_size = size;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		free_space_set_bits(trans, block_group, path, &amp;cur_start, &amp;cur_size,</div><div class='del'>-				    !remove);</div><div class='add'>+		free_space_modify_bits(trans, block_group, path, &amp;cur_start,</div><div class='add'>+				       &amp;cur_size, !remove);</div><div class='ctx'> 		if (cur_size == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ret = free_space_next_bitmap(trans, root, path);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -676,42 +673,36 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (end &gt;= key.objectid + key.offset) {</div><div class='ctx'> 			ret = free_space_next_bitmap(trans, root, path);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		next_bit = free_space_test_bit(block_group, path, end);</div><div class='del'>-	} else {</div><div class='del'>-		next_bit = -1;</div><div class='add'>+		next_bit_set = btrfs_free_space_test_bit(block_group, path, end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (remove) {</div><div class='ctx'> 		new_extents = -1;</div><div class='del'>-		if (prev_bit == 1) {</div><div class='add'>+		if (prev_bit_set) {</div><div class='ctx'> 			/* Leftover on the left. */</div><div class='ctx'> 			new_extents++;</div><div class='ctx'> 		}</div><div class='del'>-		if (next_bit == 1) {</div><div class='add'>+		if (next_bit_set) {</div><div class='ctx'> 			/* Leftover on the right. */</div><div class='ctx'> 			new_extents++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		new_extents = 1;</div><div class='del'>-		if (prev_bit == 1) {</div><div class='add'>+		if (prev_bit_set) {</div><div class='ctx'> 			/* Merging with neighbor on the left. */</div><div class='ctx'> 			new_extents--;</div><div class='ctx'> 		}</div><div class='del'>-		if (next_bit == 1) {</div><div class='add'>+		if (next_bit_set) {</div><div class='ctx'> 			/* Merging with neighbor on the right. */</div><div class='ctx'> 			new_extents--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	ret = update_free_space_extent_count(trans, block_group, path,</div><div class='del'>-					     new_extents);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return update_free_space_extent_count(trans, block_group, path, new_extents);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int remove_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -732,7 +723,7 @@ static int remove_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_prev_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -764,7 +755,7 @@ static int remove_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* Delete the existing key (cases 1-4). */</div><div class='ctx'> 	ret = btrfs_del_item(trans, root, path);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Add a key for leftovers at the beginning (cases 3 and 4). */</div><div class='ctx'> 	if (start &gt; found_start) {</div><div class='hunk'>@@ -775,7 +766,7 @@ static int remove_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		new_extents++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -788,81 +779,89 @@ static int remove_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		new_extents++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	ret = update_free_space_extent_count(trans, block_group, path,</div><div class='del'>-					     new_extents);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return update_free_space_extent_count(trans, block_group, path, new_extents);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_FOR_TESTS</div><div class='del'>-int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group,</div><div class='del'>-				  struct btrfs_path *path, u64 start, u64 size)</div><div class='add'>+static int using_bitmaps(struct btrfs_block_group *bg, struct btrfs_path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_free_space_info *info;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE, &amp;block_group-&gt;runtime_flags)) {</div><div class='del'>-		ret = __add_block_group_free_space(trans, block_group, path);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	if (bg-&gt;using_free_space_bitmaps_cached)</div><div class='add'>+		return bg-&gt;using_free_space_bitmaps;</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(NULL, block_group, path, 0);</div><div class='add'>+	info = btrfs_search_free_space_info(NULL, bg, path, 0);</div><div class='ctx'> 	if (IS_ERR(info))</div><div class='ctx'> 		return PTR_ERR(info);</div><div class='ctx'> 	flags = btrfs_free_space_flags(path-&gt;nodes[0], info);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS) {</div><div class='add'>+	bg-&gt;using_free_space_bitmaps = (flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS);</div><div class='add'>+	bg-&gt;using_free_space_bitmaps_cached = true;</div><div class='add'>+</div><div class='add'>+	return bg-&gt;using_free_space_bitmaps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_FOR_TESTS</div><div class='add'>+int __btrfs_remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group,</div><div class='add'>+					struct btrfs_path *path, u64 start, u64 size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __add_block_group_free_space(trans, block_group, path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = using_bitmaps(block_group, path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return modify_free_space_bitmap(trans, block_group, path,</div><div class='del'>-						start, size, 1);</div><div class='del'>-	} else {</div><div class='del'>-		return remove_free_space_extent(trans, block_group, path,</div><div class='del'>-						start, size);</div><div class='del'>-	}</div><div class='add'>+						start, size, true);</div><div class='add'>+</div><div class='add'>+	return remove_free_space_extent(trans, block_group, path, start, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-				u64 start, u64 size)</div><div class='add'>+int btrfs_remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+				      u64 start, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_fs_compat_ro(trans-&gt;fs_info, FREE_SPACE_TREE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='add'>+	if (unlikely(!path)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	block_group = btrfs_lookup_block_group(trans-&gt;fs_info, start);</div><div class='del'>-	if (!block_group) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+	if (unlikely(!block_group)) {</div><div class='add'>+		DEBUG_WARN("no block group found for start=%llu", start);</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-	ret = __remove_from_free_space_tree(trans, block_group, path, start,</div><div class='del'>-					    size);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, block_group, path, start, size);</div><div class='ctx'> 	mutex_unlock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-</div><div class='del'>-	btrfs_put_block_group(block_group);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='add'>+</div><div class='add'>+	btrfs_put_block_group(block_group);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -909,7 +908,7 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_prev_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -932,7 +931,7 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (found_end == start) {</div><div class='ctx'> 		ret = btrfs_del_item(trans, root, path);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		new_key.objectid = found_start;</div><div class='ctx'> 		new_key.offset += key.offset;</div><div class='ctx'> 		new_extents--;</div><div class='hunk'>@@ -949,7 +948,7 @@ right:</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_prev_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -973,7 +972,7 @@ right:</div><div class='ctx'> 	if (found_start == end) {</div><div class='ctx'> 		ret = btrfs_del_item(trans, root, path);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		new_key.offset += key.offset;</div><div class='ctx'> 		new_extents--;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -983,78 +982,67 @@ insert:</div><div class='ctx'> 	/* Insert the new key (cases 1-4). */</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;new_key, 0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	ret = update_free_space_extent_count(trans, block_group, path,</div><div class='del'>-					     new_extents);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return update_free_space_extent_count(trans, block_group, path, new_extents);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='del'>-int __add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-			     struct btrfs_block_group *block_group,</div><div class='del'>-			     struct btrfs_path *path, u64 start, u64 size)</div><div class='add'>+int __btrfs_add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+				   struct btrfs_block_group *block_group,</div><div class='add'>+				   struct btrfs_path *path, u64 start, u64 size)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_free_space_info *info;</div><div class='del'>-	u32 flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE, &amp;block_group-&gt;runtime_flags)) {</div><div class='del'>-		ret = __add_block_group_free_space(trans, block_group, path);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	ret = __add_block_group_free_space(trans, block_group, path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(NULL, block_group, path, 0);</div><div class='del'>-	if (IS_ERR(info))</div><div class='del'>-		return PTR_ERR(info);</div><div class='del'>-	flags = btrfs_free_space_flags(path-&gt;nodes[0], info);</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	ret = using_bitmaps(block_group, path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS) {</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return modify_free_space_bitmap(trans, block_group, path,</div><div class='del'>-						start, size, 0);</div><div class='del'>-	} else {</div><div class='del'>-		return add_free_space_extent(trans, block_group, path, start,</div><div class='del'>-					     size);</div><div class='del'>-	}</div><div class='add'>+						start, size, false);</div><div class='add'>+</div><div class='add'>+	return add_free_space_extent(trans, block_group, path, start, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-			   u64 start, u64 size)</div><div class='add'>+int btrfs_add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+				 u64 start, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_fs_compat_ro(trans-&gt;fs_info, FREE_SPACE_TREE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='add'>+	if (unlikely(!path)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	block_group = btrfs_lookup_block_group(trans-&gt;fs_info, start);</div><div class='del'>-	if (!block_group) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+	if (unlikely(!block_group)) {</div><div class='add'>+		DEBUG_WARN("no block group found for start=%llu", start);</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-	ret = __add_to_free_space_tree(trans, block_group, path, start, size);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, block_group, path, start, size);</div><div class='ctx'> 	mutex_unlock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-</div><div class='del'>-	btrfs_put_block_group(block_group);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='add'>+</div><div class='add'>+	btrfs_put_block_group(block_group);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1067,7 +1055,8 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='del'>-	struct btrfs_path *path, *path2;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path2);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 start, end;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1075,17 +1064,16 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='ctx'> 	path2 = btrfs_alloc_path();</div><div class='del'>-	if (!path2) {</div><div class='del'>-		btrfs_free_path(path);</div><div class='add'>+	if (!path2)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='ctx'> 	ret = add_new_free_space_info(trans, block_group, path2);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;block_group-&gt;free_space_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1104,11 +1092,22 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = btrfs_search_slot_for_read(extent_root, &amp;key, path, 1, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_locked;</div><div class='del'>-	ASSERT(ret == 0);</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * If ret is 1 (no key found), it means this is an empty block group,</div><div class='add'>+	 * without any extents allocated from it and there's no block group</div><div class='add'>+	 * item (key BTRFS_BLOCK_GROUP_ITEM_KEY) located in the extent tree</div><div class='add'>+	 * because we are using the block group tree feature (so block group</div><div class='add'>+	 * items are stored in the block group tree) or this is a new block</div><div class='add'>+	 * group created in the current transaction and its block group item</div><div class='add'>+	 * was not yet inserted in the extent tree (that happens in</div><div class='add'>+	 * btrfs_create_pending_block_groups() -&gt; insert_block_group_item()).</div><div class='add'>+	 * It also means there are no extents allocated for block groups with a</div><div class='add'>+	 * start offset beyond this block group's end offset (this is the last,</div><div class='add'>+	 * highest, block group).</div><div class='add'>+	 */</div><div class='ctx'> 	start = block_group-&gt;start;</div><div class='ctx'> 	end = block_group-&gt;start + block_group-&gt;length;</div><div class='del'>-	while (1) {</div><div class='add'>+	while (ret == 0) {</div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='ctx'> 		if (key.type == BTRFS_EXTENT_ITEM_KEY ||</div><div class='hunk'>@@ -1117,11 +1116,11 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (start &lt; key.objectid) {</div><div class='del'>-				ret = __add_to_free_space_tree(trans,</div><div class='del'>-							       block_group,</div><div class='del'>-							       path2, start,</div><div class='del'>-							       key.objectid -</div><div class='del'>-							       start);</div><div class='add'>+				ret = __btrfs_add_to_free_space_tree(trans,</div><div class='add'>+								     block_group,</div><div class='add'>+								     path2, start,</div><div class='add'>+								     key.objectid -</div><div class='add'>+								     start);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto out_locked;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1138,12 +1137,10 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = btrfs_next_item(extent_root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_locked;</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (start &lt; end) {</div><div class='del'>-		ret = __add_to_free_space_tree(trans, block_group, path2,</div><div class='del'>-					       start, end - start);</div><div class='add'>+		ret = __btrfs_add_to_free_space_tree(trans, block_group, path2,</div><div class='add'>+						     start, end - start);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_locked;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1151,9 +1148,7 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out_locked:</div><div class='ctx'> 	mutex_unlock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path2);</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1176,12 +1171,16 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 					    BTRFS_FREE_SPACE_TREE_OBJECTID);</div><div class='ctx'> 	if (IS_ERR(free_space_root)) {</div><div class='ctx'> 		ret = PTR_ERR(free_space_root);</div><div class='del'>-		goto abort;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		goto out_clear;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = btrfs_global_root_insert(free_space_root);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_put_root(free_space_root);</div><div class='del'>-		goto abort;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		goto out_clear;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	node = rb_first_cached(&amp;fs_info-&gt;block_group_cache_tree);</div><div class='hunk'>@@ -1189,8 +1188,11 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		block_group = rb_entry(node, struct btrfs_block_group,</div><div class='ctx'> 				       cache_node);</div><div class='ctx'> 		ret = populate_free_space_tree(trans, block_group);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto abort;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			btrfs_end_transaction(trans);</div><div class='add'>+			goto out_clear;</div><div class='add'>+		}</div><div class='ctx'> 		node = rb_next(node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1206,19 +1208,18 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	clear_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='del'>-abort:</div><div class='add'>+out_clear:</div><div class='ctx'> 	clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	clear_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &amp;fs_info-&gt;flags);</div><div class='del'>-	btrfs_abort_transaction(trans, ret);</div><div class='del'>-	btrfs_end_transaction(trans);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int clear_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct btrfs_root *root)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> 	int nr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1233,7 +1234,7 @@ static int clear_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		nr = btrfs_header_nritems(path-&gt;nodes[0]);</div><div class='ctx'> 		if (!nr)</div><div class='hunk'>@@ -1242,15 +1243,22 @@ static int clear_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		path-&gt;slots[0] = 0;</div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, 0, nr);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	node = rb_first_cached(&amp;trans-&gt;fs_info-&gt;block_group_cache_tree);</div><div class='add'>+	while (node) {</div><div class='add'>+		struct btrfs_block_group *bg;</div><div class='add'>+</div><div class='add'>+		bg = rb_entry(node, struct btrfs_block_group, cache_node);</div><div class='add'>+		clear_bit(BLOCK_GROUP_FLAG_FREE_SPACE_ADDED, &amp;bg-&gt;runtime_flags);</div><div class='add'>+		node = rb_next(node);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_delete_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='hunk'>@@ -1273,12 +1281,18 @@ int btrfs_delete_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_clear_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID);</div><div class='ctx'> </div><div class='ctx'> 	ret = clear_free_space_tree(trans, free_space_root);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto abort;</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_root(trans, &amp;free_space_root-&gt;root_key);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto abort;</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_global_root_delete(free_space_root);</div><div class='ctx'> </div><div class='hunk'>@@ -1289,17 +1303,16 @@ int btrfs_delete_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_tree_lock(free_space_root-&gt;node);</div><div class='ctx'> 	btrfs_clear_buffer_dirty(trans, free_space_root-&gt;node);</div><div class='ctx'> 	btrfs_tree_unlock(free_space_root-&gt;node);</div><div class='del'>-	btrfs_free_tree_block(trans, btrfs_root_id(free_space_root),</div><div class='del'>-			      free_space_root-&gt;node, 0, 1);</div><div class='del'>-</div><div class='add'>+	ret = btrfs_free_tree_block(trans, btrfs_root_id(free_space_root),</div><div class='add'>+				    free_space_root-&gt;node, 0, 1);</div><div class='ctx'> 	btrfs_put_root(free_space_root);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return btrfs_commit_transaction(trans);</div><div class='del'>-</div><div class='del'>-abort:</div><div class='del'>-	btrfs_abort_transaction(trans, ret);</div><div class='del'>-	btrfs_end_transaction(trans);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='hunk'>@@ -1322,8 +1335,11 @@ int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	set_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &amp;fs_info-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	ret = clear_free_space_tree(trans, free_space_root);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto abort;</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	node = rb_first_cached(&amp;fs_info-&gt;block_group_cache_tree);</div><div class='ctx'> 	while (node) {</div><div class='hunk'>@@ -1331,9 +1347,24 @@ int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 		block_group = rb_entry(node, struct btrfs_block_group,</div><div class='ctx'> 				       cache_node);</div><div class='add'>+</div><div class='add'>+		if (test_bit(BLOCK_GROUP_FLAG_FREE_SPACE_ADDED,</div><div class='add'>+			     &amp;block_group-&gt;runtime_flags))</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='ctx'> 		ret = populate_free_space_tree(trans, block_group);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto abort;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			btrfs_end_transaction(trans);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+next:</div><div class='add'>+		if (btrfs_should_end_transaction(trans)) {</div><div class='add'>+			btrfs_end_transaction(trans);</div><div class='add'>+			trans = btrfs_start_transaction(free_space_root, 1);</div><div class='add'>+			if (IS_ERR(trans))</div><div class='add'>+				return PTR_ERR(trans);</div><div class='add'>+		}</div><div class='ctx'> 		node = rb_next(node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1344,64 +1375,88 @@ int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	ret = btrfs_commit_transaction(trans);</div><div class='ctx'> 	clear_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	return ret;</div><div class='del'>-abort:</div><div class='del'>-	btrfs_abort_transaction(trans, ret);</div><div class='del'>-	btrfs_end_transaction(trans);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __add_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					struct btrfs_block_group *block_group,</div><div class='ctx'> 					struct btrfs_path *path)</div><div class='ctx'> {</div><div class='add'>+	bool own_path = false;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	clear_bit(BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE, &amp;block_group-&gt;runtime_flags);</div><div class='add'>+	if (!test_and_clear_bit(BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE,</div><div class='add'>+				&amp;block_group-&gt;runtime_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * While rebuilding the free space tree we may allocate new metadata</div><div class='add'>+	 * block groups while modifying the free space tree.</div><div class='add'>+	 *</div><div class='add'>+	 * Because during the rebuild (at btrfs_rebuild_free_space_tree()) we</div><div class='add'>+	 * can use multiple transactions, every time btrfs_end_transaction() is</div><div class='add'>+	 * called at btrfs_rebuild_free_space_tree() we finish the creation of</div><div class='add'>+	 * new block groups by calling btrfs_create_pending_block_groups(), and</div><div class='add'>+	 * that in turn calls us, through add_block_group_free_space(), to add</div><div class='add'>+	 * a free space info item and a free space extent item for the block</div><div class='add'>+	 * group.</div><div class='add'>+	 *</div><div class='add'>+	 * Then later btrfs_rebuild_free_space_tree() may find such new block</div><div class='add'>+	 * groups and processes them with populate_free_space_tree(), which can</div><div class='add'>+	 * fail with EEXIST since there are already items for the block group in</div><div class='add'>+	 * the free space tree. Notice that we say "may find" because a new</div><div class='add'>+	 * block group may be added to the block groups rbtree in a node before</div><div class='add'>+	 * or after the block group currently being processed by the rebuild</div><div class='add'>+	 * process. So signal the rebuild process to skip such new block groups</div><div class='add'>+	 * if it finds them.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(BLOCK_GROUP_FLAG_FREE_SPACE_ADDED, &amp;block_group-&gt;runtime_flags);</div><div class='add'>+</div><div class='add'>+	if (!path) {</div><div class='add'>+		path = btrfs_alloc_path();</div><div class='add'>+		if (unlikely(!path)) {</div><div class='add'>+			btrfs_abort_transaction(trans, -ENOMEM);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		own_path = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = add_new_free_space_info(trans, block_group, path);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, block_group, path,</div><div class='add'>+					     block_group-&gt;start, block_group-&gt;length);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> </div><div class='del'>-	return __add_to_free_space_tree(trans, block_group, path,</div><div class='del'>-					block_group-&gt;start,</div><div class='del'>-					block_group-&gt;length);</div><div class='add'>+out:</div><div class='add'>+	if (own_path)</div><div class='add'>+		btrfs_free_path(path);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int add_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='del'>-			       struct btrfs_block_group *block_group)</div><div class='add'>+int btrfs_add_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='add'>+				     struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE))</div><div class='add'>+	if (!btrfs_fs_compat_ro(trans-&gt;fs_info, FREE_SPACE_TREE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-	if (!test_bit(BLOCK_GROUP_FLAG_NEEDS_FREE_SPACE, &amp;block_group-&gt;runtime_flags))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __add_block_group_free_space(trans, block_group, path);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	ret = __add_block_group_free_space(trans, block_group, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;block_group-&gt;free_space_lock);</div><div class='del'>-	if (ret)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group)</div><div class='add'>+int btrfs_remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = btrfs_free_space_root(block_group);</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key, found_key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	u64 start, end;</div><div class='hunk'>@@ -1417,9 +1472,10 @@ int remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='add'>+	if (unlikely(!path)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	start = block_group-&gt;start;</div><div class='hunk'>@@ -1431,8 +1487,10 @@ int remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	while (!done) {</div><div class='ctx'> 		ret = btrfs_search_prev_slot(trans, root, &amp;key, path, -1, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		nr = 0;</div><div class='hunk'>@@ -1460,16 +1518,15 @@ int remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, path-&gt;slots[0], nr);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	if (ret)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1481,7 +1538,7 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	int prev_bit = 0, bit;</div><div class='add'>+	bool prev_bit_set = false;</div><div class='ctx'> 	/* Initialize to silence GCC. */</div><div class='ctx'> 	u64 extent_start = 0;</div><div class='ctx'> 	u64 end, offset;</div><div class='hunk'>@@ -1498,7 +1555,7 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		ret = btrfs_next_item(root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1512,10 +1569,12 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> </div><div class='ctx'> 		offset = key.objectid;</div><div class='ctx'> 		while (offset &lt; key.objectid + key.offset) {</div><div class='del'>-			bit = free_space_test_bit(block_group, path, offset);</div><div class='del'>-			if (prev_bit == 0 &amp;&amp; bit == 1) {</div><div class='add'>+			bool bit_set;</div><div class='add'>+</div><div class='add'>+			bit_set = btrfs_free_space_test_bit(block_group, path, offset);</div><div class='add'>+			if (!prev_bit_set &amp;&amp; bit_set) {</div><div class='ctx'> 				extent_start = offset;</div><div class='del'>-			} else if (prev_bit == 1 &amp;&amp; bit == 0) {</div><div class='add'>+			} else if (prev_bit_set &amp;&amp; !bit_set) {</div><div class='ctx'> 				u64 space_added;</div><div class='ctx'> </div><div class='ctx'> 				ret = btrfs_add_new_free_space(block_group,</div><div class='hunk'>@@ -1523,7 +1582,7 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> 							       offset,</div><div class='ctx'> 							       &amp;space_added);</div><div class='ctx'> 				if (ret)</div><div class='del'>-					goto out;</div><div class='add'>+					return ret;</div><div class='ctx'> 				total_found += space_added;</div><div class='ctx'> 				if (total_found &gt; CACHING_CTL_WAKE_UP) {</div><div class='ctx'> 					total_found = 0;</div><div class='hunk'>@@ -1531,30 +1590,27 @@ static int load_free_space_bitmaps(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> 				}</div><div class='ctx'> 				extent_count++;</div><div class='ctx'> 			}</div><div class='del'>-			prev_bit = bit;</div><div class='add'>+			prev_bit_set = bit_set;</div><div class='ctx'> 			offset += fs_info-&gt;sectorsize;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (prev_bit == 1) {</div><div class='add'>+	if (prev_bit_set) {</div><div class='ctx'> 		ret = btrfs_add_new_free_space(block_group, extent_start, end, NULL);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		extent_count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (extent_count != expected_extent_count) {</div><div class='add'>+	if (unlikely(extent_count != expected_extent_count)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "incorrect extent count for %llu; counted %u, expected %u",</div><div class='ctx'> 			  block_group-&gt;start, extent_count,</div><div class='ctx'> 			  expected_extent_count);</div><div class='del'>-		ASSERT(0);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int load_free_space_extents(struct btrfs_caching_control *caching_ctl,</div><div class='hunk'>@@ -1581,7 +1637,7 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_next_item(root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1597,7 +1653,7 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> 					       key.objectid + key.offset,</div><div class='ctx'> 					       &amp;space_added);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		total_found += space_added;</div><div class='ctx'> 		if (total_found &gt; CACHING_CTL_WAKE_UP) {</div><div class='ctx'> 			total_found = 0;</div><div class='hunk'>@@ -1606,28 +1662,24 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl,</div><div class='ctx'> 		extent_count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (extent_count != expected_extent_count) {</div><div class='add'>+	if (unlikely(extent_count != expected_extent_count)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "incorrect extent count for %llu; counted %u, expected %u",</div><div class='ctx'> 			  block_group-&gt;start, extent_count,</div><div class='ctx'> 			  expected_extent_count);</div><div class='del'>-		ASSERT(0);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int load_free_space_tree(struct btrfs_caching_control *caching_ctl)</div><div class='add'>+int btrfs_load_free_space_tree(struct btrfs_caching_control *caching_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='ctx'> 	struct btrfs_free_space_info *info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	u32 extent_count, flags;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	block_group = caching_ctl-&gt;block_group;</div><div class='ctx'> </div><div class='hunk'>@@ -1639,15 +1691,14 @@ int load_free_space_tree(struct btrfs_caching_control *caching_ctl)</div><div class='ctx'> 	 * Just like caching_thread() doesn't want to deadlock on the extent</div><div class='ctx'> 	 * tree, we don't want to deadlock on the free space tree.</div><div class='ctx'> 	 */</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(NULL, block_group, path, 0);</div><div class='del'>-	if (IS_ERR(info)) {</div><div class='del'>-		ret = PTR_ERR(info);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	info = btrfs_search_free_space_info(NULL, block_group, path, 0);</div><div class='add'>+	if (IS_ERR(info))</div><div class='add'>+		return PTR_ERR(info);</div><div class='add'>+</div><div class='ctx'> 	extent_count = btrfs_free_space_extent_count(path-&gt;nodes[0], info);</div><div class='ctx'> 	flags = btrfs_free_space_flags(path-&gt;nodes[0], info);</div><div class='ctx'> </div><div class='hunk'>@@ -1657,11 +1708,7 @@ int load_free_space_tree(struct btrfs_caching_control *caching_ctl)</div><div class='ctx'> 	 * there.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS)</div><div class='del'>-		ret = load_free_space_bitmaps(caching_ctl, path, extent_count);</div><div class='add'>+		return load_free_space_bitmaps(caching_ctl, path, extent_count);</div><div class='ctx'> 	else</div><div class='del'>-		ret = load_free_space_extents(caching_ctl, path, extent_count);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+		return load_free_space_extents(caching_ctl, path, extent_count);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/free-space-tree.h b/fs/btrfs/free-space-tree.h<br/>index 6d5551d0ced8..3d9a5d4477fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/free-space-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/free-space-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/free-space-tree.h</a></div><div class='hunk'>@@ -6,7 +6,13 @@</div><div class='ctx'> #ifndef BTRFS_FREE_SPACE_TREE_H</div><div class='ctx'> #define BTRFS_FREE_SPACE_TREE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='ctx'> struct btrfs_caching_control;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The default size for new free space bitmap items. The last bitmap in a block</div><div class='hunk'>@@ -16,39 +22,39 @@ struct btrfs_caching_control;</div><div class='ctx'> #define BTRFS_FREE_SPACE_BITMAP_SIZE 256</div><div class='ctx'> #define BTRFS_FREE_SPACE_BITMAP_BITS (BTRFS_FREE_SPACE_BITMAP_SIZE * BITS_PER_BYTE)</div><div class='ctx'> </div><div class='del'>-void set_free_space_tree_thresholds(struct btrfs_block_group *block_group);</div><div class='add'>+void btrfs_set_free_space_tree_thresholds(struct btrfs_block_group *block_group);</div><div class='ctx'> int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_delete_free_space_tree(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info);</div><div class='del'>-int load_free_space_tree(struct btrfs_caching_control *caching_ctl);</div><div class='del'>-int add_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='del'>-			       struct btrfs_block_group *block_group);</div><div class='del'>-int remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group);</div><div class='del'>-int add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-			   u64 start, u64 size);</div><div class='del'>-int remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-				u64 start, u64 size);</div><div class='add'>+int btrfs_load_free_space_tree(struct btrfs_caching_control *caching_ctl);</div><div class='add'>+int btrfs_add_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='add'>+				     struct btrfs_block_group *block_group);</div><div class='add'>+int btrfs_remove_block_group_free_space(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group);</div><div class='add'>+int btrfs_add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+				 u64 start, u64 size);</div><div class='add'>+int btrfs_remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+				      u64 start, u64 size);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> struct btrfs_free_space_info *</div><div class='del'>-search_free_space_info(struct btrfs_trans_handle *trans,</div><div class='del'>-		       struct btrfs_block_group *block_group,</div><div class='del'>-		       struct btrfs_path *path, int cow);</div><div class='del'>-int __add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+btrfs_search_free_space_info(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_block_group *block_group,</div><div class='del'>-			     struct btrfs_path *path, u64 start, u64 size);</div><div class='del'>-int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group,</div><div class='del'>-				  struct btrfs_path *path, u64 start, u64 size);</div><div class='del'>-int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group,</div><div class='del'>-				  struct btrfs_path *path);</div><div class='del'>-int convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_block_group *block_group,</div><div class='del'>-				  struct btrfs_path *path);</div><div class='del'>-int free_space_test_bit(struct btrfs_block_group *block_group,</div><div class='del'>-			struct btrfs_path *path, u64 offset);</div><div class='add'>+			     struct btrfs_path *path, int cow);</div><div class='add'>+int __btrfs_add_to_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+				   struct btrfs_block_group *block_group,</div><div class='add'>+				   struct btrfs_path *path, u64 start, u64 size);</div><div class='add'>+int __btrfs_remove_from_free_space_tree(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group,</div><div class='add'>+					struct btrfs_path *path, u64 start, u64 size);</div><div class='add'>+int btrfs_convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group,</div><div class='add'>+					struct btrfs_path *path);</div><div class='add'>+int btrfs_convert_free_space_to_extents(struct btrfs_trans_handle *trans,</div><div class='add'>+					struct btrfs_block_group *block_group,</div><div class='add'>+					struct btrfs_path *path);</div><div class='add'>+bool btrfs_free_space_test_bit(struct btrfs_block_group *block_group,</div><div class='add'>+			       struct btrfs_path *path, u64 offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/fs.c b/fs/btrfs/fs.c<br/>index 31c1648bc0b4..feb0a2faa837 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/fs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/fs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/fs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/fs.c</a></div><div class='hunk'>@@ -1,9 +1,186 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "ctree.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='add'>+#include "volumes.h"</div><div class='add'>+</div><div class='add'>+static const struct btrfs_csums {</div><div class='add'>+	u16		size;</div><div class='add'>+	const char	name[10];</div><div class='add'>+	const char	driver[12];</div><div class='add'>+} btrfs_csums[] = {</div><div class='add'>+	[BTRFS_CSUM_TYPE_CRC32] = { .size = 4, .name = "crc32c" },</div><div class='add'>+	[BTRFS_CSUM_TYPE_XXHASH] = { .size = 8, .name = "xxhash64" },</div><div class='add'>+	[BTRFS_CSUM_TYPE_SHA256] = { .size = 32, .name = "sha256" },</div><div class='add'>+	[BTRFS_CSUM_TYPE_BLAKE2] = { .size = 32, .name = "blake2b",</div><div class='add'>+				     .driver = "blake2b-256" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This exists for btrfs-progs usages. */</div><div class='add'>+u16 btrfs_csum_type_size(u16 type)</div><div class='add'>+{</div><div class='add'>+	return btrfs_csums[type].size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_super_csum_size(const struct btrfs_super_block *s)</div><div class='add'>+{</div><div class='add'>+	u16 t = btrfs_super_csum_type(s);</div><div class='add'>+</div><div class='add'>+	/* csum type is validated at mount time. */</div><div class='add'>+	return btrfs_csum_type_size(t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *btrfs_super_csum_name(u16 csum_type)</div><div class='add'>+{</div><div class='add'>+	/* csum type is validated at mount time. */</div><div class='add'>+	return btrfs_csums[csum_type].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return driver name if defined, otherwise the name that's also a valid driver</div><div class='add'>+ * name.</div><div class='add'>+ */</div><div class='add'>+const char *btrfs_super_csum_driver(u16 csum_type)</div><div class='add'>+{</div><div class='add'>+	/* csum type is validated at mount time */</div><div class='add'>+	return btrfs_csums[csum_type].driver[0] ?</div><div class='add'>+		btrfs_csums[csum_type].driver :</div><div class='add'>+		btrfs_csums[csum_type].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t __attribute_const__ btrfs_get_num_csums(void)</div><div class='add'>+{</div><div class='add'>+	return ARRAY_SIZE(btrfs_csums);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We support the following block sizes for all systems:</div><div class='add'>+ *</div><div class='add'>+ * - 4K</div><div class='add'>+ *   This is the most common block size. For PAGE SIZE &gt; 4K cases the subpage</div><div class='add'>+ *   mode is used.</div><div class='add'>+ *</div><div class='add'>+ * - PAGE_SIZE</div><div class='add'>+ *   The straightforward block size to support.</div><div class='add'>+ *</div><div class='add'>+ * And extra support for the following block sizes based on the kernel config:</div><div class='add'>+ *</div><div class='add'>+ * - MIN_BLOCKSIZE</div><div class='add'>+ *   This is either 4K (regular builds) or 2K (debug builds)</div><div class='add'>+ *   This allows testing subpage routines on x86_64.</div><div class='add'>+ */</div><div class='add'>+bool __attribute_const__ btrfs_supported_blocksize(u32 blocksize)</div><div class='add'>+{</div><div class='add'>+	/* @blocksize should be validated first. */</div><div class='add'>+	ASSERT(is_power_of_2(blocksize) &amp;&amp; blocksize &gt;= BTRFS_MIN_BLOCKSIZE &amp;&amp;</div><div class='add'>+	       blocksize &lt;= BTRFS_MAX_BLOCKSIZE);</div><div class='add'>+</div><div class='add'>+	if (blocksize == PAGE_SIZE || blocksize == SZ_4K || blocksize == BTRFS_MIN_BLOCKSIZE)</div><div class='add'>+		return true;</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	/*</div><div class='add'>+	 * For bs &gt; ps support it's done by specifying a minimal folio order</div><div class='add'>+	 * for filemap, thus implying large data folios.</div><div class='add'>+	 * For HIGHMEM systems, we can not always access the content of a (large)</div><div class='add'>+	 * folio in one go, but go through them page by page.</div><div class='add'>+	 *</div><div class='add'>+	 * A lot of features don't implement a proper PAGE sized loop for large</div><div class='add'>+	 * folios, this includes:</div><div class='add'>+	 *</div><div class='add'>+	 * - compression</div><div class='add'>+	 * - verity</div><div class='add'>+	 * - encoded write</div><div class='add'>+	 *</div><div class='add'>+	 * Considering HIGHMEM is such a pain to deal with and it's going</div><div class='add'>+	 * to be deprecated eventually, just reject HIGHMEM &amp;&amp; bs &gt; ps cases.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ENABLED(CONFIG_HIGHMEM) &amp;&amp; blocksize &gt; PAGE_SIZE)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+#endif</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Start exclusive operation @type, return true on success.</div><div class='add'>+ */</div><div class='add'>+bool btrfs_exclop_start(struct btrfs_fs_info *fs_info,</div><div class='add'>+			enum btrfs_exclusive_operation type)</div><div class='add'>+{</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+	if (fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_NONE) {</div><div class='add'>+		fs_info-&gt;exclusive_operation = type;</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Conditionally allow to enter the exclusive operation in case it's compatible</div><div class='add'>+ * with the running one.  This must be paired with btrfs_exclop_start_unlock()</div><div class='add'>+ * and btrfs_exclop_finish().</div><div class='add'>+ *</div><div class='add'>+ * Compatibility:</div><div class='add'>+ * - the same type is already running</div><div class='add'>+ * - when trying to add a device and balance has been paused</div><div class='add'>+ * - not BTRFS_EXCLOP_NONE - this is intentionally incompatible and the caller</div><div class='add'>+ *   must check the condition first that would allow none -&gt; @type</div><div class='add'>+ */</div><div class='add'>+bool btrfs_exclop_start_try_lock(struct btrfs_fs_info *fs_info,</div><div class='add'>+				 enum btrfs_exclusive_operation type)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+	if (fs_info-&gt;exclusive_operation == type ||</div><div class='add'>+	    (fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED &amp;&amp;</div><div class='add'>+	     type == BTRFS_EXCLOP_DEV_ADD))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_exclop_start_unlock(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_exclop_finish(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+	WRITE_ONCE(fs_info-&gt;exclusive_operation, BTRFS_EXCLOP_NONE);</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+	sysfs_notify(&amp;fs_info-&gt;fs_devices-&gt;fsid_kobj, NULL, "exclusive_operation");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_exclop_balance(struct btrfs_fs_info *fs_info,</div><div class='add'>+			  enum btrfs_exclusive_operation op)</div><div class='add'>+{</div><div class='add'>+	switch (op) {</div><div class='add'>+	case BTRFS_EXCLOP_BALANCE_PAUSED:</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+		ASSERT(fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE ||</div><div class='add'>+		       fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_DEV_ADD ||</div><div class='add'>+		       fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_NONE ||</div><div class='add'>+		       fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED);</div><div class='add'>+		fs_info-&gt;exclusive_operation = BTRFS_EXCLOP_BALANCE_PAUSED;</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+		break;</div><div class='add'>+	case BTRFS_EXCLOP_BALANCE:</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+		ASSERT(fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED);</div><div class='add'>+		fs_info-&gt;exclusive_operation = BTRFS_EXCLOP_BALANCE;</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='add'>+			"invalid exclop balance operation %d requested", op);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,</div><div class='ctx'> 			     const char *name)</div><div class='head'>diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h<br/>index f8bb73d6ab68..0f7e1ef27891 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/fs.h</a></div><div class='hunk'>@@ -4,13 +4,63 @@</div><div class='ctx'> #define BTRFS_FS_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/btrfs_tree.h&gt;</div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/time64.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/math.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/percpu_counter.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/radix-tree.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/wait_bit.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> #include "extent-io-tree.h"</div><div class='del'>-#include "extent_map.h"</div><div class='ctx'> #include "async-thread.h"</div><div class='ctx'> #include "block-rsv.h"</div><div class='add'>+#include "messages.h"</div><div class='add'>+</div><div class='add'>+struct inode;</div><div class='add'>+struct super_block;</div><div class='add'>+struct kobject;</div><div class='add'>+struct reloc_control;</div><div class='add'>+struct crypto_shash;</div><div class='add'>+struct ulist;</div><div class='add'>+struct btrfs_device;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_fs_devices;</div><div class='add'>+struct btrfs_transaction;</div><div class='add'>+struct btrfs_delayed_root;</div><div class='add'>+struct btrfs_balance_control;</div><div class='add'>+struct btrfs_subpage_info;</div><div class='add'>+struct btrfs_stripe_hash_table;</div><div class='add'>+struct btrfs_space_info;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Minimum data and metadata block size.</div><div class='add'>+ *</div><div class='add'>+ * Normally it's 4K, but for testing subpage block size on 4K page systems, we</div><div class='add'>+ * allow DEBUG builds to accept 2K page size.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+#define BTRFS_MIN_BLOCKSIZE	(SZ_2K)</div><div class='add'>+#else</div><div class='add'>+#define BTRFS_MIN_BLOCKSIZE	(SZ_4K)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define BTRFS_MAX_BLOCKSIZE	(SZ_64K)</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_MAX_EXTENT_SIZE SZ_128M</div><div class='ctx'> </div><div class='hunk'>@@ -24,6 +74,13 @@</div><div class='ctx'> #define BTRFS_SUPER_INFO_SIZE			4096</div><div class='ctx'> static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);</div><div class='ctx'> </div><div class='add'>+/* Array of bytes with variable length, hexadecimal format 0x1234 */</div><div class='add'>+#define BTRFS_CSUM_FMT				"0x%*phN"</div><div class='add'>+#define BTRFS_CSUM_FMT_VALUE(size, bytes)	size, bytes</div><div class='add'>+</div><div class='add'>+#define BTRFS_KEY_FMT			"(%llu %u %llu)"</div><div class='add'>+#define BTRFS_KEY_FMT_VALUE(key)	(key)-&gt;objectid, (key)-&gt;type, (key)-&gt;offset</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Number of metadata items necessary for an unlink operation:</div><div class='ctx'>  *</div><div class='hunk'>@@ -55,6 +112,8 @@ enum {</div><div class='ctx'> 	BTRFS_FS_STATE_RO,</div><div class='ctx'> 	/* Track if a transaction abort has been reported on this filesystem */</div><div class='ctx'> 	BTRFS_FS_STATE_TRANS_ABORTED,</div><div class='add'>+	/* Track if log replay has failed. */</div><div class='add'>+	BTRFS_FS_STATE_LOG_REPLAY_ABORTED,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bio operations should be blocked on this filesystem because a source</div><div class='ctx'> 	 * or target device is being destroyed as part of a device replace</div><div class='hunk'>@@ -63,11 +122,22 @@ enum {</div><div class='ctx'> 	/* The btrfs_fs_info created for self-tests */</div><div class='ctx'> 	BTRFS_FS_STATE_DUMMY_FS_INFO,</div><div class='ctx'> </div><div class='del'>-	BTRFS_FS_STATE_NO_CSUMS,</div><div class='add'>+	/* Checksum errors are ignored. */</div><div class='add'>+	BTRFS_FS_STATE_NO_DATA_CSUMS,</div><div class='add'>+	BTRFS_FS_STATE_SKIP_META_CSUMS,</div><div class='ctx'> </div><div class='ctx'> 	/* Indicates there was an error cleaning up a log tree. */</div><div class='ctx'> 	BTRFS_FS_STATE_LOG_CLEANUP_ERROR,</div><div class='ctx'> </div><div class='add'>+	/* No more delayed iput can be queued. */</div><div class='add'>+	BTRFS_FS_STATE_NO_DELAYED_IPUT,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Emergency shutdown, a step further than transaction aborted by</div><div class='add'>+	 * rejecting all operations.</div><div class='add'>+	 */</div><div class='add'>+	BTRFS_FS_STATE_EMERGENCY_SHUTDOWN,</div><div class='add'>+</div><div class='ctx'> 	BTRFS_FS_STATE_COUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -158,37 +228,40 @@ enum {</div><div class='ctx'>  * Note: don't forget to add new options to btrfs_show_options()</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='del'>-	BTRFS_MOUNT_NODATASUM			= (1UL &lt;&lt; 0),</div><div class='del'>-	BTRFS_MOUNT_NODATACOW			= (1UL &lt;&lt; 1),</div><div class='del'>-	BTRFS_MOUNT_NOBARRIER			= (1UL &lt;&lt; 2),</div><div class='del'>-	BTRFS_MOUNT_SSD				= (1UL &lt;&lt; 3),</div><div class='del'>-	BTRFS_MOUNT_DEGRADED			= (1UL &lt;&lt; 4),</div><div class='del'>-	BTRFS_MOUNT_COMPRESS			= (1UL &lt;&lt; 5),</div><div class='del'>-	BTRFS_MOUNT_NOTREELOG   		= (1UL &lt;&lt; 6),</div><div class='del'>-	BTRFS_MOUNT_FLUSHONCOMMIT		= (1UL &lt;&lt; 7),</div><div class='del'>-	BTRFS_MOUNT_SSD_SPREAD			= (1UL &lt;&lt; 8),</div><div class='del'>-	BTRFS_MOUNT_NOSSD			= (1UL &lt;&lt; 9),</div><div class='del'>-	BTRFS_MOUNT_DISCARD_SYNC		= (1UL &lt;&lt; 10),</div><div class='del'>-	BTRFS_MOUNT_FORCE_COMPRESS      	= (1UL &lt;&lt; 11),</div><div class='del'>-	BTRFS_MOUNT_SPACE_CACHE			= (1UL &lt;&lt; 12),</div><div class='del'>-	BTRFS_MOUNT_CLEAR_CACHE			= (1UL &lt;&lt; 13),</div><div class='del'>-	BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED	= (1UL &lt;&lt; 14),</div><div class='del'>-	BTRFS_MOUNT_ENOSPC_DEBUG		= (1UL &lt;&lt; 15),</div><div class='del'>-	BTRFS_MOUNT_AUTO_DEFRAG			= (1UL &lt;&lt; 16),</div><div class='del'>-	BTRFS_MOUNT_USEBACKUPROOT		= (1UL &lt;&lt; 17),</div><div class='del'>-	BTRFS_MOUNT_SKIP_BALANCE		= (1UL &lt;&lt; 18),</div><div class='del'>-	BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	= (1UL &lt;&lt; 19),</div><div class='del'>-	BTRFS_MOUNT_RESCAN_UUID_TREE		= (1UL &lt;&lt; 20),</div><div class='del'>-	BTRFS_MOUNT_FRAGMENT_DATA		= (1UL &lt;&lt; 21),</div><div class='del'>-	BTRFS_MOUNT_FRAGMENT_METADATA		= (1UL &lt;&lt; 22),</div><div class='del'>-	BTRFS_MOUNT_FREE_SPACE_TREE		= (1UL &lt;&lt; 23),</div><div class='del'>-	BTRFS_MOUNT_NOLOGREPLAY			= (1UL &lt;&lt; 24),</div><div class='del'>-	BTRFS_MOUNT_REF_VERIFY			= (1UL &lt;&lt; 25),</div><div class='del'>-	BTRFS_MOUNT_DISCARD_ASYNC		= (1UL &lt;&lt; 26),</div><div class='del'>-	BTRFS_MOUNT_IGNOREBADROOTS		= (1UL &lt;&lt; 27),</div><div class='del'>-	BTRFS_MOUNT_IGNOREDATACSUMS		= (1UL &lt;&lt; 28),</div><div class='del'>-	BTRFS_MOUNT_NODISCARD			= (1UL &lt;&lt; 29),</div><div class='del'>-	BTRFS_MOUNT_NOSPACECACHE		= (1UL &lt;&lt; 30),</div><div class='add'>+	BTRFS_MOUNT_NODATASUM			= (1ULL &lt;&lt; 0),</div><div class='add'>+	BTRFS_MOUNT_NODATACOW			= (1ULL &lt;&lt; 1),</div><div class='add'>+	BTRFS_MOUNT_NOBARRIER			= (1ULL &lt;&lt; 2),</div><div class='add'>+	BTRFS_MOUNT_SSD				= (1ULL &lt;&lt; 3),</div><div class='add'>+	BTRFS_MOUNT_DEGRADED			= (1ULL &lt;&lt; 4),</div><div class='add'>+	BTRFS_MOUNT_COMPRESS			= (1ULL &lt;&lt; 5),</div><div class='add'>+	BTRFS_MOUNT_NOTREELOG			= (1ULL &lt;&lt; 6),</div><div class='add'>+	BTRFS_MOUNT_FLUSHONCOMMIT		= (1ULL &lt;&lt; 7),</div><div class='add'>+	BTRFS_MOUNT_SSD_SPREAD			= (1ULL &lt;&lt; 8),</div><div class='add'>+	BTRFS_MOUNT_NOSSD			= (1ULL &lt;&lt; 9),</div><div class='add'>+	BTRFS_MOUNT_DISCARD_SYNC		= (1ULL &lt;&lt; 10),</div><div class='add'>+	BTRFS_MOUNT_FORCE_COMPRESS		= (1ULL &lt;&lt; 11),</div><div class='add'>+	BTRFS_MOUNT_SPACE_CACHE			= (1ULL &lt;&lt; 12),</div><div class='add'>+	BTRFS_MOUNT_CLEAR_CACHE			= (1ULL &lt;&lt; 13),</div><div class='add'>+	BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED	= (1ULL &lt;&lt; 14),</div><div class='add'>+	BTRFS_MOUNT_ENOSPC_DEBUG		= (1ULL &lt;&lt; 15),</div><div class='add'>+	BTRFS_MOUNT_AUTO_DEFRAG			= (1ULL &lt;&lt; 16),</div><div class='add'>+	BTRFS_MOUNT_USEBACKUPROOT		= (1ULL &lt;&lt; 17),</div><div class='add'>+	BTRFS_MOUNT_SKIP_BALANCE		= (1ULL &lt;&lt; 18),</div><div class='add'>+	BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	= (1ULL &lt;&lt; 19),</div><div class='add'>+	BTRFS_MOUNT_RESCAN_UUID_TREE		= (1ULL &lt;&lt; 20),</div><div class='add'>+	BTRFS_MOUNT_FRAGMENT_DATA		= (1ULL &lt;&lt; 21),</div><div class='add'>+	BTRFS_MOUNT_FRAGMENT_METADATA		= (1ULL &lt;&lt; 22),</div><div class='add'>+	BTRFS_MOUNT_FREE_SPACE_TREE		= (1ULL &lt;&lt; 23),</div><div class='add'>+	BTRFS_MOUNT_NOLOGREPLAY			= (1ULL &lt;&lt; 24),</div><div class='add'>+	BTRFS_MOUNT_REF_VERIFY			= (1ULL &lt;&lt; 25),</div><div class='add'>+	BTRFS_MOUNT_DISCARD_ASYNC		= (1ULL &lt;&lt; 26),</div><div class='add'>+	BTRFS_MOUNT_IGNOREBADROOTS		= (1ULL &lt;&lt; 27),</div><div class='add'>+	BTRFS_MOUNT_IGNOREDATACSUMS		= (1ULL &lt;&lt; 28),</div><div class='add'>+	BTRFS_MOUNT_NODISCARD			= (1ULL &lt;&lt; 29),</div><div class='add'>+	BTRFS_MOUNT_NOSPACECACHE		= (1ULL &lt;&lt; 30),</div><div class='add'>+	BTRFS_MOUNT_IGNOREMETACSUMS		= (1ULL &lt;&lt; 31),</div><div class='add'>+	BTRFS_MOUNT_IGNORESUPERFLAGS		= (1ULL &lt;&lt; 32),</div><div class='add'>+	BTRFS_MOUNT_REF_TRACKER			= (1ULL &lt;&lt; 33),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -224,10 +297,10 @@ enum {</div><div class='ctx'> 	 BTRFS_FEATURE_INCOMPAT_ZONED		|	\</div><div class='ctx'> 	 BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='ctx'> 	/*</div><div class='del'>-	 * Features under developmen like Extent tree v2 support is enabled</div><div class='del'>-	 * only under CONFIG_BTRFS_DEBUG.</div><div class='add'>+	 * Features under development like Extent tree v2 support is enabled</div><div class='add'>+	 * only under CONFIG_BTRFS_EXPERIMENTAL</div><div class='ctx'> 	 */</div><div class='ctx'> #define BTRFS_FEATURE_INCOMPAT_SUPP		\</div><div class='ctx'> 	(BTRFS_FEATURE_INCOMPAT_SUPP_STABLE |	\</div><div class='hunk'>@@ -246,8 +319,19 @@ enum {</div><div class='ctx'> #define BTRFS_FEATURE_INCOMPAT_SAFE_CLEAR		0ULL</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_DEFAULT_COMMIT_INTERVAL	(30)</div><div class='add'>+#define BTRFS_WARNING_COMMIT_INTERVAL	(300)</div><div class='ctx'> #define BTRFS_DEFAULT_MAX_INLINE	(2048)</div><div class='ctx'> </div><div class='add'>+enum btrfs_compression_type {</div><div class='add'>+	BTRFS_COMPRESS_NONE  = 0,</div><div class='add'>+	BTRFS_COMPRESS_ZLIB  = 1,</div><div class='add'>+	BTRFS_COMPRESS_LZO   = 2,</div><div class='add'>+	BTRFS_COMPRESS_ZSTD  = 3,</div><div class='add'>+	BTRFS_NR_COMPRESS_TYPES = 4,</div><div class='add'>+</div><div class='add'>+	BTRFS_DEFRAG_DONT_COMPRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct btrfs_dev_replace {</div><div class='ctx'> 	/* See #define above */</div><div class='ctx'> 	u64 replace_state;</div><div class='hunk'>@@ -278,6 +362,8 @@ struct btrfs_dev_replace {</div><div class='ctx'> </div><div class='ctx'> 	struct percpu_counter bio_counter;</div><div class='ctx'> 	wait_queue_head_t replace_wait;</div><div class='add'>+</div><div class='add'>+	struct task_struct *replace_task;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -363,6 +449,8 @@ struct btrfs_commit_stats {</div><div class='ctx'> 	u64 last_commit_dur;</div><div class='ctx'> 	/* The total commit duration in ns */</div><div class='ctx'> 	u64 total_commit_dur;</div><div class='add'>+	/* Start of the last critical section in ns. */</div><div class='add'>+	u64 critical_section_start_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct btrfs_fs_info {</div><div class='hunk'>@@ -415,6 +503,8 @@ struct btrfs_fs_info {</div><div class='ctx'> 	struct btrfs_block_rsv delayed_block_rsv;</div><div class='ctx'> 	/* Block reservation for delayed refs */</div><div class='ctx'> 	struct btrfs_block_rsv delayed_refs_rsv;</div><div class='add'>+	/* Block reservation for treelog tree */</div><div class='add'>+	struct btrfs_block_rsv treelog_rsv;</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_block_rsv empty_block_rsv;</div><div class='ctx'> </div><div class='hunk'>@@ -442,10 +532,13 @@ struct btrfs_fs_info {</div><div class='ctx'> 	 * required instead of the faster short fsync log commits</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64 last_trans_log_full_commit;</div><div class='del'>-	unsigned long mount_opt;</div><div class='add'>+	unsigned long long mount_opt;</div><div class='ctx'> </div><div class='del'>-	unsigned long compress_type:4;</div><div class='del'>-	unsigned int compress_level;</div><div class='add'>+	/* Compress related structures. */</div><div class='add'>+	void *compr_wsm[BTRFS_NR_COMPRESS_TYPES];</div><div class='add'>+</div><div class='add'>+	int compress_type;</div><div class='add'>+	int compress_level;</div><div class='ctx'> 	u32 commit_interval;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It is a suggestive number, the read side is safe even it gets a</div><div class='hunk'>@@ -565,7 +658,6 @@ struct btrfs_fs_info {</div><div class='ctx'> 	struct workqueue_struct *endio_workers;</div><div class='ctx'> 	struct workqueue_struct *endio_meta_workers;</div><div class='ctx'> 	struct workqueue_struct *rmw_workers;</div><div class='del'>-	struct workqueue_struct *compressed_write_workers;</div><div class='ctx'> 	struct btrfs_workqueue *endio_write_workers;</div><div class='ctx'> 	struct btrfs_workqueue *endio_freespace_worker;</div><div class='ctx'> 	struct btrfs_workqueue *caching_workers;</div><div class='hunk'>@@ -586,6 +678,9 @@ struct btrfs_fs_info {</div><div class='ctx'> 	struct kobject *qgroups_kobj;</div><div class='ctx'> 	struct kobject *discard_kobj;</div><div class='ctx'> </div><div class='add'>+	/* Track the number of blocks (sectors) read by the filesystem. */</div><div class='add'>+	struct percpu_counter stats_read_blocks;</div><div class='add'>+</div><div class='ctx'> 	/* Used to keep from writing metadata until there is a nice batch */</div><div class='ctx'> 	struct percpu_counter dirty_metadata_bytes;</div><div class='ctx'> 	struct percpu_counter delalloc_bytes;</div><div class='hunk'>@@ -593,6 +688,12 @@ struct btrfs_fs_info {</div><div class='ctx'> 	s32 dirty_metadata_batch;</div><div class='ctx'> 	s32 delalloc_batch;</div><div class='ctx'> </div><div class='add'>+	struct percpu_counter evictable_extent_maps;</div><div class='add'>+	u64 em_shrinker_last_root;</div><div class='add'>+	u64 em_shrinker_last_ino;</div><div class='add'>+	atomic64_t em_shrinker_nr_to_scan;</div><div class='add'>+	struct work_struct em_shrinker_work;</div><div class='add'>+</div><div class='ctx'> 	/* Protected by 'trans_lock'. */</div><div class='ctx'> 	struct list_head dirty_cowonly_roots;</div><div class='ctx'> </div><div class='hunk'>@@ -645,8 +746,6 @@ struct btrfs_fs_info {</div><div class='ctx'> 	u32 data_chunk_allocations;</div><div class='ctx'> 	u32 metadata_ratio;</div><div class='ctx'> </div><div class='del'>-	void *bdev_holder;</div><div class='del'>-</div><div class='ctx'> 	/* Private scrub information */</div><div class='ctx'> 	struct mutex scrub_lock;</div><div class='ctx'> 	atomic_t scrubs_running;</div><div class='hunk'>@@ -660,7 +759,6 @@ struct btrfs_fs_info {</div><div class='ctx'> 	 */</div><div class='ctx'> 	refcount_t scrub_workers_refcnt;</div><div class='ctx'> 	struct workqueue_struct *scrub_workers;</div><div class='del'>-	struct btrfs_subpage_info *subpage_info;</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_discard_ctl discard_ctl;</div><div class='ctx'> </div><div class='hunk'>@@ -672,12 +770,6 @@ struct btrfs_fs_info {</div><div class='ctx'> 	spinlock_t qgroup_lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Used to avoid frequently calling ulist_alloc()/ulist_free()</div><div class='del'>-	 * when doing qgroup accounting, it must be protected by qgroup_lock.</div><div class='del'>-	 */</div><div class='del'>-	struct ulist *qgroup_ulist;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Protect user change for quota operations. If a transaction is needed,</div><div class='ctx'> 	 * it must be started before locking this lock.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -712,10 +804,8 @@ struct btrfs_fs_info {</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_delayed_root *delayed_root;</div><div class='ctx'> </div><div class='del'>-	/* Extent buffer radix tree */</div><div class='del'>-	spinlock_t buffer_lock;</div><div class='del'>-	/* Entries are eb-&gt;start / sectorsize */</div><div class='del'>-	struct radix_tree_root buffer_radix;</div><div class='add'>+	/* Entries are eb-&gt;start &gt;&gt; nodesize_bits */</div><div class='add'>+	struct xarray buffer_tree;</div><div class='ctx'> </div><div class='ctx'> 	/* Next backup root to be overwritten */</div><div class='ctx'> 	int backup_root_index;</div><div class='hunk'>@@ -732,10 +822,13 @@ struct btrfs_fs_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Reclaim partially filled block groups in the background */</div><div class='ctx'> 	struct work_struct reclaim_bgs_work;</div><div class='add'>+	/* Protected by unused_bgs_lock. */</div><div class='ctx'> 	struct list_head reclaim_bgs;</div><div class='ctx'> 	int bg_reclaim_threshold;</div><div class='ctx'> </div><div class='add'>+	/* Protects the lists unused_bgs and reclaim_bgs. */</div><div class='ctx'> 	spinlock_t unused_bgs_lock;</div><div class='add'>+	/* Protected by unused_bgs_lock. */</div><div class='ctx'> 	struct list_head unused_bgs;</div><div class='ctx'> 	struct mutex unused_bg_unpin_mutex;</div><div class='ctx'> 	/* Protect block groups that are going to be deleted */</div><div class='hunk'>@@ -743,9 +836,12 @@ struct btrfs_fs_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Cached block sizes */</div><div class='ctx'> 	u32 nodesize;</div><div class='add'>+	u32 nodesize_bits;</div><div class='ctx'> 	u32 sectorsize;</div><div class='ctx'> 	/* ilog2 of sectorsize, use to avoid 64bit division */</div><div class='ctx'> 	u32 sectorsize_bits;</div><div class='add'>+	u32 block_min_order;</div><div class='add'>+	u32 block_max_order;</div><div class='ctx'> 	u32 csum_size;</div><div class='ctx'> 	u32 csums_per_leaf;</div><div class='ctx'> 	u32 stripesize;</div><div class='hunk'>@@ -815,12 +911,10 @@ struct btrfs_fs_info {</div><div class='ctx'> 	struct lockdep_map btrfs_trans_pending_ordered_map;</div><div class='ctx'> 	struct lockdep_map btrfs_ordered_extent_map;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	spinlock_t ref_verify_lock;</div><div class='ctx'> 	struct rb_root block_tree;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	struct kobject *debug_kobj;</div><div class='ctx'> 	struct list_head allocated_roots;</div><div class='ctx'> </div><div class='hunk'>@@ -829,6 +923,25 @@ struct btrfs_fs_info {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define folio_to_inode(_folio)	(BTRFS_I(_Generic((_folio),			\</div><div class='add'>+					  struct folio *: (_folio))-&gt;mapping-&gt;host))</div><div class='add'>+</div><div class='add'>+#define folio_to_fs_info(_folio) (folio_to_inode(_folio)-&gt;root-&gt;fs_info)</div><div class='add'>+</div><div class='add'>+#define inode_to_fs_info(_inode) (BTRFS_I(_Generic((_inode),			\</div><div class='add'>+					   struct inode *: (_inode)))-&gt;root-&gt;fs_info)</div><div class='add'>+</div><div class='add'>+static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	return mapping_gfp_constraint(mapping, ~__GFP_FS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the minimal folio size of the fs. */</div><div class='add'>+static inline unsigned int btrfs_min_folio_size(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	return 1U &lt;&lt; (PAGE_SHIFT + fs_info-&gt;block_min_order);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u64 btrfs_get_fs_generation(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return READ_ONCE(fs_info-&gt;generation);</div><div class='hunk'>@@ -895,6 +1008,8 @@ static inline u64 btrfs_calc_metadata_size(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> #define BTRFS_MAX_EXTENT_ITEM_SIZE(r) ((BTRFS_LEAF_DATA_SIZE(r-&gt;fs_info) &gt;&gt; 4) - \</div><div class='ctx'> 					sizeof(struct btrfs_item))</div><div class='ctx'> </div><div class='add'>+#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) ((bytes) &gt;&gt; (fs_info)-&gt;sectorsize_bits)</div><div class='add'>+</div><div class='ctx'> static inline bool btrfs_is_zoned(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return IS_ENABLED(CONFIG_BLK_DEV_ZONED) &amp;&amp; fs_info-&gt;zone_size &gt; 0;</div><div class='hunk'>@@ -903,7 +1018,7 @@ static inline bool btrfs_is_zoned(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> /*</div><div class='ctx'>  * Count how many fs_info-&gt;max_extent_size cover the @size</div><div class='ctx'>  */</div><div class='del'>-static inline u32 count_max_extents(struct btrfs_fs_info *fs_info, u64 size)</div><div class='add'>+static inline u32 count_max_extents(const struct btrfs_fs_info *fs_info, u64 size)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> 	if (!fs_info)</div><div class='hunk'>@@ -913,6 +1028,13 @@ static inline u32 count_max_extents(struct btrfs_fs_info *fs_info, u64 size)</div><div class='ctx'> 	return div_u64(size + fs_info-&gt;max_extent_size - 1, fs_info-&gt;max_extent_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int btrfs_blocks_per_folio(const struct btrfs_fs_info *fs_info,</div><div class='add'>+						  const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio_size(folio) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool __attribute_const__ btrfs_supported_blocksize(u32 blocksize);</div><div class='ctx'> bool btrfs_exclop_start(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			enum btrfs_exclusive_operation type);</div><div class='ctx'> bool btrfs_exclop_start_try_lock(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -922,6 +1044,19 @@ void btrfs_exclop_finish(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_exclop_balance(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			  enum btrfs_exclusive_operation op);</div><div class='ctx'> </div><div class='add'>+int btrfs_check_ioctl_vol_args_path(const struct btrfs_ioctl_vol_args *vol_args);</div><div class='add'>+</div><div class='add'>+u16 btrfs_csum_type_size(u16 type);</div><div class='add'>+int btrfs_super_csum_size(const struct btrfs_super_block *s);</div><div class='add'>+const char *btrfs_super_csum_name(u16 csum_type);</div><div class='add'>+const char *btrfs_super_csum_driver(u16 csum_type);</div><div class='add'>+size_t __attribute_const__ btrfs_get_num_csums(void);</div><div class='add'>+</div><div class='add'>+static inline bool btrfs_is_empty_uuid(const u8 *uuid)</div><div class='add'>+{</div><div class='add'>+	return uuid_is_null((const uuid_t *)uuid);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Compatibility and incompatibility defines */</div><div class='ctx'> void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,</div><div class='ctx'> 			     const char *name);</div><div class='hunk'>@@ -962,7 +1097,7 @@ void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag,</div><div class='ctx'> #define btrfs_test_opt(fs_info, opt)	((fs_info)-&gt;mount_opt &amp; \</div><div class='ctx'> 					 BTRFS_MOUNT_##opt)</div><div class='ctx'> </div><div class='del'>-static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline int btrfs_fs_closing(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	/* Do it this way so we only ever do one test_bit in the normal case. */</div><div class='ctx'> 	if (test_bit(BTRFS_FS_CLOSING_START, &amp;fs_info-&gt;flags)) {</div><div class='hunk'>@@ -981,7 +1116,7 @@ static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)</div><div class='ctx'>  * since setting and checking for SB_RDONLY in the superblock's flags is not</div><div class='ctx'>  * atomic.</div><div class='ctx'>  */</div><div class='del'>-static inline int btrfs_need_cleaner_sleep(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline int btrfs_need_cleaner_sleep(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(BTRFS_FS_STATE_RO, &amp;fs_info-&gt;fs_state) ||</div><div class='ctx'> 		btrfs_fs_closing(fs_info);</div><div class='hunk'>@@ -998,13 +1133,42 @@ static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	(unlikely(test_bit(BTRFS_FS_STATE_LOG_CLEANUP_ERROR,		\</div><div class='ctx'> 			   &amp;(fs_info)-&gt;fs_state)))</div><div class='ctx'> </div><div class='add'>+static inline bool btrfs_is_shutdown(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	return test_bit(BTRFS_FS_STATE_EMERGENCY_SHUTDOWN, &amp;fs_info-&gt;fs_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_force_shutdown(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Here we do not want to use handle_fs_error(), which will mark the fs</div><div class='add'>+	 * read-only.</div><div class='add'>+	 * Some call sites like shutdown ioctl will mark the fs shutdown when</div><div class='add'>+	 * the fs is frozen. But thaw path will handle RO and RW fs</div><div class='add'>+	 * differently.</div><div class='add'>+	 *</div><div class='add'>+	 * So here we only mark the fs error without flipping it RO.</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(fs_info-&gt;fs_error, -EIO);</div><div class='add'>+	if (!test_and_set_bit(BTRFS_FS_STATE_EMERGENCY_SHUTDOWN, &amp;fs_info-&gt;fs_state))</div><div class='add'>+		btrfs_crit(fs_info, "emergency shutdown");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We use folio flag owner_2 to indicate there is an ordered extent with</div><div class='add'>+ * unfinished IO.</div><div class='add'>+ */</div><div class='add'>+#define folio_test_ordered(folio)	folio_test_owner_2(folio)</div><div class='add'>+#define folio_set_ordered(folio)	folio_set_owner_2(folio)</div><div class='add'>+#define folio_clear_ordered(folio)	folio_clear_owner_2(folio)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> </div><div class='ctx'> #define EXPORT_FOR_TESTS</div><div class='ctx'> </div><div class='del'>-static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline bool btrfs_is_testing(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state);</div><div class='add'>+	return unlikely(test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_test_destroy_inode(struct inode *inode);</div><div class='hunk'>@@ -1013,9 +1177,9 @@ void btrfs_test_destroy_inode(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> #define EXPORT_FOR_TESTS static</div><div class='ctx'> </div><div class='del'>-static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline bool btrfs_is_testing(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c<br/>index 7d734830e514..b73e1dd97208 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/inode-item.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/inode-item.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/inode-item.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/inode-item.c</a></div><div class='hunk'>@@ -9,13 +9,12 @@</div><div class='ctx'> #include "inode-item.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "transaction.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "space-info.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "extent-tree.h"</div><div class='ctx'> #include "file-item.h"</div><div class='ctx'> </div><div class='del'>-struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf,</div><div class='add'>+struct btrfs_inode_ref *btrfs_find_name_in_backref(const struct extent_buffer *leaf,</div><div class='ctx'> 						   int slot,</div><div class='ctx'> 						   const struct fscrypt_str *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,7 +42,7 @@ struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_inode_extref *btrfs_find_name_in_ext_backref(</div><div class='del'>-		struct extent_buffer *leaf, int slot, u64 ref_objectid,</div><div class='add'>+		const struct extent_buffer *leaf, int slot, u64 ref_objectid,</div><div class='ctx'> 		const struct fscrypt_str *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode_extref *extref;</div><div class='hunk'>@@ -79,13 +78,10 @@ struct btrfs_inode_extref *btrfs_find_name_in_ext_backref(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns NULL if no extref found */</div><div class='del'>-struct btrfs_inode_extref *</div><div class='del'>-btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans,</div><div class='del'>-			  struct btrfs_root *root,</div><div class='del'>-			  struct btrfs_path *path,</div><div class='del'>-			  const struct fscrypt_str *name,</div><div class='del'>-			  u64 inode_objectid, u64 ref_objectid, int ins_len,</div><div class='del'>-			  int cow)</div><div class='add'>+struct btrfs_inode_extref *btrfs_lookup_inode_extref(struct btrfs_root *root,</div><div class='add'>+						     struct btrfs_path *path,</div><div class='add'>+						     const struct fscrypt_str *name,</div><div class='add'>+						     u64 inode_objectid, u64 ref_objectid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -94,7 +90,7 @@ btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	key.type = BTRFS_INODE_EXTREF_KEY;</div><div class='ctx'> 	key.offset = btrfs_extref_hash(ref_objectid, name-&gt;name, name-&gt;len);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_search_slot(trans, root, &amp;key, path, ins_len, cow);</div><div class='add'>+	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -110,7 +106,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				  u64 inode_objectid, u64 ref_objectid,</div><div class='ctx'> 				  u64 *index)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_inode_extref *extref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -130,9 +126,9 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		ret = -ENOENT;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sanity check - did we find the right item for this name?</div><div class='hunk'>@@ -141,10 +137,9 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	extref = btrfs_find_name_in_ext_backref(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='ctx'> 						ref_objectid, name);</div><div class='del'>-	if (!extref) {</div><div class='del'>-		btrfs_handle_fs_error(root-&gt;fs_info, -ENOENT, NULL);</div><div class='del'>-		ret = -EROFS;</div><div class='del'>-		goto out;</div><div class='add'>+	if (unlikely(!extref)) {</div><div class='add'>+		btrfs_abort_transaction(trans, -ENOENT);</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -153,12 +148,8 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		*index = btrfs_inode_extref_index(leaf, extref);</div><div class='ctx'> </div><div class='ctx'> 	if (del_len == item_size) {</div><div class='del'>-		/*</div><div class='del'>-		 * Common case only one ref in the item, remove the</div><div class='del'>-		 * whole item.</div><div class='del'>-		 */</div><div class='del'>-		ret = btrfs_del_item(trans, root, path);</div><div class='del'>-		goto out;</div><div class='add'>+		/* Common case only one ref in the item, remove the whole item. */</div><div class='add'>+		return btrfs_del_item(trans, root, path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ptr = (unsigned long)extref;</div><div class='hunk'>@@ -169,9 +160,6 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	btrfs_truncate_item(trans, path, item_size - del_len, 1);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -192,8 +180,8 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int del_len = name-&gt;len + sizeof(*ref);</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = inode_objectid;</div><div class='del'>-	key.offset = ref_objectid;</div><div class='ctx'> 	key.type = BTRFS_INODE_REF_KEY;</div><div class='add'>+	key.offset = ref_objectid;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -261,7 +249,7 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int ins_len = name-&gt;len + sizeof(*extref);</div><div class='ctx'> 	unsigned long ptr;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> </div><div class='hunk'>@@ -280,13 +268,13 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 						   path-&gt;slots[0],</div><div class='ctx'> 						   ref_objectid,</div><div class='ctx'> 						   name))</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		btrfs_extend_item(trans, path, ins_len);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	ptr = (unsigned long)btrfs_item_ptr(leaf, path-&gt;slots[0], char);</div><div class='hunk'>@@ -299,11 +287,8 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ptr = (unsigned long)&amp;extref-&gt;name;</div><div class='ctx'> 	write_extent_buffer(path-&gt;nodes[0], name-&gt;name, ptr, name-&gt;len);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Will return 0, -ENOMEM, -EMLINK, or -EEXIST or anything from the CoW path */</div><div class='hunk'>@@ -320,14 +305,14 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ins_len = name-&gt;len + sizeof(*ref);</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = inode_objectid;</div><div class='del'>-	key.offset = ref_objectid;</div><div class='ctx'> 	key.type = BTRFS_INODE_REF_KEY;</div><div class='add'>+	key.offset = ref_objectid;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	path-&gt;skip_release_on_error = 1;</div><div class='add'>+	path-&gt;skip_release_on_error = true;</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, &amp;key,</div><div class='ctx'> 				      ins_len);</div><div class='ctx'> 	if (ret == -EEXIST) {</div><div class='hunk'>@@ -364,8 +349,6 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ptr = (unsigned long)(ref + 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	write_extent_buffer(path-&gt;nodes[0], name-&gt;name, ptr, name-&gt;len);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='del'>-</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='hunk'>@@ -424,9 +407,9 @@ int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_trace_truncate(struct btrfs_inode *inode,</div><div class='del'>-					struct extent_buffer *leaf,</div><div class='del'>-					struct btrfs_file_extent_item *fi,</div><div class='add'>+static inline void btrfs_trace_truncate(const struct btrfs_inode *inode,</div><div class='add'>+					const struct extent_buffer *leaf,</div><div class='add'>+					const struct btrfs_file_extent_item *fi,</div><div class='ctx'> 					u64 offset, int extent_type, int slot)</div><div class='ctx'> {</div><div class='ctx'> 	if (!inode)</div><div class='hunk'>@@ -461,7 +444,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_truncate_control *control)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -498,8 +481,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	path-&gt;reada = READA_BACK;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = control-&gt;ino;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	key.type = (u8)-1;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> search_again:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -591,7 +574,6 @@ search_again:</div><div class='ctx'> 				num_dec = (orig_num_bytes - extent_num_bytes);</div><div class='ctx'> 				if (extent_start != 0)</div><div class='ctx'> 					control-&gt;sub_bytes += num_dec;</div><div class='del'>-				btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				extent_num_bytes =</div><div class='ctx'> 					btrfs_file_extent_disk_num_bytes(leaf, fi);</div><div class='hunk'>@@ -645,7 +627,7 @@ delete:</div><div class='ctx'> 		if (control-&gt;clear_extent_range) {</div><div class='ctx'> 			ret = btrfs_inode_clear_file_extent_range(control-&gt;inode,</div><div class='ctx'> 						  clear_start, clear_len);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -671,18 +653,20 @@ delete:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (del_item &amp;&amp; extent_start != 0 &amp;&amp; !control-&gt;skip_ref_updates) {</div><div class='del'>-			struct btrfs_ref ref = { 0 };</div><div class='add'>+			struct btrfs_ref ref = {</div><div class='add'>+				.action = BTRFS_DROP_DELAYED_REF,</div><div class='add'>+				.bytenr = extent_start,</div><div class='add'>+				.num_bytes = extent_num_bytes,</div><div class='add'>+				.owning_root = btrfs_root_id(root),</div><div class='add'>+				.ref_root = btrfs_header_owner(leaf),</div><div class='add'>+			};</div><div class='ctx'> </div><div class='ctx'> 			bytes_deleted += extent_num_bytes;</div><div class='ctx'> </div><div class='del'>-			btrfs_init_generic_ref(&amp;ref, BTRFS_DROP_DELAYED_REF,</div><div class='del'>-					extent_start, extent_num_bytes, 0,</div><div class='del'>-					root-&gt;root_key.objectid);</div><div class='del'>-			btrfs_init_data_ref(&amp;ref, btrfs_header_owner(leaf),</div><div class='del'>-					control-&gt;ino, extent_offset,</div><div class='del'>-					root-&gt;root_key.objectid, false);</div><div class='add'>+			btrfs_init_data_ref(&amp;ref, control-&gt;ino, extent_offset,</div><div class='add'>+					    btrfs_root_id(root), false);</div><div class='ctx'> 			ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -700,7 +684,7 @@ delete:</div><div class='ctx'> 				ret = btrfs_del_items(trans, root, path,</div><div class='ctx'> 						pending_del_slot,</div><div class='ctx'> 						pending_del_nr);</div><div class='del'>-				if (ret) {</div><div class='add'>+				if (unlikely(ret)) {</div><div class='ctx'> 					btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -733,13 +717,12 @@ delete:</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret &gt;= 0 &amp;&amp; pending_del_nr) {</div><div class='del'>-		int err;</div><div class='add'>+		int ret2;</div><div class='ctx'> </div><div class='del'>-		err = btrfs_del_items(trans, root, path, pending_del_slot,</div><div class='del'>-				      pending_del_nr);</div><div class='del'>-		if (err) {</div><div class='del'>-			btrfs_abort_transaction(trans, err);</div><div class='del'>-			ret = err;</div><div class='add'>+		ret2 = btrfs_del_items(trans, root, path, pending_del_slot, pending_del_nr);</div><div class='add'>+		if (unlikely(ret2)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret2);</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -747,6 +730,5 @@ out:</div><div class='ctx'> 	if (!ret &amp;&amp; control-&gt;last_size &gt; new_size)</div><div class='ctx'> 		control-&gt;last_size = new_size;</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/inode-item.h b/fs/btrfs/inode-item.h<br/>index 4337bb26f419..6d9f5ad20646 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/inode-item.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/inode-item.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/inode-item.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/inode-item.h</a></div><div class='hunk'>@@ -6,14 +6,15 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/crc32c.h&gt;</div><div class='ctx'> </div><div class='add'>+struct fscrypt_str;</div><div class='add'>+struct extent_buffer;</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='ctx'> struct btrfs_root;</div><div class='ctx'> struct btrfs_path;</div><div class='ctx'> struct btrfs_key;</div><div class='ctx'> struct btrfs_inode_extref;</div><div class='ctx'> struct btrfs_inode;</div><div class='del'>-struct extent_buffer;</div><div class='del'>-struct fscrypt_str;</div><div class='add'>+struct btrfs_truncate_control;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return this if we need to call truncate_block for the last bit of the</div><div class='hunk'>@@ -100,19 +101,16 @@ int btrfs_lookup_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		       struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 		       struct btrfs_key *location, int mod);</div><div class='ctx'> </div><div class='del'>-struct btrfs_inode_extref *btrfs_lookup_inode_extref(</div><div class='del'>-			  struct btrfs_trans_handle *trans,</div><div class='del'>-			  struct btrfs_root *root,</div><div class='del'>-			  struct btrfs_path *path,</div><div class='del'>-			  const struct fscrypt_str *name,</div><div class='del'>-			  u64 inode_objectid, u64 ref_objectid, int ins_len,</div><div class='del'>-			  int cow);</div><div class='add'>+struct btrfs_inode_extref *btrfs_lookup_inode_extref(struct btrfs_root *root,</div><div class='add'>+						     struct btrfs_path *path,</div><div class='add'>+						     const struct fscrypt_str *name,</div><div class='add'>+						     u64 inode_objectid, u64 ref_objectid);</div><div class='ctx'> </div><div class='del'>-struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf,</div><div class='add'>+struct btrfs_inode_ref *btrfs_find_name_in_backref(const struct extent_buffer *leaf,</div><div class='ctx'> 						   int slot,</div><div class='ctx'> 						   const struct fscrypt_str *name);</div><div class='ctx'> struct btrfs_inode_extref *btrfs_find_name_in_ext_backref(</div><div class='del'>-		struct extent_buffer *leaf, int slot, u64 ref_objectid,</div><div class='add'>+		const struct extent_buffer *leaf, int slot, u64 ref_objectid,</div><div class='ctx'> 		const struct fscrypt_str *name);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c<br/>index 809b11472a80..c4bee47829ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/inode.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/blk-cgroup.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -32,21 +33,19 @@</div><div class='ctx'> #include &lt;linux/migrate.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/fsverity.h&gt;</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "ordered-data.h"</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> #include "tree-log.h"</div><div class='ctx'> #include "bio.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "locking.h"</div><div class='del'>-#include "free-space-cache.h"</div><div class='ctx'> #include "props.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "delalloc-space.h"</div><div class='hunk'>@@ -72,31 +71,17 @@</div><div class='ctx'> #include "orphan.h"</div><div class='ctx'> #include "backref.h"</div><div class='ctx'> #include "raid-stripe-tree.h"</div><div class='add'>+#include "fiemap.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='add'>+</div><div class='add'>+#define COW_FILE_RANGE_KEEP_LOCKED	(1UL &lt;&lt; 0)</div><div class='add'>+#define COW_FILE_RANGE_NO_INLINE	(1UL &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> struct btrfs_iget_args {</div><div class='ctx'> 	u64 ino;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct btrfs_dio_data {</div><div class='del'>-	ssize_t submitted;</div><div class='del'>-	struct extent_changeset *data_reserved;</div><div class='del'>-	struct btrfs_ordered_extent *ordered;</div><div class='del'>-	bool data_space_reserved;</div><div class='del'>-	bool nocow_done;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct btrfs_dio_private {</div><div class='del'>-	/* Range of I/O */</div><div class='del'>-	u64 file_offset;</div><div class='del'>-	u32 bytes;</div><div class='del'>-</div><div class='del'>-	/* This must be last */</div><div class='del'>-	struct btrfs_bio bbio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct bio_set btrfs_dio_bioset;</div><div class='del'>-</div><div class='ctx'> struct btrfs_rename_ctx {</div><div class='ctx'> 	/* Output field. Stores the index number of the old directory entry. */</div><div class='ctx'> 	u64 index;</div><div class='hunk'>@@ -136,14 +121,9 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr);</div><div class='ctx'> static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback);</div><div class='ctx'> </div><div class='ctx'> static noinline int run_delalloc_cow(struct btrfs_inode *inode,</div><div class='del'>-				     struct page *locked_page, u64 start,</div><div class='add'>+				     struct folio *locked_folio, u64 start,</div><div class='ctx'> 				     u64 end, struct writeback_control *wbc,</div><div class='ctx'> 				     bool pages_dirty);</div><div class='del'>-static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,</div><div class='del'>-				       u64 len, u64 orig_start, u64 block_start,</div><div class='del'>-				       u64 block_len, u64 orig_block_len,</div><div class='del'>-				       u64 ram_bytes, int compress_type,</div><div class='del'>-				       int type);</div><div class='ctx'> </div><div class='ctx'> static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 					  u64 root, void *warn_ctx)</div><div class='hunk'>@@ -152,7 +132,7 @@ static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = warn-&gt;fs_info;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='del'>-	struct inode_fs_paths *ipath = NULL;</div><div class='add'>+	struct inode_fs_paths *ipath __free(inode_fs_paths) = NULL;</div><div class='ctx'> 	struct btrfs_root *local_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	unsigned int nofs_flag;</div><div class='hunk'>@@ -199,8 +179,10 @@ static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = paths_from_inode(inum, ipath);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_put_root(local_root);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We deliberately ignore the bit ipath might have been too small to</div><div class='hunk'>@@ -215,7 +197,6 @@ static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_root(local_root);</div><div class='del'>-	free_ipath(ipath);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -223,7 +204,6 @@ err:</div><div class='ctx'> "checksum error at logical %llu mirror %u root %llu inode %llu offset %llu, path resolving failed with ret=%d",</div><div class='ctx'> 		   warn-&gt;logical, warn-&gt;mirror_num, root, inum, offset, ret);</div><div class='ctx'> </div><div class='del'>-	free_ipath(ipath);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -255,21 +235,21 @@ static void print_data_reloc_error(const struct btrfs_inode *inode, u64 file_off</div><div class='ctx'> 	if (logical == U64_MAX) {</div><div class='ctx'> 		btrfs_warn_rl(fs_info, "has data reloc tree but no running relocation");</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-"csum failed root %lld ino %llu off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",</div><div class='del'>-			inode-&gt;root-&gt;root_key.objectid, btrfs_ino(inode), file_off,</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum),</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='add'>+"csum failed root %lld ino %llu off %llu csum " BTRFS_CSUM_FMT " expected csum " BTRFS_CSUM_FMT " mirror %d",</div><div class='add'>+			btrfs_root_id(inode-&gt;root), btrfs_ino(inode), file_off,</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='ctx'> 			mirror_num);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	logical += file_off;</div><div class='ctx'> 	btrfs_warn_rl(fs_info,</div><div class='del'>-"csum failed root %lld ino %llu off %llu logical %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",</div><div class='del'>-			inode-&gt;root-&gt;root_key.objectid,</div><div class='add'>+"csum failed root %lld ino %llu off %llu logical %llu csum " BTRFS_CSUM_FMT " expected csum " BTRFS_CSUM_FMT " mirror %d",</div><div class='add'>+			btrfs_root_id(inode-&gt;root),</div><div class='ctx'> 			btrfs_ino(inode), file_off, logical,</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum),</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='ctx'> 			mirror_num);</div><div class='ctx'> </div><div class='ctx'> 	ret = extent_from_logical(fs_info, logical, &amp;path, &amp;found_key, &amp;flags);</div><div class='hunk'>@@ -333,26 +313,26 @@ static void __cold btrfs_print_data_csum_error(struct btrfs_inode *inode,</div><div class='ctx'> 	const u32 csum_size = root-&gt;fs_info-&gt;csum_size;</div><div class='ctx'> </div><div class='ctx'> 	/* For data reloc tree, it's better to do a backref lookup instead. */</div><div class='del'>-	if (root-&gt;root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID)</div><div class='add'>+	if (btrfs_is_data_reloc_root(root))</div><div class='ctx'> 		return print_data_reloc_error(inode, logical_start, csum,</div><div class='ctx'> 					      csum_expected, mirror_num);</div><div class='ctx'> </div><div class='ctx'> 	/* Output without objectid, which is more meaningful */</div><div class='del'>-	if (root-&gt;root_key.objectid &gt;= BTRFS_LAST_FREE_OBJECTID) {</div><div class='add'>+	if (btrfs_root_id(root) &gt;= BTRFS_LAST_FREE_OBJECTID) {</div><div class='ctx'> 		btrfs_warn_rl(root-&gt;fs_info,</div><div class='del'>-"csum failed root %lld ino %lld off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",</div><div class='del'>-			root-&gt;root_key.objectid, btrfs_ino(inode),</div><div class='add'>+"csum failed root %lld ino %lld off %llu csum " BTRFS_CSUM_FMT " expected csum " BTRFS_CSUM_FMT " mirror %d",</div><div class='add'>+			btrfs_root_id(root), btrfs_ino(inode),</div><div class='ctx'> 			logical_start,</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum),</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='ctx'> 			mirror_num);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_warn_rl(root-&gt;fs_info,</div><div class='del'>-"csum failed root %llu ino %llu off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",</div><div class='del'>-			root-&gt;root_key.objectid, btrfs_ino(inode),</div><div class='add'>+"csum failed root %llu ino %llu off %llu csum " BTRFS_CSUM_FMT " expected csum " BTRFS_CSUM_FMT " mirror %d",</div><div class='add'>+			btrfs_root_id(root), btrfs_ino(inode),</div><div class='ctx'> 			logical_start,</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum),</div><div class='del'>-			CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum),</div><div class='add'>+			BTRFS_CSUM_FMT_VALUE(csum_size, csum_expected),</div><div class='ctx'> 			mirror_num);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -392,7 +372,7 @@ int btrfs_inode_lock(struct btrfs_inode *inode, unsigned int ilock_flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Unock inode i_rwsem.</div><div class='add'>+ * Unlock inode i_rwsem.</div><div class='ctx'>  *</div><div class='ctx'>  * ilock_flags should contain the same bits set as passed to btrfs_inode_lock()</div><div class='ctx'>  * to decide whether the lock acquired is shared or exclusive.</div><div class='hunk'>@@ -418,63 +398,28 @@ void btrfs_inode_unlock(struct btrfs_inode *inode, unsigned int ilock_flags)</div><div class='ctx'>  * extent (btrfs_finish_ordered_io()).</div><div class='ctx'>  */</div><div class='ctx'> static inline void btrfs_cleanup_ordered_extents(struct btrfs_inode *inode,</div><div class='del'>-						 struct page *locked_page,</div><div class='ctx'> 						 u64 offset, u64 bytes)</div><div class='ctx'> {</div><div class='del'>-	unsigned long index = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long end_index = (offset + bytes - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	u64 page_start = 0, page_end = 0;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	if (locked_page) {</div><div class='del'>-		page_start = page_offset(locked_page);</div><div class='del'>-		page_end = page_start + PAGE_SIZE - 1;</div><div class='del'>-	}</div><div class='add'>+	pgoff_t index = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const pgoff_t end_index = (offset + bytes - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	while (index &lt;= end_index) {</div><div class='del'>-		/*</div><div class='del'>-		 * For locked page, we will call btrfs_mark_ordered_io_finished</div><div class='del'>-		 * through btrfs_mark_ordered_io_finished() on it</div><div class='del'>-		 * in run_delalloc_range() for the error handling, which will</div><div class='del'>-		 * clear page Ordered and run the ordered extent accounting.</div><div class='del'>-		 *</div><div class='del'>-		 * Here we can't just clear the Ordered bit, or</div><div class='del'>-		 * btrfs_mark_ordered_io_finished() would skip the accounting</div><div class='del'>-		 * for the page range, and the ordered extent will never finish.</div><div class='del'>-		 */</div><div class='del'>-		if (locked_page &amp;&amp; index == (page_start &gt;&gt; PAGE_SHIFT)) {</div><div class='add'>+		folio = filemap_get_folio(inode-&gt;vfs_inode.i_mapping, index);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='ctx'> 			index++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		page = find_get_page(inode-&gt;vfs_inode.i_mapping, index);</div><div class='del'>-		index++;</div><div class='del'>-		if (!page)</div><div class='del'>-			continue;</div><div class='ctx'> </div><div class='add'>+		index = folio_next_index(folio);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Here we just clear all Ordered bits for every page in the</div><div class='ctx'> 		 * range, then btrfs_mark_ordered_io_finished() will handle</div><div class='ctx'> 		 * the ordered extent accounting for the range.</div><div class='ctx'> 		 */</div><div class='del'>-		btrfs_folio_clamp_clear_ordered(inode-&gt;root-&gt;fs_info,</div><div class='del'>-						page_folio(page), offset, bytes);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (locked_page) {</div><div class='del'>-		/* The locked page covers the full range, nothing needs to be done */</div><div class='del'>-		if (bytes + offset &lt;= page_start + PAGE_SIZE)</div><div class='del'>-			return;</div><div class='del'>-		/*</div><div class='del'>-		 * In case this page belongs to the delalloc range being</div><div class='del'>-		 * instantiated then skip it, since the first page of a range is</div><div class='del'>-		 * going to be properly cleaned up by the caller of</div><div class='del'>-		 * run_delalloc_range</div><div class='del'>-		 */</div><div class='del'>-		if (page_start &gt;= offset &amp;&amp; page_end &lt;= (offset + bytes - 1)) {</div><div class='del'>-			bytes = offset + bytes - page_offset(locked_page) - PAGE_SIZE;</div><div class='del'>-			offset = page_offset(locked_page) + PAGE_SIZE;</div><div class='del'>-		}</div><div class='add'>+		btrfs_folio_clamp_clear_ordered(inode-&gt;root-&gt;fs_info, folio,</div><div class='add'>+						offset, bytes);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return btrfs_mark_ordered_io_finished(inode, NULL, offset, bytes, false);</div><div class='hunk'>@@ -485,18 +430,18 @@ static int btrfs_dirty_inode(struct btrfs_inode *inode);</div><div class='ctx'> static int btrfs_init_inode_security(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     struct btrfs_new_inode_args *args)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;default_acl) {</div><div class='del'>-		err = __btrfs_set_acl(trans, args-&gt;inode, args-&gt;default_acl,</div><div class='add'>+		ret = __btrfs_set_acl(trans, args-&gt;inode, args-&gt;default_acl,</div><div class='ctx'> 				      ACL_TYPE_DEFAULT);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (args-&gt;acl) {</div><div class='del'>-		err = __btrfs_set_acl(trans, args-&gt;inode, args-&gt;acl, ACL_TYPE_ACCESS);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		ret = __btrfs_set_acl(trans, args-&gt;inode, args-&gt;acl, ACL_TYPE_ACCESS);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!args-&gt;default_acl &amp;&amp; !args-&gt;acl)</div><div class='ctx'> 		cache_no_acl(args-&gt;inode);</div><div class='hunk'>@@ -514,12 +459,12 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct btrfs_inode *inode, bool extent_inserted,</div><div class='ctx'> 				size_t size, size_t compressed_size,</div><div class='ctx'> 				int compress_type,</div><div class='del'>-				struct page **compressed_pages,</div><div class='add'>+				struct folio *compressed_folio,</div><div class='ctx'> 				bool update_i_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	const u32 sectorsize = trans-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> 	unsigned long ptr;</div><div class='ctx'> 	struct btrfs_file_extent_item *ei;</div><div class='hunk'>@@ -527,10 +472,23 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	size_t cur_size = size;</div><div class='ctx'> 	u64 i_size;</div><div class='ctx'> </div><div class='del'>-	ASSERT((compressed_size &gt; 0 &amp;&amp; compressed_pages) ||</div><div class='del'>-	       (compressed_size == 0 &amp;&amp; !compressed_pages));</div><div class='add'>+	/*</div><div class='add'>+	 * The decompressed size must still be no larger than a sector.  Under</div><div class='add'>+	 * heavy race, we can have size == 0 passed in, but that shouldn't be a</div><div class='add'>+	 * big deal and we can continue the insertion.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(size &lt;= sectorsize);</div><div class='ctx'> </div><div class='del'>-	if (compressed_size &amp;&amp; compressed_pages)</div><div class='add'>+	/*</div><div class='add'>+	 * The compressed size also needs to be no larger than a sector.</div><div class='add'>+	 * That's also why we only need one page as the parameter.</div><div class='add'>+	 */</div><div class='add'>+	if (compressed_folio)</div><div class='add'>+		ASSERT(compressed_size &lt;= sectorsize);</div><div class='add'>+	else</div><div class='add'>+		ASSERT(compressed_size == 0);</div><div class='add'>+</div><div class='add'>+	if (compressed_size &amp;&amp; compressed_folio)</div><div class='ctx'> 		cur_size = compressed_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!extent_inserted) {</div><div class='hunk'>@@ -538,8 +496,8 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		size_t datasize;</div><div class='ctx'> </div><div class='ctx'> 		key.objectid = btrfs_ino(inode);</div><div class='del'>-		key.offset = 0;</div><div class='ctx'> 		key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+		key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> 		datasize = btrfs_file_extent_calc_inline_size(cur_size);</div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path, &amp;key,</div><div class='hunk'>@@ -558,32 +516,23 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ptr = btrfs_file_extent_inline_start(ei);</div><div class='ctx'> </div><div class='ctx'> 	if (compress_type != BTRFS_COMPRESS_NONE) {</div><div class='del'>-		struct page *cpage;</div><div class='del'>-		int i = 0;</div><div class='del'>-		while (compressed_size &gt; 0) {</div><div class='del'>-			cpage = compressed_pages[i];</div><div class='del'>-			cur_size = min_t(unsigned long, compressed_size,</div><div class='del'>-				       PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-			kaddr = kmap_local_page(cpage);</div><div class='del'>-			write_extent_buffer(leaf, kaddr, ptr, cur_size);</div><div class='del'>-			kunmap_local(kaddr);</div><div class='add'>+		kaddr = kmap_local_folio(compressed_folio, 0);</div><div class='add'>+		write_extent_buffer(leaf, kaddr, ptr, compressed_size);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='ctx'> </div><div class='del'>-			i++;</div><div class='del'>-			ptr += cur_size;</div><div class='del'>-			compressed_size -= cur_size;</div><div class='del'>-		}</div><div class='ctx'> 		btrfs_set_file_extent_compression(leaf, ei,</div><div class='ctx'> 						  compress_type);</div><div class='ctx'> 	} else {</div><div class='del'>-		page = find_get_page(inode-&gt;vfs_inode.i_mapping, 0);</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='add'>+		folio = filemap_get_folio(inode-&gt;vfs_inode.i_mapping, 0);</div><div class='add'>+		ASSERT(!IS_ERR(folio));</div><div class='ctx'> 		btrfs_set_file_extent_compression(leaf, ei, 0);</div><div class='del'>-		kaddr = kmap_local_page(page);</div><div class='add'>+		kaddr = kmap_local_folio(folio, 0);</div><div class='ctx'> 		write_extent_buffer(leaf, kaddr, ptr, size);</div><div class='ctx'> 		kunmap_local(kaddr);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -613,17 +562,57 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool can_cow_file_range_inline(struct btrfs_inode *inode,</div><div class='add'>+				      u64 offset, u64 size,</div><div class='add'>+				      size_t compressed_size)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	u64 data_len = (compressed_size ?: size);</div><div class='add'>+</div><div class='add'>+	/* Inline extents must start at offset 0. */</div><div class='add'>+	if (offset != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Inline extents are limited to sectorsize. */</div><div class='add'>+	if (size &gt; fs_info-&gt;sectorsize)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We do not allow a non-compressed extent to be as large as block size. */</div><div class='add'>+	if (data_len &gt;= fs_info-&gt;sectorsize)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We cannot exceed the maximum inline data size. */</div><div class='add'>+	if (data_len &gt; BTRFS_MAX_INLINE_DATA_SIZE(fs_info))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We cannot exceed the user specified max_inline size. */</div><div class='add'>+	if (data_len &gt; fs_info-&gt;max_inline)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Inline extents must be the entirety of the file. */</div><div class='add'>+	if (size &lt; i_size_read(&amp;inode-&gt;vfs_inode))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Encrypted file cannot be inlined. */</div><div class='add'>+	if (IS_ENCRYPTED(&amp;inode-&gt;vfs_inode))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * conditionally insert an inline extent into the file.  This</div><div class='ctx'>  * does the checks required to make sure the data is small enough</div><div class='ctx'>  * to fit as an inline extent.</div><div class='add'>+ *</div><div class='add'>+ * If being used directly, you must have already checked we're allowed to cow</div><div class='add'>+ * the range by getting true from can_cow_file_range_inline().</div><div class='ctx'>  */</div><div class='del'>-static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,</div><div class='del'>-					  size_t compressed_size,</div><div class='del'>-					  int compress_type,</div><div class='del'>-					  struct page **compressed_pages,</div><div class='del'>-					  bool update_i_size)</div><div class='add'>+static noinline int __cow_file_range_inline(struct btrfs_inode *inode,</div><div class='add'>+					    u64 size, size_t compressed_size,</div><div class='add'>+					    int compress_type,</div><div class='add'>+					    struct folio *compressed_folio,</div><div class='add'>+					    bool update_i_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_drop_extents_args drop_args = { 0 };</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='hunk'>@@ -633,18 +622,6 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can create an inline extent if it ends at or beyond the current</div><div class='del'>-	 * i_size, is no larger than a sector (decompressed), and the (possibly</div><div class='del'>-	 * compressed) data fits in a leaf and the configured maximum inline</div><div class='del'>-	 * size.</div><div class='del'>-	 */</div><div class='del'>-	if (size &lt; i_size_read(&amp;inode-&gt;vfs_inode) ||</div><div class='del'>-	    size &gt; fs_info-&gt;sectorsize ||</div><div class='del'>-	    data_len &gt; BTRFS_MAX_INLINE_DATA_SIZE(fs_info) ||</div><div class='del'>-	    data_len &gt; fs_info-&gt;max_inline)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -663,15 +640,15 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,</div><div class='ctx'> 	drop_args.replace_extent = true;</div><div class='ctx'> 	drop_args.extent_item_size = btrfs_file_extent_calc_inline_size(data_len);</div><div class='ctx'> 	ret = btrfs_drop_extents(trans, root, inode, &amp;drop_args);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = insert_inline_extent(trans, path, inode, drop_args.extent_inserted,</div><div class='ctx'> 				   size, compressed_size, compress_type,</div><div class='del'>-				   compressed_pages, update_i_size);</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOSPC) {</div><div class='add'>+				   compressed_folio, update_i_size);</div><div class='add'>+	if (unlikely(ret &amp;&amp; ret != -ENOSPC)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (ret == -ENOSPC) {</div><div class='hunk'>@@ -681,7 +658,7 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,</div><div class='ctx'> </div><div class='ctx'> 	btrfs_update_inode_bytes(inode, size, drop_args.bytes_found);</div><div class='ctx'> 	ret = btrfs_update_inode(trans, inode);</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOSPC) {</div><div class='add'>+	if (unlikely(ret &amp;&amp; ret != -ENOSPC)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (ret == -ENOSPC) {</div><div class='hunk'>@@ -697,25 +674,74 @@ out:</div><div class='ctx'> 	 * And at reserve time, it's always aligned to page size, so</div><div class='ctx'> 	 * just free one page here.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_qgroup_free_data(inode, NULL, 0, PAGE_SIZE, NULL);</div><div class='add'>+	btrfs_qgroup_free_data(inode, NULL, 0, fs_info-&gt;sectorsize, NULL);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static noinline int cow_file_range_inline(struct btrfs_inode *inode,</div><div class='add'>+					  struct folio *locked_folio,</div><div class='add'>+					  u64 offset, u64 end,</div><div class='add'>+					  size_t compressed_size,</div><div class='add'>+					  int compress_type,</div><div class='add'>+					  struct folio *compressed_folio,</div><div class='add'>+					  bool update_i_size)</div><div class='add'>+{</div><div class='add'>+	struct extent_state *cached = NULL;</div><div class='add'>+	unsigned long clear_flags = EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='add'>+		EXTENT_DEFRAG | EXTENT_DO_ACCOUNTING | EXTENT_LOCKED;</div><div class='add'>+	u64 size = min_t(u64, i_size_read(&amp;inode-&gt;vfs_inode), end + 1);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!can_cow_file_range_inline(inode, offset, size, compressed_size))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, offset, end, &amp;cached);</div><div class='add'>+	ret = __cow_file_range_inline(inode, size, compressed_size,</div><div class='add'>+				      compress_type, compressed_folio,</div><div class='add'>+				      update_i_size);</div><div class='add'>+	if (ret &gt; 0) {</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, offset, end, &amp;cached);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In the successful case (ret == 0 here), cow_file_range will return 1.</div><div class='add'>+	 *</div><div class='add'>+	 * Quite a bit further up the callstack in extent_writepage(), ret == 1</div><div class='add'>+	 * is treated as a short circuited success and does not unlock the folio,</div><div class='add'>+	 * so we must do it here.</div><div class='add'>+	 *</div><div class='add'>+	 * In the failure case, the locked_folio does get unlocked by</div><div class='add'>+	 * btrfs_folio_end_all_writers, which asserts that it is still locked</div><div class='add'>+	 * at that point, so we must *not* unlock it here.</div><div class='add'>+	 *</div><div class='add'>+	 * The other two callsites in compress_file_range do not have a</div><div class='add'>+	 * locked_folio, so they are not relevant to this logic.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		locked_folio = NULL;</div><div class='add'>+</div><div class='add'>+	extent_clear_unlock_delalloc(inode, offset, end, locked_folio, &amp;cached,</div><div class='add'>+				     clear_flags, PAGE_UNLOCK |</div><div class='add'>+				     PAGE_START_WRITEBACK | PAGE_END_WRITEBACK);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct async_extent {</div><div class='ctx'> 	u64 start;</div><div class='ctx'> 	u64 ram_size;</div><div class='ctx'> 	u64 compressed_size;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	unsigned long nr_pages;</div><div class='add'>+	struct folio **folios;</div><div class='add'>+	unsigned long nr_folios;</div><div class='ctx'> 	int compress_type;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct async_chunk {</div><div class='ctx'> 	struct btrfs_inode *inode;</div><div class='del'>-	struct page *locked_page;</div><div class='add'>+	struct folio *locked_folio;</div><div class='ctx'> 	u64 start;</div><div class='ctx'> 	u64 end;</div><div class='ctx'> 	blk_opf_t write_flags;</div><div class='hunk'>@@ -733,19 +759,20 @@ struct async_cow {</div><div class='ctx'> static noinline int add_async_extent(struct async_chunk *cow,</div><div class='ctx'> 				     u64 start, u64 ram_size,</div><div class='ctx'> 				     u64 compressed_size,</div><div class='del'>-				     struct page **pages,</div><div class='del'>-				     unsigned long nr_pages,</div><div class='add'>+				     struct folio **folios,</div><div class='add'>+				     unsigned long nr_folios,</div><div class='ctx'> 				     int compress_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct async_extent *async_extent;</div><div class='ctx'> </div><div class='ctx'> 	async_extent = kmalloc(sizeof(*async_extent), GFP_NOFS);</div><div class='del'>-	BUG_ON(!async_extent); /* -ENOMEM */</div><div class='add'>+	if (!async_extent)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	async_extent-&gt;start = start;</div><div class='ctx'> 	async_extent-&gt;ram_size = ram_size;</div><div class='ctx'> 	async_extent-&gt;compressed_size = compressed_size;</div><div class='del'>-	async_extent-&gt;pages = pages;</div><div class='del'>-	async_extent-&gt;nr_pages = nr_pages;</div><div class='add'>+	async_extent-&gt;folios = folios;</div><div class='add'>+	async_extent-&gt;nr_folios = nr_folios;</div><div class='ctx'> 	async_extent-&gt;compress_type = compress_type;</div><div class='ctx'> 	list_add_tail(&amp;async_extent-&gt;list, &amp;cow-&gt;extents);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -761,56 +788,26 @@ static inline int inode_need_compress(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_inode_can_compress(inode)) {</div><div class='del'>-		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),</div><div class='del'>-			KERN_ERR "BTRFS: unexpected compression for ino %llu\n",</div><div class='del'>-			btrfs_ino(inode));</div><div class='add'>+		DEBUG_WARN("BTRFS: unexpected compression for ino %llu", btrfs_ino(inode));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * Special check for subpage.</div><div class='del'>-	 *</div><div class='del'>-	 * We lock the full page then run each delalloc range in the page, thus</div><div class='del'>-	 * for the following case, we will hit some subpage specific corner case:</div><div class='del'>-	 *</div><div class='del'>-	 * 0		32K		64K</div><div class='del'>-	 * |	|///////|	|///////|</div><div class='del'>-	 *		\- A		\- B</div><div class='del'>-	 *</div><div class='del'>-	 * In above case, both range A and range B will try to unlock the full</div><div class='del'>-	 * page [0, 64K), causing the one finished later will have page</div><div class='del'>-	 * unlocked already, triggering various page lock requirement BUG_ON()s.</div><div class='del'>-	 *</div><div class='del'>-	 * So here we add an artificial limit that subpage compression can only</div><div class='del'>-	 * if the range is fully page aligned.</div><div class='del'>-	 *</div><div class='del'>-	 * In theory we only need to ensure the first page is fully covered, but</div><div class='del'>-	 * the tailing partial page will be locked until the full compression</div><div class='del'>-	 * finishes, delaying the write of other range.</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: Make btrfs_run_delalloc_range() to lock all delalloc range</div><div class='del'>-	 * first to prevent any submitted async extent to unlock the full page.</div><div class='del'>-	 * By this, we can ensure for subpage case that only the last async_cow</div><div class='del'>-	 * will unlock the full page.</div><div class='del'>-	 */</div><div class='del'>-	if (fs_info-&gt;sectorsize &lt; PAGE_SIZE) {</div><div class='del'>-		if (!PAGE_ALIGNED(start) ||</div><div class='del'>-		    !PAGE_ALIGNED(end + 1))</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	/* Defrag ioctl takes precedence over mount options and properties. */</div><div class='add'>+	if (inode-&gt;defrag_compress == BTRFS_DEFRAG_DONT_COMPRESS)</div><div class='add'>+		return 0;</div><div class='add'>+	if (BTRFS_COMPRESS_NONE &lt; inode-&gt;defrag_compress &amp;&amp;</div><div class='add'>+	    inode-&gt;defrag_compress &lt; BTRFS_NR_COMPRESS_TYPES)</div><div class='add'>+		return 1;</div><div class='ctx'> 	/* force compress */</div><div class='ctx'> 	if (btrfs_test_opt(fs_info, FORCE_COMPRESS))</div><div class='ctx'> 		return 1;</div><div class='del'>-	/* defrag ioctl */</div><div class='del'>-	if (inode-&gt;defrag_compress)</div><div class='del'>-		return 1;</div><div class='ctx'> 	/* bad compression ratios */</div><div class='ctx'> 	if (inode-&gt;flags &amp; BTRFS_INODE_NOCOMPRESS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (btrfs_test_opt(fs_info, COMPRESS) ||</div><div class='ctx'> 	    inode-&gt;flags &amp; BTRFS_INODE_COMPRESS ||</div><div class='ctx'> 	    inode-&gt;prop_compress)</div><div class='del'>-		return btrfs_compress_heuristic(&amp;inode-&gt;vfs_inode, start, end);</div><div class='add'>+		return btrfs_compress_heuristic(inode, start, end);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -820,7 +817,27 @@ static inline void inode_should_defrag(struct btrfs_inode *inode,</div><div class='ctx'> 	/* If this is a small write inside eof, kick off a defrag */</div><div class='ctx'> 	if (num_bytes &lt; small_write &amp;&amp;</div><div class='ctx'> 	    (start &gt; 0 || end + 1 &lt; inode-&gt;disk_i_size))</div><div class='del'>-		btrfs_add_inode_defrag(NULL, inode, small_write);</div><div class='add'>+		btrfs_add_inode_defrag(inode, small_write);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int extent_range_clear_dirty_for_io(struct btrfs_inode *inode, u64 start, u64 end)</div><div class='add'>+{</div><div class='add'>+	const pgoff_t end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	for (pgoff_t index = start &gt;&gt; PAGE_SHIFT; index &lt;= end_index; index++) {</div><div class='add'>+		folio = filemap_get_folio(inode-&gt;vfs_inode.i_mapping, index);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			if (!ret)</div><div class='add'>+				ret = PTR_ERR(folio);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		btrfs_folio_clamp_clear_dirty(inode-&gt;root-&gt;fs_info, folio, start,</div><div class='add'>+					      end + 1 - start);</div><div class='add'>+		folio_put(folio);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -843,19 +860,25 @@ static void compress_file_range(struct btrfs_work *work)</div><div class='ctx'> 	struct btrfs_inode *inode = async_chunk-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='add'>+	const u32 min_folio_size = btrfs_min_folio_size(fs_info);</div><div class='ctx'> 	u64 blocksize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	u64 start = async_chunk-&gt;start;</div><div class='ctx'> 	u64 end = async_chunk-&gt;end;</div><div class='ctx'> 	u64 actual_end;</div><div class='ctx'> 	u64 i_size;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	unsigned long nr_pages;</div><div class='add'>+	struct folio **folios = NULL;</div><div class='add'>+	unsigned long nr_folios;</div><div class='ctx'> 	unsigned long total_compressed = 0;</div><div class='ctx'> 	unsigned long total_in = 0;</div><div class='del'>-	unsigned int poff;</div><div class='add'>+	unsigned int loff;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int compress_type = fs_info-&gt;compress_type;</div><div class='add'>+	int compress_level = fs_info-&gt;compress_level;</div><div class='add'>+</div><div class='add'>+	if (unlikely(btrfs_is_shutdown(fs_info)))</div><div class='add'>+		goto cleanup_and_bail_uncompressed;</div><div class='ctx'> </div><div class='ctx'> 	inode_should_defrag(inode, start, end, end - start + 1, SZ_16K);</div><div class='ctx'> </div><div class='hunk'>@@ -864,7 +887,16 @@ static void compress_file_range(struct btrfs_work *work)</div><div class='ctx'> 	 * Otherwise applications with the file mmap'd can wander in and change</div><div class='ctx'> 	 * the page contents while we are compressing them.</div><div class='ctx'> 	 */</div><div class='del'>-	extent_range_clear_dirty_for_io(&amp;inode-&gt;vfs_inode, start, end);</div><div class='add'>+	ret = extent_range_clear_dirty_for_io(inode, start, end);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All the folios should have been locked thus no failure.</div><div class='add'>+	 *</div><div class='add'>+	 * And even if some folios are missing, btrfs_compress_folios()</div><div class='add'>+	 * would handle them correctly, so here just do an ASSERT() check for</div><div class='add'>+	 * early logic errors.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(ret == 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to save i_size before now because it could change in between</div><div class='hunk'>@@ -880,9 +912,9 @@ static void compress_file_range(struct btrfs_work *work)</div><div class='ctx'> 	barrier();</div><div class='ctx'> 	actual_end = min_t(u64, i_size, end + 1);</div><div class='ctx'> again:</div><div class='del'>-	pages = NULL;</div><div class='del'>-	nr_pages = (end &gt;&gt; PAGE_SHIFT) - (start &gt;&gt; PAGE_SHIFT) + 1;</div><div class='del'>-	nr_pages = min_t(unsigned long, nr_pages, BTRFS_MAX_COMPRESSED_PAGES);</div><div class='add'>+	folios = NULL;</div><div class='add'>+	nr_folios = (end &gt;&gt; min_folio_shift) - (start &gt;&gt; min_folio_shift) + 1;</div><div class='add'>+	nr_folios = min_t(unsigned long, nr_folios, BTRFS_MAX_COMPRESSED &gt;&gt; min_folio_shift);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we don't want to send crud past the end of i_size through</div><div class='hunk'>@@ -907,17 +939,6 @@ again:</div><div class='ctx'> 	   (start &gt; 0 || end + 1 &lt; inode-&gt;disk_i_size))</div><div class='ctx'> 		goto cleanup_and_bail_uncompressed;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For subpage case, we require full page alignment for the sector</div><div class='del'>-	 * aligned range.</div><div class='del'>-	 * Thus we must also check against @actual_end, not just @end.</div><div class='del'>-	 */</div><div class='del'>-	if (blocksize &lt; PAGE_SIZE) {</div><div class='del'>-		if (!PAGE_ALIGNED(start) ||</div><div class='del'>-		    !PAGE_ALIGNED(round_up(actual_end, blocksize)))</div><div class='del'>-			goto cleanup_and_bail_uncompressed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	total_compressed = min_t(unsigned long, total_compressed,</div><div class='ctx'> 			BTRFS_MAX_UNCOMPRESSED);</div><div class='ctx'> 	total_in = 0;</div><div class='hunk'>@@ -931,8 +952,8 @@ again:</div><div class='ctx'> 	if (!inode_need_compress(inode, start, end))</div><div class='ctx'> 		goto cleanup_and_bail_uncompressed;</div><div class='ctx'> </div><div class='del'>-	pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	if (!pages) {</div><div class='add'>+	folios = kcalloc(nr_folios, sizeof(struct folio *), GFP_NOFS);</div><div class='add'>+	if (!folios) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Memory allocation failure is not a fatal error, we can fall</div><div class='ctx'> 		 * back to uncompressed code.</div><div class='hunk'>@@ -940,25 +961,27 @@ again:</div><div class='ctx'> 		goto cleanup_and_bail_uncompressed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;defrag_compress)</div><div class='add'>+	if (0 &lt; inode-&gt;defrag_compress &amp;&amp; inode-&gt;defrag_compress &lt; BTRFS_NR_COMPRESS_TYPES) {</div><div class='ctx'> 		compress_type = inode-&gt;defrag_compress;</div><div class='del'>-	else if (inode-&gt;prop_compress)</div><div class='add'>+		compress_level = inode-&gt;defrag_compress_level;</div><div class='add'>+	} else if (inode-&gt;prop_compress) {</div><div class='ctx'> 		compress_type = inode-&gt;prop_compress;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Compression level is applied here. */</div><div class='del'>-	ret = btrfs_compress_pages(compress_type | (fs_info-&gt;compress_level &lt;&lt; 4),</div><div class='del'>-				   mapping, start, pages, &amp;nr_pages, &amp;total_in,</div><div class='del'>-				   &amp;total_compressed);</div><div class='add'>+	ret = btrfs_compress_folios(compress_type, compress_level,</div><div class='add'>+				    inode, start, folios, &amp;nr_folios, &amp;total_in,</div><div class='add'>+				    &amp;total_compressed);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto mark_incompressible;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Zero the tail end of the last page, as we might be sending it down</div><div class='add'>+	 * Zero the tail end of the last folio, as we might be sending it down</div><div class='ctx'> 	 * to disk.</div><div class='ctx'> 	 */</div><div class='del'>-	poff = offset_in_page(total_compressed);</div><div class='del'>-	if (poff)</div><div class='del'>-		memzero_page(pages[nr_pages - 1], poff, PAGE_SIZE - poff);</div><div class='add'>+	loff = (total_compressed &amp; (min_folio_size - 1));</div><div class='add'>+	if (loff)</div><div class='add'>+		folio_zero_range(folios[nr_folios - 1], loff, min_folio_size - loff);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to create an inline extent.</div><div class='hunk'>@@ -969,43 +992,16 @@ again:</div><div class='ctx'> 	 * Check cow_file_range() for why we don't even try to create inline</div><div class='ctx'> 	 * extent for the subpage case.</div><div class='ctx'> 	 */</div><div class='del'>-	if (start == 0 &amp;&amp; fs_info-&gt;sectorsize == PAGE_SIZE) {</div><div class='del'>-		if (total_in &lt; actual_end) {</div><div class='del'>-			ret = cow_file_range_inline(inode, actual_end, 0,</div><div class='del'>-						    BTRFS_COMPRESS_NONE, NULL,</div><div class='del'>-						    false);</div><div class='del'>-		} else {</div><div class='del'>-			ret = cow_file_range_inline(inode, actual_end,</div><div class='del'>-						    total_compressed,</div><div class='del'>-						    compress_type, pages,</div><div class='del'>-						    false);</div><div class='del'>-		}</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='del'>-			unsigned long clear_flags = EXTENT_DELALLOC |</div><div class='del'>-				EXTENT_DELALLOC_NEW | EXTENT_DEFRAG |</div><div class='del'>-				EXTENT_DO_ACCOUNTING;</div><div class='del'>-</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				mapping_set_error(mapping, -EIO);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * inline extent creation worked or returned error,</div><div class='del'>-			 * we don't need to create any more async work items.</div><div class='del'>-			 * Unlock and free up our temp pages.</div><div class='del'>-			 *</div><div class='del'>-			 * We use DO_ACCOUNTING here because we need the</div><div class='del'>-			 * delalloc_release_metadata to be done _after_ we drop</div><div class='del'>-			 * our outstanding extent for clearing delalloc for this</div><div class='del'>-			 * range.</div><div class='del'>-			 */</div><div class='del'>-			extent_clear_unlock_delalloc(inode, start, end,</div><div class='del'>-						     NULL,</div><div class='del'>-						     clear_flags,</div><div class='del'>-						     PAGE_UNLOCK |</div><div class='del'>-						     PAGE_START_WRITEBACK |</div><div class='del'>-						     PAGE_END_WRITEBACK);</div><div class='del'>-			goto free_pages;</div><div class='del'>-		}</div><div class='add'>+	if (total_in &lt; actual_end)</div><div class='add'>+		ret = cow_file_range_inline(inode, NULL, start, end, 0,</div><div class='add'>+					    BTRFS_COMPRESS_NONE, NULL, false);</div><div class='add'>+	else</div><div class='add'>+		ret = cow_file_range_inline(inode, NULL, start, end, total_compressed,</div><div class='add'>+					    compress_type, folios[0], false);</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			mapping_set_error(mapping, -EIO);</div><div class='add'>+		goto free_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1027,8 +1023,9 @@ again:</div><div class='ctx'> 	 * The async work queues will take care of doing actual allocation on</div><div class='ctx'> 	 * disk for these compressed pages, and will submit the bios.</div><div class='ctx'> 	 */</div><div class='del'>-	add_async_extent(async_chunk, start, total_in, total_compressed, pages,</div><div class='del'>-			 nr_pages, compress_type);</div><div class='add'>+	ret = add_async_extent(async_chunk, start, total_in, total_compressed, folios,</div><div class='add'>+			       nr_folios, compress_type);</div><div class='add'>+	BUG_ON(ret);</div><div class='ctx'> 	if (start + total_in &lt; end) {</div><div class='ctx'> 		start += total_in;</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -1040,15 +1037,16 @@ mark_incompressible:</div><div class='ctx'> 	if (!btrfs_test_opt(fs_info, FORCE_COMPRESS) &amp;&amp; !inode-&gt;prop_compress)</div><div class='ctx'> 		inode-&gt;flags |= BTRFS_INODE_NOCOMPRESS;</div><div class='ctx'> cleanup_and_bail_uncompressed:</div><div class='del'>-	add_async_extent(async_chunk, start, end - start + 1, 0, NULL, 0,</div><div class='del'>-			 BTRFS_COMPRESS_NONE);</div><div class='add'>+	ret = add_async_extent(async_chunk, start, end - start + 1, 0, NULL, 0,</div><div class='add'>+			       BTRFS_COMPRESS_NONE);</div><div class='add'>+	BUG_ON(ret);</div><div class='ctx'> free_pages:</div><div class='del'>-	if (pages) {</div><div class='del'>-		for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-			WARN_ON(pages[i]-&gt;mapping);</div><div class='del'>-			btrfs_free_compr_page(pages[i]);</div><div class='add'>+	if (folios) {</div><div class='add'>+		for (i = 0; i &lt; nr_folios; i++) {</div><div class='add'>+			WARN_ON(folios[i]-&gt;mapping);</div><div class='add'>+			btrfs_free_compr_folio(folios[i]);</div><div class='ctx'> 		}</div><div class='del'>-		kfree(pages);</div><div class='add'>+		kfree(folios);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1056,21 +1054,21 @@ static void free_async_extent_pages(struct async_extent *async_extent)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!async_extent-&gt;pages)</div><div class='add'>+	if (!async_extent-&gt;folios)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; async_extent-&gt;nr_pages; i++) {</div><div class='del'>-		WARN_ON(async_extent-&gt;pages[i]-&gt;mapping);</div><div class='del'>-		btrfs_free_compr_page(async_extent-&gt;pages[i]);</div><div class='add'>+	for (i = 0; i &lt; async_extent-&gt;nr_folios; i++) {</div><div class='add'>+		WARN_ON(async_extent-&gt;folios[i]-&gt;mapping);</div><div class='add'>+		btrfs_free_compr_folio(async_extent-&gt;folios[i]);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(async_extent-&gt;pages);</div><div class='del'>-	async_extent-&gt;nr_pages = 0;</div><div class='del'>-	async_extent-&gt;pages = NULL;</div><div class='add'>+	kfree(async_extent-&gt;folios);</div><div class='add'>+	async_extent-&gt;nr_folios = 0;</div><div class='add'>+	async_extent-&gt;folios = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void submit_uncompressed_range(struct btrfs_inode *inode,</div><div class='ctx'> 				      struct async_extent *async_extent,</div><div class='del'>-				      struct page *locked_page)</div><div class='add'>+				      struct folio *locked_folio)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start = async_extent-&gt;start;</div><div class='ctx'> 	u64 end = async_extent-&gt;start + async_extent-&gt;ram_size - 1;</div><div class='hunk'>@@ -1083,21 +1081,17 @@ static void submit_uncompressed_range(struct btrfs_inode *inode,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	wbc_attach_fdatawrite_inode(&amp;wbc, &amp;inode-&gt;vfs_inode);</div><div class='del'>-	ret = run_delalloc_cow(inode, locked_page, start, end, &amp;wbc, false);</div><div class='add'>+	ret = run_delalloc_cow(inode, locked_folio, start, end,</div><div class='add'>+			       &amp;wbc, false);</div><div class='ctx'> 	wbc_detach_inode(&amp;wbc);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_cleanup_ordered_extents(inode, locked_page, start, end - start + 1);</div><div class='del'>-		if (locked_page) {</div><div class='del'>-			const u64 page_start = page_offset(locked_page);</div><div class='del'>-</div><div class='del'>-			set_page_writeback(locked_page);</div><div class='del'>-			end_page_writeback(locked_page);</div><div class='del'>-			btrfs_mark_ordered_io_finished(inode, locked_page,</div><div class='del'>-						       page_start, PAGE_SIZE,</div><div class='del'>-						       !ret);</div><div class='del'>-			mapping_set_error(locked_page-&gt;mapping, ret);</div><div class='del'>-			unlock_page(locked_page);</div><div class='del'>-		}</div><div class='add'>+		if (locked_folio)</div><div class='add'>+			btrfs_folio_end_lock(inode-&gt;root-&gt;fs_info, locked_folio,</div><div class='add'>+					     start, async_extent-&gt;ram_size);</div><div class='add'>+		btrfs_err_rl(inode-&gt;root-&gt;fs_info,</div><div class='add'>+			"%s failed, root=%llu inode=%llu start=%llu len=%llu: %d",</div><div class='add'>+			     __func__, btrfs_root_id(inode-&gt;root),</div><div class='add'>+			     btrfs_ino(inode), start, async_extent-&gt;ram_size, ret);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1110,10 +1104,13 @@ static void submit_one_async_extent(struct async_chunk *async_chunk,</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	struct btrfs_file_extent file_extent;</div><div class='ctx'> 	struct btrfs_key ins;</div><div class='del'>-	struct page *locked_page = NULL;</div><div class='add'>+	struct folio *locked_folio = NULL;</div><div class='add'>+	struct extent_state *cached = NULL;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	bool free_pages = false;</div><div class='ctx'> 	u64 start = async_extent-&gt;start;</div><div class='ctx'> 	u64 end = async_extent-&gt;start + async_extent-&gt;ram_size - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1121,62 +1118,61 @@ static void submit_one_async_extent(struct async_chunk *async_chunk,</div><div class='ctx'> 		kthread_associate_blkcg(async_chunk-&gt;blkcg_css);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If async_chunk-&gt;locked_page is in the async_extent range, we need to</div><div class='add'>+	 * If async_chunk-&gt;locked_folio is in the async_extent range, we need to</div><div class='ctx'> 	 * handle it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (async_chunk-&gt;locked_page) {</div><div class='del'>-		u64 locked_page_start = page_offset(async_chunk-&gt;locked_page);</div><div class='del'>-		u64 locked_page_end = locked_page_start + PAGE_SIZE - 1;</div><div class='add'>+	if (async_chunk-&gt;locked_folio) {</div><div class='add'>+		u64 locked_folio_start = folio_pos(async_chunk-&gt;locked_folio);</div><div class='add'>+		u64 locked_folio_end = locked_folio_start +</div><div class='add'>+			folio_size(async_chunk-&gt;locked_folio) - 1;</div><div class='ctx'> </div><div class='del'>-		if (!(start &gt;= locked_page_end || end &lt;= locked_page_start))</div><div class='del'>-			locked_page = async_chunk-&gt;locked_page;</div><div class='add'>+		if (!(start &gt;= locked_folio_end || end &lt;= locked_folio_start))</div><div class='add'>+			locked_folio = async_chunk-&gt;locked_folio;</div><div class='ctx'> 	}</div><div class='del'>-	lock_extent(io_tree, start, end, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (async_extent-&gt;compress_type == BTRFS_COMPRESS_NONE) {</div><div class='del'>-		submit_uncompressed_range(inode, async_extent, locked_page);</div><div class='add'>+		ASSERT(!async_extent-&gt;folios);</div><div class='add'>+		ASSERT(async_extent-&gt;nr_folios == 0);</div><div class='add'>+		submit_uncompressed_range(inode, async_extent, locked_folio);</div><div class='add'>+		free_pages = true;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_reserve_extent(root, async_extent-&gt;ram_size,</div><div class='ctx'> 				   async_extent-&gt;compressed_size,</div><div class='ctx'> 				   async_extent-&gt;compressed_size,</div><div class='del'>-				   0, *alloc_hint, &amp;ins, 1, 1);</div><div class='add'>+				   0, *alloc_hint, &amp;ins, true, true);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Here we used to try again by going back to non-compressed</div><div class='del'>-		 * path for ENOSPC.  But we can't reserve space even for</div><div class='del'>-		 * compressed size, how could it work for uncompressed size</div><div class='del'>-		 * which requires larger size?  So here we directly go error</div><div class='del'>-		 * path.</div><div class='add'>+		 * We can't reserve contiguous space for the compressed size.</div><div class='add'>+		 * Unlikely, but it's possible that we could have enough</div><div class='add'>+		 * non-contiguous space for the uncompressed size instead.  So</div><div class='add'>+		 * fall back to uncompressed.</div><div class='ctx'> 		 */</div><div class='del'>-		goto out_free;</div><div class='add'>+		submit_uncompressed_range(inode, async_extent, locked_folio);</div><div class='add'>+		free_pages = true;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	btrfs_lock_extent(io_tree, start, end, &amp;cached);</div><div class='add'>+</div><div class='ctx'> 	/* Here we're doing allocation and writeback of the compressed pages */</div><div class='del'>-	em = create_io_em(inode, start,</div><div class='del'>-			  async_extent-&gt;ram_size,	/* len */</div><div class='del'>-			  start,			/* orig_start */</div><div class='del'>-			  ins.objectid,			/* block_start */</div><div class='del'>-			  ins.offset,			/* block_len */</div><div class='del'>-			  ins.offset,			/* orig_block_len */</div><div class='del'>-			  async_extent-&gt;ram_size,	/* ram_bytes */</div><div class='del'>-			  async_extent-&gt;compress_type,</div><div class='del'>-			  BTRFS_ORDERED_COMPRESSED);</div><div class='add'>+	file_extent.disk_bytenr = ins.objectid;</div><div class='add'>+	file_extent.disk_num_bytes = ins.offset;</div><div class='add'>+	file_extent.ram_bytes = async_extent-&gt;ram_size;</div><div class='add'>+	file_extent.num_bytes = async_extent-&gt;ram_size;</div><div class='add'>+	file_extent.offset = 0;</div><div class='add'>+	file_extent.compression = async_extent-&gt;compress_type;</div><div class='add'>+</div><div class='add'>+	em = btrfs_create_io_em(inode, start, &amp;file_extent, BTRFS_ORDERED_COMPRESSED);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		ret = PTR_ERR(em);</div><div class='ctx'> 		goto out_free_reserve;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	ordered = btrfs_alloc_ordered_extent(inode, start,	/* file_offset */</div><div class='del'>-				       async_extent-&gt;ram_size,	/* num_bytes */</div><div class='del'>-				       async_extent-&gt;ram_size,	/* ram_bytes */</div><div class='del'>-				       ins.objectid,		/* disk_bytenr */</div><div class='del'>-				       ins.offset,		/* disk_num_bytes */</div><div class='del'>-				       0,			/* offset */</div><div class='del'>-				       1 &lt;&lt; BTRFS_ORDERED_COMPRESSED,</div><div class='del'>-				       async_extent-&gt;compress_type);</div><div class='add'>+	ordered = btrfs_alloc_ordered_extent(inode, start, &amp;file_extent,</div><div class='add'>+					     1U &lt;&lt; BTRFS_ORDERED_COMPRESSED);</div><div class='ctx'> 	if (IS_ERR(ordered)) {</div><div class='ctx'> 		btrfs_drop_extent_map_range(inode, start, end, false);</div><div class='ctx'> 		ret = PTR_ERR(ordered);</div><div class='hunk'>@@ -1186,26 +1182,28 @@ static void submit_one_async_extent(struct async_chunk *async_chunk,</div><div class='ctx'> </div><div class='ctx'> 	/* Clear dirty, set writeback and unlock the pages. */</div><div class='ctx'> 	extent_clear_unlock_delalloc(inode, start, end,</div><div class='del'>-			NULL, EXTENT_LOCKED | EXTENT_DELALLOC,</div><div class='add'>+			NULL, &amp;cached, EXTENT_LOCKED | EXTENT_DELALLOC,</div><div class='ctx'> 			PAGE_UNLOCK | PAGE_START_WRITEBACK);</div><div class='ctx'> 	btrfs_submit_compressed_write(ordered,</div><div class='del'>-			    async_extent-&gt;pages,	/* compressed_pages */</div><div class='del'>-			    async_extent-&gt;nr_pages,</div><div class='add'>+			    async_extent-&gt;folios,	/* compressed_folios */</div><div class='add'>+			    async_extent-&gt;nr_folios,</div><div class='ctx'> 			    async_chunk-&gt;write_flags, true);</div><div class='ctx'> 	*alloc_hint = ins.objectid + ins.offset;</div><div class='ctx'> done:</div><div class='ctx'> 	if (async_chunk-&gt;blkcg_css)</div><div class='ctx'> 		kthread_associate_blkcg(NULL);</div><div class='add'>+	if (free_pages)</div><div class='add'>+		free_async_extent_pages(async_extent);</div><div class='ctx'> 	kfree(async_extent);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_free_reserve:</div><div class='ctx'> 	btrfs_dec_block_group_reservations(fs_info, ins.objectid);</div><div class='del'>-	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);</div><div class='del'>-out_free:</div><div class='add'>+	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);</div><div class='ctx'> 	mapping_set_error(inode-&gt;vfs_inode.i_mapping, -EIO);</div><div class='ctx'> 	extent_clear_unlock_delalloc(inode, start, end,</div><div class='del'>-				     NULL, EXTENT_LOCKED | EXTENT_DELALLOC |</div><div class='add'>+				     NULL, &amp;cached,</div><div class='add'>+				     EXTENT_LOCKED | EXTENT_DELALLOC |</div><div class='ctx'> 				     EXTENT_DELALLOC_NEW |</div><div class='ctx'> 				     EXTENT_DEFRAG | EXTENT_DO_ACCOUNTING,</div><div class='ctx'> 				     PAGE_UNLOCK | PAGE_START_WRITEBACK |</div><div class='hunk'>@@ -1215,36 +1213,36 @@ out_free:</div><div class='ctx'> 		kthread_associate_blkcg(NULL);</div><div class='ctx'> 	btrfs_debug(fs_info,</div><div class='ctx'> "async extent submission failed root=%lld inode=%llu start=%llu len=%llu ret=%d",</div><div class='del'>-		    root-&gt;root_key.objectid, btrfs_ino(inode), start,</div><div class='add'>+		    btrfs_root_id(root), btrfs_ino(inode), start,</div><div class='ctx'> 		    async_extent-&gt;ram_size, ret);</div><div class='ctx'> 	kfree(async_extent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,</div><div class='del'>-				      u64 num_bytes)</div><div class='add'>+u64 btrfs_get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,</div><div class='add'>+				     u64 num_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	u64 alloc_hint = 0;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = search_extent_mapping(em_tree, start, num_bytes);</div><div class='add'>+	em = btrfs_search_extent_mapping(em_tree, start, num_bytes);</div><div class='ctx'> 	if (em) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if block start isn't an actual block number then find the</div><div class='ctx'> 		 * first block in this inode and use that as a hint.  If that</div><div class='ctx'> 		 * block is also bogus then just don't worry about it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-			em = search_extent_mapping(em_tree, 0, 0);</div><div class='del'>-			if (em &amp;&amp; em-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE)</div><div class='del'>-				alloc_hint = em-&gt;block_start;</div><div class='add'>+		if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+			em = btrfs_search_extent_mapping(em_tree, 0, 0);</div><div class='add'>+			if (em &amp;&amp; em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE)</div><div class='add'>+				alloc_hint = btrfs_extent_map_block_start(em);</div><div class='ctx'> 			if (em)</div><div class='del'>-				free_extent_map(em);</div><div class='add'>+				btrfs_free_extent_map(em);</div><div class='ctx'> 		} else {</div><div class='del'>-			alloc_hint = em-&gt;block_start;</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+			alloc_hint = btrfs_extent_map_block_start(em);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='hunk'>@@ -1258,39 +1256,36 @@ static u64 get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,</div><div class='ctx'>  * allocate extents on disk for the range, and create ordered data structs</div><div class='ctx'>  * in ram to track those extents.</div><div class='ctx'>  *</div><div class='del'>- * locked_page is the page that writepage had locked already.  We use</div><div class='add'>+ * locked_folio is the folio that writepage had locked already.  We use</div><div class='ctx'>  * it to make sure we don't do extra locks or unlocks.</div><div class='ctx'>  *</div><div class='del'>- * When this function fails, it unlocks all pages except @locked_page.</div><div class='add'>+ * When this function fails, it unlocks all folios except @locked_folio.</div><div class='ctx'>  *</div><div class='ctx'>  * When this function successfully creates an inline extent, it returns 1 and</div><div class='del'>- * unlocks all pages including locked_page and starts I/O on them.</div><div class='del'>- * (In reality inline extents are limited to a single page, so locked_page is</div><div class='del'>- * the only page handled anyway).</div><div class='add'>+ * unlocks all folios including locked_folio and starts I/O on them.</div><div class='add'>+ * (In reality inline extents are limited to a single block, so locked_folio is</div><div class='add'>+ * the only folio handled anyway).</div><div class='ctx'>  *</div><div class='del'>- * When this function succeed and creates a normal extent, the page locking</div><div class='add'>+ * When this function succeed and creates a normal extent, the folio locking</div><div class='ctx'>  * status depends on the passed in flags:</div><div class='ctx'>  *</div><div class='del'>- * - If @keep_locked is set, all pages are kept locked.</div><div class='del'>- * - Else all pages except for @locked_page are unlocked.</div><div class='add'>+ * - If COW_FILE_RANGE_KEEP_LOCKED flag is set, all folios are kept locked.</div><div class='add'>+ * - Else all folios except for @locked_folio are unlocked.</div><div class='ctx'>  *</div><div class='ctx'>  * When a failure happens in the second or later iteration of the</div><div class='del'>- * while-loop, the ordered extents created in previous iterations are kept</div><div class='del'>- * intact. So, the caller must clean them up by calling</div><div class='del'>- * btrfs_cleanup_ordered_extents(). See btrfs_run_delalloc_range() for</div><div class='del'>- * example.</div><div class='add'>+ * while-loop, the ordered extents created in previous iterations are cleaned up.</div><div class='ctx'>  */</div><div class='ctx'> static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='del'>-				   struct page *locked_page, u64 start, u64 end,</div><div class='del'>-				   u64 *done_offset,</div><div class='del'>-				   bool keep_locked, bool no_inline)</div><div class='add'>+				   struct folio *locked_folio, u64 start,</div><div class='add'>+				   u64 end, u64 *done_offset,</div><div class='add'>+				   unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	struct extent_state *cached = NULL;</div><div class='ctx'> 	u64 alloc_hint = 0;</div><div class='ctx'> 	u64 orig_start = start;</div><div class='ctx'> 	u64 num_bytes;</div><div class='del'>-	unsigned long ram_size;</div><div class='ctx'> 	u64 cur_alloc_size = 0;</div><div class='ctx'> 	u64 min_alloc_size;</div><div class='ctx'> 	u64 blocksize = fs_info-&gt;sectorsize;</div><div class='hunk'>@@ -1298,9 +1293,13 @@ static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	unsigned clear_bits;</div><div class='ctx'> 	unsigned long page_ops;</div><div class='del'>-	bool extent_reserved = false;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(fs_info))) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (btrfs_is_free_space_inode(inode)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -1312,57 +1311,36 @@ static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	inode_should_defrag(inode, start, end, num_bytes, SZ_64K);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Due to the page size limit, for subpage we can only trigger the</div><div class='del'>-	 * writeback for the dirty sectors of page, that means data writeback</div><div class='del'>-	 * is doing more writeback than what we want.</div><div class='del'>-	 *</div><div class='del'>-	 * This is especially unexpected for some call sites like fallocate,</div><div class='del'>-	 * where we only increase i_size after everything is done.</div><div class='del'>-	 * This means we can trigger inline extent even if we didn't want to.</div><div class='del'>-	 * So here we skip inline extent creation completely.</div><div class='del'>-	 */</div><div class='del'>-	if (start == 0 &amp;&amp; fs_info-&gt;sectorsize == PAGE_SIZE &amp;&amp; !no_inline) {</div><div class='del'>-		u64 actual_end = min_t(u64, i_size_read(&amp;inode-&gt;vfs_inode),</div><div class='del'>-				       end + 1);</div><div class='del'>-</div><div class='add'>+	if (!(flags &amp; COW_FILE_RANGE_NO_INLINE)) {</div><div class='ctx'> 		/* lets try to make an inline extent */</div><div class='del'>-		ret = cow_file_range_inline(inode, actual_end, 0,</div><div class='add'>+		ret = cow_file_range_inline(inode, locked_folio, start, end, 0,</div><div class='ctx'> 					    BTRFS_COMPRESS_NONE, NULL, false);</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * We use DO_ACCOUNTING here because we need the</div><div class='del'>-			 * delalloc_release_metadata to be run _after_ we drop</div><div class='del'>-			 * our outstanding extent for clearing delalloc for this</div><div class='del'>-			 * range.</div><div class='del'>-			 */</div><div class='del'>-			extent_clear_unlock_delalloc(inode, start, end,</div><div class='del'>-				     locked_page,</div><div class='del'>-				     EXTENT_LOCKED | EXTENT_DELALLOC |</div><div class='del'>-				     EXTENT_DELALLOC_NEW | EXTENT_DEFRAG |</div><div class='del'>-				     EXTENT_DO_ACCOUNTING, PAGE_UNLOCK |</div><div class='del'>-				     PAGE_START_WRITEBACK | PAGE_END_WRITEBACK);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * locked_page is locked by the caller of</div><div class='del'>-			 * writepage_delalloc(), not locked by</div><div class='del'>-			 * __process_pages_contig().</div><div class='del'>-			 *</div><div class='del'>-			 * We can't let __process_pages_contig() to unlock it,</div><div class='del'>-			 * as it doesn't have any subpage::writers recorded.</div><div class='add'>+			 * We succeeded, return 1 so the caller knows we're done</div><div class='add'>+			 * with this page and already handled the IO.</div><div class='ctx'> 			 *</div><div class='del'>-			 * Here we manually unlock the page, since the caller</div><div class='del'>-			 * can't determine if it's an inline extent or a</div><div class='del'>-			 * compressed extent.</div><div class='add'>+			 * If there was an error then cow_file_range_inline() has</div><div class='add'>+			 * already done the cleanup.</div><div class='ctx'> 			 */</div><div class='del'>-			unlock_page(locked_page);</div><div class='del'>-			ret = 1;</div><div class='add'>+			if (ret == 0)</div><div class='add'>+				ret = 1;</div><div class='ctx'> 			goto done;</div><div class='del'>-		} else if (ret &lt; 0) {</div><div class='del'>-			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	alloc_hint = get_extent_allocation_hint(inode, start, num_bytes);</div><div class='add'>+	alloc_hint = btrfs_get_extent_allocation_hint(inode, start, num_bytes);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're not doing compressed IO, don't unlock the first page (which</div><div class='add'>+	 * the caller expects to stay locked), don't clear any dirty bits and</div><div class='add'>+	 * don't set any writeback bits.</div><div class='add'>+	 *</div><div class='add'>+	 * Do set the Ordered (Private2) bit so we know this page was properly</div><div class='add'>+	 * setup for writepage.</div><div class='add'>+	 */</div><div class='add'>+	page_ops = ((flags &amp; COW_FILE_RANGE_KEEP_LOCKED) ? 0 : PAGE_UNLOCK);</div><div class='add'>+	page_ops |= PAGE_SET_ORDERED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Relocation relies on the relocated extents to have exactly the same</div><div class='hunk'>@@ -1382,11 +1360,11 @@ static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	while (num_bytes &gt; 0) {</div><div class='ctx'> 		struct btrfs_ordered_extent *ordered;</div><div class='add'>+		struct btrfs_file_extent file_extent;</div><div class='ctx'> </div><div class='del'>-		cur_alloc_size = num_bytes;</div><div class='del'>-		ret = btrfs_reserve_extent(root, cur_alloc_size, cur_alloc_size,</div><div class='add'>+		ret = btrfs_reserve_extent(root, num_bytes, num_bytes,</div><div class='ctx'> 					   min_alloc_size, 0, alloc_hint,</div><div class='del'>-					   &amp;ins, 1, 1);</div><div class='add'>+					   &amp;ins, true, true);</div><div class='ctx'> 		if (ret == -EAGAIN) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * btrfs_reserve_extent only returns -EAGAIN for zoned</div><div class='hunk'>@@ -1407,36 +1385,49 @@ static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (done_offset) {</div><div class='del'>-				*done_offset = start - 1;</div><div class='del'>-				return 0;</div><div class='add'>+				/*</div><div class='add'>+				 * Move @end to the end of the processed range,</div><div class='add'>+				 * and exit the loop to unlock the processed extents.</div><div class='add'>+				 */</div><div class='add'>+				end = start - 1;</div><div class='add'>+				ret = 0;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			ret = -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		cur_alloc_size = ins.offset;</div><div class='del'>-		extent_reserved = true;</div><div class='del'>-</div><div class='del'>-		ram_size = ins.offset;</div><div class='del'>-		em = create_io_em(inode, start, ins.offset, /* len */</div><div class='del'>-				  start, /* orig_start */</div><div class='del'>-				  ins.objectid, /* block_start */</div><div class='del'>-				  ins.offset, /* block_len */</div><div class='del'>-				  ins.offset, /* orig_block_len */</div><div class='del'>-				  ram_size, /* ram_bytes */</div><div class='del'>-				  BTRFS_COMPRESS_NONE, /* compress_type */</div><div class='del'>-				  BTRFS_ORDERED_REGULAR /* type */);</div><div class='add'>+</div><div class='add'>+		file_extent.disk_bytenr = ins.objectid;</div><div class='add'>+		file_extent.disk_num_bytes = ins.offset;</div><div class='add'>+		file_extent.num_bytes = ins.offset;</div><div class='add'>+		file_extent.ram_bytes = ins.offset;</div><div class='add'>+		file_extent.offset = 0;</div><div class='add'>+		file_extent.compression = BTRFS_COMPRESS_NONE;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Locked range will be released either during error clean up or</div><div class='add'>+		 * after the whole range is finished.</div><div class='add'>+		 */</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, start, start + cur_alloc_size - 1,</div><div class='add'>+				  &amp;cached);</div><div class='add'>+</div><div class='add'>+		em = btrfs_create_io_em(inode, start, &amp;file_extent,</div><div class='add'>+					BTRFS_ORDERED_REGULAR);</div><div class='ctx'> 		if (IS_ERR(em)) {</div><div class='add'>+			btrfs_unlock_extent(&amp;inode-&gt;io_tree, start,</div><div class='add'>+					    start + cur_alloc_size - 1, &amp;cached);</div><div class='ctx'> 			ret = PTR_ERR(em);</div><div class='ctx'> 			goto out_reserve;</div><div class='ctx'> 		}</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-		ordered = btrfs_alloc_ordered_extent(inode, start, ram_size,</div><div class='del'>-					ram_size, ins.objectid, cur_alloc_size,</div><div class='del'>-					0, 1 &lt;&lt; BTRFS_ORDERED_REGULAR,</div><div class='del'>-					BTRFS_COMPRESS_NONE);</div><div class='add'>+		ordered = btrfs_alloc_ordered_extent(inode, start, &amp;file_extent,</div><div class='add'>+						     1U &lt;&lt; BTRFS_ORDERED_REGULAR);</div><div class='ctx'> 		if (IS_ERR(ordered)) {</div><div class='add'>+			btrfs_unlock_extent(&amp;inode-&gt;io_tree, start,</div><div class='add'>+					    start + cur_alloc_size - 1, &amp;cached);</div><div class='ctx'> 			ret = PTR_ERR(ordered);</div><div class='ctx'> 			goto out_drop_extent_cache;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1457,35 +1448,20 @@ static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				btrfs_drop_extent_map_range(inode, start,</div><div class='del'>-							    start + ram_size - 1,</div><div class='add'>+							    start + cur_alloc_size - 1,</div><div class='ctx'> 							    false);</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='ctx'> </div><div class='ctx'> 		btrfs_dec_block_group_reservations(fs_info, ins.objectid);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * We're not doing compressed IO, don't unlock the first page</div><div class='del'>-		 * (which the caller expects to stay locked), don't clear any</div><div class='del'>-		 * dirty bits and don't set any writeback bits</div><div class='del'>-		 *</div><div class='del'>-		 * Do set the Ordered (Private2) bit so we know this page was</div><div class='del'>-		 * properly setup for writepage.</div><div class='del'>-		 */</div><div class='del'>-		page_ops = (keep_locked ? 0 : PAGE_UNLOCK);</div><div class='del'>-		page_ops |= PAGE_SET_ORDERED;</div><div class='del'>-</div><div class='del'>-		extent_clear_unlock_delalloc(inode, start, start + ram_size - 1,</div><div class='del'>-					     locked_page,</div><div class='del'>-					     EXTENT_LOCKED | EXTENT_DELALLOC,</div><div class='del'>-					     page_ops);</div><div class='ctx'> 		if (num_bytes &lt; cur_alloc_size)</div><div class='ctx'> 			num_bytes = 0;</div><div class='ctx'> 		else</div><div class='ctx'> 			num_bytes -= cur_alloc_size;</div><div class='ctx'> 		alloc_hint = ins.objectid + ins.offset;</div><div class='ctx'> 		start += cur_alloc_size;</div><div class='del'>-		extent_reserved = false;</div><div class='add'>+		cur_alloc_size = 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * btrfs_reloc_clone_csums() error, since start is increased</div><div class='hunk'>@@ -1495,16 +1471,18 @@ static noinline int cow_file_range(struct btrfs_inode *inode,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 	}</div><div class='add'>+	extent_clear_unlock_delalloc(inode, orig_start, end, locked_folio, &amp;cached,</div><div class='add'>+				     EXTENT_LOCKED | EXTENT_DELALLOC, page_ops);</div><div class='ctx'> done:</div><div class='ctx'> 	if (done_offset)</div><div class='ctx'> 		*done_offset = end;</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> out_drop_extent_cache:</div><div class='del'>-	btrfs_drop_extent_map_range(inode, start, start + ram_size - 1, false);</div><div class='add'>+	btrfs_drop_extent_map_range(inode, start, start + cur_alloc_size - 1, false);</div><div class='ctx'> out_reserve:</div><div class='ctx'> 	btrfs_dec_block_group_reservations(fs_info, ins.objectid);</div><div class='del'>-	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);</div><div class='add'>+	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now, we have three regions to clean up:</div><div class='hunk'>@@ -1515,29 +1493,31 @@ out_unlock:</div><div class='ctx'> 	 * We process each region below.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	clear_bits = EXTENT_LOCKED | EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='del'>-		EXTENT_DEFRAG | EXTENT_CLEAR_META_RESV;</div><div class='del'>-	page_ops = PAGE_UNLOCK | PAGE_START_WRITEBACK | PAGE_END_WRITEBACK;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For the range (1). We have already instantiated the ordered extents</div><div class='del'>-	 * for this region. They are cleaned up by</div><div class='del'>-	 * btrfs_cleanup_ordered_extents() in e.g,</div><div class='del'>-	 * btrfs_run_delalloc_range(). EXTENT_LOCKED | EXTENT_DELALLOC are</div><div class='del'>-	 * already cleared in the above loop. And, EXTENT_DELALLOC_NEW |</div><div class='del'>-	 * EXTENT_DEFRAG | EXTENT_CLEAR_META_RESV are handled by the cleanup</div><div class='del'>-	 * function.</div><div class='add'>+	 * for this region, thus we need to cleanup those ordered extents.</div><div class='add'>+	 * EXTENT_DELALLOC_NEW | EXTENT_DEFRAG | EXTENT_CLEAR_META_RESV</div><div class='add'>+	 * are also handled by the ordered extents cleanup.</div><div class='ctx'> 	 *</div><div class='del'>-	 * However, in case of @keep_locked, we still need to unlock the pages</div><div class='del'>-	 * (except @locked_page) to ensure all the pages are unlocked.</div><div class='add'>+	 * So here we only clear EXTENT_LOCKED and EXTENT_DELALLOC flag, and</div><div class='add'>+	 * finish the writeback of the involved folios, which will be never submitted.</div><div class='ctx'> 	 */</div><div class='del'>-	if (keep_locked &amp;&amp; orig_start &lt; start) {</div><div class='del'>-		if (!locked_page)</div><div class='add'>+	if (orig_start &lt; start) {</div><div class='add'>+		clear_bits = EXTENT_LOCKED | EXTENT_DELALLOC;</div><div class='add'>+		page_ops = PAGE_UNLOCK | PAGE_START_WRITEBACK | PAGE_END_WRITEBACK;</div><div class='add'>+</div><div class='add'>+		if (!locked_folio)</div><div class='ctx'> 			mapping_set_error(inode-&gt;vfs_inode.i_mapping, ret);</div><div class='add'>+</div><div class='add'>+		btrfs_cleanup_ordered_extents(inode, orig_start, start - orig_start);</div><div class='ctx'> 		extent_clear_unlock_delalloc(inode, orig_start, start - 1,</div><div class='del'>-					     locked_page, 0, page_ops);</div><div class='add'>+					     locked_folio, NULL, clear_bits, page_ops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clear_bits = EXTENT_LOCKED | EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='add'>+		     EXTENT_DEFRAG | EXTENT_CLEAR_META_RESV;</div><div class='add'>+	page_ops = PAGE_UNLOCK | PAGE_START_WRITEBACK | PAGE_END_WRITEBACK;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For the range (2). If we reserved an extent for our delalloc range</div><div class='ctx'> 	 * (or a subrange) and failed to create the respective ordered extent,</div><div class='hunk'>@@ -1548,13 +1528,12 @@ out_unlock:</div><div class='ctx'> 	 * to decrement again the data space_info's bytes_may_use counter,</div><div class='ctx'> 	 * therefore we do not pass it the flag EXTENT_CLEAR_DATA_RESV.</div><div class='ctx'> 	 */</div><div class='del'>-	if (extent_reserved) {</div><div class='add'>+	if (cur_alloc_size) {</div><div class='ctx'> 		extent_clear_unlock_delalloc(inode, start,</div><div class='ctx'> 					     start + cur_alloc_size - 1,</div><div class='del'>-					     locked_page,</div><div class='del'>-					     clear_bits,</div><div class='add'>+					     locked_folio, &amp;cached, clear_bits,</div><div class='ctx'> 					     page_ops);</div><div class='del'>-		start += cur_alloc_size;</div><div class='add'>+		btrfs_qgroup_free_data(inode, NULL, start, cur_alloc_size, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1563,11 +1542,19 @@ out_unlock:</div><div class='ctx'> 	 * space_info's bytes_may_use counter, reserved in</div><div class='ctx'> 	 * btrfs_check_data_free_space().</div><div class='ctx'> 	 */</div><div class='del'>-	if (start &lt; end) {</div><div class='add'>+	if (start + cur_alloc_size &lt; end) {</div><div class='ctx'> 		clear_bits |= EXTENT_CLEAR_DATA_RESV;</div><div class='del'>-		extent_clear_unlock_delalloc(inode, start, end, locked_page,</div><div class='del'>-					     clear_bits, page_ops);</div><div class='del'>-	}</div><div class='add'>+		extent_clear_unlock_delalloc(inode, start + cur_alloc_size,</div><div class='add'>+					     end, locked_folio,</div><div class='add'>+					     &amp;cached, clear_bits, page_ops);</div><div class='add'>+		btrfs_qgroup_free_data(inode, NULL, start + cur_alloc_size,</div><div class='add'>+				       end - start - cur_alloc_size + 1, NULL);</div><div class='add'>+	}</div><div class='add'>+	btrfs_err(fs_info,</div><div class='add'>+"%s failed, root=%llu inode=%llu start=%llu len=%llu cur_offset=%llu cur_alloc_size=%llu: %d",</div><div class='add'>+		  __func__, btrfs_root_id(inode-&gt;root),</div><div class='add'>+		  btrfs_ino(inode), orig_start, end + 1 - orig_start,</div><div class='add'>+		  start, cur_alloc_size, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1589,10 +1576,8 @@ static noinline void submit_compressed_extents(struct btrfs_work *work, bool do_</div><div class='ctx'> 	u64 alloc_hint = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (do_free) {</div><div class='del'>-		struct async_chunk *async_chunk;</div><div class='ctx'> 		struct async_cow *async_cow;</div><div class='ctx'> </div><div class='del'>-		async_chunk = container_of(work, struct async_chunk, work);</div><div class='ctx'> 		btrfs_add_delayed_iput(async_chunk-&gt;inode);</div><div class='ctx'> 		if (async_chunk-&gt;blkcg_css)</div><div class='ctx'> 			css_put(async_chunk-&gt;blkcg_css);</div><div class='hunk'>@@ -1607,8 +1592,8 @@ static noinline void submit_compressed_extents(struct btrfs_work *work, bool do_</div><div class='ctx'> 		PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;async_chunk-&gt;extents)) {</div><div class='del'>-		async_extent = list_entry(async_chunk-&gt;extents.next,</div><div class='del'>-					  struct async_extent, list);</div><div class='add'>+		async_extent = list_first_entry(&amp;async_chunk-&gt;extents,</div><div class='add'>+						struct async_extent, list);</div><div class='ctx'> 		list_del(&amp;async_extent-&gt;list);</div><div class='ctx'> 		submit_one_async_extent(async_chunk, async_extent, &amp;alloc_hint);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1620,7 +1605,7 @@ static noinline void submit_compressed_extents(struct btrfs_work *work, bool do_</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool run_delalloc_compressed(struct btrfs_inode *inode,</div><div class='del'>-				    struct page *locked_page, u64 start,</div><div class='add'>+				    struct folio *locked_folio, u64 start,</div><div class='ctx'> 				    u64 end, struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='hunk'>@@ -1639,7 +1624,6 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, start, end, NULL);</div><div class='ctx'> 	set_bit(BTRFS_INODE_HAS_ASYNC_EXTENT, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	async_chunk = ctx-&gt;chunks;</div><div class='hunk'>@@ -1661,15 +1645,16 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;async_chunk[i].extents);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * The locked_page comes all the way from writepage and its</div><div class='del'>-		 * the original page we were actually given.  As we spread</div><div class='add'>+		 * The locked_folio comes all the way from writepage and its</div><div class='add'>+		 * the original folio we were actually given.  As we spread</div><div class='ctx'> 		 * this large delalloc region across multiple async_chunk</div><div class='del'>-		 * structs, only the first struct needs a pointer to locked_page</div><div class='add'>+		 * structs, only the first struct needs a pointer to</div><div class='add'>+		 * locked_folio.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * This way we don't need racey decisions about who is supposed</div><div class='ctx'> 		 * to unlock it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (locked_page) {</div><div class='add'>+		if (locked_folio) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Depending on the compressibility, the pages might or</div><div class='ctx'> 			 * might not go through async.  We want all of them to</div><div class='hunk'>@@ -1679,12 +1664,12 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,</div><div class='ctx'> 			 * need full accuracy.  Just account the whole thing</div><div class='ctx'> 			 * against the first page.</div><div class='ctx'> 			 */</div><div class='del'>-			wbc_account_cgroup_owner(wbc, locked_page,</div><div class='add'>+			wbc_account_cgroup_owner(wbc, locked_folio,</div><div class='ctx'> 						 cur_end - start);</div><div class='del'>-			async_chunk[i].locked_page = locked_page;</div><div class='del'>-			locked_page = NULL;</div><div class='add'>+			async_chunk[i].locked_folio = locked_folio;</div><div class='add'>+			locked_folio = NULL;</div><div class='ctx'> 		} else {</div><div class='del'>-			async_chunk[i].locked_page = NULL;</div><div class='add'>+			async_chunk[i].locked_folio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (blkcg_css != blkcg_root_css) {</div><div class='hunk'>@@ -1713,7 +1698,7 @@ static bool run_delalloc_compressed(struct btrfs_inode *inode,</div><div class='ctx'>  * covered by the range.</div><div class='ctx'>  */</div><div class='ctx'> static noinline int run_delalloc_cow(struct btrfs_inode *inode,</div><div class='del'>-				     struct page *locked_page, u64 start,</div><div class='add'>+				     struct folio *locked_folio, u64 start,</div><div class='ctx'> 				     u64 end, struct writeback_control *wbc,</div><div class='ctx'> 				     bool pages_dirty)</div><div class='ctx'> {</div><div class='hunk'>@@ -1721,48 +1706,27 @@ static noinline int run_delalloc_cow(struct btrfs_inode *inode,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	while (start &lt;= end) {</div><div class='del'>-		ret = cow_file_range(inode, locked_page, start, end, &amp;done_offset,</div><div class='del'>-				     true, false);</div><div class='add'>+		ret = cow_file_range(inode, locked_folio, start, end,</div><div class='add'>+				     &amp;done_offset, COW_FILE_RANGE_KEEP_LOCKED);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		extent_write_locked_range(&amp;inode-&gt;vfs_inode, locked_page, start,</div><div class='del'>-					  done_offset, wbc, pages_dirty);</div><div class='add'>+		extent_write_locked_range(&amp;inode-&gt;vfs_inode, locked_folio,</div><div class='add'>+					  start, done_offset, wbc, pages_dirty);</div><div class='ctx'> 		start = done_offset + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int csum_exist_in_range(struct btrfs_fs_info *fs_info,</div><div class='del'>-					u64 bytenr, u64 num_bytes, bool nowait)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_root *csum_root = btrfs_csum_root(fs_info, bytenr);</div><div class='del'>-	struct btrfs_ordered_sum *sums;</div><div class='del'>-	int ret;</div><div class='del'>-	LIST_HEAD(list);</div><div class='del'>-</div><div class='del'>-	ret = btrfs_lookup_csums_list(csum_root, bytenr, bytenr + num_bytes - 1,</div><div class='del'>-				      &amp;list, 0, nowait);</div><div class='del'>-	if (ret == 0 &amp;&amp; list_empty(&amp;list))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;list)) {</div><div class='del'>-		sums = list_entry(list.next, struct btrfs_ordered_sum, list);</div><div class='del'>-		list_del(&amp;sums-&gt;list);</div><div class='del'>-		kfree(sums);</div><div class='del'>-	}</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fallback_to_cow(struct btrfs_inode *inode, struct page *locked_page,</div><div class='del'>-			   const u64 start, const u64 end)</div><div class='add'>+static int fallback_to_cow(struct btrfs_inode *inode,</div><div class='add'>+			   struct folio *locked_folio, const u64 start,</div><div class='add'>+			   const u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	const bool is_space_ino = btrfs_is_free_space_inode(inode);</div><div class='ctx'> 	const bool is_reloc_ino = btrfs_is_data_reloc_root(inode-&gt;root);</div><div class='ctx'> 	const u64 range_bytes = end + 1 - start;</div><div class='ctx'> 	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 range_start = start;</div><div class='ctx'> 	u64 count;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1799,8 +1763,9 @@ static int fallback_to_cow(struct btrfs_inode *inode, struct page *locked_page,</div><div class='ctx'> 	 * group that contains that extent to RO mode and therefore force COW</div><div class='ctx'> 	 * when starting writeback.</div><div class='ctx'> 	 */</div><div class='del'>-	count = count_range_bits(io_tree, &amp;range_start, end, range_bytes,</div><div class='del'>-				 EXTENT_NORESERVE, 0, NULL);</div><div class='add'>+	btrfs_lock_extent(io_tree, start, end, &amp;cached_state);</div><div class='add'>+	count = btrfs_count_range_bits(io_tree, &amp;range_start, end, range_bytes,</div><div class='add'>+				       EXTENT_NORESERVE, 0, NULL);</div><div class='ctx'> 	if (count &gt; 0 || is_space_ino || is_reloc_ino) {</div><div class='ctx'> 		u64 bytes = count;</div><div class='ctx'> 		struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='hunk'>@@ -1810,20 +1775,28 @@ static int fallback_to_cow(struct btrfs_inode *inode, struct page *locked_page,</div><div class='ctx'> 			bytes = range_bytes;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;sinfo-&gt;lock);</div><div class='del'>-		btrfs_space_info_update_bytes_may_use(fs_info, sinfo, bytes);</div><div class='add'>+		btrfs_space_info_update_bytes_may_use(sinfo, bytes);</div><div class='ctx'> 		spin_unlock(&amp;sinfo-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		if (count &gt; 0)</div><div class='del'>-			clear_extent_bit(io_tree, start, end, EXTENT_NORESERVE,</div><div class='del'>-					 NULL);</div><div class='add'>+			btrfs_clear_extent_bit(io_tree, start, end, EXTENT_NORESERVE,</div><div class='add'>+					       &amp;cached_state);</div><div class='ctx'> 	}</div><div class='add'>+	btrfs_unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't try to create inline extents, as a mix of inline extent that</div><div class='ctx'> 	 * is written out and unlocked directly and a normal NOCOW extent</div><div class='ctx'> 	 * doesn't work.</div><div class='add'>+	 *</div><div class='add'>+	 * And here we do not unlock the folio after a successful run.</div><div class='add'>+	 * The folios will be unlocked after everything is finished, or by error handling.</div><div class='add'>+	 *</div><div class='add'>+	 * This is to ensure error handling won't need to clear dirty/ordered flags without</div><div class='add'>+	 * a locked folio, which can race with writeback.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = cow_file_range(inode, locked_page, start, end, NULL, false, true);</div><div class='add'>+	ret = cow_file_range(inode, locked_folio, start, end, NULL,</div><div class='add'>+			     COW_FILE_RANGE_NO_INLINE | COW_FILE_RANGE_KEEP_LOCKED);</div><div class='ctx'> 	ASSERT(ret != 1);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1836,20 +1809,17 @@ struct can_nocow_file_extent_args {</div><div class='ctx'> 	/* End file offset (inclusive) of the range we want to NOCOW. */</div><div class='ctx'> 	u64 end;</div><div class='ctx'> 	bool writeback_path;</div><div class='del'>-	bool strict;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Free the path passed to can_nocow_file_extent() once it's not needed</div><div class='ctx'> 	 * anymore.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool free_path;</div><div class='ctx'> </div><div class='del'>-	/* Output fields. Only set when can_nocow_file_extent() returns 1. */</div><div class='del'>-</div><div class='del'>-	u64 disk_bytenr;</div><div class='del'>-	u64 disk_num_bytes;</div><div class='del'>-	u64 extent_offset;</div><div class='del'>-	/* Number of bytes that can be written to in NOCOW mode. */</div><div class='del'>-	u64 num_bytes;</div><div class='add'>+	/*</div><div class='add'>+	 * Output fields. Only set when can_nocow_file_extent() returns 1.</div><div class='add'>+	 * The expected file extent for the NOCOW write.</div><div class='add'>+	 */</div><div class='add'>+	struct btrfs_file_extent file_extent;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1870,6 +1840,8 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='add'>+	struct btrfs_root *csum_root;</div><div class='add'>+	u64 io_start;</div><div class='ctx'> 	u64 extent_end;</div><div class='ctx'> 	u8 extent_type;</div><div class='ctx'> 	int can_nocow = 0;</div><div class='hunk'>@@ -1882,11 +1854,6 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	if (extent_type == BTRFS_FILE_EXTENT_INLINE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Can't access these fields unless we know it's not an inline extent. */</div><div class='del'>-	args-&gt;disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);</div><div class='del'>-	args-&gt;disk_num_bytes = btrfs_file_extent_disk_num_bytes(leaf, fi);</div><div class='del'>-	args-&gt;extent_offset = btrfs_file_extent_offset(leaf, fi);</div><div class='del'>-</div><div class='ctx'> 	if (!(inode-&gt;flags &amp; BTRFS_INODE_NODATACOW) &amp;&amp;</div><div class='ctx'> 	    extent_type == BTRFS_FILE_EXTENT_REG)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1896,13 +1863,12 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	 * for its subvolume was created, then this implies the extent is shared,</div><div class='ctx'> 	 * hence we must COW.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!args-&gt;strict &amp;&amp;</div><div class='del'>-	    btrfs_file_extent_generation(leaf, fi) &lt;=</div><div class='add'>+	if (btrfs_file_extent_generation(leaf, fi) &lt;=</div><div class='ctx'> 	    btrfs_root_last_snapshot(&amp;root-&gt;root_item))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* An explicit hole, must COW. */</div><div class='del'>-	if (args-&gt;disk_bytenr == 0)</div><div class='add'>+	if (btrfs_file_extent_disk_bytenr(leaf, fi) == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Compressed/encrypted/encoded extents must be COWed. */</div><div class='hunk'>@@ -1913,6 +1879,12 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> </div><div class='ctx'> 	extent_end = btrfs_file_extent_end(path);</div><div class='ctx'> </div><div class='add'>+	args-&gt;file_extent.disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);</div><div class='add'>+	args-&gt;file_extent.disk_num_bytes = btrfs_file_extent_disk_num_bytes(leaf, fi);</div><div class='add'>+	args-&gt;file_extent.ram_bytes = btrfs_file_extent_ram_bytes(leaf, fi);</div><div class='add'>+	args-&gt;file_extent.offset = btrfs_file_extent_offset(leaf, fi);</div><div class='add'>+	args-&gt;file_extent.compression = btrfs_file_extent_compression(leaf, fi);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The following checks can be expensive, as they need to take other</div><div class='ctx'> 	 * locks and do btree or rbtree searches, so release the path to avoid</div><div class='hunk'>@@ -1920,9 +1892,8 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_cross_ref_exist(root, btrfs_ino(inode),</div><div class='del'>-				    key-&gt;offset - args-&gt;extent_offset,</div><div class='del'>-				    args-&gt;disk_bytenr, args-&gt;strict, path);</div><div class='add'>+	ret = btrfs_cross_ref_exist(inode, key-&gt;offset - args-&gt;file_extent.offset,</div><div class='add'>+				    args-&gt;file_extent.disk_bytenr, path);</div><div class='ctx'> 	WARN_ON_ONCE(ret &gt; 0 &amp;&amp; is_freespace_inode);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1930,7 +1901,7 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	if (args-&gt;free_path) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't need the path anymore, plus through the</div><div class='del'>-		 * csum_exist_in_range() call below we will end up allocating</div><div class='add'>+		 * btrfs_lookup_csums_list() call below we will end up allocating</div><div class='ctx'> 		 * another path. So free the path to avoid unnecessary extra</div><div class='ctx'> 		 * memory usage.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1943,16 +1914,19 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	    atomic_read(&amp;root-&gt;snapshot_force_cow))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	args-&gt;disk_bytenr += args-&gt;extent_offset;</div><div class='del'>-	args-&gt;disk_bytenr += args-&gt;start - key-&gt;offset;</div><div class='del'>-	args-&gt;num_bytes = min(args-&gt;end + 1, extent_end) - args-&gt;start;</div><div class='add'>+	args-&gt;file_extent.num_bytes = min(args-&gt;end + 1, extent_end) - args-&gt;start;</div><div class='add'>+	args-&gt;file_extent.offset += args-&gt;start - key-&gt;offset;</div><div class='add'>+	io_start = args-&gt;file_extent.disk_bytenr + args-&gt;file_extent.offset;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Force COW if csums exist in the range. This ensures that csums for a</div><div class='ctx'> 	 * given extent are either valid or do not exist.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = csum_exist_in_range(root-&gt;fs_info, args-&gt;disk_bytenr, args-&gt;num_bytes,</div><div class='del'>-				  nowait);</div><div class='add'>+</div><div class='add'>+	csum_root = btrfs_csum_root(root-&gt;fs_info, io_start);</div><div class='add'>+	ret = btrfs_lookup_csums_list(csum_root, io_start,</div><div class='add'>+				      io_start + args-&gt;file_extent.num_bytes - 1,</div><div class='add'>+				      NULL, nowait);</div><div class='ctx'> 	WARN_ON_ONCE(ret &gt; 0 &amp;&amp; is_freespace_inode);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1965,26 +1939,107 @@ static int can_nocow_file_extent(struct btrfs_path *path,</div><div class='ctx'> 	return ret &lt; 0 ? ret : can_nocow;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nocow_one_range(struct btrfs_inode *inode, struct folio *locked_folio,</div><div class='add'>+			   struct extent_state **cached,</div><div class='add'>+			   struct can_nocow_file_extent_args *nocow_args,</div><div class='add'>+			   u64 file_pos, bool is_prealloc)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	const u64 len = nocow_args-&gt;file_extent.num_bytes;</div><div class='add'>+	const u64 end = file_pos + len - 1;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, file_pos, end, cached);</div><div class='add'>+</div><div class='add'>+	if (is_prealloc) {</div><div class='add'>+		struct extent_map *em;</div><div class='add'>+</div><div class='add'>+		em = btrfs_create_io_em(inode, file_pos, &amp;nocow_args-&gt;file_extent,</div><div class='add'>+					BTRFS_ORDERED_PREALLOC);</div><div class='add'>+		if (IS_ERR(em)) {</div><div class='add'>+			ret = PTR_ERR(em);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ordered = btrfs_alloc_ordered_extent(inode, file_pos, &amp;nocow_args-&gt;file_extent,</div><div class='add'>+					     is_prealloc</div><div class='add'>+					     ? (1U &lt;&lt; BTRFS_ORDERED_PREALLOC)</div><div class='add'>+					     : (1U &lt;&lt; BTRFS_ORDERED_NOCOW));</div><div class='add'>+	if (IS_ERR(ordered)) {</div><div class='add'>+		if (is_prealloc)</div><div class='add'>+			btrfs_drop_extent_map_range(inode, file_pos, end, false);</div><div class='add'>+		ret = PTR_ERR(ordered);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (btrfs_is_data_reloc_root(inode-&gt;root))</div><div class='add'>+		/*</div><div class='add'>+		 * Errors are handled later, as we must prevent</div><div class='add'>+		 * extent_clear_unlock_delalloc() in error handler from freeing</div><div class='add'>+		 * metadata of the created ordered extent.</div><div class='add'>+		 */</div><div class='add'>+		ret = btrfs_reloc_clone_csums(ordered);</div><div class='add'>+	btrfs_put_ordered_extent(ordered);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	extent_clear_unlock_delalloc(inode, file_pos, end, locked_folio, cached,</div><div class='add'>+				     EXTENT_LOCKED | EXTENT_DELALLOC |</div><div class='add'>+				     EXTENT_CLEAR_DATA_RESV,</div><div class='add'>+				     PAGE_SET_ORDERED);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	btrfs_cleanup_ordered_extents(inode, file_pos, len);</div><div class='add'>+	extent_clear_unlock_delalloc(inode, file_pos, end, locked_folio, cached,</div><div class='add'>+				     EXTENT_LOCKED | EXTENT_DELALLOC |</div><div class='add'>+				     EXTENT_CLEAR_DATA_RESV,</div><div class='add'>+				     PAGE_UNLOCK | PAGE_START_WRITEBACK |</div><div class='add'>+				     PAGE_END_WRITEBACK);</div><div class='add'>+	btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		  "%s failed, root=%lld inode=%llu start=%llu len=%llu: %d",</div><div class='add'>+		  __func__, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+		  file_pos, len, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * when nowcow writeback call back.  This checks for snapshots or COW copies</div><div class='add'>+ * When nocow writeback calls back.  This checks for snapshots or COW copies</div><div class='ctx'>  * of the extents that exist in the file, and COWs the file as required.</div><div class='ctx'>  *</div><div class='ctx'>  * If no cow copies or snapshots exist, we write directly to the existing</div><div class='ctx'>  * blocks on disk</div><div class='ctx'>  */</div><div class='ctx'> static noinline int run_delalloc_nocow(struct btrfs_inode *inode,</div><div class='del'>-				       struct page *locked_page,</div><div class='add'>+				       struct folio *locked_folio,</div><div class='ctx'> 				       const u64 start, const u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	struct btrfs_path *path = NULL;</div><div class='ctx'> 	u64 cow_start = (u64)-1;</div><div class='add'>+	/*</div><div class='add'>+	 * If not 0, represents the inclusive end of the last fallback_to_cow()</div><div class='add'>+	 * range. Only for error handling.</div><div class='add'>+	 *</div><div class='add'>+	 * The same for nocow_end, it's to avoid double cleaning up the range</div><div class='add'>+	 * already cleaned by nocow_one_range().</div><div class='add'>+	 */</div><div class='add'>+	u64 cow_end = 0;</div><div class='add'>+	u64 nocow_end = 0;</div><div class='ctx'> 	u64 cur_offset = start;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool check_prev = true;</div><div class='ctx'> 	u64 ino = btrfs_ino(inode);</div><div class='ctx'> 	struct can_nocow_file_extent_args nocow_args = { 0 };</div><div class='add'>+	/* The range that has ordered extent(s). */</div><div class='add'>+	u64 oe_cleanup_start;</div><div class='add'>+	u64 oe_cleanup_len = 0;</div><div class='add'>+	/* The range that is untouched. */</div><div class='add'>+	u64 untouched_start;</div><div class='add'>+	u64 untouched_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Normally on a zoned device we're only doing COW writes, but in case</div><div class='hunk'>@@ -1993,6 +2048,10 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(!btrfs_is_zoned(fs_info) || btrfs_is_data_reloc_root(root));</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(fs_info))) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -2002,17 +2061,14 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode,</div><div class='ctx'> 	nocow_args.end = end;</div><div class='ctx'> 	nocow_args.writeback_path = true;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	while (cur_offset &lt;= end) {</div><div class='ctx'> 		struct btrfs_block_group *nocow_bg = NULL;</div><div class='del'>-		struct btrfs_ordered_extent *ordered;</div><div class='ctx'> 		struct btrfs_key found_key;</div><div class='ctx'> 		struct btrfs_file_extent_item *fi;</div><div class='ctx'> 		struct extent_buffer *leaf;</div><div class='add'>+		struct extent_state *cached_state = NULL;</div><div class='ctx'> 		u64 extent_end;</div><div class='del'>-		u64 ram_bytes;</div><div class='del'>-		u64 nocow_end;</div><div class='ctx'> 		int extent_type;</div><div class='del'>-		bool is_prealloc;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_lookup_file_extent(NULL, root, path, ino,</div><div class='ctx'> 					       cur_offset, 0);</div><div class='hunk'>@@ -2067,12 +2123,13 @@ next_slot:</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the found extent starts after requested offset, then</div><div class='del'>-		 * adjust extent_end to be right before this extent begins</div><div class='add'>+		 * adjust cur_offset to be right before this extent begins.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (found_key.offset &gt; cur_offset) {</div><div class='del'>-			extent_end = found_key.offset;</div><div class='del'>-			extent_type = 0;</div><div class='del'>-			goto must_cow;</div><div class='add'>+			if (cow_start == (u64)-1)</div><div class='add'>+				cow_start = cur_offset;</div><div class='add'>+			cur_offset = found_key.offset;</div><div class='add'>+			goto next_slot;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2088,7 +2145,6 @@ next_slot:</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		ram_bytes = btrfs_file_extent_ram_bytes(leaf, fi);</div><div class='ctx'> 		extent_end = btrfs_file_extent_end(path);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2108,7 +2164,9 @@ next_slot:</div><div class='ctx'> 			goto must_cow;</div><div class='ctx'> </div><div class='ctx'> 		ret = 0;</div><div class='del'>-		nocow_bg = btrfs_inc_nocow_writers(fs_info, nocow_args.disk_bytenr);</div><div class='add'>+		nocow_bg = btrfs_inc_nocow_writers(fs_info,</div><div class='add'>+				nocow_args.file_extent.disk_bytenr +</div><div class='add'>+				nocow_args.file_extent.offset);</div><div class='ctx'> 		if (!nocow_bg) {</div><div class='ctx'> must_cow:</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2135,79 +2193,25 @@ must_cow:</div><div class='ctx'> 		 * NOCOW, following one which needs to be COW'ed</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (cow_start != (u64)-1) {</div><div class='del'>-			ret = fallback_to_cow(inode, locked_page,</div><div class='del'>-					      cow_start, found_key.offset - 1);</div><div class='del'>-			cow_start = (u64)-1;</div><div class='add'>+			ret = fallback_to_cow(inode, locked_folio, cow_start,</div><div class='add'>+					      found_key.offset - 1);</div><div class='ctx'> 			if (ret) {</div><div class='add'>+				cow_end = found_key.offset - 1;</div><div class='ctx'> 				btrfs_dec_nocow_writers(nocow_bg);</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='add'>+			cow_start = (u64)-1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nocow_end = cur_offset + nocow_args.num_bytes - 1;</div><div class='del'>-		is_prealloc = extent_type == BTRFS_FILE_EXTENT_PREALLOC;</div><div class='del'>-		if (is_prealloc) {</div><div class='del'>-			u64 orig_start = found_key.offset - nocow_args.extent_offset;</div><div class='del'>-			struct extent_map *em;</div><div class='del'>-</div><div class='del'>-			em = create_io_em(inode, cur_offset, nocow_args.num_bytes,</div><div class='del'>-					  orig_start,</div><div class='del'>-					  nocow_args.disk_bytenr, /* block_start */</div><div class='del'>-					  nocow_args.num_bytes, /* block_len */</div><div class='del'>-					  nocow_args.disk_num_bytes, /* orig_block_len */</div><div class='del'>-					  ram_bytes, BTRFS_COMPRESS_NONE,</div><div class='del'>-					  BTRFS_ORDERED_PREALLOC);</div><div class='del'>-			if (IS_ERR(em)) {</div><div class='del'>-				btrfs_dec_nocow_writers(nocow_bg);</div><div class='del'>-				ret = PTR_ERR(em);</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ordered = btrfs_alloc_ordered_extent(inode, cur_offset,</div><div class='del'>-				nocow_args.num_bytes, nocow_args.num_bytes,</div><div class='del'>-				nocow_args.disk_bytenr, nocow_args.num_bytes, 0,</div><div class='del'>-				is_prealloc</div><div class='del'>-				? (1 &lt;&lt; BTRFS_ORDERED_PREALLOC)</div><div class='del'>-				: (1 &lt;&lt; BTRFS_ORDERED_NOCOW),</div><div class='del'>-				BTRFS_COMPRESS_NONE);</div><div class='add'>+		ret = nocow_one_range(inode, locked_folio, &amp;cached_state,</div><div class='add'>+				      &amp;nocow_args, cur_offset,</div><div class='add'>+				      extent_type == BTRFS_FILE_EXTENT_PREALLOC);</div><div class='ctx'> 		btrfs_dec_nocow_writers(nocow_bg);</div><div class='del'>-		if (IS_ERR(ordered)) {</div><div class='del'>-			if (is_prealloc) {</div><div class='del'>-				btrfs_drop_extent_map_range(inode, cur_offset,</div><div class='del'>-							    nocow_end, false);</div><div class='del'>-			}</div><div class='del'>-			ret = PTR_ERR(ordered);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			nocow_end = cur_offset + nocow_args.file_extent.num_bytes - 1;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (btrfs_is_data_reloc_root(root))</div><div class='del'>-			/*</div><div class='del'>-			 * Error handled later, as we must prevent</div><div class='del'>-			 * extent_clear_unlock_delalloc() in error handler</div><div class='del'>-			 * from freeing metadata of created ordered extent.</div><div class='del'>-			 */</div><div class='del'>-			ret = btrfs_reloc_clone_csums(ordered);</div><div class='del'>-		btrfs_put_ordered_extent(ordered);</div><div class='del'>-</div><div class='del'>-		extent_clear_unlock_delalloc(inode, cur_offset, nocow_end,</div><div class='del'>-					     locked_page, EXTENT_LOCKED |</div><div class='del'>-					     EXTENT_DELALLOC |</div><div class='del'>-					     EXTENT_CLEAR_DATA_RESV,</div><div class='del'>-					     PAGE_UNLOCK | PAGE_SET_ORDERED);</div><div class='del'>-</div><div class='ctx'> 		cur_offset = extent_end;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * btrfs_reloc_clone_csums() error, now we're OK to call error</div><div class='del'>-		 * handler, as metadata for created ordered extent will only</div><div class='del'>-		 * be freed by btrfs_finish_ordered_io().</div><div class='del'>-		 */</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		if (cur_offset &gt; end)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='hunk'>@@ -2215,32 +2219,113 @@ must_cow:</div><div class='ctx'> 		cow_start = cur_offset;</div><div class='ctx'> </div><div class='ctx'> 	if (cow_start != (u64)-1) {</div><div class='del'>-		cur_offset = end;</div><div class='del'>-		ret = fallback_to_cow(inode, locked_page, cow_start, end);</div><div class='del'>-		cow_start = (u64)-1;</div><div class='del'>-		if (ret)</div><div class='add'>+		ret = fallback_to_cow(inode, locked_folio, cow_start, end);</div><div class='add'>+		if (ret) {</div><div class='add'>+			cow_end = end;</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='add'>+		cow_start = (u64)-1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Everything is finished without an error, can unlock the folios now.</div><div class='add'>+	 *</div><div class='add'>+	 * No need to touch the io tree range nor set folio ordered flag, as</div><div class='add'>+	 * fallback_to_cow() and nocow_one_range() have already handled them.</div><div class='add'>+	 */</div><div class='add'>+	extent_clear_unlock_delalloc(inode, start, end, locked_folio, NULL, 0, PAGE_UNLOCK);</div><div class='add'>+</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	/*</div><div class='del'>-	 * If an error happened while a COW region is outstanding, cur_offset</div><div class='del'>-	 * needs to be reset to cow_start to ensure the COW region is unlocked</div><div class='del'>-	 * as well.</div><div class='del'>-	 */</div><div class='del'>-	if (cow_start != (u64)-1)</div><div class='del'>-		cur_offset = cow_start;</div><div class='del'>-	if (cur_offset &lt; end)</div><div class='del'>-		extent_clear_unlock_delalloc(inode, cur_offset, end,</div><div class='del'>-					     locked_page, EXTENT_LOCKED |</div><div class='del'>-					     EXTENT_DELALLOC | EXTENT_DEFRAG |</div><div class='add'>+	if (cow_start == (u64)-1) {</div><div class='add'>+		/*</div><div class='add'>+		 * case a)</div><div class='add'>+		 *    start           cur_offset               end</div><div class='add'>+		 *    |   OE cleanup  |       Untouched        |</div><div class='add'>+		 *</div><div class='add'>+		 * We finished a fallback_to_cow() or nocow_one_range() call,</div><div class='add'>+		 * but failed to check the next range.</div><div class='add'>+		 *</div><div class='add'>+		 * or</div><div class='add'>+		 *    start           cur_offset   nocow_end   end</div><div class='add'>+		 *    |   OE cleanup  |   Skip     | Untouched |</div><div class='add'>+		 *</div><div class='add'>+		 * nocow_one_range() failed, the range [cur_offset, nocow_end] is</div><div class='add'>+		 * already cleaned up.</div><div class='add'>+		 */</div><div class='add'>+		oe_cleanup_start = start;</div><div class='add'>+		oe_cleanup_len = cur_offset - start;</div><div class='add'>+		if (nocow_end)</div><div class='add'>+			untouched_start = nocow_end + 1;</div><div class='add'>+		else</div><div class='add'>+			untouched_start = cur_offset;</div><div class='add'>+		untouched_len = end + 1 - untouched_start;</div><div class='add'>+	} else if (cow_start != (u64)-1 &amp;&amp; cow_end == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * case b)</div><div class='add'>+		 *    start        cow_start    cur_offset   end</div><div class='add'>+		 *    | OE cleanup |        Untouched        |</div><div class='add'>+		 *</div><div class='add'>+		 * We got a range that needs COW, but before we hit the next NOCOW range,</div><div class='add'>+		 * thus [cow_start, cur_offset) doesn't yet have any OE.</div><div class='add'>+		 */</div><div class='add'>+		oe_cleanup_start = start;</div><div class='add'>+		oe_cleanup_len = cow_start - start;</div><div class='add'>+		untouched_start = cow_start;</div><div class='add'>+		untouched_len = end + 1 - untouched_start;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * case c)</div><div class='add'>+		 *    start        cow_start    cow_end      end</div><div class='add'>+		 *    | OE cleanup |   Skip     |  Untouched |</div><div class='add'>+		 *</div><div class='add'>+		 * fallback_to_cow() failed, and fallback_to_cow() will do the</div><div class='add'>+		 * cleanup for its range, we shouldn't touch the range</div><div class='add'>+		 * [cow_start, cow_end].</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(cow_start != (u64)-1 &amp;&amp; cow_end != 0);</div><div class='add'>+		oe_cleanup_start = start;</div><div class='add'>+		oe_cleanup_len = cow_start - start;</div><div class='add'>+		untouched_start = cow_end + 1;</div><div class='add'>+		untouched_len = end + 1 - untouched_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oe_cleanup_len) {</div><div class='add'>+		const u64 oe_cleanup_end = oe_cleanup_start + oe_cleanup_len - 1;</div><div class='add'>+		btrfs_cleanup_ordered_extents(inode, oe_cleanup_start, oe_cleanup_len);</div><div class='add'>+		extent_clear_unlock_delalloc(inode, oe_cleanup_start, oe_cleanup_end,</div><div class='add'>+					     locked_folio, NULL,</div><div class='add'>+					     EXTENT_LOCKED | EXTENT_DELALLOC,</div><div class='add'>+					     PAGE_UNLOCK | PAGE_START_WRITEBACK |</div><div class='add'>+					     PAGE_END_WRITEBACK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (untouched_len) {</div><div class='add'>+		struct extent_state *cached = NULL;</div><div class='add'>+		const u64 untouched_end = untouched_start + untouched_len - 1;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to lock the extent here because we're clearing DELALLOC and</div><div class='add'>+		 * we're not locked at this point.</div><div class='add'>+		 */</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, untouched_start, untouched_end, &amp;cached);</div><div class='add'>+		extent_clear_unlock_delalloc(inode, untouched_start, untouched_end,</div><div class='add'>+					     locked_folio, &amp;cached,</div><div class='add'>+					     EXTENT_LOCKED | EXTENT_DELALLOC |</div><div class='add'>+					     EXTENT_DEFRAG |</div><div class='ctx'> 					     EXTENT_DO_ACCOUNTING, PAGE_UNLOCK |</div><div class='ctx'> 					     PAGE_START_WRITEBACK |</div><div class='ctx'> 					     PAGE_END_WRITEBACK);</div><div class='add'>+		btrfs_qgroup_free_data(inode, NULL, untouched_start, untouched_len, NULL);</div><div class='add'>+	}</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='add'>+	btrfs_err(fs_info,</div><div class='add'>+"%s failed, root=%llu inode=%llu start=%llu len=%llu cur_offset=%llu oe_cleanup=%llu oe_cleanup_len=%llu untouched_start=%llu untouched_len=%llu: %d",</div><div class='add'>+		  __func__, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+		  start, end + 1 - start, cur_offset, oe_cleanup_start, oe_cleanup_len,</div><div class='add'>+		  untouched_start, untouched_len, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2248,7 +2333,7 @@ static bool should_nocow(struct btrfs_inode *inode, u64 start, u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	if (inode-&gt;flags &amp; (BTRFS_INODE_NODATACOW | BTRFS_INODE_PREALLOC)) {</div><div class='ctx'> 		if (inode-&gt;defrag_bytes &amp;&amp;</div><div class='del'>-		    test_range_bit_exists(&amp;inode-&gt;io_tree, start, end, EXTENT_DEFRAG))</div><div class='add'>+		    btrfs_test_range_bit_exists(&amp;inode-&gt;io_tree, start, end, EXTENT_DEFRAG))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2259,40 +2344,34 @@ static bool should_nocow(struct btrfs_inode *inode, u64 start, u64 end)</div><div class='ctx'>  * Function to process delayed allocation (create CoW) for ranges which are</div><div class='ctx'>  * being touched for the first time.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page,</div><div class='add'>+int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct folio *locked_folio,</div><div class='ctx'> 			     u64 start, u64 end, struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	const bool zoned = btrfs_is_zoned(inode-&gt;root-&gt;fs_info);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The range must cover part of the @locked_page, or a return of 1</div><div class='add'>+	 * The range must cover part of the @locked_folio, or a return of 1</div><div class='ctx'> 	 * can confuse the caller.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(!(end &lt;= page_offset(locked_page) ||</div><div class='del'>-		 start &gt;= page_offset(locked_page) + PAGE_SIZE));</div><div class='add'>+	ASSERT(!(end &lt;= folio_pos(locked_folio) ||</div><div class='add'>+		 start &gt;= folio_next_pos(locked_folio)));</div><div class='ctx'> </div><div class='ctx'> 	if (should_nocow(inode, start, end)) {</div><div class='del'>-		ret = run_delalloc_nocow(inode, locked_page, start, end);</div><div class='del'>-		goto out;</div><div class='add'>+		ret = run_delalloc_nocow(inode, locked_folio, start, end);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_inode_can_compress(inode) &amp;&amp;</div><div class='ctx'> 	    inode_need_compress(inode, start, end) &amp;&amp;</div><div class='del'>-	    run_delalloc_compressed(inode, locked_page, start, end, wbc))</div><div class='add'>+	    run_delalloc_compressed(inode, locked_folio, start, end, wbc))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	if (zoned)</div><div class='del'>-		ret = run_delalloc_cow(inode, locked_page, start, end, wbc,</div><div class='add'>+		ret = run_delalloc_cow(inode, locked_folio, start, end, wbc,</div><div class='ctx'> 				       true);</div><div class='ctx'> 	else</div><div class='del'>-		ret = cow_file_range(inode, locked_page, start, end, NULL,</div><div class='del'>-				     false, false);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		btrfs_cleanup_ordered_extents(inode, locked_page, start,</div><div class='del'>-					      end - start + 1);</div><div class='add'>+		ret = cow_file_range(inode, locked_folio, start, end, NULL, 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2302,6 +2381,8 @@ void btrfs_split_delalloc_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	u64 size;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;io_tree.lock);</div><div class='add'>+</div><div class='ctx'> 	/* not delalloc, ignore it */</div><div class='ctx'> 	if (!(orig-&gt;state &amp; EXTENT_DELALLOC))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2340,6 +2421,8 @@ void btrfs_merge_delalloc_extent(struct btrfs_inode *inode, struct extent_state</div><div class='ctx'> 	u64 new_size, old_size;</div><div class='ctx'> 	u32 num_extents;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;io_tree.lock);</div><div class='add'>+</div><div class='ctx'> 	/* not delalloc, ignore it */</div><div class='ctx'> 	if (!(other-&gt;state &amp; EXTENT_DELALLOC))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2387,55 +2470,50 @@ void btrfs_merge_delalloc_extent(struct btrfs_inode *inode, struct extent_state</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_add_delalloc_inodes(struct btrfs_root *root,</div><div class='del'>-				      struct btrfs_inode *inode)</div><div class='add'>+static void btrfs_add_delalloc_inode(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;root-&gt;delalloc_lock);</div><div class='del'>-	if (list_empty(&amp;inode-&gt;delalloc_inodes)) {</div><div class='del'>-		list_add_tail(&amp;inode-&gt;delalloc_inodes, &amp;root-&gt;delalloc_inodes);</div><div class='del'>-		set_bit(BTRFS_INODE_IN_DELALLOC_LIST, &amp;inode-&gt;runtime_flags);</div><div class='del'>-		root-&gt;nr_delalloc_inodes++;</div><div class='del'>-		if (root-&gt;nr_delalloc_inodes == 1) {</div><div class='del'>-			spin_lock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='del'>-			BUG_ON(!list_empty(&amp;root-&gt;delalloc_root));</div><div class='del'>-			list_add_tail(&amp;root-&gt;delalloc_root,</div><div class='del'>-				      &amp;fs_info-&gt;delalloc_roots);</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='del'>-		}</div><div class='add'>+	ASSERT(list_empty(&amp;inode-&gt;delalloc_inodes));</div><div class='add'>+	list_add_tail(&amp;inode-&gt;delalloc_inodes, &amp;root-&gt;delalloc_inodes);</div><div class='add'>+	root-&gt;nr_delalloc_inodes++;</div><div class='add'>+	if (root-&gt;nr_delalloc_inodes == 1) {</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='add'>+		ASSERT(list_empty(&amp;root-&gt;delalloc_root));</div><div class='add'>+		list_add_tail(&amp;root-&gt;delalloc_root, &amp;fs_info-&gt;delalloc_roots);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;root-&gt;delalloc_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __btrfs_del_delalloc_inode(struct btrfs_root *root,</div><div class='del'>-				struct btrfs_inode *inode)</div><div class='add'>+void btrfs_del_delalloc_inode(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;root-&gt;delalloc_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We may be called after the inode was already deleted from the list,</div><div class='add'>+	 * namely in the transaction abort path btrfs_destroy_delalloc_inodes(),</div><div class='add'>+	 * and then later through btrfs_clear_delalloc_extent() while the inode</div><div class='add'>+	 * still has -&gt;delalloc_bytes &gt; 0.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!list_empty(&amp;inode-&gt;delalloc_inodes)) {</div><div class='ctx'> 		list_del_init(&amp;inode-&gt;delalloc_inodes);</div><div class='del'>-		clear_bit(BTRFS_INODE_IN_DELALLOC_LIST,</div><div class='del'>-			  &amp;inode-&gt;runtime_flags);</div><div class='ctx'> 		root-&gt;nr_delalloc_inodes--;</div><div class='ctx'> 		if (!root-&gt;nr_delalloc_inodes) {</div><div class='ctx'> 			ASSERT(list_empty(&amp;root-&gt;delalloc_inodes));</div><div class='ctx'> 			spin_lock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='del'>-			BUG_ON(list_empty(&amp;root-&gt;delalloc_root));</div><div class='add'>+			ASSERT(!list_empty(&amp;root-&gt;delalloc_root));</div><div class='ctx'> 			list_del_init(&amp;root-&gt;delalloc_root);</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_del_delalloc_inode(struct btrfs_root *root,</div><div class='del'>-				     struct btrfs_inode *inode)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;root-&gt;delalloc_lock);</div><div class='del'>-	__btrfs_del_delalloc_inode(root, inode);</div><div class='del'>-	spin_unlock(&amp;root-&gt;delalloc_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Properly track delayed allocation bytes in the inode and to maintain the</div><div class='ctx'>  * list of inodes that have pending delalloc work to be done.</div><div class='hunk'>@@ -2445,6 +2523,8 @@ void btrfs_set_delalloc_extent(struct btrfs_inode *inode, struct extent_state *s</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;io_tree.lock);</div><div class='add'>+</div><div class='ctx'> 	if ((bits &amp; EXTENT_DEFRAG) &amp;&amp; !(bits &amp; EXTENT_DELALLOC))</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2453,10 +2533,9 @@ void btrfs_set_delalloc_extent(struct btrfs_inode *inode, struct extent_state *s</div><div class='ctx'> 	 * bit, which is only set or cleared with irqs on</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(state-&gt;state &amp; EXTENT_DELALLOC) &amp;&amp; (bits &amp; EXTENT_DELALLOC)) {</div><div class='del'>-		struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 		u64 len = state-&gt;end + 1 - state-&gt;start;</div><div class='add'>+		u64 prev_delalloc_bytes;</div><div class='ctx'> 		u32 num_extents = count_max_extents(fs_info, len);</div><div class='del'>-		bool do_list = !btrfs_is_free_space_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 		btrfs_mod_outstanding_extents(inode, num_extents);</div><div class='hunk'>@@ -2469,13 +2548,20 @@ void btrfs_set_delalloc_extent(struct btrfs_inode *inode, struct extent_state *s</div><div class='ctx'> 		percpu_counter_add_batch(&amp;fs_info-&gt;delalloc_bytes, len,</div><div class='ctx'> 					 fs_info-&gt;delalloc_batch);</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;lock);</div><div class='add'>+		prev_delalloc_bytes = inode-&gt;delalloc_bytes;</div><div class='ctx'> 		inode-&gt;delalloc_bytes += len;</div><div class='ctx'> 		if (bits &amp; EXTENT_DEFRAG)</div><div class='ctx'> 			inode-&gt;defrag_bytes += len;</div><div class='del'>-		if (do_list &amp;&amp; !test_bit(BTRFS_INODE_IN_DELALLOC_LIST,</div><div class='del'>-					 &amp;inode-&gt;runtime_flags))</div><div class='del'>-			btrfs_add_delalloc_inodes(root, inode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We don't need to be under the protection of the inode's lock,</div><div class='add'>+		 * because we are called while holding the inode's io_tree lock</div><div class='add'>+		 * and are therefore protected against concurrent calls of this</div><div class='add'>+		 * function and btrfs_clear_delalloc_extent().</div><div class='add'>+		 */</div><div class='add'>+		if (!btrfs_is_free_space_inode(inode) &amp;&amp; prev_delalloc_bytes == 0)</div><div class='add'>+			btrfs_add_delalloc_inode(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(state-&gt;state &amp; EXTENT_DELALLOC_NEW) &amp;&amp;</div><div class='hunk'>@@ -2497,6 +2583,8 @@ void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	u64 len = state-&gt;end + 1 - state-&gt;start;</div><div class='ctx'> 	u32 num_extents = count_max_extents(fs_info, len);</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;io_tree.lock);</div><div class='add'>+</div><div class='ctx'> 	if ((state-&gt;state &amp; EXTENT_DEFRAG) &amp;&amp; (bits &amp; EXTENT_DEFRAG)) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 		inode-&gt;defrag_bytes -= len;</div><div class='hunk'>@@ -2510,7 +2598,7 @@ void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((state-&gt;state &amp; EXTENT_DELALLOC) &amp;&amp; (bits &amp; EXTENT_DELALLOC)) {</div><div class='ctx'> 		struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-		bool do_list = !btrfs_is_free_space_inode(inode);</div><div class='add'>+		u64 new_delalloc_bytes;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 		btrfs_mod_outstanding_extents(inode, -num_extents);</div><div class='hunk'>@@ -2523,26 +2611,36 @@ void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (bits &amp; EXTENT_CLEAR_META_RESV &amp;&amp;</div><div class='ctx'> 		    root != fs_info-&gt;tree_root)</div><div class='del'>-			btrfs_delalloc_release_metadata(inode, len, false);</div><div class='add'>+			btrfs_delalloc_release_metadata(inode, len, true);</div><div class='ctx'> </div><div class='ctx'> 		/* For sanity tests. */</div><div class='ctx'> 		if (btrfs_is_testing(fs_info))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (!btrfs_is_data_reloc_root(root) &amp;&amp;</div><div class='del'>-		    do_list &amp;&amp; !(state-&gt;state &amp; EXTENT_NORESERVE) &amp;&amp;</div><div class='add'>+		    !btrfs_is_free_space_inode(inode) &amp;&amp;</div><div class='add'>+		    !(state-&gt;state &amp; EXTENT_NORESERVE) &amp;&amp;</div><div class='ctx'> 		    (bits &amp; EXTENT_CLEAR_DATA_RESV))</div><div class='del'>-			btrfs_free_reserved_data_space_noquota(fs_info, len);</div><div class='add'>+			btrfs_free_reserved_data_space_noquota(inode, len);</div><div class='ctx'> </div><div class='ctx'> 		percpu_counter_add_batch(&amp;fs_info-&gt;delalloc_bytes, -len,</div><div class='ctx'> 					 fs_info-&gt;delalloc_batch);</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 		inode-&gt;delalloc_bytes -= len;</div><div class='del'>-		if (do_list &amp;&amp; inode-&gt;delalloc_bytes == 0 &amp;&amp;</div><div class='del'>-		    test_bit(BTRFS_INODE_IN_DELALLOC_LIST,</div><div class='del'>-					&amp;inode-&gt;runtime_flags))</div><div class='del'>-			btrfs_del_delalloc_inode(root, inode);</div><div class='add'>+		new_delalloc_bytes = inode-&gt;delalloc_bytes;</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We don't need to be under the protection of the inode's lock,</div><div class='add'>+		 * because we are called while holding the inode's io_tree lock</div><div class='add'>+		 * and are therefore protected against concurrent calls of this</div><div class='add'>+		 * function and btrfs_set_delalloc_extent().</div><div class='add'>+		 */</div><div class='add'>+		if (!btrfs_is_free_space_inode(inode) &amp;&amp; new_delalloc_bytes == 0) {</div><div class='add'>+			spin_lock(&amp;root-&gt;delalloc_lock);</div><div class='add'>+			btrfs_del_delalloc_inode(inode);</div><div class='add'>+			spin_unlock(&amp;root-&gt;delalloc_lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((state-&gt;state &amp; EXTENT_DELALLOC_NEW) &amp;&amp;</div><div class='hunk'>@@ -2556,44 +2654,6 @@ void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int btrfs_extract_ordered_extent(struct btrfs_bio *bbio,</div><div class='del'>-					struct btrfs_ordered_extent *ordered)</div><div class='del'>-{</div><div class='del'>-	u64 start = (u64)bbio-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='del'>-	u64 len = bbio-&gt;bio.bi_iter.bi_size;</div><div class='del'>-	struct btrfs_ordered_extent *new;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Must always be called for the beginning of an ordered extent. */</div><div class='del'>-	if (WARN_ON_ONCE(start != ordered-&gt;disk_bytenr))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* No need to split if the ordered extent covers the entire bio. */</div><div class='del'>-	if (ordered-&gt;disk_num_bytes == len) {</div><div class='del'>-		refcount_inc(&amp;ordered-&gt;refs);</div><div class='del'>-		bbio-&gt;ordered = ordered;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't split the extent_map for NOCOW extents, as we're writing into</div><div class='del'>-	 * a pre-existing one.</div><div class='del'>-	 */</div><div class='del'>-	if (!test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered-&gt;flags)) {</div><div class='del'>-		ret = split_extent_map(bbio-&gt;inode, bbio-&gt;file_offset,</div><div class='del'>-				       ordered-&gt;num_bytes, len,</div><div class='del'>-				       ordered-&gt;disk_bytenr);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new = btrfs_split_ordered_extent(ordered, len);</div><div class='del'>-	if (IS_ERR(new))</div><div class='del'>-		return PTR_ERR(new);</div><div class='del'>-	bbio-&gt;ordered = new;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * given a list of ordered sums record them in the inode.  This happens</div><div class='ctx'>  * at IO completion time based on sums calculated at bio submission time.</div><div class='hunk'>@@ -2632,11 +2692,11 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,</div><div class='ctx'> 		u64 em_len;</div><div class='ctx'> 		int ret = 0;</div><div class='ctx'> </div><div class='del'>-		em = btrfs_get_extent(inode, NULL, 0, search_start, search_len);</div><div class='add'>+		em = btrfs_get_extent(inode, NULL, search_start, search_len);</div><div class='ctx'> 		if (IS_ERR(em))</div><div class='ctx'> 			return PTR_ERR(em);</div><div class='ctx'> </div><div class='del'>-		if (em-&gt;block_start != EXTENT_MAP_HOLE)</div><div class='add'>+		if (em-&gt;disk_bytenr != EXTENT_MAP_HOLE)</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='ctx'> 		em_len = em-&gt;len;</div><div class='hunk'>@@ -2645,12 +2705,12 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,</div><div class='ctx'> 		if (em_len &gt; search_len)</div><div class='ctx'> 			em_len = search_len;</div><div class='ctx'> </div><div class='del'>-		ret = set_extent_bit(&amp;inode-&gt;io_tree, search_start,</div><div class='del'>-				     search_start + em_len - 1,</div><div class='del'>-				     EXTENT_DELALLOC_NEW, cached_state);</div><div class='add'>+		ret = btrfs_set_extent_bit(&amp;inode-&gt;io_tree, search_start,</div><div class='add'>+					   search_start + em_len - 1,</div><div class='add'>+					   EXTENT_DELALLOC_NEW, cached_state);</div><div class='ctx'> next:</div><div class='del'>-		search_start = extent_map_end(em);</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		search_start = btrfs_extent_map_end(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2680,13 +2740,13 @@ int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return set_extent_bit(&amp;inode-&gt;io_tree, start, end,</div><div class='del'>-			      EXTENT_DELALLOC | extra_bits, cached_state);</div><div class='add'>+	return btrfs_set_extent_bit(&amp;inode-&gt;io_tree, start, end,</div><div class='add'>+				    EXTENT_DELALLOC | extra_bits, cached_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* see btrfs_writepage_start_hook for details on why this is required */</div><div class='ctx'> struct btrfs_writepage_fixup {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct btrfs_inode *inode;</div><div class='ctx'> 	struct btrfs_work work;</div><div class='ctx'> };</div><div class='hunk'>@@ -2698,50 +2758,51 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	struct extent_changeset *data_reserved = NULL;</div><div class='del'>-	struct page *page = fixup-&gt;page;</div><div class='add'>+	struct folio *folio = fixup-&gt;folio;</div><div class='ctx'> 	struct btrfs_inode *inode = fixup-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	u64 page_start = page_offset(page);</div><div class='del'>-	u64 page_end = page_offset(page) + PAGE_SIZE - 1;</div><div class='add'>+	u64 page_start = folio_pos(folio);</div><div class='add'>+	u64 page_end = folio_next_pos(folio) - 1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	bool free_delalloc_space = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is similar to page_mkwrite, we need to reserve the space before</div><div class='del'>-	 * we take the page lock.</div><div class='add'>+	 * we take the folio lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_delalloc_reserve_space(inode, &amp;data_reserved, page_start,</div><div class='del'>-					   PAGE_SIZE);</div><div class='add'>+					   folio_size(folio));</div><div class='ctx'> again:</div><div class='del'>-	lock_page(page);</div><div class='add'>+	folio_lock(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Before we queued this fixup, we took a reference on the page.</div><div class='del'>-	 * page-&gt;mapping may go NULL, but it shouldn't be moved to a different</div><div class='add'>+	 * Before we queued this fixup, we took a reference on the folio.</div><div class='add'>+	 * folio-&gt;mapping may go NULL, but it shouldn't be moved to a different</div><div class='ctx'> 	 * address space.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!page-&gt;mapping || !PageDirty(page) || !PageChecked(page)) {</div><div class='add'>+	if (!folio-&gt;mapping || !folio_test_dirty(folio) ||</div><div class='add'>+	    !folio_test_checked(folio)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Unfortunately this is a little tricky, either</div><div class='ctx'> 		 *</div><div class='del'>-		 * 1) We got here and our page had already been dealt with and</div><div class='add'>+		 * 1) We got here and our folio had already been dealt with and</div><div class='ctx'> 		 *    we reserved our space, thus ret == 0, so we need to just</div><div class='ctx'> 		 *    drop our space reservation and bail.  This can happen the</div><div class='ctx'> 		 *    first time we come into the fixup worker, or could happen</div><div class='ctx'> 		 *    while waiting for the ordered extent.</div><div class='del'>-		 * 2) Our page was already dealt with, but we happened to get an</div><div class='add'>+		 * 2) Our folio was already dealt with, but we happened to get an</div><div class='ctx'> 		 *    ENOSPC above from the btrfs_delalloc_reserve_space.  In</div><div class='ctx'> 		 *    this case we obviously don't have anything to release, but</div><div class='del'>-		 *    because the page was already dealt with we don't want to</div><div class='del'>-		 *    mark the page with an error, so make sure we're resetting</div><div class='add'>+		 *    because the folio was already dealt with we don't want to</div><div class='add'>+		 *    mark the folio with an error, so make sure we're resetting</div><div class='ctx'> 		 *    ret to 0.  This is why we have this check _before_ the ret</div><div class='ctx'> 		 *    check, because we do not want to have a surprise ENOSPC</div><div class='del'>-		 *    when the page was already properly dealt with.</div><div class='add'>+		 *    when the folio was already properly dealt with.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!ret) {</div><div class='del'>-			btrfs_delalloc_release_extents(inode, PAGE_SIZE);</div><div class='add'>+			btrfs_delalloc_release_extents(inode, folio_size(folio));</div><div class='ctx'> 			btrfs_delalloc_release_space(inode, data_reserved,</div><div class='del'>-						     page_start, PAGE_SIZE,</div><div class='add'>+						     page_start, folio_size(folio),</div><div class='ctx'> 						     true);</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -2749,23 +2810,23 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We can't mess with the page state unless it is locked, so now that</div><div class='add'>+	 * We can't mess with the folio state unless it is locked, so now that</div><div class='ctx'> 	 * it is locked bail if we failed to make our space reservation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_page;</div><div class='ctx'> </div><div class='del'>-	lock_extent(&amp;inode-&gt;io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, page_start, page_end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	/* already ordered? We're done */</div><div class='del'>-	if (PageOrdered(page))</div><div class='add'>+	if (folio_test_ordered(folio))</div><div class='ctx'> 		goto out_reserved;</div><div class='ctx'> </div><div class='ctx'> 	ordered = btrfs_lookup_ordered_range(inode, page_start, PAGE_SIZE);</div><div class='ctx'> 	if (ordered) {</div><div class='del'>-		unlock_extent(&amp;inode-&gt;io_tree, page_start, page_end,</div><div class='del'>-			      &amp;cached_state);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, page_start, page_end,</div><div class='add'>+				    &amp;cached_state);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		btrfs_start_ordered_extent(ordered);</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='ctx'> 		goto again;</div><div class='hunk'>@@ -2783,28 +2844,28 @@ again:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The page was dirty when we started, nothing should have cleaned it.</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(!PageDirty(page));</div><div class='add'>+	BUG_ON(!folio_test_dirty(folio));</div><div class='ctx'> 	free_delalloc_space = false;</div><div class='ctx'> out_reserved:</div><div class='ctx'> 	btrfs_delalloc_release_extents(inode, PAGE_SIZE);</div><div class='ctx'> 	if (free_delalloc_space)</div><div class='ctx'> 		btrfs_delalloc_release_space(inode, data_reserved, page_start,</div><div class='ctx'> 					     PAGE_SIZE, true);</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, page_start, page_end, &amp;cached_state);</div><div class='ctx'> out_page:</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We hit ENOSPC or other errors.  Update the mapping and page</div><div class='ctx'> 		 * to reflect the errors and clean the page.</div><div class='ctx'> 		 */</div><div class='del'>-		mapping_set_error(page-&gt;mapping, ret);</div><div class='del'>-		btrfs_mark_ordered_io_finished(inode, page, page_start,</div><div class='del'>-					       PAGE_SIZE, !ret);</div><div class='del'>-		clear_page_dirty_for_io(page);</div><div class='del'>-	}</div><div class='del'>-	btrfs_folio_clear_checked(fs_info, page_folio(page), page_start, PAGE_SIZE);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+		mapping_set_error(folio-&gt;mapping, ret);</div><div class='add'>+		btrfs_mark_ordered_io_finished(inode, folio, page_start,</div><div class='add'>+					       folio_size(folio), !ret);</div><div class='add'>+		folio_clear_dirty_for_io(folio);</div><div class='add'>+	}</div><div class='add'>+	btrfs_folio_clear_checked(fs_info, folio, page_start, PAGE_SIZE);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	kfree(fixup);</div><div class='ctx'> 	extent_changeset_free(data_reserved);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2817,33 +2878,49 @@ out_page:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * There are a few paths in the higher layers of the kernel that directly</div><div class='del'>- * set the page dirty bit without asking the filesystem if it is a</div><div class='add'>+ * set the folio dirty bit without asking the filesystem if it is a</div><div class='ctx'>  * good idea.  This causes problems because we want to make sure COW</div><div class='ctx'>  * properly happens and the data=ordered rules are followed.</div><div class='ctx'>  *</div><div class='ctx'>  * In our case any range that doesn't have the ORDERED bit set</div><div class='ctx'>  * hasn't been properly setup for IO.  We kick off an async process</div><div class='ctx'>  * to fix it up.  The async helper will wait for ordered extents, set</div><div class='del'>- * the delalloc bit and make it safe to write the page.</div><div class='add'>+ * the delalloc bit and make it safe to write the folio.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_writepage_cow_fixup(struct page *page)</div><div class='add'>+int btrfs_writepage_cow_fixup(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_writepage_fixup *fixup;</div><div class='ctx'> </div><div class='del'>-	/* This page has ordered extent covering it already */</div><div class='del'>-	if (PageOrdered(page))</div><div class='add'>+	/* This folio has ordered extent covering it already */</div><div class='add'>+	if (folio_test_ordered(folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * PageChecked is set below when we create a fixup worker for this page,</div><div class='del'>-	 * don't try to create another one if we're already PageChecked()</div><div class='add'>+	 * For experimental build, we error out instead of EAGAIN.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The extent_io writepage code will redirty the page if we send back</div><div class='add'>+	 * We should not hit such out-of-band dirty folios anymore.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_EXPERIMENTAL)) {</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		btrfs_err_rl(fs_info,</div><div class='add'>+	"root %lld ino %llu folio %llu is marked dirty without notifying the fs",</div><div class='add'>+			     btrfs_root_id(BTRFS_I(inode)-&gt;root),</div><div class='add'>+			     btrfs_ino(BTRFS_I(inode)),</div><div class='add'>+			     folio_pos(folio));</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * folio_checked is set below when we create a fixup worker for this</div><div class='add'>+	 * folio, don't try to create another one if we're already</div><div class='add'>+	 * folio_test_checked.</div><div class='add'>+	 *</div><div class='add'>+	 * The extent_io writepage code will redirty the foio if we send back</div><div class='ctx'> 	 * EAGAIN.</div><div class='ctx'> 	 */</div><div class='del'>-	if (PageChecked(page))</div><div class='add'>+	if (folio_test_checked(folio))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	fixup = kzalloc(sizeof(*fixup), GFP_NOFS);</div><div class='hunk'>@@ -2853,14 +2930,14 @@ int btrfs_writepage_cow_fixup(struct page *page)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are already holding a reference to this inode from</div><div class='ctx'> 	 * write_cache_pages.  We need to hold it because the space reservation</div><div class='del'>-	 * takes place outside of the page lock, and we can't trust</div><div class='del'>-	 * page-&gt;mapping outside of the page lock.</div><div class='add'>+	 * takes place outside of the folio lock, and we can't trust</div><div class='add'>+	 * folio-&gt;mapping outside of the folio lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ihold(inode);</div><div class='del'>-	btrfs_folio_set_checked(fs_info, page_folio(page), page_offset(page), PAGE_SIZE);</div><div class='del'>-	get_page(page);</div><div class='add'>+	btrfs_folio_set_checked(fs_info, folio, folio_pos(folio), folio_size(folio));</div><div class='add'>+	folio_get(folio);</div><div class='ctx'> 	btrfs_init_work(&amp;fixup-&gt;work, btrfs_writepage_fixup_worker, NULL);</div><div class='del'>-	fixup-&gt;page = page;</div><div class='add'>+	fixup-&gt;folio = folio;</div><div class='ctx'> 	fixup-&gt;inode = BTRFS_I(inode);</div><div class='ctx'> 	btrfs_queue_work(fs_info-&gt;fixup_workers, &amp;fixup-&gt;work);</div><div class='ctx'> </div><div class='hunk'>@@ -2875,7 +2952,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	const u64 sectorsize = root-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key ins;</div><div class='ctx'> 	u64 disk_num_bytes = btrfs_stack_file_extent_disk_num_bytes(stack_fi);</div><div class='hunk'>@@ -2910,8 +2987,8 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (!drop_args.extent_inserted) {</div><div class='ctx'> 		ins.objectid = btrfs_ino(inode);</div><div class='del'>-		ins.offset = file_pos;</div><div class='ctx'> 		ins.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+		ins.offset = file_pos;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path, &amp;ins,</div><div class='ctx'> 					      sizeof(*stack_fi));</div><div class='hunk'>@@ -2924,14 +3001,13 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			btrfs_item_ptr_offset(leaf, path-&gt;slots[0]),</div><div class='ctx'> 			sizeof(struct btrfs_file_extent_item));</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we dropped an inline extent here, we know the range where it is</div><div class='ctx'> 	 * was not marked with the EXTENT_DELALLOC_NEW bit, so we update the</div><div class='ctx'> 	 * number of bytes only for that range containing the inline extent.</div><div class='del'>-	 * The remaining of the range will be processed when clearning the</div><div class='add'>+	 * The remaining of the range will be processed when clearing the</div><div class='ctx'> 	 * EXTENT_DELALLOC_BIT bit through the ordered extent completion.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (file_pos == 0 &amp;&amp; !IS_ALIGNED(drop_args.bytes_found, sectorsize)) {</div><div class='hunk'>@@ -2947,8 +3023,8 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_update_inode_bytes(inode, num_bytes, drop_args.bytes_found);</div><div class='ctx'> </div><div class='ctx'> 	ins.objectid = disk_bytenr;</div><div class='del'>-	ins.offset = disk_num_bytes;</div><div class='ctx'> 	ins.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+	ins.offset = disk_num_bytes;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_inode_set_file_extent_range(inode, file_pos, ram_bytes);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2958,8 +3034,6 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					       file_pos - offset,</div><div class='ctx'> 					       qgroup_reserved, &amp;ins);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2992,10 +3066,8 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_stack_file_extent_disk_num_bytes(&amp;stack_fi,</div><div class='ctx'> 						   oe-&gt;disk_num_bytes);</div><div class='ctx'> 	btrfs_set_stack_file_extent_offset(&amp;stack_fi, oe-&gt;offset);</div><div class='del'>-	if (test_bit(BTRFS_ORDERED_TRUNCATED, &amp;oe-&gt;flags)) {</div><div class='add'>+	if (test_bit(BTRFS_ORDERED_TRUNCATED, &amp;oe-&gt;flags))</div><div class='ctx'> 		num_bytes = oe-&gt;truncated_len;</div><div class='del'>-		ram_bytes = num_bytes;</div><div class='del'>-	}</div><div class='ctx'> 	btrfs_set_stack_file_extent_num_bytes(&amp;stack_fi, num_bytes);</div><div class='ctx'> 	btrfs_set_stack_file_extent_ram_bytes(&amp;stack_fi, ram_bytes);</div><div class='ctx'> 	btrfs_set_stack_file_extent_compression(&amp;stack_fi, oe-&gt;compress_type);</div><div class='hunk'>@@ -3011,7 +3083,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     test_bit(BTRFS_ORDERED_ENCODED, &amp;oe-&gt;flags) ||</div><div class='ctx'> 			     test_bit(BTRFS_ORDERED_TRUNCATED, &amp;oe-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	return insert_reserved_file_extent(trans, BTRFS_I(oe-&gt;inode),</div><div class='add'>+	return insert_reserved_file_extent(trans, oe-&gt;inode,</div><div class='ctx'> 					   oe-&gt;file_offset, &amp;stack_fi,</div><div class='ctx'> 					   update_inode_bytes, oe-&gt;qgroup_rsv);</div><div class='ctx'> }</div><div class='hunk'>@@ -3023,7 +3095,7 @@ static int insert_ordered_extent_file_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered_extent-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered_extent-&gt;inode;</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='hunk'>@@ -3051,14 +3123,15 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)</div><div class='ctx'> 	if (!freespace_inode)</div><div class='ctx'> 		btrfs_lockdep_acquire(fs_info, btrfs_ordered_extent);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BTRFS_ORDERED_IOERR, &amp;ordered_extent-&gt;flags)) {</div><div class='add'>+	if (unlikely(test_bit(BTRFS_ORDERED_IOERR, &amp;ordered_extent-&gt;flags))) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (btrfs_is_zoned(fs_info))</div><div class='del'>-		btrfs_zone_finish_endio(fs_info, ordered_extent-&gt;disk_bytenr,</div><div class='del'>-					ordered_extent-&gt;disk_num_bytes);</div><div class='add'>+	ret = btrfs_zone_finish_endio(fs_info, ordered_extent-&gt;disk_bytenr,</div><div class='add'>+				      ordered_extent-&gt;disk_num_bytes);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_ORDERED_TRUNCATED, &amp;ordered_extent-&gt;flags)) {</div><div class='ctx'> 		truncated = true;</div><div class='hunk'>@@ -3068,29 +3141,21 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered_extent-&gt;flags)) {</div><div class='del'>-		BUG_ON(!list_empty(&amp;ordered_extent-&gt;list)); /* Logic error */</div><div class='del'>-</div><div class='del'>-		btrfs_inode_safe_disk_i_size_write(inode, 0);</div><div class='del'>-		if (freespace_inode)</div><div class='del'>-			trans = btrfs_join_transaction_spacecache(root);</div><div class='del'>-		else</div><div class='del'>-			trans = btrfs_join_transaction(root);</div><div class='del'>-		if (IS_ERR(trans)) {</div><div class='del'>-			ret = PTR_ERR(trans);</div><div class='del'>-			trans = NULL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		trans-&gt;block_rsv = &amp;inode-&gt;block_rsv;</div><div class='del'>-		ret = btrfs_update_inode_fallback(trans, inode);</div><div class='del'>-		if (ret) /* -ENOMEM or corruption */</div><div class='del'>-			btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * If it's a COW write we need to lock the extent range as we will be</div><div class='add'>+	 * inserting/replacing file extent items and unpinning an extent map.</div><div class='add'>+	 * This must be taken before joining a transaction, as it's a higher</div><div class='add'>+	 * level lock (like the inode's VFS lock), otherwise we can run into an</div><div class='add'>+	 * ABBA deadlock with other tasks (transactions work like a lock,</div><div class='add'>+	 * depending on their current state).</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered_extent-&gt;flags)) {</div><div class='add'>+		clear_bits |= EXTENT_LOCKED | EXTENT_FINISHING_ORDERED;</div><div class='add'>+		btrfs_lock_extent_bits(io_tree, start, end,</div><div class='add'>+				       EXTENT_LOCKED | EXTENT_FINISHING_ORDERED,</div><div class='add'>+				       &amp;cached_state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clear_bits |= EXTENT_LOCKED;</div><div class='del'>-	lock_extent(io_tree, start, end, &amp;cached_state);</div><div class='del'>-</div><div class='ctx'> 	if (freespace_inode)</div><div class='ctx'> 		trans = btrfs_join_transaction_spacecache(root);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3104,8 +3169,28 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)</div><div class='ctx'> 	trans-&gt;block_rsv = &amp;inode-&gt;block_rsv;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_raid_extent(trans, ordered_extent);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered_extent-&gt;flags)) {</div><div class='add'>+		/* Logic error */</div><div class='add'>+		ASSERT(list_empty(&amp;ordered_extent-&gt;list));</div><div class='add'>+		if (unlikely(!list_empty(&amp;ordered_extent-&gt;list))) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		btrfs_inode_safe_disk_i_size_write(inode, 0);</div><div class='add'>+		ret = btrfs_update_inode_fallback(trans, inode);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			/* -ENOMEM or corruption */</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+		}</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_ORDERED_COMPRESSED, &amp;ordered_extent-&gt;flags))</div><div class='ctx'> 		compress_type = ordered_extent-&gt;compress_type;</div><div class='hunk'>@@ -3127,15 +3212,20 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)</div><div class='ctx'> 						ordered_extent-&gt;disk_num_bytes);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	unpin_extent_cache(inode, ordered_extent-&gt;file_offset,</div><div class='del'>-			   ordered_extent-&gt;num_bytes, trans-&gt;transid);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_unpin_extent_cache(inode, ordered_extent-&gt;file_offset,</div><div class='add'>+				       ordered_extent-&gt;num_bytes, trans-&gt;transid);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = add_pending_csums(trans, &amp;ordered_extent-&gt;list);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3147,27 +3237,24 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((clear_bits &amp; EXTENT_DELALLOC_NEW) &amp;&amp;</div><div class='ctx'> 	    !test_bit(BTRFS_ORDERED_TRUNCATED, &amp;ordered_extent-&gt;flags))</div><div class='del'>-		clear_extent_bit(&amp;inode-&gt;io_tree, start, end,</div><div class='del'>-				 EXTENT_DELALLOC_NEW | EXTENT_ADD_INODE_BYTES,</div><div class='del'>-				 &amp;cached_state);</div><div class='add'>+		btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, start, end,</div><div class='add'>+				       EXTENT_DELALLOC_NEW | EXTENT_ADD_INODE_BYTES,</div><div class='add'>+				       &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_inode_safe_disk_i_size_write(inode, 0);</div><div class='ctx'> 	ret = btrfs_update_inode_fallback(trans, inode);</div><div class='del'>-	if (ret) { /* -ENOMEM or corruption */</div><div class='add'>+	if (unlikely(ret)) { /* -ENOMEM or corruption */</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='ctx'> out:</div><div class='del'>-	clear_extent_bit(&amp;inode-&gt;io_tree, start, end, clear_bits,</div><div class='del'>-			 &amp;cached_state);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, start, end, clear_bits,</div><div class='add'>+			       &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	if (trans)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> </div><div class='ctx'> 	if (ret || truncated) {</div><div class='del'>-		u64 unwritten_start = start;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we failed to finish this ordered extent for any reason we</div><div class='ctx'> 		 * need to make sure BTRFS_ORDERED_IOERR is set on the ordered</div><div class='hunk'>@@ -3176,16 +3263,32 @@ out:</div><div class='ctx'> 		 * set the mapping error, so we need to set it if we're the ones</div><div class='ctx'> 		 * marking this ordered extent as failed.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ret &amp;&amp; !test_and_set_bit(BTRFS_ORDERED_IOERR,</div><div class='del'>-					     &amp;ordered_extent-&gt;flags))</div><div class='del'>-			mapping_set_error(ordered_extent-&gt;inode-&gt;i_mapping, -EIO);</div><div class='add'>+		if (ret)</div><div class='add'>+			btrfs_mark_ordered_extent_error(ordered_extent);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Drop extent maps for the part of the extent we didn't write.</div><div class='add'>+		 *</div><div class='add'>+		 * We have an exception here for the free_space_inode, this is</div><div class='add'>+		 * because when we do btrfs_get_extent() on the free space inode</div><div class='add'>+		 * we will search the commit root.  If this is a new block group</div><div class='add'>+		 * we won't find anything, and we will trip over the assert in</div><div class='add'>+		 * writepage where we do ASSERT(em-&gt;block_start !=</div><div class='add'>+		 * EXTENT_MAP_HOLE).</div><div class='add'>+		 *</div><div class='add'>+		 * Theoretically we could also skip this for any NOCOW extent as</div><div class='add'>+		 * we don't mess with the extent map tree in the NOCOW case, but</div><div class='add'>+		 * for now simply skip this if we are the free space inode.</div><div class='add'>+		 */</div><div class='add'>+		if (!btrfs_is_free_space_inode(inode)) {</div><div class='add'>+			u64 unwritten_start = start;</div><div class='ctx'> </div><div class='del'>-		if (truncated)</div><div class='del'>-			unwritten_start += logical_len;</div><div class='del'>-		clear_extent_uptodate(io_tree, unwritten_start, end, NULL);</div><div class='add'>+			if (truncated)</div><div class='add'>+				unwritten_start += logical_len;</div><div class='ctx'> </div><div class='del'>-		/* Drop extent maps for the part of the extent we didn't write. */</div><div class='del'>-		btrfs_drop_extent_map_range(inode, unwritten_start, end, false);</div><div class='add'>+			btrfs_drop_extent_map_range(inode, unwritten_start,</div><div class='add'>+						    end, false);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the ordered extent had an IOERR or something else went</div><div class='hunk'>@@ -3212,12 +3315,12 @@ out:</div><div class='ctx'> 						NULL);</div><div class='ctx'> 			btrfs_free_reserved_extent(fs_info,</div><div class='ctx'> 					ordered_extent-&gt;disk_bytenr,</div><div class='del'>-					ordered_extent-&gt;disk_num_bytes, 1);</div><div class='add'>+					ordered_extent-&gt;disk_num_bytes, true);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Actually free the qgroup rsv which was released when</div><div class='ctx'> 			 * the ordered extent was created.</div><div class='ctx'> 			 */</div><div class='del'>-			btrfs_qgroup_free_refroot(fs_info, inode-&gt;root-&gt;root_key.objectid,</div><div class='add'>+			btrfs_qgroup_free_refroot(fs_info, btrfs_root_id(inode-&gt;root),</div><div class='ctx'> 						  ordered_extent-&gt;qgroup_rsv,</div><div class='ctx'> 						  BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3239,7 +3342,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered)</div><div class='ctx'> {</div><div class='del'>-	if (btrfs_is_zoned(btrfs_sb(ordered-&gt;inode-&gt;i_sb)) &amp;&amp;</div><div class='add'>+	if (btrfs_is_zoned(ordered-&gt;inode-&gt;root-&gt;fs_info) &amp;&amp;</div><div class='ctx'> 	    !test_bit(BTRFS_ORDERED_IOERR, &amp;ordered-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    list_empty(&amp;ordered-&gt;bioc_list))</div><div class='ctx'> 		btrfs_finish_ordered_zoned(ordered);</div><div class='hunk'>@@ -3247,35 +3350,89 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Verify the checksum for a single sector without any extra action that depend</div><div class='del'>- * on the type of I/O.</div><div class='add'>+ * Calculate the checksum of an fs block at physical memory address @paddr,</div><div class='add'>+ * and save the result to @dest.</div><div class='add'>+ *</div><div class='add'>+ * The folio containing @paddr must be large enough to contain a full fs block.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,</div><div class='del'>-			    u32 pgoff, u8 *csum, const u8 * const csum_expected)</div><div class='add'>+void btrfs_calculate_block_csum_folio(struct btrfs_fs_info *fs_info,</div><div class='add'>+				      const phys_addr_t paddr, u8 *dest)</div><div class='ctx'> {</div><div class='del'>-	SHASH_DESC_ON_STACK(shash, fs_info-&gt;csum_shash);</div><div class='del'>-	char *kaddr;</div><div class='add'>+	struct folio *folio = page_folio(phys_to_page(paddr));</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(blocksize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = blocksize / step;</div><div class='add'>+	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];</div><div class='ctx'> </div><div class='del'>-	ASSERT(pgoff + fs_info-&gt;sectorsize &lt;= PAGE_SIZE);</div><div class='add'>+	/* The full block must be inside the folio. */</div><div class='add'>+	ASSERT(offset_in_folio(folio, paddr) + blocksize &lt;= folio_size(folio));</div><div class='ctx'> </div><div class='del'>-	shash-&gt;tfm = fs_info-&gt;csum_shash;</div><div class='add'>+	for (int i = 0; i &lt; nr_steps; i++) {</div><div class='add'>+		u32 pindex = offset_in_folio(folio, paddr + i * step) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_local_page(page) + pgoff;</div><div class='del'>-	crypto_shash_digest(shash, kaddr, fs_info-&gt;sectorsize, csum);</div><div class='del'>-	kunmap_local(kaddr);</div><div class='add'>+		/*</div><div class='add'>+		 * For bs &lt;= ps cases, we will only run the loop once, so the offset</div><div class='add'>+		 * inside the page will only added to paddrs[0].</div><div class='add'>+		 *</div><div class='add'>+		 * For bs &gt; ps cases, the block must be page aligned, thus offset</div><div class='add'>+		 * inside the page will always be 0.</div><div class='add'>+		 */</div><div class='add'>+		paddrs[i] = page_to_phys(folio_page(folio, pindex)) + offset_in_page(paddr);</div><div class='add'>+	}</div><div class='add'>+	return btrfs_calculate_block_csum_pages(fs_info, paddrs, dest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate the checksum of a fs block backed by multiple noncontiguous pages</div><div class='add'>+ * at @paddrs[] and save the result to @dest.</div><div class='add'>+ *</div><div class='add'>+ * The folio containing @paddr must be large enough to contain a full fs block.</div><div class='add'>+ */</div><div class='add'>+void btrfs_calculate_block_csum_pages(struct btrfs_fs_info *fs_info,</div><div class='add'>+				      const phys_addr_t paddrs[], u8 *dest)</div><div class='add'>+{</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(blocksize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = blocksize / step;</div><div class='add'>+	SHASH_DESC_ON_STACK(shash, fs_info-&gt;csum_shash);</div><div class='add'>+</div><div class='add'>+	shash-&gt;tfm = fs_info-&gt;csum_shash;</div><div class='add'>+	crypto_shash_init(shash);</div><div class='add'>+	for (int i = 0; i &lt; nr_steps; i++) {</div><div class='add'>+		const phys_addr_t paddr = paddrs[i];</div><div class='add'>+		void *kaddr;</div><div class='add'>+</div><div class='add'>+		ASSERT(offset_in_page(paddr) + step &lt;= PAGE_SIZE);</div><div class='add'>+		kaddr = kmap_local_page(phys_to_page(paddr)) + offset_in_page(paddr);</div><div class='add'>+		crypto_shash_update(shash, kaddr, step);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='add'>+	}</div><div class='add'>+	crypto_shash_final(shash, dest);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (memcmp(csum, csum_expected, fs_info-&gt;csum_size))</div><div class='add'>+/*</div><div class='add'>+ * Verify the checksum for a single sector without any extra action that depend</div><div class='add'>+ * on the type of I/O.</div><div class='add'>+ *</div><div class='add'>+ * @kaddr must be a properly kmapped address.</div><div class='add'>+ */</div><div class='add'>+int btrfs_check_block_csum(struct btrfs_fs_info *fs_info, phys_addr_t paddr, u8 *csum,</div><div class='add'>+			   const u8 * const csum_expected)</div><div class='add'>+{</div><div class='add'>+	btrfs_calculate_block_csum_folio(fs_info, paddr, csum);</div><div class='add'>+	if (unlikely(memcmp(csum, csum_expected, fs_info-&gt;csum_size) != 0))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Verify the checksum of a single data sector.</div><div class='add'>+ * Verify the checksum of a single data sector, which can be scattered at</div><div class='add'>+ * different noncontiguous pages.</div><div class='ctx'>  *</div><div class='ctx'>  * @bbio:	btrfs_io_bio which contains the csum</div><div class='ctx'>  * @dev:	device the sector is on</div><div class='ctx'>  * @bio_offset:	offset to the beginning of the bio (in bytes)</div><div class='del'>- * @bv:		bio_vec to check</div><div class='add'>+ * @paddrs:	physical addresses which back the fs block</div><div class='ctx'>  *</div><div class='ctx'>  * Check if the checksum on a data block is valid.  When a checksum mismatch is</div><div class='ctx'>  * detected, report the error and fill the corrupted range with zero.</div><div class='hunk'>@@ -3283,33 +3440,34 @@ int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,</div><div class='ctx'>  * Return %true if the sector is ok or had no checksum to start with, else %false.</div><div class='ctx'>  */</div><div class='ctx'> bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev,</div><div class='del'>-			u32 bio_offset, struct bio_vec *bv)</div><div class='add'>+			u32 bio_offset, const phys_addr_t paddrs[])</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(blocksize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = blocksize / step;</div><div class='ctx'> 	u64 file_offset = bbio-&gt;file_offset + bio_offset;</div><div class='del'>-	u64 end = file_offset + bv-&gt;bv_len - 1;</div><div class='add'>+	u64 end = file_offset + blocksize - 1;</div><div class='ctx'> 	u8 *csum_expected;</div><div class='ctx'> 	u8 csum[BTRFS_CSUM_SIZE];</div><div class='ctx'> </div><div class='del'>-	ASSERT(bv-&gt;bv_len == fs_info-&gt;sectorsize);</div><div class='del'>-</div><div class='ctx'> 	if (!bbio-&gt;csum)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_is_data_reloc_root(inode-&gt;root) &amp;&amp;</div><div class='del'>-	    test_range_bit(&amp;inode-&gt;io_tree, file_offset, end, EXTENT_NODATASUM,</div><div class='del'>-			   NULL)) {</div><div class='add'>+	    btrfs_test_range_bit(&amp;inode-&gt;io_tree, file_offset, end, EXTENT_NODATASUM,</div><div class='add'>+				 NULL)) {</div><div class='ctx'> 		/* Skip the range without csum for data reloc inode */</div><div class='del'>-		clear_extent_bits(&amp;inode-&gt;io_tree, file_offset, end,</div><div class='del'>-				  EXTENT_NODATASUM);</div><div class='add'>+		btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, file_offset, end,</div><div class='add'>+				       EXTENT_NODATASUM, NULL);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	csum_expected = bbio-&gt;csum + (bio_offset &gt;&gt; fs_info-&gt;sectorsize_bits) *</div><div class='ctx'> 				fs_info-&gt;csum_size;</div><div class='del'>-	if (btrfs_check_sector_csum(fs_info, bv-&gt;bv_page, bv-&gt;bv_offset, csum,</div><div class='del'>-				    csum_expected))</div><div class='add'>+	btrfs_calculate_block_csum_pages(fs_info, paddrs, csum);</div><div class='add'>+	if (unlikely(memcmp(csum, csum_expected, fs_info-&gt;csum_size) != 0))</div><div class='ctx'> 		goto zeroit;</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='hunk'>@@ -3318,7 +3476,8 @@ zeroit:</div><div class='ctx'> 				    bbio-&gt;mirror_num);</div><div class='ctx'> 	if (dev)</div><div class='ctx'> 		btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_CORRUPTION_ERRS);</div><div class='del'>-	memzero_bvec(bv);</div><div class='add'>+	for (int i = 0; i &lt; nr_steps; i++)</div><div class='add'>+		memzero_page(phys_to_page(paddrs[i]), offset_in_page(paddrs[i]), step);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3340,6 +3499,7 @@ void btrfs_add_delayed_iput(struct btrfs_inode *inode)</div><div class='ctx'> 	if (atomic_add_unless(&amp;inode-&gt;vfs_inode.i_count, -1, 1))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(test_bit(BTRFS_FS_STATE_NO_DELAYED_IPUT, &amp;fs_info-&gt;fs_state));</div><div class='ctx'> 	atomic_inc(&amp;fs_info-&gt;nr_delayed_iputs);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Need to be irq safe here because we can be called from either an irq</div><div class='hunk'>@@ -3431,7 +3591,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_orphan_item(trans, inode-&gt;root, btrfs_ino(inode));</div><div class='del'>-	if (ret &amp;&amp; ret != -EEXIST) {</div><div class='add'>+	if (unlikely(ret &amp;&amp; ret != -EEXIST)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3456,11 +3616,10 @@ static int btrfs_orphan_del(struct btrfs_trans_handle *trans,</div><div class='ctx'> int btrfs_orphan_cleanup(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key, found_key;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	u64 last_objectid = 0;</div><div class='ctx'> 	int ret = 0, nr_unlink = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3479,6 +3638,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)</div><div class='ctx'> 	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='add'>+		struct btrfs_inode *inode;</div><div class='add'>+</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3533,7 +3694,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)</div><div class='ctx'> 		found_key.objectid = found_key.offset;</div><div class='ctx'> 		found_key.type = BTRFS_INODE_ITEM_KEY;</div><div class='ctx'> 		found_key.offset = 0;</div><div class='del'>-		inode = btrfs_iget(fs_info-&gt;sb, last_objectid, root);</div><div class='add'>+		inode = btrfs_iget(last_objectid, root);</div><div class='ctx'> 		if (IS_ERR(inode)) {</div><div class='ctx'> 			ret = PTR_ERR(inode);</div><div class='ctx'> 			inode = NULL;</div><div class='hunk'>@@ -3602,10 +3763,10 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)</div><div class='ctx'> 		 * deleted but wasn't. The inode number may have been reused,</div><div class='ctx'> 		 * but either way, we can delete the orphan item.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!inode || inode-&gt;i_nlink) {</div><div class='add'>+		if (!inode || inode-&gt;vfs_inode.i_nlink) {</div><div class='ctx'> 			if (inode) {</div><div class='del'>-				ret = btrfs_drop_verity_items(BTRFS_I(inode));</div><div class='del'>-				iput(inode);</div><div class='add'>+				ret = btrfs_drop_verity_items(inode);</div><div class='add'>+				iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 				inode = NULL;</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto out;</div><div class='hunk'>@@ -3628,7 +3789,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)</div><div class='ctx'> 		nr_unlink++;</div><div class='ctx'> </div><div class='ctx'> 		/* this will do delete_inode and everything for us */</div><div class='del'>-		iput(inode);</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* release the path since we're done with it */</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='hunk'>@@ -3645,19 +3806,22 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_err(fs_info, "could not do orphan cleanup %d", ret);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * very simple check to peek ahead in the leaf looking for xattrs.  If we</div><div class='del'>- * don't find any xattrs, we know there can't be any acls.</div><div class='add'>+ * Look ahead in the leaf for xattrs. If we don't find any then we know there</div><div class='add'>+ * can't be any ACLs.</div><div class='ctx'>  *</div><div class='del'>- * slot is the slot the inode is in, objectid is the objectid of the inode</div><div class='add'>+ * @leaf:       the eb leaf where to search</div><div class='add'>+ * @slot:       the slot the inode is in</div><div class='add'>+ * @objectid:   the objectid of the inode</div><div class='add'>+ *</div><div class='add'>+ * Return true if there is xattr/ACL, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static noinline int acls_after_inode_item(struct extent_buffer *leaf,</div><div class='del'>-					  int slot, u64 objectid,</div><div class='del'>-					  int *first_xattr_slot)</div><div class='add'>+static noinline bool acls_after_inode_item(struct extent_buffer *leaf,</div><div class='add'>+					   int slot, u64 objectid,</div><div class='add'>+					   int *first_xattr_slot)</div><div class='ctx'> {</div><div class='ctx'> 	u32 nritems = btrfs_header_nritems(leaf);</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='hunk'>@@ -3677,58 +3841,120 @@ static noinline int acls_after_inode_item(struct extent_buffer *leaf,</div><div class='ctx'> 	while (slot &lt; nritems) {</div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;found_key, slot);</div><div class='ctx'> </div><div class='del'>-		/* we found a different objectid, there must not be acls */</div><div class='add'>+		/* We found a different objectid, there must be no ACLs. */</div><div class='ctx'> 		if (found_key.objectid != objectid)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> </div><div class='del'>-		/* we found an xattr, assume we've got an acl */</div><div class='add'>+		/* We found an xattr, assume we've got an ACL. */</div><div class='ctx'> 		if (found_key.type == BTRFS_XATTR_ITEM_KEY) {</div><div class='ctx'> 			if (*first_xattr_slot == -1)</div><div class='ctx'> 				*first_xattr_slot = slot;</div><div class='ctx'> 			if (found_key.offset == xattr_access ||</div><div class='ctx'> 			    found_key.offset == xattr_default)</div><div class='del'>-				return 1;</div><div class='add'>+				return true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * we found a key greater than an xattr key, there can't</div><div class='del'>-		 * be any acls later on</div><div class='add'>+		 * We found a key greater than an xattr key, there can't be any</div><div class='add'>+		 * ACLs later on.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (found_key.type &gt; BTRFS_XATTR_ITEM_KEY)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> </div><div class='ctx'> 		slot++;</div><div class='ctx'> 		scanned++;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * it goes inode, inode backrefs, xattrs, extents,</div><div class='del'>-		 * so if there are a ton of hard links to an inode there can</div><div class='del'>-		 * be a lot of backrefs.  Don't waste time searching too hard,</div><div class='del'>-		 * this is just an optimization</div><div class='add'>+		 * The item order goes like:</div><div class='add'>+		 * - inode</div><div class='add'>+		 * - inode backrefs</div><div class='add'>+		 * - xattrs</div><div class='add'>+		 * - extents,</div><div class='add'>+		 *</div><div class='add'>+		 * so if there are lots of hard links to an inode there can be</div><div class='add'>+		 * a lot of backrefs.  Don't waste time searching too hard,</div><div class='add'>+		 * this is just an optimization.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (scanned &gt;= 8)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	/* we hit the end of the leaf before we found an xattr or</div><div class='del'>-	 * something larger than an xattr.  We have to assume the inode</div><div class='del'>-	 * has acls</div><div class='add'>+	/*</div><div class='add'>+	 * We hit the end of the leaf before we found an xattr or something</div><div class='add'>+	 * larger than an xattr.  We have to assume the inode has ACLs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (*first_xattr_slot == -1)</div><div class='ctx'> 		*first_xattr_slot = slot;</div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_init_file_extent_tree(struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(inode-&gt;file_extent_tree))</div><div class='add'>+		return 0;</div><div class='add'>+	if (btrfs_fs_incompat(fs_info, NO_HOLES))</div><div class='add'>+		return 0;</div><div class='add'>+	if (!S_ISREG(inode-&gt;vfs_inode.i_mode))</div><div class='add'>+		return 0;</div><div class='add'>+	if (btrfs_is_free_space_inode(inode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	inode-&gt;file_extent_tree = kmalloc(sizeof(struct extent_io_tree), GFP_KERNEL);</div><div class='add'>+	if (!inode-&gt;file_extent_tree)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, inode-&gt;file_extent_tree,</div><div class='add'>+				  IO_TREE_INODE_FILE_EXTENT);</div><div class='add'>+	/* Lockdep class is set only for the file extent tree. */</div><div class='add'>+	lockdep_set_class(&amp;inode-&gt;file_extent_tree-&gt;lock, &amp;file_extent_tree_class);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_add_inode_to_root(struct btrfs_inode *inode, bool prealloc)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_inode *existing;</div><div class='add'>+	const u64 ino = btrfs_ino(inode);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (inode_unhashed(&amp;inode-&gt;vfs_inode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (prealloc) {</div><div class='add'>+		ret = xa_reserve(&amp;root-&gt;inodes, ino, GFP_NOFS);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	existing = xa_store(&amp;root-&gt;inodes, ino, inode, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (xa_is_err(existing)) {</div><div class='add'>+		ret = xa_err(existing);</div><div class='add'>+		ASSERT(ret != -EINVAL);</div><div class='add'>+		ASSERT(ret != -ENOMEM);</div><div class='add'>+		return ret;</div><div class='add'>+	} else if (existing) {</div><div class='add'>+		WARN_ON(!(inode_state_read_once(&amp;existing-&gt;vfs_inode) &amp; (I_WILL_FREE | I_FREEING)));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * read an inode from the btree into the in-memory inode</div><div class='add'>+ * Read a locked inode from the btree into the in-memory inode and add it to</div><div class='add'>+ * its root list/tree.</div><div class='add'>+ *</div><div class='add'>+ * On failure clean up the inode.</div><div class='ctx'>  */</div><div class='del'>-static int btrfs_read_locked_inode(struct inode *inode,</div><div class='del'>-				   struct btrfs_path *in_path)</div><div class='add'>+static int btrfs_read_locked_inode(struct btrfs_inode *inode, struct btrfs_path *path)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_path *path = in_path;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='add'>+	struct inode *vfs_inode = &amp;inode-&gt;vfs_inode;</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> 	unsigned long ptr;</div><div class='ctx'> 	int maybe_acls;</div><div class='hunk'>@@ -3741,19 +3967,19 @@ static int btrfs_read_locked_inode(struct inode *inode,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		filled = true;</div><div class='ctx'> </div><div class='del'>-	if (!path) {</div><div class='del'>-		path = btrfs_alloc_path();</div><div class='del'>-		if (!path)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	ASSERT(path);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;location, &amp;BTRFS_I(inode)-&gt;location, sizeof(location));</div><div class='add'>+	btrfs_get_inode_key(inode, &amp;location);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_lookup_inode(NULL, root, path, &amp;location, 0);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		if (path != in_path)</div><div class='del'>-			btrfs_free_path(path);</div><div class='del'>-		return ret;</div><div class='add'>+		/*</div><div class='add'>+		 * ret &gt; 0 can come from btrfs_search_slot called by</div><div class='add'>+		 * btrfs_lookup_inode(), this means the inode was not found.</div><div class='add'>+		 */</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -3763,41 +3989,47 @@ static int btrfs_read_locked_inode(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	inode_item = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 				    struct btrfs_inode_item);</div><div class='del'>-	inode-&gt;i_mode = btrfs_inode_mode(leaf, inode_item);</div><div class='del'>-	set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));</div><div class='del'>-	i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));</div><div class='del'>-	i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));</div><div class='del'>-	btrfs_i_size_write(BTRFS_I(inode), btrfs_inode_size(leaf, inode_item));</div><div class='del'>-	btrfs_inode_set_file_extent_range(BTRFS_I(inode), 0,</div><div class='del'>-			round_up(i_size_read(inode), fs_info-&gt;sectorsize));</div><div class='del'>-</div><div class='del'>-	inode_set_atime(inode, btrfs_timespec_sec(leaf, &amp;inode_item-&gt;atime),</div><div class='add'>+	vfs_inode-&gt;i_mode = btrfs_inode_mode(leaf, inode_item);</div><div class='add'>+	set_nlink(vfs_inode, btrfs_inode_nlink(leaf, inode_item));</div><div class='add'>+	i_uid_write(vfs_inode, btrfs_inode_uid(leaf, inode_item));</div><div class='add'>+	i_gid_write(vfs_inode, btrfs_inode_gid(leaf, inode_item));</div><div class='add'>+	btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));</div><div class='add'>+</div><div class='add'>+	inode_set_atime(vfs_inode, btrfs_timespec_sec(leaf, &amp;inode_item-&gt;atime),</div><div class='ctx'> 			btrfs_timespec_nsec(leaf, &amp;inode_item-&gt;atime));</div><div class='ctx'> </div><div class='del'>-	inode_set_mtime(inode, btrfs_timespec_sec(leaf, &amp;inode_item-&gt;mtime),</div><div class='add'>+	inode_set_mtime(vfs_inode, btrfs_timespec_sec(leaf, &amp;inode_item-&gt;mtime),</div><div class='ctx'> 			btrfs_timespec_nsec(leaf, &amp;inode_item-&gt;mtime));</div><div class='ctx'> </div><div class='del'>-	inode_set_ctime(inode, btrfs_timespec_sec(leaf, &amp;inode_item-&gt;ctime),</div><div class='add'>+	inode_set_ctime(vfs_inode, btrfs_timespec_sec(leaf, &amp;inode_item-&gt;ctime),</div><div class='ctx'> 			btrfs_timespec_nsec(leaf, &amp;inode_item-&gt;ctime));</div><div class='ctx'> </div><div class='del'>-	BTRFS_I(inode)-&gt;i_otime_sec = btrfs_timespec_sec(leaf, &amp;inode_item-&gt;otime);</div><div class='del'>-	BTRFS_I(inode)-&gt;i_otime_nsec = btrfs_timespec_nsec(leaf, &amp;inode_item-&gt;otime);</div><div class='add'>+	inode-&gt;i_otime_sec = btrfs_timespec_sec(leaf, &amp;inode_item-&gt;otime);</div><div class='add'>+	inode-&gt;i_otime_nsec = btrfs_timespec_nsec(leaf, &amp;inode_item-&gt;otime);</div><div class='ctx'> </div><div class='del'>-	inode_set_bytes(inode, btrfs_inode_nbytes(leaf, inode_item));</div><div class='del'>-	BTRFS_I(inode)-&gt;generation = btrfs_inode_generation(leaf, inode_item);</div><div class='del'>-	BTRFS_I(inode)-&gt;last_trans = btrfs_inode_transid(leaf, inode_item);</div><div class='add'>+	inode_set_bytes(vfs_inode, btrfs_inode_nbytes(leaf, inode_item));</div><div class='add'>+	inode-&gt;generation = btrfs_inode_generation(leaf, inode_item);</div><div class='add'>+	inode-&gt;last_trans = btrfs_inode_transid(leaf, inode_item);</div><div class='ctx'> </div><div class='del'>-	inode_set_iversion_queried(inode,</div><div class='del'>-				   btrfs_inode_sequence(leaf, inode_item));</div><div class='del'>-	inode-&gt;i_generation = BTRFS_I(inode)-&gt;generation;</div><div class='del'>-	inode-&gt;i_rdev = 0;</div><div class='add'>+	inode_set_iversion_queried(vfs_inode, btrfs_inode_sequence(leaf, inode_item));</div><div class='add'>+	vfs_inode-&gt;i_generation = inode-&gt;generation;</div><div class='add'>+	vfs_inode-&gt;i_rdev = 0;</div><div class='ctx'> 	rdev = btrfs_inode_rdev(leaf, inode_item);</div><div class='ctx'> </div><div class='del'>-	BTRFS_I(inode)-&gt;index_cnt = (u64)-1;</div><div class='add'>+	if (S_ISDIR(vfs_inode-&gt;i_mode))</div><div class='add'>+		inode-&gt;index_cnt = (u64)-1;</div><div class='add'>+</div><div class='ctx'> 	btrfs_inode_split_flags(btrfs_inode_flags(leaf, inode_item),</div><div class='del'>-				&amp;BTRFS_I(inode)-&gt;flags, &amp;BTRFS_I(inode)-&gt;ro_flags);</div><div class='add'>+				&amp;inode-&gt;flags, &amp;inode-&gt;ro_flags);</div><div class='add'>+	btrfs_update_inode_mapping_flags(inode);</div><div class='add'>+	btrfs_set_inode_mapping_order(inode);</div><div class='ctx'> </div><div class='ctx'> cache_index:</div><div class='add'>+	ret = btrfs_init_file_extent_tree(inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	btrfs_inode_set_file_extent_range(inode, 0,</div><div class='add'>+			round_up(i_size_read(vfs_inode), fs_info-&gt;sectorsize));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we were modified in the current generation and evicted from memory</div><div class='ctx'> 	 * and then re-read we need to do a full sync since we don't have any</div><div class='hunk'>@@ -3807,9 +4039,8 @@ cache_index:</div><div class='ctx'> 	 * This is required for both inode re-read from disk and delayed inode</div><div class='ctx'> 	 * in the delayed_nodes xarray.</div><div class='ctx'> 	 */</div><div class='del'>-	if (BTRFS_I(inode)-&gt;last_trans == btrfs_get_fs_generation(fs_info))</div><div class='del'>-		set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,</div><div class='del'>-			&amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+	if (inode-&gt;last_trans == btrfs_get_fs_generation(fs_info))</div><div class='add'>+		set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't persist the id of the transaction where an unlink operation</div><div class='hunk'>@@ -3838,7 +4069,7 @@ cache_index:</div><div class='ctx'> 	 * transaction commits on fsync if our inode is a directory, or if our</div><div class='ctx'> 	 * inode is not a directory, logging its parent unnecessarily.</div><div class='ctx'> 	 */</div><div class='del'>-	BTRFS_I(inode)-&gt;last_unlink_trans = BTRFS_I(inode)-&gt;last_trans;</div><div class='add'>+	inode-&gt;last_unlink_trans = inode-&gt;last_trans;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Same logic as for last_unlink_trans. We don't persist the generation</div><div class='hunk'>@@ -3846,15 +4077,15 @@ cache_index:</div><div class='ctx'> 	 * operation, so after eviction and reloading the inode we must be</div><div class='ctx'> 	 * pessimistic and assume the last transaction that modified the inode.</div><div class='ctx'> 	 */</div><div class='del'>-	BTRFS_I(inode)-&gt;last_reflink_trans = BTRFS_I(inode)-&gt;last_trans;</div><div class='add'>+	inode-&gt;last_reflink_trans = inode-&gt;last_trans;</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;slots[0]++;</div><div class='del'>-	if (inode-&gt;i_nlink != 1 ||</div><div class='add'>+	if (vfs_inode-&gt;i_nlink != 1 ||</div><div class='ctx'> 	    path-&gt;slots[0] &gt;= btrfs_header_nritems(leaf))</div><div class='ctx'> 		goto cache_acl;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;location, path-&gt;slots[0]);</div><div class='del'>-	if (location.objectid != btrfs_ino(BTRFS_I(inode)))</div><div class='add'>+	if (location.objectid != btrfs_ino(inode))</div><div class='ctx'> 		goto cache_acl;</div><div class='ctx'> </div><div class='ctx'> 	ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='hunk'>@@ -3862,13 +4093,12 @@ cache_index:</div><div class='ctx'> 		struct btrfs_inode_ref *ref;</div><div class='ctx'> </div><div class='ctx'> 		ref = (struct btrfs_inode_ref *)ptr;</div><div class='del'>-		BTRFS_I(inode)-&gt;dir_index = btrfs_inode_ref_index(leaf, ref);</div><div class='add'>+		inode-&gt;dir_index = btrfs_inode_ref_index(leaf, ref);</div><div class='ctx'> 	} else if (location.type == BTRFS_INODE_EXTREF_KEY) {</div><div class='ctx'> 		struct btrfs_inode_extref *extref;</div><div class='ctx'> </div><div class='ctx'> 		extref = (struct btrfs_inode_extref *)ptr;</div><div class='del'>-		BTRFS_I(inode)-&gt;dir_index = btrfs_inode_extref_index(leaf,</div><div class='del'>-								     extref);</div><div class='add'>+		inode-&gt;dir_index = btrfs_inode_extref_index(leaf, extref);</div><div class='ctx'> 	}</div><div class='ctx'> cache_acl:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3876,45 +4106,50 @@ cache_acl:</div><div class='ctx'> 	 * any xattrs or acls</div><div class='ctx'> 	 */</div><div class='ctx'> 	maybe_acls = acls_after_inode_item(leaf, path-&gt;slots[0],</div><div class='del'>-			btrfs_ino(BTRFS_I(inode)), &amp;first_xattr_slot);</div><div class='add'>+					   btrfs_ino(inode), &amp;first_xattr_slot);</div><div class='ctx'> 	if (first_xattr_slot != -1) {</div><div class='ctx'> 		path-&gt;slots[0] = first_xattr_slot;</div><div class='ctx'> 		ret = btrfs_load_inode_props(inode, path);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 				  "error loading props for ino %llu (root %llu): %d",</div><div class='del'>-				  btrfs_ino(BTRFS_I(inode)),</div><div class='del'>-				  root-&gt;root_key.objectid, ret);</div><div class='add'>+				  btrfs_ino(inode), btrfs_root_id(root), ret);</div><div class='ctx'> 	}</div><div class='del'>-	if (path != in_path)</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (!maybe_acls)</div><div class='del'>-		cache_no_acl(inode);</div><div class='add'>+		cache_no_acl(vfs_inode);</div><div class='ctx'> </div><div class='del'>-	switch (inode-&gt;i_mode &amp; S_IFMT) {</div><div class='add'>+	switch (vfs_inode-&gt;i_mode &amp; S_IFMT) {</div><div class='ctx'> 	case S_IFREG:</div><div class='del'>-		inode-&gt;i_mapping-&gt;a_ops = &amp;btrfs_aops;</div><div class='del'>-		inode-&gt;i_fop = &amp;btrfs_file_operations;</div><div class='del'>-		inode-&gt;i_op = &amp;btrfs_file_inode_operations;</div><div class='add'>+		vfs_inode-&gt;i_mapping-&gt;a_ops = &amp;btrfs_aops;</div><div class='add'>+		vfs_inode-&gt;i_fop = &amp;btrfs_file_operations;</div><div class='add'>+		vfs_inode-&gt;i_op = &amp;btrfs_file_inode_operations;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFDIR:</div><div class='del'>-		inode-&gt;i_fop = &amp;btrfs_dir_file_operations;</div><div class='del'>-		inode-&gt;i_op = &amp;btrfs_dir_inode_operations;</div><div class='add'>+		vfs_inode-&gt;i_fop = &amp;btrfs_dir_file_operations;</div><div class='add'>+		vfs_inode-&gt;i_op = &amp;btrfs_dir_inode_operations;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFLNK:</div><div class='del'>-		inode-&gt;i_op = &amp;btrfs_symlink_inode_operations;</div><div class='del'>-		inode_nohighmem(inode);</div><div class='del'>-		inode-&gt;i_mapping-&gt;a_ops = &amp;btrfs_aops;</div><div class='add'>+		vfs_inode-&gt;i_op = &amp;btrfs_symlink_inode_operations;</div><div class='add'>+		inode_nohighmem(vfs_inode);</div><div class='add'>+		vfs_inode-&gt;i_mapping-&gt;a_ops = &amp;btrfs_aops;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		inode-&gt;i_op = &amp;btrfs_special_inode_operations;</div><div class='del'>-		init_special_inode(inode, inode-&gt;i_mode, rdev);</div><div class='add'>+		vfs_inode-&gt;i_op = &amp;btrfs_special_inode_operations;</div><div class='add'>+		init_special_inode(vfs_inode, vfs_inode-&gt;i_mode, rdev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_sync_inode_flags_to_i_flags(inode);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_add_inode_to_root(inode, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+out:</div><div class='add'>+	iget_failed(vfs_inode);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3925,45 +4160,35 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_inode_item *item,</div><div class='ctx'> 			    struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> </div><div class='del'>-	btrfs_init_map_token(&amp;token, leaf);</div><div class='del'>-</div><div class='del'>-	btrfs_set_token_inode_uid(&amp;token, item, i_uid_read(inode));</div><div class='del'>-	btrfs_set_token_inode_gid(&amp;token, item, i_gid_read(inode));</div><div class='del'>-	btrfs_set_token_inode_size(&amp;token, item, BTRFS_I(inode)-&gt;disk_i_size);</div><div class='del'>-	btrfs_set_token_inode_mode(&amp;token, item, inode-&gt;i_mode);</div><div class='del'>-	btrfs_set_token_inode_nlink(&amp;token, item, inode-&gt;i_nlink);</div><div class='del'>-</div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;atime,</div><div class='del'>-				     inode_get_atime_sec(inode));</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;atime,</div><div class='del'>-				      inode_get_atime_nsec(inode));</div><div class='del'>-</div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;mtime,</div><div class='del'>-				     inode_get_mtime_sec(inode));</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;mtime,</div><div class='del'>-				      inode_get_mtime_nsec(inode));</div><div class='del'>-</div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;ctime,</div><div class='del'>-				     inode_get_ctime_sec(inode));</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;ctime,</div><div class='del'>-				      inode_get_ctime_nsec(inode));</div><div class='del'>-</div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_sec);</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_nsec);</div><div class='del'>-</div><div class='del'>-	btrfs_set_token_inode_nbytes(&amp;token, item, inode_get_bytes(inode));</div><div class='del'>-	btrfs_set_token_inode_generation(&amp;token, item,</div><div class='del'>-					 BTRFS_I(inode)-&gt;generation);</div><div class='del'>-	btrfs_set_token_inode_sequence(&amp;token, item, inode_peek_iversion(inode));</div><div class='del'>-	btrfs_set_token_inode_transid(&amp;token, item, trans-&gt;transid);</div><div class='del'>-	btrfs_set_token_inode_rdev(&amp;token, item, inode-&gt;i_rdev);</div><div class='add'>+	btrfs_set_inode_uid(leaf, item, i_uid_read(inode));</div><div class='add'>+	btrfs_set_inode_gid(leaf, item, i_gid_read(inode));</div><div class='add'>+	btrfs_set_inode_size(leaf, item, BTRFS_I(inode)-&gt;disk_i_size);</div><div class='add'>+	btrfs_set_inode_mode(leaf, item, inode-&gt;i_mode);</div><div class='add'>+	btrfs_set_inode_nlink(leaf, item, inode-&gt;i_nlink);</div><div class='add'>+</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;atime, inode_get_atime_sec(inode));</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;atime, inode_get_atime_nsec(inode));</div><div class='add'>+</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;mtime, inode_get_mtime_sec(inode));</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;mtime, inode_get_mtime_nsec(inode));</div><div class='add'>+</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;ctime, inode_get_ctime_sec(inode));</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;ctime, inode_get_ctime_nsec(inode));</div><div class='add'>+</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_sec);</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_nsec);</div><div class='add'>+</div><div class='add'>+	btrfs_set_inode_nbytes(leaf, item, inode_get_bytes(inode));</div><div class='add'>+	btrfs_set_inode_generation(leaf, item, BTRFS_I(inode)-&gt;generation);</div><div class='add'>+	btrfs_set_inode_sequence(leaf, item, inode_peek_iversion(inode));</div><div class='add'>+	btrfs_set_inode_transid(leaf, item, trans-&gt;transid);</div><div class='add'>+	btrfs_set_inode_rdev(leaf, item, inode-&gt;i_rdev);</div><div class='ctx'> 	flags = btrfs_inode_combine_flags(BTRFS_I(inode)-&gt;flags,</div><div class='ctx'> 					  BTRFS_I(inode)-&gt;ro_flags);</div><div class='del'>-	btrfs_set_token_inode_flags(&amp;token, item, flags);</div><div class='del'>-	btrfs_set_token_inode_block_group(&amp;token, item, 0);</div><div class='add'>+	btrfs_set_inode_flags(leaf, item, flags);</div><div class='add'>+	btrfs_set_inode_block_group(leaf, item, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3973,19 +4198,21 @@ static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					    struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='add'>+	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_lookup_inode(trans, inode-&gt;root, path, &amp;inode-&gt;location, 1);</div><div class='add'>+	btrfs_get_inode_key(inode, &amp;key);</div><div class='add'>+	ret = btrfs_lookup_inode(trans, inode-&gt;root, path, &amp;key, 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			ret = -ENOENT;</div><div class='del'>-		goto failed;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -3993,12 +4220,8 @@ static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    struct btrfs_inode_item);</div><div class='ctx'> </div><div class='ctx'> 	fill_inode_item(trans, leaf, inode_item, &amp;inode-&gt;vfs_inode);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_set_inode_last_trans(trans, inode);</div><div class='del'>-	ret = 0;</div><div class='del'>-failed:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4043,6 +4266,23 @@ int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void update_time_after_link_or_unlink(struct btrfs_inode *dir)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 now;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are replaying a log tree, we do not want to update the mtime</div><div class='add'>+	 * and ctime of the parent directory with the current time, since the</div><div class='add'>+	 * log replay procedure is responsible for setting them to their correct</div><div class='add'>+	 * values (the ones it had when the fsync was done).</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(BTRFS_FS_LOG_RECOVERING, &amp;dir-&gt;root-&gt;fs_info-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	now = inode_set_ctime_current(&amp;dir-&gt;vfs_inode);</div><div class='add'>+	inode_set_mtime_to_ts(&amp;dir-&gt;vfs_inode, now);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * unlink helper that gets used here in inode.c and in the tree logging</div><div class='ctx'>  * recovery code.  It remove a link in a directory with a given name, and</div><div class='hunk'>@@ -4064,20 +4304,22 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u64 dir_ino = btrfs_ino(dir);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	di = btrfs_lookup_dir_item(trans, root, path, dir_ino, name, -1);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(di)) {</div><div class='del'>-		ret = di ? PTR_ERR(di) : -ENOENT;</div><div class='del'>-		goto err;</div><div class='add'>+		btrfs_free_path(path);</div><div class='add'>+		return di ? PTR_ERR(di) : -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = btrfs_delete_one_dir_name(trans, root, path, di);</div><div class='add'>+	/*</div><div class='add'>+	 * Down the call chains below we'll also need to allocate a path, so no</div><div class='add'>+	 * need to hold on to this one for longer than necessary.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_free_path(path);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we don't have dir index, we have to get it by looking up</div><div class='hunk'>@@ -4098,21 +4340,21 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_inode_ref(trans, root, name, ino, dir_ino, &amp;index);</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_info(fs_info,</div><div class='del'>-			"failed to delete reference to %.*s, inode %llu parent %llu",</div><div class='del'>-			name-&gt;len, name-&gt;name, ino, dir_ino);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_crit(fs_info,</div><div class='add'>+	   "failed to delete reference to %.*s, root %llu inode %llu parent %llu",</div><div class='add'>+			   name-&gt;len, name-&gt;name, btrfs_root_id(root), ino, dir_ino);</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto err;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> skip_backref:</div><div class='ctx'> 	if (rename_ctx)</div><div class='ctx'> 		rename_ctx-&gt;index = index;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_delete_delayed_dir_index(trans, dir, index);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto err;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4122,8 +4364,8 @@ skip_backref:</div><div class='ctx'> 	 * operations on the log tree, increasing latency for applications.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!rename_ctx) {</div><div class='del'>-		btrfs_del_inode_ref_in_log(trans, root, name, inode, dir_ino);</div><div class='del'>-		btrfs_del_dir_entries_in_log(trans, root, name, dir, index);</div><div class='add'>+		btrfs_del_inode_ref_in_log(trans, name, inode, dir);</div><div class='add'>+		btrfs_del_dir_entries_in_log(trans, name, dir, index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4136,18 +4378,14 @@ skip_backref:</div><div class='ctx'> 	 * holding.</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_run_delayed_iput(fs_info, inode);</div><div class='del'>-err:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_i_size_write(dir, dir-&gt;vfs_inode.i_size - name-&gt;len * 2);</div><div class='ctx'> 	inode_inc_iversion(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	inode_set_ctime_current(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	inode_inc_iversion(&amp;dir-&gt;vfs_inode);</div><div class='del'>- 	inode_set_mtime_to_ts(&amp;dir-&gt;vfs_inode, inode_set_ctime_current(&amp;dir-&gt;vfs_inode));</div><div class='del'>-	ret = btrfs_update_inode(trans, dir);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	update_time_after_link_or_unlink(dir);</div><div class='add'>+</div><div class='add'>+	return btrfs_update_inode(trans, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_unlink_inode(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -4226,7 +4464,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = dir-&gt;root;</div><div class='ctx'> 	struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -4243,9 +4481,9 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* This needs to handle no-key deletions later on */</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='del'>-		objectid = inode-&gt;root-&gt;root_key.objectid;</div><div class='add'>+		objectid = btrfs_root_id(inode-&gt;root);</div><div class='ctx'> 	} else if (btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) {</div><div class='del'>-		objectid = inode-&gt;location.objectid;</div><div class='add'>+		objectid = inode-&gt;ref_root_id;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		fscrypt_free_filename(&amp;fname);</div><div class='hunk'>@@ -4269,7 +4507,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(leaf, di, &amp;key);</div><div class='ctx'> 	WARN_ON(key.type != BTRFS_ROOT_ITEM_KEY || key.objectid != objectid);</div><div class='ctx'> 	ret = btrfs_delete_one_dir_name(trans, root, path, di);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4286,11 +4524,8 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) {</div><div class='ctx'> 		di = btrfs_search_dir_index_item(root, path, dir_ino, &amp;fname.disk_name);</div><div class='del'>-		if (IS_ERR_OR_NULL(di)) {</div><div class='del'>-			if (!di)</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-			else</div><div class='del'>-				ret = PTR_ERR(di);</div><div class='add'>+		if (IS_ERR(di)) {</div><div class='add'>+			ret = PTR_ERR(di);</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4301,16 +4536,16 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = btrfs_del_root_ref(trans, objectid,</div><div class='del'>-					 root-&gt;root_key.objectid, dir_ino,</div><div class='add'>+					 btrfs_root_id(root), dir_ino,</div><div class='ctx'> 					 &amp;index, &amp;fname.disk_name);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_delete_delayed_dir_index(trans, dir, index);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4322,7 +4557,6 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	fscrypt_free_filename(&amp;fname);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4334,7 +4568,7 @@ out:</div><div class='ctx'> static noinline int may_destroy_subvol(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct fscrypt_str name = FSTR_INIT("default", 7);</div><div class='hunk'>@@ -4351,35 +4585,39 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)</div><div class='ctx'> 				   dir_id, &amp;name, 0);</div><div class='ctx'> 	if (di &amp;&amp; !IS_ERR(di)) {</div><div class='ctx'> 		btrfs_dir_item_key_to_cpu(path-&gt;nodes[0], di, &amp;key);</div><div class='del'>-		if (key.objectid == root-&gt;root_key.objectid) {</div><div class='add'>+		if (key.objectid == btrfs_root_id(root)) {</div><div class='ctx'> 			ret = -EPERM;</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 				  "deleting default subvolume %llu is not allowed",</div><div class='ctx'> 				  key.objectid);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key.objectid = root-&gt;root_key.objectid;</div><div class='add'>+	key.objectid = btrfs_root_id(root);</div><div class='ctx'> 	key.type = BTRFS_ROOT_REF_KEY;</div><div class='ctx'> 	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, fs_info-&gt;tree_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	BUG_ON(ret == 0);</div><div class='add'>+		return ret;</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist a root</div><div class='add'>+		 * with such id, but this is out of valid range.</div><div class='add'>+		 */</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	if (path-&gt;slots[0] &gt; 0) {</div><div class='ctx'> 		path-&gt;slots[0]--;</div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='del'>-		if (key.objectid == root-&gt;root_key.objectid &amp;&amp;</div><div class='del'>-		    key.type == BTRFS_ROOT_REF_KEY)</div><div class='add'>+		if (key.objectid == btrfs_root_id(root) &amp;&amp; key.type == BTRFS_ROOT_REF_KEY)</div><div class='ctx'> 			ret = -ENOTEMPTY;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4387,77 +4625,42 @@ out:</div><div class='ctx'> static void btrfs_prune_dentries(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct rb_node *node;</div><div class='del'>-	struct rb_node *prev;</div><div class='del'>-	struct btrfs_inode *entry;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	u64 objectid = 0;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	u64 min_ino = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!BTRFS_FS_ERROR(fs_info))</div><div class='ctx'> 		WARN_ON(btrfs_root_refs(&amp;root-&gt;root_item) != 0);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;root-&gt;inode_lock);</div><div class='del'>-again:</div><div class='del'>-	node = root-&gt;inode_tree.rb_node;</div><div class='del'>-	prev = NULL;</div><div class='del'>-	while (node) {</div><div class='del'>-		prev = node;</div><div class='del'>-		entry = rb_entry(node, struct btrfs_inode, rb_node);</div><div class='del'>-</div><div class='del'>-		if (objectid &lt; btrfs_ino(entry))</div><div class='del'>-			node = node-&gt;rb_left;</div><div class='del'>-		else if (objectid &gt; btrfs_ino(entry))</div><div class='del'>-			node = node-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!node) {</div><div class='del'>-		while (prev) {</div><div class='del'>-			entry = rb_entry(prev, struct btrfs_inode, rb_node);</div><div class='del'>-			if (objectid &lt;= btrfs_ino(entry)) {</div><div class='del'>-				node = prev;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			prev = rb_next(prev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	while (node) {</div><div class='del'>-		entry = rb_entry(node, struct btrfs_inode, rb_node);</div><div class='del'>-		objectid = btrfs_ino(entry) + 1;</div><div class='del'>-		inode = igrab(&amp;entry-&gt;vfs_inode);</div><div class='del'>-		if (inode) {</div><div class='del'>-			spin_unlock(&amp;root-&gt;inode_lock);</div><div class='del'>-			if (atomic_read(&amp;inode-&gt;i_count) &gt; 1)</div><div class='del'>-				d_prune_aliases(inode);</div><div class='del'>-			/*</div><div class='del'>-			 * btrfs_drop_inode will have it removed from the inode</div><div class='del'>-			 * cache when its usage count hits zero.</div><div class='del'>-			 */</div><div class='del'>-			iput(inode);</div><div class='del'>-			cond_resched();</div><div class='del'>-			spin_lock(&amp;root-&gt;inode_lock);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cond_resched_lock(&amp;root-&gt;inode_lock))</div><div class='del'>-			goto again;</div><div class='add'>+	inode = btrfs_find_first_inode(root, min_ino);</div><div class='add'>+	while (inode) {</div><div class='add'>+		if (icount_read(&amp;inode-&gt;vfs_inode) &gt; 1)</div><div class='add'>+			d_prune_aliases(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> </div><div class='del'>-		node = rb_next(node);</div><div class='add'>+		min_ino = btrfs_ino(inode) + 1;</div><div class='add'>+		/*</div><div class='add'>+		 * btrfs_drop_inode() will have it removed from the inode</div><div class='add'>+		 * cache when its usage count hits zero.</div><div class='add'>+		 */</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		cond_resched();</div><div class='add'>+		inode = btrfs_find_first_inode(root, min_ino);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;root-&gt;inode_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dentry-&gt;d_sb);</div><div class='ctx'> 	struct btrfs_root *root = dir-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct btrfs_root *dest = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_block_rsv block_rsv;</div><div class='ctx'> 	u64 root_flags;</div><div class='add'>+	u64 qgroup_reserved = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	down_write(&amp;fs_info-&gt;subvol_sem);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't allow to delete a subvolume with send in progress. This is</div><div class='ctx'> 	 * inside the inode lock so the error handling that has to drop the bit</div><div class='hunk'>@@ -4468,26 +4671,26 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry)</div><div class='ctx'> 		spin_unlock(&amp;dest-&gt;root_item_lock);</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 			   "attempt to delete subvolume %llu during send",</div><div class='del'>-			   dest-&gt;root_key.objectid);</div><div class='del'>-		return -EPERM;</div><div class='add'>+			   btrfs_root_id(dest));</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out_up_write;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (atomic_read(&amp;dest-&gt;nr_swapfiles)) {</div><div class='ctx'> 		spin_unlock(&amp;dest-&gt;root_item_lock);</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 			   "attempt to delete subvolume %llu with active swapfile",</div><div class='del'>-			   root-&gt;root_key.objectid);</div><div class='del'>-		return -EPERM;</div><div class='add'>+			   btrfs_root_id(root));</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out_up_write;</div><div class='ctx'> 	}</div><div class='ctx'> 	root_flags = btrfs_root_flags(&amp;dest-&gt;root_item);</div><div class='ctx'> 	btrfs_set_root_flags(&amp;dest-&gt;root_item,</div><div class='ctx'> 			     root_flags | BTRFS_ROOT_SUBVOL_DEAD);</div><div class='ctx'> 	spin_unlock(&amp;dest-&gt;root_item_lock);</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;fs_info-&gt;subvol_sem);</div><div class='del'>-</div><div class='ctx'> 	ret = may_destroy_subvol(dest);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_up_write;</div><div class='add'>+		goto out_undead;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_init_block_rsv(&amp;block_rsv, BTRFS_BLOCK_RSV_TEMP);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4497,26 +4700,29 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_subvolume_reserve_metadata(root, &amp;block_rsv, 5, true);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_up_write;</div><div class='add'>+		goto out_undead;</div><div class='add'>+	qgroup_reserved = block_rsv.qgroup_rsv_reserved;</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_start_transaction(root, 0);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='ctx'> 		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_release;</div><div class='ctx'> 	}</div><div class='add'>+	btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);</div><div class='add'>+	qgroup_reserved = 0;</div><div class='ctx'> 	trans-&gt;block_rsv = &amp;block_rsv;</div><div class='ctx'> 	trans-&gt;bytes_reserved = block_rsv.size;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_record_snapshot_destroy(trans, dir);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_unlink_subvol(trans, dir, dentry);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_end_trans;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_record_root_in_trans(trans, dest);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_end_trans;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4529,17 +4735,16 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry)</div><div class='ctx'> 	if (!test_and_set_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED, &amp;dest-&gt;state)) {</div><div class='ctx'> 		ret = btrfs_insert_orphan_item(trans,</div><div class='ctx'> 					fs_info-&gt;tree_root,</div><div class='del'>-					dest-&gt;root_key.objectid);</div><div class='del'>-		if (ret) {</div><div class='add'>+					btrfs_root_id(dest));</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_end_trans;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_uuid_tree_remove(trans, dest-&gt;root_item.uuid,</div><div class='del'>-				  BTRFS_UUID_KEY_SUBVOL,</div><div class='del'>-				  dest-&gt;root_key.objectid);</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOENT) {</div><div class='add'>+				     BTRFS_UUID_KEY_SUBVOL, btrfs_root_id(dest));</div><div class='add'>+	if (unlikely(ret &amp;&amp; ret != -ENOENT)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_end_trans;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4547,8 +4752,8 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry)</div><div class='ctx'> 		ret = btrfs_uuid_tree_remove(trans,</div><div class='ctx'> 					  dest-&gt;root_item.received_uuid,</div><div class='ctx'> 					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,</div><div class='del'>-					  dest-&gt;root_key.objectid);</div><div class='del'>-		if (ret &amp;&amp; ret != -ENOENT) {</div><div class='add'>+					  btrfs_root_id(dest));</div><div class='add'>+		if (unlikely(ret &amp;&amp; ret != -ENOENT)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_end_trans;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4562,16 +4767,20 @@ out_end_trans:</div><div class='ctx'> 	ret = btrfs_end_transaction(trans);</div><div class='ctx'> 	inode-&gt;i_flags |= S_DEAD;</div><div class='ctx'> out_release:</div><div class='del'>-	btrfs_subvolume_release_metadata(root, &amp;block_rsv);</div><div class='del'>-out_up_write:</div><div class='del'>-	up_write(&amp;fs_info-&gt;subvol_sem);</div><div class='add'>+	btrfs_block_rsv_release(fs_info, &amp;block_rsv, (u64)-1, NULL);</div><div class='add'>+	if (qgroup_reserved)</div><div class='add'>+		btrfs_qgroup_free_meta_prealloc(root, qgroup_reserved);</div><div class='add'>+out_undead:</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		spin_lock(&amp;dest-&gt;root_item_lock);</div><div class='ctx'> 		root_flags = btrfs_root_flags(&amp;dest-&gt;root_item);</div><div class='ctx'> 		btrfs_set_root_flags(&amp;dest-&gt;root_item,</div><div class='ctx'> 				root_flags &amp; ~BTRFS_ROOT_SUBVOL_DEAD);</div><div class='ctx'> 		spin_unlock(&amp;dest-&gt;root_item_lock);</div><div class='del'>-	} else {</div><div class='add'>+	}</div><div class='add'>+out_up_write:</div><div class='add'>+	up_write(&amp;fs_info-&gt;subvol_sem);</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		d_invalidate(dentry);</div><div class='ctx'> 		btrfs_prune_dentries(dest);</div><div class='ctx'> 		ASSERT(dest-&gt;send_in_progress == 0);</div><div class='hunk'>@@ -4580,91 +4789,151 @@ out_up_write:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='add'>+static int btrfs_rmdir(struct inode *vfs_dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct btrfs_fs_info *fs_info = BTRFS_I(inode)-&gt;root-&gt;fs_info;</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct btrfs_inode *dir = BTRFS_I(vfs_dir);</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	u64 last_unlink_trans;</div><div class='ctx'> 	struct fscrypt_name fname;</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_size &gt; BTRFS_EMPTY_DIR_SIZE)</div><div class='add'>+	if (inode-&gt;vfs_inode.i_size &gt; BTRFS_EMPTY_DIR_SIZE)</div><div class='ctx'> 		return -ENOTEMPTY;</div><div class='del'>-	if (btrfs_ino(BTRFS_I(inode)) == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+	if (btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 		if (unlikely(btrfs_fs_incompat(fs_info, EXTENT_TREE_V2))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 			"extent tree v2 doesn't support snapshot deletion yet");</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='del'>-		return btrfs_delete_subvolume(BTRFS_I(dir), dentry);</div><div class='add'>+		return btrfs_delete_subvolume(dir, dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fscrypt_setup_filename(dir, &amp;dentry-&gt;d_name, 1, &amp;fname);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	ret = fscrypt_setup_filename(vfs_dir, &amp;dentry-&gt;d_name, 1, &amp;fname);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* This needs to handle no-key deletions later on */</div><div class='ctx'> </div><div class='del'>-	trans = __unlink_start_trans(BTRFS_I(dir));</div><div class='add'>+	trans = __unlink_start_trans(dir);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_notrans;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(btrfs_ino(BTRFS_I(inode)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)) {</div><div class='del'>-		err = btrfs_unlink_subvol(trans, BTRFS_I(dir), dentry);</div><div class='add'>+	/*</div><div class='add'>+	 * Propagate the last_unlink_trans value of the deleted dir to its</div><div class='add'>+	 * parent directory. This is to prevent an unrecoverable log tree in the</div><div class='add'>+	 * case we do something like this:</div><div class='add'>+	 * 1) create dir foo</div><div class='add'>+	 * 2) create snapshot under dir foo</div><div class='add'>+	 * 3) delete the snapshot</div><div class='add'>+	 * 4) rmdir foo</div><div class='add'>+	 * 5) mkdir foo</div><div class='add'>+	 * 6) fsync foo or some file inside foo</div><div class='add'>+	 *</div><div class='add'>+	 * This is because we can't unlink other roots when replaying the dir</div><div class='add'>+	 * deletes for directory foo.</div><div class='add'>+	 */</div><div class='add'>+	if (inode-&gt;last_unlink_trans &gt;= trans-&gt;transid)</div><div class='add'>+		btrfs_record_snapshot_destroy(trans, dir);</div><div class='add'>+</div><div class='add'>+	if (unlikely(btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)) {</div><div class='add'>+		ret = btrfs_unlink_subvol(trans, dir, dentry);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = btrfs_orphan_add(trans, BTRFS_I(inode));</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_orphan_add(trans, inode);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	last_unlink_trans = BTRFS_I(inode)-&gt;last_unlink_trans;</div><div class='del'>-</div><div class='ctx'> 	/* now the directory is empty */</div><div class='del'>-	err = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)),</div><div class='del'>-				 &amp;fname.disk_name);</div><div class='del'>-	if (!err) {</div><div class='del'>-		btrfs_i_size_write(BTRFS_I(inode), 0);</div><div class='del'>-		/*</div><div class='del'>-		 * Propagate the last_unlink_trans value of the deleted dir to</div><div class='del'>-		 * its parent directory. This is to prevent an unrecoverable</div><div class='del'>-		 * log tree in the case we do something like this:</div><div class='del'>-		 * 1) create dir foo</div><div class='del'>-		 * 2) create snapshot under dir foo</div><div class='del'>-		 * 3) delete the snapshot</div><div class='del'>-		 * 4) rmdir foo</div><div class='del'>-		 * 5) mkdir foo</div><div class='del'>-		 * 6) fsync foo or some file inside foo</div><div class='del'>-		 */</div><div class='del'>-		if (last_unlink_trans &gt;= trans-&gt;transid)</div><div class='del'>-			BTRFS_I(dir)-&gt;last_unlink_trans = last_unlink_trans;</div><div class='del'>-	}</div><div class='add'>+	ret = btrfs_unlink_inode(trans, dir, inode, &amp;fname.disk_name);</div><div class='add'>+	if (!ret)</div><div class='add'>+		btrfs_i_size_write(inode, 0);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> out_notrans:</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> 	fscrypt_free_filename(&amp;fname);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_inside_block(u64 bytenr, u64 blockstart, u32 blocksize)</div><div class='add'>+{</div><div class='add'>+	ASSERT(IS_ALIGNED(blockstart, blocksize), "blockstart=%llu blocksize=%u",</div><div class='add'>+		blockstart, blocksize);</div><div class='add'>+</div><div class='add'>+	if (blockstart &lt;= bytenr &amp;&amp; bytenr &lt;= blockstart + blocksize - 1)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int truncate_block_zero_beyond_eof(struct btrfs_inode *inode, u64 start)</div><div class='add'>+{</div><div class='add'>+	const pgoff_t index = (start &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	u64 zero_start;</div><div class='add'>+	u64 zero_end;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	folio = filemap_lock_folio(mapping, index);</div><div class='add'>+	/* No folio present. */</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='add'>+		ret = btrfs_read_folio(NULL, folio);</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (folio-&gt;mapping != mapping) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+		if (unlikely(!folio_test_uptodate(folio))) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not need to lock extents nor wait for OE, as it's already</div><div class='add'>+	 * beyond EOF.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	zero_start = max_t(u64, folio_pos(folio), start);</div><div class='add'>+	zero_end = folio_next_pos(folio);</div><div class='add'>+	folio_zero_range(folio, zero_start - folio_pos(folio),</div><div class='add'>+			 zero_end - zero_start);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Read, zero a chunk and write a block.</div><div class='add'>+ * Handle the truncation of a fs block.</div><div class='add'>+ *</div><div class='add'>+ * @inode  - inode that we're zeroing</div><div class='add'>+ * @offset - the file offset of the block to truncate</div><div class='add'>+ *           The value must be inside [@start, @end], and the function will do</div><div class='add'>+ *           extra checks if the block that covers @offset needs to be zeroed.</div><div class='add'>+ * @start  - the start file offset of the range we want to zero</div><div class='add'>+ * @end    - the end (inclusive) file offset of the range we want to zero.</div><div class='ctx'>  *</div><div class='del'>- * @inode - inode that we're zeroing</div><div class='del'>- * @from - the offset to start zeroing</div><div class='del'>- * @len - the length to zero, 0 to zero the entire range respective to the</div><div class='del'>- *	offset</div><div class='del'>- * @front - zero up to the offset instead of from the offset on</div><div class='add'>+ * If the range is not block aligned, read out the folio that covers @offset,</div><div class='add'>+ * and if needed zero blocks that are inside the folio and covered by [@start, @end).</div><div class='add'>+ * If @start or @end + 1 lands inside a block, that block will be marked dirty</div><div class='add'>+ * for writeback.</div><div class='ctx'>  *</div><div class='del'>- * This will find the block for the "from" offset and cow the block and zero the</div><div class='del'>- * part we want to zero.  This is used with truncate and hole punching.</div><div class='add'>+ * This is utilized by hole punch, zero range, file expansion.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,</div><div class='del'>-			 int front)</div><div class='add'>+int btrfs_truncate_block(struct btrfs_inode *inode, u64 offset, u64 start, u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='hunk'>@@ -4674,27 +4943,66 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,</div><div class='ctx'> 	struct extent_changeset *data_reserved = NULL;</div><div class='ctx'> 	bool only_release_metadata = false;</div><div class='ctx'> 	u32 blocksize = fs_info-&gt;sectorsize;</div><div class='del'>-	pgoff_t index = from &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned offset = from &amp; (blocksize - 1);</div><div class='del'>-	struct page *page;</div><div class='add'>+	pgoff_t index = (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	gfp_t mask = btrfs_alloc_write_mask(mapping);</div><div class='del'>-	size_t write_bytes = blocksize;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	const bool in_head_block = is_inside_block(offset, round_down(start, blocksize),</div><div class='add'>+						   blocksize);</div><div class='add'>+	const bool in_tail_block = is_inside_block(offset, round_down(end, blocksize),</div><div class='add'>+						   blocksize);</div><div class='add'>+	bool need_truncate_head = false;</div><div class='add'>+	bool need_truncate_tail = false;</div><div class='add'>+	u64 zero_start;</div><div class='add'>+	u64 zero_end;</div><div class='ctx'> 	u64 block_start;</div><div class='ctx'> 	u64 block_end;</div><div class='ctx'> </div><div class='del'>-	if (IS_ALIGNED(offset, blocksize) &amp;&amp;</div><div class='del'>-	    (!len || IS_ALIGNED(len, blocksize)))</div><div class='add'>+	/* @offset should be inside the range. */</div><div class='add'>+	ASSERT(start &lt;= offset &amp;&amp; offset &lt;= end, "offset=%llu start=%llu end=%llu",</div><div class='add'>+	       offset, start, end);</div><div class='add'>+</div><div class='add'>+	/* The range is aligned at both ends. */</div><div class='add'>+	if (IS_ALIGNED(start, blocksize) &amp;&amp; IS_ALIGNED(end + 1, blocksize)) {</div><div class='add'>+		/*</div><div class='add'>+		 * For block size &lt; page size case, we may have polluted blocks</div><div class='add'>+		 * beyond EOF. So we also need to zero them out.</div><div class='add'>+		 */</div><div class='add'>+		if (end == (u64)-1 &amp;&amp; blocksize &lt; PAGE_SIZE)</div><div class='add'>+			ret = truncate_block_zero_beyond_eof(inode, start);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * @offset may not be inside the head nor tail block. In that case we</div><div class='add'>+	 * don't need to do anything.</div><div class='add'>+	 */</div><div class='add'>+	if (!in_head_block &amp;&amp; !in_tail_block)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	block_start = round_down(from, blocksize);</div><div class='add'>+	/*</div><div class='add'>+	 * Skip the truncation if the range in the target block is already aligned.</div><div class='add'>+	 * The seemingly complex check will also handle the same block case.</div><div class='add'>+	 */</div><div class='add'>+	if (in_head_block &amp;&amp; !IS_ALIGNED(start, blocksize))</div><div class='add'>+		need_truncate_head = true;</div><div class='add'>+	if (in_tail_block &amp;&amp; !IS_ALIGNED(end + 1, blocksize))</div><div class='add'>+		need_truncate_tail = true;</div><div class='add'>+	if (!need_truncate_head &amp;&amp; !need_truncate_tail)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	block_start = round_down(offset, blocksize);</div><div class='ctx'> 	block_end = block_start + blocksize - 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_check_data_free_space(inode, &amp;data_reserved, block_start,</div><div class='ctx'> 					  blocksize, false);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		size_t write_bytes = blocksize;</div><div class='add'>+</div><div class='ctx'> 		if (btrfs_check_nocow_lock(inode, block_start, &amp;write_bytes, false) &gt; 0) {</div><div class='del'>-			/* For nocow case, no need to reserve data space */</div><div class='add'>+			/* For nocow case, no need to reserve data space. */</div><div class='add'>+			ASSERT(write_bytes == blocksize, "write_bytes=%zu blocksize=%u",</div><div class='add'>+			       write_bytes, blocksize);</div><div class='ctx'> 			only_release_metadata = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -4708,24 +5016,28 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> again:</div><div class='del'>-	page = find_or_create_page(mapping, index, mask);</div><div class='del'>-	if (!page) {</div><div class='del'>-		btrfs_delalloc_release_space(inode, data_reserved, block_start,</div><div class='del'>-					     blocksize, true);</div><div class='add'>+	folio = __filemap_get_folio(mapping, index,</div><div class='add'>+				    FGP_LOCK | FGP_ACCESSED | FGP_CREAT, mask);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		if (only_release_metadata)</div><div class='add'>+			btrfs_delalloc_release_metadata(inode, blocksize, true);</div><div class='add'>+		else</div><div class='add'>+			btrfs_delalloc_release_space(inode, data_reserved,</div><div class='add'>+						     block_start, blocksize, true);</div><div class='ctx'> 		btrfs_delalloc_release_extents(inode, blocksize);</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		ret = btrfs_read_folio(NULL, page_folio(page));</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (page-&gt;mapping != mapping) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='add'>+		ret = btrfs_read_folio(NULL, folio);</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (folio-&gt;mapping != mapping) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='add'>+		if (unlikely(!folio_test_uptodate(folio))) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4737,54 +5049,64 @@ again:</div><div class='ctx'> 	 * folio private, but left the page in the mapping.  Set the page mapped</div><div class='ctx'> 	 * here to make sure it's properly set for the subpage stuff.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = set_page_extent_mapped(page);</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	wait_on_page_writeback(page);</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='ctx'> </div><div class='del'>-	lock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='add'>+	btrfs_lock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	ordered = btrfs_lookup_ordered_extent(inode, block_start);</div><div class='ctx'> 	if (ordered) {</div><div class='del'>-		unlock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		btrfs_unlock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		btrfs_start_ordered_extent(ordered);</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clear_extent_bit(&amp;inode-&gt;io_tree, block_start, block_end,</div><div class='del'>-			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,</div><div class='del'>-			 &amp;cached_state);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, block_start, block_end,</div><div class='add'>+			       EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,</div><div class='add'>+			       &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_set_extent_delalloc(inode, block_start, block_end, 0,</div><div class='ctx'> 					&amp;cached_state);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		unlock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='add'>+		btrfs_unlock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (offset != blocksize) {</div><div class='del'>-		if (!len)</div><div class='del'>-			len = blocksize - offset;</div><div class='del'>-		if (front)</div><div class='del'>-			memzero_page(page, (block_start - page_offset(page)),</div><div class='del'>-				     offset);</div><div class='del'>-		else</div><div class='del'>-			memzero_page(page, (block_start - page_offset(page)) + offset,</div><div class='del'>-				     len);</div><div class='add'>+	if (end == (u64)-1) {</div><div class='add'>+		/*</div><div class='add'>+		 * We're truncating beyond EOF, the remaining blocks normally are</div><div class='add'>+		 * already holes thus no need to zero again, but it's possible for</div><div class='add'>+		 * fs block size &lt; page size cases to have memory mapped writes</div><div class='add'>+		 * to pollute ranges beyond EOF.</div><div class='add'>+		 *</div><div class='add'>+		 * In that case although such polluted blocks beyond EOF will</div><div class='add'>+		 * not reach disk, it still affects our page caches.</div><div class='add'>+		 */</div><div class='add'>+		zero_start = max_t(u64, folio_pos(folio), start);</div><div class='add'>+		zero_end = min_t(u64, folio_next_pos(folio) - 1, end);</div><div class='add'>+	} else {</div><div class='add'>+		zero_start = max_t(u64, block_start, start);</div><div class='add'>+		zero_end = min_t(u64, block_end, end);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_folio_clear_checked(fs_info, page_folio(page), block_start,</div><div class='add'>+	folio_zero_range(folio, zero_start - folio_pos(folio),</div><div class='add'>+			 zero_end - zero_start + 1);</div><div class='add'>+</div><div class='add'>+	btrfs_folio_clear_checked(fs_info, folio, block_start,</div><div class='ctx'> 				  block_end + 1 - block_start);</div><div class='del'>-	btrfs_folio_set_dirty(fs_info, page_folio(page), block_start,</div><div class='add'>+	btrfs_folio_set_dirty(fs_info, folio, block_start,</div><div class='ctx'> 			      block_end + 1 - block_start);</div><div class='del'>-	unlock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	if (only_release_metadata)</div><div class='del'>-		set_extent_bit(&amp;inode-&gt;io_tree, block_start, block_end,</div><div class='del'>-			       EXTENT_NORESERVE, NULL);</div><div class='add'>+		btrfs_set_extent_bit(&amp;inode-&gt;io_tree, block_start, block_end,</div><div class='add'>+				     EXTENT_NORESERVE, &amp;cached_state);</div><div class='add'>+</div><div class='add'>+	btrfs_unlock_extent(io_tree, block_start, block_end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -4795,8 +5117,8 @@ out_unlock:</div><div class='ctx'> 					block_start, blocksize, true);</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_delalloc_release_extents(inode, blocksize);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> out:</div><div class='ctx'> 	if (only_release_metadata)</div><div class='ctx'> 		btrfs_check_nocow_unlock(inode);</div><div class='hunk'>@@ -4835,7 +5157,7 @@ static int maybe_insert_hole(struct btrfs_inode *inode, u64 offset, u64 len)</div><div class='ctx'> 	drop_args.drop_cache = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_drop_extents(trans, root, inode, &amp;drop_args);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -4870,16 +5192,16 @@ int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size)</div><div class='ctx'> 	u64 last_byte;</div><div class='ctx'> 	u64 cur_offset;</div><div class='ctx'> 	u64 hole_size;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If our size started in the middle of a block we need to zero out the</div><div class='ctx'> 	 * rest of the block before we expand the i_size, otherwise we could</div><div class='ctx'> 	 * expose stale data.</div><div class='ctx'> 	 */</div><div class='del'>-	err = btrfs_truncate_block(inode, oldsize, 0, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	ret = btrfs_truncate_block(inode, oldsize, oldsize, -1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (size &lt;= hole_start)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -4888,30 +5210,29 @@ int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size)</div><div class='ctx'> 					   &amp;cached_state);</div><div class='ctx'> 	cur_offset = hole_start;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		em = btrfs_get_extent(inode, NULL, 0, cur_offset,</div><div class='del'>-				      block_end - cur_offset);</div><div class='add'>+		em = btrfs_get_extent(inode, NULL, cur_offset, block_end - cur_offset);</div><div class='ctx'> 		if (IS_ERR(em)) {</div><div class='del'>-			err = PTR_ERR(em);</div><div class='add'>+			ret = PTR_ERR(em);</div><div class='ctx'> 			em = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		last_byte = min(extent_map_end(em), block_end);</div><div class='add'>+		last_byte = min(btrfs_extent_map_end(em), block_end);</div><div class='ctx'> 		last_byte = ALIGN(last_byte, fs_info-&gt;sectorsize);</div><div class='ctx'> 		hole_size = last_byte - cur_offset;</div><div class='ctx'> </div><div class='ctx'> 		if (!(em-&gt;flags &amp; EXTENT_FLAG_PREALLOC)) {</div><div class='ctx'> 			struct extent_map *hole_em;</div><div class='ctx'> </div><div class='del'>-			err = maybe_insert_hole(inode, cur_offset, hole_size);</div><div class='del'>-			if (err)</div><div class='add'>+			ret = maybe_insert_hole(inode, cur_offset, hole_size);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			err = btrfs_inode_set_file_extent_range(inode,</div><div class='add'>+			ret = btrfs_inode_set_file_extent_range(inode,</div><div class='ctx'> 							cur_offset, hole_size);</div><div class='del'>-			if (err)</div><div class='add'>+			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			hole_em = alloc_extent_map();</div><div class='add'>+			hole_em = btrfs_alloc_extent_map();</div><div class='ctx'> 			if (!hole_em) {</div><div class='ctx'> 				btrfs_drop_extent_map_range(inode, cur_offset,</div><div class='ctx'> 						    cur_offset + hole_size - 1,</div><div class='hunk'>@@ -4921,32 +5242,30 @@ int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size)</div><div class='ctx'> 			}</div><div class='ctx'> 			hole_em-&gt;start = cur_offset;</div><div class='ctx'> 			hole_em-&gt;len = hole_size;</div><div class='del'>-			hole_em-&gt;orig_start = cur_offset;</div><div class='ctx'> </div><div class='del'>-			hole_em-&gt;block_start = EXTENT_MAP_HOLE;</div><div class='del'>-			hole_em-&gt;block_len = 0;</div><div class='del'>-			hole_em-&gt;orig_block_len = 0;</div><div class='add'>+			hole_em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='add'>+			hole_em-&gt;disk_num_bytes = 0;</div><div class='ctx'> 			hole_em-&gt;ram_bytes = hole_size;</div><div class='ctx'> 			hole_em-&gt;generation = btrfs_get_fs_generation(fs_info);</div><div class='ctx'> </div><div class='del'>-			err = btrfs_replace_extent_map_range(inode, hole_em, true);</div><div class='del'>-			free_extent_map(hole_em);</div><div class='add'>+			ret = btrfs_replace_extent_map_range(inode, hole_em, true);</div><div class='add'>+			btrfs_free_extent_map(hole_em);</div><div class='ctx'> 		} else {</div><div class='del'>-			err = btrfs_inode_set_file_extent_range(inode,</div><div class='add'>+			ret = btrfs_inode_set_file_extent_range(inode,</div><div class='ctx'> 							cur_offset, hole_size);</div><div class='del'>-			if (err)</div><div class='add'>+			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> next:</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		em = NULL;</div><div class='ctx'> 		cur_offset = last_byte;</div><div class='ctx'> 		if (cur_offset &gt;= block_end)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='del'>-	unlock_extent(io_tree, hole_start, block_end - 1, &amp;cached_state);</div><div class='del'>-	return err;</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+	btrfs_unlock_extent(io_tree, hole_start, block_end - 1, &amp;cached_state);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_setsize(struct inode *inode, struct iattr *attr)</div><div class='hunk'>@@ -5000,10 +5319,10 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)</div><div class='ctx'> 		btrfs_drew_write_unlock(&amp;root-&gt;snapshot_lock);</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+		struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_is_zoned(fs_info)) {</div><div class='del'>-			ret = btrfs_wait_ordered_range(inode,</div><div class='add'>+			ret = btrfs_wait_ordered_range(BTRFS_I(inode),</div><div class='ctx'> 					ALIGN(newsize, fs_info-&gt;sectorsize),</div><div class='ctx'> 					(u64)-1);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -5025,7 +5344,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_truncate(BTRFS_I(inode), newsize == oldsize);</div><div class='ctx'> 		if (ret &amp;&amp; inode-&gt;i_nlink) {</div><div class='del'>-			int err;</div><div class='add'>+			int ret2;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Truncate failed, so fix up the in-memory size. We</div><div class='hunk'>@@ -5033,9 +5352,9 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)</div><div class='ctx'> 			 * wait for disk_i_size to be stable and then update the</div><div class='ctx'> 			 * in-memory size to match.</div><div class='ctx'> 			 */</div><div class='del'>-			err = btrfs_wait_ordered_range(inode, 0, (u64)-1);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='add'>+			ret2 = btrfs_wait_ordered_range(BTRFS_I(inode), 0, (u64)-1);</div><div class='add'>+			if (ret2)</div><div class='add'>+				return ret2;</div><div class='ctx'> 			i_size_write(inode, BTRFS_I(inode)-&gt;disk_i_size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5048,31 +5367,31 @@ static int btrfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_root_readonly(root))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='del'>-	err = setattr_prepare(idmap, dentry, attr);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	ret = setattr_prepare(idmap, dentry, attr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode) &amp;&amp; (attr-&gt;ia_valid &amp; ATTR_SIZE)) {</div><div class='del'>-		err = btrfs_setsize(inode, attr);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		ret = btrfs_setsize(inode, attr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;ia_valid) {</div><div class='ctx'> 		setattr_copy(idmap, inode, attr);</div><div class='ctx'> 		inode_inc_iversion(inode);</div><div class='del'>-		err = btrfs_dirty_inode(BTRFS_I(inode));</div><div class='add'>+		ret = btrfs_dirty_inode(BTRFS_I(inode));</div><div class='ctx'> </div><div class='del'>-		if (!err &amp;&amp; attr-&gt;ia_valid &amp; ATTR_MODE)</div><div class='del'>-			err = posix_acl_chmod(idmap, dentry, inode-&gt;i_mode);</div><div class='add'>+		if (!ret &amp;&amp; attr-&gt;ia_valid &amp; ATTR_MODE)</div><div class='add'>+			ret = posix_acl_chmod(idmap, dentry, inode-&gt;i_mode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5093,7 +5412,7 @@ static void evict_inode_truncate_pages(struct inode *inode)</div><div class='ctx'> 	struct extent_io_tree *io_tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	ASSERT(inode-&gt;i_state &amp; I_FREEING);</div><div class='add'>+	ASSERT(inode_state_read_once(inode) &amp; I_FREEING);</div><div class='ctx'> 	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_drop_extent_map_range(BTRFS_I(inode), 0, (u64)-1, false);</div><div class='hunk'>@@ -5129,7 +5448,7 @@ static void evict_inode_truncate_pages(struct inode *inode)</div><div class='ctx'> 		state_flags = state-&gt;state;</div><div class='ctx'> 		spin_unlock(&amp;io_tree-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		lock_extent(io_tree, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(io_tree, start, end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If still has DELALLOC flag, the extent didn't reach disk,</div><div class='hunk'>@@ -5143,9 +5462,9 @@ static void evict_inode_truncate_pages(struct inode *inode)</div><div class='ctx'> 			btrfs_qgroup_free_data(BTRFS_I(inode), NULL, start,</div><div class='ctx'> 					       end - start + 1, NULL);</div><div class='ctx'> </div><div class='del'>-		clear_extent_bit(io_tree, start, end,</div><div class='del'>-				 EXTENT_CLEAR_ALL_BITS | EXTENT_DO_ACCOUNTING,</div><div class='del'>-				 &amp;cached_state);</div><div class='add'>+		btrfs_clear_extent_bit(io_tree, start, end,</div><div class='add'>+				       EXTENT_CLEAR_ALL_BITS | EXTENT_DO_ACCOUNTING,</div><div class='add'>+				       &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		spin_lock(&amp;io_tree-&gt;lock);</div><div class='hunk'>@@ -5203,10 +5522,10 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	struct btrfs_block_rsv *rsv = NULL;</div><div class='add'>+	struct btrfs_block_rsv rsv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_inode_evict(inode);</div><div class='hunk'>@@ -5217,11 +5536,12 @@ void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	evict_inode_truncate_pages(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_nlink &amp;&amp;</div><div class='ctx'> 	    ((btrfs_root_refs(&amp;root-&gt;root_item) != 0 &amp;&amp;</div><div class='del'>-	      root-&gt;root_key.objectid != BTRFS_ROOT_TREE_OBJECTID) ||</div><div class='add'>+	      btrfs_root_id(root) != BTRFS_ROOT_TREE_OBJECTID) ||</div><div class='ctx'> 	     btrfs_is_free_space_inode(BTRFS_I(inode))))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -5233,7 +5553,7 @@ void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_nlink &gt; 0) {</div><div class='ctx'> 		BUG_ON(btrfs_root_refs(&amp;root-&gt;root_item) != 0 &amp;&amp;</div><div class='del'>-		       root-&gt;root_key.objectid != BTRFS_ROOT_TREE_OBJECTID);</div><div class='add'>+		       btrfs_root_id(root) != BTRFS_ROOT_TREE_OBJECTID);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5253,11 +5573,9 @@ void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_kill_delayed_inode_items(BTRFS_I(inode));</div><div class='ctx'> </div><div class='del'>-	rsv = btrfs_alloc_block_rsv(fs_info, BTRFS_BLOCK_RSV_TEMP);</div><div class='del'>-	if (!rsv)</div><div class='del'>-		goto out;</div><div class='del'>-	rsv-&gt;size = btrfs_calc_metadata_size(fs_info, 1);</div><div class='del'>-	rsv-&gt;failfast = true;</div><div class='add'>+	btrfs_init_metadata_block_rsv(fs_info, &amp;rsv, BTRFS_BLOCK_RSV_TEMP);</div><div class='add'>+	rsv.size = btrfs_calc_metadata_size(fs_info, 1);</div><div class='add'>+	rsv.failfast = true;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_i_size_write(BTRFS_I(inode), 0);</div><div class='ctx'> </div><div class='hunk'>@@ -5269,11 +5587,11 @@ void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> 			.min_type = 0,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		trans = evict_refill_and_join(root, rsv);</div><div class='add'>+		trans = evict_refill_and_join(root, &amp;rsv);</div><div class='ctx'> 		if (IS_ERR(trans))</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_release;</div><div class='ctx'> </div><div class='del'>-		trans-&gt;block_rsv = rsv;</div><div class='add'>+		trans-&gt;block_rsv = &amp;rsv;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_truncate_inode_items(trans, root, &amp;control);</div><div class='ctx'> 		trans-&gt;block_rsv = &amp;fs_info-&gt;trans_block_rsv;</div><div class='hunk'>@@ -5285,7 +5603,7 @@ void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> 		 */</div><div class='ctx'> 		btrfs_btree_balance_dirty_nodelay(fs_info);</div><div class='ctx'> 		if (ret &amp;&amp; ret != -ENOSPC &amp;&amp; ret != -EAGAIN)</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_release;</div><div class='ctx'> 		else if (!ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5299,16 +5617,17 @@ void btrfs_evict_inode(struct inode *inode)</div><div class='ctx'> 	 * If it turns out that we are dropping too many of these, we might want</div><div class='ctx'> 	 * to add a mechanism for retrying these after a commit.</div><div class='ctx'> 	 */</div><div class='del'>-	trans = evict_refill_and_join(root, rsv);</div><div class='add'>+	trans = evict_refill_and_join(root, &amp;rsv);</div><div class='ctx'> 	if (!IS_ERR(trans)) {</div><div class='del'>-		trans-&gt;block_rsv = rsv;</div><div class='add'>+		trans-&gt;block_rsv = &amp;rsv;</div><div class='ctx'> 		btrfs_orphan_del(trans, BTRFS_I(inode));</div><div class='ctx'> 		trans-&gt;block_rsv = &amp;fs_info-&gt;trans_block_rsv;</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out_release:</div><div class='add'>+	btrfs_block_rsv_release(fs_info, &amp;rsv, (u64)-1, NULL);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_block_rsv(fs_info, rsv);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we didn't successfully delete, the orphan item will still be in</div><div class='ctx'> 	 * the tree and we'll retry on the next mount. Again, we might also want</div><div class='hunk'>@@ -5330,7 +5649,7 @@ static int btrfs_inode_by_name(struct btrfs_inode *dir, struct dentry *dentry,</div><div class='ctx'> 			       struct btrfs_key *location, u8 *type)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = dir-&gt;root;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fscrypt_name fname;</div><div class='hunk'>@@ -5341,7 +5660,7 @@ static int btrfs_inode_by_name(struct btrfs_inode *dir, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	ret = fscrypt_setup_filename(&amp;dir-&gt;vfs_inode, &amp;dentry-&gt;d_name, 1, &amp;fname);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * fscrypt_setup_filename() should never return a positive value, but</div><div class='ctx'> 	 * gcc on sparc/parisc thinks it can, so assert that doesn't happen.</div><div class='hunk'>@@ -5358,19 +5677,18 @@ static int btrfs_inode_by_name(struct btrfs_inode *dir, struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(path-&gt;nodes[0], di, location);</div><div class='del'>-	if (location-&gt;type != BTRFS_INODE_ITEM_KEY &amp;&amp;</div><div class='del'>-	    location-&gt;type != BTRFS_ROOT_ITEM_KEY) {</div><div class='add'>+	if (unlikely(location-&gt;type != BTRFS_INODE_ITEM_KEY &amp;&amp;</div><div class='add'>+		     location-&gt;type != BTRFS_ROOT_ITEM_KEY)) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_warn(root-&gt;fs_info,</div><div class='del'>-"%s gets something invalid in DIR_ITEM (name %s, directory ino %llu, location(%llu %u %llu))",</div><div class='add'>+"%s gets something invalid in DIR_ITEM (name %s, directory ino %llu, location " BTRFS_KEY_FMT ")",</div><div class='ctx'> 			   __func__, fname.disk_name.name, btrfs_ino(dir),</div><div class='del'>-			   location-&gt;objectid, location-&gt;type, location-&gt;offset);</div><div class='add'>+			   BTRFS_KEY_FMT_VALUE(location));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		*type = btrfs_dir_ftype(path-&gt;nodes[0], di);</div><div class='ctx'> out:</div><div class='ctx'> 	fscrypt_free_filename(&amp;fname);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5385,7 +5703,7 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				    struct btrfs_key *location,</div><div class='ctx'> 				    struct btrfs_root **sub_root)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *new_root;</div><div class='ctx'> 	struct btrfs_root_ref *ref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -5405,7 +5723,7 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOENT;</div><div class='del'>-	key.objectid = dir-&gt;root-&gt;root_key.objectid;</div><div class='add'>+	key.objectid = btrfs_root_id(dir-&gt;root);</div><div class='ctx'> 	key.type = BTRFS_ROOT_REF_KEY;</div><div class='ctx'> 	key.offset = location-&gt;objectid;</div><div class='ctx'> </div><div class='hunk'>@@ -5441,64 +5759,38 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	location-&gt;offset = 0;</div><div class='ctx'> 	err = 0;</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	fscrypt_free_filename(&amp;fname);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inode_tree_add(struct btrfs_inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	struct btrfs_inode *entry;</div><div class='del'>-	struct rb_node **p;</div><div class='del'>-	struct rb_node *parent;</div><div class='del'>-	struct rb_node *new = &amp;inode-&gt;rb_node;</div><div class='del'>-	u64 ino = btrfs_ino(inode);</div><div class='del'>-</div><div class='del'>-	if (inode_unhashed(&amp;inode-&gt;vfs_inode))</div><div class='del'>-		return;</div><div class='del'>-	parent = NULL;</div><div class='del'>-	spin_lock(&amp;root-&gt;inode_lock);</div><div class='del'>-	p = &amp;root-&gt;inode_tree.rb_node;</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		entry = rb_entry(parent, struct btrfs_inode, rb_node);</div><div class='ctx'> </div><div class='del'>-		if (ino &lt; btrfs_ino(entry))</div><div class='del'>-			p = &amp;parent-&gt;rb_left;</div><div class='del'>-		else if (ino &gt; btrfs_ino(entry))</div><div class='del'>-			p = &amp;parent-&gt;rb_right;</div><div class='del'>-		else {</div><div class='del'>-			WARN_ON(!(entry-&gt;vfs_inode.i_state &amp;</div><div class='del'>-				  (I_WILL_FREE | I_FREEING)));</div><div class='del'>-			rb_replace_node(parent, new, &amp;root-&gt;inode_tree);</div><div class='del'>-			RB_CLEAR_NODE(parent);</div><div class='del'>-			spin_unlock(&amp;root-&gt;inode_lock);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rb_link_node(new, parent, p);</div><div class='del'>-	rb_insert_color(new, &amp;root-&gt;inode_tree);</div><div class='del'>-	spin_unlock(&amp;root-&gt;inode_lock);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void inode_tree_del(struct btrfs_inode *inode)</div><div class='add'>+static void btrfs_del_inode_from_root(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	int empty = 0;</div><div class='add'>+	struct btrfs_inode *entry;</div><div class='add'>+	bool empty = false;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;root-&gt;inode_lock);</div><div class='del'>-	if (!RB_EMPTY_NODE(&amp;inode-&gt;rb_node)) {</div><div class='del'>-		rb_erase(&amp;inode-&gt;rb_node, &amp;root-&gt;inode_tree);</div><div class='del'>-		RB_CLEAR_NODE(&amp;inode-&gt;rb_node);</div><div class='del'>-		empty = RB_EMPTY_ROOT(&amp;root-&gt;inode_tree);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+	xa_lock(&amp;root-&gt;inodes);</div><div class='add'>+	/*</div><div class='add'>+	 * This btrfs_inode is being freed and has already been unhashed at this</div><div class='add'>+	 * point. It's possible that another btrfs_inode has already been</div><div class='add'>+	 * allocated for the same inode and inserted itself into the root, so</div><div class='add'>+	 * don't delete it in that case.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that this shouldn't need to allocate memory, so the gfp flags</div><div class='add'>+	 * don't really matter.</div><div class='add'>+	 */</div><div class='add'>+	entry = __xa_cmpxchg(&amp;root-&gt;inodes, btrfs_ino(inode), inode, NULL,</div><div class='add'>+			     GFP_ATOMIC);</div><div class='add'>+	if (entry == inode)</div><div class='add'>+		empty = xa_empty(&amp;root-&gt;inodes);</div><div class='add'>+	xa_unlock(&amp;root-&gt;inodes);</div><div class='ctx'> </div><div class='ctx'> 	if (empty &amp;&amp; btrfs_root_refs(&amp;root-&gt;root_item) == 0) {</div><div class='del'>-		spin_lock(&amp;root-&gt;inode_lock);</div><div class='del'>-		empty = RB_EMPTY_ROOT(&amp;root-&gt;inode_tree);</div><div class='del'>-		spin_unlock(&amp;root-&gt;inode_lock);</div><div class='add'>+		xa_lock(&amp;root-&gt;inodes);</div><div class='add'>+		empty = xa_empty(&amp;root-&gt;inodes);</div><div class='add'>+		xa_unlock(&amp;root-&gt;inodes);</div><div class='ctx'> 		if (empty)</div><div class='ctx'> 			btrfs_add_dead_root(root);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5509,12 +5801,8 @@ static int btrfs_init_locked_inode(struct inode *inode, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_iget_args *args = p;</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_ino = args-&gt;ino;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.objectid = args-&gt;ino;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.type = BTRFS_INODE_ITEM_KEY;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.offset = 0;</div><div class='add'>+	btrfs_set_inode_number(BTRFS_I(inode), args-&gt;ino);</div><div class='ctx'> 	BTRFS_I(inode)-&gt;root = btrfs_grab_root(args-&gt;root);</div><div class='del'>-	BUG_ON(args-&gt;root &amp;&amp; !BTRFS_I(inode)-&gt;root);</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;root &amp;&amp; args-&gt;root == args-&gt;root-&gt;fs_info-&gt;tree_root &amp;&amp;</div><div class='ctx'> 	    args-&gt;ino != BTRFS_BTREE_INODE_OBJECTID)</div><div class='hunk'>@@ -5527,12 +5815,11 @@ static int btrfs_find_actor(struct inode *inode, void *opaque)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_iget_args *args = opaque;</div><div class='ctx'> </div><div class='del'>-	return args-&gt;ino == BTRFS_I(inode)-&gt;location.objectid &amp;&amp;</div><div class='add'>+	return args-&gt;ino == btrfs_ino(BTRFS_I(inode)) &amp;&amp;</div><div class='ctx'> 		args-&gt;root == BTRFS_I(inode)-&gt;root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino,</div><div class='del'>-				       struct btrfs_root *root)</div><div class='add'>+static struct btrfs_inode *btrfs_iget_locked(u64 ino, struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct btrfs_iget_args args;</div><div class='hunk'>@@ -5541,87 +5828,108 @@ static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino,</div><div class='ctx'> 	args.ino = ino;</div><div class='ctx'> 	args.root = root;</div><div class='ctx'> </div><div class='del'>-	inode = iget5_locked(s, hashval, btrfs_find_actor,</div><div class='add'>+	inode = iget5_locked_rcu(root-&gt;fs_info-&gt;sb, hashval, btrfs_find_actor,</div><div class='ctx'> 			     btrfs_init_locked_inode,</div><div class='ctx'> 			     (void *)&amp;args);</div><div class='del'>-	return inode;</div><div class='add'>+	if (!inode)</div><div class='add'>+		return NULL;</div><div class='add'>+	return BTRFS_I(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get an inode object given its inode number and corresponding root.</div><div class='del'>- * Path can be preallocated to prevent recursing back to iget through</div><div class='del'>- * allocator. NULL is also valid but may require an additional allocation</div><div class='del'>- * later.</div><div class='add'>+ * Get an inode object given its inode number and corresponding root.  Path is</div><div class='add'>+ * preallocated to prevent recursing back to iget through allocator.</div><div class='ctx'>  */</div><div class='del'>-struct inode *btrfs_iget_path(struct super_block *s, u64 ino,</div><div class='del'>-			      struct btrfs_root *root, struct btrfs_path *path)</div><div class='add'>+struct btrfs_inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,</div><div class='add'>+				    struct btrfs_path *path)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget_locked(s, ino, root);</div><div class='add'>+	inode = btrfs_iget_locked(ino, root);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='del'>-		int ret;</div><div class='add'>+	if (!(inode_state_read_once(&amp;inode-&gt;vfs_inode) &amp; I_NEW))</div><div class='add'>+		return inode;</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_read_locked_inode(inode, path);</div><div class='del'>-		if (!ret) {</div><div class='del'>-			inode_tree_add(BTRFS_I(inode));</div><div class='del'>-			unlock_new_inode(inode);</div><div class='del'>-		} else {</div><div class='del'>-			iget_failed(inode);</div><div class='del'>-			/*</div><div class='del'>-			 * ret &gt; 0 can come from btrfs_search_slot called by</div><div class='del'>-			 * btrfs_read_locked_inode, this means the inode item</div><div class='del'>-			 * was not found.</div><div class='del'>-			 */</div><div class='del'>-			if (ret &gt; 0)</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-			inode = ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ret = btrfs_read_locked_inode(inode, path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='add'>+	unlock_new_inode(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct inode *btrfs_iget(struct super_block *s, u64 ino, struct btrfs_root *root)</div><div class='add'>+/*</div><div class='add'>+ * Get an inode object given its inode number and corresponding root.</div><div class='add'>+ */</div><div class='add'>+struct btrfs_inode *btrfs_iget(u64 ino, struct btrfs_root *root)</div><div class='ctx'> {</div><div class='del'>-	return btrfs_iget_path(s, ino, root, NULL);</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	struct btrfs_path *path;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	inode = btrfs_iget_locked(ino, root);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	if (!(inode_state_read_once(&amp;inode-&gt;vfs_inode) &amp; I_NEW))</div><div class='add'>+		return inode;</div><div class='add'>+</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!path) {</div><div class='add'>+		iget_failed(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_read_locked_inode(inode, path);</div><div class='add'>+	btrfs_free_path(path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	if (S_ISDIR(inode-&gt;vfs_inode.i_mode))</div><div class='add'>+		inode-&gt;vfs_inode.i_opflags |= IOP_FASTPERM_MAY_EXEC;</div><div class='add'>+	unlock_new_inode(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct inode *new_simple_dir(struct inode *dir,</div><div class='del'>-				    struct btrfs_key *key,</div><div class='del'>-				    struct btrfs_root *root)</div><div class='add'>+static struct btrfs_inode *new_simple_dir(struct inode *dir,</div><div class='add'>+					  struct btrfs_key *key,</div><div class='add'>+					  struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec64 ts;</div><div class='del'>-	struct inode *inode = new_inode(dir-&gt;i_sb);</div><div class='add'>+	struct inode *vfs_inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> </div><div class='del'>-	if (!inode)</div><div class='add'>+	vfs_inode = new_inode(dir-&gt;i_sb);</div><div class='add'>+	if (!vfs_inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	BTRFS_I(inode)-&gt;root = btrfs_grab_root(root);</div><div class='del'>-	memcpy(&amp;BTRFS_I(inode)-&gt;location, key, sizeof(*key));</div><div class='del'>-	set_bit(BTRFS_INODE_DUMMY, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+	inode = BTRFS_I(vfs_inode);</div><div class='add'>+	inode-&gt;root = btrfs_grab_root(root);</div><div class='add'>+	inode-&gt;ref_root_id = key-&gt;objectid;</div><div class='add'>+	set_bit(BTRFS_INODE_ROOT_STUB, &amp;inode-&gt;runtime_flags);</div><div class='add'>+	set_bit(BTRFS_INODE_DUMMY, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_ino = BTRFS_EMPTY_SUBVOL_DIR_OBJECTID;</div><div class='add'>+	btrfs_set_inode_number(inode, BTRFS_EMPTY_SUBVOL_DIR_OBJECTID);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We only need lookup, the rest is read-only and there's no inode</div><div class='ctx'> 	 * associated with the dentry</div><div class='ctx'> 	 */</div><div class='del'>-	inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='del'>-	inode-&gt;i_opflags &amp;= ~IOP_XATTR;</div><div class='del'>-	inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='del'>-	inode-&gt;i_mode = S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO;</div><div class='add'>+	vfs_inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='add'>+	vfs_inode-&gt;i_opflags &amp;= ~IOP_XATTR;</div><div class='add'>+	vfs_inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='add'>+	vfs_inode-&gt;i_mode = S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO;</div><div class='ctx'> </div><div class='del'>-	ts = inode_set_ctime_current(inode);</div><div class='del'>-	inode_set_mtime_to_ts(inode, ts);</div><div class='del'>-	inode_set_atime_to_ts(inode, inode_get_atime(dir));</div><div class='del'>-	BTRFS_I(inode)-&gt;i_otime_sec = ts.tv_sec;</div><div class='del'>-	BTRFS_I(inode)-&gt;i_otime_nsec = ts.tv_nsec;</div><div class='add'>+	ts = inode_set_ctime_current(vfs_inode);</div><div class='add'>+	inode_set_mtime_to_ts(vfs_inode, ts);</div><div class='add'>+	inode_set_atime_to_ts(vfs_inode, inode_get_atime(dir));</div><div class='add'>+	inode-&gt;i_otime_sec = ts.tv_sec;</div><div class='add'>+	inode-&gt;i_otime_nsec = ts.tv_nsec;</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_uid = dir-&gt;i_uid;</div><div class='del'>-	inode-&gt;i_gid = dir-&gt;i_gid;</div><div class='add'>+	vfs_inode-&gt;i_uid = dir-&gt;i_uid;</div><div class='add'>+	vfs_inode-&gt;i_gid = dir-&gt;i_gid;</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -5635,18 +5943,18 @@ static_assert(BTRFS_FT_FIFO == FT_FIFO);</div><div class='ctx'> static_assert(BTRFS_FT_SOCK == FT_SOCK);</div><div class='ctx'> static_assert(BTRFS_FT_SYMLINK == FT_SYMLINK);</div><div class='ctx'> </div><div class='del'>-static inline u8 btrfs_inode_type(struct inode *inode)</div><div class='add'>+static inline u8 btrfs_inode_type(const struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return fs_umode_to_ftype(inode-&gt;i_mode);</div><div class='add'>+	return fs_umode_to_ftype(inode-&gt;vfs_inode.i_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='ctx'> 	struct btrfs_root *sub_root = root;</div><div class='del'>-	struct btrfs_key location;</div><div class='add'>+	struct btrfs_key location = { 0 };</div><div class='ctx'> 	u8 di_type = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -5658,20 +5966,20 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	if (location.type == BTRFS_INODE_ITEM_KEY) {</div><div class='del'>-		inode = btrfs_iget(dir-&gt;i_sb, location.objectid, root);</div><div class='add'>+		inode = btrfs_iget(location.objectid, root);</div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='del'>-			return inode;</div><div class='add'>+			return ERR_CAST(inode);</div><div class='ctx'> </div><div class='ctx'> 		/* Do extra check against inode mode with di_type */</div><div class='del'>-		if (btrfs_inode_type(inode) != di_type) {</div><div class='add'>+		if (unlikely(btrfs_inode_type(inode) != di_type)) {</div><div class='ctx'> 			btrfs_crit(fs_info,</div><div class='ctx'> "inode mode mismatch with dir: inode mode=0%o btrfs type=%u dir type=%u",</div><div class='del'>-				  inode-&gt;i_mode, btrfs_inode_type(inode),</div><div class='add'>+				  inode-&gt;vfs_inode.i_mode, btrfs_inode_type(inode),</div><div class='ctx'> 				  di_type);</div><div class='del'>-			iput(inode);</div><div class='add'>+			iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 			return ERR_PTR(-EUCLEAN);</div><div class='ctx'> 		}</div><div class='del'>-		return inode;</div><div class='add'>+		return &amp;inode-&gt;vfs_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fixup_tree_root_location(fs_info, BTRFS_I(dir), dentry,</div><div class='hunk'>@@ -5682,23 +5990,26 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		else</div><div class='ctx'> 			inode = new_simple_dir(dir, &amp;location, root);</div><div class='ctx'> 	} else {</div><div class='del'>-		inode = btrfs_iget(dir-&gt;i_sb, location.objectid, sub_root);</div><div class='add'>+		inode = btrfs_iget(location.objectid, sub_root);</div><div class='ctx'> 		btrfs_put_root(sub_root);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='del'>-			return inode;</div><div class='add'>+			return ERR_CAST(inode);</div><div class='ctx'> </div><div class='ctx'> 		down_read(&amp;fs_info-&gt;cleanup_work_sem);</div><div class='del'>-		if (!sb_rdonly(inode-&gt;i_sb))</div><div class='add'>+		if (!sb_rdonly(inode-&gt;vfs_inode.i_sb))</div><div class='ctx'> 			ret = btrfs_orphan_cleanup(sub_root);</div><div class='ctx'> 		up_read(&amp;fs_info-&gt;cleanup_work_sem);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			iput(inode);</div><div class='add'>+			iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 			inode = ERR_PTR(ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return inode;</div><div class='add'>+	if (IS_ERR(inode))</div><div class='add'>+		return ERR_CAST(inode);</div><div class='add'>+</div><div class='add'>+	return &amp;inode-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_dentry_delete(const struct dentry *dentry)</div><div class='hunk'>@@ -5738,7 +6049,7 @@ static int btrfs_set_inode_index_count(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_key key, found_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -5752,15 +6063,14 @@ static int btrfs_set_inode_index_count(struct btrfs_inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	/* FIXME: we should be able to handle this */</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = 0;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (path-&gt;slots[0] == 0) {</div><div class='ctx'> 		inode-&gt;index_cnt = BTRFS_DIR_START_INDEX;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;slots[0]--;</div><div class='hunk'>@@ -5771,13 +6081,12 @@ static int btrfs_set_inode_index_count(struct btrfs_inode *inode)</div><div class='ctx'> 	if (found_key.objectid != btrfs_ino(inode) ||</div><div class='ctx'> 	    found_key.type != BTRFS_DIR_INDEX_KEY) {</div><div class='ctx'> 		inode-&gt;index_cnt = BTRFS_DIR_START_INDEX;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;index_cnt = found_key.offset + 1;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_get_dir_last_index(struct btrfs_inode *dir, u64 *index)</div><div class='hunk'>@@ -5880,7 +6189,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	void *addr;</div><div class='ctx'> 	LIST_HEAD(ins_list);</div><div class='ctx'> 	LIST_HEAD(del_list);</div><div class='hunk'>@@ -5902,7 +6211,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	addr = private-&gt;filldir_buf;</div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='del'>-	put = btrfs_readdir_get_delayed_items(inode, private-&gt;last_index,</div><div class='add'>+	put = btrfs_readdir_get_delayed_items(BTRFS_I(inode), private-&gt;last_index,</div><div class='ctx'> 					      &amp;ins_list, &amp;del_list);</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='hunk'>@@ -5963,8 +6272,7 @@ again:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto nopos;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_readdir_delayed_dir_index(ctx, &amp;ins_list);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (btrfs_readdir_delayed_dir_index(ctx, &amp;ins_list))</div><div class='ctx'> 		goto nopos;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5975,7 +6283,7 @@ again:</div><div class='ctx'> 	 * offset.  This means that new entries created during readdir</div><div class='ctx'> 	 * are *guaranteed* to be seen in the future by that readdir.</div><div class='ctx'> 	 * This has broken buggy programs which operate on names as</div><div class='del'>-	 * they're returned by readdir.  Until we re-use freed offsets</div><div class='add'>+	 * they're returned by readdir.  Until we reuse freed offsets</div><div class='ctx'> 	 * we have this hack to stop new entries from being returned</div><div class='ctx'> 	 * under the assumption that they'll never reach this huge</div><div class='ctx'> 	 * offset.</div><div class='hunk'>@@ -5992,8 +6300,7 @@ nopos:</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> err:</div><div class='ctx'> 	if (put)</div><div class='del'>-		btrfs_readdir_put_delayed_items(inode, &amp;ins_list, &amp;del_list);</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+		btrfs_readdir_put_delayed_items(BTRFS_I(inode), &amp;ins_list, &amp;del_list);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6035,8 +6342,8 @@ static int btrfs_dirty_inode(struct btrfs_inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This is a copy of file_update_time.  We need this so we can return error on</div><div class='del'>- * ENOSPC for updating the inode in the case of file write and mmap writes.</div><div class='add'>+ * We need our own -&gt;update_time so that we can return error on ENOSPC for</div><div class='add'>+ * updating the inode in the case of file write and mmap writes.</div><div class='ctx'>  */</div><div class='ctx'> static int btrfs_update_time(struct inode *inode, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -6077,7 +6384,7 @@ static int btrfs_insert_inode_locked(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_iget_args args;</div><div class='ctx'> </div><div class='del'>-	args.ino = BTRFS_I(inode)-&gt;location.objectid;</div><div class='add'>+	args.ino = btrfs_ino(BTRFS_I(inode));</div><div class='ctx'> 	args.root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> </div><div class='ctx'> 	return insert_inode_locked4(inode,</div><div class='hunk'>@@ -6171,7 +6478,7 @@ static void btrfs_inherit_iflags(struct btrfs_inode *inode, struct btrfs_inode *</div><div class='ctx'> 			inode-&gt;flags |= BTRFS_INODE_NODATASUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_sync_inode_flags_to_i_flags(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	btrfs_sync_inode_flags_to_i_flags(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -6181,10 +6488,9 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct inode *dir = args-&gt;dir;</div><div class='ctx'> 	struct inode *inode = args-&gt;inode;</div><div class='ctx'> 	const struct fscrypt_str *name = args-&gt;orphan ? NULL : &amp;args-&gt;fname.disk_name;</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='del'>-	struct btrfs_key *location;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	u64 objectid;</div><div class='ctx'> 	struct btrfs_inode_ref *ref;</div><div class='hunk'>@@ -6193,6 +6499,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_item_batch batch;</div><div class='ctx'> 	unsigned long ptr;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool xa_reserved = false;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -6202,10 +6509,19 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		BTRFS_I(inode)-&gt;root = btrfs_grab_root(BTRFS_I(dir)-&gt;root);</div><div class='ctx'> 	root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> </div><div class='add'>+	ret = btrfs_init_file_extent_tree(BTRFS_I(inode));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	ret = btrfs_get_free_objectid(root, &amp;objectid);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	inode-&gt;i_ino = objectid;</div><div class='add'>+	btrfs_set_inode_number(BTRFS_I(inode), objectid);</div><div class='add'>+</div><div class='add'>+	ret = xa_reserve(&amp;root-&gt;inodes, objectid, GFP_NOFS);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	xa_reserved = true;</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;orphan) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -6220,8 +6536,10 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	/* index_cnt is ignored for everything but a dir. */</div><div class='del'>-	BTRFS_I(inode)-&gt;index_cnt = BTRFS_DIR_START_INDEX;</div><div class='add'>+</div><div class='add'>+	if (S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+		BTRFS_I(inode)-&gt;index_cnt = BTRFS_DIR_START_INDEX;</div><div class='add'>+</div><div class='ctx'> 	BTRFS_I(inode)-&gt;generation = trans-&gt;transid;</div><div class='ctx'> 	inode-&gt;i_generation = BTRFS_I(inode)-&gt;generation;</div><div class='ctx'> </div><div class='hunk'>@@ -6240,19 +6558,16 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!args-&gt;subvol)</div><div class='ctx'> 		btrfs_inherit_iflags(BTRFS_I(inode), BTRFS_I(dir));</div><div class='ctx'> </div><div class='add'>+	btrfs_set_inode_mapping_order(BTRFS_I(inode));</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode)) {</div><div class='ctx'> 		if (btrfs_test_opt(fs_info, NODATASUM))</div><div class='ctx'> 			BTRFS_I(inode)-&gt;flags |= BTRFS_INODE_NODATASUM;</div><div class='ctx'> 		if (btrfs_test_opt(fs_info, NODATACOW))</div><div class='ctx'> 			BTRFS_I(inode)-&gt;flags |= BTRFS_INODE_NODATACOW |</div><div class='ctx'> 				BTRFS_INODE_NODATASUM;</div><div class='add'>+		btrfs_update_inode_mapping_flags(BTRFS_I(inode));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	location = &amp;BTRFS_I(inode)-&gt;location;</div><div class='del'>-	location-&gt;objectid = objectid;</div><div class='del'>-	location-&gt;offset = 0;</div><div class='del'>-	location-&gt;type = BTRFS_INODE_ITEM_KEY;</div><div class='del'>-</div><div class='ctx'> 	ret = btrfs_insert_inode_locked(inode);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (!args-&gt;orphan)</div><div class='hunk'>@@ -6297,7 +6612,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	batch.total_data_size = sizes[0] + (args-&gt;orphan ? 0 : sizes[1]);</div><div class='ctx'> 	batch.nr = args-&gt;orphan ? 1 : 2;</div><div class='ctx'> 	ret = btrfs_insert_empty_items(trans, root, path, &amp;batch);</div><div class='del'>-	if (ret != 0) {</div><div class='add'>+	if (unlikely(ret != 0)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto discard;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6335,7 +6650,6 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't need the path anymore, plus inheriting properties, adding</div><div class='ctx'> 	 * ACLs, security xattrs, orphan item or adding the link, will result in</div><div class='hunk'>@@ -6345,28 +6659,28 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	path = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;subvol) {</div><div class='del'>-		struct inode *parent;</div><div class='add'>+		struct btrfs_inode *parent;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Subvolumes inherit properties from their parent subvolume,</div><div class='ctx'> 		 * not the directory they were created in.</div><div class='ctx'> 		 */</div><div class='del'>-		parent = btrfs_iget(fs_info-&gt;sb, BTRFS_FIRST_FREE_OBJECTID,</div><div class='del'>-				    BTRFS_I(dir)-&gt;root);</div><div class='add'>+		parent = btrfs_iget(BTRFS_FIRST_FREE_OBJECTID, BTRFS_I(dir)-&gt;root);</div><div class='ctx'> 		if (IS_ERR(parent)) {</div><div class='ctx'> 			ret = PTR_ERR(parent);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = btrfs_inode_inherit_props(trans, inode, parent);</div><div class='del'>-			iput(parent);</div><div class='add'>+			ret = btrfs_inode_inherit_props(trans, BTRFS_I(inode),</div><div class='add'>+							parent);</div><div class='add'>+			iput(&amp;parent-&gt;vfs_inode);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = btrfs_inode_inherit_props(trans, inode, dir);</div><div class='add'>+		ret = btrfs_inode_inherit_props(trans, BTRFS_I(inode),</div><div class='add'>+						BTRFS_I(dir));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "error inheriting props for ino %llu (root %llu): %d",</div><div class='del'>-			  btrfs_ino(BTRFS_I(inode)), root-&gt;root_key.objectid,</div><div class='del'>-			  ret);</div><div class='add'>+			  btrfs_ino(BTRFS_I(inode)), btrfs_root_id(root), ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -6375,13 +6689,18 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!args-&gt;subvol) {</div><div class='ctx'> 		ret = btrfs_init_inode_security(trans, args);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto discard;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_tree_add(BTRFS_I(inode));</div><div class='add'>+	ret = btrfs_add_inode_to_root(BTRFS_I(inode), false);</div><div class='add'>+	if (WARN_ON(ret)) {</div><div class='add'>+		/* Shouldn't happen, we used xa_reserve() before. */</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		goto discard;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_inode_new(inode);</div><div class='ctx'> 	btrfs_set_inode_last_trans(trans, BTRFS_I(inode));</div><div class='hunk'>@@ -6390,13 +6709,17 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;orphan) {</div><div class='ctx'> 		ret = btrfs_orphan_add(trans, BTRFS_I(inode));</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto discard;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode), name,</div><div class='ctx'> 				     0, BTRFS_I(inode)-&gt;dir_index);</div><div class='del'>-	}</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto discard;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto discard;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -6409,6 +6732,9 @@ discard:</div><div class='ctx'> 	ihold(inode);</div><div class='ctx'> 	discard_new_inode(inode);</div><div class='ctx'> out:</div><div class='add'>+	if (xa_reserved)</div><div class='add'>+		xa_release(&amp;root-&gt;inodes, objectid);</div><div class='add'>+</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -6421,7 +6747,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_add_link(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		   struct btrfs_inode *parent_inode, struct btrfs_inode *inode,</div><div class='del'>-		   const struct fscrypt_str *name, int add_backref, u64 index)</div><div class='add'>+		   const struct fscrypt_str *name, bool add_backref, u64 index)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -6439,7 +6765,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {</div><div class='ctx'> 		ret = btrfs_add_root_ref(trans, key.objectid,</div><div class='del'>-					 root-&gt;root_key.objectid, parent_ino,</div><div class='add'>+					 btrfs_root_id(root), parent_ino,</div><div class='ctx'> 					 index, name);</div><div class='ctx'> 	} else if (add_backref) {</div><div class='ctx'> 		ret = btrfs_insert_inode_ref(trans, root, name,</div><div class='hunk'>@@ -6451,10 +6777,10 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_dir_item(trans, name, parent_inode, &amp;key,</div><div class='del'>-				    btrfs_inode_type(&amp;inode-&gt;vfs_inode), index);</div><div class='add'>+				    btrfs_inode_type(inode), index);</div><div class='ctx'> 	if (ret == -EEXIST || ret == -EOVERFLOW)</div><div class='ctx'> 		goto fail_dir_item;</div><div class='del'>-	else if (ret) {</div><div class='add'>+	else if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6462,15 +6788,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_i_size_write(parent_inode, parent_inode-&gt;vfs_inode.i_size +</div><div class='ctx'> 			   name-&gt;len * 2);</div><div class='ctx'> 	inode_inc_iversion(&amp;parent_inode-&gt;vfs_inode);</div><div class='del'>-	/*</div><div class='del'>-	 * If we are replaying a log tree, we do not want to update the mtime</div><div class='del'>-	 * and ctime of the parent directory with the current time, since the</div><div class='del'>-	 * log replay procedure is responsible for setting them to their correct</div><div class='del'>-	 * values (the ones it had when the fsync was done).</div><div class='del'>-	 */</div><div class='del'>-	if (!test_bit(BTRFS_FS_LOG_RECOVERING, &amp;root-&gt;fs_info-&gt;flags))</div><div class='del'>-		inode_set_mtime_to_ts(&amp;parent_inode-&gt;vfs_inode,</div><div class='del'>-				      inode_set_ctime_current(&amp;parent_inode-&gt;vfs_inode));</div><div class='add'>+	update_time_after_link_or_unlink(parent_inode);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_update_inode(trans, parent_inode);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -6480,20 +6798,18 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,</div><div class='ctx'> fail_dir_item:</div><div class='ctx'> 	if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {</div><div class='ctx'> 		u64 local_index;</div><div class='del'>-		int err;</div><div class='del'>-		err = btrfs_del_root_ref(trans, key.objectid,</div><div class='del'>-					 root-&gt;root_key.objectid, parent_ino,</div><div class='del'>-					 &amp;local_index, name);</div><div class='del'>-		if (err)</div><div class='del'>-			btrfs_abort_transaction(trans, err);</div><div class='add'>+		int ret2;</div><div class='add'>+</div><div class='add'>+		ret2 = btrfs_del_root_ref(trans, key.objectid, btrfs_root_id(root),</div><div class='add'>+					  parent_ino, &amp;local_index, name);</div><div class='add'>+		if (ret2)</div><div class='add'>+			btrfs_abort_transaction(trans, ret2);</div><div class='ctx'> 	} else if (add_backref) {</div><div class='del'>-		u64 local_index;</div><div class='del'>-		int err;</div><div class='add'>+		int ret2;</div><div class='ctx'> </div><div class='del'>-		err = btrfs_del_inode_ref(trans, root, name, ino, parent_ino,</div><div class='del'>-					  &amp;local_index);</div><div class='del'>-		if (err)</div><div class='del'>-			btrfs_abort_transaction(trans, err);</div><div class='add'>+		ret2 = btrfs_del_inode_ref(trans, root, name, ino, parent_ino, NULL);</div><div class='add'>+		if (ret2)</div><div class='add'>+			btrfs_abort_transaction(trans, ret2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Return the original error code */</div><div class='hunk'>@@ -6503,7 +6819,7 @@ fail_dir_item:</div><div class='ctx'> static int btrfs_create_common(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			       struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='ctx'> 	struct btrfs_new_inode_args new_inode_args = {</div><div class='ctx'> 		.dir = dir,</div><div class='hunk'>@@ -6512,30 +6828,33 @@ static int btrfs_create_common(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int trans_num_items;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	err = btrfs_new_inode_prepare(&amp;new_inode_args, &amp;trans_num_items);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_new_inode_prepare(&amp;new_inode_args, &amp;trans_num_items);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_inode;</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_start_transaction(root, trans_num_items);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_new_inode_args;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = btrfs_create_new_inode(trans, &amp;new_inode_args);</div><div class='del'>-	if (!err)</div><div class='add'>+	ret = btrfs_create_new_inode(trans, &amp;new_inode_args);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+			inode-&gt;i_opflags |= IOP_FASTPERM_MAY_EXEC;</div><div class='ctx'> 		d_instantiate_new(dentry, inode);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> out_new_inode_args:</div><div class='ctx'> 	btrfs_new_inode_args_destroy(&amp;new_inode_args);</div><div class='ctx'> out_inode:</div><div class='del'>-	if (err)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		iput(inode);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -6573,25 +6892,24 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='ctx'> 	struct inode *inode = d_inode(old_dentry);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct fscrypt_name fname;</div><div class='ctx'> 	u64 index;</div><div class='del'>-	int err;</div><div class='del'>-	int drop_inode = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* do not allow sys_link's with other subvols of the same device */</div><div class='del'>-	if (root-&gt;root_key.objectid != BTRFS_I(inode)-&gt;root-&gt;root_key.objectid)</div><div class='add'>+	if (btrfs_root_id(root) != btrfs_root_id(BTRFS_I(inode)-&gt;root))</div><div class='ctx'> 		return -EXDEV;</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_nlink &gt;= BTRFS_LINK_MAX)</div><div class='ctx'> 		return -EMLINK;</div><div class='ctx'> </div><div class='del'>-	err = fscrypt_setup_filename(dir, &amp;dentry-&gt;d_name, 0, &amp;fname);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = fscrypt_setup_filename(dir, &amp;dentry-&gt;d_name, 0, &amp;fname);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	err = btrfs_set_inode_index(BTRFS_I(dir), &amp;index);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_set_inode_index(BTRFS_I(dir), &amp;index);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -6602,75 +6920,75 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> 	 */</div><div class='ctx'> 	trans = btrfs_start_transaction(root, inode-&gt;i_nlink ? 5 : 6);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		trans = NULL;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* There are several dir indexes for this inode, clear the cache. */</div><div class='ctx'> 	BTRFS_I(inode)-&gt;dir_index = 0ULL;</div><div class='del'>-	inc_nlink(inode);</div><div class='ctx'> 	inode_inc_iversion(inode);</div><div class='ctx'> 	inode_set_ctime_current(inode);</div><div class='del'>-	ihold(inode);</div><div class='del'>-	set_bit(BTRFS_INODE_COPY_EVERYTHING, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='ctx'> </div><div class='del'>-	err = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode),</div><div class='add'>+	ret = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode),</div><div class='ctx'> 			     &amp;fname.disk_name, 1, index);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='del'>-		drop_inode = 1;</div><div class='del'>-	} else {</div><div class='del'>-		struct dentry *parent = dentry-&gt;d_parent;</div><div class='add'>+	/* Link added now we update the inode item with the new link count. */</div><div class='add'>+	inc_nlink(inode);</div><div class='add'>+	ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		err = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='del'>-		if (err)</div><div class='add'>+	if (inode-&gt;i_nlink == 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the new hard link count is 1, it's a file created with the</div><div class='add'>+		 * open(2) O_TMPFILE flag.</div><div class='add'>+		 */</div><div class='add'>+		ret = btrfs_orphan_del(trans, BTRFS_I(inode));</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto fail;</div><div class='del'>-		if (inode-&gt;i_nlink == 1) {</div><div class='del'>-			/*</div><div class='del'>-			 * If new hard link count is 1, it's a file created</div><div class='del'>-			 * with open(2) O_TMPFILE flag.</div><div class='del'>-			 */</div><div class='del'>-			err = btrfs_orphan_del(trans, BTRFS_I(inode));</div><div class='del'>-			if (err)</div><div class='del'>-				goto fail;</div><div class='ctx'> 		}</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-		btrfs_log_new_name(trans, old_dentry, NULL, 0, parent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Grab reference for the new dentry passed to d_instantiate(). */</div><div class='add'>+	ihold(inode);</div><div class='add'>+	d_instantiate(dentry, inode);</div><div class='add'>+	btrfs_log_new_name(trans, old_dentry, NULL, 0, dentry-&gt;d_parent);</div><div class='add'>+</div><div class='ctx'> fail:</div><div class='ctx'> 	fscrypt_free_filename(&amp;fname);</div><div class='ctx'> 	if (trans)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='del'>-	if (drop_inode) {</div><div class='del'>-		inode_dec_link_count(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-	}</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int btrfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		       struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *btrfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				  struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	inode = new_inode(dir-&gt;i_sb);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	inode_init_owner(idmap, inode, dir, S_IFDIR | mode);</div><div class='ctx'> 	inode-&gt;i_op = &amp;btrfs_dir_inode_operations;</div><div class='ctx'> 	inode-&gt;i_fop = &amp;btrfs_dir_file_operations;</div><div class='del'>-	return btrfs_create_common(dir, dentry, inode);</div><div class='add'>+	return ERR_PTR(btrfs_create_common(dir, dentry, inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline int uncompress_inline(struct btrfs_path *path,</div><div class='del'>-				      struct page *page,</div><div class='add'>+				      struct folio *folio,</div><div class='ctx'> 				      struct btrfs_file_extent_item *item)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='add'>+	const u32 blocksize = leaf-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	char *tmp;</div><div class='ctx'> 	size_t max_size;</div><div class='ctx'> 	unsigned long inline_size;</div><div class='hunk'>@@ -6687,8 +7005,9 @@ static noinline int uncompress_inline(struct btrfs_path *path,</div><div class='ctx'> </div><div class='ctx'> 	read_extent_buffer(leaf, tmp, ptr, inline_size);</div><div class='ctx'> </div><div class='del'>-	max_size = min_t(unsigned long, PAGE_SIZE, max_size);</div><div class='del'>-	ret = btrfs_decompress(compress_type, tmp, page, 0, inline_size, max_size);</div><div class='add'>+	max_size = min_t(unsigned long, blocksize, max_size);</div><div class='add'>+	ret = btrfs_decompress(compress_type, tmp, folio, 0, inline_size,</div><div class='add'>+			       max_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * decompression code contains a memset to fill in any space between the end</div><div class='hunk'>@@ -6698,37 +7017,37 @@ static noinline int uncompress_inline(struct btrfs_path *path,</div><div class='ctx'> 	 * cover that region here.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (max_size &lt; PAGE_SIZE)</div><div class='del'>-		memzero_page(page, max_size, PAGE_SIZE - max_size);</div><div class='add'>+	if (max_size &lt; blocksize)</div><div class='add'>+		folio_zero_range(folio, max_size, blocksize - max_size);</div><div class='ctx'> 	kfree(tmp);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int read_inline_extent(struct btrfs_inode *inode, struct btrfs_path *path,</div><div class='del'>-			      struct page *page)</div><div class='add'>+static int read_inline_extent(struct btrfs_path *path, struct folio *folio)</div><div class='ctx'> {</div><div class='add'>+	const u32 blocksize = path-&gt;nodes[0]-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	size_t copy_size;</div><div class='ctx'> </div><div class='del'>-	if (!page || PageUptodate(page))</div><div class='add'>+	if (!folio || folio_test_uptodate(folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ASSERT(page_offset(page) == 0);</div><div class='add'>+	ASSERT(folio_pos(folio) == 0);</div><div class='ctx'> </div><div class='ctx'> 	fi = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='ctx'> 			    struct btrfs_file_extent_item);</div><div class='ctx'> 	if (btrfs_file_extent_compression(path-&gt;nodes[0], fi) != BTRFS_COMPRESS_NONE)</div><div class='del'>-		return uncompress_inline(path, page, fi);</div><div class='add'>+		return uncompress_inline(path, folio, fi);</div><div class='ctx'> </div><div class='del'>-	copy_size = min_t(u64, PAGE_SIZE,</div><div class='add'>+	copy_size = min_t(u64, blocksize,</div><div class='ctx'> 			  btrfs_file_extent_ram_bytes(path-&gt;nodes[0], fi));</div><div class='del'>-	kaddr = kmap_local_page(page);</div><div class='add'>+	kaddr = kmap_local_folio(folio, 0);</div><div class='ctx'> 	read_extent_buffer(path-&gt;nodes[0], kaddr,</div><div class='ctx'> 			   btrfs_file_extent_inline_start(fi), copy_size);</div><div class='ctx'> 	kunmap_local(kaddr);</div><div class='del'>-	if (copy_size &lt; PAGE_SIZE)</div><div class='del'>-		memzero_page(page, copy_size, PAGE_SIZE - copy_size);</div><div class='add'>+	if (copy_size &lt; blocksize)</div><div class='add'>+		folio_zero_range(folio, copy_size, blocksize - copy_size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6737,7 +7056,6 @@ static int read_inline_extent(struct btrfs_inode *inode, struct btrfs_path *path</div><div class='ctx'>  *</div><div class='ctx'>  * @inode:	file to search in</div><div class='ctx'>  * @page:	page to read extent data into if the extent is inline</div><div class='del'>- * @pg_offset:	offset into @page to copy to</div><div class='ctx'>  * @start:	file offset</div><div class='ctx'>  * @len:	length of range starting at @start</div><div class='ctx'>  *</div><div class='hunk'>@@ -6751,8 +7069,7 @@ static int read_inline_extent(struct btrfs_inode *inode, struct btrfs_path *path</div><div class='ctx'>  * Return: ERR_PTR on error, non-NULL extent_map on success.</div><div class='ctx'>  */</div><div class='ctx'> struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,</div><div class='del'>-				    struct page *page, size_t pg_offset,</div><div class='del'>-				    u64 start, u64 len)</div><div class='add'>+				    struct folio *folio, u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -6769,26 +7086,25 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, start, len);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, start, len);</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (em) {</div><div class='ctx'> 		if (em-&gt;start &gt; start || em-&gt;start + em-&gt;len &lt;= start)</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-		else if (em-&gt;block_start == EXTENT_MAP_INLINE &amp;&amp; page)</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='add'>+		else if (em-&gt;disk_bytenr == EXTENT_MAP_INLINE &amp;&amp; folio)</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 		else</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	em-&gt;start = EXTENT_MAP_HOLE;</div><div class='del'>-	em-&gt;orig_start = EXTENT_MAP_HOLE;</div><div class='add'>+	em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='ctx'> 	em-&gt;len = (u64)-1;</div><div class='del'>-	em-&gt;block_len = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='hunk'>@@ -6805,8 +7121,8 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	 * point the commit_root has everything we need.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (btrfs_is_free_space_inode(inode)) {</div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='add'>+		path-&gt;search_commit_root = true;</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_lookup_file_extent(NULL, root, path, objectid, start, 0);</div><div class='hunk'>@@ -6841,7 +7157,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,</div><div class='ctx'> 	if (extent_type == BTRFS_FILE_EXTENT_REG ||</div><div class='ctx'> 	    extent_type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='ctx'> 		/* Only regular file could have regular/prealloc extent */</div><div class='del'>-		if (!S_ISREG(inode-&gt;vfs_inode.i_mode)) {</div><div class='add'>+		if (unlikely(!S_ISREG(inode-&gt;vfs_inode.i_mode))) {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			btrfs_crit(fs_info,</div><div class='ctx'> 		"regular/prealloc extent found for non-regular inode %llu",</div><div class='hunk'>@@ -6878,9 +7194,8 @@ next:</div><div class='ctx'> </div><div class='ctx'> 		/* New extent overlaps with existing one */</div><div class='ctx'> 		em-&gt;start = start;</div><div class='del'>-		em-&gt;orig_start = start;</div><div class='ctx'> 		em-&gt;len = found_key.offset - start;</div><div class='del'>-		em-&gt;block_start = EXTENT_MAP_HOLE;</div><div class='add'>+		em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='ctx'> 		goto insert;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6895,7 +7210,6 @@ next:</div><div class='ctx'> 		 * ensured by tree-checker and inline extent creation path.</div><div class='ctx'> 		 * Thus all members representing file offsets should be zero.</div><div class='ctx'> 		 */</div><div class='del'>-		ASSERT(pg_offset == 0);</div><div class='ctx'> 		ASSERT(extent_start == 0);</div><div class='ctx'> 		ASSERT(em-&gt;start == 0);</div><div class='ctx'> </div><div class='hunk'>@@ -6905,23 +7219,22 @@ next:</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Other members are not utilized for inline extents.</div><div class='ctx'> 		 */</div><div class='del'>-		ASSERT(em-&gt;block_start == EXTENT_MAP_INLINE);</div><div class='add'>+		ASSERT(em-&gt;disk_bytenr == EXTENT_MAP_INLINE);</div><div class='ctx'> 		ASSERT(em-&gt;len == fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='del'>-		ret = read_inline_extent(inode, path, page);</div><div class='add'>+		ret = read_inline_extent(path, folio);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		goto insert;</div><div class='ctx'> 	}</div><div class='ctx'> not_found:</div><div class='ctx'> 	em-&gt;start = start;</div><div class='del'>-	em-&gt;orig_start = start;</div><div class='ctx'> 	em-&gt;len = len;</div><div class='del'>-	em-&gt;block_start = EXTENT_MAP_HOLE;</div><div class='add'>+	em-&gt;disk_bytenr = EXTENT_MAP_HOLE;</div><div class='ctx'> insert:</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	if (em-&gt;start &gt; start || extent_map_end(em) &lt;= start) {</div><div class='add'>+	if (unlikely(em-&gt;start &gt; start || btrfs_extent_map_end(em) &lt;= start)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "bad extent! em: [%llu %llu] passed [%llu %llu]",</div><div class='ctx'> 			  em-&gt;start, em-&gt;len, start, len);</div><div class='hunk'>@@ -6930,7 +7243,7 @@ insert:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, start, len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, start, len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='hunk'>@@ -6938,90 +7251,12 @@ out:</div><div class='ctx'> 	trace_btrfs_get_extent(root, inode, em);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	return em;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct extent_map *btrfs_create_dio_extent(struct btrfs_inode *inode,</div><div class='del'>-						  struct btrfs_dio_data *dio_data,</div><div class='del'>-						  const u64 start,</div><div class='del'>-						  const u64 len,</div><div class='del'>-						  const u64 orig_start,</div><div class='del'>-						  const u64 block_start,</div><div class='del'>-						  const u64 block_len,</div><div class='del'>-						  const u64 orig_block_len,</div><div class='del'>-						  const u64 ram_bytes,</div><div class='del'>-						  const int type)</div><div class='del'>-{</div><div class='del'>-	struct extent_map *em = NULL;</div><div class='del'>-	struct btrfs_ordered_extent *ordered;</div><div class='del'>-</div><div class='del'>-	if (type != BTRFS_ORDERED_NOCOW) {</div><div class='del'>-		em = create_io_em(inode, start, len, orig_start, block_start,</div><div class='del'>-				  block_len, orig_block_len, ram_bytes,</div><div class='del'>-				  BTRFS_COMPRESS_NONE, /* compress_type */</div><div class='del'>-				  type);</div><div class='del'>-		if (IS_ERR(em))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	ordered = btrfs_alloc_ordered_extent(inode, start, len, len,</div><div class='del'>-					     block_start, block_len, 0,</div><div class='del'>-					     (1 &lt;&lt; type) |</div><div class='del'>-					     (1 &lt;&lt; BTRFS_ORDERED_DIRECT),</div><div class='del'>-					     BTRFS_COMPRESS_NONE);</div><div class='del'>-	if (IS_ERR(ordered)) {</div><div class='del'>-		if (em) {</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-			btrfs_drop_extent_map_range(inode, start,</div><div class='del'>-						    start + len - 1, false);</div><div class='del'>-		}</div><div class='del'>-		em = ERR_CAST(ordered);</div><div class='del'>-	} else {</div><div class='del'>-		ASSERT(!dio_data-&gt;ordered);</div><div class='del'>-		dio_data-&gt;ordered = ordered;</div><div class='del'>-	}</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	return em;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct extent_map *btrfs_new_extent_direct(struct btrfs_inode *inode,</div><div class='del'>-						  struct btrfs_dio_data *dio_data,</div><div class='del'>-						  u64 start, u64 len)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct extent_map *em;</div><div class='del'>-	struct btrfs_key ins;</div><div class='del'>-	u64 alloc_hint;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	alloc_hint = get_extent_allocation_hint(inode, start, len);</div><div class='del'>-again:</div><div class='del'>-	ret = btrfs_reserve_extent(root, len, len, fs_info-&gt;sectorsize,</div><div class='del'>-				   0, alloc_hint, &amp;ins, 1, 1);</div><div class='del'>-	if (ret == -EAGAIN) {</div><div class='del'>-		ASSERT(btrfs_is_zoned(fs_info));</div><div class='del'>-		wait_on_bit_io(&amp;inode-&gt;root-&gt;fs_info-&gt;flags, BTRFS_FS_NEED_ZONE_FINISH,</div><div class='del'>-			       TASK_UNINTERRUPTIBLE);</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-	if (ret)</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-</div><div class='del'>-	em = btrfs_create_dio_extent(inode, dio_data, start, ins.offset, start,</div><div class='del'>-				     ins.objectid, ins.offset, ins.offset,</div><div class='del'>-				     ins.offset, BTRFS_ORDERED_REGULAR);</div><div class='del'>-	btrfs_dec_block_group_reservations(fs_info, ins.objectid);</div><div class='del'>-	if (IS_ERR(em))</div><div class='del'>-		btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset,</div><div class='del'>-					   1);</div><div class='del'>-</div><div class='del'>-	return em;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool btrfs_extent_readonly(struct btrfs_fs_info *fs_info, u64 bytenr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='hunk'>@@ -7044,8 +7279,6 @@ static bool btrfs_extent_readonly(struct btrfs_fs_info *fs_info, u64 bytenr)</div><div class='ctx'>  * @orig_start:	(optional) Return the original file offset of the file extent</div><div class='ctx'>  * @orig_len:	(optional) Return the original on-disk length of the file extent</div><div class='ctx'>  * @ram_bytes:	(optional) Return the ram_bytes of the file extent</div><div class='del'>- * @strict:	if true, omit optimizations that might force us into unnecessary</div><div class='del'>- *		cow. e.g., don't trust generation number.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='ctx'>  * &gt;0	and update @len if we can do nocow write</div><div class='hunk'>@@ -7055,17 +7288,17 @@ static bool btrfs_extent_readonly(struct btrfs_fs_info *fs_info, u64 bytenr)</div><div class='ctx'>  * NOTE: This only checks the file extents, caller is responsible to wait for</div><div class='ctx'>  *	 any ordered extents.</div><div class='ctx'>  */</div><div class='del'>-noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,</div><div class='del'>-			      u64 *orig_start, u64 *orig_block_len,</div><div class='del'>-			      u64 *ram_bytes, bool nowait, bool strict)</div><div class='add'>+noinline int can_nocow_extent(struct btrfs_inode *inode, u64 offset, u64 *len,</div><div class='add'>+			      struct btrfs_file_extent *file_extent,</div><div class='add'>+			      bool nowait)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct can_nocow_file_extent_args nocow_args = { 0 };</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	struct extent_io_tree *io_tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int found_type;</div><div class='hunk'>@@ -7075,786 +7308,146 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	path-&gt;nowait = nowait;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_lookup_file_extent(NULL, root, path,</div><div class='del'>-			btrfs_ino(BTRFS_I(inode)), offset, 0);</div><div class='add'>+	ret = btrfs_lookup_file_extent(NULL, root, path, btrfs_ino(inode),</div><div class='add'>+				       offset, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 1) {</div><div class='ctx'> 		if (path-&gt;slots[0] == 0) {</div><div class='del'>-			/* can't find the item, must cow */</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='add'>+			/* Can't find the item, must COW. */</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		path-&gt;slots[0]--;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='del'>-	if (key.objectid != btrfs_ino(BTRFS_I(inode)) ||</div><div class='add'>+	if (key.objectid != btrfs_ino(inode) ||</div><div class='ctx'> 	    key.type != BTRFS_EXTENT_DATA_KEY) {</div><div class='del'>-		/* not our file or wrong item type, must cow */</div><div class='del'>-		goto out;</div><div class='add'>+		/* Not our file or wrong item type, must COW. */</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (key.offset &gt; offset) {</div><div class='del'>-		/* Wrong offset, must cow */</div><div class='del'>-		goto out;</div><div class='add'>+		/* Wrong offset, must COW. */</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_file_extent_end(path) &lt;= offset)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	fi = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='ctx'> 	found_type = btrfs_file_extent_type(leaf, fi);</div><div class='del'>-	if (ram_bytes)</div><div class='del'>-		*ram_bytes = btrfs_file_extent_ram_bytes(leaf, fi);</div><div class='ctx'> </div><div class='ctx'> 	nocow_args.start = offset;</div><div class='ctx'> 	nocow_args.end = offset + *len - 1;</div><div class='del'>-	nocow_args.strict = strict;</div><div class='ctx'> 	nocow_args.free_path = true;</div><div class='ctx'> </div><div class='del'>-	ret = can_nocow_file_extent(path, &amp;key, BTRFS_I(inode), &amp;nocow_args);</div><div class='add'>+	ret = can_nocow_file_extent(path, &amp;key, inode, &amp;nocow_args);</div><div class='ctx'> 	/* can_nocow_file_extent() has freed the path. */</div><div class='ctx'> 	path = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 1) {</div><div class='ctx'> 		/* Treat errors as not being able to NOCOW. */</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-	if (btrfs_extent_readonly(fs_info, nocow_args.disk_bytenr))</div><div class='del'>-		goto out;</div><div class='add'>+	if (btrfs_extent_readonly(fs_info,</div><div class='add'>+				  nocow_args.file_extent.disk_bytenr +</div><div class='add'>+				  nocow_args.file_extent.offset))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!(BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_NODATACOW) &amp;&amp;</div><div class='add'>+	if (!(inode-&gt;flags &amp; BTRFS_INODE_NODATACOW) &amp;&amp;</div><div class='ctx'> 	    found_type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='ctx'> 		u64 range_end;</div><div class='ctx'> </div><div class='del'>-		range_end = round_up(offset + nocow_args.num_bytes,</div><div class='add'>+		range_end = round_up(offset + nocow_args.file_extent.num_bytes,</div><div class='ctx'> 				     root-&gt;fs_info-&gt;sectorsize) - 1;</div><div class='del'>-		ret = test_range_bit_exists(io_tree, offset, range_end, EXTENT_DELALLOC);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ret = -EAGAIN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		ret = btrfs_test_range_bit_exists(io_tree, offset, range_end,</div><div class='add'>+						  EXTENT_DELALLOC);</div><div class='add'>+		if (ret)</div><div class='add'>+			return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (orig_start)</div><div class='del'>-		*orig_start = key.offset - nocow_args.extent_offset;</div><div class='del'>-	if (orig_block_len)</div><div class='del'>-		*orig_block_len = nocow_args.disk_num_bytes;</div><div class='add'>+	if (file_extent)</div><div class='add'>+		memcpy(file_extent, &amp;nocow_args.file_extent, sizeof(*file_extent));</div><div class='ctx'> </div><div class='del'>-	*len = nocow_args.num_bytes;</div><div class='del'>-	ret = 1;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	*len = nocow_args.file_extent.num_bytes;</div><div class='ctx'> </div><div class='del'>-static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,</div><div class='del'>-			      struct extent_state **cached_state,</div><div class='del'>-			      unsigned int iomap_flags)</div><div class='del'>-{</div><div class='del'>-	const bool writing = (iomap_flags &amp; IOMAP_WRITE);</div><div class='del'>-	const bool nowait = (iomap_flags &amp; IOMAP_NOWAIT);</div><div class='del'>-	struct extent_io_tree *io_tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='del'>-	struct btrfs_ordered_extent *ordered;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (nowait) {</div><div class='del'>-			if (!try_lock_extent(io_tree, lockstart, lockend,</div><div class='del'>-					     cached_state))</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-		} else {</div><div class='del'>-			lock_extent(io_tree, lockstart, lockend, cached_state);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * We're concerned with the entire range that we're going to be</div><div class='del'>-		 * doing DIO to, so we need to make sure there's no ordered</div><div class='del'>-		 * extents in this range.</div><div class='del'>-		 */</div><div class='del'>-		ordered = btrfs_lookup_ordered_range(BTRFS_I(inode), lockstart,</div><div class='del'>-						     lockend - lockstart + 1);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to make sure there are no buffered pages in this</div><div class='del'>-		 * range either, we could have raced between the invalidate in</div><div class='del'>-		 * generic_file_direct_write and locking the extent.  The</div><div class='del'>-		 * invalidate needs to happen so that reads after a write do not</div><div class='del'>-		 * get stale data.</div><div class='del'>-		 */</div><div class='del'>-		if (!ordered &amp;&amp;</div><div class='del'>-		    (!writing || !filemap_range_has_page(inode-&gt;i_mapping,</div><div class='del'>-							 lockstart, lockend)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		unlock_extent(io_tree, lockstart, lockend, cached_state);</div><div class='del'>-</div><div class='del'>-		if (ordered) {</div><div class='del'>-			if (nowait) {</div><div class='del'>-				btrfs_put_ordered_extent(ordered);</div><div class='del'>-				ret = -EAGAIN;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * If we are doing a DIO read and the ordered extent we</div><div class='del'>-			 * found is for a buffered write, we can not wait for it</div><div class='del'>-			 * to complete and retry, because if we do so we can</div><div class='del'>-			 * deadlock with concurrent buffered writes on page</div><div class='del'>-			 * locks. This happens only if our DIO read covers more</div><div class='del'>-			 * than one extent map, if at this point has already</div><div class='del'>-			 * created an ordered extent for a previous extent map</div><div class='del'>-			 * and locked its range in the inode's io tree, and a</div><div class='del'>-			 * concurrent write against that previous extent map's</div><div class='del'>-			 * range and this range started (we unlock the ranges</div><div class='del'>-			 * in the io tree only when the bios complete and</div><div class='del'>-			 * buffered writes always lock pages before attempting</div><div class='del'>-			 * to lock range in the io tree).</div><div class='del'>-			 */</div><div class='del'>-			if (writing ||</div><div class='del'>-			    test_bit(BTRFS_ORDERED_DIRECT, &amp;ordered-&gt;flags))</div><div class='del'>-				btrfs_start_ordered_extent(ordered);</div><div class='del'>-			else</div><div class='del'>-				ret = nowait ? -EAGAIN : -ENOTBLK;</div><div class='del'>-			btrfs_put_ordered_extent(ordered);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * We could trigger writeback for this range (and wait</div><div class='del'>-			 * for it to complete) and then invalidate the pages for</div><div class='del'>-			 * this range (through invalidate_inode_pages2_range()),</div><div class='del'>-			 * but that can lead us to a deadlock with a concurrent</div><div class='del'>-			 * call to readahead (a buffered read or a defrag call</div><div class='del'>-			 * triggered a readahead) on a page lock due to an</div><div class='del'>-			 * ordered dio extent we created before but did not have</div><div class='del'>-			 * yet a corresponding bio submitted (whence it can not</div><div class='del'>-			 * complete), which makes readahead wait for that</div><div class='del'>-			 * ordered extent to complete while holding a lock on</div><div class='del'>-			 * that page.</div><div class='del'>-			 */</div><div class='del'>-			ret = nowait ? -EAGAIN : -ENOTBLK;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The callers of this must take lock_extent() */</div><div class='del'>-static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,</div><div class='del'>-				       u64 len, u64 orig_start, u64 block_start,</div><div class='del'>-				       u64 block_len, u64 orig_block_len,</div><div class='del'>-				       u64 ram_bytes, int compress_type,</div><div class='del'>-				       int type)</div><div class='add'>+struct extent_map *btrfs_create_io_em(struct btrfs_inode *inode, u64 start,</div><div class='add'>+				      const struct btrfs_file_extent *file_extent,</div><div class='add'>+				      int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Note the missing NOCOW type.</div><div class='add'>+	 *</div><div class='add'>+	 * For pure NOCOW writes, we should not create an io extent map, but</div><div class='add'>+	 * just reusing the existing one.</div><div class='add'>+	 * Only PREALLOC writes (NOCOW write into preallocated range) can</div><div class='add'>+	 * create an io extent map.</div><div class='add'>+	 */</div><div class='ctx'> 	ASSERT(type == BTRFS_ORDERED_PREALLOC ||</div><div class='ctx'> 	       type == BTRFS_ORDERED_COMPRESSED ||</div><div class='del'>-	       type == BTRFS_ORDERED_NOCOW ||</div><div class='ctx'> 	       type == BTRFS_ORDERED_REGULAR);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BTRFS_ORDERED_PREALLOC:</div><div class='add'>+		/* We're only referring part of a larger preallocated extent. */</div><div class='add'>+		ASSERT(file_extent-&gt;num_bytes &lt;= file_extent-&gt;ram_bytes);</div><div class='add'>+		break;</div><div class='add'>+	case BTRFS_ORDERED_REGULAR:</div><div class='add'>+		/* COW results a new extent matching our file extent size. */</div><div class='add'>+		ASSERT(file_extent-&gt;disk_num_bytes == file_extent-&gt;num_bytes);</div><div class='add'>+		ASSERT(file_extent-&gt;ram_bytes == file_extent-&gt;num_bytes);</div><div class='add'>+</div><div class='add'>+		/* Since it's a new extent, we should not have any offset. */</div><div class='add'>+		ASSERT(file_extent-&gt;offset == 0);</div><div class='add'>+		break;</div><div class='add'>+	case BTRFS_ORDERED_COMPRESSED:</div><div class='add'>+		/* Must be compressed. */</div><div class='add'>+		ASSERT(file_extent-&gt;compression != BTRFS_COMPRESS_NONE);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Encoded write can make us to refer to part of the</div><div class='add'>+		 * uncompressed extent.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(file_extent-&gt;num_bytes &lt;= file_extent-&gt;ram_bytes);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;start = start;</div><div class='del'>-	em-&gt;orig_start = orig_start;</div><div class='del'>-	em-&gt;len = len;</div><div class='del'>-	em-&gt;block_len = block_len;</div><div class='del'>-	em-&gt;block_start = block_start;</div><div class='del'>-	em-&gt;orig_block_len = orig_block_len;</div><div class='del'>-	em-&gt;ram_bytes = ram_bytes;</div><div class='add'>+	em-&gt;len = file_extent-&gt;num_bytes;</div><div class='add'>+	em-&gt;disk_bytenr = file_extent-&gt;disk_bytenr;</div><div class='add'>+	em-&gt;disk_num_bytes = file_extent-&gt;disk_num_bytes;</div><div class='add'>+	em-&gt;ram_bytes = file_extent-&gt;ram_bytes;</div><div class='ctx'> 	em-&gt;generation = -1;</div><div class='add'>+	em-&gt;offset = file_extent-&gt;offset;</div><div class='ctx'> 	em-&gt;flags |= EXTENT_FLAG_PINNED;</div><div class='del'>-	if (type == BTRFS_ORDERED_PREALLOC)</div><div class='del'>-		em-&gt;flags |= EXTENT_FLAG_FILLING;</div><div class='del'>-	else if (type == BTRFS_ORDERED_COMPRESSED)</div><div class='del'>-		extent_map_set_compression(em, compress_type);</div><div class='add'>+	if (type == BTRFS_ORDERED_COMPRESSED)</div><div class='add'>+		btrfs_extent_map_set_compression(em, file_extent-&gt;compression);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_replace_extent_map_range(inode, em, true);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* em got 2 refs now, callers needs to do free_extent_map once. */</div><div class='add'>+	/* em got 2 refs now, callers needs to do btrfs_free_extent_map once. */</div><div class='ctx'> 	return em;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int btrfs_get_blocks_direct_write(struct extent_map **map,</div><div class='del'>-					 struct inode *inode,</div><div class='del'>-					 struct btrfs_dio_data *dio_data,</div><div class='del'>-					 u64 start, u64 *lenp,</div><div class='del'>-					 unsigned int iomap_flags)</div><div class='del'>-{</div><div class='del'>-	const bool nowait = (iomap_flags &amp; IOMAP_NOWAIT);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct extent_map *em = *map;</div><div class='del'>-	int type;</div><div class='del'>-	u64 block_start, orig_start, orig_block_len, ram_bytes;</div><div class='del'>-	struct btrfs_block_group *bg;</div><div class='del'>-	bool can_nocow = false;</div><div class='del'>-	bool space_reserved = false;</div><div class='del'>-	u64 len = *lenp;</div><div class='del'>-	u64 prev_len;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't allocate a new extent in the following cases</div><div class='del'>-	 *</div><div class='del'>-	 * 1) The inode is marked as NODATACOW. In this case we'll just use the</div><div class='del'>-	 * existing extent.</div><div class='del'>-	 * 2) The extent is marked as PREALLOC. We're good to go here and can</div><div class='del'>-	 * just use the extent.</div><div class='del'>-	 *</div><div class='del'>-	 */</div><div class='del'>-	if ((em-&gt;flags &amp; EXTENT_FLAG_PREALLOC) ||</div><div class='del'>-	    ((BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_NODATACOW) &amp;&amp;</div><div class='del'>-	     em-&gt;block_start != EXTENT_MAP_HOLE)) {</div><div class='del'>-		if (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC)</div><div class='del'>-			type = BTRFS_ORDERED_PREALLOC;</div><div class='del'>-		else</div><div class='del'>-			type = BTRFS_ORDERED_NOCOW;</div><div class='del'>-		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='del'>-		block_start = em-&gt;block_start + (start - em-&gt;start);</div><div class='del'>-</div><div class='del'>-		if (can_nocow_extent(inode, start, &amp;len, &amp;orig_start,</div><div class='del'>-				     &amp;orig_block_len, &amp;ram_bytes, false, false) == 1) {</div><div class='del'>-			bg = btrfs_inc_nocow_writers(fs_info, block_start);</div><div class='del'>-			if (bg)</div><div class='del'>-				can_nocow = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prev_len = len;</div><div class='del'>-	if (can_nocow) {</div><div class='del'>-		struct extent_map *em2;</div><div class='del'>-</div><div class='del'>-		/* We can NOCOW, so only need to reserve metadata space. */</div><div class='del'>-		ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len, len,</div><div class='del'>-						      nowait);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			/* Our caller expects us to free the input extent map. */</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-			*map = NULL;</div><div class='del'>-			btrfs_dec_nocow_writers(bg);</div><div class='del'>-			if (nowait &amp;&amp; (ret == -ENOSPC || ret == -EDQUOT))</div><div class='del'>-				ret = -EAGAIN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		space_reserved = true;</div><div class='del'>-</div><div class='del'>-		em2 = btrfs_create_dio_extent(BTRFS_I(inode), dio_data, start, len,</div><div class='del'>-					      orig_start, block_start,</div><div class='del'>-					      len, orig_block_len,</div><div class='del'>-					      ram_bytes, type);</div><div class='del'>-		btrfs_dec_nocow_writers(bg);</div><div class='del'>-		if (type == BTRFS_ORDERED_PREALLOC) {</div><div class='del'>-			free_extent_map(em);</div><div class='del'>-			*map = em2;</div><div class='del'>-			em = em2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(em2)) {</div><div class='del'>-			ret = PTR_ERR(em2);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dio_data-&gt;nocow_done = true;</div><div class='del'>-	} else {</div><div class='del'>-		/* Our caller expects us to free the input extent map. */</div><div class='del'>-		free_extent_map(em);</div><div class='del'>-		*map = NULL;</div><div class='del'>-</div><div class='del'>-		if (nowait) {</div><div class='del'>-			ret = -EAGAIN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we could not allocate data space before locking the file</div><div class='del'>-		 * range and we can't do a NOCOW write, then we have to fail.</div><div class='del'>-		 */</div><div class='del'>-		if (!dio_data-&gt;data_space_reserved) {</div><div class='del'>-			ret = -ENOSPC;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We have to COW and we have already reserved data space before,</div><div class='del'>-		 * so now we reserve only metadata.</div><div class='del'>-		 */</div><div class='del'>-		ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len, len,</div><div class='del'>-						      false);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		space_reserved = true;</div><div class='del'>-</div><div class='del'>-		em = btrfs_new_extent_direct(BTRFS_I(inode), dio_data, start, len);</div><div class='del'>-		if (IS_ERR(em)) {</div><div class='del'>-			ret = PTR_ERR(em);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		*map = em;</div><div class='del'>-		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='del'>-		if (len &lt; prev_len)</div><div class='del'>-			btrfs_delalloc_release_metadata(BTRFS_I(inode),</div><div class='del'>-							prev_len - len, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have created our ordered extent, so we can now release our reservation</div><div class='del'>-	 * for an outstanding extent.</div><div class='del'>-	 */</div><div class='del'>-	btrfs_delalloc_release_extents(BTRFS_I(inode), prev_len);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Need to update the i_size under the extent lock so buffered</div><div class='del'>-	 * readers will get the updated i_size when we unlock.</div><div class='del'>-	 */</div><div class='del'>-	if (start + len &gt; i_size_read(inode))</div><div class='del'>-		i_size_write(inode, start + len);</div><div class='del'>-out:</div><div class='del'>-	if (ret &amp;&amp; space_reserved) {</div><div class='del'>-		btrfs_delalloc_release_extents(BTRFS_I(inode), len);</div><div class='del'>-		btrfs_delalloc_release_metadata(BTRFS_I(inode), len, true);</div><div class='del'>-	}</div><div class='del'>-	*lenp = len;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,</div><div class='del'>-		loff_t length, unsigned int flags, struct iomap *iomap,</div><div class='del'>-		struct iomap *srcmap)</div><div class='del'>-{</div><div class='del'>-	struct iomap_iter *iter = container_of(iomap, struct iomap_iter, iomap);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct extent_map *em;</div><div class='del'>-	struct extent_state *cached_state = NULL;</div><div class='del'>-	struct btrfs_dio_data *dio_data = iter-&gt;private;</div><div class='del'>-	u64 lockstart, lockend;</div><div class='del'>-	const bool write = !!(flags &amp; IOMAP_WRITE);</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 len = length;</div><div class='del'>-	const u64 data_alloc_len = length;</div><div class='del'>-	bool unlock_extents = false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We could potentially fault if we have a buffer &gt; PAGE_SIZE, and if</div><div class='del'>-	 * we're NOWAIT we may submit a bio for a partial range and return</div><div class='del'>-	 * EIOCBQUEUED, which would result in an errant short read.</div><div class='del'>-	 *</div><div class='del'>-	 * The best way to handle this would be to allow for partial completions</div><div class='del'>-	 * of iocb's, so we could submit the partial bio, return and fault in</div><div class='del'>-	 * the rest of the pages, and then submit the io for the rest of the</div><div class='del'>-	 * range.  However we don't have that currently, so simply return</div><div class='del'>-	 * -EAGAIN at this point so that the normal path is used.</div><div class='del'>-	 */</div><div class='del'>-	if (!write &amp;&amp; (flags &amp; IOMAP_NOWAIT) &amp;&amp; length &gt; PAGE_SIZE)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Cap the size of reads to that usually seen in buffered I/O as we need</div><div class='del'>-	 * to allocate a contiguous array for the checksums.</div><div class='del'>-	 */</div><div class='del'>-	if (!write)</div><div class='del'>-		len = min_t(u64, len, fs_info-&gt;sectorsize * BTRFS_MAX_BIO_SECTORS);</div><div class='del'>-</div><div class='del'>-	lockstart = start;</div><div class='del'>-	lockend = start + len - 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * iomap_dio_rw() only does filemap_write_and_wait_range(), which isn't</div><div class='del'>-	 * enough if we've written compressed pages to this area, so we need to</div><div class='del'>-	 * flush the dirty pages again to make absolutely sure that any</div><div class='del'>-	 * outstanding dirty pages are on disk - the first flush only starts</div><div class='del'>-	 * compression on the data, while keeping the pages locked, so by the</div><div class='del'>-	 * time the second flush returns we know bios for the compressed pages</div><div class='del'>-	 * were submitted and finished, and the pages no longer under writeback.</div><div class='del'>-	 *</div><div class='del'>-	 * If we have a NOWAIT request and we have any pages in the range that</div><div class='del'>-	 * are locked, likely due to compression still in progress, we don't want</div><div class='del'>-	 * to block on page locks. We also don't want to block on pages marked as</div><div class='del'>-	 * dirty or under writeback (same as for the non-compression case).</div><div class='del'>-	 * iomap_dio_rw() did the same check, but after that and before we got</div><div class='del'>-	 * here, mmap'ed writes may have happened or buffered reads started</div><div class='del'>-	 * (readpage() and readahead(), which lock pages), as we haven't locked</div><div class='del'>-	 * the file range yet.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,</div><div class='del'>-		     &amp;BTRFS_I(inode)-&gt;runtime_flags)) {</div><div class='del'>-		if (flags &amp; IOMAP_NOWAIT) {</div><div class='del'>-			if (filemap_range_needs_writeback(inode-&gt;i_mapping,</div><div class='del'>-							  lockstart, lockend))</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-		} else {</div><div class='del'>-			ret = filemap_fdatawrite_range(inode-&gt;i_mapping, start,</div><div class='del'>-						       start + length - 1);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(dio_data, 0, sizeof(*dio_data));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We always try to allocate data space and must do it before locking</div><div class='del'>-	 * the file range, to avoid deadlocks with concurrent writes to the same</div><div class='del'>-	 * range if the range has several extents and the writes don't expand the</div><div class='del'>-	 * current i_size (the inode lock is taken in shared mode). If we fail to</div><div class='del'>-	 * allocate data space here we continue and later, after locking the</div><div class='del'>-	 * file range, we fail with ENOSPC only if we figure out we can not do a</div><div class='del'>-	 * NOCOW write.</div><div class='del'>-	 */</div><div class='del'>-	if (write &amp;&amp; !(flags &amp; IOMAP_NOWAIT)) {</div><div class='del'>-		ret = btrfs_check_data_free_space(BTRFS_I(inode),</div><div class='del'>-						  &amp;dio_data-&gt;data_reserved,</div><div class='del'>-						  start, data_alloc_len, false);</div><div class='del'>-		if (!ret)</div><div class='del'>-			dio_data-&gt;data_space_reserved = true;</div><div class='del'>-		else if (ret &amp;&amp; !(BTRFS_I(inode)-&gt;flags &amp;</div><div class='del'>-				  (BTRFS_INODE_NODATACOW | BTRFS_INODE_PREALLOC)))</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If this errors out it's because we couldn't invalidate pagecache for</div><div class='del'>-	 * this range and we need to fallback to buffered IO, or we are doing a</div><div class='del'>-	 * NOWAIT read/write and we need to block.</div><div class='del'>-	 */</div><div class='del'>-	ret = lock_extent_direct(inode, lockstart, lockend, &amp;cached_state, flags);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, start, len);</div><div class='del'>-	if (IS_ERR(em)) {</div><div class='del'>-		ret = PTR_ERR(em);</div><div class='del'>-		goto unlock_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ok for INLINE and COMPRESSED extents we need to fallback on buffered</div><div class='del'>-	 * io.  INLINE is special, and we could probably kludge it in here, but</div><div class='del'>-	 * it's still buffered so for safety lets just fall back to the generic</div><div class='del'>-	 * buffered path.</div><div class='del'>-	 *</div><div class='del'>-	 * For COMPRESSED we _have_ to read the entire extent in so we can</div><div class='del'>-	 * decompress it, so there will be buffering required no matter what we</div><div class='del'>-	 * do, so go ahead and fallback to buffered.</div><div class='del'>-	 *</div><div class='del'>-	 * We return -ENOTBLK because that's what makes DIO go ahead and go back</div><div class='del'>-	 * to buffered IO.  Don't blame me, this is the price we pay for using</div><div class='del'>-	 * the generic code.</div><div class='del'>-	 */</div><div class='del'>-	if (extent_map_is_compressed(em) ||</div><div class='del'>-	    em-&gt;block_start == EXTENT_MAP_INLINE) {</div><div class='del'>-		free_extent_map(em);</div><div class='del'>-		/*</div><div class='del'>-		 * If we are in a NOWAIT context, return -EAGAIN in order to</div><div class='del'>-		 * fallback to buffered IO. This is not only because we can</div><div class='del'>-		 * block with buffered IO (no support for NOWAIT semantics at</div><div class='del'>-		 * the moment) but also to avoid returning short reads to user</div><div class='del'>-		 * space - this happens if we were able to read some data from</div><div class='del'>-		 * previous non-compressed extents and then when we fallback to</div><div class='del'>-		 * buffered IO, at btrfs_file_read_iter() by calling</div><div class='del'>-		 * filemap_read(), we fail to fault in pages for the read buffer,</div><div class='del'>-		 * in which case filemap_read() returns a short read (the number</div><div class='del'>-		 * of bytes previously read is &gt; 0, so it does not return -EFAULT).</div><div class='del'>-		 */</div><div class='del'>-		ret = (flags &amp; IOMAP_NOWAIT) ? -EAGAIN : -ENOTBLK;</div><div class='del'>-		goto unlock_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we have a NOWAIT request and the range contains multiple extents</div><div class='del'>-	 * (or a mix of extents and holes), then we return -EAGAIN to make the</div><div class='del'>-	 * caller fallback to a context where it can do a blocking (without</div><div class='del'>-	 * NOWAIT) request. This way we avoid doing partial IO and returning</div><div class='del'>-	 * success to the caller, which is not optimal for writes and for reads</div><div class='del'>-	 * it can result in unexpected behaviour for an application.</div><div class='del'>-	 *</div><div class='del'>-	 * When doing a read, because we use IOMAP_DIO_PARTIAL when calling</div><div class='del'>-	 * iomap_dio_rw(), we can end up returning less data then what the caller</div><div class='del'>-	 * asked for, resulting in an unexpected, and incorrect, short read.</div><div class='del'>-	 * That is, the caller asked to read N bytes and we return less than that,</div><div class='del'>-	 * which is wrong unless we are crossing EOF. This happens if we get a</div><div class='del'>-	 * page fault error when trying to fault in pages for the buffer that is</div><div class='del'>-	 * associated to the struct iov_iter passed to iomap_dio_rw(), and we</div><div class='del'>-	 * have previously submitted bios for other extents in the range, in</div><div class='del'>-	 * which case iomap_dio_rw() may return us EIOCBQUEUED if not all of</div><div class='del'>-	 * those bios have completed by the time we get the page fault error,</div><div class='del'>-	 * which we return back to our caller - we should only return EIOCBQUEUED</div><div class='del'>-	 * after we have submitted bios for all the extents in the range.</div><div class='del'>-	 */</div><div class='del'>-	if ((flags &amp; IOMAP_NOWAIT) &amp;&amp; len &lt; length) {</div><div class='del'>-		free_extent_map(em);</div><div class='del'>-		ret = -EAGAIN;</div><div class='del'>-		goto unlock_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write) {</div><div class='del'>-		ret = btrfs_get_blocks_direct_write(&amp;em, inode, dio_data,</div><div class='del'>-						    start, &amp;len, flags);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto unlock_err;</div><div class='del'>-		unlock_extents = true;</div><div class='del'>-		/* Recalc len in case the new em is smaller than requested */</div><div class='del'>-		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='del'>-		if (dio_data-&gt;data_space_reserved) {</div><div class='del'>-			u64 release_offset;</div><div class='del'>-			u64 release_len = 0;</div><div class='del'>-</div><div class='del'>-			if (dio_data-&gt;nocow_done) {</div><div class='del'>-				release_offset = start;</div><div class='del'>-				release_len = data_alloc_len;</div><div class='del'>-			} else if (len &lt; data_alloc_len) {</div><div class='del'>-				release_offset = start + len;</div><div class='del'>-				release_len = data_alloc_len - len;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (release_len &gt; 0)</div><div class='del'>-				btrfs_free_reserved_data_space(BTRFS_I(inode),</div><div class='del'>-							       dio_data-&gt;data_reserved,</div><div class='del'>-							       release_offset,</div><div class='del'>-							       release_len);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * We need to unlock only the end area that we aren't using.</div><div class='del'>-		 * The rest is going to be unlocked by the endio routine.</div><div class='del'>-		 */</div><div class='del'>-		lockstart = start + len;</div><div class='del'>-		if (lockstart &lt; lockend)</div><div class='del'>-			unlock_extents = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlock_extents)</div><div class='del'>-		unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='del'>-			      &amp;cached_state);</div><div class='del'>-	else</div><div class='del'>-		free_extent_state(cached_state);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Translate extent map information to iomap.</div><div class='del'>-	 * We trim the extents (and move the addr) even though iomap code does</div><div class='del'>-	 * that, since we have locked only the parts we are performing I/O in.</div><div class='del'>-	 */</div><div class='del'>-	if ((em-&gt;block_start == EXTENT_MAP_HOLE) ||</div><div class='del'>-	    ((em-&gt;flags &amp; EXTENT_FLAG_PREALLOC) &amp;&amp; !write)) {</div><div class='del'>-		iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='del'>-		iomap-&gt;type = IOMAP_HOLE;</div><div class='del'>-	} else {</div><div class='del'>-		iomap-&gt;addr = em-&gt;block_start + (start - em-&gt;start);</div><div class='del'>-		iomap-&gt;type = IOMAP_MAPPED;</div><div class='del'>-	}</div><div class='del'>-	iomap-&gt;offset = start;</div><div class='del'>-	iomap-&gt;bdev = fs_info-&gt;fs_devices-&gt;latest_dev-&gt;bdev;</div><div class='del'>-	iomap-&gt;length = len;</div><div class='del'>-	free_extent_map(em);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unlock_err:</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, lockstart, lockend,</div><div class='del'>-		      &amp;cached_state);</div><div class='del'>-err:</div><div class='del'>-	if (dio_data-&gt;data_space_reserved) {</div><div class='del'>-		btrfs_free_reserved_data_space(BTRFS_I(inode),</div><div class='del'>-					       dio_data-&gt;data_reserved,</div><div class='del'>-					       start, data_alloc_len);</div><div class='del'>-		extent_changeset_free(dio_data-&gt;data_reserved);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btrfs_dio_iomap_end(struct inode *inode, loff_t pos, loff_t length,</div><div class='del'>-		ssize_t written, unsigned int flags, struct iomap *iomap)</div><div class='del'>-{</div><div class='del'>-	struct iomap_iter *iter = container_of(iomap, struct iomap_iter, iomap);</div><div class='del'>-	struct btrfs_dio_data *dio_data = iter-&gt;private;</div><div class='del'>-	size_t submitted = dio_data-&gt;submitted;</div><div class='del'>-	const bool write = !!(flags &amp; IOMAP_WRITE);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!write &amp;&amp; (iomap-&gt;type == IOMAP_HOLE)) {</div><div class='del'>-		/* If reading from a hole, unlock and return */</div><div class='del'>-		unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, pos, pos + length - 1,</div><div class='del'>-			      NULL);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (submitted &lt; length) {</div><div class='del'>-		pos += submitted;</div><div class='del'>-		length -= submitted;</div><div class='del'>-		if (write)</div><div class='del'>-			btrfs_finish_ordered_extent(dio_data-&gt;ordered, NULL,</div><div class='del'>-						    pos, length, false);</div><div class='del'>-		else</div><div class='del'>-			unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, pos,</div><div class='del'>-				      pos + length - 1, NULL);</div><div class='del'>-		ret = -ENOTBLK;</div><div class='del'>-	}</div><div class='del'>-	if (write) {</div><div class='del'>-		btrfs_put_ordered_extent(dio_data-&gt;ordered);</div><div class='del'>-		dio_data-&gt;ordered = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (write)</div><div class='del'>-		extent_changeset_free(dio_data-&gt;data_reserved);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btrfs_dio_end_io(struct btrfs_bio *bbio)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_dio_private *dip =</div><div class='del'>-		container_of(bbio, struct btrfs_dio_private, bbio);</div><div class='del'>-	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='del'>-	struct bio *bio = &amp;bbio-&gt;bio;</div><div class='del'>-</div><div class='del'>-	if (bio-&gt;bi_status) {</div><div class='del'>-		btrfs_warn(inode-&gt;root-&gt;fs_info,</div><div class='del'>-		"direct IO failed ino %llu op 0x%0x offset %#llx len %u err no %d",</div><div class='del'>-			   btrfs_ino(inode), bio-&gt;bi_opf,</div><div class='del'>-			   dip-&gt;file_offset, dip-&gt;bytes, bio-&gt;bi_status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btrfs_op(bio) == BTRFS_MAP_WRITE) {</div><div class='del'>-		btrfs_finish_ordered_extent(bbio-&gt;ordered, NULL,</div><div class='del'>-					    dip-&gt;file_offset, dip-&gt;bytes,</div><div class='del'>-					    !bio-&gt;bi_status);</div><div class='del'>-	} else {</div><div class='del'>-		unlock_extent(&amp;inode-&gt;io_tree, dip-&gt;file_offset,</div><div class='del'>-			      dip-&gt;file_offset + dip-&gt;bytes - 1, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bbio-&gt;bio.bi_private = bbio-&gt;private;</div><div class='del'>-	iomap_dio_bio_end_io(bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio,</div><div class='del'>-				loff_t file_offset)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_bio *bbio = btrfs_bio(bio);</div><div class='del'>-	struct btrfs_dio_private *dip =</div><div class='del'>-		container_of(bbio, struct btrfs_dio_private, bbio);</div><div class='del'>-	struct btrfs_dio_data *dio_data = iter-&gt;private;</div><div class='del'>-</div><div class='del'>-	btrfs_bio_init(bbio, BTRFS_I(iter-&gt;inode)-&gt;root-&gt;fs_info,</div><div class='del'>-		       btrfs_dio_end_io, bio-&gt;bi_private);</div><div class='del'>-	bbio-&gt;inode = BTRFS_I(iter-&gt;inode);</div><div class='del'>-	bbio-&gt;file_offset = file_offset;</div><div class='del'>-</div><div class='del'>-	dip-&gt;file_offset = file_offset;</div><div class='del'>-	dip-&gt;bytes = bio-&gt;bi_iter.bi_size;</div><div class='del'>-</div><div class='del'>-	dio_data-&gt;submitted += bio-&gt;bi_iter.bi_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if we are doing a partial write.  If we are, we need to split</div><div class='del'>-	 * the ordered extent to match the submitted bio.  Hang on to the</div><div class='del'>-	 * remaining unfinishable ordered_extent in dio_data so that it can be</div><div class='del'>-	 * cancelled in iomap_end to avoid a deadlock wherein faulting the</div><div class='del'>-	 * remaining pages is blocked on the outstanding ordered extent.</div><div class='del'>-	 */</div><div class='del'>-	if (iter-&gt;flags &amp; IOMAP_WRITE) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		ret = btrfs_extract_ordered_extent(bbio, dio_data-&gt;ordered);</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_finish_ordered_extent(dio_data-&gt;ordered, NULL,</div><div class='del'>-						    file_offset, dip-&gt;bytes,</div><div class='del'>-						    !ret);</div><div class='del'>-			bio-&gt;bi_status = errno_to_blk_status(ret);</div><div class='del'>-			iomap_dio_bio_end_io(bio);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	btrfs_submit_bio(bbio, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct iomap_ops btrfs_dio_iomap_ops = {</div><div class='del'>-	.iomap_begin            = btrfs_dio_iomap_begin,</div><div class='del'>-	.iomap_end              = btrfs_dio_iomap_end,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iomap_dio_ops btrfs_dio_ops = {</div><div class='del'>-	.submit_io		= btrfs_dio_submit_io,</div><div class='del'>-	.bio_set		= &amp;btrfs_dio_bioset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ssize_t btrfs_dio_read(struct kiocb *iocb, struct iov_iter *iter, size_t done_before)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_dio_data data = { 0 };</div><div class='del'>-</div><div class='del'>-	return iomap_dio_rw(iocb, iter, &amp;btrfs_dio_iomap_ops, &amp;btrfs_dio_ops,</div><div class='del'>-			    IOMAP_DIO_PARTIAL, &amp;data, done_before);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct iomap_dio *btrfs_dio_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='del'>-				  size_t done_before)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_dio_data data = { 0 };</div><div class='del'>-</div><div class='del'>-	return __iomap_dio_rw(iocb, iter, &amp;btrfs_dio_iomap_ops, &amp;btrfs_dio_ops,</div><div class='del'>-			    IOMAP_DIO_PARTIAL, &amp;data, done_before);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='del'>-			u64 start, u64 len)</div><div class='del'>-{</div><div class='del'>-	int	ret;</div><div class='del'>-</div><div class='del'>-	ret = fiemap_prep(inode, fieinfo, start, &amp;len, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * fiemap_prep() called filemap_write_and_wait() for the whole possible</div><div class='del'>-	 * file range (0 to LLONG_MAX), but that is not enough if we have</div><div class='del'>-	 * compression enabled. The first filemap_fdatawrite_range() only kicks</div><div class='del'>-	 * in the compression of data (in an async thread) and will return</div><div class='del'>-	 * before the compression is done and writeback is started. A second</div><div class='del'>-	 * filemap_fdatawrite_range() is needed to wait for the compression to</div><div class='del'>-	 * complete and writeback to start. We also need to wait for ordered</div><div class='del'>-	 * extents to complete, because our fiemap implementation uses mainly</div><div class='del'>-	 * file extent items to list the extents, searching for extent maps</div><div class='del'>-	 * only for file ranges with holes or prealloc extents to figure out</div><div class='del'>-	 * if we have delalloc in those ranges.</div><div class='del'>-	 */</div><div class='del'>-	if (fieinfo-&gt;fi_flags &amp; FIEMAP_FLAG_SYNC) {</div><div class='del'>-		ret = btrfs_wait_ordered_range(inode, 0, LLONG_MAX);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return extent_fiemap(BTRFS_I(inode), fieinfo, start, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btrfs_writepages(struct address_space *mapping,</div><div class='del'>-			    struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	return extent_writepages(mapping, wbc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btrfs_readahead(struct readahead_control *rac)</div><div class='del'>-{</div><div class='del'>-	extent_readahead(rac);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * For release_folio() and invalidate_folio() we have a race window where</div><div class='ctx'>  * folio_end_writeback() is called but the subpage spinlock is not yet released.</div><div class='hunk'>@@ -7862,17 +7455,16 @@ static void btrfs_readahead(struct readahead_control *rac)</div><div class='ctx'>  * for subpage spinlock.  So this function is to spin and wait for subpage</div><div class='ctx'>  * spinlock.</div><div class='ctx'>  */</div><div class='del'>-static void wait_subpage_spinlock(struct page *page)</div><div class='add'>+static void wait_subpage_spinlock(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(page-&gt;mapping-&gt;host-&gt;i_sb);</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_is_subpage(fs_info, page-&gt;mapping))</div><div class='add'>+	if (!btrfs_is_subpage(fs_info, folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(folio_test_private(folio) &amp;&amp; folio_get_private(folio));</div><div class='del'>-	subpage = folio_get_private(folio);</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This may look insane as we just acquire the spinlock and release it,</div><div class='hunk'>@@ -7885,19 +7477,24 @@ static void wait_subpage_spinlock(struct page *page)</div><div class='ctx'> 	 * Here we just acquire the spinlock so that all existing callers</div><div class='ctx'> 	 * should exit and we're safe to release/invalidate the page.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irq(&amp;subpage-&gt;lock);</div><div class='del'>-	spin_unlock_irq(&amp;subpage-&gt;lock);</div><div class='add'>+	spin_lock_irq(&amp;bfs-&gt;lock);</div><div class='add'>+	spin_unlock_irq(&amp;bfs-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __btrfs_release_folio(struct folio *folio, gfp_t gfp_flags)</div><div class='add'>+static int btrfs_launder_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	int ret = try_release_extent_mapping(&amp;folio-&gt;page, gfp_flags);</div><div class='add'>+	return btrfs_qgroup_free_data(folio_to_inode(folio), NULL, folio_pos(folio),</div><div class='add'>+				      folio_size(folio), NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (ret == 1) {</div><div class='del'>-		wait_subpage_spinlock(&amp;folio-&gt;page);</div><div class='del'>-		clear_page_extent_mapped(&amp;folio-&gt;page);</div><div class='add'>+static bool __btrfs_release_folio(struct folio *folio, gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	if (try_release_extent_mapping(folio, gfp_flags)) {</div><div class='add'>+		wait_subpage_spinlock(folio);</div><div class='add'>+		clear_folio_extent_mapped(folio);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool btrfs_release_folio(struct folio *folio, gfp_t gfp_flags)</div><div class='hunk'>@@ -7914,7 +7511,7 @@ static int btrfs_migrate_folio(struct address_space *mapping,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = filemap_migrate_folio(mapping, dst, src, mode);</div><div class='ctx'> </div><div class='del'>-	if (ret != MIGRATEPAGE_SUCCESS)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_ordered(src)) {</div><div class='hunk'>@@ -7922,7 +7519,7 @@ static int btrfs_migrate_folio(struct address_space *mapping,</div><div class='ctx'> 		folio_set_ordered(dst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return MIGRATEPAGE_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define btrfs_migrate_folio NULL</div><div class='hunk'>@@ -7931,14 +7528,14 @@ static int btrfs_migrate_folio(struct address_space *mapping,</div><div class='ctx'> static void btrfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 				 size_t length)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(folio-&gt;mapping-&gt;host);</div><div class='add'>+	struct btrfs_inode *inode = folio_to_inode(folio);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct extent_io_tree *tree = &amp;inode-&gt;io_tree;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 page_start = folio_pos(folio);</div><div class='ctx'> 	u64 page_end = page_start + folio_size(folio) - 1;</div><div class='ctx'> 	u64 cur;</div><div class='del'>-	int inode_evicting = inode-&gt;vfs_inode.i_state &amp; I_FREEING;</div><div class='add'>+	int inode_evicting = inode_state_read_once(&amp;inode-&gt;vfs_inode) &amp; I_FREEING;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have folio locked so no new ordered extent can be created on this</div><div class='hunk'>@@ -7946,7 +7543,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * But already submitted bio can still be finished on this folio.</div><div class='ctx'> 	 * Furthermore, endio function won't skip folio which has Ordered</div><div class='del'>-	 * (Private2) already cleared, so it's possible for endio and</div><div class='add'>+	 * already cleared, so it's possible for endio and</div><div class='ctx'> 	 * invalidate_folio to do the same ordered extent accounting twice</div><div class='ctx'> 	 * on one folio.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -7954,7 +7551,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 	 * do double ordered extent accounting on the same folio.</div><div class='ctx'> 	 */</div><div class='ctx'> 	folio_wait_writeback(folio);</div><div class='del'>-	wait_subpage_spinlock(&amp;folio-&gt;page);</div><div class='add'>+	wait_subpage_spinlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For subpage case, we have call sites like</div><div class='hunk'>@@ -7974,7 +7571,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_evicting)</div><div class='del'>-		lock_extent(tree, page_start, page_end, &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(tree, page_start, page_end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	cur = page_start;</div><div class='ctx'> 	while (cur &lt; page_end) {</div><div class='hunk'>@@ -8012,7 +7609,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 		range_len = range_end + 1 - cur;</div><div class='ctx'> 		if (!btrfs_folio_test_ordered(fs_info, folio, cur, range_len)) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * If Ordered (Private2) is cleared, it means endio has</div><div class='add'>+			 * If Ordered is cleared, it means endio has</div><div class='ctx'> 			 * already been executed for the range.</div><div class='ctx'> 			 * We can't delete the extent states as</div><div class='ctx'> 			 * btrfs_finish_ordered_io() may still use some of them.</div><div class='hunk'>@@ -8030,16 +7627,16 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 		 * btrfs_finish_ordered_io().</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!inode_evicting)</div><div class='del'>-			clear_extent_bit(tree, cur, range_end,</div><div class='del'>-					 EXTENT_DELALLOC |</div><div class='del'>-					 EXTENT_LOCKED | EXTENT_DO_ACCOUNTING |</div><div class='del'>-					 EXTENT_DEFRAG, &amp;cached_state);</div><div class='add'>+			btrfs_clear_extent_bit(tree, cur, range_end,</div><div class='add'>+					       EXTENT_DELALLOC |</div><div class='add'>+					       EXTENT_LOCKED | EXTENT_DO_ACCOUNTING |</div><div class='add'>+					       EXTENT_DEFRAG, &amp;cached_state);</div><div class='ctx'> </div><div class='del'>-		spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+		spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 		set_bit(BTRFS_ORDERED_TRUNCATED, &amp;ordered-&gt;flags);</div><div class='ctx'> 		ordered-&gt;truncated_len = min(ordered-&gt;truncated_len,</div><div class='ctx'> 					     cur - ordered-&gt;file_offset);</div><div class='del'>-		spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+		spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the ordered extent has finished, we're safe to delete all</div><div class='hunk'>@@ -8075,191 +7672,23 @@ next:</div><div class='ctx'> 		 *    Since the IO will never happen for this page.</div><div class='ctx'> 		 */</div><div class='ctx'> 		btrfs_qgroup_free_data(inode, NULL, cur, range_end + 1 - cur, NULL);</div><div class='del'>-		if (!inode_evicting) {</div><div class='del'>-			clear_extent_bit(tree, cur, range_end, EXTENT_LOCKED |</div><div class='del'>-				 EXTENT_DELALLOC | EXTENT_UPTODATE |</div><div class='del'>-				 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG |</div><div class='del'>-				 extra_flags, &amp;cached_state);</div><div class='del'>-		}</div><div class='add'>+		if (!inode_evicting)</div><div class='add'>+			btrfs_clear_extent_bit(tree, cur, range_end, EXTENT_LOCKED |</div><div class='add'>+					       EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |</div><div class='add'>+					       EXTENT_DEFRAG | extra_flags,</div><div class='add'>+					       &amp;cached_state);</div><div class='ctx'> 		cur = range_end + 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have iterated through all ordered extents of the page, the page</div><div class='del'>-	 * should not have Ordered (Private2) anymore, or the above iteration</div><div class='add'>+	 * should not have Ordered anymore, or the above iteration</div><div class='ctx'> 	 * did something wrong.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(!folio_test_ordered(folio));</div><div class='ctx'> 	btrfs_folio_clear_checked(fs_info, folio, folio_pos(folio), folio_size(folio));</div><div class='ctx'> 	if (!inode_evicting)</div><div class='ctx'> 		__btrfs_release_folio(folio, GFP_NOFS);</div><div class='del'>-	clear_page_extent_mapped(&amp;folio-&gt;page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * btrfs_page_mkwrite() is not allowed to change the file size as it gets</div><div class='del'>- * called from a page fault handler when a page is first dirtied. Hence we must</div><div class='del'>- * be careful to check for EOF conditions here. We set the page up correctly</div><div class='del'>- * for a written page which means we get ENOSPC checking when writing into</div><div class='del'>- * holes and correct delalloc and unwritten extent mapping on filesystems that</div><div class='del'>- * support these features.</div><div class='del'>- *</div><div class='del'>- * We are not allowed to take the i_mutex here so we have to play games to</div><div class='del'>- * protect against truncate races as the page could now be beyond EOF.  Because</div><div class='del'>- * truncate_setsize() writes the inode size before removing pages, once we have</div><div class='del'>- * the page lock we can determine safely if the page is beyond EOF. If it is not</div><div class='del'>- * beyond EOF, then the page is guaranteed safe against truncation until we</div><div class='del'>- * unlock the page.</div><div class='del'>- */</div><div class='del'>-vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)</div><div class='del'>-{</div><div class='del'>-	struct page *page = vmf-&gt;page;</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct extent_io_tree *io_tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='del'>-	struct btrfs_ordered_extent *ordered;</div><div class='del'>-	struct extent_state *cached_state = NULL;</div><div class='del'>-	struct extent_changeset *data_reserved = NULL;</div><div class='del'>-	unsigned long zero_start;</div><div class='del'>-	loff_t size;</div><div class='del'>-	vm_fault_t ret;</div><div class='del'>-	int ret2;</div><div class='del'>-	int reserved = 0;</div><div class='del'>-	u64 reserved_space;</div><div class='del'>-	u64 page_start;</div><div class='del'>-	u64 page_end;</div><div class='del'>-	u64 end;</div><div class='del'>-</div><div class='del'>-	ASSERT(folio_order(folio) == 0);</div><div class='del'>-</div><div class='del'>-	reserved_space = PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-	sb_start_pagefault(inode-&gt;i_sb);</div><div class='del'>-	page_start = page_offset(page);</div><div class='del'>-	page_end = page_start + PAGE_SIZE - 1;</div><div class='del'>-	end = page_end;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reserving delalloc space after obtaining the page lock can lead to</div><div class='del'>-	 * deadlock. For example, if a dirty page is locked by this function</div><div class='del'>-	 * and the call to btrfs_delalloc_reserve_space() ends up triggering</div><div class='del'>-	 * dirty page write out, then the btrfs_writepages() function could</div><div class='del'>-	 * end up waiting indefinitely to get a lock on the page currently</div><div class='del'>-	 * being processed by btrfs_page_mkwrite() function.</div><div class='del'>-	 */</div><div class='del'>-	ret2 = btrfs_delalloc_reserve_space(BTRFS_I(inode), &amp;data_reserved,</div><div class='del'>-					    page_start, reserved_space);</div><div class='del'>-	if (!ret2) {</div><div class='del'>-		ret2 = file_update_time(vmf-&gt;vma-&gt;vm_file);</div><div class='del'>-		reserved = 1;</div><div class='del'>-	}</div><div class='del'>-	if (ret2) {</div><div class='del'>-		ret = vmf_error(ret2);</div><div class='del'>-		if (reserved)</div><div class='del'>-			goto out;</div><div class='del'>-		goto out_noreserve;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */</div><div class='del'>-again:</div><div class='del'>-	down_read(&amp;BTRFS_I(inode)-&gt;i_mmap_lock);</div><div class='del'>-	lock_page(page);</div><div class='del'>-	size = i_size_read(inode);</div><div class='del'>-</div><div class='del'>-	if ((page-&gt;mapping != inode-&gt;i_mapping) ||</div><div class='del'>-	    (page_start &gt;= size)) {</div><div class='del'>-		/* page got truncated out from underneath us */</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-	wait_on_page_writeback(page);</div><div class='del'>-</div><div class='del'>-	lock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='del'>-	ret2 = set_page_extent_mapped(page);</div><div class='del'>-	if (ret2 &lt; 0) {</div><div class='del'>-		ret = vmf_error(ret2);</div><div class='del'>-		unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we can't set the delalloc bits if there are pending ordered</div><div class='del'>-	 * extents.  Drop our locks and wait for them to finish</div><div class='del'>-	 */</div><div class='del'>-	ordered = btrfs_lookup_ordered_range(BTRFS_I(inode), page_start,</div><div class='del'>-			PAGE_SIZE);</div><div class='del'>-	if (ordered) {</div><div class='del'>-		unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		up_read(&amp;BTRFS_I(inode)-&gt;i_mmap_lock);</div><div class='del'>-		btrfs_start_ordered_extent(ordered);</div><div class='del'>-		btrfs_put_ordered_extent(ordered);</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (page-&gt;index == ((size - 1) &gt;&gt; PAGE_SHIFT)) {</div><div class='del'>-		reserved_space = round_up(size - page_start,</div><div class='del'>-					  fs_info-&gt;sectorsize);</div><div class='del'>-		if (reserved_space &lt; PAGE_SIZE) {</div><div class='del'>-			end = page_start + reserved_space - 1;</div><div class='del'>-			btrfs_delalloc_release_space(BTRFS_I(inode),</div><div class='del'>-					data_reserved, page_start,</div><div class='del'>-					PAGE_SIZE - reserved_space, true);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * page_mkwrite gets called when the page is firstly dirtied after it's</div><div class='del'>-	 * faulted in, but write(2) could also dirty a page and set delalloc</div><div class='del'>-	 * bits, thus in this case for space account reason, we still need to</div><div class='del'>-	 * clear any delalloc bits within this page range since we have to</div><div class='del'>-	 * reserve data&amp;meta space before lock_page() (see above comments).</div><div class='del'>-	 */</div><div class='del'>-	clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, page_start, end,</div><div class='del'>-			  EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |</div><div class='del'>-			  EXTENT_DEFRAG, &amp;cached_state);</div><div class='del'>-</div><div class='del'>-	ret2 = btrfs_set_extent_delalloc(BTRFS_I(inode), page_start, end, 0,</div><div class='del'>-					&amp;cached_state);</div><div class='del'>-	if (ret2) {</div><div class='del'>-		unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='del'>-		ret = VM_FAULT_SIGBUS;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* page is wholly or partially inside EOF */</div><div class='del'>-	if (page_start + PAGE_SIZE &gt; size)</div><div class='del'>-		zero_start = offset_in_page(size);</div><div class='del'>-	else</div><div class='del'>-		zero_start = PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-	if (zero_start != PAGE_SIZE)</div><div class='del'>-		memzero_page(page, zero_start, PAGE_SIZE - zero_start);</div><div class='del'>-</div><div class='del'>-	btrfs_folio_clear_checked(fs_info, folio, page_start, PAGE_SIZE);</div><div class='del'>-	btrfs_folio_set_dirty(fs_info, folio, page_start, end + 1 - page_start);</div><div class='del'>-	btrfs_folio_set_uptodate(fs_info, folio, page_start, end + 1 - page_start);</div><div class='del'>-</div><div class='del'>-	btrfs_set_inode_last_sub_trans(BTRFS_I(inode));</div><div class='del'>-</div><div class='del'>-	unlock_extent(io_tree, page_start, page_end, &amp;cached_state);</div><div class='del'>-	up_read(&amp;BTRFS_I(inode)-&gt;i_mmap_lock);</div><div class='del'>-</div><div class='del'>-	btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);</div><div class='del'>-	sb_end_pagefault(inode-&gt;i_sb);</div><div class='del'>-	extent_changeset_free(data_reserved);</div><div class='del'>-	return VM_FAULT_LOCKED;</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	up_read(&amp;BTRFS_I(inode)-&gt;i_mmap_lock);</div><div class='del'>-out:</div><div class='del'>-	btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);</div><div class='del'>-	btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved, page_start,</div><div class='del'>-				     reserved_space, (ret != 0));</div><div class='del'>-out_noreserve:</div><div class='del'>-	sb_end_pagefault(inode-&gt;i_sb);</div><div class='del'>-	extent_changeset_free(data_reserved);</div><div class='del'>-	return ret;</div><div class='add'>+	clear_folio_extent_mapped(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='hunk'>@@ -8269,19 +7698,22 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 		.ino = btrfs_ino(inode),</div><div class='ctx'> 		.min_type = BTRFS_EXTENT_DATA_KEY,</div><div class='ctx'> 		.clear_extent_range = true,</div><div class='add'>+		.new_size = inode-&gt;vfs_inode.i_size,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_block_rsv *rsv;</div><div class='add'>+	struct btrfs_block_rsv rsv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	u64 mask = fs_info-&gt;sectorsize - 1;</div><div class='ctx'> 	const u64 min_size = btrfs_calc_metadata_size(fs_info, 1);</div><div class='add'>+	const u64 lock_start = round_down(inode-&gt;vfs_inode.i_size, fs_info-&gt;sectorsize);</div><div class='add'>+	const u64 i_size_up = round_up(inode-&gt;vfs_inode.i_size, fs_info-&gt;sectorsize);</div><div class='add'>+</div><div class='add'>+	/* Our inode is locked and the i_size can't be changed concurrently. */</div><div class='add'>+	btrfs_assert_inode_locked(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (!skip_writeback) {</div><div class='del'>-		ret = btrfs_wait_ordered_range(&amp;inode-&gt;vfs_inode,</div><div class='del'>-					       inode-&gt;vfs_inode.i_size &amp; (~mask),</div><div class='del'>-					       (u64)-1);</div><div class='add'>+		ret = btrfs_wait_ordered_range(inode, lock_start, (u64)-1);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8314,11 +7746,9 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 	 * 2) fs_info-&gt;trans_block_rsv - this will have 1 items worth left for</div><div class='ctx'> 	 * updating the inode.</div><div class='ctx'> 	 */</div><div class='del'>-	rsv = btrfs_alloc_block_rsv(fs_info, BTRFS_BLOCK_RSV_TEMP);</div><div class='del'>-	if (!rsv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	rsv-&gt;size = min_size;</div><div class='del'>-	rsv-&gt;failfast = true;</div><div class='add'>+	btrfs_init_metadata_block_rsv(fs_info, &amp;rsv, BTRFS_BLOCK_RSV_TEMP);</div><div class='add'>+	rsv.size = min_size;</div><div class='add'>+	rsv.failfast = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1 for the truncate slack space</div><div class='hunk'>@@ -8331,7 +7761,7 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Migrate the slack space for the truncate to our reserve */</div><div class='del'>-	ret = btrfs_block_rsv_migrate(&amp;fs_info-&gt;trans_block_rsv, rsv,</div><div class='add'>+	ret = btrfs_block_rsv_migrate(&amp;fs_info-&gt;trans_block_rsv, &amp;rsv,</div><div class='ctx'> 				      min_size, false);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have reserved 2 metadata units when we started the transaction and</div><div class='hunk'>@@ -8343,30 +7773,25 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trans-&gt;block_rsv = rsv;</div><div class='add'>+	trans-&gt;block_rsv = &amp;rsv;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct extent_state *cached_state = NULL;</div><div class='del'>-		const u64 new_size = inode-&gt;vfs_inode.i_size;</div><div class='del'>-		const u64 lock_start = ALIGN_DOWN(new_size, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='del'>-		control.new_size = new_size;</div><div class='del'>-		lock_extent(&amp;inode-&gt;io_tree, lock_start, (u64)-1, &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, lock_start, (u64)-1, &amp;cached_state);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We want to drop from the next block forward in case this new</div><div class='ctx'> 		 * size is not block aligned since we will be keeping the last</div><div class='ctx'> 		 * block of the extent just the way it is.</div><div class='ctx'> 		 */</div><div class='del'>-		btrfs_drop_extent_map_range(inode,</div><div class='del'>-					    ALIGN(new_size, fs_info-&gt;sectorsize),</div><div class='del'>-					    (u64)-1, false);</div><div class='add'>+		btrfs_drop_extent_map_range(inode, i_size_up, (u64)-1, false);</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_truncate_inode_items(trans, root, &amp;control);</div><div class='ctx'> </div><div class='ctx'> 		inode_sub_bytes(&amp;inode-&gt;vfs_inode, control.sub_bytes);</div><div class='ctx'> 		btrfs_inode_safe_disk_i_size_write(inode, control.last_size);</div><div class='ctx'> </div><div class='del'>-		unlock_extent(&amp;inode-&gt;io_tree, lock_start, (u64)-1, &amp;cached_state);</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, lock_start, (u64)-1, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 		trans-&gt;block_rsv = &amp;fs_info-&gt;trans_block_rsv;</div><div class='ctx'> 		if (ret != -ENOSPC &amp;&amp; ret != -EAGAIN)</div><div class='hunk'>@@ -8386,9 +7811,9 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		btrfs_block_rsv_release(fs_info, rsv, -1, NULL);</div><div class='add'>+		btrfs_block_rsv_release(fs_info, &amp;rsv, -1, NULL);</div><div class='ctx'> 		ret = btrfs_block_rsv_migrate(&amp;fs_info-&gt;trans_block_rsv,</div><div class='del'>-					      rsv, min_size, false);</div><div class='add'>+					      &amp;rsv, min_size, false);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We have reserved 2 metadata units when we started the</div><div class='ctx'> 		 * transaction and min_size matches 1 unit, so this should never</div><div class='hunk'>@@ -8397,7 +7822,7 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 		if (WARN_ON(ret))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		trans-&gt;block_rsv = rsv;</div><div class='add'>+		trans-&gt;block_rsv = &amp;rsv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -8410,7 +7835,8 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 		btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_truncate_block(inode, inode-&gt;vfs_inode.i_size, 0, 0);</div><div class='add'>+		ret = btrfs_truncate_block(inode, inode-&gt;vfs_inode.i_size,</div><div class='add'>+					   inode-&gt;vfs_inode.i_size, (u64)-1);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		trans = btrfs_start_transaction(root, 1);</div><div class='hunk'>@@ -8435,7 +7861,7 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback)</div><div class='ctx'> 		btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_block_rsv(fs_info, rsv);</div><div class='add'>+	btrfs_block_rsv_release(fs_info, &amp;rsv, (u64)-1, NULL);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * So if we truncate and then write and fsync we normally would just</div><div class='ctx'> 	 * write the extents that changed, which is a problem if we need to</div><div class='hunk'>@@ -8480,20 +7906,10 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='ctx'> 	struct btrfs_inode *ei;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct extent_io_tree *file_extent_tree = NULL;</div><div class='del'>-</div><div class='del'>-	/* Self tests may pass a NULL fs_info. */</div><div class='del'>-	if (fs_info &amp;&amp; !btrfs_fs_incompat(fs_info, NO_HOLES)) {</div><div class='del'>-		file_extent_tree = kmalloc(sizeof(struct extent_io_tree), GFP_KERNEL);</div><div class='del'>-		if (!file_extent_tree)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ei = alloc_inode_sb(sb, btrfs_inode_cachep, GFP_KERNEL);</div><div class='del'>-	if (!ei) {</div><div class='del'>-		kfree(file_extent_tree);</div><div class='add'>+	if (!ei)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ei-&gt;root = NULL;</div><div class='ctx'> 	ei-&gt;generation = 0;</div><div class='hunk'>@@ -8501,13 +7917,18 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	ei-&gt;last_sub_trans = 0;</div><div class='ctx'> 	ei-&gt;logged_trans = 0;</div><div class='ctx'> 	ei-&gt;delalloc_bytes = 0;</div><div class='add'>+	/* new_delalloc_bytes and last_dir_index_offset are in a union. */</div><div class='ctx'> 	ei-&gt;new_delalloc_bytes = 0;</div><div class='ctx'> 	ei-&gt;defrag_bytes = 0;</div><div class='ctx'> 	ei-&gt;disk_i_size = 0;</div><div class='ctx'> 	ei-&gt;flags = 0;</div><div class='ctx'> 	ei-&gt;ro_flags = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * -&gt;index_cnt will be properly initialized later when creating a new</div><div class='add'>+	 * inode (btrfs_create_new_inode()) or when reading an existing inode</div><div class='add'>+	 * from disk (btrfs_read_locked_inode()).</div><div class='add'>+	 */</div><div class='ctx'> 	ei-&gt;csum_bytes = 0;</div><div class='del'>-	ei-&gt;index_cnt = (u64)-1;</div><div class='ctx'> 	ei-&gt;dir_index = 0;</div><div class='ctx'> 	ei-&gt;last_unlink_trans = 0;</div><div class='ctx'> 	ei-&gt;last_reflink_trans = 0;</div><div class='hunk'>@@ -8528,26 +7949,20 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	ei-&gt;i_otime_nsec = 0;</div><div class='ctx'> </div><div class='ctx'> 	inode = &amp;ei-&gt;vfs_inode;</div><div class='del'>-	extent_map_tree_init(&amp;ei-&gt;extent_tree);</div><div class='add'>+	btrfs_extent_map_tree_init(&amp;ei-&gt;extent_tree);</div><div class='ctx'> </div><div class='ctx'> 	/* This io tree sets the valid inode. */</div><div class='del'>-	extent_io_tree_init(fs_info, &amp;ei-&gt;io_tree, IO_TREE_INODE_IO);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;ei-&gt;io_tree, IO_TREE_INODE_IO);</div><div class='ctx'> 	ei-&gt;io_tree.inode = ei;</div><div class='ctx'> </div><div class='del'>-	ei-&gt;file_extent_tree = file_extent_tree;</div><div class='del'>-	if (file_extent_tree) {</div><div class='del'>-		extent_io_tree_init(fs_info, ei-&gt;file_extent_tree,</div><div class='del'>-				    IO_TREE_INODE_FILE_EXTENT);</div><div class='del'>-		/* Lockdep class is set only for the file extent tree. */</div><div class='del'>-		lockdep_set_class(&amp;ei-&gt;file_extent_tree-&gt;lock, &amp;file_extent_tree_class);</div><div class='del'>-	}</div><div class='add'>+	ei-&gt;file_extent_tree = NULL;</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;ei-&gt;log_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;ei-&gt;ordered_tree_lock);</div><div class='ctx'> 	ei-&gt;ordered_tree = RB_ROOT;</div><div class='ctx'> 	ei-&gt;ordered_tree_last = NULL;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ei-&gt;delalloc_inodes);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ei-&gt;delayed_iput);</div><div class='del'>-	RB_CLEAR_NODE(&amp;ei-&gt;rb_node);</div><div class='ctx'> 	init_rwsem(&amp;ei-&gt;i_mmap_lock);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -8583,9 +7998,10 @@ void btrfs_destroy_inode(struct inode *vfs_inode)</div><div class='ctx'> 	if (!S_ISDIR(vfs_inode-&gt;i_mode)) {</div><div class='ctx'> 		WARN_ON(inode-&gt;delalloc_bytes);</div><div class='ctx'> 		WARN_ON(inode-&gt;new_delalloc_bytes);</div><div class='add'>+		WARN_ON(inode-&gt;csum_bytes);</div><div class='ctx'> 	}</div><div class='del'>-	WARN_ON(inode-&gt;csum_bytes);</div><div class='del'>-	WARN_ON(inode-&gt;defrag_bytes);</div><div class='add'>+	if (!root || !btrfs_is_data_reloc_root(root))</div><div class='add'>+		WARN_ON(inode-&gt;defrag_bytes);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This can happen where we create an inode, but somebody else also</div><div class='hunk'>@@ -8619,7 +8035,7 @@ void btrfs_destroy_inode(struct inode *vfs_inode)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_qgroup_check_reserved_leak(inode);</div><div class='del'>-	inode_tree_del(inode);</div><div class='add'>+	btrfs_del_inode_from_root(inode);</div><div class='ctx'> 	btrfs_drop_extent_map_range(inode, 0, (u64)-1, false);</div><div class='ctx'> 	btrfs_inode_clear_file_extent_range(inode, 0, (u64)-1);</div><div class='ctx'> 	btrfs_put_root(inode-&gt;root);</div><div class='hunk'>@@ -8636,7 +8052,7 @@ int btrfs_drop_inode(struct inode *inode)</div><div class='ctx'> 	if (btrfs_root_refs(&amp;root-&gt;root_item) == 0)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	else</div><div class='del'>-		return generic_drop_inode(inode);</div><div class='add'>+		return inode_generic_drop(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_once(void *foo)</div><div class='hunk'>@@ -8644,6 +8060,9 @@ static void init_once(void *foo)</div><div class='ctx'> 	struct btrfs_inode *ei = foo;</div><div class='ctx'> </div><div class='ctx'> 	inode_init_once(&amp;ei-&gt;vfs_inode);</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	ei-&gt;i_verity_info = NULL;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __cold btrfs_destroy_cachep(void)</div><div class='hunk'>@@ -8653,7 +8072,6 @@ void __cold btrfs_destroy_cachep(void)</div><div class='ctx'> 	 * destroy cache.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_barrier();</div><div class='del'>-	bioset_exit(&amp;btrfs_dio_bioset);</div><div class='ctx'> 	kmem_cache_destroy(btrfs_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8661,20 +8079,12 @@ int __init btrfs_init_cachep(void)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_inode_cachep = kmem_cache_create("btrfs_inode",</div><div class='ctx'> 			sizeof(struct btrfs_inode), 0,</div><div class='del'>-			SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT,</div><div class='add'>+			SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='ctx'> 			init_once);</div><div class='ctx'> 	if (!btrfs_inode_cachep)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (bioset_init(&amp;btrfs_dio_bioset, BIO_POOL_SIZE,</div><div class='del'>-			offsetof(struct btrfs_dio_private, bbio.bio),</div><div class='del'>-			BIOSET_NEED_BVECS))</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-fail:</div><div class='del'>-	btrfs_destroy_cachep();</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_getattr(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -8684,7 +8094,7 @@ static int btrfs_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> 	u64 delalloc_bytes;</div><div class='ctx'> 	u64 inode_bytes;</div><div class='ctx'> 	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='del'>-	u32 blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='add'>+	u32 blocksize = btrfs_sb(inode-&gt;i_sb)-&gt;sectorsize;</div><div class='ctx'> 	u32 bi_flags = BTRFS_I(inode)-&gt;flags;</div><div class='ctx'> 	u32 bi_ro_flags = BTRFS_I(inode)-&gt;ro_flags;</div><div class='ctx'> </div><div class='hunk'>@@ -8710,6 +8120,9 @@ static int btrfs_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> 	generic_fillattr(idmap, request_mask, inode, stat);</div><div class='ctx'> 	stat-&gt;dev = BTRFS_I(inode)-&gt;root-&gt;anon_dev;</div><div class='ctx'> </div><div class='add'>+	stat-&gt;subvol = btrfs_root_id(BTRFS_I(inode)-&gt;root);</div><div class='add'>+	stat-&gt;result_mask |= STATX_SUBVOL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;BTRFS_I(inode)-&gt;lock);</div><div class='ctx'> 	delalloc_bytes = BTRFS_I(inode)-&gt;new_delalloc_bytes;</div><div class='ctx'> 	inode_bytes = inode_get_bytes(inode);</div><div class='hunk'>@@ -8724,7 +8137,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 			      struct inode *new_dir,</div><div class='ctx'> 			      struct dentry *new_dentry)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(old_dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(old_dir);</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	unsigned int trans_num_items;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(old_dir)-&gt;root;</div><div class='hunk'>@@ -8740,6 +8153,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int ret2;</div><div class='ctx'> 	bool need_abort = false;</div><div class='add'>+	bool logs_pinned = false;</div><div class='ctx'> 	struct fscrypt_name old_fname, new_fname;</div><div class='ctx'> 	struct fscrypt_str *old_name, *new_name;</div><div class='ctx'> </div><div class='hunk'>@@ -8850,7 +8264,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 					     btrfs_ino(BTRFS_I(old_dir)),</div><div class='ctx'> 					     new_idx);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			if (need_abort)</div><div class='add'>+			if (unlikely(need_abort))</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -8863,6 +8277,31 @@ static int btrfs_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 	inode_inc_iversion(new_inode);</div><div class='ctx'> 	simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);</div><div class='ctx'> </div><div class='add'>+	if (old_ino != BTRFS_FIRST_FREE_OBJECTID &amp;&amp;</div><div class='add'>+	    new_ino != BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we are renaming in the same directory (and it's not for</div><div class='add'>+		 * root entries) pin the log early to prevent any concurrent</div><div class='add'>+		 * task from logging the directory after we removed the old</div><div class='add'>+		 * entries and before we add the new entries, otherwise that</div><div class='add'>+		 * task can sync a log without any entry for the inodes we are</div><div class='add'>+		 * renaming and therefore replaying that log, if a power failure</div><div class='add'>+		 * happens after syncing the log, would result in deleting the</div><div class='add'>+		 * inodes.</div><div class='add'>+		 *</div><div class='add'>+		 * If the rename affects two different directories, we want to</div><div class='add'>+		 * make sure the that there's no log commit that contains</div><div class='add'>+		 * updates for only one of the directories but not for the</div><div class='add'>+		 * other.</div><div class='add'>+		 *</div><div class='add'>+		 * If we are renaming an entry for a root, we don't care about</div><div class='add'>+		 * log updates since we called btrfs_set_log_full_commit().</div><div class='add'>+		 */</div><div class='add'>+		btrfs_pin_log_trans(root);</div><div class='add'>+		btrfs_pin_log_trans(dest);</div><div class='add'>+		logs_pinned = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (old_dentry-&gt;d_parent != new_dentry-&gt;d_parent) {</div><div class='ctx'> 		btrfs_record_unlink_dir(trans, BTRFS_I(old_dir),</div><div class='ctx'> 					BTRFS_I(old_inode), true);</div><div class='hunk'>@@ -8873,43 +8312,57 @@ static int btrfs_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 	/* src is a subvolume */</div><div class='ctx'> 	if (old_ino == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 		ret = btrfs_unlink_subvol(trans, BTRFS_I(old_dir), old_dentry);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='ctx'> 	} else { /* src is an inode */</div><div class='ctx'> 		ret = __btrfs_unlink_inode(trans, BTRFS_I(old_dir),</div><div class='ctx'> 					   BTRFS_I(old_dentry-&gt;d_inode),</div><div class='ctx'> 					   old_name, &amp;old_rename_ctx);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = btrfs_update_inode(trans, BTRFS_I(old_inode));</div><div class='del'>-	}</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out_fail;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		ret = btrfs_update_inode(trans, BTRFS_I(old_inode));</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* dest is a subvolume */</div><div class='ctx'> 	if (new_ino == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 		ret = btrfs_unlink_subvol(trans, BTRFS_I(new_dir), new_dentry);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='ctx'> 	} else { /* dest is an inode */</div><div class='ctx'> 		ret = __btrfs_unlink_inode(trans, BTRFS_I(new_dir),</div><div class='ctx'> 					   BTRFS_I(new_dentry-&gt;d_inode),</div><div class='ctx'> 					   new_name, &amp;new_rename_ctx);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = btrfs_update_inode(trans, BTRFS_I(new_inode));</div><div class='del'>-	}</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out_fail;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		ret = btrfs_update_inode(trans, BTRFS_I(new_inode));</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_add_link(trans, BTRFS_I(new_dir), BTRFS_I(old_inode),</div><div class='ctx'> 			     new_name, 0, old_idx);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_add_link(trans, BTRFS_I(old_dir), BTRFS_I(new_inode),</div><div class='ctx'> 			     old_name, 0, new_idx);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8920,30 +8373,23 @@ static int btrfs_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 		BTRFS_I(new_inode)-&gt;dir_index = new_idx;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Now pin the logs of the roots. We do it to ensure that no other task</div><div class='del'>-	 * can sync the logs while we are in progress with the rename, because</div><div class='del'>-	 * that could result in an inconsistency in case any of the inodes that</div><div class='del'>-	 * are part of this rename operation were logged before.</div><div class='add'>+	 * Do the log updates for all inodes.</div><div class='add'>+	 *</div><div class='add'>+	 * If either entry is for a root we don't need to update the logs since</div><div class='add'>+	 * we've called btrfs_set_log_full_commit() before.</div><div class='ctx'> 	 */</div><div class='del'>-	if (old_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='del'>-		btrfs_pin_log_trans(root);</div><div class='del'>-	if (new_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='del'>-		btrfs_pin_log_trans(dest);</div><div class='del'>-</div><div class='del'>-	/* Do the log updates for all inodes. */</div><div class='del'>-	if (old_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='add'>+	if (logs_pinned) {</div><div class='ctx'> 		btrfs_log_new_name(trans, old_dentry, BTRFS_I(old_dir),</div><div class='ctx'> 				   old_rename_ctx.index, new_dentry-&gt;d_parent);</div><div class='del'>-	if (new_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='ctx'> 		btrfs_log_new_name(trans, new_dentry, BTRFS_I(new_dir),</div><div class='ctx'> 				   new_rename_ctx.index, old_dentry-&gt;d_parent);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Now unpin the logs. */</div><div class='del'>-	if (old_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='add'>+out_fail:</div><div class='add'>+	if (logs_pinned) {</div><div class='ctx'> 		btrfs_end_log_trans(root);</div><div class='del'>-	if (new_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='ctx'> 		btrfs_end_log_trans(dest);</div><div class='del'>-out_fail:</div><div class='add'>+	}</div><div class='ctx'> 	ret2 = btrfs_end_transaction(trans);</div><div class='ctx'> 	ret = ret ? ret : ret2;</div><div class='ctx'> out_notrans:</div><div class='hunk'>@@ -8976,7 +8422,7 @@ static int btrfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 			struct inode *new_dir, struct dentry *new_dentry,</div><div class='ctx'> 			unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(old_dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(old_dir);</div><div class='ctx'> 	struct btrfs_new_inode_args whiteout_args = {</div><div class='ctx'> 		.dir = old_dir,</div><div class='ctx'> 		.dentry = old_dentry,</div><div class='hunk'>@@ -8993,6 +8439,7 @@ static int btrfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	int ret2;</div><div class='ctx'> 	u64 old_ino = btrfs_ino(BTRFS_I(old_inode));</div><div class='ctx'> 	struct fscrypt_name old_fname, new_fname;</div><div class='add'>+	bool logs_pinned = false;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_ino(BTRFS_I(new_dir)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -9127,22 +8574,52 @@ static int btrfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	inode_inc_iversion(old_inode);</div><div class='ctx'> 	simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);</div><div class='ctx'> </div><div class='add'>+	if (old_ino != BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we are renaming in the same directory (and it's not a</div><div class='add'>+		 * root entry) pin the log to prevent any concurrent task from</div><div class='add'>+		 * logging the directory after we removed the old entry and</div><div class='add'>+		 * before we add the new entry, otherwise that task can sync</div><div class='add'>+		 * a log without any entry for the inode we are renaming and</div><div class='add'>+		 * therefore replaying that log, if a power failure happens</div><div class='add'>+		 * after syncing the log, would result in deleting the inode.</div><div class='add'>+		 *</div><div class='add'>+		 * If the rename affects two different directories, we want to</div><div class='add'>+		 * make sure the that there's no log commit that contains</div><div class='add'>+		 * updates for only one of the directories but not for the</div><div class='add'>+		 * other.</div><div class='add'>+		 *</div><div class='add'>+		 * If we are renaming an entry for a root, we don't care about</div><div class='add'>+		 * log updates since we called btrfs_set_log_full_commit().</div><div class='add'>+		 */</div><div class='add'>+		btrfs_pin_log_trans(root);</div><div class='add'>+		btrfs_pin_log_trans(dest);</div><div class='add'>+		logs_pinned = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (old_dentry-&gt;d_parent != new_dentry-&gt;d_parent)</div><div class='ctx'> 		btrfs_record_unlink_dir(trans, BTRFS_I(old_dir),</div><div class='ctx'> 					BTRFS_I(old_inode), true);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) {</div><div class='ctx'> 		ret = btrfs_unlink_subvol(trans, BTRFS_I(old_dir), old_dentry);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = __btrfs_unlink_inode(trans, BTRFS_I(old_dir),</div><div class='ctx'> 					   BTRFS_I(d_inode(old_dentry)),</div><div class='ctx'> 					   &amp;old_fname.disk_name, &amp;rename_ctx);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = btrfs_update_inode(trans, BTRFS_I(old_inode));</div><div class='del'>-	}</div><div class='del'>-	if (ret) {</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out_fail;</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		ret = btrfs_update_inode(trans, BTRFS_I(old_inode));</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_inode) {</div><div class='hunk'>@@ -9150,24 +8627,33 @@ static int btrfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 		if (unlikely(btrfs_ino(BTRFS_I(new_inode)) ==</div><div class='ctx'> 			     BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)) {</div><div class='ctx'> 			ret = btrfs_unlink_subvol(trans, BTRFS_I(new_dir), new_dentry);</div><div class='add'>+			if (unlikely(ret)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto out_fail;</div><div class='add'>+			}</div><div class='ctx'> 			BUG_ON(new_inode-&gt;i_nlink == 0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = btrfs_unlink_inode(trans, BTRFS_I(new_dir),</div><div class='ctx'> 						 BTRFS_I(d_inode(new_dentry)),</div><div class='ctx'> 						 &amp;new_fname.disk_name);</div><div class='add'>+			if (unlikely(ret)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto out_fail;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		if (!ret &amp;&amp; new_inode-&gt;i_nlink == 0)</div><div class='add'>+		if (new_inode-&gt;i_nlink == 0) {</div><div class='ctx'> 			ret = btrfs_orphan_add(trans,</div><div class='ctx'> 					BTRFS_I(d_inode(new_dentry)));</div><div class='del'>-		if (ret) {</div><div class='del'>-			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto out_fail;</div><div class='add'>+			if (unlikely(ret)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto out_fail;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_add_link(trans, BTRFS_I(new_dir), BTRFS_I(old_inode),</div><div class='ctx'> 			     &amp;new_fname.disk_name, 0, index);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -9175,13 +8661,13 @@ static int btrfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (old_inode-&gt;i_nlink == 1)</div><div class='ctx'> 		BTRFS_I(old_inode)-&gt;dir_index = index;</div><div class='ctx'> </div><div class='del'>-	if (old_ino != BTRFS_FIRST_FREE_OBJECTID)</div><div class='add'>+	if (logs_pinned)</div><div class='ctx'> 		btrfs_log_new_name(trans, old_dentry, BTRFS_I(old_dir),</div><div class='ctx'> 				   rename_ctx.index, new_dentry-&gt;d_parent);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; RENAME_WHITEOUT) {</div><div class='ctx'> 		ret = btrfs_create_new_inode(trans, &amp;whiteout_args);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_fail;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -9191,6 +8677,10 @@ static int btrfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out_fail:</div><div class='add'>+	if (logs_pinned) {</div><div class='add'>+		btrfs_end_log_trans(root);</div><div class='add'>+		btrfs_end_log_trans(dest);</div><div class='add'>+	}</div><div class='ctx'> 	ret2 = btrfs_end_transaction(trans);</div><div class='ctx'> 	ret = ret ? ret : ret2;</div><div class='ctx'> out_notrans:</div><div class='hunk'>@@ -9272,46 +8762,42 @@ static struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode</div><div class='ctx'>  * some fairly slow code that needs optimization. This walks the list</div><div class='ctx'>  * of all the inodes with pending delalloc and forces them to disk.</div><div class='ctx'>  */</div><div class='del'>-static int start_delalloc_inodes(struct btrfs_root *root,</div><div class='del'>-				 struct writeback_control *wbc, bool snapshot,</div><div class='del'>-				 bool in_reclaim_context)</div><div class='add'>+static int start_delalloc_inodes(struct btrfs_root *root, long *nr_to_write,</div><div class='add'>+				 bool snapshot, bool in_reclaim_context)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *binode;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	struct btrfs_delalloc_work *work, *next;</div><div class='ctx'> 	LIST_HEAD(works);</div><div class='ctx'> 	LIST_HEAD(splice);</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	bool full_flush = wbc-&gt;nr_to_write == LONG_MAX;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;root-&gt;delalloc_mutex);</div><div class='ctx'> 	spin_lock(&amp;root-&gt;delalloc_lock);</div><div class='ctx'> 	list_splice_init(&amp;root-&gt;delalloc_inodes, &amp;splice);</div><div class='ctx'> 	while (!list_empty(&amp;splice)) {</div><div class='del'>-		binode = list_entry(splice.next, struct btrfs_inode,</div><div class='del'>-				    delalloc_inodes);</div><div class='add'>+		struct btrfs_inode *inode;</div><div class='add'>+		struct inode *tmp_inode;</div><div class='ctx'> </div><div class='del'>-		list_move_tail(&amp;binode-&gt;delalloc_inodes,</div><div class='del'>-			       &amp;root-&gt;delalloc_inodes);</div><div class='add'>+		inode = list_first_entry(&amp;splice, struct btrfs_inode, delalloc_inodes);</div><div class='add'>+</div><div class='add'>+		list_move_tail(&amp;inode-&gt;delalloc_inodes, &amp;root-&gt;delalloc_inodes);</div><div class='ctx'> </div><div class='ctx'> 		if (in_reclaim_context &amp;&amp;</div><div class='del'>-		    test_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &amp;binode-&gt;runtime_flags))</div><div class='add'>+		    test_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &amp;inode-&gt;runtime_flags))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		inode = igrab(&amp;binode-&gt;vfs_inode);</div><div class='del'>-		if (!inode) {</div><div class='add'>+		tmp_inode = igrab(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		if (!tmp_inode) {</div><div class='ctx'> 			cond_resched_lock(&amp;root-&gt;delalloc_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;root-&gt;delalloc_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (snapshot)</div><div class='del'>-			set_bit(BTRFS_INODE_SNAPSHOT_FLUSH,</div><div class='del'>-				&amp;binode-&gt;runtime_flags);</div><div class='del'>-		if (full_flush) {</div><div class='del'>-			work = btrfs_alloc_delalloc_work(inode);</div><div class='add'>+			set_bit(BTRFS_INODE_SNAPSHOT_FLUSH, &amp;inode-&gt;runtime_flags);</div><div class='add'>+		if (nr_to_write == NULL) {</div><div class='add'>+			work = btrfs_alloc_delalloc_work(tmp_inode);</div><div class='ctx'> 			if (!work) {</div><div class='del'>-				iput(inode);</div><div class='add'>+				iput(tmp_inode);</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -9319,9 +8805,11 @@ static int start_delalloc_inodes(struct btrfs_root *root,</div><div class='ctx'> 			btrfs_queue_work(root-&gt;fs_info-&gt;flush_workers,</div><div class='ctx'> 					 &amp;work-&gt;work);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = filemap_fdatawrite_wbc(inode-&gt;i_mapping, wbc);</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='del'>-			if (ret || wbc-&gt;nr_to_write &lt;= 0)</div><div class='add'>+			ret = filemap_flush_nr(tmp_inode-&gt;i_mapping,</div><div class='add'>+					nr_to_write);</div><div class='add'>+			btrfs_add_delayed_iput(inode);</div><div class='add'>+</div><div class='add'>+			if (ret || *nr_to_write &lt;= 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -9347,29 +8835,17 @@ out:</div><div class='ctx'> </div><div class='ctx'> int btrfs_start_delalloc_snapshot(struct btrfs_root *root, bool in_reclaim_context)</div><div class='ctx'> {</div><div class='del'>-	struct writeback_control wbc = {</div><div class='del'>-		.nr_to_write = LONG_MAX,</div><div class='del'>-		.sync_mode = WB_SYNC_NONE,</div><div class='del'>-		.range_start = 0,</div><div class='del'>-		.range_end = LLONG_MAX,</div><div class='del'>-	};</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (BTRFS_FS_ERROR(fs_info))</div><div class='ctx'> 		return -EROFS;</div><div class='del'>-</div><div class='del'>-	return start_delalloc_inodes(root, &amp;wbc, true, in_reclaim_context);</div><div class='add'>+	return start_delalloc_inodes(root, NULL, true, in_reclaim_context);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,</div><div class='ctx'> 			       bool in_reclaim_context)</div><div class='ctx'> {</div><div class='del'>-	struct writeback_control wbc = {</div><div class='del'>-		.nr_to_write = nr,</div><div class='del'>-		.sync_mode = WB_SYNC_NONE,</div><div class='del'>-		.range_start = 0,</div><div class='del'>-		.range_end = LLONG_MAX,</div><div class='del'>-	};</div><div class='add'>+	long *nr_to_write = nr == LONG_MAX ? NULL : &amp;nr;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	LIST_HEAD(splice);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -9381,13 +8857,6 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,</div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='ctx'> 	list_splice_init(&amp;fs_info-&gt;delalloc_roots, &amp;splice);</div><div class='ctx'> 	while (!list_empty(&amp;splice)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Reset nr_to_write here so we know that we're doing a full</div><div class='del'>-		 * flush.</div><div class='del'>-		 */</div><div class='del'>-		if (nr == LONG_MAX)</div><div class='del'>-			wbc.nr_to_write = LONG_MAX;</div><div class='del'>-</div><div class='ctx'> 		root = list_first_entry(&amp;splice, struct btrfs_root,</div><div class='ctx'> 					delalloc_root);</div><div class='ctx'> 		root = btrfs_grab_root(root);</div><div class='hunk'>@@ -9396,9 +8865,10 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,</div><div class='ctx'> 			       &amp;fs_info-&gt;delalloc_roots);</div><div class='ctx'> 		spin_unlock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='ctx'> </div><div class='del'>-		ret = start_delalloc_inodes(root, &amp;wbc, false, in_reclaim_context);</div><div class='add'>+		ret = start_delalloc_inodes(root, nr_to_write, false,</div><div class='add'>+				in_reclaim_context);</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='del'>-		if (ret &lt; 0 || wbc.nr_to_write &lt;= 0)</div><div class='add'>+		if (ret &lt; 0 || nr &lt;= 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;delalloc_root_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -9418,7 +8888,7 @@ out:</div><div class='ctx'> static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			 struct dentry *dentry, const char *symname)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='hunk'>@@ -9429,7 +8899,7 @@ static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		.dentry = dentry,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int trans_num_items;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> 	int name_len;</div><div class='ctx'> 	int datasize;</div><div class='ctx'> 	unsigned long ptr;</div><div class='hunk'>@@ -9437,7 +8907,12 @@ static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> </div><div class='ctx'> 	name_len = strlen(symname);</div><div class='del'>-	if (name_len &gt; BTRFS_MAX_INLINE_DATA_SIZE(fs_info))</div><div class='add'>+	/*</div><div class='add'>+	 * Symlinks utilize uncompressed inline extent data, which should not</div><div class='add'>+	 * reach block size.</div><div class='add'>+	 */</div><div class='add'>+	if (name_len &gt; BTRFS_MAX_INLINE_DATA_SIZE(fs_info) ||</div><div class='add'>+	    name_len &gt;= fs_info-&gt;sectorsize)</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='ctx'> 	inode = new_inode(dir-&gt;i_sb);</div><div class='hunk'>@@ -9451,38 +8926,37 @@ static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	inode_set_bytes(inode, name_len);</div><div class='ctx'> </div><div class='ctx'> 	new_inode_args.inode = inode;</div><div class='del'>-	err = btrfs_new_inode_prepare(&amp;new_inode_args, &amp;trans_num_items);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_new_inode_prepare(&amp;new_inode_args, &amp;trans_num_items);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_inode;</div><div class='ctx'> 	/* 1 additional item for the inline extent */</div><div class='ctx'> 	trans_num_items++;</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_start_transaction(root, trans_num_items);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_new_inode_args;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = btrfs_create_new_inode(trans, &amp;new_inode_args);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_create_new_inode(trans, &amp;new_inode_args);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		btrfs_abort_transaction(trans, err);</div><div class='add'>+	if (unlikely(!path)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		discard_new_inode(inode);</div><div class='ctx'> 		inode = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	key.objectid = btrfs_ino(BTRFS_I(inode));</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> 	datasize = btrfs_file_extent_calc_inline_size(name_len);</div><div class='del'>-	err = btrfs_insert_empty_item(trans, root, path, &amp;key,</div><div class='del'>-				      datasize);</div><div class='del'>-	if (err) {</div><div class='del'>-		btrfs_abort_transaction(trans, err);</div><div class='add'>+	ret = btrfs_insert_empty_item(trans, root, path, &amp;key, datasize);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		btrfs_free_path(path);</div><div class='ctx'> 		discard_new_inode(inode);</div><div class='ctx'> 		inode = NULL;</div><div class='hunk'>@@ -9501,20 +8975,19 @@ static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	ptr = btrfs_file_extent_inline_start(ei);</div><div class='ctx'> 	write_extent_buffer(leaf, symname, ptr, name_len);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate_new(dentry, inode);</div><div class='del'>-	err = 0;</div><div class='add'>+	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> out_new_inode_args:</div><div class='ctx'> 	btrfs_new_inode_args_destroy(&amp;new_inode_args);</div><div class='ctx'> out_inode:</div><div class='del'>-	if (err)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		iput(inode);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct btrfs_trans_handle *insert_prealloc_file_extent(</div><div class='hunk'>@@ -9589,7 +9062,7 @@ free_qgroup:</div><div class='ctx'> 	 * or we leak qgroup data reservation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_qgroup_free_refroot(inode-&gt;root-&gt;fs_info,</div><div class='del'>-			inode-&gt;root-&gt;root_key.objectid, qgroup_released,</div><div class='add'>+			btrfs_root_id(inode-&gt;root), qgroup_released,</div><div class='ctx'> 			BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -9599,7 +9072,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,</div><div class='ctx'> 				       loff_t actual_len, u64 *alloc_hint,</div><div class='ctx'> 				       struct btrfs_trans_handle *trans)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_key ins;</div><div class='hunk'>@@ -9625,7 +9098,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,</div><div class='ctx'> 		 */</div><div class='ctx'> 		cur_bytes = min(cur_bytes, last_alloc);</div><div class='ctx'> 		ret = btrfs_reserve_extent(root, cur_bytes, cur_bytes,</div><div class='del'>-				min_size, 0, *alloc_hint, &amp;ins, 1, 0);</div><div class='add'>+				min_size, 0, *alloc_hint, &amp;ins, true, false);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -9651,11 +9124,11 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,</div><div class='ctx'> 		if (IS_ERR(trans)) {</div><div class='ctx'> 			ret = PTR_ERR(trans);</div><div class='ctx'> 			btrfs_free_reserved_extent(fs_info, ins.objectid,</div><div class='del'>-						   ins.offset, 0);</div><div class='add'>+						   ins.offset, false);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		em = alloc_extent_map();</div><div class='add'>+		em = btrfs_alloc_extent_map();</div><div class='ctx'> 		if (!em) {</div><div class='ctx'> 			btrfs_drop_extent_map_range(BTRFS_I(inode), cur_offset,</div><div class='ctx'> 					    cur_offset + ins.offset - 1, false);</div><div class='hunk'>@@ -9664,17 +9137,16 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		em-&gt;start = cur_offset;</div><div class='del'>-		em-&gt;orig_start = cur_offset;</div><div class='ctx'> 		em-&gt;len = ins.offset;</div><div class='del'>-		em-&gt;block_start = ins.objectid;</div><div class='del'>-		em-&gt;block_len = ins.offset;</div><div class='del'>-		em-&gt;orig_block_len = ins.offset;</div><div class='add'>+		em-&gt;disk_bytenr = ins.objectid;</div><div class='add'>+		em-&gt;offset = 0;</div><div class='add'>+		em-&gt;disk_num_bytes = ins.offset;</div><div class='ctx'> 		em-&gt;ram_bytes = ins.offset;</div><div class='ctx'> 		em-&gt;flags |= EXTENT_FLAG_PREALLOC;</div><div class='ctx'> 		em-&gt;generation = trans-&gt;transid;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_replace_extent_map_range(BTRFS_I(inode), em, true);</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> next:</div><div class='ctx'> 		num_bytes -= ins.offset;</div><div class='ctx'> 		cur_offset += ins.offset;</div><div class='hunk'>@@ -9696,7 +9168,7 @@ next:</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='ctx'> </div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			if (own_trans)</div><div class='ctx'> 				btrfs_end_transaction(trans);</div><div class='hunk'>@@ -9732,6 +9204,11 @@ int btrfs_prealloc_file_range_trans(struct inode *inode,</div><div class='ctx'> 					   min_size, actual_len, alloc_hint, trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * NOTE: in case you are adding MAY_EXEC check for directories:</div><div class='add'>+ * we are marking them with IOP_FASTPERM_MAY_EXEC, allowing path lookup to</div><div class='add'>+ * elide calls here.</div><div class='add'>+ */</div><div class='ctx'> static int btrfs_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 			    struct inode *inode, int mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -9751,7 +9228,7 @@ static int btrfs_permission(struct mnt_idmap *idmap,</div><div class='ctx'> static int btrfs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			 struct file *file, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -9809,28 +9286,6 @@ out_inode:</div><div class='ctx'> 	return finish_open_simple(file, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_set_range_writeback(struct btrfs_inode *inode, u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	unsigned long index = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u32 len;</div><div class='del'>-</div><div class='del'>-	ASSERT(end + 1 - start &lt;= U32_MAX);</div><div class='del'>-	len = end + 1 - start;</div><div class='del'>-	while (index &lt;= end_index) {</div><div class='del'>-		page = find_get_page(inode-&gt;vfs_inode.i_mapping, index);</div><div class='del'>-		ASSERT(page); /* Pages should be in the extent_io_tree */</div><div class='del'>-</div><div class='del'>-		/* This is for data, which doesn't yet support larger folio. */</div><div class='del'>-		ASSERT(folio_order(page_folio(page)) == 0);</div><div class='del'>-		btrfs_folio_set_writeback(fs_info, page_folio(page), start, len);</div><div class='del'>-		put_page(page);</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int btrfs_encoded_io_compression_from_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					     int compress_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -9868,27 +9323,29 @@ static ssize_t btrfs_encoded_read_inline(</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_file_extent_item *item;</div><div class='ctx'> 	u64 ram_bytes;</div><div class='ctx'> 	unsigned long ptr;</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> 	ssize_t ret;</div><div class='add'>+	const bool nowait = (iocb-&gt;ki_flags &amp; IOCB_NOWAIT);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	path-&gt;nowait = nowait;</div><div class='add'>+</div><div class='ctx'> 	ret = btrfs_lookup_file_extent(NULL, root, path, btrfs_ino(inode),</div><div class='ctx'> 				       extent_start, 0);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		if (ret &gt; 0) {</div><div class='add'>+		if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 			/* The extent item disappeared? */</div><div class='del'>-			ret = -EIO;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	item = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='hunk'>@@ -9901,17 +9358,16 @@ static ssize_t btrfs_encoded_read_inline(</div><div class='ctx'> 	ret = btrfs_encoded_io_compression_from_extent(fs_info,</div><div class='ctx'> 				 btrfs_file_extent_compression(leaf, item));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	encoded-&gt;compression = ret;</div><div class='ctx'> 	if (encoded-&gt;compression) {</div><div class='ctx'> 		size_t inline_size;</div><div class='ctx'> </div><div class='ctx'> 		inline_size = btrfs_file_extent_inline_item_len(leaf,</div><div class='ctx'> 								path-&gt;slots[0]);</div><div class='del'>-		if (inline_size &gt; count) {</div><div class='del'>-			ret = -ENOBUFS;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (inline_size &gt; count)</div><div class='add'>+			return -ENOBUFS;</div><div class='add'>+</div><div class='ctx'> 		count = inline_size;</div><div class='ctx'> 		encoded-&gt;unencoded_len = ram_bytes;</div><div class='ctx'> 		encoded-&gt;unencoded_offset = iocb-&gt;ki_pos - extent_start;</div><div class='hunk'>@@ -9923,13 +9379,12 @@ static ssize_t btrfs_encoded_read_inline(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = kmalloc(count, GFP_NOFS);</div><div class='del'>-	if (!tmp) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	read_extent_buffer(leaf, tmp, ptr, count);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	unlock_extent(io_tree, start, lockend, cached_state);</div><div class='add'>+	btrfs_unlock_extent(io_tree, start, lockend, cached_state);</div><div class='ctx'> 	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='ctx'> 	*unlocked = true;</div><div class='ctx'> </div><div class='hunk'>@@ -9937,14 +9392,14 @@ static ssize_t btrfs_encoded_read_inline(</div><div class='ctx'> 	if (ret != count)</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 	kfree(tmp);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_encoded_read_private {</div><div class='del'>-	wait_queue_head_t wait;</div><div class='del'>-	atomic_t pending;</div><div class='add'>+	struct completion *sync_reads;</div><div class='add'>+	void *uring_ctx;</div><div class='add'>+	refcount_t pending_refs;</div><div class='ctx'> 	blk_status_t status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -9954,49 +9409,69 @@ static void btrfs_encoded_read_endio(struct btrfs_bio *bbio)</div><div class='ctx'> </div><div class='ctx'> 	if (bbio-&gt;bio.bi_status) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * The memory barrier implied by the atomic_dec_return() here</div><div class='del'>-		 * pairs with the memory barrier implied by the</div><div class='del'>-		 * atomic_dec_return() or io_wait_event() in</div><div class='del'>-		 * btrfs_encoded_read_regular_fill_pages() to ensure that this</div><div class='del'>-		 * write is observed before the load of status in</div><div class='add'>+		 * The memory barrier implied by the refcount_dec_and_test() here</div><div class='add'>+		 * pairs with the memory barrier implied by the refcount_dec_and_test()</div><div class='add'>+		 * in btrfs_encoded_read_regular_fill_pages() to ensure that</div><div class='add'>+		 * this write is observed before the load of status in</div><div class='ctx'> 		 * btrfs_encoded_read_regular_fill_pages().</div><div class='ctx'> 		 */</div><div class='ctx'> 		WRITE_ONCE(priv-&gt;status, bbio-&gt;bio.bi_status);</div><div class='ctx'> 	}</div><div class='del'>-	if (!atomic_dec_return(&amp;priv-&gt;pending))</div><div class='del'>-		wake_up(&amp;priv-&gt;wait);</div><div class='add'>+	if (refcount_dec_and_test(&amp;priv-&gt;pending_refs)) {</div><div class='add'>+		int err = blk_status_to_errno(READ_ONCE(priv-&gt;status));</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;uring_ctx) {</div><div class='add'>+			btrfs_uring_read_extent_endio(priv-&gt;uring_ctx, err);</div><div class='add'>+			kfree(priv);</div><div class='add'>+		} else {</div><div class='add'>+			complete(priv-&gt;sync_reads);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,</div><div class='del'>-					  u64 file_offset, u64 disk_bytenr,</div><div class='del'>-					  u64 disk_io_size, struct page **pages)</div><div class='add'>+					  u64 disk_bytenr, u64 disk_io_size,</div><div class='add'>+					  struct page **pages, void *uring_ctx)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	struct btrfs_encoded_read_private priv = {</div><div class='del'>-		.pending = ATOMIC_INIT(1),</div><div class='del'>-	};</div><div class='add'>+	struct btrfs_encoded_read_private *priv, sync_priv;</div><div class='add'>+	struct completion sync_reads;</div><div class='ctx'> 	unsigned long i = 0;</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	init_waitqueue_head(&amp;priv.wait);</div><div class='add'>+	/*</div><div class='add'>+	 * Fast path for synchronous reads which completes in this call, io_uring</div><div class='add'>+	 * needs longer time span.</div><div class='add'>+	 */</div><div class='add'>+	if (uring_ctx) {</div><div class='add'>+		priv = kmalloc(sizeof(struct btrfs_encoded_read_private), GFP_NOFS);</div><div class='add'>+		if (!priv)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		priv = &amp;sync_priv;</div><div class='add'>+		init_completion(&amp;sync_reads);</div><div class='add'>+		priv-&gt;sync_reads = &amp;sync_reads;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bbio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ, fs_info,</div><div class='del'>-			       btrfs_encoded_read_endio, &amp;priv);</div><div class='add'>+	refcount_set(&amp;priv-&gt;pending_refs, 1);</div><div class='add'>+	priv-&gt;status = 0;</div><div class='add'>+	priv-&gt;uring_ctx = uring_ctx;</div><div class='add'>+</div><div class='add'>+	bbio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ, inode, 0,</div><div class='add'>+			       btrfs_encoded_read_endio, priv);</div><div class='ctx'> 	bbio-&gt;bio.bi_iter.bi_sector = disk_bytenr &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	bbio-&gt;inode = inode;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		size_t bytes = min_t(u64, disk_io_size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		if (bio_add_page(&amp;bbio-&gt;bio, pages[i], bytes, 0) &lt; bytes) {</div><div class='del'>-			atomic_inc(&amp;priv.pending);</div><div class='del'>-			btrfs_submit_bio(bbio, 0);</div><div class='add'>+			refcount_inc(&amp;priv-&gt;pending_refs);</div><div class='add'>+			btrfs_submit_bbio(bbio, 0);</div><div class='ctx'> </div><div class='del'>-			bbio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ, fs_info,</div><div class='del'>-					       btrfs_encoded_read_endio, &amp;priv);</div><div class='add'>+			bbio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ, inode, 0,</div><div class='add'>+					       btrfs_encoded_read_endio, priv);</div><div class='ctx'> 			bbio-&gt;bio.bi_iter.bi_sector = disk_bytenr &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-			bbio-&gt;inode = inode;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -10005,22 +9480,31 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,</div><div class='ctx'> 		disk_io_size -= bytes;</div><div class='ctx'> 	} while (disk_io_size);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;priv.pending);</div><div class='del'>-	btrfs_submit_bio(bbio, 0);</div><div class='add'>+	refcount_inc(&amp;priv-&gt;pending_refs);</div><div class='add'>+	btrfs_submit_bbio(bbio, 0);</div><div class='add'>+</div><div class='add'>+	if (uring_ctx) {</div><div class='add'>+		if (refcount_dec_and_test(&amp;priv-&gt;pending_refs)) {</div><div class='add'>+			ret = blk_status_to_errno(READ_ONCE(priv-&gt;status));</div><div class='add'>+			btrfs_uring_read_extent_endio(uring_ctx, ret);</div><div class='add'>+			kfree(priv);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_return(&amp;priv.pending))</div><div class='del'>-		io_wait_event(priv.wait, !atomic_read(&amp;priv.pending));</div><div class='del'>-	/* See btrfs_encoded_read_endio() for ordering. */</div><div class='del'>-	return blk_status_to_errno(READ_ONCE(priv.status));</div><div class='add'>+		return -EIOCBQUEUED;</div><div class='add'>+	} else {</div><div class='add'>+		if (!refcount_dec_and_test(&amp;priv-&gt;pending_refs))</div><div class='add'>+			wait_for_completion_io(&amp;sync_reads);</div><div class='add'>+		/* See btrfs_encoded_read_endio() for ordering. */</div><div class='add'>+		return blk_status_to_errno(READ_ONCE(priv-&gt;status));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t btrfs_encoded_read_regular(struct kiocb *iocb,</div><div class='del'>-					  struct iov_iter *iter,</div><div class='del'>-					  u64 start, u64 lockend,</div><div class='del'>-					  struct extent_state **cached_state,</div><div class='del'>-					  u64 disk_bytenr, u64 disk_io_size,</div><div class='del'>-					  size_t count, bool compressed,</div><div class='del'>-					  bool *unlocked)</div><div class='add'>+ssize_t btrfs_encoded_read_regular(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+				   u64 start, u64 lockend,</div><div class='add'>+				   struct extent_state **cached_state,</div><div class='add'>+				   u64 disk_bytenr, u64 disk_io_size,</div><div class='add'>+				   size_t count, bool compressed, bool *unlocked)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = BTRFS_I(file_inode(iocb-&gt;ki_filp));</div><div class='ctx'> 	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='hunk'>@@ -10034,18 +9518,18 @@ static ssize_t btrfs_encoded_read_regular(struct kiocb *iocb,</div><div class='ctx'> 	pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);</div><div class='ctx'> 	if (!pages)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = btrfs_alloc_page_array(nr_pages, pages, 0);</div><div class='add'>+	ret = btrfs_alloc_page_array(nr_pages, pages, false);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_encoded_read_regular_fill_pages(inode, start, disk_bytenr,</div><div class='del'>-						    disk_io_size, pages);</div><div class='add'>+	ret = btrfs_encoded_read_regular_fill_pages(inode, disk_bytenr,</div><div class='add'>+						    disk_io_size, pages, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	unlock_extent(io_tree, start, lockend, cached_state);</div><div class='add'>+	btrfs_unlock_extent(io_tree, start, lockend, cached_state);</div><div class='ctx'> 	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='ctx'> 	*unlocked = true;</div><div class='ctx'> </div><div class='hunk'>@@ -10081,21 +9565,26 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter,</div><div class='del'>-			   struct btrfs_ioctl_encoded_io_args *encoded)</div><div class='add'>+			   struct btrfs_ioctl_encoded_io_args *encoded,</div><div class='add'>+			   struct extent_state **cached_state,</div><div class='add'>+			   u64 *disk_bytenr, u64 *disk_io_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode *inode = BTRFS_I(file_inode(iocb-&gt;ki_filp));</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	size_t count = iov_iter_count(iter);</div><div class='del'>-	u64 start, lockend, disk_bytenr, disk_io_size;</div><div class='del'>-	struct extent_state *cached_state = NULL;</div><div class='add'>+	u64 start, lockend;</div><div class='ctx'> 	struct extent_map *em;</div><div class='add'>+	const bool nowait = (iocb-&gt;ki_flags &amp; IOCB_NOWAIT);</div><div class='ctx'> 	bool unlocked = false;</div><div class='ctx'> </div><div class='ctx'> 	file_accessed(iocb-&gt;ki_filp);</div><div class='ctx'> </div><div class='del'>-	btrfs_inode_lock(inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+	ret = btrfs_inode_lock(inode,</div><div class='add'>+			       BTRFS_ILOCK_SHARED | (nowait ? BTRFS_ILOCK_TRY : 0));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (iocb-&gt;ki_pos &gt;= inode-&gt;vfs_inode.i_size) {</div><div class='ctx'> 		btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='hunk'>@@ -10108,117 +9597,137 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 	 */</div><div class='ctx'> 	lockend = start + BTRFS_MAX_UNCOMPRESSED - 1;</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='add'>+	if (nowait) {</div><div class='ctx'> 		struct btrfs_ordered_extent *ordered;</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_wait_ordered_range(&amp;inode-&gt;vfs_inode, start,</div><div class='del'>-					       lockend - start + 1);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (filemap_range_needs_writeback(inode-&gt;vfs_inode.i_mapping,</div><div class='add'>+						  start, lockend)) {</div><div class='add'>+			ret = -EAGAIN;</div><div class='ctx'> 			goto out_unlock_inode;</div><div class='del'>-		lock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!btrfs_try_lock_extent(io_tree, start, lockend, cached_state)) {</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto out_unlock_inode;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ordered = btrfs_lookup_ordered_range(inode, start,</div><div class='ctx'> 						     lockend - start + 1);</div><div class='del'>-		if (!ordered)</div><div class='del'>-			break;</div><div class='del'>-		btrfs_put_ordered_extent(ordered);</div><div class='del'>-		unlock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='del'>-		cond_resched();</div><div class='add'>+		if (ordered) {</div><div class='add'>+			btrfs_put_ordered_extent(ordered);</div><div class='add'>+			btrfs_unlock_extent(io_tree, start, lockend, cached_state);</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto out_unlock_inode;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (;;) {</div><div class='add'>+			struct btrfs_ordered_extent *ordered;</div><div class='add'>+</div><div class='add'>+			ret = btrfs_wait_ordered_range(inode, start,</div><div class='add'>+						       lockend - start + 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_unlock_inode;</div><div class='add'>+</div><div class='add'>+			btrfs_lock_extent(io_tree, start, lockend, cached_state);</div><div class='add'>+			ordered = btrfs_lookup_ordered_range(inode, start,</div><div class='add'>+							     lockend - start + 1);</div><div class='add'>+			if (!ordered)</div><div class='add'>+				break;</div><div class='add'>+			btrfs_put_ordered_extent(ordered);</div><div class='add'>+			btrfs_unlock_extent(io_tree, start, lockend, cached_state);</div><div class='add'>+			cond_resched();</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(inode, NULL, 0, start, lockend - start + 1);</div><div class='add'>+	em = btrfs_get_extent(inode, NULL, start, lockend - start + 1);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		ret = PTR_ERR(em);</div><div class='ctx'> 		goto out_unlock_extent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (em-&gt;block_start == EXTENT_MAP_INLINE) {</div><div class='add'>+	if (em-&gt;disk_bytenr == EXTENT_MAP_INLINE) {</div><div class='ctx'> 		u64 extent_start = em-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For inline extents we get everything we need out of the</div><div class='ctx'> 		 * extent item.</div><div class='ctx'> 		 */</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 		em = NULL;</div><div class='ctx'> 		ret = btrfs_encoded_read_inline(iocb, iter, start, lockend,</div><div class='del'>-						&amp;cached_state, extent_start,</div><div class='add'>+						cached_state, extent_start,</div><div class='ctx'> 						count, encoded, &amp;unlocked);</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock_extent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We only want to return up to EOF even if the extent extends beyond</div><div class='ctx'> 	 * that.</div><div class='ctx'> 	 */</div><div class='del'>-	encoded-&gt;len = min_t(u64, extent_map_end(em),</div><div class='add'>+	encoded-&gt;len = min_t(u64, btrfs_extent_map_end(em),</div><div class='ctx'> 			     inode-&gt;vfs_inode.i_size) - iocb-&gt;ki_pos;</div><div class='del'>-	if (em-&gt;block_start == EXTENT_MAP_HOLE ||</div><div class='add'>+	if (em-&gt;disk_bytenr == EXTENT_MAP_HOLE ||</div><div class='ctx'> 	    (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC)) {</div><div class='del'>-		disk_bytenr = EXTENT_MAP_HOLE;</div><div class='add'>+		*disk_bytenr = EXTENT_MAP_HOLE;</div><div class='ctx'> 		count = min_t(u64, count, encoded-&gt;len);</div><div class='ctx'> 		encoded-&gt;len = count;</div><div class='ctx'> 		encoded-&gt;unencoded_len = count;</div><div class='del'>-	} else if (extent_map_is_compressed(em)) {</div><div class='del'>-		disk_bytenr = em-&gt;block_start;</div><div class='add'>+	} else if (btrfs_extent_map_is_compressed(em)) {</div><div class='add'>+		*disk_bytenr = em-&gt;disk_bytenr;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Bail if the buffer isn't large enough to return the whole</div><div class='ctx'> 		 * compressed extent.</div><div class='ctx'> 		 */</div><div class='del'>-		if (em-&gt;block_len &gt; count) {</div><div class='add'>+		if (em-&gt;disk_num_bytes &gt; count) {</div><div class='ctx'> 			ret = -ENOBUFS;</div><div class='ctx'> 			goto out_em;</div><div class='ctx'> 		}</div><div class='del'>-		disk_io_size = em-&gt;block_len;</div><div class='del'>-		count = em-&gt;block_len;</div><div class='add'>+		*disk_io_size = em-&gt;disk_num_bytes;</div><div class='add'>+		count = em-&gt;disk_num_bytes;</div><div class='ctx'> 		encoded-&gt;unencoded_len = em-&gt;ram_bytes;</div><div class='del'>-		encoded-&gt;unencoded_offset = iocb-&gt;ki_pos - em-&gt;orig_start;</div><div class='add'>+		encoded-&gt;unencoded_offset = iocb-&gt;ki_pos - (em-&gt;start - em-&gt;offset);</div><div class='ctx'> 		ret = btrfs_encoded_io_compression_from_extent(fs_info,</div><div class='del'>-							       extent_map_compression(em));</div><div class='add'>+					       btrfs_extent_map_compression(em));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_em;</div><div class='ctx'> 		encoded-&gt;compression = ret;</div><div class='ctx'> 	} else {</div><div class='del'>-		disk_bytenr = em-&gt;block_start + (start - em-&gt;start);</div><div class='add'>+		*disk_bytenr = btrfs_extent_map_block_start(em) + (start - em-&gt;start);</div><div class='ctx'> 		if (encoded-&gt;len &gt; count)</div><div class='ctx'> 			encoded-&gt;len = count;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Don't read beyond what we locked. This also limits the page</div><div class='ctx'> 		 * allocations that we'll do.</div><div class='ctx'> 		 */</div><div class='del'>-		disk_io_size = min(lockend + 1, iocb-&gt;ki_pos + encoded-&gt;len) - start;</div><div class='del'>-		count = start + disk_io_size - iocb-&gt;ki_pos;</div><div class='add'>+		*disk_io_size = min(lockend + 1, iocb-&gt;ki_pos + encoded-&gt;len) - start;</div><div class='add'>+		count = start + *disk_io_size - iocb-&gt;ki_pos;</div><div class='ctx'> 		encoded-&gt;len = count;</div><div class='ctx'> 		encoded-&gt;unencoded_len = count;</div><div class='del'>-		disk_io_size = ALIGN(disk_io_size, fs_info-&gt;sectorsize);</div><div class='add'>+		*disk_io_size = ALIGN(*disk_io_size, fs_info-&gt;sectorsize);</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	em = NULL;</div><div class='ctx'> </div><div class='del'>-	if (disk_bytenr == EXTENT_MAP_HOLE) {</div><div class='del'>-		unlock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='add'>+	if (*disk_bytenr == EXTENT_MAP_HOLE) {</div><div class='add'>+		btrfs_unlock_extent(io_tree, start, lockend, cached_state);</div><div class='ctx'> 		btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='ctx'> 		unlocked = true;</div><div class='ctx'> 		ret = iov_iter_zero(count, iter);</div><div class='ctx'> 		if (ret != count)</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = btrfs_encoded_read_regular(iocb, iter, start, lockend,</div><div class='del'>-						 &amp;cached_state, disk_bytenr,</div><div class='del'>-						 disk_io_size, count,</div><div class='del'>-						 encoded-&gt;compression,</div><div class='del'>-						 &amp;unlocked);</div><div class='add'>+		ret = -EIOCBQUEUED;</div><div class='add'>+		goto out_unlock_extent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		iocb-&gt;ki_pos += encoded-&gt;len;</div><div class='ctx'> out_em:</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> out_unlock_extent:</div><div class='del'>-	if (!unlocked)</div><div class='del'>-		unlock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='add'>+	/* Leave inode and extent locked if we need to do a read. */</div><div class='add'>+	if (!unlocked &amp;&amp; ret != -EIOCBQUEUED)</div><div class='add'>+		btrfs_unlock_extent(io_tree, start, lockend, cached_state);</div><div class='ctx'> out_unlock_inode:</div><div class='del'>-	if (!unlocked)</div><div class='add'>+	if (!unlocked &amp;&amp; ret != -EIOCBQUEUED)</div><div class='ctx'> 		btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -10233,12 +9742,13 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	struct extent_changeset *data_reserved = NULL;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	struct btrfs_file_extent file_extent;</div><div class='ctx'> 	int compression;</div><div class='ctx'> 	size_t orig_count;</div><div class='ctx'> 	u64 start, end;</div><div class='ctx'> 	u64 num_bytes, ram_bytes, disk_num_bytes;</div><div class='del'>-	unsigned long nr_pages, i;</div><div class='del'>-	struct page **pages;</div><div class='add'>+	unsigned long nr_folios, i;</div><div class='add'>+	struct folio **folios;</div><div class='ctx'> 	struct btrfs_key ins;</div><div class='ctx'> 	bool extent_reserved = false;</div><div class='ctx'> 	struct extent_map *em;</div><div class='hunk'>@@ -10269,6 +9779,13 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	if (encoded-&gt;encryption != BTRFS_ENCODED_IO_ENCRYPTION_NONE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Compressed extents should always have checksums, so error out if we</div><div class='add'>+	 * have a NOCOW file or inode was created while mounted with NODATASUM.</div><div class='add'>+	 */</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_NODATASUM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	orig_count = iov_iter_count(from);</div><div class='ctx'> </div><div class='ctx'> 	/* The extent size must be sane. */</div><div class='hunk'>@@ -10320,24 +9837,24 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	 * isn't.</div><div class='ctx'> 	 */</div><div class='ctx'> 	disk_num_bytes = ALIGN(orig_count, fs_info-&gt;sectorsize);</div><div class='del'>-	nr_pages = DIV_ROUND_UP(disk_num_bytes, PAGE_SIZE);</div><div class='del'>-	pages = kvcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL_ACCOUNT);</div><div class='del'>-	if (!pages)</div><div class='add'>+	nr_folios = DIV_ROUND_UP(disk_num_bytes, PAGE_SIZE);</div><div class='add'>+	folios = kvcalloc(nr_folios, sizeof(struct folio *), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!folios)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++) {</div><div class='add'>+	for (i = 0; i &lt; nr_folios; i++) {</div><div class='ctx'> 		size_t bytes = min_t(size_t, PAGE_SIZE, iov_iter_count(from));</div><div class='ctx'> 		char *kaddr;</div><div class='ctx'> </div><div class='del'>-		pages[i] = alloc_page(GFP_KERNEL_ACCOUNT);</div><div class='del'>-		if (!pages[i]) {</div><div class='add'>+		folios[i] = folio_alloc(GFP_KERNEL_ACCOUNT, 0);</div><div class='add'>+		if (!folios[i]) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='del'>-			goto out_pages;</div><div class='add'>+			goto out_folios;</div><div class='ctx'> 		}</div><div class='del'>-		kaddr = kmap_local_page(pages[i]);</div><div class='add'>+		kaddr = kmap_local_folio(folios[i], 0);</div><div class='ctx'> 		if (copy_from_iter(kaddr, bytes, from) != bytes) {</div><div class='ctx'> 			kunmap_local(kaddr);</div><div class='ctx'> 			ret = -EFAULT;</div><div class='del'>-			goto out_pages;</div><div class='add'>+			goto out_folios;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (bytes &lt; PAGE_SIZE)</div><div class='ctx'> 			memset(kaddr + bytes, 0, PAGE_SIZE - bytes);</div><div class='hunk'>@@ -10345,24 +9862,22 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		struct btrfs_ordered_extent *ordered;</div><div class='del'>-</div><div class='del'>-		ret = btrfs_wait_ordered_range(&amp;inode-&gt;vfs_inode, start, num_bytes);</div><div class='add'>+		ret = btrfs_wait_ordered_range(inode, start, num_bytes);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out_pages;</div><div class='add'>+			goto out_folios;</div><div class='ctx'> 		ret = invalidate_inode_pages2_range(inode-&gt;vfs_inode.i_mapping,</div><div class='ctx'> 						    start &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 						    end &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out_pages;</div><div class='del'>-		lock_extent(io_tree, start, end, &amp;cached_state);</div><div class='add'>+			goto out_folios;</div><div class='add'>+		btrfs_lock_extent(io_tree, start, end, &amp;cached_state);</div><div class='ctx'> 		ordered = btrfs_lookup_ordered_range(inode, start, num_bytes);</div><div class='ctx'> 		if (!ordered &amp;&amp;</div><div class='ctx'> 		    !filemap_range_has_page(inode-&gt;vfs_inode.i_mapping, start, end))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (ordered)</div><div class='ctx'> 			btrfs_put_ordered_extent(ordered);</div><div class='del'>-		unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -10382,10 +9897,12 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 		goto out_qgroup_free_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Try an inline extent first. */</div><div class='del'>-	if (start == 0 &amp;&amp; encoded-&gt;unencoded_len == encoded-&gt;len &amp;&amp;</div><div class='del'>-	    encoded-&gt;unencoded_offset == 0) {</div><div class='del'>-		ret = cow_file_range_inline(inode, encoded-&gt;len, orig_count,</div><div class='del'>-					    compression, pages, true);</div><div class='add'>+	if (encoded-&gt;unencoded_len == encoded-&gt;len &amp;&amp;</div><div class='add'>+	    encoded-&gt;unencoded_offset == 0 &amp;&amp;</div><div class='add'>+	    can_cow_file_range_inline(inode, start, encoded-&gt;len, orig_count)) {</div><div class='add'>+		ret = __cow_file_range_inline(inode, encoded-&gt;len,</div><div class='add'>+					      orig_count, compression, folios[0],</div><div class='add'>+					      true);</div><div class='ctx'> 		if (ret &lt;= 0) {</div><div class='ctx'> 			if (ret == 0)</div><div class='ctx'> 				ret = orig_count;</div><div class='hunk'>@@ -10394,27 +9911,27 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_reserve_extent(root, disk_num_bytes, disk_num_bytes,</div><div class='del'>-				   disk_num_bytes, 0, 0, &amp;ins, 1, 1);</div><div class='add'>+				   disk_num_bytes, 0, 0, &amp;ins, true, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_delalloc_release;</div><div class='ctx'> 	extent_reserved = true;</div><div class='ctx'> </div><div class='del'>-	em = create_io_em(inode, start, num_bytes,</div><div class='del'>-			  start - encoded-&gt;unencoded_offset, ins.objectid,</div><div class='del'>-			  ins.offset, ins.offset, ram_bytes, compression,</div><div class='del'>-			  BTRFS_ORDERED_COMPRESSED);</div><div class='add'>+	file_extent.disk_bytenr = ins.objectid;</div><div class='add'>+	file_extent.disk_num_bytes = ins.offset;</div><div class='add'>+	file_extent.num_bytes = num_bytes;</div><div class='add'>+	file_extent.ram_bytes = ram_bytes;</div><div class='add'>+	file_extent.offset = encoded-&gt;unencoded_offset;</div><div class='add'>+	file_extent.compression = compression;</div><div class='add'>+	em = btrfs_create_io_em(inode, start, &amp;file_extent, BTRFS_ORDERED_COMPRESSED);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		ret = PTR_ERR(em);</div><div class='ctx'> 		goto out_free_reserved;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	ordered = btrfs_alloc_ordered_extent(inode, start, num_bytes, ram_bytes,</div><div class='del'>-				       ins.objectid, ins.offset,</div><div class='del'>-				       encoded-&gt;unencoded_offset,</div><div class='del'>-				       (1 &lt;&lt; BTRFS_ORDERED_ENCODED) |</div><div class='del'>-				       (1 &lt;&lt; BTRFS_ORDERED_COMPRESSED),</div><div class='del'>-				       compression);</div><div class='add'>+	ordered = btrfs_alloc_ordered_extent(inode, start, &amp;file_extent,</div><div class='add'>+				       (1U &lt;&lt; BTRFS_ORDERED_ENCODED) |</div><div class='add'>+				       (1U &lt;&lt; BTRFS_ORDERED_COMPRESSED));</div><div class='ctx'> 	if (IS_ERR(ordered)) {</div><div class='ctx'> 		btrfs_drop_extent_map_range(inode, start, end, false);</div><div class='ctx'> 		ret = PTR_ERR(ordered);</div><div class='hunk'>@@ -10425,17 +9942,17 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	if (start + encoded-&gt;len &gt; inode-&gt;vfs_inode.i_size)</div><div class='ctx'> 		i_size_write(&amp;inode-&gt;vfs_inode, start + encoded-&gt;len);</div><div class='ctx'> </div><div class='del'>-	unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_delalloc_release_extents(inode, num_bytes);</div><div class='ctx'> </div><div class='del'>-	btrfs_submit_compressed_write(ordered, pages, nr_pages, 0, false);</div><div class='add'>+	btrfs_submit_compressed_write(ordered, folios, nr_folios, 0, false);</div><div class='ctx'> 	ret = orig_count;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_free_reserved:</div><div class='ctx'> 	btrfs_dec_block_group_reservations(fs_info, ins.objectid);</div><div class='del'>-	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);</div><div class='add'>+	btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);</div><div class='ctx'> out_delalloc_release:</div><div class='ctx'> 	btrfs_delalloc_release_extents(inode, num_bytes);</div><div class='ctx'> 	btrfs_delalloc_release_metadata(inode, disk_num_bytes, ret &lt; 0);</div><div class='hunk'>@@ -10448,15 +9965,15 @@ out_free_data_space:</div><div class='ctx'> 	 * bytes_may_use.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!extent_reserved)</div><div class='del'>-		btrfs_free_reserved_data_space_noquota(fs_info, disk_num_bytes);</div><div class='add'>+		btrfs_free_reserved_data_space_noquota(inode, disk_num_bytes);</div><div class='ctx'> out_unlock:</div><div class='del'>-	unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='del'>-out_pages:</div><div class='del'>-	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		if (pages[i])</div><div class='del'>-			__free_page(pages[i]);</div><div class='add'>+	btrfs_unlock_extent(io_tree, start, end, &amp;cached_state);</div><div class='add'>+out_folios:</div><div class='add'>+	for (i = 0; i &lt; nr_folios; i++) {</div><div class='add'>+		if (folios[i])</div><div class='add'>+			folio_put(folios[i]);</div><div class='ctx'> 	}</div><div class='del'>-	kvfree(pages);</div><div class='add'>+	kvfree(folios);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret &gt;= 0)</div><div class='ctx'> 		iocb-&gt;ki_pos += encoded-&gt;len;</div><div class='hunk'>@@ -10603,39 +10120,59 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct extent_io_tree *io_tree = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='del'>-	struct extent_map *em = NULL;</div><div class='ctx'> 	struct btrfs_chunk_map *map = NULL;</div><div class='ctx'> 	struct btrfs_device *device = NULL;</div><div class='ctx'> 	struct btrfs_swap_info bsi = {</div><div class='ctx'> 		.lowest_ppage = (sector_t)-1ULL,</div><div class='ctx'> 	};</div><div class='add'>+	struct btrfs_backref_share_check_ctx *backref_ctx = NULL;</div><div class='add'>+	struct btrfs_path *path = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u64 isize;</div><div class='del'>-	u64 start;</div><div class='add'>+	u64 prev_extent_end = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Acquire the inode's mmap lock to prevent races with memory mapped</div><div class='add'>+	 * writes, as they could happen after we flush delalloc below and before</div><div class='add'>+	 * we lock the extent range further below. The inode was already locked</div><div class='add'>+	 * up in the call chain.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_assert_inode_locked(BTRFS_I(inode));</div><div class='add'>+	down_write(&amp;BTRFS_I(inode)-&gt;i_mmap_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the swap file was just created, make sure delalloc is done. If the</div><div class='ctx'> 	 * file changes again after this, the user is doing something stupid and</div><div class='ctx'> 	 * we don't really care.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_wait_ordered_range(inode, 0, (u64)-1);</div><div class='add'>+	ret = btrfs_wait_ordered_range(BTRFS_I(inode), 0, (u64)-1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The inode is locked, so these flags won't change after we check them.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_COMPRESS) {</div><div class='ctx'> 		btrfs_warn(fs_info, "swapfile must not be compressed");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_NODATACOW)) {</div><div class='ctx'> 		btrfs_warn(fs_info, "swapfile must not be copy-on-write");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(BTRFS_I(inode)-&gt;flags &amp; BTRFS_INODE_NODATASUM)) {</div><div class='ctx'> 		btrfs_warn(fs_info, "swapfile must not be checksummed");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	backref_ctx = btrfs_alloc_backref_share_check_ctx();</div><div class='add'>+	if (!path || !backref_ctx) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -10650,7 +10187,8 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 	if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_SWAP_ACTIVATE)) {</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 	   "cannot activate swapfile while exclusive operation is running");</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -10664,7 +10202,8 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 		btrfs_exclop_finish(fs_info);</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 	   "cannot activate swapfile because snapshot creation is in progress");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Snapshots can create extents which require COW even if NODATACOW is</div><div class='hunk'>@@ -10680,36 +10219,53 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 	if (btrfs_root_dead(root)) {</div><div class='ctx'> 		spin_unlock(&amp;root-&gt;root_item_lock);</div><div class='ctx'> </div><div class='add'>+		btrfs_drew_write_unlock(&amp;root-&gt;snapshot_lock);</div><div class='ctx'> 		btrfs_exclop_finish(fs_info);</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 		"cannot activate swapfile because subvolume %llu is being deleted",</div><div class='del'>-			root-&gt;root_key.objectid);</div><div class='del'>-		return -EPERM;</div><div class='add'>+			btrfs_root_id(root));</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out_unlock_mmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_inc(&amp;root-&gt;nr_swapfiles);</div><div class='ctx'> 	spin_unlock(&amp;root-&gt;root_item_lock);</div><div class='ctx'> </div><div class='ctx'> 	isize = ALIGN_DOWN(inode-&gt;i_size, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='del'>-	lock_extent(io_tree, 0, isize - 1, &amp;cached_state);</div><div class='del'>-	start = 0;</div><div class='del'>-	while (start &lt; isize) {</div><div class='del'>-		u64 logical_block_start, physical_block_start;</div><div class='add'>+	btrfs_lock_extent(io_tree, 0, isize - 1, &amp;cached_state);</div><div class='add'>+	while (prev_extent_end &lt; isize) {</div><div class='add'>+		struct btrfs_key key;</div><div class='add'>+		struct extent_buffer *leaf;</div><div class='add'>+		struct btrfs_file_extent_item *ei;</div><div class='ctx'> 		struct btrfs_block_group *bg;</div><div class='del'>-		u64 len = isize - start;</div><div class='add'>+		u64 logical_block_start;</div><div class='add'>+		u64 physical_block_start;</div><div class='add'>+		u64 extent_gen;</div><div class='add'>+		u64 disk_bytenr;</div><div class='add'>+		u64 len;</div><div class='ctx'> </div><div class='del'>-		em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, start, len);</div><div class='del'>-		if (IS_ERR(em)) {</div><div class='del'>-			ret = PTR_ERR(em);</div><div class='add'>+		key.objectid = btrfs_ino(BTRFS_I(inode));</div><div class='add'>+		key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='add'>+		key.offset = prev_extent_end;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (em-&gt;block_start == EXTENT_MAP_HOLE) {</div><div class='add'>+		/*</div><div class='add'>+		 * If key not found it means we have an implicit hole (NO_HOLES</div><div class='add'>+		 * is enabled).</div><div class='add'>+		 */</div><div class='add'>+		if (ret &gt; 0) {</div><div class='ctx'> 			btrfs_warn(fs_info, "swapfile must not have holes");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (em-&gt;block_start == EXTENT_MAP_INLINE) {</div><div class='add'>+</div><div class='add'>+		leaf = path-&gt;nodes[0];</div><div class='add'>+		ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='add'>+</div><div class='add'>+		if (btrfs_file_extent_type(leaf, ei) == BTRFS_FILE_EXTENT_INLINE) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * It's unlikely we'll ever actually find ourselves</div><div class='ctx'> 			 * here, as a file small enough to fit inline won't be</div><div class='hunk'>@@ -10721,23 +10277,45 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (extent_map_is_compressed(em)) {</div><div class='add'>+</div><div class='add'>+		if (btrfs_file_extent_compression(leaf, ei) != BTRFS_COMPRESS_NONE) {</div><div class='ctx'> 			btrfs_warn(fs_info, "swapfile must not be compressed");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		logical_block_start = em-&gt;block_start + (start - em-&gt;start);</div><div class='del'>-		len = min(len, em-&gt;len - (start - em-&gt;start));</div><div class='del'>-		free_extent_map(em);</div><div class='del'>-		em = NULL;</div><div class='add'>+		disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='add'>+		if (disk_bytenr == 0) {</div><div class='add'>+			btrfs_warn(fs_info, "swapfile must not have holes");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		logical_block_start = disk_bytenr + btrfs_file_extent_offset(leaf, ei);</div><div class='add'>+		extent_gen = btrfs_file_extent_generation(leaf, ei);</div><div class='add'>+		prev_extent_end = btrfs_file_extent_end(path);</div><div class='add'>+</div><div class='add'>+		if (prev_extent_end &gt; isize)</div><div class='add'>+			len = isize - key.offset;</div><div class='add'>+		else</div><div class='add'>+			len = btrfs_file_extent_num_bytes(leaf, ei);</div><div class='add'>+</div><div class='add'>+		backref_ctx-&gt;curr_leaf_bytenr = leaf-&gt;start;</div><div class='ctx'> </div><div class='del'>-		ret = can_nocow_extent(inode, start, &amp;len, NULL, NULL, NULL, false, true);</div><div class='add'>+		/*</div><div class='add'>+		 * Don't need the path anymore, release to avoid deadlocks when</div><div class='add'>+		 * calling btrfs_is_data_extent_shared() because when joining a</div><div class='add'>+		 * transaction it can block waiting for the current one's commit</div><div class='add'>+		 * which in turn may be trying to lock the same leaf to flush</div><div class='add'>+		 * delayed items for example.</div><div class='add'>+		 */</div><div class='add'>+		btrfs_release_path(path);</div><div class='add'>+</div><div class='add'>+		ret = btrfs_is_data_extent_shared(BTRFS_I(inode), disk_bytenr,</div><div class='add'>+						  extent_gen, backref_ctx);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			goto out;</div><div class='del'>-		} else if (ret) {</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else {</div><div class='add'>+		} else if (ret &gt; 0) {</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "swapfile must not be copy-on-write");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='hunk'>@@ -10772,7 +10350,6 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 		physical_block_start = (map-&gt;stripes[0].physical +</div><div class='ctx'> 					(logical_block_start - map-&gt;start));</div><div class='del'>-		len = min(len, map-&gt;chunk_len - (logical_block_start - map-&gt;start));</div><div class='ctx'> 		btrfs_free_chunk_map(map);</div><div class='ctx'> 		map = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -10813,24 +10390,27 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto out;</div><div class='ctx'> 			}</div><div class='del'>-			bsi.start = start;</div><div class='add'>+			bsi.start = key.offset;</div><div class='ctx'> 			bsi.block_start = physical_block_start;</div><div class='ctx'> 			bsi.block_len = len;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		start += len;</div><div class='add'>+		if (fatal_signal_pending(current)) {</div><div class='add'>+			ret = -EINTR;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bsi.block_len)</div><div class='ctx'> 		ret = btrfs_add_swap_extent(sis, &amp;bsi);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (!IS_ERR_OR_NULL(em))</div><div class='del'>-		free_extent_map(em);</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(map))</div><div class='ctx'> 		btrfs_free_chunk_map(map);</div><div class='ctx'> </div><div class='del'>-	unlock_extent(io_tree, 0, isize - 1, &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(io_tree, 0, isize - 1, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_swap_deactivate(file);</div><div class='hunk'>@@ -10839,6 +10419,10 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	btrfs_exclop_finish(fs_info);</div><div class='ctx'> </div><div class='add'>+out_unlock_mmap:</div><div class='add'>+	up_write(&amp;BTRFS_I(inode)-&gt;i_mmap_lock);</div><div class='add'>+	btrfs_free_backref_share_ctx(backref_ctx);</div><div class='add'>+	btrfs_free_path(path);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -10847,7 +10431,6 @@ out:</div><div class='ctx'> 	*span = bsi.highest_ppage - bsi.lowest_ppage + 1;</div><div class='ctx'> 	sis-&gt;max = bsi.nr_pages;</div><div class='ctx'> 	sis-&gt;pages = bsi.nr_pages - 1;</div><div class='del'>-	sis-&gt;highest_bit = bsi.nr_pages - 1;</div><div class='ctx'> 	return bsi.nr_extents;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -10909,7 +10492,7 @@ void btrfs_assert_inode_range_clean(struct btrfs_inode *inode, u64 start, u64 en</div><div class='ctx'> 	if (ordered) {</div><div class='ctx'> 		btrfs_err(root-&gt;fs_info,</div><div class='ctx'> "found unexpected ordered extent in file range [%llu, %llu] for inode %llu root %llu (ordered range [%llu, %llu])",</div><div class='del'>-			  start, end, btrfs_ino(inode), root-&gt;root_key.objectid,</div><div class='add'>+			  start, end, btrfs_ino(inode), btrfs_root_id(root),</div><div class='ctx'> 			  ordered-&gt;file_offset,</div><div class='ctx'> 			  ordered-&gt;file_offset + ordered-&gt;num_bytes - 1);</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='hunk'>@@ -10918,6 +10501,36 @@ void btrfs_assert_inode_range_clean(struct btrfs_inode *inode, u64 start, u64 en</div><div class='ctx'> 	ASSERT(ordered == NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Find the first inode with a minimum number.</div><div class='add'>+ *</div><div class='add'>+ * @root:	The root to search for.</div><div class='add'>+ * @min_ino:	The minimum inode number.</div><div class='add'>+ *</div><div class='add'>+ * Find the first inode in the @root with a number &gt;= @min_ino and return it.</div><div class='add'>+ * Returns NULL if no such inode found.</div><div class='add'>+ */</div><div class='add'>+struct btrfs_inode *btrfs_find_first_inode(struct btrfs_root *root, u64 min_ino)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	unsigned long from = min_ino;</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;root-&gt;inodes);</div><div class='add'>+	while (true) {</div><div class='add'>+		inode = xa_find(&amp;root-&gt;inodes, &amp;from, ULONG_MAX, XA_PRESENT);</div><div class='add'>+		if (!inode)</div><div class='add'>+			break;</div><div class='add'>+		if (igrab(&amp;inode-&gt;vfs_inode))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		from = btrfs_ino(inode) + 1;</div><div class='add'>+		cond_resched_lock(&amp;root-&gt;inodes.xa_lock);</div><div class='add'>+	}</div><div class='add'>+	xa_unlock(&amp;root-&gt;inodes);</div><div class='add'>+</div><div class='add'>+	return inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct inode_operations btrfs_dir_inode_operations = {</div><div class='ctx'> 	.getattr	= btrfs_getattr,</div><div class='ctx'> 	.lookup		= btrfs_lookup,</div><div class='hunk'>@@ -10970,6 +10583,7 @@ static const struct address_space_operations btrfs_aops = {</div><div class='ctx'> 	.writepages	= btrfs_writepages,</div><div class='ctx'> 	.readahead	= btrfs_readahead,</div><div class='ctx'> 	.invalidate_folio = btrfs_invalidate_folio,</div><div class='add'>+	.launder_folio	= btrfs_launder_folio,</div><div class='ctx'> 	.release_folio	= btrfs_release_folio,</div><div class='ctx'> 	.migrate_folio	= btrfs_migrate_folio,</div><div class='ctx'> 	.dirty_folio	= filemap_dirty_folio,</div><div class='head'>diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c<br/>index 9e0b3932d90c..acb484546b1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ioctl.c</a></div><div class='hunk'>@@ -29,16 +29,15 @@</div><div class='ctx'> #include &lt;linux/fileattr.h&gt;</div><div class='ctx'> #include &lt;linux/fsverity.h&gt;</div><div class='ctx'> #include &lt;linux/sched/xacct.h&gt;</div><div class='add'>+#include &lt;linux/io_uring/cmd.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "export.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "locking.h"</div><div class='ctx'> #include "backref.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "send.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='ctx'> #include "props.h"</div><div class='hunk'>@@ -47,9 +46,7 @@</div><div class='ctx'> #include "tree-log.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "space-info.h"</div><div class='del'>-#include "delalloc-space.h"</div><div class='ctx'> #include "block-group.h"</div><div class='del'>-#include "subpage.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "extent-tree.h"</div><div class='hunk'>@@ -121,8 +118,8 @@ struct btrfs_ioctl_encoded_io_args_32 {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Mask out flags that are inappropriate for the given type of inode. */</div><div class='del'>-static unsigned int btrfs_mask_fsflags_for_type(struct inode *inode,</div><div class='del'>-		unsigned int flags)</div><div class='add'>+static unsigned int btrfs_mask_fsflags_for_type(const struct inode *inode,</div><div class='add'>+						unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		return flags;</div><div class='hunk'>@@ -136,11 +133,11 @@ static unsigned int btrfs_mask_fsflags_for_type(struct inode *inode,</div><div class='ctx'>  * Export internal inode flags to the format expected by the FS_IOC_GETFLAGS</div><div class='ctx'>  * ioctl.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int btrfs_inode_flags_to_fsflags(struct btrfs_inode *binode)</div><div class='add'>+static unsigned int btrfs_inode_flags_to_fsflags(const struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int iflags = 0;</div><div class='del'>-	u32 flags = binode-&gt;flags;</div><div class='del'>-	u32 ro_flags = binode-&gt;ro_flags;</div><div class='add'>+	u32 flags = inode-&gt;flags;</div><div class='add'>+	u32 ro_flags = inode-&gt;ro_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; BTRFS_INODE_SYNC)</div><div class='ctx'> 		iflags |= FS_SYNC_FL;</div><div class='hunk'>@@ -170,25 +167,24 @@ static unsigned int btrfs_inode_flags_to_fsflags(struct btrfs_inode *binode)</div><div class='ctx'> /*</div><div class='ctx'>  * Update inode-&gt;i_flags based on the btrfs internal flags.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_sync_inode_flags_to_i_flags(struct inode *inode)</div><div class='add'>+void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *binode = BTRFS_I(inode);</div><div class='ctx'> 	unsigned int new_fl = 0;</div><div class='ctx'> </div><div class='del'>-	if (binode-&gt;flags &amp; BTRFS_INODE_SYNC)</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_SYNC)</div><div class='ctx'> 		new_fl |= S_SYNC;</div><div class='del'>-	if (binode-&gt;flags &amp; BTRFS_INODE_IMMUTABLE)</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_IMMUTABLE)</div><div class='ctx'> 		new_fl |= S_IMMUTABLE;</div><div class='del'>-	if (binode-&gt;flags &amp; BTRFS_INODE_APPEND)</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_APPEND)</div><div class='ctx'> 		new_fl |= S_APPEND;</div><div class='del'>-	if (binode-&gt;flags &amp; BTRFS_INODE_NOATIME)</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_NOATIME)</div><div class='ctx'> 		new_fl |= S_NOATIME;</div><div class='del'>-	if (binode-&gt;flags &amp; BTRFS_INODE_DIRSYNC)</div><div class='add'>+	if (inode-&gt;flags &amp; BTRFS_INODE_DIRSYNC)</div><div class='ctx'> 		new_fl |= S_DIRSYNC;</div><div class='del'>-	if (binode-&gt;ro_flags &amp; BTRFS_INODE_RO_VERITY)</div><div class='add'>+	if (inode-&gt;ro_flags &amp; BTRFS_INODE_RO_VERITY)</div><div class='ctx'> 		new_fl |= S_VERITY;</div><div class='ctx'> </div><div class='del'>-	set_mask_bits(&amp;inode-&gt;i_flags,</div><div class='add'>+	set_mask_bits(&amp;inode-&gt;vfs_inode.i_flags,</div><div class='ctx'> 		      S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC |</div><div class='ctx'> 		      S_VERITY, new_fl);</div><div class='ctx'> }</div><div class='hunk'>@@ -222,7 +218,7 @@ static int check_fsflags(unsigned int old_flags, unsigned int flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_fsflags_compatible(struct btrfs_fs_info *fs_info,</div><div class='add'>+static int check_fsflags_compatible(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				    unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_is_zoned(fs_info) &amp;&amp; (flags &amp; FS_NOCOW_FL))</div><div class='hunk'>@@ -231,30 +227,43 @@ static int check_fsflags_compatible(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int btrfs_check_ioctl_vol_args_path(const struct btrfs_ioctl_vol_args *vol_args)</div><div class='add'>+{</div><div class='add'>+	if (memchr(vol_args-&gt;name, 0, sizeof(vol_args-&gt;name)) == NULL)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_check_ioctl_vol_args2_subvol_name(const struct btrfs_ioctl_vol_args_v2 *vol_args2)</div><div class='add'>+{</div><div class='add'>+	if (memchr(vol_args2-&gt;name, 0, sizeof(vol_args2-&gt;name)) == NULL)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Set flags/xflags from the internal inode flags. The remaining items of</div><div class='ctx'>  * fsxattr are zeroed.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int btrfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *binode = BTRFS_I(d_inode(dentry));</div><div class='add'>+	const struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));</div><div class='ctx'> </div><div class='del'>-	fileattr_fill_flags(fa, btrfs_inode_flags_to_fsflags(binode));</div><div class='add'>+	fileattr_fill_flags(fa, btrfs_inode_flags_to_fsflags(inode));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		       struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		       struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_inode *binode = BTRFS_I(inode);</div><div class='del'>-	struct btrfs_root *root = binode-&gt;root;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(d_inode(dentry));</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	unsigned int fsflags, old_fsflags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	const char *comp = NULL;</div><div class='del'>-	u32 binode_flags;</div><div class='add'>+	u32 inode_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_root_readonly(root))</div><div class='ctx'> 		return -EROFS;</div><div class='hunk'>@@ -262,8 +271,8 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (fileattr_has_fsx(fa))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	fsflags = btrfs_mask_fsflags_for_type(inode, fa-&gt;flags);</div><div class='del'>-	old_fsflags = btrfs_inode_flags_to_fsflags(binode);</div><div class='add'>+	fsflags = btrfs_mask_fsflags_for_type(&amp;inode-&gt;vfs_inode, fa-&gt;flags);</div><div class='add'>+	old_fsflags = btrfs_inode_flags_to_fsflags(inode);</div><div class='ctx'> 	ret = check_fsflags(old_fsflags, fsflags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -272,27 +281,27 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	binode_flags = binode-&gt;flags;</div><div class='add'>+	inode_flags = inode-&gt;flags;</div><div class='ctx'> 	if (fsflags &amp; FS_SYNC_FL)</div><div class='del'>-		binode_flags |= BTRFS_INODE_SYNC;</div><div class='add'>+		inode_flags |= BTRFS_INODE_SYNC;</div><div class='ctx'> 	else</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_SYNC;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_SYNC;</div><div class='ctx'> 	if (fsflags &amp; FS_IMMUTABLE_FL)</div><div class='del'>-		binode_flags |= BTRFS_INODE_IMMUTABLE;</div><div class='add'>+		inode_flags |= BTRFS_INODE_IMMUTABLE;</div><div class='ctx'> 	else</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_IMMUTABLE;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_IMMUTABLE;</div><div class='ctx'> 	if (fsflags &amp; FS_APPEND_FL)</div><div class='del'>-		binode_flags |= BTRFS_INODE_APPEND;</div><div class='add'>+		inode_flags |= BTRFS_INODE_APPEND;</div><div class='ctx'> 	else</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_APPEND;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_APPEND;</div><div class='ctx'> 	if (fsflags &amp; FS_NODUMP_FL)</div><div class='del'>-		binode_flags |= BTRFS_INODE_NODUMP;</div><div class='add'>+		inode_flags |= BTRFS_INODE_NODUMP;</div><div class='ctx'> 	else</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_NODUMP;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_NODUMP;</div><div class='ctx'> 	if (fsflags &amp; FS_NOATIME_FL)</div><div class='del'>-		binode_flags |= BTRFS_INODE_NOATIME;</div><div class='add'>+		inode_flags |= BTRFS_INODE_NOATIME;</div><div class='ctx'> 	else</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_NOATIME;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_NOATIME;</div><div class='ctx'> </div><div class='ctx'> 	/* If coming from FS_IOC_FSSETXATTR then skip unconverted flags */</div><div class='ctx'> 	if (!fa-&gt;flags_valid) {</div><div class='hunk'>@@ -304,32 +313,32 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fsflags &amp; FS_DIRSYNC_FL)</div><div class='del'>-		binode_flags |= BTRFS_INODE_DIRSYNC;</div><div class='add'>+		inode_flags |= BTRFS_INODE_DIRSYNC;</div><div class='ctx'> 	else</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_DIRSYNC;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_DIRSYNC;</div><div class='ctx'> 	if (fsflags &amp; FS_NOCOW_FL) {</div><div class='del'>-		if (S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		if (S_ISREG(inode-&gt;vfs_inode.i_mode)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * It's safe to turn csums off here, no extents exist.</div><div class='ctx'> 			 * Otherwise we want the flag to reflect the real COW</div><div class='ctx'> 			 * status of the file and will not set it.</div><div class='ctx'> 			 */</div><div class='del'>-			if (inode-&gt;i_size == 0)</div><div class='del'>-				binode_flags |= BTRFS_INODE_NODATACOW |</div><div class='del'>-						BTRFS_INODE_NODATASUM;</div><div class='add'>+			if (inode-&gt;vfs_inode.i_size == 0)</div><div class='add'>+				inode_flags |= BTRFS_INODE_NODATACOW |</div><div class='add'>+					       BTRFS_INODE_NODATASUM;</div><div class='ctx'> 		} else {</div><div class='del'>-			binode_flags |= BTRFS_INODE_NODATACOW;</div><div class='add'>+			inode_flags |= BTRFS_INODE_NODATACOW;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Revert back under same assumptions as above</div><div class='ctx'> 		 */</div><div class='del'>-		if (S_ISREG(inode-&gt;i_mode)) {</div><div class='del'>-			if (inode-&gt;i_size == 0)</div><div class='del'>-				binode_flags &amp;= ~(BTRFS_INODE_NODATACOW |</div><div class='del'>-						  BTRFS_INODE_NODATASUM);</div><div class='add'>+		if (S_ISREG(inode-&gt;vfs_inode.i_mode)) {</div><div class='add'>+			if (inode-&gt;vfs_inode.i_size == 0)</div><div class='add'>+				inode_flags &amp;= ~(BTRFS_INODE_NODATACOW |</div><div class='add'>+						 BTRFS_INODE_NODATASUM);</div><div class='ctx'> 		} else {</div><div class='del'>-			binode_flags &amp;= ~BTRFS_INODE_NODATACOW;</div><div class='add'>+			inode_flags &amp;= ~BTRFS_INODE_NODATACOW;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -339,21 +348,21 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 	 * things smaller.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (fsflags &amp; FS_NOCOMP_FL) {</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_COMPRESS;</div><div class='del'>-		binode_flags |= BTRFS_INODE_NOCOMPRESS;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_COMPRESS;</div><div class='add'>+		inode_flags |= BTRFS_INODE_NOCOMPRESS;</div><div class='ctx'> 	} else if (fsflags &amp; FS_COMPR_FL) {</div><div class='ctx'> </div><div class='del'>-		if (IS_SWAPFILE(inode))</div><div class='add'>+		if (IS_SWAPFILE(&amp;inode-&gt;vfs_inode))</div><div class='ctx'> 			return -ETXTBSY;</div><div class='ctx'> </div><div class='del'>-		binode_flags |= BTRFS_INODE_COMPRESS;</div><div class='del'>-		binode_flags &amp;= ~BTRFS_INODE_NOCOMPRESS;</div><div class='add'>+		inode_flags |= BTRFS_INODE_COMPRESS;</div><div class='add'>+		inode_flags &amp;= ~BTRFS_INODE_NOCOMPRESS;</div><div class='ctx'> </div><div class='ctx'> 		comp = btrfs_compress_type2str(fs_info-&gt;compress_type);</div><div class='ctx'> 		if (!comp || comp[0] == 0)</div><div class='ctx'> 			comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB);</div><div class='ctx'> 	} else {</div><div class='del'>-		binode_flags &amp;= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);</div><div class='add'>+		inode_flags &amp;= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -365,114 +374,34 @@ int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 		return PTR_ERR(trans);</div><div class='ctx'> </div><div class='ctx'> 	if (comp) {</div><div class='del'>-		ret = btrfs_set_prop(trans, inode, "btrfs.compression", comp,</div><div class='del'>-				     strlen(comp), 0);</div><div class='del'>-		if (ret) {</div><div class='add'>+		ret = btrfs_set_prop(trans, inode, "btrfs.compression",</div><div class='add'>+				     comp, strlen(comp), 0);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_end_trans;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL,</div><div class='del'>-				     0, 0);</div><div class='del'>-		if (ret &amp;&amp; ret != -ENODATA) {</div><div class='add'>+		ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL, 0, 0);</div><div class='add'>+		if (unlikely(ret &amp;&amp; ret != -ENODATA)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_end_trans;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> update_flags:</div><div class='del'>-	binode-&gt;flags = binode_flags;</div><div class='add'>+	inode-&gt;flags = inode_flags;</div><div class='add'>+	btrfs_update_inode_mapping_flags(inode);</div><div class='ctx'> 	btrfs_sync_inode_flags_to_i_flags(inode);</div><div class='del'>-	inode_inc_iversion(inode);</div><div class='del'>-	inode_set_ctime_current(inode);</div><div class='del'>-	ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='add'>+	inode_inc_iversion(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	inode_set_ctime_current(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	ret = btrfs_update_inode(trans, inode);</div><div class='ctx'> </div><div class='ctx'>  out_end_trans:</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Start exclusive operation @type, return true on success</div><div class='del'>- */</div><div class='del'>-bool btrfs_exclop_start(struct btrfs_fs_info *fs_info,</div><div class='del'>-			enum btrfs_exclusive_operation type)</div><div class='del'>-{</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	if (fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_NONE) {</div><div class='del'>-		fs_info-&gt;exclusive_operation = type;</div><div class='del'>-		ret = true;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Conditionally allow to enter the exclusive operation in case it's compatible</div><div class='del'>- * with the running one.  This must be paired with btrfs_exclop_start_unlock and</div><div class='del'>- * btrfs_exclop_finish.</div><div class='del'>- *</div><div class='del'>- * Compatibility:</div><div class='del'>- * - the same type is already running</div><div class='del'>- * - when trying to add a device and balance has been paused</div><div class='del'>- * - not BTRFS_EXCLOP_NONE - this is intentionally incompatible and the caller</div><div class='del'>- *   must check the condition first that would allow none -&gt; @type</div><div class='del'>- */</div><div class='del'>-bool btrfs_exclop_start_try_lock(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 enum btrfs_exclusive_operation type)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	if (fs_info-&gt;exclusive_operation == type ||</div><div class='del'>-	    (fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED &amp;&amp;</div><div class='del'>-	     type == BTRFS_EXCLOP_DEV_ADD))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_exclop_start_unlock(struct btrfs_fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_exclop_finish(struct btrfs_fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	WRITE_ONCE(fs_info-&gt;exclusive_operation, BTRFS_EXCLOP_NONE);</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	sysfs_notify(&amp;fs_info-&gt;fs_devices-&gt;fsid_kobj, NULL, "exclusive_operation");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_exclop_balance(struct btrfs_fs_info *fs_info,</div><div class='del'>-			  enum btrfs_exclusive_operation op)</div><div class='del'>-{</div><div class='del'>-	switch (op) {</div><div class='del'>-	case BTRFS_EXCLOP_BALANCE_PAUSED:</div><div class='del'>-		spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-		ASSERT(fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE ||</div><div class='del'>-		       fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_DEV_ADD ||</div><div class='del'>-		       fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_NONE ||</div><div class='del'>-		       fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED);</div><div class='del'>-		fs_info-&gt;exclusive_operation = BTRFS_EXCLOP_BALANCE_PAUSED;</div><div class='del'>-		spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-		break;</div><div class='del'>-	case BTRFS_EXCLOP_BALANCE:</div><div class='del'>-		spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-		ASSERT(fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED);</div><div class='del'>-		fs_info-&gt;exclusive_operation = BTRFS_EXCLOP_BALANCE;</div><div class='del'>-		spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		btrfs_warn(fs_info,</div><div class='del'>-			"invalid exclop balance operation %d requested", op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int btrfs_ioctl_getversion(struct inode *inode, int __user *arg)</div><div class='add'>+static int btrfs_ioctl_getversion(const struct inode *inode, int __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	return put_user(inode-&gt;i_generation, arg);</div><div class='ctx'> }</div><div class='hunk'>@@ -528,36 +457,23 @@ static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * block group is in the logical address space, which can be any</div><div class='ctx'> 	 * sectorsize aligned bytenr in  the range [0, U64_MAX].</div><div class='ctx'> 	 */</div><div class='del'>-	if (range.len &lt; fs_info-&gt;sb-&gt;s_blocksize)</div><div class='add'>+	if (range.len &lt; fs_info-&gt;sectorsize)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	range.minlen = max(range.minlen, minlen);</div><div class='ctx'> 	ret = btrfs_trim_fs(fs_info, &amp;range);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(arg, &amp;range, sizeof(range)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __pure btrfs_is_empty_uuid(u8 *uuid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTRFS_UUID_SIZE; i++) {</div><div class='del'>-		if (uuid[i])</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Calculate the number of transaction items to reserve for creating a subvolume</div><div class='ctx'>  * or snapshot, not including the inode, directory entries, or parent directory.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int create_subvol_num_items(struct btrfs_qgroup_inherit *inherit)</div><div class='add'>+static unsigned int create_subvol_num_items(const struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1 to add root block</div><div class='hunk'>@@ -584,10 +500,10 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 				  struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 				  struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_root_item *root_item;</div><div class='add'>+	struct btrfs_root_item AUTO_KFREE(root_item);</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='hunk'>@@ -603,6 +519,7 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	dev_t anon_dev;</div><div class='ctx'> 	u64 objectid;</div><div class='add'>+	u64 qgroup_reserved = 0;</div><div class='ctx'> </div><div class='ctx'> 	root_item = kzalloc(sizeof(*root_item), GFP_KERNEL);</div><div class='ctx'> 	if (!root_item)</div><div class='hunk'>@@ -610,20 +527,18 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_get_free_objectid(fs_info-&gt;tree_root, &amp;objectid);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_root_item;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't create subvolume whose level is not zero. Or qgroup will be</div><div class='ctx'> 	 * screwed up since it assumes subvolume qgroup's level to be 0.</div><div class='ctx'> 	 */</div><div class='del'>-	if (btrfs_qgroup_level(objectid)) {</div><div class='del'>-		ret = -ENOSPC;</div><div class='del'>-		goto out_root_item;</div><div class='del'>-	}</div><div class='add'>+	if (btrfs_qgroup_level(objectid))</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	ret = get_anon_bdev(&amp;anon_dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out_root_item;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	new_inode_args.inode = btrfs_new_subvol_inode(idmap, dir);</div><div class='ctx'> 	if (!new_inode_args.inode) {</div><div class='hunk'>@@ -640,19 +555,19 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 					       trans_num_items, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_new_inode_args;</div><div class='add'>+	qgroup_reserved = block_rsv.qgroup_rsv_reserved;</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_start_transaction(root, 0);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='ctx'> 		ret = PTR_ERR(trans);</div><div class='del'>-		btrfs_subvolume_release_metadata(root, &amp;block_rsv);</div><div class='del'>-		goto out_new_inode_args;</div><div class='add'>+		goto out_release_rsv;</div><div class='ctx'> 	}</div><div class='add'>+	btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);</div><div class='add'>+	qgroup_reserved = 0;</div><div class='ctx'> 	trans-&gt;block_rsv = &amp;block_rsv;</div><div class='ctx'> 	trans-&gt;bytes_reserved = block_rsv.size;</div><div class='del'>-	/* Tree log can't currently deal with an inode which is a new root. */</div><div class='del'>-	btrfs_set_log_full_commit(trans);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_qgroup_inherit(trans, 0, objectid, root-&gt;root_key.objectid, inherit);</div><div class='add'>+	ret = btrfs_qgroup_inherit(trans, 0, objectid, btrfs_root_id(root), inherit);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -698,11 +613,13 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 	btrfs_set_root_dirid(root_item, BTRFS_FIRST_FREE_OBJECTID);</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = objectid;</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> 	ret = btrfs_insert_root(trans, fs_info-&gt;tree_root, &amp;key,</div><div class='ctx'> 				root_item);</div><div class='ctx'> 	if (ret) {</div><div class='add'>+		int ret2;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Since we don't abort the transaction in this case, free the</div><div class='ctx'> 		 * tree block so that we don't leak space and leave the</div><div class='hunk'>@@ -713,7 +630,9 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 		btrfs_tree_lock(leaf);</div><div class='ctx'> 		btrfs_clear_buffer_dirty(trans, leaf);</div><div class='ctx'> 		btrfs_tree_unlock(leaf);</div><div class='del'>-		btrfs_free_tree_block(trans, objectid, leaf, 0, 1);</div><div class='add'>+		ret2 = btrfs_free_tree_block(trans, objectid, leaf, 0, 1);</div><div class='add'>+		if (unlikely(ret2 &lt; 0))</div><div class='add'>+			btrfs_abort_transaction(trans, ret2);</div><div class='ctx'> 		free_extent_buffer(leaf);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -721,7 +640,7 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 	free_extent_buffer(leaf);</div><div class='ctx'> 	leaf = NULL;</div><div class='ctx'> </div><div class='del'>-	new_root = btrfs_get_new_fs_root(fs_info, objectid, anon_dev);</div><div class='add'>+	new_root = btrfs_get_new_fs_root(fs_info, objectid, &amp;anon_dev);</div><div class='ctx'> 	if (IS_ERR(new_root)) {</div><div class='ctx'> 		ret = PTR_ERR(new_root);</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -733,20 +652,22 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> 	/* ... and new_root is owned by new_inode_args.inode now. */</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_record_root_in_trans(trans, new_root);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_uuid_tree_add(trans, root_item-&gt;uuid,</div><div class='ctx'> 				  BTRFS_UUID_KEY_SUBVOL, objectid);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	btrfs_record_new_subvolume(trans, BTRFS_I(dir));</div><div class='add'>+</div><div class='ctx'> 	ret = btrfs_create_new_inode(trans, &amp;new_inode_args);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -757,9 +678,11 @@ static noinline int create_subvol(struct mnt_idmap *idmap,</div><div class='ctx'> out:</div><div class='ctx'> 	trans-&gt;block_rsv = NULL;</div><div class='ctx'> 	trans-&gt;bytes_reserved = 0;</div><div class='del'>-	btrfs_subvolume_release_metadata(root, &amp;block_rsv);</div><div class='del'>-</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='add'>+out_release_rsv:</div><div class='add'>+	btrfs_block_rsv_release(fs_info, &amp;block_rsv, (u64)-1, NULL);</div><div class='add'>+	if (qgroup_reserved)</div><div class='add'>+		btrfs_qgroup_free_meta_prealloc(root, qgroup_reserved);</div><div class='ctx'> out_new_inode_args:</div><div class='ctx'> 	btrfs_new_inode_args_destroy(&amp;new_inode_args);</div><div class='ctx'> out_inode:</div><div class='hunk'>@@ -767,8 +690,7 @@ out_inode:</div><div class='ctx'> out_anon_dev:</div><div class='ctx'> 	if (anon_dev)</div><div class='ctx'> 		free_anon_bdev(anon_dev);</div><div class='del'>-out_root_item:</div><div class='del'>-	kfree(root_item);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -776,11 +698,13 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,</div><div class='ctx'> 			   struct dentry *dentry, bool readonly,</div><div class='ctx'> 			   struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct btrfs_pending_snapshot *pending_snapshot;</div><div class='ctx'> 	unsigned int trans_num_items;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='add'>+	struct btrfs_block_rsv *block_rsv;</div><div class='add'>+	u64 qgroup_reserved = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* We do not support snapshotting right now. */</div><div class='hunk'>@@ -790,6 +714,9 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (btrfs_root_refs(&amp;root-&gt;root_item) == 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	if (!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -814,24 +741,24 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,</div><div class='ctx'> 		goto free_pending;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_init_block_rsv(&amp;pending_snapshot-&gt;block_rsv,</div><div class='del'>-			     BTRFS_BLOCK_RSV_TEMP);</div><div class='add'>+	block_rsv = &amp;pending_snapshot-&gt;block_rsv;</div><div class='add'>+	btrfs_init_block_rsv(block_rsv, BTRFS_BLOCK_RSV_TEMP);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1 to add dir item</div><div class='ctx'> 	 * 1 to add dir index</div><div class='ctx'> 	 * 1 to update parent inode item</div><div class='ctx'> 	 */</div><div class='ctx'> 	trans_num_items = create_subvol_num_items(inherit) + 3;</div><div class='del'>-	ret = btrfs_subvolume_reserve_metadata(BTRFS_I(dir)-&gt;root,</div><div class='del'>-					       &amp;pending_snapshot-&gt;block_rsv,</div><div class='add'>+	ret = btrfs_subvolume_reserve_metadata(BTRFS_I(dir)-&gt;root, block_rsv,</div><div class='ctx'> 					       trans_num_items, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto free_pending;</div><div class='add'>+	qgroup_reserved = block_rsv-&gt;qgroup_rsv_reserved;</div><div class='ctx'> </div><div class='ctx'> 	pending_snapshot-&gt;dentry = dentry;</div><div class='ctx'> 	pending_snapshot-&gt;root = root;</div><div class='ctx'> 	pending_snapshot-&gt;readonly = readonly;</div><div class='del'>-	pending_snapshot-&gt;dir = dir;</div><div class='add'>+	pending_snapshot-&gt;dir = BTRFS_I(dir);</div><div class='ctx'> 	pending_snapshot-&gt;inherit = inherit;</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_start_transaction(root, 0);</div><div class='hunk'>@@ -839,6 +766,13 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,</div><div class='ctx'> 		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='add'>+	ret = btrfs_record_root_in_trans(trans, BTRFS_I(dir)-&gt;root);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);</div><div class='add'>+	qgroup_reserved = 0;</div><div class='ctx'> </div><div class='ctx'> 	trans-&gt;pending_snapshot = pending_snapshot;</div><div class='ctx'> </div><div class='hunk'>@@ -868,7 +802,9 @@ fail:</div><div class='ctx'> 	if (ret &amp;&amp; pending_snapshot-&gt;snap)</div><div class='ctx'> 		pending_snapshot-&gt;snap-&gt;anon_dev = 0;</div><div class='ctx'> 	btrfs_put_root(pending_snapshot-&gt;snap);</div><div class='del'>-	btrfs_subvolume_release_metadata(root, &amp;pending_snapshot-&gt;block_rsv);</div><div class='add'>+	btrfs_block_rsv_release(fs_info, block_rsv, (u64)-1, NULL);</div><div class='add'>+	if (qgroup_reserved)</div><div class='add'>+		btrfs_qgroup_free_meta_prealloc(root, qgroup_reserved);</div><div class='ctx'> free_pending:</div><div class='ctx'> 	if (pending_snapshot-&gt;anon_dev)</div><div class='ctx'> 		free_anon_bdev(pending_snapshot-&gt;anon_dev);</div><div class='hunk'>@@ -902,17 +838,19 @@ free_pending:</div><div class='ctx'> static int btrfs_may_delete(struct mnt_idmap *idmap,</div><div class='ctx'> 			    struct inode *dir, struct dentry *victim, int isdir)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (d_really_is_negative(victim))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(d_inode(victim-&gt;d_parent) != dir);</div><div class='add'>+	/* The @victim is not inside @dir. */</div><div class='add'>+	if (d_inode(victim-&gt;d_parent) != dir)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	audit_inode_child(dir, victim, AUDIT_TYPE_CHILD_DELETE);</div><div class='ctx'> </div><div class='del'>-	error = inode_permission(idmap, dir, MAY_WRITE | MAY_EXEC);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='add'>+	ret = inode_permission(idmap, dir, MAY_WRITE | MAY_EXEC);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (IS_APPEND(dir))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	if (check_sticky(idmap, dir, d_inode(victim)) ||</div><div class='hunk'>@@ -935,7 +873,7 @@ static int btrfs_may_delete(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> /* copy of may_create in fs/namei.c() */</div><div class='ctx'> static inline int btrfs_may_create(struct mnt_idmap *idmap,</div><div class='del'>-				   struct inode *dir, struct dentry *child)</div><div class='add'>+				   struct inode *dir, const struct dentry *child)</div><div class='ctx'> {</div><div class='ctx'> 	if (d_really_is_positive(child))</div><div class='ctx'> 		return -EEXIST;</div><div class='hunk'>@@ -951,39 +889,32 @@ static inline int btrfs_may_create(struct mnt_idmap *idmap,</div><div class='ctx'>  * sys_mkdirat and vfs_mkdir, but we only do a single component lookup</div><div class='ctx'>  * inside this filesystem so it's quite a bit simpler.</div><div class='ctx'>  */</div><div class='del'>-static noinline int btrfs_mksubvol(const struct path *parent,</div><div class='add'>+static noinline int btrfs_mksubvol(struct dentry *parent,</div><div class='ctx'> 				   struct mnt_idmap *idmap,</div><div class='del'>-				   const char *name, int namelen,</div><div class='del'>-				   struct btrfs_root *snap_src,</div><div class='add'>+				   struct qstr *qname, struct btrfs_root *snap_src,</div><div class='ctx'> 				   bool readonly,</div><div class='ctx'> 				   struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='del'>-	struct inode *dir = d_inode(parent-&gt;dentry);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dir-&gt;i_sb);</div><div class='add'>+	struct inode *dir = d_inode(parent);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	struct fscrypt_str name_str = FSTR_INIT((char *)name, namelen);</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = down_write_killable_nested(&amp;dir-&gt;i_rwsem, I_MUTEX_PARENT);</div><div class='del'>-	if (error == -EINTR)</div><div class='del'>-		return error;</div><div class='add'>+	struct fscrypt_str name_str = FSTR_INIT((char *)qname-&gt;name, qname-&gt;len);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_one(idmap, name, parent-&gt;dentry, namelen);</div><div class='del'>-	error = PTR_ERR(dentry);</div><div class='add'>+	dentry = start_creating_killable(idmap, parent, qname);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='ctx'> </div><div class='del'>-	error = btrfs_may_create(idmap, dir, dentry);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = btrfs_may_create(idmap, dir, dentry);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_dput;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * even if this name doesn't exist, we may get hash collisions.</div><div class='ctx'> 	 * check for them now when we can safely fail</div><div class='ctx'> 	 */</div><div class='del'>-	error = btrfs_check_dir_item_collision(BTRFS_I(dir)-&gt;root,</div><div class='del'>-					       dir-&gt;i_ino, &amp;name_str);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = btrfs_check_dir_item_collision(BTRFS_I(dir)-&gt;root, dir-&gt;i_ino, &amp;name_str);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_dput;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;fs_info-&gt;subvol_sem);</div><div class='hunk'>@@ -992,34 +923,31 @@ static noinline int btrfs_mksubvol(const struct path *parent,</div><div class='ctx'> 		goto out_up_read;</div><div class='ctx'> </div><div class='ctx'> 	if (snap_src)</div><div class='del'>-		error = create_snapshot(snap_src, dir, dentry, readonly, inherit);</div><div class='add'>+		ret = create_snapshot(snap_src, dir, dentry, readonly, inherit);</div><div class='ctx'> 	else</div><div class='del'>-		error = create_subvol(idmap, dir, dentry, inherit);</div><div class='add'>+		ret = create_subvol(idmap, dir, dentry, inherit);</div><div class='ctx'> </div><div class='del'>-	if (!error)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		fsnotify_mkdir(dir, dentry);</div><div class='ctx'> out_up_read:</div><div class='ctx'> 	up_read(&amp;fs_info-&gt;subvol_sem);</div><div class='ctx'> out_dput:</div><div class='del'>-	dput(dentry);</div><div class='del'>-out_unlock:</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(dir), 0);</div><div class='del'>-	return error;</div><div class='add'>+	end_creating(dentry);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int btrfs_mksnapshot(const struct path *parent,</div><div class='add'>+static noinline int btrfs_mksnapshot(struct dentry *parent,</div><div class='ctx'> 				   struct mnt_idmap *idmap,</div><div class='del'>-				   const char *name, int namelen,</div><div class='add'>+				   struct qstr *qname,</div><div class='ctx'> 				   struct btrfs_root *root,</div><div class='ctx'> 				   bool readonly,</div><div class='ctx'> 				   struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool snapshot_force_cow = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Force new buffered writes to reserve space even when NOCOW is</div><div class='del'>-	 * possible. This is to avoid later writeback (running dealloc) to</div><div class='add'>+	 * possible. This is to avoid later writeback (running delalloc) to</div><div class='ctx'> 	 * fallback to COW mode and unexpectedly fail with ENOSPC.</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_drew_read_lock(&amp;root-&gt;snapshot_lock);</div><div class='hunk'>@@ -1034,15 +962,13 @@ static noinline int btrfs_mksnapshot(const struct path *parent,</div><div class='ctx'> 	 * creation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_inc(&amp;root-&gt;snapshot_force_cow);</div><div class='del'>-	snapshot_force_cow = true;</div><div class='ctx'> </div><div class='del'>-	btrfs_wait_ordered_extents(root, U64_MAX, 0, (u64)-1);</div><div class='add'>+	btrfs_wait_ordered_extents(root, U64_MAX, NULL);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_mksubvol(parent, idmap, qname, root, readonly, inherit);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_mksubvol(parent, idmap, name, namelen,</div><div class='del'>-			     root, readonly, inherit);</div><div class='add'>+	atomic_dec(&amp;root-&gt;snapshot_force_cow);</div><div class='ctx'> out:</div><div class='del'>-	if (snapshot_force_cow)</div><div class='del'>-		atomic_dec(&amp;root-&gt;snapshot_force_cow);</div><div class='ctx'> 	btrfs_drew_read_unlock(&amp;root-&gt;snapshot_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1093,17 +1019,14 @@ static noinline int btrfs_ioctl_resize(struct file *file,</div><div class='ctx'> 					void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	BTRFS_DEV_LOOKUP_ARGS(args);</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_root *root = BTRFS_I(file_inode(file))-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	u64 new_size;</div><div class='ctx'> 	u64 old_size;</div><div class='ctx'> 	u64 devid = 1;</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_ioctl_vol_args *vol_args;</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_device *device = NULL;</div><div class='ctx'> 	char *sizestr;</div><div class='del'>-	char *retptr;</div><div class='ctx'> 	char *devstr = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int mod = 0;</div><div class='hunk'>@@ -1125,7 +1048,10 @@ static noinline int btrfs_ioctl_resize(struct file *file,</div><div class='ctx'> 		ret = PTR_ERR(vol_args);</div><div class='ctx'> 		goto out_drop;</div><div class='ctx'> 	}</div><div class='del'>-	vol_args-&gt;name[BTRFS_PATH_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args_path(vol_args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	sizestr = vol_args-&gt;name;</div><div class='ctx'> 	cancel = (strcmp("cancel", sizestr) == 0);</div><div class='ctx'> 	ret = exclop_start_or_cancel_reloc(fs_info, BTRFS_EXCLOP_RESIZE, cancel);</div><div class='hunk'>@@ -1168,6 +1094,8 @@ static noinline int btrfs_ioctl_resize(struct file *file,</div><div class='ctx'> 	if (!strcmp(sizestr, "max"))</div><div class='ctx'> 		new_size = bdev_nr_bytes(device-&gt;bdev);</div><div class='ctx'> 	else {</div><div class='add'>+		char *retptr;</div><div class='add'>+</div><div class='ctx'> 		if (sizestr[0] == '-') {</div><div class='ctx'> 			mod = -1;</div><div class='ctx'> 			sizestr++;</div><div class='hunk'>@@ -1215,6 +1143,8 @@ static noinline int btrfs_ioctl_resize(struct file *file,</div><div class='ctx'> 	new_size = round_down(new_size, fs_info-&gt;sectorsize);</div><div class='ctx'> </div><div class='ctx'> 	if (new_size &gt; old_size) {</div><div class='add'>+		struct btrfs_trans_handle *trans;</div><div class='add'>+</div><div class='ctx'> 		trans = btrfs_start_transaction(root, 0);</div><div class='ctx'> 		if (IS_ERR(trans)) {</div><div class='ctx'> 			ret = PTR_ERR(trans);</div><div class='hunk'>@@ -1227,7 +1157,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,</div><div class='ctx'> 	} /* equal, nothing need to do */</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0 &amp;&amp; new_size != old_size)</div><div class='del'>-		btrfs_info_in_rcu(fs_info,</div><div class='add'>+		btrfs_info(fs_info,</div><div class='ctx'> 			"resize device %s (devid %llu) from %llu to %llu",</div><div class='ctx'> 			btrfs_dev_name(device), device-&gt;devid,</div><div class='ctx'> 			old_size, new_size);</div><div class='hunk'>@@ -1242,12 +1172,12 @@ out_drop:</div><div class='ctx'> </div><div class='ctx'> static noinline int __btrfs_ioctl_snap_create(struct file *file,</div><div class='ctx'> 				struct mnt_idmap *idmap,</div><div class='del'>-				const char *name, unsigned long fd, int subvol,</div><div class='add'>+				const char *name, unsigned long fd, bool subvol,</div><div class='ctx'> 				bool readonly,</div><div class='ctx'> 				struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='del'>-	int namelen;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	struct qstr qname = QSTR_INIT(name, strlen(name));</div><div class='ctx'> </div><div class='ctx'> 	if (!S_ISDIR(file_inode(file)-&gt;i_mode))</div><div class='ctx'> 		return -ENOTDIR;</div><div class='hunk'>@@ -1256,30 +1186,29 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	namelen = strlen(name);</div><div class='ctx'> 	if (strchr(name, '/')) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_drop_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (name[0] == '.' &amp;&amp;</div><div class='del'>-	   (namelen == 1 || (name[1] == '.' &amp;&amp; namelen == 2))) {</div><div class='add'>+	if (qname.name[0] == '.' &amp;&amp;</div><div class='add'>+	   (qname.len == 1 || (qname.name[1] == '.' &amp;&amp; qname.len == 2))) {</div><div class='ctx'> 		ret = -EEXIST;</div><div class='ctx'> 		goto out_drop_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (subvol) {</div><div class='del'>-		ret = btrfs_mksubvol(&amp;file-&gt;f_path, idmap, name,</div><div class='del'>-				     namelen, NULL, readonly, inherit);</div><div class='add'>+		ret = btrfs_mksubvol(file_dentry(file), idmap, &amp;qname, NULL,</div><div class='add'>+				     readonly, inherit);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct fd src = fdget(fd);</div><div class='add'>+		CLASS(fd, src)(fd);</div><div class='ctx'> 		struct inode *src_inode;</div><div class='del'>-		if (!src.file) {</div><div class='add'>+		if (fd_empty(src)) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out_drop_write;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		src_inode = file_inode(src.file);</div><div class='add'>+		src_inode = file_inode(fd_file(src));</div><div class='ctx'> 		if (src_inode-&gt;i_sb != file_inode(file)-&gt;i_sb) {</div><div class='ctx'> 			btrfs_info(BTRFS_I(file_inode(file))-&gt;root-&gt;fs_info,</div><div class='ctx'> 				   "Snapshot src from another FS");</div><div class='hunk'>@@ -1300,12 +1229,10 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file,</div><div class='ctx'> 			 */</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = btrfs_mksnapshot(&amp;file-&gt;f_path, idmap,</div><div class='del'>-					       name, namelen,</div><div class='add'>+			ret = btrfs_mksnapshot(file_dentry(file), idmap, &amp;qname,</div><div class='ctx'> 					       BTRFS_I(src_inode)-&gt;root,</div><div class='ctx'> 					       readonly, inherit);</div><div class='ctx'> 		}</div><div class='del'>-		fdput(src);</div><div class='ctx'> 	}</div><div class='ctx'> out_drop_write:</div><div class='ctx'> 	mnt_drop_write_file(file);</div><div class='hunk'>@@ -1314,7 +1241,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline int btrfs_ioctl_snap_create(struct file *file,</div><div class='del'>-					    void __user *arg, int subvol)</div><div class='add'>+					    void __user *arg, bool subvol)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ioctl_vol_args *vol_args;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1325,18 +1252,21 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,</div><div class='ctx'> 	vol_args = memdup_user(arg, sizeof(*vol_args));</div><div class='ctx'> 	if (IS_ERR(vol_args))</div><div class='ctx'> 		return PTR_ERR(vol_args);</div><div class='del'>-	vol_args-&gt;name[BTRFS_PATH_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args_path(vol_args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = __btrfs_ioctl_snap_create(file, file_mnt_idmap(file),</div><div class='ctx'> 					vol_args-&gt;name, vol_args-&gt;fd, subvol,</div><div class='ctx'> 					false, NULL);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	kfree(vol_args);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline int btrfs_ioctl_snap_create_v2(struct file *file,</div><div class='del'>-					       void __user *arg, int subvol)</div><div class='add'>+					       void __user *arg, bool subvol)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ioctl_vol_args_v2 *vol_args;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1349,7 +1279,9 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,</div><div class='ctx'> 	vol_args = memdup_user(arg, sizeof(*vol_args));</div><div class='ctx'> 	if (IS_ERR(vol_args))</div><div class='ctx'> 		return PTR_ERR(vol_args);</div><div class='del'>-	vol_args-&gt;name[BTRFS_SUBVOL_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args2_subvol_name(vol_args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_args;</div><div class='ctx'> </div><div class='ctx'> 	if (vol_args-&gt;flags &amp; ~BTRFS_SUBVOL_CREATE_ARGS_MASK) {</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='hunk'>@@ -1359,7 +1291,7 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,</div><div class='ctx'> 	if (vol_args-&gt;flags &amp; BTRFS_SUBVOL_RDONLY)</div><div class='ctx'> 		readonly = true;</div><div class='ctx'> 	if (vol_args-&gt;flags &amp; BTRFS_SUBVOL_QGROUP_INHERIT) {</div><div class='del'>-		u64 nums;</div><div class='add'>+		struct btrfs_fs_info *fs_info = inode_to_fs_info(file_inode(file));</div><div class='ctx'> </div><div class='ctx'> 		if (vol_args-&gt;size &lt; sizeof(*inherit) ||</div><div class='ctx'> 		    vol_args-&gt;size &gt; PAGE_SIZE) {</div><div class='hunk'>@@ -1372,19 +1304,9 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,</div><div class='ctx'> 			goto free_args;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (inherit-&gt;num_qgroups &gt; PAGE_SIZE ||</div><div class='del'>-		    inherit-&gt;num_ref_copies &gt; PAGE_SIZE ||</div><div class='del'>-		    inherit-&gt;num_excl_copies &gt; PAGE_SIZE) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto free_inherit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		nums = inherit-&gt;num_qgroups + 2 * inherit-&gt;num_ref_copies +</div><div class='del'>-		       2 * inherit-&gt;num_excl_copies;</div><div class='del'>-		if (vol_args-&gt;size != struct_size(inherit, qgroups, nums)) {</div><div class='del'>-			ret = -EINVAL;</div><div class='add'>+		ret = btrfs_qgroup_check_inherit(fs_info, inherit, vol_args-&gt;size);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto free_inherit;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = __btrfs_ioctl_snap_create(file, file_mnt_idmap(file),</div><div class='hunk'>@@ -1399,15 +1321,15 @@ free_args:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int btrfs_ioctl_subvol_getflags(struct inode *inode,</div><div class='add'>+static noinline int btrfs_ioctl_subvol_getflags(struct btrfs_inode *inode,</div><div class='ctx'> 						void __user *arg)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u64 flags = 0;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID)</div><div class='add'>+	if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;fs_info-&gt;subvol_sem);</div><div class='hunk'>@@ -1425,7 +1347,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,</div><div class='ctx'> 					      void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	u64 root_flags;</div><div class='hunk'>@@ -1478,7 +1400,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,</div><div class='ctx'> 			spin_unlock(&amp;root-&gt;root_item_lock);</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "Attempt to set subvolume %llu read-write during send",</div><div class='del'>-				   root-&gt;root_key.objectid);</div><div class='add'>+				   btrfs_root_id(root));</div><div class='ctx'> 			ret = -EPERM;</div><div class='ctx'> 			goto out_drop_sem;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1510,8 +1432,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int key_in_sk(struct btrfs_key *key,</div><div class='del'>-			      struct btrfs_ioctl_search_key *sk)</div><div class='add'>+static noinline bool key_in_sk(const struct btrfs_key *key,</div><div class='add'>+			       const struct btrfs_ioctl_search_key *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_key test;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1522,7 +1444,7 @@ static noinline int key_in_sk(struct btrfs_key *key,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_comp_cpu_keys(key, &amp;test);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	test.objectid = sk-&gt;max_objectid;</div><div class='ctx'> 	test.type = sk-&gt;max_type;</div><div class='hunk'>@@ -1530,13 +1452,13 @@ static noinline int key_in_sk(struct btrfs_key *key,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_comp_cpu_keys(key, &amp;test);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline int copy_to_sk(struct btrfs_path *path,</div><div class='ctx'> 			       struct btrfs_key *key,</div><div class='del'>-			       struct btrfs_ioctl_search_key *sk,</div><div class='add'>+			       const struct btrfs_ioctl_search_key *sk,</div><div class='ctx'> 			       u64 *buf_size,</div><div class='ctx'> 			       char __user *ubuf,</div><div class='ctx'> 			       unsigned long *sk_offset,</div><div class='hunk'>@@ -1593,8 +1515,8 @@ static noinline int copy_to_sk(struct btrfs_path *path,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sh.objectid = key-&gt;objectid;</div><div class='del'>-		sh.offset = key-&gt;offset;</div><div class='ctx'> 		sh.type = key-&gt;type;</div><div class='add'>+		sh.offset = key-&gt;offset;</div><div class='ctx'> 		sh.len = item_len;</div><div class='ctx'> 		sh.transid = found_transid;</div><div class='ctx'> </div><div class='hunk'>@@ -1667,15 +1589,14 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int search_ioctl(struct inode *inode,</div><div class='add'>+static noinline int search_ioctl(struct btrfs_root *root,</div><div class='ctx'> 				 struct btrfs_ioctl_search_key *sk,</div><div class='ctx'> 				 u64 *buf_size,</div><div class='ctx'> 				 char __user *ubuf)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_root *root;</div><div class='add'>+	struct btrfs_fs_info *info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int num_found = 0;</div><div class='ctx'> 	unsigned long sk_offset = 0;</div><div class='hunk'>@@ -1690,14 +1611,13 @@ static noinline int search_ioctl(struct inode *inode,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;tree_id == 0) {</div><div class='del'>-		/* search the root of the inode that was passed */</div><div class='del'>-		root = btrfs_grab_root(BTRFS_I(inode)-&gt;root);</div><div class='add'>+		/* Search the root that we got passed. */</div><div class='add'>+		root = btrfs_grab_root(root);</div><div class='ctx'> 	} else {</div><div class='add'>+		/* Look up the root from the arguments. */</div><div class='ctx'> 		root = btrfs_get_fs_root(info, sk-&gt;tree_id, true);</div><div class='del'>-		if (IS_ERR(root)) {</div><div class='del'>-			btrfs_free_path(path);</div><div class='add'>+		if (IS_ERR(root))</div><div class='ctx'> 			return PTR_ERR(root);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = sk-&gt;min_objectid;</div><div class='hunk'>@@ -1705,21 +1625,19 @@ static noinline int search_ioctl(struct inode *inode,</div><div class='ctx'> 	key.offset = sk-&gt;min_offset;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		ret = -EFAULT;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ensure that the whole user buffer is faulted in at sub-page</div><div class='ctx'> 		 * granularity, otherwise the loop may live-lock.</div><div class='ctx'> 		 */</div><div class='del'>-		if (fault_in_subpage_writeable(ubuf + sk_offset,</div><div class='del'>-					       *buf_size - sk_offset))</div><div class='add'>+		if (fault_in_subpage_writeable(ubuf + sk_offset, *buf_size - sk_offset)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_search_forward(root, &amp;key, path, sk-&gt;min_transid);</div><div class='del'>-		if (ret != 0) {</div><div class='del'>-			if (ret &gt; 0)</div><div class='del'>-				ret = 0;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		ret = copy_to_sk(path, &amp;key, sk, buf_size, ubuf,</div><div class='ctx'> 				 &amp;sk_offset, &amp;num_found);</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='hunk'>@@ -1727,16 +1645,16 @@ static noinline int search_ioctl(struct inode *inode,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='add'>+	/* Normalize return values from btrfs_search_forward() and copy_to_sk(). */</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		ret = 0;</div><div class='del'>-err:</div><div class='add'>+</div><div class='ctx'> 	sk-&gt;nr_items = num_found;</div><div class='ctx'> 	btrfs_put_root(root);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int btrfs_ioctl_tree_search(struct inode *inode,</div><div class='add'>+static noinline int btrfs_ioctl_tree_search(struct btrfs_root *root,</div><div class='ctx'> 					    void __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ioctl_search_args __user *uargs = argp;</div><div class='hunk'>@@ -1752,7 +1670,7 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	buf_size = sizeof(uargs-&gt;buf);</div><div class='ctx'> </div><div class='del'>-	ret = search_ioctl(inode, &amp;sk, &amp;buf_size, uargs-&gt;buf);</div><div class='add'>+	ret = search_ioctl(root, &amp;sk, &amp;buf_size, uargs-&gt;buf);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In the origin implementation an overflow is handled by returning a</div><div class='hunk'>@@ -1766,7 +1684,7 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode,</div><div class='add'>+static noinline int btrfs_ioctl_tree_search_v2(struct btrfs_root *root,</div><div class='ctx'> 					       void __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ioctl_search_args_v2 __user *uarg = argp;</div><div class='hunk'>@@ -1788,7 +1706,7 @@ static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode,</div><div class='ctx'> 	if (buf_size &gt; buf_limit)</div><div class='ctx'> 		buf_size = buf_limit;</div><div class='ctx'> </div><div class='del'>-	ret = search_ioctl(inode, &amp;args.key, &amp;buf_size,</div><div class='add'>+	ret = search_ioctl(root, &amp;args.key, &amp;buf_size,</div><div class='ctx'> 			   (char __user *)(&amp;uarg-&gt;buf[0]));</div><div class='ctx'> 	if (ret == 0 &amp;&amp; copy_to_user(&amp;uarg-&gt;key, &amp;args.key, sizeof(args.key)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='hunk'>@@ -1815,7 +1733,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,</div><div class='ctx'> 	int total_len = 0;</div><div class='ctx'> 	struct btrfs_inode_ref *iref;</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	if (dirid == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 		name[0]='\0';</div><div class='hunk'>@@ -1876,7 +1794,6 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_put_root(root);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1885,19 +1802,17 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> 				struct btrfs_ioctl_ino_lookup_user_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = BTRFS_I(inode)-&gt;root-&gt;fs_info;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct btrfs_key upper_limit = BTRFS_I(inode)-&gt;location;</div><div class='del'>-	u64 treeid = BTRFS_I(inode)-&gt;root-&gt;root_key.objectid;</div><div class='add'>+	u64 upper_limit = btrfs_ino(BTRFS_I(inode));</div><div class='add'>+	u64 treeid = btrfs_root_id(BTRFS_I(inode)-&gt;root);</div><div class='ctx'> 	u64 dirid = args-&gt;dirid;</div><div class='ctx'> 	unsigned long item_off;</div><div class='ctx'> 	unsigned long item_len;</div><div class='ctx'> 	struct btrfs_inode_ref *iref;</div><div class='ctx'> 	struct btrfs_root_ref *rref;</div><div class='ctx'> 	struct btrfs_root *root = NULL;</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	struct btrfs_key key, key2;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct inode *temp_inode;</div><div class='ctx'> 	char *ptr;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -1912,19 +1827,19 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> 	 * If the bottom subvolume does not exist directly under upper_limit,</div><div class='ctx'> 	 * construct the path in from the bottom up.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dirid != upper_limit.objectid) {</div><div class='add'>+	if (dirid != upper_limit) {</div><div class='ctx'> 		ptr = &amp;args-&gt;path[BTRFS_INO_LOOKUP_USER_PATH_MAX - 1];</div><div class='ctx'> </div><div class='ctx'> 		root = btrfs_get_fs_root(fs_info, treeid, true);</div><div class='del'>-		if (IS_ERR(root)) {</div><div class='del'>-			ret = PTR_ERR(root);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(root))</div><div class='add'>+			return PTR_ERR(root);</div><div class='ctx'> </div><div class='ctx'> 		key.objectid = dirid;</div><div class='ctx'> 		key.type = BTRFS_INODE_REF_KEY;</div><div class='ctx'> 		key.offset = (u64)-1;</div><div class='ctx'> 		while (1) {</div><div class='add'>+			struct btrfs_inode *temp_inode;</div><div class='add'>+</div><div class='ctx'> 			ret = btrfs_search_backwards(root, &amp;key, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out_put;</div><div class='hunk'>@@ -1949,24 +1864,6 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> 			read_extent_buffer(leaf, ptr,</div><div class='ctx'> 					(unsigned long)(iref + 1), len);</div><div class='ctx'> </div><div class='del'>-			/* Check the read+exec permission of this directory */</div><div class='del'>-			ret = btrfs_previous_item(root, path, dirid,</div><div class='del'>-						  BTRFS_INODE_ITEM_KEY);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				goto out_put;</div><div class='del'>-			} else if (ret &gt; 0) {</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-				goto out_put;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			leaf = path-&gt;nodes[0];</div><div class='del'>-			slot = path-&gt;slots[0];</div><div class='del'>-			btrfs_item_key_to_cpu(leaf, &amp;key2, slot);</div><div class='del'>-			if (key2.objectid != dirid) {</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-				goto out_put;</div><div class='del'>-			}</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We don't need the path anymore, so release it and</div><div class='ctx'> 			 * avoid deadlocks and lockdep warnings in case</div><div class='hunk'>@@ -1974,20 +1871,19 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> 			 * btree and lock the same leaf.</div><div class='ctx'> 			 */</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='del'>-			temp_inode = btrfs_iget(sb, key2.objectid, root);</div><div class='add'>+			temp_inode = btrfs_iget(key.offset, root);</div><div class='ctx'> 			if (IS_ERR(temp_inode)) {</div><div class='ctx'> 				ret = PTR_ERR(temp_inode);</div><div class='ctx'> 				goto out_put;</div><div class='ctx'> 			}</div><div class='del'>-			ret = inode_permission(idmap, temp_inode,</div><div class='add'>+			/* Check the read+exec permission of this directory. */</div><div class='add'>+			ret = inode_permission(idmap, &amp;temp_inode-&gt;vfs_inode,</div><div class='ctx'> 					       MAY_READ | MAY_EXEC);</div><div class='del'>-			iput(temp_inode);</div><div class='del'>-			if (ret) {</div><div class='del'>-				ret = -EACCES;</div><div class='add'>+			iput(&amp;temp_inode-&gt;vfs_inode);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				goto out_put;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			if (key.offset == upper_limit.objectid)</div><div class='add'>+			if (key.offset == upper_limit)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (key.objectid == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 				ret = -EACCES;</div><div class='hunk'>@@ -2011,12 +1907,10 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> 	key.type = BTRFS_ROOT_REF_KEY;</div><div class='ctx'> 	key.offset = args-&gt;treeid;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, fs_info-&gt;tree_root, &amp;key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	else if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -2026,10 +1920,8 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> 	item_len = btrfs_item_size(leaf, slot);</div><div class='ctx'> 	/* Check if dirid in ROOT_REF corresponds to passed dirid */</div><div class='ctx'> 	rref = btrfs_item_ptr(leaf, slot, struct btrfs_root_ref);</div><div class='del'>-	if (args-&gt;dirid != btrfs_root_ref_dirid(leaf, rref)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (args-&gt;dirid != btrfs_root_ref_dirid(leaf, rref))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy subvolume's name */</div><div class='ctx'> 	item_off += sizeof(struct btrfs_root_ref);</div><div class='hunk'>@@ -2039,8 +1931,7 @@ static int btrfs_search_path_in_tree_user(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> out_put:</div><div class='ctx'> 	btrfs_put_root(root);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2059,7 +1950,7 @@ static noinline int btrfs_ioctl_ino_lookup(struct btrfs_root *root,</div><div class='ctx'> 	 * path is reset so it's consistent with btrfs_search_path_in_tree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (args-&gt;treeid == 0)</div><div class='del'>-		args-&gt;treeid = root-&gt;root_key.objectid;</div><div class='add'>+		args-&gt;treeid = btrfs_root_id(root);</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;objectid == BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 		args-&gt;name[0] = 0;</div><div class='hunk'>@@ -2108,7 +1999,7 @@ static int btrfs_ioctl_ino_lookup_user(struct file *file, void __user *argp)</div><div class='ctx'> 	inode = file_inode(file);</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;dirid == BTRFS_FIRST_FREE_OBJECTID &amp;&amp;</div><div class='del'>-	    BTRFS_I(inode)-&gt;location.objectid != BTRFS_FIRST_FREE_OBJECTID) {</div><div class='add'>+	    btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The subvolume does not exist under fd with which this is</div><div class='ctx'> 		 * called</div><div class='hunk'>@@ -2155,7 +2046,7 @@ static int btrfs_ioctl_get_subvol_info(struct inode *inode, void __user *argp)</div><div class='ctx'> 	fs_info = BTRFS_I(inode)-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	/* Get root_item of inode's subvolume */</div><div class='del'>-	key.objectid = BTRFS_I(inode)-&gt;root-&gt;root_key.objectid;</div><div class='add'>+	key.objectid = btrfs_root_id(BTRFS_I(inode)-&gt;root);</div><div class='ctx'> 	root = btrfs_get_fs_root(fs_info, key.objectid, true);</div><div class='ctx'> 	if (IS_ERR(root)) {</div><div class='ctx'> 		ret = PTR_ERR(root);</div><div class='hunk'>@@ -2202,7 +2093,7 @@ static int btrfs_ioctl_get_subvol_info(struct inode *inode, void __user *argp)</div><div class='ctx'> 			ret = btrfs_next_leaf(fs_info-&gt;tree_root, path);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				goto out;</div><div class='del'>-			} else if (ret &gt; 0) {</div><div class='add'>+			} else if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 				ret = -EUCLEAN;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2270,7 +2161,7 @@ static int btrfs_ioctl_get_subvol_rootref(struct btrfs_root *root,</div><div class='ctx'> 		return PTR_ERR(rootrefs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	objectid = root-&gt;root_key.objectid;</div><div class='add'>+	objectid = btrfs_root_id(root);</div><div class='ctx'> 	key.objectid = objectid;</div><div class='ctx'> 	key.type = BTRFS_ROOT_REF_KEY;</div><div class='ctx'> 	key.offset = rootrefs-&gt;min_treeid;</div><div class='hunk'>@@ -2285,7 +2176,7 @@ static int btrfs_ioctl_get_subvol_rootref(struct btrfs_root *root,</div><div class='ctx'> 		ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			goto out;</div><div class='del'>-		} else if (ret &gt; 0) {</div><div class='add'>+		} else if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2314,7 +2205,7 @@ static int btrfs_ioctl_get_subvol_rootref(struct btrfs_root *root,</div><div class='ctx'> 		ret = btrfs_next_item(root, path);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			goto out;</div><div class='del'>-		} else if (ret &gt; 0) {</div><div class='add'>+		} else if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2343,9 +2234,9 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 					     bool destroy_v2)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *parent = file-&gt;f_path.dentry;</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(parent-&gt;d_sb);</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *dir = d_inode(parent);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(dir);</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='ctx'> 	struct btrfs_root *dest = NULL;</div><div class='hunk'>@@ -2353,8 +2244,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 	struct btrfs_ioctl_vol_args_v2 *vol_args2 = NULL;</div><div class='ctx'> 	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='ctx'> 	char *subvol_name, *subvol_name_ptr = NULL;</div><div class='del'>-	int subvol_namelen;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	bool destroy_parent = false;</div><div class='ctx'> </div><div class='ctx'> 	/* We don't support snapshots with extent tree v2 yet. */</div><div class='hunk'>@@ -2370,7 +2260,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 			return PTR_ERR(vol_args2);</div><div class='ctx'> </div><div class='ctx'> 		if (vol_args2-&gt;flags &amp; ~BTRFS_SUBVOL_DELETE_ARGS_MASK) {</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2379,29 +2269,31 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 		 * name, same as v1 currently does.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!(vol_args2-&gt;flags &amp; BTRFS_SUBVOL_SPEC_BY_ID)) {</div><div class='del'>-			vol_args2-&gt;name[BTRFS_SUBVOL_NAME_MAX] = 0;</div><div class='add'>+			ret = btrfs_check_ioctl_vol_args2_subvol_name(vol_args2);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto out;</div><div class='ctx'> 			subvol_name = vol_args2-&gt;name;</div><div class='ctx'> </div><div class='del'>-			err = mnt_want_write_file(file);</div><div class='del'>-			if (err)</div><div class='add'>+			ret = mnt_want_write_file(file);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct inode *old_dir;</div><div class='ctx'> </div><div class='ctx'> 			if (vol_args2-&gt;subvolid &lt; BTRFS_FIRST_FREE_OBJECTID) {</div><div class='del'>-				err = -EINVAL;</div><div class='add'>+				ret = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			err = mnt_want_write_file(file);</div><div class='del'>-			if (err)</div><div class='add'>+			ret = mnt_want_write_file(file);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			dentry = btrfs_get_dentry(fs_info-&gt;sb,</div><div class='ctx'> 					BTRFS_FIRST_FREE_OBJECTID,</div><div class='ctx'> 					vol_args2-&gt;subvolid, 0);</div><div class='ctx'> 			if (IS_ERR(dentry)) {</div><div class='del'>-				err = PTR_ERR(dentry);</div><div class='add'>+				ret = PTR_ERR(dentry);</div><div class='ctx'> 				goto out_drop_write;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -2421,7 +2313,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 			 */</div><div class='ctx'> 			dput(dentry);</div><div class='ctx'> 			if (IS_ERR(parent)) {</div><div class='del'>-				err = PTR_ERR(parent);</div><div class='add'>+				ret = PTR_ERR(parent);</div><div class='ctx'> 				goto out_drop_write;</div><div class='ctx'> 			}</div><div class='ctx'> 			old_dir = dir;</div><div class='hunk'>@@ -2445,14 +2337,14 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 			 * to delete without an idmapped mount.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (old_dir != dir &amp;&amp; idmap != &amp;nop_mnt_idmap) {</div><div class='del'>-				err = -EOPNOTSUPP;</div><div class='add'>+				ret = -EOPNOTSUPP;</div><div class='ctx'> 				goto free_parent;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			subvol_name_ptr = btrfs_get_subvol_name_from_objectid(</div><div class='ctx'> 						fs_info, vol_args2-&gt;subvolid);</div><div class='ctx'> 			if (IS_ERR(subvol_name_ptr)) {</div><div class='del'>-				err = PTR_ERR(subvol_name_ptr);</div><div class='add'>+				ret = PTR_ERR(subvol_name_ptr);</div><div class='ctx'> 				goto free_parent;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* subvol_name_ptr is already nul terminated */</div><div class='hunk'>@@ -2463,39 +2355,32 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 		if (IS_ERR(vol_args))</div><div class='ctx'> 			return PTR_ERR(vol_args);</div><div class='ctx'> </div><div class='del'>-		vol_args-&gt;name[BTRFS_PATH_NAME_MAX] = 0;</div><div class='add'>+		ret = btrfs_check_ioctl_vol_args_path(vol_args);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='ctx'> 		subvol_name = vol_args-&gt;name;</div><div class='ctx'> </div><div class='del'>-		err = mnt_want_write_file(file);</div><div class='del'>-		if (err)</div><div class='add'>+		ret = mnt_want_write_file(file);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	subvol_namelen = strlen(subvol_name);</div><div class='del'>-</div><div class='ctx'> 	if (strchr(subvol_name, '/') ||</div><div class='del'>-	    strncmp(subvol_name, "..", subvol_namelen) == 0) {</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+	    strcmp(subvol_name, "..") == 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto free_subvol_name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!S_ISDIR(dir-&gt;i_mode)) {</div><div class='del'>-		err = -ENOTDIR;</div><div class='add'>+		ret = -ENOTDIR;</div><div class='ctx'> 		goto free_subvol_name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = down_write_killable_nested(&amp;dir-&gt;i_rwsem, I_MUTEX_PARENT);</div><div class='del'>-	if (err == -EINTR)</div><div class='del'>-		goto free_subvol_name;</div><div class='del'>-	dentry = lookup_one(idmap, subvol_name, parent, subvol_namelen);</div><div class='add'>+	dentry = start_removing_killable(idmap, parent, &amp;QSTR(subvol_name));</div><div class='ctx'> 	if (IS_ERR(dentry)) {</div><div class='del'>-		err = PTR_ERR(dentry);</div><div class='del'>-		goto out_unlock_dir;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d_really_is_negative(dentry)) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto out_dput;</div><div class='add'>+		ret = PTR_ERR(dentry);</div><div class='add'>+		goto out_end_removing;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='hunk'>@@ -2514,9 +2399,9 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 		 * Users who want to delete empty subvols should try</div><div class='ctx'> 		 * rmdir(2).</div><div class='ctx'> 		 */</div><div class='del'>-		err = -EPERM;</div><div class='add'>+		ret = -EPERM;</div><div class='ctx'> 		if (!btrfs_test_opt(fs_info, USER_SUBVOL_RM_ALLOWED))</div><div class='del'>-			goto out_dput;</div><div class='add'>+			goto out_end_removing;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Do not allow deletion if the parent dir is the same</div><div class='hunk'>@@ -2525,35 +2410,33 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,</div><div class='ctx'> 		 * of the subvol, not a random directory contained</div><div class='ctx'> 		 * within it.</div><div class='ctx'> 		 */</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		if (root == dest)</div><div class='del'>-			goto out_dput;</div><div class='add'>+			goto out_end_removing;</div><div class='ctx'> </div><div class='del'>-		err = inode_permission(idmap, inode, MAY_WRITE | MAY_EXEC);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_dput;</div><div class='add'>+		ret = inode_permission(idmap, inode, MAY_WRITE | MAY_EXEC);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_end_removing;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check if subvolume may be deleted by a user */</div><div class='del'>-	err = btrfs_may_delete(idmap, dir, dentry, 1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_dput;</div><div class='add'>+	ret = btrfs_may_delete(idmap, dir, dentry, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_end_removing;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out_dput;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_end_removing;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_inode_lock(BTRFS_I(inode), 0);</div><div class='del'>-	err = btrfs_delete_subvolume(BTRFS_I(dir), dentry);</div><div class='add'>+	ret = btrfs_delete_subvolume(BTRFS_I(dir), dentry);</div><div class='ctx'> 	btrfs_inode_unlock(BTRFS_I(inode), 0);</div><div class='del'>-	if (!err)</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		d_delete_notify(dir, dentry);</div><div class='ctx'> </div><div class='del'>-out_dput:</div><div class='del'>-	dput(dentry);</div><div class='del'>-out_unlock_dir:</div><div class='del'>-	btrfs_inode_unlock(BTRFS_I(dir), 0);</div><div class='add'>+out_end_removing:</div><div class='add'>+	end_removing(dentry);</div><div class='ctx'> free_subvol_name:</div><div class='ctx'> 	kfree(subvol_name_ptr);</div><div class='ctx'> free_parent:</div><div class='hunk'>@@ -2564,7 +2447,7 @@ out_drop_write:</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(vol_args2);</div><div class='ctx'> 	kfree(vol_args);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_ioctl_defrag(struct file *file, void __user *argp)</div><div class='hunk'>@@ -2603,13 +2486,32 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Don't allow defrag on pre-content watched files, as it could</div><div class='add'>+		 * populate the page cache with 0's via readahead.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(FMODE_FSNOTIFY_HSM(file-&gt;f_mode))) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (argp) {</div><div class='ctx'> 			if (copy_from_user(&amp;range, argp, sizeof(range))) {</div><div class='ctx'> 				ret = -EFAULT;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			/* compression requires us to start the IO */</div><div class='del'>-			if ((range.flags &amp; BTRFS_DEFRAG_RANGE_COMPRESS)) {</div><div class='add'>+			if (range.flags &amp; ~BTRFS_DEFRAG_RANGE_FLAGS_SUPP) {</div><div class='add'>+				ret = -EOPNOTSUPP;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if ((range.flags &amp; BTRFS_DEFRAG_RANGE_COMPRESS) &amp;&amp;</div><div class='add'>+			    (range.flags &amp; BTRFS_DEFRAG_RANGE_NOCOMPRESS)) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			/* Compression or no-compression require to start the IO. */</div><div class='add'>+			if ((range.flags &amp; BTRFS_DEFRAG_RANGE_COMPRESS) ||</div><div class='add'>+			    (range.flags &amp; BTRFS_DEFRAG_RANGE_NOCOMPRESS)) {</div><div class='ctx'> 				range.flags |= BTRFS_DEFRAG_RANGE_START_IO;</div><div class='ctx'> 				range.extent_thresh = (u32)-1;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2617,7 +2519,7 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)</div><div class='ctx'> 			/* the rest are all set to zero by kzalloc */</div><div class='ctx'> 			range.len = (u64)-1;</div><div class='ctx'> 		}</div><div class='del'>-		ret = btrfs_defrag_file(file_inode(file), &amp;file-&gt;f_ra,</div><div class='add'>+		ret = btrfs_defrag_file(BTRFS_I(file_inode(file)), &amp;file-&gt;f_ra,</div><div class='ctx'> 					&amp;range, BTRFS_OLDEST_GENERATION, 0);</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -2670,12 +2572,16 @@ static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vol_args-&gt;name[BTRFS_PATH_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args_path(vol_args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	ret = btrfs_init_new_device(fs_info, vol_args-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		btrfs_info(fs_info, "disk added %s", vol_args-&gt;name);</div><div class='ctx'> </div><div class='add'>+out_free:</div><div class='ctx'> 	kfree(vol_args);</div><div class='ctx'> out:</div><div class='ctx'> 	if (restore_op)</div><div class='hunk'>@@ -2689,7 +2595,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	BTRFS_DEV_LOOKUP_ARGS(args);</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_ioctl_vol_args_v2 *vol_args;</div><div class='ctx'> 	struct file *bdev_file = NULL;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2707,7 +2613,10 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vol_args-&gt;name[BTRFS_SUBVOL_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args2_subvol_name(vol_args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (vol_args-&gt;flags &amp; BTRFS_DEVICE_SPEC_BY_ID) {</div><div class='ctx'> 		args.devid = vol_args-&gt;devid;</div><div class='ctx'> 	} else if (!strcmp("cancel", vol_args-&gt;name)) {</div><div class='hunk'>@@ -2743,7 +2652,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)</div><div class='ctx'> err_drop:</div><div class='ctx'> 	mnt_drop_write_file(file);</div><div class='ctx'> 	if (bdev_file)</div><div class='del'>-		fput(bdev_file);</div><div class='add'>+		bdev_fput(bdev_file);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_put_dev_args_from_path(&amp;args);</div><div class='ctx'> 	kfree(vol_args);</div><div class='hunk'>@@ -2754,7 +2663,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	BTRFS_DEV_LOOKUP_ARGS(args);</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_ioctl_vol_args *vol_args;</div><div class='ctx'> 	struct file *bdev_file = NULL;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2767,7 +2676,10 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)</div><div class='ctx'> 	if (IS_ERR(vol_args))</div><div class='ctx'> 		return PTR_ERR(vol_args);</div><div class='ctx'> </div><div class='del'>-	vol_args-&gt;name[BTRFS_PATH_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args_path(vol_args);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	if (!strcmp("cancel", vol_args-&gt;name)) {</div><div class='ctx'> 		cancel = true;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2791,14 +2703,15 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> 	mnt_drop_write_file(file);</div><div class='ctx'> 	if (bdev_file)</div><div class='del'>-		fput(bdev_file);</div><div class='add'>+		bdev_fput(bdev_file);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_put_dev_args_from_path(&amp;args);</div><div class='add'>+out_free:</div><div class='ctx'> 	kfree(vol_args);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long btrfs_ioctl_fs_info(struct btrfs_fs_info *fs_info,</div><div class='add'>+static long btrfs_ioctl_fs_info(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ioctl_fs_info_args *fi_args;</div><div class='hunk'>@@ -2852,7 +2765,7 @@ static long btrfs_ioctl_fs_info(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long btrfs_ioctl_dev_info(struct btrfs_fs_info *fs_info,</div><div class='add'>+static long btrfs_ioctl_dev_info(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	BTRFS_DEV_LOOKUP_ARGS(args);</div><div class='hunk'>@@ -2897,7 +2810,7 @@ out:</div><div class='ctx'> static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_root *new_root;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='hunk'>@@ -2929,7 +2842,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)</div><div class='ctx'> 		ret = PTR_ERR(new_root);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (!is_fstree(new_root-&gt;root_key.objectid)) {</div><div class='add'>+	if (!btrfs_is_fstree(btrfs_root_id(new_root))) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2960,7 +2873,6 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)</div><div class='ctx'> </div><div class='ctx'> 	btrfs_cpu_key_to_disk(&amp;disk_key, &amp;new_root-&gt;root_key);</div><div class='ctx'> 	btrfs_set_dir_item_key(path-&gt;nodes[0], di, &amp;disk_key);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_fs_incompat(fs_info, DEFAULT_SUBVOL);</div><div class='hunk'>@@ -2994,7 +2906,7 @@ static long btrfs_ioctl_space_info(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct btrfs_ioctl_space_args space_args = { 0 };</div><div class='ctx'> 	struct btrfs_ioctl_space_info space;</div><div class='ctx'> 	struct btrfs_ioctl_space_info *dest;</div><div class='del'>-	struct btrfs_ioctl_space_info *dest_orig;</div><div class='add'>+	struct btrfs_ioctl_space_info AUTO_KFREE(dest_orig);</div><div class='ctx'> 	struct btrfs_ioctl_space_info __user *user_dest;</div><div class='ctx'> 	struct btrfs_space_info *info;</div><div class='ctx'> 	static const u64 types[] = {</div><div class='hunk'>@@ -3115,9 +3027,8 @@ static long btrfs_ioctl_space_info(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		(arg + sizeof(struct btrfs_ioctl_space_args));</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(user_dest, dest_orig, alloc_size))</div><div class='del'>-		ret = -EFAULT;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	kfree(dest_orig);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret == 0 &amp;&amp; copy_to_user(arg, &amp;space_args, sizeof(space_args)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='hunk'>@@ -3171,7 +3082,7 @@ static noinline long btrfs_ioctl_wait_sync(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static long btrfs_ioctl_scrub(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(file_inode(file)-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(file_inode(file));</div><div class='ctx'> 	struct btrfs_ioctl_scrub_args *sa;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3179,7 +3090,7 @@ static long btrfs_ioctl_scrub(struct file *file, void __user *arg)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_fs_incompat(fs_info, EXTENT_TREE_V2)) {</div><div class='del'>-		btrfs_err(fs_info, "scrub is not supported on extent tree v2 yet");</div><div class='add'>+		btrfs_err(fs_info, "scrub: extent tree v2 not yet supported");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3336,7 +3247,7 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg)</div><div class='ctx'> 	u64 rel_ptr;</div><div class='ctx'> 	int size;</div><div class='ctx'> 	struct btrfs_ioctl_ino_path_args *ipa = NULL;</div><div class='del'>-	struct inode_fs_paths *ipath = NULL;</div><div class='add'>+	struct inode_fs_paths *ipath __free(inode_fs_paths) = NULL;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_DAC_READ_SEARCH))</div><div class='hunk'>@@ -3384,7 +3295,6 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='del'>-	free_ipath(ipath);</div><div class='ctx'> 	kfree(ipa);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3397,7 +3307,6 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	int size;</div><div class='ctx'> 	struct btrfs_ioctl_logical_ino_args *loi;</div><div class='ctx'> 	struct btrfs_data_container *inodes = NULL;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='ctx'> 	bool ignore_offset;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -3431,14 +3340,7 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		goto out_loi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	ret = iterate_inodes_from_logical(loi-&gt;logical, fs_info, path,</div><div class='del'>-					  inodes, ignore_offset);</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	ret = iterate_inodes_from_logical(loi-&gt;logical, fs_info, inodes, ignore_offset);</div><div class='ctx'> 	if (ret == -EINVAL)</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -3657,7 +3559,7 @@ static long btrfs_ioctl_balance_ctl(struct btrfs_fs_info *fs_info, int cmd)</div><div class='ctx'> static long btrfs_ioctl_balance_progress(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					 void __user *arg)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_ioctl_balance_args *bargs;</div><div class='add'>+	struct btrfs_ioctl_balance_args AUTO_KFREE(bargs);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -3679,8 +3581,6 @@ static long btrfs_ioctl_balance_progress(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(arg, bargs, sizeof(*bargs)))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-	kfree(bargs);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;balance_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3689,7 +3589,7 @@ out:</div><div class='ctx'> static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_ioctl_quota_ctl_args *sa;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3706,15 +3606,43 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)</div><div class='ctx'> 		goto drop_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;fs_info-&gt;subvol_sem);</div><div class='del'>-</div><div class='ctx'> 	switch (sa-&gt;cmd) {</div><div class='ctx'> 	case BTRFS_QUOTA_CTL_ENABLE:</div><div class='ctx'> 	case BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA:</div><div class='add'>+		down_write(&amp;fs_info-&gt;subvol_sem);</div><div class='ctx'> 		ret = btrfs_quota_enable(fs_info, sa);</div><div class='add'>+		up_write(&amp;fs_info-&gt;subvol_sem);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_QUOTA_CTL_DISABLE:</div><div class='add'>+		/*</div><div class='add'>+		 * Lock the cleaner mutex to prevent races with concurrent</div><div class='add'>+		 * relocation, because relocation may be building backrefs for</div><div class='add'>+		 * blocks of the quota root while we are deleting the root. This</div><div class='add'>+		 * is like dropping fs roots of deleted snapshots/subvolumes, we</div><div class='add'>+		 * need the same protection.</div><div class='add'>+		 *</div><div class='add'>+		 * This also prevents races between concurrent tasks trying to</div><div class='add'>+		 * disable quotas, because we will unlock and relock</div><div class='add'>+		 * qgroup_ioctl_lock across BTRFS_FS_QUOTA_ENABLED changes.</div><div class='add'>+		 *</div><div class='add'>+		 * We take this here because we have the dependency of</div><div class='add'>+		 *</div><div class='add'>+		 * inode_lock -&gt; subvol_sem</div><div class='add'>+		 *</div><div class='add'>+		 * because of rename.  With relocation we can prealloc extents,</div><div class='add'>+		 * so that makes the dependency chain</div><div class='add'>+		 *</div><div class='add'>+		 * cleaner_mutex -&gt; inode_lock -&gt; subvol_sem</div><div class='add'>+		 *</div><div class='add'>+		 * so we must take the cleaner_mutex here before we take the</div><div class='add'>+		 * subvol_sem.  The deadlock can't actually happen, but this</div><div class='add'>+		 * quiets lockdep.</div><div class='add'>+		 */</div><div class='add'>+		mutex_lock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='add'>+		down_write(&amp;fs_info-&gt;subvol_sem);</div><div class='ctx'> 		ret = btrfs_quota_disable(fs_info);</div><div class='add'>+		up_write(&amp;fs_info-&gt;subvol_sem);</div><div class='add'>+		mutex_unlock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -3722,7 +3650,6 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(sa);</div><div class='del'>-	up_write(&amp;fs_info-&gt;subvol_sem);</div><div class='ctx'> drop_write:</div><div class='ctx'> 	mnt_drop_write_file(file);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3731,9 +3658,10 @@ drop_write:</div><div class='ctx'> static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_ioctl_qgroup_assign_args *sa;</div><div class='add'>+	struct btrfs_qgroup_list *prealloc = NULL;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -3741,6 +3669,9 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_qgroup_enabled(fs_info))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='ctx'> 	ret = mnt_want_write_file(file);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -3751,14 +3682,27 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)</div><div class='ctx'> 		goto drop_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sa-&gt;assign) {</div><div class='add'>+		prealloc = kzalloc(sizeof(*prealloc), GFP_KERNEL);</div><div class='add'>+		if (!prealloc) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	trans = btrfs_join_transaction(root);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='ctx'> 		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Prealloc ownership is moved to the relation handler, there it's used</div><div class='add'>+	 * or freed on error.</div><div class='add'>+	 */</div><div class='ctx'> 	if (sa-&gt;assign) {</div><div class='del'>-		ret = btrfs_add_qgroup_relation(trans, sa-&gt;src, sa-&gt;dst);</div><div class='add'>+		ret = btrfs_add_qgroup_relation(trans, sa-&gt;src, sa-&gt;dst, prealloc);</div><div class='add'>+		prealloc = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = btrfs_del_qgroup_relation(trans, sa-&gt;src, sa-&gt;dst);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3768,13 +3712,15 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)</div><div class='ctx'> 	err = btrfs_run_qgroups(trans);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		btrfs_handle_fs_error(fs_info, err,</div><div class='del'>-				      "failed to update qgroup status and info");</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='add'>+			   "qgroup status update failed after %s relation, marked as inconsistent",</div><div class='add'>+			   sa-&gt;assign ? "adding" : "deleting");</div><div class='ctx'> 	err = btrfs_end_transaction(trans);</div><div class='ctx'> 	if (err &amp;&amp; !ret)</div><div class='ctx'> 		ret = err;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	kfree(prealloc);</div><div class='ctx'> 	kfree(sa);</div><div class='ctx'> drop_write:</div><div class='ctx'> 	mnt_drop_write_file(file);</div><div class='hunk'>@@ -3793,6 +3739,9 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_qgroup_enabled(root-&gt;fs_info))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='ctx'> 	ret = mnt_want_write_file(file);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -3808,6 +3757,11 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sa-&gt;create &amp;&amp; btrfs_is_fstree(sa-&gt;qgroupid)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	trans = btrfs_join_transaction(root);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='ctx'> 		ret = PTR_ERR(trans);</div><div class='hunk'>@@ -3844,6 +3798,9 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_qgroup_enabled(root-&gt;fs_info))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='ctx'> 	ret = mnt_want_write_file(file);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -3863,7 +3820,7 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)</div><div class='ctx'> 	qgroupid = sa-&gt;qgroupid;</div><div class='ctx'> 	if (!qgroupid) {</div><div class='ctx'> 		/* take the current subvol as qgroup */</div><div class='del'>-		qgroupid = root-&gt;root_key.objectid;</div><div class='add'>+		qgroupid = btrfs_root_id(root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_limit_qgroup(trans, qgroupid, &amp;sa-&gt;lim);</div><div class='hunk'>@@ -3882,13 +3839,16 @@ drop_write:</div><div class='ctx'> static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_ioctl_quota_rescan_args *qsa;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_qgroup_enabled(fs_info))</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='ctx'> 	ret = mnt_want_write_file(file);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -3932,8 +3892,7 @@ static long btrfs_ioctl_quota_rescan_status(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long btrfs_ioctl_quota_rescan_wait(struct btrfs_fs_info *fs_info,</div><div class='del'>-						void __user *arg)</div><div class='add'>+static long btrfs_ioctl_quota_rescan_wait(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -3946,7 +3905,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,</div><div class='ctx'> 					    struct btrfs_ioctl_received_subvol_args *sa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_root_item *root_item = &amp;root-&gt;root_item;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='hunk'>@@ -3994,8 +3953,8 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,</div><div class='ctx'> 	    !btrfs_is_empty_uuid(root_item-&gt;received_uuid)) {</div><div class='ctx'> 		ret = btrfs_uuid_tree_remove(trans, root_item-&gt;received_uuid,</div><div class='ctx'> 					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,</div><div class='del'>-					  root-&gt;root_key.objectid);</div><div class='del'>-		if (ret &amp;&amp; ret != -ENOENT) {</div><div class='add'>+					  btrfs_root_id(root));</div><div class='add'>+		if (unlikely(ret &amp;&amp; ret != -ENOENT)) {</div><div class='ctx'> 		        btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		        btrfs_end_transaction(trans);</div><div class='ctx'> 		        goto out;</div><div class='hunk'>@@ -4018,8 +3977,8 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,</div><div class='ctx'> 	if (received_uuid_changed &amp;&amp; !btrfs_is_empty_uuid(sa-&gt;uuid)) {</div><div class='ctx'> 		ret = btrfs_uuid_tree_add(trans, sa-&gt;uuid,</div><div class='ctx'> 					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,</div><div class='del'>-					  root-&gt;root_key.objectid);</div><div class='del'>-		if (ret &lt; 0 &amp;&amp; ret != -EEXIST) {</div><div class='add'>+					  btrfs_root_id(root));</div><div class='add'>+		if (unlikely(ret &lt; 0 &amp;&amp; ret != -EEXIST)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -4134,7 +4093,7 @@ static int btrfs_ioctl_get_fslabel(struct btrfs_fs_info *fs_info,</div><div class='ctx'> static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_super_block *super_block = fs_info-&gt;super_copy;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='hunk'>@@ -4165,7 +4124,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	strcpy(super_block-&gt;label, label);</div><div class='add'>+	strscpy(super_block-&gt;label, label);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='ctx'> 	ret = btrfs_commit_transaction(trans);</div><div class='ctx'> </div><div class='hunk'>@@ -4209,13 +4168,13 @@ static int btrfs_ioctl_get_features(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_feature_bits(struct btrfs_fs_info *fs_info,</div><div class='add'>+static int check_feature_bits(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			      enum btrfs_feature_set set,</div><div class='ctx'> 			      u64 change_mask, u64 flags, u64 supported_flags,</div><div class='ctx'> 			      u64 safe_set, u64 safe_clear)</div><div class='ctx'> {</div><div class='ctx'> 	const char *type = btrfs_feature_set_name(set);</div><div class='del'>-	char *names;</div><div class='add'>+	const char AUTO_KFREE(names);</div><div class='ctx'> 	u64 disallowed, unsupported;</div><div class='ctx'> 	u64 set_mask = flags &amp; change_mask;</div><div class='ctx'> 	u64 clear_mask = ~flags &amp; change_mask;</div><div class='hunk'>@@ -4223,12 +4182,11 @@ static int check_feature_bits(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	unsupported = set_mask &amp; ~supported_flags;</div><div class='ctx'> 	if (unsupported) {</div><div class='ctx'> 		names = btrfs_printable_features(set, unsupported);</div><div class='del'>-		if (names) {</div><div class='add'>+		if (names)</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "this kernel does not support the %s feature bit%s",</div><div class='ctx'> 				   names, strchr(names, ',') ? "s" : "");</div><div class='del'>-			kfree(names);</div><div class='del'>-		} else</div><div class='add'>+		else</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "this kernel does not support %s bits 0x%llx",</div><div class='ctx'> 				   type, unsupported);</div><div class='hunk'>@@ -4238,12 +4196,11 @@ static int check_feature_bits(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	disallowed = set_mask &amp; ~safe_set;</div><div class='ctx'> 	if (disallowed) {</div><div class='ctx'> 		names = btrfs_printable_features(set, disallowed);</div><div class='del'>-		if (names) {</div><div class='add'>+		if (names)</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "can't set the %s feature bit%s while mounted",</div><div class='ctx'> 				   names, strchr(names, ',') ? "s" : "");</div><div class='del'>-			kfree(names);</div><div class='del'>-		} else</div><div class='add'>+		else</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "can't set %s bits 0x%llx while mounted",</div><div class='ctx'> 				   type, disallowed);</div><div class='hunk'>@@ -4253,12 +4210,11 @@ static int check_feature_bits(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	disallowed = clear_mask &amp; ~safe_clear;</div><div class='ctx'> 	if (disallowed) {</div><div class='ctx'> 		names = btrfs_printable_features(set, disallowed);</div><div class='del'>-		if (names) {</div><div class='add'>+		if (names)</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "can't clear the %s feature bit%s while mounted",</div><div class='ctx'> 				   names, strchr(names, ',') ? "s" : "");</div><div class='del'>-			kfree(names);</div><div class='del'>-		} else</div><div class='add'>+		else</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='ctx'> 				   "can't clear %s bits 0x%llx while mounted",</div><div class='ctx'> 				   type, disallowed);</div><div class='hunk'>@@ -4277,7 +4233,7 @@ check_feature_bits(fs_info, FEAT_##mask_base, change_mask, flags,	\</div><div class='ctx'> static int btrfs_ioctl_set_features(struct file *file, void __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_super_block *super_block = fs_info-&gt;super_copy;</div><div class='ctx'> 	struct btrfs_ioctl_feature_flags flags[2];</div><div class='hunk'>@@ -4345,7 +4301,7 @@ out_drop_write:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _btrfs_ioctl_send(struct inode *inode, void __user *argp, bool compat)</div><div class='add'>+static int _btrfs_ioctl_send(struct btrfs_root *root, void __user *argp, bool compat)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ioctl_send_args *arg;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -4376,7 +4332,7 @@ static int _btrfs_ioctl_send(struct inode *inode, void __user *argp, bool compat</div><div class='ctx'> 		if (IS_ERR(arg))</div><div class='ctx'> 			return PTR_ERR(arg);</div><div class='ctx'> 	}</div><div class='del'>-	ret = btrfs_ioctl_send(inode, arg);</div><div class='add'>+	ret = btrfs_ioctl_send(root, arg);</div><div class='ctx'> 	kfree(arg);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4388,12 +4344,17 @@ static int btrfs_ioctl_encoded_read(struct file *file, void __user *argp,</div><div class='ctx'> 	size_t copy_end_kernel = offsetofend(struct btrfs_ioctl_encoded_io_args,</div><div class='ctx'> 					     flags);</div><div class='ctx'> 	size_t copy_end;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(file_inode(file));</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='ctx'> 	struct iovec iovstack[UIO_FASTIOV];</div><div class='ctx'> 	struct iovec *iov = iovstack;</div><div class='ctx'> 	struct iov_iter iter;</div><div class='ctx'> 	loff_t pos;</div><div class='ctx'> 	struct kiocb kiocb;</div><div class='ctx'> 	ssize_t ret;</div><div class='add'>+	u64 disk_bytenr, disk_io_size;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN)) {</div><div class='ctx'> 		ret = -EPERM;</div><div class='hunk'>@@ -4446,7 +4407,32 @@ static int btrfs_ioctl_encoded_read(struct file *file, void __user *argp,</div><div class='ctx'> 	init_sync_kiocb(&amp;kiocb, file);</div><div class='ctx'> 	kiocb.ki_pos = pos;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_encoded_read(&amp;kiocb, &amp;iter, &amp;args);</div><div class='add'>+	ret = btrfs_encoded_read(&amp;kiocb, &amp;iter, &amp;args, &amp;cached_state,</div><div class='add'>+				 &amp;disk_bytenr, &amp;disk_io_size);</div><div class='add'>+</div><div class='add'>+	if (ret == -EIOCBQUEUED) {</div><div class='add'>+		bool unlocked = false;</div><div class='add'>+		u64 start, lockend, count;</div><div class='add'>+</div><div class='add'>+		start = ALIGN_DOWN(kiocb.ki_pos, fs_info-&gt;sectorsize);</div><div class='add'>+		lockend = start + BTRFS_MAX_UNCOMPRESSED - 1;</div><div class='add'>+</div><div class='add'>+		if (args.compression)</div><div class='add'>+			count = disk_io_size;</div><div class='add'>+		else</div><div class='add'>+			count = args.len;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_encoded_read_regular(&amp;kiocb, &amp;iter, start, lockend,</div><div class='add'>+						 &amp;cached_state, disk_bytenr,</div><div class='add'>+						 disk_io_size, count,</div><div class='add'>+						 args.compression, &amp;unlocked);</div><div class='add'>+</div><div class='add'>+		if (!unlocked) {</div><div class='add'>+			btrfs_unlock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='add'>+			btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='ctx'> 		fsnotify_access(file);</div><div class='ctx'> 		if (copy_to_user(argp + copy_end,</div><div class='hunk'>@@ -4543,7 +4529,7 @@ static int btrfs_ioctl_encoded_write(struct file *file, void __user *argp, bool</div><div class='ctx'> 		goto out_iov;</div><div class='ctx'> </div><div class='ctx'> 	init_sync_kiocb(&amp;kiocb, file);</div><div class='del'>-	ret = kiocb_set_rw_flags(&amp;kiocb, 0);</div><div class='add'>+	ret = kiocb_set_rw_flags(&amp;kiocb, 0, WRITE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_iov;</div><div class='ctx'> 	kiocb.ki_pos = pos;</div><div class='hunk'>@@ -4564,11 +4550,644 @@ out_acct:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct btrfs_uring_encoded_data {</div><div class='add'>+	struct btrfs_ioctl_encoded_io_args args;</div><div class='add'>+	struct iovec iovstack[UIO_FASTIOV];</div><div class='add'>+	struct iovec *iov;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Context that's attached to an encoded read io_uring command, in cmd-&gt;pdu. It</div><div class='add'>+ * contains the fields in btrfs_uring_read_extent that are necessary to finish</div><div class='add'>+ * off and cleanup the I/O in btrfs_uring_read_finished.</div><div class='add'>+ */</div><div class='add'>+struct btrfs_uring_priv {</div><div class='add'>+	struct io_uring_cmd *cmd;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	unsigned long nr_pages;</div><div class='add'>+	struct kiocb iocb;</div><div class='add'>+	struct iovec *iov;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	struct extent_state *cached_state;</div><div class='add'>+	u64 count;</div><div class='add'>+	u64 start;</div><div class='add'>+	u64 lockend;</div><div class='add'>+	int err;</div><div class='add'>+	bool compressed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct io_btrfs_cmd {</div><div class='add'>+	struct btrfs_uring_encoded_data *data;</div><div class='add'>+	struct btrfs_uring_priv *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void btrfs_uring_read_finished(struct io_tw_req tw_req, io_tw_token_t tw)</div><div class='add'>+{</div><div class='add'>+	struct io_uring_cmd *cmd = io_uring_cmd_from_tw(tw_req);</div><div class='add'>+	struct io_btrfs_cmd *bc = io_uring_cmd_to_pdu(cmd, struct io_btrfs_cmd);</div><div class='add'>+	struct btrfs_uring_priv *priv = bc-&gt;priv;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(file_inode(priv-&gt;iocb.ki_filp));</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='add'>+	pgoff_t index;</div><div class='add'>+	u64 cur;</div><div class='add'>+	size_t page_offset;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	/* The inode lock has already been acquired in btrfs_uring_read_extent.  */</div><div class='add'>+	btrfs_lockdep_inode_acquire(inode, i_rwsem);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;err) {</div><div class='add'>+		ret = priv-&gt;err;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;compressed) {</div><div class='add'>+		index = 0;</div><div class='add'>+		page_offset = 0;</div><div class='add'>+	} else {</div><div class='add'>+		index = (priv-&gt;iocb.ki_pos - priv-&gt;start) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		page_offset = offset_in_page(priv-&gt;iocb.ki_pos - priv-&gt;start);</div><div class='add'>+	}</div><div class='add'>+	cur = 0;</div><div class='add'>+	while (cur &lt; priv-&gt;count) {</div><div class='add'>+		size_t bytes = min_t(size_t, priv-&gt;count - cur, PAGE_SIZE - page_offset);</div><div class='add'>+</div><div class='add'>+		if (copy_page_to_iter(priv-&gt;pages[index], page_offset, bytes,</div><div class='add'>+				      &amp;priv-&gt;iter) != bytes) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		index++;</div><div class='add'>+		cur += bytes;</div><div class='add'>+		page_offset = 0;</div><div class='add'>+	}</div><div class='add'>+	ret = priv-&gt;count;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_unlock_extent(io_tree, priv-&gt;start, priv-&gt;lockend, &amp;priv-&gt;cached_state);</div><div class='add'>+	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+</div><div class='add'>+	io_uring_cmd_done(cmd, ret, IO_URING_CMD_TASK_WORK_ISSUE_FLAGS);</div><div class='add'>+	add_rchar(current, ret);</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; priv-&gt;nr_pages; index++)</div><div class='add'>+		__free_page(priv-&gt;pages[index]);</div><div class='add'>+</div><div class='add'>+	kfree(priv-&gt;pages);</div><div class='add'>+	kfree(priv-&gt;iov);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	kfree(bc-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_uring_read_extent_endio(void *ctx, int err)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_uring_priv *priv = ctx;</div><div class='add'>+	struct io_btrfs_cmd *bc = io_uring_cmd_to_pdu(priv-&gt;cmd, struct io_btrfs_cmd);</div><div class='add'>+</div><div class='add'>+	priv-&gt;err = err;</div><div class='add'>+	bc-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	io_uring_cmd_complete_in_task(priv-&gt;cmd, btrfs_uring_read_finished);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_uring_read_extent(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+				   u64 start, u64 lockend,</div><div class='add'>+				   struct extent_state *cached_state,</div><div class='add'>+				   u64 disk_bytenr, u64 disk_io_size,</div><div class='add'>+				   size_t count, bool compressed,</div><div class='add'>+				   struct iovec *iov, struct io_uring_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(file_inode(iocb-&gt;ki_filp));</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	struct btrfs_uring_priv *priv = NULL;</div><div class='add'>+	unsigned long nr_pages;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nr_pages = DIV_ROUND_UP(disk_io_size, PAGE_SIZE);</div><div class='add'>+	pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);</div><div class='add'>+	if (!pages)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ret = btrfs_alloc_page_array(nr_pages, pages, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = kmalloc(sizeof(*priv), GFP_NOFS);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;iocb = *iocb;</div><div class='add'>+	priv-&gt;iov = iov;</div><div class='add'>+	priv-&gt;iter = *iter;</div><div class='add'>+	priv-&gt;count = count;</div><div class='add'>+	priv-&gt;cmd = cmd;</div><div class='add'>+	priv-&gt;cached_state = cached_state;</div><div class='add'>+	priv-&gt;compressed = compressed;</div><div class='add'>+	priv-&gt;nr_pages = nr_pages;</div><div class='add'>+	priv-&gt;pages = pages;</div><div class='add'>+	priv-&gt;start = start;</div><div class='add'>+	priv-&gt;lockend = lockend;</div><div class='add'>+	priv-&gt;err = 0;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_encoded_read_regular_fill_pages(inode, disk_bytenr,</div><div class='add'>+						    disk_io_size, pages, priv);</div><div class='add'>+	if (ret &amp;&amp; ret != -EIOCBQUEUED)</div><div class='add'>+		goto out_fail;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we return -EIOCBQUEUED, we're deferring the cleanup to</div><div class='add'>+	 * btrfs_uring_read_finished(), which will handle unlocking the extent</div><div class='add'>+	 * and inode and freeing the allocations.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're returning to userspace with the inode lock held, and that's</div><div class='add'>+	 * okay - it'll get unlocked in a worker thread.  Call</div><div class='add'>+	 * btrfs_lockdep_inode_release() to avoid confusing lockdep.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_lockdep_inode_release(inode, i_rwsem);</div><div class='add'>+</div><div class='add'>+	return -EIOCBQUEUED;</div><div class='add'>+</div><div class='add'>+out_fail:</div><div class='add'>+	btrfs_unlock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='add'>+	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_uring_encoded_read(struct io_uring_cmd *cmd, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct file *file = cmd-&gt;file;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(file-&gt;f_inode);</div><div class='add'>+	struct extent_io_tree *io_tree = &amp;inode-&gt;io_tree;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='add'>+	size_t copy_end_kernel = offsetofend(struct btrfs_ioctl_encoded_io_args, flags);</div><div class='add'>+	size_t copy_end;</div><div class='add'>+	int ret;</div><div class='add'>+	u64 disk_bytenr, disk_io_size;</div><div class='add'>+	loff_t pos;</div><div class='add'>+	struct kiocb kiocb;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	u64 start, lockend;</div><div class='add'>+	void __user *sqe_addr;</div><div class='add'>+	struct io_btrfs_cmd *bc = io_uring_cmd_to_pdu(cmd, struct io_btrfs_cmd);</div><div class='add'>+	struct btrfs_uring_encoded_data *data = NULL;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flags &amp; IORING_URING_CMD_REISSUE)</div><div class='add'>+		data = bc-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN)) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out_acct;</div><div class='add'>+	}</div><div class='add'>+	sqe_addr = u64_to_user_ptr(READ_ONCE(cmd-&gt;sqe-&gt;addr));</div><div class='add'>+</div><div class='add'>+	if (issue_flags &amp; IO_URING_F_COMPAT) {</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='add'>+		copy_end = offsetofend(struct btrfs_ioctl_encoded_io_args_32, flags);</div><div class='add'>+#else</div><div class='add'>+		ret = -ENOTTY;</div><div class='add'>+		goto out_acct;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		copy_end = copy_end_kernel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data) {</div><div class='add'>+		data = kzalloc(sizeof(*data), GFP_NOFS);</div><div class='add'>+		if (!data) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_acct;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bc-&gt;data = data;</div><div class='add'>+</div><div class='add'>+		if (issue_flags &amp; IO_URING_F_COMPAT) {</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='add'>+			struct btrfs_ioctl_encoded_io_args_32 args32;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;args32, sqe_addr, copy_end)) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out_acct;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			data-&gt;args.iov = compat_ptr(args32.iov);</div><div class='add'>+			data-&gt;args.iovcnt = args32.iovcnt;</div><div class='add'>+			data-&gt;args.offset = args32.offset;</div><div class='add'>+			data-&gt;args.flags = args32.flags;</div><div class='add'>+#endif</div><div class='add'>+		} else {</div><div class='add'>+			if (copy_from_user(&amp;data-&gt;args, sqe_addr, copy_end)) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out_acct;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (data-&gt;args.flags != 0) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_acct;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;iov = data-&gt;iovstack;</div><div class='add'>+		ret = import_iovec(ITER_DEST, data-&gt;args.iov, data-&gt;args.iovcnt,</div><div class='add'>+				   ARRAY_SIZE(data-&gt;iovstack), &amp;data-&gt;iov,</div><div class='add'>+				   &amp;data-&gt;iter);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_acct;</div><div class='add'>+</div><div class='add'>+		if (iov_iter_count(&amp;data-&gt;iter) == 0) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = data-&gt;args.offset;</div><div class='add'>+	ret = rw_verify_area(READ, file, &amp;pos, data-&gt;args.len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	init_sync_kiocb(&amp;kiocb, file);</div><div class='add'>+	kiocb.ki_pos = pos;</div><div class='add'>+</div><div class='add'>+	if (issue_flags &amp; IO_URING_F_NONBLOCK)</div><div class='add'>+		kiocb.ki_flags |= IOCB_NOWAIT;</div><div class='add'>+</div><div class='add'>+	start = ALIGN_DOWN(pos, fs_info-&gt;sectorsize);</div><div class='add'>+	lockend = start + BTRFS_MAX_UNCOMPRESSED - 1;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_encoded_read(&amp;kiocb, &amp;data-&gt;iter, &amp;data-&gt;args, &amp;cached_state,</div><div class='add'>+				 &amp;disk_bytenr, &amp;disk_io_size);</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		goto out_acct;</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret != -EIOCBQUEUED)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	file_accessed(file);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(sqe_addr + copy_end,</div><div class='add'>+			 (const char *)&amp;data-&gt;args + copy_end_kernel,</div><div class='add'>+			 sizeof(data-&gt;args) - copy_end_kernel)) {</div><div class='add'>+		if (ret == -EIOCBQUEUED) {</div><div class='add'>+			btrfs_unlock_extent(io_tree, start, lockend, &amp;cached_state);</div><div class='add'>+			btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);</div><div class='add'>+		}</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == -EIOCBQUEUED) {</div><div class='add'>+		u64 count = min_t(u64, iov_iter_count(&amp;data-&gt;iter), disk_io_size);</div><div class='add'>+</div><div class='add'>+		/* Match ioctl by not returning past EOF if uncompressed. */</div><div class='add'>+		if (!data-&gt;args.compression)</div><div class='add'>+			count = min_t(u64, count, data-&gt;args.len);</div><div class='add'>+</div><div class='add'>+		ret = btrfs_uring_read_extent(&amp;kiocb, &amp;data-&gt;iter, start, lockend,</div><div class='add'>+					      cached_state, disk_bytenr, disk_io_size,</div><div class='add'>+					      count, data-&gt;args.compression,</div><div class='add'>+					      data-&gt;iov, cmd);</div><div class='add'>+</div><div class='add'>+		goto out_acct;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(data-&gt;iov);</div><div class='add'>+</div><div class='add'>+out_acct:</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		add_rchar(current, ret);</div><div class='add'>+	inc_syscr(current);</div><div class='add'>+</div><div class='add'>+	if (ret != -EIOCBQUEUED &amp;&amp; ret != -EAGAIN)</div><div class='add'>+		kfree(data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_uring_encoded_write(struct io_uring_cmd *cmd, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct file *file = cmd-&gt;file;</div><div class='add'>+	loff_t pos;</div><div class='add'>+	struct kiocb kiocb;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	void __user *sqe_addr;</div><div class='add'>+	struct io_btrfs_cmd *bc = io_uring_cmd_to_pdu(cmd, struct io_btrfs_cmd);</div><div class='add'>+	struct btrfs_uring_encoded_data *data = NULL;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flags &amp; IORING_URING_CMD_REISSUE)</div><div class='add'>+		data = bc-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN)) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out_acct;</div><div class='add'>+	}</div><div class='add'>+	sqe_addr = u64_to_user_ptr(READ_ONCE(cmd-&gt;sqe-&gt;addr));</div><div class='add'>+</div><div class='add'>+	if (!(file-&gt;f_mode &amp; FMODE_WRITE)) {</div><div class='add'>+		ret = -EBADF;</div><div class='add'>+		goto out_acct;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data) {</div><div class='add'>+		data = kzalloc(sizeof(*data), GFP_NOFS);</div><div class='add'>+		if (!data) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_acct;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bc-&gt;data = data;</div><div class='add'>+</div><div class='add'>+		if (issue_flags &amp; IO_URING_F_COMPAT) {</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='add'>+			struct btrfs_ioctl_encoded_io_args_32 args32;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;args32, sqe_addr, sizeof(args32))) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out_acct;</div><div class='add'>+			}</div><div class='add'>+			data-&gt;args.iov = compat_ptr(args32.iov);</div><div class='add'>+			data-&gt;args.iovcnt = args32.iovcnt;</div><div class='add'>+			data-&gt;args.offset = args32.offset;</div><div class='add'>+			data-&gt;args.flags = args32.flags;</div><div class='add'>+			data-&gt;args.len = args32.len;</div><div class='add'>+			data-&gt;args.unencoded_len = args32.unencoded_len;</div><div class='add'>+			data-&gt;args.unencoded_offset = args32.unencoded_offset;</div><div class='add'>+			data-&gt;args.compression = args32.compression;</div><div class='add'>+			data-&gt;args.encryption = args32.encryption;</div><div class='add'>+			memcpy(data-&gt;args.reserved, args32.reserved,</div><div class='add'>+			       sizeof(data-&gt;args.reserved));</div><div class='add'>+#else</div><div class='add'>+			ret = -ENOTTY;</div><div class='add'>+			goto out_acct;</div><div class='add'>+#endif</div><div class='add'>+		} else {</div><div class='add'>+			if (copy_from_user(&amp;data-&gt;args, sqe_addr, sizeof(data-&gt;args))) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out_acct;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		if (data-&gt;args.flags != 0)</div><div class='add'>+			goto out_acct;</div><div class='add'>+		if (memchr_inv(data-&gt;args.reserved, 0, sizeof(data-&gt;args.reserved)))</div><div class='add'>+			goto out_acct;</div><div class='add'>+		if (data-&gt;args.compression == BTRFS_ENCODED_IO_COMPRESSION_NONE &amp;&amp;</div><div class='add'>+		    data-&gt;args.encryption == BTRFS_ENCODED_IO_ENCRYPTION_NONE)</div><div class='add'>+			goto out_acct;</div><div class='add'>+		if (data-&gt;args.compression &gt;= BTRFS_ENCODED_IO_COMPRESSION_TYPES ||</div><div class='add'>+		    data-&gt;args.encryption &gt;= BTRFS_ENCODED_IO_ENCRYPTION_TYPES)</div><div class='add'>+			goto out_acct;</div><div class='add'>+		if (data-&gt;args.unencoded_offset &gt; data-&gt;args.unencoded_len)</div><div class='add'>+			goto out_acct;</div><div class='add'>+		if (data-&gt;args.len &gt; data-&gt;args.unencoded_len - data-&gt;args.unencoded_offset)</div><div class='add'>+			goto out_acct;</div><div class='add'>+</div><div class='add'>+		data-&gt;iov = data-&gt;iovstack;</div><div class='add'>+		ret = import_iovec(ITER_SOURCE, data-&gt;args.iov, data-&gt;args.iovcnt,</div><div class='add'>+				   ARRAY_SIZE(data-&gt;iovstack), &amp;data-&gt;iov,</div><div class='add'>+				   &amp;data-&gt;iter);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_acct;</div><div class='add'>+</div><div class='add'>+		if (iov_iter_count(&amp;data-&gt;iter) == 0) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto out_iov;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (issue_flags &amp; IO_URING_F_NONBLOCK) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out_acct;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = data-&gt;args.offset;</div><div class='add'>+	ret = rw_verify_area(WRITE, file, &amp;pos, data-&gt;args.len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_iov;</div><div class='add'>+</div><div class='add'>+	init_sync_kiocb(&amp;kiocb, file);</div><div class='add'>+	ret = kiocb_set_rw_flags(&amp;kiocb, 0, WRITE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_iov;</div><div class='add'>+	kiocb.ki_pos = pos;</div><div class='add'>+</div><div class='add'>+	file_start_write(file);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_do_write_iter(&amp;kiocb, &amp;data-&gt;iter, &amp;data-&gt;args);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		fsnotify_modify(file);</div><div class='add'>+</div><div class='add'>+	file_end_write(file);</div><div class='add'>+out_iov:</div><div class='add'>+	kfree(data-&gt;iov);</div><div class='add'>+out_acct:</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		add_wchar(current, ret);</div><div class='add'>+	inc_syscw(current);</div><div class='add'>+</div><div class='add'>+	if (ret != -EAGAIN)</div><div class='add'>+		kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(file_inode(cmd-&gt;file)))))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd_op) {</div><div class='add'>+	case BTRFS_IOC_ENCODED_READ:</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='add'>+	case BTRFS_IOC_ENCODED_READ_32:</div><div class='add'>+#endif</div><div class='add'>+		return btrfs_uring_encoded_read(cmd, issue_flags);</div><div class='add'>+</div><div class='add'>+	case BTRFS_IOC_ENCODED_WRITE:</div><div class='add'>+#if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='add'>+	case BTRFS_IOC_ENCODED_WRITE_32:</div><div class='add'>+#endif</div><div class='add'>+		return btrfs_uring_encoded_write(cmd, issue_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_ioctl_subvol_sync(struct btrfs_fs_info *fs_info, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_root *root;</div><div class='add'>+	struct btrfs_ioctl_subvol_wait args = { 0 };</div><div class='add'>+	signed long sched_ret;</div><div class='add'>+	int refs;</div><div class='add'>+	u64 root_flags;</div><div class='add'>+	bool wait_for_deletion = false;</div><div class='add'>+	bool found = false;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;args, argp, sizeof(args)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (args.mode) {</div><div class='add'>+	case BTRFS_SUBVOL_SYNC_WAIT_FOR_QUEUED:</div><div class='add'>+		/*</div><div class='add'>+		 * Wait for the first one deleted that waits until all previous</div><div class='add'>+		 * are cleaned.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		if (!list_empty(&amp;fs_info-&gt;dead_roots)) {</div><div class='add'>+			root = list_last_entry(&amp;fs_info-&gt;dead_roots,</div><div class='add'>+					       struct btrfs_root, root_list);</div><div class='add'>+			args.subvolid = btrfs_root_id(root);</div><div class='add'>+			found = true;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		if (!found)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BTRFS_SUBVOL_SYNC_WAIT_FOR_ONE:</div><div class='add'>+		if ((0 &lt; args.subvolid &amp;&amp; args.subvolid &lt; BTRFS_FIRST_FREE_OBJECTID) ||</div><div class='add'>+		    BTRFS_LAST_FREE_OBJECTID &lt; args.subvolid)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case BTRFS_SUBVOL_SYNC_COUNT:</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		args.count = list_count_nodes(&amp;fs_info-&gt;dead_roots);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		if (copy_to_user(argp, &amp;args, sizeof(args)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	case BTRFS_SUBVOL_SYNC_PEEK_FIRST:</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		/* Last in the list was deleted first. */</div><div class='add'>+		if (!list_empty(&amp;fs_info-&gt;dead_roots)) {</div><div class='add'>+			root = list_last_entry(&amp;fs_info-&gt;dead_roots,</div><div class='add'>+					       struct btrfs_root, root_list);</div><div class='add'>+			args.subvolid = btrfs_root_id(root);</div><div class='add'>+		} else {</div><div class='add'>+			args.subvolid = 0;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		if (copy_to_user(argp, &amp;args, sizeof(args)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	case BTRFS_SUBVOL_SYNC_PEEK_LAST:</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		/* First in the list was deleted last. */</div><div class='add'>+		if (!list_empty(&amp;fs_info-&gt;dead_roots)) {</div><div class='add'>+			root = list_first_entry(&amp;fs_info-&gt;dead_roots,</div><div class='add'>+						struct btrfs_root, root_list);</div><div class='add'>+			args.subvolid = btrfs_root_id(root);</div><div class='add'>+		} else {</div><div class='add'>+			args.subvolid = 0;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='add'>+		if (copy_to_user(argp, &amp;args, sizeof(args)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 32bit limitation: fs_roots_radix key is not wide enough. */</div><div class='add'>+	if (sizeof(unsigned long) != sizeof(u64) &amp;&amp; args.subvolid &gt; U32_MAX)</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		/* Wait for the specific one. */</div><div class='add'>+		if (down_read_interruptible(&amp;fs_info-&gt;subvol_sem) == -EINTR)</div><div class='add'>+			return -EINTR;</div><div class='add'>+		refs = -1;</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='add'>+		root = radix_tree_lookup(&amp;fs_info-&gt;fs_roots_radix,</div><div class='add'>+					 (unsigned long)args.subvolid);</div><div class='add'>+		if (root) {</div><div class='add'>+			spin_lock(&amp;root-&gt;root_item_lock);</div><div class='add'>+			refs = btrfs_root_refs(&amp;root-&gt;root_item);</div><div class='add'>+			root_flags = btrfs_root_flags(&amp;root-&gt;root_item);</div><div class='add'>+			spin_unlock(&amp;root-&gt;root_item_lock);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='add'>+		up_read(&amp;fs_info-&gt;subvol_sem);</div><div class='add'>+</div><div class='add'>+		/* Subvolume does not exist. */</div><div class='add'>+		if (!root)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		/* Subvolume not deleted at all. */</div><div class='add'>+		if (refs &gt; 0)</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		/* We've waited and now the subvolume is gone. */</div><div class='add'>+		if (wait_for_deletion &amp;&amp; refs == -1) {</div><div class='add'>+			/* Return the one we waited for as the last one. */</div><div class='add'>+			if (copy_to_user(argp, &amp;args, sizeof(args)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Subvolume not found on the first try (deleted or never existed). */</div><div class='add'>+		if (refs == -1)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		wait_for_deletion = true;</div><div class='add'>+		ASSERT(root_flags &amp; BTRFS_ROOT_SUBVOL_DEAD);</div><div class='add'>+		sched_ret = schedule_timeout_interruptible(HZ);</div><div class='add'>+		/* Early wake up or error. */</div><div class='add'>+		if (sched_ret != 0)</div><div class='add'>+			return -EINTR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+static int btrfs_ioctl_shutdown(struct btrfs_fs_info *fs_info, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (get_user(flags, (u32 __user *)arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (flags &gt;= BTRFS_SHUTDOWN_FLAGS_LAST)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (btrfs_is_shutdown(fs_info))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (flags) {</div><div class='add'>+	case BTRFS_SHUTDOWN_FLAGS_LOGFLUSH:</div><div class='add'>+	case BTRFS_SHUTDOWN_FLAGS_DEFAULT:</div><div class='add'>+		ret = freeze_super(fs_info-&gt;sb, FREEZE_HOLDER_KERNEL, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		btrfs_force_shutdown(fs_info);</div><div class='add'>+		ret = thaw_super(fs_info-&gt;sb, FREEZE_HOLDER_KERNEL, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case BTRFS_SHUTDOWN_FLAGS_NOLOGFLUSH:</div><div class='add'>+		btrfs_force_shutdown(fs_info);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 		cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='hunk'>@@ -4582,19 +5201,19 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 	case FITRIM:</div><div class='ctx'> 		return btrfs_ioctl_fitrim(fs_info, argp);</div><div class='ctx'> 	case BTRFS_IOC_SNAP_CREATE:</div><div class='del'>-		return btrfs_ioctl_snap_create(file, argp, 0);</div><div class='add'>+		return btrfs_ioctl_snap_create(file, argp, false);</div><div class='ctx'> 	case BTRFS_IOC_SNAP_CREATE_V2:</div><div class='del'>-		return btrfs_ioctl_snap_create_v2(file, argp, 0);</div><div class='add'>+		return btrfs_ioctl_snap_create_v2(file, argp, false);</div><div class='ctx'> 	case BTRFS_IOC_SUBVOL_CREATE:</div><div class='del'>-		return btrfs_ioctl_snap_create(file, argp, 1);</div><div class='add'>+		return btrfs_ioctl_snap_create(file, argp, true);</div><div class='ctx'> 	case BTRFS_IOC_SUBVOL_CREATE_V2:</div><div class='del'>-		return btrfs_ioctl_snap_create_v2(file, argp, 1);</div><div class='add'>+		return btrfs_ioctl_snap_create_v2(file, argp, true);</div><div class='ctx'> 	case BTRFS_IOC_SNAP_DESTROY:</div><div class='ctx'> 		return btrfs_ioctl_snap_destroy(file, argp, false);</div><div class='ctx'> 	case BTRFS_IOC_SNAP_DESTROY_V2:</div><div class='ctx'> 		return btrfs_ioctl_snap_destroy(file, argp, true);</div><div class='ctx'> 	case BTRFS_IOC_SUBVOL_GETFLAGS:</div><div class='del'>-		return btrfs_ioctl_subvol_getflags(inode, argp);</div><div class='add'>+		return btrfs_ioctl_subvol_getflags(BTRFS_I(inode), argp);</div><div class='ctx'> 	case BTRFS_IOC_SUBVOL_SETFLAGS:</div><div class='ctx'> 		return btrfs_ioctl_subvol_setflags(file, argp);</div><div class='ctx'> 	case BTRFS_IOC_DEFAULT_SUBVOL:</div><div class='hunk'>@@ -4616,9 +5235,9 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 	case BTRFS_IOC_DEV_INFO:</div><div class='ctx'> 		return btrfs_ioctl_dev_info(fs_info, argp);</div><div class='ctx'> 	case BTRFS_IOC_TREE_SEARCH:</div><div class='del'>-		return btrfs_ioctl_tree_search(inode, argp);</div><div class='add'>+		return btrfs_ioctl_tree_search(root, argp);</div><div class='ctx'> 	case BTRFS_IOC_TREE_SEARCH_V2:</div><div class='del'>-		return btrfs_ioctl_tree_search_v2(inode, argp);</div><div class='add'>+		return btrfs_ioctl_tree_search_v2(root, argp);</div><div class='ctx'> 	case BTRFS_IOC_INO_LOOKUP:</div><div class='ctx'> 		return btrfs_ioctl_ino_lookup(root, argp);</div><div class='ctx'> 	case BTRFS_IOC_INO_PATHS:</div><div class='hunk'>@@ -4637,11 +5256,10 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		ret = btrfs_sync_fs(inode-&gt;i_sb, 1);</div><div class='ctx'> 		/*</div><div class='del'>-		 * The transaction thread may want to do more work,</div><div class='del'>-		 * namely it pokes the cleaner kthread that will start</div><div class='del'>-		 * processing uncleaned subvols.</div><div class='add'>+		 * There may be work for the cleaner kthread to do (subvolume</div><div class='add'>+		 * deletion, delayed iputs, defrag inodes, etc), so wake it up.</div><div class='ctx'> 		 */</div><div class='del'>-		wake_up_process(fs_info-&gt;transaction_kthread);</div><div class='add'>+		wake_up_process(fs_info-&gt;cleaner_kthread);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	case BTRFS_IOC_START_SYNC:</div><div class='hunk'>@@ -4667,10 +5285,10 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 		return btrfs_ioctl_set_received_subvol_32(file, argp);</div><div class='ctx'> #endif</div><div class='ctx'> 	case BTRFS_IOC_SEND:</div><div class='del'>-		return _btrfs_ioctl_send(inode, argp, false);</div><div class='add'>+		return _btrfs_ioctl_send(root, argp, false);</div><div class='ctx'> #if defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_COMPAT)</div><div class='ctx'> 	case BTRFS_IOC_SEND_32:</div><div class='del'>-		return _btrfs_ioctl_send(inode, argp, true);</div><div class='add'>+		return _btrfs_ioctl_send(root, argp, true);</div><div class='ctx'> #endif</div><div class='ctx'> 	case BTRFS_IOC_GET_DEV_STATS:</div><div class='ctx'> 		return btrfs_ioctl_get_dev_stats(fs_info, argp);</div><div class='hunk'>@@ -4687,7 +5305,7 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 	case BTRFS_IOC_QUOTA_RESCAN_STATUS:</div><div class='ctx'> 		return btrfs_ioctl_quota_rescan_status(fs_info, argp);</div><div class='ctx'> 	case BTRFS_IOC_QUOTA_RESCAN_WAIT:</div><div class='del'>-		return btrfs_ioctl_quota_rescan_wait(fs_info, argp);</div><div class='add'>+		return btrfs_ioctl_quota_rescan_wait(fs_info);</div><div class='ctx'> 	case BTRFS_IOC_DEV_REPLACE:</div><div class='ctx'> 		return btrfs_ioctl_dev_replace(fs_info, argp);</div><div class='ctx'> 	case BTRFS_IOC_GET_SUPPORTED_FEATURES:</div><div class='hunk'>@@ -4706,6 +5324,8 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 		return fsverity_ioctl_enable(file, (const void __user *)argp);</div><div class='ctx'> 	case FS_IOC_MEASURE_VERITY:</div><div class='ctx'> 		return fsverity_ioctl_measure(file, argp);</div><div class='add'>+	case FS_IOC_READ_VERITY_METADATA:</div><div class='add'>+		return fsverity_ioctl_read_metadata(file, argp);</div><div class='ctx'> 	case BTRFS_IOC_ENCODED_READ:</div><div class='ctx'> 		return btrfs_ioctl_encoded_read(file, argp, false);</div><div class='ctx'> 	case BTRFS_IOC_ENCODED_WRITE:</div><div class='hunk'>@@ -4716,6 +5336,12 @@ long btrfs_ioctl(struct file *file, unsigned int</div><div class='ctx'> 	case BTRFS_IOC_ENCODED_WRITE_32:</div><div class='ctx'> 		return btrfs_ioctl_encoded_write(file, argp, true);</div><div class='ctx'> #endif</div><div class='add'>+	case BTRFS_IOC_SUBVOL_SYNC_WAIT:</div><div class='add'>+		return btrfs_ioctl_subvol_sync(fs_info, argp);</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	case BTRFS_IOC_SHUTDOWN:</div><div class='add'>+		return btrfs_ioctl_shutdown(fs_info, arg);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -ENOTTY;</div><div class='head'>diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h<br/>index d51b9a2f2f6e..ccf6bed9cc24 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ioctl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ioctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ioctl.h</a></div><div class='hunk'>@@ -3,15 +3,27 @@</div><div class='ctx'> #ifndef BTRFS_IOCTL_H</div><div class='ctx'> #define BTRFS_IOCTL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct file;</div><div class='add'>+struct dentry;</div><div class='add'>+struct mnt_idmap;</div><div class='add'>+struct file_kattr;</div><div class='add'>+struct io_uring_cmd;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_ioctl_balance_args;</div><div class='add'>+</div><div class='ctx'> long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='ctx'> long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='del'>-int btrfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int btrfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int btrfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		       struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		       struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int btrfs_ioctl_get_supported_features(void __user *arg);</div><div class='del'>-void btrfs_sync_inode_flags_to_i_flags(struct inode *inode);</div><div class='del'>-int __pure btrfs_is_empty_uuid(u8 *uuid);</div><div class='add'>+void btrfs_sync_inode_flags_to_i_flags(struct btrfs_inode *inode);</div><div class='ctx'> void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				     struct btrfs_ioctl_balance_args *bargs);</div><div class='add'>+int btrfs_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags);</div><div class='add'>+void btrfs_uring_read_extent_endio(void *ctx, int err);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c<br/>index 74d8e2003f58..0035851d72b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/locking.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/locking.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/locking.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/locking.c</a></div><div class='hunk'>@@ -9,11 +9,9 @@</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='ctx'> #include &lt;trace/events/btrfs.h&gt;</div><div class='del'>-#include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "extent_io.h"</div><div class='ctx'> #include "locking.h"</div><div class='del'>-#include "accessors.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Lockdep class keys for extent_buffer-&gt;lock's in this root.  For a given</div><div class='hunk'>@@ -85,7 +83,7 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_lockdep_keyset *ks;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(level &gt;= ARRAY_SIZE(ks-&gt;keys));</div><div class='add'>+	ASSERT(level &lt; ARRAY_SIZE(ks-&gt;keys));</div><div class='ctx'> </div><div class='ctx'> 	/* Find the matching keyset, id 0 is the default entry */</div><div class='ctx'> 	for (ks = btrfs_lockdep_keysets; ks-&gt;id; ks++)</div><div class='hunk'>@@ -98,7 +96,7 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int</div><div class='ctx'> void btrfs_maybe_reset_lockdep_class(struct btrfs_root *root, struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(BTRFS_ROOT_RESET_LOCKDEP_CLASS, &amp;root-&gt;state))</div><div class='del'>-		btrfs_set_buffer_lockdep_class(root-&gt;root_key.objectid,</div><div class='add'>+		btrfs_set_buffer_lockdep_class(btrfs_root_id(root),</div><div class='ctx'> 					       eb, btrfs_header_level(eb));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -130,14 +128,14 @@ static void btrfs_set_eb_lock_owner(struct extent_buffer *eb, pid_t owner) { }</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * __btrfs_tree_read_lock - lock extent buffer for read</div><div class='add'>+ * btrfs_tree_read_lock_nested - lock extent buffer for read</div><div class='ctx'>  * @eb:		the eb to be locked</div><div class='ctx'>  * @nest:	the nesting level to be used for lockdep</div><div class='ctx'>  *</div><div class='ctx'>  * This takes the read lock on the extent buffer, using the specified nesting</div><div class='ctx'>  * level for lockdep purposes.</div><div class='ctx'>  */</div><div class='del'>-void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest)</div><div class='add'>+void btrfs_tree_read_lock_nested(struct extent_buffer *eb, enum btrfs_lock_nesting nest)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start_ns = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -148,38 +146,18 @@ void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting ne</div><div class='ctx'> 	trace_btrfs_tree_read_lock(eb, start_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_tree_read_lock(struct extent_buffer *eb)</div><div class='del'>-{</div><div class='del'>-	__btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Try-lock for read.</div><div class='ctx'>  *</div><div class='del'>- * Return 1 if the rwlock has been taken, 0 otherwise</div><div class='add'>+ * Return true if the rwlock has been taken, false otherwise</div><div class='ctx'>  */</div><div class='del'>-int btrfs_try_tree_read_lock(struct extent_buffer *eb)</div><div class='add'>+bool btrfs_try_tree_read_lock(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	if (down_read_trylock(&amp;eb-&gt;lock)) {</div><div class='ctx'> 		trace_btrfs_try_tree_read_lock(eb);</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Try-lock for write.</div><div class='del'>- *</div><div class='del'>- * Return 1 if the rwlock has been taken, 0 otherwise</div><div class='del'>- */</div><div class='del'>-int btrfs_try_tree_write_lock(struct extent_buffer *eb)</div><div class='del'>-{</div><div class='del'>-	if (down_write_trylock(&amp;eb-&gt;lock)) {</div><div class='del'>-		btrfs_set_eb_lock_owner(eb, current-&gt;pid);</div><div class='del'>-		trace_btrfs_try_tree_write_lock(eb);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -199,7 +177,7 @@ void btrfs_tree_read_unlock(struct extent_buffer *eb)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns with the eb-&gt;lock write locked.</div><div class='ctx'>  */</div><div class='del'>-void __btrfs_tree_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest)</div><div class='add'>+void btrfs_tree_lock_nested(struct extent_buffer *eb, enum btrfs_lock_nesting nest)</div><div class='ctx'> 	__acquires(&amp;eb-&gt;lock)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start_ns = 0;</div><div class='hunk'>@@ -212,11 +190,6 @@ void __btrfs_tree_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest)</div><div class='ctx'> 	trace_btrfs_tree_lock(eb, start_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_tree_lock(struct extent_buffer *eb)</div><div class='del'>-{</div><div class='del'>-	__btrfs_tree_lock(eb, BTRFS_NESTING_NORMAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Release the write lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -375,8 +348,12 @@ void btrfs_drew_write_lock(struct btrfs_drew_lock *lock)</div><div class='ctx'> </div><div class='ctx'> void btrfs_drew_write_unlock(struct btrfs_drew_lock *lock)</div><div class='ctx'> {</div><div class='del'>-	atomic_dec(&amp;lock-&gt;writers);</div><div class='del'>-	cond_wake_up(&amp;lock-&gt;pending_readers);</div><div class='add'>+	/*</div><div class='add'>+	 * atomic_dec_and_test() implies a full barrier, so woken up readers are</div><div class='add'>+	 * guaranteed to see the decrement.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_dec_and_test(&amp;lock-&gt;writers))</div><div class='add'>+		wake_up(&amp;lock-&gt;pending_readers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_drew_read_lock(struct btrfs_drew_lock *lock)</div><div class='hunk'>@@ -384,7 +361,7 @@ void btrfs_drew_read_lock(struct btrfs_drew_lock *lock)</div><div class='ctx'> 	atomic_inc(&amp;lock-&gt;readers);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Ensure the pending reader count is perceieved BEFORE this reader</div><div class='add'>+	 * Ensure the pending reader count is perceived BEFORE this reader</div><div class='ctx'> 	 * goes to sleep in case of active writers. This guarantees new writers</div><div class='ctx'> 	 * won't be allowed and that the current reader will be woken up when</div><div class='ctx'> 	 * the last active writer finishes its jobs.</div><div class='head'>diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h<br/>index 7d6ee1e609bf..a4673e7d95d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/locking.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/locking.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/locking.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/locking.h</a></div><div class='hunk'>@@ -8,9 +8,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='ctx'> #include "extent_io.h"</div><div class='ctx'> </div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+</div><div class='ctx'> #define BTRFS_WRITE_LOCK 1</div><div class='ctx'> #define BTRFS_READ_LOCK 2</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +74,7 @@ enum btrfs_lock_nesting {</div><div class='ctx'> 	BTRFS_NESTING_NEW_ROOT,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We are limited to MAX_LOCKDEP_SUBLCLASSES number of subclasses, so</div><div class='add'>+	 * We are limited to MAX_LOCKDEP_SUBCLASSES number of subclasses, so</div><div class='ctx'> 	 * add this in here and add a static_assert to keep us from going over</div><div class='ctx'> 	 * the limit.  As of this writing we're limited to 8, and we're</div><div class='ctx'> 	 * definitely using 8, hence this check to keep us from messing up in</div><div class='hunk'>@@ -124,6 +129,16 @@ enum btrfs_lockdep_trans_states {</div><div class='ctx'> 	rwsem_release(&amp;owner-&gt;lock##_map, _THIS_IP_)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Used to account for the fact that when doing io_uring encoded I/O, we can</div><div class='add'>+ * return to userspace with the inode lock still held.</div><div class='add'>+ */</div><div class='add'>+#define btrfs_lockdep_inode_acquire(owner, lock)				\</div><div class='add'>+	rwsem_acquire_read(&amp;owner-&gt;vfs_inode.lock.dep_map, 0, 0, _THIS_IP_)</div><div class='add'>+</div><div class='add'>+#define btrfs_lockdep_inode_release(owner, lock)				\</div><div class='add'>+	rwsem_release(&amp;owner-&gt;vfs_inode.lock.dep_map, _THIS_IP_)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Macros for the transaction states wait events, similar to the generic wait</div><div class='ctx'>  * event macros.</div><div class='ctx'>  */</div><div class='hunk'>@@ -157,17 +172,24 @@ enum btrfs_lockdep_trans_states {</div><div class='ctx'> static_assert(BTRFS_NESTING_MAX &lt;= MAX_LOCKDEP_SUBCLASSES,</div><div class='ctx'> 	      "too many lock subclasses defined");</div><div class='ctx'> </div><div class='del'>-struct btrfs_path;</div><div class='add'>+void btrfs_tree_lock_nested(struct extent_buffer *eb, enum btrfs_lock_nesting nest);</div><div class='add'>+</div><div class='add'>+static inline void btrfs_tree_lock(struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	btrfs_tree_lock_nested(eb, BTRFS_NESTING_NORMAL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-void __btrfs_tree_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest);</div><div class='del'>-void btrfs_tree_lock(struct extent_buffer *eb);</div><div class='ctx'> void btrfs_tree_unlock(struct extent_buffer *eb);</div><div class='ctx'> </div><div class='del'>-void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest);</div><div class='del'>-void btrfs_tree_read_lock(struct extent_buffer *eb);</div><div class='add'>+void btrfs_tree_read_lock_nested(struct extent_buffer *eb, enum btrfs_lock_nesting nest);</div><div class='add'>+</div><div class='add'>+static inline void btrfs_tree_read_lock(struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	btrfs_tree_read_lock_nested(eb, BTRFS_NESTING_NORMAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void btrfs_tree_read_unlock(struct extent_buffer *eb);</div><div class='del'>-int btrfs_try_tree_read_lock(struct extent_buffer *eb);</div><div class='del'>-int btrfs_try_tree_write_lock(struct extent_buffer *eb);</div><div class='add'>+bool btrfs_try_tree_read_lock(struct extent_buffer *eb);</div><div class='ctx'> struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root);</div><div class='ctx'> struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root);</div><div class='ctx'> struct extent_buffer *btrfs_try_read_lock_root_node(struct btrfs_root *root);</div><div class='hunk'>@@ -177,8 +199,13 @@ static inline void btrfs_assert_tree_write_locked(struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held_write(&amp;eb-&gt;lock);</div><div class='ctx'> }</div><div class='add'>+static inline void btrfs_assert_tree_read_locked(struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held_read(&amp;eb-&gt;lock);</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline void btrfs_assert_tree_write_locked(struct extent_buffer *eb) { }</div><div class='add'>+static inline void btrfs_assert_tree_read_locked(struct extent_buffer *eb) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void btrfs_unlock_up_safe(struct btrfs_path *path, int level);</div><div class='head'>diff --git a/fs/btrfs/lru_cache.h b/fs/btrfs/lru_cache.h<br/>index 00328c856be6..07f1bb1c6aa3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/lru_cache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/lru_cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/lru_cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/lru_cache.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #ifndef BTRFS_LRU_CACHE_H</div><div class='ctx'> #define BTRFS_LRU_CACHE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/maple_tree.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -50,11 +51,6 @@ struct btrfs_lru_cache {</div><div class='ctx'> #define btrfs_lru_cache_for_each_entry_safe(cache, entry, tmp)		\</div><div class='ctx'> 	list_for_each_entry_safe_reverse((entry), (tmp), &amp;(cache)-&gt;lru_list, lru_list)</div><div class='ctx'> </div><div class='del'>-static inline unsigned int btrfs_lru_cache_size(const struct btrfs_lru_cache *cache)</div><div class='del'>-{</div><div class='del'>-	return cache-&gt;size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct btrfs_lru_cache_entry *btrfs_lru_cache_lru_entry(</div><div class='ctx'> 					      struct btrfs_lru_cache *cache)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c<br/>index 1131d5a29d61..4758f66da449 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/lzo.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/lzo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/lzo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/lzo.c</a></div><div class='hunk'>@@ -58,9 +58,6 @@</div><div class='ctx'>  * 0x1000   | SegHdr N+1| Data payload N+1 ...                |</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define WORKSPACE_BUF_LENGTH	(lzo1x_worst_compress(PAGE_SIZE))</div><div class='del'>-#define WORKSPACE_CBUF_LENGTH	(lzo1x_worst_compress(PAGE_SIZE))</div><div class='del'>-</div><div class='ctx'> struct workspace {</div><div class='ctx'> 	void *mem;</div><div class='ctx'> 	void *buf;	/* where decompressed data goes */</div><div class='hunk'>@@ -68,7 +65,14 @@ struct workspace {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct workspace_manager wsm;</div><div class='add'>+static u32 workspace_buf_length(const struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	return lzo1x_worst_compress(fs_info-&gt;sectorsize);</div><div class='add'>+}</div><div class='add'>+static u32 workspace_cbuf_length(const struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	return lzo1x_worst_compress(fs_info-&gt;sectorsize);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void lzo_free_workspace(struct list_head *ws)</div><div class='ctx'> {</div><div class='hunk'>@@ -80,7 +84,7 @@ void lzo_free_workspace(struct list_head *ws)</div><div class='ctx'> 	kfree(workspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct list_head *lzo_alloc_workspace(unsigned int level)</div><div class='add'>+struct list_head *lzo_alloc_workspace(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct workspace *workspace;</div><div class='ctx'> </div><div class='hunk'>@@ -89,8 +93,8 @@ struct list_head *lzo_alloc_workspace(unsigned int level)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;mem = kvmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL | __GFP_NOWARN);</div><div class='del'>-	workspace-&gt;buf = kvmalloc(WORKSPACE_BUF_LENGTH, GFP_KERNEL | __GFP_NOWARN);</div><div class='del'>-	workspace-&gt;cbuf = kvmalloc(WORKSPACE_CBUF_LENGTH, GFP_KERNEL | __GFP_NOWARN);</div><div class='add'>+	workspace-&gt;buf = kvmalloc(workspace_buf_length(fs_info), GFP_KERNEL | __GFP_NOWARN);</div><div class='add'>+	workspace-&gt;cbuf = kvmalloc(workspace_cbuf_length(fs_info), GFP_KERNEL | __GFP_NOWARN);</div><div class='ctx'> 	if (!workspace-&gt;mem || !workspace-&gt;buf || !workspace-&gt;cbuf)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -128,19 +132,21 @@ static inline size_t read_compress_length(const char *buf)</div><div class='ctx'>  *</div><div class='ctx'>  * Will allocate new pages when needed.</div><div class='ctx'>  */</div><div class='del'>-static int copy_compressed_data_to_page(char *compressed_data,</div><div class='add'>+static int copy_compressed_data_to_page(struct btrfs_fs_info *fs_info,</div><div class='add'>+					char *compressed_data,</div><div class='ctx'> 					size_t compressed_size,</div><div class='del'>-					struct page **out_pages,</div><div class='del'>-					unsigned long max_nr_page,</div><div class='del'>-					u32 *cur_out,</div><div class='del'>-					const u32 sectorsize)</div><div class='add'>+					struct folio **out_folios,</div><div class='add'>+					unsigned long max_nr_folio,</div><div class='add'>+					u32 *cur_out)</div><div class='ctx'> {</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='ctx'> 	u32 sector_bytes_left;</div><div class='ctx'> 	u32 orig_out;</div><div class='del'>-	struct page *cur_page;</div><div class='add'>+	struct folio *cur_folio;</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> </div><div class='del'>-	if ((*cur_out / PAGE_SIZE) &gt;= max_nr_page)</div><div class='add'>+	if ((*cur_out &gt;&gt; min_folio_shift) &gt;= max_nr_folio)</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -149,18 +155,17 @@ static int copy_compressed_data_to_page(char *compressed_data,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT((*cur_out / sectorsize) == (*cur_out + LZO_LEN - 1) / sectorsize);</div><div class='ctx'> </div><div class='del'>-	cur_page = out_pages[*cur_out / PAGE_SIZE];</div><div class='add'>+	cur_folio = out_folios[*cur_out &gt;&gt; min_folio_shift];</div><div class='ctx'> 	/* Allocate a new page */</div><div class='del'>-	if (!cur_page) {</div><div class='del'>-		cur_page = btrfs_alloc_compr_page();</div><div class='del'>-		if (!cur_page)</div><div class='add'>+	if (!cur_folio) {</div><div class='add'>+		cur_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+		if (!cur_folio)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		out_pages[*cur_out / PAGE_SIZE] = cur_page;</div><div class='add'>+		out_folios[*cur_out &gt;&gt; min_folio_shift] = cur_folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_local_page(cur_page);</div><div class='del'>-	write_compress_length(kaddr + offset_in_page(*cur_out),</div><div class='del'>-			      compressed_size);</div><div class='add'>+	kaddr = kmap_local_folio(cur_folio, offset_in_folio(cur_folio, *cur_out));</div><div class='add'>+	write_compress_length(kaddr, compressed_size);</div><div class='ctx'> 	*cur_out += LZO_LEN;</div><div class='ctx'> </div><div class='ctx'> 	orig_out = *cur_out;</div><div class='hunk'>@@ -172,20 +177,20 @@ static int copy_compressed_data_to_page(char *compressed_data,</div><div class='ctx'> </div><div class='ctx'> 		kunmap_local(kaddr);</div><div class='ctx'> </div><div class='del'>-		if ((*cur_out / PAGE_SIZE) &gt;= max_nr_page)</div><div class='add'>+		if ((*cur_out &gt;&gt; min_folio_shift) &gt;= max_nr_folio)</div><div class='ctx'> 			return -E2BIG;</div><div class='ctx'> </div><div class='del'>-		cur_page = out_pages[*cur_out / PAGE_SIZE];</div><div class='add'>+		cur_folio = out_folios[*cur_out &gt;&gt; min_folio_shift];</div><div class='ctx'> 		/* Allocate a new page */</div><div class='del'>-		if (!cur_page) {</div><div class='del'>-			cur_page = btrfs_alloc_compr_page();</div><div class='del'>-			if (!cur_page)</div><div class='add'>+		if (!cur_folio) {</div><div class='add'>+			cur_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+			if (!cur_folio)</div><div class='ctx'> 				return -ENOMEM;</div><div class='del'>-			out_pages[*cur_out / PAGE_SIZE] = cur_page;</div><div class='add'>+			out_folios[*cur_out &gt;&gt; min_folio_shift] = cur_folio;</div><div class='ctx'> 		}</div><div class='del'>-		kaddr = kmap_local_page(cur_page);</div><div class='add'>+		kaddr = kmap_local_folio(cur_folio, 0);</div><div class='ctx'> </div><div class='del'>-		memcpy(kaddr + offset_in_page(*cur_out),</div><div class='add'>+		memcpy(kaddr + offset_in_folio(cur_folio, *cur_out),</div><div class='ctx'> 		       compressed_data + *cur_out - orig_out, copy_len);</div><div class='ctx'> </div><div class='ctx'> 		*cur_out += copy_len;</div><div class='hunk'>@@ -209,15 +214,18 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='del'>-		u64 start, struct page **pages, unsigned long *out_pages,</div><div class='del'>-		unsigned long *total_in, unsigned long *total_out)</div><div class='add'>+int lzo_compress_folios(struct list_head *ws, struct btrfs_inode *inode,</div><div class='add'>+			u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='add'>+			unsigned long *total_in, unsigned long *total_out)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='del'>-	const u32 sectorsize = btrfs_sb(mapping-&gt;host-&gt;i_sb)-&gt;sectorsize;</div><div class='del'>-	struct page *page_in = NULL;</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 min_folio_size = btrfs_min_folio_size(fs_info);</div><div class='add'>+	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='add'>+	struct folio *folio_in = NULL;</div><div class='ctx'> 	char *sizes_ptr;</div><div class='del'>-	const unsigned long max_nr_page = *out_pages;</div><div class='add'>+	const unsigned long max_nr_folio = *out_folios;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	/* Points to the file offset of input data */</div><div class='ctx'> 	u64 cur_in = start;</div><div class='hunk'>@@ -225,8 +233,8 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 	u32 cur_out = 0;</div><div class='ctx'> 	u32 len = *total_out;</div><div class='ctx'> </div><div class='del'>-	ASSERT(max_nr_page &gt; 0);</div><div class='del'>-	*out_pages = 0;</div><div class='add'>+	ASSERT(max_nr_folio &gt; 0);</div><div class='add'>+	*out_folios = 0;</div><div class='ctx'> 	*total_out = 0;</div><div class='ctx'> 	*total_in = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -243,29 +251,29 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 		size_t out_len;</div><div class='ctx'> </div><div class='ctx'> 		/* Get the input page first */</div><div class='del'>-		if (!page_in) {</div><div class='del'>-			page_in = find_get_page(mapping, cur_in &gt;&gt; PAGE_SHIFT);</div><div class='del'>-			ASSERT(page_in);</div><div class='add'>+		if (!folio_in) {</div><div class='add'>+			ret = btrfs_compress_filemap_get_folio(mapping, cur_in, &amp;folio_in);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Compress at most one sector of data each time */</div><div class='ctx'> 		in_len = min_t(u32, start + len - cur_in, sectorsize - sector_off);</div><div class='ctx'> 		ASSERT(in_len);</div><div class='del'>-		data_in = kmap_local_page(page_in);</div><div class='del'>-		ret = lzo1x_1_compress(data_in +</div><div class='del'>-				       offset_in_page(cur_in), in_len,</div><div class='add'>+		data_in = kmap_local_folio(folio_in, offset_in_folio(folio_in, cur_in));</div><div class='add'>+		ret = lzo1x_1_compress(data_in, in_len,</div><div class='ctx'> 				       workspace-&gt;cbuf, &amp;out_len,</div><div class='ctx'> 				       workspace-&gt;mem);</div><div class='ctx'> 		kunmap_local(data_in);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			pr_debug("BTRFS: lzo in loop returned %d\n", ret);</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='add'>+			/* lzo1x_1_compress never fails. */</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = copy_compressed_data_to_page(workspace-&gt;cbuf, out_len,</div><div class='del'>-						   pages, max_nr_page,</div><div class='del'>-						   &amp;cur_out, sectorsize);</div><div class='add'>+		ret = copy_compressed_data_to_page(fs_info, workspace-&gt;cbuf, out_len,</div><div class='add'>+						   folios, max_nr_folio,</div><div class='add'>+						   &amp;cur_out);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -280,15 +288,15 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Check if we have reached page boundary */</div><div class='del'>-		if (PAGE_ALIGNED(cur_in)) {</div><div class='del'>-			put_page(page_in);</div><div class='del'>-			page_in = NULL;</div><div class='add'>+		/* Check if we have reached folio boundary. */</div><div class='add'>+		if (IS_ALIGNED(cur_in, min_folio_size)) {</div><div class='add'>+			folio_put(folio_in);</div><div class='add'>+			folio_in = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Store the size of all chunks of compressed data */</div><div class='del'>-	sizes_ptr = kmap_local_page(pages[0]);</div><div class='add'>+	sizes_ptr = kmap_local_folio(folios[0], 0);</div><div class='ctx'> 	write_compress_length(sizes_ptr, cur_out);</div><div class='ctx'> 	kunmap_local(sizes_ptr);</div><div class='ctx'> </div><div class='hunk'>@@ -296,9 +304,9 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 	*total_out = cur_out;</div><div class='ctx'> 	*total_in = cur_in - start;</div><div class='ctx'> out:</div><div class='del'>-	if (page_in)</div><div class='del'>-		put_page(page_in);</div><div class='del'>-	*out_pages = DIV_ROUND_UP(cur_out, PAGE_SIZE);</div><div class='add'>+	if (folio_in)</div><div class='add'>+		folio_put(folio_in);</div><div class='add'>+	*out_folios = DIV_ROUND_UP(cur_out, min_folio_size);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -310,18 +318,19 @@ out:</div><div class='ctx'> static void copy_compressed_segment(struct compressed_bio *cb,</div><div class='ctx'> 				    char *dest, u32 len, u32 *cur_in)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = cb_to_fs_info(cb);</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='ctx'> 	u32 orig_in = *cur_in;</div><div class='ctx'> </div><div class='ctx'> 	while (*cur_in &lt; orig_in + len) {</div><div class='del'>-		struct page *cur_page;</div><div class='del'>-		u32 copy_len = min_t(u32, PAGE_SIZE - offset_in_page(*cur_in),</div><div class='del'>-					  orig_in + len - *cur_in);</div><div class='add'>+		struct folio *cur_folio = cb-&gt;compressed_folios[*cur_in &gt;&gt; min_folio_shift];</div><div class='add'>+		u32 copy_len = min_t(u32, orig_in + len - *cur_in,</div><div class='add'>+				     folio_size(cur_folio) - offset_in_folio(cur_folio, *cur_in));</div><div class='ctx'> </div><div class='ctx'> 		ASSERT(copy_len);</div><div class='del'>-		cur_page = cb-&gt;compressed_pages[*cur_in / PAGE_SIZE];</div><div class='ctx'> </div><div class='del'>-		memcpy_from_page(dest + *cur_in - orig_in, cur_page,</div><div class='del'>-				 offset_in_page(*cur_in), copy_len);</div><div class='add'>+		memcpy_from_folio(dest + *cur_in - orig_in, cur_folio,</div><div class='add'>+				  offset_in_folio(cur_folio, *cur_in), copy_len);</div><div class='ctx'> </div><div class='ctx'> 		*cur_in += copy_len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -332,6 +341,7 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='ctx'> 	const struct btrfs_fs_info *fs_info = cb-&gt;bbio.inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	/* Compressed data length, can be unaligned */</div><div class='hunk'>@@ -341,7 +351,7 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 	/* Bytes decompressed so far */</div><div class='ctx'> 	u32 cur_out = 0;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_local_page(cb-&gt;compressed_pages[0]);</div><div class='add'>+	kaddr = kmap_local_folio(cb-&gt;compressed_folios[0], 0);</div><div class='ctx'> 	len_in = read_compress_length(kaddr);</div><div class='ctx'> 	kunmap_local(kaddr);</div><div class='ctx'> 	cur_in += LZO_LEN;</div><div class='hunk'>@@ -353,17 +363,20 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 	 * and all sectors should be used.</div><div class='ctx'> 	 * If this happens, it means the compressed extent is corrupted.</div><div class='ctx'> 	 */</div><div class='del'>-	if (len_in &gt; min_t(size_t, BTRFS_MAX_COMPRESSED, cb-&gt;compressed_len) ||</div><div class='del'>-	    round_up(len_in, sectorsize) &lt; cb-&gt;compressed_len) {</div><div class='add'>+	if (unlikely(len_in &gt; min_t(size_t, BTRFS_MAX_COMPRESSED, cb-&gt;compressed_len) ||</div><div class='add'>+		     round_up(len_in, sectorsize) &lt; cb-&gt;compressed_len)) {</div><div class='add'>+		struct btrfs_inode *inode = cb-&gt;bbio.inode;</div><div class='add'>+</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='del'>-			"invalid lzo header, lzo len %u compressed len %u",</div><div class='del'>-			len_in, cb-&gt;compressed_len);</div><div class='add'>+"lzo header invalid, root %llu inode %llu offset %llu lzo len %u compressed len %u",</div><div class='add'>+			  btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+			  cb-&gt;start, len_in, cb-&gt;compressed_len);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Go through each lzo segment */</div><div class='ctx'> 	while (cur_in &lt; len_in) {</div><div class='del'>-		struct page *cur_page;</div><div class='add'>+		struct folio *cur_folio;</div><div class='ctx'> 		/* Length of the compressed segment */</div><div class='ctx'> 		u32 seg_len;</div><div class='ctx'> 		u32 sector_bytes_left;</div><div class='hunk'>@@ -375,20 +388,24 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ASSERT(cur_in / sectorsize ==</div><div class='ctx'> 		       (cur_in + LZO_LEN - 1) / sectorsize);</div><div class='del'>-		cur_page = cb-&gt;compressed_pages[cur_in / PAGE_SIZE];</div><div class='del'>-		ASSERT(cur_page);</div><div class='del'>-		kaddr = kmap_local_page(cur_page);</div><div class='del'>-		seg_len = read_compress_length(kaddr + offset_in_page(cur_in));</div><div class='add'>+		cur_folio = cb-&gt;compressed_folios[cur_in &gt;&gt; min_folio_shift];</div><div class='add'>+		ASSERT(cur_folio);</div><div class='add'>+		kaddr = kmap_local_folio(cur_folio, 0);</div><div class='add'>+		seg_len = read_compress_length(kaddr + offset_in_folio(cur_folio, cur_in));</div><div class='ctx'> 		kunmap_local(kaddr);</div><div class='ctx'> 		cur_in += LZO_LEN;</div><div class='ctx'> </div><div class='del'>-		if (seg_len &gt; WORKSPACE_CBUF_LENGTH) {</div><div class='add'>+		if (unlikely(seg_len &gt; workspace_cbuf_length(fs_info))) {</div><div class='add'>+			struct btrfs_inode *inode = cb-&gt;bbio.inode;</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * seg_len shouldn't be larger than we have allocated</div><div class='ctx'> 			 * for workspace-&gt;cbuf</div><div class='ctx'> 			 */</div><div class='del'>-			btrfs_err(fs_info, "unexpectedly large lzo segment len %u",</div><div class='del'>-					seg_len);</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+			"lzo segment too big, root %llu inode %llu offset %llu len %u",</div><div class='add'>+				  btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+				  cb-&gt;start, seg_len);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -398,8 +415,13 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 		/* Decompress the data */</div><div class='ctx'> 		ret = lzo1x_decompress_safe(workspace-&gt;cbuf, seg_len,</div><div class='ctx'> 					    workspace-&gt;buf, &amp;out_len);</div><div class='del'>-		if (ret != LZO_E_OK) {</div><div class='del'>-			btrfs_err(fs_info, "failed to decompress");</div><div class='add'>+		if (unlikely(ret != LZO_E_OK)) {</div><div class='add'>+			struct btrfs_inode *inode = cb-&gt;bbio.inode;</div><div class='add'>+</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+		"lzo decompression failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+				  ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+				  cb-&gt;start);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -425,69 +447,57 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int lzo_decompress(struct list_head *ws, const u8 *data_in,</div><div class='del'>-		struct page *dest_page, unsigned long start_byte, size_t srclen,</div><div class='add'>+		struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,</div><div class='ctx'> 		size_t destlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='add'>+	struct btrfs_fs_info *fs_info = folio_to_fs_info(dest_folio);</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	size_t in_len;</div><div class='ctx'> 	size_t out_len;</div><div class='del'>-	size_t max_segment_len = WORKSPACE_BUF_LENGTH;</div><div class='add'>+	size_t max_segment_len = workspace_buf_length(fs_info);</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	char *kaddr;</div><div class='del'>-	unsigned long bytes;</div><div class='ctx'> </div><div class='del'>-	if (srclen &lt; LZO_LEN || srclen &gt; max_segment_len + LZO_LEN * 2)</div><div class='add'>+	if (unlikely(srclen &lt; LZO_LEN || srclen &gt; max_segment_len + LZO_LEN * 2))</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> </div><div class='ctx'> 	in_len = read_compress_length(data_in);</div><div class='del'>-	if (in_len != srclen)</div><div class='add'>+	if (unlikely(in_len != srclen))</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	data_in += LZO_LEN;</div><div class='ctx'> </div><div class='ctx'> 	in_len = read_compress_length(data_in);</div><div class='del'>-	if (in_len != srclen - LZO_LEN * 2) {</div><div class='add'>+	if (unlikely(in_len != srclen - LZO_LEN * 2)) {</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	data_in += LZO_LEN;</div><div class='ctx'> </div><div class='del'>-	out_len = PAGE_SIZE;</div><div class='add'>+	out_len = sectorsize;</div><div class='ctx'> 	ret = lzo1x_decompress_safe(data_in, in_len, workspace-&gt;buf, &amp;out_len);</div><div class='del'>-	if (ret != LZO_E_OK) {</div><div class='del'>-		pr_warn("BTRFS: decompress failed!\n");</div><div class='add'>+	if (unlikely(ret != LZO_E_OK)) {</div><div class='add'>+		struct btrfs_inode *inode = folio_to_inode(dest_folio);</div><div class='add'>+</div><div class='add'>+		btrfs_err(fs_info,</div><div class='add'>+		"lzo decompression failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+			  ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+			  folio_pos(dest_folio));</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (out_len &lt; start_byte) {</div><div class='add'>+	ASSERT(out_len &lt;= sectorsize);</div><div class='add'>+	memcpy_to_folio(dest_folio, dest_pgoff, workspace-&gt;buf, out_len);</div><div class='add'>+	/* Early end, considered as an error. */</div><div class='add'>+	if (unlikely(out_len &lt; destlen)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		folio_zero_range(dest_folio, dest_pgoff + out_len, destlen - out_len);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the caller is already checking against PAGE_SIZE, but lets</div><div class='del'>-	 * move this check closer to the memcpy/memset</div><div class='del'>-	 */</div><div class='del'>-	destlen = min_t(unsigned long, destlen, PAGE_SIZE);</div><div class='del'>-	bytes = min_t(unsigned long, destlen, out_len - start_byte);</div><div class='del'>-</div><div class='del'>-	kaddr = kmap_local_page(dest_page);</div><div class='del'>-	memcpy(kaddr, workspace-&gt;buf + start_byte, bytes);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * btrfs_getblock is doing a zero on the tail of the page too,</div><div class='del'>-	 * but this will cover anything missing from the decompressed</div><div class='del'>-	 * data.</div><div class='del'>-	 */</div><div class='del'>-	if (bytes &lt; destlen)</div><div class='del'>-		memset(kaddr+bytes, 0, destlen-bytes);</div><div class='del'>-	kunmap_local(kaddr);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct btrfs_compress_op btrfs_lzo_compress = {</div><div class='del'>-	.workspace_manager	= &amp;wsm,</div><div class='add'>+const struct btrfs_compress_levels  btrfs_lzo_compress = {</div><div class='ctx'> 	.max_level		= 1,</div><div class='ctx'> 	.default_level		= 1,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/btrfs/messages.c b/fs/btrfs/messages.c<br/>index cdada4865837..2f853de44473 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/messages.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/messages.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/messages.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/messages.c</a></div><div class='hunk'>@@ -3,13 +3,11 @@</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "discard.h"</div><div class='del'>-#include "transaction.h"</div><div class='del'>-#include "space-info.h"</div><div class='ctx'> #include "super.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PRINTK</div><div class='ctx'> </div><div class='del'>-#define STATE_STRING_PREFACE	": state "</div><div class='add'>+#define STATE_STRING_PREFACE	" state "</div><div class='ctx'> #define STATE_STRING_BUF_LEN	(sizeof(STATE_STRING_PREFACE) + BTRFS_FS_STATE_COUNT + 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -20,10 +18,13 @@ static const char fs_state_chars[] = {</div><div class='ctx'> 	[BTRFS_FS_STATE_REMOUNTING]		= 'M',</div><div class='ctx'> 	[BTRFS_FS_STATE_RO]			= 0,</div><div class='ctx'> 	[BTRFS_FS_STATE_TRANS_ABORTED]		= 'A',</div><div class='add'>+	[BTRFS_FS_STATE_LOG_REPLAY_ABORTED]	= 'O',</div><div class='ctx'> 	[BTRFS_FS_STATE_DEV_REPLACING]		= 'R',</div><div class='ctx'> 	[BTRFS_FS_STATE_DUMMY_FS_INFO]		= 0,</div><div class='del'>-	[BTRFS_FS_STATE_NO_CSUMS]		= 'C',</div><div class='add'>+	[BTRFS_FS_STATE_NO_DATA_CSUMS]		= 'C',</div><div class='add'>+	[BTRFS_FS_STATE_SKIP_META_CSUMS]	= 'S',</div><div class='ctx'> 	[BTRFS_FS_STATE_LOG_CLEANUP_ERROR]	= 'L',</div><div class='add'>+	[BTRFS_FS_STATE_EMERGENCY_SHUTDOWN]	= 'E',</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void btrfs_state_to_string(const struct btrfs_fs_info *info, char *buf)</div><div class='hunk'>@@ -240,7 +241,8 @@ void __cold _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='del'>-	if (__ratelimit(ratelimit)) {</div><div class='add'>+	/* Do not ratelimit if CONFIG_BTRFS_DEBUG is enabled. */</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_DEBUG) || __ratelimit(ratelimit)) {</div><div class='ctx'> 		if (fs_info) {</div><div class='ctx'> 			char statestr[STATE_STRING_BUF_LEN];</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/messages.h b/fs/btrfs/messages.h<br/>index 08a9272399d2..d8c0bd17dcda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/messages.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/messages.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/messages.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/messages.h</a></div><div class='hunk'>@@ -36,106 +36,46 @@ void _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...);</div><div class='ctx'> 	btrfs_no_printk(fs_info, fmt, ##args)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define btrfs_emerg(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_EMERG fmt, ##args)</div><div class='del'>-#define btrfs_alert(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_ALERT fmt, ##args)</div><div class='del'>-#define btrfs_crit(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_CRIT fmt, ##args)</div><div class='del'>-#define btrfs_err(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_ERR fmt, ##args)</div><div class='del'>-#define btrfs_warn(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_WARNING fmt, ##args)</div><div class='del'>-#define btrfs_notice(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_NOTICE fmt, ##args)</div><div class='del'>-#define btrfs_info(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_INFO fmt, ##args)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Wrappers that use printk_in_rcu</div><div class='add'>+ * Print a message with filesystem info, enclosed in RCU protection.</div><div class='ctx'>  */</div><div class='del'>-#define btrfs_emerg_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_in_rcu(fs_info, KERN_EMERG fmt, ##args)</div><div class='del'>-#define btrfs_alert_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_in_rcu(fs_info, KERN_ALERT fmt, ##args)</div><div class='del'>-#define btrfs_crit_in_rcu(fs_info, fmt, args...) \</div><div class='add'>+#define btrfs_crit(fs_info, fmt, args...) \</div><div class='ctx'> 	btrfs_printk_in_rcu(fs_info, KERN_CRIT fmt, ##args)</div><div class='del'>-#define btrfs_err_in_rcu(fs_info, fmt, args...) \</div><div class='add'>+#define btrfs_err(fs_info, fmt, args...) \</div><div class='ctx'> 	btrfs_printk_in_rcu(fs_info, KERN_ERR fmt, ##args)</div><div class='del'>-#define btrfs_warn_in_rcu(fs_info, fmt, args...) \</div><div class='add'>+#define btrfs_warn(fs_info, fmt, args...) \</div><div class='ctx'> 	btrfs_printk_in_rcu(fs_info, KERN_WARNING fmt, ##args)</div><div class='del'>-#define btrfs_notice_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_in_rcu(fs_info, KERN_NOTICE fmt, ##args)</div><div class='del'>-#define btrfs_info_in_rcu(fs_info, fmt, args...) \</div><div class='add'>+#define btrfs_info(fs_info, fmt, args...) \</div><div class='ctx'> 	btrfs_printk_in_rcu(fs_info, KERN_INFO fmt, ##args)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Wrappers that use a ratelimited printk_in_rcu</div><div class='del'>- */</div><div class='del'>-#define btrfs_emerg_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_EMERG fmt, ##args)</div><div class='del'>-#define btrfs_alert_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_ALERT fmt, ##args)</div><div class='del'>-#define btrfs_crit_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_CRIT fmt, ##args)</div><div class='del'>-#define btrfs_err_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_ERR fmt, ##args)</div><div class='del'>-#define btrfs_warn_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_WARNING fmt, ##args)</div><div class='del'>-#define btrfs_notice_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_NOTICE fmt, ##args)</div><div class='del'>-#define btrfs_info_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_INFO fmt, ##args)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Wrappers that use a ratelimited printk</div><div class='ctx'>  */</div><div class='del'>-#define btrfs_emerg_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_EMERG fmt, ##args)</div><div class='del'>-#define btrfs_alert_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_ALERT fmt, ##args)</div><div class='ctx'> #define btrfs_crit_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_CRIT fmt, ##args)</div><div class='add'>+	btrfs_printk_rl_in_rcu(fs_info, KERN_CRIT fmt, ##args)</div><div class='ctx'> #define btrfs_err_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_ERR fmt, ##args)</div><div class='add'>+	btrfs_printk_rl_in_rcu(fs_info, KERN_ERR fmt, ##args)</div><div class='ctx'> #define btrfs_warn_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_WARNING fmt, ##args)</div><div class='del'>-#define btrfs_notice_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_NOTICE fmt, ##args)</div><div class='add'>+	btrfs_printk_rl_in_rcu(fs_info, KERN_WARNING fmt, ##args)</div><div class='ctx'> #define btrfs_info_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_INFO fmt, ##args)</div><div class='add'>+	btrfs_printk_rl_in_rcu(fs_info, KERN_INFO fmt, ##args)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DYNAMIC_DEBUG)</div><div class='ctx'> #define btrfs_debug(fs_info, fmt, args...)				\</div><div class='del'>-	_dynamic_func_call_no_desc(fmt, btrfs_printk,			\</div><div class='del'>-				   fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_in_rcu(fs_info, fmt, args...)			\</div><div class='ctx'> 	_dynamic_func_call_no_desc(fmt, btrfs_printk_in_rcu,		\</div><div class='ctx'> 				   fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_rl_in_rcu(fs_info, fmt, args...)			\</div><div class='del'>-	_dynamic_func_call_no_desc(fmt, btrfs_printk_rl_in_rcu,		\</div><div class='del'>-				   fs_info, KERN_DEBUG fmt, ##args)</div><div class='ctx'> #define btrfs_debug_rl(fs_info, fmt, args...)				\</div><div class='del'>-	_dynamic_func_call_no_desc(fmt, btrfs_printk_ratelimited,	\</div><div class='add'>+	_dynamic_func_call_no_desc(fmt, btrfs_printk_rl_in_rcu,		\</div><div class='ctx'> 				   fs_info, KERN_DEBUG fmt, ##args)</div><div class='ctx'> #elif defined(DEBUG)</div><div class='ctx'> #define btrfs_debug(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk(fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_in_rcu(fs_info, fmt, args...) \</div><div class='ctx'> 	btrfs_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_rl_in_rcu(fs_info, KERN_DEBUG fmt, ##args)</div><div class='ctx'> #define btrfs_debug_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, KERN_DEBUG fmt, ##args)</div><div class='add'>+	btrfs_printk_rl_in_rcu(fs_info, KERN_DEBUG fmt, ##args)</div><div class='ctx'> #else</div><div class='del'>-#define btrfs_debug(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_no_printk(fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_no_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_no_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)</div><div class='del'>-#define btrfs_debug_rl(fs_info, fmt, args...) \</div><div class='del'>-	btrfs_no_printk(fs_info, KERN_DEBUG fmt, ##args)</div><div class='add'>+/* When printk() is no_printk(), expand to no-op. */</div><div class='add'>+#define btrfs_debug(fs_info, fmt, args...)	do { (void)(fs_info); } while(0)</div><div class='add'>+#define btrfs_debug_rl(fs_info, fmt, args...)	do { (void)(fs_info); } while(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define btrfs_printk_in_rcu(fs_info, fmt, args...)	\</div><div class='hunk'>@@ -145,40 +85,98 @@ do {							\</div><div class='ctx'> 	rcu_read_unlock();				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define btrfs_no_printk_in_rcu(fs_info, fmt, args...)	\</div><div class='del'>-do {							\</div><div class='del'>-	rcu_read_lock();				\</div><div class='del'>-	btrfs_no_printk(fs_info, fmt, ##args);		\</div><div class='del'>-	rcu_read_unlock();				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define btrfs_printk_ratelimited(fs_info, fmt, args...)		\</div><div class='add'>+#define btrfs_printk_rl_in_rcu(fs_info, fmt, args...)		\</div><div class='ctx'> do {								\</div><div class='ctx'> 	static DEFINE_RATELIMIT_STATE(_rs,			\</div><div class='ctx'> 		DEFAULT_RATELIMIT_INTERVAL,			\</div><div class='ctx'> 		DEFAULT_RATELIMIT_BURST);			\</div><div class='add'>+								\</div><div class='add'>+	rcu_read_lock();					\</div><div class='ctx'> 	if (__ratelimit(&amp;_rs))					\</div><div class='ctx'> 		btrfs_printk(fs_info, fmt, ##args);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define btrfs_printk_rl_in_rcu(fs_info, fmt, args...)		\</div><div class='del'>-do {								\</div><div class='del'>-	rcu_read_lock();					\</div><div class='del'>-	btrfs_printk_ratelimited(fs_info, fmt, ##args);		\</div><div class='ctx'> 	rcu_read_unlock();					\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_ASSERT</div><div class='ctx'> </div><div class='del'>-#define btrfs_assertfail(expr, file, line)	({				\</div><div class='del'>-	pr_err("assertion failed: %s, in %s:%d\n", (expr), (file), (line));	\</div><div class='del'>-	BUG();								\</div><div class='del'>-})</div><div class='add'>+__printf(1, 2)</div><div class='add'>+static inline void verify_assert_printk_format(const char *fmt, ...) {</div><div class='add'>+	/* Stub to verify the assertion format string. */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Take the first token if any. */</div><div class='add'>+#define __FIRST_ARG(_, ...) _</div><div class='add'>+/*</div><div class='add'>+ * Skip the first token and return the rest, if it's empty the comma is dropped.</div><div class='add'>+ * As ##__VA_ARGS__ cannot be at the beginning of the macro the __VA_OPT__ is needed</div><div class='add'>+ * and supported since GCC 8 and Clang 12.</div><div class='add'>+ */</div><div class='add'>+#define __REST_ARGS(_, ... ) __VA_OPT__(,) __VA_ARGS__</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CC_IS_CLANG) || GCC_VERSION &gt;= 80000</div><div class='add'>+/*</div><div class='add'>+ * Assertion with optional printk() format.</div><div class='add'>+ *</div><div class='add'>+ * Accepted syntax:</div><div class='add'>+ * ASSERT(condition);</div><div class='add'>+ * ASSERT(condition, "string");</div><div class='add'>+ * ASSERT(condition, "variable=%d", variable);</div><div class='add'>+ *</div><div class='add'>+ * How it works:</div><div class='add'>+ * - if there's no format string, ""[0] evaluates at compile time to 0 and the</div><div class='add'>+ *   true branch is executed</div><div class='add'>+ * - any non-empty format string with the "" prefix evaluates to != 0 at</div><div class='add'>+ *   compile time and the false branch is executed</div><div class='add'>+ * - stringified condition is printed as %s so we don't accidentally mix format</div><div class='add'>+ *   strings (the % operator)</div><div class='add'>+ * - there can be only one printk() call, so the format strings and arguments are</div><div class='add'>+ *   spliced together:</div><div class='add'>+ *   DEFAULT_FMT [USER_FMT], DEFAULT_ARGS [, USER_ARGS]</div><div class='add'>+ * - comma between DEFAULT_ARGS and USER_ARGS is handled by preprocessor</div><div class='add'>+ *   (requires __VA_OPT__ support)</div><div class='add'>+ * - otherwise we could use __VA_OPT(,) __VA_ARGS__ for the 2nd+ argument of args,</div><div class='add'>+ */</div><div class='add'>+#define ASSERT(cond, args...)							\</div><div class='add'>+do {										\</div><div class='add'>+	verify_assert_printk_format("check the format string" args);		\</div><div class='add'>+	if (!likely(cond)) {							\</div><div class='add'>+		if (("" __FIRST_ARG(args) [0]) == 0) {				\</div><div class='add'>+			pr_err("assertion failed: %s :: %ld, in %s:%d\n",	\</div><div class='add'>+				#cond, (long)(cond), __FILE__, __LINE__);	\</div><div class='add'>+		} else {							\</div><div class='add'>+			pr_err("assertion failed: %s :: %ld, in %s:%d (" __FIRST_ARG(args) ")\n", \</div><div class='add'>+				#cond, (long)(cond), __FILE__, __LINE__ __REST_ARGS(args)); \</div><div class='add'>+		}								\</div><div class='add'>+		BUG();								\</div><div class='add'>+	}									\</div><div class='add'>+} while(0)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/* For GCC &lt; 8.x only the simple output. */</div><div class='add'>+</div><div class='add'>+#define ASSERT(cond, args...)							\</div><div class='add'>+do {										\</div><div class='add'>+	verify_assert_printk_format("check the format string" args);		\</div><div class='add'>+	if (!likely(cond)) {							\</div><div class='add'>+		pr_err("assertion failed: %s :: %ld, in %s:%d\n",		\</div><div class='add'>+			#cond, (long)(cond), __FILE__, __LINE__);		\</div><div class='add'>+		BUG();								\</div><div class='add'>+	}									\</div><div class='add'>+} while(0)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+/* Compile check the @cond expression but don't generate any code. */</div><div class='add'>+#define ASSERT(cond, args...)			BUILD_BUG_ON_INVALID(cond)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#define ASSERT(expr)						\</div><div class='del'>-	(likely(expr) ? (void)0 : btrfs_assertfail(#expr, __FILE__, __LINE__))</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+/* Verbose warning only under debug build. */</div><div class='add'>+#define DEBUG_WARN(args...)			WARN(1, KERN_ERR args)</div><div class='ctx'> #else</div><div class='del'>-#define ASSERT(expr)	(void)(expr)</div><div class='add'>+#define DEBUG_WARN(...)				do {} while(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> __printf(5, 6)</div><div class='head'>diff --git a/fs/btrfs/misc.h b/fs/btrfs/misc.h<br/>index 40f2d9f1a17a..12c5a9d6564f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/misc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/misc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/misc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/misc.h</a></div><div class='hunk'>@@ -3,10 +3,22 @@</div><div class='ctx'> #ifndef BTRFS_MISC_H</div><div class='ctx'> #define BTRFS_MISC_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convenience macros to define a pointer with the __free(kfree) and</div><div class='add'>+ * __free(kvfree) cleanup attributes and initialized to NULL.</div><div class='add'>+ */</div><div class='add'>+#define AUTO_KFREE(name)       *name __free(kfree) = NULL</div><div class='add'>+#define AUTO_KVFREE(name)      *name __free(kvfree) = NULL</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enumerate bits using enum autoincrement. Define the @name as the n-th bit.</div><div class='hunk'>@@ -16,6 +28,54 @@</div><div class='ctx'> 	name = (1U &lt;&lt; __ ## name ## _BIT),              \</div><div class='ctx'> 	__ ## name ## _SEQ = __ ## name ## _BIT</div><div class='ctx'> </div><div class='add'>+static inline phys_addr_t bio_iter_phys(struct bio *bio, struct bvec_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec bv = bio_iter_iovec(bio, *iter);</div><div class='add'>+</div><div class='add'>+	return bvec_phys(&amp;bv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Iterate bio using btrfs block size.</div><div class='add'>+ *</div><div class='add'>+ * This will handle large folio and highmem.</div><div class='add'>+ *</div><div class='add'>+ * @paddr:	Physical memory address of each iteration</div><div class='add'>+ * @bio:	The bio to iterate</div><div class='add'>+ * @iter:	The bvec_iter (pointer) to use.</div><div class='add'>+ * @blocksize:	The blocksize to iterate.</div><div class='add'>+ *</div><div class='add'>+ * This requires all folios in the bio to cover at least one block.</div><div class='add'>+ */</div><div class='add'>+#define btrfs_bio_for_each_block(paddr, bio, iter, blocksize)		\</div><div class='add'>+	for (; (iter)-&gt;bi_size &amp;&amp;					\</div><div class='add'>+	     (paddr = bio_iter_phys((bio), (iter)), 1);			\</div><div class='add'>+	     bio_advance_iter_single((bio), (iter), (blocksize)))</div><div class='add'>+</div><div class='add'>+/* Initialize a bvec_iter to the size of the specified bio. */</div><div class='add'>+static inline struct bvec_iter init_bvec_iter_for_bio(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec *bvec;</div><div class='add'>+	u32 bio_size = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bio_for_each_bvec_all(bvec, bio, i)</div><div class='add'>+		bio_size += bvec-&gt;bv_len;</div><div class='add'>+</div><div class='add'>+	return (struct bvec_iter) {</div><div class='add'>+		.bi_sector = 0,</div><div class='add'>+		.bi_size = bio_size,</div><div class='add'>+		.bi_idx = 0,</div><div class='add'>+		.bi_bvec_done = 0,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define btrfs_bio_for_each_block_all(paddr, bio, blocksize)		\</div><div class='add'>+	for (struct bvec_iter iter = init_bvec_iter_for_bio(bio);	\</div><div class='add'>+	     (iter).bi_size &amp;&amp;						\</div><div class='add'>+	     (paddr = bio_iter_phys((bio), &amp;(iter)), 1);		\</div><div class='add'>+	     bio_advance_iter_single((bio), &amp;(iter), (blocksize)))</div><div class='add'>+</div><div class='ctx'> static inline void cond_wake_up(struct wait_queue_head *wq)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -64,7 +124,7 @@ struct rb_simple_node {</div><div class='ctx'> 	u64 bytenr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct rb_node *rb_simple_search(struct rb_root *root, u64 bytenr)</div><div class='add'>+static inline struct rb_node *rb_simple_search(const struct rb_root *root, u64 bytenr)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node = root-&gt;rb_node;</div><div class='ctx'> 	struct rb_simple_node *entry;</div><div class='hunk'>@@ -91,7 +151,7 @@ static inline struct rb_node *rb_simple_search(struct rb_root *root, u64 bytenr)</div><div class='ctx'>  * Return the rb_node that start at or after @bytenr.  If there is no entry at</div><div class='ctx'>  * or after @bytner return NULL.</div><div class='ctx'>  */</div><div class='del'>-static inline struct rb_node *rb_simple_search_first(struct rb_root *root,</div><div class='add'>+static inline struct rb_node *rb_simple_search_first(const struct rb_root *root,</div><div class='ctx'> 						     u64 bytenr)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node = root-&gt;rb_node, *ret = NULL;</div><div class='hunk'>@@ -117,28 +177,23 @@ static inline struct rb_node *rb_simple_search_first(struct rb_root *root,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct rb_node *rb_simple_insert(struct rb_root *root, u64 bytenr,</div><div class='del'>-					       struct rb_node *node)</div><div class='add'>+static int rb_simple_node_bytenr_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	struct rb_simple_node *entry;</div><div class='add'>+	struct rb_simple_node *new_entry = rb_entry(new, struct rb_simple_node, rb_node);</div><div class='add'>+	struct rb_simple_node *existing_entry = rb_entry(existing, struct rb_simple_node, rb_node);</div><div class='ctx'> </div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		entry = rb_entry(parent, struct rb_simple_node, rb_node);</div><div class='add'>+	if (new_entry-&gt;bytenr &lt; existing_entry-&gt;bytenr)</div><div class='add'>+		return -1;</div><div class='add'>+	else if (new_entry-&gt;bytenr &gt; existing_entry-&gt;bytenr)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-		if (bytenr &lt; entry-&gt;bytenr)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else if (bytenr &gt; entry-&gt;bytenr)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return parent;</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rb_link_node(node, parent, p);</div><div class='del'>-	rb_insert_color(node, root);</div><div class='del'>-	return NULL;</div><div class='add'>+static inline struct rb_node *rb_simple_insert(struct rb_root *root,</div><div class='add'>+					       struct rb_simple_node *simple_node)</div><div class='add'>+{</div><div class='add'>+	return rb_find_add(&amp;simple_node-&gt;rb_node, root, rb_simple_node_bytenr_cmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bitmap_test_range_all_set(const unsigned long *addr,</div><div class='head'>diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c<br/>index 59850dc17b22..5df02c707aee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ordered-data.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ordered-data.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ordered-data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ordered-data.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "subpage.h"</div><div class='ctx'> #include "file.h"</div><div class='del'>-#include "super.h"</div><div class='add'>+#include "block-group.h"</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *btrfs_ordered_extent_cache;</div><div class='ctx'> </div><div class='hunk'>@@ -111,8 +111,8 @@ static struct rb_node *__tree_search(struct rb_root *root, u64 file_offset,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int range_overlaps(struct btrfs_ordered_extent *entry, u64 file_offset,</div><div class='del'>-			  u64 len)</div><div class='add'>+static int btrfs_range_overlaps(struct btrfs_ordered_extent *entry, u64 file_offset,</div><div class='add'>+				u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	if (file_offset + len &lt;= entry-&gt;file_offset ||</div><div class='ctx'> 	    entry-&gt;file_offset + entry-&gt;num_bytes &lt;= file_offset)</div><div class='hunk'>@@ -153,25 +153,30 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(</div><div class='ctx'> 	struct btrfs_ordered_extent *entry;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 qgroup_rsv = 0;</div><div class='add'>+	const bool is_nocow = (flags &amp;</div><div class='add'>+	       ((1U &lt;&lt; BTRFS_ORDERED_NOCOW) | (1U &lt;&lt; BTRFS_ORDERED_PREALLOC)));</div><div class='ctx'> </div><div class='del'>-	if (flags &amp;</div><div class='del'>-	    ((1 &lt;&lt; BTRFS_ORDERED_NOCOW) | (1 &lt;&lt; BTRFS_ORDERED_PREALLOC))) {</div><div class='del'>-		/* For nocow write, we can release the qgroup rsv right now */</div><div class='add'>+	/*</div><div class='add'>+	 * For a NOCOW write we can free the qgroup reserve right now. For a COW</div><div class='add'>+	 * one we transfer the reserved space from the inode's iotree into the</div><div class='add'>+	 * ordered extent by calling btrfs_qgroup_release_data() and tracking</div><div class='add'>+	 * the qgroup reserved amount in the ordered extent, so that later after</div><div class='add'>+	 * completing the ordered extent, when running the data delayed ref it</div><div class='add'>+	 * creates, we free the reserved data with btrfs_qgroup_free_refroot().</div><div class='add'>+	 */</div><div class='add'>+	if (is_nocow)</div><div class='ctx'> 		ret = btrfs_qgroup_free_data(inode, NULL, file_offset, num_bytes, &amp;qgroup_rsv);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * The ordered extent has reserved qgroup space, release now</div><div class='del'>-		 * and pass the reserved number for qgroup_record to free.</div><div class='del'>-		 */</div><div class='add'>+	else</div><div class='ctx'> 		ret = btrfs_qgroup_release_data(inode, file_offset, num_bytes, &amp;qgroup_rsv);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='ctx'> 	entry = kmem_cache_zalloc(btrfs_ordered_extent_cache, GFP_NOFS);</div><div class='del'>-	if (!entry)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	if (!entry) {</div><div class='add'>+		entry = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	entry-&gt;file_offset = file_offset;</div><div class='ctx'> 	entry-&gt;num_bytes = num_bytes;</div><div class='hunk'>@@ -180,7 +185,12 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(</div><div class='ctx'> 	entry-&gt;disk_num_bytes = disk_num_bytes;</div><div class='ctx'> 	entry-&gt;offset = offset;</div><div class='ctx'> 	entry-&gt;bytes_left = num_bytes;</div><div class='del'>-	entry-&gt;inode = igrab(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	if (WARN_ON_ONCE(!igrab(&amp;inode-&gt;vfs_inode))) {</div><div class='add'>+		kmem_cache_free(btrfs_ordered_extent_cache, entry);</div><div class='add'>+		entry = ERR_PTR(-ESTALE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;inode = inode;</div><div class='ctx'> 	entry-&gt;compress_type = compress_type;</div><div class='ctx'> 	entry-&gt;truncated_len = (u64)-1;</div><div class='ctx'> 	entry-&gt;qgroup_rsv = qgroup_rsv;</div><div class='hunk'>@@ -203,12 +213,18 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(</div><div class='ctx'> 	btrfs_mod_outstanding_extents(inode, 1);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	if (IS_ERR(entry) &amp;&amp; !is_nocow)</div><div class='add'>+		btrfs_qgroup_free_refroot(inode-&gt;root-&gt;fs_info,</div><div class='add'>+					  btrfs_root_id(inode-&gt;root),</div><div class='add'>+					  qgroup_rsv, BTRFS_QGROUP_RSV_DATA);</div><div class='add'>+</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void insert_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(entry-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = entry-&gt;inode;</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct rb_node *node;</div><div class='hunk'>@@ -221,14 +237,14 @@ static void insert_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'> 	/* One ref for the tree. */</div><div class='ctx'> 	refcount_inc(&amp;entry-&gt;refs);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	node = tree_insert(&amp;inode-&gt;ordered_tree, entry-&gt;file_offset,</div><div class='ctx'> 			   &amp;entry-&gt;rb_node);</div><div class='del'>-	if (node)</div><div class='add'>+	if (unlikely(node))</div><div class='ctx'> 		btrfs_panic(fs_info, -EEXIST,</div><div class='ctx'> 				"inconsistency in ordered tree at offset %llu",</div><div class='ctx'> 				entry-&gt;file_offset);</div><div class='del'>-	spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;root-&gt;ordered_extent_lock);</div><div class='ctx'> 	list_add_tail(&amp;entry-&gt;root_extent_list,</div><div class='hunk'>@@ -253,7 +269,7 @@ static void insert_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'>  * @disk_bytenr:     Offset of extent on disk.</div><div class='ctx'>  * @disk_num_bytes:  Size of extent on disk.</div><div class='ctx'>  * @offset:          Offset into unencoded data where file data starts.</div><div class='del'>- * @flags:           Flags specifying type of extent (1 &lt;&lt; BTRFS_ORDERED_*).</div><div class='add'>+ * @flags:           Flags specifying type of extent (1U &lt;&lt; BTRFS_ORDERED_*).</div><div class='ctx'>  * @compress_type:   Compression algorithm used for data.</div><div class='ctx'>  *</div><div class='ctx'>  * Most of these parameters correspond to &amp;struct btrfs_file_extent_item. The</div><div class='hunk'>@@ -264,17 +280,39 @@ static void insert_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(</div><div class='ctx'> 			struct btrfs_inode *inode, u64 file_offset,</div><div class='del'>-			u64 num_bytes, u64 ram_bytes, u64 disk_bytenr,</div><div class='del'>-			u64 disk_num_bytes, u64 offset, unsigned long flags,</div><div class='del'>-			int compress_type)</div><div class='add'>+			const struct btrfs_file_extent *file_extent, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ordered_extent *entry;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT((flags &amp; ~BTRFS_ORDERED_TYPE_FLAGS) == 0);</div><div class='ctx'> </div><div class='del'>-	entry = alloc_ordered_extent(inode, file_offset, num_bytes, ram_bytes,</div><div class='del'>-				     disk_bytenr, disk_num_bytes, offset, flags,</div><div class='del'>-				     compress_type);</div><div class='add'>+	/*</div><div class='add'>+	 * For regular writes, we just use the members in @file_extent.</div><div class='add'>+	 *</div><div class='add'>+	 * For NOCOW, we don't really care about the numbers except @start and</div><div class='add'>+	 * file_extent-&gt;num_bytes, as we won't insert a file extent item at all.</div><div class='add'>+	 *</div><div class='add'>+	 * For PREALLOC, we do not use ordered extent members, but</div><div class='add'>+	 * btrfs_mark_extent_written() handles everything.</div><div class='add'>+	 *</div><div class='add'>+	 * So here we always pass 0 as offset for NOCOW/PREALLOC ordered extents,</div><div class='add'>+	 * or btrfs_split_ordered_extent() cannot handle it correctly.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; ((1U &lt;&lt; BTRFS_ORDERED_NOCOW) | (1U &lt;&lt; BTRFS_ORDERED_PREALLOC)))</div><div class='add'>+		entry = alloc_ordered_extent(inode, file_offset,</div><div class='add'>+					     file_extent-&gt;num_bytes,</div><div class='add'>+					     file_extent-&gt;num_bytes,</div><div class='add'>+					     file_extent-&gt;disk_bytenr + file_extent-&gt;offset,</div><div class='add'>+					     file_extent-&gt;num_bytes, 0, flags,</div><div class='add'>+					     file_extent-&gt;compression);</div><div class='add'>+	else</div><div class='add'>+		entry = alloc_ordered_extent(inode, file_offset,</div><div class='add'>+					     file_extent-&gt;num_bytes,</div><div class='add'>+					     file_extent-&gt;ram_bytes,</div><div class='add'>+					     file_extent-&gt;disk_bytenr,</div><div class='add'>+					     file_extent-&gt;disk_num_bytes,</div><div class='add'>+					     file_extent-&gt;offset, flags,</div><div class='add'>+					     file_extent-&gt;compression);</div><div class='ctx'> 	if (!IS_ERR(entry))</div><div class='ctx'> 		insert_ordered_extent(entry);</div><div class='ctx'> 	return entry;</div><div class='hunk'>@@ -288,11 +326,17 @@ struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(</div><div class='ctx'> void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,</div><div class='ctx'> 			   struct btrfs_ordered_sum *sum)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(entry-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = entry-&gt;inode;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	list_add_tail(&amp;sum-&gt;list, &amp;entry-&gt;list);</div><div class='del'>-	spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_mark_ordered_extent_error(struct btrfs_ordered_extent *ordered)</div><div class='add'>+{</div><div class='add'>+	if (!test_and_set_bit(BTRFS_ORDERED_IOERR, &amp;ordered-&gt;flags))</div><div class='add'>+		mapping_set_error(ordered-&gt;inode-&gt;vfs_inode.i_mapping, -EIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void finish_ordered_fn(struct btrfs_work *work)</div><div class='hunk'>@@ -304,36 +348,35 @@ static void finish_ordered_fn(struct btrfs_work *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='del'>-				      struct page *page, u64 file_offset,</div><div class='add'>+				      struct folio *folio, u64 file_offset,</div><div class='ctx'> 				      u64 len, bool uptodate)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> </div><div class='del'>-	if (page) {</div><div class='del'>-		ASSERT(page-&gt;mapping);</div><div class='del'>-		ASSERT(page_offset(page) &lt;= file_offset);</div><div class='del'>-		ASSERT(file_offset + len &lt;= page_offset(page) + PAGE_SIZE);</div><div class='add'>+	if (folio) {</div><div class='add'>+		ASSERT(folio-&gt;mapping);</div><div class='add'>+		ASSERT(folio_pos(folio) &lt;= file_offset);</div><div class='add'>+		ASSERT(file_offset + len &lt;= folio_next_pos(folio));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Ordered (Private2) bit indicates whether we still have</div><div class='add'>+		 * Ordered flag indicates whether we still have</div><div class='ctx'> 		 * pending io unfinished for the ordered extent.</div><div class='ctx'> 		 *</div><div class='del'>-		 * If there's no such bit, we need to skip to next range.</div><div class='add'>+		 * If it's not set, we need to skip to next range.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!btrfs_folio_test_ordered(fs_info, page_folio(page),</div><div class='del'>-					      file_offset, len))</div><div class='add'>+		if (!btrfs_folio_test_ordered(fs_info, folio, file_offset, len))</div><div class='ctx'> 			return false;</div><div class='del'>-		btrfs_folio_clear_ordered(fs_info, page_folio(page), file_offset, len);</div><div class='add'>+		btrfs_folio_clear_ordered(fs_info, folio, file_offset, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now we're fine to update the accounting. */</div><div class='ctx'> 	if (WARN_ON_ONCE(len &gt; ordered-&gt;bytes_left)) {</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='ctx'> "bad ordered extent accounting, root=%llu ino=%llu OE offset=%llu OE len=%llu to_dec=%llu left=%llu",</div><div class='del'>-			   inode-&gt;root-&gt;root_key.objectid, btrfs_ino(inode),</div><div class='add'>+			   btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='ctx'> 			   ordered-&gt;file_offset, ordered-&gt;num_bytes,</div><div class='ctx'> 			   len, ordered-&gt;bytes_left);</div><div class='ctx'> 		ordered-&gt;bytes_left = 0;</div><div class='hunk'>@@ -360,7 +403,7 @@ static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='ctx'> </div><div class='ctx'> static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_workqueue *wq = btrfs_is_free_space_inode(inode) ?</div><div class='ctx'> 		fs_info-&gt;endio_freespace_worker : fs_info-&gt;endio_write_workers;</div><div class='hunk'>@@ -369,30 +412,60 @@ static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered)</div><div class='ctx'> 	btrfs_queue_work(wq, &amp;ordered-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='del'>-				 struct page *page, u64 file_offset, u64 len,</div><div class='add'>+void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='add'>+				 struct folio *folio, u64 file_offset, u64 len,</div><div class='ctx'> 				 bool uptodate)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_finish_ordered_extent(inode, file_offset, len, uptodate);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='del'>-	ret = can_finish_ordered_extent(ordered, page, file_offset, len, uptodate);</div><div class='del'>-	spin_unlock_irqrestore(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	ret = can_finish_ordered_extent(ordered, folio, file_offset, len,</div><div class='add'>+					uptodate);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this is a COW write it means we created new extent maps for the</div><div class='add'>+	 * range and they point to unwritten locations if we got an error either</div><div class='add'>+	 * before submitting a bio or during IO.</div><div class='add'>+	 *</div><div class='add'>+	 * We have marked the ordered extent with BTRFS_ORDERED_IOERR, and we</div><div class='add'>+	 * are queuing its completion below. During completion, at</div><div class='add'>+	 * btrfs_finish_one_ordered(), we will drop the extent maps for the</div><div class='add'>+	 * unwritten extents.</div><div class='add'>+	 *</div><div class='add'>+	 * However because completion runs in a work queue we can end up having</div><div class='add'>+	 * a fast fsync running before that. In the case of direct IO, once we</div><div class='add'>+	 * unlock the inode the fsync might start, and we queue the completion</div><div class='add'>+	 * before unlocking the inode. In the case of buffered IO when writeback</div><div class='add'>+	 * finishes (end_bbio_data_write()) we queue the completion, so if the</div><div class='add'>+	 * writeback was triggered by a fast fsync, the fsync might start</div><div class='add'>+	 * logging before ordered extent completion runs in the work queue.</div><div class='add'>+	 *</div><div class='add'>+	 * The fast fsync will log file extent items based on the extent maps it</div><div class='add'>+	 * finds, so if by the time it collects extent maps the ordered extent</div><div class='add'>+	 * completion didn't happen yet, it will log file extent items that</div><div class='add'>+	 * point to unwritten extents, resulting in a corruption if a crash</div><div class='add'>+	 * happens and the log tree is replayed. Note that a fast fsync does not</div><div class='add'>+	 * wait for completion of ordered extents in order to reduce latency.</div><div class='add'>+	 *</div><div class='add'>+	 * Set a flag in the inode so that the next fast fsync will wait for</div><div class='add'>+	 * ordered extents to complete before starting to log.</div><div class='add'>+	 */</div><div class='add'>+	if (!uptodate &amp;&amp; !test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered-&gt;flags))</div><div class='add'>+		set_bit(BTRFS_INODE_COW_WRITE_ERROR, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_queue_ordered_fn(ordered);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mark all ordered extents io inside the specified range finished.</div><div class='ctx'>  *</div><div class='del'>- * @page:	 The involved page for the operation.</div><div class='del'>- *		 For uncompressed buffered IO, the page status also needs to be</div><div class='add'>+ * @folio:	 The involved folio for the operation.</div><div class='add'>+ *		 For uncompressed buffered IO, the folio status also needs to be</div><div class='ctx'>  *		 updated to indicate whether the pending ordered io is finished.</div><div class='ctx'>  *		 Can be NULL for direct IO and compressed write.</div><div class='ctx'>  *		 For these cases, callers are ensured they won't execute the</div><div class='hunk'>@@ -402,23 +475,21 @@ bool btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='ctx'>  * extent(s) covering it.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,</div><div class='del'>-				    struct page *page, u64 file_offset,</div><div class='add'>+				    struct folio *folio, u64 file_offset,</div><div class='ctx'> 				    u64 num_bytes, bool uptodate)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	struct btrfs_ordered_extent *entry = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u64 cur = file_offset;</div><div class='add'>+	const u64 end = file_offset + num_bytes;</div><div class='ctx'> </div><div class='del'>-	trace_btrfs_writepage_end_io_hook(inode, file_offset,</div><div class='del'>-					  file_offset + num_bytes - 1,</div><div class='del'>-					  uptodate);</div><div class='add'>+	trace_btrfs_writepage_end_io_hook(inode, file_offset, end - 1, uptodate);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='del'>-	while (cur &lt; file_offset + num_bytes) {</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	while (cur &lt; end) {</div><div class='ctx'> 		u64 entry_end;</div><div class='del'>-		u64 end;</div><div class='del'>-		u32 len;</div><div class='add'>+		u64 this_end;</div><div class='add'>+		u64 len;</div><div class='ctx'> </div><div class='ctx'> 		node = ordered_tree_search(inode, cur);</div><div class='ctx'> 		/* No ordered extents at all */</div><div class='hunk'>@@ -461,19 +532,18 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,</div><div class='ctx'> 		 *	|</div><div class='ctx'> 		 *	cur</div><div class='ctx'> 		 */</div><div class='del'>-		end = min(entry-&gt;file_offset + entry-&gt;num_bytes,</div><div class='del'>-			  file_offset + num_bytes) - 1;</div><div class='del'>-		ASSERT(end + 1 - cur &lt; U32_MAX);</div><div class='del'>-		len = end + 1 - cur;</div><div class='add'>+		this_end = min(entry_end, end);</div><div class='add'>+		len = this_end - cur;</div><div class='add'>+		ASSERT(len &lt; U32_MAX);</div><div class='ctx'> </div><div class='del'>-		if (can_finish_ordered_extent(entry, page, cur, len, uptodate)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+		if (can_finish_ordered_extent(entry, folio, cur, len, uptodate)) {</div><div class='add'>+			spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 			btrfs_queue_ordered_fn(entry);</div><div class='del'>-			spin_lock_irqsave(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+			spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		cur += len;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -499,10 +569,9 @@ bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	struct btrfs_ordered_extent *entry = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	bool finished = false;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	if (cached &amp;&amp; *cached) {</div><div class='ctx'> 		entry = *cached;</div><div class='ctx'> 		goto have_entry;</div><div class='hunk'>@@ -539,7 +608,7 @@ out:</div><div class='ctx'> 		refcount_inc(&amp;entry-&gt;refs);</div><div class='ctx'> 		trace_btrfs_ordered_extent_dec_test_pending(inode, entry);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	return finished;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -549,23 +618,18 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *cur;</div><div class='del'>-	struct btrfs_ordered_sum *sum;</div><div class='del'>-</div><div class='del'>-	trace_btrfs_ordered_extent_put(BTRFS_I(entry-&gt;inode), entry);</div><div class='add'>+	trace_btrfs_ordered_extent_put(entry-&gt;inode, entry);</div><div class='ctx'> </div><div class='ctx'> 	if (refcount_dec_and_test(&amp;entry-&gt;refs)) {</div><div class='add'>+		struct btrfs_ordered_sum *sum;</div><div class='add'>+		struct btrfs_ordered_sum *tmp;</div><div class='add'>+</div><div class='ctx'> 		ASSERT(list_empty(&amp;entry-&gt;root_extent_list));</div><div class='ctx'> 		ASSERT(list_empty(&amp;entry-&gt;log_list));</div><div class='ctx'> 		ASSERT(RB_EMPTY_NODE(&amp;entry-&gt;rb_node));</div><div class='del'>-		if (entry-&gt;inode)</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(entry-&gt;inode));</div><div class='del'>-		while (!list_empty(&amp;entry-&gt;list)) {</div><div class='del'>-			cur = entry-&gt;list.next;</div><div class='del'>-			sum = list_entry(cur, struct btrfs_ordered_sum, list);</div><div class='del'>-			list_del(&amp;sum-&gt;list);</div><div class='add'>+		btrfs_add_delayed_iput(entry-&gt;inode);</div><div class='add'>+		list_for_each_entry_safe(sum, tmp, &amp;entry-&gt;list, list)</div><div class='ctx'> 			kvfree(sum);</div><div class='del'>-		}</div><div class='ctx'> 		kmem_cache_free(btrfs_ordered_extent_cache, entry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -590,7 +654,7 @@ void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,</div><div class='ctx'> 	freespace_inode = btrfs_is_free_space_inode(btrfs_inode);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_lockdep_acquire(fs_info, btrfs_trans_pending_ordered);</div><div class='del'>-	/* This is paired with btrfs_alloc_ordered_extent. */</div><div class='add'>+	/* This is paired with alloc_ordered_extent(). */</div><div class='ctx'> 	spin_lock(&amp;btrfs_inode-&gt;lock);</div><div class='ctx'> 	btrfs_mod_outstanding_extents(btrfs_inode, -1);</div><div class='ctx'> 	spin_unlock(&amp;btrfs_inode-&gt;lock);</div><div class='hunk'>@@ -609,7 +673,7 @@ void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,</div><div class='ctx'> 	percpu_counter_add_batch(&amp;fs_info-&gt;ordered_bytes, -entry-&gt;num_bytes,</div><div class='ctx'> 				 fs_info-&gt;delalloc_batch);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;btrfs_inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;btrfs_inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	node = &amp;entry-&gt;rb_node;</div><div class='ctx'> 	rb_erase(node, &amp;btrfs_inode-&gt;ordered_tree);</div><div class='ctx'> 	RB_CLEAR_NODE(node);</div><div class='hunk'>@@ -617,7 +681,7 @@ void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,</div><div class='ctx'> 		btrfs_inode-&gt;ordered_tree_last = NULL;</div><div class='ctx'> 	set_bit(BTRFS_ORDERED_COMPLETE, &amp;entry-&gt;flags);</div><div class='ctx'> 	pending = test_and_clear_bit(BTRFS_ORDERED_PENDING, &amp;entry-&gt;flags);</div><div class='del'>-	spin_unlock_irq(&amp;btrfs_inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;btrfs_inode-&gt;ordered_tree_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The current running transaction is waiting on us, we need to let it</div><div class='hunk'>@@ -676,11 +740,11 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * wait for all the ordered extents in a root.  This is done when balancing</div><div class='del'>- * space between drives.</div><div class='add'>+ * Wait for all the ordered extents in a root. Use @bg as range or do whole</div><div class='add'>+ * range if it's NULL.</div><div class='ctx'>  */</div><div class='ctx'> u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,</div><div class='del'>-			       const u64 range_start, const u64 range_len)</div><div class='add'>+			       const struct btrfs_block_group *bg)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	LIST_HEAD(splice);</div><div class='hunk'>@@ -688,7 +752,17 @@ u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,</div><div class='ctx'> 	LIST_HEAD(works);</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered, *next;</div><div class='ctx'> 	u64 count = 0;</div><div class='del'>-	const u64 range_end = range_start + range_len;</div><div class='add'>+	u64 range_start, range_len;</div><div class='add'>+	u64 range_end;</div><div class='add'>+</div><div class='add'>+	if (bg) {</div><div class='add'>+		range_start = bg-&gt;start;</div><div class='add'>+		range_len = bg-&gt;length;</div><div class='add'>+	} else {</div><div class='add'>+		range_start = 0;</div><div class='add'>+		range_len = U64_MAX;</div><div class='add'>+	}</div><div class='add'>+	range_end = range_start + range_len;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;root-&gt;ordered_extent_mutex);</div><div class='ctx'> 	spin_lock(&amp;root-&gt;ordered_extent_lock);</div><div class='hunk'>@@ -715,10 +789,10 @@ u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,</div><div class='ctx'> 		btrfs_queue_work(fs_info-&gt;flush_workers, &amp;ordered-&gt;flush_work);</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='del'>-		spin_lock(&amp;root-&gt;ordered_extent_lock);</div><div class='ctx'> 		if (nr != U64_MAX)</div><div class='ctx'> 			nr--;</div><div class='ctx'> 		count++;</div><div class='add'>+		spin_lock(&amp;root-&gt;ordered_extent_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_splice_tail(&amp;skipped, &amp;root-&gt;ordered_extents);</div><div class='ctx'> 	list_splice_tail(&amp;splice, &amp;root-&gt;ordered_extents);</div><div class='hunk'>@@ -735,8 +809,12 @@ u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Wait for @nr ordered extents that intersect the @bg, or the whole range of</div><div class='add'>+ * the filesystem if @bg is NULL.</div><div class='add'>+ */</div><div class='ctx'> void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,</div><div class='del'>-			     const u64 range_start, const u64 range_len)</div><div class='add'>+			      const struct btrfs_block_group *bg)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	LIST_HEAD(splice);</div><div class='hunk'>@@ -754,14 +832,13 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,</div><div class='ctx'> 			       &amp;fs_info-&gt;ordered_roots);</div><div class='ctx'> 		spin_unlock(&amp;fs_info-&gt;ordered_root_lock);</div><div class='ctx'> </div><div class='del'>-		done = btrfs_wait_ordered_extents(root, nr,</div><div class='del'>-						  range_start, range_len);</div><div class='add'>+		done = btrfs_wait_ordered_extents(root, nr, bg);</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;fs_info-&gt;ordered_root_lock);</div><div class='del'>-		if (nr != U64_MAX) {</div><div class='add'>+		if (nr != U64_MAX)</div><div class='ctx'> 			nr -= done;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;ordered_root_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_splice_tail(&amp;splice, &amp;fs_info-&gt;ordered_roots);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;ordered_root_lock);</div><div class='hunk'>@@ -771,14 +848,16 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,</div><div class='ctx'> /*</div><div class='ctx'>  * Start IO and wait for a given ordered extent to finish.</div><div class='ctx'>  *</div><div class='del'>- * Wait on page writeback for all the pages in the extent and the IO completion</div><div class='del'>- * code to insert metadata into the btree corresponding to the extent.</div><div class='add'>+ * Wait on page writeback for all the pages in the extent but not in</div><div class='add'>+ * [@nowriteback_start, @nowriteback_start + @nowriteback_len) and the</div><div class='add'>+ * IO completion code to insert metadata into the btree corresponding to the extent.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='add'>+void btrfs_start_ordered_extent_nowriteback(struct btrfs_ordered_extent *entry,</div><div class='add'>+					    u64 nowriteback_start, u32 nowriteback_len)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start = entry-&gt;file_offset;</div><div class='ctx'> 	u64 end = start + entry-&gt;num_bytes - 1;</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(entry-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = entry-&gt;inode;</div><div class='ctx'> 	bool freespace_inode;</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_ordered_extent_start(inode, entry);</div><div class='hunk'>@@ -794,8 +873,19 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'> 	 * start IO on any dirty ones so the wait doesn't stall waiting</div><div class='ctx'> 	 * for the flusher thread to find them</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(BTRFS_ORDERED_DIRECT, &amp;entry-&gt;flags))</div><div class='del'>-		filemap_fdatawrite_range(inode-&gt;vfs_inode.i_mapping, start, end);</div><div class='add'>+	if (!test_bit(BTRFS_ORDERED_DIRECT, &amp;entry-&gt;flags)) {</div><div class='add'>+		if (!nowriteback_len) {</div><div class='add'>+			filemap_fdatawrite_range(inode-&gt;vfs_inode.i_mapping, start, end);</div><div class='add'>+		} else {</div><div class='add'>+			if (start &lt; nowriteback_start)</div><div class='add'>+				filemap_fdatawrite_range(inode-&gt;vfs_inode.i_mapping, start,</div><div class='add'>+							 nowriteback_start - 1);</div><div class='add'>+			if (nowriteback_start + nowriteback_len &lt; end)</div><div class='add'>+				filemap_fdatawrite_range(inode-&gt;vfs_inode.i_mapping,</div><div class='add'>+							 nowriteback_start + nowriteback_len,</div><div class='add'>+							 end);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!freespace_inode)</div><div class='ctx'> 		btrfs_might_wait_for_event(inode-&gt;root-&gt;fs_info, btrfs_ordered_extent);</div><div class='hunk'>@@ -805,7 +895,7 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='ctx'> /*</div><div class='ctx'>  * Used to wait on ordered extents across a large range of bytes.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len)</div><div class='add'>+int btrfs_wait_ordered_range(struct btrfs_inode *inode, u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int ret_wb = 0;</div><div class='hunk'>@@ -835,11 +925,11 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len)</div><div class='ctx'> 	 * before the ordered extents complete - to avoid failures (-EEXIST)</div><div class='ctx'> 	 * when adding the new ordered extents to the ordered tree.</div><div class='ctx'> 	 */</div><div class='del'>-	ret_wb = filemap_fdatawait_range(inode-&gt;i_mapping, start, orig_end);</div><div class='add'>+	ret_wb = filemap_fdatawait_range(inode-&gt;vfs_inode.i_mapping, start, orig_end);</div><div class='ctx'> </div><div class='ctx'> 	end = orig_end;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		ordered = btrfs_lookup_first_ordered_extent(BTRFS_I(inode), end);</div><div class='add'>+		ordered = btrfs_lookup_first_ordered_extent(inode, end);</div><div class='ctx'> 		if (!ordered)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (ordered-&gt;file_offset &gt; orig_end) {</div><div class='hunk'>@@ -876,9 +966,8 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *ino</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	struct btrfs_ordered_extent *entry = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	node = ordered_tree_search(inode, file_offset);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -891,7 +980,7 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *ino</div><div class='ctx'> 		trace_btrfs_ordered_extent_lookup(inode, entry);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;inode-&gt;ordered_tree_lock, flags);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -904,7 +993,7 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_range(</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	struct btrfs_ordered_extent *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	node = ordered_tree_search(inode, file_offset);</div><div class='ctx'> 	if (!node) {</div><div class='ctx'> 		node = ordered_tree_search(inode, file_offset + len);</div><div class='hunk'>@@ -914,7 +1003,7 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_range(</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		entry = rb_entry(node, struct btrfs_ordered_extent, rb_node);</div><div class='del'>-		if (range_overlaps(entry, file_offset, len))</div><div class='add'>+		if (btrfs_range_overlaps(entry, file_offset, len))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (entry-&gt;file_offset &gt;= file_offset + len) {</div><div class='hunk'>@@ -931,7 +1020,7 @@ out:</div><div class='ctx'> 		refcount_inc(&amp;entry-&gt;refs);</div><div class='ctx'> 		trace_btrfs_ordered_extent_lookup_range(inode, entry);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -944,9 +1033,9 @@ void btrfs_get_ordered_extents_for_logging(struct btrfs_inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *n;</div><div class='ctx'> </div><div class='del'>-	ASSERT(inode_is_locked(&amp;inode-&gt;vfs_inode));</div><div class='add'>+	btrfs_assert_inode_locked(inode);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	for (n = rb_first(&amp;inode-&gt;ordered_tree); n; n = rb_next(n)) {</div><div class='ctx'> 		struct btrfs_ordered_extent *ordered;</div><div class='ctx'> </div><div class='hunk'>@@ -960,7 +1049,7 @@ void btrfs_get_ordered_extents_for_logging(struct btrfs_inode *inode,</div><div class='ctx'> 		refcount_inc(&amp;ordered-&gt;refs);</div><div class='ctx'> 		trace_btrfs_ordered_extent_lookup_for_logging(inode, ordered);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -973,7 +1062,7 @@ btrfs_lookup_first_ordered_extent(struct btrfs_inode *inode, u64 file_offset)</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	struct btrfs_ordered_extent *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	node = ordered_tree_search(inode, file_offset);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -982,7 +1071,7 @@ btrfs_lookup_first_ordered_extent(struct btrfs_inode *inode, u64 file_offset)</div><div class='ctx'> 	refcount_inc(&amp;entry-&gt;refs);</div><div class='ctx'> 	trace_btrfs_ordered_extent_lookup_first(inode, entry);</div><div class='ctx'> out:</div><div class='del'>-	spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1004,7 +1093,7 @@ struct btrfs_ordered_extent *btrfs_lookup_first_ordered_range(</div><div class='ctx'> 	struct rb_node *next;</div><div class='ctx'> 	struct btrfs_ordered_extent *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	node = inode-&gt;ordered_tree.rb_node;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Here we don't want to use tree_search() which will use tree-&gt;last</div><div class='hunk'>@@ -1043,12 +1132,12 @@ struct btrfs_ordered_extent *btrfs_lookup_first_ordered_range(</div><div class='ctx'> 	}</div><div class='ctx'> 	if (prev) {</div><div class='ctx'> 		entry = rb_entry(prev, struct btrfs_ordered_extent, rb_node);</div><div class='del'>-		if (range_overlaps(entry, file_offset, len))</div><div class='add'>+		if (btrfs_range_overlaps(entry, file_offset, len))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (next) {</div><div class='ctx'> 		entry = rb_entry(next, struct btrfs_ordered_extent, rb_node);</div><div class='del'>-		if (range_overlaps(entry, file_offset, len))</div><div class='add'>+		if (btrfs_range_overlaps(entry, file_offset, len))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* No ordered extent in the range */</div><div class='hunk'>@@ -1059,7 +1148,7 @@ out:</div><div class='ctx'> 		trace_btrfs_ordered_extent_lookup_first_range(inode, entry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1089,7 +1178,7 @@ void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 		cachedp = cached_state;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		lock_extent(&amp;inode-&gt;io_tree, start, end, cachedp);</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, start, end, cachedp);</div><div class='ctx'> 		ordered = btrfs_lookup_ordered_range(inode, start,</div><div class='ctx'> 						     end - start + 1);</div><div class='ctx'> 		if (!ordered) {</div><div class='hunk'>@@ -1102,7 +1191,7 @@ void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 				refcount_dec(&amp;cache-&gt;refs);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		unlock_extent(&amp;inode-&gt;io_tree, start, end, cachedp);</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, cachedp);</div><div class='ctx'> 		btrfs_start_ordered_extent(ordered);</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1120,7 +1209,7 @@ bool btrfs_try_lock_ordered_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered;</div><div class='ctx'> </div><div class='del'>-	if (!try_lock_extent(&amp;inode-&gt;io_tree, start, end, cached_state))</div><div class='add'>+	if (!btrfs_try_lock_extent(&amp;inode-&gt;io_tree, start, end, cached_state))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	ordered = btrfs_lookup_ordered_range(inode, start, end - start + 1);</div><div class='hunk'>@@ -1128,7 +1217,7 @@ bool btrfs_try_lock_ordered_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_ordered_extent(ordered);</div><div class='del'>-	unlock_extent(&amp;inode-&gt;io_tree, start, end, cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, cached_state);</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -1137,7 +1226,7 @@ bool btrfs_try_lock_ordered_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> struct btrfs_ordered_extent *btrfs_split_ordered_extent(</div><div class='ctx'> 			struct btrfs_ordered_extent *ordered, u64 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	u64 file_offset = ordered-&gt;file_offset;</div><div class='hunk'>@@ -1158,6 +1247,18 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (WARN_ON_ONCE(len &gt;= ordered-&gt;num_bytes))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='add'>+	/*</div><div class='add'>+	 * If our ordered extent had an error there's no point in continuing.</div><div class='add'>+	 * The error may have come from a transaction abort done either by this</div><div class='add'>+	 * task or some other concurrent task, and the transaction abort path</div><div class='add'>+	 * iterates over all existing ordered extents and sets the flag</div><div class='add'>+	 * BTRFS_ORDERED_IOERR on them.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(flags &amp; (1U &lt;&lt; BTRFS_ORDERED_IOERR))) {</div><div class='add'>+		const int fs_error = BTRFS_FS_ERROR(fs_info);</div><div class='add'>+</div><div class='add'>+		return fs_error ? ERR_PTR(fs_error) : ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='ctx'> 	/* We cannot split partially completed ordered extents. */</div><div class='ctx'> 	if (ordered-&gt;bytes_left) {</div><div class='ctx'> 		ASSERT(!(flags &amp; ~BTRFS_ORDERED_TYPE_FLAGS));</div><div class='hunk'>@@ -1176,19 +1277,35 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(</div><div class='ctx'> 	/* One ref for the tree. */</div><div class='ctx'> 	refcount_inc(&amp;new-&gt;refs);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Take the root's ordered_extent_lock to avoid a race with</div><div class='add'>+	 * btrfs_wait_ordered_extents() when updating the disk_bytenr and</div><div class='add'>+	 * disk_num_bytes fields of the ordered extent below.</div><div class='add'>+	 *</div><div class='add'>+	 * There's no concern about a previous caller of</div><div class='add'>+	 * btrfs_wait_ordered_extents() getting the trimmed ordered extent</div><div class='add'>+	 * before we insert the new one, because even if it gets the ordered</div><div class='add'>+	 * extent before it's trimmed and the new one inserted, right before it</div><div class='add'>+	 * uses it or during its use, the ordered extent might have been</div><div class='add'>+	 * trimmed in the meanwhile, and it missed the new ordered extent.</div><div class='add'>+	 * There's no way around this and it's harmless for current use cases,</div><div class='add'>+	 * so we take the root's ordered_extent_lock to fix that race during</div><div class='add'>+	 * trimming and silence tools like KCSAN.</div><div class='add'>+	 */</div><div class='ctx'> 	spin_lock_irq(&amp;root-&gt;ordered_extent_lock);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='del'>-	/* Remove from tree once */</div><div class='del'>-	node = &amp;ordered-&gt;rb_node;</div><div class='del'>-	rb_erase(node, &amp;inode-&gt;ordered_tree);</div><div class='del'>-	RB_CLEAR_NODE(node);</div><div class='del'>-	if (inode-&gt;ordered_tree_last == node)</div><div class='del'>-		inode-&gt;ordered_tree_last = NULL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We don't have overlapping ordered extents (that would imply double</div><div class='add'>+	 * allocation of extents) and we checked above that the split length</div><div class='add'>+	 * does not cross the ordered extent's num_bytes field, so there's</div><div class='add'>+	 * no need to remove it and re-insert it in the tree.</div><div class='add'>+	 */</div><div class='ctx'> 	ordered-&gt;file_offset += len;</div><div class='ctx'> 	ordered-&gt;disk_bytenr += len;</div><div class='ctx'> 	ordered-&gt;num_bytes -= len;</div><div class='ctx'> 	ordered-&gt;disk_num_bytes -= len;</div><div class='add'>+	ordered-&gt;ram_bytes -= len;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_ORDERED_IO_DONE, &amp;ordered-&gt;flags)) {</div><div class='ctx'> 		ASSERT(ordered-&gt;bytes_left == 0);</div><div class='hunk'>@@ -1213,18 +1330,10 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(</div><div class='ctx'> 		offset += sum-&gt;len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Re-insert the node */</div><div class='del'>-	node = tree_insert(&amp;inode-&gt;ordered_tree, ordered-&gt;file_offset,</div><div class='del'>-			   &amp;ordered-&gt;rb_node);</div><div class='del'>-	if (node)</div><div class='del'>-		btrfs_panic(fs_info, -EEXIST,</div><div class='del'>-			"zoned: inconsistency in ordered tree at offset %llu",</div><div class='del'>-			ordered-&gt;file_offset);</div><div class='del'>-</div><div class='ctx'> 	node = tree_insert(&amp;inode-&gt;ordered_tree, new-&gt;file_offset, &amp;new-&gt;rb_node);</div><div class='del'>-	if (node)</div><div class='add'>+	if (unlikely(node))</div><div class='ctx'> 		btrfs_panic(fs_info, -EEXIST,</div><div class='del'>-			"zoned: inconsistency in ordered tree at offset %llu",</div><div class='add'>+			"inconsistency in ordered tree at offset %llu after split",</div><div class='ctx'> 			new-&gt;file_offset);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1236,10 +1345,7 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(</div><div class='ctx'> </div><div class='ctx'> int __init ordered_data_init(void)</div><div class='ctx'> {</div><div class='del'>-	btrfs_ordered_extent_cache = kmem_cache_create("btrfs_ordered_extent",</div><div class='del'>-				     sizeof(struct btrfs_ordered_extent), 0,</div><div class='del'>-				     SLAB_MEM_SPREAD,</div><div class='del'>-				     NULL);</div><div class='add'>+	btrfs_ordered_extent_cache = KMEM_CACHE(btrfs_ordered_extent, 0);</div><div class='ctx'> 	if (!btrfs_ordered_extent_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h<br/>index 127ef8bf0ffd..1e6b0b182b29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ordered-data.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ordered-data.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ordered-data.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ordered-data.h</a></div><div class='hunk'>@@ -6,6 +6,22 @@</div><div class='ctx'> #ifndef BTRFS_ORDERED_DATA_H</div><div class='ctx'> #define BTRFS_ORDERED_DATA_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include "async-thread.h"</div><div class='add'>+</div><div class='add'>+struct inode;</div><div class='add'>+struct page;</div><div class='add'>+struct extent_state;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+</div><div class='ctx'> struct btrfs_ordered_sum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Logical start address and length for of the blocks covered by</div><div class='hunk'>@@ -115,7 +131,7 @@ struct btrfs_ordered_extent {</div><div class='ctx'> 	refcount_t refs;</div><div class='ctx'> </div><div class='ctx'> 	/* the inode we belong to */</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	/* list of checksums for insertion when the extent io is done */</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -147,26 +163,43 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent);</div><div class='ctx'> void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);</div><div class='ctx'> void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,</div><div class='ctx'> 				struct btrfs_ordered_extent *entry);</div><div class='del'>-bool btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='del'>-				 struct page *page, u64 file_offset, u64 len,</div><div class='add'>+void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,</div><div class='add'>+				 struct folio *folio, u64 file_offset, u64 len,</div><div class='ctx'> 				 bool uptodate);</div><div class='ctx'> void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,</div><div class='del'>-				struct page *page, u64 file_offset,</div><div class='del'>-				u64 num_bytes, bool uptodate);</div><div class='add'>+				    struct folio *folio, u64 file_offset,</div><div class='add'>+				    u64 num_bytes, bool uptodate);</div><div class='ctx'> bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,</div><div class='ctx'> 				    struct btrfs_ordered_extent **cached,</div><div class='ctx'> 				    u64 file_offset, u64 io_size);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This represents details about the target file extent item of a write operation.</div><div class='add'>+ */</div><div class='add'>+struct btrfs_file_extent {</div><div class='add'>+	u64 disk_bytenr;</div><div class='add'>+	u64 disk_num_bytes;</div><div class='add'>+	u64 num_bytes;</div><div class='add'>+	u64 ram_bytes;</div><div class='add'>+	u64 offset;</div><div class='add'>+	u8 compression;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(</div><div class='ctx'> 			struct btrfs_inode *inode, u64 file_offset,</div><div class='del'>-			u64 num_bytes, u64 ram_bytes, u64 disk_bytenr,</div><div class='del'>-			u64 disk_num_bytes, u64 offset, unsigned long flags,</div><div class='del'>-			int compress_type);</div><div class='add'>+			const struct btrfs_file_extent *file_extent, unsigned long flags);</div><div class='ctx'> void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,</div><div class='ctx'> 			   struct btrfs_ordered_sum *sum);</div><div class='ctx'> struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,</div><div class='ctx'> 							 u64 file_offset);</div><div class='del'>-void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry);</div><div class='del'>-int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);</div><div class='add'>+void btrfs_start_ordered_extent_nowriteback(struct btrfs_ordered_extent *entry,</div><div class='add'>+				u64 nowriteback_start, u32 nowriteback_len);</div><div class='add'>+static inline void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)</div><div class='add'>+{</div><div class='add'>+	return btrfs_start_ordered_extent_nowriteback(entry, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_wait_ordered_range(struct btrfs_inode *inode, u64 start, u64 len);</div><div class='ctx'> struct btrfs_ordered_extent *</div><div class='ctx'> btrfs_lookup_first_ordered_extent(struct btrfs_inode *inode, u64 file_offset);</div><div class='ctx'> struct btrfs_ordered_extent *btrfs_lookup_first_ordered_range(</div><div class='hunk'>@@ -178,9 +211,9 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_range(</div><div class='ctx'> void btrfs_get_ordered_extents_for_logging(struct btrfs_inode *inode,</div><div class='ctx'> 					   struct list_head *list);</div><div class='ctx'> u64 btrfs_wait_ordered_extents(struct btrfs_root *root, u64 nr,</div><div class='del'>-			       const u64 range_start, const u64 range_len);</div><div class='add'>+			       const struct btrfs_block_group *bg);</div><div class='ctx'> void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,</div><div class='del'>-			      const u64 range_start, const u64 range_len);</div><div class='add'>+			      const struct btrfs_block_group *bg);</div><div class='ctx'> void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,</div><div class='ctx'> 					u64 end,</div><div class='ctx'> 					struct extent_state **cached_state);</div><div class='hunk'>@@ -188,6 +221,7 @@ bool btrfs_try_lock_ordered_range(struct btrfs_inode *inode, u64 start, u64 end,</div><div class='ctx'> 				  struct extent_state **cached_state);</div><div class='ctx'> struct btrfs_ordered_extent *btrfs_split_ordered_extent(</div><div class='ctx'> 			struct btrfs_ordered_extent *ordered, u64 len);</div><div class='add'>+void btrfs_mark_ordered_extent_error(struct btrfs_ordered_extent *ordered);</div><div class='ctx'> int __init ordered_data_init(void);</div><div class='ctx'> void __cold ordered_data_exit(void);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/orphan.c b/fs/btrfs/orphan.c<br/>index 7a1b021b5669..9f3ad124104f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/orphan.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/orphan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/orphan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/orphan.c</a></div><div class='hunk'>@@ -4,15 +4,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctree.h"</div><div class='del'>-#include "disk-io.h"</div><div class='ctx'> #include "orphan.h"</div><div class='ctx'> </div><div class='ctx'> int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_root *root, u64 offset)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_ORPHAN_OBJECTID;</div><div class='ctx'> 	key.type = BTRFS_ORPHAN_ITEM_KEY;</div><div class='hunk'>@@ -22,16 +20,13 @@ int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='del'>-</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  struct btrfs_root *root, u64 offset)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -45,15 +40,9 @@ int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret) { /* JDM: Really? */</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = btrfs_del_item(trans, root, path);</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_del_item(trans, root, path);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/orphan.h b/fs/btrfs/orphan.h<br/>index 3faab5cbb59a..aa54a88a60de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/orphan.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/orphan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/orphan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/orphan.h</a></div><div class='hunk'>@@ -3,6 +3,11 @@</div><div class='ctx'> #ifndef BTRFS_ORPHAN_H</div><div class='ctx'> #define BTRFS_ORPHAN_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+</div><div class='ctx'> int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_root *root, u64 offset);</div><div class='ctx'> int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,</div><div class='head'>diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c<br/>index 7e46aa8a0444..f189bf09ce6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/print-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/print-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/print-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/print-tree.c</a></div><div class='hunk'>@@ -6,15 +6,22 @@</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='add'>+#include "file-item.h"</div><div class='ctx'> #include "print-tree.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "raid-stripe-tree.h"</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Large enough buffer size for the stringification of any key type yet short</div><div class='add'>+ * enough to use the stack and avoid allocations.</div><div class='add'>+ */</div><div class='add'>+#define KEY_TYPE_BUF_SIZE 32</div><div class='add'>+</div><div class='ctx'> struct root_name_map {</div><div class='ctx'> 	u64 id;</div><div class='del'>-	char name[16];</div><div class='add'>+	const char *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct root_name_map root_map[] = {</div><div class='hunk'>@@ -109,7 +116,7 @@ static void print_extent_item(const struct extent_buffer *eb, int slot, int type</div><div class='ctx'> 		btrfs_err(eb-&gt;fs_info,</div><div class='ctx'> 			  "unexpected extent item size, has %u expect &gt;= %zu",</div><div class='ctx'> 			  item_size, sizeof(*ei));</div><div class='del'>-		btrfs_handle_fs_error(eb-&gt;fs_info, -EUCLEAN, NULL);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ei = btrfs_item_ptr(eb, slot, struct btrfs_extent_item);</div><div class='hunk'>@@ -124,7 +131,7 @@ static void print_extent_item(const struct extent_buffer *eb, int slot, int type</div><div class='ctx'> 		struct btrfs_tree_block_info *info;</div><div class='ctx'> 		info = (struct btrfs_tree_block_info *)(ei + 1);</div><div class='ctx'> 		btrfs_tree_block_key(eb, info, &amp;key);</div><div class='del'>-		pr_info("\t\ttree block key (%llu %u %llu) level %d\n",</div><div class='add'>+		pr_info("\t\ttree block key " BTRFS_KEY_FMT " level %d\n",</div><div class='ctx'> 		       btrfs_disk_key_objectid(&amp;key), key.type,</div><div class='ctx'> 		       btrfs_disk_key_offset(&amp;key),</div><div class='ctx'> 		       btrfs_tree_block_level(eb, info));</div><div class='hunk'>@@ -190,7 +197,7 @@ static void print_uuid_item(const struct extent_buffer *l, unsigned long offset,</div><div class='ctx'> 			    u32 item_size)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ALIGNED(item_size, sizeof(u64))) {</div><div class='del'>-		pr_warn("BTRFS: uuid item with illegal size %lu!\n",</div><div class='add'>+		btrfs_warn(l-&gt;fs_info, "uuid item with illegal size %lu",</div><div class='ctx'> 			(unsigned long)item_size);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -208,11 +215,6 @@ static void print_raid_stripe_key(const struct extent_buffer *eb, u32 item_size,</div><div class='ctx'> 				  struct btrfs_stripe_extent *stripe)</div><div class='ctx'> {</div><div class='ctx'> 	const int num_stripes = btrfs_num_raid_stripes(item_size);</div><div class='del'>-	const u8 encoding = btrfs_stripe_extent_encoding(eb, stripe);</div><div class='del'>-</div><div class='del'>-	pr_info("\t\t\tencoding: %s\n",</div><div class='del'>-		(encoding &amp;&amp; encoding &lt; BTRFS_NR_RAID_TYPES) ?</div><div class='del'>-		btrfs_raid_array[encoding].raid_name : "unknown");</div><div class='ctx'> </div><div class='ctx'> 	for (int i = 0; i &lt; num_stripes; i++)</div><div class='ctx'> 		pr_info("\t\t\tstride %d devid %llu physical %llu\n",</div><div class='hunk'>@@ -228,25 +230,212 @@ static void print_eb_refs_lock(const struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	btrfs_info(eb-&gt;fs_info, "refs %u lock_owner %u current %u",</div><div class='del'>-		   atomic_read(&amp;eb-&gt;refs), eb-&gt;lock_owner, current-&gt;pid);</div><div class='add'>+		   refcount_read(&amp;eb-&gt;refs), eb-&gt;lock_owner, current-&gt;pid);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void print_timespec(const struct extent_buffer *eb,</div><div class='add'>+			   struct btrfs_timespec *timespec,</div><div class='add'>+			   const char *prefix, const char *suffix)</div><div class='add'>+{</div><div class='add'>+	const u64 secs = btrfs_timespec_sec(eb, timespec);</div><div class='add'>+	const u32 nsecs = btrfs_timespec_nsec(eb, timespec);</div><div class='add'>+</div><div class='add'>+	pr_info("%s%llu.%u%s", prefix, secs, nsecs, suffix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_inode_item(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode_item *ii = btrfs_item_ptr(eb, i, struct btrfs_inode_item);</div><div class='add'>+</div><div class='add'>+	pr_info("\t\tinode generation %llu transid %llu size %llu nbytes %llu\n",</div><div class='add'>+		btrfs_inode_generation(eb, ii), btrfs_inode_transid(eb, ii),</div><div class='add'>+		btrfs_inode_size(eb, ii), btrfs_inode_nbytes(eb, ii));</div><div class='add'>+	pr_info("\t\tblock group %llu mode %o links %u uid %u gid %u\n",</div><div class='add'>+		btrfs_inode_block_group(eb, ii), btrfs_inode_mode(eb, ii),</div><div class='add'>+		btrfs_inode_nlink(eb, ii), btrfs_inode_uid(eb, ii),</div><div class='add'>+		btrfs_inode_gid(eb, ii));</div><div class='add'>+	pr_info("\t\trdev %llu sequence %llu flags 0x%llx\n",</div><div class='add'>+		btrfs_inode_rdev(eb, ii), btrfs_inode_sequence(eb, ii),</div><div class='add'>+		btrfs_inode_flags(eb, ii));</div><div class='add'>+	print_timespec(eb, &amp;ii-&gt;atime, "\t\tatime ", "\n");</div><div class='add'>+	print_timespec(eb, &amp;ii-&gt;ctime, "\t\tctime ", "\n");</div><div class='add'>+	print_timespec(eb, &amp;ii-&gt;mtime, "\t\tmtime ", "\n");</div><div class='add'>+	print_timespec(eb, &amp;ii-&gt;otime, "\t\totime ", "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_dir_item(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	const u32 size = btrfs_item_size(eb, i);</div><div class='add'>+	struct btrfs_dir_item *di = btrfs_item_ptr(eb, i, struct btrfs_dir_item);</div><div class='add'>+	u32 cur = 0;</div><div class='add'>+</div><div class='add'>+	while (cur &lt; size) {</div><div class='add'>+		const u32 name_len = btrfs_dir_name_len(eb, di);</div><div class='add'>+		const u32 data_len = btrfs_dir_data_len(eb, di);</div><div class='add'>+		const u32 len = sizeof(*di) + name_len + data_len;</div><div class='add'>+		struct btrfs_key location;</div><div class='add'>+</div><div class='add'>+		btrfs_dir_item_key_to_cpu(eb, di, &amp;location);</div><div class='add'>+		pr_info("\t\tlocation key " BTRFS_KEY_FMT " type %d\n",</div><div class='add'>+			BTRFS_KEY_FMT_VALUE(&amp;location), btrfs_dir_ftype(eb, di));</div><div class='add'>+		pr_info("\t\ttransid %llu data_len %u name_len %u\n",</div><div class='add'>+			btrfs_dir_transid(eb, di), data_len, name_len);</div><div class='add'>+		di = (struct btrfs_dir_item *)((char *)di + len);</div><div class='add'>+		cur += len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_inode_ref_item(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	const u32 size = btrfs_item_size(eb, i);</div><div class='add'>+	struct btrfs_inode_ref *ref = btrfs_item_ptr(eb, i, struct btrfs_inode_ref);</div><div class='add'>+	u32 cur = 0;</div><div class='add'>+</div><div class='add'>+	while (cur &lt; size) {</div><div class='add'>+		const u64 index = btrfs_inode_ref_index(eb, ref);</div><div class='add'>+		const u32 name_len = btrfs_inode_ref_name_len(eb, ref);</div><div class='add'>+		const u32 len = sizeof(*ref) + name_len;</div><div class='add'>+</div><div class='add'>+		pr_info("\t\tindex %llu name_len %u\n", index, name_len);</div><div class='add'>+		ref = (struct btrfs_inode_ref *)((char *)ref + len);</div><div class='add'>+		cur += len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_inode_extref_item(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	const u32 size = btrfs_item_size(eb, i);</div><div class='add'>+	struct btrfs_inode_extref *extref;</div><div class='add'>+	u32 cur = 0;</div><div class='add'>+</div><div class='add'>+	extref = btrfs_item_ptr(eb, i, struct btrfs_inode_extref);</div><div class='add'>+	while (cur &lt; size) {</div><div class='add'>+		const u64 index = btrfs_inode_extref_index(eb, extref);</div><div class='add'>+		const u32 name_len = btrfs_inode_extref_name_len(eb, extref);</div><div class='add'>+		const u64 parent = btrfs_inode_extref_parent(eb, extref);</div><div class='add'>+		const u32 len = sizeof(*extref) + name_len;</div><div class='add'>+</div><div class='add'>+		pr_info("\t\tindex %llu parent %llu name_len %u\n",</div><div class='add'>+			index, parent, name_len);</div><div class='add'>+		extref = (struct btrfs_inode_extref *)((char *)extref + len);</div><div class='add'>+		cur += len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_dir_log_index_item(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_dir_log_item *dlog;</div><div class='add'>+</div><div class='add'>+	dlog = btrfs_item_ptr(eb, i, struct btrfs_dir_log_item);</div><div class='add'>+	pr_info("\t\tdir log end %llu\n", btrfs_dir_log_end(eb, dlog));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_extent_csum(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='add'>+	const u32 size = btrfs_item_size(eb, i);</div><div class='add'>+	const u32 csum_bytes = (size / fs_info-&gt;csum_size) * fs_info-&gt;sectorsize;</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+</div><div class='add'>+	btrfs_item_key_to_cpu(eb, &amp;key, i);</div><div class='add'>+	pr_info("\t\trange start %llu end %llu length %u\n",</div><div class='add'>+		key.offset, key.offset + csum_bytes, csum_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_file_extent_item(const struct extent_buffer *eb, int i)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_file_extent_item *fi;</div><div class='add'>+</div><div class='add'>+	fi = btrfs_item_ptr(eb, i, struct btrfs_file_extent_item);</div><div class='add'>+	pr_info("\t\tgeneration %llu type %hhu\n",</div><div class='add'>+		btrfs_file_extent_generation(eb, fi),</div><div class='add'>+		btrfs_file_extent_type(eb, fi));</div><div class='add'>+</div><div class='add'>+	if (btrfs_file_extent_type(eb, fi) == BTRFS_FILE_EXTENT_INLINE) {</div><div class='add'>+		pr_info("\t\tinline extent data size %u ram_bytes %llu compression %hhu\n",</div><div class='add'>+			btrfs_file_extent_inline_item_len(eb, i),</div><div class='add'>+			btrfs_file_extent_ram_bytes(eb, fi),</div><div class='add'>+			btrfs_file_extent_compression(eb, fi));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("\t\textent data disk bytenr %llu nr %llu\n",</div><div class='add'>+		btrfs_file_extent_disk_bytenr(eb, fi),</div><div class='add'>+		btrfs_file_extent_disk_num_bytes(eb, fi));</div><div class='add'>+	pr_info("\t\textent data offset %llu nr %llu ram %llu\n",</div><div class='add'>+		btrfs_file_extent_offset(eb, fi),</div><div class='add'>+		btrfs_file_extent_num_bytes(eb, fi),</div><div class='add'>+		btrfs_file_extent_ram_bytes(eb, fi));</div><div class='add'>+	pr_info("\t\textent compression %hhu\n",</div><div class='add'>+		btrfs_file_extent_compression(eb, fi));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void key_type_string(const struct btrfs_key *key, char *buf, int buf_size)</div><div class='add'>+{</div><div class='add'>+	static const char *key_to_str[256] = {</div><div class='add'>+		[BTRFS_INODE_ITEM_KEY]			= "INODE_ITEM",</div><div class='add'>+		[BTRFS_INODE_REF_KEY]			= "INODE_REF",</div><div class='add'>+		[BTRFS_INODE_EXTREF_KEY]		= "INODE_EXTREF",</div><div class='add'>+		[BTRFS_DIR_ITEM_KEY]			= "DIR_ITEM",</div><div class='add'>+		[BTRFS_DIR_INDEX_KEY]			= "DIR_INDEX",</div><div class='add'>+		[BTRFS_DIR_LOG_ITEM_KEY]		= "DIR_LOG_ITEM",</div><div class='add'>+		[BTRFS_DIR_LOG_INDEX_KEY]		= "DIR_LOG_INDEX",</div><div class='add'>+		[BTRFS_XATTR_ITEM_KEY]			= "XATTR_ITEM",</div><div class='add'>+		[BTRFS_VERITY_DESC_ITEM_KEY]		= "VERITY_DESC_ITEM",</div><div class='add'>+		[BTRFS_VERITY_MERKLE_ITEM_KEY]		= "VERITY_MERKLE_ITEM",</div><div class='add'>+		[BTRFS_ORPHAN_ITEM_KEY]			= "ORPHAN_ITEM",</div><div class='add'>+		[BTRFS_ROOT_ITEM_KEY]			= "ROOT_ITEM",</div><div class='add'>+		[BTRFS_ROOT_REF_KEY]			= "ROOT_REF",</div><div class='add'>+		[BTRFS_ROOT_BACKREF_KEY]		= "ROOT_BACKREF",</div><div class='add'>+		[BTRFS_EXTENT_ITEM_KEY]			= "EXTENT_ITEM",</div><div class='add'>+		[BTRFS_METADATA_ITEM_KEY]		= "METADATA_ITEM",</div><div class='add'>+		[BTRFS_TREE_BLOCK_REF_KEY]		= "TREE_BLOCK_REF",</div><div class='add'>+		[BTRFS_SHARED_BLOCK_REF_KEY]		= "SHARED_BLOCK_REF",</div><div class='add'>+		[BTRFS_EXTENT_DATA_REF_KEY]		= "EXTENT_DATA_REF",</div><div class='add'>+		[BTRFS_SHARED_DATA_REF_KEY]		= "SHARED_DATA_REF",</div><div class='add'>+		[BTRFS_EXTENT_OWNER_REF_KEY]		= "EXTENT_OWNER_REF",</div><div class='add'>+		[BTRFS_EXTENT_CSUM_KEY]			= "EXTENT_CSUM",</div><div class='add'>+		[BTRFS_EXTENT_DATA_KEY]			= "EXTENT_DATA",</div><div class='add'>+		[BTRFS_BLOCK_GROUP_ITEM_KEY]		= "BLOCK_GROUP_ITEM",</div><div class='add'>+		[BTRFS_FREE_SPACE_INFO_KEY]		= "FREE_SPACE_INFO",</div><div class='add'>+		[BTRFS_FREE_SPACE_EXTENT_KEY]		= "FREE_SPACE_EXTENT",</div><div class='add'>+		[BTRFS_FREE_SPACE_BITMAP_KEY]		= "FREE_SPACE_BITMAP",</div><div class='add'>+		[BTRFS_CHUNK_ITEM_KEY]			= "CHUNK_ITEM",</div><div class='add'>+		[BTRFS_DEV_ITEM_KEY]			= "DEV_ITEM",</div><div class='add'>+		[BTRFS_DEV_EXTENT_KEY]			= "DEV_EXTENT",</div><div class='add'>+		[BTRFS_TEMPORARY_ITEM_KEY]		= "TEMPORARY_ITEM",</div><div class='add'>+		[BTRFS_DEV_REPLACE_KEY]			= "DEV_REPLACE",</div><div class='add'>+		[BTRFS_STRING_ITEM_KEY]			= "STRING_ITEM",</div><div class='add'>+		[BTRFS_QGROUP_STATUS_KEY]		= "QGROUP_STATUS",</div><div class='add'>+		[BTRFS_QGROUP_RELATION_KEY]		= "QGROUP_RELATION",</div><div class='add'>+		[BTRFS_QGROUP_INFO_KEY]			= "QGROUP_INFO",</div><div class='add'>+		[BTRFS_QGROUP_LIMIT_KEY]		= "QGROUP_LIMIT",</div><div class='add'>+		[BTRFS_PERSISTENT_ITEM_KEY]		= "PERSISTENT_ITEM",</div><div class='add'>+		[BTRFS_UUID_KEY_SUBVOL]			= "UUID_KEY_SUBVOL",</div><div class='add'>+		[BTRFS_UUID_KEY_RECEIVED_SUBVOL]	= "UUID_KEY_RECEIVED_SUBVOL",</div><div class='add'>+		[BTRFS_RAID_STRIPE_KEY]			= "RAID_STRIPE",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (key-&gt;type == 0 &amp;&amp; key-&gt;objectid == BTRFS_FREE_SPACE_OBJECTID)</div><div class='add'>+		scnprintf(buf, buf_size, "UNTYPED");</div><div class='add'>+	else if (key_to_str[key-&gt;type])</div><div class='add'>+		scnprintf(buf, buf_size, "%s", key_to_str[key-&gt;type]);</div><div class='add'>+	else</div><div class='add'>+		scnprintf(buf, buf_size, "UNKNOWN.%d", key-&gt;type);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void btrfs_print_leaf(const struct extent_buffer *l)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 type, nr;</div><div class='ctx'> 	struct btrfs_root_item *ri;</div><div class='del'>-	struct btrfs_dir_item *di;</div><div class='del'>-	struct btrfs_inode_item *ii;</div><div class='ctx'> 	struct btrfs_block_group_item *bi;</div><div class='del'>-	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct btrfs_extent_data_ref *dref;</div><div class='ctx'> 	struct btrfs_shared_data_ref *sref;</div><div class='ctx'> 	struct btrfs_dev_extent *dev_extent;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_key found_key;</div><div class='ctx'> </div><div class='ctx'> 	if (!l)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -260,25 +449,35 @@ void btrfs_print_leaf(const struct extent_buffer *l)</div><div class='ctx'> 		   btrfs_leaf_free_space(l), btrfs_header_owner(l));</div><div class='ctx'> 	print_eb_refs_lock(l);</div><div class='ctx'> 	for (i = 0 ; i &lt; nr ; i++) {</div><div class='add'>+		char key_buf[KEY_TYPE_BUF_SIZE];</div><div class='add'>+</div><div class='ctx'> 		btrfs_item_key_to_cpu(l, &amp;key, i);</div><div class='ctx'> 		type = key.type;</div><div class='del'>-		pr_info("\titem %d key (%llu %u %llu) itemoff %d itemsize %d\n",</div><div class='del'>-			i, key.objectid, type, key.offset,</div><div class='add'>+		key_type_string(&amp;key, key_buf, KEY_TYPE_BUF_SIZE);</div><div class='add'>+</div><div class='add'>+		pr_info("\titem %d key (%llu %s %llu) itemoff %d itemsize %d\n",</div><div class='add'>+			i, key.objectid, key_buf, key.offset,</div><div class='ctx'> 			btrfs_item_offset(l, i), btrfs_item_size(l, i));</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case BTRFS_INODE_ITEM_KEY:</div><div class='del'>-			ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);</div><div class='del'>-			pr_info("\t\tinode generation %llu size %llu mode %o\n",</div><div class='del'>-			       btrfs_inode_generation(l, ii),</div><div class='del'>-			       btrfs_inode_size(l, ii),</div><div class='del'>-			       btrfs_inode_mode(l, ii));</div><div class='add'>+			print_inode_item(l, i);</div><div class='add'>+			break;</div><div class='add'>+		case BTRFS_INODE_REF_KEY:</div><div class='add'>+			print_inode_ref_item(l, i);</div><div class='add'>+			break;</div><div class='add'>+		case BTRFS_INODE_EXTREF_KEY:</div><div class='add'>+			print_inode_extref_item(l, i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_DIR_ITEM_KEY:</div><div class='del'>-			di = btrfs_item_ptr(l, i, struct btrfs_dir_item);</div><div class='del'>-			btrfs_dir_item_key_to_cpu(l, di, &amp;found_key);</div><div class='del'>-			pr_info("\t\tdir oid %llu flags %u\n",</div><div class='del'>-				found_key.objectid,</div><div class='del'>-				btrfs_dir_flags(l, di));</div><div class='add'>+		case BTRFS_DIR_INDEX_KEY:</div><div class='add'>+		case BTRFS_XATTR_ITEM_KEY:</div><div class='add'>+			print_dir_item(l, i);</div><div class='add'>+			break;</div><div class='add'>+		case BTRFS_DIR_LOG_INDEX_KEY:</div><div class='add'>+			print_dir_log_index_item(l, i);</div><div class='add'>+			break;</div><div class='add'>+		case BTRFS_EXTENT_CSUM_KEY:</div><div class='add'>+			print_extent_csum(l, i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_ROOT_ITEM_KEY:</div><div class='ctx'> 			ri = btrfs_item_ptr(l, i, struct btrfs_root_item);</div><div class='hunk'>@@ -308,21 +507,7 @@ void btrfs_print_leaf(const struct extent_buffer *l)</div><div class='ctx'> 			       btrfs_shared_data_ref_count(l, sref));</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_EXTENT_DATA_KEY:</div><div class='del'>-			fi = btrfs_item_ptr(l, i,</div><div class='del'>-					    struct btrfs_file_extent_item);</div><div class='del'>-			if (btrfs_file_extent_type(l, fi) ==</div><div class='del'>-			    BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-				pr_info("\t\tinline extent data size %llu\n",</div><div class='del'>-				       btrfs_file_extent_ram_bytes(l, fi));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			pr_info("\t\textent data disk bytenr %llu nr %llu\n",</div><div class='del'>-			       btrfs_file_extent_disk_bytenr(l, fi),</div><div class='del'>-			       btrfs_file_extent_disk_num_bytes(l, fi));</div><div class='del'>-			pr_info("\t\textent data offset %llu nr %llu ram %llu\n",</div><div class='del'>-			       btrfs_file_extent_offset(l, fi),</div><div class='del'>-			       btrfs_file_extent_num_bytes(l, fi),</div><div class='del'>-			       btrfs_file_extent_ram_bytes(l, fi));</div><div class='add'>+			print_file_extent_item(l, i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_BLOCK_GROUP_ITEM_KEY:</div><div class='ctx'> 			bi = btrfs_item_ptr(l, i,</div><div class='hunk'>@@ -412,10 +597,9 @@ void btrfs_print_tree(const struct extent_buffer *c, bool follow)</div><div class='ctx'> 	print_eb_refs_lock(c);</div><div class='ctx'> 	for (i = 0; i &lt; nr; i++) {</div><div class='ctx'> 		btrfs_node_key_to_cpu(c, &amp;key, i);</div><div class='del'>-		pr_info("\tkey %d (%llu %u %llu) block %llu gen %llu\n",</div><div class='del'>-		       i, key.objectid, key.type, key.offset,</div><div class='del'>-		       btrfs_node_blockptr(c, i),</div><div class='del'>-		       btrfs_node_ptr_generation(c, i));</div><div class='add'>+		pr_info("\tkey %d " BTRFS_KEY_FMT " block %llu gen %llu\n",</div><div class='add'>+			i, BTRFS_KEY_FMT_VALUE(&amp;key), btrfs_node_blockptr(c, i),</div><div class='add'>+			btrfs_node_ptr_generation(c, i));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!follow)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/fs/btrfs/print-tree.h b/fs/btrfs/print-tree.h<br/>index c42bc666d5ee..d0e620bf5f5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/print-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/print-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/print-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/print-tree.h</a></div><div class='hunk'>@@ -6,9 +6,14 @@</div><div class='ctx'> #ifndef BTRFS_PRINT_TREE_H</div><div class='ctx'> #define BTRFS_PRINT_TREE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Buffer size to contain tree name and possibly additional data (offset) */</div><div class='ctx'> #define BTRFS_ROOT_NAME_BUF_LEN				48</div><div class='ctx'> </div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_key;</div><div class='add'>+</div><div class='ctx'> void btrfs_print_leaf(const struct extent_buffer *l);</div><div class='ctx'> void btrfs_print_tree(const struct extent_buffer *c, bool follow);</div><div class='ctx'> const char *btrfs_root_name(const struct btrfs_key *key, char *buf);</div><div class='head'>diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c<br/>index f9bf591a0718..adc956432d2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/props.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/props.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/props.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/props.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hashtable.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "props.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='hunk'>@@ -25,8 +26,8 @@ struct prop_handler {</div><div class='ctx'> 	const char *xattr_name;</div><div class='ctx'> 	int (*validate)(const struct btrfs_inode *inode, const char *value,</div><div class='ctx'> 			size_t len);</div><div class='del'>-	int (*apply)(struct inode *inode, const char *value, size_t len);</div><div class='del'>-	const char *(*extract)(struct inode *inode);</div><div class='add'>+	int (*apply)(struct btrfs_inode *inode, const char *value, size_t len);</div><div class='add'>+	const char *(*extract)(const struct btrfs_inode *inode);</div><div class='ctx'> 	bool (*ignore)(const struct btrfs_inode *inode);</div><div class='ctx'> 	int inheritable;</div><div class='ctx'> };</div><div class='hunk'>@@ -103,7 +104,7 @@ bool btrfs_ignore_prop(const struct btrfs_inode *inode, const char *name)</div><div class='ctx'> 	return handler-&gt;ignore(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='add'>+int btrfs_set_prop(struct btrfs_trans_handle *trans, struct btrfs_inode *inode,</div><div class='ctx'> 		   const char *name, const char *value, size_t value_len,</div><div class='ctx'> 		   int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,7 +116,7 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (value_len == 0) {</div><div class='del'>-		ret = btrfs_setxattr(trans, inode, handler-&gt;xattr_name,</div><div class='add'>+		ret = btrfs_setxattr(trans, &amp;inode-&gt;vfs_inode, handler-&gt;xattr_name,</div><div class='ctx'> 				     NULL, 0, flags);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -126,18 +127,18 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_setxattr(trans, inode, handler-&gt;xattr_name, value,</div><div class='add'>+	ret = btrfs_setxattr(trans, &amp;inode-&gt;vfs_inode, handler-&gt;xattr_name, value,</div><div class='ctx'> 			     value_len, flags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = handler-&gt;apply(inode, value, value_len);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		btrfs_setxattr(trans, inode, handler-&gt;xattr_name, NULL,</div><div class='add'>+		btrfs_setxattr(trans, &amp;inode-&gt;vfs_inode, handler-&gt;xattr_name, NULL,</div><div class='ctx'> 			       0, flags);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(BTRFS_INODE_HAS_PROPS, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+	set_bit(BTRFS_INODE_HAS_PROPS, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -262,22 +263,23 @@ static void inode_prop_iterator(void *ctx,</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = handler-&gt;apply(inode, value, len);</div><div class='add'>+	ret = handler-&gt;apply(BTRFS_I(inode), value, len);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		btrfs_warn(root-&gt;fs_info,</div><div class='ctx'> 			   "error applying prop %s to ino %llu (root %llu): %d",</div><div class='ctx'> 			   handler-&gt;xattr_name, btrfs_ino(BTRFS_I(inode)),</div><div class='del'>-			   root-&gt;root_key.objectid, ret);</div><div class='add'>+			   btrfs_root_id(root), ret);</div><div class='ctx'> 	else</div><div class='ctx'> 		set_bit(BTRFS_INODE_HAS_PROPS, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path)</div><div class='add'>+int btrfs_load_inode_props(struct btrfs_inode *inode, struct btrfs_path *path)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	u64 ino = btrfs_ino(BTRFS_I(inode));</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	u64 ino = btrfs_ino(inode);</div><div class='ctx'> </div><div class='del'>-	return iterate_object_props(root, path, ino, inode_prop_iterator, inode);</div><div class='add'>+	return iterate_object_props(root, path, ino, inode_prop_iterator,</div><div class='add'>+				    &amp;inode-&gt;vfs_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int prop_compression_validate(const struct btrfs_inode *inode,</div><div class='hunk'>@@ -299,26 +301,26 @@ static int prop_compression_validate(const struct btrfs_inode *inode,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prop_compression_apply(struct inode *inode, const char *value,</div><div class='add'>+static int prop_compression_apply(struct btrfs_inode *inode, const char *value,</div><div class='ctx'> 				  size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset to defaults */</div><div class='ctx'> 	if (len == 0) {</div><div class='del'>-		BTRFS_I(inode)-&gt;flags &amp;= ~BTRFS_INODE_COMPRESS;</div><div class='del'>-		BTRFS_I(inode)-&gt;flags &amp;= ~BTRFS_INODE_NOCOMPRESS;</div><div class='del'>-		BTRFS_I(inode)-&gt;prop_compress = BTRFS_COMPRESS_NONE;</div><div class='add'>+		inode-&gt;flags &amp;= ~BTRFS_INODE_COMPRESS;</div><div class='add'>+		inode-&gt;flags &amp;= ~BTRFS_INODE_NOCOMPRESS;</div><div class='add'>+		inode-&gt;prop_compress = BTRFS_COMPRESS_NONE;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set NOCOMPRESS flag */</div><div class='ctx'> 	if ((len == 2 &amp;&amp; strncmp("no", value, 2) == 0) ||</div><div class='ctx'> 	    (len == 4 &amp;&amp; strncmp("none", value, 4) == 0)) {</div><div class='del'>-		BTRFS_I(inode)-&gt;flags |= BTRFS_INODE_NOCOMPRESS;</div><div class='del'>-		BTRFS_I(inode)-&gt;flags &amp;= ~BTRFS_INODE_COMPRESS;</div><div class='del'>-		BTRFS_I(inode)-&gt;prop_compress = BTRFS_COMPRESS_NONE;</div><div class='add'>+		inode-&gt;flags |= BTRFS_INODE_NOCOMPRESS;</div><div class='add'>+		inode-&gt;flags &amp;= ~BTRFS_INODE_COMPRESS;</div><div class='add'>+		inode-&gt;prop_compress = BTRFS_COMPRESS_NONE;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -335,9 +337,9 @@ static int prop_compression_apply(struct inode *inode, const char *value,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BTRFS_I(inode)-&gt;flags &amp;= ~BTRFS_INODE_NOCOMPRESS;</div><div class='del'>-	BTRFS_I(inode)-&gt;flags |= BTRFS_INODE_COMPRESS;</div><div class='del'>-	BTRFS_I(inode)-&gt;prop_compress = type;</div><div class='add'>+	inode-&gt;flags &amp;= ~BTRFS_INODE_NOCOMPRESS;</div><div class='add'>+	inode-&gt;flags |= BTRFS_INODE_COMPRESS;</div><div class='add'>+	inode-&gt;prop_compress = type;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -358,13 +360,13 @@ static bool prop_compression_ignore(const struct btrfs_inode *inode)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *prop_compression_extract(struct inode *inode)</div><div class='add'>+static const char *prop_compression_extract(const struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	switch (BTRFS_I(inode)-&gt;prop_compress) {</div><div class='add'>+	switch (inode-&gt;prop_compress) {</div><div class='ctx'> 	case BTRFS_COMPRESS_ZLIB:</div><div class='ctx'> 	case BTRFS_COMPRESS_LZO:</div><div class='ctx'> 	case BTRFS_COMPRESS_ZSTD:</div><div class='del'>-		return btrfs_compress_type2str(BTRFS_I(inode)-&gt;prop_compress);</div><div class='add'>+		return btrfs_compress_type2str(inode-&gt;prop_compress);</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -384,16 +386,16 @@ static struct prop_handler prop_handlers[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,</div><div class='del'>-			      struct inode *inode, struct inode *parent)</div><div class='add'>+			      struct btrfs_inode *inode,</div><div class='add'>+			      const struct btrfs_inode *parent)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	bool need_reserve = false;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(BTRFS_INODE_HAS_PROPS,</div><div class='del'>-		      &amp;BTRFS_I(parent)-&gt;runtime_flags))</div><div class='add'>+	if (!test_bit(BTRFS_INODE_HAS_PROPS, &amp;parent-&gt;runtime_flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(prop_handlers); i++) {</div><div class='hunk'>@@ -404,7 +406,7 @@ int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (!h-&gt;inheritable)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (h-&gt;ignore(BTRFS_I(inode)))</div><div class='add'>+		if (h-&gt;ignore(inode))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		value = h-&gt;extract(parent);</div><div class='hunk'>@@ -415,7 +417,7 @@ int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * This is not strictly necessary as the property should be</div><div class='ctx'> 		 * valid, but in case it isn't, don't propagate it further.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = h-&gt;validate(BTRFS_I(inode), value, strlen(value));</div><div class='add'>+		ret = h-&gt;validate(inode, value, strlen(value));</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -435,16 +437,15 @@ int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_setxattr(trans, inode, h-&gt;xattr_name, value,</div><div class='add'>+		ret = btrfs_setxattr(trans, &amp;inode-&gt;vfs_inode, h-&gt;xattr_name, value,</div><div class='ctx'> 				     strlen(value), 0);</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			ret = h-&gt;apply(inode, value, strlen(value));</div><div class='ctx'> 			if (ret)</div><div class='del'>-				btrfs_setxattr(trans, inode, h-&gt;xattr_name,</div><div class='add'>+				btrfs_setxattr(trans, &amp;inode-&gt;vfs_inode, h-&gt;xattr_name,</div><div class='ctx'> 					       NULL, 0, 0);</div><div class='ctx'> 			else</div><div class='del'>-				set_bit(BTRFS_INODE_HAS_PROPS,</div><div class='del'>-					&amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='add'>+				set_bit(BTRFS_INODE_HAS_PROPS, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (need_reserve) {</div><div class='head'>diff --git a/fs/btrfs/props.h b/fs/btrfs/props.h<br/>index 6e283196e38a..15d9a025c923 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/props.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/props.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/props.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/props.h</a></div><div class='hunk'>@@ -6,21 +6,26 @@</div><div class='ctx'> #ifndef BTRFS_PROPS_H</div><div class='ctx'> #define BTRFS_PROPS_H</div><div class='ctx'> </div><div class='del'>-#include "ctree.h"</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_props_init(void);</div><div class='ctx'> </div><div class='del'>-int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='add'>+int btrfs_set_prop(struct btrfs_trans_handle *trans, struct btrfs_inode *inode,</div><div class='ctx'> 		   const char *name, const char *value, size_t value_len,</div><div class='ctx'> 		   int flags);</div><div class='ctx'> int btrfs_validate_prop(const struct btrfs_inode *inode, const char *name,</div><div class='ctx'> 			const char *value, size_t value_len);</div><div class='ctx'> bool btrfs_ignore_prop(const struct btrfs_inode *inode, const char *name);</div><div class='ctx'> </div><div class='del'>-int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path);</div><div class='add'>+int btrfs_load_inode_props(struct btrfs_inode *inode, struct btrfs_path *path);</div><div class='ctx'> </div><div class='ctx'> int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,</div><div class='del'>-			      struct inode *inode,</div><div class='del'>-			      struct inode *dir);</div><div class='add'>+			      struct btrfs_inode *inode,</div><div class='add'>+			      const struct btrfs_inode *dir);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c<br/>index 63b426cc7798..9e2b53e90dcb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/qgroup.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/qgroup.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/qgroup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/qgroup.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include "root-tree.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='ctx'> </div><div class='del'>-enum btrfs_qgroup_mode btrfs_qgroup_mode(struct btrfs_fs_info *fs_info)</div><div class='add'>+enum btrfs_qgroup_mode btrfs_qgroup_mode(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		return BTRFS_QGROUP_MODE_DISABLED;</div><div class='hunk'>@@ -39,12 +39,12 @@ enum btrfs_qgroup_mode btrfs_qgroup_mode(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return BTRFS_QGROUP_MODE_FULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_qgroup_enabled(struct btrfs_fs_info *fs_info)</div><div class='add'>+bool btrfs_qgroup_enabled(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return btrfs_qgroup_mode(fs_info) != BTRFS_QGROUP_MODE_DISABLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_qgroup_full_accounting(struct btrfs_fs_info *fs_info)</div><div class='add'>+bool btrfs_qgroup_full_accounting(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_FULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -83,7 +83,7 @@ static void qgroup_rsv_add(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			   struct btrfs_qgroup *qgroup, u64 num_bytes,</div><div class='ctx'> 			   enum btrfs_qgroup_rsv_type type)</div><div class='ctx'> {</div><div class='del'>-	trace_qgroup_update_reserve(fs_info, qgroup, num_bytes, type);</div><div class='add'>+	trace_btrfs_qgroup_update_reserve(fs_info, qgroup, num_bytes, type);</div><div class='ctx'> 	qgroup-&gt;rsv.values[type] += num_bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +91,7 @@ static void qgroup_rsv_release(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       struct btrfs_qgroup *qgroup, u64 num_bytes,</div><div class='ctx'> 			       enum btrfs_qgroup_rsv_type type)</div><div class='ctx'> {</div><div class='del'>-	trace_qgroup_update_reserve(fs_info, qgroup, -(s64)num_bytes, type);</div><div class='add'>+	trace_btrfs_qgroup_update_reserve(fs_info, qgroup, -(s64)num_bytes, type);</div><div class='ctx'> 	if (qgroup-&gt;rsv.values[type] &gt;= num_bytes) {</div><div class='ctx'> 		qgroup-&gt;rsv.values[type] -= num_bytes;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -107,7 +107,7 @@ static void qgroup_rsv_release(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static void qgroup_rsv_add_by_qgroup(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				     struct btrfs_qgroup *dest,</div><div class='del'>-				     struct btrfs_qgroup *src)</div><div class='add'>+				     const struct btrfs_qgroup *src)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +117,7 @@ static void qgroup_rsv_add_by_qgroup(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static void qgroup_rsv_release_by_qgroup(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					 struct btrfs_qgroup *dest,</div><div class='del'>-					  struct btrfs_qgroup *src)</div><div class='add'>+					 const struct btrfs_qgroup *src)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -141,52 +141,53 @@ static void btrfs_qgroup_update_new_refcnt(struct btrfs_qgroup *qg, u64 seq,</div><div class='ctx'> 	qg-&gt;new_refcnt += mod;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 btrfs_qgroup_get_old_refcnt(struct btrfs_qgroup *qg, u64 seq)</div><div class='add'>+static inline u64 btrfs_qgroup_get_old_refcnt(const struct btrfs_qgroup *qg, u64 seq)</div><div class='ctx'> {</div><div class='ctx'> 	if (qg-&gt;old_refcnt &lt; seq)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return qg-&gt;old_refcnt - seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 btrfs_qgroup_get_new_refcnt(struct btrfs_qgroup *qg, u64 seq)</div><div class='add'>+static inline u64 btrfs_qgroup_get_new_refcnt(const struct btrfs_qgroup *qg, u64 seq)</div><div class='ctx'> {</div><div class='ctx'> 	if (qg-&gt;new_refcnt &lt; seq)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return qg-&gt;new_refcnt - seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * glue structure to represent the relations between qgroups.</div><div class='del'>- */</div><div class='del'>-struct btrfs_qgroup_list {</div><div class='del'>-	struct list_head next_group;</div><div class='del'>-	struct list_head next_member;</div><div class='del'>-	struct btrfs_qgroup *group;</div><div class='del'>-	struct btrfs_qgroup *member;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,</div><div class='ctx'> 		   int init_flags);</div><div class='ctx'> static void qgroup_rescan_zero_tracking(struct btrfs_fs_info *fs_info);</div><div class='ctx'> </div><div class='add'>+static int btrfs_qgroup_qgroupid_key_cmp(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 *qgroupid = key;</div><div class='add'>+	const struct btrfs_qgroup *qgroup = rb_entry(node, struct btrfs_qgroup, node);</div><div class='add'>+</div><div class='add'>+	if (qgroup-&gt;qgroupid &lt; *qgroupid)</div><div class='add'>+		return -1;</div><div class='add'>+	else if (qgroup-&gt;qgroupid &gt; *qgroupid)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* must be called with qgroup_ioctl_lock held */</div><div class='del'>-static struct btrfs_qgroup *find_qgroup_rb(struct btrfs_fs_info *fs_info,</div><div class='add'>+static struct btrfs_qgroup *find_qgroup_rb(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					   u64 qgroupid)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n = fs_info-&gt;qgroup_tree.rb_node;</div><div class='del'>-	struct btrfs_qgroup *qgroup;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	while (n) {</div><div class='del'>-		qgroup = rb_entry(n, struct btrfs_qgroup, node);</div><div class='del'>-		if (qgroup-&gt;qgroupid &lt; qgroupid)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else if (qgroup-&gt;qgroupid &gt; qgroupid)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return qgroup;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	node = rb_find(&amp;qgroupid, &amp;fs_info-&gt;qgroup_tree, btrfs_qgroup_qgroupid_key_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct btrfs_qgroup, node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_qgroup_qgroupid_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_qgroup *new_qgroup = rb_entry(new, struct btrfs_qgroup, node);</div><div class='add'>+</div><div class='add'>+	return btrfs_qgroup_qgroupid_key_cmp(&amp;new_qgroup-&gt;qgroupid, existing);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -201,43 +202,28 @@ static struct btrfs_qgroup *add_qgroup_rb(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					  struct btrfs_qgroup *prealloc,</div><div class='ctx'> 					  u64 qgroupid)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;fs_info-&gt;qgroup_tree.rb_node;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	struct btrfs_qgroup *qgroup;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='ctx'> 	/* Caller must have pre-allocated @prealloc. */</div><div class='ctx'> 	ASSERT(prealloc);</div><div class='ctx'> </div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		qgroup = rb_entry(parent, struct btrfs_qgroup, node);</div><div class='del'>-</div><div class='del'>-		if (qgroup-&gt;qgroupid &lt; qgroupid) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (qgroup-&gt;qgroupid &gt; qgroupid) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		} else {</div><div class='del'>-			kfree(prealloc);</div><div class='del'>-			return qgroup;</div><div class='del'>-		}</div><div class='add'>+	prealloc-&gt;qgroupid = qgroupid;</div><div class='add'>+	node = rb_find_add(&amp;prealloc-&gt;node, &amp;fs_info-&gt;qgroup_tree, btrfs_qgroup_qgroupid_cmp);</div><div class='add'>+	if (node) {</div><div class='add'>+		kfree(prealloc);</div><div class='add'>+		return rb_entry(node, struct btrfs_qgroup, node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qgroup = prealloc;</div><div class='del'>-	qgroup-&gt;qgroupid = qgroupid;</div><div class='del'>-	INIT_LIST_HEAD(&amp;qgroup-&gt;groups);</div><div class='del'>-	INIT_LIST_HEAD(&amp;qgroup-&gt;members);</div><div class='del'>-	INIT_LIST_HEAD(&amp;qgroup-&gt;dirty);</div><div class='del'>-	INIT_LIST_HEAD(&amp;qgroup-&gt;iterator);</div><div class='del'>-	INIT_LIST_HEAD(&amp;qgroup-&gt;nested_iterator);</div><div class='add'>+	INIT_LIST_HEAD(&amp;prealloc-&gt;groups);</div><div class='add'>+	INIT_LIST_HEAD(&amp;prealloc-&gt;members);</div><div class='add'>+	INIT_LIST_HEAD(&amp;prealloc-&gt;dirty);</div><div class='add'>+	INIT_LIST_HEAD(&amp;prealloc-&gt;iterator);</div><div class='add'>+	INIT_LIST_HEAD(&amp;prealloc-&gt;nested_iterator);</div><div class='ctx'> </div><div class='del'>-	rb_link_node(&amp;qgroup-&gt;node, parent, p);</div><div class='del'>-	rb_insert_color(&amp;qgroup-&gt;node, &amp;fs_info-&gt;qgroup_tree);</div><div class='del'>-</div><div class='del'>-	return qgroup;</div><div class='add'>+	return prealloc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __del_qgroup_rb(struct btrfs_fs_info *fs_info,</div><div class='del'>-			    struct btrfs_qgroup *qgroup)</div><div class='add'>+static void __del_qgroup_rb(struct btrfs_qgroup *qgroup)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_qgroup_list *list;</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +254,7 @@ static int del_qgroup_rb(struct btrfs_fs_info *fs_info, u64 qgroupid)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	rb_erase(&amp;qgroup-&gt;node, &amp;fs_info-&gt;qgroup_tree);</div><div class='del'>-	__del_qgroup_rb(fs_info, qgroup);</div><div class='add'>+	__del_qgroup_rb(qgroup);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +332,7 @@ static int del_relation_rb(struct btrfs_fs_info *fs_info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='del'>-int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,</div><div class='add'>+int btrfs_verify_qgroup_counts(const struct btrfs_fs_info *fs_info, u64 qgroupid,</div><div class='ctx'> 			       u64 rfer, u64 excl)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='hunk'>@@ -360,13 +346,27 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void qgroup_mark_inconsistent(struct btrfs_fs_info *fs_info)</div><div class='add'>+__printf(2, 3)</div><div class='add'>+static void qgroup_mark_inconsistent(struct btrfs_fs_info *fs_info, const char *fmt, ...)</div><div class='ctx'> {</div><div class='add'>+	const u64 old_flags = fs_info-&gt;qgroup_flags;</div><div class='add'>+</div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_SIMPLE)</div><div class='ctx'> 		return;</div><div class='ctx'> 	fs_info-&gt;qgroup_flags |= (BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT |</div><div class='ctx'> 				  BTRFS_QGROUP_RUNTIME_FLAG_CANCEL_RESCAN |</div><div class='ctx'> 				  BTRFS_QGROUP_RUNTIME_FLAG_NO_ACCOUNTING);</div><div class='add'>+	if (!(old_flags &amp; BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT)) {</div><div class='add'>+		struct va_format vaf;</div><div class='add'>+		va_list args;</div><div class='add'>+</div><div class='add'>+		va_start(args, fmt);</div><div class='add'>+		vaf.fmt = fmt;</div><div class='add'>+		vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+		btrfs_warn_rl(fs_info, "qgroup marked inconsistent, %pV", &amp;vaf);</div><div class='add'>+		va_end(args);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qgroup_read_enable_gen(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	if (!fs_info-&gt;quota_root)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fs_info-&gt;qgroup_ulist = ulist_alloc(GFP_KERNEL);</div><div class='del'>-	if (!fs_info-&gt;qgroup_ulist) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -445,13 +439,10 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			fs_info-&gt;qgroup_flags = btrfs_qgroup_status_flags(l, ptr);</div><div class='del'>-			if (fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_STATUS_FLAG_SIMPLE_MODE) {</div><div class='add'>+			if (fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_STATUS_FLAG_SIMPLE_MODE)</div><div class='ctx'> 				qgroup_read_enable_gen(fs_info, l, slot, ptr);</div><div class='del'>-			} else if (btrfs_qgroup_status_generation(l, ptr) != fs_info-&gt;generation) {</div><div class='del'>-				qgroup_mark_inconsistent(fs_info);</div><div class='del'>-				btrfs_err(fs_info,</div><div class='del'>-					"qgroup generation mismatch, marked as inconsistent");</div><div class='del'>-			}</div><div class='add'>+			else if (btrfs_qgroup_status_generation(l, ptr) != fs_info-&gt;generation)</div><div class='add'>+				qgroup_mark_inconsistent(fs_info, "qgroup generation mismatch");</div><div class='ctx'> 			rescan_progress = btrfs_qgroup_status_rescan(l, ptr);</div><div class='ctx'> 			goto next1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -462,12 +453,11 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 		qgroup = find_qgroup_rb(fs_info, found_key.offset);</div><div class='ctx'> 		if ((qgroup &amp;&amp; found_key.type == BTRFS_QGROUP_INFO_KEY) ||</div><div class='del'>-		    (!qgroup &amp;&amp; found_key.type == BTRFS_QGROUP_LIMIT_KEY)) {</div><div class='del'>-			btrfs_err(fs_info, "inconsistent qgroup config");</div><div class='del'>-			qgroup_mark_inconsistent(fs_info);</div><div class='del'>-		}</div><div class='add'>+		    (!qgroup &amp;&amp; found_key.type == BTRFS_QGROUP_LIMIT_KEY))</div><div class='add'>+			qgroup_mark_inconsistent(fs_info, "inconsistent qgroup config");</div><div class='ctx'> 		if (!qgroup) {</div><div class='ctx'> 			struct btrfs_qgroup *prealloc;</div><div class='add'>+			struct btrfs_root *tree_root = fs_info-&gt;tree_root;</div><div class='ctx'> </div><div class='ctx'> 			prealloc = kzalloc(sizeof(*prealloc), GFP_KERNEL);</div><div class='ctx'> 			if (!prealloc) {</div><div class='hunk'>@@ -475,6 +465,25 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			qgroup = add_qgroup_rb(fs_info, prealloc, found_key.offset);</div><div class='add'>+			/*</div><div class='add'>+			 * If a qgroup exists for a subvolume ID, it is possible</div><div class='add'>+			 * that subvolume has been deleted, in which case</div><div class='add'>+			 * reusing that ID would lead to incorrect accounting.</div><div class='add'>+			 *</div><div class='add'>+			 * Ensure that we skip any such subvol ids.</div><div class='add'>+			 *</div><div class='add'>+			 * We don't need to lock because this is only called</div><div class='add'>+			 * during mount before we start doing things like creating</div><div class='add'>+			 * subvolumes.</div><div class='add'>+			 */</div><div class='add'>+			if (btrfs_is_fstree(qgroup-&gt;qgroupid) &amp;&amp;</div><div class='add'>+			    qgroup-&gt;qgroupid &gt; tree_root-&gt;free_objectid)</div><div class='add'>+				/*</div><div class='add'>+				 * Don't need to check against BTRFS_LAST_FREE_OBJECTID,</div><div class='add'>+				 * as it will get checked on the next call to</div><div class='add'>+				 * btrfs_get_free_objectid.</div><div class='add'>+				 */</div><div class='add'>+				tree_root-&gt;free_objectid = qgroup-&gt;qgroupid + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = btrfs_sysfs_add_one_qgroup(fs_info, qgroup);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -572,8 +581,6 @@ out:</div><div class='ctx'> 		if (fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_STATUS_FLAG_RESCAN)</div><div class='ctx'> 			ret = qgroup_rescan_init(fs_info, rescan_progress, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		ulist_free(fs_info-&gt;qgroup_ulist);</div><div class='del'>-		fs_info-&gt;qgroup_ulist = NULL;</div><div class='ctx'> 		fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN;</div><div class='ctx'> 		btrfs_sysfs_del_qgroups(fs_info);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -588,7 +595,7 @@ out:</div><div class='ctx'>  * Return false if no reserved space is left.</div><div class='ctx'>  * Return true if some reserved space is leaked.</div><div class='ctx'>  */</div><div class='del'>-bool btrfs_check_quota_leak(struct btrfs_fs_info *fs_info)</div><div class='add'>+bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	bool ret = false;</div><div class='hunk'>@@ -621,29 +628,30 @@ bool btrfs_check_quota_leak(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is called from close_ctree() or open_ctree() or btrfs_quota_disable(),</div><div class='del'>- * first two are in single-threaded paths.And for the third one, we have set</div><div class='del'>- * quota_root to be null with qgroup_lock held before, so it is safe to clean</div><div class='del'>- * up the in-memory structures without qgroup_lock held.</div><div class='add'>+ * first two are in single-threaded paths.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *n;</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * btrfs_quota_disable() can be called concurrently with</div><div class='add'>+	 * btrfs_qgroup_rescan() -&gt; qgroup_rescan_zero_tracking(), so take the</div><div class='add'>+	 * lock.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> 	while ((n = rb_first(&amp;fs_info-&gt;qgroup_tree))) {</div><div class='ctx'> 		qgroup = rb_entry(n, struct btrfs_qgroup, node);</div><div class='ctx'> 		rb_erase(n, &amp;fs_info-&gt;qgroup_tree);</div><div class='del'>-		__del_qgroup_rb(fs_info, qgroup);</div><div class='add'>+		__del_qgroup_rb(qgroup);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> 		btrfs_sysfs_del_one_qgroup(fs_info, qgroup);</div><div class='ctx'> 		kfree(qgroup);</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * We call btrfs_free_qgroup_config() when unmounting</div><div class='del'>-	 * filesystem and disabling quota, so we set qgroup_ulist</div><div class='del'>-	 * to be null here to avoid double free.</div><div class='del'>-	 */</div><div class='del'>-	ulist_free(fs_info-&gt;qgroup_ulist);</div><div class='del'>-	fs_info-&gt;qgroup_ulist = NULL;</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='add'>+</div><div class='ctx'> 	btrfs_sysfs_del_qgroups(fs_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -652,7 +660,7 @@ static int add_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_root *quota_root = trans-&gt;fs_info-&gt;quota_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -664,10 +672,6 @@ static int add_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,</div><div class='ctx'> 	key.offset = dst;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, quota_root, path, &amp;key, 0);</div><div class='del'>-</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='del'>-</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -676,7 +680,7 @@ static int del_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_root *quota_root = trans-&gt;fs_info-&gt;quota_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -689,24 +693,19 @@ static int del_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, quota_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_del_item(trans, quota_root, path);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_del_item(trans, quota_root, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int add_qgroup_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			   struct btrfs_root *quota_root, u64 qgroupid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_qgroup_info_item *qgroup_info;</div><div class='ctx'> 	struct btrfs_qgroup_limit_item *qgroup_limit;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -732,7 +731,7 @@ static int add_qgroup_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, quota_root, path, &amp;key,</div><div class='ctx'> 				      sizeof(*qgroup_info));</div><div class='ctx'> 	if (ret &amp;&amp; ret != -EEXIST)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	qgroup_info = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='hunk'>@@ -743,15 +742,13 @@ static int add_qgroup_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_qgroup_info_excl(leaf, qgroup_info, 0);</div><div class='ctx'> 	btrfs_set_qgroup_info_excl_cmpr(leaf, qgroup_info, 0);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	key.type = BTRFS_QGROUP_LIMIT_KEY;</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, quota_root, path, &amp;key,</div><div class='ctx'> 				      sizeof(*qgroup_limit));</div><div class='ctx'> 	if (ret &amp;&amp; ret != -EEXIST)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	qgroup_limit = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='hunk'>@@ -762,19 +759,14 @@ static int add_qgroup_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_qgroup_limit_rsv_rfer(leaf, qgroup_limit, 0);</div><div class='ctx'> 	btrfs_set_qgroup_limit_rsv_excl(leaf, qgroup_limit, 0);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int del_qgroup_item(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_root *quota_root = trans-&gt;fs_info-&gt;quota_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -786,33 +778,27 @@ static int del_qgroup_item(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> 	key.offset = qgroupid;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, quota_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_item(trans, quota_root, path);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	key.type = BTRFS_QGROUP_LIMIT_KEY;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, quota_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_item(trans, quota_root, path);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -820,7 +806,7 @@ static int update_qgroup_limit_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    struct btrfs_qgroup *qgroup)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *quota_root = trans-&gt;fs_info-&gt;quota_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='ctx'> 	struct btrfs_qgroup_limit_item *qgroup_limit;</div><div class='hunk'>@@ -840,7 +826,7 @@ static int update_qgroup_limit_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	l = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -851,10 +837,6 @@ static int update_qgroup_limit_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_qgroup_limit_rsv_rfer(l, qgroup_limit, qgroup-&gt;rsv_rfer);</div><div class='ctx'> 	btrfs_set_qgroup_limit_rsv_excl(l, qgroup_limit, qgroup-&gt;rsv_excl);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, l);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -863,7 +845,7 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *quota_root = fs_info-&gt;quota_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='ctx'> 	struct btrfs_qgroup_info_item *qgroup_info;</div><div class='hunk'>@@ -886,7 +868,7 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	l = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -897,10 +879,6 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_qgroup_info_excl(l, qgroup_info, qgroup-&gt;excl);</div><div class='ctx'> 	btrfs_set_qgroup_info_excl_cmpr(l, qgroup_info, qgroup-&gt;excl_cmpr);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, l);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -908,7 +886,7 @@ static int update_qgroup_status_item(struct btrfs_trans_handle *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *quota_root = fs_info-&gt;quota_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='ctx'> 	struct btrfs_qgroup_status_item *ptr;</div><div class='hunk'>@@ -928,7 +906,7 @@ static int update_qgroup_status_item(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	l = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -939,10 +917,6 @@ static int update_qgroup_status_item(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	btrfs_set_qgroup_status_rescan(l, ptr,</div><div class='ctx'> 				fs_info-&gt;qgroup_rescan_progress.objectid);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, l);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -952,7 +926,7 @@ out:</div><div class='ctx'> static int btrfs_clean_quota_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				  struct btrfs_root *root)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf = NULL;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -963,13 +937,13 @@ static int btrfs_clean_quota_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = 0;</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = 0;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		nr = btrfs_header_nritems(leaf);</div><div class='ctx'> 		if (!nr)</div><div class='hunk'>@@ -982,14 +956,12 @@ static int btrfs_clean_quota_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		path-&gt;slots[0] = 0;</div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, 0, nr);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -1005,7 +977,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct btrfs_qgroup *qgroup = NULL;</div><div class='ctx'> 	struct btrfs_qgroup *prealloc = NULL;</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='del'>-	struct ulist *ulist = NULL;</div><div class='ctx'> 	const bool simple = (quota_ctl_args-&gt;cmd == BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -1028,12 +999,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (fs_info-&gt;quota_root)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ulist = ulist_alloc(GFP_KERNEL);</div><div class='del'>-	if (!ulist) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = btrfs_sysfs_add_qgroups(fs_info);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1073,9 +1038,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (fs_info-&gt;quota_root)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	fs_info-&gt;qgroup_ulist = ulist;</div><div class='del'>-	ulist = NULL;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * initially create the quota tree</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1087,7 +1049,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='add'>+	if (unlikely(!path)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_free_root;</div><div class='hunk'>@@ -1099,7 +1061,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, quota_root, path, &amp;key,</div><div class='ctx'> 				      sizeof(*ptr));</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_free_path;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1112,6 +1074,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	fs_info-&gt;qgroup_flags = BTRFS_QGROUP_STATUS_FLAG_ON;</div><div class='ctx'> 	if (simple) {</div><div class='ctx'> 		fs_info-&gt;qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_SIMPLE_MODE;</div><div class='add'>+		btrfs_set_fs_incompat(fs_info, SIMPLE_QUOTA);</div><div class='ctx'> 		btrfs_set_qgroup_status_enable_gen(leaf, ptr, trans-&gt;transid);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fs_info-&gt;qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;</div><div class='hunk'>@@ -1120,8 +1083,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				      BTRFS_QGROUP_STATUS_FLAGS_MASK);</div><div class='ctx'> 	btrfs_set_qgroup_status_rescan(leaf, ptr, 0);</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-</div><div class='ctx'> 	key.objectid = 0;</div><div class='ctx'> 	key.type = BTRFS_ROOT_REF_KEY;</div><div class='ctx'> 	key.offset = 0;</div><div class='hunk'>@@ -1130,7 +1091,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	ret = btrfs_search_slot_for_read(tree_root, &amp;key, path, 1, 0);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		goto out_add_root;</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_free_path;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1148,7 +1109,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			/* We should not have a stray @prealloc pointer. */</div><div class='ctx'> 			ASSERT(prealloc == NULL);</div><div class='ctx'> 			prealloc = kzalloc(sizeof(*prealloc), GFP_NOFS);</div><div class='del'>-			if (!prealloc) {</div><div class='add'>+			if (unlikely(!prealloc)) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				goto out_free_path;</div><div class='hunk'>@@ -1156,26 +1117,21 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 			ret = add_qgroup_item(trans, quota_root,</div><div class='ctx'> 					      found_key.offset);</div><div class='del'>-			if (ret) {</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				goto out_free_path;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			qgroup = add_qgroup_rb(fs_info, prealloc, found_key.offset);</div><div class='ctx'> 			prealloc = NULL;</div><div class='del'>-			if (IS_ERR(qgroup)) {</div><div class='del'>-				ret = PTR_ERR(qgroup);</div><div class='del'>-				btrfs_abort_transaction(trans, ret);</div><div class='del'>-				goto out_free_path;</div><div class='del'>-			}</div><div class='ctx'> 			ret = btrfs_sysfs_add_one_qgroup(fs_info, qgroup);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				goto out_free_path;</div><div class='ctx'> 			}</div><div class='ctx'> 			ret = btrfs_search_slot_for_read(tree_root, &amp;found_key,</div><div class='ctx'> 							 path, 1, 0);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 				goto out_free_path;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1189,7 +1145,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = btrfs_next_item(tree_root, path);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out_free_path;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1200,7 +1156,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> out_add_root:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	ret = add_qgroup_item(trans, quota_root, BTRFS_FS_TREE_OBJECTID);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_free_path;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1214,7 +1170,7 @@ out_add_root:</div><div class='ctx'> 	qgroup = add_qgroup_rb(fs_info, prealloc, BTRFS_FS_TREE_OBJECTID);</div><div class='ctx'> 	prealloc = NULL;</div><div class='ctx'> 	ret = btrfs_sysfs_add_one_qgroup(fs_info, qgroup);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_free_path;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1245,8 +1201,6 @@ out_add_root:</div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> 	fs_info-&gt;quota_root = quota_root;</div><div class='ctx'> 	set_bit(BTRFS_FS_QUOTA_ENABLED, &amp;fs_info-&gt;flags);</div><div class='del'>-	if (simple)</div><div class='del'>-		btrfs_set_fs_incompat(fs_info, SIMPLE_QUOTA);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Skip rescan for simple qgroups. */</div><div class='hunk'>@@ -1282,18 +1236,21 @@ out_free_root:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_put_root(quota_root);</div><div class='ctx'> out:</div><div class='del'>-	if (ret) {</div><div class='del'>-		ulist_free(fs_info-&gt;qgroup_ulist);</div><div class='del'>-		fs_info-&gt;qgroup_ulist = NULL;</div><div class='add'>+	if (ret)</div><div class='ctx'> 		btrfs_sysfs_del_qgroups(fs_info);</div><div class='del'>-	}</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (ret &amp;&amp; trans)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	else if (trans)</div><div class='ctx'> 		ret = btrfs_end_transaction(trans);</div><div class='del'>-	ulist_free(ulist);</div><div class='del'>-	kfree(prealloc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At this point we either failed at allocating prealloc, or we</div><div class='add'>+	 * succeeded and passed the ownership to it to add_qgroup_rb(). In any</div><div class='add'>+	 * case, this needs to be NULL or there is something wrong.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(prealloc == NULL);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1314,24 +1271,19 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int flush_reservations(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_start_delalloc_roots(fs_info, LONG_MAX, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);</div><div class='del'>-	trans = btrfs_join_transaction(fs_info-&gt;tree_root);</div><div class='del'>-	if (IS_ERR(trans))</div><div class='del'>-		return PTR_ERR(trans);</div><div class='del'>-	btrfs_commit_transaction(trans);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, NULL);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_commit_current_transaction(fs_info-&gt;tree_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_quota_disable(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *quota_root;</div><div class='add'>+	struct btrfs_root *quota_root = NULL;</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1342,16 +1294,10 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	lockdep_assert_held_write(&amp;fs_info-&gt;subvol_sem);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Lock the cleaner mutex to prevent races with concurrent relocation,</div><div class='del'>-	 * because relocation may be building backrefs for blocks of the quota</div><div class='del'>-	 * root while we are deleting the root. This is like dropping fs roots</div><div class='del'>-	 * of deleted snapshots/subvolumes, we need the same protection.</div><div class='del'>-	 *</div><div class='del'>-	 * This also prevents races between concurrent tasks trying to disable</div><div class='del'>-	 * quotas, because we will unlock and relock qgroup_ioctl_lock across</div><div class='del'>-	 * BTRFS_FS_QUOTA_ENABLED changes.</div><div class='add'>+	 * Relocation will mess with backrefs, so make sure we have the</div><div class='add'>+	 * cleaner_mutex held to protect us from relocate.</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='add'>+	lockdep_assert_held(&amp;fs_info-&gt;cleaner_mutex);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (!fs_info-&gt;quota_root)</div><div class='hunk'>@@ -1373,9 +1319,16 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	clear_bit(BTRFS_FS_QUOTA_ENABLED, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	btrfs_qgroup_wait_for_completion(fs_info, false);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We have nothing held here and no trans handle, just return the error</div><div class='add'>+	 * if there is one and set back the quota enabled bit since we didn't</div><div class='add'>+	 * actually disable quotas.</div><div class='add'>+	 */</div><div class='ctx'> 	ret = flush_reservations(fs_info);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_unlock_cleaner;</div><div class='add'>+	if (ret) {</div><div class='add'>+		set_bit(BTRFS_FS_QUOTA_ENABLED, &amp;fs_info-&gt;flags);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1 For the root item</div><div class='hunk'>@@ -1404,19 +1357,19 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	fs_info-&gt;quota_root = NULL;</div><div class='ctx'> 	fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_ON;</div><div class='ctx'> 	fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_SIMPLE_MODE;</div><div class='del'>-	fs_info-&gt;qgroup_drop_subtree_thres = BTRFS_MAX_LEVEL;</div><div class='add'>+	fs_info-&gt;qgroup_drop_subtree_thres = BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT;</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_free_qgroup_config(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_clean_quota_tree(trans, quota_root);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_root(trans, &amp;quota_root-&gt;root_key);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1428,20 +1381,19 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_tree_lock(quota_root-&gt;node);</div><div class='ctx'> 	btrfs_clear_buffer_dirty(trans, quota_root-&gt;node);</div><div class='ctx'> 	btrfs_tree_unlock(quota_root-&gt;node);</div><div class='del'>-	btrfs_free_tree_block(trans, btrfs_root_id(quota_root),</div><div class='del'>-			      quota_root-&gt;node, 0, 1);</div><div class='add'>+	ret = btrfs_free_tree_block(trans, btrfs_root_id(quota_root),</div><div class='add'>+				    quota_root-&gt;node, 0, 1);</div><div class='ctx'> </div><div class='del'>-	btrfs_put_root(quota_root);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	btrfs_put_root(quota_root);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (ret &amp;&amp; trans)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	else if (trans)</div><div class='ctx'> 		ret = btrfs_commit_transaction(trans);</div><div class='del'>-out_unlock_cleaner:</div><div class='del'>-	mutex_unlock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1488,9 +1440,9 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info, u64 ref_root,</div><div class='ctx'> 				    struct btrfs_qgroup *src, int sign)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='del'>-	struct btrfs_qgroup *cur;</div><div class='ctx'> 	LIST_HEAD(qgroup_list);</div><div class='ctx'> 	u64 num_bytes = src-&gt;excl;</div><div class='add'>+	u64 num_bytes_cmpr = src-&gt;excl_cmpr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	qgroup = find_qgroup_rb(fs_info, ref_root);</div><div class='hunk'>@@ -1498,15 +1450,16 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info, u64 ref_root,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	qgroup_iterator_add(&amp;qgroup_list, qgroup);</div><div class='del'>-	list_for_each_entry(cur, &amp;qgroup_list, iterator) {</div><div class='add'>+	list_for_each_entry(qgroup, &amp;qgroup_list, iterator) {</div><div class='ctx'> 		struct btrfs_qgroup_list *glist;</div><div class='ctx'> </div><div class='ctx'> 		qgroup-&gt;rfer += sign * num_bytes;</div><div class='del'>-		qgroup-&gt;rfer_cmpr += sign * num_bytes;</div><div class='add'>+		qgroup-&gt;rfer_cmpr += sign * num_bytes_cmpr;</div><div class='ctx'> </div><div class='ctx'> 		WARN_ON(sign &lt; 0 &amp;&amp; qgroup-&gt;excl &lt; num_bytes);</div><div class='add'>+		WARN_ON(sign &lt; 0 &amp;&amp; qgroup-&gt;excl_cmpr &lt; num_bytes_cmpr);</div><div class='ctx'> 		qgroup-&gt;excl += sign * num_bytes;</div><div class='del'>-		qgroup-&gt;excl_cmpr += sign * num_bytes;</div><div class='add'>+		qgroup-&gt;excl_cmpr += sign * num_bytes_cmpr;</div><div class='ctx'> </div><div class='ctx'> 		if (sign &gt; 0)</div><div class='ctx'> 			qgroup_rsv_add_by_qgroup(fs_info, qgroup, src);</div><div class='hunk'>@@ -1541,18 +1494,15 @@ static int quick_update_accounting(struct btrfs_fs_info *fs_info,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	qgroup = find_qgroup_rb(fs_info, src);</div><div class='ctx'> 	if (!qgroup)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (qgroup-&gt;excl == qgroup-&gt;rfer) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		err = __qgroup_excl_accounting(fs_info, dst, qgroup, sign);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			ret = err;</div><div class='add'>+		ret = __qgroup_excl_accounting(fs_info, dst, qgroup, sign);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1560,18 +1510,26 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, u64 dst)</div><div class='add'>+/*</div><div class='add'>+ * Add relation between @src and @dst qgroup. The @prealloc is allocated by the</div><div class='add'>+ * callers and transferred here (either used or freed on error).</div><div class='add'>+ */</div><div class='add'>+int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, u64 dst,</div><div class='add'>+			      struct btrfs_qgroup_list *prealloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_qgroup *parent;</div><div class='ctx'> 	struct btrfs_qgroup *member;</div><div class='ctx'> 	struct btrfs_qgroup_list *list;</div><div class='del'>-	struct btrfs_qgroup_list *prealloc = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	ASSERT(prealloc);</div><div class='add'>+</div><div class='ctx'> 	/* Check the level of src and dst first */</div><div class='del'>-	if (btrfs_qgroup_level(src) &gt;= btrfs_qgroup_level(dst))</div><div class='add'>+	if (btrfs_qgroup_level(src) &gt;= btrfs_qgroup_level(dst)) {</div><div class='add'>+		kfree(prealloc);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (!fs_info-&gt;quota_root) {</div><div class='hunk'>@@ -1593,11 +1551,6 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, u64 dst</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prealloc = kzalloc(sizeof(*list), GFP_NOFS);</div><div class='del'>-	if (!prealloc) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	ret = add_qgroup_relation_item(trans, src, dst);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1699,9 +1652,6 @@ int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> 	struct btrfs_qgroup *prealloc = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (!fs_info-&gt;quota_root) {</div><div class='ctx'> 		ret = -ENOTCONN;</div><div class='hunk'>@@ -1732,10 +1682,63 @@ int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> 	ret = btrfs_sysfs_add_one_qgroup(fs_info, qgroup);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='del'>-	kfree(prealloc);</div><div class='add'>+	/*</div><div class='add'>+	 * At this point we either failed at allocating prealloc, or we</div><div class='add'>+	 * succeeded and passed the ownership to it to add_qgroup_rb(). In any</div><div class='add'>+	 * case, this needs to be NULL or there is something wrong.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(prealloc == NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Return 0 if we can not delete the qgroup (not empty or has children etc).</div><div class='add'>+ * Return &gt;0 if we can delete the qgroup.</div><div class='add'>+ * Return &lt;0 for other errors during tree search.</div><div class='add'>+ */</div><div class='add'>+static int can_delete_qgroup(struct btrfs_fs_info *fs_info, struct btrfs_qgroup *qgroup)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Squota would never be inconsistent, but there can still be case</div><div class='add'>+	 * where a dropped subvolume still has qgroup numbers, and squota</div><div class='add'>+	 * relies on such qgroup for future accounting.</div><div class='add'>+	 *</div><div class='add'>+	 * So for squota, do not allow dropping any non-zero qgroup.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_SIMPLE &amp;&amp;</div><div class='add'>+	    (qgroup-&gt;rfer || qgroup-&gt;excl || qgroup-&gt;excl_cmpr || qgroup-&gt;rfer_cmpr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* For higher level qgroup, we can only delete it if it has no child. */</div><div class='add'>+	if (btrfs_qgroup_level(qgroup-&gt;qgroupid)) {</div><div class='add'>+		if (!list_empty(&amp;qgroup-&gt;members))</div><div class='add'>+			return 0;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For level-0 qgroups, we can only delete it if it has no subvolume</div><div class='add'>+	 * for it.</div><div class='add'>+	 * This means even a subvolume is unlinked but not yet fully dropped,</div><div class='add'>+	 * we can not delete the qgroup.</div><div class='add'>+	 */</div><div class='add'>+	key.objectid = qgroup-&gt;qgroupid;</div><div class='add'>+	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+	key.offset = -1ULL;</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The @ret from btrfs_find_root() exactly matches our definition for</div><div class='add'>+	 * the return value, thus can be returned directly.</div><div class='add'>+	 */</div><div class='add'>+	return btrfs_find_root(fs_info-&gt;tree_root, &amp;key, path, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='hunk'>@@ -1755,6 +1758,14 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = can_delete_qgroup(fs_info, qgroup);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check if there are no children of this qgroup */</div><div class='ctx'> 	if (!list_empty(&amp;qgroup-&gt;members)) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='hunk'>@@ -1775,6 +1786,44 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;qgroup_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Warn on reserved space. The subvolume should has no child nor</div><div class='add'>+	 * corresponding subvolume.</div><div class='add'>+	 * Thus its reserved space should all be zero, no matter if qgroup</div><div class='add'>+	 * is consistent or the mode.</div><div class='add'>+	 */</div><div class='add'>+	if (qgroup-&gt;rsv.values[BTRFS_QGROUP_RSV_DATA] ||</div><div class='add'>+	    qgroup-&gt;rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC] ||</div><div class='add'>+	    qgroup-&gt;rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS]) {</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		btrfs_warn_rl(fs_info,</div><div class='add'>+"to be deleted qgroup %u/%llu has non-zero numbers, data %llu meta prealloc %llu meta pertrans %llu",</div><div class='add'>+			      btrfs_qgroup_level(qgroup-&gt;qgroupid),</div><div class='add'>+			      btrfs_qgroup_subvolid(qgroup-&gt;qgroupid),</div><div class='add'>+			      qgroup-&gt;rsv.values[BTRFS_QGROUP_RSV_DATA],</div><div class='add'>+			      qgroup-&gt;rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC],</div><div class='add'>+			      qgroup-&gt;rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS]);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * The same for rfer/excl numbers, but that's only if our qgroup is</div><div class='add'>+	 * consistent and if it's in regular qgroup mode.</div><div class='add'>+	 * For simple mode it's not as accurate thus we can hit non-zero values</div><div class='add'>+	 * very frequently.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_FULL &amp;&amp;</div><div class='add'>+	    !(fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT)) {</div><div class='add'>+		if (qgroup-&gt;rfer || qgroup-&gt;excl ||</div><div class='add'>+		    qgroup-&gt;rfer_cmpr || qgroup-&gt;excl_cmpr) {</div><div class='add'>+			DEBUG_WARN();</div><div class='add'>+			qgroup_mark_inconsistent(fs_info,</div><div class='add'>+				"to be deleted qgroup %u/%llu has non-zero numbers, rfer %llu rfer_cmpr %llu excl %llu excl_cmpr %llu",</div><div class='add'>+				btrfs_qgroup_level(qgroup-&gt;qgroupid),</div><div class='add'>+				btrfs_qgroup_subvolid(qgroup-&gt;qgroupid),</div><div class='add'>+				qgroup-&gt;rfer, qgroup-&gt;rfer_cmpr,</div><div class='add'>+				qgroup-&gt;excl, qgroup-&gt;excl_cmpr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	del_qgroup_rb(fs_info, qgroupid);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1790,6 +1839,41 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int btrfs_qgroup_cleanup_dropped_subvolume(struct btrfs_fs_info *fs_info, u64 subvolid)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_trans_handle *trans;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_fstree(subvolid) || !btrfs_qgroup_enabled(fs_info) ||</div><div class='add'>+	    !fs_info-&gt;quota_root)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Commit current transaction to make sure all the rfer/excl numbers</div><div class='add'>+	 * get updated.</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_commit_current_transaction(fs_info-&gt;quota_root);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Start new trans to delete the qgroup info and limit items. */</div><div class='add'>+	trans = btrfs_start_transaction(fs_info-&gt;quota_root, 2);</div><div class='add'>+	if (IS_ERR(trans))</div><div class='add'>+		return PTR_ERR(trans);</div><div class='add'>+	ret = btrfs_remove_qgroup(trans, subvolid);</div><div class='add'>+	btrfs_end_transaction(trans);</div><div class='add'>+	/*</div><div class='add'>+	 * It's squota and the subvolume still has numbers needed for future</div><div class='add'>+	 * accounting, in this case we can not delete it.  Just skip it.</div><div class='add'>+	 *</div><div class='add'>+	 * Or the qgroup is already removed by a qgroup rescan. For both cases we're</div><div class='add'>+	 * safe to ignore them.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == -EBUSY || ret == -ENOENT)</div><div class='add'>+		ret = 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid,</div><div class='ctx'> 		       struct btrfs_qgroup_limit *limit)</div><div class='ctx'> {</div><div class='hunk'>@@ -1856,11 +1940,8 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid,</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = update_qgroup_limit_item(trans, qgroup);</div><div class='del'>-	if (ret) {</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='del'>-		btrfs_info(fs_info, "unable to update quota limit for %llu",</div><div class='del'>-		       qgroupid);</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		qgroup_mark_inconsistent(fs_info, "qgroup item update error %d", ret);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='hunk'>@@ -1876,43 +1957,49 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 for success insert</div><div class='ctx'>  * Return &gt;0 for existing record, caller can free @record safely.</div><div class='del'>- * Error is not possible</div><div class='add'>+ * Return &lt;0 for insertion failure, caller can free @record safely.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_qgroup_trace_extent_nolock(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_delayed_ref_root *delayed_refs,</div><div class='del'>-				struct btrfs_qgroup_extent_record *record)</div><div class='add'>+				     struct btrfs_delayed_ref_root *delayed_refs,</div><div class='add'>+				     struct btrfs_qgroup_extent_record *record,</div><div class='add'>+				     u64 bytenr)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;delayed_refs-&gt;dirty_extent_root.rb_node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='del'>-	struct btrfs_qgroup_extent_record *entry;</div><div class='del'>-	u64 bytenr = record-&gt;bytenr;</div><div class='add'>+	struct btrfs_qgroup_extent_record *existing, *ret;</div><div class='add'>+	const unsigned long index = (bytenr &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_qgroup_full_accounting(fs_info))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	trace_btrfs_qgroup_trace_extent(fs_info, record);</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		entry = rb_entry(parent_node, struct btrfs_qgroup_extent_record,</div><div class='del'>-				 node);</div><div class='del'>-		if (bytenr &lt; entry-&gt;bytenr) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (bytenr &gt; entry-&gt;bytenr) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		} else {</div><div class='del'>-			if (record-&gt;data_rsv &amp;&amp; !entry-&gt;data_rsv) {</div><div class='del'>-				entry-&gt;data_rsv = record-&gt;data_rsv;</div><div class='del'>-				entry-&gt;data_rsv_refroot =</div><div class='del'>-					record-&gt;data_rsv_refroot;</div><div class='del'>-			}</div><div class='del'>-			return 1;</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	if (bytenr &gt;= MAX_LFS_FILESIZE) {</div><div class='add'>+		btrfs_err_rl(fs_info,</div><div class='add'>+"qgroup record for extent at %llu is beyond 32bit page cache and xarray index limit",</div><div class='add'>+			     bytenr);</div><div class='add'>+		btrfs_err_32bit_limit(fs_info);</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	trace_btrfs_qgroup_trace_extent(fs_info, record, bytenr);</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;delayed_refs-&gt;dirty_extents);</div><div class='add'>+	existing = xa_load(&amp;delayed_refs-&gt;dirty_extents, index);</div><div class='add'>+	if (existing) {</div><div class='add'>+		if (record-&gt;data_rsv &amp;&amp; !existing-&gt;data_rsv) {</div><div class='add'>+			existing-&gt;data_rsv = record-&gt;data_rsv;</div><div class='add'>+			existing-&gt;data_rsv_refroot = record-&gt;data_rsv_refroot;</div><div class='ctx'> 		}</div><div class='add'>+		xa_unlock(&amp;delayed_refs-&gt;dirty_extents);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __xa_store(&amp;delayed_refs-&gt;dirty_extents, index, record, GFP_ATOMIC);</div><div class='add'>+	xa_unlock(&amp;delayed_refs-&gt;dirty_extents);</div><div class='add'>+	if (xa_is_err(ret)) {</div><div class='add'>+		qgroup_mark_inconsistent(fs_info, "xarray insert error: %d", xa_err(ret));</div><div class='add'>+		return xa_err(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rb_link_node(&amp;record-&gt;node, parent_node, p);</div><div class='del'>-	rb_insert_color(&amp;record-&gt;node, &amp;delayed_refs-&gt;dirty_extent_root);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1938,12 +2025,17 @@ int btrfs_qgroup_trace_extent_nolock(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * transaction committing, but not now as qgroup accounting will be wrong again.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,</div><div class='del'>-				   struct btrfs_qgroup_extent_record *qrecord)</div><div class='add'>+				   struct btrfs_qgroup_extent_record *qrecord,</div><div class='add'>+				   u64 bytenr)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_backref_walk_ctx ctx = { 0 };</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_backref_walk_ctx ctx = {</div><div class='add'>+		.bytenr = bytenr,</div><div class='add'>+		.fs_info = fs_info,</div><div class='add'>+	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_qgroup_full_accounting(trans-&gt;fs_info))</div><div class='add'>+	if (!btrfs_qgroup_full_accounting(fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are always called in a context where we are already holding a</div><div class='hunk'>@@ -1966,18 +2058,13 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(trans != NULL);</div><div class='ctx'> </div><div class='del'>-	if (trans-&gt;fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_RUNTIME_FLAG_NO_ACCOUNTING)</div><div class='add'>+	if (fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_RUNTIME_FLAG_NO_ACCOUNTING)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ctx.bytenr = qrecord-&gt;bytenr;</div><div class='del'>-	ctx.fs_info = trans-&gt;fs_info;</div><div class='del'>-</div><div class='ctx'> 	ret = btrfs_find_all_roots(&amp;ctx, true);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		qgroup_mark_inconsistent(trans-&gt;fs_info);</div><div class='del'>-		btrfs_warn(trans-&gt;fs_info,</div><div class='del'>-"error accounting new delayed refs extent (err code: %d), quota inconsistent",</div><div class='del'>-			ret);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info,</div><div class='add'>+				"error accounting new delayed refs extent: %d", ret);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2010,7 +2097,8 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_qgroup_extent_record *record;</div><div class='del'>-	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='add'>+	struct btrfs_delayed_ref_root *delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+	const unsigned long index = (bytenr &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_qgroup_full_accounting(fs_info) || bytenr == 0 || num_bytes == 0)</div><div class='hunk'>@@ -2019,19 +2107,21 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='ctx'> 	if (!record)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='del'>-	record-&gt;bytenr = bytenr;</div><div class='add'>+	if (xa_reserve(&amp;delayed_refs-&gt;dirty_extents, index, GFP_NOFS)) {</div><div class='add'>+		kfree(record);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	record-&gt;num_bytes = num_bytes;</div><div class='del'>-	record-&gt;old_roots = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	ret = btrfs_qgroup_trace_extent_nolock(fs_info, delayed_refs, record);</div><div class='del'>-	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='del'>-	if (ret &gt; 0) {</div><div class='add'>+	ret = btrfs_qgroup_trace_extent_nolock(fs_info, delayed_refs, record, bytenr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Clean up if insertion fails or item exists. */</div><div class='add'>+		xa_release(&amp;delayed_refs-&gt;dirty_extents, index);</div><div class='ctx'> 		kfree(record);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return btrfs_qgroup_trace_extent_post(trans, record);</div><div class='add'>+	return btrfs_qgroup_trace_extent_post(trans, record, bytenr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2195,7 +2285,7 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,</div><div class='ctx'> 				    bool trace_leaf)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *src_path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(src_path);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	u32 nodesize = fs_info-&gt;nodesize;</div><div class='ctx'> 	int cur_level = root_level;</div><div class='hunk'>@@ -2207,10 +2297,8 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	src_path = btrfs_alloc_path();</div><div class='del'>-	if (!src_path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!src_path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (dst_level)</div><div class='ctx'> 		btrfs_node_key_to_cpu(dst_path-&gt;nodes[dst_level], &amp;key, 0);</div><div class='hunk'>@@ -2218,7 +2306,7 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,</div><div class='ctx'> 		btrfs_item_key_to_cpu(dst_path-&gt;nodes[dst_level], &amp;key, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* For src_path */</div><div class='del'>-	atomic_inc(&amp;src_eb-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;src_eb-&gt;refs);</div><div class='ctx'> 	src_path-&gt;nodes[root_level] = src_eb;</div><div class='ctx'> 	src_path-&gt;slots[root_level] = dst_path-&gt;slots[root_level];</div><div class='ctx'> 	src_path-&gt;locks[root_level] = 0;</div><div class='hunk'>@@ -2236,10 +2324,8 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,</div><div class='ctx'> 			parent_slot = src_path-&gt;slots[cur_level + 1];</div><div class='ctx'> </div><div class='ctx'> 			eb = btrfs_read_node_slot(eb, parent_slot);</div><div class='del'>-			if (IS_ERR(eb)) {</div><div class='del'>-				ret = PTR_ERR(eb);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+			if (IS_ERR(eb))</div><div class='add'>+				return PTR_ERR(eb);</div><div class='ctx'> </div><div class='ctx'> 			src_path-&gt;nodes[cur_level] = eb;</div><div class='ctx'> </div><div class='hunk'>@@ -2260,10 +2346,8 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,</div><div class='ctx'> 					&amp;src_key, src_path-&gt;slots[cur_level]);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Content mismatch, something went wrong */</div><div class='del'>-		if (btrfs_comp_cpu_keys(&amp;dst_key, &amp;src_key)) {</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (btrfs_comp_cpu_keys(&amp;dst_key, &amp;src_key))</div><div class='add'>+			return -ENOENT;</div><div class='ctx'> 		cur_level--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2274,21 +2358,20 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,</div><div class='ctx'> 	ret = btrfs_qgroup_trace_extent(trans, src_path-&gt;nodes[dst_level]-&gt;start,</div><div class='ctx'> 					nodesize);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = btrfs_qgroup_trace_extent(trans, dst_path-&gt;nodes[dst_level]-&gt;start,</div><div class='ctx'> 					nodesize);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Record leaf file extents */</div><div class='ctx'> 	if (dst_level == 0 &amp;&amp; trace_leaf) {</div><div class='ctx'> 		ret = btrfs_qgroup_trace_leaf_items(trans, src_path-&gt;nodes[0]);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = btrfs_qgroup_trace_leaf_items(trans, dst_path-&gt;nodes[0]);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(src_path);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2327,9 +2410,9 @@ static int qgroup_trace_new_subtree_blocks(struct btrfs_trans_handle* trans,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Level sanity check */</div><div class='del'>-	if (cur_level &lt; 0 || cur_level &gt;= BTRFS_MAX_LEVEL - 1 ||</div><div class='del'>-	    root_level &lt; 0 || root_level &gt;= BTRFS_MAX_LEVEL - 1 ||</div><div class='del'>-	    root_level &lt; cur_level) {</div><div class='add'>+	if (unlikely(cur_level &lt; 0 || cur_level &gt;= BTRFS_MAX_LEVEL - 1 ||</div><div class='add'>+		     root_level &lt; 0 || root_level &gt;= BTRFS_MAX_LEVEL - 1 ||</div><div class='add'>+		     root_level &lt; cur_level)) {</div><div class='ctx'> 		btrfs_err_rl(fs_info,</div><div class='ctx'> 			"%s: bad levels, cur_level=%d root_level=%d",</div><div class='ctx'> 			__func__, cur_level, root_level);</div><div class='hunk'>@@ -2345,7 +2428,7 @@ static int qgroup_trace_new_subtree_blocks(struct btrfs_trans_handle* trans,</div><div class='ctx'> 		 * dst_path-&gt;nodes[root_level] must be initialized before</div><div class='ctx'> 		 * calling this function.</div><div class='ctx'> 		 */</div><div class='del'>-		if (cur_level == root_level) {</div><div class='add'>+		if (unlikely(cur_level == root_level)) {</div><div class='ctx'> 			btrfs_err_rl(fs_info,</div><div class='ctx'> 	"%s: dst_path-&gt;nodes[%d] not initialized, root_level=%d cur_level=%d",</div><div class='ctx'> 				__func__, root_level, root_level, cur_level);</div><div class='hunk'>@@ -2431,7 +2514,7 @@ static int qgroup_trace_subtree_swap(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Wrong parameter order */</div><div class='del'>-	if (btrfs_header_generation(src_eb) &gt; btrfs_header_generation(dst_eb)) {</div><div class='add'>+	if (unlikely(btrfs_header_generation(src_eb) &gt; btrfs_header_generation(dst_eb))) {</div><div class='ctx'> 		btrfs_err_rl(fs_info,</div><div class='ctx'> 		"%s: bad parameter order, src_gen=%llu dst_gen=%llu", __func__,</div><div class='ctx'> 			     btrfs_header_generation(src_eb),</div><div class='hunk'>@@ -2439,7 +2522,7 @@ static int qgroup_trace_subtree_swap(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!extent_buffer_uptodate(src_eb) || !extent_buffer_uptodate(dst_eb)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(src_eb) || !extent_buffer_uptodate(dst_eb))) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2451,7 +2534,7 @@ static int qgroup_trace_subtree_swap(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* For dst_path */</div><div class='del'>-	atomic_inc(&amp;dst_eb-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;dst_eb-&gt;refs);</div><div class='ctx'> 	dst_path-&gt;nodes[level] = dst_eb;</div><div class='ctx'> 	dst_path-&gt;slots[level] = 0;</div><div class='ctx'> 	dst_path-&gt;locks[level] = 0;</div><div class='hunk'>@@ -2466,7 +2549,7 @@ static int qgroup_trace_subtree_swap(struct btrfs_trans_handle *trans,</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(dst_path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info, "%s error: %d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2489,10 +2572,10 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int level;</div><div class='ctx'> 	u8 drop_subptree_thres;</div><div class='ctx'> 	struct extent_buffer *eb = root_eb;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(root_level &lt; 0 || root_level &gt;= BTRFS_MAX_LEVEL);</div><div class='del'>-	BUG_ON(root_eb == NULL);</div><div class='add'>+	ASSERT(0 &lt;= root_level &amp;&amp; root_level &lt; BTRFS_MAX_LEVEL);</div><div class='add'>+	ASSERT(root_eb != NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_qgroup_full_accounting(fs_info))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2510,25 +2593,24 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * mark qgroup inconsistent.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (root_level &gt;= drop_subptree_thres) {</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info, "subtree level reached threshold");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!extent_buffer_uptodate(root_eb)) {</div><div class='ctx'> 		struct btrfs_tree_parent_check check = {</div><div class='del'>-			.has_first_key = false,</div><div class='ctx'> 			.transid = root_gen,</div><div class='ctx'> 			.level = root_level</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_read_extent_buffer(root_eb, &amp;check);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (root_level == 0) {</div><div class='ctx'> 		ret = btrfs_qgroup_trace_leaf_items(trans, root_eb);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -2544,7 +2626,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * walk back up the tree (adjusting slot pointers as we go)</div><div class='ctx'> 	 * and restart the search process.</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_inc(&amp;root_eb-&gt;refs);	/* For path */</div><div class='add'>+	refcount_inc(&amp;root_eb-&gt;refs);	/* For path */</div><div class='ctx'> 	path-&gt;nodes[root_level] = root_eb;</div><div class='ctx'> 	path-&gt;slots[root_level] = 0;</div><div class='ctx'> 	path-&gt;locks[root_level] = 0; /* so release_path doesn't try to unlock */</div><div class='hunk'>@@ -2564,10 +2646,8 @@ walk_down:</div><div class='ctx'> 			child_bytenr = btrfs_node_blockptr(eb, parent_slot);</div><div class='ctx'> </div><div class='ctx'> 			eb = btrfs_read_node_slot(eb, parent_slot);</div><div class='del'>-			if (IS_ERR(eb)) {</div><div class='del'>-				ret = PTR_ERR(eb);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+			if (IS_ERR(eb))</div><div class='add'>+				return PTR_ERR(eb);</div><div class='ctx'> </div><div class='ctx'> 			path-&gt;nodes[level] = eb;</div><div class='ctx'> 			path-&gt;slots[level] = 0;</div><div class='hunk'>@@ -2578,14 +2658,14 @@ walk_down:</div><div class='ctx'> 			ret = btrfs_qgroup_trace_extent(trans, child_bytenr,</div><div class='ctx'> 							fs_info-&gt;nodesize);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (level == 0) {</div><div class='ctx'> 			ret = btrfs_qgroup_trace_leaf_items(trans,</div><div class='ctx'> 							    path-&gt;nodes[level]);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> </div><div class='ctx'> 			/* Nonzero return here means we completed our search */</div><div class='ctx'> 			ret = adjust_slots_upwards(path, root_level);</div><div class='hunk'>@@ -2599,11 +2679,7 @@ walk_down:</div><div class='ctx'> 		level--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qgroup_iterator_nested_add(struct list_head *head, struct btrfs_qgroup *qgroup)</div><div class='hunk'>@@ -2631,7 +2707,7 @@ static void qgroup_iterator_nested_clean(struct list_head *head)</div><div class='ctx'>  */</div><div class='ctx'> static void qgroup_update_refcnt(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 struct ulist *roots, struct list_head *qgroups,</div><div class='del'>-				 u64 seq, int update_old)</div><div class='add'>+				 u64 seq, bool update_old)</div><div class='ctx'> {</div><div class='ctx'> 	struct ulist_node *unode;</div><div class='ctx'> 	struct ulist_iterator uiter;</div><div class='hunk'>@@ -2715,8 +2791,8 @@ static void qgroup_update_counters(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		cur_old_count = btrfs_qgroup_get_old_refcnt(qg, seq);</div><div class='ctx'> 		cur_new_count = btrfs_qgroup_get_new_refcnt(qg, seq);</div><div class='ctx'> </div><div class='del'>-		trace_qgroup_update_counters(fs_info, qg, cur_old_count,</div><div class='del'>-					     cur_new_count);</div><div class='add'>+		trace_btrfs_qgroup_update_counters(fs_info, qg, cur_old_count,</div><div class='add'>+						   cur_new_count);</div><div class='ctx'> </div><div class='ctx'> 		/* Rfer update part */</div><div class='ctx'> 		if (cur_old_count == 0 &amp;&amp; cur_new_count &gt; 0) {</div><div class='hunk'>@@ -2810,7 +2886,7 @@ static int maybe_fs_roots(struct ulist *roots)</div><div class='ctx'> 	 * trees.</div><div class='ctx'> 	 * If it contains a non-fs tree, it won't be shared with fs/subvol trees.</div><div class='ctx'> 	 */</div><div class='del'>-	return is_fstree(unode-&gt;val);</div><div class='add'>+	return btrfs_is_fstree(unode-&gt;val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='hunk'>@@ -2847,8 +2923,6 @@ int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='ctx'> 	if (nr_old_roots == 0 &amp;&amp; nr_new_roots == 0)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!fs_info-&gt;quota_root);</div><div class='del'>-</div><div class='ctx'> 	trace_btrfs_qgroup_account_extent(fs_info, trans-&gt;transid, bytenr,</div><div class='ctx'> 					num_bytes, nr_old_roots, nr_new_roots);</div><div class='ctx'> </div><div class='hunk'>@@ -2898,7 +2972,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_qgroup_extent_record *record;</div><div class='ctx'> 	struct btrfs_delayed_ref_root *delayed_refs;</div><div class='ctx'> 	struct ulist *new_roots = NULL;</div><div class='del'>-	struct rb_node *node;</div><div class='add'>+	unsigned long index;</div><div class='ctx'> 	u64 num_dirty_extents = 0;</div><div class='ctx'> 	u64 qgroup_to_skip;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -2908,18 +2982,17 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)</div><div class='ctx'> </div><div class='ctx'> 	delayed_refs = &amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='ctx'> 	qgroup_to_skip = delayed_refs-&gt;qgroup_to_skip;</div><div class='del'>-	while ((node = rb_first(&amp;delayed_refs-&gt;dirty_extent_root))) {</div><div class='del'>-		record = rb_entry(node, struct btrfs_qgroup_extent_record,</div><div class='del'>-				  node);</div><div class='add'>+	xa_for_each(&amp;delayed_refs-&gt;dirty_extents, index, record) {</div><div class='add'>+		const u64 bytenr = (((u64)index) &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> </div><div class='ctx'> 		num_dirty_extents++;</div><div class='del'>-		trace_btrfs_qgroup_account_extents(fs_info, record);</div><div class='add'>+		trace_btrfs_qgroup_account_extents(fs_info, record, bytenr);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret &amp;&amp; !(fs_info-&gt;qgroup_flags &amp;</div><div class='ctx'> 			      BTRFS_QGROUP_RUNTIME_FLAG_NO_ACCOUNTING)) {</div><div class='ctx'> 			struct btrfs_backref_walk_ctx ctx = { 0 };</div><div class='ctx'> </div><div class='del'>-			ctx.bytenr = record-&gt;bytenr;</div><div class='add'>+			ctx.bytenr = bytenr;</div><div class='ctx'> 			ctx.fs_info = fs_info;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2945,11 +3018,6 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)</div><div class='ctx'> 				ctx.roots = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* Free the reserved data space */</div><div class='del'>-			btrfs_qgroup_free_refroot(fs_info,</div><div class='del'>-					record-&gt;data_rsv_refroot,</div><div class='del'>-					record-&gt;data_rsv,</div><div class='del'>-					BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Use BTRFS_SEQ_LAST as time_seq to do special search,</div><div class='ctx'> 			 * which doesn't lock tree or delayed_refs and search</div><div class='hunk'>@@ -2966,23 +3034,27 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)</div><div class='ctx'> 				ulist_del(record-&gt;old_roots, qgroup_to_skip,</div><div class='ctx'> 					  0);</div><div class='ctx'> 			}</div><div class='del'>-			ret = btrfs_qgroup_account_extent(trans, record-&gt;bytenr,</div><div class='add'>+			ret = btrfs_qgroup_account_extent(trans, bytenr,</div><div class='ctx'> 							  record-&gt;num_bytes,</div><div class='ctx'> 							  record-&gt;old_roots,</div><div class='ctx'> 							  new_roots);</div><div class='ctx'> 			record-&gt;old_roots = NULL;</div><div class='ctx'> 			new_roots = NULL;</div><div class='ctx'> 		}</div><div class='add'>+		/* Free the reserved data space */</div><div class='add'>+		btrfs_qgroup_free_refroot(fs_info,</div><div class='add'>+				record-&gt;data_rsv_refroot,</div><div class='add'>+				record-&gt;data_rsv,</div><div class='add'>+				BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> cleanup:</div><div class='ctx'> 		ulist_free(record-&gt;old_roots);</div><div class='ctx'> 		ulist_free(new_roots);</div><div class='ctx'> 		new_roots = NULL;</div><div class='del'>-		rb_erase(node, &amp;delayed_refs-&gt;dirty_extent_root);</div><div class='add'>+		xa_erase(&amp;delayed_refs-&gt;dirty_extents, index);</div><div class='ctx'> 		kfree(record);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-	trace_qgroup_num_dirty_extents(fs_info, trans-&gt;transid,</div><div class='del'>-				       num_dirty_extents);</div><div class='add'>+	trace_btrfs_qgroup_num_dirty_extents(fs_info, trans-&gt;transid, num_dirty_extents);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3015,10 +3087,12 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> 		ret = update_qgroup_info_item(trans, qgroup);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			qgroup_mark_inconsistent(fs_info);</div><div class='add'>+			qgroup_mark_inconsistent(fs_info,</div><div class='add'>+						 "qgroup info item update error %d", ret);</div><div class='ctx'> 		ret = update_qgroup_limit_item(trans, qgroup);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			qgroup_mark_inconsistent(fs_info);</div><div class='add'>+			qgroup_mark_inconsistent(fs_info,</div><div class='add'>+						 "qgroup limit item update error %d", ret);</div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;qgroup_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (btrfs_qgroup_enabled(fs_info))</div><div class='hunk'>@@ -3029,11 +3103,68 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans)</div><div class='ctx'> </div><div class='ctx'> 	ret = update_qgroup_status_item(trans);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info,</div><div class='add'>+					 "qgroup status item update error %d", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int btrfs_qgroup_check_inherit(struct btrfs_fs_info *fs_info,</div><div class='add'>+			       struct btrfs_qgroup_inherit *inherit,</div><div class='add'>+			       size_t size)</div><div class='add'>+{</div><div class='add'>+	if (inherit-&gt;flags &amp; ~BTRFS_QGROUP_INHERIT_FLAGS_SUPP)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (size &lt; sizeof(*inherit) || size &gt; PAGE_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In the past we allowed btrfs_qgroup_inherit to specify to copy</div><div class='add'>+	 * rfer/excl numbers directly from other qgroups.  This behavior has</div><div class='add'>+	 * been disabled in userspace for a very long time, but here we should</div><div class='add'>+	 * also disable it in kernel, as this behavior is known to mark qgroup</div><div class='add'>+	 * inconsistent, and a rescan would wipe out the changes anyway.</div><div class='add'>+	 *</div><div class='add'>+	 * Reject any btrfs_qgroup_inherit with num_ref_copies or num_excl_copies.</div><div class='add'>+	 */</div><div class='add'>+	if (inherit-&gt;num_ref_copies &gt; 0 || inherit-&gt;num_excl_copies &gt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size != struct_size(inherit, qgroups, inherit-&gt;num_qgroups))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Skip the inherit source qgroups check if qgroup is not enabled.</div><div class='add'>+	 * Qgroup can still be later enabled causing problems, but in that case</div><div class='add'>+	 * btrfs_qgroup_inherit() would just ignore those invalid ones.</div><div class='add'>+	 */</div><div class='add'>+	if (!btrfs_qgroup_enabled(fs_info))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now check all the remaining qgroups, they should all:</div><div class='add'>+	 *</div><div class='add'>+	 * - Exist</div><div class='add'>+	 * - Be higher level qgroups.</div><div class='add'>+	 */</div><div class='add'>+	for (int i = 0; i &lt; inherit-&gt;num_qgroups; i++) {</div><div class='add'>+		struct btrfs_qgroup *qgroup;</div><div class='add'>+		u64 qgroupid = inherit-&gt;qgroups[i];</div><div class='add'>+</div><div class='add'>+		if (btrfs_qgroup_level(qgroupid) == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;qgroup_lock);</div><div class='add'>+		qgroup = find_qgroup_rb(fs_info, qgroupid);</div><div class='add'>+		if (!qgroup) {</div><div class='add'>+			spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;qgroup_lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int qgroup_auto_inherit(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       u64 inode_rootid,</div><div class='ctx'> 			       struct btrfs_qgroup_inherit **inherit)</div><div class='hunk'>@@ -3069,13 +3200,69 @@ static int qgroup_auto_inherit(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	qgids = res-&gt;qgroups;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(qg_list, &amp;inode_qg-&gt;groups, next_group)</div><div class='del'>-		qgids[i] = qg_list-&gt;group-&gt;qgroupid;</div><div class='add'>+		qgids[i++] = qg_list-&gt;group-&gt;qgroupid;</div><div class='ctx'> </div><div class='ctx'> 	*inherit = res;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Check if we can skip rescan when inheriting qgroups.  If @src has a single</div><div class='add'>+ * @parent, and that @parent is owning all its bytes exclusively, we can skip</div><div class='add'>+ * the full rescan, by just adding nodesize to the @parent's excl/rfer.</div><div class='add'>+ *</div><div class='add'>+ * Return &lt;0 for fatal errors (like srcid/parentid has no qgroup).</div><div class='add'>+ * Return 0 if a quick inherit is done.</div><div class='add'>+ * Return &gt;0 if a quick inherit is not possible, and a full rescan is needed.</div><div class='add'>+ */</div><div class='add'>+static int qgroup_snapshot_quick_inherit(struct btrfs_fs_info *fs_info,</div><div class='add'>+					 u64 srcid, u64 parentid)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_qgroup *src;</div><div class='add'>+	struct btrfs_qgroup *parent;</div><div class='add'>+	struct btrfs_qgroup_list *list;</div><div class='add'>+	int nr_parents = 0;</div><div class='add'>+</div><div class='add'>+	src = find_qgroup_rb(fs_info, srcid);</div><div class='add'>+	if (!src)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	parent = find_qgroup_rb(fs_info, parentid);</div><div class='add'>+	if (!parent)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Source has no parent qgroup, but our new qgroup would have one.</div><div class='add'>+	 * Qgroup numbers would become inconsistent.</div><div class='add'>+	 */</div><div class='add'>+	if (list_empty(&amp;src-&gt;groups))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(list, &amp;src-&gt;groups, next_group) {</div><div class='add'>+		/* The parent is not the same, quick update is not possible. */</div><div class='add'>+		if (list-&gt;group-&gt;qgroupid != parentid)</div><div class='add'>+			return 1;</div><div class='add'>+		nr_parents++;</div><div class='add'>+		/*</div><div class='add'>+		 * More than one parent qgroup, we can't be sure about accounting</div><div class='add'>+		 * consistency.</div><div class='add'>+		 */</div><div class='add'>+		if (nr_parents &gt; 1)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The parent is not exclusively owning all its bytes.  We're not sure</div><div class='add'>+	 * if the source has any bytes not fully owned by the parent.</div><div class='add'>+	 */</div><div class='add'>+	if (parent-&gt;excl != parent-&gt;rfer)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	parent-&gt;excl += fs_info-&gt;nodesize;</div><div class='add'>+	parent-&gt;rfer += fs_info-&gt;nodesize;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Copy the accounting information between qgroups. This is necessary</div><div class='ctx'>  * when a snapshot or a subvolume is created. Throwing an error will</div><div class='ctx'>  * cause a transaction abort so we take extra care here to only error</div><div class='hunk'>@@ -3086,20 +3273,22 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> 			 struct btrfs_qgroup_inherit *inherit)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int i;</div><div class='ctx'> 	u64 *i_qgroups;</div><div class='ctx'> 	bool committing = false;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *quota_root;</div><div class='ctx'> 	struct btrfs_qgroup *srcgroup;</div><div class='ctx'> 	struct btrfs_qgroup *dstgroup;</div><div class='del'>-	struct btrfs_qgroup *prealloc;</div><div class='add'>+	struct btrfs_qgroup *prealloc = NULL;</div><div class='ctx'> 	struct btrfs_qgroup_list **qlist_prealloc = NULL;</div><div class='ctx'> 	bool free_inherit = false;</div><div class='ctx'> 	bool need_rescan = false;</div><div class='ctx'> 	u32 level_size = 0;</div><div class='ctx'> 	u64 nums;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_qgroup_enabled(fs_info))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	prealloc = kzalloc(sizeof(*prealloc), GFP_NOFS);</div><div class='ctx'> 	if (!prealloc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3123,8 +3312,6 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> </div><div class='ctx'> 	if (!committing)</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='del'>-	if (!btrfs_qgroup_enabled(fs_info))</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='ctx'> 	quota_root = fs_info-&gt;quota_root;</div><div class='ctx'> 	if (!quota_root) {</div><div class='hunk'>@@ -3143,7 +3330,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> 		i_qgroups = (u64 *)(inherit + 1);</div><div class='ctx'> 		nums = inherit-&gt;num_qgroups + 2 * inherit-&gt;num_ref_copies +</div><div class='ctx'> 		       2 * inherit-&gt;num_excl_copies;</div><div class='del'>-		for (i = 0; i &lt; nums; ++i) {</div><div class='add'>+		for (int i = 0; i &lt; nums; i++) {</div><div class='ctx'> 			srcgroup = find_qgroup_rb(fs_info, *i_qgroups);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -3170,7 +3357,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (inherit) {</div><div class='ctx'> 		i_qgroups = (u64 *)(inherit + 1);</div><div class='del'>-		for (i = 0; i &lt; inherit-&gt;num_qgroups; ++i, ++i_qgroups) {</div><div class='add'>+		for (int i = 0; i &lt; inherit-&gt;num_qgroups; i++, i_qgroups++) {</div><div class='ctx'> 			if (*i_qgroups == 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			ret = add_qgroup_relation_item(trans, objectid,</div><div class='hunk'>@@ -3243,13 +3430,20 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> </div><div class='ctx'> 		qgroup_dirty(fs_info, dstgroup);</div><div class='ctx'> 		qgroup_dirty(fs_info, srcgroup);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the source qgroup has parent but the new one doesn't,</div><div class='add'>+		 * we need a full rescan.</div><div class='add'>+		 */</div><div class='add'>+		if (!inherit &amp;&amp; !list_empty(&amp;srcgroup-&gt;groups))</div><div class='add'>+			need_rescan = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!inherit)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	i_qgroups = (u64 *)(inherit + 1);</div><div class='del'>-	for (i = 0; i &lt; inherit-&gt;num_qgroups; ++i) {</div><div class='add'>+	for (int i = 0; i &lt; inherit-&gt;num_qgroups; i++) {</div><div class='ctx'> 		if (*i_qgroups) {</div><div class='ctx'> 			ret = add_relation_rb(fs_info, qlist_prealloc[i], objectid,</div><div class='ctx'> 					      *i_qgroups);</div><div class='hunk'>@@ -3257,17 +3451,19 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto unlock;</div><div class='ctx'> 		}</div><div class='add'>+		if (srcid) {</div><div class='add'>+			/* Check if we can do a quick inherit. */</div><div class='add'>+			ret = qgroup_snapshot_quick_inherit(fs_info, srcid, *i_qgroups);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto unlock;</div><div class='add'>+			if (ret &gt; 0)</div><div class='add'>+				need_rescan = true;</div><div class='add'>+			ret = 0;</div><div class='add'>+		}</div><div class='ctx'> 		++i_qgroups;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we're doing a snapshot, and adding the snapshot to a new</div><div class='del'>-		 * qgroup, the numbers are guaranteed to be incorrect.</div><div class='del'>-		 */</div><div class='del'>-		if (srcid)</div><div class='del'>-			need_rescan = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;  inherit-&gt;num_ref_copies; ++i, i_qgroups += 2) {</div><div class='add'>+	for (int i = 0; i &lt; inherit-&gt;num_ref_copies; i++, i_qgroups += 2) {</div><div class='ctx'> 		struct btrfs_qgroup *src;</div><div class='ctx'> 		struct btrfs_qgroup *dst;</div><div class='ctx'> </div><div class='hunk'>@@ -3288,7 +3484,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> 		/* Manually tweaking numbers certainly needs a rescan */</div><div class='ctx'> 		need_rescan = true;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt;  inherit-&gt;num_excl_copies; ++i, i_qgroups += 2) {</div><div class='add'>+	for (int i = 0; i &lt; inherit-&gt;num_excl_copies; i++, i_qgroups += 2) {</div><div class='ctx'> 		struct btrfs_qgroup *src;</div><div class='ctx'> 		struct btrfs_qgroup *dst;</div><div class='ctx'> </div><div class='hunk'>@@ -3316,7 +3512,7 @@ out:</div><div class='ctx'> 	if (!committing)</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;qgroup_ioctl_lock);</div><div class='ctx'> 	if (need_rescan)</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info, "qgroup inherit needs a rescan");</div><div class='ctx'> 	if (qlist_prealloc) {</div><div class='ctx'> 		for (int i = 0; i &lt; inherit-&gt;num_qgroups; i++)</div><div class='ctx'> 			kfree(qlist_prealloc[i]);</div><div class='hunk'>@@ -3324,7 +3520,14 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> 	if (free_inherit)</div><div class='ctx'> 		kfree(inherit);</div><div class='del'>-	kfree(prealloc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At this point we either failed at allocating prealloc, or we</div><div class='add'>+	 * succeeded and passed the ownership to it to add_qgroup_rb(). In any</div><div class='add'>+	 * case, this needs to be NULL or there is something wrong.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(prealloc == NULL);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3346,11 +3549,11 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	u64 ref_root = root-&gt;root_key.objectid;</div><div class='add'>+	u64 ref_root = btrfs_root_id(root);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	LIST_HEAD(qgroup_list);</div><div class='ctx'> </div><div class='del'>-	if (!is_fstree(ref_root))</div><div class='add'>+	if (!btrfs_is_fstree(ref_root))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (num_bytes == 0)</div><div class='hunk'>@@ -3410,7 +3613,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='ctx'> 	LIST_HEAD(qgroup_list);</div><div class='ctx'> </div><div class='del'>-	if (!is_fstree(ref_root))</div><div class='add'>+	if (!btrfs_is_fstree(ref_root))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (num_bytes == 0)</div><div class='hunk'>@@ -3492,10 +3695,8 @@ static int qgroup_rescan_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					 path, 1, 0);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_debug(fs_info,</div><div class='del'>-		"current progress key (%llu %u %llu), search_slot ret %d",</div><div class='del'>-		fs_info-&gt;qgroup_rescan_progress.objectid,</div><div class='del'>-		fs_info-&gt;qgroup_rescan_progress.type,</div><div class='del'>-		fs_info-&gt;qgroup_rescan_progress.offset, ret);</div><div class='add'>+		    "current progress key " BTRFS_KEY_FMT ", search_slot ret %d",</div><div class='add'>+		    BTRFS_KEY_FMT_VALUE(&amp;fs_info-&gt;qgroup_rescan_progress), ret);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3581,7 +3782,6 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work)</div><div class='ctx'> 						     qgroup_rescan_work);</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='del'>-	int err = -ENOMEM;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	bool stopped = false;</div><div class='ctx'> 	bool did_leaf_rescans = false;</div><div class='hunk'>@@ -3590,27 +3790,28 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path)</div><div class='add'>+	if (!path) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Rescan should only search for commit root, and any later difference</div><div class='ctx'> 	 * should be recorded by qgroup</div><div class='ctx'> 	 */</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-	while (!err &amp;&amp; !(stopped = rescan_should_stop(fs_info))) {</div><div class='add'>+	while (!ret &amp;&amp; !(stopped = rescan_should_stop(fs_info))) {</div><div class='ctx'> 		trans = btrfs_start_transaction(fs_info-&gt;fs_root, 0);</div><div class='ctx'> 		if (IS_ERR(trans)) {</div><div class='del'>-			err = PTR_ERR(trans);</div><div class='add'>+			ret = PTR_ERR(trans);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = qgroup_rescan_leaf(trans, path);</div><div class='add'>+		ret = qgroup_rescan_leaf(trans, path);</div><div class='ctx'> 		did_leaf_rescans = true;</div><div class='ctx'> </div><div class='del'>-		if (err &gt; 0)</div><div class='add'>+		if (ret &gt; 0)</div><div class='ctx'> 			btrfs_commit_transaction(trans);</div><div class='ctx'> 		else</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='hunk'>@@ -3620,10 +3821,10 @@ out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;qgroup_rescan_lock);</div><div class='del'>-	if (err &gt; 0 &amp;&amp;</div><div class='add'>+	if (ret &gt; 0 &amp;&amp;</div><div class='ctx'> 	    fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT) {</div><div class='ctx'> 		fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;</div><div class='del'>-	} else if (err &lt; 0 || stopped) {</div><div class='add'>+	} else if (ret &lt; 0 || stopped) {</div><div class='ctx'> 		fs_info-&gt;qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_rescan_lock);</div><div class='hunk'>@@ -3638,11 +3839,11 @@ out:</div><div class='ctx'> 	if (did_leaf_rescans) {</div><div class='ctx'> 		trans = btrfs_start_transaction(fs_info-&gt;quota_root, 1);</div><div class='ctx'> 		if (IS_ERR(trans)) {</div><div class='del'>-			err = PTR_ERR(trans);</div><div class='add'>+			ret = PTR_ERR(trans);</div><div class='ctx'> 			trans = NULL;</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 				  "fail to start transaction for status update: %d",</div><div class='del'>-				  err);</div><div class='add'>+				  ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		trans = NULL;</div><div class='hunk'>@@ -3653,11 +3854,11 @@ out:</div><div class='ctx'> 	    fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_RUNTIME_FLAG_CANCEL_RESCAN)</div><div class='ctx'> 		fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN;</div><div class='ctx'> 	if (trans) {</div><div class='del'>-		ret = update_qgroup_status_item(trans);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			err = ret;</div><div class='del'>-			btrfs_err(fs_info, "fail to update qgroup status: %d",</div><div class='del'>-				  err);</div><div class='add'>+		int ret2 = update_qgroup_status_item(trans);</div><div class='add'>+</div><div class='add'>+		if (ret2 &lt; 0) {</div><div class='add'>+			ret = ret2;</div><div class='add'>+			btrfs_err(fs_info, "fail to update qgroup status: %d", ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	fs_info-&gt;qgroup_rescan_running = false;</div><div class='hunk'>@@ -3674,11 +3875,11 @@ out:</div><div class='ctx'> 		btrfs_info(fs_info, "qgroup scan paused");</div><div class='ctx'> 	} else if (fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_RUNTIME_FLAG_CANCEL_RESCAN) {</div><div class='ctx'> 		btrfs_info(fs_info, "qgroup scan cancelled");</div><div class='del'>-	} else if (err &gt;= 0) {</div><div class='add'>+	} else if (ret &gt;= 0) {</div><div class='ctx'> 		btrfs_info(fs_info, "qgroup scan completed%s",</div><div class='del'>-			err &gt; 0 ? " (inconsistency flag cleared)" : "");</div><div class='add'>+			ret &gt; 0 ? " (inconsistency flag cleared)" : "");</div><div class='ctx'> 	} else {</div><div class='del'>-		btrfs_err(fs_info, "qgroup scan failed with %d", err);</div><div class='add'>+		btrfs_err(fs_info, "qgroup scan failed with %d", ret);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3701,14 +3902,14 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,</div><div class='ctx'> 		/* we're resuming qgroup rescan at mount time */</div><div class='ctx'> 		if (!(fs_info-&gt;qgroup_flags &amp;</div><div class='ctx'> 		      BTRFS_QGROUP_STATUS_FLAG_RESCAN)) {</div><div class='del'>-			btrfs_warn(fs_info,</div><div class='add'>+			btrfs_debug(fs_info,</div><div class='ctx'> 			"qgroup rescan init failed, qgroup rescan is not queued");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		} else if (!(fs_info-&gt;qgroup_flags &amp;</div><div class='ctx'> 			     BTRFS_QGROUP_STATUS_FLAG_ON)) {</div><div class='del'>-			btrfs_warn(fs_info,</div><div class='add'>+			btrfs_debug(fs_info,</div><div class='ctx'> 			"qgroup rescan init failed, qgroup is not enabled");</div><div class='del'>-			ret = -EINVAL;</div><div class='add'>+			ret = -ENOTCONN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -3719,14 +3920,12 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,</div><div class='ctx'> </div><div class='ctx'> 	if (init_flags) {</div><div class='ctx'> 		if (fs_info-&gt;qgroup_flags &amp; BTRFS_QGROUP_STATUS_FLAG_RESCAN) {</div><div class='del'>-			btrfs_warn(fs_info,</div><div class='del'>-				   "qgroup rescan is already in progress");</div><div class='ctx'> 			ret = -EINPROGRESS;</div><div class='ctx'> 		} else if (!(fs_info-&gt;qgroup_flags &amp;</div><div class='ctx'> 			     BTRFS_QGROUP_STATUS_FLAG_ON)) {</div><div class='del'>-			btrfs_warn(fs_info,</div><div class='add'>+			btrfs_debug(fs_info,</div><div class='ctx'> 			"qgroup rescan init failed, qgroup is not enabled");</div><div class='del'>-			ret = -EINVAL;</div><div class='add'>+			ret = -ENOTCONN;</div><div class='ctx'> 		} else if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED) {</div><div class='ctx'> 			/* Quota disable is in progress */</div><div class='ctx'> 			ret = -EBUSY;</div><div class='hunk'>@@ -3775,7 +3974,6 @@ int</div><div class='ctx'> btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='ctx'> </div><div class='ctx'> 	ret = qgroup_rescan_init(fs_info, 0, 1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3792,27 +3990,30 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	 * going to clear all tracking information for a clean start.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	trans = btrfs_attach_transaction_barrier(fs_info-&gt;fs_root);</div><div class='del'>-	if (IS_ERR(trans) &amp;&amp; trans != ERR_PTR(-ENOENT)) {</div><div class='add'>+	ret = btrfs_commit_current_transaction(fs_info-&gt;fs_root);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN;</div><div class='del'>-		return PTR_ERR(trans);</div><div class='del'>-	} else if (trans != ERR_PTR(-ENOENT)) {</div><div class='del'>-		ret = btrfs_commit_transaction(trans);</div><div class='del'>-		if (ret) {</div><div class='del'>-			fs_info-&gt;qgroup_flags &amp;= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN;</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qgroup_rescan_zero_tracking(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;qgroup_rescan_lock);</div><div class='del'>-	fs_info-&gt;qgroup_rescan_running = true;</div><div class='del'>-	btrfs_queue_work(fs_info-&gt;qgroup_rescan_workers,</div><div class='del'>-			 &amp;fs_info-&gt;qgroup_rescan_work);</div><div class='add'>+	/*</div><div class='add'>+	 * The rescan worker is only for full accounting qgroups, check if it's</div><div class='add'>+	 * enabled as it is pointless to queue it otherwise. A concurrent quota</div><div class='add'>+	 * disable may also have just cleared BTRFS_FS_QUOTA_ENABLED.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_qgroup_full_accounting(fs_info)) {</div><div class='add'>+		fs_info-&gt;qgroup_rescan_running = true;</div><div class='add'>+		btrfs_queue_work(fs_info-&gt;qgroup_rescan_workers,</div><div class='add'>+				 &amp;fs_info-&gt;qgroup_rescan_work);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENOTCONN;</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;qgroup_rescan_lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -3899,8 +4100,8 @@ static int qgroup_unreserve_range(struct btrfs_inode *inode,</div><div class='ctx'> 		 * Now the entry is in [start, start + len), revert the</div><div class='ctx'> 		 * EXTENT_QGROUP_RESERVED bit.</div><div class='ctx'> 		 */</div><div class='del'>-		clear_ret = clear_extent_bits(&amp;inode-&gt;io_tree, entry_start,</div><div class='del'>-					      entry_end, EXTENT_QGROUP_RESERVED);</div><div class='add'>+		clear_ret = btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, entry_start, entry_end,</div><div class='add'>+						   EXTENT_QGROUP_RESERVED, NULL);</div><div class='ctx'> 		if (!ret &amp;&amp; clear_ret &lt; 0)</div><div class='ctx'> 			ret = clear_ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3937,7 +4138,6 @@ static int qgroup_unreserve_range(struct btrfs_inode *inode,</div><div class='ctx'>  */</div><div class='ctx'> static int try_flush_qgroup(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Can't hold an open transaction or we run the risk of deadlocking. */</div><div class='hunk'>@@ -3958,17 +4158,18 @@ static int try_flush_qgroup(struct btrfs_root *root)</div><div class='ctx'> 	ret = btrfs_start_delalloc_snapshot(root, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	btrfs_wait_ordered_extents(root, U64_MAX, 0, (u64)-1);</div><div class='add'>+	btrfs_wait_ordered_extents(root, U64_MAX, NULL);</div><div class='ctx'> </div><div class='del'>-	trans = btrfs_attach_transaction_barrier(root);</div><div class='del'>-	if (IS_ERR(trans)) {</div><div class='del'>-		ret = PTR_ERR(trans);</div><div class='del'>-		if (ret == -ENOENT)</div><div class='del'>-			ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * After waiting for ordered extents run delayed iputs in order to free</div><div class='add'>+	 * space from unlinked files before committing the current transaction,</div><div class='add'>+	 * as ordered extents may have been holding the last reference of an</div><div class='add'>+	 * inode and they add a delayed iput when they complete.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_run_delayed_iputs(root-&gt;fs_info);</div><div class='add'>+	btrfs_wait_on_delayed_iputs(root-&gt;fs_info);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_commit_transaction(trans);</div><div class='add'>+	ret = btrfs_commit_current_transaction(root);</div><div class='ctx'> out:</div><div class='ctx'> 	clear_bit(BTRFS_ROOT_QGROUP_FLUSHING, &amp;root-&gt;state);</div><div class='ctx'> 	wake_up(&amp;root-&gt;qgroup_flush_wait);</div><div class='hunk'>@@ -3987,7 +4188,7 @@ static int qgroup_reserve_data(struct btrfs_inode *inode,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_qgroup_mode(root-&gt;fs_info) == BTRFS_QGROUP_MODE_DISABLED ||</div><div class='del'>-	    !is_fstree(root-&gt;root_key.objectid) || len == 0)</div><div class='add'>+	    !btrfs_is_fstree(btrfs_root_id(root)) || len == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* @reserved parameter is mandatory for qgroup */</div><div class='hunk'>@@ -4002,8 +4203,9 @@ static int qgroup_reserve_data(struct btrfs_inode *inode,</div><div class='ctx'> 	reserved = *reserved_ret;</div><div class='ctx'> 	/* Record already reserved space */</div><div class='ctx'> 	orig_reserved = reserved-&gt;bytes_changed;</div><div class='del'>-	ret = set_record_extent_bits(&amp;inode-&gt;io_tree, start,</div><div class='del'>-			start + len -1, EXTENT_QGROUP_RESERVED, reserved);</div><div class='add'>+	ret = btrfs_set_record_extent_bits(&amp;inode-&gt;io_tree, start,</div><div class='add'>+					   start + len - 1, EXTENT_QGROUP_RESERVED,</div><div class='add'>+					   reserved);</div><div class='ctx'> </div><div class='ctx'> 	/* Newly reserved space */</div><div class='ctx'> 	to_reserve = reserved-&gt;bytes_changed - orig_reserved;</div><div class='hunk'>@@ -4096,14 +4298,15 @@ static int qgroup_free_reserved_data(struct btrfs_inode *inode,</div><div class='ctx'> 		 * EXTENT_QGROUP_RESERVED, we won't double free.</div><div class='ctx'> 		 * So not need to rush.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = clear_record_extent_bits(&amp;inode-&gt;io_tree, free_start,</div><div class='del'>-				free_start + free_len - 1,</div><div class='del'>-				EXTENT_QGROUP_RESERVED, &amp;changeset);</div><div class='add'>+		ret = btrfs_clear_record_extent_bits(&amp;inode-&gt;io_tree, free_start,</div><div class='add'>+						     free_start + free_len - 1,</div><div class='add'>+						     EXTENT_QGROUP_RESERVED,</div><div class='add'>+						     &amp;changeset);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		freed += changeset.bytes_changed;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_qgroup_free_refroot(root-&gt;fs_info, root-&gt;root_key.objectid, freed,</div><div class='add'>+	btrfs_qgroup_free_refroot(root-&gt;fs_info, btrfs_root_id(root), freed,</div><div class='ctx'> 				  BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> 	if (freed_ret)</div><div class='ctx'> 		*freed_ret = freed;</div><div class='hunk'>@@ -4122,10 +4325,9 @@ static int __btrfs_qgroup_release_data(struct btrfs_inode *inode,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_qgroup_mode(inode-&gt;root-&gt;fs_info) == BTRFS_QGROUP_MODE_DISABLED) {</div><div class='del'>-		extent_changeset_init(&amp;changeset);</div><div class='del'>-		return clear_record_extent_bits(&amp;inode-&gt;io_tree, start,</div><div class='del'>-						start + len - 1,</div><div class='del'>-						EXTENT_QGROUP_RESERVED, &amp;changeset);</div><div class='add'>+		return btrfs_clear_record_extent_bits(&amp;inode-&gt;io_tree, start,</div><div class='add'>+						      start + len - 1,</div><div class='add'>+						      EXTENT_QGROUP_RESERVED, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* In release case, we shouldn't have @reserved */</div><div class='hunk'>@@ -4133,8 +4335,8 @@ static int __btrfs_qgroup_release_data(struct btrfs_inode *inode,</div><div class='ctx'> 	if (free &amp;&amp; reserved)</div><div class='ctx'> 		return qgroup_free_reserved_data(inode, reserved, start, len, released);</div><div class='ctx'> 	extent_changeset_init(&amp;changeset);</div><div class='del'>-	ret = clear_record_extent_bits(&amp;inode-&gt;io_tree, start, start + len -1,</div><div class='del'>-				       EXTENT_QGROUP_RESERVED, &amp;changeset);</div><div class='add'>+	ret = btrfs_clear_record_extent_bits(&amp;inode-&gt;io_tree, start, start + len - 1,</div><div class='add'>+					     EXTENT_QGROUP_RESERVED, &amp;changeset);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -4144,7 +4346,7 @@ static int __btrfs_qgroup_release_data(struct btrfs_inode *inode,</div><div class='ctx'> 					changeset.bytes_changed, trace_op);</div><div class='ctx'> 	if (free)</div><div class='ctx'> 		btrfs_qgroup_free_refroot(inode-&gt;root-&gt;fs_info,</div><div class='del'>-				inode-&gt;root-&gt;root_key.objectid,</div><div class='add'>+				btrfs_root_id(inode-&gt;root),</div><div class='ctx'> 				changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> 	if (released)</div><div class='ctx'> 		*released = changeset.bytes_changed;</div><div class='hunk'>@@ -4239,11 +4441,11 @@ int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED ||</div><div class='del'>-	    !is_fstree(root-&gt;root_key.objectid) || num_bytes == 0)</div><div class='add'>+	    !btrfs_is_fstree(btrfs_root_id(root)) || num_bytes == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(num_bytes != round_down(num_bytes, fs_info-&gt;nodesize));</div><div class='del'>-	trace_qgroup_meta_reserve(root, (s64)num_bytes, type);</div><div class='add'>+	trace_btrfs_qgroup_meta_reserve(root, (s64)num_bytes, type);</div><div class='ctx'> 	ret = qgroup_reserve(root, num_bytes, enforce, type);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -4284,13 +4486,13 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED ||</div><div class='del'>-	    !is_fstree(root-&gt;root_key.objectid))</div><div class='add'>+	    !btrfs_is_fstree(btrfs_root_id(root)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Update trace point to handle such free */</div><div class='del'>-	trace_qgroup_meta_free_all_pertrans(root);</div><div class='add'>+	trace_btrfs_qgroup_meta_free_all_pertrans(root);</div><div class='ctx'> 	/* Special value -1 means to free all reserved space */</div><div class='del'>-	btrfs_qgroup_free_refroot(fs_info, root-&gt;root_key.objectid, (u64)-1,</div><div class='add'>+	btrfs_qgroup_free_refroot(fs_info, btrfs_root_id(root), (u64)-1,</div><div class='ctx'> 				  BTRFS_QGROUP_RSV_META_PERTRANS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4300,7 +4502,7 @@ void __btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED ||</div><div class='del'>-	    !is_fstree(root-&gt;root_key.objectid))</div><div class='add'>+	    !btrfs_is_fstree(btrfs_root_id(root)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4310,9 +4512,8 @@ void __btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes,</div><div class='ctx'> 	 */</div><div class='ctx'> 	num_bytes = sub_root_meta_rsv(root, num_bytes, type);</div><div class='ctx'> 	BUG_ON(num_bytes != round_down(num_bytes, fs_info-&gt;nodesize));</div><div class='del'>-	trace_qgroup_meta_reserve(root, -(s64)num_bytes, type);</div><div class='del'>-	btrfs_qgroup_free_refroot(fs_info, root-&gt;root_key.objectid,</div><div class='del'>-				  num_bytes, type);</div><div class='add'>+	trace_btrfs_qgroup_meta_reserve(root, -(s64)num_bytes, type);</div><div class='add'>+	btrfs_qgroup_free_refroot(fs_info, btrfs_root_id(root), num_bytes, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qgroup_convert_meta(struct btrfs_fs_info *fs_info, u64 ref_root,</div><div class='hunk'>@@ -4360,13 +4561,15 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED ||</div><div class='del'>-	    !is_fstree(root-&gt;root_key.objectid))</div><div class='add'>+	    !btrfs_is_fstree(btrfs_root_id(root)))</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* Same as btrfs_qgroup_free_meta_prealloc() */</div><div class='ctx'> 	num_bytes = sub_root_meta_rsv(root, num_bytes,</div><div class='ctx'> 				      BTRFS_QGROUP_RSV_META_PREALLOC);</div><div class='del'>-	trace_qgroup_meta_convert(root, num_bytes);</div><div class='del'>-	qgroup_convert_meta(fs_info, root-&gt;root_key.objectid, num_bytes);</div><div class='add'>+	trace_btrfs_qgroup_meta_convert(root, num_bytes);</div><div class='add'>+	qgroup_convert_meta(fs_info, btrfs_root_id(root), num_bytes);</div><div class='add'>+	if (!sb_rdonly(fs_info-&gt;sb))</div><div class='add'>+		add_root_meta_rsv(root, num_bytes, BTRFS_QGROUP_RSV_META_PERTRANS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4381,8 +4584,8 @@ void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	extent_changeset_init(&amp;changeset);</div><div class='del'>-	ret = clear_record_extent_bits(&amp;inode-&gt;io_tree, 0, (u64)-1,</div><div class='del'>-			EXTENT_QGROUP_RESERVED, &amp;changeset);</div><div class='add'>+	ret = btrfs_clear_record_extent_bits(&amp;inode-&gt;io_tree, 0, (u64)-1,</div><div class='add'>+					     EXTENT_QGROUP_RESERVED, &amp;changeset);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(ret &lt; 0);</div><div class='ctx'> 	if (WARN_ON(changeset.bytes_changed)) {</div><div class='hunk'>@@ -4393,7 +4596,7 @@ void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)</div><div class='ctx'> 				btrfs_ino(inode), unode-&gt;val, unode-&gt;aux);</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_qgroup_free_refroot(inode-&gt;root-&gt;fs_info,</div><div class='del'>-				inode-&gt;root-&gt;root_key.objectid,</div><div class='add'>+				btrfs_root_id(inode-&gt;root),</div><div class='ctx'> 				changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -4442,6 +4645,28 @@ out:</div><div class='ctx'> 	spin_unlock(&amp;swapped_blocks-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qgroup_swapped_block_bytenr_key_cmp(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 *bytenr = key;</div><div class='add'>+	const struct btrfs_qgroup_swapped_block *block = rb_entry(node,</div><div class='add'>+					  struct btrfs_qgroup_swapped_block, node);</div><div class='add'>+</div><div class='add'>+	if (block-&gt;subvol_bytenr &lt; *bytenr)</div><div class='add'>+		return -1;</div><div class='add'>+	else if (block-&gt;subvol_bytenr &gt; *bytenr)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qgroup_swapped_block_bytenr_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_qgroup_swapped_block *new_block = rb_entry(new,</div><div class='add'>+					      struct btrfs_qgroup_swapped_block, node);</div><div class='add'>+</div><div class='add'>+	return qgroup_swapped_block_bytenr_key_cmp(&amp;new_block-&gt;subvol_bytenr, existing);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Add subtree roots record into @subvol_root.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4452,8 +4677,7 @@ out:</div><div class='ctx'>  *			BOTH POINTERS ARE BEFORE TREE SWAP</div><div class='ctx'>  * @last_snapshot:	last snapshot generation of the subvolume tree</div><div class='ctx'>  */</div><div class='del'>-int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans,</div><div class='del'>-		struct btrfs_root *subvol_root,</div><div class='add'>+int btrfs_qgroup_add_swapped_blocks(struct btrfs_root *subvol_root,</div><div class='ctx'> 		struct btrfs_block_group *bg,</div><div class='ctx'> 		struct extent_buffer *subvol_parent, int subvol_slot,</div><div class='ctx'> 		struct extent_buffer *reloc_parent, int reloc_slot,</div><div class='hunk'>@@ -4462,16 +4686,15 @@ int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = subvol_root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_qgroup_swapped_blocks *blocks = &amp;subvol_root-&gt;swapped_blocks;</div><div class='ctx'> 	struct btrfs_qgroup_swapped_block *block;</div><div class='del'>-	struct rb_node **cur;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> 	int level = btrfs_header_level(subvol_parent) - 1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_qgroup_full_accounting(fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_node_ptr_generation(subvol_parent, subvol_slot) &gt;</div><div class='del'>-	    btrfs_node_ptr_generation(reloc_parent, reloc_slot)) {</div><div class='add'>+	if (unlikely(btrfs_node_ptr_generation(subvol_parent, subvol_slot) &gt;</div><div class='add'>+		     btrfs_node_ptr_generation(reloc_parent, reloc_slot))) {</div><div class='ctx'> 		btrfs_err_rl(fs_info,</div><div class='ctx'> 		"%s: bad parameter order, subvol_gen=%llu reloc_gen=%llu",</div><div class='ctx'> 			__func__,</div><div class='hunk'>@@ -4512,46 +4735,32 @@ int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* Insert @block into @blocks */</div><div class='ctx'> 	spin_lock(&amp;blocks-&gt;lock);</div><div class='del'>-	cur = &amp;blocks-&gt;blocks[level].rb_node;</div><div class='del'>-	while (*cur) {</div><div class='add'>+	node = rb_find_add(&amp;block-&gt;node, &amp;blocks-&gt;blocks[level], qgroup_swapped_block_bytenr_cmp);</div><div class='add'>+	if (node) {</div><div class='ctx'> 		struct btrfs_qgroup_swapped_block *entry;</div><div class='ctx'> </div><div class='del'>-		parent = *cur;</div><div class='del'>-		entry = rb_entry(parent, struct btrfs_qgroup_swapped_block,</div><div class='del'>-				 node);</div><div class='add'>+		entry = rb_entry(node, struct btrfs_qgroup_swapped_block, node);</div><div class='ctx'> </div><div class='del'>-		if (entry-&gt;subvol_bytenr &lt; block-&gt;subvol_bytenr) {</div><div class='del'>-			cur = &amp;(*cur)-&gt;rb_left;</div><div class='del'>-		} else if (entry-&gt;subvol_bytenr &gt; block-&gt;subvol_bytenr) {</div><div class='del'>-			cur = &amp;(*cur)-&gt;rb_right;</div><div class='del'>-		} else {</div><div class='del'>-			if (entry-&gt;subvol_generation !=</div><div class='del'>-					block-&gt;subvol_generation ||</div><div class='del'>-			    entry-&gt;reloc_bytenr != block-&gt;reloc_bytenr ||</div><div class='del'>-			    entry-&gt;reloc_generation !=</div><div class='del'>-					block-&gt;reloc_generation) {</div><div class='del'>-				/*</div><div class='del'>-				 * Duplicated but mismatch entry found.</div><div class='del'>-				 * Shouldn't happen.</div><div class='del'>-				 *</div><div class='del'>-				 * Marking qgroup inconsistent should be enough</div><div class='del'>-				 * for end users.</div><div class='del'>-				 */</div><div class='del'>-				WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='del'>-				ret = -EEXIST;</div><div class='del'>-			}</div><div class='del'>-			kfree(block);</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		if (entry-&gt;subvol_generation != block-&gt;subvol_generation ||</div><div class='add'>+		    entry-&gt;reloc_bytenr != block-&gt;reloc_bytenr ||</div><div class='add'>+		    entry-&gt;reloc_generation != block-&gt;reloc_generation) {</div><div class='add'>+			/*</div><div class='add'>+			 * Duplicated but mismatch entry found.  Shouldn't happen.</div><div class='add'>+			 * Marking qgroup inconsistent should be enough for end</div><div class='add'>+			 * users.</div><div class='add'>+			 */</div><div class='add'>+			DEBUG_WARN("duplicated but mismatched entry found");</div><div class='add'>+			ret = -EEXIST;</div><div class='ctx'> 		}</div><div class='add'>+		kfree(block);</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	rb_link_node(&amp;block-&gt;node, parent, cur);</div><div class='del'>-	rb_insert_color(&amp;block-&gt;node, &amp;blocks-&gt;blocks[level]);</div><div class='ctx'> 	blocks-&gt;swapped = true;</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;blocks-&gt;lock);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info, "%s error: %d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4568,10 +4777,9 @@ int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_tree_parent_check check = { 0 };</div><div class='ctx'> 	struct btrfs_qgroup_swapped_blocks *blocks = &amp;root-&gt;swapped_blocks;</div><div class='del'>-	struct btrfs_qgroup_swapped_block *block;</div><div class='add'>+	struct btrfs_qgroup_swapped_block AUTO_KFREE(block);</div><div class='ctx'> 	struct extent_buffer *reloc_eb = NULL;</div><div class='ctx'> 	struct rb_node *node;</div><div class='del'>-	bool found = false;</div><div class='ctx'> 	bool swapped = false;</div><div class='ctx'> 	int level = btrfs_header_level(subvol_eb);</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -4579,7 +4787,7 @@ int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_qgroup_full_accounting(fs_info))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!is_fstree(root-&gt;root_key.objectid) || !root-&gt;reloc_root)</div><div class='add'>+	if (!btrfs_is_fstree(btrfs_root_id(root)) || !root-&gt;reloc_root)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;blocks-&gt;lock);</div><div class='hunk'>@@ -4587,23 +4795,14 @@ int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		spin_unlock(&amp;blocks-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	node = blocks-&gt;blocks[level].rb_node;</div><div class='del'>-</div><div class='del'>-	while (node) {</div><div class='del'>-		block = rb_entry(node, struct btrfs_qgroup_swapped_block, node);</div><div class='del'>-		if (block-&gt;subvol_bytenr &lt; subvol_eb-&gt;start) {</div><div class='del'>-			node = node-&gt;rb_left;</div><div class='del'>-		} else if (block-&gt;subvol_bytenr &gt; subvol_eb-&gt;start) {</div><div class='del'>-			node = node-&gt;rb_right;</div><div class='del'>-		} else {</div><div class='del'>-			found = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!found) {</div><div class='add'>+	node = rb_find(&amp;subvol_eb-&gt;start, &amp;blocks-&gt;blocks[level],</div><div class='add'>+			qgroup_swapped_block_bytenr_key_cmp);</div><div class='add'>+	if (!node) {</div><div class='ctx'> 		spin_unlock(&amp;blocks-&gt;lock);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	block = rb_entry(node, struct btrfs_qgroup_swapped_block, node);</div><div class='add'>+</div><div class='ctx'> 	/* Found one, remove it from @blocks first and update blocks-&gt;swapped */</div><div class='ctx'> 	rb_erase(&amp;block-&gt;node, &amp;blocks-&gt;blocks[level]);</div><div class='ctx'> 	for (i = 0; i &lt; BTRFS_MAX_LEVEL; i++) {</div><div class='hunk'>@@ -4627,7 +4826,7 @@ int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		reloc_eb = NULL;</div><div class='ctx'> 		goto free_out;</div><div class='ctx'> 	}</div><div class='del'>-	if (!extent_buffer_uptodate(reloc_eb)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(reloc_eb))) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto free_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4635,14 +4834,12 @@ int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = qgroup_trace_subtree_swap(trans, reloc_eb, subvol_eb,</div><div class='ctx'> 			block-&gt;last_snapshot, block-&gt;trace_leaf);</div><div class='ctx'> free_out:</div><div class='del'>-	kfree(block);</div><div class='ctx'> 	free_extent_buffer(reloc_eb);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_err_rl(fs_info,</div><div class='del'>-			     "failed to account subtree at bytenr %llu: %d",</div><div class='del'>-			     subvol_eb-&gt;start, ret);</div><div class='del'>-		qgroup_mark_inconsistent(fs_info);</div><div class='add'>+		qgroup_mark_inconsistent(fs_info,</div><div class='add'>+				"failed to account subtree at bytenr %llu: %d",</div><div class='add'>+				subvol_eb-&gt;start, ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4650,30 +4847,17 @@ out:</div><div class='ctx'> void btrfs_qgroup_destroy_extent_records(struct btrfs_transaction *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_qgroup_extent_record *entry;</div><div class='del'>-	struct btrfs_qgroup_extent_record *next;</div><div class='del'>-	struct rb_root *root;</div><div class='add'>+	unsigned long index;</div><div class='ctx'> </div><div class='del'>-	root = &amp;trans-&gt;delayed_refs.dirty_extent_root;</div><div class='del'>-	rbtree_postorder_for_each_entry_safe(entry, next, root, node) {</div><div class='add'>+	xa_for_each(&amp;trans-&gt;delayed_refs.dirty_extents, index, entry) {</div><div class='ctx'> 		ulist_free(entry-&gt;old_roots);</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 	}</div><div class='del'>-	*root = RB_ROOT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_free_squota_rsv(struct btrfs_fs_info *fs_info, u64 root, u64 rsv_bytes)</div><div class='del'>-{</div><div class='del'>-	if (btrfs_qgroup_mode(fs_info) != BTRFS_QGROUP_MODE_SIMPLE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!is_fstree(root))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	btrfs_qgroup_free_refroot(fs_info, root, rsv_bytes, BTRFS_QGROUP_RSV_DATA);</div><div class='add'>+	xa_destroy(&amp;trans-&gt;delayed_refs.dirty_extents);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_record_squota_delta(struct btrfs_fs_info *fs_info,</div><div class='del'>-			      struct btrfs_squota_delta *delta)</div><div class='add'>+			      const struct btrfs_squota_delta *delta)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='hunk'>@@ -4686,7 +4870,7 @@ int btrfs_record_squota_delta(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (btrfs_qgroup_mode(fs_info) != BTRFS_QGROUP_MODE_SIMPLE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!is_fstree(root))</div><div class='add'>+	if (!btrfs_is_fstree(root))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If the extent predates enabling quotas, don't count it. */</div><div class='head'>diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h<br/>index be18c862e64e..a979fd59a4da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/qgroup.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/qgroup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/qgroup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/qgroup.h</a></div><div class='hunk'>@@ -6,12 +6,25 @@</div><div class='ctx'> #ifndef BTRFS_QGROUP_H</div><div class='ctx'> #define BTRFS_QGROUP_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='del'>-#include "ulist.h"</div><div class='del'>-#include "delayed-ref.h"</div><div class='del'>-#include "misc.h"</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='add'>+</div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct extent_changeset;</div><div class='add'>+struct btrfs_delayed_extent_op;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_ioctl_quota_ctl_args;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_delayed_ref_root;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+struct btrfs_transaction;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_qgroup_swapped_blocks;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Btrfs qgroup overview</div><div class='hunk'>@@ -111,13 +124,18 @@</div><div class='ctx'> #define BTRFS_QGROUP_RUNTIME_FLAG_CANCEL_RESCAN		(1ULL &lt;&lt; 63)</div><div class='ctx'> #define BTRFS_QGROUP_RUNTIME_FLAG_NO_ACCOUNTING		(1ULL &lt;&lt; 62)</div><div class='ctx'> </div><div class='add'>+#define BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT		(3)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Record a dirty extent, and info qgroup to update quota on it</div><div class='del'>- * TODO: Use kmem cache to alloc it.</div><div class='ctx'>  */</div><div class='ctx'> struct btrfs_qgroup_extent_record {</div><div class='del'>-	struct rb_node node;</div><div class='del'>-	u64 bytenr;</div><div class='add'>+	/*</div><div class='add'>+	 * The bytenr of the extent is given by its index in the dirty_extents</div><div class='add'>+	 * xarray of struct btrfs_delayed_ref_root left shifted by</div><div class='add'>+	 * fs_info-&gt;sectorsize_bits.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	u64 num_bytes;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -269,6 +287,14 @@ struct btrfs_qgroup {</div><div class='ctx'> 	struct kobject kobj;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Glue structure to represent the relations between qgroups. */</div><div class='add'>+struct btrfs_qgroup_list {</div><div class='add'>+	struct list_head next_group;</div><div class='add'>+	struct list_head next_member;</div><div class='add'>+	struct btrfs_qgroup *group;</div><div class='add'>+	struct btrfs_qgroup *member;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct btrfs_squota_delta {</div><div class='ctx'> 	/* The fstree root this delta counts against. */</div><div class='ctx'> 	u64 root;</div><div class='hunk'>@@ -302,9 +328,9 @@ enum btrfs_qgroup_mode {</div><div class='ctx'> 	BTRFS_QGROUP_MODE_SIMPLE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum btrfs_qgroup_mode btrfs_qgroup_mode(struct btrfs_fs_info *fs_info);</div><div class='del'>-bool btrfs_qgroup_enabled(struct btrfs_fs_info *fs_info);</div><div class='del'>-bool btrfs_qgroup_full_accounting(struct btrfs_fs_info *fs_info);</div><div class='add'>+enum btrfs_qgroup_mode btrfs_qgroup_mode(const struct btrfs_fs_info *fs_info);</div><div class='add'>+bool btrfs_qgroup_enabled(const struct btrfs_fs_info *fs_info);</div><div class='add'>+bool btrfs_qgroup_full_accounting(const struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_quota_enable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		       struct btrfs_ioctl_quota_ctl_args *quota_ctl_args);</div><div class='ctx'> int btrfs_quota_disable(struct btrfs_fs_info *fs_info);</div><div class='hunk'>@@ -312,23 +338,26 @@ int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				     bool interruptible);</div><div class='del'>-int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, u64 dst);</div><div class='add'>+int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, u64 dst,</div><div class='add'>+			      struct btrfs_qgroup_list *prealloc);</div><div class='ctx'> int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,</div><div class='ctx'> 			      u64 dst);</div><div class='ctx'> int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid);</div><div class='ctx'> int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid);</div><div class='add'>+int btrfs_qgroup_cleanup_dropped_subvolume(struct btrfs_fs_info *fs_info, u64 subvolid);</div><div class='ctx'> int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid,</div><div class='ctx'> 		       struct btrfs_qgroup_limit *limit);</div><div class='ctx'> int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info);</div><div class='del'>-struct btrfs_delayed_extent_op;</div><div class='ctx'> </div><div class='ctx'> int btrfs_qgroup_trace_extent_nolock(</div><div class='ctx'> 		struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		struct btrfs_delayed_ref_root *delayed_refs,</div><div class='del'>-		struct btrfs_qgroup_extent_record *record);</div><div class='add'>+		struct btrfs_qgroup_extent_record *record,</div><div class='add'>+		u64 bytenr);</div><div class='ctx'> int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,</div><div class='del'>-				   struct btrfs_qgroup_extent_record *qrecord);</div><div class='add'>+				   struct btrfs_qgroup_extent_record *qrecord,</div><div class='add'>+				   u64 bytenr);</div><div class='ctx'> int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='ctx'> 			      u64 num_bytes);</div><div class='ctx'> int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -341,6 +370,9 @@ int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,</div><div class='ctx'> 				struct ulist *new_roots);</div><div class='ctx'> int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans);</div><div class='ctx'> int btrfs_run_qgroups(struct btrfs_trans_handle *trans);</div><div class='add'>+int btrfs_qgroup_check_inherit(struct btrfs_fs_info *fs_info,</div><div class='add'>+			       struct btrfs_qgroup_inherit *inherit,</div><div class='add'>+			       size_t size);</div><div class='ctx'> int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,</div><div class='ctx'> 			 u64 objectid, u64 inode_rootid,</div><div class='ctx'> 			 struct btrfs_qgroup_inherit *inherit);</div><div class='hunk'>@@ -349,7 +381,7 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       enum btrfs_qgroup_rsv_type type);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='del'>-int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,</div><div class='add'>+int btrfs_verify_qgroup_counts(const struct btrfs_fs_info *fs_info, u64 qgroupid,</div><div class='ctx'> 			       u64 rfer, u64 excl);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -410,8 +442,7 @@ void btrfs_qgroup_init_swapped_blocks(</div><div class='ctx'> 	struct btrfs_qgroup_swapped_blocks *swapped_blocks);</div><div class='ctx'> </div><div class='ctx'> void btrfs_qgroup_clean_swapped_blocks(struct btrfs_root *root);</div><div class='del'>-int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans,</div><div class='del'>-		struct btrfs_root *subvol_root,</div><div class='add'>+int btrfs_qgroup_add_swapped_blocks(struct btrfs_root *subvol_root,</div><div class='ctx'> 		struct btrfs_block_group *bg,</div><div class='ctx'> 		struct extent_buffer *subvol_parent, int subvol_slot,</div><div class='ctx'> 		struct extent_buffer *reloc_parent, int reloc_slot,</div><div class='hunk'>@@ -419,9 +450,8 @@ int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		struct btrfs_root *root, struct extent_buffer *eb);</div><div class='ctx'> void btrfs_qgroup_destroy_extent_records(struct btrfs_transaction *trans);</div><div class='del'>-bool btrfs_check_quota_leak(struct btrfs_fs_info *fs_info);</div><div class='del'>-void btrfs_free_squota_rsv(struct btrfs_fs_info *fs_info, u64 root, u64 rsv_bytes);</div><div class='add'>+bool btrfs_check_quota_leak(const struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_record_squota_delta(struct btrfs_fs_info *fs_info,</div><div class='del'>-			      struct btrfs_squota_delta *delta);</div><div class='add'>+			      const struct btrfs_squota_delta *delta);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c<br/>index 9589362acfbf..2987cb7c686e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid-stripe-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid-stripe-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid-stripe-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/raid-stripe-tree.c</a></div><div class='hunk'>@@ -11,14 +11,59 @@</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "raid-stripe-tree.h"</div><div class='ctx'> #include "volumes.h"</div><div class='del'>-#include "misc.h"</div><div class='ctx'> #include "print-tree.h"</div><div class='ctx'> </div><div class='add'>+static int btrfs_partially_delete_raid_extent(struct btrfs_trans_handle *trans,</div><div class='add'>+					       struct btrfs_path *path,</div><div class='add'>+					       const struct btrfs_key *oldkey,</div><div class='add'>+					       u64 newlen, u64 frontpad)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_root *stripe_root = trans-&gt;fs_info-&gt;stripe_root;</div><div class='add'>+	struct btrfs_stripe_extent *extent, AUTO_KFREE(newitem);</div><div class='add'>+	struct extent_buffer *leaf;</div><div class='add'>+	int slot;</div><div class='add'>+	size_t item_size;</div><div class='add'>+	struct btrfs_key newkey = {</div><div class='add'>+		.objectid = oldkey-&gt;objectid + frontpad,</div><div class='add'>+		.type = BTRFS_RAID_STRIPE_KEY,</div><div class='add'>+		.offset = newlen,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT(newlen &gt; 0);</div><div class='add'>+	ASSERT(oldkey-&gt;type == BTRFS_RAID_STRIPE_KEY);</div><div class='add'>+</div><div class='add'>+	leaf = path-&gt;nodes[0];</div><div class='add'>+	slot = path-&gt;slots[0];</div><div class='add'>+	item_size = btrfs_item_size(leaf, slot);</div><div class='add'>+</div><div class='add'>+	newitem = kzalloc(item_size, GFP_NOFS);</div><div class='add'>+	if (!newitem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	extent = btrfs_item_ptr(leaf, slot, struct btrfs_stripe_extent);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; btrfs_num_raid_stripes(item_size); i++) {</div><div class='add'>+		struct btrfs_raid_stride *stride = &amp;extent-&gt;strides[i];</div><div class='add'>+		u64 phys;</div><div class='add'>+</div><div class='add'>+		phys = btrfs_raid_stride_physical(leaf, stride) + frontpad;</div><div class='add'>+		btrfs_set_stack_raid_stride_physical(&amp;newitem-&gt;strides[i], phys);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_del_item(trans, stripe_root, path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	btrfs_release_path(path);</div><div class='add'>+	return btrfs_insert_item(trans, stripe_root, &amp;newkey, newitem, item_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 length)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *stripe_root = fs_info-&gt;stripe_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	u64 found_start;</div><div class='hunk'>@@ -27,9 +72,22 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!stripe_root)</div><div class='add'>+	if (!btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE) || !stripe_root)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (!btrfs_is_testing(fs_info)) {</div><div class='add'>+		struct btrfs_chunk_map *map;</div><div class='add'>+		bool use_rst;</div><div class='add'>+</div><div class='add'>+		map = btrfs_find_chunk_map(fs_info, start, length);</div><div class='add'>+		if (!map)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		use_rst = btrfs_need_stripe_tree_update(fs_info, map-&gt;type);</div><div class='add'>+		btrfs_free_chunk_map(map);</div><div class='add'>+		if (!use_rst)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -37,23 +95,55 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		key.objectid = start;</div><div class='ctx'> 		key.type = BTRFS_RAID_STRIPE_KEY;</div><div class='del'>-		key.offset = length;</div><div class='add'>+		key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_search_slot(trans, stripe_root, &amp;key, path, -1, 1);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		if (ret &gt; 0) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			if (path-&gt;slots[0] == 0)</div><div class='del'>-				break;</div><div class='add'>+</div><div class='add'>+		if (path-&gt;slots[0] == btrfs_header_nritems(path-&gt;nodes[0]))</div><div class='ctx'> 			path-&gt;slots[0]--;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		slot = path-&gt;slots[0];</div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;key, slot);</div><div class='ctx'> 		found_start = key.objectid;</div><div class='ctx'> 		found_end = found_start + key.offset;</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The stripe extent starts before the range we want to delete,</div><div class='add'>+		 * but the range spans more than one stripe extent:</div><div class='add'>+		 *</div><div class='add'>+		 * |--- RAID Stripe Extent ---||--- RAID Stripe Extent ---|</div><div class='add'>+		 *        |--- keep  ---|--- drop ---|</div><div class='add'>+		 *</div><div class='add'>+		 * This means we have to get the previous item, truncate its</div><div class='add'>+		 * length and then restart the search.</div><div class='add'>+		 */</div><div class='add'>+		if (found_start &gt; start) {</div><div class='add'>+			if (slot == 0) {</div><div class='add'>+				ret = btrfs_previous_item(stripe_root, path, start,</div><div class='add'>+							  BTRFS_RAID_STRIPE_KEY);</div><div class='add'>+				if (ret) {</div><div class='add'>+					if (ret &gt; 0)</div><div class='add'>+						ret = -ENOENT;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				path-&gt;slots[0]--;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			leaf = path-&gt;nodes[0];</div><div class='add'>+			slot = path-&gt;slots[0];</div><div class='add'>+			btrfs_item_key_to_cpu(leaf, &amp;key, slot);</div><div class='add'>+			found_start = key.objectid;</div><div class='add'>+			found_end = found_start + key.offset;</div><div class='add'>+			ASSERT(found_start &lt;= start);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key.type != BTRFS_RAID_STRIPE_KEY)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		/* That stripe ends before we start, we're done. */</div><div class='ctx'> 		if (found_end &lt;= start)</div><div class='hunk'>@@ -62,32 +152,155 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le</div><div class='ctx'> 		trace_btrfs_raid_extent_delete(fs_info, start, end,</div><div class='ctx'> 					       found_start, found_end);</div><div class='ctx'> </div><div class='del'>-		ASSERT(found_start &gt;= start &amp;&amp; found_end &lt;= end);</div><div class='add'>+		/*</div><div class='add'>+		 * The stripe extent starts before the range we want to delete</div><div class='add'>+		 * and ends after the range we want to delete, i.e. we're</div><div class='add'>+		 * punching a hole in the stripe extent:</div><div class='add'>+		 *</div><div class='add'>+		 *  |--- RAID Stripe Extent ---|</div><div class='add'>+		 *  | keep |--- drop ---| keep |</div><div class='add'>+		 *</div><div class='add'>+		 * This means we need to a) truncate the existing item and b)</div><div class='add'>+		 * create a second item for the remaining range.</div><div class='add'>+		 */</div><div class='add'>+		if (found_start &lt; start &amp;&amp; found_end &gt; end) {</div><div class='add'>+			size_t item_size;</div><div class='add'>+			u64 diff_start = start - found_start;</div><div class='add'>+			u64 diff_end = found_end - end;</div><div class='add'>+			struct btrfs_stripe_extent *extent;</div><div class='add'>+			struct btrfs_key newkey = {</div><div class='add'>+				.objectid = end,</div><div class='add'>+				.type = BTRFS_RAID_STRIPE_KEY,</div><div class='add'>+				.offset = diff_end,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* The "right" item. */</div><div class='add'>+			ret = btrfs_duplicate_item(trans, stripe_root, path, &amp;newkey);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			item_size = btrfs_item_size(leaf, path-&gt;slots[0]);</div><div class='add'>+			extent = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='add'>+						struct btrfs_stripe_extent);</div><div class='add'>+</div><div class='add'>+			for (int i = 0; i &lt; btrfs_num_raid_stripes(item_size); i++) {</div><div class='add'>+				struct btrfs_raid_stride *stride = &amp;extent-&gt;strides[i];</div><div class='add'>+				u64 phys;</div><div class='add'>+</div><div class='add'>+				phys = btrfs_raid_stride_physical(leaf, stride);</div><div class='add'>+				phys += diff_start + length;</div><div class='add'>+				btrfs_set_raid_stride_physical(leaf, stride, phys);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* The "left" item. */</div><div class='add'>+			path-&gt;slots[0]--;</div><div class='add'>+			btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='add'>+			btrfs_partially_delete_raid_extent(trans, path, &amp;key,</div><div class='add'>+							   diff_start, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The stripe extent starts before the range we want to delete:</div><div class='add'>+		 *</div><div class='add'>+		 * |--- RAID Stripe Extent ---|</div><div class='add'>+		 * |--- keep  ---|--- drop ---|</div><div class='add'>+		 *</div><div class='add'>+		 * This means we have to duplicate the tree item, truncate the</div><div class='add'>+		 * length to the new size and then re-insert the item.</div><div class='add'>+		 */</div><div class='add'>+		if (found_start &lt; start) {</div><div class='add'>+			u64 diff_start = start - found_start;</div><div class='add'>+</div><div class='add'>+			btrfs_partially_delete_raid_extent(trans, path, &amp;key,</div><div class='add'>+							   diff_start, 0);</div><div class='add'>+</div><div class='add'>+			start += (key.offset - diff_start);</div><div class='add'>+			length -= (key.offset - diff_start);</div><div class='add'>+			if (length == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			btrfs_release_path(path);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The stripe extent ends after the range we want to delete:</div><div class='add'>+		 *</div><div class='add'>+		 * |--- RAID Stripe Extent ---|</div><div class='add'>+		 * |--- drop  ---|--- keep ---|</div><div class='add'>+		 *</div><div class='add'>+		 * This means we have to duplicate the tree item, truncate the</div><div class='add'>+		 * length to the new size and then re-insert the item.</div><div class='add'>+		 */</div><div class='add'>+		if (found_end &gt; end) {</div><div class='add'>+			u64 diff_end = found_end - end;</div><div class='add'>+</div><div class='add'>+			btrfs_partially_delete_raid_extent(trans, path, &amp;key,</div><div class='add'>+							   key.offset - length,</div><div class='add'>+							   length);</div><div class='add'>+			ASSERT(key.offset - diff_end == length);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Finally we can delete the whole item, no more special cases. */</div><div class='ctx'> 		ret = btrfs_del_item(trans, stripe_root, path);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		start += key.offset;</div><div class='add'>+		length -= key.offset;</div><div class='add'>+		if (length == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,</div><div class='del'>-					struct btrfs_io_context *bioc)</div><div class='add'>+static int update_raid_extent_item(struct btrfs_trans_handle *trans,</div><div class='add'>+				   struct btrfs_key *key,</div><div class='add'>+				   struct btrfs_stripe_extent *stripe_extent,</div><div class='add'>+				   const size_t item_size)</div><div class='add'>+{</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='add'>+	struct extent_buffer *leaf;</div><div class='add'>+	int ret;</div><div class='add'>+	int slot;</div><div class='add'>+</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_search_slot(trans, trans-&gt;fs_info-&gt;stripe_root, key, path,</div><div class='add'>+				0, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return (ret == 1 ? ret : -EINVAL);</div><div class='add'>+</div><div class='add'>+	leaf = path-&gt;nodes[0];</div><div class='add'>+	slot = path-&gt;slots[0];</div><div class='add'>+</div><div class='add'>+	write_extent_buffer(leaf, stripe_extent, btrfs_item_ptr_offset(leaf, slot),</div><div class='add'>+			    item_size);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_FOR_TESTS</div><div class='add'>+int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,</div><div class='add'>+				 struct btrfs_io_context *bioc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key stripe_key;</div><div class='ctx'> 	struct btrfs_root *stripe_root = fs_info-&gt;stripe_root;</div><div class='ctx'> 	const int num_stripes = btrfs_bg_type_to_factor(bioc-&gt;map_type);</div><div class='del'>-	u8 encoding = btrfs_bg_flags_to_raid_index(bioc-&gt;map_type);</div><div class='del'>-	struct btrfs_stripe_extent *stripe_extent;</div><div class='add'>+	struct btrfs_stripe_extent AUTO_KFREE(stripe_extent);</div><div class='ctx'> 	const size_t item_size = struct_size(stripe_extent, strides, num_stripes);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	stripe_extent = kzalloc(item_size, GFP_NOFS);</div><div class='del'>-	if (!stripe_extent) {</div><div class='add'>+	if (!unlikely(stripe_extent)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, -ENOMEM);</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -95,16 +308,11 @@ static int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_insert_one_raid_extent(fs_info, bioc-&gt;logical, bioc-&gt;size,</div><div class='ctx'> 					   num_stripes);</div><div class='del'>-	btrfs_set_stack_stripe_extent_encoding(stripe_extent, encoding);</div><div class='ctx'> 	for (int i = 0; i &lt; num_stripes; i++) {</div><div class='ctx'> 		u64 devid = bioc-&gt;stripes[i].dev-&gt;devid;</div><div class='ctx'> 		u64 physical = bioc-&gt;stripes[i].physical;</div><div class='del'>-		u64 length = bioc-&gt;stripes[i].length;</div><div class='ctx'> 		struct btrfs_raid_stride *raid_stride = &amp;stripe_extent-&gt;strides[i];</div><div class='ctx'> </div><div class='del'>-		if (length == 0)</div><div class='del'>-			length = bioc-&gt;size;</div><div class='del'>-</div><div class='ctx'> 		btrfs_set_stack_raid_stride_devid(raid_stride, devid);</div><div class='ctx'> 		btrfs_set_stack_raid_stride_physical(raid_stride, physical);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -115,10 +323,14 @@ static int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_item(trans, stripe_root, &amp;stripe_key, stripe_extent,</div><div class='ctx'> 				item_size);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret == -EEXIST) {</div><div class='add'>+		ret = update_raid_extent_item(trans, &amp;stripe_key, stripe_extent,</div><div class='add'>+					      item_size);</div><div class='add'>+		if (ret)</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+	} else if (ret) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-</div><div class='del'>-	kfree(stripe_extent);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -156,11 +368,10 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct btrfs_stripe_extent *stripe_extent;</div><div class='ctx'> 	struct btrfs_key stripe_key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	const u64 end = logical + *length;</div><div class='ctx'> 	int num_stripes;</div><div class='del'>-	u8 encoding;</div><div class='ctx'> 	u64 offset;</div><div class='ctx'> 	u64 found_logical;</div><div class='ctx'> 	u64 found_length;</div><div class='hunk'>@@ -176,14 +387,14 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (stripe-&gt;is_scrub) {</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='add'>+	if (stripe-&gt;rst_search_commit_root) {</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='add'>+		path-&gt;search_commit_root = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, stripe_root, &amp;stripe_key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto free_path;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (path-&gt;slots[0] != 0)</div><div class='ctx'> 			path-&gt;slots[0]--;</div><div class='hunk'>@@ -199,7 +410,7 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		found_end = found_logical + found_length;</div><div class='ctx'> </div><div class='ctx'> 		if (found_logical &gt; end) {</div><div class='del'>-			ret = -ENOENT;</div><div class='add'>+			ret = -ENODATA;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -223,16 +434,6 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	num_stripes = btrfs_num_raid_stripes(btrfs_item_size(leaf, slot));</div><div class='ctx'> 	stripe_extent = btrfs_item_ptr(leaf, slot, struct btrfs_stripe_extent);</div><div class='del'>-	encoding = btrfs_stripe_extent_encoding(leaf, stripe_extent);</div><div class='del'>-</div><div class='del'>-	if (encoding != btrfs_bg_flags_to_raid_index(map_type)) {</div><div class='del'>-		ret = -EUCLEAN;</div><div class='del'>-		btrfs_handle_fs_error(fs_info, ret,</div><div class='del'>-				      "on-disk stripe encoding %d doesn't match RAID index %d",</div><div class='del'>-				      encoding,</div><div class='del'>-				      btrfs_bg_flags_to_raid_index(map_type));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for (int i = 0; i &lt; num_stripes; i++) {</div><div class='ctx'> 		struct btrfs_raid_stride *stride = &amp;stripe_extent-&gt;strides[i];</div><div class='hunk'>@@ -250,25 +451,20 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		trace_btrfs_get_raid_extent_offset(fs_info, logical, *length,</div><div class='ctx'> 						   stripe-&gt;physical, devid);</div><div class='ctx'> </div><div class='del'>-		ret = 0;</div><div class='del'>-		goto free_path;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If we're here, we haven't found the requested devid in the stripe. */</div><div class='del'>-	ret = -ENOENT;</div><div class='add'>+	ret = -ENODATA;</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-	if (ret &amp;&amp; ret != -EIO &amp;&amp; !stripe-&gt;is_scrub) {</div><div class='del'>-		if (IS_ENABLED(CONFIG_BTRFS_DEBUG))</div><div class='del'>-			btrfs_print_tree(leaf, 1);</div><div class='del'>-		btrfs_err(fs_info,</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+	if (ret &amp;&amp; ret != -EIO &amp;&amp; !stripe-&gt;rst_search_commit_root) {</div><div class='add'>+		btrfs_debug(fs_info,</div><div class='ctx'> 		"cannot find raid-stripe for logical [%llu, %llu] devid %llu, profile %s",</div><div class='ctx'> 			  logical, logical + *length, stripe-&gt;dev-&gt;devid,</div><div class='ctx'> 			  btrfs_bg_type_to_raid_name(map_type));</div><div class='ctx'> 	}</div><div class='del'>-free_path:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/raid-stripe-tree.h b/fs/btrfs/raid-stripe-tree.h<br/>index cdb58b38fcb5..69942ad43140 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid-stripe-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid-stripe-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid-stripe-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/raid-stripe-tree.h</a></div><div class='hunk'>@@ -6,6 +6,11 @@</div><div class='ctx'> #ifndef BTRFS_RAID_STRIPE_TREE_H</div><div class='ctx'> #define BTRFS_RAID_STRIPE_TREE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "accessors.h"</div><div class='add'>+</div><div class='ctx'> #define BTRFS_RST_SUPP_BLOCK_GROUP_MASK    (BTRFS_BLOCK_GROUP_DUP |		\</div><div class='ctx'> 					    BTRFS_BLOCK_GROUP_RAID1_MASK |	\</div><div class='ctx'> 					    BTRFS_BLOCK_GROUP_RAID0 |		\</div><div class='hunk'>@@ -13,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> struct btrfs_io_context;</div><div class='ctx'> struct btrfs_io_stripe;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> struct btrfs_ordered_extent;</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +29,11 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info,</div><div class='ctx'> int btrfs_insert_raid_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     struct btrfs_ordered_extent *ordered_extent);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='add'>+int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,</div><div class='add'>+				 struct btrfs_io_context *bioc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline bool btrfs_need_stripe_tree_update(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 						 u64 map_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,8 +54,7 @@ static inline bool btrfs_need_stripe_tree_update(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static inline int btrfs_num_raid_stripes(u32 item_size)</div><div class='ctx'> {</div><div class='del'>-	return (item_size - offsetof(struct btrfs_stripe_extent, strides)) /</div><div class='del'>-		sizeof(struct btrfs_raid_stride);</div><div class='add'>+	return item_size / sizeof(struct btrfs_raid_stride);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c<br/>index 792c8e17c31d..f38d8305e46d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid56.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid56.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid56.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/raid56.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/raid/xor.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "volumes.h"</div><div class='hunk'>@@ -41,6 +40,85 @@</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_STRIPE_HASH_TABLE_BITS				11</div><div class='ctx'> </div><div class='add'>+static void dump_bioc(const struct btrfs_fs_info *fs_info, const struct btrfs_io_context *bioc)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!bioc)) {</div><div class='add'>+		btrfs_crit(fs_info, "bioc=NULL");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	btrfs_crit(fs_info,</div><div class='add'>+"bioc logical=%llu full_stripe=%llu size=%llu map_type=0x%llx mirror=%u replace_nr_stripes=%u replace_stripe_src=%d num_stripes=%u",</div><div class='add'>+		bioc-&gt;logical, bioc-&gt;full_stripe_logical, bioc-&gt;size,</div><div class='add'>+		bioc-&gt;map_type, bioc-&gt;mirror_num, bioc-&gt;replace_nr_stripes,</div><div class='add'>+		bioc-&gt;replace_stripe_src, bioc-&gt;num_stripes);</div><div class='add'>+	for (int i = 0; i &lt; bioc-&gt;num_stripes; i++) {</div><div class='add'>+		btrfs_crit(fs_info, "    nr=%d devid=%llu physical=%llu",</div><div class='add'>+			   i, bioc-&gt;stripes[i].dev-&gt;devid,</div><div class='add'>+			   bioc-&gt;stripes[i].physical);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btrfs_dump_rbio(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			    const struct btrfs_raid_bio *rbio)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BTRFS_ASSERT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dump_bioc(fs_info, rbio-&gt;bioc);</div><div class='add'>+	btrfs_crit(fs_info,</div><div class='add'>+"rbio flags=0x%lx nr_sectors=%u nr_data=%u real_stripes=%u stripe_nsectors=%u sector_nsteps=%u scrubp=%u dbitmap=0x%lx",</div><div class='add'>+		rbio-&gt;flags, rbio-&gt;nr_sectors, rbio-&gt;nr_data,</div><div class='add'>+		rbio-&gt;real_stripes, rbio-&gt;stripe_nsectors,</div><div class='add'>+		rbio-&gt;sector_nsteps, rbio-&gt;scrubp, rbio-&gt;dbitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ASSERT_RBIO(expr, rbio)						\</div><div class='add'>+({									\</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_ASSERT) &amp;&amp; unlikely(!(expr))) {	\</div><div class='add'>+		const struct btrfs_fs_info *__fs_info = (rbio)-&gt;bioc ?	\</div><div class='add'>+					(rbio)-&gt;bioc-&gt;fs_info : NULL;	\</div><div class='add'>+									\</div><div class='add'>+		btrfs_dump_rbio(__fs_info, (rbio));			\</div><div class='add'>+	}								\</div><div class='add'>+	ASSERT((expr));							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define ASSERT_RBIO_STRIPE(expr, rbio, stripe_nr)			\</div><div class='add'>+({									\</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_ASSERT) &amp;&amp; unlikely(!(expr))) {	\</div><div class='add'>+		const struct btrfs_fs_info *__fs_info = (rbio)-&gt;bioc ?	\</div><div class='add'>+					(rbio)-&gt;bioc-&gt;fs_info : NULL;	\</div><div class='add'>+									\</div><div class='add'>+		btrfs_dump_rbio(__fs_info, (rbio));			\</div><div class='add'>+		btrfs_crit(__fs_info, "stripe_nr=%d", (stripe_nr));	\</div><div class='add'>+	}								\</div><div class='add'>+	ASSERT((expr));							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define ASSERT_RBIO_SECTOR(expr, rbio, sector_nr)			\</div><div class='add'>+({									\</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_ASSERT) &amp;&amp; unlikely(!(expr))) {	\</div><div class='add'>+		const struct btrfs_fs_info *__fs_info = (rbio)-&gt;bioc ?	\</div><div class='add'>+					(rbio)-&gt;bioc-&gt;fs_info : NULL;	\</div><div class='add'>+									\</div><div class='add'>+		btrfs_dump_rbio(__fs_info, (rbio));			\</div><div class='add'>+		btrfs_crit(__fs_info, "sector_nr=%d", (sector_nr));	\</div><div class='add'>+	}								\</div><div class='add'>+	ASSERT((expr));							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define ASSERT_RBIO_LOGICAL(expr, rbio, logical)			\</div><div class='add'>+({									\</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_ASSERT) &amp;&amp; unlikely(!(expr))) {	\</div><div class='add'>+		const struct btrfs_fs_info *__fs_info = (rbio)-&gt;bioc ?	\</div><div class='add'>+					(rbio)-&gt;bioc-&gt;fs_info : NULL;	\</div><div class='add'>+									\</div><div class='add'>+		btrfs_dump_rbio(__fs_info, (rbio));			\</div><div class='add'>+		btrfs_crit(__fs_info, "logical=%llu", (logical));		\</div><div class='add'>+	}								\</div><div class='add'>+	ASSERT((expr));							\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> /* Used by the raid56 code to lock stripes for read/modify/write */</div><div class='ctx'> struct btrfs_stripe_hash {</div><div class='ctx'> 	struct list_head hash_list;</div><div class='hunk'>@@ -56,15 +134,10 @@ struct btrfs_stripe_hash_table {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * A bvec like structure to present a sector inside a page.</div><div class='del'>- *</div><div class='del'>- * Unlike bvec we don't need bvlen, as it's fixed to sectorsize.</div><div class='add'>+ * The PFN may still be valid, but our paddrs should always be block size</div><div class='add'>+ * aligned, thus such -1 paddr is definitely not a valid one.</div><div class='ctx'>  */</div><div class='del'>-struct sector_ptr {</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned int pgoff:24;</div><div class='del'>-	unsigned int uptodate:8;</div><div class='del'>-};</div><div class='add'>+#define INVALID_PADDR	(~(phys_addr_t)0)</div><div class='ctx'> </div><div class='ctx'> static void rmw_rbio_work(struct work_struct *work);</div><div class='ctx'> static void rmw_rbio_work_locked(struct work_struct *work);</div><div class='hunk'>@@ -78,8 +151,8 @@ static void free_raid_bio_pointers(struct btrfs_raid_bio *rbio)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_free(rbio-&gt;error_bitmap);</div><div class='ctx'> 	kfree(rbio-&gt;stripe_pages);</div><div class='del'>-	kfree(rbio-&gt;bio_sectors);</div><div class='del'>-	kfree(rbio-&gt;stripe_sectors);</div><div class='add'>+	kfree(rbio-&gt;bio_paddrs);</div><div class='add'>+	kfree(rbio-&gt;stripe_paddrs);</div><div class='ctx'> 	kfree(rbio-&gt;finish_pointers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -122,8 +195,7 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info)</div><div class='ctx'> 	struct btrfs_stripe_hash_table *x;</div><div class='ctx'> 	struct btrfs_stripe_hash *cur;</div><div class='ctx'> 	struct btrfs_stripe_hash *h;</div><div class='del'>-	int num_entries = 1 &lt;&lt; BTRFS_STRIPE_HASH_TABLE_BITS;</div><div class='del'>-	int i;</div><div class='add'>+	unsigned int num_entries = 1U &lt;&lt; BTRFS_STRIPE_HASH_TABLE_BITS;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;stripe_hash_table)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -144,7 +216,7 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info)</div><div class='ctx'> </div><div class='ctx'> 	h = table-&gt;table;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_entries; i++) {</div><div class='add'>+	for (unsigned int i = 0; i &lt; num_entries; i++) {</div><div class='ctx'> 		cur = h + i;</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cur-&gt;hash_list);</div><div class='ctx'> 		spin_lock_init(&amp;cur-&gt;lock);</div><div class='hunk'>@@ -155,6 +227,24 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void memcpy_from_bio_to_stripe(struct btrfs_raid_bio *rbio, unsigned int sector_nr)</div><div class='add'>+{</div><div class='add'>+	const u32 step = min(rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	ASSERT(sector_nr &lt; rbio-&gt;nr_sectors);</div><div class='add'>+	for (int i = 0; i &lt; rbio-&gt;sector_nsteps; i++) {</div><div class='add'>+		unsigned int index = sector_nr * rbio-&gt;sector_nsteps + i;</div><div class='add'>+		phys_addr_t dst = rbio-&gt;stripe_paddrs[index];</div><div class='add'>+		phys_addr_t src = rbio-&gt;bio_paddrs[index];</div><div class='add'>+</div><div class='add'>+		ASSERT(dst != INVALID_PADDR);</div><div class='add'>+		ASSERT(src != INVALID_PADDR);</div><div class='add'>+</div><div class='add'>+		memcpy_page(phys_to_page(dst), offset_in_page(dst),</div><div class='add'>+			    phys_to_page(src), offset_in_page(src), step);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * caching an rbio means to copy anything from the</div><div class='ctx'>  * bio_sectors array into the stripe_pages array.  We</div><div class='hunk'>@@ -175,24 +265,19 @@ static void cache_rbio_pages(struct btrfs_raid_bio *rbio)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rbio-&gt;nr_sectors; i++) {</div><div class='ctx'> 		/* Some range not covered by bio (partial write), skip it */</div><div class='del'>-		if (!rbio-&gt;bio_sectors[i].page) {</div><div class='add'>+		if (rbio-&gt;bio_paddrs[i * rbio-&gt;sector_nsteps] == INVALID_PADDR) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Even if the sector is not covered by bio, if it is</div><div class='ctx'> 			 * a data sector it should still be uptodate as it is</div><div class='ctx'> 			 * read from disk.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (i &lt; rbio-&gt;nr_data * rbio-&gt;stripe_nsectors)</div><div class='del'>-				ASSERT(rbio-&gt;stripe_sectors[i].uptodate);</div><div class='add'>+				ASSERT(test_bit(i, rbio-&gt;stripe_uptodate_bitmap));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ASSERT(rbio-&gt;stripe_sectors[i].page);</div><div class='del'>-		memcpy_page(rbio-&gt;stripe_sectors[i].page,</div><div class='del'>-			    rbio-&gt;stripe_sectors[i].pgoff,</div><div class='del'>-			    rbio-&gt;bio_sectors[i].page,</div><div class='del'>-			    rbio-&gt;bio_sectors[i].pgoff,</div><div class='del'>-			    rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize);</div><div class='del'>-		rbio-&gt;stripe_sectors[i].uptodate = 1;</div><div class='add'>+		memcpy_from_bio_to_stripe(rbio, i);</div><div class='add'>+		set_bit(i, rbio-&gt;stripe_uptodate_bitmap);</div><div class='ctx'> 	}</div><div class='ctx'> 	set_bit(RBIO_CACHE_READY_BIT, &amp;rbio-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -215,19 +300,48 @@ static int rbio_bucket(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	return hash_64(num &gt;&gt; 16, BTRFS_STRIPE_HASH_TABLE_BITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool full_page_sectors_uptodate(struct btrfs_raid_bio *rbio,</div><div class='del'>-				       unsigned int page_nr)</div><div class='add'>+/* Get the sector number of the first sector covered by @page_nr. */</div><div class='add'>+static u32 page_nr_to_sector_nr(struct btrfs_raid_bio *rbio, unsigned int page_nr)</div><div class='ctx'> {</div><div class='del'>-	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	const u32 sectors_per_page = PAGE_SIZE / sectorsize;</div><div class='add'>+	u32 sector_nr;</div><div class='add'>+</div><div class='add'>+	ASSERT(page_nr &lt; rbio-&gt;nr_pages);</div><div class='add'>+</div><div class='add'>+	sector_nr = (page_nr &lt;&lt; PAGE_SHIFT) &gt;&gt; rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize_bits;</div><div class='add'>+	ASSERT(sector_nr &lt; rbio-&gt;nr_sectors);</div><div class='add'>+	return sector_nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the number of sectors covered by @page_nr.</div><div class='add'>+ *</div><div class='add'>+ * For bs &gt; ps cases, the result will always be 1.</div><div class='add'>+ * For bs &lt;= ps cases, the result will be ps / bs.</div><div class='add'>+ */</div><div class='add'>+static u32 page_nr_to_num_sectors(struct btrfs_raid_bio *rbio, unsigned int page_nr)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = rbio-&gt;bioc-&gt;fs_info;</div><div class='add'>+	u32 nr_sectors;</div><div class='add'>+</div><div class='add'>+	ASSERT(page_nr &lt; rbio-&gt;nr_pages);</div><div class='add'>+</div><div class='add'>+	nr_sectors = round_up(PAGE_SIZE, fs_info-&gt;sectorsize) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	ASSERT(nr_sectors &gt; 0);</div><div class='add'>+	return nr_sectors;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused bool full_page_sectors_uptodate(struct btrfs_raid_bio *rbio,</div><div class='add'>+						      unsigned int page_nr)</div><div class='add'>+{</div><div class='add'>+	const u32 sector_nr = page_nr_to_sector_nr(rbio, page_nr);</div><div class='add'>+	const u32 nr_bits = page_nr_to_num_sectors(rbio, page_nr);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(page_nr &lt; rbio-&gt;nr_pages);</div><div class='add'>+	ASSERT(sector_nr + nr_bits &lt; rbio-&gt;nr_sectors);</div><div class='ctx'> </div><div class='del'>-	for (i = sectors_per_page * page_nr;</div><div class='del'>-	     i &lt; sectors_per_page * page_nr + sectors_per_page;</div><div class='del'>-	     i++) {</div><div class='del'>-		if (!rbio-&gt;stripe_sectors[i].uptodate)</div><div class='add'>+	for (i = sector_nr; i &lt; sector_nr + nr_bits; i++) {</div><div class='add'>+		if (!test_bit(i, rbio-&gt;stripe_uptodate_bitmap))</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -240,41 +354,44 @@ static bool full_page_sectors_uptodate(struct btrfs_raid_bio *rbio,</div><div class='ctx'>  */</div><div class='ctx'> static void index_stripe_sectors(struct btrfs_raid_bio *rbio)</div><div class='ctx'> {</div><div class='del'>-	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='ctx'> 	u32 offset;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, offset = 0; i &lt; rbio-&gt;nr_sectors; i++, offset += sectorsize) {</div><div class='add'>+	for (i = 0, offset = 0; i &lt; rbio-&gt;nr_sectors * rbio-&gt;sector_nsteps;</div><div class='add'>+	     i++, offset += step) {</div><div class='ctx'> 		int page_index = offset &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		ASSERT(page_index &lt; rbio-&gt;nr_pages);</div><div class='del'>-		rbio-&gt;stripe_sectors[i].page = rbio-&gt;stripe_pages[page_index];</div><div class='del'>-		rbio-&gt;stripe_sectors[i].pgoff = offset_in_page(offset);</div><div class='add'>+		if (!rbio-&gt;stripe_pages[page_index])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rbio-&gt;stripe_paddrs[i] = page_to_phys(rbio-&gt;stripe_pages[page_index]) +</div><div class='add'>+					 offset_in_page(offset);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void steal_rbio_page(struct btrfs_raid_bio *src,</div><div class='ctx'> 			    struct btrfs_raid_bio *dest, int page_nr)</div><div class='ctx'> {</div><div class='del'>-	const u32 sectorsize = src-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	const u32 sectors_per_page = PAGE_SIZE / sectorsize;</div><div class='del'>-	int i;</div><div class='add'>+	const u32 sector_nr = page_nr_to_sector_nr(src, page_nr);</div><div class='add'>+	const u32 nr_bits = page_nr_to_num_sectors(src, page_nr);</div><div class='add'>+</div><div class='add'>+	ASSERT(page_nr &lt; src-&gt;nr_pages);</div><div class='add'>+	ASSERT(sector_nr + nr_bits &lt; src-&gt;nr_sectors);</div><div class='ctx'> </div><div class='ctx'> 	if (dest-&gt;stripe_pages[page_nr])</div><div class='ctx'> 		__free_page(dest-&gt;stripe_pages[page_nr]);</div><div class='ctx'> 	dest-&gt;stripe_pages[page_nr] = src-&gt;stripe_pages[page_nr];</div><div class='ctx'> 	src-&gt;stripe_pages[page_nr] = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Also update the sector-&gt;uptodate bits. */</div><div class='del'>-	for (i = sectors_per_page * page_nr;</div><div class='del'>-	     i &lt; sectors_per_page * page_nr + sectors_per_page; i++)</div><div class='del'>-		dest-&gt;stripe_sectors[i].uptodate = true;</div><div class='add'>+	/* Also update the stripe_uptodate_bitmap bits. */</div><div class='add'>+	bitmap_set(dest-&gt;stripe_uptodate_bitmap, sector_nr, nr_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool is_data_stripe_page(struct btrfs_raid_bio *rbio, int page_nr)</div><div class='ctx'> {</div><div class='del'>-	const int sector_nr = (page_nr &lt;&lt; PAGE_SHIFT) &gt;&gt;</div><div class='del'>-			      rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize_bits;</div><div class='add'>+	const int sector_nr = page_nr_to_sector_nr(rbio, page_nr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have ensured PAGE_SIZE is aligned with sectorsize, thus</div><div class='hunk'>@@ -332,12 +449,11 @@ static void steal_rbio(struct btrfs_raid_bio *src, struct btrfs_raid_bio *dest)</div><div class='ctx'> static void merge_rbio(struct btrfs_raid_bio *dest,</div><div class='ctx'> 		       struct btrfs_raid_bio *victim)</div><div class='ctx'> {</div><div class='del'>-	bio_list_merge(&amp;dest-&gt;bio_list, &amp;victim-&gt;bio_list);</div><div class='add'>+	bio_list_merge_init(&amp;dest-&gt;bio_list, &amp;victim-&gt;bio_list);</div><div class='ctx'> 	dest-&gt;bio_list_bytes += victim-&gt;bio_list_bytes;</div><div class='ctx'> 	/* Also inherit the bitmaps from @victim. */</div><div class='ctx'> 	bitmap_or(&amp;dest-&gt;dbitmap, &amp;victim-&gt;dbitmap, &amp;dest-&gt;dbitmap,</div><div class='ctx'> 		  dest-&gt;stripe_nsectors);</div><div class='del'>-	bio_list_init(&amp;victim-&gt;bio_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -430,9 +546,8 @@ static void btrfs_clear_rbio_cache(struct btrfs_fs_info *info)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;table-&gt;cache_lock);</div><div class='ctx'> 	while (!list_empty(&amp;table-&gt;stripe_cache)) {</div><div class='del'>-		rbio = list_entry(table-&gt;stripe_cache.next,</div><div class='del'>-				  struct btrfs_raid_bio,</div><div class='del'>-				  stripe_cache);</div><div class='add'>+		rbio = list_first_entry(&amp;table-&gt;stripe_cache,</div><div class='add'>+					struct btrfs_raid_bio, stripe_cache);</div><div class='ctx'> 		__remove_rbio_from_cache(rbio);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;table-&gt;cache_lock);</div><div class='hunk'>@@ -490,9 +605,9 @@ static void cache_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	if (table-&gt;cache_size &gt; RBIO_CACHE_SIZE) {</div><div class='ctx'> 		struct btrfs_raid_bio *found;</div><div class='ctx'> </div><div class='del'>-		found = list_entry(table-&gt;stripe_cache.prev,</div><div class='del'>-				  struct btrfs_raid_bio,</div><div class='del'>-				  stripe_cache);</div><div class='add'>+		found = list_last_entry(&amp;table-&gt;stripe_cache,</div><div class='add'>+					struct btrfs_raid_bio,</div><div class='add'>+					stripe_cache);</div><div class='ctx'> </div><div class='ctx'> 		if (found != rbio)</div><div class='ctx'> 			__remove_rbio_from_cache(found);</div><div class='hunk'>@@ -590,39 +705,62 @@ static int rbio_can_merge(struct btrfs_raid_bio *last,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int rbio_stripe_sector_index(const struct btrfs_raid_bio *rbio,</div><div class='del'>-					     unsigned int stripe_nr,</div><div class='del'>-					     unsigned int sector_nr)</div><div class='add'>+/* Return the sector index for @stripe_nr and @sector_nr. */</div><div class='add'>+static unsigned int rbio_sector_index(const struct btrfs_raid_bio *rbio,</div><div class='add'>+				      unsigned int stripe_nr,</div><div class='add'>+				      unsigned int sector_nr)</div><div class='ctx'> {</div><div class='del'>-	ASSERT(stripe_nr &lt; rbio-&gt;real_stripes);</div><div class='del'>-	ASSERT(sector_nr &lt; rbio-&gt;stripe_nsectors);</div><div class='add'>+	unsigned int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_RBIO_STRIPE(stripe_nr &lt; rbio-&gt;real_stripes, rbio, stripe_nr);</div><div class='add'>+	ASSERT_RBIO_SECTOR(sector_nr &lt; rbio-&gt;stripe_nsectors, rbio, sector_nr);</div><div class='ctx'> </div><div class='del'>-	return stripe_nr * rbio-&gt;stripe_nsectors + sector_nr;</div><div class='add'>+	ret = stripe_nr * rbio-&gt;stripe_nsectors + sector_nr;</div><div class='add'>+	ASSERT(ret &lt; rbio-&gt;nr_sectors);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return a sector from rbio-&gt;stripe_sectors, not from the bio list */</div><div class='del'>-static struct sector_ptr *rbio_stripe_sector(const struct btrfs_raid_bio *rbio,</div><div class='del'>-					     unsigned int stripe_nr,</div><div class='del'>-					     unsigned int sector_nr)</div><div class='add'>+/* Return the paddr array index for @stripe_nr, @sector_nr and @step_nr. */</div><div class='add'>+static unsigned int rbio_paddr_index(const struct btrfs_raid_bio *rbio,</div><div class='add'>+				     unsigned int stripe_nr,</div><div class='add'>+				     unsigned int sector_nr,</div><div class='add'>+				     unsigned int step_nr)</div><div class='ctx'> {</div><div class='del'>-	return &amp;rbio-&gt;stripe_sectors[rbio_stripe_sector_index(rbio, stripe_nr,</div><div class='del'>-							      sector_nr)];</div><div class='add'>+	unsigned int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_RBIO_SECTOR(step_nr &lt; rbio-&gt;sector_nsteps, rbio, step_nr);</div><div class='add'>+</div><div class='add'>+	ret = rbio_sector_index(rbio, stripe_nr, sector_nr) * rbio-&gt;sector_nsteps + step_nr;</div><div class='add'>+	ASSERT(ret &lt; rbio-&gt;nr_sectors * rbio-&gt;sector_nsteps);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Grab a sector inside P stripe */</div><div class='del'>-static struct sector_ptr *rbio_pstripe_sector(const struct btrfs_raid_bio *rbio,</div><div class='del'>-					      unsigned int sector_nr)</div><div class='add'>+static phys_addr_t rbio_stripe_paddr(const struct btrfs_raid_bio *rbio,</div><div class='add'>+					  unsigned int stripe_nr, unsigned int sector_nr,</div><div class='add'>+					  unsigned int step_nr)</div><div class='ctx'> {</div><div class='del'>-	return rbio_stripe_sector(rbio, rbio-&gt;nr_data, sector_nr);</div><div class='add'>+	return rbio-&gt;stripe_paddrs[rbio_paddr_index(rbio, stripe_nr, sector_nr, step_nr)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Grab a sector inside Q stripe, return NULL if not RAID6 */</div><div class='del'>-static struct sector_ptr *rbio_qstripe_sector(const struct btrfs_raid_bio *rbio,</div><div class='del'>-					      unsigned int sector_nr)</div><div class='add'>+static phys_addr_t rbio_pstripe_paddr(const struct btrfs_raid_bio *rbio,</div><div class='add'>+					   unsigned int sector_nr, unsigned int step_nr)</div><div class='add'>+{</div><div class='add'>+	return rbio_stripe_paddr(rbio, rbio-&gt;nr_data, sector_nr, step_nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static phys_addr_t rbio_qstripe_paddr(const struct btrfs_raid_bio *rbio,</div><div class='add'>+					   unsigned int sector_nr, unsigned int step_nr)</div><div class='ctx'> {</div><div class='ctx'> 	if (rbio-&gt;nr_data + 1 == rbio-&gt;real_stripes)</div><div class='del'>-		return NULL;</div><div class='del'>-	return rbio_stripe_sector(rbio, rbio-&gt;nr_data + 1, sector_nr);</div><div class='add'>+		return INVALID_PADDR;</div><div class='add'>+	return rbio_stripe_paddr(rbio, rbio-&gt;nr_data + 1, sector_nr, step_nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return a paddr pointer into the rbio::stripe_paddrs[] for the specified sector. */</div><div class='add'>+static phys_addr_t *rbio_stripe_paddrs(const struct btrfs_raid_bio *rbio,</div><div class='add'>+				       unsigned int stripe_nr, unsigned int sector_nr)</div><div class='add'>+{</div><div class='add'>+	return &amp;rbio-&gt;stripe_paddrs[rbio_paddr_index(rbio, stripe_nr, sector_nr, 0)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -805,14 +943,14 @@ done_nolock:</div><div class='ctx'> 		remove_rbio_from_cache(rbio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rbio_endio_bio_list(struct bio *cur, blk_status_t err)</div><div class='add'>+static void rbio_endio_bio_list(struct bio *cur, blk_status_t status)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *next;</div><div class='ctx'> </div><div class='ctx'> 	while (cur) {</div><div class='ctx'> 		next = cur-&gt;bi_next;</div><div class='ctx'> 		cur-&gt;bi_next = NULL;</div><div class='del'>-		cur-&gt;bi_status = err;</div><div class='add'>+		cur-&gt;bi_status = status;</div><div class='ctx'> 		bio_endio(cur);</div><div class='ctx'> 		cur = next;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -822,7 +960,7 @@ static void rbio_endio_bio_list(struct bio *cur, blk_status_t err)</div><div class='ctx'>  * this frees the rbio and runs through all the bios in the</div><div class='ctx'>  * bio_list and calls end_io on them</div><div class='ctx'>  */</div><div class='del'>-static void rbio_orig_end_io(struct btrfs_raid_bio *rbio, blk_status_t err)</div><div class='add'>+static void rbio_orig_end_io(struct btrfs_raid_bio *rbio, blk_status_t status)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *cur = bio_list_get(&amp;rbio-&gt;bio_list);</div><div class='ctx'> 	struct bio *extra;</div><div class='hunk'>@@ -851,13 +989,13 @@ static void rbio_orig_end_io(struct btrfs_raid_bio *rbio, blk_status_t err)</div><div class='ctx'> 	extra = bio_list_get(&amp;rbio-&gt;bio_list);</div><div class='ctx'> 	free_raid_bio(rbio);</div><div class='ctx'> </div><div class='del'>-	rbio_endio_bio_list(cur, err);</div><div class='add'>+	rbio_endio_bio_list(cur, status);</div><div class='ctx'> 	if (extra)</div><div class='del'>-		rbio_endio_bio_list(extra, err);</div><div class='add'>+		rbio_endio_bio_list(extra, status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get a sector pointer specified by its @stripe_nr and @sector_nr.</div><div class='add'>+ * Get paddr pointer for the sector specified by its @stripe_nr and @sector_nr.</div><div class='ctx'>  *</div><div class='ctx'>  * @rbio:               The raid bio</div><div class='ctx'>  * @stripe_nr:          Stripe number, valid range [0, real_stripe)</div><div class='hunk'>@@ -867,32 +1005,52 @@ static void rbio_orig_end_io(struct btrfs_raid_bio *rbio, blk_status_t err)</div><div class='ctx'>  *</div><div class='ctx'>  * The read/modify/write code wants to reuse the original bio page as much</div><div class='ctx'>  * as possible, and only use stripe_sectors as fallback.</div><div class='add'>+ *</div><div class='add'>+ * Return NULL if bio_list_only is set but the specified sector has no</div><div class='add'>+ * coresponding bio.</div><div class='ctx'>  */</div><div class='del'>-static struct sector_ptr *sector_in_rbio(struct btrfs_raid_bio *rbio,</div><div class='del'>-					 int stripe_nr, int sector_nr,</div><div class='del'>-					 bool bio_list_only)</div><div class='add'>+static phys_addr_t *sector_paddrs_in_rbio(struct btrfs_raid_bio *rbio,</div><div class='add'>+					  int stripe_nr, int sector_nr,</div><div class='add'>+					  bool bio_list_only)</div><div class='ctx'> {</div><div class='del'>-	struct sector_ptr *sector;</div><div class='del'>-	int index;</div><div class='add'>+	phys_addr_t *ret = NULL;</div><div class='add'>+	const int index = rbio_paddr_index(rbio, stripe_nr, sector_nr, 0);</div><div class='ctx'> </div><div class='del'>-	ASSERT(stripe_nr &gt;= 0 &amp;&amp; stripe_nr &lt; rbio-&gt;real_stripes);</div><div class='del'>-	ASSERT(sector_nr &gt;= 0 &amp;&amp; sector_nr &lt; rbio-&gt;stripe_nsectors);</div><div class='add'>+	ASSERT(index &gt;= 0 &amp;&amp; index &lt; rbio-&gt;nr_sectors * rbio-&gt;sector_nsteps);</div><div class='ctx'> </div><div class='del'>-	index = stripe_nr * rbio-&gt;stripe_nsectors + sector_nr;</div><div class='del'>-	ASSERT(index &gt;= 0 &amp;&amp; index &lt; rbio-&gt;nr_sectors);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;rbio-&gt;bio_list_lock);</div><div class='del'>-	sector = &amp;rbio-&gt;bio_sectors[index];</div><div class='del'>-	if (sector-&gt;page || bio_list_only) {</div><div class='del'>-		/* Don't return sector without a valid page pointer */</div><div class='del'>-		if (!sector-&gt;page)</div><div class='del'>-			sector = NULL;</div><div class='del'>-		spin_unlock(&amp;rbio-&gt;bio_list_lock);</div><div class='del'>-		return sector;</div><div class='add'>+	scoped_guard(spinlock, &amp;rbio-&gt;bio_list_lock) {</div><div class='add'>+		if (rbio-&gt;bio_paddrs[index] != INVALID_PADDR || bio_list_only) {</div><div class='add'>+			/* Don't return sector without a valid page pointer */</div><div class='add'>+			if (rbio-&gt;bio_paddrs[index] != INVALID_PADDR)</div><div class='add'>+				ret = &amp;rbio-&gt;bio_paddrs[index];</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;rbio-&gt;bio_list_lock);</div><div class='add'>+	return &amp;rbio-&gt;stripe_paddrs[index];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Similar to sector_paddr_in_rbio(), but with extra consideration for</div><div class='add'>+ * bs &gt; ps cases, where we can have multiple steps for a fs block.</div><div class='add'>+ */</div><div class='add'>+static phys_addr_t sector_paddr_in_rbio(struct btrfs_raid_bio *rbio,</div><div class='add'>+					int stripe_nr, int sector_nr, int step_nr,</div><div class='add'>+					bool bio_list_only)</div><div class='add'>+{</div><div class='add'>+	phys_addr_t ret = INVALID_PADDR;</div><div class='add'>+	const int index = rbio_paddr_index(rbio, stripe_nr, sector_nr, step_nr);</div><div class='add'>+</div><div class='add'>+	ASSERT(index &gt;= 0 &amp;&amp; index &lt; rbio-&gt;nr_sectors * rbio-&gt;sector_nsteps);</div><div class='ctx'> </div><div class='del'>-	return &amp;rbio-&gt;stripe_sectors[index];</div><div class='add'>+	scoped_guard(spinlock, &amp;rbio-&gt;bio_list_lock) {</div><div class='add'>+		if (rbio-&gt;bio_paddrs[index] != INVALID_PADDR || bio_list_only) {</div><div class='add'>+			/* Don't return sector without a valid page pointer */</div><div class='add'>+			if (rbio-&gt;bio_paddrs[index] != INVALID_PADDR)</div><div class='add'>+				ret = rbio-&gt;bio_paddrs[index];</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return rbio-&gt;stripe_paddrs[index];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -908,34 +1066,50 @@ static struct btrfs_raid_bio *alloc_rbio(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	const unsigned int stripe_nsectors =</div><div class='ctx'> 		BTRFS_STRIPE_LEN &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	const unsigned int num_sectors = stripe_nsectors * real_stripes;</div><div class='add'>+	const unsigned int step = min(fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+	const unsigned int sector_nsteps = fs_info-&gt;sectorsize / step;</div><div class='ctx'> 	struct btrfs_raid_bio *rbio;</div><div class='ctx'> </div><div class='del'>-	/* PAGE_SIZE must also be aligned to sectorsize for subpage support */</div><div class='del'>-	ASSERT(IS_ALIGNED(PAGE_SIZE, fs_info-&gt;sectorsize));</div><div class='add'>+	/*</div><div class='add'>+	 * For bs &lt;= ps cases, ps must be aligned to bs.</div><div class='add'>+	 * For bs &gt; ps cases, bs must be aligned to ps.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(IS_ALIGNED(PAGE_SIZE, fs_info-&gt;sectorsize) ||</div><div class='add'>+	       IS_ALIGNED(fs_info-&gt;sectorsize, PAGE_SIZE));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Our current stripe len should be fixed to 64k thus stripe_nsectors</div><div class='ctx'> 	 * (at most 16) should be no larger than BITS_PER_LONG.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(stripe_nsectors &lt;= BITS_PER_LONG);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Real stripes must be between 2 (2 disks RAID5, aka RAID1) and 256</div><div class='add'>+	 * (limited by u8).</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(real_stripes &gt;= 2);</div><div class='add'>+	ASSERT(real_stripes &lt;= U8_MAX);</div><div class='add'>+</div><div class='ctx'> 	rbio = kzalloc(sizeof(*rbio), GFP_NOFS);</div><div class='ctx'> 	if (!rbio)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	rbio-&gt;stripe_pages = kcalloc(num_pages, sizeof(struct page *),</div><div class='ctx'> 				     GFP_NOFS);</div><div class='del'>-	rbio-&gt;bio_sectors = kcalloc(num_sectors, sizeof(struct sector_ptr),</div><div class='del'>-				    GFP_NOFS);</div><div class='del'>-	rbio-&gt;stripe_sectors = kcalloc(num_sectors, sizeof(struct sector_ptr),</div><div class='del'>-				       GFP_NOFS);</div><div class='add'>+	rbio-&gt;bio_paddrs = kcalloc(num_sectors * sector_nsteps, sizeof(phys_addr_t), GFP_NOFS);</div><div class='add'>+	rbio-&gt;stripe_paddrs = kcalloc(num_sectors * sector_nsteps, sizeof(phys_addr_t), GFP_NOFS);</div><div class='ctx'> 	rbio-&gt;finish_pointers = kcalloc(real_stripes, sizeof(void *), GFP_NOFS);</div><div class='ctx'> 	rbio-&gt;error_bitmap = bitmap_zalloc(num_sectors, GFP_NOFS);</div><div class='add'>+	rbio-&gt;stripe_uptodate_bitmap = bitmap_zalloc(num_sectors, GFP_NOFS);</div><div class='ctx'> </div><div class='del'>-	if (!rbio-&gt;stripe_pages || !rbio-&gt;bio_sectors || !rbio-&gt;stripe_sectors ||</div><div class='del'>-	    !rbio-&gt;finish_pointers || !rbio-&gt;error_bitmap) {</div><div class='add'>+	if (!rbio-&gt;stripe_pages || !rbio-&gt;bio_paddrs || !rbio-&gt;stripe_paddrs ||</div><div class='add'>+	    !rbio-&gt;finish_pointers || !rbio-&gt;error_bitmap || !rbio-&gt;stripe_uptodate_bitmap) {</div><div class='ctx'> 		free_raid_bio_pointers(rbio);</div><div class='ctx'> 		kfree(rbio);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='add'>+	for (int i = 0; i &lt; num_sectors * sector_nsteps; i++) {</div><div class='add'>+		rbio-&gt;stripe_paddrs[i] = INVALID_PADDR;</div><div class='add'>+		rbio-&gt;bio_paddrs[i] = INVALID_PADDR;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bio_list_init(&amp;rbio-&gt;bio_list);</div><div class='ctx'> 	init_waitqueue_head(&amp;rbio-&gt;io_wait);</div><div class='hunk'>@@ -950,11 +1124,13 @@ static struct btrfs_raid_bio *alloc_rbio(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	rbio-&gt;real_stripes = real_stripes;</div><div class='ctx'> 	rbio-&gt;stripe_npages = stripe_npages;</div><div class='ctx'> 	rbio-&gt;stripe_nsectors = stripe_nsectors;</div><div class='add'>+	rbio-&gt;sector_nsteps = sector_nsteps;</div><div class='ctx'> 	refcount_set(&amp;rbio-&gt;refs, 1);</div><div class='ctx'> 	atomic_set(&amp;rbio-&gt;stripes_pending, 0);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(btrfs_nr_parity_stripes(bioc-&gt;map_type));</div><div class='ctx'> 	rbio-&gt;nr_data = real_stripes - btrfs_nr_parity_stripes(bioc-&gt;map_type);</div><div class='add'>+	ASSERT(rbio-&gt;nr_data &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 	return rbio;</div><div class='ctx'> }</div><div class='hunk'>@@ -964,7 +1140,7 @@ static int alloc_rbio_pages(struct btrfs_raid_bio *rbio)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_alloc_page_array(rbio-&gt;nr_pages, rbio-&gt;stripe_pages, 0);</div><div class='add'>+	ret = btrfs_alloc_page_array(rbio-&gt;nr_pages, rbio-&gt;stripe_pages, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	/* Mapping all sectors */</div><div class='hunk'>@@ -979,7 +1155,7 @@ static int alloc_rbio_parity_pages(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_alloc_page_array(rbio-&gt;nr_pages - data_pages,</div><div class='del'>-				     rbio-&gt;stripe_pages + data_pages, 0);</div><div class='add'>+				     rbio-&gt;stripe_pages + data_pages, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -993,8 +1169,8 @@ static int alloc_rbio_parity_pages(struct btrfs_raid_bio *rbio)</div><div class='ctx'>  * @faila and @failb will also be updated to the first and second stripe</div><div class='ctx'>  * number of the errors.</div><div class='ctx'>  */</div><div class='del'>-static int get_rbio_veritical_errors(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='del'>-				     int *faila, int *failb)</div><div class='add'>+static int get_rbio_vertical_errors(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='add'>+				    int *faila, int *failb)</div><div class='ctx'> {</div><div class='ctx'> 	int stripe_nr;</div><div class='ctx'> 	int found_errors = 0;</div><div class='hunk'>@@ -1026,20 +1202,41 @@ static int get_rbio_veritical_errors(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='ctx'> 	return found_errors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bio_add_paddrs(struct bio *bio, phys_addr_t *paddrs, unsigned int nr_steps,</div><div class='add'>+			  unsigned int step)</div><div class='add'>+{</div><div class='add'>+	int added = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; nr_steps; i++) {</div><div class='add'>+		ret = bio_add_page(bio, phys_to_page(paddrs[i]), step,</div><div class='add'>+				   offset_in_page(paddrs[i]));</div><div class='add'>+		if (ret != step)</div><div class='add'>+			goto revert;</div><div class='add'>+		added += ret;</div><div class='add'>+	}</div><div class='add'>+	return added;</div><div class='add'>+revert:</div><div class='add'>+	/*</div><div class='add'>+	 * We don't need to revert the bvec, as the bio will be submitted immediately,</div><div class='add'>+	 * as long as the size is reduced the extra bvec will not be accessed.</div><div class='add'>+	 */</div><div class='add'>+	bio-&gt;bi_iter.bi_size -= added;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Add a single sector @sector into our list of bios for IO.</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 if everything went well.</div><div class='del'>- * Return &lt;0 for error.</div><div class='add'>+ * Return &lt;0 for error, and no byte will be added to @rbio.</div><div class='ctx'>  */</div><div class='del'>-static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,</div><div class='del'>-			      struct bio_list *bio_list,</div><div class='del'>-			      struct sector_ptr *sector,</div><div class='del'>-			      unsigned int stripe_nr,</div><div class='del'>-			      unsigned int sector_nr,</div><div class='del'>-			      enum req_op op)</div><div class='add'>+static int rbio_add_io_paddrs(struct btrfs_raid_bio *rbio, struct bio_list *bio_list,</div><div class='add'>+			      phys_addr_t *paddrs, unsigned int stripe_nr,</div><div class='add'>+			      unsigned int sector_nr, enum req_op op)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 step = min(sectorsize, PAGE_SIZE);</div><div class='ctx'> 	struct bio *last = bio_list-&gt;tail;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct bio *bio;</div><div class='hunk'>@@ -1051,9 +1248,11 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 	 * thus it can be larger than rbio-&gt;real_stripe.</div><div class='ctx'> 	 * So here we check against bioc-&gt;num_stripes, not rbio-&gt;real_stripes.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(stripe_nr &gt;= 0 &amp;&amp; stripe_nr &lt; rbio-&gt;bioc-&gt;num_stripes);</div><div class='del'>-	ASSERT(sector_nr &gt;= 0 &amp;&amp; sector_nr &lt; rbio-&gt;stripe_nsectors);</div><div class='del'>-	ASSERT(sector-&gt;page);</div><div class='add'>+	ASSERT_RBIO_STRIPE(stripe_nr &gt;= 0 &amp;&amp; stripe_nr &lt; rbio-&gt;bioc-&gt;num_stripes,</div><div class='add'>+			   rbio, stripe_nr);</div><div class='add'>+	ASSERT_RBIO_SECTOR(sector_nr &gt;= 0 &amp;&amp; sector_nr &lt; rbio-&gt;stripe_nsectors,</div><div class='add'>+			   rbio, sector_nr);</div><div class='add'>+	ASSERT(paddrs != NULL);</div><div class='ctx'> </div><div class='ctx'> 	stripe = &amp;rbio-&gt;bioc-&gt;stripes[stripe_nr];</div><div class='ctx'> 	disk_start = stripe-&gt;physical + sector_nr * sectorsize;</div><div class='hunk'>@@ -1066,9 +1265,9 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 			rbio-&gt;error_bitmap);</div><div class='ctx'> </div><div class='ctx'> 		/* Check if we have reached tolerance early. */</div><div class='del'>-		found_errors = get_rbio_veritical_errors(rbio, sector_nr,</div><div class='del'>-							 NULL, NULL);</div><div class='del'>-		if (found_errors &gt; rbio-&gt;bioc-&gt;max_errors)</div><div class='add'>+		found_errors = get_rbio_vertical_errors(rbio, sector_nr,</div><div class='add'>+							NULL, NULL);</div><div class='add'>+		if (unlikely(found_errors &gt; rbio-&gt;bioc-&gt;max_errors))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1084,8 +1283,7 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (last_end == disk_start &amp;&amp; !last-&gt;bi_status &amp;&amp;</div><div class='ctx'> 		    last-&gt;bi_bdev == stripe-&gt;dev-&gt;bdev) {</div><div class='del'>-			ret = bio_add_page(last, sector-&gt;page, sectorsize,</div><div class='del'>-					   sector-&gt;pgoff);</div><div class='add'>+			ret = bio_add_paddrs(last, paddrs, rbio-&gt;sector_nsteps, step);</div><div class='ctx'> 			if (ret == sectorsize)</div><div class='ctx'> 				return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1098,31 +1296,27 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 	bio-&gt;bi_iter.bi_sector = disk_start &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 	bio-&gt;bi_private = rbio;</div><div class='ctx'> </div><div class='del'>-	__bio_add_page(bio, sector-&gt;page, sectorsize, sector-&gt;pgoff);</div><div class='add'>+	ret = bio_add_paddrs(bio, paddrs, rbio-&gt;sector_nsteps, step);</div><div class='add'>+	ASSERT(ret == sectorsize);</div><div class='ctx'> 	bio_list_add(bio_list, bio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void index_one_bio(struct btrfs_raid_bio *rbio, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	struct bvec_iter iter;</div><div class='add'>+	struct btrfs_fs_info *fs_info = rbio-&gt;bioc-&gt;fs_info;</div><div class='add'>+	const u32 step = min(fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+	const u32 step_bits = min(fs_info-&gt;sectorsize_bits, PAGE_SHIFT);</div><div class='add'>+	struct bvec_iter iter = bio-&gt;bi_iter;</div><div class='add'>+	phys_addr_t paddr;</div><div class='ctx'> 	u32 offset = (bio-&gt;bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT) -</div><div class='ctx'> 		     rbio-&gt;bioc-&gt;full_stripe_logical;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment(bvec, bio, iter) {</div><div class='del'>-		u32 bvec_offset;</div><div class='add'>+	btrfs_bio_for_each_block(paddr, bio, &amp;iter, step) {</div><div class='add'>+		unsigned int index = (offset &gt;&gt; step_bits);</div><div class='ctx'> </div><div class='del'>-		for (bvec_offset = 0; bvec_offset &lt; bvec.bv_len;</div><div class='del'>-		     bvec_offset += sectorsize, offset += sectorsize) {</div><div class='del'>-			int index = offset / sectorsize;</div><div class='del'>-			struct sector_ptr *sector = &amp;rbio-&gt;bio_sectors[index];</div><div class='del'>-</div><div class='del'>-			sector-&gt;page = bvec.bv_page;</div><div class='del'>-			sector-&gt;pgoff = bvec.bv_offset + bvec_offset;</div><div class='del'>-			ASSERT(sector-&gt;pgoff &lt; PAGE_SIZE);</div><div class='del'>-		}</div><div class='add'>+		rbio-&gt;bio_paddrs[index] = paddr;</div><div class='add'>+		offset += step;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1181,48 +1375,83 @@ static inline void bio_list_put(struct bio_list *bio_list)</div><div class='ctx'> 		bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Generate PQ for one vertical stripe. */</div><div class='del'>-static void generate_pq_vertical(struct btrfs_raid_bio *rbio, int sectornr)</div><div class='add'>+static void assert_rbio(struct btrfs_raid_bio *rbio)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BTRFS_ASSERT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At least two stripes (2 disks RAID5), and since real_stripes is U8,</div><div class='add'>+	 * we won't go beyond 256 disks anyway.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_RBIO(rbio-&gt;real_stripes &gt;= 2, rbio);</div><div class='add'>+	ASSERT_RBIO(rbio-&gt;nr_data &gt; 0, rbio);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is another check to make sure nr data stripes is smaller</div><div class='add'>+	 * than total stripes.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_RBIO(rbio-&gt;nr_data &lt; rbio-&gt;real_stripes, rbio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *kmap_local_paddr(phys_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	/* The sector pointer must have a page mapped to it. */</div><div class='add'>+	ASSERT(paddr != INVALID_PADDR);</div><div class='add'>+</div><div class='add'>+	return kmap_local_page(phys_to_page(paddr)) + offset_in_page(paddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void generate_pq_vertical_step(struct btrfs_raid_bio *rbio, unsigned int sector_nr,</div><div class='add'>+				      unsigned int step_nr)</div><div class='ctx'> {</div><div class='ctx'> 	void **pointers = rbio-&gt;finish_pointers;</div><div class='del'>-	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	struct sector_ptr *sector;</div><div class='add'>+	const u32 step = min(rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='ctx'> 	int stripe;</div><div class='ctx'> 	const bool has_qstripe = rbio-&gt;bioc-&gt;map_type &amp; BTRFS_BLOCK_GROUP_RAID6;</div><div class='ctx'> </div><div class='ctx'> 	/* First collect one sector from each data stripe */</div><div class='del'>-	for (stripe = 0; stripe &lt; rbio-&gt;nr_data; stripe++) {</div><div class='del'>-		sector = sector_in_rbio(rbio, stripe, sectornr, 0);</div><div class='del'>-		pointers[stripe] = kmap_local_page(sector-&gt;page) +</div><div class='del'>-				   sector-&gt;pgoff;</div><div class='del'>-	}</div><div class='add'>+	for (stripe = 0; stripe &lt; rbio-&gt;nr_data; stripe++)</div><div class='add'>+		pointers[stripe] = kmap_local_paddr(</div><div class='add'>+				sector_paddr_in_rbio(rbio, stripe, sector_nr, step_nr, 0));</div><div class='ctx'> </div><div class='ctx'> 	/* Then add the parity stripe */</div><div class='del'>-	sector = rbio_pstripe_sector(rbio, sectornr);</div><div class='del'>-	sector-&gt;uptodate = 1;</div><div class='del'>-	pointers[stripe++] = kmap_local_page(sector-&gt;page) + sector-&gt;pgoff;</div><div class='add'>+	pointers[stripe++] = kmap_local_paddr(rbio_pstripe_paddr(rbio, sector_nr, step_nr));</div><div class='ctx'> </div><div class='ctx'> 	if (has_qstripe) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * RAID6, add the qstripe and call the library function</div><div class='ctx'> 		 * to fill in our p/q</div><div class='ctx'> 		 */</div><div class='del'>-		sector = rbio_qstripe_sector(rbio, sectornr);</div><div class='del'>-		sector-&gt;uptodate = 1;</div><div class='del'>-		pointers[stripe++] = kmap_local_page(sector-&gt;page) +</div><div class='del'>-				     sector-&gt;pgoff;</div><div class='add'>+		pointers[stripe++] = kmap_local_paddr(</div><div class='add'>+				rbio_qstripe_paddr(rbio, sector_nr, step_nr));</div><div class='ctx'> </div><div class='del'>-		raid6_call.gen_syndrome(rbio-&gt;real_stripes, sectorsize,</div><div class='del'>-					pointers);</div><div class='add'>+		assert_rbio(rbio);</div><div class='add'>+		raid6_call.gen_syndrome(rbio-&gt;real_stripes, step, pointers);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* raid5 */</div><div class='del'>-		memcpy(pointers[rbio-&gt;nr_data], pointers[0], sectorsize);</div><div class='del'>-		run_xor(pointers + 1, rbio-&gt;nr_data - 1, sectorsize);</div><div class='add'>+		memcpy(pointers[rbio-&gt;nr_data], pointers[0], step);</div><div class='add'>+		run_xor(pointers + 1, rbio-&gt;nr_data - 1, step);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (stripe = stripe - 1; stripe &gt;= 0; stripe--)</div><div class='ctx'> 		kunmap_local(pointers[stripe]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Generate PQ for one vertical stripe. */</div><div class='add'>+static void generate_pq_vertical(struct btrfs_raid_bio *rbio, int sectornr)</div><div class='add'>+{</div><div class='add'>+	const bool has_qstripe = (rbio-&gt;bioc-&gt;map_type &amp; BTRFS_BLOCK_GROUP_RAID6);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; rbio-&gt;sector_nsteps; i++)</div><div class='add'>+		generate_pq_vertical_step(rbio, sectornr, i);</div><div class='add'>+</div><div class='add'>+	set_bit(rbio_sector_index(rbio, rbio-&gt;nr_data, sectornr),</div><div class='add'>+		rbio-&gt;stripe_uptodate_bitmap);</div><div class='add'>+	if (has_qstripe)</div><div class='add'>+		set_bit(rbio_sector_index(rbio, rbio-&gt;nr_data + 1, sectornr),</div><div class='add'>+			rbio-&gt;stripe_uptodate_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rmw_assemble_write_bios(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 				   struct bio_list *bio_list)</div><div class='ctx'> {</div><div class='hunk'>@@ -1249,7 +1478,7 @@ static int rmw_assemble_write_bios(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (total_sector_nr = 0; total_sector_nr &lt; rbio-&gt;nr_sectors;</div><div class='ctx'> 	     total_sector_nr++) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='ctx'> 		stripe = total_sector_nr / rbio-&gt;stripe_nsectors;</div><div class='ctx'> 		sectornr = total_sector_nr % rbio-&gt;stripe_nsectors;</div><div class='hunk'>@@ -1259,14 +1488,14 @@ static int rmw_assemble_write_bios(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (stripe &lt; rbio-&gt;nr_data) {</div><div class='del'>-			sector = sector_in_rbio(rbio, stripe, sectornr, 1);</div><div class='del'>-			if (!sector)</div><div class='add'>+			paddrs = sector_paddrs_in_rbio(rbio, stripe, sectornr, 1);</div><div class='add'>+			if (paddrs == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		} else {</div><div class='del'>-			sector = rbio_stripe_sector(rbio, stripe, sectornr);</div><div class='add'>+			paddrs = rbio_stripe_paddrs(rbio, stripe, sectornr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = rbio_add_io_sector(rbio, bio_list, sector, stripe,</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, bio_list, paddrs, stripe,</div><div class='ctx'> 					 sectornr, REQ_OP_WRITE);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='hunk'>@@ -1284,7 +1513,7 @@ static int rmw_assemble_write_bios(struct btrfs_raid_bio *rbio,</div><div class='ctx'> </div><div class='ctx'> 	for (total_sector_nr = 0; total_sector_nr &lt; rbio-&gt;nr_sectors;</div><div class='ctx'> 	     total_sector_nr++) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='ctx'> 		stripe = total_sector_nr / rbio-&gt;stripe_nsectors;</div><div class='ctx'> 		sectornr = total_sector_nr % rbio-&gt;stripe_nsectors;</div><div class='hunk'>@@ -1309,14 +1538,14 @@ static int rmw_assemble_write_bios(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (stripe &lt; rbio-&gt;nr_data) {</div><div class='del'>-			sector = sector_in_rbio(rbio, stripe, sectornr, 1);</div><div class='del'>-			if (!sector)</div><div class='add'>+			paddrs = sector_paddrs_in_rbio(rbio, stripe, sectornr, 1);</div><div class='add'>+			if (paddrs == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		} else {</div><div class='del'>-			sector = rbio_stripe_sector(rbio, stripe, sectornr);</div><div class='add'>+			paddrs = rbio_stripe_paddrs(rbio, stripe, sectornr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = rbio_add_io_sector(rbio, bio_list, sector,</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, bio_list, paddrs,</div><div class='ctx'> 					 rbio-&gt;real_stripes,</div><div class='ctx'> 					 sectornr, REQ_OP_WRITE);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1364,22 +1593,17 @@ static void set_rbio_range_error(struct btrfs_raid_bio *rbio, struct bio *bio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * For subpage case, we can no longer set page Up-to-date directly for</div><div class='del'>- * stripe_pages[], thus we need to locate the sector.</div><div class='add'>+ * Return the index inside the rbio-&gt;stripe_sectors[] array.</div><div class='add'>+ *</div><div class='add'>+ * Return -1 if not found.</div><div class='ctx'>  */</div><div class='del'>-static struct sector_ptr *find_stripe_sector(struct btrfs_raid_bio *rbio,</div><div class='del'>-					     struct page *page,</div><div class='del'>-					     unsigned int pgoff)</div><div class='add'>+static int find_stripe_sector_nr(struct btrfs_raid_bio *rbio, phys_addr_t paddr)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; rbio-&gt;nr_sectors; i++) {</div><div class='del'>-		struct sector_ptr *sector = &amp;rbio-&gt;stripe_sectors[i];</div><div class='del'>-</div><div class='del'>-		if (sector-&gt;page == page &amp;&amp; sector-&gt;pgoff == pgoff)</div><div class='del'>-			return sector;</div><div class='add'>+	for (int i = 0; i &lt; rbio-&gt;nr_sectors; i++) {</div><div class='add'>+		if (rbio-&gt;stripe_paddrs[i * rbio-&gt;sector_nsteps] == paddr)</div><div class='add'>+			return i;</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1389,38 +1613,34 @@ static struct sector_ptr *find_stripe_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> static void set_bio_pages_uptodate(struct btrfs_raid_bio *rbio, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	const u32 step = min(sectorsize, PAGE_SIZE);</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	phys_addr_t paddr;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(!bio_flagged(bio, BIO_CLONED));</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='del'>-		int pgoff;</div><div class='add'>+	btrfs_bio_for_each_block_all(paddr, bio, step) {</div><div class='add'>+		/* Hitting the first step of a sector. */</div><div class='add'>+		if (IS_ALIGNED(offset, sectorsize)) {</div><div class='add'>+			int sector_nr = find_stripe_sector_nr(rbio, paddr);</div><div class='ctx'> </div><div class='del'>-		for (pgoff = bvec-&gt;bv_offset; pgoff - bvec-&gt;bv_offset &lt; bvec-&gt;bv_len;</div><div class='del'>-		     pgoff += sectorsize) {</div><div class='del'>-			sector = find_stripe_sector(rbio, bvec-&gt;bv_page, pgoff);</div><div class='del'>-			ASSERT(sector);</div><div class='del'>-			if (sector)</div><div class='del'>-				sector-&gt;uptodate = 1;</div><div class='add'>+			ASSERT(sector_nr &gt;= 0);</div><div class='add'>+			if (sector_nr &gt;= 0)</div><div class='add'>+				set_bit(sector_nr, rbio-&gt;stripe_uptodate_bitmap);</div><div class='ctx'> 		}</div><div class='add'>+		offset += step;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_bio_sector_nr(struct btrfs_raid_bio *rbio, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec *bv = bio_first_bvec_all(bio);</div><div class='add'>+	phys_addr_t bvec_paddr = bvec_phys(bio_first_bvec_all(bio));</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rbio-&gt;nr_sectors; i++) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='del'>-</div><div class='del'>-		sector = &amp;rbio-&gt;stripe_sectors[i];</div><div class='del'>-		if (sector-&gt;page == bv-&gt;bv_page &amp;&amp; sector-&gt;pgoff == bv-&gt;bv_offset)</div><div class='add'>+		if (rbio-&gt;stripe_paddrs[i * rbio-&gt;sector_nsteps] == bvec_paddr)</div><div class='ctx'> 			break;</div><div class='del'>-		sector = &amp;rbio-&gt;bio_sectors[i];</div><div class='del'>-		if (sector-&gt;page == bv-&gt;bv_page &amp;&amp; sector-&gt;pgoff == bv-&gt;bv_offset)</div><div class='add'>+		if (rbio-&gt;bio_paddrs[i * rbio-&gt;sector_nsteps] == bvec_paddr)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	ASSERT(i &lt; rbio-&gt;nr_sectors);</div><div class='hunk'>@@ -1453,9 +1673,12 @@ static void verify_bio_data_sectors(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 				    struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = rbio-&gt;bioc-&gt;fs_info;</div><div class='add'>+	const u32 step = min(fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+	const u32 nr_steps = rbio-&gt;sector_nsteps;</div><div class='ctx'> 	int total_sector_nr = get_bio_sector_nr(rbio, bio);</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];</div><div class='add'>+	phys_addr_t paddr;</div><div class='ctx'> </div><div class='ctx'> 	/* No data csum for the whole stripe, no need to verify. */</div><div class='ctx'> 	if (!rbio-&gt;csum_bitmap || !rbio-&gt;csum_buf)</div><div class='hunk'>@@ -1465,26 +1688,26 @@ static void verify_bio_data_sectors(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 	if (total_sector_nr &gt;= rbio-&gt;nr_data * rbio-&gt;stripe_nsectors)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		int bv_offset;</div><div class='add'>+	btrfs_bio_for_each_block_all(paddr, bio, step) {</div><div class='add'>+		u8 csum_buf[BTRFS_CSUM_SIZE];</div><div class='add'>+		u8 *expected_csum;</div><div class='ctx'> </div><div class='del'>-		for (bv_offset = bvec-&gt;bv_offset;</div><div class='del'>-		     bv_offset &lt; bvec-&gt;bv_offset + bvec-&gt;bv_len;</div><div class='del'>-		     bv_offset += fs_info-&gt;sectorsize, total_sector_nr++) {</div><div class='del'>-			u8 csum_buf[BTRFS_CSUM_SIZE];</div><div class='del'>-			u8 *expected_csum = rbio-&gt;csum_buf +</div><div class='del'>-					    total_sector_nr * fs_info-&gt;csum_size;</div><div class='del'>-			int ret;</div><div class='add'>+		paddrs[(offset / step) % nr_steps] = paddr;</div><div class='add'>+		offset += step;</div><div class='ctx'> </div><div class='del'>-			/* No csum for this sector, skip to the next sector. */</div><div class='del'>-			if (!test_bit(total_sector_nr, rbio-&gt;csum_bitmap))</div><div class='del'>-				continue;</div><div class='add'>+		/* Not yet covering the full fs block, continue to the next step. */</div><div class='add'>+		if (!IS_ALIGNED(offset, fs_info-&gt;sectorsize))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			ret = btrfs_check_sector_csum(fs_info, bvec-&gt;bv_page,</div><div class='del'>-				bv_offset, csum_buf, expected_csum);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				set_bit(total_sector_nr, rbio-&gt;error_bitmap);</div><div class='del'>-		}</div><div class='add'>+		/* No csum for this sector, skip to the next sector. */</div><div class='add'>+		if (!test_bit(total_sector_nr, rbio-&gt;csum_bitmap))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		expected_csum = rbio-&gt;csum_buf + total_sector_nr * fs_info-&gt;csum_size;</div><div class='add'>+		btrfs_calculate_block_csum_pages(fs_info, paddrs, csum_buf);</div><div class='add'>+		if (unlikely(memcmp(csum_buf, expected_csum, fs_info-&gt;csum_size) != 0))</div><div class='add'>+			set_bit(total_sector_nr, rbio-&gt;error_bitmap);</div><div class='add'>+		total_sector_nr++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1530,7 +1753,7 @@ static int alloc_rbio_data_pages(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	const int data_pages = rbio-&gt;nr_data * rbio-&gt;stripe_npages;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_alloc_page_array(data_pages, rbio-&gt;stripe_pages, 0);</div><div class='add'>+	ret = btrfs_alloc_page_array(data_pages, rbio-&gt;stripe_pages, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1580,8 +1803,8 @@ static void raid_unplug(struct blk_plug_cb *cb, bool from_schedule)</div><div class='ctx'> 	list_sort(NULL, &amp;plug-&gt;rbio_list, plug_cmp);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;plug-&gt;rbio_list)) {</div><div class='del'>-		cur = list_entry(plug-&gt;rbio_list.next,</div><div class='del'>-				 struct btrfs_raid_bio, plug_list);</div><div class='add'>+		cur = list_first_entry(&amp;plug-&gt;rbio_list,</div><div class='add'>+				       struct btrfs_raid_bio, plug_list);</div><div class='ctx'> 		list_del_init(&amp;cur-&gt;plug_list);</div><div class='ctx'> </div><div class='ctx'> 		if (rbio_is_full(cur)) {</div><div class='hunk'>@@ -1614,9 +1837,10 @@ static void rbio_add_bio(struct btrfs_raid_bio *rbio, struct bio *orig_bio)</div><div class='ctx'> 	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	u64 cur_logical;</div><div class='ctx'> </div><div class='del'>-	ASSERT(orig_logical &gt;= full_stripe_start &amp;&amp;</div><div class='del'>-	       orig_logical + orig_len &lt;= full_stripe_start +</div><div class='del'>-	       rbio-&gt;nr_data * BTRFS_STRIPE_LEN);</div><div class='add'>+	ASSERT_RBIO_LOGICAL(orig_logical &gt;= full_stripe_start &amp;&amp;</div><div class='add'>+			    orig_logical + orig_len &lt;= full_stripe_start +</div><div class='add'>+			    rbio-&gt;nr_data * BTRFS_STRIPE_LEN,</div><div class='add'>+			    rbio, orig_logical);</div><div class='ctx'> </div><div class='ctx'> 	bio_list_add(&amp;rbio-&gt;bio_list, orig_bio);</div><div class='ctx'> 	rbio-&gt;bio_list_bytes += orig_bio-&gt;bi_iter.bi_size;</div><div class='hunk'>@@ -1678,10 +1902,9 @@ static int verify_one_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 			     int stripe_nr, int sector_nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = rbio-&gt;bioc-&gt;fs_info;</div><div class='del'>-	struct sector_ptr *sector;</div><div class='add'>+	phys_addr_t *paddrs;</div><div class='ctx'> 	u8 csum_buf[BTRFS_CSUM_SIZE];</div><div class='ctx'> 	u8 *csum_expected;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!rbio-&gt;csum_bitmap || !rbio-&gt;csum_buf)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1694,57 +1917,32 @@ static int verify_one_sector(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 	 * bio list if possible.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rbio-&gt;operation == BTRFS_RBIO_READ_REBUILD) {</div><div class='del'>-		sector = sector_in_rbio(rbio, stripe_nr, sector_nr, 0);</div><div class='add'>+		paddrs = sector_paddrs_in_rbio(rbio, stripe_nr, sector_nr, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		sector = rbio_stripe_sector(rbio, stripe_nr, sector_nr);</div><div class='add'>+		paddrs = rbio_stripe_paddrs(rbio, stripe_nr, sector_nr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(sector-&gt;page);</div><div class='del'>-</div><div class='ctx'> 	csum_expected = rbio-&gt;csum_buf +</div><div class='ctx'> 			(stripe_nr * rbio-&gt;stripe_nsectors + sector_nr) *</div><div class='ctx'> 			fs_info-&gt;csum_size;</div><div class='del'>-	ret = btrfs_check_sector_csum(fs_info, sector-&gt;page, sector-&gt;pgoff,</div><div class='del'>-				      csum_buf, csum_expected);</div><div class='del'>-	return ret;</div><div class='add'>+	btrfs_calculate_block_csum_pages(fs_info, paddrs, csum_buf);</div><div class='add'>+	if (unlikely(memcmp(csum_buf, csum_expected, fs_info-&gt;csum_size) != 0))</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Recover a vertical stripe specified by @sector_nr.</div><div class='del'>- * @*pointers are the pre-allocated pointers by the caller, so we don't</div><div class='del'>- * need to allocate/free the pointers again and again.</div><div class='del'>- */</div><div class='del'>-static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='del'>-			    void **pointers, void **unmap_array)</div><div class='add'>+static void recover_vertical_step(struct btrfs_raid_bio *rbio,</div><div class='add'>+				  unsigned int sector_nr,</div><div class='add'>+				  unsigned int step_nr,</div><div class='add'>+				  int faila, int failb,</div><div class='add'>+				  void **pointers, void **unmap_array)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = rbio-&gt;bioc-&gt;fs_info;</div><div class='del'>-	struct sector_ptr *sector;</div><div class='del'>-	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='del'>-	int found_errors;</div><div class='del'>-	int faila;</div><div class='del'>-	int failb;</div><div class='add'>+	const u32 step = min(fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='ctx'> 	int stripe_nr;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now we just use bitmap to mark the horizontal stripes in</div><div class='del'>-	 * which we have data when doing parity scrub.</div><div class='del'>-	 */</div><div class='del'>-	if (rbio-&gt;operation == BTRFS_RBIO_PARITY_SCRUB &amp;&amp;</div><div class='del'>-	    !test_bit(sector_nr, &amp;rbio-&gt;dbitmap))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	found_errors = get_rbio_veritical_errors(rbio, sector_nr, &amp;faila,</div><div class='del'>-						 &amp;failb);</div><div class='del'>-	/*</div><div class='del'>-	 * No errors in the vertical stripe, skip it.  Can happen for recovery</div><div class='del'>-	 * which only part of a stripe failed csum check.</div><div class='del'>-	 */</div><div class='del'>-	if (!found_errors)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (found_errors &gt; rbio-&gt;bioc-&gt;max_errors)</div><div class='del'>-		return -EIO;</div><div class='add'>+	ASSERT(step_nr &lt; rbio-&gt;sector_nsteps);</div><div class='add'>+	ASSERT(sector_nr &lt; rbio-&gt;stripe_nsectors);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup our array of pointers with sectors from each stripe</div><div class='hunk'>@@ -1753,18 +1951,18 @@ static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='ctx'> 	 * pointer order.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (stripe_nr = 0; stripe_nr &lt; rbio-&gt;real_stripes; stripe_nr++) {</div><div class='add'>+		phys_addr_t paddr;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we're rebuilding a read, we have to use pages from the</div><div class='ctx'> 		 * bio list if possible.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (rbio-&gt;operation == BTRFS_RBIO_READ_REBUILD) {</div><div class='del'>-			sector = sector_in_rbio(rbio, stripe_nr, sector_nr, 0);</div><div class='add'>+			paddr = sector_paddr_in_rbio(rbio, stripe_nr, sector_nr, step_nr, 0);</div><div class='ctx'> 		} else {</div><div class='del'>-			sector = rbio_stripe_sector(rbio, stripe_nr, sector_nr);</div><div class='add'>+			paddr = rbio_stripe_paddr(rbio, stripe_nr, sector_nr, step_nr);</div><div class='ctx'> 		}</div><div class='del'>-		ASSERT(sector-&gt;page);</div><div class='del'>-		pointers[stripe_nr] = kmap_local_page(sector-&gt;page) +</div><div class='del'>-				   sector-&gt;pgoff;</div><div class='add'>+		pointers[stripe_nr] = kmap_local_paddr(paddr);</div><div class='ctx'> 		unmap_array[stripe_nr] = pointers[stripe_nr];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1810,10 +2008,10 @@ static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (failb == rbio-&gt;real_stripes - 2) {</div><div class='del'>-			raid6_datap_recov(rbio-&gt;real_stripes, sectorsize,</div><div class='add'>+			raid6_datap_recov(rbio-&gt;real_stripes, step,</div><div class='ctx'> 					  faila, pointers);</div><div class='ctx'> 		} else {</div><div class='del'>-			raid6_2data_recov(rbio-&gt;real_stripes, sectorsize,</div><div class='add'>+			raid6_2data_recov(rbio-&gt;real_stripes, step,</div><div class='ctx'> 					  faila, failb, pointers);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1823,7 +2021,7 @@ static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='ctx'> 		ASSERT(failb == -1);</div><div class='ctx'> pstripe:</div><div class='ctx'> 		/* Copy parity block into failed block to start with */</div><div class='del'>-		memcpy(pointers[faila], pointers[rbio-&gt;nr_data], sectorsize);</div><div class='add'>+		memcpy(pointers[faila], pointers[rbio-&gt;nr_data], step);</div><div class='ctx'> </div><div class='ctx'> 		/* Rearrange the pointer array */</div><div class='ctx'> 		p = pointers[faila];</div><div class='hunk'>@@ -1833,40 +2031,66 @@ pstripe:</div><div class='ctx'> 		pointers[rbio-&gt;nr_data - 1] = p;</div><div class='ctx'> </div><div class='ctx'> 		/* Xor in the rest */</div><div class='del'>-		run_xor(pointers, rbio-&gt;nr_data - 1, sectorsize);</div><div class='del'>-</div><div class='add'>+		run_xor(pointers, rbio-&gt;nr_data - 1, step);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+cleanup:</div><div class='add'>+	for (stripe_nr = rbio-&gt;real_stripes - 1; stripe_nr &gt;= 0; stripe_nr--)</div><div class='add'>+		kunmap_local(unmap_array[stripe_nr]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Recover a vertical stripe specified by @sector_nr.</div><div class='add'>+ * @*pointers are the pre-allocated pointers by the caller, so we don't</div><div class='add'>+ * need to allocate/free the pointers again and again.</div><div class='add'>+ */</div><div class='add'>+static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,</div><div class='add'>+			    void **pointers, void **unmap_array)</div><div class='add'>+{</div><div class='add'>+	int found_errors;</div><div class='add'>+	int faila;</div><div class='add'>+	int failb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * No matter if this is a RMW or recovery, we should have all</div><div class='del'>-	 * failed sectors repaired in the vertical stripe, thus they are now</div><div class='del'>-	 * uptodate.</div><div class='del'>-	 * Especially if we determine to cache the rbio, we need to</div><div class='del'>-	 * have at least all data sectors uptodate.</div><div class='del'>-	 *</div><div class='del'>-	 * If possible, also check if the repaired sector matches its data</div><div class='del'>-	 * checksum.</div><div class='add'>+	 * Now we just use bitmap to mark the horizontal stripes in</div><div class='add'>+	 * which we have data when doing parity scrub.</div><div class='add'>+	 */</div><div class='add'>+	if (rbio-&gt;operation == BTRFS_RBIO_PARITY_SCRUB &amp;&amp;</div><div class='add'>+	    !test_bit(sector_nr, &amp;rbio-&gt;dbitmap))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	found_errors = get_rbio_vertical_errors(rbio, sector_nr, &amp;faila,</div><div class='add'>+						&amp;failb);</div><div class='add'>+	/*</div><div class='add'>+	 * No errors in the vertical stripe, skip it.  Can happen for recovery</div><div class='add'>+	 * which only part of a stripe failed csum check.</div><div class='ctx'> 	 */</div><div class='add'>+	if (!found_errors)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(found_errors &gt; rbio-&gt;bioc-&gt;max_errors))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; rbio-&gt;sector_nsteps; i++)</div><div class='add'>+		recover_vertical_step(rbio, sector_nr, i, faila, failb,</div><div class='add'>+					    pointers, unmap_array);</div><div class='ctx'> 	if (faila &gt;= 0) {</div><div class='ctx'> 		ret = verify_one_sector(rbio, faila, sector_nr);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto cleanup;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, faila, sector_nr);</div><div class='del'>-		sector-&gt;uptodate = 1;</div><div class='add'>+		set_bit(rbio_sector_index(rbio, faila, sector_nr),</div><div class='add'>+			rbio-&gt;stripe_uptodate_bitmap);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (failb &gt;= 0) {</div><div class='ctx'> 		ret = verify_one_sector(rbio, failb, sector_nr);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto cleanup;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, failb, sector_nr);</div><div class='del'>-		sector-&gt;uptodate = 1;</div><div class='add'>+		set_bit(rbio_sector_index(rbio, failb, sector_nr),</div><div class='add'>+			rbio-&gt;stripe_uptodate_bitmap);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-cleanup:</div><div class='del'>-	for (stripe_nr = rbio-&gt;real_stripes - 1; stripe_nr &gt;= 0; stripe_nr--)</div><div class='del'>-		kunmap_local(unmap_array[stripe_nr]);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1941,7 +2165,7 @@ static void recover_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	     total_sector_nr++) {</div><div class='ctx'> 		int stripe = total_sector_nr / rbio-&gt;stripe_nsectors;</div><div class='ctx'> 		int sectornr = total_sector_nr % rbio-&gt;stripe_nsectors;</div><div class='del'>-		struct sector_ptr *sector;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Skip the range which has error.  It can be a range which is</div><div class='hunk'>@@ -1958,8 +2182,8 @@ static void recover_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, stripe, sectornr);</div><div class='del'>-		ret = rbio_add_io_sector(rbio, &amp;bio_list, sector, stripe,</div><div class='add'>+		paddrs = rbio_stripe_paddrs(rbio, stripe, sectornr);</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, &amp;bio_list, paddrs, stripe,</div><div class='ctx'> 					 sectornr, REQ_OP_READ);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			bio_list_put(&amp;bio_list);</div><div class='hunk'>@@ -2004,7 +2228,7 @@ static void set_rbio_raid6_extra_error(struct btrfs_raid_bio *rbio, int mirror_n</div><div class='ctx'> 		int faila;</div><div class='ctx'> 		int failb;</div><div class='ctx'> </div><div class='del'>-		found_errors = get_rbio_veritical_errors(rbio, sector_nr,</div><div class='add'>+		found_errors = get_rbio_vertical_errors(rbio, sector_nr,</div><div class='ctx'> 							 &amp;faila, &amp;failb);</div><div class='ctx'> 		/* This vertical stripe doesn't have errors. */</div><div class='ctx'> 		if (!found_errors)</div><div class='hunk'>@@ -2148,13 +2372,13 @@ static int rmw_read_wait_recover(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (total_sector_nr = 0; total_sector_nr &lt; rbio-&gt;nr_sectors;</div><div class='ctx'> 	     total_sector_nr++) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='ctx'> 		int stripe = total_sector_nr / rbio-&gt;stripe_nsectors;</div><div class='ctx'> 		int sectornr = total_sector_nr % rbio-&gt;stripe_nsectors;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, stripe, sectornr);</div><div class='del'>-		ret = rbio_add_io_sector(rbio, &amp;bio_list, sector,</div><div class='del'>-			       stripe, sectornr, REQ_OP_READ);</div><div class='add'>+		paddrs = rbio_stripe_paddrs(rbio, stripe, sectornr);</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, &amp;bio_list, paddrs, stripe,</div><div class='add'>+					 sectornr, REQ_OP_READ);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			bio_list_put(&amp;bio_list);</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -2172,9 +2396,8 @@ static int rmw_read_wait_recover(struct btrfs_raid_bio *rbio)</div><div class='ctx'> static void raid_wait_write_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_raid_bio *rbio = bio-&gt;bi_private;</div><div class='del'>-	blk_status_t err = bio-&gt;bi_status;</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='add'>+	if (bio-&gt;bi_status)</div><div class='ctx'> 		rbio_update_error_bitmap(rbio, bio);</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;rbio-&gt;stripes_pending))</div><div class='hunk'>@@ -2209,14 +2432,15 @@ static bool need_read_stripe_sectors(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rbio-&gt;nr_data * rbio-&gt;stripe_nsectors; i++) {</div><div class='del'>-		struct sector_ptr *sector = &amp;rbio-&gt;stripe_sectors[i];</div><div class='add'>+		phys_addr_t paddr = rbio-&gt;stripe_paddrs[i * rbio-&gt;sector_nsteps];</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We have a sector which doesn't have page nor uptodate,</div><div class='ctx'> 		 * thus this rbio can not be cached one, as cached one must</div><div class='ctx'> 		 * have all its data sectors present and uptodate.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!sector-&gt;page || !sector-&gt;uptodate)</div><div class='add'>+		if (paddr == INVALID_PADDR ||</div><div class='add'>+		    !test_bit(i, rbio-&gt;stripe_uptodate_bitmap))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -2297,8 +2521,8 @@ static void rmw_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	for (sectornr = 0; sectornr &lt; rbio-&gt;stripe_nsectors; sectornr++) {</div><div class='ctx'> 		int found_errors;</div><div class='ctx'> </div><div class='del'>-		found_errors = get_rbio_veritical_errors(rbio, sectornr, NULL, NULL);</div><div class='del'>-		if (found_errors &gt; rbio-&gt;bioc-&gt;max_errors) {</div><div class='add'>+		found_errors = get_rbio_vertical_errors(rbio, sectornr, NULL, NULL);</div><div class='add'>+		if (unlikely(found_errors &gt; rbio-&gt;bioc-&gt;max_errors)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2362,52 +2586,127 @@ struct btrfs_raid_bio *raid56_parity_alloc_scrub_rbio(struct bio *bio,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	ASSERT(i &lt; rbio-&gt;real_stripes);</div><div class='add'>+	ASSERT_RBIO_STRIPE(i &lt; rbio-&gt;real_stripes, rbio, i);</div><div class='ctx'> </div><div class='ctx'> 	bitmap_copy(&amp;rbio-&gt;dbitmap, dbitmap, stripe_nsectors);</div><div class='ctx'> 	return rbio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int alloc_rbio_sector_pages(struct btrfs_raid_bio *rbio,</div><div class='add'>+				  int sector_nr)</div><div class='add'>+{</div><div class='add'>+	const u32 step = min(PAGE_SIZE, rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize);</div><div class='add'>+	const u32 base = sector_nr * rbio-&gt;sector_nsteps;</div><div class='add'>+</div><div class='add'>+	for (int i = base; i &lt; base + rbio-&gt;sector_nsteps; i++) {</div><div class='add'>+		const unsigned int page_index = (i * step) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='add'>+		if (rbio-&gt;stripe_pages[page_index])</div><div class='add'>+			continue;</div><div class='add'>+		page = alloc_page(GFP_NOFS);</div><div class='add'>+		if (!page)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		rbio-&gt;stripe_pages[page_index] = page;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We just scrub the parity that we have correct data on the same horizontal,</div><div class='ctx'>  * so we needn't allocate all pages for all the stripes.</div><div class='ctx'>  */</div><div class='ctx'> static int alloc_rbio_essential_pages(struct btrfs_raid_bio *rbio)</div><div class='ctx'> {</div><div class='del'>-	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	int total_sector_nr;</div><div class='ctx'> </div><div class='ctx'> 	for (total_sector_nr = 0; total_sector_nr &lt; rbio-&gt;nr_sectors;</div><div class='ctx'> 	     total_sector_nr++) {</div><div class='del'>-		struct page *page;</div><div class='ctx'> 		int sectornr = total_sector_nr % rbio-&gt;stripe_nsectors;</div><div class='del'>-		int index = (total_sector_nr * sectorsize) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='ctx'> 		if (!test_bit(sectornr, &amp;rbio-&gt;dbitmap))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (rbio-&gt;stripe_pages[index])</div><div class='del'>-			continue;</div><div class='del'>-		page = alloc_page(GFP_NOFS);</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		rbio-&gt;stripe_pages[index] = page;</div><div class='add'>+		ret = alloc_rbio_sector_pages(rbio, total_sector_nr);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	index_stripe_sectors(rbio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Return true if the content of the step matches the caclulated one. */</div><div class='add'>+static bool verify_one_parity_step(struct btrfs_raid_bio *rbio,</div><div class='add'>+				   void *pointers[], unsigned int sector_nr,</div><div class='add'>+				   unsigned int step_nr)</div><div class='add'>+{</div><div class='add'>+	const unsigned int nr_data = rbio-&gt;nr_data;</div><div class='add'>+	const bool has_qstripe = (rbio-&gt;real_stripes - rbio-&gt;nr_data == 2);</div><div class='add'>+	const u32 step = min(rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize, PAGE_SIZE);</div><div class='add'>+	void *parity;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	ASSERT(step_nr &lt; rbio-&gt;sector_nsteps);</div><div class='add'>+</div><div class='add'>+	/* First collect one page from each data stripe. */</div><div class='add'>+	for (int stripe = 0; stripe &lt; nr_data; stripe++)</div><div class='add'>+		pointers[stripe] = kmap_local_paddr(</div><div class='add'>+				sector_paddr_in_rbio(rbio, stripe, sector_nr,</div><div class='add'>+						     step_nr, 0));</div><div class='add'>+</div><div class='add'>+	if (has_qstripe) {</div><div class='add'>+		assert_rbio(rbio);</div><div class='add'>+		/* RAID6, call the library function to fill in our P/Q. */</div><div class='add'>+		raid6_call.gen_syndrome(rbio-&gt;real_stripes, step, pointers);</div><div class='add'>+	} else {</div><div class='add'>+		/* RAID5. */</div><div class='add'>+		memcpy(pointers[nr_data], pointers[0], step);</div><div class='add'>+		run_xor(pointers + 1, nr_data - 1, step);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check scrubbing parity and repair it. */</div><div class='add'>+	parity = kmap_local_paddr(rbio_stripe_paddr(rbio, rbio-&gt;scrubp, sector_nr, step_nr));</div><div class='add'>+	if (memcmp(parity, pointers[rbio-&gt;scrubp], step) != 0)</div><div class='add'>+		memcpy(parity, pointers[rbio-&gt;scrubp], step);</div><div class='add'>+	else</div><div class='add'>+		ret = true;</div><div class='add'>+	kunmap_local(parity);</div><div class='add'>+</div><div class='add'>+	for (int stripe = nr_data - 1; stripe &gt;= 0; stripe--)</div><div class='add'>+		kunmap_local(pointers[stripe]);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The @pointers array should have the P/Q parity already mapped.</div><div class='add'>+ */</div><div class='add'>+static void verify_one_parity_sector(struct btrfs_raid_bio *rbio,</div><div class='add'>+				     void *pointers[], unsigned int sector_nr)</div><div class='add'>+{</div><div class='add'>+	bool found_error = false;</div><div class='add'>+</div><div class='add'>+	for (int step_nr = 0; step_nr &lt; rbio-&gt;sector_nsteps; step_nr++) {</div><div class='add'>+		bool match;</div><div class='add'>+</div><div class='add'>+		match = verify_one_parity_step(rbio, pointers, sector_nr, step_nr);</div><div class='add'>+		if (!match)</div><div class='add'>+			found_error = true;</div><div class='add'>+	}</div><div class='add'>+	if (!found_error)</div><div class='add'>+		bitmap_clear(&amp;rbio-&gt;dbitmap, sector_nr, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int finish_parity_scrub(struct btrfs_raid_bio *rbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_io_context *bioc = rbio-&gt;bioc;</div><div class='del'>-	const u32 sectorsize = bioc-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	void **pointers = rbio-&gt;finish_pointers;</div><div class='ctx'> 	unsigned long *pbitmap = &amp;rbio-&gt;finish_pbitmap;</div><div class='ctx'> 	int nr_data = rbio-&gt;nr_data;</div><div class='del'>-	int stripe;</div><div class='ctx'> 	int sectornr;</div><div class='ctx'> 	bool has_qstripe;</div><div class='del'>-	struct sector_ptr p_sector = { 0 };</div><div class='del'>-	struct sector_ptr q_sector = { 0 };</div><div class='add'>+	struct page *page;</div><div class='add'>+	phys_addr_t p_paddr = INVALID_PADDR;</div><div class='add'>+	phys_addr_t q_paddr = INVALID_PADDR;</div><div class='ctx'> 	struct bio_list bio_list;</div><div class='ctx'> 	int is_replace = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2437,72 +2736,39 @@ static int finish_parity_scrub(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_bit(RBIO_CACHE_READY_BIT, &amp;rbio-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	p_sector.page = alloc_page(GFP_NOFS);</div><div class='del'>-	if (!p_sector.page)</div><div class='add'>+	page = alloc_page(GFP_NOFS);</div><div class='add'>+	if (!page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	p_sector.pgoff = 0;</div><div class='del'>-	p_sector.uptodate = 1;</div><div class='add'>+	p_paddr = page_to_phys(page);</div><div class='add'>+	page = NULL;</div><div class='add'>+	pointers[nr_data] = kmap_local_paddr(p_paddr);</div><div class='ctx'> </div><div class='ctx'> 	if (has_qstripe) {</div><div class='ctx'> 		/* RAID6, allocate and map temp space for the Q stripe */</div><div class='del'>-		q_sector.page = alloc_page(GFP_NOFS);</div><div class='del'>-		if (!q_sector.page) {</div><div class='del'>-			__free_page(p_sector.page);</div><div class='del'>-			p_sector.page = NULL;</div><div class='add'>+		page = alloc_page(GFP_NOFS);</div><div class='add'>+		if (!page) {</div><div class='add'>+			__free_page(phys_to_page(p_paddr));</div><div class='add'>+			p_paddr = INVALID_PADDR;</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		q_sector.pgoff = 0;</div><div class='del'>-		q_sector.uptodate = 1;</div><div class='del'>-		pointers[rbio-&gt;real_stripes - 1] = kmap_local_page(q_sector.page);</div><div class='add'>+		q_paddr = page_to_phys(page);</div><div class='add'>+		page = NULL;</div><div class='add'>+		pointers[rbio-&gt;real_stripes - 1] = kmap_local_paddr(q_paddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bitmap_clear(rbio-&gt;error_bitmap, 0, rbio-&gt;nr_sectors);</div><div class='ctx'> </div><div class='ctx'> 	/* Map the parity stripe just once */</div><div class='del'>-	pointers[nr_data] = kmap_local_page(p_sector.page);</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(sectornr, &amp;rbio-&gt;dbitmap, rbio-&gt;stripe_nsectors) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='del'>-		void *parity;</div><div class='del'>-</div><div class='del'>-		/* first collect one page from each data stripe */</div><div class='del'>-		for (stripe = 0; stripe &lt; nr_data; stripe++) {</div><div class='del'>-			sector = sector_in_rbio(rbio, stripe, sectornr, 0);</div><div class='del'>-			pointers[stripe] = kmap_local_page(sector-&gt;page) +</div><div class='del'>-					   sector-&gt;pgoff;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (has_qstripe) {</div><div class='del'>-			/* RAID6, call the library function to fill in our P/Q */</div><div class='del'>-			raid6_call.gen_syndrome(rbio-&gt;real_stripes, sectorsize,</div><div class='del'>-						pointers);</div><div class='del'>-		} else {</div><div class='del'>-			/* raid5 */</div><div class='del'>-			memcpy(pointers[nr_data], pointers[0], sectorsize);</div><div class='del'>-			run_xor(pointers + 1, nr_data - 1, sectorsize);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* Check scrubbing parity and repair it */</div><div class='del'>-		sector = rbio_stripe_sector(rbio, rbio-&gt;scrubp, sectornr);</div><div class='del'>-		parity = kmap_local_page(sector-&gt;page) + sector-&gt;pgoff;</div><div class='del'>-		if (memcmp(parity, pointers[rbio-&gt;scrubp], sectorsize) != 0)</div><div class='del'>-			memcpy(parity, pointers[rbio-&gt;scrubp], sectorsize);</div><div class='del'>-		else</div><div class='del'>-			/* Parity is right, needn't writeback */</div><div class='del'>-			bitmap_clear(&amp;rbio-&gt;dbitmap, sectornr, 1);</div><div class='del'>-		kunmap_local(parity);</div><div class='del'>-</div><div class='del'>-		for (stripe = nr_data - 1; stripe &gt;= 0; stripe--)</div><div class='del'>-			kunmap_local(pointers[stripe]);</div><div class='del'>-	}</div><div class='add'>+	for_each_set_bit(sectornr, &amp;rbio-&gt;dbitmap, rbio-&gt;stripe_nsectors)</div><div class='add'>+		verify_one_parity_sector(rbio, pointers, sectornr);</div><div class='ctx'> </div><div class='ctx'> 	kunmap_local(pointers[nr_data]);</div><div class='del'>-	__free_page(p_sector.page);</div><div class='del'>-	p_sector.page = NULL;</div><div class='del'>-	if (q_sector.page) {</div><div class='del'>-		kunmap_local(pointers[rbio-&gt;real_stripes - 1]);</div><div class='del'>-		__free_page(q_sector.page);</div><div class='del'>-		q_sector.page = NULL;</div><div class='add'>+	__free_page(phys_to_page(p_paddr));</div><div class='add'>+	p_paddr = INVALID_PADDR;</div><div class='add'>+	if (q_paddr != INVALID_PADDR) {</div><div class='add'>+		__free_page(phys_to_page(q_paddr));</div><div class='add'>+		q_paddr = INVALID_PADDR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2511,10 +2777,10 @@ static int finish_parity_scrub(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	 * everything else.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_set_bit(sectornr, &amp;rbio-&gt;dbitmap, rbio-&gt;stripe_nsectors) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, rbio-&gt;scrubp, sectornr);</div><div class='del'>-		ret = rbio_add_io_sector(rbio, &amp;bio_list, sector, rbio-&gt;scrubp,</div><div class='add'>+		paddrs = rbio_stripe_paddrs(rbio, rbio-&gt;scrubp, sectornr);</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, &amp;bio_list, paddrs, rbio-&gt;scrubp,</div><div class='ctx'> 					 sectornr, REQ_OP_WRITE);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -2527,13 +2793,12 @@ static int finish_parity_scrub(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	 * Replace is running and our parity stripe needs to be duplicated to</div><div class='ctx'> 	 * the target device.  Check we have a valid source stripe number.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(rbio-&gt;bioc-&gt;replace_stripe_src &gt;= 0);</div><div class='add'>+	ASSERT_RBIO(rbio-&gt;bioc-&gt;replace_stripe_src &gt;= 0, rbio);</div><div class='ctx'> 	for_each_set_bit(sectornr, pbitmap, rbio-&gt;stripe_nsectors) {</div><div class='del'>-		struct sector_ptr *sector;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, rbio-&gt;scrubp, sectornr);</div><div class='del'>-		ret = rbio_add_io_sector(rbio, &amp;bio_list, sector,</div><div class='del'>-					 rbio-&gt;real_stripes,</div><div class='add'>+		paddrs = rbio_stripe_paddrs(rbio, rbio-&gt;scrubp, sectornr);</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, &amp;bio_list, paddrs, rbio-&gt;real_stripes,</div><div class='ctx'> 					 sectornr, REQ_OP_WRITE);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -2581,9 +2846,9 @@ static int recover_scrub_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 		int failb;</div><div class='ctx'> 		int found_errors;</div><div class='ctx'> </div><div class='del'>-		found_errors = get_rbio_veritical_errors(rbio, sector_nr,</div><div class='add'>+		found_errors = get_rbio_vertical_errors(rbio, sector_nr,</div><div class='ctx'> 							 &amp;faila, &amp;failb);</div><div class='del'>-		if (found_errors &gt; rbio-&gt;bioc-&gt;max_errors) {</div><div class='add'>+		if (unlikely(found_errors &gt; rbio-&gt;bioc-&gt;max_errors)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2607,7 +2872,7 @@ static int recover_scrub_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 		 * data, so the capability of the repair is declined.  (In the</div><div class='ctx'> 		 * case of RAID5, we can not repair anything.)</div><div class='ctx'> 		 */</div><div class='del'>-		if (dfail &gt; rbio-&gt;bioc-&gt;max_errors - 1) {</div><div class='add'>+		if (unlikely(dfail &gt; rbio-&gt;bioc-&gt;max_errors - 1)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2624,7 +2889,7 @@ static int recover_scrub_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 		 * scrubbing parity, luckily, use the other one to repair the</div><div class='ctx'> 		 * data, or we can not repair the data stripe.</div><div class='ctx'> 		 */</div><div class='del'>-		if (failp != rbio-&gt;scrubp) {</div><div class='add'>+		if (unlikely(failp != rbio-&gt;scrubp)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2650,7 +2915,7 @@ static int scrub_assemble_read_bios(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	     total_sector_nr++) {</div><div class='ctx'> 		int sectornr = total_sector_nr % rbio-&gt;stripe_nsectors;</div><div class='ctx'> 		int stripe = total_sector_nr / rbio-&gt;stripe_nsectors;</div><div class='del'>-		struct sector_ptr *sector;</div><div class='add'>+		phys_addr_t *paddrs;</div><div class='ctx'> </div><div class='ctx'> 		/* No data in the vertical stripe, no need to read. */</div><div class='ctx'> 		if (!test_bit(sectornr, &amp;rbio-&gt;dbitmap))</div><div class='hunk'>@@ -2658,22 +2923,23 @@ static int scrub_assemble_read_bios(struct btrfs_raid_bio *rbio)</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We want to find all the sectors missing from the rbio and</div><div class='del'>-		 * read them from the disk. If sector_in_rbio() finds a sector</div><div class='add'>+		 * read them from the disk. If sector_paddr_in_rbio() finds a sector</div><div class='ctx'> 		 * in the bio list we don't need to read it off the stripe.</div><div class='ctx'> 		 */</div><div class='del'>-		sector = sector_in_rbio(rbio, stripe, sectornr, 1);</div><div class='del'>-		if (sector)</div><div class='add'>+		paddrs = sector_paddrs_in_rbio(rbio, stripe, sectornr, 1);</div><div class='add'>+		if (paddrs == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sector = rbio_stripe_sector(rbio, stripe, sectornr);</div><div class='add'>+		paddrs = rbio_stripe_paddrs(rbio, stripe, sectornr);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The bio cache may have handed us an uptodate sector.  If so,</div><div class='ctx'> 		 * use it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sector-&gt;uptodate)</div><div class='add'>+		if (test_bit(rbio_sector_index(rbio, stripe, sectornr),</div><div class='add'>+			     rbio-&gt;stripe_uptodate_bitmap))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = rbio_add_io_sector(rbio, &amp;bio_list, sector, stripe,</div><div class='add'>+		ret = rbio_add_io_paddrs(rbio, &amp;bio_list, paddrs, stripe,</div><div class='ctx'> 					 sectornr, REQ_OP_READ);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			bio_list_put(&amp;bio_list);</div><div class='hunk'>@@ -2714,8 +2980,8 @@ static void scrub_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'> 	for (sector_nr = 0; sector_nr &lt; rbio-&gt;stripe_nsectors; sector_nr++) {</div><div class='ctx'> 		int found_errors;</div><div class='ctx'> </div><div class='del'>-		found_errors = get_rbio_veritical_errors(rbio, sector_nr, NULL, NULL);</div><div class='del'>-		if (found_errors &gt; rbio-&gt;bioc-&gt;max_errors) {</div><div class='add'>+		found_errors = get_rbio_vertical_errors(rbio, sector_nr, NULL, NULL);</div><div class='add'>+		if (unlikely(found_errors &gt; rbio-&gt;bioc-&gt;max_errors)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2739,17 +3005,17 @@ void raid56_parity_submit_scrub_rbio(struct btrfs_raid_bio *rbio)</div><div class='ctx'>  * This is for scrub call sites where we already have correct data contents.</div><div class='ctx'>  * This allows us to avoid reading data stripes again.</div><div class='ctx'>  *</div><div class='del'>- * Unfortunately here we have to do page copy, other than reusing the pages.</div><div class='add'>+ * Unfortunately here we have to do folio copy, other than reusing the pages.</div><div class='ctx'>  * This is due to the fact rbio has its own page management for its cache.</div><div class='ctx'>  */</div><div class='del'>-void raid56_parity_cache_data_pages(struct btrfs_raid_bio *rbio,</div><div class='del'>-				    struct page **data_pages, u64 data_logical)</div><div class='add'>+void raid56_parity_cache_data_folios(struct btrfs_raid_bio *rbio,</div><div class='add'>+				     struct folio **data_folios, u64 data_logical)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = rbio-&gt;bioc-&gt;fs_info;</div><div class='ctx'> 	const u64 offset_in_full_stripe = data_logical -</div><div class='ctx'> 					  rbio-&gt;bioc-&gt;full_stripe_logical;</div><div class='del'>-	const int page_index = offset_in_full_stripe &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	const u32 sectorsize = rbio-&gt;bioc-&gt;fs_info-&gt;sectorsize;</div><div class='del'>-	const u32 sectors_per_page = PAGE_SIZE / sectorsize;</div><div class='add'>+	unsigned int findex = 0;</div><div class='add'>+	unsigned int foffset = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2768,14 +3034,24 @@ void raid56_parity_cache_data_pages(struct btrfs_raid_bio *rbio,</div><div class='ctx'> 	ASSERT(IS_ALIGNED(offset_in_full_stripe, BTRFS_STRIPE_LEN));</div><div class='ctx'> 	ASSERT(offset_in_full_stripe &lt; (rbio-&gt;nr_data &lt;&lt; BTRFS_STRIPE_LEN_SHIFT));</div><div class='ctx'> </div><div class='del'>-	for (int page_nr = 0; page_nr &lt; (BTRFS_STRIPE_LEN &gt;&gt; PAGE_SHIFT); page_nr++) {</div><div class='del'>-		struct page *dst = rbio-&gt;stripe_pages[page_nr + page_index];</div><div class='del'>-		struct page *src = data_pages[page_nr];</div><div class='del'>-</div><div class='del'>-		memcpy_page(dst, 0, src, 0, PAGE_SIZE);</div><div class='del'>-		for (int sector_nr = sectors_per_page * page_index;</div><div class='del'>-		     sector_nr &lt; sectors_per_page * (page_index + 1);</div><div class='del'>-		     sector_nr++)</div><div class='del'>-			rbio-&gt;stripe_sectors[sector_nr].uptodate = true;</div><div class='add'>+	for (unsigned int cur_off = offset_in_full_stripe;</div><div class='add'>+	     cur_off &lt; offset_in_full_stripe + BTRFS_STRIPE_LEN;</div><div class='add'>+	     cur_off += PAGE_SIZE) {</div><div class='add'>+		const unsigned int pindex = cur_off &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		void *kaddr;</div><div class='add'>+</div><div class='add'>+		kaddr = kmap_local_page(rbio-&gt;stripe_pages[pindex]);</div><div class='add'>+		memcpy_from_folio(kaddr, data_folios[findex], foffset, PAGE_SIZE);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='add'>+</div><div class='add'>+		foffset += PAGE_SIZE;</div><div class='add'>+		ASSERT(foffset &lt;= folio_size(data_folios[findex]));</div><div class='add'>+		if (foffset == folio_size(data_folios[findex])) {</div><div class='add'>+			findex++;</div><div class='add'>+			foffset = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	bitmap_set(rbio-&gt;stripe_uptodate_bitmap,</div><div class='add'>+		   offset_in_full_stripe &gt;&gt; fs_info-&gt;sectorsize_bits,</div><div class='add'>+		   BTRFS_STRIPE_LEN &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/raid56.h b/fs/btrfs/raid56.h<br/>index 470213688872..1f463ecf7e41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid56.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/raid56.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/raid56.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/raid56.h</a></div><div class='hunk'>@@ -7,15 +7,101 @@</div><div class='ctx'> #ifndef BTRFS_RAID56_H</div><div class='ctx'> #define BTRFS_RAID56_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> </div><div class='add'>+struct page;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+</div><div class='ctx'> enum btrfs_rbio_ops {</div><div class='ctx'> 	BTRFS_RBIO_WRITE,</div><div class='ctx'> 	BTRFS_RBIO_READ_REBUILD,</div><div class='ctx'> 	BTRFS_RBIO_PARITY_SCRUB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Overview of btrfs_raid_bio.</div><div class='add'>+ *</div><div class='add'>+ * One btrfs_raid_bio represents a full stripe of RAID56, including both data</div><div class='add'>+ * and P/Q stripes. For now, each data and P/Q stripe is of a fixed length (64K).</div><div class='add'>+ *</div><div class='add'>+ * One btrfs_raid_bio can have one or more bios from higher layer, covering</div><div class='add'>+ * part or all of the data stripes.</div><div class='add'>+ *</div><div class='add'>+ * [PAGES FROM HIGHER LAYER BIOS]</div><div class='add'>+ * Higher layer bios are in the btrfs_raid_bio::bio_list.</div><div class='add'>+ *</div><div class='add'>+ * Pages from the bio_list are represented like the following:</div><div class='add'>+ *</div><div class='add'>+ * bio_list:	     |&lt;- Bio 1 -&gt;|             |&lt;- Bio 2 -&gt;|  ...</div><div class='add'>+ * bio_paddrs:	    [0]   [1]   [2]    [3]    [4]    [5]      ...</div><div class='add'>+ *</div><div class='add'>+ * If there is a bio covering a sector (one btrfs fs block), the corresponding</div><div class='add'>+ * pointer in btrfs_raid_bio::bio_paddrs[] will point to the physical address</div><div class='add'>+ * (with the offset inside the page) of the corresponding bio.</div><div class='add'>+ *</div><div class='add'>+ * If there is no bio covering a sector, then btrfs_raid_bio::bio_paddrs[i] will</div><div class='add'>+ * be INVALID_PADDR.</div><div class='add'>+ *</div><div class='add'>+ * The length of each entry in bio_paddrs[] is a step (aka, min(sectorsize, PAGE_SIZE)).</div><div class='add'>+ *</div><div class='add'>+ * [PAGES FOR INTERNAL USAGES]</div><div class='add'>+ * Pages not covered by any bio or belonging to P/Q stripes are stored in</div><div class='add'>+ * btrfs_raid_bio::stripe_pages[] and stripe_paddrs[], like the following:</div><div class='add'>+ *</div><div class='add'>+ * stripe_pages:       |&lt;- Page 0 -&gt;|&lt;- Page 1 -&gt;|  ...</div><div class='add'>+ * stripe_paddrs:     [0]    [1]   [2]    [3]   [4] ...</div><div class='add'>+ *</div><div class='add'>+ * stripe_pages[] array stores all the pages covering the full stripe, including</div><div class='add'>+ * data and P/Q pages.</div><div class='add'>+ * stripe_pages[0] is the first page of the first data stripe.</div><div class='add'>+ * stripe_pages[BTRFS_STRIPE_LEN / PAGE_SIZE] is the first page of the second</div><div class='add'>+ * data stripe.</div><div class='add'>+ *</div><div class='add'>+ * Some pointers inside stripe_pages[] can be NULL, e.g. for a full stripe write</div><div class='add'>+ * (the bio covers all data stripes) there is no need to allocate pages for</div><div class='add'>+ * data stripes (can grab from bio_paddrs[]).</div><div class='add'>+ *</div><div class='add'>+ * If the corresponding page of stripe_paddrs[i] is not allocated, the value of</div><div class='add'>+ * stripe_paddrs[i] will be INVALID_PADDR.</div><div class='add'>+ *</div><div class='add'>+ * The length of each entry in stripe_paddrs[] is a step.</div><div class='add'>+ *</div><div class='add'>+ * [LOCATING A SECTOR]</div><div class='add'>+ * To locate a sector for IO, we need the following info:</div><div class='add'>+ *</div><div class='add'>+ * - stripe_nr</div><div class='add'>+ *   Starts from 0 (representing the first data stripe), ends at</div><div class='add'>+ *   @nr_data (RAID5, P stripe) or @nr_data + 1 (RAID6, Q stripe).</div><div class='add'>+ *</div><div class='add'>+ * - sector_nr</div><div class='add'>+ *   Starts from 0 (representing the first sector of the stripe), ends</div><div class='add'>+ *   at BTRFS_STRIPE_LEN / sectorsize - 1.</div><div class='add'>+ *</div><div class='add'>+ * - step_nr</div><div class='add'>+ *   A step is min(sector_size, PAGE_SIZE).</div><div class='add'>+ *</div><div class='add'>+ *   Starts from 0 (representing the first step of the sector), ends</div><div class='add'>+ *   at @sector_nsteps - 1.</div><div class='add'>+ *</div><div class='add'>+ *   For most call sites they do not need to bother this parameter.</div><div class='add'>+ *   It is for bs &gt; ps support and only for vertical stripe related works.</div><div class='add'>+ *   (e.g. RMW/recover)</div><div class='add'>+ *</div><div class='add'>+ * - from which array</div><div class='add'>+ *   Whether grabbing from stripe_paddrs[] (aka, internal pages) or from the</div><div class='add'>+ *   bio_paddrs[] (aka, from the higher layer bios).</div><div class='add'>+ *</div><div class='add'>+ * For IO, a physical address is returned, so that we can extract the page and</div><div class='add'>+ * the offset inside the page for IO.</div><div class='add'>+ * A special value INVALID_PADDR represents when the physical address is invalid,</div><div class='add'>+ * normally meaning there is no page allocated for the specified sector.</div><div class='add'>+ */</div><div class='ctx'> struct btrfs_raid_bio {</div><div class='ctx'> 	struct btrfs_io_context *bioc;</div><div class='ctx'> </div><div class='hunk'>@@ -73,6 +159,14 @@ struct btrfs_raid_bio {</div><div class='ctx'> 	/* How many sectors there are for each stripe */</div><div class='ctx'> 	u8 stripe_nsectors;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * How many steps there are for one sector.</div><div class='add'>+	 *</div><div class='add'>+	 * For bs &gt; ps cases, it's sectorsize / PAGE_SIZE.</div><div class='add'>+	 * For bs &lt;= ps cases, it's always 1.</div><div class='add'>+	 */</div><div class='add'>+	u8 sector_nsteps;</div><div class='add'>+</div><div class='ctx'> 	/* Stripe number that we're scrubbing  */</div><div class='ctx'> 	u8 scrubp;</div><div class='ctx'> </div><div class='hunk'>@@ -107,13 +201,13 @@ struct btrfs_raid_bio {</div><div class='ctx'> 	struct page **stripe_pages;</div><div class='ctx'> </div><div class='ctx'> 	/* Pointers to the sectors in the bio_list, for faster lookup */</div><div class='del'>-	struct sector_ptr *bio_sectors;</div><div class='add'>+	phys_addr_t *bio_paddrs;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For subpage support, we need to map each sector to above</div><div class='del'>-	 * stripe_pages.</div><div class='del'>-	 */</div><div class='del'>-	struct sector_ptr *stripe_sectors;</div><div class='add'>+	/* Pointers to the sectors in the stripe_pages[]. */</div><div class='add'>+	phys_addr_t *stripe_paddrs;</div><div class='add'>+</div><div class='add'>+	/* Each set bit means the corresponding sector in stripe_sectors[] is uptodate. */</div><div class='add'>+	unsigned long *stripe_uptodate_bitmap;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocated with real_stripes-many pointers for finish_*() calls */</div><div class='ctx'> 	void **finish_pointers;</div><div class='hunk'>@@ -122,10 +216,6 @@ struct btrfs_raid_bio {</div><div class='ctx'> 	 * The bitmap recording where IO errors happened.</div><div class='ctx'> 	 * Each bit is corresponding to one sector in either bio_sectors[] or</div><div class='ctx'> 	 * stripe_sectors[] array.</div><div class='del'>-	 *</div><div class='del'>-	 * The reason we don't use another bit in sector_ptr is, we have two</div><div class='del'>-	 * arrays of sectors, and a lot of IO can use sectors in both arrays.</div><div class='del'>-	 * Thus making it much harder to iterate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long *error_bitmap;</div><div class='ctx'> </div><div class='hunk'>@@ -192,8 +282,8 @@ struct btrfs_raid_bio *raid56_parity_alloc_scrub_rbio(struct bio *bio,</div><div class='ctx'> 				unsigned long *dbitmap, int stripe_nsectors);</div><div class='ctx'> void raid56_parity_submit_scrub_rbio(struct btrfs_raid_bio *rbio);</div><div class='ctx'> </div><div class='del'>-void raid56_parity_cache_data_pages(struct btrfs_raid_bio *rbio,</div><div class='del'>-				    struct page **data_pages, u64 data_logical);</div><div class='add'>+void raid56_parity_cache_data_folios(struct btrfs_raid_bio *rbio,</div><div class='add'>+				     struct folio **data_folios, u64 data_logical);</div><div class='ctx'> </div><div class='ctx'> int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info);</div><div class='ctx'> void btrfs_free_stripe_hash_table(struct btrfs_fs_info *info);</div><div class='head'>diff --git a/fs/btrfs/rcu-string.h b/fs/btrfs/rcu-string.h<br/>deleted file mode 100644<br/>index 5c2b66d155ef..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/rcu-string.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/rcu-string.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2012 Red Hat.  All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef BTRFS_RCU_STRING_H</div><div class='del'>-#define BTRFS_RCU_STRING_H</div><div class='del'>-</div><div class='del'>-struct rcu_string {</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-	char str[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct rcu_string *rcu_string_strdup(const char *src, gfp_t mask)</div><div class='del'>-{</div><div class='del'>-	size_t len = strlen(src) + 1;</div><div class='del'>-	struct rcu_string *ret = kzalloc(sizeof(struct rcu_string) +</div><div class='del'>-					 (len * sizeof(char)), mask);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return ret;</div><div class='del'>-	/* Warn if the source got unexpectedly truncated. */</div><div class='del'>-	if (WARN_ON(strscpy(ret-&gt;str, src, len) &lt; 0)) {</div><div class='del'>-		kfree(ret);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void rcu_string_free(struct rcu_string *str)</div><div class='del'>-{</div><div class='del'>-	if (str)</div><div class='del'>-		kfree_rcu(str, rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define printk_in_rcu(fmt, ...) do {	\</div><div class='del'>-	rcu_read_lock();		\</div><div class='del'>-	printk(fmt, __VA_ARGS__);	\</div><div class='del'>-	rcu_read_unlock();		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define printk_ratelimited_in_rcu(fmt, ...) do {	\</div><div class='del'>-	rcu_read_lock();				\</div><div class='del'>-	printk_ratelimited(fmt, __VA_ARGS__);		\</div><div class='del'>-	rcu_read_unlock();				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define rcu_str_deref(rcu_str) ({				\</div><div class='del'>-	struct rcu_string *__str = rcu_dereference(rcu_str);	\</div><div class='del'>-	__str-&gt;str;						\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c<br/>index 6486f0d7e993..e9224145d754 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ref-verify.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ref-verify.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ref-verify.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ref-verify.c</a></div><div class='hunk'>@@ -75,69 +75,70 @@ struct block_entry {</div><div class='ctx'> 	struct list_head actions;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int block_entry_bytenr_key_cmp(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 *bytenr = key;</div><div class='add'>+	const struct block_entry *entry = rb_entry(node, struct block_entry, node);</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;bytenr &lt; *bytenr)</div><div class='add'>+		return 1;</div><div class='add'>+	else if (entry-&gt;bytenr &gt; *bytenr)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int block_entry_bytenr_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	const struct block_entry *new_entry = rb_entry(new, struct block_entry, node);</div><div class='add'>+</div><div class='add'>+	return block_entry_bytenr_key_cmp(&amp;new_entry-&gt;bytenr, existing);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct block_entry *insert_block_entry(struct rb_root *root,</div><div class='ctx'> 					      struct block_entry *be)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='del'>-	struct block_entry *entry;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		entry = rb_entry(parent_node, struct block_entry, node);</div><div class='del'>-		if (entry-&gt;bytenr &gt; be-&gt;bytenr)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else if (entry-&gt;bytenr &lt; be-&gt;bytenr)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	rb_link_node(&amp;be-&gt;node, parent_node, p);</div><div class='del'>-	rb_insert_color(&amp;be-&gt;node, root);</div><div class='del'>-	return NULL;</div><div class='add'>+	node = rb_find_add(&amp;be-&gt;node, root, block_entry_bytenr_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct block_entry, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct block_entry *lookup_block_entry(struct rb_root *root, u64 bytenr)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-	struct block_entry *entry = NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	n = root-&gt;rb_node;</div><div class='del'>-	while (n) {</div><div class='del'>-		entry = rb_entry(n, struct block_entry, node);</div><div class='del'>-		if (entry-&gt;bytenr &lt; bytenr)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else if (entry-&gt;bytenr &gt; bytenr)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	node = rb_find(&amp;bytenr, root, block_entry_bytenr_key_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct block_entry, node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int root_entry_root_objectid_key_cmp(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 *objectid = key;</div><div class='add'>+	const struct root_entry *entry = rb_entry(node, struct root_entry, node);</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;root_objectid &lt; *objectid)</div><div class='add'>+		return 1;</div><div class='add'>+	else if (entry-&gt;root_objectid &gt; *objectid)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int root_entry_root_objectid_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	const struct root_entry *new_entry = rb_entry(new, struct root_entry, node);</div><div class='add'>+</div><div class='add'>+	return root_entry_root_objectid_key_cmp(&amp;new_entry-&gt;root_objectid, existing);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct root_entry *insert_root_entry(struct rb_root *root,</div><div class='ctx'> 					    struct root_entry *re)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='del'>-	struct root_entry *entry;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		entry = rb_entry(parent_node, struct root_entry, node);</div><div class='del'>-		if (entry-&gt;root_objectid &gt; re-&gt;root_objectid)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else if (entry-&gt;root_objectid &lt; re-&gt;root_objectid)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_link_node(&amp;re-&gt;node, parent_node, p);</div><div class='del'>-	rb_insert_color(&amp;re-&gt;node, root);</div><div class='del'>-	return NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='add'>+	node = rb_find_add(&amp;re-&gt;node, root, root_entry_root_objectid_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct root_entry, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int comp_refs(struct ref_entry *ref1, struct ref_entry *ref2)</div><div class='hunk'>@@ -161,48 +162,29 @@ static int comp_refs(struct ref_entry *ref1, struct ref_entry *ref2)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ref_entry_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	struct ref_entry *new_entry = rb_entry(new, struct ref_entry, node);</div><div class='add'>+	struct ref_entry *existing_entry = rb_entry(existing, struct ref_entry, node);</div><div class='add'>+</div><div class='add'>+	return comp_refs(new_entry, existing_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ref_entry *insert_ref_entry(struct rb_root *root,</div><div class='ctx'> 					  struct ref_entry *ref)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='del'>-	struct rb_node *parent_node = NULL;</div><div class='del'>-	struct ref_entry *entry;</div><div class='del'>-	int cmp;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent_node = *p;</div><div class='del'>-		entry = rb_entry(parent_node, struct ref_entry, node);</div><div class='del'>-		cmp = comp_refs(entry, ref);</div><div class='del'>-		if (cmp &gt; 0)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else if (cmp &lt; 0)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_link_node(&amp;ref-&gt;node, parent_node, p);</div><div class='del'>-	rb_insert_color(&amp;ref-&gt;node, root);</div><div class='del'>-	return NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='add'>+	node = rb_find_add(&amp;ref-&gt;node, root, ref_entry_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct ref_entry, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct root_entry *lookup_root_entry(struct rb_root *root, u64 objectid)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-	struct root_entry *entry = NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	n = root-&gt;rb_node;</div><div class='del'>-	while (n) {</div><div class='del'>-		entry = rb_entry(n, struct root_entry, node);</div><div class='del'>-		if (entry-&gt;root_objectid &lt; objectid)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else if (entry-&gt;root_objectid &gt; objectid)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return entry;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	node = rb_find(&amp;objectid, root, root_entry_root_objectid_key_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct root_entry, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_STACKTRACE</div><div class='hunk'>@@ -441,7 +423,8 @@ static int process_extent_item(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	u32 item_size = btrfs_item_size(leaf, slot);</div><div class='ctx'> 	unsigned long end, ptr;</div><div class='ctx'> 	u64 offset, flags, count;</div><div class='del'>-	int type, ret;</div><div class='add'>+	int type;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, slot, struct btrfs_extent_item);</div><div class='ctx'> 	flags = btrfs_extent_flags(leaf, ei);</div><div class='hunk'>@@ -486,7 +469,11 @@ static int process_extent_item(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 						  key-&gt;objectid, key-&gt;offset);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_EXTENT_OWNER_REF_KEY:</div><div class='del'>-			WARN_ON(!btrfs_fs_incompat(fs_info, SIMPLE_QUOTA));</div><div class='add'>+			if (!btrfs_fs_incompat(fs_info, SIMPLE_QUOTA)) {</div><div class='add'>+				btrfs_err(fs_info,</div><div class='add'>+			  "found extent owner ref without simple quotas enabled");</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			btrfs_err(fs_info, "invalid key type in iref");</div><div class='hunk'>@@ -663,7 +650,7 @@ static void dump_block_entry(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * our sanity checks pass as they are no longer needed.</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='del'>-		       struct btrfs_ref *generic_ref)</div><div class='add'>+		       const struct btrfs_ref *generic_ref)</div><div class='ctx'> {</div><div class='ctx'> 	struct ref_entry *ref = NULL, *exist;</div><div class='ctx'> 	struct ref_action *ra = NULL;</div><div class='hunk'>@@ -673,7 +660,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	bool metadata;</div><div class='ctx'> 	u64 bytenr = generic_ref-&gt;bytenr;</div><div class='del'>-	u64 num_bytes = generic_ref-&gt;len;</div><div class='add'>+	u64 num_bytes = generic_ref-&gt;num_bytes;</div><div class='ctx'> 	u64 parent = generic_ref-&gt;parent;</div><div class='ctx'> 	u64 ref_root = 0;</div><div class='ctx'> 	u64 owner = 0;</div><div class='hunk'>@@ -684,11 +671,11 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	if (generic_ref-&gt;type == BTRFS_REF_METADATA) {</div><div class='ctx'> 		if (!parent)</div><div class='del'>-			ref_root = generic_ref-&gt;tree_ref.ref_root;</div><div class='add'>+			ref_root = generic_ref-&gt;ref_root;</div><div class='ctx'> 		owner = generic_ref-&gt;tree_ref.level;</div><div class='ctx'> 	} else if (!parent) {</div><div class='del'>-		ref_root = generic_ref-&gt;data_ref.ref_root;</div><div class='del'>-		owner = generic_ref-&gt;data_ref.ino;</div><div class='add'>+		ref_root = generic_ref-&gt;ref_root;</div><div class='add'>+		owner = generic_ref-&gt;data_ref.objectid;</div><div class='ctx'> 		offset = generic_ref-&gt;data_ref.offset;</div><div class='ctx'> 	}</div><div class='ctx'> 	metadata = owner &lt; BTRFS_FIRST_FREE_OBJECTID;</div><div class='hunk'>@@ -852,6 +839,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='ctx'> "dropping a ref for a root that doesn't have a ref on the block");</div><div class='ctx'> 			dump_block_entry(fs_info, be);</div><div class='ctx'> 			dump_ref_action(fs_info, ra);</div><div class='add'>+			rb_erase(&amp;ref-&gt;node, &amp;be-&gt;refs);</div><div class='ctx'> 			kfree(ref);</div><div class='ctx'> 			kfree(ra);</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -889,8 +877,10 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;ref_verify_lock);</div><div class='ctx'> out:</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_free_ref_cache(fs_info);</div><div class='ctx'> 		btrfs_clear_opt(fs_info-&gt;mount_opt, REF_VERIFY);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -981,7 +971,7 @@ void btrfs_free_ref_tree_range(struct btrfs_fs_info *fs_info, u64 start,</div><div class='ctx'> int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *extent_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int tree_block_level = 0;</div><div class='ctx'> 	u64 bytenr = 0, num_bytes = 0;</div><div class='hunk'>@@ -990,11 +980,18 @@ int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	if (!btrfs_test_opt(fs_info, REF_VERIFY))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	extent_root = btrfs_extent_root(fs_info, 0);</div><div class='add'>+	/* If the extent tree is damaged we cannot ignore it (IGNOREBADROOTS). */</div><div class='add'>+	if (!extent_root) {</div><div class='add'>+		btrfs_warn(fs_info, "ref-verify: extent tree not available, disabling");</div><div class='add'>+		btrfs_clear_opt(fs_info-&gt;mount_opt, REF_VERIFY);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	extent_root = btrfs_extent_root(fs_info, 0);</div><div class='ctx'> 	eb = btrfs_read_lock_root_node(extent_root);</div><div class='ctx'> 	level = btrfs_header_level(eb);</div><div class='ctx'> 	path-&gt;nodes[level] = eb;</div><div class='hunk'>@@ -1021,9 +1018,8 @@ int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		btrfs_clear_opt(fs_info-&gt;mount_opt, REF_VERIFY);</div><div class='ctx'> 		btrfs_free_ref_cache(fs_info);</div><div class='add'>+		btrfs_clear_opt(fs_info-&gt;mount_opt, REF_VERIFY);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/ref-verify.h b/fs/btrfs/ref-verify.h<br/>index 855de37719b5..1ce544d53cc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ref-verify.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ref-verify.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ref-verify.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ref-verify.h</a></div><div class='hunk'>@@ -6,11 +6,20 @@</div><div class='ctx'> #ifndef BTRFS_REF_VERIFY_H</div><div class='ctx'> #define BTRFS_REF_VERIFY_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/rbtree_types.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_ref;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='ctx'> int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_free_ref_cache(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='del'>-		       struct btrfs_ref *generic_ref);</div><div class='add'>+		       const struct btrfs_ref *generic_ref);</div><div class='ctx'> void btrfs_free_ref_tree_range(struct btrfs_fs_info *fs_info, u64 start,</div><div class='ctx'> 			       u64 len);</div><div class='ctx'> </div><div class='hunk'>@@ -30,7 +39,7 @@ static inline void btrfs_free_ref_cache(struct btrfs_fs_info *fs_info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,</div><div class='del'>-		       struct btrfs_ref *generic_ref)</div><div class='add'>+				     const struct btrfs_ref *generic_ref)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -44,6 +53,6 @@ static inline void btrfs_init_ref_verify(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_BTRFS_FS_REF_VERIFY */</div><div class='add'>+#endif /* CONFIG_BTRFS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c<br/>index ae90894dc7dc..b5fe95baf92e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/reflink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/reflink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/reflink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/reflink.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/fscrypt.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "fs.h"</div><div class='hunk'>@@ -23,7 +24,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     u64 endoff,</div><div class='ctx'> 				     const u64 destoff,</div><div class='ctx'> 				     const u64 olen,</div><div class='del'>-				     int no_time_update)</div><div class='add'>+				     bool no_time_update)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -43,14 +44,12 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ret = btrfs_end_transaction(trans);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_end_transaction(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int copy_inline_to_page(struct btrfs_inode *inode,</div><div class='hunk'>@@ -66,7 +65,7 @@ static int copy_inline_to_page(struct btrfs_inode *inode,</div><div class='ctx'> 	const size_t inline_size = size - btrfs_file_extent_calc_inline_size(0);</div><div class='ctx'> 	char *data_start = inline_data + btrfs_file_extent_calc_inline_size(0);</div><div class='ctx'> 	struct extent_changeset *data_reserved = NULL;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -83,20 +82,20 @@ static int copy_inline_to_page(struct btrfs_inode *inode,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	page = find_or_create_page(mapping, file_offset &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				   btrfs_alloc_write_mask(mapping));</div><div class='del'>-	if (!page) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	folio = __filemap_get_folio(mapping, file_offset &gt;&gt; PAGE_SHIFT,</div><div class='add'>+					FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					btrfs_alloc_write_mask(mapping));</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = set_page_extent_mapped(page);</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	clear_extent_bit(&amp;inode-&gt;io_tree, file_offset, range_end,</div><div class='del'>-			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,</div><div class='del'>-			 NULL);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;inode-&gt;io_tree, file_offset, range_end,</div><div class='add'>+			       EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, NULL);</div><div class='ctx'> 	ret = btrfs_set_extent_delalloc(inode, file_offset, range_end, 0, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -115,15 +114,15 @@ static int copy_inline_to_page(struct btrfs_inode *inode,</div><div class='ctx'> 	set_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (comp_type == BTRFS_COMPRESS_NONE) {</div><div class='del'>-		memcpy_to_page(page, offset_in_page(file_offset), data_start,</div><div class='del'>-			       datal);</div><div class='add'>+		memcpy_to_folio(folio, offset_in_folio(folio, file_offset), data_start,</div><div class='add'>+					datal);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = btrfs_decompress(comp_type, data_start, page,</div><div class='del'>-				       offset_in_page(file_offset),</div><div class='add'>+		ret = btrfs_decompress(comp_type, data_start, folio,</div><div class='add'>+				       offset_in_folio(folio, file_offset),</div><div class='ctx'> 				       inline_size, datal);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_unlock;</div><div class='del'>-		flush_dcache_page(page);</div><div class='add'>+		flush_dcache_folio(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -139,15 +138,15 @@ static int copy_inline_to_page(struct btrfs_inode *inode,</div><div class='ctx'> 	 * So what's in the range [500, 4095] corresponds to zeroes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (datal &lt; block_size)</div><div class='del'>-		memzero_page(page, datal, block_size - datal);</div><div class='add'>+		folio_zero_range(folio, datal, block_size - datal);</div><div class='ctx'> </div><div class='del'>-	btrfs_folio_set_uptodate(fs_info, page_folio(page), file_offset, block_size);</div><div class='del'>-	btrfs_folio_clear_checked(fs_info, page_folio(page), file_offset, block_size);</div><div class='del'>-	btrfs_folio_set_dirty(fs_info, page_folio(page), file_offset, block_size);</div><div class='add'>+	btrfs_folio_set_uptodate(fs_info, folio, file_offset, block_size);</div><div class='add'>+	btrfs_folio_clear_checked(fs_info, folio, file_offset, block_size);</div><div class='add'>+	btrfs_folio_set_dirty(fs_info, folio, file_offset, block_size);</div><div class='ctx'> out_unlock:</div><div class='del'>-	if (page) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+	if (!IS_ERR(folio)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_delalloc_release_space(inode, data_reserved, file_offset,</div><div class='hunk'>@@ -164,7 +163,7 @@ out:</div><div class='ctx'>  * the source inode to destination inode when possible. When not possible we</div><div class='ctx'>  * copy the inline extent's data into the respective page of the inode.</div><div class='ctx'>  */</div><div class='del'>-static int clone_copy_inline_extent(struct inode *dst,</div><div class='add'>+static int clone_copy_inline_extent(struct btrfs_inode *inode,</div><div class='ctx'> 				    struct btrfs_path *path,</div><div class='ctx'> 				    struct btrfs_key *new_key,</div><div class='ctx'> 				    const u64 drop_start,</div><div class='hunk'>@@ -174,8 +173,8 @@ static int clone_copy_inline_extent(struct inode *dst,</div><div class='ctx'> 				    char *inline_data,</div><div class='ctx'> 				    struct btrfs_trans_handle **trans_out)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(dst-&gt;i_sb);</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(dst)-&gt;root;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='add'>+	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	const u64 aligned_end = ALIGN(new_key-&gt;offset + datal,</div><div class='ctx'> 				      fs_info-&gt;sectorsize);</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='hunk'>@@ -184,12 +183,12 @@ static int clone_copy_inline_extent(struct inode *dst,</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	if (new_key-&gt;offset &gt; 0) {</div><div class='del'>-		ret = copy_inline_to_page(BTRFS_I(dst), new_key-&gt;offset,</div><div class='add'>+		ret = copy_inline_to_page(inode, new_key-&gt;offset,</div><div class='ctx'> 					  inline_data, size, datal, comp_type);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key.objectid = btrfs_ino(BTRFS_I(dst));</div><div class='add'>+	key.objectid = btrfs_ino(inode);</div><div class='ctx'> 	key.type = BTRFS_EXTENT_DATA_KEY;</div><div class='ctx'> 	key.offset = 0;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='hunk'>@@ -204,7 +203,7 @@ static int clone_copy_inline_extent(struct inode *dst,</div><div class='ctx'> 				goto copy_inline_extent;</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='del'>-		if (key.objectid == btrfs_ino(BTRFS_I(dst)) &amp;&amp;</div><div class='add'>+		if (key.objectid == btrfs_ino(inode) &amp;&amp;</div><div class='ctx'> 		    key.type == BTRFS_EXTENT_DATA_KEY) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * There's an implicit hole at file offset 0, copy the</div><div class='hunk'>@@ -213,7 +212,7 @@ static int clone_copy_inline_extent(struct inode *dst,</div><div class='ctx'> 			ASSERT(key.offset &gt; 0);</div><div class='ctx'> 			goto copy_to_page;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (i_size_read(dst) &lt;= datal) {</div><div class='add'>+	} else if (i_size_read(&amp;inode-&gt;vfs_inode) &lt;= datal) {</div><div class='ctx'> 		struct btrfs_file_extent_item *ei;</div><div class='ctx'> </div><div class='ctx'> 		ei = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='hunk'>@@ -235,7 +234,7 @@ copy_inline_extent:</div><div class='ctx'> 	 * We have no extent items, or we have an extent at offset 0 which may</div><div class='ctx'> 	 * or may not be inlined. All these cases are dealt the same way.</div><div class='ctx'> 	 */</div><div class='del'>-	if (i_size_read(dst) &gt; datal) {</div><div class='add'>+	if (i_size_read(&amp;inode-&gt;vfs_inode) &gt; datal) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * At the destination offset 0 we have either a hole, a regular</div><div class='ctx'> 		 * extent or an inline extent larger then the one we want to</div><div class='hunk'>@@ -269,20 +268,26 @@ copy_inline_extent:</div><div class='ctx'> 	drop_args.start = drop_start;</div><div class='ctx'> 	drop_args.end = aligned_end;</div><div class='ctx'> 	drop_args.drop_cache = true;</div><div class='del'>-	ret = btrfs_drop_extents(trans, root, BTRFS_I(dst), &amp;drop_args);</div><div class='del'>-	if (ret)</div><div class='add'>+	ret = btrfs_drop_extents(trans, root, inode, &amp;drop_args);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, root, path, new_key, size);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	write_extent_buffer(path-&gt;nodes[0], inline_data,</div><div class='ctx'> 			    btrfs_item_ptr_offset(path-&gt;nodes[0],</div><div class='ctx'> 						  path-&gt;slots[0]),</div><div class='ctx'> 			    size);</div><div class='del'>-	btrfs_update_inode_bytes(BTRFS_I(dst), datal, drop_args.bytes_found);</div><div class='del'>-	btrfs_set_inode_full_sync(BTRFS_I(dst));</div><div class='del'>-	ret = btrfs_inode_set_file_extent_range(BTRFS_I(dst), 0, aligned_end);</div><div class='add'>+	btrfs_update_inode_bytes(inode, datal, drop_args.bytes_found);</div><div class='add'>+	btrfs_set_inode_full_sync(inode);</div><div class='add'>+	ret = btrfs_inode_set_file_extent_range(inode, 0, aligned_end);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> out:</div><div class='ctx'> 	if (!ret &amp;&amp; !trans) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -297,10 +302,8 @@ out:</div><div class='ctx'> 			trans = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (ret &amp;&amp; trans) {</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='add'>+	if (ret &amp;&amp; trans)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='del'>-	}</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		*trans_out = trans;</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +320,7 @@ copy_to_page:</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	ret = copy_inline_to_page(BTRFS_I(dst), new_key-&gt;offset,</div><div class='add'>+	ret = copy_inline_to_page(inode, new_key-&gt;offset,</div><div class='ctx'> 				  inline_data, size, datal, comp_type);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='hunk'>@@ -335,13 +338,13 @@ copy_to_page:</div><div class='ctx'>  */</div><div class='ctx'> static int btrfs_clone(struct inode *src, struct inode *inode,</div><div class='ctx'> 		       const u64 off, const u64 olen, const u64 olen_aligned,</div><div class='del'>-		       const u64 destoff, int no_time_update)</div><div class='add'>+		       const u64 destoff, bool no_time_update)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	char *buf = NULL;</div><div class='add'>+	char AUTO_KVFREE(buf);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u32 nritems;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -356,10 +359,8 @@ static int btrfs_clone(struct inode *src, struct inode *inode,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		kvfree(buf);</div><div class='add'>+	if (!path)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> 	/* Clone data */</div><div class='hunk'>@@ -525,7 +526,7 @@ process_slot:</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = clone_copy_inline_extent(inode, path, &amp;new_key,</div><div class='add'>+			ret = clone_copy_inline_extent(BTRFS_I(inode), path, &amp;new_key,</div><div class='ctx'> 						       drop_start, datal, size,</div><div class='ctx'> 						       comp, buf, &amp;trans);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -609,70 +610,44 @@ process_slot:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	kvfree(buf);</div><div class='ctx'> 	clear_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_double_extent_unlock(struct inode *inode1, u64 loff1,</div><div class='del'>-				       struct inode *inode2, u64 loff2, u64 len)</div><div class='del'>-{</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode1)-&gt;io_tree, loff1, loff1 + len - 1, NULL);</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode2)-&gt;io_tree, loff2, loff2 + len - 1, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btrfs_double_extent_lock(struct inode *inode1, u64 loff1,</div><div class='del'>-				     struct inode *inode2, u64 loff2, u64 len)</div><div class='del'>-{</div><div class='del'>-	u64 range1_end = loff1 + len - 1;</div><div class='del'>-	u64 range2_end = loff2 + len - 1;</div><div class='del'>-</div><div class='del'>-	if (inode1 &lt; inode2) {</div><div class='del'>-		swap(inode1, inode2);</div><div class='del'>-		swap(loff1, loff2);</div><div class='del'>-		swap(range1_end, range2_end);</div><div class='del'>-	} else if (inode1 == inode2 &amp;&amp; loff2 &lt; loff1) {</div><div class='del'>-		swap(loff1, loff2);</div><div class='del'>-		swap(range1_end, range2_end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lock_extent(&amp;BTRFS_I(inode1)-&gt;io_tree, loff1, range1_end, NULL);</div><div class='del'>-	lock_extent(&amp;BTRFS_I(inode2)-&gt;io_tree, loff2, range2_end, NULL);</div><div class='del'>-</div><div class='del'>-	btrfs_assert_inode_range_clean(BTRFS_I(inode1), loff1, range1_end);</div><div class='del'>-	btrfs_assert_inode_range_clean(BTRFS_I(inode2), loff2, range2_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void btrfs_double_mmap_lock(struct inode *inode1, struct inode *inode2)</div><div class='add'>+static void btrfs_double_mmap_lock(struct btrfs_inode *inode1, struct btrfs_inode *inode2)</div><div class='ctx'> {</div><div class='ctx'> 	if (inode1 &lt; inode2)</div><div class='ctx'> 		swap(inode1, inode2);</div><div class='del'>-	down_write(&amp;BTRFS_I(inode1)-&gt;i_mmap_lock);</div><div class='del'>-	down_write_nested(&amp;BTRFS_I(inode2)-&gt;i_mmap_lock, SINGLE_DEPTH_NESTING);</div><div class='add'>+	down_write(&amp;inode1-&gt;i_mmap_lock);</div><div class='add'>+	down_write_nested(&amp;inode2-&gt;i_mmap_lock, SINGLE_DEPTH_NESTING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void btrfs_double_mmap_unlock(struct inode *inode1, struct inode *inode2)</div><div class='add'>+static void btrfs_double_mmap_unlock(struct btrfs_inode *inode1, struct btrfs_inode *inode2)</div><div class='ctx'> {</div><div class='del'>-	up_write(&amp;BTRFS_I(inode1)-&gt;i_mmap_lock);</div><div class='del'>-	up_write(&amp;BTRFS_I(inode2)-&gt;i_mmap_lock);</div><div class='add'>+	up_write(&amp;inode1-&gt;i_mmap_lock);</div><div class='add'>+	up_write(&amp;inode2-&gt;i_mmap_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len,</div><div class='del'>-				   struct inode *dst, u64 dst_loff)</div><div class='add'>+static int btrfs_extent_same_range(struct btrfs_inode *src, u64 loff, u64 len,</div><div class='add'>+				   struct btrfs_inode *dst, u64 dst_loff)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = BTRFS_I(src)-&gt;root-&gt;fs_info;</div><div class='del'>-	const u64 bs = fs_info-&gt;sb-&gt;s_blocksize;</div><div class='add'>+	const u64 end = dst_loff + len - 1;</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='add'>+	struct btrfs_fs_info *fs_info = src-&gt;root-&gt;fs_info;</div><div class='add'>+	const u64 bs = fs_info-&gt;sectorsize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Lock destination range to serialize with concurrent readahead() and</div><div class='del'>-	 * source range to serialize with relocation.</div><div class='add'>+	 * Lock destination range to serialize with concurrent readahead(), and</div><div class='add'>+	 * we are safe from concurrency with relocation of source extents</div><div class='add'>+	 * because we have already locked the inode's i_mmap_lock in exclusive</div><div class='add'>+	 * mode.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_double_extent_lock(src, loff, dst, dst_loff, len);</div><div class='del'>-	ret = btrfs_clone(src, dst, loff, len, ALIGN(len, bs), dst_loff, 1);</div><div class='del'>-	btrfs_double_extent_unlock(src, loff, dst, dst_loff, len);</div><div class='add'>+	btrfs_lock_extent(&amp;dst-&gt;io_tree, dst_loff, end, &amp;cached_state);</div><div class='add'>+	ret = btrfs_clone(&amp;src-&gt;vfs_inode, &amp;dst-&gt;vfs_inode, loff, len,</div><div class='add'>+			  ALIGN(len, bs), dst_loff, 1);</div><div class='add'>+	btrfs_unlock_extent(&amp;dst-&gt;io_tree, dst_loff, end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='ctx'> </div><div class='hunk'>@@ -690,7 +665,7 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,</div><div class='ctx'> 	if (root_dst-&gt;send_in_progress) {</div><div class='ctx'> 		btrfs_warn_rl(root_dst-&gt;fs_info,</div><div class='ctx'> "cannot deduplicate to root %llu while send operations are using it (%d in progress)",</div><div class='del'>-			      root_dst-&gt;root_key.objectid,</div><div class='add'>+			      btrfs_root_id(root_dst),</div><div class='ctx'> 			      root_dst-&gt;send_in_progress);</div><div class='ctx'> 		spin_unlock(&amp;root_dst-&gt;root_item_lock);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -702,8 +677,8 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,</div><div class='ctx'> 	chunk_count = div_u64(olen, BTRFS_MAX_DEDUPE_LEN);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; chunk_count; i++) {</div><div class='del'>-		ret = btrfs_extent_same_range(src, loff, BTRFS_MAX_DEDUPE_LEN,</div><div class='del'>-					      dst, dst_loff);</div><div class='add'>+		ret = btrfs_extent_same_range(BTRFS_I(src), loff, BTRFS_MAX_DEDUPE_LEN,</div><div class='add'>+					      BTRFS_I(dst), dst_loff);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -712,7 +687,8 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tail_len &gt; 0)</div><div class='del'>-		ret = btrfs_extent_same_range(src, loff, tail_len, dst, dst_loff);</div><div class='add'>+		ret = btrfs_extent_same_range(BTRFS_I(src), loff, tail_len,</div><div class='add'>+					      BTRFS_I(dst), dst_loff);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_lock(&amp;root_dst-&gt;root_item_lock);</div><div class='ctx'> 	root_dst-&gt;dedupe_in_progress--;</div><div class='hunk'>@@ -724,13 +700,15 @@ out:</div><div class='ctx'> static noinline int btrfs_clone_files(struct file *file, struct file *file_src,</div><div class='ctx'> 					u64 off, u64 olen, u64 destoff)</div><div class='ctx'> {</div><div class='add'>+	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct inode *src = file_inode(file_src);</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int wb_ret;</div><div class='ctx'> 	u64 len = olen;</div><div class='del'>-	u64 bs = fs_info-&gt;sb-&gt;s_blocksize;</div><div class='add'>+	u64 bs = fs_info-&gt;sectorsize;</div><div class='add'>+	u64 end;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * VFS's generic_remap_file_range_prep() protects us from cloning the</div><div class='hunk'>@@ -756,26 +734,29 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src,</div><div class='ctx'> 		 * we found the previous extent covering eof and before we</div><div class='ctx'> 		 * attempted to increment its reference count).</div><div class='ctx'> 		 */</div><div class='del'>-		ret = btrfs_wait_ordered_range(inode, wb_start,</div><div class='add'>+		ret = btrfs_wait_ordered_range(BTRFS_I(inode), wb_start,</div><div class='ctx'> 					       destoff - wb_start);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Lock destination range to serialize with concurrent readahead() and</div><div class='del'>-	 * source range to serialize with relocation.</div><div class='add'>+	 * Lock destination range to serialize with concurrent readahead(), and</div><div class='add'>+	 * we are safe from concurrency with relocation of source extents</div><div class='add'>+	 * because we have already locked the inode's i_mmap_lock in exclusive</div><div class='add'>+	 * mode.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_double_extent_lock(src, off, inode, destoff, len);</div><div class='add'>+	end = destoff + len - 1;</div><div class='add'>+	btrfs_lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, destoff, end, &amp;cached_state);</div><div class='ctx'> 	ret = btrfs_clone(src, inode, off, olen, len, destoff, 0);</div><div class='del'>-	btrfs_double_extent_unlock(src, off, inode, destoff, len);</div><div class='add'>+	btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, destoff, end, &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We may have copied an inline extent into a page of the destination</div><div class='ctx'> 	 * range, so wait for writeback to complete before truncating pages</div><div class='ctx'> 	 * from the page cache. This is a rare case.</div><div class='ctx'> 	 */</div><div class='del'>-	wb_ret = btrfs_wait_ordered_range(inode, destoff, len);</div><div class='add'>+	wb_ret = btrfs_wait_ordered_range(BTRFS_I(inode), destoff, len);</div><div class='ctx'> 	ret = ret ? ret : wb_ret;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Truncate page cache pages so that future reads will see the cloned</div><div class='hunk'>@@ -794,24 +775,28 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 				       struct file *file_out, loff_t pos_out,</div><div class='ctx'> 				       loff_t *len, unsigned int remap_flags)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode_in = file_inode(file_in);</div><div class='del'>-	struct inode *inode_out = file_inode(file_out);</div><div class='del'>-	u64 bs = BTRFS_I(inode_out)-&gt;root-&gt;fs_info-&gt;sb-&gt;s_blocksize;</div><div class='add'>+	struct btrfs_inode *inode_in = BTRFS_I(file_inode(file_in));</div><div class='add'>+	struct btrfs_inode *inode_out = BTRFS_I(file_inode(file_out));</div><div class='add'>+	u64 bs = inode_out-&gt;root-&gt;fs_info-&gt;sectorsize;</div><div class='ctx'> 	u64 wb_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(remap_flags &amp; REMAP_FILE_DEDUP)) {</div><div class='del'>-		struct btrfs_root *root_out = BTRFS_I(inode_out)-&gt;root;</div><div class='add'>+		struct btrfs_root *root_out = inode_out-&gt;root;</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_root_readonly(root_out))</div><div class='ctx'> 			return -EROFS;</div><div class='ctx'> </div><div class='del'>-		ASSERT(inode_in-&gt;i_sb == inode_out-&gt;i_sb);</div><div class='add'>+		ASSERT(inode_in-&gt;vfs_inode.i_sb == inode_out-&gt;vfs_inode.i_sb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Can only reflink encrypted files if both files are encrypted. */</div><div class='add'>+	if (IS_ENCRYPTED(&amp;inode_in-&gt;vfs_inode) != IS_ENCRYPTED(&amp;inode_out-&gt;vfs_inode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* Don't make the dst file partly checksummed */</div><div class='del'>-	if ((BTRFS_I(inode_in)-&gt;flags &amp; BTRFS_INODE_NODATASUM) !=</div><div class='del'>-	    (BTRFS_I(inode_out)-&gt;flags &amp; BTRFS_INODE_NODATASUM)) {</div><div class='add'>+	if ((inode_in-&gt;flags &amp; BTRFS_INODE_NODATASUM) !=</div><div class='add'>+	    (inode_out-&gt;flags &amp; BTRFS_INODE_NODATASUM)) {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -830,7 +815,7 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	 *    to complete so that new file extent items are in the fs tree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (*len == 0 &amp;&amp; !(remap_flags &amp; REMAP_FILE_DEDUP))</div><div class='del'>-		wb_len = ALIGN(inode_in-&gt;i_size, bs) - ALIGN_DOWN(pos_in, bs);</div><div class='add'>+		wb_len = ALIGN(inode_in-&gt;vfs_inode.i_size, bs) - ALIGN_DOWN(pos_in, bs);</div><div class='ctx'> 	else</div><div class='ctx'> 		wb_len = ALIGN(*len, bs);</div><div class='ctx'> </div><div class='hunk'>@@ -851,16 +836,14 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	 * Also we don't need to check ASYNC_EXTENT, as async extent will be</div><div class='ctx'> 	 * CoWed anyway, not affecting nocow part.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = filemap_flush(inode_in-&gt;i_mapping);</div><div class='add'>+	ret = filemap_flush(inode_in-&gt;vfs_inode.i_mapping);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_wait_ordered_range(inode_in, ALIGN_DOWN(pos_in, bs),</div><div class='del'>-				       wb_len);</div><div class='add'>+	ret = btrfs_wait_ordered_range(inode_in, ALIGN_DOWN(pos_in, bs), wb_len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = btrfs_wait_ordered_range(inode_out, ALIGN_DOWN(pos_out, bs),</div><div class='del'>-				       wb_len);</div><div class='add'>+	ret = btrfs_wait_ordered_range(inode_out, ALIGN_DOWN(pos_out, bs), wb_len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -882,18 +865,21 @@ loff_t btrfs_remap_file_range(struct file *src_file, loff_t off,</div><div class='ctx'> 		struct file *dst_file, loff_t destoff, loff_t len,</div><div class='ctx'> 		unsigned int remap_flags)</div><div class='ctx'> {</div><div class='del'>-	struct inode *src_inode = file_inode(src_file);</div><div class='del'>-	struct inode *dst_inode = file_inode(dst_file);</div><div class='add'>+	struct btrfs_inode *src_inode = BTRFS_I(file_inode(src_file));</div><div class='add'>+	struct btrfs_inode *dst_inode = BTRFS_I(file_inode(dst_file));</div><div class='ctx'> 	bool same_inode = dst_inode == src_inode;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(btrfs_is_shutdown(inode_to_fs_info(file_inode(src_file)))))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (remap_flags &amp; ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (same_inode) {</div><div class='del'>-		btrfs_inode_lock(BTRFS_I(src_inode), BTRFS_ILOCK_MMAP);</div><div class='add'>+		btrfs_inode_lock(src_inode, BTRFS_ILOCK_MMAP);</div><div class='ctx'> 	} else {</div><div class='del'>-		lock_two_nondirectories(src_inode, dst_inode);</div><div class='add'>+		lock_two_nondirectories(&amp;src_inode-&gt;vfs_inode, &amp;dst_inode-&gt;vfs_inode);</div><div class='ctx'> 		btrfs_double_mmap_lock(src_inode, dst_inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -903,16 +889,18 @@ loff_t btrfs_remap_file_range(struct file *src_file, loff_t off,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (remap_flags &amp; REMAP_FILE_DEDUP)</div><div class='del'>-		ret = btrfs_extent_same(src_inode, off, len, dst_inode, destoff);</div><div class='add'>+		ret = btrfs_extent_same(&amp;src_inode-&gt;vfs_inode, off, len,</div><div class='add'>+					&amp;dst_inode-&gt;vfs_inode, destoff);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = btrfs_clone_files(dst_file, src_file, off, len, destoff);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	if (same_inode) {</div><div class='del'>-		btrfs_inode_unlock(BTRFS_I(src_inode), BTRFS_ILOCK_MMAP);</div><div class='add'>+		btrfs_inode_unlock(src_inode, BTRFS_ILOCK_MMAP);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_double_mmap_unlock(src_inode, dst_inode);</div><div class='del'>-		unlock_two_nondirectories(src_inode, dst_inode);</div><div class='add'>+		unlock_two_nondirectories(&amp;src_inode-&gt;vfs_inode,</div><div class='add'>+					  &amp;dst_inode-&gt;vfs_inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/fs/btrfs/reflink.h b/fs/btrfs/reflink.h<br/>index ecb309b4dad0..1e291f7d85c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/reflink.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/reflink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/reflink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/reflink.h</a></div><div class='hunk'>@@ -3,7 +3,9 @@</div><div class='ctx'> #ifndef BTRFS_REFLINK_H</div><div class='ctx'> #define BTRFS_REFLINK_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct file;</div><div class='ctx'> </div><div class='ctx'> loff_t btrfs_remap_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 			      struct file *file_out, loff_t pos_out,</div><div class='head'>diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c<br/>index abe594f77f99..5bfefc3e9c06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/relocation.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/relocation.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/relocation.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/relocation.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include "relocation.h"</div><div class='ctx'> #include "super.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='add'>+#include "raid-stripe-tree.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Relocation overview</div><div class='hunk'>@@ -89,10 +90,15 @@</div><div class='ctx'>  * map address of tree root to tree</div><div class='ctx'>  */</div><div class='ctx'> struct mapping_node {</div><div class='del'>-	struct {</div><div class='del'>-		struct rb_node rb_node;</div><div class='del'>-		u64 bytenr;</div><div class='del'>-	}; /* Use rb_simle_node for search/insert */</div><div class='add'>+	union {</div><div class='add'>+		/* Use rb_simple_node for search/insert */</div><div class='add'>+		struct {</div><div class='add'>+			struct rb_node rb_node;</div><div class='add'>+			u64 bytenr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		struct rb_simple_node simple_node;</div><div class='add'>+	};</div><div class='ctx'> 	void *data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -105,10 +111,15 @@ struct mapping_tree {</div><div class='ctx'>  * present a tree block to process</div><div class='ctx'>  */</div><div class='ctx'> struct tree_block {</div><div class='del'>-	struct {</div><div class='del'>-		struct rb_node rb_node;</div><div class='del'>-		u64 bytenr;</div><div class='del'>-	}; /* Use rb_simple_node for search/insert */</div><div class='add'>+	union {</div><div class='add'>+		/* Use rb_simple_node for search/insert */</div><div class='add'>+		struct {</div><div class='add'>+			struct rb_node rb_node;</div><div class='add'>+			u64 bytenr;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		struct rb_simple_node simple_node;</div><div class='add'>+	};</div><div class='ctx'> 	u64 owner;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u8 level;</div><div class='hunk'>@@ -177,8 +188,9 @@ static void mark_block_processed(struct reloc_control *rc,</div><div class='ctx'> 	    in_range(node-&gt;bytenr, rc-&gt;block_group-&gt;start,</div><div class='ctx'> 		     rc-&gt;block_group-&gt;length)) {</div><div class='ctx'> 		blocksize = rc-&gt;extent_root-&gt;fs_info-&gt;nodesize;</div><div class='del'>-		set_extent_bit(&amp;rc-&gt;processed_blocks, node-&gt;bytenr,</div><div class='del'>-			       node-&gt;bytenr + blocksize - 1, EXTENT_DIRTY, NULL);</div><div class='add'>+		btrfs_set_extent_bit(&amp;rc-&gt;processed_blocks, node-&gt;bytenr,</div><div class='add'>+				     node-&gt;bytenr + blocksize - 1, EXTENT_DIRTY,</div><div class='add'>+				     NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	node-&gt;processed = 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -194,8 +206,8 @@ static struct btrfs_backref_node *walk_up_backref(</div><div class='ctx'> 	int idx = *index;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;node-&gt;upper)) {</div><div class='del'>-		edge = list_entry(node-&gt;upper.next,</div><div class='del'>-				  struct btrfs_backref_edge, list[LOWER]);</div><div class='add'>+		edge = list_first_entry(&amp;node-&gt;upper, struct btrfs_backref_edge,</div><div class='add'>+					list[LOWER]);</div><div class='ctx'> 		edges[idx++] = edge;</div><div class='ctx'> 		node = edge-&gt;node[UPPER];</div><div class='ctx'> 	}</div><div class='hunk'>@@ -221,8 +233,8 @@ static struct btrfs_backref_node *walk_down_backref(</div><div class='ctx'> 			idx--;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		edge = list_entry(edge-&gt;list[LOWER].next,</div><div class='del'>-				  struct btrfs_backref_edge, list[LOWER]);</div><div class='add'>+		edge = list_first_entry(&amp;edge-&gt;list[LOWER], struct btrfs_backref_edge,</div><div class='add'>+					list[LOWER]);</div><div class='ctx'> 		edges[idx - 1] = edge;</div><div class='ctx'> 		*index = idx;</div><div class='ctx'> 		return edge-&gt;node[UPPER];</div><div class='hunk'>@@ -231,70 +243,6 @@ static struct btrfs_backref_node *walk_down_backref(</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void update_backref_node(struct btrfs_backref_cache *cache,</div><div class='del'>-				struct btrfs_backref_node *node, u64 bytenr)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *rb_node;</div><div class='del'>-	rb_erase(&amp;node-&gt;rb_node, &amp;cache-&gt;rb_root);</div><div class='del'>-	node-&gt;bytenr = bytenr;</div><div class='del'>-	rb_node = rb_simple_insert(&amp;cache-&gt;rb_root, node-&gt;bytenr, &amp;node-&gt;rb_node);</div><div class='del'>-	if (rb_node)</div><div class='del'>-		btrfs_backref_panic(cache-&gt;fs_info, bytenr, -EEXIST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * update backref cache after a transaction commit</div><div class='del'>- */</div><div class='del'>-static int update_backref_cache(struct btrfs_trans_handle *trans,</div><div class='del'>-				struct btrfs_backref_cache *cache)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_backref_node *node;</div><div class='del'>-	int level = 0;</div><div class='del'>-</div><div class='del'>-	if (cache-&gt;last_trans == 0) {</div><div class='del'>-		cache-&gt;last_trans = trans-&gt;transid;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cache-&gt;last_trans == trans-&gt;transid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * detached nodes are used to avoid unnecessary backref</div><div class='del'>-	 * lookup. transaction commit changes the extent tree.</div><div class='del'>-	 * so the detached nodes are no longer useful.</div><div class='del'>-	 */</div><div class='del'>-	while (!list_empty(&amp;cache-&gt;detached)) {</div><div class='del'>-		node = list_entry(cache-&gt;detached.next,</div><div class='del'>-				  struct btrfs_backref_node, list);</div><div class='del'>-		btrfs_backref_cleanup_node(cache, node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;cache-&gt;changed)) {</div><div class='del'>-		node = list_entry(cache-&gt;changed.next,</div><div class='del'>-				  struct btrfs_backref_node, list);</div><div class='del'>-		list_del_init(&amp;node-&gt;list);</div><div class='del'>-		BUG_ON(node-&gt;pending);</div><div class='del'>-		update_backref_node(cache, node, node-&gt;new_bytenr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * some nodes can be left in the pending list if there were</div><div class='del'>-	 * errors during processing the pending nodes.</div><div class='del'>-	 */</div><div class='del'>-	for (level = 0; level &lt; BTRFS_MAX_LEVEL; level++) {</div><div class='del'>-		list_for_each_entry(node, &amp;cache-&gt;pending[level], list) {</div><div class='del'>-			BUG_ON(!node-&gt;pending);</div><div class='del'>-			if (node-&gt;bytenr == node-&gt;new_bytenr)</div><div class='del'>-				continue;</div><div class='del'>-			update_backref_node(cache, node, node-&gt;new_bytenr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cache-&gt;last_trans = 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool reloc_root_is_dead(const struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -405,19 +353,13 @@ static bool handle_useless_nodes(struct reloc_control *rc,</div><div class='ctx'> 		if (cur == node)</div><div class='ctx'> 			ret = true;</div><div class='ctx'> </div><div class='del'>-		/* The node is the lowest node */</div><div class='del'>-		if (cur-&gt;lowest) {</div><div class='del'>-			list_del_init(&amp;cur-&gt;lower);</div><div class='del'>-			cur-&gt;lowest = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Cleanup the lower edges */</div><div class='ctx'> 		while (!list_empty(&amp;cur-&gt;lower)) {</div><div class='ctx'> 			struct btrfs_backref_edge *edge;</div><div class='ctx'> 			struct btrfs_backref_node *lower;</div><div class='ctx'> </div><div class='del'>-			edge = list_entry(cur-&gt;lower.next,</div><div class='del'>-					struct btrfs_backref_edge, list[UPPER]);</div><div class='add'>+			edge = list_first_entry(&amp;cur-&gt;lower, struct btrfs_backref_edge,</div><div class='add'>+						list[UPPER]);</div><div class='ctx'> 			list_del(&amp;edge-&gt;list[UPPER]);</div><div class='ctx'> 			list_del(&amp;edge-&gt;list[LOWER]);</div><div class='ctx'> 			lower = edge-&gt;node[LOWER];</div><div class='hunk'>@@ -436,7 +378,6 @@ static bool handle_useless_nodes(struct reloc_control *rc,</div><div class='ctx'> 		 * cache to avoid unnecessary backref lookup.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (cur-&gt;level &gt; 0) {</div><div class='del'>-			list_add(&amp;cur-&gt;list, &amp;cache-&gt;detached);</div><div class='ctx'> 			cur-&gt;detached = 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rb_erase(&amp;cur-&gt;rb_node, &amp;cache-&gt;rb_root);</div><div class='hunk'>@@ -473,34 +414,31 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(</div><div class='ctx'> 	struct btrfs_backref_node *node = NULL;</div><div class='ctx'> 	struct btrfs_backref_edge *edge;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	iter = btrfs_backref_iter_alloc(rc-&gt;extent_root-&gt;fs_info);</div><div class='ctx'> 	if (!iter)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	node = btrfs_backref_alloc_node(cache, bytenr, level);</div><div class='ctx'> 	if (!node) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	node-&gt;lowest = 1;</div><div class='ctx'> 	cur = node;</div><div class='ctx'> </div><div class='ctx'> 	/* Breadth-first search to build backref cache */</div><div class='ctx'> 	do {</div><div class='ctx'> 		ret = btrfs_backref_add_tree_node(trans, cache, path, iter,</div><div class='ctx'> 						  node_key, cur);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			err = ret;</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		edge = list_first_entry_or_null(&amp;cache-&gt;pending_edge,</div><div class='ctx'> 				struct btrfs_backref_edge, list[UPPER]);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -515,19 +453,18 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(</div><div class='ctx'> </div><div class='ctx'> 	/* Finish the upper linkage of newly added edges/nodes */</div><div class='ctx'> 	ret = btrfs_backref_finish_upper_links(cache, node);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		err = ret;</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (handle_useless_nodes(rc, node))</div><div class='ctx'> 		node = NULL;</div><div class='ctx'> out:</div><div class='del'>-	btrfs_backref_iter_free(iter);</div><div class='add'>+	btrfs_free_path(iter-&gt;path);</div><div class='add'>+	kfree(iter);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='del'>-	if (err) {</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		btrfs_backref_error_cleanup(cache, node);</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	ASSERT(!node || !node-&gt;detached);</div><div class='ctx'> 	ASSERT(list_empty(&amp;cache-&gt;useless_node) &amp;&amp;</div><div class='hunk'>@@ -536,95 +473,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * helper to add backref node for the newly created snapshot.</div><div class='del'>- * the backref node is created by cloning backref node that</div><div class='del'>- * corresponds to root of source tree</div><div class='del'>- */</div><div class='del'>-static int clone_backref_node(struct btrfs_trans_handle *trans,</div><div class='del'>-			      struct reloc_control *rc,</div><div class='del'>-			      const struct btrfs_root *src,</div><div class='del'>-			      struct btrfs_root *dest)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_root *reloc_root = src-&gt;reloc_root;</div><div class='del'>-	struct btrfs_backref_cache *cache = &amp;rc-&gt;backref_cache;</div><div class='del'>-	struct btrfs_backref_node *node = NULL;</div><div class='del'>-	struct btrfs_backref_node *new_node;</div><div class='del'>-	struct btrfs_backref_edge *edge;</div><div class='del'>-	struct btrfs_backref_edge *new_edge;</div><div class='del'>-	struct rb_node *rb_node;</div><div class='del'>-</div><div class='del'>-	if (cache-&gt;last_trans &gt; 0)</div><div class='del'>-		update_backref_cache(trans, cache);</div><div class='del'>-</div><div class='del'>-	rb_node = rb_simple_search(&amp;cache-&gt;rb_root, src-&gt;commit_root-&gt;start);</div><div class='del'>-	if (rb_node) {</div><div class='del'>-		node = rb_entry(rb_node, struct btrfs_backref_node, rb_node);</div><div class='del'>-		if (node-&gt;detached)</div><div class='del'>-			node = NULL;</div><div class='del'>-		else</div><div class='del'>-			BUG_ON(node-&gt;new_bytenr != reloc_root-&gt;node-&gt;start);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!node) {</div><div class='del'>-		rb_node = rb_simple_search(&amp;cache-&gt;rb_root,</div><div class='del'>-					   reloc_root-&gt;commit_root-&gt;start);</div><div class='del'>-		if (rb_node) {</div><div class='del'>-			node = rb_entry(rb_node, struct btrfs_backref_node,</div><div class='del'>-					rb_node);</div><div class='del'>-			BUG_ON(node-&gt;detached);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!node)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	new_node = btrfs_backref_alloc_node(cache, dest-&gt;node-&gt;start,</div><div class='del'>-					    node-&gt;level);</div><div class='del'>-	if (!new_node)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	new_node-&gt;lowest = node-&gt;lowest;</div><div class='del'>-	new_node-&gt;checked = 1;</div><div class='del'>-	new_node-&gt;root = btrfs_grab_root(dest);</div><div class='del'>-	ASSERT(new_node-&gt;root);</div><div class='del'>-</div><div class='del'>-	if (!node-&gt;lowest) {</div><div class='del'>-		list_for_each_entry(edge, &amp;node-&gt;lower, list[UPPER]) {</div><div class='del'>-			new_edge = btrfs_backref_alloc_edge(cache);</div><div class='del'>-			if (!new_edge)</div><div class='del'>-				goto fail;</div><div class='del'>-</div><div class='del'>-			btrfs_backref_link_edge(new_edge, edge-&gt;node[LOWER],</div><div class='del'>-						new_node, LINK_UPPER);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		list_add_tail(&amp;new_node-&gt;lower, &amp;cache-&gt;leaves);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_node = rb_simple_insert(&amp;cache-&gt;rb_root, new_node-&gt;bytenr,</div><div class='del'>-				   &amp;new_node-&gt;rb_node);</div><div class='del'>-	if (rb_node)</div><div class='del'>-		btrfs_backref_panic(trans-&gt;fs_info, new_node-&gt;bytenr, -EEXIST);</div><div class='del'>-</div><div class='del'>-	if (!new_node-&gt;lowest) {</div><div class='del'>-		list_for_each_entry(new_edge, &amp;new_node-&gt;lower, list[UPPER]) {</div><div class='del'>-			list_add_tail(&amp;new_edge-&gt;list[LOWER],</div><div class='del'>-				      &amp;new_edge-&gt;node[LOWER]-&gt;upper);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-fail:</div><div class='del'>-	while (!list_empty(&amp;new_node-&gt;lower)) {</div><div class='del'>-		new_edge = list_entry(new_node-&gt;lower.next,</div><div class='del'>-				      struct btrfs_backref_edge, list[UPPER]);</div><div class='del'>-		list_del(&amp;new_edge-&gt;list[UPPER]);</div><div class='del'>-		btrfs_backref_free_edge(cache, new_edge);</div><div class='del'>-	}</div><div class='del'>-	btrfs_backref_free_node(cache, new_node);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * helper to add 'address of tree root -&gt; reloc tree' mapping</div><div class='ctx'>  */</div><div class='ctx'> static int __add_reloc_root(struct btrfs_root *root)</div><div class='hunk'>@@ -642,8 +490,7 @@ static int __add_reloc_root(struct btrfs_root *root)</div><div class='ctx'> 	node-&gt;data = root;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;rc-&gt;reloc_root_tree.lock);</div><div class='del'>-	rb_node = rb_simple_insert(&amp;rc-&gt;reloc_root_tree.rb_root,</div><div class='del'>-				   node-&gt;bytenr, &amp;node-&gt;rb_node);</div><div class='add'>+	rb_node = rb_simple_insert(&amp;rc-&gt;reloc_root_tree.rb_root, &amp;node-&gt;simple_node);</div><div class='ctx'> 	spin_unlock(&amp;rc-&gt;reloc_root_tree.lock);</div><div class='ctx'> 	if (rb_node) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='hunk'>@@ -664,7 +511,7 @@ static void __del_reloc_root(struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct rb_node *rb_node;</div><div class='del'>-	struct mapping_node *node = NULL;</div><div class='add'>+	struct mapping_node AUTO_KFREE(node);</div><div class='ctx'> 	struct reloc_control *rc = fs_info-&gt;reloc_ctl;</div><div class='ctx'> 	bool put_ref = false;</div><div class='ctx'> </div><div class='hunk'>@@ -697,7 +544,6 @@ static void __del_reloc_root(struct btrfs_root *root)</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> 	if (put_ref)</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='del'>-	kfree(node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -726,8 +572,7 @@ static int __update_reloc_root(struct btrfs_root *root)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;rc-&gt;reloc_root_tree.lock);</div><div class='ctx'> 	node-&gt;bytenr = root-&gt;node-&gt;start;</div><div class='del'>-	rb_node = rb_simple_insert(&amp;rc-&gt;reloc_root_tree.rb_root,</div><div class='del'>-				   node-&gt;bytenr, &amp;node-&gt;rb_node);</div><div class='add'>+	rb_node = rb_simple_insert(&amp;rc-&gt;reloc_root_tree.rb_root, &amp;node-&gt;simple_node);</div><div class='ctx'> 	spin_unlock(&amp;rc-&gt;reloc_root_tree.lock);</div><div class='ctx'> 	if (rb_node)</div><div class='ctx'> 		btrfs_backref_panic(fs_info, node-&gt;bytenr, -EEXIST);</div><div class='hunk'>@@ -740,10 +585,9 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *reloc_root;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='del'>-	struct btrfs_root_item *root_item;</div><div class='add'>+	struct btrfs_root_item AUTO_KFREE(root_item);</div><div class='ctx'> 	struct btrfs_key root_key;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	bool must_abort = false;</div><div class='ctx'> </div><div class='ctx'> 	root_item = kmalloc(sizeof(*root_item), GFP_NOFS);</div><div class='ctx'> 	if (!root_item)</div><div class='hunk'>@@ -753,14 +597,32 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	root_key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='ctx'> 	root_key.offset = objectid;</div><div class='ctx'> </div><div class='del'>-	if (root-&gt;root_key.objectid == objectid) {</div><div class='add'>+	if (btrfs_root_id(root) == objectid) {</div><div class='ctx'> 		u64 commit_root_gen;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Relocation will wait for cleaner thread, and any half-dropped</div><div class='add'>+		 * subvolume will be fully cleaned up at mount time.</div><div class='add'>+		 * So here we shouldn't hit a subvolume with non-zero drop_progress.</div><div class='add'>+		 *</div><div class='add'>+		 * If this isn't the case, error out since it can make us attempt to</div><div class='add'>+		 * drop references for extents that were already dropped before.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(btrfs_disk_key_objectid(&amp;root-&gt;root_item.drop_progress))) {</div><div class='add'>+			struct btrfs_key cpu_key;</div><div class='add'>+</div><div class='add'>+			btrfs_disk_key_to_cpu(&amp;cpu_key, &amp;root-&gt;root_item.drop_progress);</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+	"cannot relocate partially dropped subvolume %llu, drop progress key " BTRFS_KEY_FMT,</div><div class='add'>+				  objectid, BTRFS_KEY_FMT_VALUE(&amp;cpu_key));</div><div class='add'>+			return ERR_PTR(-EUCLEAN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* called by btrfs_init_reloc_root */</div><div class='ctx'> 		ret = btrfs_copy_root(trans, root, root-&gt;commit_root, &amp;eb,</div><div class='ctx'> 				      BTRFS_TREE_RELOC_OBJECTID);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto fail;</div><div class='add'>+			return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set the last_snapshot field to the generation of the commit</div><div class='hunk'>@@ -783,21 +645,20 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = btrfs_copy_root(trans, root, root-&gt;node, &amp;eb,</div><div class='ctx'> 				      BTRFS_TREE_RELOC_OBJECTID);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto fail;</div><div class='add'>+			return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have changed references at this point, we must abort the</div><div class='del'>-	 * transaction if anything fails.</div><div class='add'>+	 * transaction if anything fails (i.e. 'goto abort').</div><div class='ctx'> 	 */</div><div class='del'>-	must_abort = true;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(root_item, &amp;root-&gt;root_item, sizeof(*root_item));</div><div class='ctx'> 	btrfs_set_root_bytenr(root_item, eb-&gt;start);</div><div class='ctx'> 	btrfs_set_root_level(root_item, btrfs_header_level(eb));</div><div class='ctx'> 	btrfs_set_root_generation(root_item, trans-&gt;transid);</div><div class='ctx'> </div><div class='del'>-	if (root-&gt;root_key.objectid == objectid) {</div><div class='add'>+	if (btrfs_root_id(root) == objectid) {</div><div class='ctx'> 		btrfs_set_root_refs(root_item, 0);</div><div class='ctx'> 		memset(&amp;root_item-&gt;drop_progress, 0,</div><div class='ctx'> 		       sizeof(struct btrfs_disk_key));</div><div class='hunk'>@@ -810,9 +671,7 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = btrfs_insert_root(trans, fs_info-&gt;tree_root,</div><div class='ctx'> 				&amp;root_key, root_item);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	kfree(root_item);</div><div class='add'>+		goto abort;</div><div class='ctx'> </div><div class='ctx'> 	reloc_root = btrfs_read_tree_root(fs_info-&gt;tree_root, &amp;root_key);</div><div class='ctx'> 	if (IS_ERR(reloc_root)) {</div><div class='hunk'>@@ -820,13 +679,11 @@ static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto abort;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_bit(BTRFS_ROOT_SHAREABLE, &amp;reloc_root-&gt;state);</div><div class='del'>-	reloc_root-&gt;last_trans = trans-&gt;transid;</div><div class='add'>+	btrfs_set_root_last_trans(reloc_root, trans-&gt;transid);</div><div class='ctx'> 	return reloc_root;</div><div class='del'>-fail:</div><div class='del'>-	kfree(root_item);</div><div class='add'>+</div><div class='ctx'> abort:</div><div class='del'>-	if (must_abort)</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='add'>+	btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -867,7 +724,7 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (root-&gt;reloc_root) {</div><div class='ctx'> 		reloc_root = root-&gt;reloc_root;</div><div class='del'>-		reloc_root-&gt;last_trans = trans-&gt;transid;</div><div class='add'>+		btrfs_set_root_last_trans(reloc_root, trans-&gt;transid);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -875,8 +732,7 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * We are merging reloc roots, we do not need new reloc trees.  Also</div><div class='ctx'> 	 * reloc trees never need their own reloc tree.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!rc-&gt;create_reloc_tree ||</div><div class='del'>-	    root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+	if (!rc-&gt;create_reloc_tree || btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!trans-&gt;reloc_reserved) {</div><div class='hunk'>@@ -884,7 +740,7 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		trans-&gt;block_rsv = rc-&gt;block_rsv;</div><div class='ctx'> 		clear_rsv = 1;</div><div class='ctx'> 	}</div><div class='del'>-	reloc_root = create_reloc_root(trans, root, root-&gt;root_key.objectid);</div><div class='add'>+	reloc_root = create_reloc_root(trans, root, btrfs_root_id(root));</div><div class='ctx'> 	if (clear_rsv)</div><div class='ctx'> 		trans-&gt;block_rsv = rsv;</div><div class='ctx'> 	if (IS_ERR(reloc_root))</div><div class='hunk'>@@ -926,7 +782,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_grab_root(reloc_root);</div><div class='ctx'> </div><div class='ctx'> 	/* root-&gt;reloc_root will stay until current relocation finished */</div><div class='del'>-	if (fs_info-&gt;reloc_ctl-&gt;merge_reloc_tree &amp;&amp;</div><div class='add'>+	if (fs_info-&gt;reloc_ctl &amp;&amp; fs_info-&gt;reloc_ctl-&gt;merge_reloc_tree &amp;&amp;</div><div class='ctx'> 	    btrfs_root_refs(root_item) == 0) {</div><div class='ctx'> 		set_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &amp;root-&gt;state);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -951,67 +807,13 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * helper to find first cached inode with inode number &gt;= objectid</div><div class='del'>- * in a subvolume</div><div class='del'>- */</div><div class='del'>-static struct inode *find_next_inode(struct btrfs_root *root, u64 objectid)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *node;</div><div class='del'>-	struct rb_node *prev;</div><div class='del'>-	struct btrfs_inode *entry;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;root-&gt;inode_lock);</div><div class='del'>-again:</div><div class='del'>-	node = root-&gt;inode_tree.rb_node;</div><div class='del'>-	prev = NULL;</div><div class='del'>-	while (node) {</div><div class='del'>-		prev = node;</div><div class='del'>-		entry = rb_entry(node, struct btrfs_inode, rb_node);</div><div class='del'>-</div><div class='del'>-		if (objectid &lt; btrfs_ino(entry))</div><div class='del'>-			node = node-&gt;rb_left;</div><div class='del'>-		else if (objectid &gt; btrfs_ino(entry))</div><div class='del'>-			node = node-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!node) {</div><div class='del'>-		while (prev) {</div><div class='del'>-			entry = rb_entry(prev, struct btrfs_inode, rb_node);</div><div class='del'>-			if (objectid &lt;= btrfs_ino(entry)) {</div><div class='del'>-				node = prev;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			prev = rb_next(prev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	while (node) {</div><div class='del'>-		entry = rb_entry(node, struct btrfs_inode, rb_node);</div><div class='del'>-		inode = igrab(&amp;entry-&gt;vfs_inode);</div><div class='del'>-		if (inode) {</div><div class='del'>-			spin_unlock(&amp;root-&gt;inode_lock);</div><div class='del'>-			return inode;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		objectid = btrfs_ino(entry) + 1;</div><div class='del'>-		if (cond_resched_lock(&amp;root-&gt;inode_lock))</div><div class='del'>-			goto again;</div><div class='del'>-</div><div class='del'>-		node = rb_next(node);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;root-&gt;inode_lock);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * get new location of data</div><div class='ctx'>  */</div><div class='ctx'> static int get_new_location(struct inode *reloc_inode, u64 *new_bytenr,</div><div class='ctx'> 			    u64 bytenr, u64 num_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(reloc_inode)-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1020,15 +822,13 @@ static int get_new_location(struct inode *reloc_inode, u64 *new_bytenr,</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	bytenr -= BTRFS_I(reloc_inode)-&gt;index_cnt;</div><div class='add'>+	bytenr -= BTRFS_I(reloc_inode)-&gt;reloc_block_group_start;</div><div class='ctx'> 	ret = btrfs_lookup_file_extent(NULL, root, path,</div><div class='ctx'> 			btrfs_ino(BTRFS_I(reloc_inode)), bytenr, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	fi = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='hunk'>@@ -1039,16 +839,11 @@ static int get_new_location(struct inode *reloc_inode, u64 *new_bytenr,</div><div class='ctx'> 	       btrfs_file_extent_encryption(leaf, fi) ||</div><div class='ctx'> 	       btrfs_file_extent_other_encoding(leaf, fi));</div><div class='ctx'> </div><div class='del'>-	if (num_bytes != btrfs_file_extent_disk_num_bytes(leaf, fi)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (num_bytes != btrfs_file_extent_disk_num_bytes(leaf, fi))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	*new_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1064,7 +859,7 @@ int replace_file_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct btrfs_inode *inode = NULL;</div><div class='ctx'> 	u64 parent;</div><div class='ctx'> 	u64 bytenr;</div><div class='ctx'> 	u64 new_bytenr = 0;</div><div class='hunk'>@@ -1074,13 +869,12 @@ int replace_file_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int first = 1;</div><div class='del'>-	int dirty = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rc-&gt;stage != UPDATE_DATA_PTRS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* reloc trees always use full backref */</div><div class='del'>-	if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)</div><div class='ctx'> 		parent = leaf-&gt;start;</div><div class='ctx'> 	else</div><div class='ctx'> 		parent = 0;</div><div class='hunk'>@@ -1109,15 +903,15 @@ int replace_file_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * if we are modifying block in fs tree, wait for read_folio</div><div class='ctx'> 		 * to complete and drop the extent cache</div><div class='ctx'> 		 */</div><div class='del'>-		if (root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) {</div><div class='add'>+		if (btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID) {</div><div class='ctx'> 			if (first) {</div><div class='del'>-				inode = find_next_inode(root, key.objectid);</div><div class='add'>+				inode = btrfs_find_first_inode(root, key.objectid);</div><div class='ctx'> 				first = 0;</div><div class='del'>-			} else if (inode &amp;&amp; btrfs_ino(BTRFS_I(inode)) &lt; key.objectid) {</div><div class='del'>-				btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='del'>-				inode = find_next_inode(root, key.objectid);</div><div class='add'>+			} else if (inode &amp;&amp; btrfs_ino(inode) &lt; key.objectid) {</div><div class='add'>+				btrfs_add_delayed_iput(inode);</div><div class='add'>+				inode = btrfs_find_first_inode(root, key.objectid);</div><div class='ctx'> 			}</div><div class='del'>-			if (inode &amp;&amp; btrfs_ino(BTRFS_I(inode)) == key.objectid) {</div><div class='add'>+			if (inode &amp;&amp; btrfs_ino(inode) == key.objectid) {</div><div class='ctx'> 				struct extent_state *cached_state = NULL;</div><div class='ctx'> </div><div class='ctx'> 				end = key.offset +</div><div class='hunk'>@@ -1126,16 +920,20 @@ int replace_file_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 						    fs_info-&gt;sectorsize));</div><div class='ctx'> 				WARN_ON(!IS_ALIGNED(end, fs_info-&gt;sectorsize));</div><div class='ctx'> 				end--;</div><div class='del'>-				ret = try_lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-						      key.offset, end,</div><div class='del'>-						      &amp;cached_state);</div><div class='del'>-				if (!ret)</div><div class='add'>+				/* Take mmap lock to serialize with reflinks. */</div><div class='add'>+				if (!down_read_trylock(&amp;inode-&gt;i_mmap_lock))</div><div class='add'>+					continue;</div><div class='add'>+				ret = btrfs_try_lock_extent(&amp;inode-&gt;io_tree, key.offset,</div><div class='add'>+							    end, &amp;cached_state);</div><div class='add'>+				if (!ret) {</div><div class='add'>+					up_read(&amp;inode-&gt;i_mmap_lock);</div><div class='ctx'> 					continue;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-				btrfs_drop_extent_map_range(BTRFS_I(inode),</div><div class='del'>-							    key.offset, end, true);</div><div class='del'>-				unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-					      key.offset, end, &amp;cached_state);</div><div class='add'>+				btrfs_drop_extent_map_range(inode, key.offset, end, true);</div><div class='add'>+				btrfs_unlock_extent(&amp;inode-&gt;io_tree, key.offset, end,</div><div class='add'>+						    &amp;cached_state);</div><div class='add'>+				up_read(&amp;inode-&gt;i_mmap_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1150,35 +948,38 @@ int replace_file_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		btrfs_set_file_extent_disk_bytenr(leaf, fi, new_bytenr);</div><div class='del'>-		dirty = 1;</div><div class='ctx'> </div><div class='ctx'> 		key.offset -= btrfs_file_extent_offset(leaf, fi);</div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_ADD_DELAYED_REF, new_bytenr,</div><div class='del'>-				       num_bytes, parent, root-&gt;root_key.objectid);</div><div class='del'>-		btrfs_init_data_ref(&amp;ref, btrfs_header_owner(leaf),</div><div class='del'>-				    key.objectid, key.offset,</div><div class='del'>-				    root-&gt;root_key.objectid, false);</div><div class='add'>+		ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+		ref.bytenr = new_bytenr;</div><div class='add'>+		ref.num_bytes = num_bytes;</div><div class='add'>+		ref.parent = parent;</div><div class='add'>+		ref.owning_root = btrfs_root_id(root);</div><div class='add'>+		ref.ref_root = btrfs_header_owner(leaf);</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, key.objectid, key.offset,</div><div class='add'>+				    btrfs_root_id(root), false);</div><div class='ctx'> 		ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_DROP_DELAYED_REF, bytenr,</div><div class='del'>-				       num_bytes, parent, root-&gt;root_key.objectid);</div><div class='del'>-		btrfs_init_data_ref(&amp;ref, btrfs_header_owner(leaf),</div><div class='del'>-				    key.objectid, key.offset,</div><div class='del'>-				    root-&gt;root_key.objectid, false);</div><div class='add'>+		ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+		ref.bytenr = bytenr;</div><div class='add'>+		ref.num_bytes = num_bytes;</div><div class='add'>+		ref.parent = parent;</div><div class='add'>+		ref.owning_root = btrfs_root_id(root);</div><div class='add'>+		ref.ref_root = btrfs_header_owner(leaf);</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, key.objectid, key.offset,</div><div class='add'>+				    btrfs_root_id(root), false);</div><div class='ctx'> 		ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (dirty)</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	if (inode)</div><div class='del'>-		btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+		btrfs_add_delayed_iput(inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1224,8 +1025,8 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='del'>-	ASSERT(src-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID);</div><div class='del'>-	ASSERT(dest-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID);</div><div class='add'>+	ASSERT(btrfs_root_id(src) == BTRFS_TREE_RELOC_OBJECTID);</div><div class='add'>+	ASSERT(btrfs_root_id(dest) != BTRFS_TREE_RELOC_OBJECTID);</div><div class='ctx'> </div><div class='ctx'> 	last_snapshot = btrfs_root_last_snapshot(&amp;src-&gt;root_item);</div><div class='ctx'> again:</div><div class='hunk'>@@ -1358,7 +1159,7 @@ again:</div><div class='ctx'> 		 * The real subtree rescan is delayed until we have new</div><div class='ctx'> 		 * CoW on the subtree root node before transaction commit.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = btrfs_qgroup_add_swapped_blocks(trans, dest,</div><div class='add'>+		ret = btrfs_qgroup_add_swapped_blocks(dest,</div><div class='ctx'> 				rc-&gt;block_group, parent, slot,</div><div class='ctx'> 				path-&gt;nodes[level], path-&gt;slots[level],</div><div class='ctx'> 				last_snapshot);</div><div class='hunk'>@@ -1369,52 +1170,62 @@ again:</div><div class='ctx'> 		 */</div><div class='ctx'> 		btrfs_set_node_blockptr(parent, slot, new_bytenr);</div><div class='ctx'> 		btrfs_set_node_ptr_generation(parent, slot, new_ptr_gen);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, parent);</div><div class='ctx'> </div><div class='ctx'> 		btrfs_set_node_blockptr(path-&gt;nodes[level],</div><div class='ctx'> 					path-&gt;slots[level], old_bytenr);</div><div class='ctx'> 		btrfs_set_node_ptr_generation(path-&gt;nodes[level],</div><div class='ctx'> 					      path-&gt;slots[level], old_ptr_gen);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, path-&gt;nodes[level]);</div><div class='ctx'> </div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_ADD_DELAYED_REF, old_bytenr,</div><div class='del'>-				       blocksize, path-&gt;nodes[level]-&gt;start,</div><div class='del'>-				       src-&gt;root_key.objectid);</div><div class='del'>-		btrfs_init_tree_ref(&amp;ref, level - 1, src-&gt;root_key.objectid,</div><div class='del'>-				    0, true);</div><div class='add'>+		ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+		ref.bytenr = old_bytenr;</div><div class='add'>+		ref.num_bytes = blocksize;</div><div class='add'>+		ref.parent = path-&gt;nodes[level]-&gt;start;</div><div class='add'>+		ref.owning_root = btrfs_root_id(src);</div><div class='add'>+		ref.ref_root = btrfs_root_id(src);</div><div class='add'>+		btrfs_init_tree_ref(&amp;ref, level - 1, 0, true);</div><div class='ctx'> 		ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_ADD_DELAYED_REF, new_bytenr,</div><div class='del'>-				       blocksize, 0, dest-&gt;root_key.objectid);</div><div class='del'>-		btrfs_init_tree_ref(&amp;ref, level - 1, dest-&gt;root_key.objectid, 0,</div><div class='del'>-				    true);</div><div class='add'>+</div><div class='add'>+		ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+		ref.bytenr = new_bytenr;</div><div class='add'>+		ref.num_bytes = blocksize;</div><div class='add'>+		ref.parent = 0;</div><div class='add'>+		ref.owning_root = btrfs_root_id(dest);</div><div class='add'>+		ref.ref_root = btrfs_root_id(dest);</div><div class='add'>+		btrfs_init_tree_ref(&amp;ref, level - 1, 0, true);</div><div class='ctx'> 		ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* We don't know the real owning_root, use 0. */</div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_DROP_DELAYED_REF, new_bytenr,</div><div class='del'>-				       blocksize, path-&gt;nodes[level]-&gt;start, 0);</div><div class='del'>-		btrfs_init_tree_ref(&amp;ref, level - 1, src-&gt;root_key.objectid,</div><div class='del'>-				    0, true);</div><div class='add'>+		ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+		ref.bytenr = new_bytenr;</div><div class='add'>+		ref.num_bytes = blocksize;</div><div class='add'>+		ref.parent = path-&gt;nodes[level]-&gt;start;</div><div class='add'>+		ref.owning_root = 0;</div><div class='add'>+		ref.ref_root = btrfs_root_id(src);</div><div class='add'>+		btrfs_init_tree_ref(&amp;ref, level - 1, 0, true);</div><div class='ctx'> 		ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* We don't know the real owning_root, use 0. */</div><div class='del'>-		btrfs_init_generic_ref(&amp;ref, BTRFS_DROP_DELAYED_REF, old_bytenr,</div><div class='del'>-				       blocksize, 0, 0);</div><div class='del'>-		btrfs_init_tree_ref(&amp;ref, level - 1, dest-&gt;root_key.objectid,</div><div class='del'>-				    0, true);</div><div class='add'>+		ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+		ref.bytenr = old_bytenr;</div><div class='add'>+		ref.num_bytes = blocksize;</div><div class='add'>+		ref.parent = 0;</div><div class='add'>+		ref.owning_root = 0;</div><div class='add'>+		ref.ref_root = btrfs_root_id(dest);</div><div class='add'>+		btrfs_init_tree_ref(&amp;ref, level - 1, 0, true);</div><div class='ctx'> 		ret = btrfs_free_extent(trans, &amp;ref);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1520,7 +1331,7 @@ static int invalidate_extent_cache(struct btrfs_root *root,</div><div class='ctx'> 				   const struct btrfs_key *max_key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct btrfs_inode *inode = NULL;</div><div class='ctx'> 	u64 objectid;</div><div class='ctx'> 	u64 start, end;</div><div class='ctx'> 	u64 ino;</div><div class='hunk'>@@ -1530,23 +1341,24 @@ static int invalidate_extent_cache(struct btrfs_root *root,</div><div class='ctx'> 		struct extent_state *cached_state = NULL;</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='del'>-		iput(inode);</div><div class='add'>+		if (inode)</div><div class='add'>+			iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> </div><div class='ctx'> 		if (objectid &gt; max_key-&gt;objectid)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		inode = find_next_inode(root, objectid);</div><div class='add'>+		inode = btrfs_find_first_inode(root, objectid);</div><div class='ctx'> 		if (!inode)</div><div class='ctx'> 			break;</div><div class='del'>-		ino = btrfs_ino(BTRFS_I(inode));</div><div class='add'>+		ino = btrfs_ino(inode);</div><div class='ctx'> </div><div class='ctx'> 		if (ino &gt; max_key-&gt;objectid) {</div><div class='del'>-			iput(inode);</div><div class='add'>+			iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		objectid = ino + 1;</div><div class='del'>-		if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		if (!S_ISREG(inode-&gt;vfs_inode.i_mode))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(min_key-&gt;objectid == ino)) {</div><div class='hunk'>@@ -1579,9 +1391,9 @@ static int invalidate_extent_cache(struct btrfs_root *root,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* the lock_extent waits for read_folio to complete */</div><div class='del'>-		lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, start, end, &amp;cached_state);</div><div class='del'>-		btrfs_drop_extent_map_range(BTRFS_I(inode), start, end, true);</div><div class='del'>-		unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_drop_extent_map_range(inode, start, end, true);</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1616,7 +1428,7 @@ static int insert_dirty_subvol(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* @root must be a subvolume tree root with a valid reloc tree */</div><div class='del'>-	ASSERT(root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID);</div><div class='add'>+	ASSERT(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID);</div><div class='ctx'> 	ASSERT(reloc_root);</div><div class='ctx'> </div><div class='ctx'> 	reloc_root_item = &amp;reloc_root-&gt;root_item;</div><div class='hunk'>@@ -1645,7 +1457,7 @@ static int clean_dirty_subvols(struct reloc_control *rc)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(root, next, &amp;rc-&gt;dirty_subvol_roots,</div><div class='ctx'> 				 reloc_dirty_list) {</div><div class='del'>-		if (root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) {</div><div class='add'>+		if (btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID) {</div><div class='ctx'> 			/* Merged subvolume, cleanup its reloc root */</div><div class='ctx'> 			struct btrfs_root *reloc_root = root-&gt;reloc_root;</div><div class='ctx'> </div><div class='hunk'>@@ -1663,7 +1475,7 @@ static int clean_dirty_subvols(struct reloc_control *rc)</div><div class='ctx'> 				 * -&gt;reloc_root.  If it fails however we must</div><div class='ctx'> 				 * drop the ref ourselves.</div><div class='ctx'> 				 */</div><div class='del'>-				ret2 = btrfs_drop_snapshot(reloc_root, 0, 1);</div><div class='add'>+				ret2 = btrfs_drop_snapshot(reloc_root, false, true);</div><div class='ctx'> 				if (ret2 &lt; 0) {</div><div class='ctx'> 					btrfs_put_root(reloc_root);</div><div class='ctx'> 					if (!ret)</div><div class='hunk'>@@ -1673,7 +1485,7 @@ static int clean_dirty_subvols(struct reloc_control *rc)</div><div class='ctx'> 			btrfs_put_root(root);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Orphan reloc tree, just clean it up */</div><div class='del'>-			ret2 = btrfs_drop_snapshot(root, 0, 1);</div><div class='add'>+			ret2 = btrfs_drop_snapshot(root, false, true);</div><div class='ctx'> 			if (ret2 &lt; 0) {</div><div class='ctx'> 				btrfs_put_root(root);</div><div class='ctx'> 				if (!ret)</div><div class='hunk'>@@ -1716,7 +1528,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_disk_key_objectid(&amp;root_item-&gt;drop_progress) == 0) {</div><div class='ctx'> 		level = btrfs_root_level(root_item);</div><div class='del'>-		atomic_inc(&amp;reloc_root-&gt;node-&gt;refs);</div><div class='add'>+		refcount_inc(&amp;reloc_root-&gt;node-&gt;refs);</div><div class='ctx'> 		path-&gt;nodes[level] = reloc_root-&gt;node;</div><div class='ctx'> 		path-&gt;slots[level] = 0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1774,7 +1586,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,</div><div class='ctx'> 		 * btrfs_update_reloc_root() and update our root item</div><div class='ctx'> 		 * appropriately.</div><div class='ctx'> 		 */</div><div class='del'>-		reloc_root-&gt;last_trans = trans-&gt;transid;</div><div class='add'>+		btrfs_set_root_last_trans(reloc_root, trans-&gt;transid);</div><div class='ctx'> 		trans-&gt;block_rsv = rc-&gt;block_rsv;</div><div class='ctx'> </div><div class='ctx'> 		replaced = 0;</div><div class='hunk'>@@ -1898,8 +1710,8 @@ again:</div><div class='ctx'> 	rc-&gt;merge_reloc_tree = true;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;rc-&gt;reloc_roots)) {</div><div class='del'>-		reloc_root = list_entry(rc-&gt;reloc_roots.next,</div><div class='del'>-					struct btrfs_root, root_list);</div><div class='add'>+		reloc_root = list_first_entry(&amp;rc-&gt;reloc_roots,</div><div class='add'>+					      struct btrfs_root, root_list);</div><div class='ctx'> 		list_del_init(&amp;reloc_root-&gt;root_list);</div><div class='ctx'> </div><div class='ctx'> 		root = btrfs_get_fs_root(fs_info, reloc_root-&gt;root_key.offset,</div><div class='hunk'>@@ -1920,13 +1732,13 @@ again:</div><div class='ctx'> 			if (root-&gt;reloc_root) {</div><div class='ctx'> 				btrfs_err(fs_info,</div><div class='ctx'> "reloc tree mismatch, root %lld has reloc root key (%lld %u %llu) gen %llu, expect reloc root key (%lld %u %llu) gen %llu",</div><div class='del'>-					  root-&gt;root_key.objectid,</div><div class='del'>-					  root-&gt;reloc_root-&gt;root_key.objectid,</div><div class='add'>+					  btrfs_root_id(root),</div><div class='add'>+					  btrfs_root_id(root-&gt;reloc_root),</div><div class='ctx'> 					  root-&gt;reloc_root-&gt;root_key.type,</div><div class='ctx'> 					  root-&gt;reloc_root-&gt;root_key.offset,</div><div class='ctx'> 					  btrfs_root_generation(</div><div class='ctx'> 						  &amp;root-&gt;reloc_root-&gt;root_item),</div><div class='del'>-					  reloc_root-&gt;root_key.objectid,</div><div class='add'>+					  btrfs_root_id(reloc_root),</div><div class='ctx'> 					  reloc_root-&gt;root_key.type,</div><div class='ctx'> 					  reloc_root-&gt;root_key.offset,</div><div class='ctx'> 					  btrfs_root_generation(</div><div class='hunk'>@@ -1934,8 +1746,8 @@ again:</div><div class='ctx'> 			} else {</div><div class='ctx'> 				btrfs_err(fs_info,</div><div class='ctx'> "reloc tree mismatch, root %lld has no reloc root, expect reloc root key (%lld %u %llu) gen %llu",</div><div class='del'>-					  root-&gt;root_key.objectid,</div><div class='del'>-					  reloc_root-&gt;root_key.objectid,</div><div class='add'>+					  btrfs_root_id(root),</div><div class='add'>+					  btrfs_root_id(reloc_root),</div><div class='ctx'> 					  reloc_root-&gt;root_key.type,</div><div class='ctx'> 					  reloc_root-&gt;root_key.offset,</div><div class='ctx'> 					  btrfs_root_generation(</div><div class='hunk'>@@ -1964,7 +1776,7 @@ again:</div><div class='ctx'> 		list_add(&amp;reloc_root-&gt;root_list, &amp;reloc_roots);</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='ctx'> </div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			if (!err)</div><div class='ctx'> 				err = ret;</div><div class='hunk'>@@ -2014,8 +1826,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;reloc_roots)) {</div><div class='ctx'> 		found = 1;</div><div class='del'>-		reloc_root = list_entry(reloc_roots.next,</div><div class='del'>-					struct btrfs_root, root_list);</div><div class='add'>+		reloc_root = list_first_entry(&amp;reloc_roots, struct btrfs_root, root_list);</div><div class='ctx'> </div><div class='ctx'> 		root = btrfs_get_fs_root(fs_info, reloc_root-&gt;root_key.offset,</div><div class='ctx'> 					 false);</div><div class='hunk'>@@ -2117,7 +1928,7 @@ static int record_reloc_root_in_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (reloc_root-&gt;last_trans == trans-&gt;transid)</div><div class='add'>+	if (btrfs_get_root_last_trans(reloc_root) == trans-&gt;transid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	root = btrfs_get_fs_root(fs_info, reloc_root-&gt;root_key.offset, false);</div><div class='hunk'>@@ -2131,11 +1942,11 @@ static int record_reloc_root_in_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * reloc root without a corresponding root this could return ENOENT.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (IS_ERR(root)) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN("error %ld reading root for reloc root", PTR_ERR(root));</div><div class='ctx'> 		return PTR_ERR(root);</div><div class='ctx'> 	}</div><div class='del'>-	if (root-&gt;reloc_root != reloc_root) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+	if (unlikely(root-&gt;reloc_root != reloc_root)) {</div><div class='add'>+		DEBUG_WARN("unexpected reloc root found");</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "root %llu has two reloc roots associated with it",</div><div class='ctx'> 			  reloc_root-&gt;root_key.offset);</div><div class='hunk'>@@ -2159,100 +1970,72 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int index = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	next = node;</div><div class='del'>-	while (1) {</div><div class='del'>-		cond_resched();</div><div class='del'>-		next = walk_up_backref(next, edges, &amp;index);</div><div class='del'>-		root = next-&gt;root;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If there is no root, then our references for this block are</div><div class='del'>-		 * incomplete, as we should be able to walk all the way up to a</div><div class='del'>-		 * block that is owned by a root.</div><div class='del'>-		 *</div><div class='del'>-		 * This path is only for SHAREABLE roots, so if we come upon a</div><div class='del'>-		 * non-SHAREABLE root then we have backrefs that resolve</div><div class='del'>-		 * improperly.</div><div class='del'>-		 *</div><div class='del'>-		 * Both of these cases indicate file system corruption, or a bug</div><div class='del'>-		 * in the backref walking code.</div><div class='del'>-		 */</div><div class='del'>-		if (!root) {</div><div class='del'>-			ASSERT(0);</div><div class='del'>-			btrfs_err(trans-&gt;fs_info,</div><div class='del'>-		"bytenr %llu doesn't have a backref path ending in a root",</div><div class='del'>-				  node-&gt;bytenr);</div><div class='del'>-			return ERR_PTR(-EUCLEAN);</div><div class='del'>-		}</div><div class='del'>-		if (!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state)) {</div><div class='del'>-			ASSERT(0);</div><div class='del'>-			btrfs_err(trans-&gt;fs_info,</div><div class='del'>-	"bytenr %llu has multiple refs with one ending in a non-shareable root",</div><div class='del'>-				  node-&gt;bytenr);</div><div class='del'>-			return ERR_PTR(-EUCLEAN);</div><div class='del'>-		}</div><div class='add'>+	next = walk_up_backref(node, edges, &amp;index);</div><div class='add'>+	root = next-&gt;root;</div><div class='ctx'> </div><div class='del'>-		if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {</div><div class='del'>-			ret = record_reloc_root_in_trans(trans, root);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ERR_PTR(ret);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * If there is no root, then our references for this block are</div><div class='add'>+	 * incomplete, as we should be able to walk all the way up to a block</div><div class='add'>+	 * that is owned by a root.</div><div class='add'>+	 *</div><div class='add'>+	 * This path is only for SHAREABLE roots, so if we come upon a</div><div class='add'>+	 * non-SHAREABLE root then we have backrefs that resolve improperly.</div><div class='add'>+	 *</div><div class='add'>+	 * Both of these cases indicate file system corruption, or a bug in the</div><div class='add'>+	 * backref walking code.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!root)) {</div><div class='add'>+		btrfs_err(trans-&gt;fs_info,</div><div class='add'>+			  "bytenr %llu doesn't have a backref path ending in a root",</div><div class='add'>+			  node-&gt;bytenr);</div><div class='add'>+		return ERR_PTR(-EUCLEAN);</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))) {</div><div class='add'>+		btrfs_err(trans-&gt;fs_info,</div><div class='add'>+			  "bytenr %llu has multiple refs with one ending in a non-shareable root",</div><div class='add'>+			  node-&gt;bytenr);</div><div class='add'>+		return ERR_PTR(-EUCLEAN);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_record_root_in_trans(trans, root);</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) {</div><div class='add'>+		ret = record_reloc_root_in_trans(trans, root);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ERR_PTR(ret);</div><div class='del'>-		root = root-&gt;reloc_root;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We could have raced with another thread which failed, so</div><div class='del'>-		 * root-&gt;reloc_root may not be set, return ENOENT in this case.</div><div class='del'>-		 */</div><div class='del'>-		if (!root)</div><div class='del'>-			return ERR_PTR(-ENOENT);</div><div class='add'>+		goto found;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (next-&gt;new_bytenr != root-&gt;node-&gt;start) {</div><div class='del'>-			/*</div><div class='del'>-			 * We just created the reloc root, so we shouldn't have</div><div class='del'>-			 * -&gt;new_bytenr set and this shouldn't be in the changed</div><div class='del'>-			 *  list.  If it is then we have multiple roots pointing</div><div class='del'>-			 *  at the same bytenr which indicates corruption, or</div><div class='del'>-			 *  we've made a mistake in the backref walking code.</div><div class='del'>-			 */</div><div class='del'>-			ASSERT(next-&gt;new_bytenr == 0);</div><div class='del'>-			ASSERT(list_empty(&amp;next-&gt;list));</div><div class='del'>-			if (next-&gt;new_bytenr || !list_empty(&amp;next-&gt;list)) {</div><div class='del'>-				btrfs_err(trans-&gt;fs_info,</div><div class='del'>-	"bytenr %llu possibly has multiple roots pointing at the same bytenr %llu",</div><div class='del'>-					  node-&gt;bytenr, next-&gt;bytenr);</div><div class='del'>-				return ERR_PTR(-EUCLEAN);</div><div class='del'>-			}</div><div class='add'>+	ret = btrfs_record_root_in_trans(trans, root);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	root = root-&gt;reloc_root;</div><div class='ctx'> </div><div class='del'>-			next-&gt;new_bytenr = root-&gt;node-&gt;start;</div><div class='del'>-			btrfs_put_root(next-&gt;root);</div><div class='del'>-			next-&gt;root = btrfs_grab_root(root);</div><div class='del'>-			ASSERT(next-&gt;root);</div><div class='del'>-			list_add_tail(&amp;next-&gt;list,</div><div class='del'>-				      &amp;rc-&gt;backref_cache.changed);</div><div class='del'>-			mark_block_processed(rc, next);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * We could have raced with another thread which failed, so</div><div class='add'>+	 * root-&gt;reloc_root may not be set, return ENOENT in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (!root)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		root = NULL;</div><div class='del'>-		next = walk_down_backref(edges, &amp;index);</div><div class='del'>-		if (!next || next-&gt;level &lt;= node-&gt;level)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!root) {</div><div class='add'>+	if (unlikely(next-&gt;new_bytenr)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * This can happen if there's fs corruption or if there's a bug</div><div class='del'>-		 * in the backref lookup code.</div><div class='add'>+		 * We just created the reloc root, so we shouldn't have</div><div class='add'>+		 * -&gt;new_bytenr set yet. If it is then we have multiple roots</div><div class='add'>+		 *  pointing at the same bytenr which indicates corruption, or</div><div class='add'>+		 *  we've made a mistake in the backref walking code.</div><div class='ctx'> 		 */</div><div class='del'>-		ASSERT(0);</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='add'>+		ASSERT(next-&gt;new_bytenr == 0);</div><div class='add'>+		btrfs_err(trans-&gt;fs_info,</div><div class='add'>+			  "bytenr %llu possibly has multiple roots pointing at the same bytenr %llu",</div><div class='add'>+			  node-&gt;bytenr, next-&gt;bytenr);</div><div class='add'>+		return ERR_PTR(-EUCLEAN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	next-&gt;new_bytenr = root-&gt;node-&gt;start;</div><div class='add'>+	btrfs_put_root(next-&gt;root);</div><div class='add'>+	next-&gt;root = btrfs_grab_root(root);</div><div class='add'>+	ASSERT(next-&gt;root);</div><div class='add'>+	mark_block_processed(rc, next);</div><div class='add'>+found:</div><div class='ctx'> 	next = node;</div><div class='ctx'> 	/* setup backref node path for btrfs_reloc_cow_block */</div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -2292,14 +2075,14 @@ struct btrfs_root *select_one_root(struct btrfs_backref_node *node)</div><div class='ctx'> 		 * This can occur if we have incomplete extent refs leading all</div><div class='ctx'> 		 * the way up a particular path, in this case return -EUCLEAN.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!root)</div><div class='add'>+		if (unlikely(!root))</div><div class='ctx'> 			return ERR_PTR(-EUCLEAN);</div><div class='ctx'> </div><div class='ctx'> 		/* No other choice for non-shareable tree */</div><div class='ctx'> 		if (!test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state))</div><div class='ctx'> 			return root;</div><div class='ctx'> </div><div class='del'>-		if (root-&gt;root_key.objectid != BTRFS_TREE_RELOC_OBJECTID)</div><div class='add'>+		if (btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID)</div><div class='ctx'> 			fs_root = root;</div><div class='ctx'> </div><div class='ctx'> 		if (next != node)</div><div class='hunk'>@@ -2315,9 +2098,8 @@ struct btrfs_root *select_one_root(struct btrfs_backref_node *node)</div><div class='ctx'> 	return fs_root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack</div><div class='del'>-u64 calcu_metadata_size(struct reloc_control *rc,</div><div class='del'>-			struct btrfs_backref_node *node, int reserve)</div><div class='add'>+static noinline_for_stack u64 calcu_metadata_size(struct reloc_control *rc,</div><div class='add'>+						  struct btrfs_backref_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = rc-&gt;extent_root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_backref_node *next = node;</div><div class='hunk'>@@ -2326,12 +2108,12 @@ u64 calcu_metadata_size(struct reloc_control *rc,</div><div class='ctx'> 	u64 num_bytes = 0;</div><div class='ctx'> 	int index = 0;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(reserve &amp;&amp; node-&gt;processed);</div><div class='add'>+	BUG_ON(node-&gt;processed);</div><div class='ctx'> </div><div class='ctx'> 	while (next) {</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		while (1) {</div><div class='del'>-			if (next-&gt;processed &amp;&amp; (reserve || next != node))</div><div class='add'>+			if (next-&gt;processed)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			num_bytes += fs_info-&gt;nodesize;</div><div class='hunk'>@@ -2339,8 +2121,8 @@ u64 calcu_metadata_size(struct reloc_control *rc,</div><div class='ctx'> 			if (list_empty(&amp;next-&gt;upper))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			edge = list_entry(next-&gt;upper.next,</div><div class='del'>-					struct btrfs_backref_edge, list[LOWER]);</div><div class='add'>+			edge = list_first_entry(&amp;next-&gt;upper, struct btrfs_backref_edge,</div><div class='add'>+						list[LOWER]);</div><div class='ctx'> 			edges[index++] = edge;</div><div class='ctx'> 			next = edge-&gt;node[UPPER];</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2349,17 +2131,11 @@ u64 calcu_metadata_size(struct reloc_control *rc,</div><div class='ctx'> 	return num_bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int reserve_metadata_space(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct reloc_control *rc,</div><div class='del'>-				  struct btrfs_backref_node *node)</div><div class='add'>+static int refill_metadata_space(struct btrfs_trans_handle *trans,</div><div class='add'>+				 struct reloc_control *rc, u64 num_bytes)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = rc-&gt;extent_root;</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	u64 num_bytes;</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u64 tmp;</div><div class='del'>-</div><div class='del'>-	num_bytes = calcu_metadata_size(rc, node, 1) * 2;</div><div class='ctx'> </div><div class='ctx'> 	trans-&gt;block_rsv = rc-&gt;block_rsv;</div><div class='ctx'> 	rc-&gt;reserved_bytes += num_bytes;</div><div class='hunk'>@@ -2372,7 +2148,8 @@ static int reserve_metadata_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = btrfs_block_rsv_refill(fs_info, rc-&gt;block_rsv, num_bytes,</div><div class='ctx'> 				     BTRFS_RESERVE_FLUSH_LIMIT);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		tmp = fs_info-&gt;nodesize * RELOCATION_RESERVED_NODES;</div><div class='add'>+		u64 tmp = fs_info-&gt;nodesize * RELOCATION_RESERVED_NODES;</div><div class='add'>+</div><div class='ctx'> 		while (tmp &lt;= rc-&gt;reserved_bytes)</div><div class='ctx'> 			tmp &lt;&lt;= 1;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2390,6 +2167,16 @@ static int reserve_metadata_space(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int reserve_metadata_space(struct btrfs_trans_handle *trans,</div><div class='add'>+				  struct reloc_control *rc,</div><div class='add'>+				  struct btrfs_backref_node *node)</div><div class='add'>+{</div><div class='add'>+	u64 num_bytes;</div><div class='add'>+</div><div class='add'>+	num_bytes = calcu_metadata_size(rc, node) * 2;</div><div class='add'>+	return refill_metadata_space(trans, rc, num_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * relocate a block tree, and then update pointers in upper level</div><div class='ctx'>  * blocks that reference the block to point to the new location.</div><div class='hunk'>@@ -2422,8 +2209,6 @@ static int do_relocation(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	path-&gt;lowest_level = node-&gt;level + 1;</div><div class='ctx'> 	rc-&gt;backref_cache.path[node-&gt;level] = node;</div><div class='ctx'> 	list_for_each_entry(edge, &amp;node-&gt;upper, list[LOWER]) {</div><div class='del'>-		struct btrfs_ref ref = { 0 };</div><div class='del'>-</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> </div><div class='ctx'> 		upper = edge-&gt;node[UPPER];</div><div class='hunk'>@@ -2477,7 +2262,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 		bytenr = btrfs_node_blockptr(upper-&gt;eb, slot);</div><div class='ctx'> 		if (lowest) {</div><div class='del'>-			if (bytenr != node-&gt;bytenr) {</div><div class='add'>+			if (unlikely(bytenr != node-&gt;bytenr)) {</div><div class='ctx'> 				btrfs_err(root-&gt;fs_info,</div><div class='ctx'> 		"lowest leaf/node mismatch: bytenr %llu node-&gt;bytenr %llu slot %d upper %llu",</div><div class='ctx'> 					  bytenr, node-&gt;bytenr, slot,</div><div class='hunk'>@@ -2511,24 +2296,28 @@ static int do_relocation(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 */</div><div class='ctx'> 			ASSERT(node-&gt;eb == eb);</div><div class='ctx'> 		} else {</div><div class='add'>+			struct btrfs_ref ref = {</div><div class='add'>+				.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+				.bytenr = node-&gt;eb-&gt;start,</div><div class='add'>+				.num_bytes = blocksize,</div><div class='add'>+				.parent = upper-&gt;eb-&gt;start,</div><div class='add'>+				.owning_root = btrfs_header_owner(upper-&gt;eb),</div><div class='add'>+				.ref_root = btrfs_header_owner(upper-&gt;eb),</div><div class='add'>+			};</div><div class='add'>+</div><div class='ctx'> 			btrfs_set_node_blockptr(upper-&gt;eb, slot,</div><div class='ctx'> 						node-&gt;eb-&gt;start);</div><div class='ctx'> 			btrfs_set_node_ptr_generation(upper-&gt;eb, slot,</div><div class='ctx'> 						      trans-&gt;transid);</div><div class='ctx'> 			btrfs_mark_buffer_dirty(trans, upper-&gt;eb);</div><div class='ctx'> </div><div class='del'>-			btrfs_init_generic_ref(&amp;ref, BTRFS_ADD_DELAYED_REF,</div><div class='del'>-					       node-&gt;eb-&gt;start, blocksize,</div><div class='del'>-					       upper-&gt;eb-&gt;start,</div><div class='del'>-					       btrfs_header_owner(upper-&gt;eb));</div><div class='ctx'> 			btrfs_init_tree_ref(&amp;ref, node-&gt;level,</div><div class='del'>-					    btrfs_header_owner(upper-&gt;eb),</div><div class='del'>-					    root-&gt;root_key.objectid, false);</div><div class='add'>+					    btrfs_root_id(root), false);</div><div class='ctx'> 			ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				ret = btrfs_drop_subtree(trans, root, eb,</div><div class='ctx'> 							 upper-&gt;eb);</div><div class='del'>-			if (ret)</div><div class='add'>+			if (unlikely(ret))</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		}</div><div class='ctx'> next:</div><div class='hunk'>@@ -2542,7 +2331,7 @@ next:</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; node-&gt;pending) {</div><div class='ctx'> 		btrfs_backref_drop_node_buffer(node);</div><div class='del'>-		list_move_tail(&amp;node-&gt;list, &amp;rc-&gt;backref_cache.changed);</div><div class='add'>+		list_del_init(&amp;node-&gt;list);</div><div class='ctx'> 		node-&gt;pending = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2579,8 +2368,8 @@ static int finish_pending_nodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	for (level = 0; level &lt; BTRFS_MAX_LEVEL; level++) {</div><div class='ctx'> 		while (!list_empty(&amp;cache-&gt;pending[level])) {</div><div class='del'>-			node = list_entry(cache-&gt;pending[level].next,</div><div class='del'>-					  struct btrfs_backref_node, list);</div><div class='add'>+			node = list_first_entry(&amp;cache-&gt;pending[level],</div><div class='add'>+						struct btrfs_backref_node, list);</div><div class='ctx'> 			list_move_tail(&amp;node-&gt;list, &amp;list);</div><div class='ctx'> 			BUG_ON(!node-&gt;pending);</div><div class='ctx'> </div><div class='hunk'>@@ -2618,8 +2407,8 @@ static void update_processed_blocks(struct reloc_control *rc,</div><div class='ctx'> 			if (list_empty(&amp;next-&gt;upper))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			edge = list_entry(next-&gt;upper.next,</div><div class='del'>-					struct btrfs_backref_edge, list[LOWER]);</div><div class='add'>+			edge = list_first_entry(&amp;next-&gt;upper, struct btrfs_backref_edge,</div><div class='add'>+						list[LOWER]);</div><div class='ctx'> 			edges[index++] = edge;</div><div class='ctx'> 			next = edge-&gt;node[UPPER];</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2631,8 +2420,8 @@ static int tree_block_processed(u64 bytenr, struct reloc_control *rc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 blocksize = rc-&gt;extent_root-&gt;fs_info-&gt;nodesize;</div><div class='ctx'> </div><div class='del'>-	if (test_range_bit(&amp;rc-&gt;processed_blocks, bytenr,</div><div class='del'>-			   bytenr + blocksize - 1, EXTENT_DIRTY, NULL))</div><div class='add'>+	if (btrfs_test_range_bit(&amp;rc-&gt;processed_blocks, bytenr,</div><div class='add'>+				 bytenr + blocksize - 1, EXTENT_DIRTY, NULL))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2650,7 +2439,7 @@ static int get_tree_block_key(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	eb = read_tree_block(fs_info, block-&gt;bytenr, &amp;check);</div><div class='ctx'> 	if (IS_ERR(eb))</div><div class='ctx'> 		return PTR_ERR(eb);</div><div class='del'>-	if (!extent_buffer_uptodate(eb)) {</div><div class='add'>+	if (unlikely(!extent_buffer_uptodate(eb))) {</div><div class='ctx'> 		free_extent_buffer(eb);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2705,8 +2494,7 @@ static int relocate_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This block was the root block of a root, and this is</div><div class='ctx'> 			 * the first time we're processing the block and thus it</div><div class='del'>-			 * should not have had the -&gt;new_bytenr modified and</div><div class='del'>-			 * should have not been included on the changed list.</div><div class='add'>+			 * should not have had the -&gt;new_bytenr modified.</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * However in the case of corruption we could have</div><div class='ctx'> 			 * multiple refs pointing to the same block improperly,</div><div class='hunk'>@@ -2716,8 +2504,7 @@ static int relocate_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 * normal user in the case of corruption.</div><div class='ctx'> 			 */</div><div class='ctx'> 			ASSERT(node-&gt;new_bytenr == 0);</div><div class='del'>-			ASSERT(list_empty(&amp;node-&gt;list));</div><div class='del'>-			if (node-&gt;new_bytenr || !list_empty(&amp;node-&gt;list)) {</div><div class='add'>+			if (unlikely(node-&gt;new_bytenr)) {</div><div class='ctx'> 				btrfs_err(root-&gt;fs_info,</div><div class='ctx'> 				  "bytenr %llu has improper references to it",</div><div class='ctx'> 					  node-&gt;bytenr);</div><div class='hunk'>@@ -2740,17 +2527,12 @@ static int relocate_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			btrfs_put_root(node-&gt;root);</div><div class='ctx'> 			node-&gt;root = btrfs_grab_root(root);</div><div class='ctx'> 			ASSERT(node-&gt;root);</div><div class='del'>-			list_add_tail(&amp;node-&gt;list, &amp;rc-&gt;backref_cache.changed);</div><div class='ctx'> 		} else {</div><div class='del'>-			path-&gt;lowest_level = node-&gt;level;</div><div class='del'>-			if (root == root-&gt;fs_info-&gt;chunk_root)</div><div class='del'>-				btrfs_reserve_chunk_metadata(trans, false);</div><div class='del'>-			ret = btrfs_search_slot(trans, root, key, path, 0, 1);</div><div class='del'>-			btrfs_release_path(path);</div><div class='del'>-			if (root == root-&gt;fs_info-&gt;chunk_root)</div><div class='del'>-				btrfs_trans_release_chunk_metadata(trans);</div><div class='del'>-			if (ret &gt; 0)</div><div class='del'>-				ret = 0;</div><div class='add'>+			btrfs_err(root-&gt;fs_info,</div><div class='add'>+				  "bytenr %llu resolved to a non-shareable root",</div><div class='add'>+				  node-&gt;bytenr);</div><div class='add'>+			ret = -EUCLEAN;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			update_processed_blocks(rc, node);</div><div class='hunk'>@@ -2758,11 +2540,50 @@ static int relocate_tree_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = do_relocation(trans, rc, node, key, path, 1);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (ret || node-&gt;level == 0 || node-&gt;cowonly)</div><div class='add'>+	if (ret || node-&gt;level == 0)</div><div class='ctx'> 		btrfs_backref_cleanup_node(&amp;rc-&gt;backref_cache, node);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int relocate_cowonly_block(struct btrfs_trans_handle *trans,</div><div class='add'>+				  struct reloc_control *rc, struct tree_block *block,</div><div class='add'>+				  struct btrfs_path *path)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_root *root;</div><div class='add'>+	u64 num_bytes;</div><div class='add'>+	int nr_levels;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	root = btrfs_get_fs_root(fs_info, block-&gt;owner, true);</div><div class='add'>+	if (IS_ERR(root))</div><div class='add'>+		return PTR_ERR(root);</div><div class='add'>+</div><div class='add'>+	nr_levels = max(btrfs_header_level(root-&gt;node) - block-&gt;level, 0) + 1;</div><div class='add'>+</div><div class='add'>+	num_bytes = fs_info-&gt;nodesize * nr_levels;</div><div class='add'>+	ret = refill_metadata_space(trans, rc, num_bytes);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_put_root(root);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	path-&gt;lowest_level = block-&gt;level;</div><div class='add'>+	if (root == root-&gt;fs_info-&gt;chunk_root)</div><div class='add'>+		btrfs_reserve_chunk_metadata(trans, false);</div><div class='add'>+</div><div class='add'>+	ret = btrfs_search_slot(trans, root, &amp;block-&gt;key, path, 0, 1);</div><div class='add'>+	path-&gt;lowest_level = 0;</div><div class='add'>+	btrfs_release_path(path);</div><div class='add'>+</div><div class='add'>+	if (root == root-&gt;fs_info-&gt;chunk_root)</div><div class='add'>+		btrfs_trans_release_chunk_metadata(trans);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		ret = 0;</div><div class='add'>+	btrfs_put_root(root);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * relocate a list of blocks</div><div class='ctx'>  */</div><div class='hunk'>@@ -2775,12 +2596,11 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct tree_block *block;</div><div class='ctx'> 	struct tree_block *next;</div><div class='del'>-	int ret;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out_free_blocks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2795,112 +2615,79 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* Get first keys */</div><div class='ctx'> 	rbtree_postorder_for_each_entry_safe(block, next, blocks, rb_node) {</div><div class='ctx'> 		if (!block-&gt;key_ready) {</div><div class='del'>-			err = get_tree_block_key(fs_info, block);</div><div class='del'>-			if (err)</div><div class='add'>+			ret = get_tree_block_key(fs_info, block);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				goto out_free_path;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do tree relocation */</div><div class='ctx'> 	rbtree_postorder_for_each_entry_safe(block, next, blocks, rb_node) {</div><div class='add'>+		/*</div><div class='add'>+		 * For COWonly blocks, or the data reloc tree, we only need to</div><div class='add'>+		 * COW down to the block, there's no need to generate a backref</div><div class='add'>+		 * tree.</div><div class='add'>+		 */</div><div class='add'>+		if (block-&gt;owner &amp;&amp;</div><div class='add'>+		    (!btrfs_is_fstree(block-&gt;owner) ||</div><div class='add'>+		     block-&gt;owner == BTRFS_DATA_RELOC_TREE_OBJECTID)) {</div><div class='add'>+			ret = relocate_cowonly_block(trans, rc, block, path);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		node = build_backref_tree(trans, rc, &amp;block-&gt;key,</div><div class='ctx'> 					  block-&gt;level, block-&gt;bytenr);</div><div class='ctx'> 		if (IS_ERR(node)) {</div><div class='del'>-			err = PTR_ERR(node);</div><div class='add'>+			ret = PTR_ERR(node);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = relocate_tree_block(trans, rc, node, &amp;block-&gt;key,</div><div class='ctx'> 					  path);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			err = ret;</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	err = finish_pending_nodes(trans, rc, path, err);</div><div class='add'>+	ret = finish_pending_nodes(trans, rc, path, ret);</div><div class='ctx'> </div><div class='ctx'> out_free_path:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> out_free_blocks:</div><div class='ctx'> 	free_block_list(blocks);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int prealloc_file_extent_cluster(</div><div class='del'>-				struct btrfs_inode *inode,</div><div class='del'>-				const struct file_extent_cluster *cluster)</div><div class='add'>+static noinline_for_stack int prealloc_file_extent_cluster(struct reloc_control *rc)</div><div class='ctx'> {</div><div class='add'>+	const struct file_extent_cluster *cluster = &amp;rc-&gt;cluster;</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(rc-&gt;data_inode);</div><div class='ctx'> 	u64 alloc_hint = 0;</div><div class='ctx'> 	u64 start;</div><div class='ctx'> 	u64 end;</div><div class='del'>-	u64 offset = inode-&gt;index_cnt;</div><div class='add'>+	u64 offset = inode-&gt;reloc_block_group_start;</div><div class='ctx'> 	u64 num_bytes;</div><div class='ctx'> 	int nr;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	u64 prealloc_start = cluster-&gt;start - offset;</div><div class='ctx'> 	u64 prealloc_end = cluster-&gt;end - offset;</div><div class='ctx'> 	u64 cur_offset = prealloc_start;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * For subpage case, previous i_size may not be aligned to PAGE_SIZE.</div><div class='del'>-	 * This means the range [i_size, PAGE_END + 1) is filled with zeros by</div><div class='del'>-	 * btrfs_do_readpage() call of previously relocated file cluster.</div><div class='add'>+	 * For blocksize &lt; folio size case (either bs &lt; page size or large folios),</div><div class='add'>+	 * beyond i_size, all blocks are filled with zero.</div><div class='ctx'> 	 *</div><div class='del'>-	 * If the current cluster starts in the above range, btrfs_do_readpage()</div><div class='del'>-	 * will skip the read, and relocate_one_page() will later writeback</div><div class='add'>+	 * If the current cluster covers the above range, btrfs_do_readpage()</div><div class='add'>+	 * will skip the read, and relocate_one_folio() will later writeback</div><div class='ctx'> 	 * the padding zeros as new data, causing data corruption.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Here we have to manually invalidate the range (i_size, PAGE_END + 1).</div><div class='add'>+	 * Here we have to invalidate the cache covering our cluster.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!PAGE_ALIGNED(i_size)) {</div><div class='del'>-		struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='del'>-		struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-		const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='del'>-		struct page *page;</div><div class='del'>-</div><div class='del'>-		ASSERT(sectorsize &lt; PAGE_SIZE);</div><div class='del'>-		ASSERT(IS_ALIGNED(i_size, sectorsize));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Subpage can't handle page with DIRTY but without UPTODATE</div><div class='del'>-		 * bit as it can lead to the following deadlock:</div><div class='del'>-		 *</div><div class='del'>-		 * btrfs_read_folio()</div><div class='del'>-		 * | Page already *locked*</div><div class='del'>-		 * |- btrfs_lock_and_flush_ordered_range()</div><div class='del'>-		 *    |- btrfs_start_ordered_extent()</div><div class='del'>-		 *       |- extent_write_cache_pages()</div><div class='del'>-		 *          |- lock_page()</div><div class='del'>-		 *             We try to lock the page we already hold.</div><div class='del'>-		 *</div><div class='del'>-		 * Here we just writeback the whole data reloc inode, so that</div><div class='del'>-		 * we will be ensured to have no dirty range in the page, and</div><div class='del'>-		 * are safe to clear the uptodate bits.</div><div class='del'>-		 *</div><div class='del'>-		 * This shouldn't cause too much overhead, as we need to write</div><div class='del'>-		 * the data back anyway.</div><div class='del'>-		 */</div><div class='del'>-		ret = filemap_write_and_wait(mapping);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		clear_extent_bits(&amp;inode-&gt;io_tree, i_size,</div><div class='del'>-				  round_up(i_size, PAGE_SIZE) - 1,</div><div class='del'>-				  EXTENT_UPTODATE);</div><div class='del'>-		page = find_lock_page(mapping, i_size &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		/*</div><div class='del'>-		 * If page is freed we don't need to do anything then, as we</div><div class='del'>-		 * will re-read the whole page anyway.</div><div class='del'>-		 */</div><div class='del'>-		if (page) {</div><div class='del'>-			btrfs_subpage_clear_uptodate(fs_info, page_folio(page), i_size,</div><div class='del'>-					round_up(i_size, PAGE_SIZE) - i_size);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ret = filemap_invalidate_inode(&amp;inode-&gt;vfs_inode, true, prealloc_start,</div><div class='add'>+				       prealloc_end);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(cluster-&gt;start != cluster-&gt;boundary[0]);</div><div class='ctx'> 	ret = btrfs_alloc_data_chunk_ondemand(inode,</div><div class='hunk'>@@ -2918,45 +2705,49 @@ static noinline_for_stack int prealloc_file_extent_cluster(</div><div class='ctx'> 		else</div><div class='ctx'> 			end = cluster-&gt;end - offset;</div><div class='ctx'> </div><div class='del'>-		lock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='ctx'> 		num_bytes = end + 1 - start;</div><div class='ctx'> 		ret = btrfs_prealloc_file_range(&amp;inode-&gt;vfs_inode, 0, start,</div><div class='ctx'> 						num_bytes, num_bytes,</div><div class='ctx'> 						end + 1, &amp;alloc_hint);</div><div class='ctx'> 		cur_offset = end + 1;</div><div class='del'>-		unlock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+		btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_inode_unlock(inode, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (cur_offset &lt; prealloc_end)</div><div class='del'>-		btrfs_free_reserved_data_space_noquota(inode-&gt;root-&gt;fs_info,</div><div class='del'>-					       prealloc_end + 1 - cur_offset);</div><div class='add'>+		btrfs_free_reserved_data_space_noquota(inode,</div><div class='add'>+						       prealloc_end + 1 - cur_offset);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int setup_relocation_extent_mapping(struct inode *inode,</div><div class='del'>-				u64 start, u64 end, u64 block_start)</div><div class='add'>+static noinline_for_stack int setup_relocation_extent_mapping(struct reloc_control *rc)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_inode *inode = BTRFS_I(rc-&gt;data_inode);</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='add'>+	u64 offset = inode-&gt;reloc_block_group_start;</div><div class='add'>+	u64 start = rc-&gt;cluster.start - offset;</div><div class='add'>+	u64 end = rc-&gt;cluster.end - offset;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;start = start;</div><div class='ctx'> 	em-&gt;len = end + 1 - start;</div><div class='del'>-	em-&gt;block_len = em-&gt;len;</div><div class='del'>-	em-&gt;block_start = block_start;</div><div class='add'>+	em-&gt;disk_bytenr = rc-&gt;cluster.start;</div><div class='add'>+	em-&gt;disk_num_bytes = em-&gt;len;</div><div class='add'>+	em-&gt;ram_bytes = em-&gt;len;</div><div class='ctx'> 	em-&gt;flags |= EXTENT_FLAG_PINNED;</div><div class='ctx'> </div><div class='del'>-	lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, start, end, &amp;cached_state);</div><div class='del'>-	ret = btrfs_replace_extent_map_range(BTRFS_I(inode), em, false);</div><div class='del'>-	unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, start, end, &amp;cached_state);</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_lock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+	ret = btrfs_replace_extent_map_range(inode, em, false);</div><div class='add'>+	btrfs_unlock_extent(&amp;inode-&gt;io_tree, start, end, &amp;cached_state);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2983,68 +2774,91 @@ static u64 get_cluster_boundary_end(const struct file_extent_cluster *cluster,</div><div class='ctx'> 	return cluster-&gt;boundary[cluster_nr + 1] - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,</div><div class='del'>-			     const struct file_extent_cluster *cluster,</div><div class='del'>-			     int *cluster_nr, unsigned long page_index)</div><div class='add'>+static int relocate_one_folio(struct reloc_control *rc,</div><div class='add'>+			      struct file_ra_state *ra,</div><div class='add'>+			      int *cluster_nr, u64 *file_offset_ret)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = btrfs_sb(inode-&gt;i_sb);</div><div class='del'>-	u64 offset = BTRFS_I(inode)-&gt;index_cnt;</div><div class='del'>-	const unsigned long last_index = (cluster-&gt;end - offset) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const struct file_extent_cluster *cluster = &amp;rc-&gt;cluster;</div><div class='add'>+	struct inode *inode = rc-&gt;data_inode;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);</div><div class='add'>+	const u64 orig_file_offset = *file_offset_ret;</div><div class='add'>+	u64 offset = BTRFS_I(inode)-&gt;reloc_block_group_start;</div><div class='add'>+	const pgoff_t last_index = (cluster-&gt;end - offset) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const pgoff_t index = orig_file_offset &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	gfp_t mask = btrfs_alloc_write_mask(inode-&gt;i_mapping);</div><div class='del'>-	struct page *page;</div><div class='del'>-	u64 page_start;</div><div class='del'>-	u64 page_end;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	u64 folio_start;</div><div class='add'>+	u64 folio_end;</div><div class='ctx'> 	u64 cur;</div><div class='ctx'> 	int ret;</div><div class='add'>+	const bool use_rst = btrfs_need_stripe_tree_update(fs_info, rc-&gt;block_group-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ASSERT(index &lt;= last_index);</div><div class='add'>+again:</div><div class='add'>+	folio = filemap_lock_folio(inode-&gt;i_mapping, index);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='ctx'> </div><div class='del'>-	ASSERT(page_index &lt;= last_index);</div><div class='del'>-	page = find_lock_page(inode-&gt;i_mapping, page_index);</div><div class='del'>-	if (!page) {</div><div class='del'>-		page_cache_sync_readahead(inode-&gt;i_mapping, ra, NULL,</div><div class='del'>-				page_index, last_index + 1 - page_index);</div><div class='del'>-		page = find_or_create_page(inode-&gt;i_mapping, page_index, mask);</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		/*</div><div class='add'>+		 * On relocation we're doing readahead on the relocation inode,</div><div class='add'>+		 * but if the filesystem is backed by a RAID stripe tree we can</div><div class='add'>+		 * get ENOENT (e.g. due to preallocated extents not being</div><div class='add'>+		 * mapped in the RST) from the lookup.</div><div class='add'>+		 *</div><div class='add'>+		 * But readahead doesn't handle the error and submits invalid</div><div class='add'>+		 * reads to the device, causing a assertion failures.</div><div class='add'>+		 */</div><div class='add'>+		if (!use_rst)</div><div class='add'>+			page_cache_sync_readahead(inode-&gt;i_mapping, ra, NULL,</div><div class='add'>+						  index, last_index + 1 - index);</div><div class='add'>+		folio = __filemap_get_folio(inode-&gt;i_mapping, index,</div><div class='add'>+					    FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					    mask);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (PageReadahead(page))</div><div class='add'>+	if (folio_test_readahead(folio) &amp;&amp; !use_rst)</div><div class='ctx'> 		page_cache_async_readahead(inode-&gt;i_mapping, ra, NULL,</div><div class='del'>-				page_folio(page), page_index,</div><div class='del'>-				last_index + 1 - page_index);</div><div class='add'>+					   folio, last_index + 1 - index);</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		btrfs_read_folio(NULL, page_folio(page));</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='add'>+		btrfs_read_folio(NULL, folio);</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (unlikely(!folio_test_uptodate(folio))) {</div><div class='ctx'> 			ret = -EIO;</div><div class='del'>-			goto release_page;</div><div class='add'>+			goto release_folio;</div><div class='add'>+		}</div><div class='add'>+		if (folio-&gt;mapping != inode-&gt;i_mapping) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='add'>+			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We could have lost page private when we dropped the lock to read the</div><div class='del'>-	 * page above, make sure we set_page_extent_mapped here so we have any</div><div class='add'>+	 * We could have lost folio private when we dropped the lock to read the</div><div class='add'>+	 * folio above, make sure we set_folio_extent_mapped() here so we have any</div><div class='ctx'> 	 * of the subpage blocksize stuff we need in place.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = set_page_extent_mapped(page);</div><div class='add'>+	ret = set_folio_extent_mapped(folio);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto release_page;</div><div class='add'>+		goto release_folio;</div><div class='ctx'> </div><div class='del'>-	page_start = page_offset(page);</div><div class='del'>-	page_end = page_start + PAGE_SIZE - 1;</div><div class='add'>+	folio_start = folio_pos(folio);</div><div class='add'>+	folio_end = folio_start + folio_size(folio) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start from the cluster, as for subpage case, the cluster can start</div><div class='del'>-	 * inside the page.</div><div class='add'>+	 * inside the folio.</div><div class='ctx'> 	 */</div><div class='del'>-	cur = max(page_start, cluster-&gt;boundary[*cluster_nr] - offset);</div><div class='del'>-	while (cur &lt;= page_end) {</div><div class='add'>+	cur = max(folio_start, cluster-&gt;boundary[*cluster_nr] - offset);</div><div class='add'>+	while (cur &lt;= folio_end) {</div><div class='ctx'> 		struct extent_state *cached_state = NULL;</div><div class='ctx'> 		u64 extent_start = cluster-&gt;boundary[*cluster_nr] - offset;</div><div class='ctx'> 		u64 extent_end = get_cluster_boundary_end(cluster,</div><div class='ctx'> 						*cluster_nr) - offset;</div><div class='del'>-		u64 clamped_start = max(page_start, extent_start);</div><div class='del'>-		u64 clamped_end = min(page_end, extent_end);</div><div class='add'>+		u64 clamped_start = max(folio_start, extent_start);</div><div class='add'>+		u64 clamped_end = min(folio_end, extent_end);</div><div class='ctx'> 		u32 clamped_len = clamped_end + 1 - clamped_start;</div><div class='ctx'> </div><div class='ctx'> 		/* Reserve metadata for this range */</div><div class='hunk'>@@ -3052,47 +2866,46 @@ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 						      clamped_len, clamped_len,</div><div class='ctx'> 						      false);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto release_page;</div><div class='add'>+			goto release_folio;</div><div class='ctx'> </div><div class='ctx'> 		/* Mark the range delalloc and dirty for later writeback */</div><div class='del'>-		lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, clamped_start, clamped_end,</div><div class='del'>-			    &amp;cached_state);</div><div class='add'>+		btrfs_lock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, clamped_start,</div><div class='add'>+				  clamped_end, &amp;cached_state);</div><div class='ctx'> 		ret = btrfs_set_extent_delalloc(BTRFS_I(inode), clamped_start,</div><div class='ctx'> 						clamped_end, 0, &amp;cached_state);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-					 clamped_start, clamped_end,</div><div class='del'>-					 EXTENT_LOCKED | EXTENT_BOUNDARY,</div><div class='del'>-					 &amp;cached_state);</div><div class='add'>+			btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='add'>+					       clamped_start, clamped_end,</div><div class='add'>+					       EXTENT_LOCKED | EXTENT_BOUNDARY,</div><div class='add'>+					       &amp;cached_state);</div><div class='ctx'> 			btrfs_delalloc_release_metadata(BTRFS_I(inode),</div><div class='ctx'> 							clamped_len, true);</div><div class='ctx'> 			btrfs_delalloc_release_extents(BTRFS_I(inode),</div><div class='ctx'> 						       clamped_len);</div><div class='del'>-			goto release_page;</div><div class='add'>+			goto release_folio;</div><div class='ctx'> 		}</div><div class='del'>-		btrfs_folio_set_dirty(fs_info, page_folio(page),</div><div class='del'>-				      clamped_start, clamped_len);</div><div class='add'>+		btrfs_folio_set_dirty(fs_info, folio, clamped_start, clamped_len);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Set the boundary if it's inside the page.</div><div class='add'>+		 * Set the boundary if it's inside the folio.</div><div class='ctx'> 		 * Data relocation requires the destination extents to have the</div><div class='ctx'> 		 * same size as the source.</div><div class='ctx'> 		 * EXTENT_BOUNDARY bit prevents current extent from being merged</div><div class='ctx'> 		 * with previous extent.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (in_range(cluster-&gt;boundary[*cluster_nr] - offset,</div><div class='del'>-			     page_start, PAGE_SIZE)) {</div><div class='add'>+			     folio_start, folio_size(folio))) {</div><div class='ctx'> 			u64 boundary_start = cluster-&gt;boundary[*cluster_nr] -</div><div class='ctx'> 						offset;</div><div class='ctx'> 			u64 boundary_end = boundary_start +</div><div class='ctx'> 					   fs_info-&gt;sectorsize - 1;</div><div class='ctx'> </div><div class='del'>-			set_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-				       boundary_start, boundary_end,</div><div class='del'>-				       EXTENT_BOUNDARY, NULL);</div><div class='add'>+			btrfs_set_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='add'>+					     boundary_start, boundary_end,</div><div class='add'>+					     EXTENT_BOUNDARY, NULL);</div><div class='ctx'> 		}</div><div class='del'>-		unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, clamped_start, clamped_end,</div><div class='del'>-			      &amp;cached_state);</div><div class='add'>+		btrfs_unlock_extent(&amp;BTRFS_I(inode)-&gt;io_tree, clamped_start, clamped_end,</div><div class='add'>+				    &amp;cached_state);</div><div class='ctx'> 		btrfs_delalloc_release_extents(BTRFS_I(inode), clamped_len);</div><div class='ctx'> 		cur += clamped_len;</div><div class='ctx'> </div><div class='hunk'>@@ -3104,28 +2917,29 @@ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 	balance_dirty_pages_ratelimited(inode-&gt;i_mapping);</div><div class='ctx'> 	btrfs_throttle(fs_info);</div><div class='ctx'> 	if (btrfs_should_cancel_balance(fs_info))</div><div class='ctx'> 		ret = -ECANCELED;</div><div class='add'>+	*file_offset_ret = folio_end + 1;</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='del'>-release_page:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+release_folio:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int relocate_file_extent_cluster(struct inode *inode,</div><div class='del'>-					const struct file_extent_cluster *cluster)</div><div class='add'>+static int relocate_file_extent_cluster(struct reloc_control *rc)</div><div class='ctx'> {</div><div class='del'>-	u64 offset = BTRFS_I(inode)-&gt;index_cnt;</div><div class='del'>-	unsigned long index;</div><div class='del'>-	unsigned long last_index;</div><div class='del'>-	struct file_ra_state *ra;</div><div class='add'>+	struct inode *inode = rc-&gt;data_inode;</div><div class='add'>+	const struct file_extent_cluster *cluster = &amp;rc-&gt;cluster;</div><div class='add'>+	u64 offset = BTRFS_I(inode)-&gt;reloc_block_group_start;</div><div class='add'>+	u64 cur_file_offset = cluster-&gt;start - offset;</div><div class='add'>+	struct file_ra_state AUTO_KFREE(ra);</div><div class='ctx'> 	int cluster_nr = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3136,37 +2950,36 @@ static int relocate_file_extent_cluster(struct inode *inode,</div><div class='ctx'> 	if (!ra)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = prealloc_file_extent_cluster(BTRFS_I(inode), cluster);</div><div class='add'>+	ret = prealloc_file_extent_cluster(rc);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	file_ra_state_init(ra, inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='del'>-	ret = setup_relocation_extent_mapping(inode, cluster-&gt;start - offset,</div><div class='del'>-				   cluster-&gt;end - offset, cluster-&gt;start);</div><div class='add'>+	ret = setup_relocation_extent_mapping(rc);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	last_index = (cluster-&gt;end - offset) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	for (index = (cluster-&gt;start - offset) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	     index &lt;= last_index &amp;&amp; !ret; index++)</div><div class='del'>-		ret = relocate_one_page(inode, ra, cluster, &amp;cluster_nr, index);</div><div class='add'>+	while (cur_file_offset &lt; cluster-&gt;end - offset) {</div><div class='add'>+		ret = relocate_one_folio(rc, ra, &amp;cluster_nr, &amp;cur_file_offset);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		WARN_ON(cluster_nr != cluster-&gt;nr);</div><div class='del'>-out:</div><div class='del'>-	kfree(ra);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int relocate_data_extent(struct inode *inode,</div><div class='del'>-				const struct btrfs_key *extent_key,</div><div class='del'>-				struct file_extent_cluster *cluster)</div><div class='add'>+static noinline_for_stack int relocate_data_extent(struct reloc_control *rc,</div><div class='add'>+					   const struct btrfs_key *extent_key)</div><div class='ctx'> {</div><div class='add'>+	struct inode *inode = rc-&gt;data_inode;</div><div class='add'>+	struct file_extent_cluster *cluster = &amp;rc-&gt;cluster;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> </div><div class='ctx'> 	if (cluster-&gt;nr &gt; 0 &amp;&amp; extent_key-&gt;objectid != cluster-&gt;end + 1) {</div><div class='del'>-		ret = relocate_file_extent_cluster(inode, cluster);</div><div class='add'>+		ret = relocate_file_extent_cluster(rc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		cluster-&gt;nr = 0;</div><div class='hunk'>@@ -3192,7 +3005,7 @@ static noinline_for_stack int relocate_data_extent(struct inode *inode,</div><div class='ctx'> 		 * the cluster we need to relocate.</div><div class='ctx'> 		 */</div><div class='ctx'> 		root-&gt;relocation_src_root = cluster-&gt;owning_root;</div><div class='del'>-		ret = relocate_file_extent_cluster(inode, cluster);</div><div class='add'>+		ret = relocate_file_extent_cluster(rc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		cluster-&gt;nr = 0;</div><div class='hunk'>@@ -3211,7 +3024,7 @@ static noinline_for_stack int relocate_data_extent(struct inode *inode,</div><div class='ctx'> 	cluster-&gt;nr++;</div><div class='ctx'> </div><div class='ctx'> 	if (cluster-&gt;nr &gt;= MAX_EXTENTS) {</div><div class='del'>-		ret = relocate_file_extent_cluster(inode, cluster);</div><div class='add'>+		ret = relocate_file_extent_cluster(rc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		cluster-&gt;nr = 0;</div><div class='hunk'>@@ -3312,7 +3125,7 @@ static int add_tree_block(struct reloc_control *rc,</div><div class='ctx'> 	block-&gt;key_ready = false;</div><div class='ctx'> 	block-&gt;owner = owner;</div><div class='ctx'> </div><div class='del'>-	rb_node = rb_simple_insert(blocks, block-&gt;bytenr, &amp;block-&gt;rb_node);</div><div class='add'>+	rb_node = rb_simple_insert(blocks, &amp;block-&gt;simple_node);</div><div class='ctx'> 	if (rb_node)</div><div class='ctx'> 		btrfs_backref_panic(rc-&gt;extent_root-&gt;fs_info, block-&gt;bytenr,</div><div class='ctx'> 				    -EEXIST);</div><div class='hunk'>@@ -3328,7 +3141,7 @@ static int __add_tree_block(struct reloc_control *rc,</div><div class='ctx'> 			    struct rb_root *blocks)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = rc-&gt;extent_root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool skinny = btrfs_fs_incompat(fs_info, SKINNY_METADATA);</div><div class='hunk'>@@ -3352,11 +3165,11 @@ again:</div><div class='ctx'> 		key.offset = blocksize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, rc-&gt;extent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0 &amp;&amp; skinny) {</div><div class='ctx'> 		if (path-&gt;slots[0]) {</div><div class='hunk'>@@ -3383,31 +3196,29 @@ again:</div><div class='ctx'> 	     "tree block extent item (%llu) is not found in extent tree",</div><div class='ctx'> 		     bytenr);</div><div class='ctx'> 		WARN_ON(1);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = add_tree_block(rc, &amp;key, path, blocks);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return add_tree_block(rc, &amp;key, path, blocks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int delete_block_group_cache(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct btrfs_block_group *block_group,</div><div class='add'>+static int delete_block_group_cache(struct btrfs_block_group *block_group,</div><div class='ctx'> 				    struct inode *inode,</div><div class='ctx'> 				    u64 ino)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='add'>+	struct btrfs_inode *btrfs_inode;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (inode)</div><div class='ctx'> 		goto truncate;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(fs_info-&gt;sb, ino, root);</div><div class='del'>-	if (IS_ERR(inode))</div><div class='add'>+	btrfs_inode = btrfs_iget(ino, root);</div><div class='add'>+	if (IS_ERR(btrfs_inode))</div><div class='ctx'> 		return -ENOENT;</div><div class='add'>+	inode = &amp;btrfs_inode-&gt;vfs_inode;</div><div class='ctx'> </div><div class='ctx'> truncate:</div><div class='ctx'> 	ret = btrfs_check_trunc_cache_free_space(fs_info,</div><div class='hunk'>@@ -3467,8 +3278,7 @@ static int delete_v1_space_cache(struct extent_buffer *leaf,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!found)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	ret = delete_block_group_cache(leaf-&gt;fs_info, block_group, NULL,</div><div class='del'>-					space_cache_ino);</div><div class='add'>+	ret = delete_block_group_cache(block_group, NULL, space_cache_ino);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3548,8 +3358,8 @@ int find_next_extent(struct reloc_control *rc, struct btrfs_path *path,</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='ctx'> 		key.offset = 0;</div><div class='ctx'> </div><div class='del'>-		path-&gt;search_commit_root = 1;</div><div class='del'>-		path-&gt;skip_locking = 1;</div><div class='add'>+		path-&gt;search_commit_root = true;</div><div class='add'>+		path-&gt;skip_locking = true;</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, rc-&gt;extent_root, &amp;key, path,</div><div class='ctx'> 					0, 0);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -3588,9 +3398,9 @@ next:</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		block_found = find_first_extent_bit(&amp;rc-&gt;processed_blocks,</div><div class='del'>-						    key.objectid, &amp;start, &amp;end,</div><div class='del'>-						    EXTENT_DIRTY, NULL);</div><div class='add'>+		block_found = btrfs_find_first_extent_bit(&amp;rc-&gt;processed_blocks,</div><div class='add'>+							  key.objectid, &amp;start, &amp;end,</div><div class='add'>+							  EXTENT_DIRTY, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (block_found &amp;&amp; start &lt;= key.objectid) {</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='hunk'>@@ -3679,7 +3489,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)</div><div class='ctx'> 	struct rb_root blocks = RB_ROOT;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_trans_handle *trans = NULL;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_extent_item *ei;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3714,11 +3524,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> restart:</div><div class='del'>-		if (update_backref_cache(trans, &amp;rc-&gt;backref_cache)) {</div><div class='del'>-			btrfs_end_transaction(trans);</div><div class='del'>-			trans = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		if (rc-&gt;backref_cache.last_trans != trans-&gt;transid)</div><div class='add'>+			btrfs_backref_release_cache(&amp;rc-&gt;backref_cache);</div><div class='add'>+		rc-&gt;backref_cache.last_trans = trans-&gt;transid;</div><div class='ctx'> </div><div class='ctx'> 		ret = find_next_extent(rc, path, &amp;key);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -3780,8 +3588,7 @@ restart:</div><div class='ctx'> 		if (rc-&gt;stage == MOVE_DATA_EXTENTS &amp;&amp;</div><div class='ctx'> 		    (flags &amp; BTRFS_EXTENT_FLAG_DATA)) {</div><div class='ctx'> 			rc-&gt;found_file_extent = true;</div><div class='del'>-			ret = relocate_data_extent(rc-&gt;data_inode,</div><div class='del'>-						   &amp;key, &amp;rc-&gt;cluster);</div><div class='add'>+			ret = relocate_data_extent(rc, &amp;key);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				err = ret;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -3802,7 +3609,7 @@ restart:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	clear_extent_bits(&amp;rc-&gt;processed_blocks, 0, (u64)-1, EXTENT_DIRTY);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;rc-&gt;processed_blocks, 0, (u64)-1, EXTENT_DIRTY, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (trans) {</div><div class='ctx'> 		btrfs_end_transaction_throttle(trans);</div><div class='hunk'>@@ -3810,8 +3617,7 @@ restart:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!err) {</div><div class='del'>-		ret = relocate_file_extent_cluster(rc-&gt;data_inode,</div><div class='del'>-						   &amp;rc-&gt;cluster);</div><div class='add'>+		ret = relocate_file_extent_cluster(rc);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			err = ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3852,14 +3658,13 @@ out_free:</div><div class='ctx'> 	if (ret &lt; 0 &amp;&amp; !err)</div><div class='ctx'> 		err = ret;</div><div class='ctx'> 	btrfs_free_block_rsv(fs_info, rc-&gt;block_rsv);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __insert_orphan_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct btrfs_root *root, u64 objectid)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_inode_item *item;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3870,7 +3675,7 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_inode(trans, root, path, objectid);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	item = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_inode_item);</div><div class='hunk'>@@ -3880,16 +3685,13 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_inode_mode(leaf, item, S_IFREG | 0600);</div><div class='ctx'> 	btrfs_set_inode_flags(leaf, item, BTRFS_INODE_NOCOMPRESS |</div><div class='ctx'> 					  BTRFS_INODE_PREALLOC);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void delete_orphan_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct btrfs_root *root, u64 objectid)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3912,7 +3714,6 @@ static void delete_orphan_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3920,14 +3721,14 @@ out:</div><div class='ctx'>  * the inode is in data relocation tree and its link count is 0</div><div class='ctx'>  */</div><div class='ctx'> static noinline_for_stack struct inode *create_reloc_inode(</div><div class='del'>-					struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					const struct btrfs_block_group *group)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct btrfs_fs_info *fs_info = group-&gt;fs_info;</div><div class='add'>+	struct btrfs_inode *inode = NULL;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	u64 objectid;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	root = btrfs_grab_root(fs_info-&gt;data_reloc_root);</div><div class='ctx'> 	trans = btrfs_start_transaction(root, 6);</div><div class='hunk'>@@ -3936,38 +3737,40 @@ static noinline_for_stack struct inode *create_reloc_inode(</div><div class='ctx'> 		return ERR_CAST(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = btrfs_get_free_objectid(root, &amp;objectid);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_get_free_objectid(root, &amp;objectid);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = __insert_orphan_inode(trans, root, objectid);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = __insert_orphan_inode(trans, root, objectid);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(fs_info-&gt;sb, objectid, root);</div><div class='add'>+	inode = btrfs_iget(objectid, root);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		delete_orphan_inode(trans, root, objectid);</div><div class='del'>-		err = PTR_ERR(inode);</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='ctx'> 		inode = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	BTRFS_I(inode)-&gt;index_cnt = group-&gt;start;</div><div class='add'>+	inode-&gt;reloc_block_group_start = group-&gt;start;</div><div class='ctx'> </div><div class='del'>-	err = btrfs_orphan_add(trans, BTRFS_I(inode));</div><div class='add'>+	ret = btrfs_orphan_add(trans, inode);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_put_root(root);</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='ctx'> 	btrfs_btree_balance_dirty(fs_info);</div><div class='del'>-	if (err) {</div><div class='del'>-		iput(inode);</div><div class='del'>-		inode = ERR_PTR(err);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (inode)</div><div class='add'>+			iput(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='del'>-	return inode;</div><div class='add'>+	return &amp;inode-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mark start of chunk relocation that is cancellable. Check if the cancellation</div><div class='ctx'>  * has been requested meanwhile and don't start in that case.</div><div class='add'>+ * NOTE: if this returns an error, reloc_chunk_end() must not be called.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='ctx'>  *   0             success</div><div class='hunk'>@@ -3984,10 +3787,8 @@ static int reloc_chunk_start(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;fs_info-&gt;reloc_cancel_req) &gt; 0) {</div><div class='ctx'> 		btrfs_info(fs_info, "chunk relocation canceled on start");</div><div class='del'>-		/*</div><div class='del'>-		 * On cancel, clear all requests but let the caller mark</div><div class='del'>-		 * the end after cleanup operations.</div><div class='del'>-		 */</div><div class='add'>+		/* On cancel, clear all requests. */</div><div class='add'>+		clear_and_wake_up_bit(BTRFS_FS_RELOC_RUNNING, &amp;fs_info-&gt;flags);</div><div class='ctx'> 		atomic_set(&amp;fs_info-&gt;reloc_cancel_req, 0);</div><div class='ctx'> 		return -ECANCELED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3996,9 +3797,11 @@ static int reloc_chunk_start(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mark end of chunk relocation that is cancellable and wake any waiters.</div><div class='add'>+ * NOTE: call only if a previous call to reloc_chunk_start() succeeded.</div><div class='ctx'>  */</div><div class='ctx'> static void reloc_chunk_end(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	ASSERT(test_bit(BTRFS_FS_RELOC_RUNNING, &amp;fs_info-&gt;flags));</div><div class='ctx'> 	/* Requested after start, clear bit first so any waiters can continue */</div><div class='ctx'> 	if (atomic_read(&amp;fs_info-&gt;reloc_cancel_req) &gt; 0)</div><div class='ctx'> 		btrfs_info(fs_info, "chunk relocation canceled during operation");</div><div class='hunk'>@@ -4019,7 +3822,7 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_backref_init_cache(fs_info, &amp;rc-&gt;backref_cache, true);</div><div class='ctx'> 	rc-&gt;reloc_root_tree.rb_root = RB_ROOT;</div><div class='ctx'> 	spin_lock_init(&amp;rc-&gt;reloc_root_tree.lock);</div><div class='del'>-	extent_io_tree_init(fs_info, &amp;rc-&gt;processed_blocks, IO_TREE_RELOC_BLOCKS);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;rc-&gt;processed_blocks, IO_TREE_RELOC_BLOCKS);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4038,15 +3841,13 @@ static void free_reloc_control(struct reloc_control *rc)</div><div class='ctx'> /*</div><div class='ctx'>  * Print the block group being relocated</div><div class='ctx'>  */</div><div class='del'>-static void describe_relocation(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_block_group *block_group)</div><div class='add'>+static void describe_relocation(struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='del'>-	char buf[128] = {'\0'};</div><div class='add'>+	char buf[128] = "NONE";</div><div class='ctx'> </div><div class='ctx'> 	btrfs_describe_block_groups(block_group-&gt;flags, buf, sizeof(buf));</div><div class='ctx'> </div><div class='del'>-	btrfs_info(fs_info,</div><div class='del'>-		   "relocating block group %llu flags %s",</div><div class='add'>+	btrfs_info(block_group-&gt;fs_info, "relocating block group %llu flags %s",</div><div class='ctx'> 		   block_group-&gt;start, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4062,7 +3863,8 @@ static const char *stage_to_string(enum reloc_stage stage)</div><div class='ctx'> /*</div><div class='ctx'>  * function to relocate all extents in a block group.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)</div><div class='add'>+int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start,</div><div class='add'>+			       bool verbose)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *bg;</div><div class='ctx'> 	struct btrfs_root *extent_root = btrfs_extent_root(fs_info, group_start);</div><div class='hunk'>@@ -4070,8 +3872,7 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int rw = 0;</div><div class='del'>-	int err = 0;</div><div class='add'>+	bool bg_is_ro = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This only gets set if we had a half-deleted snapshot on mount.  We</div><div class='hunk'>@@ -4113,24 +3914,20 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = reloc_chunk_start(fs_info);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		err = ret;</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out_put_bg;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	rc-&gt;extent_root = extent_root;</div><div class='ctx'> 	rc-&gt;block_group = bg;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_inc_block_group_ro(rc-&gt;block_group, true);</div><div class='del'>-	if (ret) {</div><div class='del'>-		err = ret;</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='del'>-	rw = 1;</div><div class='add'>+	bg_is_ro = true;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4138,29 +3935,26 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(inode))</div><div class='del'>-		ret = delete_block_group_cache(fs_info, rc-&gt;block_group, inode, 0);</div><div class='add'>+		ret = delete_block_group_cache(rc-&gt;block_group, inode, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = PTR_ERR(inode);</div><div class='ctx'> </div><div class='del'>-	if (ret &amp;&amp; ret != -ENOENT) {</div><div class='del'>-		err = ret;</div><div class='add'>+	if (ret &amp;&amp; ret != -ENOENT)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	rc-&gt;data_inode = create_reloc_inode(fs_info, rc-&gt;block_group);</div><div class='add'>+	rc-&gt;data_inode = create_reloc_inode(rc-&gt;block_group);</div><div class='ctx'> 	if (IS_ERR(rc-&gt;data_inode)) {</div><div class='del'>-		err = PTR_ERR(rc-&gt;data_inode);</div><div class='add'>+		ret = PTR_ERR(rc-&gt;data_inode);</div><div class='ctx'> 		rc-&gt;data_inode = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	describe_relocation(fs_info, rc-&gt;block_group);</div><div class='add'>+	if (verbose)</div><div class='add'>+		describe_relocation(rc-&gt;block_group);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_wait_block_group_reservations(rc-&gt;block_group);</div><div class='ctx'> 	btrfs_wait_nocow_writers(rc-&gt;block_group);</div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX,</div><div class='del'>-				 rc-&gt;block_group-&gt;start,</div><div class='del'>-				 rc-&gt;block_group-&gt;length);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, rc-&gt;block_group);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_zone_finish(rc-&gt;block_group);</div><div class='ctx'> 	WARN_ON(ret &amp;&amp; ret != -EAGAIN);</div><div class='hunk'>@@ -4171,8 +3965,6 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='ctx'> 		ret = relocate_block_group(rc);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;cleaner_mutex);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			err = ret;</div><div class='ctx'> </div><div class='ctx'> 		finishes_stage = rc-&gt;stage;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -4185,37 +3977,41 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)</div><div class='ctx'> 		 * out of the loop if we hit an error.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (rc-&gt;stage == MOVE_DATA_EXTENTS &amp;&amp; rc-&gt;found_file_extent) {</div><div class='del'>-			ret = btrfs_wait_ordered_range(rc-&gt;data_inode, 0,</div><div class='del'>-						       (u64)-1);</div><div class='del'>-			if (ret)</div><div class='del'>-				err = ret;</div><div class='add'>+			int wb_ret;</div><div class='add'>+</div><div class='add'>+			wb_ret = btrfs_wait_ordered_range(BTRFS_I(rc-&gt;data_inode), 0,</div><div class='add'>+							  (u64)-1);</div><div class='add'>+			if (wb_ret &amp;&amp; ret == 0)</div><div class='add'>+				ret = wb_ret;</div><div class='ctx'> 			invalidate_mapping_pages(rc-&gt;data_inode-&gt;i_mapping,</div><div class='ctx'> 						 0, -1);</div><div class='ctx'> 			rc-&gt;stage = UPDATE_DATA_PTRS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (err &lt; 0)</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (rc-&gt;extents_found == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		btrfs_info(fs_info, "found %llu extents, stage: %s",</div><div class='del'>-			   rc-&gt;extents_found, stage_to_string(finishes_stage));</div><div class='add'>+		if (verbose)</div><div class='add'>+			btrfs_info(fs_info, "found %llu extents, stage: %s",</div><div class='add'>+				   rc-&gt;extents_found,</div><div class='add'>+				   stage_to_string(finishes_stage));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(rc-&gt;block_group-&gt;pinned &gt; 0);</div><div class='ctx'> 	WARN_ON(rc-&gt;block_group-&gt;reserved &gt; 0);</div><div class='ctx'> 	WARN_ON(rc-&gt;block_group-&gt;used &gt; 0);</div><div class='ctx'> out:</div><div class='del'>-	if (err &amp;&amp; rw)</div><div class='add'>+	if (ret &amp;&amp; bg_is_ro)</div><div class='ctx'> 		btrfs_dec_block_group_ro(rc-&gt;block_group);</div><div class='ctx'> 	iput(rc-&gt;data_inode);</div><div class='add'>+	reloc_chunk_end(fs_info);</div><div class='ctx'> out_put_bg:</div><div class='ctx'> 	btrfs_put_block_group(bg);</div><div class='del'>-	reloc_chunk_end(fs_info);</div><div class='ctx'> 	free_reloc_control(rc);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack int mark_garbage_root(struct btrfs_root *root)</div><div class='hunk'>@@ -4257,8 +4053,8 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct reloc_control *rc = NULL;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	int ret;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret2;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -4272,15 +4068,14 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, fs_info-&gt;tree_root, &amp;key,</div><div class='ctx'> 					path, 0, 0);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			err = ret;</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			if (path-&gt;slots[0] == 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			path-&gt;slots[0]--;</div><div class='ctx'> 		}</div><div class='add'>+		ret = 0;</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='hunk'>@@ -4291,7 +4086,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 		reloc_root = btrfs_read_tree_root(fs_info-&gt;tree_root, &amp;key);</div><div class='ctx'> 		if (IS_ERR(reloc_root)) {</div><div class='del'>-			err = PTR_ERR(reloc_root);</div><div class='add'>+			ret = PTR_ERR(reloc_root);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -4303,15 +4098,12 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 					reloc_root-&gt;root_key.offset, false);</div><div class='ctx'> 			if (IS_ERR(fs_root)) {</div><div class='ctx'> 				ret = PTR_ERR(fs_root);</div><div class='del'>-				if (ret != -ENOENT) {</div><div class='del'>-					err = ret;</div><div class='add'>+				if (ret != -ENOENT)</div><div class='ctx'> 					goto out;</div><div class='del'>-				}</div><div class='ctx'> 				ret = mark_garbage_root(reloc_root);</div><div class='del'>-				if (ret &lt; 0) {</div><div class='del'>-					err = ret;</div><div class='add'>+				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='del'>-				}</div><div class='add'>+				ret = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				btrfs_put_root(fs_root);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4329,15 +4121,13 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	rc = alloc_reloc_control(fs_info);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = reloc_chunk_start(fs_info);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		err = ret;</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out_end;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	rc-&gt;extent_root = btrfs_extent_root(fs_info, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -4345,15 +4135,14 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_join_transaction(rc-&gt;extent_root);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_unset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc-&gt;merge_reloc_tree = true;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;reloc_roots)) {</div><div class='del'>-		reloc_root = list_entry(reloc_roots.next,</div><div class='del'>-					struct btrfs_root, root_list);</div><div class='add'>+		reloc_root = list_first_entry(&amp;reloc_roots, struct btrfs_root, root_list);</div><div class='ctx'> 		list_del(&amp;reloc_root-&gt;root_list);</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_root_refs(&amp;reloc_root-&gt;root_item) == 0) {</div><div class='hunk'>@@ -4365,15 +4154,15 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		fs_root = btrfs_get_fs_root(fs_info, reloc_root-&gt;root_key.offset,</div><div class='ctx'> 					    false);</div><div class='ctx'> 		if (IS_ERR(fs_root)) {</div><div class='del'>-			err = PTR_ERR(fs_root);</div><div class='add'>+			ret = PTR_ERR(fs_root);</div><div class='ctx'> 			list_add_tail(&amp;reloc_root-&gt;root_list, &amp;reloc_roots);</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='ctx'> 			goto out_unset;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = __add_reloc_root(reloc_root);</div><div class='del'>-		ASSERT(err != -EEXIST);</div><div class='del'>-		if (err) {</div><div class='add'>+		ret = __add_reloc_root(reloc_root);</div><div class='add'>+		ASSERT(ret != -EEXIST);</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			list_add_tail(&amp;reloc_root-&gt;root_list, &amp;reloc_roots);</div><div class='ctx'> 			btrfs_put_root(fs_root);</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='hunk'>@@ -4383,8 +4172,8 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		btrfs_put_root(fs_root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = btrfs_commit_transaction(trans);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = btrfs_commit_transaction(trans);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_unset;</div><div class='ctx'> </div><div class='ctx'> 	merge_reloc_roots(rc);</div><div class='hunk'>@@ -4393,32 +4182,32 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_join_transaction(rc-&gt;extent_root);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='del'>-		err = PTR_ERR(trans);</div><div class='add'>+		ret = PTR_ERR(trans);</div><div class='ctx'> 		goto out_clean;</div><div class='ctx'> 	}</div><div class='del'>-	err = btrfs_commit_transaction(trans);</div><div class='add'>+	ret = btrfs_commit_transaction(trans);</div><div class='ctx'> out_clean:</div><div class='del'>-	ret = clean_dirty_subvols(rc);</div><div class='del'>-	if (ret &lt; 0 &amp;&amp; !err)</div><div class='del'>-		err = ret;</div><div class='add'>+	ret2 = clean_dirty_subvols(rc);</div><div class='add'>+	if (ret2 &lt; 0 &amp;&amp; !ret)</div><div class='add'>+		ret = ret2;</div><div class='ctx'> out_unset:</div><div class='ctx'> 	unset_reloc_control(rc);</div><div class='del'>-out_end:</div><div class='ctx'> 	reloc_chunk_end(fs_info);</div><div class='add'>+out_end:</div><div class='ctx'> 	free_reloc_control(rc);</div><div class='ctx'> out:</div><div class='ctx'> 	free_reloc_roots(&amp;reloc_roots);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> </div><div class='del'>-	if (err == 0) {</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 		/* cleanup orphan inode in data relocation tree */</div><div class='ctx'> 		fs_root = btrfs_grab_root(fs_info-&gt;data_reloc_root);</div><div class='ctx'> 		ASSERT(fs_root);</div><div class='del'>-		err = btrfs_orphan_cleanup(fs_root);</div><div class='add'>+		ret = btrfs_orphan_cleanup(fs_root);</div><div class='ctx'> 		btrfs_put_root(fs_root);</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4429,22 +4218,24 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='del'>-	u64 disk_bytenr = ordered-&gt;file_offset + inode-&gt;index_cnt;</div><div class='add'>+	u64 disk_bytenr = ordered-&gt;file_offset + inode-&gt;reloc_block_group_start;</div><div class='ctx'> 	struct btrfs_root *csum_root = btrfs_csum_root(fs_info, disk_bytenr);</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_lookup_csums_list(csum_root, disk_bytenr,</div><div class='ctx'> 				      disk_bytenr + ordered-&gt;num_bytes - 1,</div><div class='del'>-				      &amp;list, 0, false);</div><div class='del'>-	if (ret)</div><div class='add'>+				      &amp;list, false);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_mark_ordered_extent_error(ordered);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;list)) {</div><div class='ctx'> 		struct btrfs_ordered_sum *sums =</div><div class='del'>-			list_entry(list.next, struct btrfs_ordered_sum, list);</div><div class='add'>+			list_first_entry(&amp;list, struct btrfs_ordered_sum, list);</div><div class='ctx'> </div><div class='ctx'> 		list_del_init(&amp;sums-&gt;list);</div><div class='ctx'> </div><div class='hunk'>@@ -4490,16 +4281,25 @@ int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	    btrfs_root_last_snapshot(&amp;root-&gt;root_item))</div><div class='ctx'> 		first_cow = 1;</div><div class='ctx'> </div><div class='del'>-	if (root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='del'>-	    rc-&gt;create_reloc_tree) {</div><div class='add'>+	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID &amp;&amp; rc-&gt;create_reloc_tree) {</div><div class='ctx'> 		WARN_ON(!first_cow &amp;&amp; level == 0);</div><div class='ctx'> </div><div class='ctx'> 		node = rc-&gt;backref_cache.path[level];</div><div class='del'>-		BUG_ON(node-&gt;bytenr != buf-&gt;start &amp;&amp;</div><div class='del'>-		       node-&gt;new_bytenr != buf-&gt;start);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If node-&gt;bytenr != buf-&gt;start and node-&gt;new_bytenr !=</div><div class='add'>+		 * buf-&gt;start then we've got the wrong backref node for what we</div><div class='add'>+		 * expected to see here and the cache is incorrect.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(node-&gt;bytenr != buf-&gt;start &amp;&amp; node-&gt;new_bytenr != buf-&gt;start)) {</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+"bytenr %llu was found but our backref cache was expecting %llu or %llu",</div><div class='add'>+				  buf-&gt;start, node-&gt;bytenr, node-&gt;new_bytenr);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		btrfs_backref_drop_node_buffer(node);</div><div class='del'>-		atomic_inc(&amp;cow-&gt;refs);</div><div class='add'>+		refcount_inc(&amp;cow-&gt;refs);</div><div class='ctx'> 		node-&gt;eb = cow;</div><div class='ctx'> 		node-&gt;new_bytenr = cow-&gt;start;</div><div class='ctx'> </div><div class='hunk'>@@ -4584,8 +4384,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new_root = pending-&gt;snap;</div><div class='del'>-	reloc_root = create_reloc_root(trans, root-&gt;reloc_root,</div><div class='del'>-				       new_root-&gt;root_key.objectid);</div><div class='add'>+	reloc_root = create_reloc_root(trans, root-&gt;reloc_root, btrfs_root_id(new_root));</div><div class='ctx'> 	if (IS_ERR(reloc_root))</div><div class='ctx'> 		return PTR_ERR(reloc_root);</div><div class='ctx'> </div><div class='hunk'>@@ -4597,10 +4396,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	new_root-&gt;reloc_root = btrfs_grab_root(reloc_root);</div><div class='del'>-</div><div class='del'>-	if (rc-&gt;create_reloc_tree)</div><div class='del'>-		ret = clone_backref_node(trans, rc, root, reloc_root);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/btrfs/relocation.h b/fs/btrfs/relocation.h<br/>index 5fb60f2deb53..5c36b3f84b57 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/relocation.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/relocation.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/relocation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/relocation.h</a></div><div class='hunk'>@@ -3,7 +3,17 @@</div><div class='ctx'> #ifndef BTRFS_RELOCATION_H</div><div class='ctx'> #define BTRFS_RELOCATION_H</div><div class='ctx'> </div><div class='del'>-int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start);</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_ordered_extent;</div><div class='add'>+struct btrfs_pending_snapshot;</div><div class='add'>+</div><div class='add'>+int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start,</div><div class='add'>+			       bool verbose);</div><div class='ctx'> int btrfs_init_reloc_root(struct btrfs_trans_handle *trans, struct btrfs_root *root);</div><div class='ctx'> int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_root *root);</div><div class='head'>diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c<br/>index 603ad1459368..6a7e297ab0a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/root-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/root-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/root-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/root-tree.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "space-info.h"</div><div class='ctx'> #include "accessors.h"</div><div class='hunk'>@@ -82,7 +81,14 @@ int btrfs_find_root(struct btrfs_root *root, const struct btrfs_key *search_key,</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='del'>-		BUG_ON(ret == 0);		/* Logical error */</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist a root</div><div class='add'>+		 * with such id, but this is out of the valid range.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(ret == 0)) {</div><div class='add'>+			ret = -EUCLEAN;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		if (path-&gt;slots[0] == 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		path-&gt;slots[0]--;</div><div class='hunk'>@@ -124,7 +130,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 		      *item)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *l;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -137,16 +143,15 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, key, path, 0, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0) {</div><div class='add'>+	if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='del'>-			"unable to find root key (%llu %u %llu) in tree %llu",</div><div class='del'>-			key-&gt;objectid, key-&gt;type, key-&gt;offset,</div><div class='del'>-			root-&gt;root_key.objectid);</div><div class='add'>+			   "unable to find root key " BTRFS_KEY_FMT " in tree %llu",</div><div class='add'>+			   BTRFS_KEY_FMT_VALUE(key), btrfs_root_id(root));</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	l = path-&gt;nodes[0];</div><div class='hunk'>@@ -163,22 +168,22 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		ret = btrfs_search_slot(trans, root, key, path,</div><div class='ctx'> 				-1, 1);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_item(trans, root, path);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, root, path,</div><div class='ctx'> 				key, sizeof(*item));</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		l = path-&gt;nodes[0];</div><div class='ctx'> 		slot = path-&gt;slots[0];</div><div class='hunk'>@@ -192,9 +197,6 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root</div><div class='ctx'> 	btrfs_set_root_generation_v2(item, btrfs_root_generation(item));</div><div class='ctx'> </div><div class='ctx'> 	write_extent_buffer(l, item, ptr, sizeof(*item));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +214,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *tree_root = fs_info-&gt;tree_root;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -305,7 +307,6 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		btrfs_put_root(root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +315,7 @@ int btrfs_del_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		   const struct btrfs_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = trans-&gt;fs_info-&gt;tree_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -322,14 +323,12 @@ int btrfs_del_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	BUG_ON(ret != 0);</div><div class='add'>+		return ret;</div><div class='add'>+	if (unlikely(ret &gt; 0))</div><div class='add'>+		/* The root must exist but we did not find it by the key. */</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_del_item(trans, root, path);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_del_item(trans, root, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,</div><div class='hunk'>@@ -337,7 +336,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,</div><div class='ctx'> 		       const struct fscrypt_str *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *tree_root = trans-&gt;fs_info-&gt;tree_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root_ref *ref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -354,7 +353,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,</div><div class='ctx'> again:</div><div class='ctx'> 	ret = btrfs_search_slot(trans, tree_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else if (ret == 0) {</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		ref = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='hunk'>@@ -362,18 +361,16 @@ again:</div><div class='ctx'> 		ptr = (unsigned long)(ref + 1);</div><div class='ctx'> 		if ((btrfs_root_ref_dirid(leaf, ref) != dirid) ||</div><div class='ctx'> 		    (btrfs_root_ref_name_len(leaf, ref) != name-&gt;len) ||</div><div class='del'>-		    memcmp_extent_buffer(leaf, name-&gt;name, ptr, name-&gt;len)) {</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		    memcmp_extent_buffer(leaf, name-&gt;name, ptr, name-&gt;len))</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 		*sequence = btrfs_root_ref_sequence(leaf, ref);</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_del_item(trans, tree_root, path);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (key.type == BTRFS_ROOT_BACKREF_KEY) {</div><div class='hunk'>@@ -384,8 +381,6 @@ again:</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +406,7 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,</div><div class='ctx'> 	struct btrfs_root *tree_root = trans-&gt;fs_info-&gt;tree_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root_ref *ref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	unsigned long ptr;</div><div class='hunk'>@@ -426,9 +421,8 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,</div><div class='ctx'> again:</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, tree_root, path, &amp;key,</div><div class='ctx'> 				      sizeof(*ref) + name-&gt;len);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +433,6 @@ again:</div><div class='ctx'> 	btrfs_set_root_ref_name_len(leaf, ref, name-&gt;len);</div><div class='ctx'> 	ptr = (unsigned long)(ref + 1);</div><div class='ctx'> 	write_extent_buffer(leaf, name-&gt;name, ptr, name-&gt;len);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='ctx'> 	if (key.type == BTRFS_ROOT_BACKREF_KEY) {</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='hunk'>@@ -449,7 +442,6 @@ again:</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -539,13 +531,3 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void btrfs_subvolume_release_metadata(struct btrfs_root *root,</div><div class='del'>-				      struct btrfs_block_rsv *rsv)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	u64 qgroup_to_release;</div><div class='del'>-</div><div class='del'>-	btrfs_block_rsv_release(fs_info, rsv, (u64)-1, &amp;qgroup_to_release);</div><div class='del'>-	btrfs_qgroup_convert_reserved_meta(root, qgroup_to_release);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/btrfs/root-tree.h b/fs/btrfs/root-tree.h<br/>index 8b2c3859e464..8f5739e732b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/root-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/root-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/root-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/root-tree.h</a></div><div class='hunk'>@@ -3,13 +3,21 @@</div><div class='ctx'> #ifndef BTRFS_ROOT_TREE_H</div><div class='ctx'> #define BTRFS_ROOT_TREE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> struct fscrypt_str;</div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_key;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_root_item;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_block_rsv;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='ctx'> int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,</div><div class='ctx'> 				     struct btrfs_block_rsv *rsv,</div><div class='ctx'> 				     int nitems, bool use_global_rsv);</div><div class='del'>-void btrfs_subvolume_release_metadata(struct btrfs_root *root,</div><div class='del'>-				      struct btrfs_block_rsv *rsv);</div><div class='ctx'> int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,</div><div class='ctx'> 		       u64 ref_id, u64 dirid, u64 sequence,</div><div class='ctx'> 		       const struct fscrypt_str *name);</div><div class='head'>diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c<br/>index a01807cbd4d4..a40ee41f42c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/scrub.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/scrub.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/scrub.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/scrub.c</a></div><div class='hunk'>@@ -66,8 +66,6 @@ struct scrub_ctx;</div><div class='ctx'> </div><div class='ctx'> /* Represent one sector and its needed info to verify the content. */</div><div class='ctx'> struct scrub_sector_verification {</div><div class='del'>-	bool is_metadata;</div><div class='del'>-</div><div class='ctx'> 	union {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Csum pointer for data csum verification.  Should point to a</div><div class='hunk'>@@ -100,7 +98,39 @@ enum scrub_stripe_flags {</div><div class='ctx'> 	SCRUB_STRIPE_FLAG_NO_REPORT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SCRUB_STRIPE_PAGES		(BTRFS_STRIPE_LEN / PAGE_SIZE)</div><div class='add'>+/*</div><div class='add'>+ * We have multiple bitmaps for one scrub_stripe.</div><div class='add'>+ * However each bitmap has at most (BTRFS_STRIPE_LEN / blocksize) bits,</div><div class='add'>+ * which is normally 16, and much smaller than BITS_PER_LONG (32 or 64).</div><div class='add'>+ *</div><div class='add'>+ * So to reduce memory usage for each scrub_stripe, we pack those bitmaps</div><div class='add'>+ * into a larger one.</div><div class='add'>+ *</div><div class='add'>+ * These enum records where the sub-bitmap are inside the larger one.</div><div class='add'>+ * Each subbitmap starts at scrub_bitmap_nr_##name * nr_sectors bit.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	/* Which blocks are covered by extent items. */</div><div class='add'>+	scrub_bitmap_nr_has_extent = 0,</div><div class='add'>+</div><div class='add'>+	/* Which blocks are metadata. */</div><div class='add'>+	scrub_bitmap_nr_is_metadata,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Which blocks have errors, including IO, csum, and metadata</div><div class='add'>+	 * errors.</div><div class='add'>+	 * This sub-bitmap is the OR results of the next few error related</div><div class='add'>+	 * sub-bitmaps.</div><div class='add'>+	 */</div><div class='add'>+	scrub_bitmap_nr_error,</div><div class='add'>+	scrub_bitmap_nr_io_error,</div><div class='add'>+	scrub_bitmap_nr_csum_error,</div><div class='add'>+	scrub_bitmap_nr_meta_error,</div><div class='add'>+	scrub_bitmap_nr_meta_gen_error,</div><div class='add'>+	scrub_bitmap_nr_last,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SCRUB_STRIPE_MAX_FOLIOS		(BTRFS_STRIPE_LEN / PAGE_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Represent one contiguous range with a length of BTRFS_STRIPE_LEN.</div><div class='hunk'>@@ -109,7 +139,7 @@ struct scrub_stripe {</div><div class='ctx'> 	struct scrub_ctx *sctx;</div><div class='ctx'> 	struct btrfs_block_group *bg;</div><div class='ctx'> </div><div class='del'>-	struct page *pages[SCRUB_STRIPE_PAGES];</div><div class='add'>+	struct folio *folios[SCRUB_STRIPE_MAX_FOLIOS];</div><div class='ctx'> 	struct scrub_sector_verification *sectors;</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_device *dev;</div><div class='hunk'>@@ -138,36 +168,15 @@ struct scrub_stripe {</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long state;</div><div class='ctx'> </div><div class='del'>-	/* Indicate which sectors are covered by extent items. */</div><div class='del'>-	unsigned long extent_sector_bitmap;</div><div class='add'>+	/* The large bitmap contains all the sub-bitmaps. */</div><div class='add'>+	unsigned long bitmaps[BITS_TO_LONGS(scrub_bitmap_nr_last *</div><div class='add'>+					    (BTRFS_STRIPE_LEN / BTRFS_MIN_BLOCKSIZE))];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The errors hit during the initial read of the stripe.</div><div class='del'>-	 *</div><div class='del'>-	 * Would be utilized for error reporting and repair.</div><div class='del'>-	 *</div><div class='del'>-	 * The remaining init_nr_* records the number of errors hit, only used</div><div class='del'>-	 * by error reporting.</div><div class='add'>+	 * For writeback (repair or replace) error reporting.</div><div class='add'>+	 * This one is protected by a spinlock, thus can not be packed into</div><div class='add'>+	 * the larger bitmap.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned long init_error_bitmap;</div><div class='del'>-	unsigned int init_nr_io_errors;</div><div class='del'>-	unsigned int init_nr_csum_errors;</div><div class='del'>-	unsigned int init_nr_meta_errors;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The following error bitmaps are all for the current status.</div><div class='del'>-	 * Every time we submit a new read, these bitmaps may be updated.</div><div class='del'>-	 *</div><div class='del'>-	 * error_bitmap = io_error_bitmap | csum_error_bitmap | meta_error_bitmap;</div><div class='del'>-	 *</div><div class='del'>-	 * IO and csum errors can happen for both metadata and data.</div><div class='del'>-	 */</div><div class='del'>-	unsigned long error_bitmap;</div><div class='del'>-	unsigned long io_error_bitmap;</div><div class='del'>-	unsigned long csum_error_bitmap;</div><div class='del'>-	unsigned long meta_error_bitmap;</div><div class='del'>-</div><div class='del'>-	/* For writeback (repair or replace) error reporting. */</div><div class='ctx'> 	unsigned long write_error_bitmap;</div><div class='ctx'> </div><div class='ctx'> 	/* Writeback can be concurrent, thus we need to protect the bitmap. */</div><div class='hunk'>@@ -197,7 +206,7 @@ struct scrub_ctx {</div><div class='ctx'> 	ktime_t			throttle_deadline;</div><div class='ctx'> 	u64			throttle_sent;</div><div class='ctx'> </div><div class='del'>-	int			is_dev_replace;</div><div class='add'>+	bool			is_dev_replace;</div><div class='ctx'> 	u64			write_pointer;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex            wr_lock;</div><div class='hunk'>@@ -219,6 +228,90 @@ struct scrub_ctx {</div><div class='ctx'> 	refcount_t              refs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define scrub_calc_start_bit(stripe, name, block_nr)			\</div><div class='add'>+({									\</div><div class='add'>+	unsigned int __start_bit;					\</div><div class='add'>+									\</div><div class='add'>+	ASSERT(block_nr &lt; stripe-&gt;nr_sectors,				\</div><div class='add'>+		"nr_sectors=%u block_nr=%u", stripe-&gt;nr_sectors, block_nr); \</div><div class='add'>+	__start_bit = scrub_bitmap_nr_##name * stripe-&gt;nr_sectors + block_nr; \</div><div class='add'>+	__start_bit;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define IMPLEMENT_SCRUB_BITMAP_OPS(name)				\</div><div class='add'>+static inline void scrub_bitmap_set_##name(struct scrub_stripe *stripe,	\</div><div class='add'>+				    unsigned int block_nr,		\</div><div class='add'>+				    unsigned int nr_blocks)		\</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int start_bit = scrub_calc_start_bit(stripe,	\</div><div class='add'>+							    name, block_nr); \</div><div class='add'>+									\</div><div class='add'>+	bitmap_set(stripe-&gt;bitmaps, start_bit, nr_blocks);		\</div><div class='add'>+}									\</div><div class='add'>+static inline void scrub_bitmap_clear_##name(struct scrub_stripe *stripe, \</div><div class='add'>+				      unsigned int block_nr,		\</div><div class='add'>+				      unsigned int nr_blocks)		\</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int start_bit = scrub_calc_start_bit(stripe, name, \</div><div class='add'>+							    block_nr);	\</div><div class='add'>+									\</div><div class='add'>+	bitmap_clear(stripe-&gt;bitmaps, start_bit, nr_blocks);		\</div><div class='add'>+}									\</div><div class='add'>+static inline bool scrub_bitmap_test_bit_##name(struct scrub_stripe *stripe, \</div><div class='add'>+				     unsigned int block_nr)		\</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int start_bit = scrub_calc_start_bit(stripe, name, \</div><div class='add'>+							    block_nr);	\</div><div class='add'>+									\</div><div class='add'>+	return test_bit(start_bit, stripe-&gt;bitmaps);			\</div><div class='add'>+}									\</div><div class='add'>+static inline void scrub_bitmap_set_bit_##name(struct scrub_stripe *stripe, \</div><div class='add'>+				     unsigned int block_nr)		\</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int start_bit = scrub_calc_start_bit(stripe, name, \</div><div class='add'>+							    block_nr);	\</div><div class='add'>+									\</div><div class='add'>+	set_bit(start_bit, stripe-&gt;bitmaps);				\</div><div class='add'>+}									\</div><div class='add'>+static inline void scrub_bitmap_clear_bit_##name(struct scrub_stripe *stripe, \</div><div class='add'>+				     unsigned int block_nr)		\</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int start_bit = scrub_calc_start_bit(stripe, name, \</div><div class='add'>+							    block_nr);	\</div><div class='add'>+									\</div><div class='add'>+	clear_bit(start_bit, stripe-&gt;bitmaps);				\</div><div class='add'>+}									\</div><div class='add'>+static inline unsigned long scrub_bitmap_read_##name(struct scrub_stripe *stripe) \</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int nr_blocks = stripe-&gt;nr_sectors;		\</div><div class='add'>+									\</div><div class='add'>+	ASSERT(nr_blocks &gt; 0 &amp;&amp; nr_blocks &lt;= BITS_PER_LONG,		\</div><div class='add'>+	       "nr_blocks=%u BITS_PER_LONG=%u",				\</div><div class='add'>+	       nr_blocks, BITS_PER_LONG);				\</div><div class='add'>+									\</div><div class='add'>+	return bitmap_read(stripe-&gt;bitmaps, nr_blocks * scrub_bitmap_nr_##name, \</div><div class='add'>+			   stripe-&gt;nr_sectors);				\</div><div class='add'>+}									\</div><div class='add'>+static inline bool scrub_bitmap_empty_##name(struct scrub_stripe *stripe) \</div><div class='add'>+{									\</div><div class='add'>+	unsigned long bitmap = scrub_bitmap_read_##name(stripe);	\</div><div class='add'>+									\</div><div class='add'>+	return bitmap_empty(&amp;bitmap, stripe-&gt;nr_sectors);		\</div><div class='add'>+}									\</div><div class='add'>+static inline unsigned int scrub_bitmap_weight_##name(struct scrub_stripe *stripe) \</div><div class='add'>+{									\</div><div class='add'>+	unsigned long bitmap = scrub_bitmap_read_##name(stripe);	\</div><div class='add'>+									\</div><div class='add'>+	return bitmap_weight(&amp;bitmap, stripe-&gt;nr_sectors);		\</div><div class='add'>+}</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(has_extent);</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(is_metadata);</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(error);</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(io_error);</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(csum_error);</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(meta_error);</div><div class='add'>+IMPLEMENT_SCRUB_BITMAP_OPS(meta_gen_error);</div><div class='add'>+</div><div class='ctx'> struct scrub_warning {</div><div class='ctx'> 	struct btrfs_path	*path;</div><div class='ctx'> 	u64			extent_item_size;</div><div class='hunk'>@@ -228,15 +321,28 @@ struct scrub_warning {</div><div class='ctx'> 	struct btrfs_device	*dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct scrub_error_records {</div><div class='add'>+	/*</div><div class='add'>+	 * Bitmap recording which blocks hit errors (IO/csum/...) during the</div><div class='add'>+	 * initial read.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long init_error_bitmap;</div><div class='add'>+</div><div class='add'>+	unsigned int nr_io_errors;</div><div class='add'>+	unsigned int nr_csum_errors;</div><div class='add'>+	unsigned int nr_meta_errors;</div><div class='add'>+	unsigned int nr_meta_gen_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void release_scrub_stripe(struct scrub_stripe *stripe)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stripe)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (int i = 0; i &lt; SCRUB_STRIPE_PAGES; i++) {</div><div class='del'>-		if (stripe-&gt;pages[i])</div><div class='del'>-			__free_page(stripe-&gt;pages[i]);</div><div class='del'>-		stripe-&gt;pages[i] = NULL;</div><div class='add'>+	for (int i = 0; i &lt; SCRUB_STRIPE_MAX_FOLIOS; i++) {</div><div class='add'>+		if (stripe-&gt;folios[i])</div><div class='add'>+			folio_put(stripe-&gt;folios[i]);</div><div class='add'>+		stripe-&gt;folios[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(stripe-&gt;sectors);</div><div class='ctx'> 	kfree(stripe-&gt;csums);</div><div class='hunk'>@@ -249,6 +355,7 @@ static void release_scrub_stripe(struct scrub_stripe *stripe)</div><div class='ctx'> static int init_scrub_stripe(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			     struct scrub_stripe *stripe)</div><div class='ctx'> {</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(stripe, 0, sizeof(*stripe));</div><div class='hunk'>@@ -261,7 +368,9 @@ static int init_scrub_stripe(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	atomic_set(&amp;stripe-&gt;pending_io, 0);</div><div class='ctx'> 	spin_lock_init(&amp;stripe-&gt;write_error_lock);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_alloc_page_array(SCRUB_STRIPE_PAGES, stripe-&gt;pages, 0);</div><div class='add'>+	ASSERT(BTRFS_STRIPE_LEN &gt;&gt; min_folio_shift &lt;= SCRUB_STRIPE_MAX_FOLIOS);</div><div class='add'>+	ret = btrfs_alloc_folio_array(BTRFS_STRIPE_LEN &gt;&gt; min_folio_shift,</div><div class='add'>+				      fs_info-&gt;block_min_order, stripe-&gt;folios);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -340,7 +449,7 @@ static void scrub_put_ctx(struct scrub_ctx *sctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(</div><div class='del'>-		struct btrfs_fs_info *fs_info, int is_dev_replace)</div><div class='add'>+		struct btrfs_fs_info *fs_info, bool is_dev_replace)</div><div class='ctx'> {</div><div class='ctx'> 	struct scrub_ctx *sctx;</div><div class='ctx'> 	int		i;</div><div class='hunk'>@@ -354,10 +463,10 @@ static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(</div><div class='ctx'> 	refcount_set(&amp;sctx-&gt;refs, 1);</div><div class='ctx'> 	sctx-&gt;is_dev_replace = is_dev_replace;</div><div class='ctx'> 	sctx-&gt;fs_info = fs_info;</div><div class='del'>-	sctx-&gt;extent_path.search_commit_root = 1;</div><div class='del'>-	sctx-&gt;extent_path.skip_locking = 1;</div><div class='del'>-	sctx-&gt;csum_path.search_commit_root = 1;</div><div class='del'>-	sctx-&gt;csum_path.skip_locking = 1;</div><div class='add'>+	sctx-&gt;extent_path.search_commit_root = true;</div><div class='add'>+	sctx-&gt;extent_path.skip_locking = true;</div><div class='add'>+	sctx-&gt;csum_path.search_commit_root = true;</div><div class='add'>+	sctx-&gt;csum_path.skip_locking = true;</div><div class='ctx'> 	for (i = 0; i &lt; SCRUB_TOTAL_STRIPES; i++) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +505,7 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='ctx'> 	struct scrub_warning *swarn = warn_ctx;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = swarn-&gt;dev-&gt;fs_info;</div><div class='del'>-	struct inode_fs_paths *ipath = NULL;</div><div class='add'>+	struct inode_fs_paths *ipath __free(inode_fs_paths) = NULL;</div><div class='ctx'> 	struct btrfs_root *local_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='hunk'>@@ -450,8 +559,8 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 	 * hold all of the paths here</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; ipath-&gt;fspath-&gt;elem_cnt; ++i)</div><div class='del'>-		btrfs_warn_in_rcu(fs_info,</div><div class='del'>-"%s at logical %llu on dev %s, physical %llu, root %llu, inode %llu, offset %llu, length %u, links %u (path: %s)",</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='add'>+"scrub: %s at logical %llu on dev %s, physical %llu root %llu inode %llu offset %llu length %u links %u (path: %s)",</div><div class='ctx'> 				  swarn-&gt;errstr, swarn-&gt;logical,</div><div class='ctx'> 				  btrfs_dev_name(swarn-&gt;dev),</div><div class='ctx'> 				  swarn-&gt;physical,</div><div class='hunk'>@@ -460,18 +569,16 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,</div><div class='ctx'> 				  (char *)(unsigned long)ipath-&gt;fspath-&gt;val[i]);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_root(local_root);</div><div class='del'>-	free_ipath(ipath);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	btrfs_warn_in_rcu(fs_info,</div><div class='del'>-			  "%s at logical %llu on dev %s, physical %llu, root %llu, inode %llu, offset %llu: path resolving failed with ret=%d",</div><div class='add'>+	btrfs_warn(fs_info,</div><div class='add'>+			  "scrub: %s at logical %llu on dev %s, physical %llu root %llu inode %llu offset %llu: path resolving failed with ret=%d",</div><div class='ctx'> 			  swarn-&gt;errstr, swarn-&gt;logical,</div><div class='ctx'> 			  btrfs_dev_name(swarn-&gt;dev),</div><div class='ctx'> 			  swarn-&gt;physical,</div><div class='ctx'> 			  root, inum, offset, ret);</div><div class='ctx'> </div><div class='del'>-	free_ipath(ipath);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +586,7 @@ static void scrub_print_common_warning(const char *errstr, struct btrfs_device *</div><div class='ctx'> 				       bool is_super, u64 logical, u64 physical)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = dev-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	struct btrfs_extent_item *ei;</div><div class='hunk'>@@ -490,7 +597,7 @@ static void scrub_print_common_warning(const char *errstr, struct btrfs_device *</div><div class='ctx'> </div><div class='ctx'> 	/* Super block error, no need to search extent tree. */</div><div class='ctx'> 	if (is_super) {</div><div class='del'>-		btrfs_warn_in_rcu(fs_info, "%s on device %s, physical %llu",</div><div class='add'>+		btrfs_warn(fs_info, "scrub: %s on device %s, physical %llu",</div><div class='ctx'> 				  errstr, btrfs_dev_name(dev), physical);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -506,7 +613,7 @@ static void scrub_print_common_warning(const char *errstr, struct btrfs_device *</div><div class='ctx'> 	ret = extent_from_logical(fs_info, swarn.logical, path, &amp;found_key,</div><div class='ctx'> 				  &amp;flags);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	swarn.extent_item_size = found_key.offset;</div><div class='ctx'> </div><div class='hunk'>@@ -525,14 +632,14 @@ static void scrub_print_common_warning(const char *errstr, struct btrfs_device *</div><div class='ctx'> 						      &amp;ref_level);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				btrfs_warn(fs_info,</div><div class='del'>-				"failed to resolve tree backref for logical %llu: %d",</div><div class='del'>-						  swarn.logical, ret);</div><div class='add'>+		   "scrub: failed to resolve tree backref for logical %llu: %d",</div><div class='add'>+					   swarn.logical, ret);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='del'>-			btrfs_warn_in_rcu(fs_info,</div><div class='del'>-"%s at logical %llu on dev %s, physical %llu: metadata %s (level %d) in tree %llu",</div><div class='add'>+			btrfs_warn(fs_info,</div><div class='add'>+"scrub: %s at logical %llu on dev %s, physical %llu: metadata %s (level %d) in tree %llu",</div><div class='ctx'> 				errstr, swarn.logical, btrfs_dev_name(dev),</div><div class='ctx'> 				swarn.physical, (ref_level ? "node" : "leaf"),</div><div class='ctx'> 				ref_level, ref_root);</div><div class='hunk'>@@ -552,9 +659,6 @@ static void scrub_print_common_warning(const char *errstr, struct btrfs_device *</div><div class='ctx'> </div><div class='ctx'> 		iterate_extent_inodes(&amp;ctx, true, scrub_print_warning_inode, &amp;swarn);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fill_writer_pointer_gap(struct scrub_ctx *sctx, u64 physical)</div><div class='hunk'>@@ -579,20 +683,32 @@ static int fill_writer_pointer_gap(struct scrub_ctx *sctx, u64 physical)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *scrub_stripe_get_page(struct scrub_stripe *stripe, int sector_nr)</div><div class='add'>+static void *scrub_stripe_get_kaddr(struct scrub_stripe *stripe, int sector_nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='del'>-	int page_index = (sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='add'>+	u32 offset = (sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	const struct folio *folio = stripe-&gt;folios[offset &gt;&gt; min_folio_shift];</div><div class='ctx'> </div><div class='del'>-	return stripe-&gt;pages[page_index];</div><div class='add'>+	/* stripe-&gt;folios[] is allocated by us and no highmem is allowed. */</div><div class='add'>+	ASSERT(folio);</div><div class='add'>+	ASSERT(!folio_test_highmem(folio));</div><div class='add'>+	return folio_address(folio) + offset_in_folio(folio, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int scrub_stripe_get_page_offset(struct scrub_stripe *stripe,</div><div class='del'>-						 int sector_nr)</div><div class='add'>+static phys_addr_t scrub_stripe_get_paddr(struct scrub_stripe *stripe, int sector_nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='add'>+	u32 offset = (sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	const struct folio *folio = stripe-&gt;folios[offset &gt;&gt; min_folio_shift];</div><div class='ctx'> </div><div class='del'>-	return offset_in_page(sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	/* stripe-&gt;folios[] is allocated by us and no highmem is allowed. */</div><div class='add'>+	ASSERT(folio);</div><div class='add'>+	ASSERT(!folio_test_highmem(folio));</div><div class='add'>+	/* And the range must be contained inside the folio. */</div><div class='add'>+	ASSERT(offset_in_folio(folio, offset) + fs_info-&gt;sectorsize &lt;= folio_size(folio));</div><div class='add'>+	return page_to_phys(folio_page(folio, 0)) + offset_in_folio(folio, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr)</div><div class='hunk'>@@ -600,46 +716,44 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='ctx'> 	const u32 sectors_per_tree = fs_info-&gt;nodesize &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	const u64 logical = stripe-&gt;logical + (sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	const struct page *first_page = scrub_stripe_get_page(stripe, sector_nr);</div><div class='del'>-	const unsigned int first_off = scrub_stripe_get_page_offset(stripe, sector_nr);</div><div class='add'>+	void *first_kaddr = scrub_stripe_get_kaddr(stripe, sector_nr);</div><div class='add'>+	struct btrfs_header *header = first_kaddr;</div><div class='ctx'> 	SHASH_DESC_ON_STACK(shash, fs_info-&gt;csum_shash);</div><div class='ctx'> 	u8 on_disk_csum[BTRFS_CSUM_SIZE];</div><div class='ctx'> 	u8 calculated_csum[BTRFS_CSUM_SIZE];</div><div class='del'>-	struct btrfs_header *header;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Here we don't have a good way to attach the pages (and subpages)</div><div class='ctx'> 	 * to a dummy extent buffer, thus we have to directly grab the members</div><div class='ctx'> 	 * from pages.</div><div class='ctx'> 	 */</div><div class='del'>-	header = (struct btrfs_header *)(page_address(first_page) + first_off);</div><div class='ctx'> 	memcpy(on_disk_csum, header-&gt;csum, fs_info-&gt;csum_size);</div><div class='ctx'> </div><div class='ctx'> 	if (logical != btrfs_stack_header_bytenr(header)) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;csum_error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_meta_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr, sectors_per_tree);</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-		"tree block %llu mirror %u has bad bytenr, has %llu want %llu",</div><div class='add'>+	  "scrub: tree block %llu mirror %u has bad bytenr, has %llu want %llu",</div><div class='ctx'> 			      logical, stripe-&gt;mirror_num,</div><div class='ctx'> 			      btrfs_stack_header_bytenr(header), logical);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (memcmp(header-&gt;fsid, fs_info-&gt;fs_devices-&gt;metadata_uuid,</div><div class='ctx'> 		   BTRFS_FSID_SIZE) != 0) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;meta_error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_meta_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr, sectors_per_tree);</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-		"tree block %llu mirror %u has bad fsid, has %pU want %pU",</div><div class='add'>+	      "scrub: tree block %llu mirror %u has bad fsid, has %pU want %pU",</div><div class='ctx'> 			      logical, stripe-&gt;mirror_num,</div><div class='ctx'> 			      header-&gt;fsid, fs_info-&gt;fs_devices-&gt;fsid);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (memcmp(header-&gt;chunk_tree_uuid, fs_info-&gt;chunk_tree_uuid,</div><div class='ctx'> 		   BTRFS_UUID_SIZE) != 0) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;meta_error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_meta_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr, sectors_per_tree);</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-		"tree block %llu mirror %u has bad chunk tree uuid, has %pU want %pU",</div><div class='add'>+   "scrub: tree block %llu mirror %u has bad chunk tree uuid, has %pU want %pU",</div><div class='ctx'> 			      logical, stripe-&gt;mirror_num,</div><div class='ctx'> 			      header-&gt;chunk_tree_uuid, fs_info-&gt;chunk_tree_uuid);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -648,42 +762,40 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr</div><div class='ctx'> 	/* Now check tree block csum. */</div><div class='ctx'> 	shash-&gt;tfm = fs_info-&gt;csum_shash;</div><div class='ctx'> 	crypto_shash_init(shash);</div><div class='del'>-	crypto_shash_update(shash, page_address(first_page) + first_off +</div><div class='del'>-			    BTRFS_CSUM_SIZE, fs_info-&gt;sectorsize - BTRFS_CSUM_SIZE);</div><div class='add'>+	crypto_shash_update(shash, first_kaddr + BTRFS_CSUM_SIZE,</div><div class='add'>+			    fs_info-&gt;sectorsize - BTRFS_CSUM_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	for (int i = sector_nr + 1; i &lt; sector_nr + sectors_per_tree; i++) {</div><div class='del'>-		struct page *page = scrub_stripe_get_page(stripe, i);</div><div class='del'>-		unsigned int page_off = scrub_stripe_get_page_offset(stripe, i);</div><div class='del'>-</div><div class='del'>-		crypto_shash_update(shash, page_address(page) + page_off,</div><div class='add'>+		crypto_shash_update(shash, scrub_stripe_get_kaddr(stripe, i),</div><div class='ctx'> 				    fs_info-&gt;sectorsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	crypto_shash_final(shash, calculated_csum);</div><div class='ctx'> 	if (memcmp(calculated_csum, on_disk_csum, fs_info-&gt;csum_size) != 0) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;meta_error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_meta_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr, sectors_per_tree);</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-		"tree block %llu mirror %u has bad csum, has " CSUM_FMT " want " CSUM_FMT,</div><div class='add'>+"scrub: tree block %llu mirror %u has bad csum, has " BTRFS_CSUM_FMT " want " BTRFS_CSUM_FMT,</div><div class='ctx'> 			      logical, stripe-&gt;mirror_num,</div><div class='del'>-			      CSUM_FMT_VALUE(fs_info-&gt;csum_size, on_disk_csum),</div><div class='del'>-			      CSUM_FMT_VALUE(fs_info-&gt;csum_size, calculated_csum));</div><div class='add'>+			      BTRFS_CSUM_FMT_VALUE(fs_info-&gt;csum_size, on_disk_csum),</div><div class='add'>+			      BTRFS_CSUM_FMT_VALUE(fs_info-&gt;csum_size, calculated_csum));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (stripe-&gt;sectors[sector_nr].generation !=</div><div class='ctx'> 	    btrfs_stack_header_generation(header)) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;meta_error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_meta_gen_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr, sectors_per_tree);</div><div class='ctx'> 		btrfs_warn_rl(fs_info,</div><div class='del'>-		"tree block %llu mirror %u has bad generation, has %llu want %llu",</div><div class='add'>+      "scrub: tree block %llu mirror %u has bad generation, has %llu want %llu",</div><div class='ctx'> 			      logical, stripe-&gt;mirror_num,</div><div class='ctx'> 			      btrfs_stack_header_generation(header),</div><div class='ctx'> 			      stripe-&gt;sectors[sector_nr].generation);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	bitmap_clear(&amp;stripe-&gt;error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-	bitmap_clear(&amp;stripe-&gt;csum_error_bitmap, sector_nr, sectors_per_tree);</div><div class='del'>-	bitmap_clear(&amp;stripe-&gt;meta_error_bitmap, sector_nr, sectors_per_tree);</div><div class='add'>+	scrub_bitmap_clear_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+	scrub_bitmap_clear_csum_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+	scrub_bitmap_clear_meta_error(stripe, sector_nr, sectors_per_tree);</div><div class='add'>+	scrub_bitmap_clear_meta_gen_error(stripe, sector_nr, sectors_per_tree);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void scrub_verify_one_sector(struct scrub_stripe *stripe, int sector_nr)</div><div class='hunk'>@@ -691,23 +803,22 @@ static void scrub_verify_one_sector(struct scrub_stripe *stripe, int sector_nr)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='ctx'> 	struct scrub_sector_verification *sector = &amp;stripe-&gt;sectors[sector_nr];</div><div class='ctx'> 	const u32 sectors_per_tree = fs_info-&gt;nodesize &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-	struct page *page = scrub_stripe_get_page(stripe, sector_nr);</div><div class='del'>-	unsigned int pgoff = scrub_stripe_get_page_offset(stripe, sector_nr);</div><div class='add'>+	phys_addr_t paddr = scrub_stripe_get_paddr(stripe, sector_nr);</div><div class='ctx'> 	u8 csum_buf[BTRFS_CSUM_SIZE];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(sector_nr &gt;= 0 &amp;&amp; sector_nr &lt; stripe-&gt;nr_sectors);</div><div class='ctx'> </div><div class='ctx'> 	/* Sector not utilized, skip it. */</div><div class='del'>-	if (!test_bit(sector_nr, &amp;stripe-&gt;extent_sector_bitmap))</div><div class='add'>+	if (!scrub_bitmap_test_bit_has_extent(stripe, sector_nr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* IO error, no need to check. */</div><div class='del'>-	if (test_bit(sector_nr, &amp;stripe-&gt;io_error_bitmap))</div><div class='add'>+	if (scrub_bitmap_test_bit_io_error(stripe, sector_nr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Metadata, verify the full tree block. */</div><div class='del'>-	if (sector-&gt;is_metadata) {</div><div class='add'>+	if (scrub_bitmap_test_bit_is_metadata(stripe, sector_nr)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check if the tree block crosses the stripe boundary.  If</div><div class='ctx'> 		 * crossed the boundary, we cannot verify it but only give a</div><div class='hunk'>@@ -718,7 +829,7 @@ static void scrub_verify_one_sector(struct scrub_stripe *stripe, int sector_nr)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (unlikely(sector_nr + sectors_per_tree &gt; stripe-&gt;nr_sectors)) {</div><div class='ctx'> 			btrfs_warn_rl(fs_info,</div><div class='del'>-			"tree block at %llu crosses stripe boundary %llu",</div><div class='add'>+			"scrub: tree block at %llu crosses stripe boundary %llu",</div><div class='ctx'> 				      stripe-&gt;logical +</div><div class='ctx'> 				      (sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits),</div><div class='ctx'> 				      stripe-&gt;logical);</div><div class='hunk'>@@ -733,17 +844,17 @@ static void scrub_verify_one_sector(struct scrub_stripe *stripe, int sector_nr)</div><div class='ctx'> 	 * cases without csum, we have no other choice but to trust it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!sector-&gt;csum) {</div><div class='del'>-		clear_bit(sector_nr, &amp;stripe-&gt;error_bitmap);</div><div class='add'>+		scrub_bitmap_clear_bit_error(stripe, sector_nr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_check_sector_csum(fs_info, page, pgoff, csum_buf, sector-&gt;csum);</div><div class='add'>+	ret = btrfs_check_block_csum(fs_info, paddr, csum_buf, sector-&gt;csum);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		set_bit(sector_nr, &amp;stripe-&gt;csum_error_bitmap);</div><div class='del'>-		set_bit(sector_nr, &amp;stripe-&gt;error_bitmap);</div><div class='add'>+		scrub_bitmap_set_bit_csum_error(stripe, sector_nr);</div><div class='add'>+		scrub_bitmap_set_bit_error(stripe, sector_nr);</div><div class='ctx'> 	} else {</div><div class='del'>-		clear_bit(sector_nr, &amp;stripe-&gt;csum_error_bitmap);</div><div class='del'>-		clear_bit(sector_nr, &amp;stripe-&gt;error_bitmap);</div><div class='add'>+		scrub_bitmap_clear_bit_csum_error(stripe, sector_nr);</div><div class='add'>+		scrub_bitmap_clear_bit_error(stripe, sector_nr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -756,7 +867,7 @@ static void scrub_verify_one_stripe(struct scrub_stripe *stripe, unsigned long b</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(sector_nr, &amp;bitmap, stripe-&gt;nr_sectors) {</div><div class='ctx'> 		scrub_verify_one_sector(stripe, sector_nr);</div><div class='del'>-		if (stripe-&gt;sectors[sector_nr].is_metadata)</div><div class='add'>+		if (scrub_bitmap_test_bit_is_metadata(stripe, sector_nr))</div><div class='ctx'> 			sector_nr += sectors_per_tree - 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -766,8 +877,7 @@ static int calc_sector_number(struct scrub_stripe *stripe, struct bio_vec *first</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; stripe-&gt;nr_sectors; i++) {</div><div class='del'>-		if (scrub_stripe_get_page(stripe, i) == first_bvec-&gt;bv_page &amp;&amp;</div><div class='del'>-		    scrub_stripe_get_page_offset(stripe, i) == first_bvec-&gt;bv_offset)</div><div class='add'>+		if (scrub_stripe_get_kaddr(stripe, i) == bvec_virt(first_bvec))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	ASSERT(i &lt; stripe-&gt;nr_sectors);</div><div class='hunk'>@@ -795,13 +905,13 @@ static void scrub_repair_read_endio(struct btrfs_bio *bbio)</div><div class='ctx'> 		bio_size += bvec-&gt;bv_len;</div><div class='ctx'> </div><div class='ctx'> 	if (bbio-&gt;bio.bi_status) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;io_error_bitmap, sector_nr,</div><div class='del'>-			   bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, sector_nr,</div><div class='del'>-			   bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+		scrub_bitmap_set_io_error(stripe, sector_nr,</div><div class='add'>+					  bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr,</div><div class='add'>+				       bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	} else {</div><div class='del'>-		bitmap_clear(&amp;stripe-&gt;io_error_bitmap, sector_nr,</div><div class='del'>-			     bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+		scrub_bitmap_clear_io_error(stripe, sector_nr,</div><div class='add'>+					  bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	}</div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;stripe-&gt;pending_io))</div><div class='hunk'>@@ -814,62 +924,90 @@ static int calc_next_mirror(int mirror, int num_copies)</div><div class='ctx'> 	return (mirror + 1 &gt; num_copies) ? 1 : mirror + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void scrub_bio_add_sector(struct btrfs_bio *bbio, struct scrub_stripe *stripe,</div><div class='add'>+				 int sector_nr)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = bbio-&gt;inode-&gt;root-&gt;fs_info;</div><div class='add'>+	void *kaddr = scrub_stripe_get_kaddr(stripe, sector_nr);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bio_add_page(&amp;bbio-&gt;bio, virt_to_page(kaddr), fs_info-&gt;sectorsize,</div><div class='add'>+			   offset_in_page(kaddr));</div><div class='add'>+	/*</div><div class='add'>+	 * Caller should ensure the bbio has enough size.</div><div class='add'>+	 * And we cannot use __bio_add_page(), which doesn't do any merge.</div><div class='add'>+	 *</div><div class='add'>+	 * Meanwhile for scrub_submit_initial_read() we fully rely on the merge</div><div class='add'>+	 * to create the minimal amount of bio vectors, for fs block size &lt; page</div><div class='add'>+	 * size cases.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT(ret == fs_info-&gt;sectorsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct btrfs_bio *alloc_scrub_bbio(struct btrfs_fs_info *fs_info,</div><div class='add'>+					  unsigned int nr_vecs, blk_opf_t opf,</div><div class='add'>+					  u64 logical,</div><div class='add'>+					  btrfs_bio_end_io_t end_io, void *private)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_bio *bbio;</div><div class='add'>+</div><div class='add'>+	bbio = btrfs_bio_alloc(nr_vecs, opf, BTRFS_I(fs_info-&gt;btree_inode),</div><div class='add'>+			       logical, end_io, private);</div><div class='add'>+	bbio-&gt;is_scrub = true;</div><div class='add'>+	bbio-&gt;bio.bi_iter.bi_sector = logical &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+	return bbio;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void scrub_stripe_submit_repair_read(struct scrub_stripe *stripe,</div><div class='ctx'> 					    int mirror, int blocksize, bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_bio *bbio = NULL;</div><div class='del'>-	const unsigned long old_error_bitmap = stripe-&gt;error_bitmap;</div><div class='add'>+	const unsigned long old_error_bitmap = scrub_bitmap_read_error(stripe);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ASSERT(stripe-&gt;mirror_num &gt;= 1);</div><div class='del'>-	ASSERT(atomic_read(&amp;stripe-&gt;pending_io) == 0);</div><div class='add'>+	ASSERT(stripe-&gt;mirror_num &gt;= 1, "stripe-&gt;mirror_num=%d", stripe-&gt;mirror_num);</div><div class='add'>+	ASSERT(atomic_read(&amp;stripe-&gt;pending_io) == 0,</div><div class='add'>+	       "atomic_read(&amp;stripe-&gt;pending_io)=%d", atomic_read(&amp;stripe-&gt;pending_io));</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(i, &amp;old_error_bitmap, stripe-&gt;nr_sectors) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		int pgoff;</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		page = scrub_stripe_get_page(stripe, i);</div><div class='del'>-		pgoff = scrub_stripe_get_page_offset(stripe, i);</div><div class='del'>-</div><div class='ctx'> 		/* The current sector cannot be merged, submit the bio. */</div><div class='del'>-		if (bbio &amp;&amp; ((i &gt; 0 &amp;&amp; !test_bit(i - 1, &amp;stripe-&gt;error_bitmap)) ||</div><div class='add'>+		if (bbio &amp;&amp; ((i &gt; 0 &amp;&amp; !test_bit(i - 1, &amp;old_error_bitmap)) ||</div><div class='ctx'> 			     bbio-&gt;bio.bi_iter.bi_size &gt;= blocksize)) {</div><div class='ctx'> 			ASSERT(bbio-&gt;bio.bi_iter.bi_size);</div><div class='ctx'> 			atomic_inc(&amp;stripe-&gt;pending_io);</div><div class='del'>-			btrfs_submit_bio(bbio, mirror);</div><div class='add'>+			btrfs_submit_bbio(bbio, mirror);</div><div class='ctx'> 			if (wait)</div><div class='ctx'> 				wait_scrub_stripe_io(stripe);</div><div class='ctx'> 			bbio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!bbio) {</div><div class='del'>-			bbio = btrfs_bio_alloc(stripe-&gt;nr_sectors, REQ_OP_READ,</div><div class='del'>-				fs_info, scrub_repair_read_endio, stripe);</div><div class='del'>-			bbio-&gt;bio.bi_iter.bi_sector = (stripe-&gt;logical +</div><div class='del'>-				(i &lt;&lt; fs_info-&gt;sectorsize_bits)) &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-		}</div><div class='add'>+		if (!bbio)</div><div class='add'>+			bbio = alloc_scrub_bbio(fs_info, stripe-&gt;nr_sectors, REQ_OP_READ,</div><div class='add'>+						stripe-&gt;logical + (i &lt;&lt; fs_info-&gt;sectorsize_bits),</div><div class='add'>+						scrub_repair_read_endio, stripe);</div><div class='ctx'> </div><div class='del'>-		ret = bio_add_page(&amp;bbio-&gt;bio, page, fs_info-&gt;sectorsize, pgoff);</div><div class='del'>-		ASSERT(ret == fs_info-&gt;sectorsize);</div><div class='add'>+		scrub_bio_add_sector(bbio, stripe, i);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bbio) {</div><div class='ctx'> 		ASSERT(bbio-&gt;bio.bi_iter.bi_size);</div><div class='ctx'> 		atomic_inc(&amp;stripe-&gt;pending_io);</div><div class='del'>-		btrfs_submit_bio(bbio, mirror);</div><div class='add'>+		btrfs_submit_bbio(bbio, mirror);</div><div class='ctx'> 		if (wait)</div><div class='ctx'> 			wait_scrub_stripe_io(stripe);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void scrub_stripe_report_errors(struct scrub_ctx *sctx,</div><div class='del'>-				       struct scrub_stripe *stripe)</div><div class='add'>+				       struct scrub_stripe *stripe,</div><div class='add'>+				       const struct scrub_error_records *errors)</div><div class='ctx'> {</div><div class='ctx'> 	static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL,</div><div class='ctx'> 				      DEFAULT_RATELIMIT_BURST);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_device *dev = NULL;</div><div class='add'>+	const unsigned long extent_bitmap = scrub_bitmap_read_has_extent(stripe);</div><div class='add'>+	const unsigned long error_bitmap = scrub_bitmap_read_error(stripe);</div><div class='ctx'> 	u64 physical = 0;</div><div class='ctx'> 	int nr_data_sectors = 0;</div><div class='ctx'> 	int nr_meta_sectors = 0;</div><div class='hunk'>@@ -886,14 +1024,14 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx,</div><div class='ctx'> 	 * Although our scrub_stripe infrastructure is mostly based on btrfs_submit_bio()</div><div class='ctx'> 	 * thus no need for dev/physical, error reporting still needs dev and physical.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!bitmap_empty(&amp;stripe-&gt;init_error_bitmap, stripe-&gt;nr_sectors)) {</div><div class='add'>+	if (!bitmap_empty(&amp;errors-&gt;init_error_bitmap, stripe-&gt;nr_sectors)) {</div><div class='ctx'> 		u64 mapped_len = fs_info-&gt;sectorsize;</div><div class='ctx'> 		struct btrfs_io_context *bioc = NULL;</div><div class='ctx'> 		int stripe_index = stripe-&gt;mirror_num - 1;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		/* For scrub, our mirror_num should always start at 1. */</div><div class='del'>-		ASSERT(stripe-&gt;mirror_num &gt;= 1);</div><div class='add'>+		ASSERT(stripe-&gt;mirror_num &gt;= 1, "stripe-&gt;mirror_num=%d", stripe-&gt;mirror_num);</div><div class='ctx'> 		ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS,</div><div class='ctx'> 				      stripe-&gt;logical, &amp;mapped_len, &amp;bioc,</div><div class='ctx'> 				      NULL, NULL);</div><div class='hunk'>@@ -909,10 +1047,10 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> skip:</div><div class='del'>-	for_each_set_bit(sector_nr, &amp;stripe-&gt;extent_sector_bitmap, stripe-&gt;nr_sectors) {</div><div class='add'>+	for_each_set_bit(sector_nr, &amp;extent_bitmap, stripe-&gt;nr_sectors) {</div><div class='ctx'> 		bool repaired = false;</div><div class='ctx'> </div><div class='del'>-		if (stripe-&gt;sectors[sector_nr].is_metadata) {</div><div class='add'>+		if (scrub_bitmap_test_bit_is_metadata(stripe, sector_nr)) {</div><div class='ctx'> 			nr_meta_sectors++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			nr_data_sectors++;</div><div class='hunk'>@@ -920,14 +1058,14 @@ skip:</div><div class='ctx'> 				nr_nodatacsum_sectors++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (test_bit(sector_nr, &amp;stripe-&gt;init_error_bitmap) &amp;&amp;</div><div class='del'>-		    !test_bit(sector_nr, &amp;stripe-&gt;error_bitmap)) {</div><div class='add'>+		if (test_bit(sector_nr, &amp;errors-&gt;init_error_bitmap) &amp;&amp;</div><div class='add'>+		    !test_bit(sector_nr, &amp;error_bitmap)) {</div><div class='ctx'> 			nr_repaired_sectors++;</div><div class='ctx'> 			repaired = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Good sector from the beginning, nothing need to be done. */</div><div class='del'>-		if (!test_bit(sector_nr, &amp;stripe-&gt;init_error_bitmap))</div><div class='add'>+		if (!test_bit(sector_nr, &amp;errors-&gt;init_error_bitmap))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -936,13 +1074,13 @@ skip:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (repaired) {</div><div class='ctx'> 			if (dev) {</div><div class='del'>-				btrfs_err_rl_in_rcu(fs_info,</div><div class='del'>-			"fixed up error at logical %llu on dev %s physical %llu",</div><div class='add'>+				btrfs_err_rl(fs_info,</div><div class='add'>+		"scrub: fixed up error at logical %llu on dev %s physical %llu",</div><div class='ctx'> 					    stripe-&gt;logical, btrfs_dev_name(dev),</div><div class='ctx'> 					    physical);</div><div class='ctx'> 			} else {</div><div class='del'>-				btrfs_err_rl_in_rcu(fs_info,</div><div class='del'>-			"fixed up error at logical %llu on mirror %u",</div><div class='add'>+				btrfs_err_rl(fs_info,</div><div class='add'>+			   "scrub: fixed up error at logical %llu on mirror %u",</div><div class='ctx'> 					    stripe-&gt;logical, stripe-&gt;mirror_num);</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -950,41 +1088,56 @@ skip:</div><div class='ctx'> </div><div class='ctx'> 		/* The remaining are all for unrepaired. */</div><div class='ctx'> 		if (dev) {</div><div class='del'>-			btrfs_err_rl_in_rcu(fs_info,</div><div class='del'>-	"unable to fixup (regular) error at logical %llu on dev %s physical %llu",</div><div class='add'>+			btrfs_err_rl(fs_info,</div><div class='add'>+"scrub: unable to fixup (regular) error at logical %llu on dev %s physical %llu",</div><div class='ctx'> 					    stripe-&gt;logical, btrfs_dev_name(dev),</div><div class='ctx'> 					    physical);</div><div class='ctx'> 		} else {</div><div class='del'>-			btrfs_err_rl_in_rcu(fs_info,</div><div class='del'>-	"unable to fixup (regular) error at logical %llu on mirror %u",</div><div class='add'>+			btrfs_err_rl(fs_info,</div><div class='add'>+	  "scrub: unable to fixup (regular) error at logical %llu on mirror %u",</div><div class='ctx'> 					    stripe-&gt;logical, stripe-&gt;mirror_num);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (test_bit(sector_nr, &amp;stripe-&gt;io_error_bitmap))</div><div class='add'>+		if (scrub_bitmap_test_bit_io_error(stripe, sector_nr))</div><div class='ctx'> 			if (__ratelimit(&amp;rs) &amp;&amp; dev)</div><div class='ctx'> 				scrub_print_common_warning("i/o error", dev, false,</div><div class='ctx'> 						     stripe-&gt;logical, physical);</div><div class='del'>-		if (test_bit(sector_nr, &amp;stripe-&gt;csum_error_bitmap))</div><div class='add'>+		if (scrub_bitmap_test_bit_csum_error(stripe, sector_nr))</div><div class='ctx'> 			if (__ratelimit(&amp;rs) &amp;&amp; dev)</div><div class='ctx'> 				scrub_print_common_warning("checksum error", dev, false,</div><div class='ctx'> 						     stripe-&gt;logical, physical);</div><div class='del'>-		if (test_bit(sector_nr, &amp;stripe-&gt;meta_error_bitmap))</div><div class='add'>+		if (scrub_bitmap_test_bit_meta_error(stripe, sector_nr))</div><div class='ctx'> 			if (__ratelimit(&amp;rs) &amp;&amp; dev)</div><div class='ctx'> 				scrub_print_common_warning("header error", dev, false,</div><div class='ctx'> 						     stripe-&gt;logical, physical);</div><div class='add'>+		if (scrub_bitmap_test_bit_meta_gen_error(stripe, sector_nr))</div><div class='add'>+			if (__ratelimit(&amp;rs) &amp;&amp; dev)</div><div class='add'>+				scrub_print_common_warning("generation error", dev, false,</div><div class='add'>+						     stripe-&gt;logical, physical);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Update the device stats. */</div><div class='add'>+	for (int i = 0; i &lt; errors-&gt;nr_io_errors; i++)</div><div class='add'>+		btrfs_dev_stat_inc_and_print(stripe-&gt;dev, BTRFS_DEV_STAT_READ_ERRS);</div><div class='add'>+	for (int i = 0; i &lt; errors-&gt;nr_csum_errors; i++)</div><div class='add'>+		btrfs_dev_stat_inc_and_print(stripe-&gt;dev, BTRFS_DEV_STAT_CORRUPTION_ERRS);</div><div class='add'>+	/* Generation mismatch error is based on each metadata, not each block. */</div><div class='add'>+	for (int i = 0; i &lt; errors-&gt;nr_meta_gen_errors;</div><div class='add'>+	     i += (fs_info-&gt;nodesize &gt;&gt; fs_info-&gt;sectorsize_bits))</div><div class='add'>+		btrfs_dev_stat_inc_and_print(stripe-&gt;dev, BTRFS_DEV_STAT_GENERATION_ERRS);</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;sctx-&gt;stat_lock);</div><div class='ctx'> 	sctx-&gt;stat.data_extents_scrubbed += stripe-&gt;nr_data_extents;</div><div class='ctx'> 	sctx-&gt;stat.tree_extents_scrubbed += stripe-&gt;nr_meta_extents;</div><div class='ctx'> 	sctx-&gt;stat.data_bytes_scrubbed += nr_data_sectors &lt;&lt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	sctx-&gt;stat.tree_bytes_scrubbed += nr_meta_sectors &lt;&lt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	sctx-&gt;stat.no_csum += nr_nodatacsum_sectors;</div><div class='del'>-	sctx-&gt;stat.read_errors += stripe-&gt;init_nr_io_errors;</div><div class='del'>-	sctx-&gt;stat.csum_errors += stripe-&gt;init_nr_csum_errors;</div><div class='del'>-	sctx-&gt;stat.verify_errors += stripe-&gt;init_nr_meta_errors;</div><div class='add'>+	sctx-&gt;stat.read_errors += errors-&gt;nr_io_errors;</div><div class='add'>+	sctx-&gt;stat.csum_errors += errors-&gt;nr_csum_errors;</div><div class='add'>+	sctx-&gt;stat.verify_errors += errors-&gt;nr_meta_errors +</div><div class='add'>+				    errors-&gt;nr_meta_gen_errors;</div><div class='ctx'> 	sctx-&gt;stat.uncorrectable_errors +=</div><div class='del'>-		bitmap_weight(&amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors);</div><div class='add'>+		bitmap_weight(&amp;error_bitmap, stripe-&gt;nr_sectors);</div><div class='ctx'> 	sctx-&gt;stat.corrected_errors += nr_repaired_sectors;</div><div class='ctx'> 	spin_unlock(&amp;sctx-&gt;stat_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1010,25 +1163,26 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work)</div><div class='ctx'> 	struct scrub_stripe *stripe = container_of(work, struct scrub_stripe, work);</div><div class='ctx'> 	struct scrub_ctx *sctx = stripe-&gt;sctx;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='add'>+	struct scrub_error_records errors = { 0 };</div><div class='ctx'> 	int num_copies = btrfs_num_copies(fs_info, stripe-&gt;bg-&gt;start,</div><div class='ctx'> 					  stripe-&gt;bg-&gt;length);</div><div class='add'>+	unsigned long repaired;</div><div class='add'>+	unsigned long error;</div><div class='ctx'> 	int mirror;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ASSERT(stripe-&gt;mirror_num &gt; 0);</div><div class='add'>+	ASSERT(stripe-&gt;mirror_num &gt;= 1, "stripe-&gt;mirror_num=%d", stripe-&gt;mirror_num);</div><div class='ctx'> </div><div class='ctx'> 	wait_scrub_stripe_io(stripe);</div><div class='del'>-	scrub_verify_one_stripe(stripe, stripe-&gt;extent_sector_bitmap);</div><div class='add'>+	scrub_verify_one_stripe(stripe, scrub_bitmap_read_has_extent(stripe));</div><div class='ctx'> 	/* Save the initial failed bitmap for later repair and report usage. */</div><div class='del'>-	stripe-&gt;init_error_bitmap = stripe-&gt;error_bitmap;</div><div class='del'>-	stripe-&gt;init_nr_io_errors = bitmap_weight(&amp;stripe-&gt;io_error_bitmap,</div><div class='del'>-						  stripe-&gt;nr_sectors);</div><div class='del'>-	stripe-&gt;init_nr_csum_errors = bitmap_weight(&amp;stripe-&gt;csum_error_bitmap,</div><div class='del'>-						    stripe-&gt;nr_sectors);</div><div class='del'>-	stripe-&gt;init_nr_meta_errors = bitmap_weight(&amp;stripe-&gt;meta_error_bitmap,</div><div class='del'>-						    stripe-&gt;nr_sectors);</div><div class='del'>-</div><div class='del'>-	if (bitmap_empty(&amp;stripe-&gt;init_error_bitmap, stripe-&gt;nr_sectors))</div><div class='add'>+	errors.init_error_bitmap = scrub_bitmap_read_error(stripe);</div><div class='add'>+	errors.nr_io_errors = scrub_bitmap_weight_io_error(stripe);</div><div class='add'>+	errors.nr_csum_errors = scrub_bitmap_weight_csum_error(stripe);</div><div class='add'>+	errors.nr_meta_errors = scrub_bitmap_weight_meta_error(stripe);</div><div class='add'>+	errors.nr_meta_gen_errors = scrub_bitmap_weight_meta_gen_error(stripe);</div><div class='add'>+</div><div class='add'>+	if (bitmap_empty(&amp;errors.init_error_bitmap, stripe-&gt;nr_sectors))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1040,13 +1194,13 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work)</div><div class='ctx'> 	for (mirror = calc_next_mirror(stripe-&gt;mirror_num, num_copies);</div><div class='ctx'> 	     mirror != stripe-&gt;mirror_num;</div><div class='ctx'> 	     mirror = calc_next_mirror(mirror, num_copies)) {</div><div class='del'>-		const unsigned long old_error_bitmap = stripe-&gt;error_bitmap;</div><div class='add'>+		const unsigned long old_error_bitmap = scrub_bitmap_read_error(stripe);</div><div class='ctx'> </div><div class='ctx'> 		scrub_stripe_submit_repair_read(stripe, mirror,</div><div class='ctx'> 						BTRFS_STRIPE_LEN, false);</div><div class='ctx'> 		wait_scrub_stripe_io(stripe);</div><div class='ctx'> 		scrub_verify_one_stripe(stripe, old_error_bitmap);</div><div class='del'>-		if (bitmap_empty(&amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors))</div><div class='add'>+		if (scrub_bitmap_empty_error(stripe))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1064,33 +1218,33 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work)</div><div class='ctx'> 	for (i = 0, mirror = stripe-&gt;mirror_num;</div><div class='ctx'> 	     i &lt; num_copies;</div><div class='ctx'> 	     i++, mirror = calc_next_mirror(mirror, num_copies)) {</div><div class='del'>-		const unsigned long old_error_bitmap = stripe-&gt;error_bitmap;</div><div class='add'>+		const unsigned long old_error_bitmap = scrub_bitmap_read_error(stripe);</div><div class='ctx'> </div><div class='ctx'> 		scrub_stripe_submit_repair_read(stripe, mirror,</div><div class='ctx'> 						fs_info-&gt;sectorsize, true);</div><div class='ctx'> 		wait_scrub_stripe_io(stripe);</div><div class='ctx'> 		scrub_verify_one_stripe(stripe, old_error_bitmap);</div><div class='del'>-		if (bitmap_empty(&amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors))</div><div class='add'>+		if (scrub_bitmap_empty_error(stripe))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	error = scrub_bitmap_read_error(stripe);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Submit the repaired sectors.  For zoned case, we cannot do repair</div><div class='ctx'> 	 * in-place, but queue the bg to be relocated.</div><div class='ctx'> 	 */</div><div class='del'>-	if (btrfs_is_zoned(fs_info)) {</div><div class='del'>-		if (!bitmap_empty(&amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors))</div><div class='add'>+	bitmap_andnot(&amp;repaired, &amp;errors.init_error_bitmap, &amp;error,</div><div class='add'>+		      stripe-&gt;nr_sectors);</div><div class='add'>+	if (!sctx-&gt;readonly &amp;&amp; !bitmap_empty(&amp;repaired, stripe-&gt;nr_sectors)) {</div><div class='add'>+		if (btrfs_is_zoned(fs_info)) {</div><div class='ctx'> 			btrfs_repair_one_zone(fs_info, sctx-&gt;stripes[0].bg-&gt;start);</div><div class='del'>-	} else if (!sctx-&gt;readonly) {</div><div class='del'>-		unsigned long repaired;</div><div class='del'>-</div><div class='del'>-		bitmap_andnot(&amp;repaired, &amp;stripe-&gt;init_error_bitmap,</div><div class='del'>-			      &amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors);</div><div class='del'>-		scrub_write_sectors(sctx, stripe, repaired, false);</div><div class='del'>-		wait_scrub_stripe_io(stripe);</div><div class='add'>+		} else {</div><div class='add'>+			scrub_write_sectors(sctx, stripe, repaired, false);</div><div class='add'>+			wait_scrub_stripe_io(stripe);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scrub_stripe_report_errors(sctx, stripe);</div><div class='add'>+	scrub_stripe_report_errors(sctx, stripe, &amp;errors);</div><div class='ctx'> 	set_bit(SCRUB_STRIPE_FLAG_REPAIR_DONE, &amp;stripe-&gt;state);</div><div class='ctx'> 	wake_up(&amp;stripe-&gt;repair_wait);</div><div class='ctx'> }</div><div class='hunk'>@@ -1098,12 +1252,22 @@ out:</div><div class='ctx'> static void scrub_read_endio(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	struct scrub_stripe *stripe = bbio-&gt;private;</div><div class='add'>+	struct bio_vec *bvec;</div><div class='add'>+	int sector_nr = calc_sector_number(stripe, bio_first_bvec_all(&amp;bbio-&gt;bio));</div><div class='add'>+	int num_sectors;</div><div class='add'>+	u32 bio_size = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ASSERT(sector_nr &lt; stripe-&gt;nr_sectors);</div><div class='add'>+	bio_for_each_bvec_all(bvec, &amp;bbio-&gt;bio, i)</div><div class='add'>+		bio_size += bvec-&gt;bv_len;</div><div class='add'>+	num_sectors = bio_size &gt;&gt; stripe-&gt;bg-&gt;fs_info-&gt;sectorsize_bits;</div><div class='ctx'> </div><div class='ctx'> 	if (bbio-&gt;bio.bi_status) {</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;io_error_bitmap, 0, stripe-&gt;nr_sectors);</div><div class='del'>-		bitmap_set(&amp;stripe-&gt;error_bitmap, 0, stripe-&gt;nr_sectors);</div><div class='add'>+		scrub_bitmap_set_io_error(stripe, sector_nr, num_sectors);</div><div class='add'>+		scrub_bitmap_set_error(stripe, sector_nr, num_sectors);</div><div class='ctx'> 	} else {</div><div class='del'>-		bitmap_clear(&amp;stripe-&gt;io_error_bitmap, 0, stripe-&gt;nr_sectors);</div><div class='add'>+		scrub_bitmap_clear_io_error(stripe, sector_nr, num_sectors);</div><div class='ctx'> 	}</div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;stripe-&gt;pending_io)) {</div><div class='hunk'>@@ -1132,6 +1296,9 @@ static void scrub_write_endio(struct btrfs_bio *bbio)</div><div class='ctx'> 		bitmap_set(&amp;stripe-&gt;write_error_bitmap, sector_nr,</div><div class='ctx'> 			   bio_size &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;stripe-&gt;write_error_lock, flags);</div><div class='add'>+		for (i = 0; i &lt; (bio_size &gt;&gt; fs_info-&gt;sectorsize_bits); i++)</div><div class='add'>+			btrfs_dev_stat_inc_and_print(stripe-&gt;dev,</div><div class='add'>+						     BTRFS_DEV_STAT_WRITE_ERRS);</div><div class='ctx'> 	}</div><div class='ctx'> 	bio_put(&amp;bbio-&gt;bio);</div><div class='ctx'> </div><div class='hunk'>@@ -1189,27 +1356,19 @@ static void scrub_write_sectors(struct scrub_ctx *sctx, struct scrub_stripe *str</div><div class='ctx'> 	int sector_nr;</div><div class='ctx'> </div><div class='ctx'> 	for_each_set_bit(sector_nr, &amp;write_bitmap, stripe-&gt;nr_sectors) {</div><div class='del'>-		struct page *page = scrub_stripe_get_page(stripe, sector_nr);</div><div class='del'>-		unsigned int pgoff = scrub_stripe_get_page_offset(stripe, sector_nr);</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='ctx'> 		/* We should only writeback sectors covered by an extent. */</div><div class='del'>-		ASSERT(test_bit(sector_nr, &amp;stripe-&gt;extent_sector_bitmap));</div><div class='add'>+		ASSERT(scrub_bitmap_test_bit_has_extent(stripe, sector_nr));</div><div class='ctx'> </div><div class='ctx'> 		/* Cannot merge with previous sector, submit the current one. */</div><div class='ctx'> 		if (bbio &amp;&amp; sector_nr &amp;&amp; !test_bit(sector_nr - 1, &amp;write_bitmap)) {</div><div class='ctx'> 			scrub_submit_write_bio(sctx, stripe, bbio, dev_replace);</div><div class='ctx'> 			bbio = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		if (!bbio) {</div><div class='del'>-			bbio = btrfs_bio_alloc(stripe-&gt;nr_sectors, REQ_OP_WRITE,</div><div class='del'>-					       fs_info, scrub_write_endio, stripe);</div><div class='del'>-			bbio-&gt;bio.bi_iter.bi_sector = (stripe-&gt;logical +</div><div class='del'>-				(sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits)) &gt;&gt;</div><div class='del'>-				SECTOR_SHIFT;</div><div class='del'>-		}</div><div class='del'>-		ret = bio_add_page(&amp;bbio-&gt;bio, page, fs_info-&gt;sectorsize, pgoff);</div><div class='del'>-		ASSERT(ret == fs_info-&gt;sectorsize);</div><div class='add'>+		if (!bbio)</div><div class='add'>+			bbio = alloc_scrub_bbio(fs_info, stripe-&gt;nr_sectors, REQ_OP_WRITE,</div><div class='add'>+					stripe-&gt;logical + (sector_nr &lt;&lt; fs_info-&gt;sectorsize_bits),</div><div class='add'>+					scrub_write_endio, stripe);</div><div class='add'>+		scrub_bio_add_sector(bbio, stripe, sector_nr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bbio)</div><div class='ctx'> 		scrub_submit_write_bio(sctx, stripe, bbio, dev_replace);</div><div class='hunk'>@@ -1236,8 +1395,7 @@ static void scrub_throttle_dev_io(struct scrub_ctx *sctx, struct btrfs_device *d</div><div class='ctx'> 	 * Slice is divided into intervals when the IO is submitted, adjust by</div><div class='ctx'> 	 * bwlimit and maximum of 64 intervals.</div><div class='ctx'> 	 */</div><div class='del'>-	div = max_t(u32, 1, (u32)(bwlimit / (16 * 1024 * 1024)));</div><div class='del'>-	div = min_t(u32, 64, div);</div><div class='add'>+	div = clamp(bwlimit / (16 * 1024 * 1024), 1, 64);</div><div class='ctx'> </div><div class='ctx'> 	/* Start new epoch, set deadline */</div><div class='ctx'> 	now = ktime_get();</div><div class='hunk'>@@ -1329,7 +1487,7 @@ static int compare_extent_item_range(struct btrfs_path *path,</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 	ASSERT(key.type == BTRFS_EXTENT_ITEM_KEY ||</div><div class='del'>-	       key.type == BTRFS_METADATA_ITEM_KEY);</div><div class='add'>+	       key.type == BTRFS_METADATA_ITEM_KEY, "key.type=%u", key.type);</div><div class='ctx'> 	if (key.type == BTRFS_METADATA_ITEM_KEY)</div><div class='ctx'> 		len = fs_info-&gt;nodesize;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1370,18 +1528,25 @@ static int find_first_extent_item(struct btrfs_root *extent_root,</div><div class='ctx'> 	if (path-&gt;nodes[0])</div><div class='ctx'> 		goto search_forward;</div><div class='ctx'> </div><div class='add'>+	key.objectid = search_start;</div><div class='ctx'> 	if (btrfs_fs_incompat(fs_info, SKINNY_METADATA))</div><div class='ctx'> 		key.type = BTRFS_METADATA_ITEM_KEY;</div><div class='ctx'> 	else</div><div class='ctx'> 		key.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='del'>-	key.objectid = search_start;</div><div class='ctx'> 	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, extent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Key with offset -1 found, there would have to exist an extent</div><div class='add'>+		 * item with such offset, but this is out of the valid range.</div><div class='add'>+		 */</div><div class='add'>+		btrfs_release_path(path);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(ret &gt; 0);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Here we intentionally pass 0 as @min_objectid, as there could be</div><div class='ctx'> 	 * an extent item starting before @search_start.</div><div class='hunk'>@@ -1427,7 +1592,7 @@ static void get_extent_info(struct btrfs_path *path, u64 *extent_start_ret,</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 	ASSERT(key.type == BTRFS_METADATA_ITEM_KEY ||</div><div class='del'>-	       key.type == BTRFS_EXTENT_ITEM_KEY);</div><div class='add'>+	       key.type == BTRFS_EXTENT_ITEM_KEY, "key.type=%u", key.type);</div><div class='ctx'> 	*extent_start_ret = key.objectid;</div><div class='ctx'> 	if (key.type == BTRFS_METADATA_ITEM_KEY)</div><div class='ctx'> 		*size_ret = path-&gt;nodes[0]-&gt;fs_info-&gt;nodesize;</div><div class='hunk'>@@ -1453,8 +1618,7 @@ static int sync_write_pointer_for_zoned(struct scrub_ctx *sctx, u64 logical,</div><div class='ctx'> 						    physical,</div><div class='ctx'> 						    sctx-&gt;write_pointer);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			btrfs_err(fs_info,</div><div class='del'>-				  "zoned: failed to recover write pointer");</div><div class='add'>+			btrfs_err(fs_info, "scrub: zoned: failed to recover write pointer");</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;sctx-&gt;wr_lock);</div><div class='ctx'> 	btrfs_dev_clear_zone_empty(sctx-&gt;wr_tgtdev, physical);</div><div class='hunk'>@@ -1476,9 +1640,9 @@ static void fill_one_extent_info(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		struct scrub_sector_verification *sector =</div><div class='ctx'> 						&amp;stripe-&gt;sectors[nr_sector];</div><div class='ctx'> </div><div class='del'>-		set_bit(nr_sector, &amp;stripe-&gt;extent_sector_bitmap);</div><div class='add'>+		scrub_bitmap_set_bit_has_extent(stripe, nr_sector);</div><div class='ctx'> 		if (extent_flags &amp; BTRFS_EXTENT_FLAG_TREE_BLOCK) {</div><div class='del'>-			sector-&gt;is_metadata = true;</div><div class='add'>+			scrub_bitmap_set_bit_is_metadata(stripe, nr_sector);</div><div class='ctx'> 			sector-&gt;generation = extent_gen;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1486,15 +1650,8 @@ static void fill_one_extent_info(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static void scrub_stripe_reset_bitmaps(struct scrub_stripe *stripe)</div><div class='ctx'> {</div><div class='del'>-	stripe-&gt;extent_sector_bitmap = 0;</div><div class='del'>-	stripe-&gt;init_error_bitmap = 0;</div><div class='del'>-	stripe-&gt;init_nr_io_errors = 0;</div><div class='del'>-	stripe-&gt;init_nr_csum_errors = 0;</div><div class='del'>-	stripe-&gt;init_nr_meta_errors = 0;</div><div class='del'>-	stripe-&gt;error_bitmap = 0;</div><div class='del'>-	stripe-&gt;io_error_bitmap = 0;</div><div class='del'>-	stripe-&gt;csum_error_bitmap = 0;</div><div class='del'>-	stripe-&gt;meta_error_bitmap = 0;</div><div class='add'>+	ASSERT(stripe-&gt;nr_sectors);</div><div class='add'>+	bitmap_zero(stripe-&gt;bitmaps, scrub_bitmap_nr_last * stripe-&gt;nr_sectors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1524,12 +1681,18 @@ static int scrub_find_fill_first_stripe(struct btrfs_block_group *bg,</div><div class='ctx'> 	u64 extent_gen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!extent_root || !csum_root)) {</div><div class='add'>+		btrfs_err(fs_info, "scrub: no valid extent or csum root found");</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='ctx'> 	memset(stripe-&gt;sectors, 0, sizeof(struct scrub_sector_verification) *</div><div class='ctx'> 				   stripe-&gt;nr_sectors);</div><div class='ctx'> 	scrub_stripe_reset_bitmaps(stripe);</div><div class='ctx'> </div><div class='ctx'> 	/* The range must be inside the bg. */</div><div class='del'>-	ASSERT(logical_start &gt;= bg-&gt;start &amp;&amp; logical_end &lt;= bg-&gt;start + bg-&gt;length);</div><div class='add'>+	ASSERT(logical_start &gt;= bg-&gt;start &amp;&amp; logical_end &lt;= bg-&gt;start + bg-&gt;length,</div><div class='add'>+	       "bg-&gt;start=%llu logical_start=%llu logical_end=%llu end=%llu",</div><div class='add'>+	       bg-&gt;start, logical_start, logical_end, bg-&gt;start + bg-&gt;length);</div><div class='ctx'> </div><div class='ctx'> 	ret = find_first_extent_item(extent_root, extent_path, logical_start,</div><div class='ctx'> 				     logical_len);</div><div class='hunk'>@@ -1625,35 +1788,43 @@ static void scrub_reset_stripe(struct scrub_stripe *stripe)</div><div class='ctx'> 	stripe-&gt;state = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (int i = 0; i &lt; stripe-&gt;nr_sectors; i++) {</div><div class='del'>-		stripe-&gt;sectors[i].is_metadata = false;</div><div class='ctx'> 		stripe-&gt;sectors[i].csum = NULL;</div><div class='ctx'> 		stripe-&gt;sectors[i].generation = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void scrub_submit_extent_sector_read(struct scrub_ctx *sctx,</div><div class='del'>-					    struct scrub_stripe *stripe)</div><div class='add'>+static u32 stripe_length(const struct scrub_stripe *stripe)</div><div class='add'>+{</div><div class='add'>+	ASSERT(stripe-&gt;bg);</div><div class='add'>+</div><div class='add'>+	return min(BTRFS_STRIPE_LEN,</div><div class='add'>+		   stripe-&gt;bg-&gt;start + stripe-&gt;bg-&gt;length - stripe-&gt;logical);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void scrub_submit_extent_sector_read(struct scrub_stripe *stripe)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_bio *bbio = NULL;</div><div class='add'>+	unsigned int nr_sectors = stripe_length(stripe) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	const unsigned long has_extent = scrub_bitmap_read_has_extent(stripe);</div><div class='ctx'> 	u64 stripe_len = BTRFS_STRIPE_LEN;</div><div class='ctx'> 	int mirror = stripe-&gt;mirror_num;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;stripe-&gt;pending_io);</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(i, &amp;stripe-&gt;extent_sector_bitmap, stripe-&gt;nr_sectors) {</div><div class='del'>-		struct page *page = scrub_stripe_get_page(stripe, i);</div><div class='del'>-		unsigned int pgoff = scrub_stripe_get_page_offset(stripe, i);</div><div class='add'>+	for_each_set_bit(i, &amp;has_extent, stripe-&gt;nr_sectors) {</div><div class='add'>+		/* We're beyond the chunk boundary, no need to read anymore. */</div><div class='add'>+		if (i &gt;= nr_sectors)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		/* The current sector cannot be merged, submit the bio. */</div><div class='ctx'> 		if (bbio &amp;&amp;</div><div class='del'>-		    ((i &gt; 0 &amp;&amp;</div><div class='del'>-		      !test_bit(i - 1, &amp;stripe-&gt;extent_sector_bitmap)) ||</div><div class='add'>+		    ((i &gt; 0 &amp;&amp; !test_bit(i - 1, &amp;has_extent)) ||</div><div class='ctx'> 		     bbio-&gt;bio.bi_iter.bi_size &gt;= stripe_len)) {</div><div class='ctx'> 			ASSERT(bbio-&gt;bio.bi_iter.bi_size);</div><div class='ctx'> 			atomic_inc(&amp;stripe-&gt;pending_io);</div><div class='del'>-			btrfs_submit_bio(bbio, mirror);</div><div class='add'>+			btrfs_submit_bbio(bbio, mirror);</div><div class='ctx'> 			bbio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1662,31 +1833,44 @@ static void scrub_submit_extent_sector_read(struct scrub_ctx *sctx,</div><div class='ctx'> 			struct btrfs_io_context *bioc = NULL;</div><div class='ctx'> 			const u64 logical = stripe-&gt;logical +</div><div class='ctx'> 					    (i &lt;&lt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			bbio = btrfs_bio_alloc(stripe-&gt;nr_sectors, REQ_OP_READ,</div><div class='del'>-					       fs_info, scrub_read_endio, stripe);</div><div class='del'>-			bbio-&gt;bio.bi_iter.bi_sector = logical &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+			int ret;</div><div class='ctx'> </div><div class='del'>-			io_stripe.is_scrub = true;</div><div class='del'>-			err = btrfs_map_block(fs_info, BTRFS_MAP_READ, logical,</div><div class='del'>-					      &amp;stripe_len, &amp;bioc, &amp;io_stripe,</div><div class='del'>-					      &amp;mirror);</div><div class='add'>+			io_stripe.rst_search_commit_root = true;</div><div class='add'>+			stripe_len = (nr_sectors - i) &lt;&lt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+			/*</div><div class='add'>+			 * For RST cases, we need to manually split the bbio to</div><div class='add'>+			 * follow the RST boundary.</div><div class='add'>+			 */</div><div class='add'>+			ret = btrfs_map_block(fs_info, BTRFS_MAP_READ, logical,</div><div class='add'>+					      &amp;stripe_len, &amp;bioc, &amp;io_stripe, &amp;mirror);</div><div class='ctx'> 			btrfs_put_bioc(bioc);</div><div class='del'>-			if (err) {</div><div class='del'>-				btrfs_bio_end_io(bbio,</div><div class='del'>-						 errno_to_blk_status(err));</div><div class='del'>-				return;</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				if (ret != -ENODATA) {</div><div class='add'>+					/*</div><div class='add'>+					 * Earlier btrfs_get_raid_extent_offset()</div><div class='add'>+					 * returned -ENODATA, which means there's</div><div class='add'>+					 * no entry for the corresponding range</div><div class='add'>+					 * in the stripe tree.  But if it's in</div><div class='add'>+					 * the extent tree, then it's a preallocated</div><div class='add'>+					 * extent and not an error.</div><div class='add'>+					 */</div><div class='add'>+					scrub_bitmap_set_bit_io_error(stripe, i);</div><div class='add'>+					scrub_bitmap_set_bit_error(stripe, i);</div><div class='add'>+				}</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			bbio = alloc_scrub_bbio(fs_info, stripe-&gt;nr_sectors, REQ_OP_READ,</div><div class='add'>+						logical, scrub_read_endio, stripe);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		__bio_add_page(&amp;bbio-&gt;bio, page, fs_info-&gt;sectorsize, pgoff);</div><div class='add'>+		scrub_bio_add_sector(bbio, stripe, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bbio) {</div><div class='ctx'> 		ASSERT(bbio-&gt;bio.bi_iter.bi_size);</div><div class='ctx'> 		atomic_inc(&amp;stripe-&gt;pending_io);</div><div class='del'>-		btrfs_submit_bio(bbio, mirror);</div><div class='add'>+		btrfs_submit_bbio(bbio, mirror);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_and_test(&amp;stripe-&gt;pending_io)) {</div><div class='hunk'>@@ -1701,6 +1885,8 @@ static void scrub_submit_initial_read(struct scrub_ctx *sctx,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_bio *bbio;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='add'>+	unsigned int nr_sectors = stripe_length(stripe) &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='ctx'> 	int mirror = stripe-&gt;mirror_num;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(stripe-&gt;bg);</div><div class='hunk'>@@ -1708,22 +1894,15 @@ static void scrub_submit_initial_read(struct scrub_ctx *sctx,</div><div class='ctx'> 	ASSERT(test_bit(SCRUB_STRIPE_FLAG_INITIALIZED, &amp;stripe-&gt;state));</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_need_stripe_tree_update(fs_info, stripe-&gt;bg-&gt;flags)) {</div><div class='del'>-		scrub_submit_extent_sector_read(sctx, stripe);</div><div class='add'>+		scrub_submit_extent_sector_read(stripe);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bbio = btrfs_bio_alloc(SCRUB_STRIPE_PAGES, REQ_OP_READ, fs_info,</div><div class='del'>-			       scrub_read_endio, stripe);</div><div class='del'>-</div><div class='del'>-	/* Read the whole stripe. */</div><div class='del'>-	bbio-&gt;bio.bi_iter.bi_sector = stripe-&gt;logical &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	for (int i = 0; i &lt; BTRFS_STRIPE_LEN &gt;&gt; PAGE_SHIFT; i++) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		ret = bio_add_page(&amp;bbio-&gt;bio, stripe-&gt;pages[i], PAGE_SIZE, 0);</div><div class='del'>-		/* We should have allocated enough bio vectors. */</div><div class='del'>-		ASSERT(ret == PAGE_SIZE);</div><div class='del'>-	}</div><div class='add'>+	bbio = alloc_scrub_bbio(fs_info, BTRFS_STRIPE_LEN &gt;&gt; min_folio_shift, REQ_OP_READ,</div><div class='add'>+				stripe-&gt;logical, scrub_read_endio, stripe);</div><div class='add'>+	/* Read the whole range inside the chunk boundary. */</div><div class='add'>+	for (unsigned int cur = 0; cur &lt; nr_sectors; cur++)</div><div class='add'>+		scrub_bio_add_sector(bbio, stripe, cur);</div><div class='ctx'> 	atomic_inc(&amp;stripe-&gt;pending_io);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1739,19 +1918,20 @@ static void scrub_submit_initial_read(struct scrub_ctx *sctx,</div><div class='ctx'> </div><div class='ctx'> 		mirror = calc_next_mirror(mirror, num_copies);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_submit_bio(bbio, mirror);</div><div class='add'>+	btrfs_submit_bbio(bbio, mirror);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool stripe_has_metadata_error(struct scrub_stripe *stripe)</div><div class='ctx'> {</div><div class='add'>+	const unsigned long error = scrub_bitmap_read_error(stripe);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(i, &amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors) {</div><div class='del'>-		if (stripe-&gt;sectors[i].is_metadata) {</div><div class='add'>+	for_each_set_bit(i, &amp;error, stripe-&gt;nr_sectors) {</div><div class='add'>+		if (scrub_bitmap_test_bit_is_metadata(stripe, i)) {</div><div class='ctx'> 			struct btrfs_fs_info *fs_info = stripe-&gt;bg-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='del'>-			"stripe %llu has unrepaired metadata sector at %llu",</div><div class='add'>+		    "scrub: stripe %llu has unrepaired metadata sector at logical %llu",</div><div class='ctx'> 				  stripe-&gt;logical,</div><div class='ctx'> 				  stripe-&gt;logical + (i &lt;&lt; fs_info-&gt;sectorsize_bits));</div><div class='ctx'> 			return true;</div><div class='hunk'>@@ -1815,20 +1995,23 @@ static int flush_scrub_stripes(struct scrub_ctx *sctx)</div><div class='ctx'> 		 * metadata, we should immediately abort.</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (int i = 0; i &lt; nr_stripes; i++) {</div><div class='del'>-			if (stripe_has_metadata_error(&amp;sctx-&gt;stripes[i])) {</div><div class='add'>+			if (unlikely(stripe_has_metadata_error(&amp;sctx-&gt;stripes[i]))) {</div><div class='ctx'> 				ret = -EIO;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		for (int i = 0; i &lt; nr_stripes; i++) {</div><div class='ctx'> 			unsigned long good;</div><div class='add'>+			unsigned long has_extent;</div><div class='add'>+			unsigned long error;</div><div class='ctx'> </div><div class='ctx'> 			stripe = &amp;sctx-&gt;stripes[i];</div><div class='ctx'> </div><div class='ctx'> 			ASSERT(stripe-&gt;dev == fs_info-&gt;dev_replace.srcdev);</div><div class='ctx'> </div><div class='del'>-			bitmap_andnot(&amp;good, &amp;stripe-&gt;extent_sector_bitmap,</div><div class='del'>-				      &amp;stripe-&gt;error_bitmap, stripe-&gt;nr_sectors);</div><div class='add'>+			has_extent = scrub_bitmap_read_has_extent(stripe);</div><div class='add'>+			error = scrub_bitmap_read_error(stripe);</div><div class='add'>+			bitmap_andnot(&amp;good, &amp;has_extent, &amp;error, stripe-&gt;nr_sectors);</div><div class='ctx'> 			scrub_write_sectors(sctx, stripe, good, true);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1838,6 +2021,9 @@ static int flush_scrub_stripes(struct scrub_ctx *sctx)</div><div class='ctx'> 		stripe = &amp;sctx-&gt;stripes[i];</div><div class='ctx'> </div><div class='ctx'> 		wait_scrub_stripe_io(stripe);</div><div class='add'>+		spin_lock(&amp;sctx-&gt;stat_lock);</div><div class='add'>+		sctx-&gt;stat.last_physical = stripe-&gt;physical + stripe_length(stripe);</div><div class='add'>+		spin_unlock(&amp;sctx-&gt;stat_lock);</div><div class='ctx'> 		scrub_reset_stripe(stripe);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -1891,37 +2077,135 @@ static int queue_scrub_stripe(struct scrub_ctx *sctx, struct btrfs_block_group *</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Return 0 if we should not cancel the scrub.</div><div class='add'>+ * Return &lt;0 if we need to cancel the scrub, returned value will</div><div class='add'>+ * indicate the reason:</div><div class='add'>+ * - -ECANCELED - Being explicitly canceled through ioctl.</div><div class='add'>+ * - -EINTR     - Being interrupted by signal or fs/process freezing.</div><div class='add'>+ */</div><div class='add'>+static int should_cancel_scrub(const struct scrub_ctx *sctx)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;fs_info-&gt;scrub_cancel_req) ||</div><div class='add'>+	    atomic_read(&amp;sctx-&gt;cancel_req))</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The user (e.g. fsfreeze command) or power management (PM)</div><div class='add'>+	 * suspend/hibernate can freeze the fs.  And PM suspend/hibernate will</div><div class='add'>+	 * also freeze all user processes.</div><div class='add'>+	 *</div><div class='add'>+	 * A user process can only be frozen when it is in user space, thus we</div><div class='add'>+	 * have to cancel the run so that the process can return to the user</div><div class='add'>+	 * space.</div><div class='add'>+	 *</div><div class='add'>+	 * Furthermore we have to check both filesystem and process freezing,</div><div class='add'>+	 * as PM can be configured to freeze the filesystems before processes.</div><div class='add'>+	 *</div><div class='add'>+	 * If we only check fs freezing, then suspend without fs freezing</div><div class='add'>+	 * will timeout, as the process is still in kernel space.</div><div class='add'>+	 *</div><div class='add'>+	 * If we only check process freezing, then suspend with fs freezing</div><div class='add'>+	 * will timeout, as the running scrub will prevent the fs from being frozen.</div><div class='add'>+	 */</div><div class='add'>+	if (fs_info-&gt;sb-&gt;s_writers.frozen &gt; SB_UNFROZEN ||</div><div class='add'>+	    freezing(current) || signal_pending(current))</div><div class='add'>+		return -EINTR;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scrub_raid56_cached_parity(struct scrub_ctx *sctx,</div><div class='add'>+				      struct btrfs_device *scrub_dev,</div><div class='add'>+				      struct btrfs_chunk_map *map,</div><div class='add'>+				      u64 full_stripe_start,</div><div class='add'>+				      unsigned long *extent_bitmap)</div><div class='add'>+{</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(io_done);</div><div class='add'>+	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc = NULL;</div><div class='add'>+	struct btrfs_raid_bio *rbio;</div><div class='add'>+	struct bio bio;</div><div class='add'>+	const int data_stripes = nr_data_stripes(map);</div><div class='add'>+	u64 length = btrfs_stripe_nr_to_offset(data_stripes);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bio_init(&amp;bio, NULL, NULL, 0, REQ_OP_READ);</div><div class='add'>+	bio.bi_iter.bi_sector = full_stripe_start &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+	bio.bi_private = &amp;io_done;</div><div class='add'>+	bio.bi_end_io = raid56_scrub_wait_endio;</div><div class='add'>+</div><div class='add'>+	btrfs_bio_counter_inc_blocked(fs_info);</div><div class='add'>+	ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, full_stripe_start,</div><div class='add'>+			      &amp;length, &amp;bioc, NULL, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	/* For RAID56 write there must be an @bioc allocated. */</div><div class='add'>+	ASSERT(bioc);</div><div class='add'>+	rbio = raid56_parity_alloc_scrub_rbio(&amp;bio, bioc, scrub_dev, extent_bitmap,</div><div class='add'>+				BTRFS_STRIPE_LEN &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	if (!rbio) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/* Use the recovered stripes as cache to avoid read them from disk again. */</div><div class='add'>+	for (int i = 0; i &lt; data_stripes; i++) {</div><div class='add'>+		struct scrub_stripe *stripe = &amp;sctx-&gt;raid56_data_stripes[i];</div><div class='add'>+</div><div class='add'>+		raid56_parity_cache_data_folios(rbio, stripe-&gt;folios,</div><div class='add'>+				full_stripe_start + (i &lt;&lt; BTRFS_STRIPE_LEN_SHIFT));</div><div class='add'>+	}</div><div class='add'>+	raid56_parity_submit_scrub_rbio(rbio);</div><div class='add'>+	wait_for_completion_io(&amp;io_done);</div><div class='add'>+	ret = blk_status_to_errno(bio.bi_status);</div><div class='add'>+out:</div><div class='add'>+	btrfs_bio_counter_dec(fs_info);</div><div class='add'>+	bio_uninit(&amp;bio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int scrub_raid56_parity_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 				      struct btrfs_device *scrub_dev,</div><div class='ctx'> 				      struct btrfs_block_group *bg,</div><div class='ctx'> 				      struct btrfs_chunk_map *map,</div><div class='ctx'> 				      u64 full_stripe_start)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_COMPLETION_ONSTACK(io_done);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='del'>-	struct btrfs_raid_bio *rbio;</div><div class='del'>-	struct btrfs_io_context *bioc = NULL;</div><div class='ctx'> 	struct btrfs_path extent_path = { 0 };</div><div class='ctx'> 	struct btrfs_path csum_path = { 0 };</div><div class='del'>-	struct bio *bio;</div><div class='ctx'> 	struct scrub_stripe *stripe;</div><div class='ctx'> 	bool all_empty = true;</div><div class='ctx'> 	const int data_stripes = nr_data_stripes(map);</div><div class='ctx'> 	unsigned long extent_bitmap = 0;</div><div class='del'>-	u64 length = btrfs_stripe_nr_to_offset(data_stripes);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(sctx-&gt;raid56_data_stripes);</div><div class='ctx'> </div><div class='add'>+	ret = should_cancel_scrub(sctx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;fs_info-&gt;scrub_pause_req))</div><div class='add'>+		scrub_blocked_if_needed(fs_info);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+	if (test_bit(BLOCK_GROUP_FLAG_REMOVED, &amp;bg-&gt;runtime_flags)) {</div><div class='add'>+		spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * For data stripe search, we cannot re-use the same extent/csum paths,</div><div class='add'>+	 * For data stripe search, we cannot reuse the same extent/csum paths,</div><div class='ctx'> 	 * as the data stripe bytenr may be smaller than previous extent.  Thus</div><div class='ctx'> 	 * we have to use our own extent/csum paths.</div><div class='ctx'> 	 */</div><div class='del'>-	extent_path.search_commit_root = 1;</div><div class='del'>-	extent_path.skip_locking = 1;</div><div class='del'>-	csum_path.search_commit_root = 1;</div><div class='del'>-	csum_path.skip_locking = 1;</div><div class='add'>+	extent_path.search_commit_root = true;</div><div class='add'>+	extent_path.skip_locking = true;</div><div class='add'>+	csum_path.search_commit_root = true;</div><div class='add'>+	csum_path.skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	for (int i = 0; i &lt; data_stripes; i++) {</div><div class='ctx'> 		int stripe_index;</div><div class='hunk'>@@ -1959,7 +2243,7 @@ static int scrub_raid56_parity_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 	/* Check if all data stripes are empty. */</div><div class='ctx'> 	for (int i = 0; i &lt; data_stripes; i++) {</div><div class='ctx'> 		stripe = &amp;sctx-&gt;raid56_data_stripes[i];</div><div class='del'>-		if (!bitmap_empty(&amp;stripe-&gt;extent_sector_bitmap, stripe-&gt;nr_sectors)) {</div><div class='add'>+		if (!scrub_bitmap_empty_has_extent(stripe)) {</div><div class='ctx'> 			all_empty = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1991,65 +2275,36 @@ static int scrub_raid56_parity_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (int i = 0; i &lt; data_stripes; i++) {</div><div class='ctx'> 		unsigned long error;</div><div class='add'>+		unsigned long has_extent;</div><div class='ctx'> </div><div class='ctx'> 		stripe = &amp;sctx-&gt;raid56_data_stripes[i];</div><div class='ctx'> </div><div class='add'>+		error = scrub_bitmap_read_error(stripe);</div><div class='add'>+		has_extent = scrub_bitmap_read_has_extent(stripe);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We should only check the errors where there is an extent.</div><div class='ctx'> 		 * As we may hit an empty data stripe while it's missing.</div><div class='ctx'> 		 */</div><div class='del'>-		bitmap_and(&amp;error, &amp;stripe-&gt;error_bitmap,</div><div class='del'>-			   &amp;stripe-&gt;extent_sector_bitmap, stripe-&gt;nr_sectors);</div><div class='del'>-		if (!bitmap_empty(&amp;error, stripe-&gt;nr_sectors)) {</div><div class='add'>+		bitmap_and(&amp;error, &amp;error, &amp;has_extent, stripe-&gt;nr_sectors);</div><div class='add'>+		if (unlikely(!bitmap_empty(&amp;error, stripe-&gt;nr_sectors))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='del'>-"unrepaired sectors detected, full stripe %llu data stripe %u errors %*pbl",</div><div class='add'>+"scrub: unrepaired sectors detected, full stripe %llu data stripe %u errors %*pbl",</div><div class='ctx'> 				  full_stripe_start, i, stripe-&gt;nr_sectors,</div><div class='ctx'> 				  &amp;error);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		bitmap_or(&amp;extent_bitmap, &amp;extent_bitmap,</div><div class='del'>-			  &amp;stripe-&gt;extent_sector_bitmap, stripe-&gt;nr_sectors);</div><div class='add'>+		bitmap_or(&amp;extent_bitmap, &amp;extent_bitmap, &amp;has_extent,</div><div class='add'>+			  stripe-&gt;nr_sectors);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can check and regenerate the P/Q stripe. */</div><div class='del'>-	bio = bio_alloc(NULL, 1, REQ_OP_READ, GFP_NOFS);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector = full_stripe_start &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	bio-&gt;bi_private = &amp;io_done;</div><div class='del'>-	bio-&gt;bi_end_io = raid56_scrub_wait_endio;</div><div class='del'>-</div><div class='del'>-	btrfs_bio_counter_inc_blocked(fs_info);</div><div class='del'>-	ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, full_stripe_start,</div><div class='del'>-			      &amp;length, &amp;bioc, NULL, NULL);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		btrfs_put_bioc(bioc);</div><div class='del'>-		btrfs_bio_counter_dec(fs_info);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	rbio = raid56_parity_alloc_scrub_rbio(bio, bioc, scrub_dev, &amp;extent_bitmap,</div><div class='del'>-				BTRFS_STRIPE_LEN &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	btrfs_put_bioc(bioc);</div><div class='del'>-	if (!rbio) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		btrfs_bio_counter_dec(fs_info);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/* Use the recovered stripes as cache to avoid read them from disk again. */</div><div class='del'>-	for (int i = 0; i &lt; data_stripes; i++) {</div><div class='del'>-		stripe = &amp;sctx-&gt;raid56_data_stripes[i];</div><div class='del'>-</div><div class='del'>-		raid56_parity_cache_data_pages(rbio, stripe-&gt;pages,</div><div class='del'>-				full_stripe_start + (i &lt;&lt; BTRFS_STRIPE_LEN_SHIFT));</div><div class='del'>-	}</div><div class='del'>-	raid56_parity_submit_scrub_rbio(rbio);</div><div class='del'>-	wait_for_completion_io(&amp;io_done);</div><div class='del'>-	ret = blk_status_to_errno(bio-&gt;bi_status);</div><div class='del'>-	bio_put(bio);</div><div class='del'>-	btrfs_bio_counter_dec(fs_info);</div><div class='del'>-</div><div class='add'>+	ret = scrub_raid56_cached_parity(sctx, scrub_dev, map, full_stripe_start,</div><div class='add'>+					 &amp;extent_bitmap);</div><div class='add'>+out:</div><div class='ctx'> 	btrfs_release_path(&amp;extent_path);</div><div class='ctx'> 	btrfs_release_path(&amp;csum_path);</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2063,7 +2318,6 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int scrub_simple_mirror(struct scrub_ctx *sctx,</div><div class='ctx'> 			       struct btrfs_block_group *bg,</div><div class='del'>-			       struct btrfs_chunk_map *map,</div><div class='ctx'> 			       u64 logical_start, u64 logical_length,</div><div class='ctx'> 			       struct btrfs_device *device,</div><div class='ctx'> 			       u64 physical, int mirror_num)</div><div class='hunk'>@@ -2071,7 +2325,7 @@ static int scrub_simple_mirror(struct scrub_ctx *sctx,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='ctx'> 	const u64 logical_end = logical_start + logical_length;</div><div class='ctx'> 	u64 cur_logical = logical_start;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* The range must be inside the bg */</div><div class='ctx'> 	ASSERT(logical_start &gt;= bg-&gt;start &amp;&amp; logical_end &lt;= bg-&gt;start + bg-&gt;length);</div><div class='hunk'>@@ -2081,18 +2335,13 @@ static int scrub_simple_mirror(struct scrub_ctx *sctx,</div><div class='ctx'> 		u64 found_logical = U64_MAX;</div><div class='ctx'> 		u64 cur_physical = physical + cur_logical - logical_start;</div><div class='ctx'> </div><div class='del'>-		/* Canceled? */</div><div class='del'>-		if (atomic_read(&amp;fs_info-&gt;scrub_cancel_req) ||</div><div class='del'>-		    atomic_read(&amp;sctx-&gt;cancel_req)) {</div><div class='del'>-			ret = -ECANCELED;</div><div class='add'>+		ret = should_cancel_scrub(sctx);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-		/* Paused? */</div><div class='del'>-		if (atomic_read(&amp;fs_info-&gt;scrub_pause_req)) {</div><div class='del'>-			/* Push queued extents */</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;fs_info-&gt;scrub_pause_req))</div><div class='ctx'> 			scrub_blocked_if_needed(fs_info);</div><div class='del'>-		}</div><div class='del'>-		/* Block group removed? */</div><div class='add'>+</div><div class='ctx'> 		spin_lock(&amp;bg-&gt;lock);</div><div class='ctx'> 		if (test_bit(BLOCK_GROUP_FLAG_REMOVED, &amp;bg-&gt;runtime_flags)) {</div><div class='ctx'> 			spin_unlock(&amp;bg-&gt;lock);</div><div class='hunk'>@@ -2106,7 +2355,9 @@ static int scrub_simple_mirror(struct scrub_ctx *sctx,</div><div class='ctx'> 					 cur_physical, &amp;found_logical);</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			/* No more extent, just update the accounting */</div><div class='add'>+			spin_lock(&amp;sctx-&gt;stat_lock);</div><div class='ctx'> 			sctx-&gt;stat.last_physical = physical + logical_length;</div><div class='add'>+			spin_unlock(&amp;sctx-&gt;stat_lock);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2180,7 +2431,7 @@ static int scrub_simple_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 		 * just RAID1, so we can reuse scrub_simple_mirror() to scrub</div><div class='ctx'> 		 * this stripe.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = scrub_simple_mirror(sctx, bg, map, cur_logical,</div><div class='add'>+		ret = scrub_simple_mirror(sctx, bg, cur_logical,</div><div class='ctx'> 					  BTRFS_STRIPE_LEN, device, cur_physical,</div><div class='ctx'> 					  mirror_num);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -2214,7 +2465,6 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 	/* Offset inside the chunk */</div><div class='ctx'> 	u64 offset;</div><div class='ctx'> 	u64 stripe_logical;</div><div class='del'>-	int stop_loop = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Extent_path should be released by now. */</div><div class='ctx'> 	ASSERT(sctx-&gt;extent_path.nodes[0] == NULL);</div><div class='hunk'>@@ -2265,7 +2515,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 		 * Only @physical and @mirror_num needs to calculated using</div><div class='ctx'> 		 * @stripe_index.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = scrub_simple_mirror(sctx, bg, map, bg-&gt;start, bg-&gt;length,</div><div class='add'>+		ret = scrub_simple_mirror(sctx, bg, bg-&gt;start, bg-&gt;length,</div><div class='ctx'> 				scrub_dev, map-&gt;stripes[stripe_index].physical,</div><div class='ctx'> 				stripe_index + 1);</div><div class='ctx'> 		offset = 0;</div><div class='hunk'>@@ -2303,6 +2553,10 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 			stripe_logical += chunk_logical;</div><div class='ctx'> 			ret = scrub_raid56_parity_stripe(sctx, scrub_dev, bg,</div><div class='ctx'> 							 map, stripe_logical);</div><div class='add'>+			spin_lock(&amp;sctx-&gt;stat_lock);</div><div class='add'>+			sctx-&gt;stat.last_physical = min(physical + BTRFS_STRIPE_LEN,</div><div class='add'>+						       physical_end);</div><div class='add'>+			spin_unlock(&amp;sctx-&gt;stat_lock);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			goto next;</div><div class='hunk'>@@ -2316,7 +2570,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,</div><div class='ctx'> 		 * We can reuse scrub_simple_mirror() here, as the repair part</div><div class='ctx'> 		 * is still based on @mirror_num.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = scrub_simple_mirror(sctx, bg, map, logical, BTRFS_STRIPE_LEN,</div><div class='add'>+		ret = scrub_simple_mirror(sctx, bg, logical, BTRFS_STRIPE_LEN,</div><div class='ctx'> 					  scrub_dev, physical, 1);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2324,14 +2578,8 @@ next:</div><div class='ctx'> 		logical += increment;</div><div class='ctx'> 		physical += BTRFS_STRIPE_LEN;</div><div class='ctx'> 		spin_lock(&amp;sctx-&gt;stat_lock);</div><div class='del'>-		if (stop_loop)</div><div class='del'>-			sctx-&gt;stat.last_physical =</div><div class='del'>-				map-&gt;stripes[stripe_index].physical + dev_stripe_len;</div><div class='del'>-		else</div><div class='del'>-			sctx-&gt;stat.last_physical = physical;</div><div class='add'>+		sctx-&gt;stat.last_physical = physical;</div><div class='ctx'> 		spin_unlock(&amp;sctx-&gt;stat_lock);</div><div class='del'>-		if (stop_loop)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	ret2 = flush_scrub_stripes(sctx);</div><div class='hunk'>@@ -2348,8 +2596,6 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sctx-&gt;is_dev_replace &amp;&amp; ret &gt;= 0) {</div><div class='del'>-		int ret2;</div><div class='del'>-</div><div class='ctx'> 		ret2 = sync_write_pointer_for_zoned(sctx,</div><div class='ctx'> 				chunk_logical + offset,</div><div class='ctx'> 				map-&gt;stripes[stripe_index].physical,</div><div class='hunk'>@@ -2408,19 +2654,15 @@ static int finish_extent_writes_for_zoned(struct btrfs_root *root,</div><div class='ctx'> 					  struct btrfs_block_group *cache)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = cache-&gt;fs_info;</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_wait_block_group_reservations(cache);</div><div class='ctx'> 	btrfs_wait_nocow_writers(cache);</div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX, cache-&gt;start, cache-&gt;length);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, cache);</div><div class='ctx'> </div><div class='del'>-	trans = btrfs_join_transaction(root);</div><div class='del'>-	if (IS_ERR(trans))</div><div class='del'>-		return PTR_ERR(trans);</div><div class='del'>-	return btrfs_commit_transaction(trans);</div><div class='add'>+	return btrfs_commit_current_transaction(root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack</div><div class='hunk'>@@ -2428,7 +2670,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,</div><div class='ctx'> 			   struct btrfs_device *scrub_dev, u64 start, u64 end)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dev_extent *dev_extent = NULL;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;dev_root;</div><div class='ctx'> 	u64 chunk_offset;</div><div class='hunk'>@@ -2446,12 +2688,12 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = scrub_dev-&gt;devid;</div><div class='del'>-	key.offset = 0ull;</div><div class='ctx'> 	key.type = BTRFS_DEV_EXTENT_KEY;</div><div class='add'>+	key.offset = 0ull;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		u64 dev_extent_len;</div><div class='hunk'>@@ -2630,14 +2872,14 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,</div><div class='ctx'> 			ro_set = 0;</div><div class='ctx'> 		} else if (ret == -ETXTBSY) {</div><div class='ctx'> 			btrfs_warn(fs_info,</div><div class='del'>-		   "skipping scrub of block group %llu due to active swapfile",</div><div class='add'>+	     "scrub: skipping scrub of block group %llu due to active swapfile",</div><div class='ctx'> 				   cache-&gt;start);</div><div class='ctx'> 			scrub_pause_off(fs_info);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto skip_unfreeze;</div><div class='ctx'> 		} else {</div><div class='del'>-			btrfs_warn(fs_info,</div><div class='del'>-				   "failed setting block group ro: %d", ret);</div><div class='add'>+			btrfs_warn(fs_info, "scrub: failed setting block group ro: %d",</div><div class='add'>+				   ret);</div><div class='ctx'> 			btrfs_unfreeze_block_group(cache);</div><div class='ctx'> 			btrfs_put_block_group(cache);</div><div class='ctx'> 			scrub_pause_off(fs_info);</div><div class='hunk'>@@ -2651,8 +2893,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (sctx-&gt;is_dev_replace) {</div><div class='ctx'> 			btrfs_wait_nocow_writers(cache);</div><div class='del'>-			btrfs_wait_ordered_roots(fs_info, U64_MAX, cache-&gt;start,</div><div class='del'>-					cache-&gt;length);</div><div class='add'>+			btrfs_wait_ordered_roots(fs_info, U64_MAX, cache);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		scrub_pause_off(fs_info);</div><div class='hunk'>@@ -2701,8 +2942,8 @@ skip_unfreeze:</div><div class='ctx'> 		btrfs_put_block_group(cache);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='del'>-		if (sctx-&gt;is_dev_replace &amp;&amp;</div><div class='del'>-		    atomic64_read(&amp;dev_replace-&gt;num_write_errors) &gt; 0) {</div><div class='add'>+		if (unlikely(sctx-&gt;is_dev_replace &amp;&amp;</div><div class='add'>+			     atomic64_read(&amp;dev_replace-&gt;num_write_errors) &gt; 0)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2715,8 +2956,6 @@ skip:</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2724,29 +2963,23 @@ static int scrub_one_super(struct scrub_ctx *sctx, struct btrfs_device *dev,</div><div class='ctx'> 			   struct page *page, u64 physical, u64 generation)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;fs_info;</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	struct bio bio;</div><div class='ctx'> 	struct btrfs_super_block *sb = page_address(page);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	bio_init(&amp;bio, dev-&gt;bdev, &amp;bvec, 1, REQ_OP_READ);</div><div class='del'>-	bio.bi_iter.bi_sector = physical &gt;&gt; SECTOR_SHIFT;</div><div class='del'>-	__bio_add_page(&amp;bio, page, BTRFS_SUPER_INFO_SIZE, 0);</div><div class='del'>-	ret = submit_bio_wait(&amp;bio);</div><div class='del'>-	bio_uninit(&amp;bio);</div><div class='del'>-</div><div class='add'>+	ret = bdev_rw_virt(dev-&gt;bdev, physical &gt;&gt; SECTOR_SHIFT, sb,</div><div class='add'>+			BTRFS_SUPER_INFO_SIZE, REQ_OP_READ);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = btrfs_check_super_csum(fs_info, sb);</div><div class='del'>-	if (ret != 0) {</div><div class='add'>+	if (unlikely(ret != 0)) {</div><div class='ctx'> 		btrfs_err_rl(fs_info,</div><div class='del'>-			"super block at physical %llu devid %llu has bad csum",</div><div class='add'>+		  "scrub: super block at physical %llu devid %llu has bad csum",</div><div class='ctx'> 			physical, dev-&gt;devid);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (btrfs_super_generation(sb) != generation) {</div><div class='add'>+	if (unlikely(btrfs_super_generation(sb) != generation)) {</div><div class='ctx'> 		btrfs_err_rl(fs_info,</div><div class='del'>-"super block at physical %llu devid %llu has bad generation %llu expect %llu",</div><div class='add'>+"scrub: super block at physical %llu devid %llu has bad generation %llu expect %llu",</div><div class='ctx'> 			     physical, dev-&gt;devid,</div><div class='ctx'> 			     btrfs_super_generation(sb), generation);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='hunk'>@@ -2783,7 +3016,17 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx,</div><div class='ctx'> 		gen = btrfs_get_last_trans_committed(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BTRFS_SUPER_MIRROR_MAX; i++) {</div><div class='del'>-		bytenr = btrfs_sb_offset(i);</div><div class='add'>+		ret = btrfs_sb_log_location(scrub_dev, i, 0, &amp;bytenr);</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			spin_lock(&amp;sctx-&gt;stat_lock);</div><div class='add'>+			sctx-&gt;stat.super_errors++;</div><div class='add'>+			spin_unlock(&amp;sctx-&gt;stat_lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (bytenr + BTRFS_SUPER_INFO_SIZE &gt;</div><div class='ctx'> 		    scrub_dev-&gt;commit_total_bytes)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2852,7 +3095,7 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,</div><div class='ctx'> 		    u64 end, struct btrfs_scrub_progress *progress,</div><div class='del'>-		    int readonly, int is_dev_replace)</div><div class='add'>+		    bool readonly, bool is_dev_replace)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dev_lookup_args args = { .devid = devid };</div><div class='ctx'> 	struct scrub_ctx *sctx;</div><div class='hunk'>@@ -2861,6 +3104,10 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,</div><div class='ctx'> 	unsigned int nofs_flag;</div><div class='ctx'> 	bool need_commit = false;</div><div class='ctx'> </div><div class='add'>+	/* Set the basic fallback @last_physical before we got a sctx. */</div><div class='add'>+	if (progress)</div><div class='add'>+		progress-&gt;last_physical = start;</div><div class='add'>+</div><div class='ctx'> 	if (btrfs_fs_closing(fs_info))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='hunk'>@@ -2879,6 +3126,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,</div><div class='ctx'> 	sctx = scrub_setup_ctx(fs_info, is_dev_replace);</div><div class='ctx'> 	if (IS_ERR(sctx))</div><div class='ctx'> 		return PTR_ERR(sctx);</div><div class='add'>+	sctx-&gt;stat.last_physical = start;</div><div class='ctx'> </div><div class='ctx'> 	ret = scrub_workers_get(fs_info);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2896,16 +3144,16 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,</div><div class='ctx'> 	if (!is_dev_replace &amp;&amp; !readonly &amp;&amp;</div><div class='ctx'> 	    !test_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;dev-&gt;dev_state)) {</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='del'>-		btrfs_err_in_rcu(fs_info,</div><div class='del'>-			"scrub on devid %llu: filesystem on %s is not writable",</div><div class='add'>+		btrfs_err(fs_info,</div><div class='add'>+			"scrub: devid %llu: filesystem on %s is not writable",</div><div class='ctx'> 				 devid, btrfs_dev_name(dev));</div><div class='ctx'> 		ret = -EROFS;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;scrub_lock);</div><div class='del'>-	if (!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &amp;dev-&gt;dev_state) ||</div><div class='del'>-	    test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &amp;dev-&gt;dev_state)) {</div><div class='add'>+	if (unlikely(!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &amp;dev-&gt;dev_state) ||</div><div class='add'>+		     test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &amp;dev-&gt;dev_state))) {</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;scrub_lock);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> 		ret = -EIO;</div><div class='head'>diff --git a/fs/btrfs/scrub.h b/fs/btrfs/scrub.h<br/>index 7639103ebf9d..aa68b6ebaf55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/scrub.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/scrub.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/scrub.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/scrub.h</a></div><div class='hunk'>@@ -3,9 +3,15 @@</div><div class='ctx'> #ifndef BTRFS_SCRUB_H</div><div class='ctx'> #define BTRFS_SCRUB_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_device;</div><div class='add'>+struct btrfs_scrub_progress;</div><div class='add'>+</div><div class='ctx'> int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,</div><div class='ctx'> 		    u64 end, struct btrfs_scrub_progress *progress,</div><div class='del'>-		    int readonly, int is_dev_replace);</div><div class='add'>+		    bool readonly, bool is_dev_replace);</div><div class='ctx'> void btrfs_scrub_pause(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_scrub_continue(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_scrub_cancel(struct btrfs_fs_info *info);</div><div class='head'>diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c<br/>index 4e36550618e5..2522faa97478 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/send.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/send.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/send.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/send.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bsearch.h&gt;</div><div class='add'>+#include &lt;linux/falloc.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='hunk'>@@ -16,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/crc32c.h&gt;</div><div class='ctx'> #include &lt;linux/fsverity.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "send.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "backref.h"</div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "compression.h"</div><div class='del'>-#include "xattr.h"</div><div class='ctx'> #include "print-tree.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "dir-item.h"</div><div class='hunk'>@@ -48,28 +47,30 @@</div><div class='ctx'>  * It allows fast adding of path elements on the right side (normal path) and</div><div class='ctx'>  * fast adding to the left side (reversed path). A reversed path can also be</div><div class='ctx'>  * unreversed if needed.</div><div class='add'>+ *</div><div class='add'>+ * The definition of struct fs_path relies on -fms-extensions to allow</div><div class='add'>+ * including a tagged struct as an anonymous member.</div><div class='ctx'>  */</div><div class='add'>+struct __fs_path {</div><div class='add'>+	char *start;</div><div class='add'>+	char *end;</div><div class='add'>+</div><div class='add'>+	char *buf;</div><div class='add'>+	unsigned short buf_len:15;</div><div class='add'>+	unsigned short reversed:1;</div><div class='add'>+};</div><div class='add'>+static_assert(sizeof(struct __fs_path) &lt; 256);</div><div class='ctx'> struct fs_path {</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			char *start;</div><div class='del'>-			char *end;</div><div class='del'>-</div><div class='del'>-			char *buf;</div><div class='del'>-			unsigned short buf_len:15;</div><div class='del'>-			unsigned short reversed:1;</div><div class='del'>-			char inline_buf[];</div><div class='del'>-		};</div><div class='del'>-		/*</div><div class='del'>-		 * Average path length does not exceed 200 bytes, we'll have</div><div class='del'>-		 * better packing in the slab and higher chance to satisfy</div><div class='del'>-		 * a allocation later during send.</div><div class='del'>-		 */</div><div class='del'>-		char pad[256];</div><div class='del'>-	};</div><div class='add'>+	struct __fs_path;</div><div class='add'>+	/*</div><div class='add'>+	 * Average path length does not exceed 200 bytes, we'll have</div><div class='add'>+	 * better packing in the slab and higher chance to satisfy</div><div class='add'>+	 * an allocation later during send.</div><div class='add'>+	 */</div><div class='add'>+	char inline_buf[256 - sizeof(struct __fs_path)];</div><div class='ctx'> };</div><div class='ctx'> #define FS_PATH_INLINE_SIZE \</div><div class='del'>-	(sizeof(struct fs_path) - offsetof(struct fs_path, inline_buf))</div><div class='add'>+	sizeof_field(struct fs_path, inline_buf)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* reused for each extent */</div><div class='hunk'>@@ -305,6 +306,8 @@ struct send_ctx {</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_lru_cache dir_created_cache;</div><div class='ctx'> 	struct btrfs_lru_cache dir_utimes_cache;</div><div class='add'>+</div><div class='add'>+	struct fs_path cur_inode_path;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pending_dir_move {</div><div class='hunk'>@@ -347,8 +350,10 @@ struct name_cache_entry {</div><div class='ctx'> 	u64 parent_gen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int need_later_update;</div><div class='add'>+	/* Name length without NUL terminator. */</div><div class='ctx'> 	int name_len;</div><div class='del'>-	char name[];</div><div class='add'>+	/* Not NUL terminated. */</div><div class='add'>+	char name[] __counted_by(name_len) __nonstring;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* See the comment at lru_cache.h about struct btrfs_lru_cache_entry. */</div><div class='hunk'>@@ -382,20 +387,19 @@ static void inconsistent_snapshot_error(struct send_ctx *sctx,</div><div class='ctx'> 		result_string = "updated";</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_COMPARE_TREE_SAME:</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN("no change between trees");</div><div class='ctx'> 		result_string = "unchanged";</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN("unexpected comparison result %d", result);</div><div class='ctx'> 		result_string = "unexpected";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_err(sctx-&gt;send_root-&gt;fs_info,</div><div class='ctx'> 		  "Send: inconsistent snapshot, found %s %s for inode %llu without updated inode item, send root is %llu, parent root is %llu",</div><div class='ctx'> 		  result_string, what, sctx-&gt;cmp_key-&gt;objectid,</div><div class='del'>-		  sctx-&gt;send_root-&gt;root_key.objectid,</div><div class='del'>-		  (sctx-&gt;parent_root ?</div><div class='del'>-		   sctx-&gt;parent_root-&gt;root_key.objectid : 0));</div><div class='add'>+		  btrfs_root_id(sctx-&gt;send_root),</div><div class='add'>+		  (sctx-&gt;parent_root ?  btrfs_root_id(sctx-&gt;parent_root) : 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __maybe_unused</div><div class='hunk'>@@ -425,15 +429,21 @@ static int need_send_hole(struct send_ctx *sctx)</div><div class='ctx'> </div><div class='ctx'> static void fs_path_reset(struct fs_path *p)</div><div class='ctx'> {</div><div class='del'>-	if (p-&gt;reversed) {</div><div class='add'>+	if (p-&gt;reversed)</div><div class='ctx'> 		p-&gt;start = p-&gt;buf + p-&gt;buf_len - 1;</div><div class='del'>-		p-&gt;end = p-&gt;start;</div><div class='del'>-		*p-&gt;start = 0;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		p-&gt;start = p-&gt;buf;</div><div class='del'>-		p-&gt;end = p-&gt;start;</div><div class='del'>-		*p-&gt;start = 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	p-&gt;end = p-&gt;start;</div><div class='add'>+	*p-&gt;start = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_path(struct fs_path *p)</div><div class='add'>+{</div><div class='add'>+	p-&gt;reversed = 0;</div><div class='add'>+	p-&gt;buf = p-&gt;inline_buf;</div><div class='add'>+	p-&gt;buf_len = FS_PATH_INLINE_SIZE;</div><div class='add'>+	fs_path_reset(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fs_path *fs_path_alloc(void)</div><div class='hunk'>@@ -443,10 +453,7 @@ static struct fs_path *fs_path_alloc(void)</div><div class='ctx'> 	p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	p-&gt;reversed = 0;</div><div class='del'>-	p-&gt;buf = p-&gt;inline_buf;</div><div class='del'>-	p-&gt;buf_len = FS_PATH_INLINE_SIZE;</div><div class='del'>-	fs_path_reset(p);</div><div class='add'>+	init_path(p);</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -471,7 +478,7 @@ static void fs_path_free(struct fs_path *p)</div><div class='ctx'> 	kfree(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fs_path_len(struct fs_path *p)</div><div class='add'>+static inline int fs_path_len(const struct fs_path *p)</div><div class='ctx'> {</div><div class='ctx'> 	return p-&gt;end - p-&gt;start;</div><div class='ctx'> }</div><div class='hunk'>@@ -487,12 +494,10 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)</div><div class='ctx'> 	if (p-&gt;buf_len &gt;= len)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (len &gt; PATH_MAX) {</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON(len &gt; PATH_MAX))</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='del'>-	path_len = p-&gt;end - p-&gt;start;</div><div class='add'>+	path_len = fs_path_len(p);</div><div class='ctx'> 	old_buf_len = p-&gt;buf_len;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -533,12 +538,12 @@ static int fs_path_prepare_for_add(struct fs_path *p, int name_len,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int new_len;</div><div class='ctx'> </div><div class='del'>-	new_len = p-&gt;end - p-&gt;start + name_len;</div><div class='add'>+	new_len = fs_path_len(p) + name_len;</div><div class='ctx'> 	if (p-&gt;start != p-&gt;end)</div><div class='ctx'> 		new_len++;</div><div class='ctx'> 	ret = fs_path_ensure_buf(p, new_len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;reversed) {</div><div class='ctx'> 		if (p-&gt;start != p-&gt;end)</div><div class='hunk'>@@ -553,8 +558,7 @@ static int fs_path_prepare_for_add(struct fs_path *p, int name_len,</div><div class='ctx'> 		*p-&gt;end = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fs_path_add(struct fs_path *p, const char *name, int name_len)</div><div class='hunk'>@@ -564,25 +568,15 @@ static int fs_path_add(struct fs_path *p, const char *name, int name_len)</div><div class='ctx'> </div><div class='ctx'> 	ret = fs_path_prepare_for_add(p, name_len, &amp;prepared);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	memcpy(prepared, name, name_len);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fs_path_add_path(struct fs_path *p, struct fs_path *p2)</div><div class='add'>+static inline int fs_path_add_path(struct fs_path *p, const struct fs_path *p2)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	char *prepared;</div><div class='del'>-</div><div class='del'>-	ret = fs_path_prepare_for_add(p, p2-&gt;end - p2-&gt;start, &amp;prepared);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	memcpy(prepared, p2-&gt;start, p2-&gt;end - p2-&gt;start);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return fs_path_add(p, p2-&gt;start, fs_path_len(p2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fs_path_add_from_extent_buffer(struct fs_path *p,</div><div class='hunk'>@@ -594,12 +588,11 @@ static int fs_path_add_from_extent_buffer(struct fs_path *p,</div><div class='ctx'> </div><div class='ctx'> 	ret = fs_path_prepare_for_add(p, len, &amp;prepared);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	read_extent_buffer(eb, prepared, off, len);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fs_path_copy(struct fs_path *p, struct fs_path *from)</div><div class='hunk'>@@ -619,13 +612,21 @@ static void fs_path_unreverse(struct fs_path *p)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tmp = p-&gt;start;</div><div class='del'>-	len = p-&gt;end - p-&gt;start;</div><div class='add'>+	len = fs_path_len(p);</div><div class='ctx'> 	p-&gt;start = p-&gt;buf;</div><div class='ctx'> 	p-&gt;end = p-&gt;start + len;</div><div class='ctx'> 	memmove(p-&gt;start, tmp, len + 1);</div><div class='ctx'> 	p-&gt;reversed = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_current_inode_path(const struct send_ctx *sctx,</div><div class='add'>+					 const struct fs_path *path)</div><div class='add'>+{</div><div class='add'>+	const struct fs_path *cur = &amp;sctx-&gt;cur_inode_path;</div><div class='add'>+</div><div class='add'>+	return (strncmp(path-&gt;start, cur-&gt;start, fs_path_len(cur)) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct btrfs_path *alloc_path_for_send(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='hunk'>@@ -633,9 +634,9 @@ static struct btrfs_path *alloc_path_for_send(void)</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='del'>-	path-&gt;need_commit_sem = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='add'>+	path-&gt;need_commit_sem = true;</div><div class='ctx'> 	return path;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -648,7 +649,7 @@ static int write_buf(struct file *filp, const void *buf, u32 len, loff_t *off)</div><div class='ctx'> 		ret = kernel_write(filp, buf + pos, len - pos, off);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		if (ret == 0)</div><div class='add'>+		if (unlikely(ret == 0))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		pos += ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -740,7 +741,7 @@ static int tlv_put_btrfs_timespec(struct send_ctx *sctx, u16 attr,</div><div class='ctx'> #define TLV_PUT_PATH(sctx, attrtype, p) \</div><div class='ctx'> 	do { \</div><div class='ctx'> 		ret = tlv_put_string(sctx, attrtype, p-&gt;start, \</div><div class='del'>-			p-&gt;end - p-&gt;start); \</div><div class='add'>+				     fs_path_len((p)));	       \</div><div class='ctx'> 		if (ret &lt; 0) \</div><div class='ctx'> 			goto tlv_put_failure; \</div><div class='ctx'> 	} while(0)</div><div class='hunk'>@@ -761,7 +762,7 @@ static int send_header(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_stream_header hdr;</div><div class='ctx'> </div><div class='del'>-	strcpy(hdr.magic, BTRFS_SEND_STREAM_MAGIC);</div><div class='add'>+	strscpy(hdr.magic, BTRFS_SEND_STREAM_MAGIC);</div><div class='ctx'> 	hdr.version = cpu_to_le32(sctx-&gt;proto);</div><div class='ctx'> 	return write_buf(sctx-&gt;send_filp, &amp;hdr, sizeof(hdr),</div><div class='ctx'> 					&amp;sctx-&gt;send_off);</div><div class='hunk'>@@ -777,7 +778,12 @@ static int begin_cmd(struct send_ctx *sctx, int cmd)</div><div class='ctx'> 	if (WARN_ON(!sctx-&gt;send_buf))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(sctx-&gt;send_size);</div><div class='add'>+	if (unlikely(sctx-&gt;send_size != 0)) {</div><div class='add'>+		btrfs_err(sctx-&gt;send_root-&gt;fs_info,</div><div class='add'>+			  "send: command header buffer not empty cmd %d offset %llu",</div><div class='add'>+			  cmd, sctx-&gt;send_off);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;send_size += sizeof(*hdr);</div><div class='ctx'> 	hdr = (struct btrfs_cmd_header *)sctx-&gt;send_buf;</div><div class='hunk'>@@ -814,14 +820,11 @@ static int send_cmd(struct send_ctx *sctx)</div><div class='ctx'> static int send_rename(struct send_ctx *sctx,</div><div class='ctx'> 		     struct fs_path *from, struct fs_path *to)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_rename %s -&gt; %s", from-&gt;start, to-&gt;start);</div><div class='del'>-</div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_RENAME);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, from);</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH_TO, to);</div><div class='hunk'>@@ -829,7 +832,6 @@ static int send_rename(struct send_ctx *sctx,</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -839,14 +841,11 @@ out:</div><div class='ctx'> static int send_link(struct send_ctx *sctx,</div><div class='ctx'> 		     struct fs_path *path, struct fs_path *lnk)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_link %s -&gt; %s", path-&gt;start, lnk-&gt;start);</div><div class='del'>-</div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_LINK);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH_LINK, lnk);</div><div class='hunk'>@@ -854,7 +853,6 @@ static int send_link(struct send_ctx *sctx,</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -863,21 +861,17 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int send_unlink(struct send_ctx *sctx, struct fs_path *path)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_unlink %s", path-&gt;start);</div><div class='del'>-</div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_UNLINK);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='ctx'> </div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -886,21 +880,17 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int send_rmdir(struct send_ctx *sctx, struct fs_path *path)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_rmdir %s", path-&gt;start);</div><div class='del'>-</div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_RMDIR);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='ctx'> </div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -922,7 +912,7 @@ static int get_inode_info(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 			  struct btrfs_inode_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_inode_item *ii;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='hunk'>@@ -937,11 +927,11 @@ static int get_inode_info(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!info)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ii = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='ctx'> 			struct btrfs_inode_item);</div><div class='hunk'>@@ -958,9 +948,7 @@ static int get_inode_info(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 	 */</div><div class='ctx'> 	info-&gt;fileattr = btrfs_inode_flags(path-&gt;nodes[0], ii);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_inode_gen(struct btrfs_root *root, u64 ino, u64 *gen)</div><div class='hunk'>@@ -975,9 +963,7 @@ static int get_inode_gen(struct btrfs_root *root, u64 ino, u64 *gen)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-typedef int (*iterate_inode_ref_t)(int num, u64 dir, int index,</div><div class='del'>-				   struct fs_path *p,</div><div class='del'>-				   void *ctx);</div><div class='add'>+typedef int (*iterate_inode_ref_t)(u64 dir, struct fs_path *p, void *ctx);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Helper function to iterate the entries in ONE btrfs_inode_ref or</div><div class='hunk'>@@ -988,13 +974,13 @@ typedef int (*iterate_inode_ref_t)(int num, u64 dir, int index,</div><div class='ctx'>  * path must point to the INODE_REF or INODE_EXTREF when called.</div><div class='ctx'>  */</div><div class='ctx'> static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,</div><div class='del'>-			     struct btrfs_key *found_key, int resolve,</div><div class='add'>+			     struct btrfs_key *found_key, bool resolve,</div><div class='ctx'> 			     iterate_inode_ref_t iterate, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_buffer *eb = path-&gt;nodes[0];</div><div class='ctx'> 	struct btrfs_inode_ref *iref;</div><div class='ctx'> 	struct btrfs_inode_extref *extref;</div><div class='del'>-	struct btrfs_path *tmp_path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(tmp_path);</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> 	u32 cur = 0;</div><div class='ctx'> 	u32 total;</div><div class='hunk'>@@ -1002,8 +988,6 @@ static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 	u32 name_len;</div><div class='ctx'> 	char *start;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int num = 0;</div><div class='del'>-	int index;</div><div class='ctx'> 	u64 dir;</div><div class='ctx'> 	unsigned long name_off;</div><div class='ctx'> 	unsigned long elem_size;</div><div class='hunk'>@@ -1038,13 +1022,11 @@ static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 			iref = (struct btrfs_inode_ref *)(ptr + cur);</div><div class='ctx'> 			name_len = btrfs_inode_ref_name_len(eb, iref);</div><div class='ctx'> 			name_off = (unsigned long)(iref + 1);</div><div class='del'>-			index = btrfs_inode_ref_index(eb, iref);</div><div class='ctx'> 			dir = found_key-&gt;offset;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			extref = (struct btrfs_inode_extref *)(ptr + cur);</div><div class='ctx'> 			name_len = btrfs_inode_extref_name_len(eb, extref);</div><div class='ctx'> 			name_off = (unsigned long)&amp;extref-&gt;name;</div><div class='del'>-			index = btrfs_inode_extref_index(eb, extref);</div><div class='ctx'> 			dir = btrfs_inode_extref_parent(eb, extref);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1070,7 +1052,13 @@ static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 					ret = PTR_ERR(start);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				BUG_ON(start &lt; p-&gt;buf);</div><div class='add'>+				if (unlikely(start &lt; p-&gt;buf)) {</div><div class='add'>+					btrfs_err(root-&gt;fs_info,</div><div class='add'>+			  "send: path ref buffer underflow for key " BTRFS_KEY_FMT,</div><div class='add'>+						  BTRFS_KEY_FMT_VALUE(found_key));</div><div class='add'>+					ret = -EINVAL;</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			p-&gt;start = start;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1081,14 +1069,12 @@ static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		cur += elem_size + name_len;</div><div class='del'>-		ret = iterate(num, dir, index, p, ctx);</div><div class='add'>+		ret = iterate(dir, p, ctx);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='del'>-		num++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(tmp_path);</div><div class='ctx'> 	fs_path_free(p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1125,7 +1111,7 @@ static int iterate_dir_item(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start with a small buffer (1 page). If later we end up needing more</div><div class='ctx'> 	 * space, which can happen for xattrs on a fs with a leaf size greater</div><div class='del'>-	 * then the page size, attempt to increase the buffer. Typically xattr</div><div class='add'>+	 * than the page size, attempt to increase the buffer. Typically xattr</div><div class='ctx'> 	 * values are small.</div><div class='ctx'> 	 */</div><div class='ctx'> 	buf_len = PATH_MAX;</div><div class='hunk'>@@ -1149,12 +1135,12 @@ static int iterate_dir_item(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 		btrfs_dir_item_key_to_cpu(eb, di, &amp;di_key);</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_dir_ftype(eb, di) == BTRFS_FT_XATTR) {</div><div class='del'>-			if (name_len &gt; XATTR_NAME_MAX) {</div><div class='add'>+			if (unlikely(name_len &gt; XATTR_NAME_MAX)) {</div><div class='ctx'> 				ret = -ENAMETOOLONG;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			if (name_len + data_len &gt;</div><div class='del'>-					BTRFS_MAX_XATTR_SIZE(root-&gt;fs_info)) {</div><div class='add'>+			if (unlikely(name_len + data_len &gt;</div><div class='add'>+				     BTRFS_MAX_XATTR_SIZE(root-&gt;fs_info))) {</div><div class='ctx'> 				ret = -E2BIG;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1162,7 +1148,7 @@ static int iterate_dir_item(struct btrfs_root *root, struct btrfs_path *path,</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Path too long</div><div class='ctx'> 			 */</div><div class='del'>-			if (name_len + data_len &gt; PATH_MAX) {</div><div class='add'>+			if (unlikely(name_len + data_len &gt; PATH_MAX)) {</div><div class='ctx'> 				ret = -ENAMETOOLONG;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1214,8 +1200,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __copy_first_ref(int num, u64 dir, int index,</div><div class='del'>-			    struct fs_path *p, void *ctx)</div><div class='add'>+static int __copy_first_ref(u64 dir, struct fs_path *p, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct fs_path *pt = ctx;</div><div class='hunk'>@@ -1237,7 +1222,7 @@ static int get_inode_path(struct btrfs_root *root,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_key key, found_key;</div><div class='del'>-	struct btrfs_path *p;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(p);</div><div class='ctx'> </div><div class='ctx'> 	p = alloc_path_for_send();</div><div class='ctx'> 	if (!p)</div><div class='hunk'>@@ -1251,28 +1236,20 @@ static int get_inode_path(struct btrfs_root *root,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot_for_read(root, &amp;key, p, 1, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret) {</div><div class='del'>-		ret = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	btrfs_item_key_to_cpu(p-&gt;nodes[0], &amp;found_key, p-&gt;slots[0]);</div><div class='ctx'> 	if (found_key.objectid != ino ||</div><div class='ctx'> 	    (found_key.type != BTRFS_INODE_REF_KEY &amp;&amp;</div><div class='del'>-	     found_key.type != BTRFS_INODE_EXTREF_KEY)) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	     found_key.type != BTRFS_INODE_EXTREF_KEY))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ret = iterate_inode_ref(root, p, &amp;found_key, 1,</div><div class='del'>-				__copy_first_ref, path);</div><div class='add'>+	ret = iterate_inode_ref(root, p, &amp;found_key, true, __copy_first_ref, path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(p);</div><div class='del'>-	return ret;</div><div class='add'>+		return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct backref_ctx {</div><div class='hunk'>@@ -1304,9 +1281,9 @@ static int __clone_root_cmp_bsearch(const void *key, const void *elt)</div><div class='ctx'> 	u64 root = (u64)(uintptr_t)key;</div><div class='ctx'> 	const struct clone_root *cr = elt;</div><div class='ctx'> </div><div class='del'>-	if (root &lt; cr-&gt;root-&gt;root_key.objectid)</div><div class='add'>+	if (root &lt; btrfs_root_id(cr-&gt;root))</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (root &gt; cr-&gt;root-&gt;root_key.objectid)</div><div class='add'>+	if (root &gt; btrfs_root_id(cr-&gt;root))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1316,9 +1293,9 @@ static int __clone_root_cmp_sort(const void *e1, const void *e2)</div><div class='ctx'> 	const struct clone_root *cr1 = e1;</div><div class='ctx'> 	const struct clone_root *cr2 = e2;</div><div class='ctx'> </div><div class='del'>-	if (cr1-&gt;root-&gt;root_key.objectid &lt; cr2-&gt;root-&gt;root_key.objectid)</div><div class='add'>+	if (btrfs_root_id(cr1-&gt;root) &lt; btrfs_root_id(cr2-&gt;root))</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (cr1-&gt;root-&gt;root_key.objectid &gt; cr2-&gt;root-&gt;root_key.objectid)</div><div class='add'>+	if (btrfs_root_id(cr1-&gt;root) &gt; btrfs_root_id(cr2-&gt;root))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1402,11 +1379,11 @@ static bool lookup_backref_cache(u64 leaf_bytenr, void *ctx,</div><div class='ctx'> 	struct backref_ctx *bctx = ctx;</div><div class='ctx'> 	struct send_ctx *sctx = bctx-&gt;sctx;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='del'>-	const u64 key = leaf_bytenr &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	const u64 key = leaf_bytenr &gt;&gt; fs_info-&gt;nodesize_bits;</div><div class='ctx'> 	struct btrfs_lru_cache_entry *raw_entry;</div><div class='ctx'> 	struct backref_cache_entry *entry;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_lru_cache_size(&amp;sctx-&gt;backref_cache) == 0)</div><div class='add'>+	if (sctx-&gt;backref_cache.size == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1457,7 +1434,7 @@ static void store_backref_cache(u64 leaf_bytenr, const struct ulist *root_ids,</div><div class='ctx'> 	if (!new_entry)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	new_entry-&gt;entry.key = leaf_bytenr &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	new_entry-&gt;entry.key = leaf_bytenr &gt;&gt; fs_info-&gt;nodesize_bits;</div><div class='ctx'> 	new_entry-&gt;entry.gen = 0;</div><div class='ctx'> 	new_entry-&gt;num_roots = 0;</div><div class='ctx'> 	ULIST_ITER_INIT(&amp;uiter);</div><div class='hunk'>@@ -1504,7 +1481,7 @@ static void store_backref_cache(u64 leaf_bytenr, const struct ulist *root_ids,</div><div class='ctx'> 	 * transaction handle or holding fs_info-&gt;commit_root_sem, so no need</div><div class='ctx'> 	 * to take any lock here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (btrfs_lru_cache_size(&amp;sctx-&gt;backref_cache) == 1)</div><div class='add'>+	if (sctx-&gt;backref_cache.size == 1)</div><div class='ctx'> 		sctx-&gt;backref_cache_last_reloc_trans = fs_info-&gt;last_reloc_trans;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1575,7 +1552,6 @@ static int find_extent_clone(struct send_ctx *sctx,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int extent_type;</div><div class='del'>-	u64 logical;</div><div class='ctx'> 	u64 disk_byte;</div><div class='ctx'> 	u64 num_bytes;</div><div class='ctx'> 	struct btrfs_file_extent_item *fi;</div><div class='hunk'>@@ -1606,7 +1582,6 @@ static int find_extent_clone(struct send_ctx *sctx,</div><div class='ctx'> </div><div class='ctx'> 	compressed = btrfs_file_extent_compression(eb, fi);</div><div class='ctx'> 	num_bytes = btrfs_file_extent_num_bytes(eb, fi);</div><div class='del'>-	logical = disk_byte + btrfs_file_extent_offset(eb, fi);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup the clone roots.</div><div class='hunk'>@@ -1688,14 +1663,8 @@ static int find_extent_clone(struct send_ctx *sctx,</div><div class='ctx'> 	}</div><div class='ctx'> 	up_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info,</div><div class='del'>-		    "find_extent_clone: data_offset=%llu, ino=%llu, num_bytes=%llu, logical=%llu",</div><div class='del'>-		    data_offset, ino, num_bytes, logical);</div><div class='del'>-</div><div class='del'>-	if (!backref_ctx.found) {</div><div class='del'>-		btrfs_debug(fs_info, "no clones found");</div><div class='add'>+	if (!backref_ctx.found)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	cur_clone_root = NULL;</div><div class='ctx'> 	for (i = 0; i &lt; sctx-&gt;clone_roots_cnt; i++) {</div><div class='hunk'>@@ -1737,7 +1706,7 @@ static int read_symlink(struct btrfs_root *root,</div><div class='ctx'> 			struct fs_path *dest)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_file_extent_item *ei;</div><div class='ctx'> 	u8 type;</div><div class='hunk'>@@ -1754,21 +1723,20 @@ static int read_symlink(struct btrfs_root *root,</div><div class='ctx'> 	key.offset = 0;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret) {</div><div class='add'>+		return ret;</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * An empty symlink inode. Can happen in rare error paths when</div><div class='ctx'> 		 * creating a symlink (transaction committed before the inode</div><div class='ctx'> 		 * eviction handler removed the symlink inode items and a crash</div><div class='del'>-		 * happened in between or the subvol was snapshoted in between).</div><div class='add'>+		 * happened in between or the subvol was snapshotted in between).</div><div class='ctx'> 		 * Print an informative message to dmesg/syslog so that the user</div><div class='ctx'> 		 * can delete the symlink.</div><div class='ctx'> 		 */</div><div class='ctx'> 		btrfs_err(root-&gt;fs_info,</div><div class='ctx'> 			  "Found empty symlink inode %llu at root %llu",</div><div class='del'>-			  ino, root-&gt;root_key.objectid);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+			  ino, btrfs_root_id(root));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ei = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='hunk'>@@ -1779,7 +1747,7 @@ static int read_symlink(struct btrfs_root *root,</div><div class='ctx'> 		btrfs_crit(root-&gt;fs_info,</div><div class='ctx'> "send: found symlink extent that is not inline, ino %llu root %llu extent type %d",</div><div class='ctx'> 			   ino, btrfs_root_id(root), type);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	compression = btrfs_file_extent_compression(path-&gt;nodes[0], ei);</div><div class='ctx'> 	if (unlikely(compression != BTRFS_COMPRESS_NONE)) {</div><div class='hunk'>@@ -1787,17 +1755,13 @@ static int read_symlink(struct btrfs_root *root,</div><div class='ctx'> 		btrfs_crit(root-&gt;fs_info,</div><div class='ctx'> "send: found symlink extent with compression, ino %llu root %llu compression type %d",</div><div class='ctx'> 			   ino, btrfs_root_id(root), compression);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	off = btrfs_file_extent_inline_start(ei);</div><div class='ctx'> 	len = btrfs_file_extent_ram_bytes(path-&gt;nodes[0], ei);</div><div class='ctx'> </div><div class='del'>-	ret = fs_path_add_from_extent_buffer(dest, path-&gt;nodes[0], off, len);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return fs_path_add_from_extent_buffer(dest, path-&gt;nodes[0], off, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1808,8 +1772,7 @@ static int gen_unique_name(struct send_ctx *sctx,</div><div class='ctx'> 			   u64 ino, u64 gen,</div><div class='ctx'> 			   struct fs_path *dest)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	char tmp[64];</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -1826,16 +1789,15 @@ static int gen_unique_name(struct send_ctx *sctx,</div><div class='ctx'> 				ino, gen, idx);</div><div class='ctx'> 		ASSERT(len &lt; sizeof(tmp));</div><div class='ctx'> 		tmp_name.name = tmp;</div><div class='del'>-		tmp_name.len = strlen(tmp);</div><div class='add'>+		tmp_name.len = len;</div><div class='ctx'> </div><div class='ctx'> 		di = btrfs_lookup_dir_item(NULL, sctx-&gt;send_root,</div><div class='ctx'> 				path, BTRFS_FIRST_FREE_OBJECTID,</div><div class='ctx'> 				&amp;tmp_name, 0);</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='del'>-		if (IS_ERR(di)) {</div><div class='del'>-			ret = PTR_ERR(di);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(di))</div><div class='add'>+			return PTR_ERR(di);</div><div class='add'>+</div><div class='ctx'> 		if (di) {</div><div class='ctx'> 			/* not unique, try again */</div><div class='ctx'> 			idx++;</div><div class='hunk'>@@ -1844,7 +1806,6 @@ static int gen_unique_name(struct send_ctx *sctx,</div><div class='ctx'> </div><div class='ctx'> 		if (!sctx-&gt;parent_root) {</div><div class='ctx'> 			/* unique */</div><div class='del'>-			ret = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1852,10 +1813,9 @@ static int gen_unique_name(struct send_ctx *sctx,</div><div class='ctx'> 				path, BTRFS_FIRST_FREE_OBJECTID,</div><div class='ctx'> 				&amp;tmp_name, 0);</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='del'>-		if (IS_ERR(di)) {</div><div class='del'>-			ret = PTR_ERR(di);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(di))</div><div class='add'>+			return PTR_ERR(di);</div><div class='add'>+</div><div class='ctx'> 		if (di) {</div><div class='ctx'> 			/* not unique, try again */</div><div class='ctx'> 			idx++;</div><div class='hunk'>@@ -1865,11 +1825,7 @@ static int gen_unique_name(struct send_ctx *sctx,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = fs_path_add(dest, tmp, strlen(tmp));</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return fs_path_add(dest, tmp, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum inode_state {</div><div class='hunk'>@@ -1892,7 +1848,7 @@ static int get_cur_inode_state(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> </div><div class='ctx'> 	ret = get_inode_info(sctx-&gt;send_root, ino, &amp;info);</div><div class='ctx'> 	if (ret &lt; 0 &amp;&amp; ret != -ENOENT)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	left_ret = (info.nlink == 0) ? -ENOENT : ret;</div><div class='ctx'> 	left_gen = info.gen;</div><div class='ctx'> 	if (send_gen)</div><div class='hunk'>@@ -1903,7 +1859,7 @@ static int get_cur_inode_state(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = get_inode_info(sctx-&gt;parent_root, ino, &amp;info);</div><div class='ctx'> 		if (ret &lt; 0 &amp;&amp; ret != -ENOENT)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		right_ret = (info.nlink == 0) ? -ENOENT : ret;</div><div class='ctx'> 		right_gen = info.gen;</div><div class='ctx'> 		if (parent_gen)</div><div class='hunk'>@@ -1948,7 +1904,6 @@ static int get_cur_inode_state(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1962,17 +1917,14 @@ static int is_inode_existent(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> </div><div class='ctx'> 	ret = get_cur_inode_state(sctx, ino, gen, send_gen, parent_gen);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ret == inode_state_no_change ||</div><div class='ctx'> 	    ret == inode_state_did_create ||</div><div class='ctx'> 	    ret == inode_state_will_delete)</div><div class='del'>-		ret = 1;</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1985,7 +1937,7 @@ static int lookup_dir_item_inode(struct btrfs_root *root,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct fscrypt_str name_str = FSTR_INIT((char *)name, name_len);</div><div class='ctx'> </div><div class='ctx'> 	path = alloc_path_for_send();</div><div class='hunk'>@@ -1993,19 +1945,15 @@ static int lookup_dir_item_inode(struct btrfs_root *root,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	di = btrfs_lookup_dir_item(NULL, root, path, dir, &amp;name_str, 0);</div><div class='del'>-	if (IS_ERR_OR_NULL(di)) {</div><div class='del'>-		ret = di ? PTR_ERR(di) : -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR_OR_NULL(di))</div><div class='add'>+		return di ? PTR_ERR(di) : -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(path-&gt;nodes[0], di, &amp;key);</div><div class='del'>-	if (key.type == BTRFS_ROOT_ITEM_KEY) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (key.type == BTRFS_ROOT_ITEM_KEY)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	*found_inode = key.objectid;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2019,7 +1967,7 @@ static int get_first_ref(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int len;</div><div class='ctx'> 	u64 parent_dir;</div><div class='ctx'> </div><div class='hunk'>@@ -2033,16 +1981,14 @@ static int get_first_ref(struct btrfs_root *root, u64 ino,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot_for_read(root, &amp;key, path, 1, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;found_key,</div><div class='ctx'> 				path-&gt;slots[0]);</div><div class='ctx'> 	if (ret || found_key.objectid != ino ||</div><div class='ctx'> 	    (found_key.type != BTRFS_INODE_REF_KEY &amp;&amp;</div><div class='del'>-	     found_key.type != BTRFS_INODE_EXTREF_KEY)) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	     found_key.type != BTRFS_INODE_EXTREF_KEY))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (found_key.type == BTRFS_INODE_REF_KEY) {</div><div class='ctx'> 		struct btrfs_inode_ref *iref;</div><div class='hunk'>@@ -2063,19 +2009,17 @@ static int get_first_ref(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 		parent_dir = btrfs_inode_extref_parent(path-&gt;nodes[0], extref);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (dir_gen) {</div><div class='ctx'> 		ret = get_inode_gen(root, parent_dir, dir_gen);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*dir = parent_dir;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2321,9 +2265,8 @@ static int __get_cur_name_and_parent(struct send_ctx *sctx,</div><div class='ctx'> 			*parent_gen = nce-&gt;parent_gen;</div><div class='ctx'> 			ret = fs_path_add(dest, nce-&gt;name, nce-&gt;name_len);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			ret = nce-&gt;ret;</div><div class='del'>-			goto out;</div><div class='add'>+				return ret;</div><div class='add'>+			return nce-&gt;ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2334,12 +2277,12 @@ static int __get_cur_name_and_parent(struct send_ctx *sctx,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = is_inode_existent(sctx, ino, gen, NULL, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		ret = gen_unique_name(sctx, ino, gen, dest);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 		goto out_cache;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2355,21 +2298,21 @@ static int __get_cur_name_and_parent(struct send_ctx *sctx,</div><div class='ctx'> 		ret = get_first_ref(sctx-&gt;parent_root, ino,</div><div class='ctx'> 				    parent_ino, parent_gen, dest);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if the ref was overwritten by an inode's ref that was processed</div><div class='ctx'> 	 * earlier. If yes, treat as orphan and return 1.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = did_overwrite_ref(sctx, *parent_ino, *parent_gen, ino, gen,</div><div class='del'>-			dest-&gt;start, dest-&gt;end - dest-&gt;start);</div><div class='add'>+				dest-&gt;start, fs_path_len(dest));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		fs_path_reset(dest);</div><div class='ctx'> 		ret = gen_unique_name(sctx, ino, gen, dest);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2377,11 +2320,9 @@ out_cache:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Store the result of the lookup in the name cache.</div><div class='ctx'> 	 */</div><div class='del'>-	nce = kmalloc(sizeof(*nce) + fs_path_len(dest) + 1, GFP_KERNEL);</div><div class='del'>-	if (!nce) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	nce = kmalloc(sizeof(*nce) + fs_path_len(dest), GFP_KERNEL);</div><div class='add'>+	if (!nce)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	nce-&gt;entry.key = ino;</div><div class='ctx'> 	nce-&gt;entry.gen = gen;</div><div class='hunk'>@@ -2389,7 +2330,7 @@ out_cache:</div><div class='ctx'> 	nce-&gt;parent_gen = *parent_gen;</div><div class='ctx'> 	nce-&gt;name_len = fs_path_len(dest);</div><div class='ctx'> 	nce-&gt;ret = ret;</div><div class='del'>-	strcpy(nce-&gt;name, dest-&gt;start);</div><div class='add'>+	memcpy(nce-&gt;name, dest-&gt;start, nce-&gt;name_len);</div><div class='ctx'> </div><div class='ctx'> 	if (ino &lt; sctx-&gt;send_progress)</div><div class='ctx'> 		nce-&gt;need_later_update = 0;</div><div class='hunk'>@@ -2399,10 +2340,9 @@ out_cache:</div><div class='ctx'> 	nce_ret = btrfs_lru_cache_store(&amp;sctx-&gt;name_cache, &amp;nce-&gt;entry, GFP_KERNEL);</div><div class='ctx'> 	if (nce_ret &lt; 0) {</div><div class='ctx'> 		kfree(nce);</div><div class='del'>-		ret = nce_ret;</div><div class='add'>+		return nce_ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2439,6 +2379,14 @@ static int get_cur_path(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> 	u64 parent_inode = 0;</div><div class='ctx'> 	u64 parent_gen = 0;</div><div class='ctx'> 	int stop = 0;</div><div class='add'>+	const bool is_cur_inode = (ino == sctx-&gt;cur_ino &amp;&amp; gen == sctx-&gt;cur_inode_gen);</div><div class='add'>+</div><div class='add'>+	if (is_cur_inode &amp;&amp; fs_path_len(&amp;sctx-&gt;cur_inode_path) &gt; 0) {</div><div class='add'>+		if (dest != &amp;sctx-&gt;cur_inode_path)</div><div class='add'>+			return fs_path_copy(dest, &amp;sctx-&gt;cur_inode_path);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	name = fs_path_alloc();</div><div class='ctx'> 	if (!name) {</div><div class='hunk'>@@ -2490,8 +2438,12 @@ static int get_cur_path(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	fs_path_free(name);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		fs_path_unreverse(dest);</div><div class='add'>+		if (is_cur_inode &amp;&amp; dest != &amp;sctx-&gt;cur_inode_path)</div><div class='add'>+			ret = fs_path_copy(&amp;sctx-&gt;cur_inode_path, dest);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2503,11 +2455,11 @@ static int send_subvol_begin(struct send_ctx *sctx)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_root *send_root = sctx-&gt;send_root;</div><div class='ctx'> 	struct btrfs_root *parent_root = sctx-&gt;parent_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_root_ref *ref;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	char *name = NULL;</div><div class='add'>+	char AUTO_KFREE(name);</div><div class='ctx'> 	int namelen;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -2515,30 +2467,25 @@ static int send_subvol_begin(struct send_ctx *sctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	name = kmalloc(BTRFS_PATH_NAME_MAX, GFP_KERNEL);</div><div class='del'>-	if (!name) {</div><div class='del'>-		btrfs_free_path(path);</div><div class='add'>+	if (!name)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	key.objectid = send_root-&gt;root_key.objectid;</div><div class='add'>+	key.objectid = btrfs_root_id(send_root);</div><div class='ctx'> 	key.type = BTRFS_ROOT_BACKREF_KEY;</div><div class='ctx'> 	key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot_for_read(send_root-&gt;fs_info-&gt;tree_root,</div><div class='ctx'> 				&amp;key, path, 1, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 	if (key.type != BTRFS_ROOT_BACKREF_KEY ||</div><div class='del'>-	    key.objectid != send_root-&gt;root_key.objectid) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+	    key.objectid != btrfs_root_id(send_root)) {</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	ref = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_root_ref);</div><div class='ctx'> 	namelen = btrfs_root_ref_name_len(leaf, ref);</div><div class='hunk'>@@ -2548,11 +2495,11 @@ static int send_subvol_begin(struct send_ctx *sctx)</div><div class='ctx'> 	if (parent_root) {</div><div class='ctx'> 		ret = begin_cmd(sctx, BTRFS_SEND_C_SNAPSHOT);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = begin_cmd(sctx, BTRFS_SEND_C_SUBVOL);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_STRING(sctx, BTRFS_SEND_A_PATH, name, namelen);</div><div class='hunk'>@@ -2580,31 +2527,63 @@ static int send_subvol_begin(struct send_ctx *sctx)</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	kfree(name);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct fs_path *get_cur_inode_path(struct send_ctx *sctx)</div><div class='add'>+{</div><div class='add'>+	if (fs_path_len(&amp;sctx-&gt;cur_inode_path) == 0) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen,</div><div class='add'>+				   &amp;sctx-&gt;cur_inode_path);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;sctx-&gt;cur_inode_path;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fs_path *get_path_for_command(struct send_ctx *sctx, u64 ino, u64 gen)</div><div class='add'>+{</div><div class='add'>+	struct fs_path *path;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ino == sctx-&gt;cur_ino &amp;&amp; gen == sctx-&gt;cur_inode_gen)</div><div class='add'>+		return get_cur_inode_path(sctx);</div><div class='add'>+</div><div class='add'>+	path = fs_path_alloc();</div><div class='add'>+	if (!path)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = get_cur_path(sctx, ino, gen, path);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		fs_path_free(path);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return path;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_path_for_command(const struct send_ctx *sctx, struct fs_path *path)</div><div class='add'>+{</div><div class='add'>+	if (path != &amp;sctx-&gt;cur_inode_path)</div><div class='add'>+		fs_path_free(path);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int send_truncate(struct send_ctx *sctx, u64 ino, u64 gen, u64 size)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_truncate %llu size=%llu", ino, size);</div><div class='del'>-</div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	p = get_path_for_command(sctx, ino, gen);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_TRUNCATE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, ino, gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_SIZE, size);</div><div class='ctx'> </div><div class='hunk'>@@ -2612,29 +2591,23 @@ static int send_truncate(struct send_ctx *sctx, u64 ino, u64 gen, u64 size)</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='ctx'> out:</div><div class='del'>-	fs_path_free(p);</div><div class='add'>+	free_path_for_command(sctx, p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_chmod(struct send_ctx *sctx, u64 ino, u64 gen, u64 mode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_chmod %llu mode=%llu", ino, mode);</div><div class='del'>-</div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	p = get_path_for_command(sctx, ino, gen);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_CHMOD);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, ino, gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_MODE, mode &amp; 07777);</div><div class='ctx'> </div><div class='hunk'>@@ -2642,32 +2615,26 @@ static int send_chmod(struct send_ctx *sctx, u64 ino, u64 gen, u64 mode)</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='ctx'> out:</div><div class='del'>-	fs_path_free(p);</div><div class='add'>+	free_path_for_command(sctx, p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_fileattr(struct send_ctx *sctx, u64 ino, u64 gen, u64 fileattr)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='ctx'> 	if (sctx-&gt;proto &lt; 2)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_fileattr %llu fileattr=%llu", ino, fileattr);</div><div class='del'>-</div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	p = get_path_for_command(sctx, ino, gen);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_FILEATTR);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, ino, gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_FILEATTR, fileattr);</div><div class='ctx'> </div><div class='hunk'>@@ -2675,30 +2642,23 @@ static int send_fileattr(struct send_ctx *sctx, u64 ino, u64 gen, u64 fileattr)</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='ctx'> out:</div><div class='del'>-	fs_path_free(p);</div><div class='add'>+	free_path_for_command(sctx, p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_chown(struct send_ctx *sctx, u64 ino, u64 gen, u64 uid, u64 gid)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_chown %llu uid=%llu, gid=%llu",</div><div class='del'>-		    ino, uid, gid);</div><div class='del'>-</div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	p = get_path_for_command(sctx, ino, gen);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_CHOWN);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, ino, gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_UID, uid);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_GID, gid);</div><div class='hunk'>@@ -2707,26 +2667,23 @@ static int send_chown(struct send_ctx *sctx, u64 ino, u64 gen, u64 uid, u64 gid)</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='ctx'> out:</div><div class='del'>-	fs_path_free(p);</div><div class='add'>+	free_path_for_command(sctx, p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_utimes(struct send_ctx *sctx, u64 ino, u64 gen)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p = NULL;</div><div class='ctx'> 	struct btrfs_inode_item *ii;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int slot;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_utimes %llu", ino);</div><div class='del'>-</div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	p = get_path_for_command(sctx, ino, gen);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	path = alloc_path_for_send();</div><div class='ctx'> 	if (!path) {</div><div class='hunk'>@@ -2751,9 +2708,6 @@ static int send_utimes(struct send_ctx *sctx, u64 ino, u64 gen)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, ino, gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='ctx'> 	TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_ATIME, eb, &amp;ii-&gt;atime);</div><div class='ctx'> 	TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_MTIME, eb, &amp;ii-&gt;mtime);</div><div class='hunk'>@@ -2765,8 +2719,7 @@ static int send_utimes(struct send_ctx *sctx, u64 ino, u64 gen)</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='ctx'> out:</div><div class='del'>-	fs_path_free(p);</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	free_path_for_command(sctx, p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2776,7 +2729,7 @@ out:</div><div class='ctx'>  * processing an inode that is a directory and it just got renamed, and existing</div><div class='ctx'>  * entries in the cache may refer to inodes that have the directory in their</div><div class='ctx'>  * full path - in which case we would generate outdated paths (pre-rename)</div><div class='del'>- * for the inodes that the cache entries point to. Instead of prunning the</div><div class='add'>+ * for the inodes that the cache entries point to. Instead of pruning the</div><div class='ctx'>  * cache when inserting, do it after we finish processing each inode at</div><div class='ctx'>  * finish_inode_if_needed().</div><div class='ctx'>  */</div><div class='hunk'>@@ -2809,8 +2762,7 @@ static int cache_dir_utimes(struct send_ctx *sctx, u64 dir, u64 gen)</div><div class='ctx'> </div><div class='ctx'> static int trim_dir_utimes_cache(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	while (btrfs_lru_cache_size(&amp;sctx-&gt;dir_utimes_cache) &gt;</div><div class='del'>-	       SEND_MAX_DIR_UTIMES_CACHE_SIZE) {</div><div class='add'>+	while (sctx-&gt;dir_utimes_cache.size &gt; SEND_MAX_DIR_UTIMES_CACHE_SIZE) {</div><div class='ctx'> 		struct btrfs_lru_cache_entry *lru;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2834,7 +2786,6 @@ static int trim_dir_utimes_cache(struct send_ctx *sctx)</div><div class='ctx'>  */</div><div class='ctx'> static int send_create_inode(struct send_ctx *sctx, u64 ino)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> 	int cmd;</div><div class='hunk'>@@ -2843,8 +2794,6 @@ static int send_create_inode(struct send_ctx *sctx, u64 ino)</div><div class='ctx'> 	u64 mode;</div><div class='ctx'> 	u64 rdev;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "send_create_inode %llu", ino);</div><div class='del'>-</div><div class='ctx'> 	p = fs_path_alloc();</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2941,7 +2890,7 @@ static int did_create_dir(struct send_ctx *sctx, u64 dir)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int iter_ret = 0;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> 	struct btrfs_key di_key;</div><div class='hunk'>@@ -2981,7 +2930,6 @@ static int did_create_dir(struct send_ctx *sctx, u64 dir)</div><div class='ctx'> 	if (iter_ret &lt; 0)</div><div class='ctx'> 		ret = iter_ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3071,7 +3019,7 @@ static void __free_recorded_refs(struct list_head *head)</div><div class='ctx'> 	struct recorded_ref *cur;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(head)) {</div><div class='del'>-		cur = list_entry(head-&gt;next, struct recorded_ref, list);</div><div class='add'>+		cur = list_first_entry(head, struct recorded_ref, list);</div><div class='ctx'> 		recorded_ref_free(cur);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3102,6 +3050,11 @@ static int orphanize_inode(struct send_ctx *sctx, u64 ino, u64 gen,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = send_rename(sctx, path, orphan);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (ino == sctx-&gt;cur_ino &amp;&amp; gen == sctx-&gt;cur_inode_gen)</div><div class='add'>+		ret = fs_path_copy(&amp;sctx-&gt;cur_inode_path, orphan);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	fs_path_free(orphan);</div><div class='hunk'>@@ -3756,8 +3709,7 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,</div><div class='ctx'> 				  struct recorded_ref *parent_ref,</div><div class='ctx'> 				  const bool is_orphan)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;parent_root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key di_key;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='hunk'>@@ -3778,19 +3730,15 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,</div><div class='ctx'> 	key.offset = btrfs_name_hash(parent_ref-&gt;name, parent_ref-&gt;name_len);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, sctx-&gt;parent_root, &amp;key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (ret &gt; 0) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	di = btrfs_match_dir_item_name(fs_info, path, parent_ref-&gt;name,</div><div class='add'>+	di = btrfs_match_dir_item_name(path, parent_ref-&gt;name,</div><div class='ctx'> 				       parent_ref-&gt;name_len);</div><div class='del'>-	if (!di) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!di)</div><div class='add'>+		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * di_key.objectid has the number of the inode that has a dentry in the</div><div class='ctx'> 	 * parent directory with the same name that sctx-&gt;cur_ino is being</div><div class='hunk'>@@ -3800,26 +3748,22 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,</div><div class='ctx'> 	 * that it happens after that other inode is renamed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(path-&gt;nodes[0], di, &amp;di_key);</div><div class='del'>-	if (di_key.type != BTRFS_INODE_ITEM_KEY) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (di_key.type != BTRFS_INODE_ITEM_KEY)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = get_inode_gen(sctx-&gt;parent_root, di_key.objectid, &amp;left_gen);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = get_inode_gen(sctx-&gt;send_root, di_key.objectid, &amp;right_gen);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (ret == -ENOENT)</div><div class='ctx'> 			ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Different inode, no need to delay the rename of sctx-&gt;cur_ino */</div><div class='del'>-	if (right_gen != left_gen) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (right_gen != left_gen)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	wdm = get_waiting_dir_move(sctx, di_key.objectid);</div><div class='ctx'> 	if (wdm &amp;&amp; !wdm-&gt;orphanized) {</div><div class='hunk'>@@ -3833,8 +3777,6 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3884,7 +3826,7 @@ static int is_ancestor(struct btrfs_root *root,</div><div class='ctx'> 	bool free_fs_path = false;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int iter_ret = 0;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	if (!fs_path) {</div><div class='hunk'>@@ -3952,7 +3894,6 @@ static int is_ancestor(struct btrfs_root *root,</div><div class='ctx'> 		ret = iter_ret;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (free_fs_path)</div><div class='ctx'> 		fs_path_free(fs_path);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -4132,7 +4073,7 @@ static int update_ref_path(struct send_ctx *sctx, struct recorded_ref *ref)</div><div class='ctx'>  */</div><div class='ctx'> static int refresh_ref_path(struct send_ctx *sctx, struct recorded_ref *ref)</div><div class='ctx'> {</div><div class='del'>-	char *name;</div><div class='add'>+	char AUTO_KFREE(name);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	name = kmemdup(ref-&gt;name, ref-&gt;name_len, GFP_KERNEL);</div><div class='hunk'>@@ -4142,17 +4083,75 @@ static int refresh_ref_path(struct send_ctx *sctx, struct recorded_ref *ref)</div><div class='ctx'> 	fs_path_reset(ref-&gt;full_path);</div><div class='ctx'> 	ret = get_cur_path(sctx, ref-&gt;dir, ref-&gt;dir_gen, ref-&gt;full_path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = fs_path_add(ref-&gt;full_path, name, ref-&gt;name_len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Update the reference's base name pointer. */</div><div class='ctx'> 	set_ref_path(ref, ref-&gt;full_path);</div><div class='del'>-out:</div><div class='del'>-	kfree(name);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rbtree_check_dir_ref_comp(const void *k, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const struct recorded_ref *data = k;</div><div class='add'>+	const struct recorded_ref *ref = rb_entry(node, struct recorded_ref, node);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;dir &gt; ref-&gt;dir)</div><div class='add'>+		return 1;</div><div class='add'>+	if (data-&gt;dir &lt; ref-&gt;dir)</div><div class='add'>+		return -1;</div><div class='add'>+	if (data-&gt;dir_gen &gt; ref-&gt;dir_gen)</div><div class='add'>+		return 1;</div><div class='add'>+	if (data-&gt;dir_gen &lt; ref-&gt;dir_gen)</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool rbtree_check_dir_ref_less(struct rb_node *node, const struct rb_node *parent)</div><div class='add'>+{</div><div class='add'>+	const struct recorded_ref *entry = rb_entry(node, struct recorded_ref, node);</div><div class='add'>+</div><div class='add'>+	return rbtree_check_dir_ref_comp(entry, parent) &lt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int record_check_dir_ref_in_tree(struct rb_root *root,</div><div class='add'>+			struct recorded_ref *ref, struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct recorded_ref *tmp_ref;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (rb_find(ref, root, rbtree_check_dir_ref_comp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dup_ref(ref, list);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tmp_ref = list_last_entry(list, struct recorded_ref, list);</div><div class='add'>+	rb_add(&amp;tmp_ref-&gt;node, root, rbtree_check_dir_ref_less);</div><div class='add'>+	tmp_ref-&gt;root = root;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rename_current_inode(struct send_ctx *sctx,</div><div class='add'>+				struct fs_path *current_path,</div><div class='add'>+				struct fs_path *new_path)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = send_rename(sctx, current_path, new_path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = fs_path_copy(&amp;sctx-&gt;cur_inode_path, new_path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return fs_path_copy(current_path, new_path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4165,24 +4164,28 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 	struct recorded_ref *cur;</div><div class='ctx'> 	struct recorded_ref *cur2;</div><div class='ctx'> 	LIST_HEAD(check_dirs);</div><div class='add'>+	struct rb_root rbtree_check_dirs = RB_ROOT;</div><div class='ctx'> 	struct fs_path *valid_path = NULL;</div><div class='ctx'> 	u64 ow_inode = 0;</div><div class='ctx'> 	u64 ow_gen;</div><div class='ctx'> 	u64 ow_mode;</div><div class='del'>-	int did_overwrite = 0;</div><div class='del'>-	int is_orphan = 0;</div><div class='del'>-	u64 last_dir_ino_rm = 0;</div><div class='add'>+	bool did_overwrite = false;</div><div class='add'>+	bool is_orphan = false;</div><div class='ctx'> 	bool can_rename = true;</div><div class='ctx'> 	bool orphanized_dir = false;</div><div class='ctx'> 	bool orphanized_ancestor = false;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "process_recorded_refs %llu", sctx-&gt;cur_ino);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This should never happen as the root dir always has the same ref</div><div class='ctx'> 	 * which is always '..'</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(sctx-&gt;cur_ino &lt;= BTRFS_FIRST_FREE_OBJECTID);</div><div class='add'>+	if (unlikely(sctx-&gt;cur_ino &lt;= BTRFS_FIRST_FREE_OBJECTID)) {</div><div class='add'>+		btrfs_err(fs_info,</div><div class='add'>+			  "send: unexpected inode %llu in process_recorded_refs()",</div><div class='add'>+			  sctx-&gt;cur_ino);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	valid_path = fs_path_alloc();</div><div class='ctx'> 	if (!valid_path) {</div><div class='hunk'>@@ -4207,14 +4210,14 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (ret)</div><div class='del'>-			did_overwrite = 1;</div><div class='add'>+			did_overwrite = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sctx-&gt;cur_inode_new || did_overwrite) {</div><div class='ctx'> 		ret = gen_unique_name(sctx, sctx-&gt;cur_ino,</div><div class='ctx'> 				sctx-&gt;cur_inode_gen, valid_path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		is_orphan = 1;</div><div class='add'>+		is_orphan = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen,</div><div class='ctx'> 				valid_path);</div><div class='hunk'>@@ -4339,6 +4342,7 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 				if (ret &gt; 0) {</div><div class='ctx'> 					orphanized_ancestor = true;</div><div class='ctx'> 					fs_path_reset(valid_path);</div><div class='add'>+					fs_path_reset(&amp;sctx-&gt;cur_inode_path);</div><div class='ctx'> 					ret = get_cur_path(sctx, sctx-&gt;cur_ino,</div><div class='ctx'> 							   sctx-&gt;cur_inode_gen,</div><div class='ctx'> 							   valid_path);</div><div class='hunk'>@@ -4434,13 +4438,10 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 		 * it depending on the inode mode.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (is_orphan &amp;&amp; can_rename) {</div><div class='del'>-			ret = send_rename(sctx, valid_path, cur-&gt;full_path);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			is_orphan = 0;</div><div class='del'>-			ret = fs_path_copy(valid_path, cur-&gt;full_path);</div><div class='add'>+			ret = rename_current_inode(sctx, valid_path, cur-&gt;full_path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='add'>+			is_orphan = false;</div><div class='ctx'> 		} else if (can_rename) {</div><div class='ctx'> 			if (S_ISDIR(sctx-&gt;cur_inode_mode)) {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -4448,10 +4449,7 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 				 * dirs, we always have one new and one deleted</div><div class='ctx'> 				 * ref. The deleted ref is ignored later.</div><div class='ctx'> 				 */</div><div class='del'>-				ret = send_rename(sctx, valid_path,</div><div class='del'>-						  cur-&gt;full_path);</div><div class='del'>-				if (!ret)</div><div class='del'>-					ret = fs_path_copy(valid_path,</div><div class='add'>+				ret = rename_current_inode(sctx, valid_path,</div><div class='ctx'> 							   cur-&gt;full_path);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='hunk'>@@ -4474,7 +4472,7 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 					goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		ret = dup_ref(cur, &amp;check_dirs);</div><div class='add'>+		ret = record_check_dir_ref_in_tree(&amp;rbtree_check_dirs, cur, &amp;check_dirs);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4498,11 +4496,11 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 					sctx-&gt;cur_inode_gen, valid_path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='del'>-			is_orphan = 1;</div><div class='add'>+			is_orphan = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry(cur, &amp;sctx-&gt;deleted_refs, list) {</div><div class='del'>-			ret = dup_ref(cur, &amp;check_dirs);</div><div class='add'>+			ret = record_check_dir_ref_in_tree(&amp;rbtree_check_dirs, cur, &amp;check_dirs);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4511,9 +4509,8 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We have a moved dir. Add the old parent to check_dirs</div><div class='ctx'> 		 */</div><div class='del'>-		cur = list_entry(sctx-&gt;deleted_refs.next, struct recorded_ref,</div><div class='del'>-				list);</div><div class='del'>-		ret = dup_ref(cur, &amp;check_dirs);</div><div class='add'>+		cur = list_first_entry(&amp;sctx-&gt;deleted_refs, struct recorded_ref, list);</div><div class='add'>+		ret = record_check_dir_ref_in_tree(&amp;rbtree_check_dirs, cur, &amp;check_dirs);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else if (!S_ISDIR(sctx-&gt;cur_inode_mode)) {</div><div class='hunk'>@@ -4544,8 +4541,10 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 				ret = send_unlink(sctx, cur-&gt;full_path);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='add'>+				if (is_current_inode_path(sctx, cur-&gt;full_path))</div><div class='add'>+					fs_path_reset(&amp;sctx-&gt;cur_inode_path);</div><div class='ctx'> 			}</div><div class='del'>-			ret = dup_ref(cur, &amp;check_dirs);</div><div class='add'>+			ret = record_check_dir_ref_in_tree(&amp;rbtree_check_dirs, cur, &amp;check_dirs);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4588,8 +4587,7 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 			ret = cache_dir_utimes(sctx, cur-&gt;dir, cur-&gt;dir_gen);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='del'>-		} else if (ret == inode_state_did_delete &amp;&amp;</div><div class='del'>-			   cur-&gt;dir != last_dir_ino_rm) {</div><div class='add'>+		} else if (ret == inode_state_did_delete) {</div><div class='ctx'> 			ret = can_rmdir(sctx, cur-&gt;dir, cur-&gt;dir_gen);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -4601,7 +4599,6 @@ static int process_recorded_refs(struct send_ctx *sctx, int *pending_move)</div><div class='ctx'> 				ret = send_rmdir(sctx, valid_path);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='del'>-				last_dir_ino_rm = cur-&gt;dir;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4619,7 +4616,6 @@ static int rbtree_ref_comp(const void *k, const struct rb_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	const struct recorded_ref *data = k;</div><div class='ctx'> 	const struct recorded_ref *ref = rb_entry(node, struct recorded_ref, node);</div><div class='del'>-	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;dir &gt; ref-&gt;dir)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -4633,12 +4629,7 @@ static int rbtree_ref_comp(const void *k, const struct rb_node *node)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (data-&gt;name_len &lt; ref-&gt;name_len)</div><div class='ctx'> 		return -1;</div><div class='del'>-	result = strcmp(data-&gt;name, ref-&gt;name);</div><div class='del'>-	if (result &gt; 0)</div><div class='del'>-		return 1;</div><div class='del'>-	if (result &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='add'>+	return strcmp(data-&gt;name, ref-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool rbtree_ref_less(struct rb_node *node, const struct rb_node *parent)</div><div class='hunk'>@@ -4690,10 +4681,9 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int record_new_ref_if_needed(int num, u64 dir, int index,</div><div class='del'>-				    struct fs_path *name, void *ctx)</div><div class='add'>+static int record_new_ref_if_needed(u64 dir, struct fs_path *name, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct send_ctx *sctx = ctx;</div><div class='ctx'> 	struct rb_node *node = NULL;</div><div class='ctx'> 	struct recorded_ref data;</div><div class='hunk'>@@ -4702,7 +4692,7 @@ static int record_new_ref_if_needed(int num, u64 dir, int index,</div><div class='ctx'> </div><div class='ctx'> 	ret = get_inode_gen(sctx-&gt;send_root, dir, &amp;dir_gen);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	data.dir = dir;</div><div class='ctx'> 	data.dir_gen = dir_gen;</div><div class='hunk'>@@ -4716,14 +4706,13 @@ static int record_new_ref_if_needed(int num, u64 dir, int index,</div><div class='ctx'> 					 &amp;sctx-&gt;new_refs, name, dir, dir_gen,</div><div class='ctx'> 					 sctx);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int record_deleted_ref_if_needed(int num, u64 dir, int index,</div><div class='del'>-					struct fs_path *name, void *ctx)</div><div class='add'>+static int record_deleted_ref_if_needed(u64 dir, struct fs_path *name, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct send_ctx *sctx = ctx;</div><div class='ctx'> 	struct rb_node *node = NULL;</div><div class='ctx'> 	struct recorded_ref data;</div><div class='hunk'>@@ -4732,7 +4721,7 @@ static int record_deleted_ref_if_needed(int num, u64 dir, int index,</div><div class='ctx'> </div><div class='ctx'> 	ret = get_inode_gen(sctx-&gt;parent_root, dir, &amp;dir_gen);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	data.dir = dir;</div><div class='ctx'> 	data.dir_gen = dir_gen;</div><div class='hunk'>@@ -4746,7 +4735,7 @@ static int record_deleted_ref_if_needed(int num, u64 dir, int index,</div><div class='ctx'> 					 &amp;sctx-&gt;deleted_refs, name, dir,</div><div class='ctx'> 					 dir_gen, sctx);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4754,47 +4743,40 @@ static int record_new_ref(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iterate_inode_ref(sctx-&gt;send_root, sctx-&gt;left_path,</div><div class='del'>-				sctx-&gt;cmp_key, 0, record_new_ref_if_needed, sctx);</div><div class='add'>+	ret = iterate_inode_ref(sctx-&gt;send_root, sctx-&gt;left_path, sctx-&gt;cmp_key,</div><div class='add'>+				false, record_new_ref_if_needed, sctx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = 0;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int record_deleted_ref(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iterate_inode_ref(sctx-&gt;parent_root, sctx-&gt;right_path,</div><div class='del'>-				sctx-&gt;cmp_key, 0, record_deleted_ref_if_needed,</div><div class='del'>-				sctx);</div><div class='add'>+	ret = iterate_inode_ref(sctx-&gt;parent_root, sctx-&gt;right_path, sctx-&gt;cmp_key,</div><div class='add'>+				false, record_deleted_ref_if_needed, sctx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = 0;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int record_changed_ref(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = iterate_inode_ref(sctx-&gt;send_root, sctx-&gt;left_path,</div><div class='del'>-			sctx-&gt;cmp_key, 0, record_new_ref_if_needed, sctx);</div><div class='add'>+	ret = iterate_inode_ref(sctx-&gt;send_root, sctx-&gt;left_path, sctx-&gt;cmp_key,</div><div class='add'>+				false, record_new_ref_if_needed, sctx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = iterate_inode_ref(sctx-&gt;parent_root, sctx-&gt;right_path,</div><div class='del'>-			sctx-&gt;cmp_key, 0, record_deleted_ref_if_needed, sctx);</div><div class='add'>+		return ret;</div><div class='add'>+	ret = iterate_inode_ref(sctx-&gt;parent_root, sctx-&gt;right_path, sctx-&gt;cmp_key,</div><div class='add'>+				false, record_deleted_ref_if_needed, sctx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = 0;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4807,7 +4789,7 @@ static int process_all_refs(struct send_ctx *sctx,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int iter_ret = 0;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> 	iterate_inode_ref_t cb;</div><div class='hunk'>@@ -4826,8 +4808,7 @@ static int process_all_refs(struct send_ctx *sctx,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		btrfs_err(sctx-&gt;send_root-&gt;fs_info,</div><div class='ctx'> 				"Wrong command %d in process_all_refs", cmd);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = sctx-&gt;cmp_key-&gt;objectid;</div><div class='hunk'>@@ -4839,15 +4820,14 @@ static int process_all_refs(struct send_ctx *sctx,</div><div class='ctx'> 		     found_key.type != BTRFS_INODE_EXTREF_KEY))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = iterate_inode_ref(root, path, &amp;found_key, 0, cb, sctx);</div><div class='add'>+		ret = iterate_inode_ref(root, path, &amp;found_key, false, cb, sctx);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Catch error found during iteration */</div><div class='del'>-	if (iter_ret &lt; 0) {</div><div class='del'>-		ret = iter_ret;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (iter_ret &lt; 0)</div><div class='add'>+		return iter_ret;</div><div class='add'>+</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4855,22 +4835,23 @@ static int process_all_refs(struct send_ctx *sctx,</div><div class='ctx'> 	 * re-creating this inode and will be rename'ing it into place once we</div><div class='ctx'> 	 * rename the parent directory.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = process_recorded_refs(sctx, &amp;pending_move);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return process_recorded_refs(sctx, &amp;pending_move);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_set_xattr(struct send_ctx *sctx,</div><div class='del'>-			  struct fs_path *path,</div><div class='ctx'> 			  const char *name, int name_len,</div><div class='ctx'> 			  const char *data, int data_len)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct fs_path *path;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	path = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return PTR_ERR(path);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_SET_XATTR);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='ctx'> 	TLV_PUT_STRING(sctx, BTRFS_SEND_A_XATTR_NAME, name, name_len);</div><div class='hunk'>@@ -4879,7 +4860,6 @@ static int send_set_xattr(struct send_ctx *sctx,</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4887,11 +4867,11 @@ static int send_remove_xattr(struct send_ctx *sctx,</div><div class='ctx'> 			  struct fs_path *path,</div><div class='ctx'> 			  const char *name, int name_len)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_REMOVE_XATTR);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='ctx'> 	TLV_PUT_STRING(sctx, BTRFS_SEND_A_XATTR_NAME, name, name_len);</div><div class='hunk'>@@ -4899,7 +4879,6 @@ static int send_remove_xattr(struct send_ctx *sctx,</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4907,19 +4886,13 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key,</div><div class='ctx'> 			       const char *name, int name_len, const char *data,</div><div class='ctx'> 			       int data_len, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct send_ctx *sctx = ctx;</div><div class='del'>-	struct fs_path *p;</div><div class='ctx'> 	struct posix_acl_xattr_header dummy_acl;</div><div class='ctx'> </div><div class='ctx'> 	/* Capabilities are emitted by finish_inode_if_needed */</div><div class='ctx'> 	if (!strncmp(name, XATTR_NAME_CAPS, name_len))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This hack is needed because empty acls are stored as zero byte</div><div class='ctx'> 	 * data in xattrs. Problem with that is, that receiving these zero byte</div><div class='hunk'>@@ -4936,48 +4909,27 @@ static int __process_new_xattr(int num, struct btrfs_key *di_key,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = send_set_xattr(sctx, p, name, name_len, data, data_len);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	fs_path_free(p);</div><div class='del'>-	return ret;</div><div class='add'>+	return send_set_xattr(sctx, name, name_len, data, data_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __process_deleted_xattr(int num, struct btrfs_key *di_key,</div><div class='ctx'> 				   const char *name, int name_len,</div><div class='ctx'> 				   const char *data, int data_len, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct send_ctx *sctx = ctx;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = send_remove_xattr(sctx, p, name, name_len);</div><div class='add'>+	p = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	fs_path_free(p);</div><div class='del'>-	return ret;</div><div class='add'>+	return send_remove_xattr(sctx, p, name, name_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int process_new_xattr(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = iterate_dir_item(sctx-&gt;send_root, sctx-&gt;left_path,</div><div class='del'>-			       __process_new_xattr, sctx);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return iterate_dir_item(sctx-&gt;send_root, sctx-&gt;left_path,</div><div class='add'>+				__process_new_xattr, sctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int process_deleted_xattr(struct send_ctx *sctx)</div><div class='hunk'>@@ -4992,6 +4944,7 @@ struct find_xattr_ctx {</div><div class='ctx'> 	int found_idx;</div><div class='ctx'> 	char *found_data;</div><div class='ctx'> 	int found_data_len;</div><div class='add'>+	bool copy_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __find_xattr(int num, struct btrfs_key *di_key, const char *name,</div><div class='hunk'>@@ -5003,9 +4956,11 @@ static int __find_xattr(int num, struct btrfs_key *di_key, const char *name,</div><div class='ctx'> 	    strncmp(name, ctx-&gt;name, name_len) == 0) {</div><div class='ctx'> 		ctx-&gt;found_idx = num;</div><div class='ctx'> 		ctx-&gt;found_data_len = data_len;</div><div class='del'>-		ctx-&gt;found_data = kmemdup(data, data_len, GFP_KERNEL);</div><div class='del'>-		if (!ctx-&gt;found_data)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (ctx-&gt;copy_data) {</div><div class='add'>+			ctx-&gt;found_data = kmemdup(data, data_len, GFP_KERNEL);</div><div class='add'>+			if (!ctx-&gt;found_data)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -5025,6 +4980,7 @@ static int find_xattr(struct btrfs_root *root,</div><div class='ctx'> 	ctx.found_idx = -1;</div><div class='ctx'> 	ctx.found_data = NULL;</div><div class='ctx'> 	ctx.found_data_len = 0;</div><div class='add'>+	ctx.copy_data = (data != NULL);</div><div class='ctx'> </div><div class='ctx'> 	ret = iterate_dir_item(root, path, __find_xattr, &amp;ctx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -5036,7 +4992,7 @@ static int find_xattr(struct btrfs_root *root,</div><div class='ctx'> 		*data = ctx.found_data;</div><div class='ctx'> 		*data_len = ctx.found_data_len;</div><div class='ctx'> 	} else {</div><div class='del'>-		kfree(ctx.found_data);</div><div class='add'>+		ASSERT(ctx.found_data == NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ctx.found_idx;</div><div class='ctx'> }</div><div class='hunk'>@@ -5049,8 +5005,8 @@ static int __process_changed_new_xattr(int num, struct btrfs_key *di_key,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct send_ctx *sctx = ctx;</div><div class='del'>-	char *found_data = NULL;</div><div class='del'>-	int found_data_len  = 0;</div><div class='add'>+	char AUTO_KFREE(found_data);</div><div class='add'>+	int found_data_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = find_xattr(sctx-&gt;parent_root, sctx-&gt;right_path,</div><div class='ctx'> 			 sctx-&gt;cmp_key, name, name_len, &amp;found_data,</div><div class='hunk'>@@ -5068,7 +5024,6 @@ static int __process_changed_new_xattr(int num, struct btrfs_key *di_key,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(found_data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5093,17 +5048,15 @@ static int __process_changed_deleted_xattr(int num, struct btrfs_key *di_key,</div><div class='ctx'> </div><div class='ctx'> static int process_changed_xattr(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = iterate_dir_item(sctx-&gt;send_root, sctx-&gt;left_path,</div><div class='ctx'> 			__process_changed_new_xattr, sctx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = iterate_dir_item(sctx-&gt;parent_root, sctx-&gt;right_path,</div><div class='del'>-			__process_changed_deleted_xattr, sctx);</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return iterate_dir_item(sctx-&gt;parent_root, sctx-&gt;right_path,</div><div class='add'>+				__process_changed_deleted_xattr, sctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int process_all_new_xattrs(struct send_ctx *sctx)</div><div class='hunk'>@@ -5111,7 +5064,7 @@ static int process_all_new_xattrs(struct send_ctx *sctx)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int iter_ret = 0;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> </div><div class='hunk'>@@ -5139,7 +5092,6 @@ static int process_all_new_xattrs(struct send_ctx *sctx)</div><div class='ctx'> 	if (iter_ret &lt; 0)</div><div class='ctx'> 		ret = iter_ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5150,7 +5102,7 @@ static int send_verity(struct send_ctx *sctx, struct fs_path *path,</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_ENABLE_VERITY);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='ctx'> 	TLV_PUT_U8(sctx, BTRFS_SEND_A_VERITY_ALGORITHM,</div><div class='hunk'>@@ -5165,26 +5117,24 @@ static int send_verity(struct send_ctx *sctx, struct fs_path *path,</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int process_verity(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(fs_info-&gt;sb, sctx-&gt;cur_ino, sctx-&gt;send_root);</div><div class='add'>+	inode = btrfs_iget(sctx-&gt;cur_ino, sctx-&gt;send_root);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return PTR_ERR(inode);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_get_verity_descriptor(inode, NULL, 0);</div><div class='add'>+	ret = btrfs_get_verity_descriptor(&amp;inode-&gt;vfs_inode, NULL, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto iput;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; FS_VERITY_MAX_DESCRIPTOR_SIZE) {</div><div class='add'>+	if (unlikely(ret &gt; FS_VERITY_MAX_DESCRIPTOR_SIZE)) {</div><div class='ctx'> 		ret = -EMSGSIZE;</div><div class='ctx'> 		goto iput;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5197,27 +5147,19 @@ static int process_verity(struct send_ctx *sctx)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_get_verity_descriptor(inode, sctx-&gt;verity_descriptor, ret);</div><div class='add'>+	ret = btrfs_get_verity_descriptor(&amp;inode-&gt;vfs_inode, sctx-&gt;verity_descriptor, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto iput;</div><div class='ctx'> </div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	p = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(p)) {</div><div class='add'>+		ret = PTR_ERR(p);</div><div class='ctx'> 		goto iput;</div><div class='ctx'> 	}</div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto free_path;</div><div class='ctx'> </div><div class='ctx'> 	ret = send_verity(sctx, p, sctx-&gt;verity_descriptor);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto free_path;</div><div class='del'>-</div><div class='del'>-free_path:</div><div class='del'>-	fs_path_free(p);</div><div class='ctx'> iput:</div><div class='del'>-	iput(inode);</div><div class='add'>+	iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5236,14 +5178,14 @@ static int put_data_header(struct send_ctx *sctx, u32 len)</div><div class='ctx'> 		 * Since v2, the data attribute header doesn't include a length,</div><div class='ctx'> 		 * it is implicitly to the end of the command.</div><div class='ctx'> 		 */</div><div class='del'>-		if (sctx-&gt;send_max_size - sctx-&gt;send_size &lt; sizeof(__le16) + len)</div><div class='add'>+		if (unlikely(sctx-&gt;send_max_size - sctx-&gt;send_size &lt; sizeof(__le16) + len))</div><div class='ctx'> 			return -EOVERFLOW;</div><div class='ctx'> 		put_unaligned_le16(BTRFS_SEND_A_DATA, sctx-&gt;send_buf + sctx-&gt;send_size);</div><div class='ctx'> 		sctx-&gt;send_size += sizeof(__le16);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct btrfs_tlv_header *hdr;</div><div class='ctx'> </div><div class='del'>-		if (sctx-&gt;send_max_size - sctx-&gt;send_size &lt; sizeof(*hdr) + len)</div><div class='add'>+		if (unlikely(sctx-&gt;send_max_size - sctx-&gt;send_size &lt; sizeof(*hdr) + len))</div><div class='ctx'> 			return -EOVERFLOW;</div><div class='ctx'> 		hdr = (struct btrfs_tlv_header *)(sctx-&gt;send_buf + sctx-&gt;send_size);</div><div class='ctx'> 		put_unaligned_le16(BTRFS_SEND_A_DATA, &amp;hdr-&gt;tlv_type);</div><div class='hunk'>@@ -5257,63 +5199,66 @@ static int put_file_data(struct send_ctx *sctx, u64 offset, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = sctx-&gt;send_root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t last_index;</div><div class='del'>-	unsigned pg_offset = offset_in_page(offset);</div><div class='add'>+	u64 cur = offset;</div><div class='add'>+	const u64 end = offset + len;</div><div class='add'>+	const pgoff_t last_index = ((end - 1) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	struct address_space *mapping = sctx-&gt;cur_inode-&gt;i_mapping;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = put_data_header(sctx, len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	last_index = (offset + len - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	while (index &lt;= last_index) {</div><div class='del'>-		unsigned cur_len = min_t(unsigned, len,</div><div class='del'>-					 PAGE_SIZE - pg_offset);</div><div class='add'>+	while (cur &lt; end) {</div><div class='add'>+		pgoff_t index = (cur &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		unsigned int cur_len;</div><div class='add'>+		unsigned int pg_offset;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='del'>-		page = find_lock_page(sctx-&gt;cur_inode-&gt;i_mapping, index);</div><div class='del'>-		if (!page) {</div><div class='del'>-			page_cache_sync_readahead(sctx-&gt;cur_inode-&gt;i_mapping,</div><div class='add'>+		folio = filemap_lock_folio(mapping, index);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			page_cache_sync_readahead(mapping,</div><div class='ctx'> 						  &amp;sctx-&gt;ra, NULL, index,</div><div class='ctx'> 						  last_index + 1 - index);</div><div class='ctx'> </div><div class='del'>-			page = find_or_create_page(sctx-&gt;cur_inode-&gt;i_mapping,</div><div class='del'>-						   index, GFP_KERNEL);</div><div class='del'>-			if (!page) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='add'>+	                folio = filemap_grab_folio(mapping, index);</div><div class='add'>+			if (IS_ERR(folio)) {</div><div class='add'>+				ret = PTR_ERR(folio);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (PageReadahead(page))</div><div class='del'>-			page_cache_async_readahead(sctx-&gt;cur_inode-&gt;i_mapping,</div><div class='del'>-						   &amp;sctx-&gt;ra, NULL, page_folio(page),</div><div class='del'>-						   index, last_index + 1 - index);</div><div class='del'>-</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='del'>-			btrfs_read_folio(NULL, page_folio(page));</div><div class='del'>-			lock_page(page);</div><div class='del'>-			if (!PageUptodate(page)) {</div><div class='del'>-				unlock_page(page);</div><div class='add'>+		pg_offset = offset_in_folio(folio, cur);</div><div class='add'>+		cur_len = min_t(unsigned int, end - cur, folio_size(folio) - pg_offset);</div><div class='add'>+</div><div class='add'>+		if (folio_test_readahead(folio))</div><div class='add'>+			page_cache_async_readahead(mapping, &amp;sctx-&gt;ra, NULL, folio,</div><div class='add'>+						   last_index + 1 - index);</div><div class='add'>+</div><div class='add'>+		if (!folio_test_uptodate(folio)) {</div><div class='add'>+			btrfs_read_folio(NULL, folio);</div><div class='add'>+			folio_lock(folio);</div><div class='add'>+			if (unlikely(!folio_test_uptodate(folio))) {</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				btrfs_err(fs_info,</div><div class='ctx'> 			"send: IO error at offset %llu for inode %llu root %llu",</div><div class='del'>-					page_offset(page), sctx-&gt;cur_ino,</div><div class='del'>-					sctx-&gt;send_root-&gt;root_key.objectid);</div><div class='del'>-				put_page(page);</div><div class='add'>+					folio_pos(folio), sctx-&gt;cur_ino,</div><div class='add'>+					btrfs_root_id(sctx-&gt;send_root));</div><div class='add'>+				folio_put(folio);</div><div class='ctx'> 				ret = -EIO;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			if (folio-&gt;mapping != mapping) {</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				folio_put(folio);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memcpy_from_page(sctx-&gt;send_buf + sctx-&gt;send_size, page,</div><div class='del'>-				 pg_offset, cur_len);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		index++;</div><div class='del'>-		pg_offset = 0;</div><div class='del'>-		len -= cur_len;</div><div class='add'>+		memcpy_from_folio(sctx-&gt;send_buf + sctx-&gt;send_size, folio,</div><div class='add'>+				  pg_offset, cur_len);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='add'>+		cur += cur_len;</div><div class='ctx'> 		sctx-&gt;send_size += cur_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5326,35 +5271,26 @@ static int put_file_data(struct send_ctx *sctx, u64 offset, u32 len)</div><div class='ctx'>  */</div><div class='ctx'> static int send_write(struct send_ctx *sctx, u64 offset, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	btrfs_debug(fs_info, "send_write offset=%llu, len=%d", offset, len);</div><div class='add'>+	p = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_WRITE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);</div><div class='ctx'> 	ret = put_file_data(sctx, offset, len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='del'>-	fs_path_free(p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5367,12 +5303,12 @@ static int send_clone(struct send_ctx *sctx,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='add'>+	struct fs_path *cur_inode_path;</div><div class='ctx'> 	u64 gen;</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(sctx-&gt;send_root-&gt;fs_info,</div><div class='del'>-		    "send_clone offset=%llu, len=%d, clone_root=%llu, clone_inode=%llu, clone_offset=%llu",</div><div class='del'>-		    offset, len, clone_root-&gt;root-&gt;root_key.objectid,</div><div class='del'>-		    clone_root-&gt;ino, clone_root-&gt;offset);</div><div class='add'>+	cur_inode_path = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(cur_inode_path))</div><div class='add'>+		return PTR_ERR(cur_inode_path);</div><div class='ctx'> </div><div class='ctx'> 	p = fs_path_alloc();</div><div class='ctx'> 	if (!p)</div><div class='hunk'>@@ -5382,13 +5318,9 @@ static int send_clone(struct send_ctx *sctx,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_LEN, len);</div><div class='del'>-	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='add'>+	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, cur_inode_path);</div><div class='ctx'> </div><div class='ctx'> 	if (clone_root-&gt;root == sctx-&gt;send_root) {</div><div class='ctx'> 		ret = get_inode_gen(sctx-&gt;send_root, clone_root-&gt;ino, &amp;gen);</div><div class='hunk'>@@ -5439,27 +5371,45 @@ static int send_update_extent(struct send_ctx *sctx,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct fs_path *p;</div><div class='ctx'> </div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	p = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_UPDATE_EXTENT);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='add'>+	TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);</div><div class='add'>+	TLV_PUT_U64(sctx, BTRFS_SEND_A_SIZE, len);</div><div class='add'>+</div><div class='add'>+	ret = send_cmd(sctx);</div><div class='add'>+</div><div class='add'>+tlv_put_failure:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int send_fallocate(struct send_ctx *sctx, u32 mode, u64 offset, u64 len)</div><div class='add'>+{</div><div class='add'>+	struct fs_path *path;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	path = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return PTR_ERR(path);</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='add'>+	ret = begin_cmd(sctx, BTRFS_SEND_C_FALLOCATE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);</div><div class='add'>+	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);</div><div class='add'>+	TLV_PUT_U32(sctx, BTRFS_SEND_A_FALLOCATE_MODE, mode);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);</div><div class='ctx'> 	TLV_PUT_U64(sctx, BTRFS_SEND_A_SIZE, len);</div><div class='ctx'> </div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='del'>-	fs_path_free(p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5471,6 +5421,14 @@ static int send_hole(struct send_ctx *sctx, u64 end)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Starting with send stream v2 we have fallocate and can use it to</div><div class='add'>+	 * punch holes instead of sending writes full of zeroes.</div><div class='add'>+	 */</div><div class='add'>+	if (proto_cmd_ok(sctx, BTRFS_SEND_C_FALLOCATE))</div><div class='add'>+		return send_fallocate(sctx, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,</div><div class='add'>+				      offset, end - offset);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * A hole that starts at EOF or beyond it. Since we do not yet support</div><div class='ctx'> 	 * fallocate (for extent preallocation and hole punching), sending a</div><div class='ctx'> 	 * write of zeroes starting at EOF or beyond would later require issuing</div><div class='hunk'>@@ -5488,12 +5446,10 @@ static int send_hole(struct send_ctx *sctx, u64 end)</div><div class='ctx'> 	if (sctx-&gt;flags &amp; BTRFS_SEND_FLAG_NO_FILE_DATA)</div><div class='ctx'> 		return send_update_extent(sctx, offset, end - offset);</div><div class='ctx'> </div><div class='del'>-	p = fs_path_alloc();</div><div class='del'>-	if (!p)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, p);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto tlv_put_failure;</div><div class='add'>+	p = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='add'>+</div><div class='ctx'> 	while (offset &lt; end) {</div><div class='ctx'> 		u64 len = min(end - offset, read_size);</div><div class='ctx'> </div><div class='hunk'>@@ -5514,7 +5470,6 @@ static int send_hole(struct send_ctx *sctx, u64 end)</div><div class='ctx'> 	}</div><div class='ctx'> 	sctx-&gt;cur_inode_next_write_offset = offset;</div><div class='ctx'> tlv_put_failure:</div><div class='del'>-	fs_path_free(p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5522,9 +5477,7 @@ static int send_encoded_inline_extent(struct send_ctx *sctx,</div><div class='ctx'> 				      struct btrfs_path *path, u64 offset,</div><div class='ctx'> 				      u64 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = sctx-&gt;send_root;</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_fs_info *fs_info = sctx-&gt;send_root-&gt;fs_info;</div><div class='ctx'> 	struct fs_path *fspath;</div><div class='ctx'> 	struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -5533,23 +5486,13 @@ static int send_encoded_inline_extent(struct send_ctx *sctx,</div><div class='ctx'> 	size_t inline_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(fs_info-&gt;sb, sctx-&gt;cur_ino, root);</div><div class='del'>-	if (IS_ERR(inode))</div><div class='del'>-		return PTR_ERR(inode);</div><div class='del'>-</div><div class='del'>-	fspath = fs_path_alloc();</div><div class='del'>-	if (!fspath) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	fspath = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(fspath))</div><div class='add'>+		return PTR_ERR(fspath);</div><div class='ctx'> </div><div class='ctx'> 	ret = begin_cmd(sctx, BTRFS_SEND_C_ENCODED_WRITE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, fspath);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='hunk'>@@ -5565,12 +5508,12 @@ static int send_encoded_inline_extent(struct send_ctx *sctx,</div><div class='ctx'> 	ret = btrfs_encoded_io_compression_from_extent(fs_info,</div><div class='ctx'> 				btrfs_file_extent_compression(leaf, ei));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	TLV_PUT_U32(sctx, BTRFS_SEND_A_COMPRESSION, ret);</div><div class='ctx'> </div><div class='ctx'> 	ret = put_data_header(sctx, inline_size);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	read_extent_buffer(leaf, sctx-&gt;send_buf + sctx-&gt;send_size,</div><div class='ctx'> 			   btrfs_file_extent_inline_start(ei), inline_size);</div><div class='ctx'> 	sctx-&gt;send_size += inline_size;</div><div class='hunk'>@@ -5578,9 +5521,6 @@ static int send_encoded_inline_extent(struct send_ctx *sctx,</div><div class='ctx'> 	ret = send_cmd(sctx);</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='del'>-out:</div><div class='del'>-	fs_path_free(fspath);</div><div class='del'>-	iput(inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5589,7 +5529,7 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = sctx-&gt;send_root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct fs_path *fspath;</div><div class='ctx'> 	struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -5600,13 +5540,13 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> 	u32 crc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(fs_info-&gt;sb, sctx-&gt;cur_ino, root);</div><div class='add'>+	inode = btrfs_iget(sctx-&gt;cur_ino, root);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return PTR_ERR(inode);</div><div class='ctx'> </div><div class='del'>-	fspath = fs_path_alloc();</div><div class='del'>-	if (!fspath) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	fspath = get_cur_inode_path(sctx);</div><div class='add'>+	if (IS_ERR(fspath)) {</div><div class='add'>+		ret = PTR_ERR(fspath);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5614,10 +5554,6 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, fspath);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 	ei = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_file_extent_item);</div><div class='ctx'> 	disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, ei);</div><div class='hunk'>@@ -5649,8 +5585,8 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> 	 * between the beginning of the command and the file data.</div><div class='ctx'> 	 */</div><div class='ctx'> 	data_offset = PAGE_ALIGN(sctx-&gt;send_size);</div><div class='del'>-	if (data_offset &gt; sctx-&gt;send_max_size ||</div><div class='del'>-	    sctx-&gt;send_max_size - data_offset &lt; disk_num_bytes) {</div><div class='add'>+	if (unlikely(data_offset &gt; sctx-&gt;send_max_size ||</div><div class='add'>+		     sctx-&gt;send_max_size - data_offset &lt; disk_num_bytes)) {</div><div class='ctx'> 		ret = -EOVERFLOW;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5659,10 +5595,11 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> 	 * Note that send_buf is a mapping of send_buf_pages, so this is really</div><div class='ctx'> 	 * reading into send_buf.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_encoded_read_regular_fill_pages(BTRFS_I(inode), offset,</div><div class='add'>+	ret = btrfs_encoded_read_regular_fill_pages(inode,</div><div class='ctx'> 						    disk_bytenr, disk_num_bytes,</div><div class='ctx'> 						    sctx-&gt;send_buf_pages +</div><div class='del'>-						    (data_offset &gt;&gt; PAGE_SHIFT));</div><div class='add'>+						    (data_offset &gt;&gt; PAGE_SHIFT),</div><div class='add'>+						    NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -5684,8 +5621,7 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> </div><div class='ctx'> tlv_put_failure:</div><div class='ctx'> out:</div><div class='del'>-	fs_path_free(fspath);</div><div class='del'>-	iput(inode);</div><div class='add'>+	iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5727,15 +5663,14 @@ static int send_extent_data(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sctx-&gt;cur_inode == NULL) {</div><div class='add'>+		struct btrfs_inode *btrfs_inode;</div><div class='ctx'> 		struct btrfs_root *root = sctx-&gt;send_root;</div><div class='ctx'> </div><div class='del'>-		sctx-&gt;cur_inode = btrfs_iget(root-&gt;fs_info-&gt;sb, sctx-&gt;cur_ino, root);</div><div class='del'>-		if (IS_ERR(sctx-&gt;cur_inode)) {</div><div class='del'>-			int err = PTR_ERR(sctx-&gt;cur_inode);</div><div class='add'>+		btrfs_inode = btrfs_iget(sctx-&gt;cur_ino, root);</div><div class='add'>+		if (IS_ERR(btrfs_inode))</div><div class='add'>+			return PTR_ERR(btrfs_inode);</div><div class='ctx'> </div><div class='del'>-			sctx-&gt;cur_inode = NULL;</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+		sctx-&gt;cur_inode = &amp;btrfs_inode-&gt;vfs_inode;</div><div class='ctx'> 		memset(&amp;sctx-&gt;ra, 0, sizeof(struct file_ra_state));</div><div class='ctx'> 		file_ra_state_init(&amp;sctx-&gt;ra, sctx-&gt;cur_inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -5814,12 +5749,11 @@ static int send_extent_data(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'>  */</div><div class='ctx'> static int send_capabilities(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	struct fs_path *fspath = NULL;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	unsigned long data_ptr;</div><div class='del'>-	char *buf = NULL;</div><div class='add'>+	char AUTO_KFREE(buf);</div><div class='ctx'> 	int buf_len;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -5831,35 +5765,23 @@ static int send_capabilities(struct send_ctx *sctx)</div><div class='ctx'> 				XATTR_NAME_CAPS, strlen(XATTR_NAME_CAPS), 0);</div><div class='ctx'> 	if (!di) {</div><div class='ctx'> 		/* There is no xattr for this inode */</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	} else if (IS_ERR(di)) {</div><div class='del'>-		ret = PTR_ERR(di);</div><div class='del'>-		goto out;</div><div class='add'>+		return PTR_ERR(di);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	buf_len = btrfs_dir_data_len(leaf, di);</div><div class='ctx'> </div><div class='del'>-	fspath = fs_path_alloc();</div><div class='ctx'> 	buf = kmalloc(buf_len, GFP_KERNEL);</div><div class='del'>-	if (!fspath || !buf) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = get_cur_path(sctx, sctx-&gt;cur_ino, sctx-&gt;cur_inode_gen, fspath);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	data_ptr = (unsigned long)(di + 1) + btrfs_dir_name_len(leaf, di);</div><div class='ctx'> 	read_extent_buffer(leaf, buf, data_ptr, buf_len);</div><div class='ctx'> </div><div class='del'>-	ret = send_set_xattr(sctx, fspath, XATTR_NAME_CAPS,</div><div class='add'>+	ret = send_set_xattr(sctx, XATTR_NAME_CAPS,</div><div class='ctx'> 			strlen(XATTR_NAME_CAPS), buf, buf_len);</div><div class='del'>-out:</div><div class='del'>-	kfree(buf);</div><div class='del'>-	fs_path_free(fspath);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5867,7 +5789,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 		       struct clone_root *clone_root, const u64 disk_byte,</div><div class='ctx'> 		       u64 data_offset, u64 offset, u64 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_inode_info info;</div><div class='hunk'>@@ -5903,7 +5825,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 	ret = get_inode_info(clone_root-&gt;root, clone_root-&gt;ino, &amp;info);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	clone_src_i_size = info.size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5933,7 +5855,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 	key.offset = clone_root-&gt;offset;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, clone_root-&gt;root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret &gt; 0 &amp;&amp; path-&gt;slots[0] &gt; 0) {</div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0] - 1);</div><div class='ctx'> 		if (key.objectid == clone_root-&gt;ino &amp;&amp;</div><div class='hunk'>@@ -5954,7 +5876,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 		if (slot &gt;= btrfs_header_nritems(leaf)) {</div><div class='ctx'> 			ret = btrfs_next_leaf(clone_root-&gt;root, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 			else if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -5991,7 +5913,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 			ret = send_extent_data(sctx, dst_path, offset,</div><div class='ctx'> 					       hole_len);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> </div><div class='ctx'> 			len -= hole_len;</div><div class='ctx'> 			if (len == 0)</div><div class='hunk'>@@ -6062,7 +5984,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 					ret = send_clone(sctx, offset, slen,</div><div class='ctx'> 							 clone_root);</div><div class='ctx'> 					if (ret &lt; 0)</div><div class='del'>-						goto out;</div><div class='add'>+						return ret;</div><div class='ctx'> 				}</div><div class='ctx'> 				ret = send_extent_data(sctx, dst_path,</div><div class='ctx'> 						       offset + slen,</div><div class='hunk'>@@ -6096,7 +6018,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		len -= clone_len;</div><div class='ctx'> 		if (len == 0)</div><div class='hunk'>@@ -6127,8 +6049,6 @@ next:</div><div class='ctx'> 		ret = send_extent_data(sctx, dst_path, offset, len);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6140,26 +6060,73 @@ static int send_write_or_clone(struct send_ctx *sctx,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u64 offset = key-&gt;offset;</div><div class='ctx'> 	u64 end;</div><div class='del'>-	u64 bs = sctx-&gt;send_root-&gt;fs_info-&gt;sb-&gt;s_blocksize;</div><div class='add'>+	u64 bs = sctx-&gt;send_root-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+	struct btrfs_file_extent_item *ei;</div><div class='add'>+	u64 disk_byte;</div><div class='add'>+	u64 data_offset;</div><div class='add'>+	u64 num_bytes;</div><div class='add'>+	struct btrfs_inode_info info = { 0 };</div><div class='ctx'> </div><div class='ctx'> 	end = min_t(u64, btrfs_file_extent_end(path), sctx-&gt;cur_inode_size);</div><div class='ctx'> 	if (offset &gt;= end)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (clone_root &amp;&amp; IS_ALIGNED(end, bs)) {</div><div class='del'>-		struct btrfs_file_extent_item *ei;</div><div class='del'>-		u64 disk_byte;</div><div class='del'>-		u64 data_offset;</div><div class='add'>+	num_bytes = end - offset;</div><div class='ctx'> </div><div class='del'>-		ei = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='del'>-				    struct btrfs_file_extent_item);</div><div class='del'>-		disk_byte = btrfs_file_extent_disk_bytenr(path-&gt;nodes[0], ei);</div><div class='del'>-		data_offset = btrfs_file_extent_offset(path-&gt;nodes[0], ei);</div><div class='del'>-		ret = clone_range(sctx, path, clone_root, disk_byte,</div><div class='del'>-				  data_offset, offset, end - offset);</div><div class='del'>-	} else {</div><div class='del'>-		ret = send_extent_data(sctx, path, offset, end - offset);</div><div class='add'>+	if (!clone_root)</div><div class='add'>+		goto write_data;</div><div class='add'>+</div><div class='add'>+	if (IS_ALIGNED(end, bs))</div><div class='add'>+		goto clone_data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the extent end is not aligned, we can clone if the extent ends at</div><div class='add'>+	 * the i_size of the inode and the clone range ends at the i_size of the</div><div class='add'>+	 * source inode, otherwise the clone operation fails with -EINVAL.</div><div class='add'>+	 */</div><div class='add'>+	if (end != sctx-&gt;cur_inode_size)</div><div class='add'>+		goto write_data;</div><div class='add'>+</div><div class='add'>+	ret = get_inode_info(clone_root-&gt;root, clone_root-&gt;ino, &amp;info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (clone_root-&gt;offset + num_bytes == info.size) {</div><div class='add'>+		/*</div><div class='add'>+		 * The final size of our file matches the end offset, but it may</div><div class='add'>+		 * be that its current size is larger, so we have to truncate it</div><div class='add'>+		 * to any value between the start offset of the range and the</div><div class='add'>+		 * final i_size, otherwise the clone operation is invalid</div><div class='add'>+		 * because it's unaligned and it ends before the current EOF.</div><div class='add'>+		 * We do this truncate to the final i_size when we finish</div><div class='add'>+		 * processing the inode, but it's too late by then. And here we</div><div class='add'>+		 * truncate to the start offset of the range because it's always</div><div class='add'>+		 * sector size aligned while if it were the final i_size it</div><div class='add'>+		 * would result in dirtying part of a page, filling part of a</div><div class='add'>+		 * page with zeroes and then having the clone operation at the</div><div class='add'>+		 * receiver trigger IO and wait for it due to the dirty page.</div><div class='add'>+		 */</div><div class='add'>+		if (sctx-&gt;parent_root != NULL) {</div><div class='add'>+			ret = send_truncate(sctx, sctx-&gt;cur_ino,</div><div class='add'>+					    sctx-&gt;cur_inode_gen, offset);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		goto clone_data;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+write_data:</div><div class='add'>+	ret = send_extent_data(sctx, path, offset, num_bytes);</div><div class='add'>+	sctx-&gt;cur_inode_next_write_offset = end;</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+clone_data:</div><div class='add'>+	ei = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='add'>+			    struct btrfs_file_extent_item);</div><div class='add'>+	disk_byte = btrfs_file_extent_disk_bytenr(path-&gt;nodes[0], ei);</div><div class='add'>+	data_offset = btrfs_file_extent_offset(path-&gt;nodes[0], ei);</div><div class='add'>+	ret = clone_range(sctx, path, clone_root, disk_byte, data_offset, offset,</div><div class='add'>+			  num_bytes);</div><div class='ctx'> 	sctx-&gt;cur_inode_next_write_offset = end;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -6170,7 +6137,7 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='hunk'>@@ -6196,10 +6163,9 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 	ei = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item);</div><div class='ctx'> 	left_type = btrfs_file_extent_type(eb, ei);</div><div class='ctx'> </div><div class='del'>-	if (left_type != BTRFS_FILE_EXTENT_REG) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (left_type != BTRFS_FILE_EXTENT_REG)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	left_disknr = btrfs_file_extent_disk_bytenr(eb, ei);</div><div class='ctx'> 	left_len = btrfs_file_extent_num_bytes(eb, ei);</div><div class='ctx'> 	left_offset = btrfs_file_extent_offset(eb, ei);</div><div class='hunk'>@@ -6231,11 +6197,9 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 	key.offset = ekey-&gt;offset;</div><div class='ctx'> 	ret = btrfs_search_slot_for_read(sctx-&gt;parent_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Handle special case where the right side has no extents at all.</div><div class='hunk'>@@ -6244,11 +6208,9 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='ctx'> 	btrfs_item_key_to_cpu(eb, &amp;found_key, slot);</div><div class='ctx'> 	if (found_key.objectid != key.objectid ||</div><div class='del'>-	    found_key.type != key.type) {</div><div class='add'>+	    found_key.type != key.type)</div><div class='ctx'> 		/* If we're a hole then just pretend nothing changed */</div><div class='del'>-		ret = (left_disknr) ? 0 : 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		return (left_disknr ? 0 : 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're now on 2a, 2b or 7.</div><div class='hunk'>@@ -6258,10 +6220,8 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 		ei = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item);</div><div class='ctx'> 		right_type = btrfs_file_extent_type(eb, ei);</div><div class='ctx'> 		if (right_type != BTRFS_FILE_EXTENT_REG &amp;&amp;</div><div class='del'>-		    right_type != BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		    right_type != BTRFS_FILE_EXTENT_INLINE)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		if (right_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='ctx'> 			right_len = btrfs_file_extent_ram_bytes(eb, ei);</div><div class='hunk'>@@ -6274,11 +6234,9 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 		 * Are we at extent 8? If yes, we know the extent is changed.</div><div class='ctx'> 		 * This may only happen on the first iteration.</div><div class='ctx'> 		 */</div><div class='del'>-		if (found_key.offset + right_len &lt;= ekey-&gt;offset) {</div><div class='add'>+		if (found_key.offset + right_len &lt;= ekey-&gt;offset)</div><div class='ctx'> 			/* If we're a hole just pretend nothing changed */</div><div class='del'>-			ret = (left_disknr) ? 0 : 1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+			return (left_disknr ? 0 : 1);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We just wanted to see if when we have an inline extent, what</div><div class='hunk'>@@ -6288,10 +6246,8 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 		 * compressed extent representing data with a size matching</div><div class='ctx'> 		 * the page size (currently the same as sector size).</div><div class='ctx'> 		 */</div><div class='del'>-		if (right_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (right_type == BTRFS_FILE_EXTENT_INLINE)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		right_disknr = btrfs_file_extent_disk_bytenr(eb, ei);</div><div class='ctx'> 		right_offset = btrfs_file_extent_offset(eb, ei);</div><div class='hunk'>@@ -6311,17 +6267,15 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (left_disknr != right_disknr ||</div><div class='ctx'> 		    left_offset_fixed != right_offset ||</div><div class='del'>-		    left_gen != right_gen) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		    left_gen != right_gen)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Go to the next extent.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = btrfs_next_item(sctx-&gt;parent_root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			eb = path-&gt;nodes[0];</div><div class='ctx'> 			slot = path-&gt;slots[0];</div><div class='hunk'>@@ -6332,10 +6286,9 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 			key.offset += right_len;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (found_key.offset != key.offset + right_len) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (found_key.offset != key.offset + right_len)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='ctx'> 		key = found_key;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6348,15 +6301,12 @@ static int is_extent_unchanged(struct send_ctx *sctx,</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_last_extent(struct send_ctx *sctx, u64 offset)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = sctx-&gt;send_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -6372,15 +6322,13 @@ static int get_last_extent(struct send_ctx *sctx, u64 offset)</div><div class='ctx'> 	key.offset = offset;</div><div class='ctx'> 	ret = btrfs_search_slot_for_read(root, &amp;key, path, 0, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 	if (key.objectid != sctx-&gt;cur_ino || key.type != BTRFS_EXTENT_DATA_KEY)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;cur_inode_last_extent = btrfs_file_extent_end(path);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6388,7 +6336,7 @@ static int range_is_hole_in_parent(struct send_ctx *sctx,</div><div class='ctx'> 				   const u64 start,</div><div class='ctx'> 				   const u64 end)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_root *root = sctx-&gt;parent_root;</div><div class='ctx'> 	u64 search_start = start;</div><div class='hunk'>@@ -6403,7 +6351,7 @@ static int range_is_hole_in_parent(struct send_ctx *sctx,</div><div class='ctx'> 	key.offset = search_start;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret &gt; 0 &amp;&amp; path-&gt;slots[0] &gt; 0)</div><div class='ctx'> 		path-&gt;slots[0]--;</div><div class='ctx'> </div><div class='hunk'>@@ -6416,8 +6364,8 @@ static int range_is_hole_in_parent(struct send_ctx *sctx,</div><div class='ctx'> 		if (slot &gt;= btrfs_header_nritems(leaf)) {</div><div class='ctx'> 			ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			else if (ret &gt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6439,15 +6387,11 @@ static int range_is_hole_in_parent(struct send_ctx *sctx,</div><div class='ctx'> 			search_start = extent_end;</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> next:</div><div class='ctx'> 		path-&gt;slots[0]++;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 1;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int maybe_send_hole(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='hunk'>@@ -6458,21 +6402,18 @@ static int maybe_send_hole(struct send_ctx *sctx, struct btrfs_path *path,</div><div class='ctx'> 	if (sctx-&gt;cur_ino != key-&gt;objectid || !need_send_hole(sctx))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (sctx-&gt;cur_inode_last_extent == (u64)-1) {</div><div class='del'>-		ret = get_last_extent(sctx, key-&gt;offset - 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (path-&gt;slots[0] == 0 &amp;&amp;</div><div class='del'>-	    sctx-&gt;cur_inode_last_extent &lt; key-&gt;offset) {</div><div class='del'>-		/*</div><div class='del'>-		 * We might have skipped entire leafs that contained only</div><div class='del'>-		 * file extent items for our current inode. These leafs have</div><div class='del'>-		 * a generation number smaller (older) than the one in the</div><div class='del'>-		 * current leaf and the leaf our last extent came from, and</div><div class='del'>-		 * are located between these 2 leafs.</div><div class='del'>-		 */</div><div class='add'>+	/*</div><div class='add'>+	 * Get last extent's end offset (exclusive) if we haven't determined it</div><div class='add'>+	 * yet (we're processing the first file extent item that is new), or if</div><div class='add'>+	 * we're at the first slot of a leaf and the last extent's end is less</div><div class='add'>+	 * than the current extent's offset, because we might have skipped</div><div class='add'>+	 * entire leaves that contained only file extent items for our current</div><div class='add'>+	 * inode. These leaves have a generation number smaller (older) than the</div><div class='add'>+	 * one in the current leaf and the leaf our last extent came from, and</div><div class='add'>+	 * are located between these 2 leaves.</div><div class='add'>+	 */</div><div class='add'>+	if ((sctx-&gt;cur_inode_last_extent == (u64)-1) ||</div><div class='add'>+	    (path-&gt;slots[0] == 0 &amp;&amp; sctx-&gt;cur_inode_last_extent &lt; key-&gt;offset)) {</div><div class='ctx'> 		ret = get_last_extent(sctx, key-&gt;offset - 1);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -6558,7 +6499,7 @@ static int process_all_extents(struct send_ctx *sctx)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int iter_ret = 0;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> </div><div class='hunk'>@@ -6585,11 +6526,10 @@ static int process_all_extents(struct send_ctx *sctx)</div><div class='ctx'> 	if (iter_ret &lt; 0)</div><div class='ctx'> 		ret = iter_ret;</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int process_recorded_refs_if_needed(struct send_ctx *sctx, int at_end,</div><div class='add'>+static int process_recorded_refs_if_needed(struct send_ctx *sctx, bool at_end,</div><div class='ctx'> 					   int *pending_move,</div><div class='ctx'> 					   int *refs_processed)</div><div class='ctx'> {</div><div class='hunk'>@@ -6612,7 +6552,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)</div><div class='add'>+static int finish_inode_if_needed(struct send_ctx *sctx, bool at_end)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_inode_info info;</div><div class='hunk'>@@ -6705,11 +6645,20 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					goto out;</div><div class='ctx'> 			}</div><div class='del'>-			if (sctx-&gt;cur_inode_last_extent &lt;</div><div class='del'>-			    sctx-&gt;cur_inode_size) {</div><div class='del'>-				ret = send_hole(sctx, sctx-&gt;cur_inode_size);</div><div class='del'>-				if (ret)</div><div class='add'>+			if (sctx-&gt;cur_inode_last_extent &lt; sctx-&gt;cur_inode_size) {</div><div class='add'>+				ret = range_is_hole_in_parent(sctx,</div><div class='add'>+						      sctx-&gt;cur_inode_last_extent,</div><div class='add'>+						      sctx-&gt;cur_inode_size);</div><div class='add'>+				if (ret &lt; 0) {</div><div class='ctx'> 					goto out;</div><div class='add'>+				} else if (ret == 0) {</div><div class='add'>+					ret = send_hole(sctx, sctx-&gt;cur_inode_size);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						goto out;</div><div class='add'>+				} else {</div><div class='add'>+					/* Range is already a hole, skip. */</div><div class='add'>+					ret = 0;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (need_truncate) {</div><div class='hunk'>@@ -6831,6 +6780,7 @@ static int changed_inode(struct send_ctx *sctx,</div><div class='ctx'> 	sctx-&gt;cur_inode_last_extent = (u64)-1;</div><div class='ctx'> 	sctx-&gt;cur_inode_next_write_offset = 0;</div><div class='ctx'> 	sctx-&gt;ignore_cur_inode = false;</div><div class='add'>+	fs_path_reset(&amp;sctx-&gt;cur_inode_path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set send_progress to current inode. This will tell all get_cur_xxx</div><div class='hunk'>@@ -7037,7 +6987,7 @@ static int changed_ref(struct send_ctx *sctx,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (sctx-&gt;cur_ino != sctx-&gt;cmp_key-&gt;objectid) {</div><div class='add'>+	if (unlikely(sctx-&gt;cur_ino != sctx-&gt;cmp_key-&gt;objectid)) {</div><div class='ctx'> 		inconsistent_snapshot_error(sctx, result, "reference");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7065,7 +7015,7 @@ static int changed_xattr(struct send_ctx *sctx,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (sctx-&gt;cur_ino != sctx-&gt;cmp_key-&gt;objectid) {</div><div class='add'>+	if (unlikely(sctx-&gt;cur_ino != sctx-&gt;cmp_key-&gt;objectid)) {</div><div class='ctx'> 		inconsistent_snapshot_error(sctx, result, "xattr");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7119,13 +7069,11 @@ static int changed_extent(struct send_ctx *sctx,</div><div class='ctx'> </div><div class='ctx'> static int changed_verity(struct send_ctx *sctx, enum btrfs_compare_tree_result result)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='ctx'> 	if (!sctx-&gt;cur_inode_new_gen &amp;&amp; !sctx-&gt;cur_inode_deleted) {</div><div class='ctx'> 		if (result == BTRFS_COMPARE_TREE_NEW)</div><div class='ctx'> 			sctx-&gt;cur_inode_needs_verity = true;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dir_changed(struct send_ctx *sctx, u64 dir)</div><div class='hunk'>@@ -7194,7 +7142,7 @@ static int changed_cb(struct btrfs_path *left_path,</div><div class='ctx'> 		      enum btrfs_compare_tree_result result,</div><div class='ctx'> 		      struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can not hold the commit root semaphore here. This is because in</div><div class='hunk'>@@ -7254,7 +7202,6 @@ static int changed_cb(struct btrfs_path *left_path,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		result = BTRFS_COMPARE_TREE_CHANGED;</div><div class='del'>-		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;left_path = left_path;</div><div class='hunk'>@@ -7308,13 +7255,13 @@ static int search_key_again(const struct send_ctx *sctx,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, key, path, 0, 0);</div><div class='ctx'> 	ASSERT(ret &lt;= 0);</div><div class='del'>-	if (ret &gt; 0) {</div><div class='add'>+	if (unlikely(ret &gt; 0)) {</div><div class='ctx'> 		btrfs_print_tree(path-&gt;nodes[path-&gt;lowest_level], false);</div><div class='ctx'> 		btrfs_err(root-&gt;fs_info,</div><div class='del'>-"send: key (%llu %u %llu) not found in %s root %llu, lowest_level %d, slot %d",</div><div class='del'>-			  key-&gt;objectid, key-&gt;type, key-&gt;offset,</div><div class='add'>+"send: key " BTRFS_KEY_FMT" not found in %s root %llu, lowest_level %d, slot %d",</div><div class='add'>+			  BTRFS_KEY_FMT_VALUE(key),</div><div class='ctx'> 			  (root == sctx-&gt;parent_root ? "parent" : "send"),</div><div class='del'>-			  root-&gt;root_key.objectid, path-&gt;lowest_level,</div><div class='add'>+			  btrfs_root_id(root), path-&gt;lowest_level,</div><div class='ctx'> 			  path-&gt;slots[path-&gt;lowest_level]);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7328,7 +7275,7 @@ static int full_send_tree(struct send_ctx *sctx)</div><div class='ctx'> 	struct btrfs_root *send_root = sctx-&gt;send_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = send_root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	path = alloc_path_for_send();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -7345,7 +7292,7 @@ static int full_send_tree(struct send_ctx *sctx)</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot_for_read(send_root, &amp;key, path, 1, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_finish;</div><div class='ctx'> </div><div class='hunk'>@@ -7355,7 +7302,7 @@ static int full_send_tree(struct send_ctx *sctx)</div><div class='ctx'> 		ret = changed_cb(path, NULL, &amp;key,</div><div class='ctx'> 				 BTRFS_COMPARE_TREE_NEW, sctx);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		down_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> 		if (fs_info-&gt;last_reloc_trans &gt; sctx-&gt;last_reloc_trans) {</div><div class='hunk'>@@ -7374,14 +7321,14 @@ static int full_send_tree(struct send_ctx *sctx)</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='ctx'> 			ret = search_key_again(sctx, send_root, path, &amp;key);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			up_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_next_item(send_root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ret  = 0;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -7389,11 +7336,7 @@ static int full_send_tree(struct send_ctx *sctx)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_finish:</div><div class='del'>-	ret = finish_inode_if_needed(sctx, 1);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return finish_inode_if_needed(sctx, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int replace_node_with_clone(struct btrfs_path *path, int level)</div><div class='hunk'>@@ -7420,8 +7363,8 @@ static int tree_move_down(struct btrfs_path *path, int *level, u64 reada_min_gen</div><div class='ctx'> 	u64 reada_done = 0;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held_read(&amp;parent-&gt;fs_info-&gt;commit_root_sem);</div><div class='add'>+	ASSERT(*level != 0);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(*level == 0);</div><div class='ctx'> 	eb = btrfs_read_node_slot(parent, slot);</div><div class='ctx'> 	if (IS_ERR(eb))</div><div class='ctx'> 		return PTR_ERR(eb);</div><div class='hunk'>@@ -7648,8 +7591,8 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = left_root-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int cmp;</div><div class='del'>-	struct btrfs_path *left_path = NULL;</div><div class='del'>-	struct btrfs_path *right_path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(left_path);</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(right_path);</div><div class='ctx'> 	struct btrfs_key left_key;</div><div class='ctx'> 	struct btrfs_key right_key;</div><div class='ctx'> 	char *tmp_buf = NULL;</div><div class='hunk'>@@ -7684,10 +7627,10 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	left_path-&gt;search_commit_root = 1;</div><div class='del'>-	left_path-&gt;skip_locking = 1;</div><div class='del'>-	right_path-&gt;search_commit_root = 1;</div><div class='del'>-	right_path-&gt;skip_locking = 1;</div><div class='add'>+	left_path-&gt;search_commit_root = true;</div><div class='add'>+	left_path-&gt;skip_locking = true;</div><div class='add'>+	right_path-&gt;search_commit_root = true;</div><div class='add'>+	right_path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Strategy: Go to the first items of both trees. Then do</div><div class='hunk'>@@ -7922,8 +7865,6 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	up_read(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(left_path);</div><div class='del'>-	btrfs_free_path(right_path);</div><div class='ctx'> 	kvfree(tmp_buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -7975,38 +7916,22 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int ensure_commit_roots_uptodate(struct send_ctx *sctx)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	struct btrfs_trans_handle *trans = NULL;</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	if (sctx-&gt;parent_root &amp;&amp;</div><div class='del'>-	    sctx-&gt;parent_root-&gt;node != sctx-&gt;parent_root-&gt;commit_root)</div><div class='del'>-		goto commit_trans;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sctx-&gt;clone_roots_cnt; i++)</div><div class='del'>-		if (sctx-&gt;clone_roots[i].root-&gt;node !=</div><div class='del'>-		    sctx-&gt;clone_roots[i].root-&gt;commit_root)</div><div class='del'>-			goto commit_trans;</div><div class='del'>-</div><div class='del'>-	if (trans)</div><div class='del'>-		return btrfs_end_transaction(trans);</div><div class='add'>+	struct btrfs_root *root = sctx-&gt;parent_root;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (root &amp;&amp; root-&gt;node != root-&gt;commit_root)</div><div class='add'>+		return btrfs_commit_current_transaction(root);</div><div class='ctx'> </div><div class='del'>-commit_trans:</div><div class='del'>-	/* Use any root, all fs roots will get their commit roots updated. */</div><div class='del'>-	if (!trans) {</div><div class='del'>-		trans = btrfs_join_transaction(sctx-&gt;send_root);</div><div class='del'>-		if (IS_ERR(trans))</div><div class='del'>-			return PTR_ERR(trans);</div><div class='del'>-		goto again;</div><div class='add'>+	for (int i = 0; i &lt; sctx-&gt;clone_roots_cnt; i++) {</div><div class='add'>+		root = sctx-&gt;clone_roots[i].root;</div><div class='add'>+		if (root-&gt;node != root-&gt;commit_root)</div><div class='add'>+			return btrfs_commit_current_transaction(root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return btrfs_commit_transaction(trans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Make sure any existing dellaloc is flushed for any root used by a send</div><div class='add'>+ * Make sure any existing delalloc is flushed for any root used by a send</div><div class='ctx'>  * operation so that we do not miss any data and we do not race with writeback</div><div class='ctx'>  * finishing and changing a tree while send is using the tree. This could</div><div class='ctx'>  * happen if a subvolume is in RW mode, has delalloc, is turned to RO mode and</div><div class='hunk'>@@ -8023,7 +7948,7 @@ static int flush_delalloc_roots(struct send_ctx *sctx)</div><div class='ctx'> 		ret = btrfs_start_delalloc_snapshot(root, false);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		btrfs_wait_ordered_extents(root, U64_MAX, 0, U64_MAX);</div><div class='add'>+		btrfs_wait_ordered_extents(root, U64_MAX, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sctx-&gt;clone_roots_cnt; i++) {</div><div class='hunk'>@@ -8031,7 +7956,7 @@ static int flush_delalloc_roots(struct send_ctx *sctx)</div><div class='ctx'> 		ret = btrfs_start_delalloc_snapshot(root, false);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		btrfs_wait_ordered_extents(root, U64_MAX, 0, U64_MAX);</div><div class='add'>+		btrfs_wait_ordered_extents(root, U64_MAX, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -8048,7 +7973,7 @@ static void btrfs_root_dec_send_in_progress(struct btrfs_root* root)</div><div class='ctx'> 	if (root-&gt;send_in_progress &lt; 0)</div><div class='ctx'> 		btrfs_err(root-&gt;fs_info,</div><div class='ctx'> 			  "send_in_progress unbalanced %d root %llu",</div><div class='del'>-			  root-&gt;send_in_progress, root-&gt;root_key.objectid);</div><div class='add'>+			  root-&gt;send_in_progress, btrfs_root_id(root));</div><div class='ctx'> 	spin_unlock(&amp;root-&gt;root_item_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8056,13 +7981,12 @@ static void dedupe_in_progress_warn(const struct btrfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_warn_rl(root-&gt;fs_info,</div><div class='ctx'> "cannot use root %llu for send while deduplications on it are in progress (%d in progress)",</div><div class='del'>-		      root-&gt;root_key.objectid, root-&gt;dedupe_in_progress);</div><div class='add'>+		      btrfs_root_id(root), root-&gt;dedupe_in_progress);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='add'>+long btrfs_ioctl_send(struct btrfs_root *send_root, const struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct btrfs_root *send_root = BTRFS_I(inode)-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = send_root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *clone_root;</div><div class='ctx'> 	struct send_ctx *sctx = NULL;</div><div class='hunk'>@@ -8082,7 +8006,20 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> 	 * making it RW. This also protects against deletion.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;send_root-&gt;root_item_lock);</div><div class='del'>-	if (btrfs_root_readonly(send_root) &amp;&amp; send_root-&gt;dedupe_in_progress) {</div><div class='add'>+	/*</div><div class='add'>+	 * Unlikely but possible, if the subvolume is marked for deletion but</div><div class='add'>+	 * is slow to remove the directory entry, send can still be started.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_root_dead(send_root)) {</div><div class='add'>+		spin_unlock(&amp;send_root-&gt;root_item_lock);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	/* Userspace tools do the checks and warn the user if it's not RO. */</div><div class='add'>+	if (!btrfs_root_readonly(send_root)) {</div><div class='add'>+		spin_unlock(&amp;send_root-&gt;root_item_lock);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	if (send_root-&gt;dedupe_in_progress) {</div><div class='ctx'> 		dedupe_in_progress_warn(send_root);</div><div class='ctx'> 		spin_unlock(&amp;send_root-&gt;root_item_lock);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -8091,15 +8028,6 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> 	spin_unlock(&amp;send_root-&gt;root_item_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Userspace tools do the checks and warn the user if it's</div><div class='del'>-	 * not RO.</div><div class='del'>-	 */</div><div class='del'>-	if (!btrfs_root_readonly(send_root)) {</div><div class='del'>-		ret = -EPERM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Check that we don't overflow at later allocations, we request</div><div class='ctx'> 	 * clone_sources_count + 1 items, and compare to unsigned long inside</div><div class='ctx'> 	 * access_ok. Also set an upper limit for allocation size so this can't</div><div class='hunk'>@@ -8111,7 +8039,7 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (arg-&gt;flags &amp; ~BTRFS_SEND_FLAG_MASK) {</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8121,6 +8049,7 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	init_path(&amp;sctx-&gt;cur_inode_path);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sctx-&gt;new_refs);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sctx-&gt;deleted_refs);</div><div class='ctx'> </div><div class='hunk'>@@ -8164,15 +8093,6 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;send_root = send_root;</div><div class='del'>-	/*</div><div class='del'>-	 * Unlikely but possible, if the subvolume is marked for deletion but</div><div class='del'>-	 * is slow to remove the directory entry, send can still be started</div><div class='del'>-	 */</div><div class='del'>-	if (btrfs_root_dead(sctx-&gt;send_root)) {</div><div class='del'>-		ret = -EPERM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	sctx-&gt;clone_roots_cnt = arg-&gt;clone_sources_count;</div><div class='ctx'> </div><div class='ctx'> 	if (sctx-&gt;proto &gt;= 2) {</div><div class='hunk'>@@ -8205,8 +8125,8 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sctx-&gt;clone_roots = kvcalloc(sizeof(*sctx-&gt;clone_roots),</div><div class='del'>-				     arg-&gt;clone_sources_count + 1,</div><div class='add'>+	sctx-&gt;clone_roots = kvcalloc(arg-&gt;clone_sources_count + 1,</div><div class='add'>+				     sizeof(*sctx-&gt;clone_roots),</div><div class='ctx'> 				     GFP_KERNEL);</div><div class='ctx'> 	if (!sctx-&gt;clone_roots) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -8406,6 +8326,9 @@ out:</div><div class='ctx'> 		btrfs_lru_cache_clear(&amp;sctx-&gt;dir_created_cache);</div><div class='ctx'> 		btrfs_lru_cache_clear(&amp;sctx-&gt;dir_utimes_cache);</div><div class='ctx'> </div><div class='add'>+		if (sctx-&gt;cur_inode_path.buf != sctx-&gt;cur_inode_path.inline_buf)</div><div class='add'>+			kfree(sctx-&gt;cur_inode_path.buf);</div><div class='add'>+</div><div class='ctx'> 		kfree(sctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/send.h b/fs/btrfs/send.h<br/>index 4f5509cb1803..652bb28f63d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/send.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/send.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/send.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/send.h</a></div><div class='hunk'>@@ -8,10 +8,15 @@</div><div class='ctx'> #define BTRFS_SEND_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/align.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_ioctl_send_args;</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"</div><div class='ctx'> /* Conditional support for the upcoming protocol version. */</div><div class='del'>-#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='ctx'> #define BTRFS_SEND_STREAM_VERSION 3</div><div class='ctx'> #else</div><div class='ctx'> #define BTRFS_SEND_STREAM_VERSION 2</div><div class='hunk'>@@ -25,9 +30,6 @@</div><div class='ctx'> #define BTRFS_SEND_BUF_SIZE_V1				SZ_64K</div><div class='ctx'> #define BTRFS_SEND_BUF_SIZE_V2	ALIGN(SZ_16K + BTRFS_MAX_COMPRESSED, PAGE_SIZE)</div><div class='ctx'> </div><div class='del'>-struct inode;</div><div class='del'>-struct btrfs_ioctl_send_args;</div><div class='del'>-</div><div class='ctx'> enum btrfs_tlv_type {</div><div class='ctx'> 	BTRFS_TLV_U8,</div><div class='ctx'> 	BTRFS_TLV_U16,</div><div class='hunk'>@@ -180,6 +182,6 @@ enum {</div><div class='ctx'> 	__BTRFS_SEND_A_MAX		= 35,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg);</div><div class='add'>+long btrfs_ioctl_send(struct btrfs_root *send_root, const struct btrfs_ioctl_send_args *arg);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c<br/>index 571bb13587d5..6babbe333741 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/space-info.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/space-info.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/space-info.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/space-info.c</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "space-info.h"</div><div class='hunk'>@@ -9,10 +11,11 @@</div><div class='ctx'> #include "ordered-data.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "block-group.h"</div><div class='del'>-#include "zoned.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "extent-tree.h"</div><div class='add'>+#include "zoned.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * HOW DOES SPACE RESERVATION WORK</div><div class='hunk'>@@ -48,11 +51,11 @@</div><div class='ctx'>  *   num_bytes we want to reserve.</div><div class='ctx'>  *</div><div class='ctx'>  *   -&gt;reserve</div><div class='del'>- *     space_info-&gt;bytes_may_reserve += num_bytes</div><div class='add'>+ *     space_info-&gt;bytes_may_use += num_bytes</div><div class='ctx'>  *</div><div class='ctx'>  *   -&gt;extent allocation</div><div class='ctx'>  *     Call btrfs_add_reserved_bytes() which does</div><div class='del'>- *     space_info-&gt;bytes_may_reserve -= num_bytes</div><div class='add'>+ *     space_info-&gt;bytes_may_use -= num_bytes</div><div class='ctx'>  *     space_info-&gt;bytes_reserved += extent_bytes</div><div class='ctx'>  *</div><div class='ctx'>  *   -&gt;insert reference</div><div class='hunk'>@@ -65,7 +68,7 @@</div><div class='ctx'>  *   Assume we are unable to simply make the reservation because we do not have</div><div class='ctx'>  *   enough space</div><div class='ctx'>  *</div><div class='del'>- *   -&gt; __reserve_bytes</div><div class='add'>+ *   -&gt; reserve_bytes</div><div class='ctx'>  *     create a reserve_ticket with -&gt;bytes set to our reservation, add it to</div><div class='ctx'>  *     the tail of space_info-&gt;tickets, kick async flush thread</div><div class='ctx'>  *</div><div class='hunk'>@@ -126,6 +129,14 @@</div><div class='ctx'>  *     churn a lot and we can avoid making some extent tree modifications if we</div><div class='ctx'>  *     are able to delay for as long as possible.</div><div class='ctx'>  *</div><div class='add'>+ *   RESET_ZONES</div><div class='add'>+ *     This state works only for the zoned mode. On the zoned mode, we cannot</div><div class='add'>+ *     reuse once allocated then freed region until we reset the zone, due to</div><div class='add'>+ *     the sequential write zone requirement. The RESET_ZONES state resets the</div><div class='add'>+ *     zones of an unused block group and let us reuse the space. The reusing</div><div class='add'>+ *     is faster than removing the block group and allocating another block</div><div class='add'>+ *     group on the zones.</div><div class='add'>+ *</div><div class='ctx'>  *   ALLOC_CHUNK</div><div class='ctx'>  *     We will skip this the first time through space reservation, because of</div><div class='ctx'>  *     overcommit and we don't want to have a lot of useless metadata space when</div><div class='hunk'>@@ -162,15 +173,14 @@</div><div class='ctx'>  *   thing with or without extra unallocated space.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-u64 __pure btrfs_space_info_used(struct btrfs_space_info *s_info,</div><div class='del'>-			  bool may_use_included)</div><div class='del'>-{</div><div class='del'>-	ASSERT(s_info);</div><div class='del'>-	return s_info-&gt;bytes_used + s_info-&gt;bytes_reserved +</div><div class='del'>-		s_info-&gt;bytes_pinned + s_info-&gt;bytes_readonly +</div><div class='del'>-		s_info-&gt;bytes_zone_unusable +</div><div class='del'>-		(may_use_included ? s_info-&gt;bytes_may_use : 0);</div><div class='del'>-}</div><div class='add'>+struct reserve_ticket {</div><div class='add'>+	u64 bytes;</div><div class='add'>+	int error;</div><div class='add'>+	bool steal;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * after adding space to the filesystem, we need to clear the full flags</div><div class='hunk'>@@ -182,7 +192,7 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info)</div><div class='ctx'> 	struct btrfs_space_info *found;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(found, head, list)</div><div class='del'>-		found-&gt;full = 0;</div><div class='add'>+		found-&gt;full = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -191,6 +201,8 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info)</div><div class='ctx'>  */</div><div class='ctx'> #define BTRFS_DEFAULT_ZONED_RECLAIM_THRESH			(75)</div><div class='ctx'> </div><div class='add'>+#define BTRFS_UNALLOC_BLOCK_GROUP_TARGET			(10ULL)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Calculate chunk size depending on volume type (regular or zoned).</div><div class='ctx'>  */</div><div class='hunk'>@@ -199,7 +211,7 @@ static u64 calc_chunk_size(const struct btrfs_fs_info *fs_info, u64 flags)</div><div class='ctx'> 	if (btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return fs_info-&gt;zone_size;</div><div class='ctx'> </div><div class='del'>-	ASSERT(flags &amp; BTRFS_BLOCK_GROUP_TYPE_MASK);</div><div class='add'>+	ASSERT(flags &amp; BTRFS_BLOCK_GROUP_TYPE_MASK, "flags=%llu", flags);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='ctx'> 		return BTRFS_MAX_DATA_CHUNK_SIZE;</div><div class='hunk'>@@ -222,18 +234,11 @@ void btrfs_update_space_info_chunk_size(struct btrfs_space_info *space_info,</div><div class='ctx'> 	WRITE_ONCE(space_info-&gt;chunk_size, chunk_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_space_info(struct btrfs_fs_info *info, u64 flags)</div><div class='add'>+static void init_space_info(struct btrfs_fs_info *info,</div><div class='add'>+			    struct btrfs_space_info *space_info, u64 flags)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct btrfs_space_info *space_info;</div><div class='del'>-	int i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	space_info = kzalloc(sizeof(*space_info), GFP_NOFS);</div><div class='del'>-	if (!space_info)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; BTRFS_NR_RAID_TYPES; i++)</div><div class='add'>+	space_info-&gt;fs_info = info;</div><div class='add'>+	for (int i = 0; i &lt; BTRFS_NR_RAID_TYPES; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;space_info-&gt;block_groups[i]);</div><div class='ctx'> 	init_rwsem(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> 	spin_lock_init(&amp;space_info-&gt;lock);</div><div class='hunk'>@@ -244,11 +249,67 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;space_info-&gt;priority_tickets);</div><div class='ctx'> 	space_info-&gt;clamp = 1;</div><div class='ctx'> 	btrfs_update_space_info_chunk_size(space_info, calc_chunk_size(info, flags));</div><div class='add'>+	space_info-&gt;subgroup_id = BTRFS_SUB_GROUP_PRIMARY;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_is_zoned(info))</div><div class='ctx'> 		space_info-&gt;bg_reclaim_threshold = BTRFS_DEFAULT_ZONED_RECLAIM_THRESH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flags,</div><div class='add'>+				       enum btrfs_space_info_sub_group id, int index)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = parent-&gt;fs_info;</div><div class='add'>+	struct btrfs_space_info *sub_group;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ASSERT(parent-&gt;subgroup_id == BTRFS_SUB_GROUP_PRIMARY,</div><div class='add'>+	       "parent-&gt;subgroup_id=%d", parent-&gt;subgroup_id);</div><div class='add'>+	ASSERT(id != BTRFS_SUB_GROUP_PRIMARY, "id=%d", id);</div><div class='add'>+</div><div class='add'>+	sub_group = kzalloc(sizeof(*sub_group), GFP_NOFS);</div><div class='add'>+	if (!sub_group)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_space_info(fs_info, sub_group, flags);</div><div class='add'>+	parent-&gt;sub_group[index] = sub_group;</div><div class='add'>+	sub_group-&gt;parent = parent;</div><div class='add'>+	sub_group-&gt;subgroup_id = id;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_sysfs_add_space_info_type(sub_group);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(sub_group);</div><div class='add'>+		parent-&gt;sub_group[index] = NULL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_space_info(struct btrfs_fs_info *info, u64 flags)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct btrfs_space_info *space_info;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	space_info = kzalloc(sizeof(*space_info), GFP_NOFS);</div><div class='add'>+	if (!space_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_space_info(info, space_info, flags);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_sysfs_add_space_info_type(info, space_info);</div><div class='add'>+	if (btrfs_is_zoned(info)) {</div><div class='add'>+		if (flags &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='add'>+			ret = create_space_info_sub_group(space_info, flags,</div><div class='add'>+							  BTRFS_SUB_GROUP_DATA_RELOC,</div><div class='add'>+							  0);</div><div class='add'>+		else if (flags &amp; BTRFS_BLOCK_GROUP_METADATA)</div><div class='add'>+			ret = create_space_info_sub_group(space_info, flags,</div><div class='add'>+							  BTRFS_SUB_GROUP_TREELOG,</div><div class='add'>+							  0);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_sysfs_add_space_info_type(space_info);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -299,31 +360,29 @@ out:</div><div class='ctx'> void btrfs_add_bg_to_space_info(struct btrfs_fs_info *info,</div><div class='ctx'> 				struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_space_info *found;</div><div class='add'>+	struct btrfs_space_info *space_info = block_group-&gt;space_info;</div><div class='ctx'> 	int factor, index;</div><div class='ctx'> </div><div class='ctx'> 	factor = btrfs_bg_type_to_factor(block_group-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	found = btrfs_find_space_info(info, block_group-&gt;flags);</div><div class='del'>-	ASSERT(found);</div><div class='del'>-	spin_lock(&amp;found-&gt;lock);</div><div class='del'>-	found-&gt;total_bytes += block_group-&gt;length;</div><div class='del'>-	found-&gt;disk_total += block_group-&gt;length * factor;</div><div class='del'>-	found-&gt;bytes_used += block_group-&gt;used;</div><div class='del'>-	found-&gt;disk_used += block_group-&gt;used * factor;</div><div class='del'>-	found-&gt;bytes_readonly += block_group-&gt;bytes_super;</div><div class='del'>-	found-&gt;bytes_zone_unusable += block_group-&gt;zone_unusable;</div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	space_info-&gt;total_bytes += block_group-&gt;length;</div><div class='add'>+	space_info-&gt;disk_total += block_group-&gt;length * factor;</div><div class='add'>+	space_info-&gt;bytes_used += block_group-&gt;used;</div><div class='add'>+	space_info-&gt;disk_used += block_group-&gt;used * factor;</div><div class='add'>+	space_info-&gt;bytes_readonly += block_group-&gt;bytes_super;</div><div class='add'>+	btrfs_space_info_update_bytes_zone_unusable(space_info, block_group-&gt;zone_unusable);</div><div class='ctx'> 	if (block_group-&gt;length &gt; 0)</div><div class='del'>-		found-&gt;full = 0;</div><div class='del'>-	btrfs_try_granting_tickets(info, found);</div><div class='del'>-	spin_unlock(&amp;found-&gt;lock);</div><div class='add'>+		space_info-&gt;full = false;</div><div class='add'>+	btrfs_try_granting_tickets(space_info);</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	block_group-&gt;space_info = found;</div><div class='add'>+	block_group-&gt;space_info = space_info;</div><div class='ctx'> </div><div class='ctx'> 	index = btrfs_bg_flags_to_raid_index(block_group-&gt;flags);</div><div class='del'>-	down_write(&amp;found-&gt;groups_sem);</div><div class='del'>-	list_add_tail(&amp;block_group-&gt;list, &amp;found-&gt;block_groups[index]);</div><div class='del'>-	up_write(&amp;found-&gt;groups_sem);</div><div class='add'>+	down_write(&amp;space_info-&gt;groups_sem);</div><div class='add'>+	list_add_tail(&amp;block_group-&gt;list, &amp;space_info-&gt;block_groups[index]);</div><div class='add'>+	up_write(&amp;space_info-&gt;groups_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_space_info *btrfs_find_space_info(struct btrfs_fs_info *info,</div><div class='hunk'>@@ -341,11 +400,32 @@ struct btrfs_space_info *btrfs_find_space_info(struct btrfs_fs_info *info,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 calc_available_free_space(struct btrfs_fs_info *fs_info,</div><div class='del'>-			  struct btrfs_space_info *space_info,</div><div class='del'>-			  enum btrfs_reserve_flush_enum flush)</div><div class='add'>+static u64 calc_effective_data_chunk_size(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_space_info *data_sinfo;</div><div class='add'>+	u64 data_chunk_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate the data_chunk_size, space_info-&gt;chunk_size is the</div><div class='add'>+	 * "optimal" chunk size based on the fs size.  However when we actually</div><div class='add'>+	 * allocate the chunk we will strip this down further, making it no</div><div class='add'>+	 * more than 10% of the disk or 1G, whichever is smaller.</div><div class='add'>+	 *</div><div class='add'>+	 * On the zoned mode, we need to use zone_size (= data_sinfo-&gt;chunk_size)</div><div class='add'>+	 * as it is.</div><div class='add'>+	 */</div><div class='add'>+	data_sinfo = btrfs_find_space_info(fs_info, BTRFS_BLOCK_GROUP_DATA);</div><div class='add'>+	if (btrfs_is_zoned(fs_info))</div><div class='add'>+		return data_sinfo-&gt;chunk_size;</div><div class='add'>+	data_chunk_size = min(data_sinfo-&gt;chunk_size,</div><div class='add'>+			      mult_perc(fs_info-&gt;fs_devices-&gt;total_rw_bytes, 10));</div><div class='add'>+	return min_t(u64, data_chunk_size, SZ_1G);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 calc_available_free_space(const struct btrfs_space_info *space_info,</div><div class='add'>+				     enum btrfs_reserve_flush_enum flush)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	u64 profile;</div><div class='ctx'> 	u64 avail;</div><div class='ctx'> 	u64 data_chunk_size;</div><div class='hunk'>@@ -369,16 +449,7 @@ static u64 calc_available_free_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (avail == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Calculate the data_chunk_size, space_info-&gt;chunk_size is the</div><div class='del'>-	 * "optimal" chunk size based on the fs size.  However when we actually</div><div class='del'>-	 * allocate the chunk we will strip this down further, making it no more</div><div class='del'>-	 * than 10% of the disk or 1G, whichever is smaller.</div><div class='del'>-	 */</div><div class='del'>-	data_sinfo = btrfs_find_space_info(fs_info, BTRFS_BLOCK_GROUP_DATA);</div><div class='del'>-	data_chunk_size = min(data_sinfo-&gt;chunk_size,</div><div class='del'>-			      mult_perc(fs_info-&gt;fs_devices-&gt;total_rw_bytes, 10));</div><div class='del'>-	data_chunk_size = min_t(u64, data_chunk_size, SZ_1G);</div><div class='add'>+	data_chunk_size = calc_effective_data_chunk_size(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since data allocations immediately use block groups as part of the</div><div class='hunk'>@@ -406,47 +477,91 @@ static u64 calc_available_free_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		avail &gt;&gt;= 3;</div><div class='ctx'> 	else</div><div class='ctx'> 		avail &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On the zoned mode, we always allocate one zone as one chunk.</div><div class='add'>+	 * Returning non-zone size aligned bytes here will result in</div><div class='add'>+	 * less pressure for the async metadata reclaim process, and it</div><div class='add'>+	 * will over-commit too much leading to ENOSPC. Align down to the</div><div class='add'>+	 * zone size to avoid that.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_is_zoned(fs_info))</div><div class='add'>+		avail = ALIGN_DOWN(avail, fs_info-&gt;zone_size);</div><div class='add'>+</div><div class='ctx'> 	return avail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct btrfs_space_info *space_info, u64 bytes,</div><div class='del'>-			 enum btrfs_reserve_flush_enum flush)</div><div class='add'>+static inline bool check_can_overcommit(const struct btrfs_space_info *space_info,</div><div class='add'>+					u64 space_info_used_bytes, u64 bytes,</div><div class='add'>+					enum btrfs_reserve_flush_enum flush)</div><div class='add'>+{</div><div class='add'>+	const u64 avail = calc_available_free_space(space_info, flush);</div><div class='add'>+</div><div class='add'>+	return (space_info_used_bytes + bytes &lt; space_info-&gt;total_bytes + avail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool can_overcommit(const struct btrfs_space_info *space_info,</div><div class='add'>+				  u64 space_info_used_bytes, u64 bytes,</div><div class='add'>+				  enum btrfs_reserve_flush_enum flush)</div><div class='add'>+{</div><div class='add'>+	/* Don't overcommit when in mixed mode. */</div><div class='add'>+	if (space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return check_can_overcommit(space_info, space_info_used_bytes, bytes, flush);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool btrfs_can_overcommit(const struct btrfs_space_info *space_info, u64 bytes,</div><div class='add'>+			  enum btrfs_reserve_flush_enum flush)</div><div class='ctx'> {</div><div class='del'>-	u64 avail;</div><div class='ctx'> 	u64 used;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't overcommit when in mixed mode */</div><div class='ctx'> 	if (space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	used = btrfs_space_info_used(space_info, true);</div><div class='del'>-	avail = calc_available_free_space(fs_info, space_info, flush);</div><div class='ctx'> </div><div class='del'>-	if (used + bytes &lt; space_info-&gt;total_bytes + avail)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+	return check_can_overcommit(space_info, used, bytes, flush);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void remove_ticket(struct btrfs_space_info *space_info,</div><div class='del'>-			  struct reserve_ticket *ticket)</div><div class='add'>+			  struct reserve_ticket *ticket, int error)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	if (!list_empty(&amp;ticket-&gt;list)) {</div><div class='ctx'> 		list_del_init(&amp;ticket-&gt;list);</div><div class='del'>-		ASSERT(space_info-&gt;reclaim_size &gt;= ticket-&gt;bytes);</div><div class='add'>+		ASSERT(space_info-&gt;reclaim_size &gt;= ticket-&gt;bytes,</div><div class='add'>+		       "space_info-&gt;reclaim_size=%llu ticket-&gt;bytes=%llu",</div><div class='add'>+		       space_info-&gt;reclaim_size, ticket-&gt;bytes);</div><div class='ctx'> 		space_info-&gt;reclaim_size -= ticket-&gt;bytes;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ticket-&gt;lock);</div><div class='add'>+	/*</div><div class='add'>+	 * If we are called from a task waiting on the ticket, it may happen</div><div class='add'>+	 * that before it sets an error on the ticket, a reclaim task was able</div><div class='add'>+	 * to satisfy the ticket. In that case ignore the error.</div><div class='add'>+	 */</div><div class='add'>+	if (error &amp;&amp; ticket-&gt;bytes &gt; 0)</div><div class='add'>+		ticket-&gt;error = error;</div><div class='add'>+	else</div><div class='add'>+		ticket-&gt;bytes = 0;</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;ticket-&gt;wait);</div><div class='add'>+	spin_unlock(&amp;ticket-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is for space we already have accounted in space_info-&gt;bytes_may_use, so</div><div class='ctx'>  * basically when we're returning space from block_rsv's.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_space_info *space_info)</div><div class='add'>+void btrfs_try_granting_tickets(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *head;</div><div class='ctx'> 	enum btrfs_reserve_flush_enum flush = BTRFS_RESERVE_NO_FLUSH;</div><div class='add'>+	u64 used = btrfs_space_info_used(space_info, true);</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -454,21 +569,18 @@ void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,</div><div class='ctx'> again:</div><div class='ctx'> 	while (!list_empty(head)) {</div><div class='ctx'> 		struct reserve_ticket *ticket;</div><div class='del'>-		u64 used = btrfs_space_info_used(space_info, true);</div><div class='add'>+		u64 used_after;</div><div class='ctx'> </div><div class='ctx'> 		ticket = list_first_entry(head, struct reserve_ticket, list);</div><div class='add'>+		used_after = used + ticket-&gt;bytes;</div><div class='ctx'> </div><div class='ctx'> 		/* Check and see if our ticket can be satisfied now. */</div><div class='del'>-		if ((used + ticket-&gt;bytes &lt;= space_info-&gt;total_bytes) ||</div><div class='del'>-		    btrfs_can_overcommit(fs_info, space_info, ticket-&gt;bytes,</div><div class='del'>-					 flush)) {</div><div class='del'>-			btrfs_space_info_update_bytes_may_use(fs_info,</div><div class='del'>-							      space_info,</div><div class='del'>-							      ticket-&gt;bytes);</div><div class='del'>-			remove_ticket(space_info, ticket);</div><div class='del'>-			ticket-&gt;bytes = 0;</div><div class='add'>+		if (used_after &lt;= space_info-&gt;total_bytes ||</div><div class='add'>+		    can_overcommit(space_info, used, ticket-&gt;bytes, flush)) {</div><div class='add'>+			btrfs_space_info_update_bytes_may_use(space_info, ticket-&gt;bytes);</div><div class='add'>+			remove_ticket(space_info, ticket, 0);</div><div class='ctx'> 			space_info-&gt;tickets_id++;</div><div class='del'>-			wake_up(&amp;ticket-&gt;wait);</div><div class='add'>+			used = used_after;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -515,15 +627,16 @@ static void dump_global_block_rsv(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	DUMP_BLOCK_RSV(fs_info, delayed_refs_rsv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __btrfs_dump_space_info(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct btrfs_space_info *info)</div><div class='add'>+static void __btrfs_dump_space_info(const struct btrfs_space_info *info)</div><div class='ctx'> {</div><div class='add'>+	const struct btrfs_fs_info *fs_info = info-&gt;fs_info;</div><div class='ctx'> 	const char *flag_str = space_info_flag_to_str(info);</div><div class='ctx'> 	lockdep_assert_held(&amp;info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* The free space could be negative in case of overcommit */</div><div class='del'>-	btrfs_info(fs_info, "space_info %s has %lld free, is %sfull",</div><div class='del'>-		   flag_str,</div><div class='add'>+	btrfs_info(fs_info,</div><div class='add'>+		   "space_info %s (sub-group id %d) has %lld free, is %sfull",</div><div class='add'>+		   flag_str, info-&gt;subgroup_id,</div><div class='ctx'> 		   (s64)(info-&gt;total_bytes - btrfs_space_info_used(info, true)),</div><div class='ctx'> 		   info-&gt;full ? "" : "not ");</div><div class='ctx'> 	btrfs_info(fs_info,</div><div class='hunk'>@@ -533,16 +646,16 @@ static void __btrfs_dump_space_info(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		info-&gt;bytes_readonly, info-&gt;bytes_zone_unusable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,</div><div class='del'>-			   struct btrfs_space_info *info, u64 bytes,</div><div class='del'>-			   int dump_block_groups)</div><div class='add'>+void btrfs_dump_space_info(struct btrfs_space_info *info, u64 bytes,</div><div class='add'>+			   bool dump_block_groups)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = info-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='ctx'> 	u64 total_avail = 0;</div><div class='ctx'> 	int index = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;info-&gt;lock);</div><div class='del'>-	__btrfs_dump_space_info(fs_info, info);</div><div class='add'>+	__btrfs_dump_space_info(info);</div><div class='ctx'> 	dump_global_block_rsv(fs_info);</div><div class='ctx'> 	spin_unlock(&amp;info-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -556,8 +669,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;cache-&gt;lock);</div><div class='ctx'> 		avail = cache-&gt;length - cache-&gt;used - cache-&gt;pinned -</div><div class='del'>-			cache-&gt;reserved - cache-&gt;delalloc_bytes -</div><div class='del'>-			cache-&gt;bytes_super - cache-&gt;zone_unusable;</div><div class='add'>+			cache-&gt;reserved - cache-&gt;bytes_super - cache-&gt;zone_unusable;</div><div class='ctx'> 		btrfs_info(fs_info,</div><div class='ctx'> "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %llu delalloc %llu super %llu zone_unusable (%llu bytes available) %s",</div><div class='ctx'> 			   cache-&gt;start, cache-&gt;length, cache-&gt;used, cache-&gt;pinned,</div><div class='hunk'>@@ -588,16 +700,14 @@ static inline u64 calc_reclaim_items_nr(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define EXTENT_SIZE_PER_ITEM	SZ_256K</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * shrink metadata reservation for delalloc</div><div class='ctx'>  */</div><div class='del'>-static void shrink_delalloc(struct btrfs_fs_info *fs_info,</div><div class='del'>-			    struct btrfs_space_info *space_info,</div><div class='add'>+static void shrink_delalloc(struct btrfs_space_info *space_info,</div><div class='ctx'> 			    u64 to_reclaim, bool wait_ordered,</div><div class='ctx'> 			    bool for_preempt)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	u64 delalloc_bytes;</div><div class='ctx'> 	u64 ordered_bytes;</div><div class='hunk'>@@ -689,7 +799,7 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info,</div><div class='ctx'> skip_async:</div><div class='ctx'> 		loops++;</div><div class='ctx'> 		if (wait_ordered &amp;&amp; !trans) {</div><div class='del'>-			btrfs_wait_ordered_roots(fs_info, items, 0, (u64)-1);</div><div class='add'>+			btrfs_wait_ordered_roots(fs_info, items, NULL);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			time_left = schedule_timeout_killable(1);</div><div class='ctx'> 			if (time_left)</div><div class='hunk'>@@ -724,10 +834,10 @@ skip_async:</div><div class='ctx'>  * and may fail for various reasons. The caller is supposed to examine the</div><div class='ctx'>  * state of @space_info to detect the outcome.</div><div class='ctx'>  */</div><div class='del'>-static void flush_space(struct btrfs_fs_info *fs_info,</div><div class='del'>-		       struct btrfs_space_info *space_info, u64 num_bytes,</div><div class='del'>-		       enum btrfs_flush_state state, bool for_preempt)</div><div class='add'>+static void flush_space(struct btrfs_space_info *space_info, u64 num_bytes,</div><div class='add'>+			enum btrfs_flush_state state, bool for_preempt)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	int nr;</div><div class='hunk'>@@ -756,7 +866,7 @@ static void flush_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	case FLUSH_DELALLOC_FULL:</div><div class='ctx'> 		if (state == FLUSH_DELALLOC_FULL)</div><div class='ctx'> 			num_bytes = U64_MAX;</div><div class='del'>-		shrink_delalloc(fs_info, space_info, num_bytes,</div><div class='add'>+		shrink_delalloc(space_info, num_bytes,</div><div class='ctx'> 				state != FLUSH_DELALLOC, for_preempt);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLUSH_DELAYED_REFS_NR:</div><div class='hunk'>@@ -781,7 +891,7 @@ static void flush_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			ret = PTR_ERR(trans);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		ret = btrfs_chunk_alloc(trans,</div><div class='add'>+		ret = btrfs_chunk_alloc(trans, space_info,</div><div class='ctx'> 				btrfs_get_alloc_profile(fs_info, space_info-&gt;flags),</div><div class='ctx'> 				(state == ALLOC_CHUNK) ? CHUNK_ALLOC_NO_FORCE :</div><div class='ctx'> 					CHUNK_ALLOC_FORCE);</div><div class='hunk'>@@ -808,14 +918,10 @@ static void flush_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		 * because that does not wait for a transaction to fully commit</div><div class='ctx'> 		 * (only for it to be unblocked, state TRANS_STATE_UNBLOCKED).</div><div class='ctx'> 		 */</div><div class='del'>-		trans = btrfs_attach_transaction_barrier(root);</div><div class='del'>-		if (IS_ERR(trans)) {</div><div class='del'>-			ret = PTR_ERR(trans);</div><div class='del'>-			if (ret == -ENOENT)</div><div class='del'>-				ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = btrfs_commit_transaction(trans);</div><div class='add'>+		ret = btrfs_commit_current_transaction(root);</div><div class='add'>+		break;</div><div class='add'>+	case RESET_ZONES:</div><div class='add'>+		ret = btrfs_reset_unused_block_groups(space_info, num_bytes);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='hunk'>@@ -827,9 +933,7 @@ static void flush_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64</div><div class='del'>-btrfs_calc_reclaim_metadata_size(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct btrfs_space_info *space_info)</div><div class='add'>+static u64 btrfs_calc_reclaim_metadata_size(const struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='ctx'> 	u64 used;</div><div class='ctx'> 	u64 avail;</div><div class='hunk'>@@ -837,8 +941,7 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	avail = calc_available_free_space(fs_info, space_info,</div><div class='del'>-					  BTRFS_RESERVE_FLUSH_ALL);</div><div class='add'>+	avail = calc_available_free_space(space_info, BTRFS_RESERVE_FLUSH_ALL);</div><div class='ctx'> 	used = btrfs_space_info_used(space_info, true);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -853,18 +956,25 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return to_reclaim;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct btrfs_space_info *space_info)</div><div class='add'>+static bool need_preemptive_reclaim(const struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='del'>-	u64 global_rsv_size = fs_info-&gt;global_block_rsv.reserved;</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='add'>+	const u64 global_rsv_size = btrfs_block_rsv_reserved(&amp;fs_info-&gt;global_block_rsv);</div><div class='ctx'> 	u64 ordered, delalloc;</div><div class='ctx'> 	u64 thresh;</div><div class='ctx'> 	u64 used;</div><div class='ctx'> </div><div class='del'>-	thresh = mult_perc(space_info-&gt;total_bytes, 90);</div><div class='del'>-</div><div class='ctx'> 	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We have tickets queued, bail so we don't compete with the async</div><div class='add'>+	 * flushers.</div><div class='add'>+	 */</div><div class='add'>+	if (space_info-&gt;reclaim_size)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	thresh = mult_perc(space_info-&gt;total_bytes, 90);</div><div class='add'>+</div><div class='ctx'> 	/* If we're just plain full then async reclaim just slows us down. */</div><div class='ctx'> 	if ((space_info-&gt;bytes_used + space_info-&gt;bytes_reserved +</div><div class='ctx'> 	     global_rsv_size) &gt;= thresh)</div><div class='hunk'>@@ -885,13 +995,6 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We have tickets queued, bail so we don't compete with the async</div><div class='del'>-	 * flushers.</div><div class='del'>-	 */</div><div class='del'>-	if (space_info-&gt;reclaim_size)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * If we have over half of the free space occupied by reservations or</div><div class='ctx'> 	 * pinned then we want to start flushing.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -920,8 +1023,7 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * much delalloc we need for the background flusher to kick in.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	thresh = calc_available_free_space(fs_info, space_info,</div><div class='del'>-					   BTRFS_RESERVE_FLUSH_ALL);</div><div class='add'>+	thresh = calc_available_free_space(space_info, BTRFS_RESERVE_FLUSH_ALL);</div><div class='ctx'> 	used = space_info-&gt;bytes_used + space_info-&gt;bytes_reserved +</div><div class='ctx'> 	       space_info-&gt;bytes_readonly + global_rsv_size;</div><div class='ctx'> 	if (used &lt; space_info-&gt;total_bytes)</div><div class='hunk'>@@ -956,8 +1058,8 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	ordered = percpu_counter_read_positive(&amp;fs_info-&gt;ordered_bytes) &gt;&gt; 1;</div><div class='ctx'> 	delalloc = percpu_counter_read_positive(&amp;fs_info-&gt;delalloc_bytes);</div><div class='ctx'> 	if (ordered &gt;= delalloc)</div><div class='del'>-		used += fs_info-&gt;delayed_refs_rsv.reserved +</div><div class='del'>-			fs_info-&gt;delayed_block_rsv.reserved;</div><div class='add'>+		used += btrfs_block_rsv_reserved(&amp;fs_info-&gt;delayed_refs_rsv) +</div><div class='add'>+			btrfs_block_rsv_reserved(&amp;fs_info-&gt;delayed_block_rsv);</div><div class='ctx'> 	else</div><div class='ctx'> 		used += space_info-&gt;bytes_may_use - global_rsv_size;</div><div class='ctx'> </div><div class='hunk'>@@ -965,13 +1067,15 @@ static bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		!test_bit(BTRFS_FS_STATE_REMOUNTING, &amp;fs_info-&gt;fs_state));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,</div><div class='del'>-				  struct btrfs_space_info *space_info,</div><div class='add'>+static bool steal_from_global_rsv(struct btrfs_space_info *space_info,</div><div class='ctx'> 				  struct reserve_ticket *ticket)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_rsv *global_rsv = &amp;fs_info-&gt;global_block_rsv;</div><div class='ctx'> 	u64 min_bytes;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	if (!ticket-&gt;steal)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -985,21 +1089,19 @@ static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	global_rsv-&gt;reserved -= ticket-&gt;bytes;</div><div class='del'>-	remove_ticket(space_info, ticket);</div><div class='del'>-	ticket-&gt;bytes = 0;</div><div class='del'>-	wake_up(&amp;ticket-&gt;wait);</div><div class='del'>-	space_info-&gt;tickets_id++;</div><div class='ctx'> 	if (global_rsv-&gt;reserved &lt; global_rsv-&gt;size)</div><div class='del'>-		global_rsv-&gt;full = 0;</div><div class='add'>+		global_rsv-&gt;full = false;</div><div class='ctx'> 	spin_unlock(&amp;global_rsv-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	remove_ticket(space_info, ticket, 0);</div><div class='add'>+	space_info-&gt;tickets_id++;</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We've exhausted our flushing, start failing tickets.</div><div class='ctx'>  *</div><div class='del'>- * @fs_info - fs_info for this fs</div><div class='ctx'>  * @space_info - the space info we were flushing</div><div class='ctx'>  *</div><div class='ctx'>  * We call this when we've exhausted our flushing ability and haven't made</div><div class='hunk'>@@ -1012,72 +1114,66 @@ static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * other tickets, or if it stumbles across a ticket that was smaller than the</div><div class='ctx'>  * first ticket.</div><div class='ctx'>  */</div><div class='del'>-static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info,</div><div class='del'>-				   struct btrfs_space_info *space_info)</div><div class='add'>+static bool maybe_fail_all_tickets(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	struct reserve_ticket *ticket;</div><div class='ctx'> 	u64 tickets_id = space_info-&gt;tickets_id;</div><div class='del'>-	const bool aborted = BTRFS_FS_ERROR(fs_info);</div><div class='add'>+	const int abort_error = BTRFS_FS_ERROR(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_fail_all_tickets(fs_info, space_info);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {</div><div class='ctx'> 		btrfs_info(fs_info, "cannot satisfy tickets, dumping space info");</div><div class='del'>-		__btrfs_dump_space_info(fs_info, space_info);</div><div class='add'>+		__btrfs_dump_space_info(space_info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;space_info-&gt;tickets) &amp;&amp;</div><div class='ctx'> 	       tickets_id == space_info-&gt;tickets_id) {</div><div class='ctx'> 		ticket = list_first_entry(&amp;space_info-&gt;tickets,</div><div class='ctx'> 					  struct reserve_ticket, list);</div><div class='add'>+		if (unlikely(abort_error)) {</div><div class='add'>+			remove_ticket(space_info, ticket, abort_error);</div><div class='add'>+		} else {</div><div class='add'>+			if (steal_from_global_rsv(space_info, ticket))</div><div class='add'>+				return true;</div><div class='ctx'> </div><div class='del'>-		if (!aborted &amp;&amp; steal_from_global_rsv(fs_info, space_info, ticket))</div><div class='del'>-			return true;</div><div class='del'>-</div><div class='del'>-		if (!aborted &amp;&amp; btrfs_test_opt(fs_info, ENOSPC_DEBUG))</div><div class='del'>-			btrfs_info(fs_info, "failing ticket with %llu bytes",</div><div class='del'>-				   ticket-&gt;bytes);</div><div class='add'>+			if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))</div><div class='add'>+				btrfs_info(fs_info, "failing ticket with %llu bytes",</div><div class='add'>+					   ticket-&gt;bytes);</div><div class='ctx'> </div><div class='del'>-		remove_ticket(space_info, ticket);</div><div class='del'>-		if (aborted)</div><div class='del'>-			ticket-&gt;error = -EIO;</div><div class='del'>-		else</div><div class='del'>-			ticket-&gt;error = -ENOSPC;</div><div class='del'>-		wake_up(&amp;ticket-&gt;wait);</div><div class='add'>+			remove_ticket(space_info, ticket, -ENOSPC);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * We're just throwing tickets away, so more flushing may not</div><div class='del'>-		 * trip over btrfs_try_granting_tickets, so we need to call it</div><div class='del'>-		 * here to see if we can make progress with the next ticket in</div><div class='del'>-		 * the list.</div><div class='del'>-		 */</div><div class='del'>-		if (!aborted)</div><div class='del'>-			btrfs_try_granting_tickets(fs_info, space_info);</div><div class='add'>+			/*</div><div class='add'>+			 * We're just throwing tickets away, so more flushing may</div><div class='add'>+			 * not trip over btrfs_try_granting_tickets, so we need</div><div class='add'>+			 * to call it here to see if we can make progress with</div><div class='add'>+			 * the next ticket in the list.</div><div class='add'>+			 */</div><div class='add'>+			btrfs_try_granting_tickets(space_info);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return (tickets_id != space_info-&gt;tickets_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is for normal flushers, we can wait all goddamned day if we want to.  We</div><div class='del'>- * will loop and continuously try to flush as long as we are making progress.</div><div class='del'>- * We count progress as clearing off tickets each time we have to loop.</div><div class='del'>- */</div><div class='del'>-static void btrfs_async_reclaim_metadata_space(struct work_struct *work)</div><div class='add'>+static void do_async_reclaim_metadata_space(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info;</div><div class='del'>-	struct btrfs_space_info *space_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	u64 to_reclaim;</div><div class='ctx'> 	enum btrfs_flush_state flush_state;</div><div class='ctx'> 	int commit_cycles = 0;</div><div class='ctx'> 	u64 last_tickets_id;</div><div class='add'>+	enum btrfs_flush_state final_state;</div><div class='ctx'> </div><div class='del'>-	fs_info = container_of(work, struct btrfs_fs_info, async_reclaim_work);</div><div class='del'>-	space_info = btrfs_find_space_info(fs_info, BTRFS_BLOCK_GROUP_METADATA);</div><div class='add'>+	if (btrfs_is_zoned(fs_info))</div><div class='add'>+		final_state = RESET_ZONES;</div><div class='add'>+	else</div><div class='add'>+		final_state = COMMIT_TRANS;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-	to_reclaim = btrfs_calc_reclaim_metadata_size(fs_info, space_info);</div><div class='add'>+	to_reclaim = btrfs_calc_reclaim_metadata_size(space_info);</div><div class='ctx'> 	if (!to_reclaim) {</div><div class='del'>-		space_info-&gt;flush = 0;</div><div class='add'>+		space_info-&gt;flush = false;</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1086,15 +1182,14 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	flush_state = FLUSH_DELAYED_ITEMS_NR;</div><div class='ctx'> 	do {</div><div class='del'>-		flush_space(fs_info, space_info, to_reclaim, flush_state, false);</div><div class='add'>+		flush_space(space_info, to_reclaim, flush_state, false);</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		if (list_empty(&amp;space_info-&gt;tickets)) {</div><div class='del'>-			space_info-&gt;flush = 0;</div><div class='add'>+			space_info-&gt;flush = false;</div><div class='ctx'> 			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		to_reclaim = btrfs_calc_reclaim_metadata_size(fs_info,</div><div class='del'>-							      space_info);</div><div class='add'>+		to_reclaim = btrfs_calc_reclaim_metadata_size(space_info);</div><div class='ctx'> 		if (last_tickets_id == space_info-&gt;tickets_id) {</div><div class='ctx'> 			flush_state++;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1125,21 +1220,40 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'> 		if (flush_state == ALLOC_CHUNK_FORCE &amp;&amp; !commit_cycles)</div><div class='ctx'> 			flush_state++;</div><div class='ctx'> </div><div class='del'>-		if (flush_state &gt; COMMIT_TRANS) {</div><div class='add'>+		if (flush_state &gt; final_state) {</div><div class='ctx'> 			commit_cycles++;</div><div class='ctx'> 			if (commit_cycles &gt; 2) {</div><div class='del'>-				if (maybe_fail_all_tickets(fs_info, space_info)) {</div><div class='add'>+				if (maybe_fail_all_tickets(space_info)) {</div><div class='ctx'> 					flush_state = FLUSH_DELAYED_ITEMS_NR;</div><div class='ctx'> 					commit_cycles--;</div><div class='ctx'> 				} else {</div><div class='del'>-					space_info-&gt;flush = 0;</div><div class='add'>+					space_info-&gt;flush = false;</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				flush_state = FLUSH_DELAYED_ITEMS_NR;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='del'>-	} while (flush_state &lt;= COMMIT_TRANS);</div><div class='add'>+	} while (flush_state &lt;= final_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is for normal flushers, it can wait as much time as needed. We will</div><div class='add'>+ * loop and continuously try to flush as long as we are making progress.  We</div><div class='add'>+ * count progress as clearing off tickets each time we have to loop.</div><div class='add'>+ */</div><div class='add'>+static void btrfs_async_reclaim_metadata_space(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	struct btrfs_space_info *space_info;</div><div class='add'>+</div><div class='add'>+	fs_info = container_of(work, struct btrfs_fs_info, async_reclaim_work);</div><div class='add'>+	space_info = btrfs_find_space_info(fs_info, BTRFS_BLOCK_GROUP_METADATA);</div><div class='add'>+	do_async_reclaim_metadata_space(space_info);</div><div class='add'>+	for (int i = 0; i &lt; BTRFS_SPACE_INFO_SUB_GROUP_MAX; i++) {</div><div class='add'>+		if (space_info-&gt;sub_group[i])</div><div class='add'>+			do_async_reclaim_metadata_space(space_info-&gt;sub_group[i]);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1169,14 +1283,15 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'> 	trans_rsv = &amp;fs_info-&gt;trans_block_rsv;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-	while (need_preemptive_reclaim(fs_info, space_info)) {</div><div class='add'>+	while (need_preemptive_reclaim(space_info)) {</div><div class='ctx'> 		enum btrfs_flush_state flush;</div><div class='ctx'> 		u64 delalloc_size = 0;</div><div class='ctx'> 		u64 to_reclaim, block_rsv_size;</div><div class='del'>-		u64 global_rsv_size = global_rsv-&gt;reserved;</div><div class='del'>-</div><div class='del'>-		loops++;</div><div class='add'>+		const u64 global_rsv_size = btrfs_block_rsv_reserved(global_rsv);</div><div class='add'>+		const u64 bytes_may_use = space_info-&gt;bytes_may_use;</div><div class='add'>+		const u64 bytes_pinned = space_info-&gt;bytes_pinned;</div><div class='ctx'> </div><div class='add'>+		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't have a precise counter for the metadata being</div><div class='ctx'> 		 * reserved for delalloc, so we'll approximate it by subtracting</div><div class='hunk'>@@ -1185,11 +1300,11 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'> 		 * assume it's tied up in delalloc reservations.</div><div class='ctx'> 		 */</div><div class='ctx'> 		block_rsv_size = global_rsv_size +</div><div class='del'>-			delayed_block_rsv-&gt;reserved +</div><div class='del'>-			delayed_refs_rsv-&gt;reserved +</div><div class='del'>-			trans_rsv-&gt;reserved;</div><div class='del'>-		if (block_rsv_size &lt; space_info-&gt;bytes_may_use)</div><div class='del'>-			delalloc_size = space_info-&gt;bytes_may_use - block_rsv_size;</div><div class='add'>+			btrfs_block_rsv_reserved(delayed_block_rsv) +</div><div class='add'>+			btrfs_block_rsv_reserved(delayed_refs_rsv) +</div><div class='add'>+			btrfs_block_rsv_reserved(trans_rsv);</div><div class='add'>+		if (block_rsv_size &lt; bytes_may_use)</div><div class='add'>+			delalloc_size = bytes_may_use - block_rsv_size;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't want to include the global_rsv in our calculation,</div><div class='hunk'>@@ -1206,21 +1321,21 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'> 		if (delalloc_size &gt; block_rsv_size) {</div><div class='ctx'> 			to_reclaim = delalloc_size;</div><div class='ctx'> 			flush = FLUSH_DELALLOC;</div><div class='del'>-		} else if (space_info-&gt;bytes_pinned &gt;</div><div class='del'>-			   (delayed_block_rsv-&gt;reserved +</div><div class='del'>-			    delayed_refs_rsv-&gt;reserved)) {</div><div class='del'>-			to_reclaim = space_info-&gt;bytes_pinned;</div><div class='add'>+		} else if (bytes_pinned &gt;</div><div class='add'>+			   (btrfs_block_rsv_reserved(delayed_block_rsv) +</div><div class='add'>+			    btrfs_block_rsv_reserved(delayed_refs_rsv))) {</div><div class='add'>+			to_reclaim = bytes_pinned;</div><div class='ctx'> 			flush = COMMIT_TRANS;</div><div class='del'>-		} else if (delayed_block_rsv-&gt;reserved &gt;</div><div class='del'>-			   delayed_refs_rsv-&gt;reserved) {</div><div class='del'>-			to_reclaim = delayed_block_rsv-&gt;reserved;</div><div class='add'>+		} else if (btrfs_block_rsv_reserved(delayed_block_rsv) &gt;</div><div class='add'>+			   btrfs_block_rsv_reserved(delayed_refs_rsv)) {</div><div class='add'>+			to_reclaim = btrfs_block_rsv_reserved(delayed_block_rsv);</div><div class='ctx'> 			flush = FLUSH_DELAYED_ITEMS_NR;</div><div class='ctx'> 		} else {</div><div class='del'>-			to_reclaim = delayed_refs_rsv-&gt;reserved;</div><div class='add'>+			to_reclaim = btrfs_block_rsv_reserved(delayed_refs_rsv);</div><div class='ctx'> 			flush = FLUSH_DELAYED_REFS_NR;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+		loops++;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't want to reclaim everything, just a portion, so scale</div><div class='hunk'>@@ -1230,7 +1345,7 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'> 		to_reclaim &gt;&gt;= 2;</div><div class='ctx'> 		if (!to_reclaim)</div><div class='ctx'> 			to_reclaim = btrfs_calc_insert_metadata_size(fs_info, 1);</div><div class='del'>-		flush_space(fs_info, space_info, to_reclaim, flush, true);</div><div class='add'>+		flush_space(space_info, to_reclaim, flush, true);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1263,13 +1378,17 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)</div><div class='ctx'>  *   If we are freeing inodes, we want to make sure all delayed iputs have</div><div class='ctx'>  *   completed, because they could have been on an inode with i_nlink == 0, and</div><div class='ctx'>  *   thus have been truncated and freed up space.  But again this space is not</div><div class='del'>- *   immediately re-usable, it comes in the form of a delayed ref, which must be</div><div class='add'>+ *   immediately reusable, it comes in the form of a delayed ref, which must be</div><div class='ctx'>  *   run and then the transaction must be committed.</div><div class='ctx'>  *</div><div class='ctx'>  * COMMIT_TRANS</div><div class='ctx'>  *   This is where we reclaim all of the pinned space generated by running the</div><div class='ctx'>  *   iputs</div><div class='ctx'>  *</div><div class='add'>+ * RESET_ZONES</div><div class='add'>+ *   This state works only for the zoned mode. We scan the unused block group</div><div class='add'>+ *   list and reset the zones and reuse the block group.</div><div class='add'>+ *</div><div class='ctx'>  * ALLOC_CHUNK_FORCE</div><div class='ctx'>  *   For data we start with alloc chunk force, however we could have been full</div><div class='ctx'>  *   before, and then the transaction commit could have freed new block groups,</div><div class='hunk'>@@ -1279,22 +1398,19 @@ static const enum btrfs_flush_state data_flush_states[] = {</div><div class='ctx'> 	FLUSH_DELALLOC_FULL,</div><div class='ctx'> 	RUN_DELAYED_IPUTS,</div><div class='ctx'> 	COMMIT_TRANS,</div><div class='add'>+	RESET_ZONES,</div><div class='ctx'> 	ALLOC_CHUNK_FORCE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void btrfs_async_reclaim_data_space(struct work_struct *work)</div><div class='add'>+static void do_async_reclaim_data_space(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info;</div><div class='del'>-	struct btrfs_space_info *space_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	u64 last_tickets_id;</div><div class='ctx'> 	enum btrfs_flush_state flush_state = 0;</div><div class='ctx'> </div><div class='del'>-	fs_info = container_of(work, struct btrfs_fs_info, async_data_reclaim_work);</div><div class='del'>-	space_info = fs_info-&gt;data_sinfo;</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	if (list_empty(&amp;space_info-&gt;tickets)) {</div><div class='del'>-		space_info-&gt;flush = 0;</div><div class='add'>+		space_info-&gt;flush = false;</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1302,27 +1418,27 @@ static void btrfs_async_reclaim_data_space(struct work_struct *work)</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	while (!space_info-&gt;full) {</div><div class='del'>-		flush_space(fs_info, space_info, U64_MAX, ALLOC_CHUNK_FORCE, false);</div><div class='add'>+		flush_space(space_info, U64_MAX, ALLOC_CHUNK_FORCE, false);</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		if (list_empty(&amp;space_info-&gt;tickets)) {</div><div class='del'>-			space_info-&gt;flush = 0;</div><div class='add'>+			space_info-&gt;flush = false;</div><div class='ctx'> 			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Something happened, fail everything and bail. */</div><div class='del'>-		if (BTRFS_FS_ERROR(fs_info))</div><div class='add'>+		if (unlikely(BTRFS_FS_ERROR(fs_info)))</div><div class='ctx'> 			goto aborted_fs;</div><div class='ctx'> 		last_tickets_id = space_info-&gt;tickets_id;</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (flush_state &lt; ARRAY_SIZE(data_flush_states)) {</div><div class='del'>-		flush_space(fs_info, space_info, U64_MAX,</div><div class='add'>+		flush_space(space_info, U64_MAX,</div><div class='ctx'> 			    data_flush_states[flush_state], false);</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 		if (list_empty(&amp;space_info-&gt;tickets)) {</div><div class='del'>-			space_info-&gt;flush = 0;</div><div class='add'>+			space_info-&gt;flush = false;</div><div class='ctx'> 			spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1336,16 +1452,16 @@ static void btrfs_async_reclaim_data_space(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		if (flush_state &gt;= ARRAY_SIZE(data_flush_states)) {</div><div class='ctx'> 			if (space_info-&gt;full) {</div><div class='del'>-				if (maybe_fail_all_tickets(fs_info, space_info))</div><div class='add'>+				if (maybe_fail_all_tickets(space_info))</div><div class='ctx'> 					flush_state = 0;</div><div class='ctx'> 				else</div><div class='del'>-					space_info-&gt;flush = 0;</div><div class='add'>+					space_info-&gt;flush = false;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				flush_state = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Something happened, fail everything and bail. */</div><div class='del'>-			if (BTRFS_FS_ERROR(fs_info))</div><div class='add'>+			if (unlikely(BTRFS_FS_ERROR(fs_info)))</div><div class='ctx'> 				goto aborted_fs;</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='hunk'>@@ -1354,11 +1470,24 @@ static void btrfs_async_reclaim_data_space(struct work_struct *work)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> aborted_fs:</div><div class='del'>-	maybe_fail_all_tickets(fs_info, space_info);</div><div class='del'>-	space_info-&gt;flush = 0;</div><div class='add'>+	maybe_fail_all_tickets(space_info);</div><div class='add'>+	space_info-&gt;flush = false;</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void btrfs_async_reclaim_data_space(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	struct btrfs_space_info *space_info;</div><div class='add'>+</div><div class='add'>+	fs_info = container_of(work, struct btrfs_fs_info, async_data_reclaim_work);</div><div class='add'>+	space_info = fs_info-&gt;data_sinfo;</div><div class='add'>+	do_async_reclaim_data_space(space_info);</div><div class='add'>+	for (int i = 0; i &lt; BTRFS_SPACE_INFO_SUB_GROUP_MAX; i++)</div><div class='add'>+		if (space_info-&gt;sub_group[i])</div><div class='add'>+			do_async_reclaim_data_space(space_info-&gt;sub_group[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void btrfs_init_async_reclaim_work(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_WORK(&amp;fs_info-&gt;async_reclaim_work, btrfs_async_reclaim_metadata_space);</div><div class='hunk'>@@ -1370,6 +1499,7 @@ void btrfs_init_async_reclaim_work(struct btrfs_fs_info *fs_info)</div><div class='ctx'> static const enum btrfs_flush_state priority_flush_states[] = {</div><div class='ctx'> 	FLUSH_DELAYED_ITEMS_NR,</div><div class='ctx'> 	FLUSH_DELAYED_ITEMS,</div><div class='add'>+	RESET_ZONES,</div><div class='ctx'> 	ALLOC_CHUNK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1383,106 +1513,105 @@ static const enum btrfs_flush_state evict_flush_states[] = {</div><div class='ctx'> 	FLUSH_DELALLOC_FULL,</div><div class='ctx'> 	ALLOC_CHUNK,</div><div class='ctx'> 	COMMIT_TRANS,</div><div class='add'>+	RESET_ZONES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_space_info *space_info,</div><div class='del'>-				struct reserve_ticket *ticket,</div><div class='del'>-				const enum btrfs_flush_state *states,</div><div class='del'>-				int states_nr)</div><div class='add'>+static bool is_ticket_served(struct reserve_ticket *ticket)</div><div class='ctx'> {</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ticket-&gt;lock);</div><div class='add'>+	ret = (ticket-&gt;bytes == 0);</div><div class='add'>+	spin_unlock(&amp;ticket-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void priority_reclaim_metadata_space(struct btrfs_space_info *space_info,</div><div class='add'>+					    struct reserve_ticket *ticket,</div><div class='add'>+					    const enum btrfs_flush_state *states,</div><div class='add'>+					    int states_nr)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	u64 to_reclaim;</div><div class='ctx'> 	int flush_state = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-	to_reclaim = btrfs_calc_reclaim_metadata_size(fs_info, space_info);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is the priority reclaim path, so to_reclaim could be &gt;0 still</div><div class='ctx'> 	 * because we may have only satisfied the priority tickets and still</div><div class='ctx'> 	 * left non priority tickets on the list.  We would then have</div><div class='ctx'> 	 * to_reclaim but -&gt;bytes == 0.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ticket-&gt;bytes == 0) {</div><div class='del'>-		spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+	if (is_ticket_served(ticket))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	to_reclaim = btrfs_calc_reclaim_metadata_size(space_info);</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	while (flush_state &lt; states_nr) {</div><div class='del'>-		spin_unlock(&amp;space_info-&gt;lock);</div><div class='del'>-		flush_space(fs_info, space_info, to_reclaim, states[flush_state],</div><div class='del'>-			    false);</div><div class='del'>-		flush_state++;</div><div class='del'>-		spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-		if (ticket-&gt;bytes == 0) {</div><div class='del'>-			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+		flush_space(space_info, to_reclaim, states[flush_state], false);</div><div class='add'>+		if (is_ticket_served(ticket))</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='add'>+		flush_state++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Attempt to steal from the global rsv if we can, except if the fs was</div><div class='ctx'> 	 * turned into error mode due to a transaction abort when flushing space</div><div class='ctx'> 	 * above, in that case fail with the abort error instead of returning</div><div class='ctx'> 	 * success to the caller if we can steal from the global rsv - this is</div><div class='del'>-	 * just to have caller fail immeditelly instead of later when trying to</div><div class='add'>+	 * just to have caller fail immediately instead of later when trying to</div><div class='ctx'> 	 * modify the fs, making it easier to debug -ENOSPC problems.</div><div class='ctx'> 	 */</div><div class='del'>-	if (BTRFS_FS_ERROR(fs_info)) {</div><div class='del'>-		ticket-&gt;error = BTRFS_FS_ERROR(fs_info);</div><div class='del'>-		remove_ticket(space_info, ticket);</div><div class='del'>-	} else if (!steal_from_global_rsv(fs_info, space_info, ticket)) {</div><div class='del'>-		ticket-&gt;error = -ENOSPC;</div><div class='del'>-		remove_ticket(space_info, ticket);</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(BTRFS_FS_ERROR(fs_info)))</div><div class='add'>+		remove_ticket(space_info, ticket, BTRFS_FS_ERROR(fs_info));</div><div class='add'>+	else if (!steal_from_global_rsv(space_info, ticket))</div><div class='add'>+		remove_ticket(space_info, ticket, -ENOSPC);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must run try_granting_tickets here because we could be a large</div><div class='ctx'> 	 * ticket in front of a smaller ticket that can now be satisfied with</div><div class='ctx'> 	 * the available space.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_try_granting_tickets(fs_info, space_info);</div><div class='add'>+	btrfs_try_granting_tickets(space_info);</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void priority_reclaim_data_space(struct btrfs_fs_info *fs_info,</div><div class='del'>-					struct btrfs_space_info *space_info,</div><div class='add'>+static void priority_reclaim_data_space(struct btrfs_space_info *space_info,</div><div class='ctx'> 					struct reserve_ticket *ticket)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	/* We could have been granted before we got here. */</div><div class='del'>-	if (ticket-&gt;bytes == 0) {</div><div class='del'>-		spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+	if (is_ticket_served(ticket))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	while (!space_info-&gt;full) {</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='del'>-		flush_space(fs_info, space_info, U64_MAX, ALLOC_CHUNK_FORCE, false);</div><div class='del'>-		spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-		if (ticket-&gt;bytes == 0) {</div><div class='del'>-			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+		flush_space(space_info, U64_MAX, ALLOC_CHUNK_FORCE, false);</div><div class='add'>+		if (is_ticket_served(ticket))</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='add'>+		spin_lock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ticket-&gt;error = -ENOSPC;</div><div class='del'>-	remove_ticket(space_info, ticket);</div><div class='del'>-	btrfs_try_granting_tickets(fs_info, space_info);</div><div class='add'>+	remove_ticket(space_info, ticket, -ENOSPC);</div><div class='add'>+	btrfs_try_granting_tickets(space_info);</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_space_info *space_info,</div><div class='add'>+static void wait_reserve_ticket(struct btrfs_space_info *space_info,</div><div class='ctx'> 				struct reserve_ticket *ticket)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_WAIT(wait);</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	spin_lock(&amp;ticket-&gt;lock);</div><div class='ctx'> 	while (ticket-&gt;bytes &gt; 0 &amp;&amp; ticket-&gt;error == 0) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='ctx'> 		ret = prepare_to_wait_event(&amp;ticket-&gt;wait, &amp;wait, TASK_KILLABLE);</div><div class='add'>+		spin_unlock(&amp;ticket-&gt;lock);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Delete us from the list. After we unlock the space</div><div class='hunk'>@@ -1492,24 +1621,23 @@ static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			 * despite getting an error, resulting in a space leak</div><div class='ctx'> 			 * (bytes_may_use counter of our space_info).</div><div class='ctx'> 			 */</div><div class='del'>-			remove_ticket(space_info, ticket);</div><div class='del'>-			ticket-&gt;error = -EINTR;</div><div class='del'>-			break;</div><div class='add'>+			spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+			remove_ticket(space_info, ticket, -EINTR);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		schedule();</div><div class='ctx'> </div><div class='ctx'> 		finish_wait(&amp;ticket-&gt;wait, &amp;wait);</div><div class='del'>-		spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+		spin_lock(&amp;ticket-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;ticket-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Do the appropriate flushing and waiting for a ticket.</div><div class='ctx'>  *</div><div class='del'>- * @fs_info:    the filesystem</div><div class='ctx'>  * @space_info: space info for the reservation</div><div class='ctx'>  * @ticket:     ticket for the reservation</div><div class='ctx'>  * @start_ns:   timestamp when the reservation started</div><div class='hunk'>@@ -1519,8 +1647,7 @@ static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * This does the work of figuring out how to flush for the ticket, waiting for</div><div class='ctx'>  * the reservation, and returning the appropriate error if there is one.</div><div class='ctx'>  */</div><div class='del'>-static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct btrfs_space_info *space_info,</div><div class='add'>+static int handle_reserve_ticket(struct btrfs_space_info *space_info,</div><div class='ctx'> 				 struct reserve_ticket *ticket,</div><div class='ctx'> 				 u64 start_ns, u64 orig_bytes,</div><div class='ctx'> 				 enum btrfs_reserve_flush_enum flush)</div><div class='hunk'>@@ -1531,23 +1658,23 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	case BTRFS_RESERVE_FLUSH_DATA:</div><div class='ctx'> 	case BTRFS_RESERVE_FLUSH_ALL:</div><div class='ctx'> 	case BTRFS_RESERVE_FLUSH_ALL_STEAL:</div><div class='del'>-		wait_reserve_ticket(fs_info, space_info, ticket);</div><div class='add'>+		wait_reserve_ticket(space_info, ticket);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_RESERVE_FLUSH_LIMIT:</div><div class='del'>-		priority_reclaim_metadata_space(fs_info, space_info, ticket,</div><div class='add'>+		priority_reclaim_metadata_space(space_info, ticket,</div><div class='ctx'> 						priority_flush_states,</div><div class='ctx'> 						ARRAY_SIZE(priority_flush_states));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_RESERVE_FLUSH_EVICT:</div><div class='del'>-		priority_reclaim_metadata_space(fs_info, space_info, ticket,</div><div class='add'>+		priority_reclaim_metadata_space(space_info, ticket,</div><div class='ctx'> 						evict_flush_states,</div><div class='ctx'> 						ARRAY_SIZE(evict_flush_states));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE:</div><div class='del'>-		priority_reclaim_data_space(fs_info, space_info, ticket);</div><div class='add'>+		priority_reclaim_data_space(space_info, ticket);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		ASSERT(0, "flush=%d", flush);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1559,9 +1686,10 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * releasing reserved space (if an error happens the expectation is that</div><div class='ctx'> 	 * space wasn't reserved at all).</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(!(ticket-&gt;bytes == 0 &amp;&amp; ticket-&gt;error));</div><div class='del'>-	trace_btrfs_reserve_ticket(fs_info, space_info-&gt;flags, orig_bytes,</div><div class='del'>-				   start_ns, flush, ticket-&gt;error);</div><div class='add'>+	ASSERT(!(ticket-&gt;bytes == 0 &amp;&amp; ticket-&gt;error),</div><div class='add'>+	       "ticket-&gt;bytes=%llu ticket-&gt;error=%d", ticket-&gt;bytes, ticket-&gt;error);</div><div class='add'>+	trace_btrfs_reserve_ticket(space_info-&gt;fs_info, space_info-&gt;flags,</div><div class='add'>+				   orig_bytes, start_ns, flush, ticket-&gt;error);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1575,9 +1703,9 @@ static inline bool is_normal_flushing(enum btrfs_reserve_flush_enum flush)</div><div class='ctx'> 		(flush == BTRFS_RESERVE_FLUSH_ALL_STEAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void maybe_clamp_preempt(struct btrfs_fs_info *fs_info,</div><div class='del'>-				       struct btrfs_space_info *space_info)</div><div class='add'>+static inline void maybe_clamp_preempt(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	u64 ordered = percpu_counter_sum_positive(&amp;fs_info-&gt;ordered_bytes);</div><div class='ctx'> 	u64 delalloc = percpu_counter_sum_positive(&amp;fs_info-&gt;delalloc_bytes);</div><div class='ctx'> </div><div class='hunk'>@@ -1612,7 +1740,6 @@ static inline bool can_ticket(enum btrfs_reserve_flush_enum flush)</div><div class='ctx'> /*</div><div class='ctx'>  * Try to reserve bytes from the block_rsv's space.</div><div class='ctx'>  *</div><div class='del'>- * @fs_info:    the filesystem</div><div class='ctx'>  * @space_info: space info we want to allocate from</div><div class='ctx'>  * @orig_bytes: number of bytes we want</div><div class='ctx'>  * @flush:      whether or not we can flush to make our reservation</div><div class='hunk'>@@ -1624,10 +1751,10 @@ static inline bool can_ticket(enum btrfs_reserve_flush_enum flush)</div><div class='ctx'>  * regain reservations will be made and this will fail if there is not enough</div><div class='ctx'>  * space already.</div><div class='ctx'>  */</div><div class='del'>-static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='del'>-			   struct btrfs_space_info *space_info, u64 orig_bytes,</div><div class='del'>-			   enum btrfs_reserve_flush_enum flush)</div><div class='add'>+static int reserve_bytes(struct btrfs_space_info *space_info, u64 orig_bytes,</div><div class='add'>+			 enum btrfs_reserve_flush_enum flush)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	struct work_struct *async_work;</div><div class='ctx'> 	struct reserve_ticket ticket;</div><div class='ctx'> 	u64 start_ns = 0;</div><div class='hunk'>@@ -1635,7 +1762,7 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	int ret = -ENOSPC;</div><div class='ctx'> 	bool pending_tickets;</div><div class='ctx'> </div><div class='del'>-	ASSERT(orig_bytes);</div><div class='add'>+	ASSERT(orig_bytes, "orig_bytes=%llu", orig_bytes);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If have a transaction handle (current-&gt;journal_info != NULL), then</div><div class='ctx'> 	 * the flush method can not be neither BTRFS_RESERVE_FLUSH_ALL* nor</div><div class='hunk'>@@ -1644,9 +1771,9 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (current-&gt;journal_info) {</div><div class='ctx'> 		/* One assert per line for easier debugging. */</div><div class='del'>-		ASSERT(flush != BTRFS_RESERVE_FLUSH_ALL);</div><div class='del'>-		ASSERT(flush != BTRFS_RESERVE_FLUSH_ALL_STEAL);</div><div class='del'>-		ASSERT(flush != BTRFS_RESERVE_FLUSH_EVICT);</div><div class='add'>+		ASSERT(flush != BTRFS_RESERVE_FLUSH_ALL, "flush=%d", flush);</div><div class='add'>+		ASSERT(flush != BTRFS_RESERVE_FLUSH_ALL_STEAL, "flush=%d", flush);</div><div class='add'>+		ASSERT(flush != BTRFS_RESERVE_FLUSH_EVICT, "flush=%d", flush);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flush == BTRFS_RESERVE_FLUSH_DATA)</div><div class='hunk'>@@ -1674,9 +1801,8 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!pending_tickets &amp;&amp;</div><div class='ctx'> 	    ((used + orig_bytes &lt;= space_info-&gt;total_bytes) ||</div><div class='del'>-	     btrfs_can_overcommit(fs_info, space_info, orig_bytes, flush))) {</div><div class='del'>-		btrfs_space_info_update_bytes_may_use(fs_info, space_info,</div><div class='del'>-						      orig_bytes);</div><div class='add'>+	     can_overcommit(space_info, used, orig_bytes, flush))) {</div><div class='add'>+		btrfs_space_info_update_bytes_may_use(space_info, orig_bytes);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1686,10 +1812,9 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * left to allocate for the block.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ret &amp;&amp; unlikely(flush == BTRFS_RESERVE_FLUSH_EMERGENCY)) {</div><div class='del'>-		used = btrfs_space_info_used(space_info, false);</div><div class='add'>+		used -= space_info-&gt;bytes_may_use;</div><div class='ctx'> 		if (used + orig_bytes &lt;= space_info-&gt;total_bytes) {</div><div class='del'>-			btrfs_space_info_update_bytes_may_use(fs_info, space_info,</div><div class='del'>-							      orig_bytes);</div><div class='add'>+			btrfs_space_info_update_bytes_may_use(space_info, orig_bytes);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1706,6 +1831,7 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		ticket.error = 0;</div><div class='ctx'> 		space_info-&gt;reclaim_size += ticket.bytes;</div><div class='ctx'> 		init_waitqueue_head(&amp;ticket.wait);</div><div class='add'>+		spin_lock_init(&amp;ticket.lock);</div><div class='ctx'> 		ticket.steal = can_steal(flush);</div><div class='ctx'> 		if (trace_btrfs_reserve_ticket_enabled())</div><div class='ctx'> 			start_ns = ktime_get_ns();</div><div class='hunk'>@@ -1722,14 +1848,14 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 * preemptive flushing in order to keep up with</div><div class='ctx'> 				 * the workload.</div><div class='ctx'> 				 */</div><div class='del'>-				maybe_clamp_preempt(fs_info, space_info);</div><div class='add'>+				maybe_clamp_preempt(space_info);</div><div class='ctx'> </div><div class='del'>-				space_info-&gt;flush = 1;</div><div class='add'>+				space_info-&gt;flush = true;</div><div class='ctx'> 				trace_btrfs_trigger_flush(fs_info,</div><div class='ctx'> 							  space_info-&gt;flags,</div><div class='ctx'> 							  orig_bytes, flush,</div><div class='ctx'> 							  "enospc");</div><div class='del'>-				queue_work(system_unbound_wq, async_work);</div><div class='add'>+				queue_work(system_dfl_wq, async_work);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			list_add_tail(&amp;ticket.list,</div><div class='hunk'>@@ -1743,10 +1869,10 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!test_bit(BTRFS_FS_LOG_RECOVERING, &amp;fs_info-&gt;flags) &amp;&amp;</div><div class='ctx'> 		    !work_busy(&amp;fs_info-&gt;preempt_reclaim_work) &amp;&amp;</div><div class='del'>-		    need_preemptive_reclaim(fs_info, space_info)) {</div><div class='add'>+		    need_preemptive_reclaim(space_info)) {</div><div class='ctx'> 			trace_btrfs_trigger_flush(fs_info, space_info-&gt;flags,</div><div class='ctx'> 						  orig_bytes, flush, "preempt");</div><div class='del'>-			queue_work(system_unbound_wq,</div><div class='add'>+			queue_work(system_dfl_wq,</div><div class='ctx'> 				   &amp;fs_info-&gt;preempt_reclaim_work);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1754,14 +1880,12 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (!ret || !can_ticket(flush))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return handle_reserve_ticket(fs_info, space_info, &amp;ticket, start_ns,</div><div class='del'>-				     orig_bytes, flush);</div><div class='add'>+	return handle_reserve_ticket(space_info, &amp;ticket, start_ns, orig_bytes, flush);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Try to reserve metadata bytes from the block_rsv's space.</div><div class='ctx'>  *</div><div class='del'>- * @fs_info:    the filesystem</div><div class='ctx'>  * @space_info: the space_info we're allocating for</div><div class='ctx'>  * @orig_bytes: number of bytes we want</div><div class='ctx'>  * @flush:      whether or not we can flush to make our reservation</div><div class='hunk'>@@ -1773,20 +1897,21 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * regain reservations will be made and this will fail if there is not enough</div><div class='ctx'>  * space already.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct btrfs_space_info *space_info,</div><div class='add'>+int btrfs_reserve_metadata_bytes(struct btrfs_space_info *space_info,</div><div class='ctx'> 				 u64 orig_bytes,</div><div class='ctx'> 				 enum btrfs_reserve_flush_enum flush)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __reserve_bytes(fs_info, space_info, orig_bytes, flush);</div><div class='add'>+	ret = reserve_bytes(space_info, orig_bytes, flush);</div><div class='ctx'> 	if (ret == -ENOSPC) {</div><div class='add'>+		struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='add'>+</div><div class='ctx'> 		trace_btrfs_space_reservation(fs_info, "space_info:enospc",</div><div class='ctx'> 					      space_info-&gt;flags, orig_bytes, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))</div><div class='del'>-			btrfs_dump_space_info(fs_info, space_info, orig_bytes, 0);</div><div class='add'>+			btrfs_dump_space_info(space_info, orig_bytes, false);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1794,30 +1919,32 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,</div><div class='ctx'> /*</div><div class='ctx'>  * Try to reserve data bytes for an allocation.</div><div class='ctx'>  *</div><div class='del'>- * @fs_info: the filesystem</div><div class='add'>+ * @space_info: the space_info we're allocating for</div><div class='ctx'>  * @bytes:   number of bytes we need</div><div class='ctx'>  * @flush:   how we are allowed to flush</div><div class='ctx'>  *</div><div class='ctx'>  * This will reserve bytes from the data space info.  If there is not enough</div><div class='ctx'>  * space then we will attempt to flush space as specified by flush.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_reserve_data_bytes(struct btrfs_fs_info *fs_info, u64 bytes,</div><div class='add'>+int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,</div><div class='ctx'> 			     enum btrfs_reserve_flush_enum flush)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_space_info *data_sinfo = fs_info-&gt;data_sinfo;</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(flush == BTRFS_RESERVE_FLUSH_DATA ||</div><div class='ctx'> 	       flush == BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE ||</div><div class='del'>-	       flush == BTRFS_RESERVE_NO_FLUSH);</div><div class='del'>-	ASSERT(!current-&gt;journal_info || flush != BTRFS_RESERVE_FLUSH_DATA);</div><div class='add'>+	       flush == BTRFS_RESERVE_NO_FLUSH, "flush=%d", flush);</div><div class='add'>+	ASSERT(!current-&gt;journal_info || flush != BTRFS_RESERVE_FLUSH_DATA,</div><div class='add'>+	       "current-&gt;journal_info=0x%lx flush=%d",</div><div class='add'>+	       (unsigned long)current-&gt;journal_info, flush);</div><div class='ctx'> </div><div class='del'>-	ret = __reserve_bytes(fs_info, data_sinfo, bytes, flush);</div><div class='add'>+	ret = reserve_bytes(space_info, bytes, flush);</div><div class='ctx'> 	if (ret == -ENOSPC) {</div><div class='ctx'> 		trace_btrfs_space_reservation(fs_info, "space_info:enospc",</div><div class='del'>-					      data_sinfo-&gt;flags, bytes, 1);</div><div class='add'>+					      space_info-&gt;flags, bytes, 1);</div><div class='ctx'> 		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))</div><div class='del'>-			btrfs_dump_space_info(fs_info, data_sinfo, bytes, 0);</div><div class='add'>+			btrfs_dump_space_info(space_info, bytes, false);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1830,7 +1957,7 @@ __cold void btrfs_dump_space_info_for_trans_abort(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_info(fs_info, "dumping space info:");</div><div class='ctx'> 	list_for_each_entry(space_info, &amp;fs_info-&gt;space_info, list) {</div><div class='ctx'> 		spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-		__btrfs_dump_space_info(fs_info, space_info);</div><div class='add'>+		__btrfs_dump_space_info(space_info);</div><div class='ctx'> 		spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	dump_global_block_rsv(fs_info);</div><div class='hunk'>@@ -1847,7 +1974,7 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)</div><div class='ctx'> 	int factor;</div><div class='ctx'> </div><div class='ctx'> 	/* It's df, we don't care if it's racy */</div><div class='del'>-	if (list_empty(&amp;sinfo-&gt;ro_bgs))</div><div class='add'>+	if (data_race(list_empty(&amp;sinfo-&gt;ro_bgs)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sinfo-&gt;lock);</div><div class='hunk'>@@ -1869,3 +1996,230 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)</div><div class='ctx'> </div><div class='ctx'> 	return free_bytes;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static u64 calc_pct_ratio(u64 x, u64 y)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!y)</div><div class='add'>+		return 0;</div><div class='add'>+again:</div><div class='add'>+	ret = check_mul_overflow(100, x, &amp;x);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto lose_precision;</div><div class='add'>+	return div64_u64(x, y);</div><div class='add'>+lose_precision:</div><div class='add'>+	x &gt;&gt;= 10;</div><div class='add'>+	y &gt;&gt;= 10;</div><div class='add'>+	if (!y)</div><div class='add'>+		y = 1;</div><div class='add'>+	goto again;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A reasonable buffer for unallocated space is 10 data block_groups.</div><div class='add'>+ * If we claw this back repeatedly, we can still achieve efficient</div><div class='add'>+ * utilization when near full, and not do too much reclaim while</div><div class='add'>+ * always maintaining a solid buffer for workloads that quickly</div><div class='add'>+ * allocate and pressure the unallocated space.</div><div class='add'>+ */</div><div class='add'>+static u64 calc_unalloc_target(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	u64 chunk_sz = calc_effective_data_chunk_size(fs_info);</div><div class='add'>+</div><div class='add'>+	return BTRFS_UNALLOC_BLOCK_GROUP_TARGET * chunk_sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The fundamental goal of automatic reclaim is to protect the filesystem's</div><div class='add'>+ * unallocated space and thus minimize the probability of the filesystem going</div><div class='add'>+ * read only when a metadata allocation failure causes a transaction abort.</div><div class='add'>+ *</div><div class='add'>+ * However, relocations happen into the space_info's unused space, therefore</div><div class='add'>+ * automatic reclaim must also back off as that space runs low. There is no</div><div class='add'>+ * value in doing trivial "relocations" of re-writing the same block group</div><div class='add'>+ * into a fresh one.</div><div class='add'>+ *</div><div class='add'>+ * Furthermore, we want to avoid doing too much reclaim even if there are good</div><div class='add'>+ * candidates. This is because the allocator is pretty good at filling up the</div><div class='add'>+ * holes with writes. So we want to do just enough reclaim to try and stay</div><div class='add'>+ * safe from running out of unallocated space but not be wasteful about it.</div><div class='add'>+ *</div><div class='add'>+ * Therefore, the dynamic reclaim threshold is calculated as follows:</div><div class='add'>+ * - calculate a target unallocated amount of 5 block group sized chunks</div><div class='add'>+ * - ratchet up the intensity of reclaim depending on how far we are from</div><div class='add'>+ *   that target by using a formula of unalloc / target to set the threshold.</div><div class='add'>+ *</div><div class='add'>+ * Typically with 10 block groups as the target, the discrete values this comes</div><div class='add'>+ * out to are 0, 10, 20, ... , 80, 90, and 99.</div><div class='add'>+ */</div><div class='add'>+static int calc_dynamic_reclaim_threshold(const struct btrfs_space_info *space_info)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='add'>+	u64 unalloc = atomic64_read(&amp;fs_info-&gt;free_chunk_space);</div><div class='add'>+	u64 target = calc_unalloc_target(fs_info);</div><div class='add'>+	u64 alloc = space_info-&gt;total_bytes;</div><div class='add'>+	u64 used = btrfs_space_info_used(space_info, false);</div><div class='add'>+	u64 unused = alloc - used;</div><div class='add'>+	u64 want = target &gt; unalloc ? target - unalloc : 0;</div><div class='add'>+	u64 data_chunk_size = calc_effective_data_chunk_size(fs_info);</div><div class='add'>+</div><div class='add'>+	/* If we have no unused space, don't bother, it won't work anyway. */</div><div class='add'>+	if (unused &lt; data_chunk_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Cast to int is OK because want &lt;= target. */</div><div class='add'>+	return calc_pct_ratio(want, target);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_calc_reclaim_threshold(const struct btrfs_space_info *space_info)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(space_info-&gt;dynamic_reclaim))</div><div class='add'>+		return calc_dynamic_reclaim_threshold(space_info);</div><div class='add'>+	return READ_ONCE(space_info-&gt;bg_reclaim_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Under "urgent" reclaim, we will reclaim even fresh block groups that have</div><div class='add'>+ * recently seen successful allocations, as we are desperate to reclaim</div><div class='add'>+ * whatever we can to avoid ENOSPC in a transaction leading to a readonly fs.</div><div class='add'>+ */</div><div class='add'>+static bool is_reclaim_urgent(struct btrfs_space_info *space_info)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='add'>+	u64 unalloc = atomic64_read(&amp;fs_info-&gt;free_chunk_space);</div><div class='add'>+	u64 data_chunk_size = calc_effective_data_chunk_size(fs_info);</div><div class='add'>+</div><div class='add'>+	return unalloc &lt; data_chunk_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_reclaim_sweep(struct btrfs_space_info *space_info, int raid)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_block_group *bg;</div><div class='add'>+	int thresh_pct;</div><div class='add'>+	bool try_again = true;</div><div class='add'>+	bool urgent;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	urgent = is_reclaim_urgent(space_info);</div><div class='add'>+	thresh_pct = btrfs_calc_reclaim_threshold(space_info);</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	down_read(&amp;space_info-&gt;groups_sem);</div><div class='add'>+again:</div><div class='add'>+	list_for_each_entry(bg, &amp;space_info-&gt;block_groups[raid], list) {</div><div class='add'>+		u64 thresh;</div><div class='add'>+		bool reclaim = false;</div><div class='add'>+</div><div class='add'>+		btrfs_get_block_group(bg);</div><div class='add'>+		spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+		thresh = mult_perc(bg-&gt;length, thresh_pct);</div><div class='add'>+		if (bg-&gt;used &lt; thresh &amp;&amp; bg-&gt;reclaim_mark) {</div><div class='add'>+			try_again = false;</div><div class='add'>+			reclaim = true;</div><div class='add'>+		}</div><div class='add'>+		bg-&gt;reclaim_mark++;</div><div class='add'>+		spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+		if (reclaim)</div><div class='add'>+			btrfs_mark_bg_to_reclaim(bg);</div><div class='add'>+		btrfs_put_block_group(bg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In situations where we are very motivated to reclaim (low unalloc)</div><div class='add'>+	 * use two passes to make the reclaim mark check best effort.</div><div class='add'>+	 *</div><div class='add'>+	 * If we have any staler groups, we don't touch the fresher ones, but if we</div><div class='add'>+	 * really need a block group, do take a fresh one.</div><div class='add'>+	 */</div><div class='add'>+	if (try_again &amp;&amp; urgent) {</div><div class='add'>+		try_again = false;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up_read(&amp;space_info-&gt;groups_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_space_info_update_reclaimable(struct btrfs_space_info *space_info, s64 bytes)</div><div class='add'>+{</div><div class='add'>+	u64 chunk_sz = calc_effective_data_chunk_size(space_info-&gt;fs_info);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='add'>+	space_info-&gt;reclaimable_bytes += bytes;</div><div class='add'>+</div><div class='add'>+	if (space_info-&gt;reclaimable_bytes &gt;= chunk_sz)</div><div class='add'>+		btrfs_set_periodic_reclaim_ready(space_info, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_set_periodic_reclaim_ready(struct btrfs_space_info *space_info, bool ready)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='add'>+	if (!READ_ONCE(space_info-&gt;periodic_reclaim))</div><div class='add'>+		return;</div><div class='add'>+	if (ready != space_info-&gt;periodic_reclaim_ready) {</div><div class='add'>+		space_info-&gt;periodic_reclaim_ready = ready;</div><div class='add'>+		if (!ready)</div><div class='add'>+			space_info-&gt;reclaimable_bytes = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool btrfs_should_periodic_reclaim(struct btrfs_space_info *space_info)</div><div class='add'>+{</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	if (space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_SYSTEM)</div><div class='add'>+		return false;</div><div class='add'>+	if (!READ_ONCE(space_info-&gt;periodic_reclaim))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	ret = space_info-&gt;periodic_reclaim_ready;</div><div class='add'>+	btrfs_set_periodic_reclaim_ready(space_info, false);</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_reclaim_sweep(const struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	int raid;</div><div class='add'>+	struct btrfs_space_info *space_info;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(space_info, &amp;fs_info-&gt;space_info, list) {</div><div class='add'>+		if (!btrfs_should_periodic_reclaim(space_info))</div><div class='add'>+			continue;</div><div class='add'>+		for (raid = 0; raid &lt; BTRFS_NR_RAID_TYPES; raid++)</div><div class='add'>+			do_reclaim_sweep(space_info, raid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_return_free_space(struct btrfs_space_info *space_info, u64 len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='add'>+	struct btrfs_block_rsv *global_rsv = &amp;fs_info-&gt;global_block_rsv;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Prioritize the global reservation to receive the freed space. */</div><div class='add'>+	if (global_rsv-&gt;space_info != space_info)</div><div class='add'>+		goto grant;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;global_rsv-&gt;lock);</div><div class='add'>+	if (!global_rsv-&gt;full) {</div><div class='add'>+		u64 to_add = min(len, global_rsv-&gt;size - global_rsv-&gt;reserved);</div><div class='add'>+</div><div class='add'>+		global_rsv-&gt;reserved += to_add;</div><div class='add'>+		btrfs_space_info_update_bytes_may_use(space_info, to_add);</div><div class='add'>+		if (global_rsv-&gt;reserved &gt;= global_rsv-&gt;size)</div><div class='add'>+			global_rsv-&gt;full = true;</div><div class='add'>+		len -= to_add;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;global_rsv-&gt;lock);</div><div class='add'>+</div><div class='add'>+grant:</div><div class='add'>+	/* Add to any tickets we may have. */</div><div class='add'>+	if (len)</div><div class='add'>+		btrfs_try_granting_tickets(space_info);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h<br/>index 92c595fed1b0..446c0614ad4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/space-info.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/space-info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/space-info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/space-info.h</a></div><div class='hunk'>@@ -4,8 +4,17 @@</div><div class='ctx'> #define BTRFS_SPACE_INFO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/btrfs.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> </div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Different levels for to flush space when doing space reservations.</div><div class='ctx'>  *</div><div class='hunk'>@@ -70,6 +79,10 @@ enum btrfs_reserve_flush_enum {</div><div class='ctx'> 	BTRFS_RESERVE_FLUSH_EMERGENCY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Please be aware that the order of enum values will be the order of the reclaim</div><div class='add'>+ * process in btrfs_async_reclaim_metadata_space().</div><div class='add'>+ */</div><div class='ctx'> enum btrfs_flush_state {</div><div class='ctx'> 	FLUSH_DELAYED_ITEMS_NR	= 1,</div><div class='ctx'> 	FLUSH_DELAYED_ITEMS	= 2,</div><div class='hunk'>@@ -82,9 +95,21 @@ enum btrfs_flush_state {</div><div class='ctx'> 	ALLOC_CHUNK_FORCE	= 9,</div><div class='ctx'> 	RUN_DELAYED_IPUTS	= 10,</div><div class='ctx'> 	COMMIT_TRANS		= 11,</div><div class='add'>+	RESET_ZONES		= 12,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum btrfs_space_info_sub_group {</div><div class='add'>+	BTRFS_SUB_GROUP_PRIMARY,</div><div class='add'>+	BTRFS_SUB_GROUP_DATA_RELOC,</div><div class='add'>+	BTRFS_SUB_GROUP_TREELOG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BTRFS_SPACE_INFO_SUB_GROUP_MAX 1</div><div class='ctx'> struct btrfs_space_info {</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	struct btrfs_space_info *parent;</div><div class='add'>+	struct btrfs_space_info *sub_group[BTRFS_SPACE_INFO_SUB_GROUP_MAX];</div><div class='add'>+	int subgroup_id;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='ctx'> 	u64 total_bytes;	/* total bytes in the space,</div><div class='hunk'>@@ -117,11 +142,11 @@ struct btrfs_space_info {</div><div class='ctx'> 				   flushing. The value is &gt;&gt; clamp, so turns</div><div class='ctx'> 				   out to be a 2^clamp divisor. */</div><div class='ctx'> </div><div class='del'>-	unsigned int full:1;	/* indicates that we cannot allocate any more</div><div class='add'>+	bool full;		/* indicates that we cannot allocate any more</div><div class='ctx'> 				   chunks for this space */</div><div class='del'>-	unsigned int chunk_alloc:1;	/* set if we are allocating a chunk */</div><div class='add'>+	bool chunk_alloc;	/* set if we are allocating a chunk */</div><div class='ctx'> </div><div class='del'>-	unsigned int flush:1;		/* set if we are trying to make space */</div><div class='add'>+	bool flush;		/* set if we are trying to make space */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int force_alloc;	/* set if we need to force a chunk</div><div class='ctx'> 					   alloc for this space */</div><div class='hunk'>@@ -156,17 +181,50 @@ struct btrfs_space_info {</div><div class='ctx'> </div><div class='ctx'> 	struct kobject kobj;</div><div class='ctx'> 	struct kobject *block_group_kobjs[BTRFS_NR_RAID_TYPES];</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-struct reserve_ticket {</div><div class='del'>-	u64 bytes;</div><div class='del'>-	int error;</div><div class='del'>-	bool steal;</div><div class='del'>-	struct list_head list;</div><div class='del'>-	wait_queue_head_t wait;</div><div class='add'>+	/*</div><div class='add'>+	 * Monotonically increasing counter of block group reclaim attempts</div><div class='add'>+	 * Exposed in /sys/fs/&lt;uuid&gt;/allocation/&lt;type&gt;/reclaim_count</div><div class='add'>+	 */</div><div class='add'>+	u64 reclaim_count;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Monotonically increasing counter of reclaimed bytes</div><div class='add'>+	 * Exposed in /sys/fs/&lt;uuid&gt;/allocation/&lt;type&gt;/reclaim_bytes</div><div class='add'>+	 */</div><div class='add'>+	u64 reclaim_bytes;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Monotonically increasing counter of reclaim errors</div><div class='add'>+	 * Exposed in /sys/fs/&lt;uuid&gt;/allocation/&lt;type&gt;/reclaim_errors</div><div class='add'>+	 */</div><div class='add'>+	u64 reclaim_errors;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If true, use the dynamic relocation threshold, instead of the</div><div class='add'>+	 * fixed bg_reclaim_threshold.</div><div class='add'>+	 */</div><div class='add'>+	bool dynamic_reclaim;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Periodically check all block groups against the reclaim</div><div class='add'>+	 * threshold in the cleaner thread.</div><div class='add'>+	 */</div><div class='add'>+	bool periodic_reclaim;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Periodic reclaim should be a no-op if a space_info hasn't</div><div class='add'>+	 * freed any space since the last time we tried.</div><div class='add'>+	 */</div><div class='add'>+	bool periodic_reclaim_ready;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Net bytes freed or allocated since the last reclaim pass.</div><div class='add'>+	 */</div><div class='add'>+	s64 reclaimable_bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)</div><div class='add'>+static inline bool btrfs_mixed_space_info(const struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='ctx'> 	return ((space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_METADATA) &amp;&amp;</div><div class='ctx'> 		(space_info-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA));</div><div class='hunk'>@@ -178,10 +236,10 @@ static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)</div><div class='ctx'>  */</div><div class='ctx'> #define DECLARE_SPACE_INFO_UPDATE(name, trace_name)			\</div><div class='ctx'> static inline void							\</div><div class='del'>-btrfs_space_info_update_##name(struct btrfs_fs_info *fs_info,		\</div><div class='del'>-			       struct btrfs_space_info *sinfo,		\</div><div class='add'>+btrfs_space_info_update_##name(struct btrfs_space_info *sinfo,		\</div><div class='ctx'> 			       s64 bytes)				\</div><div class='ctx'> {									\</div><div class='add'>+	struct btrfs_fs_info *fs_info = sinfo-&gt;fs_info;			\</div><div class='ctx'> 	const u64 abs_bytes = (bytes &lt; 0) ? -bytes : bytes;		\</div><div class='ctx'> 	lockdep_assert_held(&amp;sinfo-&gt;lock);				\</div><div class='ctx'> 	trace_update_##name(fs_info, sinfo, sinfo-&gt;name, bytes);	\</div><div class='hunk'>@@ -198,6 +256,18 @@ btrfs_space_info_update_##name(struct btrfs_fs_info *fs_info,		\</div><div class='ctx'> </div><div class='ctx'> DECLARE_SPACE_INFO_UPDATE(bytes_may_use, "space_info");</div><div class='ctx'> DECLARE_SPACE_INFO_UPDATE(bytes_pinned, "pinned");</div><div class='add'>+DECLARE_SPACE_INFO_UPDATE(bytes_zone_unusable, "zone_unusable");</div><div class='add'>+</div><div class='add'>+static inline u64 btrfs_space_info_used(const struct btrfs_space_info *s_info,</div><div class='add'>+					bool may_use_included)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;s_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return s_info-&gt;bytes_used + s_info-&gt;bytes_reserved +</div><div class='add'>+		s_info-&gt;bytes_pinned + s_info-&gt;bytes_readonly +</div><div class='add'>+		s_info-&gt;bytes_zone_unusable +</div><div class='add'>+		(may_use_included ? s_info-&gt;bytes_may_use : 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int btrfs_init_space_info(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_add_bg_to_space_info(struct btrfs_fs_info *info,</div><div class='hunk'>@@ -206,36 +276,35 @@ void btrfs_update_space_info_chunk_size(struct btrfs_space_info *space_info,</div><div class='ctx'> 					u64 chunk_size);</div><div class='ctx'> struct btrfs_space_info *btrfs_find_space_info(struct btrfs_fs_info *info,</div><div class='ctx'> 					       u64 flags);</div><div class='del'>-u64 __pure btrfs_space_info_used(struct btrfs_space_info *s_info,</div><div class='del'>-			  bool may_use_included);</div><div class='ctx'> void btrfs_clear_space_info_full(struct btrfs_fs_info *info);</div><div class='del'>-void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,</div><div class='del'>-			   struct btrfs_space_info *info, u64 bytes,</div><div class='del'>-			   int dump_block_groups);</div><div class='del'>-int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct btrfs_space_info *space_info,</div><div class='add'>+void btrfs_dump_space_info(struct btrfs_space_info *info, u64 bytes,</div><div class='add'>+			   bool dump_block_groups);</div><div class='add'>+int btrfs_reserve_metadata_bytes(struct btrfs_space_info *space_info,</div><div class='ctx'> 				 u64 orig_bytes,</div><div class='ctx'> 				 enum btrfs_reserve_flush_enum flush);</div><div class='del'>-void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_space_info *space_info);</div><div class='del'>-int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct btrfs_space_info *space_info, u64 bytes,</div><div class='del'>-			 enum btrfs_reserve_flush_enum flush);</div><div class='add'>+void btrfs_try_granting_tickets(struct btrfs_space_info *space_info);</div><div class='add'>+bool btrfs_can_overcommit(const struct btrfs_space_info *space_info, u64 bytes,</div><div class='add'>+			  enum btrfs_reserve_flush_enum flush);</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_space_info_free_bytes_may_use(</div><div class='del'>-				struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				struct btrfs_space_info *space_info,</div><div class='ctx'> 				u64 num_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;space_info-&gt;lock);</div><div class='del'>-	btrfs_space_info_update_bytes_may_use(fs_info, space_info, -num_bytes);</div><div class='del'>-	btrfs_try_granting_tickets(fs_info, space_info);</div><div class='add'>+	btrfs_space_info_update_bytes_may_use(space_info, -num_bytes);</div><div class='add'>+	btrfs_try_granting_tickets(space_info);</div><div class='ctx'> 	spin_unlock(&amp;space_info-&gt;lock);</div><div class='ctx'> }</div><div class='del'>-int btrfs_reserve_data_bytes(struct btrfs_fs_info *fs_info, u64 bytes,</div><div class='add'>+int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,</div><div class='ctx'> 			     enum btrfs_reserve_flush_enum flush);</div><div class='ctx'> void btrfs_dump_space_info_for_trans_abort(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_init_async_reclaim_work(struct btrfs_fs_info *fs_info);</div><div class='ctx'> u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo);</div><div class='ctx'> </div><div class='add'>+void btrfs_space_info_update_reclaimable(struct btrfs_space_info *space_info, s64 bytes);</div><div class='add'>+void btrfs_set_periodic_reclaim_ready(struct btrfs_space_info *space_info, bool ready);</div><div class='add'>+int btrfs_calc_reclaim_threshold(const struct btrfs_space_info *space_info);</div><div class='add'>+void btrfs_reclaim_sweep(const struct btrfs_fs_info *fs_info);</div><div class='add'>+void btrfs_return_free_space(struct btrfs_space_info *space_info, u64 len);</div><div class='add'>+</div><div class='ctx'> #endif /* BTRFS_SPACE_INFO_H */</div><div class='head'>diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c<br/>index 93511d54abf8..f82e71f5d88b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/subpage.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/subpage.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/subpage.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/subpage.c</a></div><div class='hunk'>@@ -2,12 +2,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "ctree.h"</div><div class='ctx'> #include "subpage.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Subpage (sectorsize &lt; PAGE_SIZE) support overview:</div><div class='add'>+ * Subpage (block size &lt; folio size) support overview:</div><div class='ctx'>  *</div><div class='ctx'>  * Limitations:</div><div class='ctx'>  *</div><div class='hunk'>@@ -50,7 +49,7 @@</div><div class='ctx'>  * Implementation:</div><div class='ctx'>  *</div><div class='ctx'>  * - Common</div><div class='del'>- *   Both metadata and data will use a new structure, btrfs_subpage, to</div><div class='add'>+ *   Both metadata and data will use a new structure, btrfs_folio_state, to</div><div class='ctx'>  *   record the status of each sector inside a page.  This provides the extra</div><div class='ctx'>  *   granularity needed.</div><div class='ctx'>  *</div><div class='hunk'>@@ -64,60 +63,14 @@</div><div class='ctx'>  *   This means a slightly higher tree locking latency.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-bool btrfs_is_subpage(const struct btrfs_fs_info *fs_info, struct address_space *mapping)</div><div class='add'>+int btrfs_attach_folio_state(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			     struct folio *folio, enum btrfs_folio_type type)</div><div class='ctx'> {</div><div class='del'>-	if (fs_info-&gt;sectorsize &gt;= PAGE_SIZE)</div><div class='del'>-		return false;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Only data pages (either through DIO or compression) can have no</div><div class='del'>-	 * mapping. And if page-&gt;mapping-&gt;host is data inode, it's subpage.</div><div class='del'>-	 * As we have ruled our sectorsize &gt;= PAGE_SIZE case already.</div><div class='del'>-	 */</div><div class='del'>-	if (!mapping || !mapping-&gt;host || is_data_inode(mapping-&gt;host))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now the only remaining case is metadata, which we only go subpage</div><div class='del'>-	 * routine if nodesize &lt; PAGE_SIZE.</div><div class='del'>-	 */</div><div class='del'>-	if (fs_info-&gt;nodesize &lt; PAGE_SIZE)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_init_subpage_info(struct btrfs_subpage_info *subpage_info, u32 sectorsize)</div><div class='del'>-{</div><div class='del'>-	unsigned int cur = 0;</div><div class='del'>-	unsigned int nr_bits;</div><div class='del'>-</div><div class='del'>-	ASSERT(IS_ALIGNED(PAGE_SIZE, sectorsize));</div><div class='del'>-</div><div class='del'>-	nr_bits = PAGE_SIZE / sectorsize;</div><div class='del'>-	subpage_info-&gt;bitmap_nr_bits = nr_bits;</div><div class='del'>-</div><div class='del'>-	subpage_info-&gt;uptodate_offset = cur;</div><div class='del'>-	cur += nr_bits;</div><div class='del'>-</div><div class='del'>-	subpage_info-&gt;dirty_offset = cur;</div><div class='del'>-	cur += nr_bits;</div><div class='del'>-</div><div class='del'>-	subpage_info-&gt;writeback_offset = cur;</div><div class='del'>-	cur += nr_bits;</div><div class='del'>-</div><div class='del'>-	subpage_info-&gt;ordered_offset = cur;</div><div class='del'>-	cur += nr_bits;</div><div class='del'>-</div><div class='del'>-	subpage_info-&gt;checked_offset = cur;</div><div class='del'>-	cur += nr_bits;</div><div class='del'>-</div><div class='del'>-	subpage_info-&gt;total_nr_bits = cur;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int btrfs_attach_subpage(const struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct folio *folio, enum btrfs_subpage_type type)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	/* For metadata we don't support large folio yet. */</div><div class='add'>+	if (type == BTRFS_SUBPAGE_METADATA)</div><div class='add'>+		ASSERT(!folio_test_large(folio));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have cases like a dummy extent buffer page, which is not mapped</div><div class='hunk'>@@ -127,59 +80,62 @@ int btrfs_attach_subpage(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		ASSERT(folio_test_locked(folio));</div><div class='ctx'> </div><div class='ctx'> 	/* Either not subpage, or the folio already has private attached. */</div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping) || folio_test_private(folio))</div><div class='add'>+	if (folio_test_private(folio))</div><div class='add'>+		return 0;</div><div class='add'>+	if (type == BTRFS_SUBPAGE_METADATA &amp;&amp; !btrfs_meta_is_subpage(fs_info))</div><div class='add'>+		return 0;</div><div class='add'>+	if (type == BTRFS_SUBPAGE_DATA &amp;&amp; !btrfs_is_subpage(fs_info, folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	subpage = btrfs_alloc_subpage(fs_info, type);</div><div class='del'>-	if (IS_ERR(subpage))</div><div class='del'>-		return  PTR_ERR(subpage);</div><div class='add'>+	bfs = btrfs_alloc_folio_state(fs_info, folio_size(folio), type);</div><div class='add'>+	if (IS_ERR(bfs))</div><div class='add'>+		return PTR_ERR(bfs);</div><div class='ctx'> </div><div class='del'>-	folio_attach_private(folio, subpage);</div><div class='add'>+	folio_attach_private(folio, bfs);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_detach_subpage(const struct btrfs_fs_info *fs_info, struct folio *folio)</div><div class='add'>+void btrfs_detach_folio_state(const struct btrfs_fs_info *fs_info, struct folio *folio,</div><div class='add'>+			      enum btrfs_folio_type type)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='ctx'> </div><div class='ctx'> 	/* Either not subpage, or the folio already has private attached. */</div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping) || !folio_test_private(folio))</div><div class='add'>+	if (!folio_test_private(folio))</div><div class='add'>+		return;</div><div class='add'>+	if (type == BTRFS_SUBPAGE_METADATA &amp;&amp; !btrfs_meta_is_subpage(fs_info))</div><div class='add'>+		return;</div><div class='add'>+	if (type == BTRFS_SUBPAGE_DATA &amp;&amp; !btrfs_is_subpage(fs_info, folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	subpage = folio_detach_private(folio);</div><div class='del'>-	ASSERT(subpage);</div><div class='del'>-	btrfs_free_subpage(subpage);</div><div class='add'>+	bfs = folio_detach_private(folio);</div><div class='add'>+	ASSERT(bfs);</div><div class='add'>+	btrfs_free_folio_state(bfs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct btrfs_subpage *btrfs_alloc_subpage(const struct btrfs_fs_info *fs_info,</div><div class='del'>-					  enum btrfs_subpage_type type)</div><div class='add'>+struct btrfs_folio_state *btrfs_alloc_folio_state(const struct btrfs_fs_info *fs_info,</div><div class='add'>+						  size_t fsize, enum btrfs_folio_type type)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *ret;</div><div class='add'>+	struct btrfs_folio_state *ret;</div><div class='ctx'> 	unsigned int real_size;</div><div class='ctx'> </div><div class='del'>-	ASSERT(fs_info-&gt;sectorsize &lt; PAGE_SIZE);</div><div class='add'>+	ASSERT(fs_info-&gt;sectorsize &lt; fsize);</div><div class='ctx'> </div><div class='ctx'> 	real_size = struct_size(ret, bitmaps,</div><div class='del'>-			BITS_TO_LONGS(fs_info-&gt;subpage_info-&gt;total_nr_bits));</div><div class='add'>+			BITS_TO_LONGS(btrfs_bitmap_nr_max *</div><div class='add'>+				      (fsize &gt;&gt; fs_info-&gt;sectorsize_bits)));</div><div class='ctx'> 	ret = kzalloc(real_size, GFP_NOFS);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ret-&gt;lock);</div><div class='del'>-	if (type == BTRFS_SUBPAGE_METADATA) {</div><div class='add'>+	if (type == BTRFS_SUBPAGE_METADATA)</div><div class='ctx'> 		atomic_set(&amp;ret-&gt;eb_refs, 0);</div><div class='del'>-	} else {</div><div class='del'>-		atomic_set(&amp;ret-&gt;readers, 0);</div><div class='del'>-		atomic_set(&amp;ret-&gt;writers, 0);</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		atomic_set(&amp;ret-&gt;nr_locked, 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_free_subpage(struct btrfs_subpage *subpage)</div><div class='del'>-{</div><div class='del'>-	kfree(subpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Increase the eb_refs of current subpage.</div><div class='ctx'>  *</div><div class='hunk'>@@ -191,86 +147,61 @@ void btrfs_free_subpage(struct btrfs_subpage *subpage)</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_folio_inc_eb_refs(const struct btrfs_fs_info *fs_info, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping))</div><div class='add'>+	if (!btrfs_meta_is_subpage(fs_info))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(folio_test_private(folio) &amp;&amp; folio-&gt;mapping);</div><div class='ctx'> 	lockdep_assert_held(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='del'>-	subpage = folio_get_private(folio);</div><div class='del'>-	atomic_inc(&amp;subpage-&gt;eb_refs);</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='add'>+	atomic_inc(&amp;bfs-&gt;eb_refs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_folio_dec_eb_refs(const struct btrfs_fs_info *fs_info, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping))</div><div class='add'>+	if (!btrfs_meta_is_subpage(fs_info))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(folio_test_private(folio) &amp;&amp; folio-&gt;mapping);</div><div class='ctx'> 	lockdep_assert_held(&amp;folio-&gt;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='del'>-	subpage = folio_get_private(folio);</div><div class='del'>-	ASSERT(atomic_read(&amp;subpage-&gt;eb_refs));</div><div class='del'>-	atomic_dec(&amp;subpage-&gt;eb_refs);</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='add'>+	ASSERT(atomic_read(&amp;bfs-&gt;eb_refs));</div><div class='add'>+	atomic_dec(&amp;bfs-&gt;eb_refs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	/* For subpage support, the folio must be single page. */</div><div class='del'>-	ASSERT(folio_order(folio) == 0);</div><div class='del'>-</div><div class='ctx'> 	/* Basic checks */</div><div class='ctx'> 	ASSERT(folio_test_private(folio) &amp;&amp; folio_get_private(folio));</div><div class='ctx'> 	ASSERT(IS_ALIGNED(start, fs_info-&gt;sectorsize) &amp;&amp;</div><div class='del'>-	       IS_ALIGNED(len, fs_info-&gt;sectorsize));</div><div class='add'>+	       IS_ALIGNED(len, fs_info-&gt;sectorsize), "start=%llu len=%u", start, len);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The range check only works for mapped page, we can still have</div><div class='ctx'> 	 * unmapped page like dummy extent buffer pages.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (folio-&gt;mapping)</div><div class='ctx'> 		ASSERT(folio_pos(folio) &lt;= start &amp;&amp;</div><div class='del'>-		       start + len &lt;= folio_pos(folio) + PAGE_SIZE);</div><div class='add'>+		       start + len &lt;= folio_next_pos(folio),</div><div class='add'>+		       "start=%llu len=%u folio_pos=%llu folio_size=%zu",</div><div class='add'>+		       start, len, folio_pos(folio), folio_size(folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_subpage_start_reader(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct folio *folio, u64 start, u32 len)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='del'>-	const int nbits = len &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-</div><div class='del'>-	btrfs_subpage_assert(fs_info, folio, start, len);</div><div class='del'>-</div><div class='del'>-	atomic_add(nbits, &amp;subpage-&gt;readers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_subpage_end_reader(const struct btrfs_fs_info *fs_info,</div><div class='del'>-			      struct folio *folio, u64 start, u32 len)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='del'>-	const int nbits = len &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='del'>-	bool is_data;</div><div class='del'>-	bool last;</div><div class='del'>-</div><div class='del'>-	btrfs_subpage_assert(fs_info, folio, start, len);</div><div class='del'>-	is_data = is_data_inode(folio-&gt;mapping-&gt;host);</div><div class='del'>-	ASSERT(atomic_read(&amp;subpage-&gt;readers) &gt;= nbits);</div><div class='del'>-	last = atomic_sub_and_test(nbits, &amp;subpage-&gt;readers);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For data we need to unlock the page if the last read has finished.</div><div class='del'>-	 *</div><div class='del'>-	 * And please don't replace @last with atomic_sub_and_test() call</div><div class='del'>-	 * inside if () condition.</div><div class='del'>-	 * As we want the atomic_sub_and_test() to be always executed.</div><div class='del'>-	 */</div><div class='del'>-	if (is_data &amp;&amp; last)</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-}</div><div class='add'>+#define subpage_calc_start_bit(fs_info, folio, name, start, len)	\</div><div class='add'>+({									\</div><div class='add'>+	unsigned int __start_bit;					\</div><div class='add'>+	const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \</div><div class='add'>+									\</div><div class='add'>+	btrfs_subpage_assert(fs_info, folio, start, len);		\</div><div class='add'>+	__start_bit = offset_in_folio(folio, start) &gt;&gt; fs_info-&gt;sectorsize_bits; \</div><div class='add'>+	__start_bit += __bpf * btrfs_bitmap_nr_##name;			\</div><div class='add'>+	__start_bit;							\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> static void btrfs_subpage_clamp_range(struct folio *folio, u64 *start, u32 *len)</div><div class='ctx'> {</div><div class='hunk'>@@ -286,145 +217,187 @@ static void btrfs_subpage_clamp_range(struct folio *folio, u64 *start, u32 *len)</div><div class='ctx'> 	if (folio_pos(folio) &gt;= orig_start + orig_len)</div><div class='ctx'> 		*len = 0;</div><div class='ctx'> 	else</div><div class='del'>-		*len = min_t(u64, folio_pos(folio) + PAGE_SIZE,</div><div class='del'>-			     orig_start + orig_len) - *start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void btrfs_subpage_start_writer(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct folio *folio, u64 start, u32 len)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='del'>-	const int nbits = (len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	btrfs_subpage_assert(fs_info, folio, start, len);</div><div class='del'>-</div><div class='del'>-	ASSERT(atomic_read(&amp;subpage-&gt;readers) == 0);</div><div class='del'>-	ret = atomic_add_return(nbits, &amp;subpage-&gt;writers);</div><div class='del'>-	ASSERT(ret == nbits);</div><div class='add'>+		*len = min_t(u64, folio_next_pos(folio), orig_start + orig_len) - *start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_subpage_end_and_test_writer(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				       struct folio *folio, u64 start, u32 len)</div><div class='add'>+static bool btrfs_subpage_end_and_test_lock(const struct btrfs_fs_info *fs_info,</div><div class='add'>+					    struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='add'>+	const int start_bit = subpage_calc_start_bit(fs_info, folio, locked, start, len);</div><div class='ctx'> 	const int nbits = (len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int cleared = 0;</div><div class='add'>+	int bit = start_bit;</div><div class='add'>+	bool last;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_subpage_assert(fs_info, folio, start, len);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have call sites passing @lock_page into</div><div class='ctx'> 	 * extent_clear_unlock_delalloc() for compression path.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This @locked_page is locked by plain lock_page(), thus its</div><div class='del'>-	 * subpage::writers is 0.  Handle them in a special way.</div><div class='add'>+	 * subpage::locked is 0.  Handle them in a special way.</div><div class='ctx'> 	 */</div><div class='del'>-	if (atomic_read(&amp;subpage-&gt;writers) == 0)</div><div class='add'>+	if (atomic_read(&amp;bfs-&gt;nr_locked) == 0) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> 		return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(atomic_read(&amp;subpage-&gt;writers) &gt;= nbits);</div><div class='del'>-	return atomic_sub_and_test(nbits, &amp;subpage-&gt;writers);</div><div class='add'>+	for_each_set_bit_from(bit, bfs-&gt;bitmaps, start_bit + nbits) {</div><div class='add'>+		clear_bit(bit, bfs-&gt;bitmaps);</div><div class='add'>+		cleared++;</div><div class='add'>+	}</div><div class='add'>+	ASSERT(atomic_read(&amp;bfs-&gt;nr_locked) &gt;= cleared,</div><div class='add'>+	       "atomic_read(&amp;bfs-&gt;nr_locked)=%d cleared=%d",</div><div class='add'>+	       atomic_read(&amp;bfs-&gt;nr_locked), cleared);</div><div class='add'>+	last = atomic_sub_and_test(cleared, &amp;bfs-&gt;nr_locked);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	return last;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Lock a folio for delalloc page writeback.</div><div class='add'>+ * Handle different locked folios:</div><div class='add'>+ *</div><div class='add'>+ * - Non-subpage folio</div><div class='add'>+ *   Just unlock it.</div><div class='ctx'>  *</div><div class='del'>- * Return -EAGAIN if the page is not properly initialized.</div><div class='del'>- * Return 0 with the page locked, and writer counter updated.</div><div class='add'>+ * - folio locked but without any subpage locked</div><div class='add'>+ *   This happens either before writepage_delalloc() or the delalloc range is</div><div class='add'>+ *   already handled by previous folio.</div><div class='add'>+ *   We can simple unlock it.</div><div class='ctx'>  *</div><div class='del'>- * Even with 0 returned, the page still need extra check to make sure</div><div class='del'>- * it's really the correct page, as the caller is using</div><div class='del'>- * filemap_get_folios_contig(), which can race with page invalidating.</div><div class='add'>+ * - folio locked with subpage range locked.</div><div class='add'>+ *   We go through the locked sectors inside the range and clear their locked</div><div class='add'>+ *   bitmap, reduce the writer lock number, and unlock the page if that's</div><div class='add'>+ *   the last locked range.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_folio_start_writer_lock(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				  struct folio *folio, u64 start, u32 len)</div><div class='add'>+void btrfs_folio_end_lock(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			  struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!fs_info) || !btrfs_is_subpage(fs_info, folio-&gt;mapping)) {</div><div class='del'>-		folio_lock(folio);</div><div class='del'>-		return 0;</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='add'>+</div><div class='add'>+	ASSERT(folio_test_locked(folio));</div><div class='add'>+</div><div class='add'>+	if (unlikely(!fs_info) || !btrfs_is_subpage(fs_info, folio)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	folio_lock(folio);</div><div class='del'>-	if (!folio_test_private(folio) || !folio_get_private(folio)) {</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For subpage case, there are two types of locked page.  With or</div><div class='add'>+	 * without locked number.</div><div class='add'>+	 *</div><div class='add'>+	 * Since we own the page lock, no one else could touch subpage::locked</div><div class='add'>+	 * and we are safe to do several atomic operations without spinlock.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;bfs-&gt;nr_locked) == 0) {</div><div class='add'>+		/* No subpage lock, locked by plain lock_page(). */</div><div class='ctx'> 		folio_unlock(folio);</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	btrfs_subpage_clamp_range(folio, &amp;start, &amp;len);</div><div class='del'>-	btrfs_subpage_start_writer(fs_info, folio, start, len);</div><div class='del'>-	return 0;</div><div class='add'>+	if (btrfs_subpage_end_and_test_lock(fs_info, folio, start, len))</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_folio_end_writer_lock(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct folio *folio, u64 start, u32 len)</div><div class='add'>+void btrfs_folio_end_lock_bitmap(const struct btrfs_fs_info *fs_info,</div><div class='add'>+				 struct folio *folio, unsigned long bitmap)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!fs_info) || !btrfs_is_subpage(fs_info, folio-&gt;mapping)) {</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='add'>+	const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);</div><div class='add'>+	const int start_bit = blocks_per_folio * btrfs_bitmap_nr_locked;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool last = false;</div><div class='add'>+	int cleared = 0;</div><div class='add'>+	int bit;</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_subpage(fs_info, folio)) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_subpage_clamp_range(folio, &amp;start, &amp;len);</div><div class='del'>-	if (btrfs_subpage_end_and_test_writer(fs_info, folio, start, len))</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;bfs-&gt;nr_locked) == 0) {</div><div class='add'>+		/* No subpage lock, locked by plain lock_page(). */</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	for_each_set_bit(bit, &amp;bitmap, blocks_per_folio) {</div><div class='add'>+		if (test_and_clear_bit(bit + start_bit, bfs-&gt;bitmaps))</div><div class='add'>+			cleared++;</div><div class='add'>+	}</div><div class='add'>+	ASSERT(atomic_read(&amp;bfs-&gt;nr_locked) &gt;= cleared,</div><div class='add'>+	       "atomic_read(&amp;bfs-&gt;nr_locked)=%d cleared=%d",</div><div class='add'>+	       atomic_read(&amp;bfs-&gt;nr_locked), cleared);</div><div class='add'>+	last = atomic_sub_and_test(cleared, &amp;bfs-&gt;nr_locked);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	if (last)</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define subpage_calc_start_bit(fs_info, folio, name, start, len)	\</div><div class='add'>+#define subpage_test_bitmap_all_set(fs_info, folio, name)		\</div><div class='ctx'> ({									\</div><div class='del'>-	unsigned int start_bit;						\</div><div class='add'>+	struct btrfs_folio_state *__bfs = folio_get_private(folio);	\</div><div class='add'>+	const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \</div><div class='ctx'> 									\</div><div class='del'>-	btrfs_subpage_assert(fs_info, folio, start, len);		\</div><div class='del'>-	start_bit = offset_in_page(start) &gt;&gt; fs_info-&gt;sectorsize_bits;	\</div><div class='del'>-	start_bit += fs_info-&gt;subpage_info-&gt;name##_offset;		\</div><div class='del'>-	start_bit;							\</div><div class='add'>+	bitmap_test_range_all_set(__bfs-&gt;bitmaps,			\</div><div class='add'>+				  __bpf * btrfs_bitmap_nr_##name, __bpf); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define subpage_test_bitmap_all_set(fs_info, subpage, name)		\</div><div class='del'>-	bitmap_test_range_all_set(subpage-&gt;bitmaps,			\</div><div class='del'>-			fs_info-&gt;subpage_info-&gt;name##_offset,		\</div><div class='del'>-			fs_info-&gt;subpage_info-&gt;bitmap_nr_bits)</div><div class='del'>-</div><div class='del'>-#define subpage_test_bitmap_all_zero(fs_info, subpage, name)		\</div><div class='del'>-	bitmap_test_range_all_zero(subpage-&gt;bitmaps,			\</div><div class='del'>-			fs_info-&gt;subpage_info-&gt;name##_offset,		\</div><div class='del'>-			fs_info-&gt;subpage_info-&gt;bitmap_nr_bits)</div><div class='add'>+#define subpage_test_bitmap_all_zero(fs_info, folio, name)		\</div><div class='add'>+({									\</div><div class='add'>+	struct btrfs_folio_state *__bfs = folio_get_private(folio);	\</div><div class='add'>+	const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \</div><div class='add'>+									\</div><div class='add'>+	bitmap_test_range_all_zero(__bfs-&gt;bitmaps,			\</div><div class='add'>+				   __bpf * btrfs_bitmap_nr_##name, __bpf); \</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_set_uptodate(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							uptodate, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_set(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	if (subpage_test_bitmap_all_set(fs_info, subpage, uptodate))</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_set(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	if (subpage_test_bitmap_all_set(fs_info, folio, uptodate))</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_clear_uptodate(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				  struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							uptodate, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_clear(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_clear(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	folio_clear_uptodate(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_set_dirty(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			     struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							dirty, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_set(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_set(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> 	folio_mark_dirty(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -441,17 +414,17 @@ void btrfs_subpage_set_dirty(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> bool btrfs_subpage_clear_and_test_dirty(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							dirty, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool last = false;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_clear(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	if (subpage_test_bitmap_all_zero(fs_info, subpage, dirty))</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_clear(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	if (subpage_test_bitmap_all_zero(fs_info, folio, dirty))</div><div class='ctx'> 		last = true;</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> 	return last;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -468,90 +441,100 @@ void btrfs_subpage_clear_dirty(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> void btrfs_subpage_set_writeback(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							writeback, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	bool keep_write;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_set(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_set(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * Don't clear the TOWRITE tag when starting writeback on a still-dirty</div><div class='add'>+	 * folio. Doing so can cause WB_SYNC_ALL writepages() to overlook it,</div><div class='add'>+	 * assume writeback is complete, and exit too early — violating sync</div><div class='add'>+	 * ordering guarantees.</div><div class='add'>+	 */</div><div class='add'>+	keep_write = folio_test_dirty(folio);</div><div class='add'>+	if (!folio_test_writeback(folio))</div><div class='add'>+		__folio_start_writeback(folio, keep_write);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_clear_writeback(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				   struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							writeback, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_clear(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	if (subpage_test_bitmap_all_zero(fs_info, subpage, writeback)) {</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_clear(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	if (subpage_test_bitmap_all_zero(fs_info, folio, writeback)) {</div><div class='ctx'> 		ASSERT(folio_test_writeback(folio));</div><div class='ctx'> 		folio_end_writeback(folio);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_set_ordered(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							ordered, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_set(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_set(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	folio_set_ordered(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_clear_ordered(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							ordered, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_clear(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	if (subpage_test_bitmap_all_zero(fs_info, subpage, ordered))</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_clear(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	if (subpage_test_bitmap_all_zero(fs_info, folio, ordered))</div><div class='ctx'> 		folio_clear_ordered(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_set_checked(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							checked, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_set(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='del'>-	if (subpage_test_bitmap_all_set(fs_info, subpage, checked))</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_set(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	if (subpage_test_bitmap_all_set(fs_info, folio, checked))</div><div class='ctx'> 		folio_set_checked(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_subpage_clear_checked(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,</div><div class='ctx'> 							checked, start, len);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	bitmap_clear(subpage-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	bitmap_clear(bfs-&gt;bitmaps, start_bit, len &gt;&gt; fs_info-&gt;sectorsize_bits);</div><div class='ctx'> 	folio_clear_checked(folio);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -562,16 +545,16 @@ void btrfs_subpage_clear_checked(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> bool btrfs_subpage_test_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 			       struct folio *folio, u64 start, u32 len)	\</div><div class='ctx'> {									\</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);	\</div><div class='add'>+	struct btrfs_folio_state *bfs = folio_get_private(folio);	\</div><div class='ctx'> 	unsigned int start_bit = subpage_calc_start_bit(fs_info, folio,	\</div><div class='ctx'> 						name, start, len);	\</div><div class='ctx'> 	unsigned long flags;						\</div><div class='ctx'> 	bool ret;							\</div><div class='ctx'> 									\</div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);			\</div><div class='del'>-	ret = bitmap_test_range_all_set(subpage-&gt;bitmaps, start_bit,	\</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);			\</div><div class='add'>+	ret = bitmap_test_range_all_set(bfs-&gt;bitmaps, start_bit,	\</div><div class='ctx'> 				len &gt;&gt; fs_info-&gt;sectorsize_bits);	\</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);			\</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);			\</div><div class='ctx'> 	return ret;							\</div><div class='ctx'> }</div><div class='ctx'> IMPLEMENT_BTRFS_SUBPAGE_TEST_OP(uptodate);</div><div class='hunk'>@@ -591,7 +574,7 @@ void btrfs_folio_set_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 			    struct folio *folio, u64 start, u32 len)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	if (unlikely(!fs_info) ||					\</div><div class='del'>-	    !btrfs_is_subpage(fs_info, folio-&gt;mapping)) {		\</div><div class='add'>+	    !btrfs_is_subpage(fs_info, folio)) {			\</div><div class='ctx'> 		folio_set_func(folio);					\</div><div class='ctx'> 		return;							\</div><div class='ctx'> 	}								\</div><div class='hunk'>@@ -601,7 +584,7 @@ void btrfs_folio_clear_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 			      struct folio *folio, u64 start, u32 len)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	if (unlikely(!fs_info) ||					\</div><div class='del'>-	    !btrfs_is_subpage(fs_info, folio-&gt;mapping)) {		\</div><div class='add'>+	    !btrfs_is_subpage(fs_info, folio)) {			\</div><div class='ctx'> 		folio_clear_func(folio);				\</div><div class='ctx'> 		return;							\</div><div class='ctx'> 	}								\</div><div class='hunk'>@@ -611,7 +594,7 @@ bool btrfs_folio_test_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 			     struct folio *folio, u64 start, u32 len)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	if (unlikely(!fs_info) ||					\</div><div class='del'>-	    !btrfs_is_subpage(fs_info, folio-&gt;mapping))			\</div><div class='add'>+	    !btrfs_is_subpage(fs_info, folio))				\</div><div class='ctx'> 		return folio_test_func(folio);				\</div><div class='ctx'> 	return btrfs_subpage_test_##name(fs_info, folio, start, len);	\</div><div class='ctx'> }									\</div><div class='hunk'>@@ -619,7 +602,7 @@ void btrfs_folio_clamp_set_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 				  struct folio *folio, u64 start, u32 len) \</div><div class='ctx'> {									\</div><div class='ctx'> 	if (unlikely(!fs_info) ||					\</div><div class='del'>-	    !btrfs_is_subpage(fs_info, folio-&gt;mapping)) {		\</div><div class='add'>+	    !btrfs_is_subpage(fs_info, folio)) {			\</div><div class='ctx'> 		folio_set_func(folio);					\</div><div class='ctx'> 		return;							\</div><div class='ctx'> 	}								\</div><div class='hunk'>@@ -630,7 +613,7 @@ void btrfs_folio_clamp_clear_##name(const struct btrfs_fs_info *fs_info, \</div><div class='ctx'> 				    struct folio *folio, u64 start, u32 len) \</div><div class='ctx'> {									\</div><div class='ctx'> 	if (unlikely(!fs_info) ||					\</div><div class='del'>-	    !btrfs_is_subpage(fs_info, folio-&gt;mapping)) {		\</div><div class='add'>+	    !btrfs_is_subpage(fs_info, folio)) {			\</div><div class='ctx'> 		folio_clear_func(folio);				\</div><div class='ctx'> 		return;							\</div><div class='ctx'> 	}								\</div><div class='hunk'>@@ -641,10 +624,32 @@ bool btrfs_folio_clamp_test_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 				   struct folio *folio, u64 start, u32 len) \</div><div class='ctx'> {									\</div><div class='ctx'> 	if (unlikely(!fs_info) ||					\</div><div class='del'>-	    !btrfs_is_subpage(fs_info, folio-&gt;mapping))			\</div><div class='add'>+	    !btrfs_is_subpage(fs_info, folio))				\</div><div class='ctx'> 		return folio_test_func(folio);				\</div><div class='ctx'> 	btrfs_subpage_clamp_range(folio, &amp;start, &amp;len);			\</div><div class='ctx'> 	return btrfs_subpage_test_##name(fs_info, folio, start, len);	\</div><div class='add'>+}									\</div><div class='add'>+void btrfs_meta_folio_set_##name(struct folio *folio, const struct extent_buffer *eb) \</div><div class='add'>+{									\</div><div class='add'>+	if (!btrfs_meta_is_subpage(eb-&gt;fs_info)) {			\</div><div class='add'>+		folio_set_func(folio);					\</div><div class='add'>+		return;							\</div><div class='add'>+	}								\</div><div class='add'>+	btrfs_subpage_set_##name(eb-&gt;fs_info, folio, eb-&gt;start, eb-&gt;len); \</div><div class='add'>+}									\</div><div class='add'>+void btrfs_meta_folio_clear_##name(struct folio *folio, const struct extent_buffer *eb) \</div><div class='add'>+{									\</div><div class='add'>+	if (!btrfs_meta_is_subpage(eb-&gt;fs_info)) {			\</div><div class='add'>+		folio_clear_func(folio);				\</div><div class='add'>+		return;							\</div><div class='add'>+	}								\</div><div class='add'>+	btrfs_subpage_clear_##name(eb-&gt;fs_info, folio, eb-&gt;start, eb-&gt;len); \</div><div class='add'>+}									\</div><div class='add'>+bool btrfs_meta_folio_test_##name(struct folio *folio, const struct extent_buffer *eb) \</div><div class='add'>+{									\</div><div class='add'>+	if (!btrfs_meta_is_subpage(eb-&gt;fs_info))			\</div><div class='add'>+		return folio_test_func(folio);				\</div><div class='add'>+	return btrfs_subpage_test_##name(eb-&gt;fs_info, folio, eb-&gt;start, eb-&gt;len); \</div><div class='ctx'> }</div><div class='ctx'> IMPLEMENT_BTRFS_PAGE_OPS(uptodate, folio_mark_uptodate, folio_clear_uptodate,</div><div class='ctx'> 			 folio_test_uptodate);</div><div class='hunk'>@@ -657,109 +662,167 @@ IMPLEMENT_BTRFS_PAGE_OPS(ordered, folio_set_ordered, folio_clear_ordered,</div><div class='ctx'> IMPLEMENT_BTRFS_PAGE_OPS(checked, folio_set_checked, folio_clear_checked,</div><div class='ctx'> 			 folio_test_checked);</div><div class='ctx'> </div><div class='add'>+#define GET_SUBPAGE_BITMAP(fs_info, folio, name, dst)			\</div><div class='add'>+{									\</div><div class='add'>+	const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \</div><div class='add'>+	const struct btrfs_folio_state *__bfs = folio_get_private(folio); \</div><div class='add'>+									\</div><div class='add'>+	ASSERT(__bpf &lt;= BITS_PER_LONG);					\</div><div class='add'>+	*dst = bitmap_read(__bfs-&gt;bitmaps,				\</div><div class='add'>+			   __bpf * btrfs_bitmap_nr_##name, __bpf);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SUBPAGE_DUMP_BITMAP(fs_info, folio, name, start, len)		\</div><div class='add'>+{									\</div><div class='add'>+	unsigned long bitmap;						\</div><div class='add'>+	const unsigned int __bpf = btrfs_blocks_per_folio(fs_info, folio); \</div><div class='add'>+									\</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, name, &amp;bitmap);		\</div><div class='add'>+	btrfs_warn(fs_info,						\</div><div class='add'>+	"dumping bitmap start=%llu len=%u folio=%llu " #name "_bitmap=%*pbl", \</div><div class='add'>+		   start, len, folio_pos(folio), __bpf, &amp;bitmap);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Make sure not only the page dirty bit is cleared, but also subpage dirty bit</div><div class='ctx'>  * is cleared.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_folio_assert_not_dirty(const struct btrfs_fs_info *fs_info, struct folio *folio)</div><div class='add'>+void btrfs_folio_assert_not_dirty(const struct btrfs_fs_info *fs_info,</div><div class='add'>+				  struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage = folio_get_private(folio);</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='add'>+	unsigned int start_bit;</div><div class='add'>+	unsigned int nbits;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_BTRFS_ASSERT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ASSERT(!folio_test_dirty(folio));</div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping))</div><div class='add'>+	if (!btrfs_is_subpage(fs_info, folio)) {</div><div class='add'>+		ASSERT(!folio_test_dirty(folio));</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(folio_test_private(folio) &amp;&amp; folio_get_private(folio));</div><div class='del'>-	ASSERT(subpage_test_bitmap_all_zero(fs_info, subpage, dirty));</div><div class='add'>+	start_bit = subpage_calc_start_bit(fs_info, folio, dirty, start, len);</div><div class='add'>+	nbits = len &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='add'>+	ASSERT(bfs);</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	if (unlikely(!bitmap_test_range_all_zero(bfs-&gt;bitmaps, start_bit, nbits))) {</div><div class='add'>+		SUBPAGE_DUMP_BITMAP(fs_info, folio, dirty, start, len);</div><div class='add'>+		ASSERT(bitmap_test_range_all_zero(bfs-&gt;bitmaps, start_bit, nbits));</div><div class='add'>+	}</div><div class='add'>+	ASSERT(bitmap_test_range_all_zero(bfs-&gt;bitmaps, start_bit, nbits));</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Handle different locked pages with different page sizes:</div><div class='del'>- *</div><div class='del'>- * - Page locked by plain lock_page()</div><div class='del'>- *   It should not have any subpage::writers count.</div><div class='del'>- *   Can be unlocked by unlock_page().</div><div class='del'>- *   This is the most common locked page for __extent_writepage() called</div><div class='del'>- *   inside extent_write_cache_pages().</div><div class='del'>- *   Rarer cases include the @locked_page from extent_write_locked_range().</div><div class='add'>+ * This is for folio already locked by plain lock_page()/folio_lock(), which</div><div class='add'>+ * doesn't have any subpage awareness.</div><div class='ctx'>  *</div><div class='del'>- * - Page locked by lock_delalloc_pages()</div><div class='del'>- *   There is only one caller, all pages except @locked_page for</div><div class='del'>- *   extent_write_locked_range().</div><div class='del'>- *   In this case, we have to call subpage helper to handle the case.</div><div class='add'>+ * This populates the involved subpage ranges so that subpage helpers can</div><div class='add'>+ * properly unlock them.</div><div class='ctx'>  */</div><div class='del'>-void btrfs_folio_unlock_writer(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       struct folio *folio, u64 start, u32 len)</div><div class='add'>+void btrfs_folio_set_lock(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			  struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int start_bit;</div><div class='add'>+	unsigned int nbits;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(folio_test_locked(folio));</div><div class='del'>-	/* For non-subpage case, we just unlock the page */</div><div class='del'>-	if (!btrfs_is_subpage(fs_info, folio-&gt;mapping)) {</div><div class='del'>-		folio_unlock(folio);</div><div class='add'>+	if (unlikely(!fs_info) || !btrfs_is_subpage(fs_info, folio))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='add'>+	start_bit = subpage_calc_start_bit(fs_info, folio, locked, start, len);</div><div class='add'>+	nbits = len &gt;&gt; fs_info-&gt;sectorsize_bits;</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	/* Target range should not yet be locked. */</div><div class='add'>+	if (unlikely(!bitmap_test_range_all_zero(bfs-&gt;bitmaps, start_bit, nbits))) {</div><div class='add'>+		SUBPAGE_DUMP_BITMAP(fs_info, folio, locked, start, len);</div><div class='add'>+		ASSERT(bitmap_test_range_all_zero(bfs-&gt;bitmaps, start_bit, nbits));</div><div class='ctx'> 	}</div><div class='add'>+	bitmap_set(bfs-&gt;bitmaps, start_bit, nbits);</div><div class='add'>+	ret = atomic_add_return(nbits, &amp;bfs-&gt;nr_locked);</div><div class='add'>+	ASSERT(ret &lt;= btrfs_blocks_per_folio(fs_info, folio));</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ASSERT(folio_test_private(folio) &amp;&amp; folio_get_private(folio));</div><div class='del'>-	subpage = folio_get_private(folio);</div><div class='add'>+/*</div><div class='add'>+ * Clear the dirty flag for the folio.</div><div class='add'>+ *</div><div class='add'>+ * If the affected folio is no longer dirty, return true. Otherwise return false.</div><div class='add'>+ */</div><div class='add'>+bool btrfs_meta_folio_clear_and_test_dirty(struct folio *folio, const struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	bool last;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For subpage case, there are two types of locked page.  With or</div><div class='del'>-	 * without writers number.</div><div class='del'>-	 *</div><div class='del'>-	 * Since we own the page lock, no one else could touch subpage::writers</div><div class='del'>-	 * and we are safe to do several atomic operations without spinlock.</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;subpage-&gt;writers) == 0) {</div><div class='del'>-		/* No writers, locked by plain lock_page() */</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		return;</div><div class='add'>+	if (!btrfs_meta_is_subpage(eb-&gt;fs_info)) {</div><div class='add'>+		folio_clear_dirty_for_io(folio);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Have writers, use proper subpage helper to end it */</div><div class='del'>-	btrfs_folio_end_writer_lock(fs_info, folio, start, len);</div><div class='add'>+	last = btrfs_subpage_clear_and_test_dirty(eb-&gt;fs_info, folio, eb-&gt;start, eb-&gt;len);</div><div class='add'>+	if (last) {</div><div class='add'>+		folio_clear_dirty_for_io(folio);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define GET_SUBPAGE_BITMAP(subpage, subpage_info, name, dst)		\</div><div class='del'>-	bitmap_cut(dst, subpage-&gt;bitmaps, 0,				\</div><div class='del'>-		   subpage_info-&gt;name##_offset, subpage_info-&gt;bitmap_nr_bits)</div><div class='del'>-</div><div class='ctx'> void __cold btrfs_subpage_dump_bitmap(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				      struct folio *folio, u64 start, u32 len)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_subpage_info *subpage_info = fs_info-&gt;subpage_info;</div><div class='del'>-	struct btrfs_subpage *subpage;</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='add'>+	const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);</div><div class='ctx'> 	unsigned long uptodate_bitmap;</div><div class='del'>-	unsigned long error_bitmap;</div><div class='ctx'> 	unsigned long dirty_bitmap;</div><div class='ctx'> 	unsigned long writeback_bitmap;</div><div class='ctx'> 	unsigned long ordered_bitmap;</div><div class='ctx'> 	unsigned long checked_bitmap;</div><div class='add'>+	unsigned long locked_bitmap;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(folio_test_private(folio) &amp;&amp; folio_get_private(folio));</div><div class='del'>-	ASSERT(subpage_info);</div><div class='del'>-	subpage = folio_get_private(folio);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;subpage-&gt;lock, flags);</div><div class='del'>-	GET_SUBPAGE_BITMAP(subpage, subpage_info, uptodate, &amp;uptodate_bitmap);</div><div class='del'>-	GET_SUBPAGE_BITMAP(subpage, subpage_info, dirty, &amp;dirty_bitmap);</div><div class='del'>-	GET_SUBPAGE_BITMAP(subpage, subpage_info, writeback, &amp;writeback_bitmap);</div><div class='del'>-	GET_SUBPAGE_BITMAP(subpage, subpage_info, ordered, &amp;ordered_bitmap);</div><div class='del'>-	GET_SUBPAGE_BITMAP(subpage, subpage_info, checked, &amp;checked_bitmap);</div><div class='del'>-	spin_unlock_irqrestore(&amp;subpage-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	dump_page(folio_page(folio, 0), "btrfs subpage dump");</div><div class='add'>+	ASSERT(blocks_per_folio &gt; 1);</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, uptodate, &amp;uptodate_bitmap);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, dirty, &amp;dirty_bitmap);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, writeback, &amp;writeback_bitmap);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, ordered, &amp;ordered_bitmap);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, checked, &amp;checked_bitmap);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, locked, &amp;locked_bitmap);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dump_page(folio_page(folio, 0), "btrfs folio state dump");</div><div class='ctx'> 	btrfs_warn(fs_info,</div><div class='del'>-"start=%llu len=%u page=%llu, bitmaps uptodate=%*pbl error=%*pbl dirty=%*pbl writeback=%*pbl ordered=%*pbl checked=%*pbl",</div><div class='add'>+"start=%llu len=%u page=%llu, bitmaps uptodate=%*pbl dirty=%*pbl locked=%*pbl writeback=%*pbl ordered=%*pbl checked=%*pbl",</div><div class='ctx'> 		    start, len, folio_pos(folio),</div><div class='del'>-		    subpage_info-&gt;bitmap_nr_bits, &amp;uptodate_bitmap,</div><div class='del'>-		    subpage_info-&gt;bitmap_nr_bits, &amp;error_bitmap,</div><div class='del'>-		    subpage_info-&gt;bitmap_nr_bits, &amp;dirty_bitmap,</div><div class='del'>-		    subpage_info-&gt;bitmap_nr_bits, &amp;writeback_bitmap,</div><div class='del'>-		    subpage_info-&gt;bitmap_nr_bits, &amp;ordered_bitmap,</div><div class='del'>-		    subpage_info-&gt;bitmap_nr_bits, &amp;checked_bitmap);</div><div class='add'>+		    blocks_per_folio, &amp;uptodate_bitmap,</div><div class='add'>+		    blocks_per_folio, &amp;dirty_bitmap,</div><div class='add'>+		    blocks_per_folio, &amp;locked_bitmap,</div><div class='add'>+		    blocks_per_folio, &amp;writeback_bitmap,</div><div class='add'>+		    blocks_per_folio, &amp;ordered_bitmap,</div><div class='add'>+		    blocks_per_folio, &amp;checked_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_get_subpage_dirty_bitmap(struct btrfs_fs_info *fs_info,</div><div class='add'>+				    struct folio *folio,</div><div class='add'>+				    unsigned long *ret_bitmap)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_folio_state *bfs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	ASSERT(folio_test_private(folio) &amp;&amp; folio_get_private(folio));</div><div class='add'>+	ASSERT(btrfs_blocks_per_folio(fs_info, folio) &gt; 1);</div><div class='add'>+	bfs = folio_get_private(folio);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bfs-&gt;lock, flags);</div><div class='add'>+	GET_SUBPAGE_BITMAP(fs_info, folio, dirty, ret_bitmap);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bfs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/subpage.h b/fs/btrfs/subpage.h<br/>index 793c2b314a58..d81a0ade559f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/subpage.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/subpage.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/subpage.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/subpage.h</a></div><div class='hunk'>@@ -4,104 +4,136 @@</div><div class='ctx'> #define BTRFS_SUBPAGE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include "btrfs_inode.h"</div><div class='add'>+</div><div class='add'>+struct address_space;</div><div class='add'>+struct folio;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Extra info for subpapge bitmap.</div><div class='add'>+ * Extra info for subpage bitmap.</div><div class='ctx'>  *</div><div class='ctx'>  * For subpage we pack all uptodate/dirty/writeback/ordered bitmaps into</div><div class='ctx'>  * one larger bitmap.</div><div class='ctx'>  *</div><div class='ctx'>  * This structure records how they are organized in the bitmap:</div><div class='ctx'>  *</div><div class='del'>- * /- uptodate_offset	/- dirty_offset	/- ordered_offset</div><div class='add'>+ * /- uptodate          /- dirty        /- ordered</div><div class='ctx'>  * |			|		|</div><div class='ctx'>  * v			v		v</div><div class='ctx'>  * |u|u|u|u|........|u|u|d|d|.......|d|d|o|o|.......|o|o|</div><div class='del'>- * |&lt;- bitmap_nr_bits -&gt;|</div><div class='del'>- * |&lt;----------------- total_nr_bits ------------------&gt;|</div><div class='add'>+ * |&lt; sectors_per_page &gt;|</div><div class='add'>+ *</div><div class='add'>+ * Unlike regular macro-like enums, here we do not go upper-case names, as</div><div class='add'>+ * these names will be utilized in various macros to define function names.</div><div class='ctx'>  */</div><div class='del'>-struct btrfs_subpage_info {</div><div class='del'>-	/* Number of bits for each bitmap */</div><div class='del'>-	unsigned int bitmap_nr_bits;</div><div class='add'>+enum {</div><div class='add'>+	btrfs_bitmap_nr_uptodate = 0,</div><div class='add'>+	btrfs_bitmap_nr_dirty,</div><div class='ctx'> </div><div class='del'>-	/* Total number of bits for the whole bitmap */</div><div class='del'>-	unsigned int total_nr_bits;</div><div class='add'>+	/*</div><div class='add'>+	 * This can be changed to atomic eventually.  But this change will rely</div><div class='add'>+	 * on the async delalloc range rework for locked bitmap.  As async</div><div class='add'>+	 * delalloc can unlock its range and mark blocks writeback at random</div><div class='add'>+	 * timing.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_bitmap_nr_writeback,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The ordered and checked flags are for COW fixup, already marked</div><div class='add'>+	 * deprecated, and will be removed eventually.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_bitmap_nr_ordered,</div><div class='add'>+	btrfs_bitmap_nr_checked,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * *_start indicates where the bitmap starts, the length is always</div><div class='del'>-	 * @bitmap_size, which is calculated from PAGE_SIZE / sectorsize.</div><div class='add'>+	 * The locked bit is for async delalloc range (compression), currently</div><div class='add'>+	 * async extent is queued with the range locked, until the compression</div><div class='add'>+	 * is done.</div><div class='add'>+	 * So an async extent can unlock the range at any random timing.</div><div class='add'>+	 *</div><div class='add'>+	 * This will need a rework on the async extent lifespan (mark writeback</div><div class='add'>+	 * and do compression) before deprecating this flag.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int uptodate_offset;</div><div class='del'>-	unsigned int dirty_offset;</div><div class='del'>-	unsigned int writeback_offset;</div><div class='del'>-	unsigned int ordered_offset;</div><div class='del'>-	unsigned int checked_offset;</div><div class='add'>+	btrfs_bitmap_nr_locked,</div><div class='add'>+	btrfs_bitmap_nr_max</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Structure to trace status of each sector inside a page, attached to</div><div class='ctx'>  * page::private for both data and metadata inodes.</div><div class='ctx'>  */</div><div class='del'>-struct btrfs_subpage {</div><div class='add'>+struct btrfs_folio_state {</div><div class='ctx'> 	/* Common members for both data and metadata pages */</div><div class='ctx'> 	spinlock_t lock;</div><div class='del'>-	/*</div><div class='del'>-	 * Both data and metadata needs to track how many readers are for the</div><div class='del'>-	 * page.</div><div class='del'>-	 * Data relies on @readers to unlock the page when last reader finished.</div><div class='del'>-	 * While metadata doesn't need page unlock, it needs to prevent</div><div class='del'>-	 * page::private get cleared before the last end_page_read().</div><div class='del'>-	 */</div><div class='del'>-	atomic_t readers;</div><div class='ctx'> 	union {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Structures only used by metadata</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * @eb_refs should only be operated under private_lock, as it</div><div class='del'>-		 * manages whether the subpage can be detached.</div><div class='add'>+		 * manages whether the btrfs_folio_state can be detached.</div><div class='ctx'> 		 */</div><div class='ctx'> 		atomic_t eb_refs;</div><div class='ctx'> </div><div class='del'>-		/* Structures only used by data */</div><div class='del'>-		atomic_t writers;</div><div class='add'>+		/*</div><div class='add'>+		 * Structures only used by data,</div><div class='add'>+		 *</div><div class='add'>+		 * How many sectors inside the page is locked.</div><div class='add'>+		 */</div><div class='add'>+		atomic_t nr_locked;</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned long bitmaps[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum btrfs_subpage_type {</div><div class='add'>+enum btrfs_folio_type {</div><div class='ctx'> 	BTRFS_SUBPAGE_METADATA,</div><div class='ctx'> 	BTRFS_SUBPAGE_DATA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-bool btrfs_is_subpage(const struct btrfs_fs_info *fs_info, struct address_space *mapping);</div><div class='del'>-</div><div class='del'>-void btrfs_init_subpage_info(struct btrfs_subpage_info *subpage_info, u32 sectorsize);</div><div class='del'>-int btrfs_attach_subpage(const struct btrfs_fs_info *fs_info,</div><div class='del'>-			 struct folio *folio, enum btrfs_subpage_type type);</div><div class='del'>-void btrfs_detach_subpage(const struct btrfs_fs_info *fs_info, struct folio *folio);</div><div class='add'>+/*</div><div class='add'>+ * Subpage support for metadata is more complex, as we can have dummy extent</div><div class='add'>+ * buffers, where folios have no mapping to determine the owning inode.</div><div class='add'>+ *</div><div class='add'>+ * Thankfully we only need to check if node size is smaller than page size.</div><div class='add'>+ * Even with larger folio support, we will only allocate a folio as large as</div><div class='add'>+ * node size.</div><div class='add'>+ * Thus if nodesize &lt; PAGE_SIZE, we know metadata needs need to subpage routine.</div><div class='add'>+ */</div><div class='add'>+static inline bool btrfs_meta_is_subpage(const struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	return fs_info-&gt;nodesize &lt; PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+static inline bool btrfs_is_subpage(const struct btrfs_fs_info *fs_info,</div><div class='add'>+				    struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	if (folio-&gt;mapping &amp;&amp; folio-&gt;mapping-&gt;host)</div><div class='add'>+		ASSERT(is_data_inode(BTRFS_I(folio-&gt;mapping-&gt;host)));</div><div class='add'>+	return fs_info-&gt;sectorsize &lt; folio_size(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_attach_folio_state(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			     struct folio *folio, enum btrfs_folio_type type);</div><div class='add'>+void btrfs_detach_folio_state(const struct btrfs_fs_info *fs_info, struct folio *folio,</div><div class='add'>+			      enum btrfs_folio_type type);</div><div class='ctx'> </div><div class='ctx'> /* Allocate additional data where page represents more than one sector */</div><div class='del'>-struct btrfs_subpage *btrfs_alloc_subpage(const struct btrfs_fs_info *fs_info,</div><div class='del'>-					  enum btrfs_subpage_type type);</div><div class='del'>-void btrfs_free_subpage(struct btrfs_subpage *subpage);</div><div class='add'>+struct btrfs_folio_state *btrfs_alloc_folio_state(const struct btrfs_fs_info *fs_info,</div><div class='add'>+						  size_t fsize, enum btrfs_folio_type type);</div><div class='add'>+static inline void btrfs_free_folio_state(struct btrfs_folio_state *bfs)</div><div class='add'>+{</div><div class='add'>+	kfree(bfs);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void btrfs_folio_inc_eb_refs(const struct btrfs_fs_info *fs_info, struct folio *folio);</div><div class='ctx'> void btrfs_folio_dec_eb_refs(const struct btrfs_fs_info *fs_info, struct folio *folio);</div><div class='ctx'> </div><div class='del'>-void btrfs_subpage_start_reader(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct folio *folio, u64 start, u32 len);</div><div class='del'>-void btrfs_subpage_end_reader(const struct btrfs_fs_info *fs_info,</div><div class='del'>-			      struct folio *folio, u64 start, u32 len);</div><div class='del'>-</div><div class='del'>-void btrfs_subpage_start_writer(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct folio *folio, u64 start, u32 len);</div><div class='del'>-bool btrfs_subpage_end_and_test_writer(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				       struct folio *folio, u64 start, u32 len);</div><div class='del'>-int btrfs_folio_start_writer_lock(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				  struct folio *folio, u64 start, u32 len);</div><div class='del'>-void btrfs_folio_end_writer_lock(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct folio *folio, u64 start, u32 len);</div><div class='del'>-</div><div class='add'>+void btrfs_folio_end_lock(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			  struct folio *folio, u64 start, u32 len);</div><div class='add'>+void btrfs_folio_set_lock(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			  struct folio *folio, u64 start, u32 len);</div><div class='add'>+void btrfs_folio_end_lock_bitmap(const struct btrfs_fs_info *fs_info,</div><div class='add'>+				 struct folio *folio, unsigned long bitmap);</div><div class='ctx'> /*</div><div class='ctx'>  * Template for subpage related operations.</div><div class='ctx'>  *</div><div class='hunk'>@@ -115,6 +147,13 @@ void btrfs_folio_end_writer_lock(const struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * btrfs_folio_clamp_*() are similar to btrfs_folio_*(), except the range doesn't</div><div class='ctx'>  * need to be inside the page. Those functions will truncate the range</div><div class='ctx'>  * automatically.</div><div class='add'>+ *</div><div class='add'>+ * Both btrfs_folio_*() and btrfs_folio_clamp_*() are for data folios.</div><div class='add'>+ *</div><div class='add'>+ * For metadata, one should use btrfs_meta_folio_*() helpers instead, and there</div><div class='add'>+ * is no clamp version for metadata helpers, as we either go subpage</div><div class='add'>+ * (nodesize &lt; PAGE_SIZE) or go regular folio helpers (nodesize &gt;= PAGE_SIZE,</div><div class='add'>+ * and our folio is never larger than nodesize).</div><div class='ctx'>  */</div><div class='ctx'> #define DECLARE_BTRFS_SUBPAGE_OPS(name)					\</div><div class='ctx'> void btrfs_subpage_set_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='hunk'>@@ -134,7 +173,10 @@ void btrfs_folio_clamp_set_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> void btrfs_folio_clamp_clear_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='ctx'> 		struct folio *folio, u64 start, u32 len);			\</div><div class='ctx'> bool btrfs_folio_clamp_test_##name(const struct btrfs_fs_info *fs_info,	\</div><div class='del'>-		struct folio *folio, u64 start, u32 len);</div><div class='add'>+		struct folio *folio, u64 start, u32 len);		\</div><div class='add'>+void btrfs_meta_folio_set_##name(struct folio *folio, const struct extent_buffer *eb); \</div><div class='add'>+void btrfs_meta_folio_clear_##name(struct folio *folio, const struct extent_buffer *eb); \</div><div class='add'>+bool btrfs_meta_folio_test_##name(struct folio *folio, const struct extent_buffer *eb);</div><div class='ctx'> </div><div class='ctx'> DECLARE_BTRFS_SUBPAGE_OPS(uptodate);</div><div class='ctx'> DECLARE_BTRFS_SUBPAGE_OPS(dirty);</div><div class='hunk'>@@ -142,12 +184,28 @@ DECLARE_BTRFS_SUBPAGE_OPS(writeback);</div><div class='ctx'> DECLARE_BTRFS_SUBPAGE_OPS(ordered);</div><div class='ctx'> DECLARE_BTRFS_SUBPAGE_OPS(checked);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Helper for error cleanup, where a folio will have its dirty flag cleared,</div><div class='add'>+ * with writeback started and finished.</div><div class='add'>+ */</div><div class='add'>+static inline void btrfs_folio_clamp_finish_io(struct btrfs_fs_info *fs_info,</div><div class='add'>+					       struct folio *locked_folio,</div><div class='add'>+					       u64 start, u32 len)</div><div class='add'>+{</div><div class='add'>+	btrfs_folio_clamp_clear_dirty(fs_info, locked_folio, start, len);</div><div class='add'>+	btrfs_folio_clamp_set_writeback(fs_info, locked_folio, start, len);</div><div class='add'>+	btrfs_folio_clamp_clear_writeback(fs_info, locked_folio, start, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool btrfs_subpage_clear_and_test_dirty(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					struct folio *folio, u64 start, u32 len);</div><div class='ctx'> </div><div class='del'>-void btrfs_folio_assert_not_dirty(const struct btrfs_fs_info *fs_info, struct folio *folio);</div><div class='del'>-void btrfs_folio_unlock_writer(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       struct folio *folio, u64 start, u32 len);</div><div class='add'>+void btrfs_folio_assert_not_dirty(const struct btrfs_fs_info *fs_info,</div><div class='add'>+				  struct folio *folio, u64 start, u32 len);</div><div class='add'>+bool btrfs_meta_folio_clear_and_test_dirty(struct folio *folio, const struct extent_buffer *eb);</div><div class='add'>+void btrfs_get_subpage_dirty_bitmap(struct btrfs_fs_info *fs_info,</div><div class='add'>+				    struct folio *folio,</div><div class='add'>+				    unsigned long *ret_bitmap);</div><div class='ctx'> void __cold btrfs_subpage_dump_bitmap(const struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				      struct folio *folio, u64 start, u32 len);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c<br/>index 896acfda1789..1999533b52be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/super.c</a></div><div class='hunk'>@@ -34,13 +34,12 @@</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='del'>-#include "print-tree.h"</div><div class='add'>+#include "direct-io.h"</div><div class='ctx'> #include "props.h"</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> #include "bio.h"</div><div class='ctx'> #include "export.h"</div><div class='ctx'> #include "compression.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='ctx'> #include "free-space-cache.h"</div><div class='ctx'> #include "backref.h"</div><div class='hunk'>@@ -83,12 +82,15 @@ struct btrfs_fs_context {</div><div class='ctx'> 	u32 commit_interval;</div><div class='ctx'> 	u32 metadata_ratio;</div><div class='ctx'> 	u32 thread_pool_size;</div><div class='del'>-	unsigned long mount_opt;</div><div class='add'>+	unsigned long long mount_opt;</div><div class='ctx'> 	unsigned long compress_type:4;</div><div class='del'>-	unsigned int compress_level;</div><div class='add'>+	int compress_level;</div><div class='ctx'> 	refcount_t refs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void btrfs_emit_options(struct btrfs_fs_info *info,</div><div class='add'>+			       struct btrfs_fs_context *old);</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	Opt_acl,</div><div class='ctx'> 	Opt_clear_cache,</div><div class='hunk'>@@ -121,22 +123,18 @@ enum {</div><div class='ctx'> 	Opt_thread_pool,</div><div class='ctx'> 	Opt_treelog,</div><div class='ctx'> 	Opt_user_subvol_rm_allowed,</div><div class='add'>+	Opt_norecovery,</div><div class='ctx'> </div><div class='ctx'> 	/* Rescue options */</div><div class='ctx'> 	Opt_rescue,</div><div class='ctx'> 	Opt_usebackuproot,</div><div class='del'>-	Opt_nologreplay,</div><div class='del'>-	Opt_ignorebadroots,</div><div class='del'>-	Opt_ignoredatacsums,</div><div class='del'>-	Opt_rescue_all,</div><div class='ctx'> </div><div class='ctx'> 	/* Debugging options */</div><div class='ctx'> 	Opt_enospc_debug,</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	Opt_fragment, Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='ctx'> 	Opt_ref_verify,</div><div class='add'>+	Opt_ref_tracker,</div><div class='ctx'> #endif</div><div class='ctx'> 	Opt_err,</div><div class='ctx'> };</div><div class='hunk'>@@ -179,6 +177,8 @@ enum {</div><div class='ctx'> 	Opt_rescue_nologreplay,</div><div class='ctx'> 	Opt_rescue_ignorebadroots,</div><div class='ctx'> 	Opt_rescue_ignoredatacsums,</div><div class='add'>+	Opt_rescue_ignoremetacsums,</div><div class='add'>+	Opt_rescue_ignoresuperflags,</div><div class='ctx'> 	Opt_rescue_parameter_all,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -188,7 +188,11 @@ static const struct constant_table btrfs_parameter_rescue[] = {</div><div class='ctx'> 	{ "ignorebadroots", Opt_rescue_ignorebadroots },</div><div class='ctx'> 	{ "ibadroots", Opt_rescue_ignorebadroots },</div><div class='ctx'> 	{ "ignoredatacsums", Opt_rescue_ignoredatacsums },</div><div class='add'>+	{ "ignoremetacsums", Opt_rescue_ignoremetacsums},</div><div class='add'>+	{ "ignoresuperflags", Opt_rescue_ignoresuperflags},</div><div class='ctx'> 	{ "idatacsums", Opt_rescue_ignoredatacsums },</div><div class='add'>+	{ "imetacsums", Opt_rescue_ignoremetacsums},</div><div class='add'>+	{ "isuperflags", Opt_rescue_ignoresuperflags},</div><div class='ctx'> 	{ "all", Opt_rescue_parameter_all },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='hunk'>@@ -243,26 +247,94 @@ static const struct fs_parameter_spec btrfs_fs_parameters[] = {</div><div class='ctx'> </div><div class='ctx'> 	/* Rescue options. */</div><div class='ctx'> 	fsparam_enum("rescue", Opt_rescue, btrfs_parameter_rescue),</div><div class='del'>-	/* Deprecated, with alias rescue=nologreplay */</div><div class='del'>-	__fsparam(NULL, "nologreplay", Opt_nologreplay, fs_param_deprecated, NULL),</div><div class='ctx'> 	/* Deprecated, with alias rescue=usebackuproot */</div><div class='ctx'> 	__fsparam(NULL, "usebackuproot", Opt_usebackuproot, fs_param_deprecated, NULL),</div><div class='add'>+	/* For compatibility only, alias for "rescue=nologreplay". */</div><div class='add'>+	fsparam_flag("norecovery", Opt_norecovery),</div><div class='ctx'> </div><div class='ctx'> 	/* Debugging options. */</div><div class='ctx'> 	fsparam_flag_no("enospc_debug", Opt_enospc_debug),</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	fsparam_enum("fragment", Opt_fragment, btrfs_parameter_fragment),</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='add'>+	fsparam_flag("ref_tracker", Opt_ref_tracker),</div><div class='ctx'> 	fsparam_flag("ref_verify", Opt_ref_verify),</div><div class='ctx'> #endif</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* No support for restricting writes to btrfs devices yet... */</div><div class='del'>-static inline blk_mode_t btrfs_open_mode(struct fs_context *fc)</div><div class='add'>+static bool btrfs_match_compress_type(const char *string, const char *type, bool may_have_level)</div><div class='ctx'> {</div><div class='del'>-	return sb_open_mode(fc-&gt;sb_flags) &amp; ~BLK_OPEN_RESTRICT_WRITES;</div><div class='add'>+	const int len = strlen(type);</div><div class='add'>+</div><div class='add'>+	return (strncmp(string, type, len) == 0) &amp;&amp;</div><div class='add'>+		((may_have_level &amp;&amp; string[len] == ':') || string[len] == '\0');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int btrfs_parse_compress(struct btrfs_fs_context *ctx,</div><div class='add'>+				const struct fs_parameter *param, int opt)</div><div class='add'>+{</div><div class='add'>+	const char *string = param-&gt;string;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Provide the same semantics as older kernels that don't use fs</div><div class='add'>+	 * context, specifying the "compress" option clears "force-compress"</div><div class='add'>+	 * without the need to pass "compress-force=[no|none]" before</div><div class='add'>+	 * specifying "compress".</div><div class='add'>+	 */</div><div class='add'>+	if (opt != Opt_compress_force &amp;&amp; opt != Opt_compress_force_type)</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, FORCE_COMPRESS);</div><div class='add'>+</div><div class='add'>+	if (opt == Opt_compress || opt == Opt_compress_force) {</div><div class='add'>+		ctx-&gt;compress_type = BTRFS_COMPRESS_ZLIB;</div><div class='add'>+		ctx-&gt;compress_level = BTRFS_ZLIB_DEFAULT_LEVEL;</div><div class='add'>+		btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='add'>+	} else if (btrfs_match_compress_type(string, "zlib", true)) {</div><div class='add'>+		ctx-&gt;compress_type = BTRFS_COMPRESS_ZLIB;</div><div class='add'>+		ret = btrfs_compress_str2level(BTRFS_COMPRESS_ZLIB, string + 4,</div><div class='add'>+					       &amp;ctx-&gt;compress_level);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='add'>+	} else if (btrfs_match_compress_type(string, "lzo", true)) {</div><div class='add'>+		ctx-&gt;compress_type = BTRFS_COMPRESS_LZO;</div><div class='add'>+		ret = btrfs_compress_str2level(BTRFS_COMPRESS_LZO, string + 3,</div><div class='add'>+					       &amp;ctx-&gt;compress_level);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		if (string[3] == ':' &amp;&amp; string[4])</div><div class='add'>+			btrfs_warn(NULL, "Compression level ignored for LZO");</div><div class='add'>+		btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='add'>+	} else if (btrfs_match_compress_type(string, "zstd", true)) {</div><div class='add'>+		ctx-&gt;compress_type = BTRFS_COMPRESS_ZSTD;</div><div class='add'>+		ret = btrfs_compress_str2level(BTRFS_COMPRESS_ZSTD, string + 4,</div><div class='add'>+					       &amp;ctx-&gt;compress_level);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='add'>+	} else if (btrfs_match_compress_type(string, "no", false) ||</div><div class='add'>+		   btrfs_match_compress_type(string, "none", false)) {</div><div class='add'>+		ctx-&gt;compress_level = 0;</div><div class='add'>+		ctx-&gt;compress_type = 0;</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='add'>+		btrfs_clear_opt(ctx-&gt;mount_opt, FORCE_COMPRESS);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	btrfs_err(NULL, "failed to parse compression option '%s'", string);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='hunk'>@@ -301,10 +373,9 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_device: {</div><div class='ctx'> 		struct btrfs_device *device;</div><div class='del'>-		blk_mode_t mode = btrfs_open_mode(fc);</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;uuid_mutex);</div><div class='del'>-		device = btrfs_scan_one_device(param-&gt;string, mode, false);</div><div class='add'>+		device = btrfs_scan_one_device(param-&gt;string, false);</div><div class='ctx'> 		mutex_unlock(&amp;uuid_mutex);</div><div class='ctx'> 		if (IS_ERR(device))</div><div class='ctx'> 			return PTR_ERR(device);</div><div class='hunk'>@@ -334,44 +405,8 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case Opt_compress:</div><div class='ctx'> 	case Opt_compress_type:</div><div class='del'>-		if (opt == Opt_compress || opt == Opt_compress_force) {</div><div class='del'>-			ctx-&gt;compress_type = BTRFS_COMPRESS_ZLIB;</div><div class='del'>-			ctx-&gt;compress_level = BTRFS_ZLIB_DEFAULT_LEVEL;</div><div class='del'>-			btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='del'>-		} else if (strncmp(param-&gt;string, "zlib", 4) == 0) {</div><div class='del'>-			ctx-&gt;compress_type = BTRFS_COMPRESS_ZLIB;</div><div class='del'>-			ctx-&gt;compress_level =</div><div class='del'>-				btrfs_compress_str2level(BTRFS_COMPRESS_ZLIB,</div><div class='del'>-							 param-&gt;string + 4);</div><div class='del'>-			btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='del'>-		} else if (strncmp(param-&gt;string, "lzo", 3) == 0) {</div><div class='del'>-			ctx-&gt;compress_type = BTRFS_COMPRESS_LZO;</div><div class='del'>-			ctx-&gt;compress_level = 0;</div><div class='del'>-			btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='del'>-		} else if (strncmp(param-&gt;string, "zstd", 4) == 0) {</div><div class='del'>-			ctx-&gt;compress_type = BTRFS_COMPRESS_ZSTD;</div><div class='del'>-			ctx-&gt;compress_level =</div><div class='del'>-				btrfs_compress_str2level(BTRFS_COMPRESS_ZSTD,</div><div class='del'>-							 param-&gt;string + 4);</div><div class='del'>-			btrfs_set_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATACOW);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, NODATASUM);</div><div class='del'>-		} else if (strncmp(param-&gt;string, "no", 2) == 0) {</div><div class='del'>-			ctx-&gt;compress_level = 0;</div><div class='del'>-			ctx-&gt;compress_type = 0;</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, COMPRESS);</div><div class='del'>-			btrfs_clear_opt(ctx-&gt;mount_opt, FORCE_COMPRESS);</div><div class='del'>-		} else {</div><div class='del'>-			btrfs_err(NULL, "unrecognized compression value %s",</div><div class='del'>-				  param-&gt;string);</div><div class='add'>+		if (btrfs_parse_compress(ctx, param, opt))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_ssd:</div><div class='ctx'> 		if (result.negated) {</div><div class='hunk'>@@ -435,9 +470,9 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		else</div><div class='ctx'> 			btrfs_clear_opt(ctx-&gt;mount_opt, NOTREELOG);</div><div class='ctx'> 		break;</div><div class='del'>-	case Opt_nologreplay:</div><div class='del'>-		btrfs_warn(NULL,</div><div class='del'>-		"'nologreplay' is deprecated, use 'rescue=nologreplay' instead");</div><div class='add'>+	case Opt_norecovery:</div><div class='add'>+		btrfs_info(NULL,</div><div class='add'>+"'norecovery' is for compatibility only, recommended to use 'rescue=nologreplay'");</div><div class='ctx'> 		btrfs_set_opt(ctx-&gt;mount_opt, NOLOGREPLAY);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_flushoncommit:</div><div class='hunk'>@@ -550,6 +585,10 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_commit_interval:</div><div class='ctx'> 		ctx-&gt;commit_interval = result.uint_32;</div><div class='add'>+		if (ctx-&gt;commit_interval &gt; BTRFS_WARNING_COMMIT_INTERVAL) {</div><div class='add'>+			btrfs_warn(NULL, "excessive commit interval %u, use with care",</div><div class='add'>+				   ctx-&gt;commit_interval);</div><div class='add'>+		}</div><div class='ctx'> 		if (ctx-&gt;commit_interval == 0)</div><div class='ctx'> 			ctx-&gt;commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -567,8 +606,16 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		case Opt_rescue_ignoredatacsums:</div><div class='ctx'> 			btrfs_set_opt(ctx-&gt;mount_opt, IGNOREDATACSUMS);</div><div class='ctx'> 			break;</div><div class='add'>+		case Opt_rescue_ignoremetacsums:</div><div class='add'>+			btrfs_set_opt(ctx-&gt;mount_opt, IGNOREMETACSUMS);</div><div class='add'>+			break;</div><div class='add'>+		case Opt_rescue_ignoresuperflags:</div><div class='add'>+			btrfs_set_opt(ctx-&gt;mount_opt, IGNORESUPERFLAGS);</div><div class='add'>+			break;</div><div class='ctx'> 		case Opt_rescue_parameter_all:</div><div class='ctx'> 			btrfs_set_opt(ctx-&gt;mount_opt, IGNOREDATACSUMS);</div><div class='add'>+			btrfs_set_opt(ctx-&gt;mount_opt, IGNOREMETACSUMS);</div><div class='add'>+			btrfs_set_opt(ctx-&gt;mount_opt, IGNORESUPERFLAGS);</div><div class='ctx'> 			btrfs_set_opt(ctx-&gt;mount_opt, IGNOREBADROOTS);</div><div class='ctx'> 			btrfs_set_opt(ctx-&gt;mount_opt, NOLOGREPLAY);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -597,11 +644,12 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='ctx'> 	case Opt_ref_verify:</div><div class='ctx'> 		btrfs_set_opt(ctx-&gt;mount_opt, REF_VERIFY);</div><div class='ctx'> 		break;</div><div class='add'>+	case Opt_ref_tracker:</div><div class='add'>+		btrfs_set_opt(ctx-&gt;mount_opt, REF_TRACKER);</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		btrfs_err(NULL, "unrecognized mount option '%s'", param-&gt;key);</div><div class='hunk'>@@ -623,8 +671,8 @@ static void btrfs_clear_oneshot_options(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	btrfs_clear_opt(fs_info-&gt;mount_opt, NOSPACECACHE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool check_ro_option(struct btrfs_fs_info *fs_info,</div><div class='del'>-			    unsigned long mount_opt, unsigned long opt,</div><div class='add'>+static bool check_ro_option(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			    unsigned long long mount_opt, unsigned long long opt,</div><div class='ctx'> 			    const char *opt_name)</div><div class='ctx'> {</div><div class='ctx'> 	if (mount_opt &amp; opt) {</div><div class='hunk'>@@ -635,7 +683,8 @@ static bool check_ro_option(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_check_options(struct btrfs_fs_info *info, unsigned long *mount_opt,</div><div class='add'>+bool btrfs_check_options(const struct btrfs_fs_info *info,</div><div class='add'>+			 unsigned long long *mount_opt,</div><div class='ctx'> 			 unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret = true;</div><div class='hunk'>@@ -643,7 +692,9 @@ bool btrfs_check_options(struct btrfs_fs_info *info, unsigned long *mount_opt,</div><div class='ctx'> 	if (!(flags &amp; SB_RDONLY) &amp;&amp;</div><div class='ctx'> 	    (check_ro_option(info, *mount_opt, BTRFS_MOUNT_NOLOGREPLAY, "nologreplay") ||</div><div class='ctx'> 	     check_ro_option(info, *mount_opt, BTRFS_MOUNT_IGNOREBADROOTS, "ignorebadroots") ||</div><div class='del'>-	     check_ro_option(info, *mount_opt, BTRFS_MOUNT_IGNOREDATACSUMS, "ignoredatacsums")))</div><div class='add'>+	     check_ro_option(info, *mount_opt, BTRFS_MOUNT_IGNOREDATACSUMS, "ignoredatacsums") ||</div><div class='add'>+	     check_ro_option(info, *mount_opt, BTRFS_MOUNT_IGNOREMETACSUMS, "ignoremetacsums") ||</div><div class='add'>+	     check_ro_option(info, *mount_opt, BTRFS_MOUNT_IGNORESUPERFLAGS, "ignoresuperflags")))</div><div class='ctx'> 		ret = false;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_fs_compat_ro(info, FREE_SPACE_TREE) &amp;&amp;</div><div class='hunk'>@@ -662,10 +713,10 @@ bool btrfs_check_options(struct btrfs_fs_info *info, unsigned long *mount_opt,</div><div class='ctx'> 		ret = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(BTRFS_FS_STATE_REMOUNTING, &amp;info-&gt;fs_state)) {</div><div class='del'>-		if (btrfs_raw_test_opt(*mount_opt, SPACE_CACHE))</div><div class='del'>-			btrfs_info(info, "disk space caching is enabled");</div><div class='del'>-		if (btrfs_raw_test_opt(*mount_opt, FREE_SPACE_TREE))</div><div class='del'>-			btrfs_info(info, "using free-space-tree");</div><div class='add'>+		if (btrfs_raw_test_opt(*mount_opt, SPACE_CACHE)) {</div><div class='add'>+			btrfs_warn(info,</div><div class='add'>+"space cache v1 is being deprecated and will be removed in a future release, please use -o space_cache=v2");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -756,17 +807,15 @@ char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct btrfs_root_ref *root_ref;</div><div class='ctx'> 	struct btrfs_inode_ref *inode_ref;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	char *name = NULL, *ptr;</div><div class='ctx'> 	u64 dirid;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	name = kmalloc(PATH_MAX, GFP_KERNEL);</div><div class='ctx'> 	if (!name) {</div><div class='hunk'>@@ -854,7 +903,6 @@ char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		fs_root = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (ptr == name + PATH_MAX - 1) {</div><div class='ctx'> 		name[0] = '/';</div><div class='ctx'> 		name[1] = '\0';</div><div class='hunk'>@@ -865,7 +913,6 @@ char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	btrfs_put_root(fs_root);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	kfree(name);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -874,7 +921,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> 	struct fscrypt_str name = FSTR_INIT("default", 7);</div><div class='ctx'> 	u64 dir_id;</div><div class='hunk'>@@ -891,7 +938,6 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec</div><div class='ctx'> 	dir_id = btrfs_super_root_dir(fs_info-&gt;super_copy);</div><div class='ctx'> 	di = btrfs_lookup_dir_item(NULL, root, path, dir_id, &amp;name, 0);</div><div class='ctx'> 	if (IS_ERR(di)) {</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return PTR_ERR(di);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!di) {</div><div class='hunk'>@@ -900,59 +946,58 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec</div><div class='ctx'> 		 * it's always been there, but don't freak out, just try and</div><div class='ctx'> 		 * mount the top-level subvolume.</div><div class='ctx'> 		 */</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		*objectid = BTRFS_FS_TREE_OBJECTID;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(path-&gt;nodes[0], di, &amp;location);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	*objectid = location.objectid;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_fill_super(struct super_block *sb,</div><div class='del'>-			    struct btrfs_fs_devices *fs_devices,</div><div class='del'>-			    void *data)</div><div class='add'>+			    struct btrfs_fs_devices *fs_devices)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='ctx'> 	sb-&gt;s_magic = BTRFS_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op = &amp;btrfs_super_ops;</div><div class='del'>-	sb-&gt;s_d_op = &amp;btrfs_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;btrfs_dentry_operations);</div><div class='ctx'> 	sb-&gt;s_export_op = &amp;btrfs_export_ops;</div><div class='ctx'> #ifdef CONFIG_FS_VERITY</div><div class='ctx'> 	sb-&gt;s_vop = &amp;btrfs_verityops;</div><div class='ctx'> #endif</div><div class='ctx'> 	sb-&gt;s_xattr = btrfs_xattr_handlers;</div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='del'>-	sb-&gt;s_iflags |= SB_I_CGROUPWB;</div><div class='add'>+	sb-&gt;s_iflags |= SB_I_CGROUPWB | SB_I_ALLOW_HSM;</div><div class='ctx'> </div><div class='del'>-	err = super_setup_bdi(sb);</div><div class='del'>-	if (err) {</div><div class='add'>+	ret = super_setup_bdi(sb);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		btrfs_err(fs_info, "super_setup_bdi failed");</div><div class='del'>-		return err;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = open_ctree(sb, fs_devices, (char *)data);</div><div class='del'>-	if (err) {</div><div class='del'>-		btrfs_err(fs_info, "open_ctree failed");</div><div class='del'>-		return err;</div><div class='add'>+	ret = open_ctree(sb, fs_devices);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_err(fs_info, "open_ctree failed: %d", ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(sb, BTRFS_FIRST_FREE_OBJECTID, fs_info-&gt;fs_root);</div><div class='add'>+	btrfs_emit_options(fs_info, NULL);</div><div class='add'>+</div><div class='add'>+	inode = btrfs_iget(BTRFS_FIRST_FREE_OBJECTID, fs_info-&gt;fs_root);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='del'>-		err = PTR_ERR(inode);</div><div class='del'>-		btrfs_handle_fs_error(fs_info, err, NULL);</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='add'>+		btrfs_handle_fs_error(fs_info, ret, NULL);</div><div class='ctx'> 		goto fail_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sb-&gt;s_root = d_make_root(inode);</div><div class='add'>+	sb-&gt;s_root = d_make_root(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto fail_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -961,7 +1006,7 @@ static int btrfs_fill_super(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> fail_close:</div><div class='ctx'> 	close_ctree(fs_info);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_sync_fs(struct super_block *sb, int wait)</div><div class='hunk'>@@ -977,7 +1022,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);</div><div class='add'>+	btrfs_wait_ordered_roots(fs_info, U64_MAX, NULL);</div><div class='ctx'> </div><div class='ctx'> 	trans = btrfs_attach_transaction_barrier(root);</div><div class='ctx'> 	if (IS_ERR(trans)) {</div><div class='hunk'>@@ -1040,7 +1085,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)</div><div class='ctx'> 			seq_printf(seq, ",compress-force=%s", compress_type);</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_printf(seq, ",compress=%s", compress_type);</div><div class='del'>-		if (info-&gt;compress_level)</div><div class='add'>+		if (info-&gt;compress_level &amp;&amp; info-&gt;compress_type != BTRFS_COMPRESS_LZO)</div><div class='ctx'> 			seq_printf(seq, ":%d", info-&gt;compress_level);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (btrfs_test_opt(info, NOSSD))</div><div class='hunk'>@@ -1059,6 +1104,10 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)</div><div class='ctx'> 		print_rescue_option(seq, "ignorebadroots", &amp;printed);</div><div class='ctx'> 	if (btrfs_test_opt(info, IGNOREDATACSUMS))</div><div class='ctx'> 		print_rescue_option(seq, "ignoredatacsums", &amp;printed);</div><div class='add'>+	if (btrfs_test_opt(info, IGNOREMETACSUMS))</div><div class='add'>+		print_rescue_option(seq, "ignoremetacsums", &amp;printed);</div><div class='add'>+	if (btrfs_test_opt(info, IGNORESUPERFLAGS))</div><div class='add'>+		print_rescue_option(seq, "ignoresuperflags", &amp;printed);</div><div class='ctx'> 	if (btrfs_test_opt(info, FLUSHONCOMMIT))</div><div class='ctx'> 		seq_puts(seq, ",flushoncommit");</div><div class='ctx'> 	if (btrfs_test_opt(info, DISCARD_SYNC))</div><div class='hunk'>@@ -1099,13 +1148,13 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)</div><div class='ctx'> #endif</div><div class='ctx'> 	if (btrfs_test_opt(info, REF_VERIFY))</div><div class='ctx'> 		seq_puts(seq, ",ref_verify");</div><div class='del'>-	seq_printf(seq, ",subvolid=%llu",</div><div class='del'>-		  BTRFS_I(d_inode(dentry))-&gt;root-&gt;root_key.objectid);</div><div class='add'>+	if (btrfs_test_opt(info, REF_TRACKER))</div><div class='add'>+		seq_puts(seq, ",ref_tracker");</div><div class='add'>+	seq_printf(seq, ",subvolid=%llu", btrfs_root_id(BTRFS_I(d_inode(dentry))-&gt;root));</div><div class='ctx'> 	subvol_name = btrfs_get_subvol_name_from_objectid(info,</div><div class='del'>-			BTRFS_I(d_inode(dentry))-&gt;root-&gt;root_key.objectid);</div><div class='add'>+			btrfs_root_id(BTRFS_I(d_inode(dentry))-&gt;root));</div><div class='ctx'> 	if (!IS_ERR(subvol_name)) {</div><div class='del'>-		seq_puts(seq, ",subvol=");</div><div class='del'>-		seq_escape(seq, subvol_name, " \t\n\\");</div><div class='add'>+		seq_show_option(seq, "subvol", subvol_name);</div><div class='ctx'> 		kfree(subvol_name);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1114,11 +1163,11 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)</div><div class='ctx'> /*</div><div class='ctx'>  * subvolumes are identified by ino 256</div><div class='ctx'>  */</div><div class='del'>-static inline int is_subvolume_inode(struct inode *inode)</div><div class='add'>+static inline bool is_subvolume_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (inode &amp;&amp; inode-&gt;i_ino == BTRFS_FIRST_FREE_OBJECTID)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *mount_subvol(const char *subvol_name, u64 subvol_objectid,</div><div class='hunk'>@@ -1154,7 +1203,7 @@ static struct dentry *mount_subvol(const char *subvol_name, u64 subvol_objectid,</div><div class='ctx'> 		struct super_block *s = root-&gt;d_sb;</div><div class='ctx'> 		struct btrfs_fs_info *fs_info = btrfs_sb(s);</div><div class='ctx'> 		struct inode *root_inode = d_inode(root);</div><div class='del'>-		u64 root_objectid = BTRFS_I(root_inode)-&gt;root-&gt;root_key.objectid;</div><div class='add'>+		u64 root_objectid = btrfs_root_id(BTRFS_I(root_inode)-&gt;root);</div><div class='ctx'> </div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		if (!is_subvolume_inode(root_inode)) {</div><div class='hunk'>@@ -1208,7 +1257,7 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_remount_begin(struct btrfs_fs_info *fs_info,</div><div class='del'>-				       unsigned long old_opts, int flags)</div><div class='add'>+				       unsigned long long old_opts, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_raw_test_opt(old_opts, AUTO_DEFRAG) &amp;&amp;</div><div class='ctx'> 	    (!btrfs_raw_test_opt(fs_info-&gt;mount_opt, AUTO_DEFRAG) ||</div><div class='hunk'>@@ -1222,12 +1271,12 @@ static inline void btrfs_remount_begin(struct btrfs_fs_info *fs_info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_remount_cleanup(struct btrfs_fs_info *fs_info,</div><div class='del'>-					 unsigned long old_opts)</div><div class='add'>+					 unsigned long long old_opts)</div><div class='ctx'> {</div><div class='ctx'> 	const bool cache_opt = btrfs_test_opt(fs_info, SPACE_CACHE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We need to cleanup all defragable inodes if the autodefragment is</div><div class='add'>+	 * We need to cleanup all defraggable inodes if the autodefragment is</div><div class='ctx'> 	 * close or the filesystem is read only.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (btrfs_raw_test_opt(old_opts, AUTO_DEFRAG) &amp;&amp;</div><div class='hunk'>@@ -1398,7 +1447,7 @@ static void btrfs_emit_options(struct btrfs_fs_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	btrfs_info_if_set(info, old, NODATASUM, "setting nodatasum");</div><div class='ctx'> 	btrfs_info_if_set(info, old, DEGRADED, "allowing degraded mounts");</div><div class='del'>-	btrfs_info_if_set(info, old, NODATASUM, "setting nodatasum");</div><div class='add'>+	btrfs_info_if_set(info, old, NODATACOW, "setting nodatacow");</div><div class='ctx'> 	btrfs_info_if_set(info, old, SSD, "enabling ssd optimizations");</div><div class='ctx'> 	btrfs_info_if_set(info, old, SSD_SPREAD, "using spread ssd allocation scheme");</div><div class='ctx'> 	btrfs_info_if_set(info, old, NOBARRIER, "turning off barriers");</div><div class='hunk'>@@ -1417,11 +1466,14 @@ static void btrfs_emit_options(struct btrfs_fs_info *info,</div><div class='ctx'> 	btrfs_info_if_set(info, old, USEBACKUPROOT, "trying to use backup root at mount time");</div><div class='ctx'> 	btrfs_info_if_set(info, old, IGNOREBADROOTS, "ignoring bad roots");</div><div class='ctx'> 	btrfs_info_if_set(info, old, IGNOREDATACSUMS, "ignoring data csums");</div><div class='add'>+	btrfs_info_if_set(info, old, IGNOREMETACSUMS, "ignoring meta csums");</div><div class='add'>+	btrfs_info_if_set(info, old, IGNORESUPERFLAGS, "ignoring unknown super block flags");</div><div class='ctx'> </div><div class='add'>+	btrfs_info_if_unset(info, old, NODATASUM, "setting datasum");</div><div class='ctx'> 	btrfs_info_if_unset(info, old, NODATACOW, "setting datacow");</div><div class='ctx'> 	btrfs_info_if_unset(info, old, SSD, "not using ssd optimizations");</div><div class='ctx'> 	btrfs_info_if_unset(info, old, SSD_SPREAD, "not using spread ssd allocation scheme");</div><div class='del'>-	btrfs_info_if_unset(info, old, NOBARRIER, "turning off barriers");</div><div class='add'>+	btrfs_info_if_unset(info, old, NOBARRIER, "turning on barriers");</div><div class='ctx'> 	btrfs_info_if_unset(info, old, NOTREELOG, "enabling tree log");</div><div class='ctx'> 	btrfs_info_if_unset(info, old, SPACE_CACHE, "disabling disk space caching");</div><div class='ctx'> 	btrfs_info_if_unset(info, old, FREE_SPACE_TREE, "disabling free space tree");</div><div class='hunk'>@@ -1457,11 +1509,18 @@ static int btrfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	btrfs_info_to_ctx(fs_info, &amp;old_ctx);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * This is our "bind mount" trick, we don't want to allow the user to do</div><div class='add'>+	 * anything other than mount a different ro/rw and a different subvol,</div><div class='add'>+	 * all of the mount options should be maintained.</div><div class='add'>+	 */</div><div class='add'>+	if (mount_reconfigure)</div><div class='add'>+		ctx-&gt;mount_opt = old_ctx.mount_opt;</div><div class='add'>+</div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> 	set_bit(BTRFS_FS_STATE_REMOUNTING, &amp;fs_info-&gt;fs_state);</div><div class='ctx'> </div><div class='del'>-	if (!mount_reconfigure &amp;&amp;</div><div class='del'>-	    !btrfs_check_options(fs_info, &amp;ctx-&gt;mount_opt, fc-&gt;sb_flags))</div><div class='add'>+	if (!btrfs_check_options(fs_info, &amp;ctx-&gt;mount_opt, fc-&gt;sb_flags))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_check_features(fs_info, !(fc-&gt;sb_flags &amp; SB_RDONLY));</div><div class='hunk'>@@ -1551,7 +1610,7 @@ static inline void btrfs_descending_sort_devices(</div><div class='ctx'> static inline int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					      u64 *free_bytes)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_device_info *devices_info;</div><div class='add'>+	struct btrfs_device_info AUTO_KFREE(devices_info);</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = fs_info-&gt;fs_devices;</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='ctx'> 	u64 type;</div><div class='hunk'>@@ -1649,7 +1708,6 @@ static inline int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		nr_devices--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(devices_info);</div><div class='ctx'> 	*free_bytes = avail_space;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1759,7 +1817,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 		buf-&gt;f_bavail = 0;</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type = BTRFS_SUPER_MAGIC;</div><div class='del'>-	buf-&gt;f_bsize = dentry-&gt;d_sb-&gt;s_blocksize;</div><div class='add'>+	buf-&gt;f_bsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	buf-&gt;f_namelen = BTRFS_NAME_LEN;</div><div class='ctx'> </div><div class='ctx'> 	/* We treat it as constant endianness (it doesn't matter _which_)</div><div class='hunk'>@@ -1768,10 +1826,8 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	buf-&gt;f_fsid.val[0] = be32_to_cpu(fsid[0]) ^ be32_to_cpu(fsid[2]);</div><div class='ctx'> 	buf-&gt;f_fsid.val[1] = be32_to_cpu(fsid[1]) ^ be32_to_cpu(fsid[3]);</div><div class='ctx'> 	/* Mask in the root object ID too, to disambiguate subvols */</div><div class='del'>-	buf-&gt;f_fsid.val[0] ^=</div><div class='del'>-		BTRFS_I(d_inode(dentry))-&gt;root-&gt;root_key.objectid &gt;&gt; 32;</div><div class='del'>-	buf-&gt;f_fsid.val[1] ^=</div><div class='del'>-		BTRFS_I(d_inode(dentry))-&gt;root-&gt;root_key.objectid;</div><div class='add'>+	buf-&gt;f_fsid.val[0] ^= btrfs_root_id(BTRFS_I(d_inode(dentry))-&gt;root) &gt;&gt; 32;</div><div class='add'>+	buf-&gt;f_fsid.val[1] ^= btrfs_root_id(BTRFS_I(d_inode(dentry))-&gt;root);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1789,10 +1845,9 @@ static int btrfs_get_tree_super(struct fs_context *fc)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = fc-&gt;s_fs_info;</div><div class='ctx'> 	struct btrfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = NULL;</div><div class='del'>-	struct block_device *bdev;</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='ctx'> 	struct super_block *sb;</div><div class='del'>-	blk_mode_t mode = btrfs_open_mode(fc);</div><div class='add'>+	blk_mode_t mode = sb_open_mode(fc-&gt;sb_flags);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_ctx_to_info(fs_info, ctx);</div><div class='hunk'>@@ -1802,69 +1857,103 @@ static int btrfs_get_tree_super(struct fs_context *fc)</div><div class='ctx'> 	 * With 'true' passed to btrfs_scan_one_device() (mount time) we expect</div><div class='ctx'> 	 * either a valid device or an error.</div><div class='ctx'> 	 */</div><div class='del'>-	device = btrfs_scan_one_device(fc-&gt;source, mode, true);</div><div class='add'>+	device = btrfs_scan_one_device(fc-&gt;source, true);</div><div class='ctx'> 	ASSERT(device != NULL);</div><div class='ctx'> 	if (IS_ERR(device)) {</div><div class='ctx'> 		mutex_unlock(&amp;uuid_mutex);</div><div class='ctx'> 		return PTR_ERR(device);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	fs_devices = device-&gt;fs_devices;</div><div class='add'>+	/*</div><div class='add'>+	 * We cannot hold uuid_mutex calling sget_fc(), it will lead to a</div><div class='add'>+	 * locking order reversal with s_umount.</div><div class='add'>+	 *</div><div class='add'>+	 * So here we increase the holding number of fs_devices, this will ensure</div><div class='add'>+	 * the fs_devices itself won't be freed.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_fs_devices_inc_holding(fs_devices);</div><div class='ctx'> 	fs_info-&gt;fs_devices = fs_devices;</div><div class='del'>-</div><div class='del'>-	ret = btrfs_open_devices(fs_devices, mode, &amp;btrfs_fs_type);</div><div class='ctx'> 	mutex_unlock(&amp;uuid_mutex);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!(fc-&gt;sb_flags &amp; SB_RDONLY) &amp;&amp; fs_devices-&gt;rw_devices == 0) {</div><div class='del'>-		ret = -EACCES;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	bdev = fs_devices-&gt;latest_dev-&gt;bdev;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * From now on the error handling is not straightforward.</div><div class='del'>-	 *</div><div class='del'>-	 * If successful, this will transfer the fs_info into the super block,</div><div class='del'>-	 * and fc-&gt;s_fs_info will be NULL.  However if there's an existing</div><div class='del'>-	 * super, we'll still have fc-&gt;s_fs_info populated.  If we error</div><div class='del'>-	 * completely out it'll be cleaned up when we drop the fs_context,</div><div class='del'>-	 * otherwise it's tied to the lifetime of the super_block.</div><div class='del'>-	 */</div><div class='ctx'> 	sb = sget_fc(fc, btrfs_fc_test_super, set_anon_super_fc);</div><div class='ctx'> 	if (IS_ERR(sb)) {</div><div class='del'>-		ret = PTR_ERR(sb);</div><div class='del'>-		goto error;</div><div class='add'>+		mutex_lock(&amp;uuid_mutex);</div><div class='add'>+		btrfs_fs_devices_dec_holding(fs_devices);</div><div class='add'>+		/*</div><div class='add'>+		 * Since the fs_devices is not opened, it can be freed at any</div><div class='add'>+		 * time after unlocking uuid_mutex.  We need to avoid double</div><div class='add'>+		 * free through put_fs_context()-&gt;btrfs_free_fs_info().</div><div class='add'>+		 * So here we reset fs_info-&gt;fs_devices to NULL, and let the</div><div class='add'>+		 * regular fs_devices reclaim path to handle it.</div><div class='add'>+		 *</div><div class='add'>+		 * This applies to all later branches where no fs_devices is</div><div class='add'>+		 * opened.</div><div class='add'>+		 */</div><div class='add'>+		fs_info-&gt;fs_devices = NULL;</div><div class='add'>+		mutex_unlock(&amp;uuid_mutex);</div><div class='add'>+		return PTR_ERR(sb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_device_specific_options(fs_info);</div><div class='del'>-</div><div class='ctx'> 	if (sb-&gt;s_root) {</div><div class='del'>-		btrfs_close_devices(fs_devices);</div><div class='del'>-		if ((fc-&gt;sb_flags ^ sb-&gt;s_flags) &amp; SB_RDONLY)</div><div class='del'>-			ret = -EBUSY;</div><div class='add'>+		/*</div><div class='add'>+		 * Not the first mount of the fs thus got an existing super block.</div><div class='add'>+		 * Will reuse the returned super block, fs_info and fs_devices.</div><div class='add'>+		 *</div><div class='add'>+		 * fc-&gt;s_fs_info is not touched and will be later freed by</div><div class='add'>+		 * put_fs_context() through btrfs_free_fs_context().</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(fc-&gt;s_fs_info == fs_info);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;uuid_mutex);</div><div class='add'>+		btrfs_fs_devices_dec_holding(fs_devices);</div><div class='add'>+		fs_info-&gt;fs_devices = NULL;</div><div class='add'>+		mutex_unlock(&amp;uuid_mutex);</div><div class='add'>+		/*</div><div class='add'>+		 * At this stage we may have RO flag mismatch between</div><div class='add'>+		 * fc-&gt;sb_flags and sb-&gt;s_flags.  Caller should detect such</div><div class='add'>+		 * mismatch and reconfigure with sb-&gt;s_umount rwsem held if</div><div class='add'>+		 * needed.</div><div class='add'>+		 */</div><div class='ctx'> 	} else {</div><div class='add'>+		struct block_device *bdev;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The first mount of the fs thus a new superblock, fc-&gt;s_fs_info</div><div class='add'>+		 * must be NULL, and the ownership of our fs_info and fs_devices is</div><div class='add'>+		 * transferred to the super block.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(fc-&gt;s_fs_info == NULL);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;uuid_mutex);</div><div class='add'>+		btrfs_fs_devices_dec_holding(fs_devices);</div><div class='add'>+		ret = btrfs_open_devices(fs_devices, mode, sb);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			fs_info-&gt;fs_devices = NULL;</div><div class='add'>+		mutex_unlock(&amp;uuid_mutex);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			deactivate_locked_super(sb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		if (!(fc-&gt;sb_flags &amp; SB_RDONLY) &amp;&amp; fs_devices-&gt;rw_devices == 0) {</div><div class='add'>+			deactivate_locked_super(sb);</div><div class='add'>+			return -EACCES;</div><div class='add'>+		}</div><div class='add'>+		set_device_specific_options(fs_info);</div><div class='add'>+		bdev = fs_devices-&gt;latest_dev-&gt;bdev;</div><div class='ctx'> 		snprintf(sb-&gt;s_id, sizeof(sb-&gt;s_id), "%pg", bdev);</div><div class='ctx'> 		shrinker_debugfs_rename(sb-&gt;s_shrink, "sb-btrfs:%s", sb-&gt;s_id);</div><div class='del'>-		btrfs_sb(sb)-&gt;bdev_holder = &amp;btrfs_fs_type;</div><div class='del'>-		ret = btrfs_fill_super(sb, fs_devices, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		deactivate_locked_super(sb);</div><div class='del'>-		return ret;</div><div class='add'>+		ret = btrfs_fill_super(sb, fs_devices);</div><div class='add'>+		if (ret) {</div><div class='add'>+			deactivate_locked_super(sb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_clear_oneshot_options(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;root = dget(sb-&gt;s_root);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	btrfs_close_devices(fs_devices);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1935,59 +2024,19 @@ error:</div><div class='ctx'>  *     fsconfig(FSCONFIG_SET_FLAG, "ro"). This option is seen by the filesystem</div><div class='ctx'>  *     in fc-&gt;sb_flags.</div><div class='ctx'>  *</div><div class='del'>- * This disambiguation has rather positive consequences.  Mounting a subvolume</div><div class='del'>- * ro will not also turn the superblock ro. Only the mount for the subvolume</div><div class='del'>- * will become ro.</div><div class='del'>- *</div><div class='del'>- * So, if the superblock creation request comes from the new mount API the</div><div class='del'>- * caller must have explicitly done:</div><div class='del'>- *</div><div class='del'>- *      fsconfig(FSCONFIG_SET_FLAG, "ro")</div><div class='del'>- *      fsmount/mount_setattr(MOUNT_ATTR_RDONLY)</div><div class='del'>- *</div><div class='del'>- * IOW, at some point the caller must have explicitly turned the whole</div><div class='del'>- * superblock ro and we shouldn't just undo it like we did for the old mount</div><div class='del'>- * API. In any case, it lets us avoid the hack in the new mount API.</div><div class='del'>- *</div><div class='del'>- * Consequently, the remounting hack must only be used for requests originating</div><div class='del'>- * from the old mount API and should be marked for full deprecation so it can be</div><div class='del'>- * turned off in a couple of years.</div><div class='del'>- *</div><div class='del'>- * The new mount API has no reason to support this hack.</div><div class='add'>+ * But, currently the util-linux mount command already utilizes the new mount</div><div class='add'>+ * API and is still setting fsconfig(FSCONFIG_SET_FLAG, "ro") no matter if it's</div><div class='add'>+ * btrfs or not, setting the whole super block RO.  To make per-subvolume mounting</div><div class='add'>+ * work with different options work we need to keep backward compatibility.</div><div class='ctx'>  */</div><div class='del'>-static struct vfsmount *btrfs_reconfigure_for_mount(struct fs_context *fc)</div><div class='add'>+static int btrfs_reconfigure_for_mount(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct vfsmount *mnt;</div><div class='del'>-	int ret;</div><div class='del'>-	const bool ro2rw = !(fc-&gt;sb_flags &amp; SB_RDONLY);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We got an EBUSY because our SB_RDONLY flag didn't match the existing</div><div class='del'>-	 * super block, so invert our setting here and retry the mount so we</div><div class='del'>-	 * can get our vfsmount.</div><div class='del'>-	 */</div><div class='del'>-	if (ro2rw)</div><div class='del'>-		fc-&gt;sb_flags |= SB_RDONLY;</div><div class='del'>-	else</div><div class='del'>-		fc-&gt;sb_flags &amp;= ~SB_RDONLY;</div><div class='del'>-</div><div class='del'>-	mnt = fc_mount(fc);</div><div class='del'>-	if (IS_ERR(mnt))</div><div class='del'>-		return mnt;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!fc-&gt;oldapi || !ro2rw)</div><div class='del'>-		return mnt;</div><div class='add'>+	if (!(fc-&gt;sb_flags &amp; SB_RDONLY) &amp;&amp; (fc-&gt;root-&gt;d_sb-&gt;s_flags &amp; SB_RDONLY))</div><div class='add'>+		ret = btrfs_reconfigure(fc);</div><div class='ctx'> </div><div class='del'>-	/* We need to convert to rw, call reconfigure. */</div><div class='del'>-	fc-&gt;sb_flags &amp;= ~SB_RDONLY;</div><div class='del'>-	down_write(&amp;mnt-&gt;mnt_sb-&gt;s_umount);</div><div class='del'>-	ret = btrfs_reconfigure(fc);</div><div class='del'>-	up_write(&amp;mnt-&gt;mnt_sb-&gt;s_umount);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mntput(mnt);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-	return mnt;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_get_tree_subvol(struct fs_context *fc)</div><div class='hunk'>@@ -1997,6 +2046,7 @@ static int btrfs_get_tree_subvol(struct fs_context *fc)</div><div class='ctx'> 	struct fs_context *dup_fc;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct vfsmount *mnt;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup a dummy root and fs_info for test/set super.  This is because</div><div class='hunk'>@@ -2013,7 +2063,13 @@ static int btrfs_get_tree_subvol(struct fs_context *fc)</div><div class='ctx'> 	fs_info-&gt;super_copy = kzalloc(BTRFS_SUPER_INFO_SIZE, GFP_KERNEL);</div><div class='ctx'> 	fs_info-&gt;super_for_commit = kzalloc(BTRFS_SUPER_INFO_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!fs_info-&gt;super_copy || !fs_info-&gt;super_for_commit) {</div><div class='del'>-		btrfs_free_fs_info(fs_info);</div><div class='add'>+		/*</div><div class='add'>+		 * Dont call btrfs_free_fs_info() to free it as it's still</div><div class='add'>+		 * initialized partially.</div><div class='add'>+		 */</div><div class='add'>+		kfree(fs_info-&gt;super_copy);</div><div class='add'>+		kfree(fs_info-&gt;super_for_commit);</div><div class='add'>+		kvfree(fs_info);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_init_fs_info(fs_info);</div><div class='hunk'>@@ -2030,17 +2086,15 @@ static int btrfs_get_tree_subvol(struct fs_context *fc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	dup_fc-&gt;s_fs_info = fs_info;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We'll do the security settings in our btrfs_get_tree_super() mount</div><div class='del'>-	 * loop, they were duplicated into dup_fc, we can drop the originals</div><div class='del'>-	 * here.</div><div class='del'>-	 */</div><div class='del'>-	security_free_mnt_opts(&amp;fc-&gt;security);</div><div class='del'>-	fc-&gt;security = NULL;</div><div class='add'>+	ret = btrfs_get_tree_super(dup_fc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	mnt = fc_mount(dup_fc);</div><div class='del'>-	if (PTR_ERR_OR_ZERO(mnt) == -EBUSY)</div><div class='del'>-		mnt = btrfs_reconfigure_for_mount(dup_fc);</div><div class='add'>+	ret = btrfs_reconfigure_for_mount(dup_fc);</div><div class='add'>+	up_write(&amp;dup_fc-&gt;root-&gt;d_sb-&gt;s_umount);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	mnt = vfs_create_mount(dup_fc);</div><div class='ctx'> 	put_fs_context(dup_fc);</div><div class='ctx'> 	if (IS_ERR(mnt))</div><div class='ctx'> 		return PTR_ERR(mnt);</div><div class='hunk'>@@ -2057,25 +2111,15 @@ static int btrfs_get_tree_subvol(struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;root = dentry;</div><div class='ctx'> 	return 0;</div><div class='add'>+error:</div><div class='add'>+	put_fs_context(dup_fc);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Since we use mount_subtree to mount the default/specified subvol, we</div><div class='del'>-	 * have to do mounts in two steps.</div><div class='del'>-	 *</div><div class='del'>-	 * First pass through we call btrfs_get_tree_subvol(), this is just a</div><div class='del'>-	 * wrapper around fc_mount() to call back into here again, and this time</div><div class='del'>-	 * we'll call btrfs_get_tree_super().  This will do the open_ctree() and</div><div class='del'>-	 * everything to open the devices and file system.  Then we return back</div><div class='del'>-	 * with a fully constructed vfsmount in btrfs_get_tree_subvol(), and</div><div class='del'>-	 * from there we can do our mount_subvol() call, which will lookup</div><div class='del'>-	 * whichever subvol we're mounting and setup this fc with the</div><div class='del'>-	 * appropriate dentry for the subvol.</div><div class='del'>-	 */</div><div class='del'>-	if (fc-&gt;s_fs_info)</div><div class='del'>-		return btrfs_get_tree_super(fc);</div><div class='add'>+	ASSERT(fc-&gt;s_fs_info == NULL);</div><div class='add'>+</div><div class='ctx'> 	return btrfs_get_tree_subvol(fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2162,7 +2206,8 @@ static struct file_system_type btrfs_fs_type = {</div><div class='ctx'> 	.init_fs_context	= btrfs_init_fs_context,</div><div class='ctx'> 	.parameters		= btrfs_fs_parameters,</div><div class='ctx'> 	.kill_sb		= btrfs_kill_super,</div><div class='del'>-	.fs_flags		= FS_REQUIRES_DEV | FS_BINARY_MOUNTDATA | FS_ALLOW_IDMAP,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV | FS_BINARY_MOUNTDATA |</div><div class='add'>+				  FS_ALLOW_IDMAP | FS_MGTIME,</div><div class='ctx'>  };</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS_FS("btrfs");</div><div class='hunk'>@@ -2195,7 +2240,9 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 	vol = memdup_user((void __user *)arg, sizeof(*vol));</div><div class='ctx'> 	if (IS_ERR(vol))</div><div class='ctx'> 		return PTR_ERR(vol);</div><div class='del'>-	vol-&gt;name[BTRFS_PATH_NAME_MAX] = '\0';</div><div class='add'>+	ret = btrfs_check_ioctl_vol_args_path(vol);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case BTRFS_IOC_SCAN_DEV:</div><div class='hunk'>@@ -2204,7 +2251,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		 * Scanning outside of mount can return NULL which would turn</div><div class='ctx'> 		 * into 0 error code.</div><div class='ctx'> 		 */</div><div class='del'>-		device = btrfs_scan_one_device(vol-&gt;name, BLK_OPEN_READ, false);</div><div class='add'>+		device = btrfs_scan_one_device(vol-&gt;name, false);</div><div class='ctx'> 		ret = PTR_ERR_OR_ZERO(device);</div><div class='ctx'> 		mutex_unlock(&amp;uuid_mutex);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2222,10 +2269,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		 * Scanning outside of mount can return NULL which would turn</div><div class='ctx'> 		 * into 0 error code.</div><div class='ctx'> 		 */</div><div class='del'>-		device = btrfs_scan_one_device(vol-&gt;name, BLK_OPEN_READ, false);</div><div class='add'>+		device = btrfs_scan_one_device(vol-&gt;name, false);</div><div class='ctx'> 		if (IS_ERR_OR_NULL(device)) {</div><div class='ctx'> 			mutex_unlock(&amp;uuid_mutex);</div><div class='del'>-			ret = PTR_ERR(device);</div><div class='add'>+			ret = PTR_ERR_OR_ZERO(device);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = !(device-&gt;fs_devices-&gt;num_devices ==</div><div class='hunk'>@@ -2237,15 +2284,14 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	kfree(vol);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_freeze(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='del'>-	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(BTRFS_FS_FROZEN, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2254,14 +2300,7 @@ static int btrfs_freeze(struct super_block *sb)</div><div class='ctx'> 	 * we want to avoid on a frozen filesystem), or do the commit</div><div class='ctx'> 	 * ourselves.</div><div class='ctx'> 	 */</div><div class='del'>-	trans = btrfs_attach_transaction_barrier(root);</div><div class='del'>-	if (IS_ERR(trans)) {</div><div class='del'>-		/* no transaction, don't bother */</div><div class='del'>-		if (PTR_ERR(trans) == -ENOENT)</div><div class='del'>-			return 0;</div><div class='del'>-		return PTR_ERR(trans);</div><div class='del'>-	}</div><div class='del'>-	return btrfs_commit_transaction(trans);</div><div class='add'>+	return btrfs_commit_current_transaction(fs_info-&gt;tree_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int check_dev_super(struct btrfs_device *dev)</div><div class='hunk'>@@ -2280,20 +2319,20 @@ static int check_dev_super(struct btrfs_device *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Only need to check the primary super block. */</div><div class='del'>-	sb = btrfs_read_dev_one_super(dev-&gt;bdev, 0, true);</div><div class='add'>+	sb = btrfs_read_disk_super(dev-&gt;bdev, 0, true);</div><div class='ctx'> 	if (IS_ERR(sb))</div><div class='ctx'> 		return PTR_ERR(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* Verify the checksum. */</div><div class='ctx'> 	csum_type = btrfs_super_csum_type(sb);</div><div class='del'>-	if (csum_type != btrfs_super_csum_type(fs_info-&gt;super_copy)) {</div><div class='add'>+	if (unlikely(csum_type != btrfs_super_csum_type(fs_info-&gt;super_copy))) {</div><div class='ctx'> 		btrfs_err(fs_info, "csum type changed, has %u expect %u",</div><div class='ctx'> 			  csum_type, btrfs_super_csum_type(fs_info-&gt;super_copy));</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (btrfs_check_super_csum(fs_info, sb)) {</div><div class='add'>+	if (unlikely(btrfs_check_super_csum(fs_info, sb))) {</div><div class='ctx'> 		btrfs_err(fs_info, "csum for on-disk super block no longer matches");</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2305,7 +2344,7 @@ static int check_dev_super(struct btrfs_device *dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	last_trans = btrfs_get_last_trans_committed(fs_info);</div><div class='del'>-	if (btrfs_super_generation(sb) != last_trans) {</div><div class='add'>+	if (unlikely(btrfs_super_generation(sb) != last_trans)) {</div><div class='ctx'> 		btrfs_err(fs_info, "transid mismatch, has %llu expect %llu",</div><div class='ctx'> 			  btrfs_super_generation(sb), last_trans);</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='hunk'>@@ -2365,6 +2404,87 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long btrfs_nr_cached_objects(struct super_block *sb, struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='add'>+	const s64 nr = percpu_counter_sum_positive(&amp;fs_info-&gt;evictable_extent_maps);</div><div class='add'>+</div><div class='add'>+	trace_btrfs_extent_map_shrinker_count(fs_info, nr);</div><div class='add'>+</div><div class='add'>+	return nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long btrfs_free_cached_objects(struct super_block *sb, struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	const long nr_to_scan = min_t(unsigned long, LONG_MAX, sc-&gt;nr_to_scan);</div><div class='add'>+	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='add'>+</div><div class='add'>+	btrfs_free_extent_maps(fs_info, nr_to_scan);</div><div class='add'>+</div><div class='add'>+	/* The extent map shrinker runs asynchronously, so always return 0. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+static int btrfs_remove_bdev(struct super_block *sb, struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='add'>+	struct btrfs_device *device;</div><div class='add'>+	struct btrfs_dev_lookup_args lookup_args = { .devt = bdev-&gt;bd_dev };</div><div class='add'>+	bool can_rw;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='add'>+	device = btrfs_find_device(fs_info-&gt;fs_devices, &amp;lookup_args);</div><div class='add'>+	if (!device) {</div><div class='add'>+		mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='add'>+		/* Device not found, should not affect the running fs, just give a warning. */</div><div class='add'>+		btrfs_warn(fs_info, "unable to find btrfs device for block device '%pg'", bdev);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * The to-be-removed device is already missing?</div><div class='add'>+	 *</div><div class='add'>+	 * That's weird but no special handling needed and can exit right now.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(test_and_set_bit(BTRFS_DEV_STATE_MISSING, &amp;device-&gt;dev_state))) {</div><div class='add'>+		mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='add'>+		btrfs_warn(fs_info, "btrfs device id %llu is already missing", device-&gt;devid);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device-&gt;fs_devices-&gt;missing_devices++;</div><div class='add'>+	if (test_and_clear_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;device-&gt;dev_state)) {</div><div class='add'>+		list_del_init(&amp;device-&gt;dev_alloc_list);</div><div class='add'>+		WARN_ON(device-&gt;fs_devices-&gt;rw_devices &lt; 1);</div><div class='add'>+		device-&gt;fs_devices-&gt;rw_devices--;</div><div class='add'>+	}</div><div class='add'>+	can_rw = btrfs_check_rw_degradable(fs_info, device);</div><div class='add'>+	mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='add'>+	/*</div><div class='add'>+	 * Now device is considered missing, btrfs_device_name() won't give a</div><div class='add'>+	 * meaningful result anymore, so only output the devid.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!can_rw)) {</div><div class='add'>+		btrfs_crit(fs_info,</div><div class='add'>+		"btrfs device id %llu has gone missing, can not maintain read-write",</div><div class='add'>+			   device-&gt;devid);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	btrfs_warn(fs_info,</div><div class='add'>+		   "btrfs device id %llu has gone missing, continue as degraded",</div><div class='add'>+		   device-&gt;devid);</div><div class='add'>+	btrfs_set_opt(fs_info-&gt;mount_opt, DEGRADED);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btrfs_shutdown(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = btrfs_sb(sb);</div><div class='add'>+</div><div class='add'>+	btrfs_force_shutdown(fs_info);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct super_operations btrfs_super_ops = {</div><div class='ctx'> 	.drop_inode	= btrfs_drop_inode,</div><div class='ctx'> 	.evict_inode	= btrfs_evict_inode,</div><div class='hunk'>@@ -2378,6 +2498,12 @@ static const struct super_operations btrfs_super_ops = {</div><div class='ctx'> 	.statfs		= btrfs_statfs,</div><div class='ctx'> 	.freeze_fs	= btrfs_freeze,</div><div class='ctx'> 	.unfreeze_fs	= btrfs_unfreeze,</div><div class='add'>+	.nr_cached_objects = btrfs_nr_cached_objects,</div><div class='add'>+	.free_cached_objects = btrfs_free_cached_objects,</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	.remove_bdev	= btrfs_remove_bdev,</div><div class='add'>+	.shutdown	= btrfs_shutdown,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations btrfs_ctl_fops = {</div><div class='hunk'>@@ -2410,15 +2536,15 @@ static __cold void btrfs_interface_exit(void)</div><div class='ctx'> static int __init btrfs_print_mod_info(void)</div><div class='ctx'> {</div><div class='ctx'> 	static const char options[] = ""</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+			", experimental=on"</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 			", debug=on"</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BTRFS_ASSERT</div><div class='ctx'> 			", assert=on"</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_BTRFS_FS_REF_VERIFY</div><div class='del'>-			", ref-verify=on"</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 			", zoned=yes"</div><div class='ctx'> #else</div><div class='hunk'>@@ -2430,7 +2556,17 @@ static int __init btrfs_print_mod_info(void)</div><div class='ctx'> 			", fsverity=no"</div><div class='ctx'> #endif</div><div class='ctx'> 			;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	if (btrfs_get_mod_read_policy() == NULL)</div><div class='add'>+		pr_info("Btrfs loaded%s\n", options);</div><div class='add'>+	else</div><div class='add'>+		pr_info("Btrfs loaded%s, read_policy=%s\n",</div><div class='add'>+			 options, btrfs_get_mod_read_policy());</div><div class='add'>+#else</div><div class='ctx'> 	pr_info("Btrfs loaded%s\n", options);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2465,6 +2601,9 @@ static const struct init_sequence mod_init_seq[] = {</div><div class='ctx'> 		.init_func = btrfs_init_cachep,</div><div class='ctx'> 		.exit_func = btrfs_destroy_cachep,</div><div class='ctx'> 	}, {</div><div class='add'>+		.init_func = btrfs_init_dio,</div><div class='add'>+		.exit_func = btrfs_destroy_dio,</div><div class='add'>+	}, {</div><div class='ctx'> 		.init_func = btrfs_transaction_init,</div><div class='ctx'> 		.exit_func = btrfs_transaction_exit,</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -2474,8 +2613,8 @@ static const struct init_sequence mod_init_seq[] = {</div><div class='ctx'> 		.init_func = btrfs_free_space_init,</div><div class='ctx'> 		.exit_func = btrfs_free_space_exit,</div><div class='ctx'> 	}, {</div><div class='del'>-		.init_func = extent_state_init_cachep,</div><div class='del'>-		.exit_func = extent_state_free_cachep,</div><div class='add'>+		.init_func = btrfs_extent_state_init_cachep,</div><div class='add'>+		.exit_func = btrfs_extent_state_free_cachep,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.init_func = extent_buffer_init_cachep,</div><div class='ctx'> 		.exit_func = extent_buffer_free_cachep,</div><div class='hunk'>@@ -2483,8 +2622,13 @@ static const struct init_sequence mod_init_seq[] = {</div><div class='ctx'> 		.init_func = btrfs_bioset_init,</div><div class='ctx'> 		.exit_func = btrfs_bioset_exit,</div><div class='ctx'> 	}, {</div><div class='del'>-		.init_func = extent_map_init,</div><div class='del'>-		.exit_func = extent_map_exit,</div><div class='add'>+		.init_func = btrfs_extent_map_init,</div><div class='add'>+		.exit_func = btrfs_extent_map_exit,</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	}, {</div><div class='add'>+		.init_func = btrfs_read_policy_init,</div><div class='add'>+		.exit_func = NULL,</div><div class='add'>+#endif</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.init_func = ordered_data_init,</div><div class='ctx'> 		.exit_func = ordered_data_exit,</div><div class='hunk'>@@ -2556,6 +2700,7 @@ static int __init init_btrfs_fs(void)</div><div class='ctx'> late_initcall(init_btrfs_fs);</div><div class='ctx'> module_exit(exit_btrfs_fs)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("B-Tree File System (BTRFS)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_SOFTDEP("pre: crc32c");</div><div class='ctx'> MODULE_SOFTDEP("pre: xxhash64");</div><div class='head'>diff --git a/fs/btrfs/super.h b/fs/btrfs/super.h<br/>index f18253ca280d..d80a86acfbbe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/super.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/super.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/super.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/super.h</a></div><div class='hunk'>@@ -3,7 +3,15 @@</div><div class='ctx'> #ifndef BTRFS_SUPER_H</div><div class='ctx'> #define BTRFS_SUPER_H</div><div class='ctx'> </div><div class='del'>-bool btrfs_check_options(struct btrfs_fs_info *info, unsigned long *mount_opt,</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include "fs.h"</div><div class='add'>+</div><div class='add'>+struct super_block;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+</div><div class='add'>+bool btrfs_check_options(const struct btrfs_fs_info *info,</div><div class='add'>+			 unsigned long long *mount_opt,</div><div class='ctx'> 			 unsigned long flags);</div><div class='ctx'> int btrfs_sync_fs(struct super_block *sb, int wait);</div><div class='ctx'> char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,</div><div class='head'>diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c<br/>index 84c05246ffd8..1f64c132b387 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/sysfs.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='hunk'>@@ -25,6 +26,7 @@</div><div class='ctx'> #include "misc.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='add'>+#include "zoned.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Structure name                       Path</div><div class='hunk'>@@ -160,8 +162,7 @@ static int can_modify_feature(struct btrfs_feature_attr *fa)</div><div class='ctx'> 		clear = BTRFS_FEATURE_INCOMPAT_SAFE_CLEAR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		pr_warn("btrfs: sysfs: unknown feature set %d\n",</div><div class='del'>-				fa-&gt;feature_set);</div><div class='add'>+		btrfs_warn(NULL, "sysfs: unknown feature set %d", fa-&gt;feature_set);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +296,7 @@ BTRFS_FEAT_ATTR_INCOMPAT(simple_quota, SIMPLE_QUOTA);</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> BTRFS_FEAT_ATTR_INCOMPAT(zoned, ZONED);</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='ctx'> /* Remove once support for extent tree v2 is feature complete */</div><div class='ctx'> BTRFS_FEAT_ATTR_INCOMPAT(extent_tree_v2, EXTENT_TREE_V2);</div><div class='ctx'> /* Remove once support for raid stripe tree is feature complete. */</div><div class='hunk'>@@ -329,7 +330,7 @@ static struct attribute *btrfs_supported_feature_attrs[] = {</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 	BTRFS_FEAT_ATTR_PTR(zoned),</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_BTRFS_DEBUG</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='ctx'> 	BTRFS_FEAT_ATTR_PTR(extent_tree_v2),</div><div class='ctx'> 	BTRFS_FEAT_ATTR_PTR(raid_stripe_tree),</div><div class='ctx'> #endif</div><div class='hunk'>@@ -385,6 +386,8 @@ static const char *rescue_opts[] = {</div><div class='ctx'> 	"nologreplay",</div><div class='ctx'> 	"ignorebadroots",</div><div class='ctx'> 	"ignoredatacsums",</div><div class='add'>+	"ignoremetacsums",</div><div class='add'>+	"ignoresuperflags",</div><div class='ctx'> 	"all",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -408,12 +411,17 @@ static ssize_t supported_sectorsizes_show(struct kobject *kobj,</div><div class='ctx'> 					  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='add'>+	bool has_output = false;</div><div class='ctx'> </div><div class='del'>-	/* An artificial limit to only support 4K and PAGE_SIZE */</div><div class='del'>-	if (PAGE_SIZE &gt; SZ_4K)</div><div class='del'>-		ret += sysfs_emit_at(buf, ret, "%u ", SZ_4K);</div><div class='del'>-	ret += sysfs_emit_at(buf, ret, "%lu\n", PAGE_SIZE);</div><div class='del'>-</div><div class='add'>+	for (u32 cur = BTRFS_MIN_BLOCKSIZE; cur &lt;= BTRFS_MAX_BLOCKSIZE; cur *= 2) {</div><div class='add'>+		if (!btrfs_supported_blocksize(cur))</div><div class='add'>+			continue;</div><div class='add'>+		if (has_output)</div><div class='add'>+			ret += sysfs_emit_at(buf, ret, " ");</div><div class='add'>+		ret += sysfs_emit_at(buf, ret, "%u", cur);</div><div class='add'>+		has_output = true;</div><div class='add'>+	}</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "\n");</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> BTRFS_ATTR(static_feature, supported_sectorsizes,</div><div class='hunk'>@@ -421,7 +429,7 @@ BTRFS_ATTR(static_feature, supported_sectorsizes,</div><div class='ctx'> </div><div class='ctx'> static ssize_t acl_show(struct kobject *kobj, struct kobj_attribute *a, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sysfs_emit(buf, "%d\n", !!IS_ENABLED(CONFIG_BTRFS_FS_POSIX_ACL));</div><div class='add'>+	return sysfs_emit(buf, "%d\n", IS_ENABLED(CONFIG_BTRFS_FS_POSIX_ACL));</div><div class='ctx'> }</div><div class='ctx'> BTRFS_ATTR(static_feature, acl, acl_show);</div><div class='ctx'> </div><div class='hunk'>@@ -894,6 +902,9 @@ SPACE_INFO_ATTR(bytes_readonly);</div><div class='ctx'> SPACE_INFO_ATTR(bytes_zone_unusable);</div><div class='ctx'> SPACE_INFO_ATTR(disk_used);</div><div class='ctx'> SPACE_INFO_ATTR(disk_total);</div><div class='add'>+SPACE_INFO_ATTR(reclaim_count);</div><div class='add'>+SPACE_INFO_ATTR(reclaim_bytes);</div><div class='add'>+SPACE_INFO_ATTR(reclaim_errors);</div><div class='ctx'> BTRFS_ATTR_RW(space_info, chunk_size, btrfs_chunk_size_show, btrfs_chunk_size_store);</div><div class='ctx'> BTRFS_ATTR(space_info, size_classes, btrfs_size_classes_show);</div><div class='ctx'> </div><div class='hunk'>@@ -902,8 +913,12 @@ static ssize_t btrfs_sinfo_bg_reclaim_threshold_show(struct kobject *kobj,</div><div class='ctx'> 						     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_space_info *space_info = to_space_info(kobj);</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	return sysfs_emit(buf, "%d\n", READ_ONCE(space_info-&gt;bg_reclaim_threshold));</div><div class='add'>+	spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+	ret = sysfs_emit(buf, "%d\n", btrfs_calc_reclaim_threshold(space_info));</div><div class='add'>+	spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t btrfs_sinfo_bg_reclaim_threshold_store(struct kobject *kobj,</div><div class='hunk'>@@ -914,6 +929,9 @@ static ssize_t btrfs_sinfo_bg_reclaim_threshold_store(struct kobject *kobj,</div><div class='ctx'> 	int thresh;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (READ_ONCE(space_info-&gt;dynamic_reclaim))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	ret = kstrtoint(buf, 10, &amp;thresh);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -930,6 +948,72 @@ BTRFS_ATTR_RW(space_info, bg_reclaim_threshold,</div><div class='ctx'> 	      btrfs_sinfo_bg_reclaim_threshold_show,</div><div class='ctx'> 	      btrfs_sinfo_bg_reclaim_threshold_store);</div><div class='ctx'> </div><div class='add'>+static ssize_t btrfs_sinfo_dynamic_reclaim_show(struct kobject *kobj,</div><div class='add'>+						struct kobj_attribute *a,</div><div class='add'>+						char *buf)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_space_info *space_info = to_space_info(kobj);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%d\n", READ_ONCE(space_info-&gt;dynamic_reclaim));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t btrfs_sinfo_dynamic_reclaim_store(struct kobject *kobj,</div><div class='add'>+						 struct kobj_attribute *a,</div><div class='add'>+						 const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_space_info *space_info = to_space_info(kobj);</div><div class='add'>+	int dynamic_reclaim;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoint(buf, 10, &amp;dynamic_reclaim);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (dynamic_reclaim &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(space_info-&gt;dynamic_reclaim, dynamic_reclaim != 0);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BTRFS_ATTR_RW(space_info, dynamic_reclaim,</div><div class='add'>+	      btrfs_sinfo_dynamic_reclaim_show,</div><div class='add'>+	      btrfs_sinfo_dynamic_reclaim_store);</div><div class='add'>+</div><div class='add'>+static ssize_t btrfs_sinfo_periodic_reclaim_show(struct kobject *kobj,</div><div class='add'>+						struct kobj_attribute *a,</div><div class='add'>+						char *buf)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_space_info *space_info = to_space_info(kobj);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%d\n", READ_ONCE(space_info-&gt;periodic_reclaim));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t btrfs_sinfo_periodic_reclaim_store(struct kobject *kobj,</div><div class='add'>+						 struct kobj_attribute *a,</div><div class='add'>+						 const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_space_info *space_info = to_space_info(kobj);</div><div class='add'>+	int periodic_reclaim;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoint(buf, 10, &amp;periodic_reclaim);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (periodic_reclaim &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(space_info-&gt;periodic_reclaim, periodic_reclaim != 0);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BTRFS_ATTR_RW(space_info, periodic_reclaim,</div><div class='add'>+	      btrfs_sinfo_periodic_reclaim_show,</div><div class='add'>+	      btrfs_sinfo_periodic_reclaim_store);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocation information about block group types.</div><div class='ctx'>  *</div><div class='hunk'>@@ -947,8 +1031,13 @@ static struct attribute *space_info_attrs[] = {</div><div class='ctx'> 	BTRFS_ATTR_PTR(space_info, disk_used),</div><div class='ctx'> 	BTRFS_ATTR_PTR(space_info, disk_total),</div><div class='ctx'> 	BTRFS_ATTR_PTR(space_info, bg_reclaim_threshold),</div><div class='add'>+	BTRFS_ATTR_PTR(space_info, dynamic_reclaim),</div><div class='ctx'> 	BTRFS_ATTR_PTR(space_info, chunk_size),</div><div class='ctx'> 	BTRFS_ATTR_PTR(space_info, size_classes),</div><div class='add'>+	BTRFS_ATTR_PTR(space_info, reclaim_count),</div><div class='add'>+	BTRFS_ATTR_PTR(space_info, reclaim_bytes),</div><div class='add'>+	BTRFS_ATTR_PTR(space_info, reclaim_errors),</div><div class='add'>+	BTRFS_ATTR_PTR(space_info, periodic_reclaim),</div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	BTRFS_ATTR_PTR(space_info, force_chunk_alloc),</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1035,7 +1124,7 @@ static ssize_t btrfs_nodesize_show(struct kobject *kobj,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);</div><div class='ctx'> </div><div class='del'>-	return sysfs_emit(buf, "%u\n", fs_info-&gt;super_copy-&gt;nodesize);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", fs_info-&gt;nodesize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BTRFS_ATTR(, nodesize, btrfs_nodesize_show);</div><div class='hunk'>@@ -1045,7 +1134,7 @@ static ssize_t btrfs_sectorsize_show(struct kobject *kobj,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);</div><div class='ctx'> </div><div class='del'>-	return sysfs_emit(buf, "%u\n", fs_info-&gt;super_copy-&gt;sectorsize);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", fs_info-&gt;sectorsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BTRFS_ATTR(, sectorsize, btrfs_sectorsize_show);</div><div class='hunk'>@@ -1054,13 +1143,21 @@ static ssize_t btrfs_commit_stats_show(struct kobject *kobj,</div><div class='ctx'> 				       struct kobj_attribute *a, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);</div><div class='add'>+	u64 now = ktime_get_ns();</div><div class='add'>+	u64 start_time = fs_info-&gt;commit_stats.critical_section_start_time;</div><div class='add'>+	u64 pending = 0;</div><div class='add'>+</div><div class='add'>+	if (start_time)</div><div class='add'>+		pending = now - start_time;</div><div class='ctx'> </div><div class='ctx'> 	return sysfs_emit(buf,</div><div class='ctx'> 		"commits %llu\n"</div><div class='add'>+		"cur_commit_ms %llu\n"</div><div class='ctx'> 		"last_commit_ms %llu\n"</div><div class='ctx'> 		"max_commit_ms %llu\n"</div><div class='ctx'> 		"total_commit_ms %llu\n",</div><div class='ctx'> 		fs_info-&gt;commit_stats.commit_count,</div><div class='add'>+		div_u64(pending, NSEC_PER_MSEC),</div><div class='ctx'> 		div_u64(fs_info-&gt;commit_stats.last_commit_dur, NSEC_PER_MSEC),</div><div class='ctx'> 		div_u64(fs_info-&gt;commit_stats.max_commit_dur, NSEC_PER_MSEC),</div><div class='ctx'> 		div_u64(fs_info-&gt;commit_stats.total_commit_dur, NSEC_PER_MSEC));</div><div class='hunk'>@@ -1092,12 +1189,62 @@ static ssize_t btrfs_commit_stats_store(struct kobject *kobj,</div><div class='ctx'> }</div><div class='ctx'> BTRFS_ATTR_RW(, commit_stats, btrfs_commit_stats_show, btrfs_commit_stats_store);</div><div class='ctx'> </div><div class='add'>+static ssize_t btrfs_zoned_stats_show(struct kobject *kobj,</div><div class='add'>+				      struct kobj_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = to_fs_info(kobj);</div><div class='add'>+	struct btrfs_block_group *bg;</div><div class='add'>+	size_t ret = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_zoned(fs_info))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "active block-groups: %zu\n",</div><div class='add'>+			     list_count_nodes(&amp;fs_info-&gt;zone_active_bgs));</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "\treclaimable: %zu\n",</div><div class='add'>+			     list_count_nodes(&amp;fs_info-&gt;reclaim_bgs));</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "\tunused: %zu\n",</div><div class='add'>+			     list_count_nodes(&amp;fs_info-&gt;unused_bgs));</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+	mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='add'>+</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "\tneed reclaim: %s\n",</div><div class='add'>+			     str_true_false(btrfs_zoned_should_reclaim(fs_info)));</div><div class='add'>+</div><div class='add'>+	if (fs_info-&gt;data_reloc_bg)</div><div class='add'>+		ret += sysfs_emit_at(buf, ret,</div><div class='add'>+				     "data relocation block-group: %llu\n",</div><div class='add'>+				     fs_info-&gt;data_reloc_bg);</div><div class='add'>+	if (fs_info-&gt;treelog_bg)</div><div class='add'>+		ret += sysfs_emit_at(buf, ret,</div><div class='add'>+				     "tree-log block-group: %llu\n",</div><div class='add'>+				     fs_info-&gt;treelog_bg);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "active zones:\n");</div><div class='add'>+	list_for_each_entry(bg, &amp;fs_info-&gt;zone_active_bgs, active_bg_list) {</div><div class='add'>+		ret += sysfs_emit_at(buf, ret,</div><div class='add'>+				     "\tstart: %llu, wp: %llu used: %llu, reserved: %llu, unusable: %llu\n",</div><div class='add'>+				     bg-&gt;start, bg-&gt;alloc_offset, bg-&gt;used,</div><div class='add'>+				     bg-&gt;reserved, bg-&gt;zone_unusable);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+BTRFS_ATTR(, zoned_stats, btrfs_zoned_stats_show);</div><div class='add'>+</div><div class='ctx'> static ssize_t btrfs_clone_alignment_show(struct kobject *kobj,</div><div class='ctx'> 				struct kobj_attribute *a, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);</div><div class='ctx'> </div><div class='del'>-	return sysfs_emit(buf, "%u\n", fs_info-&gt;super_copy-&gt;sectorsize);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", fs_info-&gt;sectorsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> BTRFS_ATTR(, clone_alignment, btrfs_clone_alignment_show);</div><div class='hunk'>@@ -1118,7 +1265,7 @@ static ssize_t quota_override_store(struct kobject *kobj,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);</div><div class='ctx'> 	unsigned long knob;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!fs_info)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -1126,9 +1273,9 @@ static ssize_t quota_override_store(struct kobject *kobj,</div><div class='ctx'> 	if (!capable(CAP_SYS_RESOURCE))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	err = kstrtoul(buf, 10, &amp;knob);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	ret = kstrtoul(buf, 10, &amp;knob);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (knob &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1222,24 +1369,103 @@ static ssize_t btrfs_temp_fsid_show(struct kobject *kobj,</div><div class='ctx'> }</div><div class='ctx'> BTRFS_ATTR(, temp_fsid, btrfs_temp_fsid_show);</div><div class='ctx'> </div><div class='del'>-static const char * const btrfs_read_policy_name[] = { "pid" };</div><div class='add'>+static const char *btrfs_read_policy_name[] = {</div><div class='add'>+	"pid",</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	"round-robin",</div><div class='add'>+	"devid",</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+</div><div class='add'>+/* Global module configuration parameters. */</div><div class='add'>+static char *read_policy;</div><div class='add'>+char *btrfs_get_mod_read_policy(void)</div><div class='add'>+{</div><div class='add'>+	return read_policy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set perms to 0, disable /sys/module/btrfs/parameter/read_policy interface. */</div><div class='add'>+module_param(read_policy, charp, 0);</div><div class='add'>+MODULE_PARM_DESC(read_policy,</div><div class='add'>+"Global read policy: pid (default), round-robin[:&lt;min_contig_read&gt;], devid[:&lt;devid&gt;]");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int btrfs_read_policy_to_enum(const char *str, s64 *value_ret)</div><div class='add'>+{</div><div class='add'>+	char param[32];</div><div class='add'>+	char __maybe_unused *value_str;</div><div class='add'>+</div><div class='add'>+	if (!str || strlen(str) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	strscpy(param, str);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	/* Separate value from input in policy:value format. */</div><div class='add'>+	value_str = strchr(param, ':');</div><div class='add'>+	if (value_str) {</div><div class='add'>+		char *retptr;</div><div class='add'>+</div><div class='add'>+		*value_str = 0;</div><div class='add'>+		value_str++;</div><div class='add'>+		if (!value_ret)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		*value_ret = memparse(value_str, &amp;retptr);</div><div class='add'>+		/* There could be any trailing typos after the value. */</div><div class='add'>+		retptr = skip_spaces(retptr);</div><div class='add'>+		if (*retptr != 0 || *value_ret &lt;= 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return sysfs_match_string(btrfs_read_policy_name, param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+int __init btrfs_read_policy_init(void)</div><div class='add'>+{</div><div class='add'>+	s64 value;</div><div class='add'>+</div><div class='add'>+	if (btrfs_read_policy_to_enum(read_policy, &amp;value) == -EINVAL) {</div><div class='add'>+		btrfs_err(NULL, "invalid read policy or value %s", read_policy);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static ssize_t btrfs_read_policy_show(struct kobject *kobj,</div><div class='ctx'> 				      struct kobj_attribute *a, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = to_fs_devs(kobj);</div><div class='add'>+	const enum btrfs_read_policy policy = READ_ONCE(fs_devices-&gt;read_policy);</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BTRFS_NR_READ_POLICY; i++) {</div><div class='del'>-		if (fs_devices-&gt;read_policy == i)</div><div class='del'>-			ret += sysfs_emit_at(buf, ret, "%s[%s]",</div><div class='del'>-					 (ret == 0 ? "" : " "),</div><div class='del'>-					 btrfs_read_policy_name[i]);</div><div class='del'>-		else</div><div class='del'>-			ret += sysfs_emit_at(buf, ret, "%s%s",</div><div class='del'>-					 (ret == 0 ? "" : " "),</div><div class='del'>-					 btrfs_read_policy_name[i]);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			ret += sysfs_emit_at(buf, ret, " ");</div><div class='add'>+</div><div class='add'>+		if (i == policy)</div><div class='add'>+			ret += sysfs_emit_at(buf, ret, "[");</div><div class='add'>+</div><div class='add'>+		ret += sysfs_emit_at(buf, ret, "%s", btrfs_read_policy_name[i]);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+		if (i == BTRFS_READ_POLICY_RR)</div><div class='add'>+			ret += sysfs_emit_at(buf, ret, ":%u",</div><div class='add'>+					     READ_ONCE(fs_devices-&gt;rr_min_contig_read));</div><div class='add'>+</div><div class='add'>+		if (i == BTRFS_READ_POLICY_DEVID)</div><div class='add'>+			ret += sysfs_emit_at(buf, ret, ":%llu",</div><div class='add'>+					     READ_ONCE(fs_devices-&gt;read_devid));</div><div class='add'>+#endif</div><div class='add'>+		if (i == policy)</div><div class='add'>+			ret += sysfs_emit_at(buf, ret, "]");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret += sysfs_emit_at(buf, ret, "\n");</div><div class='hunk'>@@ -1252,21 +1478,80 @@ static ssize_t btrfs_read_policy_store(struct kobject *kobj,</div><div class='ctx'> 				       const char *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = to_fs_devs(kobj);</div><div class='del'>-	int i;</div><div class='add'>+	int index;</div><div class='add'>+	s64 value = -1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BTRFS_NR_READ_POLICY; i++) {</div><div class='del'>-		if (sysfs_streq(buf, btrfs_read_policy_name[i])) {</div><div class='del'>-			if (i != fs_devices-&gt;read_policy) {</div><div class='del'>-				fs_devices-&gt;read_policy = i;</div><div class='del'>-				btrfs_info(fs_devices-&gt;fs_info,</div><div class='del'>-					   "read policy set to '%s'",</div><div class='del'>-					   btrfs_read_policy_name[i]);</div><div class='add'>+	index = btrfs_read_policy_to_enum(buf, &amp;value);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	/* If moving from RR then disable collecting fs stats. */</div><div class='add'>+	if (fs_devices-&gt;read_policy == BTRFS_READ_POLICY_RR &amp;&amp; index != BTRFS_READ_POLICY_RR)</div><div class='add'>+		fs_devices-&gt;collect_fs_stats = false;</div><div class='add'>+</div><div class='add'>+	if (index == BTRFS_READ_POLICY_RR) {</div><div class='add'>+		if (value != -1) {</div><div class='add'>+			const u32 sectorsize = fs_devices-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+</div><div class='add'>+			if (!IS_ALIGNED(value, sectorsize)) {</div><div class='add'>+				u64 temp_value = round_up(value, sectorsize);</div><div class='add'>+</div><div class='add'>+				btrfs_debug(fs_devices-&gt;fs_info,</div><div class='add'>+"read_policy: min contig read %lld should be multiple of sectorsize %u, rounded to %llu",</div><div class='add'>+					  value, sectorsize, temp_value);</div><div class='add'>+				value = temp_value;</div><div class='ctx'> 			}</div><div class='del'>-			return len;</div><div class='add'>+		} else {</div><div class='add'>+			value = BTRFS_DEFAULT_RR_MIN_CONTIG_READ;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (index != READ_ONCE(fs_devices-&gt;read_policy) ||</div><div class='add'>+		    value != READ_ONCE(fs_devices-&gt;rr_min_contig_read)) {</div><div class='add'>+			WRITE_ONCE(fs_devices-&gt;read_policy, index);</div><div class='add'>+			WRITE_ONCE(fs_devices-&gt;rr_min_contig_read, value);</div><div class='add'>+</div><div class='add'>+			btrfs_info(fs_devices-&gt;fs_info, "read policy set to '%s:%lld'",</div><div class='add'>+				   btrfs_read_policy_name[index], value);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		fs_devices-&gt;collect_fs_stats = true;</div><div class='add'>+</div><div class='add'>+		return len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	if (index == BTRFS_READ_POLICY_DEVID) {</div><div class='add'>+		if (value != -1) {</div><div class='add'>+			BTRFS_DEV_LOOKUP_ARGS(args);</div><div class='add'>+</div><div class='add'>+			/* Validate input devid. */</div><div class='add'>+			args.devid = value;</div><div class='add'>+			if (btrfs_find_device(fs_devices, &amp;args) == NULL)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			/* Set default devid to the devid of the latest device. */</div><div class='add'>+			value = fs_devices-&gt;latest_dev-&gt;devid;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (index != READ_ONCE(fs_devices-&gt;read_policy) ||</div><div class='add'>+		    value != READ_ONCE(fs_devices-&gt;read_devid)) {</div><div class='add'>+			WRITE_ONCE(fs_devices-&gt;read_policy, index);</div><div class='add'>+			WRITE_ONCE(fs_devices-&gt;read_devid, value);</div><div class='add'>+</div><div class='add'>+			btrfs_info(fs_devices-&gt;fs_info, "read policy set to '%s:%llu'",</div><div class='add'>+				   btrfs_read_policy_name[index], value);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return len;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (index != READ_ONCE(fs_devices-&gt;read_policy)) {</div><div class='add'>+		WRITE_ONCE(fs_devices-&gt;read_policy, index);</div><div class='add'>+		btrfs_info(fs_devices-&gt;fs_info, "read policy set to '%s'",</div><div class='add'>+			   btrfs_read_policy_name[index]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> BTRFS_ATTR_RW(, read_policy, btrfs_read_policy_show, btrfs_read_policy_store);</div><div class='ctx'> </div><div class='hunk'>@@ -1306,6 +1591,47 @@ static ssize_t btrfs_bg_reclaim_threshold_store(struct kobject *kobj,</div><div class='ctx'> BTRFS_ATTR_RW(, bg_reclaim_threshold, btrfs_bg_reclaim_threshold_show,</div><div class='ctx'> 	      btrfs_bg_reclaim_threshold_store);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+static ssize_t btrfs_offload_csum_show(struct kobject *kobj,</div><div class='add'>+				       struct kobj_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_devices *fs_devices = to_fs_devs(kobj);</div><div class='add'>+</div><div class='add'>+	switch (READ_ONCE(fs_devices-&gt;offload_csum_mode)) {</div><div class='add'>+	case BTRFS_OFFLOAD_CSUM_AUTO:</div><div class='add'>+		return sysfs_emit(buf, "auto\n");</div><div class='add'>+	case BTRFS_OFFLOAD_CSUM_FORCE_ON:</div><div class='add'>+		return sysfs_emit(buf, "1\n");</div><div class='add'>+	case BTRFS_OFFLOAD_CSUM_FORCE_OFF:</div><div class='add'>+		return sysfs_emit(buf, "0\n");</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t btrfs_offload_csum_store(struct kobject *kobj,</div><div class='add'>+					struct kobj_attribute *a, const char *buf,</div><div class='add'>+					size_t len)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_devices *fs_devices = to_fs_devs(kobj);</div><div class='add'>+	int ret;</div><div class='add'>+	bool val;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;val);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		WRITE_ONCE(fs_devices-&gt;offload_csum_mode,</div><div class='add'>+			   val ? BTRFS_OFFLOAD_CSUM_FORCE_ON : BTRFS_OFFLOAD_CSUM_FORCE_OFF);</div><div class='add'>+	else if (ret == -EINVAL &amp;&amp; sysfs_streq(buf, "auto"))</div><div class='add'>+		WRITE_ONCE(fs_devices-&gt;offload_csum_mode, BTRFS_OFFLOAD_CSUM_AUTO);</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+BTRFS_ATTR_RW(, offload_csum, btrfs_offload_csum_show, btrfs_offload_csum_store);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Per-filesystem information and stats.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1325,6 +1651,10 @@ static const struct attribute *btrfs_attrs[] = {</div><div class='ctx'> 	BTRFS_ATTR_PTR(, bg_reclaim_threshold),</div><div class='ctx'> 	BTRFS_ATTR_PTR(, commit_stats),</div><div class='ctx'> 	BTRFS_ATTR_PTR(, temp_fsid),</div><div class='add'>+	BTRFS_ATTR_PTR(, zoned_stats),</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	BTRFS_ATTR_PTR(, offload_csum),</div><div class='add'>+#endif</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1664,16 +1994,35 @@ void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info)</div><div class='ctx'> 	kobject_put(&amp;space_info-&gt;kobj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *alloc_name(u64 flags)</div><div class='add'>+static const char *alloc_name(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='add'>+	u64 flags = space_info-&gt;flags;</div><div class='add'>+</div><div class='ctx'> 	switch (flags) {</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA:</div><div class='ctx'> 		return "mixed";</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_METADATA:</div><div class='del'>-		return "metadata";</div><div class='add'>+		switch (space_info-&gt;subgroup_id) {</div><div class='add'>+		case BTRFS_SUB_GROUP_PRIMARY:</div><div class='add'>+			return "metadata";</div><div class='add'>+		case BTRFS_SUB_GROUP_TREELOG:</div><div class='add'>+			return "metadata-treelog";</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			return "metadata (unknown sub-group)";</div><div class='add'>+		}</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_DATA:</div><div class='del'>-		return "data";</div><div class='add'>+		switch (space_info-&gt;subgroup_id) {</div><div class='add'>+		case BTRFS_SUB_GROUP_PRIMARY:</div><div class='add'>+			return "data";</div><div class='add'>+		case BTRFS_SUB_GROUP_DATA_RELOC:</div><div class='add'>+			return "data-reloc";</div><div class='add'>+		default:</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			return "data (unknown sub-group)";</div><div class='add'>+		}</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_SYSTEM:</div><div class='add'>+		ASSERT(space_info-&gt;subgroup_id == BTRFS_SUB_GROUP_PRIMARY);</div><div class='ctx'> 		return "system";</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='hunk'>@@ -1685,14 +2034,13 @@ static const char *alloc_name(u64 flags)</div><div class='ctx'>  * Create a sysfs entry for a space info type at path</div><div class='ctx'>  * /sys/fs/btrfs/UUID/allocation/TYPE</div><div class='ctx'>  */</div><div class='del'>-int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct btrfs_space_info *space_info)</div><div class='add'>+int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = kobject_init_and_add(&amp;space_info-&gt;kobj, &amp;space_info_ktype,</div><div class='del'>-				   fs_info-&gt;space_info_kobj, "%s",</div><div class='del'>-				   alloc_name(space_info-&gt;flags));</div><div class='add'>+				   space_info-&gt;fs_info-&gt;space_info_kobj, "%s",</div><div class='add'>+				   alloc_name(space_info));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kobject_put(&amp;space_info-&gt;kobj);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1954,7 +2302,7 @@ void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action)</div><div class='ctx'> </div><div class='ctx'> 	ret = kobject_uevent(&amp;disk_to_dev(bdev-&gt;bd_disk)-&gt;kobj, action);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		pr_warn("BTRFS: Sending event '%d' to kobject: '%s' (%p): failed\n",</div><div class='add'>+		btrfs_warn(NULL, "sending event %d to kobject: '%s' (%p): failed",</div><div class='ctx'> 			action, kobject_name(&amp;disk_to_dev(bdev-&gt;bd_disk)-&gt;kobj),</div><div class='ctx'> 			&amp;disk_to_dev(bdev-&gt;bd_disk)-&gt;kobj);</div><div class='ctx'> }</div><div class='hunk'>@@ -1997,15 +2345,15 @@ static struct kset *btrfs_kset;</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;fs_devs-&gt;kobj_unregister);</div><div class='ctx'> 	fs_devs-&gt;fsid_kobj.kset = btrfs_kset;</div><div class='del'>-	error = kobject_init_and_add(&amp;fs_devs-&gt;fsid_kobj, &amp;btrfs_ktype, NULL,</div><div class='del'>-				     "%pU", fs_devs-&gt;fsid);</div><div class='del'>-	if (error) {</div><div class='add'>+	ret = kobject_init_and_add(&amp;fs_devs-&gt;fsid_kobj, &amp;btrfs_ktype, NULL,</div><div class='add'>+				   "%pU", fs_devs-&gt;fsid);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		kobject_put(&amp;fs_devs-&gt;fsid_kobj);</div><div class='del'>-		return error;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fs_devs-&gt;devices_kobj = kobject_create_and_add("devices",</div><div class='hunk'>@@ -2031,71 +2379,70 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs)</div><div class='ctx'> </div><div class='ctx'> int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devs = fs_info-&gt;fs_devices;</div><div class='ctx'> 	struct kobject *fsid_kobj = &amp;fs_devs-&gt;fsid_kobj;</div><div class='ctx'> </div><div class='del'>-	error = btrfs_sysfs_add_fs_devices(fs_devs);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='add'>+	ret = btrfs_sysfs_add_fs_devices(fs_devs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	error = sysfs_create_files(fsid_kobj, btrfs_attrs);</div><div class='del'>-	if (error) {</div><div class='add'>+	ret = sysfs_create_files(fsid_kobj, btrfs_attrs);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		btrfs_sysfs_remove_fs_devices(fs_devs);</div><div class='del'>-		return error;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = sysfs_create_group(fsid_kobj,</div><div class='del'>-				   &amp;btrfs_feature_attr_group);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = sysfs_create_group(fsid_kobj, &amp;btrfs_feature_attr_group);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 	fs_info-&gt;debug_kobj = kobject_create_and_add("debug", fsid_kobj);</div><div class='ctx'> 	if (!fs_info-&gt;debug_kobj) {</div><div class='del'>-		error = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = sysfs_create_files(fs_info-&gt;debug_kobj, btrfs_debug_mount_attrs);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = sysfs_create_files(fs_info-&gt;debug_kobj, btrfs_debug_mount_attrs);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Discard directory */</div><div class='ctx'> 	fs_info-&gt;discard_kobj = kobject_create_and_add("discard", fsid_kobj);</div><div class='ctx'> 	if (!fs_info-&gt;discard_kobj) {</div><div class='del'>-		error = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = sysfs_create_files(fs_info-&gt;discard_kobj, discard_attrs);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = sysfs_create_files(fs_info-&gt;discard_kobj, discard_attrs);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='del'>-	error = addrm_unknown_feature_attrs(fs_info, true);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = addrm_unknown_feature_attrs(fs_info, true);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='del'>-	error = sysfs_create_link(fsid_kobj, &amp;fs_info-&gt;sb-&gt;s_bdi-&gt;dev-&gt;kobj, "bdi");</div><div class='del'>-	if (error)</div><div class='add'>+	ret = sysfs_create_link(fsid_kobj, &amp;fs_info-&gt;sb-&gt;s_bdi-&gt;dev-&gt;kobj, "bdi");</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='ctx'> 	fs_info-&gt;space_info_kobj = kobject_create_and_add("allocation",</div><div class='ctx'> 						  fsid_kobj);</div><div class='ctx'> 	if (!fs_info-&gt;space_info_kobj) {</div><div class='del'>-		error = -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = sysfs_create_files(fs_info-&gt;space_info_kobj, allocation_attrs);</div><div class='del'>-	if (error)</div><div class='add'>+	ret = sysfs_create_files(fs_info-&gt;space_info_kobj, allocation_attrs);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failure:</div><div class='ctx'> 	btrfs_sysfs_remove_mounted(fs_info);</div><div class='del'>-	return error;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t qgroup_enabled_show(struct kobject *qgroups_kobj,</div><div class='hunk'>@@ -2294,7 +2641,7 @@ int btrfs_sysfs_add_one_qgroup(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	struct kobject *qgroups_kobj = fs_info-&gt;qgroups_kobj;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state))</div><div class='add'>+	if (btrfs_is_testing(fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (qgroup-&gt;kobj.state_initialized)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2315,7 +2662,7 @@ void btrfs_sysfs_del_qgroups(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_qgroup *qgroup;</div><div class='ctx'> 	struct btrfs_qgroup *next;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state))</div><div class='add'>+	if (btrfs_is_testing(fs_info))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rbtree_postorder_for_each_entry_safe(qgroup, next,</div><div class='hunk'>@@ -2336,7 +2683,7 @@ int btrfs_sysfs_add_qgroups(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_qgroup *next;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state))</div><div class='add'>+	if (btrfs_is_testing(fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(fsid_kobj);</div><div class='hunk'>@@ -2368,7 +2715,7 @@ out:</div><div class='ctx'> void btrfs_sysfs_del_one_qgroup(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				struct btrfs_qgroup *qgroup)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state))</div><div class='add'>+	if (btrfs_is_testing(fs_info))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (qgroup-&gt;kobj.state_initialized) {</div><div class='head'>diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h<br/>index 86c7eef12873..05498e5346c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/sysfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/sysfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/sysfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/sysfs.h</a></div><div class='hunk'>@@ -3,8 +3,18 @@</div><div class='ctx'> #ifndef BTRFS_SYSFS_H</div><div class='ctx'> #define BTRFS_SYSFS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> </div><div class='add'>+struct block_device;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_device;</div><div class='add'>+struct btrfs_fs_devices;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_space_info;</div><div class='add'>+struct btrfs_qgroup;</div><div class='add'>+</div><div class='ctx'> enum btrfs_feature_set {</div><div class='ctx'> 	FEAT_COMPAT,</div><div class='ctx'> 	FEAT_COMPAT_RO,</div><div class='hunk'>@@ -27,8 +37,7 @@ void __cold btrfs_exit_sysfs(void);</div><div class='ctx'> int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_sysfs_add_block_group_type(struct btrfs_block_group *cache);</div><div class='del'>-int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct btrfs_space_info *space_info);</div><div class='add'>+int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info);</div><div class='ctx'> void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info);</div><div class='ctx'> void btrfs_sysfs_update_devid(struct btrfs_device *device);</div><div class='ctx'> </div><div class='hunk'>@@ -38,5 +47,11 @@ void btrfs_sysfs_del_qgroups(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_sysfs_add_qgroups(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_sysfs_del_one_qgroup(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				struct btrfs_qgroup *qgroup);</div><div class='add'>+int btrfs_read_policy_to_enum(const char *str, s64 *value);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+int __init btrfs_read_policy_init(void);</div><div class='add'>+char *btrfs_get_mod_read_policy(void);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c<br/>index 709c6cc9706a..b576897d71cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/btrfs-tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/btrfs-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/btrfs-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/btrfs-tests.c</a></div><div class='hunk'>@@ -29,6 +29,8 @@ const char *test_error[] = {</div><div class='ctx'> 	[TEST_ALLOC_BLOCK_GROUP]     = "cannot allocate block group",</div><div class='ctx'> 	[TEST_ALLOC_EXTENT_MAP]      = "cannot allocate extent map",</div><div class='ctx'> 	[TEST_ALLOC_CHUNK_MAP]       = "cannot allocate chunk map",</div><div class='add'>+	[TEST_ALLOC_IO_CONTEXT]	     = "cannot allocate io context",</div><div class='add'>+	[TEST_ALLOC_TRANSACTION]     = "cannot allocate transaction",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations btrfs_test_super_ops = {</div><div class='hunk'>@@ -61,10 +63,7 @@ struct inode *btrfs_new_test_inode(void)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = S_IFREG;</div><div class='del'>-	inode-&gt;i_ino = BTRFS_FIRST_FREE_OBJECTID;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.type = BTRFS_INODE_ITEM_KEY;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.objectid = BTRFS_FIRST_FREE_OBJECTID;</div><div class='del'>-	BTRFS_I(inode)-&gt;location.offset = 0;</div><div class='add'>+	btrfs_set_inode_number(BTRFS_I(inode), BTRFS_FIRST_FREE_OBJECTID);</div><div class='ctx'> 	inode_init_owner(&amp;nop_mnt_idmap, inode, NULL, S_IFREG);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -103,7 +102,7 @@ struct btrfs_device *btrfs_alloc_dummy_device(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	extent_io_tree_init(fs_info, &amp;dev-&gt;alloc_state, 0);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;dev-&gt;alloc_state, 0);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;dev_list);</div><div class='ctx'> 	list_add(&amp;dev-&gt;dev_list, &amp;fs_info-&gt;fs_devices-&gt;devices);</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +111,7 @@ struct btrfs_device *btrfs_alloc_dummy_device(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> static void btrfs_free_dummy_device(struct btrfs_device *dev)</div><div class='ctx'> {</div><div class='del'>-	extent_io_tree_release(&amp;dev-&gt;alloc_state);</div><div class='add'>+	btrfs_extent_io_tree_release(&amp;dev-&gt;alloc_state);</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -144,6 +143,11 @@ struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(u32 nodesize, u32 sectorsize)</div><div class='ctx'> 	fs_info-&gt;nodesize = nodesize;</div><div class='ctx'> 	fs_info-&gt;sectorsize = sectorsize;</div><div class='ctx'> 	fs_info-&gt;sectorsize_bits = ilog2(sectorsize);</div><div class='add'>+</div><div class='add'>+	/* CRC32C csum size. */</div><div class='add'>+	fs_info-&gt;csum_size = 4;</div><div class='add'>+	fs_info-&gt;csums_per_leaf = BTRFS_MAX_ITEM_SIZE(fs_info) /</div><div class='add'>+		fs_info-&gt;csum_size;</div><div class='ctx'> 	set_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;fs_info-&gt;fs_state);</div><div class='ctx'> </div><div class='ctx'> 	test_mnt-&gt;mnt_sb-&gt;s_fs_info = fs_info;</div><div class='hunk'>@@ -153,38 +157,25 @@ struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(u32 nodesize, u32 sectorsize)</div><div class='ctx'> </div><div class='ctx'> void btrfs_free_dummy_fs_info(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct radix_tree_iter iter;</div><div class='del'>-	void **slot;</div><div class='ctx'> 	struct btrfs_device *dev, *tmp;</div><div class='add'>+	struct extent_buffer *eb;</div><div class='add'>+	unsigned long index;</div><div class='ctx'> </div><div class='ctx'> 	if (!fs_info)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO,</div><div class='del'>-			      &amp;fs_info-&gt;fs_state)))</div><div class='add'>+	if (WARN_ON(!btrfs_is_testing(fs_info)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	test_mnt-&gt;mnt_sb-&gt;s_fs_info = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-	radix_tree_for_each_slot(slot, &amp;fs_info-&gt;buffer_radix, &amp;iter, 0) {</div><div class='del'>-		struct extent_buffer *eb;</div><div class='del'>-</div><div class='del'>-		eb = radix_tree_deref_slot_protected(slot, &amp;fs_info-&gt;buffer_lock);</div><div class='del'>-		if (!eb)</div><div class='del'>-			continue;</div><div class='del'>-		/* Shouldn't happen but that kind of thinking creates CVE's */</div><div class='del'>-		if (radix_tree_exception(eb)) {</div><div class='del'>-			if (radix_tree_deref_retry(eb))</div><div class='del'>-				slot = radix_tree_iter_retry(&amp;iter);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		slot = radix_tree_iter_resume(slot, &amp;iter);</div><div class='del'>-		spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='del'>-		free_extent_buffer_stale(eb);</div><div class='del'>-		spin_lock(&amp;fs_info-&gt;buffer_lock);</div><div class='add'>+	xa_lock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+	xa_for_each(&amp;fs_info-&gt;buffer_tree, index, eb) {</div><div class='add'>+		xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='add'>+		free_extent_buffer(eb);</div><div class='add'>+		xa_lock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;buffer_lock);</div><div class='add'>+	xa_unlock_irq(&amp;fs_info-&gt;buffer_tree);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_mapping_tree_free(fs_info);</div><div class='ctx'> 	list_for_each_entry_safe(dev, tmp, &amp;fs_info-&gt;fs_devices-&gt;devices,</div><div class='hunk'>@@ -250,6 +241,15 @@ void btrfs_free_dummy_block_group(struct btrfs_block_group *cache)</div><div class='ctx'> 	kfree(cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_init_dummy_transaction(struct btrfs_transaction *trans, struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	memset(trans, 0, sizeof(*trans));</div><div class='add'>+	trans-&gt;fs_info = fs_info;</div><div class='add'>+	xa_init(&amp;trans-&gt;delayed_refs.head_refs);</div><div class='add'>+	xa_init(&amp;trans-&gt;delayed_refs.dirty_extents);</div><div class='add'>+	spin_lock_init(&amp;trans-&gt;delayed_refs.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='hunk'>@@ -295,6 +295,12 @@ int btrfs_run_sanity_tests(void)</div><div class='ctx'> 			ret = btrfs_test_free_space_tree(sectorsize, nodesize);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='add'>+			ret = btrfs_test_raid_stripe_tree(sectorsize, nodesize);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+			ret = btrfs_test_delayed_refs(sectorsize, nodesize);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = btrfs_test_extent_map();</div><div class='head'>diff --git a/fs/btrfs/tests/btrfs-tests.h b/fs/btrfs/tests/btrfs-tests.h<br/>index dc2f2ab15fa5..4307bdaa6749 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/btrfs-tests.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/btrfs-tests.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/btrfs-tests.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/btrfs-tests.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #ifndef BTRFS_TESTS_H</div><div class='ctx'> #define BTRFS_TESTS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='ctx'> int btrfs_run_sanity_tests(void);</div><div class='ctx'> </div><div class='hunk'>@@ -24,12 +26,15 @@ enum {</div><div class='ctx'> 	TEST_ALLOC_BLOCK_GROUP,</div><div class='ctx'> 	TEST_ALLOC_EXTENT_MAP,</div><div class='ctx'> 	TEST_ALLOC_CHUNK_MAP,</div><div class='add'>+	TEST_ALLOC_IO_CONTEXT,</div><div class='add'>+	TEST_ALLOC_TRANSACTION,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const char *test_error[];</div><div class='ctx'> </div><div class='ctx'> struct btrfs_root;</div><div class='ctx'> struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_transaction;</div><div class='ctx'> </div><div class='ctx'> int btrfs_test_extent_buffer_operations(u32 sectorsize, u32 nodesize);</div><div class='ctx'> int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize);</div><div class='hunk'>@@ -37,7 +42,9 @@ int btrfs_test_extent_io(u32 sectorsize, u32 nodesize);</div><div class='ctx'> int btrfs_test_inodes(u32 sectorsize, u32 nodesize);</div><div class='ctx'> int btrfs_test_qgroups(u32 sectorsize, u32 nodesize);</div><div class='ctx'> int btrfs_test_free_space_tree(u32 sectorsize, u32 nodesize);</div><div class='add'>+int btrfs_test_raid_stripe_tree(u32 sectorsize, u32 nodesize);</div><div class='ctx'> int btrfs_test_extent_map(void);</div><div class='add'>+int btrfs_test_delayed_refs(u32 sectorsize, u32 nodesize);</div><div class='ctx'> struct inode *btrfs_new_test_inode(void);</div><div class='ctx'> struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(u32 nodesize, u32 sectorsize);</div><div class='ctx'> void btrfs_free_dummy_fs_info(struct btrfs_fs_info *fs_info);</div><div class='hunk'>@@ -47,6 +54,7 @@ btrfs_alloc_dummy_block_group(struct btrfs_fs_info *fs_info, unsigned long lengt</div><div class='ctx'> void btrfs_free_dummy_block_group(struct btrfs_block_group *cache);</div><div class='ctx'> void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_fs_info *fs_info);</div><div class='add'>+void btrfs_init_dummy_transaction(struct btrfs_transaction *trans, struct btrfs_fs_info *fs_info);</div><div class='ctx'> struct btrfs_device *btrfs_alloc_dummy_device(struct btrfs_fs_info *fs_info);</div><div class='ctx'> #else</div><div class='ctx'> static inline int btrfs_run_sanity_tests(void)</div><div class='head'>diff --git a/fs/btrfs/tests/delayed-refs-tests.c b/fs/btrfs/tests/delayed-refs-tests.c<br/>new file mode 100644<br/>index 000000000000..e2248acb906b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/delayed-refs-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/delayed-refs-tests.c</a></div><div class='hunk'>@@ -0,0 +1,1016 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include "btrfs-tests.h"</div><div class='add'>+#include "../transaction.h"</div><div class='add'>+#include "../delayed-ref.h"</div><div class='add'>+#include "../extent-tree.h"</div><div class='add'>+</div><div class='add'>+#define FAKE_ROOT_OBJECTID 256</div><div class='add'>+#define FAKE_BYTENR 0</div><div class='add'>+#define FAKE_LEVEL 1</div><div class='add'>+#define FAKE_INO 256</div><div class='add'>+#define FAKE_FILE_OFFSET 0</div><div class='add'>+#define FAKE_PARENT SZ_1M</div><div class='add'>+</div><div class='add'>+struct ref_head_check {</div><div class='add'>+	u64 bytenr;</div><div class='add'>+	u64 num_bytes;</div><div class='add'>+	int ref_mod;</div><div class='add'>+	int total_ref_mod;</div><div class='add'>+	int must_insert;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ref_node_check {</div><div class='add'>+	u64 bytenr;</div><div class='add'>+	u64 num_bytes;</div><div class='add'>+	int ref_mod;</div><div class='add'>+	enum btrfs_delayed_ref_action action;</div><div class='add'>+	u8 type;</div><div class='add'>+	u64 parent;</div><div class='add'>+	u64 root;</div><div class='add'>+	u64 owner;</div><div class='add'>+	u64 offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum btrfs_ref_type ref_type_from_disk_ref_type(u8 type)</div><div class='add'>+{</div><div class='add'>+	if ((type == BTRFS_TREE_BLOCK_REF_KEY) ||</div><div class='add'>+	    (type == BTRFS_SHARED_BLOCK_REF_KEY))</div><div class='add'>+		return BTRFS_REF_METADATA;</div><div class='add'>+	return BTRFS_REF_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_delayed_ref_head(struct btrfs_trans_handle *trans,</div><div class='add'>+				    struct btrfs_delayed_ref_head *head)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_delayed_ref_root *delayed_refs =</div><div class='add'>+		&amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	btrfs_delete_ref_head(fs_info, delayed_refs, head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;delayed_refs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	btrfs_delayed_ref_unlock(head);</div><div class='add'>+	btrfs_put_delayed_ref_head(head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_delayed_ref_node(struct btrfs_delayed_ref_head *head,</div><div class='add'>+				    struct btrfs_delayed_ref_node *node)</div><div class='add'>+{</div><div class='add'>+	rb_erase_cached(&amp;node-&gt;ref_node, &amp;head-&gt;ref_tree);</div><div class='add'>+	RB_CLEAR_NODE(&amp;node-&gt;ref_node);</div><div class='add'>+	if (!list_empty(&amp;node-&gt;add_list))</div><div class='add'>+		list_del_init(&amp;node-&gt;add_list);</div><div class='add'>+	btrfs_put_delayed_ref(node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_ref_head(struct btrfs_delayed_ref_head *head,</div><div class='add'>+			     struct ref_head_check *check)</div><div class='add'>+{</div><div class='add'>+	if (head-&gt;bytenr != check-&gt;bytenr) {</div><div class='add'>+		test_err("invalid bytenr have: %llu want: %llu", head-&gt;bytenr,</div><div class='add'>+			 check-&gt;bytenr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (head-&gt;num_bytes != check-&gt;num_bytes) {</div><div class='add'>+		test_err("invalid num_bytes have: %llu want: %llu",</div><div class='add'>+			 head-&gt;num_bytes, check-&gt;num_bytes);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (head-&gt;ref_mod != check-&gt;ref_mod) {</div><div class='add'>+		test_err("invalid ref_mod have: %d want: %d", head-&gt;ref_mod,</div><div class='add'>+			 check-&gt;ref_mod);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (head-&gt;total_ref_mod != check-&gt;total_ref_mod) {</div><div class='add'>+		test_err("invalid total_ref_mod have: %d want: %d",</div><div class='add'>+			 head-&gt;total_ref_mod, check-&gt;total_ref_mod);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (head-&gt;must_insert_reserved != check-&gt;must_insert) {</div><div class='add'>+		test_err("invalid must_insert have: %d want: %d",</div><div class='add'>+			 head-&gt;must_insert_reserved, check-&gt;must_insert);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_ref_node(struct btrfs_delayed_ref_node *node,</div><div class='add'>+			     struct ref_node_check *check)</div><div class='add'>+{</div><div class='add'>+	if (node-&gt;bytenr != check-&gt;bytenr) {</div><div class='add'>+		test_err("invalid bytenr have: %llu want: %llu", node-&gt;bytenr,</div><div class='add'>+			 check-&gt;bytenr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;num_bytes != check-&gt;num_bytes) {</div><div class='add'>+		test_err("invalid num_bytes have: %llu want: %llu",</div><div class='add'>+			 node-&gt;num_bytes, check-&gt;num_bytes);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;ref_mod != check-&gt;ref_mod) {</div><div class='add'>+		test_err("invalid ref_mod have: %d want: %d", node-&gt;ref_mod,</div><div class='add'>+			 check-&gt;ref_mod);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;action != check-&gt;action) {</div><div class='add'>+		test_err("invalid action have: %d want: %d", node-&gt;action,</div><div class='add'>+			 check-&gt;action);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;parent != check-&gt;parent) {</div><div class='add'>+		test_err("invalid parent have: %llu want: %llu", node-&gt;parent,</div><div class='add'>+			 check-&gt;parent);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;ref_root != check-&gt;root) {</div><div class='add'>+		test_err("invalid root have: %llu want: %llu", node-&gt;ref_root,</div><div class='add'>+			 check-&gt;root);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;type != check-&gt;type) {</div><div class='add'>+		test_err("invalid type have: %d want: %d", node-&gt;type,</div><div class='add'>+			 check-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (btrfs_delayed_ref_owner(node) != check-&gt;owner) {</div><div class='add'>+		test_err("invalid owner have: %llu want: %llu",</div><div class='add'>+			 btrfs_delayed_ref_owner(node), check-&gt;owner);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (btrfs_delayed_ref_offset(node) != check-&gt;offset) {</div><div class='add'>+		test_err("invalid offset have: %llu want: %llu",</div><div class='add'>+			 btrfs_delayed_ref_offset(node), check-&gt;offset);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simple_test(struct btrfs_trans_handle *trans,</div><div class='add'>+		       struct ref_head_check *head_check,</div><div class='add'>+		       struct ref_node_check *node_check)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_delayed_ref_root *delayed_refs =</div><div class='add'>+		&amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_delayed_ref_head *head;</div><div class='add'>+	struct btrfs_delayed_ref_node *node;</div><div class='add'>+	struct btrfs_ref ref = {</div><div class='add'>+		.type = ref_type_from_disk_ref_type(node_check-&gt;type),</div><div class='add'>+		.action = node_check-&gt;action,</div><div class='add'>+		.parent = node_check-&gt;parent,</div><div class='add'>+		.ref_root = node_check-&gt;root,</div><div class='add'>+		.bytenr = node_check-&gt;bytenr,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ref.type == BTRFS_REF_METADATA)</div><div class='add'>+		btrfs_init_tree_ref(&amp;ref, node_check-&gt;owner, node_check-&gt;root,</div><div class='add'>+				    false);</div><div class='add'>+	else</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, node_check-&gt;owner, node_check-&gt;offset,</div><div class='add'>+				    node_check-&gt;root, true);</div><div class='add'>+</div><div class='add'>+	if (ref.type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, head_check))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (validate_ref_node(node, node_check))</div><div class='add'>+		goto out;</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	btrfs_unselect_ref_head(delayed_refs, head);</div><div class='add'>+	btrfs_destroy_delayed_refs(trans-&gt;transaction);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are simple tests, make sure that our btrfs_ref's get turned into the</div><div class='add'>+ * appropriate btrfs_delayed_ref_node based on their settings and action.</div><div class='add'>+ */</div><div class='add'>+static int simple_tests(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct ref_head_check head_check = {</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+		.ref_mod = 1,</div><div class='add'>+		.total_ref_mod = 1,</div><div class='add'>+	};</div><div class='add'>+	struct ref_node_check node_check = {</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+		.ref_mod = 1,</div><div class='add'>+		.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+		.type = BTRFS_TREE_BLOCK_REF_KEY,</div><div class='add'>+		.parent = 0,</div><div class='add'>+		.root = FAKE_ROOT_OBJECTID,</div><div class='add'>+		.owner = FAKE_LEVEL,</div><div class='add'>+		.offset = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single add tree block failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.type = BTRFS_EXTENT_DATA_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_INO;</div><div class='add'>+	node_check.offset = FAKE_FILE_OFFSET;</div><div class='add'>+</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single add extent data failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.parent = FAKE_PARENT;</div><div class='add'>+	node_check.type = BTRFS_SHARED_BLOCK_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_LEVEL;</div><div class='add'>+	node_check.offset = 0;</div><div class='add'>+</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single add shared block failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.type = BTRFS_SHARED_DATA_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_INO;</div><div class='add'>+	node_check.offset = FAKE_FILE_OFFSET;</div><div class='add'>+</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single add shared data failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head_check.ref_mod = -1;</div><div class='add'>+	head_check.total_ref_mod = -1;</div><div class='add'>+	node_check.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	node_check.type = BTRFS_TREE_BLOCK_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_LEVEL;</div><div class='add'>+	node_check.offset = 0;</div><div class='add'>+	node_check.parent = 0;</div><div class='add'>+</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single drop tree block failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.type = BTRFS_EXTENT_DATA_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_INO;</div><div class='add'>+	node_check.offset = FAKE_FILE_OFFSET;</div><div class='add'>+</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single drop extent data failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.parent = FAKE_PARENT;</div><div class='add'>+	node_check.type = BTRFS_SHARED_BLOCK_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_LEVEL;</div><div class='add'>+	node_check.offset = 0;</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single drop shared block failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.type = BTRFS_SHARED_DATA_REF_KEY;</div><div class='add'>+	node_check.owner = FAKE_INO;</div><div class='add'>+	node_check.offset = FAKE_FILE_OFFSET;</div><div class='add'>+	if (simple_test(trans, &amp;head_check, &amp;node_check)) {</div><div class='add'>+		test_err("single drop shared data failed");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Merge tests, validate that we do delayed ref merging properly, the ref counts</div><div class='add'>+ * all end up properly, and delayed refs are deleted once they're no longer</div><div class='add'>+ * needed.</div><div class='add'>+ */</div><div class='add'>+static int merge_tests(struct btrfs_trans_handle *trans,</div><div class='add'>+		       enum btrfs_ref_type type)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_delayed_ref_head *head = NULL;</div><div class='add'>+	struct btrfs_delayed_ref_node *node;</div><div class='add'>+	struct btrfs_ref ref = {</div><div class='add'>+		.type = type,</div><div class='add'>+		.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+		.parent = 0,</div><div class='add'>+		.ref_root = FAKE_ROOT_OBJECTID,</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+	};</div><div class='add'>+	struct ref_head_check head_check = {</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+		.ref_mod = 0,</div><div class='add'>+		.total_ref_mod = 0,</div><div class='add'>+	};</div><div class='add'>+	struct ref_node_check node_check = {</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+		.ref_mod = 2,</div><div class='add'>+		.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+		.parent = 0,</div><div class='add'>+		.root = FAKE_ROOT_OBJECTID,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First add a ref and then drop it, make sure we get a head ref with a</div><div class='add'>+	 * 0 total ref mod and no nodes.</div><div class='add'>+	 */</div><div class='add'>+	if (type == BTRFS_REF_METADATA) {</div><div class='add'>+		node_check.type = BTRFS_TREE_BLOCK_REF_KEY;</div><div class='add'>+		node_check.owner = FAKE_LEVEL;</div><div class='add'>+		btrfs_init_tree_ref(&amp;ref, FAKE_LEVEL, FAKE_ROOT_OBJECTID, false);</div><div class='add'>+	} else {</div><div class='add'>+		node_check.type = BTRFS_EXTENT_DATA_REF_KEY;</div><div class='add'>+		node_check.owner = FAKE_INO;</div><div class='add'>+		node_check.offset = FAKE_FILE_OFFSET;</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, FAKE_INO, FAKE_FILE_OFFSET,</div><div class='add'>+				    FAKE_ROOT_OBJECTID, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	if (type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, &amp;trans-&gt;transaction-&gt;delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("single add and drop failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (node) {</div><div class='add'>+		test_err("found node when none should exist");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_delayed_ref_head(trans, head);</div><div class='add'>+	head = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add a ref, then add another ref, make sure we get a head ref with a</div><div class='add'>+	 * 2 total ref mod and 1 node.</div><div class='add'>+	 */</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	if (type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, &amp;trans-&gt;transaction-&gt;delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head_check.ref_mod = 2;</div><div class='add'>+	head_check.total_ref_mod = 2;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("double add failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (node) {</div><div class='add'>+		test_err("found node when none should exist");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_head(trans, head);</div><div class='add'>+	head = NULL;</div><div class='add'>+</div><div class='add'>+	/* Add two drop refs, make sure they are merged properly. */</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	if (type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == BTRFS_REF_METADATA)</div><div class='add'>+		ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	else</div><div class='add'>+		ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, &amp;trans-&gt;transaction-&gt;delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head_check.ref_mod = -2;</div><div class='add'>+	head_check.total_ref_mod = -2;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("double drop failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (node) {</div><div class='add'>+		test_err("found node when none should exist");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_head(trans, head);</div><div class='add'>+	head = NULL;</div><div class='add'>+</div><div class='add'>+	/* Add multiple refs, then drop until we go negative again. */</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	for (int i = 0; i &lt; 10; i++) {</div><div class='add'>+		if (type == BTRFS_REF_METADATA)</div><div class='add'>+			ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+		else</div><div class='add'>+			ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("failed ref action %d", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	for (int i = 0; i &lt; 12; i++) {</div><div class='add'>+		if (type == BTRFS_REF_METADATA)</div><div class='add'>+			ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+		else</div><div class='add'>+			ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("failed ref action %d", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, &amp;trans-&gt;transaction-&gt;delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head_check.ref_mod = -2;</div><div class='add'>+	head_check.total_ref_mod = -2;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("double drop failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (node) {</div><div class='add'>+		test_err("found node when none should exist");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_delayed_ref_head(trans, head);</div><div class='add'>+	head = NULL;</div><div class='add'>+</div><div class='add'>+	/* Drop multiple refs, then add until we go positive again. */</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	for (int i = 0; i &lt; 10; i++) {</div><div class='add'>+		if (type == BTRFS_REF_METADATA)</div><div class='add'>+			ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+		else</div><div class='add'>+			ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("failed ref action %d", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	for (int i = 0; i &lt; 12; i++) {</div><div class='add'>+		if (type == BTRFS_REF_METADATA)</div><div class='add'>+			ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+		else</div><div class='add'>+			ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("failed ref action %d", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, &amp;trans-&gt;transaction-&gt;delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head_check.ref_mod = 2;</div><div class='add'>+	head_check.total_ref_mod = 2;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("add and drop to positive failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (node) {</div><div class='add'>+		test_err("found node when none should exist");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_head(trans, head);</div><div class='add'>+	head = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add a bunch of refs with different roots and parents, then drop them</div><div class='add'>+	 * all, make sure everything is properly merged.</div><div class='add'>+	 */</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	for (int i = 0; i &lt; 50; i++) {</div><div class='add'>+		if (!(i % 2)) {</div><div class='add'>+			ref.parent = 0;</div><div class='add'>+			ref.ref_root = FAKE_ROOT_OBJECTID + i;</div><div class='add'>+		} else {</div><div class='add'>+			ref.parent = FAKE_PARENT + (i * fs_info-&gt;nodesize);</div><div class='add'>+		}</div><div class='add'>+		if (type == BTRFS_REF_METADATA)</div><div class='add'>+			ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+		else</div><div class='add'>+			ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("failed ref action %d", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	for (int i = 0; i &lt; 50; i++) {</div><div class='add'>+		if (!(i % 2)) {</div><div class='add'>+			ref.parent = 0;</div><div class='add'>+			ref.ref_root = FAKE_ROOT_OBJECTID + i;</div><div class='add'>+		} else {</div><div class='add'>+			ref.parent = FAKE_PARENT + (i * fs_info-&gt;nodesize);</div><div class='add'>+		}</div><div class='add'>+		if (type == BTRFS_REF_METADATA)</div><div class='add'>+			ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+		else</div><div class='add'>+			ret = btrfs_add_delayed_data_ref(trans, &amp;ref, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("failed ref action %d", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, &amp;trans-&gt;transaction-&gt;delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head_check.ref_mod = 0;</div><div class='add'>+	head_check.total_ref_mod = 0;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("add and drop multiple failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (node) {</div><div class='add'>+		test_err("found node when none should exist");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	if (!IS_ERR_OR_NULL(head))</div><div class='add'>+		btrfs_unselect_ref_head(&amp;trans-&gt;transaction-&gt;delayed_refs, head);</div><div class='add'>+	btrfs_destroy_delayed_refs(trans-&gt;transaction);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Basic test to validate we always get the add operations first followed by any</div><div class='add'>+ * delete operations.</div><div class='add'>+ */</div><div class='add'>+static int select_delayed_refs_test(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_delayed_ref_root *delayed_refs =</div><div class='add'>+		&amp;trans-&gt;transaction-&gt;delayed_refs;</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_delayed_ref_head *head = NULL;</div><div class='add'>+	struct btrfs_delayed_ref_node *node;</div><div class='add'>+	struct btrfs_ref ref = {</div><div class='add'>+		.type = BTRFS_REF_METADATA,</div><div class='add'>+		.action = BTRFS_DROP_DELAYED_REF,</div><div class='add'>+		.parent = 0,</div><div class='add'>+		.ref_root = FAKE_ROOT_OBJECTID,</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+	};</div><div class='add'>+	struct ref_head_check head_check = {</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+		.ref_mod = 0,</div><div class='add'>+		.total_ref_mod = 0,</div><div class='add'>+	};</div><div class='add'>+	struct ref_node_check node_check = {</div><div class='add'>+		.bytenr = FAKE_BYTENR,</div><div class='add'>+		.num_bytes = fs_info-&gt;nodesize,</div><div class='add'>+		.ref_mod = 1,</div><div class='add'>+		.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+		.type = BTRFS_TREE_BLOCK_REF_KEY,</div><div class='add'>+		.parent = 0,</div><div class='add'>+		.owner = FAKE_LEVEL,</div><div class='add'>+		.offset = 0,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Add the drop first. */</div><div class='add'>+	btrfs_init_tree_ref(&amp;ref, FAKE_LEVEL, FAKE_ROOT_OBJECTID, false);</div><div class='add'>+	ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now add the add, and make it a different root so it's logically later</div><div class='add'>+	 * in the rb tree.</div><div class='add'>+	 */</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	ref.ref_root = FAKE_ROOT_OBJECTID + 1;</div><div class='add'>+	ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		head = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("head check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.root = FAKE_ROOT_OBJECTID + 1;</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	node_check.root = FAKE_ROOT_OBJECTID;</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+	delete_delayed_ref_head(trans, head);</div><div class='add'>+	head = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now we're going to do the same thing, but we're going to have an add</div><div class='add'>+	 * that gets deleted because of a merge, and make sure we still have</div><div class='add'>+	 * another add in place.</div><div class='add'>+	 */</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	ref.ref_root = FAKE_ROOT_OBJECTID;</div><div class='add'>+	ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	ref.ref_root = FAKE_ROOT_OBJECTID + 1;</div><div class='add'>+	ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	ref.ref_root = FAKE_ROOT_OBJECTID + 2;</div><div class='add'>+	ret = btrfs_add_delayed_tree_ref(trans, &amp;ref, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("failed ref action %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = btrfs_select_ref_head(fs_info, delayed_refs);</div><div class='add'>+	if (IS_ERR_OR_NULL(head)) {</div><div class='add'>+		if (IS_ERR(head))</div><div class='add'>+			test_err("failed to select delayed ref head: %ld",</div><div class='add'>+				 PTR_ERR(head));</div><div class='add'>+		else</div><div class='add'>+			test_err("failed to find delayed ref head");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		head = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (validate_ref_head(head, &amp;head_check)) {</div><div class='add'>+		test_err("head check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.action = BTRFS_ADD_DELAYED_REF;</div><div class='add'>+	node_check.root = FAKE_ROOT_OBJECTID + 2;</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;head-&gt;lock);</div><div class='add'>+	node = btrfs_select_delayed_ref(head);</div><div class='add'>+	spin_unlock(&amp;head-&gt;lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		test_err("failed to select delayed ref");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_check.action = BTRFS_DROP_DELAYED_REF;</div><div class='add'>+	node_check.root = FAKE_ROOT_OBJECTID;</div><div class='add'>+	if (validate_ref_node(node, &amp;node_check)) {</div><div class='add'>+		test_err("node check failed");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	delete_delayed_ref_node(head, node);</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	if (head)</div><div class='add'>+		btrfs_unselect_ref_head(delayed_refs, head);</div><div class='add'>+	btrfs_destroy_delayed_refs(trans-&gt;transaction);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_test_delayed_refs(u32 sectorsize, u32 nodesize)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_transaction *transaction;</div><div class='add'>+	struct btrfs_trans_handle trans;</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	test_msg("running delayed refs tests");</div><div class='add'>+</div><div class='add'>+	fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize);</div><div class='add'>+	if (!fs_info) {</div><div class='add'>+		test_std_err(TEST_ALLOC_FS_INFO);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	transaction = kmalloc(sizeof(*transaction), GFP_KERNEL);</div><div class='add'>+	if (!transaction) {</div><div class='add'>+		test_std_err(TEST_ALLOC_TRANSACTION);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_fs_info;</div><div class='add'>+	}</div><div class='add'>+	btrfs_init_dummy_trans(&amp;trans, fs_info);</div><div class='add'>+	btrfs_init_dummy_transaction(transaction, fs_info);</div><div class='add'>+	trans.transaction = transaction;</div><div class='add'>+</div><div class='add'>+	ret = simple_tests(&amp;trans);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		test_msg("running delayed refs merge tests on metadata refs");</div><div class='add'>+		ret = merge_tests(&amp;trans, BTRFS_REF_METADATA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		test_msg("running delayed refs merge tests on data refs");</div><div class='add'>+		ret = merge_tests(&amp;trans, BTRFS_REF_DATA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = select_delayed_refs_test(&amp;trans);</div><div class='add'>+</div><div class='add'>+	kfree(transaction);</div><div class='add'>+out_free_fs_info:</div><div class='add'>+	btrfs_free_dummy_fs_info(fs_info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c<br/>index 25b3349595e0..a0187d6163df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/extent-io-tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/extent-io-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/extent-io-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/extent-io-tests.c</a></div><div class='hunk'>@@ -11,19 +11,20 @@</div><div class='ctx'> #include "btrfs-tests.h"</div><div class='ctx'> #include "../ctree.h"</div><div class='ctx'> #include "../extent_io.h"</div><div class='add'>+#include "../disk-io.h"</div><div class='ctx'> #include "../btrfs_inode.h"</div><div class='ctx'> </div><div class='del'>-#define PROCESS_UNLOCK		(1 &lt;&lt; 0)</div><div class='del'>-#define PROCESS_RELEASE		(1 &lt;&lt; 1)</div><div class='del'>-#define PROCESS_TEST_LOCKED	(1 &lt;&lt; 2)</div><div class='add'>+#define PROCESS_UNLOCK		(1U &lt;&lt; 0)</div><div class='add'>+#define PROCESS_RELEASE		(1U &lt;&lt; 1)</div><div class='add'>+#define PROCESS_TEST_LOCKED	(1U &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> static noinline int process_page_range(struct inode *inode, u64 start, u64 end,</div><div class='ctx'> 				       unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='del'>-	unsigned long index = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t index = start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t end_index = end &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	int loops = 0;</div><div class='hunk'>@@ -73,9 +74,9 @@ static void extent_flag_to_str(const struct extent_state *state, char *dest)</div><div class='ctx'> </div><div class='ctx'> 	dest[0] = 0;</div><div class='ctx'> 	PRINT_ONE_FLAG(state, dest, cur, DIRTY);</div><div class='del'>-	PRINT_ONE_FLAG(state, dest, cur, UPTODATE);</div><div class='ctx'> 	PRINT_ONE_FLAG(state, dest, cur, LOCKED);</div><div class='del'>-	PRINT_ONE_FLAG(state, dest, cur, NEW);</div><div class='add'>+	PRINT_ONE_FLAG(state, dest, cur, DIRTY_LOG1);</div><div class='add'>+	PRINT_ONE_FLAG(state, dest, cur, DIRTY_LOG2);</div><div class='ctx'> 	PRINT_ONE_FLAG(state, dest, cur, DELALLOC);</div><div class='ctx'> 	PRINT_ONE_FLAG(state, dest, cur, DEFRAG);</div><div class='ctx'> 	PRINT_ONE_FLAG(state, dest, cur, BOUNDARY);</div><div class='hunk'>@@ -105,13 +106,14 @@ static void dump_extent_io_tree(const struct extent_io_tree *tree)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int test_find_delalloc(u32 sectorsize)</div><div class='add'>+static int test_find_delalloc(u32 sectorsize, u32 nodesize)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	struct btrfs_root *root = NULL;</div><div class='add'>+	struct inode *inode = NULL;</div><div class='ctx'> 	struct extent_io_tree *tmp;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	struct page *locked_page = NULL;</div><div class='del'>-	unsigned long index = 0;</div><div class='ctx'> 	/* In this test we need at least 2 file extents at its maximum size */</div><div class='ctx'> 	u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;</div><div class='ctx'> 	u64 total_dirty = 2 * max_bytes;</div><div class='hunk'>@@ -121,25 +123,40 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> </div><div class='ctx'> 	test_msg("running find delalloc tests");</div><div class='ctx'> </div><div class='add'>+	fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize);</div><div class='add'>+	if (!fs_info) {</div><div class='add'>+		test_std_err(TEST_ALLOC_FS_INFO);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	root = btrfs_alloc_dummy_root(fs_info);</div><div class='add'>+	if (IS_ERR(root)) {</div><div class='add'>+		test_std_err(TEST_ALLOC_ROOT);</div><div class='add'>+		ret = PTR_ERR(root);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	inode = btrfs_new_test_inode();</div><div class='ctx'> 	if (!inode) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_INODE);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	tmp = &amp;BTRFS_I(inode)-&gt;io_tree;</div><div class='add'>+	BTRFS_I(inode)-&gt;root = root;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Passing NULL as we don't have fs_info but tracepoints are not used</div><div class='ctx'> 	 * at this point</div><div class='ctx'> 	 */</div><div class='del'>-	extent_io_tree_init(NULL, tmp, IO_TREE_SELFTEST);</div><div class='add'>+	btrfs_extent_io_tree_init(NULL, tmp, IO_TREE_SELFTEST);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First go through and create and mark all of our pages dirty, we pin</div><div class='ctx'> 	 * everything to make sure our pages don't get evicted and screw up our</div><div class='ctx'> 	 * test.</div><div class='ctx'> 	 */</div><div class='del'>-	for (index = 0; index &lt; (total_dirty &gt;&gt; PAGE_SHIFT); index++) {</div><div class='add'>+	for (pgoff_t index = 0; index &lt; (total_dirty &gt;&gt; PAGE_SHIFT); index++) {</div><div class='ctx'> 		page = find_or_create_page(inode-&gt;i_mapping, index, GFP_KERNEL);</div><div class='ctx'> 		if (!page) {</div><div class='ctx'> 			test_err("failed to allocate test page");</div><div class='hunk'>@@ -159,10 +176,10 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 	 * |--- delalloc ---|</div><div class='ctx'> 	 * |---  search  ---|</div><div class='ctx'> 	 */</div><div class='del'>-	set_extent_bit(tmp, 0, sectorsize - 1, EXTENT_DELALLOC, NULL);</div><div class='add'>+	btrfs_set_extent_bit(tmp, 0, sectorsize - 1, EXTENT_DELALLOC, NULL);</div><div class='ctx'> 	start = 0;</div><div class='ctx'> 	end = start + PAGE_SIZE - 1;</div><div class='del'>-	found = find_lock_delalloc_range(inode, locked_page, &amp;start,</div><div class='add'>+	found = find_lock_delalloc_range(inode, page_folio(locked_page), &amp;start,</div><div class='ctx'> 					 &amp;end);</div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		test_err("should have found at least one delalloc");</div><div class='hunk'>@@ -173,7 +190,7 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 			sectorsize - 1, start, end);</div><div class='ctx'> 		goto out_bits;</div><div class='ctx'> 	}</div><div class='del'>-	unlock_extent(tmp, start, end, NULL);</div><div class='add'>+	btrfs_unlock_extent(tmp, start, end, NULL);</div><div class='ctx'> 	unlock_page(locked_page);</div><div class='ctx'> 	put_page(locked_page);</div><div class='ctx'> </div><div class='hunk'>@@ -190,10 +207,10 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 		test_err("couldn't find the locked page");</div><div class='ctx'> 		goto out_bits;</div><div class='ctx'> 	}</div><div class='del'>-	set_extent_bit(tmp, sectorsize, max_bytes - 1, EXTENT_DELALLOC, NULL);</div><div class='add'>+	btrfs_set_extent_bit(tmp, sectorsize, max_bytes - 1, EXTENT_DELALLOC, NULL);</div><div class='ctx'> 	start = test_start;</div><div class='ctx'> 	end = start + PAGE_SIZE - 1;</div><div class='del'>-	found = find_lock_delalloc_range(inode, locked_page, &amp;start,</div><div class='add'>+	found = find_lock_delalloc_range(inode, page_folio(locked_page), &amp;start,</div><div class='ctx'> 					 &amp;end);</div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		test_err("couldn't find delalloc in our range");</div><div class='hunk'>@@ -209,7 +226,7 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 		test_err("there were unlocked pages in the range");</div><div class='ctx'> 		goto out_bits;</div><div class='ctx'> 	}</div><div class='del'>-	unlock_extent(tmp, start, end, NULL);</div><div class='add'>+	btrfs_unlock_extent(tmp, start, end, NULL);</div><div class='ctx'> 	/* locked_page was unlocked above */</div><div class='ctx'> 	put_page(locked_page);</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +244,7 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 	}</div><div class='ctx'> 	start = test_start;</div><div class='ctx'> 	end = start + PAGE_SIZE - 1;</div><div class='del'>-	found = find_lock_delalloc_range(inode, locked_page, &amp;start,</div><div class='add'>+	found = find_lock_delalloc_range(inode, page_folio(locked_page), &amp;start,</div><div class='ctx'> 					 &amp;end);</div><div class='ctx'> 	if (found) {</div><div class='ctx'> 		test_err("found range when we shouldn't have");</div><div class='hunk'>@@ -245,10 +262,10 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * We are re-using our test_start from above since it works out well.</div><div class='ctx'> 	 */</div><div class='del'>-	set_extent_bit(tmp, max_bytes, total_dirty - 1, EXTENT_DELALLOC, NULL);</div><div class='add'>+	btrfs_set_extent_bit(tmp, max_bytes, total_dirty - 1, EXTENT_DELALLOC, NULL);</div><div class='ctx'> 	start = test_start;</div><div class='ctx'> 	end = start + PAGE_SIZE - 1;</div><div class='del'>-	found = find_lock_delalloc_range(inode, locked_page, &amp;start,</div><div class='add'>+	found = find_lock_delalloc_range(inode, page_folio(locked_page), &amp;start,</div><div class='ctx'> 					 &amp;end);</div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		test_err("didn't find our range");</div><div class='hunk'>@@ -264,7 +281,7 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 		test_err("pages in range were not all locked");</div><div class='ctx'> 		goto out_bits;</div><div class='ctx'> 	}</div><div class='del'>-	unlock_extent(tmp, start, end, NULL);</div><div class='add'>+	btrfs_unlock_extent(tmp, start, end, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now to test where we run into a page that is no longer dirty in the</div><div class='hunk'>@@ -289,7 +306,7 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> 	 * this changes at any point in the future we will need to fix this</div><div class='ctx'> 	 * tests expected behavior.</div><div class='ctx'> 	 */</div><div class='del'>-	found = find_lock_delalloc_range(inode, locked_page, &amp;start,</div><div class='add'>+	found = find_lock_delalloc_range(inode, page_folio(locked_page), &amp;start,</div><div class='ctx'> 					 &amp;end);</div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		test_err("didn't find our range");</div><div class='hunk'>@@ -309,13 +326,15 @@ static int test_find_delalloc(u32 sectorsize)</div><div class='ctx'> out_bits:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dump_extent_io_tree(tmp);</div><div class='del'>-	clear_extent_bits(tmp, 0, total_dirty - 1, (unsigned)-1);</div><div class='add'>+	btrfs_clear_extent_bit(tmp, 0, total_dirty - 1, (unsigned)-1, NULL);</div><div class='ctx'> out:</div><div class='ctx'> 	if (locked_page)</div><div class='ctx'> 		put_page(locked_page);</div><div class='ctx'> 	process_page_range(inode, 0, total_dirty - 1,</div><div class='ctx'> 			   PROCESS_UNLOCK | PROCESS_RELEASE);</div><div class='ctx'> 	iput(inode);</div><div class='add'>+	btrfs_free_dummy_root(root);</div><div class='add'>+	btrfs_free_dummy_fs_info(fs_info);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,11 +343,11 @@ static int check_eb_bitmap(unsigned long *bitmap, struct extent_buffer *eb)</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; eb-&gt;len * BITS_PER_BYTE; i++) {</div><div class='del'>-		int bit, bit1;</div><div class='add'>+		bool bit_set, bit1_set;</div><div class='ctx'> </div><div class='del'>-		bit = !!test_bit(i, bitmap);</div><div class='del'>-		bit1 = !!extent_buffer_test_bit(eb, 0, i);</div><div class='del'>-		if (bit1 != bit) {</div><div class='add'>+		bit_set = test_bit(i, bitmap);</div><div class='add'>+		bit1_set = extent_buffer_test_bit(eb, 0, i);</div><div class='add'>+		if (bit1_set != bit_set) {</div><div class='ctx'> 			u8 has;</div><div class='ctx'> 			u8 expect;</div><div class='ctx'> </div><div class='hunk'>@@ -341,9 +360,9 @@ static int check_eb_bitmap(unsigned long *bitmap, struct extent_buffer *eb)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bit1 = !!extent_buffer_test_bit(eb, i / BITS_PER_BYTE,</div><div class='del'>-						i % BITS_PER_BYTE);</div><div class='del'>-		if (bit1 != bit) {</div><div class='add'>+		bit1_set = extent_buffer_test_bit(eb, i / BITS_PER_BYTE,</div><div class='add'>+						  i % BITS_PER_BYTE);</div><div class='add'>+		if (bit1_set != bit_set) {</div><div class='ctx'> 			u8 has;</div><div class='ctx'> 			u8 expect;</div><div class='ctx'> </div><div class='hunk'>@@ -486,7 +505,7 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb)</div><div class='ctx'> static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='del'>-	unsigned long *bitmap = NULL;</div><div class='add'>+	unsigned long AUTO_KFREE(bitmap);</div><div class='ctx'> 	struct extent_buffer *eb = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -505,7 +524,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	eb = __alloc_dummy_extent_buffer(fs_info, 0, nodesize);</div><div class='add'>+	eb = alloc_dummy_extent_buffer(fs_info, 0);</div><div class='ctx'> 	if (!eb) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_ROOT);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -522,7 +541,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	 * Test again for case where the tree block is sectorsize aligned but</div><div class='ctx'> 	 * not nodesize aligned.</div><div class='ctx'> 	 */</div><div class='del'>-	eb = __alloc_dummy_extent_buffer(fs_info, sectorsize, nodesize);</div><div class='add'>+	eb = alloc_dummy_extent_buffer(fs_info, sectorsize);</div><div class='ctx'> 	if (!eb) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_ROOT);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -532,7 +551,6 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	ret = __test_eb_bitmaps(bitmap, eb);</div><div class='ctx'> out:</div><div class='ctx'> 	free_extent_buffer(eb);</div><div class='del'>-	kfree(bitmap);</div><div class='ctx'> 	btrfs_free_dummy_fs_info(fs_info);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -545,10 +563,10 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> </div><div class='ctx'> 	test_msg("running find_first_clear_extent_bit test");</div><div class='ctx'> </div><div class='del'>-	extent_io_tree_init(NULL, &amp;tree, IO_TREE_SELFTEST);</div><div class='add'>+	btrfs_extent_io_tree_init(NULL, &amp;tree, IO_TREE_SELFTEST);</div><div class='ctx'> </div><div class='ctx'> 	/* Test correct handling of empty tree */</div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, 0, &amp;start, &amp;end, CHUNK_TRIMMED);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, 0, &amp;start, &amp;end, CHUNK_TRIMMED);</div><div class='ctx'> 	if (start != 0 || end != -1) {</div><div class='ctx'> 		test_err(</div><div class='ctx'> 	"error getting a range from completely empty tree: start %llu end %llu",</div><div class='hunk'>@@ -559,11 +577,11 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> 	 * Set 1M-4M alloc/discard and 32M-64M thus leaving a hole between</div><div class='ctx'> 	 * 4M-32M</div><div class='ctx'> 	 */</div><div class='del'>-	set_extent_bit(&amp;tree, SZ_1M, SZ_4M - 1,</div><div class='del'>-		       CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);</div><div class='add'>+	btrfs_set_extent_bit(&amp;tree, SZ_1M, SZ_4M - 1,</div><div class='add'>+			     CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);</div><div class='ctx'> </div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, SZ_512K, &amp;start, &amp;end,</div><div class='del'>-				    CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, SZ_512K, &amp;start, &amp;end,</div><div class='add'>+					  CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> 	if (start != 0 || end != SZ_1M - 1) {</div><div class='ctx'> 		test_err("error finding beginning range: start %llu end %llu",</div><div class='hunk'>@@ -572,14 +590,14 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now add 32M-64M so that we have a hole between 4M-32M */</div><div class='del'>-	set_extent_bit(&amp;tree, SZ_32M, SZ_64M - 1,</div><div class='del'>-		       CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);</div><div class='add'>+	btrfs_set_extent_bit(&amp;tree, SZ_32M, SZ_64M - 1,</div><div class='add'>+			     CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Request first hole starting at 12M, we should get 4M-32M</div><div class='ctx'> 	 */</div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, 12 * SZ_1M, &amp;start, &amp;end,</div><div class='del'>-				    CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, 12 * SZ_1M, &amp;start, &amp;end,</div><div class='add'>+					  CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> 	if (start != SZ_4M || end != SZ_32M - 1) {</div><div class='ctx'> 		test_err("error finding trimmed range: start %llu end %llu",</div><div class='hunk'>@@ -591,8 +609,8 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> 	 * Search in the middle of allocated range, should get the next one</div><div class='ctx'> 	 * available, which happens to be unallocated -&gt; 4M-32M</div><div class='ctx'> 	 */</div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, SZ_2M, &amp;start, &amp;end,</div><div class='del'>-				    CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, SZ_2M, &amp;start, &amp;end,</div><div class='add'>+					  CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> 	if (start != SZ_4M || end != SZ_32M - 1) {</div><div class='ctx'> 		test_err("error finding next unalloc range: start %llu end %llu",</div><div class='hunk'>@@ -604,9 +622,9 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> 	 * Set 64M-72M with CHUNK_ALLOC flag, then search for CHUNK_TRIMMED flag</div><div class='ctx'> 	 * being unset in this range, we should get the entry in range 64M-72M</div><div class='ctx'> 	 */</div><div class='del'>-	set_extent_bit(&amp;tree, SZ_64M, SZ_64M + SZ_8M - 1, CHUNK_ALLOCATED, NULL);</div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, SZ_64M + SZ_1M, &amp;start, &amp;end,</div><div class='del'>-				    CHUNK_TRIMMED);</div><div class='add'>+	btrfs_set_extent_bit(&amp;tree, SZ_64M, SZ_64M + SZ_8M - 1, CHUNK_ALLOCATED, NULL);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, SZ_64M + SZ_1M, &amp;start, &amp;end,</div><div class='add'>+					  CHUNK_TRIMMED);</div><div class='ctx'> </div><div class='ctx'> 	if (start != SZ_64M || end != SZ_64M + SZ_8M - 1) {</div><div class='ctx'> 		test_err("error finding exact range: start %llu end %llu",</div><div class='hunk'>@@ -614,8 +632,8 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, SZ_64M - SZ_8M, &amp;start, &amp;end,</div><div class='del'>-				    CHUNK_TRIMMED);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, SZ_64M - SZ_8M, &amp;start, &amp;end,</div><div class='add'>+					  CHUNK_TRIMMED);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Search in the middle of set range whose immediate neighbour doesn't</div><div class='hunk'>@@ -631,7 +649,7 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> 	 * Search beyond any known range, shall return after last known range</div><div class='ctx'> 	 * and end should be -1</div><div class='ctx'> 	 */</div><div class='del'>-	find_first_clear_extent_bit(&amp;tree, -1, &amp;start, &amp;end, CHUNK_TRIMMED);</div><div class='add'>+	btrfs_find_first_clear_extent_bit(&amp;tree, -1, &amp;start, &amp;end, CHUNK_TRIMMED);</div><div class='ctx'> 	if (start != SZ_64M + SZ_8M || end != -1) {</div><div class='ctx'> 		test_err(</div><div class='ctx'> 		"error handling beyond end of range search: start %llu end %llu",</div><div class='hunk'>@@ -643,7 +661,7 @@ static int test_find_first_clear_extent_bit(void)</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dump_extent_io_tree(&amp;tree);</div><div class='del'>-	clear_extent_bits(&amp;tree, 0, (u64)-1, CHUNK_TRIMMED | CHUNK_ALLOCATED);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;tree, 0, (u64)-1, CHUNK_TRIMMED | CHUNK_ALLOCATED, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -710,7 +728,7 @@ static int test_eb_mem_ops(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	eb = __alloc_dummy_extent_buffer(fs_info, SZ_1M, nodesize);</div><div class='add'>+	eb = alloc_dummy_extent_buffer(fs_info, SZ_1M);</div><div class='ctx'> 	if (!eb) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_BUFFER);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -794,7 +812,7 @@ int btrfs_test_extent_io(u32 sectorsize, u32 nodesize)</div><div class='ctx'> </div><div class='ctx'> 	test_msg("running extent I/O tests");</div><div class='ctx'> </div><div class='del'>-	ret = test_find_delalloc(sectorsize);</div><div class='add'>+	ret = test_find_delalloc(sectorsize, nodesize);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/tests/extent-map-tests.c b/fs/btrfs/tests/extent-map-tests.c<br/>index 253cce7ffecf..0b9f25dd1a68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/extent-map-tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/extent-map-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/extent-map-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/extent-map-tests.c</a></div><div class='hunk'>@@ -11,30 +11,36 @@</div><div class='ctx'> #include "../disk-io.h"</div><div class='ctx'> #include "../block-group.h"</div><div class='ctx'> </div><div class='del'>-static void free_extent_map_tree(struct extent_map_tree *em_tree)</div><div class='add'>+static int free_extent_map_tree(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	struct rb_node *node;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	while (!RB_EMPTY_ROOT(&amp;em_tree-&gt;map.rb_root)) {</div><div class='del'>-		node = rb_first_cached(&amp;em_tree-&gt;map);</div><div class='add'>+	while (!RB_EMPTY_ROOT(&amp;em_tree-&gt;root)) {</div><div class='add'>+		node = rb_first(&amp;em_tree-&gt;root);</div><div class='ctx'> 		em = rb_entry(node, struct extent_map, rb_node);</div><div class='del'>-		remove_extent_mapping(em_tree, em);</div><div class='add'>+		btrfs_remove_extent_mapping(inode, em);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BTRFS_DEBUG</div><div class='ctx'> 		if (refcount_read(&amp;em-&gt;refs) != 1) {</div><div class='add'>+			ret = -EINVAL;</div><div class='ctx'> 			test_err(</div><div class='del'>-"em leak: em (start %llu len %llu block_start %llu block_len %llu) refs %d",</div><div class='del'>-				 em-&gt;start, em-&gt;len, em-&gt;block_start,</div><div class='del'>-				 em-&gt;block_len, refcount_read(&amp;em-&gt;refs));</div><div class='add'>+"em leak: em (start %llu len %llu disk_bytenr %llu disk_num_bytes %llu offset %llu) refs %d",</div><div class='add'>+				 em-&gt;start, em-&gt;len, em-&gt;disk_bytenr,</div><div class='add'>+				 em-&gt;disk_num_bytes, em-&gt;offset,</div><div class='add'>+				 refcount_read(&amp;em-&gt;refs));</div><div class='ctx'> </div><div class='ctx'> 			refcount_set(&amp;em-&gt;refs, 1);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 	}</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -53,15 +59,16 @@ static void free_extent_map_tree(struct extent_map_tree *em_tree)</div><div class='ctx'>  *                                    -&gt;add_extent_mapping(0, 16K)</div><div class='ctx'>  *                                    -&gt; #handle -EEXIST</div><div class='ctx'>  */</div><div class='del'>-static int test_case_1(struct btrfs_fs_info *fs_info,</div><div class='del'>-		struct extent_map_tree *em_tree)</div><div class='add'>+static int test_case_1(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	u64 start = 0;</div><div class='ctx'> 	u64 len = SZ_8K;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -70,19 +77,20 @@ static int test_case_1(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0, 16K) */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_16K;</div><div class='del'>-	em-&gt;block_start = 0;</div><div class='del'>-	em-&gt;block_len = SZ_16K;</div><div class='add'>+	em-&gt;disk_bytenr = 0;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_16K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_16K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [0, 16K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Add [16K, 20K) following [0, 16K)  */</div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -91,18 +99,19 @@ static int test_case_1(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;start = SZ_16K;</div><div class='ctx'> 	em-&gt;len = SZ_4K;</div><div class='del'>-	em-&gt;block_start = SZ_32K; /* avoid merging */</div><div class='del'>-	em-&gt;block_len = SZ_4K;</div><div class='add'>+	em-&gt;disk_bytenr = SZ_32K; /* avoid merging */</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_4K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [16K, 20K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -112,10 +121,11 @@ static int test_case_1(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0, 8K), should return [0, 16K) instead. */</div><div class='ctx'> 	em-&gt;start = start;</div><div class='ctx'> 	em-&gt;len = len;</div><div class='del'>-	em-&gt;block_start = start;</div><div class='del'>-	em-&gt;block_len = len;</div><div class='add'>+	em-&gt;disk_bytenr = start;</div><div class='add'>+	em-&gt;disk_num_bytes = len;</div><div class='add'>+	em-&gt;ram_bytes = len;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("case1 [%llu %llu]: ret %d", start, start + len, ret);</div><div class='hunk'>@@ -127,17 +137,19 @@ static int test_case_1(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;start != 0 || extent_map_end(em) != SZ_16K ||</div><div class='del'>-	    em-&gt;block_start != 0 || em-&gt;block_len != SZ_16K) {</div><div class='add'>+	if (em-&gt;start != 0 || btrfs_extent_map_end(em) != SZ_16K ||</div><div class='add'>+	    em-&gt;disk_bytenr != 0 || em-&gt;disk_num_bytes != SZ_16K) {</div><div class='ctx'> 		test_err(</div><div class='del'>-"case1 [%llu %llu]: ret %d return a wrong em (start %llu len %llu block_start %llu block_len %llu",</div><div class='add'>+"case1 [%llu %llu]: ret %d return a wrong em (start %llu len %llu disk_bytenr %llu disk_num_bytes %llu",</div><div class='ctx'> 			 start, start + len, ret, em-&gt;start, em-&gt;len,</div><div class='del'>-			 em-&gt;block_start, em-&gt;block_len);</div><div class='add'>+			 em-&gt;disk_bytenr, em-&gt;disk_num_bytes);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map_tree(em_tree);</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -148,13 +160,14 @@ out:</div><div class='ctx'>  * Reading the inline ending up with EEXIST, ie. read an inline</div><div class='ctx'>  * extent and discard page cache and read it again.</div><div class='ctx'>  */</div><div class='del'>-static int test_case_2(struct btrfs_fs_info *fs_info,</div><div class='del'>-		struct extent_map_tree *em_tree)</div><div class='add'>+static int test_case_2(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -163,19 +176,20 @@ static int test_case_2(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0, 1K) */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_1K;</div><div class='del'>-	em-&gt;block_start = EXTENT_MAP_INLINE;</div><div class='del'>-	em-&gt;block_len = (u64)-1;</div><div class='add'>+	em-&gt;disk_bytenr = EXTENT_MAP_INLINE;</div><div class='add'>+	em-&gt;disk_num_bytes = 0;</div><div class='add'>+	em-&gt;ram_bytes = SZ_1K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [0, 1K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Add [4K, 8K) following [0, 1K)  */</div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -184,18 +198,19 @@ static int test_case_2(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;start = SZ_4K;</div><div class='ctx'> 	em-&gt;len = SZ_4K;</div><div class='del'>-	em-&gt;block_start = SZ_4K;</div><div class='del'>-	em-&gt;block_len = SZ_4K;</div><div class='add'>+	em-&gt;disk_bytenr = SZ_4K;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_4K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [4K, 8K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -205,10 +220,11 @@ static int test_case_2(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0, 1K) */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_1K;</div><div class='del'>-	em-&gt;block_start = EXTENT_MAP_INLINE;</div><div class='del'>-	em-&gt;block_len = (u64)-1;</div><div class='add'>+	em-&gt;disk_bytenr = EXTENT_MAP_INLINE;</div><div class='add'>+	em-&gt;disk_num_bytes = 0;</div><div class='add'>+	em-&gt;ram_bytes = SZ_1K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("case2 [0 1K]: ret %d", ret);</div><div class='hunk'>@@ -219,29 +235,32 @@ static int test_case_2(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;start != 0 || extent_map_end(em) != SZ_1K ||</div><div class='del'>-	    em-&gt;block_start != EXTENT_MAP_INLINE || em-&gt;block_len != (u64)-1) {</div><div class='add'>+	if (em-&gt;start != 0 || btrfs_extent_map_end(em) != SZ_1K ||</div><div class='add'>+	    em-&gt;disk_bytenr != EXTENT_MAP_INLINE) {</div><div class='ctx'> 		test_err(</div><div class='del'>-"case2 [0 1K]: ret %d return a wrong em (start %llu len %llu block_start %llu block_len %llu",</div><div class='del'>-			 ret, em-&gt;start, em-&gt;len, em-&gt;block_start,</div><div class='del'>-			 em-&gt;block_len);</div><div class='add'>+"case2 [0 1K]: ret %d return a wrong em (start %llu len %llu disk_bytenr %llu",</div><div class='add'>+			 ret, em-&gt;start, em-&gt;len, em-&gt;disk_bytenr);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map_tree(em_tree);</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __test_case_3(struct btrfs_fs_info *fs_info,</div><div class='del'>-		struct extent_map_tree *em_tree, u64 start)</div><div class='add'>+			 struct btrfs_inode *inode, u64 start)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	u64 len = SZ_4K;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -250,18 +269,19 @@ static int __test_case_3(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [4K, 8K) */</div><div class='ctx'> 	em-&gt;start = SZ_4K;</div><div class='ctx'> 	em-&gt;len = SZ_4K;</div><div class='del'>-	em-&gt;block_start = SZ_4K;</div><div class='del'>-	em-&gt;block_len = SZ_4K;</div><div class='add'>+	em-&gt;disk_bytenr = SZ_4K;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_4K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [4K, 8K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -271,10 +291,11 @@ static int __test_case_3(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0, 16K) */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_16K;</div><div class='del'>-	em-&gt;block_start = 0;</div><div class='del'>-	em-&gt;block_len = SZ_16K;</div><div class='add'>+	em-&gt;disk_bytenr = 0;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_16K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_16K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, start, len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, start, len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("case3 [%llu %llu): ret %d",</div><div class='hunk'>@@ -291,17 +312,19 @@ static int __test_case_3(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * Since bytes within em are contiguous, em-&gt;block_start is identical to</div><div class='ctx'> 	 * em-&gt;start.</div><div class='ctx'> 	 */</div><div class='del'>-	if (start &lt; em-&gt;start || start + len &gt; extent_map_end(em) ||</div><div class='del'>-	    em-&gt;start != em-&gt;block_start || em-&gt;len != em-&gt;block_len) {</div><div class='add'>+	if (start &lt; em-&gt;start || start + len &gt; btrfs_extent_map_end(em) ||</div><div class='add'>+	    em-&gt;start != btrfs_extent_map_block_start(em)) {</div><div class='ctx'> 		test_err(</div><div class='del'>-"case3 [%llu %llu): ret %d em (start %llu len %llu block_start %llu block_len %llu)",</div><div class='add'>+"case3 [%llu %llu): ret %d em (start %llu len %llu disk_bytenr %llu block_len %llu)",</div><div class='ctx'> 			 start, start + len, ret, em-&gt;start, em-&gt;len,</div><div class='del'>-			 em-&gt;block_start, em-&gt;block_len);</div><div class='add'>+			 em-&gt;disk_bytenr, em-&gt;disk_num_bytes);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map_tree(em_tree);</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -322,30 +345,31 @@ out:</div><div class='ctx'>  *   -&gt; add_extent_mapping()</div><div class='ctx'>  *                            -&gt; add_extent_mapping()</div><div class='ctx'>  */</div><div class='del'>-static int test_case_3(struct btrfs_fs_info *fs_info,</div><div class='del'>-		struct extent_map_tree *em_tree)</div><div class='add'>+static int test_case_3(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __test_case_3(fs_info, em_tree, 0);</div><div class='add'>+	ret = __test_case_3(fs_info, inode, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = __test_case_3(fs_info, em_tree, SZ_8K);</div><div class='add'>+	ret = __test_case_3(fs_info, inode, SZ_8K);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = __test_case_3(fs_info, em_tree, (12 * SZ_1K));</div><div class='add'>+	ret = __test_case_3(fs_info, inode, (12 * SZ_1K));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __test_case_4(struct btrfs_fs_info *fs_info,</div><div class='del'>-		struct extent_map_tree *em_tree, u64 start)</div><div class='add'>+			 struct btrfs_inode *inode, u64 start)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	u64 len = SZ_4K;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -354,18 +378,19 @@ static int __test_case_4(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0K, 8K) */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_8K;</div><div class='del'>-	em-&gt;block_start = 0;</div><div class='del'>-	em-&gt;block_len = SZ_8K;</div><div class='add'>+	em-&gt;disk_bytenr = 0;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_8K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_8K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [0, 8K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -375,18 +400,19 @@ static int __test_case_4(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [8K, 32K) */</div><div class='ctx'> 	em-&gt;start = SZ_8K;</div><div class='ctx'> 	em-&gt;len = 24 * SZ_1K;</div><div class='del'>-	em-&gt;block_start = SZ_16K; /* avoid merging */</div><div class='del'>-	em-&gt;block_len = 24 * SZ_1K;</div><div class='add'>+	em-&gt;disk_bytenr = SZ_16K; /* avoid merging */</div><div class='add'>+	em-&gt;disk_num_bytes = 24 * SZ_1K;</div><div class='add'>+	em-&gt;ram_bytes = 24 * SZ_1K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent range [8K, 32K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -395,10 +421,11 @@ static int __test_case_4(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	/* Add [0K, 32K) */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_32K;</div><div class='del'>-	em-&gt;block_start = 0;</div><div class='del'>-	em-&gt;block_len = SZ_32K;</div><div class='add'>+	em-&gt;disk_bytenr = 0;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_32K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_32K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, start, len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, start, len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("case4 [%llu %llu): ret %d",</div><div class='hunk'>@@ -411,16 +438,18 @@ static int __test_case_4(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (start &lt; em-&gt;start || start + len &gt; extent_map_end(em)) {</div><div class='add'>+	if (start &lt; em-&gt;start || start + len &gt; btrfs_extent_map_end(em)) {</div><div class='ctx'> 		test_err(</div><div class='del'>-"case4 [%llu %llu): ret %d, added wrong em (start %llu len %llu block_start %llu block_len %llu)",</div><div class='del'>-			 start, start + len, ret, em-&gt;start, em-&gt;len, em-&gt;block_start,</div><div class='del'>-			 em-&gt;block_len);</div><div class='add'>+"case4 [%llu %llu): ret %d, added wrong em (start %llu len %llu disk_bytenr %llu disk_num_bytes %llu)",</div><div class='add'>+			 start, start + len, ret, em-&gt;start, em-&gt;len,</div><div class='add'>+			 em-&gt;disk_bytenr, em-&gt;disk_num_bytes);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map_tree(em_tree);</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -450,27 +479,26 @@ out:</div><div class='ctx'>  *                                             # handle -EEXIST when adding</div><div class='ctx'>  *                                             # [0, 32K)</div><div class='ctx'>  */</div><div class='del'>-static int test_case_4(struct btrfs_fs_info *fs_info,</div><div class='del'>-		struct extent_map_tree *em_tree)</div><div class='add'>+static int test_case_4(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __test_case_4(fs_info, em_tree, 0);</div><div class='add'>+	ret = __test_case_4(fs_info, inode, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = __test_case_4(fs_info, em_tree, SZ_4K);</div><div class='add'>+	ret = __test_case_4(fs_info, inode, SZ_4K);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int add_compressed_extent(struct btrfs_fs_info *fs_info,</div><div class='del'>-				 struct extent_map_tree *em_tree,</div><div class='add'>+static int add_compressed_extent(struct btrfs_inode *inode,</div><div class='ctx'> 				 u64 start, u64 len, u64 block_start)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -478,13 +506,14 @@ static int add_compressed_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;start = start;</div><div class='ctx'> 	em-&gt;len = len;</div><div class='del'>-	em-&gt;block_start = block_start;</div><div class='del'>-	em-&gt;block_len = SZ_4K;</div><div class='add'>+	em-&gt;disk_bytenr = block_start;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = len;</div><div class='ctx'> 	em-&gt;flags |= EXTENT_FLAG_COMPRESS_ZLIB;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("cannot add extent map [%llu, %llu)", start, start + len);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -534,7 +563,7 @@ static int validate_range(struct extent_map_tree *em_tree, int index)</div><div class='ctx'> 	struct rb_node *n;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, n = rb_first_cached(&amp;em_tree-&gt;map);</div><div class='add'>+	for (i = 0, n = rb_first(&amp;em_tree-&gt;root);</div><div class='ctx'> 	     valid_ranges[index][i].len &amp;&amp; n;</div><div class='ctx'> 	     i++, n = rb_next(n)) {</div><div class='ctx'> 		struct extent_map *entry = rb_entry(n, struct extent_map, rb_node);</div><div class='hunk'>@@ -588,53 +617,44 @@ static int validate_range(struct extent_map_tree *em_tree, int index)</div><div class='ctx'>  * They'll have the EXTENT_FLAG_COMPRESSED flag set to keep the em tree from</div><div class='ctx'>  * merging the em's.</div><div class='ctx'>  */</div><div class='del'>-static int test_case_5(struct btrfs_fs_info *fs_info)</div><div class='add'>+static int test_case_5(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct extent_map_tree *em_tree;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	u64 start, end;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='ctx'> 	test_msg("Running btrfs_drop_extent_map_range tests");</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_new_test_inode();</div><div class='del'>-	if (!inode) {</div><div class='del'>-		test_std_err(TEST_ALLOC_INODE);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	em_tree = &amp;BTRFS_I(inode)-&gt;extent_tree;</div><div class='del'>-</div><div class='ctx'> 	/* [0, 12k) */</div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, 0, SZ_4K * 3, 0);</div><div class='add'>+	ret = add_compressed_extent(inode, 0, SZ_4K * 3, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("cannot add extent range [0, 12K)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [12k, 24k) */</div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, SZ_4K * 3, SZ_4K * 3, SZ_4K);</div><div class='add'>+	ret = add_compressed_extent(inode, SZ_4K * 3, SZ_4K * 3, SZ_4K);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("cannot add extent range [12k, 24k)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [24k, 36k) */</div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, SZ_4K * 6, SZ_4K * 3, SZ_8K);</div><div class='add'>+	ret = add_compressed_extent(inode, SZ_4K * 6, SZ_4K * 3, SZ_8K);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("cannot add extent range [12k, 24k)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [36k, 40k) */</div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, SZ_32K + SZ_4K, SZ_4K, SZ_4K * 3);</div><div class='add'>+	ret = add_compressed_extent(inode, SZ_32K + SZ_4K, SZ_4K, SZ_4K * 3);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("cannot add extent range [12k, 24k)");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [40k, 64k) */</div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, SZ_4K * 10, SZ_4K * 6, SZ_16K);</div><div class='add'>+	ret = add_compressed_extent(inode, SZ_4K * 10, SZ_4K * 6, SZ_16K);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("cannot add extent range [12k, 24k)");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -643,36 +663,39 @@ static int test_case_5(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	/* Drop [8k, 12k) */</div><div class='ctx'> 	start = SZ_8K;</div><div class='ctx'> 	end = (3 * SZ_4K) - 1;</div><div class='del'>-	btrfs_drop_extent_map_range(BTRFS_I(inode), start, end, false);</div><div class='del'>-	ret = validate_range(&amp;BTRFS_I(inode)-&gt;extent_tree, 0);</div><div class='add'>+	btrfs_drop_extent_map_range(inode, start, end, false);</div><div class='add'>+	ret = validate_range(&amp;inode-&gt;extent_tree, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Drop [12k, 20k) */</div><div class='ctx'> 	start = SZ_4K * 3;</div><div class='ctx'> 	end = SZ_16K + SZ_4K - 1;</div><div class='del'>-	btrfs_drop_extent_map_range(BTRFS_I(inode), start, end, false);</div><div class='del'>-	ret = validate_range(&amp;BTRFS_I(inode)-&gt;extent_tree, 1);</div><div class='add'>+	btrfs_drop_extent_map_range(inode, start, end, false);</div><div class='add'>+	ret = validate_range(&amp;inode-&gt;extent_tree, 1);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Drop [28k, 32k) */</div><div class='ctx'> 	start = SZ_32K - SZ_4K;</div><div class='ctx'> 	end = SZ_32K - 1;</div><div class='del'>-	btrfs_drop_extent_map_range(BTRFS_I(inode), start, end, false);</div><div class='del'>-	ret = validate_range(&amp;BTRFS_I(inode)-&gt;extent_tree, 2);</div><div class='add'>+	btrfs_drop_extent_map_range(inode, start, end, false);</div><div class='add'>+	ret = validate_range(&amp;inode-&gt;extent_tree, 2);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Drop [32k, 64k) */</div><div class='ctx'> 	start = SZ_32K;</div><div class='ctx'> 	end = SZ_64K - 1;</div><div class='del'>-	btrfs_drop_extent_map_range(BTRFS_I(inode), start, end, false);</div><div class='del'>-	ret = validate_range(&amp;BTRFS_I(inode)-&gt;extent_tree, 3);</div><div class='add'>+	btrfs_drop_extent_map_range(inode, start, end, false);</div><div class='add'>+	ret = validate_range(&amp;inode-&gt;extent_tree, 3);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> out:</div><div class='del'>-	iput(inode);</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -681,31 +704,35 @@ out:</div><div class='ctx'>  * for areas between two existing ems.  Validate it doesn't do this when there</div><div class='ctx'>  * are two unmerged em's side by side.</div><div class='ctx'>  */</div><div class='del'>-static int test_case_6(struct btrfs_fs_info *fs_info, struct extent_map_tree *em_tree)</div><div class='add'>+static int test_case_6(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em = NULL;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, 0, SZ_4K, 0);</div><div class='add'>+	ret = add_compressed_extent(inode, 0, SZ_4K, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = add_compressed_extent(fs_info, em_tree, SZ_4K, SZ_4K, 0);</div><div class='add'>+	ret = add_compressed_extent(inode, SZ_4K, SZ_4K, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	em-&gt;start = SZ_4K;</div><div class='ctx'> 	em-&gt;len = SZ_4K;</div><div class='del'>-	em-&gt;block_start = SZ_16K;</div><div class='del'>-	em-&gt;block_len = SZ_16K;</div><div class='add'>+	em-&gt;disk_bytenr = SZ_16K;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_16K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_16K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, 0, SZ_8K);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, 0, SZ_8K);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 0) {</div><div class='hunk'>@@ -724,8 +751,11 @@ static int test_case_6(struct btrfs_fs_info *fs_info, struct extent_map_tree *em</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map(em);</div><div class='del'>-	free_extent_map_tree(em_tree);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -734,46 +764,38 @@ out:</div><div class='ctx'>  * true would mess up the start/end calculations and subsequent splits would be</div><div class='ctx'>  * incorrect.</div><div class='ctx'>  */</div><div class='del'>-static int test_case_7(struct btrfs_fs_info *fs_info)</div><div class='add'>+static int test_case_7(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct extent_map_tree *em_tree;</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int ret2;</div><div class='ctx'> </div><div class='ctx'> 	test_msg("Running btrfs_drop_extent_cache with pinned");</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_new_test_inode();</div><div class='del'>-	if (!inode) {</div><div class='del'>-		test_std_err(TEST_ALLOC_INODE);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	em_tree = &amp;BTRFS_I(inode)-&gt;extent_tree;</div><div class='del'>-</div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [0, 16K), pinned */</div><div class='ctx'> 	em-&gt;start = 0;</div><div class='ctx'> 	em-&gt;len = SZ_16K;</div><div class='del'>-	em-&gt;block_start = 0;</div><div class='del'>-	em-&gt;block_len = SZ_4K;</div><div class='del'>-	em-&gt;flags |= EXTENT_FLAG_PINNED;</div><div class='add'>+	em-&gt;disk_bytenr = 0;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_16K;</div><div class='add'>+	em-&gt;flags |= (EXTENT_FLAG_PINNED | EXTENT_FLAG_COMPRESS_ZLIB);</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("couldn't add extent map");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = alloc_extent_map();</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -783,27 +805,28 @@ static int test_case_7(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	/* [32K, 48K), not pinned */</div><div class='ctx'> 	em-&gt;start = SZ_32K;</div><div class='ctx'> 	em-&gt;len = SZ_16K;</div><div class='del'>-	em-&gt;block_start = SZ_32K;</div><div class='del'>-	em-&gt;block_len = SZ_16K;</div><div class='add'>+	em-&gt;disk_bytenr = SZ_32K;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_16K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_16K;</div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	ret = btrfs_add_extent_mapping(fs_info, em_tree, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		test_err("couldn't add extent map");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Drop [0, 36K) This should skip the [0, 4K) extent and then split the</div><div class='ctx'> 	 * [32K, 48K) extent.</div><div class='ctx'> 	 */</div><div class='del'>-	btrfs_drop_extent_map_range(BTRFS_I(inode), 0, (36 * SZ_1K) - 1, true);</div><div class='add'>+	btrfs_drop_extent_map_range(inode, 0, (36 * SZ_1K) - 1, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure our extent maps look sane. */</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	em = lookup_extent_mapping(em_tree, 0, SZ_16K);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, 0, SZ_16K);</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_err("didn't find an em at 0 as expected");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -819,10 +842,10 @@ static int test_case_7(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, SZ_16K, SZ_16K);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, SZ_16K, SZ_16K);</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (em) {</div><div class='ctx'> 		test_err("found an em when we weren't expecting one");</div><div class='hunk'>@@ -830,7 +853,7 @@ static int test_case_7(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, SZ_32K, SZ_16K);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, SZ_32K, SZ_16K);</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (!em) {</div><div class='ctx'> 		test_err("didn't find an em at 32K as expected");</div><div class='hunk'>@@ -847,10 +870,16 @@ static int test_case_7(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	if (btrfs_extent_map_block_start(em) != SZ_32K + SZ_4K) {</div><div class='add'>+		test_err("em-&gt;block_start is %llu, expected 36K",</div><div class='add'>+			 btrfs_extent_map_block_start(em));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = lookup_extent_mapping(em_tree, 48 * SZ_1K, (u64)-1);</div><div class='add'>+	em = btrfs_lookup_extent_mapping(em_tree, 48 * SZ_1K, (u64)-1);</div><div class='ctx'> 	read_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> 	if (em) {</div><div class='ctx'> 		test_err("found an unexpected em above 48K");</div><div class='hunk'>@@ -859,8 +888,111 @@ static int test_case_7(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='del'>-	free_extent_map(em);</div><div class='del'>-	iput(inode);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+	/* Unpin our extent to prevent warning when removing it below. */</div><div class='add'>+	ret2 = btrfs_unpin_extent_cache(inode, 0, SZ_16K, 0);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test a regression for compressed extent map adjustment when we attempt to</div><div class='add'>+ * add an extent map that is partially overlapped by another existing extent</div><div class='add'>+ * map. The resulting extent map offset was left unchanged despite having</div><div class='add'>+ * incremented its start offset.</div><div class='add'>+ */</div><div class='add'>+static int test_case_8(struct btrfs_fs_info *fs_info, struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;inode-&gt;extent_tree;</div><div class='add'>+	struct extent_map *em;</div><div class='add'>+	int ret;</div><div class='add'>+	int ret2;</div><div class='add'>+</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='add'>+	if (!em) {</div><div class='add'>+		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compressed extent for the file range [120K, 128K). */</div><div class='add'>+	em-&gt;start = SZ_1K * 120;</div><div class='add'>+	em-&gt;len = SZ_8K;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_8K;</div><div class='add'>+	em-&gt;flags |= EXTENT_FLAG_COMPRESS_ZLIB;</div><div class='add'>+	write_lock(&amp;em_tree-&gt;lock);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, em-&gt;start, em-&gt;len);</div><div class='add'>+	write_unlock(&amp;em_tree-&gt;lock);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		test_err("couldn't add extent map for range [120K, 128K)");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	em = btrfs_alloc_extent_map();</div><div class='add'>+	if (!em) {</div><div class='add'>+		test_std_err(TEST_ALLOC_EXTENT_MAP);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compressed extent for the file range [108K, 144K), which overlaps</div><div class='add'>+	 * with the [120K, 128K) we previously inserted.</div><div class='add'>+	 */</div><div class='add'>+	em-&gt;start = SZ_1K * 108;</div><div class='add'>+	em-&gt;len = SZ_1K * 36;</div><div class='add'>+	em-&gt;disk_num_bytes = SZ_4K;</div><div class='add'>+	em-&gt;ram_bytes = SZ_1K * 36;</div><div class='add'>+	em-&gt;flags |= EXTENT_FLAG_COMPRESS_ZLIB;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to add the extent map but with a search range of [140K, 144K),</div><div class='add'>+	 * this should succeed and adjust the extent map to the range</div><div class='add'>+	 * [128K, 144K), with a length of 16K and an offset of 20K.</div><div class='add'>+	 *</div><div class='add'>+	 * This simulates a scenario where in the subvolume tree of an inode we</div><div class='add'>+	 * have a compressed file extent item for the range [108K, 144K) and we</div><div class='add'>+	 * have an overlapping compressed extent map for the range [120K, 128K),</div><div class='add'>+	 * which was created by an encoded write, but its ordered extent was not</div><div class='add'>+	 * yet completed, so the subvolume tree doesn't have yet the file extent</div><div class='add'>+	 * item for that range - we only have the extent map in the inode's</div><div class='add'>+	 * extent map tree.</div><div class='add'>+	 */</div><div class='add'>+	write_lock(&amp;em_tree-&gt;lock);</div><div class='add'>+	ret = btrfs_add_extent_mapping(inode, &amp;em, SZ_1K * 140, SZ_4K);</div><div class='add'>+	write_unlock(&amp;em_tree-&gt;lock);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		test_err("couldn't add extent map for range [108K, 144K)");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (em-&gt;start != SZ_128K) {</div><div class='add'>+		test_err("unexpected extent map start %llu (should be 128K)", em-&gt;start);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (em-&gt;len != SZ_16K) {</div><div class='add'>+		test_err("unexpected extent map length %llu (should be 16K)", em-&gt;len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (em-&gt;offset != SZ_1K * 20) {</div><div class='add'>+		test_err("unexpected extent map offset %llu (should be 20K)", em-&gt;offset);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	ret2 = free_extent_map_tree(inode);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ret = ret2;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -881,7 +1013,7 @@ static int test_rmap_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			   struct rmap_test_vector *test)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_chunk_map *map;</div><div class='del'>-	u64 *logical = NULL;</div><div class='add'>+	u64 AUTO_KFREE(logical);</div><div class='ctx'> 	int i, out_ndaddrs, out_stripe_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -913,7 +1045,8 @@ static int test_rmap_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	ret = btrfs_add_chunk_map(fs_info, map);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("error adding chunk map to mapping tree");</div><div class='del'>-		goto out_free;</div><div class='add'>+		btrfs_free_chunk_map(map);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_rmap_block(fs_info, map-&gt;start, btrfs_sb_offset(1),</div><div class='hunk'>@@ -946,22 +1079,21 @@ static int test_rmap_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_remove_chunk_map(fs_info, map);</div><div class='del'>-out_free:</div><div class='del'>-	kfree(logical);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_test_extent_map(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = NULL;</div><div class='del'>-	struct extent_map_tree *em_tree;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct btrfs_root *root = NULL;</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> 	struct rmap_test_vector rmap_tests[] = {</div><div class='ctx'> 		{</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Test a chunk with 2 data stripes one of which</div><div class='ctx'> 			 * intersects the physical address of the super block</div><div class='del'>-			 * is correctly recognised.</div><div class='add'>+			 * is correctly recognized.</div><div class='ctx'> 			 */</div><div class='ctx'> 			.raid_type = BTRFS_BLOCK_GROUP_RAID1,</div><div class='ctx'> 			.physical_start = SZ_64M - SZ_4M,</div><div class='hunk'>@@ -1003,33 +1135,45 @@ int btrfs_test_extent_map(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	em_tree = kzalloc(sizeof(*em_tree), GFP_KERNEL);</div><div class='del'>-	if (!em_tree) {</div><div class='add'>+	inode = btrfs_new_test_inode();</div><div class='add'>+	if (!inode) {</div><div class='add'>+		test_std_err(TEST_ALLOC_INODE);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	extent_map_tree_init(em_tree);</div><div class='add'>+	root = btrfs_alloc_dummy_root(fs_info);</div><div class='add'>+	if (IS_ERR(root)) {</div><div class='add'>+		test_std_err(TEST_ALLOC_ROOT);</div><div class='add'>+		ret = PTR_ERR(root);</div><div class='add'>+		root = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BTRFS_I(inode)-&gt;root = root;</div><div class='ctx'> </div><div class='del'>-	ret = test_case_1(fs_info, em_tree);</div><div class='add'>+	ret = test_case_1(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = test_case_2(fs_info, em_tree);</div><div class='add'>+	ret = test_case_2(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = test_case_3(fs_info, em_tree);</div><div class='add'>+	ret = test_case_3(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = test_case_4(fs_info, em_tree);</div><div class='add'>+	ret = test_case_4(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = test_case_5(fs_info);</div><div class='add'>+	ret = test_case_5(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = test_case_6(fs_info, em_tree);</div><div class='add'>+	ret = test_case_6(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = test_case_7(fs_info);</div><div class='add'>+	ret = test_case_7(fs_info, BTRFS_I(inode));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = test_case_8(fs_info, BTRFS_I(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1041,7 +1185,8 @@ int btrfs_test_extent_map(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	kfree(em_tree);</div><div class='add'>+	iput(inode);</div><div class='add'>+	btrfs_free_dummy_root(root);</div><div class='ctx'> 	btrfs_free_dummy_fs_info(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c<br/>index b61972046feb..c8822edd32e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/free-space-tree-tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/free-space-tree-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/free-space-tree-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/free-space-tree-tests.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ static int __check_free_space_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(trans, cache, path, 0);</div><div class='add'>+	info = btrfs_search_free_space_info(trans, cache, path, 0);</div><div class='ctx'> 	if (IS_ERR(info)) {</div><div class='ctx'> 		test_err("could not find free space info");</div><div class='ctx'> 		ret = PTR_ERR(info);</div><div class='hunk'>@@ -57,7 +57,7 @@ static int __check_free_space_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				goto invalid;</div><div class='ctx'> 			offset = key.objectid;</div><div class='ctx'> 			while (offset &lt; key.objectid + key.offset) {</div><div class='del'>-				bit = free_space_test_bit(cache, path, offset);</div><div class='add'>+				bit = btrfs_free_space_test_bit(cache, path, offset);</div><div class='ctx'> 				if (prev_bit == 0 &amp;&amp; bit == 1) {</div><div class='ctx'> 					extent_start = offset;</div><div class='ctx'> 				} else if (prev_bit == 1 &amp;&amp; bit == 0) {</div><div class='hunk'>@@ -115,7 +115,7 @@ static int check_free_space_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	info = search_free_space_info(trans, cache, path, 0);</div><div class='add'>+	info = btrfs_search_free_space_info(trans, cache, path, 0);</div><div class='ctx'> 	if (IS_ERR(info)) {</div><div class='ctx'> 		test_err("could not find free space info");</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='hunk'>@@ -131,13 +131,13 @@ static int check_free_space_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* Flip it to the other format and check that for good measure. */</div><div class='ctx'> 	if (flags &amp; BTRFS_FREE_SPACE_USING_BITMAPS) {</div><div class='del'>-		ret = convert_free_space_to_extents(trans, cache, path);</div><div class='add'>+		ret = btrfs_convert_free_space_to_extents(trans, cache, path);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			test_err("could not convert to extents");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = convert_free_space_to_bitmaps(trans, cache, path);</div><div class='add'>+		ret = btrfs_convert_free_space_to_bitmaps(trans, cache, path);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			test_err("could not convert to bitmaps");</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -170,9 +170,8 @@ static int test_remove_all(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	const struct free_space_extent extents[] = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start,</div><div class='del'>-					    cache-&gt;length);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start, cache-&gt;length);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -193,8 +192,8 @@ static int test_remove_beginning(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start, alignment);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -216,7 +215,7 @@ static int test_remove_end(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='ctx'> 				    cache-&gt;start + cache-&gt;length - alignment,</div><div class='ctx'> 				    alignment);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -240,9 +239,9 @@ static int test_remove_middle(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start + alignment,</div><div class='del'>-					    alignment);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start + alignment,</div><div class='add'>+						  alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -263,23 +262,22 @@ static int test_merge_left(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start, cache-&gt;length);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start, cache-&gt;length);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path, cache-&gt;start,</div><div class='del'>-				       alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path, cache-&gt;start,</div><div class='add'>+					     alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + alignment,</div><div class='del'>-				       alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + alignment, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -300,24 +298,23 @@ static int test_merge_right(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start, cache-&gt;length);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start, cache-&gt;length);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + 2 * alignment,</div><div class='del'>-				       alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + 2 * alignment,</div><div class='add'>+					     alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + alignment,</div><div class='del'>-				       alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + alignment, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -338,29 +335,29 @@ static int test_merge_both(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start, cache-&gt;length);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start, cache-&gt;length);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path, cache-&gt;start,</div><div class='del'>-				       alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path, cache-&gt;start,</div><div class='add'>+					     alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + 2 * alignment, alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + 2 * alignment, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + alignment, alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + alignment, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -383,29 +380,29 @@ static int test_merge_none(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __remove_from_free_space_tree(trans, cache, path,</div><div class='del'>-					    cache-&gt;start, cache-&gt;length);</div><div class='add'>+	ret = __btrfs_remove_from_free_space_tree(trans, cache, path,</div><div class='add'>+						  cache-&gt;start, cache-&gt;length);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path, cache-&gt;start,</div><div class='del'>-				       alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path, cache-&gt;start,</div><div class='add'>+					     alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + 4 * alignment, alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + 4 * alignment, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __add_to_free_space_tree(trans, cache, path,</div><div class='del'>-				       cache-&gt;start + 2 * alignment, alignment);</div><div class='add'>+	ret = __btrfs_add_to_free_space_tree(trans, cache, path,</div><div class='add'>+					     cache-&gt;start + 2 * alignment, alignment);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add free space");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -483,14 +480,14 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = add_block_group_free_space(&amp;trans, cache);</div><div class='add'>+	ret = btrfs_add_block_group_free_space(&amp;trans, cache);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not add block group free space");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bitmaps) {</div><div class='del'>-		ret = convert_free_space_to_bitmaps(&amp;trans, cache, path);</div><div class='add'>+		ret = btrfs_convert_free_space_to_bitmaps(&amp;trans, cache, path);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			test_err("could not convert block group to bitmaps");</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -501,7 +498,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = remove_block_group_free_space(&amp;trans, cache);</div><div class='add'>+	ret = btrfs_remove_block_group_free_space(&amp;trans, cache);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("could not remove block group free space");</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c<br/>index 9957de9f7806..a4c2b7748b95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/inode-tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/inode-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/inode-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/inode-tests.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static void setup_file_extents(struct btrfs_root *root, u32 sectorsize)</div><div class='ctx'> </div><div class='ctx'> 	/* Now for a regular extent */</div><div class='ctx'> 	insert_extent(root, offset, sectorsize - 1, sectorsize - 1, 0,</div><div class='del'>-		      disk_bytenr, sectorsize, BTRFS_FILE_EXTENT_REG, 0, slot);</div><div class='add'>+		      disk_bytenr, sectorsize - 1, BTRFS_FILE_EXTENT_REG, 0, slot);</div><div class='ctx'> 	slot++;</div><div class='ctx'> 	disk_bytenr += sectorsize;</div><div class='ctx'> 	offset += sectorsize - 1;</div><div class='hunk'>@@ -258,17 +258,17 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> </div><div class='ctx'> 	/* First with no extents */</div><div class='ctx'> 	BTRFS_I(inode)-&gt;root = root;</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		em = NULL;</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != EXTENT_MAP_HOLE) {</div><div class='del'>-		test_err("expected a hole, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr != EXTENT_MAP_HOLE) {</div><div class='add'>+		test_err("expected a hole, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	btrfs_drop_extent_map_range(BTRFS_I(inode), 0, (u64)-1, false);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -278,13 +278,13 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	 */</div><div class='ctx'> 	setup_file_extents(root, sectorsize);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, (u64)-1);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, (u64)-1);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != EXTENT_MAP_INLINE) {</div><div class='del'>-		test_err("expected an inline, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr != EXTENT_MAP_INLINE) {</div><div class='add'>+		test_err("expected an inline, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -314,15 +314,15 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	 * this?</div><div class='ctx'> 	 */</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != EXTENT_MAP_HOLE) {</div><div class='del'>-		test_err("expected a hole, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr != EXTENT_MAP_HOLE) {</div><div class='add'>+		test_err("expected a hole, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != 4) {</div><div class='hunk'>@@ -336,16 +336,16 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Regular extent */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize - 1) {</div><div class='hunk'>@@ -358,22 +358,21 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* The next 3 are split extents */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -386,23 +385,22 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	disk_bytenr = em-&gt;block_start;</div><div class='add'>+	disk_bytenr = btrfs_extent_map_block_start(em);</div><div class='ctx'> 	orig_start = em-&gt;start;</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != EXTENT_MAP_HOLE) {</div><div class='del'>-		test_err("expected a hole, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr != EXTENT_MAP_HOLE) {</div><div class='add'>+		test_err("expected a hole, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -416,15 +414,15 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != 2 * sectorsize) {</div><div class='hunk'>@@ -437,28 +435,28 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != orig_start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu",</div><div class='del'>-			 orig_start, em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;start - em-&gt;offset != orig_start) {</div><div class='add'>+		test_err("wrong offset, em-&gt;start=%llu em-&gt;offset=%llu orig_start=%llu",</div><div class='add'>+			 em-&gt;start, em-&gt;offset, orig_start);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	disk_bytenr += (em-&gt;start - orig_start);</div><div class='del'>-	if (em-&gt;block_start != disk_bytenr) {</div><div class='add'>+	if (btrfs_extent_map_block_start(em) != disk_bytenr) {</div><div class='ctx'> 		test_err("wrong block start, want %llu, have %llu",</div><div class='del'>-			 disk_bytenr, em-&gt;block_start);</div><div class='add'>+			 disk_bytenr, btrfs_extent_map_block_start(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Prealloc extent */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -472,22 +470,21 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 prealloc_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* The next 3 are a half written prealloc extent */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -501,23 +498,22 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 prealloc_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	disk_bytenr = em-&gt;block_start;</div><div class='add'>+	disk_bytenr = btrfs_extent_map_block_start(em);</div><div class='ctx'> 	orig_start = em-&gt;start;</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_HOLE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_HOLE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -530,27 +526,26 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != orig_start) {</div><div class='del'>-		test_err("unexpected orig offset, wanted %llu, have %llu",</div><div class='del'>-			 orig_start, em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;start - em-&gt;offset != orig_start) {</div><div class='add'>+		test_err("unexpected offset, wanted %llu, have %llu",</div><div class='add'>+			 em-&gt;start - orig_start, em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != (disk_bytenr + (em-&gt;start - em-&gt;orig_start))) {</div><div class='add'>+	if (btrfs_extent_map_block_start(em) != disk_bytenr + em-&gt;offset) {</div><div class='ctx'> 		test_err("unexpected block start, wanted %llu, have %llu",</div><div class='del'>-			 disk_bytenr + (em-&gt;start - em-&gt;orig_start),</div><div class='del'>-			 em-&gt;block_start);</div><div class='add'>+			 disk_bytenr + em-&gt;offset, btrfs_extent_map_block_start(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != 2 * sectorsize) {</div><div class='hunk'>@@ -564,28 +559,27 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 prealloc_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != orig_start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", orig_start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;start - em-&gt;offset != orig_start) {</div><div class='add'>+		test_err("wrong offset, em-&gt;start=%llu em-&gt;offset=%llu orig_start=%llu",</div><div class='add'>+			 em-&gt;start, em-&gt;offset, orig_start);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != (disk_bytenr + (em-&gt;start - em-&gt;orig_start))) {</div><div class='add'>+	if (btrfs_extent_map_block_start(em) != disk_bytenr + em-&gt;offset) {</div><div class='ctx'> 		test_err("unexpected block start, wanted %llu, have %llu",</div><div class='del'>-			 disk_bytenr + (em-&gt;start - em-&gt;orig_start),</div><div class='del'>-			 em-&gt;block_start);</div><div class='add'>+			 disk_bytenr + em-&gt;offset, btrfs_extent_map_block_start(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Now for the compressed extent */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != 2 * sectorsize) {</div><div class='hunk'>@@ -599,27 +593,26 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 compressed_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu",</div><div class='del'>-			 em-&gt;start, em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (extent_map_compression(em) != BTRFS_COMPRESS_ZLIB) {</div><div class='add'>+	if (btrfs_extent_map_compression(em) != BTRFS_COMPRESS_ZLIB) {</div><div class='ctx'> 		test_err("unexpected compress type, wanted %d, got %d",</div><div class='del'>-			 BTRFS_COMPRESS_ZLIB, extent_map_compression(em));</div><div class='add'>+			 BTRFS_COMPRESS_ZLIB, btrfs_extent_map_compression(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* Split compressed extent */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -633,28 +626,27 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 compressed_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu",</div><div class='del'>-			 em-&gt;start, em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (extent_map_compression(em) != BTRFS_COMPRESS_ZLIB) {</div><div class='add'>+	if (btrfs_extent_map_compression(em) != BTRFS_COMPRESS_ZLIB) {</div><div class='ctx'> 		test_err("unexpected compress type, wanted %d, got %d",</div><div class='del'>-			 BTRFS_COMPRESS_ZLIB, extent_map_compression(em));</div><div class='add'>+			 BTRFS_COMPRESS_ZLIB, btrfs_extent_map_compression(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	disk_bytenr = em-&gt;block_start;</div><div class='add'>+	disk_bytenr = btrfs_extent_map_block_start(em);</div><div class='ctx'> 	orig_start = em-&gt;start;</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -667,22 +659,21 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != disk_bytenr) {</div><div class='add'>+	if (btrfs_extent_map_block_start(em) != disk_bytenr) {</div><div class='ctx'> 		test_err("block start does not match, want %llu got %llu",</div><div class='del'>-			 disk_bytenr, em-&gt;block_start);</div><div class='add'>+			 disk_bytenr, btrfs_extent_map_block_start(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != 2 * sectorsize) {</div><div class='hunk'>@@ -696,27 +687,27 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 compressed_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != orig_start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu",</div><div class='del'>-			 em-&gt;start, orig_start);</div><div class='add'>+	if (em-&gt;start - em-&gt;offset != orig_start) {</div><div class='add'>+		test_err("wrong offset, em-&gt;start=%llu em-&gt;offset=%llu orig_start=%llu",</div><div class='add'>+			 em-&gt;start, em-&gt;offset, orig_start);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (extent_map_compression(em) != BTRFS_COMPRESS_ZLIB) {</div><div class='add'>+	if (btrfs_extent_map_compression(em) != BTRFS_COMPRESS_ZLIB) {</div><div class='ctx'> 		test_err("unexpected compress type, wanted %d, got %d",</div><div class='del'>-			 BTRFS_COMPRESS_ZLIB, extent_map_compression(em));</div><div class='add'>+			 BTRFS_COMPRESS_ZLIB, btrfs_extent_map_compression(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='ctx'> 	/* A hole between regular extents but no hole extent */</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset + 6, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset + 6, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -729,21 +720,20 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, SZ_4M);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, SZ_4M);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != EXTENT_MAP_HOLE) {</div><div class='del'>-		test_err("expected a hole extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr != EXTENT_MAP_HOLE) {</div><div class='add'>+		test_err("expected a hole extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -762,21 +752,20 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 vacancy_only, em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	offset = em-&gt;start + em-&gt;len;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, offset, sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr &gt;= EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		test_err("expected a real extent, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != offset || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -789,15 +778,14 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 		test_err("unexpected flags set, want 0 have %u", em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;orig_start != em-&gt;start) {</div><div class='del'>-		test_err("wrong orig offset, want %llu, have %llu", em-&gt;start,</div><div class='del'>-			 em-&gt;orig_start);</div><div class='add'>+	if (em-&gt;offset != 0) {</div><div class='add'>+		test_err("wrong orig offset, want 0, have %llu", em-&gt;offset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	if (!IS_ERR(em))</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> 	btrfs_free_dummy_root(root);</div><div class='ctx'> 	btrfs_free_dummy_fs_info(fs_info);</div><div class='hunk'>@@ -850,13 +838,13 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	insert_inode_item_key(root);</div><div class='ctx'> 	insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize,</div><div class='ctx'> 		      sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1);</div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, 2 * sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 2 * sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != EXTENT_MAP_HOLE) {</div><div class='del'>-		test_err("expected a hole, got %llu", em-&gt;block_start);</div><div class='add'>+	if (em-&gt;disk_bytenr != EXTENT_MAP_HOLE) {</div><div class='add'>+		test_err("expected a hole, got %llu", em-&gt;disk_bytenr);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != 0 || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -870,15 +858,16 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 			 em-&gt;flags);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> </div><div class='del'>-	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize, 2 * sectorsize);</div><div class='add'>+	em = btrfs_get_extent(BTRFS_I(inode), NULL, sectorsize, 2 * sectorsize);</div><div class='ctx'> 	if (IS_ERR(em)) {</div><div class='ctx'> 		test_err("got an error when we shouldn't have");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (em-&gt;block_start != sectorsize) {</div><div class='del'>-		test_err("expected a real extent, got %llu", em-&gt;block_start);</div><div class='add'>+	if (btrfs_extent_map_block_start(em) != sectorsize) {</div><div class='add'>+		test_err("expected a real extent, got %llu",</div><div class='add'>+			 btrfs_extent_map_block_start(em));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (em-&gt;start != sectorsize || em-&gt;len != sectorsize) {</div><div class='hunk'>@@ -895,7 +884,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	if (!IS_ERR(em))</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> 	btrfs_free_dummy_root(root);</div><div class='ctx'> 	btrfs_free_dummy_fs_info(fs_info);</div><div class='hunk'>@@ -961,11 +950,10 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [BTRFS_MAX_EXTENT_SIZE/2][sectorsize HOLE][the rest] */</div><div class='del'>-	ret = clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-			       BTRFS_MAX_EXTENT_SIZE &gt;&gt; 1,</div><div class='del'>-			       (BTRFS_MAX_EXTENT_SIZE &gt;&gt; 1) + sectorsize - 1,</div><div class='del'>-			       EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='del'>-			       EXTENT_UPTODATE, NULL);</div><div class='add'>+	ret = btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='add'>+				     BTRFS_MAX_EXTENT_SIZE &gt;&gt; 1,</div><div class='add'>+				     (BTRFS_MAX_EXTENT_SIZE &gt;&gt; 1) + sectorsize - 1,</div><div class='add'>+				     EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("clear_extent_bit returned %d", ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1029,11 +1017,10 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* [BTRFS_MAX_EXTENT_SIZE+4k][4K HOLE][BTRFS_MAX_EXTENT_SIZE+4k] */</div><div class='del'>-	ret = clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='del'>-			       BTRFS_MAX_EXTENT_SIZE + sectorsize,</div><div class='del'>-			       BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1,</div><div class='del'>-			       EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='del'>-			       EXTENT_UPTODATE, NULL);</div><div class='add'>+	ret = btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree,</div><div class='add'>+				     BTRFS_MAX_EXTENT_SIZE + sectorsize,</div><div class='add'>+				     BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1,</div><div class='add'>+				     EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("clear_extent_bit returned %d", ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1064,9 +1051,8 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Empty */</div><div class='del'>-	ret = clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, (u64)-1,</div><div class='del'>-			       EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='del'>-			       EXTENT_UPTODATE, NULL);</div><div class='add'>+	ret = btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, (u64)-1,</div><div class='add'>+				     EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("clear_extent_bit returned %d", ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1080,9 +1066,8 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, (u64)-1,</div><div class='del'>-				 EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |</div><div class='del'>-				 EXTENT_UPTODATE, NULL);</div><div class='add'>+		btrfs_clear_extent_bit(&amp;BTRFS_I(inode)-&gt;io_tree, 0, (u64)-1,</div><div class='add'>+				       EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> 	btrfs_free_dummy_root(root);</div><div class='ctx'> 	btrfs_free_dummy_fs_info(fs_info);</div><div class='head'>diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c<br/>index 3fc8dc3fd980..05cfda8af422 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/qgroup-tests.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tests/qgroup-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/qgroup-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/qgroup-tests.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@ static int insert_normal_tree_ref(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> 	struct btrfs_extent_item *item;</div><div class='ctx'> 	struct btrfs_extent_inline_ref *iref;</div><div class='ctx'> 	struct btrfs_tree_block_info *block_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key ins;</div><div class='ctx'> 	u32 size = sizeof(*item) + sizeof(*iref) + sizeof(*block_info);</div><div class='hunk'>@@ -41,7 +41,6 @@ static int insert_normal_tree_ref(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> 	ret = btrfs_insert_empty_item(&amp;trans, root, path, &amp;ins, size);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("couldn't insert ref %d", ret);</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +60,6 @@ static int insert_normal_tree_ref(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> 		btrfs_set_extent_inline_ref_type(leaf, iref, BTRFS_TREE_BLOCK_REF_KEY);</div><div class='ctx'> 		btrfs_set_extent_inline_ref_offset(leaf, iref, root_objectid);</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +68,7 @@ static int add_tree_ref(struct btrfs_root *root, u64 bytenr, u64 num_bytes,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_trans_handle trans;</div><div class='ctx'> 	struct btrfs_extent_item *item;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 refs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -90,7 +88,6 @@ static int add_tree_ref(struct btrfs_root *root, u64 bytenr, u64 num_bytes,</div><div class='ctx'> 	ret = btrfs_search_slot(&amp;trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("couldn't find extent ref");</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +109,6 @@ static int add_tree_ref(struct btrfs_root *root, u64 bytenr, u64 num_bytes,</div><div class='ctx'> 	ret = btrfs_insert_empty_item(&amp;trans, root, path, &amp;key, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		test_err("failed to insert backref");</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -121,7 +117,7 @@ static int remove_extent_item(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_trans_handle trans;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_init_dummy_trans(&amp;trans, NULL);</div><div class='hunk'>@@ -139,11 +135,9 @@ static int remove_extent_item(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> 	ret = btrfs_search_slot(&amp;trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("didn't find our key %d", ret);</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_del_item(&amp;trans, root, path);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +146,7 @@ static int remove_extent_ref(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_trans_handle trans;</div><div class='ctx'> 	struct btrfs_extent_item *item;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 refs;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -172,7 +166,6 @@ static int remove_extent_ref(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> 	ret = btrfs_search_slot(&amp;trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		test_err("couldn't find extent ref");</div><div class='del'>-		btrfs_free_path(path);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +191,6 @@ static int remove_extent_ref(struct btrfs_root *root, u64 bytenr,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_del_item(&amp;trans, root, path);</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/tests/raid-stripe-tree-tests.c b/fs/btrfs/tests/raid-stripe-tree-tests.c<br/>new file mode 100644<br/>index 000000000000..a7bc58a5c1e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tests/raid-stripe-tree-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tests/raid-stripe-tree-tests.c</a></div><div class='hunk'>@@ -0,0 +1,1161 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Western Digital Corporation or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include "../fs.h"</div><div class='add'>+#include "../disk-io.h"</div><div class='add'>+#include "../transaction.h"</div><div class='add'>+#include "../volumes.h"</div><div class='add'>+#include "../raid-stripe-tree.h"</div><div class='add'>+#include "btrfs-tests.h"</div><div class='add'>+</div><div class='add'>+#define RST_TEST_NUM_DEVICES	(2)</div><div class='add'>+#define RST_TEST_RAID1_TYPE	(BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_RAID1)</div><div class='add'>+</div><div class='add'>+#define SZ_48K (SZ_32K + SZ_16K)</div><div class='add'>+</div><div class='add'>+typedef int (*test_func_t)(struct btrfs_trans_handle *trans);</div><div class='add'>+</div><div class='add'>+static struct btrfs_device *btrfs_device_by_devid(struct btrfs_fs_devices *fs_devices,</div><div class='add'>+						  u64 devid)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_device *dev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;fs_devices-&gt;devices, dev_list) {</div><div class='add'>+		if (dev-&gt;devid == devid)</div><div class='add'>+			return dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test creating a range of three extents and then punch a hole in the middle,</div><div class='add'>+ * deleting all of the middle extents and partially deleting the "book ends".</div><div class='add'>+ */</div><div class='add'>+static int test_punch_hole_3extents(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical1 = SZ_1M;</div><div class='add'>+	u64 len1 = SZ_1M;</div><div class='add'>+	u64 logical2 = logical1 + len1;</div><div class='add'>+	u64 len2 = SZ_1M;</div><div class='add'>+	u64 logical3 = logical2 + len2;</div><div class='add'>+	u64 len3 = SZ_1M;</div><div class='add'>+	u64 hole_start = logical1 + SZ_256K;</div><div class='add'>+	u64 hole_len = SZ_2M;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical1, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+</div><div class='add'>+	/* Prepare for the test, 1st create 3 x 1M extents. */</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len1;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical1 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bioc-&gt;logical = logical2;</div><div class='add'>+	bioc-&gt;size = len2;</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical2 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bioc-&gt;logical = logical3;</div><div class='add'>+	bioc-&gt;size = len3;</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical3 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Delete a range starting at logical1 + 256K and 2M in length. Extent</div><div class='add'>+	 * 1 is truncated to 256k length, extent 2 is completely dropped and</div><div class='add'>+	 * extent 3 is moved 256K to the right.</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, hole_start, hole_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 hole_start, hole_start + hole_len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the first extent and check its size. */</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical1, &amp;len1, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical1, logical1 + len1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical1) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical1, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len1 != SZ_256K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_256K, len1);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the second extent and check it's absent. */</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical2, &amp;len2, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] succeeded should fail",</div><div class='add'>+			 logical2, logical2 + len2);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the third extent and check its size. */</div><div class='add'>+	logical3 += SZ_256K;</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical3, &amp;len3, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical3, logical3 + len3);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical3) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical3 + SZ_256K, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len3 != SZ_1M - SZ_256K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_1M - SZ_256K, len3);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical1, len1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical1, logical1 + len1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical3, len3);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical1, logical1 + len1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_delete_two_extents(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical1 = SZ_1M;</div><div class='add'>+	u64 len1 = SZ_1M;</div><div class='add'>+	u64 logical2 = logical1 + len1;</div><div class='add'>+	u64 len2 = SZ_1M;</div><div class='add'>+	u64 logical3 = logical2 + len2;</div><div class='add'>+	u64 len3 = SZ_1M;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical1, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+</div><div class='add'>+	/* Prepare for the test, 1st create 3 x 1M extents. */</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len1;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical1 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bioc-&gt;logical = logical2;</div><div class='add'>+	bioc-&gt;size = len2;</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical2 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bioc-&gt;logical = logical3;</div><div class='add'>+	bioc-&gt;size = len3;</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical3 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Delete a range starting at logical1 and 2M in length. Extents 1</div><div class='add'>+	 * and 2 are dropped and extent 3 is kept as is.</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical1, len1 + len2);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical1, logical1 + len1 + len2);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical1, &amp;len1, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] succeeded, should fail",</div><div class='add'>+			 logical1, len1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical2, &amp;len2, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] succeeded, should fail",</div><div class='add'>+			 logical2, len2);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical3, &amp;len3, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical3, len3);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical3) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical3, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len3 != SZ_1M) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_1M, len3);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical3, len3);</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test punching a hole into a single RAID stripe-extent. */</div><div class='add'>+static int test_punch_hole(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical1 = SZ_1M;</div><div class='add'>+	u64 hole_start = logical1 + SZ_32K;</div><div class='add'>+	u64 hole_len = SZ_64K;</div><div class='add'>+	u64 logical2 = hole_start + hole_len;</div><div class='add'>+	u64 len = SZ_1M;</div><div class='add'>+	u64 len1 = SZ_32K;</div><div class='add'>+	u64 len2 = len - len1 - hole_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical1, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical1 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical1, &amp;len, map_type, 0,</div><div class='add'>+					   &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical1,</div><div class='add'>+			 logical1 + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical1) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical1, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_1M) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_1M, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, hole_start, hole_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 hole_start, hole_start + hole_len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical1, &amp;len1, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical1, logical1 + len1);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical1) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical1, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len1 != SZ_32K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_32K, len1);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical2, &amp;len2, map_type,</div><div class='add'>+					   0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical2,</div><div class='add'>+			 logical2 + len2);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical2) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical2, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len2 != len - len1 - hole_len) {</div><div class='add'>+		test_err("invalid length, expected %llu, got %llu",</div><div class='add'>+			 len - len1 - hole_len, len2);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for the absence of the hole. */</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, hole_start, &amp;hole_len,</div><div class='add'>+					   map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] succeeded, should fail",</div><div class='add'>+			 hole_start, hole_start + SZ_64K);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical1, len1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical2, len2);</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test a 1M RST write that spans two adjacent RST items on disk and then</div><div class='add'>+ * delete a portion starting in the first item and spanning into the second</div><div class='add'>+ * item. This is similar to test_front_delete(), but spanning multiple items.</div><div class='add'>+ */</div><div class='add'>+static int test_front_delete_prev_item(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical1 = SZ_1M;</div><div class='add'>+	u64 logical2 = SZ_2M;</div><div class='add'>+	u64 len = SZ_1M;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical1, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len;</div><div class='add'>+</div><div class='add'>+	/* Insert RAID extent 1. */</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical1 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bioc-&gt;logical = logical2;</div><div class='add'>+	/* Insert RAID extent 2, directly adjacent to it. */</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical2 + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical1 + SZ_512K, SZ_1M);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical1 + SZ_512K, (u64)SZ_1M);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify item 1 is truncated to 512K. */</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical1, &amp;len, map_type, 0,</div><div class='add'>+					   &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical1,</div><div class='add'>+			 logical1 + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical1) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical1, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_512K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_512K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify item 2's start is moved by 512K. */</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical2 + SZ_512K, &amp;len,</div><div class='add'>+					   map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical2 + SZ_512K, logical2 + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical2 + SZ_512K) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical2 + SZ_512K, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_512K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_512K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify there's a hole at [1M+512K, 2M+512K] . */</div><div class='add'>+	len = SZ_1M;</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical1 + SZ_512K, &amp;len,</div><div class='add'>+					   map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		test_err("lookup of RAID [%llu, %llu] succeeded, should fail",</div><div class='add'>+			 logical1 + SZ_512K, logical1 + SZ_512K + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clean up after us. */</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical1, SZ_512K);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical2 + SZ_512K, SZ_512K);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test a 64K RST write on a 2 disk RAID1 at a logical address of 1M and then</div><div class='add'>+ * delete the 1st 32K, making the new start address 1M+32K.</div><div class='add'>+ */</div><div class='add'>+static int test_front_delete(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical = SZ_1M;</div><div class='add'>+	u64 len = SZ_64K;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_64K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_64K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical, SZ_16K);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + SZ_16K);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len -= SZ_16K;</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical + SZ_16K, &amp;len,</div><div class='add'>+					   map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical + SZ_16K, logical + SZ_64K);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical + SZ_16K) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical + SZ_16K, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_48K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_48K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] succeeded, should fail",</div><div class='add'>+			 logical, logical + SZ_16K);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical + SZ_16K, SZ_48K);</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test a 64K RST write on a 2 disk RAID1 at a logical address of 1M and then</div><div class='add'>+ * truncate the stripe extent down to 32K.</div><div class='add'>+ */</div><div class='add'>+static int test_tail_delete(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical = SZ_1M;</div><div class='add'>+	u64 len = SZ_64K;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	if (!io_stripe.dev) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_64K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_64K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical + SZ_48K, SZ_16K);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed",</div><div class='add'>+			 logical + SZ_48K, logical + SZ_64K);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = SZ_48K;</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_48K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_48K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = SZ_16K;</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical + SZ_48K, &amp;len,</div><div class='add'>+					   map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret != -ENODATA) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] succeeded should fail",</div><div class='add'>+			 logical + SZ_48K, logical + SZ_64K);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test a 64K RST write on a 2 disk RAID1 at a logical address of 1M and then</div><div class='add'>+ * overwrite the whole range giving it new physical address at an offset of 1G.</div><div class='add'>+ * The intent of this test is to exercise the 'update_raid_extent_item()'</div><div class='add'>+ * function called be btrfs_insert_one_raid_extent().</div><div class='add'>+ */</div><div class='add'>+static int test_create_update_delete(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical = SZ_1M;</div><div class='add'>+	u64 len = SZ_64K;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = len;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	if (!io_stripe.dev) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_64K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_64K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = SZ_1G + logical + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("updating RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical + SZ_1G) {</div><div class='add'>+		test_err("invalid physical address, expected %llu, got %llu",</div><div class='add'>+			 logical + SZ_1G, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_64K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu, got %llu",</div><div class='add'>+			 (u64)SZ_64K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test a simple 64K RST write on a 2 disk RAID1 at a logical address of 1M.</div><div class='add'>+ * The "physical" copy on device 0 is at 1M, on device 1 it is at 1G+1M.</div><div class='add'>+ */</div><div class='add'>+static int test_simple_create_delete(struct btrfs_trans_handle *trans)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='add'>+	struct btrfs_io_context *bioc;</div><div class='add'>+	struct btrfs_io_stripe io_stripe = { 0 };</div><div class='add'>+	u64 map_type = RST_TEST_RAID1_TYPE;</div><div class='add'>+	u64 logical = SZ_1M;</div><div class='add'>+	u64 len = SZ_64K;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bioc = alloc_btrfs_io_context(fs_info, logical, RST_TEST_NUM_DEVICES);</div><div class='add'>+	if (!bioc) {</div><div class='add'>+		test_std_err(TEST_ALLOC_IO_CONTEXT);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bioc-&gt;map_type = map_type;</div><div class='add'>+	bioc-&gt;size = SZ_64K;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_io_stripe *stripe = &amp;bioc-&gt;stripes[i];</div><div class='add'>+</div><div class='add'>+		stripe-&gt;dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, i);</div><div class='add'>+		if (!stripe-&gt;dev) {</div><div class='add'>+			test_err("cannot find device with devid %d", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stripe-&gt;physical = logical + i * SZ_1G;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_one_raid_extent(trans, bioc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		test_err("inserting RAID extent failed: %d", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_stripe.dev = btrfs_device_by_devid(fs_info-&gt;fs_devices, 0);</div><div class='add'>+	if (!io_stripe.dev) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_get_raid_extent_offset(fs_info, logical, &amp;len, map_type, 0, &amp;io_stripe);</div><div class='add'>+	if (ret)  {</div><div class='add'>+		test_err("lookup of RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (io_stripe.physical != logical) {</div><div class='add'>+		test_err("invalid physical address, expected %llu got %llu",</div><div class='add'>+			 logical, io_stripe.physical);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != SZ_64K) {</div><div class='add'>+		test_err("invalid stripe length, expected %llu got %llu",</div><div class='add'>+			 (u64)SZ_64K, len);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = btrfs_delete_raid_extent(trans, logical, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		test_err("deleting RAID extent [%llu, %llu] failed", logical,</div><div class='add'>+			 logical + len);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_put_bioc(bioc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const test_func_t tests[] = {</div><div class='add'>+	test_simple_create_delete,</div><div class='add'>+	test_create_update_delete,</div><div class='add'>+	test_tail_delete,</div><div class='add'>+	test_front_delete,</div><div class='add'>+	test_front_delete_prev_item,</div><div class='add'>+	test_punch_hole,</div><div class='add'>+	test_punch_hole_3extents,</div><div class='add'>+	test_delete_two_extents,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int run_test(test_func_t test, u32 sectorsize, u32 nodesize)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_trans_handle trans;</div><div class='add'>+	struct btrfs_fs_info *fs_info;</div><div class='add'>+	struct btrfs_root *root = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	fs_info = btrfs_alloc_dummy_fs_info(sectorsize, nodesize);</div><div class='add'>+	if (!fs_info) {</div><div class='add'>+		test_std_err(TEST_ALLOC_FS_INFO);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	root = btrfs_alloc_dummy_root(fs_info);</div><div class='add'>+	if (IS_ERR(root)) {</div><div class='add'>+		test_std_err(TEST_ALLOC_ROOT);</div><div class='add'>+		ret = PTR_ERR(root);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	btrfs_set_super_incompat_flags(root-&gt;fs_info-&gt;super_copy,</div><div class='add'>+				       BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE);</div><div class='add'>+	root-&gt;root_key.objectid = BTRFS_RAID_STRIPE_TREE_OBJECTID;</div><div class='add'>+	root-&gt;root_key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+	root-&gt;root_key.offset = 0;</div><div class='add'>+	fs_info-&gt;stripe_root = root;</div><div class='add'>+	root-&gt;fs_info-&gt;tree_root = root;</div><div class='add'>+</div><div class='add'>+	root-&gt;node = alloc_test_extent_buffer(root-&gt;fs_info, nodesize);</div><div class='add'>+	if (IS_ERR(root-&gt;node)) {</div><div class='add'>+		test_std_err(TEST_ALLOC_EXTENT_BUFFER);</div><div class='add'>+		ret = PTR_ERR(root-&gt;node);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	btrfs_set_header_level(root-&gt;node, 0);</div><div class='add'>+	btrfs_set_header_nritems(root-&gt;node, 0);</div><div class='add'>+	root-&gt;alloc_bytenr += 2 * nodesize;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; RST_TEST_NUM_DEVICES; i++) {</div><div class='add'>+		struct btrfs_device *dev;</div><div class='add'>+</div><div class='add'>+		dev = btrfs_alloc_dummy_device(fs_info);</div><div class='add'>+		if (IS_ERR(dev)) {</div><div class='add'>+			test_err("cannot allocate device");</div><div class='add'>+			ret = PTR_ERR(dev);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		dev-&gt;devid = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_init_dummy_trans(&amp;trans, root-&gt;fs_info);</div><div class='add'>+	ret = test(&amp;trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	btrfs_free_dummy_root(root);</div><div class='add'>+	btrfs_free_dummy_fs_info(fs_info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_test_raid_stripe_tree(u32 sectorsize, u32 nodesize)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	test_msg("running raid-stripe-tree tests");</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(tests); i++) {</div><div class='add'>+		ret = run_test(tests[i], sectorsize, nodesize);</div><div class='add'>+		if (ret) {</div><div class='add'>+			test_err("test-case %ps failed with %d\n", tests[i], ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c<br/>index 5b3333ceef04..05ee4391c83a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/transaction.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/transaction.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/transaction.c</a></div><div class='hunk'>@@ -23,17 +23,17 @@</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "block-group.h"</div><div class='ctx'> #include "space-info.h"</div><div class='del'>-#include "zoned.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "extent-tree.h"</div><div class='ctx'> #include "root-tree.h"</div><div class='del'>-#include "defrag.h"</div><div class='ctx'> #include "dir-item.h"</div><div class='ctx'> #include "uuid-tree.h"</div><div class='ctx'> #include "ioctl.h"</div><div class='ctx'> #include "relocation.h"</div><div class='ctx'> #include "scrub.h"</div><div class='add'>+#include "ordered-data.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *btrfs_trans_handle_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +105,7 @@ static struct kmem_cache *btrfs_trans_handle_cachep;</div><div class='ctx'>  * | attached to transid N+1.			    |</div><div class='ctx'>  * |						    |</div><div class='ctx'>  * | To next stage:				    |</div><div class='del'>- * |  Until all tree blocks are super blocks are    |</div><div class='add'>+ * |  Until all tree blocks and super blocks are    |</div><div class='ctx'>  * |  written to block devices			    |</div><div class='ctx'>  * V						    |</div><div class='ctx'>  * Transaction N [[TRANS_STATE_COMPLETED]]	    V</div><div class='hunk'>@@ -140,13 +140,10 @@ static const unsigned int btrfs_blocked_trans_types[TRANS_STATE_MAX] = {</div><div class='ctx'> </div><div class='ctx'> void btrfs_put_transaction(struct btrfs_transaction *transaction)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(refcount_read(&amp;transaction-&gt;use_count) == 0);</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;transaction-&gt;use_count)) {</div><div class='ctx'> 		BUG_ON(!list_empty(&amp;transaction-&gt;list));</div><div class='del'>-		WARN_ON(!RB_EMPTY_ROOT(</div><div class='del'>-				&amp;transaction-&gt;delayed_refs.href_root.rb_root));</div><div class='del'>-		WARN_ON(!RB_EMPTY_ROOT(</div><div class='del'>-				&amp;transaction-&gt;delayed_refs.dirty_extent_root));</div><div class='add'>+		WARN_ON(!xa_empty(&amp;transaction-&gt;delayed_refs.head_refs));</div><div class='add'>+		WARN_ON(!xa_empty(&amp;transaction-&gt;delayed_refs.dirty_extents));</div><div class='ctx'> 		if (transaction-&gt;delayed_refs.pending_csums)</div><div class='ctx'> 			btrfs_err(transaction-&gt;fs_info,</div><div class='ctx'> 				  "pending csums is %llu",</div><div class='hunk'>@@ -164,7 +161,13 @@ void btrfs_put_transaction(struct btrfs_transaction *transaction)</div><div class='ctx'> 			cache = list_first_entry(&amp;transaction-&gt;deleted_bgs,</div><div class='ctx'> 						 struct btrfs_block_group,</div><div class='ctx'> 						 bg_list);</div><div class='add'>+			/*</div><div class='add'>+			 * Not strictly necessary to lock, as no other task will be using a</div><div class='add'>+			 * block_group on the deleted_bgs list during a transaction abort.</div><div class='add'>+			 */</div><div class='add'>+			spin_lock(&amp;transaction-&gt;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 			list_del_init(&amp;cache-&gt;bg_list);</div><div class='add'>+			spin_unlock(&amp;transaction-&gt;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'> 			btrfs_unfreeze_block_group(cache);</div><div class='ctx'> 			btrfs_put_block_group(cache);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -183,7 +186,8 @@ static noinline void switch_commit_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 * At this point no one can be using this transaction to modify any tree</div><div class='ctx'> 	 * and no one can start another transaction to modify any tree either.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(cur_trans-&gt;state == TRANS_STATE_COMMIT_DOING);</div><div class='add'>+	ASSERT(cur_trans-&gt;state == TRANS_STATE_COMMIT_DOING,</div><div class='add'>+	       "cur_trans-&gt;state=%d", cur_trans-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;fs_info-&gt;commit_root_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +199,7 @@ static noinline void switch_commit_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		list_del_init(&amp;root-&gt;dirty_list);</div><div class='ctx'> 		free_extent_buffer(root-&gt;commit_root);</div><div class='ctx'> 		root-&gt;commit_root = btrfs_root_node(root);</div><div class='del'>-		extent_io_tree_release(&amp;root-&gt;dirty_log_pages);</div><div class='add'>+		btrfs_extent_io_tree_release(&amp;root-&gt;dirty_log_pages);</div><div class='ctx'> 		btrfs_qgroup_clean_swapped_blocks(root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -278,8 +282,10 @@ loop:</div><div class='ctx'> 	cur_trans = fs_info-&gt;running_transaction;</div><div class='ctx'> 	if (cur_trans) {</div><div class='ctx'> 		if (TRANS_ABORTED(cur_trans)) {</div><div class='add'>+			const int abort_error = cur_trans-&gt;aborted;</div><div class='add'>+</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='del'>-			return cur_trans-&gt;aborted;</div><div class='add'>+			return abort_error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (btrfs_blocked_trans_types[cur_trans-&gt;state] &amp; type) {</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='hunk'>@@ -352,9 +358,8 @@ loop:</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cur_trans-&gt;delayed_refs, 0, sizeof(cur_trans-&gt;delayed_refs));</div><div class='ctx'> </div><div class='del'>-	cur_trans-&gt;delayed_refs.href_root = RB_ROOT_CACHED;</div><div class='del'>-	cur_trans-&gt;delayed_refs.dirty_extent_root = RB_ROOT;</div><div class='del'>-	atomic_set(&amp;cur_trans-&gt;delayed_refs.num_entries, 0);</div><div class='add'>+	xa_init(&amp;cur_trans-&gt;delayed_refs.head_refs);</div><div class='add'>+	xa_init(&amp;cur_trans-&gt;delayed_refs.dirty_extents);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * although the tree mod log is per file system and not per transaction,</div><div class='hunk'>@@ -380,10 +385,10 @@ loop:</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cur_trans-&gt;deleted_bgs);</div><div class='ctx'> 	spin_lock_init(&amp;cur_trans-&gt;dropped_roots_lock);</div><div class='ctx'> 	list_add_tail(&amp;cur_trans-&gt;list, &amp;fs_info-&gt;trans_list);</div><div class='del'>-	extent_io_tree_init(fs_info, &amp;cur_trans-&gt;dirty_pages,</div><div class='del'>-			IO_TREE_TRANS_DIRTY_PAGES);</div><div class='del'>-	extent_io_tree_init(fs_info, &amp;cur_trans-&gt;pinned_extents,</div><div class='del'>-			IO_TREE_FS_PINNED_EXTENTS);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;cur_trans-&gt;dirty_pages,</div><div class='add'>+				  IO_TREE_TRANS_DIRTY_PAGES);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;cur_trans-&gt;pinned_extents,</div><div class='add'>+				  IO_TREE_FS_PINNED_EXTENTS);</div><div class='ctx'> 	btrfs_set_fs_generation(fs_info, fs_info-&gt;generation + 1);</div><div class='ctx'> 	cur_trans-&gt;transid = fs_info-&gt;generation;</div><div class='ctx'> 	fs_info-&gt;running_transaction = cur_trans;</div><div class='hunk'>@@ -401,13 +406,13 @@ loop:</div><div class='ctx'>  */</div><div class='ctx'> static int record_root_in_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_root *root,</div><div class='del'>-			       int force)</div><div class='add'>+			       bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) &amp;&amp;</div><div class='del'>-	    root-&gt;last_trans &lt; trans-&gt;transid) || force) {</div><div class='add'>+	    btrfs_get_root_last_trans(root) &lt; trans-&gt;transid) || force) {</div><div class='ctx'> 		WARN_ON(!force &amp;&amp; root-&gt;commit_root != root-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -423,15 +428,15 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='del'>-		if (root-&gt;last_trans == trans-&gt;transid &amp;&amp; !force) {</div><div class='add'>+		if (btrfs_get_root_last_trans(root) == trans-&gt;transid &amp;&amp; !force) {</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		radix_tree_tag_set(&amp;fs_info-&gt;fs_roots_radix,</div><div class='del'>-				   (unsigned long)root-&gt;root_key.objectid,</div><div class='add'>+				   (unsigned long)btrfs_root_id(root),</div><div class='ctx'> 				   BTRFS_ROOT_TRANS_TAG);</div><div class='ctx'> 		spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='del'>-		root-&gt;last_trans = trans-&gt;transid;</div><div class='add'>+		btrfs_set_root_last_trans(root, trans-&gt;transid);</div><div class='ctx'> </div><div class='ctx'> 		/* this is pretty tricky.  We don't want to</div><div class='ctx'> 		 * take the relocation lock in btrfs_record_root_in_trans</div><div class='hunk'>@@ -474,7 +479,7 @@ void btrfs_add_dropped_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* Make sure we don't try to update the root at commit time */</div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> 	radix_tree_tag_clear(&amp;fs_info-&gt;fs_roots_radix,</div><div class='del'>-			     (unsigned long)root-&gt;root_key.objectid,</div><div class='add'>+			     (unsigned long)btrfs_root_id(root),</div><div class='ctx'> 			     BTRFS_ROOT_TRANS_TAG);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -493,7 +498,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * and barriers</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_rmb();</div><div class='del'>-	if (root-&gt;last_trans == trans-&gt;transid &amp;&amp;</div><div class='add'>+	if (btrfs_get_root_last_trans(root) == trans-&gt;transid &amp;&amp;</div><div class='ctx'> 	    !test_bit(BTRFS_ROOT_IN_TRANS_SETUP, &amp;root-&gt;state))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -535,15 +540,15 @@ static void wait_current_trans(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int may_wait_transaction(struct btrfs_fs_info *fs_info, int type)</div><div class='add'>+static bool may_wait_transaction(struct btrfs_fs_info *fs_info, int type)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(BTRFS_FS_LOG_RECOVERING, &amp;fs_info-&gt;flags))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (type == TRANS_START)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool need_reserve_reloc_root(struct btrfs_root *root)</div><div class='hunk'>@@ -552,7 +557,7 @@ static inline bool need_reserve_reloc_root(struct btrfs_root *root)</div><div class='ctx'> </div><div class='ctx'> 	if (!fs_info-&gt;reloc_ctl ||</div><div class='ctx'> 	    !test_bit(BTRFS_ROOT_SHAREABLE, &amp;root-&gt;state) ||</div><div class='del'>-	    root-&gt;root_key.objectid == BTRFS_TREE_RELOC_OBJECTID ||</div><div class='add'>+	    btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID ||</div><div class='ctx'> 	    root-&gt;reloc_root)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -564,59 +569,25 @@ static int btrfs_reserve_trans_metadata(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					u64 num_bytes,</div><div class='ctx'> 					u64 *delayed_refs_bytes)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_block_rsv *delayed_refs_rsv = &amp;fs_info-&gt;delayed_refs_rsv;</div><div class='ctx'> 	struct btrfs_space_info *si = fs_info-&gt;trans_block_rsv.space_info;</div><div class='del'>-	u64 extra_delayed_refs_bytes = 0;</div><div class='del'>-	u64 bytes;</div><div class='add'>+	u64 bytes = num_bytes + *delayed_refs_bytes;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If there's a gap between the size of the delayed refs reserve and</div><div class='del'>-	 * its reserved space, than some tasks have added delayed refs or bumped</div><div class='del'>-	 * its size otherwise (due to block group creation or removal, or block</div><div class='del'>-	 * group item update). Also try to allocate that gap in order to prevent</div><div class='del'>-	 * using (and possibly abusing) the global reserve when committing the</div><div class='del'>-	 * transaction.</div><div class='del'>-	 */</div><div class='del'>-	if (flush == BTRFS_RESERVE_FLUSH_ALL &amp;&amp;</div><div class='del'>-	    !btrfs_block_rsv_full(delayed_refs_rsv)) {</div><div class='del'>-		spin_lock(&amp;delayed_refs_rsv-&gt;lock);</div><div class='del'>-		if (delayed_refs_rsv-&gt;size &gt; delayed_refs_rsv-&gt;reserved)</div><div class='del'>-			extra_delayed_refs_bytes = delayed_refs_rsv-&gt;size -</div><div class='del'>-				delayed_refs_rsv-&gt;reserved;</div><div class='del'>-		spin_unlock(&amp;delayed_refs_rsv-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bytes = num_bytes + *delayed_refs_bytes + extra_delayed_refs_bytes;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * We want to reserve all the bytes we may need all at once, so we only</div><div class='ctx'> 	 * do 1 enospc flushing cycle per transaction start.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		if (extra_delayed_refs_bytes &gt; 0)</div><div class='del'>-			btrfs_migrate_to_delayed_refs_rsv(fs_info,</div><div class='del'>-							  extra_delayed_refs_bytes);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (extra_delayed_refs_bytes &gt; 0) {</div><div class='del'>-		bytes -= extra_delayed_refs_bytes;</div><div class='del'>-		ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='add'>+	ret = btrfs_reserve_metadata_bytes(si, bytes, flush);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are an emergency flush, which can steal from the global block</div><div class='ctx'> 	 * reserve, then attempt to not reserve space for the delayed refs, as</div><div class='ctx'> 	 * we will consume space for them from the global block reserve.</div><div class='ctx'> 	 */</div><div class='del'>-	if (flush == BTRFS_RESERVE_FLUSH_ALL_STEAL) {</div><div class='add'>+	if (ret &amp;&amp; flush == BTRFS_RESERVE_FLUSH_ALL_STEAL) {</div><div class='ctx'> 		bytes -= *delayed_refs_bytes;</div><div class='ctx'> 		*delayed_refs_bytes = 0;</div><div class='del'>-		ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush);</div><div class='add'>+		ret = btrfs_reserve_metadata_bytes(si, bytes, flush);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -781,14 +752,6 @@ again:</div><div class='ctx'> 		h-&gt;reloc_reserved = reloc_reserved;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now that we have found a transaction to be a part of, convert the</div><div class='del'>-	 * qgroup reservation from prealloc to pertrans. A different transaction</div><div class='del'>-	 * can't race in and free our pertrans out from under us.</div><div class='del'>-	 */</div><div class='del'>-	if (qgroup_reserved)</div><div class='del'>-		btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);</div><div class='del'>-</div><div class='ctx'> got_it:</div><div class='ctx'> 	if (!current-&gt;journal_info)</div><div class='ctx'> 		current-&gt;journal_info = h;</div><div class='hunk'>@@ -800,9 +763,10 @@ got_it:</div><div class='ctx'> 	 * value here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (do_chunk_alloc &amp;&amp; num_bytes) {</div><div class='del'>-		u64 flags = h-&gt;block_rsv-&gt;space_info-&gt;flags;</div><div class='add'>+		struct btrfs_space_info *space_info = h-&gt;block_rsv-&gt;space_info;</div><div class='add'>+		u64 flags = space_info-&gt;flags;</div><div class='ctx'> </div><div class='del'>-		btrfs_chunk_alloc(h, btrfs_get_alloc_profile(fs_info, flags),</div><div class='add'>+		btrfs_chunk_alloc(h, space_info, btrfs_get_alloc_profile(fs_info, flags),</div><div class='ctx'> 				  CHUNK_ALLOC_NO_FORCE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -822,8 +786,15 @@ got_it:</div><div class='ctx'> 		 * not just freed.</div><div class='ctx'> 		 */</div><div class='ctx'> 		btrfs_end_transaction(h);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='add'>+		goto reserve_fail;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * Now that we have found a transaction to be a part of, convert the</div><div class='add'>+	 * qgroup reservation from prealloc to pertrans. A different transaction</div><div class='add'>+	 * can't race in and free our pertrans out from under us.</div><div class='add'>+	 */</div><div class='add'>+	if (qgroup_reserved)</div><div class='add'>+		btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);</div><div class='ctx'> </div><div class='ctx'> 	return h;</div><div class='ctx'> </div><div class='hunk'>@@ -835,8 +806,7 @@ alloc_fail:</div><div class='ctx'> 	if (num_bytes)</div><div class='ctx'> 		btrfs_block_rsv_release(fs_info, trans_rsv, num_bytes, NULL);</div><div class='ctx'> 	if (delayed_refs_bytes)</div><div class='del'>-		btrfs_space_info_free_bytes_may_use(fs_info, trans_rsv-&gt;space_info,</div><div class='del'>-						    delayed_refs_bytes);</div><div class='add'>+		btrfs_space_info_free_bytes_may_use(trans_rsv-&gt;space_info, delayed_refs_bytes);</div><div class='ctx'> reserve_fail:</div><div class='ctx'> 	btrfs_qgroup_free_meta_prealloc(root, qgroup_reserved);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -1056,13 +1026,18 @@ static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (!trans-&gt;block_rsv) {</div><div class='del'>-		ASSERT(!trans-&gt;bytes_reserved);</div><div class='del'>-		ASSERT(!trans-&gt;delayed_refs_bytes_reserved);</div><div class='add'>+		ASSERT(trans-&gt;bytes_reserved == 0,</div><div class='add'>+		       "trans-&gt;bytes_reserved=%llu", trans-&gt;bytes_reserved);</div><div class='add'>+		ASSERT(trans-&gt;delayed_refs_bytes_reserved == 0,</div><div class='add'>+		       "trans-&gt;delayed_refs_bytes_reserved=%llu",</div><div class='add'>+		       trans-&gt;delayed_refs_bytes_reserved);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!trans-&gt;bytes_reserved) {</div><div class='del'>-		ASSERT(!trans-&gt;delayed_refs_bytes_reserved);</div><div class='add'>+		ASSERT(trans-&gt;delayed_refs_bytes_reserved == 0,</div><div class='add'>+		       "trans-&gt;delayed_refs_bytes_reserved=%llu",</div><div class='add'>+		       trans-&gt;delayed_refs_bytes_reserved);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1089,7 +1064,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_transaction *cur_trans = trans-&gt;transaction;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (refcount_read(&amp;trans-&gt;use_count) &gt; 1) {</div><div class='ctx'> 		refcount_dec(&amp;trans-&gt;use_count);</div><div class='hunk'>@@ -1128,13 +1103,13 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (TRANS_ABORTED(trans) || BTRFS_FS_ERROR(info)) {</div><div class='ctx'> 		wake_up_process(info-&gt;transaction_kthread);</div><div class='ctx'> 		if (TRANS_ABORTED(trans))</div><div class='del'>-			err = trans-&gt;aborted;</div><div class='add'>+			ret = trans-&gt;aborted;</div><div class='ctx'> 		else</div><div class='del'>-			err = -EROFS;</div><div class='add'>+			ret = -EROFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kmem_cache_free(btrfs_trans_handle_cachep, trans);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_end_transaction(struct btrfs_trans_handle *trans)</div><div class='hunk'>@@ -1155,20 +1130,19 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans)</div><div class='ctx'> int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       struct extent_io_tree *dirty_pages, int mark)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	int werr = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	struct address_space *mapping = fs_info-&gt;btree_inode-&gt;i_mapping;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 start = 0;</div><div class='ctx'> 	u64 end;</div><div class='ctx'> </div><div class='del'>-	while (find_first_extent_bit(dirty_pages, start, &amp;start, &amp;end,</div><div class='del'>-				     mark, &amp;cached_state)) {</div><div class='add'>+	while (btrfs_find_first_extent_bit(dirty_pages, start, &amp;start, &amp;end,</div><div class='add'>+					   mark, &amp;cached_state)) {</div><div class='ctx'> 		bool wait_writeback = false;</div><div class='ctx'> </div><div class='del'>-		err = convert_extent_bit(dirty_pages, start, end,</div><div class='del'>-					 EXTENT_NEED_WAIT,</div><div class='del'>-					 mark, &amp;cached_state);</div><div class='add'>+		ret = btrfs_convert_extent_bit(dirty_pages, start, end,</div><div class='add'>+					       EXTENT_NEED_WAIT,</div><div class='add'>+					       mark, &amp;cached_state);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * convert_extent_bit can return -ENOMEM, which is most of the</div><div class='ctx'> 		 * time a temporary error. So when it happens, ignore the error</div><div class='hunk'>@@ -1182,22 +1156,22 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		 * We cleanup any entries left in the io tree when committing</div><div class='ctx'> 		 * the transaction (through extent_io_tree_release()).</div><div class='ctx'> 		 */</div><div class='del'>-		if (err == -ENOMEM) {</div><div class='del'>-			err = 0;</div><div class='add'>+		if (ret == -ENOMEM) {</div><div class='add'>+			ret = 0;</div><div class='ctx'> 			wait_writeback = true;</div><div class='ctx'> 		}</div><div class='del'>-		if (!err)</div><div class='del'>-			err = filemap_fdatawrite_range(mapping, start, end);</div><div class='del'>-		if (err)</div><div class='del'>-			werr = err;</div><div class='del'>-		else if (wait_writeback)</div><div class='del'>-			werr = filemap_fdatawait_range(mapping, start, end);</div><div class='del'>-		free_extent_state(cached_state);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = filemap_fdatawrite_range(mapping, start, end);</div><div class='add'>+		if (!ret &amp;&amp; wait_writeback)</div><div class='add'>+			btrfs_btree_wait_writeback_range(fs_info, start, end);</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='ctx'> 		cached_state = NULL;</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		start = end + 1;</div><div class='ctx'> 	}</div><div class='del'>-	return werr;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1209,15 +1183,13 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				       struct extent_io_tree *dirty_pages)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	int werr = 0;</div><div class='del'>-	struct address_space *mapping = fs_info-&gt;btree_inode-&gt;i_mapping;</div><div class='ctx'> 	struct extent_state *cached_state = NULL;</div><div class='ctx'> 	u64 start = 0;</div><div class='ctx'> 	u64 end;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	while (find_first_extent_bit(dirty_pages, start, &amp;start, &amp;end,</div><div class='del'>-				     EXTENT_NEED_WAIT, &amp;cached_state)) {</div><div class='add'>+	while (btrfs_find_first_extent_bit(dirty_pages, start, &amp;start, &amp;end,</div><div class='add'>+					   EXTENT_NEED_WAIT, &amp;cached_state)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ignore -ENOMEM errors returned by clear_extent_bit().</div><div class='ctx'> 		 * When committing the transaction, we'll remove any entries</div><div class='hunk'>@@ -1226,37 +1198,35 @@ static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		 * concurrently - we do it only at transaction commit time when</div><div class='ctx'> 		 * it's safe to do it (through extent_io_tree_release()).</div><div class='ctx'> 		 */</div><div class='del'>-		err = clear_extent_bit(dirty_pages, start, end,</div><div class='del'>-				       EXTENT_NEED_WAIT, &amp;cached_state);</div><div class='del'>-		if (err == -ENOMEM)</div><div class='del'>-			err = 0;</div><div class='del'>-		if (!err)</div><div class='del'>-			err = filemap_fdatawait_range(mapping, start, end);</div><div class='del'>-		if (err)</div><div class='del'>-			werr = err;</div><div class='del'>-		free_extent_state(cached_state);</div><div class='add'>+		ret = btrfs_clear_extent_bit(dirty_pages, start, end,</div><div class='add'>+					     EXTENT_NEED_WAIT, &amp;cached_state);</div><div class='add'>+		if (ret == -ENOMEM)</div><div class='add'>+			ret = 0;</div><div class='add'>+		if (!ret)</div><div class='add'>+			btrfs_btree_wait_writeback_range(fs_info, start, end);</div><div class='add'>+		btrfs_free_extent_state(cached_state);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='ctx'> 		cached_state = NULL;</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		start = end + 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (err)</div><div class='del'>-		werr = err;</div><div class='del'>-	return werr;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_wait_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		       struct extent_io_tree *dirty_pages)</div><div class='ctx'> {</div><div class='ctx'> 	bool errors = false;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	err = __btrfs_wait_marked_extents(fs_info, dirty_pages);</div><div class='add'>+	ret = __btrfs_wait_marked_extents(fs_info, dirty_pages);</div><div class='ctx'> 	if (test_and_clear_bit(BTRFS_FS_BTREE_ERR, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		errors = true;</div><div class='ctx'> </div><div class='del'>-	if (errors &amp;&amp; !err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	return err;</div><div class='add'>+	if (errors &amp;&amp; !ret)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_wait_tree_log_extents(struct btrfs_root *log_root, int mark)</div><div class='hunk'>@@ -1264,22 +1234,23 @@ int btrfs_wait_tree_log_extents(struct btrfs_root *log_root, int mark)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = log_root-&gt;fs_info;</div><div class='ctx'> 	struct extent_io_tree *dirty_pages = &amp;log_root-&gt;dirty_log_pages;</div><div class='ctx'> 	bool errors = false;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(log_root-&gt;root_key.objectid == BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	ASSERT(btrfs_root_id(log_root) == BTRFS_TREE_LOG_OBJECTID,</div><div class='add'>+	       "root_id(log_root)=%llu", btrfs_root_id(log_root));</div><div class='ctx'> </div><div class='del'>-	err = __btrfs_wait_marked_extents(fs_info, dirty_pages);</div><div class='del'>-	if ((mark &amp; EXTENT_DIRTY) &amp;&amp;</div><div class='add'>+	ret = __btrfs_wait_marked_extents(fs_info, dirty_pages);</div><div class='add'>+	if ((mark &amp; EXTENT_DIRTY_LOG1) &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(BTRFS_FS_LOG1_ERR, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		errors = true;</div><div class='ctx'> </div><div class='del'>-	if ((mark &amp; EXTENT_NEW) &amp;&amp;</div><div class='add'>+	if ((mark &amp; EXTENT_DIRTY_LOG2) &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(BTRFS_FS_LOG2_ERR, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		errors = true;</div><div class='ctx'> </div><div class='del'>-	if (errors &amp;&amp; !err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	return err;</div><div class='add'>+	if (errors &amp;&amp; !ret)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1302,7 +1273,7 @@ static int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> 	ret2 = btrfs_wait_extents(fs_info, dirty_pages);</div><div class='ctx'> </div><div class='del'>-	extent_io_tree_release(&amp;trans-&gt;transaction-&gt;dirty_pages);</div><div class='add'>+	btrfs_extent_io_tree_release(&amp;trans-&gt;transaction-&gt;dirty_pages);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1364,7 +1335,6 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct list_head *dirty_bgs = &amp;trans-&gt;transaction-&gt;dirty_bgs;</div><div class='ctx'> 	struct list_head *io_bgs = &amp;trans-&gt;transaction-&gt;io_bgs;</div><div class='del'>-	struct list_head *next;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1372,7 +1342,8 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 * At this point no one can be using this transaction to modify any tree</div><div class='ctx'> 	 * and no one can start another transaction to modify any tree either.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(trans-&gt;transaction-&gt;state == TRANS_STATE_COMMIT_DOING);</div><div class='add'>+	ASSERT(trans-&gt;transaction-&gt;state == TRANS_STATE_COMMIT_DOING,</div><div class='add'>+	       "trans-&gt;transaction-&gt;state=%d", trans-&gt;transaction-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	eb = btrfs_lock_root_node(fs_info-&gt;tree_root);</div><div class='ctx'> 	ret = btrfs_cow_block(trans, fs_info-&gt;tree_root, eb, NULL,</div><div class='hunk'>@@ -1400,13 +1371,13 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> again:</div><div class='ctx'> 	while (!list_empty(&amp;fs_info-&gt;dirty_cowonly_roots)) {</div><div class='ctx'> 		struct btrfs_root *root;</div><div class='del'>-		next = fs_info-&gt;dirty_cowonly_roots.next;</div><div class='del'>-		list_del_init(next);</div><div class='del'>-		root = list_entry(next, struct btrfs_root, dirty_list);</div><div class='add'>+</div><div class='add'>+		root = list_first_entry(&amp;fs_info-&gt;dirty_cowonly_roots,</div><div class='add'>+					struct btrfs_root, dirty_list);</div><div class='ctx'> 		clear_bit(BTRFS_ROOT_DIRTY, &amp;root-&gt;state);</div><div class='add'>+		list_move_tail(&amp;root-&gt;dirty_list,</div><div class='add'>+			       &amp;trans-&gt;transaction-&gt;switch_commits);</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;root-&gt;dirty_list,</div><div class='del'>-			      &amp;trans-&gt;transaction-&gt;switch_commits);</div><div class='ctx'> 		ret = update_cowonly_root(trans, root);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -1506,7 +1477,8 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 * At this point no one can be using this transaction to modify any tree</div><div class='ctx'> 	 * and no one can start another transaction to modify any tree either.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(trans-&gt;transaction-&gt;state == TRANS_STATE_COMMIT_DOING);</div><div class='add'>+	ASSERT(trans-&gt;transaction-&gt;state == TRANS_STATE_COMMIT_DOING,</div><div class='add'>+	       "trans-&gt;transaction-&gt;state=%d", trans-&gt;transaction-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -1524,13 +1496,20 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 			 * At this point we can neither have tasks logging inodes</div><div class='ctx'> 			 * from a root nor trying to commit a log tree.</div><div class='ctx'> 			 */</div><div class='del'>-			ASSERT(atomic_read(&amp;root-&gt;log_writers) == 0);</div><div class='del'>-			ASSERT(atomic_read(&amp;root-&gt;log_commit[0]) == 0);</div><div class='del'>-			ASSERT(atomic_read(&amp;root-&gt;log_commit[1]) == 0);</div><div class='add'>+			ASSERT(atomic_read(&amp;root-&gt;log_writers) == 0,</div><div class='add'>+			       "atomic_read(&amp;root-&gt;log_writers)=%d",</div><div class='add'>+			       atomic_read(&amp;root-&gt;log_writers));</div><div class='add'>+			ASSERT(atomic_read(&amp;root-&gt;log_commit[0]) == 0,</div><div class='add'>+			       "atomic_read(&amp;root-&gt;log_commit[0])=%d",</div><div class='add'>+			       atomic_read(&amp;root-&gt;log_commit[0]));</div><div class='add'>+			ASSERT(atomic_read(&amp;root-&gt;log_commit[1]) == 0,</div><div class='add'>+			       "atomic_read(&amp;root-&gt;log_commit[1])=%d",</div><div class='add'>+			       atomic_read(&amp;root-&gt;log_commit[1]));</div><div class='ctx'> </div><div class='ctx'> 			radix_tree_tag_clear(&amp;fs_info-&gt;fs_roots_radix,</div><div class='del'>-					(unsigned long)root-&gt;root_key.objectid,</div><div class='add'>+					(unsigned long)btrfs_root_id(root),</div><div class='ctx'> 					BTRFS_ROOT_TRANS_TAG);</div><div class='add'>+			btrfs_qgroup_free_meta_all_pertrans(root);</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='ctx'> </div><div class='ctx'> 			btrfs_free_log(trans, root);</div><div class='hunk'>@@ -1555,7 +1534,6 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans)</div><div class='ctx'> 			if (ret2)</div><div class='ctx'> 				return ret2;</div><div class='ctx'> 			spin_lock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='del'>-			btrfs_qgroup_free_meta_all_pertrans(root);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;fs_roots_radix_lock);</div><div class='hunk'>@@ -1607,7 +1585,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * qgroup counters could end up wrong.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_run_delayed_refs(trans, U64_MAX);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1620,8 +1598,8 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Now qgroup are all updated, we can inherit it to new qgroups */</div><div class='del'>-	ret = btrfs_qgroup_inherit(trans, src-&gt;root_key.objectid, dst_objectid,</div><div class='del'>-				   parent-&gt;root_key.objectid, inherit);</div><div class='add'>+	ret = btrfs_qgroup_inherit(trans, btrfs_root_id(src), dst_objectid,</div><div class='add'>+				   btrfs_root_id(parent), inherit);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1678,8 +1656,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_root *root = pending-&gt;root;</div><div class='ctx'> 	struct btrfs_root *parent_root;</div><div class='ctx'> 	struct btrfs_block_rsv *rsv;</div><div class='del'>-	struct inode *parent_inode = pending-&gt;dir;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	struct btrfs_inode *parent_inode = pending-&gt;dir;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dir_item *dir_item;</div><div class='ctx'> 	struct extent_buffer *tmp;</div><div class='ctx'> 	struct extent_buffer *old;</div><div class='hunk'>@@ -1704,7 +1682,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * filesystem.</div><div class='ctx'> 	 */</div><div class='ctx'> 	nofs_flags = memalloc_nofs_save();</div><div class='del'>-	pending-&gt;error = fscrypt_setup_filename(parent_inode,</div><div class='add'>+	pending-&gt;error = fscrypt_setup_filename(&amp;parent_inode-&gt;vfs_inode,</div><div class='ctx'> 						&amp;pending-&gt;dentry-&gt;d_name, 0,</div><div class='ctx'> 						&amp;fname);</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flags);</div><div class='hunk'>@@ -1732,34 +1710,30 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto clear_skip_qgroup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key.objectid = objectid;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='del'>-	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='del'>-</div><div class='ctx'> 	rsv = trans-&gt;block_rsv;</div><div class='ctx'> 	trans-&gt;block_rsv = &amp;pending-&gt;block_rsv;</div><div class='ctx'> 	trans-&gt;bytes_reserved = trans-&gt;block_rsv-&gt;reserved;</div><div class='ctx'> 	trace_btrfs_space_reservation(fs_info, "transaction",</div><div class='ctx'> 				      trans-&gt;transid,</div><div class='ctx'> 				      trans-&gt;bytes_reserved, 1);</div><div class='del'>-	parent_root = BTRFS_I(parent_inode)-&gt;root;</div><div class='add'>+	parent_root = parent_inode-&gt;root;</div><div class='ctx'> 	ret = record_root_in_trans(trans, parent_root, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	cur_time = current_time(parent_inode);</div><div class='add'>+	cur_time = current_time(&amp;parent_inode-&gt;vfs_inode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * insert the directory item</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_set_inode_index(BTRFS_I(parent_inode), &amp;index);</div><div class='del'>-	if (ret) {</div><div class='add'>+	ret = btrfs_set_inode_index(parent_inode, &amp;index);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check if there is a file/dir which has the same name. */</div><div class='ctx'> 	dir_item = btrfs_lookup_dir_item(NULL, parent_root, path,</div><div class='del'>-					 btrfs_ino(BTRFS_I(parent_inode)),</div><div class='add'>+					 btrfs_ino(parent_inode),</div><div class='ctx'> 					 &amp;fname.disk_name, 0);</div><div class='ctx'> 	if (dir_item != NULL &amp;&amp; !IS_ERR(dir_item)) {</div><div class='ctx'> 		pending-&gt;error = -EEXIST;</div><div class='hunk'>@@ -1773,8 +1747,10 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_create_qgroup(trans, objectid);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -EEXIST) {</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		goto fail;</div><div class='add'>+		if (unlikely(ret != -ENOTCONN || btrfs_qgroup_enabled(fs_info))) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1784,13 +1760,13 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * snapshot</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_run_delayed_items(trans);</div><div class='del'>-	if (ret) {	/* Transaction aborted */</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = record_root_in_trans(trans, root, 0);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1825,7 +1801,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	old = btrfs_lock_root_node(root);</div><div class='ctx'> 	ret = btrfs_cow_block(trans, root, old, NULL, 0, &amp;old,</div><div class='ctx'> 			      BTRFS_NESTING_COW);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_tree_unlock(old);</div><div class='ctx'> 		free_extent_buffer(old);</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -1836,21 +1812,23 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	/* clean up in any case */</div><div class='ctx'> 	btrfs_tree_unlock(old);</div><div class='ctx'> 	free_extent_buffer(old);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* see comments in should_cow_block() */</div><div class='ctx'> 	set_bit(BTRFS_ROOT_FORCE_COW, &amp;root-&gt;state);</div><div class='del'>-	smp_wmb();</div><div class='add'>+	smp_mb__after_atomic();</div><div class='ctx'> </div><div class='ctx'> 	btrfs_set_root_node(new_root_item, tmp);</div><div class='ctx'> 	/* record when the snapshot was created in key.offset */</div><div class='add'>+	key.objectid = objectid;</div><div class='add'>+	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='ctx'> 	key.offset = trans-&gt;transid;</div><div class='ctx'> 	ret = btrfs_insert_root(trans, tree_root, &amp;key, new_root_item);</div><div class='ctx'> 	btrfs_tree_unlock(tmp);</div><div class='ctx'> 	free_extent_buffer(tmp);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1859,16 +1837,16 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * insert root back/forward references</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_add_root_ref(trans, objectid,</div><div class='del'>-				 parent_root-&gt;root_key.objectid,</div><div class='del'>-				 btrfs_ino(BTRFS_I(parent_inode)), index,</div><div class='add'>+				 btrfs_root_id(parent_root),</div><div class='add'>+				 btrfs_ino(parent_inode), index,</div><div class='ctx'> 				 &amp;fname.disk_name);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	key.offset = (u64)-1;</div><div class='del'>-	pending-&gt;snap = btrfs_get_new_fs_root(fs_info, objectid, pending-&gt;anon_dev);</div><div class='add'>+	pending-&gt;snap = btrfs_get_new_fs_root(fs_info, objectid, &amp;pending-&gt;anon_dev);</div><div class='ctx'> 	if (IS_ERR(pending-&gt;snap)) {</div><div class='ctx'> 		ret = PTR_ERR(pending-&gt;snap);</div><div class='ctx'> 		pending-&gt;snap = NULL;</div><div class='hunk'>@@ -1877,7 +1855,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_reloc_post_snapshot(trans, pending);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1892,34 +1870,32 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = qgroup_account_snapshot(trans, root, parent_root,</div><div class='ctx'> 					      pending-&gt;inherit, objectid);</div><div class='ctx'> 	else if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_SIMPLE)</div><div class='del'>-		ret = btrfs_qgroup_inherit(trans, root-&gt;root_key.objectid, objectid,</div><div class='del'>-					   parent_root-&gt;root_key.objectid, pending-&gt;inherit);</div><div class='add'>+		ret = btrfs_qgroup_inherit(trans, btrfs_root_id(root), objectid,</div><div class='add'>+					   btrfs_root_id(parent_root), pending-&gt;inherit);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_dir_item(trans, &amp;fname.disk_name,</div><div class='del'>-				    BTRFS_I(parent_inode), &amp;key, BTRFS_FT_DIR,</div><div class='add'>+				    parent_inode, &amp;key, BTRFS_FT_DIR,</div><div class='ctx'> 				    index);</div><div class='del'>-	/* We have check then name at the beginning, so it is impossible. */</div><div class='del'>-	BUG_ON(ret == -EEXIST || ret == -EOVERFLOW);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_i_size_write(BTRFS_I(parent_inode), parent_inode-&gt;i_size +</div><div class='add'>+	btrfs_i_size_write(parent_inode, parent_inode-&gt;vfs_inode.i_size +</div><div class='ctx'> 						  fname.disk_name.len * 2);</div><div class='del'>-	inode_set_mtime_to_ts(parent_inode,</div><div class='del'>-			      inode_set_ctime_current(parent_inode));</div><div class='del'>-	ret = btrfs_update_inode_fallback(trans, BTRFS_I(parent_inode));</div><div class='del'>-	if (ret) {</div><div class='add'>+	inode_set_mtime_to_ts(&amp;parent_inode-&gt;vfs_inode,</div><div class='add'>+			      inode_set_ctime_current(&amp;parent_inode-&gt;vfs_inode));</div><div class='add'>+	ret = btrfs_update_inode_fallback(trans, parent_inode);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = btrfs_uuid_tree_add(trans, new_root_item-&gt;uuid,</div><div class='ctx'> 				  BTRFS_UUID_KEY_SUBVOL,</div><div class='ctx'> 				  objectid);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1927,7 +1903,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = btrfs_uuid_tree_add(trans, new_root_item-&gt;received_uuid,</div><div class='ctx'> 					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,</div><div class='ctx'> 					  objectid);</div><div class='del'>-		if (ret &amp;&amp; ret != -EEXIST) {</div><div class='add'>+		if (unlikely(ret &amp;&amp; ret != -EEXIST)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1945,7 +1921,6 @@ free_fname:</div><div class='ctx'> free_pending:</div><div class='ctx'> 	kfree(new_root_item);</div><div class='ctx'> 	pending-&gt;root_item = NULL;</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	pending-&gt;path = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1993,19 +1968,6 @@ static void update_super_roots(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		super-&gt;uuid_tree_generation = root_item-&gt;generation;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_transaction_in_commit(struct btrfs_fs_info *info)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_transaction *trans;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;info-&gt;trans_lock);</div><div class='del'>-	trans = info-&gt;running_transaction;</div><div class='del'>-	if (trans)</div><div class='del'>-		ret = (trans-&gt;state &gt;= TRANS_STATE_COMMIT_START);</div><div class='del'>-	spin_unlock(&amp;info-&gt;trans_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int btrfs_transaction_blocked(struct btrfs_fs_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_transaction *trans;</div><div class='hunk'>@@ -2045,6 +2007,25 @@ void btrfs_commit_transaction_async(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	btrfs_put_transaction(cur_trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If there is a running transaction commit it or if it's already committing,</div><div class='add'>+ * wait for its commit to complete. Does not start and commit a new transaction</div><div class='add'>+ * if there isn't any running.</div><div class='add'>+ */</div><div class='add'>+int btrfs_commit_current_transaction(struct btrfs_root *root)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_trans_handle *trans;</div><div class='add'>+</div><div class='add'>+	trans = btrfs_attach_transaction_barrier(root);</div><div class='add'>+	if (IS_ERR(trans)) {</div><div class='add'>+		int ret = PTR_ERR(trans);</div><div class='add'>+</div><div class='add'>+		return (ret == -ENOENT) ? 0 : ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return btrfs_commit_transaction(trans);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cleanup_transaction(struct btrfs_trans_handle *trans, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='hunk'>@@ -2090,7 +2071,7 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans, int err)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> </div><div class='del'>-	btrfs_cleanup_one_transaction(trans-&gt;transaction, fs_info);</div><div class='add'>+	btrfs_cleanup_one_transaction(trans-&gt;transaction);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> 	if (cur_trans == fs_info-&gt;running_transaction)</div><div class='hunk'>@@ -2135,7 +2116,14 @@ static void btrfs_cleanup_pending_block_groups(struct btrfs_trans_handle *trans)</div><div class='ctx'> </div><div class='ctx'>        list_for_each_entry_safe(block_group, tmp, &amp;trans-&gt;new_bgs, bg_list) {</div><div class='ctx'>                btrfs_dec_delayed_refs_rsv_bg_inserts(fs_info);</div><div class='add'>+		/*</div><div class='add'>+		* Not strictly necessary to lock, as no other task will be using a</div><div class='add'>+		* block_group on the new_bgs list during a transaction abort.</div><div class='add'>+		*/</div><div class='add'>+	       spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'>                list_del_init(&amp;block_group-&gt;bg_list);</div><div class='add'>+	       btrfs_put_block_group(block_group);</div><div class='add'>+	       spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='ctx'>        }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2166,7 +2154,7 @@ static inline int btrfs_start_delalloc_flush(struct btrfs_fs_info *fs_info)</div><div class='ctx'> static inline void btrfs_wait_delalloc_flush(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	if (btrfs_test_opt(fs_info, FLUSHONCOMMIT))</div><div class='del'>-		btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);</div><div class='add'>+		btrfs_wait_ordered_roots(fs_info, U64_MAX, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2185,18 +2173,25 @@ static void add_pending_snapshot(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;trans-&gt;fs_info-&gt;trans_lock);</div><div class='del'>-	ASSERT(cur_trans-&gt;state &gt;= TRANS_STATE_COMMIT_PREP);</div><div class='add'>+	ASSERT(cur_trans-&gt;state &gt;= TRANS_STATE_COMMIT_PREP,</div><div class='add'>+	       "cur_trans-&gt;state=%d", cur_trans-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	list_add(&amp;trans-&gt;pending_snapshot-&gt;list, &amp;cur_trans-&gt;pending_snapshots);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void update_commit_stats(struct btrfs_fs_info *fs_info, ktime_t interval)</div><div class='add'>+static void update_commit_stats(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	ktime_t now = ktime_get_ns();</div><div class='add'>+	ktime_t interval = now - fs_info-&gt;commit_stats.critical_section_start_time;</div><div class='add'>+</div><div class='add'>+	ASSERT(fs_info-&gt;commit_stats.critical_section_start_time);</div><div class='add'>+</div><div class='ctx'> 	fs_info-&gt;commit_stats.commit_count++;</div><div class='ctx'> 	fs_info-&gt;commit_stats.last_commit_dur = interval;</div><div class='ctx'> 	fs_info-&gt;commit_stats.max_commit_dur =</div><div class='ctx'> 			max_t(u64, fs_info-&gt;commit_stats.max_commit_dur, interval);</div><div class='ctx'> 	fs_info-&gt;commit_stats.total_commit_dur += interval;</div><div class='add'>+	fs_info-&gt;commit_stats.critical_section_start_time = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='hunk'>@@ -2205,10 +2200,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_transaction *cur_trans = trans-&gt;transaction;</div><div class='ctx'> 	struct btrfs_transaction *prev_trans = NULL;</div><div class='ctx'> 	int ret;</div><div class='del'>-	ktime_t start_time;</div><div class='del'>-	ktime_t interval;</div><div class='ctx'> </div><div class='del'>-	ASSERT(refcount_read(&amp;trans-&gt;use_count) == 1);</div><div class='add'>+	ASSERT(refcount_read(&amp;trans-&gt;use_count) == 1,</div><div class='add'>+	       "refcount_read(&amp;trans-&gt;use_count)=%d", refcount_read(&amp;trans-&gt;use_count));</div><div class='ctx'> 	btrfs_trans_state_lockdep_acquire(fs_info, BTRFS_LOCKDEP_TRANS_COMMIT_PREP);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(BTRFS_FS_NEED_TRANS_COMMIT, &amp;fs_info-&gt;flags);</div><div class='hunk'>@@ -2297,14 +2291,13 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	wake_up(&amp;fs_info-&gt;transaction_blocked_wait);</div><div class='ctx'> 	btrfs_trans_state_lockdep_release(fs_info, BTRFS_LOCKDEP_TRANS_COMMIT_PREP);</div><div class='ctx'> </div><div class='del'>-	if (cur_trans-&gt;list.prev != &amp;fs_info-&gt;trans_list) {</div><div class='add'>+	if (!list_is_first(&amp;cur_trans-&gt;list, &amp;fs_info-&gt;trans_list)) {</div><div class='ctx'> 		enum btrfs_trans_state want_state = TRANS_STATE_COMPLETED;</div><div class='ctx'> </div><div class='ctx'> 		if (trans-&gt;in_fsync)</div><div class='ctx'> 			want_state = TRANS_STATE_SUPER_COMMITTED;</div><div class='ctx'> </div><div class='del'>-		prev_trans = list_entry(cur_trans-&gt;list.prev,</div><div class='del'>-					struct btrfs_transaction, list);</div><div class='add'>+		prev_trans = list_prev_entry(cur_trans, list);</div><div class='ctx'> 		if (prev_trans-&gt;state &lt; want_state) {</div><div class='ctx'> 			refcount_inc(&amp;prev_trans-&gt;use_count);</div><div class='ctx'> 			spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='hunk'>@@ -2340,8 +2333,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 * Get the time spent on the work done by the commit thread and not</div><div class='ctx'> 	 * the time spent waiting on a previous commit</div><div class='ctx'> 	 */</div><div class='del'>-	start_time = ktime_get_ns();</div><div class='del'>-</div><div class='add'>+	fs_info-&gt;commit_stats.critical_section_start_time = ktime_get_ns();</div><div class='ctx'> 	extwriter_counter_dec(cur_trans, trans-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_start_delalloc_flush(fs_info);</div><div class='hunk'>@@ -2446,7 +2438,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 * them.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * We needn't worry that this operation will corrupt the snapshots,</div><div class='del'>-	 * because all the tree which are snapshoted will be forced to COW</div><div class='add'>+	 * because all the tree which are snapshotted will be forced to COW</div><div class='ctx'> 	 * the nodes and leaves.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = btrfs_run_delayed_items(trans);</div><div class='hunk'>@@ -2573,6 +2565,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto scrub_continue;</div><div class='ctx'> </div><div class='add'>+	update_commit_stats(fs_info);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We needn't acquire the lock here because there is no other task</div><div class='ctx'> 	 * which can change it.</div><div class='hunk'>@@ -2581,7 +2574,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	wake_up(&amp;cur_trans-&gt;commit_wait);</div><div class='ctx'> 	btrfs_trans_state_lockdep_release(fs_info, BTRFS_LOCKDEP_TRANS_SUPER_COMMITTED);</div><div class='ctx'> </div><div class='del'>-	btrfs_finish_extent_commit(trans);</div><div class='add'>+	ret = btrfs_finish_extent_commit(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto scrub_continue;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_TRANS_HAVE_FREE_BGS, &amp;cur_trans-&gt;flags))</div><div class='ctx'> 		btrfs_clear_space_info_full(fs_info);</div><div class='hunk'>@@ -2607,8 +2602,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> </div><div class='ctx'> 	trace_btrfs_transaction_commit(fs_info);</div><div class='ctx'> </div><div class='del'>-	interval = ktime_get_ns() - start_time;</div><div class='del'>-</div><div class='ctx'> 	btrfs_scrub_continue(fs_info);</div><div class='ctx'> </div><div class='ctx'> 	if (current-&gt;journal_info == trans)</div><div class='hunk'>@@ -2616,8 +2609,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)</div><div class='ctx'> </div><div class='ctx'> 	kmem_cache_free(btrfs_trans_handle_cachep, trans);</div><div class='ctx'> </div><div class='del'>-	update_commit_stats(fs_info, interval);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> unlock_reloc:</div><div class='hunk'>@@ -2675,15 +2666,15 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	list_del_init(&amp;root-&gt;root_list);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;trans_lock);</div><div class='ctx'> </div><div class='del'>-	btrfs_debug(fs_info, "cleaner removing %llu", root-&gt;root_key.objectid);</div><div class='add'>+	btrfs_debug(fs_info, "cleaner removing %llu", btrfs_root_id(root));</div><div class='ctx'> </div><div class='ctx'> 	btrfs_kill_all_delayed_nodes(root);</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_header_backref_rev(root-&gt;node) &lt;</div><div class='ctx'> 			BTRFS_MIXED_BACKREF_REV)</div><div class='del'>-		ret = btrfs_drop_snapshot(root, 0, 0);</div><div class='add'>+		ret = btrfs_drop_snapshot(root, false, false);</div><div class='ctx'> 	else</div><div class='del'>-		ret = btrfs_drop_snapshot(root, 1, 0);</div><div class='add'>+		ret = btrfs_drop_snapshot(root, true, false);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_root(root);</div><div class='ctx'> 	return (ret &lt; 0) ? 0 : 1;</div><div class='hunk'>@@ -2720,9 +2711,7 @@ void __cold __btrfs_abort_transaction(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> int __init btrfs_transaction_init(void)</div><div class='ctx'> {</div><div class='del'>-	btrfs_trans_handle_cachep = kmem_cache_create("btrfs_trans_handle",</div><div class='del'>-			sizeof(struct btrfs_trans_handle), 0,</div><div class='del'>-			SLAB_TEMPORARY | SLAB_MEM_SPREAD, NULL);</div><div class='add'>+	btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle, SLAB_TEMPORARY);</div><div class='ctx'> 	if (!btrfs_trans_handle_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h<br/>index 2bf8bbdfd0b3..18ef069197e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/transaction.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/transaction.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/transaction.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/transaction.h</a></div><div class='hunk'>@@ -6,13 +6,30 @@</div><div class='ctx'> #ifndef BTRFS_TRANSACTION_H</div><div class='ctx'> #define BTRFS_TRANSACTION_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/time64.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> #include "delayed-ref.h"</div><div class='del'>-#include "ctree.h"</div><div class='del'>-#include "misc.h"</div><div class='ctx'> </div><div class='del'>-/* Radix-tree tag for roots that are part of the trasaction. */</div><div class='add'>+struct dentry;</div><div class='add'>+struct inode;</div><div class='add'>+struct btrfs_pending_snapshot;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_root_item;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Signal that a direct IO write is in progress, to avoid deadlock for sync</div><div class='add'>+ * direct IO writes when fsync is called during the direct IO write path.</div><div class='add'>+ */</div><div class='add'>+#define BTRFS_TRANS_DIO_WRITE_STUB	((void *) 1)</div><div class='add'>+</div><div class='add'>+/* Radix-tree tag for roots that are part of the transaction. */</div><div class='ctx'> #define BTRFS_ROOT_TRANS_TAG			0</div><div class='ctx'> </div><div class='ctx'> enum btrfs_trans_state {</div><div class='hunk'>@@ -157,7 +174,7 @@ struct btrfs_trans_handle {</div><div class='ctx'> </div><div class='ctx'> struct btrfs_pending_snapshot {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	struct inode *dir;</div><div class='add'>+	struct btrfs_inode *dir;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='ctx'> 	struct btrfs_root_item *root_item;</div><div class='ctx'> 	struct btrfs_root *snap;</div><div class='hunk'>@@ -206,7 +223,21 @@ static inline void btrfs_clear_skip_qgroup(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	delayed_refs-&gt;qgroup_to_skip = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool __cold abort_should_print_stack(int error);</div><div class='add'>+/*</div><div class='add'>+ * We want the transaction abort to print stack trace only for errors where the</div><div class='add'>+ * cause could be a bug, eg. due to ENOSPC, and not for common errors that are</div><div class='add'>+ * caused by external factors.</div><div class='add'>+ */</div><div class='add'>+static inline bool btrfs_abort_should_print_stack(int error)</div><div class='add'>+{</div><div class='add'>+	switch (error) {</div><div class='add'>+	case -EIO:</div><div class='add'>+	case -EROFS:</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Call btrfs_abort_transaction as early as possible when an error condition is</div><div class='hunk'>@@ -214,12 +245,12 @@ bool __cold abort_should_print_stack(int error);</div><div class='ctx'>  */</div><div class='ctx'> #define btrfs_abort_transaction(trans, error)		\</div><div class='ctx'> do {								\</div><div class='del'>-	bool first = false;					\</div><div class='add'>+	bool __first = false;					\</div><div class='ctx'> 	/* Report first abort since mount */			\</div><div class='ctx'> 	if (!test_and_set_bit(BTRFS_FS_STATE_TRANS_ABORTED,	\</div><div class='ctx'> 			&amp;((trans)-&gt;fs_info-&gt;fs_state))) {	\</div><div class='del'>-		first = true;					\</div><div class='del'>-		if (WARN(abort_should_print_stack(error),	\</div><div class='add'>+		__first = true;					\</div><div class='add'>+		if (WARN(btrfs_abort_should_print_stack(error),	\</div><div class='ctx'> 			KERN_ERR				\</div><div class='ctx'> 			"BTRFS: Transaction aborted (error %d)\n",	\</div><div class='ctx'> 			(error))) {					\</div><div class='hunk'>@@ -231,7 +262,7 @@ do {								\</div><div class='ctx'> 		}						\</div><div class='ctx'> 	}							\</div><div class='ctx'> 	__btrfs_abort_transaction((trans), __func__,		\</div><div class='del'>-				  __LINE__, (error), first);	\</div><div class='add'>+				  __LINE__, (error), __first);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> int btrfs_end_transaction(struct btrfs_trans_handle *trans);</div><div class='hunk'>@@ -253,6 +284,7 @@ void btrfs_maybe_wake_unfinished_drop(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_clean_one_deleted_snapshot(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_commit_transaction(struct btrfs_trans_handle *trans);</div><div class='ctx'> void btrfs_commit_transaction_async(struct btrfs_trans_handle *trans);</div><div class='add'>+int btrfs_commit_current_transaction(struct btrfs_root *root);</div><div class='ctx'> int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans);</div><div class='ctx'> bool btrfs_should_end_transaction(struct btrfs_trans_handle *trans);</div><div class='ctx'> void btrfs_throttle(struct btrfs_fs_info *fs_info);</div><div class='hunk'>@@ -262,7 +294,6 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				struct extent_io_tree *dirty_pages, int mark);</div><div class='ctx'> int btrfs_wait_tree_log_extents(struct btrfs_root *root, int mark);</div><div class='ctx'> int btrfs_transaction_blocked(struct btrfs_fs_info *info);</div><div class='del'>-int btrfs_transaction_in_commit(struct btrfs_fs_info *info);</div><div class='ctx'> void btrfs_put_transaction(struct btrfs_transaction *transaction);</div><div class='ctx'> void btrfs_add_dropped_root(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_root *root);</div><div class='head'>diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c<br/>index 50fdc69fdddf..c21c21adf61e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-checker.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-checker.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-checker.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tree-checker.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='del'>-#include "disk-io.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "misc.h"</div><div class='hunk'>@@ -30,7 +29,6 @@</div><div class='ctx'> #include "file-item.h"</div><div class='ctx'> #include "inode-item.h"</div><div class='ctx'> #include "dir-item.h"</div><div class='del'>-#include "raid-stripe-tree.h"</div><div class='ctx'> #include "extent-tree.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -67,6 +65,7 @@ static void generic_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='add'>+	dump_page(folio_page(eb-&gt;folios[0], 0), "eb page dump");</div><div class='ctx'> 	btrfs_crit(fs_info,</div><div class='ctx'> 		"corrupt %s: root=%llu block=%llu slot=%d, %pV",</div><div class='ctx'> 		btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -94,6 +93,7 @@ static void file_extent_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='add'>+	dump_page(folio_page(eb-&gt;folios[0], 0), "eb page dump");</div><div class='ctx'> 	btrfs_crit(fs_info,</div><div class='ctx'> 	"corrupt %s: root=%llu block=%llu slot=%d ino=%llu file_offset=%llu, %pV",</div><div class='ctx'> 		btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -154,6 +154,7 @@ static void dir_item_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='add'>+	dump_page(folio_page(eb-&gt;folios[0], 0), "eb page dump");</div><div class='ctx'> 	btrfs_crit(fs_info,</div><div class='ctx'> 		"corrupt %s: root=%llu block=%llu slot=%d ino=%llu, %pV",</div><div class='ctx'> 		btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -182,15 +183,16 @@ static bool check_prev_ino(struct extent_buffer *leaf,</div><div class='ctx'> 	/* Only these key-&gt;types needs to be checked */</div><div class='ctx'> 	ASSERT(key-&gt;type == BTRFS_XATTR_ITEM_KEY ||</div><div class='ctx'> 	       key-&gt;type == BTRFS_INODE_REF_KEY ||</div><div class='add'>+	       key-&gt;type == BTRFS_INODE_EXTREF_KEY ||</div><div class='ctx'> 	       key-&gt;type == BTRFS_DIR_INDEX_KEY ||</div><div class='ctx'> 	       key-&gt;type == BTRFS_DIR_ITEM_KEY ||</div><div class='del'>-	       key-&gt;type == BTRFS_EXTENT_DATA_KEY);</div><div class='add'>+	       key-&gt;type == BTRFS_EXTENT_DATA_KEY, "key-&gt;type=%u", key-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only subvolume trees along with their reloc trees need this check.</div><div class='ctx'> 	 * Things like log tree doesn't follow this ino requirement.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_fstree(btrfs_header_owner(leaf)))</div><div class='add'>+	if (!btrfs_is_fstree(btrfs_header_owner(leaf)))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;objectid == prev_key-&gt;objectid)</div><div class='hunk'>@@ -339,6 +341,24 @@ static int check_extent_data_item(struct extent_buffer *leaf,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * For non-compressed data extents, ram_bytes should match its</div><div class='add'>+	 * disk_num_bytes.</div><div class='add'>+	 * However we do not really utilize ram_bytes in this case, so this check</div><div class='add'>+	 * is only optional for DEBUG builds for developers to catch the</div><div class='add'>+	 * unexpected behaviors.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ENABLED(CONFIG_BTRFS_DEBUG) &amp;&amp;</div><div class='add'>+	    btrfs_file_extent_compression(leaf, fi) == BTRFS_COMPRESS_NONE &amp;&amp;</div><div class='add'>+	    btrfs_file_extent_disk_bytenr(leaf, fi)) {</div><div class='add'>+		if (WARN_ON(btrfs_file_extent_ram_bytes(leaf, fi) !=</div><div class='add'>+			    btrfs_file_extent_disk_num_bytes(leaf, fi)))</div><div class='add'>+			file_extent_err(leaf, slot,</div><div class='add'>+"mismatch ram_bytes (%llu) and disk_num_bytes (%llu) for non-compressed extent",</div><div class='add'>+					btrfs_file_extent_ram_bytes(leaf, fi),</div><div class='add'>+					btrfs_file_extent_disk_num_bytes(leaf, fi));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -456,7 +476,7 @@ static int check_root_key(struct extent_buffer *leaf, struct btrfs_key *key,</div><div class='ctx'> 	 * to be COWed to be relocated.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(is_root_item &amp;&amp; key-&gt;objectid == BTRFS_TREE_RELOC_OBJECTID &amp;&amp;</div><div class='del'>-		     !is_fstree(key-&gt;offset))) {</div><div class='add'>+		     !btrfs_is_fstree(key-&gt;offset))) {</div><div class='ctx'> 		generic_err(leaf, slot,</div><div class='ctx'> 		"invalid reloc tree for root %lld, root id is not a subvolume tree",</div><div class='ctx'> 			    key-&gt;offset);</div><div class='hunk'>@@ -474,7 +494,7 @@ static int check_root_key(struct extent_buffer *leaf, struct btrfs_key *key,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* DIR_ITEM/INDEX/INODE_REF is not allowed to point to non-fs trees */</div><div class='del'>-	if (unlikely(!is_fstree(key-&gt;objectid) &amp;&amp; !is_root_item)) {</div><div class='add'>+	if (unlikely(!btrfs_is_fstree(key-&gt;objectid) &amp;&amp; !is_root_item)) {</div><div class='ctx'> 		dir_item_err(leaf, slot,</div><div class='ctx'> 		"invalid location key objectid, have %llu expect [%llu, %llu]",</div><div class='ctx'> 				key-&gt;objectid, BTRFS_FIRST_FREE_OBJECTID,</div><div class='hunk'>@@ -550,9 +570,10 @@ static int check_dir_item(struct extent_buffer *leaf,</div><div class='ctx'> </div><div class='ctx'> 		/* dir type check */</div><div class='ctx'> 		dir_type = btrfs_dir_ftype(leaf, di);</div><div class='del'>-		if (unlikely(dir_type &gt;= BTRFS_FT_MAX)) {</div><div class='add'>+		if (unlikely(dir_type &lt;= BTRFS_FT_UNKNOWN ||</div><div class='add'>+			     dir_type &gt;= BTRFS_FT_MAX)) {</div><div class='ctx'> 			dir_item_err(leaf, slot,</div><div class='del'>-			"invalid dir item type, have %u expect [0, %u)",</div><div class='add'>+			"invalid dir item type, have %u expect (0, %u)",</div><div class='ctx'> 				dir_type, BTRFS_FT_MAX);</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -615,7 +636,7 @@ static int check_dir_item(struct extent_buffer *leaf,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (key-&gt;type == BTRFS_DIR_ITEM_KEY ||</div><div class='ctx'> 		    key-&gt;type == BTRFS_XATTR_ITEM_KEY) {</div><div class='del'>-			char namebuf[max(BTRFS_NAME_LEN, XATTR_NAME_MAX)];</div><div class='add'>+			char namebuf[MAX(BTRFS_NAME_LEN, XATTR_NAME_MAX)];</div><div class='ctx'> </div><div class='ctx'> 			read_extent_buffer(leaf, namebuf,</div><div class='ctx'> 					(unsigned long)(di + 1), name_len);</div><div class='hunk'>@@ -649,6 +670,7 @@ static void block_group_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='add'>+	dump_page(folio_page(eb-&gt;folios[0], 0), "eb page dump");</div><div class='ctx'> 	btrfs_crit(fs_info,</div><div class='ctx'> 	"corrupt %s: root=%llu block=%llu slot=%d bg_start=%llu bg_len=%llu, %pV",</div><div class='ctx'> 		btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -743,22 +765,19 @@ static int check_block_group_item(struct extent_buffer *leaf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__printf(4, 5)</div><div class='add'>+__printf(5, 6)</div><div class='ctx'> __cold</div><div class='del'>-static void chunk_err(const struct extent_buffer *leaf,</div><div class='add'>+static void chunk_err(const struct btrfs_fs_info *fs_info,</div><div class='add'>+		      const struct extent_buffer *leaf,</div><div class='ctx'> 		      const struct btrfs_chunk *chunk, u64 logical,</div><div class='ctx'> 		      const char *fmt, ...)</div><div class='ctx'> {</div><div class='del'>-	const struct btrfs_fs_info *fs_info = leaf-&gt;fs_info;</div><div class='del'>-	bool is_sb;</div><div class='add'>+	bool is_sb = !leaf;</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int slot = -1;</div><div class='ctx'> </div><div class='del'>-	/* Only superblock eb is able to have such small offset */</div><div class='del'>-	is_sb = (leaf-&gt;start == BTRFS_SUPER_INFO_OFFSET);</div><div class='del'>-</div><div class='ctx'> 	if (!is_sb) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Get the slot number by iterating through all slots, this</div><div class='hunk'>@@ -791,13 +810,17 @@ static void chunk_err(const struct extent_buffer *leaf,</div><div class='ctx'> /*</div><div class='ctx'>  * The common chunk check which could also work on super block sys chunk array.</div><div class='ctx'>  *</div><div class='add'>+ * If @leaf is NULL, then @chunk must be an on-stack chunk item.</div><div class='add'>+ * (For superblock sys_chunk array, and fs_info-&gt;sectorsize is unreliable)</div><div class='add'>+ *</div><div class='ctx'>  * Return -EUCLEAN if anything is corrupted.</div><div class='ctx'>  * Return 0 if everything is OK.</div><div class='ctx'>  */</div><div class='del'>-int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='del'>-			    struct btrfs_chunk *chunk, u64 logical)</div><div class='add'>+int btrfs_check_chunk_valid(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			    const struct extent_buffer *leaf,</div><div class='add'>+			    const struct btrfs_chunk *chunk, u64 logical,</div><div class='add'>+			    u32 sectorsize)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = leaf-&gt;fs_info;</div><div class='ctx'> 	u64 length;</div><div class='ctx'> 	u64 chunk_end;</div><div class='ctx'> 	u64 stripe_len;</div><div class='hunk'>@@ -805,63 +828,73 @@ int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='ctx'> 	u16 sub_stripes;</div><div class='ctx'> 	u64 type;</div><div class='ctx'> 	u64 features;</div><div class='add'>+	u32 chunk_sector_size;</div><div class='ctx'> 	bool mixed = false;</div><div class='ctx'> 	int raid_index;</div><div class='ctx'> 	int nparity;</div><div class='ctx'> 	int ncopies;</div><div class='ctx'> </div><div class='del'>-	length = btrfs_chunk_length(leaf, chunk);</div><div class='del'>-	stripe_len = btrfs_chunk_stripe_len(leaf, chunk);</div><div class='del'>-	num_stripes = btrfs_chunk_num_stripes(leaf, chunk);</div><div class='del'>-	sub_stripes = btrfs_chunk_sub_stripes(leaf, chunk);</div><div class='del'>-	type = btrfs_chunk_type(leaf, chunk);</div><div class='add'>+	if (leaf) {</div><div class='add'>+		length = btrfs_chunk_length(leaf, chunk);</div><div class='add'>+		stripe_len = btrfs_chunk_stripe_len(leaf, chunk);</div><div class='add'>+		num_stripes = btrfs_chunk_num_stripes(leaf, chunk);</div><div class='add'>+		sub_stripes = btrfs_chunk_sub_stripes(leaf, chunk);</div><div class='add'>+		type = btrfs_chunk_type(leaf, chunk);</div><div class='add'>+		chunk_sector_size = btrfs_chunk_sector_size(leaf, chunk);</div><div class='add'>+	} else {</div><div class='add'>+		length = btrfs_stack_chunk_length(chunk);</div><div class='add'>+		stripe_len = btrfs_stack_chunk_stripe_len(chunk);</div><div class='add'>+		num_stripes = btrfs_stack_chunk_num_stripes(chunk);</div><div class='add'>+		sub_stripes = btrfs_stack_chunk_sub_stripes(chunk);</div><div class='add'>+		type = btrfs_stack_chunk_type(chunk);</div><div class='add'>+		chunk_sector_size = btrfs_stack_chunk_sector_size(chunk);</div><div class='add'>+	}</div><div class='ctx'> 	raid_index = btrfs_bg_flags_to_raid_index(type);</div><div class='ctx'> 	ncopies = btrfs_raid_array[raid_index].ncopies;</div><div class='ctx'> 	nparity = btrfs_raid_array[raid_index].nparity;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!num_stripes)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "invalid chunk num_stripes, have %u", num_stripes);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(num_stripes &lt; ncopies)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "invalid chunk num_stripes &lt; ncopies, have %u &lt; %d",</div><div class='ctx'> 			  num_stripes, ncopies);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(nparity &amp;&amp; num_stripes == nparity)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "invalid chunk num_stripes == nparity, have %u == %d",</div><div class='ctx'> 			  num_stripes, nparity);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(!IS_ALIGNED(logical, fs_info-&gt;sectorsize))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+	if (unlikely(!IS_ALIGNED(logical, sectorsize))) {</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 		"invalid chunk logical, have %llu should aligned to %u",</div><div class='del'>-			  logical, fs_info-&gt;sectorsize);</div><div class='add'>+			  logical, sectorsize);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(btrfs_chunk_sector_size(leaf, chunk) != fs_info-&gt;sectorsize)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+	if (unlikely(chunk_sector_size != sectorsize)) {</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "invalid chunk sectorsize, have %u expect %u",</div><div class='del'>-			  btrfs_chunk_sector_size(leaf, chunk),</div><div class='del'>-			  fs_info-&gt;sectorsize);</div><div class='add'>+			  chunk_sector_size, sectorsize);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(!length || !IS_ALIGNED(length, fs_info-&gt;sectorsize))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+	if (unlikely(!length || !IS_ALIGNED(length, sectorsize))) {</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "invalid chunk length, have %llu", length);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(check_add_overflow(logical, length, &amp;chunk_end))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> "invalid chunk logical start and length, have logical start %llu length %llu",</div><div class='ctx'> 			  logical, length);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(!is_power_of_2(stripe_len) || stripe_len != BTRFS_STRIPE_LEN)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "invalid chunk stripe length: %llu",</div><div class='ctx'> 			  stripe_len);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='hunk'>@@ -875,30 +908,29 @@ int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='ctx'> 	 * Thus it should be a good way to catch obvious bitflips.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(length &gt;= btrfs_stripe_nr_to_offset(U32_MAX))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "chunk length too large: have %llu limit %llu",</div><div class='ctx'> 			  length, btrfs_stripe_nr_to_offset(U32_MAX));</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(type &amp; ~(BTRFS_BLOCK_GROUP_TYPE_MASK |</div><div class='ctx'> 			      BTRFS_BLOCK_GROUP_PROFILE_MASK))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "unrecognized chunk type: 0x%llx",</div><div class='ctx'> 			  ~(BTRFS_BLOCK_GROUP_TYPE_MASK |</div><div class='del'>-			    BTRFS_BLOCK_GROUP_PROFILE_MASK) &amp;</div><div class='del'>-			  btrfs_chunk_type(leaf, chunk));</div><div class='add'>+			    BTRFS_BLOCK_GROUP_PROFILE_MASK) &amp; type);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!has_single_bit_set(type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK) &amp;&amp;</div><div class='ctx'> 		     (type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK) != 0)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 		"invalid chunk profile flag: 0x%llx, expect 0 or 1 bit set",</div><div class='ctx'> 			  type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely((type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK) == 0)) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 	"missing chunk type flag, have 0x%llx one bit must be set in 0x%llx",</div><div class='ctx'> 			  type, BTRFS_BLOCK_GROUP_TYPE_MASK);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='hunk'>@@ -907,7 +939,7 @@ int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='ctx'> 	if (unlikely((type &amp; BTRFS_BLOCK_GROUP_SYSTEM) &amp;&amp;</div><div class='ctx'> 		     (type &amp; (BTRFS_BLOCK_GROUP_METADATA |</div><div class='ctx'> 			      BTRFS_BLOCK_GROUP_DATA)))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			  "system chunk with data or metadata type: 0x%llx",</div><div class='ctx'> 			  type);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='hunk'>@@ -920,7 +952,7 @@ int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='ctx'> 	if (!mixed) {</div><div class='ctx'> 		if (unlikely((type &amp; BTRFS_BLOCK_GROUP_METADATA) &amp;&amp;</div><div class='ctx'> 			     (type &amp; BTRFS_BLOCK_GROUP_DATA))) {</div><div class='del'>-			chunk_err(leaf, chunk, logical,</div><div class='add'>+			chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			"mixed chunk type in non-mixed mode: 0x%llx", type);</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -942,7 +974,7 @@ int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='ctx'> 		      num_stripes != btrfs_raid_array[BTRFS_RAID_DUP].dev_stripes) ||</div><div class='ctx'> 		     ((type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK) == 0 &amp;&amp;</div><div class='ctx'> 		      num_stripes != btrfs_raid_array[BTRFS_RAID_SINGLE].dev_stripes))) {</div><div class='del'>-		chunk_err(leaf, chunk, logical,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, logical,</div><div class='ctx'> 			"invalid num_stripes:sub_stripes %u:%u for profile %llu",</div><div class='ctx'> 			num_stripes, sub_stripes,</div><div class='ctx'> 			type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK);</div><div class='hunk'>@@ -962,14 +994,15 @@ static int check_leaf_chunk_item(struct extent_buffer *leaf,</div><div class='ctx'> 				 struct btrfs_chunk *chunk,</div><div class='ctx'> 				 struct btrfs_key *key, int slot)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = leaf-&gt;fs_info;</div><div class='ctx'> 	int num_stripes;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(btrfs_item_size(leaf, slot) &lt; sizeof(struct btrfs_chunk))) {</div><div class='del'>-		chunk_err(leaf, chunk, key-&gt;offset,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, key-&gt;offset,</div><div class='ctx'> 			"invalid chunk item size: have %u expect [%zu, %u)",</div><div class='ctx'> 			btrfs_item_size(leaf, slot),</div><div class='ctx'> 			sizeof(struct btrfs_chunk),</div><div class='del'>-			BTRFS_LEAF_DATA_SIZE(leaf-&gt;fs_info));</div><div class='add'>+			BTRFS_LEAF_DATA_SIZE(fs_info));</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -980,14 +1013,15 @@ static int check_leaf_chunk_item(struct extent_buffer *leaf,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(btrfs_chunk_item_size(num_stripes) !=</div><div class='ctx'> 		     btrfs_item_size(leaf, slot))) {</div><div class='del'>-		chunk_err(leaf, chunk, key-&gt;offset,</div><div class='add'>+		chunk_err(fs_info, leaf, chunk, key-&gt;offset,</div><div class='ctx'> 			"invalid chunk item size: have %u expect %lu",</div><div class='ctx'> 			btrfs_item_size(leaf, slot),</div><div class='ctx'> 			btrfs_chunk_item_size(num_stripes));</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return btrfs_check_chunk_valid(leaf, chunk, key-&gt;offset);</div><div class='add'>+	return btrfs_check_chunk_valid(fs_info, leaf, chunk, key-&gt;offset,</div><div class='add'>+				       fs_info-&gt;sectorsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __printf(3, 4)</div><div class='hunk'>@@ -1005,6 +1039,7 @@ static void dev_item_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='add'>+	dump_page(folio_page(eb-&gt;folios[0], 0), "eb page dump");</div><div class='ctx'> 	btrfs_crit(eb-&gt;fs_info,</div><div class='ctx'> 	"corrupt %s: root=%llu block=%llu slot=%d devid=%llu %pV",</div><div class='ctx'> 		btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -1175,7 +1210,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For legacy root item, the members starting at generation_v2 will be</div><div class='ctx'> 	 * all filled with 0.</div><div class='del'>-	 * And since we allow geneartion_v2 as 0, it will still pass the check.</div><div class='add'>+	 * And since we allow generation_v2 as 0, it will still pass the check.</div><div class='ctx'> 	 */</div><div class='ctx'> 	read_extent_buffer(leaf, &amp;ri, btrfs_item_ptr_offset(leaf, slot),</div><div class='ctx'> 			   btrfs_item_size(leaf, slot));</div><div class='hunk'>@@ -1260,6 +1295,7 @@ static void extent_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	vaf.fmt = fmt;</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='add'>+	dump_page(folio_page(eb-&gt;folios[0], 0), "eb page dump");</div><div class='ctx'> 	btrfs_crit(eb-&gt;fs_info,</div><div class='ctx'> 	"corrupt %s: block=%llu slot=%d extent bytenr=%llu len=%llu %pV",</div><div class='ctx'> 		btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -1267,6 +1303,19 @@ static void extent_err(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_valid_dref_root(u64 rootid)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The following tree root objectids are allowed to have a data backref:</div><div class='add'>+	 * - subvolume trees</div><div class='add'>+	 * - data reloc tree</div><div class='add'>+	 * - tree root</div><div class='add'>+	 *   For v1 space cache</div><div class='add'>+	 */</div><div class='add'>+	return btrfs_is_fstree(rootid) || rootid == BTRFS_DATA_RELOC_TREE_OBJECTID ||</div><div class='add'>+	       rootid == BTRFS_ROOT_TREE_OBJECTID;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 			     struct btrfs_key *key, int slot,</div><div class='ctx'> 			     struct btrfs_key *prev_key)</div><div class='hunk'>@@ -1419,6 +1468,8 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 		struct btrfs_extent_data_ref *dref;</div><div class='ctx'> 		struct btrfs_shared_data_ref *sref;</div><div class='ctx'> 		u64 seq;</div><div class='add'>+		u64 dref_root;</div><div class='add'>+		u64 dref_objectid;</div><div class='ctx'> 		u64 dref_offset;</div><div class='ctx'> 		u64 inline_offset;</div><div class='ctx'> 		u8 inline_type;</div><div class='hunk'>@@ -1436,7 +1487,7 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 		if (unlikely(ptr + btrfs_extent_inline_ref_size(inline_type) &gt; end)) {</div><div class='ctx'> 			extent_err(leaf, slot,</div><div class='ctx'> "inline ref item overflows extent item, ptr %lu iref size %u end %lu",</div><div class='del'>-				   ptr, inline_type, end);</div><div class='add'>+				   ptr, btrfs_extent_inline_ref_size(inline_type), end);</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1462,11 +1513,26 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 		 */</div><div class='ctx'> 		case BTRFS_EXTENT_DATA_REF_KEY:</div><div class='ctx'> 			dref = (struct btrfs_extent_data_ref *)(&amp;iref-&gt;offset);</div><div class='add'>+			dref_root = btrfs_extent_data_ref_root(leaf, dref);</div><div class='add'>+			dref_objectid = btrfs_extent_data_ref_objectid(leaf, dref);</div><div class='ctx'> 			dref_offset = btrfs_extent_data_ref_offset(leaf, dref);</div><div class='ctx'> 			seq = hash_extent_data_ref(</div><div class='ctx'> 					btrfs_extent_data_ref_root(leaf, dref),</div><div class='ctx'> 					btrfs_extent_data_ref_objectid(leaf, dref),</div><div class='ctx'> 					btrfs_extent_data_ref_offset(leaf, dref));</div><div class='add'>+			if (unlikely(!is_valid_dref_root(dref_root))) {</div><div class='add'>+				extent_err(leaf, slot,</div><div class='add'>+					   "invalid data ref root value %llu",</div><div class='add'>+					   dref_root);</div><div class='add'>+				return -EUCLEAN;</div><div class='add'>+			}</div><div class='add'>+			if (unlikely(dref_objectid &lt; BTRFS_FIRST_FREE_OBJECTID ||</div><div class='add'>+				     dref_objectid &gt; BTRFS_LAST_FREE_OBJECTID)) {</div><div class='add'>+				extent_err(leaf, slot,</div><div class='add'>+					   "invalid data ref objectid value %llu",</div><div class='add'>+					   dref_objectid);</div><div class='add'>+				return -EUCLEAN;</div><div class='add'>+			}</div><div class='ctx'> 			if (unlikely(!IS_ALIGNED(dref_offset,</div><div class='ctx'> 						 fs_info-&gt;sectorsize))) {</div><div class='ctx'> 				extent_err(leaf, slot,</div><div class='hunk'>@@ -1474,6 +1540,11 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 					   dref_offset, fs_info-&gt;sectorsize);</div><div class='ctx'> 				return -EUCLEAN;</div><div class='ctx'> 			}</div><div class='add'>+			if (unlikely(btrfs_extent_data_ref_count(leaf, dref) == 0)) {</div><div class='add'>+				extent_err(leaf, slot,</div><div class='add'>+			"invalid data ref count, should have non-zero value");</div><div class='add'>+				return -EUCLEAN;</div><div class='add'>+			}</div><div class='ctx'> 			inline_refs += btrfs_extent_data_ref_count(leaf, dref);</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* Contains parent bytenr and ref count */</div><div class='hunk'>@@ -1486,6 +1557,11 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 					   inline_offset, fs_info-&gt;sectorsize);</div><div class='ctx'> 				return -EUCLEAN;</div><div class='ctx'> 			}</div><div class='add'>+			if (unlikely(btrfs_shared_data_ref_count(leaf, sref) == 0)) {</div><div class='add'>+				extent_err(leaf, slot,</div><div class='add'>+			"invalid shared data ref count, should have non-zero value");</div><div class='add'>+				return -EUCLEAN;</div><div class='add'>+			}</div><div class='ctx'> 			inline_refs += btrfs_shared_data_ref_count(leaf, sref);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_EXTENT_OWNER_REF_KEY:</div><div class='hunk'>@@ -1496,7 +1572,7 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 				   inline_type);</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='del'>-		if (inline_type &lt; last_type) {</div><div class='add'>+		if (unlikely(inline_type &lt; last_type)) {</div><div class='ctx'> 			extent_err(leaf, slot,</div><div class='ctx'> 				   "inline ref out-of-order: has type %u, prev type %u",</div><div class='ctx'> 				   inline_type, last_type);</div><div class='hunk'>@@ -1505,7 +1581,7 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> 		/* Type changed, allow the sequence starts from U64_MAX again. */</div><div class='ctx'> 		if (inline_type &gt; last_type)</div><div class='ctx'> 			last_seq = U64_MAX;</div><div class='del'>-		if (seq &gt; last_seq) {</div><div class='add'>+		if (unlikely(seq &gt; last_seq)) {</div><div class='ctx'> 			extent_err(leaf, slot,</div><div class='ctx'> "inline ref out-of-order: has type %u offset %llu seq 0x%llx, prev type %u seq 0x%llx",</div><div class='ctx'> 				   inline_type, inline_offset, seq,</div><div class='hunk'>@@ -1542,10 +1618,9 @@ static int check_extent_item(struct extent_buffer *leaf,</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(prev_end &gt; key-&gt;objectid)) {</div><div class='ctx'> 			extent_err(leaf, slot,</div><div class='del'>-	"previous extent [%llu %u %llu] overlaps current extent [%llu %u %llu]",</div><div class='del'>-				   prev_key-&gt;objectid, prev_key-&gt;type,</div><div class='del'>-				   prev_key-&gt;offset, key-&gt;objectid, key-&gt;type,</div><div class='del'>-				   key-&gt;offset);</div><div class='add'>+	"previous extent " BTRFS_KEY_FMT " overlaps current extent " BTRFS_KEY_FMT,</div><div class='add'>+				   BTRFS_KEY_FMT_VALUE(prev_key),</div><div class='add'>+				   BTRFS_KEY_FMT_VALUE(key));</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1558,8 +1633,18 @@ static int check_simple_keyed_refs(struct extent_buffer *leaf,</div><div class='ctx'> {</div><div class='ctx'> 	u32 expect_item_size = 0;</div><div class='ctx'> </div><div class='del'>-	if (key-&gt;type == BTRFS_SHARED_DATA_REF_KEY)</div><div class='add'>+	if (key-&gt;type == BTRFS_SHARED_DATA_REF_KEY) {</div><div class='add'>+		struct btrfs_shared_data_ref *sref;</div><div class='add'>+</div><div class='add'>+		sref = btrfs_item_ptr(leaf, slot, struct btrfs_shared_data_ref);</div><div class='add'>+		if (unlikely(btrfs_shared_data_ref_count(leaf, sref) == 0)) {</div><div class='add'>+			extent_err(leaf, slot,</div><div class='add'>+		"invalid shared data backref count, should have non-zero value");</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		expect_item_size = sizeof(struct btrfs_shared_data_ref);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(btrfs_item_size(leaf, slot) != expect_item_size)) {</div><div class='ctx'> 		generic_err(leaf, slot,</div><div class='hunk'>@@ -1605,6 +1690,8 @@ static int check_extent_data_ref(struct extent_buffer *leaf,</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (; ptr &lt; end; ptr += sizeof(*dref)) {</div><div class='add'>+		u64 root;</div><div class='add'>+		u64 objectid;</div><div class='ctx'> 		u64 offset;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1612,13 +1699,33 @@ static int check_extent_data_ref(struct extent_buffer *leaf,</div><div class='ctx'> 		 * overflow from the leaf due to hash collisions.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dref = (struct btrfs_extent_data_ref *)ptr;</div><div class='add'>+		root = btrfs_extent_data_ref_root(leaf, dref);</div><div class='add'>+		objectid = btrfs_extent_data_ref_objectid(leaf, dref);</div><div class='ctx'> 		offset = btrfs_extent_data_ref_offset(leaf, dref);</div><div class='add'>+		if (unlikely(!is_valid_dref_root(root))) {</div><div class='add'>+			extent_err(leaf, slot,</div><div class='add'>+				   "invalid extent data backref root value %llu",</div><div class='add'>+				   root);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+		if (unlikely(objectid &lt; BTRFS_FIRST_FREE_OBJECTID ||</div><div class='add'>+			     objectid &gt; BTRFS_LAST_FREE_OBJECTID)) {</div><div class='add'>+			extent_err(leaf, slot,</div><div class='add'>+				   "invalid extent data backref objectid value %llu",</div><div class='add'>+				   root);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='ctx'> 		if (unlikely(!IS_ALIGNED(offset, leaf-&gt;fs_info-&gt;sectorsize))) {</div><div class='ctx'> 			extent_err(leaf, slot,</div><div class='ctx'> 	"invalid extent data backref offset, have %llu expect aligned to %u",</div><div class='ctx'> 				   offset, leaf-&gt;fs_info-&gt;sectorsize);</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='add'>+		if (unlikely(btrfs_extent_data_ref_count(leaf, dref) == 0)) {</div><div class='add'>+			extent_err(leaf, slot,</div><div class='add'>+	"invalid extent data backref count, should have non-zero value");</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1649,10 +1756,10 @@ static int check_inode_ref(struct extent_buffer *leaf,</div><div class='ctx'> 	while (ptr &lt; end) {</div><div class='ctx'> 		u16 namelen;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(ptr + sizeof(iref) &gt; end)) {</div><div class='add'>+		if (unlikely(ptr + sizeof(*iref) &gt; end)) {</div><div class='ctx'> 			inode_ref_err(leaf, slot,</div><div class='ctx'> 			"inode ref overflow, ptr %lu end %lu inode_ref_size %zu",</div><div class='del'>-				ptr, end, sizeof(iref));</div><div class='add'>+				ptr, end, sizeof(*iref));</div><div class='ctx'> 			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1675,12 +1782,42 @@ static int check_inode_ref(struct extent_buffer *leaf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int check_inode_extref(struct extent_buffer *leaf,</div><div class='add'>+			      struct btrfs_key *key, struct btrfs_key *prev_key,</div><div class='add'>+			      int slot)</div><div class='add'>+{</div><div class='add'>+	unsigned long ptr = btrfs_item_ptr_offset(leaf, slot);</div><div class='add'>+	unsigned long end = ptr + btrfs_item_size(leaf, slot);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!check_prev_ino(leaf, key, slot, prev_key)))</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+</div><div class='add'>+	while (ptr &lt; end) {</div><div class='add'>+		struct btrfs_inode_extref *extref = (struct btrfs_inode_extref *)ptr;</div><div class='add'>+		u16 namelen;</div><div class='add'>+</div><div class='add'>+		if (unlikely(ptr + sizeof(*extref) &gt; end)) {</div><div class='add'>+			inode_ref_err(leaf, slot,</div><div class='add'>+			"inode extref overflow, ptr %lu end %lu inode_extref size %zu",</div><div class='add'>+				      ptr, end, sizeof(*extref));</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		namelen = btrfs_inode_extref_name_len(leaf, extref);</div><div class='add'>+		if (unlikely(ptr + sizeof(*extref) + namelen &gt; end)) {</div><div class='add'>+			inode_ref_err(leaf, slot,</div><div class='add'>+				"inode extref overflow, ptr %lu end %lu namelen %u",</div><div class='add'>+				ptr, end, namelen);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+		ptr += sizeof(*extref) + namelen;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int check_raid_stripe_extent(const struct extent_buffer *leaf,</div><div class='ctx'> 				    const struct btrfs_key *key, int slot)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_stripe_extent *stripe_extent =</div><div class='del'>-		btrfs_item_ptr(leaf, slot, struct btrfs_stripe_extent);</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(!IS_ALIGNED(key-&gt;objectid, leaf-&gt;fs_info-&gt;sectorsize))) {</div><div class='ctx'> 		generic_err(leaf, slot,</div><div class='ctx'> "invalid key objectid for raid stripe extent, have %llu expect aligned to %u",</div><div class='hunk'>@@ -1694,22 +1831,72 @@ static int check_raid_stripe_extent(const struct extent_buffer *leaf,</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (btrfs_stripe_extent_encoding(leaf, stripe_extent)) {</div><div class='del'>-	case BTRFS_STRIPE_RAID0:</div><div class='del'>-	case BTRFS_STRIPE_RAID1:</div><div class='del'>-	case BTRFS_STRIPE_DUP:</div><div class='del'>-	case BTRFS_STRIPE_RAID10:</div><div class='del'>-	case BTRFS_STRIPE_RAID5:</div><div class='del'>-	case BTRFS_STRIPE_RAID6:</div><div class='del'>-	case BTRFS_STRIPE_RAID1C3:</div><div class='del'>-	case BTRFS_STRIPE_RAID1C4:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		generic_err(leaf, slot, "invalid raid stripe encoding %u",</div><div class='del'>-			    btrfs_stripe_extent_encoding(leaf, stripe_extent));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_dev_extent_item(const struct extent_buffer *leaf,</div><div class='add'>+				 const struct btrfs_key *key,</div><div class='add'>+				 int slot,</div><div class='add'>+				 struct btrfs_key *prev_key)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_dev_extent *de;</div><div class='add'>+	const u32 sectorsize = leaf-&gt;fs_info-&gt;sectorsize;</div><div class='add'>+</div><div class='add'>+	de = btrfs_item_ptr(leaf, slot, struct btrfs_dev_extent);</div><div class='add'>+	/* Basic fixed member checks. */</div><div class='add'>+	if (unlikely(btrfs_dev_extent_chunk_tree(leaf, de) !=</div><div class='add'>+		     BTRFS_CHUNK_TREE_OBJECTID)) {</div><div class='add'>+		generic_err(leaf, slot,</div><div class='add'>+			    "invalid dev extent chunk tree id, has %llu expect %llu",</div><div class='add'>+			    btrfs_dev_extent_chunk_tree(leaf, de),</div><div class='add'>+			    BTRFS_CHUNK_TREE_OBJECTID);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(btrfs_dev_extent_chunk_objectid(leaf, de) !=</div><div class='add'>+		     BTRFS_FIRST_CHUNK_TREE_OBJECTID)) {</div><div class='add'>+		generic_err(leaf, slot,</div><div class='add'>+			    "invalid dev extent chunk objectid, has %llu expect %llu",</div><div class='add'>+			    btrfs_dev_extent_chunk_objectid(leaf, de),</div><div class='add'>+			    BTRFS_FIRST_CHUNK_TREE_OBJECTID);</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='add'>+	/* Alignment check. */</div><div class='add'>+	if (unlikely(!IS_ALIGNED(key-&gt;offset, sectorsize))) {</div><div class='add'>+		generic_err(leaf, slot,</div><div class='add'>+			    "invalid dev extent key.offset, has %llu not aligned to %u",</div><div class='add'>+			    key-&gt;offset, sectorsize);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!IS_ALIGNED(btrfs_dev_extent_chunk_offset(leaf, de),</div><div class='add'>+				 sectorsize))) {</div><div class='add'>+		generic_err(leaf, slot,</div><div class='add'>+			    "invalid dev extent chunk offset, has %llu not aligned to %u",</div><div class='add'>+			    btrfs_dev_extent_chunk_objectid(leaf, de),</div><div class='add'>+			    sectorsize);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!IS_ALIGNED(btrfs_dev_extent_length(leaf, de),</div><div class='add'>+				 sectorsize))) {</div><div class='add'>+		generic_err(leaf, slot,</div><div class='add'>+			    "invalid dev extent length, has %llu not aligned to %u",</div><div class='add'>+			    btrfs_dev_extent_length(leaf, de), sectorsize);</div><div class='add'>+		return -EUCLEAN;</div><div class='add'>+	}</div><div class='add'>+	/* Overlap check with previous dev extent. */</div><div class='add'>+	if (slot &amp;&amp; prev_key-&gt;objectid == key-&gt;objectid &amp;&amp;</div><div class='add'>+	    prev_key-&gt;type == key-&gt;type) {</div><div class='add'>+		struct btrfs_dev_extent *prev_de;</div><div class='add'>+		u64 prev_len;</div><div class='ctx'> </div><div class='add'>+		prev_de = btrfs_item_ptr(leaf, slot - 1, struct btrfs_dev_extent);</div><div class='add'>+		prev_len = btrfs_dev_extent_length(leaf, prev_de);</div><div class='add'>+		if (unlikely(prev_key-&gt;offset + prev_len &gt; key-&gt;offset)) {</div><div class='add'>+			generic_err(leaf, slot,</div><div class='add'>+		"dev extent overlap, prev offset %llu len %llu current offset %llu",</div><div class='add'>+				    prev_key-&gt;objectid, prev_len, key-&gt;offset);</div><div class='add'>+			return -EUCLEAN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1739,6 +1926,9 @@ static enum btrfs_tree_block_status check_leaf_item(struct extent_buffer *leaf,</div><div class='ctx'> 	case BTRFS_INODE_REF_KEY:</div><div class='ctx'> 		ret = check_inode_ref(leaf, key, prev_key, slot);</div><div class='ctx'> 		break;</div><div class='add'>+	case BTRFS_INODE_EXTREF_KEY:</div><div class='add'>+		ret = check_inode_extref(leaf, key, prev_key, slot);</div><div class='add'>+		break;</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_ITEM_KEY:</div><div class='ctx'> 		ret = check_block_group_item(leaf, key, slot);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1749,6 +1939,9 @@ static enum btrfs_tree_block_status check_leaf_item(struct extent_buffer *leaf,</div><div class='ctx'> 	case BTRFS_DEV_ITEM_KEY:</div><div class='ctx'> 		ret = check_dev_item(leaf, key, slot);</div><div class='ctx'> 		break;</div><div class='add'>+	case BTRFS_DEV_EXTENT_KEY:</div><div class='add'>+		ret = check_dev_extent_item(leaf, key, slot, prev_key);</div><div class='add'>+		break;</div><div class='ctx'> 	case BTRFS_INODE_ITEM_KEY:</div><div class='ctx'> 		ret = check_inode_item(leaf, key, slot);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1772,7 +1965,7 @@ static enum btrfs_tree_block_status check_leaf_item(struct extent_buffer *leaf,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='add'>+	if (unlikely(ret))</div><div class='ctx'> 		return BTRFS_TREE_BLOCK_INVALID_ITEM;</div><div class='ctx'> 	return BTRFS_TREE_BLOCK_CLEAN;</div><div class='ctx'> }</div><div class='hunk'>@@ -1793,6 +1986,11 @@ enum btrfs_tree_block_status __btrfs_check_leaf(struct extent_buffer *leaf)</div><div class='ctx'> 		return BTRFS_TREE_BLOCK_INVALID_LEVEL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!btrfs_header_flag(leaf, BTRFS_HEADER_FLAG_WRITTEN))) {</div><div class='add'>+		generic_err(leaf, 0, "invalid flag for leaf, WRITTEN not set");</div><div class='add'>+		return BTRFS_TREE_BLOCK_WRITTEN_NOT_SET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Extent buffers from a relocation tree have a owner field that</div><div class='ctx'> 	 * corresponds to the subvolume tree they are based on. So just from an</div><div class='hunk'>@@ -1854,16 +2052,16 @@ enum btrfs_tree_block_status __btrfs_check_leaf(struct extent_buffer *leaf)</div><div class='ctx'> 	for (slot = 0; slot &lt; nritems; slot++) {</div><div class='ctx'> 		u32 item_end_expected;</div><div class='ctx'> 		u64 item_data_end;</div><div class='add'>+		enum btrfs_tree_block_status ret;</div><div class='ctx'> </div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;key, slot);</div><div class='ctx'> </div><div class='ctx'> 		/* Make sure the keys are in the right order */</div><div class='ctx'> 		if (unlikely(btrfs_comp_cpu_keys(&amp;prev_key, &amp;key) &gt;= 0)) {</div><div class='ctx'> 			generic_err(leaf, slot,</div><div class='del'>-	"bad key order, prev (%llu %u %llu) current (%llu %u %llu)",</div><div class='del'>-				prev_key.objectid, prev_key.type,</div><div class='del'>-				prev_key.offset, key.objectid, key.type,</div><div class='del'>-				key.offset);</div><div class='add'>+	"bad key order, prev " BTRFS_KEY_FMT " current " BTRFS_KEY_FMT,</div><div class='add'>+				    BTRFS_KEY_FMT_VALUE(&amp;prev_key),</div><div class='add'>+				    BTRFS_KEY_FMT_VALUE(&amp;key));</div><div class='ctx'> 			return BTRFS_TREE_BLOCK_BAD_KEY_ORDER;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1909,21 +2107,10 @@ enum btrfs_tree_block_status __btrfs_check_leaf(struct extent_buffer *leaf)</div><div class='ctx'> 			return BTRFS_TREE_BLOCK_INVALID_OFFSETS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * We only want to do this if WRITTEN is set, otherwise the leaf</div><div class='del'>-		 * may be in some intermediate state and won't appear valid.</div><div class='del'>-		 */</div><div class='del'>-		if (btrfs_header_flag(leaf, BTRFS_HEADER_FLAG_WRITTEN)) {</div><div class='del'>-			enum btrfs_tree_block_status ret;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Check if the item size and content meet other</div><div class='del'>-			 * criteria</div><div class='del'>-			 */</div><div class='del'>-			ret = check_leaf_item(leaf, &amp;key, slot, &amp;prev_key);</div><div class='del'>-			if (unlikely(ret != BTRFS_TREE_BLOCK_CLEAN))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='add'>+		/* Check if the item size and content meet other criteria. */</div><div class='add'>+		ret = check_leaf_item(leaf, &amp;key, slot, &amp;prev_key);</div><div class='add'>+		if (unlikely(ret != BTRFS_TREE_BLOCK_CLEAN))</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		prev_key.objectid = key.objectid;</div><div class='ctx'> 		prev_key.type = key.type;</div><div class='hunk'>@@ -1953,6 +2140,11 @@ enum btrfs_tree_block_status __btrfs_check_node(struct extent_buffer *node)</div><div class='ctx'> 	int level = btrfs_header_level(node);</div><div class='ctx'> 	u64 bytenr;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!btrfs_header_flag(node, BTRFS_HEADER_FLAG_WRITTEN))) {</div><div class='add'>+		generic_err(node, 0, "invalid flag for node, WRITTEN not set");</div><div class='add'>+		return BTRFS_TREE_BLOCK_WRITTEN_NOT_SET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(level &lt;= 0 || level &gt;= BTRFS_MAX_LEVEL)) {</div><div class='ctx'> 		generic_err(node, 0,</div><div class='ctx'> 			"invalid level for node, have %d expect [1, %d]",</div><div class='hunk'>@@ -1987,10 +2179,9 @@ enum btrfs_tree_block_status __btrfs_check_node(struct extent_buffer *node)</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(btrfs_comp_cpu_keys(&amp;key, &amp;next_key) &gt;= 0)) {</div><div class='ctx'> 			generic_err(node, slot,</div><div class='del'>-	"bad key order, current (%llu %u %llu) next (%llu %u %llu)",</div><div class='del'>-				key.objectid, key.type, key.offset,</div><div class='del'>-				next_key.objectid, next_key.type,</div><div class='del'>-				next_key.offset);</div><div class='add'>+	"bad key order, current " BTRFS_KEY_FMT " next " BTRFS_KEY_FMT,</div><div class='add'>+				    BTRFS_KEY_FMT_VALUE(&amp;key),</div><div class='add'>+				    BTRFS_KEY_FMT_VALUE(&amp;next_key));</div><div class='ctx'> 			return BTRFS_TREE_BLOCK_BAD_KEY_ORDER;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2010,14 +2201,14 @@ ALLOW_ERROR_INJECTION(btrfs_check_node, ERRNO);</div><div class='ctx'> </div><div class='ctx'> int btrfs_check_eb_owner(const struct extent_buffer *eb, u64 root_owner)</div><div class='ctx'> {</div><div class='del'>-	const bool is_subvol = is_fstree(root_owner);</div><div class='add'>+	const bool is_subvol = btrfs_is_fstree(root_owner);</div><div class='ctx'> 	const u64 eb_owner = btrfs_header_owner(eb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Skip dummy fs, as selftests don't create unique ebs for each dummy</div><div class='ctx'> 	 * root.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &amp;eb-&gt;fs_info-&gt;fs_state))</div><div class='add'>+	if (btrfs_is_testing(eb-&gt;fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There are several call sites (backref walking, qgroup, and data</div><div class='hunk'>@@ -2052,7 +2243,7 @@ int btrfs_check_eb_owner(const struct extent_buffer *eb, u64 root_owner)</div><div class='ctx'> 	 * For subvolume trees, owners can mismatch, but they should all belong</div><div class='ctx'> 	 * to subvolume trees.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(is_subvol != is_fstree(eb_owner))) {</div><div class='add'>+	if (unlikely(is_subvol != btrfs_is_fstree(eb_owner))) {</div><div class='ctx'> 		btrfs_crit(eb-&gt;fs_info,</div><div class='ctx'> "corrupted %s, root=%llu block=%llu owner mismatch, have %llu expect [%llu, %llu]",</div><div class='ctx'> 			btrfs_header_level(eb) == 0 ? "leaf" : "node",</div><div class='hunk'>@@ -2063,8 +2254,8 @@ int btrfs_check_eb_owner(const struct extent_buffer *eb, u64 root_owner)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_verify_level_key(struct extent_buffer *eb, int level,</div><div class='del'>-			   struct btrfs_key *first_key, u64 parent_transid)</div><div class='add'>+int btrfs_verify_level_key(struct extent_buffer *eb,</div><div class='add'>+			   const struct btrfs_tree_parent_check *check)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='ctx'> 	int found_level;</div><div class='hunk'>@@ -2072,16 +2263,15 @@ int btrfs_verify_level_key(struct extent_buffer *eb, int level,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	found_level = btrfs_header_level(eb);</div><div class='del'>-	if (found_level != level) {</div><div class='del'>-		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),</div><div class='del'>-		     KERN_ERR "BTRFS: tree level check failed\n");</div><div class='add'>+	if (unlikely(found_level != check-&gt;level)) {</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "tree level mismatch detected, bytenr=%llu level expected=%u has=%u",</div><div class='del'>-			  eb-&gt;start, level, found_level);</div><div class='del'>-		return -EIO;</div><div class='add'>+			  eb-&gt;start, check-&gt;level, found_level);</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!first_key)</div><div class='add'>+	if (!check-&gt;has_first_key)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2094,11 +2284,11 @@ int btrfs_verify_level_key(struct extent_buffer *eb, int level,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We have @first_key, so this @eb must have at least one item */</div><div class='del'>-	if (btrfs_header_nritems(eb) == 0) {</div><div class='add'>+	if (unlikely(btrfs_header_nritems(eb) == 0)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 		"invalid tree nritems, bytenr=%llu nritems=0 expect &gt;0",</div><div class='ctx'> 			  eb-&gt;start);</div><div class='del'>-		WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2106,15 +2296,14 @@ int btrfs_verify_level_key(struct extent_buffer *eb, int level,</div><div class='ctx'> 		btrfs_node_key_to_cpu(eb, &amp;found_key, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		btrfs_item_key_to_cpu(eb, &amp;found_key, 0);</div><div class='del'>-	ret = btrfs_comp_cpu_keys(first_key, &amp;found_key);</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),</div><div class='del'>-		     KERN_ERR "BTRFS: tree first key check failed\n");</div><div class='add'>+	ret = btrfs_comp_cpu_keys(&amp;check-&gt;first_key, &amp;found_key);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "tree first key mismatch detected, bytenr=%llu parent_transid=%llu key expected=(%llu,%u,%llu) has=(%llu,%u,%llu)",</div><div class='del'>-			  eb-&gt;start, parent_transid, first_key-&gt;objectid,</div><div class='del'>-			  first_key-&gt;type, first_key-&gt;offset,</div><div class='add'>+			  eb-&gt;start, check-&gt;transid, check-&gt;first_key.objectid,</div><div class='add'>+			  check-&gt;first_key.type, check-&gt;first_key.offset,</div><div class='ctx'> 			  found_key.objectid, found_key.type,</div><div class='ctx'> 			  found_key.offset);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/btrfs/tree-checker.h b/fs/btrfs/tree-checker.h<br/>index 14b9fbe82da4..eb201f4ec3c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-checker.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-checker.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-checker.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tree-checker.h</a></div><div class='hunk'>@@ -6,10 +6,13 @@</div><div class='ctx'> #ifndef BTRFS_TREE_CHECKER_H</div><div class='ctx'> #define BTRFS_TREE_CHECKER_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct extent_buffer;</div><div class='add'>+struct btrfs_fs_info;</div><div class='ctx'> struct btrfs_chunk;</div><div class='add'>+struct btrfs_key;</div><div class='ctx'> </div><div class='ctx'> /* All the extra info needed to verify the parentness of a tree block. */</div><div class='ctx'> struct btrfs_tree_parent_check {</div><div class='hunk'>@@ -51,6 +54,7 @@ enum btrfs_tree_block_status {</div><div class='ctx'> 	BTRFS_TREE_BLOCK_INVALID_BLOCKPTR,</div><div class='ctx'> 	BTRFS_TREE_BLOCK_INVALID_ITEM,</div><div class='ctx'> 	BTRFS_TREE_BLOCK_INVALID_OWNER,</div><div class='add'>+	BTRFS_TREE_BLOCK_WRITTEN_NOT_SET,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -63,10 +67,12 @@ enum btrfs_tree_block_status __btrfs_check_node(struct extent_buffer *node);</div><div class='ctx'> int btrfs_check_leaf(struct extent_buffer *leaf);</div><div class='ctx'> int btrfs_check_node(struct extent_buffer *node);</div><div class='ctx'> </div><div class='del'>-int btrfs_check_chunk_valid(struct extent_buffer *leaf,</div><div class='del'>-			    struct btrfs_chunk *chunk, u64 logical);</div><div class='add'>+int btrfs_check_chunk_valid(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			    const struct extent_buffer *leaf,</div><div class='add'>+			    const struct btrfs_chunk *chunk, u64 logical,</div><div class='add'>+			    u32 sectorsize);</div><div class='ctx'> int btrfs_check_eb_owner(const struct extent_buffer *eb, u64 root_owner);</div><div class='del'>-int btrfs_verify_level_key(struct extent_buffer *eb, int level,</div><div class='del'>-			   struct btrfs_key *first_key, u64 parent_transid);</div><div class='add'>+int btrfs_verify_level_key(struct extent_buffer *eb,</div><div class='add'>+			   const struct btrfs_tree_parent_check *check);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c<br/>index 331fc7429952..fff37c8d96a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-log.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-log.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-log.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tree-log.c</a></div><div class='hunk'>@@ -13,13 +13,11 @@</div><div class='ctx'> #include "tree-log.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "locking.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "backref.h"</div><div class='ctx'> #include "compression.h"</div><div class='ctx'> #include "qgroup.h"</div><div class='ctx'> #include "block-group.h"</div><div class='ctx'> #include "space-info.h"</div><div class='del'>-#include "zoned.h"</div><div class='ctx'> #include "inode-item.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='hunk'>@@ -29,7 +27,9 @@</div><div class='ctx'> #include "file-item.h"</div><div class='ctx'> #include "file.h"</div><div class='ctx'> #include "orphan.h"</div><div class='add'>+#include "print-tree.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='add'>+#include "delayed-inode.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_CONFLICT_INODES 10</div><div class='ctx'> </div><div class='hunk'>@@ -103,18 +103,135 @@ enum {</div><div class='ctx'> 	LOG_WALK_REPLAY_ALL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The walk control struct is used to pass state down the chain when processing</div><div class='add'>+ * the log tree. The stage field tells us which part of the log tree processing</div><div class='add'>+ * we are currently doing.</div><div class='add'>+ */</div><div class='add'>+struct walk_control {</div><div class='add'>+	/*</div><div class='add'>+	 * Signal that we are freeing the metadata extents of a log tree.</div><div class='add'>+	 * This is used at transaction commit time while freeing a log tree.</div><div class='add'>+	 */</div><div class='add'>+	bool free;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Signal that we are pinning the metadata extents of a log tree and the</div><div class='add'>+	 * data extents its leaves point to (if using mixed block groups).</div><div class='add'>+	 * This happens in the first stage of log replay to ensure that during</div><div class='add'>+	 * replay, while we are modifying subvolume trees, we don't overwrite</div><div class='add'>+	 * the metadata extents of log trees.</div><div class='add'>+	 */</div><div class='add'>+	bool pin;</div><div class='add'>+</div><div class='add'>+	/* What stage of the replay code we're currently in. */</div><div class='add'>+	int stage;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ignore any items from the inode currently being processed. Needs</div><div class='add'>+	 * to be set every time we find a BTRFS_INODE_ITEM_KEY.</div><div class='add'>+	 */</div><div class='add'>+	bool ignore_cur_inode;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The root we are currently replaying to. This is NULL for the replay</div><div class='add'>+	 * stage LOG_WALK_PIN_ONLY.</div><div class='add'>+	 */</div><div class='add'>+	struct btrfs_root *root;</div><div class='add'>+</div><div class='add'>+	/* The log tree we are currently processing (not NULL for any stage). */</div><div class='add'>+	struct btrfs_root *log;</div><div class='add'>+</div><div class='add'>+	/* The transaction handle used for replaying all log trees. */</div><div class='add'>+	struct btrfs_trans_handle *trans;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The function that gets used to process blocks we find in the tree.</div><div class='add'>+	 * Note the extent_buffer might not be up to date when it is passed in,</div><div class='add'>+	 * and it must be checked or read if you need the data inside it.</div><div class='add'>+	 */</div><div class='add'>+	int (*process_func)(struct extent_buffer *eb,</div><div class='add'>+			    struct walk_control *wc, u64 gen, int level);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following are used only when stage is &gt;= LOG_WALK_REPLAY_INODES</div><div class='add'>+	 * and by the replay_one_buffer() callback.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* The current log leaf being processed. */</div><div class='add'>+	struct extent_buffer *log_leaf;</div><div class='add'>+	/* The key being processed of the current log leaf. */</div><div class='add'>+	struct btrfs_key log_key;</div><div class='add'>+	/* The slot being processed of the current log leaf. */</div><div class='add'>+	int log_slot;</div><div class='add'>+</div><div class='add'>+	/* A path used for searches and modifications to subvolume trees. */</div><div class='add'>+	struct btrfs_path *subvol_path;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void do_abort_log_replay(struct walk_control *wc, const char *function,</div><div class='add'>+				unsigned int line, int error, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = wc-&gt;trans-&gt;fs_info;</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do nothing if we already aborted, to avoid dumping leaves again which</div><div class='add'>+	 * can be verbose. Further more, only the first call is useful since it</div><div class='add'>+	 * is where we have a problem. Note that we do not use the flag</div><div class='add'>+	 * BTRFS_FS_STATE_TRANS_ABORTED because log replay calls functions that</div><div class='add'>+	 * are outside of tree-log.c that can abort transactions (such as</div><div class='add'>+	 * btrfs_add_link() for example), so if that happens we still want to</div><div class='add'>+	 * dump all log replay specific information below.</div><div class='add'>+	 */</div><div class='add'>+	if (test_and_set_bit(BTRFS_FS_STATE_LOG_REPLAY_ABORTED, &amp;fs_info-&gt;fs_state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	btrfs_abort_transaction(wc-&gt;trans, error);</div><div class='add'>+</div><div class='add'>+	if (wc-&gt;subvol_path-&gt;nodes[0]) {</div><div class='add'>+		btrfs_crit(fs_info,</div><div class='add'>+			   "subvolume (root %llu) leaf currently being processed:",</div><div class='add'>+			   btrfs_root_id(wc-&gt;root));</div><div class='add'>+		btrfs_print_leaf(wc-&gt;subvol_path-&gt;nodes[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wc-&gt;log_leaf) {</div><div class='add'>+		btrfs_crit(fs_info,</div><div class='add'>+"log tree (for root %llu) leaf currently being processed (slot %d key " BTRFS_KEY_FMT "):",</div><div class='add'>+			   btrfs_root_id(wc-&gt;root), wc-&gt;log_slot,</div><div class='add'>+			   BTRFS_KEY_FMT_VALUE(&amp;wc-&gt;log_key));</div><div class='add'>+		btrfs_print_leaf(wc-&gt;log_leaf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	btrfs_crit(fs_info,</div><div class='add'>+	   "log replay failed in %s:%u for root %llu, stage %d, with error %d: %pV",</div><div class='add'>+		   function, line, btrfs_root_id(wc-&gt;root), wc-&gt;stage, error, &amp;vaf);</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use this for aborting a transaction during log replay while we are down the</div><div class='add'>+ * call chain of replay_one_buffer(), so that we get a lot more useful</div><div class='add'>+ * information for debugging issues when compared to a plain call to</div><div class='add'>+ * btrfs_abort_transaction().</div><div class='add'>+ */</div><div class='add'>+#define btrfs_abort_log_replay(wc, error, fmt, args...) \</div><div class='add'>+	do_abort_log_replay((wc), __func__, __LINE__, (error), fmt, ##args)</div><div class='add'>+</div><div class='ctx'> static int btrfs_log_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			   struct btrfs_inode *inode,</div><div class='ctx'> 			   int inode_only,</div><div class='ctx'> 			   struct btrfs_log_ctx *ctx);</div><div class='del'>-static int link_to_fixup_dir(struct btrfs_trans_handle *trans,</div><div class='del'>-			     struct btrfs_root *root,</div><div class='del'>-			     struct btrfs_path *path, u64 objectid);</div><div class='del'>-static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,</div><div class='del'>-				       struct btrfs_root *root,</div><div class='del'>-				       struct btrfs_root *log,</div><div class='del'>-				       struct btrfs_path *path,</div><div class='del'>-				       u64 dirid, int del_all);</div><div class='add'>+static int link_to_fixup_dir(struct walk_control *wc, u64 objectid);</div><div class='add'>+static noinline int replay_dir_deletes(struct walk_control *wc,</div><div class='add'>+				       u64 dirid, bool del_all);</div><div class='ctx'> static void wait_log_commit(struct btrfs_root *root, int transid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -140,6 +257,28 @@ static void wait_log_commit(struct btrfs_root *root, int transid);</div><div class='ctx'>  * and once to do all the other items.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static struct btrfs_inode *btrfs_iget_logging(u64 objectid, struct btrfs_root *root)</div><div class='add'>+{</div><div class='add'>+	unsigned int nofs_flag;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+</div><div class='add'>+	/* Only meant to be called for subvolume roots and not for log roots. */</div><div class='add'>+	ASSERT(btrfs_is_fstree(btrfs_root_id(root)), "root_id=%llu", btrfs_root_id(root));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're holding a transaction handle whether we are logging or</div><div class='add'>+	 * replaying a log tree, so we must make sure NOFS semantics apply</div><div class='add'>+	 * because btrfs_alloc_inode() may be triggered and it uses GFP_KERNEL</div><div class='add'>+	 * to allocate an inode, which can recurse back into the filesystem and</div><div class='add'>+	 * attempt a transaction commit, resulting in a deadlock.</div><div class='add'>+	 */</div><div class='add'>+	nofs_flag = memalloc_nofs_save();</div><div class='add'>+	inode = btrfs_iget(objectid, root);</div><div class='add'>+	memalloc_nofs_restore(nofs_flag);</div><div class='add'>+</div><div class='add'>+	return inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * start a sub transaction and setup the log tree</div><div class='ctx'>  * this increments the log tree writer count to make the people</div><div class='hunk'>@@ -280,54 +419,13 @@ void btrfs_end_log_trans(struct btrfs_root *root)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * the walk control struct is used to pass state down the chain when</div><div class='del'>- * processing the log tree.  The stage field tells us which part</div><div class='del'>- * of the log tree processing we are currently doing.  The others</div><div class='del'>- * are state fields used for that specific part</div><div class='del'>- */</div><div class='del'>-struct walk_control {</div><div class='del'>-	/* should we free the extent on disk when done?  This is used</div><div class='del'>-	 * at transaction commit time while freeing a log tree</div><div class='del'>-	 */</div><div class='del'>-	int free;</div><div class='del'>-</div><div class='del'>-	/* pin only walk, we record which extents on disk belong to the</div><div class='del'>-	 * log trees</div><div class='del'>-	 */</div><div class='del'>-	int pin;</div><div class='del'>-</div><div class='del'>-	/* what stage of the replay code we're currently in */</div><div class='del'>-	int stage;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ignore any items from the inode currently being processed. Needs</div><div class='del'>-	 * to be set every time we find a BTRFS_INODE_ITEM_KEY and we are in</div><div class='del'>-	 * the LOG_WALK_REPLAY_INODES stage.</div><div class='del'>-	 */</div><div class='del'>-	bool ignore_cur_inode;</div><div class='del'>-</div><div class='del'>-	/* the root we are currently replaying */</div><div class='del'>-	struct btrfs_root *replay_dest;</div><div class='del'>-</div><div class='del'>-	/* the trans handle for the current replay */</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='del'>-</div><div class='del'>-	/* the function that gets used to process blocks we find in the</div><div class='del'>-	 * tree.  Note the extent_buffer might not be up to date when it is</div><div class='del'>-	 * passed in, and it must be checked or read if you need the data</div><div class='del'>-	 * inside it</div><div class='del'>-	 */</div><div class='del'>-	int (*process_func)(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='del'>-			    struct walk_control *wc, u64 gen, int level);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * process_func used to pin down extents, write them or wait on them</div><div class='ctx'>  */</div><div class='del'>-static int process_one_buffer(struct btrfs_root *log,</div><div class='del'>-			      struct extent_buffer *eb,</div><div class='add'>+static int process_one_buffer(struct extent_buffer *eb,</div><div class='ctx'> 			      struct walk_control *wc, u64 gen, int level)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *log = wc-&gt;log;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = log-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -342,29 +440,40 @@ static int process_one_buffer(struct btrfs_root *log,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_read_extent_buffer(eb, &amp;check);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			if (trans)</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+			else</div><div class='add'>+				btrfs_handle_fs_error(fs_info, ret, NULL);</div><div class='ctx'> 			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wc-&gt;pin) {</div><div class='del'>-		ret = btrfs_pin_extent_for_log_replay(wc-&gt;trans, eb);</div><div class='del'>-		if (ret)</div><div class='add'>+		ASSERT(trans != NULL);</div><div class='add'>+		ret = btrfs_pin_extent_for_log_replay(trans, eb);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (btrfs_buffer_uptodate(eb, gen, 0) &amp;&amp;</div><div class='del'>-		    btrfs_header_level(eb) == 0)</div><div class='add'>+		if (btrfs_buffer_uptodate(eb, gen, false) &amp;&amp; level == 0) {</div><div class='ctx'> 			ret = btrfs_exclude_logged_extents(eb);</div><div class='add'>+			if (ret)</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Item overwrite used by replay and tree logging.  eb, slot and key all refer</div><div class='del'>- * to the src data we are copying out.</div><div class='add'>+ * Item overwrite used by log replay. The given log tree leaf, slot and key</div><div class='add'>+ * from the walk_control structure all refer to the source data we are copying</div><div class='add'>+ * out.</div><div class='ctx'>  *</div><div class='del'>- * root is the tree we are copying into, and path is a scratch</div><div class='del'>- * path for use in this function (it should be released on entry and</div><div class='del'>- * will be released on exit).</div><div class='add'>+ * The given root is for the tree we are copying into, and path is a scratch</div><div class='add'>+ * path for use in this function (it should be released on entry and will be</div><div class='add'>+ * released on exit).</div><div class='ctx'>  *</div><div class='ctx'>  * If the key is already in the destination tree the existing item is</div><div class='ctx'>  * overwritten.  If the existing item isn't big enough, it is extended.</div><div class='hunk'>@@ -372,19 +481,19 @@ static int process_one_buffer(struct btrfs_root *log,</div><div class='ctx'>  *</div><div class='ctx'>  * If the key isn't in the destination yet, a new item is inserted.</div><div class='ctx'>  */</div><div class='del'>-static int overwrite_item(struct btrfs_trans_handle *trans,</div><div class='del'>-			  struct btrfs_root *root,</div><div class='del'>-			  struct btrfs_path *path,</div><div class='del'>-			  struct extent_buffer *eb, int slot,</div><div class='del'>-			  struct btrfs_key *key)</div><div class='add'>+static int overwrite_item(struct walk_control *wc)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 item_size;</div><div class='ctx'> 	u64 saved_i_size = 0;</div><div class='ctx'> 	int save_old_i_size = 0;</div><div class='ctx'> 	unsigned long src_ptr;</div><div class='ctx'> 	unsigned long dst_ptr;</div><div class='del'>-	bool inode_item = key-&gt;type == BTRFS_INODE_ITEM_KEY;</div><div class='add'>+	struct extent_buffer *dst_eb;</div><div class='add'>+	int dst_slot;</div><div class='add'>+	const bool is_inode_item = (wc-&gt;log_key.type == BTRFS_INODE_ITEM_KEY);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is only used during log replay, so the root is always from a</div><div class='hunk'>@@ -393,45 +502,46 @@ static int overwrite_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * the leaf before writing into the log tree. See the comments at</div><div class='ctx'> 	 * copy_items() for more details.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(root-&gt;root_key.objectid != BTRFS_TREE_LOG_OBJECTID);</div><div class='add'>+	ASSERT(btrfs_root_id(root) != BTRFS_TREE_LOG_OBJECTID, "root_id=%llu", btrfs_root_id(root));</div><div class='ctx'> </div><div class='del'>-	item_size = btrfs_item_size(eb, slot);</div><div class='del'>-	src_ptr = btrfs_item_ptr_offset(eb, slot);</div><div class='add'>+	item_size = btrfs_item_size(wc-&gt;log_leaf, wc-&gt;log_slot);</div><div class='add'>+	src_ptr = btrfs_item_ptr_offset(wc-&gt;log_leaf, wc-&gt;log_slot);</div><div class='ctx'> </div><div class='ctx'> 	/* Look for the key in the destination tree. */</div><div class='del'>-	ret = btrfs_search_slot(NULL, root, key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = btrfs_search_slot(NULL, root, &amp;wc-&gt;log_key, wc-&gt;subvol_path, 0, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		"failed to search subvolume tree for key " BTRFS_KEY_FMT " root %llu",</div><div class='add'>+				       BTRFS_KEY_FMT_VALUE(&amp;wc-&gt;log_key),</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst_eb = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+	dst_slot = wc-&gt;subvol_path-&gt;slots[0];</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		char *src_copy;</div><div class='del'>-		char *dst_copy;</div><div class='del'>-		u32 dst_size = btrfs_item_size(path-&gt;nodes[0],</div><div class='del'>-						  path-&gt;slots[0]);</div><div class='add'>+		const u32 dst_size = btrfs_item_size(dst_eb, dst_slot);</div><div class='add'>+</div><div class='ctx'> 		if (dst_size != item_size)</div><div class='ctx'> 			goto insert;</div><div class='ctx'> </div><div class='ctx'> 		if (item_size == 0) {</div><div class='del'>-			btrfs_release_path(path);</div><div class='add'>+			btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		dst_copy = kmalloc(item_size, GFP_NOFS);</div><div class='ctx'> 		src_copy = kmalloc(item_size, GFP_NOFS);</div><div class='del'>-		if (!dst_copy || !src_copy) {</div><div class='del'>-			btrfs_release_path(path);</div><div class='del'>-			kfree(dst_copy);</div><div class='del'>-			kfree(src_copy);</div><div class='add'>+		if (!src_copy) {</div><div class='add'>+			btrfs_abort_log_replay(wc, -ENOMEM,</div><div class='add'>+			       "failed to allocate memory for log leaf item");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		read_extent_buffer(eb, src_copy, src_ptr, item_size);</div><div class='del'>-</div><div class='del'>-		dst_ptr = btrfs_item_ptr_offset(path-&gt;nodes[0], path-&gt;slots[0]);</div><div class='del'>-		read_extent_buffer(path-&gt;nodes[0], dst_copy, dst_ptr,</div><div class='del'>-				   item_size);</div><div class='del'>-		ret = memcmp(dst_copy, src_copy, item_size);</div><div class='add'>+		read_extent_buffer(wc-&gt;log_leaf, src_copy, src_ptr, item_size);</div><div class='add'>+		dst_ptr = btrfs_item_ptr_offset(dst_eb, dst_slot);</div><div class='add'>+		ret = memcmp_extent_buffer(dst_eb, src_copy, dst_ptr, item_size);</div><div class='ctx'> </div><div class='del'>-		kfree(dst_copy);</div><div class='ctx'> 		kfree(src_copy);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * they have the same contents, just return, this saves</div><div class='hunk'>@@ -440,7 +550,7 @@ static int overwrite_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * sync</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ret == 0) {</div><div class='del'>-			btrfs_release_path(path);</div><div class='add'>+			btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -448,28 +558,28 @@ static int overwrite_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * We need to load the old nbytes into the inode so when we</div><div class='ctx'> 		 * replay the extents we've logged we get the right nbytes.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode_item) {</div><div class='add'>+		if (is_inode_item) {</div><div class='ctx'> 			struct btrfs_inode_item *item;</div><div class='ctx'> 			u64 nbytes;</div><div class='ctx'> 			u32 mode;</div><div class='ctx'> </div><div class='del'>-			item = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='add'>+			item = btrfs_item_ptr(dst_eb, dst_slot,</div><div class='ctx'> 					      struct btrfs_inode_item);</div><div class='del'>-			nbytes = btrfs_inode_nbytes(path-&gt;nodes[0], item);</div><div class='del'>-			item = btrfs_item_ptr(eb, slot,</div><div class='add'>+			nbytes = btrfs_inode_nbytes(dst_eb, item);</div><div class='add'>+			item = btrfs_item_ptr(wc-&gt;log_leaf, wc-&gt;log_slot,</div><div class='ctx'> 					      struct btrfs_inode_item);</div><div class='del'>-			btrfs_set_inode_nbytes(eb, item, nbytes);</div><div class='add'>+			btrfs_set_inode_nbytes(wc-&gt;log_leaf, item, nbytes);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If this is a directory we need to reset the i_size to</div><div class='ctx'> 			 * 0 so that we can set it up properly when replaying</div><div class='ctx'> 			 * the rest of the items in this log.</div><div class='ctx'> 			 */</div><div class='del'>-			mode = btrfs_inode_mode(eb, item);</div><div class='add'>+			mode = btrfs_inode_mode(wc-&gt;log_leaf, item);</div><div class='ctx'> 			if (S_ISDIR(mode))</div><div class='del'>-				btrfs_set_inode_size(eb, item, 0);</div><div class='add'>+				btrfs_set_inode_size(wc-&gt;log_leaf, item, 0);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (inode_item) {</div><div class='add'>+	} else if (is_inode_item) {</div><div class='ctx'> 		struct btrfs_inode_item *item;</div><div class='ctx'> 		u32 mode;</div><div class='ctx'> </div><div class='hunk'>@@ -477,40 +587,43 @@ static int overwrite_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * New inode, set nbytes to 0 so that the nbytes comes out</div><div class='ctx'> 		 * properly when we replay the extents.</div><div class='ctx'> 		 */</div><div class='del'>-		item = btrfs_item_ptr(eb, slot, struct btrfs_inode_item);</div><div class='del'>-		btrfs_set_inode_nbytes(eb, item, 0);</div><div class='add'>+		item = btrfs_item_ptr(wc-&gt;log_leaf, wc-&gt;log_slot, struct btrfs_inode_item);</div><div class='add'>+		btrfs_set_inode_nbytes(wc-&gt;log_leaf, item, 0);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If this is a directory we need to reset the i_size to 0 so</div><div class='ctx'> 		 * that we can set it up properly when replaying the rest of</div><div class='ctx'> 		 * the items in this log.</div><div class='ctx'> 		 */</div><div class='del'>-		mode = btrfs_inode_mode(eb, item);</div><div class='add'>+		mode = btrfs_inode_mode(wc-&gt;log_leaf, item);</div><div class='ctx'> 		if (S_ISDIR(mode))</div><div class='del'>-			btrfs_set_inode_size(eb, item, 0);</div><div class='add'>+			btrfs_set_inode_size(wc-&gt;log_leaf, item, 0);</div><div class='ctx'> 	}</div><div class='ctx'> insert:</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	/* try to insert the key into the destination tree */</div><div class='del'>-	path-&gt;skip_release_on_error = 1;</div><div class='del'>-	ret = btrfs_insert_empty_item(trans, root, path,</div><div class='del'>-				      key, item_size);</div><div class='del'>-	path-&gt;skip_release_on_error = 0;</div><div class='add'>+	wc-&gt;subvol_path-&gt;skip_release_on_error = true;</div><div class='add'>+	ret = btrfs_insert_empty_item(trans, root, wc-&gt;subvol_path, &amp;wc-&gt;log_key, item_size);</div><div class='add'>+	wc-&gt;subvol_path-&gt;skip_release_on_error = false;</div><div class='add'>+</div><div class='add'>+	dst_eb = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+	dst_slot = wc-&gt;subvol_path-&gt;slots[0];</div><div class='ctx'> </div><div class='ctx'> 	/* make sure any existing item is the correct size */</div><div class='ctx'> 	if (ret == -EEXIST || ret == -EOVERFLOW) {</div><div class='del'>-		u32 found_size;</div><div class='del'>-		found_size = btrfs_item_size(path-&gt;nodes[0],</div><div class='del'>-						path-&gt;slots[0]);</div><div class='add'>+		const u32 found_size = btrfs_item_size(dst_eb, dst_slot);</div><div class='add'>+</div><div class='ctx'> 		if (found_size &gt; item_size)</div><div class='del'>-			btrfs_truncate_item(trans, path, item_size, 1);</div><div class='add'>+			btrfs_truncate_item(trans, wc-&gt;subvol_path, item_size, 1);</div><div class='ctx'> 		else if (found_size &lt; item_size)</div><div class='del'>-			btrfs_extend_item(trans, path, item_size - found_size);</div><div class='add'>+			btrfs_extend_item(trans, wc-&gt;subvol_path, item_size - found_size);</div><div class='ctx'> 	} else if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to insert item for key " BTRFS_KEY_FMT,</div><div class='add'>+				       BTRFS_KEY_FMT_VALUE(&amp;wc-&gt;log_key));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	dst_ptr = btrfs_item_ptr_offset(path-&gt;nodes[0],</div><div class='del'>-					path-&gt;slots[0]);</div><div class='add'>+	dst_ptr = btrfs_item_ptr_offset(dst_eb, dst_slot);</div><div class='ctx'> </div><div class='ctx'> 	/* don't overwrite an existing inode if the generation number</div><div class='ctx'> 	 * was logged as zero.  This is done when the tree logging code</div><div class='hunk'>@@ -521,16 +634,15 @@ insert:</div><div class='ctx'> 	 * state of the tree found in the subvolume, and i_size is modified</div><div class='ctx'> 	 * as it goes</div><div class='ctx'> 	 */</div><div class='del'>-	if (key-&gt;type == BTRFS_INODE_ITEM_KEY &amp;&amp; ret == -EEXIST) {</div><div class='add'>+	if (is_inode_item &amp;&amp; ret == -EEXIST) {</div><div class='ctx'> 		struct btrfs_inode_item *src_item;</div><div class='ctx'> 		struct btrfs_inode_item *dst_item;</div><div class='ctx'> </div><div class='ctx'> 		src_item = (struct btrfs_inode_item *)src_ptr;</div><div class='ctx'> 		dst_item = (struct btrfs_inode_item *)dst_ptr;</div><div class='ctx'> </div><div class='del'>-		if (btrfs_inode_generation(eb, src_item) == 0) {</div><div class='del'>-			struct extent_buffer *dst_eb = path-&gt;nodes[0];</div><div class='del'>-			const u64 ino_size = btrfs_inode_size(eb, src_item);</div><div class='add'>+		if (btrfs_inode_generation(wc-&gt;log_leaf, src_item) == 0) {</div><div class='add'>+			const u64 ino_size = btrfs_inode_size(wc-&gt;log_leaf, src_item);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * For regular files an ino_size == 0 is used only when</div><div class='hunk'>@@ -539,42 +651,39 @@ insert:</div><div class='ctx'> 			 * case don't set the size of the inode in the fs/subvol</div><div class='ctx'> 			 * tree, otherwise we would be throwing valid data away.</div><div class='ctx'> 			 */</div><div class='del'>-			if (S_ISREG(btrfs_inode_mode(eb, src_item)) &amp;&amp;</div><div class='add'>+			if (S_ISREG(btrfs_inode_mode(wc-&gt;log_leaf, src_item)) &amp;&amp;</div><div class='ctx'> 			    S_ISREG(btrfs_inode_mode(dst_eb, dst_item)) &amp;&amp;</div><div class='ctx'> 			    ino_size != 0)</div><div class='ctx'> 				btrfs_set_inode_size(dst_eb, dst_item, ino_size);</div><div class='ctx'> 			goto no_copy;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (S_ISDIR(btrfs_inode_mode(eb, src_item)) &amp;&amp;</div><div class='del'>-		    S_ISDIR(btrfs_inode_mode(path-&gt;nodes[0], dst_item))) {</div><div class='add'>+		if (S_ISDIR(btrfs_inode_mode(wc-&gt;log_leaf, src_item)) &amp;&amp;</div><div class='add'>+		    S_ISDIR(btrfs_inode_mode(dst_eb, dst_item))) {</div><div class='ctx'> 			save_old_i_size = 1;</div><div class='del'>-			saved_i_size = btrfs_inode_size(path-&gt;nodes[0],</div><div class='del'>-							dst_item);</div><div class='add'>+			saved_i_size = btrfs_inode_size(dst_eb, dst_item);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	copy_extent_buffer(path-&gt;nodes[0], eb, dst_ptr,</div><div class='del'>-			   src_ptr, item_size);</div><div class='add'>+	copy_extent_buffer(dst_eb, wc-&gt;log_leaf, dst_ptr, src_ptr, item_size);</div><div class='ctx'> </div><div class='ctx'> 	if (save_old_i_size) {</div><div class='ctx'> 		struct btrfs_inode_item *dst_item;</div><div class='add'>+</div><div class='ctx'> 		dst_item = (struct btrfs_inode_item *)dst_ptr;</div><div class='del'>-		btrfs_set_inode_size(path-&gt;nodes[0], dst_item, saved_i_size);</div><div class='add'>+		btrfs_set_inode_size(dst_eb, dst_item, saved_i_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the generation is filled in */</div><div class='del'>-	if (key-&gt;type == BTRFS_INODE_ITEM_KEY) {</div><div class='add'>+	if (is_inode_item) {</div><div class='ctx'> 		struct btrfs_inode_item *dst_item;</div><div class='add'>+</div><div class='ctx'> 		dst_item = (struct btrfs_inode_item *)dst_ptr;</div><div class='del'>-		if (btrfs_inode_generation(path-&gt;nodes[0], dst_item) == 0) {</div><div class='del'>-			btrfs_set_inode_generation(path-&gt;nodes[0], dst_item,</div><div class='del'>-						   trans-&gt;transid);</div><div class='del'>-		}</div><div class='add'>+		if (btrfs_inode_generation(dst_eb, dst_item) == 0)</div><div class='add'>+			btrfs_set_inode_generation(dst_eb, dst_item, trans-&gt;transid);</div><div class='ctx'> 	}</div><div class='ctx'> no_copy:</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -593,21 +702,6 @@ static int read_alloc_one_name(struct extent_buffer *eb, void *start, int len,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * simple helper to read an inode off the disk from a given root</div><div class='del'>- * This can only be called for subvolume roots and not for the log</div><div class='del'>- */</div><div class='del'>-static noinline struct inode *read_one_inode(struct btrfs_root *root,</div><div class='del'>-					     u64 objectid)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	inode = btrfs_iget(root-&gt;fs_info-&gt;sb, objectid, root);</div><div class='del'>-	if (IS_ERR(inode))</div><div class='del'>-		inode = NULL;</div><div class='del'>-	return inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* replays a single extent in 'eb' at 'slot' with 'key' into the</div><div class='ctx'>  * subvolume 'root'.  path is released on entry and should be released</div><div class='ctx'>  * on exit.</div><div class='hunk'>@@ -620,51 +714,53 @@ static noinline struct inode *read_one_inode(struct btrfs_root *root,</div><div class='ctx'>  * The extent is inserted into the file, dropping any existing extents</div><div class='ctx'>  * from the file that overlap the new one.</div><div class='ctx'>  */</div><div class='del'>-static noinline int replay_one_extent(struct btrfs_trans_handle *trans,</div><div class='del'>-				      struct btrfs_root *root,</div><div class='del'>-				      struct btrfs_path *path,</div><div class='del'>-				      struct extent_buffer *eb, int slot,</div><div class='del'>-				      struct btrfs_key *key)</div><div class='add'>+static noinline int replay_one_extent(struct walk_control *wc)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='ctx'> 	struct btrfs_drop_extents_args drop_args = { 0 };</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int found_type;</div><div class='ctx'> 	u64 extent_end;</div><div class='del'>-	u64 start = key-&gt;offset;</div><div class='add'>+	const u64 start = wc-&gt;log_key.offset;</div><div class='ctx'> 	u64 nbytes = 0;</div><div class='add'>+	u64 csum_start;</div><div class='add'>+	u64 csum_end;</div><div class='add'>+	LIST_HEAD(ordered_sums);</div><div class='add'>+	u64 offset;</div><div class='add'>+	unsigned long dest_offset;</div><div class='add'>+	struct btrfs_key ins;</div><div class='ctx'> 	struct btrfs_file_extent_item *item;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='del'>-	unsigned long size;</div><div class='add'>+	struct btrfs_inode *inode = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	item = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item);</div><div class='del'>-	found_type = btrfs_file_extent_type(eb, item);</div><div class='add'>+	item = btrfs_item_ptr(wc-&gt;log_leaf, wc-&gt;log_slot, struct btrfs_file_extent_item);</div><div class='add'>+	found_type = btrfs_file_extent_type(wc-&gt;log_leaf, item);</div><div class='ctx'> </div><div class='ctx'> 	if (found_type == BTRFS_FILE_EXTENT_REG ||</div><div class='ctx'> 	    found_type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='del'>-		nbytes = btrfs_file_extent_num_bytes(eb, item);</div><div class='del'>-		extent_end = start + nbytes;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We don't add to the inodes nbytes if we are prealloc or a</div><div class='del'>-		 * hole.</div><div class='del'>-		 */</div><div class='del'>-		if (btrfs_file_extent_disk_bytenr(eb, item) == 0)</div><div class='del'>-			nbytes = 0;</div><div class='add'>+		extent_end = start + btrfs_file_extent_num_bytes(wc-&gt;log_leaf, item);</div><div class='add'>+		/* Holes don't take up space. */</div><div class='add'>+		if (btrfs_file_extent_disk_bytenr(wc-&gt;log_leaf, item) != 0)</div><div class='add'>+			nbytes = btrfs_file_extent_num_bytes(wc-&gt;log_leaf, item);</div><div class='ctx'> 	} else if (found_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-		size = btrfs_file_extent_ram_bytes(eb, item);</div><div class='del'>-		nbytes = btrfs_file_extent_ram_bytes(eb, item);</div><div class='del'>-		extent_end = ALIGN(start + size,</div><div class='del'>-				   fs_info-&gt;sectorsize);</div><div class='add'>+		nbytes = btrfs_file_extent_ram_bytes(wc-&gt;log_leaf, item);</div><div class='add'>+		extent_end = ALIGN(start + nbytes, fs_info-&gt;sectorsize);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		btrfs_abort_log_replay(wc, -EUCLEAN,</div><div class='add'>+		       "unexpected extent type=%d root=%llu inode=%llu offset=%llu",</div><div class='add'>+				       found_type, btrfs_root_id(root),</div><div class='add'>+				       wc-&gt;log_key.objectid, wc-&gt;log_key.offset);</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode = read_one_inode(root, key-&gt;objectid);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+	inode = btrfs_iget_logging(wc-&gt;log_key.objectid, root);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to get inode %llu for root %llu",</div><div class='add'>+				       wc-&gt;log_key.objectid, btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -672,247 +768,300 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * file.  This must be done before the btrfs_drop_extents run</div><div class='ctx'> 	 * so we don't try to drop this extent.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = btrfs_lookup_file_extent(trans, root, path,</div><div class='del'>-			btrfs_ino(BTRFS_I(inode)), start, 0);</div><div class='add'>+	ret = btrfs_lookup_file_extent(trans, root, wc-&gt;subvol_path,</div><div class='add'>+				       btrfs_ino(inode), start, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0 &amp;&amp;</div><div class='ctx'> 	    (found_type == BTRFS_FILE_EXTENT_REG ||</div><div class='ctx'> 	     found_type == BTRFS_FILE_EXTENT_PREALLOC)) {</div><div class='del'>-		struct btrfs_file_extent_item cmp1;</div><div class='del'>-		struct btrfs_file_extent_item cmp2;</div><div class='del'>-		struct btrfs_file_extent_item *existing;</div><div class='del'>-		struct extent_buffer *leaf;</div><div class='del'>-</div><div class='del'>-		leaf = path-&gt;nodes[0];</div><div class='del'>-		existing = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='del'>-					  struct btrfs_file_extent_item);</div><div class='add'>+		struct extent_buffer *leaf = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+		struct btrfs_file_extent_item existing;</div><div class='add'>+		unsigned long ptr;</div><div class='ctx'> </div><div class='del'>-		read_extent_buffer(eb, &amp;cmp1, (unsigned long)item,</div><div class='del'>-				   sizeof(cmp1));</div><div class='del'>-		read_extent_buffer(leaf, &amp;cmp2, (unsigned long)existing,</div><div class='del'>-				   sizeof(cmp2));</div><div class='add'>+		ptr = btrfs_item_ptr_offset(leaf, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+		read_extent_buffer(leaf, &amp;existing, ptr, sizeof(existing));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * we already have a pointer to this exact extent,</div><div class='ctx'> 		 * we don't have to do anything</div><div class='ctx'> 		 */</div><div class='del'>-		if (memcmp(&amp;cmp1, &amp;cmp2, sizeof(cmp1)) == 0) {</div><div class='del'>-			btrfs_release_path(path);</div><div class='add'>+		if (memcmp_extent_buffer(wc-&gt;log_leaf, &amp;existing, (unsigned long)item,</div><div class='add'>+					 sizeof(existing)) == 0) {</div><div class='add'>+			btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='ctx'> 	/* drop any overlapping extents */</div><div class='ctx'> 	drop_args.start = start;</div><div class='ctx'> 	drop_args.end = extent_end;</div><div class='ctx'> 	drop_args.drop_cache = true;</div><div class='del'>-	ret = btrfs_drop_extents(trans, root, BTRFS_I(inode), &amp;drop_args);</div><div class='del'>-	if (ret)</div><div class='add'>+	drop_args.path = wc-&gt;subvol_path;</div><div class='add'>+	ret = btrfs_drop_extents(trans, root, inode, &amp;drop_args);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to drop extents for inode %llu range [%llu, %llu) root %llu",</div><div class='add'>+				       wc-&gt;log_key.objectid, start, extent_end,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (found_type == BTRFS_FILE_EXTENT_REG ||</div><div class='del'>-	    found_type == BTRFS_FILE_EXTENT_PREALLOC) {</div><div class='del'>-		u64 offset;</div><div class='del'>-		unsigned long dest_offset;</div><div class='del'>-		struct btrfs_key ins;</div><div class='del'>-</div><div class='del'>-		if (btrfs_file_extent_disk_bytenr(eb, item) == 0 &amp;&amp;</div><div class='del'>-		    btrfs_fs_incompat(fs_info, NO_HOLES))</div><div class='del'>-			goto update_inode;</div><div class='del'>-</div><div class='del'>-		ret = btrfs_insert_empty_item(trans, root, path, key,</div><div class='del'>-					      sizeof(*item));</div><div class='add'>+	if (found_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='add'>+		/* inline extents are easy, we just overwrite them */</div><div class='add'>+		ret = overwrite_item(wc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='del'>-		dest_offset = btrfs_item_ptr_offset(path-&gt;nodes[0],</div><div class='del'>-						    path-&gt;slots[0]);</div><div class='del'>-		copy_extent_buffer(path-&gt;nodes[0], eb, dest_offset,</div><div class='del'>-				(unsigned long)item,  sizeof(*item));</div><div class='add'>+		goto update_inode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ins.objectid = btrfs_file_extent_disk_bytenr(eb, item);</div><div class='del'>-		ins.offset = btrfs_file_extent_disk_num_bytes(eb, item);</div><div class='del'>-		ins.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='del'>-		offset = key-&gt;offset - btrfs_file_extent_offset(eb, item);</div><div class='add'>+	/*</div><div class='add'>+	 * If not an inline extent, it can only be a regular or prealloc one.</div><div class='add'>+	 * We have checked that above and returned -EUCLEAN if not.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Manually record dirty extent, as here we did a shallow</div><div class='del'>-		 * file extent item copy and skip normal backref update,</div><div class='del'>-		 * but modifying extent tree all by ourselves.</div><div class='del'>-		 * So need to manually record dirty extent for qgroup,</div><div class='del'>-		 * as the owner of the file extent changed from log tree</div><div class='del'>-		 * (doesn't affect qgroup) to fs/file tree(affects qgroup)</div><div class='del'>-		 */</div><div class='del'>-		ret = btrfs_qgroup_trace_extent(trans,</div><div class='del'>-				btrfs_file_extent_disk_bytenr(eb, item),</div><div class='del'>-				btrfs_file_extent_disk_num_bytes(eb, item));</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+	/* A hole and NO_HOLES feature enabled, nothing else to do. */</div><div class='add'>+	if (btrfs_file_extent_disk_bytenr(wc-&gt;log_leaf, item) == 0 &amp;&amp;</div><div class='add'>+	    btrfs_fs_incompat(fs_info, NO_HOLES))</div><div class='add'>+		goto update_inode;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_insert_empty_item(trans, root, wc-&gt;subvol_path,</div><div class='add'>+				      &amp;wc-&gt;log_key, sizeof(*item));</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to insert item with key " BTRFS_KEY_FMT " root %llu",</div><div class='add'>+				       BTRFS_KEY_FMT_VALUE(&amp;wc-&gt;log_key),</div><div class='add'>+				       btrfs_root_id(root));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	dest_offset = btrfs_item_ptr_offset(wc-&gt;subvol_path-&gt;nodes[0],</div><div class='add'>+					    wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+	copy_extent_buffer(wc-&gt;subvol_path-&gt;nodes[0], wc-&gt;log_leaf, dest_offset,</div><div class='add'>+			   (unsigned long)item, sizeof(*item));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have an explicit hole and NO_HOLES is not enabled. We have added</div><div class='add'>+	 * the hole file extent item to the subvolume tree, so we don't have</div><div class='add'>+	 * anything else to do other than update the file extent item range and</div><div class='add'>+	 * update the inode item.</div><div class='add'>+	 */</div><div class='add'>+	if (btrfs_file_extent_disk_bytenr(wc-&gt;log_leaf, item) == 0) {</div><div class='add'>+		btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+		goto update_inode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ins.objectid = btrfs_file_extent_disk_bytenr(wc-&gt;log_leaf, item);</div><div class='add'>+	ins.type = BTRFS_EXTENT_ITEM_KEY;</div><div class='add'>+	ins.offset = btrfs_file_extent_disk_num_bytes(wc-&gt;log_leaf, item);</div><div class='add'>+	offset = wc-&gt;log_key.offset - btrfs_file_extent_offset(wc-&gt;log_leaf, item);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Manually record dirty extent, as here we did a shallow file extent</div><div class='add'>+	 * item copy and skip normal backref update, but modifying extent tree</div><div class='add'>+	 * all by ourselves. So need to manually record dirty extent for qgroup,</div><div class='add'>+	 * as the owner of the file extent changed from log tree (doesn't affect</div><div class='add'>+	 * qgroup) to fs/file tree (affects qgroup).</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_qgroup_trace_extent(trans, ins.objectid, ins.offset);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to trace extent for bytenr %llu disk_num_bytes %llu inode %llu root %llu",</div><div class='add'>+				       ins.objectid, ins.offset,</div><div class='add'>+				       wc-&gt;log_key.objectid, btrfs_root_id(root));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Is this extent already allocated in the extent tree?</div><div class='add'>+	 * If so, just add a reference.</div><div class='add'>+	 */</div><div class='add'>+	ret = btrfs_lookup_data_extent(fs_info, ins.objectid, ins.offset);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to lookup data extent for bytenr %llu disk_num_bytes %llu inode %llu root %llu",</div><div class='add'>+				       ins.objectid, ins.offset,</div><div class='add'>+				       wc-&gt;log_key.objectid, btrfs_root_id(root));</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (ret == 0) {</div><div class='add'>+		struct btrfs_ref ref = {</div><div class='add'>+			.action = BTRFS_ADD_DELAYED_REF,</div><div class='add'>+			.bytenr = ins.objectid,</div><div class='add'>+			.num_bytes = ins.offset,</div><div class='add'>+			.owning_root = btrfs_root_id(root),</div><div class='add'>+			.ref_root = btrfs_root_id(root),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		btrfs_init_data_ref(&amp;ref, wc-&gt;log_key.objectid, offset, 0, false);</div><div class='add'>+		ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to increment data extent for bytenr %llu disk_num_bytes %llu inode %llu root %llu",</div><div class='add'>+					       ins.objectid, ins.offset,</div><div class='add'>+					       wc-&gt;log_key.objectid,</div><div class='add'>+					       btrfs_root_id(root));</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Insert the extent pointer in the extent tree. */</div><div class='add'>+		ret = btrfs_alloc_logged_file_extent(trans, btrfs_root_id(root),</div><div class='add'>+						     wc-&gt;log_key.objectid, offset, &amp;ins);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to allocate logged data extent for bytenr %llu disk_num_bytes %llu offset %llu inode %llu root %llu",</div><div class='add'>+					       ins.objectid, ins.offset, offset,</div><div class='add'>+					       wc-&gt;log_key.objectid, btrfs_root_id(root));</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (ins.objectid &gt; 0) {</div><div class='del'>-			struct btrfs_ref ref = { 0 };</div><div class='del'>-			u64 csum_start;</div><div class='del'>-			u64 csum_end;</div><div class='del'>-			LIST_HEAD(ordered_sums);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * is this extent already allocated in the extent</div><div class='del'>-			 * allocation tree?  If so, just add a reference</div><div class='del'>-			 */</div><div class='del'>-			ret = btrfs_lookup_data_extent(fs_info, ins.objectid,</div><div class='del'>-						ins.offset);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				goto out;</div><div class='del'>-			} else if (ret == 0) {</div><div class='del'>-				btrfs_init_generic_ref(&amp;ref,</div><div class='del'>-						BTRFS_ADD_DELAYED_REF,</div><div class='del'>-						ins.objectid, ins.offset, 0,</div><div class='del'>-						root-&gt;root_key.objectid);</div><div class='del'>-				btrfs_init_data_ref(&amp;ref,</div><div class='del'>-						root-&gt;root_key.objectid,</div><div class='del'>-						key-&gt;objectid, offset, 0, false);</div><div class='del'>-				ret = btrfs_inc_extent_ref(trans, &amp;ref);</div><div class='del'>-				if (ret)</div><div class='del'>-					goto out;</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * insert the extent pointer in the extent</div><div class='del'>-				 * allocation tree</div><div class='del'>-				 */</div><div class='del'>-				ret = btrfs_alloc_logged_file_extent(trans,</div><div class='del'>-						root-&gt;root_key.objectid,</div><div class='del'>-						key-&gt;objectid, offset, &amp;ins);</div><div class='del'>-				if (ret)</div><div class='del'>-					goto out;</div><div class='del'>-			}</div><div class='del'>-			btrfs_release_path(path);</div><div class='add'>+	if (btrfs_file_extent_compression(wc-&gt;log_leaf, item)) {</div><div class='add'>+		csum_start = ins.objectid;</div><div class='add'>+		csum_end = csum_start + ins.offset;</div><div class='add'>+	} else {</div><div class='add'>+		csum_start = ins.objectid + btrfs_file_extent_offset(wc-&gt;log_leaf, item);</div><div class='add'>+		csum_end = csum_start + btrfs_file_extent_num_bytes(wc-&gt;log_leaf, item);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (btrfs_file_extent_compression(eb, item)) {</div><div class='del'>-				csum_start = ins.objectid;</div><div class='del'>-				csum_end = csum_start + ins.offset;</div><div class='del'>-			} else {</div><div class='del'>-				csum_start = ins.objectid +</div><div class='del'>-					btrfs_file_extent_offset(eb, item);</div><div class='del'>-				csum_end = csum_start +</div><div class='del'>-					btrfs_file_extent_num_bytes(eb, item);</div><div class='del'>-			}</div><div class='add'>+	ret = btrfs_lookup_csums_list(root-&gt;log_root, csum_start, csum_end - 1,</div><div class='add'>+				      &amp;ordered_sums, false);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to lookups csums for range [%llu, %llu) inode %llu root %llu",</div><div class='add'>+				       csum_start, csum_end, wc-&gt;log_key.objectid,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * Now delete all existing cums in the csum root that cover our range.</div><div class='add'>+	 * We do this because we can have an extent that is completely</div><div class='add'>+	 * referenced by one file extent item and partially referenced by</div><div class='add'>+	 * another file extent item (like after using the clone or extent_same</div><div class='add'>+	 * ioctls). In this case if we end up doing the replay of the one that</div><div class='add'>+	 * partially references the extent first, and we do not do the csum</div><div class='add'>+	 * deletion below, we can get 2 csum items in the csum tree that overlap</div><div class='add'>+	 * each other. For example, imagine our log has the two following file</div><div class='add'>+	 * extent items:</div><div class='add'>+	 *</div><div class='add'>+	 * key (257 EXTENT_DATA 409600)</div><div class='add'>+	 *     extent data disk byte 12845056 nr 102400</div><div class='add'>+	 *     extent data offset 20480 nr 20480 ram 102400</div><div class='add'>+	 *</div><div class='add'>+	 * key (257 EXTENT_DATA 819200)</div><div class='add'>+	 *     extent data disk byte 12845056 nr 102400</div><div class='add'>+	 *     extent data offset 0 nr 102400 ram 102400</div><div class='add'>+	 *</div><div class='add'>+	 * Where the second one fully references the 100K extent that starts at</div><div class='add'>+	 * disk byte 12845056, and the log tree has a single csum item that</div><div class='add'>+	 * covers the entire range of the extent:</div><div class='add'>+	 *</div><div class='add'>+	 * key (EXTENT_CSUM EXTENT_CSUM 12845056) itemsize 100</div><div class='add'>+	 *</div><div class='add'>+	 * After the first file extent item is replayed, the csum tree gets the</div><div class='add'>+	 * following csum item:</div><div class='add'>+	 *</div><div class='add'>+	 * key (EXTENT_CSUM EXTENT_CSUM 12865536) itemsize 20</div><div class='add'>+	 *</div><div class='add'>+	 * Which covers the 20K sub-range starting at offset 20K of our extent.</div><div class='add'>+	 * Now when we replay the second file extent item, if we do not delete</div><div class='add'>+	 * existing csum items that cover any of its blocks, we end up getting</div><div class='add'>+	 * two csum items in our csum tree that overlap each other:</div><div class='add'>+	 *</div><div class='add'>+	 * key (EXTENT_CSUM EXTENT_CSUM 12845056) itemsize 100</div><div class='add'>+	 * key (EXTENT_CSUM EXTENT_CSUM 12865536) itemsize 20</div><div class='add'>+	 *</div><div class='add'>+	 * Which is a problem, because after this anyone trying to lookup for</div><div class='add'>+	 * the checksum of any block of our extent starting at an offset of 40K</div><div class='add'>+	 * or higher, will end up looking at the second csum item only, which</div><div class='add'>+	 * does not contain the checksum for any block starting at offset 40K or</div><div class='add'>+	 * higher of our extent.</div><div class='add'>+	 */</div><div class='add'>+	while (!list_empty(&amp;ordered_sums)) {</div><div class='add'>+		struct btrfs_ordered_sum *sums;</div><div class='add'>+		struct btrfs_root *csum_root;</div><div class='ctx'> </div><div class='del'>-			ret = btrfs_lookup_csums_list(root-&gt;log_root,</div><div class='del'>-						csum_start, csum_end - 1,</div><div class='del'>-						&amp;ordered_sums, 0, false);</div><div class='add'>+		sums = list_first_entry(&amp;ordered_sums, struct btrfs_ordered_sum, list);</div><div class='add'>+		csum_root = btrfs_csum_root(fs_info, sums-&gt;logical);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			ret = btrfs_del_csums(trans, csum_root, sums-&gt;logical,</div><div class='add'>+					      sums-&gt;len);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-			/*</div><div class='del'>-			 * Now delete all existing cums in the csum root that</div><div class='del'>-			 * cover our range. We do this because we can have an</div><div class='del'>-			 * extent that is completely referenced by one file</div><div class='del'>-			 * extent item and partially referenced by another</div><div class='del'>-			 * file extent item (like after using the clone or</div><div class='del'>-			 * extent_same ioctls). In this case if we end up doing</div><div class='del'>-			 * the replay of the one that partially references the</div><div class='del'>-			 * extent first, and we do not do the csum deletion</div><div class='del'>-			 * below, we can get 2 csum items in the csum tree that</div><div class='del'>-			 * overlap each other. For example, imagine our log has</div><div class='del'>-			 * the two following file extent items:</div><div class='del'>-			 *</div><div class='del'>-			 * key (257 EXTENT_DATA 409600)</div><div class='del'>-			 *     extent data disk byte 12845056 nr 102400</div><div class='del'>-			 *     extent data offset 20480 nr 20480 ram 102400</div><div class='del'>-			 *</div><div class='del'>-			 * key (257 EXTENT_DATA 819200)</div><div class='del'>-			 *     extent data disk byte 12845056 nr 102400</div><div class='del'>-			 *     extent data offset 0 nr 102400 ram 102400</div><div class='del'>-			 *</div><div class='del'>-			 * Where the second one fully references the 100K extent</div><div class='del'>-			 * that starts at disk byte 12845056, and the log tree</div><div class='del'>-			 * has a single csum item that covers the entire range</div><div class='del'>-			 * of the extent:</div><div class='del'>-			 *</div><div class='del'>-			 * key (EXTENT_CSUM EXTENT_CSUM 12845056) itemsize 100</div><div class='del'>-			 *</div><div class='del'>-			 * After the first file extent item is replayed, the</div><div class='del'>-			 * csum tree gets the following csum item:</div><div class='del'>-			 *</div><div class='del'>-			 * key (EXTENT_CSUM EXTENT_CSUM 12865536) itemsize 20</div><div class='del'>-			 *</div><div class='del'>-			 * Which covers the 20K sub-range starting at offset 20K</div><div class='del'>-			 * of our extent. Now when we replay the second file</div><div class='del'>-			 * extent item, if we do not delete existing csum items</div><div class='del'>-			 * that cover any of its blocks, we end up getting two</div><div class='del'>-			 * csum items in our csum tree that overlap each other:</div><div class='del'>-			 *</div><div class='del'>-			 * key (EXTENT_CSUM EXTENT_CSUM 12845056) itemsize 100</div><div class='del'>-			 * key (EXTENT_CSUM EXTENT_CSUM 12865536) itemsize 20</div><div class='del'>-			 *</div><div class='del'>-			 * Which is a problem, because after this anyone trying</div><div class='del'>-			 * to lookup up for the checksum of any block of our</div><div class='del'>-			 * extent starting at an offset of 40K or higher, will</div><div class='del'>-			 * end up looking at the second csum item only, which</div><div class='del'>-			 * does not contain the checksum for any block starting</div><div class='del'>-			 * at offset 40K or higher of our extent.</div><div class='del'>-			 */</div><div class='del'>-			while (!list_empty(&amp;ordered_sums)) {</div><div class='del'>-				struct btrfs_ordered_sum *sums;</div><div class='del'>-				struct btrfs_root *csum_root;</div><div class='del'>-</div><div class='del'>-				sums = list_entry(ordered_sums.next,</div><div class='del'>-						struct btrfs_ordered_sum,</div><div class='del'>-						list);</div><div class='del'>-				csum_root = btrfs_csum_root(fs_info,</div><div class='del'>-							    sums-&gt;logical);</div><div class='del'>-				if (!ret)</div><div class='del'>-					ret = btrfs_del_csums(trans, csum_root,</div><div class='del'>-							      sums-&gt;logical,</div><div class='del'>-							      sums-&gt;len);</div><div class='del'>-				if (!ret)</div><div class='del'>-					ret = btrfs_csum_file_blocks(trans,</div><div class='del'>-								     csum_root,</div><div class='del'>-								     sums);</div><div class='del'>-				list_del(&amp;sums-&gt;list);</div><div class='del'>-				kfree(sums);</div><div class='del'>-			}</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to delete csums for range [%llu, %llu) inode %llu root %llu",</div><div class='add'>+						       sums-&gt;logical,</div><div class='add'>+						       sums-&gt;logical + sums-&gt;len,</div><div class='add'>+						       wc-&gt;log_key.objectid,</div><div class='add'>+						       btrfs_root_id(root));</div><div class='add'>+		}</div><div class='add'>+		if (!ret) {</div><div class='add'>+			ret = btrfs_csum_file_blocks(trans, csum_root, sums);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-		} else {</div><div class='del'>-			btrfs_release_path(path);</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to add csums for range [%llu, %llu) inode %llu root %llu",</div><div class='add'>+						       sums-&gt;logical,</div><div class='add'>+						       sums-&gt;logical + sums-&gt;len,</div><div class='add'>+						       wc-&gt;log_key.objectid,</div><div class='add'>+						       btrfs_root_id(root));</div><div class='ctx'> 		}</div><div class='del'>-	} else if (found_type == BTRFS_FILE_EXTENT_INLINE) {</div><div class='del'>-		/* inline extents are easy, we just overwrite them */</div><div class='del'>-		ret = overwrite_item(trans, root, path, eb, slot, key);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+		list_del(&amp;sums-&gt;list);</div><div class='add'>+		kfree(sums);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ret = btrfs_inode_set_file_extent_range(BTRFS_I(inode), start,</div><div class='del'>-						extent_end - start);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> update_inode:</div><div class='del'>-	btrfs_update_inode_bytes(BTRFS_I(inode), nbytes, drop_args.bytes_found);</div><div class='del'>-	ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='add'>+	ret = btrfs_inode_set_file_extent_range(inode, start, extent_end - start);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to set file extent range [%llu, %llu) inode %llu root %llu",</div><div class='add'>+				       start, extent_end, wc-&gt;log_key.objectid,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_update_inode_bytes(inode, nbytes, drop_args.bytes_found);</div><div class='add'>+	ret = btrfs_update_inode(trans, inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to update inode %llu root %llu",</div><div class='add'>+				       wc-&gt;log_key.objectid, btrfs_root_id(root));</div><div class='ctx'> out:</div><div class='del'>-	iput(inode);</div><div class='add'>+	iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int unlink_inode_for_log_replay(struct btrfs_trans_handle *trans,</div><div class='add'>+static int unlink_inode_for_log_replay(struct walk_control *wc,</div><div class='ctx'> 				       struct btrfs_inode *dir,</div><div class='ctx'> 				       struct btrfs_inode *inode,</div><div class='ctx'> 				       const struct fscrypt_str *name)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_unlink_inode(trans, dir, inode, name);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to unlink inode %llu parent dir %llu name %.*s root %llu",</div><div class='add'>+				       btrfs_ino(inode), btrfs_ino(dir), name-&gt;len,</div><div class='add'>+				       name-&gt;name, btrfs_root_id(inode-&gt;root));</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Whenever we need to check if a name exists or not, we check the</div><div class='ctx'> 	 * fs/subvolume tree. So after an unlink we must run delayed items, so</div><div class='ctx'> 	 * that future checks for a name during log replay see that the name</div><div class='ctx'> 	 * does not exists anymore.</div><div class='ctx'> 	 */</div><div class='del'>-	return btrfs_run_delayed_items(trans);</div><div class='add'>+	ret = btrfs_run_delayed_items(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to run delayed items current inode %llu parent dir %llu name %.*s root %llu",</div><div class='add'>+				       btrfs_ino(inode), btrfs_ino(dir), name-&gt;len,</div><div class='add'>+				       name-&gt;name, btrfs_root_id(inode-&gt;root));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -923,41 +1072,48 @@ static int unlink_inode_for_log_replay(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * This is a helper function to do the unlink of a specific directory</div><div class='ctx'>  * item</div><div class='ctx'>  */</div><div class='del'>-static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,</div><div class='del'>-				      struct btrfs_path *path,</div><div class='add'>+static noinline int drop_one_dir_item(struct walk_control *wc,</div><div class='ctx'> 				      struct btrfs_inode *dir,</div><div class='ctx'> 				      struct btrfs_dir_item *di)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = dir-&gt;root;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct fscrypt_str name;</div><div class='del'>-	struct extent_buffer *leaf;</div><div class='add'>+	struct extent_buffer *leaf = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	leaf = path-&gt;nodes[0];</div><div class='del'>-</div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(leaf, di, &amp;location);</div><div class='ctx'> 	ret = read_alloc_one_name(leaf, di + 1, btrfs_dir_name_len(leaf, di), &amp;name);</div><div class='del'>-	if (ret)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to allocate name for dir %llu root %llu",</div><div class='add'>+				       btrfs_ino(dir), btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='del'>-	inode = read_one_inode(root, location.objectid);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		ret = -EIO;</div><div class='add'>+	inode = btrfs_iget_logging(location.objectid, root);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to open inode %llu parent dir %llu name %.*s root %llu",</div><div class='add'>+				       location.objectid, btrfs_ino(dir),</div><div class='add'>+				       name.len, name.name, btrfs_root_id(root));</div><div class='add'>+		inode = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = link_to_fixup_dir(trans, root, path, location.objectid);</div><div class='add'>+	ret = link_to_fixup_dir(wc, location.objectid);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = unlink_inode_for_log_replay(trans, dir, BTRFS_I(inode), &amp;name);</div><div class='add'>+	ret = unlink_inode_for_log_replay(wc, dir, inode, &amp;name);</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(name.name);</div><div class='del'>-	iput(inode);</div><div class='add'>+	if (inode)</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1020,7 +1176,7 @@ static noinline int backref_in_log(struct btrfs_root *log,</div><div class='ctx'> 				   u64 ref_objectid,</div><div class='ctx'> 				   const struct fscrypt_str *name)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -1028,12 +1184,10 @@ static noinline int backref_in_log(struct btrfs_root *log,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, log, key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (ret == 1) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret == 1)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;type == BTRFS_INODE_EXTREF_KEY)</div><div class='ctx'> 		ret = !!btrfs_find_name_in_ext_backref(path-&gt;nodes[0],</div><div class='hunk'>@@ -1042,172 +1196,224 @@ static noinline int backref_in_log(struct btrfs_root *log,</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = !!btrfs_find_name_in_backref(path-&gt;nodes[0],</div><div class='ctx'> 						   path-&gt;slots[0], name);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int __add_inode_ref(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_root *root,</div><div class='del'>-				  struct btrfs_path *path,</div><div class='del'>-				  struct btrfs_root *log_root,</div><div class='add'>+static int unlink_refs_not_in_log(struct walk_control *wc,</div><div class='add'>+				  struct btrfs_key *search_key,</div><div class='ctx'> 				  struct btrfs_inode *dir,</div><div class='del'>-				  struct btrfs_inode *inode,</div><div class='del'>-				  u64 inode_objectid, u64 parent_objectid,</div><div class='del'>-				  u64 ref_index, struct fscrypt_str *name)</div><div class='add'>+				  struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct extent_buffer *leaf;</div><div class='del'>-	struct btrfs_dir_item *di;</div><div class='del'>-	struct btrfs_key search_key;</div><div class='del'>-	struct btrfs_inode_extref *extref;</div><div class='add'>+	struct extent_buffer *leaf = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+	unsigned long ptr;</div><div class='add'>+	unsigned long ptr_end;</div><div class='ctx'> </div><div class='del'>-again:</div><div class='del'>-	/* Search old style refs */</div><div class='del'>-	search_key.objectid = inode_objectid;</div><div class='del'>-	search_key.type = BTRFS_INODE_REF_KEY;</div><div class='del'>-	search_key.offset = parent_objectid;</div><div class='del'>-	ret = btrfs_search_slot(NULL, root, &amp;search_key, path, 0, 0);</div><div class='del'>-	if (ret == 0) {</div><div class='add'>+	/*</div><div class='add'>+	 * Check all the names in this back reference to see if they are in the</div><div class='add'>+	 * log. If so, we allow them to stay otherwise they must be unlinked as</div><div class='add'>+	 * a conflict.</div><div class='add'>+	 */</div><div class='add'>+	ptr = btrfs_item_ptr_offset(leaf, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+	ptr_end = ptr + btrfs_item_size(leaf, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+	while (ptr &lt; ptr_end) {</div><div class='add'>+		struct fscrypt_str victim_name;</div><div class='ctx'> 		struct btrfs_inode_ref *victim_ref;</div><div class='del'>-		unsigned long ptr;</div><div class='del'>-		unsigned long ptr_end;</div><div class='del'>-</div><div class='del'>-		leaf = path-&gt;nodes[0];</div><div class='del'>-</div><div class='del'>-		/* are we trying to overwrite a back ref for the root directory</div><div class='del'>-		 * if so, just jump out, we're done</div><div class='del'>-		 */</div><div class='del'>-		if (search_key.objectid == search_key.offset)</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* check all the names in this back reference to see</div><div class='del'>-		 * if they are in the log.  if so, we allow them to stay</div><div class='del'>-		 * otherwise they must be unlinked as a conflict</div><div class='del'>-		 */</div><div class='del'>-		ptr = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='del'>-		ptr_end = ptr + btrfs_item_size(leaf, path-&gt;slots[0]);</div><div class='del'>-		while (ptr &lt; ptr_end) {</div><div class='del'>-			struct fscrypt_str victim_name;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='del'>-			victim_ref = (struct btrfs_inode_ref *)ptr;</div><div class='del'>-			ret = read_alloc_one_name(leaf, (victim_ref + 1),</div><div class='del'>-				 btrfs_inode_ref_name_len(leaf, victim_ref),</div><div class='del'>-				 &amp;victim_name);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='add'>+		victim_ref = (struct btrfs_inode_ref *)ptr;</div><div class='add'>+		ret = read_alloc_one_name(leaf, (victim_ref + 1),</div><div class='add'>+					  btrfs_inode_ref_name_len(leaf, victim_ref),</div><div class='add'>+					  &amp;victim_name);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to allocate name for inode %llu parent dir %llu root %llu",</div><div class='add'>+					       btrfs_ino(inode), btrfs_ino(dir),</div><div class='add'>+					       btrfs_root_id(inode-&gt;root));</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			ret = backref_in_log(log_root, &amp;search_key,</div><div class='del'>-					     parent_objectid, &amp;victim_name);</div><div class='add'>+		ret = backref_in_log(wc-&gt;log, search_key, btrfs_ino(dir), &amp;victim_name);</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to check if backref is in log tree for inode %llu parent dir %llu name %.*s root %llu",</div><div class='add'>+						       btrfs_ino(inode), btrfs_ino(dir),</div><div class='add'>+						       victim_name.len, victim_name.name,</div><div class='add'>+						       btrfs_root_id(inode-&gt;root));</div><div class='ctx'> 				kfree(victim_name.name);</div><div class='ctx'> 				return ret;</div><div class='del'>-			} else if (!ret) {</div><div class='del'>-				inc_nlink(&amp;inode-&gt;vfs_inode);</div><div class='del'>-				btrfs_release_path(path);</div><div class='del'>-</div><div class='del'>-				ret = unlink_inode_for_log_replay(trans, dir, inode,</div><div class='del'>-						&amp;victim_name);</div><div class='del'>-				kfree(victim_name.name);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-				goto again;</div><div class='ctx'> 			}</div><div class='ctx'> 			kfree(victim_name.name);</div><div class='del'>-</div><div class='ctx'> 			ptr = (unsigned long)(victim_ref + 1) + victim_name.len;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='ctx'> </div><div class='del'>-	/* Same search but for extended refs */</div><div class='del'>-	extref = btrfs_lookup_inode_extref(NULL, root, path, name,</div><div class='del'>-					   inode_objectid, parent_objectid, 0,</div><div class='del'>-					   0);</div><div class='del'>-	if (IS_ERR(extref)) {</div><div class='del'>-		return PTR_ERR(extref);</div><div class='del'>-	} else if (extref) {</div><div class='del'>-		u32 item_size;</div><div class='del'>-		u32 cur_offset = 0;</div><div class='del'>-		unsigned long base;</div><div class='del'>-		struct inode *victim_parent;</div><div class='add'>+		inc_nlink(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='del'>-		leaf = path-&gt;nodes[0];</div><div class='add'>+		ret = unlink_inode_for_log_replay(wc, dir, inode, &amp;victim_name);</div><div class='add'>+		kfree(victim_name.name);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		item_size = btrfs_item_size(leaf, path-&gt;slots[0]);</div><div class='del'>-		base = btrfs_item_ptr_offset(leaf, path-&gt;slots[0]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		while (cur_offset &lt; item_size) {</div><div class='del'>-			struct fscrypt_str victim_name;</div><div class='add'>+static int unlink_extrefs_not_in_log(struct walk_control *wc,</div><div class='add'>+				     struct btrfs_key *search_key,</div><div class='add'>+				     struct btrfs_inode *dir,</div><div class='add'>+				     struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct extent_buffer *leaf = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+	const unsigned long base = btrfs_item_ptr_offset(leaf, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+	const u32 item_size = btrfs_item_size(leaf, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+	u32 cur_offset = 0;</div><div class='add'>+</div><div class='add'>+	while (cur_offset &lt; item_size) {</div><div class='add'>+		struct btrfs_root *log_root = wc-&gt;log;</div><div class='add'>+		struct btrfs_inode_extref *extref;</div><div class='add'>+		struct fscrypt_str victim_name;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='del'>-			extref = (struct btrfs_inode_extref *)(base + cur_offset);</div><div class='add'>+		extref = (struct btrfs_inode_extref *)(base + cur_offset);</div><div class='add'>+		victim_name.len = btrfs_inode_extref_name_len(leaf, extref);</div><div class='ctx'> </div><div class='del'>-			if (btrfs_inode_extref_parent(leaf, extref) != parent_objectid)</div><div class='del'>-				goto next;</div><div class='add'>+		if (btrfs_inode_extref_parent(leaf, extref) != btrfs_ino(dir))</div><div class='add'>+			goto next;</div><div class='ctx'> </div><div class='del'>-			ret = read_alloc_one_name(leaf, &amp;extref-&gt;name,</div><div class='del'>-				 btrfs_inode_extref_name_len(leaf, extref),</div><div class='del'>-				 &amp;victim_name);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='add'>+		ret = read_alloc_one_name(leaf, &amp;extref-&gt;name, victim_name.len,</div><div class='add'>+					  &amp;victim_name);</div><div class='add'>+		if (ret) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to allocate name for inode %llu parent dir %llu root %llu",</div><div class='add'>+					       btrfs_ino(inode), btrfs_ino(dir),</div><div class='add'>+					       btrfs_root_id(inode-&gt;root));</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			search_key.objectid = inode_objectid;</div><div class='del'>-			search_key.type = BTRFS_INODE_EXTREF_KEY;</div><div class='del'>-			search_key.offset = btrfs_extref_hash(parent_objectid,</div><div class='del'>-							      victim_name.name,</div><div class='del'>-							      victim_name.len);</div><div class='del'>-			ret = backref_in_log(log_root, &amp;search_key,</div><div class='del'>-					     parent_objectid, &amp;victim_name);</div><div class='add'>+		search_key-&gt;objectid = btrfs_ino(inode);</div><div class='add'>+		search_key-&gt;type = BTRFS_INODE_EXTREF_KEY;</div><div class='add'>+		search_key-&gt;offset = btrfs_extref_hash(btrfs_ino(dir),</div><div class='add'>+						       victim_name.name,</div><div class='add'>+						       victim_name.len);</div><div class='add'>+		ret = backref_in_log(log_root, search_key, btrfs_ino(dir), &amp;victim_name);</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to check if backref is in log tree for inode %llu parent dir %llu name %.*s root %llu",</div><div class='add'>+						       btrfs_ino(inode), btrfs_ino(dir),</div><div class='add'>+						       victim_name.len, victim_name.name,</div><div class='add'>+						       btrfs_root_id(inode-&gt;root));</div><div class='ctx'> 				kfree(victim_name.name);</div><div class='ctx'> 				return ret;</div><div class='del'>-			} else if (!ret) {</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-				victim_parent = read_one_inode(root,</div><div class='del'>-						parent_objectid);</div><div class='del'>-				if (victim_parent) {</div><div class='del'>-					inc_nlink(&amp;inode-&gt;vfs_inode);</div><div class='del'>-					btrfs_release_path(path);</div><div class='del'>-</div><div class='del'>-					ret = unlink_inode_for_log_replay(trans,</div><div class='del'>-							BTRFS_I(victim_parent),</div><div class='del'>-							inode, &amp;victim_name);</div><div class='del'>-				}</div><div class='del'>-				iput(victim_parent);</div><div class='del'>-				kfree(victim_name.name);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-				goto again;</div><div class='ctx'> 			}</div><div class='ctx'> 			kfree(victim_name.name);</div><div class='ctx'> next:</div><div class='ctx'> 			cur_offset += victim_name.len + sizeof(*extref);</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		inc_nlink(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+</div><div class='add'>+		ret = unlink_inode_for_log_replay(wc, dir, inode, &amp;victim_name);</div><div class='add'>+		kfree(victim_name.name);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __add_inode_ref(struct walk_control *wc,</div><div class='add'>+				  struct btrfs_inode *dir,</div><div class='add'>+				  struct btrfs_inode *inode,</div><div class='add'>+				  u64 ref_index, struct fscrypt_str *name)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+	struct btrfs_dir_item *di;</div><div class='add'>+	struct btrfs_key search_key;</div><div class='add'>+	struct btrfs_inode_extref *extref;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	/* Search old style refs */</div><div class='add'>+	search_key.objectid = btrfs_ino(inode);</div><div class='add'>+	search_key.type = BTRFS_INODE_REF_KEY;</div><div class='add'>+	search_key.offset = btrfs_ino(dir);</div><div class='add'>+	ret = btrfs_search_slot(NULL, root, &amp;search_key, wc-&gt;subvol_path, 0, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to search subvolume tree for key " BTRFS_KEY_FMT " root %llu",</div><div class='add'>+				       BTRFS_KEY_FMT_VALUE(&amp;search_key),</div><div class='add'>+				       btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='add'>+	} else if (ret == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Are we trying to overwrite a back ref for the root directory?</div><div class='add'>+		 * If so, we're done.</div><div class='add'>+		 */</div><div class='add'>+		if (search_key.objectid == search_key.offset)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		ret = unlink_refs_not_in_log(wc, &amp;search_key, dir, inode);</div><div class='add'>+		if (ret == -EAGAIN)</div><div class='add'>+			goto again;</div><div class='add'>+		else if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+</div><div class='add'>+	/* Same search but for extended refs */</div><div class='add'>+	extref = btrfs_lookup_inode_extref(root, wc-&gt;subvol_path, name,</div><div class='add'>+					   btrfs_ino(inode), btrfs_ino(dir));</div><div class='add'>+	if (IS_ERR(extref)) {</div><div class='add'>+		return PTR_ERR(extref);</div><div class='add'>+	} else if (extref) {</div><div class='add'>+		ret = unlink_extrefs_not_in_log(wc, &amp;search_key, dir, inode);</div><div class='add'>+		if (ret == -EAGAIN)</div><div class='add'>+			goto again;</div><div class='add'>+		else if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='ctx'> 	/* look for a conflicting sequence number */</div><div class='del'>-	di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(dir),</div><div class='add'>+	di = btrfs_lookup_dir_index_item(trans, root, wc-&gt;subvol_path, btrfs_ino(dir),</div><div class='ctx'> 					 ref_index, name, 0);</div><div class='ctx'> 	if (IS_ERR(di)) {</div><div class='del'>-		return PTR_ERR(di);</div><div class='add'>+		ret = PTR_ERR(di);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to lookup dir index item for dir %llu ref_index %llu name %.*s root %llu",</div><div class='add'>+				       btrfs_ino(dir), ref_index, name-&gt;len,</div><div class='add'>+				       name-&gt;name, btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else if (di) {</div><div class='del'>-		ret = drop_one_dir_item(trans, path, dir, di);</div><div class='add'>+		ret = drop_one_dir_item(wc, dir, di);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='ctx'> 	/* look for a conflicting name */</div><div class='del'>-	di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(dir), name, 0);</div><div class='add'>+	di = btrfs_lookup_dir_item(trans, root, wc-&gt;subvol_path, btrfs_ino(dir), name, 0);</div><div class='ctx'> 	if (IS_ERR(di)) {</div><div class='del'>-		return PTR_ERR(di);</div><div class='add'>+		ret = PTR_ERR(di);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	"failed to lookup dir item for dir %llu name %.*s root %llu",</div><div class='add'>+				       btrfs_ino(dir), name-&gt;len, name-&gt;name,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else if (di) {</div><div class='del'>-		ret = drop_one_dir_item(trans, path, dir, di);</div><div class='add'>+		ret = drop_one_dir_item(wc, dir, di);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1260,66 +1466,81 @@ static int ref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,</div><div class='ctx'>  * proper unlink of that name (that is, remove its entry from the inode</div><div class='ctx'>  * reference item and both dir index keys).</div><div class='ctx'>  */</div><div class='del'>-static int unlink_old_inode_refs(struct btrfs_trans_handle *trans,</div><div class='del'>-				 struct btrfs_root *root,</div><div class='del'>-				 struct btrfs_path *path,</div><div class='del'>-				 struct btrfs_inode *inode,</div><div class='del'>-				 struct extent_buffer *log_eb,</div><div class='del'>-				 int log_slot,</div><div class='del'>-				 struct btrfs_key *key)</div><div class='add'>+static int unlink_old_inode_refs(struct walk_control *wc, struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long ref_ptr;</div><div class='ctx'> 	unsigned long ref_end;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	ret = btrfs_search_slot(NULL, root, key, path, 0, 0);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+	ret = btrfs_search_slot(NULL, root, &amp;wc-&gt;log_key, wc-&gt;subvol_path, 0, 0);</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to search subvolume tree for key " BTRFS_KEY_FMT " root %llu",</div><div class='add'>+				       BTRFS_KEY_FMT_VALUE(&amp;wc-&gt;log_key),</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	eb = path-&gt;nodes[0];</div><div class='del'>-	ref_ptr = btrfs_item_ptr_offset(eb, path-&gt;slots[0]);</div><div class='del'>-	ref_end = ref_ptr + btrfs_item_size(eb, path-&gt;slots[0]);</div><div class='add'>+	eb = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+	ref_ptr = btrfs_item_ptr_offset(eb, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='add'>+	ref_end = ref_ptr + btrfs_item_size(eb, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='ctx'> 	while (ref_ptr &lt; ref_end) {</div><div class='ctx'> 		struct fscrypt_str name;</div><div class='ctx'> 		u64 parent_id;</div><div class='ctx'> </div><div class='del'>-		if (key-&gt;type == BTRFS_INODE_EXTREF_KEY) {</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_INODE_EXTREF_KEY) {</div><div class='ctx'> 			ret = extref_get_fields(eb, ref_ptr, &amp;name,</div><div class='ctx'> 						NULL, &amp;parent_id);</div><div class='add'>+			if (ret) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to get extref details for inode %llu root %llu",</div><div class='add'>+						       btrfs_ino(inode),</div><div class='add'>+						       btrfs_root_id(root));</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			parent_id = key-&gt;offset;</div><div class='add'>+			parent_id = wc-&gt;log_key.offset;</div><div class='ctx'> 			ret = ref_get_fields(eb, ref_ptr, &amp;name, NULL);</div><div class='add'>+			if (ret) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to get ref details for inode %llu parent_id %llu root %llu",</div><div class='add'>+						       btrfs_ino(inode), parent_id,</div><div class='add'>+						       btrfs_root_id(root));</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='ctx'> </div><div class='del'>-		if (key-&gt;type == BTRFS_INODE_EXTREF_KEY)</div><div class='del'>-			ret = !!btrfs_find_name_in_ext_backref(log_eb, log_slot,</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_INODE_EXTREF_KEY)</div><div class='add'>+			ret = !!btrfs_find_name_in_ext_backref(wc-&gt;log_leaf, wc-&gt;log_slot,</div><div class='ctx'> 							       parent_id, &amp;name);</div><div class='ctx'> 		else</div><div class='del'>-			ret = !!btrfs_find_name_in_backref(log_eb, log_slot, &amp;name);</div><div class='add'>+			ret = !!btrfs_find_name_in_backref(wc-&gt;log_leaf, wc-&gt;log_slot,</div><div class='add'>+							   &amp;name);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret) {</div><div class='del'>-			struct inode *dir;</div><div class='add'>+			struct btrfs_inode *dir;</div><div class='ctx'> </div><div class='del'>-			btrfs_release_path(path);</div><div class='del'>-			dir = read_one_inode(root, parent_id);</div><div class='del'>-			if (!dir) {</div><div class='del'>-				ret = -ENOENT;</div><div class='add'>+			btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+			dir = btrfs_iget_logging(parent_id, root);</div><div class='add'>+			if (IS_ERR(dir)) {</div><div class='add'>+				ret = PTR_ERR(dir);</div><div class='ctx'> 				kfree(name.name);</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup dir inode %llu root %llu",</div><div class='add'>+						       parent_id, btrfs_root_id(root));</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			ret = unlink_inode_for_log_replay(trans, BTRFS_I(dir),</div><div class='del'>-						 inode, &amp;name);</div><div class='add'>+			ret = unlink_inode_for_log_replay(wc, dir, inode, &amp;name);</div><div class='ctx'> 			kfree(name.name);</div><div class='del'>-			iput(dir);</div><div class='add'>+			iput(&amp;dir-&gt;vfs_inode);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -1327,57 +1548,51 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		kfree(name.name);</div><div class='ctx'> 		ref_ptr += name.len;</div><div class='del'>-		if (key-&gt;type == BTRFS_INODE_EXTREF_KEY)</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_INODE_EXTREF_KEY)</div><div class='ctx'> 			ref_ptr += sizeof(struct btrfs_inode_extref);</div><div class='ctx'> 		else</div><div class='ctx'> 			ref_ptr += sizeof(struct btrfs_inode_ref);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'>  out:</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * replay one inode back reference item found in the log tree.</div><div class='del'>- * eb, slot and key refer to the buffer and key found in the log tree.</div><div class='del'>- * root is the destination we are replaying into, and path is for temp</div><div class='del'>- * use by this function.  (it should be released on return).</div><div class='add'>+ * Replay one inode back reference item found in the log tree.</div><div class='add'>+ * Path is for temporary use by this function (it should be released on return).</div><div class='ctx'>  */</div><div class='del'>-static noinline int add_inode_ref(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_root *root,</div><div class='del'>-				  struct btrfs_root *log,</div><div class='del'>-				  struct btrfs_path *path,</div><div class='del'>-				  struct extent_buffer *eb, int slot,</div><div class='del'>-				  struct btrfs_key *key)</div><div class='add'>+static noinline int add_inode_ref(struct walk_control *wc)</div><div class='ctx'> {</div><div class='del'>-	struct inode *dir = NULL;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+	struct btrfs_inode *dir = NULL;</div><div class='add'>+	struct btrfs_inode *inode = NULL;</div><div class='ctx'> 	unsigned long ref_ptr;</div><div class='ctx'> 	unsigned long ref_end;</div><div class='del'>-	struct fscrypt_str name;</div><div class='add'>+	struct fscrypt_str name = { 0 };</div><div class='ctx'> 	int ret;</div><div class='del'>-	int log_ref_ver = 0;</div><div class='add'>+	const bool is_extref_item = (wc-&gt;log_key.type == BTRFS_INODE_EXTREF_KEY);</div><div class='ctx'> 	u64 parent_objectid;</div><div class='ctx'> 	u64 inode_objectid;</div><div class='ctx'> 	u64 ref_index = 0;</div><div class='ctx'> 	int ref_struct_size;</div><div class='ctx'> </div><div class='del'>-	ref_ptr = btrfs_item_ptr_offset(eb, slot);</div><div class='del'>-	ref_end = ref_ptr + btrfs_item_size(eb, slot);</div><div class='add'>+	ref_ptr = btrfs_item_ptr_offset(wc-&gt;log_leaf, wc-&gt;log_slot);</div><div class='add'>+	ref_end = ref_ptr + btrfs_item_size(wc-&gt;log_leaf, wc-&gt;log_slot);</div><div class='ctx'> </div><div class='del'>-	if (key-&gt;type == BTRFS_INODE_EXTREF_KEY) {</div><div class='add'>+	if (is_extref_item) {</div><div class='ctx'> 		struct btrfs_inode_extref *r;</div><div class='ctx'> </div><div class='ctx'> 		ref_struct_size = sizeof(struct btrfs_inode_extref);</div><div class='del'>-		log_ref_ver = 1;</div><div class='ctx'> 		r = (struct btrfs_inode_extref *)ref_ptr;</div><div class='del'>-		parent_objectid = btrfs_inode_extref_parent(eb, r);</div><div class='add'>+		parent_objectid = btrfs_inode_extref_parent(wc-&gt;log_leaf, r);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ref_struct_size = sizeof(struct btrfs_inode_ref);</div><div class='del'>-		parent_objectid = key-&gt;offset;</div><div class='add'>+		parent_objectid = wc-&gt;log_key.offset;</div><div class='ctx'> 	}</div><div class='del'>-	inode_objectid = key-&gt;objectid;</div><div class='add'>+	inode_objectid = wc-&gt;log_key.objectid;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * it is possible that we didn't log all the parent directories</div><div class='hunk'>@@ -1385,41 +1600,93 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * copy the back ref in.  The link count fixup code will take</div><div class='ctx'> 	 * care of the rest</div><div class='ctx'> 	 */</div><div class='del'>-	dir = read_one_inode(root, parent_objectid);</div><div class='del'>-	if (!dir) {</div><div class='del'>-		ret = -ENOENT;</div><div class='add'>+	dir = btrfs_iget_logging(parent_objectid, root);</div><div class='add'>+	if (IS_ERR(dir)) {</div><div class='add'>+		ret = PTR_ERR(dir);</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = 0;</div><div class='add'>+		else</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to lookup dir inode %llu root %llu",</div><div class='add'>+					       parent_objectid, btrfs_root_id(root));</div><div class='add'>+		dir = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode = read_one_inode(root, inode_objectid);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		ret = -EIO;</div><div class='add'>+	inode = btrfs_iget_logging(inode_objectid, root);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup inode %llu root %llu",</div><div class='add'>+				       inode_objectid, btrfs_root_id(root));</div><div class='add'>+		inode = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (ref_ptr &lt; ref_end) {</div><div class='del'>-		if (log_ref_ver) {</div><div class='del'>-			ret = extref_get_fields(eb, ref_ptr, &amp;name,</div><div class='add'>+		if (is_extref_item) {</div><div class='add'>+			ret = extref_get_fields(wc-&gt;log_leaf, ref_ptr, &amp;name,</div><div class='ctx'> 						&amp;ref_index, &amp;parent_objectid);</div><div class='add'>+			if (ret) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to get extref details for inode %llu root %llu",</div><div class='add'>+						       btrfs_ino(inode),</div><div class='add'>+						       btrfs_root_id(root));</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * parent object can change from one array</div><div class='ctx'> 			 * item to another.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!dir)</div><div class='del'>-				dir = read_one_inode(root, parent_objectid);</div><div class='ctx'> 			if (!dir) {</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-				goto out;</div><div class='add'>+				dir = btrfs_iget_logging(parent_objectid, root);</div><div class='add'>+				if (IS_ERR(dir)) {</div><div class='add'>+					ret = PTR_ERR(dir);</div><div class='add'>+					dir = NULL;</div><div class='add'>+					/*</div><div class='add'>+					 * A new parent dir may have not been</div><div class='add'>+					 * logged and not exist in the subvolume</div><div class='add'>+					 * tree, see the comment above before</div><div class='add'>+					 * the loop when getting the first</div><div class='add'>+					 * parent dir.</div><div class='add'>+					 */</div><div class='add'>+					if (ret == -ENOENT) {</div><div class='add'>+						/*</div><div class='add'>+						 * The next extref may refer to</div><div class='add'>+						 * another parent dir that</div><div class='add'>+						 * exists, so continue.</div><div class='add'>+						 */</div><div class='add'>+						ret = 0;</div><div class='add'>+						goto next;</div><div class='add'>+					} else {</div><div class='add'>+						btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup dir inode %llu root %llu",</div><div class='add'>+								       parent_objectid,</div><div class='add'>+								       btrfs_root_id(root));</div><div class='add'>+					}</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = ref_get_fields(eb, ref_ptr, &amp;name, &amp;ref_index);</div><div class='add'>+			ret = ref_get_fields(wc-&gt;log_leaf, ref_ptr, &amp;name, &amp;ref_index);</div><div class='add'>+			if (ret) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	"failed to get ref details for inode %llu parent_objectid %llu root %llu",</div><div class='add'>+						       btrfs_ino(inode),</div><div class='add'>+						       parent_objectid,</div><div class='add'>+						       btrfs_root_id(root));</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='ctx'> </div><div class='del'>-		ret = inode_in_dir(root, path, btrfs_ino(BTRFS_I(dir)),</div><div class='del'>-				   btrfs_ino(BTRFS_I(inode)), ref_index, &amp;name);</div><div class='add'>+		ret = inode_in_dir(root, wc-&gt;subvol_path, btrfs_ino(dir),</div><div class='add'>+				   btrfs_ino(inode), ref_index, &amp;name);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to check if inode %llu is in dir %llu ref_index %llu name %.*s root %llu",</div><div class='add'>+					       btrfs_ino(inode), btrfs_ino(dir),</div><div class='add'>+					       ref_index, name.len, name.name,</div><div class='add'>+					       btrfs_root_id(root));</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (ret == 0) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1429,10 +1696,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 * overwrite any existing back reference, and we don't</div><div class='ctx'> 			 * want to create dangling pointers in the directory.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = __add_inode_ref(trans, root, path, log,</div><div class='del'>-					      BTRFS_I(dir), BTRFS_I(inode),</div><div class='del'>-					      inode_objectid, parent_objectid,</div><div class='del'>-					      ref_index, &amp;name);</div><div class='add'>+			ret = __add_inode_ref(wc, dir, inode, ref_index, &amp;name);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				if (ret == 1)</div><div class='ctx'> 					ret = 0;</div><div class='hunk'>@@ -1440,22 +1704,34 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* insert our name */</div><div class='del'>-			ret = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode),</div><div class='del'>-					     &amp;name, 0, ref_index);</div><div class='del'>-			if (ret)</div><div class='add'>+			ret = btrfs_add_link(trans, dir, inode, &amp;name, 0, ref_index);</div><div class='add'>+			if (ret) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to add link for inode %llu in dir %llu ref_index %llu name %.*s root %llu",</div><div class='add'>+						       btrfs_ino(inode),</div><div class='add'>+						       btrfs_ino(dir), ref_index,</div><div class='add'>+						       name.len, name.name,</div><div class='add'>+						       btrfs_root_id(root));</div><div class='ctx'> 				goto out;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='del'>-			if (ret)</div><div class='add'>+			ret = btrfs_update_inode(trans, inode);</div><div class='add'>+			if (ret) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to update inode %llu root %llu",</div><div class='add'>+						       btrfs_ino(inode),</div><div class='add'>+						       btrfs_root_id(root));</div><div class='ctx'> 				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Else, ret == 1, we already have a perfect match, we're done. */</div><div class='ctx'> </div><div class='add'>+next:</div><div class='ctx'> 		ref_ptr = (unsigned long)(ref_ptr + ref_struct_size) + name.len;</div><div class='ctx'> 		kfree(name.name);</div><div class='ctx'> 		name.name = NULL;</div><div class='del'>-		if (log_ref_ver) {</div><div class='del'>-			iput(dir);</div><div class='add'>+		if (is_extref_item &amp;&amp; dir) {</div><div class='add'>+			iput(&amp;dir-&gt;vfs_inode);</div><div class='ctx'> 			dir = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1468,18 +1744,19 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * dir index entries exist for a name but there is no inode reference</div><div class='ctx'> 	 * item with the same name.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = unlink_old_inode_refs(trans, root, path, BTRFS_I(inode), eb, slot,</div><div class='del'>-				    key);</div><div class='add'>+	ret = unlink_old_inode_refs(wc, inode);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* finally write the back reference in the inode */</div><div class='del'>-	ret = overwrite_item(trans, root, path, eb, slot, key);</div><div class='add'>+	ret = overwrite_item(wc);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	kfree(name.name);</div><div class='del'>-	iput(dir);</div><div class='del'>-	iput(inode);</div><div class='add'>+	if (dir)</div><div class='add'>+		iput(&amp;dir-&gt;vfs_inode);</div><div class='add'>+	if (inode)</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1592,26 +1869,22 @@ process_slot:</div><div class='ctx'>  * number of back refs found.  If it goes down to zero, the iput</div><div class='ctx'>  * will free the inode.</div><div class='ctx'>  */</div><div class='del'>-static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans,</div><div class='del'>-					   struct inode *inode)</div><div class='add'>+static noinline int fixup_inode_link_count(struct walk_control *wc,</div><div class='add'>+					   struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 nlink = 0;</div><div class='del'>-	u64 ino = btrfs_ino(BTRFS_I(inode));</div><div class='del'>-</div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!path)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	const u64 ino = btrfs_ino(inode);</div><div class='ctx'> </div><div class='del'>-	ret = count_inode_refs(BTRFS_I(inode), path);</div><div class='add'>+	ret = count_inode_refs(inode, wc-&gt;subvol_path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	nlink = ret;</div><div class='ctx'> </div><div class='del'>-	ret = count_inode_extrefs(BTRFS_I(inode), path);</div><div class='add'>+	ret = count_inode_extrefs(inode, wc-&gt;subvol_path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1619,18 +1892,18 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (nlink != inode-&gt;i_nlink) {</div><div class='del'>-		set_nlink(inode, nlink);</div><div class='del'>-		ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='add'>+	if (nlink != inode-&gt;vfs_inode.i_nlink) {</div><div class='add'>+		set_nlink(&amp;inode-&gt;vfs_inode, nlink);</div><div class='add'>+		ret = btrfs_update_inode(trans, inode);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	BTRFS_I(inode)-&gt;index_cnt = (u64)-1;</div><div class='add'>+	if (S_ISDIR(inode-&gt;vfs_inode.i_mode))</div><div class='add'>+		inode-&gt;index_cnt = (u64)-1;</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_nlink == 0) {</div><div class='del'>-		if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-			ret = replay_dir_deletes(trans, root, NULL, path,</div><div class='del'>-						 ino, 1);</div><div class='add'>+	if (inode-&gt;vfs_inode.i_nlink == 0) {</div><div class='add'>+		if (S_ISDIR(inode-&gt;vfs_inode.i_mode)) {</div><div class='add'>+			ret = replay_dir_deletes(wc, ino, true);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1640,62 +1913,63 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int fixup_inode_link_counts(struct btrfs_trans_handle *trans,</div><div class='del'>-					    struct btrfs_root *root,</div><div class='del'>-					    struct btrfs_path *path)</div><div class='add'>+static noinline int fixup_inode_link_counts(struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_TREE_LOG_FIXUP_OBJECTID;</div><div class='ctx'> 	key.type = BTRFS_ORPHAN_ITEM_KEY;</div><div class='ctx'> 	key.offset = (u64)-1;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='add'>+		struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+		struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+		struct btrfs_inode *inode;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_search_slot(trans, root, &amp;key, wc-&gt;subvol_path, -1, 1);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (ret == 1) {</div><div class='ctx'> 			ret = 0;</div><div class='del'>-			if (path-&gt;slots[0] == 0)</div><div class='add'>+			if (wc-&gt;subvol_path-&gt;slots[0] == 0)</div><div class='ctx'> 				break;</div><div class='del'>-			path-&gt;slots[0]--;</div><div class='add'>+			wc-&gt;subvol_path-&gt;slots[0]--;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='add'>+		btrfs_item_key_to_cpu(wc-&gt;subvol_path-&gt;nodes[0], &amp;key, wc-&gt;subvol_path-&gt;slots[0]);</div><div class='ctx'> 		if (key.objectid != BTRFS_TREE_LOG_FIXUP_OBJECTID ||</div><div class='ctx'> 		    key.type != BTRFS_ORPHAN_ITEM_KEY)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_del_item(trans, root, path);</div><div class='add'>+		ret = btrfs_del_item(trans, root, wc-&gt;subvol_path);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		btrfs_release_path(path);</div><div class='del'>-		inode = read_one_inode(root, key.offset);</div><div class='del'>-		if (!inode) {</div><div class='del'>-			ret = -EIO;</div><div class='add'>+		btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+		inode = btrfs_iget_logging(key.offset, root);</div><div class='add'>+		if (IS_ERR(inode)) {</div><div class='add'>+			ret = PTR_ERR(inode);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = fixup_inode_link_count(trans, inode);</div><div class='del'>-		iput(inode);</div><div class='add'>+		ret = fixup_inode_link_count(wc, inode);</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * fixup on a directory may create new entries,</div><div class='del'>-		 * make sure we always look for the highset possible</div><div class='add'>+		 * make sure we always look for the highest possible</div><div class='ctx'> 		 * offset</div><div class='ctx'> 		 */</div><div class='ctx'> 		key.offset = (u64)-1;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1705,36 +1979,50 @@ static noinline int fixup_inode_link_counts(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * count when replay is done.  The link count is incremented here</div><div class='ctx'>  * so the inode won't go away until we check it</div><div class='ctx'>  */</div><div class='del'>-static noinline int link_to_fixup_dir(struct btrfs_trans_handle *trans,</div><div class='del'>-				      struct btrfs_root *root,</div><div class='del'>-				      struct btrfs_path *path,</div><div class='del'>-				      u64 objectid)</div><div class='add'>+static noinline int link_to_fixup_dir(struct walk_control *wc, u64 objectid)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	struct inode *vfs_inode;</div><div class='ctx'> </div><div class='del'>-	inode = read_one_inode(root, objectid);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return -EIO;</div><div class='add'>+	inode = btrfs_iget_logging(objectid, root);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup inode %llu root %llu",</div><div class='add'>+				       objectid, btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	vfs_inode = &amp;inode-&gt;vfs_inode;</div><div class='ctx'> 	key.objectid = BTRFS_TREE_LOG_FIXUP_OBJECTID;</div><div class='ctx'> 	key.type = BTRFS_ORPHAN_ITEM_KEY;</div><div class='ctx'> 	key.offset = objectid;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_insert_empty_item(trans, root, path, &amp;key, 0);</div><div class='add'>+	ret = btrfs_insert_empty_item(trans, root, wc-&gt;subvol_path, &amp;key, 0);</div><div class='ctx'> </div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		if (!inode-&gt;i_nlink)</div><div class='del'>-			set_nlink(inode, 1);</div><div class='add'>+		if (!vfs_inode-&gt;i_nlink)</div><div class='add'>+			set_nlink(vfs_inode, 1);</div><div class='ctx'> 		else</div><div class='del'>-			inc_nlink(inode);</div><div class='del'>-		ret = btrfs_update_inode(trans, BTRFS_I(inode));</div><div class='add'>+			inc_nlink(vfs_inode);</div><div class='add'>+		ret = btrfs_update_inode(trans, inode);</div><div class='add'>+		if (ret)</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to update inode %llu root %llu",</div><div class='add'>+					       objectid, btrfs_root_id(root));</div><div class='ctx'> 	} else if (ret == -EEXIST) {</div><div class='ctx'> 		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to insert fixup item for inode %llu root %llu",</div><div class='add'>+				       objectid, btrfs_root_id(root));</div><div class='ctx'> 	}</div><div class='del'>-	iput(inode);</div><div class='add'>+	iput(vfs_inode);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1750,33 +2038,31 @@ static noinline int insert_one_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    const struct fscrypt_str *name,</div><div class='ctx'> 				    struct btrfs_key *location)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct inode *dir;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='add'>+	struct btrfs_inode *dir;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	inode = read_one_inode(root, location-&gt;objectid);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	inode = btrfs_iget_logging(location-&gt;objectid, root);</div><div class='add'>+	if (IS_ERR(inode))</div><div class='add'>+		return PTR_ERR(inode);</div><div class='ctx'> </div><div class='del'>-	dir = read_one_inode(root, dirid);</div><div class='del'>-	if (!dir) {</div><div class='del'>-		iput(inode);</div><div class='del'>-		return -EIO;</div><div class='add'>+	dir = btrfs_iget_logging(dirid, root);</div><div class='add'>+	if (IS_ERR(dir)) {</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='add'>+		return PTR_ERR(dir);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode), name,</div><div class='del'>-			     1, index);</div><div class='add'>+	ret = btrfs_add_link(trans, dir, inode, name, 1, index);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME, put inode into FIXUP list */</div><div class='ctx'> </div><div class='del'>-	iput(inode);</div><div class='del'>-	iput(dir);</div><div class='add'>+	iput(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	iput(&amp;dir-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int delete_conflicting_dir_entry(struct btrfs_trans_handle *trans,</div><div class='add'>+static int delete_conflicting_dir_entry(struct walk_control *wc,</div><div class='ctx'> 					struct btrfs_inode *dir,</div><div class='del'>-					struct btrfs_path *path,</div><div class='ctx'> 					struct btrfs_dir_item *dst_di,</div><div class='ctx'> 					const struct btrfs_key *log_key,</div><div class='ctx'> 					u8 log_flags,</div><div class='hunk'>@@ -1784,12 +2070,12 @@ static int delete_conflicting_dir_entry(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> </div><div class='del'>-	btrfs_dir_item_key_to_cpu(path-&gt;nodes[0], dst_di, &amp;found_key);</div><div class='add'>+	btrfs_dir_item_key_to_cpu(wc-&gt;subvol_path-&gt;nodes[0], dst_di, &amp;found_key);</div><div class='ctx'> 	/* The existing dentry points to the same inode, don't delete it. */</div><div class='ctx'> 	if (found_key.objectid == log_key-&gt;objectid &amp;&amp;</div><div class='ctx'> 	    found_key.type == log_key-&gt;type &amp;&amp;</div><div class='ctx'> 	    found_key.offset == log_key-&gt;offset &amp;&amp;</div><div class='del'>-	    btrfs_dir_flags(path-&gt;nodes[0], dst_di) == log_flags)</div><div class='add'>+	    btrfs_dir_flags(wc-&gt;subvol_path-&gt;nodes[0], dst_di) == log_flags)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1799,7 +2085,7 @@ static int delete_conflicting_dir_entry(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!exists)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return drop_one_dir_item(trans, path, dir, dst_di);</div><div class='add'>+	return drop_one_dir_item(wc, dir, dst_di);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1818,76 +2104,103 @@ static int delete_conflicting_dir_entry(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * Returns &lt; 0 on error, 0 if the name wasn't replayed (dentry points to a</div><div class='ctx'>  * non-existing inode) and 1 if the name was replayed.</div><div class='ctx'>  */</div><div class='del'>-static noinline int replay_one_name(struct btrfs_trans_handle *trans,</div><div class='del'>-				    struct btrfs_root *root,</div><div class='del'>-				    struct btrfs_path *path,</div><div class='del'>-				    struct extent_buffer *eb,</div><div class='del'>-				    struct btrfs_dir_item *di,</div><div class='del'>-				    struct btrfs_key *key)</div><div class='add'>+static noinline int replay_one_name(struct walk_control *wc, struct btrfs_dir_item *di)</div><div class='ctx'> {</div><div class='del'>-	struct fscrypt_str name;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+	struct fscrypt_str name = { 0 };</div><div class='ctx'> 	struct btrfs_dir_item *dir_dst_di;</div><div class='ctx'> 	struct btrfs_dir_item *index_dst_di;</div><div class='ctx'> 	bool dir_dst_matches = false;</div><div class='ctx'> 	bool index_dst_matches = false;</div><div class='ctx'> 	struct btrfs_key log_key;</div><div class='ctx'> 	struct btrfs_key search_key;</div><div class='del'>-	struct inode *dir;</div><div class='add'>+	struct btrfs_inode *dir;</div><div class='ctx'> 	u8 log_flags;</div><div class='ctx'> 	bool exists;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool update_size = true;</div><div class='ctx'> 	bool name_added = false;</div><div class='ctx'> </div><div class='del'>-	dir = read_one_inode(root, key-&gt;objectid);</div><div class='del'>-	if (!dir)</div><div class='del'>-		return -EIO;</div><div class='add'>+	dir = btrfs_iget_logging(wc-&gt;log_key.objectid, root);</div><div class='add'>+	if (IS_ERR(dir)) {</div><div class='add'>+		ret = PTR_ERR(dir);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup dir inode %llu root %llu",</div><div class='add'>+				       wc-&gt;log_key.objectid, btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = read_alloc_one_name(eb, di + 1, btrfs_dir_name_len(eb, di), &amp;name);</div><div class='del'>-	if (ret)</div><div class='add'>+	ret = read_alloc_one_name(wc-&gt;log_leaf, di + 1,</div><div class='add'>+				  btrfs_dir_name_len(wc-&gt;log_leaf, di), &amp;name);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to allocate name for dir %llu root %llu",</div><div class='add'>+				       btrfs_ino(dir), btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	log_flags = btrfs_dir_flags(eb, di);</div><div class='del'>-	btrfs_dir_item_key_to_cpu(eb, di, &amp;log_key);</div><div class='del'>-	ret = btrfs_lookup_inode(trans, root, path, &amp;log_key, 0);</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	log_flags = btrfs_dir_flags(wc-&gt;log_leaf, di);</div><div class='add'>+	btrfs_dir_item_key_to_cpu(wc-&gt;log_leaf, di, &amp;log_key);</div><div class='add'>+	ret = btrfs_lookup_inode(trans, root, wc-&gt;subvol_path, &amp;log_key, 0);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup inode %llu root %llu",</div><div class='add'>+				       log_key.objectid, btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	exists = (ret == 0);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='del'>-	dir_dst_di = btrfs_lookup_dir_item(trans, root, path, key-&gt;objectid,</div><div class='del'>-					   &amp;name, 1);</div><div class='add'>+	dir_dst_di = btrfs_lookup_dir_item(trans, root, wc-&gt;subvol_path,</div><div class='add'>+					   wc-&gt;log_key.objectid, &amp;name, 1);</div><div class='ctx'> 	if (IS_ERR(dir_dst_di)) {</div><div class='ctx'> 		ret = PTR_ERR(dir_dst_di);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to lookup dir item for dir %llu name %.*s root %llu",</div><div class='add'>+				       wc-&gt;log_key.objectid, name.len, name.name,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (dir_dst_di) {</div><div class='del'>-		ret = delete_conflicting_dir_entry(trans, BTRFS_I(dir), path,</div><div class='del'>-						   dir_dst_di, &amp;log_key,</div><div class='del'>-						   log_flags, exists);</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		ret = delete_conflicting_dir_entry(wc, dir, dir_dst_di,</div><div class='add'>+						   &amp;log_key, log_flags, exists);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to delete conflicting entry for dir %llu name %.*s root %llu",</div><div class='add'>+					       btrfs_ino(dir), name.len, name.name,</div><div class='add'>+					       btrfs_root_id(root));</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		dir_dst_matches = (ret == 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='del'>-	index_dst_di = btrfs_lookup_dir_index_item(trans, root, path,</div><div class='del'>-						   key-&gt;objectid, key-&gt;offset,</div><div class='del'>-						   &amp;name, 1);</div><div class='add'>+	index_dst_di = btrfs_lookup_dir_index_item(trans, root, wc-&gt;subvol_path,</div><div class='add'>+						   wc-&gt;log_key.objectid,</div><div class='add'>+						   wc-&gt;log_key.offset, &amp;name, 1);</div><div class='ctx'> 	if (IS_ERR(index_dst_di)) {</div><div class='ctx'> 		ret = PTR_ERR(index_dst_di);</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to lookup dir index item for dir %llu name %.*s root %llu",</div><div class='add'>+				       wc-&gt;log_key.objectid, name.len, name.name,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (index_dst_di) {</div><div class='del'>-		ret = delete_conflicting_dir_entry(trans, BTRFS_I(dir), path,</div><div class='del'>-						   index_dst_di, &amp;log_key,</div><div class='del'>-						   log_flags, exists);</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		ret = delete_conflicting_dir_entry(wc, dir, index_dst_di,</div><div class='add'>+						   &amp;log_key, log_flags, exists);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	       "failed to delete conflicting entry for dir %llu name %.*s root %llu",</div><div class='add'>+					       btrfs_ino(dir), name.len, name.name,</div><div class='add'>+					       btrfs_root_id(root));</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		index_dst_matches = (ret == 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> </div><div class='ctx'> 	if (dir_dst_matches &amp;&amp; index_dst_matches) {</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -1901,9 +2214,13 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	search_key.objectid = log_key.objectid;</div><div class='ctx'> 	search_key.type = BTRFS_INODE_REF_KEY;</div><div class='del'>-	search_key.offset = key-&gt;objectid;</div><div class='add'>+	search_key.offset = wc-&gt;log_key.objectid;</div><div class='ctx'> 	ret = backref_in_log(root-&gt;log_root, &amp;search_key, 0, &amp;name);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to check if ref item is logged for inode %llu dir %llu name %.*s root %llu",</div><div class='add'>+				       search_key.objectid, btrfs_ino(dir),</div><div class='add'>+				       name.len, name.name, btrfs_root_id(root));</div><div class='ctx'> 	        goto out;</div><div class='ctx'> 	} else if (ret) {</div><div class='ctx'> 	        /* The dentry will be added later. */</div><div class='hunk'>@@ -1914,9 +2231,13 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	search_key.objectid = log_key.objectid;</div><div class='ctx'> 	search_key.type = BTRFS_INODE_EXTREF_KEY;</div><div class='del'>-	search_key.offset = key-&gt;objectid;</div><div class='del'>-	ret = backref_in_log(root-&gt;log_root, &amp;search_key, key-&gt;objectid, &amp;name);</div><div class='add'>+	search_key.offset = btrfs_extref_hash(wc-&gt;log_key.objectid, name.name, name.len);</div><div class='add'>+	ret = backref_in_log(root-&gt;log_root, &amp;search_key, wc-&gt;log_key.objectid, &amp;name);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+"failed to check if extref item is logged for inode %llu dir %llu name %.*s root %llu",</div><div class='add'>+				       search_key.objectid, btrfs_ino(dir),</div><div class='add'>+				       name.len, name.name, btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (ret) {</div><div class='ctx'> 		/* The dentry will be added later. */</div><div class='hunk'>@@ -1924,11 +2245,15 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		update_size = false;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	ret = insert_one_name(trans, root, key-&gt;objectid, key-&gt;offset,</div><div class='add'>+	ret = insert_one_name(trans, root, wc-&gt;log_key.objectid, wc-&gt;log_key.offset,</div><div class='ctx'> 			      &amp;name, &amp;log_key);</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOENT &amp;&amp; ret != -EEXIST)</div><div class='add'>+	if (ret &amp;&amp; ret != -ENOENT &amp;&amp; ret != -EEXIST) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to insert name %.*s for inode %llu dir %llu root %llu",</div><div class='add'>+				       name.len, name.name, log_key.objectid,</div><div class='add'>+				       btrfs_ino(dir), btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		name_added = true;</div><div class='ctx'> 	update_size = false;</div><div class='hunk'>@@ -1936,31 +2261,32 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (!ret &amp;&amp; update_size) {</div><div class='del'>-		btrfs_i_size_write(BTRFS_I(dir), dir-&gt;i_size + name.len * 2);</div><div class='del'>-		ret = btrfs_update_inode(trans, BTRFS_I(dir));</div><div class='add'>+		btrfs_i_size_write(dir, dir-&gt;vfs_inode.i_size + name.len * 2);</div><div class='add'>+		ret = btrfs_update_inode(trans, dir);</div><div class='add'>+		if (ret)</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to update dir inode %llu root %llu",</div><div class='add'>+					       btrfs_ino(dir), btrfs_root_id(root));</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(name.name);</div><div class='del'>-	iput(dir);</div><div class='add'>+	iput(&amp;dir-&gt;vfs_inode);</div><div class='ctx'> 	if (!ret &amp;&amp; name_added)</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Replay one dir item from a BTRFS_DIR_INDEX_KEY key. */</div><div class='del'>-static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,</div><div class='del'>-					struct btrfs_root *root,</div><div class='del'>-					struct btrfs_path *path,</div><div class='del'>-					struct extent_buffer *eb, int slot,</div><div class='del'>-					struct btrfs_key *key)</div><div class='add'>+static noinline int replay_one_dir_item(struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> </div><div class='ctx'> 	/* We only log dir index keys, which only contain a single dir item. */</div><div class='del'>-	ASSERT(key-&gt;type == BTRFS_DIR_INDEX_KEY);</div><div class='add'>+	ASSERT(wc-&gt;log_key.type == BTRFS_DIR_INDEX_KEY,</div><div class='add'>+	       "wc-&gt;log_key.type=%u", wc-&gt;log_key.type);</div><div class='ctx'> </div><div class='del'>-	di = btrfs_item_ptr(eb, slot, struct btrfs_dir_item);</div><div class='del'>-	ret = replay_one_name(trans, root, path, eb, di, key);</div><div class='add'>+	di = btrfs_item_ptr(wc-&gt;log_leaf, wc-&gt;log_slot, struct btrfs_dir_item);</div><div class='add'>+	ret = replay_one_name(wc, di);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1990,17 +2316,11 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * to ever delete the parent directory has it would result in stale</div><div class='ctx'> 	 * dentries that can never be deleted.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ret == 1 &amp;&amp; btrfs_dir_ftype(eb, di) != BTRFS_FT_DIR) {</div><div class='del'>-		struct btrfs_path *fixup_path;</div><div class='add'>+	if (ret == 1 &amp;&amp; btrfs_dir_ftype(wc-&gt;log_leaf, di) != BTRFS_FT_DIR) {</div><div class='ctx'> 		struct btrfs_key di_key;</div><div class='ctx'> </div><div class='del'>-		fixup_path = btrfs_alloc_path();</div><div class='del'>-		if (!fixup_path)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		btrfs_dir_item_key_to_cpu(eb, di, &amp;di_key);</div><div class='del'>-		ret = link_to_fixup_dir(trans, root, fixup_path, di_key.objectid);</div><div class='del'>-		btrfs_free_path(fixup_path);</div><div class='add'>+		btrfs_dir_item_key_to_cpu(wc-&gt;log_leaf, di, &amp;di_key);</div><div class='add'>+		ret = link_to_fixup_dir(wc, di_key.objectid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2093,20 +2413,20 @@ out:</div><div class='ctx'>  * item is not in the log, the item is removed and the inode it points</div><div class='ctx'>  * to is unlinked</div><div class='ctx'>  */</div><div class='del'>-static noinline int check_item_in_log(struct btrfs_trans_handle *trans,</div><div class='del'>-				      struct btrfs_root *log,</div><div class='del'>-				      struct btrfs_path *path,</div><div class='add'>+static noinline int check_item_in_log(struct walk_control *wc,</div><div class='ctx'> 				      struct btrfs_path *log_path,</div><div class='del'>-				      struct inode *dir,</div><div class='del'>-				      struct btrfs_key *dir_key)</div><div class='add'>+				      struct btrfs_inode *dir,</div><div class='add'>+				      struct btrfs_key *dir_key,</div><div class='add'>+				      bool force_remove)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *root = BTRFS_I(dir)-&gt;root;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = dir-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='del'>-	struct fscrypt_str name;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct fscrypt_str name = { 0 };</div><div class='add'>+	struct btrfs_inode *inode = NULL;</div><div class='ctx'> 	struct btrfs_key location;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2115,23 +2435,33 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * we need to do is process the dir index keys, we (and our caller) can</div><div class='ctx'> 	 * safely ignore dir item keys (key type BTRFS_DIR_ITEM_KEY).</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(dir_key-&gt;type == BTRFS_DIR_INDEX_KEY);</div><div class='add'>+	ASSERT(dir_key-&gt;type == BTRFS_DIR_INDEX_KEY, "dir_key-&gt;type=%u", dir_key-&gt;type);</div><div class='ctx'> </div><div class='del'>-	eb = path-&gt;nodes[0];</div><div class='del'>-	slot = path-&gt;slots[0];</div><div class='add'>+	eb = wc-&gt;subvol_path-&gt;nodes[0];</div><div class='add'>+	slot = wc-&gt;subvol_path-&gt;slots[0];</div><div class='ctx'> 	di = btrfs_item_ptr(eb, slot, struct btrfs_dir_item);</div><div class='ctx'> 	ret = read_alloc_one_name(eb, di + 1, btrfs_dir_name_len(eb, di), &amp;name);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to allocate name for dir %llu index %llu root %llu",</div><div class='add'>+				       btrfs_ino(dir), dir_key-&gt;offset,</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (log) {</div><div class='add'>+	if (!force_remove) {</div><div class='ctx'> 		struct btrfs_dir_item *log_di;</div><div class='ctx'> </div><div class='del'>-		log_di = btrfs_lookup_dir_index_item(trans, log, log_path,</div><div class='add'>+		log_di = btrfs_lookup_dir_index_item(trans, wc-&gt;log, log_path,</div><div class='ctx'> 						     dir_key-&gt;objectid,</div><div class='ctx'> 						     dir_key-&gt;offset, &amp;name, 0);</div><div class='ctx'> 		if (IS_ERR(log_di)) {</div><div class='ctx'> 			ret = PTR_ERR(log_di);</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	"failed to lookup dir index item for dir %llu index %llu name %.*s root %llu",</div><div class='add'>+					       btrfs_ino(dir), dir_key-&gt;offset,</div><div class='add'>+					       name.len, name.name,</div><div class='add'>+					       btrfs_root_id(root));</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (log_di) {</div><div class='ctx'> 			/* The dentry exists in the log, we have nothing to do. */</div><div class='hunk'>@@ -2141,87 +2471,99 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_dir_item_key_to_cpu(eb, di, &amp;location);</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	btrfs_release_path(log_path);</div><div class='del'>-	inode = read_one_inode(root, location.objectid);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		ret = -EIO;</div><div class='add'>+	inode = btrfs_iget_logging(location.objectid, root);</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		ret = PTR_ERR(inode);</div><div class='add'>+		inode = NULL;</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to lookup inode %llu root %llu",</div><div class='add'>+				       location.objectid, btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = link_to_fixup_dir(trans, root, path, location.objectid);</div><div class='add'>+	ret = link_to_fixup_dir(wc, location.objectid);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inc_nlink(inode);</div><div class='del'>-	ret = unlink_inode_for_log_replay(trans, BTRFS_I(dir), BTRFS_I(inode),</div><div class='del'>-					  &amp;name);</div><div class='add'>+	inc_nlink(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	ret = unlink_inode_for_log_replay(wc, dir, inode, &amp;name);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Unlike dir item keys, dir index keys can only have one name (entry) in</div><div class='ctx'> 	 * them, as there are no key collisions since each key has a unique offset</div><div class='ctx'> 	 * (an index number), so we're done.</div><div class='ctx'> 	 */</div><div class='ctx'> out:</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	btrfs_release_path(log_path);</div><div class='ctx'> 	kfree(name.name);</div><div class='del'>-	iput(inode);</div><div class='add'>+	if (inode)</div><div class='add'>+		iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int replay_xattr_deletes(struct btrfs_trans_handle *trans,</div><div class='del'>-			      struct btrfs_root *root,</div><div class='del'>-			      struct btrfs_root *log,</div><div class='del'>-			      struct btrfs_path *path,</div><div class='del'>-			      const u64 ino)</div><div class='add'>+static int replay_xattr_deletes(struct walk_control *wc)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+	struct btrfs_root *log = wc-&gt;log;</div><div class='ctx'> 	struct btrfs_key search_key;</div><div class='del'>-	struct btrfs_path *log_path;</div><div class='del'>-	int i;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(log_path);</div><div class='add'>+	const u64 ino = wc-&gt;log_key.objectid;</div><div class='ctx'> 	int nritems;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	log_path = btrfs_alloc_path();</div><div class='del'>-	if (!log_path)</div><div class='add'>+	if (!log_path) {</div><div class='add'>+		btrfs_abort_log_replay(wc, -ENOMEM, "failed to allocate path");</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	search_key.objectid = ino;</div><div class='ctx'> 	search_key.type = BTRFS_XATTR_ITEM_KEY;</div><div class='ctx'> 	search_key.offset = 0;</div><div class='ctx'> again:</div><div class='del'>-	ret = btrfs_search_slot(NULL, root, &amp;search_key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = btrfs_search_slot(NULL, root, &amp;search_key, wc-&gt;subvol_path, 0, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to search xattrs for inode %llu root %llu",</div><div class='add'>+				       ino, btrfs_root_id(root));</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> process_leaf:</div><div class='del'>-	nritems = btrfs_header_nritems(path-&gt;nodes[0]);</div><div class='del'>-	for (i = path-&gt;slots[0]; i &lt; nritems; i++) {</div><div class='add'>+	nritems = btrfs_header_nritems(wc-&gt;subvol_path-&gt;nodes[0]);</div><div class='add'>+	for (int i = wc-&gt;subvol_path-&gt;slots[0]; i &lt; nritems; i++) {</div><div class='ctx'> 		struct btrfs_key key;</div><div class='ctx'> 		struct btrfs_dir_item *di;</div><div class='ctx'> 		struct btrfs_dir_item *log_di;</div><div class='ctx'> 		u32 total_size;</div><div class='ctx'> 		u32 cur;</div><div class='ctx'> </div><div class='del'>-		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, i);</div><div class='add'>+		btrfs_item_key_to_cpu(wc-&gt;subvol_path-&gt;nodes[0], &amp;key, i);</div><div class='ctx'> 		if (key.objectid != ino || key.type != BTRFS_XATTR_ITEM_KEY) {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		di = btrfs_item_ptr(path-&gt;nodes[0], i, struct btrfs_dir_item);</div><div class='del'>-		total_size = btrfs_item_size(path-&gt;nodes[0], i);</div><div class='add'>+		di = btrfs_item_ptr(wc-&gt;subvol_path-&gt;nodes[0], i, struct btrfs_dir_item);</div><div class='add'>+		total_size = btrfs_item_size(wc-&gt;subvol_path-&gt;nodes[0], i);</div><div class='ctx'> 		cur = 0;</div><div class='ctx'> 		while (cur &lt; total_size) {</div><div class='del'>-			u16 name_len = btrfs_dir_name_len(path-&gt;nodes[0], di);</div><div class='del'>-			u16 data_len = btrfs_dir_data_len(path-&gt;nodes[0], di);</div><div class='add'>+			u16 name_len = btrfs_dir_name_len(wc-&gt;subvol_path-&gt;nodes[0], di);</div><div class='add'>+			u16 data_len = btrfs_dir_data_len(wc-&gt;subvol_path-&gt;nodes[0], di);</div><div class='ctx'> 			u32 this_len = sizeof(*di) + name_len + data_len;</div><div class='ctx'> 			char *name;</div><div class='ctx'> </div><div class='ctx'> 			name = kmalloc(name_len, GFP_NOFS);</div><div class='ctx'> 			if (!name) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to allocate memory for name of length %u",</div><div class='add'>+						       name_len);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			read_extent_buffer(path-&gt;nodes[0], name,</div><div class='add'>+			read_extent_buffer(wc-&gt;subvol_path-&gt;nodes[0], name,</div><div class='ctx'> 					   (unsigned long)(di + 1), name_len);</div><div class='ctx'> </div><div class='ctx'> 			log_di = btrfs_lookup_xattr(NULL, log, log_path, ino,</div><div class='hunk'>@@ -2229,40 +2571,59 @@ process_leaf:</div><div class='ctx'> 			btrfs_release_path(log_path);</div><div class='ctx'> 			if (!log_di) {</div><div class='ctx'> 				/* Doesn't exist in log tree, so delete it. */</div><div class='del'>-				btrfs_release_path(path);</div><div class='del'>-				di = btrfs_lookup_xattr(trans, root, path, ino,</div><div class='add'>+				btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+				di = btrfs_lookup_xattr(trans, root, wc-&gt;subvol_path, ino,</div><div class='ctx'> 							name, name_len, -1);</div><div class='del'>-				kfree(name);</div><div class='ctx'> 				if (IS_ERR(di)) {</div><div class='ctx'> 					ret = PTR_ERR(di);</div><div class='add'>+					btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to lookup xattr with name %.*s for inode %llu root %llu",</div><div class='add'>+							       name_len, name, ino,</div><div class='add'>+							       btrfs_root_id(root));</div><div class='add'>+					kfree(name);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='ctx'> 				ASSERT(di);</div><div class='ctx'> 				ret = btrfs_delete_one_dir_name(trans, root,</div><div class='del'>-								path, di);</div><div class='del'>-				if (ret)</div><div class='add'>+								wc-&gt;subvol_path, di);</div><div class='add'>+				if (ret) {</div><div class='add'>+					btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to delete xattr with name %.*s for inode %llu root %llu",</div><div class='add'>+							       name_len, name, ino,</div><div class='add'>+							       btrfs_root_id(root));</div><div class='add'>+					kfree(name);</div><div class='ctx'> 					goto out;</div><div class='del'>-				btrfs_release_path(path);</div><div class='add'>+				}</div><div class='add'>+				btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+				kfree(name);</div><div class='ctx'> 				search_key = key;</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			}</div><div class='del'>-			kfree(name);</div><div class='ctx'> 			if (IS_ERR(log_di)) {</div><div class='ctx'> 				ret = PTR_ERR(log_di);</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+	"failed to lookup xattr in log tree with name %.*s for inode %llu root %llu",</div><div class='add'>+						       name_len, name, ino,</div><div class='add'>+						       btrfs_root_id(root));</div><div class='add'>+				kfree(name);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='add'>+			kfree(name);</div><div class='ctx'> 			cur += this_len;</div><div class='ctx'> 			di = (struct btrfs_dir_item *)((char *)di + this_len);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	ret = btrfs_next_leaf(root, path);</div><div class='add'>+	ret = btrfs_next_leaf(root, wc-&gt;subvol_path);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	else if (ret == 0)</div><div class='ctx'> 		goto process_leaf;</div><div class='add'>+	else</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to get next leaf in subvolume root %llu",</div><div class='add'>+				       btrfs_root_id(root));</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(log_path);</div><div class='del'>-	btrfs_release_path(path);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2277,34 +2638,41 @@ out:</div><div class='ctx'>  * Anything we don't find in the log is unlinked and removed from the</div><div class='ctx'>  * directory.</div><div class='ctx'>  */</div><div class='del'>-static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,</div><div class='del'>-				       struct btrfs_root *root,</div><div class='del'>-				       struct btrfs_root *log,</div><div class='del'>-				       struct btrfs_path *path,</div><div class='del'>-				       u64 dirid, int del_all)</div><div class='add'>+static noinline int replay_dir_deletes(struct walk_control *wc,</div><div class='add'>+				       u64 dirid, bool del_all)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+	struct btrfs_root *log = (del_all ? NULL : wc-&gt;log);</div><div class='ctx'> 	u64 range_start;</div><div class='ctx'> 	u64 range_end;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_key dir_key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_path *log_path;</div><div class='del'>-	struct inode *dir;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(log_path);</div><div class='add'>+	struct btrfs_inode *dir;</div><div class='ctx'> </div><div class='ctx'> 	dir_key.objectid = dirid;</div><div class='ctx'> 	dir_key.type = BTRFS_DIR_INDEX_KEY;</div><div class='ctx'> 	log_path = btrfs_alloc_path();</div><div class='del'>-	if (!log_path)</div><div class='add'>+	if (!log_path) {</div><div class='add'>+		btrfs_abort_log_replay(wc, -ENOMEM, "failed to allocate path");</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dir = read_one_inode(root, dirid);</div><div class='del'>-	/* it isn't an error if the inode isn't there, that can happen</div><div class='del'>-	 * because we replay the deletes before we copy in the inode item</div><div class='del'>-	 * from the log</div><div class='add'>+	dir = btrfs_iget_logging(dirid, root);</div><div class='add'>+	/*</div><div class='add'>+	 * It isn't an error if the inode isn't there, that can happen because</div><div class='add'>+	 * we replay the deletes before we copy in the inode item from the log.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!dir) {</div><div class='del'>-		btrfs_free_path(log_path);</div><div class='del'>-		return 0;</div><div class='add'>+	if (IS_ERR(dir)) {</div><div class='add'>+		ret = PTR_ERR(dir);</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = 0;</div><div class='add'>+		else</div><div class='add'>+			btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to lookup dir inode %llu root %llu",</div><div class='add'>+					       dirid, btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	range_start = 0;</div><div class='hunk'>@@ -2313,32 +2681,45 @@ static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (del_all)</div><div class='ctx'> 			range_end = (u64)-1;</div><div class='ctx'> 		else {</div><div class='del'>-			ret = find_dir_range(log, path, dirid,</div><div class='add'>+			ret = find_dir_range(log, wc-&gt;subvol_path, dirid,</div><div class='ctx'> 					     &amp;range_start, &amp;range_end);</div><div class='del'>-			if (ret &lt; 0)</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to find range for dir %llu in log tree root %llu",</div><div class='add'>+						       dirid, btrfs_root_id(root));</div><div class='ctx'> 				goto out;</div><div class='del'>-			else if (ret &gt; 0)</div><div class='add'>+			} else if (ret &gt; 0) {</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dir_key.offset = range_start;</div><div class='ctx'> 		while (1) {</div><div class='ctx'> 			int nritems;</div><div class='del'>-			ret = btrfs_search_slot(NULL, root, &amp;dir_key, path,</div><div class='del'>-						0, 0);</div><div class='del'>-			if (ret &lt; 0)</div><div class='add'>+			ret = btrfs_search_slot(NULL, root, &amp;dir_key,</div><div class='add'>+						wc-&gt;subvol_path, 0, 0);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				btrfs_abort_log_replay(wc, ret,</div><div class='add'>+			       "failed to search root %llu for key " BTRFS_KEY_FMT,</div><div class='add'>+						       btrfs_root_id(root),</div><div class='add'>+						       BTRFS_KEY_FMT_VALUE(&amp;dir_key));</div><div class='ctx'> 				goto out;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			nritems = btrfs_header_nritems(path-&gt;nodes[0]);</div><div class='del'>-			if (path-&gt;slots[0] &gt;= nritems) {</div><div class='del'>-				ret = btrfs_next_leaf(root, path);</div><div class='del'>-				if (ret == 1)</div><div class='add'>+			nritems = btrfs_header_nritems(wc-&gt;subvol_path-&gt;nodes[0]);</div><div class='add'>+			if (wc-&gt;subvol_path-&gt;slots[0] &gt;= nritems) {</div><div class='add'>+				ret = btrfs_next_leaf(root, wc-&gt;subvol_path);</div><div class='add'>+				if (ret == 1) {</div><div class='ctx'> 					break;</div><div class='del'>-				else if (ret &lt; 0)</div><div class='add'>+				} else if (ret &lt; 0) {</div><div class='add'>+					btrfs_abort_log_replay(wc, ret,</div><div class='add'>+				       "failed to get next leaf in subvolume root %llu",</div><div class='add'>+							       btrfs_root_id(root));</div><div class='ctx'> 					goto out;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='del'>-			btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;found_key,</div><div class='del'>-					      path-&gt;slots[0]);</div><div class='add'>+			btrfs_item_key_to_cpu(wc-&gt;subvol_path-&gt;nodes[0], &amp;found_key,</div><div class='add'>+					      wc-&gt;subvol_path-&gt;slots[0]);</div><div class='ctx'> 			if (found_key.objectid != dirid ||</div><div class='ctx'> 			    found_key.type != dir_key.type) {</div><div class='ctx'> 				ret = 0;</div><div class='hunk'>@@ -2348,25 +2729,22 @@ static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			if (found_key.offset &gt; range_end)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			ret = check_item_in_log(trans, log, path,</div><div class='del'>-						log_path, dir,</div><div class='del'>-						&amp;found_key);</div><div class='add'>+			ret = check_item_in_log(wc, log_path, dir, &amp;found_key, del_all);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			if (found_key.offset == (u64)-1)</div><div class='ctx'> 				break;</div><div class='ctx'> 			dir_key.offset = found_key.offset + 1;</div><div class='ctx'> 		}</div><div class='del'>-		btrfs_release_path(path);</div><div class='add'>+		btrfs_release_path(wc-&gt;subvol_path);</div><div class='ctx'> 		if (range_end == (u64)-1)</div><div class='ctx'> 			break;</div><div class='ctx'> 		range_start = range_end + 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	btrfs_free_path(log_path);</div><div class='del'>-	iput(dir);</div><div class='add'>+	btrfs_release_path(wc-&gt;subvol_path);</div><div class='add'>+	iput(&amp;dir-&gt;vfs_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2381,7 +2759,7 @@ out:</div><div class='ctx'>  * only in the log (references come from either directory items or inode</div><div class='ctx'>  * back refs).</div><div class='ctx'>  */</div><div class='del'>-static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='add'>+static int replay_one_buffer(struct extent_buffer *eb,</div><div class='ctx'> 			     struct walk_control *wc, u64 gen, int level)</div><div class='ctx'> {</div><div class='ctx'> 	int nritems;</div><div class='hunk'>@@ -2389,44 +2767,62 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='ctx'> 		.transid = gen,</div><div class='ctx'> 		.level = level</div><div class='ctx'> 	};</div><div class='del'>-	struct btrfs_path *path;</div><div class='del'>-	struct btrfs_root *root = wc-&gt;replay_dest;</div><div class='del'>-	struct btrfs_key key;</div><div class='del'>-	int i;</div><div class='add'>+	struct btrfs_root *root = wc-&gt;root;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_read_extent_buffer(eb, &amp;check);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	level = btrfs_header_level(eb);</div><div class='del'>-</div><div class='ctx'> 	if (level != 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!path)</div><div class='add'>+	/*</div><div class='add'>+	 * Set to NULL since it was not yet read and in case we abort log replay</div><div class='add'>+	 * on error, we have no valid log tree leaf to dump.</div><div class='add'>+	 */</div><div class='add'>+	wc-&gt;log_leaf = NULL;</div><div class='add'>+	ret = btrfs_read_extent_buffer(eb, &amp;check);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to read log tree leaf %llu for root %llu",</div><div class='add'>+				       eb-&gt;start, btrfs_root_id(root));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT(wc-&gt;subvol_path == NULL);</div><div class='add'>+	wc-&gt;subvol_path = btrfs_alloc_path();</div><div class='add'>+	if (!wc-&gt;subvol_path) {</div><div class='add'>+		btrfs_abort_log_replay(wc, -ENOMEM, "failed to allocate path");</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wc-&gt;log_leaf = eb;</div><div class='ctx'> </div><div class='ctx'> 	nritems = btrfs_header_nritems(eb);</div><div class='del'>-	for (i = 0; i &lt; nritems; i++) {</div><div class='del'>-		btrfs_item_key_to_cpu(eb, &amp;key, i);</div><div class='add'>+	for (wc-&gt;log_slot = 0; wc-&gt;log_slot &lt; nritems; wc-&gt;log_slot++) {</div><div class='add'>+		struct btrfs_inode_item *inode_item;</div><div class='ctx'> </div><div class='del'>-		/* inode keys are done during the first stage */</div><div class='del'>-		if (key.type == BTRFS_INODE_ITEM_KEY &amp;&amp;</div><div class='del'>-		    wc-&gt;stage == LOG_WALK_REPLAY_INODES) {</div><div class='del'>-			struct btrfs_inode_item *inode_item;</div><div class='del'>-			u32 mode;</div><div class='add'>+		btrfs_item_key_to_cpu(eb, &amp;wc-&gt;log_key, wc-&gt;log_slot);</div><div class='ctx'> </div><div class='del'>-			inode_item = btrfs_item_ptr(eb, i,</div><div class='del'>-					    struct btrfs_inode_item);</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_INODE_ITEM_KEY) {</div><div class='add'>+			inode_item = btrfs_item_ptr(eb, wc-&gt;log_slot,</div><div class='add'>+						    struct btrfs_inode_item);</div><div class='ctx'> 			/*</div><div class='del'>-			 * If we have a tmpfile (O_TMPFILE) that got fsync'ed</div><div class='del'>-			 * and never got linked before the fsync, skip it, as</div><div class='del'>-			 * replaying it is pointless since it would be deleted</div><div class='del'>-			 * later. We skip logging tmpfiles, but it's always</div><div class='del'>-			 * possible we are replaying a log created with a kernel</div><div class='del'>-			 * that used to log tmpfiles.</div><div class='add'>+			 * An inode with no links is either:</div><div class='add'>+			 *</div><div class='add'>+			 * 1) A tmpfile (O_TMPFILE) that got fsync'ed and never</div><div class='add'>+			 *    got linked before the fsync, skip it, as replaying</div><div class='add'>+			 *    it is pointless since it would be deleted later.</div><div class='add'>+			 *    We skip logging tmpfiles, but it's always possible</div><div class='add'>+			 *    we are replaying a log created with a kernel that</div><div class='add'>+			 *    used to log tmpfiles;</div><div class='add'>+			 *</div><div class='add'>+			 * 2) A non-tmpfile which got its last link deleted</div><div class='add'>+			 *    while holding an open fd on it and later got</div><div class='add'>+			 *    fsynced through that fd. We always log the</div><div class='add'>+			 *    parent inodes when inode-&gt;last_unlink_trans is</div><div class='add'>+			 *    set to the current transaction, so ignore all the</div><div class='add'>+			 *    inode items for this inode. We will delete the</div><div class='add'>+			 *    inode when processing the parent directory with</div><div class='add'>+			 *    replay_dir_deletes().</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (btrfs_inode_nlink(eb, inode_item) == 0) {</div><div class='ctx'> 				wc-&gt;ignore_cur_inode = true;</div><div class='hunk'>@@ -2434,19 +2830,23 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='ctx'> 			} else {</div><div class='ctx'> 				wc-&gt;ignore_cur_inode = false;</div><div class='ctx'> 			}</div><div class='del'>-			ret = replay_xattr_deletes(wc-&gt;trans, root, log,</div><div class='del'>-						   path, key.objectid);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Inode keys are done during the first stage. */</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_INODE_ITEM_KEY &amp;&amp;</div><div class='add'>+		    wc-&gt;stage == LOG_WALK_REPLAY_INODES) {</div><div class='add'>+			u32 mode;</div><div class='add'>+</div><div class='add'>+			ret = replay_xattr_deletes(wc);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 			mode = btrfs_inode_mode(eb, inode_item);</div><div class='ctx'> 			if (S_ISDIR(mode)) {</div><div class='del'>-				ret = replay_dir_deletes(wc-&gt;trans,</div><div class='del'>-					 root, log, path, key.objectid, 0);</div><div class='add'>+				ret = replay_dir_deletes(wc, wc-&gt;log_key.objectid, false);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='del'>-			ret = overwrite_item(wc-&gt;trans, root, path,</div><div class='del'>-					     eb, i, &amp;key);</div><div class='add'>+			ret = overwrite_item(wc);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -2460,36 +2860,48 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (S_ISREG(mode)) {</div><div class='ctx'> 				struct btrfs_drop_extents_args drop_args = { 0 };</div><div class='del'>-				struct inode *inode;</div><div class='add'>+				struct btrfs_inode *inode;</div><div class='ctx'> 				u64 from;</div><div class='ctx'> </div><div class='del'>-				inode = read_one_inode(root, key.objectid);</div><div class='del'>-				if (!inode) {</div><div class='del'>-					ret = -EIO;</div><div class='add'>+				inode = btrfs_iget_logging(wc-&gt;log_key.objectid, root);</div><div class='add'>+				if (IS_ERR(inode)) {</div><div class='add'>+					ret = PTR_ERR(inode);</div><div class='add'>+					btrfs_abort_log_replay(wc, ret,</div><div class='add'>+					       "failed to lookup inode %llu root %llu",</div><div class='add'>+							       wc-&gt;log_key.objectid,</div><div class='add'>+							       btrfs_root_id(root));</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				from = ALIGN(i_size_read(inode),</div><div class='add'>+				from = ALIGN(i_size_read(&amp;inode-&gt;vfs_inode),</div><div class='ctx'> 					     root-&gt;fs_info-&gt;sectorsize);</div><div class='ctx'> 				drop_args.start = from;</div><div class='ctx'> 				drop_args.end = (u64)-1;</div><div class='ctx'> 				drop_args.drop_cache = true;</div><div class='del'>-				ret = btrfs_drop_extents(wc-&gt;trans, root,</div><div class='del'>-							 BTRFS_I(inode),</div><div class='del'>-							 &amp;drop_args);</div><div class='del'>-				if (!ret) {</div><div class='del'>-					inode_sub_bytes(inode,</div><div class='add'>+				drop_args.path = wc-&gt;subvol_path;</div><div class='add'>+				ret = btrfs_drop_extents(trans, root, inode,  &amp;drop_args);</div><div class='add'>+				if (ret) {</div><div class='add'>+					btrfs_abort_log_replay(wc, ret,</div><div class='add'>+		       "failed to drop extents for inode %llu root %llu offset %llu",</div><div class='add'>+							       btrfs_ino(inode),</div><div class='add'>+							       btrfs_root_id(root),</div><div class='add'>+							       from);</div><div class='add'>+				} else {</div><div class='add'>+					inode_sub_bytes(&amp;inode-&gt;vfs_inode,</div><div class='ctx'> 							drop_args.bytes_found);</div><div class='ctx'> 					/* Update the inode's nbytes. */</div><div class='del'>-					ret = btrfs_update_inode(wc-&gt;trans,</div><div class='del'>-								 BTRFS_I(inode));</div><div class='add'>+					ret = btrfs_update_inode(trans, inode);</div><div class='add'>+					if (ret)</div><div class='add'>+						btrfs_abort_log_replay(wc, ret,</div><div class='add'>+					       "failed to update inode %llu root %llu",</div><div class='add'>+								       btrfs_ino(inode),</div><div class='add'>+								       btrfs_root_id(root));</div><div class='ctx'> 				}</div><div class='del'>-				iput(inode);</div><div class='add'>+				iput(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = link_to_fixup_dir(wc-&gt;trans, root,</div><div class='del'>-						path, key.objectid);</div><div class='add'>+			ret = link_to_fixup_dir(wc, wc-&gt;log_key.objectid);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2497,10 +2909,9 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='ctx'> 		if (wc-&gt;ignore_cur_inode)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (key.type == BTRFS_DIR_INDEX_KEY &amp;&amp;</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_DIR_INDEX_KEY &amp;&amp;</div><div class='ctx'> 		    wc-&gt;stage == LOG_WALK_REPLAY_DIR_INDEX) {</div><div class='del'>-			ret = replay_one_dir_item(wc-&gt;trans, root, path,</div><div class='del'>-						  eb, i, &amp;key);</div><div class='add'>+			ret = replay_one_dir_item(wc);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2509,21 +2920,17 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* these keys are simply copied */</div><div class='del'>-		if (key.type == BTRFS_XATTR_ITEM_KEY) {</div><div class='del'>-			ret = overwrite_item(wc-&gt;trans, root, path,</div><div class='del'>-					     eb, i, &amp;key);</div><div class='add'>+		if (wc-&gt;log_key.type == BTRFS_XATTR_ITEM_KEY) {</div><div class='add'>+			ret = overwrite_item(wc);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='del'>-		} else if (key.type == BTRFS_INODE_REF_KEY ||</div><div class='del'>-			   key.type == BTRFS_INODE_EXTREF_KEY) {</div><div class='del'>-			ret = add_inode_ref(wc-&gt;trans, root, log, path,</div><div class='del'>-					    eb, i, &amp;key);</div><div class='del'>-			if (ret &amp;&amp; ret != -ENOENT)</div><div class='add'>+		} else if (wc-&gt;log_key.type == BTRFS_INODE_REF_KEY ||</div><div class='add'>+			   wc-&gt;log_key.type == BTRFS_INODE_EXTREF_KEY) {</div><div class='add'>+			ret = add_inode_ref(wc);</div><div class='add'>+			if (ret)</div><div class='ctx'> 				break;</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else if (key.type == BTRFS_EXTENT_DATA_KEY) {</div><div class='del'>-			ret = replay_one_extent(wc-&gt;trans, root, path,</div><div class='del'>-						eb, i, &amp;key);</div><div class='add'>+		} else if (wc-&gt;log_key.type == BTRFS_EXTENT_DATA_KEY) {</div><div class='add'>+			ret = replay_one_extent(wc);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2534,37 +2941,16 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,</div><div class='ctx'> 		 * older kernel with such keys, ignore them.</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	btrfs_free_path(wc-&gt;subvol_path);</div><div class='add'>+	wc-&gt;subvol_path = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Correctly adjust the reserved bytes occupied by a log tree extent buffer</div><div class='del'>- */</div><div class='del'>-static void unaccount_log_buffer(struct btrfs_fs_info *fs_info, u64 start)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_block_group *cache;</div><div class='del'>-</div><div class='del'>-	cache = btrfs_lookup_block_group(fs_info, start);</div><div class='del'>-	if (!cache) {</div><div class='del'>-		btrfs_err(fs_info, "unable to find block group for %llu", start);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;cache-&gt;space_info-&gt;lock);</div><div class='del'>-	spin_lock(&amp;cache-&gt;lock);</div><div class='del'>-	cache-&gt;reserved -= fs_info-&gt;nodesize;</div><div class='del'>-	cache-&gt;space_info-&gt;bytes_reserved -= fs_info-&gt;nodesize;</div><div class='del'>-	spin_unlock(&amp;cache-&gt;lock);</div><div class='del'>-	spin_unlock(&amp;cache-&gt;space_info-&gt;lock);</div><div class='del'>-</div><div class='del'>-	btrfs_put_block_group(cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int clean_log_buffer(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct btrfs_fs_info *fs_info = eb-&gt;fs_info;</div><div class='add'>+	struct btrfs_block_group *bg;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_tree_lock(eb);</div><div class='ctx'> 	btrfs_clear_buffer_dirty(trans, eb);</div><div class='hunk'>@@ -2572,22 +2958,38 @@ static int clean_log_buffer(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_tree_unlock(eb);</div><div class='ctx'> </div><div class='ctx'> 	if (trans) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='ctx'> 		ret = btrfs_pin_reserved_extent(trans, eb);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	} else {</div><div class='del'>-		unaccount_log_buffer(eb-&gt;fs_info, eb-&gt;start);</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bg = btrfs_lookup_block_group(fs_info, eb-&gt;start);</div><div class='add'>+	if (!bg) {</div><div class='add'>+		btrfs_err(fs_info, "unable to find block group for %llu", eb-&gt;start);</div><div class='add'>+		btrfs_handle_fs_error(fs_info, -ENOENT, NULL);</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;bg-&gt;space_info-&gt;lock);</div><div class='add'>+	spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+	bg-&gt;reserved -= fs_info-&gt;nodesize;</div><div class='add'>+	bg-&gt;space_info-&gt;bytes_reserved -= fs_info-&gt;nodesize;</div><div class='add'>+	spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;bg-&gt;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	btrfs_put_block_group(bg);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-				   struct btrfs_root *root,</div><div class='del'>-				   struct btrfs_path *path, int *level,</div><div class='del'>-				   struct walk_control *wc)</div><div class='add'>+static noinline int walk_down_log_tree(struct btrfs_path *path, int *level,</div><div class='add'>+				       struct walk_control *wc)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='add'>+	struct btrfs_trans_handle *trans = wc-&gt;trans;</div><div class='add'>+	struct btrfs_fs_info *fs_info = wc-&gt;log-&gt;fs_info;</div><div class='ctx'> 	u64 bytenr;</div><div class='ctx'> 	u64 ptr_gen;</div><div class='ctx'> 	struct extent_buffer *next;</div><div class='hunk'>@@ -2615,12 +3017,17 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		next = btrfs_find_create_tree_block(fs_info, bytenr,</div><div class='ctx'> 						    btrfs_header_owner(cur),</div><div class='ctx'> 						    *level - 1);</div><div class='del'>-		if (IS_ERR(next))</div><div class='del'>-			return PTR_ERR(next);</div><div class='add'>+		if (IS_ERR(next)) {</div><div class='add'>+			ret = PTR_ERR(next);</div><div class='add'>+			if (trans)</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+			else</div><div class='add'>+				btrfs_handle_fs_error(fs_info, ret, NULL);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (*level == 1) {</div><div class='del'>-			ret = wc-&gt;process_func(root, next, wc, ptr_gen,</div><div class='del'>-					       *level - 1);</div><div class='add'>+			ret = wc-&gt;process_func(next, wc, ptr_gen, *level - 1);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				free_extent_buffer(next);</div><div class='ctx'> 				return ret;</div><div class='hunk'>@@ -2631,6 +3038,10 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				ret = btrfs_read_extent_buffer(next, &amp;check);</div><div class='ctx'> 				if (ret) {</div><div class='ctx'> 					free_extent_buffer(next);</div><div class='add'>+					if (trans)</div><div class='add'>+						btrfs_abort_transaction(trans, ret);</div><div class='add'>+					else</div><div class='add'>+						btrfs_handle_fs_error(fs_info, ret, NULL);</div><div class='ctx'> 					return ret;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -2646,6 +3057,10 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = btrfs_read_extent_buffer(next, &amp;check);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			free_extent_buffer(next);</div><div class='add'>+			if (trans)</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+			else</div><div class='add'>+				btrfs_handle_fs_error(fs_info, ret, NULL);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2662,10 +3077,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-				 struct btrfs_root *root,</div><div class='del'>-				 struct btrfs_path *path, int *level,</div><div class='del'>-				 struct walk_control *wc)</div><div class='add'>+static noinline int walk_up_log_tree(struct btrfs_path *path, int *level,</div><div class='add'>+				     struct walk_control *wc)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -2679,14 +3092,14 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			WARN_ON(*level == 0);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = wc-&gt;process_func(root, path-&gt;nodes[*level], wc,</div><div class='add'>+			ret = wc-&gt;process_func(path-&gt;nodes[*level], wc,</div><div class='ctx'> 				 btrfs_header_generation(path-&gt;nodes[*level]),</div><div class='ctx'> 				 *level);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='ctx'> 			if (wc-&gt;free) {</div><div class='del'>-				ret = clean_log_buffer(trans, path-&gt;nodes[*level]);</div><div class='add'>+				ret = clean_log_buffer(wc-&gt;trans, path-&gt;nodes[*level]);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2703,13 +3116,13 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * the tree freeing any blocks that have a ref count of zero after being</div><div class='ctx'>  * decremented.</div><div class='ctx'>  */</div><div class='del'>-static int walk_log_tree(struct btrfs_trans_handle *trans,</div><div class='del'>-			 struct btrfs_root *log, struct walk_control *wc)</div><div class='add'>+static int walk_log_tree(struct walk_control *wc)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_root *log = wc-&gt;log;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int wret;</div><div class='ctx'> 	int level;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int orig_level;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -2719,40 +3132,34 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	level = btrfs_header_level(log-&gt;node);</div><div class='ctx'> 	orig_level = level;</div><div class='ctx'> 	path-&gt;nodes[level] = log-&gt;node;</div><div class='del'>-	atomic_inc(&amp;log-&gt;node-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;log-&gt;node-&gt;refs);</div><div class='ctx'> 	path-&gt;slots[level] = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		wret = walk_down_log_tree(trans, log, path, &amp;level, wc);</div><div class='add'>+		wret = walk_down_log_tree(path, &amp;level, wc);</div><div class='ctx'> 		if (wret &gt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		if (wret &lt; 0) {</div><div class='del'>-			ret = wret;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (wret &lt; 0)</div><div class='add'>+			return wret;</div><div class='ctx'> </div><div class='del'>-		wret = walk_up_log_tree(trans, log, path, &amp;level, wc);</div><div class='add'>+		wret = walk_up_log_tree(path, &amp;level, wc);</div><div class='ctx'> 		if (wret &gt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		if (wret &lt; 0) {</div><div class='del'>-			ret = wret;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (wret &lt; 0)</div><div class='add'>+			return wret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* was the root node processed? if not, catch it here */</div><div class='ctx'> 	if (path-&gt;nodes[orig_level]) {</div><div class='del'>-		ret = wc-&gt;process_func(log, path-&gt;nodes[orig_level], wc,</div><div class='add'>+		ret = wc-&gt;process_func(path-&gt;nodes[orig_level], wc,</div><div class='ctx'> 			 btrfs_header_generation(path-&gt;nodes[orig_level]),</div><div class='ctx'> 			 orig_level);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (wc-&gt;free)</div><div class='del'>-			ret = clean_log_buffer(trans, path-&gt;nodes[orig_level]);</div><div class='add'>+			ret = clean_log_buffer(wc-&gt;trans, path-&gt;nodes[orig_level]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2820,6 +3227,52 @@ static void wait_for_writer(struct btrfs_root *root)</div><div class='ctx'> 	finish_wait(&amp;root-&gt;log_writer_wait, &amp;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx, struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;log_ret = 0;</div><div class='add'>+	ctx-&gt;log_transid = 0;</div><div class='add'>+	ctx-&gt;log_new_dentries = false;</div><div class='add'>+	ctx-&gt;logging_new_name = false;</div><div class='add'>+	ctx-&gt;logging_new_delayed_dentries = false;</div><div class='add'>+	ctx-&gt;logged_before = false;</div><div class='add'>+	ctx-&gt;inode = inode;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ctx-&gt;list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ctx-&gt;ordered_extents);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ctx-&gt;conflict_inodes);</div><div class='add'>+	ctx-&gt;num_conflict_inodes = 0;</div><div class='add'>+	ctx-&gt;logging_conflict_inodes = false;</div><div class='add'>+	ctx-&gt;scratch_eb = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_init_log_ctx_scratch_eb(struct btrfs_log_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_inode *inode = ctx-&gt;inode;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &amp;inode-&gt;runtime_flags) &amp;&amp;</div><div class='add'>+	    !test_bit(BTRFS_INODE_COPY_EVERYTHING, &amp;inode-&gt;runtime_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't care about allocation failure. This is just for optimization,</div><div class='add'>+	 * if we fail to allocate here, we will try again later if needed.</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;scratch_eb = alloc_dummy_extent_buffer(inode-&gt;root-&gt;fs_info, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void btrfs_release_log_ctx_extents(struct btrfs_log_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_ordered_extent *ordered;</div><div class='add'>+	struct btrfs_ordered_extent *tmp;</div><div class='add'>+</div><div class='add'>+	btrfs_assert_inode_locked(ctx-&gt;inode);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ordered, tmp, &amp;ctx-&gt;ordered_extents, log_list) {</div><div class='add'>+		list_del_init(&amp;ordered-&gt;log_list);</div><div class='add'>+		btrfs_put_ordered_extent(ordered);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline void btrfs_remove_log_ctx(struct btrfs_root *root,</div><div class='ctx'> 					struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -2885,7 +3338,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		mutex_unlock(&amp;root-&gt;log_mutex);</div><div class='ctx'> 		return ctx-&gt;log_ret;</div><div class='ctx'> 	}</div><div class='del'>-	ASSERT(log_transid == root-&gt;log_transid);</div><div class='add'>+	ASSERT(log_transid == root-&gt;log_transid,</div><div class='add'>+	       "log_transid=%d root-&gt;log_transid=%d", log_transid, root-&gt;log_transid);</div><div class='ctx'> 	atomic_set(&amp;root-&gt;log_commit[index1], 1);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for previous tree log sync to complete */</div><div class='hunk'>@@ -2914,9 +3368,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (log_transid % 2 == 0)</div><div class='del'>-		mark = EXTENT_DIRTY;</div><div class='add'>+		mark = EXTENT_DIRTY_LOG1;</div><div class='ctx'> 	else</div><div class='del'>-		mark = EXTENT_NEW;</div><div class='add'>+		mark = EXTENT_DIRTY_LOG2;</div><div class='ctx'> </div><div class='ctx'> 	/* we start IO on  all the marked extents here, but we don't actually</div><div class='ctx'> 	 * wait for them until later.</div><div class='hunk'>@@ -3001,7 +3455,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (ret != -ENOSPC)</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 				  "failed to update log for root %llu ret %d",</div><div class='del'>-				  root-&gt;root_key.objectid, ret);</div><div class='add'>+				  btrfs_root_id(root), ret);</div><div class='ctx'> 		btrfs_wait_tree_log_extents(log, mark);</div><div class='ctx'> 		mutex_unlock(&amp;log_root_tree-&gt;log_mutex);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3025,7 +3479,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			ret = root_log_ctx.log_ret;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	ASSERT(root_log_ctx.log_transid == log_root_tree-&gt;log_transid);</div><div class='add'>+	ASSERT(root_log_ctx.log_transid == log_root_tree-&gt;log_transid,</div><div class='add'>+	       "root_log_ctx.log_transid=%d log_root_tree-&gt;log_transid=%d",</div><div class='add'>+		root_log_ctx.log_transid, log_root_tree-&gt;log_transid);</div><div class='ctx'> 	atomic_set(&amp;log_root_tree-&gt;log_commit[index2], 1);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;log_root_tree-&gt;log_commit[(index2 + 1) % 2])) {</div><div class='hunk'>@@ -3047,7 +3503,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_write_marked_extents(fs_info,</div><div class='ctx'> 					 &amp;log_root_tree-&gt;dirty_log_pages,</div><div class='del'>-					 EXTENT_DIRTY | EXTENT_NEW);</div><div class='add'>+					 EXTENT_DIRTY_LOG1 | EXTENT_DIRTY_LOG2);</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * As described above, -EAGAIN indicates a hole in the extents. We</div><div class='hunk'>@@ -3067,7 +3523,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = btrfs_wait_tree_log_extents(log, mark);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = btrfs_wait_tree_log_extents(log_root_tree,</div><div class='del'>-						  EXTENT_NEW | EXTENT_DIRTY);</div><div class='add'>+						  EXTENT_DIRTY_LOG1 | EXTENT_DIRTY_LOG2);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='ctx'> 		mutex_unlock(&amp;log_root_tree-&gt;log_mutex);</div><div class='hunk'>@@ -3115,7 +3571,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_set_super_log_root_level(fs_info-&gt;super_for_commit, log_root_level);</div><div class='ctx'> 	ret = write_all_supers(fs_info, 1);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;tree_log_mutex);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out_wake_log_root;</div><div class='hunk'>@@ -3129,7 +3585,9 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * someone else already started it. We use &lt;= and not &lt; because the</div><div class='ctx'> 	 * first log transaction has an ID of 0.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(btrfs_get_root_last_log_commit(root) &lt;= log_transid);</div><div class='add'>+	ASSERT(btrfs_get_root_last_log_commit(root) &lt;= log_transid,</div><div class='add'>+	       "last_log_commit(root)=%d log_transid=%d",</div><div class='add'>+	       btrfs_get_root_last_log_commit(root), log_transid);</div><div class='ctx'> 	btrfs_set_root_last_log_commit(root, log_transid);</div><div class='ctx'> </div><div class='ctx'> out_wake_log_root:</div><div class='hunk'>@@ -3167,12 +3625,14 @@ static void free_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct walk_control wc = {</div><div class='del'>-		.free = 1,</div><div class='del'>-		.process_func = process_one_buffer</div><div class='add'>+		.free = true,</div><div class='add'>+		.process_func = process_one_buffer,</div><div class='add'>+		.log = log,</div><div class='add'>+		.trans = trans,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (log-&gt;node) {</div><div class='del'>-		ret = walk_log_tree(trans, log, &amp;wc);</div><div class='add'>+		ret = walk_log_tree(&amp;wc);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We weren't able to traverse the entire log tree, the</div><div class='hunk'>@@ -3193,9 +3653,9 @@ static void free_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 */</div><div class='ctx'> 			btrfs_write_marked_extents(log-&gt;fs_info,</div><div class='ctx'> 						   &amp;log-&gt;dirty_log_pages,</div><div class='del'>-						   EXTENT_DIRTY | EXTENT_NEW);</div><div class='add'>+						   EXTENT_DIRTY_LOG1 | EXTENT_DIRTY_LOG2);</div><div class='ctx'> 			btrfs_wait_tree_log_extents(log,</div><div class='del'>-						    EXTENT_DIRTY | EXTENT_NEW);</div><div class='add'>+						    EXTENT_DIRTY_LOG1 | EXTENT_DIRTY_LOG2);</div><div class='ctx'> </div><div class='ctx'> 			if (trans)</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -3204,8 +3664,8 @@ static void free_log_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	extent_io_tree_release(&amp;log-&gt;dirty_log_pages);</div><div class='del'>-	extent_io_tree_release(&amp;log-&gt;log_csum_range);</div><div class='add'>+	btrfs_extent_io_tree_release(&amp;log-&gt;dirty_log_pages);</div><div class='add'>+	btrfs_extent_io_tree_release(&amp;log-&gt;log_csum_range);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_root(log);</div><div class='ctx'> }</div><div class='hunk'>@@ -3235,6 +3695,31 @@ int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool mark_inode_as_not_logged(const struct btrfs_trans_handle *trans,</div><div class='add'>+				     struct btrfs_inode *inode)</div><div class='add'>+{</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do this only if -&gt;logged_trans is still 0 to prevent races with</div><div class='add'>+	 * concurrent logging as we may see the inode not logged when</div><div class='add'>+	 * inode_logged() is called but it gets logged after inode_logged() did</div><div class='add'>+	 * not find it in the log tree and we end up setting -&gt;logged_trans to a</div><div class='add'>+	 * value less than trans-&gt;transid after the concurrent logging task has</div><div class='add'>+	 * set it to trans-&gt;transid. As a consequence, subsequent rename, unlink</div><div class='add'>+	 * and link operations may end up not logging new names and removing old</div><div class='add'>+	 * names from the log.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;inode-&gt;lock);</div><div class='add'>+	if (inode-&gt;logged_trans == 0)</div><div class='add'>+		inode-&gt;logged_trans = trans-&gt;transid - 1;</div><div class='add'>+	else if (inode-&gt;logged_trans == trans-&gt;transid)</div><div class='add'>+		ret = true;</div><div class='add'>+	spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Check if an inode was logged in the current transaction. This correctly deals</div><div class='ctx'>  * with the case where the inode was logged but has a logged_trans of 0, which</div><div class='hunk'>@@ -3252,15 +3737,32 @@ static int inode_logged(const struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;logged_trans == trans-&gt;transid)</div><div class='add'>+	/*</div><div class='add'>+	 * Quick lockless call, since once -&gt;logged_trans is set to the current</div><div class='add'>+	 * transaction, we never set it to a lower value anywhere else.</div><div class='add'>+	 */</div><div class='add'>+	if (data_race(inode-&gt;logged_trans) == trans-&gt;transid)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If logged_trans is not 0, then we know the inode logged was not logged</div><div class='del'>-	 * in this transaction, so we can return false right away.</div><div class='add'>+	 * If logged_trans is not 0 and not trans-&gt;transid, then we know the</div><div class='add'>+	 * inode was not logged in this transaction, so we can return false</div><div class='add'>+	 * right away. We take the lock to avoid a race caused by load/store</div><div class='add'>+	 * tearing with a concurrent btrfs_log_inode() call or a concurrent task</div><div class='add'>+	 * in this function further below - an update to trans-&gt;transid can be</div><div class='add'>+	 * teared into two 32 bits updates for example, in which case we could</div><div class='add'>+	 * see a positive value that is not trans-&gt;transid and assume the inode</div><div class='add'>+	 * was not logged when it was.</div><div class='ctx'> 	 */</div><div class='del'>-	if (inode-&gt;logged_trans &gt; 0)</div><div class='add'>+	spin_lock(&amp;inode-&gt;lock);</div><div class='add'>+	if (inode-&gt;logged_trans == trans-&gt;transid) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;lock);</div><div class='add'>+		return 1;</div><div class='add'>+	} else if (inode-&gt;logged_trans &gt; 0) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If no log tree was created for this root in this transaction, then</div><div class='hunk'>@@ -3269,10 +3771,8 @@ static int inode_logged(const struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * transaction's ID, to avoid the search below in a future call in case</div><div class='ctx'> 	 * a log tree gets created after this.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_bit(BTRFS_ROOT_HAS_LOG_TREE, &amp;inode-&gt;root-&gt;state)) {</div><div class='del'>-		inode-&gt;logged_trans = trans-&gt;transid - 1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (!test_bit(BTRFS_ROOT_HAS_LOG_TREE, &amp;inode-&gt;root-&gt;state))</div><div class='add'>+		return mark_inode_as_not_logged(trans, inode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have a log tree and the inode's logged_trans is 0. We can't tell</div><div class='hunk'>@@ -3326,29 +3826,17 @@ static int inode_logged(const struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * Set logged_trans to a value greater than 0 and less then the</div><div class='ctx'> 		 * current transaction to avoid doing the search in future calls.</div><div class='ctx'> 		 */</div><div class='del'>-		inode-&gt;logged_trans = trans-&gt;transid - 1;</div><div class='del'>-		return 0;</div><div class='add'>+		return mark_inode_as_not_logged(trans, inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The inode was previously logged and then evicted, set logged_trans to</div><div class='del'>-	 * the current transacion's ID, to avoid future tree searches as long as</div><div class='add'>+	 * the current transaction's ID, to avoid future tree searches as long as</div><div class='ctx'> 	 * the inode is not evicted again.</div><div class='ctx'> 	 */</div><div class='add'>+	spin_lock(&amp;inode-&gt;lock);</div><div class='ctx'> 	inode-&gt;logged_trans = trans-&gt;transid;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If it's a directory, then we must set last_dir_index_offset to the</div><div class='del'>-	 * maximum possible value, so that the next attempt to log the inode does</div><div class='del'>-	 * not skip checking if dir index keys found in modified subvolume tree</div><div class='del'>-	 * leaves have been logged before, otherwise it would result in attempts</div><div class='del'>-	 * to insert duplicate dir index keys in the log tree. This must be done</div><div class='del'>-	 * because last_dir_index_offset is an in-memory only field, not persisted</div><div class='del'>-	 * in the inode item or any other on-disk structure, so its value is lost</div><div class='del'>-	 * once the inode is evicted.</div><div class='del'>-	 */</div><div class='del'>-	if (S_ISDIR(inode-&gt;vfs_inode.i_mode))</div><div class='del'>-		inode-&gt;last_dir_index_offset = (u64)-1;</div><div class='add'>+	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -3385,7 +3873,7 @@ static int del_logged_dentry(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * inode item because on log replay we update the field to reflect</div><div class='ctx'> 	 * all existing entries in the directory (see overwrite_item()).</div><div class='ctx'> 	 */</div><div class='del'>-	return btrfs_delete_one_dir_name(trans, log, path, di);</div><div class='add'>+	return btrfs_del_item(trans, log, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3410,37 +3898,36 @@ static int del_logged_dentry(struct btrfs_trans_handle *trans,</div><div class='ctx'>  * or the entire directory.</div><div class='ctx'>  */</div><div class='ctx'> void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_root *root,</div><div class='ctx'> 				  const struct fscrypt_str *name,</div><div class='ctx'> 				  struct btrfs_inode *dir, u64 index)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	struct btrfs_root *root = dir-&gt;root;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = inode_logged(trans, dir, NULL);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		return;</div><div class='del'>-	else if (ret &lt; 0) {</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		btrfs_set_log_full_commit(trans);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!path) {</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = join_running_log_trans(root);</div><div class='del'>-	if (ret)</div><div class='add'>+	ASSERT(ret == 0, "join_running_log_trans() ret=%d", ret);</div><div class='add'>+	if (WARN_ON(ret))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dir-&gt;log_mutex);</div><div class='ctx'> </div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = del_logged_dentry(trans, root-&gt;log_root, path, btrfs_ino(dir),</div><div class='ctx'> 				name, index);</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;dir-&gt;log_mutex);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='hunk'>@@ -3449,12 +3936,11 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> /* see comments for btrfs_del_dir_entries_in_log */</div><div class='ctx'> void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,</div><div class='del'>-				struct btrfs_root *root,</div><div class='ctx'> 				const struct fscrypt_str *name,</div><div class='del'>-				struct btrfs_inode *inode, u64 dirid)</div><div class='add'>+				struct btrfs_inode *inode,</div><div class='add'>+				struct btrfs_inode *dir)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_root *log;</div><div class='del'>-	u64 index;</div><div class='add'>+	struct btrfs_root *root = dir-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = inode_logged(trans, inode, NULL);</div><div class='hunk'>@@ -3466,13 +3952,13 @@ void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = join_running_log_trans(root);</div><div class='del'>-	if (ret)</div><div class='add'>+	ASSERT(ret == 0, "join_running_log_trans() ret=%d", ret);</div><div class='add'>+	if (WARN_ON(ret))</div><div class='ctx'> 		return;</div><div class='del'>-	log = root-&gt;log_root;</div><div class='ctx'> 	mutex_lock(&amp;inode-&gt;log_mutex);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_del_inode_ref(trans, log, name, btrfs_ino(inode),</div><div class='del'>-				  dirid, &amp;index);</div><div class='add'>+	ret = btrfs_del_inode_ref(trans, root-&gt;log_root, name, btrfs_ino(inode),</div><div class='add'>+				  btrfs_ino(dir), NULL);</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;log_mutex);</div><div class='ctx'> 	if (ret &lt; 0 &amp;&amp; ret != -ENOENT)</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='hunk'>@@ -3495,8 +3981,8 @@ static noinline int insert_dir_log_key(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_dir_log_item *item;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = dirid;</div><div class='del'>-	key.offset = first_offset;</div><div class='ctx'> 	key.type = BTRFS_DIR_LOG_INDEX_KEY;</div><div class='add'>+	key.offset = first_offset;</div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, log, path, &amp;key, sizeof(*item));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * -EEXIST is fine and can happen sporadically when we are logging a</div><div class='hunk'>@@ -3522,7 +4008,6 @@ static noinline int insert_dir_log_key(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		last_offset = max(last_offset, curr_end);</div><div class='ctx'> 	}</div><div class='ctx'> 	btrfs_set_dir_log_end(path-&gt;nodes[0], item, last_offset);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, path-&gt;nodes[0]);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3535,7 +4020,7 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *log = inode-&gt;root-&gt;log_root;</div><div class='del'>-	char *ins_data = NULL;</div><div class='add'>+	char AUTO_KFREE(ins_data);</div><div class='ctx'> 	struct btrfs_item_batch batch;</div><div class='ctx'> 	struct extent_buffer *dst;</div><div class='ctx'> 	unsigned long src_offset;</div><div class='hunk'>@@ -3546,7 +4031,7 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ASSERT(count &gt; 0);</div><div class='add'>+	ASSERT(count &gt; 0, "count=%d", count);</div><div class='ctx'> 	batch.nr = count;</div><div class='ctx'> </div><div class='ctx'> 	if (count == 1) {</div><div class='hunk'>@@ -3559,8 +4044,7 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		struct btrfs_key *ins_keys;</div><div class='ctx'> 		u32 *ins_sizes;</div><div class='ctx'> </div><div class='del'>-		ins_data = kmalloc(count * sizeof(u32) +</div><div class='del'>-				   count * sizeof(struct btrfs_key), GFP_NOFS);</div><div class='add'>+		ins_data = kmalloc_array(count, sizeof(u32) + sizeof(struct btrfs_key), GFP_NOFS);</div><div class='ctx'> 		if (!ins_data)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -3581,7 +4065,7 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_items(trans, log, dst_path, &amp;batch);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	dst = dst_path-&gt;nodes[0];</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3600,7 +4084,9 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_release_path(dst_path);</div><div class='ctx'> </div><div class='ctx'> 	last_index = batch.keys[count - 1].offset;</div><div class='del'>-	ASSERT(last_index &gt; inode-&gt;last_dir_index_offset);</div><div class='add'>+	ASSERT(last_index &gt; inode-&gt;last_dir_index_offset,</div><div class='add'>+	       "last_index=%llu inode-&gt;last_dir_index_offset=%llu",</div><div class='add'>+	       last_index, inode-&gt;last_dir_index_offset);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If for some unexpected reason the last item's index is not greater</div><div class='hunk'>@@ -3613,12 +4099,34 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_get_first_dir_index_to_log(inode) == 0)</div><div class='ctx'> 		btrfs_set_first_dir_index_to_log(inode, batch.keys[0].offset);</div><div class='del'>-out:</div><div class='del'>-	kfree(ins_data);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int clone_leaf(struct btrfs_path *path, struct btrfs_log_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	const int slot = path-&gt;slots[0];</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;scratch_eb) {</div><div class='add'>+		copy_extent_buffer_full(ctx-&gt;scratch_eb, path-&gt;nodes[0]);</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;scratch_eb = btrfs_clone_extent_buffer(path-&gt;nodes[0]);</div><div class='add'>+		if (!ctx-&gt;scratch_eb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btrfs_release_path(path);</div><div class='add'>+	path-&gt;nodes[0] = ctx-&gt;scratch_eb;</div><div class='add'>+	path-&gt;slots[0] = slot;</div><div class='add'>+	/*</div><div class='add'>+	 * Add extra ref to scratch eb so that it is not freed when callers</div><div class='add'>+	 * release the path, so we can reuse it later if needed.</div><div class='add'>+	 */</div><div class='add'>+	refcount_inc(&amp;ctx-&gt;scratch_eb-&gt;refs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int process_dir_items_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				  struct btrfs_inode *inode,</div><div class='ctx'> 				  struct btrfs_path *path,</div><div class='hunk'>@@ -3633,26 +4141,22 @@ static int process_dir_items_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	bool last_found = false;</div><div class='ctx'> 	int batch_start = 0;</div><div class='ctx'> 	int batch_size = 0;</div><div class='del'>-	int i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to clone the leaf, release the read lock on it, and use the</div><div class='ctx'> 	 * clone before modifying the log tree. See the comment at copy_items()</div><div class='ctx'> 	 * about why we need to do this.</div><div class='ctx'> 	 */</div><div class='del'>-	src = btrfs_clone_extent_buffer(path-&gt;nodes[0]);</div><div class='del'>-	if (!src)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	ret = clone_leaf(path, ctx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	i = path-&gt;slots[0];</div><div class='del'>-	btrfs_release_path(path);</div><div class='del'>-	path-&gt;nodes[0] = src;</div><div class='del'>-	path-&gt;slots[0] = i;</div><div class='add'>+	src = path-&gt;nodes[0];</div><div class='ctx'> </div><div class='del'>-	for (; i &lt; nritems; i++) {</div><div class='add'>+	for (int i = path-&gt;slots[0]; i &lt; nritems; i++) {</div><div class='ctx'> 		struct btrfs_dir_item *di;</div><div class='ctx'> 		struct btrfs_key key;</div><div class='del'>-		int ret;</div><div class='ctx'> </div><div class='ctx'> 		btrfs_item_key_to_cpu(src, &amp;key, i);</div><div class='ctx'> </div><div class='hunk'>@@ -3722,8 +4226,6 @@ static int process_dir_items_leaf(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (batch_size &gt; 0) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='ctx'> 		ret = flush_dir_items_batch(trans, inode, src, dst_path,</div><div class='ctx'> 					    batch_start, batch_size);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -3908,7 +4410,9 @@ done:</div><div class='ctx'> 		 * change in the current transaction), then we don't need to log</div><div class='ctx'> 		 * a range, last_old_dentry_offset is == to last_offset.</div><div class='ctx'> 		 */</div><div class='del'>-		ASSERT(last_old_dentry_offset &lt;= last_offset);</div><div class='add'>+		ASSERT(last_old_dentry_offset &lt;= last_offset,</div><div class='add'>+		       "last_old_dentry_offset=%llu last_offset=%llu",</div><div class='add'>+		       last_old_dentry_offset, last_offset);</div><div class='ctx'> 		if (last_old_dentry_offset &lt; last_offset)</div><div class='ctx'> 			ret = insert_dir_log_key(trans, log, path, ino,</div><div class='ctx'> 						 last_old_dentry_offset + 1,</div><div class='hunk'>@@ -3920,7 +4424,7 @@ done:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If the inode was logged before and it was evicted, then its</div><div class='del'>- * last_dir_index_offset is (u64)-1, so we don't the value of the last index</div><div class='add'>+ * last_dir_index_offset is 0, so we don't know the value of the last index</div><div class='ctx'>  * key offset. If that's the case, search for it and update the inode. This</div><div class='ctx'>  * is to avoid lookups in the log tree every time we try to insert a dir index</div><div class='ctx'>  * key from a leaf changed in the current transaction, and to allow us to always</div><div class='hunk'>@@ -3936,7 +4440,7 @@ static int update_last_dir_index_offset(struct btrfs_inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;inode-&gt;log_mutex);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;last_dir_index_offset != (u64)-1)</div><div class='add'>+	if (inode-&gt;last_dir_index_offset != 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx-&gt;logged_before) {</div><div class='hunk'>@@ -4102,47 +4606,40 @@ static int truncate_inode_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> static void fill_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct extent_buffer *leaf,</div><div class='ctx'> 			    struct btrfs_inode_item *item,</div><div class='del'>-			    struct inode *inode, int log_inode_only,</div><div class='add'>+			    struct inode *inode, bool log_inode_only,</div><div class='ctx'> 			    u64 logged_isize)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_map_token token;</div><div class='ctx'> 	u64 flags;</div><div class='ctx'> </div><div class='del'>-	btrfs_init_map_token(&amp;token, leaf);</div><div class='del'>-</div><div class='ctx'> 	if (log_inode_only) {</div><div class='ctx'> 		/* set the generation to zero so the recover code</div><div class='ctx'> 		 * can tell the difference between an logging</div><div class='ctx'> 		 * just to say 'this inode exists' and a logging</div><div class='ctx'> 		 * to say 'update this inode with these values'</div><div class='ctx'> 		 */</div><div class='del'>-		btrfs_set_token_inode_generation(&amp;token, item, 0);</div><div class='del'>-		btrfs_set_token_inode_size(&amp;token, item, logged_isize);</div><div class='add'>+		btrfs_set_inode_generation(leaf, item, 0);</div><div class='add'>+		btrfs_set_inode_size(leaf, item, logged_isize);</div><div class='ctx'> 	} else {</div><div class='del'>-		btrfs_set_token_inode_generation(&amp;token, item,</div><div class='del'>-						 BTRFS_I(inode)-&gt;generation);</div><div class='del'>-		btrfs_set_token_inode_size(&amp;token, item, inode-&gt;i_size);</div><div class='add'>+		btrfs_set_inode_generation(leaf, item, BTRFS_I(inode)-&gt;generation);</div><div class='add'>+		btrfs_set_inode_size(leaf, item, inode-&gt;i_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_set_token_inode_uid(&amp;token, item, i_uid_read(inode));</div><div class='del'>-	btrfs_set_token_inode_gid(&amp;token, item, i_gid_read(inode));</div><div class='del'>-	btrfs_set_token_inode_mode(&amp;token, item, inode-&gt;i_mode);</div><div class='del'>-	btrfs_set_token_inode_nlink(&amp;token, item, inode-&gt;i_nlink);</div><div class='add'>+	btrfs_set_inode_uid(leaf, item, i_uid_read(inode));</div><div class='add'>+	btrfs_set_inode_gid(leaf, item, i_gid_read(inode));</div><div class='add'>+	btrfs_set_inode_mode(leaf, item, inode-&gt;i_mode);</div><div class='add'>+	btrfs_set_inode_nlink(leaf, item, inode-&gt;i_nlink);</div><div class='ctx'> </div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;atime,</div><div class='del'>-				     inode_get_atime_sec(inode));</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;atime,</div><div class='del'>-				      inode_get_atime_nsec(inode));</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;atime, inode_get_atime_sec(inode));</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;atime, inode_get_atime_nsec(inode));</div><div class='ctx'> </div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;mtime,</div><div class='del'>-				     inode_get_mtime_sec(inode));</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;mtime,</div><div class='del'>-				      inode_get_mtime_nsec(inode));</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;mtime, inode_get_mtime_sec(inode));</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;mtime, inode_get_mtime_nsec(inode));</div><div class='ctx'> </div><div class='del'>-	btrfs_set_token_timespec_sec(&amp;token, &amp;item-&gt;ctime,</div><div class='del'>-				     inode_get_ctime_sec(inode));</div><div class='del'>-	btrfs_set_token_timespec_nsec(&amp;token, &amp;item-&gt;ctime,</div><div class='del'>-				      inode_get_ctime_nsec(inode));</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;ctime, inode_get_ctime_sec(inode));</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;ctime, inode_get_ctime_nsec(inode));</div><div class='add'>+</div><div class='add'>+	btrfs_set_timespec_sec(leaf, &amp;item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_sec);</div><div class='add'>+	btrfs_set_timespec_nsec(leaf, &amp;item-&gt;otime, BTRFS_I(inode)-&gt;i_otime_nsec);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We do not need to set the nbytes field, in fact during a fast fsync</div><div class='hunk'>@@ -4153,13 +4650,13 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * inode item in subvolume tree as needed (see overwrite_item()).</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	btrfs_set_token_inode_sequence(&amp;token, item, inode_peek_iversion(inode));</div><div class='del'>-	btrfs_set_token_inode_transid(&amp;token, item, trans-&gt;transid);</div><div class='del'>-	btrfs_set_token_inode_rdev(&amp;token, item, inode-&gt;i_rdev);</div><div class='add'>+	btrfs_set_inode_sequence(leaf, item, inode_peek_iversion(inode));</div><div class='add'>+	btrfs_set_inode_transid(leaf, item, trans-&gt;transid);</div><div class='add'>+	btrfs_set_inode_rdev(leaf, item, inode-&gt;i_rdev);</div><div class='ctx'> 	flags = btrfs_inode_combine_flags(BTRFS_I(inode)-&gt;flags,</div><div class='ctx'> 					  BTRFS_I(inode)-&gt;ro_flags);</div><div class='del'>-	btrfs_set_token_inode_flags(&amp;token, item, flags);</div><div class='del'>-	btrfs_set_token_inode_block_group(&amp;token, item, 0);</div><div class='add'>+	btrfs_set_inode_flags(leaf, item, flags);</div><div class='add'>+	btrfs_set_inode_block_group(leaf, item, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int log_inode_item(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -4167,8 +4664,10 @@ static int log_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  struct btrfs_inode *inode, bool inode_item_dropped)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_inode_item *inode_item;</div><div class='add'>+	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	btrfs_get_inode_key(inode, &amp;key);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are doing a fast fsync and the inode was logged before in the</div><div class='ctx'> 	 * current transaction, then we know the inode was previously logged and</div><div class='hunk'>@@ -4180,7 +4679,7 @@ static int log_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * already exists can also result in unnecessarily splitting a leaf.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!inode_item_dropped &amp;&amp; inode-&gt;logged_trans == trans-&gt;transid) {</div><div class='del'>-		ret = btrfs_search_slot(trans, log, &amp;inode-&gt;location, path, 0, 1);</div><div class='add'>+		ret = btrfs_search_slot(trans, log, &amp;key, path, 0, 1);</div><div class='ctx'> 		ASSERT(ret &lt;= 0);</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			ret = -ENOENT;</div><div class='hunk'>@@ -4194,7 +4693,7 @@ static int log_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * the inode, we set BTRFS_INODE_NEEDS_FULL_SYNC on its runtime</div><div class='ctx'> 		 * flags and set -&gt;logged_trans to 0.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = btrfs_insert_empty_item(trans, log, path, &amp;inode-&gt;location,</div><div class='add'>+		ret = btrfs_insert_empty_item(trans, log, path, &amp;key,</div><div class='ctx'> 					      sizeof(*inode_item));</div><div class='ctx'> 		ASSERT(ret != -EEXIST);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4203,7 +4702,7 @@ static int log_inode_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	inode_item = btrfs_item_ptr(path-&gt;nodes[0], path-&gt;slots[0],</div><div class='ctx'> 				    struct btrfs_inode_item);</div><div class='ctx'> 	fill_inode_item(trans, path-&gt;nodes[0], inode_item, &amp;inode-&gt;vfs_inode,</div><div class='del'>-			0, 0);</div><div class='add'>+			false, 0);</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4231,8 +4730,8 @@ static int log_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * file which happens to refer to the same extent as well. Such races</div><div class='ctx'> 	 * can leave checksum items in the log with overlapping ranges.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = lock_extent(&amp;log_root-&gt;log_csum_range, sums-&gt;logical, lock_end,</div><div class='del'>-			  &amp;cached_state);</div><div class='add'>+	ret = btrfs_lock_extent(&amp;log_root-&gt;log_csum_range, sums-&gt;logical, lock_end,</div><div class='add'>+				&amp;cached_state);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4248,8 +4747,8 @@ static int log_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = btrfs_csum_file_blocks(trans, log_root, sums);</div><div class='ctx'> </div><div class='del'>-	unlock_extent(&amp;log_root-&gt;log_csum_range, sums-&gt;logical, lock_end,</div><div class='del'>-		      &amp;cached_state);</div><div class='add'>+	btrfs_unlock_extent(&amp;log_root-&gt;log_csum_range, sums-&gt;logical, lock_end,</div><div class='add'>+			    &amp;cached_state);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4259,17 +4758,16 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			       struct btrfs_path *dst_path,</div><div class='ctx'> 			       struct btrfs_path *src_path,</div><div class='ctx'> 			       int start_slot, int nr, int inode_only,</div><div class='del'>-			       u64 logged_isize)</div><div class='add'>+			       u64 logged_isize, struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *log = inode-&gt;root-&gt;log_root;</div><div class='ctx'> 	struct btrfs_file_extent_item *extent;</div><div class='ctx'> 	struct extent_buffer *src;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct btrfs_key *ins_keys;</div><div class='ctx'> 	u32 *ins_sizes;</div><div class='ctx'> 	struct btrfs_item_batch batch;</div><div class='del'>-	char *ins_data;</div><div class='del'>-	int i;</div><div class='add'>+	char AUTO_KFREE(ins_data);</div><div class='ctx'> 	int dst_index;</div><div class='ctx'> 	const bool skip_csum = (inode-&gt;flags &amp; BTRFS_INODE_NODATASUM);</div><div class='ctx'> 	const u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='hunk'>@@ -4302,17 +4800,13 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * while the other is holding the delayed node's mutex and wants to</div><div class='ctx'> 	 * write lock the same subvolume leaf for flushing delayed items.</div><div class='ctx'> 	 */</div><div class='del'>-	src = btrfs_clone_extent_buffer(src_path-&gt;nodes[0]);</div><div class='del'>-	if (!src)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	ret = clone_leaf(src_path, ctx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	i = src_path-&gt;slots[0];</div><div class='del'>-	btrfs_release_path(src_path);</div><div class='del'>-	src_path-&gt;nodes[0] = src;</div><div class='del'>-	src_path-&gt;slots[0] = i;</div><div class='add'>+	src = src_path-&gt;nodes[0];</div><div class='ctx'> </div><div class='del'>-	ins_data = kmalloc(nr * sizeof(struct btrfs_key) +</div><div class='del'>-			   nr * sizeof(u32), GFP_NOFS);</div><div class='add'>+	ins_data = kmalloc_array(nr, sizeof(struct btrfs_key) + sizeof(u32), GFP_NOFS);</div><div class='ctx'> 	if (!ins_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -4324,7 +4818,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	batch.nr = 0;</div><div class='ctx'> </div><div class='ctx'> 	dst_index = 0;</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='add'>+	for (int i = 0; i &lt; nr; i++) {</div><div class='ctx'> 		const int src_slot = start_slot + i;</div><div class='ctx'> 		struct btrfs_root *csum_root;</div><div class='ctx'> 		struct btrfs_ordered_sum *sums;</div><div class='hunk'>@@ -4399,9 +4893,10 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		disk_bytenr += extent_offset;</div><div class='ctx'> 		ret = btrfs_lookup_csums_list(csum_root, disk_bytenr,</div><div class='ctx'> 					      disk_bytenr + extent_num_bytes - 1,</div><div class='del'>-					      &amp;ordered_sums, 0, false);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+					      &amp;ordered_sums, false);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = 0;</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry_safe(sums, sums_next, &amp;ordered_sums, list) {</div><div class='ctx'> 			if (!ret)</div><div class='hunk'>@@ -4410,7 +4905,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			kfree(sums);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> add_to_batch:</div><div class='ctx'> 		ins_sizes[dst_index] = btrfs_item_size(src, src_slot);</div><div class='hunk'>@@ -4424,14 +4919,14 @@ add_to_batch:</div><div class='ctx'> 	 * so we don't need to do anything.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (batch.nr == 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_items(trans, log, dst_path, &amp;batch);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	dst_index = 0;</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='add'>+	for (int i = 0; i &lt; nr; i++) {</div><div class='ctx'> 		const int src_slot = start_slot + i;</div><div class='ctx'> 		const int dst_slot = dst_path-&gt;slots[0] + dst_index;</div><div class='ctx'> 		struct btrfs_key key;</div><div class='hunk'>@@ -4480,10 +4975,7 @@ copy_item:</div><div class='ctx'> 		dst_index++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_mark_buffer_dirty(trans, dst_path-&gt;nodes[0]);</div><div class='ctx'> 	btrfs_release_path(dst_path);</div><div class='del'>-out:</div><div class='del'>-	kfree(ins_data);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4511,16 +5003,17 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ordered_extent *ordered;</div><div class='ctx'> 	struct btrfs_root *csum_root;</div><div class='add'>+	u64 block_start;</div><div class='ctx'> 	u64 csum_offset;</div><div class='ctx'> 	u64 csum_len;</div><div class='del'>-	u64 mod_start = em-&gt;mod_start;</div><div class='del'>-	u64 mod_len = em-&gt;mod_len;</div><div class='add'>+	u64 mod_start = em-&gt;start;</div><div class='add'>+	u64 mod_len = em-&gt;len;</div><div class='ctx'> 	LIST_HEAD(ordered_sums);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;flags &amp; BTRFS_INODE_NODATASUM ||</div><div class='ctx'> 	    (em-&gt;flags &amp; EXTENT_FLAG_PREALLOC) ||</div><div class='del'>-	    em-&gt;block_start == EXTENT_MAP_HOLE)</div><div class='add'>+	    em-&gt;disk_bytenr == EXTENT_MAP_HOLE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ordered, &amp;ctx-&gt;ordered_extents, log_list) {</div><div class='hunk'>@@ -4582,26 +5075,28 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If we're compressed we have to save the entire range of csums. */</div><div class='del'>-	if (extent_map_is_compressed(em)) {</div><div class='add'>+	if (btrfs_extent_map_is_compressed(em)) {</div><div class='ctx'> 		csum_offset = 0;</div><div class='del'>-		csum_len = max(em-&gt;block_len, em-&gt;orig_block_len);</div><div class='add'>+		csum_len = em-&gt;disk_num_bytes;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		csum_offset = mod_start - em-&gt;start;</div><div class='ctx'> 		csum_len = mod_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* block start is already adjusted for the file extent offset. */</div><div class='del'>-	csum_root = btrfs_csum_root(trans-&gt;fs_info, em-&gt;block_start);</div><div class='del'>-	ret = btrfs_lookup_csums_list(csum_root, em-&gt;block_start + csum_offset,</div><div class='del'>-				      em-&gt;block_start + csum_offset +</div><div class='del'>-				      csum_len - 1, &amp;ordered_sums, 0, false);</div><div class='del'>-	if (ret)</div><div class='add'>+	block_start = btrfs_extent_map_block_start(em);</div><div class='add'>+	csum_root = btrfs_csum_root(trans-&gt;fs_info, block_start);</div><div class='add'>+	ret = btrfs_lookup_csums_list(csum_root, block_start + csum_offset,</div><div class='add'>+				      block_start + csum_offset + csum_len - 1,</div><div class='add'>+				      &amp;ordered_sums, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='add'>+	ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;ordered_sums)) {</div><div class='del'>-		struct btrfs_ordered_sum *sums = list_entry(ordered_sums.next,</div><div class='del'>-						   struct btrfs_ordered_sum,</div><div class='del'>-						   list);</div><div class='add'>+		struct btrfs_ordered_sum *sums = list_first_entry(&amp;ordered_sums,</div><div class='add'>+								  struct btrfs_ordered_sum,</div><div class='add'>+								  list);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = log_csums(trans, inode, log_root, sums);</div><div class='ctx'> 		list_del(&amp;sums-&gt;list);</div><div class='hunk'>@@ -4623,7 +5118,8 @@ static int log_one_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	enum btrfs_compression_type compress_type;</div><div class='del'>-	u64 extent_offset = em-&gt;start - em-&gt;orig_start;</div><div class='add'>+	u64 extent_offset = em-&gt;offset;</div><div class='add'>+	u64 block_start = btrfs_extent_map_block_start(em);</div><div class='ctx'> 	u64 block_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -4633,14 +5129,13 @@ static int log_one_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	else</div><div class='ctx'> 		btrfs_set_stack_file_extent_type(&amp;fi, BTRFS_FILE_EXTENT_REG);</div><div class='ctx'> </div><div class='del'>-	block_len = max(em-&gt;block_len, em-&gt;orig_block_len);</div><div class='del'>-	compress_type = extent_map_compression(em);</div><div class='add'>+	block_len = em-&gt;disk_num_bytes;</div><div class='add'>+	compress_type = btrfs_extent_map_compression(em);</div><div class='ctx'> 	if (compress_type != BTRFS_COMPRESS_NONE) {</div><div class='del'>-		btrfs_set_stack_file_extent_disk_bytenr(&amp;fi, em-&gt;block_start);</div><div class='add'>+		btrfs_set_stack_file_extent_disk_bytenr(&amp;fi, block_start);</div><div class='ctx'> 		btrfs_set_stack_file_extent_disk_num_bytes(&amp;fi, block_len);</div><div class='del'>-	} else if (em-&gt;block_start &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='del'>-		btrfs_set_stack_file_extent_disk_bytenr(&amp;fi, em-&gt;block_start -</div><div class='del'>-							extent_offset);</div><div class='add'>+	} else if (em-&gt;disk_bytenr &lt; EXTENT_MAP_LAST_BYTE) {</div><div class='add'>+		btrfs_set_stack_file_extent_disk_bytenr(&amp;fi, block_start - extent_offset);</div><div class='ctx'> 		btrfs_set_stack_file_extent_disk_num_bytes(&amp;fi, block_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4687,7 +5182,6 @@ static int log_one_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	write_extent_buffer(leaf, &amp;fi,</div><div class='ctx'> 			    btrfs_item_ptr_offset(leaf, path-&gt;slots[0]),</div><div class='ctx'> 			    sizeof(fi));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> </div><div class='hunk'>@@ -4704,13 +5198,14 @@ static int log_one_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'>  */</div><div class='ctx'> static int btrfs_log_prealloc_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				      struct btrfs_inode *inode,</div><div class='del'>-				      struct btrfs_path *path)</div><div class='add'>+				      struct btrfs_path *path,</div><div class='add'>+				      struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	const u64 i_size = i_size_read(&amp;inode-&gt;vfs_inode);</div><div class='ctx'> 	const u64 ino = btrfs_ino(inode);</div><div class='del'>-	struct btrfs_path *dst_path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(dst_path);</div><div class='ctx'> 	bool dropped_extents = false;</div><div class='ctx'> 	u64 truncate_offset = i_size;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -4770,7 +5265,7 @@ static int btrfs_log_prealloc_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (slot &gt;= btrfs_header_nritems(leaf)) {</div><div class='ctx'> 			if (ins_nr &gt; 0) {</div><div class='ctx'> 				ret = copy_items(trans, inode, dst_path, path,</div><div class='del'>-						 start_slot, ins_nr, 1, 0);</div><div class='add'>+						 start_slot, ins_nr, 1, 0, ctx);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				ins_nr = 0;</div><div class='hunk'>@@ -4794,18 +5289,23 @@ static int btrfs_log_prealloc_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			path-&gt;slots[0]++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (!dropped_extents) {</div><div class='del'>-			/*</div><div class='del'>-			 * Avoid logging extent items logged in past fsync calls</div><div class='del'>-			 * and leading to duplicate keys in the log tree.</div><div class='del'>-			 */</div><div class='add'>+		/*</div><div class='add'>+		 * Avoid overlapping items in the log tree. The first time we</div><div class='add'>+		 * get here, get rid of everything from a past fsync. After</div><div class='add'>+		 * that, if the current extent starts before the end of the last</div><div class='add'>+		 * extent we copied, truncate the last one. This can happen if</div><div class='add'>+		 * an ordered extent completion modifies the subvolume tree</div><div class='add'>+		 * while btrfs_next_leaf() has the tree unlocked.</div><div class='add'>+		 */</div><div class='add'>+		if (!dropped_extents || key.offset &lt; truncate_offset) {</div><div class='ctx'> 			ret = truncate_inode_items(trans, root-&gt;log_root, inode,</div><div class='del'>-						   truncate_offset,</div><div class='add'>+						   min(key.offset, truncate_offset),</div><div class='ctx'> 						   BTRFS_EXTENT_DATA_KEY);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			dropped_extents = true;</div><div class='ctx'> 		}</div><div class='add'>+		truncate_offset = btrfs_file_extent_end(path);</div><div class='ctx'> 		if (ins_nr == 0)</div><div class='ctx'> 			start_slot = slot;</div><div class='ctx'> 		ins_nr++;</div><div class='hunk'>@@ -4820,10 +5320,9 @@ static int btrfs_log_prealloc_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ins_nr &gt; 0)</div><div class='ctx'> 		ret = copy_items(trans, inode, dst_path, path,</div><div class='del'>-				 start_slot, ins_nr, 1, 0);</div><div class='add'>+				 start_slot, ins_nr, 1, 0, ctx);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	btrfs_free_path(dst_path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4874,7 +5373,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	list_sort(NULL, &amp;extents, extent_cmp);</div><div class='ctx'> process:</div><div class='ctx'> 	while (!list_empty(&amp;extents)) {</div><div class='del'>-		em = list_entry(extents.next, struct extent_map, list);</div><div class='add'>+		em = list_first_entry(&amp;extents, struct extent_map, list);</div><div class='ctx'> </div><div class='ctx'> 		list_del_init(&amp;em-&gt;list);</div><div class='ctx'> </div><div class='hunk'>@@ -4883,8 +5382,8 @@ process:</div><div class='ctx'> 		 * private list.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			clear_em_logging(tree, em);</div><div class='del'>-			free_extent_map(em);</div><div class='add'>+			btrfs_clear_em_logging(inode, em);</div><div class='add'>+			btrfs_free_extent_map(em);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -4892,14 +5391,14 @@ process:</div><div class='ctx'> </div><div class='ctx'> 		ret = log_one_extent(trans, inode, em, path, ctx);</div><div class='ctx'> 		write_lock(&amp;tree-&gt;lock);</div><div class='del'>-		clear_em_logging(tree, em);</div><div class='del'>-		free_extent_map(em);</div><div class='add'>+		btrfs_clear_em_logging(inode, em);</div><div class='add'>+		btrfs_free_extent_map(em);</div><div class='ctx'> 	}</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;extents));</div><div class='ctx'> 	write_unlock(&amp;tree-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = btrfs_log_prealloc_extents(trans, inode, path);</div><div class='add'>+		ret = btrfs_log_prealloc_extents(trans, inode, path, ctx);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -4915,12 +5414,12 @@ process:</div><div class='ctx'> 		set_bit(BTRFS_ORDERED_LOGGED, &amp;ordered-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		if (!test_bit(BTRFS_ORDERED_COMPLETE, &amp;ordered-&gt;flags)) {</div><div class='del'>-			spin_lock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+			spin_lock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 			if (!test_bit(BTRFS_ORDERED_COMPLETE, &amp;ordered-&gt;flags)) {</div><div class='ctx'> 				set_bit(BTRFS_ORDERED_PENDING, &amp;ordered-&gt;flags);</div><div class='ctx'> 				atomic_inc(&amp;trans-&gt;transaction-&gt;pending_ordered);</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_irq(&amp;inode-&gt;ordered_tree_lock);</div><div class='add'>+			spin_unlock(&amp;inode-&gt;ordered_tree_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_put_ordered_extent(ordered);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4980,7 +5479,8 @@ static int logged_inode_size(struct btrfs_root *log, struct btrfs_inode *inode,</div><div class='ctx'> static int btrfs_log_all_xattrs(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct btrfs_inode *inode,</div><div class='ctx'> 				struct btrfs_path *path,</div><div class='del'>-				struct btrfs_path *dst_path)</div><div class='add'>+				struct btrfs_path *dst_path,</div><div class='add'>+				struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5009,7 +5509,7 @@ static int btrfs_log_all_xattrs(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (slot &gt;= nritems) {</div><div class='ctx'> 			if (ins_nr &gt; 0) {</div><div class='ctx'> 				ret = copy_items(trans, inode, dst_path, path,</div><div class='del'>-						 start_slot, ins_nr, 1, 0);</div><div class='add'>+						 start_slot, ins_nr, 1, 0, ctx);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 				ins_nr = 0;</div><div class='hunk'>@@ -5035,7 +5535,7 @@ static int btrfs_log_all_xattrs(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ins_nr &gt; 0) {</div><div class='ctx'> 		ret = copy_items(trans, inode, dst_path, path,</div><div class='del'>-				 start_slot, ins_nr, 1, 0);</div><div class='add'>+				 start_slot, ins_nr, 1, 0, ctx);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5194,9 +5694,8 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,</div><div class='ctx'> 					 struct btrfs_inode *inode,</div><div class='ctx'> 					 u64 *other_ino, u64 *other_parent)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct btrfs_path *search_path;</div><div class='del'>-	char *name = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(search_path);</div><div class='add'>+	char AUTO_KFREE(name);</div><div class='ctx'> 	u32 name_len = 0;</div><div class='ctx'> 	u32 item_size = btrfs_item_size(eb, slot);</div><div class='ctx'> 	u32 cur_offset = 0;</div><div class='hunk'>@@ -5205,8 +5704,8 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,</div><div class='ctx'> 	search_path = btrfs_alloc_path();</div><div class='ctx'> 	if (!search_path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	search_path-&gt;search_commit_root = 1;</div><div class='del'>-	search_path-&gt;skip_locking = 1;</div><div class='add'>+	search_path-&gt;search_commit_root = true;</div><div class='add'>+	search_path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	while (cur_offset &lt; item_size) {</div><div class='ctx'> 		u64 parent;</div><div class='hunk'>@@ -5239,10 +5738,8 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,</div><div class='ctx'> 			char *new_name;</div><div class='ctx'> </div><div class='ctx'> 			new_name = krealloc(name, this_name_len, GFP_NOFS);</div><div class='del'>-			if (!new_name) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+			if (!new_name)</div><div class='add'>+				return -ENOMEM;</div><div class='ctx'> 			name_len = this_name_len;</div><div class='ctx'> 			name = new_name;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5260,29 +5757,24 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,</div><div class='ctx'> 						  di, &amp;di_key);</div><div class='ctx'> 			if (di_key.type == BTRFS_INODE_ITEM_KEY) {</div><div class='ctx'> 				if (di_key.objectid != key-&gt;objectid) {</div><div class='del'>-					ret = 1;</div><div class='ctx'> 					*other_ino = di_key.objectid;</div><div class='ctx'> 					*other_parent = parent;</div><div class='add'>+					return 1;</div><div class='ctx'> 				} else {</div><div class='del'>-					ret = 0;</div><div class='add'>+					return 0;</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='del'>-				ret = -EAGAIN;</div><div class='add'>+				return -EAGAIN;</div><div class='ctx'> 			}</div><div class='del'>-			goto out;</div><div class='ctx'> 		} else if (IS_ERR(di)) {</div><div class='del'>-			ret = PTR_ERR(di);</div><div class='del'>-			goto out;</div><div class='add'>+			return PTR_ERR(di);</div><div class='ctx'> 		}</div><div class='ctx'> 		btrfs_release_path(search_path);</div><div class='ctx'> </div><div class='ctx'> 		cur_offset += this_len;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(search_path);</div><div class='del'>-	kfree(name);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5330,7 +5822,7 @@ struct btrfs_dir_list {</div><div class='ctx'>  * See process_dir_items_leaf() for details about why it is needed.</div><div class='ctx'>  * This is a recursive operation - if an existing dentry corresponds to a</div><div class='ctx'>  * directory, that directory's new entries are logged too (same behaviour as</div><div class='del'>- * ext3/4, xfs, f2fs, reiserfs, nilfs2). Note that when logging the inodes</div><div class='add'>+ * ext3/4, xfs, f2fs, nilfs2). Note that when logging the inodes</div><div class='ctx'>  * the dentries point to we do not acquire their VFS lock, otherwise lockdep</div><div class='ctx'>  * complains about the following circular lock dependency / possible deadlock:</div><div class='ctx'>  *</div><div class='hunk'>@@ -5366,7 +5858,6 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = start_inode-&gt;root;</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	LIST_HEAD(dir_list);</div><div class='ctx'> 	struct btrfs_dir_list *dir_elem;</div><div class='hunk'>@@ -5390,7 +5881,6 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ihold(&amp;curr_inode-&gt;vfs_inode);</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='del'>-		struct inode *vfs_inode;</div><div class='ctx'> 		struct btrfs_key key;</div><div class='ctx'> 		struct btrfs_key found_key;</div><div class='ctx'> 		u64 next_index;</div><div class='hunk'>@@ -5406,7 +5896,7 @@ again:</div><div class='ctx'> 			struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='ctx'> 			struct btrfs_dir_item *di;</div><div class='ctx'> 			struct btrfs_key di_key;</div><div class='del'>-			struct inode *di_inode;</div><div class='add'>+			struct btrfs_inode *di_inode;</div><div class='ctx'> 			int log_mode = LOG_INODE_EXISTS;</div><div class='ctx'> 			int type;</div><div class='ctx'> </div><div class='hunk'>@@ -5427,23 +5917,22 @@ again:</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			btrfs_release_path(path);</div><div class='del'>-			di_inode = btrfs_iget(fs_info-&gt;sb, di_key.objectid, root);</div><div class='add'>+			di_inode = btrfs_iget_logging(di_key.objectid, root);</div><div class='ctx'> 			if (IS_ERR(di_inode)) {</div><div class='ctx'> 				ret = PTR_ERR(di_inode);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!need_log_inode(trans, BTRFS_I(di_inode))) {</div><div class='del'>-				btrfs_add_delayed_iput(BTRFS_I(di_inode));</div><div class='add'>+			if (!need_log_inode(trans, di_inode)) {</div><div class='add'>+				btrfs_add_delayed_iput(di_inode);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ctx-&gt;log_new_dentries = false;</div><div class='ctx'> 			if (type == BTRFS_FT_DIR)</div><div class='ctx'> 				log_mode = LOG_INODE_ALL;</div><div class='del'>-			ret = btrfs_log_inode(trans, BTRFS_I(di_inode),</div><div class='del'>-					      log_mode, ctx);</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(di_inode));</div><div class='add'>+			ret = btrfs_log_inode(trans, di_inode, log_mode, ctx);</div><div class='add'>+			btrfs_add_delayed_iput(di_inode);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			if (ctx-&gt;log_new_dentries) {</div><div class='hunk'>@@ -5485,14 +5974,13 @@ again:</div><div class='ctx'> 		kfree(dir_elem);</div><div class='ctx'> </div><div class='ctx'> 		btrfs_add_delayed_iput(curr_inode);</div><div class='del'>-		curr_inode = NULL;</div><div class='ctx'> </div><div class='del'>-		vfs_inode = btrfs_iget(fs_info-&gt;sb, ino, root);</div><div class='del'>-		if (IS_ERR(vfs_inode)) {</div><div class='del'>-			ret = PTR_ERR(vfs_inode);</div><div class='add'>+		curr_inode = btrfs_iget_logging(ino, root);</div><div class='add'>+		if (IS_ERR(curr_inode)) {</div><div class='add'>+			ret = PTR_ERR(curr_inode);</div><div class='add'>+			curr_inode = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		curr_inode = BTRFS_I(vfs_inode);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='hunk'>@@ -5536,8 +6024,8 @@ static int conflicting_inode_is_dir(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 	key.type = BTRFS_INODE_ITEM_KEY;</div><div class='ctx'> 	key.offset = 0;</div><div class='ctx'> </div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (WARN_ON_ONCE(ret &gt; 0)) {</div><div class='hunk'>@@ -5557,8 +6045,8 @@ static int conflicting_inode_is_dir(struct btrfs_root *root, u64 ino,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='del'>-	path-&gt;search_commit_root = 0;</div><div class='del'>-	path-&gt;skip_locking = 0;</div><div class='add'>+	path-&gt;search_commit_root = false;</div><div class='add'>+	path-&gt;skip_locking = false;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -5570,7 +6058,7 @@ static int add_conflicting_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_ino_list *ino_elem;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It's rare to have a lot of conflicting inodes, in practice it is not</div><div class='hunk'>@@ -5582,7 +6070,7 @@ static int add_conflicting_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (ctx-&gt;num_conflict_inodes &gt;= MAX_CONFLICT_INODES)</div><div class='ctx'> 		return BTRFS_LOG_FORCE_COMMIT;</div><div class='ctx'> </div><div class='del'>-	inode = btrfs_iget(root-&gt;fs_info-&gt;sb, ino, root);</div><div class='add'>+	inode = btrfs_iget_logging(ino, root);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the other inode that had a conflicting dir entry was deleted in</div><div class='ctx'> 	 * the current transaction then we either:</div><div class='hunk'>@@ -5661,12 +6149,12 @@ static int add_conflicting_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 * inode in LOG_INODE_EXISTS mode and rename operations update the log,</div><div class='ctx'> 	 * so that the log ends up with the new name and without the old name.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!need_log_inode(trans, BTRFS_I(inode))) {</div><div class='del'>-		btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+	if (!need_log_inode(trans, inode)) {</div><div class='add'>+		btrfs_add_delayed_iput(inode);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+	btrfs_add_delayed_iput(inode);</div><div class='ctx'> </div><div class='ctx'> 	ino_elem = kmalloc(sizeof(*ino_elem), GFP_NOFS);</div><div class='ctx'> 	if (!ino_elem)</div><div class='hunk'>@@ -5683,7 +6171,6 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				  struct btrfs_root *root,</div><div class='ctx'> 				  struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5703,7 +6190,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (!list_empty(&amp;ctx-&gt;conflict_inodes)) {</div><div class='ctx'> 		struct btrfs_ino_list *curr;</div><div class='del'>-		struct inode *inode;</div><div class='add'>+		struct btrfs_inode *inode;</div><div class='ctx'> 		u64 ino;</div><div class='ctx'> 		u64 parent;</div><div class='ctx'> </div><div class='hunk'>@@ -5714,7 +6201,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		list_del(&amp;curr-&gt;list);</div><div class='ctx'> 		kfree(curr);</div><div class='ctx'> </div><div class='del'>-		inode = btrfs_iget(fs_info-&gt;sb, ino, root);</div><div class='add'>+		inode = btrfs_iget_logging(ino, root);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the other inode that had a conflicting dir entry was</div><div class='ctx'> 		 * deleted in the current transaction, we need to log its parent</div><div class='hunk'>@@ -5725,7 +6212,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			if (ret != -ENOENT)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			inode = btrfs_iget(fs_info-&gt;sb, parent, root);</div><div class='add'>+			inode = btrfs_iget_logging(parent, root);</div><div class='ctx'> 			if (IS_ERR(inode)) {</div><div class='ctx'> 				ret = PTR_ERR(inode);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -5739,9 +6226,8 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 * dir index key range logged for the directory. So we</div><div class='ctx'> 			 * must make sure the deletion is recorded.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = btrfs_log_inode(trans, BTRFS_I(inode),</div><div class='del'>-					      LOG_INODE_ALL, ctx);</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+			ret = btrfs_log_inode(trans, inode, LOG_INODE_ALL, ctx);</div><div class='add'>+			btrfs_add_delayed_iput(inode);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -5757,8 +6243,8 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * it again because if some other task logged the inode after</div><div class='ctx'> 		 * that, we can avoid doing it again.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!need_log_inode(trans, BTRFS_I(inode))) {</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+		if (!need_log_inode(trans, inode)) {</div><div class='add'>+			btrfs_add_delayed_iput(inode);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5769,8 +6255,8 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * well because during a rename we pin the log and update the</div><div class='ctx'> 		 * log with the new name before we unpin it.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = btrfs_log_inode(trans, BTRFS_I(inode), LOG_INODE_EXISTS, ctx);</div><div class='del'>-		btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+		ret = btrfs_log_inode(trans, inode, LOG_INODE_EXISTS, ctx);</div><div class='add'>+		btrfs_add_delayed_iput(inode);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5838,7 +6324,7 @@ again:</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			} else if (ret &gt; 0 &amp;&amp;</div><div class='del'>-				   other_ino != btrfs_ino(BTRFS_I(ctx-&gt;inode))) {</div><div class='add'>+				   other_ino != btrfs_ino(ctx-&gt;inode)) {</div><div class='ctx'> 				if (ins_nr &gt; 0) {</div><div class='ctx'> 					ins_nr++;</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -5847,7 +6333,7 @@ again:</div><div class='ctx'> 				}</div><div class='ctx'> 				ret = copy_items(trans, inode, dst_path, path,</div><div class='ctx'> 						 ins_start_slot, ins_nr,</div><div class='del'>-						 inode_only, logged_isize);</div><div class='add'>+						 inode_only, logged_isize, ctx);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 				ins_nr = 0;</div><div class='hunk'>@@ -5866,7 +6352,7 @@ again:</div><div class='ctx'> 				goto next_slot;</div><div class='ctx'> 			ret = copy_items(trans, inode, dst_path, path,</div><div class='ctx'> 					 ins_start_slot,</div><div class='del'>-					 ins_nr, inode_only, logged_isize);</div><div class='add'>+					 ins_nr, inode_only, logged_isize, ctx);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			ins_nr = 0;</div><div class='hunk'>@@ -5883,7 +6369,7 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = copy_items(trans, inode, dst_path, path, ins_start_slot,</div><div class='del'>-				 ins_nr, inode_only, logged_isize);</div><div class='add'>+				 ins_nr, inode_only, logged_isize, ctx);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		ins_nr = 1;</div><div class='hunk'>@@ -5898,7 +6384,7 @@ next_slot:</div><div class='ctx'> 		if (ins_nr) {</div><div class='ctx'> 			ret = copy_items(trans, inode, dst_path, path,</div><div class='ctx'> 					 ins_start_slot, ins_nr, inode_only,</div><div class='del'>-					 logged_isize);</div><div class='add'>+					 logged_isize, ctx);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			ins_nr = 0;</div><div class='hunk'>@@ -5923,7 +6409,7 @@ next_key:</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ins_nr) {</div><div class='ctx'> 		ret = copy_items(trans, inode, dst_path, path, ins_start_slot,</div><div class='del'>-				 ins_nr, inode_only, logged_isize);</div><div class='add'>+				 ins_nr, inode_only, logged_isize, ctx);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5934,7 +6420,7 @@ next_key:</div><div class='ctx'> 		 * lock the same leaf with btrfs_log_prealloc_extents() below.</div><div class='ctx'> 		 */</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='del'>-		ret = btrfs_log_prealloc_extents(trans, inode, dst_path);</div><div class='add'>+		ret = btrfs_log_prealloc_extents(trans, inode, dst_path, ctx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -6014,8 +6500,7 @@ static int log_delayed_insertion_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	if (!first)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ins_data = kmalloc(max_batch_size * sizeof(u32) +</div><div class='del'>-			   max_batch_size * sizeof(struct btrfs_key), GFP_NOFS);</div><div class='add'>+	ins_data = kmalloc_array(max_batch_size, sizeof(u32) + sizeof(struct btrfs_key), GFP_NOFS);</div><div class='ctx'> 	if (!ins_data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ins_sizes = (u32 *)ins_data;</div><div class='hunk'>@@ -6051,7 +6536,7 @@ static int log_delayed_insertion_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		curr = list_next_entry(curr, log_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(batch.nr &gt;= 1);</div><div class='add'>+	ASSERT(batch.nr &gt;= 1, "batch.nr=%d", batch.nr);</div><div class='ctx'> 	ret = insert_delayed_items_batch(trans, log, path, &amp;batch, first);</div><div class='ctx'> </div><div class='ctx'> 	curr = list_last_entry(delayed_ins_list, struct btrfs_delayed_item,</div><div class='hunk'>@@ -6095,7 +6580,9 @@ static int log_delayed_deletions_full(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		last_dir_index = curr-&gt;index;</div><div class='del'>-		ASSERT(last_dir_index &gt;= first_dir_index);</div><div class='add'>+		ASSERT(last_dir_index &gt;= first_dir_index,</div><div class='add'>+		       "last_dir_index=%llu first_dir_index=%llu",</div><div class='add'>+		       last_dir_index, first_dir_index);</div><div class='ctx'> </div><div class='ctx'> 		ret = insert_dir_log_key(trans, inode-&gt;root-&gt;log_root, path,</div><div class='ctx'> 					 ino, first_dir_index, last_dir_index);</div><div class='hunk'>@@ -6110,7 +6597,6 @@ static int log_delayed_deletions_full(struct btrfs_trans_handle *trans,</div><div class='ctx'> static int batch_delete_dir_index_items(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					struct btrfs_inode *inode,</div><div class='ctx'> 					struct btrfs_path *path,</div><div class='del'>-					struct btrfs_log_ctx *ctx,</div><div class='ctx'> 					const struct list_head *delayed_del_list,</div><div class='ctx'> 					const struct btrfs_delayed_item *first,</div><div class='ctx'> 					const struct btrfs_delayed_item **last_ret)</div><div class='hunk'>@@ -6171,7 +6657,7 @@ static int log_delayed_deletions_incremental(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		} else if (ret == 0) {</div><div class='del'>-			ret = batch_delete_dir_index_items(trans, inode, path, ctx,</div><div class='add'>+			ret = batch_delete_dir_index_items(trans, inode, path,</div><div class='ctx'> 							   delayed_del_list, curr,</div><div class='ctx'> 							   &amp;last);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -6190,7 +6676,9 @@ static int log_delayed_deletions_incremental(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto next_batch;</div><div class='ctx'> </div><div class='ctx'> 		last_dir_index = last-&gt;index;</div><div class='del'>-		ASSERT(last_dir_index &gt;= first_dir_index);</div><div class='add'>+		ASSERT(last_dir_index &gt;= first_dir_index,</div><div class='add'>+		       "last_dir_index=%llu first_dir_index=%llu",</div><div class='add'>+		       last_dir_index, first_dir_index);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If this range starts right after where the previous one ends,</div><div class='ctx'> 		 * then we want to reuse the previous range item and change its</div><div class='hunk'>@@ -6247,7 +6735,6 @@ static int log_new_delayed_dentries(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				    struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	const bool orig_log_new_dentries = ctx-&gt;log_new_dentries;</div><div class='del'>-	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_delayed_item *item;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6258,12 +6745,13 @@ static int log_new_delayed_dentries(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	 */</div><div class='ctx'> 	lockdep_assert_not_held(&amp;inode-&gt;log_mutex);</div><div class='ctx'> </div><div class='del'>-	ASSERT(!ctx-&gt;logging_new_delayed_dentries);</div><div class='add'>+	ASSERT(!ctx-&gt;logging_new_delayed_dentries,</div><div class='add'>+	       "ctx-&gt;logging_new_delayed_dentries=%d", ctx-&gt;logging_new_delayed_dentries);</div><div class='ctx'> 	ctx-&gt;logging_new_delayed_dentries = true;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(item, delayed_ins_list, log_list) {</div><div class='ctx'> 		struct btrfs_dir_item *dir_item;</div><div class='del'>-		struct inode *di_inode;</div><div class='add'>+		struct btrfs_inode *di_inode;</div><div class='ctx'> 		struct btrfs_key key;</div><div class='ctx'> 		int log_mode = LOG_INODE_EXISTS;</div><div class='ctx'> </div><div class='hunk'>@@ -6273,14 +6761,14 @@ static int log_new_delayed_dentries(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (key.type == BTRFS_ROOT_ITEM_KEY)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		di_inode = btrfs_iget(fs_info-&gt;sb, key.objectid, inode-&gt;root);</div><div class='add'>+		di_inode = btrfs_iget_logging(key.objectid, inode-&gt;root);</div><div class='ctx'> 		if (IS_ERR(di_inode)) {</div><div class='ctx'> 			ret = PTR_ERR(di_inode);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!need_log_inode(trans, BTRFS_I(di_inode))) {</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(di_inode));</div><div class='add'>+		if (!need_log_inode(trans, di_inode)) {</div><div class='add'>+			btrfs_add_delayed_iput(di_inode);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -6288,12 +6776,12 @@ static int log_new_delayed_dentries(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			log_mode = LOG_INODE_ALL;</div><div class='ctx'> </div><div class='ctx'> 		ctx-&gt;log_new_dentries = false;</div><div class='del'>-		ret = btrfs_log_inode(trans, BTRFS_I(di_inode), log_mode, ctx);</div><div class='add'>+		ret = btrfs_log_inode(trans, di_inode, log_mode, ctx);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret &amp;&amp; ctx-&gt;log_new_dentries)</div><div class='del'>-			ret = log_new_dir_dentries(trans, BTRFS_I(di_inode), ctx);</div><div class='add'>+			ret = log_new_dir_dentries(trans, di_inode, ctx);</div><div class='ctx'> </div><div class='del'>-		btrfs_add_delayed_iput(BTRFS_I(di_inode));</div><div class='add'>+		btrfs_add_delayed_iput(di_inode);</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -6517,6 +7005,19 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		btrfs_log_get_delayed_items(inode, &amp;delayed_ins_list,</div><div class='ctx'> 					    &amp;delayed_del_list);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If we are fsyncing a file with 0 hard links, then commit the delayed</div><div class='add'>+	 * inode because the last inode ref (or extref) item may still be in the</div><div class='add'>+	 * subvolume tree and if we log it the file will still exist after a log</div><div class='add'>+	 * replay. So commit the delayed inode to delete that last ref and we</div><div class='add'>+	 * skip logging it.</div><div class='add'>+	 */</div><div class='add'>+	if (inode-&gt;vfs_inode.i_nlink == 0) {</div><div class='add'>+		ret = btrfs_commit_inode_delayed_inode(inode);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = copy_inode_items_to_log(trans, inode, &amp;min_key, &amp;max_key,</div><div class='ctx'> 				      path, dst_path, logged_isize,</div><div class='ctx'> 				      inode_only, ctx,</div><div class='hunk'>@@ -6526,7 +7027,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	btrfs_release_path(path);</div><div class='ctx'> 	btrfs_release_path(dst_path);</div><div class='del'>-	ret = btrfs_log_all_xattrs(trans, inode, path, dst_path);</div><div class='add'>+	ret = btrfs_log_all_xattrs(trans, inode, path, dst_path, ctx);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	xattrs_logged = true;</div><div class='hunk'>@@ -6553,7 +7054,7 @@ log_extents:</div><div class='ctx'> 		 * BTRFS_INODE_COPY_EVERYTHING set.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!xattrs_logged &amp;&amp; inode-&gt;logged_trans &lt; trans-&gt;transid) {</div><div class='del'>-			ret = btrfs_log_all_xattrs(trans, inode, path, dst_path);</div><div class='add'>+			ret = btrfs_log_all_xattrs(trans, inode, path, dst_path, ctx);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out_unlock;</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='hunk'>@@ -6619,7 +7120,7 @@ log_extents:</div><div class='ctx'> 	 *    a power failure unless the log was synced as part of an fsync</div><div class='ctx'> 	 *    against any other unrelated inode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (inode_only != LOG_INODE_EXISTS)</div><div class='add'>+	if (!ctx-&gt;logging_new_name &amp;&amp; inode_only != LOG_INODE_EXISTS)</div><div class='ctx'> 		inode-&gt;last_log_commit = inode-&gt;last_sub_trans;</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -6657,9 +7158,8 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				 struct btrfs_inode *inode,</div><div class='ctx'> 				 struct btrfs_log_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	const u64 ino = btrfs_ino(inode);</div><div class='hunk'>@@ -6667,15 +7167,15 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = ino;</div><div class='ctx'> 	key.type = BTRFS_INODE_REF_KEY;</div><div class='ctx'> 	key.offset = 0;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='ctx'> 		struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -6687,8 +7187,8 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		if (slot &gt;= btrfs_header_nritems(leaf)) {</div><div class='ctx'> 			ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			else if (ret &gt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6701,29 +7201,24 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		item_size = btrfs_item_size(leaf, slot);</div><div class='ctx'> 		ptr = btrfs_item_ptr_offset(leaf, slot);</div><div class='ctx'> 		while (cur_offset &lt; item_size) {</div><div class='del'>-			struct btrfs_key inode_key;</div><div class='del'>-			struct inode *dir_inode;</div><div class='del'>-</div><div class='del'>-			inode_key.type = BTRFS_INODE_ITEM_KEY;</div><div class='del'>-			inode_key.offset = 0;</div><div class='add'>+			u64 dir_id;</div><div class='add'>+			struct btrfs_inode *dir_inode;</div><div class='ctx'> </div><div class='ctx'> 			if (key.type == BTRFS_INODE_EXTREF_KEY) {</div><div class='ctx'> 				struct btrfs_inode_extref *extref;</div><div class='ctx'> </div><div class='ctx'> 				extref = (struct btrfs_inode_extref *)</div><div class='ctx'> 					(ptr + cur_offset);</div><div class='del'>-				inode_key.objectid = btrfs_inode_extref_parent(</div><div class='del'>-					leaf, extref);</div><div class='add'>+				dir_id = btrfs_inode_extref_parent(leaf, extref);</div><div class='ctx'> 				cur_offset += sizeof(*extref);</div><div class='ctx'> 				cur_offset += btrfs_inode_extref_name_len(leaf,</div><div class='ctx'> 					extref);</div><div class='ctx'> 			} else {</div><div class='del'>-				inode_key.objectid = key.offset;</div><div class='add'>+				dir_id = key.offset;</div><div class='ctx'> 				cur_offset = item_size;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			dir_inode = btrfs_iget(fs_info-&gt;sb, inode_key.objectid,</div><div class='del'>-					       root);</div><div class='add'>+			dir_inode = btrfs_iget_logging(dir_id, root);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If the parent inode was deleted, return an error to</div><div class='ctx'> 			 * fallback to a transaction commit. This is to prevent</div><div class='hunk'>@@ -6747,32 +7242,25 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			 * at both parents and the old parent B would still</div><div class='ctx'> 			 * exist.</div><div class='ctx'> 			 */</div><div class='del'>-			if (IS_ERR(dir_inode)) {</div><div class='del'>-				ret = PTR_ERR(dir_inode);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+			if (IS_ERR(dir_inode))</div><div class='add'>+				return PTR_ERR(dir_inode);</div><div class='ctx'> </div><div class='del'>-			if (!need_log_inode(trans, BTRFS_I(dir_inode))) {</div><div class='del'>-				btrfs_add_delayed_iput(BTRFS_I(dir_inode));</div><div class='add'>+			if (!need_log_inode(trans, dir_inode)) {</div><div class='add'>+				btrfs_add_delayed_iput(dir_inode);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ctx-&gt;log_new_dentries = false;</div><div class='del'>-			ret = btrfs_log_inode(trans, BTRFS_I(dir_inode),</div><div class='del'>-					      LOG_INODE_ALL, ctx);</div><div class='add'>+			ret = btrfs_log_inode(trans, dir_inode, LOG_INODE_ALL, ctx);</div><div class='ctx'> 			if (!ret &amp;&amp; ctx-&gt;log_new_dentries)</div><div class='del'>-				ret = log_new_dir_dentries(trans,</div><div class='del'>-						   BTRFS_I(dir_inode), ctx);</div><div class='del'>-			btrfs_add_delayed_iput(BTRFS_I(dir_inode));</div><div class='add'>+				ret = log_new_dir_dentries(trans, dir_inode, ctx);</div><div class='add'>+			btrfs_add_delayed_iput(dir_inode);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		path-&gt;slots[0]++;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int log_new_ancestors(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -6785,11 +7273,10 @@ static int log_new_ancestors(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;found_key, path-&gt;slots[0]);</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='del'>-		struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 		struct extent_buffer *leaf;</div><div class='ctx'> 		int slot;</div><div class='ctx'> 		struct btrfs_key search_key;</div><div class='del'>-		struct inode *inode;</div><div class='add'>+		struct btrfs_inode *inode;</div><div class='ctx'> 		u64 ino;</div><div class='ctx'> 		int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6800,15 +7287,14 @@ static int log_new_ancestors(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		search_key.objectid = found_key.offset;</div><div class='ctx'> 		search_key.type = BTRFS_INODE_ITEM_KEY;</div><div class='ctx'> 		search_key.offset = 0;</div><div class='del'>-		inode = btrfs_iget(fs_info-&gt;sb, ino, root);</div><div class='add'>+		inode = btrfs_iget_logging(ino, root);</div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='ctx'> 			return PTR_ERR(inode);</div><div class='ctx'> </div><div class='del'>-		if (BTRFS_I(inode)-&gt;generation &gt;= trans-&gt;transid &amp;&amp;</div><div class='del'>-		    need_log_inode(trans, BTRFS_I(inode)))</div><div class='del'>-			ret = btrfs_log_inode(trans, BTRFS_I(inode),</div><div class='del'>-					      LOG_INODE_EXISTS, ctx);</div><div class='del'>-		btrfs_add_delayed_iput(BTRFS_I(inode));</div><div class='add'>+		if (inode-&gt;generation &gt;= trans-&gt;transid &amp;&amp;</div><div class='add'>+		    need_log_inode(trans, inode))</div><div class='add'>+			ret = btrfs_log_inode(trans, inode, LOG_INODE_EXISTS, ctx);</div><div class='add'>+		btrfs_add_delayed_iput(inode);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -6885,7 +7371,7 @@ static int log_all_new_ancestors(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	const u64 ino = btrfs_ino(inode);</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key search_key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -6906,7 +7392,7 @@ static int log_all_new_ancestors(struct btrfs_trans_handle *trans,</div><div class='ctx'> again:</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;search_key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		path-&gt;slots[0]++;</div><div class='ctx'> </div><div class='hunk'>@@ -6918,8 +7404,8 @@ again:</div><div class='ctx'> 		if (slot &gt;= btrfs_header_nritems(leaf)) {</div><div class='ctx'> 			ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-			else if (ret &gt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6936,10 +7422,8 @@ again:</div><div class='ctx'> 		 * this loop, etc). So just return some error to fallback to</div><div class='ctx'> 		 * a transaction commit.</div><div class='ctx'> 		 */</div><div class='del'>-		if (found_key.type == BTRFS_INODE_EXTREF_KEY) {</div><div class='del'>-			ret = -EMLINK;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (found_key.type == BTRFS_INODE_EXTREF_KEY)</div><div class='add'>+			return -EMLINK;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Logging ancestors needs to do more searches on the fs/subvol</div><div class='hunk'>@@ -6951,14 +7435,11 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		ret = log_new_ancestors(trans, root, path, ctx);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -6976,33 +7457,29 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	bool log_dentries = false;</div><div class='add'>+	bool log_dentries;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_test_opt(fs_info, NOTREELOG)) {</div><div class='del'>-		ret = BTRFS_LOG_FORCE_COMMIT;</div><div class='del'>-		goto end_no_trans;</div><div class='del'>-	}</div><div class='add'>+	if (btrfs_test_opt(fs_info, NOTREELOG))</div><div class='add'>+		return BTRFS_LOG_FORCE_COMMIT;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_root_refs(&amp;root-&gt;root_item) == 0) {</div><div class='del'>-		ret = BTRFS_LOG_FORCE_COMMIT;</div><div class='del'>-		goto end_no_trans;</div><div class='del'>-	}</div><div class='add'>+	if (btrfs_root_refs(&amp;root-&gt;root_item) == 0)</div><div class='add'>+		return BTRFS_LOG_FORCE_COMMIT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Skip already logged inodes or inodes corresponding to tmpfiles</div><div class='del'>-	 * (since logging them is pointless, a link count of 0 means they</div><div class='del'>-	 * will never be accessible).</div><div class='add'>+	 * If we're logging an inode from a subvolume created in the current</div><div class='add'>+	 * transaction we must force a commit since the root is not persisted.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((btrfs_inode_in_log(inode, trans-&gt;transid) &amp;&amp;</div><div class='del'>-	     list_empty(&amp;ctx-&gt;ordered_extents)) ||</div><div class='del'>-	    inode-&gt;vfs_inode.i_nlink == 0) {</div><div class='del'>-		ret = BTRFS_NO_LOG_SYNC;</div><div class='del'>-		goto end_no_trans;</div><div class='del'>-	}</div><div class='add'>+	if (btrfs_root_generation(&amp;root-&gt;root_item) == trans-&gt;transid)</div><div class='add'>+		return BTRFS_LOG_FORCE_COMMIT;</div><div class='add'>+</div><div class='add'>+	/* Skip already logged inodes and without new extents. */</div><div class='add'>+	if (btrfs_inode_in_log(inode, trans-&gt;transid) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;ctx-&gt;ordered_extents))</div><div class='add'>+		return BTRFS_NO_LOG_SYNC;</div><div class='ctx'> </div><div class='ctx'> 	ret = start_log_trans(trans, root, ctx);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto end_no_trans;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_log_inode(trans, inode, inode_only, ctx);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -7021,8 +7498,11 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		goto end_trans;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (S_ISDIR(inode-&gt;vfs_inode.i_mode) &amp;&amp; ctx-&gt;log_new_dentries)</div><div class='del'>-		log_dentries = true;</div><div class='add'>+	/*</div><div class='add'>+	 * Track if we need to log dentries because ctx-&gt;log_new_dentries can</div><div class='add'>+	 * be modified in the call chains below.</div><div class='add'>+	 */</div><div class='add'>+	log_dentries = ctx-&gt;log_new_dentries;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On unlink we must make sure all our current and old parent directory</div><div class='hunk'>@@ -7077,8 +7557,6 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (log_dentries)</div><div class='ctx'> 		ret = log_new_dir_dentries(trans, inode, ctx);</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='ctx'> end_trans:</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='hunk'>@@ -7088,7 +7566,7 @@ end_trans:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		btrfs_remove_log_ctx(root, ctx);</div><div class='ctx'> 	btrfs_end_log_trans(root);</div><div class='del'>-end_no_trans:</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7122,8 +7600,6 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)</div><div class='ctx'> 	struct btrfs_path *path;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_root *log;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = log_root_tree-&gt;fs_info;</div><div class='ctx'> 	struct walk_control wc = {</div><div class='ctx'> 		.process_func = process_one_buffer,</div><div class='hunk'>@@ -7143,23 +7619,27 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wc.trans = trans;</div><div class='del'>-	wc.pin = 1;</div><div class='add'>+	wc.pin = true;</div><div class='add'>+	wc.log = log_root_tree;</div><div class='ctx'> </div><div class='del'>-	ret = walk_log_tree(trans, log_root_tree, &amp;wc);</div><div class='del'>-	if (ret) {</div><div class='add'>+	ret = walk_log_tree(&amp;wc);</div><div class='add'>+	wc.log = NULL;</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	key.objectid = BTRFS_TREE_LOG_OBJECTID;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='add'>+		struct btrfs_key found_key;</div><div class='add'>+</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, log_root_tree, &amp;key, path, 0, 0);</div><div class='ctx'> </div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -7174,17 +7654,22 @@ again:</div><div class='ctx'> 		if (found_key.objectid != BTRFS_TREE_LOG_OBJECTID)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		log = btrfs_read_tree_root(log_root_tree, &amp;found_key);</div><div class='del'>-		if (IS_ERR(log)) {</div><div class='del'>-			ret = PTR_ERR(log);</div><div class='add'>+		wc.log = btrfs_read_tree_root(log_root_tree, &amp;found_key);</div><div class='add'>+		if (IS_ERR(wc.log)) {</div><div class='add'>+			ret = PTR_ERR(wc.log);</div><div class='add'>+			wc.log = NULL;</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		wc.replay_dest = btrfs_get_fs_root(fs_info, found_key.offset,</div><div class='del'>-						   true);</div><div class='del'>-		if (IS_ERR(wc.replay_dest)) {</div><div class='del'>-			ret = PTR_ERR(wc.replay_dest);</div><div class='add'>+		wc.root = btrfs_get_fs_root(fs_info, found_key.offset, true);</div><div class='add'>+		if (IS_ERR(wc.root)) {</div><div class='add'>+			ret = PTR_ERR(wc.root);</div><div class='add'>+			wc.root = NULL;</div><div class='add'>+			if (unlikely(ret != -ENOENT)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We didn't find the subvol, likely because it was</div><div class='hunk'>@@ -7197,36 +7682,37 @@ again:</div><div class='ctx'> 			 * block from being modified, and we'll just bail for</div><div class='ctx'> 			 * each subsequent pass.</div><div class='ctx'> 			 */</div><div class='del'>-			if (ret == -ENOENT)</div><div class='del'>-				ret = btrfs_pin_extent_for_log_replay(trans, log-&gt;node);</div><div class='del'>-			btrfs_put_root(log);</div><div class='add'>+			ret = btrfs_pin_extent_for_log_replay(trans, wc.log-&gt;node);</div><div class='add'>+			if (unlikely(ret)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (!ret)</div><div class='del'>-				goto next;</div><div class='add'>+		wc.root-&gt;log_root = wc.log;</div><div class='add'>+		ret = btrfs_record_root_in_trans(trans, wc.root);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-			goto error;</div><div class='add'>+			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		wc.replay_dest-&gt;log_root = log;</div><div class='del'>-		ret = btrfs_record_root_in_trans(trans, wc.replay_dest);</div><div class='del'>-		if (ret)</div><div class='del'>-			/* The loop needs to continue due to the root refs */</div><div class='add'>+		ret = walk_log_tree(&amp;wc);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='del'>-		else</div><div class='del'>-			ret = walk_log_tree(trans, log, &amp;wc);</div><div class='del'>-</div><div class='del'>-		if (!ret &amp;&amp; wc.stage == LOG_WALK_REPLAY_ALL) {</div><div class='del'>-			ret = fixup_inode_link_counts(trans, wc.replay_dest,</div><div class='del'>-						      path);</div><div class='del'>-			if (ret)</div><div class='del'>-				btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!ret &amp;&amp; wc.stage == LOG_WALK_REPLAY_ALL) {</div><div class='del'>-			struct btrfs_root *root = wc.replay_dest;</div><div class='del'>-</div><div class='del'>-			btrfs_release_path(path);</div><div class='add'>+		if (wc.stage == LOG_WALK_REPLAY_ALL) {</div><div class='add'>+			struct btrfs_root *root = wc.root;</div><div class='ctx'> </div><div class='add'>+			wc.subvol_path = path;</div><div class='add'>+			ret = fixup_inode_link_counts(&amp;wc);</div><div class='add'>+			wc.subvol_path = NULL;</div><div class='add'>+			if (unlikely(ret)) {</div><div class='add'>+				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto next;</div><div class='add'>+			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We have just replayed everything, and the highest</div><div class='ctx'> 			 * objectid of fs roots probably has changed in case</div><div class='hunk'>@@ -7236,17 +7722,21 @@ again:</div><div class='ctx'> 			 * could only happen during mount.</div><div class='ctx'> 			 */</div><div class='ctx'> 			ret = btrfs_init_root_free_objectid(root);</div><div class='del'>-			if (ret)</div><div class='add'>+			if (unlikely(ret)) {</div><div class='ctx'> 				btrfs_abort_transaction(trans, ret);</div><div class='add'>+				goto next;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		wc.replay_dest-&gt;log_root = NULL;</div><div class='del'>-		btrfs_put_root(wc.replay_dest);</div><div class='del'>-		btrfs_put_root(log);</div><div class='add'>+next:</div><div class='add'>+		if (wc.root) {</div><div class='add'>+			wc.root-&gt;log_root = NULL;</div><div class='add'>+			btrfs_put_root(wc.root);</div><div class='add'>+		}</div><div class='add'>+		btrfs_put_root(wc.log);</div><div class='add'>+		wc.log = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='del'>-next:</div><div class='ctx'> 		if (found_key.offset == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		key.offset = found_key.offset - 1;</div><div class='hunk'>@@ -7255,7 +7745,7 @@ next:</div><div class='ctx'> </div><div class='ctx'> 	/* step one is to pin it all, step two is to replay just inodes */</div><div class='ctx'> 	if (wc.pin) {</div><div class='del'>-		wc.pin = 0;</div><div class='add'>+		wc.pin = false;</div><div class='ctx'> 		wc.process_func = replay_one_buffer;</div><div class='ctx'> 		wc.stage = LOG_WALK_REPLAY_INODES;</div><div class='ctx'> 		goto again;</div><div class='hunk'>@@ -7273,14 +7763,13 @@ next:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	log_root_tree-&gt;log_root = NULL;</div><div class='ctx'> 	clear_bit(BTRFS_FS_LOG_RECOVERING, &amp;fs_info-&gt;flags);</div><div class='del'>-	btrfs_put_root(log_root_tree);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> error:</div><div class='ctx'> 	if (wc.trans)</div><div class='ctx'> 		btrfs_end_transaction(wc.trans);</div><div class='add'>+	btrfs_put_root(wc.log);</div><div class='ctx'> 	clear_bit(BTRFS_FS_LOG_RECOVERING, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -7369,6 +7858,26 @@ void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Call this when creating a subvolume in a directory.</div><div class='add'>+ * Because we don't commit a transaction when creating a subvolume, we can't</div><div class='add'>+ * allow the directory pointing to the subvolume to be logged with an entry that</div><div class='add'>+ * points to an unpersisted root if we are still in the transaction used to</div><div class='add'>+ * create the subvolume, so make any attempt to log the directory to result in a</div><div class='add'>+ * full log sync.</div><div class='add'>+ * Also we don't need to worry with renames, since btrfs_rename() marks the log</div><div class='add'>+ * for full commit when renaming a subvolume.</div><div class='add'>+ *</div><div class='add'>+ * Must be called before creating the subvolume entry in its parent directory.</div><div class='add'>+ */</div><div class='add'>+void btrfs_record_new_subvolume(const struct btrfs_trans_handle *trans,</div><div class='add'>+				struct btrfs_inode *dir)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dir-&gt;log_mutex);</div><div class='add'>+	dir-&gt;last_unlink_trans = trans-&gt;transid;</div><div class='add'>+	mutex_unlock(&amp;dir-&gt;log_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Update the log after adding a new name for an inode.</div><div class='ctx'>  *</div><div class='ctx'>  * @trans:              Transaction handle.</div><div class='hunk'>@@ -7395,6 +7904,12 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	bool log_pinned = false;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* The inode has a new name (ref/extref), so make sure we log it. */</div><div class='add'>+	set_bit(BTRFS_INODE_COPY_EVERYTHING, &amp;inode-&gt;runtime_flags);</div><div class='add'>+</div><div class='add'>+	btrfs_init_log_ctx(&amp;ctx, inode);</div><div class='add'>+	ctx.logging_new_name = true;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * this will force the logging code to walk the dentry chain</div><div class='ctx'> 	 * up for the file</div><div class='hunk'>@@ -7426,6 +7941,13 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Now that we know we need to update the log, allocate the scratch eb</div><div class='add'>+	 * for the context before joining a log transaction below, as this can</div><div class='add'>+	 * take time and therefore we could delay log commits from other tasks.</div><div class='add'>+	 */</div><div class='add'>+	btrfs_init_log_ctx_scratch_eb(&amp;ctx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * If we are doing a rename (old_dir is not NULL) from a directory that</div><div class='ctx'> 	 * was previously logged, make sure that on log replay we get the old</div><div class='ctx'> 	 * dir entry deleted. This is needed because we will also log the new</div><div class='hunk'>@@ -7437,12 +7959,21 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		struct btrfs_path *path;</div><div class='ctx'> 		struct fscrypt_name fname;</div><div class='ctx'> </div><div class='del'>-		ASSERT(old_dir_index &gt;= BTRFS_DIR_START_INDEX);</div><div class='add'>+		ASSERT(old_dir_index &gt;= BTRFS_DIR_START_INDEX,</div><div class='add'>+		       "old_dir_index=%llu", old_dir_index);</div><div class='ctx'> </div><div class='ctx'> 		ret = fscrypt_setup_filename(&amp;old_dir-&gt;vfs_inode,</div><div class='ctx'> 					     &amp;old_dentry-&gt;d_name, 0, &amp;fname);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='add'>+</div><div class='add'>+		path = btrfs_alloc_path();</div><div class='add'>+		if (!path) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			fscrypt_free_filename(&amp;fname);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We have two inodes to update in the log, the old directory and</div><div class='ctx'> 		 * the inode that got renamed, so we must pin the log to prevent</div><div class='hunk'>@@ -7456,19 +7987,13 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		 * mark the log for a full commit.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (WARN_ON_ONCE(ret &lt; 0)) {</div><div class='add'>+			btrfs_free_path(path);</div><div class='ctx'> 			fscrypt_free_filename(&amp;fname);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		log_pinned = true;</div><div class='ctx'> </div><div class='del'>-		path = btrfs_alloc_path();</div><div class='del'>-		if (!path) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			fscrypt_free_filename(&amp;fname);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Other concurrent task might be logging the old directory,</div><div class='ctx'> 		 * as it can be triggered when logging other inode that had or</div><div class='hunk'>@@ -7500,8 +8025,6 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_init_log_ctx(&amp;ctx, &amp;inode-&gt;vfs_inode);</div><div class='del'>-	ctx.logging_new_name = true;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't care about the return value. If we fail to log the new name</div><div class='ctx'> 	 * then we know the next attempt to sync the log will fallback to a full</div><div class='hunk'>@@ -7522,5 +8045,6 @@ out:</div><div class='ctx'> 		btrfs_set_log_full_commit(trans);</div><div class='ctx'> 	if (log_pinned)</div><div class='ctx'> 		btrfs_end_log_trans(root);</div><div class='add'>+	free_extent_buffer(ctx.scratch_eb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h<br/>index a550a8a375cd..41e47fda036d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-log.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-log.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-log.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tree-log.h</a></div><div class='hunk'>@@ -6,10 +6,17 @@</div><div class='ctx'> #ifndef BTRFS_TREE_LOG_H</div><div class='ctx'> #define BTRFS_TREE_LOG_H</div><div class='ctx'> </div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "ctree.h"</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fscrypt.h&gt;</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> </div><div class='add'>+struct inode;</div><div class='add'>+struct dentry;</div><div class='add'>+struct btrfs_ordered_extent;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+</div><div class='ctx'> /* return value for btrfs_log_dentry_safe that means we don't need to log it at all */</div><div class='ctx'> #define BTRFS_NO_LOG_SYNC 256</div><div class='ctx'> </div><div class='hunk'>@@ -29,44 +36,27 @@ struct btrfs_log_ctx {</div><div class='ctx'> 	bool logging_new_delayed_dentries;</div><div class='ctx'> 	/* Indicate if the inode being logged was logged before. */</div><div class='ctx'> 	bool logged_before;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct btrfs_inode *inode;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	/* Only used for fast fsyncs. */</div><div class='ctx'> 	struct list_head ordered_extents;</div><div class='ctx'> 	struct list_head conflict_inodes;</div><div class='ctx'> 	int num_conflict_inodes;</div><div class='ctx'> 	bool logging_conflict_inodes;</div><div class='add'>+	/*</div><div class='add'>+	 * Used for fsyncs that need to copy items from the subvolume tree to</div><div class='add'>+	 * the log tree (full sync flag set or copy everything flag set) to</div><div class='add'>+	 * avoid allocating a temporary extent buffer while holding a lock on</div><div class='add'>+	 * an extent buffer of the subvolume tree and under the log transaction.</div><div class='add'>+	 * Also helps to avoid allocating and freeing a temporary extent buffer</div><div class='add'>+	 * in case we need to process multiple leaves from the subvolume tree.</div><div class='add'>+	 */</div><div class='add'>+	struct extent_buffer *scratch_eb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx,</div><div class='del'>-				      struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	ctx-&gt;log_ret = 0;</div><div class='del'>-	ctx-&gt;log_transid = 0;</div><div class='del'>-	ctx-&gt;log_new_dentries = false;</div><div class='del'>-	ctx-&gt;logging_new_name = false;</div><div class='del'>-	ctx-&gt;logging_new_delayed_dentries = false;</div><div class='del'>-	ctx-&gt;logged_before = false;</div><div class='del'>-	ctx-&gt;inode = inode;</div><div class='del'>-	INIT_LIST_HEAD(&amp;ctx-&gt;list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ctx-&gt;ordered_extents);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ctx-&gt;conflict_inodes);</div><div class='del'>-	ctx-&gt;num_conflict_inodes = 0;</div><div class='del'>-	ctx-&gt;logging_conflict_inodes = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void btrfs_release_log_ctx_extents(struct btrfs_log_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_ordered_extent *ordered;</div><div class='del'>-	struct btrfs_ordered_extent *tmp;</div><div class='del'>-</div><div class='del'>-	ASSERT(inode_is_locked(ctx-&gt;inode));</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(ordered, tmp, &amp;ctx-&gt;ordered_extents, log_list) {</div><div class='del'>-		list_del_init(&amp;ordered-&gt;log_list);</div><div class='del'>-		btrfs_put_ordered_extent(ordered);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx, struct btrfs_inode *inode);</div><div class='add'>+void btrfs_init_log_ctx_scratch_eb(struct btrfs_log_ctx *ctx);</div><div class='add'>+void btrfs_release_log_ctx_extents(struct btrfs_log_ctx *ctx);</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_set_log_full_commit(struct btrfs_trans_handle *trans)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,13 +79,12 @@ int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			  struct dentry *dentry,</div><div class='ctx'> 			  struct btrfs_log_ctx *ctx);</div><div class='ctx'> void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,</div><div class='del'>-				  struct btrfs_root *root,</div><div class='ctx'> 				  const struct fscrypt_str *name,</div><div class='ctx'> 				  struct btrfs_inode *dir, u64 index);</div><div class='ctx'> void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,</div><div class='del'>-				struct btrfs_root *root,</div><div class='ctx'> 				const struct fscrypt_str *name,</div><div class='del'>-				struct btrfs_inode *inode, u64 dirid);</div><div class='add'>+				struct btrfs_inode *inode,</div><div class='add'>+				struct btrfs_inode *dir);</div><div class='ctx'> void btrfs_end_log_trans(struct btrfs_root *root);</div><div class='ctx'> void btrfs_pin_log_trans(struct btrfs_root *root);</div><div class='ctx'> void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -103,6 +92,8 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			     bool for_rename);</div><div class='ctx'> void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				   struct btrfs_inode *dir);</div><div class='add'>+void btrfs_record_new_subvolume(const struct btrfs_trans_handle *trans,</div><div class='add'>+				struct btrfs_inode *dir);</div><div class='ctx'> void btrfs_log_new_name(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			struct dentry *old_dentry, struct btrfs_inode *old_dir,</div><div class='ctx'> 			u64 old_dir_index, struct dentry *parent);</div><div class='head'>diff --git a/fs/btrfs/tree-mod-log.c b/fs/btrfs/tree-mod-log.c<br/>index 3df6153d5d5a..9e8cb3b7c064 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-mod-log.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-mod-log.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-mod-log.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tree-mod-log.c</a></div><div class='hunk'>@@ -27,24 +27,35 @@ struct tree_mod_elem {</div><div class='ctx'> 	/* This is used for BTRFS_MOD_LOG_KEY* and BTRFS_MOD_LOG_ROOT_REPLACE. */</div><div class='ctx'> 	u64 generation;</div><div class='ctx'> </div><div class='del'>-	/* Those are used for op == BTRFS_MOD_LOG_KEY_{REPLACE,REMOVE}. */</div><div class='del'>-	struct btrfs_disk_key key;</div><div class='del'>-	u64 blockptr;</div><div class='del'>-</div><div class='del'>-	/* This is used for op == BTRFS_MOD_LOG_MOVE_KEYS. */</div><div class='del'>-	struct {</div><div class='del'>-		int dst_slot;</div><div class='del'>-		int nr_items;</div><div class='del'>-	} move;</div><div class='del'>-</div><div class='del'>-	/* This is used for op == BTRFS_MOD_LOG_ROOT_REPLACE. */</div><div class='del'>-	struct tree_mod_root old_root;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * This is used for the following op types:</div><div class='add'>+		 *</div><div class='add'>+		 *    BTRFS_MOD_LOG_KEY_REMOVE_WHILE_FREEING</div><div class='add'>+		 *    BTRFS_MOD_LOG_KEY_REMOVE_WHILE_MOVING</div><div class='add'>+		 *    BTRFS_MOD_LOG_KEY_REMOVE</div><div class='add'>+		 *    BTRFS_MOD_LOG_KEY_REPLACE</div><div class='add'>+		 */</div><div class='add'>+		struct {</div><div class='add'>+			struct btrfs_disk_key key;</div><div class='add'>+			u64 blockptr;</div><div class='add'>+		} slot_change;</div><div class='add'>+</div><div class='add'>+		/* This is used for op == BTRFS_MOD_LOG_MOVE_KEYS. */</div><div class='add'>+		struct {</div><div class='add'>+			int dst_slot;</div><div class='add'>+			int nr_items;</div><div class='add'>+		} move;</div><div class='add'>+</div><div class='add'>+		/* This is used for op == BTRFS_MOD_LOG_ROOT_REPLACE. */</div><div class='add'>+		struct tree_mod_root old_root;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Pull a new tree mod seq number for our operation.</div><div class='ctx'>  */</div><div class='del'>-static inline u64 btrfs_inc_tree_mod_seq(struct btrfs_fs_info *fs_info)</div><div class='add'>+static u64 btrfs_inc_tree_mod_seq(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic64_inc_return(&amp;fs_info-&gt;tree_mod_seq);</div><div class='ctx'> }</div><div class='hunk'>@@ -164,18 +175,41 @@ static noinline int tree_mod_log_insert(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool skip_eb_logging(const struct extent_buffer *eb)</div><div class='add'>+{</div><div class='add'>+	const u64 owner = btrfs_header_owner(eb);</div><div class='add'>+</div><div class='add'>+	if (btrfs_header_level(eb) == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tree mod logging exists so that there's a consistent view of the</div><div class='add'>+	 * extents and backrefs of inodes even if while a task is iterating over</div><div class='add'>+	 * them other tasks are modifying subvolume trees and the extent tree</div><div class='add'>+	 * (including running delayed refs). So we only need to log extent</div><div class='add'>+	 * buffers from the extent tree and subvolume trees.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (owner == BTRFS_EXTENT_TREE_OBJECTID)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (btrfs_is_fstree(owner))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Determines if logging can be omitted. Returns true if it can. Otherwise, it</div><div class='ctx'>  * returns false with the tree_mod_log_lock acquired. The caller must hold</div><div class='ctx'>  * this until all tree mod log insertions are recorded in the rb tree and then</div><div class='ctx'>  * write unlock fs_info::tree_mod_log_lock.</div><div class='ctx'>  */</div><div class='del'>-static inline bool tree_mod_dont_log(struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct extent_buffer *eb)</div><div class='add'>+static bool tree_mod_dont_log(struct btrfs_fs_info *fs_info, const struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(BTRFS_FS_TREE_MOD_LOG_USERS, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		return true;</div><div class='del'>-	if (eb &amp;&amp; btrfs_header_level(eb) == 0)</div><div class='add'>+	if (eb &amp;&amp; skip_eb_logging(eb))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;fs_info-&gt;tree_mod_log_lock);</div><div class='hunk'>@@ -188,32 +222,34 @@ static inline bool tree_mod_dont_log(struct btrfs_fs_info *fs_info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Similar to tree_mod_dont_log, but doesn't acquire any locks. */</div><div class='del'>-static inline bool tree_mod_need_log(const struct btrfs_fs_info *fs_info,</div><div class='del'>-				    struct extent_buffer *eb)</div><div class='add'>+static bool tree_mod_need_log(const struct btrfs_fs_info *fs_info,</div><div class='add'>+			      const struct extent_buffer *eb)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(BTRFS_FS_TREE_MOD_LOG_USERS, &amp;fs_info-&gt;flags))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (eb &amp;&amp; btrfs_header_level(eb) == 0)</div><div class='add'>+	if (eb &amp;&amp; skip_eb_logging(eb))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct tree_mod_elem *alloc_tree_mod_elem(struct extent_buffer *eb,</div><div class='add'>+static struct tree_mod_elem *alloc_tree_mod_elem(const struct extent_buffer *eb,</div><div class='ctx'> 						 int slot,</div><div class='ctx'> 						 enum btrfs_mod_log_op op)</div><div class='ctx'> {</div><div class='ctx'> 	struct tree_mod_elem *tm;</div><div class='ctx'> </div><div class='add'>+	/* Can't be one of these types, due to union in struct tree_mod_elem. */</div><div class='add'>+	ASSERT(op != BTRFS_MOD_LOG_MOVE_KEYS);</div><div class='add'>+	ASSERT(op != BTRFS_MOD_LOG_ROOT_REPLACE);</div><div class='add'>+</div><div class='ctx'> 	tm = kzalloc(sizeof(*tm), GFP_NOFS);</div><div class='ctx'> 	if (!tm)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	tm-&gt;logical = eb-&gt;start;</div><div class='del'>-	if (op != BTRFS_MOD_LOG_KEY_ADD) {</div><div class='del'>-		btrfs_node_key(eb, &amp;tm-&gt;key, slot);</div><div class='del'>-		tm-&gt;blockptr = btrfs_node_blockptr(eb, slot);</div><div class='del'>-	}</div><div class='add'>+	btrfs_node_key(eb, &amp;tm-&gt;slot_change.key, slot);</div><div class='add'>+	tm-&gt;slot_change.blockptr = btrfs_node_blockptr(eb, slot);</div><div class='ctx'> 	tm-&gt;op = op;</div><div class='ctx'> 	tm-&gt;slot = slot;</div><div class='ctx'> 	tm-&gt;generation = btrfs_node_ptr_generation(eb, slot);</div><div class='hunk'>@@ -222,7 +258,7 @@ static struct tree_mod_elem *alloc_tree_mod_elem(struct extent_buffer *eb,</div><div class='ctx'> 	return tm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_tree_mod_log_insert_key(struct extent_buffer *eb, int slot,</div><div class='add'>+int btrfs_tree_mod_log_insert_key(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 				  enum btrfs_mod_log_op op)</div><div class='ctx'> {</div><div class='ctx'> 	struct tree_mod_elem *tm;</div><div class='hunk'>@@ -259,7 +295,7 @@ out_unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct tree_mod_elem *tree_mod_log_alloc_move(struct extent_buffer *eb,</div><div class='add'>+static struct tree_mod_elem *tree_mod_log_alloc_move(const struct extent_buffer *eb,</div><div class='ctx'> 						     int dst_slot, int src_slot,</div><div class='ctx'> 						     int nr_items)</div><div class='ctx'> {</div><div class='hunk'>@@ -279,7 +315,7 @@ static struct tree_mod_elem *tree_mod_log_alloc_move(struct extent_buffer *eb,</div><div class='ctx'> 	return tm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_tree_mod_log_insert_move(struct extent_buffer *eb,</div><div class='add'>+int btrfs_tree_mod_log_insert_move(const struct extent_buffer *eb,</div><div class='ctx'> 				   int dst_slot, int src_slot,</div><div class='ctx'> 				   int nr_items)</div><div class='ctx'> {</div><div class='hunk'>@@ -367,9 +403,9 @@ free_tms:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int tree_mod_log_free_eb(struct btrfs_fs_info *fs_info,</div><div class='del'>-				       struct tree_mod_elem **tm_list,</div><div class='del'>-				       int nritems)</div><div class='add'>+static int tree_mod_log_free_eb(struct btrfs_fs_info *fs_info,</div><div class='add'>+				struct tree_mod_elem **tm_list,</div><div class='add'>+				int nritems)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -536,7 +572,7 @@ static struct tree_mod_elem *tree_mod_log_search(struct btrfs_fs_info *fs_info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_tree_mod_log_eb_copy(struct extent_buffer *dst,</div><div class='del'>-			       struct extent_buffer *src,</div><div class='add'>+			       const struct extent_buffer *src,</div><div class='ctx'> 			       unsigned long dst_offset,</div><div class='ctx'> 			       unsigned long src_offset,</div><div class='ctx'> 			       int nr_items)</div><div class='hunk'>@@ -831,8 +867,8 @@ static void tree_mod_log_rewind(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			fallthrough;</div><div class='ctx'> 		case BTRFS_MOD_LOG_KEY_REMOVE_WHILE_MOVING:</div><div class='ctx'> 		case BTRFS_MOD_LOG_KEY_REMOVE:</div><div class='del'>-			btrfs_set_node_key(eb, &amp;tm-&gt;key, tm-&gt;slot);</div><div class='del'>-			btrfs_set_node_blockptr(eb, tm-&gt;slot, tm-&gt;blockptr);</div><div class='add'>+			btrfs_set_node_key(eb, &amp;tm-&gt;slot_change.key, tm-&gt;slot);</div><div class='add'>+			btrfs_set_node_blockptr(eb, tm-&gt;slot, tm-&gt;slot_change.blockptr);</div><div class='ctx'> 			btrfs_set_node_ptr_generation(eb, tm-&gt;slot,</div><div class='ctx'> 						      tm-&gt;generation);</div><div class='ctx'> 			n++;</div><div class='hunk'>@@ -841,8 +877,8 @@ static void tree_mod_log_rewind(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BTRFS_MOD_LOG_KEY_REPLACE:</div><div class='ctx'> 			BUG_ON(tm-&gt;slot &gt;= n);</div><div class='del'>-			btrfs_set_node_key(eb, &amp;tm-&gt;key, tm-&gt;slot);</div><div class='del'>-			btrfs_set_node_blockptr(eb, tm-&gt;slot, tm-&gt;blockptr);</div><div class='add'>+			btrfs_set_node_key(eb, &amp;tm-&gt;slot_change.key, tm-&gt;slot);</div><div class='add'>+			btrfs_set_node_blockptr(eb, tm-&gt;slot, tm-&gt;slot_change.blockptr);</div><div class='ctx'> 			btrfs_set_node_ptr_generation(eb, tm-&gt;slot,</div><div class='ctx'> 						      tm-&gt;generation);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -910,7 +946,6 @@ static void tree_mod_log_rewind(struct btrfs_fs_info *fs_info,</div><div class='ctx'>  * is freed (its refcount is decremented).</div><div class='ctx'>  */</div><div class='ctx'> struct extent_buffer *btrfs_tree_mod_log_rewind(struct btrfs_fs_info *fs_info,</div><div class='del'>-						struct btrfs_path *path,</div><div class='ctx'> 						struct extent_buffer *eb,</div><div class='ctx'> 						u64 time_seq)</div><div class='ctx'> {</div><div class='hunk'>@@ -1005,7 +1040,7 @@ struct extent_buffer *btrfs_get_old_root(struct btrfs_root *root, u64 time_seq)</div><div class='ctx'> 		free_extent_buffer(eb_root);</div><div class='ctx'> </div><div class='ctx'> 		check.level = level;</div><div class='del'>-		check.owner_root = root-&gt;root_key.objectid;</div><div class='add'>+		check.owner_root = btrfs_root_id(root);</div><div class='ctx'> </div><div class='ctx'> 		old = read_tree_block(fs_info, logical, &amp;check);</div><div class='ctx'> 		if (WARN_ON(IS_ERR(old) || !extent_buffer_uptodate(old))) {</div><div class='head'>diff --git a/fs/btrfs/tree-mod-log.h b/fs/btrfs/tree-mod-log.h<br/>index 94f10afeee97..1c12566040db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-mod-log.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/tree-mod-log.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/tree-mod-log.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/tree-mod-log.h</a></div><div class='hunk'>@@ -3,7 +3,13 @@</div><div class='ctx'> #ifndef BTRFS_TREE_MOD_LOG_H</div><div class='ctx'> #define BTRFS_TREE_MOD_LOG_H</div><div class='ctx'> </div><div class='del'>-#include "ctree.h"</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_path;</div><div class='add'>+struct btrfs_root;</div><div class='add'>+struct btrfs_seq_list;</div><div class='ctx'> </div><div class='ctx'> /* Represents a tree mod log user. */</div><div class='ctx'> struct btrfs_seq_list {</div><div class='hunk'>@@ -31,21 +37,20 @@ void btrfs_put_tree_mod_seq(struct btrfs_fs_info *fs_info,</div><div class='ctx'> int btrfs_tree_mod_log_insert_root(struct extent_buffer *old_root,</div><div class='ctx'> 				   struct extent_buffer *new_root,</div><div class='ctx'> 				   bool log_removal);</div><div class='del'>-int btrfs_tree_mod_log_insert_key(struct extent_buffer *eb, int slot,</div><div class='add'>+int btrfs_tree_mod_log_insert_key(const struct extent_buffer *eb, int slot,</div><div class='ctx'> 				  enum btrfs_mod_log_op op);</div><div class='ctx'> int btrfs_tree_mod_log_free_eb(struct extent_buffer *eb);</div><div class='ctx'> struct extent_buffer *btrfs_tree_mod_log_rewind(struct btrfs_fs_info *fs_info,</div><div class='del'>-						struct btrfs_path *path,</div><div class='ctx'> 						struct extent_buffer *eb,</div><div class='ctx'> 						u64 time_seq);</div><div class='ctx'> struct extent_buffer *btrfs_get_old_root(struct btrfs_root *root, u64 time_seq);</div><div class='ctx'> int btrfs_old_root_level(struct btrfs_root *root, u64 time_seq);</div><div class='ctx'> int btrfs_tree_mod_log_eb_copy(struct extent_buffer *dst,</div><div class='del'>-			       struct extent_buffer *src,</div><div class='add'>+			       const struct extent_buffer *src,</div><div class='ctx'> 			       unsigned long dst_offset,</div><div class='ctx'> 			       unsigned long src_offset,</div><div class='ctx'> 			       int nr_items);</div><div class='del'>-int btrfs_tree_mod_log_insert_move(struct extent_buffer *eb,</div><div class='add'>+int btrfs_tree_mod_log_insert_move(const struct extent_buffer *eb,</div><div class='ctx'> 				   int dst_slot, int src_slot,</div><div class='ctx'> 				   int nr_items);</div><div class='ctx'> u64 btrfs_tree_mod_log_lowest_seq(struct btrfs_fs_info *fs_info);</div><div class='head'>diff --git a/fs/btrfs/ulist.c b/fs/btrfs/ulist.c<br/>index b4ac2b0cd235..7e16a253fb35 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ulist.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ulist.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ulist.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ulist.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ulist.h"</div><div class='del'>-#include "ctree.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ulist is a generic data structure to hold a collection of unique u64</div><div class='hunk'>@@ -51,6 +50,7 @@ void ulist_init(struct ulist *ulist)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ulist-&gt;nodes);</div><div class='ctx'> 	ulist-&gt;root = RB_ROOT;</div><div class='ctx'> 	ulist-&gt;nnodes = 0;</div><div class='add'>+	ulist-&gt;prealloc = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -69,6 +69,8 @@ void ulist_release(struct ulist *ulist)</div><div class='ctx'> 	list_for_each_entry_safe(node, next, &amp;ulist-&gt;nodes, list) {</div><div class='ctx'> 		kfree(node);</div><div class='ctx'> 	}</div><div class='add'>+	kfree(ulist-&gt;prealloc);</div><div class='add'>+	ulist-&gt;prealloc = NULL;</div><div class='ctx'> 	ulist-&gt;root = RB_ROOT;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ulist-&gt;nodes);</div><div class='ctx'> }</div><div class='hunk'>@@ -106,6 +108,12 @@ struct ulist *ulist_alloc(gfp_t gfp_mask)</div><div class='ctx'> 	return ulist;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ulist_prealloc(struct ulist *ulist, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	if (!ulist-&gt;prealloc)</div><div class='add'>+		ulist-&gt;prealloc = kzalloc(sizeof(*ulist-&gt;prealloc), gfp_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Free dynamically allocated ulist.</div><div class='ctx'>  *</div><div class='hunk'>@@ -121,21 +129,25 @@ void ulist_free(struct ulist *ulist)</div><div class='ctx'> 	kfree(ulist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ulist_node_val_key_cmp(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 *val = key;</div><div class='add'>+	const struct ulist_node *unode = rb_entry(node, struct ulist_node, rb_node);</div><div class='add'>+</div><div class='add'>+	if (unode-&gt;val &lt; *val)</div><div class='add'>+		return 1;</div><div class='add'>+	else if (unode-&gt;val &gt; *val)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ulist_node *ulist_rbtree_search(struct ulist *ulist, u64 val)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n = ulist-&gt;root.rb_node;</div><div class='del'>-	struct ulist_node *u = NULL;</div><div class='del'>-</div><div class='del'>-	while (n) {</div><div class='del'>-		u = rb_entry(n, struct ulist_node, rb_node);</div><div class='del'>-		if (u-&gt;val &lt; val)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else if (u-&gt;val &gt; val)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return u;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	node = rb_find(&amp;val, &amp;ulist-&gt;root, ulist_node_val_key_cmp);</div><div class='add'>+	return rb_entry_safe(node, struct ulist_node, rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ulist_rbtree_erase(struct ulist *ulist, struct ulist_node *node)</div><div class='hunk'>@@ -147,25 +159,20 @@ static void ulist_rbtree_erase(struct ulist *ulist, struct ulist_node *node)</div><div class='ctx'> 	ulist-&gt;nnodes--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ulist_node_val_cmp(struct rb_node *new, const struct rb_node *existing)</div><div class='add'>+{</div><div class='add'>+	const struct ulist_node *unode = rb_entry(new, struct ulist_node, rb_node);</div><div class='add'>+</div><div class='add'>+	return ulist_node_val_key_cmp(&amp;unode-&gt;val, existing);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ulist_rbtree_insert(struct ulist *ulist, struct ulist_node *ins)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p = &amp;ulist-&gt;root.rb_node;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	struct ulist_node *cur = NULL;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		parent = *p;</div><div class='del'>-		cur = rb_entry(parent, struct ulist_node, rb_node);</div><div class='del'>-</div><div class='del'>-		if (cur-&gt;val &lt; ins-&gt;val)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else if (cur-&gt;val &gt; ins-&gt;val)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-	rb_link_node(&amp;ins-&gt;rb_node, parent, p);</div><div class='del'>-	rb_insert_color(&amp;ins-&gt;rb_node, &amp;ulist-&gt;root);</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	node = rb_find_add(&amp;ins-&gt;rb_node, &amp;ulist-&gt;root, ulist_node_val_cmp);</div><div class='add'>+	if (node)</div><div class='add'>+		return -EEXIST;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -207,9 +214,15 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,</div><div class='ctx'> 			*old_aux = node-&gt;aux;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	node = kmalloc(sizeof(*node), gfp_mask);</div><div class='del'>-	if (!node)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (ulist-&gt;prealloc) {</div><div class='add'>+		node = ulist-&gt;prealloc;</div><div class='add'>+		ulist-&gt;prealloc = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		node = kmalloc(sizeof(*node), gfp_mask);</div><div class='add'>+		if (!node)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;val = val;</div><div class='ctx'> 	node-&gt;aux = aux;</div><div class='head'>diff --git a/fs/btrfs/ulist.h b/fs/btrfs/ulist.h<br/>index b2cef187ea8e..c62a372f1462 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ulist.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/ulist.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/ulist.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/ulist.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #ifndef BTRFS_ULIST_H</div><div class='ctx'> #define BTRFS_ULIST_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -40,12 +41,14 @@ struct ulist {</div><div class='ctx'> </div><div class='ctx'> 	struct list_head nodes;</div><div class='ctx'> 	struct rb_root root;</div><div class='add'>+	struct ulist_node *prealloc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void ulist_init(struct ulist *ulist);</div><div class='ctx'> void ulist_release(struct ulist *ulist);</div><div class='ctx'> void ulist_reinit(struct ulist *ulist);</div><div class='ctx'> struct ulist *ulist_alloc(gfp_t gfp_mask);</div><div class='add'>+void ulist_prealloc(struct ulist *ulist, gfp_t mask);</div><div class='ctx'> void ulist_free(struct ulist *ulist);</div><div class='ctx'> int ulist_add(struct ulist *ulist, u64 val, u64 aux, gfp_t gfp_mask);</div><div class='ctx'> int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,</div><div class='head'>diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c<br/>index 5be74f9e47eb..e3a1310fa7d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/uuid-tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/uuid-tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/uuid-tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/uuid-tree.c</a></div><div class='hunk'>@@ -3,18 +3,19 @@</div><div class='ctx'>  * Copyright (C) STRATO AG 2013.  All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "transaction.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "uuid-tree.h"</div><div class='add'>+#include "ioctl.h"</div><div class='ctx'> </div><div class='del'>-static void btrfs_uuid_to_key(u8 *uuid, u8 type, struct btrfs_key *key)</div><div class='add'>+static void btrfs_uuid_to_key(const u8 *uuid, u8 type, struct btrfs_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	key-&gt;type = type;</div><div class='ctx'> 	key-&gt;objectid = get_unaligned_le64(uuid);</div><div class='hunk'>@@ -22,36 +23,30 @@ static void btrfs_uuid_to_key(u8 *uuid, u8 type, struct btrfs_key *key)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* return -ENOENT for !found, &lt; 0 for errors, or 0 if an item was found */</div><div class='del'>-static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid,</div><div class='add'>+static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, const u8 *uuid,</div><div class='ctx'> 				  u8 type, u64 subid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	u32 item_size;</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!uuid_root)) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON_ONCE(!uuid_root))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_uuid_to_key(uuid, type, &amp;key);</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, uuid_root, &amp;key, path, 0, 0);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	eb = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -63,7 +58,7 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid,</div><div class='ctx'> 		btrfs_warn(uuid_root-&gt;fs_info,</div><div class='ctx'> 			   "uuid item with illegal size %lu!",</div><div class='ctx'> 			   (unsigned long)item_size);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (item_size) {</div><div class='ctx'> 		__le64 data;</div><div class='hunk'>@@ -77,18 +72,16 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid,</div><div class='ctx'> 		item_size -= sizeof(data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='add'>+int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, const u8 *uuid, u8 type,</div><div class='ctx'> 			u64 subid_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *uuid_root = fs_info-&gt;uuid_root;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -99,22 +92,18 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='ctx'> 	if (ret != -ENOENT)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!uuid_root)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON_ONCE(!uuid_root))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_uuid_to_key(uuid, type, &amp;key);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_insert_empty_item(trans, uuid_root, path, &amp;key,</div><div class='ctx'> 				      sizeof(subid_le));</div><div class='del'>-	if (ret &gt;= 0) {</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 		/* Add an item for the type for the first time */</div><div class='ctx'> 		eb = path-&gt;nodes[0];</div><div class='ctx'> 		slot = path-&gt;slots[0];</div><div class='hunk'>@@ -133,26 +122,21 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='ctx'> 		btrfs_warn(fs_info,</div><div class='ctx'> 			   "insert uuid item failed %d (0x%016llx, 0x%016llx) type %u!",</div><div class='ctx'> 			   ret, key.objectid, key.offset, type);</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='ctx'> 	subid_le = cpu_to_le64(subid_cpu);</div><div class='ctx'> 	write_extent_buffer(eb, &amp;subid_le, offset, sizeof(subid_le));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, eb);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='add'>+int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, const u8 *uuid, u8 type,</div><div class='ctx'> 			u64 subid)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *uuid_root = fs_info-&gt;uuid_root;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -162,29 +146,23 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='ctx'> 	unsigned long move_src;</div><div class='ctx'> 	unsigned long move_len;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!uuid_root)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON_ONCE(!uuid_root))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_uuid_to_key(uuid, type, &amp;key);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, uuid_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		btrfs_warn(fs_info, "error %d while searching for uuid item!",</div><div class='ctx'> 			   ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	eb = path-&gt;nodes[0];</div><div class='ctx'> 	slot = path-&gt;slots[0];</div><div class='hunk'>@@ -193,8 +171,7 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='ctx'> 	if (!IS_ALIGNED(item_size, sizeof(u64))) {</div><div class='ctx'> 		btrfs_warn(fs_info, "uuid item with illegal size %lu!",</div><div class='ctx'> 			   (unsigned long)item_size);</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (item_size) {</div><div class='ctx'> 		__le64 read_subid;</div><div class='hunk'>@@ -206,16 +183,12 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='ctx'> 		item_size -= sizeof(read_subid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!item_size) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!item_size)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	item_size = btrfs_item_size(eb, slot);</div><div class='del'>-	if (item_size == sizeof(subid)) {</div><div class='del'>-		ret = btrfs_del_item(trans, uuid_root, path);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (item_size == sizeof(subid))</div><div class='add'>+		return btrfs_del_item(trans, uuid_root, path);</div><div class='ctx'> </div><div class='ctx'> 	move_dst = offset;</div><div class='ctx'> 	move_src = offset + sizeof(subid);</div><div class='hunk'>@@ -223,9 +196,7 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='ctx'> 	memmove_extent_buffer(eb, move_dst, move_src, move_len);</div><div class='ctx'> 	btrfs_truncate_item(trans, path, item_size - sizeof(subid), 1);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_uuid_iter_rem(struct btrfs_root *uuid_root, u8 *uuid, u8 type,</div><div class='hunk'>@@ -257,7 +228,7 @@ out:</div><div class='ctx'>  * &lt; 0	if an error occurred</div><div class='ctx'>  */</div><div class='ctx'> static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info,</div><div class='del'>-				       u8 *uuid, u8 type, u64 subvolid)</div><div class='add'>+				       const u8 *uuid, u8 type, u64 subvolid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct btrfs_root *subvol_root;</div><div class='hunk'>@@ -294,7 +265,7 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;uuid_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	int slot;</div><div class='hunk'>@@ -302,10 +273,8 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = 0;</div><div class='ctx'> 	key.type = 0;</div><div class='hunk'>@@ -313,17 +282,15 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> again_search_slot:</div><div class='ctx'> 	ret = btrfs_search_forward(root, &amp;key, path, BTRFS_OLDEST_GENERATION);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (btrfs_fs_closing(fs_info)) {</div><div class='del'>-			ret = -EINTR;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (btrfs_fs_closing(fs_info))</div><div class='add'>+			return -EINTR;</div><div class='add'>+</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		slot = path-&gt;slots[0];</div><div class='hunk'>@@ -354,7 +321,7 @@ again_search_slot:</div><div class='ctx'> 			ret = btrfs_check_uuid_tree_entry(fs_info, uuid,</div><div class='ctx'> 							  key.type, subid_cpu);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='add'>+				return ret;</div><div class='ctx'> 			if (ret &gt; 0) {</div><div class='ctx'> 				btrfs_release_path(path);</div><div class='ctx'> 				ret = btrfs_uuid_iter_rem(root, uuid, key.type,</div><div class='hunk'>@@ -370,7 +337,7 @@ again_search_slot:</div><div class='ctx'> 					goto again_search_slot;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (ret &lt; 0 &amp;&amp; ret != -ENOENT)</div><div class='del'>-					goto out;</div><div class='add'>+					return ret;</div><div class='ctx'> 				key.offset++;</div><div class='ctx'> 				goto again_search_slot;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -387,7 +354,182 @@ skip:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_uuid_scan_kthread(void *data)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = data;</div><div class='add'>+	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='add'>+	struct btrfs_key key;</div><div class='add'>+	struct btrfs_path *path = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct extent_buffer *eb;</div><div class='add'>+	int slot;</div><div class='add'>+	struct btrfs_root_item root_item;</div><div class='add'>+	u32 item_size;</div><div class='add'>+	struct btrfs_trans_handle *trans = NULL;</div><div class='add'>+	bool closing = false;</div><div class='add'>+</div><div class='add'>+	path = btrfs_alloc_path();</div><div class='add'>+	if (!path) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key.objectid = 0;</div><div class='add'>+	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+	key.offset = 0;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (btrfs_fs_closing(fs_info)) {</div><div class='add'>+			closing = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = btrfs_search_forward(root, &amp;key, path,</div><div class='add'>+				BTRFS_OLDEST_GENERATION);</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret &gt; 0)</div><div class='add'>+				ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key.type != BTRFS_ROOT_ITEM_KEY ||</div><div class='add'>+		    (key.objectid &lt; BTRFS_FIRST_FREE_OBJECTID &amp;&amp;</div><div class='add'>+		     key.objectid != BTRFS_FS_TREE_OBJECTID) ||</div><div class='add'>+		    key.objectid &gt; BTRFS_LAST_FREE_OBJECTID)</div><div class='add'>+			goto skip;</div><div class='add'>+</div><div class='add'>+		eb = path-&gt;nodes[0];</div><div class='add'>+		slot = path-&gt;slots[0];</div><div class='add'>+		item_size = btrfs_item_size(eb, slot);</div><div class='add'>+		if (item_size &lt; sizeof(root_item))</div><div class='add'>+			goto skip;</div><div class='add'>+</div><div class='add'>+		read_extent_buffer(eb, &amp;root_item,</div><div class='add'>+				   btrfs_item_ptr_offset(eb, slot),</div><div class='add'>+				   (int)sizeof(root_item));</div><div class='add'>+		if (btrfs_root_refs(&amp;root_item) == 0)</div><div class='add'>+			goto skip;</div><div class='add'>+</div><div class='add'>+		if (!btrfs_is_empty_uuid(root_item.uuid) ||</div><div class='add'>+		    !btrfs_is_empty_uuid(root_item.received_uuid)) {</div><div class='add'>+			if (trans)</div><div class='add'>+				goto update_tree;</div><div class='add'>+</div><div class='add'>+			btrfs_release_path(path);</div><div class='add'>+			/*</div><div class='add'>+			 * 1 - subvol uuid item</div><div class='add'>+			 * 1 - received_subvol uuid item</div><div class='add'>+			 */</div><div class='add'>+			trans = btrfs_start_transaction(fs_info-&gt;uuid_root, 2);</div><div class='add'>+			if (IS_ERR(trans)) {</div><div class='add'>+				ret = PTR_ERR(trans);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		} else {</div><div class='add'>+			goto skip;</div><div class='add'>+		}</div><div class='add'>+update_tree:</div><div class='add'>+		btrfs_release_path(path);</div><div class='add'>+		if (!btrfs_is_empty_uuid(root_item.uuid)) {</div><div class='add'>+			ret = btrfs_uuid_tree_add(trans, root_item.uuid,</div><div class='add'>+						  BTRFS_UUID_KEY_SUBVOL,</div><div class='add'>+						  key.objectid);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				btrfs_warn(fs_info, "uuid_tree_add failed %d",</div><div class='add'>+					ret);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!btrfs_is_empty_uuid(root_item.received_uuid)) {</div><div class='add'>+			ret = btrfs_uuid_tree_add(trans,</div><div class='add'>+						  root_item.received_uuid,</div><div class='add'>+						 BTRFS_UUID_KEY_RECEIVED_SUBVOL,</div><div class='add'>+						  key.objectid);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				btrfs_warn(fs_info, "uuid_tree_add failed %d",</div><div class='add'>+					ret);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+		btrfs_release_path(path);</div><div class='add'>+		if (trans) {</div><div class='add'>+			ret = btrfs_end_transaction(trans);</div><div class='add'>+			trans = NULL;</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key.offset &lt; (u64)-1) {</div><div class='add'>+			key.offset++;</div><div class='add'>+		} else if (key.type &lt; BTRFS_ROOT_ITEM_KEY) {</div><div class='add'>+			key.offset = 0;</div><div class='add'>+			key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+		} else if (key.objectid &lt; (u64)-1) {</div><div class='add'>+			key.offset = 0;</div><div class='add'>+			key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='add'>+			key.objectid++;</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	if (trans &amp;&amp; !IS_ERR(trans))</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		btrfs_warn(fs_info, "btrfs_uuid_scan_kthread failed %d", ret);</div><div class='add'>+	else if (!closing)</div><div class='add'>+		set_bit(BTRFS_FS_UPDATE_UUID_TREE_GEN, &amp;fs_info-&gt;flags);</div><div class='add'>+	up(&amp;fs_info-&gt;uuid_tree_rescan_sem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_trans_handle *trans;</div><div class='add'>+	struct btrfs_root *tree_root = fs_info-&gt;tree_root;</div><div class='add'>+	struct btrfs_root *uuid_root;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1 - root node</div><div class='add'>+	 * 1 - root item</div><div class='add'>+	 */</div><div class='add'>+	trans = btrfs_start_transaction(tree_root, 2);</div><div class='add'>+	if (IS_ERR(trans))</div><div class='add'>+		return PTR_ERR(trans);</div><div class='add'>+</div><div class='add'>+	uuid_root = btrfs_create_tree(trans, BTRFS_UUID_TREE_OBJECTID);</div><div class='add'>+	if (IS_ERR(uuid_root)) {</div><div class='add'>+		ret = PTR_ERR(uuid_root);</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		btrfs_end_transaction(trans);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fs_info-&gt;uuid_root = uuid_root;</div><div class='add'>+</div><div class='add'>+	ret = btrfs_commit_transaction(trans);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	down(&amp;fs_info-&gt;uuid_tree_rescan_sem);</div><div class='add'>+	task = kthread_run(btrfs_uuid_scan_kthread, fs_info, "btrfs-uuid");</div><div class='add'>+	if (IS_ERR(task)) {</div><div class='add'>+		/* fs_info-&gt;update_uuid_tree_gen remains 0 in all error case */</div><div class='add'>+		btrfs_warn(fs_info, "failed to start uuid_scan task");</div><div class='add'>+		up(&amp;fs_info-&gt;uuid_tree_rescan_sem);</div><div class='add'>+		return PTR_ERR(task);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/btrfs/uuid-tree.h b/fs/btrfs/uuid-tree.h<br/>index 5350c87fe2ca..c60ad20325cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/uuid-tree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/uuid-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/uuid-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/uuid-tree.h</a></div><div class='hunk'>@@ -3,10 +3,17 @@</div><div class='ctx'> #ifndef BTRFS_UUID_TREE_H</div><div class='ctx'> #define BTRFS_UUID_TREE_H</div><div class='ctx'> </div><div class='del'>-int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+</div><div class='add'>+int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, const u8 *uuid, u8 type,</div><div class='ctx'> 			u64 subid);</div><div class='del'>-int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,</div><div class='add'>+int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, const u8 *uuid, u8 type,</div><div class='ctx'> 			u64 subid);</div><div class='ctx'> int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info);</div><div class='add'>+int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info);</div><div class='add'>+int btrfs_uuid_scan_kthread(void *data);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c<br/>index 66e2270b0dae..a2ac3fb68bc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/verity.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/verity.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/verity.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/verity.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> #include "transaction.h"</div><div class='del'>-#include "disk-io.h"</div><div class='ctx'> #include "locking.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='hunk'>@@ -110,7 +109,7 @@ static int drop_verity_items(struct btrfs_inode *inode, u8 key_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -122,10 +121,8 @@ static int drop_verity_items(struct btrfs_inode *inode, u8 key_type)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		/* 1 for the item being dropped */</div><div class='ctx'> 		trans = btrfs_start_transaction(root, 1);</div><div class='del'>-		if (IS_ERR(trans)) {</div><div class='del'>-			ret = PTR_ERR(trans);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(trans))</div><div class='add'>+			return PTR_ERR(trans);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Walk backwards through all the items until we find one that</div><div class='hunk'>@@ -144,7 +141,7 @@ static int drop_verity_items(struct btrfs_inode *inode, u8 key_type)</div><div class='ctx'> 			path-&gt;slots[0]--;</div><div class='ctx'> 		} else if (ret &lt; 0) {</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;key, path-&gt;slots[0]);</div><div class='hunk'>@@ -162,17 +159,14 @@ static int drop_verity_items(struct btrfs_inode *inode, u8 key_type)</div><div class='ctx'> 		ret = btrfs_del_items(trans, root, path, path-&gt;slots[0], 1);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			btrfs_end_transaction(trans);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		count++;</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	}</div><div class='del'>-	ret = count;</div><div class='ctx'> 	btrfs_end_transaction(trans);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -218,7 +212,7 @@ static int write_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'> 			   const char *src, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -234,10 +228,8 @@ static int write_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		/* 1 for the new item being inserted */</div><div class='ctx'> 		trans = btrfs_start_transaction(root, 1);</div><div class='del'>-		if (IS_ERR(trans)) {</div><div class='del'>-			ret = PTR_ERR(trans);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(trans))</div><div class='add'>+			return PTR_ERR(trans);</div><div class='ctx'> </div><div class='ctx'> 		key.objectid = btrfs_ino(inode);</div><div class='ctx'> 		key.type = key_type;</div><div class='hunk'>@@ -268,7 +260,6 @@ static int write_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -285,7 +276,7 @@ static int write_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'>  *              page and ignore dest, but it must still be non-NULL to avoid the</div><div class='ctx'>  *              counting-only behavior.</div><div class='ctx'>  * @len:        length in bytes to read</div><div class='del'>- * @dest_page:  copy into this page instead of the dest buffer</div><div class='add'>+ * @dest_folio: copy into this folio instead of the dest buffer</div><div class='ctx'>  *</div><div class='ctx'>  * Helper function to read items from the btree.  This returns the number of</div><div class='ctx'>  * bytes read or &lt; 0 for errors.  We can return short reads if the items don't</div><div class='hunk'>@@ -295,9 +286,9 @@ static int write_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'>  * Returns number of bytes read or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int read_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='del'>-			  char *dest, u64 len, struct page *dest_page)</div><div class='add'>+			  char *dest, u64 len, struct folio *dest_folio)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -315,7 +306,7 @@ static int read_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (dest_page)</div><div class='add'>+	if (dest_folio)</div><div class='ctx'> 		path-&gt;reada = READA_FORWARD;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = btrfs_ino(inode);</div><div class='hunk'>@@ -372,15 +363,15 @@ static int read_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'> 		copy_offset = offset - key.offset;</div><div class='ctx'> </div><div class='ctx'> 		if (dest) {</div><div class='del'>-			if (dest_page)</div><div class='del'>-				kaddr = kmap_local_page(dest_page);</div><div class='add'>+			if (dest_folio)</div><div class='add'>+				kaddr = kmap_local_folio(dest_folio, 0);</div><div class='ctx'> </div><div class='ctx'> 			data = btrfs_item_ptr(leaf, path-&gt;slots[0], void);</div><div class='ctx'> 			read_extent_buffer(leaf, kaddr + dest_offset,</div><div class='ctx'> 					   (unsigned long)data + copy_offset,</div><div class='ctx'> 					   copy_bytes);</div><div class='ctx'> </div><div class='del'>-			if (dest_page)</div><div class='add'>+			if (dest_folio)</div><div class='ctx'> 				kunmap_local(kaddr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -405,7 +396,6 @@ static int read_key_bytes(struct btrfs_inode *inode, u8 key_type, u64 offset,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = copied;</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -461,7 +451,7 @@ static int rollback_verity(struct btrfs_inode *inode)</div><div class='ctx'> 	struct btrfs_root *root = inode-&gt;root;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(inode_is_locked(&amp;inode-&gt;vfs_inode));</div><div class='add'>+	btrfs_assert_inode_locked(inode);</div><div class='ctx'> 	truncate_inode_pages(inode-&gt;vfs_inode.i_mapping, inode-&gt;vfs_inode.i_size);</div><div class='ctx'> 	clear_bit(BTRFS_INODE_VERITY_IN_PROGRESS, &amp;inode-&gt;runtime_flags);</div><div class='ctx'> 	ret = btrfs_drop_verity_items(inode);</div><div class='hunk'>@@ -486,14 +476,14 @@ static int rollback_verity(struct btrfs_inode *inode)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	inode-&gt;ro_flags &amp;= ~BTRFS_INODE_RO_VERITY;</div><div class='del'>-	btrfs_sync_inode_flags_to_i_flags(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	btrfs_sync_inode_flags_to_i_flags(inode);</div><div class='ctx'> 	ret = btrfs_update_inode(trans, inode);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = del_orphan(trans, inode);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -553,7 +543,7 @@ static int finish_verity(struct btrfs_inode *inode, const void *desc,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	inode-&gt;ro_flags |= BTRFS_INODE_RO_VERITY;</div><div class='del'>-	btrfs_sync_inode_flags_to_i_flags(&amp;inode-&gt;vfs_inode);</div><div class='add'>+	btrfs_sync_inode_flags_to_i_flags(inode);</div><div class='ctx'> 	ret = btrfs_update_inode(trans, inode);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto end_trans;</div><div class='hunk'>@@ -586,7 +576,10 @@ static int btrfs_begin_enable_verity(struct file *filp)</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(inode_is_locked(file_inode(filp)));</div><div class='add'>+	btrfs_assert_inode_locked(inode);</div><div class='add'>+</div><div class='add'>+	if (IS_ENCRYPTED(&amp;inode-&gt;vfs_inode))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BTRFS_INODE_VERITY_IN_PROGRESS, &amp;inode-&gt;runtime_flags))</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -634,7 +627,7 @@ static int btrfs_end_enable_verity(struct file *filp, const void *desc,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int rollback_ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(inode_is_locked(file_inode(filp)));</div><div class='add'>+	btrfs_assert_inode_locked(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (desc == NULL)</div><div class='ctx'> 		goto rollback;</div><div class='hunk'>@@ -677,11 +670,11 @@ int btrfs_get_verity_descriptor(struct inode *inode, void *buf, size_t buf_size)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (item.reserved[0] != 0 || item.reserved[1] != 0)</div><div class='add'>+	if (unlikely(item.reserved[0] != 0 || item.reserved[1] != 0))</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> </div><div class='ctx'> 	true_size = btrfs_stack_verity_descriptor_size(&amp;item);</div><div class='del'>-	if (true_size &gt; INT_MAX)</div><div class='add'>+	if (unlikely(true_size &gt; INT_MAX))</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_size == 0)</div><div class='hunk'>@@ -743,7 +736,7 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	folio = filemap_alloc_folio(mapping_gfp_constraint(inode-&gt;i_mapping, ~__GFP_FS),</div><div class='del'>-				    0);</div><div class='add'>+				    0, NULL);</div><div class='ctx'> 	if (!folio)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -763,7 +756,7 @@ again:</div><div class='ctx'> 	 * [ inode objectid, BTRFS_MERKLE_ITEM_KEY, offset in bytes ]</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = read_key_bytes(BTRFS_I(inode), BTRFS_VERITY_MERKLE_ITEM_KEY, off,</div><div class='del'>-			     folio_address(folio), PAGE_SIZE, &amp;folio-&gt;page);</div><div class='add'>+			     folio_address(folio), PAGE_SIZE, folio);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='hunk'>@@ -803,6 +796,8 @@ static int btrfs_write_merkle_tree_block(struct inode *inode, const void *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct fsverity_operations btrfs_verityops = {</div><div class='add'>+	.inode_info_offs         = (int)offsetof(struct btrfs_inode, i_verity_info) -</div><div class='add'>+				   (int)offsetof(struct btrfs_inode, vfs_inode),</div><div class='ctx'> 	.begin_enable_verity     = btrfs_begin_enable_verity,</div><div class='ctx'> 	.end_enable_verity       = btrfs_end_enable_verity,</div><div class='ctx'> 	.get_verity_descriptor   = btrfs_get_verity_descriptor,</div><div class='head'>diff --git a/fs/btrfs/verity.h b/fs/btrfs/verity.h<br/>index 91c10f7d0a46..d696659e43e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/verity.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/verity.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/verity.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/verity.h</a></div><div class='hunk'>@@ -3,8 +3,13 @@</div><div class='ctx'> #ifndef BTRFS_VERITY_H</div><div class='ctx'> #define BTRFS_VERITY_H</div><div class='ctx'> </div><div class='add'>+struct inode;</div><div class='add'>+struct btrfs_inode;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FS_VERITY</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/fsverity.h&gt;</div><div class='add'>+</div><div class='ctx'> extern const struct fsverity_operations btrfs_verityops;</div><div class='ctx'> </div><div class='ctx'> int btrfs_drop_verity_items(struct btrfs_inode *inode);</div><div class='hunk'>@@ -12,6 +17,8 @@ int btrfs_get_verity_descriptor(struct inode *inode, void *buf, size_t buf_size)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='ctx'> static inline int btrfs_drop_verity_items(struct btrfs_inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c<br/>index 769a1dc4b756..ae1742a35e76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/volumes.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/volumes.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/volumes.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/volumes.c</a></div><div class='hunk'>@@ -13,14 +13,11 @@</div><div class='ctx'> #include &lt;linux/list_sort.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include "misc.h"</div><div class='del'>-#include "ctree.h"</div><div class='del'>-#include "extent_map.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='add'>+#include "extent-tree.h"</div><div class='ctx'> #include "transaction.h"</div><div class='del'>-#include "print-tree.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "raid56.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='ctx'> #include "sysfs.h"</div><div class='ctx'> #include "tree-checker.h"</div><div class='hunk'>@@ -50,6 +47,7 @@ struct btrfs_io_geometry {</div><div class='ctx'> 	u64 raid56_full_stripe_start;</div><div class='ctx'> 	int max_errors;</div><div class='ctx'> 	enum btrfs_map_op op;</div><div class='add'>+	bool use_rst;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {</div><div class='hunk'>@@ -215,10 +213,8 @@ void btrfs_describe_block_groups(u64 bg_flags, char *buf, u32 size_buf)</div><div class='ctx'> 	u64 flags = bg_flags;</div><div class='ctx'> 	u32 size_bp = size_buf;</div><div class='ctx'> </div><div class='del'>-	if (!flags) {</div><div class='del'>-		strcpy(bp, "NONE");</div><div class='add'>+	if (!flags)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> #define DESCRIBE_FLAG(flag, desc)						\</div><div class='ctx'> 	do {								\</div><div class='hunk'>@@ -404,8 +400,12 @@ static struct btrfs_fs_devices *alloc_fs_devices(const u8 *fsid)</div><div class='ctx'> static void btrfs_free_device(struct btrfs_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;device-&gt;post_commit_list));</div><div class='del'>-	rcu_string_free(device-&gt;name);</div><div class='del'>-	extent_io_tree_release(&amp;device-&gt;alloc_state);</div><div class='add'>+	/*</div><div class='add'>+	 * No need to call kfree_rcu() nor do RCU lock/unlock, nothing is</div><div class='add'>+	 * reading the device name.</div><div class='add'>+	 */</div><div class='add'>+	kfree(rcu_dereference_raw(device-&gt;name));</div><div class='add'>+	btrfs_extent_io_tree_release(&amp;device-&gt;alloc_state);</div><div class='ctx'> 	btrfs_destroy_dev_zone_info(device);</div><div class='ctx'> 	kfree(device);</div><div class='ctx'> }</div><div class='hunk'>@@ -415,9 +415,10 @@ static void free_fs_devices(struct btrfs_fs_devices *fs_devices)</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(fs_devices-&gt;opened);</div><div class='add'>+	WARN_ON(fs_devices-&gt;holding);</div><div class='ctx'> 	while (!list_empty(&amp;fs_devices-&gt;devices)) {</div><div class='del'>-		device = list_entry(fs_devices-&gt;devices.next,</div><div class='del'>-				    struct btrfs_device, dev_list);</div><div class='add'>+		device = list_first_entry(&amp;fs_devices-&gt;devices,</div><div class='add'>+					  struct btrfs_device, dev_list);</div><div class='ctx'> 		list_del(&amp;device-&gt;dev_list);</div><div class='ctx'> 		btrfs_free_device(device);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -429,8 +430,8 @@ void __exit btrfs_cleanup_fs_uuids(void)</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;fs_uuids)) {</div><div class='del'>-		fs_devices = list_entry(fs_uuids.next,</div><div class='del'>-					struct btrfs_fs_devices, fs_list);</div><div class='add'>+		fs_devices = list_first_entry(&amp;fs_uuids, struct btrfs_fs_devices,</div><div class='add'>+					      fs_list);</div><div class='ctx'> 		list_del(&amp;fs_devices-&gt;fs_list);</div><div class='ctx'> 		free_fs_devices(fs_devices);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -474,32 +475,37 @@ btrfs_get_bdev_and_sb(const char *device_path, blk_mode_t flags, void *holder,</div><div class='ctx'> 	struct block_device *bdev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*bdev_file = bdev_file_open_by_path(device_path, flags, holder, NULL);</div><div class='add'>+	*bdev_file = bdev_file_open_by_path(device_path, flags, holder, &amp;fs_holder_ops);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(*bdev_file)) {</div><div class='ctx'> 		ret = PTR_ERR(*bdev_file);</div><div class='add'>+		btrfs_err(NULL, "failed to open device for path %s with flags 0x%x: %d",</div><div class='add'>+			  device_path, flags, ret);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	bdev = file_bdev(*bdev_file);</div><div class='ctx'> </div><div class='ctx'> 	if (flush)</div><div class='ctx'> 		sync_blockdev(bdev);</div><div class='del'>-	ret = set_blocksize(bdev, BTRFS_BDEV_BLOCKSIZE);</div><div class='del'>-	if (ret) {</div><div class='del'>-		fput(*bdev_file);</div><div class='del'>-		goto error;</div><div class='add'>+	if (holder) {</div><div class='add'>+		ret = set_blocksize(*bdev_file, BTRFS_BDEV_BLOCKSIZE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			bdev_fput(*bdev_file);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	invalidate_bdev(bdev);</div><div class='del'>-	*disk_super = btrfs_read_dev_super(bdev);</div><div class='add'>+	*disk_super = btrfs_read_disk_super(bdev, 0, false);</div><div class='ctx'> 	if (IS_ERR(*disk_super)) {</div><div class='ctx'> 		ret = PTR_ERR(*disk_super);</div><div class='del'>-		fput(*bdev_file);</div><div class='add'>+		bdev_fput(*bdev_file);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='add'>+	*disk_super = NULL;</div><div class='ctx'> 	*bdev_file = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -537,7 +543,7 @@ static int btrfs_free_stale_devices(dev_t devt, struct btrfs_device *skip_device</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (devt &amp;&amp; devt != device-&gt;devt)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (fs_devices-&gt;opened) {</div><div class='add'>+			if (fs_devices-&gt;opened || fs_devices-&gt;holding) {</div><div class='ctx'> 				if (devt)</div><div class='ctx'> 					ret = -EBUSY;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -653,7 +659,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	if (!device-&gt;name)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_get_bdev_and_sb(device-&gt;name-&gt;str, flags, holder, 1,</div><div class='add'>+	ret = btrfs_get_bdev_and_sb(rcu_dereference_raw(device-&gt;name), flags, holder, 1,</div><div class='ctx'> 				    &amp;bdev_file, &amp;disk_super);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -670,8 +676,8 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	if (btrfs_super_flags(disk_super) &amp; BTRFS_SUPER_FLAG_SEEDING) {</div><div class='ctx'> 		if (btrfs_super_incompat_flags(disk_super) &amp;</div><div class='ctx'> 		    BTRFS_FEATURE_INCOMPAT_METADATA_UUID) {</div><div class='del'>-			pr_err(</div><div class='del'>-		"BTRFS: Invalid seeding and uuid-changed device detected\n");</div><div class='add'>+			btrfs_err(NULL,</div><div class='add'>+				  "invalid seeding and uuid-changed device detected");</div><div class='ctx'> 			goto error_free_page;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -694,6 +700,16 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	device-&gt;bdev = file_bdev(bdev_file);</div><div class='ctx'> 	clear_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &amp;device-&gt;dev_state);</div><div class='ctx'> </div><div class='add'>+	if (device-&gt;devt != device-&gt;bdev-&gt;bd_dev) {</div><div class='add'>+		btrfs_warn(NULL,</div><div class='add'>+			   "device %s maj:min changed from %d:%d to %d:%d",</div><div class='add'>+			   rcu_dereference_raw(device-&gt;name), MAJOR(device-&gt;devt),</div><div class='add'>+			   MINOR(device-&gt;devt), MAJOR(device-&gt;bdev-&gt;bd_dev),</div><div class='add'>+			   MINOR(device-&gt;bdev-&gt;bd_dev));</div><div class='add'>+</div><div class='add'>+		device-&gt;devt = device-&gt;bdev-&gt;bd_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fs_devices-&gt;open_devices++;</div><div class='ctx'> 	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;device-&gt;dev_state) &amp;&amp;</div><div class='ctx'> 	    device-&gt;devid != BTRFS_DEV_REPLACE_DEVID) {</div><div class='hunk'>@@ -706,12 +722,12 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> </div><div class='ctx'> error_free_page:</div><div class='ctx'> 	btrfs_release_disk_super(disk_super);</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 *btrfs_sb_fsid_ptr(struct btrfs_super_block *sb)</div><div class='add'>+const u8 *btrfs_sb_fsid_ptr(const struct btrfs_super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	bool has_metadata_uuid = (btrfs_super_incompat_flags(sb) &amp;</div><div class='ctx'> 				  BTRFS_FEATURE_INCOMPAT_METADATA_UUID);</div><div class='hunk'>@@ -719,6 +735,41 @@ u8 *btrfs_sb_fsid_ptr(struct btrfs_super_block *sb)</div><div class='ctx'> 	return has_metadata_uuid ? sb-&gt;metadata_uuid : sb-&gt;fsid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_same_device(struct btrfs_device *device, const char *new_path)</div><div class='add'>+{</div><div class='add'>+	struct path old = { .mnt = NULL, .dentry = NULL };</div><div class='add'>+	struct path new = { .mnt = NULL, .dentry = NULL };</div><div class='add'>+	char AUTO_KFREE(old_path);</div><div class='add'>+	bool is_same = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!device-&gt;name)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	old_path = kzalloc(PATH_MAX, GFP_NOFS);</div><div class='add'>+	if (!old_path)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ret = strscpy(old_path, rcu_dereference(device-&gt;name), PATH_MAX);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = kern_path(old_path, LOOKUP_FOLLOW, &amp;old);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = kern_path(new_path, LOOKUP_FOLLOW, &amp;new);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	if (path_equal(&amp;old, &amp;new))</div><div class='add'>+		is_same = true;</div><div class='add'>+out:</div><div class='add'>+	path_put(&amp;old);</div><div class='add'>+	path_put(&amp;new);</div><div class='add'>+	return is_same;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Add new device to list of registered devices</div><div class='ctx'>  *</div><div class='hunk'>@@ -732,11 +783,11 @@ static noinline struct btrfs_device *device_list_add(const char *path,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = NULL;</div><div class='del'>-	struct rcu_string *name;</div><div class='add'>+	const char *name;</div><div class='ctx'> 	u64 found_transid = btrfs_super_generation(disk_super);</div><div class='ctx'> 	u64 devid = btrfs_stack_device_id(&amp;disk_super-&gt;dev_item);</div><div class='ctx'> 	dev_t path_devt;</div><div class='del'>-	int error;</div><div class='add'>+	int ret;</div><div class='ctx'> 	bool same_fsid_diff_dev = false;</div><div class='ctx'> 	bool has_metadata_uuid = (btrfs_super_incompat_flags(disk_super) &amp;</div><div class='ctx'> 		BTRFS_FEATURE_INCOMPAT_METADATA_UUID);</div><div class='hunk'>@@ -748,11 +799,11 @@ static noinline struct btrfs_device *device_list_add(const char *path,</div><div class='ctx'> 		return ERR_PTR(-EAGAIN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = lookup_bdev(path, &amp;path_devt);</div><div class='del'>-	if (error) {</div><div class='add'>+	ret = lookup_bdev(path, &amp;path_devt);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		btrfs_err(NULL, "failed to lookup block device for path %s: %d",</div><div class='del'>-			  path, error);</div><div class='del'>-		return ERR_PTR(error);</div><div class='add'>+			  path, ret);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fs_devices = find_fsid_by_device(disk_super, path_devt, &amp;same_fsid_diff_dev);</div><div class='hunk'>@@ -769,8 +820,9 @@ static noinline struct btrfs_device *device_list_add(const char *path,</div><div class='ctx'> 		if (same_fsid_diff_dev) {</div><div class='ctx'> 			generate_random_uuid(fs_devices-&gt;fsid);</div><div class='ctx'> 			fs_devices-&gt;temp_fsid = true;</div><div class='del'>-			pr_info("BTRFS: device %s using temp-fsid %pU\n",</div><div class='del'>-				path, fs_devices-&gt;fsid);</div><div class='add'>+			btrfs_info(NULL, "device %s (%d:%d) using temp-fsid %pU",</div><div class='add'>+				path, MAJOR(path_devt), MINOR(path_devt),</div><div class='add'>+				fs_devices-&gt;fsid);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='hunk'>@@ -799,8 +851,9 @@ static noinline struct btrfs_device *device_list_add(const char *path,</div><div class='ctx'> </div><div class='ctx'> 		if (fs_devices-&gt;opened) {</div><div class='ctx'> 			btrfs_err(NULL,</div><div class='del'>-"device %s belongs to fsid %pU, and the fs is already mounted, scanned by %s (%d)",</div><div class='del'>-				  path, fs_devices-&gt;fsid, current-&gt;comm,</div><div class='add'>+"device %s (%d:%d) belongs to fsid %pU, and the fs is already mounted, scanned by %s (%d)",</div><div class='add'>+				  path, MAJOR(path_devt), MINOR(path_devt),</div><div class='add'>+				  fs_devices-&gt;fsid, current-&gt;comm,</div><div class='ctx'> 				  task_pid_nr(current));</div><div class='ctx'> 			mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> 			return ERR_PTR(-EBUSY);</div><div class='hunk'>@@ -826,16 +879,20 @@ static noinline struct btrfs_device *device_list_add(const char *path,</div><div class='ctx'> </div><div class='ctx'> 		if (disk_super-&gt;label[0])</div><div class='ctx'> 			pr_info(</div><div class='del'>-	"BTRFS: device label %s devid %llu transid %llu %s scanned by %s (%d)\n",</div><div class='add'>+"BTRFS: device label %s devid %llu transid %llu %s (%d:%d) scanned by %s (%d)\n",</div><div class='ctx'> 				disk_super-&gt;label, devid, found_transid, path,</div><div class='add'>+				MAJOR(path_devt), MINOR(path_devt),</div><div class='ctx'> 				current-&gt;comm, task_pid_nr(current));</div><div class='ctx'> 		else</div><div class='ctx'> 			pr_info(</div><div class='del'>-	"BTRFS: device fsid %pU devid %llu transid %llu %s scanned by %s (%d)\n",</div><div class='add'>+"BTRFS: device fsid %pU devid %llu transid %llu %s (%d:%d) scanned by %s (%d)\n",</div><div class='ctx'> 				disk_super-&gt;fsid, devid, found_transid, path,</div><div class='add'>+				MAJOR(path_devt), MINOR(path_devt),</div><div class='ctx'> 				current-&gt;comm, task_pid_nr(current));</div><div class='ctx'> </div><div class='del'>-	} else if (!device-&gt;name || strcmp(device-&gt;name-&gt;str, path)) {</div><div class='add'>+	} else if (!device-&gt;name || !is_same_device(device, path)) {</div><div class='add'>+		const char *old_name;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * When FS is already mounted.</div><div class='ctx'> 		 * 1. If you are here and if the device-&gt;name is NULL that</div><div class='hunk'>@@ -889,27 +946,31 @@ static noinline struct btrfs_device *device_list_add(const char *path,</div><div class='ctx'> 		if (device-&gt;bdev) {</div><div class='ctx'> 			if (device-&gt;devt != path_devt) {</div><div class='ctx'> 				mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='del'>-				btrfs_warn_in_rcu(NULL,</div><div class='add'>+				btrfs_warn(NULL,</div><div class='ctx'> 	"duplicate device %s devid %llu generation %llu scanned by %s (%d)",</div><div class='ctx'> 						  path, devid, found_transid,</div><div class='ctx'> 						  current-&gt;comm,</div><div class='ctx'> 						  task_pid_nr(current));</div><div class='ctx'> 				return ERR_PTR(-EEXIST);</div><div class='ctx'> 			}</div><div class='del'>-			btrfs_info_in_rcu(NULL,</div><div class='add'>+			btrfs_info(NULL,</div><div class='ctx'> 	"devid %llu device path %s changed to %s scanned by %s (%d)",</div><div class='ctx'> 					  devid, btrfs_dev_name(device),</div><div class='ctx'> 					  path, current-&gt;comm,</div><div class='ctx'> 					  task_pid_nr(current));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		name = rcu_string_strdup(path, GFP_NOFS);</div><div class='add'>+		name = kstrdup(path, GFP_NOFS);</div><div class='ctx'> 		if (!name) {</div><div class='ctx'> 			mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		}</div><div class='del'>-		rcu_string_free(device-&gt;name);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		old_name = rcu_dereference(device-&gt;name);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		rcu_assign_pointer(device-&gt;name, name);</div><div class='add'>+		kfree_rcu_mightsleep(old_name);</div><div class='add'>+</div><div class='ctx'> 		if (test_bit(BTRFS_DEV_STATE_MISSING, &amp;device-&gt;dev_state)) {</div><div class='ctx'> 			fs_devices-&gt;missing_devices--;</div><div class='ctx'> 			clear_bit(BTRFS_DEV_STATE_MISSING, &amp;device-&gt;dev_state);</div><div class='hunk'>@@ -958,7 +1019,7 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)</div><div class='ctx'> 		 * uuid mutex so nothing we touch in here is going to disappear.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (orig_dev-&gt;name)</div><div class='del'>-			dev_path = orig_dev-&gt;name-&gt;str;</div><div class='add'>+			dev_path = rcu_dereference_raw(orig_dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		device = btrfs_alloc_device(NULL, &amp;orig_dev-&gt;devid,</div><div class='ctx'> 					    orig_dev-&gt;uuid, dev_path);</div><div class='hunk'>@@ -1016,7 +1077,7 @@ static void __btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (device-&gt;bdev_file) {</div><div class='del'>-			fput(device-&gt;bdev_file);</div><div class='add'>+			bdev_fput(device-&gt;bdev_file);</div><div class='ctx'> 			device-&gt;bdev = NULL;</div><div class='ctx'> 			device-&gt;bdev_file = NULL;</div><div class='ctx'> 			fs_devices-&gt;open_devices--;</div><div class='hunk'>@@ -1063,7 +1124,7 @@ static void btrfs_close_bdev(struct btrfs_device *device)</div><div class='ctx'> 		invalidate_bdev(device-&gt;bdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fput(device-&gt;bdev_file);</div><div class='add'>+	bdev_fput(device-&gt;bdev_file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btrfs_close_one_device(struct btrfs_device *device)</div><div class='hunk'>@@ -1088,13 +1149,14 @@ static void btrfs_close_one_device(struct btrfs_device *device)</div><div class='ctx'> 	if (device-&gt;bdev) {</div><div class='ctx'> 		fs_devices-&gt;open_devices--;</div><div class='ctx'> 		device-&gt;bdev = NULL;</div><div class='add'>+		device-&gt;bdev_file = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;device-&gt;dev_state);</div><div class='ctx'> 	btrfs_destroy_dev_zone_info(device);</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;fs_info = NULL;</div><div class='ctx'> 	atomic_set(&amp;device-&gt;dev_stats_ccnt, 0);</div><div class='del'>-	extent_io_tree_release(&amp;device-&gt;alloc_state);</div><div class='add'>+	btrfs_extent_io_tree_release(&amp;device-&gt;alloc_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset the flush error record. We might have a transient flush error</div><div class='hunk'>@@ -1142,7 +1204,7 @@ void btrfs_close_devices(struct btrfs_fs_devices *fs_devices)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;uuid_mutex);</div><div class='ctx'> 	close_fs_devices(fs_devices);</div><div class='del'>-	if (!fs_devices-&gt;opened) {</div><div class='add'>+	if (!fs_devices-&gt;opened &amp;&amp; !fs_devices-&gt;holding) {</div><div class='ctx'> 		list_splice_init(&amp;fs_devices-&gt;seed_list, &amp;list);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1172,29 +1234,53 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='ctx'> 	struct btrfs_device *latest_dev = NULL;</div><div class='ctx'> 	struct btrfs_device *tmp_device;</div><div class='add'>+	s64 __maybe_unused value = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(device, tmp_device, &amp;fs_devices-&gt;devices,</div><div class='ctx'> 				 dev_list) {</div><div class='del'>-		int ret;</div><div class='add'>+		int ret2;</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_open_one_device(fs_devices, device, flags, holder);</div><div class='del'>-		if (ret == 0 &amp;&amp;</div><div class='add'>+		ret2 = btrfs_open_one_device(fs_devices, device, flags, holder);</div><div class='add'>+		if (ret2 == 0 &amp;&amp;</div><div class='ctx'> 		    (!latest_dev || device-&gt;generation &gt; latest_dev-&gt;generation)) {</div><div class='ctx'> 			latest_dev = device;</div><div class='del'>-		} else if (ret == -ENODATA) {</div><div class='add'>+		} else if (ret2 == -ENODATA) {</div><div class='ctx'> 			fs_devices-&gt;num_devices--;</div><div class='ctx'> 			list_del(&amp;device-&gt;dev_list);</div><div class='ctx'> 			btrfs_free_device(device);</div><div class='ctx'> 		}</div><div class='add'>+		if (ret == 0 &amp;&amp; ret2 != 0)</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 	}</div><div class='del'>-	if (fs_devices-&gt;open_devices == 0)</div><div class='add'>+</div><div class='add'>+	if (fs_devices-&gt;open_devices == 0) {</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fs_devices-&gt;opened = 1;</div><div class='ctx'> 	fs_devices-&gt;latest_dev = latest_dev;</div><div class='ctx'> 	fs_devices-&gt;total_rw_bytes = 0;</div><div class='ctx'> 	fs_devices-&gt;chunk_alloc_policy = BTRFS_CHUNK_ALLOC_REGULAR;</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	fs_devices-&gt;rr_min_contig_read = BTRFS_DEFAULT_RR_MIN_CONTIG_READ;</div><div class='add'>+	fs_devices-&gt;read_devid = latest_dev-&gt;devid;</div><div class='add'>+	fs_devices-&gt;read_policy = btrfs_read_policy_to_enum(btrfs_get_mod_read_policy(),</div><div class='add'>+							    &amp;value);</div><div class='add'>+	if (fs_devices-&gt;read_policy == BTRFS_READ_POLICY_RR)</div><div class='add'>+		fs_devices-&gt;collect_fs_stats = true;</div><div class='add'>+</div><div class='add'>+	if (value) {</div><div class='add'>+		if (fs_devices-&gt;read_policy == BTRFS_READ_POLICY_RR)</div><div class='add'>+			fs_devices-&gt;rr_min_contig_read = value;</div><div class='add'>+		if (fs_devices-&gt;read_policy == BTRFS_READ_POLICY_DEVID)</div><div class='add'>+			fs_devices-&gt;read_devid = value;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='ctx'> 	fs_devices-&gt;read_policy = BTRFS_READ_POLICY_PID;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1246,48 +1332,58 @@ void btrfs_release_disk_super(struct btrfs_super_block *super)</div><div class='ctx'> 	put_page(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct btrfs_super_block *btrfs_read_disk_super(struct block_device *bdev,</div><div class='del'>-						       u64 bytenr, u64 bytenr_orig)</div><div class='add'>+struct btrfs_super_block *btrfs_read_disk_super(struct block_device *bdev,</div><div class='add'>+						int copy_num, bool drop_cache)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_super_block *disk_super;</div><div class='add'>+	struct btrfs_super_block *super;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	void *p;</div><div class='del'>-	pgoff_t index;</div><div class='add'>+	u64 bytenr, bytenr_orig;</div><div class='add'>+	struct address_space *mapping = bdev-&gt;bd_mapping;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* make sure our super fits in the device */</div><div class='del'>-	if (bytenr + PAGE_SIZE &gt;= bdev_nr_bytes(bdev))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+	bytenr_orig = btrfs_sb_offset(copy_num);</div><div class='add'>+	ret = btrfs_sb_log_location_bdev(bdev, copy_num, READ, &amp;bytenr);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* make sure our super fits in the page */</div><div class='del'>-	if (sizeof(*disk_super) &gt; PAGE_SIZE)</div><div class='add'>+	if (bytenr + BTRFS_SUPER_INFO_SIZE &gt;= bdev_nr_bytes(bdev))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	/* make sure our super doesn't straddle pages on disk */</div><div class='del'>-	index = bytenr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if ((bytenr + sizeof(*disk_super) - 1) &gt;&gt; PAGE_SHIFT != index)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (drop_cache) {</div><div class='add'>+		/* This should only be called with the primary sb. */</div><div class='add'>+		ASSERT(copy_num == 0);</div><div class='ctx'> </div><div class='del'>-	/* pull in the page with our super */</div><div class='del'>-	page = read_cache_page_gfp(bdev-&gt;bd_inode-&gt;i_mapping, index, GFP_KERNEL);</div><div class='add'>+		/*</div><div class='add'>+		 * Drop the page of the primary superblock, so later read will</div><div class='add'>+		 * always read from the device.</div><div class='add'>+		 */</div><div class='add'>+		invalidate_inode_pages2_range(mapping, bytenr &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				      (bytenr + BTRFS_SUPER_INFO_SIZE) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	page = read_cache_page_gfp(mapping, bytenr &gt;&gt; PAGE_SHIFT, GFP_NOFS);</div><div class='ctx'> 	if (IS_ERR(page))</div><div class='ctx'> 		return ERR_CAST(page);</div><div class='ctx'> </div><div class='del'>-	p = page_address(page);</div><div class='del'>-</div><div class='del'>-	/* align our pointer to the offset of the super block */</div><div class='del'>-	disk_super = p + offset_in_page(bytenr);</div><div class='del'>-</div><div class='del'>-	if (btrfs_super_bytenr(disk_super) != bytenr_orig ||</div><div class='del'>-	    btrfs_super_magic(disk_super) != BTRFS_MAGIC) {</div><div class='del'>-		btrfs_release_disk_super(p);</div><div class='add'>+	super = page_address(page);</div><div class='add'>+	if (btrfs_super_magic(super) != BTRFS_MAGIC ||</div><div class='add'>+	    btrfs_super_bytenr(super) != bytenr_orig) {</div><div class='add'>+		btrfs_release_disk_super(super);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (disk_super-&gt;label[0] &amp;&amp; disk_super-&gt;label[BTRFS_LABEL_SIZE - 1])</div><div class='del'>-		disk_super-&gt;label[BTRFS_LABEL_SIZE - 1] = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the last byte of label is properly NUL terminated.  We use</div><div class='add'>+	 * '%s' to print the label, if not properly NUL terminated we can access</div><div class='add'>+	 * beyond the label.</div><div class='add'>+	 */</div><div class='add'>+	if (super-&gt;label[0] &amp;&amp; super-&gt;label[BTRFS_LABEL_SIZE - 1])</div><div class='add'>+		super-&gt;label[BTRFS_LABEL_SIZE - 1] = 0;</div><div class='ctx'> </div><div class='del'>-	return disk_super;</div><div class='add'>+	return super;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_forget_devices(dev_t devt)</div><div class='hunk'>@@ -1301,6 +1397,47 @@ int btrfs_forget_devices(dev_t devt)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool btrfs_skip_registration(struct btrfs_super_block *disk_super,</div><div class='add'>+				    const char *path, dev_t devt,</div><div class='add'>+				    bool mount_arg_dev)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_devices *fs_devices;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not skip device registration for mounted devices with matching</div><div class='add'>+	 * maj:min but different paths. Booting without initrd relies on</div><div class='add'>+	 * /dev/root initially, later replaced with the actual root device.</div><div class='add'>+	 * A successful scan ensures grub2-probe selects the correct device.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(fs_devices, &amp;fs_uuids, fs_list) {</div><div class='add'>+		struct btrfs_device *device;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='add'>+</div><div class='add'>+		if (!fs_devices-&gt;opened) {</div><div class='add'>+			mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(device, &amp;fs_devices-&gt;devices, dev_list) {</div><div class='add'>+			if (device-&gt;bdev &amp;&amp; (device-&gt;bdev-&gt;bd_dev == devt) &amp;&amp;</div><div class='add'>+			    strcmp(rcu_dereference_raw(device-&gt;name), path) != 0) {</div><div class='add'>+				mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='add'>+</div><div class='add'>+				/* Do not skip registration. */</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mount_arg_dev &amp;&amp; btrfs_super_num_devices(disk_super) == 1 &amp;&amp;</div><div class='add'>+	    !(btrfs_super_flags(disk_super) &amp; BTRFS_SUPER_FLAG_SEEDING))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Look for a btrfs signature on a device. This may be called out of the mount path</div><div class='ctx'>  * and we are not allowed to call set_blocksize during the scan. The superblock</div><div class='hunk'>@@ -1310,26 +1447,18 @@ int btrfs_forget_devices(dev_t devt)</div><div class='ctx'>  * the device or return an error. Multi-device and seeding devices are registered</div><div class='ctx'>  * in both cases.</div><div class='ctx'>  */</div><div class='del'>-struct btrfs_device *btrfs_scan_one_device(const char *path, blk_mode_t flags,</div><div class='add'>+struct btrfs_device *btrfs_scan_one_device(const char *path,</div><div class='ctx'> 					   bool mount_arg_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_super_block *disk_super;</div><div class='ctx'> 	bool new_device_added = false;</div><div class='ctx'> 	struct btrfs_device *device = NULL;</div><div class='ctx'> 	struct file *bdev_file;</div><div class='del'>-	u64 bytenr, bytenr_orig;</div><div class='del'>-	int ret;</div><div class='add'>+	dev_t devt;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;uuid_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * we would like to check all the supers, but that would make</div><div class='del'>-	 * a btrfs mount succeed after a mkfs from a different FS.</div><div class='del'>-	 * So, we need to add a special mount option to scan for</div><div class='del'>-	 * later supers, using BTRFS_SUPER_MIRROR_MAX instead</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Avoid an exclusive open here, as the systemd-udev may initiate the</div><div class='ctx'> 	 * device scan which may race with the user's mount or mkfs command,</div><div class='ctx'> 	 * resulting in failure.</div><div class='hunk'>@@ -1339,36 +1468,23 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, blk_mode_t flags,</div><div class='ctx'> 	 * values temporarily, as the device paths of the fsid are the only</div><div class='ctx'> 	 * required information for assembling the volume.</div><div class='ctx'> 	 */</div><div class='del'>-	bdev_file = bdev_file_open_by_path(path, flags, NULL, NULL);</div><div class='add'>+	bdev_file = bdev_file_open_by_path(path, BLK_OPEN_READ, NULL, NULL);</div><div class='ctx'> 	if (IS_ERR(bdev_file))</div><div class='ctx'> 		return ERR_CAST(bdev_file);</div><div class='ctx'> </div><div class='del'>-	bytenr_orig = btrfs_sb_offset(0);</div><div class='del'>-	ret = btrfs_sb_log_location_bdev(file_bdev(bdev_file), 0, READ, &amp;bytenr);</div><div class='del'>-	if (ret) {</div><div class='del'>-		device = ERR_PTR(ret);</div><div class='del'>-		goto error_bdev_put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	disk_super = btrfs_read_disk_super(file_bdev(bdev_file), bytenr,</div><div class='del'>-					   bytenr_orig);</div><div class='add'>+	disk_super = btrfs_read_disk_super(file_bdev(bdev_file), 0, false);</div><div class='ctx'> 	if (IS_ERR(disk_super)) {</div><div class='ctx'> 		device = ERR_CAST(disk_super);</div><div class='ctx'> 		goto error_bdev_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!mount_arg_dev &amp;&amp; btrfs_super_num_devices(disk_super) == 1 &amp;&amp;</div><div class='del'>-	    !(btrfs_super_flags(disk_super) &amp; BTRFS_SUPER_FLAG_SEEDING)) {</div><div class='del'>-		dev_t devt;</div><div class='add'>+	devt = file_bdev(bdev_file)-&gt;bd_dev;</div><div class='add'>+	if (btrfs_skip_registration(disk_super, path, devt, mount_arg_dev)) {</div><div class='add'>+		btrfs_debug(NULL, "skip registering single non-seed device %s (%d:%d)",</div><div class='add'>+			  path, MAJOR(devt), MINOR(devt));</div><div class='ctx'> </div><div class='del'>-		ret = lookup_bdev(path, &amp;devt);</div><div class='del'>-		if (ret)</div><div class='del'>-			btrfs_warn(NULL, "lookup bdev failed for path %s: %d",</div><div class='del'>-				   path, ret);</div><div class='del'>-		else</div><div class='del'>-			btrfs_free_stale_devices(devt, NULL);</div><div class='add'>+		btrfs_free_stale_devices(devt, NULL);</div><div class='ctx'> </div><div class='del'>-		pr_debug("BTRFS: skip registering single non-seed device %s\n", path);</div><div class='ctx'> 		device = NULL;</div><div class='ctx'> 		goto free_disk_super;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1381,7 +1497,7 @@ free_disk_super:</div><div class='ctx'> 	btrfs_release_disk_super(disk_super);</div><div class='ctx'> </div><div class='ctx'> error_bdev_put:</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> </div><div class='ctx'> 	return device;</div><div class='ctx'> }</div><div class='hunk'>@@ -1397,13 +1513,13 @@ static bool contains_pending_extent(struct btrfs_device *device, u64 *start,</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;device-&gt;fs_info-&gt;chunk_mutex);</div><div class='ctx'> </div><div class='del'>-	if (find_first_extent_bit(&amp;device-&gt;alloc_state, *start,</div><div class='del'>-				  &amp;physical_start, &amp;physical_end,</div><div class='del'>-				  CHUNK_ALLOCATED, NULL)) {</div><div class='add'>+	if (btrfs_find_first_extent_bit(&amp;device-&gt;alloc_state, *start,</div><div class='add'>+					&amp;physical_start, &amp;physical_end,</div><div class='add'>+					CHUNK_ALLOCATED, NULL)) {</div><div class='ctx'> </div><div class='ctx'> 		if (in_range(physical_start, *start, len) ||</div><div class='ctx'> 		    in_range(*start, physical_start,</div><div class='del'>-			     physical_end - physical_start)) {</div><div class='add'>+			     physical_end + 1 - physical_start)) {</div><div class='ctx'> 			*start = physical_end + 1;</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1414,6 +1530,9 @@ static bool contains_pending_extent(struct btrfs_device *device, u64 *start,</div><div class='ctx'> static u64 dev_extent_search_start(struct btrfs_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	switch (device-&gt;fs_devices-&gt;chunk_alloc_policy) {</div><div class='add'>+	default:</div><div class='add'>+		btrfs_warn_unknown_chunk_allocation(device-&gt;fs_devices-&gt;chunk_alloc_policy);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BTRFS_CHUNK_ALLOC_REGULAR:</div><div class='ctx'> 		return BTRFS_DEVICE_RANGE_RESERVED;</div><div class='ctx'> 	case BTRFS_CHUNK_ALLOC_ZONED:</div><div class='hunk'>@@ -1423,8 +1542,6 @@ static u64 dev_extent_search_start(struct btrfs_device *device)</div><div class='ctx'> 		 * for superblock logging.</div><div class='ctx'> 		 */</div><div class='ctx'> 		return 0;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1437,7 +1554,8 @@ static bool dev_extent_hole_check_zoned(struct btrfs_device *device,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool changed = false;</div><div class='ctx'> </div><div class='del'>-	ASSERT(IS_ALIGNED(*hole_start, zone_size));</div><div class='add'>+	ASSERT(IS_ALIGNED(*hole_start, zone_size),</div><div class='add'>+	       "hole_start=%llu zone_size=%llu", *hole_start, zone_size);</div><div class='ctx'> </div><div class='ctx'> 	while (*hole_size &gt; 0) {</div><div class='ctx'> 		pos = btrfs_find_allocatable_zones(device, *hole_start,</div><div class='hunk'>@@ -1503,6 +1621,9 @@ static bool dev_extent_hole_check(struct btrfs_device *device, u64 *hole_start,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (device-&gt;fs_devices-&gt;chunk_alloc_policy) {</div><div class='add'>+		default:</div><div class='add'>+			btrfs_warn_unknown_chunk_allocation(device-&gt;fs_devices-&gt;chunk_alloc_policy);</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case BTRFS_CHUNK_ALLOC_REGULAR:</div><div class='ctx'> 			/* No extra check */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1517,8 +1638,6 @@ static bool dev_extent_hole_check(struct btrfs_device *device, u64 *hole_start,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1561,7 +1680,7 @@ static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;dev_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_dev_extent *dev_extent;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	u64 search_start;</div><div class='ctx'> 	u64 hole_size;</div><div class='ctx'> 	u64 max_hole_start;</div><div class='hunk'>@@ -1591,12 +1710,12 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='del'>-	path-&gt;search_commit_root = 1;</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;search_commit_root = true;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = device-&gt;devid;</div><div class='del'>-	key.offset = search_start;</div><div class='ctx'> 	key.type = BTRFS_DEV_EXTENT_KEY;</div><div class='add'>+	key.offset = search_start;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_backwards(root, &amp;key, path);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -1688,9 +1807,10 @@ next:</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='del'>-	ASSERT(max_hole_start + max_hole_size &lt;= search_end);</div><div class='add'>+	ASSERT(max_hole_start + max_hole_size &lt;= search_end,</div><div class='add'>+	       "max_hole_start=%llu max_hole_size=%llu search_end=%llu",</div><div class='add'>+	       max_hole_start, max_hole_size, search_end);</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	*start = max_hole_start;</div><div class='ctx'> 	if (len)</div><div class='ctx'> 		*len = max_hole_size;</div><div class='hunk'>@@ -1704,7 +1824,7 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = device-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;dev_root;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> 	struct extent_buffer *leaf = NULL;</div><div class='hunk'>@@ -1715,15 +1835,15 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = device-&gt;devid;</div><div class='del'>-	key.offset = start;</div><div class='ctx'> 	key.type = BTRFS_DEV_EXTENT_KEY;</div><div class='add'>+	key.offset = start;</div><div class='ctx'> again:</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='ctx'> 		ret = btrfs_previous_item(root, path, key.objectid,</div><div class='ctx'> 					  BTRFS_DEV_EXTENT_KEY);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> 		btrfs_item_key_to_cpu(leaf, &amp;found_key, path-&gt;slots[0]);</div><div class='ctx'> 		extent = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='hunk'>@@ -1738,7 +1858,7 @@ again:</div><div class='ctx'> 		extent = btrfs_item_ptr(leaf, path-&gt;slots[0],</div><div class='ctx'> 					struct btrfs_dev_extent);</div><div class='ctx'> 	} else {</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*dev_extent_len = btrfs_dev_extent_length(leaf, extent);</div><div class='hunk'>@@ -1746,8 +1866,6 @@ again:</div><div class='ctx'> 	ret = btrfs_del_item(trans, root, path);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		set_bit(BTRFS_TRANS_HAVE_FREE_BGS, &amp;trans-&gt;transaction-&gt;flags);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1775,7 +1893,7 @@ static noinline int find_next_devid(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='hunk'>@@ -1787,13 +1905,12 @@ static noinline int find_next_devid(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, fs_info-&gt;chunk_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret == 0) {</div><div class='add'>+	if (unlikely(ret == 0)) {</div><div class='ctx'> 		/* Corruption */</div><div class='ctx'> 		btrfs_err(fs_info, "corrupted chunk tree devid -1 matched");</div><div class='del'>-		ret = -EUCLEAN;</div><div class='del'>-		goto error;</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_previous_item(fs_info-&gt;chunk_root, path,</div><div class='hunk'>@@ -1806,10 +1923,7 @@ static noinline int find_next_devid(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				      path-&gt;slots[0]);</div><div class='ctx'> 		*devid_ret = found_key.offset + 1;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-error:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1820,7 +1934,7 @@ static int btrfs_add_dev_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			    struct btrfs_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_dev_item *dev_item;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -1839,7 +1953,7 @@ static int btrfs_add_dev_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				      &amp;key, sizeof(*dev_item));</div><div class='ctx'> 	btrfs_trans_release_chunk_metadata(trans);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	dev_item = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_dev_item);</div><div class='hunk'>@@ -1864,12 +1978,8 @@ static int btrfs_add_dev_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	ptr = btrfs_device_fsid(dev_item);</div><div class='ctx'> 	write_extent_buffer(leaf, trans-&gt;fs_info-&gt;fs_devices-&gt;metadata_uuid,</div><div class='ctx'> 			    ptr, BTRFS_FSID_SIZE);</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1881,14 +1991,11 @@ out:</div><div class='ctx'> static void update_dev_time(const char *device_path)</div><div class='ctx'> {</div><div class='ctx'> 	struct path path;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = kern_path(device_path, LOOKUP_FOLLOW, &amp;path);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inode_update_time(d_inode(path.dentry), S_MTIME | S_CTIME | S_VERSION);</div><div class='del'>-	path_put(&amp;path);</div><div class='add'>+	if (!kern_path(device_path, LOOKUP_FOLLOW, &amp;path)) {</div><div class='add'>+		vfs_utimes(&amp;path, NULL);</div><div class='add'>+		path_put(&amp;path);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_rm_dev_item(struct btrfs_trans_handle *trans,</div><div class='hunk'>@@ -1896,7 +2003,7 @@ static int btrfs_rm_dev_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = device-&gt;fs_info-&gt;chunk_root;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -1910,16 +2017,12 @@ static int btrfs_rm_dev_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	btrfs_reserve_chunk_metadata(trans, false);</div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	btrfs_trans_release_chunk_metadata(trans);</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_del_item(trans, root, path);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_del_item(trans, root, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2002,7 +2105,7 @@ static u64 btrfs_num_devices(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;fs_info-&gt;dev_replace.rwsem);</div><div class='ctx'> 	if (btrfs_dev_replace_is_ongoing(&amp;fs_info-&gt;dev_replace)) {</div><div class='del'>-		ASSERT(num_devices &gt; 1);</div><div class='add'>+		ASSERT(num_devices &gt; 1, "num_devices=%llu", num_devices);</div><div class='ctx'> 		num_devices--;</div><div class='ctx'> 	}</div><div class='ctx'> 	up_read(&amp;fs_info-&gt;dev_replace.rwsem);</div><div class='hunk'>@@ -2018,7 +2121,7 @@ static void btrfs_scratch_superblock(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	const u64 bytenr = btrfs_sb_offset(copy_num);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	disk_super = btrfs_read_disk_super(bdev, bytenr, bytenr);</div><div class='add'>+	disk_super = btrfs_read_disk_super(bdev, copy_num, false);</div><div class='ctx'> 	if (IS_ERR(disk_super))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -2032,11 +2135,10 @@ static void btrfs_scratch_superblock(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			copy_num, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       struct block_device *bdev,</div><div class='del'>-			       const char *device_path)</div><div class='add'>+void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info, struct btrfs_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int copy_num;</div><div class='add'>+	struct block_device *bdev = device-&gt;bdev;</div><div class='ctx'> </div><div class='ctx'> 	if (!bdev)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2052,7 +2154,7 @@ void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	btrfs_kobject_uevent(bdev, KOBJ_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	/* Update ctime/mtime for device path for libblkid */</div><div class='del'>-	update_dev_time(device_path);</div><div class='add'>+	update_dev_time(rcu_dereference_raw(device-&gt;name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_rm_device(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -2092,7 +2194,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_pinned_by_swapfile(fs_info, device)) {</div><div class='del'>-		btrfs_warn_in_rcu(fs_info,</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='ctx'> 		  "cannot remove device %s (devid %llu) due to active swapfile",</div><div class='ctx'> 				  btrfs_dev_name(device), device-&gt;devid);</div><div class='ctx'> 		return -ETXTBSY;</div><div class='hunk'>@@ -2123,7 +2225,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_rm_dev_item(trans, device);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		/* Any error in dev item removal is critical */</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='ctx'> 			   "failed to remove device item for devid %llu: %d",</div><div class='hunk'>@@ -2182,13 +2284,12 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 * free the device.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * We cannot call btrfs_close_bdev() here because we're holding the sb</div><div class='del'>-	 * write lock, and fput() on the block device will pull in the</div><div class='add'>+	 * write lock, and bdev_fput() on the block device will pull in the</div><div class='ctx'> 	 * -&gt;open_mutex on the block device and it's dependencies.  Instead</div><div class='ctx'> 	 *  just flush the device and let the caller do the final bdev_release.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &amp;device-&gt;dev_state)) {</div><div class='del'>-		btrfs_scratch_superblocks(fs_info, device-&gt;bdev,</div><div class='del'>-					  device-&gt;name-&gt;str);</div><div class='add'>+		btrfs_scratch_superblocks(fs_info, device);</div><div class='ctx'> 		if (device-&gt;bdev) {</div><div class='ctx'> 			sync_blockdev(device-&gt;bdev);</div><div class='ctx'> 			invalidate_bdev(device-&gt;bdev);</div><div class='hunk'>@@ -2208,7 +2309,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cur_devices-&gt;num_devices == 0) {</div><div class='ctx'> 		list_del_init(&amp;cur_devices-&gt;seed_list);</div><div class='del'>-		ASSERT(cur_devices-&gt;opened == 1);</div><div class='add'>+		ASSERT(cur_devices-&gt;opened == 1, "opened=%d", cur_devices-&gt;opened);</div><div class='ctx'> 		cur_devices-&gt;opened--;</div><div class='ctx'> 		free_fs_devices(cur_devices);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2301,8 +2402,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> </div><div class='del'>-	btrfs_scratch_superblocks(tgtdev-&gt;fs_info, tgtdev-&gt;bdev,</div><div class='del'>-				  tgtdev-&gt;name-&gt;str);</div><div class='add'>+	btrfs_scratch_superblocks(tgtdev-&gt;fs_info, tgtdev);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_close_bdev(tgtdev);</div><div class='ctx'> 	synchronize_rcu();</div><div class='hunk'>@@ -2363,7 +2463,7 @@ int btrfs_get_dev_args_from_path(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	else</div><div class='ctx'> 		memcpy(args-&gt;fsid, disk_super-&gt;fsid, BTRFS_FSID_SIZE);</div><div class='ctx'> 	btrfs_release_disk_super(disk_super);</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2508,7 +2608,7 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	BTRFS_DEV_LOOKUP_ARGS(args);</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;chunk_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_dev_item *dev_item;</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='hunk'>@@ -2522,15 +2622,15 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_DEV_ITEMS_OBJECTID;</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = BTRFS_DEV_ITEM_KEY;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		btrfs_reserve_chunk_metadata(trans, false);</div><div class='ctx'> 		ret = btrfs_search_slot(trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 		btrfs_trans_release_chunk_metadata(trans);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		leaf = path-&gt;nodes[0];</div><div class='ctx'> next_slot:</div><div class='hunk'>@@ -2539,7 +2639,7 @@ next_slot:</div><div class='ctx'> 			if (ret &gt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto error;</div><div class='add'>+				return ret;</div><div class='ctx'> 			leaf = path-&gt;nodes[0];</div><div class='ctx'> 			btrfs_item_key_to_cpu(leaf, &amp;key, path-&gt;slots[0]);</div><div class='ctx'> 			btrfs_release_path(path);</div><div class='hunk'>@@ -2563,19 +2663,14 @@ next_slot:</div><div class='ctx'> 		device = btrfs_find_device(fs_info-&gt;fs_devices, &amp;args);</div><div class='ctx'> 		BUG_ON(!device); /* Logic error */</div><div class='ctx'> </div><div class='del'>-		if (device-&gt;fs_devices-&gt;seeding) {</div><div class='add'>+		if (device-&gt;fs_devices-&gt;seeding)</div><div class='ctx'> 			btrfs_set_device_generation(leaf, dev_item,</div><div class='ctx'> 						    device-&gt;generation);</div><div class='del'>-			btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		path-&gt;slots[0]++;</div><div class='ctx'> 		goto next_slot;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-error:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path)</div><div class='hunk'>@@ -2597,7 +2692,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='ctx'> 	bdev_file = bdev_file_open_by_path(device_path, BLK_OPEN_WRITE,</div><div class='del'>-					fs_info-&gt;bdev_holder, NULL);</div><div class='add'>+					   fs_info-&gt;sb, &amp;fs_holder_ops);</div><div class='ctx'> 	if (IS_ERR(bdev_file))</div><div class='ctx'> 		return PTR_ERR(bdev_file);</div><div class='ctx'> </div><div class='hunk'>@@ -2606,6 +2701,11 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (bdev_nr_bytes(file_bdev(bdev_file)) &lt;= BTRFS_DEVICE_RANGE_RESERVED) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (fs_devices-&gt;seeding) {</div><div class='ctx'> 		seeding_dev = true;</div><div class='ctx'> 		down_write(&amp;sb-&gt;s_umount);</div><div class='hunk'>@@ -2661,11 +2761,9 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path</div><div class='ctx'> 	set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &amp;device-&gt;dev_state);</div><div class='ctx'> 	clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &amp;device-&gt;dev_state);</div><div class='ctx'> 	device-&gt;dev_stats_valid = 1;</div><div class='del'>-	set_blocksize(device-&gt;bdev, BTRFS_BDEV_BLOCKSIZE);</div><div class='add'>+	set_blocksize(device-&gt;bdev_file, BTRFS_BDEV_BLOCKSIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (seeding_dev) {</div><div class='del'>-		btrfs_clear_sb_rdonly(sb);</div><div class='del'>-</div><div class='ctx'> 		/* GFP_KERNEL allocation must not be under device_list_mutex */</div><div class='ctx'> 		seed_devices = btrfs_init_sprout(fs_info);</div><div class='ctx'> 		if (IS_ERR(seed_devices)) {</div><div class='hunk'>@@ -2724,21 +2822,21 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 		ret = init_first_rw_device(trans);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;chunk_mutex);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto error_sysfs;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_add_dev_item(trans, device);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto error_sysfs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (seeding_dev) {</div><div class='ctx'> 		ret = btrfs_finish_sprout(trans);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto error_sysfs;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2808,8 +2906,6 @@ error_sysfs:</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> error_trans:</div><div class='del'>-	if (seeding_dev)</div><div class='del'>-		btrfs_set_sb_rdonly(sb);</div><div class='ctx'> 	if (trans)</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> error_free_zone:</div><div class='hunk'>@@ -2817,7 +2913,7 @@ error_free_zone:</div><div class='ctx'> error_free_device:</div><div class='ctx'> 	btrfs_free_device(device);</div><div class='ctx'> error:</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> 	if (locked) {</div><div class='ctx'> 		mutex_unlock(&amp;uuid_mutex);</div><div class='ctx'> 		up_write(&amp;sb-&gt;s_umount);</div><div class='hunk'>@@ -2829,7 +2925,7 @@ static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,</div><div class='ctx'> 					struct btrfs_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = device-&gt;fs_info-&gt;chunk_root;</div><div class='ctx'> 	struct btrfs_dev_item *dev_item;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -2845,12 +2941,10 @@ static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, 0, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	dev_item = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_dev_item);</div><div class='hunk'>@@ -2864,10 +2958,6 @@ static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,</div><div class='ctx'> 				     btrfs_device_get_disk_total_bytes(device));</div><div class='ctx'> 	btrfs_set_device_bytes_used(leaf, dev_item,</div><div class='ctx'> 				    btrfs_device_get_bytes_used(device));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2920,7 +3010,7 @@ static int btrfs_free_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;chunk_root;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -2928,25 +3018,26 @@ static int btrfs_free_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;</div><div class='del'>-	key.offset = chunk_offset;</div><div class='ctx'> 	key.type = BTRFS_CHUNK_ITEM_KEY;</div><div class='add'>+	key.offset = chunk_offset;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(trans, root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	else if (ret &gt; 0) { /* Logic error or corruption */</div><div class='del'>-		btrfs_handle_fs_error(fs_info, -ENOENT,</div><div class='del'>-				      "Failed lookup while freeing chunk.");</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='add'>+	if (unlikely(ret &gt; 0)) {</div><div class='add'>+		/* Logic error or corruption */</div><div class='add'>+		btrfs_err(fs_info, "failed to lookup chunk %llu when freeing",</div><div class='add'>+			  chunk_offset);</div><div class='add'>+		btrfs_abort_transaction(trans, -ENOENT);</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_del_item(trans, root, path);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		btrfs_handle_fs_error(fs_info, ret,</div><div class='del'>-				      "Failed to delete chunk item.");</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		btrfs_err(fs_info, "failed to delete chunk %llu item", chunk_offset);</div><div class='add'>+		btrfs_abort_transaction(trans, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3087,7 +3178,6 @@ struct btrfs_chunk_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	map = btrfs_find_chunk_map(fs_info, logical, length);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!map)) {</div><div class='del'>-		read_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='ctx'> 			   "unable to find chunk map for logical %llu length %llu",</div><div class='ctx'> 			   logical, length);</div><div class='hunk'>@@ -3095,7 +3185,6 @@ struct btrfs_chunk_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(map-&gt;start &gt; logical || map-&gt;start + map-&gt;chunk_len &lt;= logical)) {</div><div class='del'>-		read_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='ctx'> 		btrfs_crit(fs_info,</div><div class='ctx'> 			   "found a bad chunk map, wanted %llu-%llu, found %llu-%llu",</div><div class='ctx'> 			   logical, logical + length, map-&gt;start,</div><div class='hunk'>@@ -3146,7 +3235,8 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 		 * user having built with ASSERT enabled, so if ASSERT doesn't</div><div class='ctx'> 		 * do anything we still error out.</div><div class='ctx'> 		 */</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN("errr %ld reading chunk map at offset %llu",</div><div class='add'>+			   PTR_ERR(map), chunk_offset);</div><div class='ctx'> 		return PTR_ERR(map);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3166,7 +3256,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 		ret = btrfs_free_dev_extent(trans, device,</div><div class='ctx'> 					    map-&gt;stripes[i].physical,</div><div class='ctx'> 					    &amp;dev_extent_len);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3178,6 +3268,12 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 					device-&gt;bytes_used - dev_extent_len);</div><div class='ctx'> 			atomic64_add(dev_extent_len, &amp;fs_info-&gt;free_chunk_space);</div><div class='ctx'> 			btrfs_clear_space_info_full(fs_info);</div><div class='add'>+</div><div class='add'>+			if (list_empty(&amp;device-&gt;post_commit_list)) {</div><div class='add'>+				list_add_tail(&amp;device-&gt;post_commit_list,</div><div class='add'>+					      &amp;trans-&gt;transaction-&gt;dev_update_list);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			mutex_unlock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3227,8 +3323,16 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 	if (ret == -ENOSPC) {</div><div class='ctx'> 		const u64 sys_flags = btrfs_system_alloc_profile(fs_info);</div><div class='ctx'> 		struct btrfs_block_group *sys_bg;</div><div class='add'>+		struct btrfs_space_info *space_info;</div><div class='ctx'> </div><div class='del'>-		sys_bg = btrfs_create_chunk(trans, sys_flags);</div><div class='add'>+		space_info = btrfs_find_space_info(fs_info, sys_flags);</div><div class='add'>+		if (unlikely(!space_info)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			btrfs_abort_transaction(trans, ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sys_bg = btrfs_create_chunk(trans, space_info, sys_flags);</div><div class='ctx'> 		if (IS_ERR(sys_bg)) {</div><div class='ctx'> 			ret = PTR_ERR(sys_bg);</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='hunk'>@@ -3236,17 +3340,17 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_chunk_alloc_add_chunk_item(trans, sys_bg);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = remove_chunk_item(trans, map, chunk_offset);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (ret) {</div><div class='add'>+	} else if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3255,7 +3359,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> </div><div class='ctx'> 	if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_SYSTEM) {</div><div class='ctx'> 		ret = btrfs_del_sys_chunk(fs_info, chunk_offset);</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (unlikely(ret)) {</div><div class='ctx'> 			btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3271,7 +3375,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)</div><div class='ctx'> 	btrfs_trans_release_chunk_metadata(trans);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_remove_block_group(trans, map);</div><div class='del'>-	if (ret) {</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3286,7 +3390,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)</div><div class='add'>+int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset,</div><div class='add'>+			 bool verbose)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;chunk_root;</div><div class='ctx'> 	struct btrfs_trans_handle *trans;</div><div class='hunk'>@@ -3316,7 +3421,7 @@ int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)</div><div class='ctx'> </div><div class='ctx'> 	/* step one, relocate all the extents inside this chunk */</div><div class='ctx'> 	btrfs_scrub_pause(fs_info);</div><div class='del'>-	ret = btrfs_relocate_block_group(fs_info, chunk_offset);</div><div class='add'>+	ret = btrfs_relocate_block_group(fs_info, chunk_offset, true);</div><div class='ctx'> 	btrfs_scrub_continue(fs_info);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3369,7 +3474,7 @@ int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)</div><div class='ctx'> static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *chunk_root = fs_info-&gt;chunk_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_chunk *chunk;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='hunk'>@@ -3385,24 +3490,34 @@ static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	key.type = BTRFS_CHUNK_ITEM_KEY;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 		ret = btrfs_search_slot(NULL, chunk_root, &amp;key, path, 0, 0);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='del'>-			goto error;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		if (unlikely(ret == 0)) {</div><div class='add'>+			/*</div><div class='add'>+			 * On the first search we would find chunk tree with</div><div class='add'>+			 * offset -1, which is not possible. On subsequent</div><div class='add'>+			 * loops this would find an existing item on an invalid</div><div class='add'>+			 * offset (one less than the previous one, wrong</div><div class='add'>+			 * alignment and size).</div><div class='add'>+			 */</div><div class='add'>+			mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='add'>+			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='del'>-		BUG_ON(ret == 0); /* Corruption */</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_previous_item(chunk_root, path, key.objectid,</div><div class='ctx'> 					  key.type);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -3415,7 +3530,8 @@ again:</div><div class='ctx'> 		btrfs_release_path(path);</div><div class='ctx'> </div><div class='ctx'> 		if (chunk_type &amp; BTRFS_BLOCK_GROUP_SYSTEM) {</div><div class='del'>-			ret = btrfs_relocate_chunk(fs_info, found_key.offset);</div><div class='add'>+			ret = btrfs_relocate_chunk(fs_info, found_key.offset,</div><div class='add'>+						   true);</div><div class='ctx'> 			if (ret == -ENOSPC)</div><div class='ctx'> 				failed++;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -3435,8 +3551,6 @@ again:</div><div class='ctx'> 	} else if (WARN_ON(failed &amp;&amp; retried)) {</div><div class='ctx'> 		ret = -ENOSPC;</div><div class='ctx'> 	}</div><div class='del'>-error:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3482,6 +3596,44 @@ static int btrfs_may_alloc_data_chunk(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,</div><div class='add'>+					   const struct btrfs_disk_balance_args *disk)</div><div class='add'>+{</div><div class='add'>+	memset(cpu, 0, sizeof(*cpu));</div><div class='add'>+</div><div class='add'>+	cpu-&gt;profiles = le64_to_cpu(disk-&gt;profiles);</div><div class='add'>+	cpu-&gt;usage = le64_to_cpu(disk-&gt;usage);</div><div class='add'>+	cpu-&gt;devid = le64_to_cpu(disk-&gt;devid);</div><div class='add'>+	cpu-&gt;pstart = le64_to_cpu(disk-&gt;pstart);</div><div class='add'>+	cpu-&gt;pend = le64_to_cpu(disk-&gt;pend);</div><div class='add'>+	cpu-&gt;vstart = le64_to_cpu(disk-&gt;vstart);</div><div class='add'>+	cpu-&gt;vend = le64_to_cpu(disk-&gt;vend);</div><div class='add'>+	cpu-&gt;target = le64_to_cpu(disk-&gt;target);</div><div class='add'>+	cpu-&gt;flags = le64_to_cpu(disk-&gt;flags);</div><div class='add'>+	cpu-&gt;limit = le64_to_cpu(disk-&gt;limit);</div><div class='add'>+	cpu-&gt;stripes_min = le32_to_cpu(disk-&gt;stripes_min);</div><div class='add'>+	cpu-&gt;stripes_max = le32_to_cpu(disk-&gt;stripes_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btrfs_cpu_balance_args_to_disk(struct btrfs_disk_balance_args *disk,</div><div class='add'>+					   const struct btrfs_balance_args *cpu)</div><div class='add'>+{</div><div class='add'>+	memset(disk, 0, sizeof(*disk));</div><div class='add'>+</div><div class='add'>+	disk-&gt;profiles = cpu_to_le64(cpu-&gt;profiles);</div><div class='add'>+	disk-&gt;usage = cpu_to_le64(cpu-&gt;usage);</div><div class='add'>+	disk-&gt;devid = cpu_to_le64(cpu-&gt;devid);</div><div class='add'>+	disk-&gt;pstart = cpu_to_le64(cpu-&gt;pstart);</div><div class='add'>+	disk-&gt;pend = cpu_to_le64(cpu-&gt;pend);</div><div class='add'>+	disk-&gt;vstart = cpu_to_le64(cpu-&gt;vstart);</div><div class='add'>+	disk-&gt;vend = cpu_to_le64(cpu-&gt;vend);</div><div class='add'>+	disk-&gt;target = cpu_to_le64(cpu-&gt;target);</div><div class='add'>+	disk-&gt;flags = cpu_to_le64(cpu-&gt;flags);</div><div class='add'>+	disk-&gt;limit = cpu_to_le64(cpu-&gt;limit);</div><div class='add'>+	disk-&gt;stripes_min = cpu_to_le32(cpu-&gt;stripes_min);</div><div class='add'>+	disk-&gt;stripes_max = cpu_to_le32(cpu-&gt;stripes_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int insert_balance_item(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			       struct btrfs_balance_control *bctl)</div><div class='ctx'> {</div><div class='hunk'>@@ -3524,10 +3676,7 @@ static int insert_balance_item(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	btrfs_set_balance_meta(leaf, item, &amp;disk_bargs);</div><div class='ctx'> 	btrfs_cpu_balance_args_to_disk(&amp;disk_bargs, &amp;bctl-&gt;sys);</div><div class='ctx'> 	btrfs_set_balance_sys(leaf, item, &amp;disk_bargs);</div><div class='del'>-</div><div class='ctx'> 	btrfs_set_balance_flags(leaf, item, bctl-&gt;flags);</div><div class='del'>-</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_free_path(path);</div><div class='ctx'> 	err = btrfs_commit_transaction(trans);</div><div class='hunk'>@@ -3626,7 +3775,7 @@ static void reset_balance_state(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_balance_control *bctl = fs_info-&gt;balance_ctl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!fs_info-&gt;balance_ctl);</div><div class='add'>+	ASSERT(fs_info-&gt;balance_ctl);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;balance_lock);</div><div class='ctx'> 	fs_info-&gt;balance_ctl = NULL;</div><div class='hunk'>@@ -3642,26 +3791,25 @@ static void reset_balance_state(struct btrfs_fs_info *fs_info)</div><div class='ctx'>  * Balance filters.  Return 1 if chunk should be filtered out</div><div class='ctx'>  * (should not be balanced).</div><div class='ctx'>  */</div><div class='del'>-static int chunk_profiles_filter(u64 chunk_type,</div><div class='del'>-				 struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_profiles_filter(u64 chunk_type, struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	chunk_type = chunk_to_extended(chunk_type) &amp;</div><div class='ctx'> 				BTRFS_EXTENDED_PROFILE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (bargs-&gt;profiles &amp; chunk_type)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chunk_usage_range_filter(struct btrfs_fs_info *fs_info, u64 chunk_offset,</div><div class='del'>-			      struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_usage_range_filter(struct btrfs_fs_info *fs_info, u64 chunk_offset,</div><div class='add'>+				     struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='ctx'> 	u64 chunk_used;</div><div class='ctx'> 	u64 user_thresh_min;</div><div class='ctx'> 	u64 user_thresh_max;</div><div class='del'>-	int ret = 1;</div><div class='add'>+	bool ret = true;</div><div class='ctx'> </div><div class='ctx'> 	cache = btrfs_lookup_block_group(fs_info, chunk_offset);</div><div class='ctx'> 	chunk_used = cache-&gt;used;</div><div class='hunk'>@@ -3679,18 +3827,18 @@ static int chunk_usage_range_filter(struct btrfs_fs_info *fs_info, u64 chunk_off</div><div class='ctx'> 		user_thresh_max = mult_perc(cache-&gt;length, bargs-&gt;usage_max);</div><div class='ctx'> </div><div class='ctx'> 	if (user_thresh_min &lt;= chunk_used &amp;&amp; chunk_used &lt; user_thresh_max)</div><div class='del'>-		ret = 0;</div><div class='add'>+		ret = false;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chunk_usage_filter(struct btrfs_fs_info *fs_info,</div><div class='del'>-		u64 chunk_offset, struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_usage_filter(struct btrfs_fs_info *fs_info, u64 chunk_offset,</div><div class='add'>+			       struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='ctx'> 	u64 chunk_used, user_thresh;</div><div class='del'>-	int ret = 1;</div><div class='add'>+	bool ret = true;</div><div class='ctx'> </div><div class='ctx'> 	cache = btrfs_lookup_block_group(fs_info, chunk_offset);</div><div class='ctx'> 	chunk_used = cache-&gt;used;</div><div class='hunk'>@@ -3703,15 +3851,14 @@ static int chunk_usage_filter(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		user_thresh = mult_perc(cache-&gt;length, bargs-&gt;usage);</div><div class='ctx'> </div><div class='ctx'> 	if (chunk_used &lt; user_thresh)</div><div class='del'>-		ret = 0;</div><div class='add'>+		ret = false;</div><div class='ctx'> </div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chunk_devid_filter(struct extent_buffer *leaf,</div><div class='del'>-			      struct btrfs_chunk *chunk,</div><div class='del'>-			      struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_devid_filter(struct extent_buffer *leaf, struct btrfs_chunk *chunk,</div><div class='add'>+			       struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_stripe *stripe;</div><div class='ctx'> 	int num_stripes = btrfs_chunk_num_stripes(leaf, chunk);</div><div class='hunk'>@@ -3720,10 +3867,10 @@ static int chunk_devid_filter(struct extent_buffer *leaf,</div><div class='ctx'> 	for (i = 0; i &lt; num_stripes; i++) {</div><div class='ctx'> 		stripe = btrfs_stripe_nr(chunk, i);</div><div class='ctx'> 		if (btrfs_stripe_devid(leaf, stripe) == bargs-&gt;devid)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 calc_data_stripes(u64 type, int num_stripes)</div><div class='hunk'>@@ -3736,9 +3883,8 @@ static u64 calc_data_stripes(u64 type, int num_stripes)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* [pstart, pend) */</div><div class='del'>-static int chunk_drange_filter(struct extent_buffer *leaf,</div><div class='del'>-			       struct btrfs_chunk *chunk,</div><div class='del'>-			       struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_drange_filter(struct extent_buffer *leaf, struct btrfs_chunk *chunk,</div><div class='add'>+				struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_stripe *stripe;</div><div class='ctx'> 	int num_stripes = btrfs_chunk_num_stripes(leaf, chunk);</div><div class='hunk'>@@ -3749,7 +3895,7 @@ static int chunk_drange_filter(struct extent_buffer *leaf,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_DEVID))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	type = btrfs_chunk_type(leaf, chunk);</div><div class='ctx'> 	factor = calc_data_stripes(type, num_stripes);</div><div class='hunk'>@@ -3765,56 +3911,53 @@ static int chunk_drange_filter(struct extent_buffer *leaf,</div><div class='ctx'> </div><div class='ctx'> 		if (stripe_offset &lt; bargs-&gt;pend &amp;&amp;</div><div class='ctx'> 		    stripe_offset + stripe_length &gt; bargs-&gt;pstart)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* [vstart, vend) */</div><div class='del'>-static int chunk_vrange_filter(struct extent_buffer *leaf,</div><div class='del'>-			       struct btrfs_chunk *chunk,</div><div class='del'>-			       u64 chunk_offset,</div><div class='del'>-			       struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_vrange_filter(struct extent_buffer *leaf, struct btrfs_chunk *chunk,</div><div class='add'>+				u64 chunk_offset, struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	if (chunk_offset &lt; bargs-&gt;vend &amp;&amp;</div><div class='ctx'> 	    chunk_offset + btrfs_chunk_length(leaf, chunk) &gt; bargs-&gt;vstart)</div><div class='ctx'> 		/* at least part of the chunk is inside this vrange */</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chunk_stripes_range_filter(struct extent_buffer *leaf,</div><div class='del'>-			       struct btrfs_chunk *chunk,</div><div class='del'>-			       struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_stripes_range_filter(struct extent_buffer *leaf,</div><div class='add'>+				       struct btrfs_chunk *chunk,</div><div class='add'>+				       struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	int num_stripes = btrfs_chunk_num_stripes(leaf, chunk);</div><div class='ctx'> </div><div class='ctx'> 	if (bargs-&gt;stripes_min &lt;= num_stripes</div><div class='ctx'> 			&amp;&amp; num_stripes &lt;= bargs-&gt;stripes_max)</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int chunk_soft_convert_filter(u64 chunk_type,</div><div class='del'>-				     struct btrfs_balance_args *bargs)</div><div class='add'>+static bool chunk_soft_convert_filter(u64 chunk_type, struct btrfs_balance_args *bargs)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_CONVERT))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	chunk_type = chunk_to_extended(chunk_type) &amp;</div><div class='ctx'> 				BTRFS_EXTENDED_PROFILE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (bargs-&gt;target == chunk_type)</div><div class='del'>-		return 1;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int should_balance_chunk(struct extent_buffer *leaf,</div><div class='del'>-				struct btrfs_chunk *chunk, u64 chunk_offset)</div><div class='add'>+static bool should_balance_chunk(struct extent_buffer *leaf, struct btrfs_chunk *chunk,</div><div class='add'>+				 u64 chunk_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = leaf-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_balance_control *bctl = fs_info-&gt;balance_ctl;</div><div class='hunk'>@@ -3824,7 +3967,7 @@ static int should_balance_chunk(struct extent_buffer *leaf,</div><div class='ctx'> 	/* type filter */</div><div class='ctx'> 	if (!((chunk_type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK) &amp;</div><div class='ctx'> 	      (bctl-&gt;flags &amp; BTRFS_BALANCE_TYPE_MASK))) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chunk_type &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='hunk'>@@ -3837,46 +3980,46 @@ static int should_balance_chunk(struct extent_buffer *leaf,</div><div class='ctx'> 	/* profiles filter */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_PROFILES) &amp;&amp;</div><div class='ctx'> 	    chunk_profiles_filter(chunk_type, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* usage filter */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_USAGE) &amp;&amp;</div><div class='ctx'> 	    chunk_usage_filter(fs_info, chunk_offset, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	} else if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_USAGE_RANGE) &amp;&amp;</div><div class='ctx'> 	    chunk_usage_range_filter(fs_info, chunk_offset, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* devid filter */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_DEVID) &amp;&amp;</div><div class='ctx'> 	    chunk_devid_filter(leaf, chunk, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* drange filter, makes sense only with devid filter */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_DRANGE) &amp;&amp;</div><div class='ctx'> 	    chunk_drange_filter(leaf, chunk, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* vrange filter */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_VRANGE) &amp;&amp;</div><div class='ctx'> 	    chunk_vrange_filter(leaf, chunk, chunk_offset, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* stripes filter */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_STRIPES_RANGE) &amp;&amp;</div><div class='ctx'> 	    chunk_stripes_range_filter(leaf, chunk, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* soft profile changing mode */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_SOFT) &amp;&amp;</div><div class='ctx'> 	    chunk_soft_convert_filter(chunk_type, bargs)) {</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3884,7 +4027,7 @@ static int should_balance_chunk(struct extent_buffer *leaf,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_LIMIT)) {</div><div class='ctx'> 		if (bargs-&gt;limit == 0)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 		else</div><div class='ctx'> 			bargs-&gt;limit--;</div><div class='ctx'> 	} else if ((bargs-&gt;flags &amp; BTRFS_BALANCE_ARGS_LIMIT_RANGE)) {</div><div class='hunk'>@@ -3894,12 +4037,12 @@ static int should_balance_chunk(struct extent_buffer *leaf,</div><div class='ctx'> 		 * about the count of all chunks that satisfy the filters.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (bargs-&gt;limit_max == 0)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 		else</div><div class='ctx'> 			bargs-&gt;limit_max--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __btrfs_balance(struct btrfs_fs_info *fs_info)</div><div class='hunk'>@@ -3908,7 +4051,7 @@ static int __btrfs_balance(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_root *chunk_root = fs_info-&gt;chunk_root;</div><div class='ctx'> 	u64 chunk_type;</div><div class='ctx'> 	struct btrfs_chunk *chunk;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -3946,8 +4089,8 @@ again:</div><div class='ctx'> 		bctl-&gt;sys.limit = limit_sys;</div><div class='ctx'> 	}</div><div class='ctx'> 	key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	key.type = BTRFS_CHUNK_ITEM_KEY;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if ((!counting &amp;&amp; atomic_read(&amp;fs_info-&gt;balance_pause_req)) ||</div><div class='hunk'>@@ -4051,7 +4194,7 @@ again:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_relocate_chunk(fs_info, found_key.offset);</div><div class='add'>+		ret = btrfs_relocate_chunk(fs_info, found_key.offset, true);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 		if (ret == -ENOSPC) {</div><div class='ctx'> 			enospc_errors++;</div><div class='hunk'>@@ -4079,7 +4222,6 @@ loop:</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> error:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (enospc_errors) {</div><div class='ctx'> 		btrfs_info(fs_info, "%d enospc errors during balance",</div><div class='ctx'> 			   enospc_errors);</div><div class='hunk'>@@ -4096,7 +4238,7 @@ error:</div><div class='ctx'>  * @flags:     profile to validate</div><div class='ctx'>  * @extended:  if true @flags is treated as an extended profile</div><div class='ctx'>  */</div><div class='del'>-static int alloc_profile_is_valid(u64 flags, int extended)</div><div class='add'>+static int alloc_profile_is_valid(u64 flags, bool extended)</div><div class='ctx'> {</div><div class='ctx'> 	u64 mask = (extended ? BTRFS_EXTENDED_PROFILE_MASK :</div><div class='ctx'> 			       BTRFS_BLOCK_GROUP_PROFILE_MASK);</div><div class='hunk'>@@ -4237,7 +4379,7 @@ static void describe_balance_start_or_resume(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	u32 size_buf = 1024;</div><div class='ctx'> 	char tmp_buf[192] = {'\0'};</div><div class='del'>-	char *buf;</div><div class='add'>+	char AUTO_KFREE(buf);</div><div class='ctx'> 	char *bp;</div><div class='ctx'> 	u32 size_bp = size_buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -4285,12 +4427,10 @@ out_overflow:</div><div class='ctx'> 	btrfs_info(fs_info, "balance: %s %s",</div><div class='ctx'> 		   (bctl-&gt;flags &amp; BTRFS_BALANCE_RESUME) ?</div><div class='ctx'> 		   "resume" : "start", buf);</div><div class='del'>-</div><div class='del'>-	kfree(buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Should be called with balance mutexe held</div><div class='add'>+ * Should be called with balance mutex held</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_balance(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		  struct btrfs_balance_control *bctl,</div><div class='hunk'>@@ -4487,12 +4627,12 @@ static int balance_kthread(void *data)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = data;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	sb_start_write(fs_info-&gt;sb);</div><div class='add'>+	guard(super_write)(fs_info-&gt;sb);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;balance_mutex);</div><div class='ctx'> 	if (fs_info-&gt;balance_ctl)</div><div class='ctx'> 		ret = btrfs_balance(fs_info, fs_info-&gt;balance_ctl, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;balance_mutex);</div><div class='del'>-	sb_end_write(fs_info-&gt;sb);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4514,7 +4654,8 @@ int btrfs_resume_balance_async(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;super_lock);</div><div class='del'>-	ASSERT(fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED);</div><div class='add'>+	ASSERT(fs_info-&gt;exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED,</div><div class='add'>+	       "exclusive_operation=%d", fs_info-&gt;exclusive_operation);</div><div class='ctx'> 	fs_info-&gt;exclusive_operation = BTRFS_EXCLOP_BALANCE;</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;super_lock);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4535,7 +4676,7 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_balance_control *bctl;</div><div class='ctx'> 	struct btrfs_balance_item *item;</div><div class='ctx'> 	struct btrfs_disk_balance_args disk_bargs;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -4550,17 +4691,14 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, fs_info-&gt;tree_root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (ret &gt; 0) { /* ret = -ENOENT; */</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bctl = kzalloc(sizeof(*bctl), GFP_NOFS);</div><div class='del'>-	if (!bctl) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!bctl)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	item = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_balance_item);</div><div class='hunk'>@@ -4597,8 +4735,6 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	fs_info-&gt;balance_ctl = bctl;</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;balance_lock);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;balance_mutex);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4680,183 +4816,6 @@ int btrfs_cancel_balance(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_uuid_scan_kthread(void *data)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_fs_info *fs_info = data;</div><div class='del'>-	struct btrfs_root *root = fs_info-&gt;tree_root;</div><div class='del'>-	struct btrfs_key key;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct extent_buffer *eb;</div><div class='del'>-	int slot;</div><div class='del'>-	struct btrfs_root_item root_item;</div><div class='del'>-	u32 item_size;</div><div class='del'>-	struct btrfs_trans_handle *trans = NULL;</div><div class='del'>-	bool closing = false;</div><div class='del'>-</div><div class='del'>-	path = btrfs_alloc_path();</div><div class='del'>-	if (!path) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	key.objectid = 0;</div><div class='del'>-	key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='del'>-	key.offset = 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (btrfs_fs_closing(fs_info)) {</div><div class='del'>-			closing = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = btrfs_search_forward(root, &amp;key, path,</div><div class='del'>-				BTRFS_OLDEST_GENERATION);</div><div class='del'>-		if (ret) {</div><div class='del'>-			if (ret &gt; 0)</div><div class='del'>-				ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (key.type != BTRFS_ROOT_ITEM_KEY ||</div><div class='del'>-		    (key.objectid &lt; BTRFS_FIRST_FREE_OBJECTID &amp;&amp;</div><div class='del'>-		     key.objectid != BTRFS_FS_TREE_OBJECTID) ||</div><div class='del'>-		    key.objectid &gt; BTRFS_LAST_FREE_OBJECTID)</div><div class='del'>-			goto skip;</div><div class='del'>-</div><div class='del'>-		eb = path-&gt;nodes[0];</div><div class='del'>-		slot = path-&gt;slots[0];</div><div class='del'>-		item_size = btrfs_item_size(eb, slot);</div><div class='del'>-		if (item_size &lt; sizeof(root_item))</div><div class='del'>-			goto skip;</div><div class='del'>-</div><div class='del'>-		read_extent_buffer(eb, &amp;root_item,</div><div class='del'>-				   btrfs_item_ptr_offset(eb, slot),</div><div class='del'>-				   (int)sizeof(root_item));</div><div class='del'>-		if (btrfs_root_refs(&amp;root_item) == 0)</div><div class='del'>-			goto skip;</div><div class='del'>-</div><div class='del'>-		if (!btrfs_is_empty_uuid(root_item.uuid) ||</div><div class='del'>-		    !btrfs_is_empty_uuid(root_item.received_uuid)) {</div><div class='del'>-			if (trans)</div><div class='del'>-				goto update_tree;</div><div class='del'>-</div><div class='del'>-			btrfs_release_path(path);</div><div class='del'>-			/*</div><div class='del'>-			 * 1 - subvol uuid item</div><div class='del'>-			 * 1 - received_subvol uuid item</div><div class='del'>-			 */</div><div class='del'>-			trans = btrfs_start_transaction(fs_info-&gt;uuid_root, 2);</div><div class='del'>-			if (IS_ERR(trans)) {</div><div class='del'>-				ret = PTR_ERR(trans);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		} else {</div><div class='del'>-			goto skip;</div><div class='del'>-		}</div><div class='del'>-update_tree:</div><div class='del'>-		btrfs_release_path(path);</div><div class='del'>-		if (!btrfs_is_empty_uuid(root_item.uuid)) {</div><div class='del'>-			ret = btrfs_uuid_tree_add(trans, root_item.uuid,</div><div class='del'>-						  BTRFS_UUID_KEY_SUBVOL,</div><div class='del'>-						  key.objectid);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				btrfs_warn(fs_info, "uuid_tree_add failed %d",</div><div class='del'>-					ret);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!btrfs_is_empty_uuid(root_item.received_uuid)) {</div><div class='del'>-			ret = btrfs_uuid_tree_add(trans,</div><div class='del'>-						  root_item.received_uuid,</div><div class='del'>-						 BTRFS_UUID_KEY_RECEIVED_SUBVOL,</div><div class='del'>-						  key.objectid);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				btrfs_warn(fs_info, "uuid_tree_add failed %d",</div><div class='del'>-					ret);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-skip:</div><div class='del'>-		btrfs_release_path(path);</div><div class='del'>-		if (trans) {</div><div class='del'>-			ret = btrfs_end_transaction(trans);</div><div class='del'>-			trans = NULL;</div><div class='del'>-			if (ret)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (key.offset &lt; (u64)-1) {</div><div class='del'>-			key.offset++;</div><div class='del'>-		} else if (key.type &lt; BTRFS_ROOT_ITEM_KEY) {</div><div class='del'>-			key.offset = 0;</div><div class='del'>-			key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='del'>-		} else if (key.objectid &lt; (u64)-1) {</div><div class='del'>-			key.offset = 0;</div><div class='del'>-			key.type = BTRFS_ROOT_ITEM_KEY;</div><div class='del'>-			key.objectid++;</div><div class='del'>-		} else {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	if (trans &amp;&amp; !IS_ERR(trans))</div><div class='del'>-		btrfs_end_transaction(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		btrfs_warn(fs_info, "btrfs_uuid_scan_kthread failed %d", ret);</div><div class='del'>-	else if (!closing)</div><div class='del'>-		set_bit(BTRFS_FS_UPDATE_UUID_TREE_GEN, &amp;fs_info-&gt;flags);</div><div class='del'>-	up(&amp;fs_info-&gt;uuid_tree_rescan_sem);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	struct btrfs_trans_handle *trans;</div><div class='del'>-	struct btrfs_root *tree_root = fs_info-&gt;tree_root;</div><div class='del'>-	struct btrfs_root *uuid_root;</div><div class='del'>-	struct task_struct *task;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 1 - root node</div><div class='del'>-	 * 1 - root item</div><div class='del'>-	 */</div><div class='del'>-	trans = btrfs_start_transaction(tree_root, 2);</div><div class='del'>-	if (IS_ERR(trans))</div><div class='del'>-		return PTR_ERR(trans);</div><div class='del'>-</div><div class='del'>-	uuid_root = btrfs_create_tree(trans, BTRFS_UUID_TREE_OBJECTID);</div><div class='del'>-	if (IS_ERR(uuid_root)) {</div><div class='del'>-		ret = PTR_ERR(uuid_root);</div><div class='del'>-		btrfs_abort_transaction(trans, ret);</div><div class='del'>-		btrfs_end_transaction(trans);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fs_info-&gt;uuid_root = uuid_root;</div><div class='del'>-</div><div class='del'>-	ret = btrfs_commit_transaction(trans);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	down(&amp;fs_info-&gt;uuid_tree_rescan_sem);</div><div class='del'>-	task = kthread_run(btrfs_uuid_scan_kthread, fs_info, "btrfs-uuid");</div><div class='del'>-	if (IS_ERR(task)) {</div><div class='del'>-		/* fs_info-&gt;update_uuid_tree_gen remains 0 in all error case */</div><div class='del'>-		btrfs_warn(fs_info, "failed to start uuid_scan task");</div><div class='del'>-		up(&amp;fs_info-&gt;uuid_tree_rescan_sem);</div><div class='del'>-		return PTR_ERR(task);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * shrinking a device means finding all of the device extents past</div><div class='ctx'>  * the new size, and then following the back refs to the chunks.</div><div class='hunk'>@@ -4940,8 +4899,8 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	key.objectid = device-&gt;devid;</div><div class='del'>-	key.offset = (u64)-1;</div><div class='ctx'> 	key.type = BTRFS_DEV_EXTENT_KEY;</div><div class='add'>+	key.offset = (u64)-1;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		mutex_lock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='hunk'>@@ -4995,7 +4954,7 @@ again:</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = btrfs_relocate_chunk(fs_info, chunk_offset);</div><div class='add'>+		ret = btrfs_relocate_chunk(fs_info, chunk_offset, true);</div><div class='ctx'> 		mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 		if (ret == -ENOSPC) {</div><div class='ctx'> 			failed++;</div><div class='hunk'>@@ -5027,8 +4986,8 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 	/* Clear all state bits beyond the shrunk device size */</div><div class='del'>-	clear_extent_bits(&amp;device-&gt;alloc_state, new_size, (u64)-1,</div><div class='del'>-			  CHUNK_STATE_MASK);</div><div class='add'>+	btrfs_clear_extent_bit(&amp;device-&gt;alloc_state, new_size, (u64)-1,</div><div class='add'>+			       CHUNK_STATE_MASK, NULL);</div><div class='ctx'> </div><div class='ctx'> 	btrfs_device_set_disk_total_bytes(device, new_size);</div><div class='ctx'> 	if (list_empty(&amp;device-&gt;post_commit_list))</div><div class='hunk'>@@ -5044,7 +5003,7 @@ again:</div><div class='ctx'> 	/* Now btrfs_update_device() will change the on-disk size. */</div><div class='ctx'> 	ret = btrfs_update_device(trans, device);</div><div class='ctx'> 	btrfs_trans_release_chunk_metadata(trans);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		btrfs_end_transaction(trans);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -5155,6 +5114,8 @@ struct alloc_chunk_ctl {</div><div class='ctx'> 	u64 stripe_size;</div><div class='ctx'> 	u64 chunk_size;</div><div class='ctx'> 	int ndevs;</div><div class='add'>+	/* Space_info the block group is going to belong. */</div><div class='add'>+	struct btrfs_space_info *space_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void init_alloc_chunk_ctl_policy_regular(</div><div class='hunk'>@@ -5228,14 +5189,15 @@ static void init_alloc_chunk_ctl(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	ctl-&gt;ndevs = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (fs_devices-&gt;chunk_alloc_policy) {</div><div class='add'>+	default:</div><div class='add'>+		btrfs_warn_unknown_chunk_allocation(fs_devices-&gt;chunk_alloc_policy);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BTRFS_CHUNK_ALLOC_REGULAR:</div><div class='ctx'> 		init_alloc_chunk_ctl_policy_regular(fs_devices, ctl);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_CHUNK_ALLOC_ZONED:</div><div class='ctx'> 		init_alloc_chunk_ctl_policy_zoned(fs_devices, ctl);</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5374,20 +5336,24 @@ static int decide_stripe_size_zoned(struct alloc_chunk_ctl *ctl,</div><div class='ctx'> 	 * It should hold because:</div><div class='ctx'> 	 *    dev_extent_min == dev_extent_want == zone_size * dev_stripes</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT(devices_info[ctl-&gt;ndevs - 1].max_avail == ctl-&gt;dev_extent_min);</div><div class='add'>+	ASSERT(devices_info[ctl-&gt;ndevs - 1].max_avail == ctl-&gt;dev_extent_min,</div><div class='add'>+	       "ndevs=%d max_avail=%llu dev_extent_min=%llu", ctl-&gt;ndevs,</div><div class='add'>+	       devices_info[ctl-&gt;ndevs - 1].max_avail, ctl-&gt;dev_extent_min);</div><div class='ctx'> </div><div class='ctx'> 	ctl-&gt;stripe_size = zone_size;</div><div class='ctx'> 	ctl-&gt;num_stripes = ctl-&gt;ndevs * ctl-&gt;dev_stripes;</div><div class='ctx'> 	data_stripes = (ctl-&gt;num_stripes - ctl-&gt;nparity) / ctl-&gt;ncopies;</div><div class='ctx'> </div><div class='del'>-	/* stripe_size is fixed in zoned filesysmte. Reduce ndevs instead. */</div><div class='add'>+	/* stripe_size is fixed in zoned filesystem. Reduce ndevs instead. */</div><div class='ctx'> 	if (ctl-&gt;stripe_size * data_stripes &gt; ctl-&gt;max_chunk_size) {</div><div class='ctx'> 		ctl-&gt;ndevs = div_u64(div_u64(ctl-&gt;max_chunk_size * ctl-&gt;ncopies,</div><div class='ctx'> 					     ctl-&gt;stripe_size) + ctl-&gt;nparity,</div><div class='ctx'> 				     ctl-&gt;dev_stripes);</div><div class='ctx'> 		ctl-&gt;num_stripes = ctl-&gt;ndevs * ctl-&gt;dev_stripes;</div><div class='ctx'> 		data_stripes = (ctl-&gt;num_stripes - ctl-&gt;nparity) / ctl-&gt;ncopies;</div><div class='del'>-		ASSERT(ctl-&gt;stripe_size * data_stripes &lt;= ctl-&gt;max_chunk_size);</div><div class='add'>+		ASSERT(ctl-&gt;stripe_size * data_stripes &lt;= ctl-&gt;max_chunk_size,</div><div class='add'>+		       "stripe_size=%llu data_stripes=%d max_chunk_size=%llu",</div><div class='add'>+		       ctl-&gt;stripe_size, data_stripes, ctl-&gt;max_chunk_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctl-&gt;chunk_size = ctl-&gt;stripe_size * data_stripes;</div><div class='hunk'>@@ -5420,12 +5386,13 @@ static int decide_stripe_size(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	ctl-&gt;ndevs = min(ctl-&gt;ndevs, ctl-&gt;devs_max);</div><div class='ctx'> </div><div class='ctx'> 	switch (fs_devices-&gt;chunk_alloc_policy) {</div><div class='add'>+	default:</div><div class='add'>+		btrfs_warn_unknown_chunk_allocation(fs_devices-&gt;chunk_alloc_policy);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BTRFS_CHUNK_ALLOC_REGULAR:</div><div class='ctx'> 		return decide_stripe_size_regular(ctl, devices_info);</div><div class='ctx'> 	case BTRFS_CHUNK_ALLOC_ZONED:</div><div class='ctx'> 		return decide_stripe_size_zoned(ctl, devices_info);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5435,9 +5402,9 @@ static void chunk_map_device_set_bits(struct btrfs_chunk_map *map, unsigned int</div><div class='ctx'> 		struct btrfs_io_stripe *stripe = &amp;map-&gt;stripes[i];</div><div class='ctx'> 		struct btrfs_device *device = stripe-&gt;dev;</div><div class='ctx'> </div><div class='del'>-		set_extent_bit(&amp;device-&gt;alloc_state, stripe-&gt;physical,</div><div class='del'>-			       stripe-&gt;physical + map-&gt;stripe_size - 1,</div><div class='del'>-			       bits | EXTENT_NOWAIT, NULL);</div><div class='add'>+		btrfs_set_extent_bit(&amp;device-&gt;alloc_state, stripe-&gt;physical,</div><div class='add'>+				     stripe-&gt;physical + map-&gt;stripe_size - 1,</div><div class='add'>+				     bits | EXTENT_NOWAIT, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5447,10 +5414,9 @@ static void chunk_map_device_clear_bits(struct btrfs_chunk_map *map, unsigned in</div><div class='ctx'> 		struct btrfs_io_stripe *stripe = &amp;map-&gt;stripes[i];</div><div class='ctx'> 		struct btrfs_device *device = stripe-&gt;dev;</div><div class='ctx'> </div><div class='del'>-		__clear_extent_bit(&amp;device-&gt;alloc_state, stripe-&gt;physical,</div><div class='del'>-				   stripe-&gt;physical + map-&gt;stripe_size - 1,</div><div class='del'>-				   bits | EXTENT_NOWAIT,</div><div class='del'>-				   NULL, NULL);</div><div class='add'>+		btrfs_clear_extent_bit(&amp;device-&gt;alloc_state, stripe-&gt;physical,</div><div class='add'>+				       stripe-&gt;physical + map-&gt;stripe_size - 1,</div><div class='add'>+				       bits | EXTENT_NOWAIT, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5466,33 +5432,34 @@ void btrfs_remove_chunk_map(struct btrfs_fs_info *fs_info, struct btrfs_chunk_ma</div><div class='ctx'> 	btrfs_free_chunk_map(map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int btrfs_chunk_map_cmp(const struct rb_node *new,</div><div class='add'>+			       const struct rb_node *exist)</div><div class='add'>+{</div><div class='add'>+	const struct btrfs_chunk_map *new_map =</div><div class='add'>+		rb_entry(new, struct btrfs_chunk_map, rb_node);</div><div class='add'>+	const struct btrfs_chunk_map *exist_map =</div><div class='add'>+		rb_entry(exist, struct btrfs_chunk_map, rb_node);</div><div class='add'>+</div><div class='add'>+	if (new_map-&gt;start == exist_map-&gt;start)</div><div class='add'>+		return 0;</div><div class='add'>+	if (new_map-&gt;start &lt; exist_map-&gt;start)</div><div class='add'>+		return -1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> EXPORT_FOR_TESTS</div><div class='ctx'> int btrfs_add_chunk_map(struct btrfs_fs_info *fs_info, struct btrfs_chunk_map *map)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **p;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	bool leftmost = true;</div><div class='add'>+	struct rb_node *exist;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='del'>-	p = &amp;fs_info-&gt;mapping_tree.rb_root.rb_node;</div><div class='del'>-	while (*p) {</div><div class='del'>-		struct btrfs_chunk_map *entry;</div><div class='del'>-</div><div class='del'>-		parent = *p;</div><div class='del'>-		entry = rb_entry(parent, struct btrfs_chunk_map, rb_node);</div><div class='del'>-</div><div class='del'>-		if (map-&gt;start &lt; entry-&gt;start) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		} else if (map-&gt;start &gt; entry-&gt;start) {</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-			leftmost = false;</div><div class='del'>-		} else {</div><div class='del'>-			write_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		}</div><div class='add'>+	exist = rb_find_add_cached(&amp;map-&gt;rb_node, &amp;fs_info-&gt;mapping_tree,</div><div class='add'>+				   btrfs_chunk_map_cmp);</div><div class='add'>+</div><div class='add'>+	if (exist) {</div><div class='add'>+		write_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='add'>+		return -EEXIST;</div><div class='ctx'> 	}</div><div class='del'>-	rb_link_node(&amp;map-&gt;rb_node, parent, p);</div><div class='del'>-	rb_insert_color_cached(&amp;map-&gt;rb_node, &amp;fs_info-&gt;mapping_tree, leftmost);</div><div class='ctx'> 	chunk_map_device_set_bits(map, CHUNK_ALLOCATED);</div><div class='ctx'> 	chunk_map_device_clear_bits(map, CHUNK_TRIMMED);</div><div class='ctx'> 	write_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='hunk'>@@ -5515,21 +5482,6 @@ struct btrfs_chunk_map *btrfs_alloc_chunk_map(int num_stripes, gfp_t gfp)</div><div class='ctx'> 	return map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct btrfs_chunk_map *btrfs_clone_chunk_map(struct btrfs_chunk_map *map, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	const int size = btrfs_chunk_map_size(map-&gt;num_stripes);</div><div class='del'>-	struct btrfs_chunk_map *clone;</div><div class='del'>-</div><div class='del'>-	clone = kmemdup(map, size, gfp);</div><div class='del'>-	if (!clone)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	refcount_set(&amp;clone-&gt;refs, 1);</div><div class='del'>-	RB_CLEAR_NODE(&amp;clone-&gt;rb_node);</div><div class='del'>-</div><div class='del'>-	return clone;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> 			struct alloc_chunk_ctl *ctl,</div><div class='ctx'> 			struct btrfs_device_info *devices_info)</div><div class='hunk'>@@ -5540,8 +5492,6 @@ static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	u64 start = ctl-&gt;start;</div><div class='ctx'> 	u64 type = ctl-&gt;type;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int i;</div><div class='del'>-	int j;</div><div class='ctx'> </div><div class='ctx'> 	map = btrfs_alloc_chunk_map(ctl-&gt;num_stripes, GFP_NOFS);</div><div class='ctx'> 	if (!map)</div><div class='hunk'>@@ -5556,8 +5506,8 @@ static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	map-&gt;sub_stripes = ctl-&gt;sub_stripes;</div><div class='ctx'> 	map-&gt;num_stripes = ctl-&gt;num_stripes;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ctl-&gt;ndevs; ++i) {</div><div class='del'>-		for (j = 0; j &lt; ctl-&gt;dev_stripes; ++j) {</div><div class='add'>+	for (int i = 0; i &lt; ctl-&gt;ndevs; i++) {</div><div class='add'>+		for (int j = 0; j &lt; ctl-&gt;dev_stripes; j++) {</div><div class='ctx'> 			int s = i * ctl-&gt;dev_stripes + j;</div><div class='ctx'> 			map-&gt;stripes[s].dev = devices_info[i].dev;</div><div class='ctx'> 			map-&gt;stripes[s].physical = devices_info[i].dev_offset +</div><div class='hunk'>@@ -5573,7 +5523,8 @@ static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	block_group = btrfs_make_block_group(trans, type, start, ctl-&gt;chunk_size);</div><div class='add'>+	block_group = btrfs_make_block_group(trans, ctl-&gt;space_info, type, start,</div><div class='add'>+					     ctl-&gt;chunk_size);</div><div class='ctx'> 	if (IS_ERR(block_group)) {</div><div class='ctx'> 		btrfs_remove_chunk_map(info, map);</div><div class='ctx'> 		return block_group;</div><div class='hunk'>@@ -5599,19 +5550,19 @@ static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans,</div><div class='del'>-					    u64 type)</div><div class='add'>+					     struct btrfs_space_info *space_info,</div><div class='add'>+					     u64 type)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = info-&gt;fs_devices;</div><div class='del'>-	struct btrfs_device_info *devices_info = NULL;</div><div class='add'>+	struct btrfs_device_info AUTO_KFREE(devices_info);</div><div class='ctx'> 	struct alloc_chunk_ctl ctl;</div><div class='del'>-	struct btrfs_block_group *block_group;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;info-&gt;chunk_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!alloc_profile_is_valid(type, 0)) {</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN("invalid alloc profile for type %llu", type);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5623,12 +5574,13 @@ struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> </div><div class='ctx'> 	if (!(type &amp; BTRFS_BLOCK_GROUP_TYPE_MASK)) {</div><div class='ctx'> 		btrfs_err(info, "invalid chunk type 0x%llx requested", type);</div><div class='del'>-		ASSERT(0);</div><div class='add'>+		DEBUG_WARN();</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctl.start = find_next_chunk(info);</div><div class='ctx'> 	ctl.type = type;</div><div class='add'>+	ctl.space_info = space_info;</div><div class='ctx'> 	init_alloc_chunk_ctl(fs_devices, &amp;ctl);</div><div class='ctx'> </div><div class='ctx'> 	devices_info = kcalloc(fs_devices-&gt;rw_devices, sizeof(*devices_info),</div><div class='hunk'>@@ -5637,22 +5589,14 @@ struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	ret = gather_device_info(fs_devices, &amp;ctl, devices_info);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		block_group = ERR_PTR(ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	ret = decide_stripe_size(fs_devices, &amp;ctl, devices_info);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		block_group = ERR_PTR(ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	block_group = create_chunk(trans, &amp;ctl, devices_info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	kfree(devices_info);</div><div class='del'>-	return block_group;</div><div class='add'>+	return create_chunk(trans, &amp;ctl, devices_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5710,7 +5654,7 @@ int btrfs_chunk_alloc_add_chunk_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	item_size = btrfs_chunk_item_size(map-&gt;num_stripes);</div><div class='ctx'> </div><div class='ctx'> 	chunk = kzalloc(item_size, GFP_NOFS);</div><div class='del'>-	if (!chunk) {</div><div class='add'>+	if (unlikely(!chunk)) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		btrfs_abort_transaction(trans, ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -5772,7 +5716,9 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	u64 alloc_profile;</div><div class='ctx'> 	struct btrfs_block_group *meta_bg;</div><div class='add'>+	struct btrfs_space_info *meta_space_info;</div><div class='ctx'> 	struct btrfs_block_group *sys_bg;</div><div class='add'>+	struct btrfs_space_info *sys_space_info;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When adding a new device for sprouting, the seed device is read-only</div><div class='hunk'>@@ -5796,12 +5742,22 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	alloc_profile = btrfs_metadata_alloc_profile(fs_info);</div><div class='del'>-	meta_bg = btrfs_create_chunk(trans, alloc_profile);</div><div class='add'>+	meta_space_info = btrfs_find_space_info(fs_info, alloc_profile);</div><div class='add'>+	if (!meta_space_info) {</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	meta_bg = btrfs_create_chunk(trans, meta_space_info, alloc_profile);</div><div class='ctx'> 	if (IS_ERR(meta_bg))</div><div class='ctx'> 		return PTR_ERR(meta_bg);</div><div class='ctx'> </div><div class='ctx'> 	alloc_profile = btrfs_system_alloc_profile(fs_info);</div><div class='del'>-	sys_bg = btrfs_create_chunk(trans, alloc_profile);</div><div class='add'>+	sys_space_info = btrfs_find_space_info(fs_info, alloc_profile);</div><div class='add'>+	if (!sys_space_info) {</div><div class='add'>+		DEBUG_WARN();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	sys_bg = btrfs_create_chunk(trans, sys_space_info, alloc_profile);</div><div class='ctx'> 	if (IS_ERR(sys_bg))</div><div class='ctx'> 		return PTR_ERR(sys_bg);</div><div class='ctx'> </div><div class='hunk'>@@ -5869,11 +5825,31 @@ void btrfs_mapping_tree_free(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	write_unlock(&amp;fs_info-&gt;mapping_tree_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int btrfs_chunk_map_num_copies(const struct btrfs_chunk_map *map)</div><div class='add'>+{</div><div class='add'>+	enum btrfs_raid_types index = btrfs_bg_flags_to_raid_index(map-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID5)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There could be two corrupted data stripes, we need to loop retry in</div><div class='add'>+	 * order to rebuild the correct data.</div><div class='add'>+	 *</div><div class='add'>+	 * Fail a stripe at a time on every retry except the stripe under</div><div class='add'>+	 * reconstruction.</div><div class='add'>+	 */</div><div class='add'>+	if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID6)</div><div class='add'>+		return map-&gt;num_stripes;</div><div class='add'>+</div><div class='add'>+	/* Non-RAID56, use their ncopies from btrfs_raid_array. */</div><div class='add'>+	return btrfs_raid_array[index].ncopies;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_chunk_map *map;</div><div class='del'>-	enum btrfs_raid_types index;</div><div class='del'>-	int ret = 1;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	map = btrfs_get_chunk_map(fs_info, logical, len);</div><div class='ctx'> 	if (IS_ERR(map))</div><div class='hunk'>@@ -5885,22 +5861,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)</div><div class='ctx'> 		 */</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	index = btrfs_bg_flags_to_raid_index(map-&gt;type);</div><div class='del'>-</div><div class='del'>-	/* Non-RAID56, use their ncopies from btrfs_raid_array. */</div><div class='del'>-	if (!(map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID56_MASK))</div><div class='del'>-		ret = btrfs_raid_array[index].ncopies;</div><div class='del'>-	else if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID5)</div><div class='del'>-		ret = 2;</div><div class='del'>-	else if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID6)</div><div class='del'>-		/*</div><div class='del'>-		 * There could be two corrupted data stripes, we need</div><div class='del'>-		 * to loop retry in order to rebuild the correct data.</div><div class='del'>-		 *</div><div class='del'>-		 * Fail a stripe at a time on every retry except the</div><div class='del'>-		 * stripe under reconstruction.</div><div class='del'>-		 */</div><div class='del'>-		ret = map-&gt;num_stripes;</div><div class='add'>+	ret = btrfs_chunk_map_num_copies(map);</div><div class='ctx'> 	btrfs_free_chunk_map(map);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -5924,53 +5885,113 @@ unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info, u64 logical, u64 len)</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+static int btrfs_read_preferred(struct btrfs_chunk_map *map, int first, int num_stripes)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_chunk_map *map;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	for (int index = first; index &lt; first + num_stripes; index++) {</div><div class='add'>+		const struct btrfs_device *device = map-&gt;stripes[index].dev;</div><div class='ctx'> </div><div class='del'>-	if (!btrfs_fs_incompat(fs_info, RAID56))</div><div class='del'>-		return 0;</div><div class='add'>+		if (device-&gt;devid == READ_ONCE(device-&gt;fs_devices-&gt;read_devid))</div><div class='add'>+			return index;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	map = btrfs_get_chunk_map(fs_info, logical, len);</div><div class='add'>+	/* If no read-preferred device is set use the first stripe. */</div><div class='add'>+	return first;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!WARN_ON(IS_ERR(map))) {</div><div class='del'>-		if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID56_MASK)</div><div class='del'>-			ret = 1;</div><div class='del'>-		btrfs_free_chunk_map(map);</div><div class='add'>+struct stripe_mirror {</div><div class='add'>+	u64 devid;</div><div class='add'>+	int num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int btrfs_cmp_devid(const void *a, const void *b)</div><div class='add'>+{</div><div class='add'>+	const struct stripe_mirror *s1 = (const struct stripe_mirror *)a;</div><div class='add'>+	const struct stripe_mirror *s2 = (const struct stripe_mirror *)b;</div><div class='add'>+</div><div class='add'>+	if (s1-&gt;devid &lt; s2-&gt;devid)</div><div class='add'>+		return -1;</div><div class='add'>+	if (s1-&gt;devid &gt; s2-&gt;devid)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select a stripe for reading using the round-robin algorithm.</div><div class='add'>+ *</div><div class='add'>+ *  1. Compute the read cycle as the total sectors read divided by the minimum</div><div class='add'>+ *     sectors per device.</div><div class='add'>+ *  2. Determine the stripe number for the current read by taking the modulus</div><div class='add'>+ *     of the read cycle with the total number of stripes:</div><div class='add'>+ *</div><div class='add'>+ *      stripe index = (total sectors / min sectors per dev) % num stripes</div><div class='add'>+ *</div><div class='add'>+ * The calculated stripe index is then used to select the corresponding device</div><div class='add'>+ * from the list of devices, which is ordered by devid.</div><div class='add'>+ */</div><div class='add'>+static int btrfs_read_rr(const struct btrfs_chunk_map *map, int first, int num_stripes)</div><div class='add'>+{</div><div class='add'>+	struct stripe_mirror stripes[BTRFS_RAID1_MAX_MIRRORS] = { 0 };</div><div class='add'>+	struct btrfs_device *device  = map-&gt;stripes[first].dev;</div><div class='add'>+	struct btrfs_fs_info *fs_info = device-&gt;fs_devices-&gt;fs_info;</div><div class='add'>+	unsigned int read_cycle;</div><div class='add'>+	unsigned int total_reads;</div><div class='add'>+	unsigned int min_reads_per_dev;</div><div class='add'>+</div><div class='add'>+	total_reads = percpu_counter_sum(&amp;fs_info-&gt;stats_read_blocks);</div><div class='add'>+	min_reads_per_dev = READ_ONCE(fs_info-&gt;fs_devices-&gt;rr_min_contig_read) &gt;&gt;</div><div class='add'>+						       fs_info-&gt;sectorsize_bits;</div><div class='add'>+</div><div class='add'>+	for (int index = 0, i = first; i &lt; first + num_stripes; i++) {</div><div class='add'>+		stripes[index].devid = map-&gt;stripes[i].dev-&gt;devid;</div><div class='add'>+		stripes[index].num = i;</div><div class='add'>+		index++;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	sort(stripes, num_stripes, sizeof(struct stripe_mirror),</div><div class='add'>+	     btrfs_cmp_devid, NULL);</div><div class='add'>+</div><div class='add'>+	read_cycle = total_reads / min_reads_per_dev;</div><div class='add'>+	return stripes[read_cycle % num_stripes].num;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int find_live_mirror(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			    struct btrfs_chunk_map *map, int first,</div><div class='del'>-			    int dev_replace_is_ongoing)</div><div class='add'>+			    bool dev_replace_is_ongoing)</div><div class='ctx'> {</div><div class='add'>+	const enum btrfs_read_policy policy = READ_ONCE(fs_info-&gt;fs_devices-&gt;read_policy);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int num_stripes;</div><div class='ctx'> 	int preferred_mirror;</div><div class='ctx'> 	int tolerance;</div><div class='ctx'> 	struct btrfs_device *srcdev;</div><div class='ctx'> </div><div class='del'>-	ASSERT((map-&gt;type &amp;</div><div class='del'>-		 (BTRFS_BLOCK_GROUP_RAID1_MASK | BTRFS_BLOCK_GROUP_RAID10)));</div><div class='add'>+	ASSERT((map-&gt;type &amp; (BTRFS_BLOCK_GROUP_RAID1_MASK | BTRFS_BLOCK_GROUP_RAID10)),</div><div class='add'>+	       "type=%llu", map-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID10)</div><div class='ctx'> 		num_stripes = map-&gt;sub_stripes;</div><div class='ctx'> 	else</div><div class='ctx'> 		num_stripes = map-&gt;num_stripes;</div><div class='ctx'> </div><div class='del'>-	switch (fs_info-&gt;fs_devices-&gt;read_policy) {</div><div class='add'>+	switch (policy) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Shouldn't happen, just warn and use pid instead of failing */</div><div class='del'>-		btrfs_warn_rl(fs_info,</div><div class='del'>-			      "unknown read_policy type %u, reset to pid",</div><div class='del'>-			      fs_info-&gt;fs_devices-&gt;read_policy);</div><div class='del'>-		fs_info-&gt;fs_devices-&gt;read_policy = BTRFS_READ_POLICY_PID;</div><div class='add'>+		btrfs_warn_rl(fs_info, "unknown read_policy type %u, reset to pid",</div><div class='add'>+			      policy);</div><div class='add'>+		WRITE_ONCE(fs_info-&gt;fs_devices-&gt;read_policy, BTRFS_READ_POLICY_PID);</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case BTRFS_READ_POLICY_PID:</div><div class='ctx'> 		preferred_mirror = first + (current-&gt;pid % num_stripes);</div><div class='ctx'> 		break;</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	case BTRFS_READ_POLICY_RR:</div><div class='add'>+		preferred_mirror = btrfs_read_rr(map, first, num_stripes);</div><div class='add'>+		break;</div><div class='add'>+	case BTRFS_READ_POLICY_DEVID:</div><div class='add'>+		preferred_mirror = btrfs_read_preferred(map, first, num_stripes);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev_replace_is_ongoing &amp;&amp;</div><div class='hunk'>@@ -6002,18 +6023,13 @@ static int find_live_mirror(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	return preferred_mirror;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct btrfs_io_context *alloc_btrfs_io_context(struct btrfs_fs_info *fs_info,</div><div class='del'>-						       u64 logical,</div><div class='del'>-						       u16 total_stripes)</div><div class='add'>+EXPORT_FOR_TESTS</div><div class='add'>+struct btrfs_io_context *alloc_btrfs_io_context(struct btrfs_fs_info *fs_info,</div><div class='add'>+						u64 logical, u16 total_stripes)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_io_context *bioc;</div><div class='ctx'> </div><div class='del'>-	bioc = kzalloc(</div><div class='del'>-		 /* The size of btrfs_io_context */</div><div class='del'>-		sizeof(struct btrfs_io_context) +</div><div class='del'>-		/* Plus the variable array for the stripes */</div><div class='del'>-		sizeof(struct btrfs_io_stripe) * (total_stripes),</div><div class='del'>-		GFP_NOFS);</div><div class='add'>+	bioc = kzalloc(struct_size(bioc, stripes, total_stripes), GFP_NOFS);</div><div class='ctx'> </div><div class='ctx'> 	if (!bioc)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -6200,20 +6216,19 @@ static bool is_block_group_to_copy(struct btrfs_fs_info *fs_info, u64 logical)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_ops_on_dev_replace(enum btrfs_map_op op,</div><div class='del'>-				      struct btrfs_io_context *bioc,</div><div class='add'>+static void handle_ops_on_dev_replace(struct btrfs_io_context *bioc,</div><div class='ctx'> 				      struct btrfs_dev_replace *dev_replace,</div><div class='ctx'> 				      u64 logical,</div><div class='del'>-				      int *num_stripes_ret, int *max_errors_ret)</div><div class='add'>+				      struct btrfs_io_geometry *io_geom)</div><div class='ctx'> {</div><div class='ctx'> 	u64 srcdev_devid = dev_replace-&gt;srcdev-&gt;devid;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * At this stage, num_stripes is still the real number of stripes,</div><div class='ctx'> 	 * excluding the duplicated stripes.</div><div class='ctx'> 	 */</div><div class='del'>-	int num_stripes = *num_stripes_ret;</div><div class='add'>+	int num_stripes = io_geom-&gt;num_stripes;</div><div class='add'>+	int max_errors = io_geom-&gt;max_errors;</div><div class='ctx'> 	int nr_extra_stripes = 0;</div><div class='del'>-	int max_errors = *max_errors_ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -6248,18 +6263,19 @@ static void handle_ops_on_dev_replace(enum btrfs_map_op op,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We can only have at most 2 extra nr_stripes (for DUP). */</div><div class='del'>-	ASSERT(nr_extra_stripes &lt;= 2);</div><div class='add'>+	ASSERT(nr_extra_stripes &lt;= 2, "nr_extra_stripes=%d", nr_extra_stripes);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For GET_READ_MIRRORS, we can only return at most 1 extra stripe for</div><div class='ctx'> 	 * replace.</div><div class='ctx'> 	 * If we have 2 extra stripes, only choose the one with smaller physical.</div><div class='ctx'> 	 */</div><div class='del'>-	if (op == BTRFS_MAP_GET_READ_MIRRORS &amp;&amp; nr_extra_stripes == 2) {</div><div class='add'>+	if (io_geom-&gt;op == BTRFS_MAP_GET_READ_MIRRORS &amp;&amp; nr_extra_stripes == 2) {</div><div class='ctx'> 		struct btrfs_io_stripe *first = &amp;bioc-&gt;stripes[num_stripes];</div><div class='ctx'> 		struct btrfs_io_stripe *second = &amp;bioc-&gt;stripes[num_stripes + 1];</div><div class='ctx'> </div><div class='ctx'> 		/* Only DUP can have two extra stripes. */</div><div class='del'>-		ASSERT(bioc-&gt;map_type &amp; BTRFS_BLOCK_GROUP_DUP);</div><div class='add'>+		ASSERT(bioc-&gt;map_type &amp; BTRFS_BLOCK_GROUP_DUP,</div><div class='add'>+		       "map_type=%llu", bioc-&gt;map_type);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Swap the last stripe stripes and reduce @nr_extra_stripes.</div><div class='hunk'>@@ -6272,8 +6288,8 @@ static void handle_ops_on_dev_replace(enum btrfs_map_op op,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*num_stripes_ret = num_stripes + nr_extra_stripes;</div><div class='del'>-	*max_errors_ret = max_errors + nr_extra_stripes;</div><div class='add'>+	io_geom-&gt;num_stripes = num_stripes + nr_extra_stripes;</div><div class='add'>+	io_geom-&gt;max_errors = max_errors + nr_extra_stripes;</div><div class='ctx'> 	bioc-&gt;replace_nr_stripes = nr_extra_stripes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6286,7 +6302,8 @@ static u64 btrfs_max_io_len(struct btrfs_chunk_map *map, u64 offset,</div><div class='ctx'> 	 */</div><div class='ctx'> 	io_geom-&gt;stripe_offset = offset &amp; BTRFS_STRIPE_LEN_MASK;</div><div class='ctx'> 	io_geom-&gt;stripe_nr = offset &gt;&gt; BTRFS_STRIPE_LEN_SHIFT;</div><div class='del'>-	ASSERT(io_geom-&gt;stripe_offset &lt; U32_MAX);</div><div class='add'>+	ASSERT(io_geom-&gt;stripe_offset &lt; U32_MAX,</div><div class='add'>+	       "stripe_offset=%llu", io_geom-&gt;stripe_offset);</div><div class='ctx'> </div><div class='ctx'> 	if (map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID56_MASK) {</div><div class='ctx'> 		unsigned long full_stripe_len =</div><div class='hunk'>@@ -6304,8 +6321,12 @@ static u64 btrfs_max_io_len(struct btrfs_chunk_map *map, u64 offset,</div><div class='ctx'> 		io_geom-&gt;raid56_full_stripe_start = btrfs_stripe_nr_to_offset(</div><div class='ctx'> 			rounddown(io_geom-&gt;stripe_nr, nr_data_stripes(map)));</div><div class='ctx'> </div><div class='del'>-		ASSERT(io_geom-&gt;raid56_full_stripe_start + full_stripe_len &gt; offset);</div><div class='del'>-		ASSERT(io_geom-&gt;raid56_full_stripe_start &lt;= offset);</div><div class='add'>+		ASSERT(io_geom-&gt;raid56_full_stripe_start + full_stripe_len &gt; offset,</div><div class='add'>+		       "raid56_full_stripe_start=%llu full_stripe_len=%lu offset=%llu",</div><div class='add'>+		       io_geom-&gt;raid56_full_stripe_start, full_stripe_len, offset);</div><div class='add'>+		ASSERT(io_geom-&gt;raid56_full_stripe_start &lt;= offset,</div><div class='add'>+		       "raid56_full_stripe_start=%llu offset=%llu",</div><div class='add'>+		       io_geom-&gt;raid56_full_stripe_start, offset);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For writes to RAID56, allow to write a full stripe set, but</div><div class='ctx'> 		 * no straddling of stripe sets.</div><div class='hunk'>@@ -6330,8 +6351,7 @@ static int set_io_stripe(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> {</div><div class='ctx'> 	dst-&gt;dev = map-&gt;stripes[io_geom-&gt;stripe_index].dev;</div><div class='ctx'> </div><div class='del'>-	if (io_geom-&gt;op == BTRFS_MAP_READ &amp;&amp;</div><div class='del'>-	    btrfs_need_stripe_tree_update(fs_info, map-&gt;type))</div><div class='add'>+	if (io_geom-&gt;op == BTRFS_MAP_READ &amp;&amp; io_geom-&gt;use_rst)</div><div class='ctx'> 		return btrfs_get_raid_extent_offset(fs_info, logical, length,</div><div class='ctx'> 						    map-&gt;type,</div><div class='ctx'> 						    io_geom-&gt;stripe_index, dst);</div><div class='hunk'>@@ -6346,7 +6366,7 @@ static bool is_single_device_io(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				const struct btrfs_io_stripe *smap,</div><div class='ctx'> 				const struct btrfs_chunk_map *map,</div><div class='ctx'> 				int num_alloc_stripes,</div><div class='del'>-				enum btrfs_map_op op, int mirror_num)</div><div class='add'>+				struct btrfs_io_geometry *io_geom)</div><div class='ctx'> {</div><div class='ctx'> 	if (!smap)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -6354,10 +6374,10 @@ static bool is_single_device_io(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (num_alloc_stripes != 1)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (btrfs_need_stripe_tree_update(fs_info, map-&gt;type) &amp;&amp; op != BTRFS_MAP_READ)</div><div class='add'>+	if (io_geom-&gt;use_rst &amp;&amp; io_geom-&gt;op != BTRFS_MAP_READ)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if ((map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID56_MASK) &amp;&amp; mirror_num &gt; 1)</div><div class='add'>+	if ((map-&gt;type &amp; BTRFS_BLOCK_GROUP_RAID56_MASK) &amp;&amp; io_geom-&gt;mirror_num &gt; 1)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -6472,7 +6492,7 @@ static void map_blocks_raid56_read(struct btrfs_chunk_map *map,</div><div class='ctx'> {</div><div class='ctx'> 	int data_stripes = nr_data_stripes(map);</div><div class='ctx'> </div><div class='del'>-	ASSERT(io_geom-&gt;mirror_num &lt;= 1);</div><div class='add'>+	ASSERT(io_geom-&gt;mirror_num &lt;= 1, "mirror_num=%d", io_geom-&gt;mirror_num);</div><div class='ctx'> 	/* Just grab the data stripe directly. */</div><div class='ctx'> 	io_geom-&gt;stripe_index = io_geom-&gt;stripe_nr % data_stripes;</div><div class='ctx'> 	io_geom-&gt;stripe_nr /= data_stripes;</div><div class='hunk'>@@ -6536,12 +6556,11 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> 	struct btrfs_chunk_map *map;</div><div class='ctx'> 	struct btrfs_io_geometry io_geom = { 0 };</div><div class='ctx'> 	u64 map_offset;</div><div class='del'>-	int i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int num_copies;</div><div class='ctx'> 	struct btrfs_io_context *bioc = NULL;</div><div class='ctx'> 	struct btrfs_dev_replace *dev_replace = &amp;fs_info-&gt;dev_replace;</div><div class='del'>-	int dev_replace_is_ongoing = 0;</div><div class='add'>+	bool dev_replace_is_ongoing = false;</div><div class='ctx'> 	u16 num_alloc_stripes;</div><div class='ctx'> 	u64 max_len;</div><div class='ctx'> </div><div class='hunk'>@@ -6552,26 +6571,29 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> 	io_geom.stripe_index = 0;</div><div class='ctx'> 	io_geom.op = op;</div><div class='ctx'> </div><div class='del'>-	num_copies = btrfs_num_copies(fs_info, logical, fs_info-&gt;sectorsize);</div><div class='del'>-	if (io_geom.mirror_num &gt; num_copies)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	map = btrfs_get_chunk_map(fs_info, logical, *length);</div><div class='ctx'> 	if (IS_ERR(map))</div><div class='ctx'> 		return PTR_ERR(map);</div><div class='ctx'> </div><div class='add'>+	num_copies = btrfs_chunk_map_num_copies(map);</div><div class='add'>+	if (io_geom.mirror_num &gt; num_copies)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	map_offset = logical - map-&gt;start;</div><div class='ctx'> 	io_geom.raid56_full_stripe_start = (u64)-1;</div><div class='ctx'> 	max_len = btrfs_max_io_len(map, map_offset, &amp;io_geom);</div><div class='ctx'> 	*length = min_t(u64, map-&gt;chunk_len - map_offset, max_len);</div><div class='add'>+	io_geom.use_rst = btrfs_need_stripe_tree_update(fs_info, map-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (dev_replace-&gt;replace_task != current)</div><div class='add'>+		down_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 	dev_replace_is_ongoing = btrfs_dev_replace_is_ongoing(dev_replace);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Hold the semaphore for read during the whole operation, write is</div><div class='ctx'> 	 * requested at commit time but must wait.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!dev_replace_is_ongoing)</div><div class='add'>+	if (!dev_replace_is_ongoing &amp;&amp; dev_replace-&gt;replace_task != current)</div><div class='ctx'> 		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> </div><div class='ctx'> 	switch (map-&gt;type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK) {</div><div class='hunk'>@@ -6630,8 +6652,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> 	 * physical block information on the stack instead of allocating an</div><div class='ctx'> 	 * I/O context structure.</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_single_device_io(fs_info, smap, map, num_alloc_stripes, op,</div><div class='del'>-				io_geom.mirror_num)) {</div><div class='add'>+	if (is_single_device_io(fs_info, smap, map, num_alloc_stripes, &amp;io_geom)) {</div><div class='ctx'> 		ret = set_io_stripe(fs_info, logical, length, smap, map, &amp;io_geom);</div><div class='ctx'> 		if (mirror_num_ret)</div><div class='ctx'> 			*mirror_num_ret = io_geom.mirror_num;</div><div class='hunk'>@@ -6645,6 +6666,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	bioc-&gt;map_type = map-&gt;type;</div><div class='add'>+	bioc-&gt;use_rst = io_geom.use_rst;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For RAID56 full map, we need to make sure the stripes[] follows the</div><div class='hunk'>@@ -6682,7 +6704,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> 		 * For all other non-RAID56 profiles, just copy the target</div><div class='ctx'> 		 * stripe into the bioc.</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 0; i &lt; io_geom.num_stripes; i++) {</div><div class='add'>+		for (int i = 0; i &lt; io_geom.num_stripes; i++) {</div><div class='ctx'> 			ret = set_io_stripe(fs_info, logical, length,</div><div class='ctx'> 					    &amp;bioc-&gt;stripes[i], map, &amp;io_geom);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='hunk'>@@ -6702,8 +6724,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> </div><div class='ctx'> 	if (dev_replace_is_ongoing &amp;&amp; dev_replace-&gt;tgtdev != NULL &amp;&amp;</div><div class='ctx'> 	    op != BTRFS_MAP_READ) {</div><div class='del'>-		handle_ops_on_dev_replace(op, bioc, dev_replace, logical,</div><div class='del'>-					  &amp;io_geom.num_stripes, &amp;io_geom.max_errors);</div><div class='add'>+		handle_ops_on_dev_replace(bioc, dev_replace, logical, &amp;io_geom);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*bioc_ret = bioc;</div><div class='hunk'>@@ -6712,7 +6733,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,</div><div class='ctx'> 	bioc-&gt;mirror_num = io_geom.mirror_num;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (dev_replace_is_ongoing) {</div><div class='add'>+	if (dev_replace_is_ongoing &amp;&amp; dev_replace-&gt;replace_task != current) {</div><div class='ctx'> 		lockdep_assert_held(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 		/* Unlock and let waiting writers proceed */</div><div class='ctx'> 		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='hunk'>@@ -6734,6 +6755,8 @@ static bool dev_args_match_fs_devices(const struct btrfs_dev_lookup_args *args,</div><div class='ctx'> static bool dev_args_match_device(const struct btrfs_dev_lookup_args *args,</div><div class='ctx'> 				  const struct btrfs_device *device)</div><div class='ctx'> {</div><div class='add'>+	if (args-&gt;devt)</div><div class='add'>+		return device-&gt;devt == args-&gt;devt;</div><div class='ctx'> 	if (args-&gt;missing) {</div><div class='ctx'> 		if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &amp;device-&gt;dev_state) &amp;&amp;</div><div class='ctx'> 		    !device-&gt;bdev)</div><div class='hunk'>@@ -6844,7 +6867,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;dev-&gt;dev_stats_ccnt, 0);</div><div class='ctx'> 	btrfs_device_data_ordered_init(dev);</div><div class='del'>-	extent_io_tree_init(fs_info, &amp;dev-&gt;alloc_state, IO_TREE_DEVICE_ALLOC_STATE);</div><div class='add'>+	btrfs_extent_io_tree_init(fs_info, &amp;dev-&gt;alloc_state, IO_TREE_DEVICE_ALLOC_STATE);</div><div class='ctx'> </div><div class='ctx'> 	if (devid)</div><div class='ctx'> 		tmp = *devid;</div><div class='hunk'>@@ -6865,9 +6888,9 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		generate_random_uuid(dev-&gt;uuid);</div><div class='ctx'> </div><div class='ctx'> 	if (path) {</div><div class='del'>-		struct rcu_string *name;</div><div class='add'>+		const char *name;</div><div class='ctx'> </div><div class='del'>-		name = rcu_string_strdup(path, GFP_KERNEL);</div><div class='add'>+		name = kstrdup(path, GFP_KERNEL);</div><div class='ctx'> 		if (!name) {</div><div class='ctx'> 			btrfs_free_device(dev);</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -6986,16 +7009,6 @@ static int read_one_chunk(struct btrfs_key *key, struct extent_buffer *leaf,</div><div class='ctx'> 	warn_32bit_meta_chunk(fs_info, logical, length, type);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Only need to verify chunk item if we're reading from sys chunk array,</div><div class='del'>-	 * as chunk item in tree block is already verified by tree-checker.</div><div class='del'>-	 */</div><div class='del'>-	if (leaf-&gt;start == BTRFS_SUPER_INFO_OFFSET) {</div><div class='del'>-		ret = btrfs_check_chunk_valid(leaf, chunk, logical);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	map = btrfs_find_chunk_map(fs_info, logical, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* already mapped? */</div><div class='hunk'>@@ -7056,6 +7069,7 @@ static int read_one_chunk(struct btrfs_key *key, struct extent_buffer *leaf,</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 			  "failed to add chunk map, start=%llu len=%llu: %d",</div><div class='ctx'> 			  map-&gt;start, map-&gt;chunk_len, ret);</div><div class='add'>+		btrfs_free_chunk_map(map);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -7101,8 +7115,12 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	fs_devices = find_fsid(fsid, NULL);</div><div class='ctx'> 	if (!fs_devices) {</div><div class='del'>-		if (!btrfs_test_opt(fs_info, DEGRADED))</div><div class='add'>+		if (!btrfs_test_opt(fs_info, DEGRADED)) {</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+		"failed to find fsid %pU when attempting to open seed devices",</div><div class='add'>+				  fsid);</div><div class='ctx'> 			return ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		fs_devices = alloc_fs_devices(fsid);</div><div class='ctx'> 		if (IS_ERR(fs_devices))</div><div class='hunk'>@@ -7121,7 +7139,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (IS_ERR(fs_devices))</div><div class='ctx'> 		return fs_devices;</div><div class='ctx'> </div><div class='del'>-	ret = open_fs_devices(fs_devices, BLK_OPEN_READ, fs_info-&gt;bdev_holder);</div><div class='add'>+	ret = open_fs_devices(fs_devices, BLK_OPEN_READ, fs_info-&gt;sb);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		free_fs_devices(fs_devices);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='hunk'>@@ -7253,16 +7271,11 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_super_block *super_copy = fs_info-&gt;super_copy;</div><div class='ctx'> 	struct extent_buffer *sb;</div><div class='del'>-	struct btrfs_disk_key *disk_key;</div><div class='del'>-	struct btrfs_chunk *chunk;</div><div class='ctx'> 	u8 *array_ptr;</div><div class='ctx'> 	unsigned long sb_array_offset;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u32 num_stripes;</div><div class='ctx'> 	u32 array_size;</div><div class='del'>-	u32 len = 0;</div><div class='ctx'> 	u32 cur_offset;</div><div class='del'>-	u64 type;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(BTRFS_SUPER_INFO_SIZE &lt;= fs_info-&gt;nodesize);</div><div class='hunk'>@@ -7285,10 +7298,15 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	cur_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (cur_offset &lt; array_size) {</div><div class='del'>-		disk_key = (struct btrfs_disk_key *)array_ptr;</div><div class='del'>-		len = sizeof(*disk_key);</div><div class='del'>-		if (cur_offset + len &gt; array_size)</div><div class='del'>-			goto out_short_read;</div><div class='add'>+		struct btrfs_chunk *chunk;</div><div class='add'>+		struct btrfs_disk_key *disk_key = (struct btrfs_disk_key *)array_ptr;</div><div class='add'>+		u32 len = sizeof(*disk_key);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The sys_chunk_array has been already verified at super block</div><div class='add'>+		 * read time.  Only do ASSERT()s for basic checks.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(cur_offset + len &lt;= array_size);</div><div class='ctx'> </div><div class='ctx'> 		btrfs_disk_key_to_cpu(&amp;key, disk_key);</div><div class='ctx'> </div><div class='hunk'>@@ -7296,44 +7314,14 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		sb_array_offset += len;</div><div class='ctx'> 		cur_offset += len;</div><div class='ctx'> </div><div class='del'>-		if (key.type != BTRFS_CHUNK_ITEM_KEY) {</div><div class='del'>-			btrfs_err(fs_info,</div><div class='del'>-			    "unexpected item type %u in sys_array at offset %u",</div><div class='del'>-				  (u32)key.type, cur_offset);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		ASSERT(key.type == BTRFS_CHUNK_ITEM_KEY);</div><div class='ctx'> </div><div class='ctx'> 		chunk = (struct btrfs_chunk *)sb_array_offset;</div><div class='del'>-		/*</div><div class='del'>-		 * At least one btrfs_chunk with one stripe must be present,</div><div class='del'>-		 * exact stripe count check comes afterwards</div><div class='del'>-		 */</div><div class='del'>-		len = btrfs_chunk_item_size(1);</div><div class='del'>-		if (cur_offset + len &gt; array_size)</div><div class='del'>-			goto out_short_read;</div><div class='add'>+		ASSERT(btrfs_chunk_type(sb, chunk) &amp; BTRFS_BLOCK_GROUP_SYSTEM);</div><div class='ctx'> </div><div class='del'>-		num_stripes = btrfs_chunk_num_stripes(sb, chunk);</div><div class='del'>-		if (!num_stripes) {</div><div class='del'>-			btrfs_err(fs_info,</div><div class='del'>-			"invalid number of stripes %u in sys_array at offset %u",</div><div class='del'>-				  num_stripes, cur_offset);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		type = btrfs_chunk_type(sb, chunk);</div><div class='del'>-		if ((type &amp; BTRFS_BLOCK_GROUP_SYSTEM) == 0) {</div><div class='del'>-			btrfs_err(fs_info,</div><div class='del'>-			"invalid chunk type %llu in sys_array at offset %u",</div><div class='del'>-				  type, cur_offset);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		len = btrfs_chunk_item_size(btrfs_chunk_num_stripes(sb, chunk));</div><div class='ctx'> </div><div class='del'>-		len = btrfs_chunk_item_size(num_stripes);</div><div class='del'>-		if (cur_offset + len &gt; array_size)</div><div class='del'>-			goto out_short_read;</div><div class='add'>+		ASSERT(cur_offset + len &lt;= array_size);</div><div class='ctx'> </div><div class='ctx'> 		ret = read_one_chunk(&amp;key, sb, chunk);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -7346,13 +7334,6 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	clear_extent_buffer_uptodate(sb);</div><div class='ctx'> 	free_extent_buffer_stale(sb);</div><div class='ctx'> 	return ret;</div><div class='del'>-</div><div class='del'>-out_short_read:</div><div class='del'>-	btrfs_err(fs_info, "sys_array too short to read %u bytes at offset %u",</div><div class='del'>-			len, cur_offset);</div><div class='del'>-	clear_extent_buffer_uptodate(sb);</div><div class='del'>-	free_extent_buffer_stale(sb);</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -7424,7 +7405,7 @@ static void readahead_tree_node_children(struct extent_buffer *node)</div><div class='ctx'> int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;chunk_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='hunk'>@@ -7455,7 +7436,7 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Lockdep complains about possible circular locking dependency between</div><div class='ctx'> 	 * a disk's open_mutex (struct gendisk.open_mutex), the rw semaphores</div><div class='del'>-	 * used for freeze procection of a fs (struct super_block.s_writers),</div><div class='add'>+	 * used for freeze protection of a fs (struct super_block.s_writers),</div><div class='ctx'> 	 * which we take when starting a transaction, and extent buffers of the</div><div class='ctx'> 	 * chunk tree if we call read_one_dev() while holding a lock on an</div><div class='ctx'> 	 * extent buffer of the chunk tree. Since we are mounting the filesystem</div><div class='hunk'>@@ -7463,7 +7444,7 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	 * chunk tree, to keep it simple, just skip locking on the chunk tree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ASSERT(!test_bit(BTRFS_FS_OPEN, &amp;fs_info-&gt;flags));</div><div class='del'>-	path-&gt;skip_locking = 1;</div><div class='add'>+	path-&gt;skip_locking = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read all device items, and then all the chunk items. All</div><div class='hunk'>@@ -7472,8 +7453,8 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	 * item - BTRFS_FIRST_CHUNK_TREE_OBJECTID).</div><div class='ctx'> 	 */</div><div class='ctx'> 	key.objectid = BTRFS_DEV_ITEMS_OBJECTID;</div><div class='del'>-	key.offset = 0;</div><div class='ctx'> 	key.type = 0;</div><div class='add'>+	key.offset = 0;</div><div class='ctx'> 	btrfs_for_each_slot(root, &amp;key, &amp;found_key, path, iter_ret) {</div><div class='ctx'> 		struct extent_buffer *node = path-&gt;nodes[1];</div><div class='ctx'> </div><div class='hunk'>@@ -7541,8 +7522,6 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> error:</div><div class='ctx'> 	mutex_unlock(&amp;uuid_mutex);</div><div class='del'>-</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7552,8 +7531,6 @@ int btrfs_init_devices_late(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	fs_devices-&gt;fs_info = fs_info;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> 	list_for_each_entry(device, &amp;fs_devices-&gt;devices, dev_list)</div><div class='ctx'> 		device-&gt;fs_info = fs_info;</div><div class='hunk'>@@ -7644,7 +7621,7 @@ int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = fs_info-&gt;fs_devices, *seed_devs;</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='del'>-	struct btrfs_path *path = NULL;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -7666,8 +7643,6 @@ int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='del'>-</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7676,7 +7651,7 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = trans-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *dev_root = fs_info-&gt;dev_root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='ctx'> 	struct btrfs_dev_stats_item *ptr;</div><div class='hunk'>@@ -7692,10 +7667,10 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ret = btrfs_search_slot(trans, dev_root, &amp;key, path, -1, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_warn_in_rcu(fs_info,</div><div class='add'>+		btrfs_warn(fs_info,</div><div class='ctx'> 			"error %d while searching for dev_stats item for device %s",</div><div class='ctx'> 				  ret, btrfs_dev_name(device));</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0 &amp;&amp;</div><div class='hunk'>@@ -7703,10 +7678,10 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		/* need to delete old one and insert a new one */</div><div class='ctx'> 		ret = btrfs_del_item(trans, dev_root, path);</div><div class='ctx'> 		if (ret != 0) {</div><div class='del'>-			btrfs_warn_in_rcu(fs_info,</div><div class='add'>+			btrfs_warn(fs_info,</div><div class='ctx'> 				"delete too small dev_stats item for device %s failed %d",</div><div class='ctx'> 					  btrfs_dev_name(device), ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7717,10 +7692,10 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 		ret = btrfs_insert_empty_item(trans, dev_root, path,</div><div class='ctx'> 					      &amp;key, sizeof(*ptr));</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			btrfs_warn_in_rcu(fs_info,</div><div class='add'>+			btrfs_warn(fs_info,</div><div class='ctx'> 				"insert dev_stats item for device %s failed %d",</div><div class='ctx'> 				btrfs_dev_name(device), ret);</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7729,10 +7704,6 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,</div><div class='ctx'> 	for (i = 0; i &lt; BTRFS_DEV_STAT_VALUES_MAX; i++)</div><div class='ctx'> 		btrfs_set_dev_stats_value(eb, ptr, i,</div><div class='ctx'> 					  btrfs_dev_stat_read(device, i));</div><div class='del'>-	btrfs_mark_buffer_dirty(trans, eb);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7782,7 +7753,7 @@ void btrfs_dev_stat_inc_and_print(struct btrfs_device *dev, int index)</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;dev_stats_valid)</div><div class='ctx'> 		return;</div><div class='del'>-	btrfs_err_rl_in_rcu(dev-&gt;fs_info,</div><div class='add'>+	btrfs_err_rl(dev-&gt;fs_info,</div><div class='ctx'> 		"bdev %s errs: wr %u, rd %u, flush %u, corrupt %u, gen %u",</div><div class='ctx'> 			   btrfs_dev_name(dev),</div><div class='ctx'> 			   btrfs_dev_stat_read(dev, BTRFS_DEV_STAT_WRITE_ERRS),</div><div class='hunk'>@@ -7802,7 +7773,7 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *dev)</div><div class='ctx'> 	if (i == BTRFS_DEV_STAT_VALUES_MAX)</div><div class='ctx'> 		return; /* all values == 0, suppress message */</div><div class='ctx'> </div><div class='del'>-	btrfs_info_in_rcu(dev-&gt;fs_info,</div><div class='add'>+	btrfs_info(dev-&gt;fs_info,</div><div class='ctx'> 		"bdev %s errs: wr %u, rd %u, flush %u, corrupt %u, gen %u",</div><div class='ctx'> 	       btrfs_dev_name(dev),</div><div class='ctx'> 	       btrfs_dev_stat_read(dev, BTRFS_DEV_STAT_WRITE_ERRS),</div><div class='hunk'>@@ -7862,7 +7833,7 @@ void btrfs_commit_device_sizes(struct btrfs_transaction *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_device *curr, *next;</div><div class='ctx'> </div><div class='del'>-	ASSERT(trans-&gt;state == TRANS_STATE_COMMIT_DOING);</div><div class='add'>+	ASSERT(trans-&gt;state == TRANS_STATE_COMMIT_DOING, "state=%d" , trans-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;trans-&gt;dev_update_list))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -7892,8 +7863,6 @@ int btrfs_bg_type_to_factor(u64 flags)</div><div class='ctx'> 	return btrfs_raid_array[index].ncopies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				 u64 chunk_offset, u64 devid,</div><div class='ctx'> 				 u64 physical_offset, u64 physical_len)</div><div class='hunk'>@@ -7907,7 +7876,7 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	map = btrfs_find_chunk_map(fs_info, chunk_offset, 1);</div><div class='del'>-	if (!map) {</div><div class='add'>+	if (unlikely(!map)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "dev extent physical offset %llu on devid %llu doesn't have corresponding chunk",</div><div class='ctx'> 			  physical_offset, devid);</div><div class='hunk'>@@ -7916,7 +7885,7 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stripe_len = btrfs_calc_stripe_length(map);</div><div class='del'>-	if (physical_len != stripe_len) {</div><div class='add'>+	if (unlikely(physical_len != stripe_len)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "dev extent physical offset %llu on devid %llu length doesn't match chunk %llu, have %llu expect %llu",</div><div class='ctx'> 			  physical_offset, devid, map-&gt;start, physical_len,</div><div class='hunk'>@@ -7926,7 +7895,7 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Very old mkfs.btrfs (before v4.1) will not respect the reserved</div><div class='add'>+	 * Very old mkfs.btrfs (before v4.15) will not respect the reserved</div><div class='ctx'> 	 * space. Although kernel can handle it without problem, better to warn</div><div class='ctx'> 	 * the users.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -7936,8 +7905,8 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			   devid, physical_offset, physical_len);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='del'>-		if (map-&gt;stripes[i].dev-&gt;devid == devid &amp;&amp;</div><div class='del'>-		    map-&gt;stripes[i].physical == physical_offset) {</div><div class='add'>+		if (unlikely(map-&gt;stripes[i].dev-&gt;devid == devid &amp;&amp;</div><div class='add'>+			     map-&gt;stripes[i].physical == physical_offset)) {</div><div class='ctx'> 			found = true;</div><div class='ctx'> 			if (map-&gt;verified_stripes &gt;= map-&gt;num_stripes) {</div><div class='ctx'> 				btrfs_err(fs_info,</div><div class='hunk'>@@ -7950,7 +7919,7 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!found) {</div><div class='add'>+	if (unlikely(!found)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 	"dev extent physical offset %llu devid %llu has no corresponding chunk",</div><div class='ctx'> 			physical_offset, devid);</div><div class='hunk'>@@ -7959,13 +7928,13 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure no dev extent is beyond device boundary */</div><div class='ctx'> 	dev = btrfs_find_device(fs_info-&gt;fs_devices, &amp;args);</div><div class='del'>-	if (!dev) {</div><div class='add'>+	if (unlikely(!dev)) {</div><div class='ctx'> 		btrfs_err(fs_info, "failed to find devid %llu", devid);</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (physical_offset + physical_len &gt; dev-&gt;disk_total_bytes) {</div><div class='add'>+	if (unlikely(physical_offset + physical_len &gt; dev-&gt;disk_total_bytes)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "dev extent devid %llu physical offset %llu len %llu is beyond device boundary %llu",</div><div class='ctx'> 			  devid, physical_offset, physical_len,</div><div class='hunk'>@@ -7977,8 +7946,8 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (dev-&gt;zone_info) {</div><div class='ctx'> 		u64 zone_size = dev-&gt;zone_info-&gt;zone_size;</div><div class='ctx'> </div><div class='del'>-		if (!IS_ALIGNED(physical_offset, zone_size) ||</div><div class='del'>-		    !IS_ALIGNED(physical_len, zone_size)) {</div><div class='add'>+		if (unlikely(!IS_ALIGNED(physical_offset, zone_size) ||</div><div class='add'>+			     !IS_ALIGNED(physical_len, zone_size))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> "zoned: dev extent devid %llu physical offset %llu len %llu is not aligned to device zone",</div><div class='ctx'> 				  devid, physical_offset, physical_len);</div><div class='hunk'>@@ -8002,7 +7971,7 @@ static int verify_chunk_dev_extent_mapping(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		struct btrfs_chunk_map *map;</div><div class='ctx'> </div><div class='ctx'> 		map = rb_entry(node, struct btrfs_chunk_map, rb_node);</div><div class='del'>-		if (map-&gt;num_stripes != map-&gt;verified_stripes) {</div><div class='add'>+		if (unlikely(map-&gt;num_stripes != map-&gt;verified_stripes)) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 			"chunk %llu has missing dev extent, have %d expect %d",</div><div class='ctx'> 				  map-&gt;start, map-&gt;verified_stripes, map-&gt;num_stripes);</div><div class='hunk'>@@ -8024,7 +7993,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;dev_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	u64 prev_devid = 0;</div><div class='hunk'>@@ -8055,17 +8024,15 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	path-&gt;reada = READA_FORWARD;</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (path-&gt;slots[0] &gt;= btrfs_header_nritems(path-&gt;nodes[0])) {</div><div class='ctx'> 		ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		/* No dev extents at all? Not good */</div><div class='del'>-		if (ret &gt; 0) {</div><div class='del'>-			ret = -EUCLEAN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (unlikely(ret &gt; 0))</div><div class='add'>+			return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct extent_buffer *leaf = path-&gt;nodes[0];</div><div class='hunk'>@@ -8087,24 +8054,23 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		physical_len = btrfs_dev_extent_length(leaf, dext);</div><div class='ctx'> </div><div class='ctx'> 		/* Check if this dev extent overlaps with the previous one */</div><div class='del'>-		if (devid == prev_devid &amp;&amp; physical_offset &lt; prev_dev_ext_end) {</div><div class='add'>+		if (unlikely(devid == prev_devid &amp;&amp; physical_offset &lt; prev_dev_ext_end)) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> "dev extent devid %llu physical offset %llu overlap with previous dev extent end %llu",</div><div class='ctx'> 				  devid, physical_offset, prev_dev_ext_end);</div><div class='del'>-			ret = -EUCLEAN;</div><div class='del'>-			goto out;</div><div class='add'>+			return -EUCLEAN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = verify_one_dev_extent(fs_info, chunk_offset, devid,</div><div class='ctx'> 					    physical_offset, physical_len);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		prev_devid = devid;</div><div class='ctx'> 		prev_dev_ext_end = physical_offset + physical_len;</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_next_item(root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -8112,10 +8078,7 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure all chunks have corresponding dev extents */</div><div class='del'>-	ret = verify_chunk_dev_extent_mapping(fs_info);</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return verify_chunk_dev_extent_mapping(fs_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -8152,12 +8115,12 @@ static int relocating_repair_kthread(void *data)</div><div class='ctx'> 	target = cache-&gt;start;</div><div class='ctx'> 	btrfs_put_block_group(cache);</div><div class='ctx'> </div><div class='del'>-	sb_start_write(fs_info-&gt;sb);</div><div class='add'>+	guard(super_write)(fs_info-&gt;sb);</div><div class='add'>+</div><div class='ctx'> 	if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE)) {</div><div class='ctx'> 		btrfs_info(fs_info,</div><div class='ctx'> 			   "zoned: skip relocating block group %llu to repair: EBUSY",</div><div class='ctx'> 			   target);</div><div class='del'>-		sb_end_write(fs_info-&gt;sb);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8178,14 +8141,13 @@ static int relocating_repair_kthread(void *data)</div><div class='ctx'> 	btrfs_info(fs_info,</div><div class='ctx'> 		   "zoned: relocating block group %llu to repair IO failure",</div><div class='ctx'> 		   target);</div><div class='del'>-	ret = btrfs_relocate_chunk(fs_info, target);</div><div class='add'>+	ret = btrfs_relocate_chunk(fs_info, target, true);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (cache)</div><div class='ctx'> 		btrfs_put_block_group(cache);</div><div class='ctx'> 	mutex_unlock(&amp;fs_info-&gt;reclaim_bgs_lock);</div><div class='ctx'> 	btrfs_exclop_finish(fs_info);</div><div class='del'>-	sb_end_write(fs_info-&gt;sb);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -8231,7 +8193,7 @@ static void map_raid56_repair_block(struct btrfs_io_context *bioc,</div><div class='ctx'> 		    logical &lt; stripe_start + BTRFS_STRIPE_LEN)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	ASSERT(i &lt; data_stripes);</div><div class='add'>+	ASSERT(i &lt; data_stripes, "i=%d data_stripes=%d", i, data_stripes);</div><div class='ctx'> 	smap-&gt;dev = bioc-&gt;stripes[i].dev;</div><div class='ctx'> 	smap-&gt;physical = bioc-&gt;stripes[i].physical +</div><div class='ctx'> 			((logical - bioc-&gt;full_stripe_logical) &amp;</div><div class='hunk'>@@ -8260,7 +8222,7 @@ int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	int mirror_ret = mirror_num;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(mirror_num &gt; 0);</div><div class='add'>+	ASSERT(mirror_num &gt; 0, "mirror_num=%d", mirror_num);</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, logical, &amp;map_length,</div><div class='ctx'> 			      &amp;bioc, smap, &amp;mirror_ret);</div><div class='hunk'>@@ -8268,7 +8230,7 @@ int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* The map range should not cross stripe boundary. */</div><div class='del'>-	ASSERT(map_length &gt;= length);</div><div class='add'>+	ASSERT(map_length &gt;= length, "map_length=%llu length=%u", map_length, length);</div><div class='ctx'> </div><div class='ctx'> 	/* Already mapped to single stripe. */</div><div class='ctx'> 	if (!bioc)</div><div class='hunk'>@@ -8280,7 +8242,8 @@ int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(mirror_num &lt;= bioc-&gt;num_stripes);</div><div class='add'>+	ASSERT(mirror_num &lt;= bioc-&gt;num_stripes,</div><div class='add'>+	       "mirror_num=%d num_stripes=%d", mirror_num,  bioc-&gt;num_stripes);</div><div class='ctx'> 	smap-&gt;dev = bioc-&gt;stripes[mirror_num - 1].dev;</div><div class='ctx'> 	smap-&gt;physical = bioc-&gt;stripes[mirror_num - 1].physical;</div><div class='ctx'> out:</div><div class='head'>diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h<br/>index a11854912d53..34b854c1a303 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/volumes.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/volumes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/volumes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/volumes.h</a></div><div class='hunk'>@@ -6,22 +6,46 @@</div><div class='ctx'> #ifndef BTRFS_VOLUMES_H</div><div class='ctx'> #define BTRFS_VOLUMES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/blk_types.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='del'>-#include &lt;linux/btrfs.h&gt;</div><div class='del'>-#include "async-thread.h"</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs.h&gt;</div><div class='add'>+#include &lt;uapi/linux/btrfs_tree.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='del'>-#include "tree-checker.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='add'>+#include "extent-io-tree.h"</div><div class='add'>+</div><div class='add'>+struct block_device;</div><div class='add'>+struct bdev_handle;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_block_group;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='add'>+struct btrfs_transaction;</div><div class='add'>+struct btrfs_zoned_device_info;</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_MAX_DATA_CHUNK_SIZE	(10ULL * SZ_1G)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Arbitrary maximum size of one discard request to limit potentially long time</div><div class='add'>+ * spent in blkdev_issue_discard().</div><div class='add'>+ */</div><div class='add'>+#define BTRFS_MAX_DISCARD_CHUNK_SIZE	(SZ_1G)</div><div class='add'>+</div><div class='ctx'> extern struct mutex uuid_mutex;</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_STRIPE_LEN		SZ_64K</div><div class='ctx'> #define BTRFS_STRIPE_LEN_SHIFT		(16)</div><div class='ctx'> #define BTRFS_STRIPE_LEN_MASK		(BTRFS_STRIPE_LEN - 1)</div><div class='ctx'> </div><div class='del'>-static_assert(const_ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);</div><div class='add'>+static_assert(ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);</div><div class='ctx'> </div><div class='ctx'> /* Used by sanity check for btrfs_raid_types. */</div><div class='ctx'> #define const_ffs(n) (__builtin_ctzll(n) + 1)</div><div class='hunk'>@@ -34,8 +58,7 @@ static_assert(const_ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);</div><div class='ctx'>  */</div><div class='ctx'> static_assert(const_ffs(BTRFS_BLOCK_GROUP_RAID0) &lt;</div><div class='ctx'> 	      const_ffs(BTRFS_BLOCK_GROUP_PROFILE_MASK &amp; ~BTRFS_BLOCK_GROUP_RAID0));</div><div class='del'>-static_assert(const_ilog2(BTRFS_BLOCK_GROUP_RAID0) &gt;</div><div class='del'>-	      ilog2(BTRFS_BLOCK_GROUP_TYPE_MASK));</div><div class='add'>+static_assert(ilog2(BTRFS_BLOCK_GROUP_RAID0) &gt; ilog2(BTRFS_BLOCK_GROUP_TYPE_MASK));</div><div class='ctx'> </div><div class='ctx'> /* ilog2() can handle both constants and variables */</div><div class='ctx'> #define BTRFS_BG_FLAG_TO_INDEX(profile)					\</div><div class='hunk'>@@ -77,7 +100,10 @@ enum btrfs_raid_types {</div><div class='ctx'> #define BTRFS_DEV_STATE_FLUSH_SENT	(4)</div><div class='ctx'> #define BTRFS_DEV_STATE_NO_READA	(5)</div><div class='ctx'> </div><div class='del'>-struct btrfs_zoned_device_info;</div><div class='add'>+/* Special value encoding failure to write primary super block. */</div><div class='add'>+#define BTRFS_SUPER_PRIMARY_WRITE_ERROR		(INT_MAX / 2)</div><div class='add'>+</div><div class='add'>+struct btrfs_fs_devices;</div><div class='ctx'> </div><div class='ctx'> struct btrfs_device {</div><div class='ctx'> 	struct list_head dev_list; /* device_list_mutex */</div><div class='hunk'>@@ -86,7 +112,8 @@ struct btrfs_device {</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> </div><div class='del'>-	struct rcu_string __rcu *name;</div><div class='add'>+	/* Device path or NULL if missing. */</div><div class='add'>+	const char __rcu *name;</div><div class='ctx'> </div><div class='ctx'> 	u64 generation;</div><div class='ctx'> </div><div class='hunk'>@@ -127,6 +154,12 @@ struct btrfs_device {</div><div class='ctx'> 	/* type and info about this device */</div><div class='ctx'> 	u64 type;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Counter of super block write errors, values larger than</div><div class='add'>+	 * BTRFS_SUPER_PRIMARY_WRITE_ERROR encode primary super block write failure.</div><div class='add'>+	 */</div><div class='add'>+	atomic_t sb_write_errors;</div><div class='add'>+</div><div class='ctx'> 	/* minimal io size for this device */</div><div class='ctx'> 	u32 sector_size;</div><div class='ctx'> </div><div class='hunk'>@@ -266,6 +299,9 @@ enum btrfs_chunk_allocation_policy {</div><div class='ctx'> 	BTRFS_CHUNK_ALLOC_ZONED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BTRFS_DEFAULT_RR_MIN_CONTIG_READ	(SZ_256K)</div><div class='add'>+/* Keep in sync with raid_attr table, current maximum is RAID1C4. */</div><div class='add'>+#define BTRFS_RAID1_MAX_MIRRORS			(4)</div><div class='ctx'> /*</div><div class='ctx'>  * Read policies for mirrored block group profiles, read picks the stripe based</div><div class='ctx'>  * on these policies.</div><div class='hunk'>@@ -273,9 +309,34 @@ enum btrfs_chunk_allocation_policy {</div><div class='ctx'> enum btrfs_read_policy {</div><div class='ctx'> 	/* Use process PID to choose the stripe */</div><div class='ctx'> 	BTRFS_READ_POLICY_PID,</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	/* Balancing RAID1 reads across all striped devices (round-robin). */</div><div class='add'>+	BTRFS_READ_POLICY_RR,</div><div class='add'>+	/* Read from a specific device. */</div><div class='add'>+	BTRFS_READ_POLICY_DEVID,</div><div class='add'>+#endif</div><div class='ctx'> 	BTRFS_NR_READ_POLICY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+/*</div><div class='add'>+ * Checksum mode - offload it to workqueues or do it synchronously in</div><div class='add'>+ * btrfs_submit_chunk().</div><div class='add'>+ */</div><div class='add'>+enum btrfs_offload_csum_mode {</div><div class='add'>+	/*</div><div class='add'>+	 * Choose offloading checksum or do it synchronously automatically.</div><div class='add'>+	 * Do it synchronously if the checksum is fast, or offload to workqueues</div><div class='add'>+	 * otherwise.</div><div class='add'>+	 */</div><div class='add'>+	BTRFS_OFFLOAD_CSUM_AUTO,</div><div class='add'>+	/* Always offload checksum to workqueues. */</div><div class='add'>+	BTRFS_OFFLOAD_CSUM_FORCE_ON,</div><div class='add'>+	/* Never offload checksum to workqueues. */</div><div class='add'>+	BTRFS_OFFLOAD_CSUM_FORCE_OFF,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct btrfs_fs_devices {</div><div class='ctx'> 	u8 fsid[BTRFS_FSID_SIZE]; /* FS specific uuid */</div><div class='ctx'> </div><div class='hunk'>@@ -360,6 +421,16 @@ struct btrfs_fs_devices {</div><div class='ctx'> 	/* Count fs-devices opened. */</div><div class='ctx'> 	int opened;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Counter of the processes that are holding this fs_devices but not</div><div class='add'>+	 * yet opened.</div><div class='add'>+	 * This is for mounting handling, as we can only open the fs_devices</div><div class='add'>+	 * after a super block is created.  But we cannot take uuid_mutex</div><div class='add'>+	 * during sget_fc(), thus we have to hold the fs_devices (meaning it</div><div class='add'>+	 * cannot be released) until a super block is returned.</div><div class='add'>+	 */</div><div class='add'>+	int holding;</div><div class='add'>+</div><div class='ctx'> 	/* Set when we find or add a device that doesn't have the nonrot flag set. */</div><div class='ctx'> 	bool rotating;</div><div class='ctx'> 	/* Devices support TRIM/discard commands. */</div><div class='hunk'>@@ -368,6 +439,8 @@ struct btrfs_fs_devices {</div><div class='ctx'> 	bool seeding;</div><div class='ctx'> 	/* The mount needs to use a randomly generated fsid. */</div><div class='ctx'> 	bool temp_fsid;</div><div class='add'>+	/* Enable/disable the filesystem stats tracking. */</div><div class='add'>+	bool collect_fs_stats;</div><div class='ctx'> </div><div class='ctx'> 	struct btrfs_fs_info *fs_info;</div><div class='ctx'> 	/* sysfs kobjects */</div><div class='hunk'>@@ -380,6 +453,20 @@ struct btrfs_fs_devices {</div><div class='ctx'> </div><div class='ctx'> 	/* Policy used to read the mirrored stripes. */</div><div class='ctx'> 	enum btrfs_read_policy read_policy;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_EXPERIMENTAL</div><div class='add'>+	/*</div><div class='add'>+	 * Minimum contiguous reads before switching to next device, the unit</div><div class='add'>+	 * is one block/sectorsize.</div><div class='add'>+	 */</div><div class='add'>+	u32 rr_min_contig_read;</div><div class='add'>+</div><div class='add'>+	/* Device to be used for reading in case of RAID1. */</div><div class='add'>+	u64 read_devid;</div><div class='add'>+</div><div class='add'>+	/* Checksum mode - offload it or do it synchronously. */</div><div class='add'>+	enum btrfs_offload_csum_mode offload_csum_mode;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BTRFS_MAX_DEVS(info) ((BTRFS_MAX_ITEM_SIZE(info)	\</div><div class='hunk'>@@ -395,8 +482,7 @@ struct btrfs_io_stripe {</div><div class='ctx'> 	struct btrfs_device *dev;</div><div class='ctx'> 	/* Block mapping. */</div><div class='ctx'> 	u64 physical;</div><div class='del'>-	u64 length;</div><div class='del'>-	bool is_scrub;</div><div class='add'>+	bool rst_search_commit_root;</div><div class='ctx'> 	/* For the endio handler. */</div><div class='ctx'> 	struct btrfs_io_context *bioc;</div><div class='ctx'> };</div><div class='hunk'>@@ -408,7 +494,7 @@ struct btrfs_discard_stripe {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Context for IO subsmission for device stripe.</div><div class='add'>+ * Context for IO submission for device stripe.</div><div class='ctx'>  *</div><div class='ctx'>  * - Track the unfinished mirrors for mirror based profiles</div><div class='ctx'>  *   Mirror based profiles are SINGLE/DUP/RAID1/RAID10.</div><div class='hunk'>@@ -431,6 +517,7 @@ struct btrfs_io_context {</div><div class='ctx'> 	struct bio *orig_bio;</div><div class='ctx'> 	atomic_t error;</div><div class='ctx'> 	u16 max_errors;</div><div class='add'>+	bool use_rst;</div><div class='ctx'> </div><div class='ctx'> 	u64 logical;</div><div class='ctx'> 	u64 size;</div><div class='hunk'>@@ -557,8 +644,6 @@ static inline void btrfs_free_chunk_map(struct btrfs_chunk_map *map)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct btrfs_balance_args;</div><div class='del'>-struct btrfs_balance_progress;</div><div class='ctx'> struct btrfs_balance_control {</div><div class='ctx'> 	struct btrfs_balance_args data;</div><div class='ctx'> 	struct btrfs_balance_args meta;</div><div class='hunk'>@@ -576,6 +661,11 @@ struct btrfs_dev_lookup_args {</div><div class='ctx'> 	u64 devid;</div><div class='ctx'> 	u8 *uuid;</div><div class='ctx'> 	u8 *fsid;</div><div class='add'>+	/*</div><div class='add'>+	 * If devt is specified, all other members will be ignored as it is</div><div class='add'>+	 * enough to uniquely locate a device.</div><div class='add'>+	 */</div><div class='add'>+	dev_t devt;</div><div class='ctx'> 	bool missing;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -591,7 +681,7 @@ enum btrfs_map_op {</div><div class='ctx'> 	BTRFS_MAP_GET_READ_MIRRORS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline enum btrfs_map_op btrfs_op(struct bio *bio)</div><div class='add'>+static inline enum btrfs_map_op btrfs_op(const struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	switch (bio_op(bio)) {</div><div class='ctx'> 	case REQ_OP_WRITE:</div><div class='hunk'>@@ -638,12 +728,12 @@ struct btrfs_discard_stripe *btrfs_map_discard(struct btrfs_fs_info *fs_info,</div><div class='ctx'> int btrfs_read_sys_array(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info);</div><div class='ctx'> struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans,</div><div class='del'>-					    u64 type);</div><div class='add'>+					     struct btrfs_space_info *space_info,</div><div class='add'>+					     u64 type);</div><div class='ctx'> void btrfs_mapping_tree_free(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 		       blk_mode_t flags, void *holder);</div><div class='del'>-struct btrfs_device *btrfs_scan_one_device(const char *path, blk_mode_t flags,</div><div class='del'>-					   bool mount_arg_dev);</div><div class='add'>+struct btrfs_device *btrfs_scan_one_device(const char *path, bool mount_arg_dev);</div><div class='ctx'> int btrfs_forget_devices(dev_t devt);</div><div class='ctx'> void btrfs_close_devices(struct btrfs_fs_devices *fs_devices);</div><div class='ctx'> void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices);</div><div class='hunk'>@@ -677,10 +767,9 @@ void btrfs_describe_block_groups(u64 flags, char *buf, u32 size_buf);</div><div class='ctx'> int btrfs_resume_balance_async(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_recover_balance(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_pause_balance(struct btrfs_fs_info *fs_info);</div><div class='del'>-int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset);</div><div class='add'>+int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset,</div><div class='add'>+			 bool verbose);</div><div class='ctx'> int btrfs_cancel_balance(struct btrfs_fs_info *fs_info);</div><div class='del'>-int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info);</div><div class='del'>-int btrfs_uuid_scan_kthread(void *data);</div><div class='ctx'> bool btrfs_chunk_writeable(struct btrfs_fs_info *fs_info, u64 chunk_offset);</div><div class='ctx'> void btrfs_dev_stat_inc_and_print(struct btrfs_device *dev, int index);</div><div class='ctx'> int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -691,8 +780,6 @@ int btrfs_run_dev_stats(struct btrfs_trans_handle *trans);</div><div class='ctx'> void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev);</div><div class='ctx'> void btrfs_rm_dev_replace_free_srcdev(struct btrfs_device *srcdev);</div><div class='ctx'> void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev);</div><div class='del'>-int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,</div><div class='del'>-			   u64 logical, u64 len);</div><div class='ctx'> unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 				    u64 logical);</div><div class='ctx'> u64 btrfs_calc_stripe_length(const struct btrfs_chunk_map *map);</div><div class='hunk'>@@ -706,7 +793,6 @@ struct btrfs_chunk_map *btrfs_alloc_chunk_map(int num_stripes, gfp_t gfp);</div><div class='ctx'> int btrfs_add_chunk_map(struct btrfs_fs_info *fs_info, struct btrfs_chunk_map *map);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct btrfs_chunk_map *btrfs_clone_chunk_map(struct btrfs_chunk_map *map, gfp_t gfp);</div><div class='ctx'> struct btrfs_chunk_map *btrfs_find_chunk_map(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					     u64 logical, u64 length);</div><div class='ctx'> struct btrfs_chunk_map *btrfs_find_chunk_map_nolock(struct btrfs_fs_info *fs_info,</div><div class='hunk'>@@ -714,6 +800,8 @@ struct btrfs_chunk_map *btrfs_find_chunk_map_nolock(struct btrfs_fs_info *fs_inf</div><div class='ctx'> struct btrfs_chunk_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					    u64 logical, u64 length);</div><div class='ctx'> void btrfs_remove_chunk_map(struct btrfs_fs_info *fs_info, struct btrfs_chunk_map *map);</div><div class='add'>+struct btrfs_super_block *btrfs_read_disk_super(struct block_device *bdev,</div><div class='add'>+						int copy_num, bool drop_cache);</div><div class='ctx'> void btrfs_release_disk_super(struct btrfs_super_block *super);</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_dev_stat_inc(struct btrfs_device *dev,</div><div class='hunk'>@@ -772,7 +860,26 @@ static inline const char *btrfs_dev_name(const struct btrfs_device *device)</div><div class='ctx'> 	if (!device || test_bit(BTRFS_DEV_STATE_MISSING, &amp;device-&gt;dev_state))</div><div class='ctx'> 		return "&lt;missing disk&gt;";</div><div class='ctx'> 	else</div><div class='del'>-		return rcu_str_deref(device-&gt;name);</div><div class='add'>+		return rcu_dereference(device-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_warn_unknown_chunk_allocation(enum btrfs_chunk_allocation_policy pol)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(1, "unknown allocation policy %d, fallback to regular", pol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_fs_devices_inc_holding(struct btrfs_fs_devices *fs_devices)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;uuid_mutex);</div><div class='add'>+	ASSERT(fs_devices-&gt;holding &gt;= 0);</div><div class='add'>+	fs_devices-&gt;holding++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void btrfs_fs_devices_dec_holding(struct btrfs_fs_devices *fs_devices)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;uuid_mutex);</div><div class='add'>+	ASSERT(fs_devices-&gt;holding &gt; 0);</div><div class='add'>+	fs_devices-&gt;holding--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_commit_device_sizes(struct btrfs_transaction *trans);</div><div class='hunk'>@@ -780,9 +887,7 @@ void btrfs_commit_device_sizes(struct btrfs_transaction *trans);</div><div class='ctx'> struct list_head * __attribute_const__ btrfs_get_fs_uuids(void);</div><div class='ctx'> bool btrfs_check_rw_degradable(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 					struct btrfs_device *failing_dev);</div><div class='del'>-void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,</div><div class='del'>-			       struct block_device *bdev,</div><div class='del'>-			       const char *device_path);</div><div class='add'>+void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info, struct btrfs_device *device);</div><div class='ctx'> </div><div class='ctx'> enum btrfs_raid_types __attribute_const__ btrfs_bg_flags_to_raid_index(u64 flags);</div><div class='ctx'> int btrfs_bg_type_to_factor(u64 flags);</div><div class='hunk'>@@ -791,6 +896,11 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info);</div><div class='ctx'> bool btrfs_repair_one_zone(struct btrfs_fs_info *fs_info, u64 logical);</div><div class='ctx'> </div><div class='ctx'> bool btrfs_pinned_by_swapfile(struct btrfs_fs_info *fs_info, void *ptr);</div><div class='del'>-u8 *btrfs_sb_fsid_ptr(struct btrfs_super_block *sb);</div><div class='add'>+const u8 *btrfs_sb_fsid_ptr(const struct btrfs_super_block *sb);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS</div><div class='add'>+struct btrfs_io_context *alloc_btrfs_io_context(struct btrfs_fs_info *fs_info,</div><div class='add'>+						u64 logical, u16 total_stripes);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c<br/>index 6287763fdccc..ab55d10bd71f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/xattr.c</a></div><div class='hunk'>@@ -24,14 +24,13 @@</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "dir-item.h"</div><div class='ctx'> </div><div class='del'>-int btrfs_getxattr(struct inode *inode, const char *name,</div><div class='add'>+int btrfs_getxattr(const struct inode *inode, const char *name,</div><div class='ctx'> 				void *buffer, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dir_item *di;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	unsigned long data_ptr;</div><div class='ctx'> </div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='hunk'>@@ -41,26 +40,19 @@ int btrfs_getxattr(struct inode *inode, const char *name,</div><div class='ctx'> 	/* lookup the xattr by name */</div><div class='ctx'> 	di = btrfs_lookup_xattr(NULL, root, path, btrfs_ino(BTRFS_I(inode)),</div><div class='ctx'> 			name, strlen(name), 0);</div><div class='del'>-	if (!di) {</div><div class='del'>-		ret = -ENODATA;</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (IS_ERR(di)) {</div><div class='del'>-		ret = PTR_ERR(di);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!di)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	if (IS_ERR(di))</div><div class='add'>+		return PTR_ERR(di);</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	/* if size is 0, that means we want the size of the attr */</div><div class='del'>-	if (!size) {</div><div class='del'>-		ret = btrfs_dir_data_len(leaf, di);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!size)</div><div class='add'>+		return btrfs_dir_data_len(leaf, di);</div><div class='ctx'> </div><div class='ctx'> 	/* now get the data out of our dir_item */</div><div class='del'>-	if (btrfs_dir_data_len(leaf, di) &gt; size) {</div><div class='del'>-		ret = -ERANGE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (btrfs_dir_data_len(leaf, di) &gt; size)</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The way things are packed into the leaf is like this</div><div class='hunk'>@@ -73,11 +65,7 @@ int btrfs_getxattr(struct inode *inode, const char *name,</div><div class='ctx'> 				   btrfs_dir_name_len(leaf, di));</div><div class='ctx'> 	read_extent_buffer(leaf, buffer, data_ptr,</div><div class='ctx'> 			   btrfs_dir_data_len(leaf, di));</div><div class='del'>-	ret = btrfs_dir_data_len(leaf, di);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return btrfs_dir_data_len(leaf, di);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='hunk'>@@ -85,8 +73,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dir_item *di = NULL;</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	struct btrfs_fs_info *fs_info = root-&gt;fs_info;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	size_t name_len = strlen(name);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +85,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 	path = btrfs_alloc_path();</div><div class='ctx'> 	if (!path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	path-&gt;skip_release_on_error = 1;</div><div class='add'>+	path-&gt;skip_release_on_error = true;</div><div class='ctx'> </div><div class='ctx'> 	if (!value) {</div><div class='ctx'> 		di = btrfs_lookup_xattr(trans, root, path,</div><div class='hunk'>@@ -120,7 +107,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 	 * locks the inode's i_mutex before calling setxattr or removexattr.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (flags &amp; XATTR_REPLACE) {</div><div class='del'>-		ASSERT(inode_is_locked(inode));</div><div class='add'>+		btrfs_assert_inode_locked(BTRFS_I(inode));</div><div class='ctx'> 		di = btrfs_lookup_xattr(NULL, root, path,</div><div class='ctx'> 				btrfs_ino(BTRFS_I(inode)), name, name_len, 0);</div><div class='ctx'> 		if (!di)</div><div class='hunk'>@@ -143,14 +130,14 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		btrfs_assert_tree_write_locked(path-&gt;nodes[0]);</div><div class='del'>-		di = btrfs_match_dir_item_name(fs_info, path, name, name_len);</div><div class='add'>+		di = btrfs_match_dir_item_name(path, name, name_len);</div><div class='ctx'> 		if (!di &amp;&amp; !(flags &amp; XATTR_REPLACE)) {</div><div class='ctx'> 			ret = -ENOSPC;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (ret == -EEXIST) {</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		di = btrfs_match_dir_item_name(fs_info, path, name, name_len);</div><div class='add'>+		di = btrfs_match_dir_item_name(path, name, name_len);</div><div class='ctx'> 		ASSERT(di); /* logic error */</div><div class='ctx'> 	} else if (ret) {</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -205,7 +192,6 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		btrfs_set_dir_data_len(leaf, di, size);</div><div class='ctx'> 		data_ptr = ((unsigned long)(di + 1)) + name_len;</div><div class='ctx'> 		write_extent_buffer(leaf, value, data_ptr, size);</div><div class='del'>-		btrfs_mark_buffer_dirty(trans, leaf);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Insert, and we had space for the xattr, so path-&gt;slots[0] is</div><div class='hunk'>@@ -214,7 +200,6 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		set_bit(BTRFS_INODE_COPY_EVERYTHING,</div><div class='ctx'> 			&amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='hunk'>@@ -280,7 +265,7 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct btrfs_root *root = BTRFS_I(inode)-&gt;root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	int iter_ret = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	size_t total_size = 0, size_left = size;</div><div class='hunk'>@@ -356,8 +341,6 @@ next:</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = total_size;</div><div class='ctx'> </div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -451,7 +434,7 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,</div><div class='ctx'> 	if (IS_ERR(trans))</div><div class='ctx'> 		return PTR_ERR(trans);</div><div class='ctx'> </div><div class='del'>-	ret = btrfs_set_prop(trans, inode, name, value, size, flags);</div><div class='add'>+	ret = btrfs_set_prop(trans, BTRFS_I(inode), name, value, size, flags);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		inode_inc_iversion(inode);</div><div class='ctx'> 		inode_set_ctime_current(inode);</div><div class='hunk'>@@ -504,7 +487,7 @@ static int btrfs_initxattrs(struct inode *inode,</div><div class='ctx'> 	const struct xattr *xattr;</div><div class='ctx'> 	unsigned int nofs_flag;</div><div class='ctx'> 	char *name;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're holding a transaction handle, so use a NOFS memory allocation</div><div class='hunk'>@@ -512,26 +495,27 @@ static int btrfs_initxattrs(struct inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='ctx'> 	for (xattr = xattr_array; xattr-&gt;name != NULL; xattr++) {</div><div class='del'>-		name = kmalloc(XATTR_SECURITY_PREFIX_LEN +</div><div class='del'>-			       strlen(xattr-&gt;name) + 1, GFP_KERNEL);</div><div class='add'>+		const size_t name_len = XATTR_SECURITY_PREFIX_LEN +</div><div class='add'>+					strlen(xattr-&gt;name) + 1;</div><div class='add'>+</div><div class='add'>+		name = kmalloc(name_len, GFP_KERNEL);</div><div class='ctx'> 		if (!name) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+			ret = -ENOMEM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		strcpy(name, XATTR_SECURITY_PREFIX);</div><div class='del'>-		strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr-&gt;name);</div><div class='add'>+		scnprintf(name, name_len, "%s%s", XATTR_SECURITY_PREFIX, xattr-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		if (strcmp(name, XATTR_NAME_CAPS) == 0)</div><div class='ctx'> 			clear_bit(BTRFS_INODE_NO_CAP_XATTR, &amp;BTRFS_I(inode)-&gt;runtime_flags);</div><div class='ctx'> </div><div class='del'>-		err = btrfs_setxattr(trans, inode, name, xattr-&gt;value,</div><div class='add'>+		ret = btrfs_setxattr(trans, inode, name, xattr-&gt;value,</div><div class='ctx'> 				     xattr-&gt;value_len, 0);</div><div class='ctx'> 		kfree(name);</div><div class='del'>-		if (err &lt; 0)</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flag);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_xattr_security_init(struct btrfs_trans_handle *trans,</div><div class='head'>diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h<br/>index 118118ca3e1d..0ce10e4ec836 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/xattr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/xattr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/xattr.h</a></div><div class='hunk'>@@ -6,11 +6,17 @@</div><div class='ctx'> #ifndef BTRFS_XATTR_H</div><div class='ctx'> #define BTRFS_XATTR_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct dentry;</div><div class='add'>+struct inode;</div><div class='add'>+struct qstr;</div><div class='add'>+struct xattr_handler;</div><div class='add'>+struct btrfs_trans_handle;</div><div class='ctx'> </div><div class='ctx'> extern const struct xattr_handler * const btrfs_xattr_handlers[];</div><div class='ctx'> </div><div class='del'>-int btrfs_getxattr(struct inode *inode, const char *name,</div><div class='add'>+int btrfs_getxattr(const struct inode *inode, const char *name,</div><div class='ctx'> 		void *buffer, size_t size);</div><div class='ctx'> int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,</div><div class='ctx'> 		   const char *name, const void *value, size_t size, int flags);</div><div class='head'>diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c<br/>index 36cf1f0e338e..6caba8be7c84 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zlib.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zlib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zlib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/zlib.c</a></div><div class='hunk'>@@ -18,7 +18,10 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include "btrfs_inode.h"</div><div class='ctx'> #include "compression.h"</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "subpage.h"</div><div class='ctx'> </div><div class='ctx'> /* workspace buffer size for s390 zlib hardware support */</div><div class='ctx'> #define ZLIB_DFLTCC_BUF_SIZE    (4 * PAGE_SIZE)</div><div class='hunk'>@@ -31,11 +34,9 @@ struct workspace {</div><div class='ctx'> 	int level;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct workspace_manager wsm;</div><div class='del'>-</div><div class='del'>-struct list_head *zlib_get_workspace(unsigned int level)</div><div class='add'>+struct list_head *zlib_get_workspace(struct btrfs_fs_info *fs_info, unsigned int level)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *ws = btrfs_get_workspace(BTRFS_COMPRESS_ZLIB, level);</div><div class='add'>+	struct list_head *ws = btrfs_get_workspace(fs_info, BTRFS_COMPRESS_ZLIB, level);</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;level = level;</div><div class='hunk'>@@ -52,8 +53,25 @@ void zlib_free_workspace(struct list_head *ws)</div><div class='ctx'> 	kfree(workspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct list_head *zlib_alloc_workspace(unsigned int level)</div><div class='add'>+/*</div><div class='add'>+ * For s390 hardware acceleration, the buffer size should be at least</div><div class='add'>+ * ZLIB_DFLTCC_BUF_SIZE to achieve the best performance.</div><div class='add'>+ *</div><div class='add'>+ * But if bs &gt; ps we can have large enough folios that meet the s390 hardware</div><div class='add'>+ * handling.</div><div class='add'>+ */</div><div class='add'>+static bool need_special_buffer(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	if (!zlib_deflate_dfltcc_enabled())</div><div class='add'>+		return false;</div><div class='add'>+	if (btrfs_min_folio_size(fs_info) &gt;= ZLIB_DFLTCC_BUF_SIZE)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct list_head *zlib_alloc_workspace(struct btrfs_fs_info *fs_info, unsigned int level)</div><div class='ctx'> {</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	struct workspace *workspace;</div><div class='ctx'> 	int workspacesize;</div><div class='ctx'> </div><div class='hunk'>@@ -66,19 +84,15 @@ struct list_head *zlib_alloc_workspace(unsigned int level)</div><div class='ctx'> 	workspace-&gt;strm.workspace = kvzalloc(workspacesize, GFP_KERNEL | __GFP_NOWARN);</div><div class='ctx'> 	workspace-&gt;level = level;</div><div class='ctx'> 	workspace-&gt;buf = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * In case of s390 zlib hardware support, allocate lager workspace</div><div class='del'>-	 * buffer. If allocator fails, fall back to a single page buffer.</div><div class='del'>-	 */</div><div class='del'>-	if (zlib_deflate_dfltcc_enabled()) {</div><div class='add'>+	if (need_special_buffer(fs_info)) {</div><div class='ctx'> 		workspace-&gt;buf = kmalloc(ZLIB_DFLTCC_BUF_SIZE,</div><div class='ctx'> 					 __GFP_NOMEMALLOC | __GFP_NORETRY |</div><div class='ctx'> 					 __GFP_NOWARN | GFP_NOIO);</div><div class='ctx'> 		workspace-&gt;buf_size = ZLIB_DFLTCC_BUF_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!workspace-&gt;buf) {</div><div class='del'>-		workspace-&gt;buf = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='del'>-		workspace-&gt;buf_size = PAGE_SIZE;</div><div class='add'>+		workspace-&gt;buf = kmalloc(blocksize, GFP_KERNEL);</div><div class='add'>+		workspace-&gt;buf_size = blocksize;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!workspace-&gt;strm.workspace || !workspace-&gt;buf)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -91,29 +105,75 @@ fail:</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='del'>-		u64 start, struct page **pages, unsigned long *out_pages,</div><div class='del'>-		unsigned long *total_in, unsigned long *total_out)</div><div class='add'>+/*</div><div class='add'>+ * Helper for S390x with hardware zlib compression support.</div><div class='add'>+ *</div><div class='add'>+ * That hardware acceleration requires a buffer size larger than a single page</div><div class='add'>+ * to get ideal performance, thus we need to do the memory copy rather than</div><div class='add'>+ * use the page cache directly as input buffer.</div><div class='add'>+ */</div><div class='add'>+static int copy_data_into_buffer(struct address_space *mapping,</div><div class='add'>+				 struct workspace *workspace, u64 filepos,</div><div class='add'>+				 unsigned long length)</div><div class='add'>+{</div><div class='add'>+	u64 cur = filepos;</div><div class='add'>+</div><div class='add'>+	/* It's only for hardware accelerated zlib code. */</div><div class='add'>+	ASSERT(zlib_deflate_dfltcc_enabled());</div><div class='add'>+</div><div class='add'>+	while (cur &lt; filepos + length) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		void *data_in;</div><div class='add'>+		unsigned int offset;</div><div class='add'>+		unsigned long copy_length;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = btrfs_compress_filemap_get_folio(mapping, cur, &amp;folio);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		offset = offset_in_folio(folio, cur);</div><div class='add'>+		copy_length = min(folio_size(folio) - offset,</div><div class='add'>+				  filepos + length - cur);</div><div class='add'>+</div><div class='add'>+		data_in = kmap_local_folio(folio, offset);</div><div class='add'>+		memcpy(workspace-&gt;buf + cur - filepos, data_in, copy_length);</div><div class='add'>+		kunmap_local(data_in);</div><div class='add'>+		cur += copy_length;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zlib_compress_folios(struct list_head *ws, struct btrfs_inode *inode,</div><div class='add'>+			 u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='add'>+			 unsigned long *total_in, unsigned long *total_out)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='add'>+	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='add'>+	const u32 min_folio_shift = PAGE_SHIFT + fs_info-&gt;block_min_order;</div><div class='add'>+	const u32 min_folio_size = btrfs_min_folio_size(fs_info);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char *data_in = NULL;</div><div class='del'>-	char *cpage_out;</div><div class='del'>-	int nr_pages = 0;</div><div class='del'>-	struct page *in_page = NULL;</div><div class='del'>-	struct page *out_page = NULL;</div><div class='del'>-	unsigned long bytes_left;</div><div class='del'>-	unsigned int in_buf_pages;</div><div class='add'>+	char *cfolio_out;</div><div class='add'>+	int nr_folios = 0;</div><div class='add'>+	struct folio *in_folio = NULL;</div><div class='add'>+	struct folio *out_folio = NULL;</div><div class='ctx'> 	unsigned long len = *total_out;</div><div class='del'>-	unsigned long nr_dest_pages = *out_pages;</div><div class='del'>-	const unsigned long max_out = nr_dest_pages * PAGE_SIZE;</div><div class='add'>+	unsigned long nr_dest_folios = *out_folios;</div><div class='add'>+	const unsigned long max_out = nr_dest_folios &lt;&lt; min_folio_shift;</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u64 orig_end = start + len;</div><div class='ctx'> </div><div class='del'>-	*out_pages = 0;</div><div class='add'>+	*out_folios = 0;</div><div class='ctx'> 	*total_out = 0;</div><div class='ctx'> 	*total_in = 0;</div><div class='ctx'> </div><div class='del'>-	if (Z_OK != zlib_deflateInit(&amp;workspace-&gt;strm, workspace-&gt;level)) {</div><div class='del'>-		pr_warn("BTRFS: deflateInit failed\n");</div><div class='add'>+	ret = zlib_deflateInit(&amp;workspace-&gt;strm, workspace-&gt;level);</div><div class='add'>+	if (unlikely(ret != Z_OK)) {</div><div class='add'>+		btrfs_err(fs_info,</div><div class='add'>+	"zlib compression init failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+			  ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode), start);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -121,19 +181,19 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 	workspace-&gt;strm.total_in = 0;</div><div class='ctx'> 	workspace-&gt;strm.total_out = 0;</div><div class='ctx'> </div><div class='del'>-	out_page = btrfs_alloc_compr_page();</div><div class='del'>-	if (out_page == NULL) {</div><div class='add'>+	out_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+	if (out_folio == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	cpage_out = page_address(out_page);</div><div class='del'>-	pages[0] = out_page;</div><div class='del'>-	nr_pages = 1;</div><div class='add'>+	cfolio_out = folio_address(out_folio);</div><div class='add'>+	folios[0] = out_folio;</div><div class='add'>+	nr_folios = 1;</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;strm.next_in = workspace-&gt;buf;</div><div class='ctx'> 	workspace-&gt;strm.avail_in = 0;</div><div class='del'>-	workspace-&gt;strm.next_out = cpage_out;</div><div class='del'>-	workspace-&gt;strm.avail_out = PAGE_SIZE;</div><div class='add'>+	workspace-&gt;strm.next_out = cfolio_out;</div><div class='add'>+	workspace-&gt;strm.avail_out = min_folio_size;</div><div class='ctx'> </div><div class='ctx'> 	while (workspace-&gt;strm.total_in &lt; len) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -141,51 +201,56 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 		 * the workspace buffer if required.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (workspace-&gt;strm.avail_in == 0) {</div><div class='del'>-			bytes_left = len - workspace-&gt;strm.total_in;</div><div class='del'>-			in_buf_pages = min(DIV_ROUND_UP(bytes_left, PAGE_SIZE),</div><div class='del'>-					   workspace-&gt;buf_size / PAGE_SIZE);</div><div class='del'>-			if (in_buf_pages &gt; 1) {</div><div class='del'>-				int i;</div><div class='del'>-</div><div class='del'>-				for (i = 0; i &lt; in_buf_pages; i++) {</div><div class='del'>-					if (data_in) {</div><div class='del'>-						kunmap_local(data_in);</div><div class='del'>-						put_page(in_page);</div><div class='del'>-					}</div><div class='del'>-					in_page = find_get_page(mapping,</div><div class='del'>-								start &gt;&gt; PAGE_SHIFT);</div><div class='del'>-					data_in = kmap_local_page(in_page);</div><div class='del'>-					copy_page(workspace-&gt;buf + i * PAGE_SIZE,</div><div class='del'>-						  data_in);</div><div class='del'>-					start += PAGE_SIZE;</div><div class='del'>-				}</div><div class='add'>+			unsigned long bytes_left = len - workspace-&gt;strm.total_in;</div><div class='add'>+			unsigned int copy_length = min(bytes_left, workspace-&gt;buf_size);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * For s390 hardware accelerated zlib, and our folio is smaller</div><div class='add'>+			 * than the copy_length, we need to fill the buffer so that</div><div class='add'>+			 * we can take full advantage of hardware acceleration.</div><div class='add'>+			 */</div><div class='add'>+			if (need_special_buffer(fs_info)) {</div><div class='add'>+				ret = copy_data_into_buffer(mapping, workspace,</div><div class='add'>+							    start, copy_length);</div><div class='add'>+				if (ret &lt; 0)</div><div class='add'>+					goto out;</div><div class='add'>+				start += copy_length;</div><div class='ctx'> 				workspace-&gt;strm.next_in = workspace-&gt;buf;</div><div class='add'>+				workspace-&gt;strm.avail_in = copy_length;</div><div class='ctx'> 			} else {</div><div class='add'>+				unsigned int cur_len;</div><div class='add'>+</div><div class='ctx'> 				if (data_in) {</div><div class='ctx'> 					kunmap_local(data_in);</div><div class='del'>-					put_page(in_page);</div><div class='add'>+					folio_put(in_folio);</div><div class='add'>+					data_in = NULL;</div><div class='ctx'> 				}</div><div class='del'>-				in_page = find_get_page(mapping,</div><div class='del'>-							start &gt;&gt; PAGE_SHIFT);</div><div class='del'>-				data_in = kmap_local_page(in_page);</div><div class='del'>-				start += PAGE_SIZE;</div><div class='add'>+				ret = btrfs_compress_filemap_get_folio(mapping,</div><div class='add'>+						start, &amp;in_folio);</div><div class='add'>+				if (ret &lt; 0)</div><div class='add'>+					goto out;</div><div class='add'>+				cur_len = btrfs_calc_input_length(in_folio, orig_end, start);</div><div class='add'>+				data_in = kmap_local_folio(in_folio,</div><div class='add'>+							   offset_in_folio(in_folio, start));</div><div class='add'>+				start += cur_len;</div><div class='ctx'> 				workspace-&gt;strm.next_in = data_in;</div><div class='add'>+				workspace-&gt;strm.avail_in = cur_len;</div><div class='ctx'> 			}</div><div class='del'>-			workspace-&gt;strm.avail_in = min(bytes_left,</div><div class='del'>-						       (unsigned long) workspace-&gt;buf_size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = zlib_deflate(&amp;workspace-&gt;strm, Z_SYNC_FLUSH);</div><div class='del'>-		if (ret != Z_OK) {</div><div class='del'>-			pr_debug("BTRFS: deflate in loop returned %d\n",</div><div class='del'>-			       ret);</div><div class='add'>+		if (unlikely(ret != Z_OK)) {</div><div class='add'>+			btrfs_warn(fs_info,</div><div class='add'>+		"zlib compression failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+				   ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+				   start);</div><div class='ctx'> 			zlib_deflateEnd(&amp;workspace-&gt;strm);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* we're making it bigger, give up */</div><div class='del'>-		if (workspace-&gt;strm.total_in &gt; 8192 &amp;&amp;</div><div class='add'>+		if (workspace-&gt;strm.total_in &gt; blocksize * 2 &amp;&amp;</div><div class='ctx'> 		    workspace-&gt;strm.total_in &lt;</div><div class='ctx'> 		    workspace-&gt;strm.total_out) {</div><div class='ctx'> 			ret = -E2BIG;</div><div class='hunk'>@@ -196,20 +261,20 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 		 * the stream end if required</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (workspace-&gt;strm.avail_out == 0) {</div><div class='del'>-			if (nr_pages == nr_dest_pages) {</div><div class='add'>+			if (nr_folios == nr_dest_folios) {</div><div class='ctx'> 				ret = -E2BIG;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			out_page = btrfs_alloc_compr_page();</div><div class='del'>-			if (out_page == NULL) {</div><div class='add'>+			out_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+			if (out_folio == NULL) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			cpage_out = page_address(out_page);</div><div class='del'>-			pages[nr_pages] = out_page;</div><div class='del'>-			nr_pages++;</div><div class='del'>-			workspace-&gt;strm.avail_out = PAGE_SIZE;</div><div class='del'>-			workspace-&gt;strm.next_out = cpage_out;</div><div class='add'>+			cfolio_out = folio_address(out_folio);</div><div class='add'>+			folios[nr_folios] = out_folio;</div><div class='add'>+			nr_folios++;</div><div class='add'>+			workspace-&gt;strm.avail_out = min_folio_size;</div><div class='add'>+			workspace-&gt;strm.next_out = cfolio_out;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* we're all done */</div><div class='ctx'> 		if (workspace-&gt;strm.total_in &gt;= len)</div><div class='hunk'>@@ -226,26 +291,26 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 		ret = zlib_deflate(&amp;workspace-&gt;strm, Z_FINISH);</div><div class='ctx'> 		if (ret == Z_STREAM_END)</div><div class='ctx'> 			break;</div><div class='del'>-		if (ret != Z_OK &amp;&amp; ret != Z_BUF_ERROR) {</div><div class='add'>+		if (unlikely(ret != Z_OK &amp;&amp; ret != Z_BUF_ERROR)) {</div><div class='ctx'> 			zlib_deflateEnd(&amp;workspace-&gt;strm);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (workspace-&gt;strm.avail_out == 0) {</div><div class='del'>-			/* get another page for the stream end */</div><div class='del'>-			if (nr_pages == nr_dest_pages) {</div><div class='add'>+			/* Get another folio for the stream end. */</div><div class='add'>+			if (nr_folios == nr_dest_folios) {</div><div class='ctx'> 				ret = -E2BIG;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			out_page = btrfs_alloc_compr_page();</div><div class='del'>-			if (out_page == NULL) {</div><div class='add'>+			out_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+			if (out_folio == NULL) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			cpage_out = page_address(out_page);</div><div class='del'>-			pages[nr_pages] = out_page;</div><div class='del'>-			nr_pages++;</div><div class='del'>-			workspace-&gt;strm.avail_out = PAGE_SIZE;</div><div class='del'>-			workspace-&gt;strm.next_out = cpage_out;</div><div class='add'>+			cfolio_out = folio_address(out_folio);</div><div class='add'>+			folios[nr_folios] = out_folio;</div><div class='add'>+			nr_folios++;</div><div class='add'>+			workspace-&gt;strm.avail_out = min_folio_size;</div><div class='add'>+			workspace-&gt;strm.next_out = cfolio_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	zlib_deflateEnd(&amp;workspace-&gt;strm);</div><div class='hunk'>@@ -259,10 +324,10 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 	*total_out = workspace-&gt;strm.total_out;</div><div class='ctx'> 	*total_in = workspace-&gt;strm.total_in;</div><div class='ctx'> out:</div><div class='del'>-	*out_pages = nr_pages;</div><div class='add'>+	*out_folios = nr_folios;</div><div class='ctx'> 	if (data_in) {</div><div class='ctx'> 		kunmap_local(data_in);</div><div class='del'>-		put_page(in_page);</div><div class='add'>+		folio_put(in_folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -270,20 +335,22 @@ out:</div><div class='ctx'> </div><div class='ctx'> int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = cb_to_fs_info(cb);</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='add'>+	const u32 min_folio_size = btrfs_min_folio_size(fs_info);</div><div class='ctx'> 	int ret = 0, ret2;</div><div class='ctx'> 	int wbits = MAX_WBITS;</div><div class='ctx'> 	char *data_in;</div><div class='ctx'> 	size_t total_out = 0;</div><div class='del'>-	unsigned long page_in_index = 0;</div><div class='add'>+	unsigned long folio_in_index = 0;</div><div class='ctx'> 	size_t srclen = cb-&gt;compressed_len;</div><div class='del'>-	unsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_SIZE);</div><div class='add'>+	unsigned long total_folios_in = DIV_ROUND_UP(srclen, min_folio_size);</div><div class='ctx'> 	unsigned long buf_start;</div><div class='del'>-	struct page **pages_in = cb-&gt;compressed_pages;</div><div class='add'>+	struct folio **folios_in = cb-&gt;compressed_folios;</div><div class='ctx'> </div><div class='del'>-	data_in = kmap_local_page(pages_in[page_in_index]);</div><div class='add'>+	data_in = kmap_local_folio(folios_in[folio_in_index], 0);</div><div class='ctx'> 	workspace-&gt;strm.next_in = data_in;</div><div class='del'>-	workspace-&gt;strm.avail_in = min_t(size_t, srclen, PAGE_SIZE);</div><div class='add'>+	workspace-&gt;strm.avail_in = min_t(size_t, srclen, min_folio_size);</div><div class='ctx'> 	workspace-&gt;strm.total_in = 0;</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;strm.total_out = 0;</div><div class='hunk'>@@ -301,9 +368,14 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 		workspace-&gt;strm.avail_in -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (Z_OK != zlib_inflateInit2(&amp;workspace-&gt;strm, wbits)) {</div><div class='del'>-		pr_warn("BTRFS: inflateInit failed\n");</div><div class='add'>+	ret = zlib_inflateInit2(&amp;workspace-&gt;strm, wbits);</div><div class='add'>+	if (unlikely(ret != Z_OK)) {</div><div class='add'>+		struct btrfs_inode *inode = cb-&gt;bbio.inode;</div><div class='add'>+</div><div class='ctx'> 		kunmap_local(data_in);</div><div class='add'>+		btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+	"zlib decompression init failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+			  ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode), cb-&gt;start);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (workspace-&gt;strm.total_in &lt; srclen) {</div><div class='hunk'>@@ -331,21 +403,26 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> 		if (workspace-&gt;strm.avail_in == 0) {</div><div class='ctx'> 			unsigned long tmp;</div><div class='ctx'> 			kunmap_local(data_in);</div><div class='del'>-			page_in_index++;</div><div class='del'>-			if (page_in_index &gt;= total_pages_in) {</div><div class='add'>+			folio_in_index++;</div><div class='add'>+			if (folio_in_index &gt;= total_folios_in) {</div><div class='ctx'> 				data_in = NULL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			data_in = kmap_local_page(pages_in[page_in_index]);</div><div class='add'>+			data_in = kmap_local_folio(folios_in[folio_in_index], 0);</div><div class='ctx'> 			workspace-&gt;strm.next_in = data_in;</div><div class='ctx'> 			tmp = srclen - workspace-&gt;strm.total_in;</div><div class='del'>-			workspace-&gt;strm.avail_in = min(tmp, PAGE_SIZE);</div><div class='add'>+			workspace-&gt;strm.avail_in = min(tmp, min_folio_size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (ret != Z_STREAM_END)</div><div class='add'>+	if (unlikely(ret != Z_STREAM_END)) {</div><div class='add'>+		btrfs_err(cb-&gt;bbio.inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"zlib decompression failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+			  ret, btrfs_root_id(cb-&gt;bbio.inode-&gt;root),</div><div class='add'>+			  btrfs_ino(cb-&gt;bbio.inode), cb-&gt;start);</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		ret = 0;</div><div class='add'>+	}</div><div class='ctx'> done:</div><div class='ctx'> 	zlib_inflateEnd(&amp;workspace-&gt;strm);</div><div class='ctx'> 	if (data_in)</div><div class='hunk'>@@ -354,18 +431,13 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int zlib_decompress(struct list_head *ws, const u8 *data_in,</div><div class='del'>-		struct page *dest_page, unsigned long start_byte, size_t srclen,</div><div class='add'>+		struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,</div><div class='ctx'> 		size_t destlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int wbits = MAX_WBITS;</div><div class='del'>-	unsigned long bytes_left;</div><div class='del'>-	unsigned long total_out = 0;</div><div class='del'>-	unsigned long pg_offset = 0;</div><div class='del'>-</div><div class='del'>-	destlen = min_t(unsigned long, destlen, PAGE_SIZE);</div><div class='del'>-	bytes_left = destlen;</div><div class='add'>+	unsigned long to_copy;</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;strm.next_in = data_in;</div><div class='ctx'> 	workspace-&gt;strm.avail_in = srclen;</div><div class='hunk'>@@ -385,70 +457,50 @@ int zlib_decompress(struct list_head *ws, const u8 *data_in,</div><div class='ctx'> 		workspace-&gt;strm.avail_in -= 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (Z_OK != zlib_inflateInit2(&amp;workspace-&gt;strm, wbits)) {</div><div class='del'>-		pr_warn("BTRFS: inflateInit failed\n");</div><div class='add'>+	ret = zlib_inflateInit2(&amp;workspace-&gt;strm, wbits);</div><div class='add'>+	if (unlikely(ret != Z_OK)) {</div><div class='add'>+		struct btrfs_inode *inode = folio_to_inode(dest_folio);</div><div class='add'>+</div><div class='add'>+		btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"zlib decompression init failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+			  ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+			  folio_pos(dest_folio));</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (bytes_left &gt; 0) {</div><div class='del'>-		unsigned long buf_start;</div><div class='del'>-		unsigned long buf_offset;</div><div class='del'>-		unsigned long bytes;</div><div class='del'>-</div><div class='del'>-		ret = zlib_inflate(&amp;workspace-&gt;strm, Z_NO_FLUSH);</div><div class='del'>-		if (ret != Z_OK &amp;&amp; ret != Z_STREAM_END)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		buf_start = total_out;</div><div class='del'>-		total_out = workspace-&gt;strm.total_out;</div><div class='del'>-</div><div class='del'>-		if (total_out == buf_start) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (total_out &lt;= start_byte)</div><div class='del'>-			goto next;</div><div class='del'>-</div><div class='del'>-		if (total_out &gt; start_byte &amp;&amp; buf_start &lt; start_byte)</div><div class='del'>-			buf_offset = start_byte - buf_start;</div><div class='del'>-		else</div><div class='del'>-			buf_offset = 0;</div><div class='del'>-</div><div class='del'>-		bytes = min(PAGE_SIZE - pg_offset,</div><div class='del'>-			    PAGE_SIZE - (buf_offset % PAGE_SIZE));</div><div class='del'>-		bytes = min(bytes, bytes_left);</div><div class='add'>+	/*</div><div class='add'>+	 * Everything (in/out buf) should be at most one sector, there should</div><div class='add'>+	 * be no need to switch any input/output buffer.</div><div class='add'>+	 */</div><div class='add'>+	ret = zlib_inflate(&amp;workspace-&gt;strm, Z_FINISH);</div><div class='add'>+	to_copy = min(workspace-&gt;strm.total_out, destlen);</div><div class='add'>+	if (ret != Z_STREAM_END)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		memcpy_to_page(dest_page, pg_offset,</div><div class='del'>-			       workspace-&gt;buf + buf_offset, bytes);</div><div class='add'>+	memcpy_to_folio(dest_folio, dest_pgoff, workspace-&gt;buf, to_copy);</div><div class='ctx'> </div><div class='del'>-		pg_offset += bytes;</div><div class='del'>-		bytes_left -= bytes;</div><div class='del'>-next:</div><div class='del'>-		workspace-&gt;strm.next_out = workspace-&gt;buf;</div><div class='del'>-		workspace-&gt;strm.avail_out = workspace-&gt;buf_size;</div><div class='del'>-	}</div><div class='add'>+out:</div><div class='add'>+	if (unlikely(to_copy != destlen)) {</div><div class='add'>+		struct btrfs_inode *inode = folio_to_inode(dest_folio);</div><div class='ctx'> </div><div class='del'>-	if (ret != Z_STREAM_END &amp;&amp; bytes_left != 0)</div><div class='add'>+		btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+"zlib decompression failed, error %d root %llu inode %llu offset %llu decompressed %lu expected %zu",</div><div class='add'>+			  ret, btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+			  folio_pos(dest_folio), to_copy, destlen);</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		ret = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	zlib_inflateEnd(&amp;workspace-&gt;strm);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * this should only happen if zlib returned fewer bytes than we</div><div class='del'>-	 * expected.  btrfs_get_block is responsible for zeroing from the</div><div class='del'>-	 * end of the inline extent (destlen) to the end of the page</div><div class='del'>-	 */</div><div class='del'>-	if (pg_offset &lt; destlen) {</div><div class='del'>-		memzero_page(dest_page, pg_offset, destlen - pg_offset);</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(to_copy &lt; destlen))</div><div class='add'>+		folio_zero_range(dest_folio, dest_pgoff + to_copy, destlen - to_copy);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct btrfs_compress_op btrfs_zlib_compress = {</div><div class='del'>-	.workspace_manager	= &amp;wsm,</div><div class='add'>+const struct btrfs_compress_levels btrfs_zlib_compress = {</div><div class='add'>+	.min_level		= 1,</div><div class='ctx'> 	.max_level		= 9,</div><div class='ctx'> 	.default_level		= BTRFS_ZLIB_DEFAULT_LEVEL,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c<br/>index 5bd76813b23f..359a98e6de85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zoned.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zoned.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zoned.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/zoned.c</a></div><div class='hunk'>@@ -9,16 +9,15 @@</div><div class='ctx'> #include "ctree.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "zoned.h"</div><div class='del'>-#include "rcu-string.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "block-group.h"</div><div class='del'>-#include "transaction.h"</div><div class='ctx'> #include "dev-replace.h"</div><div class='ctx'> #include "space-info.h"</div><div class='del'>-#include "super.h"</div><div class='ctx'> #include "fs.h"</div><div class='ctx'> #include "accessors.h"</div><div class='ctx'> #include "bio.h"</div><div class='add'>+#include "transaction.h"</div><div class='add'>+#include "sysfs.h"</div><div class='ctx'> </div><div class='ctx'> /* Maximum number of zones to report per blkdev_report_zones() call */</div><div class='ctx'> #define BTRFS_REPORT_NR_ZONES   4096</div><div class='hunk'>@@ -38,12 +37,15 @@</div><div class='ctx'> #define BTRFS_SB_LOG_FIRST_OFFSET	(512ULL * SZ_1G)</div><div class='ctx'> #define BTRFS_SB_LOG_SECOND_OFFSET	(4096ULL * SZ_1G)</div><div class='ctx'> </div><div class='del'>-#define BTRFS_SB_LOG_FIRST_SHIFT	const_ilog2(BTRFS_SB_LOG_FIRST_OFFSET)</div><div class='del'>-#define BTRFS_SB_LOG_SECOND_SHIFT	const_ilog2(BTRFS_SB_LOG_SECOND_OFFSET)</div><div class='add'>+#define BTRFS_SB_LOG_FIRST_SHIFT	ilog2(BTRFS_SB_LOG_FIRST_OFFSET)</div><div class='add'>+#define BTRFS_SB_LOG_SECOND_SHIFT	ilog2(BTRFS_SB_LOG_SECOND_OFFSET)</div><div class='ctx'> </div><div class='ctx'> /* Number of superblock log zones */</div><div class='ctx'> #define BTRFS_NR_SB_LOG_ZONES 2</div><div class='ctx'> </div><div class='add'>+/* Default number of max active zones when the device has no limits. */</div><div class='add'>+#define BTRFS_DEFAULT_MAX_ACTIVE_ZONES	128</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Minimum of active zones we need:</div><div class='ctx'>  *</div><div class='hunk'>@@ -89,10 +91,10 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones,</div><div class='ctx'> 	bool empty[BTRFS_NR_SB_LOG_ZONES];</div><div class='ctx'> 	bool full[BTRFS_NR_SB_LOG_ZONES];</div><div class='ctx'> 	sector_t sector;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BTRFS_NR_SB_LOG_ZONES; i++) {</div><div class='del'>-		ASSERT(zones[i].type != BLK_ZONE_TYPE_CONVENTIONAL);</div><div class='add'>+	for (int i = 0; i &lt; BTRFS_NR_SB_LOG_ZONES; i++) {</div><div class='add'>+		ASSERT(zones[i].type != BLK_ZONE_TYPE_CONVENTIONAL,</div><div class='add'>+		       "zones[%d].type=%d", i, zones[i].type);</div><div class='ctx'> 		empty[i] = (zones[i].cond == BLK_ZONE_COND_EMPTY);</div><div class='ctx'> 		full[i] = sb_zone_is_full(&amp;zones[i]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -120,12 +122,11 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	} else if (full[0] &amp;&amp; full[1]) {</div><div class='ctx'> 		/* Compare two super blocks */</div><div class='del'>-		struct address_space *mapping = bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+		struct address_space *mapping = bdev-&gt;bd_mapping;</div><div class='ctx'> 		struct page *page[BTRFS_NR_SB_LOG_ZONES];</div><div class='ctx'> 		struct btrfs_super_block *super[BTRFS_NR_SB_LOG_ZONES];</div><div class='del'>-		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; BTRFS_NR_SB_LOG_ZONES; i++) {</div><div class='add'>+		for (int i = 0; i &lt; BTRFS_NR_SB_LOG_ZONES; i++) {</div><div class='ctx'> 			u64 zone_end = (zones[i].start + zones[i].capacity) &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> 			u64 bytenr = ALIGN_DOWN(zone_end, BTRFS_SUPER_INFO_SIZE) -</div><div class='ctx'> 						BTRFS_SUPER_INFO_SIZE;</div><div class='hunk'>@@ -146,7 +147,7 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones,</div><div class='ctx'> 		else</div><div class='ctx'> 			sector = zones[0].start;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; BTRFS_NR_SB_LOG_ZONES; i++)</div><div class='add'>+		for (int i = 0; i &lt; BTRFS_NR_SB_LOG_ZONES; i++)</div><div class='ctx'> 			btrfs_release_disk_super(super[i]);</div><div class='ctx'> 	} else if (!full[0] &amp;&amp; (empty[1] || full[1])) {</div><div class='ctx'> 		sector = zones[0].wp;</div><div class='hunk'>@@ -166,14 +167,14 @@ static inline u32 sb_zone_number(int shift, int mirror)</div><div class='ctx'> {</div><div class='ctx'> 	u64 zone = U64_MAX;</div><div class='ctx'> </div><div class='del'>-	ASSERT(mirror &lt; BTRFS_SUPER_MIRROR_MAX);</div><div class='add'>+	ASSERT(mirror &lt; BTRFS_SUPER_MIRROR_MAX, "mirror=%d", mirror);</div><div class='ctx'> 	switch (mirror) {</div><div class='ctx'> 	case 0: zone = 0; break;</div><div class='ctx'> 	case 1: zone = 1ULL &lt;&lt; (BTRFS_SB_LOG_FIRST_SHIFT - shift); break;</div><div class='ctx'> 	case 2: zone = 1ULL &lt;&lt; (BTRFS_SB_LOG_SECOND_SHIFT - shift); break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ASSERT(zone &lt;= U32_MAX);</div><div class='add'>+	ASSERT(zone &lt;= U32_MAX, "zone=%llu", zone);</div><div class='ctx'> </div><div class='ctx'> 	return (u32)zone;</div><div class='ctx'> }</div><div class='hunk'>@@ -240,7 +241,8 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> 		u32 zno;</div><div class='ctx'> </div><div class='del'>-		ASSERT(IS_ALIGNED(pos, zinfo-&gt;zone_size));</div><div class='add'>+		ASSERT(IS_ALIGNED(pos, zinfo-&gt;zone_size),</div><div class='add'>+		       "pos=%llu zinfo-&gt;zone_size=%llu", pos, zinfo-&gt;zone_size);</div><div class='ctx'> 		zno = pos &gt;&gt; zinfo-&gt;zone_size_shift;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We cannot report zones beyond the zone end. So, it is OK to</div><div class='hunk'>@@ -264,17 +266,17 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = blkdev_report_zones(device-&gt;bdev, pos &gt;&gt; SECTOR_SHIFT, *nr_zones,</div><div class='del'>-				  copy_zone_info_cb, zones);</div><div class='add'>+	ret = blkdev_report_zones_cached(device-&gt;bdev, pos &gt;&gt; SECTOR_SHIFT,</div><div class='add'>+					 *nr_zones, copy_zone_info_cb, zones);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		btrfs_err_in_rcu(device-&gt;fs_info,</div><div class='add'>+		btrfs_err(device-&gt;fs_info,</div><div class='ctx'> 				 "zoned: failed to read zone %llu on %s (devid %llu)",</div><div class='del'>-				 pos, rcu_str_deref(device-&gt;name),</div><div class='add'>+				 pos, rcu_dereference(device-&gt;name),</div><div class='ctx'> 				 device-&gt;devid);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	*nr_zones = ret;</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (unlikely(!ret))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* Populate cache */</div><div class='hunk'>@@ -291,7 +293,7 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,</div><div class='ctx'> /* The emulated zone size is determined from the size of device extent */</div><div class='ctx'> static int calculate_emulated_zone_size(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_root *root = fs_info-&gt;dev_root;</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct extent_buffer *leaf;</div><div class='hunk'>@@ -308,28 +310,21 @@ static int calculate_emulated_zone_size(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (path-&gt;slots[0] &gt;= btrfs_header_nritems(path-&gt;nodes[0])) {</div><div class='ctx'> 		ret = btrfs_next_leaf(root, path);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 		/* No dev extents at all? Not good */</div><div class='del'>-		if (ret &gt; 0) {</div><div class='del'>-			ret = -EUCLEAN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (unlikely(ret &gt; 0))</div><div class='add'>+			return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	leaf = path-&gt;nodes[0];</div><div class='ctx'> 	dext = btrfs_item_ptr(leaf, path-&gt;slots[0], struct btrfs_dev_extent);</div><div class='ctx'> 	fs_info-&gt;zone_size = btrfs_dev_extent_length(leaf, dext);</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info)</div><div class='hunk'>@@ -406,16 +401,16 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> </div><div class='ctx'> 	/* We reject devices with a zone size larger than 8GB */</div><div class='ctx'> 	if (zone_info-&gt;zone_size &gt; BTRFS_MAX_ZONE_SIZE) {</div><div class='del'>-		btrfs_err_in_rcu(fs_info,</div><div class='add'>+		btrfs_err(fs_info,</div><div class='ctx'> 		"zoned: %s: zone size %llu larger than supported maximum %llu",</div><div class='del'>-				 rcu_str_deref(device-&gt;name),</div><div class='add'>+				 rcu_dereference(device-&gt;name),</div><div class='ctx'> 				 zone_info-&gt;zone_size, BTRFS_MAX_ZONE_SIZE);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else if (zone_info-&gt;zone_size &lt; BTRFS_MIN_ZONE_SIZE) {</div><div class='del'>-		btrfs_err_in_rcu(fs_info,</div><div class='add'>+		btrfs_err(fs_info,</div><div class='ctx'> 		"zoned: %s: zone size %llu smaller than supported minimum %u",</div><div class='del'>-				 rcu_str_deref(device-&gt;name),</div><div class='add'>+				 rcu_dereference(device-&gt;name),</div><div class='ctx'> 				 zone_info-&gt;zone_size, BTRFS_MIN_ZONE_SIZE);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -427,11 +422,14 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 	if (!IS_ALIGNED(nr_sectors, zone_sectors))</div><div class='ctx'> 		zone_info-&gt;nr_zones++;</div><div class='ctx'> </div><div class='del'>-	max_active_zones = bdev_max_active_zones(bdev);</div><div class='add'>+	max_active_zones = min_not_zero(bdev_max_active_zones(bdev),</div><div class='add'>+					bdev_max_open_zones(bdev));</div><div class='add'>+	if (!max_active_zones &amp;&amp; zone_info-&gt;nr_zones &gt; BTRFS_DEFAULT_MAX_ACTIVE_ZONES)</div><div class='add'>+		max_active_zones = BTRFS_DEFAULT_MAX_ACTIVE_ZONES;</div><div class='ctx'> 	if (max_active_zones &amp;&amp; max_active_zones &lt; BTRFS_MIN_ACTIVE_ZONES) {</div><div class='del'>-		btrfs_err_in_rcu(fs_info,</div><div class='add'>+		btrfs_err(fs_info,</div><div class='ctx'> "zoned: %s: max active zones %u is too small, need at least %u active zones",</div><div class='del'>-				 rcu_str_deref(device-&gt;name), max_active_zones,</div><div class='add'>+				 rcu_dereference(device-&gt;name), max_active_zones,</div><div class='ctx'> 				 BTRFS_MIN_ACTIVE_ZONES);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -471,9 +469,9 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 		zone_info-&gt;zone_cache = vcalloc(zone_info-&gt;nr_zones,</div><div class='ctx'> 						sizeof(struct blk_zone));</div><div class='ctx'> 		if (!zone_info-&gt;zone_cache) {</div><div class='del'>-			btrfs_err_in_rcu(device-&gt;fs_info,</div><div class='add'>+			btrfs_err(device-&gt;fs_info,</div><div class='ctx'> 				"zoned: failed to allocate zone cache for %s",</div><div class='del'>-				rcu_str_deref(device-&gt;name));</div><div class='add'>+				rcu_dereference(device-&gt;name));</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -498,6 +496,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 			case BLK_ZONE_COND_IMP_OPEN:</div><div class='ctx'> 			case BLK_ZONE_COND_EXP_OPEN:</div><div class='ctx'> 			case BLK_ZONE_COND_CLOSED:</div><div class='add'>+			case BLK_ZONE_COND_ACTIVE:</div><div class='ctx'> 				__set_bit(nreported, zone_info-&gt;active_zones);</div><div class='ctx'> 				nactive++;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -507,20 +506,25 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 		sector = zones[nr_zones - 1].start + zones[nr_zones - 1].len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nreported != zone_info-&gt;nr_zones) {</div><div class='del'>-		btrfs_err_in_rcu(device-&gt;fs_info,</div><div class='add'>+	if (unlikely(nreported != zone_info-&gt;nr_zones)) {</div><div class='add'>+		btrfs_err(device-&gt;fs_info,</div><div class='ctx'> 				 "inconsistent number of zones on %s (%u/%u)",</div><div class='del'>-				 rcu_str_deref(device-&gt;name), nreported,</div><div class='add'>+				 rcu_dereference(device-&gt;name), nreported,</div><div class='ctx'> 				 zone_info-&gt;nr_zones);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (max_active_zones) {</div><div class='del'>-		if (nactive &gt; max_active_zones) {</div><div class='del'>-			btrfs_err_in_rcu(device-&gt;fs_info,</div><div class='add'>+		if (unlikely(nactive &gt; max_active_zones)) {</div><div class='add'>+			if (bdev_max_active_zones(bdev) == 0) {</div><div class='add'>+				max_active_zones = 0;</div><div class='add'>+				zone_info-&gt;max_active_zones = 0;</div><div class='add'>+				goto validate;</div><div class='add'>+			}</div><div class='add'>+			btrfs_err(device-&gt;fs_info,</div><div class='ctx'> 			"zoned: %u active zones on %s exceeds max_active_zones %u",</div><div class='del'>-					 nactive, rcu_str_deref(device-&gt;name),</div><div class='add'>+					 nactive, rcu_dereference(device-&gt;name),</div><div class='ctx'> 					 max_active_zones);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -530,6 +534,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 		set_bit(BTRFS_FS_ACTIVE_ZONE_TRACKING, &amp;fs_info-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+validate:</div><div class='ctx'> 	/* Validate superblock log */</div><div class='ctx'> 	nr_zones = BTRFS_NR_SB_LOG_ZONES;</div><div class='ctx'> 	for (i = 0; i &lt; BTRFS_SUPER_MIRROR_MAX; i++) {</div><div class='hunk'>@@ -548,8 +553,8 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (nr_zones != BTRFS_NR_SB_LOG_ZONES) {</div><div class='del'>-			btrfs_err_in_rcu(device-&gt;fs_info,</div><div class='add'>+		if (unlikely(nr_zones != BTRFS_NR_SB_LOG_ZONES)) {</div><div class='add'>+			btrfs_err(device-&gt;fs_info,</div><div class='ctx'> 	"zoned: failed to read super block log zone info at devid %llu zone %u",</div><div class='ctx'> 					 device-&gt;devid, sb_zone);</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='hunk'>@@ -566,8 +571,8 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> </div><div class='ctx'> 		ret = sb_write_pointer(device-&gt;bdev,</div><div class='ctx'> 				       &amp;zone_info-&gt;sb_zones[sb_pos], &amp;sb_wp);</div><div class='del'>-		if (ret != -ENOENT &amp;&amp; ret) {</div><div class='del'>-			btrfs_err_in_rcu(device-&gt;fs_info,</div><div class='add'>+		if (unlikely(ret != -ENOENT &amp;&amp; ret)) {</div><div class='add'>+			btrfs_err(device-&gt;fs_info,</div><div class='ctx'> 			"zoned: super block log zone corrupted devid %llu zone %u",</div><div class='ctx'> 					 device-&gt;devid, sb_zone);</div><div class='ctx'> 			ret = -EUCLEAN;</div><div class='hunk'>@@ -586,9 +591,9 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)</div><div class='ctx'> 		emulated = "emulated ";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	btrfs_info_in_rcu(fs_info,</div><div class='add'>+	btrfs_info(fs_info,</div><div class='ctx'> 		"%s block device %s, %u %szones of %llu bytes",</div><div class='del'>-		model, rcu_str_deref(device-&gt;name), zone_info-&gt;nr_zones,</div><div class='add'>+		model, rcu_dereference(device-&gt;name), zone_info-&gt;nr_zones,</div><div class='ctx'> 		emulated, zone_info-&gt;zone_size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -654,8 +659,7 @@ out:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,</div><div class='del'>-		       struct blk_zone *zone)</div><div class='add'>+static int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, struct blk_zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int nr_zones = 1;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -719,11 +723,14 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		 * zoned mode. In this case, we don't have a valid max zone</div><div class='ctx'> 		 * append size.</div><div class='ctx'> 		 */</div><div class='del'>-		if (bdev_is_zoned(device-&gt;bdev)) {</div><div class='del'>-			blk_stack_limits(lim,</div><div class='del'>-					 &amp;bdev_get_queue(device-&gt;bdev)-&gt;limits,</div><div class='del'>-					 0);</div><div class='del'>-		}</div><div class='add'>+		if (bdev_is_zoned(device-&gt;bdev))</div><div class='add'>+			blk_stack_limits(lim, bdev_limits(device-&gt;bdev), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = blk_validate_limits(lim);</div><div class='add'>+	if (ret) {</div><div class='add'>+		btrfs_err(fs_info, "zoned: failed to validate queue limits");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -757,8 +764,9 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		     (u64)lim-&gt;max_segments &lt;&lt; PAGE_SHIFT),</div><div class='ctx'> 		fs_info-&gt;sectorsize);</div><div class='ctx'> 	fs_info-&gt;fs_devices-&gt;chunk_alloc_policy = BTRFS_CHUNK_ALLOC_ZONED;</div><div class='del'>-	if (fs_info-&gt;max_zone_append_size &lt; fs_info-&gt;max_extent_size)</div><div class='del'>-		fs_info-&gt;max_extent_size = fs_info-&gt;max_zone_append_size;</div><div class='add'>+</div><div class='add'>+	fs_info-&gt;max_extent_size = min_not_zero(fs_info-&gt;max_extent_size,</div><div class='add'>+						fs_info-&gt;max_zone_append_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check mount options here, because we might change fs_info-&gt;zoned</div><div class='hunk'>@@ -772,7 +780,8 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_check_mountopts_zoned(struct btrfs_fs_info *info, unsigned long *mount_opt)</div><div class='add'>+int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,</div><div class='add'>+				unsigned long long *mount_opt)</div><div class='ctx'> {</div><div class='ctx'> 	if (!btrfs_is_zoned(info))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -824,11 +833,14 @@ static int sb_log_location(struct block_device *bdev, struct blk_zone *zones,</div><div class='ctx'> 			reset = &amp;zones[1];</div><div class='ctx'> </div><div class='ctx'> 		if (reset &amp;&amp; reset-&gt;cond != BLK_ZONE_COND_EMPTY) {</div><div class='add'>+			unsigned int nofs_flags;</div><div class='add'>+</div><div class='ctx'> 			ASSERT(sb_zone_is_full(reset));</div><div class='ctx'> </div><div class='add'>+			nofs_flags = memalloc_nofs_save();</div><div class='ctx'> 			ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,</div><div class='del'>-					       reset-&gt;start, reset-&gt;len,</div><div class='del'>-					       GFP_NOFS);</div><div class='add'>+					       reset-&gt;start, reset-&gt;len);</div><div class='add'>+			memalloc_nofs_restore(nofs_flags);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -887,12 +899,12 @@ int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw,</div><div class='ctx'> 	if (sb_zone + 1 &gt;= nr_zones)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ret = blkdev_report_zones(bdev, zone_start_sector(sb_zone, bdev),</div><div class='del'>-				  BTRFS_NR_SB_LOG_ZONES, copy_zone_info_cb,</div><div class='del'>-				  zones);</div><div class='add'>+	ret = blkdev_report_zones_cached(bdev, zone_start_sector(sb_zone, bdev),</div><div class='add'>+					 BTRFS_NR_SB_LOG_ZONES,</div><div class='add'>+					 copy_zone_info_cb, zones);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (ret != BTRFS_NR_SB_LOG_ZONES)</div><div class='add'>+	if (unlikely(ret != BTRFS_NR_SB_LOG_ZONES))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return sb_log_location(bdev, zones, rw, bytenr_ret);</div><div class='hunk'>@@ -974,11 +986,14 @@ int btrfs_advance_sb_log(struct btrfs_device *device, int mirror)</div><div class='ctx'> 			 * explicit ZONE_FINISH is not necessary.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (zone-&gt;wp != zone-&gt;start + zone-&gt;capacity) {</div><div class='add'>+				unsigned int nofs_flags;</div><div class='ctx'> 				int ret;</div><div class='ctx'> </div><div class='add'>+				nofs_flags = memalloc_nofs_save();</div><div class='ctx'> 				ret = blkdev_zone_mgmt(device-&gt;bdev,</div><div class='ctx'> 						REQ_OP_ZONE_FINISH, zone-&gt;start,</div><div class='del'>-						zone-&gt;len, GFP_NOFS);</div><div class='add'>+						zone-&gt;len);</div><div class='add'>+				memalloc_nofs_restore(nofs_flags);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -990,17 +1005,19 @@ int btrfs_advance_sb_log(struct btrfs_device *device, int mirror)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* All the zones are FULL. Should not reach here. */</div><div class='del'>-	ASSERT(0);</div><div class='add'>+	DEBUG_WARN("unexpected state, all zones full");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int btrfs_reset_sb_log_zones(struct block_device *bdev, int mirror)</div><div class='ctx'> {</div><div class='add'>+	unsigned int nofs_flags;</div><div class='ctx'> 	sector_t zone_sectors;</div><div class='ctx'> 	sector_t nr_sectors;</div><div class='ctx'> 	u8 zone_sectors_shift;</div><div class='ctx'> 	u32 sb_zone;</div><div class='ctx'> 	u32 nr_zones;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	zone_sectors = bdev_zone_sectors(bdev);</div><div class='ctx'> 	zone_sectors_shift = ilog2(zone_sectors);</div><div class='hunk'>@@ -1011,9 +1028,12 @@ int btrfs_reset_sb_log_zones(struct block_device *bdev, int mirror)</div><div class='ctx'> 	if (sb_zone + 1 &gt;= nr_zones)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	return blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,</div><div class='del'>-				zone_start_sector(sb_zone, bdev),</div><div class='del'>-				zone_sectors * BTRFS_NR_SB_LOG_ZONES, GFP_NOFS);</div><div class='add'>+	nofs_flags = memalloc_nofs_save();</div><div class='add'>+	ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,</div><div class='add'>+			       zone_start_sector(sb_zone, bdev),</div><div class='add'>+			       zone_sectors * BTRFS_NR_SB_LOG_ZONES);</div><div class='add'>+	memalloc_nofs_restore(nofs_flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1038,8 +1058,10 @@ u64 btrfs_find_allocatable_zones(struct btrfs_device *device, u64 hole_start,</div><div class='ctx'> 	bool have_sb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ASSERT(IS_ALIGNED(hole_start, zinfo-&gt;zone_size));</div><div class='del'>-	ASSERT(IS_ALIGNED(num_bytes, zinfo-&gt;zone_size));</div><div class='add'>+	ASSERT(IS_ALIGNED(hole_start, zinfo-&gt;zone_size),</div><div class='add'>+	       "hole_start=%llu zinfo-&gt;zone_size=%llu", hole_start, zinfo-&gt;zone_size);</div><div class='add'>+	ASSERT(IS_ALIGNED(num_bytes, zinfo-&gt;zone_size),</div><div class='add'>+	       "num_bytes=%llu zinfo-&gt;zone_size=%llu", num_bytes, zinfo-&gt;zone_size);</div><div class='ctx'> </div><div class='ctx'> 	while (pos &lt; hole_end) {</div><div class='ctx'> 		begin = pos &gt;&gt; shift;</div><div class='hunk'>@@ -1124,12 +1146,14 @@ static void btrfs_dev_clear_active_zone(struct btrfs_device *device, u64 pos)</div><div class='ctx'> int btrfs_reset_device_zone(struct btrfs_device *device, u64 physical,</div><div class='ctx'> 			    u64 length, u64 *bytes)</div><div class='ctx'> {</div><div class='add'>+	unsigned int nofs_flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	*bytes = 0;</div><div class='add'>+	nofs_flags = memalloc_nofs_save();</div><div class='ctx'> 	ret = blkdev_zone_mgmt(device-&gt;bdev, REQ_OP_ZONE_RESET,</div><div class='del'>-			       physical &gt;&gt; SECTOR_SHIFT, length &gt;&gt; SECTOR_SHIFT,</div><div class='del'>-			       GFP_NOFS);</div><div class='add'>+			       physical &gt;&gt; SECTOR_SHIFT, length &gt;&gt; SECTOR_SHIFT);</div><div class='add'>+	memalloc_nofs_restore(nofs_flags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1153,8 +1177,10 @@ int btrfs_ensure_empty_zones(struct btrfs_device *device, u64 start, u64 size)</div><div class='ctx'> 	u64 pos;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ASSERT(IS_ALIGNED(start, zinfo-&gt;zone_size));</div><div class='del'>-	ASSERT(IS_ALIGNED(size, zinfo-&gt;zone_size));</div><div class='add'>+	ASSERT(IS_ALIGNED(start, zinfo-&gt;zone_size),</div><div class='add'>+	       "start=%llu, zinfo-&gt;zone_size=%llu", start, zinfo-&gt;zone_size);</div><div class='add'>+	ASSERT(IS_ALIGNED(size, zinfo-&gt;zone_size),</div><div class='add'>+	       "size=%llu, zinfo-&gt;zone_size=%llu", size, zinfo-&gt;zone_size);</div><div class='ctx'> </div><div class='ctx'> 	if (begin + nbits &gt; zinfo-&gt;nr_zones)</div><div class='ctx'> 		return -ERANGE;</div><div class='hunk'>@@ -1176,10 +1202,10 @@ int btrfs_ensure_empty_zones(struct btrfs_device *device, u64 start, u64 size)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Free regions should be empty */</div><div class='del'>-		btrfs_warn_in_rcu(</div><div class='add'>+		btrfs_warn(</div><div class='ctx'> 			device-&gt;fs_info,</div><div class='ctx'> 		"zoned: resetting device %s (devid %llu) zone %llu for allocation",</div><div class='del'>-			rcu_str_deref(device-&gt;name), device-&gt;devid, pos &gt;&gt; shift);</div><div class='add'>+			rcu_dereference(device-&gt;name), device-&gt;devid, pos &gt;&gt; shift);</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> </div><div class='ctx'> 		ret = btrfs_reset_device_zone(device, pos, zinfo-&gt;zone_size,</div><div class='hunk'>@@ -1202,7 +1228,7 @@ static int calculate_alloc_pointer(struct btrfs_block_group *cache,</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = cache-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_root *root;</div><div class='del'>-	struct btrfs_path *path;</div><div class='add'>+	BTRFS_PATH_AUTO_FREE(path);</div><div class='ctx'> 	struct btrfs_key key;</div><div class='ctx'> 	struct btrfs_key found_key;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1234,10 +1260,10 @@ static int calculate_alloc_pointer(struct btrfs_block_group *cache,</div><div class='ctx'> 	root = btrfs_extent_root(fs_info, key.objectid);</div><div class='ctx'> 	ret = btrfs_search_slot(NULL, root, &amp;key, path, 0, 0);</div><div class='ctx'> 	/* We should not find the exact match */</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (unlikely(!ret))</div><div class='ctx'> 		ret = -EUCLEAN;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_previous_extent_item(root, path, cache-&gt;start);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1245,7 +1271,7 @@ static int calculate_alloc_pointer(struct btrfs_block_group *cache,</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			*offset_ret = 0;</div><div class='ctx'> 		}</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	btrfs_item_key_to_cpu(path-&gt;nodes[0], &amp;found_key, path-&gt;slots[0]);</div><div class='hunk'>@@ -1255,17 +1281,12 @@ static int calculate_alloc_pointer(struct btrfs_block_group *cache,</div><div class='ctx'> 	else</div><div class='ctx'> 		length = fs_info-&gt;nodesize;</div><div class='ctx'> </div><div class='del'>-	if (!(found_key.objectid &gt;= cache-&gt;start &amp;&amp;</div><div class='del'>-	       found_key.objectid + length &lt;= cache-&gt;start + cache-&gt;length)) {</div><div class='del'>-		ret = -EUCLEAN;</div><div class='del'>-		goto out;</div><div class='add'>+	if (unlikely(!(found_key.objectid &gt;= cache-&gt;start &amp;&amp;</div><div class='add'>+		       found_key.objectid + length &lt;= cache-&gt;start + cache-&gt;length))) {</div><div class='add'>+		return -EUCLEAN;</div><div class='ctx'> 	}</div><div class='ctx'> 	*offset_ret = found_key.objectid + length - cache-&gt;start;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	btrfs_free_path(path);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct zone_info {</div><div class='hunk'>@@ -1276,10 +1297,10 @@ struct zone_info {</div><div class='ctx'> </div><div class='ctx'> static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,</div><div class='ctx'> 				struct zone_info *info, unsigned long *active,</div><div class='del'>-				struct btrfs_chunk_map *map)</div><div class='add'>+				struct btrfs_chunk_map *map, bool new)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_dev_replace *dev_replace = &amp;fs_info-&gt;dev_replace;</div><div class='del'>-	struct btrfs_device *device = map-&gt;stripes[zone_idx].dev;</div><div class='add'>+	struct btrfs_device *device;</div><div class='ctx'> 	int dev_replace_is_ongoing = 0;</div><div class='ctx'> 	unsigned int nofs_flag;</div><div class='ctx'> 	struct blk_zone zone;</div><div class='hunk'>@@ -1287,7 +1308,11 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;physical = map-&gt;stripes[zone_idx].physical;</div><div class='ctx'> </div><div class='add'>+	down_read(&amp;dev_replace-&gt;rwsem);</div><div class='add'>+	device = map-&gt;stripes[zone_idx].dev;</div><div class='add'>+</div><div class='ctx'> 	if (!device-&gt;bdev) {</div><div class='add'>+		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 		info-&gt;alloc_offset = WP_MISSING_DEV;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1297,39 +1322,55 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,</div><div class='ctx'> 		__set_bit(zone_idx, active);</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_dev_is_sequential(device, info-&gt;physical)) {</div><div class='add'>+		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 		info-&gt;alloc_offset = WP_CONVENTIONAL;</div><div class='add'>+		info-&gt;capacity = device-&gt;zone_info-&gt;zone_size;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ASSERT(!new || btrfs_dev_is_empty_zone(device, info-&gt;physical));</div><div class='add'>+</div><div class='ctx'> 	/* This zone will be used for allocation, so mark this zone non-empty. */</div><div class='ctx'> 	btrfs_dev_clear_zone_empty(device, info-&gt;physical);</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 	dev_replace_is_ongoing = btrfs_dev_replace_is_ongoing(dev_replace);</div><div class='ctx'> 	if (dev_replace_is_ongoing &amp;&amp; dev_replace-&gt;tgtdev != NULL)</div><div class='ctx'> 		btrfs_dev_clear_zone_empty(dev_replace-&gt;tgtdev, info-&gt;physical);</div><div class='del'>-	up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The group is mapped to a sequential zone. Get the zone write pointer</div><div class='ctx'> 	 * to determine the allocation offset within the zone.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON(!IS_ALIGNED(info-&gt;physical, fs_info-&gt;zone_size));</div><div class='add'>+</div><div class='add'>+	if (new) {</div><div class='add'>+		sector_t capacity;</div><div class='add'>+</div><div class='add'>+		capacity = bdev_zone_capacity(device-&gt;bdev, info-&gt;physical &gt;&gt; SECTOR_SHIFT);</div><div class='add'>+		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='add'>+		info-&gt;alloc_offset = 0;</div><div class='add'>+		info-&gt;capacity = capacity &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='ctx'> 	ret = btrfs_get_dev_zone(device, info-&gt;physical, &amp;zone);</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flag);</div><div class='ctx'> 	if (ret) {</div><div class='add'>+		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 		if (ret != -EIO &amp;&amp; ret != -EOPNOTSUPP)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		info-&gt;alloc_offset = WP_MISSING_DEV;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (zone.type == BLK_ZONE_TYPE_CONVENTIONAL) {</div><div class='del'>-		btrfs_err_in_rcu(fs_info,</div><div class='add'>+	if (unlikely(zone.type == BLK_ZONE_TYPE_CONVENTIONAL)) {</div><div class='add'>+		btrfs_err(fs_info,</div><div class='ctx'> 		"zoned: unexpected conventional zone %llu on device %s (devid %llu)",</div><div class='del'>-			zone.start &lt;&lt; SECTOR_SHIFT, rcu_str_deref(device-&gt;name),</div><div class='add'>+			zone.start &lt;&lt; SECTOR_SHIFT, rcu_dereference(device-&gt;name),</div><div class='ctx'> 			device-&gt;devid);</div><div class='add'>+		up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1341,7 +1382,7 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 		"zoned: offline/readonly zone %llu on device %s (devid %llu)",</div><div class='ctx'> 			  (info-&gt;physical &gt;&gt; device-&gt;zone_info-&gt;zone_size_shift),</div><div class='del'>-			  rcu_str_deref(device-&gt;name), device-&gt;devid);</div><div class='add'>+			  rcu_dereference(device-&gt;name), device-&gt;devid);</div><div class='ctx'> 		info-&gt;alloc_offset = WP_MISSING_DEV;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BLK_ZONE_COND_EMPTY:</div><div class='hunk'>@@ -1357,6 +1398,8 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	up_read(&amp;dev_replace-&gt;rwsem);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1364,7 +1407,7 @@ static int btrfs_load_block_group_single(struct btrfs_block_group *bg,</div><div class='ctx'> 					 struct zone_info *info,</div><div class='ctx'> 					 unsigned long *active)</div><div class='ctx'> {</div><div class='del'>-	if (info-&gt;alloc_offset == WP_MISSING_DEV) {</div><div class='add'>+	if (unlikely(info-&gt;alloc_offset == WP_MISSING_DEV)) {</div><div class='ctx'> 		btrfs_err(bg-&gt;fs_info,</div><div class='ctx'> 			"zoned: cannot recover write pointer for zone %llu",</div><div class='ctx'> 			info-&gt;physical);</div><div class='hunk'>@@ -1381,7 +1424,8 @@ static int btrfs_load_block_group_single(struct btrfs_block_group *bg,</div><div class='ctx'> static int btrfs_load_block_group_dup(struct btrfs_block_group *bg,</div><div class='ctx'> 				      struct btrfs_chunk_map *map,</div><div class='ctx'> 				      struct zone_info *zone_info,</div><div class='del'>-				      unsigned long *active)</div><div class='add'>+				      unsigned long *active,</div><div class='add'>+				      u64 last_alloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='ctx'> </div><div class='hunk'>@@ -1390,40 +1434,49 @@ static int btrfs_load_block_group_dup(struct btrfs_block_group *bg,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (zone_info[0].alloc_offset == WP_MISSING_DEV) {</div><div class='add'>+	bg-&gt;zone_capacity = min_not_zero(zone_info[0].capacity, zone_info[1].capacity);</div><div class='add'>+</div><div class='add'>+	if (unlikely(zone_info[0].alloc_offset == WP_MISSING_DEV)) {</div><div class='ctx'> 		btrfs_err(bg-&gt;fs_info,</div><div class='ctx'> 			  "zoned: cannot recover write pointer for zone %llu",</div><div class='ctx'> 			  zone_info[0].physical);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (zone_info[1].alloc_offset == WP_MISSING_DEV) {</div><div class='add'>+	if (unlikely(zone_info[1].alloc_offset == WP_MISSING_DEV)) {</div><div class='ctx'> 		btrfs_err(bg-&gt;fs_info,</div><div class='ctx'> 			  "zoned: cannot recover write pointer for zone %llu",</div><div class='ctx'> 			  zone_info[1].physical);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (zone_info[0].alloc_offset != zone_info[1].alloc_offset) {</div><div class='add'>+</div><div class='add'>+	if (zone_info[0].alloc_offset == WP_CONVENTIONAL)</div><div class='add'>+		zone_info[0].alloc_offset = last_alloc;</div><div class='add'>+</div><div class='add'>+	if (zone_info[1].alloc_offset == WP_CONVENTIONAL)</div><div class='add'>+		zone_info[1].alloc_offset = last_alloc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(zone_info[0].alloc_offset != zone_info[1].alloc_offset)) {</div><div class='ctx'> 		btrfs_err(bg-&gt;fs_info,</div><div class='ctx'> 			  "zoned: write pointer offset mismatch of zones in DUP profile");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(0, active) != test_bit(1, active)) {</div><div class='del'>-		if (!btrfs_zone_activate(bg))</div><div class='add'>+		if (unlikely(!btrfs_zone_activate(bg)))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	} else if (test_bit(0, active)) {</div><div class='ctx'> 		set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &amp;bg-&gt;runtime_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bg-&gt;alloc_offset = zone_info[0].alloc_offset;</div><div class='del'>-	bg-&gt;zone_capacity = min(zone_info[0].capacity, zone_info[1].capacity);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int btrfs_load_block_group_raid1(struct btrfs_block_group *bg,</div><div class='ctx'> 					struct btrfs_chunk_map *map,</div><div class='ctx'> 					struct zone_info *zone_info,</div><div class='del'>-					unsigned long *active)</div><div class='add'>+					unsigned long *active,</div><div class='add'>+					u64 last_alloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1434,30 +1487,32 @@ static int btrfs_load_block_group_raid1(struct btrfs_block_group *bg,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* In case a device is missing we have a cap of 0, so don't use it. */</div><div class='add'>+	bg-&gt;zone_capacity = min_not_zero(zone_info[0].capacity, zone_info[1].capacity);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='del'>-		if (zone_info[i].alloc_offset == WP_MISSING_DEV ||</div><div class='del'>-		    zone_info[i].alloc_offset == WP_CONVENTIONAL)</div><div class='add'>+		if (zone_info[i].alloc_offset == WP_MISSING_DEV)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if ((zone_info[0].alloc_offset != zone_info[i].alloc_offset) &amp;&amp;</div><div class='del'>-		    !btrfs_test_opt(fs_info, DEGRADED)) {</div><div class='add'>+		if (zone_info[i].alloc_offset == WP_CONVENTIONAL)</div><div class='add'>+			zone_info[i].alloc_offset = last_alloc;</div><div class='add'>+</div><div class='add'>+		if (unlikely((zone_info[0].alloc_offset != zone_info[i].alloc_offset) &amp;&amp;</div><div class='add'>+			     !btrfs_test_opt(fs_info, DEGRADED))) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='ctx'> 			"zoned: write pointer offset mismatch of zones in %s profile",</div><div class='ctx'> 				  btrfs_bg_type_to_raid_name(map-&gt;type));</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (test_bit(0, active) != test_bit(i, active)) {</div><div class='del'>-			if (!btrfs_test_opt(fs_info, DEGRADED) &amp;&amp;</div><div class='del'>-			    !btrfs_zone_activate(bg)) {</div><div class='add'>+			if (unlikely(!btrfs_test_opt(fs_info, DEGRADED) &amp;&amp;</div><div class='add'>+				     !btrfs_zone_activate(bg))) {</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (test_bit(0, active))</div><div class='ctx'> 				set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &amp;bg-&gt;runtime_flags);</div><div class='ctx'> 		}</div><div class='del'>-		/* In case a device is missing we have a cap of 0, so don't use it. */</div><div class='del'>-		bg-&gt;zone_capacity = min_not_zero(zone_info[0].capacity,</div><div class='del'>-						 zone_info[1].capacity);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (zone_info[0].alloc_offset != WP_MISSING_DEV)</div><div class='hunk'>@@ -1471,9 +1526,12 @@ static int btrfs_load_block_group_raid1(struct btrfs_block_group *bg,</div><div class='ctx'> static int btrfs_load_block_group_raid0(struct btrfs_block_group *bg,</div><div class='ctx'> 					struct btrfs_chunk_map *map,</div><div class='ctx'> 					struct zone_info *zone_info,</div><div class='del'>-					unsigned long *active)</div><div class='add'>+					unsigned long *active,</div><div class='add'>+					u64 last_alloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='add'>+	u64 stripe_nr = 0, stripe_offset = 0;</div><div class='add'>+	u32 stripe_index = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((map-&gt;type &amp; BTRFS_BLOCK_GROUP_DATA) &amp;&amp; !fs_info-&gt;stripe_root) {</div><div class='ctx'> 		btrfs_err(fs_info, "zoned: data %s needs raid-stripe-tree",</div><div class='hunk'>@@ -1481,13 +1539,30 @@ static int btrfs_load_block_group_raid0(struct btrfs_block_group *bg,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (last_alloc) {</div><div class='add'>+		u32 factor = map-&gt;num_stripes;</div><div class='add'>+</div><div class='add'>+		stripe_nr = last_alloc &gt;&gt; BTRFS_STRIPE_LEN_SHIFT;</div><div class='add'>+		stripe_offset = last_alloc &amp; BTRFS_STRIPE_LEN_MASK;</div><div class='add'>+		stripe_nr = div_u64_rem(stripe_nr, factor, &amp;stripe_index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (int i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='del'>-		if (zone_info[i].alloc_offset == WP_MISSING_DEV ||</div><div class='del'>-		    zone_info[i].alloc_offset == WP_CONVENTIONAL)</div><div class='add'>+		if (zone_info[i].alloc_offset == WP_MISSING_DEV)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (zone_info[i].alloc_offset == WP_CONVENTIONAL) {</div><div class='add'>+</div><div class='add'>+			zone_info[i].alloc_offset = btrfs_stripe_nr_to_offset(stripe_nr);</div><div class='add'>+</div><div class='add'>+			if (stripe_index &gt; i)</div><div class='add'>+				zone_info[i].alloc_offset += BTRFS_STRIPE_LEN;</div><div class='add'>+			else if (stripe_index == i)</div><div class='add'>+				zone_info[i].alloc_offset += stripe_offset;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (test_bit(0, active) != test_bit(i, active)) {</div><div class='del'>-			if (!btrfs_zone_activate(bg))</div><div class='add'>+			if (unlikely(!btrfs_zone_activate(bg)))</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (test_bit(0, active))</div><div class='hunk'>@@ -1503,9 +1578,12 @@ static int btrfs_load_block_group_raid0(struct btrfs_block_group *bg,</div><div class='ctx'> static int btrfs_load_block_group_raid10(struct btrfs_block_group *bg,</div><div class='ctx'> 					 struct btrfs_chunk_map *map,</div><div class='ctx'> 					 struct zone_info *zone_info,</div><div class='del'>-					 unsigned long *active)</div><div class='add'>+					 unsigned long *active,</div><div class='add'>+					 u64 last_alloc)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = bg-&gt;fs_info;</div><div class='add'>+	u64 stripe_nr = 0, stripe_offset = 0;</div><div class='add'>+	u32 stripe_index = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((map-&gt;type &amp; BTRFS_BLOCK_GROUP_DATA) &amp;&amp; !fs_info-&gt;stripe_root) {</div><div class='ctx'> 		btrfs_err(fs_info, "zoned: data %s needs raid-stripe-tree",</div><div class='hunk'>@@ -1513,19 +1591,35 @@ static int btrfs_load_block_group_raid10(struct btrfs_block_group *bg,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (last_alloc) {</div><div class='add'>+		u32 factor = map-&gt;num_stripes / map-&gt;sub_stripes;</div><div class='add'>+</div><div class='add'>+		stripe_nr = last_alloc &gt;&gt; BTRFS_STRIPE_LEN_SHIFT;</div><div class='add'>+		stripe_offset = last_alloc &amp; BTRFS_STRIPE_LEN_MASK;</div><div class='add'>+		stripe_nr = div_u64_rem(stripe_nr, factor, &amp;stripe_index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (int i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='del'>-		if (zone_info[i].alloc_offset == WP_MISSING_DEV ||</div><div class='del'>-		    zone_info[i].alloc_offset == WP_CONVENTIONAL)</div><div class='add'>+		if (zone_info[i].alloc_offset == WP_MISSING_DEV)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(0, active) != test_bit(i, active)) {</div><div class='del'>-			if (!btrfs_zone_activate(bg))</div><div class='add'>+			if (unlikely(!btrfs_zone_activate(bg)))</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (test_bit(0, active))</div><div class='ctx'> 				set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &amp;bg-&gt;runtime_flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (zone_info[i].alloc_offset == WP_CONVENTIONAL) {</div><div class='add'>+			zone_info[i].alloc_offset = btrfs_stripe_nr_to_offset(stripe_nr);</div><div class='add'>+</div><div class='add'>+			if (stripe_index &gt; (i / map-&gt;sub_stripes))</div><div class='add'>+				zone_info[i].alloc_offset += BTRFS_STRIPE_LEN;</div><div class='add'>+			else if (stripe_index == (i / map-&gt;sub_stripes))</div><div class='add'>+				zone_info[i].alloc_offset += stripe_offset;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if ((i % map-&gt;sub_stripes) == 0) {</div><div class='ctx'> 			bg-&gt;zone_capacity += zone_info[i].capacity;</div><div class='ctx'> 			bg-&gt;alloc_offset += zone_info[i].alloc_offset;</div><div class='hunk'>@@ -1541,18 +1635,19 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)</div><div class='ctx'> 	struct btrfs_chunk_map *map;</div><div class='ctx'> 	u64 logical = cache-&gt;start;</div><div class='ctx'> 	u64 length = cache-&gt;length;</div><div class='del'>-	struct zone_info *zone_info = NULL;</div><div class='add'>+	struct zone_info AUTO_KFREE(zone_info);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long *active = NULL;</div><div class='ctx'> 	u64 last_alloc = 0;</div><div class='ctx'> 	u32 num_sequential = 0, num_conventional = 0;</div><div class='add'>+	u64 profile;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='del'>-	if (!IS_ALIGNED(length, fs_info-&gt;zone_size)) {</div><div class='add'>+	if (unlikely(!IS_ALIGNED(length, fs_info-&gt;zone_size))) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> 		"zoned: block group %llu len %llu unaligned to zone size %llu",</div><div class='ctx'> 			  logical, length, fs_info-&gt;zone_size);</div><div class='hunk'>@@ -1563,11 +1658,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)</div><div class='ctx'> 	if (!map)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	cache-&gt;physical_map = btrfs_clone_chunk_map(map, GFP_NOFS);</div><div class='del'>-	if (!cache-&gt;physical_map) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	cache-&gt;physical_map = map;</div><div class='ctx'> </div><div class='ctx'> 	zone_info = kcalloc(map-&gt;num_stripes, sizeof(*zone_info), GFP_NOFS);</div><div class='ctx'> 	if (!zone_info) {</div><div class='hunk'>@@ -1582,7 +1673,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='del'>-		ret = btrfs_load_zone_info(fs_info, i, &amp;zone_info[i], active, map);</div><div class='add'>+		ret = btrfs_load_zone_info(fs_info, i, &amp;zone_info[i], active, map, new);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1596,8 +1687,6 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)</div><div class='ctx'> 		set_bit(BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE, &amp;cache-&gt;runtime_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (num_conventional &gt; 0) {</div><div class='del'>-		/* Zone capacity is always zone size in emulation */</div><div class='del'>-		cache-&gt;zone_capacity = cache-&gt;length;</div><div class='ctx'> 		ret = calculate_alloc_pointer(cache, &amp;last_alloc, new);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			btrfs_err(fs_info,</div><div class='hunk'>@@ -1606,28 +1695,34 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (map-&gt;num_stripes == num_conventional) {</div><div class='ctx'> 			cache-&gt;alloc_offset = last_alloc;</div><div class='add'>+			cache-&gt;zone_capacity = cache-&gt;length;</div><div class='ctx'> 			set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &amp;cache-&gt;runtime_flags);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (map-&gt;type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK) {</div><div class='add'>+	profile = map-&gt;type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK;</div><div class='add'>+	switch (profile) {</div><div class='ctx'> 	case 0: /* single */</div><div class='ctx'> 		ret = btrfs_load_block_group_single(cache, &amp;zone_info[0], active);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_DUP:</div><div class='del'>-		ret = btrfs_load_block_group_dup(cache, map, zone_info, active);</div><div class='add'>+		ret = btrfs_load_block_group_dup(cache, map, zone_info, active,</div><div class='add'>+						 last_alloc);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID1:</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID1C3:</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID1C4:</div><div class='del'>-		ret = btrfs_load_block_group_raid1(cache, map, zone_info, active);</div><div class='add'>+		ret = btrfs_load_block_group_raid1(cache, map, zone_info,</div><div class='add'>+						   active, last_alloc);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID0:</div><div class='del'>-		ret = btrfs_load_block_group_raid0(cache, map, zone_info, active);</div><div class='add'>+		ret = btrfs_load_block_group_raid0(cache, map, zone_info,</div><div class='add'>+						   active, last_alloc);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID10:</div><div class='del'>-		ret = btrfs_load_block_group_raid10(cache, map, zone_info, active);</div><div class='add'>+		ret = btrfs_load_block_group_raid10(cache, map, zone_info,</div><div class='add'>+						    active, last_alloc);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID5:</div><div class='ctx'> 	case BTRFS_BLOCK_GROUP_RAID6:</div><div class='hunk'>@@ -1638,8 +1733,33 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ret == -EIO &amp;&amp; profile != 0 &amp;&amp; profile != BTRFS_BLOCK_GROUP_RAID0 &amp;&amp;</div><div class='add'>+	    profile != BTRFS_BLOCK_GROUP_RAID10) {</div><div class='add'>+		/*</div><div class='add'>+		 * Detected broken write pointer.  Make this block group</div><div class='add'>+		 * unallocatable by setting the allocation pointer at the end of</div><div class='add'>+		 * allocatable region. Relocating this block group will fix the</div><div class='add'>+		 * mismatch.</div><div class='add'>+		 *</div><div class='add'>+		 * Currently, we cannot handle RAID0 or RAID10 case like this</div><div class='add'>+		 * because we don't have a proper zone_capacity value. But,</div><div class='add'>+		 * reading from this block group won't work anyway by a missing</div><div class='add'>+		 * stripe.</div><div class='add'>+		 */</div><div class='add'>+		cache-&gt;alloc_offset = cache-&gt;zone_capacity;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> out:</div><div class='del'>-	if (cache-&gt;alloc_offset &gt; cache-&gt;zone_capacity) {</div><div class='add'>+	/* Reject non SINGLE data profiles without RST */</div><div class='add'>+	if ((map-&gt;type &amp; BTRFS_BLOCK_GROUP_DATA) &amp;&amp;</div><div class='add'>+	    (map-&gt;type &amp; BTRFS_BLOCK_GROUP_PROFILE_MASK) &amp;&amp;</div><div class='add'>+	    !fs_info-&gt;stripe_root) {</div><div class='add'>+		btrfs_err(fs_info, "zoned: data %s needs raid-stripe-tree",</div><div class='add'>+			  btrfs_bg_type_to_raid_name(map-&gt;type));</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(cache-&gt;alloc_offset &gt; cache-&gt;zone_capacity)) {</div><div class='ctx'> 		btrfs_err(fs_info,</div><div class='ctx'> "zoned: invalid write pointer %llu (larger than zone capacity %llu) in block group %llu",</div><div class='ctx'> 			  cache-&gt;alloc_offset, cache-&gt;zone_capacity,</div><div class='hunk'>@@ -1669,7 +1789,6 @@ out:</div><div class='ctx'> 		cache-&gt;physical_map = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	bitmap_free(active);</div><div class='del'>-	kfree(zone_info);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1696,21 +1815,21 @@ bool btrfs_use_zone_append(struct btrfs_bio *bbio)</div><div class='ctx'> {</div><div class='ctx'> 	u64 start = (bbio-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT);</div><div class='ctx'> 	struct btrfs_inode *inode = bbio-&gt;inode;</div><div class='del'>-	struct btrfs_fs_info *fs_info = bbio-&gt;fs_info;</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_group *cache;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!inode || !is_data_inode(&amp;inode-&gt;vfs_inode))</div><div class='add'>+	if (!is_data_inode(inode))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (btrfs_op(&amp;bbio-&gt;bio) != BTRFS_MAP_WRITE)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Using REQ_OP_ZONE_APPNED for relocation can break assumptions on the</div><div class='add'>+	 * Using REQ_OP_ZONE_APPEND for relocation can break assumptions on the</div><div class='ctx'> 	 * extent layout the relocation code has.</div><div class='ctx'> 	 * Furthermore we have set aside own block-group from which only the</div><div class='ctx'> 	 * relocation "process" can allocate and make sure only one process at a</div><div class='hunk'>@@ -1745,16 +1864,18 @@ void btrfs_record_physical_zoned(struct btrfs_bio *bbio)</div><div class='ctx'> static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered,</div><div class='ctx'> 					u64 logical)</div><div class='ctx'> {</div><div class='del'>-	struct extent_map_tree *em_tree = &amp;BTRFS_I(ordered-&gt;inode)-&gt;extent_tree;</div><div class='add'>+	struct extent_map_tree *em_tree = &amp;ordered-&gt;inode-&gt;extent_tree;</div><div class='ctx'> 	struct extent_map *em;</div><div class='ctx'> </div><div class='ctx'> 	ordered-&gt;disk_bytenr = logical;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;em_tree-&gt;lock);</div><div class='del'>-	em = search_extent_mapping(em_tree, ordered-&gt;file_offset,</div><div class='del'>-				   ordered-&gt;num_bytes);</div><div class='del'>-	em-&gt;block_start = logical;</div><div class='del'>-	free_extent_map(em);</div><div class='add'>+	em = btrfs_search_extent_mapping(em_tree, ordered-&gt;file_offset,</div><div class='add'>+					 ordered-&gt;num_bytes);</div><div class='add'>+	/* The em should be a new COW extent, thus it should not have an offset. */</div><div class='add'>+	ASSERT(em-&gt;offset == 0, "em-&gt;offset=%llu", em-&gt;offset);</div><div class='add'>+	em-&gt;disk_bytenr = logical;</div><div class='add'>+	btrfs_free_extent_map(em);</div><div class='ctx'> 	write_unlock(&amp;em_tree-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1764,8 +1885,8 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,</div><div class='ctx'> 	struct btrfs_ordered_extent *new;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(BTRFS_ORDERED_NOCOW, &amp;ordered-&gt;flags) &amp;&amp;</div><div class='del'>-	    split_extent_map(BTRFS_I(ordered-&gt;inode), ordered-&gt;file_offset,</div><div class='del'>-			     ordered-&gt;num_bytes, len, logical))</div><div class='add'>+	    btrfs_split_extent_map(ordered-&gt;inode, ordered-&gt;file_offset,</div><div class='add'>+				   ordered-&gt;num_bytes, len, logical))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	new = btrfs_split_ordered_extent(ordered, len);</div><div class='hunk'>@@ -1778,7 +1899,7 @@ static bool btrfs_zoned_split_ordered(struct btrfs_ordered_extent *ordered,</div><div class='ctx'> </div><div class='ctx'> void btrfs_finish_ordered_zoned(struct btrfs_ordered_extent *ordered)</div><div class='ctx'> {</div><div class='del'>-	struct btrfs_inode *inode = BTRFS_I(ordered-&gt;inode);</div><div class='add'>+	struct btrfs_inode *inode = ordered-&gt;inode;</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_ordered_sum *sum;</div><div class='ctx'> 	u64 logical, len;</div><div class='hunk'>@@ -1822,7 +1943,7 @@ out:</div><div class='ctx'> 	 * here so that we don't attempt to log the csums later.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((inode-&gt;flags &amp; BTRFS_INODE_NODATASUM) ||</div><div class='del'>-	    test_bit(BTRFS_FS_STATE_NO_CSUMS, &amp;fs_info-&gt;fs_state)) {</div><div class='add'>+	    test_bit(BTRFS_FS_STATE_NO_DATA_CSUMS, &amp;fs_info-&gt;fs_state)) {</div><div class='ctx'> 		while ((sum = list_first_entry_or_null(&amp;ordered-&gt;list,</div><div class='ctx'> 						       typeof(*sum), list))) {</div><div class='ctx'> 			list_del(&amp;sum-&gt;list);</div><div class='hunk'>@@ -1942,7 +2063,7 @@ int btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info,</div><div class='ctx'> 	if (block_group-&gt;meta_write_pointer &gt; eb-&gt;start)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	/* If for_sync, this hole will be filled with trasnsaction commit. */</div><div class='add'>+	/* If for_sync, this hole will be filled with transaction commit. */</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL &amp;&amp; !wbc-&gt;for_sync)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	return -EBUSY;</div><div class='hunk'>@@ -1968,7 +2089,7 @@ static int read_zone_info(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> </div><div class='ctx'> 	ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,</div><div class='ctx'> 			      &amp;mapped_length, &amp;bioc, NULL, NULL);</div><div class='del'>-	if (ret || !bioc || mapped_length &lt; PAGE_SIZE) {</div><div class='add'>+	if (unlikely(ret || !bioc || mapped_length &lt; PAGE_SIZE)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out_put_bioc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2026,7 +2147,7 @@ int btrfs_sync_zone_write_pointer(struct btrfs_device *tgt_dev, u64 logical,</div><div class='ctx'> 	if (physical_pos == wp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (physical_pos &gt; wp)</div><div class='add'>+	if (unlikely(physical_pos &gt; wp))</div><div class='ctx'> 		return -EUCLEAN;</div><div class='ctx'> </div><div class='ctx'> 	length = wp - physical_pos;</div><div class='hunk'>@@ -2055,19 +2176,24 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group)</div><div class='ctx'> </div><div class='ctx'> 	map = block_group-&gt;physical_map;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> 	spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> 	if (test_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &amp;block_group-&gt;runtime_flags)) {</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* No space left */</div><div class='del'>-	if (btrfs_zoned_bg_is_full(block_group)) {</div><div class='del'>-		ret = false;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA) {</div><div class='add'>+		/* The caller should check if the block group is full. */</div><div class='add'>+		if (WARN_ON_ONCE(btrfs_zoned_bg_is_full(block_group))) {</div><div class='add'>+			ret = false;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Since it is already written, it should have been active. */</div><div class='add'>+		WARN_ON_ONCE(block_group-&gt;meta_write_pointer != block_group-&gt;start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> 	for (i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='ctx'> 		struct btrfs_zoned_device_info *zinfo;</div><div class='ctx'> 		int reserved = 0;</div><div class='hunk'>@@ -2076,6 +2202,9 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group)</div><div class='ctx'> 		physical = map-&gt;stripes[i].physical;</div><div class='ctx'> 		zinfo = device-&gt;zone_info;</div><div class='ctx'> </div><div class='add'>+		if (!device-&gt;bdev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (zinfo-&gt;max_active_zones == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2087,20 +2216,17 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (atomic_read(&amp;zinfo-&gt;active_zones_left) &lt;= reserved) {</div><div class='ctx'> 			ret = false;</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!btrfs_dev_set_active_zone(device, physical)) {</div><div class='ctx'> 			/* Cannot activate the zone */</div><div class='ctx'> 			ret = false;</div><div class='del'>-			spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!is_data)</div><div class='ctx'> 			zinfo-&gt;reserved_active_zones--;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Successfully activated all the zones */</div><div class='ctx'> 	set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &amp;block_group-&gt;runtime_flags);</div><div class='hunk'>@@ -2108,8 +2234,6 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group)</div><div class='ctx'> </div><div class='ctx'> 	/* For the active block group list */</div><div class='ctx'> 	btrfs_get_block_group(block_group);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> 	list_add_tail(&amp;block_group-&gt;active_bg_list, &amp;fs_info-&gt;zone_active_bgs);</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2117,6 +2241,7 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group)</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;block_group-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2124,27 +2249,15 @@ static void wait_eb_writebacks(struct btrfs_block_group *block_group)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> 	const u64 end = block_group-&gt;start + block_group-&gt;length;</div><div class='del'>-	struct radix_tree_iter iter;</div><div class='ctx'> 	struct extent_buffer *eb;</div><div class='del'>-	void __rcu **slot;</div><div class='add'>+	unsigned long index, start = (block_group-&gt;start &gt;&gt; fs_info-&gt;nodesize_bits);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	radix_tree_for_each_slot(slot, &amp;fs_info-&gt;buffer_radix, &amp;iter,</div><div class='del'>-				 block_group-&gt;start &gt;&gt; fs_info-&gt;sectorsize_bits) {</div><div class='del'>-		eb = radix_tree_deref_slot(slot);</div><div class='del'>-		if (!eb)</div><div class='del'>-			continue;</div><div class='del'>-		if (radix_tree_deref_retry(eb)) {</div><div class='del'>-			slot = radix_tree_iter_retry(&amp;iter);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+	xa_for_each_start(&amp;fs_info-&gt;buffer_tree, index, eb, start) {</div><div class='ctx'> 		if (eb-&gt;start &lt; block_group-&gt;start)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (eb-&gt;start &gt;= end)</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-		slot = radix_tree_iter_resume(slot, &amp;iter);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		wait_on_extent_buffer_writeback(eb);</div><div class='ctx'> 		rcu_read_lock();</div><div class='hunk'>@@ -2152,12 +2265,47 @@ static void wait_eb_writebacks(struct btrfs_block_group *block_group)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int call_zone_finish(struct btrfs_block_group *block_group,</div><div class='add'>+			    struct btrfs_io_stripe *stripe)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_device *device = stripe-&gt;dev;</div><div class='add'>+	const u64 physical = stripe-&gt;physical;</div><div class='add'>+	struct btrfs_zoned_device_info *zinfo = device-&gt;zone_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!device-&gt;bdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (zinfo-&gt;max_active_zones == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (btrfs_dev_is_sequential(device, physical)) {</div><div class='add'>+		unsigned int nofs_flags;</div><div class='add'>+</div><div class='add'>+		nofs_flags = memalloc_nofs_save();</div><div class='add'>+		ret = blkdev_zone_mgmt(device-&gt;bdev, REQ_OP_ZONE_FINISH,</div><div class='add'>+				       physical &gt;&gt; SECTOR_SHIFT,</div><div class='add'>+				       zinfo-&gt;zone_size &gt;&gt; SECTOR_SHIFT);</div><div class='add'>+		memalloc_nofs_restore(nofs_flags);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA))</div><div class='add'>+		zinfo-&gt;reserved_active_zones++;</div><div class='add'>+	btrfs_dev_clear_active_zone(device, physical);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_written)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_info *fs_info = block_group-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_chunk_map *map;</div><div class='ctx'> 	const bool is_metadata = (block_group-&gt;flags &amp;</div><div class='ctx'> 			(BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_SYSTEM));</div><div class='add'>+	struct btrfs_dev_replace *dev_replace = &amp;fs_info-&gt;dev_replace;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -2195,8 +2343,7 @@ static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_writ</div><div class='ctx'> 		/* Ensure all writes in this block group finish */</div><div class='ctx'> 		btrfs_wait_block_group_reservations(block_group);</div><div class='ctx'> 		/* No need to wait for NOCOW writers. Zoned mode does not allow that */</div><div class='del'>-		btrfs_wait_ordered_roots(fs_info, U64_MAX, block_group-&gt;start,</div><div class='del'>-					 block_group-&gt;length);</div><div class='add'>+		btrfs_wait_ordered_roots(fs_info, U64_MAX, block_group);</div><div class='ctx'> 		/* Wait for extent buffers to be written. */</div><div class='ctx'> 		if (is_metadata)</div><div class='ctx'> 			wait_eb_writebacks(block_group);</div><div class='hunk'>@@ -2233,27 +2380,17 @@ static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_writ</div><div class='ctx'> 	btrfs_clear_data_reloc_bg(block_group);</div><div class='ctx'> 	spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	down_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 	map = block_group-&gt;physical_map;</div><div class='ctx'> 	for (i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='del'>-		struct btrfs_device *device = map-&gt;stripes[i].dev;</div><div class='del'>-		const u64 physical = map-&gt;stripes[i].physical;</div><div class='del'>-		struct btrfs_zoned_device_info *zinfo = device-&gt;zone_info;</div><div class='ctx'> </div><div class='del'>-		if (zinfo-&gt;max_active_zones == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ret = blkdev_zone_mgmt(device-&gt;bdev, REQ_OP_ZONE_FINISH,</div><div class='del'>-				       physical &gt;&gt; SECTOR_SHIFT,</div><div class='del'>-				       zinfo-&gt;zone_size &gt;&gt; SECTOR_SHIFT,</div><div class='del'>-				       GFP_NOFS);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='add'>+		ret = call_zone_finish(block_group, &amp;map-&gt;stripes[i]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> 			return ret;</div><div class='del'>-</div><div class='del'>-		if (!(block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA))</div><div class='del'>-			zinfo-&gt;reserved_active_zones++;</div><div class='del'>-		btrfs_dev_clear_active_zone(device, physical);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	up_read(&amp;dev_replace-&gt;rwsem);</div><div class='ctx'> </div><div class='ctx'> 	if (!fully_written)</div><div class='ctx'> 		btrfs_dec_block_group_ro(block_group);</div><div class='hunk'>@@ -2288,6 +2425,9 @@ bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, u64 flags)</div><div class='ctx'> 	if (!btrfs_is_zoned(fs_info))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='add'>+	if (test_bit(BTRFS_FS_NEED_ZONE_FINISH, &amp;fs_info-&gt;flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* Check if there is a device with active zones left */</div><div class='ctx'> 	mutex_lock(&amp;fs_info-&gt;chunk_mutex);</div><div class='ctx'> 	spin_lock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='hunk'>@@ -2326,16 +2466,17 @@ bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, u64 flags)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 length)</div><div class='add'>+int btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 length)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_block_group *block_group;</div><div class='ctx'> 	u64 min_alloc_bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (!btrfs_is_zoned(fs_info))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	block_group = btrfs_lookup_block_group(fs_info, logical);</div><div class='del'>-	ASSERT(block_group);</div><div class='add'>+	if (WARN_ON_ONCE(!block_group))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	/* No MIXED_BG on zoned btrfs. */</div><div class='ctx'> 	if (block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA)</div><div class='hunk'>@@ -2352,16 +2493,21 @@ void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 len</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	btrfs_put_block_group(block_group);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void btrfs_zone_finish_endio_workfn(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct btrfs_block_group *bg =</div><div class='ctx'> 		container_of(work, struct btrfs_block_group, zone_finish_work);</div><div class='ctx'> </div><div class='ctx'> 	wait_on_extent_buffer_writeback(bg-&gt;last_eb);</div><div class='ctx'> 	free_extent_buffer(bg-&gt;last_eb);</div><div class='del'>-	btrfs_zone_finish_endio(bg-&gt;fs_info, bg-&gt;start, bg-&gt;length);</div><div class='add'>+	ret = do_zone_finish(bg, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		btrfs_handle_fs_error(bg-&gt;fs_info, ret,</div><div class='add'>+				      "Failed to finish block-group's zone");</div><div class='ctx'> 	btrfs_put_block_group(bg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2380,10 +2526,10 @@ void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg,</div><div class='ctx'> </div><div class='ctx'> 	/* For the work */</div><div class='ctx'> 	btrfs_get_block_group(bg);</div><div class='del'>-	atomic_inc(&amp;eb-&gt;refs);</div><div class='add'>+	refcount_inc(&amp;eb-&gt;refs);</div><div class='ctx'> 	bg-&gt;last_eb = eb;</div><div class='ctx'> 	INIT_WORK(&amp;bg-&gt;zone_finish_work, btrfs_zone_finish_endio_workfn);</div><div class='del'>-	queue_work(system_unbound_wq, &amp;bg-&gt;zone_finish_work);</div><div class='add'>+	queue_work(system_dfl_wq, &amp;bg-&gt;zone_finish_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg)</div><div class='hunk'>@@ -2396,6 +2542,106 @@ void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg)</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;relocation_bg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void btrfs_zoned_reserve_data_reloc_bg(struct btrfs_fs_info *fs_info)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_space_info *data_sinfo = fs_info-&gt;data_sinfo;</div><div class='add'>+	struct btrfs_space_info *space_info = data_sinfo;</div><div class='add'>+	struct btrfs_trans_handle *trans;</div><div class='add'>+	struct btrfs_block_group *bg;</div><div class='add'>+	struct list_head *bg_list;</div><div class='add'>+	u64 alloc_flags;</div><div class='add'>+	bool first = true;</div><div class='add'>+	bool did_chunk_alloc = false;</div><div class='add'>+	int index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_zoned(fs_info))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fs_info-&gt;data_reloc_bg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (sb_rdonly(fs_info-&gt;sb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	alloc_flags = btrfs_get_alloc_profile(fs_info, space_info-&gt;flags);</div><div class='add'>+	index = btrfs_bg_flags_to_raid_index(alloc_flags);</div><div class='add'>+</div><div class='add'>+	/* Scan the data space_info to find empty block groups. Take the second one. */</div><div class='add'>+again:</div><div class='add'>+	bg_list = &amp;space_info-&gt;block_groups[index];</div><div class='add'>+	list_for_each_entry(bg, bg_list, list) {</div><div class='add'>+		if (bg-&gt;alloc_offset != 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (first) {</div><div class='add'>+			first = false;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (space_info == data_sinfo) {</div><div class='add'>+			/* Migrate the block group to the data relocation space_info. */</div><div class='add'>+			struct btrfs_space_info *reloc_sinfo = data_sinfo-&gt;sub_group[0];</div><div class='add'>+			int factor;</div><div class='add'>+</div><div class='add'>+			ASSERT(reloc_sinfo-&gt;subgroup_id == BTRFS_SUB_GROUP_DATA_RELOC,</div><div class='add'>+			       "reloc_sinfo-&gt;subgroup_id=%d", reloc_sinfo-&gt;subgroup_id);</div><div class='add'>+			factor = btrfs_bg_type_to_factor(bg-&gt;flags);</div><div class='add'>+</div><div class='add'>+			down_write(&amp;space_info-&gt;groups_sem);</div><div class='add'>+			list_del_init(&amp;bg-&gt;list);</div><div class='add'>+			/* We can assume this as we choose the second empty one. */</div><div class='add'>+			ASSERT(!list_empty(&amp;space_info-&gt;block_groups[index]));</div><div class='add'>+			up_write(&amp;space_info-&gt;groups_sem);</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+			space_info-&gt;total_bytes -= bg-&gt;length;</div><div class='add'>+			space_info-&gt;disk_total -= bg-&gt;length * factor;</div><div class='add'>+			space_info-&gt;disk_total -= bg-&gt;zone_unusable;</div><div class='add'>+			/* There is no allocation ever happened. */</div><div class='add'>+			ASSERT(bg-&gt;used == 0, "bg-&gt;used=%llu", bg-&gt;used);</div><div class='add'>+			/* No super block in a block group on the zoned setup. */</div><div class='add'>+			ASSERT(bg-&gt;bytes_super == 0, "bg-&gt;bytes_super=%llu", bg-&gt;bytes_super);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+			bg-&gt;space_info = reloc_sinfo;</div><div class='add'>+			if (reloc_sinfo-&gt;block_group_kobjs[index] == NULL)</div><div class='add'>+				btrfs_sysfs_add_block_group_type(bg);</div><div class='add'>+</div><div class='add'>+			btrfs_add_bg_to_space_info(fs_info, bg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fs_info-&gt;data_reloc_bg = bg-&gt;start;</div><div class='add'>+		set_bit(BLOCK_GROUP_FLAG_ZONED_DATA_RELOC, &amp;bg-&gt;runtime_flags);</div><div class='add'>+		btrfs_zone_activate(bg);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (did_chunk_alloc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	trans = btrfs_join_transaction(fs_info-&gt;tree_root);</div><div class='add'>+	if (IS_ERR(trans))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Allocate new BG in the data relocation space_info. */</div><div class='add'>+	space_info = data_sinfo-&gt;sub_group[0];</div><div class='add'>+	ASSERT(space_info-&gt;subgroup_id == BTRFS_SUB_GROUP_DATA_RELOC,</div><div class='add'>+	       "space_info-&gt;subgroup_id=%d", space_info-&gt;subgroup_id);</div><div class='add'>+	ret = btrfs_chunk_alloc(trans, space_info, alloc_flags, CHUNK_ALLOC_FORCE);</div><div class='add'>+	btrfs_end_transaction(trans);</div><div class='add'>+	if (ret == 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * We allocated a new block group in the data relocation space_info. We</div><div class='add'>+		 * can take that one.</div><div class='add'>+		 */</div><div class='add'>+		first = false;</div><div class='add'>+		did_chunk_alloc = true;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = fs_info-&gt;fs_devices;</div><div class='hunk'>@@ -2414,12 +2660,12 @@ void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info)</div><div class='add'>+bool btrfs_zoned_should_reclaim(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct btrfs_fs_devices *fs_devices = fs_info-&gt;fs_devices;</div><div class='ctx'> 	struct btrfs_device *device;</div><div class='add'>+	u64 total = btrfs_super_total_bytes(fs_info-&gt;super_copy);</div><div class='ctx'> 	u64 used = 0;</div><div class='del'>-	u64 total = 0;</div><div class='ctx'> 	u64 factor;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(btrfs_is_zoned(fs_info));</div><div class='hunk'>@@ -2432,7 +2678,6 @@ bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 		if (!device-&gt;bdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		total += device-&gt;disk_total_bytes;</div><div class='ctx'> 		used += device-&gt;bytes_used;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;fs_devices-&gt;device_list_mutex);</div><div class='hunk'>@@ -2486,7 +2731,7 @@ int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;block_group-&gt;lock);</div><div class='ctx'> 		if (block_group-&gt;reserved || block_group-&gt;alloc_offset == 0 ||</div><div class='del'>-		    (block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_SYSTEM) ||</div><div class='add'>+		    !(block_group-&gt;flags &amp; BTRFS_BLOCK_GROUP_DATA) ||</div><div class='ctx'> 		    test_bit(BLOCK_GROUP_FLAG_ZONED_DATA_RELOC, &amp;block_group-&gt;runtime_flags)) {</div><div class='ctx'> 			spin_unlock(&amp;block_group-&gt;lock);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2513,10 +2758,9 @@ int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return ret &lt; 0 ? ret : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_space_info *space_info,</div><div class='del'>-				bool do_finish)</div><div class='add'>+int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='ctx'> 	struct btrfs_block_group *bg;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='hunk'>@@ -2615,3 +2859,128 @@ void btrfs_check_active_zone_reservation(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;fs_info-&gt;zone_active_bgs_lock);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the zones of unused block groups from @space_info-&gt;bytes_zone_unusable.</div><div class='add'>+ *</div><div class='add'>+ * @space_info:	the space to work on</div><div class='add'>+ * @num_bytes:	targeting reclaim bytes</div><div class='add'>+ *</div><div class='add'>+ * This one resets the zones of a block group, so we can reuse the region</div><div class='add'>+ * without removing the block group. On the other hand, btrfs_delete_unused_bgs()</div><div class='add'>+ * just removes a block group and frees up the underlying zones. So, we still</div><div class='add'>+ * need to allocate a new block group to reuse the zones.</div><div class='add'>+ *</div><div class='add'>+ * Resetting is faster than deleting/recreating a block group. It is similar</div><div class='add'>+ * to freeing the logical space on the regular mode. However, we cannot change</div><div class='add'>+ * the block group's profile with this operation.</div><div class='add'>+ */</div><div class='add'>+int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num_bytes)</div><div class='add'>+{</div><div class='add'>+	struct btrfs_fs_info *fs_info = space_info-&gt;fs_info;</div><div class='add'>+	const sector_t zone_size_sectors = fs_info-&gt;zone_size &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (!btrfs_is_zoned(fs_info))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while (num_bytes &gt; 0) {</div><div class='add'>+		struct btrfs_chunk_map *map;</div><div class='add'>+		struct btrfs_block_group *bg = NULL;</div><div class='add'>+		bool found = false;</div><div class='add'>+		u64 reclaimed = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Here, we choose a fully zone_unusable block group. It's</div><div class='add'>+		 * technically possible to reset a partly zone_unusable block</div><div class='add'>+		 * group, which still has some free space left. However,</div><div class='add'>+		 * handling that needs to cope with the allocation side, which</div><div class='add'>+		 * makes the logic more complex. So, let's handle the easy case</div><div class='add'>+		 * for now.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+		list_for_each_entry(bg, &amp;fs_info-&gt;unused_bgs, bg_list) {</div><div class='add'>+			if ((bg-&gt;flags &amp; BTRFS_BLOCK_GROUP_TYPE_MASK) != space_info-&gt;flags)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Use trylock to avoid locking order violation. In</div><div class='add'>+			 * btrfs_reclaim_bgs_work(), the lock order is</div><div class='add'>+			 * &amp;bg-&gt;lock -&gt; &amp;fs_info-&gt;unused_bgs_lock. We skip a</div><div class='add'>+			 * block group if we cannot take its lock.</div><div class='add'>+			 */</div><div class='add'>+			if (!spin_trylock(&amp;bg-&gt;lock))</div><div class='add'>+				continue;</div><div class='add'>+			if (btrfs_is_block_group_used(bg) || bg-&gt;zone_unusable &lt; bg-&gt;length) {</div><div class='add'>+				spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!found) {</div><div class='add'>+			spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del_init(&amp;bg-&gt;bg_list);</div><div class='add'>+		btrfs_put_block_group(bg);</div><div class='add'>+		spin_unlock(&amp;fs_info-&gt;unused_bgs_lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Since the block group is fully zone_unusable and we cannot</div><div class='add'>+		 * allocate from this block group anymore, we don't need to set</div><div class='add'>+		 * this block group read-only.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		down_read(&amp;fs_info-&gt;dev_replace.rwsem);</div><div class='add'>+		map = bg-&gt;physical_map;</div><div class='add'>+		for (int i = 0; i &lt; map-&gt;num_stripes; i++) {</div><div class='add'>+			struct btrfs_io_stripe *stripe = &amp;map-&gt;stripes[i];</div><div class='add'>+			unsigned int nofs_flags;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			nofs_flags = memalloc_nofs_save();</div><div class='add'>+			ret = blkdev_zone_mgmt(stripe-&gt;dev-&gt;bdev, REQ_OP_ZONE_RESET,</div><div class='add'>+					       stripe-&gt;physical &gt;&gt; SECTOR_SHIFT,</div><div class='add'>+					       zone_size_sectors);</div><div class='add'>+			memalloc_nofs_restore(nofs_flags);</div><div class='add'>+</div><div class='add'>+			if (ret) {</div><div class='add'>+				up_read(&amp;fs_info-&gt;dev_replace.rwsem);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		up_read(&amp;fs_info-&gt;dev_replace.rwsem);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;space_info-&gt;lock);</div><div class='add'>+		spin_lock(&amp;bg-&gt;lock);</div><div class='add'>+		ASSERT(!btrfs_is_block_group_used(bg));</div><div class='add'>+		if (bg-&gt;ro) {</div><div class='add'>+			spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reclaimed = bg-&gt;alloc_offset;</div><div class='add'>+		bg-&gt;zone_unusable = bg-&gt;length - bg-&gt;zone_capacity;</div><div class='add'>+		bg-&gt;alloc_offset = 0;</div><div class='add'>+		/*</div><div class='add'>+		 * This holds because we currently reset fully used then freed</div><div class='add'>+		 * block group.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT(reclaimed == bg-&gt;zone_capacity,</div><div class='add'>+		       "reclaimed=%llu bg-&gt;zone_capacity=%llu", reclaimed, bg-&gt;zone_capacity);</div><div class='add'>+		bg-&gt;free_space_ctl-&gt;free_space += reclaimed;</div><div class='add'>+		space_info-&gt;bytes_zone_unusable -= reclaimed;</div><div class='add'>+		spin_unlock(&amp;bg-&gt;lock);</div><div class='add'>+		btrfs_return_free_space(space_info, reclaimed);</div><div class='add'>+		spin_unlock(&amp;space_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (num_bytes &lt;= reclaimed)</div><div class='add'>+			break;</div><div class='add'>+		num_bytes -= reclaimed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h<br/>index f573bda496fb..5cefdeb08b7b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zoned.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zoned.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zoned.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/zoned.h</a></div><div class='hunk'>@@ -4,13 +4,27 @@</div><div class='ctx'> #define BTRFS_ZONED_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/blkzoned.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include "messages.h"</div><div class='ctx'> #include "volumes.h"</div><div class='ctx'> #include "disk-io.h"</div><div class='ctx'> #include "block-group.h"</div><div class='ctx'> #include "btrfs_inode.h"</div><div class='ctx'> </div><div class='add'>+struct block_device;</div><div class='add'>+struct extent_buffer;</div><div class='add'>+struct btrfs_bio;</div><div class='add'>+struct btrfs_ordered_extent;</div><div class='add'>+struct btrfs_fs_info;</div><div class='add'>+struct btrfs_space_info;</div><div class='add'>+struct btrfs_eb_write_context;</div><div class='add'>+struct btrfs_fs_devices;</div><div class='add'>+</div><div class='ctx'> #define BTRFS_DEFAULT_RECLAIM_THRESH           			(75)</div><div class='ctx'> </div><div class='ctx'> struct btrfs_zoned_device_info {</div><div class='hunk'>@@ -38,14 +52,13 @@ struct btrfs_zoned_device_info {</div><div class='ctx'> void btrfs_finish_ordered_zoned(struct btrfs_ordered_extent *ordered);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,</div><div class='del'>-		       struct blk_zone *zone);</div><div class='ctx'> int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info);</div><div class='ctx'> int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache);</div><div class='ctx'> void btrfs_destroy_dev_zone_info(struct btrfs_device *device);</div><div class='ctx'> struct btrfs_zoned_device_info *btrfs_clone_dev_zone_info(struct btrfs_device *orig_dev);</div><div class='ctx'> int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info);</div><div class='del'>-int btrfs_check_mountopts_zoned(struct btrfs_fs_info *info, unsigned long *mount_opt);</div><div class='add'>+int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,</div><div class='add'>+				unsigned long long *mount_opt);</div><div class='ctx'> int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw,</div><div class='ctx'> 			       u64 *bytenr_ret);</div><div class='ctx'> int btrfs_sb_log_location(struct btrfs_device *device, int mirror, int rw,</div><div class='hunk'>@@ -69,25 +82,21 @@ int btrfs_sync_zone_write_pointer(struct btrfs_device *tgt_dev, u64 logical,</div><div class='ctx'> bool btrfs_zone_activate(struct btrfs_block_group *block_group);</div><div class='ctx'> int btrfs_zone_finish(struct btrfs_block_group *block_group);</div><div class='ctx'> bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, u64 flags);</div><div class='del'>-void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='add'>+int btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> 			     u64 length);</div><div class='ctx'> void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg,</div><div class='ctx'> 				   struct extent_buffer *eb);</div><div class='ctx'> void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg);</div><div class='add'>+void btrfs_zoned_reserve_data_reloc_bg(struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info);</div><div class='del'>-bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info);</div><div class='add'>+bool btrfs_zoned_should_reclaim(const struct btrfs_fs_info *fs_info);</div><div class='ctx'> void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical,</div><div class='ctx'> 				       u64 length);</div><div class='ctx'> int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info);</div><div class='del'>-int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,</div><div class='del'>-				struct btrfs_space_info *space_info, bool do_finish);</div><div class='add'>+int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish);</div><div class='ctx'> void btrfs_check_active_zone_reservation(struct btrfs_fs_info *fs_info);</div><div class='add'>+int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num_bytes);</div><div class='ctx'> #else /* CONFIG_BLK_DEV_ZONED */</div><div class='del'>-static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,</div><div class='del'>-				     struct blk_zone *zone)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='hunk'>@@ -121,8 +130,8 @@ static inline int btrfs_check_zoned_mode(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int btrfs_check_mountopts_zoned(struct btrfs_fs_info *info,</div><div class='del'>-					      unsigned long *mount_opt)</div><div class='add'>+static inline int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,</div><div class='add'>+					      unsigned long long *mount_opt)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -223,17 +232,22 @@ static inline bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info,</div><div class='del'>-					   u64 logical, u64 length) { }</div><div class='add'>+static inline int btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info,</div><div class='add'>+					   u64 logical, u64 length)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg,</div><div class='ctx'> 						 struct extent_buffer *eb) { }</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg) { }</div><div class='ctx'> </div><div class='add'>+static inline void btrfs_zoned_reserve_data_reloc_bg(struct btrfs_fs_info *fs_info) { }</div><div class='add'>+</div><div class='ctx'> static inline void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info) { }</div><div class='ctx'> </div><div class='del'>-static inline bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info)</div><div class='add'>+static inline bool btrfs_zoned_should_reclaim(const struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -246,8 +260,7 @@ static inline int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,</div><div class='del'>-					      struct btrfs_space_info *space_info,</div><div class='add'>+static inline int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info,</div><div class='ctx'> 					      bool do_finish)</div><div class='ctx'> {</div><div class='ctx'> 	/* Consider all the block groups are active */</div><div class='hunk'>@@ -256,6 +269,12 @@ static inline int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,</div><div class='ctx'> </div><div class='ctx'> static inline void btrfs_check_active_zone_reservation(struct btrfs_fs_info *fs_info) { }</div><div class='ctx'> </div><div class='add'>+static inline int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info,</div><div class='add'>+						  u64 num_bytes)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline bool btrfs_dev_is_sequential(struct btrfs_device *device, u64 pos)</div><div class='head'>diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c<br/>index 0d66db8bc1d4..c9cddcfa337b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zstd.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/btrfs/zstd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/btrfs/zstd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/btrfs/zstd.c</a></div><div class='hunk'>@@ -18,17 +18,20 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/zstd.h&gt;</div><div class='ctx'> #include "misc.h"</div><div class='add'>+#include "fs.h"</div><div class='add'>+#include "btrfs_inode.h"</div><div class='ctx'> #include "compression.h"</div><div class='del'>-#include "ctree.h"</div><div class='add'>+#include "super.h"</div><div class='ctx'> </div><div class='ctx'> #define ZSTD_BTRFS_MAX_WINDOWLOG 17</div><div class='del'>-#define ZSTD_BTRFS_MAX_INPUT (1 &lt;&lt; ZSTD_BTRFS_MAX_WINDOWLOG)</div><div class='add'>+#define ZSTD_BTRFS_MAX_INPUT (1U &lt;&lt; ZSTD_BTRFS_MAX_WINDOWLOG)</div><div class='ctx'> #define ZSTD_BTRFS_DEFAULT_LEVEL 3</div><div class='add'>+#define ZSTD_BTRFS_MIN_LEVEL -15</div><div class='ctx'> #define ZSTD_BTRFS_MAX_LEVEL 15</div><div class='ctx'> /* 307s to avoid pathologically clashing with transaction commit */</div><div class='ctx'> #define ZSTD_BTRFS_RECLAIM_JIFFIES (307 * HZ)</div><div class='ctx'> </div><div class='del'>-static zstd_parameters zstd_get_btrfs_parameters(unsigned int level,</div><div class='add'>+static zstd_parameters zstd_get_btrfs_parameters(int level,</div><div class='ctx'> 						 size_t src_len)</div><div class='ctx'> {</div><div class='ctx'> 	zstd_parameters params = zstd_get_params(level, src_len);</div><div class='hunk'>@@ -43,13 +46,14 @@ struct workspace {</div><div class='ctx'> 	void *mem;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	char *buf;</div><div class='del'>-	unsigned int level;</div><div class='del'>-	unsigned int req_level;</div><div class='add'>+	int level;</div><div class='add'>+	int req_level;</div><div class='ctx'> 	unsigned long last_used; /* jiffies */</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct list_head lru_list;</div><div class='ctx'> 	zstd_in_buffer in_buf;</div><div class='ctx'> 	zstd_out_buffer out_buf;</div><div class='add'>+	zstd_parameters params;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -73,7 +77,6 @@ struct workspace {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct zstd_workspace_manager {</div><div class='del'>-	const struct btrfs_compress_op *ops;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct list_head lru_list;</div><div class='ctx'> 	struct list_head idle_ws[ZSTD_BTRFS_MAX_LEVEL];</div><div class='hunk'>@@ -82,8 +85,6 @@ struct zstd_workspace_manager {</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct zstd_workspace_manager wsm;</div><div class='del'>-</div><div class='ctx'> static size_t zstd_ws_mem_sizes[ZSTD_BTRFS_MAX_LEVEL];</div><div class='ctx'> </div><div class='ctx'> static inline struct workspace *list_to_workspace(struct list_head *list)</div><div class='hunk'>@@ -91,8 +92,10 @@ static inline struct workspace *list_to_workspace(struct list_head *list)</div><div class='ctx'> 	return container_of(list, struct workspace, list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zstd_free_workspace(struct list_head *ws);</div><div class='del'>-struct list_head *zstd_alloc_workspace(unsigned int level);</div><div class='add'>+static inline int clip_level(int level)</div><div class='add'>+{</div><div class='add'>+	return max(0, level - 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Timer callback to free unused workspaces.</div><div class='hunk'>@@ -106,20 +109,22 @@ struct list_head *zstd_alloc_workspace(unsigned int level);</div><div class='ctx'>  */</div><div class='ctx'> static void zstd_reclaim_timer_fn(struct timer_list *timer)</div><div class='ctx'> {</div><div class='add'>+	struct zstd_workspace_manager *zwsm =</div><div class='add'>+		container_of(timer, struct zstd_workspace_manager, timer);</div><div class='ctx'> 	unsigned long reclaim_threshold = jiffies - ZSTD_BTRFS_RECLAIM_JIFFIES;</div><div class='ctx'> 	struct list_head *pos, *next;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;wsm.lock);</div><div class='add'>+	spin_lock(&amp;zwsm-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;wsm.lru_list)) {</div><div class='del'>-		spin_unlock(&amp;wsm.lock);</div><div class='add'>+	if (list_empty(&amp;zwsm-&gt;lru_list)) {</div><div class='add'>+		spin_unlock(&amp;zwsm-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_prev_safe(pos, next, &amp;wsm.lru_list) {</div><div class='add'>+	list_for_each_prev_safe(pos, next, &amp;zwsm-&gt;lru_list) {</div><div class='ctx'> 		struct workspace *victim = container_of(pos, struct workspace,</div><div class='ctx'> 							lru_list);</div><div class='del'>-		unsigned int level;</div><div class='add'>+		int level;</div><div class='ctx'> </div><div class='ctx'> 		if (time_after(victim-&gt;last_used, reclaim_threshold))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -133,15 +138,15 @@ static void zstd_reclaim_timer_fn(struct timer_list *timer)</div><div class='ctx'> 		list_del(&amp;victim-&gt;list);</div><div class='ctx'> 		zstd_free_workspace(&amp;victim-&gt;list);</div><div class='ctx'> </div><div class='del'>-		if (list_empty(&amp;wsm.idle_ws[level - 1]))</div><div class='del'>-			clear_bit(level - 1, &amp;wsm.active_map);</div><div class='add'>+		if (list_empty(&amp;zwsm-&gt;idle_ws[level]))</div><div class='add'>+			clear_bit(level, &amp;zwsm-&gt;active_map);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;wsm.lru_list))</div><div class='del'>-		mod_timer(&amp;wsm.timer, jiffies + ZSTD_BTRFS_RECLAIM_JIFFIES);</div><div class='add'>+	if (!list_empty(&amp;zwsm-&gt;lru_list))</div><div class='add'>+		mod_timer(&amp;zwsm-&gt;timer, jiffies + ZSTD_BTRFS_RECLAIM_JIFFIES);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;wsm.lock);</div><div class='add'>+	spin_unlock(&amp;zwsm-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -156,9 +161,11 @@ static void zstd_reclaim_timer_fn(struct timer_list *timer)</div><div class='ctx'> static void zstd_calc_ws_mem_sizes(void)</div><div class='ctx'> {</div><div class='ctx'> 	size_t max_size = 0;</div><div class='del'>-	unsigned int level;</div><div class='add'>+	int level;</div><div class='ctx'> </div><div class='del'>-	for (level = 1; level &lt;= ZSTD_BTRFS_MAX_LEVEL; level++) {</div><div class='add'>+	for (level = ZSTD_BTRFS_MIN_LEVEL; level &lt;= ZSTD_BTRFS_MAX_LEVEL; level++) {</div><div class='add'>+		if (level == 0)</div><div class='add'>+			continue;</div><div class='ctx'> 		zstd_parameters params =</div><div class='ctx'> 			zstd_get_btrfs_parameters(level, ZSTD_BTRFS_MAX_INPUT);</div><div class='ctx'> 		size_t level_size =</div><div class='hunk'>@@ -167,54 +174,61 @@ static void zstd_calc_ws_mem_sizes(void)</div><div class='ctx'> 			      zstd_dstream_workspace_bound(ZSTD_BTRFS_MAX_INPUT));</div><div class='ctx'> </div><div class='ctx'> 		max_size = max_t(size_t, max_size, level_size);</div><div class='del'>-		zstd_ws_mem_sizes[level - 1] = max_size;</div><div class='add'>+		/* Use level 1 workspace size for all the fast mode negative levels. */</div><div class='add'>+		zstd_ws_mem_sizes[clip_level(level)] = max_size;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zstd_init_workspace_manager(void)</div><div class='add'>+int zstd_alloc_workspace_manager(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	struct zstd_workspace_manager *zwsm;</div><div class='ctx'> 	struct list_head *ws;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='add'>+	ASSERT(fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD] == NULL);</div><div class='add'>+	zwsm = kzalloc(sizeof(*zwsm), GFP_KERNEL);</div><div class='add'>+	if (!zwsm)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	zstd_calc_ws_mem_sizes();</div><div class='add'>+	spin_lock_init(&amp;zwsm-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;zwsm-&gt;wait);</div><div class='add'>+	timer_setup(&amp;zwsm-&gt;timer, zstd_reclaim_timer_fn, 0);</div><div class='ctx'> </div><div class='del'>-	wsm.ops = &amp;btrfs_zstd_compress;</div><div class='del'>-	spin_lock_init(&amp;wsm.lock);</div><div class='del'>-	init_waitqueue_head(&amp;wsm.wait);</div><div class='del'>-	timer_setup(&amp;wsm.timer, zstd_reclaim_timer_fn, 0);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;wsm.lru_list);</div><div class='del'>-	for (i = 0; i &lt; ZSTD_BTRFS_MAX_LEVEL; i++)</div><div class='del'>-		INIT_LIST_HEAD(&amp;wsm.idle_ws[i]);</div><div class='add'>+	INIT_LIST_HEAD(&amp;zwsm-&gt;lru_list);</div><div class='add'>+	for (int i = 0; i &lt; ZSTD_BTRFS_MAX_LEVEL; i++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;zwsm-&gt;idle_ws[i]);</div><div class='add'>+	fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD] = zwsm;</div><div class='ctx'> </div><div class='del'>-	ws = zstd_alloc_workspace(ZSTD_BTRFS_MAX_LEVEL);</div><div class='add'>+	ws = zstd_alloc_workspace(fs_info, ZSTD_BTRFS_MAX_LEVEL);</div><div class='ctx'> 	if (IS_ERR(ws)) {</div><div class='del'>-		pr_warn(</div><div class='del'>-		"BTRFS: cannot preallocate zstd compression workspace\n");</div><div class='add'>+		btrfs_warn(NULL, "cannot preallocate zstd compression workspace");</div><div class='ctx'> 	} else {</div><div class='del'>-		set_bit(ZSTD_BTRFS_MAX_LEVEL - 1, &amp;wsm.active_map);</div><div class='del'>-		list_add(ws, &amp;wsm.idle_ws[ZSTD_BTRFS_MAX_LEVEL - 1]);</div><div class='add'>+		set_bit(ZSTD_BTRFS_MAX_LEVEL - 1, &amp;zwsm-&gt;active_map);</div><div class='add'>+		list_add(ws, &amp;zwsm-&gt;idle_ws[ZSTD_BTRFS_MAX_LEVEL - 1]);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zstd_cleanup_workspace_manager(void)</div><div class='add'>+void zstd_free_workspace_manager(struct btrfs_fs_info *fs_info)</div><div class='ctx'> {</div><div class='add'>+	struct zstd_workspace_manager *zwsm = fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD];</div><div class='ctx'> 	struct workspace *workspace;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;wsm.lock);</div><div class='del'>-	for (i = 0; i &lt; ZSTD_BTRFS_MAX_LEVEL; i++) {</div><div class='del'>-		while (!list_empty(&amp;wsm.idle_ws[i])) {</div><div class='del'>-			workspace = container_of(wsm.idle_ws[i].next,</div><div class='add'>+	if (!zwsm)</div><div class='add'>+		return;</div><div class='add'>+	fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD] = NULL;</div><div class='add'>+	spin_lock_bh(&amp;zwsm-&gt;lock);</div><div class='add'>+	for (int i = 0; i &lt; ZSTD_BTRFS_MAX_LEVEL; i++) {</div><div class='add'>+		while (!list_empty(&amp;zwsm-&gt;idle_ws[i])) {</div><div class='add'>+			workspace = container_of(zwsm-&gt;idle_ws[i].next,</div><div class='ctx'> 						 struct workspace, list);</div><div class='ctx'> 			list_del(&amp;workspace-&gt;list);</div><div class='ctx'> 			list_del(&amp;workspace-&gt;lru_list);</div><div class='ctx'> 			zstd_free_workspace(&amp;workspace-&gt;list);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;wsm.lock);</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;wsm.timer);</div><div class='add'>+	spin_unlock_bh(&amp;zwsm-&gt;lock);</div><div class='add'>+	timer_delete_sync(&amp;zwsm-&gt;timer);</div><div class='add'>+	kfree(zwsm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -229,29 +243,31 @@ void zstd_cleanup_workspace_manager(void)</div><div class='ctx'>  * offer the opportunity to reclaim the workspace in favor of allocating an</div><div class='ctx'>  * appropriately sized one in the future.</div><div class='ctx'>  */</div><div class='del'>-static struct list_head *zstd_find_workspace(unsigned int level)</div><div class='add'>+static struct list_head *zstd_find_workspace(struct btrfs_fs_info *fs_info, int level)</div><div class='ctx'> {</div><div class='add'>+	struct zstd_workspace_manager *zwsm = fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD];</div><div class='ctx'> 	struct list_head *ws;</div><div class='ctx'> 	struct workspace *workspace;</div><div class='del'>-	int i = level - 1;</div><div class='add'>+	int i = clip_level(level);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;wsm.lock);</div><div class='del'>-	for_each_set_bit_from(i, &amp;wsm.active_map, ZSTD_BTRFS_MAX_LEVEL) {</div><div class='del'>-		if (!list_empty(&amp;wsm.idle_ws[i])) {</div><div class='del'>-			ws = wsm.idle_ws[i].next;</div><div class='add'>+	ASSERT(zwsm);</div><div class='add'>+	spin_lock_bh(&amp;zwsm-&gt;lock);</div><div class='add'>+	for_each_set_bit_from(i, &amp;zwsm-&gt;active_map, ZSTD_BTRFS_MAX_LEVEL) {</div><div class='add'>+		if (!list_empty(&amp;zwsm-&gt;idle_ws[i])) {</div><div class='add'>+			ws = zwsm-&gt;idle_ws[i].next;</div><div class='ctx'> 			workspace = list_to_workspace(ws);</div><div class='ctx'> 			list_del_init(ws);</div><div class='ctx'> 			/* keep its place if it's a lower level using this */</div><div class='ctx'> 			workspace-&gt;req_level = level;</div><div class='del'>-			if (level == workspace-&gt;level)</div><div class='add'>+			if (clip_level(level) == workspace-&gt;level)</div><div class='ctx'> 				list_del(&amp;workspace-&gt;lru_list);</div><div class='del'>-			if (list_empty(&amp;wsm.idle_ws[i]))</div><div class='del'>-				clear_bit(i, &amp;wsm.active_map);</div><div class='del'>-			spin_unlock_bh(&amp;wsm.lock);</div><div class='add'>+			if (list_empty(&amp;zwsm-&gt;idle_ws[i]))</div><div class='add'>+				clear_bit(i, &amp;zwsm-&gt;active_map);</div><div class='add'>+			spin_unlock_bh(&amp;zwsm-&gt;lock);</div><div class='ctx'> 			return ws;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;wsm.lock);</div><div class='add'>+	spin_unlock_bh(&amp;zwsm-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -266,30 +282,33 @@ static struct list_head *zstd_find_workspace(unsigned int level)</div><div class='ctx'>  * attempt to allocate a new workspace.  If we fail to allocate one due to</div><div class='ctx'>  * memory pressure, go to sleep waiting for the max level workspace to free up.</div><div class='ctx'>  */</div><div class='del'>-struct list_head *zstd_get_workspace(unsigned int level)</div><div class='add'>+struct list_head *zstd_get_workspace(struct btrfs_fs_info *fs_info, int level)</div><div class='ctx'> {</div><div class='add'>+	struct zstd_workspace_manager *zwsm = fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD];</div><div class='ctx'> 	struct list_head *ws;</div><div class='ctx'> 	unsigned int nofs_flag;</div><div class='ctx'> </div><div class='add'>+	ASSERT(zwsm);</div><div class='add'>+</div><div class='ctx'> 	/* level == 0 means we can use any workspace */</div><div class='ctx'> 	if (!level)</div><div class='ctx'> 		level = 1;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	ws = zstd_find_workspace(level);</div><div class='add'>+	ws = zstd_find_workspace(fs_info, level);</div><div class='ctx'> 	if (ws)</div><div class='ctx'> 		return ws;</div><div class='ctx'> </div><div class='ctx'> 	nofs_flag = memalloc_nofs_save();</div><div class='del'>-	ws = zstd_alloc_workspace(level);</div><div class='add'>+	ws = zstd_alloc_workspace(fs_info, level);</div><div class='ctx'> 	memalloc_nofs_restore(nofs_flag);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(ws)) {</div><div class='ctx'> 		DEFINE_WAIT(wait);</div><div class='ctx'> </div><div class='del'>-		prepare_to_wait(&amp;wsm.wait, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		prepare_to_wait(&amp;zwsm-&gt;wait, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 		schedule();</div><div class='del'>-		finish_wait(&amp;wsm.wait, &amp;wait);</div><div class='add'>+		finish_wait(&amp;zwsm-&gt;wait, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -308,34 +327,36 @@ again:</div><div class='ctx'>  * isn't set, it is also set here.  Only the max level workspace tries and wakes</div><div class='ctx'>  * up waiting workspaces.</div><div class='ctx'>  */</div><div class='del'>-void zstd_put_workspace(struct list_head *ws)</div><div class='add'>+void zstd_put_workspace(struct btrfs_fs_info *fs_info, struct list_head *ws)</div><div class='ctx'> {</div><div class='add'>+	struct zstd_workspace_manager *zwsm = fs_info-&gt;compr_wsm[BTRFS_COMPRESS_ZSTD];</div><div class='ctx'> 	struct workspace *workspace = list_to_workspace(ws);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;wsm.lock);</div><div class='add'>+	ASSERT(zwsm);</div><div class='add'>+	spin_lock_bh(&amp;zwsm-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* A node is only taken off the lru if we are the corresponding level */</div><div class='del'>-	if (workspace-&gt;req_level == workspace-&gt;level) {</div><div class='add'>+	if (clip_level(workspace-&gt;req_level) == workspace-&gt;level) {</div><div class='ctx'> 		/* Hide a max level workspace from reclaim */</div><div class='del'>-		if (list_empty(&amp;wsm.idle_ws[ZSTD_BTRFS_MAX_LEVEL - 1])) {</div><div class='add'>+		if (list_empty(&amp;zwsm-&gt;idle_ws[ZSTD_BTRFS_MAX_LEVEL - 1])) {</div><div class='ctx'> 			INIT_LIST_HEAD(&amp;workspace-&gt;lru_list);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			workspace-&gt;last_used = jiffies;</div><div class='del'>-			list_add(&amp;workspace-&gt;lru_list, &amp;wsm.lru_list);</div><div class='del'>-			if (!timer_pending(&amp;wsm.timer))</div><div class='del'>-				mod_timer(&amp;wsm.timer,</div><div class='add'>+			list_add(&amp;workspace-&gt;lru_list, &amp;zwsm-&gt;lru_list);</div><div class='add'>+			if (!timer_pending(&amp;zwsm-&gt;timer))</div><div class='add'>+				mod_timer(&amp;zwsm-&gt;timer,</div><div class='ctx'> 					  jiffies + ZSTD_BTRFS_RECLAIM_JIFFIES);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(workspace-&gt;level - 1, &amp;wsm.active_map);</div><div class='del'>-	list_add(&amp;workspace-&gt;list, &amp;wsm.idle_ws[workspace-&gt;level - 1]);</div><div class='add'>+	set_bit(workspace-&gt;level, &amp;zwsm-&gt;active_map);</div><div class='add'>+	list_add(&amp;workspace-&gt;list, &amp;zwsm-&gt;idle_ws[workspace-&gt;level]);</div><div class='ctx'> 	workspace-&gt;req_level = 0;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;wsm.lock);</div><div class='add'>+	spin_unlock_bh(&amp;zwsm-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (workspace-&gt;level == ZSTD_BTRFS_MAX_LEVEL)</div><div class='del'>-		cond_wake_up(&amp;wsm.wait);</div><div class='add'>+	if (workspace-&gt;level == clip_level(ZSTD_BTRFS_MAX_LEVEL))</div><div class='add'>+		cond_wake_up(&amp;zwsm-&gt;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void zstd_free_workspace(struct list_head *ws)</div><div class='hunk'>@@ -347,20 +368,22 @@ void zstd_free_workspace(struct list_head *ws)</div><div class='ctx'> 	kfree(workspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct list_head *zstd_alloc_workspace(unsigned int level)</div><div class='add'>+struct list_head *zstd_alloc_workspace(struct btrfs_fs_info *fs_info, int level)</div><div class='ctx'> {</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	struct workspace *workspace;</div><div class='ctx'> </div><div class='ctx'> 	workspace = kzalloc(sizeof(*workspace), GFP_KERNEL);</div><div class='ctx'> 	if (!workspace)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	workspace-&gt;size = zstd_ws_mem_sizes[level - 1];</div><div class='del'>-	workspace-&gt;level = level;</div><div class='add'>+	/* Use level 1 workspace size for all the fast mode negative levels. */</div><div class='add'>+	workspace-&gt;size = zstd_ws_mem_sizes[clip_level(level)];</div><div class='add'>+	workspace-&gt;level = clip_level(level);</div><div class='ctx'> 	workspace-&gt;req_level = level;</div><div class='ctx'> 	workspace-&gt;last_used = jiffies;</div><div class='ctx'> 	workspace-&gt;mem = kvmalloc(workspace-&gt;size, GFP_KERNEL | __GFP_NOWARN);</div><div class='del'>-	workspace-&gt;buf = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='add'>+	workspace-&gt;buf = kmalloc(blocksize, GFP_KERNEL);</div><div class='ctx'> 	if (!workspace-&gt;mem || !workspace-&gt;buf)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -373,68 +396,82 @@ fail:</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='del'>-		u64 start, struct page **pages, unsigned long *out_pages,</div><div class='del'>-		unsigned long *total_in, unsigned long *total_out)</div><div class='add'>+int zstd_compress_folios(struct list_head *ws, struct btrfs_inode *inode,</div><div class='add'>+			 u64 start, struct folio **folios, unsigned long *out_folios,</div><div class='add'>+			 unsigned long *total_in, unsigned long *total_out)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = inode-&gt;root-&gt;fs_info;</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='add'>+	struct address_space *mapping = inode-&gt;vfs_inode.i_mapping;</div><div class='ctx'> 	zstd_cstream *stream;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int nr_pages = 0;</div><div class='del'>-	struct page *in_page = NULL;  /* The current page to read */</div><div class='del'>-	struct page *out_page = NULL; /* The current page to write to */</div><div class='add'>+	int nr_folios = 0;</div><div class='add'>+	struct folio *in_folio = NULL;  /* The current folio to read. */</div><div class='add'>+	struct folio *out_folio = NULL; /* The current folio to write to. */</div><div class='ctx'> 	unsigned long tot_in = 0;</div><div class='ctx'> 	unsigned long tot_out = 0;</div><div class='ctx'> 	unsigned long len = *total_out;</div><div class='del'>-	const unsigned long nr_dest_pages = *out_pages;</div><div class='del'>-	unsigned long max_out = nr_dest_pages * PAGE_SIZE;</div><div class='del'>-	zstd_parameters params = zstd_get_btrfs_parameters(workspace-&gt;req_level,</div><div class='del'>-							   len);</div><div class='del'>-</div><div class='del'>-	*out_pages = 0;</div><div class='add'>+	const unsigned long nr_dest_folios = *out_folios;</div><div class='add'>+	const u64 orig_end = start + len;</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const u32 min_folio_size = btrfs_min_folio_size(fs_info);</div><div class='add'>+	unsigned long max_out = nr_dest_folios * min_folio_size;</div><div class='add'>+	unsigned int cur_len;</div><div class='add'>+</div><div class='add'>+	workspace-&gt;params = zstd_get_btrfs_parameters(workspace-&gt;req_level, len);</div><div class='add'>+	*out_folios = 0;</div><div class='ctx'> 	*total_out = 0;</div><div class='ctx'> 	*total_in = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the stream */</div><div class='del'>-	stream = zstd_init_cstream(&amp;params, len, workspace-&gt;mem,</div><div class='add'>+	stream = zstd_init_cstream(&amp;workspace-&gt;params, len, workspace-&gt;mem,</div><div class='ctx'> 			workspace-&gt;size);</div><div class='del'>-	if (!stream) {</div><div class='del'>-		pr_warn("BTRFS: zstd_init_cstream failed\n");</div><div class='add'>+	if (unlikely(!stream)) {</div><div class='add'>+		btrfs_err(fs_info,</div><div class='add'>+	"zstd compression init level %d failed, root %llu inode %llu offset %llu",</div><div class='add'>+			  workspace-&gt;req_level, btrfs_root_id(inode-&gt;root),</div><div class='add'>+			  btrfs_ino(inode), start);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* map in the first page of input data */</div><div class='del'>-	in_page = find_get_page(mapping, start &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	workspace-&gt;in_buf.src = kmap_local_page(in_page);</div><div class='add'>+	ret = btrfs_compress_filemap_get_folio(mapping, start, &amp;in_folio);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	cur_len = btrfs_calc_input_length(in_folio, orig_end, start);</div><div class='add'>+	workspace-&gt;in_buf.src = kmap_local_folio(in_folio, offset_in_folio(in_folio, start));</div><div class='ctx'> 	workspace-&gt;in_buf.pos = 0;</div><div class='del'>-	workspace-&gt;in_buf.size = min_t(size_t, len, PAGE_SIZE);</div><div class='add'>+	workspace-&gt;in_buf.size = cur_len;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate and map in the output buffer */</div><div class='del'>-	out_page = btrfs_alloc_compr_page();</div><div class='del'>-	if (out_page == NULL) {</div><div class='add'>+	out_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+	if (out_folio == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	pages[nr_pages++] = out_page;</div><div class='del'>-	workspace-&gt;out_buf.dst = page_address(out_page);</div><div class='add'>+	folios[nr_folios++] = out_folio;</div><div class='add'>+	workspace-&gt;out_buf.dst = folio_address(out_folio);</div><div class='ctx'> 	workspace-&gt;out_buf.pos = 0;</div><div class='del'>-	workspace-&gt;out_buf.size = min_t(size_t, max_out, PAGE_SIZE);</div><div class='add'>+	workspace-&gt;out_buf.size = min_t(size_t, max_out, min_folio_size);</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		size_t ret2;</div><div class='ctx'> </div><div class='ctx'> 		ret2 = zstd_compress_stream(stream, &amp;workspace-&gt;out_buf,</div><div class='ctx'> 				&amp;workspace-&gt;in_buf);</div><div class='del'>-		if (zstd_is_error(ret2)) {</div><div class='del'>-			pr_debug("BTRFS: zstd_compress_stream returned %d\n",</div><div class='del'>-					zstd_get_error_code(ret2));</div><div class='add'>+		if (unlikely(zstd_is_error(ret2))) {</div><div class='add'>+			btrfs_warn(fs_info,</div><div class='add'>+"zstd compression level %d failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+				   workspace-&gt;req_level, zstd_get_error_code(ret2),</div><div class='add'>+				   btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+				   start);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check to see if we are making it bigger */</div><div class='del'>-		if (tot_in + workspace-&gt;in_buf.pos &gt; 8192 &amp;&amp;</div><div class='add'>+		if (tot_in + workspace-&gt;in_buf.pos &gt; blocksize * 2 &amp;&amp;</div><div class='ctx'> 				tot_in + workspace-&gt;in_buf.pos &lt;</div><div class='ctx'> 				tot_out + workspace-&gt;out_buf.pos) {</div><div class='ctx'> 			ret = -E2BIG;</div><div class='hunk'>@@ -450,22 +487,21 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> </div><div class='ctx'> 		/* Check if we need more output space */</div><div class='ctx'> 		if (workspace-&gt;out_buf.pos == workspace-&gt;out_buf.size) {</div><div class='del'>-			tot_out += PAGE_SIZE;</div><div class='del'>-			max_out -= PAGE_SIZE;</div><div class='del'>-			if (nr_pages == nr_dest_pages) {</div><div class='add'>+			tot_out += min_folio_size;</div><div class='add'>+			max_out -= min_folio_size;</div><div class='add'>+			if (nr_folios == nr_dest_folios) {</div><div class='ctx'> 				ret = -E2BIG;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			out_page = btrfs_alloc_compr_page();</div><div class='del'>-			if (out_page == NULL) {</div><div class='add'>+			out_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+			if (out_folio == NULL) {</div><div class='ctx'> 				ret = -ENOMEM;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			pages[nr_pages++] = out_page;</div><div class='del'>-			workspace-&gt;out_buf.dst = page_address(out_page);</div><div class='add'>+			folios[nr_folios++] = out_folio;</div><div class='add'>+			workspace-&gt;out_buf.dst = folio_address(out_folio);</div><div class='ctx'> 			workspace-&gt;out_buf.pos = 0;</div><div class='del'>-			workspace-&gt;out_buf.size = min_t(size_t, max_out,</div><div class='del'>-							PAGE_SIZE);</div><div class='add'>+			workspace-&gt;out_buf.size = min_t(size_t, max_out, min_folio_size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* We've reached the end of the input */</div><div class='hunk'>@@ -476,24 +512,32 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> </div><div class='ctx'> 		/* Check if we need more input */</div><div class='ctx'> 		if (workspace-&gt;in_buf.pos == workspace-&gt;in_buf.size) {</div><div class='del'>-			tot_in += PAGE_SIZE;</div><div class='add'>+			tot_in += workspace-&gt;in_buf.size;</div><div class='ctx'> 			kunmap_local(workspace-&gt;in_buf.src);</div><div class='del'>-			put_page(in_page);</div><div class='del'>-			start += PAGE_SIZE;</div><div class='del'>-			len -= PAGE_SIZE;</div><div class='del'>-			in_page = find_get_page(mapping, start &gt;&gt; PAGE_SHIFT);</div><div class='del'>-			workspace-&gt;in_buf.src = kmap_local_page(in_page);</div><div class='add'>+			workspace-&gt;in_buf.src = NULL;</div><div class='add'>+			folio_put(in_folio);</div><div class='add'>+			start += cur_len;</div><div class='add'>+			len -= cur_len;</div><div class='add'>+			ret = btrfs_compress_filemap_get_folio(mapping, start, &amp;in_folio);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto out;</div><div class='add'>+			cur_len = btrfs_calc_input_length(in_folio, orig_end, start);</div><div class='add'>+			workspace-&gt;in_buf.src = kmap_local_folio(in_folio,</div><div class='add'>+							 offset_in_folio(in_folio, start));</div><div class='ctx'> 			workspace-&gt;in_buf.pos = 0;</div><div class='del'>-			workspace-&gt;in_buf.size = min_t(size_t, len, PAGE_SIZE);</div><div class='add'>+			workspace-&gt;in_buf.size = cur_len;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		size_t ret2;</div><div class='ctx'> </div><div class='ctx'> 		ret2 = zstd_end_stream(stream, &amp;workspace-&gt;out_buf);</div><div class='del'>-		if (zstd_is_error(ret2)) {</div><div class='del'>-			pr_debug("BTRFS: zstd_end_stream returned %d\n",</div><div class='del'>-					zstd_get_error_code(ret2));</div><div class='add'>+		if (unlikely(zstd_is_error(ret2))) {</div><div class='add'>+			btrfs_err(fs_info,</div><div class='add'>+"zstd compression end level %d failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+				  workspace-&gt;req_level, zstd_get_error_code(ret2),</div><div class='add'>+				  btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+				  start);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -507,21 +551,21 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tot_out += PAGE_SIZE;</div><div class='del'>-		max_out -= PAGE_SIZE;</div><div class='del'>-		if (nr_pages == nr_dest_pages) {</div><div class='add'>+		tot_out += min_folio_size;</div><div class='add'>+		max_out -= min_folio_size;</div><div class='add'>+		if (nr_folios == nr_dest_folios) {</div><div class='ctx'> 			ret = -E2BIG;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		out_page = btrfs_alloc_compr_page();</div><div class='del'>-		if (out_page == NULL) {</div><div class='add'>+		out_folio = btrfs_alloc_compr_folio(fs_info);</div><div class='add'>+		if (out_folio == NULL) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		pages[nr_pages++] = out_page;</div><div class='del'>-		workspace-&gt;out_buf.dst = page_address(out_page);</div><div class='add'>+		folios[nr_folios++] = out_folio;</div><div class='add'>+		workspace-&gt;out_buf.dst = folio_address(out_folio);</div><div class='ctx'> 		workspace-&gt;out_buf.pos = 0;</div><div class='del'>-		workspace-&gt;out_buf.size = min_t(size_t, max_out, PAGE_SIZE);</div><div class='add'>+		workspace-&gt;out_buf.size = min_t(size_t, max_out, min_folio_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tot_out &gt;= tot_in) {</div><div class='hunk'>@@ -533,50 +577,61 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,</div><div class='ctx'> 	*total_in = tot_in;</div><div class='ctx'> 	*total_out = tot_out;</div><div class='ctx'> out:</div><div class='del'>-	*out_pages = nr_pages;</div><div class='add'>+	*out_folios = nr_folios;</div><div class='ctx'> 	if (workspace-&gt;in_buf.src) {</div><div class='ctx'> 		kunmap_local(workspace-&gt;in_buf.src);</div><div class='del'>-		put_page(in_page);</div><div class='add'>+		folio_put(in_folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> {</div><div class='add'>+	struct btrfs_fs_info *fs_info = cb_to_fs_info(cb);</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='del'>-	struct page **pages_in = cb-&gt;compressed_pages;</div><div class='add'>+	struct folio **folios_in = cb-&gt;compressed_folios;</div><div class='ctx'> 	size_t srclen = cb-&gt;compressed_len;</div><div class='ctx'> 	zstd_dstream *stream;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	unsigned long page_in_index = 0;</div><div class='del'>-	unsigned long total_pages_in = DIV_ROUND_UP(srclen, PAGE_SIZE);</div><div class='add'>+	const u32 blocksize = fs_info-&gt;sectorsize;</div><div class='add'>+	const unsigned int min_folio_size = btrfs_min_folio_size(fs_info);</div><div class='add'>+	unsigned long folio_in_index = 0;</div><div class='add'>+	unsigned long total_folios_in = DIV_ROUND_UP(srclen, min_folio_size);</div><div class='ctx'> 	unsigned long buf_start;</div><div class='ctx'> 	unsigned long total_out = 0;</div><div class='ctx'> </div><div class='ctx'> 	stream = zstd_init_dstream(</div><div class='ctx'> 			ZSTD_BTRFS_MAX_INPUT, workspace-&gt;mem, workspace-&gt;size);</div><div class='del'>-	if (!stream) {</div><div class='del'>-		pr_debug("BTRFS: zstd_init_dstream failed\n");</div><div class='add'>+	if (unlikely(!stream)) {</div><div class='add'>+		struct btrfs_inode *inode = cb-&gt;bbio.inode;</div><div class='add'>+</div><div class='add'>+		btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"zstd decompression init failed, root %llu inode %llu offset %llu",</div><div class='add'>+			  btrfs_root_id(inode-&gt;root), btrfs_ino(inode), cb-&gt;start);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	workspace-&gt;in_buf.src = kmap_local_page(pages_in[page_in_index]);</div><div class='add'>+	workspace-&gt;in_buf.src = kmap_local_folio(folios_in[folio_in_index], 0);</div><div class='ctx'> 	workspace-&gt;in_buf.pos = 0;</div><div class='del'>-	workspace-&gt;in_buf.size = min_t(size_t, srclen, PAGE_SIZE);</div><div class='add'>+	workspace-&gt;in_buf.size = min_t(size_t, srclen, min_folio_size);</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;out_buf.dst = workspace-&gt;buf;</div><div class='ctx'> 	workspace-&gt;out_buf.pos = 0;</div><div class='del'>-	workspace-&gt;out_buf.size = PAGE_SIZE;</div><div class='add'>+	workspace-&gt;out_buf.size = blocksize;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		size_t ret2;</div><div class='ctx'> </div><div class='ctx'> 		ret2 = zstd_decompress_stream(stream, &amp;workspace-&gt;out_buf,</div><div class='ctx'> 				&amp;workspace-&gt;in_buf);</div><div class='del'>-		if (zstd_is_error(ret2)) {</div><div class='del'>-			pr_debug("BTRFS: zstd_decompress_stream returned %d\n",</div><div class='del'>-					zstd_get_error_code(ret2));</div><div class='add'>+		if (unlikely(zstd_is_error(ret2))) {</div><div class='add'>+			struct btrfs_inode *inode = cb-&gt;bbio.inode;</div><div class='add'>+</div><div class='add'>+			btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"zstd decompression failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+				  zstd_get_error_code(ret2), btrfs_root_id(inode-&gt;root),</div><div class='add'>+				  btrfs_ino(inode), cb-&gt;start);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -598,16 +653,17 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb)</div><div class='ctx'> </div><div class='ctx'> 		if (workspace-&gt;in_buf.pos == workspace-&gt;in_buf.size) {</div><div class='ctx'> 			kunmap_local(workspace-&gt;in_buf.src);</div><div class='del'>-			page_in_index++;</div><div class='del'>-			if (page_in_index &gt;= total_pages_in) {</div><div class='add'>+			folio_in_index++;</div><div class='add'>+			if (unlikely(folio_in_index &gt;= total_folios_in)) {</div><div class='ctx'> 				workspace-&gt;in_buf.src = NULL;</div><div class='ctx'> 				ret = -EIO;</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='del'>-			srclen -= PAGE_SIZE;</div><div class='del'>-			workspace-&gt;in_buf.src = kmap_local_page(pages_in[page_in_index]);</div><div class='add'>+			srclen -= min_folio_size;</div><div class='add'>+			workspace-&gt;in_buf.src =</div><div class='add'>+				kmap_local_folio(folios_in[folio_in_index], 0);</div><div class='ctx'> 			workspace-&gt;in_buf.pos = 0;</div><div class='del'>-			workspace-&gt;in_buf.size = min_t(size_t, srclen, PAGE_SIZE);</div><div class='add'>+			workspace-&gt;in_buf.size = min_t(size_t, srclen, min_folio_size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -618,87 +674,64 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int zstd_decompress(struct list_head *ws, const u8 *data_in,</div><div class='del'>-		struct page *dest_page, unsigned long start_byte, size_t srclen,</div><div class='add'>+		struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,</div><div class='ctx'> 		size_t destlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct workspace *workspace = list_entry(ws, struct workspace, list);</div><div class='add'>+	struct btrfs_fs_info *fs_info = btrfs_sb(folio_inode(dest_folio)-&gt;i_sb);</div><div class='add'>+	const u32 sectorsize = fs_info-&gt;sectorsize;</div><div class='ctx'> 	zstd_dstream *stream;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	size_t ret2;</div><div class='del'>-	unsigned long total_out = 0;</div><div class='del'>-	unsigned long pg_offset = 0;</div><div class='add'>+	unsigned long to_copy = 0;</div><div class='ctx'> </div><div class='ctx'> 	stream = zstd_init_dstream(</div><div class='ctx'> 			ZSTD_BTRFS_MAX_INPUT, workspace-&gt;mem, workspace-&gt;size);</div><div class='del'>-	if (!stream) {</div><div class='del'>-		pr_warn("BTRFS: zstd_init_dstream failed\n");</div><div class='add'>+	if (unlikely(!stream)) {</div><div class='add'>+		struct btrfs_inode *inode = folio_to_inode(dest_folio);</div><div class='add'>+</div><div class='add'>+		btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"zstd decompression init failed, root %llu inode %llu offset %llu",</div><div class='add'>+			  btrfs_root_id(inode-&gt;root), btrfs_ino(inode),</div><div class='add'>+			  folio_pos(dest_folio));</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto finish;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	destlen = min_t(size_t, destlen, PAGE_SIZE);</div><div class='del'>-</div><div class='ctx'> 	workspace-&gt;in_buf.src = data_in;</div><div class='ctx'> 	workspace-&gt;in_buf.pos = 0;</div><div class='ctx'> 	workspace-&gt;in_buf.size = srclen;</div><div class='ctx'> </div><div class='ctx'> 	workspace-&gt;out_buf.dst = workspace-&gt;buf;</div><div class='ctx'> 	workspace-&gt;out_buf.pos = 0;</div><div class='del'>-	workspace-&gt;out_buf.size = PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-	ret2 = 1;</div><div class='del'>-	while (pg_offset &lt; destlen</div><div class='del'>-	       &amp;&amp; workspace-&gt;in_buf.pos &lt; workspace-&gt;in_buf.size) {</div><div class='del'>-		unsigned long buf_start;</div><div class='del'>-		unsigned long buf_offset;</div><div class='del'>-		unsigned long bytes;</div><div class='del'>-</div><div class='del'>-		/* Check if the frame is over and we still need more input */</div><div class='del'>-		if (ret2 == 0) {</div><div class='del'>-			pr_debug("BTRFS: zstd_decompress_stream ended early\n");</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto finish;</div><div class='del'>-		}</div><div class='del'>-		ret2 = zstd_decompress_stream(stream, &amp;workspace-&gt;out_buf,</div><div class='del'>-				&amp;workspace-&gt;in_buf);</div><div class='del'>-		if (zstd_is_error(ret2)) {</div><div class='del'>-			pr_debug("BTRFS: zstd_decompress_stream returned %d\n",</div><div class='del'>-					zstd_get_error_code(ret2));</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto finish;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		buf_start = total_out;</div><div class='del'>-		total_out += workspace-&gt;out_buf.pos;</div><div class='del'>-		workspace-&gt;out_buf.pos = 0;</div><div class='del'>-</div><div class='del'>-		if (total_out &lt;= start_byte)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (total_out &gt; start_byte &amp;&amp; buf_start &lt; start_byte)</div><div class='del'>-			buf_offset = start_byte - buf_start;</div><div class='del'>-		else</div><div class='del'>-			buf_offset = 0;</div><div class='del'>-</div><div class='del'>-		bytes = min_t(unsigned long, destlen - pg_offset,</div><div class='del'>-				workspace-&gt;out_buf.size - buf_offset);</div><div class='del'>-</div><div class='del'>-		memcpy_to_page(dest_page, pg_offset,</div><div class='del'>-			       workspace-&gt;out_buf.dst + buf_offset, bytes);</div><div class='del'>-</div><div class='del'>-		pg_offset += bytes;</div><div class='add'>+	workspace-&gt;out_buf.size = sectorsize;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since both input and output buffers should not exceed one sector,</div><div class='add'>+	 * one call should end the decompression.</div><div class='add'>+	 */</div><div class='add'>+	ret = zstd_decompress_stream(stream, &amp;workspace-&gt;out_buf, &amp;workspace-&gt;in_buf);</div><div class='add'>+	if (unlikely(zstd_is_error(ret))) {</div><div class='add'>+		struct btrfs_inode *inode = folio_to_inode(dest_folio);</div><div class='add'>+</div><div class='add'>+		btrfs_err(inode-&gt;root-&gt;fs_info,</div><div class='add'>+		"zstd decompression failed, error %d root %llu inode %llu offset %llu",</div><div class='add'>+			  zstd_get_error_code(ret), btrfs_root_id(inode-&gt;root),</div><div class='add'>+			  btrfs_ino(inode), folio_pos(dest_folio));</div><div class='add'>+		goto finish;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='add'>+	to_copy = workspace-&gt;out_buf.pos;</div><div class='add'>+	memcpy_to_folio(dest_folio, dest_pgoff, workspace-&gt;out_buf.dst, to_copy);</div><div class='ctx'> finish:</div><div class='del'>-	if (pg_offset &lt; destlen) {</div><div class='del'>-		memzero_page(dest_page, pg_offset, destlen - pg_offset);</div><div class='add'>+	/* Error or early end. */</div><div class='add'>+	if (unlikely(to_copy &lt; destlen)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		folio_zero_range(dest_folio, dest_pgoff + to_copy, destlen - to_copy);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct btrfs_compress_op btrfs_zstd_compress = {</div><div class='del'>-	/* ZSTD uses own workspace manager */</div><div class='del'>-	.workspace_manager = NULL,</div><div class='add'>+const struct btrfs_compress_levels btrfs_zstd_compress = {</div><div class='add'>+	.min_level	= ZSTD_BTRFS_MIN_LEVEL,</div><div class='ctx'> 	.max_level	= ZSTD_BTRFS_MAX_LEVEL,</div><div class='ctx'> 	.default_level	= ZSTD_BTRFS_DEFAULT_LEVEL,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/buffer.c b/fs/buffer.c<br/>index d3bcf601d3e5..838c0c571022 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/buffer.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/buffer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/buffer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/buffer.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);</div><div class='ctx'> static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,</div><div class='del'>-			  struct writeback_control *wbc);</div><div class='add'>+			  enum rw_hint hint, struct writeback_control *wbc);</div><div class='ctx'> </div><div class='ctx'> #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers)</div><div class='ctx'> </div><div class='hunk'>@@ -157,8 +157,8 @@ static void __end_buffer_read_notouch(struct buffer_head *bh, int uptodate)</div><div class='ctx'>  */</div><div class='ctx'> void end_buffer_read_sync(struct buffer_head *bh, int uptodate)</div><div class='ctx'> {</div><div class='del'>-	__end_buffer_read_notouch(bh, uptodate);</div><div class='ctx'> 	put_bh(bh);</div><div class='add'>+	__end_buffer_read_notouch(bh, uptodate);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(end_buffer_read_sync);</div><div class='ctx'> </div><div class='hunk'>@@ -176,21 +176,11 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(end_buffer_write_sync);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Various filesystems appear to want __find_get_block to be non-blocking.</div><div class='del'>- * But it's the page lock which protects the buffers.  To get around this,</div><div class='del'>- * we get exclusion from try_to_free_buffers with the blockdev mapping's</div><div class='del'>- * i_private_lock.</div><div class='del'>- *</div><div class='del'>- * Hack idea: for the blockdev mapping, i_private_lock contention</div><div class='del'>- * may be quite high.  This code could TryLock the page, and if that</div><div class='del'>- * succeeds, there is no need to take i_private_lock.</div><div class='del'>- */</div><div class='ctx'> static struct buffer_head *</div><div class='del'>-__find_get_block_slow(struct block_device *bdev, sector_t block)</div><div class='add'>+__find_get_block_slow(struct block_device *bdev, sector_t block, bool atomic)</div><div class='ctx'> {</div><div class='del'>-	struct inode *bd_inode = bdev-&gt;bd_inode;</div><div class='del'>-	struct address_space *bd_mapping = bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *bd_mapping = bdev-&gt;bd_mapping;</div><div class='add'>+	const int blkbits = bd_mapping-&gt;host-&gt;i_blkbits;</div><div class='ctx'> 	struct buffer_head *ret = NULL;</div><div class='ctx'> 	pgoff_t index;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='hunk'>@@ -199,15 +189,33 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)</div><div class='ctx'> 	int all_mapped = 1;</div><div class='ctx'> 	static DEFINE_RATELIMIT_STATE(last_warned, HZ, 1);</div><div class='ctx'> </div><div class='del'>-	index = ((loff_t)block &lt;&lt; bd_inode-&gt;i_blkbits) / PAGE_SIZE;</div><div class='add'>+	index = ((loff_t)block &lt;&lt; blkbits) / PAGE_SIZE;</div><div class='ctx'> 	folio = __filemap_get_folio(bd_mapping, index, FGP_ACCESSED, 0);</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;bd_mapping-&gt;i_private_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Folio lock protects the buffers. Callers that cannot block</div><div class='add'>+	 * will fallback to serializing vs try_to_free_buffers() via</div><div class='add'>+	 * the i_private_lock.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic)</div><div class='add'>+		spin_lock(&amp;bd_mapping-&gt;i_private_lock);</div><div class='add'>+	else</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+</div><div class='ctx'> 	head = folio_buffers(folio);</div><div class='ctx'> 	if (!head)</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	/*</div><div class='add'>+	 * Upon a noref migration, the folio lock serializes here;</div><div class='add'>+	 * otherwise bail.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit_acquire(BH_Migrate, &amp;head-&gt;b_state)) {</div><div class='add'>+		WARN_ON(!atomic);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bh = head;</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!buffer_mapped(bh))</div><div class='hunk'>@@ -233,10 +241,13 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)</div><div class='ctx'> 		       (unsigned long long)block,</div><div class='ctx'> 		       (unsigned long long)bh-&gt;b_blocknr,</div><div class='ctx'> 		       bh-&gt;b_state, bh-&gt;b_size, bdev,</div><div class='del'>-		       1 &lt;&lt; bd_inode-&gt;i_blkbits);</div><div class='add'>+		       1 &lt;&lt; blkbits);</div><div class='ctx'> 	}</div><div class='ctx'> out_unlock:</div><div class='del'>-	spin_unlock(&amp;bd_mapping-&gt;i_private_lock);</div><div class='add'>+	if (atomic)</div><div class='add'>+		spin_unlock(&amp;bd_mapping-&gt;i_private_lock);</div><div class='add'>+	else</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -258,7 +269,6 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		clear_buffer_uptodate(bh);</div><div class='ctx'> 		buffer_io_error(bh, ", async page read");</div><div class='del'>-		folio_set_error(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -287,7 +297,6 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)</div><div class='ctx'> </div><div class='ctx'> still_busy:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;first-&gt;b_uptodate_lock, flags);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct postprocess_bh_ctx {</div><div class='hunk'>@@ -391,7 +400,6 @@ static void end_buffer_async_write(struct buffer_head *bh, int uptodate)</div><div class='ctx'> 		buffer_io_error(bh, ", lost async page write");</div><div class='ctx'> 		mark_buffer_write_io_error(bh);</div><div class='ctx'> 		clear_buffer_uptodate(bh);</div><div class='del'>-		folio_set_error(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	first = folio_buffers(folio);</div><div class='hunk'>@@ -413,7 +421,6 @@ static void end_buffer_async_write(struct buffer_head *bh, int uptodate)</div><div class='ctx'> </div><div class='ctx'> still_busy:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;first-&gt;b_uptodate_lock, flags);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -464,7 +471,7 @@ EXPORT_SYMBOL(mark_buffer_async_write);</div><div class='ctx'>  * a successful fsync().  For example, ext2 indirect blocks need to be</div><div class='ctx'>  * written back and waited upon before fsync() returns.</div><div class='ctx'>  *</div><div class='del'>- * The functions mark_buffer_inode_dirty(), fsync_inode_buffers(),</div><div class='add'>+ * The functions mark_buffer_dirty_inode(), fsync_inode_buffers(),</div><div class='ctx'>  * inode_has_buffers() and invalidate_inode_buffers() are provided for the</div><div class='ctx'>  * management of a list of dependent buffers at -&gt;i_mapping-&gt;i_private_list.</div><div class='ctx'>  *</div><div class='hunk'>@@ -604,9 +611,9 @@ int generic_buffers_fsync_noflush(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	ret = sync_mapping_buffers(inode-&gt;i_mapping);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_DIRTY_ALL))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_DIRTY_ALL))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (datasync &amp;&amp; !(inode-&gt;i_state &amp; I_DIRTY_DATASYNC))</div><div class='add'>+	if (datasync &amp;&amp; !(inode_state_read_once(inode) &amp; I_DIRTY_DATASYNC))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = sync_inode_metadata(inode, 1);</div><div class='hunk'>@@ -658,7 +665,9 @@ EXPORT_SYMBOL(generic_buffers_fsync);</div><div class='ctx'> void write_boundary_block(struct block_device *bdev,</div><div class='ctx'> 			sector_t bblock, unsigned blocksize)</div><div class='ctx'> {</div><div class='del'>-	struct buffer_head *bh = __find_get_block(bdev, bblock + 1, blocksize);</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+</div><div class='add'>+	bh = __find_get_block_nonatomic(bdev, bblock + 1, blocksize);</div><div class='ctx'> 	if (bh) {</div><div class='ctx'> 		if (buffer_dirty(bh))</div><div class='ctx'> 			write_dirty_buffer(bh, 0);</div><div class='hunk'>@@ -687,30 +696,37 @@ void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mark_buffer_dirty_inode);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Add a page to the dirty page list.</div><div class='del'>- *</div><div class='del'>- * It is a sad fact of life that this function is called from several places</div><div class='del'>- * deeply under spinlocking.  It may not sleep.</div><div class='del'>- *</div><div class='del'>- * If the page has buffers, the uptodate buffers are set dirty, to preserve</div><div class='del'>- * dirty-state coherency between the page and the buffers.  It the page does</div><div class='del'>- * not have buffers then when they are later attached they will all be set</div><div class='del'>- * dirty.</div><div class='del'>- *</div><div class='del'>- * The buffers are dirtied before the page is dirtied.  There's a small race</div><div class='del'>- * window in which a writepage caller may see the page cleanness but not the</div><div class='del'>- * buffer dirtiness.  That's fine.  If this code were to set the page dirty</div><div class='del'>- * before the buffers, a concurrent writepage caller could clear the page dirty</div><div class='del'>- * bit, see a bunch of clean buffers and we'd end up with dirty buffers/clean</div><div class='del'>- * page on the dirty page list.</div><div class='del'>- *</div><div class='del'>- * We use i_private_lock to lock against try_to_free_buffers while using the</div><div class='del'>- * page's buffer list.  Also use this to protect against clean buffers being</div><div class='del'>- * added to the page after it was set dirty.</div><div class='del'>- *</div><div class='del'>- * FIXME: may need to call -&gt;reservepage here as well.  That's rather up to the</div><div class='del'>- * address_space though.</div><div class='add'>+/**</div><div class='add'>+ * block_dirty_folio - Mark a folio as dirty.</div><div class='add'>+ * @mapping: The address space containing this folio.</div><div class='add'>+ * @folio: The folio to mark dirty.</div><div class='add'>+ *</div><div class='add'>+ * Filesystems which use buffer_heads can use this function as their</div><div class='add'>+ * -&gt;dirty_folio implementation.  Some filesystems need to do a little</div><div class='add'>+ * work before calling this function.  Filesystems which do not use</div><div class='add'>+ * buffer_heads should call filemap_dirty_folio() instead.</div><div class='add'>+ *</div><div class='add'>+ * If the folio has buffers, the uptodate buffers are set dirty, to</div><div class='add'>+ * preserve dirty-state coherency between the folio and the buffers.</div><div class='add'>+ * Buffers added to a dirty folio are created dirty.</div><div class='add'>+ *</div><div class='add'>+ * The buffers are dirtied before the folio is dirtied.  There's a small</div><div class='add'>+ * race window in which writeback may see the folio cleanness but not the</div><div class='add'>+ * buffer dirtiness.  That's fine.  If this code were to set the folio</div><div class='add'>+ * dirty before the buffers, writeback could clear the folio dirty flag,</div><div class='add'>+ * see a bunch of clean buffers and we'd end up with dirty buffers/clean</div><div class='add'>+ * folio on the dirty folio list.</div><div class='add'>+ *</div><div class='add'>+ * We use i_private_lock to lock against try_to_free_buffers() while</div><div class='add'>+ * using the folio's buffer list.  This also prevents clean buffers</div><div class='add'>+ * being added to the folio after it was set dirty.</div><div class='add'>+ *</div><div class='add'>+ * Context: May only be called from process context.  Does not sleep.</div><div class='add'>+ * Caller must ensure that @folio cannot be truncated during this call,</div><div class='add'>+ * typically by holding the folio lock or having a page in the folio</div><div class='add'>+ * mapped and holding the page table lock.</div><div class='add'>+ *</div><div class='add'>+ * Return: True if the folio was dirtied; false if it was already dirtied.</div><div class='ctx'>  */</div><div class='ctx'> bool block_dirty_folio(struct address_space *mapping, struct folio *folio)</div><div class='ctx'> {</div><div class='hunk'>@@ -731,15 +747,12 @@ bool block_dirty_folio(struct address_space *mapping, struct folio *folio)</div><div class='ctx'> 	 * Lock out page's memcg migration to keep PageDirty</div><div class='ctx'> 	 * synchronized with per-memcg dirty page counters.</div><div class='ctx'> 	 */</div><div class='del'>-	folio_memcg_lock(folio);</div><div class='ctx'> 	newly_dirty = !folio_test_set_dirty(folio);</div><div class='ctx'> 	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (newly_dirty)</div><div class='ctx'> 		__folio_mark_dirty(folio, mapping, 1);</div><div class='ctx'> </div><div class='del'>-	folio_memcg_unlock(folio);</div><div class='del'>-</div><div class='ctx'> 	if (newly_dirty)</div><div class='ctx'> 		__mark_inode_dirty(mapping-&gt;host, I_DIRTY_PAGES);</div><div class='ctx'> </div><div class='hunk'>@@ -769,12 +782,11 @@ EXPORT_SYMBOL(block_dirty_folio);</div><div class='ctx'> static int fsync_buffers_list(spinlock_t *lock, struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	struct list_head tmp;</div><div class='ctx'> 	struct address_space *mapping;</div><div class='ctx'> 	int err = 0, err2;</div><div class='ctx'> 	struct blk_plug plug;</div><div class='add'>+	LIST_HEAD(tmp);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;tmp);</div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(lock);</div><div class='hunk'>@@ -851,8 +863,7 @@ static int fsync_buffers_list(spinlock_t *lock, struct list_head *list)</div><div class='ctx'>  * done a sync().  Just drop the buffers from the inode list.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: we take the inode's blockdev's mapping's i_private_lock.  Which</div><div class='del'>- * assumes that all the buffers are against the blockdev.  Not true</div><div class='del'>- * for reiserfs.</div><div class='add'>+ * assumes that all the buffers are against the blockdev.</div><div class='ctx'>  */</div><div class='ctx'> void invalidate_inode_buffers(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -953,12 +964,9 @@ no_grow:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(folio_alloc_buffers);</div><div class='ctx'> </div><div class='del'>-struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,</div><div class='del'>-				       bool retry)</div><div class='add'>+struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	gfp_t gfp = GFP_NOFS | __GFP_ACCOUNT;</div><div class='del'>-	if (retry)</div><div class='del'>-		gfp |= __GFP_NOFAIL;</div><div class='ctx'> </div><div class='ctx'> 	return folio_alloc_buffers(page_folio(page), size, gfp);</div><div class='ctx'> }</div><div class='hunk'>@@ -1034,12 +1042,12 @@ static sector_t folio_init_buffers(struct folio *folio,</div><div class='ctx'> static bool grow_dev_folio(struct block_device *bdev, sector_t block,</div><div class='ctx'> 		pgoff_t index, unsigned size, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = bdev-&gt;bd_inode;</div><div class='add'>+	struct address_space *mapping = bdev-&gt;bd_mapping;</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	sector_t end_block = 0;</div><div class='ctx'> </div><div class='del'>-	folio = __filemap_get_folio(inode-&gt;i_mapping, index,</div><div class='add'>+	folio = __filemap_get_folio(mapping, index,</div><div class='ctx'> 			FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1073,10 +1081,10 @@ static bool grow_dev_folio(struct block_device *bdev, sector_t block,</div><div class='ctx'> 	 * lock to be atomic wrt __find_get_block(), which does not</div><div class='ctx'> 	 * run under the folio lock.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;inode-&gt;i_mapping-&gt;i_private_lock);</div><div class='add'>+	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> 	link_dev_buffers(folio, bh);</div><div class='ctx'> 	end_block = folio_init_buffers(folio, bdev, size);</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_mapping-&gt;i_private_lock);</div><div class='add'>+	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> unlock:</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='hunk'>@@ -1112,27 +1120,26 @@ static struct buffer_head *</div><div class='ctx'> __getblk_slow(struct block_device *bdev, sector_t block,</div><div class='ctx'> 	     unsigned size, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	/* Size must be multiple of hard sectorsize */</div><div class='del'>-	if (unlikely(size &amp; (bdev_logical_block_size(bdev)-1) ||</div><div class='del'>-			(size &lt; 512 || size &gt; PAGE_SIZE))) {</div><div class='del'>-		printk(KERN_ERR "getblk(): invalid block size %d requested\n",</div><div class='del'>-					size);</div><div class='del'>-		printk(KERN_ERR "logical block size: %d\n",</div><div class='del'>-					bdev_logical_block_size(bdev));</div><div class='add'>+	bool blocking = gfpflags_allow_blocking(gfp);</div><div class='ctx'> </div><div class='del'>-		dump_stack();</div><div class='add'>+	if (WARN_ON_ONCE(!IS_ALIGNED(size, bdev_logical_block_size(bdev)))) {</div><div class='add'>+		printk(KERN_ERR "getblk(): block size %d not aligned to logical block size %d\n",</div><div class='add'>+		       size, bdev_logical_block_size(bdev));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-		bh = __find_get_block(bdev, block, size);</div><div class='del'>-		if (bh)</div><div class='del'>-			return bh;</div><div class='del'>-</div><div class='ctx'> 		if (!grow_buffers(bdev, block, size, gfp))</div><div class='ctx'> 			return NULL;</div><div class='add'>+</div><div class='add'>+		if (blocking)</div><div class='add'>+			bh = __find_get_block_nonatomic(bdev, block, size);</div><div class='add'>+		else</div><div class='add'>+			bh = __find_get_block(bdev, block, size);</div><div class='add'>+		if (bh)</div><div class='add'>+			return bh;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1193,13 +1200,11 @@ void mark_buffer_dirty(struct buffer_head *bh)</div><div class='ctx'> 		struct folio *folio = bh-&gt;b_folio;</div><div class='ctx'> 		struct address_space *mapping = NULL;</div><div class='ctx'> </div><div class='del'>-		folio_memcg_lock(folio);</div><div class='ctx'> 		if (!folio_test_set_dirty(folio)) {</div><div class='ctx'> 			mapping = folio-&gt;mapping;</div><div class='ctx'> 			if (mapping)</div><div class='ctx'> 				__folio_mark_dirty(folio, mapping, 0);</div><div class='ctx'> 		}</div><div class='del'>-		folio_memcg_unlock(folio);</div><div class='ctx'> 		if (mapping)</div><div class='ctx'> 			__mark_inode_dirty(mapping-&gt;host, I_DIRTY_PAGES);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1212,33 +1217,33 @@ void mark_buffer_write_io_error(struct buffer_head *bh)</div><div class='ctx'> 	/* FIXME: do we need to set this in both places? */</div><div class='ctx'> 	if (bh-&gt;b_folio &amp;&amp; bh-&gt;b_folio-&gt;mapping)</div><div class='ctx'> 		mapping_set_error(bh-&gt;b_folio-&gt;mapping, -EIO);</div><div class='del'>-	if (bh-&gt;b_assoc_map) {</div><div class='add'>+	if (bh-&gt;b_assoc_map)</div><div class='ctx'> 		mapping_set_error(bh-&gt;b_assoc_map, -EIO);</div><div class='del'>-		errseq_set(&amp;bh-&gt;b_assoc_map-&gt;host-&gt;i_sb-&gt;s_wb_err, -EIO);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mark_buffer_write_io_error);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Decrement a buffer_head's reference count.  If all buffers against a page</div><div class='del'>- * have zero reference count, are clean and unlocked, and if the page is clean</div><div class='del'>- * and unlocked then try_to_free_buffers() may strip the buffers from the page</div><div class='del'>- * in preparation for freeing it (sometimes, rarely, buffers are removed from</div><div class='del'>- * a page but it ends up not being freed, and buffers may later be reattached).</div><div class='add'>+/**</div><div class='add'>+ * __brelse - Release a buffer.</div><div class='add'>+ * @bh: The buffer to release.</div><div class='add'>+ *</div><div class='add'>+ * This variant of brelse() can be called if @bh is guaranteed to not be NULL.</div><div class='ctx'>  */</div><div class='del'>-void __brelse(struct buffer_head * buf)</div><div class='add'>+void __brelse(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_read(&amp;buf-&gt;b_count)) {</div><div class='del'>-		put_bh(buf);</div><div class='add'>+	if (atomic_read(&amp;bh-&gt;b_count)) {</div><div class='add'>+		put_bh(bh);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	WARN(1, KERN_ERR "VFS: brelse: Trying to free free buffer\n");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__brelse);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * bforget() is like brelse(), except it discards any</div><div class='del'>- * potentially dirty data.</div><div class='add'>+/**</div><div class='add'>+ * __bforget - Discard any dirty data in a buffer.</div><div class='add'>+ * @bh: The buffer to forget.</div><div class='add'>+ *</div><div class='add'>+ * This variant of bforget() can be called if @bh is guaranteed to not</div><div class='add'>+ * be NULL.</div><div class='ctx'>  */</div><div class='ctx'> void __bforget(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='hunk'>@@ -1389,16 +1394,18 @@ lookup_bh_lru(struct block_device *bdev, sector_t block, unsigned size)</div><div class='ctx'> /*</div><div class='ctx'>  * Perform a pagecache lookup for the matching buffer.  If it's there, refresh</div><div class='ctx'>  * it in the LRU and mark it as accessed.  If it is not present then return</div><div class='del'>- * NULL</div><div class='add'>+ * NULL. Atomic context callers may also return NULL if the buffer is being</div><div class='add'>+ * migrated; similarly the page is not marked accessed either.</div><div class='ctx'>  */</div><div class='del'>-struct buffer_head *</div><div class='del'>-__find_get_block(struct block_device *bdev, sector_t block, unsigned size)</div><div class='add'>+static struct buffer_head *</div><div class='add'>+find_get_block_common(struct block_device *bdev, sector_t block,</div><div class='add'>+			unsigned size, bool atomic)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh = lookup_bh_lru(bdev, block, size);</div><div class='ctx'> </div><div class='ctx'> 	if (bh == NULL) {</div><div class='ctx'> 		/* __find_get_block_slow will mark the page accessed */</div><div class='del'>-		bh = __find_get_block_slow(bdev, block);</div><div class='add'>+		bh = __find_get_block_slow(bdev, block, atomic);</div><div class='ctx'> 		if (bh)</div><div class='ctx'> 			bh_lru_install(bh);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1406,8 +1413,23 @@ __find_get_block(struct block_device *bdev, sector_t block, unsigned size)</div><div class='ctx'> </div><div class='ctx'> 	return bh;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct buffer_head *</div><div class='add'>+__find_get_block(struct block_device *bdev, sector_t block, unsigned size)</div><div class='add'>+{</div><div class='add'>+	return find_get_block_common(bdev, block, size, true);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(__find_get_block);</div><div class='ctx'> </div><div class='add'>+/* same as __find_get_block() but allows sleeping contexts */</div><div class='add'>+struct buffer_head *</div><div class='add'>+__find_get_block_nonatomic(struct block_device *bdev, sector_t block,</div><div class='add'>+			   unsigned size)</div><div class='add'>+{</div><div class='add'>+	return find_get_block_common(bdev, block, size, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__find_get_block_nonatomic);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bdev_getblk - Get a buffer_head in a block device's buffer cache.</div><div class='ctx'>  * @bdev: The block device.</div><div class='hunk'>@@ -1415,12 +1437,22 @@ EXPORT_SYMBOL(__find_get_block);</div><div class='ctx'>  * @size: The size of buffer_heads for this @bdev.</div><div class='ctx'>  * @gfp: The memory allocation flags to use.</div><div class='ctx'>  *</div><div class='add'>+ * The returned buffer head has its reference count incremented, but is</div><div class='add'>+ * not locked.  The caller should call brelse() when it has finished</div><div class='add'>+ * with the buffer.  The buffer may not be uptodate.  If needed, the</div><div class='add'>+ * caller can bring it uptodate either by reading it or overwriting it.</div><div class='add'>+ *</div><div class='ctx'>  * Return: The buffer head, or NULL if memory could not be allocated.</div><div class='ctx'>  */</div><div class='ctx'> struct buffer_head *bdev_getblk(struct block_device *bdev, sector_t block,</div><div class='ctx'> 		unsigned size, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct buffer_head *bh = __find_get_block(bdev, block, size);</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+</div><div class='add'>+	if (gfpflags_allow_blocking(gfp))</div><div class='add'>+		bh = __find_get_block_nonatomic(bdev, block, size);</div><div class='add'>+	else</div><div class='add'>+		bh = __find_get_block(bdev, block, size);</div><div class='ctx'> </div><div class='ctx'> 	might_alloc(gfp);</div><div class='ctx'> 	if (bh)</div><div class='hunk'>@@ -1446,24 +1478,33 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size)</div><div class='ctx'> EXPORT_SYMBOL(__breadahead);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  __bread_gfp() - reads a specified block and returns the bh</div><div class='del'>- *  @bdev: the block_device to read from</div><div class='del'>- *  @block: number of block</div><div class='del'>- *  @size: size (in bytes) to read</div><div class='del'>- *  @gfp: page allocation flag</div><div class='del'>- *</div><div class='del'>- *  Reads a specified block, and returns buffer head that contains it.</div><div class='del'>- *  The page cache can be allocated from non-movable area</div><div class='del'>- *  not to prevent page migration if you set gfp to zero.</div><div class='del'>- *  It returns NULL if the block was unreadable.</div><div class='add'>+ * __bread_gfp() - Read a block.</div><div class='add'>+ * @bdev: The block device to read from.</div><div class='add'>+ * @block: Block number in units of block size.</div><div class='add'>+ * @size: The block size of this device in bytes.</div><div class='add'>+ * @gfp: Not page allocation flags; see below.</div><div class='add'>+ *</div><div class='add'>+ * You are not expected to call this function.  You should use one of</div><div class='add'>+ * sb_bread(), sb_bread_unmovable() or __bread().</div><div class='add'>+ *</div><div class='add'>+ * Read a specified block, and return the buffer head that refers to it.</div><div class='add'>+ * If @gfp is 0, the memory will be allocated using the block device's</div><div class='add'>+ * default GFP flags.  If @gfp is __GFP_MOVABLE, the memory may be</div><div class='add'>+ * allocated from a movable area.  Do not pass in a complete set of</div><div class='add'>+ * GFP flags.</div><div class='add'>+ *</div><div class='add'>+ * The returned buffer head has its refcount increased.  The caller should</div><div class='add'>+ * call brelse() when it has finished with the buffer.</div><div class='add'>+ *</div><div class='add'>+ * Context: May sleep waiting for I/O.</div><div class='add'>+ * Return: NULL if the block was unreadable.</div><div class='ctx'>  */</div><div class='del'>-struct buffer_head *</div><div class='del'>-__bread_gfp(struct block_device *bdev, sector_t block,</div><div class='del'>-		   unsigned size, gfp_t gfp)</div><div class='add'>+struct buffer_head *__bread_gfp(struct block_device *bdev, sector_t block,</div><div class='add'>+		unsigned size, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-	gfp |= mapping_gfp_constraint(bdev-&gt;bd_inode-&gt;i_mapping, ~__GFP_FS);</div><div class='add'>+	gfp |= mapping_gfp_constraint(bdev-&gt;bd_mapping, ~__GFP_FS);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prefer looping in the allocator rather than here, at least that</div><div class='hunk'>@@ -1567,8 +1608,8 @@ static void discard_buffer(struct buffer_head * bh)</div><div class='ctx'> 	bh-&gt;b_bdev = NULL;</div><div class='ctx'> 	b_state = READ_ONCE(bh-&gt;b_state);</div><div class='ctx'> 	do {</div><div class='del'>-	} while (!try_cmpxchg(&amp;bh-&gt;b_state, &amp;b_state,</div><div class='del'>-			      b_state &amp; ~BUFFER_FLAGS_DISCARD));</div><div class='add'>+	} while (!try_cmpxchg_relaxed(&amp;bh-&gt;b_state, &amp;b_state,</div><div class='add'>+				      b_state &amp; ~BUFFER_FLAGS_DISCARD));</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1632,7 +1673,7 @@ void block_invalidate_folio(struct folio *folio, size_t offset, size_t length)</div><div class='ctx'> 	if (length == folio_size(folio))</div><div class='ctx'> 		filemap_release_folio(folio, 0);</div><div class='ctx'> out:</div><div class='del'>-	return;</div><div class='add'>+	folio_clear_mappedtodisk(folio);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(block_invalidate_folio);</div><div class='ctx'> </div><div class='hunk'>@@ -1696,16 +1737,16 @@ EXPORT_SYMBOL(create_empty_buffers);</div><div class='ctx'>  */</div><div class='ctx'> void clean_bdev_aliases(struct block_device *bdev, sector_t block, sector_t len)</div><div class='ctx'> {</div><div class='del'>-	struct inode *bd_inode = bdev-&gt;bd_inode;</div><div class='del'>-	struct address_space *bd_mapping = bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *bd_mapping = bdev-&gt;bd_mapping;</div><div class='add'>+	const int blkbits = bd_mapping-&gt;host-&gt;i_blkbits;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='del'>-	pgoff_t index = ((loff_t)block &lt;&lt; bd_inode-&gt;i_blkbits) / PAGE_SIZE;</div><div class='add'>+	pgoff_t index = ((loff_t)block &lt;&lt; blkbits) / PAGE_SIZE;</div><div class='ctx'> 	pgoff_t end;</div><div class='ctx'> 	int i, count;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct buffer_head *head;</div><div class='ctx'> </div><div class='del'>-	end = ((loff_t)(block + len - 1) &lt;&lt; bd_inode-&gt;i_blkbits) / PAGE_SIZE;</div><div class='add'>+	end = ((loff_t)(block + len - 1) &lt;&lt; blkbits) / PAGE_SIZE;</div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='ctx'> 	while (filemap_get_folios(bd_mapping, &amp;index, end, &amp;fbatch)) {</div><div class='ctx'> 		count = folio_batch_count(&amp;fbatch);</div><div class='hunk'>@@ -1889,7 +1930,8 @@ int __block_write_full_folio(struct inode *inode, struct folio *folio,</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='ctx'> 		if (buffer_async_write(bh)) {</div><div class='del'>-			submit_bh_wbc(REQ_OP_WRITE | write_flags, bh, wbc);</div><div class='add'>+			submit_bh_wbc(REQ_OP_WRITE | write_flags, bh,</div><div class='add'>+				      inode-&gt;i_write_hint, wbc);</div><div class='ctx'> 			nr_underway++;</div><div class='ctx'> 		}</div><div class='ctx'> 		bh = next;</div><div class='hunk'>@@ -1936,7 +1978,6 @@ recover:</div><div class='ctx'> 			clear_buffer_dirty(bh);</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	folio_set_error(folio);</div><div class='ctx'> 	BUG_ON(folio_test_writeback(folio));</div><div class='ctx'> 	mapping_set_error(folio-&gt;mapping, err);</div><div class='ctx'> 	folio_start_writeback(folio);</div><div class='hunk'>@@ -1944,7 +1985,8 @@ recover:</div><div class='ctx'> 		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='ctx'> 		if (buffer_async_write(bh)) {</div><div class='ctx'> 			clear_buffer_dirty(bh);</div><div class='del'>-			submit_bh_wbc(REQ_OP_WRITE | write_flags, bh, wbc);</div><div class='add'>+			submit_bh_wbc(REQ_OP_WRITE | write_flags, bh,</div><div class='add'>+				      inode-&gt;i_write_hint, wbc);</div><div class='ctx'> 			nr_underway++;</div><div class='ctx'> 		}</div><div class='ctx'> 		bh = next;</div><div class='hunk'>@@ -2146,15 +2188,14 @@ int __block_write_begin_int(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __block_write_begin(struct page *page, loff_t pos, unsigned len,</div><div class='add'>+int __block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'> 		get_block_t *get_block)</div><div class='ctx'> {</div><div class='del'>-	return __block_write_begin_int(page_folio(page), pos, len, get_block,</div><div class='del'>-				       NULL);</div><div class='add'>+	return __block_write_begin_int(folio, pos, len, get_block, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__block_write_begin);</div><div class='ctx'> </div><div class='del'>-static void __block_commit_write(struct folio *folio, size_t from, size_t to)</div><div class='add'>+void block_commit_write(struct folio *folio, size_t from, size_t to)</div><div class='ctx'> {</div><div class='ctx'> 	size_t block_start, block_end;</div><div class='ctx'> 	bool partial = false;</div><div class='hunk'>@@ -2162,6 +2203,8 @@ static void __block_commit_write(struct folio *folio, size_t from, size_t to)</div><div class='ctx'> 	struct buffer_head *bh, *head;</div><div class='ctx'> </div><div class='ctx'> 	bh = head = folio_buffers(folio);</div><div class='add'>+	if (!bh)</div><div class='add'>+		return;</div><div class='ctx'> 	blocksize = bh-&gt;b_size;</div><div class='ctx'> </div><div class='ctx'> 	block_start = 0;</div><div class='hunk'>@@ -2190,6 +2233,7 @@ static void __block_commit_write(struct folio *folio, size_t from, size_t to)</div><div class='ctx'> 	if (!partial)</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(block_commit_write);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * block_write_begin takes care of the basic task of block allocation and</div><div class='hunk'>@@ -2198,33 +2242,32 @@ static void __block_commit_write(struct folio *folio, size_t from, size_t to)</div><div class='ctx'>  * The filesystem needs to handle block truncation upon failure.</div><div class='ctx'>  */</div><div class='ctx'> int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,</div><div class='del'>-		struct page **pagep, get_block_t *get_block)</div><div class='add'>+		struct folio **foliop, get_block_t *get_block)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	page = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	status = __block_write_begin(page, pos, len, get_block);</div><div class='add'>+	status = __block_write_begin_int(folio, pos, len, get_block, NULL);</div><div class='ctx'> 	if (unlikely(status)) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		page = NULL;</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='add'>+		folio = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pagep = page;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(block_write_begin);</div><div class='ctx'> </div><div class='del'>-int block_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+int block_write_end(loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	size_t start = pos - folio_pos(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(copied &lt; len)) {</div><div class='hunk'>@@ -2248,27 +2291,27 @@ int block_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 	/* This could be a short (even 0-length) commit */</div><div class='del'>-	__block_commit_write(folio, start, start + copied);</div><div class='add'>+	block_commit_write(folio, start, start + copied);</div><div class='ctx'> </div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(block_write_end);</div><div class='ctx'> </div><div class='del'>-int generic_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+int generic_write_end(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		      loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+		      struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	loff_t old_size = inode-&gt;i_size;</div><div class='ctx'> 	bool i_size_changed = false;</div><div class='ctx'> </div><div class='del'>-	copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);</div><div class='add'>+	copied = block_write_end(pos, len, copied, folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No need to use i_size_read() here, the i_size cannot change under us</div><div class='ctx'> 	 * because we hold i_rwsem.</div><div class='ctx'> 	 *</div><div class='del'>-	 * But it's important to update i_size while still holding page lock:</div><div class='add'>+	 * But it's important to update i_size while still holding folio lock:</div><div class='ctx'> 	 * page writeout could otherwise come in and zero beyond i_size.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pos + copied &gt; inode-&gt;i_size) {</div><div class='hunk'>@@ -2276,8 +2319,8 @@ int generic_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		i_size_changed = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (old_size &lt; pos)</div><div class='ctx'> 		pagecache_isize_extended(inode, old_size, pos);</div><div class='hunk'>@@ -2347,9 +2390,8 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	sector_t iblock, lblock;</div><div class='del'>-	struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];</div><div class='add'>+	struct buffer_head *bh, *head, *prev = NULL;</div><div class='ctx'> 	size_t blocksize;</div><div class='del'>-	int nr, i;</div><div class='ctx'> 	int fully_mapped = 1;</div><div class='ctx'> 	bool page_error = false;</div><div class='ctx'> 	loff_t limit = i_size_read(inode);</div><div class='hunk'>@@ -2358,16 +2400,12 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_FS_VERITY) &amp;&amp; IS_VERITY(inode))</div><div class='ctx'> 		limit = inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='ctx'> </div><div class='del'>-	VM_BUG_ON_FOLIO(folio_test_large(folio), folio);</div><div class='del'>-</div><div class='ctx'> 	head = folio_create_buffers(folio, inode, 0);</div><div class='ctx'> 	blocksize = head-&gt;b_size;</div><div class='ctx'> </div><div class='ctx'> 	iblock = div_u64(folio_pos(folio), blocksize);</div><div class='ctx'> 	lblock = div_u64(limit + blocksize - 1, blocksize);</div><div class='ctx'> 	bh = head;</div><div class='del'>-	nr = 0;</div><div class='del'>-	i = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if (buffer_uptodate(bh))</div><div class='hunk'>@@ -2380,13 +2418,11 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)</div><div class='ctx'> 			if (iblock &lt; lblock) {</div><div class='ctx'> 				WARN_ON(bh-&gt;b_size != blocksize);</div><div class='ctx'> 				err = get_block(inode, iblock, bh, 0);</div><div class='del'>-				if (err) {</div><div class='del'>-					folio_set_error(folio);</div><div class='add'>+				if (err)</div><div class='ctx'> 					page_error = true;</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!buffer_mapped(bh)) {</div><div class='del'>-				folio_zero_range(folio, i * blocksize,</div><div class='add'>+				folio_zero_range(folio, bh_offset(bh),</div><div class='ctx'> 						blocksize);</div><div class='ctx'> 				if (!err)</div><div class='ctx'> 					set_buffer_uptodate(bh);</div><div class='hunk'>@@ -2399,40 +2435,33 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)</div><div class='ctx'> 			if (buffer_uptodate(bh))</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='del'>-		arr[nr++] = bh;</div><div class='del'>-	} while (i++, iblock++, (bh = bh-&gt;b_this_page) != head);</div><div class='ctx'> </div><div class='del'>-	if (fully_mapped)</div><div class='del'>-		folio_set_mappedtodisk(folio);</div><div class='del'>-</div><div class='del'>-	if (!nr) {</div><div class='del'>-		/*</div><div class='del'>-		 * All buffers are uptodate or get_block() returned an</div><div class='del'>-		 * error when trying to map them - we can finish the read.</div><div class='del'>-		 */</div><div class='del'>-		folio_end_read(folio, !page_error);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Stage two: lock the buffers */</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		bh = arr[i];</div><div class='ctx'> 		lock_buffer(bh);</div><div class='add'>+		if (buffer_uptodate(bh)) {</div><div class='add'>+			unlock_buffer(bh);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		mark_buffer_async_read(bh);</div><div class='del'>-	}</div><div class='add'>+		if (prev)</div><div class='add'>+			submit_bh(REQ_OP_READ, prev);</div><div class='add'>+		prev = bh;</div><div class='add'>+	} while (iblock++, (bh = bh-&gt;b_this_page) != head);</div><div class='add'>+</div><div class='add'>+	if (fully_mapped)</div><div class='add'>+		folio_set_mappedtodisk(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Stage 3: start the IO.  Check for uptodateness</div><div class='del'>-	 * inside the buffer lock in case another process reading</div><div class='del'>-	 * the underlying blockdev brought it uptodate (the sct fix).</div><div class='add'>+	 * All buffers are uptodate or get_block() returned an error</div><div class='add'>+	 * when trying to map them - we must finish the read because</div><div class='add'>+	 * end_buffer_async_read() will never be called on any buffer</div><div class='add'>+	 * in this folio.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		bh = arr[i];</div><div class='del'>-		if (buffer_uptodate(bh))</div><div class='del'>-			end_buffer_async_read(bh, 1);</div><div class='del'>-		else</div><div class='del'>-			submit_bh(REQ_OP_READ, bh);</div><div class='del'>-	}</div><div class='add'>+	if (prev)</div><div class='add'>+		submit_bh(REQ_OP_READ, prev);</div><div class='add'>+	else</div><div class='add'>+		folio_end_read(folio, !page_error);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(block_read_full_folio);</div><div class='hunk'>@@ -2445,7 +2474,7 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	const struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	void *fsdata = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2453,11 +2482,11 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = aops-&gt;write_begin(NULL, mapping, size, 0, &amp;page, &amp;fsdata);</div><div class='add'>+	err = aops-&gt;write_begin(NULL, mapping, size, 0, &amp;folio, &amp;fsdata);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = aops-&gt;write_end(NULL, mapping, size, 0, 0, page, fsdata);</div><div class='add'>+	err = aops-&gt;write_end(NULL, mapping, size, 0, 0, folio, fsdata);</div><div class='ctx'> 	BUG_ON(err &gt; 0);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -2465,13 +2494,14 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(generic_cont_expand_simple);</div><div class='ctx'> </div><div class='del'>-static int cont_expand_zero(struct file *file, struct address_space *mapping,</div><div class='add'>+static int cont_expand_zero(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='ctx'> 			    loff_t pos, loff_t *bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	const struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='ctx'> 	unsigned int blocksize = i_blocksize(inode);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	void *fsdata = NULL;</div><div class='ctx'> 	pgoff_t index, curidx;</div><div class='ctx'> 	loff_t curpos;</div><div class='hunk'>@@ -2489,13 +2519,13 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		}</div><div class='ctx'> 		len = PAGE_SIZE - zerofrom;</div><div class='ctx'> </div><div class='del'>-		err = aops-&gt;write_begin(file, mapping, curpos, len,</div><div class='del'>-					    &amp;page, &amp;fsdata);</div><div class='add'>+		err = aops-&gt;write_begin(iocb, mapping, curpos, len,</div><div class='add'>+					    &amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='del'>-		zero_user(page, zerofrom, len);</div><div class='del'>-		err = aops-&gt;write_end(file, mapping, curpos, len, len,</div><div class='del'>-						page, fsdata);</div><div class='add'>+		folio_zero_range(folio, offset_in_folio(folio, curpos), len);</div><div class='add'>+		err = aops-&gt;write_end(iocb, mapping, curpos, len, len,</div><div class='add'>+						folio, fsdata);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		BUG_ON(err != len);</div><div class='hunk'>@@ -2522,13 +2552,13 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		}</div><div class='ctx'> 		len = offset - zerofrom;</div><div class='ctx'> </div><div class='del'>-		err = aops-&gt;write_begin(file, mapping, curpos, len,</div><div class='del'>-					    &amp;page, &amp;fsdata);</div><div class='add'>+		err = aops-&gt;write_begin(iocb, mapping, curpos, len,</div><div class='add'>+					    &amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='del'>-		zero_user(page, zerofrom, len);</div><div class='del'>-		err = aops-&gt;write_end(file, mapping, curpos, len, len,</div><div class='del'>-						page, fsdata);</div><div class='add'>+		folio_zero_range(folio, offset_in_folio(folio, curpos), len);</div><div class='add'>+		err = aops-&gt;write_end(iocb, mapping, curpos, len, len,</div><div class='add'>+						folio, fsdata);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		BUG_ON(err != len);</div><div class='hunk'>@@ -2542,17 +2572,16 @@ out:</div><div class='ctx'>  * For moronic filesystems that do not allow holes in file.</div><div class='ctx'>  * We may have to extend the file.</div><div class='ctx'>  */</div><div class='del'>-int cont_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata,</div><div class='del'>-			get_block_t *get_block, loff_t *bytes)</div><div class='add'>+int cont_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		     loff_t pos, unsigned len, struct folio **foliop,</div><div class='add'>+		     void **fsdata, get_block_t *get_block, loff_t *bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	unsigned int blocksize = i_blocksize(inode);</div><div class='ctx'> 	unsigned int zerofrom;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = cont_expand_zero(file, mapping, pos, bytes);</div><div class='add'>+	err = cont_expand_zero(iocb, mapping, pos, bytes);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2562,17 +2591,10 @@ int cont_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 		(*bytes)++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return block_write_begin(mapping, pos, len, pagep, get_block);</div><div class='add'>+	return block_write_begin(mapping, pos, len, foliop, get_block);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cont_write_begin);</div><div class='ctx'> </div><div class='del'>-void block_commit_write(struct page *page, unsigned from, unsigned to)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	__block_commit_write(folio, from, to);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(block_commit_write);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * block_page_mkwrite() is not allowed to change the file size as it gets</div><div class='ctx'>  * called from a page fault handler when a page is first dirtied. Hence we must</div><div class='hunk'>@@ -2581,7 +2603,7 @@ EXPORT_SYMBOL(block_commit_write);</div><div class='ctx'>  * holes and correct delalloc and unwritten extent mapping on filesystems that</div><div class='ctx'>  * support these features.</div><div class='ctx'>  *</div><div class='del'>- * We are not allowed to take the i_mutex here so we have to play games to</div><div class='add'>+ * We are not allowed to take the i_rwsem here so we have to play games to</div><div class='ctx'>  * protect against truncate races as the page could now be beyond EOF.  Because</div><div class='ctx'>  * truncate writes the inode size before removing pages, once we have the</div><div class='ctx'>  * page lock we can determine safely if the page is beyond EOF. If it is not</div><div class='hunk'>@@ -2618,7 +2640,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	__block_commit_write(folio, 0, end);</div><div class='add'>+	block_commit_write(folio, 0, end);</div><div class='ctx'> </div><div class='ctx'> 	folio_mark_dirty(folio);</div><div class='ctx'> 	folio_wait_stable(folio);</div><div class='hunk'>@@ -2701,7 +2723,7 @@ unlock:</div><div class='ctx'> EXPORT_SYMBOL(block_truncate_page);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The generic -&gt;writepage function for buffer-backed address_spaces</div><div class='add'>+ * The generic write folio function for buffer-backed address_spaces</div><div class='ctx'>  */</div><div class='ctx'> int block_write_full_folio(struct folio *folio, struct writeback_control *wbc,</div><div class='ctx'> 		void *get_block)</div><div class='hunk'>@@ -2710,7 +2732,7 @@ int block_write_full_folio(struct folio *folio, struct writeback_control *wbc,</div><div class='ctx'> 	loff_t i_size = i_size_read(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* Is the folio fully inside i_size? */</div><div class='del'>-	if (folio_pos(folio) + folio_size(folio) &lt;= i_size)</div><div class='add'>+	if (folio_next_pos(folio) &lt;= i_size)</div><div class='ctx'> 		return __block_write_full_folio(inode, folio, get_block, wbc);</div><div class='ctx'> </div><div class='ctx'> 	/* Is the folio fully outside i_size? (truncate in progress) */</div><div class='hunk'>@@ -2721,7 +2743,7 @@ int block_write_full_folio(struct folio *folio, struct writeback_control *wbc,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The folio straddles i_size.  It must be zeroed out on each and every</div><div class='del'>-	 * writepage invocation because it may be mmapped.  "A file is mapped</div><div class='add'>+	 * writeback invocation because it may be mmapped.  "A file is mapped</div><div class='ctx'> 	 * in multiples of the page size.  For a file that is not a multiple of</div><div class='ctx'> 	 * the page size, the remaining memory is zeroed when mapped, and</div><div class='ctx'> 	 * writes to that region are not written out to the file."</div><div class='hunk'>@@ -2756,6 +2778,7 @@ static void end_bio_bh_io_sync(struct bio *bio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,</div><div class='add'>+			  enum rw_hint write_hint,</div><div class='ctx'> 			  struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	const enum req_op op = opf &amp; REQ_OP_MASK;</div><div class='hunk'>@@ -2783,8 +2806,9 @@ static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,</div><div class='ctx'> 	fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO);</div><div class='ctx'> </div><div class='ctx'> 	bio-&gt;bi_iter.bi_sector = bh-&gt;b_blocknr * (bh-&gt;b_size &gt;&gt; 9);</div><div class='add'>+	bio-&gt;bi_write_hint = write_hint;</div><div class='ctx'> </div><div class='del'>-	__bio_add_page(bio, bh-&gt;b_page, bh-&gt;b_size, bh_offset(bh));</div><div class='add'>+	bio_add_folio_nofail(bio, bh-&gt;b_folio, bh-&gt;b_size, bh_offset(bh));</div><div class='ctx'> </div><div class='ctx'> 	bio-&gt;bi_end_io = end_bio_bh_io_sync;</div><div class='ctx'> 	bio-&gt;bi_private = bh;</div><div class='hunk'>@@ -2794,7 +2818,7 @@ static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,</div><div class='ctx'> </div><div class='ctx'> 	if (wbc) {</div><div class='ctx'> 		wbc_init_bio(wbc, bio);</div><div class='del'>-		wbc_account_cgroup_owner(wbc, bh-&gt;b_page, bh-&gt;b_size);</div><div class='add'>+		wbc_account_cgroup_owner(wbc, bh-&gt;b_folio, bh-&gt;b_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	submit_bio(bio);</div><div class='hunk'>@@ -2802,7 +2826,7 @@ static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,</div><div class='ctx'> </div><div class='ctx'> void submit_bh(blk_opf_t opf, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	submit_bh_wbc(opf, bh, NULL);</div><div class='add'>+	submit_bh_wbc(opf, bh, WRITE_LIFE_NOT_SET, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(submit_bh);</div><div class='ctx'> </div><div class='hunk'>@@ -2857,26 +2881,6 @@ int sync_dirty_buffer(struct buffer_head *bh)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sync_dirty_buffer);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * try_to_free_buffers() checks if all the buffers on this particular folio</div><div class='del'>- * are unused, and releases them if so.</div><div class='del'>- *</div><div class='del'>- * Exclusion against try_to_free_buffers may be obtained by either</div><div class='del'>- * locking the folio or by holding its mapping's i_private_lock.</div><div class='del'>- *</div><div class='del'>- * If the folio is dirty but all the buffers are clean then we need to</div><div class='del'>- * be sure to mark the folio clean as well.  This is because the folio</div><div class='del'>- * may be against a block device, and a later reattachment of buffers</div><div class='del'>- * to a dirty folio will set *all* buffers dirty.  Which would corrupt</div><div class='del'>- * filesystem data on the same device.</div><div class='del'>- *</div><div class='del'>- * The same applies to regular filesystem folios: if all the buffers are</div><div class='del'>- * clean then we set the folio clean and proceed.  To do that, we require</div><div class='del'>- * total exclusion from block_dirty_folio().  That is obtained with</div><div class='del'>- * i_private_lock.</div><div class='del'>- *</div><div class='del'>- * try_to_free_buffers() is non-blocking.</div><div class='del'>- */</div><div class='ctx'> static inline int buffer_busy(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_read(&amp;bh-&gt;b_count) |</div><div class='hunk'>@@ -2910,6 +2914,30 @@ failed:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * try_to_free_buffers - Release buffers attached to this folio.</div><div class='add'>+ * @folio: The folio.</div><div class='add'>+ *</div><div class='add'>+ * If any buffers are in use (dirty, under writeback, elevated refcount),</div><div class='add'>+ * no buffers will be freed.</div><div class='add'>+ *</div><div class='add'>+ * If the folio is dirty but all the buffers are clean then we need to</div><div class='add'>+ * be sure to mark the folio clean as well.  This is because the folio</div><div class='add'>+ * may be against a block device, and a later reattachment of buffers</div><div class='add'>+ * to a dirty folio will set *all* buffers dirty.  Which would corrupt</div><div class='add'>+ * filesystem data on the same device.</div><div class='add'>+ *</div><div class='add'>+ * The same applies to regular filesystem folios: if all the buffers are</div><div class='add'>+ * clean then we set the folio clean and proceed.  To do that, we require</div><div class='add'>+ * total exclusion from block_dirty_folio().  That is obtained with</div><div class='add'>+ * i_private_lock.</div><div class='add'>+ *</div><div class='add'>+ * Exclusion against try_to_free_buffers may be obtained by either</div><div class='add'>+ * locking the folio or by holding its mapping's i_private_lock.</div><div class='add'>+ *</div><div class='add'>+ * Context: Process context.  @folio must be locked.  Will not sleep.</div><div class='add'>+ * Return: true if all buffers attached to this folio were freed.</div><div class='add'>+ */</div><div class='ctx'> bool try_to_free_buffers(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space * const mapping = folio-&gt;mapping;</div><div class='hunk'>@@ -3121,12 +3149,8 @@ void __init buffer_init(void)</div><div class='ctx'> 	unsigned long nrpages;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	bh_cachep = kmem_cache_create("buffer_head",</div><div class='del'>-			sizeof(struct buffer_head), 0,</div><div class='del'>-				(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|</div><div class='del'>-				SLAB_MEM_SPREAD),</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='add'>+	bh_cachep = KMEM_CACHE(buffer_head,</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT|SLAB_PANIC);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Limit the bh occupancy to 10% of ZONE_NORMAL</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/fs/cachefiles/cache.c b/fs/cachefiles/cache.c<br/>index 7077f72e6f47..9fb06dc16520 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/cache.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;trace/events/fscache.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -168,6 +169,8 @@ error_unsupported:</div><div class='ctx'> 	dput(root);</div><div class='ctx'> error_open_root:</div><div class='ctx'> 	cachefiles_end_secure(cache, saved_cred);</div><div class='add'>+	put_cred(cache-&gt;cache_cred);</div><div class='add'>+	cache-&gt;cache_cred = NULL;</div><div class='ctx'> error_getsec:</div><div class='ctx'> 	fscache_relinquish_cache(cache_cookie);</div><div class='ctx'> 	cache-&gt;cache = NULL;</div><div class='hunk'>@@ -310,19 +313,59 @@ static void cachefiles_withdraw_objects(struct cachefiles_cache *cache)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Withdraw volumes.</div><div class='add'>+ * Withdraw fscache volumes.</div><div class='add'>+ */</div><div class='add'>+static void cachefiles_withdraw_fscache_volumes(struct cachefiles_cache *cache)</div><div class='add'>+{</div><div class='add'>+	struct list_head *cur;</div><div class='add'>+	struct cachefiles_volume *volume;</div><div class='add'>+	struct fscache_volume *vcookie;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+retry:</div><div class='add'>+	spin_lock(&amp;cache-&gt;object_list_lock);</div><div class='add'>+	list_for_each(cur, &amp;cache-&gt;volumes) {</div><div class='add'>+		volume = list_entry(cur, struct cachefiles_volume, cache_link);</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;volume-&gt;vcookie-&gt;n_accesses) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		vcookie = fscache_try_get_volume(volume-&gt;vcookie,</div><div class='add'>+						 fscache_volume_get_withdraw);</div><div class='add'>+		if (vcookie) {</div><div class='add'>+			spin_unlock(&amp;cache-&gt;object_list_lock);</div><div class='add'>+			fscache_withdraw_volume(vcookie);</div><div class='add'>+			fscache_put_volume(vcookie, fscache_volume_put_withdraw);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;cache-&gt;object_list_lock);</div><div class='add'>+</div><div class='add'>+	_leave("");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Withdraw cachefiles volumes.</div><div class='ctx'>  */</div><div class='ctx'> static void cachefiles_withdraw_volumes(struct cachefiles_cache *cache)</div><div class='ctx'> {</div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='add'>+		struct fscache_volume *vcookie = NULL;</div><div class='ctx'> 		struct cachefiles_volume *volume = NULL;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;cache-&gt;object_list_lock);</div><div class='ctx'> 		if (!list_empty(&amp;cache-&gt;volumes)) {</div><div class='ctx'> 			volume = list_first_entry(&amp;cache-&gt;volumes,</div><div class='ctx'> 						  struct cachefiles_volume, cache_link);</div><div class='add'>+			vcookie = fscache_try_get_volume(volume-&gt;vcookie,</div><div class='add'>+							 fscache_volume_get_withdraw);</div><div class='add'>+			if (!vcookie) {</div><div class='add'>+				spin_unlock(&amp;cache-&gt;object_list_lock);</div><div class='add'>+				cpu_relax();</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			list_del_init(&amp;volume-&gt;cache_link);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;cache-&gt;object_list_lock);</div><div class='hunk'>@@ -330,6 +373,7 @@ static void cachefiles_withdraw_volumes(struct cachefiles_cache *cache)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		cachefiles_withdraw_volume(volume);</div><div class='add'>+		fscache_put_volume(vcookie, fscache_volume_put_withdraw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	_leave("");</div><div class='hunk'>@@ -369,6 +413,7 @@ void cachefiles_withdraw_cache(struct cachefiles_cache *cache)</div><div class='ctx'> 	pr_info("File cache on %s unregistering\n", fscache-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	fscache_withdraw_cache(fscache);</div><div class='add'>+	cachefiles_withdraw_fscache_volumes(cache);</div><div class='ctx'> </div><div class='ctx'> 	/* we now have to destroy all the active objects pertaining to this</div><div class='ctx'> 	 * cache - which we do by passing them off to thread pool to be</div><div class='head'>diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c<br/>index 3f24905f4066..1806bff8e59b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/daemon.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/daemon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/daemon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/daemon.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -133,7 +134,7 @@ static int cachefiles_daemon_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cachefiles_flush_reqs(struct cachefiles_cache *cache)</div><div class='add'>+void cachefiles_flush_reqs(struct cachefiles_cache *cache)</div><div class='ctx'> {</div><div class='ctx'> 	struct xarray *xa = &amp;cache-&gt;reqs;</div><div class='ctx'> 	struct cachefiles_req *req;</div><div class='hunk'>@@ -159,6 +160,7 @@ static void cachefiles_flush_reqs(struct cachefiles_cache *cache)</div><div class='ctx'> 	xa_for_each(xa, index, req) {</div><div class='ctx'> 		req-&gt;error = -EIO;</div><div class='ctx'> 		complete(&amp;req-&gt;done);</div><div class='add'>+		__xa_erase(xa, index);</div><div class='ctx'> 	}</div><div class='ctx'> 	xa_unlock(xa);</div><div class='ctx'> </div><div class='hunk'>@@ -365,14 +367,14 @@ static __poll_t cachefiles_daemon_poll(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	if (cachefiles_in_ondemand_mode(cache)) {</div><div class='ctx'> 		if (!xa_empty(&amp;cache-&gt;reqs)) {</div><div class='del'>-			rcu_read_lock();</div><div class='add'>+			xas_lock(&amp;xas);</div><div class='ctx'> 			xas_for_each_marked(&amp;xas, req, ULONG_MAX, CACHEFILES_REQ_NEW) {</div><div class='ctx'> 				if (!cachefiles_ondemand_is_reopening_read(req)) {</div><div class='ctx'> 					mask |= EPOLLIN;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			rcu_read_unlock();</div><div class='add'>+			xas_unlock(&amp;xas);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (test_bit(CACHEFILES_STATE_CHANGED, &amp;cache-&gt;flags))</div><div class='hunk'>@@ -575,7 +577,7 @@ static int cachefiles_daemon_dir(struct cachefiles_cache *cache, char *args)</div><div class='ctx'>  */</div><div class='ctx'> static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> {</div><div class='del'>-	char *secctx;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	_enter(",%s", args);</div><div class='ctx'> </div><div class='hunk'>@@ -584,16 +586,16 @@ static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cache-&gt;secctx) {</div><div class='add'>+	if (cache-&gt;have_secid) {</div><div class='ctx'> 		pr_err("Second security context specified\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	secctx = kstrdup(args, GFP_KERNEL);</div><div class='del'>-	if (!secctx)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	err = security_secctx_to_secid(args, strlen(args), &amp;cache-&gt;secid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	cache-&gt;secctx = secctx;</div><div class='add'>+	cache-&gt;have_secid = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -816,9 +818,9 @@ static void cachefiles_daemon_unbind(struct cachefiles_cache *cache)</div><div class='ctx'> 	cachefiles_put_directory(cache-&gt;graveyard);</div><div class='ctx'> 	cachefiles_put_directory(cache-&gt;store);</div><div class='ctx'> 	mntput(cache-&gt;mnt);</div><div class='add'>+	put_cred(cache-&gt;cache_cred);</div><div class='ctx'> </div><div class='ctx'> 	kfree(cache-&gt;rootdirname);</div><div class='del'>-	kfree(cache-&gt;secctx);</div><div class='ctx'> 	kfree(cache-&gt;tag);</div><div class='ctx'> </div><div class='ctx'> 	_leave("");</div><div class='head'>diff --git a/fs/cachefiles/error_inject.c b/fs/cachefiles/error_inject.c<br/>index 1715d5ca2b2d..e341ade47dd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/error_inject.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/error_inject.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/error_inject.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/error_inject.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> unsigned int cachefiles_error_injection_state;</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *cachefiles_sysctl;</div><div class='del'>-static struct ctl_table cachefiles_sysctls[] = {</div><div class='add'>+static const struct ctl_table cachefiles_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "error_injection",</div><div class='ctx'> 		.data		= &amp;cachefiles_error_injection_state,</div><div class='head'>diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c<br/>index 35ba2117a6f6..a08250d244ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/interface.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/interface.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/interface.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/interface.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='ctx'> #include &lt;trace/events/fscache.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -327,6 +328,8 @@ static void cachefiles_commit_object(struct cachefiles_object *object,</div><div class='ctx'> static void cachefiles_clean_up_object(struct cachefiles_object *object,</div><div class='ctx'> 				       struct cachefiles_cache *cache)</div><div class='ctx'> {</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(FSCACHE_COOKIE_RETIRED, &amp;object-&gt;cookie-&gt;flags)) {</div><div class='ctx'> 		if (!test_bit(CACHEFILES_OBJECT_USING_TMPFILE, &amp;object-&gt;flags)) {</div><div class='ctx'> 			cachefiles_see_object(object, cachefiles_obj_see_clean_delete);</div><div class='hunk'>@@ -342,10 +345,14 @@ static void cachefiles_clean_up_object(struct cachefiles_object *object,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cachefiles_unmark_inode_in_use(object, object-&gt;file);</div><div class='del'>-	if (object-&gt;file) {</div><div class='del'>-		fput(object-&gt;file);</div><div class='del'>-		object-&gt;file = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;object-&gt;lock);</div><div class='add'>+	file = object-&gt;file;</div><div class='add'>+	object-&gt;file = NULL;</div><div class='add'>+	spin_unlock(&amp;object-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (file)</div><div class='add'>+		fput(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -422,11 +429,13 @@ static bool cachefiles_invalidate_cookie(struct fscache_cookie *cookie)</div><div class='ctx'> 		if (!old_tmpfile) {</div><div class='ctx'> 			struct cachefiles_volume *volume = object-&gt;volume;</div><div class='ctx'> 			struct dentry *fan = volume-&gt;fanout[(u8)cookie-&gt;key_hash];</div><div class='add'>+			struct dentry *obj;</div><div class='ctx'> </div><div class='del'>-			inode_lock_nested(d_inode(fan), I_MUTEX_PARENT);</div><div class='del'>-			cachefiles_bury_object(volume-&gt;cache, object, fan,</div><div class='del'>-					       old_file-&gt;f_path.dentry,</div><div class='del'>-					       FSCACHE_OBJECT_INVALIDATED);</div><div class='add'>+			obj = start_removing_dentry(fan, old_file-&gt;f_path.dentry);</div><div class='add'>+			if (!IS_ERR(obj))</div><div class='add'>+				cachefiles_bury_object(volume-&gt;cache, object,</div><div class='add'>+						       fan, obj,</div><div class='add'>+						       FSCACHE_OBJECT_INVALIDATED);</div><div class='ctx'> 		}</div><div class='ctx'> 		fput(old_file);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h<br/>index d33169f0018b..b62cd3e9a18e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/internal.h</a></div><div class='hunk'>@@ -48,6 +48,7 @@ enum cachefiles_object_state {</div><div class='ctx'> 	CACHEFILES_ONDEMAND_OBJSTATE_CLOSE, /* Anonymous fd closed by daemon or initial state */</div><div class='ctx'> 	CACHEFILES_ONDEMAND_OBJSTATE_OPEN, /* Anonymous fd associated with object is available */</div><div class='ctx'> 	CACHEFILES_ONDEMAND_OBJSTATE_REOPENING, /* Object that was closed and is being reopened. */</div><div class='add'>+	CACHEFILES_ONDEMAND_OBJSTATE_DROPPING, /* Object is being dropped. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cachefiles_ondemand_info {</div><div class='hunk'>@@ -55,6 +56,7 @@ struct cachefiles_ondemand_info {</div><div class='ctx'> 	int				ondemand_id;</div><div class='ctx'> 	enum cachefiles_object_state	state;</div><div class='ctx'> 	struct cachefiles_object	*object;</div><div class='add'>+	spinlock_t			lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -69,7 +71,6 @@ struct cachefiles_object {</div><div class='ctx'> 	int				debug_id;</div><div class='ctx'> 	spinlock_t			lock;</div><div class='ctx'> 	refcount_t			ref;</div><div class='del'>-	u8				d_name_len;	/* Length of filename */</div><div class='ctx'> 	enum cachefiles_content		content_info:8;	/* Info about content presence */</div><div class='ctx'> 	unsigned long			flags;</div><div class='ctx'> #define CACHEFILES_OBJECT_USING_TMPFILE	0		/* Have an unlinked tmpfile */</div><div class='hunk'>@@ -120,13 +121,15 @@ struct cachefiles_cache {</div><div class='ctx'> #define CACHEFILES_STATE_CHANGED	3	/* T if state changed (poll trigger) */</div><div class='ctx'> #define CACHEFILES_ONDEMAND_MODE	4	/* T if in on-demand read mode */</div><div class='ctx'> 	char				*rootdirname;	/* name of cache root directory */</div><div class='del'>-	char				*secctx;	/* LSM security context */</div><div class='ctx'> 	char				*tag;		/* cache binding tag */</div><div class='ctx'> 	refcount_t			unbind_pincount;/* refcount to do daemon unbind */</div><div class='ctx'> 	struct xarray			reqs;		/* xarray of pending on-demand requests */</div><div class='ctx'> 	unsigned long			req_id_next;</div><div class='ctx'> 	struct xarray			ondemand_ids;	/* xarray for ondemand_id allocation */</div><div class='ctx'> 	u32				ondemand_id_next;</div><div class='add'>+	u32				msg_id_next;</div><div class='add'>+	u32				secid;		/* LSM security id */</div><div class='add'>+	bool				have_secid;	/* whether "secid" was set */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool cachefiles_in_ondemand_mode(struct cachefiles_cache *cache)</div><div class='hunk'>@@ -138,6 +141,7 @@ static inline bool cachefiles_in_ondemand_mode(struct cachefiles_cache *cache)</div><div class='ctx'> struct cachefiles_req {</div><div class='ctx'> 	struct cachefiles_object *object;</div><div class='ctx'> 	struct completion done;</div><div class='add'>+	refcount_t ref;</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct cachefiles_msg msg;</div><div class='ctx'> };</div><div class='hunk'>@@ -186,6 +190,7 @@ extern int cachefiles_has_space(struct cachefiles_cache *cache,</div><div class='ctx'>  * daemon.c</div><div class='ctx'>  */</div><div class='ctx'> extern const struct file_operations cachefiles_daemon_fops;</div><div class='add'>+extern void cachefiles_flush_reqs(struct cachefiles_cache *cache);</div><div class='ctx'> extern void cachefiles_get_unbind_pincount(struct cachefiles_cache *cache);</div><div class='ctx'> extern void cachefiles_put_unbind_pincount(struct cachefiles_cache *cache);</div><div class='ctx'> </div><div class='hunk'>@@ -332,6 +337,7 @@ cachefiles_ondemand_set_object_##_state(struct cachefiles_object *object) \</div><div class='ctx'> CACHEFILES_OBJECT_STATE_FUNCS(open, OPEN);</div><div class='ctx'> CACHEFILES_OBJECT_STATE_FUNCS(close, CLOSE);</div><div class='ctx'> CACHEFILES_OBJECT_STATE_FUNCS(reopening, REOPENING);</div><div class='add'>+CACHEFILES_OBJECT_STATE_FUNCS(dropping, DROPPING);</div><div class='ctx'> </div><div class='ctx'> static inline bool cachefiles_ondemand_is_reopening_read(struct cachefiles_req *req)</div><div class='ctx'> {</div><div class='hunk'>@@ -424,6 +430,8 @@ do {							\</div><div class='ctx'> 	pr_err("I/O Error: " FMT"\n", ##__VA_ARGS__);	\</div><div class='ctx'> 	fscache_io_error((___cache)-&gt;cache);		\</div><div class='ctx'> 	set_bit(CACHEFILES_DEAD, &amp;(___cache)-&gt;flags);	\</div><div class='add'>+	if (cachefiles_in_ondemand_mode(___cache))	\</div><div class='add'>+		cachefiles_flush_reqs(___cache);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define cachefiles_io_error_obj(object, FMT, ...)			\</div><div class='head'>diff --git a/fs/cachefiles/io.c b/fs/cachefiles/io.c<br/>index 1d685357e67f..3e0576d9db1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/io.c</a></div><div class='hunk'>@@ -9,9 +9,11 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;trace/events/fscache.h&gt;</div><div class='add'>+#include &lt;trace/events/netfs.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> struct cachefiles_kiocb {</div><div class='hunk'>@@ -61,7 +63,7 @@ static void cachefiles_read_complete(struct kiocb *iocb, long ret)</div><div class='ctx'> 				ret = -ESTALE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ki-&gt;term_func(ki-&gt;term_func_priv, ret, ki-&gt;was_async);</div><div class='add'>+		ki-&gt;term_func(ki-&gt;term_func_priv, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cachefiles_put_kiocb(ki);</div><div class='hunk'>@@ -186,7 +188,7 @@ in_progress:</div><div class='ctx'> </div><div class='ctx'> presubmission_error:</div><div class='ctx'> 	if (term_func)</div><div class='del'>-		term_func(term_func_priv, ret &lt; 0 ? ret : skipped, false);</div><div class='add'>+		term_func(term_func_priv, ret &lt; 0 ? ret : skipped);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +271,7 @@ static void cachefiles_write_complete(struct kiocb *iocb, long ret)</div><div class='ctx'> 	atomic_long_sub(ki-&gt;b_writing, &amp;object-&gt;volume-&gt;cache-&gt;b_writing);</div><div class='ctx'> 	set_bit(FSCACHE_COOKIE_HAVE_DATA, &amp;object-&gt;cookie-&gt;flags);</div><div class='ctx'> 	if (ki-&gt;term_func)</div><div class='del'>-		ki-&gt;term_func(ki-&gt;term_func_priv, ret, ki-&gt;was_async);</div><div class='add'>+		ki-&gt;term_func(ki-&gt;term_func_priv, ret);</div><div class='ctx'> 	cachefiles_put_kiocb(ki);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -299,7 +301,7 @@ int __cachefiles_write(struct cachefiles_object *object,</div><div class='ctx'> 	ki = kzalloc(sizeof(struct cachefiles_kiocb), GFP_KERNEL);</div><div class='ctx'> 	if (!ki) {</div><div class='ctx'> 		if (term_func)</div><div class='del'>-			term_func(term_func_priv, -ENOMEM, false);</div><div class='add'>+			term_func(term_func_priv, -ENOMEM);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -345,8 +347,6 @@ int __cachefiles_write(struct cachefiles_object *object,</div><div class='ctx'> 	default:</div><div class='ctx'> 		ki-&gt;was_async = false;</div><div class='ctx'> 		cachefiles_write_complete(&amp;ki-&gt;iocb, ret);</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			ret = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -364,7 +364,8 @@ static int cachefiles_write(struct netfs_cache_resources *cres,</div><div class='ctx'> {</div><div class='ctx'> 	if (!fscache_wait_for_operation(cres, FSCACHE_WANT_WRITE)) {</div><div class='ctx'> 		if (term_func)</div><div class='del'>-			term_func(term_func_priv, -ENOBUFS, false);</div><div class='add'>+			term_func(term_func_priv, -ENOBUFS);</div><div class='add'>+		trace_netfs_sreq(term_func_priv, netfs_sreq_trace_cache_nowrite);</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -493,7 +494,7 @@ out_no_object:</div><div class='ctx'>  * boundary as appropriate.</div><div class='ctx'>  */</div><div class='ctx'> static enum netfs_io_source cachefiles_prepare_read(struct netfs_io_subrequest *subreq,</div><div class='del'>-						    loff_t i_size)</div><div class='add'>+						    unsigned long long i_size)</div><div class='ctx'> {</div><div class='ctx'> 	return cachefiles_do_prepare_read(&amp;subreq-&gt;rreq-&gt;cache_resources,</div><div class='ctx'> 					  subreq-&gt;start, &amp;subreq-&gt;len, i_size,</div><div class='hunk'>@@ -622,6 +623,94 @@ static int cachefiles_prepare_write(struct netfs_cache_resources *cres,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cachefiles_prepare_write_subreq(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;wreq-&gt;cache_resources;</div><div class='add'>+	struct netfs_io_stream *stream = &amp;wreq-&gt;io_streams[subreq-&gt;stream_nr];</div><div class='add'>+</div><div class='add'>+	_enter("W=%x[%x] %llx", wreq-&gt;debug_id, subreq-&gt;debug_index, subreq-&gt;start);</div><div class='add'>+</div><div class='add'>+	stream-&gt;sreq_max_len = MAX_RW_COUNT;</div><div class='add'>+	stream-&gt;sreq_max_segs = BIO_MAX_VECS;</div><div class='add'>+</div><div class='add'>+	if (!cachefiles_cres_file(cres)) {</div><div class='add'>+		if (!fscache_wait_for_operation(cres, FSCACHE_WANT_WRITE))</div><div class='add'>+			return netfs_prepare_write_failed(subreq);</div><div class='add'>+		if (!cachefiles_cres_file(cres))</div><div class='add'>+			return netfs_prepare_write_failed(subreq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cachefiles_issue_write(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;wreq-&gt;cache_resources;</div><div class='add'>+	struct cachefiles_object *object = cachefiles_cres_object(cres);</div><div class='add'>+	struct cachefiles_cache *cache = object-&gt;volume-&gt;cache;</div><div class='add'>+	struct netfs_io_stream *stream = &amp;wreq-&gt;io_streams[subreq-&gt;stream_nr];</div><div class='add'>+	const struct cred *saved_cred;</div><div class='add'>+	size_t off, pre, post, len = subreq-&gt;len;</div><div class='add'>+	loff_t start = subreq-&gt;start;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	_enter("W=%x[%x] %llx-%llx",</div><div class='add'>+	       wreq-&gt;debug_id, subreq-&gt;debug_index, start, start + len - 1);</div><div class='add'>+</div><div class='add'>+	/* We need to start on the cache granularity boundary */</div><div class='add'>+	off = start &amp; (CACHEFILES_DIO_BLOCK_SIZE - 1);</div><div class='add'>+	if (off) {</div><div class='add'>+		pre = CACHEFILES_DIO_BLOCK_SIZE - off;</div><div class='add'>+		if (pre &gt;= len) {</div><div class='add'>+			fscache_count_dio_misfit();</div><div class='add'>+			netfs_write_subrequest_terminated(subreq, len);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		subreq-&gt;transferred += pre;</div><div class='add'>+		start += pre;</div><div class='add'>+		len -= pre;</div><div class='add'>+		iov_iter_advance(&amp;subreq-&gt;io_iter, pre);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We also need to end on the cache granularity boundary */</div><div class='add'>+	if (start + len == wreq-&gt;i_size) {</div><div class='add'>+		size_t part = len % CACHEFILES_DIO_BLOCK_SIZE;</div><div class='add'>+		size_t need = CACHEFILES_DIO_BLOCK_SIZE - part;</div><div class='add'>+</div><div class='add'>+		if (part &amp;&amp; stream-&gt;submit_extendable_to &gt;= need) {</div><div class='add'>+			len += need;</div><div class='add'>+			subreq-&gt;len += need;</div><div class='add'>+			subreq-&gt;io_iter.count += need;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	post = len &amp; (CACHEFILES_DIO_BLOCK_SIZE - 1);</div><div class='add'>+	if (post) {</div><div class='add'>+		len -= post;</div><div class='add'>+		if (len == 0) {</div><div class='add'>+			fscache_count_dio_misfit();</div><div class='add'>+			netfs_write_subrequest_terminated(subreq, post);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		iov_iter_truncate(&amp;subreq-&gt;io_iter, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_cache_prepare);</div><div class='add'>+	cachefiles_begin_secure(cache, &amp;saved_cred);</div><div class='add'>+	ret = __cachefiles_prepare_write(object, cachefiles_cres_file(cres),</div><div class='add'>+					 &amp;start, &amp;len, len, true);</div><div class='add'>+	cachefiles_end_secure(cache, saved_cred);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netfs_write_subrequest_terminated(subreq, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_cache_write);</div><div class='add'>+	cachefiles_write(&amp;subreq-&gt;rreq-&gt;cache_resources,</div><div class='add'>+			 subreq-&gt;start, &amp;subreq-&gt;io_iter,</div><div class='add'>+			 netfs_write_subrequest_terminated, subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Clean up an operation.</div><div class='ctx'>  */</div><div class='hunk'>@@ -638,8 +727,10 @@ static const struct netfs_cache_ops cachefiles_netfs_cache_ops = {</div><div class='ctx'> 	.end_operation		= cachefiles_end_operation,</div><div class='ctx'> 	.read			= cachefiles_read,</div><div class='ctx'> 	.write			= cachefiles_write,</div><div class='add'>+	.issue_write		= cachefiles_issue_write,</div><div class='ctx'> 	.prepare_read		= cachefiles_prepare_read,</div><div class='ctx'> 	.prepare_write		= cachefiles_prepare_write,</div><div class='add'>+	.prepare_write_subreq	= cachefiles_prepare_write_subreq,</div><div class='ctx'> 	.prepare_ondemand_read	= cachefiles_prepare_ondemand_read,</div><div class='ctx'> 	.query_occupancy	= cachefiles_query_occupancy,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/cachefiles/key.c b/fs/cachefiles/key.c<br/>index bf935e25bdbe..aae86af48ed5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/key.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/key.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/key.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-static const char cachefiles_charmap[64] =</div><div class='add'>+static const char cachefiles_charmap[64] __nonstring =</div><div class='ctx'> 	"0123456789"			/* 0 - 9 */</div><div class='ctx'> 	"abcdefghijklmnopqrstuvwxyz"	/* 10 - 35 */</div><div class='ctx'> 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"	/* 36 - 61 */</div><div class='hunk'>@@ -132,7 +132,6 @@ bool cachefiles_cook_key(struct cachefiles_object *object)</div><div class='ctx'> success:</div><div class='ctx'> 	name[len] = 0;</div><div class='ctx'> 	object-&gt;d_name = name;</div><div class='del'>-	object-&gt;d_name_len = len;</div><div class='ctx'> 	_leave(" = %s", object-&gt;d_name);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c<br/>index 7ade836beb58..e5ec90dccc27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/namei.c</a></div><div class='hunk'>@@ -93,12 +93,11 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,</div><div class='ctx'> 	_enter(",,%s", dirname);</div><div class='ctx'> </div><div class='ctx'> 	/* search the current directory for the element name */</div><div class='del'>-	inode_lock_nested(d_inode(dir), I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	ret = cachefiles_inject_read_error();</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		subdir = lookup_one_len(dirname, dir, strlen(dirname));</div><div class='add'>+		subdir = start_creating(&amp;nop_mnt_idmap, dir, &amp;QSTR(dirname));</div><div class='ctx'> 	else</div><div class='ctx'> 		subdir = ERR_PTR(ret);</div><div class='ctx'> 	trace_cachefiles_lookup(NULL, dir, subdir);</div><div class='hunk'>@@ -129,17 +128,21 @@ retry:</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto mkdir_error;</div><div class='ctx'> 		ret = cachefiles_inject_write_error();</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			ret = vfs_mkdir(&amp;nop_mnt_idmap, d_inode(dir), subdir, 0700);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			subdir = vfs_mkdir(&amp;nop_mnt_idmap, d_inode(dir), subdir, 0700, NULL);</div><div class='add'>+		} else {</div><div class='add'>+			end_creating(subdir);</div><div class='add'>+			subdir = ERR_PTR(ret);</div><div class='add'>+		}</div><div class='add'>+		if (IS_ERR(subdir)) {</div><div class='ctx'> 			trace_cachefiles_vfs_error(NULL, d_inode(dir), ret,</div><div class='ctx'> 						   cachefiles_trace_mkdir_error);</div><div class='ctx'> 			goto mkdir_error;</div><div class='ctx'> 		}</div><div class='ctx'> 		trace_cachefiles_mkdir(dir, subdir);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(d_unhashed(subdir))) {</div><div class='del'>-			cachefiles_put_directory(subdir);</div><div class='add'>+		if (unlikely(d_unhashed(subdir) || d_is_negative(subdir))) {</div><div class='add'>+			end_creating(subdir);</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		}</div><div class='ctx'> 		ASSERT(d_backing_inode(subdir));</div><div class='hunk'>@@ -152,7 +155,7 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	/* Tell rmdir() it's not allowed to delete the subdir */</div><div class='ctx'> 	inode_lock(d_inode(subdir));</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='add'>+	end_creating_keep(subdir);</div><div class='ctx'> </div><div class='ctx'> 	if (!__cachefiles_mark_inode_in_use(NULL, d_inode(subdir))) {</div><div class='ctx'> 		pr_notice("cachefiles: Inode already in use: %pd (B=%lx)\n",</div><div class='hunk'>@@ -194,13 +197,11 @@ mark_error:</div><div class='ctx'> 	return ERR_PTR(-EBUSY);</div><div class='ctx'> </div><div class='ctx'> mkdir_error:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='del'>-	dput(subdir);</div><div class='add'>+	end_creating(subdir);</div><div class='ctx'> 	pr_err("mkdir %s failed with error %d\n", dirname, ret);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> lookup_error:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='ctx'> 	ret = PTR_ERR(subdir);</div><div class='ctx'> 	pr_err("Lookup %s failed with error %d\n", dirname, ret);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='hunk'>@@ -260,6 +261,8 @@ static int cachefiles_unlink(struct cachefiles_cache *cache,</div><div class='ctx'>  * - File backed objects are unlinked</div><div class='ctx'>  * - Directory backed objects are stuffed into the graveyard for userspace to</div><div class='ctx'>  *   delete</div><div class='add'>+ * On entry dir must be locked.  It will be unlocked on exit.</div><div class='add'>+ * On entry there must be at least 2 refs on rep, one will be dropped on exit.</div><div class='ctx'>  */</div><div class='ctx'> int cachefiles_bury_object(struct cachefiles_cache *cache,</div><div class='ctx'> 			   struct cachefiles_object *object,</div><div class='hunk'>@@ -275,27 +278,23 @@ int cachefiles_bury_object(struct cachefiles_cache *cache,</div><div class='ctx'> 	_enter(",'%pd','%pd'", dir, rep);</div><div class='ctx'> </div><div class='ctx'> 	if (rep-&gt;d_parent != dir) {</div><div class='del'>-		inode_unlock(d_inode(dir));</div><div class='add'>+		end_removing(rep);</div><div class='ctx'> 		_leave(" = -ESTALE");</div><div class='ctx'> 		return -ESTALE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* non-directories can just be unlinked */</div><div class='ctx'> 	if (!d_is_dir(rep)) {</div><div class='del'>-		dget(rep); /* Stop the dentry being negated if it's only pinned</div><div class='del'>-			    * by a file struct.</div><div class='del'>-			    */</div><div class='ctx'> 		ret = cachefiles_unlink(cache, object, dir, rep, why);</div><div class='del'>-		dput(rep);</div><div class='add'>+		end_removing(rep);</div><div class='ctx'> </div><div class='del'>-		inode_unlock(d_inode(dir));</div><div class='ctx'> 		_leave(" = %d", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* directories have to be moved to the graveyard */</div><div class='ctx'> 	_debug("move stale object to graveyard");</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='add'>+	end_removing(rep);</div><div class='ctx'> </div><div class='ctx'> try_again:</div><div class='ctx'> 	/* first step is to make up a grave dentry in the graveyard */</div><div class='hunk'>@@ -335,7 +334,7 @@ try_again:</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	grave = lookup_one_len(nbuffer, cache-&gt;graveyard, strlen(nbuffer));</div><div class='add'>+	grave = lookup_one(&amp;nop_mnt_idmap, &amp;QSTR(nbuffer), cache-&gt;graveyard);</div><div class='ctx'> 	if (IS_ERR(grave)) {</div><div class='ctx'> 		unlock_rename(cache-&gt;graveyard, dir);</div><div class='ctx'> 		trace_cachefiles_vfs_error(object, d_inode(cache-&gt;graveyard),</div><div class='hunk'>@@ -384,11 +383,10 @@ try_again:</div><div class='ctx'> 		cachefiles_io_error(cache, "Rename security error %d", ret);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct renamedata rd = {</div><div class='del'>-			.old_mnt_idmap	= &amp;nop_mnt_idmap,</div><div class='del'>-			.old_dir	= d_inode(dir),</div><div class='add'>+			.mnt_idmap	= &amp;nop_mnt_idmap,</div><div class='add'>+			.old_parent	= dir,</div><div class='ctx'> 			.old_dentry	= rep,</div><div class='del'>-			.new_mnt_idmap	= &amp;nop_mnt_idmap,</div><div class='del'>-			.new_dir	= d_inode(cache-&gt;graveyard),</div><div class='add'>+			.new_parent	= cache-&gt;graveyard,</div><div class='ctx'> 			.new_dentry	= grave,</div><div class='ctx'> 		};</div><div class='ctx'> 		trace_cachefiles_rename(object, d_inode(rep)-&gt;i_ino, why);</div><div class='hunk'>@@ -423,13 +421,12 @@ int cachefiles_delete_object(struct cachefiles_object *object,</div><div class='ctx'> </div><div class='ctx'> 	_enter(",OBJ%x{%pD}", object-&gt;debug_id, object-&gt;file);</div><div class='ctx'> </div><div class='del'>-	/* Stop the dentry being negated if it's only pinned by a file struct. */</div><div class='del'>-	dget(dentry);</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_backing_inode(fan), I_MUTEX_PARENT);</div><div class='del'>-	ret = cachefiles_unlink(volume-&gt;cache, object, fan, dentry, why);</div><div class='del'>-	inode_unlock(d_backing_inode(fan));</div><div class='del'>-	dput(dentry);</div><div class='add'>+	dentry = start_removing_dentry(fan, dentry);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		ret = PTR_ERR(dentry);</div><div class='add'>+	else</div><div class='add'>+		ret = cachefiles_unlink(volume-&gt;cache, object, fan, dentry, why);</div><div class='add'>+	end_removing(dentry);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -563,8 +560,7 @@ static bool cachefiles_open_file(struct cachefiles_object *object,</div><div class='ctx'> 	 */</div><div class='ctx'> 	path.mnt = cache-&gt;mnt;</div><div class='ctx'> 	path.dentry = dentry;</div><div class='del'>-	file = kernel_file_open(&amp;path, O_RDWR | O_LARGEFILE | O_DIRECT,</div><div class='del'>-				d_backing_inode(dentry), cache-&gt;cache_cred);</div><div class='add'>+	file = kernel_file_open(&amp;path, O_RDWR | O_LARGEFILE | O_DIRECT, cache-&gt;cache_cred);</div><div class='ctx'> 	if (IS_ERR(file)) {</div><div class='ctx'> 		trace_cachefiles_vfs_error(object, d_backing_inode(dentry),</div><div class='ctx'> 					   PTR_ERR(file),</div><div class='hunk'>@@ -596,14 +592,12 @@ static bool cachefiles_open_file(struct cachefiles_object *object,</div><div class='ctx'> 	 * write and readdir but not lookup or open).</div><div class='ctx'> 	 */</div><div class='ctx'> 	touch_atime(&amp;file-&gt;f_path);</div><div class='del'>-	dput(dentry);</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> check_failed:</div><div class='ctx'> 	fscache_cookie_lookup_negative(object-&gt;cookie);</div><div class='ctx'> 	cachefiles_unmark_inode_in_use(object, file);</div><div class='ctx'> 	fput(file);</div><div class='del'>-	dput(dentry);</div><div class='ctx'> 	if (ret == -ESTALE)</div><div class='ctx'> 		return cachefiles_create_file(object);</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -612,7 +606,6 @@ error_fput:</div><div class='ctx'> 	fput(file);</div><div class='ctx'> error:</div><div class='ctx'> 	cachefiles_do_unmark_inode_in_use(object, d_inode(dentry));</div><div class='del'>-	dput(dentry);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -631,8 +624,8 @@ bool cachefiles_look_up_object(struct cachefiles_object *object)</div><div class='ctx'> 	/* Look up path "cache/vol/fanout/file". */</div><div class='ctx'> 	ret = cachefiles_inject_read_error();</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		dentry = lookup_positive_unlocked(object-&gt;d_name, fan,</div><div class='del'>-						  object-&gt;d_name_len);</div><div class='add'>+		dentry = lookup_one_positive_unlocked(&amp;nop_mnt_idmap,</div><div class='add'>+						      &amp;QSTR(object-&gt;d_name), fan);</div><div class='ctx'> 	else</div><div class='ctx'> 		dentry = ERR_PTR(ret);</div><div class='ctx'> 	trace_cachefiles_lookup(object, fan, dentry);</div><div class='hunk'>@@ -646,16 +639,22 @@ bool cachefiles_look_up_object(struct cachefiles_object *object)</div><div class='ctx'> </div><div class='ctx'> 	if (!d_is_reg(dentry)) {</div><div class='ctx'> 		pr_err("%pd is not a file\n", dentry);</div><div class='del'>-		inode_lock_nested(d_inode(fan), I_MUTEX_PARENT);</div><div class='del'>-		ret = cachefiles_bury_object(volume-&gt;cache, object, fan, dentry,</div><div class='del'>-					     FSCACHE_OBJECT_IS_WEIRD);</div><div class='add'>+		struct dentry *de = start_removing_dentry(fan, dentry);</div><div class='add'>+		if (IS_ERR(de))</div><div class='add'>+			ret = PTR_ERR(de);</div><div class='add'>+		else</div><div class='add'>+			ret = cachefiles_bury_object(volume-&gt;cache, object,</div><div class='add'>+						     fan, de,</div><div class='add'>+						     FSCACHE_OBJECT_IS_WEIRD);</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		goto new_file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cachefiles_open_file(object, dentry))</div><div class='add'>+	ret = cachefiles_open_file(object, dentry);</div><div class='add'>+	dput(dentry);</div><div class='add'>+	if (!ret)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	_leave(" = t [%lu]", file_inode(object-&gt;file)-&gt;i_ino);</div><div class='hunk'>@@ -679,41 +678,41 @@ bool cachefiles_commit_tmpfile(struct cachefiles_cache *cache,</div><div class='ctx'> </div><div class='ctx'> 	_enter(",%pD", object-&gt;file);</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(d_inode(fan), I_MUTEX_PARENT);</div><div class='ctx'> 	ret = cachefiles_inject_read_error();</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		dentry = lookup_one_len(object-&gt;d_name, fan, object-&gt;d_name_len);</div><div class='add'>+		dentry = start_creating(&amp;nop_mnt_idmap, fan, &amp;QSTR(object-&gt;d_name));</div><div class='ctx'> 	else</div><div class='ctx'> 		dentry = ERR_PTR(ret);</div><div class='ctx'> 	if (IS_ERR(dentry)) {</div><div class='ctx'> 		trace_cachefiles_vfs_error(object, d_inode(fan), PTR_ERR(dentry),</div><div class='ctx'> 					   cachefiles_trace_lookup_error);</div><div class='ctx'> 		_debug("lookup fail %ld", PTR_ERR(dentry));</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!d_is_negative(dentry)) {</div><div class='del'>-		if (d_backing_inode(dentry) == file_inode(object-&gt;file)) {</div><div class='del'>-			success = true;</div><div class='del'>-			goto out_dput;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * This loop will only execute more than once if some other thread</div><div class='add'>+	 * races to create the object we are trying to create.</div><div class='add'>+	 */</div><div class='add'>+	while (!d_is_negative(dentry)) {</div><div class='ctx'> 		ret = cachefiles_unlink(volume-&gt;cache, object, fan, dentry,</div><div class='ctx'> 					FSCACHE_OBJECT_IS_STALE);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out_dput;</div><div class='add'>+			goto out_end;</div><div class='add'>+</div><div class='add'>+		end_creating(dentry);</div><div class='ctx'> </div><div class='del'>-		dput(dentry);</div><div class='ctx'> 		ret = cachefiles_inject_read_error();</div><div class='ctx'> 		if (ret == 0)</div><div class='del'>-			dentry = lookup_one_len(object-&gt;d_name, fan, object-&gt;d_name_len);</div><div class='add'>+			dentry = start_creating(&amp;nop_mnt_idmap, fan,</div><div class='add'>+						&amp;QSTR(object-&gt;d_name));</div><div class='ctx'> 		else</div><div class='ctx'> 			dentry = ERR_PTR(ret);</div><div class='ctx'> 		if (IS_ERR(dentry)) {</div><div class='ctx'> 			trace_cachefiles_vfs_error(object, d_inode(fan), PTR_ERR(dentry),</div><div class='ctx'> 						   cachefiles_trace_lookup_error);</div><div class='ctx'> 			_debug("lookup fail %ld", PTR_ERR(dentry));</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -734,10 +733,9 @@ bool cachefiles_commit_tmpfile(struct cachefiles_cache *cache,</div><div class='ctx'> 		success = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_dput:</div><div class='del'>-	dput(dentry);</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(d_inode(fan));</div><div class='add'>+out_end:</div><div class='add'>+	end_creating(dentry);</div><div class='add'>+out:</div><div class='ctx'> 	_leave(" = %u", success);</div><div class='ctx'> 	return success;</div><div class='ctx'> }</div><div class='hunk'>@@ -753,26 +751,20 @@ static struct dentry *cachefiles_lookup_for_cull(struct cachefiles_cache *cache,</div><div class='ctx'> 	struct dentry *victim;</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(d_inode(dir), I_MUTEX_PARENT);</div><div class='add'>+	victim = start_removing(&amp;nop_mnt_idmap, dir, &amp;QSTR(filename));</div><div class='ctx'> </div><div class='del'>-	victim = lookup_one_len(filename, dir, strlen(filename));</div><div class='ctx'> 	if (IS_ERR(victim))</div><div class='ctx'> 		goto lookup_error;</div><div class='del'>-	if (d_is_negative(victim))</div><div class='del'>-		goto lookup_put;</div><div class='ctx'> 	if (d_inode(victim)-&gt;i_flags &amp; S_KERNEL_FILE)</div><div class='ctx'> 		goto lookup_busy;</div><div class='ctx'> 	return victim;</div><div class='ctx'> </div><div class='ctx'> lookup_busy:</div><div class='ctx'> 	ret = -EBUSY;</div><div class='del'>-lookup_put:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='del'>-	dput(victim);</div><div class='add'>+	end_removing(victim);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> lookup_error:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='ctx'> 	ret = PTR_ERR(victim);</div><div class='ctx'> 	if (ret == -ENOENT)</div><div class='ctx'> 		return ERR_PTR(-ESTALE); /* Probably got retired by the netfs */</div><div class='hunk'>@@ -820,18 +812,17 @@ int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir,</div><div class='ctx'> </div><div class='ctx'> 	ret = cachefiles_bury_object(cache, NULL, dir, victim,</div><div class='ctx'> 				     FSCACHE_OBJECT_WAS_CULLED);</div><div class='add'>+	dput(victim);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	fscache_count_culled();</div><div class='del'>-	dput(victim);</div><div class='ctx'> 	_leave(" = 0");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error_unlock:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='add'>+	end_removing(victim);</div><div class='ctx'> error:</div><div class='del'>-	dput(victim);</div><div class='ctx'> 	if (ret == -ENOENT)</div><div class='ctx'> 		return -ESTALE; /* Probably got retired by the netfs */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c<br/>index 5fd74ec60bef..a7ed86fa98bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/ondemand.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/ondemand.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/ondemand.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/ondemand.c</a></div><div class='hunk'>@@ -1,22 +1,42 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/anon_inodes.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+struct ondemand_anon_file {</div><div class='add'>+	struct file *file;</div><div class='add'>+	int fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void cachefiles_req_put(struct cachefiles_req *req)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;req-&gt;ref))</div><div class='add'>+		kfree(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cachefiles_ondemand_fd_release(struct inode *inode,</div><div class='ctx'> 					  struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_object *object = file-&gt;private_data;</div><div class='del'>-	struct cachefiles_cache *cache = object-&gt;volume-&gt;cache;</div><div class='del'>-	struct cachefiles_ondemand_info *info = object-&gt;ondemand;</div><div class='del'>-	int object_id = info-&gt;ondemand_id;</div><div class='add'>+	struct cachefiles_cache *cache;</div><div class='add'>+	struct cachefiles_ondemand_info *info;</div><div class='add'>+	int object_id;</div><div class='ctx'> 	struct cachefiles_req *req;</div><div class='del'>-	XA_STATE(xas, &amp;cache-&gt;reqs, 0);</div><div class='add'>+	XA_STATE(xas, NULL, 0);</div><div class='add'>+</div><div class='add'>+	if (!object)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	info = object-&gt;ondemand;</div><div class='add'>+	cache = object-&gt;volume-&gt;cache;</div><div class='add'>+	xas.xa = &amp;cache-&gt;reqs;</div><div class='ctx'> </div><div class='ctx'> 	xa_lock(&amp;cache-&gt;reqs);</div><div class='add'>+	spin_lock(&amp;info-&gt;lock);</div><div class='add'>+	object_id = info-&gt;ondemand_id;</div><div class='ctx'> 	info-&gt;ondemand_id = CACHEFILES_ONDEMAND_ID_CLOSED;</div><div class='ctx'> 	cachefiles_ondemand_set_object_close(object);</div><div class='add'>+	spin_unlock(&amp;info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Only flush CACHEFILES_REQ_NEW marked req to avoid race with daemon_read */</div><div class='ctx'> 	xas_for_each_marked(&amp;xas, req, ULONG_MAX, CACHEFILES_REQ_NEW) {</div><div class='hunk'>@@ -40,26 +60,34 @@ static ssize_t cachefiles_ondemand_fd_write_iter(struct kiocb *kiocb,</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_object *object = kiocb-&gt;ki_filp-&gt;private_data;</div><div class='ctx'> 	struct cachefiles_cache *cache = object-&gt;volume-&gt;cache;</div><div class='del'>-	struct file *file = object-&gt;file;</div><div class='del'>-	size_t len = iter-&gt;count;</div><div class='add'>+	struct file *file;</div><div class='add'>+	size_t len = iter-&gt;count, aligned_len = len;</div><div class='ctx'> 	loff_t pos = kiocb-&gt;ki_pos;</div><div class='ctx'> 	const struct cred *saved_cred;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!file)</div><div class='add'>+	spin_lock(&amp;object-&gt;lock);</div><div class='add'>+	file = object-&gt;file;</div><div class='add'>+	if (!file) {</div><div class='add'>+		spin_unlock(&amp;object-&gt;lock);</div><div class='ctx'> 		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+	get_file(file);</div><div class='add'>+	spin_unlock(&amp;object-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	cachefiles_begin_secure(cache, &amp;saved_cred);</div><div class='del'>-	ret = __cachefiles_prepare_write(object, file, &amp;pos, &amp;len, len, true);</div><div class='add'>+	ret = __cachefiles_prepare_write(object, file, &amp;pos, &amp;aligned_len, len, true);</div><div class='ctx'> 	cachefiles_end_secure(cache, saved_cred);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	trace_cachefiles_ondemand_fd_write(object, file_inode(file), pos, len);</div><div class='ctx'> 	ret = __cachefiles_write(object, file, pos, iter, NULL, NULL);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = len;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		kiocb-&gt;ki_pos += ret;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	fput(file);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -67,21 +95,31 @@ static loff_t cachefiles_ondemand_fd_llseek(struct file *filp, loff_t pos,</div><div class='ctx'> 					    int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_object *object = filp-&gt;private_data;</div><div class='del'>-	struct file *file = object-&gt;file;</div><div class='add'>+	struct file *file;</div><div class='add'>+	loff_t ret;</div><div class='ctx'> </div><div class='del'>-	if (!file)</div><div class='add'>+	spin_lock(&amp;object-&gt;lock);</div><div class='add'>+	file = object-&gt;file;</div><div class='add'>+	if (!file) {</div><div class='add'>+		spin_unlock(&amp;object-&gt;lock);</div><div class='ctx'> 		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+	get_file(file);</div><div class='add'>+	spin_unlock(&amp;object-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = vfs_llseek(file, pos, whence);</div><div class='add'>+	fput(file);</div><div class='ctx'> </div><div class='del'>-	return vfs_llseek(file, pos, whence);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long cachefiles_ondemand_fd_ioctl(struct file *filp, unsigned int ioctl,</div><div class='del'>-					 unsigned long arg)</div><div class='add'>+					 unsigned long id)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_object *object = filp-&gt;private_data;</div><div class='ctx'> 	struct cachefiles_cache *cache = object-&gt;volume-&gt;cache;</div><div class='ctx'> 	struct cachefiles_req *req;</div><div class='del'>-	unsigned long id;</div><div class='add'>+	XA_STATE(xas, &amp;cache-&gt;reqs, id);</div><div class='ctx'> </div><div class='ctx'> 	if (ioctl != CACHEFILES_IOC_READ_COMPLETE)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -89,10 +127,15 @@ static long cachefiles_ondemand_fd_ioctl(struct file *filp, unsigned int ioctl,</div><div class='ctx'> 	if (!test_bit(CACHEFILES_ONDEMAND_MODE, &amp;cache-&gt;flags))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	id = arg;</div><div class='del'>-	req = xa_erase(&amp;cache-&gt;reqs, id);</div><div class='del'>-	if (!req)</div><div class='add'>+	xa_lock(&amp;cache-&gt;reqs);</div><div class='add'>+	req = xas_load(&amp;xas);</div><div class='add'>+	if (!req || req-&gt;msg.opcode != CACHEFILES_OP_READ ||</div><div class='add'>+	    req-&gt;object != object) {</div><div class='add'>+		xa_unlock(&amp;cache-&gt;reqs);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	xas_store(&amp;xas, NULL);</div><div class='add'>+	xa_unlock(&amp;cache-&gt;reqs);</div><div class='ctx'> </div><div class='ctx'> 	trace_cachefiles_ondemand_cread(object, id);</div><div class='ctx'> 	complete(&amp;req-&gt;done);</div><div class='hunk'>@@ -116,10 +159,12 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_req *req;</div><div class='ctx'> 	struct fscache_cookie *cookie;</div><div class='add'>+	struct cachefiles_ondemand_info *info;</div><div class='ctx'> 	char *pid, *psize;</div><div class='ctx'> 	unsigned long id;</div><div class='ctx'> 	long size;</div><div class='ctx'> 	int ret;</div><div class='add'>+	XA_STATE(xas, &amp;cache-&gt;reqs, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(CACHEFILES_ONDEMAND_MODE, &amp;cache-&gt;flags))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -143,10 +188,18 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	req = xa_erase(&amp;cache-&gt;reqs, id);</div><div class='del'>-	if (!req)</div><div class='add'>+	xa_lock(&amp;cache-&gt;reqs);</div><div class='add'>+	xas.xa_index = id;</div><div class='add'>+	req = xas_load(&amp;xas);</div><div class='add'>+	if (!req || req-&gt;msg.opcode != CACHEFILES_OP_OPEN ||</div><div class='add'>+	    !req-&gt;object-&gt;ondemand-&gt;ondemand_id) {</div><div class='add'>+		xa_unlock(&amp;cache-&gt;reqs);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	xas_store(&amp;xas, NULL);</div><div class='add'>+	xa_unlock(&amp;cache-&gt;reqs);</div><div class='ctx'> </div><div class='add'>+	info = req-&gt;object-&gt;ondemand;</div><div class='ctx'> 	/* fail OPEN request if copen format is invalid */</div><div class='ctx'> 	ret = kstrtol(psize, 0, &amp;size);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -166,6 +219,32 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;info-&gt;lock);</div><div class='add'>+	/*</div><div class='add'>+	 * The anonymous fd was closed before copen ? Fail the request.</div><div class='add'>+	 *</div><div class='add'>+	 *             t1             |             t2</div><div class='add'>+	 * ---------------------------------------------------------</div><div class='add'>+	 *                             cachefiles_ondemand_copen</div><div class='add'>+	 *                             req = xa_erase(&amp;cache-&gt;reqs, id)</div><div class='add'>+	 * // Anon fd is maliciously closed.</div><div class='add'>+	 * cachefiles_ondemand_fd_release</div><div class='add'>+	 * xa_lock(&amp;cache-&gt;reqs)</div><div class='add'>+	 * cachefiles_ondemand_set_object_close(object)</div><div class='add'>+	 * xa_unlock(&amp;cache-&gt;reqs)</div><div class='add'>+	 *                             cachefiles_ondemand_set_object_open</div><div class='add'>+	 *                             // No one will ever close it again.</div><div class='add'>+	 * cachefiles_ondemand_daemon_read</div><div class='add'>+	 * cachefiles_ondemand_select_req</div><div class='add'>+	 *</div><div class='add'>+	 * Get a read req but its fd is already closed. The daemon can't</div><div class='add'>+	 * issue a cread ioctl with an closed fd, then hung.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;ondemand_id == CACHEFILES_ONDEMAND_ID_CLOSED) {</div><div class='add'>+		spin_unlock(&amp;info-&gt;lock);</div><div class='add'>+		req-&gt;error = -EBADFD;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	cookie = req-&gt;object-&gt;cookie;</div><div class='ctx'> 	cookie-&gt;object_size = size;</div><div class='ctx'> 	if (size)</div><div class='hunk'>@@ -175,9 +254,15 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> 	trace_cachefiles_ondemand_copen(req-&gt;object, id, size);</div><div class='ctx'> </div><div class='ctx'> 	cachefiles_ondemand_set_object_open(req-&gt;object);</div><div class='add'>+	spin_unlock(&amp;info-&gt;lock);</div><div class='ctx'> 	wake_up_all(&amp;cache-&gt;daemon_pollwq);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	spin_lock(&amp;info-&gt;lock);</div><div class='add'>+	/* Need to set object close to avoid reopen status continuing */</div><div class='add'>+	if (info-&gt;ondemand_id == CACHEFILES_ONDEMAND_ID_CLOSED)</div><div class='add'>+		cachefiles_ondemand_set_object_close(req-&gt;object);</div><div class='add'>+	spin_unlock(&amp;info-&gt;lock);</div><div class='ctx'> 	complete(&amp;req-&gt;done);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -205,14 +290,14 @@ int cachefiles_ondemand_restore(struct cachefiles_cache *cache, char *args)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cachefiles_ondemand_get_fd(struct cachefiles_req *req)</div><div class='add'>+static int cachefiles_ondemand_get_fd(struct cachefiles_req *req,</div><div class='add'>+				      struct ondemand_anon_file *anon_file)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_object *object;</div><div class='ctx'> 	struct cachefiles_cache *cache;</div><div class='ctx'> 	struct cachefiles_open *load;</div><div class='del'>-	struct file *file;</div><div class='ctx'> 	u32 object_id;</div><div class='del'>-	int ret, fd;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	object = cachefiles_grab_object(req-&gt;object,</div><div class='ctx'> 			cachefiles_obj_get_ondemand_fd);</div><div class='hunk'>@@ -224,35 +309,52 @@ static int cachefiles_ondemand_get_fd(struct cachefiles_req *req)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	fd = get_unused_fd_flags(O_WRONLY);</div><div class='del'>-	if (fd &lt; 0) {</div><div class='del'>-		ret = fd;</div><div class='add'>+	anon_file-&gt;fd = get_unused_fd_flags(O_WRONLY);</div><div class='add'>+	if (anon_file-&gt;fd &lt; 0) {</div><div class='add'>+		ret = anon_file-&gt;fd;</div><div class='ctx'> 		goto err_free_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	file = anon_inode_getfile("[cachefiles]", &amp;cachefiles_ondemand_fd_fops,</div><div class='del'>-				  object, O_WRONLY);</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		ret = PTR_ERR(file);</div><div class='add'>+	anon_file-&gt;file = anon_inode_getfile_fmode("[cachefiles]",</div><div class='add'>+				&amp;cachefiles_ondemand_fd_fops, object,</div><div class='add'>+				O_WRONLY, FMODE_PWRITE | FMODE_LSEEK);</div><div class='add'>+	if (IS_ERR(anon_file-&gt;file)) {</div><div class='add'>+		ret = PTR_ERR(anon_file-&gt;file);</div><div class='ctx'> 		goto err_put_fd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	file-&gt;f_mode |= FMODE_PWRITE | FMODE_LSEEK;</div><div class='del'>-	fd_install(fd, file);</div><div class='add'>+	spin_lock(&amp;object-&gt;ondemand-&gt;lock);</div><div class='add'>+	if (object-&gt;ondemand-&gt;ondemand_id &gt; 0) {</div><div class='add'>+		spin_unlock(&amp;object-&gt;ondemand-&gt;lock);</div><div class='add'>+		/* Pair with check in cachefiles_ondemand_fd_release(). */</div><div class='add'>+		anon_file-&gt;file-&gt;private_data = NULL;</div><div class='add'>+		ret = -EEXIST;</div><div class='add'>+		goto err_put_file;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	load = (void *)req-&gt;msg.data;</div><div class='del'>-	load-&gt;fd = fd;</div><div class='add'>+	load-&gt;fd = anon_file-&gt;fd;</div><div class='ctx'> 	object-&gt;ondemand-&gt;ondemand_id = object_id;</div><div class='add'>+	spin_unlock(&amp;object-&gt;ondemand-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	cachefiles_get_unbind_pincount(cache);</div><div class='ctx'> 	trace_cachefiles_ondemand_open(object, &amp;req-&gt;msg, load);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_put_file:</div><div class='add'>+	fput(anon_file-&gt;file);</div><div class='add'>+	anon_file-&gt;file = NULL;</div><div class='ctx'> err_put_fd:</div><div class='del'>-	put_unused_fd(fd);</div><div class='add'>+	put_unused_fd(anon_file-&gt;fd);</div><div class='add'>+	anon_file-&gt;fd = ret;</div><div class='ctx'> err_free_id:</div><div class='ctx'> 	xa_erase(&amp;cache-&gt;ondemand_ids, object_id);</div><div class='ctx'> err:</div><div class='add'>+	spin_lock(&amp;object-&gt;ondemand-&gt;lock);</div><div class='add'>+	/* Avoid marking an opened object as closed. */</div><div class='add'>+	if (object-&gt;ondemand-&gt;ondemand_id &lt;= 0)</div><div class='add'>+		cachefiles_ondemand_set_object_close(object);</div><div class='add'>+	spin_unlock(&amp;object-&gt;ondemand-&gt;lock);</div><div class='ctx'> 	cachefiles_put_object(object, cachefiles_obj_put_ondemand_fd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -294,14 +396,28 @@ static struct cachefiles_req *cachefiles_ondemand_select_req(struct xa_state *xa</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool cachefiles_ondemand_finish_req(struct cachefiles_req *req,</div><div class='add'>+						  struct xa_state *xas, int err)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!xas || !req))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (xa_cmpxchg(xas-&gt;xa, xas-&gt;xa_index, req, NULL, 0) != req)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	req-&gt;error = err;</div><div class='add'>+	complete(&amp;req-&gt;done);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache,</div><div class='ctx'> 					char __user *_buffer, size_t buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct cachefiles_req *req;</div><div class='ctx'> 	struct cachefiles_msg *msg;</div><div class='del'>-	unsigned long id = 0;</div><div class='ctx'> 	size_t n;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	struct ondemand_anon_file anon_file;</div><div class='ctx'> 	XA_STATE(xas, &amp;cache-&gt;reqs, cache-&gt;req_id_next);</div><div class='ctx'> </div><div class='ctx'> 	xa_lock(&amp;cache-&gt;reqs);</div><div class='hunk'>@@ -330,42 +446,37 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache,</div><div class='ctx'> </div><div class='ctx'> 	xas_clear_mark(&amp;xas, CACHEFILES_REQ_NEW);</div><div class='ctx'> 	cache-&gt;req_id_next = xas.xa_index + 1;</div><div class='add'>+	refcount_inc(&amp;req-&gt;ref);</div><div class='add'>+	cachefiles_grab_object(req-&gt;object, cachefiles_obj_get_read_req);</div><div class='ctx'> 	xa_unlock(&amp;cache-&gt;reqs);</div><div class='ctx'> </div><div class='del'>-	id = xas.xa_index;</div><div class='del'>-</div><div class='ctx'> 	if (msg-&gt;opcode == CACHEFILES_OP_OPEN) {</div><div class='del'>-		ret = cachefiles_ondemand_get_fd(req);</div><div class='del'>-		if (ret) {</div><div class='del'>-			cachefiles_ondemand_set_object_close(req-&gt;object);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='add'>+		ret = cachefiles_ondemand_get_fd(req, &amp;anon_file);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	msg-&gt;msg_id = id;</div><div class='add'>+	msg-&gt;msg_id = xas.xa_index;</div><div class='ctx'> 	msg-&gt;object_id = req-&gt;object-&gt;ondemand-&gt;ondemand_id;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(_buffer, msg, n) != 0) {</div><div class='add'>+	if (copy_to_user(_buffer, msg, n) != 0)</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_put_fd;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* CLOSE request has no reply */</div><div class='del'>-	if (msg-&gt;opcode == CACHEFILES_OP_CLOSE) {</div><div class='del'>-		xa_erase(&amp;cache-&gt;reqs, id);</div><div class='del'>-		complete(&amp;req-&gt;done);</div><div class='add'>+	if (msg-&gt;opcode == CACHEFILES_OP_OPEN) {</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			fput(anon_file.file);</div><div class='add'>+			put_unused_fd(anon_file.fd);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		fd_install(anon_file.fd, anon_file.file);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-</div><div class='del'>-err_put_fd:</div><div class='del'>-	if (msg-&gt;opcode == CACHEFILES_OP_OPEN)</div><div class='del'>-		close_fd(((struct cachefiles_open *)msg-&gt;data)-&gt;fd);</div><div class='del'>-error:</div><div class='del'>-	xa_erase(&amp;cache-&gt;reqs, id);</div><div class='del'>-	req-&gt;error = ret;</div><div class='del'>-	complete(&amp;req-&gt;done);</div><div class='del'>-	return ret;</div><div class='add'>+out:</div><div class='add'>+	cachefiles_put_object(req-&gt;object, cachefiles_obj_put_read_req);</div><div class='add'>+	/* Remove error request and CLOSE request has no reply */</div><div class='add'>+	if (ret || msg-&gt;opcode == CACHEFILES_OP_CLOSE)</div><div class='add'>+		cachefiles_ondemand_finish_req(req, &amp;xas, ret);</div><div class='add'>+	cachefiles_req_put(req);</div><div class='add'>+	return ret ? ret : n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> typedef int (*init_req_fn)(struct cachefiles_req *req, void *private);</div><div class='hunk'>@@ -395,6 +506,7 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	refcount_set(&amp;req-&gt;ref, 1);</div><div class='ctx'> 	req-&gt;object = object;</div><div class='ctx'> 	init_completion(&amp;req-&gt;done);</div><div class='ctx'> 	req-&gt;msg.opcode = opcode;</div><div class='hunk'>@@ -422,7 +534,8 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,</div><div class='ctx'> 		 */</div><div class='ctx'> 		xas_lock(&amp;xas);</div><div class='ctx'> </div><div class='del'>-		if (test_bit(CACHEFILES_DEAD, &amp;cache-&gt;flags)) {</div><div class='add'>+		if (test_bit(CACHEFILES_DEAD, &amp;cache-&gt;flags) ||</div><div class='add'>+		    cachefiles_ondemand_object_is_dropping(object)) {</div><div class='ctx'> 			xas_unlock(&amp;xas);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -432,20 +545,32 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> </div><div class='ctx'> 		if (opcode == CACHEFILES_OP_CLOSE &amp;&amp;</div><div class='del'>-			!cachefiles_ondemand_object_is_open(object)) {</div><div class='add'>+		    !cachefiles_ondemand_object_is_open(object)) {</div><div class='ctx'> 			WARN_ON_ONCE(object-&gt;ondemand-&gt;ondemand_id == 0);</div><div class='ctx'> 			xas_unlock(&amp;xas);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		xas.xa_index = 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Cyclically find a free xas to avoid msg_id reuse that would</div><div class='add'>+		 * cause the daemon to successfully copen a stale msg_id.</div><div class='add'>+		 */</div><div class='add'>+		xas.xa_index = cache-&gt;msg_id_next;</div><div class='ctx'> 		xas_find_marked(&amp;xas, UINT_MAX, XA_FREE_MARK);</div><div class='add'>+		if (xas.xa_node == XAS_RESTART) {</div><div class='add'>+			xas.xa_index = 0;</div><div class='add'>+			xas_find_marked(&amp;xas, cache-&gt;msg_id_next - 1, XA_FREE_MARK);</div><div class='add'>+		}</div><div class='ctx'> 		if (xas.xa_node == XAS_RESTART)</div><div class='ctx'> 			xas_set_err(&amp;xas, -EBUSY);</div><div class='add'>+</div><div class='ctx'> 		xas_store(&amp;xas, req);</div><div class='del'>-		xas_clear_mark(&amp;xas, XA_FREE_MARK);</div><div class='del'>-		xas_set_mark(&amp;xas, CACHEFILES_REQ_NEW);</div><div class='add'>+		if (xas_valid(&amp;xas)) {</div><div class='add'>+			cache-&gt;msg_id_next = xas.xa_index + 1;</div><div class='add'>+			xas_clear_mark(&amp;xas, XA_FREE_MARK);</div><div class='add'>+			xas_set_mark(&amp;xas, CACHEFILES_REQ_NEW);</div><div class='add'>+		}</div><div class='ctx'> 		xas_unlock(&amp;xas);</div><div class='ctx'> 	} while (xas_nomem(&amp;xas, GFP_KERNEL));</div><div class='ctx'> </div><div class='hunk'>@@ -454,16 +579,27 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	wake_up_all(&amp;cache-&gt;daemon_pollwq);</div><div class='del'>-	wait_for_completion(&amp;req-&gt;done);</div><div class='del'>-	ret = req-&gt;error;</div><div class='del'>-	kfree(req);</div><div class='add'>+wait:</div><div class='add'>+	ret = wait_for_completion_killable(&amp;req-&gt;done);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = req-&gt;error;</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINTR;</div><div class='add'>+		if (!cachefiles_ondemand_finish_req(req, &amp;xas, ret)) {</div><div class='add'>+			/* Someone will complete it soon. */</div><div class='add'>+			cpu_relax();</div><div class='add'>+			goto wait;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cachefiles_req_put(req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> out:</div><div class='ctx'> 	/* Reset the object to close state in error handling path.</div><div class='ctx'> 	 * If error occurs after creating the anonymous fd,</div><div class='ctx'> 	 * cachefiles_ondemand_fd_release() will set object to close.</div><div class='ctx'> 	 */</div><div class='del'>-	if (opcode == CACHEFILES_OP_OPEN)</div><div class='add'>+	if (opcode == CACHEFILES_OP_OPEN &amp;&amp;</div><div class='add'>+	    !cachefiles_ondemand_object_is_dropping(object))</div><div class='ctx'> 		cachefiles_ondemand_set_object_close(object);</div><div class='ctx'> 	kfree(req);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -539,6 +675,9 @@ int cachefiles_ondemand_init_object(struct cachefiles_object *object)</div><div class='ctx'> 	struct fscache_volume *volume = object-&gt;volume-&gt;vcookie;</div><div class='ctx'> 	size_t volume_key_size, cookie_key_size, data_len;</div><div class='ctx'> </div><div class='add'>+	if (!object-&gt;ondemand)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CacheFiles will firstly check the cache file under the root cache</div><div class='ctx'> 	 * directory. If the coherency check failed, it will fallback to</div><div class='hunk'>@@ -559,8 +698,34 @@ int cachefiles_ondemand_init_object(struct cachefiles_object *object)</div><div class='ctx'> </div><div class='ctx'> void cachefiles_ondemand_clean_object(struct cachefiles_object *object)</div><div class='ctx'> {</div><div class='add'>+	unsigned long index;</div><div class='add'>+	struct cachefiles_req *req;</div><div class='add'>+	struct cachefiles_cache *cache;</div><div class='add'>+</div><div class='add'>+	if (!object-&gt;ondemand)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	cachefiles_ondemand_send_req(object, CACHEFILES_OP_CLOSE, 0,</div><div class='ctx'> 			cachefiles_ondemand_init_close_req, NULL);</div><div class='add'>+</div><div class='add'>+	if (!object-&gt;ondemand-&gt;ondemand_id)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Cancel all requests for the object that is being dropped. */</div><div class='add'>+	cache = object-&gt;volume-&gt;cache;</div><div class='add'>+	xa_lock(&amp;cache-&gt;reqs);</div><div class='add'>+	cachefiles_ondemand_set_object_dropping(object);</div><div class='add'>+	xa_for_each(&amp;cache-&gt;reqs, index, req) {</div><div class='add'>+		if (req-&gt;object == object) {</div><div class='add'>+			req-&gt;error = -EIO;</div><div class='add'>+			complete(&amp;req-&gt;done);</div><div class='add'>+			__xa_erase(&amp;cache-&gt;reqs, index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	xa_unlock(&amp;cache-&gt;reqs);</div><div class='add'>+</div><div class='add'>+	/* Wait for ondemand_object_worker() to finish to avoid UAF. */</div><div class='add'>+	cancel_work_sync(&amp;object-&gt;ondemand-&gt;ondemand_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object,</div><div class='hunk'>@@ -575,6 +740,7 @@ int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	object-&gt;ondemand-&gt;object = object;</div><div class='add'>+	spin_lock_init(&amp;object-&gt;ondemand-&gt;lock);</div><div class='ctx'> 	INIT_WORK(&amp;object-&gt;ondemand-&gt;ondemand_work, ondemand_object_worker);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/cachefiles/security.c b/fs/cachefiles/security.c<br/>index fe777164f1d8..fc6611886b3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/security.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/security.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/security.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/security.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@ int cachefiles_get_security_ID(struct cachefiles_cache *cache)</div><div class='ctx'> 	struct cred *new;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("{%s}", cache-&gt;secctx);</div><div class='add'>+	_enter("{%u}", cache-&gt;have_secid ? cache-&gt;secid : 0);</div><div class='ctx'> </div><div class='ctx'> 	new = prepare_kernel_cred(current);</div><div class='ctx'> 	if (!new) {</div><div class='hunk'>@@ -26,8 +26,8 @@ int cachefiles_get_security_ID(struct cachefiles_cache *cache)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cache-&gt;secctx) {</div><div class='del'>-		ret = set_security_override_from_ctx(new, cache-&gt;secctx);</div><div class='add'>+	if (cache-&gt;have_secid) {</div><div class='add'>+		ret = set_security_override(new, cache-&gt;secid);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			put_cred(new);</div><div class='ctx'> 			pr_err("Security denies permission to nominate security context: error %d\n",</div><div class='head'>diff --git a/fs/cachefiles/volume.c b/fs/cachefiles/volume.c<br/>index 89df0ba8ba5e..90ba926f488e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/volume.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/volume.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/volume.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/volume.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include &lt;trace/events/fscache.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -58,9 +59,11 @@ retry:</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			if (ret != -ESTALE)</div><div class='ctx'> 				goto error_dir;</div><div class='del'>-			inode_lock_nested(d_inode(cache-&gt;store), I_MUTEX_PARENT);</div><div class='del'>-			cachefiles_bury_object(cache, NULL, cache-&gt;store, vdentry,</div><div class='del'>-					       FSCACHE_VOLUME_IS_WEIRD);</div><div class='add'>+			vdentry = start_removing_dentry(cache-&gt;store, vdentry);</div><div class='add'>+			if (!IS_ERR(vdentry))</div><div class='add'>+				cachefiles_bury_object(cache, NULL, cache-&gt;store,</div><div class='add'>+						       vdentry,</div><div class='add'>+						       FSCACHE_VOLUME_IS_WEIRD);</div><div class='ctx'> 			cachefiles_put_directory(volume-&gt;dentry);</div><div class='ctx'> 			cond_resched();</div><div class='ctx'> 			goto retry;</div><div class='hunk'>@@ -133,7 +136,6 @@ void cachefiles_free_volume(struct fscache_volume *vcookie)</div><div class='ctx'> </div><div class='ctx'> void cachefiles_withdraw_volume(struct cachefiles_volume *volume)</div><div class='ctx'> {</div><div class='del'>-	fscache_withdraw_volume(volume-&gt;vcookie);</div><div class='ctx'> 	cachefiles_set_volume_xattr(volume);</div><div class='ctx'> 	__cachefiles_free_volume(volume);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c<br/>index bcb6173943ee..52383b1d0ba6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cachefiles/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cachefiles/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cachefiles/xattr.c</a></div><div class='hunk'>@@ -64,13 +64,20 @@ int cachefiles_set_object_xattr(struct cachefiles_object *object)</div><div class='ctx'> 		memcpy(buf-&gt;data, fscache_get_aux(object-&gt;cookie), len);</div><div class='ctx'> </div><div class='ctx'> 	ret = cachefiles_inject_write_error();</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = vfs_setxattr(&amp;nop_mnt_idmap, dentry, cachefiles_xattr_cache,</div><div class='del'>-				   buf, sizeof(struct cachefiles_xattr) + len, 0);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = mnt_want_write_file(file);</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ret = vfs_setxattr(&amp;nop_mnt_idmap, dentry,</div><div class='add'>+					   cachefiles_xattr_cache, buf,</div><div class='add'>+					   sizeof(struct cachefiles_xattr) + len, 0);</div><div class='add'>+			mnt_drop_write_file(file);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		trace_cachefiles_vfs_error(object, file_inode(file), ret,</div><div class='ctx'> 					   cachefiles_trace_setxattr_error);</div><div class='ctx'> 		trace_cachefiles_coherency(object, file_inode(file)-&gt;i_ino,</div><div class='add'>+					   be64_to_cpup((__be64 *)buf-&gt;data),</div><div class='ctx'> 					   buf-&gt;content,</div><div class='ctx'> 					   cachefiles_coherency_set_fail);</div><div class='ctx'> 		if (ret != -ENOMEM)</div><div class='hunk'>@@ -79,6 +86,7 @@ int cachefiles_set_object_xattr(struct cachefiles_object *object)</div><div class='ctx'> 				"Failed to set xattr with error %d", ret);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		trace_cachefiles_coherency(object, file_inode(file)-&gt;i_ino,</div><div class='add'>+					   be64_to_cpup((__be64 *)buf-&gt;data),</div><div class='ctx'> 					   buf-&gt;content,</div><div class='ctx'> 					   cachefiles_coherency_set_ok);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -110,15 +118,20 @@ int cachefiles_check_auxdata(struct cachefiles_object *object, struct file *file</div><div class='ctx'> 	if (xlen == 0)</div><div class='ctx'> 		xlen = vfs_getxattr(&amp;nop_mnt_idmap, dentry, cachefiles_xattr_cache, buf, tlen);</div><div class='ctx'> 	if (xlen != tlen) {</div><div class='del'>-		if (xlen &lt; 0)</div><div class='add'>+		if (xlen &lt; 0) {</div><div class='add'>+			ret = xlen;</div><div class='ctx'> 			trace_cachefiles_vfs_error(object, file_inode(file), xlen,</div><div class='ctx'> 						   cachefiles_trace_getxattr_error);</div><div class='add'>+		}</div><div class='ctx'> 		if (xlen == -EIO)</div><div class='ctx'> 			cachefiles_io_error_obj(</div><div class='ctx'> 				object,</div><div class='ctx'> 				"Failed to read aux with error %zd", xlen);</div><div class='ctx'> 		why = cachefiles_coherency_check_xattr;</div><div class='del'>-	} else if (buf-&gt;type != CACHEFILES_COOKIE_TYPE_DATA) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;type != CACHEFILES_COOKIE_TYPE_DATA) {</div><div class='ctx'> 		why = cachefiles_coherency_check_type;</div><div class='ctx'> 	} else if (memcmp(buf-&gt;data, p, len) != 0) {</div><div class='ctx'> 		why = cachefiles_coherency_check_aux;</div><div class='hunk'>@@ -133,7 +146,9 @@ int cachefiles_check_auxdata(struct cachefiles_object *object, struct file *file</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	trace_cachefiles_coherency(object, file_inode(file)-&gt;i_ino,</div><div class='add'>+				   be64_to_cpup((__be64 *)buf-&gt;data),</div><div class='ctx'> 				   buf-&gt;content, why);</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -149,8 +164,14 @@ int cachefiles_remove_object_xattr(struct cachefiles_cache *cache,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = cachefiles_inject_remove_error();</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = vfs_removexattr(&amp;nop_mnt_idmap, dentry, cachefiles_xattr_cache);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = mnt_want_write(cache-&gt;mnt);</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ret = vfs_removexattr(&amp;nop_mnt_idmap, dentry,</div><div class='add'>+					      cachefiles_xattr_cache);</div><div class='add'>+			mnt_drop_write(cache-&gt;mnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		trace_cachefiles_vfs_error(object, d_inode(dentry), ret,</div><div class='ctx'> 					   cachefiles_trace_remxattr_error);</div><div class='hunk'>@@ -206,9 +227,15 @@ bool cachefiles_set_volume_xattr(struct cachefiles_volume *volume)</div><div class='ctx'> 	memcpy(buf-&gt;data, p, volume-&gt;vcookie-&gt;coherency_len);</div><div class='ctx'> </div><div class='ctx'> 	ret = cachefiles_inject_write_error();</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = vfs_setxattr(&amp;nop_mnt_idmap, dentry, cachefiles_xattr_cache,</div><div class='del'>-				   buf, len, 0);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = mnt_want_write(volume-&gt;cache-&gt;mnt);</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ret = vfs_setxattr(&amp;nop_mnt_idmap, dentry,</div><div class='add'>+					   cachefiles_xattr_cache,</div><div class='add'>+					   buf, len, 0);</div><div class='add'>+			mnt_drop_write(volume-&gt;cache-&gt;mnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		trace_cachefiles_vfs_error(NULL, d_inode(dentry), ret,</div><div class='ctx'> 					   cachefiles_trace_setxattr_error);</div><div class='hunk'>@@ -252,6 +279,7 @@ int cachefiles_check_volume_xattr(struct cachefiles_volume *volume)</div><div class='ctx'> 		xlen = vfs_getxattr(&amp;nop_mnt_idmap, dentry, cachefiles_xattr_cache, buf, len);</div><div class='ctx'> 	if (xlen != len) {</div><div class='ctx'> 		if (xlen &lt; 0) {</div><div class='add'>+			ret = xlen;</div><div class='ctx'> 			trace_cachefiles_vfs_error(NULL, d_inode(dentry), xlen,</div><div class='ctx'> 						   cachefiles_trace_getxattr_error);</div><div class='ctx'> 			if (xlen == -EIO)</div><div class='head'>diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig<br/>index 7249d70e1a43..3e7def3d31c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@ config CEPH_FS</div><div class='ctx'> 	tristate "Ceph distributed file system"</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	select CEPH_LIB</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	select CRYPTO</div><div class='ctx'> 	select NETFS_SUPPORT</div><div class='head'>diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c<br/>index 1340d77124ae..63b75d214210 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/addr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/addr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/addr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/addr.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/netfs.h&gt;</div><div class='add'>+#include &lt;trace/events/netfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "super.h"</div><div class='ctx'> #include "mds_client.h"</div><div class='hunk'>@@ -81,6 +82,7 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='add'>+	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode-&gt;i_sb);</div><div class='ctx'> 	struct ceph_inode_info *ci;</div><div class='ctx'> 	struct ceph_snap_context *snapc;</div><div class='ctx'> </div><div class='hunk'>@@ -91,11 +93,12 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	atomic64_inc(&amp;mdsc-&gt;dirty_folios);</div><div class='add'>+</div><div class='ctx'> 	ci = ceph_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* dirty the head */</div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-	BUG_ON(ci-&gt;i_wr_ref == 0); // caller should hold Fw reference</div><div class='ctx'> 	if (__ceph_have_pending_cap_snap(ci)) {</div><div class='ctx'> 		struct ceph_cap_snap *capsnap =</div><div class='ctx'> 				list_last_entry(&amp;ci-&gt;i_cap_snaps,</div><div class='hunk'>@@ -193,7 +196,7 @@ static void ceph_netfs_expand_readahead(struct netfs_io_request *rreq)</div><div class='ctx'> 	 * block, but do not exceed the file size, unless the original</div><div class='ctx'> 	 * request already exceeds it.</div><div class='ctx'> 	 */</div><div class='del'>-	new_end = min(round_up(end, lo-&gt;stripe_unit), rreq-&gt;i_size);</div><div class='add'>+	new_end = umin(round_up(end, lo-&gt;stripe_unit), rreq-&gt;i_size);</div><div class='ctx'> 	if (new_end &gt; end &amp;&amp; new_end &lt;= rreq-&gt;start + max_len)</div><div class='ctx'> 		rreq-&gt;len = new_end - rreq-&gt;start;</div><div class='ctx'> </div><div class='hunk'>@@ -205,21 +208,6 @@ static void ceph_netfs_expand_readahead(struct netfs_io_request *rreq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ceph_netfs_clamp_length(struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = subreq-&gt;rreq-&gt;inode;</div><div class='del'>-	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='del'>-	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='del'>-	u64 objno, objoff;</div><div class='del'>-	u32 xlen;</div><div class='del'>-</div><div class='del'>-	/* Truncate the extent at the end of the current block */</div><div class='del'>-	ceph_calc_file_object_mapping(&amp;ci-&gt;i_layout, subreq-&gt;start, subreq-&gt;len,</div><div class='del'>-				      &amp;objno, &amp;objoff, &amp;xlen);</div><div class='del'>-	subreq-&gt;len = min(xlen, fsc-&gt;mount_options-&gt;rsize);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void finish_netfs_read(struct ceph_osd_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = req-&gt;r_inode;</div><div class='hunk'>@@ -238,15 +226,20 @@ static void finish_netfs_read(struct ceph_osd_request *req)</div><div class='ctx'> 	      subreq-&gt;len, i_size_read(req-&gt;r_inode));</div><div class='ctx'> </div><div class='ctx'> 	/* no object means success but no data */</div><div class='del'>-	if (err == -ENOENT)</div><div class='add'>+	if (err == -ENOENT) {</div><div class='add'>+		__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='add'>+		__set_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='ctx'> 		err = 0;</div><div class='del'>-	else if (err == -EBLOCKLISTED)</div><div class='add'>+	} else if (err == -EBLOCKLISTED) {</div><div class='ctx'> 		fsc-&gt;blocklisted = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err &gt;= 0) {</div><div class='ctx'> 		if (sparse &amp;&amp; err &gt; 0)</div><div class='ctx'> 			err = ceph_sparse_ext_map_end(op);</div><div class='del'>-		if (err &lt; subreq-&gt;len)</div><div class='add'>+		if (err &lt; subreq-&gt;len &amp;&amp;</div><div class='add'>+		    subreq-&gt;rreq-&gt;origin != NETFS_UNBUFFERED_READ &amp;&amp;</div><div class='add'>+		    subreq-&gt;rreq-&gt;origin != NETFS_DIO_READ)</div><div class='ctx'> 			__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='ctx'> 		if (IS_ENCRYPTED(inode) &amp;&amp; err &gt; 0) {</div><div class='ctx'> 			err = ceph_fscrypt_decrypt_extents(inode,</div><div class='hunk'>@@ -256,6 +249,8 @@ static void finish_netfs_read(struct ceph_osd_request *req)</div><div class='ctx'> 			if (err &gt; subreq-&gt;len)</div><div class='ctx'> 				err = subreq-&gt;len;</div><div class='ctx'> 		}</div><div class='add'>+		if (err &gt; 0)</div><div class='add'>+			__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (osd_data-&gt;type == CEPH_OSD_DATA_TYPE_PAGES) {</div><div class='hunk'>@@ -263,7 +258,13 @@ static void finish_netfs_read(struct ceph_osd_request *req)</div><div class='ctx'> 				     calc_pages_for(osd_data-&gt;alignment,</div><div class='ctx'> 					osd_data-&gt;length), false);</div><div class='ctx'> 	}</div><div class='del'>-	netfs_subreq_terminated(subreq, err, false);</div><div class='add'>+	if (err &gt; 0) {</div><div class='add'>+		subreq-&gt;transferred = err;</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	subreq-&gt;error = err;</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_io_progress);</div><div class='add'>+	netfs_read_subreq_terminated(subreq);</div><div class='ctx'> 	iput(req-&gt;r_inode);</div><div class='ctx'> 	ceph_dec_osd_stopping_blocker(fsc-&gt;mdsc);</div><div class='ctx'> }</div><div class='hunk'>@@ -277,12 +278,13 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	struct ceph_mds_request *req;</div><div class='ctx'> 	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode-&gt;i_sb);</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='del'>-	struct iov_iter iter;</div><div class='ctx'> 	ssize_t err = 0;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	int mode;</div><div class='ctx'> </div><div class='del'>-	__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='add'>+	if (rreq-&gt;origin != NETFS_UNBUFFERED_READ &amp;&amp;</div><div class='add'>+	    rreq-&gt;origin != NETFS_DIO_READ)</div><div class='add'>+		__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='ctx'> 	__clear_bit(NETFS_SREQ_COPY_TO_CACHE, &amp;subreq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (subreq-&gt;start &gt;= inode-&gt;i_size)</div><div class='hunk'>@@ -299,6 +301,7 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	req-&gt;r_args.getattr.mask = cpu_to_le32(CEPH_STAT_CAP_INLINE_DATA);</div><div class='ctx'> 	req-&gt;r_num_caps = 2;</div><div class='ctx'> </div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='ctx'> 	err = ceph_mdsc_do_request(mdsc, NULL, req);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -312,17 +315,38 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	len = min_t(size_t, iinfo-&gt;inline_len - subreq-&gt;start, subreq-&gt;len);</div><div class='del'>-	iov_iter_xarray(&amp;iter, ITER_DEST, &amp;rreq-&gt;mapping-&gt;i_pages, subreq-&gt;start, len);</div><div class='del'>-	err = copy_to_iter(iinfo-&gt;inline_data + subreq-&gt;start, len, &amp;iter);</div><div class='del'>-	if (err == 0)</div><div class='add'>+	err = copy_to_iter(iinfo-&gt;inline_data + subreq-&gt;start, len, &amp;subreq-&gt;io_iter);</div><div class='add'>+	if (err == 0) {</div><div class='ctx'> 		err = -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		subreq-&gt;transferred += err;</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ceph_mdsc_put_request(req);</div><div class='ctx'> out:</div><div class='del'>-	netfs_subreq_terminated(subreq, err, false);</div><div class='add'>+	subreq-&gt;error = err;</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_io_progress);</div><div class='add'>+	netfs_read_subreq_terminated(subreq);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ceph_netfs_prepare_read(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='add'>+	struct inode *inode = rreq-&gt;inode;</div><div class='add'>+	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	u64 objno, objoff;</div><div class='add'>+	u32 xlen;</div><div class='add'>+</div><div class='add'>+	/* Truncate the extent at the end of the current block */</div><div class='add'>+	ceph_calc_file_object_mapping(&amp;ci-&gt;i_layout, subreq-&gt;start, subreq-&gt;len,</div><div class='add'>+				      &amp;objno, &amp;objoff, &amp;xlen);</div><div class='add'>+	rreq-&gt;io_streams[0].sreq_max_len = umin(xlen, fsc-&gt;mount_options-&gt;rsize);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='hunk'>@@ -332,9 +356,8 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	struct ceph_client *cl = fsc-&gt;client;</div><div class='ctx'> 	struct ceph_osd_request *req = NULL;</div><div class='ctx'> 	struct ceph_vino vino = ceph_vino(inode);</div><div class='del'>-	struct iov_iter iter;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u64 len = subreq-&gt;len;</div><div class='add'>+	int err;</div><div class='add'>+	u64 len;</div><div class='ctx'> 	bool sparse = IS_ENCRYPTED(inode) || ceph_test_mount_opt(fsc, SPARSEREAD);</div><div class='ctx'> 	u64 off = subreq-&gt;start;</div><div class='ctx'> 	int extent_cnt;</div><div class='hunk'>@@ -347,6 +370,12 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	if (ceph_has_inline_data(ci) &amp;&amp; ceph_netfs_issue_op_inline(subreq))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	// TODO: This rounding here is slightly dodgy.  It *should* work, for</div><div class='add'>+	// now, as the cache only deals in blocks that are a multiple of</div><div class='add'>+	// PAGE_SIZE and fscrypt blocks are at most PAGE_SIZE.  What needs to</div><div class='add'>+	// happen is for the fscrypt driving to be moved into netfslib and the</div><div class='add'>+	// data in the cache also to be stored encrypted.</div><div class='add'>+	len = subreq-&gt;len;</div><div class='ctx'> 	ceph_fscrypt_adjust_off_and_len(inode, &amp;off, &amp;len);</div><div class='ctx'> </div><div class='ctx'> 	req = ceph_osdc_new_request(&amp;fsc-&gt;client-&gt;osdc, &amp;ci-&gt;i_layout, vino,</div><div class='hunk'>@@ -369,8 +398,6 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	doutc(cl, "%llx.%llx pos=%llu orig_len=%zu len=%llu\n",</div><div class='ctx'> 	      ceph_vinop(inode), subreq-&gt;start, subreq-&gt;len, len);</div><div class='ctx'> </div><div class='del'>-	iov_iter_xarray(&amp;iter, ITER_DEST, &amp;rreq-&gt;mapping-&gt;i_pages, subreq-&gt;start, len);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME: For now, use CEPH_OSD_DATA_TYPE_PAGES instead of _ITER for</div><div class='ctx'> 	 * encrypted inodes. We'd need infrastructure that handles an iov_iter</div><div class='hunk'>@@ -382,7 +409,16 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 		struct page **pages;</div><div class='ctx'> 		size_t page_off;</div><div class='ctx'> </div><div class='del'>-		err = iov_iter_get_pages_alloc2(&amp;iter, &amp;pages, len, &amp;page_off);</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: io_iter.count needs to be corrected to aligned</div><div class='add'>+		 * length. Otherwise, iov_iter_get_pages_alloc2() operates</div><div class='add'>+		 * with the initial unaligned length value. As a result,</div><div class='add'>+		 * ceph_msg_data_cursor_init() triggers BUG_ON() in the case</div><div class='add'>+		 * if msg-&gt;sparse_read_total &gt; msg-&gt;data_length.</div><div class='add'>+		 */</div><div class='add'>+		subreq-&gt;io_iter.count = len;</div><div class='add'>+</div><div class='add'>+		err = iov_iter_get_pages_alloc2(&amp;subreq-&gt;io_iter, &amp;pages, len, &amp;page_off);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			doutc(cl, "%llx.%llx failed to allocate pages, %d\n",</div><div class='ctx'> 			      ceph_vinop(inode), err);</div><div class='hunk'>@@ -397,7 +433,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 		osd_req_op_extent_osd_data_pages(req, 0, pages, len, 0, false,</div><div class='ctx'> 						 false);</div><div class='ctx'> 	} else {</div><div class='del'>-		osd_req_op_extent_osd_iter(req, 0, &amp;iter);</div><div class='add'>+		osd_req_op_extent_osd_iter(req, 0, &amp;subreq-&gt;io_iter);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!ceph_inc_osd_stopping_blocker(fsc-&gt;mdsc)) {</div><div class='ctx'> 		err = -EIO;</div><div class='hunk'>@@ -408,22 +444,29 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)</div><div class='ctx'> 	req-&gt;r_inode = inode;</div><div class='ctx'> 	ihold(inode);</div><div class='ctx'> </div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='ctx'> 	ceph_osdc_start_request(req-&gt;r_osdc, req);</div><div class='ctx'> out:</div><div class='ctx'> 	ceph_osdc_put_request(req);</div><div class='del'>-	if (err)</div><div class='del'>-		netfs_subreq_terminated(subreq, err, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		subreq-&gt;error = err;</div><div class='add'>+		netfs_read_subreq_terminated(subreq);</div><div class='add'>+	}</div><div class='ctx'> 	doutc(cl, "%llx.%llx result %d\n", ceph_vinop(inode), err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = rreq-&gt;inode;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='ctx'> 	int got = 0, want = CEPH_CAP_FILE_CACHE;</div><div class='ctx'> 	struct ceph_netfs_request_data *priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	/* [DEPRECATED] Use PG_private_2 to mark folio being written to the cache. */</div><div class='add'>+	__set_bit(NETFS_RREQ_USE_PGPRIV2, &amp;rreq-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	if (rreq-&gt;origin != NETFS_READAHEAD)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -467,10 +510,14 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;caps = got;</div><div class='ctx'> 	rreq-&gt;netfs_priv = priv;</div><div class='add'>+	rreq-&gt;io_streams[0].sreq_max_len = fsc-&gt;mount_options-&gt;rsize;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (got)</div><div class='add'>+			ceph_put_cap_refs(ceph_inode(inode), got);</div><div class='ctx'> 		kfree(priv);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -491,19 +538,19 @@ static void ceph_netfs_free_request(struct netfs_io_request *rreq)</div><div class='ctx'> const struct netfs_request_ops ceph_netfs_ops = {</div><div class='ctx'> 	.init_request		= ceph_init_request,</div><div class='ctx'> 	.free_request		= ceph_netfs_free_request,</div><div class='add'>+	.prepare_read		= ceph_netfs_prepare_read,</div><div class='ctx'> 	.issue_read		= ceph_netfs_issue_read,</div><div class='ctx'> 	.expand_readahead	= ceph_netfs_expand_readahead,</div><div class='del'>-	.clamp_length		= ceph_netfs_clamp_length,</div><div class='ctx'> 	.check_write_begin	= ceph_netfs_check_write_begin,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CEPH_FSCACHE</div><div class='ctx'> static void ceph_set_page_fscache(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	set_page_fscache(page);</div><div class='add'>+	folio_start_private_2(page_folio(page)); /* [DEPRECATED] */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ceph_fscache_write_terminated(void *priv, ssize_t error, bool was_async)</div><div class='add'>+static void ceph_fscache_write_terminated(void *priv, ssize_t error)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = priv;</div><div class='ctx'> </div><div class='hunk'>@@ -517,7 +564,7 @@ static void ceph_fscache_write_to_cache(struct inode *inode, u64 off, u64 len, b</div><div class='ctx'> 	struct fscache_cookie *cookie = ceph_fscache_cookie(ci);</div><div class='ctx'> </div><div class='ctx'> 	fscache_write_to_cache(cookie, inode-&gt;i_mapping, off, len, i_size_read(inode),</div><div class='del'>-			       ceph_fscache_write_terminated, inode, caching);</div><div class='add'>+			       ceph_fscache_write_terminated, inode, true, caching);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void ceph_set_page_fscache(struct page *page)</div><div class='hunk'>@@ -535,7 +582,36 @@ struct ceph_writeback_ctl</div><div class='ctx'> 	u64 truncate_size;</div><div class='ctx'> 	u32 truncate_seq;</div><div class='ctx'> 	bool size_stable;</div><div class='add'>+</div><div class='ctx'> 	bool head_snapc;</div><div class='add'>+	struct ceph_snap_context *snapc;</div><div class='add'>+	struct ceph_snap_context *last_snapc;</div><div class='add'>+</div><div class='add'>+	bool done;</div><div class='add'>+	bool should_loop;</div><div class='add'>+	bool range_whole;</div><div class='add'>+	pgoff_t start_index;</div><div class='add'>+	pgoff_t index;</div><div class='add'>+	pgoff_t end;</div><div class='add'>+	xa_mark_t tag;</div><div class='add'>+</div><div class='add'>+	pgoff_t strip_unit_end;</div><div class='add'>+	unsigned int wsize;</div><div class='add'>+	unsigned int nr_folios;</div><div class='add'>+	unsigned int max_pages;</div><div class='add'>+	unsigned int locked_pages;</div><div class='add'>+</div><div class='add'>+	int op_idx;</div><div class='add'>+	int num_ops;</div><div class='add'>+	u64 offset;</div><div class='add'>+	u64 len;</div><div class='add'>+</div><div class='add'>+	struct folio_batch fbatch;</div><div class='add'>+	unsigned int processed_in_fbatch;</div><div class='add'>+</div><div class='add'>+	bool from_pool;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	struct page **data_pages;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -633,22 +709,23 @@ static u64 get_writepages_data_length(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Write a single page, but leave the page locked.</div><div class='add'>+ * Write a folio, but leave it locked.</div><div class='ctx'>  *</div><div class='ctx'>  * If we get a write error, mark the mapping for error, but still adjust the</div><div class='del'>- * dirty page accounting (i.e., page is no longer dirty).</div><div class='add'>+ * dirty page accounting (i.e., folio is no longer dirty).</div><div class='ctx'>  */</div><div class='del'>-static int writepage_nounlock(struct page *page, struct writeback_control *wbc)</div><div class='add'>+static int write_folio_nounlock(struct folio *folio,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct page *page = &amp;folio-&gt;page;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> 	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='ctx'> 	struct ceph_client *cl = fsc-&gt;client;</div><div class='ctx'> 	struct ceph_snap_context *snapc, *oldest;</div><div class='del'>-	loff_t page_off = page_offset(page);</div><div class='add'>+	loff_t page_off = folio_pos(folio);</div><div class='ctx'> 	int err;</div><div class='del'>-	loff_t len = thp_size(page);</div><div class='add'>+	loff_t len = folio_size(folio);</div><div class='ctx'> 	loff_t wlen;</div><div class='ctx'> 	struct ceph_writeback_ctl ceph_wbc;</div><div class='ctx'> 	struct ceph_osd_client *osdc = &amp;fsc-&gt;client-&gt;osdc;</div><div class='hunk'>@@ -656,27 +733,27 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 	bool caching = ceph_is_cache_enabled(inode);</div><div class='ctx'> 	struct page *bounce_page = NULL;</div><div class='ctx'> </div><div class='del'>-	doutc(cl, "%llx.%llx page %p idx %lu\n", ceph_vinop(inode), page,</div><div class='del'>-	      page-&gt;index);</div><div class='add'>+	doutc(cl, "%llx.%llx folio %p idx %lu\n", ceph_vinop(inode), folio,</div><div class='add'>+	      folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* verify this is a writeable snap context */</div><div class='del'>-	snapc = page_snap_context(page);</div><div class='add'>+	snapc = page_snap_context(&amp;folio-&gt;page);</div><div class='ctx'> 	if (!snapc) {</div><div class='del'>-		doutc(cl, "%llx.%llx page %p not dirty?\n", ceph_vinop(inode),</div><div class='del'>-		      page);</div><div class='add'>+		doutc(cl, "%llx.%llx folio %p not dirty?\n", ceph_vinop(inode),</div><div class='add'>+		      folio);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	oldest = get_oldest_context(inode, &amp;ceph_wbc, snapc);</div><div class='ctx'> 	if (snapc-&gt;seq &gt; oldest-&gt;seq) {</div><div class='del'>-		doutc(cl, "%llx.%llx page %p snapc %p not writeable - noop\n",</div><div class='del'>-		      ceph_vinop(inode), page, snapc);</div><div class='add'>+		doutc(cl, "%llx.%llx folio %p snapc %p not writeable - noop\n",</div><div class='add'>+		      ceph_vinop(inode), folio, snapc);</div><div class='ctx'> 		/* we should only noop if called by kswapd */</div><div class='ctx'> 		WARN_ON(!(current-&gt;flags &amp; PF_MEMALLOC));</div><div class='ctx'> 		ceph_put_snap_context(oldest);</div><div class='del'>-		redirty_page_for_writepage(wbc, page);</div><div class='add'>+		folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ceph_put_snap_context(oldest);</div><div class='hunk'>@@ -693,8 +770,8 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 		len = ceph_wbc.i_size - page_off;</div><div class='ctx'> </div><div class='ctx'> 	wlen = IS_ENCRYPTED(inode) ? round_up(len, CEPH_FSCRYPT_BLOCK_SIZE) : len;</div><div class='del'>-	doutc(cl, "%llx.%llx page %p index %lu on %llu~%llu snapc %p seq %lld\n",</div><div class='del'>-	      ceph_vinop(inode), page, page-&gt;index, page_off, wlen, snapc,</div><div class='add'>+	doutc(cl, "%llx.%llx folio %p index %lu on %llu~%llu snapc %p seq %lld\n",</div><div class='add'>+	      ceph_vinop(inode), folio, folio-&gt;index, page_off, wlen, snapc,</div><div class='ctx'> 	      snapc-&gt;seq);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_long_inc_return(&amp;fsc-&gt;writeback_count) &gt;</div><div class='hunk'>@@ -707,32 +784,32 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 				    ceph_wbc.truncate_seq,</div><div class='ctx'> 				    ceph_wbc.truncate_size, true);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='del'>-		redirty_page_for_writepage(wbc, page);</div><div class='add'>+		folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wlen &lt; len)</div><div class='ctx'> 		len = wlen;</div><div class='ctx'> </div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> 	if (caching)</div><div class='del'>-		ceph_set_page_fscache(page);</div><div class='add'>+		ceph_set_page_fscache(&amp;folio-&gt;page);</div><div class='ctx'> 	ceph_fscache_write_to_cache(inode, page_off, len, caching);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENCRYPTED(inode)) {</div><div class='del'>-		bounce_page = fscrypt_encrypt_pagecache_blocks(page,</div><div class='add'>+		bounce_page = fscrypt_encrypt_pagecache_blocks(folio,</div><div class='ctx'> 						    CEPH_FSCRYPT_BLOCK_SIZE, 0,</div><div class='ctx'> 						    GFP_NOFS);</div><div class='ctx'> 		if (IS_ERR(bounce_page)) {</div><div class='del'>-			redirty_page_for_writepage(wbc, page);</div><div class='del'>-			end_page_writeback(page);</div><div class='add'>+			folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+			folio_end_writeback(folio);</div><div class='ctx'> 			ceph_osdc_put_request(req);</div><div class='ctx'> 			return PTR_ERR(bounce_page);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* it may be a short write due to an object boundary */</div><div class='del'>-	WARN_ON_ONCE(len &gt; thp_size(page));</div><div class='add'>+	WARN_ON_ONCE(len &gt; folio_size(folio));</div><div class='ctx'> 	osd_req_op_extent_osd_data_pages(req, 0,</div><div class='ctx'> 			bounce_page ? &amp;bounce_page : &amp;page, wlen, 0,</div><div class='ctx'> 			false, false);</div><div class='hunk'>@@ -758,25 +835,25 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 		if (err == -ERESTARTSYS) {</div><div class='ctx'> 			/* killed by SIGKILL */</div><div class='ctx'> 			doutc(cl, "%llx.%llx interrupted page %p\n",</div><div class='del'>-			      ceph_vinop(inode), page);</div><div class='del'>-			redirty_page_for_writepage(wbc, page);</div><div class='del'>-			end_page_writeback(page);</div><div class='add'>+			      ceph_vinop(inode), folio);</div><div class='add'>+			folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+			folio_end_writeback(folio);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (err == -EBLOCKLISTED)</div><div class='ctx'> 			fsc-&gt;blocklisted = true;</div><div class='del'>-		doutc(cl, "%llx.%llx setting page/mapping error %d %p\n",</div><div class='del'>-		      ceph_vinop(inode), err, page);</div><div class='add'>+		doutc(cl, "%llx.%llx setting mapping error %d %p\n",</div><div class='add'>+		      ceph_vinop(inode), err, folio);</div><div class='ctx'> 		mapping_set_error(&amp;inode-&gt;i_data, err);</div><div class='ctx'> 		wbc-&gt;pages_skipped++;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		doutc(cl, "%llx.%llx cleaned page %p\n",</div><div class='del'>-		      ceph_vinop(inode), page);</div><div class='add'>+		      ceph_vinop(inode), folio);</div><div class='ctx'> 		err = 0;  /* vfs expects us to return 0 */</div><div class='ctx'> 	}</div><div class='del'>-	oldest = detach_page_private(page);</div><div class='add'>+	oldest = folio_detach_private(folio);</div><div class='ctx'> 	WARN_ON_ONCE(oldest != snapc);</div><div class='del'>-	end_page_writeback(page);</div><div class='add'>+	folio_end_writeback(folio);</div><div class='ctx'> 	ceph_put_wrbuffer_cap_refs(ci, 1, snapc);</div><div class='ctx'> 	ceph_put_snap_context(snapc);  /* page's reference */</div><div class='ctx'> </div><div class='hunk'>@@ -787,30 +864,6 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ceph_writepage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	BUG_ON(!inode);</div><div class='del'>-	ihold(inode);</div><div class='del'>-</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='del'>-	    ceph_inode_to_fs_client(inode)-&gt;write_congested)</div><div class='del'>-		return AOP_WRITEPAGE_ACTIVATE;</div><div class='del'>-</div><div class='del'>-	wait_on_page_fscache(page);</div><div class='del'>-</div><div class='del'>-	err = writepage_nounlock(page, wbc);</div><div class='del'>-	if (err == -ERESTARTSYS) {</div><div class='del'>-		/* direct memory reclaimer was killed by SIGKILL. return 0</div><div class='del'>-		 * to prevent caller from setting mapping/page error */</div><div class='del'>-		err = 0;</div><div class='del'>-	}</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	iput(inode);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * async writeback completion handler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -830,6 +883,7 @@ static void writepages_finish(struct ceph_osd_request *req)</div><div class='ctx'> 	struct ceph_snap_context *snapc = req-&gt;r_snapc;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode-&gt;i_sb);</div><div class='ctx'> 	unsigned int len = 0;</div><div class='ctx'> 	bool remove_page;</div><div class='ctx'> </div><div class='hunk'>@@ -885,6 +939,12 @@ static void writepages_finish(struct ceph_osd_request *req)</div><div class='ctx'> </div><div class='ctx'> 			ceph_put_snap_context(detach_page_private(page));</div><div class='ctx'> 			end_page_writeback(page);</div><div class='add'>+</div><div class='add'>+			if (atomic64_dec_return(&amp;mdsc-&gt;dirty_folios) &lt;= 0) {</div><div class='add'>+				wake_up_all(&amp;mdsc-&gt;flush_end_wq);</div><div class='add'>+				WARN_ON(atomic64_read(&amp;mdsc-&gt;dirty_folios) &lt; 0);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			doutc(cl, "unlocking %p\n", page);</div><div class='ctx'> </div><div class='ctx'> 			if (remove_page)</div><div class='hunk'>@@ -914,36 +974,13 @@ static void writepages_finish(struct ceph_osd_request *req)</div><div class='ctx'> 	ceph_dec_osd_stopping_blocker(fsc-&gt;mdsc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * initiate async writeback</div><div class='del'>- */</div><div class='del'>-static int ceph_writepages_start(struct address_space *mapping,</div><div class='del'>-				 struct writeback_control *wbc)</div><div class='add'>+static inline</div><div class='add'>+bool is_forced_umount(struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> 	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='ctx'> 	struct ceph_client *cl = fsc-&gt;client;</div><div class='del'>-	struct ceph_vino vino = ceph_vino(inode);</div><div class='del'>-	pgoff_t index, start_index, end = -1;</div><div class='del'>-	struct ceph_snap_context *snapc = NULL, *last_snapc = NULL, *pgsnapc;</div><div class='del'>-	struct folio_batch fbatch;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	unsigned int wsize = i_blocksize(inode);</div><div class='del'>-	struct ceph_osd_request *req = NULL;</div><div class='del'>-	struct ceph_writeback_ctl ceph_wbc;</div><div class='del'>-	bool should_loop, range_whole = false;</div><div class='del'>-	bool done = false;</div><div class='del'>-	bool caching = ceph_is_cache_enabled(inode);</div><div class='del'>-	xa_mark_t tag;</div><div class='del'>-</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='del'>-	    fsc-&gt;write_congested)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	doutc(cl, "%llx.%llx (mode=%s)\n", ceph_vinop(inode),</div><div class='del'>-	      wbc-&gt;sync_mode == WB_SYNC_NONE ? "NONE" :</div><div class='del'>-	      (wbc-&gt;sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD"));</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode)) {</div><div class='ctx'> 		if (ci-&gt;i_wrbuffer_ref &gt; 0) {</div><div class='hunk'>@@ -952,387 +989,730 @@ static int ceph_writepages_start(struct address_space *mapping,</div><div class='ctx'> 				ceph_vinop(inode), ceph_ino(inode));</div><div class='ctx'> 		}</div><div class='ctx'> 		mapping_set_error(mapping, -EIO);</div><div class='del'>-		return -EIO; /* we're in a forced umount, don't write! */</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+unsigned int ceph_define_write_size(struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	unsigned int wsize = i_blocksize(inode);</div><div class='add'>+</div><div class='ctx'> 	if (fsc-&gt;mount_options-&gt;wsize &lt; wsize)</div><div class='ctx'> 		wsize = fsc-&gt;mount_options-&gt;wsize;</div><div class='ctx'> </div><div class='del'>-	folio_batch_init(&amp;fbatch);</div><div class='add'>+	return wsize;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	start_index = wbc-&gt;range_cyclic ? mapping-&gt;writeback_index : 0;</div><div class='del'>-	index = start_index;</div><div class='add'>+static inline</div><div class='add'>+void ceph_folio_batch_init(struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	folio_batch_init(&amp;ceph_wbc-&gt;fbatch);</div><div class='add'>+	ceph_wbc-&gt;processed_in_fbatch = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void ceph_folio_batch_reinit(struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	folio_batch_release(&amp;ceph_wbc-&gt;fbatch);</div><div class='add'>+	ceph_folio_batch_init(ceph_wbc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void ceph_init_writeback_ctl(struct address_space *mapping,</div><div class='add'>+			     struct writeback_control *wbc,</div><div class='add'>+			     struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	ceph_wbc-&gt;snapc = NULL;</div><div class='add'>+	ceph_wbc-&gt;last_snapc = NULL;</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;strip_unit_end = 0;</div><div class='add'>+	ceph_wbc-&gt;wsize = ceph_define_write_size(mapping);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;nr_folios = 0;</div><div class='add'>+	ceph_wbc-&gt;max_pages = 0;</div><div class='add'>+	ceph_wbc-&gt;locked_pages = 0;</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;done = false;</div><div class='add'>+	ceph_wbc-&gt;should_loop = false;</div><div class='add'>+	ceph_wbc-&gt;range_whole = false;</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;start_index = wbc-&gt;range_cyclic ? mapping-&gt;writeback_index : 0;</div><div class='add'>+	ceph_wbc-&gt;index = ceph_wbc-&gt;start_index;</div><div class='add'>+	ceph_wbc-&gt;end = -1;</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;tag = wbc_to_tag(wbc);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;op_idx = -1;</div><div class='add'>+	ceph_wbc-&gt;num_ops = 0;</div><div class='add'>+	ceph_wbc-&gt;offset = 0;</div><div class='add'>+	ceph_wbc-&gt;len = 0;</div><div class='add'>+	ceph_wbc-&gt;from_pool = false;</div><div class='add'>+</div><div class='add'>+	ceph_folio_batch_init(ceph_wbc);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;pages = NULL;</div><div class='add'>+	ceph_wbc-&gt;data_pages = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+int ceph_define_writeback_range(struct address_space *mapping,</div><div class='add'>+				struct writeback_control *wbc,</div><div class='add'>+				struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_client *cl = fsc-&gt;client;</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages) {</div><div class='del'>-		tag = PAGECACHE_TAG_TOWRITE;</div><div class='del'>-	} else {</div><div class='del'>-		tag = PAGECACHE_TAG_DIRTY;</div><div class='del'>-	}</div><div class='del'>-retry:</div><div class='ctx'> 	/* find oldest snap context with dirty data */</div><div class='del'>-	snapc = get_oldest_context(inode, &amp;ceph_wbc, NULL);</div><div class='del'>-	if (!snapc) {</div><div class='add'>+	ceph_wbc-&gt;snapc = get_oldest_context(inode, ceph_wbc, NULL);</div><div class='add'>+	if (!ceph_wbc-&gt;snapc) {</div><div class='ctx'> 		/* hmm, why does writepages get called when there</div><div class='ctx'> 		   is no dirty data? */</div><div class='ctx'> 		doutc(cl, " no snap context with dirty data?\n");</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> 	}</div><div class='del'>-	doutc(cl, " oldest snapc is %p seq %lld (%d snaps)\n", snapc,</div><div class='del'>-	      snapc-&gt;seq, snapc-&gt;num_snaps);</div><div class='ctx'> </div><div class='del'>-	should_loop = false;</div><div class='del'>-	if (ceph_wbc.head_snapc &amp;&amp; snapc != last_snapc) {</div><div class='add'>+	doutc(cl, " oldest snapc is %p seq %lld (%d snaps)\n",</div><div class='add'>+	      ceph_wbc-&gt;snapc, ceph_wbc-&gt;snapc-&gt;seq,</div><div class='add'>+	      ceph_wbc-&gt;snapc-&gt;num_snaps);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;should_loop = false;</div><div class='add'>+</div><div class='add'>+	if (ceph_wbc-&gt;head_snapc &amp;&amp; ceph_wbc-&gt;snapc != ceph_wbc-&gt;last_snapc) {</div><div class='ctx'> 		/* where to start/end? */</div><div class='ctx'> 		if (wbc-&gt;range_cyclic) {</div><div class='del'>-			index = start_index;</div><div class='del'>-			end = -1;</div><div class='del'>-			if (index &gt; 0)</div><div class='del'>-				should_loop = true;</div><div class='del'>-			doutc(cl, " cyclic, start at %lu\n", index);</div><div class='add'>+			ceph_wbc-&gt;index = ceph_wbc-&gt;start_index;</div><div class='add'>+			ceph_wbc-&gt;end = -1;</div><div class='add'>+			if (ceph_wbc-&gt;index &gt; 0)</div><div class='add'>+				ceph_wbc-&gt;should_loop = true;</div><div class='add'>+			doutc(cl, " cyclic, start at %lu\n", ceph_wbc-&gt;index);</div><div class='ctx'> 		} else {</div><div class='del'>-			index = wbc-&gt;range_start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-			end = wbc-&gt;range_end &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			ceph_wbc-&gt;index = wbc-&gt;range_start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			ceph_wbc-&gt;end = wbc-&gt;range_end &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 			if (wbc-&gt;range_start == 0 &amp;&amp; wbc-&gt;range_end == LLONG_MAX)</div><div class='del'>-				range_whole = true;</div><div class='del'>-			doutc(cl, " not cyclic, %lu to %lu\n", index, end);</div><div class='add'>+				ceph_wbc-&gt;range_whole = true;</div><div class='add'>+			doutc(cl, " not cyclic, %lu to %lu\n",</div><div class='add'>+				ceph_wbc-&gt;index, ceph_wbc-&gt;end);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (!ceph_wbc.head_snapc) {</div><div class='add'>+	} else if (!ceph_wbc-&gt;head_snapc) {</div><div class='ctx'> 		/* Do not respect wbc-&gt;range_{start,end}. Dirty pages</div><div class='ctx'> 		 * in that range can be associated with newer snapc.</div><div class='ctx'> 		 * They are not writeable until we write all dirty pages</div><div class='ctx'> 		 * associated with 'snapc' get written */</div><div class='del'>-		if (index &gt; 0)</div><div class='del'>-			should_loop = true;</div><div class='add'>+		if (ceph_wbc-&gt;index &gt; 0)</div><div class='add'>+			ceph_wbc-&gt;should_loop = true;</div><div class='ctx'> 		doutc(cl, " non-head snapc, range whole\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='del'>-		tag_pages_for_writeback(mapping, index, end);</div><div class='add'>+	ceph_put_snap_context(ceph_wbc-&gt;last_snapc);</div><div class='add'>+	ceph_wbc-&gt;last_snapc = ceph_wbc-&gt;snapc;</div><div class='ctx'> </div><div class='del'>-	ceph_put_snap_context(last_snapc);</div><div class='del'>-	last_snapc = snapc;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	while (!done &amp;&amp; index &lt;= end) {</div><div class='del'>-		int num_ops = 0, op_idx;</div><div class='del'>-		unsigned i, nr_folios, max_pages, locked_pages = 0;</div><div class='del'>-		struct page **pages = NULL, **data_pages;</div><div class='del'>-		struct page *page;</div><div class='del'>-		pgoff_t strip_unit_end = 0;</div><div class='del'>-		u64 offset = 0, len = 0;</div><div class='del'>-		bool from_pool = false;</div><div class='add'>+static inline</div><div class='add'>+bool has_writeback_done(struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	return ceph_wbc-&gt;done &amp;&amp; ceph_wbc-&gt;index &gt; ceph_wbc-&gt;end;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		max_pages = wsize &gt;&gt; PAGE_SHIFT;</div><div class='add'>+static inline</div><div class='add'>+bool can_next_page_be_processed(struct ceph_writeback_ctl *ceph_wbc,</div><div class='add'>+				unsigned index)</div><div class='add'>+{</div><div class='add'>+	return index &lt; ceph_wbc-&gt;nr_folios &amp;&amp;</div><div class='add'>+		ceph_wbc-&gt;locked_pages &lt; ceph_wbc-&gt;max_pages;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-get_more_pages:</div><div class='del'>-		nr_folios = filemap_get_folios_tag(mapping, &amp;index,</div><div class='del'>-						   end, tag, &amp;fbatch);</div><div class='del'>-		doutc(cl, "pagevec_lookup_range_tag got %d\n", nr_folios);</div><div class='del'>-		if (!nr_folios &amp;&amp; !locked_pages)</div><div class='del'>-			break;</div><div class='del'>-		for (i = 0; i &lt; nr_folios &amp;&amp; locked_pages &lt; max_pages; i++) {</div><div class='del'>-			page = &amp;fbatch.folios[i]-&gt;page;</div><div class='del'>-			doutc(cl, "? %p idx %lu\n", page, page-&gt;index);</div><div class='del'>-			if (locked_pages == 0)</div><div class='del'>-				lock_page(page);  /* first page */</div><div class='del'>-			else if (!trylock_page(page))</div><div class='del'>-				break;</div><div class='add'>+static</div><div class='add'>+int ceph_check_page_before_write(struct address_space *mapping,</div><div class='add'>+				 struct writeback_control *wbc,</div><div class='add'>+				 struct ceph_writeback_ctl *ceph_wbc,</div><div class='add'>+				 struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_client *cl = fsc-&gt;client;</div><div class='add'>+	struct ceph_snap_context *pgsnapc;</div><div class='ctx'> </div><div class='del'>-			/* only dirty pages, or our accounting breaks */</div><div class='del'>-			if (unlikely(!PageDirty(page)) ||</div><div class='del'>-			    unlikely(page-&gt;mapping != mapping)) {</div><div class='del'>-				doutc(cl, "!dirty or !mapping %p\n", page);</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/* only if matching snap context */</div><div class='del'>-			pgsnapc = page_snap_context(page);</div><div class='del'>-			if (pgsnapc != snapc) {</div><div class='del'>-				doutc(cl, "page snapc %p %lld != oldest %p %lld\n",</div><div class='del'>-				      pgsnapc, pgsnapc-&gt;seq, snapc, snapc-&gt;seq);</div><div class='del'>-				if (!should_loop &amp;&amp;</div><div class='del'>-				    !ceph_wbc.head_snapc &amp;&amp;</div><div class='del'>-				    wbc-&gt;sync_mode != WB_SYNC_NONE)</div><div class='del'>-					should_loop = true;</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				continue;</div><div class='add'>+	/* only dirty folios, or our accounting breaks */</div><div class='add'>+	if (unlikely(!folio_test_dirty(folio) || folio-&gt;mapping != mapping)) {</div><div class='add'>+		doutc(cl, "!dirty or !mapping %p\n", folio);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* only if matching snap context */</div><div class='add'>+	pgsnapc = page_snap_context(&amp;folio-&gt;page);</div><div class='add'>+	if (pgsnapc != ceph_wbc-&gt;snapc) {</div><div class='add'>+		doutc(cl, "folio snapc %p %lld != oldest %p %lld\n",</div><div class='add'>+		      pgsnapc, pgsnapc-&gt;seq,</div><div class='add'>+		      ceph_wbc-&gt;snapc, ceph_wbc-&gt;snapc-&gt;seq);</div><div class='add'>+</div><div class='add'>+		if (!ceph_wbc-&gt;should_loop &amp;&amp; !ceph_wbc-&gt;head_snapc &amp;&amp;</div><div class='add'>+		    wbc-&gt;sync_mode != WB_SYNC_NONE)</div><div class='add'>+			ceph_wbc-&gt;should_loop = true;</div><div class='add'>+</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (folio_pos(folio) &gt;= ceph_wbc-&gt;i_size) {</div><div class='add'>+		doutc(cl, "folio at %lu beyond eof %llu\n",</div><div class='add'>+		      folio-&gt;index, ceph_wbc-&gt;i_size);</div><div class='add'>+</div><div class='add'>+		if ((ceph_wbc-&gt;size_stable ||</div><div class='add'>+		    folio_pos(folio) &gt;= i_size_read(inode)) &amp;&amp;</div><div class='add'>+		    folio_clear_dirty_for_io(folio))</div><div class='add'>+			folio_invalidate(folio, 0, folio_size(folio));</div><div class='add'>+</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ceph_wbc-&gt;strip_unit_end &amp;&amp;</div><div class='add'>+	    (folio-&gt;index &gt; ceph_wbc-&gt;strip_unit_end)) {</div><div class='add'>+		doutc(cl, "end of strip unit %p\n", folio);</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void __ceph_allocate_page_array(struct ceph_writeback_ctl *ceph_wbc,</div><div class='add'>+				unsigned int max_pages)</div><div class='add'>+{</div><div class='add'>+	ceph_wbc-&gt;pages = kmalloc_array(max_pages,</div><div class='add'>+					sizeof(*ceph_wbc-&gt;pages),</div><div class='add'>+					GFP_NOFS);</div><div class='add'>+	if (!ceph_wbc-&gt;pages) {</div><div class='add'>+		ceph_wbc-&gt;from_pool = true;</div><div class='add'>+		ceph_wbc-&gt;pages = mempool_alloc(ceph_wb_pagevec_pool, GFP_NOFS);</div><div class='add'>+		BUG_ON(!ceph_wbc-&gt;pages);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void ceph_allocate_page_array(struct address_space *mapping,</div><div class='add'>+			      struct ceph_writeback_ctl *ceph_wbc,</div><div class='add'>+			      struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='add'>+	u64 objnum;</div><div class='add'>+	u64 objoff;</div><div class='add'>+	u32 xlen;</div><div class='add'>+</div><div class='add'>+	/* prepare async write request */</div><div class='add'>+	ceph_wbc-&gt;offset = (u64)folio_pos(folio);</div><div class='add'>+	ceph_calc_file_object_mapping(&amp;ci-&gt;i_layout,</div><div class='add'>+					ceph_wbc-&gt;offset, ceph_wbc-&gt;wsize,</div><div class='add'>+					&amp;objnum, &amp;objoff, &amp;xlen);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;num_ops = 1;</div><div class='add'>+	ceph_wbc-&gt;strip_unit_end = folio-&gt;index + ((xlen - 1) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	BUG_ON(ceph_wbc-&gt;pages);</div><div class='add'>+	ceph_wbc-&gt;max_pages = calc_pages_for(0, (u64)xlen);</div><div class='add'>+	__ceph_allocate_page_array(ceph_wbc, ceph_wbc-&gt;max_pages);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool is_folio_index_contiguous(const struct ceph_writeback_ctl *ceph_wbc,</div><div class='add'>+			      const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio-&gt;index == (ceph_wbc-&gt;offset + ceph_wbc-&gt;len) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool is_num_ops_too_big(struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	return ceph_wbc-&gt;num_ops &gt;=</div><div class='add'>+		(ceph_wbc-&gt;from_pool ?  CEPH_OSD_SLAB_OPS : CEPH_OSD_MAX_OPS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool is_write_congestion_happened(struct ceph_fs_client *fsc)</div><div class='add'>+{</div><div class='add'>+	return atomic_long_inc_return(&amp;fsc-&gt;writeback_count) &gt;</div><div class='add'>+		CONGESTION_ON_THRESH(fsc-&gt;mount_options-&gt;congestion_kb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int move_dirty_folio_in_page_array(struct address_space *mapping,</div><div class='add'>+		struct writeback_control *wbc,</div><div class='add'>+		struct ceph_writeback_ctl *ceph_wbc, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_client *cl = fsc-&gt;client;</div><div class='add'>+	struct page **pages = ceph_wbc-&gt;pages;</div><div class='add'>+	unsigned int index = ceph_wbc-&gt;locked_pages;</div><div class='add'>+	gfp_t gfp_flags = ceph_wbc-&gt;locked_pages ? GFP_NOWAIT : GFP_NOFS;</div><div class='add'>+</div><div class='add'>+	if (IS_ENCRYPTED(inode)) {</div><div class='add'>+		pages[index] = fscrypt_encrypt_pagecache_blocks(folio,</div><div class='add'>+								PAGE_SIZE,</div><div class='add'>+								0,</div><div class='add'>+								gfp_flags);</div><div class='add'>+		if (IS_ERR(pages[index])) {</div><div class='add'>+			int err = PTR_ERR(pages[index]);</div><div class='add'>+</div><div class='add'>+			if (err == -EINVAL) {</div><div class='add'>+				pr_err_client(cl, "inode-&gt;i_blkbits=%hhu\n",</div><div class='add'>+						inode-&gt;i_blkbits);</div><div class='ctx'> 			}</div><div class='del'>-			if (page_offset(page) &gt;= ceph_wbc.i_size) {</div><div class='del'>-				struct folio *folio = page_folio(page);</div><div class='del'>-</div><div class='del'>-				doutc(cl, "folio at %lu beyond eof %llu\n",</div><div class='del'>-				      folio-&gt;index, ceph_wbc.i_size);</div><div class='del'>-				if ((ceph_wbc.size_stable ||</div><div class='del'>-				    folio_pos(folio) &gt;= i_size_read(inode)) &amp;&amp;</div><div class='del'>-				    folio_clear_dirty_for_io(folio))</div><div class='del'>-					folio_invalidate(folio, 0,</div><div class='del'>-							folio_size(folio));</div><div class='add'>+</div><div class='add'>+			/* better not fail on first page! */</div><div class='add'>+			BUG_ON(ceph_wbc-&gt;locked_pages == 0);</div><div class='add'>+</div><div class='add'>+			pages[index] = NULL;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pages[index] = &amp;folio-&gt;page;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;locked_pages++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int ceph_process_folio_batch(struct address_space *mapping,</div><div class='add'>+			     struct writeback_control *wbc,</div><div class='add'>+			     struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_client *cl = fsc-&gt;client;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	unsigned i;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; can_next_page_be_processed(ceph_wbc, i); i++) {</div><div class='add'>+		folio = ceph_wbc-&gt;fbatch.folios[i];</div><div class='add'>+</div><div class='add'>+		if (!folio)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		doutc(cl, "? %p idx %lu, folio_test_writeback %#x, "</div><div class='add'>+			"folio_test_dirty %#x, folio_test_locked %#x\n",</div><div class='add'>+			folio, folio-&gt;index, folio_test_writeback(folio),</div><div class='add'>+			folio_test_dirty(folio),</div><div class='add'>+			folio_test_locked(folio));</div><div class='add'>+</div><div class='add'>+		if (folio_test_writeback(folio) ||</div><div class='add'>+		    folio_test_private_2(folio) /* [DEPRECATED] */) {</div><div class='add'>+			doutc(cl, "waiting on writeback %p\n", folio);</div><div class='add'>+			folio_wait_writeback(folio);</div><div class='add'>+			folio_wait_private_2(folio); /* [DEPRECATED] */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ceph_wbc-&gt;locked_pages == 0)</div><div class='add'>+			folio_lock(folio);</div><div class='add'>+		else if (!folio_trylock(folio))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rc = ceph_check_page_before_write(mapping, wbc,</div><div class='add'>+						  ceph_wbc, folio);</div><div class='add'>+		if (rc == -ENODATA) {</div><div class='add'>+			rc = 0;</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			ceph_wbc-&gt;fbatch.folios[i] = NULL;</div><div class='add'>+			continue;</div><div class='add'>+		} else if (rc == -E2BIG) {</div><div class='add'>+			rc = 0;</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			ceph_wbc-&gt;fbatch.folios[i] = NULL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!folio_clear_dirty_for_io(folio)) {</div><div class='add'>+			doutc(cl, "%p !folio_clear_dirty_for_io\n", folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			ceph_wbc-&gt;fbatch.folios[i] = NULL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We have something to write.  If this is</div><div class='add'>+		 * the first locked page this time through,</div><div class='add'>+		 * calculate max possible write size and</div><div class='add'>+		 * allocate a page array</div><div class='add'>+		 */</div><div class='add'>+		if (ceph_wbc-&gt;locked_pages == 0) {</div><div class='add'>+			ceph_allocate_page_array(mapping, ceph_wbc, folio);</div><div class='add'>+		} else if (!is_folio_index_contiguous(ceph_wbc, folio)) {</div><div class='add'>+			if (is_num_ops_too_big(ceph_wbc)) {</div><div class='add'>+				folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> 				folio_unlock(folio);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (strip_unit_end &amp;&amp; (page-&gt;index &gt; strip_unit_end)) {</div><div class='del'>-				doutc(cl, "end of strip unit %p\n", page);</div><div class='del'>-				unlock_page(page);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			if (PageWriteback(page) || PageFsCache(page)) {</div><div class='del'>-				if (wbc-&gt;sync_mode == WB_SYNC_NONE) {</div><div class='del'>-					doutc(cl, "%p under writeback\n", page);</div><div class='del'>-					unlock_page(page);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				doutc(cl, "waiting on writeback %p\n", page);</div><div class='del'>-				wait_on_page_writeback(page);</div><div class='del'>-				wait_on_page_fscache(page);</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			if (!clear_page_dirty_for_io(page)) {</div><div class='del'>-				doutc(cl, "%p !clear_page_dirty_for_io\n", page);</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+			ceph_wbc-&gt;num_ops++;</div><div class='add'>+			ceph_wbc-&gt;offset = (u64)folio_pos(folio);</div><div class='add'>+			ceph_wbc-&gt;len = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * We have something to write.  If this is</div><div class='del'>-			 * the first locked page this time through,</div><div class='del'>-			 * calculate max possinle write size and</div><div class='del'>-			 * allocate a page array</div><div class='del'>-			 */</div><div class='del'>-			if (locked_pages == 0) {</div><div class='del'>-				u64 objnum;</div><div class='del'>-				u64 objoff;</div><div class='del'>-				u32 xlen;</div><div class='del'>-</div><div class='del'>-				/* prepare async write request */</div><div class='del'>-				offset = (u64)page_offset(page);</div><div class='del'>-				ceph_calc_file_object_mapping(&amp;ci-&gt;i_layout,</div><div class='del'>-							      offset, wsize,</div><div class='del'>-							      &amp;objnum, &amp;objoff,</div><div class='del'>-							      &amp;xlen);</div><div class='del'>-				len = xlen;</div><div class='del'>-</div><div class='del'>-				num_ops = 1;</div><div class='del'>-				strip_unit_end = page-&gt;index +</div><div class='del'>-					((len - 1) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-				BUG_ON(pages);</div><div class='del'>-				max_pages = calc_pages_for(0, (u64)len);</div><div class='del'>-				pages = kmalloc_array(max_pages,</div><div class='del'>-						      sizeof(*pages),</div><div class='del'>-						      GFP_NOFS);</div><div class='del'>-				if (!pages) {</div><div class='del'>-					from_pool = true;</div><div class='del'>-					pages = mempool_alloc(ceph_wb_pagevec_pool, GFP_NOFS);</div><div class='del'>-					BUG_ON(!pages);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				len = 0;</div><div class='del'>-			} else if (page-&gt;index !=</div><div class='del'>-				   (offset + len) &gt;&gt; PAGE_SHIFT) {</div><div class='del'>-				if (num_ops &gt;= (from_pool ?  CEPH_OSD_SLAB_OPS :</div><div class='del'>-							     CEPH_OSD_MAX_OPS)) {</div><div class='del'>-					redirty_page_for_writepage(wbc, page);</div><div class='del'>-					unlock_page(page);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				num_ops++;</div><div class='del'>-				offset = (u64)page_offset(page);</div><div class='del'>-				len = 0;</div><div class='del'>-			}</div><div class='add'>+		/* note position of first page in fbatch */</div><div class='add'>+		doutc(cl, "%llx.%llx will write folio %p idx %lu\n",</div><div class='add'>+		      ceph_vinop(inode), folio, folio-&gt;index);</div><div class='ctx'> </div><div class='del'>-			/* note position of first page in fbatch */</div><div class='del'>-			doutc(cl, "%llx.%llx will write page %p idx %lu\n",</div><div class='del'>-			      ceph_vinop(inode), page, page-&gt;index);</div><div class='del'>-</div><div class='del'>-			if (atomic_long_inc_return(&amp;fsc-&gt;writeback_count) &gt;</div><div class='del'>-			    CONGESTION_ON_THRESH(</div><div class='del'>-				    fsc-&gt;mount_options-&gt;congestion_kb))</div><div class='del'>-				fsc-&gt;write_congested = true;</div><div class='del'>-</div><div class='del'>-			if (IS_ENCRYPTED(inode)) {</div><div class='del'>-				pages[locked_pages] =</div><div class='del'>-					fscrypt_encrypt_pagecache_blocks(page,</div><div class='del'>-						PAGE_SIZE, 0,</div><div class='del'>-						locked_pages ? GFP_NOWAIT : GFP_NOFS);</div><div class='del'>-				if (IS_ERR(pages[locked_pages])) {</div><div class='del'>-					if (PTR_ERR(pages[locked_pages]) == -EINVAL)</div><div class='del'>-						pr_err_client(cl,</div><div class='del'>-							"inode-&gt;i_blkbits=%hhu\n",</div><div class='del'>-							inode-&gt;i_blkbits);</div><div class='del'>-					/* better not fail on first page! */</div><div class='del'>-					BUG_ON(locked_pages == 0);</div><div class='del'>-					pages[locked_pages] = NULL;</div><div class='del'>-					redirty_page_for_writepage(wbc, page);</div><div class='del'>-					unlock_page(page);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				++locked_pages;</div><div class='del'>-			} else {</div><div class='del'>-				pages[locked_pages++] = page;</div><div class='del'>-			}</div><div class='add'>+		fsc-&gt;write_congested = is_write_congestion_happened(fsc);</div><div class='ctx'> </div><div class='del'>-			fbatch.folios[i] = NULL;</div><div class='del'>-			len += thp_size(page);</div><div class='add'>+		rc = move_dirty_folio_in_page_array(mapping, wbc, ceph_wbc,</div><div class='add'>+				folio);</div><div class='add'>+		if (rc) {</div><div class='add'>+			folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* did we get anything? */</div><div class='del'>-		if (!locked_pages)</div><div class='del'>-			goto release_folios;</div><div class='del'>-		if (i) {</div><div class='del'>-			unsigned j, n = 0;</div><div class='del'>-			/* shift unused page to beginning of fbatch */</div><div class='del'>-			for (j = 0; j &lt; nr_folios; j++) {</div><div class='del'>-				if (!fbatch.folios[j])</div><div class='del'>-					continue;</div><div class='del'>-				if (n &lt; j)</div><div class='del'>-					fbatch.folios[n] = fbatch.folios[j];</div><div class='del'>-				n++;</div><div class='del'>-			}</div><div class='del'>-			fbatch.nr = n;</div><div class='add'>+		ceph_wbc-&gt;fbatch.folios[i] = NULL;</div><div class='add'>+		ceph_wbc-&gt;len += folio_size(folio);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (nr_folios &amp;&amp; i == nr_folios &amp;&amp;</div><div class='del'>-			    locked_pages &lt; max_pages) {</div><div class='del'>-				doutc(cl, "reached end fbatch, trying for more\n");</div><div class='del'>-				folio_batch_release(&amp;fbatch);</div><div class='del'>-				goto get_more_pages;</div><div class='del'>-			}</div><div class='add'>+	ceph_wbc-&gt;processed_in_fbatch = i;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void ceph_shift_unused_folios_left(struct folio_batch *fbatch)</div><div class='add'>+{</div><div class='add'>+	unsigned j, n = 0;</div><div class='add'>+</div><div class='add'>+	/* shift unused page to beginning of fbatch */</div><div class='add'>+	for (j = 0; j &lt; folio_batch_count(fbatch); j++) {</div><div class='add'>+		if (!fbatch-&gt;folios[j])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (n &lt; j) {</div><div class='add'>+			fbatch-&gt;folios[n] = fbatch-&gt;folios[j];</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		n++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fbatch-&gt;nr = n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+int ceph_submit_write(struct address_space *mapping,</div><div class='add'>+			struct writeback_control *wbc,</div><div class='add'>+			struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_client *cl = fsc-&gt;client;</div><div class='add'>+	struct ceph_vino vino = ceph_vino(inode);</div><div class='add'>+	struct ceph_osd_request *req = NULL;</div><div class='add'>+	struct page *page = NULL;</div><div class='add'>+	bool caching = ceph_is_cache_enabled(inode);</div><div class='add'>+	u64 offset;</div><div class='add'>+	u64 len;</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='ctx'> new_request:</div><div class='del'>-		offset = ceph_fscrypt_page_offset(pages[0]);</div><div class='del'>-		len = wsize;</div><div class='add'>+	offset = ceph_fscrypt_page_offset(ceph_wbc-&gt;pages[0]);</div><div class='add'>+	len = ceph_wbc-&gt;wsize;</div><div class='ctx'> </div><div class='add'>+	req = ceph_osdc_new_request(&amp;fsc-&gt;client-&gt;osdc,</div><div class='add'>+				    &amp;ci-&gt;i_layout, vino,</div><div class='add'>+				    offset, &amp;len, 0, ceph_wbc-&gt;num_ops,</div><div class='add'>+				    CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,</div><div class='add'>+				    ceph_wbc-&gt;snapc, ceph_wbc-&gt;truncate_seq,</div><div class='add'>+				    ceph_wbc-&gt;truncate_size, false);</div><div class='add'>+	if (IS_ERR(req)) {</div><div class='ctx'> 		req = ceph_osdc_new_request(&amp;fsc-&gt;client-&gt;osdc,</div><div class='del'>-					&amp;ci-&gt;i_layout, vino,</div><div class='del'>-					offset, &amp;len, 0, num_ops,</div><div class='del'>-					CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,</div><div class='del'>-					snapc, ceph_wbc.truncate_seq,</div><div class='del'>-					ceph_wbc.truncate_size, false);</div><div class='del'>-		if (IS_ERR(req)) {</div><div class='del'>-			req = ceph_osdc_new_request(&amp;fsc-&gt;client-&gt;osdc,</div><div class='del'>-						&amp;ci-&gt;i_layout, vino,</div><div class='del'>-						offset, &amp;len, 0,</div><div class='del'>-						min(num_ops,</div><div class='del'>-						    CEPH_OSD_SLAB_OPS),</div><div class='del'>-						CEPH_OSD_OP_WRITE,</div><div class='del'>-						CEPH_OSD_FLAG_WRITE,</div><div class='del'>-						snapc, ceph_wbc.truncate_seq,</div><div class='del'>-						ceph_wbc.truncate_size, true);</div><div class='del'>-			BUG_ON(IS_ERR(req));</div><div class='add'>+					    &amp;ci-&gt;i_layout, vino,</div><div class='add'>+					    offset, &amp;len, 0,</div><div class='add'>+					    min(ceph_wbc-&gt;num_ops,</div><div class='add'>+						CEPH_OSD_SLAB_OPS),</div><div class='add'>+					    CEPH_OSD_OP_WRITE,</div><div class='add'>+					    CEPH_OSD_FLAG_WRITE,</div><div class='add'>+					    ceph_wbc-&gt;snapc,</div><div class='add'>+					    ceph_wbc-&gt;truncate_seq,</div><div class='add'>+					    ceph_wbc-&gt;truncate_size,</div><div class='add'>+					    true);</div><div class='add'>+		BUG_ON(IS_ERR(req));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page = ceph_wbc-&gt;pages[ceph_wbc-&gt;locked_pages - 1];</div><div class='add'>+	BUG_ON(len &lt; ceph_fscrypt_page_offset(page) + thp_size(page) - offset);</div><div class='add'>+</div><div class='add'>+	if (!ceph_inc_osd_stopping_blocker(fsc-&gt;mdsc)) {</div><div class='add'>+		for (i = 0; i &lt; folio_batch_count(&amp;ceph_wbc-&gt;fbatch); i++) {</div><div class='add'>+			struct folio *folio = ceph_wbc-&gt;fbatch.folios[i];</div><div class='add'>+</div><div class='add'>+			if (!folio)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			page = &amp;folio-&gt;page;</div><div class='add'>+			redirty_page_for_writepage(wbc, page);</div><div class='add'>+			unlock_page(page);</div><div class='ctx'> 		}</div><div class='del'>-		BUG_ON(len &lt; ceph_fscrypt_page_offset(pages[locked_pages - 1]) +</div><div class='del'>-			     thp_size(pages[locked_pages - 1]) - offset);</div><div class='ctx'> </div><div class='del'>-		if (!ceph_inc_osd_stopping_blocker(fsc-&gt;mdsc)) {</div><div class='del'>-			rc = -EIO;</div><div class='del'>-			goto release_folios;</div><div class='add'>+		for (i = 0; i &lt; ceph_wbc-&gt;locked_pages; i++) {</div><div class='add'>+			page = ceph_fscrypt_pagecache_page(ceph_wbc-&gt;pages[i]);</div><div class='add'>+</div><div class='add'>+			if (!page)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			redirty_page_for_writepage(wbc, page);</div><div class='add'>+			unlock_page(page);</div><div class='ctx'> 		}</div><div class='del'>-		req-&gt;r_callback = writepages_finish;</div><div class='del'>-		req-&gt;r_inode = inode;</div><div class='del'>-</div><div class='del'>-		/* Format the osd request message and submit the write */</div><div class='del'>-		len = 0;</div><div class='del'>-		data_pages = pages;</div><div class='del'>-		op_idx = 0;</div><div class='del'>-		for (i = 0; i &lt; locked_pages; i++) {</div><div class='del'>-			struct page *page = ceph_fscrypt_pagecache_page(pages[i]);</div><div class='del'>-</div><div class='del'>-			u64 cur_offset = page_offset(page);</div><div class='del'>-			/*</div><div class='del'>-			 * Discontinuity in page range? Ceph can handle that by just passing</div><div class='del'>-			 * multiple extents in the write op.</div><div class='del'>-			 */</div><div class='del'>-			if (offset + len != cur_offset) {</div><div class='del'>-				/* If it's full, stop here */</div><div class='del'>-				if (op_idx + 1 == req-&gt;r_num_ops)</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				/* Kick off an fscache write with what we have so far. */</div><div class='del'>-				ceph_fscache_write_to_cache(inode, offset, len, caching);</div><div class='del'>-</div><div class='del'>-				/* Start a new extent */</div><div class='del'>-				osd_req_op_extent_dup_last(req, op_idx,</div><div class='del'>-							   cur_offset - offset);</div><div class='del'>-				doutc(cl, "got pages at %llu~%llu\n", offset,</div><div class='del'>-				      len);</div><div class='del'>-				osd_req_op_extent_osd_data_pages(req, op_idx,</div><div class='del'>-							data_pages, len, 0,</div><div class='del'>-							from_pool, false);</div><div class='del'>-				osd_req_op_extent_update(req, op_idx, len);</div><div class='del'>-</div><div class='del'>-				len = 0;</div><div class='del'>-				offset = cur_offset;</div><div class='del'>-				data_pages = pages + i;</div><div class='del'>-				op_idx++;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			set_page_writeback(page);</div><div class='del'>-			if (caching)</div><div class='del'>-				ceph_set_page_fscache(page);</div><div class='del'>-			len += thp_size(page);</div><div class='add'>+		ceph_osdc_put_request(req);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;r_callback = writepages_finish;</div><div class='add'>+	req-&gt;r_inode = inode;</div><div class='add'>+</div><div class='add'>+	/* Format the osd request message and submit the write */</div><div class='add'>+	len = 0;</div><div class='add'>+	ceph_wbc-&gt;data_pages = ceph_wbc-&gt;pages;</div><div class='add'>+	ceph_wbc-&gt;op_idx = 0;</div><div class='add'>+	for (i = 0; i &lt; ceph_wbc-&gt;locked_pages; i++) {</div><div class='add'>+		u64 cur_offset;</div><div class='add'>+</div><div class='add'>+		page = ceph_fscrypt_pagecache_page(ceph_wbc-&gt;pages[i]);</div><div class='add'>+		cur_offset = page_offset(page);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Discontinuity in page range? Ceph can handle that by just passing</div><div class='add'>+		 * multiple extents in the write op.</div><div class='add'>+		 */</div><div class='add'>+		if (offset + len != cur_offset) {</div><div class='add'>+			/* If it's full, stop here */</div><div class='add'>+			if (ceph_wbc-&gt;op_idx + 1 == req-&gt;r_num_ops)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Kick off an fscache write with what we have so far. */</div><div class='add'>+			ceph_fscache_write_to_cache(inode, offset, len, caching);</div><div class='add'>+</div><div class='add'>+			/* Start a new extent */</div><div class='add'>+			osd_req_op_extent_dup_last(req, ceph_wbc-&gt;op_idx,</div><div class='add'>+						   cur_offset - offset);</div><div class='add'>+</div><div class='add'>+			doutc(cl, "got pages at %llu~%llu\n", offset, len);</div><div class='add'>+</div><div class='add'>+			osd_req_op_extent_osd_data_pages(req, ceph_wbc-&gt;op_idx,</div><div class='add'>+							 ceph_wbc-&gt;data_pages,</div><div class='add'>+							 len, 0,</div><div class='add'>+							 ceph_wbc-&gt;from_pool,</div><div class='add'>+							 false);</div><div class='add'>+			osd_req_op_extent_update(req, ceph_wbc-&gt;op_idx, len);</div><div class='add'>+</div><div class='add'>+			len = 0;</div><div class='add'>+			offset = cur_offset;</div><div class='add'>+			ceph_wbc-&gt;data_pages = ceph_wbc-&gt;pages + i;</div><div class='add'>+			ceph_wbc-&gt;op_idx++;</div><div class='ctx'> 		}</div><div class='del'>-		ceph_fscache_write_to_cache(inode, offset, len, caching);</div><div class='del'>-</div><div class='del'>-		if (ceph_wbc.size_stable) {</div><div class='del'>-			len = min(len, ceph_wbc.i_size - offset);</div><div class='del'>-		} else if (i == locked_pages) {</div><div class='del'>-			/* writepages_finish() clears writeback pages</div><div class='del'>-			 * according to the data length, so make sure</div><div class='del'>-			 * data length covers all locked pages */</div><div class='del'>-			u64 min_len = len + 1 - thp_size(page);</div><div class='del'>-			len = get_writepages_data_length(inode, pages[i - 1],</div><div class='del'>-							 offset);</div><div class='del'>-			len = max(len, min_len);</div><div class='add'>+</div><div class='add'>+		set_page_writeback(page);</div><div class='add'>+</div><div class='add'>+		if (caching)</div><div class='add'>+			ceph_set_page_fscache(page);</div><div class='add'>+</div><div class='add'>+		len += thp_size(page);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_fscache_write_to_cache(inode, offset, len, caching);</div><div class='add'>+</div><div class='add'>+	if (ceph_wbc-&gt;size_stable) {</div><div class='add'>+		len = min(len, ceph_wbc-&gt;i_size - offset);</div><div class='add'>+	} else if (i == ceph_wbc-&gt;locked_pages) {</div><div class='add'>+		/* writepages_finish() clears writeback pages</div><div class='add'>+		 * according to the data length, so make sure</div><div class='add'>+		 * data length covers all locked pages */</div><div class='add'>+		u64 min_len = len + 1 - thp_size(page);</div><div class='add'>+		len = get_writepages_data_length(inode,</div><div class='add'>+						 ceph_wbc-&gt;pages[i - 1],</div><div class='add'>+						 offset);</div><div class='add'>+		len = max(len, min_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ENCRYPTED(inode))</div><div class='add'>+		len = round_up(len, CEPH_FSCRYPT_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+	doutc(cl, "got pages at %llu~%llu\n", offset, len);</div><div class='add'>+</div><div class='add'>+	if (IS_ENCRYPTED(inode) &amp;&amp;</div><div class='add'>+	    ((offset | len) &amp; ~CEPH_FSCRYPT_BLOCK_MASK)) {</div><div class='add'>+		pr_warn_client(cl,</div><div class='add'>+			"bad encrypted write offset=%lld len=%llu\n",</div><div class='add'>+			offset, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	osd_req_op_extent_osd_data_pages(req, ceph_wbc-&gt;op_idx,</div><div class='add'>+					 ceph_wbc-&gt;data_pages, len,</div><div class='add'>+					 0, ceph_wbc-&gt;from_pool, false);</div><div class='add'>+	osd_req_op_extent_update(req, ceph_wbc-&gt;op_idx, len);</div><div class='add'>+</div><div class='add'>+	BUG_ON(ceph_wbc-&gt;op_idx + 1 != req-&gt;r_num_ops);</div><div class='add'>+</div><div class='add'>+	ceph_wbc-&gt;from_pool = false;</div><div class='add'>+	if (i &lt; ceph_wbc-&gt;locked_pages) {</div><div class='add'>+		BUG_ON(ceph_wbc-&gt;num_ops &lt;= req-&gt;r_num_ops);</div><div class='add'>+		ceph_wbc-&gt;num_ops -= req-&gt;r_num_ops;</div><div class='add'>+		ceph_wbc-&gt;locked_pages -= i;</div><div class='add'>+</div><div class='add'>+		/* allocate new pages array for next request */</div><div class='add'>+		ceph_wbc-&gt;data_pages = ceph_wbc-&gt;pages;</div><div class='add'>+		__ceph_allocate_page_array(ceph_wbc, ceph_wbc-&gt;locked_pages);</div><div class='add'>+		memcpy(ceph_wbc-&gt;pages, ceph_wbc-&gt;data_pages + i,</div><div class='add'>+			ceph_wbc-&gt;locked_pages * sizeof(*ceph_wbc-&gt;pages));</div><div class='add'>+		memset(ceph_wbc-&gt;data_pages + i, 0,</div><div class='add'>+			ceph_wbc-&gt;locked_pages * sizeof(*ceph_wbc-&gt;pages));</div><div class='add'>+	} else {</div><div class='add'>+		BUG_ON(ceph_wbc-&gt;num_ops != req-&gt;r_num_ops);</div><div class='add'>+		/* request message now owns the pages array */</div><div class='add'>+		ceph_wbc-&gt;pages = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;r_mtime = inode_get_mtime(inode);</div><div class='add'>+	ceph_osdc_start_request(&amp;fsc-&gt;client-&gt;osdc, req);</div><div class='add'>+	req = NULL;</div><div class='add'>+</div><div class='add'>+	wbc-&gt;nr_to_write -= i;</div><div class='add'>+	if (ceph_wbc-&gt;pages)</div><div class='add'>+		goto new_request;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static</div><div class='add'>+void ceph_wait_until_current_writes_complete(struct address_space *mapping,</div><div class='add'>+					     struct writeback_control *wbc,</div><div class='add'>+					     struct ceph_writeback_ctl *ceph_wbc)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	unsigned i, nr;</div><div class='add'>+</div><div class='add'>+	if (wbc-&gt;sync_mode != WB_SYNC_NONE &amp;&amp;</div><div class='add'>+	    ceph_wbc-&gt;start_index == 0 &amp;&amp; /* all dirty pages were checked */</div><div class='add'>+	    !ceph_wbc-&gt;head_snapc) {</div><div class='add'>+		ceph_wbc-&gt;index = 0;</div><div class='add'>+</div><div class='add'>+		while ((ceph_wbc-&gt;index &lt;= ceph_wbc-&gt;end) &amp;&amp;</div><div class='add'>+			(nr = filemap_get_folios_tag(mapping,</div><div class='add'>+						     &amp;ceph_wbc-&gt;index,</div><div class='add'>+						     (pgoff_t)-1,</div><div class='add'>+						     PAGECACHE_TAG_WRITEBACK,</div><div class='add'>+						     &amp;ceph_wbc-&gt;fbatch))) {</div><div class='add'>+			for (i = 0; i &lt; nr; i++) {</div><div class='add'>+				page = &amp;ceph_wbc-&gt;fbatch.folios[i]-&gt;page;</div><div class='add'>+				if (page_snap_context(page) != ceph_wbc-&gt;snapc)</div><div class='add'>+					continue;</div><div class='add'>+				wait_on_page_writeback(page);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			folio_batch_release(&amp;ceph_wbc-&gt;fbatch);</div><div class='add'>+			cond_resched();</div><div class='ctx'> 		}</div><div class='del'>-		if (IS_ENCRYPTED(inode))</div><div class='del'>-			len = round_up(len, CEPH_FSCRYPT_BLOCK_SIZE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		doutc(cl, "got pages at %llu~%llu\n", offset, len);</div><div class='add'>+/*</div><div class='add'>+ * initiate async writeback</div><div class='add'>+ */</div><div class='add'>+static int ceph_writepages_start(struct address_space *mapping,</div><div class='add'>+				 struct writeback_control *wbc)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);</div><div class='add'>+	struct ceph_client *cl = fsc-&gt;client;</div><div class='add'>+	struct ceph_writeback_ctl ceph_wbc;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='del'>-		if (IS_ENCRYPTED(inode) &amp;&amp;</div><div class='del'>-		    ((offset | len) &amp; ~CEPH_FSCRYPT_BLOCK_MASK))</div><div class='del'>-			pr_warn_client(cl,</div><div class='del'>-				"bad encrypted write offset=%lld len=%llu\n",</div><div class='del'>-				offset, len);</div><div class='del'>-</div><div class='del'>-		osd_req_op_extent_osd_data_pages(req, op_idx, data_pages, len,</div><div class='del'>-						 0, from_pool, false);</div><div class='del'>-		osd_req_op_extent_update(req, op_idx, len);</div><div class='del'>-</div><div class='del'>-		BUG_ON(op_idx + 1 != req-&gt;r_num_ops);</div><div class='del'>-</div><div class='del'>-		from_pool = false;</div><div class='del'>-		if (i &lt; locked_pages) {</div><div class='del'>-			BUG_ON(num_ops &lt;= req-&gt;r_num_ops);</div><div class='del'>-			num_ops -= req-&gt;r_num_ops;</div><div class='del'>-			locked_pages -= i;</div><div class='del'>-</div><div class='del'>-			/* allocate new pages array for next request */</div><div class='del'>-			data_pages = pages;</div><div class='del'>-			pages = kmalloc_array(locked_pages, sizeof(*pages),</div><div class='del'>-					      GFP_NOFS);</div><div class='del'>-			if (!pages) {</div><div class='del'>-				from_pool = true;</div><div class='del'>-				pages = mempool_alloc(ceph_wb_pagevec_pool, GFP_NOFS);</div><div class='del'>-				BUG_ON(!pages);</div><div class='add'>+	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp; fsc-&gt;write_congested)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	doutc(cl, "%llx.%llx (mode=%s)\n", ceph_vinop(inode),</div><div class='add'>+	      wbc-&gt;sync_mode == WB_SYNC_NONE ? "NONE" :</div><div class='add'>+	      (wbc-&gt;sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD"));</div><div class='add'>+</div><div class='add'>+	if (is_forced_umount(mapping)) {</div><div class='add'>+		/* we're in a forced umount, don't write! */</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ceph_init_writeback_ctl(mapping, wbc, &amp;ceph_wbc);</div><div class='add'>+</div><div class='add'>+	if (!ceph_inc_osd_stopping_blocker(fsc-&gt;mdsc)) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	rc = ceph_define_writeback_range(mapping, wbc, &amp;ceph_wbc);</div><div class='add'>+	if (rc == -ENODATA) {</div><div class='add'>+		/* hmm, why does writepages get called when there</div><div class='add'>+		   is no dirty data? */</div><div class='add'>+		rc = 0;</div><div class='add'>+		goto dec_osd_stopping_blocker;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='add'>+		tag_pages_for_writeback(mapping, ceph_wbc.index, ceph_wbc.end);</div><div class='add'>+</div><div class='add'>+	while (!has_writeback_done(&amp;ceph_wbc)) {</div><div class='add'>+		ceph_wbc.locked_pages = 0;</div><div class='add'>+		ceph_wbc.max_pages = ceph_wbc.wsize &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+get_more_pages:</div><div class='add'>+		ceph_folio_batch_reinit(&amp;ceph_wbc);</div><div class='add'>+</div><div class='add'>+		ceph_wbc.nr_folios = filemap_get_folios_tag(mapping,</div><div class='add'>+							    &amp;ceph_wbc.index,</div><div class='add'>+							    ceph_wbc.end,</div><div class='add'>+							    ceph_wbc.tag,</div><div class='add'>+							    &amp;ceph_wbc.fbatch);</div><div class='add'>+		doutc(cl, "pagevec_lookup_range_tag for tag %#x got %d\n",</div><div class='add'>+			ceph_wbc.tag, ceph_wbc.nr_folios);</div><div class='add'>+</div><div class='add'>+		if (!ceph_wbc.nr_folios &amp;&amp; !ceph_wbc.locked_pages)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+process_folio_batch:</div><div class='add'>+		rc = ceph_process_folio_batch(mapping, wbc, &amp;ceph_wbc);</div><div class='add'>+		ceph_shift_unused_folios_left(&amp;ceph_wbc.fbatch);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto release_folios;</div><div class='add'>+</div><div class='add'>+		/* did we get anything? */</div><div class='add'>+		if (!ceph_wbc.locked_pages)</div><div class='add'>+			goto release_folios;</div><div class='add'>+</div><div class='add'>+		if (ceph_wbc.processed_in_fbatch) {</div><div class='add'>+			if (folio_batch_count(&amp;ceph_wbc.fbatch) == 0 &amp;&amp;</div><div class='add'>+			    ceph_wbc.locked_pages &lt; ceph_wbc.max_pages) {</div><div class='add'>+				doutc(cl, "reached end fbatch, trying for more\n");</div><div class='add'>+				goto get_more_pages;</div><div class='ctx'> 			}</div><div class='del'>-			memcpy(pages, data_pages + i,</div><div class='del'>-			       locked_pages * sizeof(*pages));</div><div class='del'>-			memset(data_pages + i, 0,</div><div class='del'>-			       locked_pages * sizeof(*pages));</div><div class='del'>-		} else {</div><div class='del'>-			BUG_ON(num_ops != req-&gt;r_num_ops);</div><div class='del'>-			index = pages[i - 1]-&gt;index + 1;</div><div class='del'>-			/* request message now owns the pages array */</div><div class='del'>-			pages = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		req-&gt;r_mtime = inode_get_mtime(inode);</div><div class='del'>-		ceph_osdc_start_request(&amp;fsc-&gt;client-&gt;osdc, req);</div><div class='del'>-		req = NULL;</div><div class='add'>+		rc = ceph_submit_write(mapping, wbc, &amp;ceph_wbc);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto release_folios;</div><div class='add'>+</div><div class='add'>+		ceph_wbc.locked_pages = 0;</div><div class='add'>+		ceph_wbc.strip_unit_end = 0;</div><div class='ctx'> </div><div class='del'>-		wbc-&gt;nr_to_write -= i;</div><div class='del'>-		if (pages)</div><div class='del'>-			goto new_request;</div><div class='add'>+		if (folio_batch_count(&amp;ceph_wbc.fbatch) &gt; 0) {</div><div class='add'>+			ceph_wbc.nr_folios =</div><div class='add'>+				folio_batch_count(&amp;ceph_wbc.fbatch);</div><div class='add'>+			goto process_folio_batch;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We stop writing back only if we are not doing</div><div class='hunk'>@@ -1341,61 +1721,44 @@ new_request:</div><div class='ctx'> 		 * we tagged for writeback prior to entering this loop.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (wbc-&gt;nr_to_write &lt;= 0 &amp;&amp; wbc-&gt;sync_mode == WB_SYNC_NONE)</div><div class='del'>-			done = true;</div><div class='add'>+			ceph_wbc.done = true;</div><div class='ctx'> </div><div class='ctx'> release_folios:</div><div class='ctx'> 		doutc(cl, "folio_batch release on %d folios (%p)\n",</div><div class='del'>-		      (int)fbatch.nr, fbatch.nr ? fbatch.folios[0] : NULL);</div><div class='del'>-		folio_batch_release(&amp;fbatch);</div><div class='add'>+		      (int)ceph_wbc.fbatch.nr,</div><div class='add'>+		      ceph_wbc.fbatch.nr ? ceph_wbc.fbatch.folios[0] : NULL);</div><div class='add'>+		folio_batch_release(&amp;ceph_wbc.fbatch);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (should_loop &amp;&amp; !done) {</div><div class='add'>+	if (ceph_wbc.should_loop &amp;&amp; !ceph_wbc.done) {</div><div class='ctx'> 		/* more to do; loop back to beginning of file */</div><div class='ctx'> 		doutc(cl, "looping back to beginning of file\n");</div><div class='del'>-		end = start_index - 1; /* OK even when start_index == 0 */</div><div class='add'>+		/* OK even when start_index == 0 */</div><div class='add'>+		ceph_wbc.end = ceph_wbc.start_index - 1;</div><div class='ctx'> </div><div class='ctx'> 		/* to write dirty pages associated with next snapc,</div><div class='ctx'> 		 * we need to wait until current writes complete */</div><div class='del'>-		if (wbc-&gt;sync_mode != WB_SYNC_NONE &amp;&amp;</div><div class='del'>-		    start_index == 0 &amp;&amp; /* all dirty pages were checked */</div><div class='del'>-		    !ceph_wbc.head_snapc) {</div><div class='del'>-			struct page *page;</div><div class='del'>-			unsigned i, nr;</div><div class='del'>-			index = 0;</div><div class='del'>-			while ((index &lt;= end) &amp;&amp;</div><div class='del'>-			       (nr = filemap_get_folios_tag(mapping, &amp;index,</div><div class='del'>-						(pgoff_t)-1,</div><div class='del'>-						PAGECACHE_TAG_WRITEBACK,</div><div class='del'>-						&amp;fbatch))) {</div><div class='del'>-				for (i = 0; i &lt; nr; i++) {</div><div class='del'>-					page = &amp;fbatch.folios[i]-&gt;page;</div><div class='del'>-					if (page_snap_context(page) != snapc)</div><div class='del'>-						continue;</div><div class='del'>-					wait_on_page_writeback(page);</div><div class='del'>-				}</div><div class='del'>-				folio_batch_release(&amp;fbatch);</div><div class='del'>-				cond_resched();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		ceph_wait_until_current_writes_complete(mapping, wbc, &amp;ceph_wbc);</div><div class='ctx'> </div><div class='del'>-		start_index = 0;</div><div class='del'>-		index = 0;</div><div class='add'>+		ceph_wbc.start_index = 0;</div><div class='add'>+		ceph_wbc.index = 0;</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;range_cyclic || (range_whole &amp;&amp; wbc-&gt;nr_to_write &gt; 0))</div><div class='del'>-		mapping-&gt;writeback_index = index;</div><div class='add'>+	if (wbc-&gt;range_cyclic || (ceph_wbc.range_whole &amp;&amp; wbc-&gt;nr_to_write &gt; 0))</div><div class='add'>+		mapping-&gt;writeback_index = ceph_wbc.index;</div><div class='add'>+</div><div class='add'>+dec_osd_stopping_blocker:</div><div class='add'>+	ceph_dec_osd_stopping_blocker(fsc-&gt;mdsc);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ceph_osdc_put_request(req);</div><div class='del'>-	ceph_put_snap_context(last_snapc);</div><div class='add'>+	ceph_put_snap_context(ceph_wbc.last_snapc);</div><div class='ctx'> 	doutc(cl, "%llx.%llx dend - startone, rc = %d\n", ceph_vinop(inode),</div><div class='ctx'> 	      rc);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * See if a given @snapc is either writeable, or already written.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1411,56 +1774,56 @@ static int context_is_writeable_or_written(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ceph_find_incompatible - find an incompatible context and return it</div><div class='del'>- * @page: page being dirtied</div><div class='add'>+ * @folio: folio being dirtied</div><div class='ctx'>  *</div><div class='del'>- * We are only allowed to write into/dirty a page if the page is</div><div class='add'>+ * We are only allowed to write into/dirty a folio if the folio is</div><div class='ctx'>  * clean, or already dirty within the same snap context. Returns a</div><div class='ctx'>  * conflicting context if there is one, NULL if there isn't, or a</div><div class='ctx'>  * negative error code on other errors.</div><div class='ctx'>  *</div><div class='del'>- * Must be called with page lock held.</div><div class='add'>+ * Must be called with folio lock held.</div><div class='ctx'>  */</div><div class='ctx'> static struct ceph_snap_context *</div><div class='del'>-ceph_find_incompatible(struct page *page)</div><div class='add'>+ceph_find_incompatible(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode)) {</div><div class='del'>-		doutc(cl, " %llx.%llx page %p is shutdown\n",</div><div class='del'>-		      ceph_vinop(inode), page);</div><div class='add'>+		doutc(cl, " %llx.%llx folio %p is shutdown\n",</div><div class='add'>+		      ceph_vinop(inode), folio);</div><div class='ctx'> 		return ERR_PTR(-ESTALE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		struct ceph_snap_context *snapc, *oldest;</div><div class='ctx'> </div><div class='del'>-		wait_on_page_writeback(page);</div><div class='add'>+		folio_wait_writeback(folio);</div><div class='ctx'> </div><div class='del'>-		snapc = page_snap_context(page);</div><div class='add'>+		snapc = page_snap_context(&amp;folio-&gt;page);</div><div class='ctx'> 		if (!snapc || snapc == ci-&gt;i_head_snapc)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * this page is already dirty in another (older) snap</div><div class='add'>+		 * this folio is already dirty in another (older) snap</div><div class='ctx'> 		 * context!  is it writeable now?</div><div class='ctx'> 		 */</div><div class='ctx'> 		oldest = get_oldest_context(inode, NULL, NULL);</div><div class='ctx'> 		if (snapc-&gt;seq &gt; oldest-&gt;seq) {</div><div class='ctx'> 			/* not writeable -- return it for the caller to deal with */</div><div class='ctx'> 			ceph_put_snap_context(oldest);</div><div class='del'>-			doutc(cl, " %llx.%llx page %p snapc %p not current or oldest\n",</div><div class='del'>-			      ceph_vinop(inode), page, snapc);</div><div class='add'>+			doutc(cl, " %llx.%llx folio %p snapc %p not current or oldest\n",</div><div class='add'>+			      ceph_vinop(inode), folio, snapc);</div><div class='ctx'> 			return ceph_get_snap_context(snapc);</div><div class='ctx'> 		}</div><div class='ctx'> 		ceph_put_snap_context(oldest);</div><div class='ctx'> </div><div class='del'>-		/* yay, writeable, do it now (without dropping page lock) */</div><div class='del'>-		doutc(cl, " %llx.%llx page %p snapc %p not current, but oldest\n",</div><div class='del'>-		      ceph_vinop(inode), page, snapc);</div><div class='del'>-		if (clear_page_dirty_for_io(page)) {</div><div class='del'>-			int r = writepage_nounlock(page, NULL);</div><div class='add'>+		/* yay, writeable, do it now (without dropping folio lock) */</div><div class='add'>+		doutc(cl, " %llx.%llx folio %p snapc %p not current, but oldest\n",</div><div class='add'>+		      ceph_vinop(inode), folio, snapc);</div><div class='add'>+		if (folio_clear_dirty_for_io(folio)) {</div><div class='add'>+			int r = write_folio_nounlock(folio, NULL);</div><div class='ctx'> 			if (r &lt; 0)</div><div class='ctx'> 				return ERR_PTR(r);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1475,7 +1838,7 @@ static int ceph_netfs_check_write_begin(struct file *file, loff_t pos, unsigned</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> 	struct ceph_snap_context *snapc;</div><div class='ctx'> </div><div class='del'>-	snapc = ceph_find_incompatible(folio_page(*foliop, 0));</div><div class='add'>+	snapc = ceph_find_incompatible(*foliop);</div><div class='ctx'> 	if (snapc) {</div><div class='ctx'> 		int r;</div><div class='ctx'> </div><div class='hunk'>@@ -1498,22 +1861,22 @@ static int ceph_netfs_check_write_begin(struct file *file, loff_t pos, unsigned</div><div class='ctx'>  * We are only allowed to write into/dirty the page if the page is</div><div class='ctx'>  * clean, or already dirty within the same snap context.</div><div class='ctx'>  */</div><div class='del'>-static int ceph_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+static int ceph_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='ctx'> 			    loff_t pos, unsigned len,</div><div class='del'>-			    struct page **pagep, void **fsdata)</div><div class='add'>+			    struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='del'>-	struct folio *folio = NULL;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = netfs_write_begin(&amp;ci-&gt;netfs, file, inode-&gt;i_mapping, pos, len, &amp;folio, NULL);</div><div class='add'>+	r = netfs_write_begin(&amp;ci-&gt;netfs, file, inode-&gt;i_mapping, pos, len, foliop, NULL);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	folio_wait_fscache(folio);</div><div class='del'>-	WARN_ON_ONCE(!folio_test_locked(folio));</div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='add'>+	folio_wait_private_2(*foliop); /* [DEPRECATED] */</div><div class='add'>+	WARN_ON_ONCE(!folio_test_locked(*foliop));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1521,11 +1884,12 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'>  * we don't do anything in here that simple_write_end doesn't do</div><div class='ctx'>  * except adjust dirty page accounting</div><div class='ctx'>  */</div><div class='del'>-static int ceph_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			  loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			  struct page *subpage, void *fsdata)</div><div class='add'>+static int ceph_write_end(const struct kiocb *iocb,</div><div class='add'>+			  struct address_space *mapping, loff_t pos,</div><div class='add'>+			  unsigned len, unsigned copied,</div><div class='add'>+			  struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(subpage);</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='ctx'> 	bool check_cap = false;</div><div class='hunk'>@@ -1561,7 +1925,6 @@ out:</div><div class='ctx'> const struct address_space_operations ceph_aops = {</div><div class='ctx'> 	.read_folio = netfs_read_folio,</div><div class='ctx'> 	.readahead = netfs_readahead,</div><div class='del'>-	.writepage = ceph_writepage,</div><div class='ctx'> 	.writepages = ceph_writepages_start,</div><div class='ctx'> 	.write_begin = ceph_write_begin,</div><div class='ctx'> 	.write_end = ceph_write_end,</div><div class='hunk'>@@ -1569,6 +1932,7 @@ const struct address_space_operations ceph_aops = {</div><div class='ctx'> 	.invalidate_folio = ceph_invalidate_folio,</div><div class='ctx'> 	.release_folio = netfs_release_folio,</div><div class='ctx'> 	.direct_IO = noop_direct_IO,</div><div class='add'>+	.migrate_folio = filemap_migrate_folio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ceph_block_sigs(sigset_t *oldset)</div><div class='hunk'>@@ -1685,8 +2049,8 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> 	struct ceph_file_info *fi = vma-&gt;vm_file-&gt;private_data;</div><div class='ctx'> 	struct ceph_cap_flush *prealloc_cf;</div><div class='del'>-	struct page *page = vmf-&gt;page;</div><div class='del'>-	loff_t off = page_offset(page);</div><div class='add'>+	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='add'>+	loff_t off = folio_pos(folio);</div><div class='ctx'> 	loff_t size = i_size_read(inode);</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	int want, got, err;</div><div class='hunk'>@@ -1703,10 +2067,10 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	sb_start_pagefault(inode-&gt;i_sb);</div><div class='ctx'> 	ceph_block_sigs(&amp;oldset);</div><div class='ctx'> </div><div class='del'>-	if (off + thp_size(page) &lt;= size)</div><div class='del'>-		len = thp_size(page);</div><div class='add'>+	if (off + folio_size(folio) &lt;= size)</div><div class='add'>+		len = folio_size(folio);</div><div class='ctx'> 	else</div><div class='del'>-		len = offset_in_thp(page, size);</div><div class='add'>+		len = offset_in_folio(folio, size);</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "%llx.%llx %llu~%zd getting caps i_size %llu\n",</div><div class='ctx'> 	      ceph_vinop(inode), off, len, size);</div><div class='hunk'>@@ -1723,30 +2087,30 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	doutc(cl, "%llx.%llx %llu~%zd got cap refs on %s\n", ceph_vinop(inode),</div><div class='ctx'> 	      off, len, ceph_cap_string(got));</div><div class='ctx'> </div><div class='del'>-	/* Update time before taking page lock */</div><div class='add'>+	/* Update time before taking folio lock */</div><div class='ctx'> 	file_update_time(vma-&gt;vm_file);</div><div class='ctx'> 	inode_inc_iversion_raw(inode);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct ceph_snap_context *snapc;</div><div class='ctx'> </div><div class='del'>-		lock_page(page);</div><div class='add'>+		folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-		if (page_mkwrite_check_truncate(page, inode) &lt; 0) {</div><div class='del'>-			unlock_page(page);</div><div class='add'>+		if (folio_mkwrite_check_truncate(folio, inode) &lt; 0) {</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 			ret = VM_FAULT_NOPAGE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		snapc = ceph_find_incompatible(page);</div><div class='add'>+		snapc = ceph_find_incompatible(folio);</div><div class='ctx'> 		if (!snapc) {</div><div class='del'>-			/* success.  we'll keep the page locked. */</div><div class='del'>-			set_page_dirty(page);</div><div class='add'>+			/* success.  we'll keep the folio locked. */</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='ctx'> 			ret = VM_FAULT_LOCKED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(snapc)) {</div><div class='ctx'> 			ret = VM_FAULT_SIGBUS;</div><div class='hunk'>@@ -1967,13 +2331,13 @@ static const struct vm_operations_struct ceph_vmops = {</div><div class='ctx'> 	.page_mkwrite	= ceph_page_mkwrite,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int ceph_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+int ceph_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='add'>+	struct address_space *mapping = desc-&gt;file-&gt;f_mapping;</div><div class='ctx'> </div><div class='ctx'> 	if (!mapping-&gt;a_ops-&gt;read_folio)</div><div class='ctx'> 		return -ENOEXEC;</div><div class='del'>-	vma-&gt;vm_ops = &amp;ceph_vmops;</div><div class='add'>+	desc-&gt;vm_ops = &amp;ceph_vmops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2125,7 +2489,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pool_ns_len = pool_ns ? pool_ns-&gt;len : 0;</div><div class='del'>-	perm = kmalloc(sizeof(*perm) + pool_ns_len + 1, GFP_NOFS);</div><div class='add'>+	perm = kmalloc(struct_size(perm, pool_ns, pool_ns_len + 1), GFP_NOFS);</div><div class='ctx'> 	if (!perm) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -2172,7 +2536,7 @@ int ceph_pool_perm_check(struct inode *inode, int need)</div><div class='ctx'> 	if (ci-&gt;i_vino.snap != CEPH_NOSNAP) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Pool permission check needs to write to the first object.</div><div class='del'>-		 * But for snapshot, head of the first object may have alread</div><div class='add'>+		 * But for snapshot, head of the first object may have already</div><div class='ctx'> 		 * been deleted. Skip check to avoid creating orphan object.</div><div class='ctx'> 		 */</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c<br/>index 930fbd54d2c8..f678bab189d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/cache.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Only new inodes! */</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(ci-&gt;netfs.cache);</div><div class='head'>diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c<br/>index 9c02f328c966..b1a8ff612c41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/caps.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/caps.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/caps.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/caps.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "super.h"</div><div class='ctx'> #include "mds_client.h"</div><div class='hunk'>@@ -977,20 +978,6 @@ int __ceph_caps_revoking_other(struct ceph_inode_info *ci,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_caps_revoking(struct ceph_inode_info *ci, int mask)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = &amp;ci-&gt;netfs.inode;</div><div class='del'>-	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-	ret = __ceph_caps_revoking_other(ci, NULL, mask);</div><div class='del'>-	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-	doutc(cl, "%p %llx.%llx %s = %d\n", inode, ceph_vinop(inode),</div><div class='del'>-	      ceph_cap_string(mask), ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int __ceph_caps_used(struct ceph_inode_info *ci)</div><div class='ctx'> {</div><div class='ctx'> 	int used = 0;</div><div class='hunk'>@@ -1452,7 +1439,7 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap,</div><div class='ctx'> 	if (flushing &amp; CEPH_CAP_XATTR_EXCL) {</div><div class='ctx'> 		arg-&gt;old_xattr_buf = __ceph_build_xattrs_blob(ci);</div><div class='ctx'> 		arg-&gt;xattr_version = ci-&gt;i_xattrs.version;</div><div class='del'>-		arg-&gt;xattr_buf = ci-&gt;i_xattrs.blob;</div><div class='add'>+		arg-&gt;xattr_buf = ceph_buffer_get(ci-&gt;i_xattrs.blob);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		arg-&gt;xattr_buf = NULL;</div><div class='ctx'> 		arg-&gt;old_xattr_buf = NULL;</div><div class='hunk'>@@ -1553,6 +1540,7 @@ static void __send_cap(struct cap_msg_args *arg, struct ceph_inode_info *ci)</div><div class='ctx'> 	encode_cap_msg(msg, arg);</div><div class='ctx'> 	ceph_con_send(&amp;arg-&gt;session-&gt;s_con, msg);</div><div class='ctx'> 	ceph_buffer_put(arg-&gt;old_xattr_buf);</div><div class='add'>+	ceph_buffer_put(arg-&gt;xattr_buf);</div><div class='ctx'> 	if (arg-&gt;wake)</div><div class='ctx'> 		wake_up_all(&amp;ci-&gt;i_cap_wq);</div><div class='ctx'> }</div><div class='hunk'>@@ -2015,6 +2003,8 @@ bool __ceph_should_report_size(struct ceph_inode_info *ci)</div><div class='ctx'>  *  CHECK_CAPS_AUTHONLY - we should only check the auth cap</div><div class='ctx'>  *  CHECK_CAPS_FLUSH - we should flush any dirty caps immediately, without</div><div class='ctx'>  *    further delay.</div><div class='add'>+ *  CHECK_CAPS_FLUSH_FORCE - we should flush any caps immediately, without</div><div class='add'>+ *    further delay.</div><div class='ctx'>  */</div><div class='ctx'> void ceph_check_caps(struct ceph_inode_info *ci, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -2096,7 +2086,7 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "%p %llx.%llx file_want %s used %s dirty %s "</div><div class='del'>-	      "flushing %s issued %s revoking %s retain %s %s%s%s\n",</div><div class='add'>+	      "flushing %s issued %s revoking %s retain %s %s%s%s%s\n",</div><div class='ctx'> 	     inode, ceph_vinop(inode), ceph_cap_string(file_wanted),</div><div class='ctx'> 	     ceph_cap_string(used), ceph_cap_string(ci-&gt;i_dirty_caps),</div><div class='ctx'> 	     ceph_cap_string(ci-&gt;i_flushing_caps),</div><div class='hunk'>@@ -2104,7 +2094,8 @@ retry:</div><div class='ctx'> 	     ceph_cap_string(retain),</div><div class='ctx'> 	     (flags &amp; CHECK_CAPS_AUTHONLY) ? " AUTHONLY" : "",</div><div class='ctx'> 	     (flags &amp; CHECK_CAPS_FLUSH) ? " FLUSH" : "",</div><div class='del'>-	     (flags &amp; CHECK_CAPS_NOINVAL) ? " NOINVAL" : "");</div><div class='add'>+	     (flags &amp; CHECK_CAPS_NOINVAL) ? " NOINVAL" : "",</div><div class='add'>+	     (flags &amp; CHECK_CAPS_FLUSH_FORCE) ? " FLUSH_FORCE" : "");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we no longer need to hold onto old our caps, and we may</div><div class='hunk'>@@ -2155,6 +2146,35 @@ retry:</div><div class='ctx'> 		      ceph_cap_string(cap-&gt;implemented),</div><div class='ctx'> 		      ceph_cap_string(revoking));</div><div class='ctx'> </div><div class='add'>+		/* completed revocation? going down and there are no caps? */</div><div class='add'>+		if (revoking) {</div><div class='add'>+			if ((revoking &amp; cap_used) == 0) {</div><div class='add'>+				doutc(cl, "completed revocation of %s\n",</div><div class='add'>+				      ceph_cap_string(cap-&gt;implemented &amp; ~cap-&gt;issued));</div><div class='add'>+				goto ack;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * If the "i_wrbuffer_ref" was increased by mmap or generic</div><div class='add'>+			 * cache write just before the ceph_check_caps() is called,</div><div class='add'>+			 * the Fb capability revoking will fail this time. Then we</div><div class='add'>+			 * must wait for the BDI's delayed work to flush the dirty</div><div class='add'>+			 * pages and to release the "i_wrbuffer_ref", which will cost</div><div class='add'>+			 * at most 5 seconds. That means the MDS needs to wait at</div><div class='add'>+			 * most 5 seconds to finished the Fb capability's revocation.</div><div class='add'>+			 *</div><div class='add'>+			 * Let's queue a writeback for it.</div><div class='add'>+			 */</div><div class='add'>+			if (S_ISREG(inode-&gt;i_mode) &amp;&amp; ci-&gt;i_wrbuffer_ref &amp;&amp;</div><div class='add'>+			    (revoking &amp; CEPH_CAP_FILE_BUFFER))</div><div class='add'>+				queue_writeback = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (flags &amp; CHECK_CAPS_FLUSH_FORCE) {</div><div class='add'>+			doutc(cl, "force to flush caps\n");</div><div class='add'>+			goto ack;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (cap == ci-&gt;i_auth_cap &amp;&amp;</div><div class='ctx'> 		    (cap-&gt;issued &amp; CEPH_CAP_FILE_WR)) {</div><div class='ctx'> 			/* request larger max_size from MDS? */</div><div class='hunk'>@@ -2182,30 +2202,6 @@ retry:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* completed revocation? going down and there are no caps? */</div><div class='del'>-		if (revoking) {</div><div class='del'>-			if ((revoking &amp; cap_used) == 0) {</div><div class='del'>-				doutc(cl, "completed revocation of %s\n",</div><div class='del'>-				      ceph_cap_string(cap-&gt;implemented &amp; ~cap-&gt;issued));</div><div class='del'>-				goto ack;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * If the "i_wrbuffer_ref" was increased by mmap or generic</div><div class='del'>-			 * cache write just before the ceph_check_caps() is called,</div><div class='del'>-			 * the Fb capability revoking will fail this time. Then we</div><div class='del'>-			 * must wait for the BDI's delayed work to flush the dirty</div><div class='del'>-			 * pages and to release the "i_wrbuffer_ref", which will cost</div><div class='del'>-			 * at most 5 seconds. That means the MDS needs to wait at</div><div class='del'>-			 * most 5 seconds to finished the Fb capability's revocation.</div><div class='del'>-			 *</div><div class='del'>-			 * Let's queue a writeback for it.</div><div class='del'>-			 */</div><div class='del'>-			if (S_ISREG(inode-&gt;i_mode) &amp;&amp; ci-&gt;i_wrbuffer_ref &amp;&amp;</div><div class='del'>-			    (revoking &amp; CEPH_CAP_FILE_BUFFER))</div><div class='del'>-				queue_writeback = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* want more caps from mds? */</div><div class='ctx'> 		if (want &amp; ~cap-&gt;mds_wanted) {</div><div class='ctx'> 			if (want &amp; ~(cap-&gt;mds_wanted | cap-&gt;issued))</div><div class='hunk'>@@ -2803,7 +2799,7 @@ void ceph_take_cap_refs(struct ceph_inode_info *ci, int got,</div><div class='ctx'>  * requested from the MDS.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 if caps were not able to be acquired (yet), 1 if succeed,</div><div class='del'>- * or a negative error code. There are 3 speical error codes:</div><div class='add'>+ * or a negative error code. There are 3 special error codes:</div><div class='ctx'>  *  -EAGAIN:  need to sleep but non-blocking is specified</div><div class='ctx'>  *  -EFBIG:   ask caller to call check_max_size() and try again.</div><div class='ctx'>  *  -EUCLEAN: ask caller to call ceph_renew_caps() and try again.</div><div class='hunk'>@@ -3066,10 +3062,13 @@ int __ceph_get_caps(struct inode *inode, struct ceph_file_info *fi, int need,</div><div class='ctx'> 				       flags, &amp;_got);</div><div class='ctx'> 		WARN_ON_ONCE(ret == -EAGAIN);</div><div class='ctx'> 		if (!ret) {</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 			struct ceph_mds_client *mdsc = fsc-&gt;mdsc;</div><div class='ctx'> 			struct cap_wait cw;</div><div class='add'>+#endif</div><div class='ctx'> 			DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 			cw.ino = ceph_ino(inode);</div><div class='ctx'> 			cw.tgid = current-&gt;tgid;</div><div class='ctx'> 			cw.need = need;</div><div class='hunk'>@@ -3078,6 +3077,7 @@ int __ceph_get_caps(struct inode *inode, struct ceph_file_info *fi, int need,</div><div class='ctx'> 			spin_lock(&amp;mdsc-&gt;caps_list_lock);</div><div class='ctx'> 			list_add(&amp;cw.list, &amp;mdsc-&gt;cap_wait_list);</div><div class='ctx'> 			spin_unlock(&amp;mdsc-&gt;caps_list_lock);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 			/* make sure used fmode not timeout */</div><div class='ctx'> 			ceph_get_fmode(ci, flags, FMODE_WAIT_BIAS);</div><div class='hunk'>@@ -3096,9 +3096,11 @@ int __ceph_get_caps(struct inode *inode, struct ceph_file_info *fi, int need,</div><div class='ctx'> 			remove_wait_queue(&amp;ci-&gt;i_cap_wq, &amp;wait);</div><div class='ctx'> 			ceph_put_fmode(ci, flags, FMODE_WAIT_BIAS);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 			spin_lock(&amp;mdsc-&gt;caps_list_lock);</div><div class='ctx'> 			list_del(&amp;cw.list);</div><div class='ctx'> 			spin_unlock(&amp;mdsc-&gt;caps_list_lock);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 			if (ret == -EAGAIN)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -3215,7 +3217,6 @@ static int ceph_try_drop_cap_snap(struct ceph_inode_info *ci,</div><div class='ctx'> </div><div class='ctx'> enum put_cap_refs_mode {</div><div class='ctx'> 	PUT_CAP_REFS_SYNC = 0,</div><div class='del'>-	PUT_CAP_REFS_NO_CHECK,</div><div class='ctx'> 	PUT_CAP_REFS_ASYNC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3331,11 +3332,6 @@ void ceph_put_cap_refs_async(struct ceph_inode_info *ci, int had)</div><div class='ctx'> 	__ceph_put_cap_refs(ci, had, PUT_CAP_REFS_ASYNC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ceph_put_cap_refs_no_check_caps(struct ceph_inode_info *ci, int had)</div><div class='del'>-{</div><div class='del'>-	__ceph_put_cap_refs(ci, had, PUT_CAP_REFS_NO_CHECK);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Release @nr WRBUFFER refs on dirty pages for the given @snapc snap</div><div class='ctx'>  * context.  Adjust per-snap dirty page accounting as appropriate.</div><div class='hunk'>@@ -3509,6 +3505,8 @@ static void handle_cap_grant(struct inode *inode,</div><div class='ctx'> 	bool queue_invalidate = false;</div><div class='ctx'> 	bool deleted_inode = false;</div><div class='ctx'> 	bool fill_inline = false;</div><div class='add'>+	bool revoke_wait = false;</div><div class='add'>+	int flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there is at least one crypto block then we'll trust</div><div class='hunk'>@@ -3704,16 +3702,18 @@ static void handle_cap_grant(struct inode *inode,</div><div class='ctx'> 		      ceph_cap_string(cap-&gt;issued), ceph_cap_string(newcaps),</div><div class='ctx'> 		      ceph_cap_string(revoking));</div><div class='ctx'> 		if (S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='del'>-		    (revoking &amp; used &amp; CEPH_CAP_FILE_BUFFER))</div><div class='add'>+		    (revoking &amp; used &amp; CEPH_CAP_FILE_BUFFER)) {</div><div class='ctx'> 			writeback = true;  /* initiate writeback; will delay ack */</div><div class='del'>-		else if (queue_invalidate &amp;&amp;</div><div class='add'>+			revoke_wait = true;</div><div class='add'>+		} else if (queue_invalidate &amp;&amp;</div><div class='ctx'> 			 revoking == CEPH_CAP_FILE_CACHE &amp;&amp;</div><div class='del'>-			 (newcaps &amp; CEPH_CAP_FILE_LAZYIO) == 0)</div><div class='del'>-			; /* do nothing yet, invalidation will be queued */</div><div class='del'>-		else if (cap == ci-&gt;i_auth_cap)</div><div class='add'>+			 (newcaps &amp; CEPH_CAP_FILE_LAZYIO) == 0) {</div><div class='add'>+			revoke_wait = true; /* do nothing yet, invalidation will be queued */</div><div class='add'>+		} else if (cap == ci-&gt;i_auth_cap) {</div><div class='ctx'> 			check_caps = 1; /* check auth cap only */</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			check_caps = 2; /* check all caps */</div><div class='add'>+		}</div><div class='ctx'> 		/* If there is new caps, try to wake up the waiters */</div><div class='ctx'> 		if (~cap-&gt;issued &amp; newcaps)</div><div class='ctx'> 			wake = true;</div><div class='hunk'>@@ -3740,8 +3740,9 @@ static void handle_cap_grant(struct inode *inode,</div><div class='ctx'> 	BUG_ON(cap-&gt;issued &amp; ~cap-&gt;implemented);</div><div class='ctx'> </div><div class='ctx'> 	/* don't let check_caps skip sending a response to MDS for revoke msgs */</div><div class='del'>-	if (le32_to_cpu(grant-&gt;op) == CEPH_CAP_OP_REVOKE) {</div><div class='add'>+	if (!revoke_wait &amp;&amp; le32_to_cpu(grant-&gt;op) == CEPH_CAP_OP_REVOKE) {</div><div class='ctx'> 		cap-&gt;mds_wanted = 0;</div><div class='add'>+		flags |= CHECK_CAPS_FLUSH_FORCE;</div><div class='ctx'> 		if (cap == ci-&gt;i_auth_cap)</div><div class='ctx'> 			check_caps = 1; /* check auth cap only */</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3797,9 +3798,9 @@ static void handle_cap_grant(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;session-&gt;s_mutex);</div><div class='ctx'> 	if (check_caps == 1)</div><div class='del'>-		ceph_check_caps(ci, CHECK_CAPS_AUTHONLY | CHECK_CAPS_NOINVAL);</div><div class='add'>+		ceph_check_caps(ci, flags | CHECK_CAPS_AUTHONLY | CHECK_CAPS_NOINVAL);</div><div class='ctx'> 	else if (check_caps == 2)</div><div class='del'>-		ceph_check_caps(ci, CHECK_CAPS_NOINVAL);</div><div class='add'>+		ceph_check_caps(ci, flags | CHECK_CAPS_NOINVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4070,23 +4071,22 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,</div><div class='ctx'> 	struct ceph_cap *cap, *tcap, *new_cap = NULL;</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> 	u64 t_cap_id;</div><div class='del'>-	unsigned mseq = le32_to_cpu(ex-&gt;migrate_seq);</div><div class='del'>-	unsigned t_seq, t_mseq;</div><div class='add'>+	u32 t_issue_seq, t_mseq;</div><div class='ctx'> 	int target, issued;</div><div class='ctx'> 	int mds = session-&gt;s_mds;</div><div class='ctx'> </div><div class='ctx'> 	if (ph) {</div><div class='ctx'> 		t_cap_id = le64_to_cpu(ph-&gt;cap_id);</div><div class='del'>-		t_seq = le32_to_cpu(ph-&gt;seq);</div><div class='add'>+		t_issue_seq = le32_to_cpu(ph-&gt;issue_seq);</div><div class='ctx'> 		t_mseq = le32_to_cpu(ph-&gt;mseq);</div><div class='ctx'> 		target = le32_to_cpu(ph-&gt;mds);</div><div class='ctx'> 	} else {</div><div class='del'>-		t_cap_id = t_seq = t_mseq = 0;</div><div class='add'>+		t_cap_id = t_issue_seq = t_mseq = 0;</div><div class='ctx'> 		target = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	doutc(cl, "%p %llx.%llx ci %p mds%d mseq %d target %d\n",</div><div class='del'>-	      inode, ceph_vinop(inode), ci, mds, mseq, target);</div><div class='add'>+	doutc(cl, " cap %llx.%llx export to peer %d piseq %u pmseq %u\n",</div><div class='add'>+	      ceph_vinop(inode), target, t_issue_seq, t_mseq);</div><div class='ctx'> retry:</div><div class='ctx'> 	down_read(&amp;mdsc-&gt;snap_rwsem);</div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='hunk'>@@ -4119,12 +4119,12 @@ retry:</div><div class='ctx'> 	if (tcap) {</div><div class='ctx'> 		/* already have caps from the target */</div><div class='ctx'> 		if (tcap-&gt;cap_id == t_cap_id &amp;&amp;</div><div class='del'>-		    ceph_seq_cmp(tcap-&gt;seq, t_seq) &lt; 0) {</div><div class='add'>+		    ceph_seq_cmp(tcap-&gt;seq, t_issue_seq) &lt; 0) {</div><div class='ctx'> 			doutc(cl, " updating import cap %p mds%d\n", tcap,</div><div class='ctx'> 			      target);</div><div class='ctx'> 			tcap-&gt;cap_id = t_cap_id;</div><div class='del'>-			tcap-&gt;seq = t_seq - 1;</div><div class='del'>-			tcap-&gt;issue_seq = t_seq - 1;</div><div class='add'>+			tcap-&gt;seq = t_issue_seq - 1;</div><div class='add'>+			tcap-&gt;issue_seq = t_issue_seq - 1;</div><div class='ctx'> 			tcap-&gt;issued |= issued;</div><div class='ctx'> 			tcap-&gt;implemented |= issued;</div><div class='ctx'> 			if (cap == ci-&gt;i_auth_cap) {</div><div class='hunk'>@@ -4135,11 +4135,11 @@ retry:</div><div class='ctx'> 		ceph_remove_cap(mdsc, cap, false);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	} else if (tsession) {</div><div class='del'>-		/* add placeholder for the export tagert */</div><div class='add'>+		/* add placeholder for the export target */</div><div class='ctx'> 		int flag = (cap == ci-&gt;i_auth_cap) ? CEPH_CAP_FLAG_AUTH : 0;</div><div class='ctx'> 		tcap = new_cap;</div><div class='ctx'> 		ceph_add_cap(inode, tsession, t_cap_id, issued, 0,</div><div class='del'>-			     t_seq - 1, t_mseq, (u64)-1, flag, &amp;new_cap);</div><div class='add'>+			     t_issue_seq - 1, t_mseq, (u64)-1, flag, &amp;new_cap);</div><div class='ctx'> </div><div class='ctx'> 		if (!list_empty(&amp;ci-&gt;i_cap_flush_list) &amp;&amp;</div><div class='ctx'> 		    ci-&gt;i_auth_cap == tcap) {</div><div class='hunk'>@@ -4213,18 +4213,22 @@ static void handle_cap_import(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	u64 realmino = le64_to_cpu(im-&gt;realm);</div><div class='ctx'> 	u64 cap_id = le64_to_cpu(im-&gt;cap_id);</div><div class='ctx'> 	u64 p_cap_id;</div><div class='add'>+	u32 piseq = 0;</div><div class='add'>+	u32 pmseq = 0;</div><div class='ctx'> 	int peer;</div><div class='ctx'> </div><div class='ctx'> 	if (ph) {</div><div class='ctx'> 		p_cap_id = le64_to_cpu(ph-&gt;cap_id);</div><div class='ctx'> 		peer = le32_to_cpu(ph-&gt;mds);</div><div class='add'>+		piseq = le32_to_cpu(ph-&gt;issue_seq);</div><div class='add'>+		pmseq = le32_to_cpu(ph-&gt;mseq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p_cap_id = 0;</div><div class='ctx'> 		peer = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	doutc(cl, "%p %llx.%llx ci %p mds%d mseq %d peer %d\n",</div><div class='del'>-	      inode, ceph_vinop(inode), ci, mds, mseq, peer);</div><div class='add'>+	doutc(cl, " cap %llx.%llx import from peer %d piseq %u pmseq %u\n",</div><div class='add'>+	      ceph_vinop(inode), peer, piseq, pmseq);</div><div class='ctx'> retry:</div><div class='ctx'> 	cap = __get_cap_for_mds(ci, mds);</div><div class='ctx'> 	if (!cap) {</div><div class='hunk'>@@ -4253,15 +4257,13 @@ retry:</div><div class='ctx'> 		doutc(cl, " remove export cap %p mds%d flags %d\n",</div><div class='ctx'> 		      ocap, peer, ph-&gt;flags);</div><div class='ctx'> 		if ((ph-&gt;flags &amp; CEPH_CAP_FLAG_AUTH) &amp;&amp;</div><div class='del'>-		    (ocap-&gt;seq != le32_to_cpu(ph-&gt;seq) ||</div><div class='del'>-		     ocap-&gt;mseq != le32_to_cpu(ph-&gt;mseq))) {</div><div class='add'>+		    (ocap-&gt;seq != piseq ||</div><div class='add'>+		     ocap-&gt;mseq != pmseq)) {</div><div class='ctx'> 			pr_err_ratelimited_client(cl, "mismatched seq/mseq: "</div><div class='ctx'> 					"%p %llx.%llx mds%d seq %d mseq %d"</div><div class='ctx'> 					" importer mds%d has peer seq %d mseq %d\n",</div><div class='ctx'> 					inode, ceph_vinop(inode), peer,</div><div class='del'>-					ocap-&gt;seq, ocap-&gt;mseq, mds,</div><div class='del'>-					le32_to_cpu(ph-&gt;seq),</div><div class='del'>-					le32_to_cpu(ph-&gt;mseq));</div><div class='add'>+					ocap-&gt;seq, ocap-&gt;mseq, mds, piseq, pmseq);</div><div class='ctx'> 		}</div><div class='ctx'> 		ceph_remove_cap(mdsc, ocap, (ph-&gt;flags &amp; CEPH_CAP_FLAG_RELEASE));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4335,7 +4337,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,</div><div class='ctx'> 	struct ceph_snap_realm *realm = NULL;</div><div class='ctx'> 	int op;</div><div class='ctx'> 	int msg_version = le16_to_cpu(msg-&gt;hdr.version);</div><div class='del'>-	u32 seq, mseq;</div><div class='add'>+	u32 seq, mseq, issue_seq;</div><div class='ctx'> 	struct ceph_vino vino;</div><div class='ctx'> 	void *snaptrace;</div><div class='ctx'> 	size_t snaptrace_len;</div><div class='hunk'>@@ -4345,8 +4347,6 @@ void ceph_handle_caps(struct ceph_mds_session *session,</div><div class='ctx'> 	bool close_sessions = false;</div><div class='ctx'> 	bool do_cap_release = false;</div><div class='ctx'> </div><div class='del'>-	doutc(cl, "from mds%d\n", session-&gt;s_mds);</div><div class='del'>-</div><div class='ctx'> 	if (!ceph_inc_mds_stopping_blocker(mdsc, session))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -4360,6 +4360,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,</div><div class='ctx'> 	vino.snap = CEPH_NOSNAP;</div><div class='ctx'> 	seq = le32_to_cpu(h-&gt;seq);</div><div class='ctx'> 	mseq = le32_to_cpu(h-&gt;migrate_seq);</div><div class='add'>+	issue_seq = le32_to_cpu(h-&gt;issue_seq);</div><div class='ctx'> </div><div class='ctx'> 	snaptrace = h + 1;</div><div class='ctx'> 	snaptrace_len = le32_to_cpu(h-&gt;snap_trace_len);</div><div class='hunk'>@@ -4447,12 +4448,11 @@ void ceph_handle_caps(struct ceph_mds_session *session,</div><div class='ctx'> </div><div class='ctx'> 	/* lookup ino */</div><div class='ctx'> 	inode = ceph_find_inode(mdsc-&gt;fsc-&gt;sb, vino);</div><div class='del'>-	doutc(cl, " op %s ino %llx.%llx inode %p\n", ceph_cap_op_name(op),</div><div class='del'>-	      vino.ino, vino.snap, inode);</div><div class='add'>+	doutc(cl, " caps mds%d op %s ino %llx.%llx inode %p seq %u iseq %u mseq %u\n",</div><div class='add'>+	      session-&gt;s_mds, ceph_cap_op_name(op), vino.ino, vino.snap, inode,</div><div class='add'>+	      seq, issue_seq, mseq);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;session-&gt;s_mutex);</div><div class='del'>-	doutc(cl, " mds%d seq %lld cap seq %u\n", session-&gt;s_mds,</div><div class='del'>-	      session-&gt;s_seq, (unsigned)seq);</div><div class='ctx'> </div><div class='ctx'> 	if (!inode) {</div><div class='ctx'> 		doutc(cl, " i don't have ino %llx\n", vino.ino);</div><div class='hunk'>@@ -4588,7 +4588,7 @@ flush_cap_releases:</div><div class='ctx'> 		__ceph_queue_cap_release(session, cap);</div><div class='ctx'> 		spin_unlock(&amp;session-&gt;s_cap_lock);</div><div class='ctx'> 	}</div><div class='del'>-	ceph_flush_cap_releases(mdsc, session);</div><div class='add'>+	ceph_flush_session_cap_releases(mdsc, session);</div><div class='ctx'> 	goto done;</div><div class='ctx'> </div><div class='ctx'> bad:</div><div class='hunk'>@@ -4639,6 +4639,14 @@ unsigned long ceph_check_delayed_caps(struct ceph_mds_client *mdsc)</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 			spin_lock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure too many dirty caps or general</div><div class='add'>+		 * slowness doesn't block mdsc delayed work,</div><div class='add'>+		 * preventing send_renew_caps() from running.</div><div class='add'>+		 */</div><div class='add'>+		if (time_after_eq(jiffies, loop_start + 5 * HZ))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='ctx'> 	doutc(cl, "done\n");</div><div class='hunk'>@@ -4679,6 +4687,28 @@ void ceph_flush_dirty_caps(struct ceph_mds_client *mdsc)</div><div class='ctx'> 	ceph_mdsc_iterate_sessions(mdsc, flush_dirty_session_caps, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Flush all cap releases to the mds</div><div class='add'>+ */</div><div class='add'>+static void flush_cap_releases(struct ceph_mds_session *s)</div><div class='add'>+{</div><div class='add'>+	struct ceph_mds_client *mdsc = s-&gt;s_mdsc;</div><div class='add'>+	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='add'>+</div><div class='add'>+	doutc(cl, "begin\n");</div><div class='add'>+	spin_lock(&amp;s-&gt;s_cap_lock);</div><div class='add'>+	if (s-&gt;s_num_cap_releases)</div><div class='add'>+		ceph_flush_session_cap_releases(mdsc, s);</div><div class='add'>+	spin_unlock(&amp;s-&gt;s_cap_lock);</div><div class='add'>+	doutc(cl, "done\n");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ceph_flush_cap_releases(struct ceph_mds_client *mdsc)</div><div class='add'>+{</div><div class='add'>+	ceph_mdsc_iterate_sessions(mdsc, flush_cap_releases, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __ceph_touch_fmode(struct ceph_inode_info *ci,</div><div class='ctx'> 			struct ceph_mds_client *mdsc, int fmode)</div><div class='ctx'> {</div><div class='hunk'>@@ -4777,7 +4807,22 @@ int ceph_drop_caps_for_unlink(struct inode *inode)</div><div class='ctx'> 		if (__ceph_caps_dirty(ci)) {</div><div class='ctx'> 			struct ceph_mds_client *mdsc =</div><div class='ctx'> 				ceph_inode_to_fs_client(inode)-&gt;mdsc;</div><div class='del'>-			__cap_delay_requeue_front(mdsc, ci);</div><div class='add'>+</div><div class='add'>+			doutc(mdsc-&gt;fsc-&gt;client, "%p %llx.%llx\n", inode,</div><div class='add'>+			      ceph_vinop(inode));</div><div class='add'>+			spin_lock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+			ci-&gt;i_ceph_flags |= CEPH_I_FLUSH;</div><div class='add'>+			if (!list_empty(&amp;ci-&gt;i_cap_delay_list))</div><div class='add'>+				list_del_init(&amp;ci-&gt;i_cap_delay_list);</div><div class='add'>+			list_add_tail(&amp;ci-&gt;i_cap_delay_list,</div><div class='add'>+				      &amp;mdsc-&gt;cap_unlink_delay_list);</div><div class='add'>+			spin_unlock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Fire the work immediately, because the MDS maybe</div><div class='add'>+			 * waiting for caps release.</div><div class='add'>+			 */</div><div class='add'>+			ceph_queue_cap_unlink_work(mdsc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='hunk'>@@ -4912,24 +4957,20 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry,</div><div class='ctx'> 	cl = ceph_inode_to_client(dir);</div><div class='ctx'> 	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	if (ret &amp;&amp; di-&gt;lease_session &amp;&amp; di-&gt;lease_session-&gt;s_mds == mds) {</div><div class='add'>+		int len = dentry-&gt;d_name.len;</div><div class='ctx'> 		doutc(cl, "%p mds%d seq %d\n",  dentry, mds,</div><div class='ctx'> 		      (int)di-&gt;lease_seq);</div><div class='ctx'> 		rel-&gt;dname_seq = cpu_to_le32(di-&gt;lease_seq);</div><div class='ctx'> 		__ceph_mdsc_drop_dentry_lease(dentry);</div><div class='add'>+		memcpy(*p, dentry-&gt;d_name.name, len);</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 		if (IS_ENCRYPTED(dir) &amp;&amp; fscrypt_has_encryption_key(dir)) {</div><div class='del'>-			int ret2 = ceph_encode_encrypted_fname(dir, dentry, *p);</div><div class='del'>-</div><div class='del'>-			if (ret2 &lt; 0)</div><div class='del'>-				return ret2;</div><div class='del'>-</div><div class='del'>-			rel-&gt;dname_len = cpu_to_le32(ret2);</div><div class='del'>-			*p += ret2;</div><div class='del'>-		} else {</div><div class='del'>-			rel-&gt;dname_len = cpu_to_le32(dentry-&gt;d_name.len);</div><div class='del'>-			memcpy(*p, dentry-&gt;d_name.name, dentry-&gt;d_name.len);</div><div class='del'>-			*p += dentry-&gt;d_name.len;</div><div class='add'>+			len = ceph_encode_encrypted_dname(dir, *p, len);</div><div class='add'>+			if (len &lt; 0)</div><div class='add'>+				return len;</div><div class='ctx'> 		}</div><div class='add'>+		rel-&gt;dname_len = cpu_to_le32(len);</div><div class='add'>+		*p += len;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c<br/>index 3b3c4d8d401e..0ea4db650f85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/crypto.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/crypto.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/crypto.c</a></div><div class='hunk'>@@ -15,59 +15,6 @@</div><div class='ctx'> #include "mds_client.h"</div><div class='ctx'> #include "crypto.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The base64url encoding used by fscrypt includes the '_' character, which may</div><div class='del'>- * cause problems in snapshot names (which can not start with '_').  Thus, we</div><div class='del'>- * used the base64 encoding defined for IMAP mailbox names (RFC 3501) instead,</div><div class='del'>- * which replaces '-' and '_' by '+' and ','.</div><div class='del'>- */</div><div class='del'>-static const char base64_table[65] =</div><div class='del'>-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";</div><div class='del'>-</div><div class='del'>-int ceph_base64_encode(const u8 *src, int srclen, char *dst)</div><div class='del'>-{</div><div class='del'>-	u32 ac = 0;</div><div class='del'>-	int bits = 0;</div><div class='del'>-	int i;</div><div class='del'>-	char *cp = dst;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; srclen; i++) {</div><div class='del'>-		ac = (ac &lt;&lt; 8) | src[i];</div><div class='del'>-		bits += 8;</div><div class='del'>-		do {</div><div class='del'>-			bits -= 6;</div><div class='del'>-			*cp++ = base64_table[(ac &gt;&gt; bits) &amp; 0x3f];</div><div class='del'>-		} while (bits &gt;= 6);</div><div class='del'>-	}</div><div class='del'>-	if (bits)</div><div class='del'>-		*cp++ = base64_table[(ac &lt;&lt; (6 - bits)) &amp; 0x3f];</div><div class='del'>-	return cp - dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ceph_base64_decode(const char *src, int srclen, u8 *dst)</div><div class='del'>-{</div><div class='del'>-	u32 ac = 0;</div><div class='del'>-	int bits = 0;</div><div class='del'>-	int i;</div><div class='del'>-	u8 *bp = dst;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; srclen; i++) {</div><div class='del'>-		const char *p = strchr(base64_table, src[i]);</div><div class='del'>-</div><div class='del'>-		if (p == NULL || src[i] == 0)</div><div class='del'>-			return -1;</div><div class='del'>-		ac = (ac &lt;&lt; 6) | (p - base64_table);</div><div class='del'>-		bits += 6;</div><div class='del'>-		if (bits &gt;= 8) {</div><div class='del'>-			bits -= 8;</div><div class='del'>-			*bp++ = (u8)(ac &gt;&gt; bits);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ac &amp; ((1 &lt;&lt; bits) - 1))</div><div class='del'>-		return -1;</div><div class='del'>-	return bp - dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ceph_crypt_get_context(struct inode *inode, void *ctx, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='hunk'>@@ -133,6 +80,8 @@ static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fscrypt_operations ceph_fscrypt_ops = {</div><div class='add'>+	.inode_info_offs	= (int)offsetof(struct ceph_inode_info, i_crypt_info) -</div><div class='add'>+				  (int)offsetof(struct ceph_inode_info, netfs.inode),</div><div class='ctx'> 	.needs_bounce_pages	= 1,</div><div class='ctx'> 	.get_context		= ceph_crypt_get_context,</div><div class='ctx'> 	.set_context		= ceph_crypt_set_context,</div><div class='hunk'>@@ -215,35 +164,31 @@ static struct inode *parse_longname(const struct inode *parent,</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(parent);</div><div class='ctx'> 	struct inode *dir = NULL;</div><div class='ctx'> 	struct ceph_vino vino = { .snap = CEPH_NOSNAP };</div><div class='del'>-	char *inode_number;</div><div class='del'>-	char *name_end;</div><div class='del'>-	int orig_len = *name_len;</div><div class='add'>+	char *name_end, *inode_number;</div><div class='ctx'> 	int ret = -EIO;</div><div class='del'>-</div><div class='add'>+	/* NUL-terminate */</div><div class='add'>+	char *str __free(kfree) = kmemdup_nul(name, *name_len, GFP_KERNEL);</div><div class='add'>+	if (!str)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	/* Skip initial '_' */</div><div class='del'>-	name++;</div><div class='del'>-	name_end = strrchr(name, '_');</div><div class='add'>+	str++;</div><div class='add'>+	name_end = strrchr(str, '_');</div><div class='ctx'> 	if (!name_end) {</div><div class='del'>-		doutc(cl, "failed to parse long snapshot name: %s\n", name);</div><div class='add'>+		doutc(cl, "failed to parse long snapshot name: %s\n", str);</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='del'>-	*name_len = (name_end - name);</div><div class='add'>+	*name_len = (name_end - str);</div><div class='ctx'> 	if (*name_len &lt;= 0) {</div><div class='ctx'> 		pr_err_client(cl, "failed to parse long snapshot name\n");</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the inode number */</div><div class='del'>-	inode_number = kmemdup_nul(name_end + 1,</div><div class='del'>-				   orig_len - *name_len - 2,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	if (!inode_number)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	inode_number = name_end + 1;</div><div class='ctx'> 	ret = kstrtou64(inode_number, 10, &amp;vino.ino);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		doutc(cl, "failed to parse inode number: %s\n", name);</div><div class='del'>-		dir = ERR_PTR(ret);</div><div class='del'>-		goto out;</div><div class='add'>+		doutc(cl, "failed to parse inode number: %s\n", str);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* And finally the inode */</div><div class='hunk'>@@ -254,42 +199,29 @@ static struct inode *parse_longname(const struct inode *parent,</div><div class='ctx'> 		if (IS_ERR(dir))</div><div class='ctx'> 			doutc(cl, "can't find inode %s (%s)\n", inode_number, name);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(inode_number);</div><div class='ctx'> 	return dir;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,</div><div class='del'>-				char *buf)</div><div class='add'>+int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int elen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(parent);</div><div class='ctx'> 	struct inode *dir = parent;</div><div class='del'>-	struct qstr iname;</div><div class='add'>+	char *p = buf;</div><div class='ctx'> 	u32 len;</div><div class='del'>-	int name_len;</div><div class='del'>-	int elen;</div><div class='add'>+	int name_len = elen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 *cryptbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	iname.name = d_name-&gt;name;</div><div class='del'>-	name_len = d_name-&gt;len;</div><div class='del'>-</div><div class='ctx'> 	/* Handle the special case of snapshot names that start with '_' */</div><div class='del'>-	if ((ceph_snap(dir) == CEPH_SNAPDIR) &amp;&amp; (name_len &gt; 0) &amp;&amp;</div><div class='del'>-	    (iname.name[0] == '_')) {</div><div class='del'>-		dir = parse_longname(parent, iname.name, &amp;name_len);</div><div class='add'>+	if (ceph_snap(dir) == CEPH_SNAPDIR &amp;&amp; *p == '_') {</div><div class='add'>+		dir = parse_longname(parent, p, &amp;name_len);</div><div class='ctx'> 		if (IS_ERR(dir))</div><div class='ctx'> 			return PTR_ERR(dir);</div><div class='del'>-		iname.name++; /* skip initial '_' */</div><div class='add'>+		p++; /* skip initial '_' */</div><div class='ctx'> 	}</div><div class='del'>-	iname.len = name_len;</div><div class='ctx'> </div><div class='del'>-	if (!fscrypt_has_encryption_key(dir)) {</div><div class='del'>-		memcpy(buf, d_name-&gt;name, d_name-&gt;len);</div><div class='del'>-		elen = d_name-&gt;len;</div><div class='add'>+	if (!fscrypt_has_encryption_key(dir))</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Convert cleartext d_name to ciphertext. If result is longer than</div><div class='hunk'>@@ -297,7 +229,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * See: fscrypt_setup_filename</div><div class='ctx'> 	 */</div><div class='del'>-	if (!fscrypt_fname_encrypted_size(dir, iname.len, NAME_MAX, &amp;len)) {</div><div class='add'>+	if (!fscrypt_fname_encrypted_size(dir, name_len, NAME_MAX, &amp;len)) {</div><div class='ctx'> 		elen = -ENAMETOOLONG;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -310,7 +242,9 @@ int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = fscrypt_fname_encrypt(dir, &amp;iname, cryptbuf, len);</div><div class='add'>+	ret = fscrypt_fname_encrypt(dir,</div><div class='add'>+				    &amp;(struct qstr)QSTR_INIT(p, name_len),</div><div class='add'>+				    cryptbuf, len);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		elen = ret;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -331,23 +265,18 @@ int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* base64 encode the encrypted name */</div><div class='del'>-	elen = ceph_base64_encode(cryptbuf, len, buf);</div><div class='del'>-	doutc(cl, "base64-encoded ciphertext name = %.*s\n", elen, buf);</div><div class='add'>+	elen = base64_encode(cryptbuf, len, p, false, BASE64_IMAP);</div><div class='add'>+	doutc(cl, "base64-encoded ciphertext name = %.*s\n", elen, p);</div><div class='ctx'> </div><div class='ctx'> 	/* To understand the 240 limit, see CEPH_NOHASH_NAME_MAX comments */</div><div class='ctx'> 	WARN_ON(elen &gt; 240);</div><div class='del'>-	if ((elen &gt; 0) &amp;&amp; (dir != parent)) {</div><div class='del'>-		char tmp_buf[NAME_MAX];</div><div class='del'>-</div><div class='del'>-		elen = snprintf(tmp_buf, sizeof(tmp_buf), "_%.*s_%ld",</div><div class='del'>-				elen, buf, dir-&gt;i_ino);</div><div class='del'>-		memcpy(buf, tmp_buf, elen);</div><div class='del'>-	}</div><div class='add'>+	if (dir != parent) // leading _ is already there; append _&lt;inum&gt;</div><div class='add'>+		elen += 1 + sprintf(p + elen, "_%ld", dir-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(cryptbuf);</div><div class='ctx'> 	if (dir != parent) {</div><div class='del'>-		if ((dir-&gt;i_state &amp; I_NEW))</div><div class='add'>+		if ((inode_state_read_once(dir) &amp; I_NEW))</div><div class='ctx'> 			discard_new_inode(dir);</div><div class='ctx'> 		else</div><div class='ctx'> 			iput(dir);</div><div class='hunk'>@@ -355,14 +284,6 @@ out:</div><div class='ctx'> 	return elen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ceph_encode_encrypted_fname(struct inode *parent, struct dentry *dentry,</div><div class='del'>-				char *buf)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(!fscrypt_has_encryption_key(parent));</div><div class='del'>-</div><div class='del'>-	return ceph_encode_encrypted_dname(parent, &amp;dentry-&gt;d_name, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ceph_fname_to_usr - convert a filename for userland presentation</div><div class='ctx'>  * @fname: ceph_fname to be converted</div><div class='hunk'>@@ -438,7 +359,8 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname,</div><div class='ctx'> 			tname = &amp;_tname;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		declen = ceph_base64_decode(name, name_len, tname-&gt;name);</div><div class='add'>+		declen = base64_decode(name, name_len,</div><div class='add'>+				       tname-&gt;name, false, BASE64_IMAP);</div><div class='ctx'> 		if (declen &lt;= 0) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -452,7 +374,7 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname,</div><div class='ctx'> </div><div class='ctx'> 	ret = fscrypt_fname_disk_to_usr(dir, 0, 0, &amp;iname, oname);</div><div class='ctx'> 	if (!ret &amp;&amp; (dir != fname-&gt;dir)) {</div><div class='del'>-		char tmp_buf[CEPH_BASE64_CHARS(NAME_MAX)];</div><div class='add'>+		char tmp_buf[BASE64_CHARS(NAME_MAX)];</div><div class='ctx'> </div><div class='ctx'> 		name_len = snprintf(tmp_buf, sizeof(tmp_buf), "_%.*s_%ld",</div><div class='ctx'> 				    oname-&gt;len, oname-&gt;name, dir-&gt;i_ino);</div><div class='hunk'>@@ -464,7 +386,7 @@ out:</div><div class='ctx'> 	fscrypt_fname_free_buffer(&amp;_tname);</div><div class='ctx'> out_inode:</div><div class='ctx'> 	if (dir != fname-&gt;dir) {</div><div class='del'>-		if ((dir-&gt;i_state &amp; I_NEW))</div><div class='add'>+		if ((inode_state_read_once(dir) &amp; I_NEW))</div><div class='ctx'> 			discard_new_inode(dir);</div><div class='ctx'> 		else</div><div class='ctx'> 			iput(dir);</div><div class='hunk'>@@ -516,15 +438,13 @@ int ceph_fscrypt_decrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> int ceph_fscrypt_encrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> 				  struct page *page, unsigned int len,</div><div class='del'>-				  unsigned int offs, u64 lblk_num,</div><div class='del'>-				  gfp_t gfp_flags)</div><div class='add'>+				  unsigned int offs, u64 lblk_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "%p %llx.%llx len %u offs %u blk %llu\n", inode,</div><div class='ctx'> 	      ceph_vinop(inode), len, offs, lblk_num);</div><div class='del'>-	return fscrypt_encrypt_block_inplace(inode, page, len, offs, lblk_num,</div><div class='del'>-					     gfp_flags);</div><div class='add'>+	return fscrypt_encrypt_block_inplace(inode, page, len, offs, lblk_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -642,9 +562,8 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page,</div><div class='ctx'>  * @page: pointer to page array</div><div class='ctx'>  * @off: offset into the file that the data starts</div><div class='ctx'>  * @len: max length to encrypt</div><div class='del'>- * @gfp: gfp flags to use for allocation</div><div class='ctx'>  *</div><div class='del'>- * Decrypt an array of cleartext pages and return the amount of</div><div class='add'>+ * Encrypt an array of cleartext pages and return the amount of</div><div class='ctx'>  * data encrypted. Any data in the page prior to the start of the</div><div class='ctx'>  * first complete block in the read is ignored. Any incomplete</div><div class='ctx'>  * crypto blocks at the end of the array are ignored.</div><div class='hunk'>@@ -652,7 +571,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page,</div><div class='ctx'>  * Returns the length of the encrypted data or a negative errno.</div><div class='ctx'>  */</div><div class='ctx'> int ceph_fscrypt_encrypt_pages(struct inode *inode, struct page **page, u64 off,</div><div class='del'>-				int len, gfp_t gfp)</div><div class='add'>+				int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i, num_blocks;</div><div class='ctx'> 	u64 baseblk = off &gt;&gt; CEPH_FSCRYPT_BLOCK_SHIFT;</div><div class='hunk'>@@ -673,7 +592,7 @@ int ceph_fscrypt_encrypt_pages(struct inode *inode, struct page **page, u64 off,</div><div class='ctx'> </div><div class='ctx'> 		fret = ceph_fscrypt_encrypt_block_inplace(inode, page[pgidx],</div><div class='ctx'> 				CEPH_FSCRYPT_BLOCK_SIZE, pgoffs,</div><div class='del'>-				baseblk + i, gfp);</div><div class='add'>+				baseblk + i);</div><div class='ctx'> 		if (fret &lt; 0) {</div><div class='ctx'> 			if (ret == 0)</div><div class='ctx'> 				ret = fret;</div><div class='head'>diff --git a/fs/ceph/crypto.h b/fs/ceph/crypto.h<br/>index 47e0c319fc68..b748e2060bc9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/crypto.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/crypto.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/crypto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/crypto.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/sha2.h&gt;</div><div class='ctx'> #include &lt;linux/fscrypt.h&gt;</div><div class='add'>+#include &lt;linux/base64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CEPH_FSCRYPT_BLOCK_SHIFT   12</div><div class='ctx'> #define CEPH_FSCRYPT_BLOCK_SIZE    (_AC(1, UL) &lt;&lt; CEPH_FSCRYPT_BLOCK_SHIFT)</div><div class='hunk'>@@ -27,7 +28,7 @@ struct ceph_fname {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Header for the crypted file when truncating the size, this</div><div class='add'>+ * Header for the encrypted file when truncating the size, this</div><div class='ctx'>  * will be sent to MDS, and the MDS will update the encrypted</div><div class='ctx'>  * last block and then truncate the size.</div><div class='ctx'>  */</div><div class='hunk'>@@ -89,11 +90,6 @@ static inline u32 ceph_fscrypt_auth_len(struct ceph_fscrypt_auth *fa)</div><div class='ctx'>  */</div><div class='ctx'> #define CEPH_NOHASH_NAME_MAX (180 - SHA256_DIGEST_SIZE)</div><div class='ctx'> </div><div class='del'>-#define CEPH_BASE64_CHARS(nbytes) DIV_ROUND_UP((nbytes) * 4, 3)</div><div class='del'>-</div><div class='del'>-int ceph_base64_encode(const u8 *src, int srclen, char *dst);</div><div class='del'>-int ceph_base64_decode(const char *src, int srclen, u8 *dst);</div><div class='del'>-</div><div class='ctx'> void ceph_fscrypt_set_ops(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> void ceph_fscrypt_free_dummy_policy(struct ceph_fs_client *fsc);</div><div class='hunk'>@@ -102,10 +98,7 @@ int ceph_fscrypt_prepare_context(struct inode *dir, struct inode *inode,</div><div class='ctx'> 				 struct ceph_acl_sec_ctx *as);</div><div class='ctx'> void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req,</div><div class='ctx'> 				struct ceph_acl_sec_ctx *as);</div><div class='del'>-int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,</div><div class='del'>-				char *buf);</div><div class='del'>-int ceph_encode_encrypted_fname(struct inode *parent, struct dentry *dentry,</div><div class='del'>-				char *buf);</div><div class='add'>+int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int len);</div><div class='ctx'> </div><div class='ctx'> static inline int ceph_fname_alloc_buffer(struct inode *parent,</div><div class='ctx'> 					  struct fscrypt_str *fname)</div><div class='hunk'>@@ -155,15 +148,14 @@ int ceph_fscrypt_decrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> 				  unsigned int offs, u64 lblk_num);</div><div class='ctx'> int ceph_fscrypt_encrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> 				  struct page *page, unsigned int len,</div><div class='del'>-				  unsigned int offs, u64 lblk_num,</div><div class='del'>-				  gfp_t gfp_flags);</div><div class='add'>+				  unsigned int offs, u64 lblk_num);</div><div class='ctx'> int ceph_fscrypt_decrypt_pages(struct inode *inode, struct page **page,</div><div class='ctx'> 			       u64 off, int len);</div><div class='ctx'> int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page,</div><div class='ctx'> 				 u64 off, struct ceph_sparse_extent *map,</div><div class='ctx'> 				 u32 ext_cnt);</div><div class='ctx'> int ceph_fscrypt_encrypt_pages(struct inode *inode, struct page **page, u64 off,</div><div class='del'>-			       int len, gfp_t gfp);</div><div class='add'>+			       int len);</div><div class='ctx'> </div><div class='ctx'> static inline struct page *ceph_fscrypt_pagecache_page(struct page *page)</div><div class='ctx'> {</div><div class='hunk'>@@ -194,17 +186,10 @@ static inline void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ceph_encode_encrypted_dname(struct inode *parent,</div><div class='del'>-					      struct qstr *d_name, char *buf)</div><div class='del'>-{</div><div class='del'>-	memcpy(buf, d_name-&gt;name, d_name-&gt;len);</div><div class='del'>-	return d_name-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int ceph_encode_encrypted_fname(struct inode *parent,</div><div class='del'>-					      struct dentry *dentry, char *buf)</div><div class='add'>+static inline int ceph_encode_encrypted_dname(struct inode *parent, char *buf,</div><div class='add'>+					      int len)</div><div class='ctx'> {</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ceph_fname_alloc_buffer(struct inode *parent,</div><div class='hunk'>@@ -246,8 +231,7 @@ static inline int ceph_fscrypt_decrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> static inline int ceph_fscrypt_encrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> 					  struct page *page, unsigned int len,</div><div class='del'>-					  unsigned int offs, u64 lblk_num,</div><div class='del'>-					  gfp_t gfp_flags)</div><div class='add'>+					  unsigned int offs, u64 lblk_num)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -269,7 +253,7 @@ static inline int ceph_fscrypt_decrypt_extents(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> static inline int ceph_fscrypt_encrypt_pages(struct inode *inode,</div><div class='ctx'> 					     struct page **page, u64 off,</div><div class='del'>-					     int len, gfp_t gfp)</div><div class='add'>+					     int len)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c<br/>index 24c08078f5aa..f3fe786b4143 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/debugfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/debugfs.c</a></div><div class='hunk'>@@ -55,8 +55,6 @@ static int mdsc_show(struct seq_file *s, void *p)</div><div class='ctx'> 	struct ceph_mds_client *mdsc = fsc-&gt;mdsc;</div><div class='ctx'> 	struct ceph_mds_request *req;</div><div class='ctx'> 	struct rb_node *rp;</div><div class='del'>-	int pathlen = 0;</div><div class='del'>-	u64 pathbase;</div><div class='ctx'> 	char *path;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mdsc-&gt;mutex);</div><div class='hunk'>@@ -81,8 +79,8 @@ static int mdsc_show(struct seq_file *s, void *p)</div><div class='ctx'> 		if (req-&gt;r_inode) {</div><div class='ctx'> 			seq_printf(s, " #%llx", ceph_ino(req-&gt;r_inode));</div><div class='ctx'> 		} else if (req-&gt;r_dentry) {</div><div class='del'>-			path = ceph_mdsc_build_path(mdsc, req-&gt;r_dentry, &amp;pathlen,</div><div class='del'>-						    &amp;pathbase, 0);</div><div class='add'>+			struct ceph_path_info path_info;</div><div class='add'>+			path = ceph_mdsc_build_path(mdsc, req-&gt;r_dentry, &amp;path_info, 0);</div><div class='ctx'> 			if (IS_ERR(path))</div><div class='ctx'> 				path = NULL;</div><div class='ctx'> 			spin_lock(&amp;req-&gt;r_dentry-&gt;d_lock);</div><div class='hunk'>@@ -91,7 +89,7 @@ static int mdsc_show(struct seq_file *s, void *p)</div><div class='ctx'> 				   req-&gt;r_dentry,</div><div class='ctx'> 				   path ? path : "");</div><div class='ctx'> 			spin_unlock(&amp;req-&gt;r_dentry-&gt;d_lock);</div><div class='del'>-			ceph_mdsc_free_path(path, pathlen);</div><div class='add'>+			ceph_mdsc_free_path_info(&amp;path_info);</div><div class='ctx'> 		} else if (req-&gt;r_path1) {</div><div class='ctx'> 			seq_printf(s, " #%llx/%s", req-&gt;r_ino1.ino,</div><div class='ctx'> 				   req-&gt;r_path1);</div><div class='hunk'>@@ -100,8 +98,8 @@ static int mdsc_show(struct seq_file *s, void *p)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (req-&gt;r_old_dentry) {</div><div class='del'>-			path = ceph_mdsc_build_path(mdsc, req-&gt;r_old_dentry, &amp;pathlen,</div><div class='del'>-						    &amp;pathbase, 0);</div><div class='add'>+			struct ceph_path_info path_info;</div><div class='add'>+			path = ceph_mdsc_build_path(mdsc, req-&gt;r_old_dentry, &amp;path_info, 0);</div><div class='ctx'> 			if (IS_ERR(path))</div><div class='ctx'> 				path = NULL;</div><div class='ctx'> 			spin_lock(&amp;req-&gt;r_old_dentry-&gt;d_lock);</div><div class='hunk'>@@ -111,7 +109,7 @@ static int mdsc_show(struct seq_file *s, void *p)</div><div class='ctx'> 				   req-&gt;r_old_dentry,</div><div class='ctx'> 				   path ? path : "");</div><div class='ctx'> 			spin_unlock(&amp;req-&gt;r_old_dentry-&gt;d_lock);</div><div class='del'>-			ceph_mdsc_free_path(path, pathlen);</div><div class='add'>+			ceph_mdsc_free_path_info(&amp;path_info);</div><div class='ctx'> 		} else if (req-&gt;r_path2 &amp;&amp; req-&gt;r_op != CEPH_MDS_OP_SYMLINK) {</div><div class='ctx'> 			if (req-&gt;r_ino2.ino)</div><div class='ctx'> 				seq_printf(s, " #%llx/%s", req-&gt;r_ino2.ino,</div><div class='hunk'>@@ -357,7 +355,7 @@ static int status_show(struct seq_file *s, void *p)</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "instance: %s.%lld %s/%u\n", ENTITY_NAME(inst-&gt;name),</div><div class='ctx'> 		   ceph_pr_addr(client_addr), le32_to_cpu(client_addr-&gt;nonce));</div><div class='del'>-	seq_printf(s, "blocklisted: %s\n", fsc-&gt;blocklisted ? "true" : "false");</div><div class='add'>+	seq_printf(s, "blocklisted: %s\n", str_true_false(fsc-&gt;blocklisted));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -412,7 +410,7 @@ void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc)</div><div class='ctx'> </div><div class='ctx'> void ceph_fs_debugfs_init(struct ceph_fs_client *fsc)</div><div class='ctx'> {</div><div class='del'>-	char name[100];</div><div class='add'>+	char name[NAME_MAX];</div><div class='ctx'> </div><div class='ctx'> 	doutc(fsc-&gt;client, "begin\n");</div><div class='ctx'> 	fsc-&gt;debugfs_congestion_kb =</div><div class='head'>diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c<br/>index 0e9f56eaba1e..86d7aa594ea9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/dir.c</a></div><div class='hunk'>@@ -141,17 +141,18 @@ __dcache_find_get_entry(struct dentry *parent, u64 idx,</div><div class='ctx'> 	if (ptr_pos &gt;= i_size_read(dir))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (!cache_ctl-&gt;page || ptr_pgoff != page_index(cache_ctl-&gt;page)) {</div><div class='add'>+	if (!cache_ctl-&gt;folio || ptr_pgoff != cache_ctl-&gt;folio-&gt;index) {</div><div class='ctx'> 		ceph_readdir_cache_release(cache_ctl);</div><div class='del'>-		cache_ctl-&gt;page = find_lock_page(&amp;dir-&gt;i_data, ptr_pgoff);</div><div class='del'>-		if (!cache_ctl-&gt;page) {</div><div class='del'>-			doutc(cl, " page %lu not found\n", ptr_pgoff);</div><div class='add'>+		cache_ctl-&gt;folio = filemap_lock_folio(&amp;dir-&gt;i_data, ptr_pgoff);</div><div class='add'>+		if (IS_ERR(cache_ctl-&gt;folio)) {</div><div class='add'>+			cache_ctl-&gt;folio = NULL;</div><div class='add'>+			doutc(cl, " folio %lu not found\n", ptr_pgoff);</div><div class='ctx'> 			return ERR_PTR(-EAGAIN);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* reading/filling the cache are serialized by</div><div class='del'>-		   i_rwsem, no need to use page lock */</div><div class='del'>-		unlock_page(cache_ctl-&gt;page);</div><div class='del'>-		cache_ctl-&gt;dentries = kmap(cache_ctl-&gt;page);</div><div class='add'>+		   i_rwsem, no need to use folio lock */</div><div class='add'>+		folio_unlock(cache_ctl-&gt;folio);</div><div class='add'>+		cache_ctl-&gt;dentries = kmap_local_folio(cache_ctl-&gt;folio, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cache_ctl-&gt;index = idx &amp; idx_mask;</div><div class='hunk'>@@ -207,7 +208,7 @@ static int __dcache_readdir(struct file *file,  struct dir_context *ctx,</div><div class='ctx'> 			dentry = __dcache_find_get_entry(parent, idx + step,</div><div class='ctx'> 							 &amp;cache_ctl);</div><div class='ctx'> 			if (!dentry) {</div><div class='del'>-				/* use linar search */</div><div class='add'>+				/* use linear search */</div><div class='ctx'> 				idx = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -422,17 +423,16 @@ more:</div><div class='ctx'> 			req-&gt;r_inode_drop = CEPH_CAP_FILE_EXCL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (dfi-&gt;last_name) {</div><div class='del'>-			struct qstr d_name = { .name = dfi-&gt;last_name,</div><div class='del'>-					       .len = strlen(dfi-&gt;last_name) };</div><div class='add'>+			int len = strlen(dfi-&gt;last_name);</div><div class='ctx'> </div><div class='ctx'> 			req-&gt;r_path2 = kzalloc(NAME_MAX + 1, GFP_KERNEL);</div><div class='ctx'> 			if (!req-&gt;r_path2) {</div><div class='ctx'> 				ceph_mdsc_put_request(req);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='add'>+			memcpy(req-&gt;r_path2, dfi-&gt;last_name, len);</div><div class='ctx'> </div><div class='del'>-			err = ceph_encode_encrypted_dname(inode, &amp;d_name,</div><div class='del'>-							  req-&gt;r_path2);</div><div class='add'>+			err = ceph_encode_encrypted_dname(inode, req-&gt;r_path2, len);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				ceph_mdsc_put_request(req);</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -659,7 +659,7 @@ static bool need_reset_readdir(struct ceph_dir_file_info *dfi, loff_t new_pos)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (is_hash_order(new_pos)) {</div><div class='ctx'> 		/* no need to reset last_name for a forward seek when</div><div class='del'>-		 * dentries are sotred in hash order */</div><div class='add'>+		 * dentries are sorted in hash order */</div><div class='ctx'> 	} else if (dfi-&gt;frag != fpos_frag(new_pos)) {</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -707,7 +707,6 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> </div><div class='ctx'> 		if (offset != file-&gt;f_pos) {</div><div class='ctx'> 			file-&gt;f_pos = offset;</div><div class='del'>-			file-&gt;f_version = 0;</div><div class='ctx'> 			dfi-&gt;file_info.flags &amp;= ~CEPH_F_ATEND;</div><div class='ctx'> 		}</div><div class='ctx'> 		retval = offset;</div><div class='hunk'>@@ -999,13 +998,14 @@ static int prep_encrypted_symlink_target(struct ceph_mds_request *req,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	req-&gt;r_path2 = kmalloc(CEPH_BASE64_CHARS(osd_link.len) + 1, GFP_KERNEL);</div><div class='add'>+	req-&gt;r_path2 = kmalloc(BASE64_CHARS(osd_link.len) + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!req-&gt;r_path2) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len = ceph_base64_encode(osd_link.name, osd_link.len, req-&gt;r_path2);</div><div class='add'>+	len = base64_encode(osd_link.name, osd_link.len,</div><div class='add'>+			    req-&gt;r_path2, false, BASE64_IMAP);</div><div class='ctx'> 	req-&gt;r_path2[len] = '\0';</div><div class='ctx'> out:</div><div class='ctx'> 	fscrypt_fname_free_buffer(&amp;osd_link);</div><div class='hunk'>@@ -1093,19 +1093,20 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ceph_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *ceph_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir-&gt;i_sb);</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='ctx'> 	struct ceph_mds_request *req;</div><div class='ctx'> 	struct ceph_acl_sec_ctx as_ctx = {};</div><div class='add'>+	struct dentry *ret;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int op;</div><div class='ctx'> </div><div class='ctx'> 	err = ceph_wait_on_conflict_unlink(dentry);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_snap(dir) == CEPH_SNAPDIR) {</div><div class='ctx'> 		/* mkdir .snap/foo is a MKSNAP */</div><div class='hunk'>@@ -1117,32 +1118,32 @@ static int ceph_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		      ceph_vinop(dir), dentry, dentry, mode);</div><div class='ctx'> 		op = CEPH_MDS_OP_MKDIR;</div><div class='ctx'> 	} else {</div><div class='del'>-		err = -EROFS;</div><div class='add'>+		ret = ERR_PTR(-EROFS);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (op == CEPH_MDS_OP_MKDIR &amp;&amp;</div><div class='ctx'> 	    ceph_quota_is_max_files_exceeded(dir)) {</div><div class='del'>-		err = -EDQUOT;</div><div class='add'>+		ret = ERR_PTR(-EDQUOT);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((op == CEPH_MDS_OP_MKSNAP) &amp;&amp; IS_ENCRYPTED(dir) &amp;&amp;</div><div class='ctx'> 	    !fscrypt_has_encryption_key(dir)) {</div><div class='del'>-		err = -ENOKEY;</div><div class='add'>+		ret = ERR_PTR(-ENOKEY);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	req = ceph_mdsc_create_request(mdsc, op, USE_AUTH_MDS);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='del'>-		err = PTR_ERR(req);</div><div class='add'>+		ret = ERR_CAST(req);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mode |= S_IFDIR;</div><div class='ctx'> 	req-&gt;r_new_inode = ceph_new_inode(dir, dentry, &amp;mode, &amp;as_ctx);</div><div class='ctx'> 	if (IS_ERR(req-&gt;r_new_inode)) {</div><div class='del'>-		err = PTR_ERR(req-&gt;r_new_inode);</div><div class='add'>+		ret = ERR_CAST(req-&gt;r_new_inode);</div><div class='ctx'> 		req-&gt;r_new_inode = NULL;</div><div class='ctx'> 		goto out_req;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1166,15 +1167,22 @@ static int ceph_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	    !req-&gt;r_reply_info.head-&gt;is_target &amp;&amp;</div><div class='ctx'> 	    !req-&gt;r_reply_info.head-&gt;is_dentry)</div><div class='ctx'> 		err = ceph_handle_notrace_create(dir, dentry);</div><div class='add'>+	ret = ERR_PTR(err);</div><div class='ctx'> out_req:</div><div class='add'>+	if (!IS_ERR(ret) &amp;&amp; req-&gt;r_dentry != dentry)</div><div class='add'>+		/* Some other dentry was spliced in */</div><div class='add'>+		ret = dget(req-&gt;r_dentry);</div><div class='ctx'> 	ceph_mdsc_put_request(req);</div><div class='ctx'> out:</div><div class='del'>-	if (!err)</div><div class='add'>+	if (!IS_ERR(ret)) {</div><div class='add'>+		if (ret)</div><div class='add'>+			dentry = ret;</div><div class='ctx'> 		ceph_init_inode_acls(d_inode(dentry), &amp;as_ctx);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		d_drop(dentry);</div><div class='add'>+	}</div><div class='ctx'> 	ceph_release_acl_sec_ctx(&amp;as_ctx);</div><div class='del'>-	return err;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ceph_link(struct dentry *old_dentry, struct inode *dir,</div><div class='hunk'>@@ -1253,8 +1261,7 @@ static void ceph_async_unlink_cb(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	spin_unlock(&amp;fsc-&gt;async_unlink_conflict_lock);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	di-&gt;flags &amp;= ~CEPH_DENTRY_ASYNC_UNLINK;</div><div class='del'>-	wake_up_bit(&amp;di-&gt;flags, CEPH_DENTRY_ASYNC_UNLINK_BIT);</div><div class='add'>+	clear_and_wake_up_bit(CEPH_DENTRY_ASYNC_UNLINK_BIT, &amp;di-&gt;flags);</div><div class='ctx'> 	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> </div><div class='ctx'> 	synchronize_rcu();</div><div class='hunk'>@@ -1264,10 +1271,8 @@ static void ceph_async_unlink_cb(struct ceph_mds_client *mdsc,</div><div class='ctx'> </div><div class='ctx'> 	/* If op failed, mark everyone involved for errors */</div><div class='ctx'> 	if (result) {</div><div class='del'>-		int pathlen = 0;</div><div class='del'>-		u64 base = 0;</div><div class='del'>-		char *path = ceph_mdsc_build_path(mdsc, dentry, &amp;pathlen,</div><div class='del'>-						  &amp;base, 0);</div><div class='add'>+		struct ceph_path_info path_info = {0};</div><div class='add'>+		char *path = ceph_mdsc_build_path(mdsc, dentry, &amp;path_info, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* mark error on parent + clear complete */</div><div class='ctx'> 		mapping_set_error(req-&gt;r_parent-&gt;i_mapping, result);</div><div class='hunk'>@@ -1281,8 +1286,8 @@ static void ceph_async_unlink_cb(struct ceph_mds_client *mdsc,</div><div class='ctx'> 		mapping_set_error(req-&gt;r_old_inode-&gt;i_mapping, result);</div><div class='ctx'> </div><div class='ctx'> 		pr_warn_client(cl, "failure path=(%llx)%s result=%d!\n",</div><div class='del'>-			       base, IS_ERR(path) ? "&lt;&lt;bad&gt;&gt;" : path, result);</div><div class='del'>-		ceph_mdsc_free_path(path, pathlen);</div><div class='add'>+			       path_info.vino.ino, IS_ERR(path) ? "&lt;&lt;bad&gt;&gt;" : path, result);</div><div class='add'>+		ceph_mdsc_free_path_info(&amp;path_info);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	iput(req-&gt;r_old_inode);</div><div class='hunk'>@@ -1336,8 +1341,10 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct ceph_mds_request *req;</div><div class='ctx'> 	bool try_async = ceph_test_mount_opt(fsc, ASYNC_DIROPS);</div><div class='add'>+	struct dentry *dn;</div><div class='ctx'> 	int err = -EROFS;</div><div class='ctx'> 	int op;</div><div class='add'>+	char *path;</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_snap(dir) == CEPH_SNAPDIR) {</div><div class='ctx'> 		/* rmdir .snap/foo is RMSNAP */</div><div class='hunk'>@@ -1351,6 +1358,31 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 			CEPH_MDS_OP_RMDIR : CEPH_MDS_OP_UNLINK;</div><div class='ctx'> 	} else</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='add'>+	dn = d_find_alias(dir);</div><div class='add'>+	if (!dn) {</div><div class='add'>+		try_async = false;</div><div class='add'>+	} else {</div><div class='add'>+		struct ceph_path_info path_info;</div><div class='add'>+		path = ceph_mdsc_build_path(mdsc, dn, &amp;path_info, 0);</div><div class='add'>+		if (IS_ERR(path)) {</div><div class='add'>+			try_async = false;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			err = ceph_mds_check_access(mdsc, path, MAY_WRITE);</div><div class='add'>+		}</div><div class='add'>+		ceph_mdsc_free_path_info(&amp;path_info);</div><div class='add'>+		dput(dn);</div><div class='add'>+</div><div class='add'>+		/* For none EACCES cases will let the MDS do the mds auth check */</div><div class='add'>+		if (err == -EACCES) {</div><div class='add'>+			return err;</div><div class='add'>+		} else if (err &lt; 0) {</div><div class='add'>+			try_async = false;</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='ctx'> 	req = ceph_mdsc_create_request(mdsc, op, USE_AUTH_MDS);</div><div class='ctx'> 	if (IS_ERR(req)) {</div><div class='hunk'>@@ -1561,7 +1593,7 @@ void __ceph_dentry_dir_lease_touch(struct ceph_dentry_info *di)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mdsc-&gt;dentry_list_lock);</div><div class='del'>-	__dentry_dir_lease_touch(mdsc, di),</div><div class='add'>+	__dentry_dir_lease_touch(mdsc, di);</div><div class='ctx'> 	spin_unlock(&amp;mdsc-&gt;dentry_list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1913,29 +1945,19 @@ static int dir_lease_is_valid(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> /*</div><div class='ctx'>  * Check if cached dentry can be trusted.</div><div class='ctx'>  */</div><div class='del'>-static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int ceph_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			     struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_mds_client *mdsc = ceph_sb_to_fs_client(dentry-&gt;d_sb)-&gt;mdsc;</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='ctx'> 	int valid = 0;</div><div class='del'>-	struct dentry *parent;</div><div class='del'>-	struct inode *dir, *inode;</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	valid = fscrypt_d_revalidate(dentry, flags);</div><div class='add'>+	valid = fscrypt_d_revalidate(dir, name, dentry, flags);</div><div class='ctx'> 	if (valid &lt;= 0)</div><div class='ctx'> 		return valid;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; LOOKUP_RCU) {</div><div class='del'>-		parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='del'>-		dir = d_inode_rcu(parent);</div><div class='del'>-		if (!dir)</div><div class='del'>-			return -ECHILD;</div><div class='del'>-		inode = d_inode_rcu(dentry);</div><div class='del'>-	} else {</div><div class='del'>-		parent = dget_parent(dentry);</div><div class='del'>-		dir = d_inode(parent);</div><div class='del'>-		inode = d_inode(dentry);</div><div class='del'>-	}</div><div class='add'>+	inode = d_inode_rcu(dentry);</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "%p '%pd' inode %p offset 0x%llx nokey %d\n",</div><div class='ctx'> 	      dentry, dentry, inode, ceph_dentry(dentry)-&gt;offset,</div><div class='hunk'>@@ -1981,6 +2003,8 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 			req-&gt;r_parent = dir;</div><div class='ctx'> 			ihold(dir);</div><div class='ctx'> </div><div class='add'>+			req-&gt;r_dname = name;</div><div class='add'>+</div><div class='ctx'> 			mask = CEPH_STAT_CAP_INODE | CEPH_CAP_AUTH_SHARED;</div><div class='ctx'> 			if (ceph_security_xattr_wanted(dir))</div><div class='ctx'> 				mask |= CEPH_CAP_XATTR_SHARED;</div><div class='hunk'>@@ -2011,9 +2035,6 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	doutc(cl, "%p '%pd' %s\n", dentry, dentry, valid ? "valid" : "invalid");</div><div class='ctx'> 	if (!valid)</div><div class='ctx'> 		ceph_dir_clear_complete(dir);</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; LOOKUP_RCU))</div><div class='del'>-		dput(parent);</div><div class='ctx'> 	return valid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2031,7 +2052,7 @@ static int ceph_d_delete(const struct dentry *dentry)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (ceph_snap(d_inode(dentry)) != CEPH_NOSNAP)</div><div class='ctx'> 		return 0;</div><div class='del'>-	/* vaild lease? */</div><div class='add'>+	/* valid lease? */</div><div class='ctx'> 	di = ceph_dentry(dentry);</div><div class='ctx'> 	if (di) {</div><div class='ctx'> 		if (__dentry_lease_is_valid(di))</div><div class='hunk'>@@ -2135,7 +2156,7 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size,</div><div class='ctx'> 				" rfiles:   %20lld\n"</div><div class='ctx'> 				" rsubdirs: %20lld\n"</div><div class='ctx'> 				"rbytes:    %20lld\n"</div><div class='del'>-				"rctime:    %10lld.%09ld\n",</div><div class='add'>+				"rctime:    %ptSp\n",</div><div class='ctx'> 				ci-&gt;i_files + ci-&gt;i_subdirs,</div><div class='ctx'> 				ci-&gt;i_files,</div><div class='ctx'> 				ci-&gt;i_subdirs,</div><div class='hunk'>@@ -2143,8 +2164,7 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size,</div><div class='ctx'> 				ci-&gt;i_rfiles,</div><div class='ctx'> 				ci-&gt;i_rsubdirs,</div><div class='ctx'> 				ci-&gt;i_rbytes,</div><div class='del'>-				ci-&gt;i_rctime.tv_sec,</div><div class='del'>-				ci-&gt;i_rctime.tv_nsec);</div><div class='add'>+				&amp;ci-&gt;i_rctime);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*ppos &gt;= dfi-&gt;dir_info_len)</div><div class='head'>diff --git a/fs/ceph/export.c b/fs/ceph/export.c<br/>index a79f163ae4ed..b2f2af104679 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/export.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "super.h"</div><div class='ctx'> #include "mds_client.h"</div><div class='hunk'>@@ -33,12 +33,19 @@ struct ceph_nfs_snapfh {</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+#define BYTES_PER_U32		(sizeof(u32))</div><div class='add'>+#define CEPH_FH_BASIC_SIZE \</div><div class='add'>+	(sizeof(struct ceph_nfs_fh) / BYTES_PER_U32)</div><div class='add'>+#define CEPH_FH_WITH_PARENT_SIZE \</div><div class='add'>+	(sizeof(struct ceph_nfs_confh) / BYTES_PER_U32)</div><div class='add'>+#define CEPH_FH_SNAPPED_INODE_SIZE \</div><div class='add'>+	(sizeof(struct ceph_nfs_snapfh) / BYTES_PER_U32)</div><div class='add'>+</div><div class='ctx'> static int ceph_encode_snapfh(struct inode *inode, u32 *rawfh, int *max_len,</div><div class='ctx'> 			      struct inode *parent_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='del'>-	static const int snap_handle_length =</div><div class='del'>-		sizeof(struct ceph_nfs_snapfh) &gt;&gt; 2;</div><div class='add'>+	static const int snap_handle_length = CEPH_FH_SNAPPED_INODE_SIZE;</div><div class='ctx'> 	struct ceph_nfs_snapfh *sfh = (void *)rawfh;</div><div class='ctx'> 	u64 snapid = ceph_snap(inode);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -88,10 +95,8 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,</div><div class='ctx'> 			  struct inode *parent_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='del'>-	static const int handle_length =</div><div class='del'>-		sizeof(struct ceph_nfs_fh) &gt;&gt; 2;</div><div class='del'>-	static const int connected_handle_length =</div><div class='del'>-		sizeof(struct ceph_nfs_confh) &gt;&gt; 2;</div><div class='add'>+	static const int handle_length = CEPH_FH_BASIC_SIZE;</div><div class='add'>+	static const int connected_handle_length = CEPH_FH_WITH_PARENT_SIZE;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_snap(inode) != CEPH_NOSNAP)</div><div class='hunk'>@@ -308,7 +313,7 @@ static struct dentry *ceph_fh_to_dentry(struct super_block *sb,</div><div class='ctx'> 	if (fh_type != FILEID_INO32_GEN  &amp;&amp;</div><div class='ctx'> 	    fh_type != FILEID_INO32_GEN_PARENT)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (fh_len &lt; sizeof(*fh) / 4)</div><div class='add'>+	if (fh_len &lt; sizeof(*fh) / BYTES_PER_U32)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	doutc(fsc-&gt;client, "%llx\n", fh-&gt;ino);</div><div class='hunk'>@@ -393,9 +398,9 @@ static struct dentry *ceph_get_parent(struct dentry *child)</div><div class='ctx'> 			}</div><div class='ctx'> 			dir = snapdir;</div><div class='ctx'> 		}</div><div class='del'>-		/* If directory has already been deleted, futher get_parent</div><div class='add'>+		/* If directory has already been deleted, further get_parent</div><div class='ctx'> 		 * will fail. Do not mark snapdir dentry as disconnected,</div><div class='del'>-		 * this prevent exportfs from doing futher get_parent. */</div><div class='add'>+		 * this prevents exportfs from doing further get_parent. */</div><div class='ctx'> 		if (unlinked)</div><div class='ctx'> 			dn = d_obtain_root(dir);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -427,7 +432,7 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	if (fh_type != FILEID_INO32_GEN_PARENT)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (fh_len &lt; sizeof(*cfh) / 4)</div><div class='add'>+	if (fh_len &lt; sizeof(*cfh) / BYTES_PER_U32)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	doutc(fsc-&gt;client, "%llx\n", cfh-&gt;parent_ino);</div><div class='hunk'>@@ -452,7 +457,13 @@ static int __get_snap_name(struct dentry *parent, char *name,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (ceph_snap(inode) == CEPH_SNAPDIR) {</div><div class='ctx'> 		if (ceph_snap(dir) == CEPH_NOSNAP) {</div><div class='del'>-			strcpy(name, fsc-&gt;mount_options-&gt;snapdir_name);</div><div class='add'>+			/*</div><div class='add'>+			 * .get_name() from struct export_operations</div><div class='add'>+			 * assumes that its 'name' parameter is pointing</div><div class='add'>+			 * to a NAME_MAX+1 sized buffer</div><div class='add'>+			 */</div><div class='add'>+			strscpy(name, fsc-&gt;mount_options-&gt;snapdir_name,</div><div class='add'>+				NAME_MAX + 1);</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/fs/ceph/file.c b/fs/ceph/file.c<br/>index abe8028d95bf..983390069f73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/file.c</a></div><div class='hunk'>@@ -366,6 +366,10 @@ int ceph_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct ceph_file_info *fi = file-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int flags, fmode, wanted;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	char *path;</div><div class='add'>+	bool do_sync = false;</div><div class='add'>+	int mask = MAY_READ;</div><div class='ctx'> </div><div class='ctx'> 	if (fi) {</div><div class='ctx'> 		doutc(cl, "file %p is already opened\n", file);</div><div class='hunk'>@@ -387,6 +391,32 @@ int ceph_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	fmode = ceph_flags_to_mode(flags);</div><div class='ctx'> 	wanted = ceph_caps_for_mode(fmode);</div><div class='ctx'> </div><div class='add'>+	if (fmode &amp; CEPH_FILE_MODE_WR)</div><div class='add'>+		mask |= MAY_WRITE;</div><div class='add'>+	dentry = d_find_alias(inode);</div><div class='add'>+	if (!dentry) {</div><div class='add'>+		do_sync = true;</div><div class='add'>+	} else {</div><div class='add'>+		struct ceph_path_info path_info;</div><div class='add'>+		path = ceph_mdsc_build_path(mdsc, dentry, &amp;path_info, 0);</div><div class='add'>+		if (IS_ERR(path)) {</div><div class='add'>+			do_sync = true;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			err = ceph_mds_check_access(mdsc, path, mask);</div><div class='add'>+		}</div><div class='add'>+		ceph_mdsc_free_path_info(&amp;path_info);</div><div class='add'>+		dput(dentry);</div><div class='add'>+</div><div class='add'>+		/* For none EACCES cases will let the MDS do the mds auth check */</div><div class='add'>+		if (err == -EACCES) {</div><div class='add'>+			return err;</div><div class='add'>+		} else if (err &lt; 0) {</div><div class='add'>+			do_sync = true;</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* snapped files are read-only */</div><div class='ctx'> 	if (ceph_snap(inode) != CEPH_NOSNAP &amp;&amp; (file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EROFS;</div><div class='hunk'>@@ -402,7 +432,7 @@ int ceph_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	 * asynchronously.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-	if (__ceph_is_any_real_caps(ci) &amp;&amp;</div><div class='add'>+	if (!do_sync &amp;&amp; __ceph_is_any_real_caps(ci) &amp;&amp;</div><div class='ctx'> 	    (((fmode &amp; CEPH_FILE_MODE_WR) == 0) || ci-&gt;i_auth_cap)) {</div><div class='ctx'> 		int mds_wanted = __ceph_caps_mds_wanted(ci, true);</div><div class='ctx'> 		int issued = __ceph_caps_issued(ci, NULL);</div><div class='hunk'>@@ -420,7 +450,7 @@ int ceph_open(struct inode *inode, struct file *file)</div><div class='ctx'> 			ceph_check_caps(ci, 0);</div><div class='ctx'> </div><div class='ctx'> 		return ceph_init_file(inode, file, fmode);</div><div class='del'>-	} else if (ceph_snap(inode) != CEPH_NOSNAP &amp;&amp;</div><div class='add'>+	} else if (!do_sync &amp;&amp; ceph_snap(inode) != CEPH_NOSNAP &amp;&amp;</div><div class='ctx'> 		   (ci-&gt;i_snap_caps &amp; wanted) == wanted) {</div><div class='ctx'> 		__ceph_touch_fmode(ci, mdsc, fmode);</div><div class='ctx'> 		spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='hunk'>@@ -549,8 +579,7 @@ static void wake_async_create_waiters(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='ctx'> 	if (ci-&gt;i_ceph_flags &amp; CEPH_I_ASYNC_CREATE) {</div><div class='del'>-		ci-&gt;i_ceph_flags &amp;= ~CEPH_I_ASYNC_CREATE;</div><div class='del'>-		wake_up_bit(&amp;ci-&gt;i_ceph_flags, CEPH_ASYNC_CREATE_BIT);</div><div class='add'>+		clear_and_wake_up_bit(CEPH_ASYNC_CREATE_BIT, &amp;ci-&gt;i_ceph_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (ci-&gt;i_ceph_flags &amp; CEPH_I_ASYNC_CHECK_CAPS) {</div><div class='ctx'> 			ci-&gt;i_ceph_flags &amp;= ~CEPH_I_ASYNC_CHECK_CAPS;</div><div class='hunk'>@@ -583,15 +612,13 @@ static void ceph_async_create_cb(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	mapping_set_error(req-&gt;r_parent-&gt;i_mapping, result);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		int pathlen = 0;</div><div class='del'>-		u64 base = 0;</div><div class='del'>-		char *path = ceph_mdsc_build_path(mdsc, req-&gt;r_dentry, &amp;pathlen,</div><div class='del'>-						  &amp;base, 0);</div><div class='add'>+		struct ceph_path_info path_info = {0};</div><div class='add'>+		char *path = ceph_mdsc_build_path(mdsc, req-&gt;r_dentry, &amp;path_info, 0);</div><div class='ctx'> </div><div class='ctx'> 		pr_warn_client(cl,</div><div class='ctx'> 			"async create failure path=(%llx)%s result=%d!\n",</div><div class='del'>-			base, IS_ERR(path) ? "&lt;&lt;bad&gt;&gt;" : path, result);</div><div class='del'>-		ceph_mdsc_free_path(path, pathlen);</div><div class='add'>+			path_info.vino.ino, IS_ERR(path) ? "&lt;&lt;bad&gt;&gt;" : path, result);</div><div class='add'>+		ceph_mdsc_free_path_info(&amp;path_info);</div><div class='ctx'> </div><div class='ctx'> 		ceph_dir_clear_complete(req-&gt;r_parent);</div><div class='ctx'> 		if (!d_unhashed(dentry))</div><div class='hunk'>@@ -713,7 +740,7 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode,</div><div class='ctx'> 		      vino.ino, ceph_ino(dir), dentry-&gt;d_name.name);</div><div class='ctx'> 		ceph_dir_clear_ordered(dir);</div><div class='ctx'> 		ceph_init_inode_acls(inode, as_ctx);</div><div class='del'>-		if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+		if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If it's not I_NEW, then someone created this before</div><div class='ctx'> 			 * we got here. Assume the server is aware of it at</div><div class='hunk'>@@ -734,8 +761,7 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	di-&gt;flags &amp;= ~CEPH_DENTRY_ASYNC_CREATE;</div><div class='del'>-	wake_up_bit(&amp;di-&gt;flags, CEPH_DENTRY_ASYNC_CREATE_BIT);</div><div class='add'>+	clear_and_wake_up_bit(CEPH_DENTRY_ASYNC_CREATE_BIT, &amp;di-&gt;flags);</div><div class='ctx'> 	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -759,6 +785,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	bool try_async = ceph_test_mount_opt(fsc, ASYNC_DIROPS);</div><div class='ctx'> 	int mask;</div><div class='ctx'> 	int err;</div><div class='add'>+	char *path;</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "%p %llx.%llx dentry %p '%pd' %s flags %d mode 0%o\n",</div><div class='ctx'> 	      dir, ceph_vinop(dir), dentry, dentry,</div><div class='hunk'>@@ -776,6 +803,35 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	 */</div><div class='ctx'> 	flags &amp;= ~O_TRUNC;</div><div class='ctx'> </div><div class='add'>+	dn = d_find_alias(dir);</div><div class='add'>+	if (!dn) {</div><div class='add'>+		try_async = false;</div><div class='add'>+	} else {</div><div class='add'>+		struct ceph_path_info path_info;</div><div class='add'>+		path = ceph_mdsc_build_path(mdsc, dn, &amp;path_info, 0);</div><div class='add'>+		if (IS_ERR(path)) {</div><div class='add'>+			try_async = false;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			int fmode = ceph_flags_to_mode(flags);</div><div class='add'>+</div><div class='add'>+			mask = MAY_READ;</div><div class='add'>+			if (fmode &amp; CEPH_FILE_MODE_WR)</div><div class='add'>+				mask |= MAY_WRITE;</div><div class='add'>+			err = ceph_mds_check_access(mdsc, path, mask);</div><div class='add'>+		}</div><div class='add'>+		ceph_mdsc_free_path_info(&amp;path_info);</div><div class='add'>+		dput(dn);</div><div class='add'>+</div><div class='add'>+		/* For none EACCES cases will let the MDS do the mds auth check */</div><div class='add'>+		if (err == -EACCES) {</div><div class='add'>+			return err;</div><div class='add'>+		} else if (err &lt; 0) {</div><div class='add'>+			try_async = false;</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='ctx'> 	if (flags &amp; O_CREAT) {</div><div class='ctx'> 		if (ceph_quota_is_max_files_exceeded(dir))</div><div class='hunk'>@@ -845,7 +901,7 @@ retry:</div><div class='ctx'> 				new_inode = NULL;</div><div class='ctx'> 				goto out_req;</div><div class='ctx'> 			}</div><div class='del'>-			WARN_ON_ONCE(!(new_inode-&gt;i_state &amp; I_NEW));</div><div class='add'>+			WARN_ON_ONCE(!(inode_state_read_once(new_inode) &amp; I_NEW));</div><div class='ctx'> </div><div class='ctx'> 			spin_lock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 			di-&gt;flags |= CEPH_DENTRY_ASYNC_CREATE;</div><div class='hunk'>@@ -1004,7 +1060,7 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (!len)</div><div class='add'>+	if (!len || !i_size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * flush any page cache pages in this range.  this</div><div class='hunk'>@@ -1024,7 +1080,7 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 		int num_pages;</div><div class='ctx'> 		size_t page_off;</div><div class='ctx'> 		bool more;</div><div class='del'>-		int idx;</div><div class='add'>+		int idx = 0;</div><div class='ctx'> 		size_t left;</div><div class='ctx'> 		struct ceph_osd_req_op *op;</div><div class='ctx'> 		u64 read_off = off;</div><div class='hunk'>@@ -1054,6 +1110,16 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 			len = read_off + read_len - off;</div><div class='ctx'> 		more = len &lt; iov_iter_count(to);</div><div class='ctx'> </div><div class='add'>+		op = &amp;req-&gt;r_ops[0];</div><div class='add'>+		if (sparse) {</div><div class='add'>+			extent_cnt = __ceph_sparse_read_ext_count(inode, read_len);</div><div class='add'>+			ret = ceph_alloc_sparse_ext_map(op, extent_cnt);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ceph_osdc_put_request(req);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		num_pages = calc_pages_for(read_off, read_len);</div><div class='ctx'> 		page_off = offset_in_page(off);</div><div class='ctx'> 		pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);</div><div class='hunk'>@@ -1065,17 +1131,7 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> </div><div class='ctx'> 		osd_req_op_extent_osd_data_pages(req, 0, pages, read_len,</div><div class='ctx'> 						 offset_in_page(read_off),</div><div class='del'>-						 false, false);</div><div class='del'>-</div><div class='del'>-		op = &amp;req-&gt;r_ops[0];</div><div class='del'>-		if (sparse) {</div><div class='del'>-			extent_cnt = __ceph_sparse_read_ext_count(inode, read_len);</div><div class='del'>-			ret = ceph_alloc_sparse_ext_map(op, extent_cnt);</div><div class='del'>-			if (ret) {</div><div class='del'>-				ceph_osdc_put_request(req);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+						 false, true);</div><div class='ctx'> </div><div class='ctx'> 		ceph_osdc_start_request(osdc, req);</div><div class='ctx'> 		ret = ceph_osdc_wait_request(osdc, req);</div><div class='hunk'>@@ -1098,7 +1154,14 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 		else if (ret == -ENOENT)</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> </div><div class='del'>-		if (ret &gt; 0 &amp;&amp; IS_ENCRYPTED(inode)) {</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ceph_osdc_put_request(req);</div><div class='add'>+			if (ret == -EBLOCKLISTED)</div><div class='add'>+				fsc-&gt;blocklisted = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (IS_ENCRYPTED(inode)) {</div><div class='ctx'> 			int fret;</div><div class='ctx'> </div><div class='ctx'> 			fret = ceph_fscrypt_decrypt_extents(inode, pages,</div><div class='hunk'>@@ -1124,10 +1187,8 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 			ret = min_t(ssize_t, fret, len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ceph_osdc_put_request(req);</div><div class='del'>-</div><div class='ctx'> 		/* Short read but not EOF? Zero out the remainder. */</div><div class='del'>-		if (ret &gt;= 0 &amp;&amp; ret &lt; len &amp;&amp; (off + ret &lt; i_size)) {</div><div class='add'>+		if (ret &lt; len &amp;&amp; (off + ret &lt; i_size)) {</div><div class='ctx'> 			int zlen = min(len - ret, i_size - off - ret);</div><div class='ctx'> 			int zoff = page_off + ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1137,8 +1198,11 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 			ret += zlen;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		idx = 0;</div><div class='del'>-		left = ret &gt; 0 ? ret : 0;</div><div class='add'>+		if (off + ret &gt; i_size)</div><div class='add'>+			left = (i_size &gt; off) ? i_size - off : 0;</div><div class='add'>+		else</div><div class='add'>+			left = ret;</div><div class='add'>+</div><div class='ctx'> 		while (left &gt; 0) {</div><div class='ctx'> 			size_t plen, copied;</div><div class='ctx'> </div><div class='hunk'>@@ -1154,28 +1218,21 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		ceph_release_page_vector(pages, num_pages);</div><div class='ctx'> </div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			if (ret == -EBLOCKLISTED)</div><div class='del'>-				fsc-&gt;blocklisted = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		ceph_osdc_put_request(req);</div><div class='ctx'> </div><div class='ctx'> 		if (off &gt;= i_size || !more)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='del'>-		if (off &gt; *ki_pos) {</div><div class='del'>-			if (off &gt;= i_size) {</div><div class='del'>-				*retry_op = CHECK_EOF;</div><div class='del'>-				ret = i_size - *ki_pos;</div><div class='del'>-				*ki_pos = i_size;</div><div class='del'>-			} else {</div><div class='del'>-				ret = off - *ki_pos;</div><div class='del'>-				*ki_pos = off;</div><div class='del'>-			}</div><div class='add'>+		if (off &gt;= i_size) {</div><div class='add'>+			*retry_op = CHECK_EOF;</div><div class='add'>+			ret = i_size - *ki_pos;</div><div class='add'>+			*ki_pos = i_size;</div><div class='add'>+		} else {</div><div class='add'>+			ret = off - *ki_pos;</div><div class='add'>+			*ki_pos = off;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (last_objver)</div><div class='hunk'>@@ -1488,6 +1545,16 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		op = &amp;req-&gt;r_ops[0];</div><div class='add'>+		if (!write &amp;&amp; sparse) {</div><div class='add'>+			extent_cnt = __ceph_sparse_read_ext_count(inode, size);</div><div class='add'>+			ret = ceph_alloc_sparse_ext_map(op, extent_cnt);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ceph_osdc_put_request(req);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		len = iter_get_bvecs_alloc(iter, size, &amp;bvecs, &amp;num_pages);</div><div class='ctx'> 		if (len &lt; 0) {</div><div class='ctx'> 			ceph_osdc_put_request(req);</div><div class='hunk'>@@ -1497,6 +1564,8 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		if (len != size)</div><div class='ctx'> 			osd_req_op_extent_update(req, 0, len);</div><div class='ctx'> </div><div class='add'>+		osd_req_op_extent_osd_data_bvecs(req, 0, bvecs, num_pages, len);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * To simplify error handling, allow AIO when IO within i_size</div><div class='ctx'> 		 * or IO can be satisfied by single OSD request.</div><div class='hunk'>@@ -1528,17 +1597,6 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 			req-&gt;r_mtime = mtime;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		osd_req_op_extent_osd_data_bvecs(req, 0, bvecs, num_pages, len);</div><div class='del'>-		op = &amp;req-&gt;r_ops[0];</div><div class='del'>-		if (sparse) {</div><div class='del'>-			extent_cnt = __ceph_sparse_read_ext_count(inode, size);</div><div class='del'>-			ret = ceph_alloc_sparse_ext_map(op, extent_cnt);</div><div class='del'>-			if (ret) {</div><div class='del'>-				ceph_osdc_put_request(req);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (aio_req) {</div><div class='ctx'> 			aio_req-&gt;total_len += len;</div><div class='ctx'> 			aio_req-&gt;num_reqs++;</div><div class='hunk'>@@ -1928,8 +1986,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ENCRYPTED(inode)) {</div><div class='ctx'> 			ret = ceph_fscrypt_encrypt_pages(inode, pages,</div><div class='del'>-							 write_pos, write_len,</div><div class='del'>-							 GFP_KERNEL);</div><div class='add'>+							 write_pos, write_len);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				doutc(cl, "encryption failed with %d\n", ret);</div><div class='ctx'> 				ceph_release_page_vector(pages, num_pages);</div><div class='hunk'>@@ -2062,10 +2119,10 @@ again:</div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode))</div><div class='ctx'> 		return -ESTALE;</div><div class='ctx'> </div><div class='del'>-	if (direct_lock)</div><div class='del'>-		ceph_start_io_direct(inode);</div><div class='del'>-	else</div><div class='del'>-		ceph_start_io_read(inode);</div><div class='add'>+	ret = direct_lock ? ceph_start_io_direct(inode) :</div><div class='add'>+			    ceph_start_io_read(inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(fi-&gt;flags &amp; CEPH_F_SYNC) &amp;&amp; !direct_lock)</div><div class='ctx'> 		want |= CEPH_CAP_FILE_CACHE;</div><div class='hunk'>@@ -2126,14 +2183,16 @@ again:</div><div class='ctx'> 		int statret;</div><div class='ctx'> 		struct page *page = NULL;</div><div class='ctx'> 		loff_t i_size;</div><div class='add'>+		int mask = CEPH_STAT_CAP_SIZE;</div><div class='ctx'> 		if (retry_op == READ_INLINE) {</div><div class='ctx'> 			page = __page_cache_alloc(GFP_KERNEL);</div><div class='ctx'> 			if (!page)</div><div class='ctx'> 				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			mask = CEPH_STAT_CAP_INLINE_DATA;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		statret = __ceph_do_getattr(inode, page,</div><div class='del'>-					    CEPH_STAT_CAP_INLINE_DATA, !!page);</div><div class='add'>+		statret = __ceph_do_getattr(inode, page, mask, !!page);</div><div class='ctx'> 		if (statret &lt; 0) {</div><div class='ctx'> 			if (page)</div><div class='ctx'> 				__free_page(page);</div><div class='hunk'>@@ -2174,7 +2233,7 @@ again:</div><div class='ctx'> 		/* hit EOF or hole? */</div><div class='ctx'> 		if (retry_op == CHECK_EOF &amp;&amp; iocb-&gt;ki_pos &lt; i_size &amp;&amp;</div><div class='ctx'> 		    ret &lt; len) {</div><div class='del'>-			doutc(cl, "hit hole, ppos %lld &lt; size %lld, reading more\n",</div><div class='add'>+			doutc(cl, "may hit hole, ppos %lld &lt; size %lld, reading more\n",</div><div class='ctx'> 			      iocb-&gt;ki_pos, i_size);</div><div class='ctx'> </div><div class='ctx'> 			read += ret;</div><div class='hunk'>@@ -2216,7 +2275,9 @@ static ssize_t ceph_splice_read(struct file *in, loff_t *ppos,</div><div class='ctx'> 	    (fi-&gt;flags &amp; CEPH_F_SYNC))</div><div class='ctx'> 		return copy_splice_read(in, ppos, pipe, len, flags);</div><div class='ctx'> </div><div class='del'>-	ceph_start_io_read(inode);</div><div class='add'>+	ret = ceph_start_io_read(inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	want = CEPH_CAP_FILE_CACHE;</div><div class='ctx'> 	if (fi-&gt;fmode &amp; CEPH_FILE_MODE_LAZY)</div><div class='hunk'>@@ -2295,10 +2356,10 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		direct_lock = true;</div><div class='ctx'> </div><div class='ctx'> retry_snap:</div><div class='del'>-	if (direct_lock)</div><div class='del'>-		ceph_start_io_direct(inode);</div><div class='del'>-	else</div><div class='del'>-		ceph_start_io_write(inode);</div><div class='add'>+	err = direct_lock ? ceph_start_io_direct(inode) :</div><div class='add'>+			    ceph_start_io_write(inode);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlocked;</div><div class='ctx'> </div><div class='ctx'> 	if (iocb-&gt;ki_flags &amp; IOCB_APPEND) {</div><div class='ctx'> 		err = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE, false);</div><div class='hunk'>@@ -2464,19 +2525,19 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	return generic_file_llseek(file, offset, whence);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ceph_zero_partial_page(</div><div class='del'>-	struct inode *inode, loff_t offset, unsigned size)</div><div class='add'>+static inline void ceph_zero_partial_page(struct inode *inode,</div><div class='add'>+		loff_t offset, size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='del'>-	page = find_lock_page(inode-&gt;i_mapping, index);</div><div class='del'>-	if (page) {</div><div class='del'>-		wait_on_page_writeback(page);</div><div class='del'>-		zero_user(page, offset &amp; (PAGE_SIZE - 1), size);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='add'>+	folio = filemap_lock_folio(inode-&gt;i_mapping, offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='add'>+	folio_zero_range(folio, offset_in_folio(folio, offset), size);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset,</div><div class='hunk'>@@ -2550,7 +2611,7 @@ static int ceph_zero_objects(struct inode *inode, loff_t offset, loff_t length)</div><div class='ctx'> 	s32 stripe_unit = ci-&gt;i_layout.stripe_unit;</div><div class='ctx'> 	s32 stripe_count = ci-&gt;i_layout.stripe_count;</div><div class='ctx'> 	s32 object_size = ci-&gt;i_layout.object_size;</div><div class='del'>-	u64 object_set_size = object_size * stripe_count;</div><div class='add'>+	u64 object_set_size = (u64) object_size * stripe_count;</div><div class='ctx'> 	u64 nearly, t;</div><div class='ctx'> </div><div class='ctx'> 	/* round offset up to next period boundary */</div><div class='hunk'>@@ -2817,7 +2878,7 @@ static ssize_t ceph_do_objects_copy(struct ceph_inode_info *src_ci, u64 *src_off</div><div class='ctx'> 	struct ceph_object_id src_oid, dst_oid;</div><div class='ctx'> 	struct ceph_osd_client *osdc;</div><div class='ctx'> 	struct ceph_osd_request *req;</div><div class='del'>-	size_t bytes = 0;</div><div class='add'>+	ssize_t bytes = 0;</div><div class='ctx'> 	u64 src_objnum, src_objoff, dst_objnum, dst_objoff;</div><div class='ctx'> 	u32 src_objlen, dst_objlen;</div><div class='ctx'> 	u32 object_size = src_ci-&gt;i_layout.object_size;</div><div class='hunk'>@@ -2867,7 +2928,7 @@ static ssize_t ceph_do_objects_copy(struct ceph_inode_info *src_ci, u64 *src_off</div><div class='ctx'> 					"OSDs don't support copy-from2; disabling copy offload\n");</div><div class='ctx'> 			}</div><div class='ctx'> 			doutc(cl, "returned %d\n", ret);</div><div class='del'>-			if (!bytes)</div><div class='add'>+			if (bytes &lt;= 0)</div><div class='ctx'> 				bytes = ret;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3105,7 +3166,7 @@ const struct file_operations ceph_file_fops = {</div><div class='ctx'> 	.llseek = ceph_llseek,</div><div class='ctx'> 	.read_iter = ceph_read_iter,</div><div class='ctx'> 	.write_iter = ceph_write_iter,</div><div class='del'>-	.mmap = ceph_mmap,</div><div class='add'>+	.mmap_prepare = ceph_mmap_prepare,</div><div class='ctx'> 	.fsync = ceph_fsync,</div><div class='ctx'> 	.lock = ceph_lock,</div><div class='ctx'> 	.setlease = simple_nosetlease,</div><div class='head'>diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c<br/>index 0c25d326afc4..2966f88310e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/inode.c</a></div><div class='hunk'>@@ -55,6 +55,52 @@ static int ceph_set_ino_cb(struct inode *inode, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check if the parent inode matches the vino from directory reply info</div><div class='add'>+ */</div><div class='add'>+static inline bool ceph_vino_matches_parent(struct inode *parent,</div><div class='add'>+					    struct ceph_vino vino)</div><div class='add'>+{</div><div class='add'>+	return ceph_ino(parent) == vino.ino &amp;&amp; ceph_snap(parent) == vino.snap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Validate that the directory inode referenced by @req-&gt;r_parent matches the</div><div class='add'>+ * inode number and snapshot id contained in the reply's directory record.  If</div><div class='add'>+ * they do not match – which can theoretically happen if the parent dentry was</div><div class='add'>+ * moved between the time the request was issued and the reply arrived – fall</div><div class='add'>+ * back to looking up the correct inode in the inode cache.</div><div class='add'>+ *</div><div class='add'>+ * A reference is *always* returned.  Callers that receive a different inode</div><div class='add'>+ * than the original @parent are responsible for dropping the extra reference</div><div class='add'>+ * once the reply has been processed.</div><div class='add'>+ */</div><div class='add'>+static struct inode *ceph_get_reply_dir(struct super_block *sb,</div><div class='add'>+					struct inode *parent,</div><div class='add'>+					struct ceph_mds_reply_info_parsed *rinfo)</div><div class='add'>+{</div><div class='add'>+	struct ceph_vino vino;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!rinfo-&gt;diri.in))</div><div class='add'>+		return parent; /* nothing to compare against */</div><div class='add'>+</div><div class='add'>+	/* If we didn't have a cached parent inode to begin with, just bail out. */</div><div class='add'>+	if (!parent)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	vino.ino  = le64_to_cpu(rinfo-&gt;diri.in-&gt;ino);</div><div class='add'>+	vino.snap = le64_to_cpu(rinfo-&gt;diri.in-&gt;snapid);</div><div class='add'>+</div><div class='add'>+	if (likely(ceph_vino_matches_parent(parent, vino)))</div><div class='add'>+		return parent; /* matches – use the original reference */</div><div class='add'>+</div><div class='add'>+	/* Mismatch – this should be rare.  Emit a WARN and obtain the correct inode. */</div><div class='add'>+	WARN_ONCE(1, "ceph: reply dir mismatch (parent valid %llx.%llx reply %llx.%llx)\n",</div><div class='add'>+		  ceph_ino(parent), ceph_snap(parent), vino.ino, vino.snap);</div><div class='add'>+</div><div class='add'>+	return ceph_get_inode(sb, vino, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ceph_new_inode - allocate a new inode in advance of an expected create</div><div class='ctx'>  * @dir: parent directory for new inode</div><div class='hunk'>@@ -78,13 +124,15 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	inode-&gt;i_blkbits = CEPH_FSCRYPT_BLOCK_SHIFT;</div><div class='add'>+</div><div class='ctx'> 	if (!S_ISLNK(*mode)) {</div><div class='ctx'> 		err = ceph_pre_init_acls(dir, mode, as_ctx);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_state = 0;</div><div class='add'>+	inode_state_assign_raw(inode, 0);</div><div class='ctx'> 	inode-&gt;i_mode = *mode;</div><div class='ctx'> </div><div class='ctx'> 	err = ceph_security_init_secctx(dentry, *mode, as_ctx);</div><div class='hunk'>@@ -153,12 +201,12 @@ struct inode *ceph_get_inode(struct super_block *sb, struct ceph_vino vino,</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "on %llx=%llx.%llx got %p new %d\n",</div><div class='ctx'> 	      ceph_present_inode(inode), ceph_vinop(inode), inode,</div><div class='del'>-	      !!(inode-&gt;i_state &amp; I_NEW));</div><div class='add'>+	      !!(inode_state_read_once(inode) &amp; I_NEW));</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * get/constuct snapdir inode for a given directory</div><div class='add'>+ * get/construct snapdir inode for a given directory</div><div class='ctx'>  */</div><div class='ctx'> struct inode *ceph_get_snapdir(struct inode *parent)</div><div class='ctx'> {</div><div class='hunk'>@@ -180,7 +228,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW) &amp;&amp; !S_ISDIR(inode-&gt;i_mode)) {</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW) &amp;&amp; !S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 		pr_warn_once_client(cl, "bad snapdir inode type (mode=0%o)\n",</div><div class='ctx'> 				    inode-&gt;i_mode);</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -213,7 +261,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;ceph_snapdir_iops;</div><div class='ctx'> 		inode-&gt;i_fop = &amp;ceph_snapdir_fops;</div><div class='ctx'> 		ci-&gt;i_snap_caps = CEPH_CAP_PIN; /* so we can open */</div><div class='hunk'>@@ -222,7 +270,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> err:</div><div class='del'>-	if ((inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if ((inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		discard_new_inode(inode);</div><div class='ctx'> 	else</div><div class='ctx'> 		iput(inode);</div><div class='hunk'>@@ -663,6 +711,7 @@ struct inode *ceph_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	ci-&gt;i_work_mask = 0;</div><div class='ctx'> 	memset(&amp;ci-&gt;i_btime, '\0', sizeof(ci-&gt;i_btime));</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	ci-&gt;i_crypt_info = NULL;</div><div class='ctx'> 	ci-&gt;fscrypt_auth = NULL;</div><div class='ctx'> 	ci-&gt;fscrypt_auth_len = 0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -693,8 +742,9 @@ void ceph_evict_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	percpu_counter_dec(&amp;mdsc-&gt;metric.total_inodes);</div><div class='ctx'> </div><div class='add'>+	netfs_wait_for_outstanding_io(inode);</div><div class='ctx'> 	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='del'>-	if (inode-&gt;i_state &amp; I_PINNING_NETFS_WB)</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_PINNING_NETFS_WB)</div><div class='ctx'> 		ceph_fscache_unuse_cookie(inode, true);</div><div class='ctx'> 	clear_inode(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -829,7 +879,9 @@ void ceph_fill_file_time(struct inode *inode, int issued,</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = ceph_inode_to_client(inode);</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='add'>+	struct timespec64 iatime = inode_get_atime(inode);</div><div class='ctx'> 	struct timespec64 ictime = inode_get_ctime(inode);</div><div class='add'>+	struct timespec64 imtime = inode_get_mtime(inode);</div><div class='ctx'> 	int warn = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (issued &amp; (CEPH_CAP_FILE_EXCL|</div><div class='hunk'>@@ -839,39 +891,26 @@ void ceph_fill_file_time(struct inode *inode, int issued,</div><div class='ctx'> 		      CEPH_CAP_XATTR_EXCL)) {</div><div class='ctx'> 		if (ci-&gt;i_version == 0 ||</div><div class='ctx'> 		    timespec64_compare(ctime, &amp;ictime) &gt; 0) {</div><div class='del'>-			doutc(cl, "ctime %lld.%09ld -&gt; %lld.%09ld inc w/ cap\n",</div><div class='del'>-			     ictime.tv_sec, ictime.tv_nsec,</div><div class='del'>-			     ctime-&gt;tv_sec, ctime-&gt;tv_nsec);</div><div class='add'>+			doutc(cl, "ctime %ptSp -&gt; %ptSp inc w/ cap\n", &amp;ictime, ctime);</div><div class='ctx'> 			inode_set_ctime_to_ts(inode, *ctime);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ci-&gt;i_version == 0 ||</div><div class='ctx'> 		    ceph_seq_cmp(time_warp_seq, ci-&gt;i_time_warp_seq) &gt; 0) {</div><div class='ctx'> 			/* the MDS did a utimes() */</div><div class='del'>-			doutc(cl, "mtime %lld.%09ld -&gt; %lld.%09ld tw %d -&gt; %d\n",</div><div class='del'>-			     inode_get_mtime_sec(inode),</div><div class='del'>-			     inode_get_mtime_nsec(inode),</div><div class='del'>-			     mtime-&gt;tv_sec, mtime-&gt;tv_nsec,</div><div class='del'>-			     ci-&gt;i_time_warp_seq, (int)time_warp_seq);</div><div class='add'>+			doutc(cl, "mtime %ptSp -&gt; %ptSp tw %d -&gt; %d\n", &amp;imtime, mtime,</div><div class='add'>+			      ci-&gt;i_time_warp_seq, (int)time_warp_seq);</div><div class='ctx'> </div><div class='ctx'> 			inode_set_mtime_to_ts(inode, *mtime);</div><div class='ctx'> 			inode_set_atime_to_ts(inode, *atime);</div><div class='ctx'> 			ci-&gt;i_time_warp_seq = time_warp_seq;</div><div class='ctx'> 		} else if (time_warp_seq == ci-&gt;i_time_warp_seq) {</div><div class='del'>-			struct timespec64	ts;</div><div class='del'>-</div><div class='ctx'> 			/* nobody did utimes(); take the max */</div><div class='del'>-			ts = inode_get_mtime(inode);</div><div class='del'>-			if (timespec64_compare(mtime, &amp;ts) &gt; 0) {</div><div class='del'>-				doutc(cl, "mtime %lld.%09ld -&gt; %lld.%09ld inc\n",</div><div class='del'>-				     ts.tv_sec, ts.tv_nsec,</div><div class='del'>-				     mtime-&gt;tv_sec, mtime-&gt;tv_nsec);</div><div class='add'>+			if (timespec64_compare(mtime, &amp;imtime) &gt; 0) {</div><div class='add'>+				doutc(cl, "mtime %ptSp -&gt; %ptSp inc\n", &amp;imtime, mtime);</div><div class='ctx'> 				inode_set_mtime_to_ts(inode, *mtime);</div><div class='ctx'> 			}</div><div class='del'>-			ts = inode_get_atime(inode);</div><div class='del'>-			if (timespec64_compare(atime, &amp;ts) &gt; 0) {</div><div class='del'>-				doutc(cl, "atime %lld.%09ld -&gt; %lld.%09ld inc\n",</div><div class='del'>-				     ts.tv_sec, ts.tv_nsec,</div><div class='del'>-				     atime-&gt;tv_sec, atime-&gt;tv_nsec);</div><div class='add'>+			if (timespec64_compare(atime, &amp;iatime) &gt; 0) {</div><div class='add'>+				doutc(cl, "atime %ptSp -&gt; %ptSp inc\n", &amp;iatime, atime);</div><div class='ctx'> 				inode_set_atime_to_ts(inode, *atime);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (issued &amp; CEPH_CAP_FILE_EXCL) {</div><div class='hunk'>@@ -908,7 +947,7 @@ static int decode_encrypted_symlink(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	if (!sym)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	declen = ceph_base64_decode(encsym, enclen, sym);</div><div class='add'>+	declen = base64_decode(encsym, enclen, sym, false, BASE64_IMAP);</div><div class='ctx'> 	if (declen &lt; 0) {</div><div class='ctx'> 		pr_err_client(cl,</div><div class='ctx'> 			"can't decode symlink (%d). Content: %.*s\n",</div><div class='hunk'>@@ -963,7 +1002,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,</div><div class='ctx'> 	      le64_to_cpu(info-&gt;version), ci-&gt;i_version);</div><div class='ctx'> </div><div class='ctx'> 	/* Once I_NEW is cleared, we can't change type or dev numbers */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		inode-&gt;i_mode = mode;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (inode_wrong_type(inode, mode)) {</div><div class='hunk'>@@ -1040,7 +1079,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='ctx'> 	if (iinfo-&gt;fscrypt_auth_len &amp;&amp;</div><div class='del'>-	    ((inode-&gt;i_state &amp; I_NEW) || (ci-&gt;fscrypt_auth_len == 0))) {</div><div class='add'>+	    ((inode_state_read_once(inode) &amp; I_NEW) || (ci-&gt;fscrypt_auth_len == 0))) {</div><div class='ctx'> 		kfree(ci-&gt;fscrypt_auth);</div><div class='ctx'> 		ci-&gt;fscrypt_auth_len = iinfo-&gt;fscrypt_auth_len;</div><div class='ctx'> 		ci-&gt;fscrypt_auth = iinfo-&gt;fscrypt_auth;</div><div class='hunk'>@@ -1520,6 +1559,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)</div><div class='ctx'> 	struct ceph_vino tvino, dvino;</div><div class='ctx'> 	struct ceph_fs_client *fsc = ceph_sb_to_fs_client(sb);</div><div class='ctx'> 	struct ceph_client *cl = fsc-&gt;client;</div><div class='add'>+	struct inode *parent_dir = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "%p is_dentry %d is_target %d\n", req,</div><div class='hunk'>@@ -1533,10 +1573,17 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rinfo-&gt;head-&gt;is_dentry) {</div><div class='del'>-		struct inode *dir = req-&gt;r_parent;</div><div class='del'>-</div><div class='del'>-		if (dir) {</div><div class='del'>-			err = ceph_fill_inode(dir, NULL, &amp;rinfo-&gt;diri,</div><div class='add'>+		/*</div><div class='add'>+		 * r_parent may be stale, in cases when R_PARENT_LOCKED is not set,</div><div class='add'>+		 * so we need to get the correct inode</div><div class='add'>+		 */</div><div class='add'>+		parent_dir = ceph_get_reply_dir(sb, req-&gt;r_parent, rinfo);</div><div class='add'>+		if (unlikely(IS_ERR(parent_dir))) {</div><div class='add'>+			err = PTR_ERR(parent_dir);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		if (parent_dir) {</div><div class='add'>+			err = ceph_fill_inode(parent_dir, NULL, &amp;rinfo-&gt;diri,</div><div class='ctx'> 					      rinfo-&gt;dirfrag, session, -1,</div><div class='ctx'> 					      &amp;req-&gt;r_caps_reservation);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='hunk'>@@ -1545,14 +1592,14 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (dir &amp;&amp; req-&gt;r_op == CEPH_MDS_OP_LOOKUPNAME &amp;&amp;</div><div class='add'>+		if (parent_dir &amp;&amp; req-&gt;r_op == CEPH_MDS_OP_LOOKUPNAME &amp;&amp;</div><div class='ctx'> 		    test_bit(CEPH_MDS_R_PARENT_LOCKED, &amp;req-&gt;r_req_flags) &amp;&amp;</div><div class='ctx'> 		    !test_bit(CEPH_MDS_R_ABORTED, &amp;req-&gt;r_req_flags)) {</div><div class='ctx'> 			bool is_nokey = false;</div><div class='ctx'> 			struct qstr dname;</div><div class='ctx'> 			struct dentry *dn, *parent;</div><div class='ctx'> 			struct fscrypt_str oname = FSTR_INIT(NULL, 0);</div><div class='del'>-			struct ceph_fname fname = { .dir	= dir,</div><div class='add'>+			struct ceph_fname fname = { .dir	= parent_dir,</div><div class='ctx'> 						    .name	= rinfo-&gt;dname,</div><div class='ctx'> 						    .ctext	= rinfo-&gt;altname,</div><div class='ctx'> 						    .name_len	= rinfo-&gt;dname_len,</div><div class='hunk'>@@ -1561,10 +1608,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)</div><div class='ctx'> 			BUG_ON(!rinfo-&gt;head-&gt;is_target);</div><div class='ctx'> 			BUG_ON(req-&gt;r_dentry);</div><div class='ctx'> </div><div class='del'>-			parent = d_find_any_alias(dir);</div><div class='add'>+			parent = d_find_any_alias(parent_dir);</div><div class='ctx'> 			BUG_ON(!parent);</div><div class='ctx'> </div><div class='del'>-			err = ceph_fname_alloc_buffer(dir, &amp;oname);</div><div class='add'>+			err = ceph_fname_alloc_buffer(parent_dir, &amp;oname);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				dput(parent);</div><div class='ctx'> 				goto done;</div><div class='hunk'>@@ -1573,7 +1620,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)</div><div class='ctx'> 			err = ceph_fname_to_usr(&amp;fname, NULL, &amp;oname, &amp;is_nokey);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				dput(parent);</div><div class='del'>-				ceph_fname_free_buffer(dir, &amp;oname);</div><div class='add'>+				ceph_fname_free_buffer(parent_dir, &amp;oname);</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> 			dname.name = oname.name;</div><div class='hunk'>@@ -1592,7 +1639,7 @@ retry_lookup:</div><div class='ctx'> 				      dname.len, dname.name, dn);</div><div class='ctx'> 				if (!dn) {</div><div class='ctx'> 					dput(parent);</div><div class='del'>-					ceph_fname_free_buffer(dir, &amp;oname);</div><div class='add'>+					ceph_fname_free_buffer(parent_dir, &amp;oname);</div><div class='ctx'> 					err = -ENOMEM;</div><div class='ctx'> 					goto done;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1607,12 +1654,12 @@ retry_lookup:</div><div class='ctx'> 				    ceph_snap(d_inode(dn)) != tvino.snap)) {</div><div class='ctx'> 				doutc(cl, " dn %p points to wrong inode %p\n",</div><div class='ctx'> 				      dn, d_inode(dn));</div><div class='del'>-				ceph_dir_clear_ordered(dir);</div><div class='add'>+				ceph_dir_clear_ordered(parent_dir);</div><div class='ctx'> 				d_delete(dn);</div><div class='ctx'> 				dput(dn);</div><div class='ctx'> 				goto retry_lookup;</div><div class='ctx'> 			}</div><div class='del'>-			ceph_fname_free_buffer(dir, &amp;oname);</div><div class='add'>+			ceph_fname_free_buffer(parent_dir, &amp;oname);</div><div class='ctx'> </div><div class='ctx'> 			req-&gt;r_dentry = dn;</div><div class='ctx'> 			dput(parent);</div><div class='hunk'>@@ -1634,13 +1681,13 @@ retry_lookup:</div><div class='ctx'> 			pr_err_client(cl, "badness %p %llx.%llx\n", in,</div><div class='ctx'> 				      ceph_vinop(in));</div><div class='ctx'> 			req-&gt;r_target_inode = NULL;</div><div class='del'>-			if (in-&gt;i_state &amp; I_NEW)</div><div class='add'>+			if (inode_state_read_once(in) &amp; I_NEW)</div><div class='ctx'> 				discard_new_inode(in);</div><div class='ctx'> 			else</div><div class='ctx'> 				iput(in);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		if (in-&gt;i_state &amp; I_NEW)</div><div class='add'>+		if (inode_state_read_once(in) &amp; I_NEW)</div><div class='ctx'> 			unlock_new_inode(in);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1736,6 +1783,11 @@ retry_lookup:</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (unlikely(!in)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* attach proper inode */</div><div class='ctx'> 		if (d_really_is_negative(dn)) {</div><div class='ctx'> 			ceph_dir_clear_ordered(dir);</div><div class='hunk'>@@ -1771,12 +1823,18 @@ retry_lookup:</div><div class='ctx'> 		doutc(cl, " linking snapped dir %p to dn %p\n", in,</div><div class='ctx'> 		      req-&gt;r_dentry);</div><div class='ctx'> 		ceph_dir_clear_ordered(dir);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!in)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ihold(in);</div><div class='ctx'> 		err = splice_dentry(&amp;req-&gt;r_dentry, in);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='ctx'> 	} else if (rinfo-&gt;head-&gt;is_dentry &amp;&amp; req-&gt;r_dentry) {</div><div class='del'>-		/* parent inode is not locked, be carefull */</div><div class='add'>+		/* parent inode is not locked, be careful */</div><div class='ctx'> 		struct ceph_vino *ptvino = NULL;</div><div class='ctx'> 		dvino.ino = le64_to_cpu(rinfo-&gt;diri.in-&gt;ino);</div><div class='ctx'> 		dvino.snap = le64_to_cpu(rinfo-&gt;diri.in-&gt;snapid);</div><div class='hunk'>@@ -1791,6 +1849,9 @@ retry_lookup:</div><div class='ctx'> 					    &amp;dvino, ptvino);</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='add'>+	/* Drop extra ref from ceph_get_reply_dir() if it returned a new inode */</div><div class='add'>+	if (unlikely(!IS_ERR_OR_NULL(parent_dir) &amp;&amp; parent_dir != req-&gt;r_parent))</div><div class='add'>+		iput(parent_dir);</div><div class='ctx'> 	doutc(cl, "done err=%d\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1826,11 +1887,11 @@ static int readdir_prepopulate_inodes_only(struct ceph_mds_request *req,</div><div class='ctx'> 			pr_err_client(cl, "inode badness on %p got %d\n", in,</div><div class='ctx'> 				      rc);</div><div class='ctx'> 			err = rc;</div><div class='del'>-			if (in-&gt;i_state &amp; I_NEW) {</div><div class='add'>+			if (inode_state_read_once(in) &amp; I_NEW) {</div><div class='ctx'> 				ihold(in);</div><div class='ctx'> 				discard_new_inode(in);</div><div class='ctx'> 			}</div><div class='del'>-		} else if (in-&gt;i_state &amp; I_NEW) {</div><div class='add'>+		} else if (inode_state_read_once(in) &amp; I_NEW) {</div><div class='ctx'> 			unlock_new_inode(in);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1842,10 +1903,9 @@ static int readdir_prepopulate_inodes_only(struct ceph_mds_request *req,</div><div class='ctx'> </div><div class='ctx'> void ceph_readdir_cache_release(struct ceph_readdir_cache_control *ctl)</div><div class='ctx'> {</div><div class='del'>-	if (ctl-&gt;page) {</div><div class='del'>-		kunmap(ctl-&gt;page);</div><div class='del'>-		put_page(ctl-&gt;page);</div><div class='del'>-		ctl-&gt;page = NULL;</div><div class='add'>+	if (ctl-&gt;folio) {</div><div class='add'>+		folio_release_kmap(ctl-&gt;folio, ctl-&gt;dentries);</div><div class='add'>+		ctl-&gt;folio = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1859,20 +1919,26 @@ static int fill_readdir_cache(struct inode *dir, struct dentry *dn,</div><div class='ctx'> 	unsigned idx = ctl-&gt;index % nsize;</div><div class='ctx'> 	pgoff_t pgoff = ctl-&gt;index / nsize;</div><div class='ctx'> </div><div class='del'>-	if (!ctl-&gt;page || pgoff != page_index(ctl-&gt;page)) {</div><div class='add'>+	if (!ctl-&gt;folio || pgoff != ctl-&gt;folio-&gt;index) {</div><div class='ctx'> 		ceph_readdir_cache_release(ctl);</div><div class='add'>+		fgf_t fgf = FGP_LOCK;</div><div class='add'>+</div><div class='ctx'> 		if (idx == 0)</div><div class='del'>-			ctl-&gt;page = grab_cache_page(&amp;dir-&gt;i_data, pgoff);</div><div class='del'>-		else</div><div class='del'>-			ctl-&gt;page = find_lock_page(&amp;dir-&gt;i_data, pgoff);</div><div class='del'>-		if (!ctl-&gt;page) {</div><div class='add'>+			fgf |= FGP_ACCESSED | FGP_CREAT;</div><div class='add'>+</div><div class='add'>+		ctl-&gt;folio = __filemap_get_folio(&amp;dir-&gt;i_data, pgoff,</div><div class='add'>+				fgf, mapping_gfp_mask(&amp;dir-&gt;i_data));</div><div class='add'>+		if (IS_ERR(ctl-&gt;folio)) {</div><div class='add'>+			int err = PTR_ERR(ctl-&gt;folio);</div><div class='add'>+</div><div class='add'>+			ctl-&gt;folio = NULL;</div><div class='ctx'> 			ctl-&gt;index = -1;</div><div class='del'>-			return idx == 0 ? -ENOMEM : 0;</div><div class='add'>+			return idx == 0 ? err : 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* reading/filling the cache are serialized by</div><div class='del'>-		 * i_rwsem, no need to use page lock */</div><div class='del'>-		unlock_page(ctl-&gt;page);</div><div class='del'>-		ctl-&gt;dentries = kmap(ctl-&gt;page);</div><div class='add'>+		 * i_rwsem, no need to use folio lock */</div><div class='add'>+		folio_unlock(ctl-&gt;folio);</div><div class='add'>+		ctl-&gt;dentries = kmap_local_folio(ctl-&gt;folio, 0);</div><div class='ctx'> 		if (idx == 0)</div><div class='ctx'> 			memset(ctl-&gt;dentries, 0, PAGE_SIZE);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2037,7 +2103,7 @@ retry_lookup:</div><div class='ctx'> 			pr_err_client(cl, "badness on %p %llx.%llx\n", in,</div><div class='ctx'> 				      ceph_vinop(in));</div><div class='ctx'> 			if (d_really_is_negative(dn)) {</div><div class='del'>-				if (in-&gt;i_state &amp; I_NEW) {</div><div class='add'>+				if (inode_state_read_once(in) &amp; I_NEW) {</div><div class='ctx'> 					ihold(in);</div><div class='ctx'> 					discard_new_inode(in);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2047,7 +2113,7 @@ retry_lookup:</div><div class='ctx'> 			err = ret;</div><div class='ctx'> 			goto next_item;</div><div class='ctx'> 		}</div><div class='del'>-		if (in-&gt;i_state &amp; I_NEW)</div><div class='add'>+		if (inode_state_read_once(in) &amp; I_NEW)</div><div class='ctx'> 			unlock_new_inode(in);</div><div class='ctx'> </div><div class='ctx'> 		if (d_really_is_negative(dn)) {</div><div class='hunk'>@@ -2359,7 +2425,7 @@ static int fill_fscrypt_truncate(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	/* Try to writeback the dirty pagecaches */</div><div class='ctx'> 	if (issued &amp; (CEPH_CAP_FILE_BUFFER)) {</div><div class='del'>-		loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;</div><div class='add'>+		loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SIZE - 1;</div><div class='ctx'> </div><div class='ctx'> 		ret = filemap_write_and_wait_range(inode-&gt;i_mapping,</div><div class='ctx'> 						   orig_pos, lend);</div><div class='hunk'>@@ -2428,8 +2494,7 @@ static int fill_fscrypt_truncate(struct inode *inode,</div><div class='ctx'> 		/* encrypt the last block */</div><div class='ctx'> 		ret = ceph_fscrypt_encrypt_block_inplace(inode, page,</div><div class='ctx'> 						    CEPH_FSCRYPT_BLOCK_SIZE,</div><div class='del'>-						    0, block,</div><div class='del'>-						    GFP_KERNEL);</div><div class='add'>+						    0, block);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2478,6 +2543,33 @@ int __ceph_setattr(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> 	bool lock_snap_rwsem = false;</div><div class='ctx'> 	bool fill_fscrypt;</div><div class='ctx'> 	int truncate_retry = 20; /* The RMW will take around 50ms */</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	char *path;</div><div class='add'>+	bool do_sync = false;</div><div class='add'>+</div><div class='add'>+	dentry = d_find_alias(inode);</div><div class='add'>+	if (!dentry) {</div><div class='add'>+		do_sync = true;</div><div class='add'>+	} else {</div><div class='add'>+		struct ceph_path_info path_info;</div><div class='add'>+		path = ceph_mdsc_build_path(mdsc, dentry, &amp;path_info, 0);</div><div class='add'>+		if (IS_ERR(path)) {</div><div class='add'>+			do_sync = true;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			err = ceph_mds_check_access(mdsc, path, MAY_WRITE);</div><div class='add'>+		}</div><div class='add'>+		ceph_mdsc_free_path_info(&amp;path_info);</div><div class='add'>+		dput(dentry);</div><div class='add'>+</div><div class='add'>+		/* For none EACCES cases will let the MDS do the mds auth check */</div><div class='add'>+		if (err == -EACCES) {</div><div class='add'>+			return err;</div><div class='add'>+		} else if (err &lt; 0) {</div><div class='add'>+			do_sync = true;</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	prealloc_cf = ceph_alloc_cap_flush();</div><div class='hunk'>@@ -2524,7 +2616,7 @@ retry:</div><div class='ctx'> 		/* It should never be re-set once set */</div><div class='ctx'> 		WARN_ON_ONCE(ci-&gt;fscrypt_auth);</div><div class='ctx'> </div><div class='del'>-		if (issued &amp; CEPH_CAP_AUTH_EXCL) {</div><div class='add'>+		if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_AUTH_EXCL)) {</div><div class='ctx'> 			dirtied |= CEPH_CAP_AUTH_EXCL;</div><div class='ctx'> 			kfree(ci-&gt;fscrypt_auth);</div><div class='ctx'> 			ci-&gt;fscrypt_auth = (u8 *)cia-&gt;fscrypt_auth;</div><div class='hunk'>@@ -2553,7 +2645,7 @@ retry:</div><div class='ctx'> 		      ceph_vinop(inode),</div><div class='ctx'> 		      from_kuid(&amp;init_user_ns, inode-&gt;i_uid),</div><div class='ctx'> 		      from_kuid(&amp;init_user_ns, attr-&gt;ia_uid));</div><div class='del'>-		if (issued &amp; CEPH_CAP_AUTH_EXCL) {</div><div class='add'>+		if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_AUTH_EXCL)) {</div><div class='ctx'> 			inode-&gt;i_uid = fsuid;</div><div class='ctx'> 			dirtied |= CEPH_CAP_AUTH_EXCL;</div><div class='ctx'> 		} else if ((issued &amp; CEPH_CAP_AUTH_SHARED) == 0 ||</div><div class='hunk'>@@ -2571,7 +2663,7 @@ retry:</div><div class='ctx'> 		      ceph_vinop(inode),</div><div class='ctx'> 		      from_kgid(&amp;init_user_ns, inode-&gt;i_gid),</div><div class='ctx'> 		      from_kgid(&amp;init_user_ns, attr-&gt;ia_gid));</div><div class='del'>-		if (issued &amp; CEPH_CAP_AUTH_EXCL) {</div><div class='add'>+		if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_AUTH_EXCL)) {</div><div class='ctx'> 			inode-&gt;i_gid = fsgid;</div><div class='ctx'> 			dirtied |= CEPH_CAP_AUTH_EXCL;</div><div class='ctx'> 		} else if ((issued &amp; CEPH_CAP_AUTH_SHARED) == 0 ||</div><div class='hunk'>@@ -2585,7 +2677,7 @@ retry:</div><div class='ctx'> 	if (ia_valid &amp; ATTR_MODE) {</div><div class='ctx'> 		doutc(cl, "%p %llx.%llx mode 0%o -&gt; 0%o\n", inode,</div><div class='ctx'> 		      ceph_vinop(inode), inode-&gt;i_mode, attr-&gt;ia_mode);</div><div class='del'>-		if (issued &amp; CEPH_CAP_AUTH_EXCL) {</div><div class='add'>+		if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_AUTH_EXCL)) {</div><div class='ctx'> 			inode-&gt;i_mode = attr-&gt;ia_mode;</div><div class='ctx'> 			dirtied |= CEPH_CAP_AUTH_EXCL;</div><div class='ctx'> 		} else if ((issued &amp; CEPH_CAP_AUTH_SHARED) == 0 ||</div><div class='hunk'>@@ -2600,15 +2692,13 @@ retry:</div><div class='ctx'> 	if (ia_valid &amp; ATTR_ATIME) {</div><div class='ctx'> 		struct timespec64 atime = inode_get_atime(inode);</div><div class='ctx'> </div><div class='del'>-		doutc(cl, "%p %llx.%llx atime %lld.%09ld -&gt; %lld.%09ld\n",</div><div class='del'>-		      inode, ceph_vinop(inode),</div><div class='del'>-		      atime.tv_sec, atime.tv_nsec,</div><div class='del'>-		      attr-&gt;ia_atime.tv_sec, attr-&gt;ia_atime.tv_nsec);</div><div class='del'>-		if (issued &amp; CEPH_CAP_FILE_EXCL) {</div><div class='add'>+		doutc(cl, "%p %llx.%llx atime %ptSp -&gt; %ptSp\n",</div><div class='add'>+		      inode, ceph_vinop(inode), &amp;atime, &amp;attr-&gt;ia_atime);</div><div class='add'>+		if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_FILE_EXCL)) {</div><div class='ctx'> 			ci-&gt;i_time_warp_seq++;</div><div class='ctx'> 			inode_set_atime_to_ts(inode, attr-&gt;ia_atime);</div><div class='ctx'> 			dirtied |= CEPH_CAP_FILE_EXCL;</div><div class='del'>-		} else if ((issued &amp; CEPH_CAP_FILE_WR) &amp;&amp;</div><div class='add'>+		} else if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_FILE_WR) &amp;&amp;</div><div class='ctx'> 			   timespec64_compare(&amp;atime,</div><div class='ctx'> 					      &amp;attr-&gt;ia_atime) &lt; 0) {</div><div class='ctx'> 			inode_set_atime_to_ts(inode, attr-&gt;ia_atime);</div><div class='hunk'>@@ -2644,7 +2734,7 @@ retry:</div><div class='ctx'> 						     CEPH_FSCRYPT_BLOCK_SIZE));</div><div class='ctx'> 			req-&gt;r_fscrypt_file = attr-&gt;ia_size;</div><div class='ctx'> 			fill_fscrypt = true;</div><div class='del'>-		} else if ((issued &amp; CEPH_CAP_FILE_EXCL) &amp;&amp; attr-&gt;ia_size &gt;= isize) {</div><div class='add'>+		} else if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_FILE_EXCL) &amp;&amp; attr-&gt;ia_size &gt;= isize) {</div><div class='ctx'> 			if (attr-&gt;ia_size &gt; isize) {</div><div class='ctx'> 				i_size_write(inode, attr-&gt;ia_size);</div><div class='ctx'> 				inode-&gt;i_blocks = calc_inode_blocks(attr-&gt;ia_size);</div><div class='hunk'>@@ -2677,15 +2767,13 @@ retry:</div><div class='ctx'> 	if (ia_valid &amp; ATTR_MTIME) {</div><div class='ctx'> 		struct timespec64 mtime = inode_get_mtime(inode);</div><div class='ctx'> </div><div class='del'>-		doutc(cl, "%p %llx.%llx mtime %lld.%09ld -&gt; %lld.%09ld\n",</div><div class='del'>-		      inode, ceph_vinop(inode),</div><div class='del'>-		      mtime.tv_sec, mtime.tv_nsec,</div><div class='del'>-		      attr-&gt;ia_mtime.tv_sec, attr-&gt;ia_mtime.tv_nsec);</div><div class='del'>-		if (issued &amp; CEPH_CAP_FILE_EXCL) {</div><div class='add'>+		doutc(cl, "%p %llx.%llx mtime %ptSp -&gt; %ptSp\n",</div><div class='add'>+		      inode, ceph_vinop(inode), &amp;mtime, &amp;attr-&gt;ia_mtime);</div><div class='add'>+		if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_FILE_EXCL)) {</div><div class='ctx'> 			ci-&gt;i_time_warp_seq++;</div><div class='ctx'> 			inode_set_mtime_to_ts(inode, attr-&gt;ia_mtime);</div><div class='ctx'> 			dirtied |= CEPH_CAP_FILE_EXCL;</div><div class='del'>-		} else if ((issued &amp; CEPH_CAP_FILE_WR) &amp;&amp;</div><div class='add'>+		} else if (!do_sync &amp;&amp; (issued &amp; CEPH_CAP_FILE_WR) &amp;&amp;</div><div class='ctx'> 			   timespec64_compare(&amp;mtime, &amp;attr-&gt;ia_mtime) &lt; 0) {</div><div class='ctx'> 			inode_set_mtime_to_ts(inode, attr-&gt;ia_mtime);</div><div class='ctx'> 			dirtied |= CEPH_CAP_FILE_WR;</div><div class='hunk'>@@ -2701,13 +2789,11 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	/* these do nothing */</div><div class='ctx'> 	if (ia_valid &amp; ATTR_CTIME) {</div><div class='add'>+		struct timespec64 ictime = inode_get_ctime(inode);</div><div class='ctx'> 		bool only = (ia_valid &amp; (ATTR_SIZE|ATTR_MTIME|ATTR_ATIME|</div><div class='ctx'> 					 ATTR_MODE|ATTR_UID|ATTR_GID)) == 0;</div><div class='del'>-		doutc(cl, "%p %llx.%llx ctime %lld.%09ld -&gt; %lld.%09ld (%s)\n",</div><div class='del'>-		      inode, ceph_vinop(inode),</div><div class='del'>-		      inode_get_ctime_sec(inode),</div><div class='del'>-		      inode_get_ctime_nsec(inode),</div><div class='del'>-		      attr-&gt;ia_ctime.tv_sec, attr-&gt;ia_ctime.tv_nsec,</div><div class='add'>+		doutc(cl, "%p %llx.%llx ctime %ptSp -&gt; %ptSp (%s)\n",</div><div class='add'>+		      inode, ceph_vinop(inode), &amp;ictime, &amp;attr-&gt;ia_ctime,</div><div class='ctx'> 		      only ? "ctime only" : "ignored");</div><div class='ctx'> 		if (only) {</div><div class='ctx'> 			/*</div><div class='head'>diff --git a/fs/ceph/io.c b/fs/ceph/io.c<br/>index c456509b31c3..2d10f49c93a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/io.c</a></div><div class='hunk'>@@ -21,14 +21,23 @@</div><div class='ctx'> /* Call with exclusively locked inode-&gt;i_rwsem */</div><div class='ctx'> static void ceph_block_o_direct(struct ceph_inode_info *ci, struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	bool is_odirect;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held_write(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> </div><div class='del'>-	if (READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT) {</div><div class='del'>-		spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-		ci-&gt;i_ceph_flags &amp;= ~CEPH_I_ODIRECT;</div><div class='del'>-		spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-		inode_dio_wait(inode);</div><div class='add'>+	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	/* ensure that bit state is consistent */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	is_odirect = READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT;</div><div class='add'>+	if (is_odirect) {</div><div class='add'>+		clear_bit(CEPH_I_ODIRECT_BIT, &amp;ci-&gt;i_ceph_flags);</div><div class='add'>+		/* ensure modified bit is visible */</div><div class='add'>+		smp_mb__after_atomic();</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+</div><div class='add'>+	if (is_odirect)</div><div class='add'>+		inode_dio_wait(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -47,20 +56,35 @@ static void ceph_block_o_direct(struct ceph_inode_info *ci, struct inode *inode)</div><div class='ctx'>  * Note that buffered writes and truncates both take a write lock on</div><div class='ctx'>  * inode-&gt;i_rwsem, meaning that those are serialised w.r.t. the reads.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='del'>-ceph_start_io_read(struct inode *inode)</div><div class='add'>+int ceph_start_io_read(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='add'>+	bool is_odirect;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Be an optimist! */</div><div class='del'>-	down_read(&amp;inode-&gt;i_rwsem);</div><div class='del'>-	if (!(READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT))</div><div class='del'>-		return;</div><div class='add'>+	err = down_read_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	/* ensure that bit state is consistent */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	is_odirect = READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT;</div><div class='add'>+	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	if (!is_odirect)</div><div class='add'>+		return 0;</div><div class='ctx'> 	up_read(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='ctx'> 	/* Slow path.... */</div><div class='del'>-	down_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	err = down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	ceph_block_o_direct(ci, inode);</div><div class='ctx'> 	downgrade_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -83,11 +107,12 @@ ceph_end_io_read(struct inode *inode)</div><div class='ctx'>  * Declare that a buffered write operation is about to start, and ensure</div><div class='ctx'>  * that we block all direct I/O.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='del'>-ceph_start_io_write(struct inode *inode)</div><div class='add'>+int ceph_start_io_write(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	down_write(&amp;inode-&gt;i_rwsem);</div><div class='del'>-	ceph_block_o_direct(ceph_inode(inode), inode);</div><div class='add'>+	int err = down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (!err)</div><div class='add'>+		ceph_block_o_direct(ceph_inode(inode), inode);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -106,12 +131,22 @@ ceph_end_io_write(struct inode *inode)</div><div class='ctx'> /* Call with exclusively locked inode-&gt;i_rwsem */</div><div class='ctx'> static void ceph_block_buffered(struct ceph_inode_info *ci, struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	bool is_odirect;</div><div class='add'>+</div><div class='ctx'> 	lockdep_assert_held_write(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> </div><div class='del'>-	if (!(READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT)) {</div><div class='del'>-		spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='del'>-		ci-&gt;i_ceph_flags |= CEPH_I_ODIRECT;</div><div class='del'>-		spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	/* ensure that bit state is consistent */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	is_odirect = READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT;</div><div class='add'>+	if (!is_odirect) {</div><div class='add'>+		set_bit(CEPH_I_ODIRECT_BIT, &amp;ci-&gt;i_ceph_flags);</div><div class='add'>+		/* ensure modified bit is visible */</div><div class='add'>+		smp_mb__after_atomic();</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+</div><div class='add'>+	if (!is_odirect) {</div><div class='ctx'> 		/* FIXME: unmap_mapping_range? */</div><div class='ctx'> 		filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -133,20 +168,35 @@ static void ceph_block_buffered(struct ceph_inode_info *ci, struct inode *inode)</div><div class='ctx'>  * Note that buffered writes and truncates both take a write lock on</div><div class='ctx'>  * inode-&gt;i_rwsem, meaning that those are serialised w.r.t. O_DIRECT.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='del'>-ceph_start_io_direct(struct inode *inode)</div><div class='add'>+int ceph_start_io_direct(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='add'>+	bool is_odirect;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Be an optimist! */</div><div class='del'>-	down_read(&amp;inode-&gt;i_rwsem);</div><div class='del'>-	if (READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT)</div><div class='del'>-		return;</div><div class='add'>+	err = down_read_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	/* ensure that bit state is consistent */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	is_odirect = READ_ONCE(ci-&gt;i_ceph_flags) &amp; CEPH_I_ODIRECT;</div><div class='add'>+	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	if (is_odirect)</div><div class='add'>+		return 0;</div><div class='ctx'> 	up_read(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='ctx'> 	/* Slow path.... */</div><div class='del'>-	down_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	err = down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	ceph_block_buffered(ci, inode);</div><div class='ctx'> 	downgrade_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/ceph/io.h b/fs/ceph/io.h<br/>index fa594cd77348..79029825e8b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/io.h</a></div><div class='hunk'>@@ -2,11 +2,13 @@</div><div class='ctx'> #ifndef _FS_CEPH_IO_H</div><div class='ctx'> #define _FS_CEPH_IO_H</div><div class='ctx'> </div><div class='del'>-void ceph_start_io_read(struct inode *inode);</div><div class='add'>+#include &lt;linux/compiler_attributes.h&gt;</div><div class='add'>+</div><div class='add'>+int __must_check ceph_start_io_read(struct inode *inode);</div><div class='ctx'> void ceph_end_io_read(struct inode *inode);</div><div class='del'>-void ceph_start_io_write(struct inode *inode);</div><div class='add'>+int __must_check ceph_start_io_write(struct inode *inode);</div><div class='ctx'> void ceph_end_io_write(struct inode *inode);</div><div class='del'>-void ceph_start_io_direct(struct inode *inode);</div><div class='add'>+int __must_check ceph_start_io_direct(struct inode *inode);</div><div class='ctx'> void ceph_end_io_direct(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> #endif /* FS_CEPH_IO_H */</div><div class='head'>diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c<br/>index e861de3c79b9..15cde055f3da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/ioctl.c</a></div><div class='hunk'>@@ -246,21 +246,28 @@ static long ceph_ioctl_lazyio(struct file *file)</div><div class='ctx'> 	struct ceph_inode_info *ci = ceph_inode(inode);</div><div class='ctx'> 	struct ceph_mds_client *mdsc = ceph_inode_to_fs_client(inode)-&gt;mdsc;</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='add'>+	bool is_file_already_lazy = false;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='ctx'> 	if ((fi-&gt;fmode &amp; CEPH_FILE_MODE_LAZY) == 0) {</div><div class='del'>-		spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='ctx'> 		fi-&gt;fmode |= CEPH_FILE_MODE_LAZY;</div><div class='ctx'> 		ci-&gt;i_nr_by_mode[ffs(CEPH_FILE_MODE_LAZY)]++;</div><div class='ctx'> 		__ceph_touch_fmode(ci, mdsc, fi-&gt;fmode);</div><div class='del'>-		spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+	} else {</div><div class='add'>+		is_file_already_lazy = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='add'>+</div><div class='add'>+	if (is_file_already_lazy) {</div><div class='add'>+		doutc(cl, "file %p %p %llx.%llx already lazy\n", file, inode,</div><div class='add'>+		      ceph_vinop(inode));</div><div class='add'>+	} else {</div><div class='ctx'> 		doutc(cl, "file %p %p %llx.%llx marked lazy\n", file, inode,</div><div class='ctx'> 		      ceph_vinop(inode));</div><div class='ctx'> </div><div class='ctx'> 		ceph_check_caps(ci, 0);</div><div class='del'>-	} else {</div><div class='del'>-		doutc(cl, "file %p %p %llx.%llx already lazy\n", file, inode,</div><div class='del'>-		      ceph_vinop(inode));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c<br/>index e07ad29ff8b9..dd764f9c64b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/locks.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/locks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/locks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/locks.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@ void __init ceph_flock_init(void)</div><div class='ctx'> </div><div class='ctx'> static void ceph_fl_copy_lock(struct file_lock *dst, struct file_lock *src)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = file_inode(dst-&gt;fl_file);</div><div class='add'>+	struct inode *inode = file_inode(dst-&gt;c.flc_file);</div><div class='ctx'> 	atomic_inc(&amp;ceph_inode(inode)-&gt;i_filelock_ref);</div><div class='ctx'> 	dst-&gt;fl_u.ceph.inode = igrab(inode);</div><div class='ctx'> }</div><div class='hunk'>@@ -110,17 +110,18 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,</div><div class='ctx'> 	else</div><div class='ctx'> 		length = fl-&gt;fl_end - fl-&gt;fl_start + 1;</div><div class='ctx'> </div><div class='del'>-	owner = secure_addr(fl-&gt;fl_owner);</div><div class='add'>+	owner = secure_addr(fl-&gt;c.flc_owner);</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "rule: %d, op: %d, owner: %llx, pid: %llu, "</div><div class='ctx'> 		    "start: %llu, length: %llu, wait: %d, type: %d\n",</div><div class='del'>-		    (int)lock_type, (int)operation, owner, (u64)fl-&gt;fl_pid,</div><div class='del'>-		    fl-&gt;fl_start, length, wait, fl-&gt;fl_type);</div><div class='add'>+		    (int)lock_type, (int)operation, owner,</div><div class='add'>+		    (u64) fl-&gt;c.flc_pid,</div><div class='add'>+		    fl-&gt;fl_start, length, wait, fl-&gt;c.flc_type);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;r_args.filelock_change.rule = lock_type;</div><div class='ctx'> 	req-&gt;r_args.filelock_change.type = cmd;</div><div class='ctx'> 	req-&gt;r_args.filelock_change.owner = cpu_to_le64(owner);</div><div class='del'>-	req-&gt;r_args.filelock_change.pid = cpu_to_le64((u64)fl-&gt;fl_pid);</div><div class='add'>+	req-&gt;r_args.filelock_change.pid = cpu_to_le64((u64) fl-&gt;c.flc_pid);</div><div class='ctx'> 	req-&gt;r_args.filelock_change.start = cpu_to_le64(fl-&gt;fl_start);</div><div class='ctx'> 	req-&gt;r_args.filelock_change.length = cpu_to_le64(length);</div><div class='ctx'> 	req-&gt;r_args.filelock_change.wait = wait;</div><div class='hunk'>@@ -130,13 +131,13 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,</div><div class='ctx'> 		err = ceph_mdsc_wait_request(mdsc, req, wait ?</div><div class='ctx'> 					ceph_lock_wait_for_completion : NULL);</div><div class='ctx'> 	if (!err &amp;&amp; operation == CEPH_MDS_OP_GETFILELOCK) {</div><div class='del'>-		fl-&gt;fl_pid = -le64_to_cpu(req-&gt;r_reply_info.filelock_reply-&gt;pid);</div><div class='add'>+		fl-&gt;c.flc_pid = -le64_to_cpu(req-&gt;r_reply_info.filelock_reply-&gt;pid);</div><div class='ctx'> 		if (CEPH_LOCK_SHARED == req-&gt;r_reply_info.filelock_reply-&gt;type)</div><div class='del'>-			fl-&gt;fl_type = F_RDLCK;</div><div class='add'>+			fl-&gt;c.flc_type = F_RDLCK;</div><div class='ctx'> 		else if (CEPH_LOCK_EXCL == req-&gt;r_reply_info.filelock_reply-&gt;type)</div><div class='del'>-			fl-&gt;fl_type = F_WRLCK;</div><div class='add'>+			fl-&gt;c.flc_type = F_WRLCK;</div><div class='ctx'> 		else</div><div class='del'>-			fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+			fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> </div><div class='ctx'> 		fl-&gt;fl_start = le64_to_cpu(req-&gt;r_reply_info.filelock_reply-&gt;start);</div><div class='ctx'> 		length = le64_to_cpu(req-&gt;r_reply_info.filelock_reply-&gt;start) +</div><div class='hunk'>@@ -150,8 +151,8 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,</div><div class='ctx'> 	ceph_mdsc_put_request(req);</div><div class='ctx'> 	doutc(cl, "rule: %d, op: %d, pid: %llu, start: %llu, "</div><div class='ctx'> 	      "length: %llu, wait: %d, type: %d, err code %d\n",</div><div class='del'>-	      (int)lock_type, (int)operation, (u64)fl-&gt;fl_pid,</div><div class='del'>-	      fl-&gt;fl_start, length, wait, fl-&gt;fl_type, err);</div><div class='add'>+	      (int)lock_type, (int)operation, (u64) fl-&gt;c.flc_pid,</div><div class='add'>+	      fl-&gt;fl_start, length, wait, fl-&gt;c.flc_type, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,17 +221,20 @@ static int ceph_lock_wait_for_completion(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	if (err &amp;&amp; err != -ERESTARTSYS)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	wait_for_completion_killable(&amp;req-&gt;r_safe_completion);</div><div class='add'>+	err = wait_for_completion_killable(&amp;req-&gt;r_safe_completion);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int try_unlock_file(struct file *file, struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned int orig_flags = fl-&gt;fl_flags;</div><div class='del'>-	fl-&gt;fl_flags |= FL_EXISTS;</div><div class='add'>+	unsigned int orig_flags = fl-&gt;c.flc_flags;</div><div class='add'>+	fl-&gt;c.flc_flags |= FL_EXISTS;</div><div class='ctx'> 	err = locks_lock_file_wait(file, fl);</div><div class='del'>-	fl-&gt;fl_flags = orig_flags;</div><div class='add'>+	fl-&gt;c.flc_flags = orig_flags;</div><div class='ctx'> 	if (err == -ENOENT) {</div><div class='ctx'> 		if (!(orig_flags &amp; FL_EXISTS))</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -253,13 +257,13 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	u8 wait = 0;</div><div class='ctx'> 	u8 lock_cmd;</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_POSIX))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_POSIX))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode))</div><div class='ctx'> 		return -ESTALE;</div><div class='ctx'> </div><div class='del'>-	doutc(cl, "fl_owner: %p\n", fl-&gt;fl_owner);</div><div class='add'>+	doutc(cl, "fl_owner: %p\n", fl-&gt;c.flc_owner);</div><div class='ctx'> </div><div class='ctx'> 	/* set wait bit as appropriate, then make command as Ceph expects it*/</div><div class='ctx'> 	if (IS_GETLK(cmd))</div><div class='hunk'>@@ -273,19 +277,19 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		if (op == CEPH_MDS_OP_SETFILELOCK &amp;&amp; F_UNLCK == fl-&gt;fl_type)</div><div class='add'>+		if (op == CEPH_MDS_OP_SETFILELOCK &amp;&amp; lock_is_unlock(fl))</div><div class='ctx'> 			posix_lock_file(file, fl, NULL);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (F_RDLCK == fl-&gt;fl_type)</div><div class='add'>+	if (lock_is_read(fl))</div><div class='ctx'> 		lock_cmd = CEPH_LOCK_SHARED;</div><div class='del'>-	else if (F_WRLCK == fl-&gt;fl_type)</div><div class='add'>+	else if (lock_is_write(fl))</div><div class='ctx'> 		lock_cmd = CEPH_LOCK_EXCL;</div><div class='ctx'> 	else</div><div class='ctx'> 		lock_cmd = CEPH_LOCK_UNLOCK;</div><div class='ctx'> </div><div class='del'>-	if (op == CEPH_MDS_OP_SETFILELOCK &amp;&amp; F_UNLCK == fl-&gt;fl_type) {</div><div class='add'>+	if (op == CEPH_MDS_OP_SETFILELOCK &amp;&amp; lock_is_unlock(fl)) {</div><div class='ctx'> 		err = try_unlock_file(file, fl);</div><div class='ctx'> 		if (err &lt;= 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -293,7 +297,7 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	err = ceph_lock_message(CEPH_LOCK_FCNTL, op, inode, lock_cmd, wait, fl);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		if (op == CEPH_MDS_OP_SETFILELOCK &amp;&amp; F_UNLCK != fl-&gt;fl_type) {</div><div class='add'>+		if (op == CEPH_MDS_OP_SETFILELOCK &amp;&amp; F_UNLCK != fl-&gt;c.flc_type) {</div><div class='ctx'> 			doutc(cl, "locking locally\n");</div><div class='ctx'> 			err = posix_lock_file(file, fl, NULL);</div><div class='ctx'> 			if (err) {</div><div class='hunk'>@@ -319,13 +323,13 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	u8 wait = 0;</div><div class='ctx'> 	u8 lock_cmd;</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_FLOCK))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_FLOCK))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_inode_is_shutdown(inode))</div><div class='ctx'> 		return -ESTALE;</div><div class='ctx'> </div><div class='del'>-	doutc(cl, "fl_file: %p\n", fl-&gt;fl_file);</div><div class='add'>+	doutc(cl, "fl_file: %p\n", fl-&gt;c.flc_file);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='ctx'> 	if (ci-&gt;i_ceph_flags &amp; CEPH_I_ERROR_FILELOCK) {</div><div class='hunk'>@@ -333,7 +337,7 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ci-&gt;i_ceph_lock);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		if (F_UNLCK == fl-&gt;fl_type)</div><div class='add'>+		if (lock_is_unlock(fl))</div><div class='ctx'> 			locks_lock_file_wait(file, fl);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,14 +345,14 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	if (IS_SETLKW(cmd))</div><div class='ctx'> 		wait = 1;</div><div class='ctx'> </div><div class='del'>-	if (F_RDLCK == fl-&gt;fl_type)</div><div class='add'>+	if (lock_is_read(fl))</div><div class='ctx'> 		lock_cmd = CEPH_LOCK_SHARED;</div><div class='del'>-	else if (F_WRLCK == fl-&gt;fl_type)</div><div class='add'>+	else if (lock_is_write(fl))</div><div class='ctx'> 		lock_cmd = CEPH_LOCK_EXCL;</div><div class='ctx'> 	else</div><div class='ctx'> 		lock_cmd = CEPH_LOCK_UNLOCK;</div><div class='ctx'> </div><div class='del'>-	if (F_UNLCK == fl-&gt;fl_type) {</div><div class='add'>+	if (lock_is_unlock(fl)) {</div><div class='ctx'> 		err = try_unlock_file(file, fl);</div><div class='ctx'> 		if (err &lt;= 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -356,7 +360,7 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	err = ceph_lock_message(CEPH_LOCK_FLOCK, CEPH_MDS_OP_SETFILELOCK,</div><div class='ctx'> 				inode, lock_cmd, wait, fl);</div><div class='del'>-	if (!err &amp;&amp; F_UNLCK != fl-&gt;fl_type) {</div><div class='add'>+	if (!err &amp;&amp; F_UNLCK != fl-&gt;c.flc_type) {</div><div class='ctx'> 		err = locks_lock_file_wait(file, fl);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			ceph_lock_message(CEPH_LOCK_FLOCK,</div><div class='hunk'>@@ -385,9 +389,9 @@ void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count)</div><div class='ctx'> 	ctx = locks_inode_context(inode);</div><div class='ctx'> 	if (ctx) {</div><div class='ctx'> 		spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-		list_for_each_entry(lock, &amp;ctx-&gt;flc_posix, fl_list)</div><div class='add'>+		for_each_file_lock(lock, &amp;ctx-&gt;flc_posix)</div><div class='ctx'> 			++(*fcntl_count);</div><div class='del'>-		list_for_each_entry(lock, &amp;ctx-&gt;flc_flock, fl_list)</div><div class='add'>+		for_each_file_lock(lock, &amp;ctx-&gt;flc_flock)</div><div class='ctx'> 			++(*flock_count);</div><div class='ctx'> 		spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -408,10 +412,10 @@ static int lock_to_ceph_filelock(struct inode *inode,</div><div class='ctx'> 	cephlock-&gt;start = cpu_to_le64(lock-&gt;fl_start);</div><div class='ctx'> 	cephlock-&gt;length = cpu_to_le64(lock-&gt;fl_end - lock-&gt;fl_start + 1);</div><div class='ctx'> 	cephlock-&gt;client = cpu_to_le64(0);</div><div class='del'>-	cephlock-&gt;pid = cpu_to_le64((u64)lock-&gt;fl_pid);</div><div class='del'>-	cephlock-&gt;owner = cpu_to_le64(secure_addr(lock-&gt;fl_owner));</div><div class='add'>+	cephlock-&gt;pid = cpu_to_le64((u64) lock-&gt;c.flc_pid);</div><div class='add'>+	cephlock-&gt;owner = cpu_to_le64(secure_addr(lock-&gt;c.flc_owner));</div><div class='ctx'> </div><div class='del'>-	switch (lock-&gt;fl_type) {</div><div class='add'>+	switch (lock-&gt;c.flc_type) {</div><div class='ctx'> 	case F_RDLCK:</div><div class='ctx'> 		cephlock-&gt;type = CEPH_LOCK_SHARED;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -422,7 +426,8 @@ static int lock_to_ceph_filelock(struct inode *inode,</div><div class='ctx'> 		cephlock-&gt;type = CEPH_LOCK_UNLOCK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		doutc(cl, "Have unknown lock type %d\n", lock-&gt;fl_type);</div><div class='add'>+		doutc(cl, "Have unknown lock type %d\n",</div><div class='add'>+		      lock-&gt;c.flc_type);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +458,7 @@ int ceph_encode_locks_to_buffer(struct inode *inode,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry(lock, &amp;ctx-&gt;flc_posix, fl_list) {</div><div class='add'>+	for_each_file_lock(lock, &amp;ctx-&gt;flc_posix) {</div><div class='ctx'> 		++seen_fcntl;</div><div class='ctx'> 		if (seen_fcntl &gt; num_fcntl_locks) {</div><div class='ctx'> 			err = -ENOSPC;</div><div class='hunk'>@@ -464,7 +469,7 @@ int ceph_encode_locks_to_buffer(struct inode *inode,</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		++l;</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_entry(lock, &amp;ctx-&gt;flc_flock, fl_list) {</div><div class='add'>+	for_each_file_lock(lock, &amp;ctx-&gt;flc_flock) {</div><div class='ctx'> 		++seen_flock;</div><div class='ctx'> 		if (seen_flock &gt; num_flock_locks) {</div><div class='ctx'> 			err = -ENOSPC;</div><div class='head'>diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c<br/>index 548d1de379f3..1740047aef0f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/mds_client.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mds_client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/mds_client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/mds_client.c</a></div><div class='hunk'>@@ -827,7 +827,7 @@ static void destroy_reply_info(struct ceph_mds_reply_info_parsed *info)</div><div class='ctx'>  * And the worst case is that for the none async openc request it will</div><div class='ctx'>  * successfully open the file if the CDentry hasn't been unlinked yet,</div><div class='ctx'>  * but later the previous delayed async unlink request will remove the</div><div class='del'>- * CDenty. That means the just created file is possiblly deleted later</div><div class='add'>+ * CDentry. That means the just created file is possibly deleted later</div><div class='ctx'>  * by accident.</div><div class='ctx'>  *</div><div class='ctx'>  * We need to wait for the inflight async unlink requests to finish</div><div class='hunk'>@@ -979,14 +979,15 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	if (mds &gt;= mdsc-&gt;max_sessions) {</div><div class='ctx'> 		int newmax = 1 &lt;&lt; get_count_order(mds + 1);</div><div class='ctx'> 		struct ceph_mds_session **sa;</div><div class='add'>+		size_t ptr_size = sizeof(struct ceph_mds_session *);</div><div class='ctx'> </div><div class='ctx'> 		doutc(cl, "realloc to %d\n", newmax);</div><div class='del'>-		sa = kcalloc(newmax, sizeof(void *), GFP_NOFS);</div><div class='add'>+		sa = kcalloc(newmax, ptr_size, GFP_NOFS);</div><div class='ctx'> 		if (!sa)</div><div class='ctx'> 			goto fail_realloc;</div><div class='ctx'> 		if (mdsc-&gt;sessions) {</div><div class='ctx'> 			memcpy(sa, mdsc-&gt;sessions,</div><div class='del'>-			       mdsc-&gt;max_sessions * sizeof(void *));</div><div class='add'>+			       mdsc-&gt;max_sessions * ptr_size);</div><div class='ctx'> 			kfree(mdsc-&gt;sessions);</div><div class='ctx'> 		}</div><div class='ctx'> 		mdsc-&gt;sessions = sa;</div><div class='hunk'>@@ -1089,7 +1090,7 @@ void ceph_mdsc_release_request(struct kref *kref)</div><div class='ctx'> 	struct ceph_mds_request *req = container_of(kref,</div><div class='ctx'> 						    struct ceph_mds_request,</div><div class='ctx'> 						    r_kref);</div><div class='del'>-	ceph_mdsc_release_dir_caps_no_check(req);</div><div class='add'>+	ceph_mdsc_release_dir_caps_async(req);</div><div class='ctx'> 	destroy_reply_info(&amp;req-&gt;r_reply_info);</div><div class='ctx'> 	if (req-&gt;r_request)</div><div class='ctx'> 		ceph_msg_put(req-&gt;r_request);</div><div class='hunk'>@@ -1747,14 +1748,6 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,</div><div class='del'>-					   struct ceph_mds_session *session)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;mdsc-&gt;mutex);</div><div class='del'>-	__open_export_target_sessions(mdsc, session);</div><div class='del'>-	mutex_unlock(&amp;mdsc-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * session caps</div><div class='ctx'>  */</div><div class='hunk'>@@ -2229,7 +2222,7 @@ static int trim_caps_cb(struct inode *inode, int mds, void *arg)</div><div class='ctx'> 			int count;</div><div class='ctx'> 			dput(dentry);</div><div class='ctx'> 			d_prune_aliases(inode);</div><div class='del'>-			count = atomic_read(&amp;inode-&gt;i_count);</div><div class='add'>+			count = icount_read(inode);</div><div class='ctx'> 			if (count == 1)</div><div class='ctx'> 				(*remaining)--;</div><div class='ctx'> 			doutc(cl, "%p %llx.%llx cap %p pruned, count now %d\n",</div><div class='hunk'>@@ -2266,7 +2259,7 @@ int ceph_trim_caps(struct ceph_mds_client *mdsc,</div><div class='ctx'> 		      trim_caps - remaining);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ceph_flush_cap_releases(mdsc, session);</div><div class='add'>+	ceph_flush_session_cap_releases(mdsc, session);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2362,7 +2355,7 @@ again:</div><div class='ctx'> 		item-&gt;ino = cpu_to_le64(cap-&gt;cap_ino);</div><div class='ctx'> 		item-&gt;cap_id = cpu_to_le64(cap-&gt;cap_id);</div><div class='ctx'> 		item-&gt;migrate_seq = cpu_to_le32(cap-&gt;mseq);</div><div class='del'>-		item-&gt;seq = cpu_to_le32(cap-&gt;issue_seq);</div><div class='add'>+		item-&gt;issue_seq = cpu_to_le32(cap-&gt;issue_seq);</div><div class='ctx'> 		msg-&gt;front.iov_len += sizeof(*item);</div><div class='ctx'> </div><div class='ctx'> 		ceph_put_cap(mdsc, cap);</div><div class='hunk'>@@ -2420,7 +2413,7 @@ static void ceph_cap_release_work(struct work_struct *work)</div><div class='ctx'> 	ceph_put_mds_session(session);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,</div><div class='add'>+void ceph_flush_session_cap_releases(struct ceph_mds_client *mdsc,</div><div class='ctx'> 		             struct ceph_mds_session *session)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='hunk'>@@ -2447,7 +2440,7 @@ void __ceph_queue_cap_release(struct ceph_mds_session *session,</div><div class='ctx'> 	session-&gt;s_num_cap_releases++;</div><div class='ctx'> </div><div class='ctx'> 	if (!(session-&gt;s_num_cap_releases % CEPH_CAPS_PER_RELEASE))</div><div class='del'>-		ceph_flush_cap_releases(session-&gt;s_mdsc, session);</div><div class='add'>+		ceph_flush_session_cap_releases(session-&gt;s_mdsc, session);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ceph_cap_reclaim_work(struct work_struct *work)</div><div class='hunk'>@@ -2484,6 +2477,50 @@ void ceph_reclaim_caps_nr(struct ceph_mds_client *mdsc, int nr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ceph_queue_cap_unlink_work(struct ceph_mds_client *mdsc)</div><div class='add'>+{</div><div class='add'>+	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='add'>+	if (mdsc-&gt;stopping)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+        if (queue_work(mdsc-&gt;fsc-&gt;cap_wq, &amp;mdsc-&gt;cap_unlink_work)) {</div><div class='add'>+                doutc(cl, "caps unlink work queued\n");</div><div class='add'>+        } else {</div><div class='add'>+                doutc(cl, "failed to queue caps unlink work\n");</div><div class='add'>+        }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ceph_cap_unlink_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ceph_mds_client *mdsc =</div><div class='add'>+		container_of(work, struct ceph_mds_client, cap_unlink_work);</div><div class='add'>+	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='add'>+</div><div class='add'>+	doutc(cl, "begin\n");</div><div class='add'>+	spin_lock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+	while (!list_empty(&amp;mdsc-&gt;cap_unlink_delay_list)) {</div><div class='add'>+		struct ceph_inode_info *ci;</div><div class='add'>+		struct inode *inode;</div><div class='add'>+</div><div class='add'>+		ci = list_first_entry(&amp;mdsc-&gt;cap_unlink_delay_list,</div><div class='add'>+				      struct ceph_inode_info,</div><div class='add'>+				      i_cap_delay_list);</div><div class='add'>+		list_del_init(&amp;ci-&gt;i_cap_delay_list);</div><div class='add'>+</div><div class='add'>+		inode = igrab(&amp;ci-&gt;netfs.inode);</div><div class='add'>+		if (inode) {</div><div class='add'>+			spin_unlock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+			doutc(cl, "on %p %llx.%llx\n", inode,</div><div class='add'>+			      ceph_vinop(inode));</div><div class='add'>+			ceph_check_caps(ci, CHECK_CAPS_FLUSH);</div><div class='add'>+			iput(inode);</div><div class='add'>+			spin_lock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+	doutc(cl, "done\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * requests</div><div class='ctx'>  */</div><div class='hunk'>@@ -2496,6 +2533,7 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,</div><div class='ctx'> 	struct ceph_mount_options *opt = req-&gt;r_mdsc-&gt;fsc-&gt;mount_options;</div><div class='ctx'> 	size_t size = sizeof(struct ceph_mds_reply_dir_entry);</div><div class='ctx'> 	unsigned int num_entries;</div><div class='add'>+	u64 bytes_count;</div><div class='ctx'> 	int order;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='hunk'>@@ -2504,7 +2542,11 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,</div><div class='ctx'> 	num_entries = max(num_entries, 1U);</div><div class='ctx'> 	num_entries = min(num_entries, opt-&gt;max_readdir);</div><div class='ctx'> </div><div class='del'>-	order = get_order(size * num_entries);</div><div class='add'>+	bytes_count = (u64)size * num_entries;</div><div class='add'>+	if (unlikely(bytes_count &gt; ULONG_MAX))</div><div class='add'>+		bytes_count = ULONG_MAX;</div><div class='add'>+</div><div class='add'>+	order = get_order((unsigned long)bytes_count);</div><div class='ctx'> 	while (order &gt;= 0) {</div><div class='ctx'> 		rinfo-&gt;dir_entries = (void*)__get_free_pages(GFP_KERNEL |</div><div class='ctx'> 							     __GFP_NOWARN |</div><div class='hunk'>@@ -2514,7 +2556,7 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,</div><div class='ctx'> 			break;</div><div class='ctx'> 		order--;</div><div class='ctx'> 	}</div><div class='del'>-	if (!rinfo-&gt;dir_entries)</div><div class='add'>+	if (!rinfo-&gt;dir_entries || unlikely(order &lt; 0))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	num_entries = (PAGE_SIZE &lt;&lt; order) / size;</div><div class='hunk'>@@ -2585,6 +2627,7 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *dir = req-&gt;r_parent;</div><div class='ctx'> 	struct dentry *dentry = req-&gt;r_dentry;</div><div class='add'>+	const struct qstr *name = req-&gt;r_dname;</div><div class='ctx'> 	u8 *cryptbuf = NULL;</div><div class='ctx'> 	u32 len = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -2605,8 +2648,10 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen)</div><div class='ctx'> 	if (!fscrypt_has_encryption_key(dir))</div><div class='ctx'> 		goto success;</div><div class='ctx'> </div><div class='del'>-	if (!fscrypt_fname_encrypted_size(dir, dentry-&gt;d_name.len, NAME_MAX,</div><div class='del'>-					  &amp;len)) {</div><div class='add'>+	if (!name)</div><div class='add'>+		name = &amp;dentry-&gt;d_name;</div><div class='add'>+</div><div class='add'>+	if (!fscrypt_fname_encrypted_size(dir, name-&gt;len, NAME_MAX, &amp;len)) {</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2621,7 +2666,7 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen)</div><div class='ctx'> 	if (!cryptbuf)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	ret = fscrypt_fname_encrypt(dir, &amp;dentry-&gt;d_name, cryptbuf, len);</div><div class='add'>+	ret = fscrypt_fname_encrypt(dir, name, cryptbuf, len);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(cryptbuf);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='hunk'>@@ -2642,8 +2687,7 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen)</div><div class='ctx'>  * ceph_mdsc_build_path - build a path string to a given dentry</div><div class='ctx'>  * @mdsc: mds client</div><div class='ctx'>  * @dentry: dentry to which path should be built</div><div class='del'>- * @plen: returned length of string</div><div class='del'>- * @pbase: returned base inode number</div><div class='add'>+ * @path_info: output path, length, base ino+snap, and freepath ownership flag</div><div class='ctx'>  * @for_wire: is this path going to be sent to the MDS?</div><div class='ctx'>  *</div><div class='ctx'>  * Build a string that represents the path to the dentry. This is mostly called</div><div class='hunk'>@@ -2661,7 +2705,7 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen)</div><div class='ctx'>  *   foo/.snap/bar -&gt; foo//bar</div><div class='ctx'>  */</div><div class='ctx'> char *ceph_mdsc_build_path(struct ceph_mds_client *mdsc, struct dentry *dentry,</div><div class='del'>-			   int *plen, u64 *pbase, int for_wire)</div><div class='add'>+			   struct ceph_path_info *path_info, int for_wire)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='ctx'> 	struct dentry *cur;</div><div class='hunk'>@@ -2727,8 +2771,8 @@ retry:</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (fscrypt_has_encryption_key(d_inode(parent))) {</div><div class='del'>-				len = ceph_encode_encrypted_fname(d_inode(parent),</div><div class='del'>-								  cur, buf);</div><div class='add'>+				len = ceph_encode_encrypted_dname(d_inode(parent),</div><div class='add'>+								  buf, len);</div><div class='ctx'> 				if (len &lt; 0) {</div><div class='ctx'> 					dput(parent);</div><div class='ctx'> 					dput(cur);</div><div class='hunk'>@@ -2764,24 +2808,35 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	if (pos &lt; 0) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * A rename didn't occur, but somehow we didn't end up where</div><div class='del'>-		 * we thought we would. Throw a warning and try again.</div><div class='add'>+		 * The path is longer than PATH_MAX and this function</div><div class='add'>+		 * cannot ever succeed.  Creating paths that long is</div><div class='add'>+		 * possible with Ceph, but Linux cannot use them.</div><div class='ctx'> 		 */</div><div class='del'>-		pr_warn_client(cl, "did not end path lookup where expected (pos = %d)\n",</div><div class='del'>-			       pos);</div><div class='del'>-		goto retry;</div><div class='add'>+		return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pbase = base;</div><div class='del'>-	*plen = PATH_MAX - 1 - pos;</div><div class='add'>+	/* Initialize the output structure */</div><div class='add'>+	memset(path_info, 0, sizeof(*path_info));</div><div class='add'>+</div><div class='add'>+	path_info-&gt;vino.ino = base;</div><div class='add'>+	path_info-&gt;pathlen = PATH_MAX - 1 - pos;</div><div class='add'>+	path_info-&gt;path = path + pos;</div><div class='add'>+	path_info-&gt;freepath = true;</div><div class='add'>+</div><div class='add'>+	/* Set snap from dentry if available */</div><div class='add'>+	if (d_inode(dentry))</div><div class='add'>+		path_info-&gt;vino.snap = ceph_snap(d_inode(dentry));</div><div class='add'>+	else</div><div class='add'>+		path_info-&gt;vino.snap = CEPH_NOSNAP;</div><div class='add'>+</div><div class='ctx'> 	doutc(cl, "on %p %d built %llx '%.*s'\n", dentry, d_count(dentry),</div><div class='del'>-	      base, *plen, path + pos);</div><div class='add'>+	      base, PATH_MAX - 1 - pos, path + pos);</div><div class='ctx'> 	return path + pos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int build_dentry_path(struct ceph_mds_client *mdsc, struct dentry *dentry,</div><div class='del'>-			     struct inode *dir, const char **ppath, int *ppathlen,</div><div class='del'>-			     u64 *pino, bool *pfreepath, bool parent_locked)</div><div class='add'>+			     struct inode *dir, struct ceph_path_info *path_info,</div><div class='add'>+			     bool parent_locked)</div><div class='ctx'> {</div><div class='ctx'> 	char *path;</div><div class='ctx'> </div><div class='hunk'>@@ -2790,41 +2845,47 @@ static int build_dentry_path(struct ceph_mds_client *mdsc, struct dentry *dentry</div><div class='ctx'> 		dir = d_inode_rcu(dentry-&gt;d_parent);</div><div class='ctx'> 	if (dir &amp;&amp; parent_locked &amp;&amp; ceph_snap(dir) == CEPH_NOSNAP &amp;&amp;</div><div class='ctx'> 	    !IS_ENCRYPTED(dir)) {</div><div class='del'>-		*pino = ceph_ino(dir);</div><div class='add'>+		path_info-&gt;vino.ino = ceph_ino(dir);</div><div class='add'>+		path_info-&gt;vino.snap = ceph_snap(dir);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		*ppath = dentry-&gt;d_name.name;</div><div class='del'>-		*ppathlen = dentry-&gt;d_name.len;</div><div class='add'>+		path_info-&gt;path = dentry-&gt;d_name.name;</div><div class='add'>+		path_info-&gt;pathlen = dentry-&gt;d_name.len;</div><div class='add'>+		path_info-&gt;freepath = false;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	path = ceph_mdsc_build_path(mdsc, dentry, ppathlen, pino, 1);</div><div class='add'>+	path = ceph_mdsc_build_path(mdsc, dentry, path_info, 1);</div><div class='ctx'> 	if (IS_ERR(path))</div><div class='ctx'> 		return PTR_ERR(path);</div><div class='del'>-	*ppath = path;</div><div class='del'>-	*pfreepath = true;</div><div class='add'>+	/*</div><div class='add'>+	 * ceph_mdsc_build_path already fills path_info, including snap handling.</div><div class='add'>+	 */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int build_inode_path(struct inode *inode,</div><div class='del'>-			    const char **ppath, int *ppathlen, u64 *pino,</div><div class='del'>-			    bool *pfreepath)</div><div class='add'>+static int build_inode_path(struct inode *inode, struct ceph_path_info *path_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(inode-&gt;i_sb);</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	char *path;</div><div class='ctx'> </div><div class='ctx'> 	if (ceph_snap(inode) == CEPH_NOSNAP) {</div><div class='del'>-		*pino = ceph_ino(inode);</div><div class='del'>-		*ppathlen = 0;</div><div class='add'>+		path_info-&gt;vino.ino = ceph_ino(inode);</div><div class='add'>+		path_info-&gt;vino.snap = ceph_snap(inode);</div><div class='add'>+		path_info-&gt;pathlen = 0;</div><div class='add'>+		path_info-&gt;freepath = false;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	dentry = d_find_alias(inode);</div><div class='del'>-	path = ceph_mdsc_build_path(mdsc, dentry, ppathlen, pino, 1);</div><div class='add'>+	path = ceph_mdsc_build_path(mdsc, dentry, path_info, 1);</div><div class='ctx'> 	dput(dentry);</div><div class='ctx'> 	if (IS_ERR(path))</div><div class='ctx'> 		return PTR_ERR(path);</div><div class='del'>-	*ppath = path;</div><div class='del'>-	*pfreepath = true;</div><div class='add'>+	/*</div><div class='add'>+	 * ceph_mdsc_build_path already fills path_info, including snap from dentry.</div><div class='add'>+	 * Override with inode's snap since that's what this function is for.</div><div class='add'>+	 */</div><div class='add'>+	path_info-&gt;vino.snap = ceph_snap(inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2834,26 +2895,32 @@ static int build_inode_path(struct inode *inode,</div><div class='ctx'>  */</div><div class='ctx'> static int set_request_path_attr(struct ceph_mds_client *mdsc, struct inode *rinode,</div><div class='ctx'> 				 struct dentry *rdentry, struct inode *rdiri,</div><div class='del'>-				 const char *rpath, u64 rino, const char **ppath,</div><div class='del'>-				 int *pathlen, u64 *ino, bool *freepath,</div><div class='add'>+				 const char *rpath, u64 rino,</div><div class='add'>+				 struct ceph_path_info *path_info,</div><div class='ctx'> 				 bool parent_locked)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='add'>+	/* Initialize the output structure */</div><div class='add'>+	memset(path_info, 0, sizeof(*path_info));</div><div class='add'>+</div><div class='ctx'> 	if (rinode) {</div><div class='del'>-		r = build_inode_path(rinode, ppath, pathlen, ino, freepath);</div><div class='add'>+		r = build_inode_path(rinode, path_info);</div><div class='ctx'> 		doutc(cl, " inode %p %llx.%llx\n", rinode, ceph_ino(rinode),</div><div class='ctx'> 		      ceph_snap(rinode));</div><div class='ctx'> 	} else if (rdentry) {</div><div class='del'>-		r = build_dentry_path(mdsc, rdentry, rdiri, ppath, pathlen, ino,</div><div class='del'>-					freepath, parent_locked);</div><div class='del'>-		doutc(cl, " dentry %p %llx/%.*s\n", rdentry, *ino, *pathlen, *ppath);</div><div class='add'>+		r = build_dentry_path(mdsc, rdentry, rdiri, path_info, parent_locked);</div><div class='add'>+		doutc(cl, " dentry %p %llx/%.*s\n", rdentry, path_info-&gt;vino.ino,</div><div class='add'>+		      path_info-&gt;pathlen, path_info-&gt;path);</div><div class='ctx'> 	} else if (rpath || rino) {</div><div class='del'>-		*ino = rino;</div><div class='del'>-		*ppath = rpath;</div><div class='del'>-		*pathlen = rpath ? strlen(rpath) : 0;</div><div class='del'>-		doutc(cl, " path %.*s\n", *pathlen, rpath);</div><div class='add'>+		path_info-&gt;vino.ino = rino;</div><div class='add'>+		path_info-&gt;vino.snap = CEPH_NOSNAP;</div><div class='add'>+		path_info-&gt;path = rpath;</div><div class='add'>+		path_info-&gt;pathlen = rpath ? strlen(rpath) : 0;</div><div class='add'>+		path_info-&gt;freepath = false;</div><div class='add'>+</div><div class='add'>+		doutc(cl, " path %.*s\n", path_info-&gt;pathlen, rpath);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -2910,12 +2977,12 @@ static struct ceph_mds_request_head_legacy *</div><div class='ctx'> find_legacy_request_head(void *p, u64 features)</div><div class='ctx'> {</div><div class='ctx'> 	bool legacy = !(features &amp; CEPH_FEATURE_FS_BTIME);</div><div class='del'>-	struct ceph_mds_request_head_old *ohead;</div><div class='add'>+	struct ceph_mds_request_head *head;</div><div class='ctx'> </div><div class='ctx'> 	if (legacy)</div><div class='ctx'> 		return (struct ceph_mds_request_head_legacy *)p;</div><div class='del'>-	ohead = (struct ceph_mds_request_head_old *)p;</div><div class='del'>-	return (struct ceph_mds_request_head_legacy *)&amp;ohead-&gt;oldest_client_tid;</div><div class='add'>+	head = (struct ceph_mds_request_head *)p;</div><div class='add'>+	return (struct ceph_mds_request_head_legacy *)&amp;head-&gt;oldest_client_tid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2930,11 +2997,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='ctx'> 	struct ceph_msg *msg;</div><div class='ctx'> 	struct ceph_mds_request_head_legacy *lhead;</div><div class='del'>-	const char *path1 = NULL;</div><div class='del'>-	const char *path2 = NULL;</div><div class='del'>-	u64 ino1 = 0, ino2 = 0;</div><div class='del'>-	int pathlen1 = 0, pathlen2 = 0;</div><div class='del'>-	bool freepath1 = false, freepath2 = false;</div><div class='add'>+	struct ceph_path_info path_info1 = {0};</div><div class='add'>+	struct ceph_path_info path_info2 = {0};</div><div class='ctx'> 	struct dentry *old_dentry = NULL;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	u16 releases;</div><div class='hunk'>@@ -2944,25 +3008,49 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 	u16 request_head_version = mds_supported_head_version(session);</div><div class='ctx'> 	kuid_t caller_fsuid = req-&gt;r_cred-&gt;fsuid;</div><div class='ctx'> 	kgid_t caller_fsgid = req-&gt;r_cred-&gt;fsgid;</div><div class='add'>+	bool parent_locked = test_bit(CEPH_MDS_R_PARENT_LOCKED, &amp;req-&gt;r_req_flags);</div><div class='ctx'> </div><div class='ctx'> 	ret = set_request_path_attr(mdsc, req-&gt;r_inode, req-&gt;r_dentry,</div><div class='del'>-			      req-&gt;r_parent, req-&gt;r_path1, req-&gt;r_ino1.ino,</div><div class='del'>-			      &amp;path1, &amp;pathlen1, &amp;ino1, &amp;freepath1,</div><div class='del'>-			      test_bit(CEPH_MDS_R_PARENT_LOCKED,</div><div class='del'>-					&amp;req-&gt;r_req_flags));</div><div class='add'>+				    req-&gt;r_parent, req-&gt;r_path1, req-&gt;r_ino1.ino,</div><div class='add'>+				    &amp;path_info1, parent_locked);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		msg = ERR_PTR(ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * When the parent directory's i_rwsem is *not* locked, req-&gt;r_parent may</div><div class='add'>+	 * have become stale (e.g. after a concurrent rename) between the time the</div><div class='add'>+	 * dentry was looked up and now.  If we detect that the stored r_parent</div><div class='add'>+	 * does not match the inode number we just encoded for the request, switch</div><div class='add'>+	 * to the correct inode so that the MDS receives a valid parent reference.</div><div class='add'>+	 */</div><div class='add'>+	if (!parent_locked &amp;&amp; req-&gt;r_parent &amp;&amp; path_info1.vino.ino &amp;&amp;</div><div class='add'>+	    ceph_ino(req-&gt;r_parent) != path_info1.vino.ino) {</div><div class='add'>+		struct inode *old_parent = req-&gt;r_parent;</div><div class='add'>+		struct inode *correct_dir = ceph_get_inode(mdsc-&gt;fsc-&gt;sb, path_info1.vino, NULL);</div><div class='add'>+		if (!IS_ERR(correct_dir)) {</div><div class='add'>+			WARN_ONCE(1, "ceph: r_parent mismatch (had %llx wanted %llx) - updating\n",</div><div class='add'>+			          ceph_ino(old_parent), path_info1.vino.ino);</div><div class='add'>+			/*</div><div class='add'>+			 * Transfer CEPH_CAP_PIN from the old parent to the new one.</div><div class='add'>+			 * The pin was taken earlier in ceph_mdsc_submit_request().</div><div class='add'>+			 */</div><div class='add'>+			ceph_put_cap_refs(ceph_inode(old_parent), CEPH_CAP_PIN);</div><div class='add'>+			iput(old_parent);</div><div class='add'>+			req-&gt;r_parent = correct_dir;</div><div class='add'>+			ceph_get_cap_refs(ceph_inode(req-&gt;r_parent), CEPH_CAP_PIN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If r_old_dentry is set, then assume that its parent is locked */</div><div class='ctx'> 	if (req-&gt;r_old_dentry &amp;&amp;</div><div class='ctx'> 	    !(req-&gt;r_old_dentry-&gt;d_flags &amp; DCACHE_DISCONNECTED))</div><div class='ctx'> 		old_dentry = req-&gt;r_old_dentry;</div><div class='ctx'> 	ret = set_request_path_attr(mdsc, NULL, old_dentry,</div><div class='del'>-			      req-&gt;r_old_dentry_dir,</div><div class='del'>-			      req-&gt;r_path2, req-&gt;r_ino2.ino,</div><div class='del'>-			      &amp;path2, &amp;pathlen2, &amp;ino2, &amp;freepath2, true);</div><div class='add'>+				    req-&gt;r_old_dentry_dir,</div><div class='add'>+				    req-&gt;r_path2, req-&gt;r_ino2.ino,</div><div class='add'>+				    &amp;path_info2, true);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		msg = ERR_PTR(ret);</div><div class='ctx'> 		goto out_free1;</div><div class='hunk'>@@ -2985,7 +3073,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 	if (legacy)</div><div class='ctx'> 		len = sizeof(struct ceph_mds_request_head_legacy);</div><div class='ctx'> 	else if (request_head_version == 1)</div><div class='del'>-		len = sizeof(struct ceph_mds_request_head_old);</div><div class='add'>+		len = offsetofend(struct ceph_mds_request_head, args);</div><div class='ctx'> 	else if (request_head_version == 2)</div><div class='ctx'> 		len = offsetofend(struct ceph_mds_request_head, ext_num_fwd);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2993,7 +3081,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> </div><div class='ctx'> 	/* filepaths */</div><div class='ctx'> 	len += 2 * (1 + sizeof(u32) + sizeof(u64));</div><div class='del'>-	len += pathlen1 + pathlen2;</div><div class='add'>+	len += path_info1.pathlen + path_info2.pathlen;</div><div class='ctx'> </div><div class='ctx'> 	/* cap releases */</div><div class='ctx'> 	len += sizeof(struct ceph_mds_request_release) *</div><div class='hunk'>@@ -3001,9 +3089,9 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 		 !!req-&gt;r_old_inode_drop + !!req-&gt;r_old_dentry_drop);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;r_dentry_drop)</div><div class='del'>-		len += pathlen1;</div><div class='add'>+		len += path_info1.pathlen;</div><div class='ctx'> 	if (req-&gt;r_old_dentry_drop)</div><div class='del'>-		len += pathlen2;</div><div class='add'>+		len += path_info2.pathlen;</div><div class='ctx'> </div><div class='ctx'> 	/* MClientRequest tail */</div><div class='ctx'> </div><div class='hunk'>@@ -3069,11 +3157,11 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 		msg-&gt;hdr.version = cpu_to_le16(3);</div><div class='ctx'> 		p = msg-&gt;front.iov_base + sizeof(*lhead);</div><div class='ctx'> 	} else if (request_head_version == 1) {</div><div class='del'>-		struct ceph_mds_request_head_old *ohead = msg-&gt;front.iov_base;</div><div class='add'>+		struct ceph_mds_request_head *nhead = msg-&gt;front.iov_base;</div><div class='ctx'> </div><div class='ctx'> 		msg-&gt;hdr.version = cpu_to_le16(4);</div><div class='del'>-		ohead-&gt;version = cpu_to_le16(1);</div><div class='del'>-		p = msg-&gt;front.iov_base + sizeof(*ohead);</div><div class='add'>+		nhead-&gt;version = cpu_to_le16(1);</div><div class='add'>+		p = msg-&gt;front.iov_base + offsetofend(struct ceph_mds_request_head, args);</div><div class='ctx'> 	} else if (request_head_version == 2) {</div><div class='ctx'> 		struct ceph_mds_request_head *nhead = msg-&gt;front.iov_base;</div><div class='ctx'> </div><div class='hunk'>@@ -3116,8 +3204,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 	lhead-&gt;ino = cpu_to_le64(req-&gt;r_deleg_ino);</div><div class='ctx'> 	lhead-&gt;args = req-&gt;r_args;</div><div class='ctx'> </div><div class='del'>-	ceph_encode_filepath(&amp;p, end, ino1, path1);</div><div class='del'>-	ceph_encode_filepath(&amp;p, end, ino2, path2);</div><div class='add'>+	ceph_encode_filepath(&amp;p, end, path_info1.vino.ino, path_info1.path);</div><div class='add'>+	ceph_encode_filepath(&amp;p, end, path_info2.vino.ino, path_info2.path);</div><div class='ctx'> </div><div class='ctx'> 	/* make note of release offset, in case we need to replay */</div><div class='ctx'> 	req-&gt;r_request_release_offset = p - msg-&gt;front.iov_base;</div><div class='hunk'>@@ -3180,11 +3268,9 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,</div><div class='ctx'> 	msg-&gt;hdr.data_off = cpu_to_le16(0);</div><div class='ctx'> </div><div class='ctx'> out_free2:</div><div class='del'>-	if (freepath2)</div><div class='del'>-		ceph_mdsc_free_path((char *)path2, pathlen2);</div><div class='add'>+	ceph_mdsc_free_path_info(&amp;path_info2);</div><div class='ctx'> out_free1:</div><div class='del'>-	if (freepath1)</div><div class='del'>-		ceph_mdsc_free_path((char *)path1, pathlen1);</div><div class='add'>+	ceph_mdsc_free_path_info(&amp;path_info1);</div><div class='ctx'> out:</div><div class='ctx'> 	return msg;</div><div class='ctx'> out_err:</div><div class='hunk'>@@ -3225,12 +3311,12 @@ static int __prepare_send_request(struct ceph_mds_session *session,</div><div class='ctx'> 				     &amp;session-&gt;s_features);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Avoid inifinite retrying after overflow. The client will</div><div class='add'>+	 * Avoid infinite retrying after overflow. The client will</div><div class='ctx'> 	 * increase the retry count and if the MDS is old version,</div><div class='ctx'> 	 * so we limit to retry at most 256 times.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (req-&gt;r_attempts) {</div><div class='del'>-	       old_max_retry = sizeof_field(struct ceph_mds_request_head_old,</div><div class='add'>+	       old_max_retry = sizeof_field(struct ceph_mds_request_head,</div><div class='ctx'> 					    num_retry);</div><div class='ctx'> 	       old_max_retry = 1 &lt;&lt; (old_max_retry * BITS_PER_BYTE);</div><div class='ctx'> 	       if ((old_version &amp;&amp; req-&gt;r_attempts &gt;= old_max_retry) ||</div><div class='hunk'>@@ -3478,7 +3564,7 @@ static void __do_request(struct ceph_mds_client *mdsc,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For async create we will choose the auth MDS of frag in parent</div><div class='del'>-	 * directory to send the request and ususally this works fine, but</div><div class='add'>+	 * directory to send the request and usually this works fine, but</div><div class='ctx'> 	 * if the migrated the dirtory to another MDS before it could handle</div><div class='ctx'> 	 * it the request will be forwarded.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -3989,7 +4075,7 @@ static void handle_forward(struct ceph_mds_client *mdsc,</div><div class='ctx'> 		__unregister_request(mdsc, req);</div><div class='ctx'> 	} else if (fwd_seq &lt;= req-&gt;r_num_fwd || (uint32_t)fwd_seq &gt;= U32_MAX) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Avoid inifinite retrying after overflow.</div><div class='add'>+		 * Avoid infinite retrying after overflow.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * The MDS will increase the fwd count and in client side</div><div class='ctx'> 		 * if the num_fwd is less than the one saved in request</div><div class='hunk'>@@ -4068,10 +4154,13 @@ static void handle_session(struct ceph_mds_session *session,</div><div class='ctx'> 	void *p = msg-&gt;front.iov_base;</div><div class='ctx'> 	void *end = p + msg-&gt;front.iov_len;</div><div class='ctx'> 	struct ceph_mds_session_head *h;</div><div class='del'>-	u32 op;</div><div class='add'>+	struct ceph_mds_cap_auth *cap_auths = NULL;</div><div class='add'>+	u32 op, cap_auths_num = 0;</div><div class='ctx'> 	u64 seq, features = 0;</div><div class='ctx'> 	int wake = 0;</div><div class='ctx'> 	bool blocklisted = false;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/* decode */</div><div class='ctx'> 	ceph_decode_need(&amp;p, end, sizeof(*h), bad);</div><div class='hunk'>@@ -4116,7 +4205,101 @@ static void handle_session(struct ceph_mds_session *session,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (msg_version &gt;= 6) {</div><div class='add'>+		ceph_decode_32_safe(&amp;p, end, cap_auths_num, bad);</div><div class='add'>+		doutc(cl, "cap_auths_num %d\n", cap_auths_num);</div><div class='add'>+</div><div class='add'>+		if (cap_auths_num &amp;&amp; op != CEPH_SESSION_OPEN) {</div><div class='add'>+			WARN_ON_ONCE(op != CEPH_SESSION_OPEN);</div><div class='add'>+			goto skip_cap_auths;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cap_auths = kcalloc(cap_auths_num,</div><div class='add'>+				    sizeof(struct ceph_mds_cap_auth),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+		if (!cap_auths) {</div><div class='add'>+			pr_err_client(cl, "No memory for cap_auths\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; cap_auths_num; i++) {</div><div class='add'>+			u32 _len, j;</div><div class='add'>+</div><div class='add'>+			/* struct_v, struct_compat, and struct_len in MDSCapAuth */</div><div class='add'>+			ceph_decode_skip_n(&amp;p, end, 2 + sizeof(u32), bad);</div><div class='add'>+</div><div class='add'>+			/* struct_v, struct_compat, and struct_len in MDSCapMatch */</div><div class='add'>+			ceph_decode_skip_n(&amp;p, end, 2 + sizeof(u32), bad);</div><div class='add'>+			ceph_decode_64_safe(&amp;p, end, cap_auths[i].match.uid, bad);</div><div class='add'>+			ceph_decode_32_safe(&amp;p, end, _len, bad);</div><div class='add'>+			if (_len) {</div><div class='add'>+				cap_auths[i].match.gids = kcalloc(_len, sizeof(u32),</div><div class='add'>+								  GFP_KERNEL);</div><div class='add'>+				if (!cap_auths[i].match.gids) {</div><div class='add'>+					pr_err_client(cl, "No memory for gids\n");</div><div class='add'>+					goto fail;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				cap_auths[i].match.num_gids = _len;</div><div class='add'>+				for (j = 0; j &lt; _len; j++)</div><div class='add'>+					ceph_decode_32_safe(&amp;p, end,</div><div class='add'>+							    cap_auths[i].match.gids[j],</div><div class='add'>+							    bad);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ceph_decode_32_safe(&amp;p, end, _len, bad);</div><div class='add'>+			if (_len) {</div><div class='add'>+				cap_auths[i].match.path = kcalloc(_len + 1, sizeof(char),</div><div class='add'>+								  GFP_KERNEL);</div><div class='add'>+				if (!cap_auths[i].match.path) {</div><div class='add'>+					pr_err_client(cl, "No memory for path\n");</div><div class='add'>+					goto fail;</div><div class='add'>+				}</div><div class='add'>+				ceph_decode_copy(&amp;p, cap_auths[i].match.path, _len);</div><div class='add'>+</div><div class='add'>+				/* Remove the tailing '/' */</div><div class='add'>+				while (_len &amp;&amp; cap_auths[i].match.path[_len - 1] == '/') {</div><div class='add'>+					cap_auths[i].match.path[_len - 1] = '\0';</div><div class='add'>+					_len -= 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ceph_decode_32_safe(&amp;p, end, _len, bad);</div><div class='add'>+			if (_len) {</div><div class='add'>+				cap_auths[i].match.fs_name = kcalloc(_len + 1, sizeof(char),</div><div class='add'>+								     GFP_KERNEL);</div><div class='add'>+				if (!cap_auths[i].match.fs_name) {</div><div class='add'>+					pr_err_client(cl, "No memory for fs_name\n");</div><div class='add'>+					goto fail;</div><div class='add'>+				}</div><div class='add'>+				ceph_decode_copy(&amp;p, cap_auths[i].match.fs_name, _len);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ceph_decode_8_safe(&amp;p, end, cap_auths[i].match.root_squash, bad);</div><div class='add'>+			ceph_decode_8_safe(&amp;p, end, cap_auths[i].readable, bad);</div><div class='add'>+			ceph_decode_8_safe(&amp;p, end, cap_auths[i].writeable, bad);</div><div class='add'>+			doutc(cl, "uid %lld, num_gids %u, path %s, fs_name %s, root_squash %d, readable %d, writeable %d\n",</div><div class='add'>+			      cap_auths[i].match.uid, cap_auths[i].match.num_gids,</div><div class='add'>+			      cap_auths[i].match.path, cap_auths[i].match.fs_name,</div><div class='add'>+			      cap_auths[i].match.root_squash,</div><div class='add'>+			      cap_auths[i].readable, cap_auths[i].writeable);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_cap_auths:</div><div class='ctx'> 	mutex_lock(&amp;mdsc-&gt;mutex);</div><div class='add'>+	if (op == CEPH_SESSION_OPEN) {</div><div class='add'>+		if (mdsc-&gt;s_cap_auths) {</div><div class='add'>+			for (i = 0; i &lt; mdsc-&gt;s_cap_auths_num; i++) {</div><div class='add'>+				kfree(mdsc-&gt;s_cap_auths[i].match.gids);</div><div class='add'>+				kfree(mdsc-&gt;s_cap_auths[i].match.path);</div><div class='add'>+				kfree(mdsc-&gt;s_cap_auths[i].match.fs_name);</div><div class='add'>+			}</div><div class='add'>+			kfree(mdsc-&gt;s_cap_auths);</div><div class='add'>+		}</div><div class='add'>+		mdsc-&gt;s_cap_auths_num = cap_auths_num;</div><div class='add'>+		mdsc-&gt;s_cap_auths = cap_auths;</div><div class='add'>+	}</div><div class='ctx'> 	if (op == CEPH_SESSION_CLOSE) {</div><div class='ctx'> 		ceph_get_mds_session(session);</div><div class='ctx'> 		__unregister_session(mdsc, session);</div><div class='hunk'>@@ -4199,7 +4382,7 @@ static void handle_session(struct ceph_mds_session *session,</div><div class='ctx'> 		/* flush cap releases */</div><div class='ctx'> 		spin_lock(&amp;session-&gt;s_cap_lock);</div><div class='ctx'> 		if (session-&gt;s_num_cap_releases)</div><div class='del'>-			ceph_flush_cap_releases(mdsc, session);</div><div class='add'>+			ceph_flush_session_cap_releases(mdsc, session);</div><div class='ctx'> 		spin_unlock(&amp;session-&gt;s_cap_lock);</div><div class='ctx'> </div><div class='ctx'> 		send_flushmsg_ack(mdsc, session, seq);</div><div class='hunk'>@@ -4246,6 +4429,13 @@ bad:</div><div class='ctx'> 	pr_err_client(cl, "corrupt message mds%d len %d\n", mds,</div><div class='ctx'> 		      (int)msg-&gt;front.iov_len);</div><div class='ctx'> 	ceph_msg_dump(msg);</div><div class='add'>+fail:</div><div class='add'>+	for (i = 0; i &lt; cap_auths_num; i++) {</div><div class='add'>+		kfree(cap_auths[i].match.gids);</div><div class='add'>+		kfree(cap_auths[i].match.path);</div><div class='add'>+		kfree(cap_auths[i].match.fs_name);</div><div class='add'>+	}</div><div class='add'>+	kfree(cap_auths);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4261,7 +4451,7 @@ void ceph_mdsc_release_dir_caps(struct ceph_mds_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ceph_mdsc_release_dir_caps_no_check(struct ceph_mds_request *req)</div><div class='add'>+void ceph_mdsc_release_dir_caps_async(struct ceph_mds_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct ceph_client *cl = req-&gt;r_mdsc-&gt;fsc-&gt;client;</div><div class='ctx'> 	int dcaps;</div><div class='hunk'>@@ -4269,8 +4459,7 @@ void ceph_mdsc_release_dir_caps_no_check(struct ceph_mds_request *req)</div><div class='ctx'> 	dcaps = xchg(&amp;req-&gt;r_dir_caps, 0);</div><div class='ctx'> 	if (dcaps) {</div><div class='ctx'> 		doutc(cl, "releasing r_dir_caps=%s\n", ceph_cap_string(dcaps));</div><div class='del'>-		ceph_put_cap_refs_no_check_caps(ceph_inode(req-&gt;r_parent),</div><div class='del'>-						dcaps);</div><div class='add'>+		ceph_put_cap_refs_async(ceph_inode(req-&gt;r_parent), dcaps);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4306,7 +4495,7 @@ static void replay_unsafe_requests(struct ceph_mds_client *mdsc,</div><div class='ctx'> 		if (req-&gt;r_session-&gt;s_mds != session-&gt;s_mds)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ceph_mdsc_release_dir_caps_no_check(req);</div><div class='add'>+		ceph_mdsc_release_dir_caps_async(req);</div><div class='ctx'> </div><div class='ctx'> 		__send_request(session, req, true);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4438,24 +4627,20 @@ static int reconnect_caps_cb(struct inode *inode, int mds, void *arg)</div><div class='ctx'> 	struct ceph_pagelist *pagelist = recon_state-&gt;pagelist;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct ceph_cap *cap;</div><div class='del'>-	char *path;</div><div class='del'>-	int pathlen = 0, err;</div><div class='del'>-	u64 pathbase;</div><div class='add'>+	struct ceph_path_info path_info = {0};</div><div class='add'>+	int err;</div><div class='ctx'> 	u64 snap_follows;</div><div class='ctx'> </div><div class='ctx'> 	dentry = d_find_primary(inode);</div><div class='ctx'> 	if (dentry) {</div><div class='ctx'> 		/* set pathbase to parent dir when msg_version &gt;= 2 */</div><div class='del'>-		path = ceph_mdsc_build_path(mdsc, dentry, &amp;pathlen, &amp;pathbase,</div><div class='add'>+		char *path = ceph_mdsc_build_path(mdsc, dentry, &amp;path_info,</div><div class='ctx'> 					    recon_state-&gt;msg_version &gt;= 2);</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 		if (IS_ERR(path)) {</div><div class='ctx'> 			err = PTR_ERR(path);</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		path = NULL;</div><div class='del'>-		pathbase = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ci-&gt;i_ceph_lock);</div><div class='hunk'>@@ -4488,7 +4673,7 @@ static int reconnect_caps_cb(struct inode *inode, int mds, void *arg)</div><div class='ctx'> 		rec.v2.wanted = cpu_to_le32(__ceph_caps_wanted(ci));</div><div class='ctx'> 		rec.v2.issued = cpu_to_le32(cap-&gt;issued);</div><div class='ctx'> 		rec.v2.snaprealm = cpu_to_le64(ci-&gt;i_snap_realm-&gt;ino);</div><div class='del'>-		rec.v2.pathbase = cpu_to_le64(pathbase);</div><div class='add'>+		rec.v2.pathbase = cpu_to_le64(path_info.vino.ino);</div><div class='ctx'> 		rec.v2.flock_len = (__force __le32)</div><div class='ctx'> 			((ci-&gt;i_ceph_flags &amp; CEPH_I_ERROR_FILELOCK) ? 0 : 1);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4503,7 +4688,7 @@ static int reconnect_caps_cb(struct inode *inode, int mds, void *arg)</div><div class='ctx'> 		ts = inode_get_atime(inode);</div><div class='ctx'> 		ceph_encode_timespec64(&amp;rec.v1.atime, &amp;ts);</div><div class='ctx'> 		rec.v1.snaprealm = cpu_to_le64(ci-&gt;i_snap_realm-&gt;ino);</div><div class='del'>-		rec.v1.pathbase = cpu_to_le64(pathbase);</div><div class='add'>+		rec.v1.pathbase = cpu_to_le64(path_info.vino.ino);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;ci-&gt;i_cap_snaps)) {</div><div class='hunk'>@@ -4565,7 +4750,7 @@ encode_again:</div><div class='ctx'> 			    sizeof(struct ceph_filelock);</div><div class='ctx'> 		rec.v2.flock_len = cpu_to_le32(struct_len);</div><div class='ctx'> </div><div class='del'>-		struct_len += sizeof(u32) + pathlen + sizeof(rec.v2);</div><div class='add'>+		struct_len += sizeof(u32) + path_info.pathlen + sizeof(rec.v2);</div><div class='ctx'> </div><div class='ctx'> 		if (struct_v &gt;= 2)</div><div class='ctx'> 			struct_len += sizeof(u64); /* snap_follows */</div><div class='hunk'>@@ -4589,7 +4774,7 @@ encode_again:</div><div class='ctx'> 			ceph_pagelist_encode_8(pagelist, 1);</div><div class='ctx'> 			ceph_pagelist_encode_32(pagelist, struct_len);</div><div class='ctx'> 		}</div><div class='del'>-		ceph_pagelist_encode_string(pagelist, path, pathlen);</div><div class='add'>+		ceph_pagelist_encode_string(pagelist, (char *)path_info.path, path_info.pathlen);</div><div class='ctx'> 		ceph_pagelist_append(pagelist, &amp;rec, sizeof(rec.v2));</div><div class='ctx'> 		ceph_locks_to_pagelist(flocks, pagelist,</div><div class='ctx'> 				       num_fcntl_locks, num_flock_locks);</div><div class='hunk'>@@ -4600,17 +4785,17 @@ out_freeflocks:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = ceph_pagelist_reserve(pagelist,</div><div class='ctx'> 					    sizeof(u64) + sizeof(u32) +</div><div class='del'>-					    pathlen + sizeof(rec.v1));</div><div class='add'>+					    path_info.pathlen + sizeof(rec.v1));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> </div><div class='ctx'> 		ceph_pagelist_encode_64(pagelist, ceph_ino(inode));</div><div class='del'>-		ceph_pagelist_encode_string(pagelist, path, pathlen);</div><div class='add'>+		ceph_pagelist_encode_string(pagelist, (char *)path_info.path, path_info.pathlen);</div><div class='ctx'> 		ceph_pagelist_append(pagelist, &amp;rec, sizeof(rec.v1));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='del'>-	ceph_mdsc_free_path(path, pathlen);</div><div class='add'>+	ceph_mdsc_free_path_info(&amp;path_info);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		recon_state-&gt;nr_caps++;</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -4763,7 +4948,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		recon_state.msg_version = 2;</div><div class='ctx'> 	}</div><div class='del'>-	/* trsaverse this session's caps */</div><div class='add'>+	/* traverse this session's caps */</div><div class='ctx'> 	err = ceph_iterate_session_caps(session, reconnect_caps_cb, &amp;recon_state);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;session-&gt;s_cap_lock);</div><div class='hunk'>@@ -5299,6 +5484,8 @@ static void delayed_work(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;mdsc-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+		ceph_flush_session_cap_releases(mdsc, s);</div><div class='add'>+</div><div class='ctx'> 		mutex_lock(&amp;s-&gt;s_mutex);</div><div class='ctx'> 		if (renew_caps)</div><div class='ctx'> 			send_renew_caps(mdsc, s);</div><div class='hunk'>@@ -5346,6 +5533,8 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)</div><div class='ctx'> 	spin_lock_init(&amp;mdsc-&gt;stopping_lock);</div><div class='ctx'> 	atomic_set(&amp;mdsc-&gt;stopping_blockers, 0);</div><div class='ctx'> 	init_completion(&amp;mdsc-&gt;stopping_waiter);</div><div class='add'>+	atomic64_set(&amp;mdsc-&gt;dirty_folios, 0);</div><div class='add'>+	init_waitqueue_head(&amp;mdsc-&gt;flush_end_wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;mdsc-&gt;session_close_wq);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mdsc-&gt;waiting_for_map);</div><div class='ctx'> 	mdsc-&gt;quotarealms_inodes = RB_ROOT;</div><div class='hunk'>@@ -5358,8 +5547,11 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;mdsc-&gt;delayed_work, delayed_work);</div><div class='ctx'> 	mdsc-&gt;last_renew_caps = jiffies;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mdsc-&gt;cap_delay_list);</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mdsc-&gt;cap_wait_list);</div><div class='add'>+#endif</div><div class='ctx'> 	spin_lock_init(&amp;mdsc-&gt;cap_delay_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mdsc-&gt;cap_unlink_delay_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mdsc-&gt;snap_flush_list);</div><div class='ctx'> 	spin_lock_init(&amp;mdsc-&gt;snap_flush_lock);</div><div class='ctx'> 	mdsc-&gt;last_cap_flush_tid = 1;</div><div class='hunk'>@@ -5368,6 +5560,7 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)</div><div class='ctx'> 	spin_lock_init(&amp;mdsc-&gt;cap_dirty_lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;mdsc-&gt;cap_flushing_wq);</div><div class='ctx'> 	INIT_WORK(&amp;mdsc-&gt;cap_reclaim_work, ceph_cap_reclaim_work);</div><div class='add'>+	INIT_WORK(&amp;mdsc-&gt;cap_unlink_work, ceph_cap_unlink_work);</div><div class='ctx'> 	err = ceph_metric_init(&amp;mdsc-&gt;metric);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_mdsmap;</div><div class='hunk'>@@ -5454,6 +5647,181 @@ void send_flush_mdlog(struct ceph_mds_session *s)</div><div class='ctx'> 	mutex_unlock(&amp;s-&gt;s_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ceph_mds_auth_match(struct ceph_mds_client *mdsc,</div><div class='add'>+			       struct ceph_mds_cap_auth *auth,</div><div class='add'>+			       const struct cred *cred,</div><div class='add'>+			       char *tpath)</div><div class='add'>+{</div><div class='add'>+	u32 caller_uid = from_kuid(&amp;init_user_ns, cred-&gt;fsuid);</div><div class='add'>+	u32 caller_gid = from_kgid(&amp;init_user_ns, cred-&gt;fsgid);</div><div class='add'>+	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='add'>+	const char *fs_name = mdsc-&gt;fsc-&gt;mount_options-&gt;mds_namespace;</div><div class='add'>+	const char *spath = mdsc-&gt;fsc-&gt;mount_options-&gt;server_path;</div><div class='add'>+	bool gid_matched = false;</div><div class='add'>+	u32 gid, tlen, len;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	doutc(cl, "fsname check fs_name=%s  match.fs_name=%s\n",</div><div class='add'>+	      fs_name, auth-&gt;match.fs_name ? auth-&gt;match.fs_name : "");</div><div class='add'>+	if (auth-&gt;match.fs_name &amp;&amp; strcmp(auth-&gt;match.fs_name, fs_name)) {</div><div class='add'>+		/* fsname mismatch, try next one */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	doutc(cl, "match.uid %lld\n", auth-&gt;match.uid);</div><div class='add'>+	if (auth-&gt;match.uid != MDS_AUTH_UID_ANY) {</div><div class='add'>+		if (auth-&gt;match.uid != caller_uid)</div><div class='add'>+			return 0;</div><div class='add'>+		if (auth-&gt;match.num_gids) {</div><div class='add'>+			for (i = 0; i &lt; auth-&gt;match.num_gids; i++) {</div><div class='add'>+				if (caller_gid == auth-&gt;match.gids[i])</div><div class='add'>+					gid_matched = true;</div><div class='add'>+			}</div><div class='add'>+			if (!gid_matched &amp;&amp; cred-&gt;group_info-&gt;ngroups) {</div><div class='add'>+				for (i = 0; i &lt; cred-&gt;group_info-&gt;ngroups; i++) {</div><div class='add'>+					gid = from_kgid(&amp;init_user_ns,</div><div class='add'>+							cred-&gt;group_info-&gt;gid[i]);</div><div class='add'>+					for (j = 0; j &lt; auth-&gt;match.num_gids; j++) {</div><div class='add'>+						if (gid == auth-&gt;match.gids[j]) {</div><div class='add'>+							gid_matched = true;</div><div class='add'>+							break;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+					if (gid_matched)</div><div class='add'>+						break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (!gid_matched)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* path match */</div><div class='add'>+	if (auth-&gt;match.path) {</div><div class='add'>+		if (!tpath)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		tlen = strlen(tpath);</div><div class='add'>+		len = strlen(auth-&gt;match.path);</div><div class='add'>+		if (len) {</div><div class='add'>+			char *_tpath = tpath;</div><div class='add'>+			bool free_tpath = false;</div><div class='add'>+			int m, n;</div><div class='add'>+</div><div class='add'>+			doutc(cl, "server path %s, tpath %s, match.path %s\n",</div><div class='add'>+			      spath, tpath, auth-&gt;match.path);</div><div class='add'>+			if (spath &amp;&amp; (m = strlen(spath)) != 1) {</div><div class='add'>+				/* mount path + '/' + tpath + an extra space */</div><div class='add'>+				n = m + 1 + tlen + 1;</div><div class='add'>+				_tpath = kmalloc(n, GFP_NOFS);</div><div class='add'>+				if (!_tpath)</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+				/* remove the leading '/' */</div><div class='add'>+				snprintf(_tpath, n, "%s/%s", spath + 1, tpath);</div><div class='add'>+				free_tpath = true;</div><div class='add'>+				tlen = strlen(_tpath);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Please note the tailing '/' for match.path has already</div><div class='add'>+			 * been removed when parsing.</div><div class='add'>+			 *</div><div class='add'>+			 * Remove the tailing '/' for the target path.</div><div class='add'>+			 */</div><div class='add'>+			while (tlen &amp;&amp; _tpath[tlen - 1] == '/') {</div><div class='add'>+				_tpath[tlen - 1] = '\0';</div><div class='add'>+				tlen -= 1;</div><div class='add'>+			}</div><div class='add'>+			doutc(cl, "_tpath %s\n", _tpath);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * In case first == _tpath &amp;&amp; tlen == len:</div><div class='add'>+			 *  match.path=/foo  --&gt; /foo _path=/foo     --&gt; match</div><div class='add'>+			 *  match.path=/foo/ --&gt; /foo _path=/foo     --&gt; match</div><div class='add'>+			 *</div><div class='add'>+			 * In case first == _tmatch.path &amp;&amp; tlen &gt; len:</div><div class='add'>+			 *  match.path=/foo/ --&gt; /foo _path=/foo/    --&gt; match</div><div class='add'>+			 *  match.path=/foo  --&gt; /foo _path=/foo/    --&gt; match</div><div class='add'>+			 *  match.path=/foo/ --&gt; /foo _path=/foo/d   --&gt; match</div><div class='add'>+			 *  match.path=/foo  --&gt; /foo _path=/food    --&gt; mismatch</div><div class='add'>+			 *</div><div class='add'>+			 * All the other cases                       --&gt; mismatch</div><div class='add'>+			 */</div><div class='add'>+			bool path_matched = true;</div><div class='add'>+			char *first = strstr(_tpath, auth-&gt;match.path);</div><div class='add'>+			if (first != _tpath ||</div><div class='add'>+			    (tlen &gt; len &amp;&amp; _tpath[len] != '/')) {</div><div class='add'>+				path_matched = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (free_tpath)</div><div class='add'>+				kfree(_tpath);</div><div class='add'>+</div><div class='add'>+			if (!path_matched)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	doutc(cl, "matched\n");</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ceph_mds_check_access(struct ceph_mds_client *mdsc, char *tpath, int mask)</div><div class='add'>+{</div><div class='add'>+	const struct cred *cred = get_current_cred();</div><div class='add'>+	u32 caller_uid = from_kuid(&amp;init_user_ns, cred-&gt;fsuid);</div><div class='add'>+	u32 caller_gid = from_kgid(&amp;init_user_ns, cred-&gt;fsgid);</div><div class='add'>+	struct ceph_mds_cap_auth *rw_perms_s = NULL;</div><div class='add'>+	struct ceph_client *cl = mdsc-&gt;fsc-&gt;client;</div><div class='add'>+	bool root_squash_perms = true;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	doutc(cl, "tpath '%s', mask %d, caller_uid %d, caller_gid %d\n",</div><div class='add'>+	      tpath, mask, caller_uid, caller_gid);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mdsc-&gt;s_cap_auths_num; i++) {</div><div class='add'>+		struct ceph_mds_cap_auth *s = &amp;mdsc-&gt;s_cap_auths[i];</div><div class='add'>+</div><div class='add'>+		err = ceph_mds_auth_match(mdsc, s, cred, tpath);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			put_cred(cred);</div><div class='add'>+			return err;</div><div class='add'>+		} else if (err &gt; 0) {</div><div class='add'>+			/* always follow the last auth caps' permission */</div><div class='add'>+			root_squash_perms = true;</div><div class='add'>+			rw_perms_s = NULL;</div><div class='add'>+			if ((mask &amp; MAY_WRITE) &amp;&amp; s-&gt;writeable &amp;&amp;</div><div class='add'>+			    s-&gt;match.root_squash &amp;&amp; (!caller_uid || !caller_gid))</div><div class='add'>+				root_squash_perms = false;</div><div class='add'>+</div><div class='add'>+			if (((mask &amp; MAY_WRITE) &amp;&amp; !s-&gt;writeable) ||</div><div class='add'>+			    ((mask &amp; MAY_READ) &amp;&amp; !s-&gt;readable))</div><div class='add'>+				rw_perms_s = s;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_cred(cred);</div><div class='add'>+</div><div class='add'>+	doutc(cl, "root_squash_perms %d, rw_perms_s %p\n", root_squash_perms,</div><div class='add'>+	      rw_perms_s);</div><div class='add'>+	if (root_squash_perms &amp;&amp; rw_perms_s == NULL) {</div><div class='add'>+		doutc(cl, "access allowed\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!root_squash_perms) {</div><div class='add'>+		doutc(cl, "root_squash is enabled and user(%d %d) isn't allowed to write",</div><div class='add'>+		      caller_uid, caller_gid);</div><div class='add'>+	}</div><div class='add'>+	if (rw_perms_s) {</div><div class='add'>+		doutc(cl, "mds auth caps readable/writeable %d/%d while request r/w %d/%d",</div><div class='add'>+		      rw_perms_s-&gt;readable, rw_perms_s-&gt;writeable,</div><div class='add'>+		      !!(mask &amp; MAY_READ), !!(mask &amp; MAY_WRITE));</div><div class='add'>+	}</div><div class='add'>+	doutc(cl, "access denied\n");</div><div class='add'>+	return -EACCES;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * called before mount is ro, and before dentries are torn down.</div><div class='ctx'>  * (hmm, does this still race with new lookups?)</div><div class='hunk'>@@ -5560,6 +5928,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc)</div><div class='ctx'> 	mutex_unlock(&amp;mdsc-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ceph_flush_dirty_caps(mdsc);</div><div class='add'>+	ceph_flush_cap_releases(mdsc);</div><div class='ctx'> 	spin_lock(&amp;mdsc-&gt;cap_dirty_lock);</div><div class='ctx'> 	want_flush = mdsc-&gt;last_cap_flush_tid;</div><div class='ctx'> 	if (!list_empty(&amp;mdsc-&gt;cap_flush_list)) {</div><div class='hunk'>@@ -5641,6 +6010,7 @@ void ceph_mdsc_close_sessions(struct ceph_mds_client *mdsc)</div><div class='ctx'> 	ceph_cleanup_global_and_empty_realms(mdsc);</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;mdsc-&gt;cap_reclaim_work);</div><div class='add'>+	cancel_work_sync(&amp;mdsc-&gt;cap_unlink_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;mdsc-&gt;delayed_work); /* cancel timer */</div><div class='ctx'> </div><div class='ctx'> 	doutc(cl, "done\n");</div><div class='hunk'>@@ -5697,6 +6067,18 @@ static void ceph_mdsc_stop(struct ceph_mds_client *mdsc)</div><div class='ctx'> 		ceph_mdsmap_destroy(mdsc-&gt;mdsmap);</div><div class='ctx'> 	kfree(mdsc-&gt;sessions);</div><div class='ctx'> 	ceph_caps_finalize(mdsc);</div><div class='add'>+</div><div class='add'>+	if (mdsc-&gt;s_cap_auths) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; mdsc-&gt;s_cap_auths_num; i++) {</div><div class='add'>+			kfree(mdsc-&gt;s_cap_auths[i].match.gids);</div><div class='add'>+			kfree(mdsc-&gt;s_cap_auths[i].match.path);</div><div class='add'>+			kfree(mdsc-&gt;s_cap_auths[i].match.fs_name);</div><div class='add'>+		}</div><div class='add'>+		kfree(mdsc-&gt;s_cap_auths);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ceph_pool_perm_destroy(mdsc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h<br/>index 2e6ddaa13d72..0428a5eaf28c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/mds_client.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mds_client.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/mds_client.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/mds_client.h</a></div><div class='hunk'>@@ -35,8 +35,9 @@ enum ceph_feature_type {</div><div class='ctx'> 	CEPHFS_FEATURE_32BITS_RETRY_FWD,</div><div class='ctx'> 	CEPHFS_FEATURE_NEW_SNAPREALM_INFO,</div><div class='ctx'> 	CEPHFS_FEATURE_HAS_OWNER_UIDGID,</div><div class='add'>+	CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK,</div><div class='ctx'> </div><div class='del'>-	CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_HAS_OWNER_UIDGID,</div><div class='add'>+	CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CEPHFS_FEATURES_CLIENT_SUPPORTED {	\</div><div class='hunk'>@@ -52,6 +53,7 @@ enum ceph_feature_type {</div><div class='ctx'> 	CEPHFS_FEATURE_OP_GETVXATTR,		\</div><div class='ctx'> 	CEPHFS_FEATURE_32BITS_RETRY_FWD,	\</div><div class='ctx'> 	CEPHFS_FEATURE_HAS_OWNER_UIDGID,	\</div><div class='add'>+	CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK,	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -71,6 +73,24 @@ enum ceph_feature_type {</div><div class='ctx'> struct ceph_fs_client;</div><div class='ctx'> struct ceph_cap;</div><div class='ctx'> </div><div class='add'>+#define MDS_AUTH_UID_ANY -1</div><div class='add'>+</div><div class='add'>+struct ceph_mds_cap_match {</div><div class='add'>+	s64 uid;  /* default to MDS_AUTH_UID_ANY */</div><div class='add'>+	u32 num_gids;</div><div class='add'>+	u32 *gids;  /* use these GIDs */</div><div class='add'>+	char *path;  /* require path to be child of this</div><div class='add'>+			(may be "" or "/" for any) */</div><div class='add'>+	char *fs_name;</div><div class='add'>+	bool root_squash;  /* default to false */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ceph_mds_cap_auth {</div><div class='add'>+	struct ceph_mds_cap_match match;</div><div class='add'>+	bool readable;</div><div class='add'>+	bool writeable;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * parsed info about a single inode.  pointers are into the encoded</div><div class='ctx'>  * on-wire structures within the mds reply message payload.</div><div class='hunk'>@@ -279,6 +299,8 @@ struct ceph_mds_request {</div><div class='ctx'> 	struct inode *r_target_inode;       /* resulting inode */</div><div class='ctx'> 	struct inode *r_new_inode;	    /* new inode (for creates) */</div><div class='ctx'> </div><div class='add'>+	const struct qstr *r_dname;	    /* stable name (for -&gt;d_revalidate) */</div><div class='add'>+</div><div class='ctx'> #define CEPH_MDS_R_DIRECT_IS_HASH	(1) /* r_direct_hash is valid */</div><div class='ctx'> #define CEPH_MDS_R_ABORTED		(2) /* call was aborted */</div><div class='ctx'> #define CEPH_MDS_R_GOT_UNSAFE		(3) /* got an unsafe reply */</div><div class='hunk'>@@ -396,6 +418,8 @@ struct ceph_quotarealm_inode {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='ctx'> struct cap_wait {</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	u64			ino;</div><div class='hunk'>@@ -404,6 +428,8 @@ struct cap_wait {</div><div class='ctx'> 	int			want;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	CEPH_MDSC_STOPPING_BEGIN = 1,</div><div class='ctx'> 	CEPH_MDSC_STOPPING_FLUSHING = 2,</div><div class='hunk'>@@ -432,6 +458,9 @@ struct ceph_mds_client {</div><div class='ctx'> 	atomic_t                stopping_blockers;</div><div class='ctx'> 	struct completion	stopping_waiter;</div><div class='ctx'> </div><div class='add'>+	atomic64_t		dirty_folios;</div><div class='add'>+	wait_queue_head_t	flush_end_wq;</div><div class='add'>+</div><div class='ctx'> 	atomic64_t		quotarealms_count; /* # realms with quota */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We keep a list of inodes we don't see in the mountpoint but that we</div><div class='hunk'>@@ -461,7 +490,8 @@ struct ceph_mds_client {</div><div class='ctx'> 	struct delayed_work    delayed_work;  /* delayed work */</div><div class='ctx'> 	unsigned long    last_renew_caps;  /* last time we renewed our caps */</div><div class='ctx'> 	struct list_head cap_delay_list;   /* caps with delayed release */</div><div class='del'>-	spinlock_t       cap_delay_lock;   /* protects cap_delay_list */</div><div class='add'>+	struct list_head cap_unlink_delay_list;  /* caps with delayed release for unlink */</div><div class='add'>+	spinlock_t       cap_delay_lock;   /* protects cap_delay_list and cap_unlink_delay_list */</div><div class='ctx'> 	struct list_head snap_flush_list;  /* cap_snaps ready to flush */</div><div class='ctx'> 	spinlock_t       snap_flush_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -475,6 +505,8 @@ struct ceph_mds_client {</div><div class='ctx'> 	struct work_struct cap_reclaim_work;</div><div class='ctx'> 	atomic_t	   cap_reclaim_pending;</div><div class='ctx'> </div><div class='add'>+	struct work_struct cap_unlink_work;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Cap reservations</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -489,7 +521,9 @@ struct ceph_mds_client {</div><div class='ctx'> 	spinlock_t	caps_list_lock;</div><div class='ctx'> 	struct		list_head caps_list; /* unused (reserved or</div><div class='ctx'> 						unreserved) */</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct		list_head cap_wait_list;</div><div class='add'>+#endif</div><div class='ctx'> 	int		caps_total_count;    /* total caps allocated */</div><div class='ctx'> 	int		caps_use_count;      /* in use */</div><div class='ctx'> 	int		caps_use_max;	     /* max used caps */</div><div class='hunk'>@@ -510,6 +544,9 @@ struct ceph_mds_client {</div><div class='ctx'> 	struct rw_semaphore     pool_perm_rwsem;</div><div class='ctx'> 	struct rb_root		pool_perm_tree;</div><div class='ctx'> </div><div class='add'>+	u32			 s_cap_auths_num;</div><div class='add'>+	struct ceph_mds_cap_auth *s_cap_auths;</div><div class='add'>+</div><div class='ctx'> 	char nodename[__NEW_UTS_LEN + 1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -527,9 +564,6 @@ extern struct ceph_mds_session *</div><div class='ctx'> ceph_get_mds_session(struct ceph_mds_session *s);</div><div class='ctx'> extern void ceph_put_mds_session(struct ceph_mds_session *s);</div><div class='ctx'> </div><div class='del'>-extern int ceph_send_msg_mds(struct ceph_mds_client *mdsc,</div><div class='del'>-			     struct ceph_msg *msg, int mds);</div><div class='del'>-</div><div class='ctx'> extern int ceph_mdsc_init(struct ceph_fs_client *fsc);</div><div class='ctx'> extern void ceph_mdsc_close_sessions(struct ceph_mds_client *mdsc);</div><div class='ctx'> extern void ceph_mdsc_force_umount(struct ceph_mds_client *mdsc);</div><div class='hunk'>@@ -552,7 +586,7 @@ extern int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,</div><div class='ctx'> 				struct inode *dir,</div><div class='ctx'> 				struct ceph_mds_request *req);</div><div class='ctx'> extern void ceph_mdsc_release_dir_caps(struct ceph_mds_request *req);</div><div class='del'>-extern void ceph_mdsc_release_dir_caps_no_check(struct ceph_mds_request *req);</div><div class='add'>+extern void ceph_mdsc_release_dir_caps_async(struct ceph_mds_request *req);</div><div class='ctx'> static inline void ceph_mdsc_get_request(struct ceph_mds_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	kref_get(&amp;req-&gt;r_kref);</div><div class='hunk'>@@ -570,23 +604,37 @@ extern void ceph_mdsc_iterate_sessions(struct ceph_mds_client *mdsc,</div><div class='ctx'> extern struct ceph_msg *ceph_create_session_msg(u32 op, u64 seq);</div><div class='ctx'> extern void __ceph_queue_cap_release(struct ceph_mds_session *session,</div><div class='ctx'> 				    struct ceph_cap *cap);</div><div class='del'>-extern void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,</div><div class='del'>-				    struct ceph_mds_session *session);</div><div class='add'>+extern void ceph_flush_session_cap_releases(struct ceph_mds_client *mdsc,</div><div class='add'>+					    struct ceph_mds_session *session);</div><div class='ctx'> extern void ceph_queue_cap_reclaim_work(struct ceph_mds_client *mdsc);</div><div class='ctx'> extern void ceph_reclaim_caps_nr(struct ceph_mds_client *mdsc, int nr);</div><div class='add'>+extern void ceph_queue_cap_unlink_work(struct ceph_mds_client *mdsc);</div><div class='ctx'> extern int ceph_iterate_session_caps(struct ceph_mds_session *session,</div><div class='ctx'> 				     int (*cb)(struct inode *, int mds, void *),</div><div class='ctx'> 				     void *arg);</div><div class='add'>+extern int ceph_mds_check_access(struct ceph_mds_client *mdsc, char *tpath,</div><div class='add'>+				 int mask);</div><div class='add'>+</div><div class='ctx'> extern void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc);</div><div class='ctx'> </div><div class='del'>-static inline void ceph_mdsc_free_path(char *path, int len)</div><div class='add'>+/*</div><div class='add'>+ * Structure to group path-related output parameters for build_*_path functions</div><div class='add'>+ */</div><div class='add'>+struct ceph_path_info {</div><div class='add'>+	const char *path;</div><div class='add'>+	int pathlen;</div><div class='add'>+	struct ceph_vino vino;</div><div class='add'>+	bool freepath;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void ceph_mdsc_free_path_info(const struct ceph_path_info *path_info)</div><div class='ctx'> {</div><div class='del'>-	if (!IS_ERR_OR_NULL(path))</div><div class='del'>-		__putname(path - (PATH_MAX - 1 - len));</div><div class='add'>+	if (path_info &amp;&amp; path_info-&gt;freepath &amp;&amp; !IS_ERR_OR_NULL(path_info-&gt;path))</div><div class='add'>+		__putname((char *)path_info-&gt;path - (PATH_MAX - 1 - path_info-&gt;pathlen));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern char *ceph_mdsc_build_path(struct ceph_mds_client *mdsc,</div><div class='del'>-				  struct dentry *dentry, int *plen, u64 *base,</div><div class='add'>+				  struct dentry *dentry, struct ceph_path_info *path_info,</div><div class='ctx'> 				  int for_wire);</div><div class='ctx'> </div><div class='ctx'> extern void __ceph_mdsc_drop_dentry_lease(struct dentry *dentry);</div><div class='hunk'>@@ -601,8 +649,6 @@ extern void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc,</div><div class='ctx'> </div><div class='ctx'> extern struct ceph_mds_session *</div><div class='ctx'> ceph_mdsc_open_export_target_session(struct ceph_mds_client *mdsc, int target);</div><div class='del'>-extern void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,</div><div class='del'>-					  struct ceph_mds_session *session);</div><div class='ctx'> </div><div class='ctx'> extern int ceph_trim_caps(struct ceph_mds_client *mdsc,</div><div class='ctx'> 			  struct ceph_mds_session *session,</div><div class='head'>diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c<br/>index fae97c25ce58..2c7b151a7c95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/mdsmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mdsmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/mdsmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/mdsmap.c</a></div><div class='hunk'>@@ -353,10 +353,22 @@ struct ceph_mdsmap *ceph_mdsmap_decode(struct ceph_mds_client *mdsc, void **p,</div><div class='ctx'> 		__decode_and_drop_type(p, end, u8, bad_ext);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mdsmap_ev &gt;= 8) {</div><div class='add'>+		u32 fsname_len;</div><div class='ctx'> 		/* enabled */</div><div class='ctx'> 		ceph_decode_8_safe(p, end, m-&gt;m_enabled, bad_ext);</div><div class='ctx'> 		/* fs_name */</div><div class='del'>-		ceph_decode_skip_string(p, end, bad_ext);</div><div class='add'>+		ceph_decode_32_safe(p, end, fsname_len, bad_ext);</div><div class='add'>+</div><div class='add'>+		/* validate fsname against mds_namespace */</div><div class='add'>+		if (!namespace_equals(mdsc-&gt;fsc-&gt;mount_options, *p,</div><div class='add'>+				      fsname_len)) {</div><div class='add'>+			pr_warn_client(cl, "fsname %*pE doesn't match mds_namespace %s\n",</div><div class='add'>+				       (int)fsname_len, (char *)*p,</div><div class='add'>+				       mdsc-&gt;fsc-&gt;mount_options-&gt;mds_namespace);</div><div class='add'>+			goto bad;</div><div class='add'>+		}</div><div class='add'>+		/* skip fsname after validation */</div><div class='add'>+		ceph_decode_skip_n(p, end, fsname_len, bad);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* damaged */</div><div class='ctx'> 	if (mdsmap_ev &gt;= 9) {</div><div class='hunk'>@@ -380,10 +392,11 @@ struct ceph_mdsmap *ceph_mdsmap_decode(struct ceph_mds_client *mdsc, void **p,</div><div class='ctx'> 		ceph_decode_skip_8(p, end, bad_ext);</div><div class='ctx'> 		/* required_client_features */</div><div class='ctx'> 		ceph_decode_skip_set(p, end, 64, bad_ext);</div><div class='add'>+		/* bal_rank_mask */</div><div class='add'>+		ceph_decode_skip_string(p, end, bad_ext);</div><div class='add'>+	}</div><div class='add'>+	if (mdsmap_ev &gt;= 18) {</div><div class='ctx'> 		ceph_decode_64_safe(p, end, m-&gt;m_max_xattr_size, bad_ext);</div><div class='del'>-	} else {</div><div class='del'>-		/* This forces the usage of the (sync) SETXATTR Op */</div><div class='del'>-		m-&gt;m_max_xattr_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> bad_ext:</div><div class='ctx'> 	doutc(cl, "m_enabled: %d, m_damaged: %d, m_num_laggy: %d\n",</div><div class='head'>diff --git a/fs/ceph/mdsmap.h b/fs/ceph/mdsmap.h<br/>index 89f1931f1ba6..1f2171dd01bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/mdsmap.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/mdsmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/mdsmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/mdsmap.h</a></div><div class='hunk'>@@ -27,7 +27,11 @@ struct ceph_mdsmap {</div><div class='ctx'> 	u32 m_session_timeout;          /* seconds */</div><div class='ctx'> 	u32 m_session_autoclose;        /* seconds */</div><div class='ctx'> 	u64 m_max_file_size;</div><div class='del'>-	u64 m_max_xattr_size;		/* maximum size for xattrs blob */</div><div class='add'>+	/*</div><div class='add'>+	 * maximum size for xattrs blob.</div><div class='add'>+	 * Zeroed by default to force the usage of the (sync) SETXATTR Op.</div><div class='add'>+	 */</div><div class='add'>+	u64 m_max_xattr_size;</div><div class='ctx'> 	u32 m_max_mds;			/* expected up:active mds number */</div><div class='ctx'> 	u32 m_num_active_mds;		/* actual up:active mds number */</div><div class='ctx'> 	u32 possible_max_rank;		/* possible max rank index */</div><div class='head'>diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c<br/>index 06ee397e0c3a..d90eda19bcc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/quota.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/quota.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/quota.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/quota.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ static struct inode *lookup_quotarealm_inode(struct ceph_mds_client *mdsc,</div><div class='ctx'> 	if (IS_ERR(in)) {</div><div class='ctx'> 		doutc(cl, "Can't lookup inode %llx (err: %ld)\n", realm-&gt;ino,</div><div class='ctx'> 		      PTR_ERR(in));</div><div class='del'>-		qri-&gt;timeout = jiffies + msecs_to_jiffies(60 * 1000); /* XXX */</div><div class='add'>+		qri-&gt;timeout = jiffies + secs_to_jiffies(60); /* XXX */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		qri-&gt;timeout = 0;</div><div class='ctx'> 		qri-&gt;inode = in;</div><div class='head'>diff --git a/fs/ceph/super.c b/fs/ceph/super.c<br/>index 5ec102f6b1ac..f6bf24b5c683 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/super.c</a></div><div class='hunk'>@@ -126,6 +126,7 @@ static int ceph_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 	if (!wait) {</div><div class='ctx'> 		doutc(cl, "(non-blocking)\n");</div><div class='ctx'> 		ceph_flush_dirty_caps(fsc-&gt;mdsc);</div><div class='add'>+		ceph_flush_cap_releases(fsc-&gt;mdsc);</div><div class='ctx'> 		doutc(cl, "(non-blocking) done\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -245,20 +246,6 @@ static void canonicalize_path(char *path)</div><div class='ctx'> 	path[j] = '\0';</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check if the mds namespace in ceph_mount_options matches</div><div class='del'>- * the passed in namespace string. First time match (when</div><div class='del'>- * -&gt;mds_namespace is NULL) is treated specially, since</div><div class='del'>- * -&gt;mds_namespace needs to be initialized by the caller.</div><div class='del'>- */</div><div class='del'>-static int namespace_equals(struct ceph_mount_options *fsopt,</div><div class='del'>-			    const char *namespace, size_t len)</div><div class='del'>-{</div><div class='del'>-	return !(fsopt-&gt;mds_namespace &amp;&amp;</div><div class='del'>-		 (strlen(fsopt-&gt;mds_namespace) != len ||</div><div class='del'>-		  strncmp(fsopt-&gt;mds_namespace, namespace, len)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ceph_parse_old_source(const char *dev_name, const char *dev_name_end,</div><div class='ctx'> 				 struct fs_context *fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -284,8 +271,10 @@ static int ceph_parse_new_source(const char *dev_name, const char *dev_name_end,</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	struct ceph_fsid fsid;</div><div class='ctx'> 	struct ceph_parse_opts_ctx *pctx = fc-&gt;fs_private;</div><div class='add'>+	struct ceph_options *opts = pctx-&gt;copts;</div><div class='ctx'> 	struct ceph_mount_options *fsopt = pctx-&gt;opts;</div><div class='del'>-	char *fsid_start, *fs_name_start;</div><div class='add'>+	const char *name_start = dev_name;</div><div class='add'>+	const char *fsid_start, *fs_name_start;</div><div class='ctx'> </div><div class='ctx'> 	if (*dev_name_end != '=') {</div><div class='ctx'> 		dout("separator '=' missing in source");</div><div class='hunk'>@@ -295,8 +284,14 @@ static int ceph_parse_new_source(const char *dev_name, const char *dev_name_end,</div><div class='ctx'> 	fsid_start = strchr(dev_name, '@');</div><div class='ctx'> 	if (!fsid_start)</div><div class='ctx'> 		return invalfc(fc, "missing cluster fsid");</div><div class='del'>-	++fsid_start; /* start of cluster fsid */</div><div class='add'>+	len = fsid_start - name_start;</div><div class='add'>+	kfree(opts-&gt;name);</div><div class='add'>+	opts-&gt;name = kstrndup(name_start, len, GFP_KERNEL);</div><div class='add'>+	if (!opts-&gt;name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dout("using %s entity name", opts-&gt;name);</div><div class='ctx'> </div><div class='add'>+	++fsid_start; /* start of cluster fsid */</div><div class='ctx'> 	fs_name_start = strchr(fsid_start, '.');</div><div class='ctx'> 	if (!fs_name_start)</div><div class='ctx'> 		return invalfc(fc, "missing file system name");</div><div class='hunk'>@@ -422,6 +417,8 @@ static int ceph_parse_mount_param(struct fs_context *fc,</div><div class='ctx'> </div><div class='ctx'> 	switch (token) {</div><div class='ctx'> 	case Opt_snapdirname:</div><div class='add'>+		if (strlen(param-&gt;string) &gt; NAME_MAX)</div><div class='add'>+			return invalfc(fc, "snapdirname too long");</div><div class='ctx'> 		kfree(fsopt-&gt;snapdir_name);</div><div class='ctx'> 		fsopt-&gt;snapdir_name = param-&gt;string;</div><div class='ctx'> 		param-&gt;string = NULL;</div><div class='hunk'>@@ -851,7 +848,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt,</div><div class='ctx'> 	fsc-&gt;inode_wq = alloc_workqueue("ceph-inode", WQ_UNBOUND, 0);</div><div class='ctx'> 	if (!fsc-&gt;inode_wq)</div><div class='ctx'> 		goto fail_client;</div><div class='del'>-	fsc-&gt;cap_wq = alloc_workqueue("ceph-cap", 0, 1);</div><div class='add'>+	fsc-&gt;cap_wq = alloc_workqueue("ceph-cap", WQ_PERCPU, 1);</div><div class='ctx'> 	if (!fsc-&gt;cap_wq)</div><div class='ctx'> 		goto fail_inode_wq;</div><div class='ctx'> </div><div class='hunk'>@@ -928,40 +925,41 @@ static int __init init_caches(void)</div><div class='ctx'> 	ceph_inode_cachep = kmem_cache_create("ceph_inode_info",</div><div class='ctx'> 				      sizeof(struct ceph_inode_info),</div><div class='ctx'> 				      __alignof__(struct ceph_inode_info),</div><div class='del'>-				      SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-				      SLAB_ACCOUNT, ceph_inode_init_once);</div><div class='add'>+				      SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='add'>+				      ceph_inode_init_once);</div><div class='ctx'> 	if (!ceph_inode_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ceph_cap_cachep = KMEM_CACHE(ceph_cap, SLAB_MEM_SPREAD);</div><div class='add'>+	ceph_cap_cachep = KMEM_CACHE(ceph_cap, 0);</div><div class='ctx'> 	if (!ceph_cap_cachep)</div><div class='ctx'> 		goto bad_cap;</div><div class='del'>-	ceph_cap_snap_cachep = KMEM_CACHE(ceph_cap_snap, SLAB_MEM_SPREAD);</div><div class='add'>+	ceph_cap_snap_cachep = KMEM_CACHE(ceph_cap_snap, 0);</div><div class='ctx'> 	if (!ceph_cap_snap_cachep)</div><div class='ctx'> 		goto bad_cap_snap;</div><div class='ctx'> 	ceph_cap_flush_cachep = KMEM_CACHE(ceph_cap_flush,</div><div class='del'>-					   SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD);</div><div class='add'>+					   SLAB_RECLAIM_ACCOUNT);</div><div class='ctx'> 	if (!ceph_cap_flush_cachep)</div><div class='ctx'> 		goto bad_cap_flush;</div><div class='ctx'> </div><div class='ctx'> 	ceph_dentry_cachep = KMEM_CACHE(ceph_dentry_info,</div><div class='del'>-					SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD);</div><div class='add'>+					SLAB_RECLAIM_ACCOUNT);</div><div class='ctx'> 	if (!ceph_dentry_cachep)</div><div class='ctx'> 		goto bad_dentry;</div><div class='ctx'> </div><div class='del'>-	ceph_file_cachep = KMEM_CACHE(ceph_file_info, SLAB_MEM_SPREAD);</div><div class='add'>+	ceph_file_cachep = KMEM_CACHE(ceph_file_info, 0);</div><div class='ctx'> 	if (!ceph_file_cachep)</div><div class='ctx'> 		goto bad_file;</div><div class='ctx'> </div><div class='del'>-	ceph_dir_file_cachep = KMEM_CACHE(ceph_dir_file_info, SLAB_MEM_SPREAD);</div><div class='add'>+	ceph_dir_file_cachep = KMEM_CACHE(ceph_dir_file_info, 0);</div><div class='ctx'> 	if (!ceph_dir_file_cachep)</div><div class='ctx'> 		goto bad_dir_file;</div><div class='ctx'> </div><div class='del'>-	ceph_mds_request_cachep = KMEM_CACHE(ceph_mds_request, SLAB_MEM_SPREAD);</div><div class='add'>+	ceph_mds_request_cachep = KMEM_CACHE(ceph_mds_request, 0);</div><div class='ctx'> 	if (!ceph_mds_request_cachep)</div><div class='ctx'> 		goto bad_mds_req;</div><div class='ctx'> </div><div class='del'>-	ceph_wb_pagevec_pool = mempool_create_kmalloc_pool(10, CEPH_MAX_WRITE_SIZE &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	ceph_wb_pagevec_pool = mempool_create_kmalloc_pool(10,</div><div class='add'>+	    (CEPH_MAX_WRITE_SIZE &gt;&gt; PAGE_SHIFT) * sizeof(struct page *));</div><div class='ctx'> 	if (!ceph_wb_pagevec_pool)</div><div class='ctx'> 		goto bad_pagevec_pool;</div><div class='ctx'> </div><div class='hunk'>@@ -1021,8 +1019,7 @@ void ceph_umount_begin(struct super_block *sb)</div><div class='ctx'> 	struct ceph_fs_client *fsc = ceph_sb_to_fs_client(sb);</div><div class='ctx'> </div><div class='ctx'> 	doutc(fsc-&gt;client, "starting forced umount\n");</div><div class='del'>-	if (!fsc)</div><div class='del'>-		return;</div><div class='add'>+</div><div class='ctx'> 	fsc-&gt;mount_state = CEPH_MOUNT_SHUTDOWN;</div><div class='ctx'> 	__ceph_umount_begin(fsc);</div><div class='ctx'> }</div><div class='hunk'>@@ -1031,7 +1028,7 @@ static const struct super_operations ceph_super_ops = {</div><div class='ctx'> 	.alloc_inode	= ceph_alloc_inode,</div><div class='ctx'> 	.free_inode	= ceph_free_inode,</div><div class='ctx'> 	.write_inode    = ceph_write_inode,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.evict_inode	= ceph_evict_inode,</div><div class='ctx'> 	.sync_fs        = ceph_sync_fs,</div><div class='ctx'> 	.put_super	= ceph_put_super,</div><div class='hunk'>@@ -1152,7 +1149,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,</div><div class='ctx'> 		const char *path = fsc-&gt;mount_options-&gt;server_path ?</div><div class='ctx'> 				     fsc-&gt;mount_options-&gt;server_path + 1 : "";</div><div class='ctx'> </div><div class='del'>-		err = __ceph_open_session(fsc-&gt;client, started);</div><div class='add'>+		err = __ceph_open_session(fsc-&gt;client);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1208,13 +1205,14 @@ static int ceph_set_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> 	fsc-&gt;max_file_size = 1ULL &lt;&lt; 40; /* temp value until we get mdsmap */</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;s_op = &amp;ceph_super_ops;</div><div class='del'>-	s-&gt;s_d_op = &amp;ceph_dentry_ops;</div><div class='add'>+	set_default_d_op(s, &amp;ceph_dentry_ops);</div><div class='ctx'> 	s-&gt;s_export_op = &amp;ceph_export_ops;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;s_time_gran = 1;</div><div class='ctx'> 	s-&gt;s_time_min = 0;</div><div class='ctx'> 	s-&gt;s_time_max = U32_MAX;</div><div class='ctx'> 	s-&gt;s_flags |= SB_NODIRATIME | SB_NOATIME;</div><div class='add'>+	s-&gt;s_magic = CEPH_SUPER_MAGIC;</div><div class='ctx'> </div><div class='ctx'> 	ceph_fscrypt_set_ops(s);</div><div class='ctx'> </div><div class='hunk'>@@ -1551,6 +1549,17 @@ static void ceph_kill_sb(struct super_block *s)</div><div class='ctx'> 	 */</div><div class='ctx'> 	sync_filesystem(s);</div><div class='ctx'> </div><div class='add'>+	if (atomic64_read(&amp;mdsc-&gt;dirty_folios) &gt; 0) {</div><div class='add'>+		wait_queue_head_t *wq = &amp;mdsc-&gt;flush_end_wq;</div><div class='add'>+		long timeleft = wait_event_killable_timeout(*wq,</div><div class='add'>+					atomic64_read(&amp;mdsc-&gt;dirty_folios) &lt;= 0,</div><div class='add'>+					fsc-&gt;client-&gt;options-&gt;mount_timeout);</div><div class='add'>+		if (!timeleft) /* timed out */</div><div class='add'>+			pr_warn_client(cl, "umount timed out, %ld\n", timeleft);</div><div class='add'>+		else if (timeleft &lt; 0) /* killed */</div><div class='add'>+			pr_warn_client(cl, "umount was killed, %ld\n", timeleft);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;mdsc-&gt;stopping_lock);</div><div class='ctx'> 	mdsc-&gt;stopping = CEPH_MDSC_STOPPING_FLUSHING;</div><div class='ctx'> 	wait = !!atomic_read(&amp;mdsc-&gt;stopping_blockers);</div><div class='head'>diff --git a/fs/ceph/super.h b/fs/ceph/super.h<br/>index b06e2bc86221..a1f781c46b41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/super.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/super.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/super.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/super.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/ceph/ceph_debug.h&gt;</div><div class='ctx'> #include &lt;linux/ceph/osd_client.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='hunk'>@@ -60,7 +60,7 @@</div><div class='ctx'> </div><div class='ctx'> /* max size of osd read request, limited by libceph */</div><div class='ctx'> #define CEPH_MAX_READ_SIZE              CEPH_MSG_MAX_DATA_LEN</div><div class='del'>-/* osd has a configurable limitaion of max write size.</div><div class='add'>+/* osd has a configurable limitation of max write size.</div><div class='ctx'>  * CEPH_MSG_MAX_DATA_LEN should be small enough. */</div><div class='ctx'> #define CEPH_MAX_WRITE_SIZE		CEPH_MSG_MAX_DATA_LEN</div><div class='ctx'> #define CEPH_RASIZE_DEFAULT             (8192*1024)    /* max readahead */</div><div class='hunk'>@@ -104,6 +104,20 @@ struct ceph_mount_options {</div><div class='ctx'> 	struct fscrypt_dummy_policy dummy_enc_policy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check if the mds namespace in ceph_mount_options matches</div><div class='add'>+ * the passed in namespace string. First time match (when</div><div class='add'>+ * -&gt;mds_namespace is NULL) is treated specially, since</div><div class='add'>+ * -&gt;mds_namespace needs to be initialized by the caller.</div><div class='add'>+ */</div><div class='add'>+static inline int namespace_equals(struct ceph_mount_options *fsopt,</div><div class='add'>+				   const char *namespace, size_t len)</div><div class='add'>+{</div><div class='add'>+	return !(fsopt-&gt;mds_namespace &amp;&amp;</div><div class='add'>+		 (strlen(fsopt-&gt;mds_namespace) != len ||</div><div class='add'>+		  strncmp(fsopt-&gt;mds_namespace, namespace, len)));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* mount state */</div><div class='ctx'> enum {</div><div class='ctx'> 	CEPH_MOUNT_MOUNTING,</div><div class='hunk'>@@ -200,9 +214,10 @@ struct ceph_cap {</div><div class='ctx'> 	struct list_head caps_item;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CHECK_CAPS_AUTHONLY   1  /* only check auth cap */</div><div class='del'>-#define CHECK_CAPS_FLUSH      2  /* flush any dirty caps */</div><div class='del'>-#define CHECK_CAPS_NOINVAL    4  /* don't invalidate pagecache */</div><div class='add'>+#define CHECK_CAPS_AUTHONLY     1  /* only check auth cap */</div><div class='add'>+#define CHECK_CAPS_FLUSH        2  /* flush any dirty caps */</div><div class='add'>+#define CHECK_CAPS_NOINVAL      4  /* don't invalidate pagecache */</div><div class='add'>+#define CHECK_CAPS_FLUSH_FORCE  8  /* force flush any caps */</div><div class='ctx'> </div><div class='ctx'> struct ceph_cap_flush {</div><div class='ctx'> 	u64 tid;</div><div class='hunk'>@@ -462,6 +477,7 @@ struct ceph_inode_info {</div><div class='ctx'> 	unsigned long  i_work_mask;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	struct fscrypt_inode_info *i_crypt_info;</div><div class='ctx'> 	u32 fscrypt_auth_len;</div><div class='ctx'> 	u32 fscrypt_file_len;</div><div class='ctx'> 	u8 *fscrypt_auth;</div><div class='hunk'>@@ -637,7 +653,8 @@ static inline struct inode *ceph_find_inode(struct super_block *sb,</div><div class='ctx'> #define CEPH_I_FLUSH_SNAPS	(1 &lt;&lt; 8)  /* need flush snapss */</div><div class='ctx'> #define CEPH_I_ERROR_WRITE	(1 &lt;&lt; 9) /* have seen write errors */</div><div class='ctx'> #define CEPH_I_ERROR_FILELOCK	(1 &lt;&lt; 10) /* have seen file lock errors */</div><div class='del'>-#define CEPH_I_ODIRECT		(1 &lt;&lt; 11) /* inode in direct I/O mode */</div><div class='add'>+#define CEPH_I_ODIRECT_BIT	(11) /* inode in direct I/O mode */</div><div class='add'>+#define CEPH_I_ODIRECT		(1 &lt;&lt; CEPH_I_ODIRECT_BIT)</div><div class='ctx'> #define CEPH_ASYNC_CREATE_BIT	(12)	  /* async create in flight for this */</div><div class='ctx'> #define CEPH_I_ASYNC_CREATE	(1 &lt;&lt; CEPH_ASYNC_CREATE_BIT)</div><div class='ctx'> #define CEPH_I_SHUTDOWN		(1 &lt;&lt; 13) /* inode is no longer usable */</div><div class='hunk'>@@ -795,7 +812,6 @@ extern int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask,</div><div class='ctx'> </div><div class='ctx'> extern int __ceph_caps_revoking_other(struct ceph_inode_info *ci,</div><div class='ctx'> 				      struct ceph_cap *ocap, int mask);</div><div class='del'>-extern int ceph_caps_revoking(struct ceph_inode_info *ci, int mask);</div><div class='ctx'> extern int __ceph_caps_used(struct ceph_inode_info *ci);</div><div class='ctx'> </div><div class='ctx'> static inline bool __ceph_is_file_opened(struct ceph_inode_info *ci)</div><div class='hunk'>@@ -903,7 +919,7 @@ ceph_find_rw_context(struct ceph_file_info *cf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ceph_readdir_cache_control {</div><div class='del'>-	struct page  *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct dentry **dentries;</div><div class='ctx'> 	int index;</div><div class='ctx'> };</div><div class='hunk'>@@ -1055,8 +1071,6 @@ extern int ceph_fill_trace(struct super_block *sb,</div><div class='ctx'> extern int ceph_readdir_prepopulate(struct ceph_mds_request *req,</div><div class='ctx'> 				    struct ceph_mds_session *session);</div><div class='ctx'> </div><div class='del'>-extern int ceph_inode_holds_cap(struct inode *inode, int mask);</div><div class='del'>-</div><div class='ctx'> extern bool ceph_inode_set_size(struct inode *inode, loff_t size);</div><div class='ctx'> extern void __ceph_do_pending_vmtruncate(struct inode *inode);</div><div class='ctx'> </div><div class='hunk'>@@ -1134,8 +1148,7 @@ struct ceph_acl_sec_ctx {</div><div class='ctx'> 	void *acl;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_CEPH_FS_SECURITY_LABEL</div><div class='del'>-	void *sec_ctx;</div><div class='del'>-	u32 sec_ctxlen;</div><div class='add'>+	struct lsm_context lsmctx;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='ctx'> 	struct ceph_fscrypt_auth *fscrypt_auth;</div><div class='hunk'>@@ -1207,10 +1220,6 @@ static inline void ceph_init_inode_acls(struct inode *inode,</div><div class='ctx'> 					struct ceph_acl_sec_ctx *as_ctx)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline int ceph_acl_chmod(struct dentry *dentry, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline void ceph_forget_all_cached_acls(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1255,8 +1264,6 @@ extern void ceph_take_cap_refs(struct ceph_inode_info *ci, int caps,</div><div class='ctx'> extern void ceph_get_cap_refs(struct ceph_inode_info *ci, int caps);</div><div class='ctx'> extern void ceph_put_cap_refs(struct ceph_inode_info *ci, int had);</div><div class='ctx'> extern void ceph_put_cap_refs_async(struct ceph_inode_info *ci, int had);</div><div class='del'>-extern void ceph_put_cap_refs_no_check_caps(struct ceph_inode_info *ci,</div><div class='del'>-					    int had);</div><div class='ctx'> extern void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,</div><div class='ctx'> 				       struct ceph_snap_context *snapc);</div><div class='ctx'> extern void __ceph_remove_capsnap(struct inode *inode,</div><div class='hunk'>@@ -1271,6 +1278,7 @@ extern bool __ceph_should_report_size(struct ceph_inode_info *ci);</div><div class='ctx'> extern void ceph_check_caps(struct ceph_inode_info *ci, int flags);</div><div class='ctx'> extern unsigned long ceph_check_delayed_caps(struct ceph_mds_client *mdsc);</div><div class='ctx'> extern void ceph_flush_dirty_caps(struct ceph_mds_client *mdsc);</div><div class='add'>+extern void ceph_flush_cap_releases(struct ceph_mds_client *mdsc);</div><div class='ctx'> extern int  ceph_drop_caps_for_unlink(struct inode *inode);</div><div class='ctx'> extern int ceph_encode_inode_release(void **p, struct inode *inode,</div><div class='ctx'> 				     int mds, int drop, int unless, int force);</div><div class='hunk'>@@ -1294,7 +1302,7 @@ extern void __ceph_touch_fmode(struct ceph_inode_info *ci,</div><div class='ctx'> /* addr.c */</div><div class='ctx'> extern const struct address_space_operations ceph_aops;</div><div class='ctx'> extern const struct netfs_request_ops ceph_netfs_ops;</div><div class='del'>-extern int ceph_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='add'>+int ceph_mmap_prepare(struct vm_area_desc *desc);</div><div class='ctx'> extern int ceph_uninline_data(struct file *file);</div><div class='ctx'> extern int ceph_pool_perm_check(struct inode *inode, int need);</div><div class='ctx'> extern void ceph_pool_perm_destroy(struct ceph_mds_client* mdsc);</div><div class='head'>diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c<br/>index e066a556eccb..ad1f30bea175 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ceph/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ceph/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ceph/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ceph/xattr.c</a></div><div class='hunk'>@@ -249,8 +249,7 @@ static ssize_t ceph_vxattrcb_dir_rbytes(struct ceph_inode_info *ci, char *val,</div><div class='ctx'> static ssize_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,</div><div class='ctx'> 					size_t size)</div><div class='ctx'> {</div><div class='del'>-	return ceph_fmt_xattr(val, size, "%lld.%09ld", ci-&gt;i_rctime.tv_sec,</div><div class='del'>-				ci-&gt;i_rctime.tv_nsec);</div><div class='add'>+	return ceph_fmt_xattr(val, size, "%ptSp", &amp;ci-&gt;i_rctime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* dir pin */</div><div class='hunk'>@@ -307,8 +306,7 @@ static bool ceph_vxattrcb_snap_btime_exists(struct ceph_inode_info *ci)</div><div class='ctx'> static ssize_t ceph_vxattrcb_snap_btime(struct ceph_inode_info *ci, char *val,</div><div class='ctx'> 					size_t size)</div><div class='ctx'> {</div><div class='del'>-	return ceph_fmt_xattr(val, size, "%lld.%09ld", ci-&gt;i_snap_btime.tv_sec,</div><div class='del'>-				ci-&gt;i_snap_btime.tv_nsec);</div><div class='add'>+	return ceph_fmt_xattr(val, size, "%ptSp", &amp;ci-&gt;i_snap_btime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ceph_vxattrcb_cluster_fsid(struct ceph_inode_info *ci,</div><div class='hunk'>@@ -899,7 +897,7 @@ static int __get_required_blob_size(struct ceph_inode_info *ci, int name_size,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * If there are dirty xattrs, reencode xattrs into the prealloc_blob</div><div class='add'>+ * If there are dirty xattrs, re-encode xattrs into the prealloc_blob</div><div class='ctx'>  * and swap into place.  It returns the old i_xattrs.blob (or NULL) so</div><div class='ctx'>  * that it can be freed by the caller as the i_ceph_lock is likely to be</div><div class='ctx'>  * held.</div><div class='hunk'>@@ -1383,8 +1381,7 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = security_dentry_init_security(dentry, mode, &amp;dentry-&gt;d_name,</div><div class='del'>-					    &amp;name, &amp;as_ctx-&gt;sec_ctx,</div><div class='del'>-					    &amp;as_ctx-&gt;sec_ctxlen);</div><div class='add'>+					    &amp;name, &amp;as_ctx-&gt;lsmctx);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		WARN_ON_ONCE(err != -EOPNOTSUPP);</div><div class='ctx'> 		err = 0; /* do nothing */</div><div class='hunk'>@@ -1409,7 +1406,7 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	name_len = strlen(name);</div><div class='ctx'> 	err = ceph_pagelist_reserve(pagelist,</div><div class='del'>-				    4 * 2 + name_len + as_ctx-&gt;sec_ctxlen);</div><div class='add'>+				    4 * 2 + name_len + as_ctx-&gt;lsmctx.len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1432,8 +1429,9 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,</div><div class='ctx'> 	ceph_pagelist_encode_32(pagelist, name_len);</div><div class='ctx'> 	ceph_pagelist_append(pagelist, name, name_len);</div><div class='ctx'> </div><div class='del'>-	ceph_pagelist_encode_32(pagelist, as_ctx-&gt;sec_ctxlen);</div><div class='del'>-	ceph_pagelist_append(pagelist, as_ctx-&gt;sec_ctx, as_ctx-&gt;sec_ctxlen);</div><div class='add'>+	ceph_pagelist_encode_32(pagelist, as_ctx-&gt;lsmctx.len);</div><div class='add'>+	ceph_pagelist_append(pagelist, as_ctx-&gt;lsmctx.context,</div><div class='add'>+			     as_ctx-&gt;lsmctx.len);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -1451,7 +1449,7 @@ void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx)</div><div class='ctx'> 	posix_acl_release(as_ctx-&gt;default_acl);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_CEPH_FS_SECURITY_LABEL</div><div class='del'>-	security_release_secctx(as_ctx-&gt;sec_ctx, as_ctx-&gt;sec_ctxlen);</div><div class='add'>+	security_release_secctx(&amp;as_ctx-&gt;lsmctx);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='ctx'> 	kfree(as_ctx-&gt;fscrypt_auth);</div><div class='head'>diff --git a/fs/char_dev.c b/fs/char_dev.c<br/>index 57cc096c498a..c2ddb998f3c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/char_dev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/char_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/char_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/char_dev.c</a></div><div class='hunk'>@@ -562,8 +562,8 @@ int cdev_device_add(struct cdev *cdev, struct device *dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cdev_device_del() - inverse of cdev_device_add</div><div class='del'>- * @dev: the device structure</div><div class='ctx'>  * @cdev: the cdev structure</div><div class='add'>+ * @dev: the device structure</div><div class='ctx'>  *</div><div class='ctx'>  * cdev_device_del() is a helper function to call cdev_del and device_del.</div><div class='ctx'>  * It should be used whenever cdev_device_add is used.</div><div class='head'>diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c<br/>index 62a3d2565c26..70bb0579b40c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coda/cnode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/cnode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coda/cnode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coda/cnode.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ retry:</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		cii = ITOC(inode);</div><div class='ctx'> 		/* we still need to set i_ino for things like stat(2) */</div><div class='ctx'> 		inode-&gt;i_ino = hash;</div><div class='hunk'>@@ -148,7 +148,7 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	/* we should never see newly created inodes because we intentionally</div><div class='ctx'> 	 * fail in the initialization callback */</div><div class='del'>-	BUG_ON(inode-&gt;i_state &amp; I_NEW);</div><div class='add'>+	BUG_ON(inode_state_read_once(inode) &amp; I_NEW);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/coda/dir.c b/fs/coda/dir.c<br/>index 4e552ba7bd43..ca9990017265 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coda/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coda/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coda/dir.c</a></div><div class='hunk'>@@ -166,8 +166,8 @@ err_out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int coda_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *de, umode_t mode)</div><div class='add'>+static struct dentry *coda_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *de, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct coda_vattr attrs;</div><div class='hunk'>@@ -177,14 +177,14 @@ static int coda_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	struct CodaFid newfid;</div><div class='ctx'> </div><div class='ctx'> 	if (is_root_inode(dir) &amp;&amp; coda_iscontrol(name, len))</div><div class='del'>-		return -EPERM;</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='ctx'> 	attrs.va_mode = mode;</div><div class='del'>-	error = venus_mkdir(dir-&gt;i_sb, coda_i2f(dir), </div><div class='add'>+	error = venus_mkdir(dir-&gt;i_sb, coda_i2f(dir),</div><div class='ctx'> 			       name, len, &amp;newfid, &amp;attrs);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto err_out;</div><div class='del'>-         </div><div class='add'>+</div><div class='ctx'> 	inode = coda_iget(dir-&gt;i_sb, &amp;newfid, &amp;attrs);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		error = PTR_ERR(inode);</div><div class='hunk'>@@ -195,10 +195,10 @@ static int coda_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	coda_dir_inc_nlink(dir);</div><div class='ctx'> 	coda_dir_update_mtime(dir);</div><div class='ctx'> 	d_instantiate(de, inode);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> err_out:</div><div class='ctx'> 	d_drop(de);</div><div class='del'>-	return error;</div><div class='add'>+	return ERR_PTR(error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* try to make de an entry in dir_inodde linked to source_de */ </div><div class='hunk'>@@ -429,23 +429,16 @@ static int coda_readdir(struct file *coda_file, struct dir_context *ctx)</div><div class='ctx'> 	cfi = coda_ftoc(coda_file);</div><div class='ctx'> 	host_file = cfi-&gt;cfi_container;</div><div class='ctx'> </div><div class='del'>-	if (host_file-&gt;f_op-&gt;iterate_shared) {</div><div class='del'>-		struct inode *host_inode = file_inode(host_file);</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		if (!IS_DEADDIR(host_inode)) {</div><div class='del'>-			inode_lock_shared(host_inode);</div><div class='del'>-			ret = host_file-&gt;f_op-&gt;iterate_shared(host_file, ctx);</div><div class='del'>-			file_accessed(host_file);</div><div class='del'>-			inode_unlock_shared(host_inode);</div><div class='del'>-		}</div><div class='add'>+	ret = iterate_dir(host_file, ctx);</div><div class='add'>+	if (ret != -ENOTDIR)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> 	/* Venus: we must read Venus dirents from a file */</div><div class='ctx'> 	return coda_venus_readdir(coda_file, ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called when a cache lookup succeeds */</div><div class='del'>-static int coda_dentry_revalidate(struct dentry *de, unsigned int flags)</div><div class='add'>+static int coda_dentry_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				  struct dentry *de, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct coda_inode_info *cii;</div><div class='head'>diff --git a/fs/coda/file.c b/fs/coda/file.c<br/>index 148856a582a9..a390b5d21196 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coda/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coda/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coda/file.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)</div><div class='ctx'> 	size_t count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!host_file-&gt;f_op-&gt;mmap)</div><div class='add'>+	if (!can_mmap_file(host_file))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(coda_file != vma-&gt;vm_file))</div><div class='hunk'>@@ -199,10 +199,10 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)</div><div class='ctx'> 	spin_unlock(&amp;cii-&gt;c_lock);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_file = get_file(host_file);</div><div class='del'>-	ret = call_mmap(vma-&gt;vm_file, vma);</div><div class='add'>+	ret = vfs_mmap(vma-&gt;vm_file, vma);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		/* if call_mmap fails, our caller will put host_file so we</div><div class='add'>+		/* if vfs_mmap fails, our caller will put host_file so we</div><div class='ctx'> 		 * should drop the reference to the coda_file that we got.</div><div class='ctx'> 		 */</div><div class='ctx'> 		fput(coda_file);</div><div class='head'>diff --git a/fs/coda/inode.c b/fs/coda/inode.c<br/>index 0c7c2528791e..08450d006016 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coda/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coda/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coda/inode.c</a></div><div class='hunk'>@@ -24,6 +24,8 @@</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/coda.h&gt;</div><div class='hunk'>@@ -70,8 +72,8 @@ int __init coda_init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	coda_inode_cachep = kmem_cache_create("coda_inode_cache",</div><div class='ctx'> 				sizeof(struct coda_inode_info), 0,</div><div class='del'>-				SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-				SLAB_ACCOUNT, init_once);</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='add'>+				init_once);</div><div class='ctx'> 	if (coda_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -87,10 +89,10 @@ void coda_destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(coda_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int coda_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int coda_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_NOATIME;</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	fc-&gt;sb_flags |= SB_NOATIME;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,78 +104,119 @@ static const struct super_operations coda_super_operations =</div><div class='ctx'> 	.evict_inode	= coda_evict_inode,</div><div class='ctx'> 	.put_super	= coda_put_super,</div><div class='ctx'> 	.statfs		= coda_statfs,</div><div class='del'>-	.remount_fs	= coda_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int get_device_index(struct coda_mount_data *data)</div><div class='add'>+struct coda_fs_context {</div><div class='add'>+	int	idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	Opt_fd,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec coda_param_specs[] = {</div><div class='add'>+	fsparam_fd	("fd",	Opt_fd),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int coda_set_idx(struct fs_context *fc, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='add'>+	struct coda_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	if (data == NULL) {</div><div class='del'>-		pr_warn("%s: Bad mount data\n", __func__);</div><div class='del'>-		return -1;</div><div class='add'>+	inode = file_inode(file);</div><div class='add'>+	if (!S_ISCHR(inode-&gt;i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) {</div><div class='add'>+		return invalf(fc, "coda: Not coda psdev");</div><div class='ctx'> 	}</div><div class='add'>+	idx = iminor(inode);</div><div class='add'>+	if (idx &lt; 0 || idx &gt;= MAX_CODADEVS)</div><div class='add'>+		return invalf(fc, "coda: Bad minor number");</div><div class='add'>+	ctx-&gt;idx = idx;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;version != CODA_MOUNT_VERSION) {</div><div class='del'>-		pr_warn("%s: Bad mount version\n", __func__);</div><div class='del'>-		return -1;</div><div class='add'>+static int coda_parse_fd(struct fs_context *fc, struct fs_parameter *param,</div><div class='add'>+			 struct fs_parse_result *result)</div><div class='add'>+{</div><div class='add'>+	struct file *file;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (param-&gt;type == fs_value_is_file) {</div><div class='add'>+		file = param-&gt;file;</div><div class='add'>+		param-&gt;file = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		file = fget(result-&gt;uint_32);</div><div class='ctx'> 	}</div><div class='add'>+	if (!file)</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	f = fdget(data-&gt;fd);</div><div class='del'>-	if (!f.file)</div><div class='del'>-		goto Ebadf;</div><div class='del'>-	inode = file_inode(f.file);</div><div class='del'>-	if (!S_ISCHR(inode-&gt;i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) {</div><div class='del'>-		fdput(f);</div><div class='del'>-		goto Ebadf;</div><div class='del'>-	}</div><div class='add'>+	err = coda_set_idx(fc, file);</div><div class='add'>+	fput(file);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	idx = iminor(inode);</div><div class='del'>-	fdput(f);</div><div class='add'>+static int coda_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, coda_param_specs, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='ctx'> </div><div class='del'>-	if (idx &lt; 0 || idx &gt;= MAX_CODADEVS) {</div><div class='del'>-		pr_warn("%s: Bad minor number\n", __func__);</div><div class='del'>-		return -1;</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_fd:</div><div class='add'>+		return coda_parse_fd(fc, param, &amp;result);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return idx;</div><div class='del'>-Ebadf:</div><div class='del'>-	pr_warn("%s: Bad file\n", __func__);</div><div class='del'>-	return -1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int coda_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+/*</div><div class='add'>+ * Parse coda's binary mount data form.  We ignore any errors and go with index</div><div class='add'>+ * 0 if we get one for backward compatibility.</div><div class='add'>+ */</div><div class='add'>+static int coda_parse_monolithic(struct fs_context *fc, void *_data)</div><div class='ctx'> {</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct coda_mount_data *data = _data;</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return invalf(fc, "coda: Bad mount data");</div><div class='add'>+</div><div class='add'>+	if (data-&gt;version != CODA_MOUNT_VERSION)</div><div class='add'>+		return invalf(fc, "coda: Bad mount version");</div><div class='add'>+</div><div class='add'>+	file = fget(data-&gt;fd);</div><div class='add'>+	if (file) {</div><div class='add'>+		coda_set_idx(fc, file);</div><div class='add'>+		fput(file);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int coda_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct coda_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct inode *root = NULL;</div><div class='ctx'> 	struct venus_comm *vc;</div><div class='ctx'> 	struct CodaFid fid;</div><div class='ctx'> 	int error;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	if (task_active_pid_ns(current) != &amp;init_pid_ns)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	idx = get_device_index((struct coda_mount_data *) data);</div><div class='ctx'> </div><div class='del'>-	/* Ignore errors in data, for backward compatibility */</div><div class='del'>-	if(idx == -1)</div><div class='del'>-		idx = 0;</div><div class='del'>-	</div><div class='del'>-	pr_info("%s: device index: %i\n", __func__,  idx);</div><div class='add'>+	infof(fc, "coda: device index: %i\n", ctx-&gt;idx);</div><div class='ctx'> </div><div class='del'>-	vc = &amp;coda_comms[idx];</div><div class='add'>+	vc = &amp;coda_comms[ctx-&gt;idx];</div><div class='ctx'> 	mutex_lock(&amp;vc-&gt;vc_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!vc-&gt;vc_inuse) {</div><div class='del'>-		pr_warn("%s: No pseudo device\n", __func__);</div><div class='add'>+		errorf(fc, "coda: No pseudo device");</div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vc-&gt;vc_sb) {</div><div class='del'>-		pr_warn("%s: Device already mounted\n", __func__);</div><div class='add'>+		errorf(fc, "coda: Device already mounted");</div><div class='ctx'> 		error = -EBUSY;</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +230,7 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = 12;</div><div class='ctx'> 	sb-&gt;s_magic = CODA_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op = &amp;coda_super_operations;</div><div class='del'>-	sb-&gt;s_d_op = &amp;coda_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;coda_dentry_operations);</div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='ctx'> 	sb-&gt;s_time_min = S64_MIN;</div><div class='ctx'> 	sb-&gt;s_time_max = S64_MAX;</div><div class='hunk'>@@ -313,18 +356,45 @@ static int coda_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	return 0; </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* init_coda: used by filesystems.c to register coda */</div><div class='add'>+static int coda_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	if (task_active_pid_ns(current) != &amp;init_pid_ns)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return get_tree_nodev(fc, coda_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void coda_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations coda_context_ops = {</div><div class='add'>+	.free		= coda_free_fc,</div><div class='add'>+	.parse_param	= coda_parse_param,</div><div class='add'>+	.parse_monolithic = coda_parse_monolithic,</div><div class='add'>+	.get_tree	= coda_get_tree,</div><div class='add'>+	.reconfigure	= coda_reconfigure,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct dentry *coda_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int coda_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_nodev(fs_type, flags, data, coda_fill_super);</div><div class='add'>+	struct coda_fs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct coda_fs_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;coda_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file_system_type coda_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "coda",</div><div class='del'>-	.mount		= coda_mount,</div><div class='add'>+	.init_fs_context = coda_init_fs_context,</div><div class='add'>+	.parameters	= coda_param_specs,</div><div class='ctx'> 	.kill_sb	= kill_anon_super,</div><div class='ctx'> 	.fs_flags	= FS_BINARY_MOUNTDATA,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c<br/>index ccdbec388091..40f84d014524 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coda/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coda/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coda/symlink.c</a></div><div class='hunk'>@@ -31,15 +31,7 @@ static int coda_symlink_filler(struct file *file, struct folio *folio)</div><div class='ctx'> 	cii = ITOC(inode);</div><div class='ctx'> </div><div class='ctx'> 	error = venus_readlink(inode-&gt;i_sb, &amp;cii-&gt;c_fid, p, &amp;len);</div><div class='del'>-	if (error)</div><div class='del'>-		goto fail;</div><div class='del'>-	folio_mark_uptodate(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	folio_set_error(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='add'>+	folio_end_read(folio, error == 0);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c<br/>index 9f2d5743e2c8..0df46f09b6cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coda/sysctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coda/sysctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coda/sysctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coda/sysctl.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *fs_table_header;</div><div class='ctx'> </div><div class='del'>-static struct ctl_table coda_table[] = {</div><div class='add'>+static const struct ctl_table coda_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "timeout",</div><div class='ctx'> 		.data		= &amp;coda_timeout,</div><div class='head'>diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c<br/>index 8f0af4f62631..d5ef5469e4e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/compat_binfmt_elf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/compat_binfmt_elf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/compat_binfmt_elf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/compat_binfmt_elf.c</a></div><div class='hunk'>@@ -80,6 +80,16 @@</div><div class='ctx'> #define	ELF_HWCAP2		COMPAT_ELF_HWCAP2</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef	COMPAT_ELF_HWCAP3</div><div class='add'>+#undef	ELF_HWCAP3</div><div class='add'>+#define	ELF_HWCAP3		COMPAT_ELF_HWCAP3</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef	COMPAT_ELF_HWCAP4</div><div class='add'>+#undef	ELF_HWCAP4</div><div class='add'>+#define	ELF_HWCAP4		COMPAT_ELF_HWCAP4</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef	COMPAT_ARCH_DLINFO</div><div class='ctx'> #undef	ARCH_DLINFO</div><div class='ctx'> #define	ARCH_DLINFO		COMPAT_ARCH_DLINFO</div><div class='head'>diff --git a/fs/configfs/Kconfig b/fs/configfs/Kconfig<br/>index 272b64456999..1fcd761fe7be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config CONFIGFS_FS</div><div class='ctx'> 	tristate "Userspace-driven configuration filesystem"</div><div class='del'>-	select SYSFS</div><div class='ctx'> 	help</div><div class='ctx'> 	  configfs is a RAM-based filesystem that provides the converse</div><div class='ctx'> 	  of sysfs's functionality. Where sysfs is a filesystem-based</div><div class='head'>diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h<br/>index e710a1782382..0b969d0eb8ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/configfs_internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/configfs_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/configfs_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/configfs_internal.h</a></div><div class='hunk'>@@ -55,6 +55,8 @@ struct configfs_dirent {</div><div class='ctx'> #define CONFIGFS_USET_IN_MKDIR	0x0200</div><div class='ctx'> #define CONFIGFS_USET_CREATING	0x0400</div><div class='ctx'> #define CONFIGFS_NOT_PINNED	(CONFIGFS_ITEM_ATTR | CONFIGFS_ITEM_BIN_ATTR)</div><div class='add'>+#define CONFIGFS_PINNED \</div><div class='add'>+	(CONFIGFS_ROOT | CONFIGFS_DIR | CONFIGFS_ITEM_LINK)</div><div class='ctx'> </div><div class='ctx'> extern struct mutex configfs_symlink_mutex;</div><div class='ctx'> extern spinlock_t configfs_dirent_lock;</div><div class='hunk'>@@ -73,8 +75,6 @@ extern int configfs_make_dirent(struct configfs_dirent *, struct dentry *,</div><div class='ctx'> 				void *, umode_t, int, struct configfs_fragment *);</div><div class='ctx'> extern int configfs_dirent_is_ready(struct configfs_dirent *);</div><div class='ctx'> </div><div class='del'>-extern void configfs_hash_and_remove(struct dentry * dir, const char * name);</div><div class='del'>-</div><div class='ctx'> extern const unsigned char * configfs_get_name(struct configfs_dirent *sd);</div><div class='ctx'> extern void configfs_drop_dentry(struct configfs_dirent *sd, struct dentry *parent);</div><div class='ctx'> extern int configfs_setattr(struct mnt_idmap *idmap,</div><div class='head'>diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c<br/>index 18677cd4e62f..ba95f636a5ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/dir.c</a></div><div class='hunk'>@@ -67,7 +67,6 @@ static void configfs_d_iput(struct dentry * dentry,</div><div class='ctx'> </div><div class='ctx'> const struct dentry_operations configfs_dentry_ops = {</div><div class='ctx'> 	.d_iput		= configfs_d_iput,</div><div class='del'>-	.d_delete	= always_delete_dentry,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='hunk'>@@ -207,7 +206,17 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent *paren</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> 	sd-&gt;s_frag = get_fragment(frag);</div><div class='del'>-	list_add(&amp;sd-&gt;s_sibling, &amp;parent_sd-&gt;s_children);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * configfs_lookup scans only for unpinned items. s_children is</div><div class='add'>+	 * partitioned so that configfs_lookup can bail out early.</div><div class='add'>+	 * CONFIGFS_PINNED and CONFIGFS_NOT_PINNED are not symmetrical.  readdir</div><div class='add'>+	 * cursors still need to be inserted at the front of the list.</div><div class='add'>+	 */</div><div class='add'>+	if (sd-&gt;s_type &amp; CONFIGFS_PINNED)</div><div class='add'>+		list_add_tail(&amp;sd-&gt;s_sibling, &amp;parent_sd-&gt;s_children);</div><div class='add'>+	else</div><div class='add'>+		list_add(&amp;sd-&gt;s_sibling, &amp;parent_sd-&gt;s_children);</div><div class='ctx'> 	spin_unlock(&amp;configfs_dirent_lock);</div><div class='ctx'> </div><div class='ctx'> 	return sd;</div><div class='hunk'>@@ -220,10 +229,11 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent *paren</div><div class='ctx'>  *</div><div class='ctx'>  * called with parent inode's i_mutex held</div><div class='ctx'>  */</div><div class='del'>-static int configfs_dirent_exists(struct configfs_dirent *parent_sd,</div><div class='del'>-				  const unsigned char *new)</div><div class='add'>+static int configfs_dirent_exists(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct configfs_dirent * sd;</div><div class='add'>+	struct configfs_dirent *parent_sd = dentry-&gt;d_parent-&gt;d_fsdata;</div><div class='add'>+	const unsigned char *new = dentry-&gt;d_name.name;</div><div class='add'>+	struct configfs_dirent *sd;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(sd, &amp;parent_sd-&gt;s_children, s_sibling) {</div><div class='ctx'> 		if (sd-&gt;s_element) {</div><div class='hunk'>@@ -289,10 +299,6 @@ static int configfs_create_dir(struct config_item *item, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!item);</div><div class='ctx'> </div><div class='del'>-	error = configfs_dirent_exists(p-&gt;d_fsdata, dentry-&gt;d_name.name);</div><div class='del'>-	if (unlikely(error))</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='ctx'> 	error = configfs_make_dirent(p-&gt;d_fsdata, dentry, item, mode,</div><div class='ctx'> 				     CONFIGFS_DIR | CONFIGFS_USET_CREATING,</div><div class='ctx'> 				     frag);</div><div class='hunk'>@@ -394,8 +400,14 @@ static void remove_dir(struct dentry * d)</div><div class='ctx'> </div><div class='ctx'> 	configfs_remove_dirent(d);</div><div class='ctx'> </div><div class='del'>-	if (d_really_is_positive(d))</div><div class='del'>-		simple_rmdir(d_inode(parent),d);</div><div class='add'>+	if (d_really_is_positive(d)) {</div><div class='add'>+		if (likely(simple_empty(d))) {</div><div class='add'>+			__simple_rmdir(d_inode(parent),d);</div><div class='add'>+			dput(d);</div><div class='add'>+		} else {</div><div class='add'>+			pr_warn("remove_dir (%pd): attributes remain", d);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug(" o %pd removing done (%d)\n", d, d_count(d));</div><div class='ctx'> </div><div class='hunk'>@@ -451,6 +463,18 @@ static struct dentry * configfs_lookup(struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;configfs_dirent_lock);</div><div class='ctx'> 	list_for_each_entry(sd, &amp;parent_sd-&gt;s_children, s_sibling) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * s_children is partitioned, see configfs_new_dirent. The first</div><div class='add'>+		 * pinned item indicates we can stop scanning.</div><div class='add'>+		 */</div><div class='add'>+		if (sd-&gt;s_type &amp; CONFIGFS_PINNED)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Note: CONFIGFS_PINNED and CONFIGFS_NOT_PINNED are asymmetric.</div><div class='add'>+		 * there may be a readdir cursor in this list</div><div class='add'>+		 */</div><div class='ctx'> 		if ((sd-&gt;s_type &amp; CONFIGFS_NOT_PINNED) &amp;&amp;</div><div class='ctx'> 		    !strcmp(configfs_get_name(sd), dentry-&gt;d_name.name)) {</div><div class='ctx'> 			struct configfs_attribute *attr = sd-&gt;s_element;</div><div class='hunk'>@@ -580,6 +604,7 @@ static void detach_attrs(struct config_item * item)</div><div class='ctx'> static int populate_attrs(struct config_item *item)</div><div class='ctx'> {</div><div class='ctx'> 	const struct config_item_type *t = item-&gt;ci_type;</div><div class='add'>+	const struct configfs_group_operations *ops;</div><div class='ctx'> 	struct configfs_attribute *attr;</div><div class='ctx'> 	struct configfs_bin_attribute *bin_attr;</div><div class='ctx'> 	int error = 0;</div><div class='hunk'>@@ -587,14 +612,23 @@ static int populate_attrs(struct config_item *item)</div><div class='ctx'> </div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ops = t-&gt;ct_group_ops;</div><div class='add'>+</div><div class='ctx'> 	if (t-&gt;ct_attrs) {</div><div class='ctx'> 		for (i = 0; (attr = t-&gt;ct_attrs[i]) != NULL; i++) {</div><div class='add'>+			if (ops &amp;&amp; ops-&gt;is_visible &amp;&amp; !ops-&gt;is_visible(item, attr, i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			if ((error = configfs_create_file(item, attr)))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (t-&gt;ct_bin_attrs) {</div><div class='add'>+	if (!error &amp;&amp; t-&gt;ct_bin_attrs) {</div><div class='ctx'> 		for (i = 0; (bin_attr = t-&gt;ct_bin_attrs[i]) != NULL; i++) {</div><div class='add'>+			if (ops &amp;&amp; ops-&gt;is_bin_visible &amp;&amp; !ops-&gt;is_bin_visible(item, bin_attr, i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			error = configfs_create_bin_file(item, bin_attr);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -941,7 +975,7 @@ static void configfs_dump_one(struct configfs_dirent *sd, int level)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("%*s\"%s\":\n", level, " ", configfs_get_name(sd));</div><div class='ctx'> </div><div class='del'>-#define type_print(_type) if (sd-&gt;s_type &amp; _type) pr_info("%*s %s\n", level, " ", #_type);</div><div class='add'>+#define type_print(_type) if (sd-&gt;s_type &amp; _type) pr_info("%*s %s\n", level, " ", #_type)</div><div class='ctx'> 	type_print(CONFIGFS_ROOT);</div><div class='ctx'> 	type_print(CONFIGFS_DIR);</div><div class='ctx'> 	type_print(CONFIGFS_ITEM_ATTR);</div><div class='hunk'>@@ -1251,8 +1285,8 @@ out_root_unlock:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(configfs_depend_item_unlocked);</div><div class='ctx'> </div><div class='del'>-static int configfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			  struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *configfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				     struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int module_got = 0;</div><div class='hunk'>@@ -1432,7 +1466,7 @@ out_put:</div><div class='ctx'> 	put_fragment(frag);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int configfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='hunk'>@@ -1573,10 +1607,7 @@ static int configfs_dir_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	err = -ENOENT;</div><div class='ctx'> 	if (configfs_dirent_is_ready(parent_sd)) {</div><div class='ctx'> 		file-&gt;private_data = configfs_new_dirent(parent_sd, NULL, 0, NULL);</div><div class='del'>-		if (IS_ERR(file-&gt;private_data))</div><div class='del'>-			err = PTR_ERR(file-&gt;private_data);</div><div class='del'>-		else</div><div class='del'>-			err = 0;</div><div class='add'>+		err = PTR_ERR_OR_ZERO(file-&gt;private_data);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode_unlock(d_inode(dentry));</div><div class='ctx'> </div><div class='hunk'>@@ -1875,8 +1906,11 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)</div><div class='ctx'> 	if (dentry) {</div><div class='ctx'> 		d_add(dentry, NULL);</div><div class='ctx'> </div><div class='del'>-		err = configfs_attach_group(sd-&gt;s_element, &amp;group-&gt;cg_item,</div><div class='del'>-					    dentry, frag);</div><div class='add'>+		err = configfs_dirent_exists(dentry);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = configfs_attach_group(sd-&gt;s_element,</div><div class='add'>+						    &amp;group-&gt;cg_item,</div><div class='add'>+						    dentry, frag);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			BUG_ON(d_inode(dentry));</div><div class='ctx'> 			d_drop(dentry);</div><div class='head'>diff --git a/fs/configfs/file.c b/fs/configfs/file.c<br/>index 0ad32150611e..affe4742bbb5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/file.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ struct configfs_buffer {</div><div class='ctx'> 	size_t			count;</div><div class='ctx'> 	loff_t			pos;</div><div class='ctx'> 	char			* page;</div><div class='del'>-	struct configfs_item_operations	* ops;</div><div class='add'>+	const struct configfs_item_operations	*ops;</div><div class='ctx'> 	struct mutex		mutex;</div><div class='ctx'> 	int			needs_read_fill;</div><div class='ctx'> 	bool			read_in_progress;</div><div class='head'>diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c<br/>index dcc22f593e43..bcda3372e141 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/inode.c</a></div><div class='hunk'>@@ -211,33 +211,9 @@ void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent)</div><div class='ctx'> 			dget_dlock(dentry);</div><div class='ctx'> 			__d_drop(dentry);</div><div class='ctx'> 			spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-			simple_unlink(d_inode(parent), dentry);</div><div class='add'>+			__simple_unlink(d_inode(parent), dentry);</div><div class='add'>+			dput(dentry);</div><div class='ctx'> 		} else</div><div class='ctx'> 			spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void configfs_hash_and_remove(struct dentry * dir, const char * name)</div><div class='del'>-{</div><div class='del'>-	struct configfs_dirent * sd;</div><div class='del'>-	struct configfs_dirent * parent_sd = dir-&gt;d_fsdata;</div><div class='del'>-</div><div class='del'>-	if (d_really_is_negative(dir))</div><div class='del'>-		/* no inode means this hasn't been made visible yet */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inode_lock(d_inode(dir));</div><div class='del'>-	list_for_each_entry(sd, &amp;parent_sd-&gt;s_children, s_sibling) {</div><div class='del'>-		if (!sd-&gt;s_element)</div><div class='del'>-			continue;</div><div class='del'>-		if (!strcmp(configfs_get_name(sd), name)) {</div><div class='del'>-			spin_lock(&amp;configfs_dirent_lock);</div><div class='del'>-			list_del_init(&amp;sd-&gt;s_sibling);</div><div class='del'>-			spin_unlock(&amp;configfs_dirent_lock);</div><div class='del'>-			configfs_drop_dentry(sd, dir);</div><div class='del'>-			configfs_put(sd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='del'>-}</div><div class='head'>diff --git a/fs/configfs/item.c b/fs/configfs/item.c<br/>index 254170a82aa3..c378b5cbf87d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/item.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/item.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/item.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/item.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ int config_item_set_name(struct config_item *item, const char *fmt, ...)</div><div class='ctx'> 		name = kvasprintf(GFP_KERNEL, fmt, args);</div><div class='ctx'> 		va_end(args);</div><div class='ctx'> 		if (!name)</div><div class='del'>-			return -EFAULT;</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Free the old name, if necessary. */</div><div class='head'>diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c<br/>index c2d820063ec4..4929f3431189 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/mount.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/mount.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/mount.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/mount.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ static void configfs_free_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations configfs_ops = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.free_inode	= configfs_free_inode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +92,8 @@ static int configfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	configfs_root_group.cg_item.ci_dentry = root;</div><div class='ctx'> 	root-&gt;d_fsdata = &amp;configfs_root;</div><div class='ctx'> 	sb-&gt;s_root = root;</div><div class='del'>-	sb-&gt;s_d_op = &amp;configfs_dentry_ops; /* the rest get that */</div><div class='add'>+	set_default_d_op(sb, &amp;configfs_dentry_ops); /* the rest get that */</div><div class='add'>+	sb-&gt;s_d_flags |= DCACHE_DONTCACHE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +116,7 @@ static struct file_system_type configfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "configfs",</div><div class='ctx'> 	.init_fs_context = configfs_init_fs_context,</div><div class='del'>-	.kill_sb	= kill_litter_super,</div><div class='add'>+	.kill_sb	= kill_anon_super,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("configfs");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c<br/>index 69133ec1fac2..f3f79c67add5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/configfs/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/configfs/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/configfs/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/configfs/symlink.c</a></div><div class='hunk'>@@ -114,26 +114,21 @@ static int create_link(struct config_item *parent_item,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int get_target(const char *symname, struct path *path,</div><div class='del'>-		      struct config_item **target, struct super_block *sb)</div><div class='add'>+static int get_target(const char *symname, struct config_item **target,</div><div class='add'>+		      struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = kern_path(symname, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, path);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (path-&gt;dentry-&gt;d_sb == sb) {</div><div class='del'>-			*target = configfs_get_config_item(path-&gt;dentry);</div><div class='del'>-			if (!*target) {</div><div class='del'>-				ret = -ENOENT;</div><div class='del'>-				path_put(path);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ret = -EPERM;</div><div class='del'>-			path_put(path);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	ret = kern_path(symname, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &amp;path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (path.dentry-&gt;d_sb != sb)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	*target = configfs_get_config_item(path.dentry);</div><div class='add'>+	if (!*target)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -141,7 +136,6 @@ int configfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		     struct dentry *dentry, const char *symname)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct path path;</div><div class='ctx'> 	struct configfs_dirent *sd;</div><div class='ctx'> 	struct config_item *parent_item;</div><div class='ctx'> 	struct config_item *target_item = NULL;</div><div class='hunk'>@@ -188,7 +182,7 @@ int configfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	 *  AV, a thoroughly annoyed bastard.</div><div class='ctx'> 	 */</div><div class='ctx'> 	inode_unlock(dir);</div><div class='del'>-	ret = get_target(symname, &amp;path, &amp;target_item, dentry-&gt;d_sb);</div><div class='add'>+	ret = get_target(symname, &amp;target_item, dentry-&gt;d_sb);</div><div class='ctx'> 	inode_lock(dir);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_put;</div><div class='hunk'>@@ -210,7 +204,6 @@ int configfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	config_item_put(target_item);</div><div class='del'>-	path_put(&amp;path);</div><div class='ctx'> </div><div class='ctx'> out_put:</div><div class='ctx'> 	config_item_put(parent_item);</div><div class='head'>diff --git a/fs/coredump.c b/fs/coredump.c<br/>index f258c17c1841..8feb9c1cf83d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/coredump.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/coredump.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/coredump.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/coredump.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;linux/sched/coredump.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched/task_stack.h&gt;</div><div class='hunk'>@@ -42,6 +43,15 @@</div><div class='ctx'> #include &lt;linux/timekeeping.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/pidfs.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;net/af_unix.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;uapi/linux/pidfd.h&gt;</div><div class='add'>+#include &lt;uapi/linux/un.h&gt;</div><div class='add'>+#include &lt;uapi/linux/coredump.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -56,14 +66,38 @@</div><div class='ctx'> static bool dump_vma_snapshot(struct coredump_params *cprm);</div><div class='ctx'> static void free_vma_snapshot(struct coredump_params *cprm);</div><div class='ctx'> </div><div class='add'>+#define CORE_FILE_NOTE_SIZE_DEFAULT (4*1024*1024)</div><div class='add'>+/* Define a reasonable max cap */</div><div class='add'>+#define CORE_FILE_NOTE_SIZE_MAX (16*1024*1024)</div><div class='add'>+/*</div><div class='add'>+ * File descriptor number for the pidfd for the thread-group leader of</div><div class='add'>+ * the coredumping task installed into the usermode helper's file</div><div class='add'>+ * descriptor table.</div><div class='add'>+ */</div><div class='add'>+#define COREDUMP_PIDFD_NUMBER 3</div><div class='add'>+</div><div class='ctx'> static int core_uses_pid;</div><div class='ctx'> static unsigned int core_pipe_limit;</div><div class='add'>+static unsigned int core_sort_vma;</div><div class='ctx'> static char core_pattern[CORENAME_MAX_SIZE] = "core";</div><div class='ctx'> static int core_name_size = CORENAME_MAX_SIZE;</div><div class='add'>+unsigned int core_file_note_size_limit = CORE_FILE_NOTE_SIZE_DEFAULT;</div><div class='add'>+static atomic_t core_pipe_count = ATOMIC_INIT(0);</div><div class='add'>+</div><div class='add'>+enum coredump_type_t {</div><div class='add'>+	COREDUMP_FILE		= 1,</div><div class='add'>+	COREDUMP_PIPE		= 2,</div><div class='add'>+	COREDUMP_SOCK		= 3,</div><div class='add'>+	COREDUMP_SOCK_REQ	= 4,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct core_name {</div><div class='ctx'> 	char *corename;</div><div class='ctx'> 	int used, size;</div><div class='add'>+	unsigned int core_pipe_limit;</div><div class='add'>+	bool core_dumped;</div><div class='add'>+	enum coredump_type_t core_type;</div><div class='add'>+	u64 mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int expand_corename(struct core_name *cn, int size)</div><div class='hunk'>@@ -194,35 +228,104 @@ put_exe_file:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* format_corename will inspect the pattern parameter, and output a</div><div class='del'>- * name into corename, which must have space for at least</div><div class='del'>- * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator.</div><div class='add'>+/*</div><div class='add'>+ * coredump_parse will inspect the pattern parameter, and output a name</div><div class='add'>+ * into corename, which must have space for at least CORENAME_MAX_SIZE</div><div class='add'>+ * bytes plus one byte for the zero terminator.</div><div class='ctx'>  */</div><div class='del'>-static int format_corename(struct core_name *cn, struct coredump_params *cprm,</div><div class='add'>+static bool coredump_parse(struct core_name *cn, struct coredump_params *cprm,</div><div class='ctx'> 			   size_t **argv, int *argc)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cred *cred = current_cred();</div><div class='ctx'> 	const char *pat_ptr = core_pattern;</div><div class='del'>-	int ispipe = (*pat_ptr == '|');</div><div class='ctx'> 	bool was_space = false;</div><div class='ctx'> 	int pid_in_pattern = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	cn-&gt;mask = COREDUMP_KERNEL;</div><div class='add'>+	if (core_pipe_limit)</div><div class='add'>+		cn-&gt;mask |= COREDUMP_WAIT;</div><div class='ctx'> 	cn-&gt;used = 0;</div><div class='ctx'> 	cn-&gt;corename = NULL;</div><div class='add'>+	cn-&gt;core_pipe_limit = 0;</div><div class='add'>+	cn-&gt;core_dumped = false;</div><div class='add'>+	if (*pat_ptr == '|')</div><div class='add'>+		cn-&gt;core_type = COREDUMP_PIPE;</div><div class='add'>+	else if (*pat_ptr == '@')</div><div class='add'>+		cn-&gt;core_type = COREDUMP_SOCK;</div><div class='add'>+	else</div><div class='add'>+		cn-&gt;core_type = COREDUMP_FILE;</div><div class='ctx'> 	if (expand_corename(cn, core_name_size))</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return false;</div><div class='ctx'> 	cn-&gt;corename[0] = '\0';</div><div class='ctx'> </div><div class='del'>-	if (ispipe) {</div><div class='add'>+	switch (cn-&gt;core_type) {</div><div class='add'>+	case COREDUMP_PIPE: {</div><div class='ctx'> 		int argvs = sizeof(core_pattern) / 2;</div><div class='ctx'> 		(*argv) = kmalloc_array(argvs, sizeof(**argv), GFP_KERNEL);</div><div class='ctx'> 		if (!(*argv))</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return false;</div><div class='ctx'> 		(*argv)[(*argc)++] = 0;</div><div class='ctx'> 		++pat_ptr;</div><div class='ctx'> 		if (!(*pat_ptr))</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case COREDUMP_SOCK: {</div><div class='add'>+		/* skip the @ */</div><div class='add'>+		pat_ptr++;</div><div class='add'>+		if (!(*pat_ptr))</div><div class='add'>+			return false;</div><div class='add'>+		if (*pat_ptr == '@') {</div><div class='add'>+			pat_ptr++;</div><div class='add'>+			if (!(*pat_ptr))</div><div class='add'>+				return false;</div><div class='add'>+</div><div class='add'>+			cn-&gt;core_type = COREDUMP_SOCK_REQ;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = cn_printf(cn, "%s", pat_ptr);</div><div class='add'>+		if (err)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* Require absolute paths. */</div><div class='add'>+		if (cn-&gt;corename[0] != '/')</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Ensure we can uses spaces to indicate additional</div><div class='add'>+		 * parameters in the future.</div><div class='add'>+		 */</div><div class='add'>+		if (strchr(cn-&gt;corename, ' ')) {</div><div class='add'>+			coredump_report_failure("Coredump socket may not %s contain spaces", cn-&gt;corename);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Must not contain ".." in the path. */</div><div class='add'>+		if (name_contains_dotdot(cn-&gt;corename)) {</div><div class='add'>+			coredump_report_failure("Coredump socket may not %s contain '..' spaces", cn-&gt;corename);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (strlen(cn-&gt;corename) &gt;= UNIX_PATH_MAX) {</div><div class='add'>+			coredump_report_failure("Coredump socket path %s too long", cn-&gt;corename);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Currently no need to parse any other options.</div><div class='add'>+		 * Relevant information can be retrieved from the peer</div><div class='add'>+		 * pidfd retrievable via SO_PEERPIDFD by the receiver or</div><div class='add'>+		 * via /proc/&lt;pid&gt;, using the SO_PEERPIDFD to guard</div><div class='add'>+		 * against pid recycling when opening /proc/&lt;pid&gt;.</div><div class='add'>+		 */</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	case COREDUMP_FILE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Repeat as long as we have more pattern to process and more output</div><div class='hunk'>@@ -232,7 +335,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm,</div><div class='ctx'> 		 * Split on spaces before doing template expansion so that</div><div class='ctx'> 		 * %e and %E don't get split if they have spaces in them</div><div class='ctx'> 		 */</div><div class='del'>-		if (ispipe) {</div><div class='add'>+		if (cn-&gt;core_type == COREDUMP_PIPE) {</div><div class='ctx'> 			if (isspace(*pat_ptr)) {</div><div class='ctx'> 				if (cn-&gt;used != 0)</div><div class='ctx'> 					was_space = true;</div><div class='hunk'>@@ -242,7 +345,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm,</div><div class='ctx'> 				was_space = false;</div><div class='ctx'> 				err = cn_printf(cn, "%c", '\0');</div><div class='ctx'> 				if (err)</div><div class='del'>-					return err;</div><div class='add'>+					return false;</div><div class='ctx'> 				(*argv)[(*argc)++] = cn-&gt;used;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -332,6 +435,27 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm,</div><div class='ctx'> 			case 'C':</div><div class='ctx'> 				err = cn_printf(cn, "%d", cprm-&gt;cpu);</div><div class='ctx'> 				break;</div><div class='add'>+			/* pidfd number */</div><div class='add'>+			case 'F': {</div><div class='add'>+				/*</div><div class='add'>+				 * Installing a pidfd only makes sense if</div><div class='add'>+				 * we actually spawn a usermode helper.</div><div class='add'>+				 */</div><div class='add'>+				if (cn-&gt;core_type != COREDUMP_PIPE)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Note that we'll install a pidfd for the</div><div class='add'>+				 * thread-group leader. We know that task</div><div class='add'>+				 * linkage hasn't been removed yet and even if</div><div class='add'>+				 * this @current isn't the actual thread-group</div><div class='add'>+				 * leader we know that the thread-group leader</div><div class='add'>+				 * cannot be reaped until @current has exited.</div><div class='add'>+				 */</div><div class='add'>+				cprm-&gt;pid = task_tgid(current);</div><div class='add'>+				err = cn_printf(cn, "%d", COREDUMP_PIDFD_NUMBER);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			default:</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -339,7 +463,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -348,32 +472,27 @@ out:</div><div class='ctx'> 	 * If core_pattern does not include a %p (as is the default)</div><div class='ctx'> 	 * and core_uses_pid is set, then .%pid will be appended to</div><div class='ctx'> 	 * the filename. Do not do this for piped commands. */</div><div class='del'>-	if (!ispipe &amp;&amp; !pid_in_pattern &amp;&amp; core_uses_pid) {</div><div class='del'>-		err = cn_printf(cn, ".%d", task_tgid_vnr(current));</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return ispipe;</div><div class='add'>+	if (cn-&gt;core_type == COREDUMP_FILE &amp;&amp; !pid_in_pattern &amp;&amp; core_uses_pid)</div><div class='add'>+		return cn_printf(cn, ".%d", task_tgid_vnr(current)) == 0;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zap_process(struct task_struct *start, int exit_code)</div><div class='add'>+static int zap_process(struct signal_struct *signal, int exit_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *t;</div><div class='ctx'> 	int nr = 0;</div><div class='ctx'> </div><div class='del'>-	/* Allow SIGKILL, see prepare_signal() */</div><div class='del'>-	start-&gt;signal-&gt;flags = SIGNAL_GROUP_EXIT;</div><div class='del'>-	start-&gt;signal-&gt;group_exit_code = exit_code;</div><div class='del'>-	start-&gt;signal-&gt;group_stop_count = 0;</div><div class='add'>+	signal-&gt;flags = SIGNAL_GROUP_EXIT;</div><div class='add'>+	signal-&gt;group_exit_code = exit_code;</div><div class='add'>+	signal-&gt;group_stop_count = 0;</div><div class='ctx'> </div><div class='del'>-	for_each_thread(start, t) {</div><div class='add'>+	__for_each_thread(signal, t) {</div><div class='ctx'> 		task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);</div><div class='ctx'> 		if (t != current &amp;&amp; !(t-&gt;flags &amp; PF_POSTCOREDUMP)) {</div><div class='ctx'> 			sigaddset(&amp;t-&gt;pending.signal, SIGKILL);</div><div class='ctx'> 			signal_wake_up(t, 1);</div><div class='del'>-			/* The vhost_worker does not particpate in coredumps */</div><div class='del'>-			if ((t-&gt;flags &amp; (PF_USER_WORKER | PF_IO_WORKER)) != PF_USER_WORKER)</div><div class='del'>-				nr++;</div><div class='add'>+			nr++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -388,8 +507,9 @@ static int zap_threads(struct task_struct *tsk,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;tsk-&gt;sighand-&gt;siglock);</div><div class='ctx'> 	if (!(signal-&gt;flags &amp; SIGNAL_GROUP_EXIT) &amp;&amp; !signal-&gt;group_exec_task) {</div><div class='add'>+		/* Allow SIGKILL, see prepare_signal() */</div><div class='ctx'> 		signal-&gt;core_state = core_state;</div><div class='del'>-		nr = zap_process(tsk, exit_code);</div><div class='add'>+		nr = zap_process(signal, exit_code);</div><div class='ctx'> 		clear_tsk_thread_flag(tsk, TIF_SIGPENDING);</div><div class='ctx'> 		tsk-&gt;flags |= PF_DUMPCORE;</div><div class='ctx'> 		atomic_set(&amp;core_state-&gt;nr_threads, nr);</div><div class='hunk'>@@ -488,7 +608,7 @@ static void wait_for_dump_helpers(struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * umh_pipe_setup</div><div class='add'>+ * umh_coredump_setup</div><div class='ctx'>  * helper function to customize the process used</div><div class='ctx'>  * to collect the core in userspace.  Specifically</div><div class='ctx'>  * it sets up a pipe and installs it as fd 0 (stdin)</div><div class='hunk'>@@ -498,11 +618,34 @@ static void wait_for_dump_helpers(struct file *file)</div><div class='ctx'>  * is a special value that we use to trap recursive</div><div class='ctx'>  * core dumps</div><div class='ctx'>  */</div><div class='del'>-static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)</div><div class='add'>+static int umh_coredump_setup(struct subprocess_info *info, struct cred *new)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *files[2];</div><div class='ctx'> 	struct coredump_params *cp = (struct coredump_params *)info-&gt;data;</div><div class='del'>-	int err = create_pipe_files(files, 0);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;pid) {</div><div class='add'>+		struct file *pidfs_file __free(fput) = NULL;</div><div class='add'>+</div><div class='add'>+		pidfs_file = pidfs_alloc_file(cp-&gt;pid, 0);</div><div class='add'>+		if (IS_ERR(pidfs_file))</div><div class='add'>+			return PTR_ERR(pidfs_file);</div><div class='add'>+</div><div class='add'>+		pidfs_coredump(cp);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Usermode helpers are childen of either</div><div class='add'>+		 * system_dfl_wq or of kthreadd. So we know that</div><div class='add'>+		 * we're starting off with a clean file descriptor</div><div class='add'>+		 * table. So we should always be able to use</div><div class='add'>+		 * COREDUMP_PIDFD_NUMBER as our file descriptor value.</div><div class='add'>+		 */</div><div class='add'>+		err = replace_fd(COREDUMP_PIDFD_NUMBER, pidfs_file, 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = create_pipe_files(files, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -510,287 +653,552 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)</div><div class='ctx'> </div><div class='ctx'> 	err = replace_fd(0, files[0], 0);</div><div class='ctx'> 	fput(files[0]);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/* and disallow core files too */</div><div class='ctx'> 	current-&gt;signal-&gt;rlim[RLIMIT_CORE] = (struct rlimit){1, 1};</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void do_coredump(const kernel_siginfo_t *siginfo)</div><div class='add'>+#ifdef CONFIG_UNIX</div><div class='add'>+static bool coredump_sock_connect(struct core_name *cn, struct coredump_params *cprm)</div><div class='ctx'> {</div><div class='del'>-	struct core_state core_state;</div><div class='del'>-	struct core_name cn;</div><div class='del'>-	struct mm_struct *mm = current-&gt;mm;</div><div class='del'>-	struct linux_binfmt * binfmt;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	struct cred *cred;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	int ispipe;</div><div class='del'>-	size_t *argv = NULL;</div><div class='del'>-	int argc = 0;</div><div class='del'>-	/* require nonrelative corefile path and be extra careful */</div><div class='del'>-	bool need_suid_safe = false;</div><div class='del'>-	bool core_dumped = false;</div><div class='del'>-	static atomic_t core_dump_count = ATOMIC_INIT(0);</div><div class='del'>-	struct coredump_params cprm = {</div><div class='del'>-		.siginfo = siginfo,</div><div class='del'>-		.limit = rlimit(RLIMIT_CORE),</div><div class='del'>-		/*</div><div class='del'>-		 * We must use the same mm-&gt;flags while dumping core to avoid</div><div class='del'>-		 * inconsistency of bit flags, since this flag is not protected</div><div class='del'>-		 * by any locks.</div><div class='del'>-		 */</div><div class='del'>-		.mm_flags = mm-&gt;flags,</div><div class='del'>-		.vma_meta = NULL,</div><div class='del'>-		.cpu = raw_smp_processor_id(),</div><div class='add'>+	struct file *file __free(fput) = NULL;</div><div class='add'>+	struct sockaddr_un addr = {</div><div class='add'>+		.sun_family = AF_UNIX,</div><div class='ctx'> 	};</div><div class='add'>+	ssize_t addr_len;</div><div class='add'>+	int retval;</div><div class='add'>+	struct socket *socket;</div><div class='ctx'> </div><div class='del'>-	audit_core_dumps(siginfo-&gt;si_signo);</div><div class='add'>+	addr_len = strscpy(addr.sun_path, cn-&gt;corename);</div><div class='add'>+	if (addr_len &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	addr_len += offsetof(struct sockaddr_un, sun_path) + 1;</div><div class='ctx'> </div><div class='del'>-	binfmt = mm-&gt;binfmt;</div><div class='del'>-	if (!binfmt || !binfmt-&gt;core_dump)</div><div class='del'>-		goto fail;</div><div class='del'>-	if (!__get_dumpable(cprm.mm_flags))</div><div class='del'>-		goto fail;</div><div class='add'>+	/*</div><div class='add'>+	 * It is possible that the userspace process which is supposed</div><div class='add'>+	 * to handle the coredump and is listening on the AF_UNIX socket</div><div class='add'>+	 * coredumps. Userspace should just mark itself non dumpable.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	retval = sock_create_kern(&amp;init_net, AF_UNIX, SOCK_STREAM, 0, &amp;socket);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	file = sock_alloc_file(socket, 0, NULL);</div><div class='add'>+	if (IS_ERR(file))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	cred = prepare_creds();</div><div class='del'>-	if (!cred)</div><div class='del'>-		goto fail;</div><div class='ctx'> 	/*</div><div class='del'>-	 * We cannot trust fsuid as being the "true" uid of the process</div><div class='del'>-	 * nor do we know its entire history. We only know it was tainted</div><div class='del'>-	 * so we dump it as root in mode 2, and only into a controlled</div><div class='del'>-	 * environment (pipe handler or fully qualified path).</div><div class='add'>+	 * Set the thread-group leader pid which is used for the peer</div><div class='add'>+	 * credentials during connect() below. Then immediately register</div><div class='add'>+	 * it in pidfs...</div><div class='add'>+	 */</div><div class='add'>+	cprm-&gt;pid = task_tgid(current);</div><div class='add'>+	retval = pidfs_register_pid(cprm-&gt;pid);</div><div class='add'>+	if (retval)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ... and set the coredump information so userspace has it</div><div class='add'>+	 * available after connect()...</div><div class='ctx'> 	 */</div><div class='del'>-	if (__get_dumpable(cprm.mm_flags) == SUID_DUMP_ROOT) {</div><div class='del'>-		/* Setuid core dump mode */</div><div class='del'>-		cred-&gt;fsuid = GLOBAL_ROOT_UID;	/* Dump root private */</div><div class='del'>-		need_suid_safe = true;</div><div class='add'>+	pidfs_coredump(cprm);</div><div class='add'>+</div><div class='add'>+	retval = kernel_connect(socket, (struct sockaddr_unsized *)(&amp;addr), addr_len,</div><div class='add'>+				O_NONBLOCK | SOCK_COREDUMP);</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		if (retval == -EAGAIN)</div><div class='add'>+			coredump_report_failure("Coredump socket %s receive queue full", addr.sun_path);</div><div class='add'>+		else</div><div class='add'>+			coredump_report_failure("Coredump socket connection %s failed %d", addr.sun_path, retval);</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = coredump_wait(siginfo-&gt;si_signo, &amp;core_state);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto fail_creds;</div><div class='add'>+	/* ... and validate that @sk_peer_pid matches @cprm.pid. */</div><div class='add'>+	if (WARN_ON_ONCE(unix_peer(socket-&gt;sk)-&gt;sk_peer_pid != cprm-&gt;pid))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	old_cred = override_creds(cred);</div><div class='add'>+	cprm-&gt;limit = RLIM_INFINITY;</div><div class='add'>+	cprm-&gt;file = no_free_ptr(file);</div><div class='ctx'> </div><div class='del'>-	ispipe = format_corename(&amp;cn, &amp;cprm, &amp;argv, &amp;argc);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (ispipe) {</div><div class='del'>-		int argi;</div><div class='del'>-		int dump_count;</div><div class='del'>-		char **helper_argv;</div><div class='del'>-		struct subprocess_info *sub_info;</div><div class='add'>+static inline bool coredump_sock_recv(struct file *file, struct coredump_ack *ack, size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = {};</div><div class='add'>+	struct kvec iov = { .iov_base = ack, .iov_len = size };</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-		if (ispipe &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "format_corename failed\n");</div><div class='del'>-			printk(KERN_WARNING "Aborting core\n");</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-		}</div><div class='add'>+	memset(ack, 0, size);</div><div class='add'>+	ret = kernel_recvmsg(sock_from_file(file), &amp;msg, &amp;iov, 1, size, flags);</div><div class='add'>+	return ret == size;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (cprm.limit == 1) {</div><div class='del'>-			/* See umh_pipe_setup() which sets RLIMIT_CORE = 1.</div><div class='del'>-			 *</div><div class='del'>-			 * Normally core limits are irrelevant to pipes, since</div><div class='del'>-			 * we're not writing to the file system, but we use</div><div class='del'>-			 * cprm.limit of 1 here as a special value, this is a</div><div class='del'>-			 * consistent way to catch recursive crashes.</div><div class='del'>-			 * We can still crash if the core_pattern binary sets</div><div class='del'>-			 * RLIM_CORE = !1, but it runs as root, and can do</div><div class='del'>-			 * lots of stupid things.</div><div class='del'>-			 *</div><div class='del'>-			 * Note that we use task_tgid_vnr here to grab the pid</div><div class='del'>-			 * of the process group leader.  That way we get the</div><div class='del'>-			 * right pid if a thread in a multi-threaded</div><div class='del'>-			 * core_pattern process dies.</div><div class='del'>-			 */</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-				"Process %d(%s) has RLIMIT_CORE set to 1\n",</div><div class='del'>-				task_tgid_vnr(current), current-&gt;comm);</div><div class='del'>-			printk(KERN_WARNING "Aborting core\n");</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-		}</div><div class='del'>-		cprm.limit = RLIM_INFINITY;</div><div class='del'>-</div><div class='del'>-		dump_count = atomic_inc_return(&amp;core_dump_count);</div><div class='del'>-		if (core_pipe_limit &amp;&amp; (core_pipe_limit &lt; dump_count)) {</div><div class='del'>-			printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",</div><div class='del'>-			       task_tgid_vnr(current), current-&gt;comm);</div><div class='del'>-			printk(KERN_WARNING "Skipping core dump\n");</div><div class='del'>-			goto fail_dropcount;</div><div class='del'>-		}</div><div class='add'>+static inline bool coredump_sock_send(struct file *file, struct coredump_req *req)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = { .msg_flags = MSG_NOSIGNAL };</div><div class='add'>+	struct kvec iov = { .iov_base = req, .iov_len = sizeof(*req) };</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-		helper_argv = kmalloc_array(argc + 1, sizeof(*helper_argv),</div><div class='del'>-					    GFP_KERNEL);</div><div class='del'>-		if (!helper_argv) {</div><div class='del'>-			printk(KERN_WARNING "%s failed to allocate memory\n",</div><div class='del'>-			       __func__);</div><div class='del'>-			goto fail_dropcount;</div><div class='del'>-		}</div><div class='del'>-		for (argi = 0; argi &lt; argc; argi++)</div><div class='del'>-			helper_argv[argi] = cn.corename + argv[argi];</div><div class='del'>-		helper_argv[argi] = NULL;</div><div class='del'>-</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		sub_info = call_usermodehelper_setup(helper_argv[0],</div><div class='del'>-						helper_argv, NULL, GFP_KERNEL,</div><div class='del'>-						umh_pipe_setup, NULL, &amp;cprm);</div><div class='del'>-		if (sub_info)</div><div class='del'>-			retval = call_usermodehelper_exec(sub_info,</div><div class='del'>-							  UMH_WAIT_EXEC);</div><div class='del'>-</div><div class='del'>-		kfree(helper_argv);</div><div class='del'>-		if (retval) {</div><div class='del'>-			printk(KERN_INFO "Core dump to |%s pipe failed\n",</div><div class='del'>-			       cn.corename);</div><div class='del'>-			goto close_fail;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct mnt_idmap *idmap;</div><div class='del'>-		struct inode *inode;</div><div class='del'>-		int open_flags = O_CREAT | O_WRONLY | O_NOFOLLOW |</div><div class='del'>-				 O_LARGEFILE | O_EXCL;</div><div class='del'>-</div><div class='del'>-		if (cprm.limit &lt; binfmt-&gt;min_coredump)</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-</div><div class='del'>-		if (need_suid_safe &amp;&amp; cn.corename[0] != '/') {</div><div class='del'>-			printk(KERN_WARNING "Pid %d(%s) can only dump core "\</div><div class='del'>-				"to fully qualified path!\n",</div><div class='del'>-				task_tgid_vnr(current), current-&gt;comm);</div><div class='del'>-			printk(KERN_WARNING "Skipping core dump\n");</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-		}</div><div class='add'>+	ret = kernel_sendmsg(sock_from_file(file), &amp;msg, &amp;iov, 1, sizeof(*req));</div><div class='add'>+	return ret == sizeof(*req);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Unlink the file if it exists unless this is a SUID</div><div class='del'>-		 * binary - in that case, we're running around with root</div><div class='del'>-		 * privs and don't want to unlink another user's coredump.</div><div class='del'>-		 */</div><div class='del'>-		if (!need_suid_safe) {</div><div class='del'>-			/*</div><div class='del'>-			 * If it doesn't exist, that's fine. If there's some</div><div class='del'>-			 * other problem, we'll catch it at the filp_open().</div><div class='del'>-			 */</div><div class='del'>-			do_unlinkat(AT_FDCWD, getname_kernel(cn.corename));</div><div class='del'>-		}</div><div class='add'>+static_assert(sizeof(enum coredump_mark) == sizeof(__u32));</div><div class='add'>+</div><div class='add'>+static inline bool coredump_sock_mark(struct file *file, enum coredump_mark mark)</div><div class='add'>+{</div><div class='add'>+	struct msghdr msg = { .msg_flags = MSG_NOSIGNAL };</div><div class='add'>+	struct kvec iov = { .iov_base = &amp;mark, .iov_len = sizeof(mark) };</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = kernel_sendmsg(sock_from_file(file), &amp;msg, &amp;iov, 1, sizeof(mark));</div><div class='add'>+	return ret == sizeof(mark);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void coredump_sock_wait(struct file *file)</div><div class='add'>+{</div><div class='add'>+	ssize_t n;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We use a simple read to wait for the coredump processing to</div><div class='add'>+	 * finish. Either the socket is closed or we get sent unexpected</div><div class='add'>+	 * data. In both cases, we're done.</div><div class='add'>+	 */</div><div class='add'>+	n = __kernel_read(file, &amp;(char){ 0 }, 1, NULL);</div><div class='add'>+	if (n &gt; 0)</div><div class='add'>+		coredump_report_failure("Coredump socket had unexpected data");</div><div class='add'>+	else if (n &lt; 0)</div><div class='add'>+		coredump_report_failure("Coredump socket failed");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void coredump_sock_shutdown(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct socket *socket;</div><div class='ctx'> </div><div class='add'>+	socket = sock_from_file(file);</div><div class='add'>+	if (!socket)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Let userspace know we're done processing the coredump. */</div><div class='add'>+	kernel_sock_shutdown(socket, SHUT_WR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coredump_sock_request(struct core_name *cn, struct coredump_params *cprm)</div><div class='add'>+{</div><div class='add'>+	struct coredump_req req = {</div><div class='add'>+		.size		= sizeof(struct coredump_req),</div><div class='add'>+		.mask		= COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+				  COREDUMP_REJECT | COREDUMP_WAIT,</div><div class='add'>+		.size_ack	= sizeof(struct coredump_ack),</div><div class='add'>+	};</div><div class='add'>+	struct coredump_ack ack = {};</div><div class='add'>+	ssize_t usize;</div><div class='add'>+</div><div class='add'>+	if (cn-&gt;core_type != COREDUMP_SOCK_REQ)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Let userspace know what we support. */</div><div class='add'>+	if (!coredump_sock_send(cprm-&gt;file, &amp;req))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Peek the size of the coredump_ack. */</div><div class='add'>+	if (!coredump_sock_recv(cprm-&gt;file, &amp;ack, sizeof(ack.size),</div><div class='add'>+				MSG_PEEK | MSG_WAITALL))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Refuse unknown coredump_ack sizes. */</div><div class='add'>+	usize = ack.size;</div><div class='add'>+	if (usize &lt; COREDUMP_ACK_SIZE_VER0) {</div><div class='add'>+		coredump_sock_mark(cprm-&gt;file, COREDUMP_MARK_MINSIZE);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usize &gt; sizeof(ack)) {</div><div class='add'>+		coredump_sock_mark(cprm-&gt;file, COREDUMP_MARK_MAXSIZE);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now retrieve the coredump_ack. */</div><div class='add'>+	if (!coredump_sock_recv(cprm-&gt;file, &amp;ack, usize, MSG_WAITALL))</div><div class='add'>+		return false;</div><div class='add'>+	if (ack.size != usize)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Refuse unknown coredump_ack flags. */</div><div class='add'>+	if (ack.mask &amp; ~req.mask) {</div><div class='add'>+		coredump_sock_mark(cprm-&gt;file, COREDUMP_MARK_UNSUPPORTED);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Refuse mutually exclusive options. */</div><div class='add'>+	if (hweight64(ack.mask &amp; (COREDUMP_USERSPACE | COREDUMP_KERNEL |</div><div class='add'>+				  COREDUMP_REJECT)) != 1) {</div><div class='add'>+		coredump_sock_mark(cprm-&gt;file, COREDUMP_MARK_CONFLICTING);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ack.spare) {</div><div class='add'>+		coredump_sock_mark(cprm-&gt;file, COREDUMP_MARK_UNSUPPORTED);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cn-&gt;mask = ack.mask;</div><div class='add'>+	return coredump_sock_mark(cprm-&gt;file, COREDUMP_MARK_REQACK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coredump_socket(struct core_name *cn, struct coredump_params *cprm)</div><div class='add'>+{</div><div class='add'>+	if (!coredump_sock_connect(cn, cprm))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return coredump_sock_request(cn, cprm);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void coredump_sock_wait(struct file *file) { }</div><div class='add'>+static inline void coredump_sock_shutdown(struct file *file) { }</div><div class='add'>+static inline bool coredump_socket(struct core_name *cn, struct coredump_params *cprm) { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* cprm-&gt;mm_flags contains a stable snapshot of dumpability flags. */</div><div class='add'>+static inline bool coredump_force_suid_safe(const struct coredump_params *cprm)</div><div class='add'>+{</div><div class='add'>+	/* Require nonrelative corefile path and be extra careful. */</div><div class='add'>+	return __get_dumpable(cprm-&gt;mm_flags) == SUID_DUMP_ROOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coredump_file(struct core_name *cn, struct coredump_params *cprm,</div><div class='add'>+			  const struct linux_binfmt *binfmt)</div><div class='add'>+{</div><div class='add'>+	struct mnt_idmap *idmap;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct file *file __free(fput) = NULL;</div><div class='add'>+	int open_flags = O_CREAT | O_WRONLY | O_NOFOLLOW | O_LARGEFILE | O_EXCL;</div><div class='add'>+</div><div class='add'>+	if (cprm-&gt;limit &lt; binfmt-&gt;min_coredump)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (coredump_force_suid_safe(cprm) &amp;&amp; cn-&gt;corename[0] != '/') {</div><div class='add'>+		coredump_report_failure("this process can only dump core to a fully qualified path, skipping core dump");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unlink the file if it exists unless this is a SUID</div><div class='add'>+	 * binary - in that case, we're running around with root</div><div class='add'>+	 * privs and don't want to unlink another user's coredump.</div><div class='add'>+	 */</div><div class='add'>+	if (!coredump_force_suid_safe(cprm)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * There is a race between unlinking and creating the</div><div class='del'>-		 * file, but if that causes an EEXIST here, that's</div><div class='del'>-		 * fine - another process raced with us while creating</div><div class='del'>-		 * the corefile, and the other process won. To userspace,</div><div class='del'>-		 * what matters is that at least one of the two processes</div><div class='del'>-		 * writes its coredump successfully, not which one.</div><div class='add'>+		 * If it doesn't exist, that's fine. If there's some</div><div class='add'>+		 * other problem, we'll catch it at the filp_open().</div><div class='ctx'> 		 */</div><div class='del'>-		if (need_suid_safe) {</div><div class='del'>-			/*</div><div class='del'>-			 * Using user namespaces, normal user tasks can change</div><div class='del'>-			 * their current-&gt;fs-&gt;root to point to arbitrary</div><div class='del'>-			 * directories. Since the intention of the "only dump</div><div class='del'>-			 * with a fully qualified path" rule is to control where</div><div class='del'>-			 * coredumps may be placed using root privileges,</div><div class='del'>-			 * current-&gt;fs-&gt;root must not be used. Instead, use the</div><div class='del'>-			 * root directory of init_task.</div><div class='del'>-			 */</div><div class='del'>-			struct path root;</div><div class='del'>-</div><div class='del'>-			task_lock(&amp;init_task);</div><div class='del'>-			get_fs_root(init_task.fs, &amp;root);</div><div class='del'>-			task_unlock(&amp;init_task);</div><div class='del'>-			cprm.file = file_open_root(&amp;root, cn.corename,</div><div class='del'>-						   open_flags, 0600);</div><div class='del'>-			path_put(&amp;root);</div><div class='del'>-		} else {</div><div class='del'>-			cprm.file = filp_open(cn.corename, open_flags, 0600);</div><div class='del'>-		}</div><div class='del'>-		if (IS_ERR(cprm.file))</div><div class='del'>-			goto fail_unlock;</div><div class='del'>-</div><div class='del'>-		inode = file_inode(cprm.file);</div><div class='del'>-		if (inode-&gt;i_nlink &gt; 1)</div><div class='del'>-			goto close_fail;</div><div class='del'>-		if (d_unhashed(cprm.file-&gt;f_path.dentry))</div><div class='del'>-			goto close_fail;</div><div class='add'>+		do_unlinkat(AT_FDCWD, getname_kernel(cn-&gt;corename));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There is a race between unlinking and creating the</div><div class='add'>+	 * file, but if that causes an EEXIST here, that's</div><div class='add'>+	 * fine - another process raced with us while creating</div><div class='add'>+	 * the corefile, and the other process won. To userspace,</div><div class='add'>+	 * what matters is that at least one of the two processes</div><div class='add'>+	 * writes its coredump successfully, not which one.</div><div class='add'>+	 */</div><div class='add'>+	if (coredump_force_suid_safe(cprm)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * AK: actually i see no reason to not allow this for named</div><div class='del'>-		 * pipes etc, but keep the previous behaviour for now.</div><div class='add'>+		 * Using user namespaces, normal user tasks can change</div><div class='add'>+		 * their current-&gt;fs-&gt;root to point to arbitrary</div><div class='add'>+		 * directories. Since the intention of the "only dump</div><div class='add'>+		 * with a fully qualified path" rule is to control where</div><div class='add'>+		 * coredumps may be placed using root privileges,</div><div class='add'>+		 * current-&gt;fs-&gt;root must not be used. Instead, use the</div><div class='add'>+		 * root directory of init_task.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!S_ISREG(inode-&gt;i_mode))</div><div class='del'>-			goto close_fail;</div><div class='del'>-		/*</div><div class='del'>-		 * Don't dump core if the filesystem changed owner or mode</div><div class='del'>-		 * of the file during file creation. This is an issue when</div><div class='del'>-		 * a process dumps core while its cwd is e.g. on a vfat</div><div class='del'>-		 * filesystem.</div><div class='add'>+		struct path root;</div><div class='add'>+</div><div class='add'>+		task_lock(&amp;init_task);</div><div class='add'>+		get_fs_root(init_task.fs, &amp;root);</div><div class='add'>+		task_unlock(&amp;init_task);</div><div class='add'>+		file = file_open_root(&amp;root, cn-&gt;corename, open_flags, 0600);</div><div class='add'>+		path_put(&amp;root);</div><div class='add'>+	} else {</div><div class='add'>+		file = filp_open(cn-&gt;corename, open_flags, 0600);</div><div class='add'>+	}</div><div class='add'>+	if (IS_ERR(file))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	inode = file_inode(file);</div><div class='add'>+	if (inode-&gt;i_nlink &gt; 1)</div><div class='add'>+		return false;</div><div class='add'>+	if (d_unhashed(file-&gt;f_path.dentry))</div><div class='add'>+		return false;</div><div class='add'>+	/*</div><div class='add'>+	 * AK: actually i see no reason to not allow this for named</div><div class='add'>+	 * pipes etc, but keep the previous behaviour for now.</div><div class='add'>+	 */</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		return false;</div><div class='add'>+	/*</div><div class='add'>+	 * Don't dump core if the filesystem changed owner or mode</div><div class='add'>+	 * of the file during file creation. This is an issue when</div><div class='add'>+	 * a process dumps core while its cwd is e.g. on a vfat</div><div class='add'>+	 * filesystem.</div><div class='add'>+	 */</div><div class='add'>+	idmap = file_mnt_idmap(file);</div><div class='add'>+	if (!vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode), current_fsuid())) {</div><div class='add'>+		coredump_report_failure("Core dump to %s aborted: cannot preserve file owner", cn-&gt;corename);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if ((inode-&gt;i_mode &amp; 0677) != 0600) {</div><div class='add'>+		coredump_report_failure("Core dump to %s aborted: cannot preserve file permissions", cn-&gt;corename);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (!(file-&gt;f_mode &amp; FMODE_CAN_WRITE))</div><div class='add'>+		return false;</div><div class='add'>+	if (do_truncate(idmap, file-&gt;f_path.dentry, 0, 0, file))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	cprm-&gt;file = no_free_ptr(file);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coredump_pipe(struct core_name *cn, struct coredump_params *cprm,</div><div class='add'>+			  size_t *argv, int argc)</div><div class='add'>+{</div><div class='add'>+	int argi;</div><div class='add'>+	char **helper_argv __free(kfree) = NULL;</div><div class='add'>+	struct subprocess_info *sub_info;</div><div class='add'>+</div><div class='add'>+	if (cprm-&gt;limit == 1) {</div><div class='add'>+		/* See umh_coredump_setup() which sets RLIMIT_CORE = 1.</div><div class='add'>+		 *</div><div class='add'>+		 * Normally core limits are irrelevant to pipes, since</div><div class='add'>+		 * we're not writing to the file system, but we use</div><div class='add'>+		 * cprm.limit of 1 here as a special value, this is a</div><div class='add'>+		 * consistent way to catch recursive crashes.</div><div class='add'>+		 * We can still crash if the core_pattern binary sets</div><div class='add'>+		 * RLIM_CORE = !1, but it runs as root, and can do</div><div class='add'>+		 * lots of stupid things.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that we use task_tgid_vnr here to grab the pid</div><div class='add'>+		 * of the process group leader.  That way we get the</div><div class='add'>+		 * right pid if a thread in a multi-threaded</div><div class='add'>+		 * core_pattern process dies.</div><div class='ctx'> 		 */</div><div class='del'>-		idmap = file_mnt_idmap(cprm.file);</div><div class='del'>-		if (!vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode),</div><div class='del'>-				    current_fsuid())) {</div><div class='del'>-			pr_info_ratelimited("Core dump to %s aborted: cannot preserve file owner\n",</div><div class='del'>-					    cn.corename);</div><div class='del'>-			goto close_fail;</div><div class='del'>-		}</div><div class='del'>-		if ((inode-&gt;i_mode &amp; 0677) != 0600) {</div><div class='del'>-			pr_info_ratelimited("Core dump to %s aborted: cannot preserve file permissions\n",</div><div class='del'>-					    cn.corename);</div><div class='del'>-			goto close_fail;</div><div class='del'>-		}</div><div class='del'>-		if (!(cprm.file-&gt;f_mode &amp; FMODE_CAN_WRITE))</div><div class='del'>-			goto close_fail;</div><div class='del'>-		if (do_truncate(idmap, cprm.file-&gt;f_path.dentry,</div><div class='del'>-				0, 0, cprm.file))</div><div class='del'>-			goto close_fail;</div><div class='add'>+		coredump_report_failure("RLIMIT_CORE is set to 1, aborting core");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	cprm-&gt;limit = RLIM_INFINITY;</div><div class='add'>+</div><div class='add'>+	cn-&gt;core_pipe_limit = atomic_inc_return(&amp;core_pipe_count);</div><div class='add'>+	if (core_pipe_limit &amp;&amp; (core_pipe_limit &lt; cn-&gt;core_pipe_limit)) {</div><div class='add'>+		coredump_report_failure("over core_pipe_limit, skipping core dump");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	helper_argv = kmalloc_array(argc + 1, sizeof(*helper_argv), GFP_KERNEL);</div><div class='add'>+	if (!helper_argv) {</div><div class='add'>+		coredump_report_failure("%s failed to allocate memory", __func__);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	for (argi = 0; argi &lt; argc; argi++)</div><div class='add'>+		helper_argv[argi] = cn-&gt;corename + argv[argi];</div><div class='add'>+	helper_argv[argi] = NULL;</div><div class='add'>+</div><div class='add'>+	sub_info = call_usermodehelper_setup(helper_argv[0], helper_argv, NULL,</div><div class='add'>+					     GFP_KERNEL, umh_coredump_setup,</div><div class='add'>+					     NULL, cprm);</div><div class='add'>+	if (!sub_info)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC)) {</div><div class='add'>+		coredump_report_failure("|%s pipe failed", cn-&gt;corename);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * umh disabled with CONFIG_STATIC_USERMODEHELPER_PATH="" would</div><div class='add'>+	 * have this set to NULL.</div><div class='add'>+	 */</div><div class='add'>+	if (!cprm-&gt;file) {</div><div class='add'>+		coredump_report_failure("Core dump to |%s disabled", cn-&gt;corename);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool coredump_write(struct core_name *cn,</div><div class='add'>+			  struct coredump_params *cprm,</div><div class='add'>+			  const struct linux_binfmt *binfmt)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (dump_interrupted())</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!dump_vma_snapshot(cprm))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	file_start_write(cprm-&gt;file);</div><div class='add'>+	cn-&gt;core_dumped = binfmt-&gt;core_dump(cprm);</div><div class='add'>+	/*</div><div class='add'>+	 * Ensures that file size is big enough to contain the current</div><div class='add'>+	 * file postion. This prevents gdb from complaining about</div><div class='add'>+	 * a truncated file if the last "write" to the file was</div><div class='add'>+	 * dump_skip.</div><div class='add'>+	 */</div><div class='add'>+	if (cprm-&gt;to_skip) {</div><div class='add'>+		cprm-&gt;to_skip--;</div><div class='add'>+		dump_emit(cprm, "", 1);</div><div class='add'>+	}</div><div class='add'>+	file_end_write(cprm-&gt;file);</div><div class='add'>+	free_vma_snapshot(cprm);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void coredump_cleanup(struct core_name *cn, struct coredump_params *cprm)</div><div class='add'>+{</div><div class='add'>+	if (cprm-&gt;file)</div><div class='add'>+		filp_close(cprm-&gt;file, NULL);</div><div class='add'>+	if (cn-&gt;core_pipe_limit) {</div><div class='add'>+		VFS_WARN_ON_ONCE(cn-&gt;core_type != COREDUMP_PIPE);</div><div class='add'>+		atomic_dec(&amp;core_pipe_count);</div><div class='ctx'> 	}</div><div class='add'>+	kfree(cn-&gt;corename);</div><div class='add'>+	coredump_finish(cn-&gt;core_dumped);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool coredump_skip(const struct coredump_params *cprm,</div><div class='add'>+				 const struct linux_binfmt *binfmt)</div><div class='add'>+{</div><div class='add'>+	if (!binfmt)</div><div class='add'>+		return true;</div><div class='add'>+	if (!binfmt-&gt;core_dump)</div><div class='add'>+		return true;</div><div class='add'>+	if (!__get_dumpable(cprm-&gt;mm_flags))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_coredump(struct core_name *cn, struct coredump_params *cprm,</div><div class='add'>+			size_t **argv, int *argc, const struct linux_binfmt *binfmt)</div><div class='add'>+{</div><div class='add'>+	if (!coredump_parse(cn, cprm, argv, argc)) {</div><div class='add'>+		coredump_report_failure("format_corename failed, aborting core");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cn-&gt;core_type) {</div><div class='add'>+	case COREDUMP_FILE:</div><div class='add'>+		if (!coredump_file(cn, cprm, binfmt))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	case COREDUMP_PIPE:</div><div class='add'>+		if (!coredump_pipe(cn, cprm, *argv, *argc))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	case COREDUMP_SOCK_REQ:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case COREDUMP_SOCK:</div><div class='add'>+		if (!coredump_socket(cn, cprm))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Don't even generate the coredump. */</div><div class='add'>+	if (cn-&gt;mask &amp; COREDUMP_REJECT)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* get us an unshared descriptor table; almost always a no-op */</div><div class='ctx'> 	/* The cell spufs coredump code reads the file descriptor tables */</div><div class='del'>-	retval = unshare_files();</div><div class='del'>-	if (retval)</div><div class='del'>-		goto close_fail;</div><div class='del'>-	if (!dump_interrupted()) {</div><div class='del'>-		/*</div><div class='del'>-		 * umh disabled with CONFIG_STATIC_USERMODEHELPER_PATH="" would</div><div class='del'>-		 * have this set to NULL.</div><div class='del'>-		 */</div><div class='del'>-		if (!cprm.file) {</div><div class='del'>-			pr_info("Core dump to |%s disabled\n", cn.corename);</div><div class='del'>-			goto close_fail;</div><div class='add'>+	if (unshare_files())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((cn-&gt;mask &amp; COREDUMP_KERNEL) &amp;&amp; !coredump_write(cn, cprm, binfmt))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	coredump_sock_shutdown(cprm-&gt;file);</div><div class='add'>+</div><div class='add'>+	/* Let the parent know that a coredump was generated. */</div><div class='add'>+	if (cn-&gt;mask &amp; COREDUMP_USERSPACE)</div><div class='add'>+		cn-&gt;core_dumped = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When core_pipe_limit is set we wait for the coredump server</div><div class='add'>+	 * or usermodehelper to finish before exiting so it can e.g.,</div><div class='add'>+	 * inspect /proc/&lt;pid&gt;.</div><div class='add'>+	 */</div><div class='add'>+	if (cn-&gt;mask &amp; COREDUMP_WAIT) {</div><div class='add'>+		switch (cn-&gt;core_type) {</div><div class='add'>+		case COREDUMP_PIPE:</div><div class='add'>+			wait_for_dump_helpers(cprm-&gt;file);</div><div class='add'>+			break;</div><div class='add'>+		case COREDUMP_SOCK_REQ:</div><div class='add'>+			fallthrough;</div><div class='add'>+		case COREDUMP_SOCK:</div><div class='add'>+			coredump_sock_wait(cprm-&gt;file);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!dump_vma_snapshot(&amp;cprm))</div><div class='del'>-			goto close_fail;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		file_start_write(cprm.file);</div><div class='del'>-		core_dumped = binfmt-&gt;core_dump(&amp;cprm);</div><div class='add'>+void vfs_coredump(const kernel_siginfo_t *siginfo)</div><div class='add'>+{</div><div class='add'>+	size_t *argv __free(kfree) = NULL;</div><div class='add'>+	struct core_state core_state;</div><div class='add'>+	struct core_name cn;</div><div class='add'>+	const struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	const struct linux_binfmt *binfmt = mm-&gt;binfmt;</div><div class='add'>+	int argc = 0;</div><div class='add'>+	struct coredump_params cprm = {</div><div class='add'>+		.siginfo = siginfo,</div><div class='add'>+		.limit = rlimit(RLIMIT_CORE),</div><div class='ctx'> 		/*</div><div class='del'>-		 * Ensures that file size is big enough to contain the current</div><div class='del'>-		 * file postion. This prevents gdb from complaining about</div><div class='del'>-		 * a truncated file if the last "write" to the file was</div><div class='del'>-		 * dump_skip.</div><div class='add'>+		 * We must use the same mm-&gt;flags while dumping core to avoid</div><div class='add'>+		 * inconsistency of bit flags, since this flag is not protected</div><div class='add'>+		 * by any locks.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that we only care about MMF_DUMP* flags.</div><div class='ctx'> 		 */</div><div class='del'>-		if (cprm.to_skip) {</div><div class='del'>-			cprm.to_skip--;</div><div class='del'>-			dump_emit(&amp;cprm, "", 1);</div><div class='del'>-		}</div><div class='del'>-		file_end_write(cprm.file);</div><div class='del'>-		free_vma_snapshot(&amp;cprm);</div><div class='del'>-	}</div><div class='del'>-	if (ispipe &amp;&amp; core_pipe_limit)</div><div class='del'>-		wait_for_dump_helpers(cprm.file);</div><div class='del'>-close_fail:</div><div class='del'>-	if (cprm.file)</div><div class='del'>-		filp_close(cprm.file, NULL);</div><div class='del'>-fail_dropcount:</div><div class='del'>-	if (ispipe)</div><div class='del'>-		atomic_dec(&amp;core_dump_count);</div><div class='del'>-fail_unlock:</div><div class='del'>-	kfree(argv);</div><div class='del'>-	kfree(cn.corename);</div><div class='del'>-	coredump_finish(core_dumped);</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-fail_creds:</div><div class='del'>-	put_cred(cred);</div><div class='del'>-fail:</div><div class='add'>+		.mm_flags = __mm_flags_get_dumpable(mm),</div><div class='add'>+		.vma_meta = NULL,</div><div class='add'>+		.cpu = raw_smp_processor_id(),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	audit_core_dumps(siginfo-&gt;si_signo);</div><div class='add'>+</div><div class='add'>+	if (coredump_skip(&amp;cprm, binfmt))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	CLASS(prepare_creds, cred)();</div><div class='add'>+	if (!cred)</div><div class='add'>+		return;</div><div class='add'>+	/*</div><div class='add'>+	 * We cannot trust fsuid as being the "true" uid of the process</div><div class='add'>+	 * nor do we know its entire history. We only know it was tainted</div><div class='add'>+	 * so we dump it as root in mode 2, and only into a controlled</div><div class='add'>+	 * environment (pipe handler or fully qualified path).</div><div class='add'>+	 */</div><div class='add'>+	if (coredump_force_suid_safe(&amp;cprm))</div><div class='add'>+		cred-&gt;fsuid = GLOBAL_ROOT_UID;</div><div class='add'>+</div><div class='add'>+	if (coredump_wait(siginfo-&gt;si_signo, &amp;core_state) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scoped_with_creds(cred)</div><div class='add'>+		do_coredump(&amp;cn, &amp;cprm, &amp;argv, &amp;argc, binfmt);</div><div class='add'>+	coredump_cleanup(&amp;cn, &amp;cprm);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -804,10 +1212,9 @@ static int __dump_emit(struct coredump_params *cprm, const void *addr, int nr)</div><div class='ctx'> 	struct file *file = cprm-&gt;file;</div><div class='ctx'> 	loff_t pos = file-&gt;f_pos;</div><div class='ctx'> 	ssize_t n;</div><div class='add'>+</div><div class='ctx'> 	if (cprm-&gt;written + nr &gt; cprm-&gt;limit)</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	if (dump_interrupted())</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	n = __kernel_write(file, addr, nr, &amp;pos);</div><div class='hunk'>@@ -824,20 +1231,21 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr)</div><div class='ctx'> {</div><div class='ctx'> 	static char zeroes[PAGE_SIZE];</div><div class='ctx'> 	struct file *file = cprm-&gt;file;</div><div class='add'>+</div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_LSEEK) {</div><div class='del'>-		if (dump_interrupted() ||</div><div class='del'>-		    vfs_llseek(file, nr, SEEK_CUR) &lt; 0)</div><div class='add'>+		if (dump_interrupted() || vfs_llseek(file, nr, SEEK_CUR) &lt; 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		cprm-&gt;pos += nr;</div><div class='ctx'> 		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		while (nr &gt; PAGE_SIZE) {</div><div class='del'>-			if (!__dump_emit(cprm, zeroes, PAGE_SIZE))</div><div class='del'>-				return 0;</div><div class='del'>-			nr -= PAGE_SIZE;</div><div class='del'>-		}</div><div class='del'>-		return __dump_emit(cprm, zeroes, nr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	while (nr &gt; PAGE_SIZE) {</div><div class='add'>+		if (!__dump_emit(cprm, zeroes, PAGE_SIZE))</div><div class='add'>+			return 0;</div><div class='add'>+		nr -= PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __dump_emit(cprm, zeroes, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dump_emit(struct coredump_params *cprm, const void *addr, int nr)</div><div class='hunk'>@@ -872,6 +1280,9 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)</div><div class='ctx'> 	loff_t pos;</div><div class='ctx'> 	ssize_t n;</div><div class='ctx'> </div><div class='add'>+	if (!page)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (cprm-&gt;to_skip) {</div><div class='ctx'> 		if (!__dump_skip(cprm, cprm-&gt;to_skip))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -884,7 +1295,6 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)</div><div class='ctx'> 	pos = file-&gt;f_pos;</div><div class='ctx'> 	bvec_set_page(&amp;bvec, page, PAGE_SIZE, 0);</div><div class='ctx'> 	iov_iter_bvec(&amp;iter, ITER_SOURCE, &amp;bvec, 1, PAGE_SIZE);</div><div class='del'>-	iov_iter_set_copy_mc(&amp;iter);</div><div class='ctx'> 	n = __kernel_write_iter(cprm-&gt;file, &amp;iter, &amp;pos);</div><div class='ctx'> 	if (n != PAGE_SIZE)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -895,14 +1305,57 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If we might get machine checks from kernel accesses during the</div><div class='add'>+ * core dump, let's get those errors early rather than during the</div><div class='add'>+ * IO. This is not performance-critical enough to warrant having</div><div class='add'>+ * all the machine check logic in the iovec paths.</div><div class='add'>+ */</div><div class='add'>+#ifdef copy_mc_to_kernel</div><div class='add'>+</div><div class='add'>+#define dump_page_alloc() alloc_page(GFP_KERNEL)</div><div class='add'>+#define dump_page_free(x) __free_page(x)</div><div class='add'>+static struct page *dump_page_copy(struct page *src, struct page *dst)</div><div class='add'>+{</div><div class='add'>+	void *buf = kmap_local_page(src);</div><div class='add'>+	size_t left = copy_mc_to_kernel(page_address(dst), buf, PAGE_SIZE);</div><div class='add'>+	kunmap_local(buf);</div><div class='add'>+	return left ? NULL : dst;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/* We just want to return non-NULL; it's never used. */</div><div class='add'>+#define dump_page_alloc() ERR_PTR(-EINVAL)</div><div class='add'>+#define dump_page_free(x) ((void)(x))</div><div class='add'>+static inline struct page *dump_page_copy(struct page *src, struct page *dst)</div><div class='add'>+{</div><div class='add'>+	return src;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int dump_user_range(struct coredump_params *cprm, unsigned long start,</div><div class='ctx'> 		    unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='add'>+	struct page *dump_page;</div><div class='add'>+	int locked, ret;</div><div class='ctx'> </div><div class='add'>+	dump_page = dump_page_alloc();</div><div class='add'>+	if (!dump_page)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	locked = 0;</div><div class='ctx'> 	for (addr = start; addr &lt; start + len; addr += PAGE_SIZE) {</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='add'>+		if (!locked) {</div><div class='add'>+			if (mmap_read_lock_killable(current-&gt;mm))</div><div class='add'>+				goto out;</div><div class='add'>+			locked = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * To avoid having to allocate page tables for virtual address</div><div class='ctx'> 		 * ranges that have never been used yet, and also to make it</div><div class='hunk'>@@ -910,17 +1363,38 @@ int dump_user_range(struct coredump_params *cprm, unsigned long start,</div><div class='ctx'> 		 * NULL when encountering an empty page table entry that would</div><div class='ctx'> 		 * otherwise have been filled with the zero page.</div><div class='ctx'> 		 */</div><div class='del'>-		page = get_dump_page(addr);</div><div class='add'>+		page = get_dump_page(addr, &amp;locked);</div><div class='ctx'> 		if (page) {</div><div class='del'>-			int stop = !dump_emit_page(cprm, page);</div><div class='add'>+			if (locked) {</div><div class='add'>+				mmap_read_unlock(current-&gt;mm);</div><div class='add'>+				locked = 0;</div><div class='add'>+			}</div><div class='add'>+			int stop = !dump_emit_page(cprm, dump_page_copy(page, dump_page));</div><div class='ctx'> 			put_page(page);</div><div class='ctx'> 			if (stop)</div><div class='del'>-				return 0;</div><div class='add'>+				goto out;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dump_skip(cprm, PAGE_SIZE);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (dump_interrupted())</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (!need_resched())</div><div class='add'>+			continue;</div><div class='add'>+		if (locked) {</div><div class='add'>+			mmap_read_unlock(current-&gt;mm);</div><div class='add'>+			locked = 0;</div><div class='add'>+		}</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	ret = 1;</div><div class='add'>+out:</div><div class='add'>+	if (locked)</div><div class='add'>+		mmap_read_unlock(current-&gt;mm);</div><div class='add'>+</div><div class='add'>+	dump_page_free(dump_page);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -940,26 +1414,88 @@ EXPORT_SYMBOL(dump_align);</div><div class='ctx'> void validate_coredump_safety(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (suid_dumpable == SUID_DUMP_ROOT &amp;&amp;</div><div class='del'>-	    core_pattern[0] != '/' &amp;&amp; core_pattern[0] != '|') {</div><div class='del'>-		pr_warn(</div><div class='del'>-"Unsafe core_pattern used with fs.suid_dumpable=2.\n"</div><div class='del'>-"Pipe handler or fully qualified core dump path required.\n"</div><div class='del'>-"Set kernel.core_pattern before fs.suid_dumpable.\n"</div><div class='del'>-		);</div><div class='add'>+	    core_pattern[0] != '/' &amp;&amp; core_pattern[0] != '|' &amp;&amp; core_pattern[0] != '@') {</div><div class='add'>+</div><div class='add'>+		coredump_report_failure("Unsafe core_pattern used with fs.suid_dumpable=2: "</div><div class='add'>+			"pipe handler or fully qualified core dump path required. "</div><div class='add'>+			"Set kernel.core_pattern before fs.suid_dumpable.");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_dostring_coredump(struct ctl_table *table, int write,</div><div class='add'>+static inline bool check_coredump_socket(void)</div><div class='add'>+{</div><div class='add'>+	const char *p;</div><div class='add'>+</div><div class='add'>+	if (core_pattern[0] != '@')</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Coredump socket must be located in the initial mount</div><div class='add'>+	 * namespace. Don't give the impression that anything else is</div><div class='add'>+	 * supported right now.</div><div class='add'>+	 */</div><div class='add'>+	if (current-&gt;nsproxy-&gt;mnt_ns != init_task.nsproxy-&gt;mnt_ns)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Must be an absolute path... */</div><div class='add'>+	if (core_pattern[1] != '/') {</div><div class='add'>+		/* ... or the socket request protocol... */</div><div class='add'>+		if (core_pattern[1] != '@')</div><div class='add'>+			return false;</div><div class='add'>+		/* ... and if so must be an absolute path. */</div><div class='add'>+		if (core_pattern[2] != '/')</div><div class='add'>+			return false;</div><div class='add'>+		p = &amp;core_pattern[2];</div><div class='add'>+	} else {</div><div class='add'>+		p = &amp;core_pattern[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The path obviously cannot exceed UNIX_PATH_MAX. */</div><div class='add'>+	if (strlen(p) &gt;= UNIX_PATH_MAX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Must not contain ".." in the path. */</div><div class='add'>+	if (name_contains_dotdot(core_pattern))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int proc_dostring_coredump(const struct ctl_table *table, int write,</div><div class='ctx'> 		  void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int error = proc_dostring(table, write, buffer, lenp, ppos);</div><div class='add'>+	int error;</div><div class='add'>+	ssize_t retval;</div><div class='add'>+	char old_core_pattern[CORENAME_MAX_SIZE];</div><div class='add'>+</div><div class='add'>+	if (!write)</div><div class='add'>+		return proc_dostring(table, write, buffer, lenp, ppos);</div><div class='add'>+</div><div class='add'>+	retval = strscpy(old_core_pattern, core_pattern, CORENAME_MAX_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (!error)</div><div class='del'>-		validate_coredump_safety();</div><div class='add'>+	error = proc_dostring(table, write, buffer, lenp, ppos);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	if (!check_coredump_socket()) {</div><div class='add'>+		strscpy(core_pattern, old_core_pattern, retval + 1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	validate_coredump_safety();</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table coredump_sysctls[] = {</div><div class='add'>+static const unsigned int core_file_note_size_min = CORE_FILE_NOTE_SIZE_DEFAULT;</div><div class='add'>+static const unsigned int core_file_note_size_max = CORE_FILE_NOTE_SIZE_MAX;</div><div class='add'>+static char core_modes[] = {</div><div class='add'>+	"file\npipe"</div><div class='add'>+#ifdef CONFIG_UNIX</div><div class='add'>+	"\nsocket"</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ctl_table coredump_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "core_uses_pid",</div><div class='ctx'> 		.data		= &amp;core_uses_pid,</div><div class='hunk'>@@ -979,7 +1515,34 @@ static struct ctl_table coredump_sysctls[] = {</div><div class='ctx'> 		.data		= &amp;core_pipe_limit,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_INT_MAX,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname       = "core_file_note_size_limit",</div><div class='add'>+		.data           = &amp;core_file_note_size_limit,</div><div class='add'>+		.maxlen         = sizeof(unsigned int),</div><div class='add'>+		.mode           = 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= (unsigned int *)&amp;core_file_note_size_min,</div><div class='add'>+		.extra2		= (unsigned int *)&amp;core_file_note_size_max,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "core_sort_vma",</div><div class='add'>+		.data		= &amp;core_sort_vma,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "core_modes",</div><div class='add'>+		.data		= core_modes,</div><div class='add'>+		.maxlen		= sizeof(core_modes) - 1,</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.proc_handler	= proc_dostring,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1137,6 +1700,18 @@ static void free_vma_snapshot(struct coredump_params *cprm)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cmp_vma_size(const void *vma_meta_lhs_ptr, const void *vma_meta_rhs_ptr)</div><div class='add'>+{</div><div class='add'>+	const struct core_vma_metadata *vma_meta_lhs = vma_meta_lhs_ptr;</div><div class='add'>+	const struct core_vma_metadata *vma_meta_rhs = vma_meta_rhs_ptr;</div><div class='add'>+</div><div class='add'>+	if (vma_meta_lhs-&gt;dump_size &lt; vma_meta_rhs-&gt;dump_size)</div><div class='add'>+		return -1;</div><div class='add'>+	if (vma_meta_lhs-&gt;dump_size &gt; vma_meta_rhs-&gt;dump_size)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Under the mmap_lock, take a snapshot of relevant information about the task's</div><div class='ctx'>  * VMAs.</div><div class='hunk'>@@ -1199,5 +1774,9 @@ static bool dump_vma_snapshot(struct coredump_params *cprm)</div><div class='ctx'> 		cprm-&gt;vma_data_size += m-&gt;dump_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (core_sort_vma)</div><div class='add'>+		sort(cprm-&gt;vma_meta, cprm-&gt;vma_count, sizeof(*cprm-&gt;vma_meta),</div><div class='add'>+		     cmp_vma_size, NULL);</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c<br/>index 39e75131fd5a..e54ebe402df7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/cramfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/cramfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/cramfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/cramfs/inode.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/pfn_t.h&gt;</div><div class='ctx'> #include &lt;linux/ramfs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -96,7 +95,7 @@ static struct inode *get_cramfs_inode(struct super_block *sb,</div><div class='ctx'> 	inode = iget_locked(sb, cramino(cramfs_inode, offset));</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	switch (cramfs_inode-&gt;mode &amp; S_IFMT) {</div><div class='hunk'>@@ -117,9 +116,18 @@ static struct inode *get_cramfs_inode(struct super_block *sb,</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 		inode-&gt;i_data.a_ops = &amp;cramfs_aops;</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='add'>+	case S_IFCHR:</div><div class='add'>+	case S_IFBLK:</div><div class='add'>+	case S_IFIFO:</div><div class='add'>+	case S_IFSOCK:</div><div class='ctx'> 		init_special_inode(inode, cramfs_inode-&gt;mode,</div><div class='ctx'> 				old_decode_dev(cramfs_inode-&gt;size));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_DEBUG "CRAMFS: Invalid file type 0%04o for inode %lu.\n",</div><div class='add'>+		       inode-&gt;i_mode, inode-&gt;i_ino);</div><div class='add'>+		iget_failed(inode);</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = cramfs_inode-&gt;mode;</div><div class='hunk'>@@ -183,7 +191,7 @@ static int next_buffer;</div><div class='ctx'> static void *cramfs_blkdev_read(struct super_block *sb, unsigned int offset,</div><div class='ctx'> 				unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = sb-&gt;s_bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *mapping = sb-&gt;s_bdev-&gt;bd_mapping;</div><div class='ctx'> 	struct file_ra_state ra = {};</div><div class='ctx'> 	struct page *pages[BLKS_PER_BUF];</div><div class='ctx'> 	unsigned i, blocknr, buffer;</div><div class='hunk'>@@ -412,8 +420,8 @@ static int cramfs_physmem_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		for (i = 0; i &lt; pages &amp;&amp; !ret; i++) {</div><div class='ctx'> 			vm_fault_t vmf;</div><div class='ctx'> 			unsigned long off = i * PAGE_SIZE;</div><div class='del'>-			pfn_t pfn = phys_to_pfn_t(address + off, PFN_DEV);</div><div class='del'>-			vmf = vmf_insert_mixed(vma, vma-&gt;vm_start + off, pfn);</div><div class='add'>+			vmf = vmf_insert_mixed(vma, vma-&gt;vm_start + off,</div><div class='add'>+					PHYS_PFN(address + off));</div><div class='ctx'> 			if (vmf &amp; VM_FAULT_ERROR)</div><div class='ctx'> 				ret = vm_fault_to_errno(vmf, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -495,7 +503,7 @@ static void cramfs_kill_sb(struct super_block *sb)</div><div class='ctx'> 		sb-&gt;s_mtd = NULL;</div><div class='ctx'> 	} else if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV) &amp;&amp; sb-&gt;s_bdev) {</div><div class='ctx'> 		sync_blockdev(sb-&gt;s_bdev);</div><div class='del'>-		fput(sb-&gt;s_bdev_file);</div><div class='add'>+		bdev_fput(sb-&gt;s_bdev_file);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(sbi);</div><div class='ctx'> }</div><div class='hunk'>@@ -811,19 +819,19 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int cramfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	u32 maxblock;</div><div class='ctx'> 	int bytes_filled;</div><div class='ctx'> 	void *pgdata;</div><div class='add'>+	bool success = false;</div><div class='ctx'> </div><div class='ctx'> 	maxblock = (inode-&gt;i_size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	bytes_filled = 0;</div><div class='del'>-	pgdata = kmap_local_page(page);</div><div class='add'>+	pgdata = kmap_local_folio(folio, 0);</div><div class='ctx'> </div><div class='del'>-	if (page-&gt;index &lt; maxblock) {</div><div class='add'>+	if (folio-&gt;index &lt; maxblock) {</div><div class='ctx'> 		struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-		u32 blkptr_offset = OFFSET(inode) + page-&gt;index * 4;</div><div class='add'>+		u32 blkptr_offset = OFFSET(inode) + folio-&gt;index * 4;</div><div class='ctx'> 		u32 block_ptr, block_start, block_len;</div><div class='ctx'> 		bool uncompressed, direct;</div><div class='ctx'> </div><div class='hunk'>@@ -844,7 +852,7 @@ static int cramfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 			if (uncompressed) {</div><div class='ctx'> 				block_len = PAGE_SIZE;</div><div class='ctx'> 				/* if last block: cap to file length */</div><div class='del'>-				if (page-&gt;index == maxblock - 1)</div><div class='add'>+				if (folio-&gt;index == maxblock - 1)</div><div class='ctx'> 					block_len =</div><div class='ctx'> 						offset_in_page(inode-&gt;i_size);</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -861,7 +869,7 @@ static int cramfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 			 * from the previous block's pointer.</div><div class='ctx'> 			 */</div><div class='ctx'> 			block_start = OFFSET(inode) + maxblock * 4;</div><div class='del'>-			if (page-&gt;index)</div><div class='add'>+			if (folio-&gt;index)</div><div class='ctx'> 				block_start = *(u32 *)</div><div class='ctx'> 					cramfs_read(sb, blkptr_offset - 4, 4);</div><div class='ctx'> 			/* Beware... previous ptr might be a direct ptr */</div><div class='hunk'>@@ -906,17 +914,12 @@ static int cramfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(pgdata + bytes_filled, 0, PAGE_SIZE - bytes_filled);</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	kunmap_local(pgdata);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return 0;</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='add'>+	success = true;</div><div class='ctx'> err:</div><div class='ctx'> 	kunmap_local(pgdata);</div><div class='del'>-	ClearPageUptodate(page);</div><div class='del'>-	SetPageError(page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_end_read(folio, success);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1003,4 +1006,5 @@ static void __exit exit_cramfs_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_cramfs_fs)</div><div class='ctx'> module_exit(exit_cramfs_fs)</div><div class='add'>+MODULE_DESCRIPTION("Compressed ROM file system support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/crypto/Kconfig b/fs/crypto/Kconfig<br/>index 5aff5934baa1..464b54610fd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/Kconfig</a></div><div class='hunk'>@@ -2,9 +2,9 @@</div><div class='ctx'> config FS_ENCRYPTION</div><div class='ctx'> 	bool "FS Encryption (Per-file encryption)"</div><div class='ctx'> 	select CRYPTO</div><div class='del'>-	select CRYPTO_HASH</div><div class='ctx'> 	select CRYPTO_SKCIPHER</div><div class='ctx'> 	select CRYPTO_LIB_SHA256</div><div class='add'>+	select CRYPTO_LIB_SHA512</div><div class='ctx'> 	select KEYS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable encryption of files and directories.  This</div><div class='hunk'>@@ -24,20 +24,14 @@ config FS_ENCRYPTION</div><div class='ctx'> #</div><div class='ctx'> # Also note that this option only pulls in the generic implementations of the</div><div class='ctx'> # algorithms, not any per-architecture optimized implementations.  It is</div><div class='del'>-# strongly recommended to enable optimized implementations too.  It is safe to</div><div class='del'>-# disable these generic implementations if corresponding optimized</div><div class='del'>-# implementations will always be available too; for this reason, these are soft</div><div class='del'>-# dependencies ('imply' rather than 'select').  Only disable these generic</div><div class='del'>-# implementations if you're sure they will never be needed, though.</div><div class='add'>+# strongly recommended to enable optimized implementations too.</div><div class='ctx'> config FS_ENCRYPTION_ALGS</div><div class='ctx'> 	tristate</div><div class='del'>-	imply CRYPTO_AES</div><div class='del'>-	imply CRYPTO_CBC</div><div class='del'>-	imply CRYPTO_CTS</div><div class='del'>-	imply CRYPTO_ECB</div><div class='del'>-	imply CRYPTO_HMAC</div><div class='del'>-	imply CRYPTO_SHA512</div><div class='del'>-	imply CRYPTO_XTS</div><div class='add'>+	select CRYPTO_AES</div><div class='add'>+	select CRYPTO_CBC</div><div class='add'>+	select CRYPTO_CTS</div><div class='add'>+	select CRYPTO_ECB</div><div class='add'>+	select CRYPTO_XTS</div><div class='ctx'> </div><div class='ctx'> config FS_ENCRYPTION_INLINE_CRYPT</div><div class='ctx'> 	bool "Enable fscrypt to use inline crypto"</div><div class='head'>diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c<br/>index 0ad8c30b8fa5..5f5599020e94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/bio.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/bio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/bio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/bio.c</a></div><div class='hunk'>@@ -7,10 +7,12 @@</div><div class='ctx'>  * Copyright (C) 2015, Motorola Mobility</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -111,7 +113,7 @@ out:</div><div class='ctx'> int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,</div><div class='ctx'> 			  sector_t pblk, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	const struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> 	const unsigned int du_bits = ci-&gt;ci_data_unit_bits;</div><div class='ctx'> 	const unsigned int du_size = 1U &lt;&lt; du_bits;</div><div class='ctx'> 	const unsigned int du_per_page_bits = PAGE_SHIFT - du_bits;</div><div class='hunk'>@@ -146,7 +148,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; nr_pages; i++) {</div><div class='ctx'> 		pages[i] = fscrypt_alloc_bounce_page(i == 0 ? GFP_NOFS :</div><div class='del'>-						     GFP_NOWAIT | __GFP_NOWARN);</div><div class='add'>+						     GFP_NOWAIT);</div><div class='ctx'> 		if (!pages[i])</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -165,8 +167,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,</div><div class='ctx'> 		do {</div><div class='ctx'> 			err = fscrypt_crypt_data_unit(ci, FS_ENCRYPT, du_index,</div><div class='ctx'> 						      ZERO_PAGE(0), pages[i],</div><div class='del'>-						      du_size, offset,</div><div class='del'>-						      GFP_NOFS);</div><div class='add'>+						      du_size, offset);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			du_index++;</div><div class='head'>diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c<br/>index 328470d40dec..07f9cbfe3ea4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/crypto.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/crypto.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/crypto.c</a></div><div class='hunk'>@@ -20,12 +20,14 @@</div><div class='ctx'>  * Special Publication 800-38E and IEEE P1619/D16.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/mempool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='del'>-#include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int num_prealloc_crypto_pages = 32;</div><div class='hunk'>@@ -108,15 +110,13 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 index,</div><div class='ctx'> int fscrypt_crypt_data_unit(const struct fscrypt_inode_info *ci,</div><div class='ctx'> 			    fscrypt_direction_t rw, u64 index,</div><div class='ctx'> 			    struct page *src_page, struct page *dest_page,</div><div class='del'>-			    unsigned int len, unsigned int offs,</div><div class='del'>-			    gfp_t gfp_flags)</div><div class='add'>+			    unsigned int len, unsigned int offs)</div><div class='ctx'> {</div><div class='add'>+	struct crypto_sync_skcipher *tfm = ci-&gt;ci_enc_key.tfm;</div><div class='add'>+	SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);</div><div class='ctx'> 	union fscrypt_iv iv;</div><div class='del'>-	struct skcipher_request *req = NULL;</div><div class='del'>-	DECLARE_CRYPTO_WAIT(wait);</div><div class='ctx'> 	struct scatterlist dst, src;</div><div class='del'>-	struct crypto_skcipher *tfm = ci-&gt;ci_enc_key.tfm;</div><div class='del'>-	int res = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(len &lt;= 0))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -125,36 +125,28 @@ int fscrypt_crypt_data_unit(const struct fscrypt_inode_info *ci,</div><div class='ctx'> </div><div class='ctx'> 	fscrypt_generate_iv(&amp;iv, index, ci);</div><div class='ctx'> </div><div class='del'>-	req = skcipher_request_alloc(tfm, gfp_flags);</div><div class='del'>-	if (!req)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	skcipher_request_set_callback(</div><div class='ctx'> 		req, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='del'>-		crypto_req_done, &amp;wait);</div><div class='del'>-</div><div class='add'>+		NULL, NULL);</div><div class='ctx'> 	sg_init_table(&amp;dst, 1);</div><div class='ctx'> 	sg_set_page(&amp;dst, dest_page, len, offs);</div><div class='ctx'> 	sg_init_table(&amp;src, 1);</div><div class='ctx'> 	sg_set_page(&amp;src, src_page, len, offs);</div><div class='ctx'> 	skcipher_request_set_crypt(req, &amp;src, &amp;dst, len, &amp;iv);</div><div class='ctx'> 	if (rw == FS_DECRYPT)</div><div class='del'>-		res = crypto_wait_req(crypto_skcipher_decrypt(req), &amp;wait);</div><div class='add'>+		err = crypto_skcipher_decrypt(req);</div><div class='ctx'> 	else</div><div class='del'>-		res = crypto_wait_req(crypto_skcipher_encrypt(req), &amp;wait);</div><div class='del'>-	skcipher_request_free(req);</div><div class='del'>-	if (res) {</div><div class='add'>+		err = crypto_skcipher_encrypt(req);</div><div class='add'>+	if (err)</div><div class='ctx'> 		fscrypt_err(ci-&gt;ci_inode,</div><div class='ctx'> 			    "%scryption failed for data unit %llu: %d",</div><div class='del'>-			    (rw == FS_DECRYPT ? "De" : "En"), index, res);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+			    (rw == FS_DECRYPT ? "De" : "En"), index, err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fscrypt_encrypt_pagecache_blocks() - Encrypt data from a pagecache page</div><div class='del'>- * @page: the locked pagecache page containing the data to encrypt</div><div class='add'>+ * fscrypt_encrypt_pagecache_blocks() - Encrypt data from a pagecache folio</div><div class='add'>+ * @folio: the locked pagecache folio containing the data to encrypt</div><div class='ctx'>  * @len: size of the data to encrypt, in bytes</div><div class='ctx'>  * @offs: offset within @page of the data to encrypt, in bytes</div><div class='ctx'>  * @gfp_flags: memory allocation flags; see details below</div><div class='hunk'>@@ -177,23 +169,21 @@ int fscrypt_crypt_data_unit(const struct fscrypt_inode_info *ci,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the new encrypted bounce page on success; an ERR_PTR() on failure</div><div class='ctx'>  */</div><div class='del'>-struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,</div><div class='del'>-					      unsigned int len,</div><div class='del'>-					      unsigned int offs,</div><div class='del'>-					      gfp_t gfp_flags)</div><div class='del'>-</div><div class='add'>+struct page *fscrypt_encrypt_pagecache_blocks(struct folio *folio,</div><div class='add'>+		size_t len, size_t offs, gfp_t gfp_flags)</div><div class='ctx'> {</div><div class='del'>-	const struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	const struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='add'>+	const struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> 	const unsigned int du_bits = ci-&gt;ci_data_unit_bits;</div><div class='ctx'> 	const unsigned int du_size = 1U &lt;&lt; du_bits;</div><div class='ctx'> 	struct page *ciphertext_page;</div><div class='del'>-	u64 index = ((u64)page-&gt;index &lt;&lt; (PAGE_SHIFT - du_bits)) +</div><div class='add'>+	u64 index = ((u64)folio-&gt;index &lt;&lt; (PAGE_SHIFT - du_bits)) +</div><div class='ctx'> 		    (offs &gt;&gt; du_bits);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!PageLocked(page)))</div><div class='add'>+	VM_BUG_ON_FOLIO(folio_test_large(folio), folio);</div><div class='add'>+	if (WARN_ON_ONCE(!folio_test_locked(folio)))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(len &lt;= 0 || !IS_ALIGNED(len | offs, du_size)))</div><div class='hunk'>@@ -205,15 +195,15 @@ struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,</div><div class='ctx'> </div><div class='ctx'> 	for (i = offs; i &lt; offs + len; i += du_size, index++) {</div><div class='ctx'> 		err = fscrypt_crypt_data_unit(ci, FS_ENCRYPT, index,</div><div class='del'>-					      page, ciphertext_page,</div><div class='del'>-					      du_size, i, gfp_flags);</div><div class='add'>+					      &amp;folio-&gt;page, ciphertext_page,</div><div class='add'>+					      du_size, i);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			fscrypt_free_bounce_page(ciphertext_page);</div><div class='ctx'> 			return ERR_PTR(err);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	SetPagePrivate(ciphertext_page);</div><div class='del'>-	set_page_private(ciphertext_page, (unsigned long)page);</div><div class='add'>+	set_page_private(ciphertext_page, (unsigned long)folio);</div><div class='ctx'> 	return ciphertext_page;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fscrypt_encrypt_pagecache_blocks);</div><div class='hunk'>@@ -227,7 +217,6 @@ EXPORT_SYMBOL(fscrypt_encrypt_pagecache_blocks);</div><div class='ctx'>  * @offs:      Byte offset within @page at which the block to encrypt begins</div><div class='ctx'>  * @lblk_num:  Filesystem logical block number of the block, i.e. the 0-based</div><div class='ctx'>  *		number of the block within the file</div><div class='del'>- * @gfp_flags: Memory allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  * Encrypt a possibly-compressed filesystem block that is located in an</div><div class='ctx'>  * arbitrary page, not necessarily in the original pagecache page.  The @inode</div><div class='hunk'>@@ -239,13 +228,13 @@ EXPORT_SYMBOL(fscrypt_encrypt_pagecache_blocks);</div><div class='ctx'>  */</div><div class='ctx'> int fscrypt_encrypt_block_inplace(const struct inode *inode, struct page *page,</div><div class='ctx'> 				  unsigned int len, unsigned int offs,</div><div class='del'>-				  u64 lblk_num, gfp_t gfp_flags)</div><div class='add'>+				  u64 lblk_num)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON_ONCE(inode-&gt;i_sb-&gt;s_cop-&gt;supports_subblock_data_units))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	return fscrypt_crypt_data_unit(inode-&gt;i_crypt_info, FS_ENCRYPT,</div><div class='del'>-				       lblk_num, page, page, len, offs,</div><div class='del'>-				       gfp_flags);</div><div class='add'>+	return fscrypt_crypt_data_unit(fscrypt_get_inode_info_raw(inode),</div><div class='add'>+				       FS_ENCRYPT, lblk_num, page, page, len,</div><div class='add'>+				       offs);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fscrypt_encrypt_block_inplace);</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +256,7 @@ int fscrypt_decrypt_pagecache_blocks(struct folio *folio, size_t len,</div><div class='ctx'> 				     size_t offs)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	const struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> 	const unsigned int du_bits = ci-&gt;ci_data_unit_bits;</div><div class='ctx'> 	const unsigned int du_size = 1U &lt;&lt; du_bits;</div><div class='ctx'> 	u64 index = ((u64)folio-&gt;index &lt;&lt; (PAGE_SHIFT - du_bits)) +</div><div class='hunk'>@@ -285,8 +274,7 @@ int fscrypt_decrypt_pagecache_blocks(struct folio *folio, size_t len,</div><div class='ctx'> 		struct page *page = folio_page(folio, i &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 		err = fscrypt_crypt_data_unit(ci, FS_DECRYPT, index, page,</div><div class='del'>-					      page, du_size, i &amp; ~PAGE_MASK,</div><div class='del'>-					      GFP_NOFS);</div><div class='add'>+					      page, du_size, i &amp; ~PAGE_MASK);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -318,9 +306,9 @@ int fscrypt_decrypt_block_inplace(const struct inode *inode, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON_ONCE(inode-&gt;i_sb-&gt;s_cop-&gt;supports_subblock_data_units))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	return fscrypt_crypt_data_unit(inode-&gt;i_crypt_info, FS_DECRYPT,</div><div class='del'>-				       lblk_num, page, page, len, offs,</div><div class='del'>-				       GFP_NOFS);</div><div class='add'>+	return fscrypt_crypt_data_unit(fscrypt_get_inode_info_raw(inode),</div><div class='add'>+				       FS_DECRYPT, lblk_num, page, page, len,</div><div class='add'>+				       offs);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fscrypt_decrypt_block_inplace);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c<br/>index 7b3fc189593a..a9a4432d12ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/fname.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/fname.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/fname.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/fname.c</a></div><div class='hunk'>@@ -11,11 +11,13 @@</div><div class='ctx'>  * This has not yet undergone a rigorous security audit.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/sha2.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/base64.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -70,17 +72,11 @@ struct fscrypt_nokey_name {</div><div class='ctx'> </div><div class='ctx'> /* Encoded size of max-size no-key name */</div><div class='ctx'> #define FSCRYPT_NOKEY_NAME_MAX_ENCODED \</div><div class='del'>-		FSCRYPT_BASE64URL_CHARS(FSCRYPT_NOKEY_NAME_MAX)</div><div class='add'>+		BASE64_CHARS(FSCRYPT_NOKEY_NAME_MAX)</div><div class='ctx'> </div><div class='ctx'> static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)</div><div class='ctx'> {</div><div class='del'>-	if (str-&gt;len == 1 &amp;&amp; str-&gt;name[0] == '.')</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (str-&gt;len == 2 &amp;&amp; str-&gt;name[0] == '.' &amp;&amp; str-&gt;name[1] == '.')</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='add'>+	return is_dot_dotdot(str-&gt;name, str-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -98,13 +94,12 @@ static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)</div><div class='ctx'> int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,</div><div class='ctx'> 			  u8 *out, unsigned int olen)</div><div class='ctx'> {</div><div class='del'>-	struct skcipher_request *req = NULL;</div><div class='del'>-	DECLARE_CRYPTO_WAIT(wait);</div><div class='del'>-	const struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='del'>-	struct crypto_skcipher *tfm = ci-&gt;ci_enc_key.tfm;</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='add'>+	struct crypto_sync_skcipher *tfm = ci-&gt;ci_enc_key.tfm;</div><div class='add'>+	SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);</div><div class='ctx'> 	union fscrypt_iv iv;</div><div class='ctx'> 	struct scatterlist sg;</div><div class='del'>-	int res;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy the filename to the output buffer for encrypting in-place and</div><div class='hunk'>@@ -115,28 +110,17 @@ int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,</div><div class='ctx'> 	memcpy(out, iname-&gt;name, iname-&gt;len);</div><div class='ctx'> 	memset(out + iname-&gt;len, 0, olen - iname-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* Initialize the IV */</div><div class='ctx'> 	fscrypt_generate_iv(&amp;iv, 0, ci);</div><div class='ctx'> </div><div class='del'>-	/* Set up the encryption request */</div><div class='del'>-	req = skcipher_request_alloc(tfm, GFP_NOFS);</div><div class='del'>-	if (!req)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	skcipher_request_set_callback(req,</div><div class='del'>-			CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='del'>-			crypto_req_done, &amp;wait);</div><div class='add'>+	skcipher_request_set_callback(</div><div class='add'>+		req, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='add'>+		NULL, NULL);</div><div class='ctx'> 	sg_init_one(&amp;sg, out, olen);</div><div class='ctx'> 	skcipher_request_set_crypt(req, &amp;sg, &amp;sg, olen, &amp;iv);</div><div class='del'>-</div><div class='del'>-	/* Do the encryption */</div><div class='del'>-	res = crypto_wait_req(crypto_skcipher_encrypt(req), &amp;wait);</div><div class='del'>-	skcipher_request_free(req);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		fscrypt_err(inode, "Filename encryption failed: %d", res);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	err = crypto_skcipher_encrypt(req);</div><div class='add'>+	if (err)</div><div class='add'>+		fscrypt_err(inode, "Filename encryption failed: %d", err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fscrypt_fname_encrypt);</div><div class='ctx'> </div><div class='hunk'>@@ -154,118 +138,31 @@ static int fname_decrypt(const struct inode *inode,</div><div class='ctx'> 			 const struct fscrypt_str *iname,</div><div class='ctx'> 			 struct fscrypt_str *oname)</div><div class='ctx'> {</div><div class='del'>-	struct skcipher_request *req = NULL;</div><div class='del'>-	DECLARE_CRYPTO_WAIT(wait);</div><div class='del'>-	struct scatterlist src_sg, dst_sg;</div><div class='del'>-	const struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='del'>-	struct crypto_skcipher *tfm = ci-&gt;ci_enc_key.tfm;</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='add'>+	struct crypto_sync_skcipher *tfm = ci-&gt;ci_enc_key.tfm;</div><div class='add'>+	SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);</div><div class='ctx'> 	union fscrypt_iv iv;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	/* Allocate request */</div><div class='del'>-	req = skcipher_request_alloc(tfm, GFP_NOFS);</div><div class='del'>-	if (!req)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	skcipher_request_set_callback(req,</div><div class='del'>-		CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='del'>-		crypto_req_done, &amp;wait);</div><div class='add'>+	struct scatterlist src_sg, dst_sg;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* Initialize IV */</div><div class='ctx'> 	fscrypt_generate_iv(&amp;iv, 0, ci);</div><div class='ctx'> </div><div class='del'>-	/* Create decryption request */</div><div class='add'>+	skcipher_request_set_callback(</div><div class='add'>+		req, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='add'>+		NULL, NULL);</div><div class='ctx'> 	sg_init_one(&amp;src_sg, iname-&gt;name, iname-&gt;len);</div><div class='ctx'> 	sg_init_one(&amp;dst_sg, oname-&gt;name, oname-&gt;len);</div><div class='ctx'> 	skcipher_request_set_crypt(req, &amp;src_sg, &amp;dst_sg, iname-&gt;len, &amp;iv);</div><div class='del'>-	res = crypto_wait_req(crypto_skcipher_decrypt(req), &amp;wait);</div><div class='del'>-	skcipher_request_free(req);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		fscrypt_err(inode, "Filename decryption failed: %d", res);</div><div class='del'>-		return res;</div><div class='add'>+	err = crypto_skcipher_decrypt(req);</div><div class='add'>+	if (err) {</div><div class='add'>+		fscrypt_err(inode, "Filename decryption failed: %d", err);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	oname-&gt;len = strnlen(oname-&gt;name, iname-&gt;len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char base64url_table[65] =</div><div class='del'>-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";</div><div class='del'>-</div><div class='del'>-#define FSCRYPT_BASE64URL_CHARS(nbytes)	DIV_ROUND_UP((nbytes) * 4, 3)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fscrypt_base64url_encode() - base64url-encode some binary data</div><div class='del'>- * @src: the binary data to encode</div><div class='del'>- * @srclen: the length of @src in bytes</div><div class='del'>- * @dst: (output) the base64url-encoded string.  Not NUL-terminated.</div><div class='del'>- *</div><div class='del'>- * Encodes data using base64url encoding, i.e. the "Base 64 Encoding with URL</div><div class='del'>- * and Filename Safe Alphabet" specified by RFC 4648.  '='-padding isn't used,</div><div class='del'>- * as it's unneeded and not required by the RFC.  base64url is used instead of</div><div class='del'>- * base64 to avoid the '/' character, which isn't allowed in filenames.</div><div class='del'>- *</div><div class='del'>- * Return: the length of the resulting base64url-encoded string in bytes.</div><div class='del'>- *	   This will be equal to FSCRYPT_BASE64URL_CHARS(srclen).</div><div class='del'>- */</div><div class='del'>-static int fscrypt_base64url_encode(const u8 *src, int srclen, char *dst)</div><div class='del'>-{</div><div class='del'>-	u32 ac = 0;</div><div class='del'>-	int bits = 0;</div><div class='del'>-	int i;</div><div class='del'>-	char *cp = dst;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; srclen; i++) {</div><div class='del'>-		ac = (ac &lt;&lt; 8) | src[i];</div><div class='del'>-		bits += 8;</div><div class='del'>-		do {</div><div class='del'>-			bits -= 6;</div><div class='del'>-			*cp++ = base64url_table[(ac &gt;&gt; bits) &amp; 0x3f];</div><div class='del'>-		} while (bits &gt;= 6);</div><div class='del'>-	}</div><div class='del'>-	if (bits)</div><div class='del'>-		*cp++ = base64url_table[(ac &lt;&lt; (6 - bits)) &amp; 0x3f];</div><div class='del'>-	return cp - dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fscrypt_base64url_decode() - base64url-decode a string</div><div class='del'>- * @src: the string to decode.  Doesn't need to be NUL-terminated.</div><div class='del'>- * @srclen: the length of @src in bytes</div><div class='del'>- * @dst: (output) the decoded binary data</div><div class='del'>- *</div><div class='del'>- * Decodes a string using base64url encoding, i.e. the "Base 64 Encoding with</div><div class='del'>- * URL and Filename Safe Alphabet" specified by RFC 4648.  '='-padding isn't</div><div class='del'>- * accepted, nor are non-encoding characters such as whitespace.</div><div class='del'>- *</div><div class='del'>- * This implementation hasn't been optimized for performance.</div><div class='del'>- *</div><div class='del'>- * Return: the length of the resulting decoded binary data in bytes,</div><div class='del'>- *	   or -1 if the string isn't a valid base64url string.</div><div class='del'>- */</div><div class='del'>-static int fscrypt_base64url_decode(const char *src, int srclen, u8 *dst)</div><div class='del'>-{</div><div class='del'>-	u32 ac = 0;</div><div class='del'>-	int bits = 0;</div><div class='del'>-	int i;</div><div class='del'>-	u8 *bp = dst;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; srclen; i++) {</div><div class='del'>-		const char *p = strchr(base64url_table, src[i]);</div><div class='del'>-</div><div class='del'>-		if (p == NULL || src[i] == 0)</div><div class='del'>-			return -1;</div><div class='del'>-		ac = (ac &lt;&lt; 6) | (p - base64url_table);</div><div class='del'>-		bits += 6;</div><div class='del'>-		if (bits &gt;= 8) {</div><div class='del'>-			bits -= 8;</div><div class='del'>-			*bp++ = (u8)(ac &gt;&gt; bits);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ac &amp; ((1 &lt;&lt; bits) - 1))</div><div class='del'>-		return -1;</div><div class='del'>-	return bp - dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool __fscrypt_fname_encrypted_size(const union fscrypt_policy *policy,</div><div class='ctx'> 				    u32 orig_len, u32 max_len,</div><div class='ctx'> 				    u32 *encrypted_len_ret)</div><div class='hunk'>@@ -299,8 +196,9 @@ bool __fscrypt_fname_encrypted_size(const union fscrypt_policy *policy,</div><div class='ctx'> bool fscrypt_fname_encrypted_size(const struct inode *inode, u32 orig_len,</div><div class='ctx'> 				  u32 max_len, u32 *encrypted_len_ret)</div><div class='ctx'> {</div><div class='del'>-	return __fscrypt_fname_encrypted_size(&amp;inode-&gt;i_crypt_info-&gt;ci_policy,</div><div class='del'>-					      orig_len, max_len,</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='add'>+</div><div class='add'>+	return __fscrypt_fname_encrypted_size(&amp;ci-&gt;ci_policy, orig_len, max_len,</div><div class='ctx'> 					      encrypted_len_ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fscrypt_fname_encrypted_size);</div><div class='hunk'>@@ -412,8 +310,8 @@ int fscrypt_fname_disk_to_usr(const struct inode *inode,</div><div class='ctx'> 		       nokey_name.sha256);</div><div class='ctx'> 		size = FSCRYPT_NOKEY_NAME_MAX;</div><div class='ctx'> 	}</div><div class='del'>-	oname-&gt;len = fscrypt_base64url_encode((const u8 *)&amp;nokey_name, size,</div><div class='del'>-					      oname-&gt;name);</div><div class='add'>+	oname-&gt;len = base64_encode((const u8 *)&amp;nokey_name, size,</div><div class='add'>+				   oname-&gt;name, false, BASE64_URLSAFE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fscrypt_fname_disk_to_usr);</div><div class='hunk'>@@ -492,8 +390,8 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,</div><div class='ctx'> 	if (fname-&gt;crypto_buf.name == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = fscrypt_base64url_decode(iname-&gt;name, iname-&gt;len,</div><div class='del'>-				       fname-&gt;crypto_buf.name);</div><div class='add'>+	ret = base64_decode(iname-&gt;name, iname-&gt;len,</div><div class='add'>+			    fname-&gt;crypto_buf.name, false, BASE64_URLSAFE);</div><div class='ctx'> 	if (ret &lt; (int)offsetof(struct fscrypt_nokey_name, bytes[1]) ||</div><div class='ctx'> 	    (ret &gt; offsetof(struct fscrypt_nokey_name, sha256) &amp;&amp;</div><div class='ctx'> 	     ret != FSCRYPT_NOKEY_NAME_MAX)) {</div><div class='hunk'>@@ -568,7 +466,7 @@ EXPORT_SYMBOL_GPL(fscrypt_match_name);</div><div class='ctx'>  */</div><div class='ctx'> u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name)</div><div class='ctx'> {</div><div class='del'>-	const struct fscrypt_inode_info *ci = dir-&gt;i_crypt_info;</div><div class='add'>+	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(dir);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!ci-&gt;ci_dirhash_key_initialized);</div><div class='ctx'> </div><div class='hunk'>@@ -580,11 +478,10 @@ EXPORT_SYMBOL_GPL(fscrypt_fname_siphash);</div><div class='ctx'>  * Validate dentries in encrypted directories to make sure we aren't potentially</div><div class='ctx'>  * caching stale dentries after a key has been added.</div><div class='ctx'>  */</div><div class='del'>-int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+int fscrypt_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dir;</div><div class='ctx'> 	int err;</div><div class='del'>-	int valid;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Plaintext names are always valid, since fscrypt doesn't support</div><div class='hunk'>@@ -597,30 +494,21 @@ int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No-key name; valid if the directory's key is still unavailable.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Although fscrypt forbids rename() on no-key names, we still must use</div><div class='del'>-	 * dget_parent() here rather than use -&gt;d_parent directly.  That's</div><div class='del'>-	 * because a corrupted fs image may contain directory hard links, which</div><div class='del'>-	 * the VFS handles by moving the directory's dentry tree in the dcache</div><div class='del'>-	 * each time -&gt;lookup() finds the directory and it already has a dentry</div><div class='del'>-	 * elsewhere.  Thus -&gt;d_parent can be changing, and we must safely grab</div><div class='del'>-	 * a reference to some -&gt;d_parent to prevent it from being freed.</div><div class='add'>+	 * Note in RCU mode we have to bail if we get here -</div><div class='add'>+	 * fscrypt_get_encryption_info() may block.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='ctx'> </div><div class='del'>-	dir = dget_parent(dentry);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pass allow_unsupported=true, so that files with an unsupported</div><div class='ctx'> 	 * encryption policy can be deleted.</div><div class='ctx'> 	 */</div><div class='del'>-	err = fscrypt_get_encryption_info(d_inode(dir), true);</div><div class='del'>-	valid = !fscrypt_has_encryption_key(d_inode(dir));</div><div class='del'>-	dput(dir);</div><div class='del'>-</div><div class='add'>+	err = fscrypt_get_encryption_info(dir, true);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return valid;</div><div class='add'>+	return !fscrypt_has_encryption_key(dir);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fscrypt_d_revalidate);</div><div class='head'>diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h<br/>index 1892356cf924..4e8e82a9ccf9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/fscrypt_private.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/fscrypt_private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/fscrypt_private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/fscrypt_private.h</a></div><div class='hunk'>@@ -11,9 +11,10 @@</div><div class='ctx'> #ifndef _FSCRYPT_PRIVATE_H</div><div class='ctx'> #define _FSCRYPT_PRIVATE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='ctx'> #include &lt;linux/fscrypt.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/siphash.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;linux/blk-crypto.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CONST_STRLEN(str)	(sizeof(str) - 1)</div><div class='hunk'>@@ -27,6 +28,41 @@</div><div class='ctx'>  */</div><div class='ctx'> #define FSCRYPT_MIN_KEY_SIZE	16</div><div class='ctx'> </div><div class='add'>+/* Maximum size of a raw fscrypt master key */</div><div class='add'>+#define FSCRYPT_MAX_RAW_KEY_SIZE	64</div><div class='add'>+</div><div class='add'>+/* Maximum size of a hardware-wrapped fscrypt master key */</div><div class='add'>+#define FSCRYPT_MAX_HW_WRAPPED_KEY_SIZE	BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE</div><div class='add'>+</div><div class='add'>+/* Maximum size of an fscrypt master key across both key types */</div><div class='add'>+#define FSCRYPT_MAX_ANY_KEY_SIZE \</div><div class='add'>+	MAX(FSCRYPT_MAX_RAW_KEY_SIZE, FSCRYPT_MAX_HW_WRAPPED_KEY_SIZE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FSCRYPT_MAX_KEY_SIZE is defined in the UAPI header, but the addition of</div><div class='add'>+ * hardware-wrapped keys has made it misleading as it's only for raw keys.</div><div class='add'>+ * Don't use it in kernel code; use one of the above constants instead.</div><div class='add'>+ */</div><div class='add'>+#undef FSCRYPT_MAX_KEY_SIZE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This mask is passed as the third argument to the crypto_alloc_*() functions</div><div class='add'>+ * to prevent fscrypt from using the Crypto API drivers for non-inline crypto</div><div class='add'>+ * engines.  Those drivers have been problematic for fscrypt.  fscrypt users</div><div class='add'>+ * have reported hangs and even incorrect en/decryption with these drivers.</div><div class='add'>+ * Since going to the driver, off CPU, and back again is really slow, such</div><div class='add'>+ * drivers can be over 50 times slower than the CPU-based code for fscrypt's</div><div class='add'>+ * workload.  Even on platforms that lack AES instructions on the CPU, using the</div><div class='add'>+ * offloads has been shown to be slower, even staying with AES.  (Of course,</div><div class='add'>+ * Adiantum is faster still, and is the recommended option on such platforms...)</div><div class='add'>+ *</div><div class='add'>+ * Note that fscrypt also supports inline crypto engines.  Those don't use the</div><div class='add'>+ * Crypto API and work much better than the old-style (non-inline) engines.</div><div class='add'>+ */</div><div class='add'>+#define FSCRYPT_CRYPTOAPI_MASK                            \</div><div class='add'>+	(CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | \</div><div class='add'>+	 CRYPTO_ALG_KERN_DRIVER_ONLY)</div><div class='add'>+</div><div class='ctx'> #define FSCRYPT_CONTEXT_V1	1</div><div class='ctx'> #define FSCRYPT_CONTEXT_V2	2</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +239,7 @@ struct fscrypt_symlink_data {</div><div class='ctx'>  * Normally only one of the fields will be non-NULL.</div><div class='ctx'>  */</div><div class='ctx'> struct fscrypt_prepared_key {</div><div class='del'>-	struct crypto_skcipher *tfm;</div><div class='add'>+	struct crypto_sync_skcipher *tfm;</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT</div><div class='ctx'> 	struct blk_crypto_key *blk_key;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -213,8 +249,8 @@ struct fscrypt_prepared_key {</div><div class='ctx'>  * fscrypt_inode_info - the "encryption key" for an inode</div><div class='ctx'>  *</div><div class='ctx'>  * When an encrypted file's key is made available, an instance of this struct is</div><div class='del'>- * allocated and stored in -&gt;i_crypt_info.  Once created, it remains until the</div><div class='del'>- * inode is evicted.</div><div class='add'>+ * allocated and a pointer to it is stored in the file's in-memory inode.  Once</div><div class='add'>+ * created, it remains until the inode is evicted.</div><div class='ctx'>  */</div><div class='ctx'> struct fscrypt_inode_info {</div><div class='ctx'> </div><div class='hunk'>@@ -222,16 +258,19 @@ struct fscrypt_inode_info {</div><div class='ctx'> 	struct fscrypt_prepared_key ci_enc_key;</div><div class='ctx'> </div><div class='ctx'> 	/* True if ci_enc_key should be freed when this struct is freed */</div><div class='del'>-	bool ci_owns_key;</div><div class='add'>+	u8 ci_owns_key : 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * True if this inode will use inline encryption (blk-crypto) instead of</div><div class='ctx'> 	 * the traditional filesystem-layer encryption.</div><div class='ctx'> 	 */</div><div class='del'>-	bool ci_inlinecrypt;</div><div class='add'>+	u8 ci_inlinecrypt : 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* True if ci_dirhash_key is initialized */</div><div class='add'>+	u8 ci_dirhash_key_initialized : 1;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * log2 of the data unit size (granularity of contents encryption) of</div><div class='ctx'> 	 * this file.  This is computable from ci_policy and ci_inode but is</div><div class='hunk'>@@ -242,6 +281,9 @@ struct fscrypt_inode_info {</div><div class='ctx'> 	/* Cached value: log2 of number of data units per FS block */</div><div class='ctx'> 	u8 ci_data_units_per_block_bits;</div><div class='ctx'> </div><div class='add'>+	/* Hashed inode number.  Only set for IV_INO_LBLK_32 */</div><div class='add'>+	u32 ci_hashed_ino;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Encryption mode used for this inode.  It corresponds to either the</div><div class='ctx'> 	 * contents or filenames encryption mode, depending on the inode type.</div><div class='hunk'>@@ -276,16 +318,12 @@ struct fscrypt_inode_info {</div><div class='ctx'> 	 * the plaintext filenames -- currently just casefolded directories.</div><div class='ctx'> 	 */</div><div class='ctx'> 	siphash_key_t ci_dirhash_key;</div><div class='del'>-	bool ci_dirhash_key_initialized;</div><div class='ctx'> </div><div class='ctx'> 	/* The encryption policy used by this inode */</div><div class='ctx'> 	union fscrypt_policy ci_policy;</div><div class='ctx'> </div><div class='ctx'> 	/* This inode's nonce, copied from the fscrypt_context */</div><div class='ctx'> 	u8 ci_nonce[FSCRYPT_FILE_NONCE_SIZE];</div><div class='del'>-</div><div class='del'>-	/* Hashed inode number.  Only set for IV_INO_LBLK_32 */</div><div class='del'>-	u32 ci_hashed_ino;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef enum {</div><div class='hunk'>@@ -299,8 +337,7 @@ int fscrypt_initialize(struct super_block *sb);</div><div class='ctx'> int fscrypt_crypt_data_unit(const struct fscrypt_inode_info *ci,</div><div class='ctx'> 			    fscrypt_direction_t rw, u64 index,</div><div class='ctx'> 			    struct page *src_page, struct page *dest_page,</div><div class='del'>-			    unsigned int len, unsigned int offs,</div><div class='del'>-			    gfp_t gfp_flags);</div><div class='add'>+			    unsigned int len, unsigned int offs);</div><div class='ctx'> struct page *fscrypt_alloc_bounce_page(gfp_t gfp_flags);</div><div class='ctx'> </div><div class='ctx'> void __printf(3, 4) __cold</div><div class='hunk'>@@ -344,12 +381,8 @@ bool __fscrypt_fname_encrypted_size(const union fscrypt_policy *policy,</div><div class='ctx'> 				    u32 *encrypted_len_ret);</div><div class='ctx'> </div><div class='ctx'> /* hkdf.c */</div><div class='del'>-struct fscrypt_hkdf {</div><div class='del'>-	struct crypto_shash *hmac_tfm;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key,</div><div class='del'>-		      unsigned int master_key_size);</div><div class='add'>+void fscrypt_init_hkdf(struct hmac_sha512_key *hkdf, const u8 *master_key,</div><div class='add'>+		       unsigned int master_key_size);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The list of contexts in which fscrypt uses HKDF.  These values are used as</div><div class='hunk'>@@ -358,23 +391,24 @@ int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key,</div><div class='ctx'>  * outputs are unique and cryptographically isolated, i.e. knowledge of one</div><div class='ctx'>  * output doesn't reveal another.</div><div class='ctx'>  */</div><div class='del'>-#define HKDF_CONTEXT_KEY_IDENTIFIER	1 /* info=&lt;empty&gt;		*/</div><div class='add'>+#define HKDF_CONTEXT_KEY_IDENTIFIER_FOR_RAW_KEY	1 /* info=&lt;empty&gt;	*/</div><div class='ctx'> #define HKDF_CONTEXT_PER_FILE_ENC_KEY	2 /* info=file_nonce		*/</div><div class='ctx'> #define HKDF_CONTEXT_DIRECT_KEY		3 /* info=mode_num		*/</div><div class='ctx'> #define HKDF_CONTEXT_IV_INO_LBLK_64_KEY	4 /* info=mode_num||fs_uuid	*/</div><div class='ctx'> #define HKDF_CONTEXT_DIRHASH_KEY	5 /* info=file_nonce		*/</div><div class='ctx'> #define HKDF_CONTEXT_IV_INO_LBLK_32_KEY	6 /* info=mode_num||fs_uuid	*/</div><div class='ctx'> #define HKDF_CONTEXT_INODE_HASH_KEY	7 /* info=&lt;empty&gt;		*/</div><div class='add'>+#define HKDF_CONTEXT_KEY_IDENTIFIER_FOR_HW_WRAPPED_KEY \</div><div class='add'>+					8 /* info=&lt;empty&gt;		*/</div><div class='ctx'> </div><div class='del'>-int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context,</div><div class='del'>-			const u8 *info, unsigned int infolen,</div><div class='del'>-			u8 *okm, unsigned int okmlen);</div><div class='del'>-</div><div class='del'>-void fscrypt_destroy_hkdf(struct fscrypt_hkdf *hkdf);</div><div class='add'>+void fscrypt_hkdf_expand(const struct hmac_sha512_key *hkdf, u8 context,</div><div class='add'>+			 const u8 *info, unsigned int infolen,</div><div class='add'>+			 u8 *okm, unsigned int okmlen);</div><div class='ctx'> </div><div class='ctx'> /* inline_crypt.c */</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT</div><div class='del'>-int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci);</div><div class='add'>+int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci,</div><div class='add'>+				   bool is_hw_wrapped_key);</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='ctx'> fscrypt_using_inline_encryption(const struct fscrypt_inode_info *ci)</div><div class='hunk'>@@ -383,12 +417,17 @@ fscrypt_using_inline_encryption(const struct fscrypt_inode_info *ci)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key,</div><div class='del'>-				     const u8 *raw_key,</div><div class='add'>+				     const u8 *key_bytes, size_t key_size,</div><div class='add'>+				     bool is_hw_wrapped,</div><div class='ctx'> 				     const struct fscrypt_inode_info *ci);</div><div class='ctx'> </div><div class='ctx'> void fscrypt_destroy_inline_crypt_key(struct super_block *sb,</div><div class='ctx'> 				      struct fscrypt_prepared_key *prep_key);</div><div class='ctx'> </div><div class='add'>+int fscrypt_derive_sw_secret(struct super_block *sb,</div><div class='add'>+			     const u8 *wrapped_key, size_t wrapped_key_size,</div><div class='add'>+			     u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Check whether the crypto transform or blk-crypto key has been allocated in</div><div class='ctx'>  * @prep_key, depending on which encryption implementation the file will use.</div><div class='hunk'>@@ -412,7 +451,8 @@ fscrypt_is_key_prepared(struct fscrypt_prepared_key *prep_key,</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_FS_ENCRYPTION_INLINE_CRYPT */</div><div class='ctx'> </div><div class='del'>-static inline int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci)</div><div class='add'>+static inline int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci,</div><div class='add'>+						 bool is_hw_wrapped_key)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -425,7 +465,8 @@ fscrypt_using_inline_encryption(const struct fscrypt_inode_info *ci)</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key,</div><div class='del'>-				 const u8 *raw_key,</div><div class='add'>+				 const u8 *key_bytes, size_t key_size,</div><div class='add'>+				 bool is_hw_wrapped,</div><div class='ctx'> 				 const struct fscrypt_inode_info *ci)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(1);</div><div class='hunk'>@@ -438,6 +479,15 @@ fscrypt_destroy_inline_crypt_key(struct super_block *sb,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+fscrypt_derive_sw_secret(struct super_block *sb,</div><div class='add'>+			 const u8 *wrapped_key, size_t wrapped_key_size,</div><div class='add'>+			 u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE])</div><div class='add'>+{</div><div class='add'>+	fscrypt_warn(NULL, "kernel doesn't support hardware-wrapped keys");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool</div><div class='ctx'> fscrypt_is_key_prepared(struct fscrypt_prepared_key *prep_key,</div><div class='ctx'> 			const struct fscrypt_inode_info *ci)</div><div class='hunk'>@@ -454,20 +504,38 @@ fscrypt_is_key_prepared(struct fscrypt_prepared_key *prep_key,</div><div class='ctx'> struct fscrypt_master_key_secret {</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * For v2 policy keys: HKDF context keyed by this master key.</div><div class='del'>-	 * For v1 policy keys: not set (hkdf.hmac_tfm == NULL).</div><div class='add'>+	 * The KDF with which subkeys of this key can be derived.</div><div class='add'>+	 *</div><div class='add'>+	 * For v1 policy keys, this isn't applicable and won't be set.</div><div class='add'>+	 * Otherwise, this KDF will be keyed by this master key if</div><div class='add'>+	 * -&gt;is_hw_wrapped=false, or by the "software secret" that hardware</div><div class='add'>+	 * derived from this master key if -&gt;is_hw_wrapped=true.</div><div class='add'>+	 */</div><div class='add'>+	struct hmac_sha512_key	hkdf;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * True if this key is a hardware-wrapped key; false if this key is a</div><div class='add'>+	 * raw key (i.e. a "software key").  For v1 policy keys this will always</div><div class='add'>+	 * be false, as v1 policy support is a legacy feature which doesn't</div><div class='add'>+	 * support newer functionality such as hardware-wrapped keys.</div><div class='ctx'> 	 */</div><div class='del'>-	struct fscrypt_hkdf	hkdf;</div><div class='add'>+	bool			is_hw_wrapped;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Size of the raw key in bytes.  This remains set even if -&gt;raw was</div><div class='add'>+	 * Size of the key in bytes.  This remains set even if -&gt;bytes was</div><div class='ctx'> 	 * zeroized due to no longer being needed.  I.e. we still remember the</div><div class='ctx'> 	 * size of the key even if we don't need to remember the key itself.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32			size;</div><div class='ctx'> </div><div class='del'>-	/* For v1 policy keys: the raw key.  Wiped for v2 policy keys. */</div><div class='del'>-	u8			raw[FSCRYPT_MAX_KEY_SIZE];</div><div class='add'>+	/*</div><div class='add'>+	 * The bytes of the key, when still needed.  This can be either a raw</div><div class='add'>+	 * key or a hardware-wrapped key, as indicated by -&gt;is_hw_wrapped.  In</div><div class='add'>+	 * the case of a raw, v2 policy key, there is no need to remember the</div><div class='add'>+	 * actual key separately from -&gt;hkdf so this field will be zeroized as</div><div class='add'>+	 * soon as -&gt;hkdf is initialized.</div><div class='add'>+	 */</div><div class='add'>+	u8			bytes[FSCRYPT_MAX_ANY_KEY_SIZE];</div><div class='ctx'> </div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='hunk'>@@ -622,7 +690,7 @@ struct fscrypt_master_key *</div><div class='ctx'> fscrypt_find_master_key(struct super_block *sb,</div><div class='ctx'> 			const struct fscrypt_key_specifier *mk_spec);</div><div class='ctx'> </div><div class='del'>-int fscrypt_get_test_dummy_key_identifier(</div><div class='add'>+void fscrypt_get_test_dummy_key_identifier(</div><div class='ctx'> 			  u8 key_identifier[FSCRYPT_KEY_IDENTIFIER_SIZE]);</div><div class='ctx'> </div><div class='ctx'> int fscrypt_add_test_dummy_key(struct super_block *sb,</div><div class='hunk'>@@ -658,8 +726,8 @@ void fscrypt_destroy_prepared_key(struct super_block *sb,</div><div class='ctx'> int fscrypt_set_per_file_enc_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 				 const u8 *raw_key);</div><div class='ctx'> </div><div class='del'>-int fscrypt_derive_dirhash_key(struct fscrypt_inode_info *ci,</div><div class='del'>-			       const struct fscrypt_master_key *mk);</div><div class='add'>+void fscrypt_derive_dirhash_key(struct fscrypt_inode_info *ci,</div><div class='add'>+				const struct fscrypt_master_key *mk);</div><div class='ctx'> </div><div class='ctx'> void fscrypt_hash_inode_number(struct fscrypt_inode_info *ci,</div><div class='ctx'> 			       const struct fscrypt_master_key *mk);</div><div class='head'>diff --git a/fs/crypto/hkdf.c b/fs/crypto/hkdf.c<br/>index 5a384dad2c72..706f56d0076e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/hkdf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/hkdf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/hkdf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/hkdf.c</a></div><div class='hunk'>@@ -4,14 +4,13 @@</div><div class='ctx'>  * Function"), aka RFC 5869.  See also the original paper (Krawczyk 2010):</div><div class='ctx'>  * "Cryptographic Extraction and Key Derivation: The HKDF Scheme".</div><div class='ctx'>  *</div><div class='del'>- * This is used to derive keys from the fscrypt master keys.</div><div class='add'>+ * This is used to derive keys from the fscrypt master keys (or from the</div><div class='add'>+ * "software secrets" which hardware derives from the fscrypt master keys, in</div><div class='add'>+ * the case that the fscrypt master keys are hardware-wrapped keys).</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2019 Google LLC</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='del'>-#include &lt;crypto/sha2.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -25,7 +24,6 @@</div><div class='ctx'>  * HKDF-SHA512 being much faster than HKDF-SHA256, as the longer digest size of</div><div class='ctx'>  * SHA-512 causes HKDF-Expand to only need to do one iteration rather than two.</div><div class='ctx'>  */</div><div class='del'>-#define HKDF_HMAC_ALG		"hmac(sha512)"</div><div class='ctx'> #define HKDF_HASHLEN		SHA512_DIGEST_SIZE</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -44,67 +42,25 @@</div><div class='ctx'>  * there's no way to persist a random salt per master key from kernel mode.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* HKDF-Extract (RFC 5869 section 2.2), unsalted */</div><div class='del'>-static int hkdf_extract(struct crypto_shash *hmac_tfm, const u8 *ikm,</div><div class='del'>-			unsigned int ikmlen, u8 prk[HKDF_HASHLEN])</div><div class='del'>-{</div><div class='del'>-	static const u8 default_salt[HKDF_HASHLEN];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_setkey(hmac_tfm, default_salt, HKDF_HASHLEN);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return crypto_shash_tfm_digest(hmac_tfm, ikm, ikmlen, prk);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Compute HKDF-Extract using the given master key as the input keying material,</div><div class='del'>- * and prepare an HMAC transform object keyed by the resulting pseudorandom key.</div><div class='del'>- *</div><div class='del'>- * Afterwards, the keyed HMAC transform object can be used for HKDF-Expand many</div><div class='del'>- * times without having to recompute HKDF-Extract each time.</div><div class='add'>+ * Compute HKDF-Extract using 'master_key' as the input keying material, and</div><div class='add'>+ * prepare the resulting HMAC key in 'hkdf'.  Afterwards, 'hkdf' can be used for</div><div class='add'>+ * HKDF-Expand many times without having to recompute HKDF-Extract each time.</div><div class='ctx'>  */</div><div class='del'>-int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key,</div><div class='del'>-		      unsigned int master_key_size)</div><div class='add'>+void fscrypt_init_hkdf(struct hmac_sha512_key *hkdf, const u8 *master_key,</div><div class='add'>+		       unsigned int master_key_size)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_shash *hmac_tfm;</div><div class='add'>+	static const u8 default_salt[HKDF_HASHLEN];</div><div class='ctx'> 	u8 prk[HKDF_HASHLEN];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	hmac_tfm = crypto_alloc_shash(HKDF_HMAC_ALG, 0, 0);</div><div class='del'>-	if (IS_ERR(hmac_tfm)) {</div><div class='del'>-		fscrypt_err(NULL, "Error allocating " HKDF_HMAC_ALG ": %ld",</div><div class='del'>-			    PTR_ERR(hmac_tfm));</div><div class='del'>-		return PTR_ERR(hmac_tfm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(crypto_shash_digestsize(hmac_tfm) != sizeof(prk))) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_free_tfm;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = hkdf_extract(hmac_tfm, master_key, master_key_size, prk);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_tfm;</div><div class='ctx'> </div><div class='del'>-	err = crypto_shash_setkey(hmac_tfm, prk, sizeof(prk));</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_tfm;</div><div class='del'>-</div><div class='del'>-	hkdf-&gt;hmac_tfm = hmac_tfm;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-err_free_tfm:</div><div class='del'>-	crypto_free_shash(hmac_tfm);</div><div class='del'>-out:</div><div class='add'>+	hmac_sha512_usingrawkey(default_salt, sizeof(default_salt),</div><div class='add'>+				master_key, master_key_size, prk);</div><div class='add'>+	hmac_sha512_preparekey(hkdf, prk, sizeof(prk));</div><div class='ctx'> 	memzero_explicit(prk, sizeof(prk));</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * HKDF-Expand (RFC 5869 section 2.3).  This expands the pseudorandom key, which</div><div class='del'>- * was already keyed into 'hkdf-&gt;hmac_tfm' by fscrypt_init_hkdf(), into 'okmlen'</div><div class='add'>+ * HKDF-Expand (RFC 5869 section 2.3).  Expand the HMAC key 'hkdf' into 'okmlen'</div><div class='ctx'>  * bytes of output keying material parameterized by the application-specific</div><div class='ctx'>  * 'info' of length 'infolen' bytes, prefixed by "fscrypt\0" and the 'context'</div><div class='ctx'>  * byte.  This is thread-safe and may be called by multiple threads in parallel.</div><div class='hunk'>@@ -113,70 +69,32 @@ out:</div><div class='ctx'>  * adds to its application-specific info strings to guarantee that it doesn't</div><div class='ctx'>  * accidentally repeat an info string when using HKDF for different purposes.)</div><div class='ctx'>  */</div><div class='del'>-int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context,</div><div class='del'>-			const u8 *info, unsigned int infolen,</div><div class='del'>-			u8 *okm, unsigned int okmlen)</div><div class='add'>+void fscrypt_hkdf_expand(const struct hmac_sha512_key *hkdf, u8 context,</div><div class='add'>+			 const u8 *info, unsigned int infolen,</div><div class='add'>+			 u8 *okm, unsigned int okmlen)</div><div class='ctx'> {</div><div class='del'>-	SHASH_DESC_ON_STACK(desc, hkdf-&gt;hmac_tfm);</div><div class='del'>-	u8 prefix[9];</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int err;</div><div class='del'>-	const u8 *prev = NULL;</div><div class='add'>+	struct hmac_sha512_ctx ctx;</div><div class='ctx'> 	u8 counter = 1;</div><div class='ctx'> 	u8 tmp[HKDF_HASHLEN];</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(okmlen &gt; 255 * HKDF_HASHLEN))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	desc-&gt;tfm = hkdf-&gt;hmac_tfm;</div><div class='del'>-</div><div class='del'>-	memcpy(prefix, "fscrypt\0", 8);</div><div class='del'>-	prefix[8] = context;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; okmlen; i += HKDF_HASHLEN) {</div><div class='del'>-</div><div class='del'>-		err = crypto_shash_init(desc);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (prev) {</div><div class='del'>-			err = crypto_shash_update(desc, prev, HKDF_HASHLEN);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = crypto_shash_update(desc, prefix, sizeof(prefix));</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		err = crypto_shash_update(desc, info, infolen);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		BUILD_BUG_ON(sizeof(counter) != 1);</div><div class='add'>+	WARN_ON_ONCE(okmlen &gt; 255 * HKDF_HASHLEN);</div><div class='add'>+</div><div class='add'>+	for (unsigned int i = 0; i &lt; okmlen; i += HKDF_HASHLEN) {</div><div class='add'>+		hmac_sha512_init(&amp;ctx, hkdf);</div><div class='add'>+		if (i != 0)</div><div class='add'>+			hmac_sha512_update(&amp;ctx, &amp;okm[i - HKDF_HASHLEN],</div><div class='add'>+					   HKDF_HASHLEN);</div><div class='add'>+		hmac_sha512_update(&amp;ctx, "fscrypt\0", 8);</div><div class='add'>+		hmac_sha512_update(&amp;ctx, &amp;context, 1);</div><div class='add'>+		hmac_sha512_update(&amp;ctx, info, infolen);</div><div class='add'>+		hmac_sha512_update(&amp;ctx, &amp;counter, 1);</div><div class='ctx'> 		if (okmlen - i &lt; HKDF_HASHLEN) {</div><div class='del'>-			err = crypto_shash_finup(desc, &amp;counter, 1, tmp);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+			hmac_sha512_final(&amp;ctx, tmp);</div><div class='ctx'> 			memcpy(&amp;okm[i], tmp, okmlen - i);</div><div class='ctx'> 			memzero_explicit(tmp, sizeof(tmp));</div><div class='ctx'> 		} else {</div><div class='del'>-			err = crypto_shash_finup(desc, &amp;counter, 1, &amp;okm[i]);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+			hmac_sha512_final(&amp;ctx, &amp;okm[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 		counter++;</div><div class='del'>-		prev = &amp;okm[i];</div><div class='ctx'> 	}</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		memzero_explicit(okm, okmlen); /* so caller doesn't need to */</div><div class='del'>-	shash_desc_zero(desc);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void fscrypt_destroy_hkdf(struct fscrypt_hkdf *hkdf)</div><div class='del'>-{</div><div class='del'>-	crypto_free_shash(hkdf-&gt;hmac_tfm);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c<br/>index 52504dd478d3..b97de0d1430f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/hooks.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/hooks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/hooks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/hooks.c</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'>  * Encryption hooks for higher-level filesystem operations.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -30,21 +32,41 @@</div><div class='ctx'> int fscrypt_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct dentry *dir;</div><div class='add'>+	struct dentry *dentry, *dentry_parent;</div><div class='add'>+	struct inode *inode_parent;</div><div class='ctx'> </div><div class='ctx'> 	err = fscrypt_require_key(inode);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	dir = dget_parent(file_dentry(filp));</div><div class='del'>-	if (IS_ENCRYPTED(d_inode(dir)) &amp;&amp;</div><div class='del'>-	    !fscrypt_has_permitted_context(d_inode(dir), inode)) {</div><div class='add'>+	dentry = file_dentry(filp);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Getting a reference to the parent dentry is needed for the actual</div><div class='add'>+	 * encryption policy comparison, but it's expensive on multi-core</div><div class='add'>+	 * systems.  Since this function runs on unencrypted files too, start</div><div class='add'>+	 * with a lightweight RCU-mode check for the parent directory being</div><div class='add'>+	 * unencrypted (in which case it's fine for the child to be either</div><div class='add'>+	 * unencrypted, or encrypted with any policy).  Only continue on to the</div><div class='add'>+	 * full policy check if the parent directory is actually encrypted.</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	dentry_parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='add'>+	inode_parent = d_inode_rcu(dentry_parent);</div><div class='add'>+	if (inode_parent != NULL &amp;&amp; !IS_ENCRYPTED(inode_parent)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	dentry_parent = dget_parent(dentry);</div><div class='add'>+	if (!fscrypt_has_permitted_context(d_inode(dentry_parent), inode)) {</div><div class='ctx'> 		fscrypt_warn(inode,</div><div class='ctx'> 			     "Inconsistent encryption context (parent directory: %lu)",</div><div class='del'>-			     d_inode(dir)-&gt;i_ino);</div><div class='add'>+			     d_inode(dentry_parent)-&gt;i_ino);</div><div class='ctx'> 		err = -EPERM;</div><div class='ctx'> 	}</div><div class='del'>-	dput(dir);</div><div class='add'>+	dput(dentry_parent);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fscrypt_file_open);</div><div class='hunk'>@@ -102,11 +124,8 @@ int __fscrypt_prepare_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	if (err &amp;&amp; err != -ENOENT)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (fname-&gt;is_nokey_name) {</div><div class='del'>-		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_NOKEY_NAME;</div><div class='del'>-		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	}</div><div class='add'>+	fscrypt_prepare_dentry(dentry, fname-&gt;is_nokey_name);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__fscrypt_prepare_lookup);</div><div class='hunk'>@@ -131,12 +150,10 @@ EXPORT_SYMBOL_GPL(__fscrypt_prepare_lookup);</div><div class='ctx'> int fscrypt_prepare_lookup_partial(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	int err = fscrypt_get_encryption_info(dir, true);</div><div class='add'>+	bool is_nokey_name = (!err &amp;&amp; !fscrypt_has_encryption_key(dir));</div><div class='add'>+</div><div class='add'>+	fscrypt_prepare_dentry(dentry, is_nokey_name);</div><div class='ctx'> </div><div class='del'>-	if (!err &amp;&amp; !fscrypt_has_encryption_key(dir)) {</div><div class='del'>-		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_NOKEY_NAME;</div><div class='del'>-		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fscrypt_prepare_lookup_partial);</div><div class='hunk'>@@ -182,13 +199,13 @@ int fscrypt_prepare_setflags(struct inode *inode,</div><div class='ctx'> 		err = fscrypt_require_key(inode);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		ci = inode-&gt;i_crypt_info;</div><div class='add'>+		ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> 		if (ci-&gt;ci_policy.version != FSCRYPT_POLICY_V2)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		mk = ci-&gt;ci_master_key;</div><div class='ctx'> 		down_read(&amp;mk-&gt;mk_sem);</div><div class='ctx'> 		if (mk-&gt;mk_present)</div><div class='del'>-			err = fscrypt_derive_dirhash_key(ci, mk);</div><div class='add'>+			fscrypt_derive_dirhash_key(ci, mk);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -ENOKEY;</div><div class='ctx'> 		up_read(&amp;mk-&gt;mk_sem);</div><div class='head'>diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c<br/>index b4002aea7cdb..ed6e926226b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/inline_crypt.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/inline_crypt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/inline_crypt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/inline_crypt.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/blk-crypto.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='hunk'>@@ -89,7 +90,8 @@ static void fscrypt_log_blk_crypto_impl(struct fscrypt_mode *mode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enable inline encryption for this file if supported. */</div><div class='del'>-int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci)</div><div class='add'>+int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci,</div><div class='add'>+				   bool is_hw_wrapped_key)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inode *inode = ci-&gt;ci_inode;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='hunk'>@@ -130,6 +132,8 @@ int fscrypt_select_encryption_impl(struct fscrypt_inode_info *ci)</div><div class='ctx'> 	crypto_cfg.crypto_mode = ci-&gt;ci_mode-&gt;blk_crypto_mode;</div><div class='ctx'> 	crypto_cfg.data_unit_size = 1U &lt;&lt; ci-&gt;ci_data_unit_bits;</div><div class='ctx'> 	crypto_cfg.dun_bytes = fscrypt_get_dun_bytes(ci);</div><div class='add'>+	crypto_cfg.key_type = is_hw_wrapped_key ?</div><div class='add'>+		BLK_CRYPTO_KEY_TYPE_HW_WRAPPED : BLK_CRYPTO_KEY_TYPE_RAW;</div><div class='ctx'> </div><div class='ctx'> 	devs = fscrypt_get_devices(sb, &amp;num_devs);</div><div class='ctx'> 	if (IS_ERR(devs))</div><div class='hunk'>@@ -150,12 +154,15 @@ out_free_devs:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key,</div><div class='del'>-				     const u8 *raw_key,</div><div class='add'>+				     const u8 *key_bytes, size_t key_size,</div><div class='add'>+				     bool is_hw_wrapped,</div><div class='ctx'> 				     const struct fscrypt_inode_info *ci)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inode *inode = ci-&gt;ci_inode;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	enum blk_crypto_mode_num crypto_mode = ci-&gt;ci_mode-&gt;blk_crypto_mode;</div><div class='add'>+	enum blk_crypto_key_type key_type = is_hw_wrapped ?</div><div class='add'>+		BLK_CRYPTO_KEY_TYPE_HW_WRAPPED : BLK_CRYPTO_KEY_TYPE_RAW;</div><div class='ctx'> 	struct blk_crypto_key *blk_key;</div><div class='ctx'> 	struct block_device **devs;</div><div class='ctx'> 	unsigned int num_devs;</div><div class='hunk'>@@ -166,8 +173,8 @@ int fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key,</div><div class='ctx'> 	if (!blk_key)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = blk_crypto_init_key(blk_key, raw_key, crypto_mode,</div><div class='del'>-				  fscrypt_get_dun_bytes(ci),</div><div class='add'>+	err = blk_crypto_init_key(blk_key, key_bytes, key_size, key_type,</div><div class='add'>+				  crypto_mode, fscrypt_get_dun_bytes(ci),</div><div class='ctx'> 				  1U &lt;&lt; ci-&gt;ci_data_unit_bits);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		fscrypt_err(inode, "error %d initializing blk-crypto key", err);</div><div class='hunk'>@@ -226,9 +233,37 @@ void fscrypt_destroy_inline_crypt_key(struct super_block *sb,</div><div class='ctx'> 	kfree_sensitive(blk_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Ask the inline encryption hardware to derive the software secret from a</div><div class='add'>+ * hardware-wrapped key.  Returns -EOPNOTSUPP if hardware-wrapped keys aren't</div><div class='add'>+ * supported on this filesystem or hardware.</div><div class='add'>+ */</div><div class='add'>+int fscrypt_derive_sw_secret(struct super_block *sb,</div><div class='add'>+			     const u8 *wrapped_key, size_t wrapped_key_size,</div><div class='add'>+			     u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE])</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The filesystem must be mounted with -o inlinecrypt. */</div><div class='add'>+	if (!(sb-&gt;s_flags &amp; SB_INLINECRYPT)) {</div><div class='add'>+		fscrypt_warn(NULL,</div><div class='add'>+			     "%s: filesystem not mounted with inlinecrypt\n",</div><div class='add'>+			     sb-&gt;s_id);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = blk_crypto_derive_sw_secret(sb-&gt;s_bdev, wrapped_key,</div><div class='add'>+					  wrapped_key_size, sw_secret);</div><div class='add'>+	if (err == -EOPNOTSUPP)</div><div class='add'>+		fscrypt_warn(NULL,</div><div class='add'>+			     "%s: block device doesn't support hardware-wrapped keys\n",</div><div class='add'>+			     sb-&gt;s_id);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool __fscrypt_inode_uses_inline_crypto(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;i_crypt_info-&gt;ci_inlinecrypt;</div><div class='add'>+	return fscrypt_get_inode_info_raw(inode)-&gt;ci_inlinecrypt;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__fscrypt_inode_uses_inline_crypto);</div><div class='ctx'> </div><div class='hunk'>@@ -272,7 +307,7 @@ void fscrypt_set_bio_crypt_ctx(struct bio *bio, const struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	if (!fscrypt_inode_uses_inline_crypto(inode))</div><div class='ctx'> 		return;</div><div class='del'>-	ci = inode-&gt;i_crypt_info;</div><div class='add'>+	ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> </div><div class='ctx'> 	fscrypt_generate_dun(ci, first_lblk, dun);</div><div class='ctx'> 	bio_crypt_set_ctx(bio, ci-&gt;ci_enc_key.blk_key, dun, gfp_mask);</div><div class='hunk'>@@ -284,7 +319,7 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh,</div><div class='ctx'> 				      const struct inode **inode_ret,</div><div class='ctx'> 				      u64 *lblk_num_ret)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = bh-&gt;b_page;</div><div class='add'>+	struct folio *folio = bh-&gt;b_folio;</div><div class='ctx'> 	const struct address_space *mapping;</div><div class='ctx'> 	const struct inode *inode;</div><div class='ctx'> </div><div class='hunk'>@@ -292,14 +327,13 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh,</div><div class='ctx'> 	 * The ext4 journal (jbd2) can submit a buffer_head it directly created</div><div class='ctx'> 	 * for a non-pagecache page.  fscrypt doesn't care about these.</div><div class='ctx'> 	 */</div><div class='del'>-	mapping = page_mapping(page);</div><div class='add'>+	mapping = folio_mapping(folio);</div><div class='ctx'> 	if (!mapping)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	inode = mapping-&gt;host;</div><div class='ctx'> </div><div class='ctx'> 	*inode_ret = inode;</div><div class='del'>-	*lblk_num_ret = ((u64)page-&gt;index &lt;&lt; (PAGE_SHIFT - inode-&gt;i_blkbits)) +</div><div class='del'>-			(bh_offset(bh) &gt;&gt; inode-&gt;i_blkbits);</div><div class='add'>+	*lblk_num_ret = (folio_pos(folio) + bh_offset(bh)) &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -350,22 +384,24 @@ bool fscrypt_mergeable_bio(struct bio *bio, const struct inode *inode,</div><div class='ctx'> 			   u64 next_lblk)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bio_crypt_ctx *bc = bio-&gt;bi_crypt_context;</div><div class='add'>+	const struct fscrypt_inode_info *ci;</div><div class='ctx'> 	u64 next_dun[BLK_CRYPTO_DUN_ARRAY_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	if (!!bc != fscrypt_inode_uses_inline_crypto(inode))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!bc)</div><div class='ctx'> 		return true;</div><div class='add'>+	ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Comparing the key pointers is good enough, as all I/O for each key</div><div class='ctx'> 	 * uses the same pointer.  I.e., there's currently no need to support</div><div class='ctx'> 	 * merging requests where the keys are the same but the pointers differ.</div><div class='ctx'> 	 */</div><div class='del'>-	if (bc-&gt;bc_key != inode-&gt;i_crypt_info-&gt;ci_enc_key.blk_key)</div><div class='add'>+	if (bc-&gt;bc_key != ci-&gt;ci_enc_key.blk_key)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	fscrypt_generate_dun(inode-&gt;i_crypt_info, next_lblk, next_dun);</div><div class='add'>+	fscrypt_generate_dun(ci, next_lblk, next_dun);</div><div class='ctx'> 	return bio_crypt_dun_is_contiguous(bc, bio-&gt;bi_iter.bi_size, next_dun);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fscrypt_mergeable_bio);</div><div class='hunk'>@@ -467,7 +503,7 @@ u64 fscrypt_limit_io_blocks(const struct inode *inode, u64 lblk, u64 nr_blocks)</div><div class='ctx'> 	if (nr_blocks &lt;= 1)</div><div class='ctx'> 		return nr_blocks;</div><div class='ctx'> </div><div class='del'>-	ci = inode-&gt;i_crypt_info;</div><div class='add'>+	ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> 	if (!(fscrypt_policy_flags(&amp;ci-&gt;ci_policy) &amp;</div><div class='ctx'> 	      FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32))</div><div class='ctx'> 		return nr_blocks;</div><div class='head'>diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c<br/>index 0edf0b58daa7..5e939ea3ac28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/keyring.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/keyring.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/keyring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/keyring.c</a></div><div class='hunk'>@@ -18,11 +18,13 @@</div><div class='ctx'>  * information about these ioctls.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/key-type.h&gt;</div><div class='add'>+#include &lt;linux/once.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='hunk'>@@ -40,7 +42,6 @@ struct fscrypt_keyring {</div><div class='ctx'> </div><div class='ctx'> static void wipe_master_key_secret(struct fscrypt_master_key_secret *secret)</div><div class='ctx'> {</div><div class='del'>-	fscrypt_destroy_hkdf(&amp;secret-&gt;hkdf);</div><div class='ctx'> 	memzero_explicit(secret, sizeof(*secret));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -74,8 +75,12 @@ void fscrypt_put_master_key(struct fscrypt_master_key *mk)</div><div class='ctx'> 	 * that concurrent keyring lookups can no longer find it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	WARN_ON_ONCE(refcount_read(&amp;mk-&gt;mk_active_refs) != 0);</div><div class='del'>-	key_put(mk-&gt;mk_users);</div><div class='del'>-	mk-&gt;mk_users = NULL;</div><div class='add'>+	if (mk-&gt;mk_users) {</div><div class='add'>+		/* Clear the keyring so the quota gets released right away. */</div><div class='add'>+		keyring_clear(mk-&gt;mk_users);</div><div class='add'>+		key_put(mk-&gt;mk_users);</div><div class='add'>+		mk-&gt;mk_users = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	call_rcu(&amp;mk-&gt;mk_rcu_head, fscrypt_free_master_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -144,11 +149,11 @@ static int fscrypt_user_key_instantiate(struct key *key,</div><div class='ctx'> 					struct key_preparsed_payload *prep)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * We just charge FSCRYPT_MAX_KEY_SIZE bytes to the user's key quota for</div><div class='del'>-	 * each key, regardless of the exact key size.  The amount of memory</div><div class='add'>+	 * We just charge FSCRYPT_MAX_RAW_KEY_SIZE bytes to the user's key quota</div><div class='add'>+	 * for each key, regardless of the exact key size.  The amount of memory</div><div class='ctx'> 	 * actually used is greater than the size of the raw key anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	return key_payload_reserve(key, FSCRYPT_MAX_KEY_SIZE);</div><div class='add'>+	return key_payload_reserve(key, FSCRYPT_MAX_RAW_KEY_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fscrypt_user_key_describe(const struct key *key, struct seq_file *m)</div><div class='hunk'>@@ -553,41 +558,79 @@ static int add_master_key(struct super_block *sb,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (key_spec-&gt;type == FSCRYPT_KEY_SPEC_TYPE_IDENTIFIER) {</div><div class='del'>-		err = fscrypt_init_hkdf(&amp;secret-&gt;hkdf, secret-&gt;raw,</div><div class='del'>-					secret-&gt;size);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE];</div><div class='add'>+		u8 *kdf_key = secret-&gt;bytes;</div><div class='add'>+		unsigned int kdf_key_size = secret-&gt;size;</div><div class='add'>+		u8 keyid_kdf_ctx = HKDF_CONTEXT_KEY_IDENTIFIER_FOR_RAW_KEY;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Now that the HKDF context is initialized, the raw key is no</div><div class='del'>-		 * longer needed.</div><div class='add'>+		 * For raw keys, the fscrypt master key is used directly as the</div><div class='add'>+		 * fscrypt KDF key.  For hardware-wrapped keys, we have to pass</div><div class='add'>+		 * the master key to the hardware to derive the KDF key, which</div><div class='add'>+		 * is then only used to derive non-file-contents subkeys.</div><div class='add'>+		 */</div><div class='add'>+		if (secret-&gt;is_hw_wrapped) {</div><div class='add'>+			err = fscrypt_derive_sw_secret(sb, secret-&gt;bytes,</div><div class='add'>+						       secret-&gt;size, sw_secret);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			kdf_key = sw_secret;</div><div class='add'>+			kdf_key_size = sizeof(sw_secret);</div><div class='add'>+			/*</div><div class='add'>+			 * To avoid weird behavior if someone manages to</div><div class='add'>+			 * determine sw_secret and add it as a raw key, ensure</div><div class='add'>+			 * that hardware-wrapped keys and raw keys will have</div><div class='add'>+			 * different key identifiers by deriving their key</div><div class='add'>+			 * identifiers using different KDF contexts.</div><div class='add'>+			 */</div><div class='add'>+			keyid_kdf_ctx =</div><div class='add'>+				HKDF_CONTEXT_KEY_IDENTIFIER_FOR_HW_WRAPPED_KEY;</div><div class='add'>+		}</div><div class='add'>+		fscrypt_init_hkdf(&amp;secret-&gt;hkdf, kdf_key, kdf_key_size);</div><div class='add'>+		/*</div><div class='add'>+		 * Now that the KDF context is initialized, the raw KDF key is</div><div class='add'>+		 * no longer needed.</div><div class='ctx'> 		 */</div><div class='del'>-		memzero_explicit(secret-&gt;raw, secret-&gt;size);</div><div class='add'>+		memzero_explicit(kdf_key, kdf_key_size);</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate the key identifier */</div><div class='del'>-		err = fscrypt_hkdf_expand(&amp;secret-&gt;hkdf,</div><div class='del'>-					  HKDF_CONTEXT_KEY_IDENTIFIER, NULL, 0,</div><div class='del'>-					  key_spec-&gt;u.identifier,</div><div class='del'>-					  FSCRYPT_KEY_IDENTIFIER_SIZE);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		fscrypt_hkdf_expand(&amp;secret-&gt;hkdf, keyid_kdf_ctx, NULL, 0,</div><div class='add'>+				    key_spec-&gt;u.identifier,</div><div class='add'>+				    FSCRYPT_KEY_IDENTIFIER_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	return do_add_master_key(sb, secret, key_spec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Validate the size of an fscrypt master key being added.  Note that this is</div><div class='add'>+ * just an initial check, as we don't know which ciphers will be used yet.</div><div class='add'>+ * There is a stricter size check later when the key is actually used by a file.</div><div class='add'>+ */</div><div class='add'>+static inline bool fscrypt_valid_key_size(size_t size, u32 add_key_flags)</div><div class='add'>+{</div><div class='add'>+	u32 max_size = (add_key_flags &amp; FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED) ?</div><div class='add'>+		       FSCRYPT_MAX_HW_WRAPPED_KEY_SIZE :</div><div class='add'>+		       FSCRYPT_MAX_RAW_KEY_SIZE;</div><div class='add'>+</div><div class='add'>+	return size &gt;= FSCRYPT_MIN_KEY_SIZE &amp;&amp; size &lt;= max_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fscrypt_provisioning_key_preparse(struct key_preparsed_payload *prep)</div><div class='ctx'> {</div><div class='ctx'> 	const struct fscrypt_provisioning_key_payload *payload = prep-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (prep-&gt;datalen &lt; sizeof(*payload) + FSCRYPT_MIN_KEY_SIZE ||</div><div class='del'>-	    prep-&gt;datalen &gt; sizeof(*payload) + FSCRYPT_MAX_KEY_SIZE)</div><div class='add'>+	if (prep-&gt;datalen &lt; sizeof(*payload))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!fscrypt_valid_key_size(prep-&gt;datalen - sizeof(*payload),</div><div class='add'>+				    payload-&gt;flags))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (payload-&gt;type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &amp;&amp;</div><div class='ctx'> 	    payload-&gt;type != FSCRYPT_KEY_SPEC_TYPE_IDENTIFIER)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (payload-&gt;__reserved)</div><div class='add'>+	if (payload-&gt;flags &amp; ~FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	prep-&gt;payload.data[0] = kmemdup(payload, prep-&gt;datalen, GFP_KERNEL);</div><div class='hunk'>@@ -631,21 +674,21 @@ static struct key_type key_type_fscrypt_provisioning = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Retrieve the raw key from the Linux keyring key specified by 'key_id', and</div><div class='del'>- * store it into 'secret'.</div><div class='add'>+ * Retrieve the key from the Linux keyring key specified by 'key_id', and store</div><div class='add'>+ * it into 'secret'.</div><div class='ctx'>  *</div><div class='del'>- * The key must be of type "fscrypt-provisioning" and must have the field</div><div class='del'>- * fscrypt_provisioning_key_payload::type set to 'type', indicating that it's</div><div class='del'>- * only usable with fscrypt with the particular KDF version identified by</div><div class='del'>- * 'type'.  We don't use the "logon" key type because there's no way to</div><div class='del'>- * completely restrict the use of such keys; they can be used by any kernel API</div><div class='del'>- * that accepts "logon" keys and doesn't require a specific service prefix.</div><div class='add'>+ * The key must be of type "fscrypt-provisioning" and must have the 'type' and</div><div class='add'>+ * 'flags' field of the payload set to the given values, indicating that the key</div><div class='add'>+ * is intended for use for the specified purpose.  We don't use the "logon" key</div><div class='add'>+ * type because there's no way to completely restrict the use of such keys; they</div><div class='add'>+ * can be used by any kernel API that accepts "logon" keys and doesn't require a</div><div class='add'>+ * specific service prefix.</div><div class='ctx'>  *</div><div class='ctx'>  * The ability to specify the key via Linux keyring key is intended for cases</div><div class='ctx'>  * where userspace needs to re-add keys after the filesystem is unmounted and</div><div class='del'>- * re-mounted.  Most users should just provide the raw key directly instead.</div><div class='add'>+ * re-mounted.  Most users should just provide the key directly instead.</div><div class='ctx'>  */</div><div class='del'>-static int get_keyring_key(u32 key_id, u32 type,</div><div class='add'>+static int get_keyring_key(u32 key_id, u32 type, u32 flags,</div><div class='ctx'> 			   struct fscrypt_master_key_secret *secret)</div><div class='ctx'> {</div><div class='ctx'> 	key_ref_t ref;</div><div class='hunk'>@@ -662,12 +705,16 @@ static int get_keyring_key(u32 key_id, u32 type,</div><div class='ctx'> 		goto bad_key;</div><div class='ctx'> 	payload = key-&gt;payload.data[0];</div><div class='ctx'> </div><div class='del'>-	/* Don't allow fscrypt v1 keys to be used as v2 keys and vice versa. */</div><div class='del'>-	if (payload-&gt;type != type)</div><div class='add'>+	/*</div><div class='add'>+	 * Don't allow fscrypt v1 keys to be used as v2 keys and vice versa.</div><div class='add'>+	 * Similarly, don't allow hardware-wrapped keys to be used as</div><div class='add'>+	 * non-hardware-wrapped keys and vice versa.</div><div class='add'>+	 */</div><div class='add'>+	if (payload-&gt;type != type || payload-&gt;flags != flags)</div><div class='ctx'> 		goto bad_key;</div><div class='ctx'> </div><div class='ctx'> 	secret-&gt;size = key-&gt;datalen - sizeof(*payload);</div><div class='del'>-	memcpy(secret-&gt;raw, payload-&gt;raw, secret-&gt;size);</div><div class='add'>+	memcpy(secret-&gt;bytes, payload-&gt;raw, secret-&gt;size);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out_put;</div><div class='ctx'> </div><div class='hunk'>@@ -729,19 +776,28 @@ int fscrypt_ioctl_add_key(struct file *filp, void __user *_uarg)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;secret, 0, sizeof(secret));</div><div class='add'>+</div><div class='add'>+	if (arg.flags) {</div><div class='add'>+		if (arg.flags &amp; ~FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_IDENTIFIER)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		secret.is_hw_wrapped = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (arg.key_id) {</div><div class='ctx'> 		if (arg.raw_size != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		err = get_keyring_key(arg.key_id, arg.key_spec.type, &amp;secret);</div><div class='add'>+		err = get_keyring_key(arg.key_id, arg.key_spec.type, arg.flags,</div><div class='add'>+				      &amp;secret);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_wipe_secret;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (arg.raw_size &lt; FSCRYPT_MIN_KEY_SIZE ||</div><div class='del'>-		    arg.raw_size &gt; FSCRYPT_MAX_KEY_SIZE)</div><div class='add'>+		if (!fscrypt_valid_key_size(arg.raw_size, arg.flags))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		secret.size = arg.raw_size;</div><div class='ctx'> 		err = -EFAULT;</div><div class='del'>-		if (copy_from_user(secret.raw, uarg-&gt;raw, secret.size))</div><div class='add'>+		if (copy_from_user(secret.bytes, uarg-&gt;raw, secret.size))</div><div class='ctx'> 			goto out_wipe_secret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -765,32 +821,26 @@ EXPORT_SYMBOL_GPL(fscrypt_ioctl_add_key);</div><div class='ctx'> static void</div><div class='ctx'> fscrypt_get_test_dummy_secret(struct fscrypt_master_key_secret *secret)</div><div class='ctx'> {</div><div class='del'>-	static u8 test_key[FSCRYPT_MAX_KEY_SIZE];</div><div class='add'>+	static u8 test_key[FSCRYPT_MAX_RAW_KEY_SIZE];</div><div class='ctx'> </div><div class='del'>-	get_random_once(test_key, FSCRYPT_MAX_KEY_SIZE);</div><div class='add'>+	get_random_once(test_key, sizeof(test_key));</div><div class='ctx'> </div><div class='ctx'> 	memset(secret, 0, sizeof(*secret));</div><div class='del'>-	secret-&gt;size = FSCRYPT_MAX_KEY_SIZE;</div><div class='del'>-	memcpy(secret-&gt;raw, test_key, FSCRYPT_MAX_KEY_SIZE);</div><div class='add'>+	secret-&gt;size = sizeof(test_key);</div><div class='add'>+	memcpy(secret-&gt;bytes, test_key, sizeof(test_key));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fscrypt_get_test_dummy_key_identifier(</div><div class='add'>+void fscrypt_get_test_dummy_key_identifier(</div><div class='ctx'> 				u8 key_identifier[FSCRYPT_KEY_IDENTIFIER_SIZE])</div><div class='ctx'> {</div><div class='ctx'> 	struct fscrypt_master_key_secret secret;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	fscrypt_get_test_dummy_secret(&amp;secret);</div><div class='del'>-</div><div class='del'>-	err = fscrypt_init_hkdf(&amp;secret.hkdf, secret.raw, secret.size);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	err = fscrypt_hkdf_expand(&amp;secret.hkdf, HKDF_CONTEXT_KEY_IDENTIFIER,</div><div class='del'>-				  NULL, 0, key_identifier,</div><div class='del'>-				  FSCRYPT_KEY_IDENTIFIER_SIZE);</div><div class='del'>-out:</div><div class='add'>+	fscrypt_init_hkdf(&amp;secret.hkdf, secret.bytes, secret.size);</div><div class='add'>+	fscrypt_hkdf_expand(&amp;secret.hkdf,</div><div class='add'>+			    HKDF_CONTEXT_KEY_IDENTIFIER_FOR_RAW_KEY, NULL, 0,</div><div class='add'>+			    key_identifier, FSCRYPT_KEY_IDENTIFIER_SIZE);</div><div class='ctx'> 	wipe_master_key_secret(&amp;secret);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -895,7 +945,7 @@ static void evict_dentries_for_decrypted_inodes(struct fscrypt_master_key *mk)</div><div class='ctx'> 	list_for_each_entry(ci, &amp;mk-&gt;mk_decrypted_inodes, ci_master_key_link) {</div><div class='ctx'> 		inode = ci-&gt;ci_inode;</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_FREEING | I_WILL_FREE | I_NEW)) {</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c<br/>index d71f7c799e79..40fa05688d3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/keysetup.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/keysetup.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/keysetup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/keysetup.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fscrypt_private.h"</div><div class='hunk'>@@ -23,7 +24,7 @@ struct fscrypt_mode fscrypt_modes[] = {</div><div class='ctx'> 		.blk_crypto_mode = BLK_ENCRYPTION_MODE_AES_256_XTS,</div><div class='ctx'> 	},</div><div class='ctx'> 	[FSCRYPT_MODE_AES_256_CTS] = {</div><div class='del'>-		.friendly_name = "AES-256-CTS-CBC",</div><div class='add'>+		.friendly_name = "AES-256-CBC-CTS",</div><div class='ctx'> 		.cipher_str = "cts(cbc(aes))",</div><div class='ctx'> 		.keysize = 32,</div><div class='ctx'> 		.security_strength = 32,</div><div class='hunk'>@@ -38,7 +39,7 @@ struct fscrypt_mode fscrypt_modes[] = {</div><div class='ctx'> 		.blk_crypto_mode = BLK_ENCRYPTION_MODE_AES_128_CBC_ESSIV,</div><div class='ctx'> 	},</div><div class='ctx'> 	[FSCRYPT_MODE_AES_128_CTS] = {</div><div class='del'>-		.friendly_name = "AES-128-CTS-CBC",</div><div class='add'>+		.friendly_name = "AES-128-CBC-CTS",</div><div class='ctx'> 		.cipher_str = "cts(cbc(aes))",</div><div class='ctx'> 		.keysize = 16,</div><div class='ctx'> 		.security_strength = 16,</div><div class='hunk'>@@ -53,7 +54,7 @@ struct fscrypt_mode fscrypt_modes[] = {</div><div class='ctx'> 		.blk_crypto_mode = BLK_ENCRYPTION_MODE_SM4_XTS,</div><div class='ctx'> 	},</div><div class='ctx'> 	[FSCRYPT_MODE_SM4_CTS] = {</div><div class='del'>-		.friendly_name = "SM4-CTS-CBC",</div><div class='add'>+		.friendly_name = "SM4-CBC-CTS",</div><div class='ctx'> 		.cipher_str = "cts(cbc(sm4))",</div><div class='ctx'> 		.keysize = 16,</div><div class='ctx'> 		.security_strength = 16,</div><div class='hunk'>@@ -96,14 +97,15 @@ select_encryption_mode(const union fscrypt_policy *policy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Create a symmetric cipher object for the given encryption mode and key */</div><div class='del'>-static struct crypto_skcipher *</div><div class='add'>+static struct crypto_sync_skcipher *</div><div class='ctx'> fscrypt_allocate_skcipher(struct fscrypt_mode *mode, const u8 *raw_key,</div><div class='ctx'> 			  const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_skcipher *tfm;</div><div class='add'>+	struct crypto_sync_skcipher *tfm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	tfm = crypto_alloc_skcipher(mode-&gt;cipher_str, 0, 0);</div><div class='add'>+	tfm = crypto_alloc_sync_skcipher(mode-&gt;cipher_str, 0,</div><div class='add'>+					 FSCRYPT_CRYPTOAPI_MASK);</div><div class='ctx'> 	if (IS_ERR(tfm)) {</div><div class='ctx'> 		if (PTR_ERR(tfm) == -ENOENT) {</div><div class='ctx'> 			fscrypt_warn(inode,</div><div class='hunk'>@@ -123,21 +125,22 @@ fscrypt_allocate_skcipher(struct fscrypt_mode *mode, const u8 *raw_key,</div><div class='ctx'> 		 * first time a mode is used.</div><div class='ctx'> 		 */</div><div class='ctx'> 		pr_info("fscrypt: %s using implementation \"%s\"\n",</div><div class='del'>-			mode-&gt;friendly_name, crypto_skcipher_driver_name(tfm));</div><div class='add'>+			mode-&gt;friendly_name,</div><div class='add'>+			crypto_skcipher_driver_name(&amp;tfm-&gt;base));</div><div class='ctx'> 	}</div><div class='del'>-	if (WARN_ON_ONCE(crypto_skcipher_ivsize(tfm) != mode-&gt;ivsize)) {</div><div class='add'>+	if (WARN_ON_ONCE(crypto_sync_skcipher_ivsize(tfm) != mode-&gt;ivsize)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_free_tfm;</div><div class='ctx'> 	}</div><div class='del'>-	crypto_skcipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);</div><div class='del'>-	err = crypto_skcipher_setkey(tfm, raw_key, mode-&gt;keysize);</div><div class='add'>+	crypto_sync_skcipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);</div><div class='add'>+	err = crypto_sync_skcipher_setkey(tfm, raw_key, mode-&gt;keysize);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_tfm;</div><div class='ctx'> </div><div class='ctx'> 	return tfm;</div><div class='ctx'> </div><div class='ctx'> err_free_tfm:</div><div class='del'>-	crypto_free_skcipher(tfm);</div><div class='add'>+	crypto_free_sync_skcipher(tfm);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -150,10 +153,12 @@ err_free_tfm:</div><div class='ctx'> int fscrypt_prepare_key(struct fscrypt_prepared_key *prep_key,</div><div class='ctx'> 			const u8 *raw_key, const struct fscrypt_inode_info *ci)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_skcipher *tfm;</div><div class='add'>+	struct crypto_sync_skcipher *tfm;</div><div class='ctx'> </div><div class='ctx'> 	if (fscrypt_using_inline_encryption(ci))</div><div class='del'>-		return fscrypt_prepare_inline_crypt_key(prep_key, raw_key, ci);</div><div class='add'>+		return fscrypt_prepare_inline_crypt_key(prep_key, raw_key,</div><div class='add'>+							ci-&gt;ci_mode-&gt;keysize,</div><div class='add'>+							false, ci);</div><div class='ctx'> </div><div class='ctx'> 	tfm = fscrypt_allocate_skcipher(ci-&gt;ci_mode, raw_key, ci-&gt;ci_inode);</div><div class='ctx'> 	if (IS_ERR(tfm))</div><div class='hunk'>@@ -172,7 +177,7 @@ int fscrypt_prepare_key(struct fscrypt_prepared_key *prep_key,</div><div class='ctx'> void fscrypt_destroy_prepared_key(struct super_block *sb,</div><div class='ctx'> 				  struct fscrypt_prepared_key *prep_key)</div><div class='ctx'> {</div><div class='del'>-	crypto_free_skcipher(prep_key-&gt;tfm);</div><div class='add'>+	crypto_free_sync_skcipher(prep_key-&gt;tfm);</div><div class='ctx'> 	fscrypt_destroy_inline_crypt_key(sb, prep_key);</div><div class='ctx'> 	memzero_explicit(prep_key, sizeof(*prep_key));</div><div class='ctx'> }</div><div class='hunk'>@@ -195,14 +200,29 @@ static int setup_per_mode_enc_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 	struct fscrypt_mode *mode = ci-&gt;ci_mode;</div><div class='ctx'> 	const u8 mode_num = mode - fscrypt_modes;</div><div class='ctx'> 	struct fscrypt_prepared_key *prep_key;</div><div class='del'>-	u8 mode_key[FSCRYPT_MAX_KEY_SIZE];</div><div class='add'>+	u8 mode_key[FSCRYPT_MAX_RAW_KEY_SIZE];</div><div class='ctx'> 	u8 hkdf_info[sizeof(mode_num) + sizeof(sb-&gt;s_uuid)];</div><div class='ctx'> 	unsigned int hkdf_infolen = 0;</div><div class='add'>+	bool use_hw_wrapped_key = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(mode_num &gt; FSCRYPT_MODE_MAX))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (mk-&gt;mk_secret.is_hw_wrapped &amp;&amp; S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		/* Using a hardware-wrapped key for file contents encryption */</div><div class='add'>+		if (!fscrypt_using_inline_encryption(ci)) {</div><div class='add'>+			if (sb-&gt;s_flags &amp; SB_INLINECRYPT)</div><div class='add'>+				fscrypt_warn(ci-&gt;ci_inode,</div><div class='add'>+					     "Hardware-wrapped key required, but no suitable inline encryption capabilities are available");</div><div class='add'>+			else</div><div class='add'>+				fscrypt_warn(ci-&gt;ci_inode,</div><div class='add'>+					     "Hardware-wrapped keys require inline encryption (-o inlinecrypt)");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		use_hw_wrapped_key = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	prep_key = &amp;keys[mode_num];</div><div class='ctx'> 	if (fscrypt_is_key_prepared(prep_key, ci)) {</div><div class='ctx'> 		ci-&gt;ci_enc_key = *prep_key;</div><div class='hunk'>@@ -214,6 +234,16 @@ static int setup_per_mode_enc_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 	if (fscrypt_is_key_prepared(prep_key, ci))</div><div class='ctx'> 		goto done_unlock;</div><div class='ctx'> </div><div class='add'>+	if (use_hw_wrapped_key) {</div><div class='add'>+		err = fscrypt_prepare_inline_crypt_key(prep_key,</div><div class='add'>+						       mk-&gt;mk_secret.bytes,</div><div class='add'>+						       mk-&gt;mk_secret.size, true,</div><div class='add'>+						       ci);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		goto done_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(mode_num) != 1);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(sb-&gt;s_uuid) != 16);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(hkdf_info) != 17);</div><div class='hunk'>@@ -223,11 +253,8 @@ static int setup_per_mode_enc_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 		       sizeof(sb-&gt;s_uuid));</div><div class='ctx'> 		hkdf_infolen += sizeof(sb-&gt;s_uuid);</div><div class='ctx'> 	}</div><div class='del'>-	err = fscrypt_hkdf_expand(&amp;mk-&gt;mk_secret.hkdf,</div><div class='del'>-				  hkdf_context, hkdf_info, hkdf_infolen,</div><div class='del'>-				  mode_key, mode-&gt;keysize);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	fscrypt_hkdf_expand(&amp;mk-&gt;mk_secret.hkdf, hkdf_context, hkdf_info,</div><div class='add'>+			    hkdf_infolen, mode_key, mode-&gt;keysize);</div><div class='ctx'> 	err = fscrypt_prepare_key(prep_key, mode_key, ci);</div><div class='ctx'> 	memzero_explicit(mode_key, mode-&gt;keysize);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -248,36 +275,25 @@ out_unlock:</div><div class='ctx'>  * as a pair of 64-bit words.  Therefore, on big endian CPUs we have to do an</div><div class='ctx'>  * endianness swap in order to get the same results as on little endian CPUs.</div><div class='ctx'>  */</div><div class='del'>-static int fscrypt_derive_siphash_key(const struct fscrypt_master_key *mk,</div><div class='del'>-				      u8 context, const u8 *info,</div><div class='del'>-				      unsigned int infolen, siphash_key_t *key)</div><div class='add'>+static void fscrypt_derive_siphash_key(const struct fscrypt_master_key *mk,</div><div class='add'>+				       u8 context, const u8 *info,</div><div class='add'>+				       unsigned int infolen, siphash_key_t *key)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = fscrypt_hkdf_expand(&amp;mk-&gt;mk_secret.hkdf, context, info, infolen,</div><div class='del'>-				  (u8 *)key, sizeof(*key));</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='add'>+	fscrypt_hkdf_expand(&amp;mk-&gt;mk_secret.hkdf, context, info, infolen,</div><div class='add'>+			    (u8 *)key, sizeof(*key));</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(*key) != 16);</div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(key-&gt;key) != 2);</div><div class='ctx'> 	le64_to_cpus(&amp;key-&gt;key[0]);</div><div class='ctx'> 	le64_to_cpus(&amp;key-&gt;key[1]);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fscrypt_derive_dirhash_key(struct fscrypt_inode_info *ci,</div><div class='del'>-			       const struct fscrypt_master_key *mk)</div><div class='add'>+void fscrypt_derive_dirhash_key(struct fscrypt_inode_info *ci,</div><div class='add'>+				const struct fscrypt_master_key *mk)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = fscrypt_derive_siphash_key(mk, HKDF_CONTEXT_DIRHASH_KEY,</div><div class='del'>-					 ci-&gt;ci_nonce, FSCRYPT_FILE_NONCE_SIZE,</div><div class='del'>-					 &amp;ci-&gt;ci_dirhash_key);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	fscrypt_derive_siphash_key(mk, HKDF_CONTEXT_DIRHASH_KEY,</div><div class='add'>+				   ci-&gt;ci_nonce, FSCRYPT_FILE_NONCE_SIZE,</div><div class='add'>+				   &amp;ci-&gt;ci_dirhash_key);</div><div class='ctx'> 	ci-&gt;ci_dirhash_key_initialized = true;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fscrypt_hash_inode_number(struct fscrypt_inode_info *ci,</div><div class='hunk'>@@ -308,17 +324,12 @@ static int fscrypt_setup_iv_ino_lblk_32_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 		if (mk-&gt;mk_ino_hash_key_initialized)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> </div><div class='del'>-		err = fscrypt_derive_siphash_key(mk,</div><div class='del'>-						 HKDF_CONTEXT_INODE_HASH_KEY,</div><div class='del'>-						 NULL, 0, &amp;mk-&gt;mk_ino_hash_key);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='add'>+		fscrypt_derive_siphash_key(mk, HKDF_CONTEXT_INODE_HASH_KEY,</div><div class='add'>+					   NULL, 0, &amp;mk-&gt;mk_ino_hash_key);</div><div class='ctx'> 		/* pairs with smp_load_acquire() above */</div><div class='ctx'> 		smp_store_release(&amp;mk-&gt;mk_ino_hash_key_initialized, true);</div><div class='ctx'> unlock:</div><div class='ctx'> 		mutex_unlock(&amp;fscrypt_mode_key_setup_mutex);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -336,6 +347,14 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (mk-&gt;mk_secret.is_hw_wrapped &amp;&amp;</div><div class='add'>+	    !(ci-&gt;ci_policy.v2.flags &amp; (FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 |</div><div class='add'>+					FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32))) {</div><div class='add'>+		fscrypt_warn(ci-&gt;ci_inode,</div><div class='add'>+			     "Hardware-wrapped keys are only supported with IV_INO_LBLK policies");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ci-&gt;ci_policy.v2.flags &amp; FSCRYPT_POLICY_FLAG_DIRECT_KEY) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * DIRECT_KEY: instead of deriving per-file encryption keys, the</div><div class='hunk'>@@ -362,15 +381,12 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 		   FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32) {</div><div class='ctx'> 		err = fscrypt_setup_iv_ino_lblk_32_key(ci, mk);</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 derived_key[FSCRYPT_MAX_KEY_SIZE];</div><div class='del'>-</div><div class='del'>-		err = fscrypt_hkdf_expand(&amp;mk-&gt;mk_secret.hkdf,</div><div class='del'>-					  HKDF_CONTEXT_PER_FILE_ENC_KEY,</div><div class='del'>-					  ci-&gt;ci_nonce, FSCRYPT_FILE_NONCE_SIZE,</div><div class='del'>-					  derived_key, ci-&gt;ci_mode-&gt;keysize);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		u8 derived_key[FSCRYPT_MAX_RAW_KEY_SIZE];</div><div class='ctx'> </div><div class='add'>+		fscrypt_hkdf_expand(&amp;mk-&gt;mk_secret.hkdf,</div><div class='add'>+				    HKDF_CONTEXT_PER_FILE_ENC_KEY,</div><div class='add'>+				    ci-&gt;ci_nonce, FSCRYPT_FILE_NONCE_SIZE,</div><div class='add'>+				    derived_key, ci-&gt;ci_mode-&gt;keysize);</div><div class='ctx'> 		err = fscrypt_set_per_file_enc_key(ci, derived_key);</div><div class='ctx'> 		memzero_explicit(derived_key, ci-&gt;ci_mode-&gt;keysize);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -378,11 +394,8 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Derive a secret dirhash key for directories that need it. */</div><div class='del'>-	if (need_dirhash_key) {</div><div class='del'>-		err = fscrypt_derive_dirhash_key(ci, mk);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='add'>+	if (need_dirhash_key)</div><div class='add'>+		fscrypt_derive_dirhash_key(ci, mk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -445,10 +458,6 @@ static int setup_file_encryption_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 	struct fscrypt_master_key *mk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = fscrypt_select_encryption_impl(ci);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	err = fscrypt_policy_to_key_spec(&amp;ci-&gt;ci_policy, &amp;mk_spec);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -476,6 +485,10 @@ static int setup_file_encryption_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 		if (ci-&gt;ci_policy.version != FSCRYPT_POLICY_V1)</div><div class='ctx'> 			return -ENOKEY;</div><div class='ctx'> </div><div class='add'>+		err = fscrypt_select_encryption_impl(ci, false);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * As a legacy fallback for v1 policies, search for the key in</div><div class='ctx'> 		 * the current task's subscribed keyrings too.  Don't move this</div><div class='hunk'>@@ -497,9 +510,21 @@ static int setup_file_encryption_key(struct fscrypt_inode_info *ci,</div><div class='ctx'> 		goto out_release_key;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = fscrypt_select_encryption_impl(ci, mk-&gt;mk_secret.is_hw_wrapped);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_release_key;</div><div class='add'>+</div><div class='ctx'> 	switch (ci-&gt;ci_policy.version) {</div><div class='ctx'> 	case FSCRYPT_POLICY_V1:</div><div class='del'>-		err = fscrypt_setup_v1_file_key(ci, mk-&gt;mk_secret.raw);</div><div class='add'>+		if (WARN_ON_ONCE(mk-&gt;mk_secret.is_hw_wrapped)) {</div><div class='add'>+			/*</div><div class='add'>+			 * This should never happen, as adding a v1 policy key</div><div class='add'>+			 * that is hardware-wrapped isn't allowed.</div><div class='add'>+			 */</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out_release_key;</div><div class='add'>+		}</div><div class='add'>+		err = fscrypt_setup_v1_file_key(ci, mk-&gt;mk_secret.bytes);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSCRYPT_POLICY_V2:</div><div class='ctx'> 		err = fscrypt_setup_v2_file_key(ci, mk, need_dirhash_key);</div><div class='hunk'>@@ -592,15 +617,16 @@ fscrypt_setup_encryption_info(struct inode *inode,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * For existing inodes, multiple tasks may race to set -&gt;i_crypt_info.</div><div class='del'>-	 * So use cmpxchg_release().  This pairs with the smp_load_acquire() in</div><div class='del'>-	 * fscrypt_get_inode_info().  I.e., here we publish -&gt;i_crypt_info with</div><div class='del'>-	 * a RELEASE barrier so that other tasks can ACQUIRE it.</div><div class='add'>+	 * For existing inodes, multiple tasks may race to set the inode's</div><div class='add'>+	 * fscrypt info pointer.  So use cmpxchg_release().  This pairs with the</div><div class='add'>+	 * smp_load_acquire() in fscrypt_get_inode_info().  I.e., publish the</div><div class='add'>+	 * pointer with a RELEASE barrier so that other tasks can ACQUIRE it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cmpxchg_release(&amp;inode-&gt;i_crypt_info, NULL, crypt_info) == NULL) {</div><div class='add'>+	if (cmpxchg_release(fscrypt_inode_info_addr(inode), NULL, crypt_info) ==</div><div class='add'>+	    NULL) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * We won the race and set -&gt;i_crypt_info to our crypt_info.</div><div class='del'>-		 * Now link it into the master key's inode list.</div><div class='add'>+		 * We won the race and set the inode's fscrypt info to our</div><div class='add'>+		 * crypt_info.  Now link it into the master key's inode list.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (mk) {</div><div class='ctx'> 			crypt_info-&gt;ci_master_key = mk;</div><div class='hunk'>@@ -631,13 +657,13 @@ out:</div><div class='ctx'>  *		       %false unless the operation being performed is needed in</div><div class='ctx'>  *		       order for files (or directories) to be deleted.</div><div class='ctx'>  *</div><div class='del'>- * Set up -&gt;i_crypt_info, if it hasn't already been done.</div><div class='add'>+ * Set up the inode's encryption key, if it hasn't already been done.</div><div class='ctx'>  *</div><div class='del'>- * Note: unless -&gt;i_crypt_info is already set, this isn't %GFP_NOFS-safe.  So</div><div class='add'>+ * Note: unless the key setup was already done, this isn't %GFP_NOFS-safe.  So</div><div class='ctx'>  * generally this shouldn't be called from within a filesystem transaction.</div><div class='ctx'>  *</div><div class='del'>- * Return: 0 if -&gt;i_crypt_info was set or was already set, *or* if the</div><div class='del'>- *	   encryption key is unavailable.  (Use fscrypt_has_encryption_key() to</div><div class='add'>+ * Return: 0 if the key is now set up, *or* if it couldn't be set up because the</div><div class='add'>+ *	   needed master key is absent.  (Use fscrypt_has_encryption_key() to</div><div class='ctx'>  *	   distinguish these cases.)  Also can return another -errno code.</div><div class='ctx'>  */</div><div class='ctx'> int fscrypt_get_encryption_info(struct inode *inode, bool allow_unsupported)</div><div class='hunk'>@@ -687,13 +713,13 @@ int fscrypt_get_encryption_info(struct inode *inode, bool allow_unsupported)</div><div class='ctx'> /**</div><div class='ctx'>  * fscrypt_prepare_new_inode() - prepare to create a new inode in a directory</div><div class='ctx'>  * @dir: a possibly-encrypted directory</div><div class='del'>- * @inode: the new inode.  -&gt;i_mode must be set already.</div><div class='add'>+ * @inode: the new inode.  -&gt;i_mode and -&gt;i_blkbits must be set already.</div><div class='ctx'>  *	   -&gt;i_ino doesn't need to be set yet.</div><div class='ctx'>  * @encrypt_ret: (output) set to %true if the new inode will be encrypted</div><div class='ctx'>  *</div><div class='del'>- * If the directory is encrypted, set up its -&gt;i_crypt_info in preparation for</div><div class='add'>+ * If the directory is encrypted, set up its encryption key in preparation for</div><div class='ctx'>  * encrypting the name of the new file.  Also, if the new inode will be</div><div class='del'>- * encrypted, set up its -&gt;i_crypt_info and set *encrypt_ret=true.</div><div class='add'>+ * encrypted, set up its encryption key too and set *encrypt_ret=true.</div><div class='ctx'>  *</div><div class='ctx'>  * This isn't %GFP_NOFS-safe, and therefore it should be called before starting</div><div class='ctx'>  * any filesystem transaction to create the inode.  For this reason, -&gt;i_ino</div><div class='hunk'>@@ -702,8 +728,8 @@ int fscrypt_get_encryption_info(struct inode *inode, bool allow_unsupported)</div><div class='ctx'>  * This doesn't persist the new inode's encryption context.  That still needs to</div><div class='ctx'>  * be done later by calling fscrypt_set_context().</div><div class='ctx'>  *</div><div class='del'>- * Return: 0 on success, -ENOKEY if the encryption key is missing, or another</div><div class='del'>- *	   -errno code</div><div class='add'>+ * Return: 0 on success, -ENOKEY if a key needs to be set up for @dir or @inode</div><div class='add'>+ *	   but the needed master key is absent, or another -errno code</div><div class='ctx'>  */</div><div class='ctx'> int fscrypt_prepare_new_inode(struct inode *dir, struct inode *inode,</div><div class='ctx'> 			      bool *encrypt_ret)</div><div class='hunk'>@@ -717,6 +743,9 @@ int fscrypt_prepare_new_inode(struct inode *dir, struct inode *inode,</div><div class='ctx'> 	if (IS_ERR(policy))</div><div class='ctx'> 		return PTR_ERR(policy);</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(inode-&gt;i_blkbits == 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON_ONCE(inode-&gt;i_mode == 0))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -747,8 +776,16 @@ EXPORT_SYMBOL_GPL(fscrypt_prepare_new_inode);</div><div class='ctx'>  */</div><div class='ctx'> void fscrypt_put_encryption_info(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	put_crypt_info(inode-&gt;i_crypt_info);</div><div class='del'>-	inode-&gt;i_crypt_info = NULL;</div><div class='add'>+	/*</div><div class='add'>+	 * Ideally we'd start with a lightweight IS_ENCRYPTED() check here</div><div class='add'>+	 * before proceeding to retrieve and check the pointer.  However, during</div><div class='add'>+	 * inode creation, the fscrypt_inode_info is set before S_ENCRYPTED.  If</div><div class='add'>+	 * an error occurs, it needs to be cleaned up regardless.</div><div class='add'>+	 */</div><div class='add'>+	struct fscrypt_inode_info **ci_addr = fscrypt_inode_info_addr(inode);</div><div class='add'>+</div><div class='add'>+	put_crypt_info(*ci_addr);</div><div class='add'>+	*ci_addr = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fscrypt_put_encryption_info);</div><div class='ctx'> </div><div class='hunk'>@@ -797,7 +834,7 @@ int fscrypt_drop_inode(struct inode *inode)</div><div class='ctx'> 	 * userspace is still using the files, inodes can be dirtied between</div><div class='ctx'> 	 * then and now.  We mustn't lose any writes, so skip dirty inodes here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_DIRTY_ALL)</div><div class='add'>+	if (inode_state_read(inode) &amp; I_DIRTY_ALL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/fs/crypto/keysetup_v1.c b/fs/crypto/keysetup_v1.c<br/>index cf3b58ec32cc..c4d05168522b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/keysetup_v1.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/keysetup_v1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/keysetup_v1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/keysetup_v1.c</a></div><div class='hunk'>@@ -48,39 +48,30 @@ static int derive_key_aes(const u8 *master_key,</div><div class='ctx'> 			  const u8 nonce[FSCRYPT_FILE_NONCE_SIZE],</div><div class='ctx'> 			  u8 *derived_key, unsigned int derived_keysize)</div><div class='ctx'> {</div><div class='del'>-	int res = 0;</div><div class='del'>-	struct skcipher_request *req = NULL;</div><div class='del'>-	DECLARE_CRYPTO_WAIT(wait);</div><div class='del'>-	struct scatterlist src_sg, dst_sg;</div><div class='del'>-	struct crypto_skcipher *tfm = crypto_alloc_skcipher("ecb(aes)", 0, 0);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		res = PTR_ERR(tfm);</div><div class='del'>-		tfm = NULL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	crypto_skcipher_set_flags(tfm, CRYPTO_TFM_REQ_FORBID_WEAK_KEYS);</div><div class='del'>-	req = skcipher_request_alloc(tfm, GFP_KERNEL);</div><div class='del'>-	if (!req) {</div><div class='del'>-		res = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	skcipher_request_set_callback(req,</div><div class='del'>-			CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='del'>-			crypto_req_done, &amp;wait);</div><div class='del'>-	res = crypto_skcipher_setkey(tfm, nonce, FSCRYPT_FILE_NONCE_SIZE);</div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	struct crypto_sync_skcipher *tfm;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(&amp;src_sg, master_key, derived_keysize);</div><div class='del'>-	sg_init_one(&amp;dst_sg, derived_key, derived_keysize);</div><div class='del'>-	skcipher_request_set_crypt(req, &amp;src_sg, &amp;dst_sg, derived_keysize,</div><div class='del'>-				   NULL);</div><div class='del'>-	res = crypto_wait_req(crypto_skcipher_encrypt(req), &amp;wait);</div><div class='del'>-out:</div><div class='del'>-	skcipher_request_free(req);</div><div class='del'>-	crypto_free_skcipher(tfm);</div><div class='del'>-	return res;</div><div class='add'>+	tfm = crypto_alloc_sync_skcipher("ecb(aes)", 0, FSCRYPT_CRYPTOAPI_MASK);</div><div class='add'>+	if (IS_ERR(tfm))</div><div class='add'>+		return PTR_ERR(tfm);</div><div class='add'>+</div><div class='add'>+	err = crypto_sync_skcipher_setkey(tfm, nonce, FSCRYPT_FILE_NONCE_SIZE);</div><div class='add'>+	if (err == 0) {</div><div class='add'>+		SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm);</div><div class='add'>+		struct scatterlist src_sg, dst_sg;</div><div class='add'>+</div><div class='add'>+		skcipher_request_set_callback(req,</div><div class='add'>+					      CRYPTO_TFM_REQ_MAY_BACKLOG |</div><div class='add'>+						      CRYPTO_TFM_REQ_MAY_SLEEP,</div><div class='add'>+					      NULL, NULL);</div><div class='add'>+		sg_init_one(&amp;src_sg, master_key, derived_keysize);</div><div class='add'>+		sg_init_one(&amp;dst_sg, derived_key, derived_keysize);</div><div class='add'>+		skcipher_request_set_crypt(req, &amp;src_sg, &amp;dst_sg,</div><div class='add'>+					   derived_keysize, NULL);</div><div class='add'>+		err = crypto_skcipher_encrypt(req);</div><div class='add'>+	}</div><div class='add'>+	crypto_free_sync_skcipher(tfm);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -118,7 +109,7 @@ find_and_lock_process_key(const char *prefix,</div><div class='ctx'> 	payload = (const struct fscrypt_key *)ukp-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (ukp-&gt;datalen != sizeof(struct fscrypt_key) ||</div><div class='del'>-	    payload-&gt;size &lt; 1 || payload-&gt;size &gt; FSCRYPT_MAX_KEY_SIZE) {</div><div class='add'>+	    payload-&gt;size &lt; 1 || payload-&gt;size &gt; sizeof(payload-&gt;raw)) {</div><div class='ctx'> 		fscrypt_warn(NULL,</div><div class='ctx'> 			     "key with description '%s' has invalid payload",</div><div class='ctx'> 			     key-&gt;description);</div><div class='hunk'>@@ -149,7 +140,7 @@ struct fscrypt_direct_key {</div><div class='ctx'> 	const struct fscrypt_mode	*dk_mode;</div><div class='ctx'> 	struct fscrypt_prepared_key	dk_key;</div><div class='ctx'> 	u8				dk_descriptor[FSCRYPT_KEY_DESCRIPTOR_SIZE];</div><div class='del'>-	u8				dk_raw[FSCRYPT_MAX_KEY_SIZE];</div><div class='add'>+	u8				dk_raw[FSCRYPT_MAX_RAW_KEY_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void free_direct_key(struct fscrypt_direct_key *dk)</div><div class='head'>diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c<br/>index 701259991277..bbb2f5ced988 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/crypto/policy.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/crypto/policy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/crypto/policy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/crypto/policy.c</a></div><div class='hunk'>@@ -10,11 +10,13 @@</div><div class='ctx'>  * Modified by Eric Biggers, 2019 for v2 policy support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fscrypt_private.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -725,7 +727,7 @@ const union fscrypt_policy *fscrypt_policy_to_inherit(struct inode *dir)</div><div class='ctx'> 		err = fscrypt_require_key(dir);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return ERR_PTR(err);</div><div class='del'>-		return &amp;dir-&gt;i_crypt_info-&gt;ci_policy;</div><div class='add'>+		return &amp;fscrypt_get_inode_info_raw(dir)-&gt;ci_policy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return fscrypt_get_dummy_policy(dir-&gt;i_sb);</div><div class='hunk'>@@ -744,7 +746,7 @@ const union fscrypt_policy *fscrypt_policy_to_inherit(struct inode *dir)</div><div class='ctx'>  */</div><div class='ctx'> int fscrypt_context_for_new_inode(void *ctx, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='add'>+	struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(union fscrypt_context) !=</div><div class='ctx'> 			FSCRYPT_SET_CONTEXT_MAX_SIZE);</div><div class='hunk'>@@ -769,7 +771,7 @@ EXPORT_SYMBOL_GPL(fscrypt_context_for_new_inode);</div><div class='ctx'>  */</div><div class='ctx'> int fscrypt_set_context(struct inode *inode, void *fs_data)</div><div class='ctx'> {</div><div class='del'>-	struct fscrypt_inode_info *ci = inode-&gt;i_crypt_info;</div><div class='add'>+	struct fscrypt_inode_info *ci;</div><div class='ctx'> 	union fscrypt_context ctx;</div><div class='ctx'> 	int ctxsize;</div><div class='ctx'> </div><div class='hunk'>@@ -781,6 +783,7 @@ int fscrypt_set_context(struct inode *inode, void *fs_data)</div><div class='ctx'> 	 * This may be the first time the inode number is available, so do any</div><div class='ctx'> 	 * delayed key setup that requires the inode number.</div><div class='ctx'> 	 */</div><div class='add'>+	ci = fscrypt_get_inode_info_raw(inode);</div><div class='ctx'> 	if (ci-&gt;ci_policy.version == FSCRYPT_POLICY_V2 &amp;&amp;</div><div class='ctx'> 	    (ci-&gt;ci_policy.v2.flags &amp; FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32))</div><div class='ctx'> 		fscrypt_hash_inode_number(ci, ci-&gt;ci_master_key);</div><div class='hunk'>@@ -824,10 +827,8 @@ int fscrypt_parse_test_dummy_encryption(const struct fs_parameter *param,</div><div class='ctx'> 		policy-&gt;version = FSCRYPT_POLICY_V2;</div><div class='ctx'> 		policy-&gt;v2.contents_encryption_mode = FSCRYPT_MODE_AES_256_XTS;</div><div class='ctx'> 		policy-&gt;v2.filenames_encryption_mode = FSCRYPT_MODE_AES_256_CTS;</div><div class='del'>-		err = fscrypt_get_test_dummy_key_identifier(</div><div class='add'>+		fscrypt_get_test_dummy_key_identifier(</div><div class='ctx'> 				policy-&gt;v2.master_key_identifier);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/fs/d_path.c b/fs/d_path.c<br/>index 5f4da5c8d5db..bb365511066b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/d_path.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/d_path.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/d_path.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/d_path.c</a></div><div class='hunk'>@@ -241,9 +241,9 @@ static void get_fs_root_rcu(struct fs_struct *fs, struct path *root)</div><div class='ctx'> 	unsigned seq;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		seq = read_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+		seq = read_seqbegin(&amp;fs-&gt;seq);</div><div class='ctx'> 		*root = fs-&gt;root;</div><div class='del'>-	} while (read_seqcount_retry(&amp;fs-&gt;seq, seq));</div><div class='add'>+	} while (read_seqretry(&amp;fs-&gt;seq, seq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -385,10 +385,10 @@ static void get_fs_root_and_pwd_rcu(struct fs_struct *fs, struct path *root,</div><div class='ctx'> 	unsigned seq;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		seq = read_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+		seq = read_seqbegin(&amp;fs-&gt;seq);</div><div class='ctx'> 		*root = fs-&gt;root;</div><div class='ctx'> 		*pwd = fs-&gt;pwd;</div><div class='del'>-	} while (read_seqcount_retry(&amp;fs-&gt;seq, seq));</div><div class='add'>+	} while (read_seqretry(&amp;fs-&gt;seq, seq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/dax.c b/fs/dax.c<br/>index 423fc1607dfa..289e6254aa30 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dax.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dax.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dax.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dax.c</a></div><div class='hunk'>@@ -20,12 +20,11 @@</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/vmstat.h&gt;</div><div class='del'>-#include &lt;linux/pfn_t.h&gt;</div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='ctx'> #include &lt;linux/mmu_notifier.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include &lt;linux/rmap.h&gt;</div><div class='del'>-#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;linux/pgalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/fs_dax.h&gt;</div><div class='hunk'>@@ -71,9 +70,14 @@ static unsigned long dax_to_pfn(void *entry)</div><div class='ctx'> 	return xa_to_value(entry) &gt;&gt; DAX_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *dax_make_entry(pfn_t pfn, unsigned long flags)</div><div class='add'>+static struct folio *dax_to_folio(void *entry)</div><div class='ctx'> {</div><div class='del'>-	return xa_mk_value(flags | (pfn_t_to_pfn(pfn) &lt;&lt; DAX_SHIFT));</div><div class='add'>+	return page_folio(pfn_to_page(dax_to_pfn(entry)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *dax_make_entry(unsigned long pfn, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	return xa_mk_value(flags | (pfn &lt;&lt; DAX_SHIFT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool dax_is_locked(void *entry)</div><div class='hunk'>@@ -206,7 +210,7 @@ static void dax_wake_entry(struct xa_state *xas, void *entry,</div><div class='ctx'>  *</div><div class='ctx'>  * Must be called with the i_pages lock held.</div><div class='ctx'>  */</div><div class='del'>-static void *get_unlocked_entry(struct xa_state *xas, unsigned int order)</div><div class='add'>+static void *get_next_unlocked_entry(struct xa_state *xas, unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	void *entry;</div><div class='ctx'> 	struct wait_exceptional_entry_queue ewait;</div><div class='hunk'>@@ -236,6 +240,37 @@ static void *get_unlocked_entry(struct xa_state *xas, unsigned int order)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Wait for the given entry to become unlocked. Caller must hold the i_pages</div><div class='add'>+ * lock and call either put_unlocked_entry() if it did not lock the entry or</div><div class='add'>+ * dax_unlock_entry() if it did. Returns an unlocked entry if still present.</div><div class='add'>+ */</div><div class='add'>+static void *wait_entry_unlocked_exclusive(struct xa_state *xas, void *entry)</div><div class='add'>+{</div><div class='add'>+	struct wait_exceptional_entry_queue ewait;</div><div class='add'>+	wait_queue_head_t *wq;</div><div class='add'>+</div><div class='add'>+	init_wait(&amp;ewait.wait);</div><div class='add'>+	ewait.wait.func = wake_exceptional_entry_func;</div><div class='add'>+</div><div class='add'>+	while (unlikely(dax_is_locked(entry))) {</div><div class='add'>+		wq = dax_entry_waitqueue(xas, entry, &amp;ewait.key);</div><div class='add'>+		prepare_to_wait_exclusive(wq, &amp;ewait.wait,</div><div class='add'>+					TASK_UNINTERRUPTIBLE);</div><div class='add'>+		xas_reset(xas);</div><div class='add'>+		xas_unlock_irq(xas);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(wq, &amp;ewait.wait);</div><div class='add'>+		xas_lock_irq(xas);</div><div class='add'>+		entry = xas_load(xas);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xa_is_internal(entry))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The only thing keeping the address space around is the i_pages lock</div><div class='ctx'>  * (it's cycled in clear_inode() after removing the entries from i_pages)</div><div class='ctx'>  * After we call xas_unlock_irq(), we cannot touch xas-&gt;xa.</div><div class='hunk'>@@ -250,7 +285,7 @@ static void wait_entry_unlocked(struct xa_state *xas, void *entry)</div><div class='ctx'> </div><div class='ctx'> 	wq = dax_entry_waitqueue(xas, entry, &amp;ewait.key);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Unlike get_unlocked_entry() there is no guarantee that this</div><div class='add'>+	 * Unlike get_next_unlocked_entry() there is no guarantee that this</div><div class='ctx'> 	 * path ever successfully retrieves an unlocked entry before an</div><div class='ctx'> 	 * inode dies. Perform a non-exclusive wait in case this path</div><div class='ctx'> 	 * never successfully performs its own wake up.</div><div class='hunk'>@@ -307,109 +342,151 @@ static unsigned long dax_entry_size(void *entry)</div><div class='ctx'> 		return PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long dax_end_pfn(void *entry)</div><div class='add'>+/*</div><div class='add'>+ * A DAX folio is considered shared if it has no mapping set and -&gt;share (which</div><div class='add'>+ * shares the -&gt;index field) is non-zero. Note this may return false even if the</div><div class='add'>+ * page is shared between multiple files but has not yet actually been mapped</div><div class='add'>+ * into multiple address spaces.</div><div class='add'>+ */</div><div class='add'>+static inline bool dax_folio_is_shared(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return dax_to_pfn(entry) + dax_entry_size(entry) / PAGE_SIZE;</div><div class='add'>+	return !folio-&gt;mapping &amp;&amp; folio-&gt;share;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Iterate through all mapped pfns represented by an entry, i.e. skip</div><div class='del'>- * 'empty' and 'zero' entries.</div><div class='add'>+ * When it is called by dax_insert_entry(), the shared flag will indicate</div><div class='add'>+ * whether this entry is shared by multiple files. If the page has not</div><div class='add'>+ * previously been associated with any mappings the -&gt;mapping and -&gt;index</div><div class='add'>+ * fields will be set. If it has already been associated with a mapping</div><div class='add'>+ * the mapping will be cleared and the share count set. It's then up to</div><div class='add'>+ * reverse map users like memory_failure() to call back into the filesystem to</div><div class='add'>+ * recover -&gt;mapping and -&gt;index information. For example by implementing</div><div class='add'>+ * dax_holder_operations.</div><div class='ctx'>  */</div><div class='del'>-#define for_each_mapped_pfn(entry, pfn) \</div><div class='del'>-	for (pfn = dax_to_pfn(entry); \</div><div class='del'>-			pfn &lt; dax_end_pfn(entry); pfn++)</div><div class='del'>-</div><div class='del'>-static inline bool dax_page_is_shared(struct page *page)</div><div class='add'>+static void dax_folio_make_shared(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page-&gt;mapping == PAGE_MAPPING_DAX_SHARED;</div><div class='add'>+	/*</div><div class='add'>+	 * folio is not currently shared so mark it as shared by clearing</div><div class='add'>+	 * folio-&gt;mapping.</div><div class='add'>+	 */</div><div class='add'>+	folio-&gt;mapping = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * folio has previously been mapped into one address space so set the</div><div class='add'>+	 * share count.</div><div class='add'>+	 */</div><div class='add'>+	folio-&gt;share = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set the page-&gt;mapping with PAGE_MAPPING_DAX_SHARED flag, increase the</div><div class='del'>- * refcount.</div><div class='del'>- */</div><div class='del'>-static inline void dax_page_share_get(struct page *page)</div><div class='add'>+static inline unsigned long dax_folio_put(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (page-&gt;mapping != PAGE_MAPPING_DAX_SHARED) {</div><div class='add'>+	unsigned long ref;</div><div class='add'>+	int order, i;</div><div class='add'>+</div><div class='add'>+	if (!dax_folio_is_shared(folio))</div><div class='add'>+		ref = 0;</div><div class='add'>+	else</div><div class='add'>+		ref = --folio-&gt;share;</div><div class='add'>+</div><div class='add'>+	if (ref)</div><div class='add'>+		return ref;</div><div class='add'>+</div><div class='add'>+	folio-&gt;mapping = NULL;</div><div class='add'>+	order = folio_order(folio);</div><div class='add'>+	if (!order)</div><div class='add'>+		return 0;</div><div class='add'>+	folio_reset_order(folio);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (1UL &lt;&lt; order); i++) {</div><div class='add'>+		struct dev_pagemap *pgmap = page_pgmap(&amp;folio-&gt;page);</div><div class='add'>+		struct page *page = folio_page(folio, i);</div><div class='add'>+		struct folio *new_folio = (struct folio *)page;</div><div class='add'>+</div><div class='add'>+		ClearPageHead(page);</div><div class='add'>+		clear_compound_head(page);</div><div class='add'>+</div><div class='add'>+		new_folio-&gt;mapping = NULL;</div><div class='ctx'> 		/*</div><div class='del'>-		 * Reset the index if the page was already mapped</div><div class='del'>-		 * regularly before.</div><div class='add'>+		 * Reset pgmap which was over-written by</div><div class='add'>+		 * prep_compound_page().</div><div class='ctx'> 		 */</div><div class='del'>-		if (page-&gt;mapping)</div><div class='del'>-			page-&gt;share = 1;</div><div class='del'>-		page-&gt;mapping = PAGE_MAPPING_DAX_SHARED;</div><div class='add'>+		new_folio-&gt;pgmap = pgmap;</div><div class='add'>+		new_folio-&gt;share = 0;</div><div class='add'>+		WARN_ON_ONCE(folio_ref_count(new_folio));</div><div class='ctx'> 	}</div><div class='del'>-	page-&gt;share++;</div><div class='add'>+</div><div class='add'>+	return ref;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long dax_page_share_put(struct page *page)</div><div class='add'>+static void dax_folio_init(void *entry)</div><div class='ctx'> {</div><div class='del'>-	return --page-&gt;share;</div><div class='add'>+	struct folio *folio = dax_to_folio(entry);</div><div class='add'>+	int order = dax_entry_order(entry);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Folio should have been split back to order-0 pages in</div><div class='add'>+	 * dax_folio_put() when they were removed from their</div><div class='add'>+	 * final mapping.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(folio_order(folio));</div><div class='add'>+</div><div class='add'>+	if (order &gt; 0) {</div><div class='add'>+		prep_compound_page(&amp;folio-&gt;page, order);</div><div class='add'>+		if (order &gt; 1)</div><div class='add'>+			INIT_LIST_HEAD(&amp;folio-&gt;_deferred_list);</div><div class='add'>+		WARN_ON_ONCE(folio_ref_count(folio));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * When it is called in dax_insert_entry(), the shared flag will indicate that</div><div class='del'>- * whether this entry is shared by multiple files.  If so, set the page-&gt;mapping</div><div class='del'>- * PAGE_MAPPING_DAX_SHARED, and use page-&gt;share as refcount.</div><div class='del'>- */</div><div class='ctx'> static void dax_associate_entry(void *entry, struct address_space *mapping,</div><div class='del'>-		struct vm_area_struct *vma, unsigned long address, bool shared)</div><div class='add'>+				struct vm_area_struct *vma,</div><div class='add'>+				unsigned long address, bool shared)</div><div class='ctx'> {</div><div class='del'>-	unsigned long size = dax_entry_size(entry), pfn, index;</div><div class='del'>-	int i = 0;</div><div class='add'>+	unsigned long size = dax_entry_size(entry), index;</div><div class='add'>+	struct folio *folio = dax_to_folio(entry);</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))</div><div class='add'>+	if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	index = linear_page_index(vma, address &amp; ~(size - 1));</div><div class='del'>-	for_each_mapped_pfn(entry, pfn) {</div><div class='del'>-		struct page *page = pfn_to_page(pfn);</div><div class='add'>+	if (shared &amp;&amp; (folio-&gt;mapping || dax_folio_is_shared(folio))) {</div><div class='add'>+		if (folio-&gt;mapping)</div><div class='add'>+			dax_folio_make_shared(folio);</div><div class='ctx'> </div><div class='del'>-		if (shared) {</div><div class='del'>-			dax_page_share_get(page);</div><div class='del'>-		} else {</div><div class='del'>-			WARN_ON_ONCE(page-&gt;mapping);</div><div class='del'>-			page-&gt;mapping = mapping;</div><div class='del'>-			page-&gt;index = index + i++;</div><div class='del'>-		}</div><div class='add'>+		WARN_ON_ONCE(!folio-&gt;share);</div><div class='add'>+		WARN_ON_ONCE(dax_entry_order(entry) != folio_order(folio));</div><div class='add'>+		folio-&gt;share++;</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(folio-&gt;mapping);</div><div class='add'>+		dax_folio_init(entry);</div><div class='add'>+		folio = dax_to_folio(entry);</div><div class='add'>+		folio-&gt;mapping = mapping;</div><div class='add'>+		folio-&gt;index = index;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dax_disassociate_entry(void *entry, struct address_space *mapping,</div><div class='del'>-		bool trunc)</div><div class='add'>+				bool trunc)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pfn;</div><div class='add'>+	struct folio *folio = dax_to_folio(entry);</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))</div><div class='add'>+	if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for_each_mapped_pfn(entry, pfn) {</div><div class='del'>-		struct page *page = pfn_to_page(pfn);</div><div class='del'>-</div><div class='del'>-		WARN_ON_ONCE(trunc &amp;&amp; page_ref_count(page) &gt; 1);</div><div class='del'>-		if (dax_page_is_shared(page)) {</div><div class='del'>-			/* keep the shared flag if this page is still shared */</div><div class='del'>-			if (dax_page_share_put(page) &gt; 0)</div><div class='del'>-				continue;</div><div class='del'>-		} else</div><div class='del'>-			WARN_ON_ONCE(page-&gt;mapping &amp;&amp; page-&gt;mapping != mapping);</div><div class='del'>-		page-&gt;mapping = NULL;</div><div class='del'>-		page-&gt;index = 0;</div><div class='del'>-	}</div><div class='add'>+	dax_folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *dax_busy_page(void *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pfn;</div><div class='add'>+	struct folio *folio = dax_to_folio(entry);</div><div class='ctx'> </div><div class='del'>-	for_each_mapped_pfn(entry, pfn) {</div><div class='del'>-		struct page *page = pfn_to_page(pfn);</div><div class='add'>+	if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-		if (page_ref_count(page) &gt; 1)</div><div class='del'>-			return page;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	if (folio_ref_count(folio) - folio_mapcount(folio))</div><div class='add'>+		return &amp;folio-&gt;page;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -580,7 +657,7 @@ static void *grab_mapping_entry(struct xa_state *xas,</div><div class='ctx'> retry:</div><div class='ctx'> 	pmd_downgrade = false;</div><div class='ctx'> 	xas_lock_irq(xas);</div><div class='del'>-	entry = get_unlocked_entry(xas, order);</div><div class='add'>+	entry = get_next_unlocked_entry(xas, order);</div><div class='ctx'> </div><div class='ctx'> 	if (entry) {</div><div class='ctx'> 		if (dax_is_conflict(entry))</div><div class='hunk'>@@ -635,7 +712,7 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 		if (order &gt; 0)</div><div class='ctx'> 			flags |= DAX_PMD;</div><div class='del'>-		entry = dax_make_entry(pfn_to_pfn_t(0), flags);</div><div class='add'>+		entry = dax_make_entry(0, flags);</div><div class='ctx'> 		dax_lock_entry(xas, entry);</div><div class='ctx'> 		if (xas_error(xas))</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -684,13 +761,7 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping,</div><div class='ctx'> 	pgoff_t end_idx;</div><div class='ctx'> 	XA_STATE(xas, &amp;mapping-&gt;i_pages, start_idx);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * In the 'limited' case get_user_pages() for dax is disabled.</div><div class='del'>-	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!dax_mapping(mapping) || !mapping_mapped(mapping))</div><div class='add'>+	if (!dax_mapping(mapping))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* If end == LLONG_MAX, all pages from start to till end of file */</div><div class='hunk'>@@ -716,8 +787,7 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping,</div><div class='ctx'> 	xas_for_each(&amp;xas, entry, end_idx) {</div><div class='ctx'> 		if (WARN_ON_ONCE(!xa_is_value(entry)))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (unlikely(dax_is_locked(entry)))</div><div class='del'>-			entry = get_unlocked_entry(&amp;xas, 0);</div><div class='add'>+		entry = wait_entry_unlocked_exclusive(&amp;xas, entry);</div><div class='ctx'> 		if (entry)</div><div class='ctx'> 			page = dax_busy_page(entry);</div><div class='ctx'> 		put_unlocked_entry(&amp;xas, entry, WAKE_NEXT);</div><div class='hunk'>@@ -743,14 +813,14 @@ struct page *dax_layout_busy_page(struct address_space *mapping)</div><div class='ctx'> EXPORT_SYMBOL_GPL(dax_layout_busy_page);</div><div class='ctx'> </div><div class='ctx'> static int __dax_invalidate_entry(struct address_space *mapping,</div><div class='del'>-					  pgoff_t index, bool trunc)</div><div class='add'>+				  pgoff_t index, bool trunc)</div><div class='ctx'> {</div><div class='ctx'> 	XA_STATE(xas, &amp;mapping-&gt;i_pages, index);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	void *entry;</div><div class='ctx'> </div><div class='ctx'> 	xas_lock_irq(&amp;xas);</div><div class='del'>-	entry = get_unlocked_entry(&amp;xas, 0);</div><div class='add'>+	entry = get_next_unlocked_entry(&amp;xas, 0);</div><div class='ctx'> 	if (!entry || WARN_ON_ONCE(!xa_is_value(entry)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (!trunc &amp;&amp;</div><div class='hunk'>@@ -776,7 +846,9 @@ static int __dax_clear_dirty_range(struct address_space *mapping,</div><div class='ctx'> </div><div class='ctx'> 	xas_lock_irq(&amp;xas);</div><div class='ctx'> 	xas_for_each(&amp;xas, entry, end) {</div><div class='del'>-		entry = get_unlocked_entry(&amp;xas, 0);</div><div class='add'>+		entry = wait_entry_unlocked_exclusive(&amp;xas, entry);</div><div class='add'>+		if (!entry)</div><div class='add'>+			continue;</div><div class='ctx'> 		xas_clear_mark(&amp;xas, PAGECACHE_TAG_DIRTY);</div><div class='ctx'> 		xas_clear_mark(&amp;xas, PAGECACHE_TAG_TOWRITE);</div><div class='ctx'> 		put_unlocked_entry(&amp;xas, entry, WAKE_NEXT);</div><div class='hunk'>@@ -813,6 +885,107 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void dax_delete_mapping_range(struct address_space *mapping,</div><div class='add'>+				loff_t start, loff_t end)</div><div class='add'>+{</div><div class='add'>+	void *entry;</div><div class='add'>+	pgoff_t start_idx = start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t end_idx;</div><div class='add'>+	XA_STATE(xas, &amp;mapping-&gt;i_pages, start_idx);</div><div class='add'>+</div><div class='add'>+	/* If end == LLONG_MAX, all pages from start to till end of file */</div><div class='add'>+	if (end == LLONG_MAX)</div><div class='add'>+		end_idx = ULONG_MAX;</div><div class='add'>+	else</div><div class='add'>+		end_idx = end &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	xas_lock_irq(&amp;xas);</div><div class='add'>+	xas_for_each(&amp;xas, entry, end_idx) {</div><div class='add'>+		if (!xa_is_value(entry))</div><div class='add'>+			continue;</div><div class='add'>+		entry = wait_entry_unlocked_exclusive(&amp;xas, entry);</div><div class='add'>+		if (!entry)</div><div class='add'>+			continue;</div><div class='add'>+		dax_disassociate_entry(entry, mapping, true);</div><div class='add'>+		xas_store(&amp;xas, NULL);</div><div class='add'>+		mapping-&gt;nrpages -= 1UL &lt;&lt; dax_entry_order(entry);</div><div class='add'>+		put_unlocked_entry(&amp;xas, entry, WAKE_ALL);</div><div class='add'>+	}</div><div class='add'>+	xas_unlock_irq(&amp;xas);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dax_delete_mapping_range);</div><div class='add'>+</div><div class='add'>+static int wait_page_idle(struct page *page,</div><div class='add'>+			void (cb)(struct inode *),</div><div class='add'>+			struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return ___wait_var_event(page, dax_page_is_idle(page),</div><div class='add'>+				TASK_INTERRUPTIBLE, 0, 0, cb(inode));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wait_page_idle_uninterruptible(struct page *page,</div><div class='add'>+					struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	___wait_var_event(page, dax_page_is_idle(page),</div><div class='add'>+			TASK_UNINTERRUPTIBLE, 0, 0, schedule());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unmaps the inode and waits for any DMA to complete prior to deleting the</div><div class='add'>+ * DAX mapping entries for the range.</div><div class='add'>+ *</div><div class='add'>+ * For NOWAIT behavior, pass @cb as NULL to early-exit on first found</div><div class='add'>+ * busy page</div><div class='add'>+ */</div><div class='add'>+int dax_break_layout(struct inode *inode, loff_t start, loff_t end,</div><div class='add'>+		void (cb)(struct inode *))</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (!dax_mapping(inode-&gt;i_mapping))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		page = dax_layout_busy_page_range(inode-&gt;i_mapping, start, end);</div><div class='add'>+		if (!page)</div><div class='add'>+			break;</div><div class='add'>+		if (!cb) {</div><div class='add'>+			error = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		error = wait_page_idle(page, cb, inode);</div><div class='add'>+	} while (error == 0);</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		dax_delete_mapping_range(inode-&gt;i_mapping, start, end);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dax_break_layout);</div><div class='add'>+</div><div class='add'>+void dax_break_layout_final(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (!dax_mapping(inode-&gt;i_mapping))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		page = dax_layout_busy_page_range(inode-&gt;i_mapping, 0,</div><div class='add'>+						LLONG_MAX);</div><div class='add'>+		if (!page)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wait_page_idle_uninterruptible(page, inode);</div><div class='add'>+	} while (true);</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		dax_delete_mapping_range(inode-&gt;i_mapping, 0, LLONG_MAX);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dax_break_layout_final);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Invalidate DAX entry if it is clean.</div><div class='ctx'>  */</div><div class='hunk'>@@ -867,7 +1040,7 @@ static bool dax_fault_is_synchronous(const struct iomap_iter *iter,</div><div class='ctx'>  * appropriate.</div><div class='ctx'>  */</div><div class='ctx'> static void *dax_insert_entry(struct xa_state *xas, struct vm_fault *vmf,</div><div class='del'>-		const struct iomap_iter *iter, void *entry, pfn_t pfn,</div><div class='add'>+		const struct iomap_iter *iter, void *entry, unsigned long pfn,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = vmf-&gt;vma-&gt;vm_file-&gt;f_mapping;</div><div class='hunk'>@@ -895,8 +1068,9 @@ static void *dax_insert_entry(struct xa_state *xas, struct vm_fault *vmf,</div><div class='ctx'> 		void *old;</div><div class='ctx'> </div><div class='ctx'> 		dax_disassociate_entry(entry, mapping, false);</div><div class='del'>-		dax_associate_entry(new_entry, mapping, vmf-&gt;vma, vmf-&gt;address,</div><div class='del'>-				shared);</div><div class='add'>+		dax_associate_entry(new_entry, mapping, vmf-&gt;vma,</div><div class='add'>+					vmf-&gt;address, shared);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Only swap our new entry into the page cache if the current</div><div class='ctx'> 		 * entry is a zero page or an empty entry.  If a normal PTE or</div><div class='hunk'>@@ -940,7 +1114,7 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev,</div><div class='ctx'> 	if (unlikely(dax_is_locked(entry))) {</div><div class='ctx'> 		void *old_entry = entry;</div><div class='ctx'> </div><div class='del'>-		entry = get_unlocked_entry(xas, 0);</div><div class='add'>+		entry = get_next_unlocked_entry(xas, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* Entry got punched out / reallocated? */</div><div class='ctx'> 		if (!entry || WARN_ON_ONCE(!xa_is_value(entry)))</div><div class='hunk'>@@ -1064,7 +1238,7 @@ int dax_writeback_mapping_range(struct address_space *mapping,</div><div class='ctx'> EXPORT_SYMBOL_GPL(dax_writeback_mapping_range);</div><div class='ctx'> </div><div class='ctx'> static int dax_iomap_direct_access(const struct iomap *iomap, loff_t pos,</div><div class='del'>-		size_t size, void **kaddr, pfn_t *pfnp)</div><div class='add'>+		size_t size, void **kaddr, unsigned long *pfnp)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t pgoff = dax_iomap_pgoff(iomap, pos);</div><div class='ctx'> 	int id, rc = 0;</div><div class='hunk'>@@ -1082,11 +1256,9 @@ static int dax_iomap_direct_access(const struct iomap *iomap, loff_t pos,</div><div class='ctx'> 	rc = -EINVAL;</div><div class='ctx'> 	if (PFN_PHYS(length) &lt; size)</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (pfn_t_to_pfn(*pfnp) &amp; (PHYS_PFN(size)-1))</div><div class='del'>-		goto out;</div><div class='del'>-	/* For larger pages we need devmap */</div><div class='del'>-	if (length &gt; 1 &amp;&amp; !pfn_t_devmap(*pfnp))</div><div class='add'>+	if (*pfnp &amp; (PHYS_PFN(size)-1))</div><div class='ctx'> 		goto out;</div><div class='add'>+</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> </div><div class='ctx'> out_check_addr:</div><div class='hunk'>@@ -1188,12 +1360,12 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, struct vm_fault *vmf,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = iter-&gt;inode;</div><div class='ctx'> 	unsigned long vaddr = vmf-&gt;address;</div><div class='del'>-	pfn_t pfn = pfn_to_pfn_t(my_zero_pfn(vaddr));</div><div class='add'>+	unsigned long pfn = my_zero_pfn(vaddr);</div><div class='ctx'> 	vm_fault_t ret;</div><div class='ctx'> </div><div class='ctx'> 	*entry = dax_insert_entry(xas, vmf, iter, *entry, pfn, DAX_ZERO_PAGE);</div><div class='ctx'> </div><div class='del'>-	ret = vmf_insert_mixed(vmf-&gt;vma, vaddr, pfn);</div><div class='add'>+	ret = vmf_insert_page_mkwrite(vmf, pfn_to_page(pfn), false);</div><div class='ctx'> 	trace_dax_load_hole(inode, vmf, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1203,52 +1375,24 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf,</div><div class='ctx'> 		const struct iomap_iter *iter, void **entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = vmf-&gt;vma-&gt;vm_file-&gt;f_mapping;</div><div class='del'>-	unsigned long pmd_addr = vmf-&gt;address &amp; PMD_MASK;</div><div class='del'>-	struct vm_area_struct *vma = vmf-&gt;vma;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	pgtable_t pgtable = NULL;</div><div class='del'>-	struct page *zero_page;</div><div class='del'>-	spinlock_t *ptl;</div><div class='del'>-	pmd_t pmd_entry;</div><div class='del'>-	pfn_t pfn;</div><div class='del'>-</div><div class='del'>-	zero_page = mm_get_huge_zero_page(vmf-&gt;vma-&gt;vm_mm);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!zero_page))</div><div class='del'>-		goto fallback;</div><div class='del'>-</div><div class='del'>-	pfn = page_to_pfn_t(zero_page);</div><div class='del'>-	*entry = dax_insert_entry(xas, vmf, iter, *entry, pfn,</div><div class='del'>-				  DAX_PMD | DAX_ZERO_PAGE);</div><div class='add'>+	struct folio *zero_folio;</div><div class='add'>+	vm_fault_t ret;</div><div class='ctx'> </div><div class='del'>-	if (arch_needs_pgtable_deposit()) {</div><div class='del'>-		pgtable = pte_alloc_one(vma-&gt;vm_mm);</div><div class='del'>-		if (!pgtable)</div><div class='del'>-			return VM_FAULT_OOM;</div><div class='del'>-	}</div><div class='add'>+	zero_folio = mm_get_huge_zero_folio(vmf-&gt;vma-&gt;vm_mm);</div><div class='ctx'> </div><div class='del'>-	ptl = pmd_lock(vmf-&gt;vma-&gt;vm_mm, vmf-&gt;pmd);</div><div class='del'>-	if (!pmd_none(*(vmf-&gt;pmd))) {</div><div class='del'>-		spin_unlock(ptl);</div><div class='del'>-		goto fallback;</div><div class='add'>+	if (unlikely(!zero_folio)) {</div><div class='add'>+		trace_dax_pmd_load_hole_fallback(inode, vmf, zero_folio, *entry);</div><div class='add'>+		return VM_FAULT_FALLBACK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pgtable) {</div><div class='del'>-		pgtable_trans_huge_deposit(vma-&gt;vm_mm, vmf-&gt;pmd, pgtable);</div><div class='del'>-		mm_inc_nr_ptes(vma-&gt;vm_mm);</div><div class='del'>-	}</div><div class='del'>-	pmd_entry = mk_pmd(zero_page, vmf-&gt;vma-&gt;vm_page_prot);</div><div class='del'>-	pmd_entry = pmd_mkhuge(pmd_entry);</div><div class='del'>-	set_pmd_at(vmf-&gt;vma-&gt;vm_mm, pmd_addr, vmf-&gt;pmd, pmd_entry);</div><div class='del'>-	spin_unlock(ptl);</div><div class='del'>-	trace_dax_pmd_load_hole(inode, vmf, zero_page, *entry);</div><div class='del'>-	return VM_FAULT_NOPAGE;</div><div class='add'>+	*entry = dax_insert_entry(xas, vmf, iter, *entry, folio_pfn(zero_folio),</div><div class='add'>+				  DAX_PMD | DAX_ZERO_PAGE);</div><div class='ctx'> </div><div class='del'>-fallback:</div><div class='del'>-	if (pgtable)</div><div class='del'>-		pte_free(vma-&gt;vm_mm, pgtable);</div><div class='del'>-	trace_dax_pmd_load_hole_fallback(inode, vmf, zero_page, *entry);</div><div class='del'>-	return VM_FAULT_FALLBACK;</div><div class='add'>+	ret = vmf_insert_folio_pmd(vmf, zero_folio, false);</div><div class='add'>+	if (ret == VM_FAULT_NOPAGE)</div><div class='add'>+		trace_dax_pmd_load_hole(inode, vmf, zero_folio, *entry);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf,</div><div class='hunk'>@@ -1258,45 +1402,56 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_FS_DAX_PMD */</div><div class='ctx'> </div><div class='del'>-static s64 dax_unshare_iter(struct iomap_iter *iter)</div><div class='add'>+static int dax_unshare_iter(struct iomap_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='ctx'> 	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='del'>-	loff_t pos = iter-&gt;pos;</div><div class='del'>-	loff_t length = iomap_length(iter);</div><div class='add'>+	loff_t copy_pos = iter-&gt;pos;</div><div class='add'>+	u64 copy_len = iomap_length(iter);</div><div class='add'>+	u32 mod;</div><div class='ctx'> 	int id = 0;</div><div class='del'>-	s64 ret = 0;</div><div class='add'>+	s64 ret;</div><div class='ctx'> 	void *daddr = NULL, *saddr = NULL;</div><div class='ctx'> </div><div class='del'>-	/* don't bother with blocks that are not shared to start with */</div><div class='del'>-	if (!(iomap-&gt;flags &amp; IOMAP_F_SHARED))</div><div class='del'>-		return length;</div><div class='add'>+	if (!iomap_want_unshare_iter(iter))</div><div class='add'>+		return iomap_iter_advance_full(iter);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Extend the file range to be aligned to fsblock/pagesize, because</div><div class='add'>+	 * we need to copy entire blocks, not just the byte range specified.</div><div class='add'>+	 * Invalidate the mapping because we're about to CoW.</div><div class='add'>+	 */</div><div class='add'>+	mod = offset_in_page(copy_pos);</div><div class='add'>+	if (mod) {</div><div class='add'>+		copy_len += mod;</div><div class='add'>+		copy_pos -= mod;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mod = offset_in_page(copy_pos + copy_len);</div><div class='add'>+	if (mod)</div><div class='add'>+		copy_len += PAGE_SIZE - mod;</div><div class='add'>+</div><div class='add'>+	invalidate_inode_pages2_range(iter-&gt;inode-&gt;i_mapping,</div><div class='add'>+				      copy_pos &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				      (copy_pos + copy_len - 1) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	id = dax_read_lock();</div><div class='del'>-	ret = dax_iomap_direct_access(iomap, pos, length, &amp;daddr, NULL);</div><div class='add'>+	ret = dax_iomap_direct_access(iomap, copy_pos, copy_len, &amp;daddr, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	/* zero the distance if srcmap is HOLE or UNWRITTEN */</div><div class='del'>-	if (srcmap-&gt;flags &amp; IOMAP_F_SHARED || srcmap-&gt;type == IOMAP_UNWRITTEN) {</div><div class='del'>-		memset(daddr, 0, length);</div><div class='del'>-		dax_flush(iomap-&gt;dax_dev, daddr, length);</div><div class='del'>-		ret = length;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = dax_iomap_direct_access(srcmap, pos, length, &amp;saddr, NULL);</div><div class='add'>+	ret = dax_iomap_direct_access(srcmap, copy_pos, copy_len, &amp;saddr, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	if (copy_mc_to_kernel(daddr, saddr, length) == 0)</div><div class='del'>-		ret = length;</div><div class='del'>-	else</div><div class='add'>+	if (copy_mc_to_kernel(daddr, saddr, copy_len) != 0)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	dax_read_unlock(id);</div><div class='del'>-	return dax_mem2blk_err(ret);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return dax_mem2blk_err(ret);</div><div class='add'>+	return iomap_iter_advance_full(iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dax_file_unshare(struct inode *inode, loff_t pos, loff_t len,</div><div class='hunk'>@@ -1305,13 +1460,17 @@ int dax_file_unshare(struct inode *inode, loff_t pos, loff_t len,</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode		= inode,</div><div class='ctx'> 		.pos		= pos,</div><div class='del'>-		.len		= len,</div><div class='ctx'> 		.flags		= IOMAP_WRITE | IOMAP_UNSHARE | IOMAP_DAX,</div><div class='ctx'> 	};</div><div class='add'>+	loff_t size = i_size_read(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (pos &lt; 0 || pos &gt;= size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iter.len = min(len, size - pos);</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = dax_unshare_iter(&amp;iter);</div><div class='add'>+		iter.status = dax_unshare_iter(&amp;iter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dax_file_unshare);</div><div class='hunk'>@@ -1339,17 +1498,16 @@ static int dax_memzero(struct iomap_iter *iter, loff_t pos, size_t size)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static s64 dax_zero_iter(struct iomap_iter *iter, bool *did_zero)</div><div class='add'>+static int dax_zero_iter(struct iomap_iter *iter, bool *did_zero)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='ctx'> 	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='del'>-	loff_t pos = iter-&gt;pos;</div><div class='ctx'> 	u64 length = iomap_length(iter);</div><div class='del'>-	s64 written = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* already zeroed?  we're done. */</div><div class='ctx'> 	if (srcmap-&gt;type == IOMAP_HOLE || srcmap-&gt;type == IOMAP_UNWRITTEN)</div><div class='del'>-		return length;</div><div class='add'>+		return iomap_iter_advance(iter, length);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * invalidate the pages whose sharing state is to be changed</div><div class='hunk'>@@ -1357,33 +1515,35 @@ static s64 dax_zero_iter(struct iomap_iter *iter, bool *did_zero)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (iomap-&gt;flags &amp; IOMAP_F_SHARED)</div><div class='ctx'> 		invalidate_inode_pages2_range(iter-&gt;inode-&gt;i_mapping,</div><div class='del'>-					      pos &gt;&gt; PAGE_SHIFT,</div><div class='del'>-					      (pos + length - 1) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+				iter-&gt;pos &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				(iter-&gt;pos + length - 1) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='add'>+		loff_t pos = iter-&gt;pos;</div><div class='ctx'> 		unsigned offset = offset_in_page(pos);</div><div class='del'>-		unsigned size = min_t(u64, PAGE_SIZE - offset, length);</div><div class='ctx'> 		pgoff_t pgoff = dax_iomap_pgoff(iomap, pos);</div><div class='del'>-		long rc;</div><div class='ctx'> 		int id;</div><div class='ctx'> </div><div class='add'>+		length = min_t(u64, PAGE_SIZE - offset, length);</div><div class='add'>+</div><div class='ctx'> 		id = dax_read_lock();</div><div class='del'>-		if (IS_ALIGNED(pos, PAGE_SIZE) &amp;&amp; size == PAGE_SIZE)</div><div class='del'>-			rc = dax_zero_page_range(iomap-&gt;dax_dev, pgoff, 1);</div><div class='add'>+		if (IS_ALIGNED(pos, PAGE_SIZE) &amp;&amp; length == PAGE_SIZE)</div><div class='add'>+			ret = dax_zero_page_range(iomap-&gt;dax_dev, pgoff, 1);</div><div class='ctx'> 		else</div><div class='del'>-			rc = dax_memzero(iter, pos, size);</div><div class='add'>+			ret = dax_memzero(iter, pos, length);</div><div class='ctx'> 		dax_read_unlock(id);</div><div class='ctx'> </div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			return rc;</div><div class='del'>-		pos += size;</div><div class='del'>-		length -= size;</div><div class='del'>-		written += size;</div><div class='del'>-	} while (length &gt; 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = iomap_iter_advance(iter, length);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} while ((length = iomap_length(iter)) &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 	if (did_zero)</div><div class='ctx'> 		*did_zero = true;</div><div class='del'>-	return written;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dax_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero,</div><div class='hunk'>@@ -1398,7 +1558,7 @@ int dax_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = dax_zero_iter(&amp;iter, did_zero);</div><div class='add'>+		iter.status = dax_zero_iter(&amp;iter, did_zero);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dax_zero_range);</div><div class='hunk'>@@ -1416,8 +1576,7 @@ int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dax_truncate_page);</div><div class='ctx'> </div><div class='del'>-static loff_t dax_iomap_iter(const struct iomap_iter *iomi,</div><div class='del'>-		struct iov_iter *iter)</div><div class='add'>+static int dax_iomap_iter(struct iomap_iter *iomi, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *iomap = &amp;iomi-&gt;iomap;</div><div class='ctx'> 	const struct iomap *srcmap = iomap_iter_srcmap(iomi);</div><div class='hunk'>@@ -1436,8 +1595,10 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi,</div><div class='ctx'> 		if (pos &gt;= end)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		if (iomap-&gt;type == IOMAP_HOLE || iomap-&gt;type == IOMAP_UNWRITTEN)</div><div class='del'>-			return iov_iter_zero(min(length, end - pos), iter);</div><div class='add'>+		if (iomap-&gt;type == IOMAP_HOLE || iomap-&gt;type == IOMAP_UNWRITTEN) {</div><div class='add'>+			done = iov_iter_zero(min(length, end - pos), iter);</div><div class='add'>+			return iomap_iter_advance(iomi, done);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1470,7 +1631,7 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	id = dax_read_lock();</div><div class='del'>-	while (pos &lt; end) {</div><div class='add'>+	while ((pos = iomi-&gt;pos) &lt; end) {</div><div class='ctx'> 		unsigned offset = pos &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 		const size_t size = ALIGN(length + offset, PAGE_SIZE);</div><div class='ctx'> 		pgoff_t pgoff = dax_iomap_pgoff(iomap, pos);</div><div class='hunk'>@@ -1520,18 +1681,16 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi,</div><div class='ctx'> 			xfer = dax_copy_to_iter(dax_dev, pgoff, kaddr,</div><div class='ctx'> 					map_len, iter);</div><div class='ctx'> </div><div class='del'>-		pos += xfer;</div><div class='del'>-		length -= xfer;</div><div class='del'>-		done += xfer;</div><div class='del'>-</div><div class='del'>-		if (xfer == 0)</div><div class='add'>+		ret = iomap_iter_advance(iomi, xfer);</div><div class='add'>+		if (!ret &amp;&amp; xfer == 0)</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		if (xfer &lt; map_len)</div><div class='ctx'> 			break;</div><div class='add'>+		length = iomap_length(iomi);</div><div class='ctx'> 	}</div><div class='ctx'> 	dax_read_unlock(id);</div><div class='ctx'> </div><div class='del'>-	return done ? done : ret;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1557,13 +1716,16 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 	loff_t done = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(iocb-&gt;ki_flags &amp; IOCB_ATOMIC))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (!iomi.len)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (iov_iter_rw(iter) == WRITE) {</div><div class='ctx'> 		lockdep_assert_held_write(&amp;iomi.inode-&gt;i_rwsem);</div><div class='ctx'> 		iomi.flags |= IOMAP_WRITE;</div><div class='del'>-	} else {</div><div class='add'>+	} else if (!sb_rdonly(iomi.inode-&gt;i_sb)) {</div><div class='ctx'> 		lockdep_assert_held(&amp;iomi.inode-&gt;i_rwsem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1571,7 +1733,7 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		iomi.flags |= IOMAP_NOWAIT;</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iomi, ops)) &gt; 0)</div><div class='del'>-		iomi.processed = dax_iomap_iter(&amp;iomi, iter);</div><div class='add'>+		iomi.status = dax_iomap_iter(&amp;iomi, iter);</div><div class='ctx'> </div><div class='ctx'> 	done = iomi.pos - iocb-&gt;ki_pos;</div><div class='ctx'> 	iocb-&gt;ki_pos = iomi.pos;</div><div class='hunk'>@@ -1592,7 +1754,8 @@ static vm_fault_t dax_fault_return(int error)</div><div class='ctx'>  * insertion for now and return the pfn so that caller can insert it after the</div><div class='ctx'>  * fsync is done.</div><div class='ctx'>  */</div><div class='del'>-static vm_fault_t dax_fault_synchronous_pfnp(pfn_t *pfnp, pfn_t pfn)</div><div class='add'>+static vm_fault_t dax_fault_synchronous_pfnp(unsigned long *pfnp,</div><div class='add'>+					unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON_ONCE(!pfnp))</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='hunk'>@@ -1640,7 +1803,7 @@ static vm_fault_t dax_fault_cow_page(struct vm_fault *vmf,</div><div class='ctx'>  * @pmd:	distinguish whether it is a pmd fault</div><div class='ctx'>  */</div><div class='ctx'> static vm_fault_t dax_fault_iter(struct vm_fault *vmf,</div><div class='del'>-		const struct iomap_iter *iter, pfn_t *pfnp,</div><div class='add'>+		const struct iomap_iter *iter, unsigned long *pfnp,</div><div class='ctx'> 		struct xa_state *xas, void **entry, bool pmd)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='hunk'>@@ -1649,8 +1812,9 @@ static vm_fault_t dax_fault_iter(struct vm_fault *vmf,</div><div class='ctx'> 	loff_t pos = (loff_t)xas-&gt;xa_index &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	bool write = iter-&gt;flags &amp; IOMAP_WRITE;</div><div class='ctx'> 	unsigned long entry_flags = pmd ? DAX_PMD : 0;</div><div class='del'>-	int err = 0;</div><div class='del'>-	pfn_t pfn;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	int ret, err = 0;</div><div class='add'>+	unsigned long pfn;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> </div><div class='ctx'> 	if (!pmd &amp;&amp; vmf-&gt;cow_page)</div><div class='hunk'>@@ -1681,20 +1845,21 @@ static vm_fault_t dax_fault_iter(struct vm_fault *vmf,</div><div class='ctx'> 			return dax_fault_return(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	folio = dax_to_folio(*entry);</div><div class='ctx'> 	if (dax_fault_is_synchronous(iter, vmf-&gt;vma))</div><div class='ctx'> 		return dax_fault_synchronous_pfnp(pfnp, pfn);</div><div class='ctx'> </div><div class='del'>-	/* insert PMD pfn */</div><div class='add'>+	folio_ref_inc(folio);</div><div class='ctx'> 	if (pmd)</div><div class='del'>-		return vmf_insert_pfn_pmd(vmf, pfn, write);</div><div class='add'>+		ret = vmf_insert_folio_pmd(vmf, pfn_folio(pfn), write);</div><div class='add'>+	else</div><div class='add'>+		ret = vmf_insert_page_mkwrite(vmf, pfn_to_page(pfn), write);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	/* insert PTE pfn */</div><div class='del'>-	if (write)</div><div class='del'>-		return vmf_insert_mixed_mkwrite(vmf-&gt;vma, vmf-&gt;address, pfn);</div><div class='del'>-	return vmf_insert_mixed(vmf-&gt;vma, vmf-&gt;address, pfn);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='add'>+static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, unsigned long *pfnp,</div><div class='ctx'> 			       int *iomap_errp, const struct iomap_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = vmf-&gt;vma-&gt;vm_file-&gt;f_mapping;</div><div class='hunk'>@@ -1735,14 +1900,14 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='ctx'> 	 * the PTE we need to set up.  If so just return and the fault will be</div><div class='ctx'> 	 * retried.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pmd_trans_huge(*vmf-&gt;pmd) || pmd_devmap(*vmf-&gt;pmd)) {</div><div class='add'>+	if (pmd_trans_huge(*vmf-&gt;pmd)) {</div><div class='ctx'> 		ret = VM_FAULT_NOPAGE;</div><div class='ctx'> 		goto unlock_entry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while ((error = iomap_iter(&amp;iter, ops)) &gt; 0) {</div><div class='ctx'> 		if (WARN_ON_ONCE(iomap_length(&amp;iter) &lt; PAGE_SIZE)) {</div><div class='del'>-			iter.processed = -EIO;	/* fs corruption? */</div><div class='add'>+			iter.status = -EIO;	/* fs corruption? */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1755,7 +1920,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(ret &amp; VM_FAULT_ERROR))</div><div class='del'>-			iter.processed = PAGE_SIZE;</div><div class='add'>+			iter.status = iomap_iter_advance(&amp;iter, PAGE_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (iomap_errp)</div><div class='hunk'>@@ -1804,7 +1969,7 @@ static bool dax_fault_check_fallback(struct vm_fault *vmf, struct xa_state *xas,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='add'>+static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, unsigned long *pfnp,</div><div class='ctx'> 			       const struct iomap_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = vmf-&gt;vma-&gt;vm_file-&gt;f_mapping;</div><div class='hunk'>@@ -1856,8 +2021,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='ctx'> 	 * the PMD we need to set up.  If so just return and the fault will be</div><div class='ctx'> 	 * retried.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!pmd_none(*vmf-&gt;pmd) &amp;&amp; !pmd_trans_huge(*vmf-&gt;pmd) &amp;&amp;</div><div class='del'>-			!pmd_devmap(*vmf-&gt;pmd)) {</div><div class='add'>+	if (!pmd_none(*vmf-&gt;pmd) &amp;&amp; !pmd_trans_huge(*vmf-&gt;pmd)) {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto unlock_entry;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1869,7 +2033,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='ctx'> </div><div class='ctx'> 		ret = dax_fault_iter(vmf, &amp;iter, pfnp, &amp;xas, &amp;entry, true);</div><div class='ctx'> 		if (ret != VM_FAULT_FALLBACK)</div><div class='del'>-			iter.processed = PMD_SIZE;</div><div class='add'>+			iter.status = iomap_iter_advance(&amp;iter, PMD_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> unlock_entry:</div><div class='hunk'>@@ -1884,7 +2048,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='add'>+static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, unsigned long *pfnp,</div><div class='ctx'> 			       const struct iomap_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	return VM_FAULT_FALLBACK;</div><div class='hunk'>@@ -1905,7 +2069,8 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,</div><div class='ctx'>  * successfully.</div><div class='ctx'>  */</div><div class='ctx'> vm_fault_t dax_iomap_fault(struct vm_fault *vmf, unsigned int order,</div><div class='del'>-		    pfn_t *pfnp, int *iomap_errp, const struct iomap_ops *ops)</div><div class='add'>+			unsigned long *pfnp, int *iomap_errp,</div><div class='add'>+			const struct iomap_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	if (order == 0)</div><div class='ctx'> 		return dax_iomap_pte_fault(vmf, pfnp, iomap_errp, ops);</div><div class='hunk'>@@ -1925,16 +2090,17 @@ EXPORT_SYMBOL_GPL(dax_iomap_fault);</div><div class='ctx'>  * This function inserts a writeable PTE or PMD entry into the page tables</div><div class='ctx'>  * for an mmaped DAX file.  It also marks the page cache entry as dirty.</div><div class='ctx'>  */</div><div class='del'>-static vm_fault_t</div><div class='del'>-dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order)</div><div class='add'>+static vm_fault_t dax_insert_pfn_mkwrite(struct vm_fault *vmf,</div><div class='add'>+					unsigned long pfn, unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = vmf-&gt;vma-&gt;vm_file-&gt;f_mapping;</div><div class='ctx'> 	XA_STATE_ORDER(xas, &amp;mapping-&gt;i_pages, vmf-&gt;pgoff, order);</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	void *entry;</div><div class='ctx'> 	vm_fault_t ret;</div><div class='ctx'> </div><div class='ctx'> 	xas_lock_irq(&amp;xas);</div><div class='del'>-	entry = get_unlocked_entry(&amp;xas, order);</div><div class='add'>+	entry = get_next_unlocked_entry(&amp;xas, order);</div><div class='ctx'> 	/* Did we race with someone splitting entry or so? */</div><div class='ctx'> 	if (!entry || dax_is_conflict(entry) ||</div><div class='ctx'> 	    (order == 0 &amp;&amp; !dax_is_pte_entry(entry))) {</div><div class='hunk'>@@ -1947,14 +2113,17 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order)</div><div class='ctx'> 	xas_set_mark(&amp;xas, PAGECACHE_TAG_DIRTY);</div><div class='ctx'> 	dax_lock_entry(&amp;xas, entry);</div><div class='ctx'> 	xas_unlock_irq(&amp;xas);</div><div class='add'>+	folio = pfn_folio(pfn);</div><div class='add'>+	folio_ref_inc(folio);</div><div class='ctx'> 	if (order == 0)</div><div class='del'>-		ret = vmf_insert_mixed_mkwrite(vmf-&gt;vma, vmf-&gt;address, pfn);</div><div class='add'>+		ret = vmf_insert_page_mkwrite(vmf, &amp;folio-&gt;page, true);</div><div class='ctx'> #ifdef CONFIG_FS_DAX_PMD</div><div class='ctx'> 	else if (order == PMD_ORDER)</div><div class='del'>-		ret = vmf_insert_pfn_pmd(vmf, pfn, FAULT_FLAG_WRITE);</div><div class='add'>+		ret = vmf_insert_folio_pmd(vmf, folio, FAULT_FLAG_WRITE);</div><div class='ctx'> #endif</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = VM_FAULT_FALLBACK;</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	dax_unlock_entry(&amp;xas, entry);</div><div class='ctx'> 	trace_dax_insert_pfn_mkwrite(mapping-&gt;host, vmf, ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1971,7 +2140,7 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order)</div><div class='ctx'>  * table entry.</div><div class='ctx'>  */</div><div class='ctx'> vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, unsigned int order,</div><div class='del'>-		pfn_t pfn)</div><div class='add'>+		unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	loff_t start = ((loff_t)vmf-&gt;pgoff) &lt;&lt; PAGE_SHIFT;</div><div class='hunk'>@@ -1984,7 +2153,7 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, unsigned int order,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dax_finish_sync_fault);</div><div class='ctx'> </div><div class='del'>-static loff_t dax_range_compare_iter(struct iomap_iter *it_src,</div><div class='add'>+static int dax_range_compare_iter(struct iomap_iter *it_src,</div><div class='ctx'> 		struct iomap_iter *it_dest, u64 len, bool *same)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *smap = &amp;it_src-&gt;iomap;</div><div class='hunk'>@@ -1997,7 +2166,7 @@ static loff_t dax_range_compare_iter(struct iomap_iter *it_src,</div><div class='ctx'> </div><div class='ctx'> 	if (smap-&gt;type == IOMAP_HOLE &amp;&amp; dmap-&gt;type == IOMAP_HOLE) {</div><div class='ctx'> 		*same = true;</div><div class='del'>-		return len;</div><div class='add'>+		goto advance;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (smap-&gt;type == IOMAP_HOLE || dmap-&gt;type == IOMAP_HOLE) {</div><div class='hunk'>@@ -2020,7 +2189,12 @@ static loff_t dax_range_compare_iter(struct iomap_iter *it_src,</div><div class='ctx'> 	if (!*same)</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	dax_read_unlock(id);</div><div class='del'>-	return len;</div><div class='add'>+</div><div class='add'>+advance:</div><div class='add'>+	ret = iomap_iter_advance(it_src, len);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = iomap_iter_advance(it_dest, len);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	dax_read_unlock(id);</div><div class='hunk'>@@ -2043,15 +2217,15 @@ int dax_dedupe_file_range_compare(struct inode *src, loff_t srcoff,</div><div class='ctx'> 		.len		= len,</div><div class='ctx'> 		.flags		= IOMAP_DAX,</div><div class='ctx'> 	};</div><div class='del'>-	int ret, compared = 0;</div><div class='add'>+	int ret, status;</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;src_iter, ops)) &gt; 0 &amp;&amp;</div><div class='ctx'> 	       (ret = iomap_iter(&amp;dst_iter, ops)) &gt; 0) {</div><div class='del'>-		compared = dax_range_compare_iter(&amp;src_iter, &amp;dst_iter,</div><div class='add'>+		status = dax_range_compare_iter(&amp;src_iter, &amp;dst_iter,</div><div class='ctx'> 				min(src_iter.len, dst_iter.len), same);</div><div class='del'>-		if (compared &lt; 0)</div><div class='add'>+		if (status &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		src_iter.processed = dst_iter.processed = compared;</div><div class='add'>+		src_iter.status = dst_iter.status = status;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/dcache.c b/fs/dcache.c<br/>index b813528fb147..dc2fff4811d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dcache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dcache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dcache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dcache.c</a></div><div class='hunk'>@@ -35,6 +35,8 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "mount.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/runtime-const.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Usage:</div><div class='ctx'>  * dcache-&gt;d_inode-&gt;i_lock protects:</div><div class='hunk'>@@ -71,14 +73,21 @@</div><div class='ctx'>  * If no ancestor relationship:</div><div class='ctx'>  * arbitrary, since it's serialized on rename_lock</div><div class='ctx'>  */</div><div class='del'>-int sysctl_vfs_cache_pressure __read_mostly = 100;</div><div class='del'>-EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);</div><div class='add'>+static int sysctl_vfs_cache_pressure __read_mostly = 100;</div><div class='add'>+static int sysctl_vfs_cache_pressure_denom __read_mostly = 100;</div><div class='add'>+</div><div class='add'>+unsigned long vfs_pressure_ratio(unsigned long val)</div><div class='add'>+{</div><div class='add'>+	return mult_frac(val, sysctl_vfs_cache_pressure, sysctl_vfs_cache_pressure_denom);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(vfs_pressure_ratio);</div><div class='ctx'> </div><div class='ctx'> __cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(rename_lock);</div><div class='ctx'> </div><div class='del'>-static struct kmem_cache *dentry_cache __ro_after_init;</div><div class='add'>+static struct kmem_cache *__dentry_cache __ro_after_init;</div><div class='add'>+#define dentry_cache runtime_const_ptr(__dentry_cache)</div><div class='ctx'> </div><div class='ctx'> const struct qstr empty_name = QSTR_INIT("", 0);</div><div class='ctx'> EXPORT_SYMBOL(empty_name);</div><div class='hunk'>@@ -94,15 +103,21 @@ EXPORT_SYMBOL(dotdot_name);</div><div class='ctx'>  *</div><div class='ctx'>  * This hash-function tries to avoid losing too many bits of hash</div><div class='ctx'>  * information, yet avoid using a prime hash-size or similar.</div><div class='add'>+ *</div><div class='add'>+ * Marking the variables "used" ensures that the compiler doesn't</div><div class='add'>+ * optimize them away completely on architectures with runtime</div><div class='add'>+ * constant infrastructure, this allows debuggers to see their</div><div class='add'>+ * values. But updating these values has no effect on those arches.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int d_hash_shift __ro_after_init;</div><div class='add'>+static unsigned int d_hash_shift __ro_after_init __used;</div><div class='ctx'> </div><div class='del'>-static struct hlist_bl_head *dentry_hashtable __ro_after_init;</div><div class='add'>+static struct hlist_bl_head *dentry_hashtable __ro_after_init __used;</div><div class='ctx'> </div><div class='del'>-static inline struct hlist_bl_head *d_hash(unsigned int hash)</div><div class='add'>+static inline struct hlist_bl_head *d_hash(unsigned long hashlen)</div><div class='ctx'> {</div><div class='del'>-	return dentry_hashtable + (hash &gt;&gt; d_hash_shift);</div><div class='add'>+	return runtime_const_ptr(dentry_hashtable) +</div><div class='add'>+		runtime_const_shift_right_32(hashlen, d_hash_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define IN_LOOKUP_SHIFT 10</div><div class='hunk'>@@ -127,6 +142,7 @@ struct dentry_stat_t {</div><div class='ctx'> static DEFINE_PER_CPU(long, nr_dentry);</div><div class='ctx'> static DEFINE_PER_CPU(long, nr_dentry_unused);</div><div class='ctx'> static DEFINE_PER_CPU(long, nr_dentry_negative);</div><div class='add'>+static int dentry_negative_policy;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SYSCTL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='ctx'> /* Statistics gathering. */</div><div class='hunk'>@@ -174,7 +190,7 @@ static long get_nr_dentry_negative(void)</div><div class='ctx'> 	return sum &lt; 0 ? 0 : sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_nr_dentry(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+static int proc_nr_dentry(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 			  size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	dentry_stat.nr_dentry = get_nr_dentry();</div><div class='hunk'>@@ -183,7 +199,7 @@ static int proc_nr_dentry(struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 	return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table fs_dcache_sysctls[] = {</div><div class='add'>+static const struct ctl_table fs_dcache_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "dentry-state",</div><div class='ctx'> 		.data		= &amp;dentry_stat,</div><div class='hunk'>@@ -191,10 +207,39 @@ static struct ctl_table fs_dcache_sysctls[] = {</div><div class='ctx'> 		.mode		= 0444,</div><div class='ctx'> 		.proc_handler	= proc_nr_dentry,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "dentry-negative",</div><div class='add'>+		.data		= &amp;dentry_negative_policy,</div><div class='add'>+		.maxlen		= sizeof(dentry_negative_policy),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= SYSCTL_ONE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ctl_table vm_dcache_sysctls[] = {</div><div class='add'>+	{</div><div class='add'>+		.procname	= "vfs_cache_pressure",</div><div class='add'>+		.data		= &amp;sysctl_vfs_cache_pressure,</div><div class='add'>+		.maxlen		= sizeof(sysctl_vfs_cache_pressure),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "vfs_cache_pressure_denom",</div><div class='add'>+		.data		= &amp;sysctl_vfs_cache_pressure_denom,</div><div class='add'>+		.maxlen		= sizeof(sysctl_vfs_cache_pressure_denom),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE_HUNDRED,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init init_fs_dcache_sysctls(void)</div><div class='ctx'> {</div><div class='add'>+	register_sysctl_init("vm", vm_dcache_sysctls);</div><div class='ctx'> 	register_sysctl_init("fs", fs_dcache_sysctls);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -277,12 +322,16 @@ static inline int dentry_cmp(const struct dentry *dentry, const unsigned char *c</div><div class='ctx'> 	return dentry_string_cmp(cs, ct, tcount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * long names are allocated separately from dentry and never modified.</div><div class='add'>+ * Refcounted, freeing is RCU-delayed.  See take_dentry_name_snapshot()</div><div class='add'>+ * for the reason why -&gt;count and -&gt;head can't be combined into a union.</div><div class='add'>+ * dentry_string_cmp() relies upon -&gt;name[] being word-aligned.</div><div class='add'>+ */</div><div class='ctx'> struct external_name {</div><div class='del'>-	union {</div><div class='del'>-		atomic_t count;</div><div class='del'>-		struct rcu_head head;</div><div class='del'>-	} u;</div><div class='del'>-	unsigned char name[];</div><div class='add'>+	atomic_t count;</div><div class='add'>+	struct rcu_head head;</div><div class='add'>+	unsigned char name[] __aligned(sizeof(unsigned long));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct external_name *external_name(struct dentry *dentry)</div><div class='hunk'>@@ -306,31 +355,45 @@ static void __d_free_external(struct rcu_head *head)</div><div class='ctx'> </div><div class='ctx'> static inline int dname_external(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return dentry-&gt;d_name.name != dentry-&gt;d_iname;</div><div class='add'>+	return dentry-&gt;d_name.name != dentry-&gt;d_shortname.string;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void take_dentry_name_snapshot(struct name_snapshot *name, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	name-&gt;name = dentry-&gt;d_name;</div><div class='del'>-	if (unlikely(dname_external(dentry))) {</div><div class='del'>-		atomic_inc(&amp;external_name(dentry)-&gt;u.count);</div><div class='add'>+	unsigned seq;</div><div class='add'>+	const unsigned char *s;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+retry:</div><div class='add'>+	seq = read_seqcount_begin(&amp;dentry-&gt;d_seq);</div><div class='add'>+	s = READ_ONCE(dentry-&gt;d_name.name);</div><div class='add'>+	name-&gt;name.hash_len = dentry-&gt;d_name.hash_len;</div><div class='add'>+	name-&gt;name.name = name-&gt;inline_name.string;</div><div class='add'>+	if (likely(s == dentry-&gt;d_shortname.string)) {</div><div class='add'>+		name-&gt;inline_name = dentry-&gt;d_shortname;</div><div class='ctx'> 	} else {</div><div class='del'>-		memcpy(name-&gt;inline_name, dentry-&gt;d_iname,</div><div class='del'>-		       dentry-&gt;d_name.len + 1);</div><div class='del'>-		name-&gt;name.name = name-&gt;inline_name;</div><div class='add'>+		struct external_name *p;</div><div class='add'>+		p = container_of(s, struct external_name, name[0]);</div><div class='add'>+		// get a valid reference</div><div class='add'>+		if (unlikely(!atomic_inc_not_zero(&amp;p-&gt;count)))</div><div class='add'>+			goto retry;</div><div class='add'>+		name-&gt;name.name = s;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	if (read_seqcount_retry(&amp;dentry-&gt;d_seq, seq)) {</div><div class='add'>+		release_dentry_name_snapshot(name);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(take_dentry_name_snapshot);</div><div class='ctx'> </div><div class='ctx'> void release_dentry_name_snapshot(struct name_snapshot *name)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(name-&gt;name.name != name-&gt;inline_name)) {</div><div class='add'>+	if (unlikely(name-&gt;name.name != name-&gt;inline_name.string)) {</div><div class='ctx'> 		struct external_name *p;</div><div class='ctx'> 		p = container_of(name-&gt;name.name, struct external_name, name[0]);</div><div class='del'>-		if (unlikely(atomic_dec_and_test(&amp;p-&gt;u.count)))</div><div class='del'>-			kfree_rcu(p, u.head);</div><div class='add'>+		if (unlikely(atomic_dec_and_test(&amp;p-&gt;count)))</div><div class='add'>+			kfree_rcu(p, head);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(release_dentry_name_snapshot);</div><div class='hunk'>@@ -355,7 +418,11 @@ static inline void __d_clear_type_and_inode(struct dentry *dentry)</div><div class='ctx'> 	flags &amp;= ~DCACHE_ENTRY_TYPE;</div><div class='ctx'> 	WRITE_ONCE(dentry-&gt;d_flags, flags);</div><div class='ctx'> 	dentry-&gt;d_inode = NULL;</div><div class='del'>-	if (dentry-&gt;d_flags &amp; DCACHE_LRU_LIST)</div><div class='add'>+	/*</div><div class='add'>+	 * The negative counter only tracks dentries on the LRU. Don't inc if</div><div class='add'>+	 * d_lru is on another list.</div><div class='add'>+	 */</div><div class='add'>+	if ((flags &amp; (DCACHE_LRU_LIST|DCACHE_SHRINK_LIST)) == DCACHE_LRU_LIST)</div><div class='ctx'> 		this_cpu_inc(nr_dentry_negative);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -364,7 +431,7 @@ static void dentry_free(struct dentry *dentry)</div><div class='ctx'> 	WARN_ON(!hlist_unhashed(&amp;dentry-&gt;d_u.d_alias));</div><div class='ctx'> 	if (unlikely(dname_external(dentry))) {</div><div class='ctx'> 		struct external_name *p = external_name(dentry);</div><div class='del'>-		if (likely(atomic_dec_and_test(&amp;p-&gt;u.count))) {</div><div class='add'>+		if (likely(atomic_dec_and_test(&amp;p-&gt;count))) {</div><div class='ctx'> 			call_rcu(&amp;dentry-&gt;d_u.d_rcu, __d_free_external);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -728,7 +795,7 @@ void d_mark_dontcache(struct inode *inode)</div><div class='ctx'> 		de-&gt;d_flags |= DCACHE_DONTCACHE;</div><div class='ctx'> 		spin_unlock(&amp;de-&gt;d_lock);</div><div class='ctx'> 	}</div><div class='del'>-	inode-&gt;i_state |= I_DONTCACHE;</div><div class='add'>+	inode_state_set(inode, I_DONTCACHE);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(d_mark_dontcache);</div><div class='hunk'>@@ -803,6 +870,24 @@ locked:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void finish_dput(struct dentry *dentry)</div><div class='add'>+	__releases(dentry-&gt;d_lock)</div><div class='add'>+	__releases(RCU)</div><div class='add'>+{</div><div class='add'>+	while (lock_for_kill(dentry)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		dentry = __dentry_kill(dentry);</div><div class='add'>+		if (!dentry)</div><div class='add'>+			return;</div><div class='add'>+		if (retain_dentry(dentry, true)) {</div><div class='add'>+			spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * This is dput</div><div class='hunk'>@@ -840,22 +925,21 @@ void dput(struct dentry *dentry)</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	while (lock_for_kill(dentry)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		dentry = __dentry_kill(dentry);</div><div class='del'>-		if (!dentry)</div><div class='del'>-			return;</div><div class='del'>-		if (retain_dentry(dentry, true)) {</div><div class='del'>-			spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	finish_dput(dentry);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dput);</div><div class='ctx'> </div><div class='add'>+void d_make_discardable(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	WARN_ON(!(dentry-&gt;d_flags &amp; DCACHE_PERSISTENT));</div><div class='add'>+	dentry-&gt;d_flags &amp;= ~DCACHE_PERSISTENT;</div><div class='add'>+	dentry-&gt;d_lockref.count--;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	finish_dput(dentry);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(d_make_discardable);</div><div class='add'>+</div><div class='ctx'> static void to_shrink_list(struct dentry *dentry, struct list_head *list)</div><div class='ctx'> __must_hold(&amp;dentry-&gt;d_lock)</div><div class='ctx'> {</div><div class='hunk'>@@ -1007,7 +1091,7 @@ struct dentry *d_find_alias_rcu(struct inode *inode)</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	// -&gt;i_dentry and -&gt;i_rcu are colocated, but the latter won't be</div><div class='ctx'> 	// used without having I_FREEING set, which means no aliases left</div><div class='del'>-	if (likely(!(inode-&gt;i_state &amp; I_FREEING) &amp;&amp; !hlist_empty(l))) {</div><div class='add'>+	if (likely(!(inode_state_read(inode) &amp; I_FREEING) &amp;&amp; !hlist_empty(l))) {</div><div class='ctx'> 		if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 			de = hlist_entry(l-&gt;first, struct dentry, d_u.d_alias);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1020,6 +1104,15 @@ struct dentry *d_find_alias_rcu(struct inode *inode)</div><div class='ctx'> 	return de;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void d_dispose_if_unused(struct dentry *dentry, struct list_head *dispose)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	if (!dentry-&gt;d_lockref.count)</div><div class='add'>+		to_shrink_list(dentry, dispose);</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(d_dispose_if_unused);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Try to kill dentries associated with this inode.</div><div class='ctx'>  * WARNING: you must own a reference to inode.</div><div class='hunk'>@@ -1030,12 +1123,8 @@ void d_prune_aliases(struct inode *inode)</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	hlist_for_each_entry(dentry, &amp;inode-&gt;i_dentry, d_u.d_alias) {</div><div class='del'>-		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		if (!dentry-&gt;d_lockref.count)</div><div class='del'>-			to_shrink_list(dentry, &amp;dispose);</div><div class='del'>-		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	}</div><div class='add'>+	hlist_for_each_entry(dentry, &amp;inode-&gt;i_dentry, d_u.d_alias)</div><div class='add'>+		d_dispose_if_unused(dentry, &amp;dispose);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	shrink_dentry_list(&amp;dispose);</div><div class='ctx'> }</div><div class='hunk'>@@ -1075,9 +1164,10 @@ void shrink_dentry_list(struct list_head *list)</div><div class='ctx'> 		shrink_kill(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(shrink_dentry_list);</div><div class='ctx'> </div><div class='ctx'> static enum lru_status dentry_lru_isolate(struct list_head *item,</div><div class='del'>-		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)</div><div class='add'>+		struct list_lru_one *lru, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *freeable = arg;</div><div class='ctx'> 	struct dentry	*dentry = container_of(item, struct dentry, d_lru);</div><div class='hunk'>@@ -1158,7 +1248,7 @@ long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,</div><div class='del'>-		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)</div><div class='add'>+		struct list_lru_one *lru, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *freeable = arg;</div><div class='ctx'> 	struct dentry	*dentry = container_of(item, struct dentry, d_lru);</div><div class='hunk'>@@ -1324,6 +1414,7 @@ struct check_mount {</div><div class='ctx'> 	unsigned int mounted;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* locks: mount_locked_reader &amp;&amp; dentry-&gt;d_lock */</div><div class='ctx'> static enum d_walk_ret path_check_mount(void *data, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct check_mount *info = data;</div><div class='hunk'>@@ -1350,9 +1441,8 @@ int path_has_submounts(const struct path *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct check_mount data = { .mnt = parent-&gt;mnt, .mounted = 0 };</div><div class='ctx'> </div><div class='del'>-	read_seqlock_excl(&amp;mount_lock);</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='ctx'> 	d_walk(parent-&gt;dentry, &amp;data, path_check_mount);</div><div class='del'>-	read_sequnlock_excl(&amp;mount_lock);</div><div class='ctx'> </div><div class='ctx'> 	return data.mounted;</div><div class='ctx'> }</div><div class='hunk'>@@ -1370,7 +1460,7 @@ int d_set_mounted(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *p;</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='del'>-	write_seqlock(&amp;rename_lock);</div><div class='add'>+	read_seqlock_excl(&amp;rename_lock);</div><div class='ctx'> 	for (p = dentry-&gt;d_parent; !IS_ROOT(p); p = p-&gt;d_parent) {</div><div class='ctx'> 		/* Need exclusion wrt. d_invalidate() */</div><div class='ctx'> 		spin_lock(&amp;p-&gt;d_lock);</div><div class='hunk'>@@ -1390,7 +1480,7 @@ int d_set_mounted(struct dentry *dentry)</div><div class='ctx'> 	}</div><div class='ctx'>  	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> out:</div><div class='del'>-	write_sequnlock(&amp;rename_lock);</div><div class='add'>+	read_sequnlock_excl(&amp;rename_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1445,6 +1535,15 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static enum d_walk_ret select_collect_umount(void *_data, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	if (dentry-&gt;d_flags &amp; DCACHE_PERSISTENT) {</div><div class='add'>+		dentry-&gt;d_flags &amp;= ~DCACHE_PERSISTENT;</div><div class='add'>+		dentry-&gt;d_lockref.count--;</div><div class='add'>+	}</div><div class='add'>+	return select_collect(_data, dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static enum d_walk_ret select_collect2(void *_data, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct select_data *data = _data;</div><div class='hunk'>@@ -1473,18 +1572,20 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * shrink_dcache_parent - prune dcache</div><div class='add'>+ * shrink_dcache_tree - prune dcache</div><div class='ctx'>  * @parent: parent of entries to prune</div><div class='add'>+ * @for_umount: true if we want to unpin the persistent ones</div><div class='ctx'>  *</div><div class='ctx'>  * Prune the dcache to remove unused children of the parent dentry.</div><div class='ctx'>  */</div><div class='del'>-void shrink_dcache_parent(struct dentry *parent)</div><div class='add'>+static void shrink_dcache_tree(struct dentry *parent, bool for_umount)</div><div class='ctx'> {</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		struct select_data data = {.start = parent};</div><div class='ctx'> </div><div class='ctx'> 		INIT_LIST_HEAD(&amp;data.dispose);</div><div class='del'>-		d_walk(parent, &amp;data, select_collect);</div><div class='add'>+		d_walk(parent, &amp;data,</div><div class='add'>+			for_umount ? select_collect_umount : select_collect);</div><div class='ctx'> </div><div class='ctx'> 		if (!list_empty(&amp;data.dispose)) {</div><div class='ctx'> 			shrink_dentry_list(&amp;data.dispose);</div><div class='hunk'>@@ -1509,6 +1610,11 @@ void shrink_dcache_parent(struct dentry *parent)</div><div class='ctx'> 			shrink_dentry_list(&amp;data.dispose);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void shrink_dcache_parent(struct dentry *parent)</div><div class='add'>+{</div><div class='add'>+	shrink_dcache_tree(parent, false);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(shrink_dcache_parent);</div><div class='ctx'> </div><div class='ctx'> static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)</div><div class='hunk'>@@ -1535,7 +1641,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> static void do_one_tree(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	shrink_dcache_parent(dentry);</div><div class='add'>+	shrink_dcache_tree(dentry, true);</div><div class='ctx'> 	d_walk(dentry, dentry, umount_check);</div><div class='ctx'> 	d_drop(dentry);</div><div class='ctx'> 	dput(dentry);</div><div class='hunk'>@@ -1548,7 +1654,7 @@ void shrink_dcache_for_umount(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> </div><div class='del'>-	WARN(down_read_trylock(&amp;sb-&gt;s_umount), "s_umount should've been locked");</div><div class='add'>+	rwsem_assert_held_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> </div><div class='ctx'> 	dentry = sb-&gt;s_root;</div><div class='ctx'> 	sb-&gt;s_root = NULL;</div><div class='hunk'>@@ -1632,10 +1738,10 @@ static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)</div><div class='ctx'> 	 * will still always have a NUL at the end, even if we might</div><div class='ctx'> 	 * be overwriting an internal NUL character</div><div class='ctx'> 	 */</div><div class='del'>-	dentry-&gt;d_iname[DNAME_INLINE_LEN-1] = 0;</div><div class='add'>+	dentry-&gt;d_shortname.string[DNAME_INLINE_LEN-1] = 0;</div><div class='ctx'> 	if (unlikely(!name)) {</div><div class='ctx'> 		name = &amp;slash_name;</div><div class='del'>-		dname = dentry-&gt;d_iname;</div><div class='add'>+		dname = dentry-&gt;d_shortname.string;</div><div class='ctx'> 	} else if (name-&gt;len &gt; DNAME_INLINE_LEN-1) {</div><div class='ctx'> 		size_t size = offsetof(struct external_name, name[1]);</div><div class='ctx'> 		struct external_name *p = kmalloc(size + name-&gt;len,</div><div class='hunk'>@@ -1645,35 +1751,34 @@ static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)</div><div class='ctx'> 			kmem_cache_free(dentry_cache, dentry); </div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		atomic_set(&amp;p-&gt;u.count, 1);</div><div class='add'>+		atomic_set(&amp;p-&gt;count, 1);</div><div class='ctx'> 		dname = p-&gt;name;</div><div class='ctx'> 	} else  {</div><div class='del'>-		dname = dentry-&gt;d_iname;</div><div class='add'>+		dname = dentry-&gt;d_shortname.string;</div><div class='ctx'> 	}	</div><div class='ctx'> </div><div class='del'>-	dentry-&gt;d_name.len = name-&gt;len;</div><div class='del'>-	dentry-&gt;d_name.hash = name-&gt;hash;</div><div class='add'>+	dentry-&gt;__d_name.len = name-&gt;len;</div><div class='add'>+	dentry-&gt;__d_name.hash = name-&gt;hash;</div><div class='ctx'> 	memcpy(dname, name-&gt;name, name-&gt;len);</div><div class='ctx'> 	dname[name-&gt;len] = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we always see the terminating NUL character */</div><div class='del'>-	smp_store_release(&amp;dentry-&gt;d_name.name, dname); /* ^^^ */</div><div class='add'>+	smp_store_release(&amp;dentry-&gt;__d_name.name, dname); /* ^^^ */</div><div class='ctx'> </div><div class='del'>-	dentry-&gt;d_lockref.count = 1;</div><div class='ctx'> 	dentry-&gt;d_flags = 0;</div><div class='del'>-	spin_lock_init(&amp;dentry-&gt;d_lock);</div><div class='add'>+	lockref_init(&amp;dentry-&gt;d_lockref);</div><div class='ctx'> 	seqcount_spinlock_init(&amp;dentry-&gt;d_seq, &amp;dentry-&gt;d_lock);</div><div class='ctx'> 	dentry-&gt;d_inode = NULL;</div><div class='ctx'> 	dentry-&gt;d_parent = dentry;</div><div class='ctx'> 	dentry-&gt;d_sb = sb;</div><div class='del'>-	dentry-&gt;d_op = NULL;</div><div class='add'>+	dentry-&gt;d_op = sb-&gt;__s_d_op;</div><div class='add'>+	dentry-&gt;d_flags = sb-&gt;s_d_flags;</div><div class='ctx'> 	dentry-&gt;d_fsdata = NULL;</div><div class='ctx'> 	INIT_HLIST_BL_NODE(&amp;dentry-&gt;d_hash);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dentry-&gt;d_lru);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;dentry-&gt;d_children);</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;dentry-&gt;d_u.d_alias);</div><div class='ctx'> 	INIT_HLIST_NODE(&amp;dentry-&gt;d_sib);</div><div class='del'>-	d_set_d_op(dentry, dentry-&gt;d_sb-&gt;s_d_op);</div><div class='ctx'> </div><div class='ctx'> 	if (dentry-&gt;d_op &amp;&amp; dentry-&gt;d_op-&gt;d_init) {</div><div class='ctx'> 		err = dentry-&gt;d_op-&gt;d_init(dentry);</div><div class='hunk'>@@ -1756,8 +1861,9 @@ struct dentry *d_alloc_pseudo(struct super_block *sb, const struct qstr *name)</div><div class='ctx'> 	struct dentry *dentry = __d_alloc(sb, name);</div><div class='ctx'> 	if (likely(dentry)) {</div><div class='ctx'> 		dentry-&gt;d_flags |= DCACHE_NORCU;</div><div class='del'>-		if (!sb-&gt;s_d_op)</div><div class='del'>-			d_set_d_op(dentry, &amp;anon_ops);</div><div class='add'>+		/* d_op_flags(&amp;anon_ops) is 0 */</div><div class='add'>+		if (!dentry-&gt;d_op)</div><div class='add'>+			dentry-&gt;d_op = &amp;anon_ops;</div><div class='ctx'> 	}</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='hunk'>@@ -1772,35 +1878,50 @@ struct dentry *d_alloc_name(struct dentry *parent, const char *name)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(d_alloc_name);</div><div class='ctx'> </div><div class='del'>-void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op)</div><div class='add'>+#define DCACHE_OP_FLAGS \</div><div class='add'>+	(DCACHE_OP_HASH | DCACHE_OP_COMPARE | DCACHE_OP_REVALIDATE | \</div><div class='add'>+	 DCACHE_OP_WEAK_REVALIDATE | DCACHE_OP_DELETE | DCACHE_OP_PRUNE | \</div><div class='add'>+	 DCACHE_OP_REAL)</div><div class='add'>+</div><div class='add'>+static unsigned int d_op_flags(const struct dentry_operations *op)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+	if (op) {</div><div class='add'>+		if (op-&gt;d_hash)</div><div class='add'>+			flags |= DCACHE_OP_HASH;</div><div class='add'>+		if (op-&gt;d_compare)</div><div class='add'>+			flags |= DCACHE_OP_COMPARE;</div><div class='add'>+		if (op-&gt;d_revalidate)</div><div class='add'>+			flags |= DCACHE_OP_REVALIDATE;</div><div class='add'>+		if (op-&gt;d_weak_revalidate)</div><div class='add'>+			flags |= DCACHE_OP_WEAK_REVALIDATE;</div><div class='add'>+		if (op-&gt;d_delete)</div><div class='add'>+			flags |= DCACHE_OP_DELETE;</div><div class='add'>+		if (op-&gt;d_prune)</div><div class='add'>+			flags |= DCACHE_OP_PRUNE;</div><div class='add'>+		if (op-&gt;d_real)</div><div class='add'>+			flags |= DCACHE_OP_REAL;</div><div class='add'>+	}</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op)</div><div class='ctx'> {</div><div class='add'>+	unsigned int flags = d_op_flags(op);</div><div class='ctx'> 	WARN_ON_ONCE(dentry-&gt;d_op);</div><div class='del'>-	WARN_ON_ONCE(dentry-&gt;d_flags &amp; (DCACHE_OP_HASH	|</div><div class='del'>-				DCACHE_OP_COMPARE	|</div><div class='del'>-				DCACHE_OP_REVALIDATE	|</div><div class='del'>-				DCACHE_OP_WEAK_REVALIDATE	|</div><div class='del'>-				DCACHE_OP_DELETE	|</div><div class='del'>-				DCACHE_OP_REAL));</div><div class='add'>+	WARN_ON_ONCE(dentry-&gt;d_flags &amp; DCACHE_OP_FLAGS);</div><div class='ctx'> 	dentry-&gt;d_op = op;</div><div class='del'>-	if (!op)</div><div class='del'>-		return;</div><div class='del'>-	if (op-&gt;d_hash)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_HASH;</div><div class='del'>-	if (op-&gt;d_compare)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_COMPARE;</div><div class='del'>-	if (op-&gt;d_revalidate)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_REVALIDATE;</div><div class='del'>-	if (op-&gt;d_weak_revalidate)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_WEAK_REVALIDATE;</div><div class='del'>-	if (op-&gt;d_delete)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_DELETE;</div><div class='del'>-	if (op-&gt;d_prune)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_PRUNE;</div><div class='del'>-	if (op-&gt;d_real)</div><div class='del'>-		dentry-&gt;d_flags |= DCACHE_OP_REAL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(d_set_d_op);</div><div class='add'>+	if (flags)</div><div class='add'>+		dentry-&gt;d_flags |= flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_default_d_op(struct super_block *s, const struct dentry_operations *ops)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = d_op_flags(ops);</div><div class='add'>+	s-&gt;__s_d_op = ops;</div><div class='add'>+	s-&gt;s_d_flags = (s-&gt;s_d_flags &amp; ~DCACHE_OP_FLAGS) | flags;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(set_default_d_op);</div><div class='ctx'> </div><div class='ctx'> static unsigned d_flags_for_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1842,18 +1963,18 @@ static void __d_instantiate(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> 	unsigned add_flags = d_flags_for_inode(inode);</div><div class='ctx'> 	WARN_ON(d_in_lookup(dentry));</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Decrement negative dentry count if it was in the LRU list.</div><div class='add'>+	 * The negative counter only tracks dentries on the LRU. Don't dec if</div><div class='add'>+	 * d_lru is on another list.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dentry-&gt;d_flags &amp; DCACHE_LRU_LIST)</div><div class='add'>+	if ((dentry-&gt;d_flags &amp;</div><div class='add'>+	     (DCACHE_LRU_LIST|DCACHE_SHRINK_LIST)) == DCACHE_LRU_LIST)</div><div class='ctx'> 		this_cpu_dec(nr_dentry_negative);</div><div class='ctx'> 	hlist_add_head(&amp;dentry-&gt;d_u.d_alias, &amp;inode-&gt;i_dentry);</div><div class='ctx'> 	raw_write_seqcount_begin(&amp;dentry-&gt;d_seq);</div><div class='ctx'> 	__d_set_inode_and_type(dentry, inode, add_flags);</div><div class='ctx'> 	raw_write_seqcount_end(&amp;dentry-&gt;d_seq);</div><div class='ctx'> 	fsnotify_update_flags(dentry);</div><div class='del'>-	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1877,7 +1998,9 @@ void d_instantiate(struct dentry *entry, struct inode * inode)</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		security_d_instantiate(entry, inode);</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+		spin_lock(&amp;entry-&gt;d_lock);</div><div class='ctx'> 		__d_instantiate(entry, inode);</div><div class='add'>+		spin_unlock(&amp;entry-&gt;d_lock);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1896,11 +2019,12 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode)</div><div class='ctx'> 	lockdep_annotate_inode_mutex_key(inode);</div><div class='ctx'> 	security_d_instantiate(entry, inode);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	spin_lock(&amp;entry-&gt;d_lock);</div><div class='ctx'> 	__d_instantiate(entry, inode);</div><div class='del'>-	WARN_ON(!(inode-&gt;i_state &amp; I_NEW));</div><div class='del'>-	inode-&gt;i_state &amp;= ~I_NEW &amp; ~I_CREATING;</div><div class='del'>-	smp_mb();</div><div class='del'>-	wake_up_bit(&amp;inode-&gt;i_state, __I_NEW);</div><div class='add'>+	spin_unlock(&amp;entry-&gt;d_lock);</div><div class='add'>+	WARN_ON(!(inode_state_read(inode) &amp; I_NEW));</div><div class='add'>+	inode_state_clear(inode, I_NEW | I_CREATING);</div><div class='add'>+	inode_wake_up_bit(inode, __I_NEW);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(d_instantiate_new);</div><div class='hunk'>@@ -2020,8 +2144,8 @@ EXPORT_SYMBOL(d_obtain_root);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * d_add_ci - lookup or allocate new dentry with case-exact name</div><div class='del'>- * @inode:  the inode case-insensitive lookup has found</div><div class='ctx'>  * @dentry: the negative dentry that was passed to the parent's lookup func</div><div class='add'>+ * @inode:  the inode case-insensitive lookup has found</div><div class='ctx'>  * @name:   the case-exact name to be associated with the returned dentry</div><div class='ctx'>  *</div><div class='ctx'>  * This is to avoid filling the dcache with case-insensitive names to the</div><div class='hunk'>@@ -2074,8 +2198,8 @@ EXPORT_SYMBOL(d_add_ci);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * d_same_name - compare dentry name with case-exact name</div><div class='del'>- * @parent: parent dentry</div><div class='ctx'>  * @dentry: the negative dentry that was passed to the parent's lookup func</div><div class='add'>+ * @parent: parent dentry</div><div class='ctx'>  * @name:   the case-exact name to be associated with the returned dentry</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if names are same, or false</div><div class='hunk'>@@ -2104,7 +2228,7 @@ static noinline struct dentry *__d_lookup_rcu_op_compare(</div><div class='ctx'> 	unsigned *seqp)</div><div class='ctx'> {</div><div class='ctx'> 	u64 hashlen = name-&gt;hash_len;</div><div class='del'>-	struct hlist_bl_head *b = d_hash(hashlen_hash(hashlen));</div><div class='add'>+	struct hlist_bl_head *b = d_hash(hashlen);</div><div class='ctx'> 	struct hlist_bl_node *node;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> </div><div class='hunk'>@@ -2154,9 +2278,6 @@ seqretry:</div><div class='ctx'>  * without taking d_lock and checking d_seq sequence count against @seq</div><div class='ctx'>  * returned here.</div><div class='ctx'>  *</div><div class='del'>- * A refcount may be taken on the found dentry with the d_rcu_to_refcount</div><div class='del'>- * function.</div><div class='del'>- *</div><div class='ctx'>  * Alternatively, __d_lookup_rcu may be called again to look up the child of</div><div class='ctx'>  * the returned dentry, so long as its parent's seqlock is checked after the</div><div class='ctx'>  * child is looked up. Thus, an interlocking stepping of sequence lock checks</div><div class='hunk'>@@ -2171,7 +2292,7 @@ struct dentry *__d_lookup_rcu(const struct dentry *parent,</div><div class='ctx'> {</div><div class='ctx'> 	u64 hashlen = name-&gt;hash_len;</div><div class='ctx'> 	const unsigned char *str = name-&gt;name;</div><div class='del'>-	struct hlist_bl_head *b = d_hash(hashlen_hash(hashlen));</div><div class='add'>+	struct hlist_bl_head *b = d_hash(hashlen);</div><div class='ctx'> 	struct hlist_bl_node *node;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> </div><div class='hunk'>@@ -2221,11 +2342,20 @@ struct dentry *__d_lookup_rcu(const struct dentry *parent,</div><div class='ctx'> 		seq = raw_seqcount_begin(&amp;dentry-&gt;d_seq);</div><div class='ctx'> 		if (dentry-&gt;d_parent != parent)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (d_unhashed(dentry))</div><div class='del'>-			continue;</div><div class='ctx'> 		if (dentry-&gt;d_name.hash_len != hashlen)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (dentry_cmp(dentry, str, hashlen_len(hashlen)) != 0)</div><div class='add'>+		if (unlikely(dentry_cmp(dentry, str, hashlen_len(hashlen)) != 0))</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Check for the dentry being unhashed.</div><div class='add'>+		 *</div><div class='add'>+		 * As tempting as it is, we *can't* skip it because of a race window</div><div class='add'>+		 * between us finding the dentry before it gets unhashed and loading</div><div class='add'>+		 * the sequence counter after unhashing is finished.</div><div class='add'>+		 *</div><div class='add'>+		 * We can at least predict on it.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(d_unhashed(dentry)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		*seqp = seq;</div><div class='ctx'> 		return dentry;</div><div class='hunk'>@@ -2352,7 +2482,6 @@ struct dentry *d_hash_and_lookup(struct dentry *dir, struct qstr *name)</div><div class='ctx'> 	}</div><div class='ctx'> 	return d_lookup(dir, name);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(d_hash_and_lookup);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * When a file is deleted, we have two options:</div><div class='hunk'>@@ -2385,6 +2514,8 @@ void d_delete(struct dentry * dentry)</div><div class='ctx'> 	 * Are we the only user?</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dentry-&gt;d_lockref.count == 1) {</div><div class='add'>+		if (dentry_negative_policy)</div><div class='add'>+			__d_drop(dentry);</div><div class='ctx'> 		dentry-&gt;d_flags &amp;= ~DCACHE_CANT_MOUNT;</div><div class='ctx'> 		dentry_unlink_inode(dentry);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2423,8 +2554,8 @@ static inline unsigned start_dir_add(struct inode *dir)</div><div class='ctx'> {</div><div class='ctx'> 	preempt_disable_nested();</div><div class='ctx'> 	for (;;) {</div><div class='del'>-		unsigned n = dir-&gt;i_dir_seq;</div><div class='del'>-		if (!(n &amp; 1) &amp;&amp; cmpxchg(&amp;dir-&gt;i_dir_seq, n, n + 1) == n)</div><div class='add'>+		unsigned n = READ_ONCE(dir-&gt;i_dir_seq);</div><div class='add'>+		if (!(n &amp; 1) &amp;&amp; try_cmpxchg(&amp;dir-&gt;i_dir_seq, &amp;n, n + 1))</div><div class='ctx'> 			return n;</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2435,7 +2566,8 @@ static inline void end_dir_add(struct inode *dir, unsigned int n,</div><div class='ctx'> {</div><div class='ctx'> 	smp_store_release(&amp;dir-&gt;i_dir_seq, n + 2);</div><div class='ctx'> 	preempt_enable_nested();</div><div class='del'>-	wake_up_all(d_wait);</div><div class='add'>+	if (wq_has_sleeper(d_wait))</div><div class='add'>+		wake_up_all(d_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void d_wait_lookup(struct dentry *dentry)</div><div class='hunk'>@@ -2459,13 +2591,21 @@ struct dentry *d_alloc_parallel(struct dentry *parent,</div><div class='ctx'> 	unsigned int hash = name-&gt;hash;</div><div class='ctx'> 	struct hlist_bl_head *b = in_lookup_hash(parent, hash);</div><div class='ctx'> 	struct hlist_bl_node *node;</div><div class='del'>-	struct dentry *new = d_alloc(parent, name);</div><div class='add'>+	struct dentry *new = __d_alloc(parent-&gt;d_sb, name);</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	unsigned seq, r_seq, d_seq;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!new))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	new-&gt;d_flags |= DCACHE_PAR_LOOKUP;</div><div class='add'>+	spin_lock(&amp;parent-&gt;d_lock);</div><div class='add'>+	new-&gt;d_parent = dget_dlock(parent);</div><div class='add'>+	hlist_add_head(&amp;new-&gt;d_sib, &amp;parent-&gt;d_children);</div><div class='add'>+	if (parent-&gt;d_flags &amp; DCACHE_DISCONNECTED)</div><div class='add'>+		new-&gt;d_flags |= DCACHE_DISCONNECTED;</div><div class='add'>+	spin_unlock(&amp;parent-&gt;d_lock);</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	seq = smp_load_acquire(&amp;parent-&gt;d_inode-&gt;i_dir_seq);</div><div class='hunk'>@@ -2549,8 +2689,6 @@ retry:</div><div class='ctx'> 		return dentry;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	/* we can't take -&gt;d_lock here; it's OK, though. */</div><div class='del'>-	new-&gt;d_flags |= DCACHE_PAR_LOOKUP;</div><div class='ctx'> 	new-&gt;d_wait = wq;</div><div class='ctx'> 	hlist_bl_add_head(&amp;new-&gt;d_u.d_in_lookup_hash, b);</div><div class='ctx'> 	hlist_bl_unlock(b);</div><div class='hunk'>@@ -2596,7 +2734,8 @@ EXPORT_SYMBOL(__d_lookup_unhash_wake);</div><div class='ctx'> </div><div class='ctx'> /* inode-&gt;i_lock held if inode is non-NULL */</div><div class='ctx'> </div><div class='del'>-static inline void __d_add(struct dentry *dentry, struct inode *inode)</div><div class='add'>+static inline void __d_add(struct dentry *dentry, struct inode *inode,</div><div class='add'>+			   const struct dentry_operations *ops)</div><div class='ctx'> {</div><div class='ctx'> 	wait_queue_head_t *d_wait;</div><div class='ctx'> 	struct inode *dir = NULL;</div><div class='hunk'>@@ -2607,6 +2746,8 @@ static inline void __d_add(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> 		n = start_dir_add(dir);</div><div class='ctx'> 		d_wait = __d_lookup_unhash(dentry);</div><div class='ctx'> 	}</div><div class='add'>+	if (unlikely(ops))</div><div class='add'>+		d_set_d_op(dentry, ops);</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		unsigned add_flags = d_flags_for_inode(inode);</div><div class='ctx'> 		hlist_add_head(&amp;dentry-&gt;d_u.d_alias, &amp;inode-&gt;i_dentry);</div><div class='hunk'>@@ -2638,55 +2779,27 @@ void d_add(struct dentry *entry, struct inode *inode)</div><div class='ctx'> 		security_d_instantiate(entry, inode);</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='del'>-	__d_add(entry, inode);</div><div class='add'>+	__d_add(entry, inode, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(d_add);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * d_exact_alias - find and hash an exact unhashed alias</div><div class='del'>- * @entry: dentry to add</div><div class='del'>- * @inode: The inode to go with this dentry</div><div class='del'>- *</div><div class='del'>- * If an unhashed dentry with the same name/parent and desired</div><div class='del'>- * inode already exists, hash and return it.  Otherwise, return</div><div class='del'>- * NULL.</div><div class='del'>- *</div><div class='del'>- * Parent directory should be locked.</div><div class='del'>- */</div><div class='del'>-struct dentry *d_exact_alias(struct dentry *entry, struct inode *inode)</div><div class='add'>+struct dentry *d_make_persistent(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *alias;</div><div class='del'>-	unsigned int hash = entry-&gt;d_name.hash;</div><div class='del'>-</div><div class='add'>+	WARN_ON(!hlist_unhashed(&amp;dentry-&gt;d_u.d_alias));</div><div class='add'>+	WARN_ON(!inode);</div><div class='add'>+	security_d_instantiate(dentry, inode);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	hlist_for_each_entry(alias, &amp;inode-&gt;i_dentry, d_u.d_alias) {</div><div class='del'>-		/*</div><div class='del'>-		 * Don't need alias-&gt;d_lock here, because aliases with</div><div class='del'>-		 * d_parent == entry-&gt;d_parent are not subject to name or</div><div class='del'>-		 * parent changes, because the parent inode i_mutex is held.</div><div class='del'>-		 */</div><div class='del'>-		if (alias-&gt;d_name.hash != hash)</div><div class='del'>-			continue;</div><div class='del'>-		if (alias-&gt;d_parent != entry-&gt;d_parent)</div><div class='del'>-			continue;</div><div class='del'>-		if (!d_same_name(alias, entry-&gt;d_parent, &amp;entry-&gt;d_name))</div><div class='del'>-			continue;</div><div class='del'>-		spin_lock(&amp;alias-&gt;d_lock);</div><div class='del'>-		if (!d_unhashed(alias)) {</div><div class='del'>-			spin_unlock(&amp;alias-&gt;d_lock);</div><div class='del'>-			alias = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			dget_dlock(alias);</div><div class='del'>-			__d_rehash(alias);</div><div class='del'>-			spin_unlock(&amp;alias-&gt;d_lock);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-		return alias;</div><div class='del'>-	}</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	__d_instantiate(dentry, inode);</div><div class='add'>+	dentry-&gt;d_flags |= DCACHE_PERSISTENT;</div><div class='add'>+	dget_dlock(dentry);</div><div class='add'>+	if (d_unhashed(dentry))</div><div class='add'>+		__d_rehash(dentry);</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-	return NULL;</div><div class='add'>+	return dentry;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(d_exact_alias);</div><div class='add'>+EXPORT_SYMBOL(d_make_persistent);</div><div class='ctx'> </div><div class='ctx'> static void swap_names(struct dentry *dentry, struct dentry *target)</div><div class='ctx'> {</div><div class='hunk'>@@ -2695,16 +2808,15 @@ static void swap_names(struct dentry *dentry, struct dentry *target)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Both external: swap the pointers</div><div class='ctx'> 			 */</div><div class='del'>-			swap(target-&gt;d_name.name, dentry-&gt;d_name.name);</div><div class='add'>+			swap(target-&gt;__d_name.name, dentry-&gt;__d_name.name);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * dentry:internal, target:external.  Steal target's</div><div class='ctx'> 			 * storage and make target internal.</div><div class='ctx'> 			 */</div><div class='del'>-			memcpy(target-&gt;d_iname, dentry-&gt;d_name.name,</div><div class='del'>-					dentry-&gt;d_name.len + 1);</div><div class='del'>-			dentry-&gt;d_name.name = target-&gt;d_name.name;</div><div class='del'>-			target-&gt;d_name.name = target-&gt;d_iname;</div><div class='add'>+			dentry-&gt;__d_name.name = target-&gt;__d_name.name;</div><div class='add'>+			target-&gt;d_shortname = dentry-&gt;d_shortname;</div><div class='add'>+			target-&gt;__d_name.name = target-&gt;d_shortname.string;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (unlikely(dname_external(dentry))) {</div><div class='hunk'>@@ -2712,23 +2824,19 @@ static void swap_names(struct dentry *dentry, struct dentry *target)</div><div class='ctx'> 			 * dentry:external, target:internal.  Give dentry's</div><div class='ctx'> 			 * storage to target and make dentry internal</div><div class='ctx'> 			 */</div><div class='del'>-			memcpy(dentry-&gt;d_iname, target-&gt;d_name.name,</div><div class='del'>-					target-&gt;d_name.len + 1);</div><div class='del'>-			target-&gt;d_name.name = dentry-&gt;d_name.name;</div><div class='del'>-			dentry-&gt;d_name.name = dentry-&gt;d_iname;</div><div class='add'>+			target-&gt;__d_name.name = dentry-&gt;__d_name.name;</div><div class='add'>+			dentry-&gt;d_shortname = target-&gt;d_shortname;</div><div class='add'>+			dentry-&gt;__d_name.name = dentry-&gt;d_shortname.string;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Both are internal.</div><div class='ctx'> 			 */</div><div class='del'>-			unsigned int i;</div><div class='del'>-			BUILD_BUG_ON(!IS_ALIGNED(DNAME_INLINE_LEN, sizeof(long)));</div><div class='del'>-			for (i = 0; i &lt; DNAME_INLINE_LEN / sizeof(long); i++) {</div><div class='del'>-				swap(((long *) &amp;dentry-&gt;d_iname)[i],</div><div class='del'>-				     ((long *) &amp;target-&gt;d_iname)[i]);</div><div class='del'>-			}</div><div class='add'>+			for (int i = 0; i &lt; DNAME_INLINE_WORDS; i++)</div><div class='add'>+				swap(dentry-&gt;d_shortname.words[i],</div><div class='add'>+				     target-&gt;d_shortname.words[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	swap(dentry-&gt;d_name.hash_len, target-&gt;d_name.hash_len);</div><div class='add'>+	swap(dentry-&gt;__d_name.hash_len, target-&gt;__d_name.hash_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void copy_name(struct dentry *dentry, struct dentry *target)</div><div class='hunk'>@@ -2737,16 +2845,15 @@ static void copy_name(struct dentry *dentry, struct dentry *target)</div><div class='ctx'> 	if (unlikely(dname_external(dentry)))</div><div class='ctx'> 		old_name = external_name(dentry);</div><div class='ctx'> 	if (unlikely(dname_external(target))) {</div><div class='del'>-		atomic_inc(&amp;external_name(target)-&gt;u.count);</div><div class='del'>-		dentry-&gt;d_name = target-&gt;d_name;</div><div class='add'>+		atomic_inc(&amp;external_name(target)-&gt;count);</div><div class='add'>+		dentry-&gt;__d_name = target-&gt;__d_name;</div><div class='ctx'> 	} else {</div><div class='del'>-		memcpy(dentry-&gt;d_iname, target-&gt;d_name.name,</div><div class='del'>-				target-&gt;d_name.len + 1);</div><div class='del'>-		dentry-&gt;d_name.name = dentry-&gt;d_iname;</div><div class='del'>-		dentry-&gt;d_name.hash_len = target-&gt;d_name.hash_len;</div><div class='add'>+		dentry-&gt;d_shortname = target-&gt;d_shortname;</div><div class='add'>+		dentry-&gt;__d_name.name = dentry-&gt;d_shortname.string;</div><div class='add'>+		dentry-&gt;__d_name.hash_len = target-&gt;__d_name.hash_len;</div><div class='ctx'> 	}</div><div class='del'>-	if (old_name &amp;&amp; likely(atomic_dec_and_test(&amp;old_name-&gt;u.count)))</div><div class='del'>-		kfree_rcu(old_name, u.head);</div><div class='add'>+	if (old_name &amp;&amp; likely(atomic_dec_and_test(&amp;old_name-&gt;count)))</div><div class='add'>+		kfree_rcu(old_name, head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2755,10 +2862,10 @@ static void copy_name(struct dentry *dentry, struct dentry *target)</div><div class='ctx'>  * @target: new dentry</div><div class='ctx'>  * @exchange: exchange the two dentries</div><div class='ctx'>  *</div><div class='del'>- * Update the dcache to reflect the move of a file name. Negative</div><div class='del'>- * dcache entries should not be moved in this way. Caller must hold</div><div class='del'>- * rename_lock, the i_mutex of the source and target directories,</div><div class='del'>- * and the sb-&gt;s_vfs_rename_mutex if they differ. See lock_rename().</div><div class='add'>+ * Update the dcache to reflect the move of a file name. Negative dcache</div><div class='add'>+ * entries should not be moved in this way. Caller must hold rename_lock, the</div><div class='add'>+ * i_rwsem of the source and target directories (exclusively), and the sb-&gt;</div><div class='add'>+ * s_vfs_rename_mutex if they differ. See lock_rename().</div><div class='ctx'>  */</div><div class='ctx'> static void __d_move(struct dentry *dentry, struct dentry *target,</div><div class='ctx'> 		     bool exchange)</div><div class='hunk'>@@ -2880,6 +2987,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)</div><div class='ctx'> </div><div class='ctx'> 	write_sequnlock(&amp;rename_lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(d_exchange);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * d_ancestor - search for an ancestor</div><div class='hunk'>@@ -2904,7 +3012,7 @@ struct dentry *d_ancestor(struct dentry *p1, struct dentry *p2)</div><div class='ctx'>  * This helper attempts to cope with remotely renamed directories</div><div class='ctx'>  *</div><div class='ctx'>  * It assumes that the caller is already holding</div><div class='del'>- * dentry-&gt;d_parent-&gt;d_inode-&gt;i_mutex, and rename_lock</div><div class='add'>+ * dentry-&gt;d_parent-&gt;d_inode-&gt;i_rwsem, and rename_lock</div><div class='ctx'>  *</div><div class='ctx'>  * Note: If ever the locking in lock_rename() changes, then please</div><div class='ctx'>  * remember to update this too...</div><div class='hunk'>@@ -2927,7 +3035,12 @@ static int __d_unalias(struct dentry *dentry, struct dentry *alias)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	m2 = &amp;alias-&gt;d_parent-&gt;d_inode-&gt;i_rwsem;</div><div class='ctx'> out_unalias:</div><div class='add'>+	if (alias-&gt;d_op &amp;&amp; alias-&gt;d_op-&gt;d_unalias_trylock &amp;&amp;</div><div class='add'>+	    !alias-&gt;d_op-&gt;d_unalias_trylock(alias))</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	__d_move(alias, dentry, false);</div><div class='add'>+	if (alias-&gt;d_op &amp;&amp; alias-&gt;d_op-&gt;d_unalias_unlock)</div><div class='add'>+		alias-&gt;d_op-&gt;d_unalias_unlock(alias);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out_err:</div><div class='ctx'> 	if (m2)</div><div class='hunk'>@@ -2937,30 +3050,8 @@ out_err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * d_splice_alias - splice a disconnected dentry into the tree if one exists</div><div class='del'>- * @inode:  the inode which may have a disconnected dentry</div><div class='del'>- * @dentry: a negative dentry which we want to point to the inode.</div><div class='del'>- *</div><div class='del'>- * If inode is a directory and has an IS_ROOT alias, then d_move that in</div><div class='del'>- * place of the given dentry and return it, else simply d_add the inode</div><div class='del'>- * to the dentry and return NULL.</div><div class='del'>- *</div><div class='del'>- * If a non-IS_ROOT directory is found, the filesystem is corrupt, and</div><div class='del'>- * we should error out: directories can't have multiple aliases.</div><div class='del'>- *</div><div class='del'>- * This is needed in the lookup routine of any filesystem that is exportable</div><div class='del'>- * (via knfsd) so that we can build dcache paths to directories effectively.</div><div class='del'>- *</div><div class='del'>- * If a dentry was found and moved, then it is returned.  Otherwise NULL</div><div class='del'>- * is returned.  This matches the expected return value of -&gt;lookup.</div><div class='del'>- *</div><div class='del'>- * Cluster filesystems may call this function with a negative, hashed dentry.</div><div class='del'>- * In that case, we know that the inode will be a regular file, and also this</div><div class='del'>- * will only occur during atomic_open. So we need to check for the dentry</div><div class='del'>- * being already hashed only in the final case.</div><div class='del'>- */</div><div class='del'>-struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)</div><div class='add'>+struct dentry *d_splice_alias_ops(struct inode *inode, struct dentry *dentry,</div><div class='add'>+				  const struct dentry_operations *ops)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return ERR_CAST(inode);</div><div class='hunk'>@@ -3006,9 +3097,37 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	__d_add(dentry, inode);</div><div class='add'>+	__d_add(dentry, inode, ops);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * d_splice_alias - splice a disconnected dentry into the tree if one exists</div><div class='add'>+ * @inode:  the inode which may have a disconnected dentry</div><div class='add'>+ * @dentry: a negative dentry which we want to point to the inode.</div><div class='add'>+ *</div><div class='add'>+ * If inode is a directory and has an IS_ROOT alias, then d_move that in</div><div class='add'>+ * place of the given dentry and return it, else simply d_add the inode</div><div class='add'>+ * to the dentry and return NULL.</div><div class='add'>+ *</div><div class='add'>+ * If a non-IS_ROOT directory is found, the filesystem is corrupt, and</div><div class='add'>+ * we should error out: directories can't have multiple aliases.</div><div class='add'>+ *</div><div class='add'>+ * This is needed in the lookup routine of any filesystem that is exportable</div><div class='add'>+ * (via knfsd) so that we can build dcache paths to directories effectively.</div><div class='add'>+ *</div><div class='add'>+ * If a dentry was found and moved, then it is returned.  Otherwise NULL</div><div class='add'>+ * is returned.  This matches the expected return value of -&gt;lookup.</div><div class='add'>+ *</div><div class='add'>+ * Cluster filesystems may call this function with a negative, hashed dentry.</div><div class='add'>+ * In that case, we know that the inode will be a regular file, and also this</div><div class='add'>+ * will only occur during atomic_open. So we need to check for the dentry</div><div class='add'>+ * being already hashed only in the final case.</div><div class='add'>+ */</div><div class='add'>+struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	return d_splice_alias_ops(inode, dentry, NULL);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(d_splice_alias);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3029,58 +3148,38 @@ EXPORT_SYMBOL(d_splice_alias);</div><div class='ctx'>   </div><div class='ctx'> bool is_subdir(struct dentry *new_dentry, struct dentry *old_dentry)</div><div class='ctx'> {</div><div class='del'>-	bool result;</div><div class='add'>+	bool subdir;</div><div class='ctx'> 	unsigned seq;</div><div class='ctx'> </div><div class='ctx'> 	if (new_dentry == old_dentry)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		/* for restarting inner loop in case of seq retry */</div><div class='del'>-		seq = read_seqbegin(&amp;rename_lock);</div><div class='del'>-		/*</div><div class='del'>-		 * Need rcu_readlock to protect against the d_parent trashing</div><div class='del'>-		 * due to d_move</div><div class='del'>-		 */</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		if (d_ancestor(old_dentry, new_dentry))</div><div class='del'>-			result = true;</div><div class='del'>-		else</div><div class='del'>-			result = false;</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-	} while (read_seqretry(&amp;rename_lock, seq));</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(is_subdir);</div><div class='del'>-</div><div class='del'>-static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct dentry *root = data;</div><div class='del'>-	if (dentry != root) {</div><div class='del'>-		if (d_unhashed(dentry) || !dentry-&gt;d_inode)</div><div class='del'>-			return D_WALK_SKIP;</div><div class='del'>-</div><div class='del'>-		dentry-&gt;d_lockref.count--;</div><div class='add'>+	/* Access d_parent under rcu as d_move() may change it. */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	seq = read_seqbegin(&amp;rename_lock);</div><div class='add'>+	subdir = d_ancestor(old_dentry, new_dentry);</div><div class='add'>+	 /* Try lockless once... */</div><div class='add'>+	if (read_seqretry(&amp;rename_lock, seq)) {</div><div class='add'>+		/* ...else acquire lock for progress even on deep chains. */</div><div class='add'>+		read_seqlock_excl(&amp;rename_lock);</div><div class='add'>+		subdir = d_ancestor(old_dentry, new_dentry);</div><div class='add'>+		read_sequnlock_excl(&amp;rename_lock);</div><div class='ctx'> 	}</div><div class='del'>-	return D_WALK_CONTINUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void d_genocide(struct dentry *parent)</div><div class='del'>-{</div><div class='del'>-	d_walk(parent, parent, d_genocide_kill);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return subdir;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(is_subdir);</div><div class='ctx'> </div><div class='ctx'> void d_mark_tmpfile(struct file *file, struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dentry-&gt;d_name.name != dentry-&gt;d_iname ||</div><div class='add'>+	BUG_ON(dname_external(dentry) ||</div><div class='ctx'> 		!hlist_unhashed(&amp;dentry-&gt;d_u.d_alias) ||</div><div class='ctx'> 		!d_unlinked(dentry));</div><div class='ctx'> 	spin_lock(&amp;dentry-&gt;d_parent-&gt;d_lock);</div><div class='ctx'> 	spin_lock_nested(&amp;dentry-&gt;d_lock, DENTRY_D_LOCK_NESTED);</div><div class='del'>-	dentry-&gt;d_name.len = sprintf(dentry-&gt;d_iname, "#%llu",</div><div class='add'>+	dentry-&gt;__d_name.len = sprintf(dentry-&gt;d_shortname.string, "#%llu",</div><div class='ctx'> 				(unsigned long long)inode-&gt;i_ino);</div><div class='ctx'> 	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	spin_unlock(&amp;dentry-&gt;d_parent-&gt;d_lock);</div><div class='hunk'>@@ -3097,6 +3196,34 @@ void d_tmpfile(struct file *file, struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(d_tmpfile);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Obtain inode number of the parent dentry.</div><div class='add'>+ */</div><div class='add'>+ino_t d_parent_ino(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct dentry *parent;</div><div class='add'>+	struct inode *iparent;</div><div class='add'>+	unsigned seq;</div><div class='add'>+	ino_t ret;</div><div class='add'>+</div><div class='add'>+	scoped_guard(rcu) {</div><div class='add'>+		seq = raw_seqcount_begin(&amp;dentry-&gt;d_seq);</div><div class='add'>+		parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='add'>+		iparent = d_inode_rcu(parent);</div><div class='add'>+		if (likely(iparent)) {</div><div class='add'>+			ret = iparent-&gt;i_ino;</div><div class='add'>+			if (!read_seqcount_retry(&amp;dentry-&gt;d_seq, seq))</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	ret = dentry-&gt;d_parent-&gt;d_inode-&gt;i_ino;</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(d_parent_ino);</div><div class='add'>+</div><div class='ctx'> static __initdata unsigned long dhash_entries;</div><div class='ctx'> static int __init set_dhash_entries(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -3126,6 +3253,9 @@ static void __init dcache_init_early(void)</div><div class='ctx'> 					0,</div><div class='ctx'> 					0);</div><div class='ctx'> 	d_hash_shift = 32 - d_hash_shift;</div><div class='add'>+</div><div class='add'>+	runtime_const_init(shift, d_hash_shift);</div><div class='add'>+	runtime_const_init(ptr, dentry_hashtable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init dcache_init(void)</div><div class='hunk'>@@ -3135,9 +3265,10 @@ static void __init dcache_init(void)</div><div class='ctx'> 	 * but it is probably not worth it because of the cache nature</div><div class='ctx'> 	 * of the dcache.</div><div class='ctx'> 	 */</div><div class='del'>-	dentry_cache = KMEM_CACHE_USERCOPY(dentry,</div><div class='del'>-		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD|SLAB_ACCOUNT,</div><div class='del'>-		d_iname);</div><div class='add'>+	__dentry_cache = KMEM_CACHE_USERCOPY(dentry,</div><div class='add'>+		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_ACCOUNT,</div><div class='add'>+		d_shortname.string);</div><div class='add'>+	runtime_const_init(ptr, __dentry_cache);</div><div class='ctx'> </div><div class='ctx'> 	/* Hash may have been set up in dcache_init_early */</div><div class='ctx'> 	if (!hashdist)</div><div class='hunk'>@@ -3154,6 +3285,9 @@ static void __init dcache_init(void)</div><div class='ctx'> 					0,</div><div class='ctx'> 					0);</div><div class='ctx'> 	d_hash_shift = 32 - d_hash_shift;</div><div class='add'>+</div><div class='add'>+	runtime_const_init(shift, d_hash_shift);</div><div class='add'>+	runtime_const_init(ptr, dentry_hashtable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* SLAB cache for __getname() consumers */</div><div class='head'>diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c<br/>index c6f4a9a98b85..3ec3324c2060 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/debugfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/debugfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/debugfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/debugfs/file.c</a></div><div class='hunk'>@@ -47,39 +47,19 @@ const struct file_operations debugfs_noop_file_operations = {</div><div class='ctx'> </div><div class='ctx'> #define F_DENTRY(filp) ((filp)-&gt;f_path.dentry)</div><div class='ctx'> </div><div class='del'>-const struct file_operations *debugfs_real_fops(const struct file *filp)</div><div class='add'>+void *debugfs_get_aux(const struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct debugfs_fsdata *fsd = F_DENTRY(filp)-&gt;d_fsdata;</div><div class='del'>-</div><div class='del'>-	if ((unsigned long)fsd &amp; DEBUGFS_FSDATA_IS_REAL_FOPS_BIT) {</div><div class='del'>-		/*</div><div class='del'>-		 * Urgh, we've been called w/o a protecting</div><div class='del'>-		 * debugfs_file_get().</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return fsd-&gt;real_fops;</div><div class='add'>+	return DEBUGFS_I(file_inode(file))-&gt;aux;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(debugfs_real_fops);</div><div class='add'>+EXPORT_SYMBOL_GPL(debugfs_get_aux);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * debugfs_file_get - mark the beginning of file data access</div><div class='del'>- * @dentry: the dentry object whose data is being accessed.</div><div class='del'>- *</div><div class='del'>- * Up to a matching call to debugfs_file_put(), any successive call</div><div class='del'>- * into the file removing functions debugfs_remove() and</div><div class='del'>- * debugfs_remove_recursive() will block. Since associated private</div><div class='del'>- * file data may only get freed after a successful return of any of</div><div class='del'>- * the removal functions, you may safely access it after a successful</div><div class='del'>- * call to debugfs_file_get() without worrying about lifetime issues.</div><div class='del'>- *</div><div class='del'>- * If -%EIO is returned, the file has already been removed and thus,</div><div class='del'>- * it is not safe to access any of its data. If, on the other hand,</div><div class='del'>- * it is allowed to access the file data, zero is returned.</div><div class='del'>- */</div><div class='del'>-int debugfs_file_get(struct dentry *dentry)</div><div class='add'>+enum dbgfs_get_mode {</div><div class='add'>+	DBGFS_GET_ALREADY,</div><div class='add'>+	DBGFS_GET_REGULAR,</div><div class='add'>+	DBGFS_GET_SHORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __debugfs_file_get(struct dentry *dentry, enum dbgfs_get_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct debugfs_fsdata *fsd;</div><div class='ctx'> 	void *d_fsd;</div><div class='hunk'>@@ -93,24 +73,55 @@ int debugfs_file_get(struct dentry *dentry)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	d_fsd = READ_ONCE(dentry-&gt;d_fsdata);</div><div class='del'>-	if (!((unsigned long)d_fsd &amp; DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)) {</div><div class='add'>+	if (d_fsd) {</div><div class='ctx'> 		fsd = d_fsd;</div><div class='ctx'> 	} else {</div><div class='add'>+		struct inode *inode = dentry-&gt;d_inode;</div><div class='add'>+		unsigned int methods = 0;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(mode == DBGFS_GET_ALREADY))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		fsd = kmalloc(sizeof(*fsd), GFP_KERNEL);</div><div class='ctx'> 		if (!fsd)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		fsd-&gt;real_fops = (void *)((unsigned long)d_fsd &amp;</div><div class='del'>-					~DEBUGFS_FSDATA_IS_REAL_FOPS_BIT);</div><div class='add'>+		if (mode == DBGFS_GET_SHORT) {</div><div class='add'>+			const struct debugfs_short_fops *ops;</div><div class='add'>+			ops = fsd-&gt;short_fops = DEBUGFS_I(inode)-&gt;short_fops;</div><div class='add'>+			if (ops-&gt;llseek)</div><div class='add'>+				methods |= HAS_LSEEK;</div><div class='add'>+			if (ops-&gt;read)</div><div class='add'>+				methods |= HAS_READ;</div><div class='add'>+			if (ops-&gt;write)</div><div class='add'>+				methods |= HAS_WRITE;</div><div class='add'>+			fsd-&gt;real_fops = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			const struct file_operations *ops;</div><div class='add'>+			ops = fsd-&gt;real_fops = DEBUGFS_I(inode)-&gt;real_fops;</div><div class='add'>+			if (ops-&gt;llseek)</div><div class='add'>+				methods |= HAS_LSEEK;</div><div class='add'>+			if (ops-&gt;read)</div><div class='add'>+				methods |= HAS_READ;</div><div class='add'>+			if (ops-&gt;write)</div><div class='add'>+				methods |= HAS_WRITE;</div><div class='add'>+			if (ops-&gt;unlocked_ioctl)</div><div class='add'>+				methods |= HAS_IOCTL;</div><div class='add'>+			if (ops-&gt;poll)</div><div class='add'>+				methods |= HAS_POLL;</div><div class='add'>+			fsd-&gt;short_fops = NULL;</div><div class='add'>+		}</div><div class='add'>+		fsd-&gt;methods = methods;</div><div class='ctx'> 		refcount_set(&amp;fsd-&gt;active_users, 1);</div><div class='ctx'> 		init_completion(&amp;fsd-&gt;active_users_drained);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;fsd-&gt;cancellations);</div><div class='ctx'> 		mutex_init(&amp;fsd-&gt;cancellations_mtx);</div><div class='ctx'> </div><div class='del'>-		if (cmpxchg(&amp;dentry-&gt;d_fsdata, d_fsd, fsd) != d_fsd) {</div><div class='add'>+		d_fsd = cmpxchg(&amp;dentry-&gt;d_fsdata, NULL, fsd);</div><div class='add'>+		if (d_fsd) {</div><div class='ctx'> 			mutex_destroy(&amp;fsd-&gt;cancellations_mtx);</div><div class='ctx'> 			kfree(fsd);</div><div class='del'>-			fsd = READ_ONCE(dentry-&gt;d_fsdata);</div><div class='add'>+			fsd = d_fsd;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -130,6 +141,26 @@ int debugfs_file_get(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * debugfs_file_get - mark the beginning of file data access</div><div class='add'>+ * @dentry: the dentry object whose data is being accessed.</div><div class='add'>+ *</div><div class='add'>+ * Up to a matching call to debugfs_file_put(), any successive call</div><div class='add'>+ * into the file removing functions debugfs_remove() and</div><div class='add'>+ * debugfs_remove_recursive() will block. Since associated private</div><div class='add'>+ * file data may only get freed after a successful return of any of</div><div class='add'>+ * the removal functions, you may safely access it after a successful</div><div class='add'>+ * call to debugfs_file_get() without worrying about lifetime issues.</div><div class='add'>+ *</div><div class='add'>+ * If -%EIO is returned, the file has already been removed and thus,</div><div class='add'>+ * it is not safe to access any of its data. If, on the other hand,</div><div class='add'>+ * it is allowed to access the file data, zero is returned.</div><div class='add'>+ */</div><div class='add'>+int debugfs_file_get(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	return __debugfs_file_get(dentry, DBGFS_GET_ALREADY);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(debugfs_file_get);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -187,8 +218,7 @@ void debugfs_enter_cancellation(struct file *file,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	fsd = READ_ONCE(dentry-&gt;d_fsdata);</div><div class='del'>-	if (WARN_ON(!fsd ||</div><div class='del'>-		    ((unsigned long)fsd &amp; DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)))</div><div class='add'>+	if (WARN_ON(!fsd))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fsd-&gt;cancellations_mtx);</div><div class='hunk'>@@ -219,8 +249,7 @@ void debugfs_leave_cancellation(struct file *file,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	fsd = READ_ONCE(dentry-&gt;d_fsdata);</div><div class='del'>-	if (WARN_ON(!fsd ||</div><div class='del'>-		    ((unsigned long)fsd &amp; DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)))</div><div class='add'>+	if (WARN_ON(!fsd))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fsd-&gt;cancellations_mtx);</div><div class='hunk'>@@ -241,9 +270,10 @@ static int debugfs_locked_down(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	if ((inode-&gt;i_mode &amp; 07777 &amp; ~0444) == 0 &amp;&amp;</div><div class='ctx'> 	    !(filp-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp;</div><div class='del'>-	    !real_fops-&gt;unlocked_ioctl &amp;&amp;</div><div class='del'>-	    !real_fops-&gt;compat_ioctl &amp;&amp;</div><div class='del'>-	    !real_fops-&gt;mmap)</div><div class='add'>+	    (!real_fops ||</div><div class='add'>+	     (!real_fops-&gt;unlocked_ioctl &amp;&amp;</div><div class='add'>+	      !real_fops-&gt;compat_ioctl &amp;&amp;</div><div class='add'>+	      !real_fops-&gt;mmap)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (security_locked_down(LOCKDOWN_DEBUGFS))</div><div class='hunk'>@@ -255,15 +285,13 @@ static int debugfs_locked_down(struct inode *inode,</div><div class='ctx'> static int open_proxy_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = F_DENTRY(filp);</div><div class='del'>-	const struct file_operations *real_fops = NULL;</div><div class='add'>+	const struct file_operations *real_fops = DEBUGFS_I(inode)-&gt;real_fops;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = debugfs_file_get(dentry);</div><div class='add'>+	r = __debugfs_file_get(dentry, DBGFS_GET_REGULAR);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r == -EIO ? -ENOENT : r;</div><div class='ctx'> </div><div class='del'>-	real_fops = debugfs_real_fops(filp);</div><div class='del'>-</div><div class='ctx'> 	r = debugfs_locked_down(inode, filp, real_fops);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -300,61 +328,93 @@ const struct file_operations debugfs_open_proxy_file_operations = {</div><div class='ctx'> #define PROTO(args...) args</div><div class='ctx'> #define ARGS(args...) args</div><div class='ctx'> </div><div class='del'>-#define FULL_PROXY_FUNC(name, ret_type, filp, proto, args)		\</div><div class='add'>+#define FULL_PROXY_FUNC(name, ret_type, filp, proto, args, bit, ret)	\</div><div class='ctx'> static ret_type full_proxy_ ## name(proto)				\</div><div class='ctx'> {									\</div><div class='del'>-	struct dentry *dentry = F_DENTRY(filp);			\</div><div class='del'>-	const struct file_operations *real_fops;			\</div><div class='add'>+	struct dentry *dentry = F_DENTRY(filp);				\</div><div class='add'>+	struct debugfs_fsdata *fsd = dentry-&gt;d_fsdata;			\</div><div class='ctx'> 	ret_type r;							\</div><div class='ctx'> 									\</div><div class='add'>+	if (!(fsd-&gt;methods &amp; bit))					\</div><div class='add'>+		return ret;						\</div><div class='ctx'> 	r = debugfs_file_get(dentry);					\</div><div class='ctx'> 	if (unlikely(r))						\</div><div class='ctx'> 		return r;						\</div><div class='del'>-	real_fops = debugfs_real_fops(filp);				\</div><div class='del'>-	r = real_fops-&gt;name(args);					\</div><div class='add'>+	r = fsd-&gt;real_fops-&gt;name(args);					\</div><div class='ctx'> 	debugfs_file_put(dentry);					\</div><div class='ctx'> 	return r;							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define SHORT_PROXY_FUNC(name, ret_type, filp, proto, args, bit, ret)	\</div><div class='add'>+static ret_type short_proxy_ ## name(proto)				\</div><div class='add'>+{									\</div><div class='add'>+	struct dentry *dentry = F_DENTRY(filp);				\</div><div class='add'>+	struct debugfs_fsdata *fsd = dentry-&gt;d_fsdata;			\</div><div class='add'>+	ret_type r;							\</div><div class='add'>+									\</div><div class='add'>+	if (!(fsd-&gt;methods &amp; bit))					\</div><div class='add'>+		return ret;						\</div><div class='add'>+	r = debugfs_file_get(dentry);					\</div><div class='add'>+	if (unlikely(r))						\</div><div class='add'>+		return r;						\</div><div class='add'>+	r = fsd-&gt;short_fops-&gt;name(args);				\</div><div class='add'>+	debugfs_file_put(dentry);					\</div><div class='add'>+	return r;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SHORT_PROXY_FUNC(llseek, loff_t, filp,</div><div class='add'>+		PROTO(struct file *filp, loff_t offset, int whence),</div><div class='add'>+		ARGS(filp, offset, whence), HAS_LSEEK, -ESPIPE);</div><div class='add'>+</div><div class='ctx'> FULL_PROXY_FUNC(llseek, loff_t, filp,</div><div class='ctx'> 		PROTO(struct file *filp, loff_t offset, int whence),</div><div class='del'>-		ARGS(filp, offset, whence));</div><div class='add'>+		ARGS(filp, offset, whence), HAS_LSEEK, -ESPIPE);</div><div class='add'>+</div><div class='add'>+SHORT_PROXY_FUNC(read, ssize_t, filp,</div><div class='add'>+		PROTO(struct file *filp, char __user *buf, size_t size,</div><div class='add'>+			loff_t *ppos),</div><div class='add'>+		ARGS(filp, buf, size, ppos), HAS_READ, -EINVAL);</div><div class='ctx'> </div><div class='ctx'> FULL_PROXY_FUNC(read, ssize_t, filp,</div><div class='ctx'> 		PROTO(struct file *filp, char __user *buf, size_t size,</div><div class='ctx'> 			loff_t *ppos),</div><div class='del'>-		ARGS(filp, buf, size, ppos));</div><div class='add'>+		ARGS(filp, buf, size, ppos), HAS_READ, -EINVAL);</div><div class='add'>+</div><div class='add'>+SHORT_PROXY_FUNC(write, ssize_t, filp,</div><div class='add'>+		PROTO(struct file *filp, const char __user *buf,</div><div class='add'>+			size_t size, loff_t *ppos),</div><div class='add'>+		ARGS(filp, buf, size, ppos), HAS_WRITE, -EINVAL);</div><div class='ctx'> </div><div class='ctx'> FULL_PROXY_FUNC(write, ssize_t, filp,</div><div class='del'>-		PROTO(struct file *filp, const char __user *buf, size_t size,</div><div class='del'>-			loff_t *ppos),</div><div class='del'>-		ARGS(filp, buf, size, ppos));</div><div class='add'>+		PROTO(struct file *filp, const char __user *buf,</div><div class='add'>+			size_t size, loff_t *ppos),</div><div class='add'>+		ARGS(filp, buf, size, ppos), HAS_WRITE, -EINVAL);</div><div class='ctx'> </div><div class='ctx'> FULL_PROXY_FUNC(unlocked_ioctl, long, filp,</div><div class='ctx'> 		PROTO(struct file *filp, unsigned int cmd, unsigned long arg),</div><div class='del'>-		ARGS(filp, cmd, arg));</div><div class='add'>+		ARGS(filp, cmd, arg), HAS_IOCTL, -ENOTTY);</div><div class='ctx'> </div><div class='ctx'> static __poll_t full_proxy_poll(struct file *filp,</div><div class='ctx'> 				struct poll_table_struct *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = F_DENTRY(filp);</div><div class='add'>+	struct debugfs_fsdata *fsd = dentry-&gt;d_fsdata;</div><div class='ctx'> 	__poll_t r = 0;</div><div class='del'>-	const struct file_operations *real_fops;</div><div class='ctx'> </div><div class='add'>+	if (!(fsd-&gt;methods &amp; HAS_POLL))</div><div class='add'>+		return DEFAULT_POLLMASK;</div><div class='ctx'> 	if (debugfs_file_get(dentry))</div><div class='ctx'> 		return EPOLLHUP;</div><div class='ctx'> </div><div class='del'>-	real_fops = debugfs_real_fops(filp);</div><div class='del'>-	r = real_fops-&gt;poll(filp, wait);</div><div class='add'>+	r = fsd-&gt;real_fops-&gt;poll(filp, wait);</div><div class='ctx'> 	debugfs_file_put(dentry);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int full_proxy_release(struct inode *inode, struct file *filp)</div><div class='add'>+static int full_proxy_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	const struct dentry *dentry = F_DENTRY(filp);</div><div class='del'>-	const struct file_operations *real_fops = debugfs_real_fops(filp);</div><div class='del'>-	const struct file_operations *proxy_fops = filp-&gt;f_op;</div><div class='add'>+	struct debugfs_fsdata *fsd = F_DENTRY(file)-&gt;d_fsdata;</div><div class='add'>+	const struct file_operations *real_fops = fsd-&gt;real_fops;</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -364,43 +424,25 @@ static int full_proxy_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 	 * -&gt;i_private is still being meaningful here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (real_fops-&gt;release)</div><div class='del'>-		r = real_fops-&gt;release(inode, filp);</div><div class='add'>+		r = real_fops-&gt;release(inode, file);</div><div class='ctx'> </div><div class='del'>-	replace_fops(filp, d_inode(dentry)-&gt;i_fop);</div><div class='del'>-	kfree(proxy_fops);</div><div class='ctx'> 	fops_put(real_fops);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __full_proxy_fops_init(struct file_operations *proxy_fops,</div><div class='del'>-				const struct file_operations *real_fops)</div><div class='del'>-{</div><div class='del'>-	proxy_fops-&gt;release = full_proxy_release;</div><div class='del'>-	if (real_fops-&gt;llseek)</div><div class='del'>-		proxy_fops-&gt;llseek = full_proxy_llseek;</div><div class='del'>-	if (real_fops-&gt;read)</div><div class='del'>-		proxy_fops-&gt;read = full_proxy_read;</div><div class='del'>-	if (real_fops-&gt;write)</div><div class='del'>-		proxy_fops-&gt;write = full_proxy_write;</div><div class='del'>-	if (real_fops-&gt;poll)</div><div class='del'>-		proxy_fops-&gt;poll = full_proxy_poll;</div><div class='del'>-	if (real_fops-&gt;unlocked_ioctl)</div><div class='del'>-		proxy_fops-&gt;unlocked_ioctl = full_proxy_unlocked_ioctl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int full_proxy_open(struct inode *inode, struct file *filp)</div><div class='add'>+static int full_proxy_open_regular(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = F_DENTRY(filp);</div><div class='del'>-	const struct file_operations *real_fops = NULL;</div><div class='del'>-	struct file_operations *proxy_fops = NULL;</div><div class='add'>+	const struct file_operations *real_fops;</div><div class='add'>+	struct debugfs_fsdata *fsd;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = debugfs_file_get(dentry);</div><div class='add'>+	r = __debugfs_file_get(dentry, DBGFS_GET_REGULAR);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r == -EIO ? -ENOENT : r;</div><div class='ctx'> </div><div class='del'>-	real_fops = debugfs_real_fops(filp);</div><div class='del'>-</div><div class='add'>+	fsd = dentry-&gt;d_fsdata;</div><div class='add'>+	real_fops = fsd-&gt;real_fops;</div><div class='ctx'> 	r = debugfs_locked_down(inode, filp, real_fops);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -421,38 +463,52 @@ static int full_proxy_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	proxy_fops = kzalloc(sizeof(*proxy_fops), GFP_KERNEL);</div><div class='del'>-	if (!proxy_fops) {</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto free_proxy;</div><div class='del'>-	}</div><div class='del'>-	__full_proxy_fops_init(proxy_fops, real_fops);</div><div class='del'>-	replace_fops(filp, proxy_fops);</div><div class='del'>-</div><div class='ctx'> 	if (real_fops-&gt;open) {</div><div class='ctx'> 		r = real_fops-&gt;open(inode, filp);</div><div class='ctx'> 		if (r) {</div><div class='del'>-			replace_fops(filp, d_inode(dentry)-&gt;i_fop);</div><div class='del'>-			goto free_proxy;</div><div class='del'>-		} else if (filp-&gt;f_op != proxy_fops) {</div><div class='add'>+			fops_put(real_fops);</div><div class='add'>+		} else if (filp-&gt;f_op != &amp;debugfs_full_proxy_file_operations) {</div><div class='ctx'> 			/* No protection against file removal anymore. */</div><div class='ctx'> 			WARN(1, "debugfs file owner replaced proxy fops: %pd",</div><div class='ctx'> 				dentry);</div><div class='del'>-			goto free_proxy;</div><div class='add'>+			fops_put(real_fops);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-free_proxy:</div><div class='del'>-	kfree(proxy_fops);</div><div class='del'>-	fops_put(real_fops);</div><div class='ctx'> out:</div><div class='ctx'> 	debugfs_file_put(dentry);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct file_operations debugfs_full_proxy_file_operations = {</div><div class='del'>-	.open = full_proxy_open,</div><div class='add'>+	.open = full_proxy_open_regular,</div><div class='add'>+	.release = full_proxy_release,</div><div class='add'>+	.llseek = full_proxy_llseek,</div><div class='add'>+	.read = full_proxy_read,</div><div class='add'>+	.write = full_proxy_write,</div><div class='add'>+	.poll = full_proxy_poll,</div><div class='add'>+	.unlocked_ioctl = full_proxy_unlocked_ioctl</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int full_proxy_open_short(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry = F_DENTRY(filp);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = __debugfs_file_get(dentry, DBGFS_GET_SHORT);</div><div class='add'>+	if (r)</div><div class='add'>+		return r == -EIO ? -ENOENT : r;</div><div class='add'>+	r = debugfs_locked_down(inode, filp, NULL);</div><div class='add'>+	if (!r)</div><div class='add'>+		r = simple_open(inode, filp);</div><div class='add'>+	debugfs_file_put(dentry);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct file_operations debugfs_full_short_proxy_file_operations = {</div><div class='add'>+	.open = full_proxy_open_short,</div><div class='add'>+	.llseek = short_proxy_llseek,</div><div class='add'>+	.read = short_proxy_read,</div><div class='add'>+	.write = short_proxy_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> ssize_t debugfs_attr_read(struct file *file, char __user *buf,</div><div class='hunk'>@@ -1218,7 +1274,6 @@ static const struct file_operations u32_array_fops = {</div><div class='ctx'> 	.open	 = u32_array_open,</div><div class='ctx'> 	.release = u32_array_release,</div><div class='ctx'> 	.read	 = u32_array_read,</div><div class='del'>-	.llseek  = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c<br/>index 034a617cb1a5..4b263c328ed2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/debugfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/debugfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/debugfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/debugfs/inode.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='hunk'>@@ -23,7 +24,6 @@</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> static struct vfsmount *debugfs_mount;</div><div class='ctx'> static int debugfs_mount_count;</div><div class='ctx'> static bool debugfs_registered;</div><div class='del'>-static unsigned int debugfs_allow __ro_after_init = DEFAULT_DEBUGFS_ALLOW_BITS;</div><div class='add'>+static bool debugfs_enabled __ro_after_init = IS_ENABLED(CONFIG_DEBUG_FS_ALLOW_ALL);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Don't allow access attributes to be changed whilst the kernel is locked down</div><div class='hunk'>@@ -77,7 +77,7 @@ static struct inode *debugfs_get_inode(struct super_block *sb)</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct debugfs_mount_opts {</div><div class='add'>+struct debugfs_fs_info {</div><div class='ctx'> 	kuid_t uid;</div><div class='ctx'> 	kgid_t gid;</div><div class='ctx'> 	umode_t mode;</div><div class='hunk'>@@ -89,68 +89,59 @@ enum {</div><div class='ctx'> 	Opt_uid,</div><div class='ctx'> 	Opt_gid,</div><div class='ctx'> 	Opt_mode,</div><div class='del'>-	Opt_err</div><div class='add'>+	Opt_source,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_mode, "mode=%o"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct fs_parameter_spec debugfs_param_specs[] = {</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct	("mode",	Opt_mode),</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_string	("source",	Opt_source),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct debugfs_fs_info {</div><div class='del'>-	struct debugfs_mount_opts mount_opts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts)</div><div class='add'>+static int debugfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	int token;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	opts-&gt;opts = 0;</div><div class='del'>-	opts-&gt;mode = DEBUGFS_DEFAULT_MODE;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;data, ",")) != NULL) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(uid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;uid = uid;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(gid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;gid = gid;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_mode:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;mode = option &amp; S_IALLUGO;</div><div class='del'>-			break;</div><div class='add'>+	struct debugfs_fs_info *opts = fc-&gt;s_fs_info;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, debugfs_param_specs, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * We might like to report bad mount options here;</div><div class='del'>-		 * but traditionally debugfs has ignored all mount options</div><div class='del'>-		 */</div><div class='del'>-		}</div><div class='add'>+                * We might like to report bad mount options here; but</div><div class='add'>+                * traditionally debugfs has ignored all mount options</div><div class='add'>+                */</div><div class='add'>+		if (opt == -ENOPARAM)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-		opts-&gt;opts |= BIT(token);</div><div class='add'>+		return opt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		opts-&gt;uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		opts-&gt;gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mode:</div><div class='add'>+		opts-&gt;mode = result.uint_32 &amp; S_IALLUGO;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_source:</div><div class='add'>+		if (fc-&gt;source)</div><div class='add'>+			return invalfc(fc, "Multiple sources specified");</div><div class='add'>+		fc-&gt;source = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;</div><div class='add'>+		break;</div><div class='add'>+	/*</div><div class='add'>+	 * We might like to report bad mount options here;</div><div class='add'>+	 * but traditionally debugfs has ignored all mount options</div><div class='add'>+	 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opts-&gt;opts |= BIT(opt);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -158,23 +149,22 @@ static void _debugfs_apply_options(struct super_block *sb, bool remount)</div><div class='ctx'> {</div><div class='ctx'> 	struct debugfs_fs_info *fsi = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct inode *inode = d_inode(sb-&gt;s_root);</div><div class='del'>-	struct debugfs_mount_opts *opts = &amp;fsi-&gt;mount_opts;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On remount, only reset mode/uid/gid if they were provided as mount</div><div class='ctx'> 	 * options.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (!remount || opts-&gt;opts &amp; BIT(Opt_mode)) {</div><div class='add'>+	if (!remount || fsi-&gt;opts &amp; BIT(Opt_mode)) {</div><div class='ctx'> 		inode-&gt;i_mode &amp;= ~S_IALLUGO;</div><div class='del'>-		inode-&gt;i_mode |= opts-&gt;mode;</div><div class='add'>+		inode-&gt;i_mode |= fsi-&gt;mode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!remount || opts-&gt;opts &amp; BIT(Opt_uid))</div><div class='del'>-		inode-&gt;i_uid = opts-&gt;uid;</div><div class='add'>+	if (!remount || fsi-&gt;opts &amp; BIT(Opt_uid))</div><div class='add'>+		inode-&gt;i_uid = fsi-&gt;uid;</div><div class='ctx'> </div><div class='del'>-	if (!remount || opts-&gt;opts &amp; BIT(Opt_gid))</div><div class='del'>-		inode-&gt;i_gid = opts-&gt;gid;</div><div class='add'>+	if (!remount || fsi-&gt;opts &amp; BIT(Opt_gid))</div><div class='add'>+		inode-&gt;i_gid = fsi-&gt;gid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void debugfs_apply_options(struct super_block *sb)</div><div class='hunk'>@@ -187,50 +177,68 @@ static void debugfs_apply_options_remount(struct super_block *sb)</div><div class='ctx'> 	_debugfs_apply_options(sb, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int debugfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int debugfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct debugfs_fs_info *fsi = sb-&gt;s_fs_info;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	struct debugfs_fs_info *sb_opts = sb-&gt;s_fs_info;</div><div class='add'>+	struct debugfs_fs_info *new_opts = fc-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	if (!new_opts)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	err = debugfs_parse_options(data, &amp;fsi-&gt;mount_opts);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail;</div><div class='ctx'> </div><div class='add'>+	/* structure copy of new mount options to sb */</div><div class='add'>+	*sb_opts = *new_opts;</div><div class='ctx'> 	debugfs_apply_options_remount(sb);</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int debugfs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct debugfs_fs_info *fsi = root-&gt;d_sb-&gt;s_fs_info;</div><div class='del'>-	struct debugfs_mount_opts *opts = &amp;fsi-&gt;mount_opts;</div><div class='ctx'> </div><div class='del'>-	if (!uid_eq(opts-&gt;uid, GLOBAL_ROOT_UID))</div><div class='add'>+	if (!uid_eq(fsi-&gt;uid, GLOBAL_ROOT_UID))</div><div class='ctx'> 		seq_printf(m, ",uid=%u",</div><div class='del'>-			   from_kuid_munged(&amp;init_user_ns, opts-&gt;uid));</div><div class='del'>-	if (!gid_eq(opts-&gt;gid, GLOBAL_ROOT_GID))</div><div class='add'>+			   from_kuid_munged(&amp;init_user_ns, fsi-&gt;uid));</div><div class='add'>+	if (!gid_eq(fsi-&gt;gid, GLOBAL_ROOT_GID))</div><div class='ctx'> 		seq_printf(m, ",gid=%u",</div><div class='del'>-			   from_kgid_munged(&amp;init_user_ns, opts-&gt;gid));</div><div class='del'>-	if (opts-&gt;mode != DEBUGFS_DEFAULT_MODE)</div><div class='del'>-		seq_printf(m, ",mode=%o", opts-&gt;mode);</div><div class='add'>+			   from_kgid_munged(&amp;init_user_ns, fsi-&gt;gid));</div><div class='add'>+	if (fsi-&gt;mode != DEBUGFS_DEFAULT_MODE)</div><div class='add'>+		seq_printf(m, ",mode=%o", fsi-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct kmem_cache *debugfs_inode_cachep __ro_after_init;</div><div class='add'>+</div><div class='add'>+static void init_once(void *foo)</div><div class='add'>+{</div><div class='add'>+	struct debugfs_inode_info *info = foo;</div><div class='add'>+	inode_init_once(&amp;info-&gt;vfs_inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct inode *debugfs_alloc_inode(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct debugfs_inode_info *info;</div><div class='add'>+	info = alloc_inode_sb(sb, debugfs_inode_cachep, GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return NULL;</div><div class='add'>+	return &amp;info-&gt;vfs_inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void debugfs_free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (S_ISLNK(inode-&gt;i_mode))</div><div class='ctx'> 		kfree(inode-&gt;i_link);</div><div class='del'>-	free_inode_nonrcu(inode);</div><div class='add'>+	kmem_cache_free(debugfs_inode_cachep, DEBUGFS_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations debugfs_super_operations = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='del'>-	.remount_fs	= debugfs_remount,</div><div class='ctx'> 	.show_options	= debugfs_show_options,</div><div class='add'>+	.alloc_inode	= debugfs_alloc_inode,</div><div class='ctx'> 	.free_inode	= debugfs_free_inode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -238,80 +246,87 @@ static void debugfs_release_dentry(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct debugfs_fsdata *fsd = dentry-&gt;d_fsdata;</div><div class='ctx'> </div><div class='del'>-	if ((unsigned long)fsd &amp; DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check it wasn't a dir (no fsdata) or automount (no real_fops) */</div><div class='del'>-	if (fsd &amp;&amp; fsd-&gt;real_fops) {</div><div class='add'>+	if (fsd) {</div><div class='ctx'> 		WARN_ON(!list_empty(&amp;fsd-&gt;cancellations));</div><div class='ctx'> 		mutex_destroy(&amp;fsd-&gt;cancellations_mtx);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	kfree(fsd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct vfsmount *debugfs_automount(struct path *path)</div><div class='ctx'> {</div><div class='del'>-	struct debugfs_fsdata *fsd = path-&gt;dentry-&gt;d_fsdata;</div><div class='add'>+	struct inode *inode = path-&gt;dentry-&gt;d_inode;</div><div class='ctx'> </div><div class='del'>-	return fsd-&gt;automount(path-&gt;dentry, d_inode(path-&gt;dentry)-&gt;i_private);</div><div class='add'>+	return DEBUGFS_I(inode)-&gt;automount(path-&gt;dentry, inode-&gt;i_private);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct dentry_operations debugfs_dops = {</div><div class='del'>-	.d_delete = always_delete_dentry,</div><div class='ctx'> 	.d_release = debugfs_release_dentry,</div><div class='ctx'> 	.d_automount = debugfs_automount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int debug_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int debugfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct tree_descr debug_files[] = {{""}};</div><div class='del'>-	struct debugfs_fs_info *fsi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fsi = kzalloc(sizeof(struct debugfs_fs_info), GFP_KERNEL);</div><div class='del'>-	sb-&gt;s_fs_info = fsi;</div><div class='del'>-	if (!fsi) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = debugfs_parse_options(data, &amp;fsi-&gt;mount_opts);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	err  =  simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);</div><div class='add'>+	err = simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto fail;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_op = &amp;debugfs_super_operations;</div><div class='del'>-	sb-&gt;s_d_op = &amp;debugfs_dops;</div><div class='add'>+	set_default_d_op(sb, &amp;debugfs_dops);</div><div class='add'>+	sb-&gt;s_d_flags |= DCACHE_DONTCACHE;</div><div class='ctx'> </div><div class='ctx'> 	debugfs_apply_options(sb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int debugfs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_tree_single(fc, debugfs_fill_super);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	kfree(fsi);</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='del'>-	return err;</div><div class='add'>+	return debugfs_reconfigure(fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *debug_mount(struct file_system_type *fs_type,</div><div class='del'>-			int flags, const char *dev_name,</div><div class='del'>-			void *data)</div><div class='add'>+static void debugfs_free_fc(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	if (!(debugfs_allow &amp; DEBUGFS_ALLOW_API))</div><div class='del'>-		return ERR_PTR(-EPERM);</div><div class='add'>+	kfree(fc-&gt;s_fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations debugfs_context_ops = {</div><div class='add'>+	.free		= debugfs_free_fc,</div><div class='add'>+	.parse_param	= debugfs_parse_param,</div><div class='add'>+	.get_tree	= debugfs_get_tree,</div><div class='add'>+	.reconfigure	= debugfs_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int debugfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct debugfs_fs_info *fsi;</div><div class='ctx'> </div><div class='del'>-	return mount_single(fs_type, flags, data, debug_fill_super);</div><div class='add'>+	fsi = kzalloc(sizeof(struct debugfs_fs_info), GFP_KERNEL);</div><div class='add'>+	if (!fsi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fsi-&gt;mode = DEBUGFS_DEFAULT_MODE;</div><div class='add'>+</div><div class='add'>+	fc-&gt;s_fs_info = fsi;</div><div class='add'>+	fc-&gt;ops = &amp;debugfs_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type debug_fs_type = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.name =		"debugfs",</div><div class='del'>-	.mount =	debug_mount,</div><div class='del'>-	.kill_sb =	kill_litter_super,</div><div class='add'>+	.init_fs_context = debugfs_init_fs_context,</div><div class='add'>+	.parameters =	debugfs_param_specs,</div><div class='add'>+	.kill_sb =	kill_anon_super,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("debugfs");</div><div class='ctx'> </div><div class='hunk'>@@ -337,19 +352,20 @@ struct dentry *debugfs_lookup(const char *name, struct dentry *parent)</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		parent = debugfs_mount-&gt;mnt_root;</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_positive_unlocked(name, parent, strlen(name));</div><div class='add'>+	dentry = lookup_noperm_positive_unlocked(&amp;QSTR(name), parent);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(debugfs_lookup);</div><div class='ctx'> </div><div class='del'>-static struct dentry *start_creating(const char *name, struct dentry *parent)</div><div class='add'>+static struct dentry *debugfs_start_creating(const char *name,</div><div class='add'>+					     struct dentry *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (!(debugfs_allow &amp; DEBUGFS_ALLOW_API))</div><div class='add'>+	if (!debugfs_enabled)</div><div class='ctx'> 		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='ctx'> 	if (!debugfs_initialized())</div><div class='hunk'>@@ -375,48 +391,33 @@ static struct dentry *start_creating(const char *name, struct dentry *parent)</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		parent = debugfs_mount-&gt;mnt_root;</div><div class='ctx'> </div><div class='del'>-	inode_lock(d_inode(parent));</div><div class='del'>-	if (unlikely(IS_DEADDIR(d_inode(parent))))</div><div class='del'>-		dentry = ERR_PTR(-ENOENT);</div><div class='del'>-	else</div><div class='del'>-		dentry = lookup_one_len(name, parent, strlen(name));</div><div class='del'>-	if (!IS_ERR(dentry) &amp;&amp; d_really_is_positive(dentry)) {</div><div class='del'>-		if (d_is_dir(dentry))</div><div class='del'>-			pr_err("Directory '%s' with parent '%s' already present!\n",</div><div class='del'>-			       name, parent-&gt;d_name.name);</div><div class='del'>-		else</div><div class='del'>-			pr_err("File '%s' in directory '%s' already present!\n",</div><div class='del'>-			       name, parent-&gt;d_name.name);</div><div class='del'>-		dput(dentry);</div><div class='del'>-		dentry = ERR_PTR(-EEXIST);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	dentry = simple_start_creating(parent, name);</div><div class='ctx'> 	if (IS_ERR(dentry)) {</div><div class='del'>-		inode_unlock(d_inode(parent));</div><div class='add'>+		if (dentry == ERR_PTR(-EEXIST))</div><div class='add'>+			pr_err("'%s' already exists in '%pd'\n", name, parent);</div><div class='ctx'> 		simple_release_fs(&amp;debugfs_mount, &amp;debugfs_mount_count);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *failed_creating(struct dentry *dentry)</div><div class='add'>+static struct dentry *debugfs_failed_creating(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	inode_unlock(d_inode(dentry-&gt;d_parent));</div><div class='del'>-	dput(dentry);</div><div class='add'>+	simple_done_creating(dentry);</div><div class='ctx'> 	simple_release_fs(&amp;debugfs_mount, &amp;debugfs_mount_count);</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *end_creating(struct dentry *dentry)</div><div class='add'>+static struct dentry *debugfs_end_creating(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	inode_unlock(d_inode(dentry-&gt;d_parent));</div><div class='del'>-	return dentry;</div><div class='add'>+	simple_done_creating(dentry);</div><div class='add'>+	return dentry; // borrowed</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *__debugfs_create_file(const char *name, umode_t mode,</div><div class='ctx'> 				struct dentry *parent, void *data,</div><div class='add'>+				const void *aux,</div><div class='ctx'> 				const struct file_operations *proxy_fops,</div><div class='del'>-				const struct file_operations *real_fops)</div><div class='add'>+				const void *real_fops)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -424,79 +425,54 @@ static struct dentry *__debugfs_create_file(const char *name, umode_t mode,</div><div class='ctx'> 	if (!(mode &amp; S_IFMT))</div><div class='ctx'> 		mode |= S_IFREG;</div><div class='ctx'> 	BUG_ON(!S_ISREG(mode));</div><div class='del'>-	dentry = start_creating(name, parent);</div><div class='add'>+	dentry = debugfs_start_creating(name, parent);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return dentry;</div><div class='ctx'> </div><div class='del'>-	if (!(debugfs_allow &amp; DEBUGFS_ALLOW_API)) {</div><div class='del'>-		failed_creating(dentry);</div><div class='del'>-		return ERR_PTR(-EPERM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	inode = debugfs_get_inode(dentry-&gt;d_sb);</div><div class='ctx'> 	if (unlikely(!inode)) {</div><div class='ctx'> 		pr_err("out of free dentries, can not create file '%s'\n",</div><div class='ctx'> 		       name);</div><div class='del'>-		return failed_creating(dentry);</div><div class='add'>+		return debugfs_failed_creating(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = mode;</div><div class='ctx'> 	inode-&gt;i_private = data;</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_op = &amp;debugfs_file_inode_operations;</div><div class='add'>+	if (!real_fops)</div><div class='add'>+		proxy_fops = &amp;debugfs_noop_file_operations;</div><div class='ctx'> 	inode-&gt;i_fop = proxy_fops;</div><div class='del'>-	dentry-&gt;d_fsdata = (void *)((unsigned long)real_fops |</div><div class='del'>-				DEBUGFS_FSDATA_IS_REAL_FOPS_BIT);</div><div class='add'>+	DEBUGFS_I(inode)-&gt;raw = real_fops;</div><div class='add'>+	DEBUGFS_I(inode)-&gt;aux = (void *)aux;</div><div class='ctx'> </div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	fsnotify_create(d_inode(dentry-&gt;d_parent), dentry);</div><div class='del'>-	return end_creating(dentry);</div><div class='add'>+	return debugfs_end_creating(dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * debugfs_create_file - create a file in the debugfs filesystem</div><div class='del'>- * @name: a pointer to a string containing the name of the file to create.</div><div class='del'>- * @mode: the permission that the file should have.</div><div class='del'>- * @parent: a pointer to the parent dentry for this file.  This should be a</div><div class='del'>- *          directory dentry if set.  If this parameter is NULL, then the</div><div class='del'>- *          file will be created in the root of the debugfs filesystem.</div><div class='del'>- * @data: a pointer to something that the caller will want to get to later</div><div class='del'>- *        on.  The inode.i_private pointer will point to this value on</div><div class='del'>- *        the open() call.</div><div class='del'>- * @fops: a pointer to a struct file_operations that should be used for</div><div class='del'>- *        this file.</div><div class='del'>- *</div><div class='del'>- * This is the basic "create a file" function for debugfs.  It allows for a</div><div class='del'>- * wide range of flexibility in creating a file, or a directory (if you want</div><div class='del'>- * to create a directory, the debugfs_create_dir() function is</div><div class='del'>- * recommended to be used instead.)</div><div class='del'>- *</div><div class='del'>- * This function will return a pointer to a dentry if it succeeds.  This</div><div class='del'>- * pointer must be passed to the debugfs_remove() function when the file is</div><div class='del'>- * to be removed (no automatic cleanup happens if your module is unloaded,</div><div class='del'>- * you are responsible here.)  If an error occurs, ERR_PTR(-ERROR) will be</div><div class='del'>- * returned.</div><div class='del'>- *</div><div class='del'>- * If debugfs is not enabled in the kernel, the value -%ENODEV will be</div><div class='del'>- * returned.</div><div class='del'>- *</div><div class='del'>- * NOTE: it's expected that most callers should _ignore_ the errors returned</div><div class='del'>- * by this function. Other debugfs functions handle the fact that the "dentry"</div><div class='del'>- * passed to them could be an error and they don't crash in that case.</div><div class='del'>- * Drivers should generally work fine even if debugfs fails to init anyway.</div><div class='del'>- */</div><div class='del'>-struct dentry *debugfs_create_file(const char *name, umode_t mode,</div><div class='del'>-				   struct dentry *parent, void *data,</div><div class='del'>-				   const struct file_operations *fops)</div><div class='add'>+struct dentry *debugfs_create_file_full(const char *name, umode_t mode,</div><div class='add'>+					struct dentry *parent, void *data,</div><div class='add'>+					const void *aux,</div><div class='add'>+					const struct file_operations *fops)</div><div class='ctx'> {</div><div class='add'>+	return __debugfs_create_file(name, mode, parent, data, aux,</div><div class='add'>+				&amp;debugfs_full_proxy_file_operations,</div><div class='add'>+				fops);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(debugfs_create_file_full);</div><div class='ctx'> </div><div class='del'>-	return __debugfs_create_file(name, mode, parent, data,</div><div class='del'>-				fops ? &amp;debugfs_full_proxy_file_operations :</div><div class='del'>-					&amp;debugfs_noop_file_operations,</div><div class='add'>+struct dentry *debugfs_create_file_short(const char *name, umode_t mode,</div><div class='add'>+					struct dentry *parent, void *data,</div><div class='add'>+					const void *aux,</div><div class='add'>+					const struct debugfs_short_fops *fops)</div><div class='add'>+{</div><div class='add'>+	return __debugfs_create_file(name, mode, parent, data, aux,</div><div class='add'>+				&amp;debugfs_full_short_proxy_file_operations,</div><div class='ctx'> 				fops);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(debugfs_create_file);</div><div class='add'>+EXPORT_SYMBOL_GPL(debugfs_create_file_short);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * debugfs_create_file_unsafe - create a file in the debugfs filesystem</div><div class='hunk'>@@ -530,9 +506,8 @@ struct dentry *debugfs_create_file_unsafe(const char *name, umode_t mode,</div><div class='ctx'> 				   const struct file_operations *fops)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	return __debugfs_create_file(name, mode, parent, data,</div><div class='del'>-				fops ? &amp;debugfs_open_proxy_file_operations :</div><div class='del'>-					&amp;debugfs_noop_file_operations,</div><div class='add'>+	return __debugfs_create_file(name, mode, parent, data, NULL,</div><div class='add'>+				&amp;debugfs_open_proxy_file_operations,</div><div class='ctx'> 				fops);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(debugfs_create_file_unsafe);</div><div class='hunk'>@@ -594,22 +569,17 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);</div><div class='ctx'>  */</div><div class='ctx'> struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = start_creating(name, parent);</div><div class='add'>+	struct dentry *dentry = debugfs_start_creating(name, parent);</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return dentry;</div><div class='ctx'> </div><div class='del'>-	if (!(debugfs_allow &amp; DEBUGFS_ALLOW_API)) {</div><div class='del'>-		failed_creating(dentry);</div><div class='del'>-		return ERR_PTR(-EPERM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	inode = debugfs_get_inode(dentry-&gt;d_sb);</div><div class='ctx'> 	if (unlikely(!inode)) {</div><div class='ctx'> 		pr_err("out of free dentries, can not create directory '%s'\n",</div><div class='ctx'> 		       name);</div><div class='del'>-		return failed_creating(dentry);</div><div class='add'>+		return debugfs_failed_creating(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;</div><div class='hunk'>@@ -618,10 +588,10 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)</div><div class='ctx'> </div><div class='ctx'> 	/* directory inodes start off with i_nlink == 2 (for "." entry) */</div><div class='ctx'> 	inc_nlink(inode);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	inc_nlink(d_inode(dentry-&gt;d_parent));</div><div class='ctx'> 	fsnotify_mkdir(d_inode(dentry-&gt;d_parent), dentry);</div><div class='del'>-	return end_creating(dentry);</div><div class='add'>+	return debugfs_end_creating(dentry);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(debugfs_create_dir);</div><div class='ctx'> </div><div class='hunk'>@@ -641,45 +611,29 @@ struct dentry *debugfs_create_automount(const char *name,</div><div class='ctx'> 					debugfs_automount_t f,</div><div class='ctx'> 					void *data)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = start_creating(name, parent);</div><div class='del'>-	struct debugfs_fsdata *fsd;</div><div class='add'>+	struct dentry *dentry = debugfs_start_creating(name, parent);</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return dentry;</div><div class='ctx'> </div><div class='del'>-	fsd = kzalloc(sizeof(*fsd), GFP_KERNEL);</div><div class='del'>-	if (!fsd) {</div><div class='del'>-		failed_creating(dentry);</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fsd-&gt;automount = f;</div><div class='del'>-</div><div class='del'>-	if (!(debugfs_allow &amp; DEBUGFS_ALLOW_API)) {</div><div class='del'>-		failed_creating(dentry);</div><div class='del'>-		kfree(fsd);</div><div class='del'>-		return ERR_PTR(-EPERM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	inode = debugfs_get_inode(dentry-&gt;d_sb);</div><div class='ctx'> 	if (unlikely(!inode)) {</div><div class='ctx'> 		pr_err("out of free dentries, can not create automount '%s'\n",</div><div class='ctx'> 		       name);</div><div class='del'>-		kfree(fsd);</div><div class='del'>-		return failed_creating(dentry);</div><div class='add'>+		return debugfs_failed_creating(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	make_empty_dir_inode(inode);</div><div class='ctx'> 	inode-&gt;i_flags |= S_AUTOMOUNT;</div><div class='ctx'> 	inode-&gt;i_private = data;</div><div class='del'>-	dentry-&gt;d_fsdata = fsd;</div><div class='add'>+	DEBUGFS_I(inode)-&gt;automount = f;</div><div class='ctx'> 	/* directory inodes start off with i_nlink == 2 (for "." entry) */</div><div class='ctx'> 	inc_nlink(inode);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	inc_nlink(d_inode(dentry-&gt;d_parent));</div><div class='ctx'> 	fsnotify_mkdir(d_inode(dentry-&gt;d_parent), dentry);</div><div class='del'>-	return end_creating(dentry);</div><div class='add'>+	return debugfs_end_creating(dentry);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(debugfs_create_automount);</div><div class='ctx'> </div><div class='hunk'>@@ -715,7 +669,7 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,</div><div class='ctx'> 	if (!link)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	dentry = start_creating(name, parent);</div><div class='add'>+	dentry = debugfs_start_creating(name, parent);</div><div class='ctx'> 	if (IS_ERR(dentry)) {</div><div class='ctx'> 		kfree(link);</div><div class='ctx'> 		return dentry;</div><div class='hunk'>@@ -726,13 +680,13 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,</div><div class='ctx'> 		pr_err("out of free dentries, can not create symlink '%s'\n",</div><div class='ctx'> 		       name);</div><div class='ctx'> 		kfree(link);</div><div class='del'>-		return failed_creating(dentry);</div><div class='add'>+		return debugfs_failed_creating(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode-&gt;i_mode = S_IFLNK | S_IRWXUGO;</div><div class='ctx'> 	inode-&gt;i_op = &amp;debugfs_symlink_inode_operations;</div><div class='ctx'> 	inode-&gt;i_link = link;</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	return end_creating(dentry);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+	return debugfs_end_creating(dentry);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(debugfs_create_symlink);</div><div class='ctx'> </div><div class='hunk'>@@ -748,16 +702,31 @@ static void __debugfs_file_removed(struct dentry *dentry)</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	fsd = READ_ONCE(dentry-&gt;d_fsdata);</div><div class='del'>-	if ((unsigned long)fsd &amp; DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)</div><div class='add'>+	if (!fsd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* if we hit zero, just wait for all to finish */</div><div class='del'>-	if (!refcount_dec_and_test(&amp;fsd-&gt;active_users)) {</div><div class='del'>-		wait_for_completion(&amp;fsd-&gt;active_users_drained);</div><div class='add'>+	/* if this was the last reference, we're done */</div><div class='add'>+	if (refcount_dec_and_test(&amp;fsd-&gt;active_users))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* if we didn't hit zero, try to cancel any we can */</div><div class='add'>+	/*</div><div class='add'>+	 * If there's still a reference, the code that obtained it can</div><div class='add'>+	 * be in different states:</div><div class='add'>+	 *  - The common case of not using cancellations, or already</div><div class='add'>+	 *    after debugfs_leave_cancellation(), where we just need</div><div class='add'>+	 *    to wait for debugfs_file_put() which signals the completion;</div><div class='add'>+	 *  - inside a cancellation section, i.e. between</div><div class='add'>+	 *    debugfs_enter_cancellation() and debugfs_leave_cancellation(),</div><div class='add'>+	 *    in which case we need to trigger the -&gt;cancel() function,</div><div class='add'>+	 *    and then wait for debugfs_file_put() just like in the</div><div class='add'>+	 *    previous case;</div><div class='add'>+	 *  - before debugfs_enter_cancellation() (but obviously after</div><div class='add'>+	 *    debugfs_file_get()), in which case we may not see the</div><div class='add'>+	 *    cancellation in the list on the first round of the loop,</div><div class='add'>+	 *    but debugfs_enter_cancellation() signals the completion</div><div class='add'>+	 *    after adding it, so this code gets woken up to call the</div><div class='add'>+	 *    -&gt;cancel() function.</div><div class='add'>+	 */</div><div class='ctx'> 	while (refcount_read(&amp;fsd-&gt;active_users)) {</div><div class='ctx'> 		struct debugfs_cancellation *c;</div><div class='ctx'> </div><div class='hunk'>@@ -837,76 +806,66 @@ void debugfs_lookup_and_remove(const char *name, struct dentry *parent)</div><div class='ctx'> EXPORT_SYMBOL_GPL(debugfs_lookup_and_remove);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * debugfs_rename - rename a file/directory in the debugfs filesystem</div><div class='del'>- * @old_dir: a pointer to the parent dentry for the renamed object. This</div><div class='del'>- *          should be a directory dentry.</div><div class='del'>- * @old_dentry: dentry of an object to be renamed.</div><div class='del'>- * @new_dir: a pointer to the parent dentry where the object should be</div><div class='del'>- *          moved. This should be a directory dentry.</div><div class='del'>- * @new_name: a pointer to a string containing the target name.</div><div class='add'>+ * debugfs_change_name - rename a file/directory in the debugfs filesystem</div><div class='add'>+ * @dentry: dentry of an object to be renamed.</div><div class='add'>+ * @fmt: format for new name</div><div class='ctx'>  *</div><div class='ctx'>  * This function renames a file/directory in debugfs.  The target must not</div><div class='ctx'>  * exist for rename to succeed.</div><div class='ctx'>  *</div><div class='del'>- * This function will return a pointer to old_dentry (which is updated to</div><div class='del'>- * reflect renaming) if it succeeds. If an error occurs, ERR_PTR(-ERROR)</div><div class='del'>- * will be returned.</div><div class='add'>+ * This function will return 0 on success and -E... on failure.</div><div class='ctx'>  *</div><div class='ctx'>  * If debugfs is not enabled in the kernel, the value -%ENODEV will be</div><div class='ctx'>  * returned.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,</div><div class='del'>-		struct dentry *new_dir, const char *new_name)</div><div class='add'>+int __printf(2, 3) debugfs_change_name(struct dentry *dentry, const char *fmt, ...)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='del'>-	struct dentry *dentry = NULL, *trap;</div><div class='add'>+	int error = 0;</div><div class='add'>+	const char *new_name;</div><div class='ctx'> 	struct name_snapshot old_name;</div><div class='add'>+	struct dentry *target;</div><div class='add'>+	struct renamedata rd = {};</div><div class='add'>+	struct inode *dir;</div><div class='add'>+	va_list ap;</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(old_dir))</div><div class='del'>-		return old_dir;</div><div class='del'>-	if (IS_ERR(new_dir))</div><div class='del'>-		return new_dir;</div><div class='del'>-	if (IS_ERR_OR_NULL(old_dentry))</div><div class='del'>-		return old_dentry;</div><div class='del'>-</div><div class='del'>-	trap = lock_rename(new_dir, old_dir);</div><div class='del'>-	/* Source or destination directories don't exist? */</div><div class='del'>-	if (d_really_is_negative(old_dir) || d_really_is_negative(new_dir))</div><div class='del'>-		goto exit;</div><div class='del'>-	/* Source does not exist, cyclic rename, or mountpoint? */</div><div class='del'>-	if (d_really_is_negative(old_dentry) || old_dentry == trap ||</div><div class='del'>-	    d_mountpoint(old_dentry))</div><div class='del'>-		goto exit;</div><div class='del'>-	dentry = lookup_one_len(new_name, new_dir, strlen(new_name));</div><div class='del'>-	/* Lookup failed, cyclic rename or target exists? */</div><div class='del'>-	if (IS_ERR(dentry) || dentry == trap || d_really_is_positive(dentry))</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	take_dentry_name_snapshot(&amp;old_name, old_dentry);</div><div class='del'>-</div><div class='del'>-	error = simple_rename(&amp;nop_mnt_idmap, d_inode(old_dir), old_dentry,</div><div class='del'>-			      d_inode(new_dir), dentry, 0);</div><div class='add'>+	if (IS_ERR_OR_NULL(dentry))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	new_name = kvasprintf_const(GFP_KERNEL, fmt, ap);</div><div class='add'>+	va_end(ap);</div><div class='add'>+	if (!new_name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rd.old_parent = dget_parent(dentry);</div><div class='add'>+	rd.new_parent = rd.old_parent;</div><div class='add'>+	rd.flags = RENAME_NOREPLACE;</div><div class='add'>+	target = lookup_noperm_unlocked(&amp;QSTR(new_name), rd.new_parent);</div><div class='add'>+	if (IS_ERR(target))</div><div class='add'>+		return PTR_ERR(target);</div><div class='add'>+</div><div class='add'>+	error = start_renaming_two_dentries(&amp;rd, dentry, target);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		release_dentry_name_snapshot(&amp;old_name);</div><div class='del'>-		goto exit;</div><div class='add'>+		if (error == -EEXIST &amp;&amp; target == dentry)</div><div class='add'>+			/* it isn't an error to rename a thing to itself */</div><div class='add'>+			error = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	d_move(old_dentry, dentry);</div><div class='del'>-	fsnotify_move(d_inode(old_dir), d_inode(new_dir), &amp;old_name.name,</div><div class='del'>-		d_is_dir(old_dentry),</div><div class='del'>-		NULL, old_dentry);</div><div class='add'>+</div><div class='add'>+	dir = d_inode(rd.old_parent);</div><div class='add'>+	take_dentry_name_snapshot(&amp;old_name, dentry);</div><div class='add'>+	simple_rename_timestamp(dir, dentry, dir, rd.new_dentry);</div><div class='add'>+	d_move(dentry, rd.new_dentry);</div><div class='add'>+	fsnotify_move(dir, dir, &amp;old_name.name, d_is_dir(dentry), NULL, dentry);</div><div class='ctx'> 	release_dentry_name_snapshot(&amp;old_name);</div><div class='del'>-	unlock_rename(new_dir, old_dir);</div><div class='del'>-	dput(dentry);</div><div class='del'>-	return old_dentry;</div><div class='del'>-exit:</div><div class='del'>-	if (dentry &amp;&amp; !IS_ERR(dentry))</div><div class='del'>-		dput(dentry);</div><div class='del'>-	unlock_rename(new_dir, old_dir);</div><div class='del'>-	if (IS_ERR(dentry))</div><div class='del'>-		return dentry;</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='add'>+out:</div><div class='add'>+	dput(rd.old_parent);</div><div class='add'>+	dput(target);</div><div class='add'>+	kfree_const(new_name);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(debugfs_rename);</div><div class='add'>+EXPORT_SYMBOL_GPL(debugfs_change_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * debugfs_initialized - Tells whether debugfs has been registered</div><div class='hunk'>@@ -921,33 +880,47 @@ static int __init debugfs_kernel(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	if (str) {</div><div class='ctx'> 		if (!strcmp(str, "on"))</div><div class='del'>-			debugfs_allow = DEBUGFS_ALLOW_API | DEBUGFS_ALLOW_MOUNT;</div><div class='del'>-		else if (!strcmp(str, "no-mount"))</div><div class='del'>-			debugfs_allow = DEBUGFS_ALLOW_API;</div><div class='add'>+			debugfs_enabled = true;</div><div class='ctx'> 		else if (!strcmp(str, "off"))</div><div class='del'>-			debugfs_allow = 0;</div><div class='add'>+			debugfs_enabled = false;</div><div class='add'>+		else if (!strcmp(str, "no-mount")) {</div><div class='add'>+			pr_notice("debugfs=no-mount is a deprecated alias "</div><div class='add'>+				  "for debugfs=off\n");</div><div class='add'>+			debugfs_enabled = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> early_param("debugfs", debugfs_kernel);</div><div class='add'>+</div><div class='ctx'> static int __init debugfs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (!(debugfs_allow &amp; DEBUGFS_ALLOW_MOUNT))</div><div class='add'>+	if (!debugfs_enabled)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	retval = sysfs_create_mount_point(kernel_kobj, "debug");</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	retval = register_filesystem(&amp;debug_fs_type);</div><div class='del'>-	if (retval)</div><div class='add'>+	debugfs_inode_cachep = kmem_cache_create("debugfs_inode_cache",</div><div class='add'>+				sizeof(struct debugfs_inode_info), 0,</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='add'>+				init_once);</div><div class='add'>+	if (debugfs_inode_cachep == NULL) {</div><div class='ctx'> 		sysfs_remove_mount_point(kernel_kobj, "debug");</div><div class='del'>-	else</div><div class='del'>-		debugfs_registered = true;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return retval;</div><div class='add'>+	retval = register_filesystem(&amp;debug_fs_type);</div><div class='add'>+	if (retval) { // Really not going to happen</div><div class='add'>+		sysfs_remove_mount_point(kernel_kobj, "debug");</div><div class='add'>+		kmem_cache_destroy(debugfs_inode_cachep);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+	debugfs_registered = true;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> core_initcall(debugfs_init);</div><div class='head'>diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h<br/>index dae80c2a469e..c95699b27a56 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/debugfs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/debugfs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/debugfs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/debugfs/internal.h</a></div><div class='hunk'>@@ -11,47 +11,48 @@</div><div class='ctx'> </div><div class='ctx'> struct file_operations;</div><div class='ctx'> </div><div class='add'>+struct debugfs_inode_info {</div><div class='add'>+	struct inode vfs_inode;</div><div class='add'>+	union {</div><div class='add'>+		const void *raw;</div><div class='add'>+		const struct file_operations *real_fops;</div><div class='add'>+		const struct debugfs_short_fops *short_fops;</div><div class='add'>+		debugfs_automount_t automount;</div><div class='add'>+	};</div><div class='add'>+	void *aux;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct debugfs_inode_info *DEBUGFS_I(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return container_of(inode, struct debugfs_inode_info, vfs_inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* declared over in file.c */</div><div class='ctx'> extern const struct file_operations debugfs_noop_file_operations;</div><div class='ctx'> extern const struct file_operations debugfs_open_proxy_file_operations;</div><div class='ctx'> extern const struct file_operations debugfs_full_proxy_file_operations;</div><div class='add'>+extern const struct file_operations debugfs_full_short_proxy_file_operations;</div><div class='ctx'> </div><div class='ctx'> struct debugfs_fsdata {</div><div class='ctx'> 	const struct file_operations *real_fops;</div><div class='del'>-	union {</div><div class='del'>-		/* automount_fn is used when real_fops is NULL */</div><div class='del'>-		debugfs_automount_t automount;</div><div class='del'>-		struct {</div><div class='del'>-			refcount_t active_users;</div><div class='del'>-			struct completion active_users_drained;</div><div class='del'>-</div><div class='del'>-			/* protect cancellations */</div><div class='del'>-			struct mutex cancellations_mtx;</div><div class='del'>-			struct list_head cancellations;</div><div class='del'>-		};</div><div class='add'>+	const struct debugfs_short_fops *short_fops;</div><div class='add'>+	struct {</div><div class='add'>+		refcount_t active_users;</div><div class='add'>+		struct completion active_users_drained;</div><div class='add'>+</div><div class='add'>+		/* protect cancellations */</div><div class='add'>+		struct mutex cancellations_mtx;</div><div class='add'>+		struct list_head cancellations;</div><div class='add'>+		unsigned int methods;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A dentry's -&gt;d_fsdata either points to the real fops or to a</div><div class='del'>- * dynamically allocated debugfs_fsdata instance.</div><div class='del'>- * In order to distinguish between these two cases, a real fops</div><div class='del'>- * pointer gets its lowest bit set.</div><div class='del'>- */</div><div class='del'>-#define DEBUGFS_FSDATA_IS_REAL_FOPS_BIT BIT(0)</div><div class='del'>-</div><div class='del'>-/* Access BITS */</div><div class='del'>-#define DEBUGFS_ALLOW_API	BIT(0)</div><div class='del'>-#define DEBUGFS_ALLOW_MOUNT	BIT(1)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS_ALLOW_ALL</div><div class='del'>-#define DEFAULT_DEBUGFS_ALLOW_BITS (DEBUGFS_ALLOW_MOUNT | DEBUGFS_ALLOW_API)</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_DEBUG_FS_DISALLOW_MOUNT</div><div class='del'>-#define DEFAULT_DEBUGFS_ALLOW_BITS (DEBUGFS_ALLOW_API)</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_DEBUG_FS_ALLOW_NONE</div><div class='del'>-#define DEFAULT_DEBUGFS_ALLOW_BITS (0)</div><div class='del'>-#endif</div><div class='add'>+enum {</div><div class='add'>+	HAS_READ = 1,</div><div class='add'>+	HAS_WRITE = 2,</div><div class='add'>+	HAS_LSEEK = 4,</div><div class='add'>+	HAS_POLL = 8,</div><div class='add'>+	HAS_IOCTL = 16</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #endif /* _DEBUGFS_INTERNAL_H_ */</div><div class='head'>diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c<br/>index b20e565b9c5e..9f3de528c358 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/devpts/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/devpts/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/devpts/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/devpts/inode.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -21,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/devpts_fs.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +46,7 @@ static int pty_limit_min;</div><div class='ctx'> static int pty_limit_max = INT_MAX;</div><div class='ctx'> static atomic_t pty_count = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='del'>-static struct ctl_table pty_table[] = {</div><div class='add'>+static const struct ctl_table pty_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "max",</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='hunk'>@@ -87,21 +88,21 @@ enum {</div><div class='ctx'> 	Opt_err</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_mode, "mode=%o"},</div><div class='del'>-	{Opt_ptmxmode, "ptmxmode=%o"},</div><div class='del'>-	{Opt_newinstance, "newinstance"},</div><div class='del'>-	{Opt_max, "max=%d"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct fs_parameter_spec devpts_param_specs[] = {</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_s32	("max",		Opt_max),</div><div class='add'>+	fsparam_u32oct	("mode",	Opt_mode),</div><div class='add'>+	fsparam_flag	("newinstance",	Opt_newinstance),</div><div class='add'>+	fsparam_u32oct	("ptmxmode",	Opt_ptmxmode),</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pts_fs_info {</div><div class='ctx'> 	struct ida allocated_ptys;</div><div class='ctx'> 	struct pts_mount_opts mount_opts;</div><div class='ctx'> 	struct super_block *sb;</div><div class='del'>-	struct dentry *ptmx_dentry;</div><div class='add'>+	struct inode *ptmx_inode; // borrowed</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct pts_fs_info *DEVPTS_SB(struct super_block *sb)</div><div class='hunk'>@@ -214,96 +215,50 @@ void devpts_release(struct pts_fs_info *fsi)</div><div class='ctx'> 	deactivate_super(fsi-&gt;sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PARSE_MOUNT	0</div><div class='del'>-#define PARSE_REMOUNT	1</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * parse_mount_options():</div><div class='del'>- *	Set @opts to mount options specified in @data. If an option is not</div><div class='del'>- *	specified in @data, set it to its default value.</div><div class='del'>- *</div><div class='del'>- * Note: @data may be NULL (in which case all options are set to default).</div><div class='add'>+ * devpts_parse_param - Parse mount parameters</div><div class='ctx'>  */</div><div class='del'>-static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)</div><div class='add'>+static int devpts_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-</div><div class='del'>-	opts-&gt;setuid  = 0;</div><div class='del'>-	opts-&gt;setgid  = 0;</div><div class='del'>-	opts-&gt;uid     = GLOBAL_ROOT_UID;</div><div class='del'>-	opts-&gt;gid     = GLOBAL_ROOT_GID;</div><div class='del'>-	opts-&gt;mode    = DEVPTS_DEFAULT_MODE;</div><div class='del'>-	opts-&gt;ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;</div><div class='del'>-	opts-&gt;max     = NR_UNIX98_PTY_MAX;</div><div class='del'>-</div><div class='del'>-	/* Only allow instances mounted from the initial mount</div><div class='del'>-	 * namespace to tap the reserve pool of ptys.</div><div class='del'>-	 */</div><div class='del'>-	if (op == PARSE_MOUNT)</div><div class='del'>-		opts-&gt;reserve =</div><div class='del'>-			(current-&gt;nsproxy-&gt;mnt_ns == init_task.nsproxy-&gt;mnt_ns);</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;data, ",")) != NULL) {</div><div class='del'>-		substring_t args[MAX_OPT_ARGS];</div><div class='del'>-		int token;</div><div class='del'>-		int option;</div><div class='del'>-</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(uid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;uid = uid;</div><div class='del'>-			opts-&gt;setuid = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(gid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;gid = gid;</div><div class='del'>-			opts-&gt;setgid = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_mode:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;mode = option &amp; S_IALLUGO;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ptmxmode:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;ptmxmode = option &amp; S_IALLUGO;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_newinstance:</div><div class='del'>-			break;</div><div class='del'>-		case Opt_max:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option) ||</div><div class='del'>-			    option &lt; 0 || option &gt; NR_UNIX98_PTY_MAX)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;max = option;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_err("called with bogus options\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	struct pts_fs_info *fsi = fc-&gt;s_fs_info;</div><div class='add'>+	struct pts_mount_opts *opts = &amp;fsi-&gt;mount_opts;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, devpts_param_specs, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		opts-&gt;uid = result.uid;</div><div class='add'>+		opts-&gt;setuid = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		opts-&gt;gid = result.gid;</div><div class='add'>+		opts-&gt;setgid = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mode:</div><div class='add'>+		opts-&gt;mode = result.uint_32 &amp; S_IALLUGO;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ptmxmode:</div><div class='add'>+		opts-&gt;ptmxmode = result.uint_32 &amp; S_IALLUGO;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_newinstance:</div><div class='add'>+		break;</div><div class='add'>+	case Opt_max:</div><div class='add'>+		if (result.uint_32 &gt; NR_UNIX98_PTY_MAX)</div><div class='add'>+			return invalf(fc, "max out of range");</div><div class='add'>+		opts-&gt;max = result.uint_32;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mknod_ptmx(struct super_block *sb)</div><div class='add'>+static int mknod_ptmx(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	int mode;</div><div class='del'>-	int rc = -ENOMEM;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct dentry *root = sb-&gt;s_root;</div><div class='hunk'>@@ -312,18 +267,10 @@ static int mknod_ptmx(struct super_block *sb)</div><div class='ctx'> 	kuid_t ptmx_uid = current_fsuid();</div><div class='ctx'> 	kgid_t ptmx_gid = current_fsgid();</div><div class='ctx'> </div><div class='del'>-	inode_lock(d_inode(root));</div><div class='del'>-</div><div class='del'>-	/* If we have already created ptmx node, return */</div><div class='del'>-	if (fsi-&gt;ptmx_dentry) {</div><div class='del'>-		rc = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dentry = d_alloc_name(root, "ptmx");</div><div class='del'>-	if (!dentry) {</div><div class='add'>+	dentry = simple_start_creating(root, "ptmx");</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='ctx'> 		pr_err("Unable to alloc dentry for ptmx node\n");</div><div class='del'>-		goto out;</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -331,9 +278,9 @@ static int mknod_ptmx(struct super_block *sb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	inode = new_inode(sb);</div><div class='ctx'> 	if (!inode) {</div><div class='add'>+		simple_done_creating(dentry);</div><div class='ctx'> 		pr_err("Unable to alloc inode for ptmx node\n");</div><div class='del'>-		dput(dentry);</div><div class='del'>-		goto out;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_ino = 2;</div><div class='hunk'>@@ -343,32 +290,37 @@ static int mknod_ptmx(struct super_block *sb)</div><div class='ctx'> 	init_special_inode(inode, mode, MKDEV(TTYAUX_MAJOR, 2));</div><div class='ctx'> 	inode-&gt;i_uid = ptmx_uid;</div><div class='ctx'> 	inode-&gt;i_gid = ptmx_gid;</div><div class='add'>+	fsi-&gt;ptmx_inode = inode;</div><div class='ctx'> </div><div class='del'>-	d_add(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> </div><div class='del'>-	fsi-&gt;ptmx_dentry = dentry;</div><div class='del'>-	rc = 0;</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(d_inode(root));</div><div class='del'>-	return rc;</div><div class='add'>+	simple_done_creating(dentry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void update_ptmx_mode(struct pts_fs_info *fsi)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	if (fsi-&gt;ptmx_dentry) {</div><div class='del'>-		inode = d_inode(fsi-&gt;ptmx_dentry);</div><div class='del'>-		inode-&gt;i_mode = S_IFCHR|fsi-&gt;mount_opts.ptmxmode;</div><div class='del'>-	}</div><div class='add'>+	fsi-&gt;ptmx_inode-&gt;i_mode = S_IFCHR|fsi-&gt;mount_opts.ptmxmode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int devpts_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int devpts_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct pts_fs_info *fsi = DEVPTS_SB(sb);</div><div class='del'>-	struct pts_mount_opts *opts = &amp;fsi-&gt;mount_opts;</div><div class='add'>+	struct pts_fs_info *fsi = DEVPTS_SB(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	struct pts_fs_info *new = fc-&gt;s_fs_info;</div><div class='ctx'> </div><div class='del'>-	err = parse_mount_options(data, PARSE_REMOUNT, opts);</div><div class='add'>+	/* Apply the revised options.  We don't want to change -&gt;reserve.</div><div class='add'>+	 * Ideally, we'd update each option conditionally on it having been</div><div class='add'>+	 * explicitly changed, but the default is to reset everything so that</div><div class='add'>+	 * would break UAPI...</div><div class='add'>+	 */</div><div class='add'>+	fsi-&gt;mount_opts.setuid		= new-&gt;mount_opts.setuid;</div><div class='add'>+	fsi-&gt;mount_opts.setgid		= new-&gt;mount_opts.setgid;</div><div class='add'>+	fsi-&gt;mount_opts.uid		= new-&gt;mount_opts.uid;</div><div class='add'>+	fsi-&gt;mount_opts.gid		= new-&gt;mount_opts.gid;</div><div class='add'>+	fsi-&gt;mount_opts.mode		= new-&gt;mount_opts.mode;</div><div class='add'>+	fsi-&gt;mount_opts.ptmxmode	= new-&gt;mount_opts.ptmxmode;</div><div class='add'>+	fsi-&gt;mount_opts.max		= new-&gt;mount_opts.max;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * parse_mount_options() restores options to default values</div><div class='hunk'>@@ -378,7 +330,7 @@ static int devpts_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	 */</div><div class='ctx'> 	update_ptmx_mode(fsi);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int devpts_show_options(struct seq_file *seq, struct dentry *root)</div><div class='hunk'>@@ -402,53 +354,26 @@ static int devpts_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations devpts_sops = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='del'>-	.remount_fs	= devpts_remount,</div><div class='ctx'> 	.show_options	= devpts_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void *new_pts_fs_info(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct pts_fs_info *fsi;</div><div class='del'>-</div><div class='del'>-	fsi = kzalloc(sizeof(struct pts_fs_info), GFP_KERNEL);</div><div class='del'>-	if (!fsi)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ida_init(&amp;fsi-&gt;allocated_ptys);</div><div class='del'>-	fsi-&gt;mount_opts.mode = DEVPTS_DEFAULT_MODE;</div><div class='del'>-	fsi-&gt;mount_opts.ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;</div><div class='del'>-	fsi-&gt;sb = sb;</div><div class='del'>-</div><div class='del'>-	return fsi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-devpts_fill_super(struct super_block *s, void *data, int silent)</div><div class='add'>+static int devpts_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct pts_fs_info *fsi = DEVPTS_SB(s);</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	int error;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;s_iflags &amp;= ~SB_I_NODEV;</div><div class='ctx'> 	s-&gt;s_blocksize = 1024;</div><div class='ctx'> 	s-&gt;s_blocksize_bits = 10;</div><div class='ctx'> 	s-&gt;s_magic = DEVPTS_SUPER_MAGIC;</div><div class='ctx'> 	s-&gt;s_op = &amp;devpts_sops;</div><div class='del'>-	s-&gt;s_d_op = &amp;simple_dentry_operations;</div><div class='add'>+	s-&gt;s_d_flags = DCACHE_DONTCACHE;</div><div class='ctx'> 	s-&gt;s_time_gran = 1;</div><div class='add'>+	fsi-&gt;sb = s;</div><div class='ctx'> </div><div class='del'>-	error = -ENOMEM;</div><div class='del'>-	s-&gt;s_fs_info = new_pts_fs_info(s);</div><div class='del'>-	if (!s-&gt;s_fs_info)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	error = parse_mount_options(data, PARSE_MOUNT, &amp;DEVPTS_SB(s)-&gt;mount_opts);</div><div class='del'>-	if (error)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	error = -ENOMEM;</div><div class='ctx'> 	inode = new_inode(s);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	inode-&gt;i_ino = 1;</div><div class='ctx'> 	simple_inode_init_ts(inode);</div><div class='ctx'> 	inode-&gt;i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;</div><div class='hunk'>@@ -459,31 +384,60 @@ devpts_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	s-&gt;s_root = d_make_root(inode);</div><div class='ctx'> 	if (!s-&gt;s_root) {</div><div class='ctx'> 		pr_err("get root dentry failed\n");</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = mknod_ptmx(s);</div><div class='del'>-	if (error)</div><div class='del'>-		goto fail_dput;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-fail_dput:</div><div class='del'>-	dput(s-&gt;s_root);</div><div class='del'>-	s-&gt;s_root = NULL;</div><div class='del'>-fail:</div><div class='del'>-	return error;</div><div class='add'>+	return mknod_ptmx(s, fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * devpts_mount()</div><div class='add'>+ * devpts_get_tree()</div><div class='ctx'>  *</div><div class='ctx'>  *     Mount a new (private) instance of devpts.  PTYs created in this</div><div class='ctx'>  *     instance are independent of the PTYs in other devpts instances.</div><div class='ctx'>  */</div><div class='del'>-static struct dentry *devpts_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int devpts_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_nodev(fc, devpts_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void devpts_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;s_fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations devpts_context_ops = {</div><div class='add'>+	.free		= devpts_free_fc,</div><div class='add'>+	.parse_param	= devpts_parse_param,</div><div class='add'>+	.get_tree	= devpts_get_tree,</div><div class='add'>+	.reconfigure	= devpts_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up the filesystem mount context.</div><div class='add'>+ */</div><div class='add'>+static int devpts_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_nodev(fs_type, flags, data, devpts_fill_super);</div><div class='add'>+	struct pts_fs_info *fsi;</div><div class='add'>+</div><div class='add'>+	fsi = kzalloc(sizeof(struct pts_fs_info), GFP_KERNEL);</div><div class='add'>+	if (!fsi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ida_init(&amp;fsi-&gt;allocated_ptys);</div><div class='add'>+	fsi-&gt;mount_opts.uid     = GLOBAL_ROOT_UID;</div><div class='add'>+	fsi-&gt;mount_opts.gid     = GLOBAL_ROOT_GID;</div><div class='add'>+	fsi-&gt;mount_opts.mode    = DEVPTS_DEFAULT_MODE;</div><div class='add'>+	fsi-&gt;mount_opts.ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;</div><div class='add'>+	fsi-&gt;mount_opts.max     = NR_UNIX98_PTY_MAX;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_MOUNT &amp;&amp;</div><div class='add'>+	    current-&gt;nsproxy-&gt;mnt_ns == init_task.nsproxy-&gt;mnt_ns)</div><div class='add'>+		fsi-&gt;mount_opts.reserve = true;</div><div class='add'>+</div><div class='add'>+	fc-&gt;s_fs_info = fsi;</div><div class='add'>+	fc-&gt;ops = &amp;devpts_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void devpts_kill_sb(struct super_block *sb)</div><div class='hunk'>@@ -493,12 +447,13 @@ static void devpts_kill_sb(struct super_block *sb)</div><div class='ctx'> 	if (fsi)</div><div class='ctx'> 		ida_destroy(&amp;fsi-&gt;allocated_ptys);</div><div class='ctx'> 	kfree(fsi);</div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type devpts_fs_type = {</div><div class='ctx'> 	.name		= "devpts",</div><div class='del'>-	.mount		= devpts_mount,</div><div class='add'>+	.init_fs_context = devpts_init_fs_context,</div><div class='add'>+	.parameters	= devpts_param_specs,</div><div class='ctx'> 	.kill_sb	= devpts_kill_sb,</div><div class='ctx'> 	.fs_flags	= FS_USERNS_MOUNT,</div><div class='ctx'> };</div><div class='hunk'>@@ -565,16 +520,15 @@ struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)</div><div class='ctx'> 	sprintf(s, "%d", index);</div><div class='ctx'> </div><div class='ctx'> 	dentry = d_alloc_name(root, s);</div><div class='del'>-	if (dentry) {</div><div class='del'>-		dentry-&gt;d_fsdata = priv;</div><div class='del'>-		d_add(dentry, inode);</div><div class='del'>-		fsnotify_create(d_inode(root), dentry);</div><div class='del'>-	} else {</div><div class='add'>+	if (!dentry) {</div><div class='ctx'> 		iput(inode);</div><div class='del'>-		dentry = ERR_PTR(-ENOMEM);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return dentry;</div><div class='add'>+	dentry-&gt;d_fsdata = priv;</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+	fsnotify_create(d_inode(root), dentry);</div><div class='add'>+	dput(dentry);</div><div class='add'>+	return dentry; // borrowed</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -604,7 +558,7 @@ void devpts_pty_kill(struct dentry *dentry)</div><div class='ctx'> 	drop_nlink(dentry-&gt;d_inode);</div><div class='ctx'> 	d_drop(dentry);</div><div class='ctx'> 	fsnotify_unlink(d_inode(dentry-&gt;d_parent), dentry);</div><div class='del'>-	dput(dentry);	/* d_alloc_name() in devpts_pty_new() */</div><div class='add'>+	d_make_discardable(dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init init_devpts_fs(void)</div><div class='head'>diff --git a/fs/direct-io.c b/fs/direct-io.c<br/>index 60456263a338..2267f5ae7f77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/direct-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/direct-io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/direct-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/direct-io.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/prefetch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +409,8 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,</div><div class='ctx'> 		bio-&gt;bi_end_io = dio_bio_end_io;</div><div class='ctx'> 	if (dio-&gt;is_pinned)</div><div class='ctx'> 		bio_set_flag(bio, BIO_PAGE_PINNED);</div><div class='add'>+	bio-&gt;bi_write_hint = file_inode(dio-&gt;iocb-&gt;ki_filp)-&gt;i_write_hint;</div><div class='add'>+</div><div class='ctx'> 	sdio-&gt;bio = bio;</div><div class='ctx'> 	sdio-&gt;logical_offset_in_bio = sdio-&gt;cur_page_fs_offset;</div><div class='ctx'> }</div><div class='hunk'>@@ -995,7 +996,7 @@ do_holes:</div><div class='ctx'> 					dio_unpin_page(dio, page);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				zero_user(page, from, 1 &lt;&lt; blkbits);</div><div class='add'>+				memzero_page(page, from, 1 &lt;&lt; blkbits);</div><div class='ctx'> 				sdio-&gt;block_in_file++;</div><div class='ctx'> 				from += 1 &lt;&lt; blkbits;</div><div class='ctx'> 				dio-&gt;result += 1 &lt;&lt; blkbits;</div><div class='hunk'>@@ -1082,8 +1083,8 @@ static inline int drop_refcount(struct dio *dio)</div><div class='ctx'>  * The locking rules are governed by the flags parameter:</div><div class='ctx'>  *  - if the flags value contains DIO_LOCKING we use a fancy locking</div><div class='ctx'>  *    scheme for dumb filesystems.</div><div class='del'>- *    For writes this function is called under i_mutex and returns with</div><div class='del'>- *    i_mutex held, for reads, i_mutex is not held on entry, but it is</div><div class='add'>+ *    For writes this function is called under i_rwsem and returns with</div><div class='add'>+ *    i_rwsem held, for reads, i_rwsem is not held on entry, but it is</div><div class='ctx'>  *    taken and dropped again before returning.</div><div class='ctx'>  *  - if the flags value does NOT contain DIO_LOCKING we don't use any</div><div class='ctx'>  *    internal locking but rather rely on the filesystem to synchronize</div><div class='hunk'>@@ -1093,7 +1094,7 @@ static inline int drop_refcount(struct dio *dio)</div><div class='ctx'>  * counter before starting direct I/O, and decrement it once we are done.</div><div class='ctx'>  * Truncate can wait for it to reach zero to provide exclusion.  It is</div><div class='ctx'>  * expected that filesystem provide exclusion between new direct I/O</div><div class='del'>- * and truncates.  For DIO_LOCKING filesystems this is done by i_mutex,</div><div class='add'>+ * and truncates.  For DIO_LOCKING filesystems this is done by i_rwsem,</div><div class='ctx'>  * but other filesystems need to take care of this on their own.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: if you pass "sdio" to anything by pointer make sure that function</div><div class='hunk'>@@ -1119,11 +1120,6 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 	struct blk_plug plug;</div><div class='ctx'> 	unsigned long align = offset | iov_iter_alignment(iter);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Avoid references to bdev if not absolutely needed to give</div><div class='del'>-	 * the early prefetch in the caller enough time.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='ctx'> 	/* watch out for a 0 len io from a tricksy fs */</div><div class='ctx'> 	if (iov_iter_rw(iter) == READ &amp;&amp; !count)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1215,7 +1211,6 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	inode_dio_begin(inode);</div><div class='ctx'> </div><div class='del'>-	retval = 0;</div><div class='ctx'> 	sdio.blkbits = blkbits;</div><div class='ctx'> 	sdio.blkfactor = i_blkbits - blkbits;</div><div class='ctx'> 	sdio.block_in_file = offset &gt;&gt; blkbits;</div><div class='hunk'>@@ -1284,7 +1279,7 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All block lookups have been performed. For READ requests</div><div class='del'>-	 * we can let i_mutex go now that its achieved its purpose</div><div class='add'>+	 * we can let i_rwsem go now that its achieved its purpose</div><div class='ctx'> 	 * of protecting us from looking up uninitialized blocks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (iov_iter_rw(iter) == READ &amp;&amp; (dio-&gt;flags &amp; DIO_LOCKING))</div><div class='head'>diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig<br/>index f82a4952769d..b46165df5a91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,6 @@ menuconfig DLM</div><div class='ctx'> 	tristate "Distributed Lock Manager (DLM)"</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	depends on SYSFS &amp;&amp; CONFIGFS_FS &amp;&amp; (IPV6 || IPV6=n)</div><div class='del'>-	select IP_SCTP</div><div class='ctx'> 	help</div><div class='ctx'> 	A general purpose distributed lock manager for kernel or userspace</div><div class='ctx'> 	applications.</div><div class='head'>diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c<br/>index 1f2f70a1b824..0fe8d80ce5e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/ast.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/ast.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/ast.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/ast.c</a></div><div class='hunk'>@@ -12,48 +12,68 @@</div><div class='ctx'> #include &lt;trace/events/dlm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "dlm_internal.h"</div><div class='add'>+#include "lvb_table.h"</div><div class='ctx'> #include "memory.h"</div><div class='ctx'> #include "lock.h"</div><div class='ctx'> #include "user.h"</div><div class='ctx'> #include "ast.h"</div><div class='ctx'> </div><div class='del'>-void dlm_release_callback(struct kref *ref)</div><div class='add'>+static void dlm_run_callback(uint32_t ls_id, uint32_t lkb_id, int8_t mode,</div><div class='add'>+			     uint32_t flags, uint8_t sb_flags, int sb_status,</div><div class='add'>+			     struct dlm_lksb *lksb,</div><div class='add'>+			     void (*astfn)(void *astparam),</div><div class='add'>+			     void (*bastfn)(void *astparam, int mode),</div><div class='add'>+			     void *astparam, const char *res_name,</div><div class='add'>+			     size_t res_length)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_callback *cb = container_of(ref, struct dlm_callback, ref);</div><div class='add'>+	if (flags &amp; DLM_CB_BAST) {</div><div class='add'>+		trace_dlm_bast(ls_id, lkb_id, mode, res_name, res_length);</div><div class='add'>+		bastfn(astparam, mode);</div><div class='add'>+	} else if (flags &amp; DLM_CB_CAST) {</div><div class='add'>+		trace_dlm_ast(ls_id, lkb_id, sb_flags, sb_status, res_name,</div><div class='add'>+			      res_length);</div><div class='add'>+		lksb-&gt;sb_status = sb_status;</div><div class='add'>+		lksb-&gt;sb_flags = sb_flags;</div><div class='add'>+		astfn(astparam);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void dlm_do_callback(struct dlm_callback *cb)</div><div class='add'>+{</div><div class='add'>+	dlm_run_callback(cb-&gt;ls_id, cb-&gt;lkb_id, cb-&gt;mode, cb-&gt;flags,</div><div class='add'>+			 cb-&gt;sb_flags, cb-&gt;sb_status, cb-&gt;lkb_lksb,</div><div class='add'>+			 cb-&gt;astfn, cb-&gt;bastfn, cb-&gt;astparam,</div><div class='add'>+			 cb-&gt;res_name, cb-&gt;res_length);</div><div class='ctx'> 	dlm_free_cb(cb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_callback_set_last_ptr(struct dlm_callback **from,</div><div class='del'>-			       struct dlm_callback *to)</div><div class='add'>+static void dlm_callback_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	if (*from)</div><div class='del'>-		kref_put(&amp;(*from)-&gt;ref, dlm_release_callback);</div><div class='del'>-</div><div class='del'>-	if (to)</div><div class='del'>-		kref_get(&amp;to-&gt;ref);</div><div class='add'>+	struct dlm_callback *cb = container_of(work, struct dlm_callback, work);</div><div class='ctx'> </div><div class='del'>-	*from = to;</div><div class='add'>+	dlm_do_callback(cb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='del'>-			     int status, uint32_t sbflags)</div><div class='add'>+bool dlm_may_skip_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='add'>+			   int status, uint32_t sbflags, int *copy_lvb)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_ls *ls = lkb-&gt;lkb_resource-&gt;res_ls;</div><div class='del'>-	int rv = DLM_ENQUEUE_CALLBACK_SUCCESS;</div><div class='del'>-	struct dlm_callback *cb;</div><div class='add'>+	struct dlm_rsb *rsb = lkb-&gt;lkb_resource;</div><div class='add'>+	struct dlm_ls *ls = rsb-&gt;res_ls;</div><div class='ctx'> 	int prev_mode;</div><div class='ctx'> </div><div class='add'>+	if (copy_lvb)</div><div class='add'>+		*copy_lvb = 0;</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; DLM_CB_BAST) {</div><div class='ctx'> 		/* if cb is a bast, it should be skipped if the blocking mode is</div><div class='ctx'> 		 * compatible with the last granted mode</div><div class='ctx'> 		 */</div><div class='del'>-		if (lkb-&gt;lkb_last_cast) {</div><div class='del'>-			if (dlm_modes_compat(mode, lkb-&gt;lkb_last_cast-&gt;mode)) {</div><div class='add'>+		if (lkb-&gt;lkb_last_cast_cb_mode != -1) {</div><div class='add'>+			if (dlm_modes_compat(mode, lkb-&gt;lkb_last_cast_cb_mode)) {</div><div class='ctx'> 				log_debug(ls, "skip %x bast mode %d for cast mode %d",</div><div class='ctx'> 					  lkb-&gt;lkb_id, mode,</div><div class='del'>-					  lkb-&gt;lkb_last_cast-&gt;mode);</div><div class='del'>-				goto out;</div><div class='add'>+					  lkb-&gt;lkb_last_cast_cb_mode);</div><div class='add'>+				return true;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -63,152 +83,130 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='ctx'> 		 * is a bast for the same mode or a more restrictive mode.</div><div class='ctx'> 		 * (the addional &gt; PR check is needed for PR/CW inversion)</div><div class='ctx'> 		 */</div><div class='del'>-		if (lkb-&gt;lkb_last_cb &amp;&amp; lkb-&gt;lkb_last_cb-&gt;flags &amp; DLM_CB_BAST) {</div><div class='del'>-			prev_mode = lkb-&gt;lkb_last_cb-&gt;mode;</div><div class='add'>+		if (lkb-&gt;lkb_last_cb_mode != -1 &amp;&amp;</div><div class='add'>+		    lkb-&gt;lkb_last_cb_flags &amp; DLM_CB_BAST) {</div><div class='add'>+			prev_mode = lkb-&gt;lkb_last_cb_mode;</div><div class='ctx'> </div><div class='ctx'> 			if ((prev_mode == mode) ||</div><div class='ctx'> 			    (prev_mode &gt; mode &amp;&amp; prev_mode &gt; DLM_LOCK_PR)) {</div><div class='ctx'> 				log_debug(ls, "skip %x add bast mode %d for bast mode %d",</div><div class='ctx'> 					  lkb-&gt;lkb_id, mode, prev_mode);</div><div class='del'>-				goto out;</div><div class='add'>+				return true;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cb = dlm_allocate_cb();</div><div class='del'>-	if (!cb) {</div><div class='del'>-		rv = DLM_ENQUEUE_CALLBACK_FAILURE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cb-&gt;flags = flags;</div><div class='del'>-	cb-&gt;mode = mode;</div><div class='del'>-	cb-&gt;sb_status = status;</div><div class='del'>-	cb-&gt;sb_flags = (sbflags &amp; 0x000000FF);</div><div class='del'>-	kref_init(&amp;cb-&gt;ref);</div><div class='del'>-	if (!test_and_set_bit(DLM_IFL_CB_PENDING_BIT, &amp;lkb-&gt;lkb_iflags))</div><div class='del'>-		rv = DLM_ENQUEUE_CALLBACK_NEED_SCHED;</div><div class='add'>+		lkb-&gt;lkb_last_bast_time = ktime_get();</div><div class='add'>+		lkb-&gt;lkb_last_bast_cb_mode = mode;</div><div class='add'>+	} else if (flags &amp; DLM_CB_CAST) {</div><div class='add'>+		if (test_bit(DLM_DFL_USER_BIT, &amp;lkb-&gt;lkb_dflags)) {</div><div class='add'>+			prev_mode = lkb-&gt;lkb_last_cast_cb_mode;</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;cb-&gt;list, &amp;lkb-&gt;lkb_callbacks);</div><div class='add'>+			if (!status &amp;&amp; lkb-&gt;lkb_lksb-&gt;sb_lvbptr &amp;&amp;</div><div class='add'>+			    dlm_lvb_operations[prev_mode + 1][mode + 1]) {</div><div class='add'>+				if (copy_lvb)</div><div class='add'>+					*copy_lvb = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; DLM_CB_CAST)</div><div class='del'>-		dlm_callback_set_last_ptr(&amp;lkb-&gt;lkb_last_cast, cb);</div><div class='add'>+		lkb-&gt;lkb_last_cast_cb_mode = mode;</div><div class='add'>+		lkb-&gt;lkb_last_cast_time = ktime_get();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dlm_callback_set_last_ptr(&amp;lkb-&gt;lkb_last_cb, cb);</div><div class='add'>+	lkb-&gt;lkb_last_cb_mode = mode;</div><div class='add'>+	lkb-&gt;lkb_last_cb_flags = flags;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	return rv;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dlm_dequeue_lkb_callback(struct dlm_lkb *lkb, struct dlm_callback **cb)</div><div class='add'>+int dlm_get_cb(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='add'>+	       int status, uint32_t sbflags,</div><div class='add'>+	       struct dlm_callback **cb)</div><div class='ctx'> {</div><div class='del'>-	/* oldest undelivered cb is callbacks first entry */</div><div class='del'>-	*cb = list_first_entry_or_null(&amp;lkb-&gt;lkb_callbacks,</div><div class='del'>-				       struct dlm_callback, list);</div><div class='del'>-	if (!*cb)</div><div class='del'>-		return DLM_DEQUEUE_CALLBACK_EMPTY;</div><div class='del'>-</div><div class='del'>-	/* remove it from callbacks so shift others down */</div><div class='del'>-	list_del(&amp;(*cb)-&gt;list);</div><div class='del'>-	if (list_empty(&amp;lkb-&gt;lkb_callbacks))</div><div class='del'>-		return DLM_DEQUEUE_CALLBACK_LAST;</div><div class='del'>-</div><div class='del'>-	return DLM_DEQUEUE_CALLBACK_SUCCESS;</div><div class='add'>+	struct dlm_rsb *rsb = lkb-&gt;lkb_resource;</div><div class='add'>+	struct dlm_ls *ls = rsb-&gt;res_ls;</div><div class='add'>+</div><div class='add'>+	*cb = dlm_allocate_cb();</div><div class='add'>+	if (WARN_ON_ONCE(!*cb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* for tracing */</div><div class='add'>+	(*cb)-&gt;lkb_id = lkb-&gt;lkb_id;</div><div class='add'>+	(*cb)-&gt;ls_id = ls-&gt;ls_global_id;</div><div class='add'>+	memcpy((*cb)-&gt;res_name, rsb-&gt;res_name, rsb-&gt;res_length);</div><div class='add'>+	(*cb)-&gt;res_length = rsb-&gt;res_length;</div><div class='add'>+</div><div class='add'>+	(*cb)-&gt;flags = flags;</div><div class='add'>+	(*cb)-&gt;mode = mode;</div><div class='add'>+	(*cb)-&gt;sb_status = status;</div><div class='add'>+	(*cb)-&gt;sb_flags = (sbflags &amp; 0x000000FF);</div><div class='add'>+	(*cb)-&gt;lkb_lksb = lkb-&gt;lkb_lksb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status,</div><div class='del'>-		uint32_t sbflags)</div><div class='add'>+static int dlm_get_queue_cb(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='add'>+			    int status, uint32_t sbflags,</div><div class='add'>+			    struct dlm_callback **cb)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_ls *ls = lkb-&gt;lkb_resource-&gt;res_ls;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(DLM_DFL_USER_BIT, &amp;lkb-&gt;lkb_dflags)) {</div><div class='del'>-		dlm_user_add_ast(lkb, flags, mode, status, sbflags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	rv = dlm_get_cb(lkb, flags, mode, status, sbflags, cb);</div><div class='add'>+	if (rv)</div><div class='add'>+		return rv;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-	rv = dlm_enqueue_lkb_callback(lkb, flags, mode, status, sbflags);</div><div class='del'>-	switch (rv) {</div><div class='del'>-	case DLM_ENQUEUE_CALLBACK_NEED_SCHED:</div><div class='del'>-		kref_get(&amp;lkb-&gt;lkb_ref);</div><div class='add'>+	(*cb)-&gt;astfn = lkb-&gt;lkb_astfn;</div><div class='add'>+	(*cb)-&gt;bastfn = lkb-&gt;lkb_bastfn;</div><div class='add'>+	(*cb)-&gt;astparam = lkb-&gt;lkb_astparam;</div><div class='add'>+	INIT_WORK(&amp;(*cb)-&gt;work, dlm_callback_work);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_cb_lock);</div><div class='del'>-		if (test_bit(LSFL_CB_DELAY, &amp;ls-&gt;ls_flags)) {</div><div class='del'>-			list_add(&amp;lkb-&gt;lkb_cb_list, &amp;ls-&gt;ls_cb_delay);</div><div class='del'>-		} else {</div><div class='del'>-			queue_work(ls-&gt;ls_callback_wq, &amp;lkb-&gt;lkb_cb_work);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_cb_lock);</div><div class='del'>-		break;</div><div class='del'>-	case DLM_ENQUEUE_CALLBACK_FAILURE:</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		break;</div><div class='del'>-	case DLM_ENQUEUE_CALLBACK_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_callback_work(struct work_struct *work)</div><div class='add'>+void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status,</div><div class='add'>+		uint32_t sbflags)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_lkb *lkb = container_of(work, struct dlm_lkb, lkb_cb_work);</div><div class='del'>-	struct dlm_ls *ls = lkb-&gt;lkb_resource-&gt;res_ls;</div><div class='del'>-	void (*castfn) (void *astparam);</div><div class='del'>-	void (*bastfn) (void *astparam, int mode);</div><div class='add'>+	struct dlm_rsb *rsb = lkb-&gt;lkb_resource;</div><div class='add'>+	struct dlm_ls *ls = rsb-&gt;res_ls;</div><div class='ctx'> 	struct dlm_callback *cb;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-	rv = dlm_dequeue_lkb_callback(lkb, &amp;cb);</div><div class='del'>-	if (WARN_ON_ONCE(rv == DLM_DEQUEUE_CALLBACK_EMPTY)) {</div><div class='del'>-		clear_bit(DLM_IFL_CB_PENDING_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='del'>-		spin_unlock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-		goto out;</div><div class='add'>+	if (test_bit(DLM_DFL_USER_BIT, &amp;lkb-&gt;lkb_dflags)) {</div><div class='add'>+		dlm_user_add_ast(lkb, flags, mode, status, sbflags);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		castfn = lkb-&gt;lkb_astfn;</div><div class='del'>-		bastfn = lkb-&gt;lkb_bastfn;</div><div class='del'>-</div><div class='del'>-		if (cb-&gt;flags &amp; DLM_CB_BAST) {</div><div class='del'>-			trace_dlm_bast(ls, lkb, cb-&gt;mode);</div><div class='del'>-			lkb-&gt;lkb_last_bast_time = ktime_get();</div><div class='del'>-			lkb-&gt;lkb_last_bast_mode = cb-&gt;mode;</div><div class='del'>-			bastfn(lkb-&gt;lkb_astparam, cb-&gt;mode);</div><div class='del'>-		} else if (cb-&gt;flags &amp; DLM_CB_CAST) {</div><div class='del'>-			lkb-&gt;lkb_lksb-&gt;sb_status = cb-&gt;sb_status;</div><div class='del'>-			lkb-&gt;lkb_lksb-&gt;sb_flags = cb-&gt;sb_flags;</div><div class='del'>-			trace_dlm_ast(ls, lkb);</div><div class='del'>-			lkb-&gt;lkb_last_cast_time = ktime_get();</div><div class='del'>-			castfn(lkb-&gt;lkb_astparam);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		kref_put(&amp;cb-&gt;ref, dlm_release_callback);</div><div class='add'>+	if (dlm_may_skip_callback(lkb, flags, mode, status, sbflags, NULL))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-		rv = dlm_dequeue_lkb_callback(lkb, &amp;cb);</div><div class='del'>-		if (rv == DLM_DEQUEUE_CALLBACK_EMPTY) {</div><div class='del'>-			clear_bit(DLM_IFL_CB_PENDING_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='del'>-			spin_unlock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-			break;</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_cb_lock);</div><div class='add'>+	if (test_bit(LSFL_CB_DELAY, &amp;ls-&gt;ls_flags)) {</div><div class='add'>+		rv = dlm_get_queue_cb(lkb, flags, mode, status, sbflags, &amp;cb);</div><div class='add'>+		if (!rv)</div><div class='add'>+			list_add(&amp;cb-&gt;list, &amp;ls-&gt;ls_cb_delay);</div><div class='add'>+	} else {</div><div class='add'>+		if (test_bit(LSFL_SOFTIRQ, &amp;ls-&gt;ls_flags)) {</div><div class='add'>+			dlm_run_callback(ls-&gt;ls_global_id, lkb-&gt;lkb_id, mode, flags,</div><div class='add'>+					 sbflags, status, lkb-&gt;lkb_lksb,</div><div class='add'>+					 lkb-&gt;lkb_astfn, lkb-&gt;lkb_bastfn,</div><div class='add'>+					 lkb-&gt;lkb_astparam, rsb-&gt;res_name,</div><div class='add'>+					 rsb-&gt;res_length);</div><div class='add'>+		} else {</div><div class='add'>+			rv = dlm_get_queue_cb(lkb, flags, mode, status, sbflags, &amp;cb);</div><div class='add'>+			if (!rv)</div><div class='add'>+				queue_work(ls-&gt;ls_callback_wq, &amp;cb-&gt;work);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	/* undo kref_get from dlm_add_callback, may cause lkb to be freed */</div><div class='del'>-	dlm_put_lkb(lkb);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_cb_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dlm_callback_start(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='del'>-	ls-&gt;ls_callback_wq = alloc_workqueue("dlm_callback",</div><div class='del'>-					     WQ_HIGHPRI | WQ_MEM_RECLAIM, 0);</div><div class='add'>+	if (!test_bit(LSFL_FS, &amp;ls-&gt;ls_flags) ||</div><div class='add'>+	    test_bit(LSFL_SOFTIRQ, &amp;ls-&gt;ls_flags))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ls-&gt;ls_callback_wq = alloc_ordered_workqueue("dlm_callback",</div><div class='add'>+						     WQ_HIGHPRI | WQ_MEM_RECLAIM);</div><div class='ctx'> 	if (!ls-&gt;ls_callback_wq) {</div><div class='ctx'> 		log_print("can't start dlm_callback workqueue");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -224,31 +222,37 @@ void dlm_callback_stop(struct dlm_ls *ls)</div><div class='ctx'> </div><div class='ctx'> void dlm_callback_suspend(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='del'>-	if (ls-&gt;ls_callback_wq) {</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_cb_lock);</div><div class='del'>-		set_bit(LSFL_CB_DELAY, &amp;ls-&gt;ls_flags);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_cb_lock);</div><div class='add'>+	if (!test_bit(LSFL_FS, &amp;ls-&gt;ls_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_cb_lock);</div><div class='add'>+	set_bit(LSFL_CB_DELAY, &amp;ls-&gt;ls_flags);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_cb_lock);</div><div class='ctx'> </div><div class='add'>+	if (ls-&gt;ls_callback_wq)</div><div class='ctx'> 		flush_workqueue(ls-&gt;ls_callback_wq);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MAX_CB_QUEUE 25</div><div class='ctx'> </div><div class='ctx'> void dlm_callback_resume(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_lkb *lkb, *safe;</div><div class='add'>+	struct dlm_callback *cb, *safe;</div><div class='ctx'> 	int count = 0, sum = 0;</div><div class='ctx'> 	bool empty;</div><div class='ctx'> </div><div class='del'>-	if (!ls-&gt;ls_callback_wq)</div><div class='add'>+	if (!test_bit(LSFL_FS, &amp;ls-&gt;ls_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> more:</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_cb_lock);</div><div class='del'>-	list_for_each_entry_safe(lkb, safe, &amp;ls-&gt;ls_cb_delay, lkb_cb_list) {</div><div class='del'>-		list_del_init(&amp;lkb-&gt;lkb_cb_list);</div><div class='del'>-		queue_work(ls-&gt;ls_callback_wq, &amp;lkb-&gt;lkb_cb_work);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_cb_lock);</div><div class='add'>+	list_for_each_entry_safe(cb, safe, &amp;ls-&gt;ls_cb_delay, list) {</div><div class='add'>+		list_del(&amp;cb-&gt;list);</div><div class='add'>+		if (test_bit(LSFL_SOFTIRQ, &amp;ls-&gt;ls_flags))</div><div class='add'>+			dlm_do_callback(cb);</div><div class='add'>+		else</div><div class='add'>+			queue_work(ls-&gt;ls_callback_wq, &amp;cb-&gt;work);</div><div class='add'>+</div><div class='ctx'> 		count++;</div><div class='ctx'> 		if (count == MAX_CB_QUEUE)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -256,7 +260,7 @@ more:</div><div class='ctx'> 	empty = list_empty(&amp;ls-&gt;ls_cb_delay);</div><div class='ctx'> 	if (empty)</div><div class='ctx'> 		clear_bit(LSFL_CB_DELAY, &amp;ls-&gt;ls_flags);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_cb_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_cb_lock);</div><div class='ctx'> </div><div class='ctx'> 	sum += count;</div><div class='ctx'> 	if (!empty) {</div><div class='head'>diff --git a/fs/dlm/ast.h b/fs/dlm/ast.h<br/>index ce007892dc2d..e2b86845d331 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/ast.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/ast.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/ast.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/ast.h</a></div><div class='hunk'>@@ -11,22 +11,14 @@</div><div class='ctx'> #ifndef __ASTD_DOT_H__</div><div class='ctx'> #define __ASTD_DOT_H__</div><div class='ctx'> </div><div class='del'>-#define DLM_ENQUEUE_CALLBACK_NEED_SCHED	1</div><div class='del'>-#define DLM_ENQUEUE_CALLBACK_SUCCESS	0</div><div class='del'>-#define DLM_ENQUEUE_CALLBACK_FAILURE	-1</div><div class='del'>-int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='del'>-			     int status, uint32_t sbflags);</div><div class='del'>-#define DLM_DEQUEUE_CALLBACK_EMPTY	2</div><div class='del'>-#define DLM_DEQUEUE_CALLBACK_LAST	1</div><div class='del'>-#define DLM_DEQUEUE_CALLBACK_SUCCESS	0</div><div class='del'>-int dlm_dequeue_lkb_callback(struct dlm_lkb *lkb, struct dlm_callback **cb);</div><div class='add'>+bool dlm_may_skip_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='add'>+			   int status, uint32_t sbflags, int *copy_lvb);</div><div class='add'>+int dlm_get_cb(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='add'>+	       int status, uint32_t sbflags,</div><div class='add'>+	       struct dlm_callback **cb);</div><div class='ctx'> void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status,</div><div class='ctx'>                 uint32_t sbflags);</div><div class='del'>-void dlm_callback_set_last_ptr(struct dlm_callback **from,</div><div class='del'>-			       struct dlm_callback *to);</div><div class='ctx'> </div><div class='del'>-void dlm_release_callback(struct kref *ref);</div><div class='del'>-void dlm_callback_work(struct work_struct *work);</div><div class='ctx'> int dlm_callback_start(struct dlm_ls *ls);</div><div class='ctx'> void dlm_callback_stop(struct dlm_ls *ls);</div><div class='ctx'> void dlm_callback_suspend(struct dlm_ls *ls);</div><div class='head'>diff --git a/fs/dlm/config.c b/fs/dlm/config.c<br/>index e55e0a2cd2e8..a0d75b5c83c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/config.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/config.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/config.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/config.c</a></div><div class='hunk'>@@ -24,9 +24,10 @@</div><div class='ctx'> #include "lowcomms.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * /config/dlm/&lt;cluster&gt;/spaces/&lt;space&gt;/nodes/&lt;node&gt;/nodeid</div><div class='add'>+ * /config/dlm/&lt;cluster&gt;/spaces/&lt;space&gt;/nodes/&lt;node&gt;/nodeid (refers to &lt;node&gt;)</div><div class='ctx'>  * /config/dlm/&lt;cluster&gt;/spaces/&lt;space&gt;/nodes/&lt;node&gt;/weight</div><div class='del'>- * /config/dlm/&lt;cluster&gt;/comms/&lt;comm&gt;/nodeid</div><div class='add'>+ * /config/dlm/&lt;cluster&gt;/spaces/&lt;space&gt;/nodes/&lt;node&gt;/release_recover</div><div class='add'>+ * /config/dlm/&lt;cluster&gt;/comms/&lt;comm&gt;/nodeid (refers to &lt;comm&gt;)</div><div class='ctx'>  * /config/dlm/&lt;cluster&gt;/comms/&lt;comm&gt;/local</div><div class='ctx'>  * /config/dlm/&lt;cluster&gt;/comms/&lt;comm&gt;/addr      (write only)</div><div class='ctx'>  * /config/dlm/&lt;cluster&gt;/comms/&lt;comm&gt;/addr_list (read only)</div><div class='hunk'>@@ -63,22 +64,16 @@ static void release_node(struct config_item *);</div><div class='ctx'> static struct configfs_attribute *comm_attrs[];</div><div class='ctx'> static struct configfs_attribute *node_attrs[];</div><div class='ctx'> </div><div class='add'>+const struct rhashtable_params dlm_rhash_rsb_params = {</div><div class='add'>+	.nelem_hint = 3, /* start small */</div><div class='add'>+	.key_len = DLM_RESNAME_MAXLEN,</div><div class='add'>+	.key_offset = offsetof(struct dlm_rsb, res_name),</div><div class='add'>+	.head_offset = offsetof(struct dlm_rsb, res_node),</div><div class='add'>+	.automatic_shrinking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dlm_cluster {</div><div class='ctx'> 	struct config_group group;</div><div class='del'>-	unsigned int cl_tcp_port;</div><div class='del'>-	unsigned int cl_buffer_size;</div><div class='del'>-	unsigned int cl_rsbtbl_size;</div><div class='del'>-	unsigned int cl_recover_timer;</div><div class='del'>-	unsigned int cl_toss_secs;</div><div class='del'>-	unsigned int cl_scan_secs;</div><div class='del'>-	unsigned int cl_log_debug;</div><div class='del'>-	unsigned int cl_log_info;</div><div class='del'>-	unsigned int cl_protocol;</div><div class='del'>-	unsigned int cl_mark;</div><div class='del'>-	unsigned int cl_new_rsb_count;</div><div class='del'>-	unsigned int cl_recover_callbacks;</div><div class='del'>-	char cl_cluster_name[DLM_LOCKSPACE_LEN];</div><div class='del'>-</div><div class='ctx'> 	struct dlm_spaces *sps;</div><div class='ctx'> 	struct dlm_comms *cms;</div><div class='ctx'> };</div><div class='hunk'>@@ -107,25 +102,60 @@ enum {</div><div class='ctx'> </div><div class='ctx'> static ssize_t cluster_cluster_name_show(struct config_item *item, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_cluster *cl = config_item_to_cluster(item);</div><div class='del'>-	return sprintf(buf, "%s\n", cl-&gt;cl_cluster_name);</div><div class='add'>+	return sprintf(buf, "%s\n", dlm_config.ci_cluster_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t cluster_cluster_name_store(struct config_item *item,</div><div class='ctx'> 					  const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_cluster *cl = config_item_to_cluster(item);</div><div class='del'>-</div><div class='ctx'> 	strscpy(dlm_config.ci_cluster_name, buf,</div><div class='del'>-				sizeof(dlm_config.ci_cluster_name));</div><div class='del'>-	strscpy(cl-&gt;cl_cluster_name, buf, sizeof(cl-&gt;cl_cluster_name));</div><div class='add'>+		sizeof(dlm_config.ci_cluster_name));</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> CONFIGFS_ATTR(cluster_, cluster_name);</div><div class='ctx'> </div><div class='del'>-static ssize_t cluster_set(struct dlm_cluster *cl, unsigned int *cl_field,</div><div class='del'>-			   int *info_field, int (*check_cb)(unsigned int x),</div><div class='add'>+static ssize_t cluster_tcp_port_show(struct config_item *item, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "%u\n", be16_to_cpu(dlm_config.ci_tcp_port));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dlm_check_zero_and_dlm_running(unsigned int x)</div><div class='add'>+{</div><div class='add'>+	if (!x)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (dlm_lowcomms_is_running())</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cluster_tcp_port_store(struct config_item *item,</div><div class='add'>+				      const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u16 x;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	rc = kstrtou16(buf, 0, &amp;x);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = dlm_check_zero_and_dlm_running(x);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	dlm_config.ci_tcp_port = cpu_to_be16(x);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CONFIGFS_ATTR(cluster_, tcp_port);</div><div class='add'>+</div><div class='add'>+static ssize_t cluster_set(unsigned int *info_field,</div><div class='add'>+			   int (*check_cb)(unsigned int x),</div><div class='ctx'> 			   const char *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int x;</div><div class='hunk'>@@ -143,7 +173,6 @@ static ssize_t cluster_set(struct dlm_cluster *cl, unsigned int *cl_field,</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*cl_field = x;</div><div class='ctx'> 	*info_field = x;</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -153,14 +182,11 @@ static ssize_t cluster_set(struct dlm_cluster *cl, unsigned int *cl_field,</div><div class='ctx'> static ssize_t cluster_##name##_store(struct config_item *item, \</div><div class='ctx'> 		const char *buf, size_t len) \</div><div class='ctx'> {                                                                             \</div><div class='del'>-	struct dlm_cluster *cl = config_item_to_cluster(item);		      \</div><div class='del'>-	return cluster_set(cl, &amp;cl-&gt;cl_##name, &amp;dlm_config.ci_##name,         \</div><div class='del'>-			   check_cb, buf, len);                               \</div><div class='add'>+	return cluster_set(&amp;dlm_config.ci_##name, check_cb, buf, len);        \</div><div class='ctx'> }                                                                             \</div><div class='ctx'> static ssize_t cluster_##name##_show(struct config_item *item, char *buf)     \</div><div class='ctx'> {                                                                             \</div><div class='del'>-	struct dlm_cluster *cl = config_item_to_cluster(item);		      \</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n", cl-&gt;cl_##name);               \</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%u\n", dlm_config.ci_##name);        \</div><div class='ctx'> }                                                                             \</div><div class='ctx'> CONFIGFS_ATTR(cluster_, name);</div><div class='ctx'> </div><div class='hunk'>@@ -172,6 +198,9 @@ static int dlm_check_protocol_and_dlm_running(unsigned int x)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* SCTP */</div><div class='add'>+		if (!IS_ENABLED(CONFIG_IP_SCTP))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -183,17 +212,6 @@ static int dlm_check_protocol_and_dlm_running(unsigned int x)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dlm_check_zero_and_dlm_running(unsigned int x)</div><div class='del'>-{</div><div class='del'>-	if (!x)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (dlm_lowcomms_is_running())</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dlm_check_zero(unsigned int x)</div><div class='ctx'> {</div><div class='ctx'> 	if (!x)</div><div class='hunk'>@@ -210,7 +228,6 @@ static int dlm_check_buffer_size(unsigned int x)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-CLUSTER_ATTR(tcp_port, dlm_check_zero_and_dlm_running);</div><div class='ctx'> CLUSTER_ATTR(buffer_size, dlm_check_buffer_size);</div><div class='ctx'> CLUSTER_ATTR(rsbtbl_size, dlm_check_zero);</div><div class='ctx'> CLUSTER_ATTR(recover_timer, dlm_check_zero);</div><div class='hunk'>@@ -251,6 +268,7 @@ enum {</div><div class='ctx'> enum {</div><div class='ctx'> 	NODE_ATTR_NODEID = 0,</div><div class='ctx'> 	NODE_ATTR_WEIGHT,</div><div class='add'>+	NODE_ATTR_RELEASE_RECOVER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dlm_clusters {</div><div class='hunk'>@@ -264,6 +282,8 @@ struct dlm_spaces {</div><div class='ctx'> struct dlm_space {</div><div class='ctx'> 	struct config_group group;</div><div class='ctx'> 	struct list_head members;</div><div class='add'>+	struct list_head members_gone;</div><div class='add'>+	int members_gone_count;</div><div class='ctx'> 	struct mutex members_lock;</div><div class='ctx'> 	int members_count;</div><div class='ctx'> 	struct dlm_nodes *nds;</div><div class='hunk'>@@ -294,6 +314,14 @@ struct dlm_node {</div><div class='ctx'> 	int weight;</div><div class='ctx'> 	int new;</div><div class='ctx'> 	int comm_seq; /* copy of cm-&gt;seq when nd-&gt;nodeid is set */</div><div class='add'>+	unsigned int release_recover;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dlm_member_gone {</div><div class='add'>+	int nodeid;</div><div class='add'>+	unsigned int release_recover;</div><div class='add'>+</div><div class='add'>+	struct list_head list; /* space-&gt;members_gone */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct configfs_group_operations clusters_ops = {</div><div class='hunk'>@@ -415,20 +443,6 @@ static struct config_group *make_cluster(struct config_group *g,</div><div class='ctx'> 	configfs_add_default_group(&amp;sps-&gt;ss_group, &amp;cl-&gt;group);</div><div class='ctx'> 	configfs_add_default_group(&amp;cms-&gt;cs_group, &amp;cl-&gt;group);</div><div class='ctx'> </div><div class='del'>-	cl-&gt;cl_tcp_port = dlm_config.ci_tcp_port;</div><div class='del'>-	cl-&gt;cl_buffer_size = dlm_config.ci_buffer_size;</div><div class='del'>-	cl-&gt;cl_rsbtbl_size = dlm_config.ci_rsbtbl_size;</div><div class='del'>-	cl-&gt;cl_recover_timer = dlm_config.ci_recover_timer;</div><div class='del'>-	cl-&gt;cl_toss_secs = dlm_config.ci_toss_secs;</div><div class='del'>-	cl-&gt;cl_scan_secs = dlm_config.ci_scan_secs;</div><div class='del'>-	cl-&gt;cl_log_debug = dlm_config.ci_log_debug;</div><div class='del'>-	cl-&gt;cl_log_info = dlm_config.ci_log_info;</div><div class='del'>-	cl-&gt;cl_protocol = dlm_config.ci_protocol;</div><div class='del'>-	cl-&gt;cl_new_rsb_count = dlm_config.ci_new_rsb_count;</div><div class='del'>-	cl-&gt;cl_recover_callbacks = dlm_config.ci_recover_callbacks;</div><div class='del'>-	memcpy(cl-&gt;cl_cluster_name, dlm_config.ci_cluster_name,</div><div class='del'>-	       DLM_LOCKSPACE_LEN);</div><div class='del'>-</div><div class='ctx'> 	space_list = &amp;sps-&gt;ss_group;</div><div class='ctx'> 	comm_list = &amp;cms-&gt;cs_group;</div><div class='ctx'> 	return &amp;cl-&gt;group;</div><div class='hunk'>@@ -478,6 +492,7 @@ static struct config_group *make_space(struct config_group *g, const char *name)</div><div class='ctx'> 	configfs_add_default_group(&amp;nds-&gt;ns_group, &amp;sp-&gt;group);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sp-&gt;members);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sp-&gt;members_gone);</div><div class='ctx'> 	mutex_init(&amp;sp-&gt;members_lock);</div><div class='ctx'> 	sp-&gt;members_count = 0;</div><div class='ctx'> 	sp-&gt;nds = nds;</div><div class='hunk'>@@ -509,6 +524,12 @@ static void release_space(struct config_item *i)</div><div class='ctx'> static struct config_item *make_comm(struct config_group *g, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_comm *cm;</div><div class='add'>+	unsigned int nodeid;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	rv = kstrtouint(name, 0, &amp;nodeid);</div><div class='add'>+	if (rv)</div><div class='add'>+		return ERR_PTR(rv);</div><div class='ctx'> </div><div class='ctx'> 	cm = kzalloc(sizeof(struct dlm_comm), GFP_NOFS);</div><div class='ctx'> 	if (!cm)</div><div class='hunk'>@@ -520,7 +541,7 @@ static struct config_item *make_comm(struct config_group *g, const char *name)</div><div class='ctx'> 	if (!cm-&gt;seq)</div><div class='ctx'> 		cm-&gt;seq = dlm_comm_count++;</div><div class='ctx'> </div><div class='del'>-	cm-&gt;nodeid = -1;</div><div class='add'>+	cm-&gt;nodeid = nodeid;</div><div class='ctx'> 	cm-&gt;local = 0;</div><div class='ctx'> 	cm-&gt;addr_count = 0;</div><div class='ctx'> 	cm-&gt;mark = 0;</div><div class='hunk'>@@ -547,16 +568,25 @@ static void release_comm(struct config_item *i)</div><div class='ctx'> static struct config_item *make_node(struct config_group *g, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_space *sp = config_item_to_space(g-&gt;cg_item.ci_parent);</div><div class='add'>+	unsigned int nodeid;</div><div class='ctx'> 	struct dlm_node *nd;</div><div class='add'>+	uint32_t seq = 0;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	rv = kstrtouint(name, 0, &amp;nodeid);</div><div class='add'>+	if (rv)</div><div class='add'>+		return ERR_PTR(rv);</div><div class='ctx'> </div><div class='ctx'> 	nd = kzalloc(sizeof(struct dlm_node), GFP_NOFS);</div><div class='ctx'> 	if (!nd)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	config_item_init_type_name(&amp;nd-&gt;item, name, &amp;node_type);</div><div class='del'>-	nd-&gt;nodeid = -1;</div><div class='add'>+	nd-&gt;nodeid = nodeid;</div><div class='ctx'> 	nd-&gt;weight = 1;  /* default weight of 1 if none is set */</div><div class='ctx'> 	nd-&gt;new = 1;     /* set to 0 once it's been read by dlm_nodeid_list() */</div><div class='add'>+	dlm_comm_seq(nodeid, &amp;seq, true);</div><div class='add'>+	nd-&gt;comm_seq = seq;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sp-&gt;members_lock);</div><div class='ctx'> 	list_add(&amp;nd-&gt;list, &amp;sp-&gt;members);</div><div class='hunk'>@@ -570,10 +600,20 @@ static void drop_node(struct config_group *g, struct config_item *i)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_space *sp = config_item_to_space(g-&gt;cg_item.ci_parent);</div><div class='ctx'> 	struct dlm_node *nd = config_item_to_node(i);</div><div class='add'>+	struct dlm_member_gone *mb_gone;</div><div class='add'>+</div><div class='add'>+	mb_gone = kzalloc(sizeof(*mb_gone), GFP_KERNEL);</div><div class='add'>+	if (!mb_gone)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sp-&gt;members_lock);</div><div class='ctx'> 	list_del(&amp;nd-&gt;list);</div><div class='ctx'> 	sp-&gt;members_count--;</div><div class='add'>+</div><div class='add'>+	mb_gone-&gt;nodeid = nd-&gt;nodeid;</div><div class='add'>+	mb_gone-&gt;release_recover = nd-&gt;release_recover;</div><div class='add'>+	list_add(&amp;mb_gone-&gt;list, &amp;sp-&gt;members_gone);</div><div class='add'>+	sp-&gt;members_gone_count++;</div><div class='ctx'> 	mutex_unlock(&amp;sp-&gt;members_lock);</div><div class='ctx'> </div><div class='ctx'> 	config_item_put(i);</div><div class='hunk'>@@ -614,16 +654,19 @@ void dlm_config_exit(void)</div><div class='ctx'> </div><div class='ctx'> static ssize_t comm_nodeid_show(struct config_item *item, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%d\n", config_item_to_comm(item)-&gt;nodeid);</div><div class='add'>+	unsigned int nodeid;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	rv = kstrtouint(config_item_name(item), 0, &amp;nodeid);</div><div class='add'>+	if (WARN_ON(rv))</div><div class='add'>+		return rv;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", nodeid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t comm_nodeid_store(struct config_item *item, const char *buf,</div><div class='ctx'> 				 size_t len)</div><div class='ctx'> {</div><div class='del'>-	int rc = kstrtoint(buf, 0, &amp;config_item_to_comm(item)-&gt;nodeid);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +707,7 @@ static ssize_t comm_addr_store(struct config_item *item, const char *buf,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(addr, buf, len);</div><div class='ctx'> </div><div class='del'>-	rv = dlm_midcomms_addr(cm-&gt;nodeid, addr, len);</div><div class='add'>+	rv = dlm_midcomms_addr(cm-&gt;nodeid, addr);</div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		kfree(addr);</div><div class='ctx'> 		return rv;</div><div class='hunk'>@@ -764,20 +807,19 @@ static struct configfs_attribute *comm_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> static ssize_t node_nodeid_show(struct config_item *item, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%d\n", config_item_to_node(item)-&gt;nodeid);</div><div class='add'>+	unsigned int nodeid;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	rv = kstrtouint(config_item_name(item), 0, &amp;nodeid);</div><div class='add'>+	if (WARN_ON(rv))</div><div class='add'>+		return rv;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", nodeid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t node_nodeid_store(struct config_item *item, const char *buf,</div><div class='ctx'> 				 size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_node *nd = config_item_to_node(item);</div><div class='del'>-	uint32_t seq = 0;</div><div class='del'>-	int rc = kstrtoint(buf, 0, &amp;nd-&gt;nodeid);</div><div class='del'>-</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	dlm_comm_seq(nd-&gt;nodeid, &amp;seq);</div><div class='del'>-	nd-&gt;comm_seq = seq;</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -796,12 +838,34 @@ static ssize_t node_weight_store(struct config_item *item, const char *buf,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t node_release_recover_show(struct config_item *item, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct dlm_node *n = config_item_to_node(item);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", n-&gt;release_recover);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t node_release_recover_store(struct config_item *item,</div><div class='add'>+					  const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct dlm_node *n = config_item_to_node(item);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = kstrtouint(buf, 0, &amp;n-&gt;release_recover);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> CONFIGFS_ATTR(node_, nodeid);</div><div class='ctx'> CONFIGFS_ATTR(node_, weight);</div><div class='add'>+CONFIGFS_ATTR(node_, release_recover);</div><div class='ctx'> </div><div class='ctx'> static struct configfs_attribute *node_attrs[] = {</div><div class='ctx'> 	[NODE_ATTR_NODEID] = &amp;node_attr_nodeid,</div><div class='ctx'> 	[NODE_ATTR_WEIGHT] = &amp;node_attr_weight,</div><div class='add'>+	[NODE_ATTR_RELEASE_RECOVER] = &amp;node_attr_release_recover,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -837,7 +901,7 @@ static struct dlm_comm *get_comm(int nodeid)</div><div class='ctx'> 	if (!comm_list)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;clusters_root.subsys.su_mutex);</div><div class='add'>+	WARN_ON_ONCE(!mutex_is_locked(&amp;clusters_root.subsys.su_mutex));</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(i, &amp;comm_list-&gt;cg_children, ci_entry) {</div><div class='ctx'> 		cm = config_item_to_comm(i);</div><div class='hunk'>@@ -848,7 +912,6 @@ static struct dlm_comm *get_comm(int nodeid)</div><div class='ctx'> 		config_item_get(i);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;clusters_root.subsys.su_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!found)</div><div class='ctx'> 		cm = NULL;</div><div class='hunk'>@@ -864,9 +927,10 @@ static void put_comm(struct dlm_comm *cm)</div><div class='ctx'> int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,</div><div class='ctx'> 		     int *count_out)</div><div class='ctx'> {</div><div class='add'>+	struct dlm_member_gone *mb_gone, *mb_safe;</div><div class='add'>+	struct dlm_config_node *nodes, *node;</div><div class='ctx'> 	struct dlm_space *sp;</div><div class='ctx'> 	struct dlm_node *nd;</div><div class='del'>-	struct dlm_config_node *nodes, *node;</div><div class='ctx'> 	int rv, count;</div><div class='ctx'> </div><div class='ctx'> 	sp = get_space(lsname);</div><div class='hunk'>@@ -880,7 +944,7 @@ int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = sp-&gt;members_count;</div><div class='add'>+	count = sp-&gt;members_count + sp-&gt;members_gone_count;</div><div class='ctx'> </div><div class='ctx'> 	nodes = kcalloc(count, sizeof(struct dlm_config_node), GFP_NOFS);</div><div class='ctx'> 	if (!nodes) {</div><div class='hunk'>@@ -899,6 +963,20 @@ int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,</div><div class='ctx'> 		nd-&gt;new = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* we delay the remove on nodes until here as configfs does</div><div class='add'>+	 * not support addtional attributes for rmdir().</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(mb_gone, mb_safe, &amp;sp-&gt;members_gone, list) {</div><div class='add'>+		node-&gt;nodeid = mb_gone-&gt;nodeid;</div><div class='add'>+		node-&gt;release_recover = mb_gone-&gt;release_recover;</div><div class='add'>+		node-&gt;gone = true;</div><div class='add'>+		node++;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;mb_gone-&gt;list);</div><div class='add'>+		sp-&gt;members_gone_count--;</div><div class='add'>+		kfree(mb_gone);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	*count_out = count;</div><div class='ctx'> 	*nodes_out = nodes;</div><div class='ctx'> 	rv = 0;</div><div class='hunk'>@@ -908,11 +986,20 @@ int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dlm_comm_seq(int nodeid, uint32_t *seq)</div><div class='add'>+int dlm_comm_seq(int nodeid, uint32_t *seq, bool locked)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_comm *cm = get_comm(nodeid);</div><div class='add'>+	struct dlm_comm *cm;</div><div class='add'>+</div><div class='add'>+	if (locked) {</div><div class='add'>+		cm = get_comm(nodeid);</div><div class='add'>+	} else {</div><div class='add'>+		mutex_lock(&amp;clusters_root.subsys.su_mutex);</div><div class='add'>+		cm = get_comm(nodeid);</div><div class='add'>+		mutex_unlock(&amp;clusters_root.subsys.su_mutex);</div><div class='add'>+	}</div><div class='ctx'> 	if (!cm)</div><div class='del'>-		return -EEXIST;</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	*seq = cm-&gt;seq;</div><div class='ctx'> 	put_comm(cm);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -920,7 +1007,7 @@ int dlm_comm_seq(int nodeid, uint32_t *seq)</div><div class='ctx'> </div><div class='ctx'> int dlm_our_nodeid(void)</div><div class='ctx'> {</div><div class='del'>-	return local_comm ? local_comm-&gt;nodeid : 0;</div><div class='add'>+	return local_comm-&gt;nodeid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* num 0 is first addr, num 1 is second addr */</div><div class='hunk'>@@ -949,7 +1036,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num)</div><div class='ctx'> #define DEFAULT_CLUSTER_NAME      ""</div><div class='ctx'> </div><div class='ctx'> struct dlm_config_info dlm_config = {</div><div class='del'>-	.ci_tcp_port = DEFAULT_TCP_PORT,</div><div class='add'>+	.ci_tcp_port = cpu_to_be16(DEFAULT_TCP_PORT),</div><div class='ctx'> 	.ci_buffer_size = DLM_MAX_SOCKET_BUFSIZE,</div><div class='ctx'> 	.ci_rsbtbl_size = DEFAULT_RSBTBL_SIZE,</div><div class='ctx'> 	.ci_recover_timer = DEFAULT_RECOVER_TIMER,</div><div class='head'>diff --git a/fs/dlm/config.h b/fs/dlm/config.h<br/>index 4c91fcca0fd4..4ebd45f75276 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/config.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/config.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/config.h</a></div><div class='hunk'>@@ -17,28 +17,32 @@</div><div class='ctx'> struct dlm_config_node {</div><div class='ctx'> 	int nodeid;</div><div class='ctx'> 	int weight;</div><div class='add'>+	bool gone;</div><div class='ctx'> 	int new;</div><div class='ctx'> 	uint32_t comm_seq;</div><div class='add'>+	unsigned int release_recover;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DLM_MAX_ADDR_COUNT 3</div><div class='add'>+extern const struct rhashtable_params dlm_rhash_rsb_params;</div><div class='add'>+</div><div class='add'>+#define DLM_MAX_ADDR_COUNT 8</div><div class='ctx'> </div><div class='ctx'> #define DLM_PROTO_TCP	0</div><div class='ctx'> #define DLM_PROTO_SCTP	1</div><div class='ctx'> </div><div class='ctx'> struct dlm_config_info {</div><div class='del'>-	int ci_tcp_port;</div><div class='del'>-	int ci_buffer_size;</div><div class='del'>-	int ci_rsbtbl_size;</div><div class='del'>-	int ci_recover_timer;</div><div class='del'>-	int ci_toss_secs;</div><div class='del'>-	int ci_scan_secs;</div><div class='del'>-	int ci_log_debug;</div><div class='del'>-	int ci_log_info;</div><div class='del'>-	int ci_protocol;</div><div class='del'>-	int ci_mark;</div><div class='del'>-	int ci_new_rsb_count;</div><div class='del'>-	int ci_recover_callbacks;</div><div class='add'>+	__be16 ci_tcp_port;</div><div class='add'>+	unsigned int ci_buffer_size;</div><div class='add'>+	unsigned int ci_rsbtbl_size;</div><div class='add'>+	unsigned int ci_recover_timer;</div><div class='add'>+	unsigned int ci_toss_secs;</div><div class='add'>+	unsigned int ci_scan_secs;</div><div class='add'>+	unsigned int ci_log_debug;</div><div class='add'>+	unsigned int ci_log_info;</div><div class='add'>+	unsigned int ci_protocol;</div><div class='add'>+	unsigned int ci_mark;</div><div class='add'>+	unsigned int ci_new_rsb_count;</div><div class='add'>+	unsigned int ci_recover_callbacks;</div><div class='ctx'> 	char ci_cluster_name[DLM_LOCKSPACE_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +52,7 @@ int dlm_config_init(void);</div><div class='ctx'> void dlm_config_exit(void);</div><div class='ctx'> int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,</div><div class='ctx'> 		     int *count_out);</div><div class='del'>-int dlm_comm_seq(int nodeid, uint32_t *seq);</div><div class='add'>+int dlm_comm_seq(int nodeid, uint32_t *seq, bool locked);</div><div class='ctx'> int dlm_our_nodeid(void);</div><div class='ctx'> int dlm_our_addr(struct sockaddr_storage *addr, int num);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c<br/>index 4fa11d9ddbb6..700a0cbb2f14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/debug_fs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/debug_fs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/debug_fs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/debug_fs.c</a></div><div class='hunk'>@@ -247,7 +247,7 @@ static void print_format3_lock(struct seq_file *s, struct dlm_lkb *lkb,</div><div class='ctx'> 		   lkb-&gt;lkb_status,</div><div class='ctx'> 		   lkb-&gt;lkb_grmode,</div><div class='ctx'> 		   lkb-&gt;lkb_rqmode,</div><div class='del'>-		   lkb-&gt;lkb_last_bast_mode,</div><div class='add'>+		   lkb-&gt;lkb_last_bast_cb_mode,</div><div class='ctx'> 		   rsb_lookup,</div><div class='ctx'> 		   lkb-&gt;lkb_wait_type,</div><div class='ctx'> 		   lkb-&gt;lkb_lvbseq,</div><div class='hunk'>@@ -366,58 +366,10 @@ static void print_format4(struct dlm_rsb *r, struct seq_file *s)</div><div class='ctx'> 	unlock_rsb(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void print_format5_lock(struct seq_file *s, struct dlm_lkb *lkb)</div><div class='del'>-{</div><div class='del'>-	struct dlm_callback *cb;</div><div class='del'>-</div><div class='del'>-	/* lkb_id lkb_flags mode flags sb_status sb_flags */</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-	list_for_each_entry(cb, &amp;lkb-&gt;lkb_callbacks, list) {</div><div class='del'>-		seq_printf(s, "%x %x %d %x %d %x\n",</div><div class='del'>-			   lkb-&gt;lkb_id,</div><div class='del'>-			   dlm_iflags_val(lkb),</div><div class='del'>-			   cb-&gt;mode,</div><div class='del'>-			   cb-&gt;flags,</div><div class='del'>-			   cb-&gt;sb_status,</div><div class='del'>-			   cb-&gt;sb_flags);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_format5(struct dlm_rsb *r, struct seq_file *s)</div><div class='del'>-{</div><div class='del'>-	struct dlm_lkb *lkb;</div><div class='del'>-</div><div class='del'>-	lock_rsb(r);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(lkb, &amp;r-&gt;res_grantqueue, lkb_statequeue) {</div><div class='del'>-		print_format5_lock(s, lkb);</div><div class='del'>-		if (seq_has_overflowed(s))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(lkb, &amp;r-&gt;res_convertqueue, lkb_statequeue) {</div><div class='del'>-		print_format5_lock(s, lkb);</div><div class='del'>-		if (seq_has_overflowed(s))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(lkb, &amp;r-&gt;res_waitqueue, lkb_statequeue) {</div><div class='del'>-		print_format5_lock(s, lkb);</div><div class='del'>-		if (seq_has_overflowed(s))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>- out:</div><div class='del'>-	unlock_rsb(r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct rsbtbl_iter {</div><div class='del'>-	struct dlm_rsb *rsb;</div><div class='del'>-	unsigned bucket;</div><div class='del'>-	int format;</div><div class='del'>-	int header;</div><div class='del'>-};</div><div class='add'>+static const struct seq_operations format1_seq_ops;</div><div class='add'>+static const struct seq_operations format2_seq_ops;</div><div class='add'>+static const struct seq_operations format3_seq_ops;</div><div class='add'>+static const struct seq_operations format4_seq_ops;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If the buffer is full, seq_printf can be called again, but it</div><div class='hunk'>@@ -428,207 +380,61 @@ struct rsbtbl_iter {</div><div class='ctx'> </div><div class='ctx'> static int table_seq_show(struct seq_file *seq, void *iter_ptr)</div><div class='ctx'> {</div><div class='del'>-	struct rsbtbl_iter *ri = iter_ptr;</div><div class='del'>-</div><div class='del'>-	switch (ri-&gt;format) {</div><div class='del'>-	case 1:</div><div class='del'>-		print_format1(ri-&gt;rsb, seq);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		if (ri-&gt;header) {</div><div class='del'>-			seq_puts(seq, "id nodeid remid pid xid exflags flags sts grmode rqmode time_ms r_nodeid r_len r_name\n");</div><div class='del'>-			ri-&gt;header = 0;</div><div class='del'>-		}</div><div class='del'>-		print_format2(ri-&gt;rsb, seq);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		if (ri-&gt;header) {</div><div class='del'>-			seq_puts(seq, "rsb ptr nodeid first_lkid flags !root_list_empty !recover_list_empty recover_locks_count len\n");</div><div class='del'>-			ri-&gt;header = 0;</div><div class='del'>-		}</div><div class='del'>-		print_format3(ri-&gt;rsb, seq);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		if (ri-&gt;header) {</div><div class='del'>-			seq_puts(seq, "rsb ptr nodeid master_nodeid dir_nodeid our_nodeid toss_time flags len str|hex name\n");</div><div class='del'>-			ri-&gt;header = 0;</div><div class='del'>-		}</div><div class='del'>-		print_format4(ri-&gt;rsb, seq);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		if (ri-&gt;header) {</div><div class='del'>-			seq_puts(seq, "lkb_id lkb_flags mode flags sb_status sb_flags\n");</div><div class='del'>-			ri-&gt;header = 0;</div><div class='del'>-		}</div><div class='del'>-		print_format5(ri-&gt;rsb, seq);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	struct dlm_rsb *rsb = list_entry(iter_ptr, struct dlm_rsb, res_slow_list);</div><div class='add'>+</div><div class='add'>+	if (seq-&gt;op == &amp;format1_seq_ops)</div><div class='add'>+		print_format1(rsb, seq);</div><div class='add'>+	else if (seq-&gt;op == &amp;format2_seq_ops)</div><div class='add'>+		print_format2(rsb, seq);</div><div class='add'>+	else if (seq-&gt;op == &amp;format3_seq_ops)</div><div class='add'>+		print_format3(rsb, seq);</div><div class='add'>+	else if (seq-&gt;op == &amp;format4_seq_ops)</div><div class='add'>+		print_format4(rsb, seq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct seq_operations format1_seq_ops;</div><div class='del'>-static const struct seq_operations format2_seq_ops;</div><div class='del'>-static const struct seq_operations format3_seq_ops;</div><div class='del'>-static const struct seq_operations format4_seq_ops;</div><div class='del'>-static const struct seq_operations format5_seq_ops;</div><div class='del'>-</div><div class='ctx'> static void *table_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct rb_root *tree;</div><div class='del'>-	struct rb_node *node;</div><div class='ctx'> 	struct dlm_ls *ls = seq-&gt;private;</div><div class='del'>-	struct rsbtbl_iter *ri;</div><div class='del'>-	struct dlm_rsb *r;</div><div class='del'>-	loff_t n = *pos;</div><div class='del'>-	unsigned bucket, entry;</div><div class='del'>-	int toss = (seq-&gt;op == &amp;format4_seq_ops);</div><div class='del'>-</div><div class='del'>-	bucket = n &gt;&gt; 32;</div><div class='del'>-	entry = n &amp; ((1LL &lt;&lt; 32) - 1);</div><div class='del'>-</div><div class='del'>-	if (bucket &gt;= ls-&gt;ls_rsbtbl_size)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ri = kzalloc(sizeof(*ri), GFP_NOFS);</div><div class='del'>-	if (!ri)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (n == 0)</div><div class='del'>-		ri-&gt;header = 1;</div><div class='del'>-	if (seq-&gt;op == &amp;format1_seq_ops)</div><div class='del'>-		ri-&gt;format = 1;</div><div class='del'>-	if (seq-&gt;op == &amp;format2_seq_ops)</div><div class='del'>-		ri-&gt;format = 2;</div><div class='del'>-	if (seq-&gt;op == &amp;format3_seq_ops)</div><div class='del'>-		ri-&gt;format = 3;</div><div class='del'>-	if (seq-&gt;op == &amp;format4_seq_ops)</div><div class='del'>-		ri-&gt;format = 4;</div><div class='del'>-	if (seq-&gt;op == &amp;format5_seq_ops)</div><div class='del'>-		ri-&gt;format = 5;</div><div class='del'>-</div><div class='del'>-	tree = toss ? &amp;ls-&gt;ls_rsbtbl[bucket].toss : &amp;ls-&gt;ls_rsbtbl[bucket].keep;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	if (!RB_EMPTY_ROOT(tree)) {</div><div class='del'>-		for (node = rb_first(tree); node; node = rb_next(node)) {</div><div class='del'>-			r = rb_entry(node, struct dlm_rsb, res_hashnode);</div><div class='del'>-			if (!entry--) {</div><div class='del'>-				dlm_hold_rsb(r);</div><div class='del'>-				ri-&gt;rsb = r;</div><div class='del'>-				ri-&gt;bucket = bucket;</div><div class='del'>-				spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-				return ri;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * move to the first rsb in the next non-empty bucket</div><div class='del'>-	 */</div><div class='add'>+	struct list_head *list;</div><div class='ctx'> </div><div class='del'>-	/* zero the entry */</div><div class='del'>-	n &amp;= ~((1LL &lt;&lt; 32) - 1);</div><div class='add'>+	if (!*pos) {</div><div class='add'>+		if (seq-&gt;op == &amp;format2_seq_ops)</div><div class='add'>+			seq_puts(seq, "id nodeid remid pid xid exflags flags sts grmode rqmode time_ms r_nodeid r_len r_name\n");</div><div class='add'>+		else if (seq-&gt;op == &amp;format3_seq_ops)</div><div class='add'>+			seq_puts(seq, "rsb ptr nodeid first_lkid flags !root_list_empty !recover_list_empty recover_locks_count len\n");</div><div class='add'>+		else if (seq-&gt;op == &amp;format4_seq_ops)</div><div class='add'>+			seq_puts(seq, "rsb ptr nodeid master_nodeid dir_nodeid our_nodeid toss_time flags len str|hex name\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		bucket++;</div><div class='del'>-		n += 1LL &lt;&lt; 32;</div><div class='add'>+	if (seq-&gt;op == &amp;format4_seq_ops)</div><div class='add'>+		list = &amp;ls-&gt;ls_slow_inactive;</div><div class='add'>+	else</div><div class='add'>+		list = &amp;ls-&gt;ls_slow_active;</div><div class='ctx'> </div><div class='del'>-		if (bucket &gt;= ls-&gt;ls_rsbtbl_size) {</div><div class='del'>-			kfree(ri);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		tree = toss ? &amp;ls-&gt;ls_rsbtbl[bucket].toss : &amp;ls-&gt;ls_rsbtbl[bucket].keep;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-		if (!RB_EMPTY_ROOT(tree)) {</div><div class='del'>-			node = rb_first(tree);</div><div class='del'>-			r = rb_entry(node, struct dlm_rsb, res_hashnode);</div><div class='del'>-			dlm_hold_rsb(r);</div><div class='del'>-			ri-&gt;rsb = r;</div><div class='del'>-			ri-&gt;bucket = bucket;</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-			*pos = n;</div><div class='del'>-			return ri;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	}</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	return seq_list_start(list, *pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *table_seq_next(struct seq_file *seq, void *iter_ptr, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = seq-&gt;private;</div><div class='del'>-	struct rsbtbl_iter *ri = iter_ptr;</div><div class='del'>-	struct rb_root *tree;</div><div class='del'>-	struct rb_node *next;</div><div class='del'>-	struct dlm_rsb *r, *rp;</div><div class='del'>-	loff_t n = *pos;</div><div class='del'>-	unsigned bucket;</div><div class='del'>-	int toss = (seq-&gt;op == &amp;format4_seq_ops);</div><div class='del'>-</div><div class='del'>-	bucket = n &gt;&gt; 32;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * move to the next rsb in the same bucket</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	rp = ri-&gt;rsb;</div><div class='del'>-	next = rb_next(&amp;rp-&gt;res_hashnode);</div><div class='del'>-</div><div class='del'>-	if (next) {</div><div class='del'>-		r = rb_entry(next, struct dlm_rsb, res_hashnode);</div><div class='del'>-		dlm_hold_rsb(r);</div><div class='del'>-		ri-&gt;rsb = r;</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-		dlm_put_rsb(rp);</div><div class='del'>-		++*pos;</div><div class='del'>-		return ri;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	dlm_put_rsb(rp);</div><div class='add'>+	struct list_head *list;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * move to the first rsb in the next non-empty bucket</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* zero the entry */</div><div class='del'>-	n &amp;= ~((1LL &lt;&lt; 32) - 1);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		bucket++;</div><div class='del'>-		n += 1LL &lt;&lt; 32;</div><div class='add'>+	if (seq-&gt;op == &amp;format4_seq_ops)</div><div class='add'>+		list = &amp;ls-&gt;ls_slow_inactive;</div><div class='add'>+	else</div><div class='add'>+		list = &amp;ls-&gt;ls_slow_active;</div><div class='ctx'> </div><div class='del'>-		if (bucket &gt;= ls-&gt;ls_rsbtbl_size) {</div><div class='del'>-			kfree(ri);</div><div class='del'>-			++*pos;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		tree = toss ? &amp;ls-&gt;ls_rsbtbl[bucket].toss : &amp;ls-&gt;ls_rsbtbl[bucket].keep;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-		if (!RB_EMPTY_ROOT(tree)) {</div><div class='del'>-			next = rb_first(tree);</div><div class='del'>-			r = rb_entry(next, struct dlm_rsb, res_hashnode);</div><div class='del'>-			dlm_hold_rsb(r);</div><div class='del'>-			ri-&gt;rsb = r;</div><div class='del'>-			ri-&gt;bucket = bucket;</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-			*pos = n;</div><div class='del'>-			return ri;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	}</div><div class='add'>+	return seq_list_next(iter_ptr, list, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void table_seq_stop(struct seq_file *seq, void *iter_ptr)</div><div class='ctx'> {</div><div class='del'>-	struct rsbtbl_iter *ri = iter_ptr;</div><div class='add'>+	struct dlm_ls *ls = seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (ri) {</div><div class='del'>-		dlm_put_rsb(ri-&gt;rsb);</div><div class='del'>-		kfree(ri);</div><div class='del'>-	}</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct seq_operations format1_seq_ops = {</div><div class='hunk'>@@ -659,18 +465,10 @@ static const struct seq_operations format4_seq_ops = {</div><div class='ctx'> 	.show  = table_seq_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct seq_operations format5_seq_ops = {</div><div class='del'>-	.start = table_seq_start,</div><div class='del'>-	.next  = table_seq_next,</div><div class='del'>-	.stop  = table_seq_stop,</div><div class='del'>-	.show  = table_seq_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct file_operations format1_fops;</div><div class='ctx'> static const struct file_operations format2_fops;</div><div class='ctx'> static const struct file_operations format3_fops;</div><div class='ctx'> static const struct file_operations format4_fops;</div><div class='del'>-static const struct file_operations format5_fops;</div><div class='ctx'> </div><div class='ctx'> static int table_open1(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -757,20 +555,6 @@ static int table_open4(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int table_open5(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct seq_file *seq;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = seq_open(file, &amp;format5_seq_ops);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	seq = file-&gt;private_data;</div><div class='del'>-	seq-&gt;private = inode-&gt;i_private; /* the dlm_ls */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct file_operations format1_fops = {</div><div class='ctx'> 	.owner   = THIS_MODULE,</div><div class='ctx'> 	.open    = table_open1,</div><div class='hunk'>@@ -804,14 +588,6 @@ static const struct file_operations format4_fops = {</div><div class='ctx'> 	.release = seq_release</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct file_operations format5_fops = {</div><div class='del'>-	.owner   = THIS_MODULE,</div><div class='del'>-	.open    = table_open5,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.release = seq_release</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * dump lkb's on the ls_waiters list</div><div class='ctx'>  */</div><div class='hunk'>@@ -823,7 +599,13 @@ static ssize_t waiters_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;debug_buf_lock);</div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	ret = dlm_lock_recovery_try(ls);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		rv = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	memset(debug_buf, 0, sizeof(debug_buf));</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(lkb, &amp;ls-&gt;ls_waiters, lkb_wait_reply) {</div><div class='hunk'>@@ -834,9 +616,11 @@ static ssize_t waiters_read(struct file *file, char __user *userbuf,</div><div class='ctx'> 			break;</div><div class='ctx'> 		pos += ret;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='add'>+	dlm_unlock_recovery(ls);</div><div class='ctx'> </div><div class='ctx'> 	rv = simple_read_from_buffer(userbuf, count, ppos, debug_buf, pos);</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;debug_buf_lock);</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='hunk'>@@ -858,7 +642,12 @@ static ssize_t waiters_write(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	if (n != 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	error = dlm_lock_recovery_try(ls);</div><div class='add'>+	if (!error)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	error = dlm_debug_add_lkb_to_waiters(ls, lkb_id, mstype, to_nodeid);</div><div class='add'>+	dlm_unlock_recovery(ls);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -944,7 +733,6 @@ out:</div><div class='ctx'> static const struct file_operations dlm_rawmsg_fops = {</div><div class='ctx'> 	.open	= simple_open,</div><div class='ctx'> 	.write	= dlm_rawmsg_write,</div><div class='del'>-	.llseek	= no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void *dlm_create_debug_comms_file(int nodeid, void *data)</div><div class='hunk'>@@ -1021,16 +809,6 @@ void dlm_create_debug_file(struct dlm_ls *ls)</div><div class='ctx'> 							  dlm_root,</div><div class='ctx'> 							  ls,</div><div class='ctx'> 							  &amp;waiters_fops);</div><div class='del'>-</div><div class='del'>-	/* format 5 */</div><div class='del'>-</div><div class='del'>-	snprintf(name, sizeof(name), "%s_queued_asts", ls-&gt;ls_name);</div><div class='del'>-</div><div class='del'>-	ls-&gt;ls_debug_queued_asts_dentry = debugfs_create_file(name,</div><div class='del'>-							      0644,</div><div class='del'>-							      dlm_root,</div><div class='del'>-							      ls,</div><div class='del'>-							      &amp;format5_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init dlm_register_debugfs(void)</div><div class='head'>diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c<br/>index f6acba4310a7..b1ab0adbd9d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/dir.c</a></div><div class='hunk'>@@ -47,15 +47,13 @@ int dlm_dir_nodeid(struct dlm_rsb *r)</div><div class='ctx'> 	return r-&gt;res_dir_nodeid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_recover_dir_nodeid(struct dlm_ls *ls)</div><div class='add'>+void dlm_recover_dir_nodeid(struct dlm_ls *ls, const struct list_head *root_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry(r, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='add'>+	list_for_each_entry(r, root_list, res_root_list) {</div><div class='ctx'> 		r-&gt;res_dir_nodeid = dlm_hash2nodeid(ls, r-&gt;res_hash);</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dlm_recover_directory(struct dlm_ls *ls, uint64_t seq)</div><div class='hunk'>@@ -200,35 +198,98 @@ static struct dlm_rsb *find_rsb_root(struct dlm_ls *ls, const char *name,</div><div class='ctx'> 				     int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='del'>-	uint32_t hash, bucket;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	hash = jhash(name, len, 0);</div><div class='del'>-	bucket = hash &amp; (ls-&gt;ls_rsbtbl_size - 1);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[bucket].keep, name, len, &amp;r);</div><div class='del'>-	if (rv)</div><div class='del'>-		rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[bucket].toss,</div><div class='del'>-					 name, len, &amp;r);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl, name, len, &amp;r);</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 	if (!rv)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry(r, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='add'>+	list_for_each_entry(r, &amp;ls-&gt;ls_masters_list, res_masters_list) {</div><div class='ctx'> 		if (len == r-&gt;res_length &amp;&amp; !memcmp(name, r-&gt;res_name, len)) {</div><div class='del'>-			up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> 			log_debug(ls, "find_rsb_root revert to root_list %s",</div><div class='ctx'> 				  r-&gt;res_name);</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct dlm_dir_dump {</div><div class='add'>+	/* init values to match if whole</div><div class='add'>+	 * dump fits to one seq. Sanity check only.</div><div class='add'>+	 */</div><div class='add'>+	uint64_t seq_init;</div><div class='add'>+	uint64_t nodeid_init;</div><div class='add'>+	/* compare local pointer with last lookup,</div><div class='add'>+	 * just a sanity check.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head *last;</div><div class='add'>+</div><div class='add'>+	unsigned int sent_res; /* for log info */</div><div class='add'>+	unsigned int sent_msg; /* for log info */</div><div class='add'>+</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void drop_dir_ctx(struct dlm_ls *ls, int nodeid)</div><div class='add'>+{</div><div class='add'>+	struct dlm_dir_dump *dd, *safe;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+	list_for_each_entry_safe(dd, safe, &amp;ls-&gt;ls_dir_dump_list, list) {</div><div class='add'>+		if (dd-&gt;nodeid_init == nodeid) {</div><div class='add'>+			log_error(ls, "drop dump seq %llu",</div><div class='add'>+				 (unsigned long long)dd-&gt;seq_init);</div><div class='add'>+			list_del(&amp;dd-&gt;list);</div><div class='add'>+			kfree(dd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dlm_dir_dump *lookup_dir_dump(struct dlm_ls *ls, int nodeid)</div><div class='add'>+{</div><div class='add'>+	struct dlm_dir_dump *iter, *dd = NULL;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+	list_for_each_entry(iter, &amp;ls-&gt;ls_dir_dump_list, list) {</div><div class='add'>+		if (iter-&gt;nodeid_init == nodeid) {</div><div class='add'>+			dd = iter;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+</div><div class='add'>+	return dd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dlm_dir_dump *init_dir_dump(struct dlm_ls *ls, int nodeid)</div><div class='add'>+{</div><div class='add'>+	struct dlm_dir_dump *dd;</div><div class='add'>+</div><div class='add'>+	dd = lookup_dir_dump(ls, nodeid);</div><div class='add'>+	if (dd) {</div><div class='add'>+		log_error(ls, "found ongoing dir dump for node %d, will drop it",</div><div class='add'>+			  nodeid);</div><div class='add'>+		drop_dir_ctx(ls, nodeid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dd = kzalloc(sizeof(*dd), GFP_ATOMIC);</div><div class='add'>+	if (!dd)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dd-&gt;seq_init = ls-&gt;ls_recover_seq;</div><div class='add'>+	dd-&gt;nodeid_init = nodeid;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+	list_add(&amp;dd-&gt;list, &amp;ls-&gt;ls_dir_dump_list);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+</div><div class='add'>+	return dd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Find the rsb where we left off (or start again), then send rsb names</div><div class='ctx'>    for rsb's we're master of and whose directory node matches the requesting</div><div class='ctx'>    node.  inbuf is the rsb name last sent, inlen is the name's length */</div><div class='hunk'>@@ -239,27 +300,50 @@ void dlm_copy_master_names(struct dlm_ls *ls, const char *inbuf, int inlen,</div><div class='ctx'> 	struct list_head *list;</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> 	int offset = 0, dir_nodeid;</div><div class='add'>+	struct dlm_dir_dump *dd;</div><div class='ctx'> 	__be16 be_namelen;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_root_sem);</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_masters_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (inlen &gt; 1) {</div><div class='add'>+		dd = lookup_dir_dump(ls, nodeid);</div><div class='add'>+		if (!dd) {</div><div class='add'>+			log_error(ls, "failed to lookup dir dump context nodeid: %d",</div><div class='add'>+				  nodeid);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* next chunk in dump */</div><div class='ctx'> 		r = find_rsb_root(ls, inbuf, inlen);</div><div class='ctx'> 		if (!r) {</div><div class='ctx'> 			log_error(ls, "copy_master_names from %d start %d %.*s",</div><div class='ctx'> 				  nodeid, inlen, inlen, inbuf);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		list = r-&gt;res_root_list.next;</div><div class='add'>+		list = r-&gt;res_masters_list.next;</div><div class='add'>+</div><div class='add'>+		/* sanity checks */</div><div class='add'>+		if (dd-&gt;last != &amp;r-&gt;res_masters_list ||</div><div class='add'>+		    dd-&gt;seq_init != ls-&gt;ls_recover_seq) {</div><div class='add'>+			log_error(ls, "failed dir dump sanity check seq_init: %llu seq: %llu",</div><div class='add'>+				  (unsigned long long)dd-&gt;seq_init,</div><div class='add'>+				  (unsigned long long)ls-&gt;ls_recover_seq);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		list = ls-&gt;ls_root_list.next;</div><div class='del'>-	}</div><div class='add'>+		dd = init_dir_dump(ls, nodeid);</div><div class='add'>+		if (!dd) {</div><div class='add'>+			log_error(ls, "failed to allocate dir dump context");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	for (offset = 0; list != &amp;ls-&gt;ls_root_list; list = list-&gt;next) {</div><div class='del'>-		r = list_entry(list, struct dlm_rsb, res_root_list);</div><div class='del'>-		if (r-&gt;res_nodeid)</div><div class='del'>-			continue;</div><div class='add'>+		/* start dump */</div><div class='add'>+		list = ls-&gt;ls_masters_list.next;</div><div class='add'>+		dd-&gt;last = list;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for (offset = 0; list != &amp;ls-&gt;ls_masters_list; list = list-&gt;next) {</div><div class='add'>+		r = list_entry(list, struct dlm_rsb, res_masters_list);</div><div class='ctx'> 		dir_nodeid = dlm_dir_nodeid(r);</div><div class='ctx'> 		if (dir_nodeid != nodeid)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -277,7 +361,7 @@ void dlm_copy_master_names(struct dlm_ls *ls, const char *inbuf, int inlen,</div><div class='ctx'> 			be_namelen = cpu_to_be16(0);</div><div class='ctx'> 			memcpy(outbuf + offset, &amp;be_namelen, sizeof(__be16));</div><div class='ctx'> 			offset += sizeof(__be16);</div><div class='del'>-			ls-&gt;ls_recover_dir_sent_msg++;</div><div class='add'>+			dd-&gt;sent_msg++;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -286,7 +370,8 @@ void dlm_copy_master_names(struct dlm_ls *ls, const char *inbuf, int inlen,</div><div class='ctx'> 		offset += sizeof(__be16);</div><div class='ctx'> 		memcpy(outbuf + offset, r-&gt;res_name, r-&gt;res_length);</div><div class='ctx'> 		offset += r-&gt;res_length;</div><div class='del'>-		ls-&gt;ls_recover_dir_sent_res++;</div><div class='add'>+		dd-&gt;sent_res++;</div><div class='add'>+		dd-&gt;last = list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -294,14 +379,22 @@ void dlm_copy_master_names(struct dlm_ls *ls, const char *inbuf, int inlen,</div><div class='ctx'> 	 * terminating record.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if ((list == &amp;ls-&gt;ls_root_list) &amp;&amp;</div><div class='add'>+	if ((list == &amp;ls-&gt;ls_masters_list) &amp;&amp;</div><div class='ctx'> 	    (offset + sizeof(uint16_t) &lt;= outlen)) {</div><div class='add'>+		/* end dump */</div><div class='ctx'> 		be_namelen = cpu_to_be16(0xFFFF);</div><div class='ctx'> 		memcpy(outbuf + offset, &amp;be_namelen, sizeof(__be16));</div><div class='ctx'> 		offset += sizeof(__be16);</div><div class='del'>-		ls-&gt;ls_recover_dir_sent_msg++;</div><div class='add'>+		dd-&gt;sent_msg++;</div><div class='add'>+		log_rinfo(ls, "dlm_recover_directory nodeid %d sent %u res out %u messages",</div><div class='add'>+			  nodeid, dd-&gt;sent_res, dd-&gt;sent_msg);</div><div class='add'>+</div><div class='add'>+		write_lock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+		list_del_init(&amp;dd-&gt;list);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+		kfree(dd);</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='del'>-	up_read(&amp;ls-&gt;ls_root_sem);</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_masters_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/dir.h b/fs/dlm/dir.h<br/>index 39ecb69d7ef3..5b2a7ee3762d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/dir.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/dir.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/dir.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/dir.h</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'> </div><div class='ctx'> int dlm_dir_nodeid(struct dlm_rsb *rsb);</div><div class='ctx'> int dlm_hash2nodeid(struct dlm_ls *ls, uint32_t hash);</div><div class='del'>-void dlm_recover_dir_nodeid(struct dlm_ls *ls);</div><div class='add'>+void dlm_recover_dir_nodeid(struct dlm_ls *ls,</div><div class='add'>+			    const struct list_head *root_list);</div><div class='ctx'> int dlm_recover_directory(struct dlm_ls *ls, uint64_t seq);</div><div class='ctx'> void dlm_copy_master_names(struct dlm_ls *ls, const char *inbuf, int inlen,</div><div class='ctx'> 			   char *outbuf, int outlen, int nodeid);</div><div class='head'>diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h<br/>index dfc444dad329..d534a4bc162b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/dlm_internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/dlm_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/dlm_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/dlm_internal.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  * This is the main header file to be included in each DLM source file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/dlm_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -33,8 +34,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/xarray.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -98,17 +100,6 @@ do { \</div><div class='ctx'>   } \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define DLM_RTF_SHRINK_BIT	0</div><div class='del'>-</div><div class='del'>-struct dlm_rsbtable {</div><div class='del'>-	struct rb_root		keep;</div><div class='del'>-	struct rb_root		toss;</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Lockspace member (per node in a ls)</div><div class='ctx'>  */</div><div class='hunk'>@@ -204,8 +195,7 @@ struct dlm_args {</div><div class='ctx'> #define DLM_IFL_OVERLAP_CANCEL_BIT 20</div><div class='ctx'> #define DLM_IFL_ENDOFLIFE_BIT	21</div><div class='ctx'> #define DLM_IFL_DEADLOCK_CANCEL_BIT 24</div><div class='del'>-#define DLM_IFL_CB_PENDING_BIT	25</div><div class='del'>-#define __DLM_IFL_MAX_BIT	DLM_IFL_CB_PENDING_BIT</div><div class='add'>+#define __DLM_IFL_MAX_BIT	DLM_IFL_DEADLOCK_CANCEL_BIT</div><div class='ctx'> </div><div class='ctx'> /* lkb_dflags */</div><div class='ctx'> </div><div class='hunk'>@@ -217,14 +207,47 @@ struct dlm_args {</div><div class='ctx'> #define DLM_CB_CAST		0x00000001</div><div class='ctx'> #define DLM_CB_BAST		0x00000002</div><div class='ctx'> </div><div class='add'>+/* much of this is just saving user space pointers associated with the</div><div class='add'>+ * lock that we pass back to the user lib with an ast</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct dlm_user_args {</div><div class='add'>+	struct dlm_user_proc	*proc; /* each process that opens the lockspace</div><div class='add'>+					* device has private data</div><div class='add'>+					* (dlm_user_proc) on the struct file,</div><div class='add'>+					* the process's locks point back to it</div><div class='add'>+					*/</div><div class='add'>+	struct dlm_lksb		lksb;</div><div class='add'>+	struct dlm_lksb __user	*user_lksb;</div><div class='add'>+	void __user		*castparam;</div><div class='add'>+	void __user		*castaddr;</div><div class='add'>+	void __user		*bastparam;</div><div class='add'>+	void __user		*bastaddr;</div><div class='add'>+	uint64_t		xid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dlm_callback {</div><div class='ctx'> 	uint32_t		flags;		/* DLM_CBF_ */</div><div class='ctx'> 	int			sb_status;	/* copy to lksb status */</div><div class='ctx'> 	uint8_t			sb_flags;	/* copy to lksb flags */</div><div class='ctx'> 	int8_t			mode; /* rq mode of bast, gr mode of cast */</div><div class='add'>+	bool			copy_lvb;</div><div class='add'>+	struct dlm_lksb		*lkb_lksb;</div><div class='add'>+	unsigned char		lvbptr[DLM_USER_LVB_LEN];</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		void			*astparam;	/* caller's ast arg */</div><div class='add'>+		struct dlm_user_args	ua;</div><div class='add'>+	};</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+	void			(*bastfn)(void *astparam, int mode);</div><div class='add'>+	void			(*astfn)(void *astparam);</div><div class='add'>+	char			res_name[DLM_RESNAME_MAXLEN];</div><div class='add'>+	size_t			res_length;</div><div class='add'>+	uint32_t		ls_id;</div><div class='add'>+	uint32_t		lkb_id;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	list;</div><div class='del'>-	struct kref		ref;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dlm_lkb {</div><div class='hunk'>@@ -246,7 +269,7 @@ struct dlm_lkb {</div><div class='ctx'> 	int8_t			lkb_highbast;	/* highest mode bast sent for */</div><div class='ctx'> </div><div class='ctx'> 	int8_t			lkb_wait_type;	/* type of reply waiting for */</div><div class='del'>-	atomic_t		lkb_wait_count;</div><div class='add'>+	int8_t			lkb_wait_count;</div><div class='ctx'> 	int			lkb_wait_nodeid; /* for debugging */</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	lkb_statequeue;	/* rsb g/c/w list */</div><div class='hunk'>@@ -255,13 +278,10 @@ struct dlm_lkb {</div><div class='ctx'> 	struct list_head	lkb_ownqueue;	/* list of locks for a process */</div><div class='ctx'> 	ktime_t			lkb_timestamp;</div><div class='ctx'> </div><div class='del'>-	spinlock_t		lkb_cb_lock;</div><div class='del'>-	struct work_struct	lkb_cb_work;</div><div class='del'>-	struct list_head	lkb_cb_list; /* for ls_cb_delay or proc-&gt;asts */</div><div class='del'>-	struct list_head	lkb_callbacks;</div><div class='del'>-	struct dlm_callback	*lkb_last_cast;</div><div class='del'>-	struct dlm_callback	*lkb_last_cb;</div><div class='del'>-	int			lkb_last_bast_mode;</div><div class='add'>+	int8_t			lkb_last_cast_cb_mode;</div><div class='add'>+	int8_t			lkb_last_bast_cb_mode;</div><div class='add'>+	int8_t			lkb_last_cb_mode;</div><div class='add'>+	uint8_t			lkb_last_cb_flags;</div><div class='ctx'> 	ktime_t			lkb_last_cast_time;	/* for debugging */</div><div class='ctx'> 	ktime_t			lkb_last_bast_time;	/* for debugging */</div><div class='ctx'> </div><div class='hunk'>@@ -275,6 +295,7 @@ struct dlm_lkb {</div><div class='ctx'> 		void			*lkb_astparam;	/* caller's ast arg */</div><div class='ctx'> 		struct dlm_user_args	*lkb_ua;</div><div class='ctx'> 	};</div><div class='add'>+	struct rcu_head		rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -290,30 +311,30 @@ struct dlm_lkb {</div><div class='ctx'> struct dlm_rsb {</div><div class='ctx'> 	struct dlm_ls		*res_ls;	/* the lockspace */</div><div class='ctx'> 	struct kref		res_ref;</div><div class='del'>-	struct mutex		res_mutex;</div><div class='add'>+	spinlock_t		res_lock;</div><div class='ctx'> 	unsigned long		res_flags;</div><div class='ctx'> 	int			res_length;	/* length of rsb name */</div><div class='ctx'> 	int			res_nodeid;</div><div class='ctx'> 	int			res_master_nodeid;</div><div class='ctx'> 	int			res_dir_nodeid;</div><div class='del'>-	int			res_id;		/* for ls_recover_idr */</div><div class='add'>+	unsigned long		res_id;		/* for ls_recover_xa */</div><div class='ctx'> 	uint32_t                res_lvbseq;</div><div class='ctx'> 	uint32_t		res_hash;</div><div class='del'>-	uint32_t		res_bucket;	/* rsbtbl */</div><div class='ctx'> 	unsigned long		res_toss_time;</div><div class='ctx'> 	uint32_t		res_first_lkid;</div><div class='ctx'> 	struct list_head	res_lookup;	/* lkbs waiting on first */</div><div class='del'>-	union {</div><div class='del'>-		struct list_head	res_hashchain;</div><div class='del'>-		struct rb_node		res_hashnode;	/* rsbtbl */</div><div class='del'>-	};</div><div class='add'>+	struct rhash_head	res_node;	/* rsbtbl */</div><div class='ctx'> 	struct list_head	res_grantqueue;</div><div class='ctx'> 	struct list_head	res_convertqueue;</div><div class='ctx'> 	struct list_head	res_waitqueue;</div><div class='ctx'> </div><div class='add'>+	struct list_head	res_slow_list;      /* ls_slow_* */</div><div class='add'>+	struct list_head	res_scan_list;</div><div class='ctx'> 	struct list_head	res_root_list;	    /* used for recovery */</div><div class='add'>+	struct list_head	res_masters_list;   /* used for recovery */</div><div class='ctx'> 	struct list_head	res_recover_list;   /* used for recovery */</div><div class='ctx'> 	int			res_recover_locks_count;</div><div class='add'>+	struct rcu_head		rcu;</div><div class='ctx'> </div><div class='ctx'> 	char			*res_lvbptr;</div><div class='ctx'> 	char			res_name[DLM_RESNAME_MAXLEN+1];</div><div class='hunk'>@@ -346,6 +367,8 @@ enum rsb_flags {</div><div class='ctx'> 	RSB_RECOVER_CONVERT,</div><div class='ctx'> 	RSB_RECOVER_GRANT,</div><div class='ctx'> 	RSB_RECOVER_LVB_INVAL,</div><div class='add'>+	RSB_INACTIVE,</div><div class='add'>+	RSB_HASHED, /* set while rsb is on ls_rsbtbl */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void rsb_set_flag(struct dlm_rsb *r, enum rsb_flags flag)</div><div class='hunk'>@@ -536,16 +559,8 @@ struct rcom_lock {</div><div class='ctx'> 	char			rl_lvb[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The max number of resources per rsbtbl bucket that shrink will attempt</div><div class='del'>- * to remove in each iteration.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DLM_REMOVE_NAMES_MAX 8</div><div class='del'>-</div><div class='ctx'> struct dlm_ls {</div><div class='ctx'> 	struct list_head	ls_list;	/* list of lockspaces */</div><div class='del'>-	dlm_lockspace_t		*ls_local_handle;</div><div class='ctx'> 	uint32_t		ls_global_id;	/* global unique lockspace ID */</div><div class='ctx'> 	uint32_t		ls_generation;</div><div class='ctx'> 	uint32_t		ls_exflags;</div><div class='hunk'>@@ -555,28 +570,28 @@ struct dlm_ls {</div><div class='ctx'> 	wait_queue_head_t	ls_count_wait;</div><div class='ctx'> 	int			ls_create_count; /* create/release refcount */</div><div class='ctx'> 	unsigned long		ls_flags;	/* LSFL_ */</div><div class='del'>-	unsigned long		ls_scan_time;</div><div class='ctx'> 	struct kobject		ls_kobj;</div><div class='ctx'> </div><div class='del'>-	struct idr		ls_lkbidr;</div><div class='del'>-	spinlock_t		ls_lkbidr_spin;</div><div class='add'>+	struct xarray		ls_lkbxa;</div><div class='add'>+	rwlock_t		ls_lkbxa_lock;</div><div class='add'>+</div><div class='add'>+	/* an rsb is on rsbtl for primary locking functions,</div><div class='add'>+	   and on a slow list for recovery/dump iteration  */</div><div class='add'>+	struct rhashtable	ls_rsbtbl;</div><div class='add'>+	rwlock_t		ls_rsbtbl_lock; /* for ls_rsbtbl and ls_slow */</div><div class='add'>+	struct list_head	ls_slow_inactive; /* to iterate rsbtbl */</div><div class='add'>+	struct list_head	ls_slow_active;   /* to iterate rsbtbl */</div><div class='ctx'> </div><div class='del'>-	struct dlm_rsbtable	*ls_rsbtbl;</div><div class='del'>-	uint32_t		ls_rsbtbl_size;</div><div class='add'>+	struct timer_list	ls_scan_timer; /* based on first scan_list rsb toss_time */</div><div class='add'>+	struct list_head	ls_scan_list;  /* rsbs ordered by res_toss_time */</div><div class='add'>+	spinlock_t		ls_scan_lock;</div><div class='ctx'> </div><div class='del'>-	struct mutex		ls_waiters_mutex;</div><div class='add'>+	spinlock_t		ls_waiters_lock;</div><div class='ctx'> 	struct list_head	ls_waiters;	/* lkbs needing a reply */</div><div class='ctx'> </div><div class='del'>-	struct mutex		ls_orphans_mutex;</div><div class='add'>+	spinlock_t		ls_orphans_lock;</div><div class='ctx'> 	struct list_head	ls_orphans;</div><div class='ctx'> </div><div class='del'>-	spinlock_t		ls_new_rsb_spin;</div><div class='del'>-	int			ls_new_rsb_count;</div><div class='del'>-	struct list_head	ls_new_rsb;	/* new rsb structs */</div><div class='del'>-</div><div class='del'>-	char			*ls_remove_names[DLM_REMOVE_NAMES_MAX];</div><div class='del'>-	int			ls_remove_lens[DLM_REMOVE_NAMES_MAX];</div><div class='del'>-</div><div class='ctx'> 	struct list_head	ls_nodes;	/* current nodes in ls */</div><div class='ctx'> 	struct list_head	ls_nodes_gone;	/* dead node list, recovery */</div><div class='ctx'> 	int			ls_num_nodes;	/* number of nodes in ls */</div><div class='hunk'>@@ -613,7 +628,6 @@ struct dlm_ls {</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		ls_cb_lock;</div><div class='ctx'> 	struct list_head	ls_cb_delay; /* save for queue_work later */</div><div class='del'>-	struct timer_list	ls_timer;</div><div class='ctx'> 	struct task_struct	*ls_recoverd_task;</div><div class='ctx'> 	struct mutex		ls_recoverd_active;</div><div class='ctx'> 	spinlock_t		ls_recover_lock;</div><div class='hunk'>@@ -622,33 +636,33 @@ struct dlm_ls {</div><div class='ctx'> 	uint64_t		ls_recover_seq;</div><div class='ctx'> 	struct dlm_recover	*ls_recover_args;</div><div class='ctx'> 	struct rw_semaphore	ls_in_recovery;	/* block local requests */</div><div class='del'>-	struct rw_semaphore	ls_recv_active;	/* block dlm_recv */</div><div class='add'>+	rwlock_t		ls_recv_active;	/* block dlm_recv */</div><div class='ctx'> 	struct list_head	ls_requestqueue;/* queue remote requests */</div><div class='del'>-	atomic_t		ls_requestqueue_cnt;</div><div class='del'>-	wait_queue_head_t	ls_requestqueue_wait;</div><div class='del'>-	struct mutex		ls_requestqueue_mutex;</div><div class='add'>+	rwlock_t		ls_requestqueue_lock;</div><div class='ctx'> 	struct dlm_rcom		*ls_recover_buf;</div><div class='ctx'> 	int			ls_recover_nodeid; /* for debugging */</div><div class='del'>-	unsigned int		ls_recover_dir_sent_res; /* for log info */</div><div class='del'>-	unsigned int		ls_recover_dir_sent_msg; /* for log info */</div><div class='ctx'> 	unsigned int		ls_recover_locks_in; /* for log info */</div><div class='ctx'> 	uint64_t		ls_rcom_seq;</div><div class='ctx'> 	spinlock_t		ls_rcom_spin;</div><div class='ctx'> 	struct list_head	ls_recover_list;</div><div class='ctx'> 	spinlock_t		ls_recover_list_lock;</div><div class='ctx'> 	int			ls_recover_list_count;</div><div class='del'>-	struct idr		ls_recover_idr;</div><div class='del'>-	spinlock_t		ls_recover_idr_lock;</div><div class='add'>+	struct xarray		ls_recover_xa;</div><div class='add'>+	spinlock_t		ls_recover_xa_lock;</div><div class='ctx'> 	wait_queue_head_t	ls_wait_general;</div><div class='ctx'> 	wait_queue_head_t	ls_recover_lock_wait;</div><div class='ctx'> 	spinlock_t		ls_clear_proc_locks;</div><div class='ctx'> </div><div class='del'>-	struct list_head	ls_root_list;	/* root resources */</div><div class='del'>-	struct rw_semaphore	ls_root_sem;	/* protect root_list */</div><div class='add'>+	struct list_head	ls_masters_list; /* root resources */</div><div class='add'>+	rwlock_t		ls_masters_lock; /* protect root_list */</div><div class='add'>+	struct list_head	ls_dir_dump_list; /* root resources */</div><div class='add'>+	rwlock_t		ls_dir_dump_lock; /* protect root_list */</div><div class='ctx'> </div><div class='ctx'> 	const struct dlm_lockspace_ops *ls_ops;</div><div class='ctx'> 	void			*ls_ops_arg;</div><div class='ctx'> </div><div class='add'>+	struct work_struct	ls_free_work;</div><div class='add'>+</div><div class='ctx'> 	int			ls_namelen;</div><div class='ctx'> 	char			ls_name[DLM_LOCKSPACE_LEN + 1];</div><div class='ctx'> };</div><div class='hunk'>@@ -686,23 +700,9 @@ struct dlm_ls {</div><div class='ctx'> #define LSFL_UEVENT_WAIT	7</div><div class='ctx'> #define LSFL_CB_DELAY		9</div><div class='ctx'> #define LSFL_NODIR		10</div><div class='del'>-</div><div class='del'>-/* much of this is just saving user space pointers associated with the</div><div class='del'>-   lock that we pass back to the user lib with an ast */</div><div class='del'>-</div><div class='del'>-struct dlm_user_args {</div><div class='del'>-	struct dlm_user_proc	*proc; /* each process that opens the lockspace</div><div class='del'>-					  device has private data</div><div class='del'>-					  (dlm_user_proc) on the struct file,</div><div class='del'>-					  the process's locks point back to it*/</div><div class='del'>-	struct dlm_lksb		lksb;</div><div class='del'>-	struct dlm_lksb __user	*user_lksb;</div><div class='del'>-	void __user		*castparam;</div><div class='del'>-	void __user		*castaddr;</div><div class='del'>-	void __user		*bastparam;</div><div class='del'>-	void __user		*bastaddr;</div><div class='del'>-	uint64_t		xid;</div><div class='del'>-};</div><div class='add'>+#define LSFL_RECV_MSG_BLOCKED	11</div><div class='add'>+#define LSFL_FS			12</div><div class='add'>+#define LSFL_SOFTIRQ		13</div><div class='ctx'> </div><div class='ctx'> #define DLM_PROC_FLAGS_CLOSING 1</div><div class='ctx'> #define DLM_PROC_FLAGS_COMPAT  2</div><div class='hunk'>@@ -806,6 +806,8 @@ static inline void dlm_set_sbflags_val(struct dlm_lkb *lkb, uint32_t val)</div><div class='ctx'> 			  __DLM_SBF_MAX_BIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern struct workqueue_struct *dlm_wq;</div><div class='add'>+</div><div class='ctx'> int dlm_plock_init(void);</div><div class='ctx'> void dlm_plock_exit(void);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c<br/>index 652c51fbbf76..be938fdf17d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/lock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/lock.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb,</div><div class='ctx'> 				    const struct dlm_message *ms, bool local);</div><div class='ctx'> static int receive_extralen(const struct dlm_message *ms);</div><div class='ctx'> static void do_purge(struct dlm_ls *ls, int nodeid, int pid);</div><div class='del'>-static void toss_rsb(struct kref *kref);</div><div class='add'>+static void deactivate_rsb(struct kref *kref);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Lock compatibilty matrix - thanks Steve</div><div class='hunk'>@@ -201,7 +201,7 @@ void dlm_dump_rsb(struct dlm_rsb *r)</div><div class='ctx'> </div><div class='ctx'> /* Threads cannot use the lockspace while it's being recovered */</div><div class='ctx'> </div><div class='del'>-static inline void dlm_lock_recovery(struct dlm_ls *ls)</div><div class='add'>+void dlm_lock_recovery(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	down_read(&amp;ls-&gt;ls_in_recovery);</div><div class='ctx'> }</div><div class='hunk'>@@ -320,11 +320,18 @@ static void queue_bast(struct dlm_rsb *r, struct dlm_lkb *lkb, int rqmode)</div><div class='ctx'>  * Basic operations on rsb's and lkb's</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline unsigned long rsb_toss_jiffies(void)</div><div class='add'>+{</div><div class='add'>+	return jiffies + (READ_ONCE(dlm_config.ci_toss_secs) * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This is only called to add a reference when the code already holds</div><div class='ctx'>    a valid reference to the rsb, so there's no need for locking. */</div><div class='ctx'> </div><div class='ctx'> static inline void hold_rsb(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='add'>+	/* inactive rsbs are not ref counted */</div><div class='add'>+	WARN_ON(rsb_flag(r, RSB_INACTIVE));</div><div class='ctx'> 	kref_get(&amp;r-&gt;res_ref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,19 +340,45 @@ void dlm_hold_rsb(struct dlm_rsb *r)</div><div class='ctx'> 	hold_rsb(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* When all references to the rsb are gone it's transferred to</div><div class='del'>-   the tossed list for later disposal. */</div><div class='add'>+/* TODO move this to lib/refcount.c */</div><div class='add'>+static __must_check bool</div><div class='add'>+dlm_refcount_dec_and_write_lock_bh(refcount_t *r, rwlock_t *lock)</div><div class='add'>+__cond_acquires(lock)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_not_one(r))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(lock);</div><div class='add'>+	if (!refcount_dec_and_test(r)) {</div><div class='add'>+		write_unlock_bh(lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO move this to include/linux/kref.h */</div><div class='add'>+static inline int dlm_kref_put_write_lock_bh(struct kref *kref,</div><div class='add'>+					     void (*release)(struct kref *kref),</div><div class='add'>+					     rwlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	if (dlm_refcount_dec_and_write_lock_bh(&amp;kref-&gt;refcount, lock)) {</div><div class='add'>+		release(kref);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void put_rsb(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='del'>-	uint32_t bucket = r-&gt;res_bucket;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	rv = kref_put_lock(&amp;r-&gt;res_ref, toss_rsb,</div><div class='del'>-			   &amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='add'>+	rv = dlm_kref_put_write_lock_bh(&amp;r-&gt;res_ref, deactivate_rsb,</div><div class='add'>+					&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 	if (rv)</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_put_rsb(struct dlm_rsb *r)</div><div class='hunk'>@@ -353,36 +386,209 @@ void dlm_put_rsb(struct dlm_rsb *r)</div><div class='ctx'> 	put_rsb(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pre_rsb_struct(struct dlm_ls *ls)</div><div class='add'>+/* connected with timer_delete_sync() in dlm_ls_stop() to stop</div><div class='add'>+ * new timers when recovery is triggered and don't run them</div><div class='add'>+ * again until a resume_scan_timer() tries it again.</div><div class='add'>+ */</div><div class='add'>+static void enable_scan_timer(struct dlm_ls *ls, unsigned long jiffies)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_rsb *r1, *r2;</div><div class='del'>-	int count = 0;</div><div class='add'>+	if (!dlm_locking_stopped(ls))</div><div class='add'>+		mod_timer(&amp;ls-&gt;ls_scan_timer, jiffies);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='del'>-	if (ls-&gt;ls_new_rsb_count &gt; dlm_config.ci_new_rsb_count / 2) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='add'>+/* This function tries to resume the timer callback if a rsb</div><div class='add'>+ * is on the scan list and no timer is pending. It might that</div><div class='add'>+ * the first entry is on currently executed as timer callback</div><div class='add'>+ * but we don't care if a timer queued up again and does</div><div class='add'>+ * nothing. Should be a rare case.</div><div class='add'>+ */</div><div class='add'>+void resume_scan_timer(struct dlm_ls *ls)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *r;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+	r = list_first_entry_or_null(&amp;ls-&gt;ls_scan_list, struct dlm_rsb,</div><div class='add'>+				     res_scan_list);</div><div class='add'>+	if (r &amp;&amp; !timer_pending(&amp;ls-&gt;ls_scan_timer))</div><div class='add'>+		enable_scan_timer(ls, r-&gt;res_toss_time);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ls_rsbtbl_lock must be held */</div><div class='add'>+</div><div class='add'>+static void del_scan(struct dlm_ls *ls, struct dlm_rsb *r)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *first;</div><div class='ctx'> </div><div class='del'>-	r1 = dlm_allocate_rsb(ls);</div><div class='del'>-	r2 = dlm_allocate_rsb(ls);</div><div class='add'>+	/* active rsbs should never be on the scan list */</div><div class='add'>+	WARN_ON(!rsb_flag(r, RSB_INACTIVE));</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='del'>-	if (r1) {</div><div class='del'>-		list_add(&amp;r1-&gt;res_hashchain, &amp;ls-&gt;ls_new_rsb);</div><div class='del'>-		ls-&gt;ls_new_rsb_count++;</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+	r-&gt;res_toss_time = 0;</div><div class='add'>+</div><div class='add'>+	/* if the rsb is not queued do nothing */</div><div class='add'>+	if (list_empty(&amp;r-&gt;res_scan_list))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* get the first element before delete */</div><div class='add'>+	first = list_first_entry(&amp;ls-&gt;ls_scan_list, struct dlm_rsb,</div><div class='add'>+				 res_scan_list);</div><div class='add'>+	list_del_init(&amp;r-&gt;res_scan_list);</div><div class='add'>+	/* check if the first element was the rsb we deleted */</div><div class='add'>+	if (first == r) {</div><div class='add'>+		/* try to get the new first element, if the list</div><div class='add'>+		 * is empty now try to delete the timer, if we are</div><div class='add'>+		 * too late we don't care.</div><div class='add'>+		 *</div><div class='add'>+		 * if the list isn't empty and a new first element got</div><div class='add'>+		 * in place, set the new timer expire time.</div><div class='add'>+		 */</div><div class='add'>+		first = list_first_entry_or_null(&amp;ls-&gt;ls_scan_list, struct dlm_rsb,</div><div class='add'>+						 res_scan_list);</div><div class='add'>+		if (!first)</div><div class='add'>+			timer_delete(&amp;ls-&gt;ls_scan_timer);</div><div class='add'>+		else</div><div class='add'>+			enable_scan_timer(ls, first-&gt;res_toss_time);</div><div class='ctx'> 	}</div><div class='del'>-	if (r2) {</div><div class='del'>-		list_add(&amp;r2-&gt;res_hashchain, &amp;ls-&gt;ls_new_rsb);</div><div class='del'>-		ls-&gt;ls_new_rsb_count++;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_scan(struct dlm_ls *ls, struct dlm_rsb *r)</div><div class='add'>+{</div><div class='add'>+	int our_nodeid = dlm_our_nodeid();</div><div class='add'>+	struct dlm_rsb *first;</div><div class='add'>+</div><div class='add'>+	/* A dir record for a remote master rsb should never be on the scan list. */</div><div class='add'>+	WARN_ON(!dlm_no_directory(ls) &amp;&amp;</div><div class='add'>+		(r-&gt;res_master_nodeid != our_nodeid) &amp;&amp;</div><div class='add'>+		(dlm_dir_nodeid(r) == our_nodeid));</div><div class='add'>+</div><div class='add'>+	/* An active rsb should never be on the scan list. */</div><div class='add'>+	WARN_ON(!rsb_flag(r, RSB_INACTIVE));</div><div class='add'>+</div><div class='add'>+	/* An rsb should not already be on the scan list. */</div><div class='add'>+	WARN_ON(!list_empty(&amp;r-&gt;res_scan_list));</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+	/* set the new rsb absolute expire time in the rsb */</div><div class='add'>+	r-&gt;res_toss_time = rsb_toss_jiffies();</div><div class='add'>+	if (list_empty(&amp;ls-&gt;ls_scan_list)) {</div><div class='add'>+		/* if the queue is empty add the element and it's</div><div class='add'>+		 * our new expire time</div><div class='add'>+		 */</div><div class='add'>+		list_add_tail(&amp;r-&gt;res_scan_list, &amp;ls-&gt;ls_scan_list);</div><div class='add'>+		enable_scan_timer(ls, r-&gt;res_toss_time);</div><div class='add'>+	} else {</div><div class='add'>+		/* try to get the maybe new first element and then add</div><div class='add'>+		 * to this rsb with the oldest expire time to the end</div><div class='add'>+		 * of the queue. If the list was empty before this</div><div class='add'>+		 * rsb expire time is our next expiration if it wasn't</div><div class='add'>+		 * the now new first elemet is our new expiration time</div><div class='add'>+		 */</div><div class='add'>+		first = list_first_entry_or_null(&amp;ls-&gt;ls_scan_list, struct dlm_rsb,</div><div class='add'>+						 res_scan_list);</div><div class='add'>+		list_add_tail(&amp;r-&gt;res_scan_list, &amp;ls-&gt;ls_scan_list);</div><div class='add'>+		if (!first)</div><div class='add'>+			enable_scan_timer(ls, r-&gt;res_toss_time);</div><div class='add'>+		else</div><div class='add'>+			enable_scan_timer(ls, first-&gt;res_toss_time);</div><div class='ctx'> 	}</div><div class='del'>-	count = ls-&gt;ls_new_rsb_count;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!count)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='add'>+/* if we hit contention we do in 250 ms a retry to trylock.</div><div class='add'>+ * if there is any other mod_timer in between we don't care</div><div class='add'>+ * about that it expires earlier again this is only for the</div><div class='add'>+ * unlikely case nothing happened in this time.</div><div class='add'>+ */</div><div class='add'>+#define DLM_TOSS_TIMER_RETRY	(jiffies + msecs_to_jiffies(250))</div><div class='add'>+</div><div class='add'>+/* Called by lockspace scan_timer to free unused rsb's. */</div><div class='add'>+</div><div class='add'>+void dlm_rsb_scan(struct timer_list *timer)</div><div class='add'>+{</div><div class='add'>+	struct dlm_ls *ls = timer_container_of(ls, timer, ls_scan_timer);</div><div class='add'>+	int our_nodeid = dlm_our_nodeid();</div><div class='add'>+	struct dlm_rsb *r;</div><div class='add'>+	int rv;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		/* interrupting point to leave iteration when</div><div class='add'>+		 * recovery waits for timer_delete_sync(), recovery</div><div class='add'>+		 * will take care to delete everything in scan list.</div><div class='add'>+		 */</div><div class='add'>+		if (dlm_locking_stopped(ls))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rv = spin_trylock(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+		if (!rv) {</div><div class='add'>+			/* rearm again try timer */</div><div class='add'>+			enable_scan_timer(ls, DLM_TOSS_TIMER_RETRY);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r = list_first_entry_or_null(&amp;ls-&gt;ls_scan_list, struct dlm_rsb,</div><div class='add'>+					     res_scan_list);</div><div class='add'>+		if (!r) {</div><div class='add'>+			/* the next add_scan will enable the timer again */</div><div class='add'>+			spin_unlock(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the first rsb is not yet expired, then stop because the</div><div class='add'>+		 * list is sorted with nearest expiration first.</div><div class='add'>+		 */</div><div class='add'>+		if (time_before(jiffies, r-&gt;res_toss_time)) {</div><div class='add'>+			/* rearm with the next rsb to expire in the future */</div><div class='add'>+			enable_scan_timer(ls, r-&gt;res_toss_time);</div><div class='add'>+			spin_unlock(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* in find_rsb_dir/nodir there is a reverse order of this</div><div class='add'>+		 * lock, however this is only a trylock if we hit some</div><div class='add'>+		 * possible contention we try it again.</div><div class='add'>+		 */</div><div class='add'>+		rv = write_trylock(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		if (!rv) {</div><div class='add'>+			spin_unlock(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+			/* rearm again try timer */</div><div class='add'>+			enable_scan_timer(ls, DLM_TOSS_TIMER_RETRY);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del(&amp;r-&gt;res_slow_list);</div><div class='add'>+		rhashtable_remove_fast(&amp;ls-&gt;ls_rsbtbl, &amp;r-&gt;res_node,</div><div class='add'>+				       dlm_rhash_rsb_params);</div><div class='add'>+		rsb_clear_flag(r, RSB_HASHED);</div><div class='add'>+</div><div class='add'>+		/* ls_rsbtbl_lock is not needed when calling send_remove() */</div><div class='add'>+		write_unlock(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+		list_del_init(&amp;r-&gt;res_scan_list);</div><div class='add'>+		spin_unlock(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+</div><div class='add'>+		/* An rsb that is a dir record for a remote master rsb</div><div class='add'>+		 * cannot be removed, and should not have a timer enabled.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(!dlm_no_directory(ls) &amp;&amp;</div><div class='add'>+			(r-&gt;res_master_nodeid != our_nodeid) &amp;&amp;</div><div class='add'>+			(dlm_dir_nodeid(r) == our_nodeid));</div><div class='add'>+</div><div class='add'>+		/* We're the master of this rsb but we're not</div><div class='add'>+		 * the directory record, so we need to tell the</div><div class='add'>+		 * dir node to remove the dir record</div><div class='add'>+		 */</div><div class='add'>+		if (!dlm_no_directory(ls) &amp;&amp;</div><div class='add'>+		    (r-&gt;res_master_nodeid == our_nodeid) &amp;&amp;</div><div class='add'>+		    (dlm_dir_nodeid(r) != our_nodeid))</div><div class='add'>+			send_remove(r);</div><div class='add'>+</div><div class='add'>+		free_inactive_rsb(r);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* If ls-&gt;ls_new_rsb is empty, return -EAGAIN, so the caller can</div><div class='hunk'>@@ -393,102 +599,52 @@ static int get_rsb_struct(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 			  struct dlm_rsb **r_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='del'>-	int count;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='del'>-	if (list_empty(&amp;ls-&gt;ls_new_rsb)) {</div><div class='del'>-		count = ls-&gt;ls_new_rsb_count;</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='del'>-		log_debug(ls, "find_rsb retry %d %d %s",</div><div class='del'>-			  count, dlm_config.ci_new_rsb_count,</div><div class='del'>-			  (const char *)name);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = list_first_entry(&amp;ls-&gt;ls_new_rsb, struct dlm_rsb, res_hashchain);</div><div class='del'>-	list_del(&amp;r-&gt;res_hashchain);</div><div class='del'>-	/* Convert the empty list_head to a NULL rb_node for tree usage: */</div><div class='del'>-	memset(&amp;r-&gt;res_hashnode, 0, sizeof(struct rb_node));</div><div class='del'>-	ls-&gt;ls_new_rsb_count--;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='add'>+	r = dlm_allocate_rsb();</div><div class='add'>+	if (!r)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	r-&gt;res_ls = ls;</div><div class='ctx'> 	r-&gt;res_length = len;</div><div class='ctx'> 	memcpy(r-&gt;res_name, name, len);</div><div class='del'>-	mutex_init(&amp;r-&gt;res_mutex);</div><div class='add'>+	spin_lock_init(&amp;r-&gt;res_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r-&gt;res_lookup);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r-&gt;res_grantqueue);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r-&gt;res_convertqueue);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r-&gt;res_waitqueue);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r-&gt;res_root_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;r-&gt;res_scan_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;r-&gt;res_recover_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;r-&gt;res_masters_list);</div><div class='ctx'> </div><div class='ctx'> 	*r_ret = r;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsb_cmp(struct dlm_rsb *r, const char *name, int nlen)</div><div class='add'>+int dlm_search_rsb_tree(struct rhashtable *rhash, const void *name, int len,</div><div class='add'>+			struct dlm_rsb **r_ret)</div><div class='ctx'> {</div><div class='del'>-	char maxname[DLM_RESNAME_MAXLEN];</div><div class='add'>+	char key[DLM_RESNAME_MAXLEN] = {};</div><div class='ctx'> </div><div class='del'>-	memset(maxname, 0, DLM_RESNAME_MAXLEN);</div><div class='del'>-	memcpy(maxname, name, nlen);</div><div class='del'>-	return memcmp(r-&gt;res_name, maxname, DLM_RESNAME_MAXLEN);</div><div class='del'>-}</div><div class='add'>+	memcpy(key, name, len);</div><div class='add'>+	*r_ret = rhashtable_lookup_fast(rhash, &amp;key, dlm_rhash_rsb_params);</div><div class='add'>+	if (*r_ret)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-int dlm_search_rsb_tree(struct rb_root *tree, const void *name, int len,</div><div class='del'>-			struct dlm_rsb **r_ret)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *node = tree-&gt;rb_node;</div><div class='del'>-	struct dlm_rsb *r;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	while (node) {</div><div class='del'>-		r = rb_entry(node, struct dlm_rsb, res_hashnode);</div><div class='del'>-		rc = rsb_cmp(r, name, len);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			node = node-&gt;rb_left;</div><div class='del'>-		else if (rc &gt; 0)</div><div class='del'>-			node = node-&gt;rb_right;</div><div class='del'>-		else</div><div class='del'>-			goto found;</div><div class='del'>-	}</div><div class='del'>-	*r_ret = NULL;</div><div class='ctx'> 	return -EBADR;</div><div class='del'>-</div><div class='del'>- found:</div><div class='del'>-	*r_ret = r;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsb_insert(struct dlm_rsb *rsb, struct rb_root *tree)</div><div class='add'>+static int rsb_insert(struct dlm_rsb *rsb, struct rhashtable *rhash)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **newn = &amp;tree-&gt;rb_node;</div><div class='del'>-	struct rb_node *parent = NULL;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	while (*newn) {</div><div class='del'>-		struct dlm_rsb *cur = rb_entry(*newn, struct dlm_rsb,</div><div class='del'>-					       res_hashnode);</div><div class='add'>+	int rv;</div><div class='ctx'> </div><div class='del'>-		parent = *newn;</div><div class='del'>-		rc = rsb_cmp(cur, rsb-&gt;res_name, rsb-&gt;res_length);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			newn = &amp;parent-&gt;rb_left;</div><div class='del'>-		else if (rc &gt; 0)</div><div class='del'>-			newn = &amp;parent-&gt;rb_right;</div><div class='del'>-		else {</div><div class='del'>-			log_print("rsb_insert match");</div><div class='del'>-			dlm_dump_rsb(rsb);</div><div class='del'>-			dlm_dump_rsb(cur);</div><div class='del'>-			return -EEXIST;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	rv = rhashtable_insert_fast(rhash, &amp;rsb-&gt;res_node,</div><div class='add'>+				    dlm_rhash_rsb_params);</div><div class='add'>+	if (!rv)</div><div class='add'>+		rsb_set_flag(rsb, RSB_HASHED);</div><div class='ctx'> </div><div class='del'>-	rb_link_node(&amp;rsb-&gt;res_hashnode, parent, newn);</div><div class='del'>-	rb_insert_color(&amp;rsb-&gt;res_hashnode, tree);</div><div class='del'>-	return 0;</div><div class='add'>+	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -518,7 +674,7 @@ static int rsb_insert(struct dlm_rsb *rsb, struct rb_root *tree)</div><div class='ctx'>  * So, if the given rsb is on the toss list, it is moved to the keep list</div><div class='ctx'>  * before being returned.</div><div class='ctx'>  *</div><div class='del'>- * toss_rsb() happens when all local usage of the rsb is done, i.e. no</div><div class='add'>+ * deactivate_rsb() happens when all local usage of the rsb is done, i.e. no</div><div class='ctx'>  * more refcounts exist, so the rsb is moved from the keep list to the</div><div class='ctx'>  * toss list.</div><div class='ctx'>  *</div><div class='hunk'>@@ -536,8 +692,7 @@ static int rsb_insert(struct dlm_rsb *rsb, struct rb_root *tree)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='del'>-			uint32_t hash, uint32_t b,</div><div class='del'>-			int dir_nodeid, int from_nodeid,</div><div class='add'>+			uint32_t hash, int dir_nodeid, int from_nodeid,</div><div class='ctx'> 			unsigned int flags, struct dlm_rsb **r_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r = NULL;</div><div class='hunk'>@@ -567,9 +722,9 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If someone sends us a request, we are the dir node, and we do</div><div class='ctx'> 	 * not find the rsb anywhere, then recreate it.  This happens if</div><div class='del'>-	 * someone sends us a request after we have removed/freed an rsb</div><div class='del'>-	 * from our toss list.  (They sent a request instead of lookup</div><div class='del'>-	 * because they are using an rsb from their toss list.)</div><div class='add'>+	 * someone sends us a request after we have removed/freed an rsb.</div><div class='add'>+	 * (They sent a request instead of lookup because they are using</div><div class='add'>+	 * an rsb taken from their scan list.)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (from_local || from_dir ||</div><div class='hunk'>@@ -578,51 +733,83 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  retry:</div><div class='del'>-	if (create) {</div><div class='del'>-		error = pre_rsb_struct(ls);</div><div class='del'>-		if (error &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-</div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].keep, name, len, &amp;r);</div><div class='add'>+	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl, name, len, &amp;r);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto do_toss;</div><div class='add'>+		goto do_new;</div><div class='add'>+</div><div class='add'>+	/* check if the rsb is active under read lock - likely path */</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	if (!rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		error = -EBADR;</div><div class='add'>+		goto do_new;</div><div class='add'>+	}</div><div class='ctx'> 	</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rsb is active, so we can't check master_nodeid without lock_rsb.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	if (rsb_flag(r, RSB_INACTIVE)) {</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		goto do_inactive;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	kref_get(&amp;r-&gt;res_ref);</div><div class='del'>-	goto out_unlock;</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>- do_toss:</div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].toss, name, len, &amp;r);</div><div class='del'>-	if (error)</div><div class='add'>+ do_inactive:</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The expectation here is that the rsb will have HASHED and</div><div class='add'>+	 * INACTIVE flags set, and that the rsb can be moved from</div><div class='add'>+	 * inactive back to active again.  However, between releasing</div><div class='add'>+	 * the read lock and acquiring the write lock, this rsb could</div><div class='add'>+	 * have been removed from rsbtbl, and had HASHED cleared, to</div><div class='add'>+	 * be freed.  To deal with this case, we would normally need</div><div class='add'>+	 * to repeat dlm_search_rsb_tree while holding the write lock,</div><div class='add'>+	 * but rcu allows us to simply check the HASHED flag, because</div><div class='add'>+	 * the rcu read lock means the rsb will not be freed yet.</div><div class='add'>+	 * If the HASHED flag is not set, then the rsb is being freed,</div><div class='add'>+	 * so we add a new rsb struct.  If the HASHED flag is set,</div><div class='add'>+	 * and INACTIVE is not set, it means another thread has</div><div class='add'>+	 * made the rsb active, as we're expecting to do here, and</div><div class='add'>+	 * we just repeat the lookup (this will be very unlikely.)</div><div class='add'>+	 */</div><div class='add'>+	if (rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		if (!rsb_flag(r, RSB_INACTIVE)) {</div><div class='add'>+			write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		error = -EBADR;</div><div class='ctx'> 		goto do_new;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rsb found inactive (master_nodeid may be out of date unless</div><div class='ctx'> 	 * we are the dir_nodeid or were the master)  No other thread</div><div class='del'>-	 * is using this rsb because it's on the toss list, so we can</div><div class='add'>+	 * is using this rsb because it's inactive, so we can</div><div class='ctx'> 	 * look at or update res_master_nodeid without lock_rsb.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if ((r-&gt;res_master_nodeid != our_nodeid) &amp;&amp; from_other) {</div><div class='ctx'> 		/* our rsb was not master, and another node (not the dir node)</div><div class='ctx'> 		   has sent us a request */</div><div class='del'>-		log_debug(ls, "find_rsb toss from_other %d master %d dir %d %s",</div><div class='add'>+		log_debug(ls, "find_rsb inactive from_other %d master %d dir %d %s",</div><div class='ctx'> 			  from_nodeid, r-&gt;res_master_nodeid, dir_nodeid,</div><div class='ctx'> 			  r-&gt;res_name);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		error = -ENOTBLK;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((r-&gt;res_master_nodeid != our_nodeid) &amp;&amp; from_dir) {</div><div class='ctx'> 		/* don't think this should ever happen */</div><div class='del'>-		log_error(ls, "find_rsb toss from_dir %d master %d",</div><div class='add'>+		log_error(ls, "find_rsb inactive from_dir %d master %d",</div><div class='ctx'> 			  from_nodeid, r-&gt;res_master_nodeid);</div><div class='ctx'> 		dlm_print_rsb(r);</div><div class='ctx'> 		/* fix it and go on */</div><div class='hunk'>@@ -639,9 +826,18 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 		r-&gt;res_first_lkid = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rb_erase(&amp;r-&gt;res_hashnode, &amp;ls-&gt;ls_rsbtbl[b].toss);</div><div class='del'>-	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl[b].keep);</div><div class='del'>-	goto out_unlock;</div><div class='add'>+	/* we always deactivate scan timer for the rsb, when</div><div class='add'>+	 * we move it out of the inactive state as rsb state</div><div class='add'>+	 * can be changed and scan timers are only for inactive</div><div class='add'>+	 * rsbs.</div><div class='add'>+	 */</div><div class='add'>+	del_scan(ls, r);</div><div class='add'>+	list_move(&amp;r-&gt;res_slow_list, &amp;ls-&gt;ls_slow_active);</div><div class='add'>+	rsb_clear_flag(r, RSB_INACTIVE);</div><div class='add'>+	kref_init(&amp;r-&gt;res_ref); /* ref is now used in active state */</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>  do_new:</div><div class='hunk'>@@ -650,18 +846,13 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (error == -EBADR &amp;&amp; !create)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	error = get_rsb_struct(ls, name, len, &amp;r);</div><div class='del'>-	if (error == -EAGAIN) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-	if (error)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (WARN_ON_ONCE(error))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	r-&gt;res_hash = hash;</div><div class='del'>-	r-&gt;res_bucket = b;</div><div class='ctx'> 	r-&gt;res_dir_nodeid = dir_nodeid;</div><div class='ctx'> 	kref_init(&amp;r-&gt;res_ref);</div><div class='ctx'> </div><div class='hunk'>@@ -681,7 +872,7 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 		dlm_free_rsb(r);</div><div class='ctx'> 		r = NULL;</div><div class='ctx'> 		error = -ENOTBLK;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (from_other) {</div><div class='hunk'>@@ -701,9 +892,20 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out_add:</div><div class='del'>-	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl[b].keep);</div><div class='del'>- out_unlock:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl);</div><div class='add'>+	if (error == -EEXIST) {</div><div class='add'>+		/* somebody else was faster and it seems the</div><div class='add'>+		 * rsb exists now, we do a whole relookup</div><div class='add'>+		 */</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		dlm_free_rsb(r);</div><div class='add'>+		goto retry;</div><div class='add'>+	} else if (!error) {</div><div class='add'>+		list_add(&amp;r-&gt;res_slow_list, &amp;ls-&gt;ls_slow_active);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'>  out:</div><div class='ctx'> 	*r_ret = r;</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -714,8 +916,7 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'>    dlm_recover_masters). */</div><div class='ctx'> </div><div class='ctx'> static int find_rsb_nodir(struct dlm_ls *ls, const void *name, int len,</div><div class='del'>-			  uint32_t hash, uint32_t b,</div><div class='del'>-			  int dir_nodeid, int from_nodeid,</div><div class='add'>+			  uint32_t hash, int dir_nodeid, int from_nodeid,</div><div class='ctx'> 			  unsigned int flags, struct dlm_rsb **r_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r = NULL;</div><div class='hunk'>@@ -724,59 +925,82 @@ static int find_rsb_nodir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'>  retry:</div><div class='del'>-	error = pre_rsb_struct(ls);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl, name, len, &amp;r);</div><div class='add'>+	if (error)</div><div class='add'>+		goto do_new;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+	/* check if the rsb is in active state under read lock - likely path */</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	if (!rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		goto do_new;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].keep, name, len, &amp;r);</div><div class='del'>-	if (error)</div><div class='del'>-		goto do_toss;</div><div class='add'>+	if (rsb_flag(r, RSB_INACTIVE)) {</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		goto do_inactive;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rsb is active, so we can't check master_nodeid without lock_rsb.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;r-&gt;res_ref);</div><div class='del'>-	goto out_unlock;</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> </div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='del'>- do_toss:</div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].toss, name, len, &amp;r);</div><div class='del'>-	if (error)</div><div class='add'>+</div><div class='add'>+ do_inactive:</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+	/* See comment in find_rsb_dir. */</div><div class='add'>+	if (rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		if (!rsb_flag(r, RSB_INACTIVE)) {</div><div class='add'>+			write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		goto do_new;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rsb found inactive. No other thread is using this rsb because</div><div class='del'>-	 * it's on the toss list, so we can look at or update</div><div class='del'>-	 * res_master_nodeid without lock_rsb.</div><div class='add'>+	 * it's inactive, so we can look at or update res_master_nodeid</div><div class='add'>+	 * without lock_rsb.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (!recover &amp;&amp; (r-&gt;res_master_nodeid != our_nodeid) &amp;&amp; from_nodeid) {</div><div class='ctx'> 		/* our rsb is not master, and another node has sent us a</div><div class='ctx'> 		   request; this should never happen */</div><div class='del'>-		log_error(ls, "find_rsb toss from_nodeid %d master %d dir %d",</div><div class='add'>+		log_error(ls, "find_rsb inactive from_nodeid %d master %d dir %d",</div><div class='ctx'> 			  from_nodeid, r-&gt;res_master_nodeid, dir_nodeid);</div><div class='ctx'> 		dlm_print_rsb(r);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		error = -ENOTBLK;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!recover &amp;&amp; (r-&gt;res_master_nodeid != our_nodeid) &amp;&amp;</div><div class='ctx'> 	    (dir_nodeid == our_nodeid)) {</div><div class='ctx'> 		/* our rsb is not master, and we are dir; may as well fix it;</div><div class='ctx'> 		   this should never happen */</div><div class='del'>-		log_error(ls, "find_rsb toss our %d master %d dir %d",</div><div class='add'>+		log_error(ls, "find_rsb inactive our %d master %d dir %d",</div><div class='ctx'> 			  our_nodeid, r-&gt;res_master_nodeid, dir_nodeid);</div><div class='ctx'> 		dlm_print_rsb(r);</div><div class='ctx'> 		r-&gt;res_master_nodeid = our_nodeid;</div><div class='ctx'> 		r-&gt;res_nodeid = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rb_erase(&amp;r-&gt;res_hashnode, &amp;ls-&gt;ls_rsbtbl[b].toss);</div><div class='del'>-	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl[b].keep);</div><div class='del'>-	goto out_unlock;</div><div class='add'>+	del_scan(ls, r);</div><div class='add'>+	list_move(&amp;r-&gt;res_slow_list, &amp;ls-&gt;ls_slow_active);</div><div class='add'>+	rsb_clear_flag(r, RSB_INACTIVE);</div><div class='add'>+	kref_init(&amp;r-&gt;res_ref);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>  do_new:</div><div class='hunk'>@@ -785,49 +1009,98 @@ static int find_rsb_nodir(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	error = get_rsb_struct(ls, name, len, &amp;r);</div><div class='del'>-	if (error == -EAGAIN) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-	if (error)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (WARN_ON_ONCE(error))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	r-&gt;res_hash = hash;</div><div class='del'>-	r-&gt;res_bucket = b;</div><div class='ctx'> 	r-&gt;res_dir_nodeid = dir_nodeid;</div><div class='ctx'> 	r-&gt;res_master_nodeid = dir_nodeid;</div><div class='ctx'> 	r-&gt;res_nodeid = (dir_nodeid == our_nodeid) ? 0 : dir_nodeid;</div><div class='ctx'> 	kref_init(&amp;r-&gt;res_ref);</div><div class='ctx'> </div><div class='del'>-	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl[b].keep);</div><div class='del'>- out_unlock:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl);</div><div class='add'>+	if (error == -EEXIST) {</div><div class='add'>+		/* somebody else was faster and it seems the</div><div class='add'>+		 * rsb exists now, we do a whole relookup</div><div class='add'>+		 */</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		dlm_free_rsb(r);</div><div class='add'>+		goto retry;</div><div class='add'>+	} else if (!error) {</div><div class='add'>+		list_add(&amp;r-&gt;res_slow_list, &amp;ls-&gt;ls_slow_active);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='ctx'>  out:</div><div class='ctx'> 	*r_ret = r;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * rsb rcu usage</div><div class='add'>+ *</div><div class='add'>+ * While rcu read lock is held, the rsb cannot be freed,</div><div class='add'>+ * which allows a lookup optimization.</div><div class='add'>+ *</div><div class='add'>+ * Two threads are accessing the same rsb concurrently,</div><div class='add'>+ * the first (A) is trying to use the rsb, the second (B)</div><div class='add'>+ * is trying to free the rsb.</div><div class='add'>+ *</div><div class='add'>+ * thread A                 thread B</div><div class='add'>+ * (trying to use rsb)      (trying to free rsb)</div><div class='add'>+ *</div><div class='add'>+ * A1. rcu read lock</div><div class='add'>+ * A2. rsbtbl read lock</div><div class='add'>+ * A3. look up rsb in rsbtbl</div><div class='add'>+ * A4. rsbtbl read unlock</div><div class='add'>+ *                          B1. rsbtbl write lock</div><div class='add'>+ *                          B2. look up rsb in rsbtbl</div><div class='add'>+ *                          B3. remove rsb from rsbtbl</div><div class='add'>+ *                          B4. clear rsb HASHED flag</div><div class='add'>+ *                          B5. rsbtbl write unlock</div><div class='add'>+ *                          B6. begin freeing rsb using rcu...</div><div class='add'>+ *</div><div class='add'>+ * (rsb is inactive, so try to make it active again)</div><div class='add'>+ * A5. read rsb HASHED flag (safe because rsb is not freed yet)</div><div class='add'>+ * A6. the rsb HASHED flag is not set, which it means the rsb</div><div class='add'>+ *     is being removed from rsbtbl and freed, so don't use it.</div><div class='add'>+ * A7. rcu read unlock</div><div class='add'>+ *</div><div class='add'>+ *                          B7. ...finish freeing rsb using rcu</div><div class='add'>+ * A8. create a new rsb</div><div class='add'>+ *</div><div class='add'>+ * Without the rcu optimization, steps A5-8 would need to do</div><div class='add'>+ * an extra rsbtbl lookup:</div><div class='add'>+ * A5. rsbtbl write lock</div><div class='add'>+ * A6. look up rsb in rsbtbl, not found</div><div class='add'>+ * A7. rsbtbl write unlock</div><div class='add'>+ * A8. create a new rsb</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> static int find_rsb(struct dlm_ls *ls, const void *name, int len,</div><div class='ctx'> 		    int from_nodeid, unsigned int flags,</div><div class='ctx'> 		    struct dlm_rsb **r_ret)</div><div class='ctx'> {</div><div class='del'>-	uint32_t hash, b;</div><div class='ctx'> 	int dir_nodeid;</div><div class='add'>+	uint32_t hash;</div><div class='add'>+	int rv;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; DLM_RESNAME_MAXLEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	hash = jhash(name, len, 0);</div><div class='del'>-	b = hash &amp; (ls-&gt;ls_rsbtbl_size - 1);</div><div class='del'>-</div><div class='ctx'> 	dir_nodeid = dlm_hash2nodeid(ls, hash);</div><div class='ctx'> </div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> 	if (dlm_no_directory(ls))</div><div class='del'>-		return find_rsb_nodir(ls, name, len, hash, b, dir_nodeid,</div><div class='add'>+		rv = find_rsb_nodir(ls, name, len, hash, dir_nodeid,</div><div class='ctx'> 				      from_nodeid, flags, r_ret);</div><div class='ctx'> 	else</div><div class='del'>-		return find_rsb_dir(ls, name, len, hash, b, dir_nodeid,</div><div class='del'>-				      from_nodeid, flags, r_ret);</div><div class='add'>+		rv = find_rsb_dir(ls, name, len, hash, dir_nodeid,</div><div class='add'>+				    from_nodeid, flags, r_ret);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* we have received a request and found that res_master_nodeid != our_nodeid,</div><div class='hunk'>@@ -874,7 +1147,7 @@ static int validate_master_nodeid(struct dlm_ls *ls, struct dlm_rsb *r,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __dlm_master_lookup(struct dlm_ls *ls, struct dlm_rsb *r, int our_nodeid,</div><div class='del'>-				int from_nodeid, bool toss_list, unsigned int flags,</div><div class='add'>+				int from_nodeid, bool is_inactive, unsigned int flags,</div><div class='ctx'> 				int *r_nodeid, int *result)</div><div class='ctx'> {</div><div class='ctx'> 	int fix_master = (flags &amp; DLM_LU_RECOVER_MASTER);</div><div class='hunk'>@@ -887,7 +1160,7 @@ static void __dlm_master_lookup(struct dlm_ls *ls, struct dlm_rsb *r, int our_no</div><div class='ctx'> 		r-&gt;res_dir_nodeid = our_nodeid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fix_master &amp;&amp; dlm_is_removed(ls, r-&gt;res_master_nodeid)) {</div><div class='add'>+	if (fix_master &amp;&amp; r-&gt;res_master_nodeid &amp;&amp; dlm_is_removed(ls, r-&gt;res_master_nodeid)) {</div><div class='ctx'> 		/* Recovery uses this function to set a new master when</div><div class='ctx'> 		 * the previous master failed.  Setting NEW_MASTER will</div><div class='ctx'> 		 * force dlm_recover_masters to call recover_master on this</div><div class='hunk'>@@ -898,9 +1171,9 @@ static void __dlm_master_lookup(struct dlm_ls *ls, struct dlm_rsb *r, int our_no</div><div class='ctx'> 		r-&gt;res_nodeid = from_nodeid;</div><div class='ctx'> 		rsb_set_flag(r, RSB_NEW_MASTER);</div><div class='ctx'> </div><div class='del'>-		if (toss_list) {</div><div class='del'>-			/* I don't think we should ever find it on toss list. */</div><div class='del'>-			log_error(ls, "%s fix_master on toss", __func__);</div><div class='add'>+		if (is_inactive) {</div><div class='add'>+			/* I don't think we should ever find it inactive. */</div><div class='add'>+			log_error(ls, "%s fix_master inactive", __func__);</div><div class='ctx'> 			dlm_dump_rsb(r);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -940,7 +1213,7 @@ static void __dlm_master_lookup(struct dlm_ls *ls, struct dlm_rsb *r, int our_no</div><div class='ctx'> 	if (!from_master &amp;&amp; !fix_master &amp;&amp;</div><div class='ctx'> 	    (r-&gt;res_master_nodeid == from_nodeid)) {</div><div class='ctx'> 		/* this can happen when the master sends remove, the dir node</div><div class='del'>-		 * finds the rsb on the keep list and ignores the remove,</div><div class='add'>+		 * finds the rsb on the active list and ignores the remove,</div><div class='ctx'> 		 * and the former master sends a lookup</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='hunk'>@@ -984,11 +1257,11 @@ static void __dlm_master_lookup(struct dlm_ls *ls, struct dlm_rsb *r, int our_no</div><div class='ctx'>  * . dlm_master_lookup RECOVER_MASTER (fix_master 1, from_master 0)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *name,</div><div class='del'>-		      int len, unsigned int flags, int *r_nodeid, int *result)</div><div class='add'>+static int _dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *name,</div><div class='add'>+			      int len, unsigned int flags, int *r_nodeid, int *result)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r = NULL;</div><div class='del'>-	uint32_t hash, b;</div><div class='add'>+	uint32_t hash;</div><div class='ctx'> 	int our_nodeid = dlm_our_nodeid();</div><div class='ctx'> 	int dir_nodeid, error;</div><div class='ctx'> </div><div class='hunk'>@@ -1002,8 +1275,6 @@ int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *name,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hash = jhash(name, len, 0);</div><div class='del'>-	b = hash &amp; (ls-&gt;ls_rsbtbl_size - 1);</div><div class='del'>-</div><div class='ctx'> 	dir_nodeid = dlm_hash2nodeid(ls, hash);</div><div class='ctx'> 	if (dir_nodeid != our_nodeid) {</div><div class='ctx'> 		log_error(ls, "dlm_master_lookup from %d dir %d our %d h %x %d",</div><div class='hunk'>@@ -1014,160 +1285,199 @@ int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *name,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  retry:</div><div class='del'>-	error = pre_rsb_struct(ls);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		return error;</div><div class='add'>+	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl, name, len, &amp;r);</div><div class='add'>+	if (error)</div><div class='add'>+		goto not_found;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].keep, name, len, &amp;r);</div><div class='del'>-	if (!error) {</div><div class='del'>-		/* because the rsb is active, we need to lock_rsb before</div><div class='del'>-		 * checking/changing re_master_nodeid</div><div class='del'>-		 */</div><div class='add'>+	/* check if the rsb is active under read lock - likely path */</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	if (!rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		goto not_found;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		hold_rsb(r);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		lock_rsb(r);</div><div class='add'>+	if (rsb_flag(r, RSB_INACTIVE)) {</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		goto do_inactive;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		__dlm_master_lookup(ls, r, our_nodeid, from_nodeid, false,</div><div class='del'>-				    flags, r_nodeid, result);</div><div class='add'>+	/* because the rsb is active, we need to lock_rsb before</div><div class='add'>+	 * checking/changing re_master_nodeid</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-		/* the rsb was active */</div><div class='del'>-		unlock_rsb(r);</div><div class='del'>-		put_rsb(r);</div><div class='add'>+	hold_rsb(r);</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	lock_rsb(r);</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	__dlm_master_lookup(ls, r, our_nodeid, from_nodeid, false,</div><div class='add'>+			    flags, r_nodeid, result);</div><div class='ctx'> </div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].toss, name, len, &amp;r);</div><div class='del'>-	if (error)</div><div class='add'>+	/* the rsb was active */</div><div class='add'>+	unlock_rsb(r);</div><div class='add'>+	put_rsb(r);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ do_inactive:</div><div class='add'>+	/* unlikely path - check if still part of ls_rsbtbl */</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+	/* see comment in find_rsb_dir */</div><div class='add'>+	if (rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		if (!rsb_flag(r, RSB_INACTIVE)) {</div><div class='add'>+			write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+			/* something as changed, very unlikely but</div><div class='add'>+			 * try again</div><div class='add'>+			 */</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		goto not_found;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* because the rsb is inactive (on toss list), it's not refcounted</div><div class='del'>-	 * and lock_rsb is not used, but is protected by the rsbtbl lock</div><div class='del'>-	 */</div><div class='add'>+	/* because the rsb is inactive, it's not refcounted and lock_rsb</div><div class='add'>+	   is not used, but is protected by the rsbtbl lock */</div><div class='ctx'> </div><div class='ctx'> 	__dlm_master_lookup(ls, r, our_nodeid, from_nodeid, true, flags,</div><div class='ctx'> 			    r_nodeid, result);</div><div class='ctx'> </div><div class='del'>-	r-&gt;res_toss_time = jiffies;</div><div class='del'>-	/* the rsb was inactive (on toss list) */</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+	/* A dir record rsb should never be on scan list.</div><div class='add'>+	 * Except when we are the dir and master node.</div><div class='add'>+	 * This function should only be called by the dir</div><div class='add'>+	 * node.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(!list_empty(&amp;r-&gt;res_scan_list) &amp;&amp;</div><div class='add'>+		r-&gt;res_master_nodeid != our_nodeid);</div><div class='add'>+</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  not_found:</div><div class='ctx'> 	error = get_rsb_struct(ls, name, len, &amp;r);</div><div class='del'>-	if (error == -EAGAIN) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-	if (error)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (WARN_ON_ONCE(error))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	r-&gt;res_hash = hash;</div><div class='del'>-	r-&gt;res_bucket = b;</div><div class='ctx'> 	r-&gt;res_dir_nodeid = our_nodeid;</div><div class='ctx'> 	r-&gt;res_master_nodeid = from_nodeid;</div><div class='ctx'> 	r-&gt;res_nodeid = from_nodeid;</div><div class='del'>-	kref_init(&amp;r-&gt;res_ref);</div><div class='del'>-	r-&gt;res_toss_time = jiffies;</div><div class='add'>+	rsb_set_flag(r, RSB_INACTIVE);</div><div class='ctx'> </div><div class='del'>-	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl[b].toss);</div><div class='del'>-	if (error) {</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	error = rsb_insert(r, &amp;ls-&gt;ls_rsbtbl);</div><div class='add'>+	if (error == -EEXIST) {</div><div class='add'>+		/* somebody else was faster and it seems the</div><div class='add'>+		 * rsb exists now, we do a whole relookup</div><div class='add'>+		 */</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		dlm_free_rsb(r);</div><div class='add'>+		goto retry;</div><div class='add'>+	} else if (error) {</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		/* should never happen */</div><div class='ctx'> 		dlm_free_rsb(r);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	list_add(&amp;r-&gt;res_slow_list, &amp;ls-&gt;ls_slow_inactive);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		*result = DLM_LU_ADD;</div><div class='ctx'> 	*r_nodeid = from_nodeid;</div><div class='del'>- out_unlock:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *name,</div><div class='add'>+		      int len, unsigned int flags, int *r_nodeid, int *result)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	rv = _dlm_master_lookup(ls, from_nodeid, name, len, flags, r_nodeid, result);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void dlm_dump_rsb_hash(struct dlm_ls *ls, uint32_t hash)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n;</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ls-&gt;ls_rsbtbl_size; i++) {</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='del'>-		for (n = rb_first(&amp;ls-&gt;ls_rsbtbl[i].keep); n; n = rb_next(n)) {</div><div class='del'>-			r = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-			if (r-&gt;res_hash == hash)</div><div class='del'>-				dlm_dump_rsb(r);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	list_for_each_entry(r, &amp;ls-&gt;ls_slow_active, res_slow_list) {</div><div class='add'>+		if (r-&gt;res_hash == hash)</div><div class='add'>+			dlm_dump_rsb(r);</div><div class='ctx'> 	}</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_dump_rsb_name(struct dlm_ls *ls, const char *name, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r = NULL;</div><div class='del'>-	uint32_t hash, b;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	hash = jhash(name, len, 0);</div><div class='del'>-	b = hash &amp; (ls-&gt;ls_rsbtbl_size - 1);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].keep, name, len, &amp;r);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl, name, len, &amp;r);</div><div class='ctx'> 	if (!error)</div><div class='del'>-		goto out_dump;</div><div class='del'>-</div><div class='del'>-	error = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].toss, name, len, &amp;r);</div><div class='del'>-	if (error)</div><div class='ctx'> 		goto out;</div><div class='del'>- out_dump:</div><div class='add'>+</div><div class='ctx'> 	dlm_dump_rsb(r);</div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void toss_rsb(struct kref *kref)</div><div class='add'>+static void deactivate_rsb(struct kref *kref)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r = container_of(kref, struct dlm_rsb, res_ref);</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='add'>+	int our_nodeid = dlm_our_nodeid();</div><div class='ctx'> </div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_root_list), dlm_print_rsb(r););</div><div class='del'>-	kref_init(&amp;r-&gt;res_ref);</div><div class='del'>-	rb_erase(&amp;r-&gt;res_hashnode, &amp;ls-&gt;ls_rsbtbl[r-&gt;res_bucket].keep);</div><div class='del'>-	rsb_insert(r, &amp;ls-&gt;ls_rsbtbl[r-&gt;res_bucket].toss);</div><div class='del'>-	r-&gt;res_toss_time = jiffies;</div><div class='del'>-	set_bit(DLM_RTF_SHRINK_BIT, &amp;ls-&gt;ls_rsbtbl[r-&gt;res_bucket].flags);</div><div class='add'>+	rsb_set_flag(r, RSB_INACTIVE);</div><div class='add'>+	list_move(&amp;r-&gt;res_slow_list, &amp;ls-&gt;ls_slow_inactive);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When the rsb becomes unused, there are two possibilities:</div><div class='add'>+	 * 1. Leave the inactive rsb in place (don't remove it).</div><div class='add'>+	 * 2. Add it to the scan list to be removed.</div><div class='add'>+	 *</div><div class='add'>+	 * 1 is done when the rsb is acting as the dir record</div><div class='add'>+	 * for a remotely mastered rsb.  The rsb must be left</div><div class='add'>+	 * in place as an inactive rsb to act as the dir record.</div><div class='add'>+	 *</div><div class='add'>+	 * 2 is done when a) the rsb is not the master and not the</div><div class='add'>+	 * dir record, b) when the rsb is both the master and the</div><div class='add'>+	 * dir record, c) when the rsb is master but not dir record.</div><div class='add'>+	 *</div><div class='add'>+	 * (If no directory is used, the rsb can always be removed.)</div><div class='add'>+	 */</div><div class='add'>+	if (dlm_no_directory(ls) ||</div><div class='add'>+	    (r-&gt;res_master_nodeid == our_nodeid ||</div><div class='add'>+	     dlm_dir_nodeid(r) != our_nodeid))</div><div class='add'>+		add_scan(ls, r);</div><div class='add'>+</div><div class='ctx'> 	if (r-&gt;res_lvbptr) {</div><div class='ctx'> 		dlm_free_lvb(r-&gt;res_lvbptr);</div><div class='ctx'> 		r-&gt;res_lvbptr = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* See comment for unhold_lkb */</div><div class='del'>-</div><div class='del'>-static void unhold_rsb(struct dlm_rsb *r)</div><div class='add'>+void free_inactive_rsb(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='del'>-	int rv;</div><div class='del'>-	rv = kref_put(&amp;r-&gt;res_ref, toss_rsb);</div><div class='del'>-	DLM_ASSERT(!rv, dlm_dump_rsb(r););</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kill_rsb(struct kref *kref)</div><div class='del'>-{</div><div class='del'>-	struct dlm_rsb *r = container_of(kref, struct dlm_rsb, res_ref);</div><div class='del'>-</div><div class='del'>-	/* All work is done after the return from kref_put() so we</div><div class='del'>-	   can release the write_lock before the remove and free. */</div><div class='add'>+	WARN_ON_ONCE(!rsb_flag(r, RSB_INACTIVE));</div><div class='ctx'> </div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_lookup), dlm_dump_rsb(r););</div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_grantqueue), dlm_dump_rsb(r););</div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_convertqueue), dlm_dump_rsb(r););</div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_waitqueue), dlm_dump_rsb(r););</div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_root_list), dlm_dump_rsb(r););</div><div class='add'>+	DLM_ASSERT(list_empty(&amp;r-&gt;res_scan_list), dlm_dump_rsb(r););</div><div class='ctx'> 	DLM_ASSERT(list_empty(&amp;r-&gt;res_recover_list), dlm_dump_rsb(r););</div><div class='add'>+	DLM_ASSERT(list_empty(&amp;r-&gt;res_masters_list), dlm_dump_rsb(r););</div><div class='add'>+</div><div class='add'>+	dlm_free_rsb(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Attaching/detaching lkb's from rsb's is for rsb reference counting.</div><div class='hunk'>@@ -1188,36 +1498,34 @@ static void detach_lkb(struct dlm_lkb *lkb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret,</div><div class='del'>-		       int start, int end)</div><div class='add'>+		       unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='add'>+	struct xa_limit limit;</div><div class='ctx'> 	struct dlm_lkb *lkb;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	lkb = dlm_allocate_lkb(ls);</div><div class='add'>+	limit.max = end;</div><div class='add'>+	limit.min = start;</div><div class='add'>+</div><div class='add'>+	lkb = dlm_allocate_lkb();</div><div class='ctx'> 	if (!lkb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	lkb-&gt;lkb_last_bast_mode = -1;</div><div class='add'>+	lkb-&gt;lkb_last_bast_cb_mode = DLM_LOCK_IV;</div><div class='add'>+	lkb-&gt;lkb_last_cast_cb_mode = DLM_LOCK_IV;</div><div class='add'>+	lkb-&gt;lkb_last_cb_mode = DLM_LOCK_IV;</div><div class='ctx'> 	lkb-&gt;lkb_nodeid = -1;</div><div class='ctx'> 	lkb-&gt;lkb_grmode = DLM_LOCK_IV;</div><div class='ctx'> 	kref_init(&amp;lkb-&gt;lkb_ref);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;lkb-&gt;lkb_ownqueue);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;lkb-&gt;lkb_rsb_lookup);</div><div class='del'>-	INIT_LIST_HEAD(&amp;lkb-&gt;lkb_cb_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;lkb-&gt;lkb_callbacks);</div><div class='del'>-	spin_lock_init(&amp;lkb-&gt;lkb_cb_lock);</div><div class='del'>-	INIT_WORK(&amp;lkb-&gt;lkb_cb_work, dlm_callback_work);</div><div class='del'>-</div><div class='del'>-	idr_preload(GFP_NOFS);</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='del'>-	rv = idr_alloc(&amp;ls-&gt;ls_lkbidr, lkb, start, end, GFP_NOWAIT);</div><div class='del'>-	if (rv &gt;= 0)</div><div class='del'>-		lkb-&gt;lkb_id = rv;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='del'>-	idr_preload_end();</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='add'>+	rv = xa_alloc(&amp;ls-&gt;ls_lkbxa, &amp;lkb-&gt;lkb_id, lkb, limit, GFP_ATOMIC);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (rv &lt; 0) {</div><div class='del'>-		log_error(ls, "create_lkb idr error %d", rv);</div><div class='add'>+		log_error(ls, "create_lkb xa error %d", rv);</div><div class='ctx'> 		dlm_free_lkb(lkb);</div><div class='ctx'> 		return rv;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1228,18 +1536,28 @@ static int _create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret,</div><div class='ctx'> </div><div class='ctx'> static int create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret)</div><div class='ctx'> {</div><div class='del'>-	return _create_lkb(ls, lkb_ret, 1, 0);</div><div class='add'>+	return _create_lkb(ls, lkb_ret, 1, ULONG_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int find_lkb(struct dlm_ls *ls, uint32_t lkid, struct dlm_lkb **lkb_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_lkb *lkb;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='del'>-	lkb = idr_find(&amp;ls-&gt;ls_lkbidr, lkid);</div><div class='del'>-	if (lkb)</div><div class='del'>-		kref_get(&amp;lkb-&gt;lkb_ref);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	lkb = xa_load(&amp;ls-&gt;ls_lkbxa, lkid);</div><div class='add'>+	if (lkb) {</div><div class='add'>+		/* check if lkb is still part of lkbxa under lkbxa_lock as</div><div class='add'>+		 * the lkb_ref is tight to the lkbxa data structure, see</div><div class='add'>+		 * __put_lkb().</div><div class='add'>+		 */</div><div class='add'>+		read_lock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='add'>+		if (kref_read(&amp;lkb-&gt;lkb_ref))</div><div class='add'>+			kref_get(&amp;lkb-&gt;lkb_ref);</div><div class='add'>+		else</div><div class='add'>+			lkb = NULL;</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	*lkb_ret = lkb;</div><div class='ctx'> 	return lkb ? 0 : -ENOENT;</div><div class='hunk'>@@ -1263,11 +1581,11 @@ static int __put_lkb(struct dlm_ls *ls, struct dlm_lkb *lkb)</div><div class='ctx'> 	uint32_t lkid = lkb-&gt;lkb_id;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	rv = kref_put_lock(&amp;lkb-&gt;lkb_ref, kill_lkb,</div><div class='del'>-			   &amp;ls-&gt;ls_lkbidr_spin);</div><div class='add'>+	rv = dlm_kref_put_write_lock_bh(&amp;lkb-&gt;lkb_ref, kill_lkb,</div><div class='add'>+					&amp;ls-&gt;ls_lkbxa_lock);</div><div class='ctx'> 	if (rv) {</div><div class='del'>-		idr_remove(&amp;ls-&gt;ls_lkbidr, lkid);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='add'>+		xa_erase(&amp;ls-&gt;ls_lkbxa, lkid);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='ctx'> </div><div class='ctx'> 		detach_lkb(lkb);</div><div class='ctx'> </div><div class='hunk'>@@ -1377,10 +1695,8 @@ static void del_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb)</div><div class='ctx'> </div><div class='ctx'> static void move_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb, int sts)</div><div class='ctx'> {</div><div class='del'>-	hold_lkb(lkb);</div><div class='ctx'> 	del_lkb(r, lkb);</div><div class='ctx'> 	add_lkb(r, lkb, sts);</div><div class='del'>-	unhold_lkb(lkb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int msg_reply_type(int mstype)</div><div class='hunk'>@@ -1403,20 +1719,11 @@ static int msg_reply_type(int mstype)</div><div class='ctx'> /* add/remove lkb from global waiters list of lkb's waiting for</div><div class='ctx'>    a reply from a remote node */</div><div class='ctx'> </div><div class='del'>-static int add_to_waiters(struct dlm_lkb *lkb, int mstype, int to_nodeid)</div><div class='add'>+static void add_to_waiters(struct dlm_lkb *lkb, int mstype, int to_nodeid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = lkb-&gt;lkb_resource-&gt;res_ls;</div><div class='del'>-	int error = 0;</div><div class='del'>-	int wc;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='del'>-</div><div class='del'>-	if (is_overlap_unlock(lkb) ||</div><div class='del'>-	    (is_overlap_cancel(lkb) &amp;&amp; (mstype == DLM_MSG_CANCEL))) {</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	if (lkb-&gt;lkb_wait_type || is_overlap_cancel(lkb)) {</div><div class='ctx'> 		switch (mstype) {</div><div class='ctx'> 		case DLM_MSG_UNLOCK:</div><div class='hunk'>@@ -1426,31 +1733,33 @@ static int add_to_waiters(struct dlm_lkb *lkb, int mstype, int to_nodeid)</div><div class='ctx'> 			set_bit(DLM_IFL_OVERLAP_CANCEL_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			error = -EBUSY;</div><div class='add'>+			/* should never happen as validate_lock_args() checks</div><div class='add'>+			 * on lkb_wait_type and validate_unlock_args() only</div><div class='add'>+			 * creates UNLOCK or CANCEL messages.</div><div class='add'>+			 */</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		wc = atomic_inc_return(&amp;lkb-&gt;lkb_wait_count);</div><div class='add'>+		lkb-&gt;lkb_wait_count++;</div><div class='ctx'> 		hold_lkb(lkb);</div><div class='ctx'> </div><div class='ctx'> 		log_debug(ls, "addwait %x cur %d overlap %d count %d f %x",</div><div class='del'>-			  lkb-&gt;lkb_id, lkb-&gt;lkb_wait_type, mstype, wc,</div><div class='del'>-			  dlm_iflags_val(lkb));</div><div class='add'>+			  lkb-&gt;lkb_id, lkb-&gt;lkb_wait_type, mstype,</div><div class='add'>+			  lkb-&gt;lkb_wait_count, dlm_iflags_val(lkb));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wc = atomic_fetch_inc(&amp;lkb-&gt;lkb_wait_count);</div><div class='del'>-	DLM_ASSERT(!wc, dlm_print_lkb(lkb); printk("wait_count %d\n", wc););</div><div class='add'>+	DLM_ASSERT(!lkb-&gt;lkb_wait_count,</div><div class='add'>+		   dlm_print_lkb(lkb);</div><div class='add'>+		   printk("wait_count %d\n", lkb-&gt;lkb_wait_count););</div><div class='add'>+</div><div class='add'>+	lkb-&gt;lkb_wait_count++;</div><div class='ctx'> 	lkb-&gt;lkb_wait_type = mstype;</div><div class='ctx'> 	lkb-&gt;lkb_wait_nodeid = to_nodeid; /* for debugging */</div><div class='ctx'> 	hold_lkb(lkb);</div><div class='ctx'> 	list_add(&amp;lkb-&gt;lkb_wait_reply, &amp;ls-&gt;ls_waiters);</div><div class='ctx'>  out:</div><div class='del'>-	if (error)</div><div class='del'>-		log_error(ls, "addwait error %x %d flags %x %d %d %s",</div><div class='del'>-			  lkb-&gt;lkb_id, error, dlm_iflags_val(lkb), mstype,</div><div class='del'>-			  lkb-&gt;lkb_wait_type, lkb-&gt;lkb_resource-&gt;res_name);</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='del'>-	return error;</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We clear the RESEND flag because we might be taking an lkb off the waiters</div><div class='hunk'>@@ -1502,7 +1811,7 @@ static int _remove_from_waiters(struct dlm_lkb *lkb, int mstype,</div><div class='ctx'> 		log_debug(ls, "remwait %x convert_reply zap overlap_cancel",</div><div class='ctx'> 			  lkb-&gt;lkb_id);</div><div class='ctx'> 		lkb-&gt;lkb_wait_type = 0;</div><div class='del'>-		atomic_dec(&amp;lkb-&gt;lkb_wait_count);</div><div class='add'>+		lkb-&gt;lkb_wait_count--;</div><div class='ctx'> 		unhold_lkb(lkb);</div><div class='ctx'> 		goto out_del;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1529,15 +1838,16 @@ static int _remove_from_waiters(struct dlm_lkb *lkb, int mstype,</div><div class='ctx'> 	if (overlap_done &amp;&amp; lkb-&gt;lkb_wait_type) {</div><div class='ctx'> 		log_error(ls, "remwait error %x reply %d wait_type %d overlap",</div><div class='ctx'> 			  lkb-&gt;lkb_id, mstype, lkb-&gt;lkb_wait_type);</div><div class='del'>-		atomic_dec(&amp;lkb-&gt;lkb_wait_count);</div><div class='add'>+		lkb-&gt;lkb_wait_count--;</div><div class='ctx'> 		unhold_lkb(lkb);</div><div class='ctx'> 		lkb-&gt;lkb_wait_type = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DLM_ASSERT(atomic_read(&amp;lkb-&gt;lkb_wait_count), dlm_print_lkb(lkb););</div><div class='add'>+	DLM_ASSERT(lkb-&gt;lkb_wait_count, dlm_print_lkb(lkb););</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(DLM_IFL_RESEND_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='del'>-	if (atomic_dec_and_test(&amp;lkb-&gt;lkb_wait_count))</div><div class='add'>+	lkb-&gt;lkb_wait_count--;</div><div class='add'>+	if (!lkb-&gt;lkb_wait_count)</div><div class='ctx'> 		list_del_init(&amp;lkb-&gt;lkb_wait_reply);</div><div class='ctx'> 	unhold_lkb(lkb);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1548,14 +1858,18 @@ static int remove_from_waiters(struct dlm_lkb *lkb, int mstype)</div><div class='ctx'> 	struct dlm_ls *ls = lkb-&gt;lkb_resource-&gt;res_ls;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	error = _remove_from_waiters(lkb, mstype, NULL);</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Handles situations where we might be processing a "fake" or "local" reply in</div><div class='del'>-   which we can't try to take waiters_mutex again. */</div><div class='add'>+ * the recovery context which stops any locking activity. Only debugfs might</div><div class='add'>+ * change the lockspace waiters but they will held the recovery lock to ensure</div><div class='add'>+ * remove_from_waiters_ms() in local case will be the only user manipulating the</div><div class='add'>+ * lockspace waiters in recovery context.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static int remove_from_waiters_ms(struct dlm_lkb *lkb,</div><div class='ctx'> 				  const struct dlm_message *ms, bool local)</div><div class='hunk'>@@ -1564,159 +1878,16 @@ static int remove_from_waiters_ms(struct dlm_lkb *lkb,</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (!local)</div><div class='del'>-		mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+		spin_lock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='add'>+	else</div><div class='add'>+		WARN_ON_ONCE(!rwsem_is_locked(&amp;ls-&gt;ls_in_recovery) ||</div><div class='add'>+			     !dlm_locking_stopped(ls));</div><div class='ctx'> 	error = _remove_from_waiters(lkb, le32_to_cpu(ms-&gt;m_type), ms);</div><div class='ctx'> 	if (!local)</div><div class='del'>-		mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+		spin_unlock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void shrink_bucket(struct dlm_ls *ls, int b)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *n, *next;</div><div class='del'>-	struct dlm_rsb *r;</div><div class='del'>-	char *name;</div><div class='del'>-	int our_nodeid = dlm_our_nodeid();</div><div class='del'>-	int remote_count = 0;</div><div class='del'>-	int need_shrink = 0;</div><div class='del'>-	int i, len, rv;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ls-&gt;ls_remove_lens, 0, sizeof(int) * DLM_REMOVE_NAMES_MAX);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(DLM_RTF_SHRINK_BIT, &amp;ls-&gt;ls_rsbtbl[b].flags)) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (n = rb_first(&amp;ls-&gt;ls_rsbtbl[b].toss); n; n = next) {</div><div class='del'>-		next = rb_next(n);</div><div class='del'>-		r = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-</div><div class='del'>-		/* If we're the directory record for this rsb, and</div><div class='del'>-		   we're not the master of it, then we need to wait</div><div class='del'>-		   for the master node to send us a dir remove for</div><div class='del'>-		   before removing the dir record. */</div><div class='del'>-</div><div class='del'>-		if (!dlm_no_directory(ls) &amp;&amp;</div><div class='del'>-		    (r-&gt;res_master_nodeid != our_nodeid) &amp;&amp;</div><div class='del'>-		    (dlm_dir_nodeid(r) == our_nodeid)) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		need_shrink = 1;</div><div class='del'>-</div><div class='del'>-		if (!time_after_eq(jiffies, r-&gt;res_toss_time +</div><div class='del'>-				   dlm_config.ci_toss_secs * HZ)) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!dlm_no_directory(ls) &amp;&amp;</div><div class='del'>-		    (r-&gt;res_master_nodeid == our_nodeid) &amp;&amp;</div><div class='del'>-		    (dlm_dir_nodeid(r) != our_nodeid)) {</div><div class='del'>-</div><div class='del'>-			/* We're the master of this rsb but we're not</div><div class='del'>-			   the directory record, so we need to tell the</div><div class='del'>-			   dir node to remove the dir record. */</div><div class='del'>-</div><div class='del'>-			ls-&gt;ls_remove_lens[remote_count] = r-&gt;res_length;</div><div class='del'>-			memcpy(ls-&gt;ls_remove_names[remote_count], r-&gt;res_name,</div><div class='del'>-			       DLM_RESNAME_MAXLEN);</div><div class='del'>-			remote_count++;</div><div class='del'>-</div><div class='del'>-			if (remote_count &gt;= DLM_REMOVE_NAMES_MAX)</div><div class='del'>-				break;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!kref_put(&amp;r-&gt;res_ref, kill_rsb)) {</div><div class='del'>-			log_error(ls, "tossed rsb in use %s", r-&gt;res_name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rb_erase(&amp;r-&gt;res_hashnode, &amp;ls-&gt;ls_rsbtbl[b].toss);</div><div class='del'>-		dlm_free_rsb(r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (need_shrink)</div><div class='del'>-		set_bit(DLM_RTF_SHRINK_BIT, &amp;ls-&gt;ls_rsbtbl[b].flags);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(DLM_RTF_SHRINK_BIT, &amp;ls-&gt;ls_rsbtbl[b].flags);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * While searching for rsb's to free, we found some that require</div><div class='del'>-	 * remote removal.  We leave them in place and find them again here</div><div class='del'>-	 * so there is a very small gap between removing them from the toss</div><div class='del'>-	 * list and sending the removal.  Keeping this gap small is</div><div class='del'>-	 * important to keep us (the master node) from being out of sync</div><div class='del'>-	 * with the remote dir node for very long.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; remote_count; i++) {</div><div class='del'>-		name = ls-&gt;ls_remove_names[i];</div><div class='del'>-		len = ls-&gt;ls_remove_lens[i];</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].toss, name, len, &amp;r);</div><div class='del'>-		if (rv) {</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-			log_debug(ls, "remove_name not toss %s", name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (r-&gt;res_master_nodeid != our_nodeid) {</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-			log_debug(ls, "remove_name master %d dir %d our %d %s",</div><div class='del'>-				  r-&gt;res_master_nodeid, r-&gt;res_dir_nodeid,</div><div class='del'>-				  our_nodeid, name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (r-&gt;res_dir_nodeid == our_nodeid) {</div><div class='del'>-			/* should never happen */</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-			log_error(ls, "remove_name dir %d master %d our %d %s",</div><div class='del'>-				  r-&gt;res_dir_nodeid, r-&gt;res_master_nodeid,</div><div class='del'>-				  our_nodeid, name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!time_after_eq(jiffies, r-&gt;res_toss_time +</div><div class='del'>-				   dlm_config.ci_toss_secs * HZ)) {</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-			log_debug(ls, "remove_name toss_time %lu now %lu %s",</div><div class='del'>-				  r-&gt;res_toss_time, jiffies, name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!kref_put(&amp;r-&gt;res_ref, kill_rsb)) {</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-			log_error(ls, "remove_name in use %s", name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rb_erase(&amp;r-&gt;res_hashnode, &amp;ls-&gt;ls_rsbtbl[b].toss);</div><div class='del'>-		send_remove(r);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-</div><div class='del'>-		dlm_free_rsb(r);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dlm_scan_rsbs(struct dlm_ls *ls)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ls-&gt;ls_rsbtbl_size; i++) {</div><div class='del'>-		shrink_bucket(ls, i);</div><div class='del'>-		if (dlm_locking_stopped(ls))</div><div class='del'>-			break;</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* lkb is master or local copy */</div><div class='ctx'> </div><div class='ctx'> static void set_lvb_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)</div><div class='hunk'>@@ -2535,7 +2706,6 @@ static void process_lookup_list(struct dlm_rsb *r)</div><div class='ctx'> 	list_for_each_entry_safe(lkb, safe, &amp;r-&gt;res_lookup, lkb_rsb_lookup) {</div><div class='ctx'> 		list_del_init(&amp;lkb-&gt;lkb_rsb_lookup);</div><div class='ctx'> 		_request_lock(r, lkb);</div><div class='del'>-		schedule();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2666,7 +2836,7 @@ static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* lock not allowed if there's any op in progress */</div><div class='del'>-		if (lkb-&gt;lkb_wait_type || atomic_read(&amp;lkb-&gt;lkb_wait_count))</div><div class='add'>+		if (lkb-&gt;lkb_wait_type || lkb-&gt;lkb_wait_count)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (is_overlap(lkb))</div><div class='hunk'>@@ -2698,16 +2868,14 @@ static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,</div><div class='ctx'> 	case -EINVAL:</div><div class='ctx'> 		/* annoy the user because dlm usage is wrong */</div><div class='ctx'> 		WARN_ON(1);</div><div class='del'>-		log_error(ls, "%s %d %x %x %x %d %d %s", __func__,</div><div class='add'>+		log_error(ls, "%s %d %x %x %x %d %d", __func__,</div><div class='ctx'> 			  rv, lkb-&gt;lkb_id, dlm_iflags_val(lkb), args-&gt;flags,</div><div class='del'>-			  lkb-&gt;lkb_status, lkb-&gt;lkb_wait_type,</div><div class='del'>-			  lkb-&gt;lkb_resource-&gt;res_name);</div><div class='add'>+			  lkb-&gt;lkb_status, lkb-&gt;lkb_wait_type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		log_debug(ls, "%s %d %x %x %x %d %d %s", __func__,</div><div class='add'>+		log_debug(ls, "%s %d %x %x %x %d %d", __func__,</div><div class='ctx'> 			  rv, lkb-&gt;lkb_id, dlm_iflags_val(lkb), args-&gt;flags,</div><div class='del'>-			  lkb-&gt;lkb_status, lkb-&gt;lkb_wait_type,</div><div class='del'>-			  lkb-&gt;lkb_resource-&gt;res_name);</div><div class='add'>+			  lkb-&gt;lkb_status, lkb-&gt;lkb_wait_type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2728,7 +2896,7 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)</div><div class='ctx'> </div><div class='ctx'> 	/* normal unlock not allowed if there's any op in progress */</div><div class='ctx'> 	if (!(args-&gt;flags &amp; (DLM_LKF_CANCEL | DLM_LKF_FORCEUNLOCK)) &amp;&amp;</div><div class='del'>-	    (lkb-&gt;lkb_wait_type || atomic_read(&amp;lkb-&gt;lkb_wait_count)))</div><div class='add'>+	    (lkb-&gt;lkb_wait_type || lkb-&gt;lkb_wait_count))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* an lkb may be waiting for an rsb lookup to complete where the</div><div class='hunk'>@@ -2765,13 +2933,16 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (is_overlap_unlock(lkb))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* cancel not allowed with another cancel/unlock in progress */</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;flags &amp; DLM_LKF_CANCEL) {</div><div class='ctx'> 		if (lkb-&gt;lkb_exflags &amp; DLM_LKF_CANCEL)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (is_overlap(lkb))</div><div class='add'>+		if (is_overlap_cancel(lkb))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(DLM_IFL_RESEND_BIT, &amp;lkb-&gt;lkb_iflags)) {</div><div class='hunk'>@@ -2809,9 +2980,6 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)</div><div class='ctx'> 		if (lkb-&gt;lkb_exflags &amp; DLM_LKF_FORCEUNLOCK)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (is_overlap_unlock(lkb))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='ctx'> 		if (test_bit(DLM_IFL_RESEND_BIT, &amp;lkb-&gt;lkb_iflags)) {</div><div class='ctx'> 			set_bit(DLM_IFL_OVERLAP_UNLOCK_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='ctx'> 			rv = -EBUSY;</div><div class='hunk'>@@ -3329,8 +3497,7 @@ int dlm_unlock(dlm_lockspace_t *lockspace,</div><div class='ctx'> static int _create_message(struct dlm_ls *ls, int mb_len,</div><div class='ctx'> 			   int to_nodeid, int mstype,</div><div class='ctx'> 			   struct dlm_message **ms_ret,</div><div class='del'>-			   struct dlm_mhandle **mh_ret,</div><div class='del'>-			   gfp_t allocation)</div><div class='add'>+			   struct dlm_mhandle **mh_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_message *ms;</div><div class='ctx'> 	struct dlm_mhandle *mh;</div><div class='hunk'>@@ -3340,7 +3507,7 @@ static int _create_message(struct dlm_ls *ls, int mb_len,</div><div class='ctx'> 	   pass into midcomms_commit and a message buffer (mb) that we</div><div class='ctx'> 	   write our data into */</div><div class='ctx'> </div><div class='del'>-	mh = dlm_midcomms_get_mhandle(to_nodeid, mb_len, allocation, &amp;mb);</div><div class='add'>+	mh = dlm_midcomms_get_mhandle(to_nodeid, mb_len, &amp;mb);</div><div class='ctx'> 	if (!mh)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -3362,8 +3529,7 @@ static int _create_message(struct dlm_ls *ls, int mb_len,</div><div class='ctx'> static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb,</div><div class='ctx'> 			  int to_nodeid, int mstype,</div><div class='ctx'> 			  struct dlm_message **ms_ret,</div><div class='del'>-			  struct dlm_mhandle **mh_ret,</div><div class='del'>-			  gfp_t allocation)</div><div class='add'>+			  struct dlm_mhandle **mh_ret)</div><div class='ctx'> {</div><div class='ctx'> 	int mb_len = sizeof(struct dlm_message);</div><div class='ctx'> </div><div class='hunk'>@@ -3384,7 +3550,7 @@ static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return _create_message(r-&gt;res_ls, mb_len, to_nodeid, mstype,</div><div class='del'>-			       ms_ret, mh_ret, allocation);</div><div class='add'>+			       ms_ret, mh_ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* further lowcomms enhancements or alternate implementations may make</div><div class='hunk'>@@ -3449,11 +3615,8 @@ static int send_common(struct dlm_rsb *r, struct dlm_lkb *lkb, int mstype)</div><div class='ctx'> </div><div class='ctx'> 	to_nodeid = r-&gt;res_nodeid;</div><div class='ctx'> </div><div class='del'>-	error = add_to_waiters(lkb, mstype, to_nodeid);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	error = create_message(r, lkb, to_nodeid, mstype, &amp;ms, &amp;mh, GFP_NOFS);</div><div class='add'>+	add_to_waiters(lkb, mstype, to_nodeid);</div><div class='add'>+	error = create_message(r, lkb, to_nodeid, mstype, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -3513,8 +3676,7 @@ static int send_grant(struct dlm_rsb *r, struct dlm_lkb *lkb)</div><div class='ctx'> </div><div class='ctx'> 	to_nodeid = lkb-&gt;lkb_nodeid;</div><div class='ctx'> </div><div class='del'>-	error = create_message(r, lkb, to_nodeid, DLM_MSG_GRANT, &amp;ms, &amp;mh,</div><div class='del'>-			       GFP_NOFS);</div><div class='add'>+	error = create_message(r, lkb, to_nodeid, DLM_MSG_GRANT, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3535,8 +3697,7 @@ static int send_bast(struct dlm_rsb *r, struct dlm_lkb *lkb, int mode)</div><div class='ctx'> </div><div class='ctx'> 	to_nodeid = lkb-&gt;lkb_nodeid;</div><div class='ctx'> </div><div class='del'>-	error = create_message(r, NULL, to_nodeid, DLM_MSG_BAST, &amp;ms, &amp;mh,</div><div class='del'>-			       GFP_NOFS);</div><div class='add'>+	error = create_message(r, NULL, to_nodeid, DLM_MSG_BAST, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3557,12 +3718,8 @@ static int send_lookup(struct dlm_rsb *r, struct dlm_lkb *lkb)</div><div class='ctx'> </div><div class='ctx'> 	to_nodeid = dlm_dir_nodeid(r);</div><div class='ctx'> </div><div class='del'>-	error = add_to_waiters(lkb, DLM_MSG_LOOKUP, to_nodeid);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	error = create_message(r, NULL, to_nodeid, DLM_MSG_LOOKUP, &amp;ms, &amp;mh,</div><div class='del'>-			       GFP_NOFS);</div><div class='add'>+	add_to_waiters(lkb, DLM_MSG_LOOKUP, to_nodeid);</div><div class='add'>+	error = create_message(r, NULL, to_nodeid, DLM_MSG_LOOKUP, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -3586,8 +3743,7 @@ static int send_remove(struct dlm_rsb *r)</div><div class='ctx'> </div><div class='ctx'> 	to_nodeid = dlm_dir_nodeid(r);</div><div class='ctx'> </div><div class='del'>-	error = create_message(r, NULL, to_nodeid, DLM_MSG_REMOVE, &amp;ms, &amp;mh,</div><div class='del'>-			       GFP_ATOMIC);</div><div class='add'>+	error = create_message(r, NULL, to_nodeid, DLM_MSG_REMOVE, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3608,7 +3764,7 @@ static int send_common_reply(struct dlm_rsb *r, struct dlm_lkb *lkb,</div><div class='ctx'> </div><div class='ctx'> 	to_nodeid = lkb-&gt;lkb_nodeid;</div><div class='ctx'> </div><div class='del'>-	error = create_message(r, lkb, to_nodeid, mstype, &amp;ms, &amp;mh, GFP_NOFS);</div><div class='add'>+	error = create_message(r, lkb, to_nodeid, mstype, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3650,8 +3806,7 @@ static int send_lookup_reply(struct dlm_ls *ls,</div><div class='ctx'> 	struct dlm_mhandle *mh;</div><div class='ctx'> 	int error, nodeid = le32_to_cpu(ms_in-&gt;m_header.h_nodeid);</div><div class='ctx'> </div><div class='del'>-	error = create_message(r, NULL, nodeid, DLM_MSG_LOOKUP_REPLY, &amp;ms, &amp;mh,</div><div class='del'>-			       GFP_NOFS);</div><div class='add'>+	error = create_message(r, NULL, nodeid, DLM_MSG_LOOKUP_REPLY, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -4136,7 +4291,6 @@ static void receive_remove(struct dlm_ls *ls, const struct dlm_message *ms)</div><div class='ctx'> {</div><div class='ctx'> 	char name[DLM_RESNAME_MAXLEN+1];</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='del'>-	uint32_t hash, b;</div><div class='ctx'> 	int rv, len, dir_nodeid, from_nodeid;</div><div class='ctx'> </div><div class='ctx'> 	from_nodeid = le32_to_cpu(ms-&gt;m_header.h_nodeid);</div><div class='hunk'>@@ -4156,68 +4310,76 @@ static void receive_remove(struct dlm_ls *ls, const struct dlm_message *ms)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Look for name on rsbtbl.toss, if it's there, kill it.</div><div class='del'>-	   If it's on rsbtbl.keep, it's being used, and we should ignore this</div><div class='del'>-	   message.  This is an expected race between the dir node sending a</div><div class='del'>-	   request to the master node at the same time as the master node sends</div><div class='del'>-	   a remove to the dir node.  The resolution to that race is for the</div><div class='del'>-	   dir node to ignore the remove message, and the master node to</div><div class='del'>-	   recreate the master rsb when it gets a request from the dir node for</div><div class='del'>-	   an rsb it doesn't have. */</div><div class='add'>+	/*</div><div class='add'>+	 * Look for inactive rsb, if it's there, free it.</div><div class='add'>+	 * If the rsb is active, it's being used, and we should ignore this</div><div class='add'>+	 * message.  This is an expected race between the dir node sending a</div><div class='add'>+	 * request to the master node at the same time as the master node sends</div><div class='add'>+	 * a remove to the dir node.  The resolution to that race is for the</div><div class='add'>+	 * dir node to ignore the remove message, and the master node to</div><div class='add'>+	 * recreate the master rsb when it gets a request from the dir node for</div><div class='add'>+	 * an rsb it doesn't have.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	memset(name, 0, sizeof(name));</div><div class='ctx'> 	memcpy(name, ms-&gt;m_extra, len);</div><div class='ctx'> </div><div class='del'>-	hash = jhash(name, len, 0);</div><div class='del'>-	b = hash &amp; (ls-&gt;ls_rsbtbl_size - 1);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl, name, len, &amp;r);</div><div class='add'>+	if (rv) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		/* should not happen */</div><div class='add'>+		log_error(ls, "%s from %d not found %s", __func__,</div><div class='add'>+			  from_nodeid, name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	if (!rsb_flag(r, RSB_HASHED)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+		/* should not happen */</div><div class='add'>+		log_error(ls, "%s from %d got removed during removal %s",</div><div class='add'>+			  __func__, from_nodeid, name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* at this stage the rsb can only being freed here */</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].toss, name, len, &amp;r);</div><div class='del'>-	if (rv) {</div><div class='del'>-		/* verify the rsb is on keep list per comment above */</div><div class='del'>-		rv = dlm_search_rsb_tree(&amp;ls-&gt;ls_rsbtbl[b].keep, name, len, &amp;r);</div><div class='del'>-		if (rv) {</div><div class='del'>-			/* should not happen */</div><div class='del'>-			log_error(ls, "receive_remove from %d not found %s",</div><div class='del'>-				  from_nodeid, name);</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (!rsb_flag(r, RSB_INACTIVE)) {</div><div class='ctx'> 		if (r-&gt;res_master_nodeid != from_nodeid) {</div><div class='ctx'> 			/* should not happen */</div><div class='del'>-			log_error(ls, "receive_remove keep from %d master %d",</div><div class='add'>+			log_error(ls, "receive_remove on active rsb from %d master %d",</div><div class='ctx'> 				  from_nodeid, r-&gt;res_master_nodeid);</div><div class='ctx'> 			dlm_print_rsb(r);</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+			write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Ignore the remove message, see race comment above. */</div><div class='add'>+</div><div class='ctx'> 		log_debug(ls, "receive_remove from %d master %d first %x %s",</div><div class='ctx'> 			  from_nodeid, r-&gt;res_master_nodeid, r-&gt;res_first_lkid,</div><div class='ctx'> 			  name);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (r-&gt;res_master_nodeid != from_nodeid) {</div><div class='del'>-		log_error(ls, "receive_remove toss from %d master %d",</div><div class='add'>+		log_error(ls, "receive_remove inactive from %d master %d",</div><div class='ctx'> 			  from_nodeid, r-&gt;res_master_nodeid);</div><div class='ctx'> 		dlm_print_rsb(r);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (kref_put(&amp;r-&gt;res_ref, kill_rsb)) {</div><div class='del'>-		rb_erase(&amp;r-&gt;res_hashnode, &amp;ls-&gt;ls_rsbtbl[b].toss);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-		dlm_free_rsb(r);</div><div class='del'>-	} else {</div><div class='del'>-		log_error(ls, "receive_remove from %d rsb ref error",</div><div class='del'>-			  from_nodeid);</div><div class='del'>-		dlm_print_rsb(r);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[b].lock);</div><div class='del'>-	}</div><div class='add'>+	list_del(&amp;r-&gt;res_slow_list);</div><div class='add'>+	rhashtable_remove_fast(&amp;ls-&gt;ls_rsbtbl, &amp;r-&gt;res_node,</div><div class='add'>+			       dlm_rhash_rsb_params);</div><div class='add'>+	rsb_clear_flag(r, RSB_HASHED);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+</div><div class='add'>+	free_inactive_rsb(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void receive_purge(struct dlm_ls *ls, const struct dlm_message *ms)</div><div class='hunk'>@@ -4404,7 +4566,6 @@ static void _receive_convert_reply(struct dlm_lkb *lkb,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* local reply can happen with waiters_mutex held */</div><div class='ctx'> 	error = remove_from_waiters_ms(lkb, ms, local);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4443,7 +4604,6 @@ static void _receive_unlock_reply(struct dlm_lkb *lkb,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* local reply can happen with waiters_mutex held */</div><div class='ctx'> 	error = remove_from_waiters_ms(lkb, ms, local);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4495,7 +4655,6 @@ static void _receive_cancel_reply(struct dlm_lkb *lkb,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* local reply can happen with waiters_mutex held */</div><div class='ctx'> 	error = remove_from_waiters_ms(lkb, ms, local);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4754,20 +4913,32 @@ static void _receive_message(struct dlm_ls *ls, const struct dlm_message *ms,</div><div class='ctx'> static void dlm_receive_message(struct dlm_ls *ls, const struct dlm_message *ms,</div><div class='ctx'> 				int nodeid)</div><div class='ctx'> {</div><div class='del'>-	if (dlm_locking_stopped(ls)) {</div><div class='add'>+try_again:</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='add'>+	if (test_bit(LSFL_RECV_MSG_BLOCKED, &amp;ls-&gt;ls_flags)) {</div><div class='ctx'> 		/* If we were a member of this lockspace, left, and rejoined,</div><div class='ctx'> 		   other nodes may still be sending us messages from the</div><div class='ctx'> 		   lockspace generation before we left. */</div><div class='ctx'> 		if (WARN_ON_ONCE(!ls-&gt;ls_generation)) {</div><div class='add'>+			read_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 			log_limit(ls, "receive %d from %d ignore old gen",</div><div class='ctx'> 				  le32_to_cpu(ms-&gt;m_type), nodeid);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='add'>+		write_lock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='add'>+		/* recheck because we hold writelock now */</div><div class='add'>+		if (!test_bit(LSFL_RECV_MSG_BLOCKED, &amp;ls-&gt;ls_flags)) {</div><div class='add'>+			write_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='add'>+			goto try_again;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		dlm_add_requestqueue(ls, nodeid, ms);</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 	} else {</div><div class='del'>-		dlm_wait_requestqueue(ls);</div><div class='ctx'> 		_receive_message(ls, ms, 0);</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4827,7 +4998,7 @@ void dlm_receive_buffer(const union dlm_packet *p, int nodeid)</div><div class='ctx'> 	/* this rwsem allows dlm_ls_stop() to wait for all dlm_recv threads to</div><div class='ctx'> 	   be inactive (in this ls) before transitioning to recovery mode */</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> 	if (hd-&gt;h_cmd == DLM_MSG)</div><div class='ctx'> 		dlm_receive_message(ls, &amp;p-&gt;message, nodeid);</div><div class='ctx'> 	else if (hd-&gt;h_cmd == DLM_RCOM)</div><div class='hunk'>@@ -4835,7 +5006,7 @@ void dlm_receive_buffer(const union dlm_packet *p, int nodeid)</div><div class='ctx'> 	else</div><div class='ctx'> 		log_error(ls, "invalid h_cmd %d from %d lockspace %x",</div><div class='ctx'> 			  hd-&gt;h_cmd, nodeid, le32_to_cpu(hd-&gt;u.h_lockspace));</div><div class='del'>-	up_read(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> </div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='ctx'> }</div><div class='hunk'>@@ -4844,16 +5015,19 @@ static void recover_convert_waiter(struct dlm_ls *ls, struct dlm_lkb *lkb,</div><div class='ctx'> 				   struct dlm_message *ms_local)</div><div class='ctx'> {</div><div class='ctx'> 	if (middle_conversion(lkb)) {</div><div class='add'>+		log_rinfo(ls, "%s %x middle convert in progress", __func__,</div><div class='add'>+			 lkb-&gt;lkb_id);</div><div class='add'>+</div><div class='add'>+		/* We sent this lock to the new master. The new master will</div><div class='add'>+		 * tell us when it's granted.  We no longer need a reply, so</div><div class='add'>+		 * use a fake reply to put the lkb into the right state.</div><div class='add'>+		 */</div><div class='ctx'> 		hold_lkb(lkb);</div><div class='ctx'> 		memset(ms_local, 0, sizeof(struct dlm_message));</div><div class='ctx'> 		ms_local-&gt;m_type = cpu_to_le32(DLM_MSG_CONVERT_REPLY);</div><div class='ctx'> 		ms_local-&gt;m_result = cpu_to_le32(to_dlm_errno(-EINPROGRESS));</div><div class='ctx'> 		ms_local-&gt;m_header.h_nodeid = cpu_to_le32(lkb-&gt;lkb_nodeid);</div><div class='ctx'> 		_receive_convert_reply(lkb, ms_local, true);</div><div class='del'>-</div><div class='del'>-		/* Same special case as in receive_rcom_lock_args() */</div><div class='del'>-		lkb-&gt;lkb_grmode = DLM_LOCK_IV;</div><div class='del'>-		rsb_set_flag(lkb-&gt;lkb_resource, RSB_RECOVER_CONVERT);</div><div class='ctx'> 		unhold_lkb(lkb);</div><div class='ctx'> </div><div class='ctx'> 	} else if (lkb-&gt;lkb_rqmode &gt;= lkb-&gt;lkb_grmode) {</div><div class='hunk'>@@ -4896,8 +5070,6 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls)</div><div class='ctx'> 	if (!ms_local)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry_safe(lkb, safe, &amp;ls-&gt;ls_waiters, lkb_wait_reply) {</div><div class='ctx'> </div><div class='ctx'> 		dir_nodeid = dlm_dir_nodeid(lkb-&gt;lkb_resource);</div><div class='hunk'>@@ -4990,7 +5162,6 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls)</div><div class='ctx'> 		}</div><div class='ctx'> 		schedule();</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='ctx'> 	kfree(ms_local);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4998,7 +5169,7 @@ static struct dlm_lkb *find_resend_waiter(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_lkb *lkb = NULL, *iter;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	list_for_each_entry(iter, &amp;ls-&gt;ls_waiters, lkb_wait_reply) {</div><div class='ctx'> 		if (test_bit(DLM_IFL_RESEND_BIT, &amp;iter-&gt;lkb_iflags)) {</div><div class='ctx'> 			hold_lkb(iter);</div><div class='hunk'>@@ -5006,26 +5177,37 @@ static struct dlm_lkb *find_resend_waiter(struct dlm_ls *ls)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> </div><div class='ctx'> 	return lkb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Deal with lookups and lkb's marked RESEND from _pre.  We may now be the</div><div class='del'>-   master or dir-node for r.  Processing the lkb may result in it being placed</div><div class='del'>-   back on waiters. */</div><div class='del'>-</div><div class='del'>-/* We do this after normal locking has been enabled and any saved messages</div><div class='del'>-   (in requestqueue) have been processed.  We should be confident that at</div><div class='del'>-   this point we won't get or process a reply to any of these waiting</div><div class='del'>-   operations.  But, new ops may be coming in on the rsbs/locks here from</div><div class='del'>-   userspace or remotely. */</div><div class='del'>-</div><div class='del'>-/* there may have been an overlap unlock/cancel prior to recovery or after</div><div class='del'>-   recovery.  if before, the lkb may still have a pos wait_count; if after, the</div><div class='del'>-   overlap flag would just have been set and nothing new sent.  we can be</div><div class='del'>-   confident here than any replies to either the initial op or overlap ops</div><div class='del'>-   prior to recovery have been received. */</div><div class='add'>+/*</div><div class='add'>+ * Forced state reset for locks that were in the middle of remote operations</div><div class='add'>+ * when recovery happened (i.e. lkbs that were on the waiters list, waiting</div><div class='add'>+ * for a reply from a remote operation.)  The lkbs remaining on the waiters</div><div class='add'>+ * list need to be reevaluated; some may need resending to a different node</div><div class='add'>+ * than previously, and some may now need local handling rather than remote.</div><div class='add'>+ *</div><div class='add'>+ * First, the lkb state for the voided remote operation is forcibly reset,</div><div class='add'>+ * equivalent to what remove_from_waiters() would normally do:</div><div class='add'>+ * . lkb removed from ls_waiters list</div><div class='add'>+ * . lkb wait_type cleared</div><div class='add'>+ * . lkb waiters_count cleared</div><div class='add'>+ * . lkb ref count decremented for each waiters_count (almost always 1,</div><div class='add'>+ *   but possibly 2 in case of cancel/unlock overlapping, which means</div><div class='add'>+ *   two remote replies were being expected for the lkb.)</div><div class='add'>+ *</div><div class='add'>+ * Second, the lkb is reprocessed like an original operation would be,</div><div class='add'>+ * by passing it to _request_lock or _convert_lock, which will either</div><div class='add'>+ * process the lkb operation locally, or send it to a remote node again</div><div class='add'>+ * and put the lkb back onto the waiters list.</div><div class='add'>+ *</div><div class='add'>+ * When reprocessing the lkb, we may find that it's flagged for an overlapping</div><div class='add'>+ * force-unlock or cancel, either from before recovery began, or after recovery</div><div class='add'>+ * finished.  If this is the case, the unlock/cancel is done directly, and the</div><div class='add'>+ * original operation is not initiated again (no _request_lock/_convert_lock.)</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> int dlm_recover_waiters_post(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='hunk'>@@ -5040,6 +5222,11 @@ int dlm_recover_waiters_post(struct dlm_ls *ls)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* </div><div class='add'>+		 * Find an lkb from the waiters list that's been affected by</div><div class='add'>+		 * recovery node changes, and needs to be reprocessed.  Does</div><div class='add'>+		 * hold_lkb(), adding a refcount.</div><div class='add'>+		 */</div><div class='ctx'> 		lkb = find_resend_waiter(ls);</div><div class='ctx'> 		if (!lkb)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -5048,6 +5235,11 @@ int dlm_recover_waiters_post(struct dlm_ls *ls)</div><div class='ctx'> 		hold_rsb(r);</div><div class='ctx'> 		lock_rsb(r);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * If the lkb has been flagged for a force unlock or cancel,</div><div class='add'>+		 * then the reprocessing below will be replaced by just doing</div><div class='add'>+		 * the unlock/cancel directly.</div><div class='add'>+		 */</div><div class='ctx'> 		mstype = lkb-&gt;lkb_wait_type;</div><div class='ctx'> 		oc = test_and_clear_bit(DLM_IFL_OVERLAP_CANCEL_BIT,</div><div class='ctx'> 					&amp;lkb-&gt;lkb_iflags);</div><div class='hunk'>@@ -5061,21 +5253,39 @@ int dlm_recover_waiters_post(struct dlm_ls *ls)</div><div class='ctx'> 			  r-&gt;res_nodeid, lkb-&gt;lkb_nodeid, lkb-&gt;lkb_wait_nodeid,</div><div class='ctx'> 			  dlm_dir_nodeid(r), oc, ou);</div><div class='ctx'> </div><div class='del'>-		/* At this point we assume that we won't get a reply to any</div><div class='del'>-		   previous op or overlap op on this lock.  First, do a big</div><div class='del'>-		   remove_from_waiters() for all previous ops. */</div><div class='add'>+		/*</div><div class='add'>+		 * No reply to the pre-recovery operation will now be received,</div><div class='add'>+		 * so a forced equivalent of remove_from_waiters() is needed to</div><div class='add'>+		 * reset the waiters state that was in place before recovery.</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='ctx'> 		clear_bit(DLM_IFL_RESEND_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='add'>+</div><div class='add'>+		/* Forcibly clear wait_type */</div><div class='ctx'> 		lkb-&gt;lkb_wait_type = 0;</div><div class='del'>-		/* drop all wait_count references we still</div><div class='del'>-		 * hold a reference for this iteration.</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Forcibly reset wait_count and associated refcount.  The</div><div class='add'>+		 * wait_count will almost always be 1, but in case of an</div><div class='add'>+		 * overlapping unlock/cancel it could be 2: see where</div><div class='add'>+		 * add_to_waiters() finds the lkb is already on the waiters</div><div class='add'>+		 * list and does lkb_wait_count++; hold_lkb().</div><div class='ctx'> 		 */</div><div class='del'>-		while (!atomic_dec_and_test(&amp;lkb-&gt;lkb_wait_count))</div><div class='add'>+		while (lkb-&gt;lkb_wait_count) {</div><div class='add'>+			lkb-&gt;lkb_wait_count--;</div><div class='ctx'> 			unhold_lkb(lkb);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+		/* Forcibly remove from waiters list */</div><div class='add'>+		spin_lock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 		list_del_init(&amp;lkb-&gt;lkb_wait_reply);</div><div class='del'>-		mutex_unlock(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+		spin_unlock_bh(&amp;ls-&gt;ls_waiters_lock);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The lkb is now clear of all prior waiters state and can be</div><div class='add'>+		 * processed locally, or sent to remote node again, or directly</div><div class='add'>+		 * cancelled/unlocked.</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='ctx'> 		if (oc || ou) {</div><div class='ctx'> 			/* do an unlock or cancel instead of resending */</div><div class='hunk'>@@ -5102,7 +5312,7 @@ int dlm_recover_waiters_post(struct dlm_ls *ls)</div><div class='ctx'> 			case DLM_MSG_LOOKUP:</div><div class='ctx'> 			case DLM_MSG_REQUEST:</div><div class='ctx'> 				_request_lock(r, lkb);</div><div class='del'>-				if (is_master(r))</div><div class='add'>+				if (r-&gt;res_nodeid != -1 &amp;&amp; is_master(r))</div><div class='ctx'> 					confirm_master(r, 0);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case DLM_MSG_CONVERT:</div><div class='hunk'>@@ -5194,7 +5404,7 @@ static void purge_dead_list(struct dlm_ls *ls, struct dlm_rsb *r,</div><div class='ctx'> </div><div class='ctx'> /* Get rid of locks held by nodes that are gone. */</div><div class='ctx'> </div><div class='del'>-void dlm_recover_purge(struct dlm_ls *ls)</div><div class='add'>+void dlm_recover_purge(struct dlm_ls *ls, const struct list_head *root_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> 	struct dlm_member *memb;</div><div class='hunk'>@@ -5213,11 +5423,9 @@ void dlm_recover_purge(struct dlm_ls *ls)</div><div class='ctx'> 	if (!nodes_count)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry(r, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='del'>-		hold_rsb(r);</div><div class='add'>+	list_for_each_entry(r, root_list, res_root_list) {</div><div class='ctx'> 		lock_rsb(r);</div><div class='del'>-		if (is_master(r)) {</div><div class='add'>+		if (r-&gt;res_nodeid != -1 &amp;&amp; is_master(r)) {</div><div class='ctx'> 			purge_dead_list(ls, r, &amp;r-&gt;res_grantqueue,</div><div class='ctx'> 					nodeid_gone, &amp;lkb_count);</div><div class='ctx'> 			purge_dead_list(ls, r, &amp;r-&gt;res_convertqueue,</div><div class='hunk'>@@ -5226,25 +5434,21 @@ void dlm_recover_purge(struct dlm_ls *ls)</div><div class='ctx'> 					nodeid_gone, &amp;lkb_count);</div><div class='ctx'> 		}</div><div class='ctx'> 		unlock_rsb(r);</div><div class='del'>-		unhold_rsb(r);</div><div class='add'>+</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	up_write(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> </div><div class='ctx'> 	if (lkb_count)</div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_purge %u locks for %u nodes",</div><div class='ctx'> 			  lkb_count, nodes_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_rsb *find_grant_rsb(struct dlm_ls *ls, int bucket)</div><div class='add'>+static struct dlm_rsb *find_grant_rsb(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node *n;</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='del'>-	for (n = rb_first(&amp;ls-&gt;ls_rsbtbl[bucket].keep); n; n = rb_next(n)) {</div><div class='del'>-		r = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	list_for_each_entry(r, &amp;ls-&gt;ls_slow_active, res_slow_list) {</div><div class='ctx'> 		if (!rsb_flag(r, RSB_RECOVER_GRANT))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!is_master(r)) {</div><div class='hunk'>@@ -5252,10 +5456,10 @@ static struct dlm_rsb *find_grant_rsb(struct dlm_ls *ls, int bucket)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		hold_rsb(r);</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='add'>+		read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rsbtbl[bucket].lock);</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5279,19 +5483,15 @@ static struct dlm_rsb *find_grant_rsb(struct dlm_ls *ls, int bucket)</div><div class='ctx'> void dlm_recover_grant(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='del'>-	int bucket = 0;</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	unsigned int rsb_count = 0;</div><div class='ctx'> 	unsigned int lkb_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		r = find_grant_rsb(ls, bucket);</div><div class='del'>-		if (!r) {</div><div class='del'>-			if (bucket == ls-&gt;ls_rsbtbl_size - 1)</div><div class='del'>-				break;</div><div class='del'>-			bucket++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		r = find_grant_rsb(ls);</div><div class='add'>+		if (!r)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		rsb_count++;</div><div class='ctx'> 		count = 0;</div><div class='ctx'> 		lock_rsb(r);</div><div class='hunk'>@@ -5374,10 +5574,11 @@ static int receive_rcom_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,</div><div class='ctx'> 	   The real granted mode of these converting locks cannot be determined</div><div class='ctx'> 	   until all locks have been rebuilt on the rsb (recover_conversion) */</div><div class='ctx'> </div><div class='del'>-	if (rl-&gt;rl_wait_type == cpu_to_le16(DLM_MSG_CONVERT) &amp;&amp;</div><div class='del'>-	    middle_conversion(lkb)) {</div><div class='del'>-		rl-&gt;rl_status = DLM_LKSTS_CONVERT;</div><div class='del'>-		lkb-&gt;lkb_grmode = DLM_LOCK_IV;</div><div class='add'>+	if (rl-&gt;rl_status == DLM_LKSTS_CONVERT &amp;&amp; middle_conversion(lkb)) {</div><div class='add'>+		/* We may need to adjust grmode depending on other granted locks. */</div><div class='add'>+		log_rinfo(ls, "%s %x middle convert gr %d rq %d remote %d %x",</div><div class='add'>+			  __func__, lkb-&gt;lkb_id, lkb-&gt;lkb_grmode,</div><div class='add'>+			  lkb-&gt;lkb_rqmode, lkb-&gt;lkb_nodeid, lkb-&gt;lkb_remid);</div><div class='ctx'> 		rsb_set_flag(r, RSB_RECOVER_CONVERT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5599,10 +5800,10 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add this new lkb to the per-process list of locks */</div><div class='del'>-	spin_lock(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='add'>+	spin_lock_bh(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='ctx'> 	hold_lkb(lkb);</div><div class='ctx'> 	list_add_tail(&amp;lkb-&gt;lkb_ownqueue, &amp;ua-&gt;proc-&gt;locks);</div><div class='del'>-	spin_unlock(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='ctx'> 	do_put = false;</div><div class='ctx'>  out_put:</div><div class='ctx'> 	trace_dlm_lock_end(ls, lkb, name, namelen, mode, flags, error, false);</div><div class='hunk'>@@ -5684,7 +5885,7 @@ int dlm_user_adopt_orphan(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,</div><div class='ctx'> 	int found_other_mode = 0;</div><div class='ctx'> 	int rv = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_orphans_mutex);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> 	list_for_each_entry(iter, &amp;ls-&gt;ls_orphans, lkb_ownqueue) {</div><div class='ctx'> 		if (iter-&gt;lkb_resource-&gt;res_length != namelen)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -5701,7 +5902,7 @@ int dlm_user_adopt_orphan(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,</div><div class='ctx'> 		*lkid = iter-&gt;lkb_id;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_orphans_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!lkb &amp;&amp; found_other_mode) {</div><div class='ctx'> 		rv = -EAGAIN;</div><div class='hunk'>@@ -5732,9 +5933,9 @@ int dlm_user_adopt_orphan(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,</div><div class='ctx'> 	 * for the proc locks list.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='add'>+	spin_lock_bh(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='ctx'> 	list_add_tail(&amp;lkb-&gt;lkb_ownqueue, &amp;ua-&gt;proc-&gt;locks);</div><div class='del'>-	spin_unlock(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='ctx'>  out:</div><div class='ctx'> 	kfree(ua_tmp);</div><div class='ctx'> 	return rv;</div><div class='hunk'>@@ -5778,11 +5979,11 @@ int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='add'>+	spin_lock_bh(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='ctx'> 	/* dlm_user_add_cb() may have already taken lkb off the proc list */</div><div class='ctx'> 	if (!list_empty(&amp;lkb-&gt;lkb_ownqueue))</div><div class='ctx'> 		list_move(&amp;lkb-&gt;lkb_ownqueue, &amp;ua-&gt;proc-&gt;unlocking);</div><div class='del'>-	spin_unlock(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ua-&gt;proc-&gt;locks_spin);</div><div class='ctx'>  out_put:</div><div class='ctx'> 	trace_dlm_unlock_end(ls, lkb, flags, error);</div><div class='ctx'> 	dlm_put_lkb(lkb);</div><div class='hunk'>@@ -5893,9 +6094,9 @@ static int orphan_proc_lock(struct dlm_ls *ls, struct dlm_lkb *lkb)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	hold_lkb(lkb); /* reference for the ls_orphans list */</div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_orphans_mutex);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> 	list_add_tail(&amp;lkb-&gt;lkb_ownqueue, &amp;ls-&gt;ls_orphans);</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_orphans_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> </div><div class='ctx'> 	set_unlock_args(0, lkb-&gt;lkb_ua, &amp;args);</div><div class='ctx'> </div><div class='hunk'>@@ -5933,7 +6134,7 @@ static struct dlm_lkb *del_proc_lock(struct dlm_ls *ls,</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_lkb *lkb = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> 	if (list_empty(&amp;proc-&gt;locks))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -5945,7 +6146,7 @@ static struct dlm_lkb *del_proc_lock(struct dlm_ls *ls,</div><div class='ctx'> 	else</div><div class='ctx'> 		set_bit(DLM_IFL_DEAD_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> 	return lkb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5961,6 +6162,7 @@ static struct dlm_lkb *del_proc_lock(struct dlm_ls *ls,</div><div class='ctx'> </div><div class='ctx'> void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)</div><div class='ctx'> {</div><div class='add'>+	struct dlm_callback *cb, *cb_safe;</div><div class='ctx'> 	struct dlm_lkb *lkb, *safe;</div><div class='ctx'> </div><div class='ctx'> 	dlm_lock_recovery(ls);</div><div class='hunk'>@@ -5981,7 +6183,7 @@ void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)</div><div class='ctx'> 		dlm_put_lkb(lkb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> </div><div class='ctx'> 	/* in-progress unlocks */</div><div class='ctx'> 	list_for_each_entry_safe(lkb, safe, &amp;proc-&gt;unlocking, lkb_ownqueue) {</div><div class='hunk'>@@ -5990,29 +6192,29 @@ void dlm_clear_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)</div><div class='ctx'> 		dlm_put_lkb(lkb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(lkb, safe, &amp;proc-&gt;asts, lkb_cb_list) {</div><div class='del'>-		dlm_purge_lkb_callbacks(lkb);</div><div class='del'>-		list_del_init(&amp;lkb-&gt;lkb_cb_list);</div><div class='del'>-		dlm_put_lkb(lkb);</div><div class='add'>+	list_for_each_entry_safe(cb, cb_safe, &amp;proc-&gt;asts, list) {</div><div class='add'>+		list_del(&amp;cb-&gt;list);</div><div class='add'>+		dlm_free_cb(cb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> 	dlm_unlock_recovery(ls);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void purge_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)</div><div class='ctx'> {</div><div class='add'>+	struct dlm_callback *cb, *cb_safe;</div><div class='ctx'> 	struct dlm_lkb *lkb, *safe;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		lkb = NULL;</div><div class='del'>-		spin_lock(&amp;proc-&gt;locks_spin);</div><div class='add'>+		spin_lock_bh(&amp;proc-&gt;locks_spin);</div><div class='ctx'> 		if (!list_empty(&amp;proc-&gt;locks)) {</div><div class='ctx'> 			lkb = list_entry(proc-&gt;locks.next, struct dlm_lkb,</div><div class='ctx'> 					 lkb_ownqueue);</div><div class='ctx'> 			list_del_init(&amp;lkb-&gt;lkb_ownqueue);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;proc-&gt;locks_spin);</div><div class='add'>+		spin_unlock_bh(&amp;proc-&gt;locks_spin);</div><div class='ctx'> </div><div class='ctx'> 		if (!lkb)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -6022,21 +6224,20 @@ static void purge_proc_locks(struct dlm_ls *ls, struct dlm_user_proc *proc)</div><div class='ctx'> 		dlm_put_lkb(lkb); /* ref from proc-&gt;locks list */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;proc-&gt;locks_spin);</div><div class='add'>+	spin_lock_bh(&amp;proc-&gt;locks_spin);</div><div class='ctx'> 	list_for_each_entry_safe(lkb, safe, &amp;proc-&gt;unlocking, lkb_ownqueue) {</div><div class='ctx'> 		list_del_init(&amp;lkb-&gt;lkb_ownqueue);</div><div class='ctx'> 		set_bit(DLM_IFL_DEAD_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='ctx'> 		dlm_put_lkb(lkb);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;proc-&gt;locks_spin);</div><div class='add'>+	spin_unlock_bh(&amp;proc-&gt;locks_spin);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;proc-&gt;asts_spin);</div><div class='del'>-	list_for_each_entry_safe(lkb, safe, &amp;proc-&gt;asts, lkb_cb_list) {</div><div class='del'>-		dlm_purge_lkb_callbacks(lkb);</div><div class='del'>-		list_del_init(&amp;lkb-&gt;lkb_cb_list);</div><div class='del'>-		dlm_put_lkb(lkb);</div><div class='add'>+	spin_lock_bh(&amp;proc-&gt;asts_spin);</div><div class='add'>+	list_for_each_entry_safe(cb, cb_safe, &amp;proc-&gt;asts, list) {</div><div class='add'>+		list_del(&amp;cb-&gt;list);</div><div class='add'>+		dlm_free_cb(cb);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+	spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* pid of 0 means purge all orphans */</div><div class='hunk'>@@ -6045,7 +6246,7 @@ static void do_purge(struct dlm_ls *ls, int nodeid, int pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_lkb *lkb, *safe;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_orphans_mutex);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> 	list_for_each_entry_safe(lkb, safe, &amp;ls-&gt;ls_orphans, lkb_ownqueue) {</div><div class='ctx'> 		if (pid &amp;&amp; lkb-&gt;lkb_ownpid != pid)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -6053,7 +6254,7 @@ static void do_purge(struct dlm_ls *ls, int nodeid, int pid)</div><div class='ctx'> 		list_del_init(&amp;lkb-&gt;lkb_ownqueue);</div><div class='ctx'> 		dlm_put_lkb(lkb);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_orphans_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_purge(struct dlm_ls *ls, int nodeid, int pid)</div><div class='hunk'>@@ -6063,7 +6264,7 @@ static int send_purge(struct dlm_ls *ls, int nodeid, int pid)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = _create_message(ls, sizeof(struct dlm_message), nodeid,</div><div class='del'>-				DLM_MSG_PURGE, &amp;ms, &amp;mh, GFP_NOFS);</div><div class='add'>+				DLM_MSG_PURGE, &amp;ms, &amp;mh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	ms-&gt;m_nodeid = cpu_to_le32(nodeid);</div><div class='hunk'>@@ -6146,8 +6347,8 @@ int dlm_debug_add_lkb_to_waiters(struct dlm_ls *ls, uint32_t lkb_id,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	error = add_to_waiters(lkb, mstype, to_nodeid);</div><div class='add'>+	add_to_waiters(lkb, mstype, to_nodeid);</div><div class='ctx'> 	dlm_put_lkb(lkb);</div><div class='del'>-	return error;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h<br/>index b54e2cbbe6e2..b23d7b854ed4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/lock.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/lock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/lock.h</a></div><div class='hunk'>@@ -18,20 +18,23 @@ void dlm_receive_message_saved(struct dlm_ls *ls, const struct dlm_message *ms,</div><div class='ctx'> 			       uint32_t saved_seq);</div><div class='ctx'> void dlm_receive_buffer(const union dlm_packet *p, int nodeid);</div><div class='ctx'> int dlm_modes_compat(int mode1, int mode2);</div><div class='add'>+void free_inactive_rsb(struct dlm_rsb *r);</div><div class='ctx'> void dlm_put_rsb(struct dlm_rsb *r);</div><div class='ctx'> void dlm_hold_rsb(struct dlm_rsb *r);</div><div class='ctx'> int dlm_put_lkb(struct dlm_lkb *lkb);</div><div class='del'>-void dlm_scan_rsbs(struct dlm_ls *ls);</div><div class='ctx'> int dlm_lock_recovery_try(struct dlm_ls *ls);</div><div class='add'>+void dlm_lock_recovery(struct dlm_ls *ls);</div><div class='ctx'> void dlm_unlock_recovery(struct dlm_ls *ls);</div><div class='add'>+void dlm_rsb_scan(struct timer_list *timer);</div><div class='add'>+void resume_scan_timer(struct dlm_ls *ls);</div><div class='ctx'> </div><div class='ctx'> int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *name,</div><div class='ctx'> 		      int len, unsigned int flags, int *r_nodeid, int *result);</div><div class='ctx'> </div><div class='del'>-int dlm_search_rsb_tree(struct rb_root *tree, const void *name, int len,</div><div class='add'>+int dlm_search_rsb_tree(struct rhashtable *rhash, const void *name, int len,</div><div class='ctx'> 			struct dlm_rsb **r_ret);</div><div class='ctx'> </div><div class='del'>-void dlm_recover_purge(struct dlm_ls *ls);</div><div class='add'>+void dlm_recover_purge(struct dlm_ls *ls, const struct list_head *root_list);</div><div class='ctx'> void dlm_purge_mstcpy_locks(struct dlm_rsb *r);</div><div class='ctx'> void dlm_recover_grant(struct dlm_ls *ls);</div><div class='ctx'> int dlm_recover_waiters_post(struct dlm_ls *ls);</div><div class='hunk'>@@ -63,17 +66,19 @@ int dlm_debug_add_lkb_to_waiters(struct dlm_ls *ls, uint32_t lkb_id,</div><div class='ctx'> </div><div class='ctx'> static inline int is_master(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='add'>+	WARN_ON_ONCE(r-&gt;res_nodeid == -1);</div><div class='add'>+</div><div class='ctx'> 	return !r-&gt;res_nodeid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void lock_rsb(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;r-&gt;res_mutex);</div><div class='add'>+	spin_lock_bh(&amp;r-&gt;res_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void unlock_rsb(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='del'>-	mutex_unlock(&amp;r-&gt;res_mutex);</div><div class='add'>+	spin_unlock_bh(&amp;r-&gt;res_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c<br/>index 0455dddb0797..ddaa76558706 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/lockspace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lockspace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/lockspace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/lockspace.c</a></div><div class='hunk'>@@ -29,8 +29,6 @@ static int			ls_count;</div><div class='ctx'> static struct mutex		ls_lock;</div><div class='ctx'> static struct list_head		lslist;</div><div class='ctx'> static spinlock_t		lslist_lock;</div><div class='del'>-static struct task_struct *	scand_task;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static ssize_t dlm_control_store(struct dlm_ls *ls, const char *buf, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,7 +38,7 @@ static ssize_t dlm_control_store(struct dlm_ls *ls, const char *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	ls = dlm_find_lockspace_local(ls-&gt;ls_local_handle);</div><div class='add'>+	ls = dlm_find_lockspace_local(ls);</div><div class='ctx'> 	if (!ls)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -176,12 +174,6 @@ static ssize_t dlm_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 	return a-&gt;store ? a-&gt;store(ls, buf, len) : len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lockspace_kobj_release(struct kobject *k)</div><div class='del'>-{</div><div class='del'>-	struct dlm_ls *ls  = container_of(k, struct dlm_ls, ls_kobj);</div><div class='del'>-	kfree(ls);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct sysfs_ops dlm_attr_ops = {</div><div class='ctx'> 	.show  = dlm_attr_show,</div><div class='ctx'> 	.store = dlm_attr_store,</div><div class='hunk'>@@ -190,17 +182,21 @@ static const struct sysfs_ops dlm_attr_ops = {</div><div class='ctx'> static struct kobj_type dlm_ktype = {</div><div class='ctx'> 	.default_groups = dlm_groups,</div><div class='ctx'> 	.sysfs_ops     = &amp;dlm_attr_ops,</div><div class='del'>-	.release       = lockspace_kobj_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct kset *dlm_kset;</div><div class='ctx'> </div><div class='del'>-static int do_uevent(struct dlm_ls *ls, int in)</div><div class='add'>+static int do_uevent(struct dlm_ls *ls, int in, unsigned int release_recover)</div><div class='ctx'> {</div><div class='del'>-	if (in)</div><div class='add'>+	char message[512] = {};</div><div class='add'>+	char *envp[] = { message, NULL };</div><div class='add'>+</div><div class='add'>+	if (in) {</div><div class='ctx'> 		kobject_uevent(&amp;ls-&gt;ls_kobj, KOBJ_ONLINE);</div><div class='del'>-	else</div><div class='del'>-		kobject_uevent(&amp;ls-&gt;ls_kobj, KOBJ_OFFLINE);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(message, 511, "RELEASE_RECOVER=%u", release_recover);</div><div class='add'>+		kobject_uevent_env(&amp;ls-&gt;ls_kobj, KOBJ_OFFLINE, envp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	log_rinfo(ls, "%s the lockspace group...", in ? "joining" : "leaving");</div><div class='ctx'> </div><div class='hunk'>@@ -247,66 +243,11 @@ void dlm_lockspace_exit(void)</div><div class='ctx'> 	kset_unregister(dlm_kset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_ls *find_ls_to_scan(void)</div><div class='del'>-{</div><div class='del'>-	struct dlm_ls *ls;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='del'>-	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='del'>-		if (time_after_eq(jiffies, ls-&gt;ls_scan_time +</div><div class='del'>-					    dlm_config.ci_scan_secs * HZ)) {</div><div class='del'>-			spin_unlock(&amp;lslist_lock);</div><div class='del'>-			return ls;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dlm_scand(void *data)</div><div class='del'>-{</div><div class='del'>-	struct dlm_ls *ls;</div><div class='del'>-</div><div class='del'>-	while (!kthread_should_stop()) {</div><div class='del'>-		ls = find_ls_to_scan();</div><div class='del'>-		if (ls) {</div><div class='del'>-			if (dlm_lock_recovery_try(ls)) {</div><div class='del'>-				ls-&gt;ls_scan_time = jiffies;</div><div class='del'>-				dlm_scan_rsbs(ls);</div><div class='del'>-				dlm_unlock_recovery(ls);</div><div class='del'>-			} else {</div><div class='del'>-				ls-&gt;ls_scan_time += HZ;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dlm_scand_start(void)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p;</div><div class='del'>-	int error = 0;</div><div class='del'>-</div><div class='del'>-	p = kthread_run(dlm_scand, NULL, "dlm_scand");</div><div class='del'>-	if (IS_ERR(p))</div><div class='del'>-		error = PTR_ERR(p);</div><div class='del'>-	else</div><div class='del'>-		scand_task = p;</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dlm_scand_stop(void)</div><div class='del'>-{</div><div class='del'>-	kthread_stop(scand_task);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct dlm_ls *dlm_find_lockspace_global(uint32_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='ctx'> 		if (ls-&gt;ls_global_id == id) {</div><div class='hunk'>@@ -316,24 +257,15 @@ struct dlm_ls *dlm_find_lockspace_global(uint32_t id)</div><div class='ctx'> 	}</div><div class='ctx'> 	ls = NULL;</div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> 	return ls;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dlm_ls *dlm_find_lockspace_local(dlm_lockspace_t *lockspace)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_ls *ls;</div><div class='add'>+	struct dlm_ls *ls = lockspace;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='del'>-	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='del'>-		if (ls-&gt;ls_local_handle == lockspace) {</div><div class='del'>-			atomic_inc(&amp;ls-&gt;ls_count);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ls = NULL;</div><div class='del'>- out:</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	atomic_inc(&amp;ls-&gt;ls_count);</div><div class='ctx'> 	return ls;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +273,7 @@ struct dlm_ls *dlm_find_lockspace_device(int minor)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='ctx'> 		if (ls-&gt;ls_device.minor == minor) {</div><div class='ctx'> 			atomic_inc(&amp;ls-&gt;ls_count);</div><div class='hunk'>@@ -350,7 +282,7 @@ struct dlm_ls *dlm_find_lockspace_device(int minor)</div><div class='ctx'> 	}</div><div class='ctx'> 	ls = NULL;</div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> 	return ls;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -365,15 +297,15 @@ static void remove_lockspace(struct dlm_ls *ls)</div><div class='ctx'> retry:</div><div class='ctx'> 	wait_event(ls-&gt;ls_count_wait, atomic_read(&amp;ls-&gt;ls_count) == 0);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	if (atomic_read(&amp;ls-&gt;ls_count) != 0) {</div><div class='del'>-		spin_unlock(&amp;lslist_lock);</div><div class='add'>+		spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(ls-&gt;ls_create_count != 0);</div><div class='ctx'> 	list_del(&amp;ls-&gt;ls_list);</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int threads_start(void)</div><div class='hunk'>@@ -382,23 +314,48 @@ static int threads_start(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Thread for sending/receiving messages for all lockspace's */</div><div class='ctx'> 	error = dlm_midcomms_start();</div><div class='del'>-	if (error) {</div><div class='add'>+	if (error)</div><div class='ctx'> 		log_print("cannot start dlm midcomms %d", error);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	error = dlm_scand_start();</div><div class='del'>-	if (error) {</div><div class='del'>-		log_print("cannot start dlm_scand thread %d", error);</div><div class='del'>-		goto midcomms_fail;</div><div class='del'>-	}</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lkb_idr_free(struct dlm_lkb *lkb)</div><div class='add'>+{</div><div class='add'>+	if (lkb-&gt;lkb_lvbptr &amp;&amp; test_bit(DLM_IFL_MSTCPY_BIT, &amp;lkb-&gt;lkb_iflags))</div><div class='add'>+		dlm_free_lvb(lkb-&gt;lkb_lvbptr);</div><div class='ctx'> </div><div class='add'>+	dlm_free_lkb(lkb);</div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>- midcomms_fail:</div><div class='del'>-	dlm_midcomms_stop();</div><div class='del'>- fail:</div><div class='del'>-	return error;</div><div class='add'>+static void rhash_free_rsb(void *ptr, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *rsb = ptr;</div><div class='add'>+</div><div class='add'>+	dlm_free_rsb(rsb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_lockspace(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct dlm_ls *ls  = container_of(work, struct dlm_ls, ls_free_work);</div><div class='add'>+	struct dlm_lkb *lkb;</div><div class='add'>+	unsigned long id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Free all lkb's in xa</div><div class='add'>+	 */</div><div class='add'>+	xa_for_each(&amp;ls-&gt;ls_lkbxa, id, lkb) {</div><div class='add'>+		lkb_idr_free(lkb);</div><div class='add'>+	}</div><div class='add'>+	xa_destroy(&amp;ls-&gt;ls_lkbxa);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Free all rsb's on rsbtbl</div><div class='add'>+	 */</div><div class='add'>+	rhashtable_free_and_destroy(&amp;ls-&gt;ls_rsbtbl, rhash_free_rsb, NULL);</div><div class='add'>+</div><div class='add'>+	kfree(ls);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int new_lockspace(const char *name, const char *cluster,</div><div class='hunk'>@@ -407,9 +364,8 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 			 int *ops_result, dlm_lockspace_t **lockspace)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='del'>-	int i, size, error;</div><div class='del'>-	int do_unreg = 0;</div><div class='ctx'> 	int namelen = strlen(name);</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (namelen &gt; DLM_LOCKSPACE_LEN || namelen == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -448,7 +404,7 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> </div><div class='ctx'> 	error = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='ctx'> 		WARN_ON(ls-&gt;ls_create_count &lt;= 0);</div><div class='ctx'> 		if (ls-&gt;ls_namelen != namelen)</div><div class='hunk'>@@ -464,7 +420,7 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 		error = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -480,47 +436,36 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	atomic_set(&amp;ls-&gt;ls_count, 0);</div><div class='ctx'> 	init_waitqueue_head(&amp;ls-&gt;ls_count_wait);</div><div class='ctx'> 	ls-&gt;ls_flags = 0;</div><div class='del'>-	ls-&gt;ls_scan_time = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	if (ops &amp;&amp; dlm_config.ci_recover_callbacks) {</div><div class='ctx'> 		ls-&gt;ls_ops = ops;</div><div class='ctx'> 		ls-&gt;ls_ops_arg = ops_arg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (flags &amp; DLM_LSFL_SOFTIRQ)</div><div class='add'>+		set_bit(LSFL_SOFTIRQ, &amp;ls-&gt;ls_flags);</div><div class='add'>+</div><div class='ctx'> 	/* ls_exflags are forced to match among nodes, and we don't</div><div class='ctx'> 	 * need to require all nodes to have some flags set</div><div class='ctx'> 	 */</div><div class='del'>-	ls-&gt;ls_exflags = (flags &amp; ~(DLM_LSFL_FS | DLM_LSFL_NEWEXCL));</div><div class='add'>+	ls-&gt;ls_exflags = (flags &amp; ~(DLM_LSFL_FS | DLM_LSFL_NEWEXCL |</div><div class='add'>+				    DLM_LSFL_SOFTIRQ));</div><div class='ctx'> </div><div class='del'>-	size = READ_ONCE(dlm_config.ci_rsbtbl_size);</div><div class='del'>-	ls-&gt;ls_rsbtbl_size = size;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ls-&gt;ls_slow_inactive);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ls-&gt;ls_slow_active);</div><div class='add'>+	rwlock_init(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> </div><div class='del'>-	ls-&gt;ls_rsbtbl = vmalloc(array_size(size, sizeof(struct dlm_rsbtable)));</div><div class='del'>-	if (!ls-&gt;ls_rsbtbl)</div><div class='add'>+	error = rhashtable_init(&amp;ls-&gt;ls_rsbtbl, &amp;dlm_rhash_rsb_params);</div><div class='add'>+	if (error)</div><div class='ctx'> 		goto out_lsfree;</div><div class='del'>-	for (i = 0; i &lt; size; i++) {</div><div class='del'>-		ls-&gt;ls_rsbtbl[i].keep.rb_node = NULL;</div><div class='del'>-		ls-&gt;ls_rsbtbl[i].toss.rb_node = NULL;</div><div class='del'>-		spin_lock_init(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; DLM_REMOVE_NAMES_MAX; i++) {</div><div class='del'>-		ls-&gt;ls_remove_names[i] = kzalloc(DLM_RESNAME_MAXLEN+1,</div><div class='del'>-						 GFP_KERNEL);</div><div class='del'>-		if (!ls-&gt;ls_remove_names[i])</div><div class='del'>-			goto out_rsbtbl;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	idr_init(&amp;ls-&gt;ls_lkbidr);</div><div class='del'>-	spin_lock_init(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='add'>+	xa_init_flags(&amp;ls-&gt;ls_lkbxa, XA_FLAGS_ALLOC | XA_FLAGS_LOCK_BH);</div><div class='add'>+	rwlock_init(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_waiters);</div><div class='del'>-	mutex_init(&amp;ls-&gt;ls_waiters_mutex);</div><div class='add'>+	spin_lock_init(&amp;ls-&gt;ls_waiters_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_orphans);</div><div class='del'>-	mutex_init(&amp;ls-&gt;ls_orphans_mutex);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;ls-&gt;ls_new_rsb);</div><div class='del'>-	spin_lock_init(&amp;ls-&gt;ls_new_rsb_spin);</div><div class='add'>+	spin_lock_init(&amp;ls-&gt;ls_orphans_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_nodes);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_nodes_gone);</div><div class='hunk'>@@ -543,6 +488,8 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	spin_lock_init(&amp;ls-&gt;ls_cb_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_cb_delay);</div><div class='ctx'> </div><div class='add'>+	INIT_WORK(&amp;ls-&gt;ls_free_work, free_lockspace);</div><div class='add'>+</div><div class='ctx'> 	ls-&gt;ls_recoverd_task = NULL;</div><div class='ctx'> 	mutex_init(&amp;ls-&gt;ls_recoverd_active);</div><div class='ctx'> 	spin_lock_init(&amp;ls-&gt;ls_recover_lock);</div><div class='hunk'>@@ -552,11 +499,9 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	ls-&gt;ls_recover_seq = get_random_u64();</div><div class='ctx'> 	ls-&gt;ls_recover_args = NULL;</div><div class='ctx'> 	init_rwsem(&amp;ls-&gt;ls_in_recovery);</div><div class='del'>-	init_rwsem(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	rwlock_init(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_requestqueue);</div><div class='del'>-	atomic_set(&amp;ls-&gt;ls_requestqueue_cnt, 0);</div><div class='del'>-	init_waitqueue_head(&amp;ls-&gt;ls_requestqueue_wait);</div><div class='del'>-	mutex_init(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='add'>+	rwlock_init(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 	spin_lock_init(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> </div><div class='ctx'> 	/* Due backwards compatibility with 3.1 we need to use maximum</div><div class='hunk'>@@ -565,8 +510,10 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	 * might send less.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ls-&gt;ls_recover_buf = kmalloc(DLM_MAX_SOCKET_BUFSIZE, GFP_NOFS);</div><div class='del'>-	if (!ls-&gt;ls_recover_buf)</div><div class='del'>-		goto out_lkbidr;</div><div class='add'>+	if (!ls-&gt;ls_recover_buf) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto out_lkbxa;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ls-&gt;ls_slot = 0;</div><div class='ctx'> 	ls-&gt;ls_num_slots = 0;</div><div class='hunk'>@@ -575,25 +522,31 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ls-&gt;ls_recover_list);</div><div class='ctx'> 	spin_lock_init(&amp;ls-&gt;ls_recover_list_lock);</div><div class='del'>-	idr_init(&amp;ls-&gt;ls_recover_idr);</div><div class='del'>-	spin_lock_init(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	xa_init_flags(&amp;ls-&gt;ls_recover_xa, XA_FLAGS_ALLOC | XA_FLAGS_LOCK_BH);</div><div class='add'>+	spin_lock_init(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> 	ls-&gt;ls_recover_list_count = 0;</div><div class='del'>-	ls-&gt;ls_local_handle = ls;</div><div class='ctx'> 	init_waitqueue_head(&amp;ls-&gt;ls_wait_general);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ls-&gt;ls_root_list);</div><div class='del'>-	init_rwsem(&amp;ls-&gt;ls_root_sem);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ls-&gt;ls_masters_list);</div><div class='add'>+	rwlock_init(&amp;ls-&gt;ls_masters_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ls-&gt;ls_dir_dump_list);</div><div class='add'>+	rwlock_init(&amp;ls-&gt;ls_dir_dump_lock);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ls-&gt;ls_scan_list);</div><div class='add'>+	spin_lock_init(&amp;ls-&gt;ls_scan_lock);</div><div class='add'>+	timer_setup(&amp;ls-&gt;ls_scan_timer, dlm_rsb_scan, TIMER_DEFERRABLE);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	ls-&gt;ls_create_count = 1;</div><div class='ctx'> 	list_add(&amp;ls-&gt;ls_list, &amp;lslist);</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; DLM_LSFL_FS) {</div><div class='del'>-		error = dlm_callback_start(ls);</div><div class='del'>-		if (error) {</div><div class='del'>-			log_error(ls, "can't start dlm_callback %d", error);</div><div class='del'>-			goto out_delist;</div><div class='del'>-		}</div><div class='add'>+	if (flags &amp; DLM_LSFL_FS)</div><div class='add'>+		set_bit(LSFL_FS, &amp;ls-&gt;ls_flags);</div><div class='add'>+</div><div class='add'>+	error = dlm_callback_start(ls);</div><div class='add'>+	if (error) {</div><div class='add'>+		log_error(ls, "can't start dlm_callback %d", error);</div><div class='add'>+		goto out_delist;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;ls-&gt;ls_recover_lock_wait);</div><div class='hunk'>@@ -614,9 +567,6 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	wait_event(ls-&gt;ls_recover_lock_wait,</div><div class='ctx'> 		   test_bit(LSFL_RECOVER_LOCK, &amp;ls-&gt;ls_flags));</div><div class='ctx'> </div><div class='del'>-	/* let kobject handle freeing of ls if there's an error */</div><div class='del'>-	do_unreg = 1;</div><div class='del'>-</div><div class='ctx'> 	ls-&gt;ls_kobj.kset = dlm_kset;</div><div class='ctx'> 	error = kobject_init_and_add(&amp;ls-&gt;ls_kobj, &amp;dlm_ktype, NULL,</div><div class='ctx'> 				     "%s", ls-&gt;ls_name);</div><div class='hunk'>@@ -630,8 +580,8 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	   current lockspace members are (via configfs) and then tells the</div><div class='ctx'> 	   lockspace to start running (via sysfs) in dlm_ls_start(). */</div><div class='ctx'> </div><div class='del'>-	error = do_uevent(ls, 1);</div><div class='del'>-	if (error)</div><div class='add'>+	error = do_uevent(ls, 1, 0);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		goto out_recoverd;</div><div class='ctx'> </div><div class='ctx'> 	/* wait until recovery is successful or failed */</div><div class='hunk'>@@ -647,7 +597,7 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out_members:</div><div class='del'>-	do_uevent(ls, 0);</div><div class='add'>+	do_uevent(ls, 0, 0);</div><div class='ctx'> 	dlm_clear_members(ls);</div><div class='ctx'> 	kfree(ls-&gt;ls_node_array);</div><div class='ctx'>  out_recoverd:</div><div class='hunk'>@@ -655,22 +605,17 @@ static int new_lockspace(const char *name, const char *cluster,</div><div class='ctx'>  out_callback:</div><div class='ctx'> 	dlm_callback_stop(ls);</div><div class='ctx'>  out_delist:</div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	list_del(&amp;ls-&gt;ls_list);</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='del'>-	idr_destroy(&amp;ls-&gt;ls_recover_idr);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='add'>+	xa_destroy(&amp;ls-&gt;ls_recover_xa);</div><div class='ctx'> 	kfree(ls-&gt;ls_recover_buf);</div><div class='del'>- out_lkbidr:</div><div class='del'>-	idr_destroy(&amp;ls-&gt;ls_lkbidr);</div><div class='del'>- out_rsbtbl:</div><div class='del'>-	for (i = 0; i &lt; DLM_REMOVE_NAMES_MAX; i++)</div><div class='del'>-		kfree(ls-&gt;ls_remove_names[i]);</div><div class='del'>-	vfree(ls-&gt;ls_rsbtbl);</div><div class='add'>+ out_lkbxa:</div><div class='add'>+	xa_destroy(&amp;ls-&gt;ls_lkbxa);</div><div class='add'>+	rhashtable_destroy(&amp;ls-&gt;ls_rsbtbl);</div><div class='ctx'>  out_lsfree:</div><div class='del'>-	if (do_unreg)</div><div class='del'>-		kobject_put(&amp;ls-&gt;ls_kobj);</div><div class='del'>-	else</div><div class='del'>-		kfree(ls);</div><div class='add'>+	kobject_put(&amp;ls-&gt;ls_kobj);</div><div class='add'>+	kfree(ls);</div><div class='ctx'>  out:</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -697,7 +642,6 @@ static int __dlm_new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 	if (error &gt; 0)</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 	if (!ls_count) {</div><div class='del'>-		dlm_scand_stop();</div><div class='ctx'> 		dlm_midcomms_shutdown();</div><div class='ctx'> 		dlm_midcomms_stop();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -721,62 +665,52 @@ int dlm_new_user_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 			   void *ops_arg, int *ops_result,</div><div class='ctx'> 			   dlm_lockspace_t **lockspace)</div><div class='ctx'> {</div><div class='add'>+	if (flags &amp; DLM_LSFL_SOFTIRQ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	return __dlm_new_lockspace(name, cluster, flags, lvblen, ops,</div><div class='ctx'> 				   ops_arg, ops_result, lockspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lkb_idr_is_local(int id, void *p, void *data)</div><div class='del'>-{</div><div class='del'>-	struct dlm_lkb *lkb = p;</div><div class='del'>-</div><div class='del'>-	return lkb-&gt;lkb_nodeid == 0 &amp;&amp; lkb-&gt;lkb_grmode != DLM_LOCK_IV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lkb_idr_is_any(int id, void *p, void *data)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lkb_idr_free(int id, void *p, void *data)</div><div class='del'>-{</div><div class='del'>-	struct dlm_lkb *lkb = p;</div><div class='del'>-</div><div class='del'>-	if (lkb-&gt;lkb_lvbptr &amp;&amp; test_bit(DLM_IFL_MSTCPY_BIT, &amp;lkb-&gt;lkb_iflags))</div><div class='del'>-		dlm_free_lvb(lkb-&gt;lkb_lvbptr);</div><div class='del'>-</div><div class='del'>-	dlm_free_lkb(lkb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* NOTE: We check the lkbidr here rather than the resource table.</div><div class='add'>+/* NOTE: We check the lkbxa here rather than the resource table.</div><div class='ctx'>    This is because there may be LKBs queued as ASTs that have been unlinked</div><div class='ctx'>    from their RSBs and are pending deletion once the AST has been delivered */</div><div class='ctx'> </div><div class='del'>-static int lockspace_busy(struct dlm_ls *ls, int force)</div><div class='add'>+static int lockspace_busy(struct dlm_ls *ls, unsigned int release_option)</div><div class='ctx'> {</div><div class='del'>-	int rv;</div><div class='add'>+	struct dlm_lkb *lkb;</div><div class='add'>+	unsigned long id;</div><div class='add'>+	int rv = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='del'>-	if (force == 0) {</div><div class='del'>-		rv = idr_for_each(&amp;ls-&gt;ls_lkbidr, lkb_idr_is_any, ls);</div><div class='del'>-	} else if (force == 1) {</div><div class='del'>-		rv = idr_for_each(&amp;ls-&gt;ls_lkbidr, lkb_idr_is_local, ls);</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='add'>+	if (release_option == DLM_RELEASE_NO_LOCKS) {</div><div class='add'>+		xa_for_each(&amp;ls-&gt;ls_lkbxa, id, lkb) {</div><div class='add'>+			rv = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (release_option == DLM_RELEASE_UNUSED) {</div><div class='add'>+		/* TODO: handle this UNUSED option as NO_LOCKS in later patch */</div><div class='add'>+		xa_for_each(&amp;ls-&gt;ls_lkbxa, id, lkb) {</div><div class='add'>+			if (lkb-&gt;lkb_nodeid == 0 &amp;&amp;</div><div class='add'>+			    lkb-&gt;lkb_grmode != DLM_LOCK_IV) {</div><div class='add'>+				rv = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rv = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_lkbidr_spin);</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_lkbxa_lock);</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='add'>+static int release_lockspace(struct dlm_ls *ls, unsigned int release_option)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_rsb *rsb;</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-	int i, busy, rv;</div><div class='add'>+	int busy, rv;</div><div class='ctx'> </div><div class='del'>-	busy = lockspace_busy(ls, force);</div><div class='add'>+	busy = lockspace_busy(ls, release_option);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	if (ls-&gt;ls_create_count == 1) {</div><div class='ctx'> 		if (busy) {</div><div class='ctx'> 			rv = -EBUSY;</div><div class='hunk'>@@ -790,7 +724,7 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rv = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		log_debug(ls, "release_lockspace no remove %d", rv);</div><div class='hunk'>@@ -802,13 +736,19 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> </div><div class='ctx'> 	dlm_device_deregister(ls);</div><div class='ctx'> </div><div class='del'>-	if (force &lt; 3 &amp;&amp; dlm_user_daemon_available())</div><div class='del'>-		do_uevent(ls, 0);</div><div class='add'>+	if (release_option != DLM_RELEASE_NO_EVENT &amp;&amp;</div><div class='add'>+	    dlm_user_daemon_available())</div><div class='add'>+		do_uevent(ls, 0, (release_option == DLM_RELEASE_RECOVER));</div><div class='ctx'> </div><div class='ctx'> 	dlm_recoverd_stop(ls);</div><div class='ctx'> </div><div class='add'>+	/* clear the LSFL_RUNNING flag to fast up</div><div class='add'>+	 * time_shutdown_sync(), we don't care anymore</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(LSFL_RUNNING, &amp;ls-&gt;ls_flags);</div><div class='add'>+	timer_shutdown_sync(&amp;ls-&gt;ls_scan_timer);</div><div class='add'>+</div><div class='ctx'> 	if (ls_count == 1) {</div><div class='del'>-		dlm_scand_stop();</div><div class='ctx'> 		dlm_clear_members(ls);</div><div class='ctx'> 		dlm_midcomms_shutdown();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -819,45 +759,10 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> </div><div class='ctx'> 	dlm_delete_debug_file(ls);</div><div class='ctx'> </div><div class='del'>-	idr_destroy(&amp;ls-&gt;ls_recover_idr);</div><div class='del'>-	kfree(ls-&gt;ls_recover_buf);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Free all lkb's in idr</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	idr_for_each(&amp;ls-&gt;ls_lkbidr, lkb_idr_free, ls);</div><div class='del'>-	idr_destroy(&amp;ls-&gt;ls_lkbidr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Free all rsb's on rsbtbl[] lists</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ls-&gt;ls_rsbtbl_size; i++) {</div><div class='del'>-		while ((n = rb_first(&amp;ls-&gt;ls_rsbtbl[i].keep))) {</div><div class='del'>-			rsb = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-			rb_erase(n, &amp;ls-&gt;ls_rsbtbl[i].keep);</div><div class='del'>-			dlm_free_rsb(rsb);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while ((n = rb_first(&amp;ls-&gt;ls_rsbtbl[i].toss))) {</div><div class='del'>-			rsb = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-			rb_erase(n, &amp;ls-&gt;ls_rsbtbl[i].toss);</div><div class='del'>-			dlm_free_rsb(rsb);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vfree(ls-&gt;ls_rsbtbl);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; DLM_REMOVE_NAMES_MAX; i++)</div><div class='del'>-		kfree(ls-&gt;ls_remove_names[i]);</div><div class='add'>+	kobject_put(&amp;ls-&gt;ls_kobj);</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;ls-&gt;ls_new_rsb)) {</div><div class='del'>-		rsb = list_first_entry(&amp;ls-&gt;ls_new_rsb, struct dlm_rsb,</div><div class='del'>-				       res_hashchain);</div><div class='del'>-		list_del(&amp;rsb-&gt;res_hashchain);</div><div class='del'>-		dlm_free_rsb(rsb);</div><div class='del'>-	}</div><div class='add'>+	xa_destroy(&amp;ls-&gt;ls_recover_xa);</div><div class='add'>+	kfree(ls-&gt;ls_recover_buf);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Free structures on any other lists</div><div class='hunk'>@@ -868,10 +773,11 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'> 	dlm_clear_members(ls);</div><div class='ctx'> 	dlm_clear_members_gone(ls);</div><div class='ctx'> 	kfree(ls-&gt;ls_node_array);</div><div class='del'>-	log_rinfo(ls, "release_lockspace final free");</div><div class='del'>-	kobject_put(&amp;ls-&gt;ls_kobj);</div><div class='del'>-	/* The ls structure will be freed when the kobject is done with */</div><div class='ctx'> </div><div class='add'>+	log_rinfo(ls, "%s final free", __func__);</div><div class='add'>+</div><div class='add'>+	/* delayed free of data structures see free_lockspace() */</div><div class='add'>+	queue_work(dlm_wq, &amp;ls-&gt;ls_free_work);</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -883,25 +789,24 @@ static int release_lockspace(struct dlm_ls *ls, int force)</div><div class='ctx'>  * lockspace must continue to function as usual, participating in recoveries,</div><div class='ctx'>  * until this returns.</div><div class='ctx'>  *</div><div class='del'>- * Force has 4 possible values:</div><div class='del'>- * 0 - don't destroy lockspace if it has any LKBs</div><div class='del'>- * 1 - destroy lockspace if it has remote LKBs but not if it has local LKBs</div><div class='del'>- * 2 - destroy lockspace regardless of LKBs</div><div class='del'>- * 3 - destroy lockspace as part of a forced shutdown</div><div class='add'>+ * See DLM_RELEASE defines for release_option values and their meaning.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int dlm_release_lockspace(void *lockspace, int force)</div><div class='add'>+int dlm_release_lockspace(void *lockspace, unsigned int release_option)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	if (release_option &gt; __DLM_RELEASE_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	ls = dlm_find_lockspace_local(lockspace);</div><div class='ctx'> 	if (!ls)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ls_lock);</div><div class='del'>-	error = release_lockspace(ls, force);</div><div class='add'>+	error = release_lockspace(ls, release_option);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		ls_count--;</div><div class='ctx'> 	if (!ls_count)</div><div class='hunk'>@@ -918,20 +823,19 @@ void dlm_stop_lockspaces(void)</div><div class='ctx'> </div><div class='ctx'>  restart:</div><div class='ctx'> 	count = 0;</div><div class='del'>-	spin_lock(&amp;lslist_lock);</div><div class='add'>+	spin_lock_bh(&amp;lslist_lock);</div><div class='ctx'> 	list_for_each_entry(ls, &amp;lslist, ls_list) {</div><div class='ctx'> 		if (!test_bit(LSFL_RUNNING, &amp;ls-&gt;ls_flags)) {</div><div class='ctx'> 			count++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;lslist_lock);</div><div class='add'>+		spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> 		log_error(ls, "no userland control daemon, stopping lockspace");</div><div class='ctx'> 		dlm_ls_stop(ls);</div><div class='ctx'> 		goto restart;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;lslist_lock);</div><div class='add'>+	spin_unlock_bh(&amp;lslist_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (count)</div><div class='ctx'> 		log_print("dlm user daemon left %d lockspaces", count);</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c<br/>index 6296c62c10fa..b3958008ba3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/lowcomms.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lowcomms.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/lowcomms.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/lowcomms.c</a></div><div class='hunk'>@@ -160,9 +160,8 @@ struct dlm_proto_ops {</div><div class='ctx'> 	bool try_new_addr;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int proto;</div><div class='add'>+	int how;</div><div class='ctx'> </div><div class='del'>-	int (*connect)(struct connection *con, struct socket *sock,</div><div class='del'>-		       struct sockaddr *addr, int addr_len);</div><div class='ctx'> 	void (*sockopts)(struct socket *sock);</div><div class='ctx'> 	int (*bind)(struct socket *sock);</div><div class='ctx'> 	int (*listen_validate)(void);</div><div class='hunk'>@@ -204,6 +203,7 @@ static void process_dlm_messages(struct work_struct *work);</div><div class='ctx'> static DECLARE_WORK(process_work, process_dlm_messages);</div><div class='ctx'> static DEFINE_SPINLOCK(processqueue_lock);</div><div class='ctx'> static bool process_dlm_messages_pending;</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(processqueue_wq);</div><div class='ctx'> static atomic_t processqueue_count;</div><div class='ctx'> static LIST_HEAD(processqueue);</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +248,7 @@ struct kmem_cache *dlm_lowcomms_writequeue_cache_create(void)</div><div class='ctx'> </div><div class='ctx'> struct kmem_cache *dlm_lowcomms_msg_cache_create(void)</div><div class='ctx'> {</div><div class='del'>-	return kmem_cache_create("dlm_msg", sizeof(struct dlm_msg), 0, 0, NULL);</div><div class='add'>+	return KMEM_CACHE(dlm_msg, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* need to held writequeue_lock */</div><div class='hunk'>@@ -460,10 +460,11 @@ static bool dlm_lowcomms_con_has_addr(const struct connection *con,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr, int len)</div><div class='add'>+int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct connection *con;</div><div class='del'>-	bool ret, idx;</div><div class='add'>+	bool ret;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='ctx'> 	idx = srcu_read_lock(&amp;connections_srcu);</div><div class='ctx'> 	con = nodeid2con(nodeid, GFP_NOFS);</div><div class='hunk'>@@ -533,7 +534,7 @@ static void lowcomms_state_change(struct sock *sk)</div><div class='ctx'> 	/* SCTP layer is not calling sk_data_ready when the connection</div><div class='ctx'> 	 * is done, so we catch the signal through here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sk-&gt;sk_shutdown == RCV_SHUTDOWN)</div><div class='add'>+	if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='ctx'> 		lowcomms_data_ready(sk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -661,18 +662,18 @@ static void add_sock(struct socket *sock, struct connection *con)</div><div class='ctx'> </div><div class='ctx'> /* Add the port number to an IPv6 or 4 sockaddr and return the address</div><div class='ctx'>    length */</div><div class='del'>-static void make_sockaddr(struct sockaddr_storage *saddr, uint16_t port,</div><div class='add'>+static void make_sockaddr(struct sockaddr_storage *saddr, __be16 port,</div><div class='ctx'> 			  int *addr_len)</div><div class='ctx'> {</div><div class='ctx'> 	saddr-&gt;ss_family =  dlm_local_addr[0].ss_family;</div><div class='ctx'> 	if (saddr-&gt;ss_family == AF_INET) {</div><div class='ctx'> 		struct sockaddr_in *in4_addr = (struct sockaddr_in *)saddr;</div><div class='del'>-		in4_addr-&gt;sin_port = cpu_to_be16(port);</div><div class='add'>+		in4_addr-&gt;sin_port = port;</div><div class='ctx'> 		*addr_len = sizeof(struct sockaddr_in);</div><div class='ctx'> 		memset(&amp;in4_addr-&gt;sin_zero, 0, sizeof(in4_addr-&gt;sin_zero));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct sockaddr_in6 *in6_addr = (struct sockaddr_in6 *)saddr;</div><div class='del'>-		in6_addr-&gt;sin6_port = cpu_to_be16(port);</div><div class='add'>+		in6_addr-&gt;sin6_port = port;</div><div class='ctx'> 		*addr_len = sizeof(struct sockaddr_in6);</div><div class='ctx'> 	}</div><div class='ctx'> 	memset((char *)saddr + *addr_len, 0, sizeof(struct sockaddr_storage) - *addr_len);</div><div class='hunk'>@@ -810,7 +811,7 @@ static void shutdown_connection(struct connection *con, bool and_other)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = kernel_sock_shutdown(con-&gt;sock, SHUT_WR);</div><div class='add'>+	ret = kernel_sock_shutdown(con-&gt;sock, dlm_proto_ops-&gt;how);</div><div class='ctx'> 	up_read(&amp;con-&gt;sock_lock);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		log_print("Connection %p failed to shutdown: %d will force close",</div><div class='hunk'>@@ -857,46 +858,42 @@ static void free_processqueue_entry(struct processqueue_entry *pentry)</div><div class='ctx'> 	kfree(pentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dlm_processed_nodes {</div><div class='del'>-	int nodeid;</div><div class='del'>-</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void process_dlm_messages(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct processqueue_entry *pentry;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;processqueue_lock);</div><div class='add'>+	spin_lock_bh(&amp;processqueue_lock);</div><div class='ctx'> 	pentry = list_first_entry_or_null(&amp;processqueue,</div><div class='ctx'> 					  struct processqueue_entry, list);</div><div class='ctx'> 	if (WARN_ON_ONCE(!pentry)) {</div><div class='ctx'> 		process_dlm_messages_pending = false;</div><div class='del'>-		spin_unlock(&amp;processqueue_lock);</div><div class='add'>+		spin_unlock_bh(&amp;processqueue_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;pentry-&gt;list);</div><div class='del'>-	atomic_dec(&amp;processqueue_count);</div><div class='del'>-	spin_unlock(&amp;processqueue_lock);</div><div class='add'>+	if (atomic_dec_and_test(&amp;processqueue_count))</div><div class='add'>+		wake_up(&amp;processqueue_wq);</div><div class='add'>+	spin_unlock_bh(&amp;processqueue_lock);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		dlm_process_incoming_buffer(pentry-&gt;nodeid, pentry-&gt;buf,</div><div class='ctx'> 					    pentry-&gt;buflen);</div><div class='ctx'> 		free_processqueue_entry(pentry);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;processqueue_lock);</div><div class='add'>+		spin_lock_bh(&amp;processqueue_lock);</div><div class='ctx'> 		pentry = list_first_entry_or_null(&amp;processqueue,</div><div class='ctx'> 						  struct processqueue_entry, list);</div><div class='ctx'> 		if (!pentry) {</div><div class='ctx'> 			process_dlm_messages_pending = false;</div><div class='del'>-			spin_unlock(&amp;processqueue_lock);</div><div class='add'>+			spin_unlock_bh(&amp;processqueue_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		list_del(&amp;pentry-&gt;list);</div><div class='del'>-		atomic_dec(&amp;processqueue_count);</div><div class='del'>-		spin_unlock(&amp;processqueue_lock);</div><div class='add'>+		if (atomic_dec_and_test(&amp;processqueue_count))</div><div class='add'>+			wake_up(&amp;processqueue_wq);</div><div class='add'>+		spin_unlock_bh(&amp;processqueue_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -966,14 +963,14 @@ again:</div><div class='ctx'> 	memmove(con-&gt;rx_leftover_buf, pentry-&gt;buf + ret,</div><div class='ctx'> 		con-&gt;rx_leftover);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;processqueue_lock);</div><div class='add'>+	spin_lock_bh(&amp;processqueue_lock);</div><div class='ctx'> 	ret = atomic_inc_return(&amp;processqueue_count);</div><div class='ctx'> 	list_add_tail(&amp;pentry-&gt;list, &amp;processqueue);</div><div class='ctx'> 	if (!process_dlm_messages_pending) {</div><div class='ctx'> 		process_dlm_messages_pending = true;</div><div class='ctx'> 		queue_work(process_workqueue, &amp;process_work);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;processqueue_lock);</div><div class='add'>+	spin_unlock_bh(&amp;processqueue_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; DLM_MAX_PROCESS_BUFFERS)</div><div class='ctx'> 		return DLM_IO_FLUSH;</div><div class='hunk'>@@ -1126,10 +1123,10 @@ static void writequeue_entry_complete(struct writequeue_entry *e, int completed)</div><div class='ctx'> /*</div><div class='ctx'>  * sctp_bind_addrs - bind a SCTP socket to all our addresses</div><div class='ctx'>  */</div><div class='del'>-static int sctp_bind_addrs(struct socket *sock, uint16_t port)</div><div class='add'>+static int sctp_bind_addrs(struct socket *sock, __be16 port)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_storage localaddr;</div><div class='del'>-	struct sockaddr *addr = (struct sockaddr *)&amp;localaddr;</div><div class='add'>+	struct sockaddr_unsized *addr = (struct sockaddr_unsized *)&amp;localaddr;</div><div class='ctx'> 	int i, addr_len, result = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dlm_local_count; i++) {</div><div class='hunk'>@@ -1229,14 +1226,13 @@ out:</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dlm_msg *dlm_lowcomms_new_msg_con(struct connection *con, int len,</div><div class='del'>-						gfp_t allocation, char **ppc,</div><div class='del'>-						void (*cb)(void *data),</div><div class='add'>+						char **ppc, void (*cb)(void *data),</div><div class='ctx'> 						void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct writequeue_entry *e;</div><div class='ctx'> 	struct dlm_msg *msg;</div><div class='ctx'> </div><div class='del'>-	msg = dlm_allocate_msg(allocation);</div><div class='add'>+	msg = dlm_allocate_msg();</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1261,9 +1257,8 @@ static struct dlm_msg *dlm_lowcomms_new_msg_con(struct connection *con, int len,</div><div class='ctx'>  * dlm_lowcomms_commit_msg which is a must call if success</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __CHECKER__</div><div class='del'>-struct dlm_msg *dlm_lowcomms_new_msg(int nodeid, int len, gfp_t allocation,</div><div class='del'>-				     char **ppc, void (*cb)(void *data),</div><div class='del'>-				     void *data)</div><div class='add'>+struct dlm_msg *dlm_lowcomms_new_msg(int nodeid, int len, char **ppc,</div><div class='add'>+				     void (*cb)(void *data), void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct connection *con;</div><div class='ctx'> 	struct dlm_msg *msg;</div><div class='hunk'>@@ -1284,7 +1279,7 @@ struct dlm_msg *dlm_lowcomms_new_msg(int nodeid, int len, gfp_t allocation,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	msg = dlm_lowcomms_new_msg_con(con, len, allocation, ppc, cb, data);</div><div class='add'>+	msg = dlm_lowcomms_new_msg_con(con, len, ppc, cb, data);</div><div class='ctx'> 	if (!msg) {</div><div class='ctx'> 		srcu_read_unlock(&amp;connections_srcu, idx);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1348,8 +1343,8 @@ int dlm_lowcomms_resend_msg(struct dlm_msg *msg)</div><div class='ctx'> 	if (msg-&gt;retransmit)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	msg_resend = dlm_lowcomms_new_msg_con(msg-&gt;entry-&gt;con, msg-&gt;len,</div><div class='del'>-					      GFP_ATOMIC, &amp;ppc, NULL, NULL);</div><div class='add'>+	msg_resend = dlm_lowcomms_new_msg_con(msg-&gt;entry-&gt;con, msg-&gt;len, &amp;ppc,</div><div class='add'>+					      NULL, NULL);</div><div class='ctx'> 	if (!msg_resend)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1513,7 +1508,20 @@ static void process_recv_sockets(struct work_struct *work)</div><div class='ctx'> 		/* CF_RECV_PENDING cleared */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DLM_IO_FLUSH:</div><div class='del'>-		flush_workqueue(process_workqueue);</div><div class='add'>+		/* we can't flush the process_workqueue here because a</div><div class='add'>+		 * WQ_MEM_RECLAIM workequeue can occurr a deadlock for a non</div><div class='add'>+		 * WQ_MEM_RECLAIM workqueue such as process_workqueue. Instead</div><div class='add'>+		 * we have a waitqueue to wait until all messages are</div><div class='add'>+		 * processed.</div><div class='add'>+		 *</div><div class='add'>+		 * This handling is only necessary to backoff the sender and</div><div class='add'>+		 * not queue all messages from the socket layer into DLM</div><div class='add'>+		 * processqueue. When DLM is capable to parse multiple messages</div><div class='add'>+		 * on an e.g. per socket basis this handling can might be</div><div class='add'>+		 * removed. Especially in a message burst we are too slow to</div><div class='add'>+		 * process messages and the queue will fill up memory.</div><div class='add'>+		 */</div><div class='add'>+		wait_event(processqueue_wq, !atomic_read(&amp;processqueue_count));</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case DLM_IO_RESCHED:</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -1591,8 +1599,7 @@ static int dlm_connect(struct connection *con)</div><div class='ctx'> </div><div class='ctx'> 	log_print_ratelimited("connecting to %d", con-&gt;nodeid);</div><div class='ctx'> 	make_sockaddr(&amp;addr, dlm_config.ci_tcp_port, &amp;addr_len);</div><div class='del'>-	result = dlm_proto_ops-&gt;connect(con, sock, (struct sockaddr *)&amp;addr,</div><div class='del'>-					addr_len);</div><div class='add'>+	result = kernel_connect(sock, (struct sockaddr_unsized *)&amp;addr, addr_len, 0);</div><div class='ctx'> 	switch (result) {</div><div class='ctx'> 	case -EINPROGRESS:</div><div class='ctx'> 		/* not an error */</div><div class='hunk'>@@ -1626,13 +1633,6 @@ static void process_send_sockets(struct work_struct *work)</div><div class='ctx'> 			switch (ret) {</div><div class='ctx'> 			case 0:</div><div class='ctx'> 				break;</div><div class='del'>-			case -EINPROGRESS:</div><div class='del'>-				/* avoid spamming resched on connection</div><div class='del'>-				 * we might can switch to a state_change</div><div class='del'>-				 * event based mechanism if established</div><div class='del'>-				 */</div><div class='del'>-				msleep(100);</div><div class='del'>-				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				/* CF_SEND_PENDING not cleared */</div><div class='ctx'> 				up_write(&amp;con-&gt;sock_lock);</div><div class='hunk'>@@ -1703,11 +1703,7 @@ static int work_start(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* ordered dlm message process queue,</div><div class='del'>-	 * should be converted to a tasklet</div><div class='del'>-	 */</div><div class='del'>-	process_workqueue = alloc_ordered_workqueue("dlm_process",</div><div class='del'>-						    WQ_HIGHPRI | WQ_MEM_RECLAIM);</div><div class='add'>+	process_workqueue = alloc_workqueue("dlm_process", WQ_HIGHPRI | WQ_BH | WQ_PERCPU, 0);</div><div class='ctx'> 	if (!process_workqueue) {</div><div class='ctx'> 		log_print("can't start dlm_process");</div><div class='ctx'> 		destroy_workqueue(io_workqueue);</div><div class='hunk'>@@ -1817,7 +1813,7 @@ static int dlm_tcp_bind(struct socket *sock)</div><div class='ctx'> 	memcpy(&amp;src_addr, &amp;dlm_local_addr[0], sizeof(src_addr));</div><div class='ctx'> 	make_sockaddr(&amp;src_addr, 0, &amp;addr_len);</div><div class='ctx'> </div><div class='del'>-	result = kernel_bind(sock, (struct sockaddr *)&amp;src_addr,</div><div class='add'>+	result = kernel_bind(sock, (struct sockaddr_unsized *)&amp;src_addr,</div><div class='ctx'> 			     addr_len);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		/* This *may* not indicate a critical error */</div><div class='hunk'>@@ -1827,18 +1823,12 @@ static int dlm_tcp_bind(struct socket *sock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dlm_tcp_connect(struct connection *con, struct socket *sock,</div><div class='del'>-			   struct sockaddr *addr, int addr_len)</div><div class='del'>-{</div><div class='del'>-	return kernel_connect(sock, addr, addr_len, O_NONBLOCK);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dlm_tcp_listen_validate(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't support multi-homed hosts */</div><div class='ctx'> 	if (dlm_local_count &gt; 1) {</div><div class='del'>-		log_print("TCP protocol can't handle multi-homed hosts, try SCTP");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		log_print("Detect multi-homed hosts but use only the first IP address.");</div><div class='add'>+		log_print("Try SCTP, if you want to enable multi-link.");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1862,14 +1852,14 @@ static int dlm_tcp_listen_bind(struct socket *sock)</div><div class='ctx'> </div><div class='ctx'> 	/* Bind to our port */</div><div class='ctx'> 	make_sockaddr(&amp;dlm_local_addr[0], dlm_config.ci_tcp_port, &amp;addr_len);</div><div class='del'>-	return kernel_bind(sock, (struct sockaddr *)&amp;dlm_local_addr[0],</div><div class='add'>+	return kernel_bind(sock, (struct sockaddr_unsized *)&amp;dlm_local_addr[0],</div><div class='ctx'> 			   addr_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct dlm_proto_ops dlm_tcp_ops = {</div><div class='ctx'> 	.name = "TCP",</div><div class='ctx'> 	.proto = IPPROTO_TCP,</div><div class='del'>-	.connect = dlm_tcp_connect,</div><div class='add'>+	.how = SHUT_WR,</div><div class='ctx'> 	.sockopts = dlm_tcp_sockopts,</div><div class='ctx'> 	.bind = dlm_tcp_bind,</div><div class='ctx'> 	.listen_validate = dlm_tcp_listen_validate,</div><div class='hunk'>@@ -1882,22 +1872,6 @@ static int dlm_sctp_bind(struct socket *sock)</div><div class='ctx'> 	return sctp_bind_addrs(sock, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dlm_sctp_connect(struct connection *con, struct socket *sock,</div><div class='del'>-			    struct sockaddr *addr, int addr_len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make kernel_connect() function return in specified time,</div><div class='del'>-	 * since O_NONBLOCK argument in connect() function does not work here,</div><div class='del'>-	 * then, we should restore the default value of this attribute.</div><div class='del'>-	 */</div><div class='del'>-	sock_set_sndtimeo(sock-&gt;sk, 5);</div><div class='del'>-	ret = kernel_connect(sock, addr, addr_len, 0);</div><div class='del'>-	sock_set_sndtimeo(sock-&gt;sk, 0);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dlm_sctp_listen_validate(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_IP_SCTP)) {</div><div class='hunk'>@@ -1924,8 +1898,8 @@ static void dlm_sctp_sockopts(struct socket *sock)</div><div class='ctx'> static const struct dlm_proto_ops dlm_sctp_ops = {</div><div class='ctx'> 	.name = "SCTP",</div><div class='ctx'> 	.proto = IPPROTO_SCTP,</div><div class='add'>+	.how = SHUT_RDWR,</div><div class='ctx'> 	.try_new_addr = true,</div><div class='del'>-	.connect = dlm_sctp_connect,</div><div class='ctx'> 	.sockopts = dlm_sctp_sockopts,</div><div class='ctx'> 	.bind = dlm_sctp_bind,</div><div class='ctx'> 	.listen_validate = dlm_sctp_listen_validate,</div><div class='head'>diff --git a/fs/dlm/lowcomms.h b/fs/dlm/lowcomms.h<br/>index 3e8dca66183b..fd0df604eb93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/lowcomms.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/lowcomms.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/lowcomms.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/lowcomms.h</a></div><div class='hunk'>@@ -39,15 +39,14 @@ void dlm_lowcomms_stop(void);</div><div class='ctx'> void dlm_lowcomms_init(void);</div><div class='ctx'> void dlm_lowcomms_exit(void);</div><div class='ctx'> int dlm_lowcomms_close(int nodeid);</div><div class='del'>-struct dlm_msg *dlm_lowcomms_new_msg(int nodeid, int len, gfp_t allocation,</div><div class='del'>-				     char **ppc, void (*cb)(void *data),</div><div class='del'>-				     void *data);</div><div class='add'>+struct dlm_msg *dlm_lowcomms_new_msg(int nodeid, int len, char **ppc,</div><div class='add'>+				     void (*cb)(void *data), void *data);</div><div class='ctx'> void dlm_lowcomms_commit_msg(struct dlm_msg *msg);</div><div class='ctx'> void dlm_lowcomms_put_msg(struct dlm_msg *msg);</div><div class='ctx'> int dlm_lowcomms_resend_msg(struct dlm_msg *msg);</div><div class='ctx'> int dlm_lowcomms_connect_node(int nodeid);</div><div class='ctx'> int dlm_lowcomms_nodes_set_mark(int nodeid, unsigned int mark);</div><div class='del'>-int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr, int len);</div><div class='add'>+int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr);</div><div class='ctx'> void dlm_midcomms_receive_done(int nodeid);</div><div class='ctx'> struct kmem_cache *dlm_lowcomms_writequeue_cache_create(void);</div><div class='ctx'> struct kmem_cache *dlm_lowcomms_msg_cache_create(void);</div><div class='head'>diff --git a/fs/dlm/main.c b/fs/dlm/main.c<br/>index 6ca28299c9db..a44d16da7187 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/main.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/main.c</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include &lt;trace/events/dlm.h&gt;</div><div class='ctx'> </div><div class='add'>+struct workqueue_struct *dlm_wq;</div><div class='add'>+</div><div class='ctx'> static int __init init_dlm(void)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -50,10 +52,18 @@ static int __init init_dlm(void)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_user;</div><div class='ctx'> </div><div class='add'>+	dlm_wq = alloc_workqueue("dlm_wq", WQ_PERCPU, 0);</div><div class='add'>+	if (!dlm_wq) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto out_plock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	printk("DLM installed\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ out_plock:</div><div class='add'>+	dlm_plock_exit();</div><div class='ctx'>  out_user:</div><div class='ctx'> 	dlm_user_exit();</div><div class='ctx'>  out_debug:</div><div class='hunk'>@@ -70,6 +80,8 @@ static int __init init_dlm(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_dlm(void)</div><div class='ctx'> {</div><div class='add'>+	/* be sure every pending work e.g. freeing is done */</div><div class='add'>+	destroy_workqueue(dlm_wq);</div><div class='ctx'> 	dlm_plock_exit();</div><div class='ctx'> 	dlm_user_exit();</div><div class='ctx'> 	dlm_config_exit();</div><div class='head'>diff --git a/fs/dlm/member.c b/fs/dlm/member.c<br/>index be7909ead71b..c0f557a80a75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/member.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/member.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/member.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/member.c</a></div><div class='hunk'>@@ -366,6 +366,8 @@ int dlm_is_member(struct dlm_ls *ls, int nodeid)</div><div class='ctx'> </div><div class='ctx'> int dlm_is_removed(struct dlm_ls *ls, int nodeid)</div><div class='ctx'> {</div><div class='add'>+	WARN_ON_ONCE(!nodeid || nodeid == -1);</div><div class='add'>+</div><div class='ctx'> 	if (find_memb(&amp;ls-&gt;ls_nodes_gone, nodeid))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -476,7 +478,8 @@ static void dlm_lsop_recover_prep(struct dlm_ls *ls)</div><div class='ctx'> 	ls-&gt;ls_ops-&gt;recover_prep(ls-&gt;ls_ops_arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dlm_lsop_recover_slot(struct dlm_ls *ls, struct dlm_member *memb)</div><div class='add'>+static void dlm_lsop_recover_slot(struct dlm_ls *ls, struct dlm_member *memb,</div><div class='add'>+				  unsigned int release_recover)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_slot slot;</div><div class='ctx'> 	uint32_t seq;</div><div class='hunk'>@@ -491,9 +494,9 @@ static void dlm_lsop_recover_slot(struct dlm_ls *ls, struct dlm_member *memb)</div><div class='ctx'> 	   we consider the node to have failed (versus</div><div class='ctx'> 	   being removed due to dlm_release_lockspace) */</div><div class='ctx'> </div><div class='del'>-	error = dlm_comm_seq(memb-&gt;nodeid, &amp;seq);</div><div class='add'>+	error = dlm_comm_seq(memb-&gt;nodeid, &amp;seq, false);</div><div class='ctx'> </div><div class='del'>-	if (!error &amp;&amp; seq == memb-&gt;comm_seq)</div><div class='add'>+	if (!release_recover &amp;&amp; !error &amp;&amp; seq == memb-&gt;comm_seq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	slot.nodeid = memb-&gt;nodeid;</div><div class='hunk'>@@ -550,6 +553,7 @@ int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)</div><div class='ctx'> 	struct dlm_member *memb, *safe;</div><div class='ctx'> 	struct dlm_config_node *node;</div><div class='ctx'> 	int i, error, neg = 0, low = -1;</div><div class='add'>+	unsigned int release_recover;</div><div class='ctx'> </div><div class='ctx'> 	/* previously removed members that we've not finished removing need to</div><div class='ctx'> 	 * count as a negative change so the "neg" recovery steps will happen</div><div class='hunk'>@@ -567,11 +571,21 @@ int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(memb, safe, &amp;ls-&gt;ls_nodes, list) {</div><div class='ctx'> 		node = find_config_node(rv, memb-&gt;nodeid);</div><div class='del'>-		if (node &amp;&amp; !node-&gt;new)</div><div class='add'>+		if (!node) {</div><div class='add'>+			log_error(ls, "remove member %d invalid",</div><div class='add'>+				  memb-&gt;nodeid);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!node-&gt;new &amp;&amp; !node-&gt;gone)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!node) {</div><div class='del'>-			log_rinfo(ls, "remove member %d", memb-&gt;nodeid);</div><div class='add'>+		release_recover = 0;</div><div class='add'>+</div><div class='add'>+		if (node-&gt;gone) {</div><div class='add'>+			release_recover = node-&gt;release_recover;</div><div class='add'>+			log_rinfo(ls, "remove member %d%s", memb-&gt;nodeid,</div><div class='add'>+				  release_recover ? " (release_recover)" : "");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* removed and re-added */</div><div class='ctx'> 			log_rinfo(ls, "remove member %d comm_seq %u %u",</div><div class='hunk'>@@ -582,13 +596,16 @@ int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)</div><div class='ctx'> 		list_move(&amp;memb-&gt;list, &amp;ls-&gt;ls_nodes_gone);</div><div class='ctx'> 		remove_remote_member(memb-&gt;nodeid);</div><div class='ctx'> 		ls-&gt;ls_num_nodes--;</div><div class='del'>-		dlm_lsop_recover_slot(ls, memb);</div><div class='add'>+		dlm_lsop_recover_slot(ls, memb, release_recover);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add new members to ls_nodes */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rv-&gt;nodes_count; i++) {</div><div class='ctx'> 		node = &amp;rv-&gt;nodes[i];</div><div class='add'>+		if (node-&gt;gone)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (dlm_is_member(ls, node-&gt;nodeid))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		error = dlm_add_member(ls, node);</div><div class='hunk'>@@ -630,7 +647,7 @@ int dlm_ls_stop(struct dlm_ls *ls)</div><div class='ctx'> 	 * message to the requestqueue without races.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Abort any recovery that's in progress (see RECOVER_STOP,</div><div class='hunk'>@@ -638,18 +655,25 @@ int dlm_ls_stop(struct dlm_ls *ls)</div><div class='ctx'> 	 * dlm to quit any processing (see RUNNING, dlm_locking_stopped()).</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	set_bit(LSFL_RECOVER_STOP, &amp;ls-&gt;ls_flags);</div><div class='ctx'> 	new = test_and_clear_bit(LSFL_RUNNING, &amp;ls-&gt;ls_flags);</div><div class='add'>+	if (new)</div><div class='add'>+		timer_delete_sync(&amp;ls-&gt;ls_scan_timer);</div><div class='ctx'> 	ls-&gt;ls_recover_seq++;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+</div><div class='add'>+	/* activate requestqueue and stop processing */</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='add'>+	set_bit(LSFL_RECV_MSG_BLOCKED, &amp;ls-&gt;ls_flags);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let dlm_recv run again, now any normal messages will be saved on the</div><div class='ctx'> 	 * requestqueue for later.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	up_write(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This in_recovery lock does two things:</div><div class='hunk'>@@ -674,13 +698,13 @@ int dlm_ls_stop(struct dlm_ls *ls)</div><div class='ctx'> </div><div class='ctx'> 	dlm_recoverd_suspend(ls);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	kfree(ls-&gt;ls_slots);</div><div class='ctx'> 	ls-&gt;ls_slots = NULL;</div><div class='ctx'> 	ls-&gt;ls_num_slots = 0;</div><div class='ctx'> 	ls-&gt;ls_slots_size = 0;</div><div class='ctx'> 	ls-&gt;ls_recover_status = 0;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'> 	dlm_recoverd_resume(ls);</div><div class='ctx'> </div><div class='hunk'>@@ -714,12 +738,12 @@ int dlm_ls_start(struct dlm_ls *ls)</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto fail_rv;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* the lockspace needs to be stopped before it can be started */</div><div class='ctx'> </div><div class='ctx'> 	if (!dlm_locking_stopped(ls)) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+		spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 		log_error(ls, "start ignored: lockspace running");</div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -730,7 +754,7 @@ int dlm_ls_start(struct dlm_ls *ls)</div><div class='ctx'> 	rv-&gt;seq = ++ls-&gt;ls_recover_seq;</div><div class='ctx'> 	rv_old = ls-&gt;ls_recover_args;</div><div class='ctx'> 	ls-&gt;ls_recover_args = rv;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (rv_old) {</div><div class='ctx'> 		log_error(ls, "unused recovery %llx %d",</div><div class='head'>diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c<br/>index 64f212a066cf..5c35cc67aca4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/memory.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/memory.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/memory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/memory.c</a></div><div class='hunk'>@@ -72,6 +72,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> void dlm_memory_exit(void)</div><div class='ctx'> {</div><div class='add'>+	rcu_barrier();</div><div class='add'>+</div><div class='ctx'> 	kmem_cache_destroy(writequeue_cache);</div><div class='ctx'> 	kmem_cache_destroy(mhandle_cache);</div><div class='ctx'> 	kmem_cache_destroy(msg_cache);</div><div class='hunk'>@@ -82,10 +84,7 @@ void dlm_memory_exit(void)</div><div class='ctx'> </div><div class='ctx'> char *dlm_allocate_lvb(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	p = kzalloc(ls-&gt;ls_lvblen, GFP_NOFS);</div><div class='del'>-	return p;</div><div class='add'>+	return kzalloc(ls-&gt;ls_lvblen, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_free_lvb(char *p)</div><div class='hunk'>@@ -93,31 +92,33 @@ void dlm_free_lvb(char *p)</div><div class='ctx'> 	kfree(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls)</div><div class='add'>+struct dlm_rsb *dlm_allocate_rsb(void)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_rsb *r;</div><div class='del'>-</div><div class='del'>-	r = kmem_cache_zalloc(rsb_cache, GFP_NOFS);</div><div class='del'>-	return r;</div><div class='add'>+	return kmem_cache_zalloc(rsb_cache, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_free_rsb(struct dlm_rsb *r)</div><div class='add'>+static void __free_rsb_rcu(struct rcu_head *rcu)</div><div class='ctx'> {</div><div class='add'>+	struct dlm_rsb *r = container_of(rcu, struct dlm_rsb, rcu);</div><div class='ctx'> 	if (r-&gt;res_lvbptr)</div><div class='ctx'> 		dlm_free_lvb(r-&gt;res_lvbptr);</div><div class='ctx'> 	kmem_cache_free(rsb_cache, r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls)</div><div class='add'>+void dlm_free_rsb(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='del'>-	struct dlm_lkb *lkb;</div><div class='add'>+	call_rcu(&amp;r-&gt;rcu, __free_rsb_rcu);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	lkb = kmem_cache_zalloc(lkb_cache, GFP_NOFS);</div><div class='del'>-	return lkb;</div><div class='add'>+struct dlm_lkb *dlm_allocate_lkb(void)</div><div class='add'>+{</div><div class='add'>+	return kmem_cache_zalloc(lkb_cache, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_free_lkb(struct dlm_lkb *lkb)</div><div class='add'>+static void __free_lkb_rcu(struct rcu_head *rcu)</div><div class='ctx'> {</div><div class='add'>+	struct dlm_lkb *lkb = container_of(rcu, struct dlm_lkb, rcu);</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(DLM_DFL_USER_BIT, &amp;lkb-&gt;lkb_dflags)) {</div><div class='ctx'> 		struct dlm_user_args *ua;</div><div class='ctx'> 		ua = lkb-&gt;lkb_ua;</div><div class='hunk'>@@ -127,16 +128,17 @@ void dlm_free_lkb(struct dlm_lkb *lkb)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* drop references if they are set */</div><div class='del'>-	dlm_callback_set_last_ptr(&amp;lkb-&gt;lkb_last_cast, NULL);</div><div class='del'>-	dlm_callback_set_last_ptr(&amp;lkb-&gt;lkb_last_cb, NULL);</div><div class='del'>-</div><div class='ctx'> 	kmem_cache_free(lkb_cache, lkb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dlm_mhandle *dlm_allocate_mhandle(gfp_t allocation)</div><div class='add'>+void dlm_free_lkb(struct dlm_lkb *lkb)</div><div class='add'>+{</div><div class='add'>+	call_rcu(&amp;lkb-&gt;rcu, __free_lkb_rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dlm_mhandle *dlm_allocate_mhandle(void)</div><div class='ctx'> {</div><div class='del'>-	return kmem_cache_alloc(mhandle_cache, allocation);</div><div class='add'>+	return kmem_cache_alloc(mhandle_cache, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_free_mhandle(struct dlm_mhandle *mhandle)</div><div class='hunk'>@@ -154,9 +156,9 @@ void dlm_free_writequeue(struct writequeue_entry *writequeue)</div><div class='ctx'> 	kmem_cache_free(writequeue_cache, writequeue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dlm_msg *dlm_allocate_msg(gfp_t allocation)</div><div class='add'>+struct dlm_msg *dlm_allocate_msg(void)</div><div class='ctx'> {</div><div class='del'>-	return kmem_cache_alloc(msg_cache, allocation);</div><div class='add'>+	return kmem_cache_alloc(msg_cache, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_free_msg(struct dlm_msg *msg)</div><div class='head'>diff --git a/fs/dlm/memory.h b/fs/dlm/memory.h<br/>index 6b29563d24f7..551b6b788489 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/memory.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/memory.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/memory.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/memory.h</a></div><div class='hunk'>@@ -14,17 +14,17 @@</div><div class='ctx'> </div><div class='ctx'> int dlm_memory_init(void);</div><div class='ctx'> void dlm_memory_exit(void);</div><div class='del'>-struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls);</div><div class='add'>+struct dlm_rsb *dlm_allocate_rsb(void);</div><div class='ctx'> void dlm_free_rsb(struct dlm_rsb *r);</div><div class='del'>-struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls);</div><div class='add'>+struct dlm_lkb *dlm_allocate_lkb(void);</div><div class='ctx'> void dlm_free_lkb(struct dlm_lkb *l);</div><div class='ctx'> char *dlm_allocate_lvb(struct dlm_ls *ls);</div><div class='ctx'> void dlm_free_lvb(char *l);</div><div class='del'>-struct dlm_mhandle *dlm_allocate_mhandle(gfp_t allocation);</div><div class='add'>+struct dlm_mhandle *dlm_allocate_mhandle(void);</div><div class='ctx'> void dlm_free_mhandle(struct dlm_mhandle *mhandle);</div><div class='ctx'> struct writequeue_entry *dlm_allocate_writequeue(void);</div><div class='ctx'> void dlm_free_writequeue(struct writequeue_entry *writequeue);</div><div class='del'>-struct dlm_msg *dlm_allocate_msg(gfp_t allocation);</div><div class='add'>+struct dlm_msg *dlm_allocate_msg(void);</div><div class='ctx'> void dlm_free_msg(struct dlm_msg *msg);</div><div class='ctx'> struct dlm_callback *dlm_allocate_cb(void);</div><div class='ctx'> void dlm_free_cb(struct dlm_callback *cb);</div><div class='head'>diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c<br/>index 2247ebb61be1..2c101bbe261a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/midcomms.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/midcomms.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/midcomms.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/midcomms.c</a></div><div class='hunk'>@@ -226,8 +226,7 @@ static DEFINE_MUTEX(close_lock);</div><div class='ctx'> </div><div class='ctx'> struct kmem_cache *dlm_midcomms_cache_create(void)</div><div class='ctx'> {</div><div class='del'>-	return kmem_cache_create("dlm_mhandle", sizeof(struct dlm_mhandle),</div><div class='del'>-				 0, 0, NULL);</div><div class='add'>+	return KMEM_CACHE(dlm_mhandle, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline const char *dlm_state_str(int state)</div><div class='hunk'>@@ -335,12 +334,12 @@ static struct midcomms_node *nodeid2node(int nodeid)</div><div class='ctx'> 	return __find_node(nodeid, nodeid_hash(nodeid));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dlm_midcomms_addr(int nodeid, struct sockaddr_storage *addr, int len)</div><div class='add'>+int dlm_midcomms_addr(int nodeid, struct sockaddr_storage *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, idx, r = nodeid_hash(nodeid);</div><div class='ctx'> 	struct midcomms_node *node;</div><div class='ctx'> </div><div class='del'>-	ret = dlm_lowcomms_addr(nodeid, addr, len);</div><div class='add'>+	ret = dlm_lowcomms_addr(nodeid, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -365,9 +364,9 @@ int dlm_midcomms_addr(int nodeid, struct sockaddr_storage *addr, int len)</div><div class='ctx'> 	node-&gt;users = 0;</div><div class='ctx'> 	midcomms_node_reset(node);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;nodes_lock);</div><div class='add'>+	spin_lock_bh(&amp;nodes_lock);</div><div class='ctx'> 	hlist_add_head_rcu(&amp;node-&gt;hlist, &amp;node_hash[r]);</div><div class='del'>-	spin_unlock(&amp;nodes_lock);</div><div class='add'>+	spin_unlock_bh(&amp;nodes_lock);</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;debugfs = dlm_create_debug_comms_file(nodeid, node);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -380,8 +379,7 @@ static int dlm_send_ack(int nodeid, uint32_t seq)</div><div class='ctx'> 	struct dlm_msg *msg;</div><div class='ctx'> 	char *ppc;</div><div class='ctx'> </div><div class='del'>-	msg = dlm_lowcomms_new_msg(nodeid, mb_len, GFP_ATOMIC, &amp;ppc,</div><div class='del'>-				   NULL, NULL);</div><div class='add'>+	msg = dlm_lowcomms_new_msg(nodeid, mb_len, &amp;ppc, NULL, NULL);</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +427,7 @@ static int dlm_send_fin(struct midcomms_node *node,</div><div class='ctx'> 	struct dlm_mhandle *mh;</div><div class='ctx'> 	char *ppc;</div><div class='ctx'> </div><div class='del'>-	mh = dlm_midcomms_get_mhandle(node-&gt;nodeid, mb_len, GFP_ATOMIC, &amp;ppc);</div><div class='add'>+	mh = dlm_midcomms_get_mhandle(node-&gt;nodeid, mb_len, &amp;ppc);</div><div class='ctx'> 	if (!mh)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -479,7 +477,7 @@ static void dlm_receive_ack(struct midcomms_node *node, uint32_t seq)</div><div class='ctx'> </div><div class='ctx'> static void dlm_pas_fin_ack_rcv(struct midcomms_node *node)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 	pr_debug("receive passive fin ack from node %d with state %s\n",</div><div class='ctx'> 		 node-&gt;nodeid, dlm_state_str(node-&gt;state));</div><div class='ctx'> </div><div class='hunk'>@@ -493,13 +491,13 @@ static void dlm_pas_fin_ack_rcv(struct midcomms_node *node)</div><div class='ctx'> 		wake_up(&amp;node-&gt;shutdown_wait);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+		spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 		log_print("%s: unexpected state: %d",</div><div class='ctx'> 			  __func__, node-&gt;state);</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dlm_receive_buffer_3_2_trace(uint32_t seq,</div><div class='hunk'>@@ -536,7 +534,7 @@ static void dlm_midcomms_receive_buffer(const union dlm_packet *p,</div><div class='ctx'> 	if (is_expected_seq) {</div><div class='ctx'> 		switch (p-&gt;header.h_cmd) {</div><div class='ctx'> 		case DLM_FIN:</div><div class='del'>-			spin_lock(&amp;node-&gt;state_lock);</div><div class='add'>+			spin_lock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 			pr_debug("receive fin msg from node %d with state %s\n",</div><div class='ctx'> 				 node-&gt;nodeid, dlm_state_str(node-&gt;state));</div><div class='ctx'> </div><div class='hunk'>@@ -577,13 +575,13 @@ static void dlm_midcomms_receive_buffer(const union dlm_packet *p,</div><div class='ctx'> 				/* probably remove_member caught it, do nothing */</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+				spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 				log_print("%s: unexpected state: %d",</div><div class='ctx'> 					  __func__, node-&gt;state);</div><div class='ctx'> 				WARN_ON_ONCE(1);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+			spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			WARN_ON_ONCE(test_bit(DLM_NODE_FLAG_STOP_RX, &amp;node-&gt;flags));</div><div class='hunk'>@@ -977,13 +975,13 @@ static void midcomms_new_msg_cb(void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dlm_msg *dlm_midcomms_get_msg_3_2(struct dlm_mhandle *mh, int nodeid,</div><div class='del'>-						int len, gfp_t allocation, char **ppc)</div><div class='add'>+						int len, char **ppc)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_opts *opts;</div><div class='ctx'> 	struct dlm_msg *msg;</div><div class='ctx'> </div><div class='ctx'> 	msg = dlm_lowcomms_new_msg(nodeid, len + DLM_MIDCOMMS_OPT_LEN,</div><div class='del'>-				   allocation, ppc, midcomms_new_msg_cb, mh);</div><div class='add'>+				   ppc, midcomms_new_msg_cb, mh);</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1002,8 +1000,7 @@ static struct dlm_msg *dlm_midcomms_get_msg_3_2(struct dlm_mhandle *mh, int node</div><div class='ctx'>  * dlm_midcomms_commit_mhandle which is a must call if success</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __CHECKER__</div><div class='del'>-struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,</div><div class='del'>-					     gfp_t allocation, char **ppc)</div><div class='add'>+struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len, char **ppc)</div><div class='ctx'> {</div><div class='ctx'> 	struct midcomms_node *node;</div><div class='ctx'> 	struct dlm_mhandle *mh;</div><div class='hunk'>@@ -1018,7 +1015,7 @@ struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,</div><div class='ctx'> 	/* this is a bug, however we going on and hope it will be resolved */</div><div class='ctx'> 	WARN_ON_ONCE(test_bit(DLM_NODE_FLAG_STOP_TX, &amp;node-&gt;flags));</div><div class='ctx'> </div><div class='del'>-	mh = dlm_allocate_mhandle(allocation);</div><div class='add'>+	mh = dlm_allocate_mhandle();</div><div class='ctx'> 	if (!mh)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -1029,8 +1026,7 @@ struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,</div><div class='ctx'> </div><div class='ctx'> 	switch (node-&gt;version) {</div><div class='ctx'> 	case DLM_VERSION_3_1:</div><div class='del'>-		msg = dlm_lowcomms_new_msg(nodeid, len, allocation, ppc,</div><div class='del'>-					   NULL, NULL);</div><div class='add'>+		msg = dlm_lowcomms_new_msg(nodeid, len, ppc, NULL, NULL);</div><div class='ctx'> 		if (!msg) {</div><div class='ctx'> 			dlm_free_mhandle(mh);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -1041,8 +1037,7 @@ struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,</div><div class='ctx'> 		/* send ack back if necessary */</div><div class='ctx'> 		dlm_send_ack_threshold(node, DLM_SEND_ACK_BACK_MSG_THRESHOLD);</div><div class='ctx'> </div><div class='del'>-		msg = dlm_midcomms_get_msg_3_2(mh, nodeid, len, allocation,</div><div class='del'>-					       ppc);</div><div class='add'>+		msg = dlm_midcomms_get_msg_3_2(mh, nodeid, len, ppc);</div><div class='ctx'> 		if (!msg) {</div><div class='ctx'> 			dlm_free_mhandle(mh);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -1187,7 +1182,7 @@ void dlm_midcomms_exit(void)</div><div class='ctx'> </div><div class='ctx'> static void dlm_act_fin_ack_rcv(struct midcomms_node *node)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 	pr_debug("receive active fin ack from node %d with state %s\n",</div><div class='ctx'> 		 node-&gt;nodeid, dlm_state_str(node-&gt;state));</div><div class='ctx'> </div><div class='hunk'>@@ -1207,13 +1202,13 @@ static void dlm_act_fin_ack_rcv(struct midcomms_node *node)</div><div class='ctx'> 		wake_up(&amp;node-&gt;shutdown_wait);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+		spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 		log_print("%s: unexpected state: %d",</div><div class='ctx'> 			  __func__, node-&gt;state);</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dlm_midcomms_add_member(int nodeid)</div><div class='hunk'>@@ -1228,7 +1223,7 @@ void dlm_midcomms_add_member(int nodeid)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 	if (!node-&gt;users) {</div><div class='ctx'> 		pr_debug("receive add member from node %d with state %s\n",</div><div class='ctx'> 			 node-&gt;nodeid, dlm_state_str(node-&gt;state));</div><div class='hunk'>@@ -1256,7 +1251,7 @@ void dlm_midcomms_add_member(int nodeid)</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;users++;</div><div class='ctx'> 	pr_debug("node %d users inc count %d\n", nodeid, node-&gt;users);</div><div class='del'>-	spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> </div><div class='ctx'> 	srcu_read_unlock(&amp;nodes_srcu, idx);</div><div class='ctx'> }</div><div class='hunk'>@@ -1274,13 +1269,13 @@ void dlm_midcomms_remove_member(int nodeid)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 	/* case of dlm_midcomms_addr() created node but</div><div class='ctx'> 	 * was not added before because dlm_midcomms_close()</div><div class='ctx'> 	 * removed the node</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!node-&gt;users) {</div><div class='del'>-		spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+		spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 		srcu_read_unlock(&amp;nodes_srcu, idx);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1318,7 +1313,7 @@ void dlm_midcomms_remove_member(int nodeid)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> </div><div class='ctx'> 	srcu_read_unlock(&amp;nodes_srcu, idx);</div><div class='ctx'> }</div><div class='hunk'>@@ -1356,7 +1351,7 @@ static void midcomms_shutdown(struct midcomms_node *node)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_lock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> 	pr_debug("receive active shutdown for node %d with state %s\n",</div><div class='ctx'> 		 node-&gt;nodeid, dlm_state_str(node-&gt;state));</div><div class='ctx'> 	switch (node-&gt;state) {</div><div class='hunk'>@@ -1375,7 +1370,7 @@ static void midcomms_shutdown(struct midcomms_node *node)</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;node-&gt;state_lock);</div><div class='add'>+	spin_unlock_bh(&amp;node-&gt;state_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (DLM_DEBUG_FENCE_TERMINATION)</div><div class='ctx'> 		msleep(5000);</div><div class='hunk'>@@ -1446,9 +1441,9 @@ int dlm_midcomms_close(int nodeid)</div><div class='ctx'> 	ret = dlm_lowcomms_close(nodeid);</div><div class='ctx'> 	dlm_delete_debug_comms_file(node-&gt;debugfs);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;nodes_lock);</div><div class='add'>+	spin_lock_bh(&amp;nodes_lock);</div><div class='ctx'> 	hlist_del_rcu(&amp;node-&gt;hlist);</div><div class='del'>-	spin_unlock(&amp;nodes_lock);</div><div class='add'>+	spin_unlock_bh(&amp;nodes_lock);</div><div class='ctx'> 	srcu_read_unlock(&amp;nodes_srcu, idx);</div><div class='ctx'> </div><div class='ctx'> 	/* wait that all readers left until flush send queue */</div><div class='hunk'>@@ -1502,8 +1497,8 @@ int dlm_midcomms_rawmsg_send(struct midcomms_node *node, void *buf,</div><div class='ctx'> 	rd.node = node;</div><div class='ctx'> 	rd.buf = buf;</div><div class='ctx'> </div><div class='del'>-	msg = dlm_lowcomms_new_msg(node-&gt;nodeid, buflen, GFP_NOFS,</div><div class='del'>-				   &amp;msgbuf, midcomms_new_rawmsg_cb, &amp;rd);</div><div class='add'>+	msg = dlm_lowcomms_new_msg(node-&gt;nodeid, buflen, &amp;msgbuf,</div><div class='add'>+				   midcomms_new_rawmsg_cb, &amp;rd);</div><div class='ctx'> 	if (!msg)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/midcomms.h b/fs/dlm/midcomms.h<br/>index e7246fb3ef57..7fad1d170bba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/midcomms.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/midcomms.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/midcomms.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/midcomms.h</a></div><div class='hunk'>@@ -16,11 +16,10 @@ struct midcomms_node;</div><div class='ctx'> </div><div class='ctx'> int dlm_validate_incoming_buffer(int nodeid, unsigned char *buf, int len);</div><div class='ctx'> int dlm_process_incoming_buffer(int nodeid, unsigned char *buf, int buflen);</div><div class='del'>-struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,</div><div class='del'>-					     gfp_t allocation, char **ppc);</div><div class='add'>+struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len, char **ppc);</div><div class='ctx'> void dlm_midcomms_commit_mhandle(struct dlm_mhandle *mh, const void *name,</div><div class='ctx'> 				 int namelen);</div><div class='del'>-int dlm_midcomms_addr(int nodeid, struct sockaddr_storage *addr, int len);</div><div class='add'>+int dlm_midcomms_addr(int nodeid, struct sockaddr_storage *addr);</div><div class='ctx'> void dlm_midcomms_version_wait(void);</div><div class='ctx'> int dlm_midcomms_close(int nodeid);</div><div class='ctx'> int dlm_midcomms_start(void);</div><div class='head'>diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c<br/>index d814c5121367..9ca83ef70ed1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/plock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/plock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/plock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/plock.c</a></div><div class='hunk'>@@ -138,14 +138,14 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;info.optype		= DLM_PLOCK_OP_LOCK;</div><div class='del'>-	op-&gt;info.pid		= fl-&gt;fl_pid;</div><div class='del'>-	op-&gt;info.ex		= (fl-&gt;fl_type == F_WRLCK);</div><div class='del'>-	op-&gt;info.wait		= !!(fl-&gt;fl_flags &amp; FL_SLEEP);</div><div class='add'>+	op-&gt;info.pid		= fl-&gt;c.flc_pid;</div><div class='add'>+	op-&gt;info.ex		= lock_is_write(fl);</div><div class='add'>+	op-&gt;info.wait		= !!(fl-&gt;c.flc_flags &amp; FL_SLEEP);</div><div class='ctx'> 	op-&gt;info.fsid		= ls-&gt;ls_global_id;</div><div class='ctx'> 	op-&gt;info.number		= number;</div><div class='ctx'> 	op-&gt;info.start		= fl-&gt;fl_start;</div><div class='ctx'> 	op-&gt;info.end		= fl-&gt;fl_end;</div><div class='del'>-	op-&gt;info.owner = (__u64)(long)fl-&gt;fl_owner;</div><div class='add'>+	op-&gt;info.owner = (__u64)(long) fl-&gt;c.flc_owner;</div><div class='ctx'> 	/* async handling */</div><div class='ctx'> 	if (fl-&gt;fl_lmops &amp;&amp; fl-&gt;fl_lmops-&gt;lm_grant) {</div><div class='ctx'> 		op_data = kzalloc(sizeof(*op_data), GFP_NOFS);</div><div class='hunk'>@@ -258,7 +258,7 @@ static int dlm_plock_callback(struct plock_op *op)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* got fs lock; bookkeep locally as well: */</div><div class='del'>-	flc-&gt;fl_flags &amp;= ~FL_SLEEP;</div><div class='add'>+	flc-&gt;c.flc_flags &amp;= ~FL_SLEEP;</div><div class='ctx'> 	if (posix_lock_file(file, flc, NULL)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This can only happen in the case of kmalloc() failure.</div><div class='hunk'>@@ -291,7 +291,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='ctx'> 	struct plock_op *op;</div><div class='ctx'> 	int rv;</div><div class='del'>-	unsigned char fl_flags = fl-&gt;fl_flags;</div><div class='add'>+	unsigned char saved_flags = fl-&gt;c.flc_flags;</div><div class='ctx'> </div><div class='ctx'> 	ls = dlm_find_lockspace_local(lockspace);</div><div class='ctx'> 	if (!ls)</div><div class='hunk'>@@ -304,7 +304,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* cause the vfs unlock to return ENOENT if lock is not found */</div><div class='del'>-	fl-&gt;fl_flags |= FL_EXISTS;</div><div class='add'>+	fl-&gt;c.flc_flags |= FL_EXISTS;</div><div class='ctx'> </div><div class='ctx'> 	rv = locks_lock_file_wait(file, fl);</div><div class='ctx'> 	if (rv == -ENOENT) {</div><div class='hunk'>@@ -317,14 +317,14 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;info.optype		= DLM_PLOCK_OP_UNLOCK;</div><div class='del'>-	op-&gt;info.pid		= fl-&gt;fl_pid;</div><div class='add'>+	op-&gt;info.pid		= fl-&gt;c.flc_pid;</div><div class='ctx'> 	op-&gt;info.fsid		= ls-&gt;ls_global_id;</div><div class='ctx'> 	op-&gt;info.number		= number;</div><div class='ctx'> 	op-&gt;info.start		= fl-&gt;fl_start;</div><div class='ctx'> 	op-&gt;info.end		= fl-&gt;fl_end;</div><div class='del'>-	op-&gt;info.owner = (__u64)(long)fl-&gt;fl_owner;</div><div class='add'>+	op-&gt;info.owner = (__u64)(long) fl-&gt;c.flc_owner;</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_CLOSE) {</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_CLOSE) {</div><div class='ctx'> 		op-&gt;info.flags |= DLM_PLOCK_FL_CLOSE;</div><div class='ctx'> 		send_op(op);</div><div class='ctx'> 		rv = 0;</div><div class='hunk'>@@ -345,7 +345,7 @@ out_free:</div><div class='ctx'> 	dlm_release_plock_op(op);</div><div class='ctx'> out:</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='del'>-	fl-&gt;fl_flags = fl_flags;</div><div class='add'>+	fl-&gt;c.flc_flags = saved_flags;</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dlm_posix_unlock);</div><div class='hunk'>@@ -375,14 +375,14 @@ int dlm_posix_cancel(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	info.pid = fl-&gt;fl_pid;</div><div class='del'>-	info.ex = (fl-&gt;fl_type == F_WRLCK);</div><div class='add'>+	info.pid = fl-&gt;c.flc_pid;</div><div class='add'>+	info.ex = lock_is_write(fl);</div><div class='ctx'> 	info.fsid = ls-&gt;ls_global_id;</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='ctx'> 	info.number = number;</div><div class='ctx'> 	info.start = fl-&gt;fl_start;</div><div class='ctx'> 	info.end = fl-&gt;fl_end;</div><div class='del'>-	info.owner = (__u64)(long)fl-&gt;fl_owner;</div><div class='add'>+	info.owner = (__u64)(long) fl-&gt;c.flc_owner;</div><div class='ctx'> </div><div class='ctx'> 	rv = do_lock_cancel(&amp;info);</div><div class='ctx'> 	switch (rv) {</div><div class='hunk'>@@ -437,13 +437,13 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	op-&gt;info.optype		= DLM_PLOCK_OP_GET;</div><div class='del'>-	op-&gt;info.pid		= fl-&gt;fl_pid;</div><div class='del'>-	op-&gt;info.ex		= (fl-&gt;fl_type == F_WRLCK);</div><div class='add'>+	op-&gt;info.pid		= fl-&gt;c.flc_pid;</div><div class='add'>+	op-&gt;info.ex		= lock_is_write(fl);</div><div class='ctx'> 	op-&gt;info.fsid		= ls-&gt;ls_global_id;</div><div class='ctx'> 	op-&gt;info.number		= number;</div><div class='ctx'> 	op-&gt;info.start		= fl-&gt;fl_start;</div><div class='ctx'> 	op-&gt;info.end		= fl-&gt;fl_end;</div><div class='del'>-	op-&gt;info.owner = (__u64)(long)fl-&gt;fl_owner;</div><div class='add'>+	op-&gt;info.owner = (__u64)(long) fl-&gt;c.flc_owner;</div><div class='ctx'> </div><div class='ctx'> 	send_op(op);</div><div class='ctx'> 	wait_event(recv_wq, (op-&gt;done != 0));</div><div class='hunk'>@@ -455,16 +455,16 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	rv = op-&gt;info.rv;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+	fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 	if (rv == -ENOENT)</div><div class='ctx'> 		rv = 0;</div><div class='ctx'> 	else if (rv &gt; 0) {</div><div class='ctx'> 		locks_init_lock(fl);</div><div class='del'>-		fl-&gt;fl_type = (op-&gt;info.ex) ? F_WRLCK : F_RDLCK;</div><div class='del'>-		fl-&gt;fl_flags = FL_POSIX;</div><div class='del'>-		fl-&gt;fl_pid = op-&gt;info.pid;</div><div class='add'>+		fl-&gt;c.flc_type = (op-&gt;info.ex) ? F_WRLCK : F_RDLCK;</div><div class='add'>+		fl-&gt;c.flc_flags = FL_POSIX;</div><div class='add'>+		fl-&gt;c.flc_pid = op-&gt;info.pid;</div><div class='ctx'> 		if (op-&gt;info.nodeid != dlm_our_nodeid())</div><div class='del'>-			fl-&gt;fl_pid = -fl-&gt;fl_pid;</div><div class='add'>+			fl-&gt;c.flc_pid = -fl-&gt;c.flc_pid;</div><div class='ctx'> 		fl-&gt;fl_start = op-&gt;info.start;</div><div class='ctx'> 		fl-&gt;fl_end = op-&gt;info.end;</div><div class='ctx'> 		rv = 0;</div><div class='head'>diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c<br/>index 3b734aed26b5..be1a71a6303a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/rcom.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/rcom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/rcom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/rcom.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static int create_rcom(struct dlm_ls *ls, int to_nodeid, int type, int len,</div><div class='ctx'> 	struct dlm_mhandle *mh;</div><div class='ctx'> 	char *mb;</div><div class='ctx'> </div><div class='del'>-	mh = dlm_midcomms_get_mhandle(to_nodeid, mb_len, GFP_NOFS, &amp;mb);</div><div class='add'>+	mh = dlm_midcomms_get_mhandle(to_nodeid, mb_len, &amp;mb);</div><div class='ctx'> 	if (!mh) {</div><div class='ctx'> 		log_print("%s to %d type %d len %d ENOBUFS",</div><div class='ctx'> 			  __func__, to_nodeid, type, len);</div><div class='hunk'>@@ -75,8 +75,7 @@ static int create_rcom_stateless(struct dlm_ls *ls, int to_nodeid, int type,</div><div class='ctx'> 	struct dlm_msg *msg;</div><div class='ctx'> 	char *mb;</div><div class='ctx'> </div><div class='del'>-	msg = dlm_lowcomms_new_msg(to_nodeid, mb_len, GFP_NOFS, &amp;mb,</div><div class='del'>-				   NULL, NULL);</div><div class='add'>+	msg = dlm_lowcomms_new_msg(to_nodeid, mb_len, &amp;mb, NULL, NULL);</div><div class='ctx'> 	if (!msg) {</div><div class='ctx'> 		log_print("create_rcom to %d type %d len %d ENOBUFS",</div><div class='ctx'> 			  to_nodeid, type, len);</div><div class='hunk'>@@ -144,18 +143,18 @@ static int check_rcom_config(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)</div><div class='ctx'> </div><div class='ctx'> static void allow_sync_reply(struct dlm_ls *ls, __le64 *new_seq)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rcom_spin);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_rcom_spin);</div><div class='ctx'> 	*new_seq = cpu_to_le64(++ls-&gt;ls_rcom_seq);</div><div class='ctx'> 	set_bit(LSFL_RCOM_WAIT, &amp;ls-&gt;ls_flags);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rcom_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_rcom_spin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void disallow_sync_reply(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rcom_spin);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_rcom_spin);</div><div class='ctx'> 	clear_bit(LSFL_RCOM_WAIT, &amp;ls-&gt;ls_flags);</div><div class='ctx'> 	clear_bit(LSFL_RCOM_READY, &amp;ls-&gt;ls_flags);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rcom_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_rcom_spin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -246,10 +245,10 @@ static void receive_rcom_status(struct dlm_ls *ls,</div><div class='ctx'> 		goto do_create;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	status = ls-&gt;ls_recover_status;</div><div class='ctx'> 	num_slots = ls-&gt;ls_num_slots;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	len += num_slots * sizeof(struct rcom_slot);</div><div class='ctx'> </div><div class='ctx'>  do_create:</div><div class='hunk'>@@ -267,9 +266,9 @@ static void receive_rcom_status(struct dlm_ls *ls,</div><div class='ctx'> 	if (!num_slots)</div><div class='ctx'> 		goto do_send;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	if (ls-&gt;ls_num_slots != num_slots) {</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+		spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 		log_debug(ls, "receive_rcom_status num_slots %d to %d",</div><div class='ctx'> 			  num_slots, ls-&gt;ls_num_slots);</div><div class='ctx'> 		rc-&gt;rc_result = 0;</div><div class='hunk'>@@ -278,7 +277,7 @@ static void receive_rcom_status(struct dlm_ls *ls,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dlm_slots_copy_out(ls, rc);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'>  do_send:</div><div class='ctx'> 	send_rcom_stateless(msg, rc);</div><div class='hunk'>@@ -286,7 +285,7 @@ static void receive_rcom_status(struct dlm_ls *ls,</div><div class='ctx'> </div><div class='ctx'> static void receive_sync_reply(struct dlm_ls *ls, const struct dlm_rcom *rc_in)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_rcom_spin);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_rcom_spin);</div><div class='ctx'> 	if (!test_bit(LSFL_RCOM_WAIT, &amp;ls-&gt;ls_flags) ||</div><div class='ctx'> 	    le64_to_cpu(rc_in-&gt;rc_id) != ls-&gt;ls_rcom_seq) {</div><div class='ctx'> 		log_debug(ls, "reject reply %d from %d seq %llx expect %llx",</div><div class='hunk'>@@ -302,7 +301,7 @@ static void receive_sync_reply(struct dlm_ls *ls, const struct dlm_rcom *rc_in)</div><div class='ctx'> 	clear_bit(LSFL_RCOM_WAIT, &amp;ls-&gt;ls_flags);</div><div class='ctx'> 	wake_up(&amp;ls-&gt;ls_wait_general);</div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_rcom_spin);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_rcom_spin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name,</div><div class='hunk'>@@ -510,7 +509,7 @@ int dlm_send_ls_not_ready(int nodeid, const struct dlm_rcom *rc_in)</div><div class='ctx'> 	char *mb;</div><div class='ctx'> 	int mb_len = sizeof(struct dlm_rcom) + sizeof(struct rcom_config);</div><div class='ctx'> </div><div class='del'>-	mh = dlm_midcomms_get_mhandle(nodeid, mb_len, GFP_NOFS, &amp;mb);</div><div class='add'>+	mh = dlm_midcomms_get_mhandle(nodeid, mb_len, &amp;mb);</div><div class='ctx'> 	if (!mh)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='hunk'>@@ -614,11 +613,11 @@ void dlm_receive_rcom(struct dlm_ls *ls, const struct dlm_rcom *rc, int nodeid)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	status = ls-&gt;ls_recover_status;</div><div class='ctx'> 	stop = dlm_recovery_stopped(ls);</div><div class='ctx'> 	seq = ls-&gt;ls_recover_seq;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (stop &amp;&amp; (rc-&gt;rc_type != cpu_to_le32(DLM_RCOM_STATUS)))</div><div class='ctx'> 		goto ignore;</div><div class='head'>diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c<br/>index 53917c0aa3c0..3ac020fb8139 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/recover.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/recover.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/recover.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/recover.c</a></div><div class='hunk'>@@ -74,9 +74,9 @@ int dlm_wait_function(struct dlm_ls *ls, int (*testfn) (struct dlm_ls *ls))</div><div class='ctx'> uint32_t dlm_recover_status(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t status;</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	status = ls-&gt;ls_recover_status;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -87,9 +87,9 @@ static void _set_recover_status(struct dlm_ls *ls, uint32_t status)</div><div class='ctx'> </div><div class='ctx'> void dlm_set_recover_status(struct dlm_ls *ls, uint32_t status)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	_set_recover_status(ls, status);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wait_status_all(struct dlm_ls *ls, uint32_t wait_status,</div><div class='hunk'>@@ -188,13 +188,13 @@ int dlm_recover_members_wait(struct dlm_ls *ls, uint64_t seq)</div><div class='ctx'> </div><div class='ctx'> 		rv = dlm_slots_assign(ls, &amp;num_slots, &amp;slots_size, &amp;slots, &amp;gen);</div><div class='ctx'> 		if (!rv) {</div><div class='del'>-			spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+			spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 			_set_recover_status(ls, DLM_RS_NODES_ALL);</div><div class='ctx'> 			ls-&gt;ls_num_slots = num_slots;</div><div class='ctx'> 			ls-&gt;ls_slots_size = slots_size;</div><div class='ctx'> 			ls-&gt;ls_slots = slots;</div><div class='ctx'> 			ls-&gt;ls_generation = gen;</div><div class='del'>-			spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+			spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dlm_set_recover_status(ls, DLM_RS_NODES_ALL);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -241,9 +241,9 @@ static int recover_list_empty(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	int empty;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> 	empty = list_empty(&amp;ls-&gt;ls_recover_list);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	return empty;</div><div class='ctx'> }</div><div class='hunk'>@@ -252,23 +252,23 @@ static void recover_list_add(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> 	if (list_empty(&amp;r-&gt;res_recover_list)) {</div><div class='ctx'> 		list_add_tail(&amp;r-&gt;res_recover_list, &amp;ls-&gt;ls_recover_list);</div><div class='ctx'> 		ls-&gt;ls_recover_list_count++;</div><div class='ctx'> 		dlm_hold_rsb(r);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void recover_list_del(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> 	list_del_init(&amp;r-&gt;res_recover_list);</div><div class='ctx'> 	ls-&gt;ls_recover_list_count--;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	dlm_put_rsb(r);</div><div class='ctx'> }</div><div class='hunk'>@@ -277,7 +277,7 @@ static void recover_list_clear(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r, *s;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> 	list_for_each_entry_safe(r, s, &amp;ls-&gt;ls_recover_list, res_recover_list) {</div><div class='ctx'> 		list_del_init(&amp;r-&gt;res_recover_list);</div><div class='ctx'> 		r-&gt;res_recover_locks_count = 0;</div><div class='hunk'>@@ -290,78 +290,81 @@ static void recover_list_clear(struct dlm_ls *ls)</div><div class='ctx'> 			  ls-&gt;ls_recover_list_count);</div><div class='ctx'> 		ls-&gt;ls_recover_list_count = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_list_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int recover_idr_empty(struct dlm_ls *ls)</div><div class='add'>+static int recover_xa_empty(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	int empty = 1;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> 	if (ls-&gt;ls_recover_list_count)</div><div class='ctx'> 		empty = 0;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> </div><div class='ctx'> 	return empty;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int recover_idr_add(struct dlm_rsb *r)</div><div class='add'>+static int recover_xa_add(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='add'>+	struct xa_limit limit = {</div><div class='add'>+		.min = 1,</div><div class='add'>+		.max = UINT_MAX,</div><div class='add'>+	};</div><div class='add'>+	uint32_t id;</div><div class='ctx'> 	int rv;</div><div class='ctx'> </div><div class='del'>-	idr_preload(GFP_NOFS);</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> 	if (r-&gt;res_id) {</div><div class='ctx'> 		rv = -1;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	rv = idr_alloc(&amp;ls-&gt;ls_recover_idr, r, 1, 0, GFP_NOWAIT);</div><div class='add'>+	rv = xa_alloc(&amp;ls-&gt;ls_recover_xa, &amp;id, r, limit, GFP_ATOMIC);</div><div class='ctx'> 	if (rv &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	r-&gt;res_id = rv;</div><div class='add'>+	r-&gt;res_id = id;</div><div class='ctx'> 	ls-&gt;ls_recover_list_count++;</div><div class='ctx'> 	dlm_hold_rsb(r);</div><div class='ctx'> 	rv = 0;</div><div class='ctx'> out_unlock:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='del'>-	idr_preload_end();</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void recover_idr_del(struct dlm_rsb *r)</div><div class='add'>+static void recover_xa_del(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='del'>-	idr_remove(&amp;ls-&gt;ls_recover_idr, r-&gt;res_id);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='add'>+	xa_erase_bh(&amp;ls-&gt;ls_recover_xa, r-&gt;res_id);</div><div class='ctx'> 	r-&gt;res_id = 0;</div><div class='ctx'> 	ls-&gt;ls_recover_list_count--;</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> </div><div class='ctx'> 	dlm_put_rsb(r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dlm_rsb *recover_idr_find(struct dlm_ls *ls, uint64_t id)</div><div class='add'>+static struct dlm_rsb *recover_xa_find(struct dlm_ls *ls, uint64_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='del'>-	r = idr_find(&amp;ls-&gt;ls_recover_idr, (int)id);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='add'>+	r = xa_load(&amp;ls-&gt;ls_recover_xa, (int)id);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void recover_idr_clear(struct dlm_ls *ls)</div><div class='add'>+static void recover_xa_clear(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='del'>-	int id;</div><div class='add'>+	unsigned long id;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> </div><div class='del'>-	idr_for_each_entry(&amp;ls-&gt;ls_recover_idr, r, id) {</div><div class='del'>-		idr_remove(&amp;ls-&gt;ls_recover_idr, id);</div><div class='add'>+	xa_for_each(&amp;ls-&gt;ls_recover_xa, id, r) {</div><div class='add'>+		xa_erase_bh(&amp;ls-&gt;ls_recover_xa, id);</div><div class='ctx'> 		r-&gt;res_id = 0;</div><div class='ctx'> 		r-&gt;res_recover_locks_count = 0;</div><div class='ctx'> 		ls-&gt;ls_recover_list_count--;</div><div class='hunk'>@@ -374,7 +377,7 @@ static void recover_idr_clear(struct dlm_ls *ls)</div><div class='ctx'> 			  ls-&gt;ls_recover_list_count);</div><div class='ctx'> 		ls-&gt;ls_recover_list_count = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_idr_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_xa_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -449,10 +452,11 @@ static int recover_master(struct dlm_rsb *r, unsigned int *count, uint64_t seq)</div><div class='ctx'> 	int is_removed = 0;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (is_master(r))</div><div class='add'>+	if (r-&gt;res_nodeid != -1 &amp;&amp; is_master(r))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	is_removed = dlm_is_removed(ls, r-&gt;res_nodeid);</div><div class='add'>+	if (r-&gt;res_nodeid != -1)</div><div class='add'>+		is_removed = dlm_is_removed(ls, r-&gt;res_nodeid);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_removed &amp;&amp; !rsb_flag(r, RSB_NEW_MASTER))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -472,7 +476,7 @@ static int recover_master(struct dlm_rsb *r, unsigned int *count, uint64_t seq)</div><div class='ctx'> 		set_new_master(r);</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		recover_idr_add(r);</div><div class='add'>+		recover_xa_add(r);</div><div class='ctx'> 		error = dlm_send_rcom_lookup(r, dir_nodeid, seq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -521,7 +525,8 @@ static int recover_master_static(struct dlm_rsb *r, unsigned int *count)</div><div class='ctx'>  * the correct dir node.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int dlm_recover_masters(struct dlm_ls *ls, uint64_t seq)</div><div class='add'>+int dlm_recover_masters(struct dlm_ls *ls, uint64_t seq,</div><div class='add'>+			const struct list_head *root_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> 	unsigned int total = 0;</div><div class='hunk'>@@ -531,10 +536,8 @@ int dlm_recover_masters(struct dlm_ls *ls, uint64_t seq)</div><div class='ctx'> </div><div class='ctx'> 	log_rinfo(ls, "dlm_recover_masters");</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry(r, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='add'>+	list_for_each_entry(r, root_list, res_root_list) {</div><div class='ctx'> 		if (dlm_recovery_stopped(ls)) {</div><div class='del'>-			up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> 			error = -EINTR;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -548,19 +551,16 @@ int dlm_recover_masters(struct dlm_ls *ls, uint64_t seq)</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		total++;</div><div class='ctx'> </div><div class='del'>-		if (error) {</div><div class='del'>-			up_read(&amp;ls-&gt;ls_root_sem);</div><div class='add'>+		if (error)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> </div><div class='ctx'> 	log_rinfo(ls, "dlm_recover_masters %u of %u", count, total);</div><div class='ctx'> </div><div class='del'>-	error = dlm_wait_function(ls, &amp;recover_idr_empty);</div><div class='add'>+	error = dlm_wait_function(ls, &amp;recover_xa_empty);</div><div class='ctx'>  out:</div><div class='ctx'> 	if (error)</div><div class='del'>-		recover_idr_clear(ls);</div><div class='add'>+		recover_xa_clear(ls);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,7 +569,7 @@ int dlm_recover_master_reply(struct dlm_ls *ls, const struct dlm_rcom *rc)</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> 	int ret_nodeid, new_master;</div><div class='ctx'> </div><div class='del'>-	r = recover_idr_find(ls, le64_to_cpu(rc-&gt;rc_id));</div><div class='add'>+	r = recover_xa_find(ls, le64_to_cpu(rc-&gt;rc_id));</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		log_error(ls, "dlm_recover_master_reply no id %llx",</div><div class='ctx'> 			  (unsigned long long)le64_to_cpu(rc-&gt;rc_id));</div><div class='hunk'>@@ -588,9 +588,9 @@ int dlm_recover_master_reply(struct dlm_ls *ls, const struct dlm_rcom *rc)</div><div class='ctx'> 	r-&gt;res_nodeid = new_master;</div><div class='ctx'> 	set_new_master(r);</div><div class='ctx'> 	unlock_rsb(r);</div><div class='del'>-	recover_idr_del(r);</div><div class='add'>+	recover_xa_del(r);</div><div class='ctx'> </div><div class='del'>-	if (recover_idr_empty(ls))</div><div class='add'>+	if (recover_xa_empty(ls))</div><div class='ctx'> 		wake_up(&amp;ls-&gt;ls_wait_general);</div><div class='ctx'>  out:</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -658,14 +658,14 @@ static int recover_locks(struct dlm_rsb *r, uint64_t seq)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dlm_recover_locks(struct dlm_ls *ls, uint64_t seq)</div><div class='add'>+int dlm_recover_locks(struct dlm_ls *ls, uint64_t seq,</div><div class='add'>+		      const struct list_head *root_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> 	int error, count = 0;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry(r, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='del'>-		if (is_master(r)) {</div><div class='add'>+	list_for_each_entry(r, root_list, res_root_list) {</div><div class='add'>+		if (r-&gt;res_nodeid != -1 &amp;&amp; is_master(r)) {</div><div class='ctx'> 			rsb_clear_flag(r, RSB_NEW_MASTER);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -675,19 +675,15 @@ int dlm_recover_locks(struct dlm_ls *ls, uint64_t seq)</div><div class='ctx'> </div><div class='ctx'> 		if (dlm_recovery_stopped(ls)) {</div><div class='ctx'> 			error = -EINTR;</div><div class='del'>-			up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		error = recover_locks(r, seq);</div><div class='del'>-		if (error) {</div><div class='del'>-			up_read(&amp;ls-&gt;ls_root_sem);</div><div class='add'>+		if (error)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		count += r-&gt;res_recover_locks_count;</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> </div><div class='ctx'> 	log_rinfo(ls, "dlm_recover_locks %d out", count);</div><div class='ctx'> </div><div class='hunk'>@@ -815,33 +811,42 @@ static void recover_lvb(struct dlm_rsb *r)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* All master rsb's flagged RECOVER_CONVERT need to be looked at.  The locks</div><div class='del'>-   converting PR-&gt;CW or CW-&gt;PR need to have their lkb_grmode set. */</div><div class='add'>+ * converting PR-&gt;CW or CW-&gt;PR may need to have their lkb_grmode changed.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static void recover_conversion(struct dlm_rsb *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_ls *ls = r-&gt;res_ls;</div><div class='add'>+	uint32_t other_lkid = 0;</div><div class='add'>+	int other_grmode = -1;</div><div class='ctx'> 	struct dlm_lkb *lkb;</div><div class='del'>-	int grmode = -1;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(lkb, &amp;r-&gt;res_grantqueue, lkb_statequeue) {</div><div class='ctx'> 		if (lkb-&gt;lkb_grmode == DLM_LOCK_PR ||</div><div class='ctx'> 		    lkb-&gt;lkb_grmode == DLM_LOCK_CW) {</div><div class='del'>-			grmode = lkb-&gt;lkb_grmode;</div><div class='add'>+			other_grmode = lkb-&gt;lkb_grmode;</div><div class='add'>+			other_lkid = lkb-&gt;lkb_id;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (other_grmode == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(lkb, &amp;r-&gt;res_convertqueue, lkb_statequeue) {</div><div class='del'>-		if (lkb-&gt;lkb_grmode != DLM_LOCK_IV)</div><div class='del'>-			continue;</div><div class='del'>-		if (grmode == -1) {</div><div class='del'>-			log_debug(ls, "recover_conversion %x set gr to rq %d",</div><div class='del'>-				  lkb-&gt;lkb_id, lkb-&gt;lkb_rqmode);</div><div class='del'>-			lkb-&gt;lkb_grmode = lkb-&gt;lkb_rqmode;</div><div class='del'>-		} else {</div><div class='del'>-			log_debug(ls, "recover_conversion %x set gr %d",</div><div class='del'>-				  lkb-&gt;lkb_id, grmode);</div><div class='del'>-			lkb-&gt;lkb_grmode = grmode;</div><div class='add'>+		/* Lock recovery created incompatible granted modes, so</div><div class='add'>+		 * change the granted mode of the converting lock to</div><div class='add'>+		 * NL. The rqmode of the converting lock should be CW,</div><div class='add'>+		 * which means the converting lock should be granted at</div><div class='add'>+		 * the end of recovery.</div><div class='add'>+		 */</div><div class='add'>+		if (((lkb-&gt;lkb_grmode == DLM_LOCK_PR) &amp;&amp; (other_grmode == DLM_LOCK_CW)) ||</div><div class='add'>+		    ((lkb-&gt;lkb_grmode == DLM_LOCK_CW) &amp;&amp; (other_grmode == DLM_LOCK_PR))) {</div><div class='add'>+			log_rinfo(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL",</div><div class='add'>+				  __func__, lkb-&gt;lkb_id, lkb-&gt;lkb_grmode,</div><div class='add'>+				  lkb-&gt;lkb_rqmode, lkb-&gt;lkb_nodeid,</div><div class='add'>+				  lkb-&gt;lkb_remid, other_lkid, other_grmode);</div><div class='add'>+			lkb-&gt;lkb_grmode = DLM_LOCK_NL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -856,15 +861,14 @@ static void recover_grant(struct dlm_rsb *r)</div><div class='ctx'> 		rsb_set_flag(r, RSB_RECOVER_GRANT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dlm_recover_rsbs(struct dlm_ls *ls)</div><div class='add'>+void dlm_recover_rsbs(struct dlm_ls *ls, const struct list_head *root_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r;</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry(r, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='add'>+	list_for_each_entry(r, root_list, res_root_list) {</div><div class='ctx'> 		lock_rsb(r);</div><div class='del'>-		if (is_master(r)) {</div><div class='add'>+		if (r-&gt;res_nodeid != -1 &amp;&amp; is_master(r)) {</div><div class='ctx'> 			if (rsb_flag(r, RSB_RECOVER_CONVERT))</div><div class='ctx'> 				recover_conversion(r);</div><div class='ctx'> </div><div class='hunk'>@@ -883,76 +887,31 @@ void dlm_recover_rsbs(struct dlm_ls *ls)</div><div class='ctx'> 		rsb_clear_flag(r, RSB_NEW_MASTER2);</div><div class='ctx'> 		unlock_rsb(r);</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;ls-&gt;ls_root_sem);</div><div class='ctx'> </div><div class='ctx'> 	if (count)</div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_rsbs %d done", count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Create a single list of all root rsb's to be used during recovery */</div><div class='del'>-</div><div class='del'>-int dlm_create_root_list(struct dlm_ls *ls)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-	struct dlm_rsb *r;</div><div class='del'>-	int i, error = 0;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	if (!list_empty(&amp;ls-&gt;ls_root_list)) {</div><div class='del'>-		log_error(ls, "root list not empty");</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ls-&gt;ls_rsbtbl_size; i++) {</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='del'>-		for (n = rb_first(&amp;ls-&gt;ls_rsbtbl[i].keep); n; n = rb_next(n)) {</div><div class='del'>-			r = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-			list_add(&amp;r-&gt;res_root_list, &amp;ls-&gt;ls_root_list);</div><div class='del'>-			dlm_hold_rsb(r);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!RB_EMPTY_ROOT(&amp;ls-&gt;ls_rsbtbl[i].toss))</div><div class='del'>-			log_error(ls, "dlm_create_root_list toss not empty");</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='del'>-	}</div><div class='del'>- out:</div><div class='del'>-	up_write(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dlm_release_root_list(struct dlm_ls *ls)</div><div class='add'>+void dlm_clear_inactive(struct dlm_ls *ls)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_rsb *r, *safe;</div><div class='add'>+	unsigned int count = 0;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-	list_for_each_entry_safe(r, safe, &amp;ls-&gt;ls_root_list, res_root_list) {</div><div class='del'>-		list_del_init(&amp;r-&gt;res_root_list);</div><div class='del'>-		dlm_put_rsb(r);</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;ls-&gt;ls_root_sem);</div><div class='del'>-}</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	list_for_each_entry_safe(r, safe, &amp;ls-&gt;ls_slow_inactive, res_slow_list) {</div><div class='add'>+		list_del(&amp;r-&gt;res_slow_list);</div><div class='add'>+		rhashtable_remove_fast(&amp;ls-&gt;ls_rsbtbl, &amp;r-&gt;res_node,</div><div class='add'>+				       dlm_rhash_rsb_params);</div><div class='ctx'> </div><div class='del'>-void dlm_clear_toss(struct dlm_ls *ls)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *n, *next;</div><div class='del'>-	struct dlm_rsb *r;</div><div class='del'>-	unsigned int count = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ls-&gt;ls_rsbtbl_size; i++) {</div><div class='del'>-		spin_lock(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='del'>-		for (n = rb_first(&amp;ls-&gt;ls_rsbtbl[i].toss); n; n = next) {</div><div class='del'>-			next = rb_next(n);</div><div class='del'>-			r = rb_entry(n, struct dlm_rsb, res_hashnode);</div><div class='del'>-			rb_erase(n, &amp;ls-&gt;ls_rsbtbl[i].toss);</div><div class='del'>-			dlm_free_rsb(r);</div><div class='del'>-			count++;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_rsbtbl[i].lock);</div><div class='add'>+		if (!list_empty(&amp;r-&gt;res_scan_list))</div><div class='add'>+			list_del_init(&amp;r-&gt;res_scan_list);</div><div class='add'>+</div><div class='add'>+		free_inactive_rsb(r);</div><div class='add'>+		count++;</div><div class='ctx'> 	}</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (count)</div><div class='del'>-		log_rinfo(ls, "dlm_clear_toss %u done", count);</div><div class='add'>+		log_rinfo(ls, "dlm_clear_inactive %u done", count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/recover.h b/fs/dlm/recover.h<br/>index dbc51013ecad..ec69896462fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/recover.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/recover.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/recover.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/recover.h</a></div><div class='hunk'>@@ -19,14 +19,14 @@ int dlm_recover_members_wait(struct dlm_ls *ls, uint64_t seq);</div><div class='ctx'> int dlm_recover_directory_wait(struct dlm_ls *ls, uint64_t seq);</div><div class='ctx'> int dlm_recover_locks_wait(struct dlm_ls *ls, uint64_t seq);</div><div class='ctx'> int dlm_recover_done_wait(struct dlm_ls *ls, uint64_t seq);</div><div class='del'>-int dlm_recover_masters(struct dlm_ls *ls, uint64_t seq);</div><div class='add'>+int dlm_recover_masters(struct dlm_ls *ls, uint64_t seq,</div><div class='add'>+			const struct list_head *root_list);</div><div class='ctx'> int dlm_recover_master_reply(struct dlm_ls *ls, const struct dlm_rcom *rc);</div><div class='del'>-int dlm_recover_locks(struct dlm_ls *ls, uint64_t seq);</div><div class='add'>+int dlm_recover_locks(struct dlm_ls *ls, uint64_t seq,</div><div class='add'>+		      const struct list_head *root_list);</div><div class='ctx'> void dlm_recovered_lock(struct dlm_rsb *r);</div><div class='del'>-int dlm_create_root_list(struct dlm_ls *ls);</div><div class='del'>-void dlm_release_root_list(struct dlm_ls *ls);</div><div class='del'>-void dlm_clear_toss(struct dlm_ls *ls);</div><div class='del'>-void dlm_recover_rsbs(struct dlm_ls *ls);</div><div class='add'>+void dlm_clear_inactive(struct dlm_ls *ls);</div><div class='add'>+void dlm_recover_rsbs(struct dlm_ls *ls, const struct list_head *root_list);</div><div class='ctx'> </div><div class='ctx'> #endif				/* __RECOVER_DOT_H__ */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c<br/>index 4d17491dea2f..12272a8f6d75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/recoverd.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/recoverd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/recoverd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/recoverd.c</a></div><div class='hunk'>@@ -20,6 +20,67 @@</div><div class='ctx'> #include "requestqueue.h"</div><div class='ctx'> #include "recoverd.h"</div><div class='ctx'> </div><div class='add'>+static int dlm_create_masters_list(struct dlm_ls *ls)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *r;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_masters_lock);</div><div class='add'>+	if (!list_empty(&amp;ls-&gt;ls_masters_list)) {</div><div class='add'>+		log_error(ls, "root list not empty");</div><div class='add'>+		error = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	list_for_each_entry(r, &amp;ls-&gt;ls_slow_active, res_slow_list) {</div><div class='add'>+		if (r-&gt;res_nodeid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_add(&amp;r-&gt;res_masters_list, &amp;ls-&gt;ls_masters_list);</div><div class='add'>+		dlm_hold_rsb(r);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+ out:</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_masters_lock);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dlm_release_masters_list(struct dlm_ls *ls)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *r, *safe;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_masters_lock);</div><div class='add'>+	list_for_each_entry_safe(r, safe, &amp;ls-&gt;ls_masters_list, res_masters_list) {</div><div class='add'>+		list_del_init(&amp;r-&gt;res_masters_list);</div><div class='add'>+		dlm_put_rsb(r);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_masters_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dlm_create_root_list(struct dlm_ls *ls, struct list_head *root_list)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *r;</div><div class='add'>+</div><div class='add'>+	read_lock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+	list_for_each_entry(r, &amp;ls-&gt;ls_slow_active, res_slow_list) {</div><div class='add'>+		list_add(&amp;r-&gt;res_root_list, root_list);</div><div class='add'>+		dlm_hold_rsb(r);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;ls-&gt;ls_slow_inactive));</div><div class='add'>+	read_unlock_bh(&amp;ls-&gt;ls_rsbtbl_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dlm_release_root_list(struct list_head *root_list)</div><div class='add'>+{</div><div class='add'>+	struct dlm_rsb *r, *safe;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(r, safe, root_list, res_root_list) {</div><div class='add'>+		list_del_init(&amp;r-&gt;res_root_list);</div><div class='add'>+		dlm_put_rsb(r);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* If the start for which we're re-enabling locking (seq) has been superseded</div><div class='ctx'>    by a newer stop (ls_recover_seq), we need to leave locking disabled.</div><div class='hunk'>@@ -32,24 +93,35 @@ static int enable_locking(struct dlm_ls *ls, uint64_t seq)</div><div class='ctx'> {</div><div class='ctx'> 	int error = -EINTR;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	if (ls-&gt;ls_recover_seq == seq) {</div><div class='ctx'> 		set_bit(LSFL_RUNNING, &amp;ls-&gt;ls_flags);</div><div class='add'>+		/* Schedule next timer if recovery put something on inactive.</div><div class='add'>+		 *</div><div class='add'>+		 * The rsbs that was queued while recovery on toss hasn't</div><div class='add'>+		 * started yet because LSFL_RUNNING was set everything</div><div class='add'>+		 * else recovery hasn't started as well because ls_in_recovery</div><div class='add'>+		 * is still hold. So we should not run into the case that</div><div class='add'>+		 * resume_scan_timer() queues a timer that can occur in</div><div class='add'>+		 * a no op.</div><div class='add'>+		 */</div><div class='add'>+		resume_scan_timer(ls);</div><div class='ctx'> 		/* unblocks processes waiting to enter the dlm */</div><div class='ctx'> 		up_write(&amp;ls-&gt;ls_in_recovery);</div><div class='ctx'> 		clear_bit(LSFL_RECOVER_LOCK, &amp;ls-&gt;ls_flags);</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='del'>-	up_write(&amp;ls-&gt;ls_recv_active);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_recv_active);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(root_list);</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> 	int error, neg = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -59,14 +131,14 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> </div><div class='ctx'> 	dlm_callback_suspend(ls);</div><div class='ctx'> </div><div class='del'>-	dlm_clear_toss(ls);</div><div class='add'>+	dlm_clear_inactive(ls);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This list of root rsb's will be the basis of most of the recovery</div><div class='ctx'> 	 * routines.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	dlm_create_root_list(ls);</div><div class='add'>+	dlm_create_root_list(ls, &amp;root_list);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add or remove nodes from the lockspace's ls_nodes list.</div><div class='hunk'>@@ -79,13 +151,28 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 	error = dlm_recover_members(ls, rv, &amp;neg);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_members error %d", error);</div><div class='del'>-		goto fail;</div><div class='add'>+		goto fail_root_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dlm_recover_dir_nodeid(ls);</div><div class='add'>+	dlm_recover_dir_nodeid(ls, &amp;root_list);</div><div class='add'>+</div><div class='add'>+	/* Create a snapshot of all active rsbs were we are the master of.</div><div class='add'>+	 * During the barrier between dlm_recover_members_wait() and</div><div class='add'>+	 * dlm_recover_directory() other nodes can dump their necessary</div><div class='add'>+	 * directory dlm_rsb (r-&gt;res_dir_nodeid == nodeid) in rcom</div><div class='add'>+	 * communication dlm_copy_master_names() handling.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO We should create a per lockspace list that contains rsbs</div><div class='add'>+	 * that we are the master of. Instead of creating this list while</div><div class='add'>+	 * recovery we keep track of those rsbs while locking handling and</div><div class='add'>+	 * recovery can use it when necessary.</div><div class='add'>+	 */</div><div class='add'>+	error = dlm_create_masters_list(ls);</div><div class='add'>+	if (error) {</div><div class='add'>+		log_rinfo(ls, "dlm_create_masters_list error %d", error);</div><div class='add'>+		goto fail_root_list;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ls-&gt;ls_recover_dir_sent_res = 0;</div><div class='del'>-	ls-&gt;ls_recover_dir_sent_msg = 0;</div><div class='ctx'> 	ls-&gt;ls_recover_locks_in = 0;</div><div class='ctx'> </div><div class='ctx'> 	dlm_set_recover_status(ls, DLM_RS_NODES);</div><div class='hunk'>@@ -93,7 +180,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 	error = dlm_recover_members_wait(ls, rv-&gt;seq);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_members_wait error %d", error);</div><div class='del'>-		goto fail;</div><div class='add'>+		dlm_release_masters_list(ls);</div><div class='add'>+		goto fail_root_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	start = jiffies;</div><div class='hunk'>@@ -106,7 +194,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 	error = dlm_recover_directory(ls, rv-&gt;seq);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_directory error %d", error);</div><div class='del'>-		goto fail;</div><div class='add'>+		dlm_release_masters_list(ls);</div><div class='add'>+		goto fail_root_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dlm_set_recover_status(ls, DLM_RS_DIR);</div><div class='hunk'>@@ -114,11 +203,11 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 	error = dlm_recover_directory_wait(ls, rv-&gt;seq);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_directory_wait error %d", error);</div><div class='del'>-		goto fail;</div><div class='add'>+		dlm_release_masters_list(ls);</div><div class='add'>+		goto fail_root_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	log_rinfo(ls, "dlm_recover_directory %u out %u messages",</div><div class='del'>-		  ls-&gt;ls_recover_dir_sent_res, ls-&gt;ls_recover_dir_sent_msg);</div><div class='add'>+	dlm_release_masters_list(ls);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We may have outstanding operations that are waiting for a reply from</div><div class='hunk'>@@ -130,7 +219,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> </div><div class='ctx'> 	if (dlm_recovery_stopped(ls)) {</div><div class='ctx'> 		error = -EINTR;</div><div class='del'>-		goto fail;</div><div class='add'>+		goto fail_root_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (neg || dlm_no_directory(ls)) {</div><div class='hunk'>@@ -138,27 +227,27 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 		 * Clear lkb's for departed nodes.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		dlm_recover_purge(ls);</div><div class='add'>+		dlm_recover_purge(ls, &amp;root_list);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Get new master nodeid's for rsb's that were mastered on</div><div class='ctx'> 		 * departed nodes.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		error = dlm_recover_masters(ls, rv-&gt;seq);</div><div class='add'>+		error = dlm_recover_masters(ls, rv-&gt;seq, &amp;root_list);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			log_rinfo(ls, "dlm_recover_masters error %d", error);</div><div class='del'>-			goto fail;</div><div class='add'>+			goto fail_root_list;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Send our locks on remastered rsb's to the new masters.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		error = dlm_recover_locks(ls, rv-&gt;seq);</div><div class='add'>+		error = dlm_recover_locks(ls, rv-&gt;seq, &amp;root_list);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			log_rinfo(ls, "dlm_recover_locks error %d", error);</div><div class='del'>-			goto fail;</div><div class='add'>+			goto fail_root_list;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dlm_set_recover_status(ls, DLM_RS_LOCKS);</div><div class='hunk'>@@ -166,7 +255,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 		error = dlm_recover_locks_wait(ls, rv-&gt;seq);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			log_rinfo(ls, "dlm_recover_locks_wait error %d", error);</div><div class='del'>-			goto fail;</div><div class='add'>+			goto fail_root_list;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		log_rinfo(ls, "dlm_recover_locks %u in",</div><div class='hunk'>@@ -178,7 +267,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 		 * settings.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		dlm_recover_rsbs(ls);</div><div class='add'>+		dlm_recover_rsbs(ls, &amp;root_list);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Other lockspace members may be going through the "neg" steps</div><div class='hunk'>@@ -190,11 +279,11 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> 		error = dlm_recover_locks_wait(ls, rv-&gt;seq);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			log_rinfo(ls, "dlm_recover_locks_wait error %d", error);</div><div class='del'>-			goto fail;</div><div class='add'>+			goto fail_root_list;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dlm_release_root_list(ls);</div><div class='add'>+	dlm_release_root_list(&amp;root_list);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Purge directory-related requests that are saved in requestqueue.</div><div class='hunk'>@@ -243,8 +332,9 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ fail_root_list:</div><div class='add'>+	dlm_release_root_list(&amp;root_list);</div><div class='ctx'>  fail:</div><div class='del'>-	dlm_release_root_list(ls);</div><div class='ctx'> 	mutex_unlock(&amp;ls-&gt;ls_recoverd_active);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -259,12 +349,12 @@ static void do_ls_recovery(struct dlm_ls *ls)</div><div class='ctx'> 	struct dlm_recover *rv = NULL;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> 	rv = ls-&gt;ls_recover_args;</div><div class='ctx'> 	ls-&gt;ls_recover_args = NULL;</div><div class='ctx'> 	if (rv &amp;&amp; ls-&gt;ls_recover_seq == rv-&gt;seq)</div><div class='ctx'> 		clear_bit(LSFL_RECOVER_STOP, &amp;ls-&gt;ls_flags);</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_recover_lock);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_recover_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		error = ls_recover(ls, rv);</div><div class='head'>diff --git a/fs/dlm/requestqueue.c b/fs/dlm/requestqueue.c<br/>index 892d6ca21e74..719a5243a069 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/requestqueue.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/requestqueue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/requestqueue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/requestqueue.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@ void dlm_add_requestqueue(struct dlm_ls *ls, int nodeid,</div><div class='ctx'> 	int length = le16_to_cpu(ms-&gt;m_header.h_length) -</div><div class='ctx'> 		sizeof(struct dlm_message);</div><div class='ctx'> </div><div class='del'>-	e = kmalloc(sizeof(struct rq_entry) + length, GFP_NOFS);</div><div class='add'>+	e = kmalloc(sizeof(struct rq_entry) + length, GFP_ATOMIC);</div><div class='ctx'> 	if (!e) {</div><div class='ctx'> 		log_print("dlm_add_requestqueue: out of memory len %d", length);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -48,10 +48,7 @@ void dlm_add_requestqueue(struct dlm_ls *ls, int nodeid,</div><div class='ctx'> 	memcpy(&amp;e-&gt;request, ms, sizeof(*ms));</div><div class='ctx'> 	memcpy(&amp;e-&gt;request.m_extra, ms-&gt;m_extra, length);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;ls-&gt;ls_requestqueue_cnt);</div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='ctx'> 	list_add_tail(&amp;e-&gt;list, &amp;ls-&gt;ls_requestqueue);</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -71,16 +68,14 @@ int dlm_process_requestqueue(struct dlm_ls *ls)</div><div class='ctx'> 	struct dlm_message *ms;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='del'>-</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (list_empty(&amp;ls-&gt;ls_requestqueue)) {</div><div class='del'>-			mutex_unlock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='add'>+			clear_bit(LSFL_RECV_MSG_BLOCKED, &amp;ls-&gt;ls_flags);</div><div class='ctx'> 			error = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		e = list_entry(ls-&gt;ls_requestqueue.next, struct rq_entry, list);</div><div class='del'>-		mutex_unlock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='add'>+		e = list_first_entry(&amp;ls-&gt;ls_requestqueue, struct rq_entry, list);</div><div class='ctx'> </div><div class='ctx'> 		ms = &amp;e-&gt;request;</div><div class='ctx'> </div><div class='hunk'>@@ -93,41 +88,23 @@ int dlm_process_requestqueue(struct dlm_ls *ls)</div><div class='ctx'> 			  e-&gt;recover_seq);</div><div class='ctx'> </div><div class='ctx'> 		dlm_receive_message_saved(ls, &amp;e-&gt;request, e-&gt;recover_seq);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='ctx'> 		list_del(&amp;e-&gt;list);</div><div class='del'>-		if (atomic_dec_and_test(&amp;ls-&gt;ls_requestqueue_cnt))</div><div class='del'>-			wake_up(&amp;ls-&gt;ls_requestqueue_wait);</div><div class='ctx'> 		kfree(e);</div><div class='ctx'> </div><div class='ctx'> 		if (dlm_locking_stopped(ls)) {</div><div class='ctx'> 			log_debug(ls, "process_requestqueue abort running");</div><div class='del'>-			mutex_unlock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='ctx'> 			error = -EINTR;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		write_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 		schedule();</div><div class='add'>+		write_lock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 	}</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * After recovery is done, locking is resumed and dlm_recoverd takes all the</div><div class='del'>- * saved requests and processes them as they would have been by dlm_recv.  At</div><div class='del'>- * the same time, dlm_recv will start receiving new requests from remote nodes.</div><div class='del'>- * We want to delay dlm_recv processing new requests until dlm_recoverd has</div><div class='del'>- * finished processing the old saved requests.  We don't check for locking</div><div class='del'>- * stopped here because dlm_ls_stop won't stop locking until it's suspended us</div><div class='del'>- * (dlm_recv).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void dlm_wait_requestqueue(struct dlm_ls *ls)</div><div class='del'>-{</div><div class='del'>-	wait_event(ls-&gt;ls_requestqueue_wait,</div><div class='del'>-		   atomic_read(&amp;ls-&gt;ls_requestqueue_cnt) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int purge_request(struct dlm_ls *ls, struct dlm_message *ms, int nodeid)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 type = ms-&gt;m_type;</div><div class='hunk'>@@ -158,17 +135,15 @@ void dlm_purge_requestqueue(struct dlm_ls *ls)</div><div class='ctx'> 	struct dlm_message *ms;</div><div class='ctx'> 	struct rq_entry *e, *safe;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='add'>+	write_lock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> 	list_for_each_entry_safe(e, safe, &amp;ls-&gt;ls_requestqueue, list) {</div><div class='ctx'> 		ms =  &amp;e-&gt;request;</div><div class='ctx'> </div><div class='ctx'> 		if (purge_request(ls, ms, e-&gt;nodeid)) {</div><div class='ctx'> 			list_del(&amp;e-&gt;list);</div><div class='del'>-			if (atomic_dec_and_test(&amp;ls-&gt;ls_requestqueue_cnt))</div><div class='del'>-				wake_up(&amp;ls-&gt;ls_requestqueue_wait);</div><div class='ctx'> 			kfree(e);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_requestqueue_mutex);</div><div class='add'>+	write_unlock_bh(&amp;ls-&gt;ls_requestqueue_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/dlm/user.c b/fs/dlm/user.c<br/>index 695e691b38b3..51daf4acbe31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/dlm/user.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/dlm/user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/dlm/user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/dlm/user.c</a></div><div class='hunk'>@@ -145,24 +145,6 @@ static void compat_output(struct dlm_lock_result *res,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* should held proc-&gt;asts_spin lock */</div><div class='del'>-void dlm_purge_lkb_callbacks(struct dlm_lkb *lkb)</div><div class='del'>-{</div><div class='del'>-	struct dlm_callback *cb, *safe;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(cb, safe, &amp;lkb-&gt;lkb_callbacks, list) {</div><div class='del'>-		list_del(&amp;cb-&gt;list);</div><div class='del'>-		kref_put(&amp;cb-&gt;ref, dlm_release_callback);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_bit(DLM_IFL_CB_PENDING_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='del'>-</div><div class='del'>-	/* invalidate */</div><div class='del'>-	dlm_callback_set_last_ptr(&amp;lkb-&gt;lkb_last_cast, NULL);</div><div class='del'>-	dlm_callback_set_last_ptr(&amp;lkb-&gt;lkb_last_cb, NULL);</div><div class='del'>-	lkb-&gt;lkb_last_bast_mode = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Figure out if this lock is at the end of its life and no longer</div><div class='ctx'>    available for the application to use.  The lkb still exists until</div><div class='ctx'>    the final ast is read.  A lock becomes EOL in three situations:</div><div class='hunk'>@@ -199,14 +181,15 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='ctx'> 	struct dlm_user_args *ua;</div><div class='ctx'> 	struct dlm_user_proc *proc;</div><div class='del'>-	int rv;</div><div class='add'>+	struct dlm_callback *cb;</div><div class='add'>+	int rv, copy_lvb;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DLM_DFL_ORPHAN_BIT, &amp;lkb-&gt;lkb_dflags) ||</div><div class='ctx'> 	    test_bit(DLM_IFL_DEAD_BIT, &amp;lkb-&gt;lkb_iflags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ls = lkb-&gt;lkb_resource-&gt;res_ls;</div><div class='del'>-	spin_lock(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='add'>+	spin_lock_bh(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> </div><div class='ctx'> 	/* If ORPHAN/DEAD flag is set, it means the process is dead so an ast</div><div class='ctx'> 	   can't be delivered.  For ORPHAN's, dlm_clear_proc_locks() freed</div><div class='hunk'>@@ -228,38 +211,38 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,</div><div class='ctx'> 	if ((flags &amp; DLM_CB_CAST) &amp;&amp; lkb_is_endoflife(mode, status))</div><div class='ctx'> 		set_bit(DLM_IFL_ENDOFLIFE_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;proc-&gt;asts_spin);</div><div class='del'>-</div><div class='del'>-	rv = dlm_enqueue_lkb_callback(lkb, flags, mode, status, sbflags);</div><div class='del'>-	switch (rv) {</div><div class='del'>-	case DLM_ENQUEUE_CALLBACK_FAILURE:</div><div class='del'>-		spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		goto out;</div><div class='del'>-	case DLM_ENQUEUE_CALLBACK_NEED_SCHED:</div><div class='del'>-		kref_get(&amp;lkb-&gt;lkb_ref);</div><div class='del'>-		list_add_tail(&amp;lkb-&gt;lkb_cb_list, &amp;proc-&gt;asts);</div><div class='del'>-		wake_up_interruptible(&amp;proc-&gt;wait);</div><div class='del'>-		break;</div><div class='del'>-	case DLM_ENQUEUE_CALLBACK_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		break;</div><div class='add'>+	spin_lock_bh(&amp;proc-&gt;asts_spin);</div><div class='add'>+</div><div class='add'>+	if (!dlm_may_skip_callback(lkb, flags, mode, status, sbflags,</div><div class='add'>+				   &amp;copy_lvb)) {</div><div class='add'>+		rv = dlm_get_cb(lkb, flags, mode, status, sbflags, &amp;cb);</div><div class='add'>+		if (!rv) {</div><div class='add'>+			cb-&gt;copy_lvb = copy_lvb;</div><div class='add'>+			cb-&gt;ua = *ua;</div><div class='add'>+			cb-&gt;lkb_lksb = &amp;cb-&gt;ua.lksb;</div><div class='add'>+			if (copy_lvb) {</div><div class='add'>+				memcpy(cb-&gt;lvbptr, ua-&gt;lksb.sb_lvbptr,</div><div class='add'>+				       DLM_USER_LVB_LEN);</div><div class='add'>+				cb-&gt;lkb_lksb-&gt;sb_lvbptr = cb-&gt;lvbptr;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			list_add_tail(&amp;cb-&gt;list, &amp;proc-&gt;asts);</div><div class='add'>+			wake_up_interruptible(&amp;proc-&gt;wait);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+	spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DLM_IFL_ENDOFLIFE_BIT, &amp;lkb-&gt;lkb_iflags)) {</div><div class='ctx'> 		/* N.B. spin_lock locks_spin, not asts_spin */</div><div class='del'>-		spin_lock(&amp;proc-&gt;locks_spin);</div><div class='add'>+		spin_lock_bh(&amp;proc-&gt;locks_spin);</div><div class='ctx'> 		if (!list_empty(&amp;lkb-&gt;lkb_ownqueue)) {</div><div class='ctx'> 			list_del_init(&amp;lkb-&gt;lkb_ownqueue);</div><div class='ctx'> 			dlm_put_lkb(lkb);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;proc-&gt;locks_spin);</div><div class='add'>+		spin_unlock_bh(&amp;proc-&gt;locks_spin);</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='del'>-	spin_unlock(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='add'>+	spin_unlock_bh(&amp;ls-&gt;ls_clear_proc_locks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int device_user_lock(struct dlm_user_proc *proc,</div><div class='hunk'>@@ -442,7 +425,7 @@ static int device_create_lockspace(struct dlm_lspace_params *params)</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='del'>-		dlm_release_lockspace(lockspace, 0);</div><div class='add'>+		dlm_release_lockspace(lockspace, DLM_RELEASE_NO_LOCKS);</div><div class='ctx'> 	else</div><div class='ctx'> 		error = ls-&gt;ls_device.minor;</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +436,7 @@ static int device_remove_lockspace(struct dlm_lspace_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	dlm_lockspace_t *lockspace;</div><div class='ctx'> 	struct dlm_ls *ls;</div><div class='del'>-	int error, force = 0;</div><div class='add'>+	int error, force = DLM_RELEASE_NO_LOCKS;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -463,9 +446,9 @@ static int device_remove_lockspace(struct dlm_lspace_params *params)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;flags &amp; DLM_USER_LSFLG_FORCEFREE)</div><div class='del'>-		force = 2;</div><div class='add'>+		force = DLM_RELEASE_NORMAL;</div><div class='ctx'> </div><div class='del'>-	lockspace = ls-&gt;ls_local_handle;</div><div class='add'>+	lockspace = ls;</div><div class='ctx'> 	dlm_put_lockspace(ls);</div><div class='ctx'> </div><div class='ctx'> 	/* The final dlm_release_lockspace waits for references to go to</div><div class='hunk'>@@ -668,7 +651,7 @@ static int device_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	proc-&gt;lockspace = ls-&gt;ls_local_handle;</div><div class='add'>+	proc-&gt;lockspace = ls;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;proc-&gt;asts);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;proc-&gt;locks);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;proc-&gt;unlocking);</div><div class='hunk'>@@ -803,11 +786,9 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 			   loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_user_proc *proc = file-&gt;private_data;</div><div class='del'>-	struct dlm_lkb *lkb;</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 	struct dlm_callback *cb;</div><div class='del'>-	int rv, copy_lvb = 0;</div><div class='del'>-	int old_mode, new_mode;</div><div class='add'>+	int rv, ret;</div><div class='ctx'> </div><div class='ctx'> 	if (count == sizeof(struct dlm_device_version)) {</div><div class='ctx'> 		rv = copy_version_to_user(buf, count);</div><div class='hunk'>@@ -826,16 +807,14 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> #endif</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>- try_another:</div><div class='del'>-</div><div class='ctx'> 	/* do we really need this? can a read happen after a close? */</div><div class='ctx'> 	if (test_bit(DLM_PROC_FLAGS_CLOSING, &amp;proc-&gt;flags))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;proc-&gt;asts_spin);</div><div class='add'>+	spin_lock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 	if (list_empty(&amp;proc-&gt;asts)) {</div><div class='ctx'> 		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-			spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+			spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -844,16 +823,16 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 	repeat:</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		if (list_empty(&amp;proc-&gt;asts) &amp;&amp; !signal_pending(current)) {</div><div class='del'>-			spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+			spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 			schedule();</div><div class='del'>-			spin_lock(&amp;proc-&gt;asts_spin);</div><div class='add'>+			spin_lock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		remove_wait_queue(&amp;proc-&gt;wait, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='del'>-			spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+			spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 			return -ERESTARTSYS;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -862,61 +841,25 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 	   without removing lkb_cb_list; so empty lkb_cb_list is always</div><div class='ctx'> 	   consistent with empty lkb_callbacks */</div><div class='ctx'> </div><div class='del'>-	lkb = list_first_entry(&amp;proc-&gt;asts, struct dlm_lkb, lkb_cb_list);</div><div class='del'>-</div><div class='del'>-	/* rem_lkb_callback sets a new lkb_last_cast */</div><div class='del'>-	old_mode = lkb-&gt;lkb_last_cast-&gt;mode;</div><div class='del'>-</div><div class='del'>-	rv = dlm_dequeue_lkb_callback(lkb, &amp;cb);</div><div class='del'>-	switch (rv) {</div><div class='del'>-	case DLM_DEQUEUE_CALLBACK_EMPTY:</div><div class='del'>-		/* this shouldn't happen; lkb should have been removed from</div><div class='del'>-		 * list when last item was dequeued</div><div class='del'>-		 */</div><div class='del'>-		log_print("dlm_rem_lkb_callback empty %x", lkb-&gt;lkb_id);</div><div class='del'>-		list_del_init(&amp;lkb-&gt;lkb_cb_list);</div><div class='del'>-		spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='del'>-		/* removes ref for proc-&gt;asts, may cause lkb to be freed */</div><div class='del'>-		dlm_put_lkb(lkb);</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		goto try_another;</div><div class='del'>-	case DLM_DEQUEUE_CALLBACK_LAST:</div><div class='del'>-		list_del_init(&amp;lkb-&gt;lkb_cb_list);</div><div class='del'>-		clear_bit(DLM_IFL_CB_PENDING_BIT, &amp;lkb-&gt;lkb_iflags);</div><div class='del'>-		break;</div><div class='del'>-	case DLM_DEQUEUE_CALLBACK_SUCCESS:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+	cb = list_first_entry(&amp;proc-&gt;asts, struct dlm_callback, list);</div><div class='add'>+	list_del(&amp;cb-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> </div><div class='ctx'> 	if (cb-&gt;flags &amp; DLM_CB_BAST) {</div><div class='del'>-		trace_dlm_bast(lkb-&gt;lkb_resource-&gt;res_ls, lkb, cb-&gt;mode);</div><div class='add'>+		trace_dlm_bast(cb-&gt;ls_id, cb-&gt;lkb_id, cb-&gt;mode, cb-&gt;res_name,</div><div class='add'>+			       cb-&gt;res_length);</div><div class='ctx'> 	} else if (cb-&gt;flags &amp; DLM_CB_CAST) {</div><div class='del'>-		new_mode = cb-&gt;mode;</div><div class='del'>-</div><div class='del'>-		if (!cb-&gt;sb_status &amp;&amp; lkb-&gt;lkb_lksb-&gt;sb_lvbptr &amp;&amp;</div><div class='del'>-		    dlm_lvb_operations[old_mode + 1][new_mode + 1])</div><div class='del'>-			copy_lvb = 1;</div><div class='del'>-</div><div class='del'>-		lkb-&gt;lkb_lksb-&gt;sb_status = cb-&gt;sb_status;</div><div class='del'>-		lkb-&gt;lkb_lksb-&gt;sb_flags = cb-&gt;sb_flags;</div><div class='del'>-		trace_dlm_ast(lkb-&gt;lkb_resource-&gt;res_ls, lkb);</div><div class='add'>+		cb-&gt;lkb_lksb-&gt;sb_status = cb-&gt;sb_status;</div><div class='add'>+		cb-&gt;lkb_lksb-&gt;sb_flags = cb-&gt;sb_flags;</div><div class='add'>+		trace_dlm_ast(cb-&gt;ls_id, cb-&gt;lkb_id, cb-&gt;sb_status,</div><div class='add'>+			      cb-&gt;sb_flags, cb-&gt;res_name, cb-&gt;res_length);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rv = copy_result_to_user(lkb-&gt;lkb_ua,</div><div class='del'>-				 test_bit(DLM_PROC_FLAGS_COMPAT, &amp;proc-&gt;flags),</div><div class='del'>-				 cb-&gt;flags, cb-&gt;mode, copy_lvb, buf, count);</div><div class='del'>-</div><div class='del'>-	kref_put(&amp;cb-&gt;ref, dlm_release_callback);</div><div class='del'>-</div><div class='del'>-	/* removes ref for proc-&gt;asts, may cause lkb to be freed */</div><div class='del'>-	if (rv == DLM_DEQUEUE_CALLBACK_LAST)</div><div class='del'>-		dlm_put_lkb(lkb);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='add'>+	ret = copy_result_to_user(&amp;cb-&gt;ua,</div><div class='add'>+				  test_bit(DLM_PROC_FLAGS_COMPAT, &amp;proc-&gt;flags),</div><div class='add'>+				  cb-&gt;flags, cb-&gt;mode, cb-&gt;copy_lvb, buf, count);</div><div class='add'>+	dlm_free_cb(cb);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __poll_t device_poll(struct file *file, poll_table *wait)</div><div class='hunk'>@@ -925,12 +868,12 @@ static __poll_t device_poll(struct file *file, poll_table *wait)</div><div class='ctx'> </div><div class='ctx'> 	poll_wait(file, &amp;proc-&gt;wait, wait);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;proc-&gt;asts_spin);</div><div class='add'>+	spin_lock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 	if (!list_empty(&amp;proc-&gt;asts)) {</div><div class='del'>-		spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+		spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 		return EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;proc-&gt;asts_spin);</div><div class='add'>+	spin_unlock_bh(&amp;proc-&gt;asts_spin);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/drop_caches.c b/fs/drop_caches.c<br/>index b9575957a7c2..49f56a598ecb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/drop_caches.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/drop_caches.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/drop_caches.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/drop_caches.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /* A global variable is a bit ugly, but it keeps the code simple */</div><div class='del'>-int sysctl_drop_caches;</div><div class='add'>+static int sysctl_drop_caches;</div><div class='ctx'> </div><div class='ctx'> static void drop_pagecache_sb(struct super_block *sb, void *unused)</div><div class='ctx'> {</div><div class='hunk'>@@ -28,7 +28,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused)</div><div class='ctx'> 		 * inodes without pages but we deliberately won't in case</div><div class='ctx'> 		 * we need to reschedule to avoid softlockups.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE|I_NEW)) ||</div><div class='add'>+		if ((inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) ||</div><div class='ctx'> 		    (mapping_empty(inode-&gt;i_mapping) &amp;&amp; !need_resched())) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -48,7 +48,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused)</div><div class='ctx'> 	iput(toput_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int drop_caches_sysctl_handler(struct ctl_table *table, int write,</div><div class='add'>+static int drop_caches_sysctl_handler(const struct ctl_table *table, int write,</div><div class='ctx'> 		void *buffer, size_t *length, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -77,3 +77,22 @@ int drop_caches_sysctl_handler(struct ctl_table *table, int write,</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static const struct ctl_table drop_caches_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.procname	= "drop_caches",</div><div class='add'>+		.data		= &amp;sysctl_drop_caches,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0200,</div><div class='add'>+		.proc_handler	= drop_caches_sysctl_handler,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= SYSCTL_FOUR,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_vm_drop_caches_sysctls(void)</div><div class='add'>+{</div><div class='add'>+	register_sysctl_init("vm", drop_caches_table);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+fs_initcall(init_vm_drop_caches_sysctls);</div><div class='head'>diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig<br/>index 1bdeaa6d5790..c2f4fb41b4e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,7 @@ config ECRYPT_FS</div><div class='ctx'> 	depends on KEYS &amp;&amp; CRYPTO &amp;&amp; (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)</div><div class='ctx'> 	select CRYPTO_ECB</div><div class='ctx'> 	select CRYPTO_CBC</div><div class='del'>-	select CRYPTO_MD5</div><div class='add'>+	select CRYPTO_LIB_MD5</div><div class='ctx'> 	help</div><div class='ctx'> 	  Encrypted filesystem that operates on the VFS layer.  See</div><div class='ctx'> 	  &lt;file:Documentation/filesystems/ecryptfs.rst&gt; to learn more about</div><div class='head'>diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c<br/>index 03bd55069d86..260f8a4938b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/crypto.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/crypto.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/crypto.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *   		Michael C. Thompson &lt;mcthomps@us.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -21,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> #include "ecryptfs_kernel.h"</div><div class='hunk'>@@ -48,32 +47,6 @@ void ecryptfs_from_hex(char *dst, char *src, int dst_size)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * ecryptfs_calculate_md5 - calculates the md5 of @src</div><div class='del'>- * @dst: Pointer to 16 bytes of allocated memory</div><div class='del'>- * @crypt_stat: Pointer to crypt_stat struct for the current inode</div><div class='del'>- * @src: Data to be md5'd</div><div class='del'>- * @len: Length of @src</div><div class='del'>- *</div><div class='del'>- * Uses the allocated crypto context that crypt_stat references to</div><div class='del'>- * generate the MD5 sum of the contents of src.</div><div class='del'>- */</div><div class='del'>-static int ecryptfs_calculate_md5(char *dst,</div><div class='del'>-				  struct ecryptfs_crypt_stat *crypt_stat,</div><div class='del'>-				  char *src, int len)</div><div class='del'>-{</div><div class='del'>-	int rc = crypto_shash_tfm_digest(crypt_stat-&gt;hash_tfm, src, len, dst);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: Error computing crypto hash; rc = [%d]\n",</div><div class='del'>-		       __func__, rc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,</div><div class='ctx'> 						  char *cipher_name,</div><div class='ctx'> 						  char *chaining_modifier)</div><div class='hunk'>@@ -104,13 +77,10 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Generate the initialization vector from the given root IV and page</div><div class='ctx'>  * offset.</div><div class='del'>- *</div><div class='del'>- * Returns zero on success; non-zero on error.</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,</div><div class='del'>-		       loff_t offset)</div><div class='add'>+void ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,</div><div class='add'>+			loff_t offset)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	char dst[MD5_DIGEST_SIZE];</div><div class='ctx'> 	char src[ECRYPTFS_MAX_IV_BYTES + 16];</div><div class='ctx'> </div><div class='hunk'>@@ -129,20 +99,12 @@ int ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,</div><div class='ctx'> 		ecryptfs_printk(KERN_DEBUG, "source:\n");</div><div class='ctx'> 		ecryptfs_dump_hex(src, (crypt_stat-&gt;iv_bytes + 16));</div><div class='ctx'> 	}</div><div class='del'>-	rc = ecryptfs_calculate_md5(dst, crypt_stat, src,</div><div class='del'>-				    (crypt_stat-&gt;iv_bytes + 16));</div><div class='del'>-	if (rc) {</div><div class='del'>-		ecryptfs_printk(KERN_WARNING, "Error attempting to compute "</div><div class='del'>-				"MD5 while generating IV for a page\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	md5(src, crypt_stat-&gt;iv_bytes + 16, dst);</div><div class='ctx'> 	memcpy(iv, dst, crypt_stat-&gt;iv_bytes);</div><div class='ctx'> 	if (unlikely(ecryptfs_verbosity &gt; 0)) {</div><div class='ctx'> 		ecryptfs_printk(KERN_DEBUG, "derived iv:\n");</div><div class='ctx'> 		ecryptfs_dump_hex(iv, crypt_stat-&gt;iv_bytes);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -151,29 +113,14 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Initialize the crypt_stat structure.</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat)</div><div class='add'>+void ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_shash *tfm;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	tfm = crypto_alloc_shash(ECRYPTFS_DEFAULT_HASH, 0, 0);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		rc = PTR_ERR(tfm);</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Error attempting to "</div><div class='del'>-				"allocate crypto context; rc = [%d]\n",</div><div class='del'>-				rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	memset((void *)crypt_stat, 0, sizeof(struct ecryptfs_crypt_stat));</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;crypt_stat-&gt;keysig_list);</div><div class='ctx'> 	mutex_init(&amp;crypt_stat-&gt;keysig_list_mutex);</div><div class='ctx'> 	mutex_init(&amp;crypt_stat-&gt;cs_mutex);</div><div class='ctx'> 	mutex_init(&amp;crypt_stat-&gt;cs_tfm_mutex);</div><div class='del'>-	crypt_stat-&gt;hash_tfm = tfm;</div><div class='ctx'> 	crypt_stat-&gt;flags |= ECRYPTFS_STRUCT_INITIALIZED;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -187,7 +134,6 @@ void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat)</div><div class='ctx'> 	struct ecryptfs_key_sig *key_sig, *key_sig_tmp;</div><div class='ctx'> </div><div class='ctx'> 	crypto_free_skcipher(crypt_stat-&gt;tfm);</div><div class='del'>-	crypto_free_shash(crypt_stat-&gt;hash_tfm);</div><div class='ctx'> 	list_for_each_entry_safe(key_sig, key_sig_tmp,</div><div class='ctx'> 				 &amp;crypt_stat-&gt;keysig_list, crypt_stat_list) {</div><div class='ctx'> 		list_del(&amp;key_sig-&gt;crypt_stat_list);</div><div class='hunk'>@@ -328,10 +274,10 @@ out:</div><div class='ctx'>  * Convert an eCryptfs page index into a lower byte offset</div><div class='ctx'>  */</div><div class='ctx'> static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,</div><div class='del'>-				    struct page *page)</div><div class='add'>+				    struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return ecryptfs_lower_header_size(crypt_stat) +</div><div class='del'>-	       ((loff_t)page-&gt;index &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	       (loff_t)folio-&gt;index * PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -340,6 +286,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,</div><div class='ctx'>  *              encryption operation</div><div class='ctx'>  * @dst_page: The page to write the result into</div><div class='ctx'>  * @src_page: The page to read from</div><div class='add'>+ * @page_index: The offset in the file (in units of PAGE_SIZE)</div><div class='ctx'>  * @extent_offset: Page extent offset for use in generating IV</div><div class='ctx'>  * @op: ENCRYPT or DECRYPT to indicate the desired operation</div><div class='ctx'>  *</div><div class='hunk'>@@ -350,9 +297,9 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,</div><div class='ctx'> static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat,</div><div class='ctx'> 			struct page *dst_page,</div><div class='ctx'> 			struct page *src_page,</div><div class='add'>+			pgoff_t page_index,</div><div class='ctx'> 			unsigned long extent_offset, int op)</div><div class='ctx'> {</div><div class='del'>-	pgoff_t page_index = op == ENCRYPT ? src_page-&gt;index : dst_page-&gt;index;</div><div class='ctx'> 	loff_t extent_base;</div><div class='ctx'> 	char extent_iv[ECRYPTFS_MAX_IV_BYTES];</div><div class='ctx'> 	struct scatterlist src_sg, dst_sg;</div><div class='hunk'>@@ -360,14 +307,7 @@ static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	extent_base = (((loff_t)page_index) * (PAGE_SIZE / extent_size));</div><div class='del'>-	rc = ecryptfs_derive_iv(extent_iv, crypt_stat,</div><div class='del'>-				(extent_base + extent_offset));</div><div class='del'>-	if (rc) {</div><div class='del'>-		ecryptfs_printk(KERN_ERR, "Error attempting to derive IV for "</div><div class='del'>-			"extent [0x%.16llx]; rc = [%d]\n",</div><div class='del'>-			(unsigned long long)(extent_base + extent_offset), rc);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	ecryptfs_derive_iv(extent_iv, crypt_stat, extent_base + extent_offset);</div><div class='ctx'> </div><div class='ctx'> 	sg_init_table(&amp;src_sg, 1);</div><div class='ctx'> 	sg_init_table(&amp;dst_sg, 1);</div><div class='hunk'>@@ -392,7 +332,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_encrypt_page</div><div class='del'>- * @page: Page mapped from the eCryptfs inode for the file; contains</div><div class='add'>+ * @folio: Folio mapped from the eCryptfs inode for the file; contains</div><div class='ctx'>  *        decrypted content that needs to be encrypted (to a temporary</div><div class='ctx'>  *        page; not in place) and written out to the lower file</div><div class='ctx'>  *</div><div class='hunk'>@@ -406,7 +346,7 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; negative on error</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_encrypt_page(struct page *page)</div><div class='add'>+int ecryptfs_encrypt_page(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ecryptfs_inode;</div><div class='ctx'> 	struct ecryptfs_crypt_stat *crypt_stat;</div><div class='hunk'>@@ -416,7 +356,7 @@ int ecryptfs_encrypt_page(struct page *page)</div><div class='ctx'> 	loff_t lower_offset;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	ecryptfs_inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	ecryptfs_inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	crypt_stat =</div><div class='ctx'> 		&amp;(ecryptfs_inode_to_private(ecryptfs_inode)-&gt;crypt_stat);</div><div class='ctx'> 	BUG_ON(!(crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED));</div><div class='hunk'>@@ -431,8 +371,9 @@ int ecryptfs_encrypt_page(struct page *page)</div><div class='ctx'> 	for (extent_offset = 0;</div><div class='ctx'> 	     extent_offset &lt; (PAGE_SIZE / crypt_stat-&gt;extent_size);</div><div class='ctx'> 	     extent_offset++) {</div><div class='del'>-		rc = crypt_extent(crypt_stat, enc_extent_page, page,</div><div class='del'>-				  extent_offset, ENCRYPT);</div><div class='add'>+		rc = crypt_extent(crypt_stat, enc_extent_page,</div><div class='add'>+				folio_page(folio, 0), folio-&gt;index,</div><div class='add'>+				extent_offset, ENCRYPT);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Error encrypting extent; "</div><div class='ctx'> 			       "rc = [%d]\n", __func__, rc);</div><div class='hunk'>@@ -440,7 +381,7 @@ int ecryptfs_encrypt_page(struct page *page)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lower_offset = lower_offset_for_page(crypt_stat, page);</div><div class='add'>+	lower_offset = lower_offset_for_page(crypt_stat, folio);</div><div class='ctx'> 	enc_extent_virt = kmap_local_page(enc_extent_page);</div><div class='ctx'> 	rc = ecryptfs_write_lower(ecryptfs_inode, enc_extent_virt, lower_offset,</div><div class='ctx'> 				  PAGE_SIZE);</div><div class='hunk'>@@ -461,7 +402,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_decrypt_page</div><div class='del'>- * @page: Page mapped from the eCryptfs inode for the file; data read</div><div class='add'>+ * @folio: Folio mapped from the eCryptfs inode for the file; data read</div><div class='ctx'>  *        and decrypted from the lower file will be written into this</div><div class='ctx'>  *        page</div><div class='ctx'>  *</div><div class='hunk'>@@ -475,7 +416,7 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; negative on error</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_decrypt_page(struct page *page)</div><div class='add'>+int ecryptfs_decrypt_page(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ecryptfs_inode;</div><div class='ctx'> 	struct ecryptfs_crypt_stat *crypt_stat;</div><div class='hunk'>@@ -484,13 +425,13 @@ int ecryptfs_decrypt_page(struct page *page)</div><div class='ctx'> 	loff_t lower_offset;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	ecryptfs_inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	ecryptfs_inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	crypt_stat =</div><div class='ctx'> 		&amp;(ecryptfs_inode_to_private(ecryptfs_inode)-&gt;crypt_stat);</div><div class='ctx'> 	BUG_ON(!(crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED));</div><div class='ctx'> </div><div class='del'>-	lower_offset = lower_offset_for_page(crypt_stat, page);</div><div class='del'>-	page_virt = kmap_local_page(page);</div><div class='add'>+	lower_offset = lower_offset_for_page(crypt_stat, folio);</div><div class='add'>+	page_virt = kmap_local_folio(folio, 0);</div><div class='ctx'> 	rc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_SIZE,</div><div class='ctx'> 				 ecryptfs_inode);</div><div class='ctx'> 	kunmap_local(page_virt);</div><div class='hunk'>@@ -504,8 +445,9 @@ int ecryptfs_decrypt_page(struct page *page)</div><div class='ctx'> 	for (extent_offset = 0;</div><div class='ctx'> 	     extent_offset &lt; (PAGE_SIZE / crypt_stat-&gt;extent_size);</div><div class='ctx'> 	     extent_offset++) {</div><div class='del'>-		rc = crypt_extent(crypt_stat, page, page,</div><div class='del'>-				  extent_offset, DECRYPT);</div><div class='add'>+		struct page *page = folio_page(folio, 0);</div><div class='add'>+		rc = crypt_extent(crypt_stat, page, page, folio-&gt;index,</div><div class='add'>+				extent_offset, DECRYPT);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Error decrypting extent; "</div><div class='ctx'> 			       "rc = [%d]\n", __func__, rc);</div><div class='hunk'>@@ -606,31 +548,20 @@ void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat)</div><div class='ctx'>  */</div><div class='ctx'> int ecryptfs_compute_root_iv(struct ecryptfs_crypt_stat *crypt_stat)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	char dst[MD5_DIGEST_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(crypt_stat-&gt;iv_bytes &gt; MD5_DIGEST_SIZE);</div><div class='ctx'> 	BUG_ON(crypt_stat-&gt;iv_bytes &lt;= 0);</div><div class='ctx'> 	if (!(crypt_stat-&gt;flags &amp; ECRYPTFS_KEY_VALID)) {</div><div class='del'>-		rc = -EINVAL;</div><div class='ctx'> 		ecryptfs_printk(KERN_WARNING, "Session key not valid; "</div><div class='ctx'> 				"cannot generate root IV\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	rc = ecryptfs_calculate_md5(dst, crypt_stat, crypt_stat-&gt;key,</div><div class='del'>-				    crypt_stat-&gt;key_size);</div><div class='del'>-	if (rc) {</div><div class='del'>-		ecryptfs_printk(KERN_WARNING, "Error attempting to compute "</div><div class='del'>-				"MD5 while generating root IV\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	memcpy(crypt_stat-&gt;root_iv, dst, crypt_stat-&gt;iv_bytes);</div><div class='del'>-out:</div><div class='del'>-	if (rc) {</div><div class='ctx'> 		memset(crypt_stat-&gt;root_iv, 0, crypt_stat-&gt;iv_bytes);</div><div class='ctx'> 		crypt_stat-&gt;flags |= ECRYPTFS_SECURITY_WARNING;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='add'>+	md5(crypt_stat-&gt;key, crypt_stat-&gt;key_size, dst);</div><div class='add'>+	memcpy(crypt_stat-&gt;root_iv, dst, crypt_stat-&gt;iv_bytes);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ecryptfs_generate_new_key(struct ecryptfs_crypt_stat *crypt_stat)</div><div class='hunk'>@@ -1606,9 +1537,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_init(&amp;tmp_tfm-&gt;key_tfm_mutex);</div><div class='del'>-	strncpy(tmp_tfm-&gt;cipher_name, cipher_name,</div><div class='del'>-		ECRYPTFS_MAX_CIPHER_NAME_SIZE);</div><div class='del'>-	tmp_tfm-&gt;cipher_name[ECRYPTFS_MAX_CIPHER_NAME_SIZE] = '\0';</div><div class='add'>+	strscpy(tmp_tfm-&gt;cipher_name, cipher_name);</div><div class='ctx'> 	tmp_tfm-&gt;key_size = key_size;</div><div class='ctx'> 	rc = ecryptfs_process_key_cipher(&amp;tmp_tfm-&gt;key_tfm,</div><div class='ctx'> 					 tmp_tfm-&gt;cipher_name,</div><div class='hunk'>@@ -1949,16 +1878,6 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool is_dot_dotdot(const char *name, size_t name_size)</div><div class='del'>-{</div><div class='del'>-	if (name_size == 1 &amp;&amp; name[0] == '.')</div><div class='del'>-		return true;</div><div class='del'>-	else if (name_size == 2 &amp;&amp; name[0] == '.' &amp;&amp; name[1] == '.')</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_decode_and_decrypt_filename - converts the encoded cipher text name to decoded plaintext</div><div class='ctx'>  * @plaintext_name: The plaintext name</div><div class='head'>diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c<br/>index acaa0825e9bb..6648a924e31a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/dentry.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/dentry.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/dentry.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/dentry.c</a></div><div class='hunk'>@@ -17,7 +17,9 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_d_revalidate - revalidate an ecryptfs dentry</div><div class='del'>- * @dentry: The ecryptfs dentry</div><div class='add'>+ * @dir: inode of expected parent</div><div class='add'>+ * @name: expected name</div><div class='add'>+ * @dentry: dentry to revalidate</div><div class='ctx'>  * @flags: lookup flags</div><div class='ctx'>  *</div><div class='ctx'>  * Called when the VFS needs to revalidate a dentry. This</div><div class='hunk'>@@ -28,7 +30,8 @@</div><div class='ctx'>  * Returns 1 if valid, 0 otherwise.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int ecryptfs_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);</div><div class='ctx'> 	int rc = 1;</div><div class='hunk'>@@ -36,8 +39,15 @@ static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='ctx'> </div><div class='del'>-	if (lower_dentry-&gt;d_flags &amp; DCACHE_OP_REVALIDATE)</div><div class='del'>-		rc = lower_dentry-&gt;d_op-&gt;d_revalidate(lower_dentry, flags);</div><div class='add'>+	if (lower_dentry-&gt;d_flags &amp; DCACHE_OP_REVALIDATE) {</div><div class='add'>+		struct inode *lower_dir = ecryptfs_inode_to_lower(dir);</div><div class='add'>+		struct name_snapshot n;</div><div class='add'>+</div><div class='add'>+		take_dentry_name_snapshot(&amp;n, lower_dentry);</div><div class='add'>+		rc = lower_dentry-&gt;d_op-&gt;d_revalidate(lower_dir, &amp;n.name,</div><div class='add'>+						      lower_dentry, flags);</div><div class='add'>+		release_dentry_name_snapshot(&amp;n);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (d_really_is_positive(dentry)) {</div><div class='ctx'> 		struct inode *inode = d_inode(dentry);</div><div class='hunk'>@@ -49,14 +59,6 @@ static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct kmem_cache *ecryptfs_dentry_info_cache;</div><div class='del'>-</div><div class='del'>-static void ecryptfs_dentry_free_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(ecryptfs_dentry_info_cache,</div><div class='del'>-		container_of(head, struct ecryptfs_dentry_info, rcu));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_d_release</div><div class='ctx'>  * @dentry: The ecryptfs dentry</div><div class='hunk'>@@ -65,11 +67,7 @@ static void ecryptfs_dentry_free_rcu(struct rcu_head *head)</div><div class='ctx'>  */</div><div class='ctx'> static void ecryptfs_d_release(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct ecryptfs_dentry_info *p = dentry-&gt;d_fsdata;</div><div class='del'>-	if (p) {</div><div class='del'>-		path_put(&amp;p-&gt;lower_path);</div><div class='del'>-		call_rcu(&amp;p-&gt;rcu, ecryptfs_dentry_free_rcu);</div><div class='del'>-	}</div><div class='add'>+	dput(dentry-&gt;d_fsdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct dentry_operations ecryptfs_dops = {</div><div class='head'>diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h<br/>index c586c5db18b5..62a2ea7f59ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/ecryptfs_kernel.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/ecryptfs_kernel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/ecryptfs_kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/ecryptfs_kernel.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #ifndef ECRYPTFS_KERNEL_H</div><div class='ctx'> #define ECRYPTFS_KERNEL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='ctx'> #include &lt;keys/user-type.h&gt;</div><div class='ctx'> #include &lt;keys/encrypted-type.h&gt;</div><div class='hunk'>@@ -137,8 +138,6 @@ ecryptfs_get_key_payload_data(struct key *key)</div><div class='ctx'> 					+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES)</div><div class='ctx'> #define ECRYPTFS_DEFAULT_CIPHER "aes"</div><div class='ctx'> #define ECRYPTFS_DEFAULT_KEY_BYTES 16</div><div class='del'>-#define ECRYPTFS_DEFAULT_HASH "md5"</div><div class='del'>-#define ECRYPTFS_TAG_70_DIGEST ECRYPTFS_DEFAULT_HASH</div><div class='ctx'> #define ECRYPTFS_TAG_1_PACKET_TYPE 0x01</div><div class='ctx'> #define ECRYPTFS_TAG_3_PACKET_TYPE 0x8C</div><div class='ctx'> #define ECRYPTFS_TAG_11_PACKET_TYPE 0xED</div><div class='hunk'>@@ -163,8 +162,6 @@ ecryptfs_get_key_payload_data(struct key *key)</div><div class='ctx'>  * ECRYPTFS_MAX_IV_BYTES */</div><div class='ctx'> #define ECRYPTFS_FILENAME_MIN_RANDOM_PREPEND_BYTES 16</div><div class='ctx'> #define ECRYPTFS_NON_NULL 0x42 /* A reasonable substitute for NULL */</div><div class='del'>-#define MD5_DIGEST_SIZE 16</div><div class='del'>-#define ECRYPTFS_TAG_70_DIGEST_SIZE MD5_DIGEST_SIZE</div><div class='ctx'> #define ECRYPTFS_TAG_70_MIN_METADATA_SIZE (1 + ECRYPTFS_MIN_PKT_LEN_SIZE \</div><div class='ctx'> 					   + ECRYPTFS_SIG_SIZE + 1 + 1)</div><div class='ctx'> #define ECRYPTFS_TAG_70_MAX_METADATA_SIZE (1 + ECRYPTFS_MAX_PKT_LEN_SIZE \</div><div class='hunk'>@@ -237,8 +234,6 @@ struct ecryptfs_crypt_stat {</div><div class='ctx'> 	unsigned int extent_mask;</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat;</div><div class='ctx'> 	struct crypto_skcipher *tfm;</div><div class='del'>-	struct crypto_shash *hash_tfm; /* Crypto context for generating</div><div class='del'>-					* the initialization vectors */</div><div class='ctx'> 	unsigned char cipher[ECRYPTFS_MAX_CIPHER_NAME_SIZE + 1];</div><div class='ctx'> 	unsigned char key[ECRYPTFS_MAX_KEY_BYTES];</div><div class='ctx'> 	unsigned char root_iv[ECRYPTFS_MAX_IV_BYTES];</div><div class='hunk'>@@ -258,13 +253,6 @@ struct ecryptfs_inode_info {</div><div class='ctx'> 	struct ecryptfs_crypt_stat crypt_stat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* dentry private data. Each dentry must keep track of a lower</div><div class='del'>- * vfsmount too. */</div><div class='del'>-struct ecryptfs_dentry_info {</div><div class='del'>-	struct path lower_path;</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_global_auth_tok - A key used to encrypt all new files under the mountpoint</div><div class='ctx'>  * @flags: Status flags</div><div class='hunk'>@@ -348,6 +336,7 @@ struct ecryptfs_mount_crypt_stat {</div><div class='ctx'> /* superblock private data. */</div><div class='ctx'> struct ecryptfs_sb_info {</div><div class='ctx'> 	struct super_block *wsi_sb;</div><div class='add'>+	struct vfsmount *lower_mnt;</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat mount_crypt_stat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -494,22 +483,25 @@ ecryptfs_set_superblock_lower(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-ecryptfs_set_dentry_private(struct dentry *dentry,</div><div class='del'>-			    struct ecryptfs_dentry_info *dentry_info)</div><div class='add'>+ecryptfs_set_dentry_lower(struct dentry *dentry,</div><div class='add'>+			  struct dentry *lower_dentry)</div><div class='ctx'> {</div><div class='del'>-	dentry-&gt;d_fsdata = dentry_info;</div><div class='add'>+	dentry-&gt;d_fsdata = lower_dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct dentry *</div><div class='ctx'> ecryptfs_dentry_to_lower(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return ((struct ecryptfs_dentry_info *)dentry-&gt;d_fsdata)-&gt;lower_path.dentry;</div><div class='add'>+	return dentry-&gt;d_fsdata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const struct path *</div><div class='del'>-ecryptfs_dentry_to_lower_path(struct dentry *dentry)</div><div class='add'>+static inline struct path</div><div class='add'>+ecryptfs_lower_path(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return &amp;((struct ecryptfs_dentry_info *)dentry-&gt;d_fsdata)-&gt;lower_path;</div><div class='add'>+	return (struct path){</div><div class='add'>+		.mnt = ecryptfs_superblock_to_private(dentry-&gt;d_sb)-&gt;lower_mnt,</div><div class='add'>+		.dentry = ecryptfs_dentry_to_lower(dentry)</div><div class='add'>+	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ecryptfs_printk(type, fmt, arg...) \</div><div class='hunk'>@@ -532,7 +524,6 @@ extern unsigned int ecryptfs_number_of_users;</div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *ecryptfs_auth_tok_list_item_cache;</div><div class='ctx'> extern struct kmem_cache *ecryptfs_file_info_cache;</div><div class='del'>-extern struct kmem_cache *ecryptfs_dentry_info_cache;</div><div class='ctx'> extern struct kmem_cache *ecryptfs_inode_info_cache;</div><div class='ctx'> extern struct kmem_cache *ecryptfs_sb_info_cache;</div><div class='ctx'> extern struct kmem_cache *ecryptfs_header_cache;</div><div class='hunk'>@@ -557,20 +548,19 @@ int ecryptfs_encrypt_and_encode_filename(</div><div class='ctx'> 	size_t *encoded_name_size,</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat,</div><div class='ctx'> 	const char *name, size_t name_size);</div><div class='del'>-struct dentry *ecryptfs_lower_dentry(struct dentry *this_dentry);</div><div class='ctx'> void ecryptfs_dump_hex(char *data, int bytes);</div><div class='ctx'> int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,</div><div class='ctx'> 			int sg_size);</div><div class='ctx'> int ecryptfs_compute_root_iv(struct ecryptfs_crypt_stat *crypt_stat);</div><div class='ctx'> void ecryptfs_rotate_iv(unsigned char *iv);</div><div class='del'>-int ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);</div><div class='add'>+void ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);</div><div class='ctx'> void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);</div><div class='ctx'> void ecryptfs_destroy_mount_crypt_stat(</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat);</div><div class='ctx'> int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat);</div><div class='ctx'> int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode);</div><div class='del'>-int ecryptfs_encrypt_page(struct page *page);</div><div class='del'>-int ecryptfs_decrypt_page(struct page *page);</div><div class='add'>+int ecryptfs_encrypt_page(struct folio *folio);</div><div class='add'>+int ecryptfs_decrypt_page(struct folio *folio);</div><div class='ctx'> int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry,</div><div class='ctx'> 			    struct inode *ecryptfs_inode);</div><div class='ctx'> int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry);</div><div class='hunk'>@@ -653,16 +643,15 @@ int ecryptfs_keyring_auth_tok_for_sig(struct key **auth_tok_key,</div><div class='ctx'> int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,</div><div class='ctx'> 			 loff_t offset, size_t size);</div><div class='ctx'> int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,</div><div class='del'>-				      struct page *page_for_lower,</div><div class='add'>+				      struct folio *folio_for_lower,</div><div class='ctx'> 				      size_t offset_in_page, size_t size);</div><div class='ctx'> int ecryptfs_write(struct inode *inode, char *data, loff_t offset, size_t size);</div><div class='ctx'> int ecryptfs_read_lower(char *data, loff_t offset, size_t size,</div><div class='ctx'> 			struct inode *ecryptfs_inode);</div><div class='del'>-int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,</div><div class='add'>+int ecryptfs_read_lower_page_segment(struct folio *folio_for_ecryptfs,</div><div class='ctx'> 				     pgoff_t page_index,</div><div class='ctx'> 				     size_t offset_in_page, size_t size,</div><div class='ctx'> 				     struct inode *ecryptfs_inode);</div><div class='del'>-struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index);</div><div class='ctx'> int ecryptfs_parse_packet_length(unsigned char *data, size_t *size,</div><div class='ctx'> 				 size_t *length_size);</div><div class='ctx'> int ecryptfs_write_packet_length(char *dest, size_t size,</div><div class='hunk'>@@ -699,8 +688,8 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,</div><div class='ctx'> 			     char *data, size_t max_packet_size);</div><div class='ctx'> int ecryptfs_set_f_namelen(long *namelen, long lower_namelen,</div><div class='ctx'> 			   struct ecryptfs_mount_crypt_stat *mount_crypt_stat);</div><div class='del'>-int ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,</div><div class='del'>-		       loff_t offset);</div><div class='add'>+void ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,</div><div class='add'>+			loff_t offset);</div><div class='ctx'> </div><div class='ctx'> extern const struct xattr_handler * const ecryptfs_xattr_handlers[];</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c<br/>index ce0a3c5ed0ca..7929411837cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/file.c</a></div><div class='hunk'>@@ -33,13 +33,12 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,</div><div class='ctx'> 				struct iov_iter *to)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t rc;</div><div class='del'>-	const struct path *path;</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> </div><div class='ctx'> 	rc = generic_file_read_iter(iocb, to);</div><div class='ctx'> 	if (rc &gt;= 0) {</div><div class='del'>-		path = ecryptfs_dentry_to_lower_path(file-&gt;f_path.dentry);</div><div class='del'>-		touch_atime(path);</div><div class='add'>+		struct path path = ecryptfs_lower_path(file-&gt;f_path.dentry);</div><div class='add'>+		touch_atime(&amp;path);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -59,12 +58,11 @@ static ssize_t ecryptfs_splice_read_update_atime(struct file *in, loff_t *ppos,</div><div class='ctx'> 						 size_t len, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t rc;</div><div class='del'>-	const struct path *path;</div><div class='ctx'> </div><div class='ctx'> 	rc = filemap_splice_read(in, ppos, pipe, len, flags);</div><div class='ctx'> 	if (rc &gt;= 0) {</div><div class='del'>-		path = ecryptfs_dentry_to_lower_path(in-&gt;f_path.dentry);</div><div class='del'>-		touch_atime(path);</div><div class='add'>+		struct path path = ecryptfs_lower_path(in-&gt;f_path.dentry);</div><div class='add'>+		touch_atime(&amp;path);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -193,7 +191,7 @@ static int ecryptfs_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	 * natively.  If FILESYSTEM_MAX_STACK_DEPTH &gt; 2 or ecryptfs</div><div class='ctx'> 	 * allows recursive mounting, this will need to be extended.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!lower_file-&gt;f_op-&gt;mmap)</div><div class='add'>+	if (!can_mmap_file(lower_file))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	return generic_file_mmap(file, vma);</div><div class='ctx'> }</div><div class='hunk'>@@ -283,6 +281,7 @@ static int ecryptfs_dir_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	 * ecryptfs_lookup() */</div><div class='ctx'> 	struct ecryptfs_file_info *file_info;</div><div class='ctx'> 	struct file *lower_file;</div><div class='add'>+	struct path path;</div><div class='ctx'> </div><div class='ctx'> 	/* Released in ecryptfs_release or end of function if failure */</div><div class='ctx'> 	file_info = kmem_cache_zalloc(ecryptfs_file_info_cache, GFP_KERNEL);</div><div class='hunk'>@@ -292,8 +291,8 @@ static int ecryptfs_dir_open(struct inode *inode, struct file *file)</div><div class='ctx'> 				"Error attempting to allocate memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	lower_file = dentry_open(ecryptfs_dentry_to_lower_path(ecryptfs_dentry),</div><div class='del'>-				 file-&gt;f_flags, current_cred());</div><div class='add'>+	path = ecryptfs_lower_path(ecryptfs_dentry);</div><div class='add'>+	lower_file = dentry_open(&amp;path, file-&gt;f_flags, current_cred());</div><div class='ctx'> 	if (IS_ERR(lower_file)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Error attempting to initialize "</div><div class='ctx'> 			"the lower file for the dentry with name "</div><div class='head'>diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c<br/>index 5ed1e4cf6c0b..3978248247dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/inode.c</a></div><div class='hunk'>@@ -21,21 +21,29 @@</div><div class='ctx'> #include &lt;linux/posix_acl.h&gt;</div><div class='ctx'> #include &lt;linux/posix_acl_xattr.h&gt;</div><div class='ctx'> #include &lt;linux/fileattr.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "ecryptfs_kernel.h"</div><div class='ctx'> </div><div class='del'>-static int lock_parent(struct dentry *dentry,</div><div class='del'>-		       struct dentry **lower_dentry,</div><div class='del'>-		       struct inode **lower_dir)</div><div class='add'>+static struct dentry *ecryptfs_start_creating_dentry(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *lower_dir_dentry;</div><div class='add'>+	struct dentry *parent = dget_parent(dentry);</div><div class='add'>+	struct dentry *ret;</div><div class='ctx'> </div><div class='del'>-	lower_dir_dentry = ecryptfs_dentry_to_lower(dentry-&gt;d_parent);</div><div class='del'>-	*lower_dir = d_inode(lower_dir_dentry);</div><div class='del'>-	*lower_dentry = ecryptfs_dentry_to_lower(dentry);</div><div class='add'>+	ret = start_creating_dentry(ecryptfs_dentry_to_lower(parent),</div><div class='add'>+				    ecryptfs_dentry_to_lower(dentry));</div><div class='add'>+	dput(parent);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(*lower_dir, I_MUTEX_PARENT);</div><div class='del'>-	return (*lower_dentry)-&gt;d_parent == lower_dir_dentry ? 0 : -EINVAL;</div><div class='add'>+static struct dentry *ecryptfs_start_removing_dentry(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct dentry *parent = dget_parent(dentry);</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+</div><div class='add'>+	ret = start_removing_dentry(ecryptfs_dentry_to_lower(parent),</div><div class='add'>+				    ecryptfs_dentry_to_lower(dentry));</div><div class='add'>+	dput(parent);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ecryptfs_inode_test(struct inode *inode, void *lower_inode)</div><div class='hunk'>@@ -95,7 +103,7 @@ static struct inode *__ecryptfs_get_inode(struct inode *lower_inode,</div><div class='ctx'> 		iput(lower_inode);</div><div class='ctx'> 		return ERR_PTR(-EACCES);</div><div class='ctx'> 	}</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		iput(lower_inode);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -106,7 +114,7 @@ struct inode *ecryptfs_get_inode(struct inode *lower_inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = __ecryptfs_get_inode(lower_inode, sb);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(inode) &amp;&amp; (inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!IS_ERR(inode) &amp;&amp; (inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -141,15 +149,12 @@ static int ecryptfs_do_unlink(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct inode *lower_dir;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = lock_parent(dentry, &amp;lower_dentry, &amp;lower_dir);</div><div class='del'>-	dget(lower_dentry);	// don't even try to make the lower negative</div><div class='del'>-	if (!rc) {</div><div class='del'>-		if (d_unhashed(lower_dentry))</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			rc = vfs_unlink(&amp;nop_mnt_idmap, lower_dir, lower_dentry,</div><div class='del'>-					NULL);</div><div class='del'>-	}</div><div class='add'>+	lower_dentry = ecryptfs_start_removing_dentry(dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		return PTR_ERR(lower_dentry);</div><div class='add'>+</div><div class='add'>+	lower_dir = lower_dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+	rc = vfs_unlink(&amp;nop_mnt_idmap, lower_dir, lower_dentry, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -158,8 +163,7 @@ static int ecryptfs_do_unlink(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	set_nlink(inode, ecryptfs_inode_to_lower(inode)-&gt;i_nlink);</div><div class='ctx'> 	inode_set_ctime_to_ts(inode, inode_get_ctime(dir));</div><div class='ctx'> out_unlock:</div><div class='del'>-	dput(lower_dentry);</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_removing(lower_dentry);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		d_drop(dentry);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -186,10 +190,11 @@ ecryptfs_do_create(struct inode *directory_inode,</div><div class='ctx'> 	struct inode *lower_dir;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	rc = lock_parent(ecryptfs_dentry, &amp;lower_dentry, &amp;lower_dir);</div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = vfs_create(&amp;nop_mnt_idmap, lower_dir,</div><div class='del'>-				lower_dentry, mode, true);</div><div class='add'>+	lower_dentry = ecryptfs_start_creating_dentry(ecryptfs_dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		return ERR_CAST(lower_dentry);</div><div class='add'>+	lower_dir = lower_dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+	rc = vfs_create(&amp;nop_mnt_idmap, lower_dentry, mode, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Failure to create dentry in lower fs; "</div><div class='ctx'> 		       "rc = [%d]\n", __func__, rc);</div><div class='hunk'>@@ -205,7 +210,7 @@ ecryptfs_do_create(struct inode *directory_inode,</div><div class='ctx'> 	fsstack_copy_attr_times(directory_inode, lower_dir);</div><div class='ctx'> 	fsstack_copy_inode_size(directory_inode, lower_dir);</div><div class='ctx'> out_lock:</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_creating(lower_dentry);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -327,24 +332,15 @@ static int ecryptfs_i_size_read(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> static struct dentry *ecryptfs_lookup_interpose(struct dentry *dentry,</div><div class='ctx'> 				     struct dentry *lower_dentry)</div><div class='ctx'> {</div><div class='del'>-	const struct path *path = ecryptfs_dentry_to_lower_path(dentry-&gt;d_parent);</div><div class='add'>+	struct dentry *lower_parent = ecryptfs_dentry_to_lower(dentry-&gt;d_parent);</div><div class='ctx'> 	struct inode *inode, *lower_inode;</div><div class='del'>-	struct ecryptfs_dentry_info *dentry_info;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	dentry_info = kmem_cache_alloc(ecryptfs_dentry_info_cache, GFP_KERNEL);</div><div class='del'>-	if (!dentry_info) {</div><div class='del'>-		dput(lower_dentry);</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	fsstack_copy_attr_atime(d_inode(dentry-&gt;d_parent),</div><div class='del'>-				d_inode(path-&gt;dentry));</div><div class='add'>+				d_inode(lower_parent));</div><div class='ctx'> 	BUG_ON(!d_count(lower_dentry));</div><div class='ctx'> </div><div class='del'>-	ecryptfs_set_dentry_private(dentry, dentry_info);</div><div class='del'>-	dentry_info-&gt;lower_path.mnt = mntget(path-&gt;mnt);</div><div class='del'>-	dentry_info-&gt;lower_path.dentry = lower_dentry;</div><div class='add'>+	ecryptfs_set_dentry_lower(dentry, lower_dentry);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * negative dentry can go positive under us here - its parent is not</div><div class='hunk'>@@ -373,7 +369,7 @@ static struct dentry *ecryptfs_lookup_interpose(struct dentry *dentry,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW)</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW)</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> 	return d_splice_alias(inode, dentry);</div><div class='ctx'> }</div><div class='hunk'>@@ -394,8 +390,8 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,</div><div class='ctx'> 	char *encrypted_and_encoded_name = NULL;</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat;</div><div class='ctx'> 	struct dentry *lower_dir_dentry, *lower_dentry;</div><div class='del'>-	const char *name = ecryptfs_dentry-&gt;d_name.name;</div><div class='del'>-	size_t len = ecryptfs_dentry-&gt;d_name.len;</div><div class='add'>+	struct qstr qname = QSTR_INIT(ecryptfs_dentry-&gt;d_name.name,</div><div class='add'>+				      ecryptfs_dentry-&gt;d_name.len);</div><div class='ctx'> 	struct dentry *res;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -404,23 +400,25 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,</div><div class='ctx'> 	mount_crypt_stat = &amp;ecryptfs_superblock_to_private(</div><div class='ctx'> 				ecryptfs_dentry-&gt;d_sb)-&gt;mount_crypt_stat;</div><div class='ctx'> 	if (mount_crypt_stat-&gt;flags &amp; ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES) {</div><div class='add'>+		size_t len = qname.len;</div><div class='ctx'> 		rc = ecryptfs_encrypt_and_encode_filename(</div><div class='ctx'> 			&amp;encrypted_and_encoded_name, &amp;len,</div><div class='del'>-			mount_crypt_stat, name, len);</div><div class='add'>+			mount_crypt_stat, qname.name, len);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Error attempting to encrypt and encode "</div><div class='ctx'> 			       "filename; rc = [%d]\n", __func__, rc);</div><div class='ctx'> 			return ERR_PTR(rc);</div><div class='ctx'> 		}</div><div class='del'>-		name = encrypted_and_encoded_name;</div><div class='add'>+		qname.name = encrypted_and_encoded_name;</div><div class='add'>+		qname.len = len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lower_dentry = lookup_one_len_unlocked(name, lower_dir_dentry, len);</div><div class='add'>+	lower_dentry = lookup_noperm_unlocked(&amp;qname, lower_dir_dentry);</div><div class='ctx'> 	if (IS_ERR(lower_dentry)) {</div><div class='del'>-		ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned "</div><div class='add'>+		ecryptfs_printk(KERN_DEBUG, "%s: lookup_noperm() returned "</div><div class='ctx'> 				"[%ld] on lower_dentry = [%s]\n", __func__,</div><div class='ctx'> 				PTR_ERR(lower_dentry),</div><div class='del'>-				name);</div><div class='add'>+				qname.name);</div><div class='ctx'> 		res = ERR_CAST(lower_dentry);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		res = ecryptfs_lookup_interpose(ecryptfs_dentry, lower_dentry);</div><div class='hunk'>@@ -440,10 +438,12 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	file_size_save = i_size_read(d_inode(old_dentry));</div><div class='ctx'> 	lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry);</div><div class='del'>-	rc = lock_parent(new_dentry, &amp;lower_new_dentry, &amp;lower_dir);</div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = vfs_link(lower_old_dentry, &amp;nop_mnt_idmap, lower_dir,</div><div class='del'>-			      lower_new_dentry, NULL);</div><div class='add'>+	lower_new_dentry = ecryptfs_start_creating_dentry(new_dentry);</div><div class='add'>+	if (IS_ERR(lower_new_dentry))</div><div class='add'>+		return PTR_ERR(lower_new_dentry);</div><div class='add'>+	lower_dir = lower_new_dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+	rc = vfs_link(lower_old_dentry, &amp;nop_mnt_idmap, lower_dir,</div><div class='add'>+		      lower_new_dentry, NULL);</div><div class='ctx'> 	if (rc || d_really_is_negative(lower_new_dentry))</div><div class='ctx'> 		goto out_lock;</div><div class='ctx'> 	rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir-&gt;i_sb);</div><div class='hunk'>@@ -455,7 +455,7 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> 		  ecryptfs_inode_to_lower(d_inode(old_dentry))-&gt;i_nlink);</div><div class='ctx'> 	i_size_write(d_inode(new_dentry), file_size_save);</div><div class='ctx'> out_lock:</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_creating(lower_new_dentry);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,9 +475,11 @@ static int ecryptfs_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> 	size_t encoded_symlen;</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat = NULL;</div><div class='ctx'> </div><div class='del'>-	rc = lock_parent(dentry, &amp;lower_dentry, &amp;lower_dir);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_lock;</div><div class='add'>+	lower_dentry = ecryptfs_start_creating_dentry(dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		return PTR_ERR(lower_dentry);</div><div class='add'>+	lower_dir = lower_dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+</div><div class='ctx'> 	mount_crypt_stat = &amp;ecryptfs_superblock_to_private(</div><div class='ctx'> 		dir-&gt;i_sb)-&gt;mount_crypt_stat;</div><div class='ctx'> 	rc = ecryptfs_encrypt_and_encode_filename(&amp;encoded_symname,</div><div class='hunk'>@@ -487,7 +489,7 @@ static int ecryptfs_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_lock;</div><div class='ctx'> 	rc = vfs_symlink(&amp;nop_mnt_idmap, lower_dir, lower_dentry,</div><div class='del'>-			 encoded_symname);</div><div class='add'>+			 encoded_symname, NULL);</div><div class='ctx'> 	kfree(encoded_symname);</div><div class='ctx'> 	if (rc || d_really_is_negative(lower_dentry))</div><div class='ctx'> 		goto out_lock;</div><div class='hunk'>@@ -497,24 +499,32 @@ static int ecryptfs_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> 	fsstack_copy_attr_times(dir, lower_dir);</div><div class='ctx'> 	fsstack_copy_inode_size(dir, lower_dir);</div><div class='ctx'> out_lock:</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_creating(lower_dentry);</div><div class='ctx'> 	if (d_really_is_negative(dentry))</div><div class='ctx'> 		d_drop(dentry);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecryptfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			  struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *ecryptfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				     struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct dentry *lower_dentry;</div><div class='add'>+	struct dentry *lower_dir_dentry;</div><div class='ctx'> 	struct inode *lower_dir;</div><div class='ctx'> </div><div class='del'>-	rc = lock_parent(dentry, &amp;lower_dentry, &amp;lower_dir);</div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = vfs_mkdir(&amp;nop_mnt_idmap, lower_dir,</div><div class='del'>-			       lower_dentry, mode);</div><div class='del'>-	if (rc || d_really_is_negative(lower_dentry))</div><div class='add'>+	lower_dentry = ecryptfs_start_creating_dentry(dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		return lower_dentry;</div><div class='add'>+	lower_dir_dentry = dget(lower_dentry-&gt;d_parent);</div><div class='add'>+	lower_dir = lower_dir_dentry-&gt;d_inode;</div><div class='add'>+	lower_dentry = vfs_mkdir(&amp;nop_mnt_idmap, lower_dir,</div><div class='add'>+				 lower_dentry, mode, NULL);</div><div class='add'>+	rc = PTR_ERR(lower_dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		goto out;</div><div class='add'>+	rc = 0;</div><div class='add'>+	if (d_unhashed(lower_dentry))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = ecryptfs_interpose(lower_dentry, dentry, dir-&gt;i_sb);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -523,10 +533,10 @@ static int ecryptfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	fsstack_copy_inode_size(dir, lower_dir);</div><div class='ctx'> 	set_nlink(dir, lower_dir-&gt;i_nlink);</div><div class='ctx'> out:</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_creating(lower_dentry);</div><div class='ctx'> 	if (d_really_is_negative(dentry))</div><div class='ctx'> 		d_drop(dentry);</div><div class='del'>-	return rc;</div><div class='add'>+	return ERR_PTR(rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='hunk'>@@ -535,21 +545,18 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	struct inode *lower_dir;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = lock_parent(dentry, &amp;lower_dentry, &amp;lower_dir);</div><div class='del'>-	dget(lower_dentry);	// don't even try to make the lower negative</div><div class='del'>-	if (!rc) {</div><div class='del'>-		if (d_unhashed(lower_dentry))</div><div class='del'>-			rc = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			rc = vfs_rmdir(&amp;nop_mnt_idmap, lower_dir, lower_dentry);</div><div class='del'>-	}</div><div class='add'>+	lower_dentry = ecryptfs_start_removing_dentry(dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		return PTR_ERR(lower_dentry);</div><div class='add'>+	lower_dir = lower_dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+</div><div class='add'>+	rc = vfs_rmdir(&amp;nop_mnt_idmap, lower_dir, lower_dentry, NULL);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		clear_nlink(d_inode(dentry));</div><div class='ctx'> 		fsstack_copy_attr_times(dir, lower_dir);</div><div class='ctx'> 		set_nlink(dir, lower_dir-&gt;i_nlink);</div><div class='ctx'> 	}</div><div class='del'>-	dput(lower_dentry);</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_removing(lower_dentry);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		d_drop(dentry);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -563,10 +570,12 @@ ecryptfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	struct dentry *lower_dentry;</div><div class='ctx'> 	struct inode *lower_dir;</div><div class='ctx'> </div><div class='del'>-	rc = lock_parent(dentry, &amp;lower_dentry, &amp;lower_dir);</div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = vfs_mknod(&amp;nop_mnt_idmap, lower_dir,</div><div class='del'>-			       lower_dentry, mode, dev);</div><div class='add'>+	lower_dentry = ecryptfs_start_creating_dentry(dentry);</div><div class='add'>+	if (IS_ERR(lower_dentry))</div><div class='add'>+		return PTR_ERR(lower_dentry);</div><div class='add'>+	lower_dir = lower_dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+</div><div class='add'>+	rc = vfs_mknod(&amp;nop_mnt_idmap, lower_dir, lower_dentry, mode, dev, NULL);</div><div class='ctx'> 	if (rc || d_really_is_negative(lower_dentry))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	rc = ecryptfs_interpose(lower_dentry, dentry, dir-&gt;i_sb);</div><div class='hunk'>@@ -575,7 +584,7 @@ ecryptfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	fsstack_copy_attr_times(dir, lower_dir);</div><div class='ctx'> 	fsstack_copy_inode_size(dir, lower_dir);</div><div class='ctx'> out:</div><div class='del'>-	inode_unlock(lower_dir);</div><div class='add'>+	end_removing(lower_dentry);</div><div class='ctx'> 	if (d_really_is_negative(dentry))</div><div class='ctx'> 		d_drop(dentry);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -591,7 +600,6 @@ ecryptfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	struct dentry *lower_new_dentry;</div><div class='ctx'> 	struct dentry *lower_old_dir_dentry;</div><div class='ctx'> 	struct dentry *lower_new_dir_dentry;</div><div class='del'>-	struct dentry *trap;</div><div class='ctx'> 	struct inode *target_inode;</div><div class='ctx'> 	struct renamedata rd = {};</div><div class='ctx'> </div><div class='hunk'>@@ -606,32 +614,13 @@ ecryptfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> </div><div class='ctx'> 	target_inode = d_inode(new_dentry);</div><div class='ctx'> </div><div class='del'>-	trap = lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);</div><div class='del'>-	if (IS_ERR(trap))</div><div class='del'>-		return PTR_ERR(trap);</div><div class='del'>-	dget(lower_new_dentry);</div><div class='del'>-	rc = -EINVAL;</div><div class='del'>-	if (lower_old_dentry-&gt;d_parent != lower_old_dir_dentry)</div><div class='del'>-		goto out_lock;</div><div class='del'>-	if (lower_new_dentry-&gt;d_parent != lower_new_dir_dentry)</div><div class='del'>-		goto out_lock;</div><div class='del'>-	if (d_unhashed(lower_old_dentry) || d_unhashed(lower_new_dentry))</div><div class='del'>-		goto out_lock;</div><div class='del'>-	/* source should not be ancestor of target */</div><div class='del'>-	if (trap == lower_old_dentry)</div><div class='del'>-		goto out_lock;</div><div class='del'>-	/* target should not be ancestor of source */</div><div class='del'>-	if (trap == lower_new_dentry) {</div><div class='del'>-		rc = -ENOTEMPTY;</div><div class='del'>-		goto out_lock;</div><div class='del'>-	}</div><div class='add'>+	rd.mnt_idmap  = &amp;nop_mnt_idmap;</div><div class='add'>+	rd.old_parent = lower_old_dir_dentry;</div><div class='add'>+	rd.new_parent = lower_new_dir_dentry;</div><div class='add'>+	rc = start_renaming_two_dentries(&amp;rd, lower_old_dentry, lower_new_dentry);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	rd.old_mnt_idmap	= &amp;nop_mnt_idmap;</div><div class='del'>-	rd.old_dir		= d_inode(lower_old_dir_dentry);</div><div class='del'>-	rd.old_dentry		= lower_old_dentry;</div><div class='del'>-	rd.new_mnt_idmap	= &amp;nop_mnt_idmap;</div><div class='del'>-	rd.new_dir		= d_inode(lower_new_dir_dentry);</div><div class='del'>-	rd.new_dentry		= lower_new_dentry;</div><div class='ctx'> 	rc = vfs_rename(&amp;rd);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_lock;</div><div class='hunk'>@@ -642,8 +631,7 @@ ecryptfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	if (new_dir != old_dir)</div><div class='ctx'> 		fsstack_copy_attr_all(old_dir, d_inode(lower_old_dir_dentry));</div><div class='ctx'> out_lock:</div><div class='del'>-	dput(lower_new_dentry);</div><div class='del'>-	unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -905,11 +893,8 @@ static int ecryptfs_setattr(struct mnt_idmap *idmap,</div><div class='ctx'> 	struct ecryptfs_crypt_stat *crypt_stat;</div><div class='ctx'> </div><div class='ctx'> 	crypt_stat = &amp;ecryptfs_inode_to_private(d_inode(dentry))-&gt;crypt_stat;</div><div class='del'>-	if (!(crypt_stat-&gt;flags &amp; ECRYPTFS_STRUCT_INITIALIZED)) {</div><div class='del'>-		rc = ecryptfs_init_crypt_stat(crypt_stat);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-	}</div><div class='add'>+	if (!(crypt_stat-&gt;flags &amp; ECRYPTFS_STRUCT_INITIALIZED))</div><div class='add'>+		ecryptfs_init_crypt_stat(crypt_stat);</div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='ctx'> 	lower_inode = ecryptfs_inode_to_lower(inode);</div><div class='ctx'> 	lower_dentry = ecryptfs_dentry_to_lower(dentry);</div><div class='hunk'>@@ -1008,24 +993,16 @@ static int ecryptfs_getattr_link(struct mnt_idmap *idmap,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecryptfs_do_getattr(const struct path *path, struct kstat *stat,</div><div class='del'>-			       u32 request_mask, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; AT_GETATTR_NOSEC)</div><div class='del'>-		return vfs_getattr_nosec(path, stat, request_mask, flags);</div><div class='del'>-	return vfs_getattr(path, stat, request_mask, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ecryptfs_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> 			    const struct path *path, struct kstat *stat,</div><div class='ctx'> 			    u32 request_mask, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = path-&gt;dentry;</div><div class='ctx'> 	struct kstat lower_stat;</div><div class='add'>+	struct path lower_path = ecryptfs_lower_path(dentry);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = ecryptfs_do_getattr(ecryptfs_dentry_to_lower_path(dentry),</div><div class='del'>-				 &amp;lower_stat, request_mask, flags);</div><div class='add'>+	rc = vfs_getattr_nosec(&amp;lower_path, &amp;lower_stat, request_mask, flags);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		fsstack_copy_attr_all(d_inode(dentry),</div><div class='ctx'> 				      ecryptfs_inode_to_lower(d_inode(dentry)));</div><div class='hunk'>@@ -1124,13 +1101,13 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ecryptfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+static int ecryptfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	return vfs_fileattr_get(ecryptfs_dentry_to_lower(dentry), fa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ecryptfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-				 struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+				 struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);</div><div class='ctx'> 	int rc;</div><div class='head'>diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c<br/>index 3fe41964c0d8..bbf8603242fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/keystore.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/keystore.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/keystore.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/keystore.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *              Trevor S. Highland &lt;trevor.highland@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='hunk'>@@ -300,9 +299,11 @@ write_tag_66_packet(char *signature, u8 cipher_code,</div><div class='ctx'> 	 *         | Key Identifier Size      | 1 or 2 bytes |</div><div class='ctx'> 	 *         | Key Identifier           | arbitrary    |</div><div class='ctx'> 	 *         | File Encryption Key Size | 1 or 2 bytes |</div><div class='add'>+	 *         | Cipher Code              | 1 byte       |</div><div class='ctx'> 	 *         | File Encryption Key      | arbitrary    |</div><div class='add'>+	 *         | Checksum                 | 2 bytes      |</div><div class='ctx'> 	 */</div><div class='del'>-	data_len = (5 + ECRYPTFS_SIG_SIZE_HEX + crypt_stat-&gt;key_size);</div><div class='add'>+	data_len = (8 + ECRYPTFS_SIG_SIZE_HEX + crypt_stat-&gt;key_size);</div><div class='ctx'> 	*packet = kmalloc(data_len, GFP_KERNEL);</div><div class='ctx'> 	message = *packet;</div><div class='ctx'> 	if (!message) {</div><div class='hunk'>@@ -599,10 +600,7 @@ struct ecryptfs_write_tag_70_packet_silly_stack {</div><div class='ctx'> 	struct crypto_skcipher *skcipher_tfm;</div><div class='ctx'> 	struct skcipher_request *skcipher_req;</div><div class='ctx'> 	char iv[ECRYPTFS_MAX_IV_BYTES];</div><div class='del'>-	char hash[ECRYPTFS_TAG_70_DIGEST_SIZE];</div><div class='del'>-	char tmp_hash[ECRYPTFS_TAG_70_DIGEST_SIZE];</div><div class='del'>-	struct crypto_shash *hash_tfm;</div><div class='del'>-	struct shash_desc *hash_desc;</div><div class='add'>+	char hash[MD5_DIGEST_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -739,51 +737,15 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,</div><div class='ctx'> 		       "password tokens\n", __func__);</div><div class='ctx'> 		goto out_free_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	s-&gt;hash_tfm = crypto_alloc_shash(ECRYPTFS_TAG_70_DIGEST, 0, 0);</div><div class='del'>-	if (IS_ERR(s-&gt;hash_tfm)) {</div><div class='del'>-			rc = PTR_ERR(s-&gt;hash_tfm);</div><div class='del'>-			printk(KERN_ERR "%s: Error attempting to "</div><div class='del'>-			       "allocate hash crypto context; rc = [%d]\n",</div><div class='del'>-			       __func__, rc);</div><div class='del'>-			goto out_free_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;hash_desc = kmalloc(sizeof(*s-&gt;hash_desc) +</div><div class='del'>-			       crypto_shash_descsize(s-&gt;hash_tfm), GFP_KERNEL);</div><div class='del'>-	if (!s-&gt;hash_desc) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out_release_free_unlock;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	s-&gt;hash_desc-&gt;tfm = s-&gt;hash_tfm;</div><div class='del'>-</div><div class='del'>-	rc = crypto_shash_digest(s-&gt;hash_desc,</div><div class='del'>-				 (u8 *)s-&gt;auth_tok-&gt;token.password.session_key_encryption_key,</div><div class='del'>-				 s-&gt;auth_tok-&gt;token.password.session_key_encryption_key_bytes,</div><div class='del'>-				 s-&gt;hash);</div><div class='del'>-	if (rc) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: Error computing crypto hash; rc = [%d]\n",</div><div class='del'>-		       __func__, rc);</div><div class='del'>-		goto out_release_free_unlock;</div><div class='del'>-	}</div><div class='add'>+	md5(s-&gt;auth_tok-&gt;token.password.session_key_encryption_key,</div><div class='add'>+	    s-&gt;auth_tok-&gt;token.password.session_key_encryption_key_bytes,</div><div class='add'>+	    s-&gt;hash);</div><div class='ctx'> 	for (s-&gt;j = 0; s-&gt;j &lt; (s-&gt;num_rand_bytes - 1); s-&gt;j++) {</div><div class='ctx'> 		s-&gt;block_aligned_filename[s-&gt;j] =</div><div class='del'>-			s-&gt;hash[(s-&gt;j % ECRYPTFS_TAG_70_DIGEST_SIZE)];</div><div class='del'>-		if ((s-&gt;j % ECRYPTFS_TAG_70_DIGEST_SIZE)</div><div class='del'>-		    == (ECRYPTFS_TAG_70_DIGEST_SIZE - 1)) {</div><div class='del'>-			rc = crypto_shash_digest(s-&gt;hash_desc, (u8 *)s-&gt;hash,</div><div class='del'>-						ECRYPTFS_TAG_70_DIGEST_SIZE,</div><div class='del'>-						s-&gt;tmp_hash);</div><div class='del'>-			if (rc) {</div><div class='del'>-				printk(KERN_ERR</div><div class='del'>-				       "%s: Error computing crypto hash; "</div><div class='del'>-				       "rc = [%d]\n", __func__, rc);</div><div class='del'>-				goto out_release_free_unlock;</div><div class='del'>-			}</div><div class='del'>-			memcpy(s-&gt;hash, s-&gt;tmp_hash,</div><div class='del'>-			       ECRYPTFS_TAG_70_DIGEST_SIZE);</div><div class='del'>-		}</div><div class='add'>+			s-&gt;hash[s-&gt;j % MD5_DIGEST_SIZE];</div><div class='add'>+		if ((s-&gt;j % MD5_DIGEST_SIZE) == (MD5_DIGEST_SIZE - 1))</div><div class='add'>+			md5(s-&gt;hash, MD5_DIGEST_SIZE, s-&gt;hash);</div><div class='ctx'> 		if (s-&gt;block_aligned_filename[s-&gt;j] == '\0')</div><div class='ctx'> 			s-&gt;block_aligned_filename[s-&gt;j] = ECRYPTFS_NON_NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -796,7 +758,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,</div><div class='ctx'> 		       "convert filename memory to scatterlist; rc = [%d]. "</div><div class='ctx'> 		       "block_aligned_filename_size = [%zd]\n", __func__, rc,</div><div class='ctx'> 		       s-&gt;block_aligned_filename_size);</div><div class='del'>-		goto out_release_free_unlock;</div><div class='add'>+		goto out_free_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = virt_to_scatterlist(&amp;dest[s-&gt;i], s-&gt;block_aligned_filename_size,</div><div class='ctx'> 				 s-&gt;dst_sg, 2);</div><div class='hunk'>@@ -805,7 +767,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,</div><div class='ctx'> 		       "convert encrypted filename memory to scatterlist; "</div><div class='ctx'> 		       "rc = [%d]. block_aligned_filename_size = [%zd]\n",</div><div class='ctx'> 		       __func__, rc, s-&gt;block_aligned_filename_size);</div><div class='del'>-		goto out_release_free_unlock;</div><div class='add'>+		goto out_free_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* The characters in the first block effectively do the job</div><div class='ctx'> 	 * of the IV here, so we just use 0's for the IV. Note the</div><div class='hunk'>@@ -823,7 +785,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,</div><div class='ctx'> 		       rc,</div><div class='ctx'> 		       s-&gt;auth_tok-&gt;token.password.session_key_encryption_key,</div><div class='ctx'> 		       mount_crypt_stat-&gt;global_default_fn_cipher_key_bytes);</div><div class='del'>-		goto out_release_free_unlock;</div><div class='add'>+		goto out_free_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	skcipher_request_set_crypt(s-&gt;skcipher_req, s-&gt;src_sg, s-&gt;dst_sg,</div><div class='ctx'> 				   s-&gt;block_aligned_filename_size, s-&gt;iv);</div><div class='hunk'>@@ -831,13 +793,11 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Error attempting to encrypt filename; "</div><div class='ctx'> 		       "rc = [%d]\n", __func__, rc);</div><div class='del'>-		goto out_release_free_unlock;</div><div class='add'>+		goto out_free_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	s-&gt;i += s-&gt;block_aligned_filename_size;</div><div class='ctx'> 	(*packet_size) = s-&gt;i;</div><div class='ctx'> 	(*remaining_bytes) -= (*packet_size);</div><div class='del'>-out_release_free_unlock:</div><div class='del'>-	crypto_free_shash(s-&gt;hash_tfm);</div><div class='ctx'> out_free_unlock:</div><div class='ctx'> 	kfree_sensitive(s-&gt;block_aligned_filename);</div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -848,7 +808,6 @@ out:</div><div class='ctx'> 		key_put(auth_tok_key);</div><div class='ctx'> 	}</div><div class='ctx'> 	skcipher_request_free(s-&gt;skcipher_req);</div><div class='del'>-	kfree_sensitive(s-&gt;hash_desc);</div><div class='ctx'> 	kfree(s);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c<br/>index 2dc927ba067f..c12dc680f8fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/main.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/main.c</a></div><div class='hunk'>@@ -12,14 +12,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dcache.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/fips.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/key.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/fs_stack.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include "ecryptfs_kernel.h"</div><div class='hunk'>@@ -105,15 +107,14 @@ static int ecryptfs_init_lower_file(struct dentry *dentry,</div><div class='ctx'> 				    struct file **lower_file)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cred *cred = current_cred();</div><div class='del'>-	const struct path *path = ecryptfs_dentry_to_lower_path(dentry);</div><div class='add'>+	struct path path = ecryptfs_lower_path(dentry);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = ecryptfs_privileged_open(lower_file, path-&gt;dentry, path-&gt;mnt,</div><div class='del'>-				      cred);</div><div class='add'>+	rc = ecryptfs_privileged_open(lower_file, path.dentry, path.mnt, cred);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "Error opening lower file "</div><div class='ctx'> 		       "for lower_dentry [0x%p] and lower_mnt [0x%p]; "</div><div class='del'>-		       "rc = [%d]\n", path-&gt;dentry, path-&gt;mnt, rc);</div><div class='add'>+		       "rc = [%d]\n", path.dentry, path.mnt, rc);</div><div class='ctx'> 		(*lower_file) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -153,32 +154,30 @@ void ecryptfs_put_lower_file(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig,</div><div class='del'>-       ecryptfs_opt_cipher, ecryptfs_opt_ecryptfs_cipher,</div><div class='del'>-       ecryptfs_opt_ecryptfs_key_bytes,</div><div class='del'>-       ecryptfs_opt_passthrough, ecryptfs_opt_xattr_metadata,</div><div class='del'>-       ecryptfs_opt_encrypted_view, ecryptfs_opt_fnek_sig,</div><div class='del'>-       ecryptfs_opt_fn_cipher, ecryptfs_opt_fn_cipher_key_bytes,</div><div class='del'>-       ecryptfs_opt_unlink_sigs, ecryptfs_opt_mount_auth_tok_only,</div><div class='del'>-       ecryptfs_opt_check_dev_ruid,</div><div class='del'>-       ecryptfs_opt_err };</div><div class='del'>-</div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{ecryptfs_opt_sig, "sig=%s"},</div><div class='del'>-	{ecryptfs_opt_ecryptfs_sig, "ecryptfs_sig=%s"},</div><div class='del'>-	{ecryptfs_opt_cipher, "cipher=%s"},</div><div class='del'>-	{ecryptfs_opt_ecryptfs_cipher, "ecryptfs_cipher=%s"},</div><div class='del'>-	{ecryptfs_opt_ecryptfs_key_bytes, "ecryptfs_key_bytes=%u"},</div><div class='del'>-	{ecryptfs_opt_passthrough, "ecryptfs_passthrough"},</div><div class='del'>-	{ecryptfs_opt_xattr_metadata, "ecryptfs_xattr_metadata"},</div><div class='del'>-	{ecryptfs_opt_encrypted_view, "ecryptfs_encrypted_view"},</div><div class='del'>-	{ecryptfs_opt_fnek_sig, "ecryptfs_fnek_sig=%s"},</div><div class='del'>-	{ecryptfs_opt_fn_cipher, "ecryptfs_fn_cipher=%s"},</div><div class='del'>-	{ecryptfs_opt_fn_cipher_key_bytes, "ecryptfs_fn_key_bytes=%u"},</div><div class='del'>-	{ecryptfs_opt_unlink_sigs, "ecryptfs_unlink_sigs"},</div><div class='del'>-	{ecryptfs_opt_mount_auth_tok_only, "ecryptfs_mount_auth_tok_only"},</div><div class='del'>-	{ecryptfs_opt_check_dev_ruid, "ecryptfs_check_dev_ruid"},</div><div class='del'>-	{ecryptfs_opt_err, NULL}</div><div class='add'>+enum {</div><div class='add'>+	Opt_sig, Opt_ecryptfs_sig, Opt_cipher, Opt_ecryptfs_cipher,</div><div class='add'>+	Opt_ecryptfs_key_bytes, Opt_passthrough, Opt_xattr_metadata,</div><div class='add'>+	Opt_encrypted_view, Opt_fnek_sig, Opt_fn_cipher,</div><div class='add'>+	Opt_fn_cipher_key_bytes, Opt_unlink_sigs, Opt_mount_auth_tok_only,</div><div class='add'>+	Opt_check_dev_ruid</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec ecryptfs_fs_param_spec[] = {</div><div class='add'>+	fsparam_string	("sig",			    Opt_sig),</div><div class='add'>+	fsparam_string	("ecryptfs_sig",	    Opt_ecryptfs_sig),</div><div class='add'>+	fsparam_string	("cipher",		    Opt_cipher),</div><div class='add'>+	fsparam_string	("ecryptfs_cipher",	    Opt_ecryptfs_cipher),</div><div class='add'>+	fsparam_u32	("ecryptfs_key_bytes",	    Opt_ecryptfs_key_bytes),</div><div class='add'>+	fsparam_flag	("ecryptfs_passthrough",    Opt_passthrough),</div><div class='add'>+	fsparam_flag	("ecryptfs_xattr_metadata", Opt_xattr_metadata),</div><div class='add'>+	fsparam_flag	("ecryptfs_encrypted_view", Opt_encrypted_view),</div><div class='add'>+	fsparam_string	("ecryptfs_fnek_sig",	    Opt_fnek_sig),</div><div class='add'>+	fsparam_string	("ecryptfs_fn_cipher",	    Opt_fn_cipher),</div><div class='add'>+	fsparam_u32	("ecryptfs_fn_key_bytes",   Opt_fn_cipher_key_bytes),</div><div class='add'>+	fsparam_flag	("ecryptfs_unlink_sigs",    Opt_unlink_sigs),</div><div class='add'>+	fsparam_flag	("ecryptfs_mount_auth_tok_only", Opt_mount_auth_tok_only),</div><div class='add'>+	fsparam_flag	("ecryptfs_check_dev_ruid", Opt_check_dev_ruid),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ecryptfs_init_global_auth_toks(</div><div class='hunk'>@@ -219,19 +218,20 @@ static void ecryptfs_init_mount_crypt_stat(</div><div class='ctx'> 	mount_crypt_stat-&gt;flags |= ECRYPTFS_MOUNT_CRYPT_STAT_INITIALIZED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ecryptfs_fs_context {</div><div class='add'>+	/* Mount option status trackers */</div><div class='add'>+	bool check_ruid;</div><div class='add'>+	bool sig_set;</div><div class='add'>+	bool cipher_name_set;</div><div class='add'>+	bool cipher_key_bytes_set;</div><div class='add'>+	bool fn_cipher_name_set;</div><div class='add'>+	bool fn_cipher_key_bytes_set;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * ecryptfs_parse_options</div><div class='del'>- * @sbi: The ecryptfs super block</div><div class='del'>- * @options: The options passed to the kernel</div><div class='del'>- * @check_ruid: set to 1 if device uid should be checked against the ruid</div><div class='del'>- *</div><div class='del'>- * Parse mount options:</div><div class='del'>- * debug=N 	   - ecryptfs_verbosity level for debug output</div><div class='del'>- * sig=XXX	   - description(signature) of the key to use</div><div class='del'>- *</div><div class='del'>- * Returns the dentry object of the lower-level (lower/interposed)</div><div class='del'>- * directory; We want to mount our stackable file system on top of</div><div class='del'>- * that lower directory.</div><div class='add'>+ * ecryptfs_parse_param</div><div class='add'>+ * @fc: The ecryptfs filesystem context</div><div class='add'>+ * @param: The mount parameter to parse</div><div class='ctx'>  *</div><div class='ctx'>  * The signature of the key to use must be the description of a key</div><div class='ctx'>  * already in the keyring. Mounting will fail if the key can not be</div><div class='hunk'>@@ -239,157 +239,118 @@ static void ecryptfs_init_mount_crypt_stat(</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero on error</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options,</div><div class='del'>-				  uid_t *check_ruid)</div><div class='add'>+static int ecryptfs_parse_param(</div><div class='add'>+	struct fs_context *fc,</div><div class='add'>+	struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	int sig_set = 0;</div><div class='del'>-	int cipher_name_set = 0;</div><div class='del'>-	int fn_cipher_name_set = 0;</div><div class='del'>-	int cipher_key_bytes;</div><div class='del'>-	int cipher_key_bytes_set = 0;</div><div class='del'>-	int fn_cipher_key_bytes;</div><div class='del'>-	int fn_cipher_key_bytes_set = 0;</div><div class='add'>+	int rc;</div><div class='add'>+	int opt;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	struct ecryptfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct ecryptfs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat =</div><div class='ctx'> 		&amp;sbi-&gt;mount_crypt_stat;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int token;</div><div class='del'>-	char *sig_src;</div><div class='del'>-	char *cipher_name_dst;</div><div class='del'>-	char *cipher_name_src;</div><div class='del'>-	char *fn_cipher_name_dst;</div><div class='del'>-	char *fn_cipher_name_src;</div><div class='del'>-	char *fnek_dst;</div><div class='del'>-	char *fnek_src;</div><div class='del'>-	char *cipher_key_bytes_src;</div><div class='del'>-	char *fn_cipher_key_bytes_src;</div><div class='del'>-	u8 cipher_code;</div><div class='ctx'> </div><div class='del'>-	*check_ruid = 0;</div><div class='add'>+	opt = fs_parse(fc, ecryptfs_fs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='ctx'> </div><div class='del'>-	if (!options) {</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	ecryptfs_init_mount_crypt_stat(mount_crypt_stat);</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case ecryptfs_opt_sig:</div><div class='del'>-		case ecryptfs_opt_ecryptfs_sig:</div><div class='del'>-			sig_src = args[0].from;</div><div class='del'>-			rc = ecryptfs_add_global_auth_tok(mount_crypt_stat,</div><div class='del'>-							  sig_src, 0);</div><div class='del'>-			if (rc) {</div><div class='del'>-				printk(KERN_ERR "Error attempting to register "</div><div class='del'>-				       "global sig; rc = [%d]\n", rc);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			sig_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_cipher:</div><div class='del'>-		case ecryptfs_opt_ecryptfs_cipher:</div><div class='del'>-			cipher_name_src = args[0].from;</div><div class='del'>-			cipher_name_dst =</div><div class='del'>-				mount_crypt_stat-&gt;</div><div class='del'>-				global_default_cipher_name;</div><div class='del'>-			strncpy(cipher_name_dst, cipher_name_src,</div><div class='del'>-				ECRYPTFS_MAX_CIPHER_NAME_SIZE);</div><div class='del'>-			cipher_name_dst[ECRYPTFS_MAX_CIPHER_NAME_SIZE] = '\0';</div><div class='del'>-			cipher_name_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_ecryptfs_key_bytes:</div><div class='del'>-			cipher_key_bytes_src = args[0].from;</div><div class='del'>-			cipher_key_bytes =</div><div class='del'>-				(int)simple_strtol(cipher_key_bytes_src,</div><div class='del'>-						   &amp;cipher_key_bytes_src, 0);</div><div class='del'>-			mount_crypt_stat-&gt;global_default_cipher_key_size =</div><div class='del'>-				cipher_key_bytes;</div><div class='del'>-			cipher_key_bytes_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_passthrough:</div><div class='del'>-			mount_crypt_stat-&gt;flags |=</div><div class='del'>-				ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_xattr_metadata:</div><div class='del'>-			mount_crypt_stat-&gt;flags |=</div><div class='del'>-				ECRYPTFS_XATTR_METADATA_ENABLED;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_encrypted_view:</div><div class='del'>-			mount_crypt_stat-&gt;flags |=</div><div class='del'>-				ECRYPTFS_XATTR_METADATA_ENABLED;</div><div class='del'>-			mount_crypt_stat-&gt;flags |=</div><div class='del'>-				ECRYPTFS_ENCRYPTED_VIEW_ENABLED;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_fnek_sig:</div><div class='del'>-			fnek_src = args[0].from;</div><div class='del'>-			fnek_dst =</div><div class='del'>-				mount_crypt_stat-&gt;global_default_fnek_sig;</div><div class='del'>-			strncpy(fnek_dst, fnek_src, ECRYPTFS_SIG_SIZE_HEX);</div><div class='del'>-			mount_crypt_stat-&gt;global_default_fnek_sig[</div><div class='del'>-				ECRYPTFS_SIG_SIZE_HEX] = '\0';</div><div class='del'>-			rc = ecryptfs_add_global_auth_tok(</div><div class='del'>-				mount_crypt_stat,</div><div class='del'>-				mount_crypt_stat-&gt;global_default_fnek_sig,</div><div class='del'>-				ECRYPTFS_AUTH_TOK_FNEK);</div><div class='del'>-			if (rc) {</div><div class='del'>-				printk(KERN_ERR "Error attempting to register "</div><div class='del'>-				       "global fnek sig [%s]; rc = [%d]\n",</div><div class='del'>-				       mount_crypt_stat-&gt;global_default_fnek_sig,</div><div class='del'>-				       rc);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			mount_crypt_stat-&gt;flags |=</div><div class='del'>-				(ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES</div><div class='del'>-				 | ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK);</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_fn_cipher:</div><div class='del'>-			fn_cipher_name_src = args[0].from;</div><div class='del'>-			fn_cipher_name_dst =</div><div class='del'>-				mount_crypt_stat-&gt;global_default_fn_cipher_name;</div><div class='del'>-			strncpy(fn_cipher_name_dst, fn_cipher_name_src,</div><div class='del'>-				ECRYPTFS_MAX_CIPHER_NAME_SIZE);</div><div class='del'>-			mount_crypt_stat-&gt;global_default_fn_cipher_name[</div><div class='del'>-				ECRYPTFS_MAX_CIPHER_NAME_SIZE] = '\0';</div><div class='del'>-			fn_cipher_name_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_fn_cipher_key_bytes:</div><div class='del'>-			fn_cipher_key_bytes_src = args[0].from;</div><div class='del'>-			fn_cipher_key_bytes =</div><div class='del'>-				(int)simple_strtol(fn_cipher_key_bytes_src,</div><div class='del'>-						   &amp;fn_cipher_key_bytes_src, 0);</div><div class='del'>-			mount_crypt_stat-&gt;global_default_fn_cipher_key_bytes =</div><div class='del'>-				fn_cipher_key_bytes;</div><div class='del'>-			fn_cipher_key_bytes_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_unlink_sigs:</div><div class='del'>-			mount_crypt_stat-&gt;flags |= ECRYPTFS_UNLINK_SIGS;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_mount_auth_tok_only:</div><div class='del'>-			mount_crypt_stat-&gt;flags |=</div><div class='del'>-				ECRYPTFS_GLOBAL_MOUNT_AUTH_TOK_ONLY;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_check_dev_ruid:</div><div class='del'>-			*check_ruid = 1;</div><div class='del'>-			break;</div><div class='del'>-		case ecryptfs_opt_err:</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "%s: eCryptfs: unrecognized option [%s]\n",</div><div class='del'>-			       __func__, p);</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_sig:</div><div class='add'>+	case Opt_ecryptfs_sig:</div><div class='add'>+		rc = ecryptfs_add_global_auth_tok(mount_crypt_stat,</div><div class='add'>+						  param-&gt;string, 0);</div><div class='add'>+		if (rc) {</div><div class='add'>+			printk(KERN_ERR "Error attempting to register "</div><div class='add'>+			       "global sig; rc = [%d]\n", rc);</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='add'>+		ctx-&gt;sig_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_cipher:</div><div class='add'>+	case Opt_ecryptfs_cipher:</div><div class='add'>+		strscpy(mount_crypt_stat-&gt;global_default_cipher_name,</div><div class='add'>+			param-&gt;string);</div><div class='add'>+		ctx-&gt;cipher_name_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ecryptfs_key_bytes:</div><div class='add'>+		mount_crypt_stat-&gt;global_default_cipher_key_size =</div><div class='add'>+			result.uint_32;</div><div class='add'>+		ctx-&gt;cipher_key_bytes_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_passthrough:</div><div class='add'>+		mount_crypt_stat-&gt;flags |=</div><div class='add'>+			ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_xattr_metadata:</div><div class='add'>+		mount_crypt_stat-&gt;flags |= ECRYPTFS_XATTR_METADATA_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_encrypted_view:</div><div class='add'>+		mount_crypt_stat-&gt;flags |= ECRYPTFS_XATTR_METADATA_ENABLED;</div><div class='add'>+		mount_crypt_stat-&gt;flags |= ECRYPTFS_ENCRYPTED_VIEW_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fnek_sig:</div><div class='add'>+		strscpy(mount_crypt_stat-&gt;global_default_fnek_sig,</div><div class='add'>+			param-&gt;string);</div><div class='add'>+		rc = ecryptfs_add_global_auth_tok(</div><div class='add'>+			mount_crypt_stat,</div><div class='add'>+			mount_crypt_stat-&gt;global_default_fnek_sig,</div><div class='add'>+			ECRYPTFS_AUTH_TOK_FNEK);</div><div class='add'>+		if (rc) {</div><div class='add'>+			printk(KERN_ERR "Error attempting to register "</div><div class='add'>+			       "global fnek sig [%s]; rc = [%d]\n",</div><div class='add'>+			       mount_crypt_stat-&gt;global_default_fnek_sig, rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+		mount_crypt_stat-&gt;flags |=</div><div class='add'>+			(ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES</div><div class='add'>+			 | ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fn_cipher:</div><div class='add'>+		strscpy(mount_crypt_stat-&gt;global_default_fn_cipher_name,</div><div class='add'>+			param-&gt;string);</div><div class='add'>+		ctx-&gt;fn_cipher_name_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fn_cipher_key_bytes:</div><div class='add'>+		mount_crypt_stat-&gt;global_default_fn_cipher_key_bytes =</div><div class='add'>+			result.uint_32;</div><div class='add'>+		ctx-&gt;fn_cipher_key_bytes_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_unlink_sigs:</div><div class='add'>+		mount_crypt_stat-&gt;flags |= ECRYPTFS_UNLINK_SIGS;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mount_auth_tok_only:</div><div class='add'>+		mount_crypt_stat-&gt;flags |= ECRYPTFS_GLOBAL_MOUNT_AUTH_TOK_ONLY;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_check_dev_ruid:</div><div class='add'>+		ctx-&gt;check_ruid = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (!sig_set) {</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecryptfs_validate_options(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u8 cipher_code;</div><div class='add'>+	struct ecryptfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct ecryptfs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='add'>+	struct ecryptfs_mount_crypt_stat *mount_crypt_stat;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	mount_crypt_stat = &amp;sbi-&gt;mount_crypt_stat;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;sig_set) {</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		ecryptfs_printk(KERN_ERR, "You must supply at least one valid "</div><div class='ctx'> 				"auth tok signature as a mount "</div><div class='ctx'> 				"parameter; see the eCryptfs README\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (!cipher_name_set) {</div><div class='add'>+	if (!ctx-&gt;cipher_name_set) {</div><div class='ctx'> 		int cipher_name_len = strlen(ECRYPTFS_DEFAULT_CIPHER);</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(cipher_name_len &gt; ECRYPTFS_MAX_CIPHER_NAME_SIZE);</div><div class='hunk'>@@ -397,13 +358,13 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options,</div><div class='ctx'> 		       ECRYPTFS_DEFAULT_CIPHER);</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((mount_crypt_stat-&gt;flags &amp; ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)</div><div class='del'>-	    &amp;&amp; !fn_cipher_name_set)</div><div class='add'>+	    &amp;&amp; !ctx-&gt;fn_cipher_name_set)</div><div class='ctx'> 		strcpy(mount_crypt_stat-&gt;global_default_fn_cipher_name,</div><div class='ctx'> 		       mount_crypt_stat-&gt;global_default_cipher_name);</div><div class='del'>-	if (!cipher_key_bytes_set)</div><div class='add'>+	if (!ctx-&gt;cipher_key_bytes_set)</div><div class='ctx'> 		mount_crypt_stat-&gt;global_default_cipher_key_size = 0;</div><div class='ctx'> 	if ((mount_crypt_stat-&gt;flags &amp; ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)</div><div class='del'>-	    &amp;&amp; !fn_cipher_key_bytes_set)</div><div class='add'>+	    &amp;&amp; !ctx-&gt;fn_cipher_key_bytes_set)</div><div class='ctx'> 		mount_crypt_stat-&gt;global_default_fn_cipher_key_bytes =</div><div class='ctx'> 			mount_crypt_stat-&gt;global_default_cipher_key_size;</div><div class='ctx'> </div><div class='hunk'>@@ -467,45 +428,40 @@ struct kmem_cache *ecryptfs_sb_info_cache;</div><div class='ctx'> static struct file_system_type ecryptfs_fs_type;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ecryptfs_mount</div><div class='del'>- * @fs_type: The filesystem type that the superblock should belong to</div><div class='del'>- * @flags: The flags associated with the mount</div><div class='del'>- * @dev_name: The path to mount over</div><div class='del'>- * @raw_data: The options passed into the kernel</div><div class='add'>+ * ecryptfs_get_tree</div><div class='add'>+ * @fc: The filesystem context</div><div class='ctx'>  */</div><div class='del'>-static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags,</div><div class='del'>-			const char *dev_name, void *raw_data)</div><div class='add'>+static int ecryptfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *s;</div><div class='del'>-	struct ecryptfs_sb_info *sbi;</div><div class='add'>+	struct ecryptfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct ecryptfs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='ctx'> 	struct ecryptfs_mount_crypt_stat *mount_crypt_stat;</div><div class='del'>-	struct ecryptfs_dentry_info *root_info;</div><div class='ctx'> 	const char *err = "Getting sb failed";</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct path path;</div><div class='del'>-	uid_t check_ruid;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL);</div><div class='del'>-	if (!sbi) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!dev_name) {</div><div class='add'>+	if (!fc-&gt;source) {</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		err = "Device name cannot be null";</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = ecryptfs_parse_options(sbi, raw_data, &amp;check_ruid);</div><div class='add'>+	mount_crypt_stat = &amp;sbi-&gt;mount_crypt_stat;</div><div class='add'>+	rc = ecryptfs_validate_options(fc);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		err = "Error parsing options";</div><div class='add'>+		err = "Error validating options";</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	mount_crypt_stat = &amp;sbi-&gt;mount_crypt_stat;</div><div class='ctx'> </div><div class='del'>-	s = sget(fs_type, NULL, set_anon_super, flags, NULL);</div><div class='add'>+	if (fips_enabled) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		err = "eCryptfs support is disabled due to FIPS";</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s = sget_fc(fc, NULL, set_anon_super_fc);</div><div class='ctx'> 	if (IS_ERR(s)) {</div><div class='ctx'> 		rc = PTR_ERR(s);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -521,10 +477,10 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags</div><div class='ctx'> 	sbi = NULL;</div><div class='ctx'> 	s-&gt;s_op = &amp;ecryptfs_sops;</div><div class='ctx'> 	s-&gt;s_xattr = ecryptfs_xattr_handlers;</div><div class='del'>-	s-&gt;s_d_op = &amp;ecryptfs_dops;</div><div class='add'>+	set_default_d_op(s, &amp;ecryptfs_dops);</div><div class='ctx'> </div><div class='ctx'> 	err = "Reading sb failed";</div><div class='del'>-	rc = kern_path(dev_name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &amp;path);</div><div class='add'>+	rc = kern_path(fc-&gt;source, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &amp;path);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_WARNING, "kern_path() failed\n");</div><div class='ctx'> 		goto out1;</div><div class='hunk'>@@ -543,7 +499,8 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (check_ruid &amp;&amp; !uid_eq(d_inode(path.dentry)-&gt;i_uid, current_uid())) {</div><div class='add'>+	if (ctx-&gt;check_ruid &amp;&amp;</div><div class='add'>+	    !uid_eq(d_inode(path.dentry)-&gt;i_uid, current_uid())) {</div><div class='ctx'> 		rc = -EPERM;</div><div class='ctx'> 		printk(KERN_ERR "Mount of device (uid: %d) not owned by "</div><div class='ctx'> 		       "requested user (uid: %d)\n",</div><div class='hunk'>@@ -558,7 +515,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags</div><div class='ctx'> 	 * Set the POSIX ACL flag based on whether they're enabled in the lower</div><div class='ctx'> 	 * mount.</div><div class='ctx'> 	 */</div><div class='del'>-	s-&gt;s_flags = flags &amp; ~SB_POSIXACL;</div><div class='add'>+	s-&gt;s_flags = fc-&gt;sb_flags &amp; ~SB_POSIXACL;</div><div class='ctx'> 	s-&gt;s_flags |= path.dentry-&gt;d_sb-&gt;s_flags &amp; SB_POSIXACL;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -591,29 +548,23 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = -ENOMEM;</div><div class='del'>-	root_info = kmem_cache_zalloc(ecryptfs_dentry_info_cache, GFP_KERNEL);</div><div class='del'>-	if (!root_info)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* -&gt;kill_sb() will take care of root_info */</div><div class='del'>-	ecryptfs_set_dentry_private(s-&gt;s_root, root_info);</div><div class='del'>-	root_info-&gt;lower_path = path;</div><div class='add'>+	ecryptfs_set_dentry_lower(s-&gt;s_root, path.dentry);</div><div class='add'>+	ecryptfs_superblock_to_private(s)-&gt;lower_mnt = path.mnt;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;s_flags |= SB_ACTIVE;</div><div class='del'>-	return dget(s-&gt;s_root);</div><div class='add'>+	fc-&gt;root = dget(s-&gt;s_root);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	path_put(&amp;path);</div><div class='ctx'> out1:</div><div class='ctx'> 	deactivate_locked_super(s);</div><div class='ctx'> out:</div><div class='del'>-	if (sbi) {</div><div class='add'>+	if (sbi)</div><div class='ctx'> 		ecryptfs_destroy_mount_crypt_stat(&amp;sbi-&gt;mount_crypt_stat);</div><div class='del'>-		kmem_cache_free(ecryptfs_sb_info_cache, sbi);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_ERR "%s; rc = [%d]\n", err, rc);</div><div class='del'>-	return ERR_PTR(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -628,14 +579,59 @@ static void ecryptfs_kill_block_super(struct super_block *sb)</div><div class='ctx'> 	kill_anon_super(sb);</div><div class='ctx'> 	if (!sb_info)</div><div class='ctx'> 		return;</div><div class='add'>+	mntput(sb_info-&gt;lower_mnt);</div><div class='ctx'> 	ecryptfs_destroy_mount_crypt_stat(&amp;sb_info-&gt;mount_crypt_stat);</div><div class='ctx'> 	kmem_cache_free(ecryptfs_sb_info_cache, sb_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ecryptfs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct ecryptfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct ecryptfs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	kfree(ctx);</div><div class='add'>+</div><div class='add'>+	if (sbi) {</div><div class='add'>+		ecryptfs_destroy_mount_crypt_stat(&amp;sbi-&gt;mount_crypt_stat);</div><div class='add'>+		kmem_cache_free(ecryptfs_sb_info_cache, sbi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations ecryptfs_context_ops = {</div><div class='add'>+	.free		= ecryptfs_free_fc,</div><div class='add'>+	.parse_param	= ecryptfs_parse_param,</div><div class='add'>+	.get_tree	= ecryptfs_get_tree,</div><div class='add'>+	.reconfigure	= NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ecryptfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct ecryptfs_fs_context *ctx;</div><div class='add'>+	struct ecryptfs_sb_info *sbi = NULL;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct ecryptfs_fs_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL);</div><div class='add'>+	if (!sbi) {</div><div class='add'>+		kfree(ctx);</div><div class='add'>+		ctx = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ecryptfs_init_mount_crypt_stat(&amp;sbi-&gt;mount_crypt_stat);</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;s_fs_info = sbi;</div><div class='add'>+	fc-&gt;ops = &amp;ecryptfs_context_ops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct file_system_type ecryptfs_fs_type = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.name = "ecryptfs",</div><div class='del'>-	.mount = ecryptfs_mount,</div><div class='add'>+	.init_fs_context = ecryptfs_init_fs_context,</div><div class='add'>+	.parameters = ecryptfs_fs_param_spec,</div><div class='ctx'> 	.kill_sb = ecryptfs_kill_block_super,</div><div class='ctx'> 	.fs_flags = 0</div><div class='ctx'> };</div><div class='hunk'>@@ -672,11 +668,6 @@ static struct ecryptfs_cache_info {</div><div class='ctx'> 		.size = sizeof(struct ecryptfs_file_info),</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.cache = &amp;ecryptfs_dentry_info_cache,</div><div class='del'>-		.name = "ecryptfs_dentry_info_cache",</div><div class='del'>-		.size = sizeof(struct ecryptfs_dentry_info),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='ctx'> 		.cache = &amp;ecryptfs_inode_info_cache,</div><div class='ctx'> 		.name = "ecryptfs_inode_cache",</div><div class='ctx'> 		.size = sizeof(struct ecryptfs_inode_info),</div><div class='hunk'>@@ -769,7 +760,7 @@ static struct kobject *ecryptfs_kobj;</div><div class='ctx'> static ssize_t version_show(struct kobject *kobj,</div><div class='ctx'> 			    struct kobj_attribute *attr, char *buff)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buff, PAGE_SIZE, "%d\n", ECRYPTFS_VERSIONING_MASK);</div><div class='add'>+	return sysfs_emit(buff, "%d\n", ECRYPTFS_VERSIONING_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kobj_attribute version_attr = __ATTR_RO(version);</div><div class='head'>diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c<br/>index e2483acc4366..2c2b12fedeae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/mmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/mmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/mmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/mmap.c</a></div><div class='hunk'>@@ -19,51 +19,33 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "ecryptfs_kernel.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ecryptfs_get_locked_page</div><div class='del'>- *</div><div class='del'>- * Get one page from cache or lower f/s, return error otherwise.</div><div class='del'>- *</div><div class='del'>- * Returns locked and up-to-date page (if ok), with increased</div><div class='del'>- * refcnt.</div><div class='del'>- */</div><div class='del'>-struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index)</div><div class='del'>-{</div><div class='del'>-	struct page *page = read_mapping_page(inode-&gt;i_mapping, index, NULL);</div><div class='del'>-	if (!IS_ERR(page))</div><div class='del'>-		lock_page(page);</div><div class='del'>-	return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecryptfs_writepage</div><div class='del'>- * @page: Page that is locked before this call is made</div><div class='del'>- * @wbc: Write-back control structure</div><div class='del'>- *</div><div class='del'>- * Returns zero on success; non-zero otherwise</div><div class='del'>- *</div><div class='ctx'>  * This is where we encrypt the data and pass the encrypted data to</div><div class='ctx'>  * the lower filesystem.  In OpenPGP-compatible mode, we operate on</div><div class='ctx'>  * entire underlying packets.</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='add'>+static int ecryptfs_writepages(struct address_space *mapping,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = ecryptfs_encrypt_page(page);</div><div class='del'>-	if (rc) {</div><div class='del'>-		ecryptfs_printk(KERN_WARNING, "Error encrypting "</div><div class='del'>-				"page (upper index [0x%.16lx])\n", page-&gt;index);</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-		goto out;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;error))) {</div><div class='add'>+		error = ecryptfs_encrypt_page(folio);</div><div class='add'>+		if (error) {</div><div class='add'>+			ecryptfs_printk(KERN_WARNING,</div><div class='add'>+				"Error encrypting folio (index [0x%.16lx])\n",</div><div class='add'>+				folio-&gt;index);</div><div class='add'>+			folio_clear_uptodate(folio);</div><div class='add'>+			mapping_set_error(mapping, error);</div><div class='add'>+		}</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void strip_xattr_flag(char *page_virt,</div><div class='hunk'>@@ -97,7 +79,7 @@ static void strip_xattr_flag(char *page_virt,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_copy_up_encrypted_with_header</div><div class='del'>- * @page: Sort of a ``virtual'' representation of the encrypted lower</div><div class='add'>+ * @folio: Sort of a ``virtual'' representation of the encrypted lower</div><div class='ctx'>  *        file. The actual lower file does not have the metadata in</div><div class='ctx'>  *        the header. This is locked.</div><div class='ctx'>  * @crypt_stat: The eCryptfs inode's cryptographic context</div><div class='hunk'>@@ -106,7 +88,7 @@ static void strip_xattr_flag(char *page_virt,</div><div class='ctx'>  * seeing, with the header information inserted.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-ecryptfs_copy_up_encrypted_with_header(struct page *page,</div><div class='add'>+ecryptfs_copy_up_encrypted_with_header(struct folio *folio,</div><div class='ctx'> 				       struct ecryptfs_crypt_stat *crypt_stat)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t extent_num_in_page = 0;</div><div class='hunk'>@@ -115,9 +97,9 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (extent_num_in_page &lt; num_extents_per_page) {</div><div class='del'>-		loff_t view_extent_num = ((((loff_t)page-&gt;index)</div><div class='add'>+		loff_t view_extent_num = ((loff_t)folio-&gt;index</div><div class='ctx'> 					   * num_extents_per_page)</div><div class='del'>-					  + extent_num_in_page);</div><div class='add'>+					  + extent_num_in_page;</div><div class='ctx'> 		size_t num_header_extents_at_front =</div><div class='ctx'> 			(crypt_stat-&gt;metadata_size / crypt_stat-&gt;extent_size);</div><div class='ctx'> </div><div class='hunk'>@@ -125,21 +107,21 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,</div><div class='ctx'> 			/* This is a header extent */</div><div class='ctx'> 			char *page_virt;</div><div class='ctx'> </div><div class='del'>-			page_virt = kmap_local_page(page);</div><div class='add'>+			page_virt = kmap_local_folio(folio, 0);</div><div class='ctx'> 			memset(page_virt, 0, PAGE_SIZE);</div><div class='ctx'> 			/* TODO: Support more than one header extent */</div><div class='ctx'> 			if (view_extent_num == 0) {</div><div class='ctx'> 				size_t written;</div><div class='ctx'> </div><div class='ctx'> 				rc = ecryptfs_read_xattr_region(</div><div class='del'>-					page_virt, page-&gt;mapping-&gt;host);</div><div class='add'>+					page_virt, folio-&gt;mapping-&gt;host);</div><div class='ctx'> 				strip_xattr_flag(page_virt + 16, crypt_stat);</div><div class='ctx'> 				ecryptfs_write_header_metadata(page_virt + 20,</div><div class='ctx'> 							       crypt_stat,</div><div class='ctx'> 							       &amp;written);</div><div class='ctx'> 			}</div><div class='ctx'> 			kunmap_local(page_virt);</div><div class='del'>-			flush_dcache_page(page);</div><div class='add'>+			flush_dcache_folio(folio);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				printk(KERN_ERR "%s: Error reading xattr "</div><div class='ctx'> 				       "region; rc = [%d]\n", __func__, rc);</div><div class='hunk'>@@ -152,9 +134,9 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,</div><div class='ctx'> 				 - crypt_stat-&gt;metadata_size);</div><div class='ctx'> </div><div class='ctx'> 			rc = ecryptfs_read_lower_page_segment(</div><div class='del'>-				page, (lower_offset &gt;&gt; PAGE_SHIFT),</div><div class='add'>+				folio, (lower_offset &gt;&gt; PAGE_SHIFT),</div><div class='ctx'> 				(lower_offset &amp; ~PAGE_MASK),</div><div class='del'>-				crypt_stat-&gt;extent_size, page-&gt;mapping-&gt;host);</div><div class='add'>+				crypt_stat-&gt;extent_size, folio-&gt;mapping-&gt;host);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				printk(KERN_ERR "%s: Error attempting to read "</div><div class='ctx'> 				       "extent at offset [%lld] in the lower "</div><div class='hunk'>@@ -180,123 +162,119 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int ecryptfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct ecryptfs_crypt_stat *crypt_stat =</div><div class='del'>-		&amp;ecryptfs_inode_to_private(page-&gt;mapping-&gt;host)-&gt;crypt_stat;</div><div class='del'>-	int rc = 0;</div><div class='add'>+		&amp;ecryptfs_inode_to_private(inode)-&gt;crypt_stat;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!crypt_stat || !(crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED)) {</div><div class='del'>-		rc = ecryptfs_read_lower_page_segment(page, page-&gt;index, 0,</div><div class='del'>-						      PAGE_SIZE,</div><div class='del'>-						      page-&gt;mapping-&gt;host);</div><div class='add'>+		err = ecryptfs_read_lower_page_segment(folio, folio-&gt;index, 0,</div><div class='add'>+				folio_size(folio), inode);</div><div class='ctx'> 	} else if (crypt_stat-&gt;flags &amp; ECRYPTFS_VIEW_AS_ENCRYPTED) {</div><div class='ctx'> 		if (crypt_stat-&gt;flags &amp; ECRYPTFS_METADATA_IN_XATTR) {</div><div class='del'>-			rc = ecryptfs_copy_up_encrypted_with_header(page,</div><div class='del'>-								    crypt_stat);</div><div class='del'>-			if (rc) {</div><div class='add'>+			err = ecryptfs_copy_up_encrypted_with_header(folio,</div><div class='add'>+					crypt_stat);</div><div class='add'>+			if (err) {</div><div class='ctx'> 				printk(KERN_ERR "%s: Error attempting to copy "</div><div class='ctx'> 				       "the encrypted content from the lower "</div><div class='ctx'> 				       "file whilst inserting the metadata "</div><div class='del'>-				       "from the xattr into the header; rc = "</div><div class='del'>-				       "[%d]\n", __func__, rc);</div><div class='add'>+				       "from the xattr into the header; err = "</div><div class='add'>+				       "[%d]\n", __func__, err);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='del'>-			rc = ecryptfs_read_lower_page_segment(</div><div class='del'>-				page, page-&gt;index, 0, PAGE_SIZE,</div><div class='del'>-				page-&gt;mapping-&gt;host);</div><div class='del'>-			if (rc) {</div><div class='del'>-				printk(KERN_ERR "Error reading page; rc = "</div><div class='del'>-				       "[%d]\n", rc);</div><div class='add'>+			err = ecryptfs_read_lower_page_segment(folio,</div><div class='add'>+					folio-&gt;index, 0, folio_size(folio),</div><div class='add'>+					inode);</div><div class='add'>+			if (err) {</div><div class='add'>+				printk(KERN_ERR "Error reading page; err = "</div><div class='add'>+				       "[%d]\n", err);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		rc = ecryptfs_decrypt_page(page);</div><div class='del'>-		if (rc) {</div><div class='add'>+		err = ecryptfs_decrypt_page(folio);</div><div class='add'>+		if (err) {</div><div class='ctx'> 			ecryptfs_printk(KERN_ERR, "Error decrypting page; "</div><div class='del'>-					"rc = [%d]\n", rc);</div><div class='add'>+					"err = [%d]\n", err);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (rc)</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-	else</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	ecryptfs_printk(KERN_DEBUG, "Unlocking page with index = [0x%.16lx]\n",</div><div class='del'>-			page-&gt;index);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return rc;</div><div class='add'>+	ecryptfs_printk(KERN_DEBUG, "Unlocking folio with index = [0x%.16lx]\n",</div><div class='add'>+			folio-&gt;index);</div><div class='add'>+	folio_end_read(folio, err == 0);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called with lower inode mutex held.</div><div class='ctx'>  */</div><div class='del'>-static int fill_zeros_to_end_of_page(struct page *page, unsigned int to)</div><div class='add'>+static int fill_zeros_to_end_of_page(struct folio *folio, unsigned int to)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	int end_byte_in_page;</div><div class='ctx'> </div><div class='del'>-	if ((i_size_read(inode) / PAGE_SIZE) != page-&gt;index)</div><div class='add'>+	if ((i_size_read(inode) / PAGE_SIZE) != folio-&gt;index)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	end_byte_in_page = i_size_read(inode) % PAGE_SIZE;</div><div class='ctx'> 	if (to &gt; end_byte_in_page)</div><div class='ctx'> 		end_byte_in_page = to;</div><div class='del'>-	zero_user_segment(page, end_byte_in_page, PAGE_SIZE);</div><div class='add'>+	folio_zero_segment(folio, end_byte_in_page, PAGE_SIZE);</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_write_begin</div><div class='del'>- * @file: The eCryptfs file</div><div class='add'>+ * @iocb: I/O control block for the eCryptfs file</div><div class='ctx'>  * @mapping: The eCryptfs object</div><div class='ctx'>  * @pos: The file offset at which to start writing</div><div class='ctx'>  * @len: Length of the write</div><div class='del'>- * @pagep: Pointer to return the page</div><div class='add'>+ * @foliop: Pointer to return the folio</div><div class='ctx'>  * @fsdata: Pointer to return fs data (unused)</div><div class='ctx'>  *</div><div class='ctx'>  * This function must zero any hole we create</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_write_begin(struct file *file,</div><div class='add'>+static int ecryptfs_write_begin(const struct kiocb *iocb,</div><div class='ctx'> 			struct address_space *mapping,</div><div class='ctx'> 			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+			struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	loff_t prev_page_end_size;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	page = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	*pagep = page;</div><div class='add'>+	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	prev_page_end_size = ((loff_t)index &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		struct ecryptfs_crypt_stat *crypt_stat =</div><div class='ctx'> 			&amp;ecryptfs_inode_to_private(mapping-&gt;host)-&gt;crypt_stat;</div><div class='ctx'> </div><div class='ctx'> 		if (!(crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED)) {</div><div class='ctx'> 			rc = ecryptfs_read_lower_page_segment(</div><div class='del'>-				page, index, 0, PAGE_SIZE, mapping-&gt;host);</div><div class='add'>+				folio, index, 0, PAGE_SIZE, mapping-&gt;host);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				printk(KERN_ERR "%s: Error attempting to read "</div><div class='ctx'> 				       "lower page segment; rc = [%d]\n",</div><div class='ctx'> 				       __func__, rc);</div><div class='del'>-				ClearPageUptodate(page);</div><div class='add'>+				folio_clear_uptodate(folio);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			} else</div><div class='del'>-				SetPageUptodate(page);</div><div class='add'>+				folio_mark_uptodate(folio);</div><div class='ctx'> 		} else if (crypt_stat-&gt;flags &amp; ECRYPTFS_VIEW_AS_ENCRYPTED) {</div><div class='ctx'> 			if (crypt_stat-&gt;flags &amp; ECRYPTFS_METADATA_IN_XATTR) {</div><div class='ctx'> 				rc = ecryptfs_copy_up_encrypted_with_header(</div><div class='del'>-					page, crypt_stat);</div><div class='add'>+					folio, crypt_stat);</div><div class='ctx'> 				if (rc) {</div><div class='ctx'> 					printk(KERN_ERR "%s: Error attempting "</div><div class='ctx'> 					       "to copy the encrypted content "</div><div class='hunk'>@@ -304,47 +282,47 @@ static int ecryptfs_write_begin(struct file *file,</div><div class='ctx'> 					       "inserting the metadata from "</div><div class='ctx'> 					       "the xattr into the header; rc "</div><div class='ctx'> 					       "= [%d]\n", __func__, rc);</div><div class='del'>-					ClearPageUptodate(page);</div><div class='add'>+					folio_clear_uptodate(folio);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				SetPageUptodate(page);</div><div class='add'>+				folio_mark_uptodate(folio);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				rc = ecryptfs_read_lower_page_segment(</div><div class='del'>-					page, index, 0, PAGE_SIZE,</div><div class='add'>+					folio, index, 0, PAGE_SIZE,</div><div class='ctx'> 					mapping-&gt;host);</div><div class='ctx'> 				if (rc) {</div><div class='ctx'> 					printk(KERN_ERR "%s: Error reading "</div><div class='ctx'> 					       "page; rc = [%d]\n",</div><div class='ctx'> 					       __func__, rc);</div><div class='del'>-					ClearPageUptodate(page);</div><div class='add'>+					folio_clear_uptodate(folio);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				SetPageUptodate(page);</div><div class='add'>+				folio_mark_uptodate(folio);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (prev_page_end_size</div><div class='del'>-			    &gt;= i_size_read(page-&gt;mapping-&gt;host)) {</div><div class='del'>-				zero_user(page, 0, PAGE_SIZE);</div><div class='del'>-				SetPageUptodate(page);</div><div class='add'>+			    &gt;= i_size_read(mapping-&gt;host)) {</div><div class='add'>+				folio_zero_range(folio, 0, PAGE_SIZE);</div><div class='add'>+				folio_mark_uptodate(folio);</div><div class='ctx'> 			} else if (len &lt; PAGE_SIZE) {</div><div class='del'>-				rc = ecryptfs_decrypt_page(page);</div><div class='add'>+				rc = ecryptfs_decrypt_page(folio);</div><div class='ctx'> 				if (rc) {</div><div class='ctx'> 					printk(KERN_ERR "%s: Error decrypting "</div><div class='ctx'> 					       "page at index [%ld]; "</div><div class='ctx'> 					       "rc = [%d]\n",</div><div class='del'>-					       __func__, page-&gt;index, rc);</div><div class='del'>-					ClearPageUptodate(page);</div><div class='add'>+					       __func__, folio-&gt;index, rc);</div><div class='add'>+					folio_clear_uptodate(folio);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				SetPageUptodate(page);</div><div class='add'>+				folio_mark_uptodate(folio);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* If creating a page or more of holes, zero them out via truncate.</div><div class='ctx'> 	 * Note, this will increase i_size. */</div><div class='ctx'> 	if (index != 0) {</div><div class='del'>-		if (prev_page_end_size &gt; i_size_read(page-&gt;mapping-&gt;host)) {</div><div class='del'>-			rc = ecryptfs_truncate(file-&gt;f_path.dentry,</div><div class='add'>+		if (prev_page_end_size &gt; i_size_read(mapping-&gt;host)) {</div><div class='add'>+			rc = ecryptfs_truncate(iocb-&gt;ki_filp-&gt;f_path.dentry,</div><div class='ctx'> 					       prev_page_end_size);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				printk(KERN_ERR "%s: Error on attempt to "</div><div class='hunk'>@@ -359,12 +337,11 @@ static int ecryptfs_write_begin(struct file *file,</div><div class='ctx'> 	 * of page?  Zero it out. */</div><div class='ctx'> 	if ((i_size_read(mapping-&gt;host) == prev_page_end_size)</div><div class='ctx'> 	    &amp;&amp; (pos != 0))</div><div class='del'>-		zero_user(page, 0, PAGE_SIZE);</div><div class='add'>+		folio_zero_range(folio, 0, PAGE_SIZE);</div><div class='ctx'> out:</div><div class='ctx'> 	if (unlikely(rc)) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		*pagep = NULL;</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -452,18 +429,18 @@ int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_write_end</div><div class='del'>- * @file: The eCryptfs file object</div><div class='add'>+ * @iocb: I/O control block for the eCryptfs file</div><div class='ctx'>  * @mapping: The eCryptfs object</div><div class='ctx'>  * @pos: The file position</div><div class='ctx'>  * @len: The length of the data (unused)</div><div class='ctx'>  * @copied: The amount of data copied</div><div class='del'>- * @page: The eCryptfs page</div><div class='add'>+ * @folio: The eCryptfs folio</div><div class='ctx'>  * @fsdata: The fsdata (unused)</div><div class='ctx'>  */</div><div class='del'>-static int ecryptfs_write_end(struct file *file,</div><div class='add'>+static int ecryptfs_write_end(const struct kiocb *iocb,</div><div class='ctx'> 			struct address_space *mapping,</div><div class='ctx'> 			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+			struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned from = pos &amp; (PAGE_SIZE - 1);</div><div class='hunk'>@@ -476,8 +453,8 @@ static int ecryptfs_write_end(struct file *file,</div><div class='ctx'> 	ecryptfs_printk(KERN_DEBUG, "Calling fill_zeros_to_end_of_page"</div><div class='ctx'> 			"(page w/ index = [0x%.16lx], to = [%d])\n", index, to);</div><div class='ctx'> 	if (!(crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED)) {</div><div class='del'>-		rc = ecryptfs_write_lower_page_segment(ecryptfs_inode, page, 0,</div><div class='del'>-						       to);</div><div class='add'>+		rc = ecryptfs_write_lower_page_segment(ecryptfs_inode,</div><div class='add'>+				folio, 0, to);</div><div class='ctx'> 		if (!rc) {</div><div class='ctx'> 			rc = copied;</div><div class='ctx'> 			fsstack_copy_inode_size(ecryptfs_inode,</div><div class='hunk'>@@ -485,21 +462,21 @@ static int ecryptfs_write_end(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		if (copied &lt; PAGE_SIZE) {</div><div class='ctx'> 			rc = 0;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Fills in zeros if 'to' goes beyond inode size */</div><div class='del'>-	rc = fill_zeros_to_end_of_page(page, to);</div><div class='add'>+	rc = fill_zeros_to_end_of_page(folio, to);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_WARNING, "Error attempting to fill "</div><div class='ctx'> 			"zeros in page with index = [0x%.16lx]\n", index);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	rc = ecryptfs_encrypt_page(page);</div><div class='add'>+	rc = ecryptfs_encrypt_page(folio);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		ecryptfs_printk(KERN_WARNING, "Error encrypting page (upper "</div><div class='ctx'> 				"index [0x%.16lx])\n", index);</div><div class='hunk'>@@ -518,8 +495,8 @@ static int ecryptfs_write_end(struct file *file,</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = copied;</div><div class='ctx'> out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -548,9 +525,10 @@ const struct address_space_operations ecryptfs_aops = {</div><div class='ctx'> 	.dirty_folio	= block_dirty_folio,</div><div class='ctx'> 	.invalidate_folio = block_invalidate_folio,</div><div class='ctx'> #endif</div><div class='del'>-	.writepage = ecryptfs_writepage,</div><div class='add'>+	.writepages = ecryptfs_writepages,</div><div class='ctx'> 	.read_folio = ecryptfs_read_folio,</div><div class='ctx'> 	.write_begin = ecryptfs_write_begin,</div><div class='ctx'> 	.write_end = ecryptfs_write_end,</div><div class='add'>+	.migrate_folio = filemap_migrate_folio,</div><div class='ctx'> 	.bmap = ecryptfs_bmap,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c<br/>index 3458f153a588..b3b451c2b941 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/read_write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/read_write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/read_write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/read_write.c</a></div><div class='hunk'>@@ -41,30 +41,29 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,</div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_write_lower_page_segment</div><div class='ctx'>  * @ecryptfs_inode: The eCryptfs inode</div><div class='del'>- * @page_for_lower: The page containing the data to be written to the</div><div class='add'>+ * @folio_for_lower: The folio containing the data to be written to the</div><div class='ctx'>  *                  lower file</div><div class='del'>- * @offset_in_page: The offset in the @page_for_lower from which to</div><div class='add'>+ * @offset_in_page: The offset in the @folio_for_lower from which to</div><div class='ctx'>  *                  start writing the data</div><div class='del'>- * @size: The amount of data from @page_for_lower to write to the</div><div class='add'>+ * @size: The amount of data from @folio_for_lower to write to the</div><div class='ctx'>  *        lower file</div><div class='ctx'>  *</div><div class='ctx'>  * Determines the byte offset in the file for the given page and</div><div class='ctx'>  * offset within the page, maps the page, and makes the call to write</div><div class='del'>- * the contents of @page_for_lower to the lower inode.</div><div class='add'>+ * the contents of @folio_for_lower to the lower inode.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='ctx'> int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,</div><div class='del'>-				      struct page *page_for_lower,</div><div class='add'>+				      struct folio *folio_for_lower,</div><div class='ctx'> 				      size_t offset_in_page, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	char *virt;</div><div class='ctx'> 	loff_t offset;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	offset = ((((loff_t)page_for_lower-&gt;index) &lt;&lt; PAGE_SHIFT)</div><div class='del'>-		  + offset_in_page);</div><div class='del'>-	virt = kmap_local_page(page_for_lower);</div><div class='add'>+	offset = (loff_t)folio_for_lower-&gt;index * PAGE_SIZE + offset_in_page;</div><div class='add'>+	virt = kmap_local_folio(folio_for_lower, 0);</div><div class='ctx'> 	rc = ecryptfs_write_lower(ecryptfs_inode, virt, offset, size);</div><div class='ctx'> 	if (rc &gt; 0)</div><div class='ctx'> 		rc = 0;</div><div class='hunk'>@@ -93,7 +92,6 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,</div><div class='ctx'> int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,</div><div class='ctx'> 		   size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct page *ecryptfs_page;</div><div class='ctx'> 	struct ecryptfs_crypt_stat *crypt_stat;</div><div class='ctx'> 	char *ecryptfs_page_virt;</div><div class='ctx'> 	loff_t ecryptfs_file_size = i_size_read(ecryptfs_inode);</div><div class='hunk'>@@ -111,6 +109,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,</div><div class='ctx'> 	else</div><div class='ctx'> 		pos = offset;</div><div class='ctx'> 	while (pos &lt; (offset + size)) {</div><div class='add'>+		struct folio *ecryptfs_folio;</div><div class='ctx'> 		pgoff_t ecryptfs_page_idx = (pos &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 		size_t start_offset_in_page = (pos &amp; ~PAGE_MASK);</div><div class='ctx'> 		size_t num_bytes = (PAGE_SIZE - start_offset_in_page);</div><div class='hunk'>@@ -130,17 +129,18 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,</div><div class='ctx'> 			if (num_bytes &gt; total_remaining_zeros)</div><div class='ctx'> 				num_bytes = total_remaining_zeros;</div><div class='ctx'> 		}</div><div class='del'>-		ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_inode,</div><div class='del'>-							 ecryptfs_page_idx);</div><div class='del'>-		if (IS_ERR(ecryptfs_page)) {</div><div class='del'>-			rc = PTR_ERR(ecryptfs_page);</div><div class='add'>+		ecryptfs_folio = read_mapping_folio(ecryptfs_inode-&gt;i_mapping,</div><div class='add'>+				ecryptfs_page_idx, NULL);</div><div class='add'>+		if (IS_ERR(ecryptfs_folio)) {</div><div class='add'>+			rc = PTR_ERR(ecryptfs_folio);</div><div class='ctx'> 			printk(KERN_ERR "%s: Error getting page at "</div><div class='ctx'> 			       "index [%ld] from eCryptfs inode "</div><div class='ctx'> 			       "mapping; rc = [%d]\n", __func__,</div><div class='ctx'> 			       ecryptfs_page_idx, rc);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		ecryptfs_page_virt = kmap_local_page(ecryptfs_page);</div><div class='add'>+		folio_lock(ecryptfs_folio);</div><div class='add'>+		ecryptfs_page_virt = kmap_local_folio(ecryptfs_folio, 0);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * pos: where we're now writing, offset: where the request was</div><div class='hunk'>@@ -164,17 +164,17 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,</div><div class='ctx'> 			data_offset += num_bytes;</div><div class='ctx'> 		}</div><div class='ctx'> 		kunmap_local(ecryptfs_page_virt);</div><div class='del'>-		flush_dcache_page(ecryptfs_page);</div><div class='del'>-		SetPageUptodate(ecryptfs_page);</div><div class='del'>-		unlock_page(ecryptfs_page);</div><div class='add'>+		flush_dcache_folio(ecryptfs_folio);</div><div class='add'>+		folio_mark_uptodate(ecryptfs_folio);</div><div class='add'>+		folio_unlock(ecryptfs_folio);</div><div class='ctx'> 		if (crypt_stat-&gt;flags &amp; ECRYPTFS_ENCRYPTED)</div><div class='del'>-			rc = ecryptfs_encrypt_page(ecryptfs_page);</div><div class='add'>+			rc = ecryptfs_encrypt_page(ecryptfs_folio);</div><div class='ctx'> 		else</div><div class='ctx'> 			rc = ecryptfs_write_lower_page_segment(ecryptfs_inode,</div><div class='del'>-						ecryptfs_page,</div><div class='add'>+						ecryptfs_folio,</div><div class='ctx'> 						start_offset_in_page,</div><div class='ctx'> 						data_offset);</div><div class='del'>-		put_page(ecryptfs_page);</div><div class='add'>+		folio_put(ecryptfs_folio);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Error encrypting "</div><div class='ctx'> 			       "page; rc = [%d]\n", __func__, rc);</div><div class='hunk'>@@ -228,7 +228,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecryptfs_read_lower_page_segment</div><div class='del'>- * @page_for_ecryptfs: The page into which data for eCryptfs will be</div><div class='add'>+ * @folio_for_ecryptfs: The folio into which data for eCryptfs will be</div><div class='ctx'>  *                     written</div><div class='ctx'>  * @page_index: Page index in @page_for_ecryptfs from which to start</div><div class='ctx'>  *		writing</div><div class='hunk'>@@ -243,7 +243,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success; non-zero otherwise</div><div class='ctx'>  */</div><div class='del'>-int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,</div><div class='add'>+int ecryptfs_read_lower_page_segment(struct folio *folio_for_ecryptfs,</div><div class='ctx'> 				     pgoff_t page_index,</div><div class='ctx'> 				     size_t offset_in_page, size_t size,</div><div class='ctx'> 				     struct inode *ecryptfs_inode)</div><div class='hunk'>@@ -252,12 +252,12 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,</div><div class='ctx'> 	loff_t offset;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	offset = ((((loff_t)page_index) &lt;&lt; PAGE_SHIFT) + offset_in_page);</div><div class='del'>-	virt = kmap_local_page(page_for_ecryptfs);</div><div class='add'>+	offset = (loff_t)page_index * PAGE_SIZE + offset_in_page;</div><div class='add'>+	virt = kmap_local_folio(folio_for_ecryptfs, 0);</div><div class='ctx'> 	rc = ecryptfs_read_lower(virt, offset, size, ecryptfs_inode);</div><div class='ctx'> 	if (rc &gt; 0)</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 	kunmap_local(virt);</div><div class='del'>-	flush_dcache_page(page_for_ecryptfs);</div><div class='add'>+	flush_dcache_folio(folio_for_ecryptfs);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c<br/>index 0b1c878317ab..3bc21d677564 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ecryptfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ecryptfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ecryptfs/super.c</a></div><div class='hunk'>@@ -41,10 +41,7 @@ static struct inode *ecryptfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	inode_info = alloc_inode_sb(sb, ecryptfs_inode_info_cache, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!inode_info))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (ecryptfs_init_crypt_stat(&amp;inode_info-&gt;crypt_stat)) {</div><div class='del'>-		kmem_cache_free(ecryptfs_inode_info_cache, inode_info);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	ecryptfs_init_crypt_stat(&amp;inode_info-&gt;crypt_stat);</div><div class='ctx'> 	mutex_init(&amp;inode_info-&gt;lower_file_mutex);</div><div class='ctx'> 	atomic_set(&amp;inode_info-&gt;lower_file_count, 0);</div><div class='ctx'> 	inode_info-&gt;lower_file = NULL;</div><div class='hunk'>@@ -172,7 +169,6 @@ const struct super_operations ecryptfs_sops = {</div><div class='ctx'> 	.destroy_inode = ecryptfs_destroy_inode,</div><div class='ctx'> 	.free_inode = ecryptfs_free_inode,</div><div class='ctx'> 	.statfs = ecryptfs_statfs,</div><div class='del'>-	.remount_fs = NULL,</div><div class='ctx'> 	.evict_inode = ecryptfs_evict_inode,</div><div class='ctx'> 	.show_options = ecryptfs_show_options</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c<br/>index 7e9961639802..cb1b6d0c3454 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efivarfs/file.c</a></div><div class='hunk'>@@ -36,28 +36,41 @@ static ssize_t efivarfs_file_write(struct file *file,</div><div class='ctx'> 	if (IS_ERR(data))</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> </div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	if (var-&gt;removed) {</div><div class='add'>+		/*</div><div class='add'>+		 * file got removed; don't allow a set.  Caused by an</div><div class='add'>+		 * unsuccessful create or successful delete write</div><div class='add'>+		 * racing with us.</div><div class='add'>+		 */</div><div class='add'>+		bytes = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bytes = efivar_entry_set_get_size(var, attributes, &amp;datasize,</div><div class='ctx'> 					  data, &amp;set);</div><div class='del'>-	if (!set &amp;&amp; bytes) {</div><div class='add'>+	if (!set) {</div><div class='ctx'> 		if (bytes == -ENOENT)</div><div class='ctx'> 			bytes = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bytes == -ENOENT) {</div><div class='del'>-		drop_nlink(inode);</div><div class='del'>-		d_delete(file-&gt;f_path.dentry);</div><div class='del'>-		dput(file-&gt;f_path.dentry);</div><div class='add'>+		/*</div><div class='add'>+		 * zero size signals to release that the write deleted</div><div class='add'>+		 * the variable</div><div class='add'>+		 */</div><div class='add'>+		i_size_write(inode, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		inode_lock(inode);</div><div class='ctx'> 		i_size_write(inode, datasize + sizeof(attributes));</div><div class='ctx'> 		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='del'>-		inode_unlock(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bytes = count;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='ctx'> 	return bytes;</div><div class='hunk'>@@ -106,9 +119,36 @@ out_free:</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int efivarfs_file_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct efivar_entry *var = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	var-&gt;removed = (--var-&gt;open_count == 0 &amp;&amp; i_size_read(inode) == 0);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+	if (var-&gt;removed)</div><div class='add'>+		simple_recursive_removal(file-&gt;f_path.dentry, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efivarfs_file_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct efivar_entry *entry = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = entry;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	entry-&gt;open_count++;</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations efivarfs_file_operations = {</div><div class='del'>-	.open	= simple_open,</div><div class='del'>-	.read	= efivarfs_file_read,</div><div class='del'>-	.write	= efivarfs_file_write,</div><div class='del'>-	.llseek	= no_llseek,</div><div class='add'>+	.open		= efivarfs_file_open,</div><div class='add'>+	.read		= efivarfs_file_read,</div><div class='add'>+	.write		= efivarfs_file_write,</div><div class='add'>+	.release	= efivarfs_file_release,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c<br/>index 586446e02ef7..95dcad83da11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efivarfs/inode.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ struct inode *efivarfs_get_inode(struct super_block *sb,</div><div class='ctx'>  *</div><div class='ctx'>  *	VariableName-12345678-1234-1234-1234-1234567891bc</div><div class='ctx'>  */</div><div class='del'>-bool efivarfs_valid_name(const char *str, int len)</div><div class='add'>+static bool efivarfs_valid_name(const char *str, int len)</div><div class='ctx'> {</div><div class='ctx'> 	const char *s = str + len - EFI_VARIABLE_GUID_LEN;</div><div class='ctx'> </div><div class='hunk'>@@ -77,39 +77,34 @@ bool efivarfs_valid_name(const char *str, int len)</div><div class='ctx'> static int efivarfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			   struct dentry *dentry, umode_t mode, bool excl)</div><div class='ctx'> {</div><div class='del'>-	struct efivarfs_fs_info *info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> 	struct efivar_entry *var;</div><div class='ctx'> 	int namelen, i = 0, err = 0;</div><div class='ctx'> 	bool is_removable = false;</div><div class='add'>+	efi_guid_t vendor;</div><div class='ctx'> </div><div class='ctx'> 	if (!efivarfs_valid_name(dentry-&gt;d_name.name, dentry-&gt;d_name.len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	var = kzalloc(sizeof(struct efivar_entry), GFP_KERNEL);</div><div class='del'>-	if (!var)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	/* length of the variable name itself: remove GUID and separator */</div><div class='ctx'> 	namelen = dentry-&gt;d_name.len - EFI_VARIABLE_GUID_LEN - 1;</div><div class='ctx'> </div><div class='del'>-	err = guid_parse(dentry-&gt;d_name.name + namelen + 1, &amp;var-&gt;var.VendorGuid);</div><div class='add'>+	err = guid_parse(dentry-&gt;d_name.name + namelen + 1, &amp;vendor);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	if (guid_equal(&amp;var-&gt;var.VendorGuid, &amp;LINUX_EFI_RANDOM_SEED_TABLE_GUID)) {</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		return err;</div><div class='add'>+	if (guid_equal(&amp;vendor, &amp;LINUX_EFI_RANDOM_SEED_TABLE_GUID))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (efivar_variable_is_removable(var-&gt;var.VendorGuid,</div><div class='add'>+	if (efivar_variable_is_removable(vendor,</div><div class='ctx'> 					 dentry-&gt;d_name.name, namelen))</div><div class='ctx'> 		is_removable = true;</div><div class='ctx'> </div><div class='ctx'> 	inode = efivarfs_get_inode(dir-&gt;i_sb, dir, mode, 0, is_removable);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!inode)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	var = efivar_entry(inode);</div><div class='add'>+</div><div class='add'>+	var-&gt;var.VendorGuid = vendor;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; namelen; i++)</div><div class='ctx'> 		var-&gt;var.VariableName[i] = dentry-&gt;d_name.name[i];</div><div class='hunk'>@@ -117,21 +112,10 @@ static int efivarfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	var-&gt;var.VariableName[i] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_private = var;</div><div class='del'>-	kmemleak_ignore(var);</div><div class='ctx'> </div><div class='del'>-	err = efivar_entry_add(var, &amp;info-&gt;efivarfs_list);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	dget(dentry);</div><div class='del'>-out:</div><div class='del'>-	if (err) {</div><div class='del'>-		kfree(var);</div><div class='del'>-		if (inode)</div><div class='del'>-			iput(inode);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int efivarfs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='hunk'>@@ -141,9 +125,7 @@ static int efivarfs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	if (efivar_entry_delete(var))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	drop_nlink(d_inode(dentry));</div><div class='del'>-	dput(dentry);</div><div class='del'>-	return 0;</div><div class='add'>+	return simple_unlink(dir, dentry);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct inode_operations efivarfs_dir_inode_operations = {</div><div class='hunk'>@@ -153,7 +135,7 @@ const struct inode_operations efivarfs_dir_inode_operations = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+efivarfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i_flags;</div><div class='ctx'> 	unsigned int flags = 0;</div><div class='hunk'>@@ -169,7 +151,7 @@ efivarfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> efivarfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +169,24 @@ efivarfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* copy of simple_setattr except that it doesn't do i_size updates */</div><div class='add'>+static int efivarfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		   struct iattr *iattr)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = setattr_prepare(idmap, dentry, iattr);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	setattr_copy(idmap, inode, iattr);</div><div class='add'>+	mark_inode_dirty(inode);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct inode_operations efivarfs_file_inode_operations = {</div><div class='ctx'> 	.fileattr_get = efivarfs_fileattr_get,</div><div class='ctx'> 	.fileattr_set = efivarfs_fileattr_set,</div><div class='add'>+	.setattr      = efivarfs_setattr,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/efivarfs/internal.h b/fs/efivarfs/internal.h<br/>index 169252e6dc46..f913b6824289 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efivarfs/internal.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #ifndef EFIVAR_FS_INTERNAL_H</div><div class='ctx'> #define EFIVAR_FS_INTERNAL_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct efivarfs_mount_opts {</div><div class='hunk'>@@ -16,7 +15,6 @@ struct efivarfs_mount_opts {</div><div class='ctx'> </div><div class='ctx'> struct efivarfs_fs_info {</div><div class='ctx'> 	struct efivarfs_mount_opts mount_opts;</div><div class='del'>-	struct list_head efivarfs_list;</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	struct notifier_block nb;</div><div class='ctx'> };</div><div class='hunk'>@@ -24,25 +22,23 @@ struct efivarfs_fs_info {</div><div class='ctx'> struct efi_variable {</div><div class='ctx'> 	efi_char16_t  VariableName[EFI_VAR_NAME_LEN/sizeof(efi_char16_t)];</div><div class='ctx'> 	efi_guid_t    VendorGuid;</div><div class='del'>-	unsigned long DataSize;</div><div class='del'>-	__u8          Data[1024];</div><div class='del'>-	efi_status_t  Status;</div><div class='del'>-	__u32         Attributes;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct efivar_entry {</div><div class='ctx'> 	struct efi_variable var;</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct kobject kobj;</div><div class='add'>+	struct inode vfs_inode;</div><div class='add'>+	unsigned long open_count;</div><div class='add'>+	bool removed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *,</div><div class='del'>-			    struct list_head *),</div><div class='del'>-		void *data, bool duplicates, struct list_head *head);</div><div class='add'>+static inline struct efivar_entry *efivar_entry(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return container_of(inode, struct efivar_entry, vfs_inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *),</div><div class='add'>+		void *data, bool duplicate_check);</div><div class='ctx'> </div><div class='del'>-int efivar_entry_add(struct efivar_entry *entry, struct list_head *head);</div><div class='del'>-void __efivar_entry_add(struct efivar_entry *entry, struct list_head *head);</div><div class='del'>-void efivar_entry_remove(struct efivar_entry *entry);</div><div class='ctx'> int efivar_entry_delete(struct efivar_entry *entry);</div><div class='ctx'> </div><div class='ctx'> int efivar_entry_size(struct efivar_entry *entry, unsigned long *size);</div><div class='hunk'>@@ -53,17 +49,17 @@ int efivar_entry_get(struct efivar_entry *entry, u32 *attributes,</div><div class='ctx'> int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,</div><div class='ctx'> 			      unsigned long *size, void *data, bool *set);</div><div class='ctx'> </div><div class='del'>-int efivar_entry_iter(int (*func)(struct efivar_entry *, void *),</div><div class='del'>-		      struct list_head *head, void *data);</div><div class='ctx'> </div><div class='ctx'> bool efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,</div><div class='ctx'> 		     unsigned long data_size);</div><div class='ctx'> bool efivar_variable_is_removable(efi_guid_t vendor, const char *name,</div><div class='ctx'> 				  size_t len);</div><div class='add'>+char *efivar_get_utf8name(const efi_char16_t *name16, efi_guid_t *vendor);</div><div class='add'>+bool efivarfs_variable_is_present(efi_char16_t *variable_name,</div><div class='add'>+				  efi_guid_t *vendor, void *data);</div><div class='ctx'> </div><div class='ctx'> extern const struct file_operations efivarfs_file_operations;</div><div class='ctx'> extern const struct inode_operations efivarfs_dir_inode_operations;</div><div class='del'>-extern bool efivarfs_valid_name(const char *str, int len);</div><div class='ctx'> extern struct inode *efivarfs_get_inode(struct super_block *sb,</div><div class='ctx'> 			const struct inode *dir, int mode, dev_t dev,</div><div class='ctx'> 			bool is_removable);</div><div class='head'>diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c<br/>index 6038dd39367a..9da992925920 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efivarfs/super.c</a></div><div class='hunk'>@@ -13,12 +13,15 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/ucs2_string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='add'>+#include "../internal.h"</div><div class='ctx'> </div><div class='ctx'> static int efivarfs_ops_notifier(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 				 void *data)</div><div class='hunk'>@@ -39,9 +42,24 @@ static int efivarfs_ops_notifier(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void efivarfs_evict_inode(struct inode *inode)</div><div class='add'>+static struct inode *efivarfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	clear_inode(inode);</div><div class='add'>+	struct efivar_entry *entry = kzalloc(sizeof(*entry), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!entry)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	inode_init_once(&amp;entry-&gt;vfs_inode);</div><div class='add'>+	entry-&gt;removed = false;</div><div class='add'>+</div><div class='add'>+	return &amp;entry-&gt;vfs_inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void efivarfs_free_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct efivar_entry *entry = efivar_entry(inode);</div><div class='add'>+</div><div class='add'>+	kfree(entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int efivarfs_show_options(struct seq_file *m, struct dentry *root)</div><div class='hunk'>@@ -103,11 +121,18 @@ static int efivarfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int efivarfs_freeze_fs(struct super_block *sb);</div><div class='add'>+static int efivarfs_unfreeze_fs(struct super_block *sb);</div><div class='add'>+</div><div class='ctx'> static const struct super_operations efivarfs_ops = {</div><div class='ctx'> 	.statfs = efivarfs_statfs,</div><div class='del'>-	.drop_inode = generic_delete_inode,</div><div class='del'>-	.evict_inode = efivarfs_evict_inode,</div><div class='add'>+	.drop_inode = inode_just_drop,</div><div class='add'>+	.alloc_inode = efivarfs_alloc_inode,</div><div class='add'>+	.free_inode = efivarfs_free_inode,</div><div class='ctx'> 	.show_options = efivarfs_show_options,</div><div class='add'>+	.freeze_fs = efivarfs_freeze_fs,</div><div class='add'>+	.unfreeze_fs = efivarfs_unfreeze_fs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -127,6 +152,10 @@ static int efivarfs_d_compare(const struct dentry *dentry,</div><div class='ctx'> {</div><div class='ctx'> 	int guid = len - EFI_VARIABLE_GUID_LEN;</div><div class='ctx'> </div><div class='add'>+	/* Parallel lookups may produce a temporary invalid filename */</div><div class='add'>+	if (guid &lt;= 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	if (name-&gt;len != len)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -144,9 +173,6 @@ static int efivarfs_d_hash(const struct dentry *dentry, struct qstr *qstr)</div><div class='ctx'> 	const unsigned char *s = qstr-&gt;name;</div><div class='ctx'> 	unsigned int len = qstr-&gt;len;</div><div class='ctx'> </div><div class='del'>-	if (!efivarfs_valid_name(s, len))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	while (len-- &gt; EFI_VARIABLE_GUID_LEN)</div><div class='ctx'> 		hash = partial_name_hash(*s++, hash);</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +187,6 @@ static int efivarfs_d_hash(const struct dentry *dentry, struct qstr *qstr)</div><div class='ctx'> static const struct dentry_operations efivarfs_d_ops = {</div><div class='ctx'> 	.d_compare = efivarfs_d_compare,</div><div class='ctx'> 	.d_hash = efivarfs_d_hash,</div><div class='del'>-	.d_delete = always_delete_dentry,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dentry *efivarfs_alloc_dentry(struct dentry *parent, char *name)</div><div class='hunk'>@@ -184,56 +209,60 @@ static struct dentry *efivarfs_alloc_dentry(struct dentry *parent, char *name)</div><div class='ctx'> 	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,</div><div class='del'>-			     unsigned long name_size, void *data,</div><div class='del'>-			     struct list_head *list)</div><div class='add'>+bool efivarfs_variable_is_present(efi_char16_t *variable_name,</div><div class='add'>+				  efi_guid_t *vendor, void *data)</div><div class='add'>+{</div><div class='add'>+	char *name = efivar_get_utf8name(variable_name, vendor);</div><div class='add'>+	struct super_block *sb = data;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		/*</div><div class='add'>+		 * If the allocation failed there'll already be an</div><div class='add'>+		 * error in the log (and likely a huge and growing</div><div class='add'>+		 * number of them since they system will be under</div><div class='add'>+		 * extreme memory pressure), so simply assume</div><div class='add'>+		 * collision for safety but don't add to the log</div><div class='add'>+		 * flood.</div><div class='add'>+		 */</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	dentry = try_lookup_noperm(&amp;QSTR(name), sb-&gt;s_root);</div><div class='add'>+	kfree(name);</div><div class='add'>+	if (!IS_ERR_OR_NULL(dentry))</div><div class='add'>+		dput(dentry);</div><div class='add'>+</div><div class='add'>+	return dentry != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efivarfs_create_dentry(struct super_block *sb, efi_char16_t *name16,</div><div class='add'>+				  unsigned long name_size, efi_guid_t vendor,</div><div class='add'>+				  char *name)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = (struct super_block *)data;</div><div class='ctx'> 	struct efivar_entry *entry;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	struct dentry *dentry, *root = sb-&gt;s_root;</div><div class='ctx'> 	unsigned long size = 0;</div><div class='del'>-	char *name;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	bool is_removable = false;</div><div class='ctx'> </div><div class='del'>-	if (guid_equal(&amp;vendor, &amp;LINUX_EFI_RANDOM_SEED_TABLE_GUID))</div><div class='del'>-		return 0;</div><div class='add'>+	/* length of the variable name itself: remove GUID and separator */</div><div class='add'>+	len = strlen(name) - EFI_VARIABLE_GUID_LEN - 1;</div><div class='ctx'> </div><div class='del'>-	entry = kzalloc(sizeof(*entry), GFP_KERNEL);</div><div class='del'>-	if (!entry)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	memcpy(entry-&gt;var.VariableName, name16, name_size);</div><div class='del'>-	memcpy(&amp;(entry-&gt;var.VendorGuid), &amp;vendor, sizeof(efi_guid_t));</div><div class='del'>-</div><div class='del'>-	len = ucs2_utf8size(entry-&gt;var.VariableName);</div><div class='del'>-</div><div class='del'>-	/* name, plus '-', plus GUID, plus NUL*/</div><div class='del'>-	name = kmalloc(len + 1 + EFI_VARIABLE_GUID_LEN + 1, GFP_KERNEL);</div><div class='del'>-	if (!name)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	ucs2_as_utf8(name, entry-&gt;var.VariableName, len);</div><div class='del'>-</div><div class='del'>-	if (efivar_variable_is_removable(entry-&gt;var.VendorGuid, name, len))</div><div class='add'>+	if (efivar_variable_is_removable(vendor, name, len))</div><div class='ctx'> 		is_removable = true;</div><div class='ctx'> </div><div class='del'>-	name[len] = '-';</div><div class='del'>-</div><div class='del'>-	efi_guid_to_str(&amp;entry-&gt;var.VendorGuid, name + len + 1);</div><div class='del'>-</div><div class='del'>-	name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';</div><div class='del'>-</div><div class='del'>-	/* replace invalid slashes like kobject_set_name_vargs does for /sys/firmware/efi/vars. */</div><div class='del'>-	strreplace(name, '/', '!');</div><div class='del'>-</div><div class='ctx'> 	inode = efivarfs_get_inode(sb, d_inode(root), S_IFREG | 0644, 0,</div><div class='ctx'> 				   is_removable);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		goto fail_name;</div><div class='ctx'> </div><div class='add'>+	entry = efivar_entry(inode);</div><div class='add'>+</div><div class='add'>+	memcpy(entry-&gt;var.VariableName, name16, name_size);</div><div class='add'>+	memcpy(&amp;(entry-&gt;var.VendorGuid), &amp;vendor, sizeof(efi_guid_t));</div><div class='add'>+</div><div class='ctx'> 	dentry = efivarfs_alloc_dentry(root, name);</div><div class='ctx'> 	if (IS_ERR(dentry)) {</div><div class='ctx'> 		err = PTR_ERR(dentry);</div><div class='hunk'>@@ -241,16 +270,16 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__efivar_entry_get(entry, NULL, &amp;size, NULL);</div><div class='del'>-	__efivar_entry_add(entry, list);</div><div class='ctx'> </div><div class='ctx'> 	/* copied by the above to local storage in the dentry. */</div><div class='ctx'> 	kfree(name);</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	inode-&gt;i_private = entry;</div><div class='del'>-	i_size_write(inode, size + sizeof(entry-&gt;var.Attributes));</div><div class='add'>+	i_size_write(inode, size + sizeof(__u32)); /* attributes + data */</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	d_add(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+	dput(dentry);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -258,16 +287,24 @@ fail_inode:</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> fail_name:</div><div class='ctx'> 	kfree(name);</div><div class='del'>-fail:</div><div class='del'>-	kfree(entry);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efivarfs_destroy(struct efivar_entry *entry, void *data)</div><div class='add'>+static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,</div><div class='add'>+			     unsigned long name_size, void *data)</div><div class='ctx'> {</div><div class='del'>-	efivar_entry_remove(entry);</div><div class='del'>-	kfree(entry);</div><div class='del'>-	return 0;</div><div class='add'>+	struct super_block *sb = (struct super_block *)data;</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	if (guid_equal(&amp;vendor, &amp;LINUX_EFI_RANDOM_SEED_TABLE_GUID))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	name = efivar_get_utf8name(name16, &amp;vendor);</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return efivarfs_create_dentry(sb, name16, name_size, vendor, name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -275,8 +312,8 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fs_parameter_spec efivarfs_parameters[] = {</div><div class='del'>-	fsparam_u32("uid", Opt_uid),</div><div class='del'>-	fsparam_u32("gid", Opt_gid),</div><div class='add'>+	fsparam_uid("uid", Opt_uid),</div><div class='add'>+	fsparam_gid("gid", Opt_gid),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -293,14 +330,10 @@ static int efivarfs_parse_param(struct fs_context *fc, struct fs_parameter *para</div><div class='ctx'> </div><div class='ctx'> 	switch (opt) {</div><div class='ctx'> 	case Opt_uid:</div><div class='del'>-		opts-&gt;uid = make_kuid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!uid_valid(opts-&gt;uid))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		opts-&gt;uid = result.uid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_gid:</div><div class='del'>-		opts-&gt;gid = make_kgid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!gid_valid(opts-&gt;gid))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		opts-&gt;gid = result.gid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -321,7 +354,8 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_blocksize_bits    = PAGE_SHIFT;</div><div class='ctx'> 	sb-&gt;s_magic             = EFIVARFS_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op                = &amp;efivarfs_ops;</div><div class='del'>-	sb-&gt;s_d_op		= &amp;efivarfs_d_ops;</div><div class='add'>+	set_default_d_op(sb, &amp;efivarfs_d_ops);</div><div class='add'>+	sb-&gt;s_d_flags |= DCACHE_DONTCACHE;</div><div class='ctx'> 	sb-&gt;s_time_gran         = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!efivar_supports_writes())</div><div class='hunk'>@@ -343,12 +377,7 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = efivar_init(efivarfs_callback, (void *)sb, true,</div><div class='del'>-			  &amp;sfi-&gt;efivarfs_list);</div><div class='del'>-	if (err)</div><div class='del'>-		efivar_entry_iter(efivarfs_destroy, &amp;sfi-&gt;efivarfs_list, NULL);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return efivar_init(efivarfs_callback, sb, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int efivarfs_get_tree(struct fs_context *fc)</div><div class='hunk'>@@ -366,12 +395,109 @@ static int efivarfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void efivarfs_free(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;s_fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct fs_context_operations efivarfs_context_ops = {</div><div class='ctx'> 	.get_tree	= efivarfs_get_tree,</div><div class='ctx'> 	.parse_param	= efivarfs_parse_param,</div><div class='ctx'> 	.reconfigure	= efivarfs_reconfigure,</div><div class='add'>+	.free		= efivarfs_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int efivarfs_check_missing(efi_char16_t *name16, efi_guid_t vendor,</div><div class='add'>+				  unsigned long name_size, void *data)</div><div class='add'>+{</div><div class='add'>+	char *name;</div><div class='add'>+	struct super_block *sb = data;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (guid_equal(&amp;vendor, &amp;LINUX_EFI_RANDOM_SEED_TABLE_GUID))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	name = efivar_get_utf8name(name16, &amp;vendor);</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dentry = try_lookup_noperm(&amp;QSTR(name), sb-&gt;s_root);</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='add'>+		err = PTR_ERR(dentry);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dentry) {</div><div class='add'>+		/* found missing entry */</div><div class='add'>+		pr_info("efivarfs: creating variable %s\n", name);</div><div class='add'>+		return efivarfs_create_dentry(sb, name16, name_size, vendor, name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dput(dentry);</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	kfree(name);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type efivarfs_type;</div><div class='add'>+</div><div class='add'>+static int efivarfs_freeze_fs(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	/* Nothing for us to do. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efivarfs_unfreeze_fs(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct dentry *child = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unconditionally resync the variable state on a thaw request.</div><div class='add'>+	 * Given the size of efivarfs it really doesn't matter to simply</div><div class='add'>+	 * iterate through all of the entries and resync. Freeze/thaw</div><div class='add'>+	 * requests are rare enough for that to not matter and the</div><div class='add'>+	 * number of entries is pretty low too. So we really don't care.</div><div class='add'>+	 */</div><div class='add'>+	pr_info("efivarfs: resyncing variable state\n");</div><div class='add'>+	for (;;) {</div><div class='add'>+		int err;</div><div class='add'>+		unsigned long size = 0;</div><div class='add'>+		struct inode *inode;</div><div class='add'>+		struct efivar_entry *entry;</div><div class='add'>+</div><div class='add'>+		child = find_next_child(sb-&gt;s_root, child);</div><div class='add'>+		if (!child)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		inode = d_inode(child);</div><div class='add'>+		entry = efivar_entry(inode);</div><div class='add'>+</div><div class='add'>+		err = efivar_entry_size(entry, &amp;size);</div><div class='add'>+		if (err)</div><div class='add'>+			size = 0;</div><div class='add'>+		else</div><div class='add'>+			size += sizeof(__u32);</div><div class='add'>+</div><div class='add'>+		inode_lock(inode);</div><div class='add'>+		i_size_write(inode, size);</div><div class='add'>+		inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+		/* The variable doesn't exist anymore, delete it. */</div><div class='add'>+		if (!size) {</div><div class='add'>+			pr_info("efivarfs: removing variable %pd\n", child);</div><div class='add'>+			simple_recursive_removal(child, NULL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	efivar_init(efivarfs_check_missing, sb, false);</div><div class='add'>+	pr_info("efivarfs: finished resyncing variable state\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int efivarfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct efivarfs_fs_info *sfi;</div><div class='hunk'>@@ -383,13 +509,12 @@ static int efivarfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	if (!sfi)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;sfi-&gt;efivarfs_list);</div><div class='del'>-</div><div class='ctx'> 	sfi-&gt;mount_opts.uid = GLOBAL_ROOT_UID;</div><div class='ctx'> 	sfi-&gt;mount_opts.gid = GLOBAL_ROOT_GID;</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;s_fs_info = sfi;</div><div class='ctx'> 	fc-&gt;ops = &amp;efivarfs_context_ops;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -398,10 +523,8 @@ static void efivarfs_kill_sb(struct super_block *sb)</div><div class='ctx'> 	struct efivarfs_fs_info *sfi = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	blocking_notifier_chain_unregister(&amp;efivar_ops_nh, &amp;sfi-&gt;nb);</div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> </div><div class='del'>-	/* Remove all entries and destroy */</div><div class='del'>-	efivar_entry_iter(efivarfs_destroy, &amp;sfi-&gt;efivarfs_list, NULL);</div><div class='ctx'> 	kfree(sfi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,6 +534,7 @@ static struct file_system_type efivarfs_type = {</div><div class='ctx'> 	.init_fs_context = efivarfs_init_fs_context,</div><div class='ctx'> 	.kill_sb = efivarfs_kill_sb,</div><div class='ctx'> 	.parameters = efivarfs_parameters,</div><div class='add'>+	.fs_flags = FS_POWER_FREEZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int efivarfs_init(void)</div><div class='head'>diff --git a/fs/efivarfs/vars.c b/fs/efivarfs/vars.c<br/>index 114ff0fd4e55..6edc10958ecf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/vars.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efivarfs/vars.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efivarfs/vars.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efivarfs/vars.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-MODULE_IMPORT_NS(EFIVAR);</div><div class='add'>+MODULE_IMPORT_NS("EFIVAR");</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='ctx'> validate_device_path(efi_char16_t *var_name, int match, u8 *buffer,</div><div class='hunk'>@@ -225,6 +225,31 @@ variable_matches(const char *var_name, size_t len, const char *match_name,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+char *</div><div class='add'>+efivar_get_utf8name(const efi_char16_t *name16, efi_guid_t *vendor)</div><div class='add'>+{</div><div class='add'>+	int len = ucs2_utf8size(name16);</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	/* name, plus '-', plus GUID, plus NUL*/</div><div class='add'>+	name = kmalloc(len + 1 + EFI_VARIABLE_GUID_LEN + 1, GFP_KERNEL);</div><div class='add'>+	if (!name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ucs2_as_utf8(name, name16, len);</div><div class='add'>+</div><div class='add'>+	name[len] = '-';</div><div class='add'>+</div><div class='add'>+	efi_guid_to_str(vendor, name + len + 1);</div><div class='add'>+</div><div class='add'>+	name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';</div><div class='add'>+</div><div class='add'>+	/* replace invalid slashes like kobject_set_name_vargs does for /sys/firmware/efi/vars. */</div><div class='add'>+	strreplace(name, '/', '!');</div><div class='add'>+</div><div class='add'>+	return name;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool</div><div class='ctx'> efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,</div><div class='ctx'> 		unsigned long data_size)</div><div class='hunk'>@@ -288,28 +313,6 @@ efivar_variable_is_removable(efi_guid_t vendor, const char *var_name,</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool variable_is_present(efi_char16_t *variable_name, efi_guid_t *vendor,</div><div class='del'>-				struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct efivar_entry *entry, *n;</div><div class='del'>-	unsigned long strsize1, strsize2;</div><div class='del'>-	bool found = false;</div><div class='del'>-</div><div class='del'>-	strsize1 = ucs2_strsize(variable_name, 1024);</div><div class='del'>-	list_for_each_entry_safe(entry, n, head, list) {</div><div class='del'>-		strsize2 = ucs2_strsize(entry-&gt;var.VariableName, 1024);</div><div class='del'>-		if (strsize1 == strsize2 &amp;&amp;</div><div class='del'>-			!memcmp(variable_name, &amp;(entry-&gt;var.VariableName),</div><div class='del'>-				strsize2) &amp;&amp;</div><div class='del'>-			!efi_guidcmp(entry-&gt;var.VendorGuid,</div><div class='del'>-				*vendor)) {</div><div class='del'>-			found = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Returns the size of variable_name, in bytes, including the</div><div class='ctx'>  * terminating NULL character, or variable_name_size if no NULL</div><div class='hunk'>@@ -361,19 +364,17 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,</div><div class='ctx'>  * efivar_init - build the initial list of EFI variables</div><div class='ctx'>  * @func: callback function to invoke for every variable</div><div class='ctx'>  * @data: function-specific data to pass to @func</div><div class='del'>- * @duplicates: error if we encounter duplicates on @head?</div><div class='del'>- * @head: initialised head of variable list</div><div class='add'>+ * @duplicate_check: fail if a duplicate variable is found</div><div class='ctx'>  *</div><div class='ctx'>  * Get every EFI variable from the firmware and invoke @func. @func</div><div class='del'>- * should call efivar_entry_add() to build the list of variables.</div><div class='add'>+ * should populate the initial dentry and inode tree.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, or a kernel error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *,</div><div class='del'>-			    struct list_head *),</div><div class='del'>-		void *data, bool duplicates, struct list_head *head)</div><div class='add'>+int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *),</div><div class='add'>+		void *data, bool duplicate_check)</div><div class='ctx'> {</div><div class='del'>-	unsigned long variable_name_size = 1024;</div><div class='add'>+	unsigned long variable_name_size = 512;</div><div class='ctx'> 	efi_char16_t *variable_name;</div><div class='ctx'> 	efi_status_t status;</div><div class='ctx'> 	efi_guid_t vendor_guid;</div><div class='hunk'>@@ -390,12 +391,14 @@ int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *,</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Per EFI spec, the maximum storage allocated for both</div><div class='del'>-	 * the variable name and variable data is 1024 bytes.</div><div class='add'>+	 * A small set of old UEFI implementations reject sizes</div><div class='add'>+	 * above a certain threshold, the lowest seen in the wild</div><div class='add'>+	 * is 512.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		variable_name_size = 1024;</div><div class='add'>+		variable_name_size = 512;</div><div class='add'>+		BUILD_BUG_ON(EFI_VAR_NAME_LEN &lt; 512);</div><div class='ctx'> </div><div class='ctx'> 		status = efivar_get_next_variable(&amp;variable_name_size,</div><div class='ctx'> 						  variable_name,</div><div class='hunk'>@@ -413,15 +416,15 @@ int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *,</div><div class='ctx'> 			 * we'll ever see a different variable name,</div><div class='ctx'> 			 * and may end up looping here forever.</div><div class='ctx'> 			 */</div><div class='del'>-			if (duplicates &amp;&amp;</div><div class='del'>-			    variable_is_present(variable_name, &amp;vendor_guid,</div><div class='del'>-						head)) {</div><div class='add'>+			if (duplicate_check &amp;&amp;</div><div class='add'>+			    efivarfs_variable_is_present(variable_name,</div><div class='add'>+							 &amp;vendor_guid, data)) {</div><div class='ctx'> 				dup_variable_bug(variable_name, &amp;vendor_guid,</div><div class='ctx'> 						 variable_name_size);</div><div class='ctx'> 				status = EFI_NOT_FOUND;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				err = func(variable_name, vendor_guid,</div><div class='del'>-					   variable_name_size, data, head);</div><div class='add'>+					   variable_name_size, data);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					status = EFI_NOT_FOUND;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -432,9 +435,13 @@ int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case EFI_NOT_FOUND:</div><div class='ctx'> 			break;</div><div class='add'>+		case EFI_BUFFER_TOO_SMALL:</div><div class='add'>+			pr_warn("efivars: Variable name size exceeds maximum (%lu &gt; 512)\n",</div><div class='add'>+				variable_name_size);</div><div class='add'>+			status = EFI_NOT_FOUND;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_WARNING "efivars: get_next_variable: status=%lx\n",</div><div class='del'>-				status);</div><div class='add'>+			pr_warn("efivars: get_next_variable: status=%lx\n", status);</div><div class='ctx'> 			status = EFI_NOT_FOUND;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -449,70 +456,12 @@ free:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * efivar_entry_add - add entry to variable list</div><div class='del'>- * @entry: entry to add to list</div><div class='del'>- * @head: list head</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, or a kernel error code on failure.</div><div class='del'>- */</div><div class='del'>-int efivar_entry_add(struct efivar_entry *entry, struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = efivar_lock();</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	list_add(&amp;entry-&gt;list, head);</div><div class='del'>-	efivar_unlock();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __efivar_entry_add - add entry to variable list</div><div class='del'>- * @entry: entry to add to list</div><div class='del'>- * @head: list head</div><div class='del'>- */</div><div class='del'>-void __efivar_entry_add(struct efivar_entry *entry, struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	list_add(&amp;entry-&gt;list, head);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * efivar_entry_remove - remove entry from variable list</div><div class='del'>- * @entry: entry to remove from list</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, or a kernel error code on failure.</div><div class='del'>- */</div><div class='del'>-void efivar_entry_remove(struct efivar_entry *entry)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;entry-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * efivar_entry_list_del_unlock - remove entry from variable list</div><div class='del'>- * @entry: entry to remove</div><div class='del'>- *</div><div class='del'>- * Remove @entry from the variable list and release the list lock.</div><div class='del'>- *</div><div class='del'>- * NOTE: slightly weird locking semantics here - we expect to be</div><div class='del'>- * called with the efivars lock already held, and we release it before</div><div class='del'>- * returning. This is because this function is usually called after</div><div class='del'>- * set_variable() while the lock is still held.</div><div class='del'>- */</div><div class='del'>-static void efivar_entry_list_del_unlock(struct efivar_entry *entry)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;entry-&gt;list);</div><div class='del'>-	efivar_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * efivar_entry_delete - delete variable and remove entry from list</div><div class='add'>+ * efivar_entry_delete - delete variable</div><div class='ctx'>  * @entry: entry containing variable to delete</div><div class='ctx'>  *</div><div class='del'>- * Delete the variable from the firmware and remove @entry from the</div><div class='del'>- * variable list. It is the caller's responsibility to free @entry</div><div class='del'>- * once we return.</div><div class='add'>+ * Delete the variable from the firmware. It is the caller's</div><div class='add'>+ * responsibility to free @entry (by deleting the dentry/inode) once</div><div class='add'>+ * we return.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, -EINTR if we can't grab the semaphore,</div><div class='ctx'>  * converted EFI status code if set_variable() fails.</div><div class='hunk'>@@ -529,12 +478,10 @@ int efivar_entry_delete(struct efivar_entry *entry)</div><div class='ctx'> 	status = efivar_set_variable_locked(entry-&gt;var.VariableName,</div><div class='ctx'> 					    &amp;entry-&gt;var.VendorGuid,</div><div class='ctx'> 					    0, 0, NULL, false);</div><div class='del'>-	if (!(status == EFI_SUCCESS || status == EFI_NOT_FOUND)) {</div><div class='del'>-		efivar_unlock();</div><div class='add'>+	efivar_unlock();</div><div class='add'>+	if (!(status == EFI_SUCCESS || status == EFI_NOT_FOUND))</div><div class='ctx'> 		return efi_status_to_err(status);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	efivar_entry_list_del_unlock(entry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -628,7 +575,7 @@ int efivar_entry_get(struct efivar_entry *entry, u32 *attributes,</div><div class='ctx'>  * get_variable() fail.</div><div class='ctx'>  *</div><div class='ctx'>  * If the EFI variable does not exist when calling set_variable()</div><div class='del'>- * (EFI_NOT_FOUND), @entry is removed from the variable list.</div><div class='add'>+ * (EFI_NOT_FOUND).</div><div class='ctx'>  */</div><div class='ctx'> int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,</div><div class='ctx'> 			      unsigned long *size, void *data, bool *set)</div><div class='hunk'>@@ -644,9 +591,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The lock here protects the get_variable call, the conditional</div><div class='del'>-	 * set_variable call, and removal of the variable from the efivars</div><div class='del'>-	 * list (in the case of an authenticated delete).</div><div class='add'>+	 * The lock here protects the get_variable call and the</div><div class='add'>+	 * conditional set_variable call</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = efivar_lock();</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -672,10 +618,7 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,</div><div class='ctx'> 				    &amp;entry-&gt;var.VendorGuid,</div><div class='ctx'> 				    NULL, size, NULL);</div><div class='ctx'> </div><div class='del'>-	if (status == EFI_NOT_FOUND)</div><div class='del'>-		efivar_entry_list_del_unlock(entry);</div><div class='del'>-	else</div><div class='del'>-		efivar_unlock();</div><div class='add'>+	efivar_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp;&amp; status != EFI_BUFFER_TOO_SMALL)</div><div class='ctx'> 		return efi_status_to_err(status);</div><div class='hunk'>@@ -687,37 +630,3 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * efivar_entry_iter - iterate over variable list</div><div class='del'>- * @func: callback function</div><div class='del'>- * @head: head of variable list</div><div class='del'>- * @data: function-specific data to pass to callback</div><div class='del'>- *</div><div class='del'>- * Iterate over the list of EFI variables and call @func with every</div><div class='del'>- * entry on the list. It is safe for @func to remove entries in the</div><div class='del'>- * list via efivar_entry_delete() while iterating.</div><div class='del'>- *</div><div class='del'>- * Some notes for the callback function:</div><div class='del'>- *  - a non-zero return value indicates an error and terminates the loop</div><div class='del'>- *  - @func is called from atomic context</div><div class='del'>- */</div><div class='del'>-int efivar_entry_iter(int (*func)(struct efivar_entry *, void *),</div><div class='del'>-		      struct list_head *head, void *data)</div><div class='del'>-{</div><div class='del'>-	struct efivar_entry *entry, *n;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	err = efivar_lock();</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, n, head, list) {</div><div class='del'>-		err = func(entry, data);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	efivar_unlock();</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/efs/inode.c b/fs/efs/inode.c<br/>index 7844ab24b813..28407578f83a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efs/inode.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(super, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	in = INODE_INFO(inode);</div><div class='hunk'>@@ -311,4 +311,5 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }  </div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Extent File System (efs)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/efs/super.c b/fs/efs/super.c<br/>index f17fdac76b2e..c59086b7eabf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efs/super.c</a></div><div class='hunk'>@@ -14,19 +14,13 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include "efs.h"</div><div class='ctx'> #include &lt;linux/efs_vh.h&gt;</div><div class='ctx'> #include &lt;linux/efs_fs_sb.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int efs_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='del'>-static int efs_fill_super(struct super_block *s, void *d, int silent);</div><div class='del'>-</div><div class='del'>-static struct dentry *efs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='del'>-{</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, efs_fill_super);</div><div class='del'>-}</div><div class='add'>+static int efs_init_fs_context(struct fs_context *fc);</div><div class='ctx'> </div><div class='ctx'> static void efs_kill_sb(struct super_block *s)</div><div class='ctx'> {</div><div class='hunk'>@@ -35,15 +29,6 @@ static void efs_kill_sb(struct super_block *s)</div><div class='ctx'> 	kfree(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_system_type efs_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "efs",</div><div class='del'>-	.mount		= efs_mount,</div><div class='del'>-	.kill_sb	= efs_kill_sb,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='del'>-};</div><div class='del'>-MODULE_ALIAS_FS("efs");</div><div class='del'>-</div><div class='ctx'> static struct pt_types sgi_pt_types[] = {</div><div class='ctx'> 	{0x00,		"SGI vh"},</div><div class='ctx'> 	{0x01,		"SGI trkrepl"},</div><div class='hunk'>@@ -63,6 +48,17 @@ static struct pt_types sgi_pt_types[] = {</div><div class='ctx'> 	{0,		NULL}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * File system definition and registration.</div><div class='add'>+ */</div><div class='add'>+static struct file_system_type efs_fs_type = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "efs",</div><div class='add'>+	.kill_sb		= efs_kill_sb,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context	= efs_init_fs_context,</div><div class='add'>+};</div><div class='add'>+MODULE_ALIAS_FS("efs");</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache * efs_inode_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -91,8 +87,8 @@ static int __init init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	efs_inode_cachep = kmem_cache_create("efs_inode_cache",</div><div class='ctx'> 				sizeof(struct efs_inode_info), 0,</div><div class='del'>-				SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-				SLAB_ACCOUNT, init_once);</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT|SLAB_ACCOUNT,</div><div class='add'>+				init_once);</div><div class='ctx'> 	if (efs_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -108,18 +104,10 @@ static void destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(efs_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efs_remount(struct super_block *sb, int *flags, char *data)</div><div class='del'>-{</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_RDONLY;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct super_operations efs_superblock_operations = {</div><div class='ctx'> 	.alloc_inode	= efs_alloc_inode,</div><div class='ctx'> 	.free_inode	= efs_free_inode,</div><div class='ctx'> 	.statfs		= efs_statfs,</div><div class='del'>-	.remount_fs	= efs_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct export_operations efs_export_ops = {</div><div class='hunk'>@@ -249,26 +237,27 @@ static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) {</div><div class='ctx'> 	return 0;    </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efs_fill_super(struct super_block *s, void *d, int silent)</div><div class='add'>+static int efs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct efs_sb_info *sb;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> </div><div class='del'>- 	sb = kzalloc(sizeof(struct efs_sb_info), GFP_KERNEL);</div><div class='add'>+	sb = kzalloc(sizeof(struct efs_sb_info), GFP_KERNEL);</div><div class='ctx'> 	if (!sb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	s-&gt;s_fs_info = sb;</div><div class='ctx'> 	s-&gt;s_time_min = 0;</div><div class='ctx'> 	s-&gt;s_time_max = U32_MAX;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	s-&gt;s_magic		= EFS_SUPER_MAGIC;</div><div class='ctx'> 	if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) {</div><div class='ctx'> 		pr_err("device does not support %d byte blocks\n",</div><div class='ctx'> 			EFS_BLOCKSIZE);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return invalf(fc, "device does not support %d byte blocks\n",</div><div class='add'>+			      EFS_BLOCKSIZE);</div><div class='ctx'> 	}</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	/* read the vh (volume header) block */</div><div class='ctx'> 	bh = sb_bread(s, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -294,7 +283,7 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)</div><div class='ctx'> 		pr_err("cannot read superblock\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	if (efs_validate_super(sb, (struct efs_super *) bh-&gt;b_data)) {</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 		pr_warn("invalid superblock at block %u\n",</div><div class='hunk'>@@ -328,6 +317,34 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int efs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, efs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efs_reconfigure(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	fc-&gt;sb_flags |= SB_RDONLY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations efs_context_opts = {</div><div class='add'>+	.get_tree	= efs_get_tree,</div><div class='add'>+	.reconfigure	= efs_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up the filesystem mount context.</div><div class='add'>+ */</div><div class='add'>+static int efs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	fc-&gt;ops = &amp;efs_context_opts;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int efs_statfs(struct dentry *dentry, struct kstatfs *buf) {</div><div class='ctx'> 	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	struct efs_sb_info *sbi = SUPER_INFO(sb);</div><div class='head'>diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c<br/>index 3b03a573cb1a..7749feded722 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/efs/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/efs/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/efs/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/efs/symlink.c</a></div><div class='hunk'>@@ -14,10 +14,9 @@</div><div class='ctx'> </div><div class='ctx'> static int efs_symlink_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	char *link = page_address(page);</div><div class='del'>-	struct buffer_head * bh;</div><div class='del'>-	struct inode * inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	char *link = folio_address(folio);</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	efs_block_t size = inode-&gt;i_size;</div><div class='ctx'> 	int err;</div><div class='ctx'>   </div><div class='hunk'>@@ -40,12 +39,9 @@ static int efs_symlink_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 	}</div><div class='ctx'> 	link[size] = '\0';</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return 0;</div><div class='add'>+	err = 0;</div><div class='ctx'> fail:</div><div class='del'>-	SetPageError(page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_end_read(folio, err == 0);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig<br/>index fffd3919343e..d81f3318417d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/Kconfig</a></div><div class='hunk'>@@ -3,8 +3,18 @@</div><div class='ctx'> config EROFS_FS</div><div class='ctx'> 	tristate "EROFS filesystem support"</div><div class='ctx'> 	depends on BLOCK</div><div class='add'>+	select CACHEFILES if EROFS_FS_ONDEMAND</div><div class='add'>+	select CRC32</div><div class='add'>+	select CRYPTO if EROFS_FS_ZIP_ACCEL</div><div class='add'>+	select CRYPTO_DEFLATE if EROFS_FS_ZIP_ACCEL</div><div class='ctx'> 	select FS_IOMAP</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select LZ4_DECOMPRESS if EROFS_FS_ZIP</div><div class='add'>+	select NETFS_SUPPORT if EROFS_FS_ONDEMAND</div><div class='add'>+	select XXHASH if EROFS_FS_XATTR</div><div class='add'>+	select XZ_DEC if EROFS_FS_ZIP_LZMA</div><div class='add'>+	select XZ_DEC_MICROLZMA if EROFS_FS_ZIP_LZMA</div><div class='add'>+	select ZLIB_INFLATE if EROFS_FS_ZIP_DEFLATE</div><div class='add'>+	select ZSTD_DECOMPRESS if EROFS_FS_ZIP_ZSTD</div><div class='ctx'> 	help</div><div class='ctx'> 	  EROFS (Enhanced Read-Only File System) is a lightweight read-only</div><div class='ctx'> 	  file system with modern designs (e.g. no buffer heads, inline</div><div class='hunk'>@@ -13,12 +23,12 @@ config EROFS_FS</div><div class='ctx'> 	  smartphones with Android OS, LiveCDs and high-density hosts with</div><div class='ctx'> 	  numerous containers;</div><div class='ctx'> </div><div class='del'>-	  It also provides fixed-sized output compression support in order to</div><div class='del'>-	  improve storage density as well as keep relatively higher compression</div><div class='del'>-	  ratios and implements in-place decompression to reuse the file page</div><div class='del'>-	  for compressed data temporarily with proper strategies, which is</div><div class='del'>-	  quite useful to ensure guaranteed end-to-end runtime decompression</div><div class='del'>-	  performance under extremely memory pressure without extra cost.</div><div class='add'>+	  It also provides transparent compression and deduplication support to</div><div class='add'>+	  improve storage density and maintain relatively high compression</div><div class='add'>+	  ratios, and it implements in-place decompression to temporarily reuse</div><div class='add'>+	  page cache for compressed data using proper strategies, which is</div><div class='add'>+	  quite useful for ensuring guaranteed end-to-end runtime decompression</div><div class='add'>+	  performance under extreme memory pressure without extra cost.</div><div class='ctx'> </div><div class='ctx'> 	  See the documentation at &lt;file:Documentation/filesystems/erofs.rst&gt;</div><div class='ctx'> 	  and the web pages at &lt;https://erofs.docs.kernel.org&gt; for more details.</div><div class='hunk'>@@ -38,7 +48,6 @@ config EROFS_FS_DEBUG</div><div class='ctx'> config EROFS_FS_XATTR</div><div class='ctx'> 	bool "EROFS extended attributes"</div><div class='ctx'> 	depends on EROFS_FS</div><div class='del'>-	select XXHASH</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Extended attributes are name:value pairs associated with inodes by</div><div class='hunk'>@@ -74,21 +83,35 @@ config EROFS_FS_SECURITY</div><div class='ctx'> </div><div class='ctx'> 	  If you are not using a security module, say N.</div><div class='ctx'> </div><div class='add'>+config EROFS_FS_BACKED_BY_FILE</div><div class='add'>+	bool "File-backed EROFS filesystem support"</div><div class='add'>+	depends on EROFS_FS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This allows EROFS to use filesystem image files directly, without</div><div class='add'>+	  the intercession of loopback block devices or likewise. It is</div><div class='add'>+	  particularly useful for container images with numerous blobs and</div><div class='add'>+	  other sandboxes, where loop devices behave intricately.  It can also</div><div class='add'>+	  be used to simplify error-prone lifetime management of unnecessary</div><div class='add'>+	  virtual block devices.</div><div class='add'>+</div><div class='add'>+	  Note that this feature, along with ongoing fanotify pre-content</div><div class='add'>+	  hooks, will eventually replace "EROFS over fscache."</div><div class='add'>+</div><div class='add'>+	  If you don't want to enable this feature, say N.</div><div class='add'>+</div><div class='ctx'> config EROFS_FS_ZIP</div><div class='ctx'> 	bool "EROFS Data Compression Support"</div><div class='ctx'> 	depends on EROFS_FS</div><div class='del'>-	select LZ4_DECOMPRESS</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Enable fixed-sized output compression for EROFS.</div><div class='add'>+	  Enable transparent compression support for EROFS file systems.</div><div class='ctx'> </div><div class='ctx'> 	  If you don't want to enable compression feature, say N.</div><div class='ctx'> </div><div class='ctx'> config EROFS_FS_ZIP_LZMA</div><div class='ctx'> 	bool "EROFS LZMA compressed data support"</div><div class='ctx'> 	depends on EROFS_FS_ZIP</div><div class='del'>-	select XZ_DEC</div><div class='del'>-	select XZ_DEC_MICROLZMA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Saying Y here includes support for reading EROFS file systems</div><div class='ctx'> 	  containing LZMA compressed data, specifically called microLZMA. It</div><div class='hunk'>@@ -100,7 +123,6 @@ config EROFS_FS_ZIP_LZMA</div><div class='ctx'> config EROFS_FS_ZIP_DEFLATE</div><div class='ctx'> 	bool "EROFS DEFLATE compressed data support"</div><div class='ctx'> 	depends on EROFS_FS_ZIP</div><div class='del'>-	select ZLIB_INFLATE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Saying Y here includes support for reading EROFS file systems</div><div class='ctx'> 	  containing DEFLATE compressed data.  It gives better compression</div><div class='hunk'>@@ -112,17 +134,46 @@ config EROFS_FS_ZIP_DEFLATE</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config EROFS_FS_ZIP_ZSTD</div><div class='add'>+	bool "EROFS Zstandard compressed data support"</div><div class='add'>+	depends on EROFS_FS_ZIP</div><div class='add'>+	help</div><div class='add'>+	  Saying Y here includes support for reading EROFS file systems</div><div class='add'>+	  containing Zstandard compressed data.  It gives better compression</div><div class='add'>+	  ratios than the default LZ4 format, while it costs more CPU</div><div class='add'>+	  overhead.</div><div class='add'>+</div><div class='add'>+	  Zstandard support is an experimental feature for now and so most</div><div class='add'>+	  file systems will be readable without selecting this option.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config EROFS_FS_ZIP_ACCEL</div><div class='add'>+	bool "EROFS hardware decompression support"</div><div class='add'>+	depends on EROFS_FS_ZIP</div><div class='add'>+	help</div><div class='add'>+	  Saying Y here includes hardware accelerator support for reading</div><div class='add'>+	  EROFS file systems containing compressed data.  It gives better</div><div class='add'>+	  decompression speed than the software-implemented decompression, and</div><div class='add'>+	  it costs lower CPU overhead.</div><div class='add'>+</div><div class='add'>+	  Hardware accelerator support is an experimental feature for now and</div><div class='add'>+	  file systems are still readable without selecting this option.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config EROFS_FS_ONDEMAND</div><div class='del'>-	bool "EROFS fscache-based on-demand read support"</div><div class='add'>+	bool "EROFS fscache-based on-demand read support (deprecated)"</div><div class='ctx'> 	depends on EROFS_FS</div><div class='del'>-	select NETFS_SUPPORT</div><div class='ctx'> 	select FSCACHE</div><div class='del'>-	select CACHEFILES</div><div class='ctx'> 	select CACHEFILES_ONDEMAND</div><div class='ctx'> 	help</div><div class='ctx'> 	  This permits EROFS to use fscache-backed data blobs with on-demand</div><div class='ctx'> 	  read support.</div><div class='ctx'> </div><div class='add'>+	  It is now deprecated and scheduled to be removed from the kernel</div><div class='add'>+	  after fanotify pre-content hooks are landed.</div><div class='add'>+</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config EROFS_FS_PCPU_KTHREAD</div><div class='head'>diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile<br/>index 994d0b9deddf..549abc424763 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/Makefile</a></div><div class='hunk'>@@ -1,9 +1,12 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_EROFS_FS) += erofs.o</div><div class='del'>-erofs-objs := super.o inode.o data.o namei.o dir.o utils.o sysfs.o</div><div class='add'>+erofs-objs := super.o inode.o data.o namei.o dir.o sysfs.o</div><div class='ctx'> erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o</div><div class='del'>-erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o pcpubuf.o</div><div class='add'>+erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o zutil.o</div><div class='ctx'> erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o</div><div class='ctx'> erofs-$(CONFIG_EROFS_FS_ZIP_DEFLATE) += decompressor_deflate.o</div><div class='add'>+erofs-$(CONFIG_EROFS_FS_ZIP_ZSTD) += decompressor_zstd.o</div><div class='add'>+erofs-$(CONFIG_EROFS_FS_ZIP_ACCEL) += decompressor_crypto.o</div><div class='add'>+erofs-$(CONFIG_EROFS_FS_BACKED_BY_FILE) += fileio.o</div><div class='ctx'> erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o</div><div class='head'>diff --git a/fs/erofs/compress.h b/fs/erofs/compress.h<br/>index 279933e007d2..84c8e52581f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/compress.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/compress.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/compress.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/compress.h</a></div><div class='hunk'>@@ -11,59 +11,37 @@</div><div class='ctx'> struct z_erofs_decompress_req {</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	struct page **in, **out;</div><div class='del'>-</div><div class='add'>+	unsigned int inpages, outpages;</div><div class='ctx'> 	unsigned short pageofs_in, pageofs_out;</div><div class='ctx'> 	unsigned int inputsize, outputsize;</div><div class='ctx'> </div><div class='del'>-	/* indicate the algorithm will be used for decompression */</div><div class='del'>-	unsigned int alg;</div><div class='add'>+	unsigned int alg;       /* the algorithm for decompression */</div><div class='ctx'> 	bool inplace_io, partial_decoding, fillgaps;</div><div class='add'>+	gfp_t gfp;      /* allocation flags for extra temporary buffers */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct z_erofs_decompressor {</div><div class='ctx'> 	int (*config)(struct super_block *sb, struct erofs_super_block *dsb,</div><div class='ctx'> 		      void *data, int size);</div><div class='del'>-	int (*decompress)(struct z_erofs_decompress_req *rq,</div><div class='del'>-			  struct page **pagepool);</div><div class='add'>+	const char *(*decompress)(struct z_erofs_decompress_req *rq,</div><div class='add'>+				  struct page **pagepool);</div><div class='add'>+	int (*init)(void);</div><div class='add'>+	void (*exit)(void);</div><div class='ctx'> 	char *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* some special page-&gt;private (unsigned long, see below) */</div><div class='ctx'> #define Z_EROFS_SHORTLIVED_PAGE		(-1UL &lt;&lt; 2)</div><div class='del'>-#define Z_EROFS_PREALLOCATED_PAGE	(-2UL &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For all pages in a pcluster, page-&gt;private should be one of</div><div class='del'>- * Type                         Last 2bits      page-&gt;private</div><div class='del'>- * short-lived page             00              Z_EROFS_SHORTLIVED_PAGE</div><div class='del'>- * preallocated page (tryalloc) 00              Z_EROFS_PREALLOCATED_PAGE</div><div class='del'>- * cached/managed page          00              pointer to z_erofs_pcluster</div><div class='del'>- * online page (file-backed,    01/10/11        sub-index &lt;&lt; 2 | count</div><div class='del'>- *              some pages can be used for inplace I/O)</div><div class='del'>- *</div><div class='del'>- * page-&gt;mapping should be one of</div><div class='del'>- * Type                 page-&gt;mapping</div><div class='del'>- * short-lived page     NULL</div><div class='del'>- * preallocated page    NULL</div><div class='del'>- * cached/managed page  non-NULL or NULL (invalidated/truncated page)</div><div class='del'>- * online page          non-NULL</div><div class='del'>- *</div><div class='del'>- * For all managed pages, PG_private should be set with 1 extra refcount,</div><div class='del'>- * which is used for page reclaim / migration.</div><div class='del'>- */</div><div class='add'>+#define Z_EROFS_PREALLOCATED_FOLIO	((void *)(-2UL &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * short-lived pages are pages directly from buddy system with specific</div><div class='del'>- * page-&gt;private (no need to set PagePrivate since these are non-LRU /</div><div class='del'>- * non-movable pages and bypass reclaim / migration code).</div><div class='add'>+ * Currently, short-lived pages are pages directly from buddy system</div><div class='add'>+ * with specific page-&gt;private (Z_EROFS_SHORTLIVED_PAGE).</div><div class='add'>+ * In the future world of Memdescs, it should be type 0 (Misc) memory</div><div class='add'>+ * which type can be checked with a new helper.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool z_erofs_is_shortlived_page(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	if (page-&gt;private != Z_EROFS_SHORTLIVED_PAGE)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(page-&gt;mapping);</div><div class='del'>-	return true;</div><div class='add'>+	return page-&gt;private == Z_EROFS_SHORTLIVED_PAGE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool z_erofs_put_shortlivedpage(struct page **pagepool,</div><div class='hunk'>@@ -71,35 +49,41 @@ static inline bool z_erofs_put_shortlivedpage(struct page **pagepool,</div><div class='ctx'> {</div><div class='ctx'> 	if (!z_erofs_is_shortlived_page(page))</div><div class='ctx'> 		return false;</div><div class='del'>-</div><div class='del'>-	/* short-lived pages should not be used by others at the same time */</div><div class='del'>-	if (page_ref_count(page) &gt; 1) {</div><div class='del'>-		put_page(page);</div><div class='del'>-	} else {</div><div class='del'>-		/* follow the pcluster rule above. */</div><div class='del'>-		erofs_pagepool_add(pagepool, page);</div><div class='del'>-	}</div><div class='add'>+	erofs_pagepool_add(pagepool, page);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MNGD_MAPPING(sbi)	((sbi)-&gt;managed_cache-&gt;i_mapping)</div><div class='del'>-static inline bool erofs_page_is_managed(const struct erofs_sb_info *sbi,</div><div class='del'>-					 struct page *page)</div><div class='del'>-{</div><div class='del'>-	return page-&gt;mapping == MNGD_MAPPING(sbi);</div><div class='del'>-}</div><div class='add'>+extern const struct z_erofs_decompressor z_erofs_lzma_decomp;</div><div class='add'>+extern const struct z_erofs_decompressor z_erofs_deflate_decomp;</div><div class='add'>+extern const struct z_erofs_decompressor z_erofs_zstd_decomp;</div><div class='add'>+extern const struct z_erofs_decompressor *z_erofs_decomp[];</div><div class='ctx'> </div><div class='del'>-int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf,</div><div class='del'>-			 unsigned int padbufsize);</div><div class='del'>-extern const struct z_erofs_decompressor erofs_decompressors[];</div><div class='add'>+struct z_erofs_stream_dctx {</div><div class='add'>+	struct z_erofs_decompress_req *rq;</div><div class='add'>+	int no, ni;			/* the current {en,de}coded page # */</div><div class='ctx'> </div><div class='del'>-/* prototypes for specific algorithms */</div><div class='del'>-int z_erofs_load_lzma_config(struct super_block *sb,</div><div class='del'>-			struct erofs_super_block *dsb, void *data, int size);</div><div class='del'>-int z_erofs_load_deflate_config(struct super_block *sb,</div><div class='del'>-			struct erofs_super_block *dsb, void *data, int size);</div><div class='del'>-int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,</div><div class='del'>-			    struct page **pagepool);</div><div class='del'>-int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,</div><div class='del'>-			       struct page **pagepool);</div><div class='add'>+	unsigned int avail_out;		/* remaining bytes in the decoded buffer */</div><div class='add'>+	unsigned int inbuf_pos, inbuf_sz;</div><div class='add'>+					/* current status of the encoded buffer */</div><div class='add'>+	u8 *kin, *kout;			/* buffer mapped pointers */</div><div class='add'>+	void *bounce;			/* bounce buffer for inplace I/Os */</div><div class='add'>+	bool bounced;			/* is the bounce buffer used now? */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *z_erofs_stream_switch_bufs(struct z_erofs_stream_dctx *dctx,</div><div class='add'>+				void **dst, void **src, struct page **pgpl);</div><div class='add'>+const char *z_erofs_fixup_insize(struct z_erofs_decompress_req *rq,</div><div class='add'>+				 const char *padbuf, unsigned int padbufsize);</div><div class='add'>+int __init z_erofs_init_decompressor(void);</div><div class='add'>+void z_erofs_exit_decompressor(void);</div><div class='add'>+int z_erofs_crypto_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+			      struct page **pgpl);</div><div class='add'>+int z_erofs_crypto_enable_engine(const char *name, int len);</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP_ACCEL</div><div class='add'>+void z_erofs_crypto_disable_all_engines(void);</div><div class='add'>+int z_erofs_crypto_show_engines(char *buf, int size, char sep);</div><div class='add'>+#else</div><div class='add'>+static inline void z_erofs_crypto_disable_all_engines(void) {}</div><div class='add'>+static inline int z_erofs_crypto_show_engines(char *buf, int size, char sep) { return 0; }</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/erofs/data.c b/fs/erofs/data.c<br/>index 433fc39ba423..bb13c4cb8455 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/data.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/data.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/data.c</a></div><div class='hunk'>@@ -10,10 +10,10 @@</div><div class='ctx'> </div><div class='ctx'> void erofs_unmap_metabuf(struct erofs_buf *buf)</div><div class='ctx'> {</div><div class='del'>-	if (buf-&gt;kmap_type == EROFS_KMAP)</div><div class='del'>-		kunmap_local(buf-&gt;base);</div><div class='add'>+	if (!buf-&gt;base)</div><div class='add'>+		return;</div><div class='add'>+	kunmap_local(buf-&gt;base);</div><div class='ctx'> 	buf-&gt;base = NULL;</div><div class='del'>-	buf-&gt;kmap_type = EROFS_NO_KMAP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void erofs_put_metabuf(struct erofs_buf *buf)</div><div class='hunk'>@@ -21,127 +21,103 @@ void erofs_put_metabuf(struct erofs_buf *buf)</div><div class='ctx'> 	if (!buf-&gt;page)</div><div class='ctx'> 		return;</div><div class='ctx'> 	erofs_unmap_metabuf(buf);</div><div class='del'>-	put_page(buf-&gt;page);</div><div class='add'>+	folio_put(page_folio(buf-&gt;page));</div><div class='ctx'> 	buf-&gt;page = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Derive the block size from inode-&gt;i_blkbits to make compatible with</div><div class='del'>- * anonymous inode in fscache mode.</div><div class='del'>- */</div><div class='del'>-void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,</div><div class='del'>-		  enum erofs_kmap_type type)</div><div class='add'>+void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = buf-&gt;inode;</div><div class='del'>-	erofs_off_t offset = (erofs_off_t)blkaddr &lt;&lt; inode-&gt;i_blkbits;</div><div class='del'>-	pgoff_t index = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct page *page = buf-&gt;page;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	unsigned int nofs_flag;</div><div class='del'>-</div><div class='del'>-	if (!page || page-&gt;index != index) {</div><div class='del'>-		erofs_put_metabuf(buf);</div><div class='add'>+	pgoff_t index = (buf-&gt;off + offset) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> </div><div class='del'>-		nofs_flag = memalloc_nofs_save();</div><div class='del'>-		folio = read_cache_folio(inode-&gt;i_mapping, index, NULL, NULL);</div><div class='del'>-		memalloc_nofs_restore(nofs_flag);</div><div class='add'>+	if (buf-&gt;page) {</div><div class='add'>+		folio = page_folio(buf-&gt;page);</div><div class='add'>+		if (folio_file_page(folio, index) != buf-&gt;page)</div><div class='add'>+			erofs_unmap_metabuf(buf);</div><div class='add'>+	}</div><div class='add'>+	if (!folio || !folio_contains(folio, index)) {</div><div class='add'>+		erofs_put_metabuf(buf);</div><div class='add'>+		folio = read_mapping_folio(buf-&gt;mapping, index, buf-&gt;file);</div><div class='ctx'> 		if (IS_ERR(folio))</div><div class='ctx'> 			return folio;</div><div class='del'>-</div><div class='del'>-		/* should already be PageUptodate, no need to lock page */</div><div class='del'>-		page = folio_file_page(folio, index);</div><div class='del'>-		buf-&gt;page = page;</div><div class='ctx'> 	}</div><div class='del'>-	if (buf-&gt;kmap_type == EROFS_NO_KMAP) {</div><div class='del'>-		if (type == EROFS_KMAP)</div><div class='del'>-			buf-&gt;base = kmap_local_page(page);</div><div class='del'>-		buf-&gt;kmap_type = type;</div><div class='del'>-	} else if (buf-&gt;kmap_type != type) {</div><div class='del'>-		DBG_BUGON(1);</div><div class='del'>-		return ERR_PTR(-EFAULT);</div><div class='del'>-	}</div><div class='del'>-	if (type == EROFS_NO_KMAP)</div><div class='add'>+	buf-&gt;page = folio_file_page(folio, index);</div><div class='add'>+	if (!need_kmap)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	if (!buf-&gt;base)</div><div class='add'>+		buf-&gt;base = kmap_local_page(buf-&gt;page);</div><div class='ctx'> 	return buf-&gt;base + (offset &amp; ~PAGE_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)</div><div class='add'>+int erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb,</div><div class='add'>+		       bool in_metabox)</div><div class='ctx'> {</div><div class='del'>-	if (erofs_is_fscache_mode(sb))</div><div class='del'>-		buf-&gt;inode = EROFS_SB(sb)-&gt;s_fscache-&gt;inode;</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	buf-&gt;file = NULL;</div><div class='add'>+	if (in_metabox) {</div><div class='add'>+		if (unlikely(!sbi-&gt;metabox_inode))</div><div class='add'>+			return -EFSCORRUPTED;</div><div class='add'>+		buf-&gt;mapping = sbi-&gt;metabox_inode-&gt;i_mapping;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	buf-&gt;off = sbi-&gt;dif0.fsoff;</div><div class='add'>+	if (erofs_is_fileio_mode(sbi)) {</div><div class='add'>+		buf-&gt;file = sbi-&gt;dif0.file;	/* some fs like FUSE needs it */</div><div class='add'>+		buf-&gt;mapping = buf-&gt;file-&gt;f_mapping;</div><div class='add'>+	} else if (erofs_is_fscache_mode(sb))</div><div class='add'>+		buf-&gt;mapping = sbi-&gt;dif0.fscache-&gt;inode-&gt;i_mapping;</div><div class='ctx'> 	else</div><div class='del'>-		buf-&gt;inode = sb-&gt;s_bdev-&gt;bd_inode;</div><div class='add'>+		buf-&gt;mapping = sb-&gt;s_bdev-&gt;bd_mapping;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,</div><div class='del'>-			 erofs_blk_t blkaddr, enum erofs_kmap_type type)</div><div class='add'>+			 erofs_off_t offset, bool in_metabox)</div><div class='ctx'> {</div><div class='del'>-	erofs_init_metabuf(buf, sb);</div><div class='del'>-	return erofs_bread(buf, blkaddr, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int erofs_map_blocks_flatmode(struct inode *inode,</div><div class='del'>-				     struct erofs_map_blocks *map)</div><div class='del'>-{</div><div class='del'>-	erofs_blk_t nblocks, lastblk;</div><div class='del'>-	u64 offset = map-&gt;m_la;</div><div class='del'>-	struct erofs_inode *vi = EROFS_I(inode);</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	bool tailendpacking = (vi-&gt;datalayout == EROFS_INODE_FLAT_INLINE);</div><div class='del'>-</div><div class='del'>-	nblocks = erofs_iblks(inode);</div><div class='del'>-	lastblk = nblocks - tailendpacking;</div><div class='del'>-</div><div class='del'>-	/* there is no hole in flatmode */</div><div class='del'>-	map-&gt;m_flags = EROFS_MAP_MAPPED;</div><div class='del'>-	if (offset &lt; erofs_pos(sb, lastblk)) {</div><div class='del'>-		map-&gt;m_pa = erofs_pos(sb, vi-&gt;raw_blkaddr) + map-&gt;m_la;</div><div class='del'>-		map-&gt;m_plen = erofs_pos(sb, lastblk) - offset;</div><div class='del'>-	} else if (tailendpacking) {</div><div class='del'>-		map-&gt;m_pa = erofs_iloc(inode) + vi-&gt;inode_isize +</div><div class='del'>-			vi-&gt;xattr_isize + erofs_blkoff(sb, offset);</div><div class='del'>-		map-&gt;m_plen = inode-&gt;i_size - offset;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		/* inline data should be located in the same meta block */</div><div class='del'>-		if (erofs_blkoff(sb, map-&gt;m_pa) + map-&gt;m_plen &gt; sb-&gt;s_blocksize) {</div><div class='del'>-			erofs_err(sb, "inline data cross block boundary @ nid %llu",</div><div class='del'>-				  vi-&gt;nid);</div><div class='del'>-			DBG_BUGON(1);</div><div class='del'>-			return -EFSCORRUPTED;</div><div class='del'>-		}</div><div class='del'>-		map-&gt;m_flags |= EROFS_MAP_META;</div><div class='del'>-	} else {</div><div class='del'>-		erofs_err(sb, "internal error @ nid: %llu (size %llu), m_la 0x%llx",</div><div class='del'>-			  vi-&gt;nid, inode-&gt;i_size, map-&gt;m_la);</div><div class='del'>-		DBG_BUGON(1);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	err = erofs_init_metabuf(buf, sb, in_metabox);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return erofs_bread(buf, offset, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map)</div><div class='ctx'> {</div><div class='add'>+	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	unsigned int unit, blksz = sb-&gt;s_blocksize;</div><div class='ctx'> 	struct erofs_inode *vi = EROFS_I(inode);</div><div class='ctx'> 	struct erofs_inode_chunk_index *idx;</div><div class='del'>-	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-	u64 chunknr;</div><div class='del'>-	unsigned int unit;</div><div class='add'>+	erofs_blk_t startblk, addrmask;</div><div class='add'>+	bool tailpacking;</div><div class='ctx'> 	erofs_off_t pos;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	u64 chunknr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	trace_erofs_map_blocks_enter(inode, map, 0);</div><div class='ctx'> 	map-&gt;m_deviceid = 0;</div><div class='del'>-	if (map-&gt;m_la &gt;= inode-&gt;i_size) {</div><div class='del'>-		/* leave out-of-bound access unmapped */</div><div class='del'>-		map-&gt;m_flags = 0;</div><div class='del'>-		map-&gt;m_plen = 0;</div><div class='add'>+	map-&gt;m_flags = 0;</div><div class='add'>+	if (map-&gt;m_la &gt;= inode-&gt;i_size)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (vi-&gt;datalayout != EROFS_INODE_CHUNK_BASED) {</div><div class='del'>-		err = erofs_map_blocks_flatmode(inode, map);</div><div class='add'>+		tailpacking = (vi-&gt;datalayout == EROFS_INODE_FLAT_INLINE);</div><div class='add'>+		if (!tailpacking &amp;&amp; vi-&gt;startblk == EROFS_NULL_ADDR)</div><div class='add'>+			goto out;</div><div class='add'>+		pos = erofs_pos(sb, erofs_iblks(inode) - tailpacking);</div><div class='add'>+</div><div class='add'>+		map-&gt;m_flags = EROFS_MAP_MAPPED;</div><div class='add'>+		if (map-&gt;m_la &lt; pos) {</div><div class='add'>+			map-&gt;m_pa = erofs_pos(sb, vi-&gt;startblk) + map-&gt;m_la;</div><div class='add'>+			map-&gt;m_llen = pos - map-&gt;m_la;</div><div class='add'>+		} else {</div><div class='add'>+			map-&gt;m_pa = erofs_iloc(inode) + vi-&gt;inode_isize +</div><div class='add'>+				vi-&gt;xattr_isize + erofs_blkoff(sb, map-&gt;m_la);</div><div class='add'>+			map-&gt;m_llen = inode-&gt;i_size - map-&gt;m_la;</div><div class='add'>+			map-&gt;m_flags |= EROFS_MAP_META;</div><div class='add'>+		}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -154,60 +130,67 @@ int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map)</div><div class='ctx'> 	pos = ALIGN(erofs_iloc(inode) + vi-&gt;inode_isize +</div><div class='ctx'> 		    vi-&gt;xattr_isize, unit) + unit * chunknr;</div><div class='ctx'> </div><div class='del'>-	kaddr = erofs_read_metabuf(&amp;buf, sb, erofs_blknr(sb, pos), EROFS_KMAP);</div><div class='del'>-	if (IS_ERR(kaddr)) {</div><div class='del'>-		err = PTR_ERR(kaddr);</div><div class='add'>+	idx = erofs_read_metabuf(&amp;buf, sb, pos, erofs_inode_in_metabox(inode));</div><div class='add'>+	if (IS_ERR(idx)) {</div><div class='add'>+		err = PTR_ERR(idx);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	map-&gt;m_la = chunknr &lt;&lt; vi-&gt;chunkbits;</div><div class='del'>-	map-&gt;m_plen = min_t(erofs_off_t, 1UL &lt;&lt; vi-&gt;chunkbits,</div><div class='del'>-			round_up(inode-&gt;i_size - map-&gt;m_la, sb-&gt;s_blocksize));</div><div class='del'>-</div><div class='del'>-	/* handle block map */</div><div class='del'>-	if (!(vi-&gt;chunkformat &amp; EROFS_CHUNK_FORMAT_INDEXES)) {</div><div class='del'>-		__le32 *blkaddr = kaddr + erofs_blkoff(sb, pos);</div><div class='del'>-</div><div class='del'>-		if (le32_to_cpu(*blkaddr) == EROFS_NULL_ADDR) {</div><div class='del'>-			map-&gt;m_flags = 0;</div><div class='del'>-		} else {</div><div class='del'>-			map-&gt;m_pa = erofs_pos(sb, le32_to_cpu(*blkaddr));</div><div class='add'>+	map-&gt;m_llen = min_t(erofs_off_t, 1UL &lt;&lt; vi-&gt;chunkbits,</div><div class='add'>+			    round_up(inode-&gt;i_size - map-&gt;m_la, blksz));</div><div class='add'>+	if (vi-&gt;chunkformat &amp; EROFS_CHUNK_FORMAT_INDEXES) {</div><div class='add'>+		addrmask = (vi-&gt;chunkformat &amp; EROFS_CHUNK_FORMAT_48BIT) ?</div><div class='add'>+			BIT_ULL(48) - 1 : BIT_ULL(32) - 1;</div><div class='add'>+		startblk = (((u64)le16_to_cpu(idx-&gt;startblk_hi) &lt;&lt; 32) |</div><div class='add'>+			    le32_to_cpu(idx-&gt;startblk_lo)) &amp; addrmask;</div><div class='add'>+		if ((startblk ^ EROFS_NULL_ADDR) &amp; addrmask) {</div><div class='add'>+			map-&gt;m_deviceid = le16_to_cpu(idx-&gt;device_id) &amp;</div><div class='add'>+				EROFS_SB(sb)-&gt;device_id_mask;</div><div class='add'>+			map-&gt;m_pa = erofs_pos(sb, startblk);</div><div class='add'>+			map-&gt;m_flags = EROFS_MAP_MAPPED;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		startblk = le32_to_cpu(*(__le32 *)idx);</div><div class='add'>+		if (startblk != (u32)EROFS_NULL_ADDR) {</div><div class='add'>+			map-&gt;m_pa = erofs_pos(sb, startblk);</div><div class='ctx'> 			map-&gt;m_flags = EROFS_MAP_MAPPED;</div><div class='ctx'> 		}</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-	/* parse chunk indexes */</div><div class='del'>-	idx = kaddr + erofs_blkoff(sb, pos);</div><div class='del'>-	switch (le32_to_cpu(idx-&gt;blkaddr)) {</div><div class='del'>-	case EROFS_NULL_ADDR:</div><div class='del'>-		map-&gt;m_flags = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		map-&gt;m_deviceid = le16_to_cpu(idx-&gt;device_id) &amp;</div><div class='del'>-			EROFS_SB(sb)-&gt;device_id_mask;</div><div class='del'>-		map-&gt;m_pa = erofs_pos(sb, le32_to_cpu(idx-&gt;blkaddr));</div><div class='del'>-		map-&gt;m_flags = EROFS_MAP_MAPPED;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='del'>-out_unlock:</div><div class='ctx'> 	erofs_put_metabuf(&amp;buf);</div><div class='ctx'> out:</div><div class='del'>-	if (!err)</div><div class='del'>-		map-&gt;m_llen = map-&gt;m_plen;</div><div class='add'>+	if (!err) {</div><div class='add'>+		map-&gt;m_plen = map-&gt;m_llen;</div><div class='add'>+		/* inline data should be located in the same meta block */</div><div class='add'>+		if ((map-&gt;m_flags &amp; EROFS_MAP_META) &amp;&amp;</div><div class='add'>+		    erofs_blkoff(sb, map-&gt;m_pa) + map-&gt;m_plen &gt; blksz) {</div><div class='add'>+			erofs_err(sb, "inline data across blocks @ nid %llu", vi-&gt;nid);</div><div class='add'>+			DBG_BUGON(1);</div><div class='add'>+			return -EFSCORRUPTED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	trace_erofs_map_blocks_exit(inode, map, 0, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void erofs_fill_from_devinfo(struct erofs_map_dev *map,</div><div class='add'>+		struct super_block *sb, struct erofs_device_info *dif)</div><div class='add'>+{</div><div class='add'>+	map-&gt;m_sb = sb;</div><div class='add'>+	map-&gt;m_dif = dif;</div><div class='add'>+	map-&gt;m_bdev = NULL;</div><div class='add'>+	if (dif-&gt;file &amp;&amp; S_ISBLK(file_inode(dif-&gt;file)-&gt;i_mode))</div><div class='add'>+		map-&gt;m_bdev = file_bdev(dif-&gt;file);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_dev_context *devs = EROFS_SB(sb)-&gt;devs;</div><div class='ctx'> 	struct erofs_device_info *dif;</div><div class='add'>+	erofs_off_t startoff;</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='del'>-	map-&gt;m_bdev = sb-&gt;s_bdev;</div><div class='del'>-	map-&gt;m_daxdev = EROFS_SB(sb)-&gt;dax_dev;</div><div class='del'>-	map-&gt;m_dax_part_off = EROFS_SB(sb)-&gt;dax_part_off;</div><div class='del'>-	map-&gt;m_fscache = EROFS_SB(sb)-&gt;s_fscache;</div><div class='del'>-</div><div class='add'>+	erofs_fill_from_devinfo(map, sb, &amp;EROFS_SB(sb)-&gt;dif0);</div><div class='add'>+	map-&gt;m_bdev = sb-&gt;s_bdev;	/* use s_bdev for the primary device */</div><div class='ctx'> 	if (map-&gt;m_deviceid) {</div><div class='ctx'> 		down_read(&amp;devs-&gt;rwsem);</div><div class='ctx'> 		dif = idr_find(&amp;devs-&gt;tree, map-&gt;m_deviceid - 1);</div><div class='hunk'>@@ -216,33 +199,23 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (devs-&gt;flatdev) {</div><div class='del'>-			map-&gt;m_pa += erofs_pos(sb, dif-&gt;mapped_blkaddr);</div><div class='add'>+			map-&gt;m_pa += erofs_pos(sb, dif-&gt;uniaddr);</div><div class='ctx'> 			up_read(&amp;devs-&gt;rwsem);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		map-&gt;m_bdev = dif-&gt;bdev_file ? file_bdev(dif-&gt;bdev_file) : NULL;</div><div class='del'>-		map-&gt;m_daxdev = dif-&gt;dax_dev;</div><div class='del'>-		map-&gt;m_dax_part_off = dif-&gt;dax_part_off;</div><div class='del'>-		map-&gt;m_fscache = dif-&gt;fscache;</div><div class='add'>+		erofs_fill_from_devinfo(map, sb, dif);</div><div class='ctx'> 		up_read(&amp;devs-&gt;rwsem);</div><div class='ctx'> 	} else if (devs-&gt;extra_devices &amp;&amp; !devs-&gt;flatdev) {</div><div class='ctx'> 		down_read(&amp;devs-&gt;rwsem);</div><div class='ctx'> 		idr_for_each_entry(&amp;devs-&gt;tree, dif, id) {</div><div class='del'>-			erofs_off_t startoff, length;</div><div class='del'>-</div><div class='del'>-			if (!dif-&gt;mapped_blkaddr)</div><div class='add'>+			if (!dif-&gt;uniaddr)</div><div class='ctx'> 				continue;</div><div class='del'>-			startoff = erofs_pos(sb, dif-&gt;mapped_blkaddr);</div><div class='del'>-			length = erofs_pos(sb, dif-&gt;blocks);</div><div class='ctx'> </div><div class='add'>+			startoff = erofs_pos(sb, dif-&gt;uniaddr);</div><div class='ctx'> 			if (map-&gt;m_pa &gt;= startoff &amp;&amp;</div><div class='del'>-			    map-&gt;m_pa &lt; startoff + length) {</div><div class='add'>+			    map-&gt;m_pa &lt; startoff + erofs_pos(sb, dif-&gt;blocks)) {</div><div class='ctx'> 				map-&gt;m_pa -= startoff;</div><div class='del'>-				map-&gt;m_bdev = dif-&gt;bdev_file ?</div><div class='del'>-					      file_bdev(dif-&gt;bdev_file) : NULL;</div><div class='del'>-				map-&gt;m_daxdev = dif-&gt;dax_dev;</div><div class='del'>-				map-&gt;m_dax_part_off = dif-&gt;dax_part_off;</div><div class='del'>-				map-&gt;m_fscache = dif-&gt;fscache;</div><div class='add'>+				erofs_fill_from_devinfo(map, sb, dif);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -251,6 +224,48 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * bit 30: I/O error occurred on this folio</div><div class='add'>+ * bit 29: CPU has dirty data in D-cache (needs aliasing handling);</div><div class='add'>+ * bit 0 - 29: remaining parts to complete this folio</div><div class='add'>+ */</div><div class='add'>+#define EROFS_ONLINEFOLIO_EIO		30</div><div class='add'>+#define EROFS_ONLINEFOLIO_DIRTY		29</div><div class='add'>+</div><div class='add'>+void erofs_onlinefolio_init(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	union {</div><div class='add'>+		atomic_t o;</div><div class='add'>+		void *v;</div><div class='add'>+	} u = { .o = ATOMIC_INIT(1) };</div><div class='add'>+</div><div class='add'>+	folio-&gt;private = u.v;	/* valid only if file-backed folio is locked */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_onlinefolio_split(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	atomic_inc((atomic_t *)&amp;folio-&gt;private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_onlinefolio_end(struct folio *folio, int err, bool dirty)</div><div class='add'>+{</div><div class='add'>+	int orig, v;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		orig = atomic_read((atomic_t *)&amp;folio-&gt;private);</div><div class='add'>+		DBG_BUGON(orig &lt;= 0);</div><div class='add'>+		v = dirty &lt;&lt; EROFS_ONLINEFOLIO_DIRTY;</div><div class='add'>+		v |= (orig - 1) | (!!err &lt;&lt; EROFS_ONLINEFOLIO_EIO);</div><div class='add'>+	} while (atomic_cmpxchg((atomic_t *)&amp;folio-&gt;private, orig, v) != orig);</div><div class='add'>+</div><div class='add'>+	if (v &amp; (BIT(EROFS_ONLINEFOLIO_DIRTY) - 1))</div><div class='add'>+		return;</div><div class='add'>+	folio-&gt;private = 0;</div><div class='add'>+	if (v &amp; BIT(EROFS_ONLINEFOLIO_DIRTY))</div><div class='add'>+		flush_dcache_folio(folio);</div><div class='add'>+	folio_end_read(folio, !(v &amp; BIT(EROFS_ONLINEFOLIO_EIO)));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> 		unsigned int flags, struct iomap *iomap, struct iomap *srcmap)</div><div class='ctx'> {</div><div class='hunk'>@@ -261,52 +276,51 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> </div><div class='ctx'> 	map.m_la = offset;</div><div class='ctx'> 	map.m_llen = length;</div><div class='del'>-</div><div class='ctx'> 	ret = erofs_map_blocks(inode, &amp;map);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	mdev = (struct erofs_map_dev) {</div><div class='del'>-		.m_deviceid = map.m_deviceid,</div><div class='del'>-		.m_pa = map.m_pa,</div><div class='del'>-	};</div><div class='del'>-	ret = erofs_map_dev(sb, &amp;mdev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	iomap-&gt;offset = map.m_la;</div><div class='del'>-	if (flags &amp; IOMAP_DAX)</div><div class='del'>-		iomap-&gt;dax_dev = mdev.m_daxdev;</div><div class='del'>-	else</div><div class='del'>-		iomap-&gt;bdev = mdev.m_bdev;</div><div class='ctx'> 	iomap-&gt;length = map.m_llen;</div><div class='ctx'> 	iomap-&gt;flags = 0;</div><div class='ctx'> 	iomap-&gt;private = NULL;</div><div class='del'>-</div><div class='add'>+	iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='ctx'> 	if (!(map.m_flags &amp; EROFS_MAP_MAPPED)) {</div><div class='ctx'> 		iomap-&gt;type = IOMAP_HOLE;</div><div class='del'>-		iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='del'>-		if (!iomap-&gt;length)</div><div class='del'>-			iomap-&gt;length = length;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!(map.m_flags &amp; EROFS_MAP_META) || !erofs_inode_in_metabox(inode)) {</div><div class='add'>+		mdev = (struct erofs_map_dev) {</div><div class='add'>+			.m_deviceid = map.m_deviceid,</div><div class='add'>+			.m_pa = map.m_pa,</div><div class='add'>+		};</div><div class='add'>+		ret = erofs_map_dev(sb, &amp;mdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; IOMAP_DAX)</div><div class='add'>+			iomap-&gt;dax_dev = mdev.m_dif-&gt;dax_dev;</div><div class='add'>+		else</div><div class='add'>+			iomap-&gt;bdev = mdev.m_bdev;</div><div class='add'>+		iomap-&gt;addr = mdev.m_dif-&gt;fsoff + mdev.m_pa;</div><div class='add'>+		if (flags &amp; IOMAP_DAX)</div><div class='add'>+			iomap-&gt;addr += mdev.m_dif-&gt;dax_part_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (map.m_flags &amp; EROFS_MAP_META) {</div><div class='ctx'> 		void *ptr;</div><div class='ctx'> 		struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='ctx'> </div><div class='ctx'> 		iomap-&gt;type = IOMAP_INLINE;</div><div class='del'>-		ptr = erofs_read_metabuf(&amp;buf, sb,</div><div class='del'>-				erofs_blknr(sb, mdev.m_pa), EROFS_KMAP);</div><div class='add'>+		ptr = erofs_read_metabuf(&amp;buf, sb, map.m_pa,</div><div class='add'>+					 erofs_inode_in_metabox(inode));</div><div class='ctx'> 		if (IS_ERR(ptr))</div><div class='ctx'> 			return PTR_ERR(ptr);</div><div class='del'>-		iomap-&gt;inline_data = ptr + erofs_blkoff(sb, mdev.m_pa);</div><div class='add'>+		iomap-&gt;inline_data = ptr;</div><div class='ctx'> 		iomap-&gt;private = buf.base;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		iomap-&gt;type = IOMAP_MAPPED;</div><div class='del'>-		iomap-&gt;addr = mdev.m_pa;</div><div class='del'>-		if (flags &amp; IOMAP_DAX)</div><div class='del'>-			iomap-&gt;addr += mdev.m_dax_part_off;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -320,7 +334,6 @@ static int erofs_iomap_end(struct inode *inode, loff_t pos, loff_t length,</div><div class='ctx'> 		struct erofs_buf buf = {</div><div class='ctx'> 			.page = kmap_to_page(ptr),</div><div class='ctx'> 			.base = ptr,</div><div class='del'>-			.kmap_type = EROFS_KMAP,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		DBG_BUGON(iomap-&gt;type != IOMAP_INLINE);</div><div class='hunk'>@@ -356,12 +369,18 @@ int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'>  */</div><div class='ctx'> static int erofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return iomap_read_folio(folio, &amp;erofs_iomap_ops);</div><div class='add'>+	trace_erofs_read_folio(folio, true);</div><div class='add'>+</div><div class='add'>+	iomap_bio_read_folio(folio, &amp;erofs_iomap_ops);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void erofs_readahead(struct readahead_control *rac)</div><div class='ctx'> {</div><div class='del'>-	return iomap_readahead(rac, &amp;erofs_iomap_ops);</div><div class='add'>+	trace_erofs_readahead(rac-&gt;mapping-&gt;host, readahead_index(rac),</div><div class='add'>+					readahead_count(rac), true);</div><div class='add'>+</div><div class='add'>+	iomap_bio_readahead(rac, &amp;erofs_iomap_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static sector_t erofs_bmap(struct address_space *mapping, sector_t block)</div><div class='hunk'>@@ -381,27 +400,14 @@ static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	if (IS_DAX(inode))</div><div class='ctx'> 		return dax_iomap_rw(iocb, to, &amp;erofs_iomap_ops);</div><div class='ctx'> #endif</div><div class='del'>-	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='del'>-		struct block_device *bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='del'>-		unsigned int blksize_mask;</div><div class='del'>-</div><div class='del'>-		if (bdev)</div><div class='del'>-			blksize_mask = bdev_logical_block_size(bdev) - 1;</div><div class='del'>-		else</div><div class='del'>-			blksize_mask = i_blocksize(inode) - 1;</div><div class='del'>-</div><div class='del'>-		if ((iocb-&gt;ki_pos | iov_iter_count(to) |</div><div class='del'>-		     iov_iter_alignment(to)) &amp; blksize_mask)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='add'>+	if ((iocb-&gt;ki_flags &amp; IOCB_DIRECT) &amp;&amp; inode-&gt;i_sb-&gt;s_bdev)</div><div class='ctx'> 		return iomap_dio_rw(iocb, to, &amp;erofs_iomap_ops,</div><div class='ctx'> 				    NULL, 0, NULL, 0);</div><div class='del'>-	}</div><div class='ctx'> 	return filemap_read(iocb, to, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* for uncompressed (aligned) files and raw access for other files */</div><div class='del'>-const struct address_space_operations erofs_raw_access_aops = {</div><div class='add'>+const struct address_space_operations erofs_aops = {</div><div class='ctx'> 	.read_folio = erofs_read_folio,</div><div class='ctx'> 	.readahead = erofs_readahead,</div><div class='ctx'> 	.bmap = erofs_bmap,</div><div class='hunk'>@@ -427,25 +433,54 @@ static const struct vm_operations_struct erofs_dax_vm_ops = {</div><div class='ctx'> 	.huge_fault	= erofs_dax_huge_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int erofs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int erofs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	if (!IS_DAX(file_inode(file)))</div><div class='del'>-		return generic_file_readonly_mmap(file, vma);</div><div class='add'>+	if (!IS_DAX(file_inode(desc-&gt;file)))</div><div class='add'>+		return generic_file_readonly_mmap_prepare(desc);</div><div class='ctx'> </div><div class='del'>-	if ((vma-&gt;vm_flags &amp; VM_SHARED) &amp;&amp; (vma-&gt;vm_flags &amp; VM_MAYWRITE))</div><div class='add'>+	if ((desc-&gt;vm_flags &amp; VM_SHARED) &amp;&amp; (desc-&gt;vm_flags &amp; VM_MAYWRITE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	vma-&gt;vm_ops = &amp;erofs_dax_vm_ops;</div><div class='del'>-	vm_flags_set(vma, VM_HUGEPAGE);</div><div class='add'>+	desc-&gt;vm_ops = &amp;erofs_dax_vm_ops;</div><div class='add'>+	desc-&gt;vm_flags |= VM_HUGEPAGE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-#define erofs_file_mmap	generic_file_readonly_mmap</div><div class='add'>+#define erofs_file_mmap_prepare	generic_file_readonly_mmap_prepare</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static loff_t erofs_file_llseek(struct file *file, loff_t offset, int whence)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+	const struct iomap_ops *ops = &amp;erofs_iomap_ops;</div><div class='add'>+</div><div class='add'>+	if (erofs_inode_is_data_compressed(EROFS_I(inode)-&gt;datalayout))</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP</div><div class='add'>+		ops = &amp;z_erofs_iomap_report_ops;</div><div class='add'>+#else</div><div class='add'>+		return generic_file_llseek(file, offset, whence);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (whence == SEEK_HOLE)</div><div class='add'>+		offset = iomap_seek_hole(inode, offset, ops);</div><div class='add'>+	else if (whence == SEEK_DATA)</div><div class='add'>+		offset = iomap_seek_data(inode, offset, ops);</div><div class='add'>+	else</div><div class='add'>+		return generic_file_llseek(file, offset, whence);</div><div class='add'>+</div><div class='add'>+	if (offset &lt; 0)</div><div class='add'>+		return offset;</div><div class='add'>+	return vfs_setpos(file, offset, inode-&gt;i_sb-&gt;s_maxbytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations erofs_file_fops = {</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='add'>+	.llseek		= erofs_file_llseek,</div><div class='ctx'> 	.read_iter	= erofs_file_read_iter,</div><div class='del'>-	.mmap		= erofs_file_mmap,</div><div class='add'>+	.unlocked_ioctl = erofs_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl   = erofs_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.mmap_prepare	= erofs_file_mmap_prepare,</div><div class='add'>+	.get_unmapped_area = thp_get_unmapped_area,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c<br/>index 072ef6a66823..d5d090276391 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/decompressor.c</a></div><div class='hunk'>@@ -2,26 +2,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2019 HUAWEI, Inc.</div><div class='ctx'>  *             https://www.huawei.com/</div><div class='add'>+ * Copyright (C) 2024 Alibaba Cloud</div><div class='ctx'>  */</div><div class='ctx'> #include "compress.h"</div><div class='ctx'> #include &lt;linux/lz4.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef LZ4_DISTANCE_MAX	/* history window size */</div><div class='del'>-#define LZ4_DISTANCE_MAX 65535	/* set to maximum value by default */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define LZ4_MAX_DISTANCE_PAGES	(DIV_ROUND_UP(LZ4_DISTANCE_MAX, PAGE_SIZE) + 1)</div><div class='del'>-#ifndef LZ4_DECOMPRESS_INPLACE_MARGIN</div><div class='del'>-#define LZ4_DECOMPRESS_INPLACE_MARGIN(srcsize)  (((srcsize) &gt;&gt; 8) + 32)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct z_erofs_lz4_decompress_ctx {</div><div class='del'>-	struct z_erofs_decompress_req *rq;</div><div class='del'>-	/* # of encoded, decoded pages */</div><div class='del'>-	unsigned int inpages, outpages;</div><div class='del'>-	/* decoded block total length (used for in-place decompression) */</div><div class='del'>-	unsigned int oend;</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static int z_erofs_load_lz4_config(struct super_block *sb,</div><div class='ctx'> 			    struct erofs_super_block *dsb, void *data, int size)</div><div class='hunk'>@@ -54,17 +40,16 @@ static int z_erofs_load_lz4_config(struct super_block *sb,</div><div class='ctx'> 	sbi-&gt;lz4.max_distance_pages = distance ?</div><div class='ctx'> 					DIV_ROUND_UP(distance, PAGE_SIZE) + 1 :</div><div class='ctx'> 					LZ4_MAX_DISTANCE_PAGES;</div><div class='del'>-	return erofs_pcpubuf_growsize(sbi-&gt;lz4.max_pclusterblks);</div><div class='add'>+	return z_erofs_gbuf_growsize(sbi-&gt;lz4.max_pclusterblks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Fill all gaps with bounce pages if it's a sparse page list. Also check if</div><div class='ctx'>  * all physical pages are consecutive, which can be seen for moderate CR.</div><div class='ctx'>  */</div><div class='del'>-static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='add'>+static int z_erofs_lz4_prepare_dstpages(struct z_erofs_decompress_req *rq,</div><div class='ctx'> 					struct page **pagepool)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_decompress_req *rq = ctx-&gt;rq;</div><div class='ctx'> 	struct page *availables[LZ4_MAX_DISTANCE_PAGES] = { NULL };</div><div class='ctx'> 	unsigned long bounced[DIV_ROUND_UP(LZ4_MAX_DISTANCE_PAGES,</div><div class='ctx'> 					   BITS_PER_LONG)] = { 0 };</div><div class='hunk'>@@ -74,7 +59,7 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> 	unsigned int i, j, top;</div><div class='ctx'> </div><div class='ctx'> 	top = 0;</div><div class='del'>-	for (i = j = 0; i &lt; ctx-&gt;outpages; ++i, ++j) {</div><div class='add'>+	for (i = j = 0; i &lt; rq-&gt;outpages; ++i, ++j) {</div><div class='ctx'> 		struct page *const page = rq-&gt;out[i];</div><div class='ctx'> 		struct page *victim;</div><div class='ctx'> </div><div class='hunk'>@@ -109,10 +94,10 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> </div><div class='ctx'> 		if (top) {</div><div class='ctx'> 			victim = availables[--top];</div><div class='del'>-			get_page(victim);</div><div class='ctx'> 		} else {</div><div class='del'>-			victim = erofs_allocpage(pagepool,</div><div class='del'>-						 GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+			victim = __erofs_allocpage(pagepool, rq-&gt;gfp, true);</div><div class='add'>+			if (!victim)</div><div class='add'>+				return -ENOMEM;</div><div class='ctx'> 			set_page_private(victim, Z_EROFS_SHORTLIVED_PAGE);</div><div class='ctx'> 		}</div><div class='ctx'> 		rq-&gt;out[i] = victim;</div><div class='hunk'>@@ -120,65 +105,72 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> 	return kaddr ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *z_erofs_lz4_handle_overlap(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='add'>+static void *z_erofs_lz4_handle_overlap(const struct z_erofs_decompress_req *rq,</div><div class='ctx'> 			void *inpage, void *out, unsigned int *inputmargin,</div><div class='ctx'> 			int *maptype, bool may_inplace)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_decompress_req *rq = ctx-&gt;rq;</div><div class='del'>-	unsigned int omargin, total, i;</div><div class='add'>+	unsigned int oend, omargin, cnt, i;</div><div class='ctx'> 	struct page **in;</div><div class='del'>-	void *src, *tmp;</div><div class='del'>-</div><div class='del'>-	if (rq-&gt;inplace_io) {</div><div class='del'>-		omargin = PAGE_ALIGN(ctx-&gt;oend) - ctx-&gt;oend;</div><div class='del'>-		if (rq-&gt;partial_decoding || !may_inplace ||</div><div class='del'>-		    omargin &lt; LZ4_DECOMPRESS_INPLACE_MARGIN(rq-&gt;inputsize))</div><div class='del'>-			goto docopy;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ctx-&gt;inpages; ++i)</div><div class='del'>-			if (rq-&gt;out[ctx-&gt;outpages - ctx-&gt;inpages + i] !=</div><div class='del'>-			    rq-&gt;in[i])</div><div class='del'>-				goto docopy;</div><div class='add'>+	void *src;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If in-place I/O isn't used, for example, the bounce compressed cache</div><div class='add'>+	 * can hold data for incomplete read requests. Just map the compressed</div><div class='add'>+	 * buffer as well and decompress directly.</div><div class='add'>+	 */</div><div class='add'>+	if (!rq-&gt;inplace_io) {</div><div class='add'>+		if (rq-&gt;inpages &lt;= 1) {</div><div class='add'>+			*maptype = 0;</div><div class='add'>+			return inpage;</div><div class='add'>+		}</div><div class='ctx'> 		kunmap_local(inpage);</div><div class='del'>-		*maptype = 3;</div><div class='del'>-		return out + ((ctx-&gt;outpages - ctx-&gt;inpages) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		src = erofs_vm_map_ram(rq-&gt;in, rq-&gt;inpages);</div><div class='add'>+		if (!src)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		*maptype = 1;</div><div class='add'>+		return src;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;inpages &lt;= 1) {</div><div class='del'>-		*maptype = 0;</div><div class='del'>-		return inpage;</div><div class='add'>+	/*</div><div class='add'>+	 * Then, deal with in-place I/Os. The reasons why in-place I/O is useful</div><div class='add'>+	 * are: (1) It minimizes memory footprint during the I/O submission,</div><div class='add'>+	 * which is useful for slow storage (including network devices and</div><div class='add'>+	 * low-end HDDs/eMMCs) but with a lot inflight I/Os; (2) If in-place</div><div class='add'>+	 * decompression can also be applied, it will reuse the unique buffer so</div><div class='add'>+	 * that no extra CPU D-cache is polluted with temporary compressed data</div><div class='add'>+	 * for extreme performance.</div><div class='add'>+	 */</div><div class='add'>+	oend = rq-&gt;pageofs_out + rq-&gt;outputsize;</div><div class='add'>+	omargin = PAGE_ALIGN(oend) - oend;</div><div class='add'>+	if (!rq-&gt;partial_decoding &amp;&amp; may_inplace &amp;&amp;</div><div class='add'>+	    omargin &gt;= LZ4_DECOMPRESS_INPLACE_MARGIN(rq-&gt;inputsize)) {</div><div class='add'>+		for (i = 0; i &lt; rq-&gt;inpages; ++i)</div><div class='add'>+			if (rq-&gt;out[rq-&gt;outpages - rq-&gt;inpages + i] !=</div><div class='add'>+			    rq-&gt;in[i])</div><div class='add'>+				break;</div><div class='add'>+		if (i &gt;= rq-&gt;inpages) {</div><div class='add'>+			kunmap_local(inpage);</div><div class='add'>+			*maptype = 3;</div><div class='add'>+			return out + ((rq-&gt;outpages - rq-&gt;inpages) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	kunmap_local(inpage);</div><div class='del'>-	src = erofs_vm_map_ram(rq-&gt;in, ctx-&gt;inpages);</div><div class='del'>-	if (!src)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	*maptype = 1;</div><div class='del'>-	return src;</div><div class='del'>-</div><div class='del'>-docopy:</div><div class='del'>-	/* Or copy compressed data which can be overlapped to per-CPU buffer */</div><div class='del'>-	in = rq-&gt;in;</div><div class='del'>-	src = erofs_get_pcpubuf(ctx-&gt;inpages);</div><div class='add'>+	/*</div><div class='add'>+	 * If in-place decompression can't be applied, copy compressed data that</div><div class='add'>+	 * may potentially overlap during decompression to a per-CPU buffer.</div><div class='add'>+	 */</div><div class='add'>+	src = z_erofs_get_gbuf(rq-&gt;inpages);</div><div class='ctx'> 	if (!src) {</div><div class='ctx'> 		DBG_BUGON(1);</div><div class='ctx'> 		kunmap_local(inpage);</div><div class='ctx'> 		return ERR_PTR(-EFAULT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tmp = src;</div><div class='del'>-	total = rq-&gt;inputsize;</div><div class='del'>-	while (total) {</div><div class='del'>-		unsigned int page_copycnt =</div><div class='del'>-			min_t(unsigned int, total, PAGE_SIZE - *inputmargin);</div><div class='del'>-</div><div class='add'>+	for (i = 0, in = rq-&gt;in; i &lt; rq-&gt;inputsize; i += cnt, ++in) {</div><div class='add'>+		cnt = min_t(u32, rq-&gt;inputsize - i, PAGE_SIZE - *inputmargin);</div><div class='ctx'> 		if (!inpage)</div><div class='ctx'> 			inpage = kmap_local_page(*in);</div><div class='del'>-		memcpy(tmp, inpage + *inputmargin, page_copycnt);</div><div class='add'>+		memcpy(src + i, inpage + *inputmargin, cnt);</div><div class='ctx'> 		kunmap_local(inpage);</div><div class='ctx'> 		inpage = NULL;</div><div class='del'>-		tmp += page_copycnt;</div><div class='del'>-		total -= page_copycnt;</div><div class='del'>-		++in;</div><div class='ctx'> 		*inputmargin = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	*maptype = 2;</div><div class='hunk'>@@ -186,30 +178,29 @@ docopy:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get the exact inputsize with zero_padding feature.</div><div class='del'>- *  - For LZ4, it should work if zero_padding feature is on (5.3+);</div><div class='del'>- *  - For MicroLZMA, it'd be enabled all the time.</div><div class='add'>+ * Get the exact on-disk size of the compressed data:</div><div class='add'>+ *  - For LZ4, it should apply if the zero_padding feature is on (5.3+);</div><div class='add'>+ *  - For others, zero_padding is enabled all the time.</div><div class='ctx'>  */</div><div class='del'>-int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf,</div><div class='del'>-			 unsigned int padbufsize)</div><div class='add'>+const char *z_erofs_fixup_insize(struct z_erofs_decompress_req *rq,</div><div class='add'>+				 const char *padbuf, unsigned int padbufsize)</div><div class='ctx'> {</div><div class='ctx'> 	const char *padend;</div><div class='ctx'> </div><div class='ctx'> 	padend = memchr_inv(padbuf, 0, padbufsize);</div><div class='ctx'> 	if (!padend)</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='add'>+		return "compressed data start not found";</div><div class='ctx'> 	rq-&gt;inputsize -= padend - padbuf;</div><div class='ctx'> 	rq-&gt;pageofs_in += padend - padbuf;</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='del'>-				      u8 *dst)</div><div class='add'>+static int z_erofs_lz4_decompress_mem(struct z_erofs_decompress_req *rq, u8 *dst)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_decompress_req *rq = ctx-&gt;rq;</div><div class='ctx'> 	bool support_0padding = false, may_inplace = false;</div><div class='ctx'> 	unsigned int inputmargin;</div><div class='ctx'> 	u8 *out, *headpage, *src;</div><div class='add'>+	const char *reason;</div><div class='ctx'> 	int ret, maptype;</div><div class='ctx'> </div><div class='ctx'> 	DBG_BUGON(*rq-&gt;in == NULL);</div><div class='hunk'>@@ -218,19 +209,19 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> 	/* LZ4 decompression inplace is only safe if zero_padding is enabled */</div><div class='ctx'> 	if (erofs_sb_has_zero_padding(EROFS_SB(rq-&gt;sb))) {</div><div class='ctx'> 		support_0padding = true;</div><div class='del'>-		ret = z_erofs_fixup_insize(rq, headpage + rq-&gt;pageofs_in,</div><div class='add'>+		reason = z_erofs_fixup_insize(rq, headpage + rq-&gt;pageofs_in,</div><div class='ctx'> 				min_t(unsigned int, rq-&gt;inputsize,</div><div class='ctx'> 				      rq-&gt;sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='del'>-		if (ret) {</div><div class='add'>+		if (reason) {</div><div class='ctx'> 			kunmap_local(headpage);</div><div class='del'>-			return ret;</div><div class='add'>+			return IS_ERR(reason) ? PTR_ERR(reason) : -EFSCORRUPTED;</div><div class='ctx'> 		}</div><div class='ctx'> 		may_inplace = !((rq-&gt;pageofs_in + rq-&gt;inputsize) &amp;</div><div class='ctx'> 				(rq-&gt;sb-&gt;s_blocksize - 1));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inputmargin = rq-&gt;pageofs_in;</div><div class='del'>-	src = z_erofs_lz4_handle_overlap(ctx, headpage, dst, &amp;inputmargin,</div><div class='add'>+	src = z_erofs_lz4_handle_overlap(rq, headpage, dst, &amp;inputmargin,</div><div class='ctx'> 					 &amp;maptype, may_inplace);</div><div class='ctx'> 	if (IS_ERR(src))</div><div class='ctx'> 		return PTR_ERR(src);</div><div class='hunk'>@@ -245,8 +236,6 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> 					  rq-&gt;inputsize, rq-&gt;outputsize);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != rq-&gt;outputsize) {</div><div class='del'>-		erofs_err(rq-&gt;sb, "failed to decompress %d in[%u, %u] out[%u]",</div><div class='del'>-			  ret, rq-&gt;inputsize, inputmargin, rq-&gt;outputsize);</div><div class='ctx'> 		if (ret &gt;= 0)</div><div class='ctx'> 			memset(out + ret, 0, rq-&gt;outputsize - ret);</div><div class='ctx'> 		ret = -EFSCORRUPTED;</div><div class='hunk'>@@ -257,9 +246,9 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> 	if (maptype == 0) {</div><div class='ctx'> 		kunmap_local(headpage);</div><div class='ctx'> 	} else if (maptype == 1) {</div><div class='del'>-		vm_unmap_ram(src, ctx-&gt;inpages);</div><div class='add'>+		vm_unmap_ram(src, rq-&gt;inpages);</div><div class='ctx'> 	} else if (maptype == 2) {</div><div class='del'>-		erofs_put_pcpubuf(src);</div><div class='add'>+		z_erofs_put_gbuf(src);</div><div class='ctx'> 	} else if (maptype != 3) {</div><div class='ctx'> 		DBG_BUGON(1);</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -267,81 +256,68 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_lz4_decompress(struct z_erofs_decompress_req *rq,</div><div class='del'>-				  struct page **pagepool)</div><div class='add'>+static const char *z_erofs_lz4_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+					  struct page **pagepool)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_lz4_decompress_ctx ctx;</div><div class='ctx'> 	unsigned int dst_maptype;</div><div class='ctx'> 	void *dst;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ctx.rq = rq;</div><div class='del'>-	ctx.oend = rq-&gt;pageofs_out + rq-&gt;outputsize;</div><div class='del'>-	ctx.outpages = PAGE_ALIGN(ctx.oend) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	ctx.inpages = PAGE_ALIGN(rq-&gt;inputsize) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='ctx'> 	/* one optimized fast path only for non bigpcluster cases yet */</div><div class='del'>-	if (ctx.inpages == 1 &amp;&amp; ctx.outpages == 1 &amp;&amp; !rq-&gt;inplace_io) {</div><div class='add'>+	if (rq-&gt;inpages == 1 &amp;&amp; rq-&gt;outpages == 1 &amp;&amp; !rq-&gt;inplace_io) {</div><div class='ctx'> 		DBG_BUGON(!*rq-&gt;out);</div><div class='ctx'> 		dst = kmap_local_page(*rq-&gt;out);</div><div class='ctx'> 		dst_maptype = 0;</div><div class='del'>-		goto dstmap_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* general decoding path which can be used for all cases */</div><div class='del'>-	ret = z_erofs_lz4_prepare_dstpages(&amp;ctx, pagepool);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		return ret;</div><div class='del'>-	} else if (ret &gt; 0) {</div><div class='del'>-		dst = page_address(*rq-&gt;out);</div><div class='del'>-		dst_maptype = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		dst = erofs_vm_map_ram(rq-&gt;out, ctx.outpages);</div><div class='del'>-		if (!dst)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		dst_maptype = 2;</div><div class='add'>+		/* general decoding path which can be used for all cases */</div><div class='add'>+		ret = z_erofs_lz4_prepare_dstpages(rq, pagepool);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			dst = page_address(*rq-&gt;out);</div><div class='add'>+			dst_maptype = 1;</div><div class='add'>+		} else {</div><div class='add'>+			dst = erofs_vm_map_ram(rq-&gt;out, rq-&gt;outpages);</div><div class='add'>+			if (!dst)</div><div class='add'>+				return ERR_PTR(-ENOMEM);</div><div class='add'>+			dst_maptype = 2;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-dstmap_out:</div><div class='del'>-	ret = z_erofs_lz4_decompress_mem(&amp;ctx, dst);</div><div class='add'>+	ret = z_erofs_lz4_decompress_mem(rq, dst);</div><div class='ctx'> 	if (!dst_maptype)</div><div class='ctx'> 		kunmap_local(dst);</div><div class='ctx'> 	else if (dst_maptype == 2)</div><div class='del'>-		vm_unmap_ram(dst, ctx.outpages);</div><div class='del'>-	return ret;</div><div class='add'>+		vm_unmap_ram(dst, rq-&gt;outpages);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_transform_plain(struct z_erofs_decompress_req *rq,</div><div class='del'>-				   struct page **pagepool)</div><div class='add'>+static const char *z_erofs_transform_plain(struct z_erofs_decompress_req *rq,</div><div class='add'>+					   struct page **pagepool)</div><div class='ctx'> {</div><div class='del'>-	const unsigned int nrpages_in =</div><div class='del'>-		PAGE_ALIGN(rq-&gt;pageofs_in + rq-&gt;inputsize) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	const unsigned int nrpages_out =</div><div class='del'>-		PAGE_ALIGN(rq-&gt;pageofs_out + rq-&gt;outputsize) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	const unsigned int nrpages_in = rq-&gt;inpages, nrpages_out = rq-&gt;outpages;</div><div class='ctx'> 	const unsigned int bs = rq-&gt;sb-&gt;s_blocksize;</div><div class='ctx'> 	unsigned int cur = 0, ni = 0, no, pi, po, insz, cnt;</div><div class='ctx'> 	u8 *kin;</div><div class='ctx'> </div><div class='del'>-	DBG_BUGON(rq-&gt;outputsize &gt; rq-&gt;inputsize);</div><div class='add'>+	if (rq-&gt;outputsize &gt; rq-&gt;inputsize)</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> 	if (rq-&gt;alg == Z_EROFS_COMPRESSION_INTERLACED) {</div><div class='ctx'> 		cur = bs - (rq-&gt;pageofs_out &amp; (bs - 1));</div><div class='ctx'> 		pi = (rq-&gt;pageofs_in + rq-&gt;inputsize - cur) &amp; ~PAGE_MASK;</div><div class='ctx'> 		cur = min(cur, rq-&gt;outputsize);</div><div class='ctx'> 		if (cur &amp;&amp; rq-&gt;out[0]) {</div><div class='ctx'> 			kin = kmap_local_page(rq-&gt;in[nrpages_in - 1]);</div><div class='del'>-			if (rq-&gt;out[0] == rq-&gt;in[nrpages_in - 1]) {</div><div class='add'>+			if (rq-&gt;out[0] == rq-&gt;in[nrpages_in - 1])</div><div class='ctx'> 				memmove(kin + rq-&gt;pageofs_out, kin + pi, cur);</div><div class='del'>-				flush_dcache_page(rq-&gt;out[0]);</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='ctx'> 				memcpy_to_page(rq-&gt;out[0], rq-&gt;pageofs_out,</div><div class='ctx'> 					       kin + pi, cur);</div><div class='del'>-			}</div><div class='ctx'> 			kunmap_local(kin);</div><div class='ctx'> 		}</div><div class='ctx'> 		rq-&gt;outputsize -= cur;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (; rq-&gt;outputsize; rq-&gt;pageofs_in = 0, cur += PAGE_SIZE, ni++) {</div><div class='add'>+	for (; rq-&gt;outputsize; rq-&gt;pageofs_in = 0, cur += insz, ni++) {</div><div class='ctx'> 		insz = min(PAGE_SIZE - rq-&gt;pageofs_in, rq-&gt;outputsize);</div><div class='ctx'> 		rq-&gt;outputsize -= insz;</div><div class='ctx'> 		if (!rq-&gt;in[ni])</div><div class='hunk'>@@ -353,49 +329,122 @@ static int z_erofs_transform_plain(struct z_erofs_decompress_req *rq,</div><div class='ctx'> 			po = (rq-&gt;pageofs_out + cur + pi) &amp; ~PAGE_MASK;</div><div class='ctx'> 			DBG_BUGON(no &gt;= nrpages_out);</div><div class='ctx'> 			cnt = min(insz - pi, PAGE_SIZE - po);</div><div class='del'>-			if (rq-&gt;out[no] == rq-&gt;in[ni]) {</div><div class='add'>+			if (rq-&gt;out[no] == rq-&gt;in[ni])</div><div class='ctx'> 				memmove(kin + po,</div><div class='ctx'> 					kin + rq-&gt;pageofs_in + pi, cnt);</div><div class='del'>-				flush_dcache_page(rq-&gt;out[no]);</div><div class='del'>-			} else if (rq-&gt;out[no]) {</div><div class='add'>+			else if (rq-&gt;out[no])</div><div class='ctx'> 				memcpy_to_page(rq-&gt;out[no], po,</div><div class='ctx'> 					       kin + rq-&gt;pageofs_in + pi, cnt);</div><div class='del'>-			}</div><div class='ctx'> 			pi += cnt;</div><div class='ctx'> 		} while (pi &lt; insz);</div><div class='ctx'> 		kunmap_local(kin);</div><div class='ctx'> 	}</div><div class='ctx'> 	DBG_BUGON(ni &gt; nrpages_in);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *z_erofs_stream_switch_bufs(struct z_erofs_stream_dctx *dctx,</div><div class='add'>+				void **dst, void **src, struct page **pgpl)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_decompress_req *rq = dctx-&gt;rq;</div><div class='add'>+	struct page **pgo, *tmppage;</div><div class='add'>+	unsigned int j;</div><div class='add'>+</div><div class='add'>+	if (!dctx-&gt;avail_out) {</div><div class='add'>+		if (++dctx-&gt;no &gt;= rq-&gt;outpages || !rq-&gt;outputsize)</div><div class='add'>+			return "insufficient space for decompressed data";</div><div class='add'>+</div><div class='add'>+		if (dctx-&gt;kout)</div><div class='add'>+			kunmap_local(dctx-&gt;kout);</div><div class='add'>+		dctx-&gt;avail_out = min(rq-&gt;outputsize, PAGE_SIZE - rq-&gt;pageofs_out);</div><div class='add'>+		rq-&gt;outputsize -= dctx-&gt;avail_out;</div><div class='add'>+		pgo = &amp;rq-&gt;out[dctx-&gt;no];</div><div class='add'>+		if (!*pgo &amp;&amp; rq-&gt;fillgaps) {		/* deduped */</div><div class='add'>+			*pgo = erofs_allocpage(pgpl, rq-&gt;gfp);</div><div class='add'>+			if (!*pgo) {</div><div class='add'>+				dctx-&gt;kout = NULL;</div><div class='add'>+				return ERR_PTR(-ENOMEM);</div><div class='add'>+			}</div><div class='add'>+			set_page_private(*pgo, Z_EROFS_SHORTLIVED_PAGE);</div><div class='add'>+		}</div><div class='add'>+		if (*pgo) {</div><div class='add'>+			dctx-&gt;kout = kmap_local_page(*pgo);</div><div class='add'>+			*dst = dctx-&gt;kout + rq-&gt;pageofs_out;</div><div class='add'>+		} else {</div><div class='add'>+			*dst = dctx-&gt;kout = NULL;</div><div class='add'>+		}</div><div class='add'>+		rq-&gt;pageofs_out = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dctx-&gt;inbuf_pos == dctx-&gt;inbuf_sz &amp;&amp; rq-&gt;inputsize) {</div><div class='add'>+		if (++dctx-&gt;ni &gt;= rq-&gt;inpages)</div><div class='add'>+			return "invalid compressed data";</div><div class='add'>+		if (dctx-&gt;kout) /* unlike kmap(), take care of the orders */</div><div class='add'>+			kunmap_local(dctx-&gt;kout);</div><div class='add'>+		kunmap_local(dctx-&gt;kin);</div><div class='add'>+</div><div class='add'>+		dctx-&gt;inbuf_sz = min_t(u32, rq-&gt;inputsize, PAGE_SIZE);</div><div class='add'>+		rq-&gt;inputsize -= dctx-&gt;inbuf_sz;</div><div class='add'>+		dctx-&gt;kin = kmap_local_page(rq-&gt;in[dctx-&gt;ni]);</div><div class='add'>+		*src = dctx-&gt;kin;</div><div class='add'>+		dctx-&gt;bounced = false;</div><div class='add'>+		if (dctx-&gt;kout) {</div><div class='add'>+			j = (u8 *)*dst - dctx-&gt;kout;</div><div class='add'>+			dctx-&gt;kout = kmap_local_page(rq-&gt;out[dctx-&gt;no]);</div><div class='add'>+			*dst = dctx-&gt;kout + j;</div><div class='add'>+		}</div><div class='add'>+		dctx-&gt;inbuf_pos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Handle overlapping: Use the given bounce buffer if the input data is</div><div class='add'>+	 * under processing; Or utilize short-lived pages from the on-stack page</div><div class='add'>+	 * pool, where pages are shared among the same request.  Note that only</div><div class='add'>+	 * a few inplace I/O pages need to be doubled.</div><div class='add'>+	 */</div><div class='add'>+	if (!dctx-&gt;bounced &amp;&amp; rq-&gt;out[dctx-&gt;no] == rq-&gt;in[dctx-&gt;ni]) {</div><div class='add'>+		memcpy(dctx-&gt;bounce, *src, dctx-&gt;inbuf_sz);</div><div class='add'>+		*src = dctx-&gt;bounce;</div><div class='add'>+		dctx-&gt;bounced = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = dctx-&gt;ni + 1; j &lt; rq-&gt;inpages; ++j) {</div><div class='add'>+		if (rq-&gt;out[dctx-&gt;no] != rq-&gt;in[j])</div><div class='add'>+			continue;</div><div class='add'>+		tmppage = erofs_allocpage(pgpl, rq-&gt;gfp);</div><div class='add'>+		if (!tmppage)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);</div><div class='add'>+		copy_highpage(tmppage, rq-&gt;in[j]);</div><div class='add'>+		rq-&gt;in[j] = tmppage;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct z_erofs_decompressor erofs_decompressors[] = {</div><div class='del'>-	[Z_EROFS_COMPRESSION_SHIFTED] = {</div><div class='add'>+const struct z_erofs_decompressor *z_erofs_decomp[] = {</div><div class='add'>+	[Z_EROFS_COMPRESSION_SHIFTED] = &amp;(const struct z_erofs_decompressor) {</div><div class='ctx'> 		.decompress = z_erofs_transform_plain,</div><div class='ctx'> 		.name = "shifted"</div><div class='ctx'> 	},</div><div class='del'>-	[Z_EROFS_COMPRESSION_INTERLACED] = {</div><div class='add'>+	[Z_EROFS_COMPRESSION_INTERLACED] = &amp;(const struct z_erofs_decompressor) {</div><div class='ctx'> 		.decompress = z_erofs_transform_plain,</div><div class='ctx'> 		.name = "interlaced"</div><div class='ctx'> 	},</div><div class='del'>-	[Z_EROFS_COMPRESSION_LZ4] = {</div><div class='add'>+	[Z_EROFS_COMPRESSION_LZ4] = &amp;(const struct z_erofs_decompressor) {</div><div class='ctx'> 		.config = z_erofs_load_lz4_config,</div><div class='ctx'> 		.decompress = z_erofs_lz4_decompress,</div><div class='add'>+		.init = z_erofs_gbuf_init,</div><div class='add'>+		.exit = z_erofs_gbuf_exit,</div><div class='ctx'> 		.name = "lz4"</div><div class='ctx'> 	},</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP_LZMA</div><div class='del'>-	[Z_EROFS_COMPRESSION_LZMA] = {</div><div class='del'>-		.config = z_erofs_load_lzma_config,</div><div class='del'>-		.decompress = z_erofs_lzma_decompress,</div><div class='del'>-		.name = "lzma"</div><div class='del'>-	},</div><div class='add'>+	[Z_EROFS_COMPRESSION_LZMA] = &amp;z_erofs_lzma_decomp,</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP_DEFLATE</div><div class='del'>-	[Z_EROFS_COMPRESSION_DEFLATE] = {</div><div class='del'>-		.config = z_erofs_load_deflate_config,</div><div class='del'>-		.decompress = z_erofs_deflate_decompress,</div><div class='del'>-		.name = "deflate"</div><div class='del'>-	},</div><div class='add'>+	[Z_EROFS_COMPRESSION_DEFLATE] = &amp;z_erofs_deflate_decomp,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP_ZSTD</div><div class='add'>+	[Z_EROFS_COMPRESSION_ZSTD] = &amp;z_erofs_zstd_decomp,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -419,10 +468,11 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	erofs_init_metabuf(&amp;buf, sb);</div><div class='add'>+	(void)erofs_init_metabuf(&amp;buf, sb, false);</div><div class='ctx'> 	offset = EROFS_SUPER_OFFSET + sbi-&gt;sb_size;</div><div class='ctx'> 	alg = 0;</div><div class='ctx'> 	for (algs = sbi-&gt;available_compr_algs; algs; algs &gt;&gt;= 1, ++alg) {</div><div class='add'>+		const struct z_erofs_decompressor *dec = z_erofs_decomp[alg];</div><div class='ctx'> 		void *data;</div><div class='ctx'> </div><div class='ctx'> 		if (!(algs &amp; 1))</div><div class='hunk'>@@ -434,16 +484,13 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (alg &gt;= ARRAY_SIZE(erofs_decompressors) ||</div><div class='del'>-		    !erofs_decompressors[alg].config) {</div><div class='add'>+		if (alg &lt; Z_EROFS_COMPRESSION_MAX &amp;&amp; dec &amp;&amp; dec-&gt;config) {</div><div class='add'>+			ret = dec-&gt;config(sb, dsb, data, size);</div><div class='add'>+		} else {</div><div class='ctx'> 			erofs_err(sb, "algorithm %d isn't enabled on this kernel",</div><div class='ctx'> 				  alg);</div><div class='ctx'> 			ret = -EOPNOTSUPP;</div><div class='del'>-		} else {</div><div class='del'>-			ret = erofs_decompressors[alg].config(sb,</div><div class='del'>-					dsb, data, size);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -451,3 +498,28 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)</div><div class='ctx'> 	erofs_put_metabuf(&amp;buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int __init z_erofs_init_decompressor(void)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; Z_EROFS_COMPRESSION_MAX; ++i) {</div><div class='add'>+		err = z_erofs_decomp[i] ? z_erofs_decomp[i]-&gt;init() : 0;</div><div class='add'>+		if (err) {</div><div class='add'>+			while (i--)</div><div class='add'>+				if (z_erofs_decomp[i])</div><div class='add'>+					z_erofs_decomp[i]-&gt;exit();</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void z_erofs_exit_decompressor(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; Z_EROFS_COMPRESSION_MAX; ++i)</div><div class='add'>+		if (z_erofs_decomp[i])</div><div class='add'>+			z_erofs_decomp[i]-&gt;exit();</div><div class='add'>+}</div><div class='head'>diff --git a/fs/erofs/decompressor_crypto.c b/fs/erofs/decompressor_crypto.c<br/>new file mode 100644<br/>index 000000000000..5ef6f71d3b7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor_crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/decompressor_crypto.c</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;crypto/acompress.h&gt;</div><div class='add'>+#include "compress.h"</div><div class='add'>+</div><div class='add'>+static int __z_erofs_crypto_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+				       struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	struct sg_table st_src, st_dst;</div><div class='add'>+	struct acomp_req *req;</div><div class='add'>+	struct crypto_wait wait;</div><div class='add'>+	const char *reason;</div><div class='add'>+	u8 *headpage;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	headpage = kmap_local_page(*rq-&gt;in);</div><div class='add'>+	reason = z_erofs_fixup_insize(rq, headpage + rq-&gt;pageofs_in,</div><div class='add'>+				min_t(unsigned int, rq-&gt;inputsize,</div><div class='add'>+				      rq-&gt;sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='add'>+	kunmap_local(headpage);</div><div class='add'>+	if (reason)</div><div class='add'>+		return IS_ERR(reason) ? PTR_ERR(reason) : -EFSCORRUPTED;</div><div class='add'>+</div><div class='add'>+	req = acomp_request_alloc(tfm);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = sg_alloc_table_from_pages_segment(&amp;st_src, rq-&gt;in, rq-&gt;inpages,</div><div class='add'>+			rq-&gt;pageofs_in, rq-&gt;inputsize, UINT_MAX, GFP_KERNEL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto failed_src_alloc;</div><div class='add'>+</div><div class='add'>+	ret = sg_alloc_table_from_pages_segment(&amp;st_dst, rq-&gt;out, rq-&gt;outpages,</div><div class='add'>+			rq-&gt;pageofs_out, rq-&gt;outputsize, UINT_MAX, GFP_KERNEL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto failed_dst_alloc;</div><div class='add'>+</div><div class='add'>+	acomp_request_set_params(req, st_src.sgl,</div><div class='add'>+				 st_dst.sgl, rq-&gt;inputsize, rq-&gt;outputsize);</div><div class='add'>+</div><div class='add'>+	crypto_init_wait(&amp;wait);</div><div class='add'>+	acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+				   crypto_req_done, &amp;wait);</div><div class='add'>+</div><div class='add'>+	ret = crypto_wait_req(crypto_acomp_decompress(req), &amp;wait);</div><div class='add'>+	if (ret) {</div><div class='add'>+		erofs_err(rq-&gt;sb, "failed to decompress %d in[%u, %u] out[%u]",</div><div class='add'>+			  ret, rq-&gt;inputsize, rq-&gt;pageofs_in, rq-&gt;outputsize);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg_free_table(&amp;st_dst);</div><div class='add'>+failed_dst_alloc:</div><div class='add'>+	sg_free_table(&amp;st_src);</div><div class='add'>+failed_src_alloc:</div><div class='add'>+	acomp_request_free(req);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct z_erofs_crypto_engine {</div><div class='add'>+	char *crypto_name;</div><div class='add'>+	struct crypto_acomp *tfm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct z_erofs_crypto_engine *z_erofs_crypto[Z_EROFS_COMPRESSION_MAX] = {</div><div class='add'>+	[Z_EROFS_COMPRESSION_LZ4] = (struct z_erofs_crypto_engine[]) {</div><div class='add'>+		{},</div><div class='add'>+	},</div><div class='add'>+	[Z_EROFS_COMPRESSION_LZMA] = (struct z_erofs_crypto_engine[]) {</div><div class='add'>+		{},</div><div class='add'>+	},</div><div class='add'>+	[Z_EROFS_COMPRESSION_DEFLATE] = (struct z_erofs_crypto_engine[]) {</div><div class='add'>+		{ .crypto_name = "qat_deflate", },</div><div class='add'>+		{},</div><div class='add'>+	},</div><div class='add'>+	[Z_EROFS_COMPRESSION_ZSTD] = (struct z_erofs_crypto_engine[]) {</div><div class='add'>+		{},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+static DECLARE_RWSEM(z_erofs_crypto_rwsem);</div><div class='add'>+</div><div class='add'>+static struct crypto_acomp *z_erofs_crypto_get_engine(int alg)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_crypto_engine *e;</div><div class='add'>+</div><div class='add'>+	for (e = z_erofs_crypto[alg]; e-&gt;crypto_name; ++e)</div><div class='add'>+		if (e-&gt;tfm)</div><div class='add'>+			return e-&gt;tfm;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int z_erofs_crypto_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+			      struct page **pgpl)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *tfm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+	tfm = z_erofs_crypto_get_engine(rq-&gt;alg);</div><div class='add'>+	if (!tfm) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rq-&gt;outpages; i++) {</div><div class='add'>+		struct page *const page = rq-&gt;out[i];</div><div class='add'>+		struct page *victim;</div><div class='add'>+</div><div class='add'>+		if (!page) {</div><div class='add'>+			victim = __erofs_allocpage(pgpl, rq-&gt;gfp, true);</div><div class='add'>+			if (!victim) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			set_page_private(victim, Z_EROFS_SHORTLIVED_PAGE);</div><div class='add'>+			rq-&gt;out[i] = victim;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = __z_erofs_crypto_decompress(rq, tfm);</div><div class='add'>+out:</div><div class='add'>+	up_read(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int z_erofs_crypto_enable_engine(const char *name, int len)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_crypto_engine *e;</div><div class='add'>+	struct crypto_acomp *tfm;</div><div class='add'>+	int alg;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+	for (alg = 0; alg &lt; Z_EROFS_COMPRESSION_MAX; ++alg) {</div><div class='add'>+		for (e = z_erofs_crypto[alg]; e-&gt;crypto_name; ++e) {</div><div class='add'>+			if (!strncmp(name, e-&gt;crypto_name, len)) {</div><div class='add'>+				if (e-&gt;tfm)</div><div class='add'>+					break;</div><div class='add'>+				tfm = crypto_alloc_acomp(e-&gt;crypto_name, 0, 0);</div><div class='add'>+				if (IS_ERR(tfm)) {</div><div class='add'>+					up_write(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+					return -EOPNOTSUPP;</div><div class='add'>+				}</div><div class='add'>+				e-&gt;tfm = tfm;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void z_erofs_crypto_disable_all_engines(void)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_crypto_engine *e;</div><div class='add'>+	int alg;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+	for (alg = 0; alg &lt; Z_EROFS_COMPRESSION_MAX; ++alg) {</div><div class='add'>+		for (e = z_erofs_crypto[alg]; e-&gt;crypto_name; ++e) {</div><div class='add'>+			if (!e-&gt;tfm)</div><div class='add'>+				continue;</div><div class='add'>+			crypto_free_acomp(e-&gt;tfm);</div><div class='add'>+			e-&gt;tfm = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;z_erofs_crypto_rwsem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int z_erofs_crypto_show_engines(char *buf, int size, char sep)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_crypto_engine *e;</div><div class='add'>+	int alg, len = 0;</div><div class='add'>+</div><div class='add'>+	for (alg = 0; alg &lt; Z_EROFS_COMPRESSION_MAX; ++alg) {</div><div class='add'>+		for (e = z_erofs_crypto[alg]; e-&gt;crypto_name; ++e) {</div><div class='add'>+			if (!e-&gt;tfm)</div><div class='add'>+				continue;</div><div class='add'>+			len += scnprintf(buf + len, size - len, "%s%c",</div><div class='add'>+					 e-&gt;crypto_name, sep);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/erofs/decompressor_deflate.c b/fs/erofs/decompressor_deflate.c<br/>index 4a64a9c91dd3..3fb73000ed27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor_deflate.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor_deflate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor_deflate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/decompressor_deflate.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@ static DECLARE_WAIT_QUEUE_HEAD(z_erofs_deflate_wq);</div><div class='ctx'> </div><div class='ctx'> module_param_named(deflate_streams, z_erofs_deflate_nstrms, uint, 0444);</div><div class='ctx'> </div><div class='del'>-void z_erofs_deflate_exit(void)</div><div class='add'>+static void z_erofs_deflate_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* there should be no running fs instance */</div><div class='ctx'> 	while (z_erofs_deflate_avail_strms) {</div><div class='hunk'>@@ -41,44 +41,20 @@ void z_erofs_deflate_exit(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init z_erofs_deflate_init(void)</div><div class='add'>+static int __init z_erofs_deflate_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* by default, use # of possible CPUs instead */</div><div class='ctx'> 	if (!z_erofs_deflate_nstrms)</div><div class='ctx'> 		z_erofs_deflate_nstrms = num_possible_cpus();</div><div class='del'>-</div><div class='del'>-	for (; z_erofs_deflate_avail_strms &lt; z_erofs_deflate_nstrms;</div><div class='del'>-	     ++z_erofs_deflate_avail_strms) {</div><div class='del'>-		struct z_erofs_deflate *strm;</div><div class='del'>-</div><div class='del'>-		strm = kzalloc(sizeof(*strm), GFP_KERNEL);</div><div class='del'>-		if (!strm)</div><div class='del'>-			goto out_failed;</div><div class='del'>-</div><div class='del'>-		/* XXX: in-kernel zlib cannot shrink windowbits currently */</div><div class='del'>-		strm-&gt;z.workspace = vmalloc(zlib_inflate_workspacesize());</div><div class='del'>-		if (!strm-&gt;z.workspace) {</div><div class='del'>-			kfree(strm);</div><div class='del'>-			goto out_failed;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;z_erofs_deflate_lock);</div><div class='del'>-		strm-&gt;next = z_erofs_deflate_head;</div><div class='del'>-		z_erofs_deflate_head = strm;</div><div class='del'>-		spin_unlock(&amp;z_erofs_deflate_lock);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out_failed:</div><div class='del'>-	erofs_err(NULL, "failed to allocate zlib workspace");</div><div class='del'>-	z_erofs_deflate_exit();</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int z_erofs_load_deflate_config(struct super_block *sb,</div><div class='add'>+static int z_erofs_load_deflate_config(struct super_block *sb,</div><div class='ctx'> 			struct erofs_super_block *dsb, void *data, int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_deflate_cfgs *dfl = data;</div><div class='add'>+	static DEFINE_MUTEX(deflate_resize_mutex);</div><div class='add'>+	static bool inited;</div><div class='ctx'> </div><div class='ctx'> 	if (!dfl || size &lt; sizeof(struct z_erofs_deflate_cfgs)) {</div><div class='ctx'> 		erofs_err(sb, "invalid deflate cfgs, size=%u", size);</div><div class='hunk'>@@ -89,33 +65,54 @@ int z_erofs_load_deflate_config(struct super_block *sb,</div><div class='ctx'> 		erofs_err(sb, "unsupported windowbits %u", dfl-&gt;windowbits);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='add'>+	mutex_lock(&amp;deflate_resize_mutex);</div><div class='add'>+	if (!inited) {</div><div class='add'>+		for (; z_erofs_deflate_avail_strms &lt; z_erofs_deflate_nstrms;</div><div class='add'>+		     ++z_erofs_deflate_avail_strms) {</div><div class='add'>+			struct z_erofs_deflate *strm;</div><div class='add'>+</div><div class='add'>+			strm = kzalloc(sizeof(*strm), GFP_KERNEL);</div><div class='add'>+			if (!strm)</div><div class='add'>+				goto failed;</div><div class='add'>+			/* XXX: in-kernel zlib cannot customize windowbits */</div><div class='add'>+			strm-&gt;z.workspace = vmalloc(zlib_inflate_workspacesize());</div><div class='add'>+			if (!strm-&gt;z.workspace) {</div><div class='add'>+				kfree(strm);</div><div class='add'>+				goto failed;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='add'>+			spin_lock(&amp;z_erofs_deflate_lock);</div><div class='add'>+			strm-&gt;next = z_erofs_deflate_head;</div><div class='add'>+			z_erofs_deflate_head = strm;</div><div class='add'>+			spin_unlock(&amp;z_erofs_deflate_lock);</div><div class='add'>+		}</div><div class='add'>+		inited = true;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;deflate_resize_mutex);</div><div class='ctx'> 	erofs_info(sb, "EXPERIMENTAL DEFLATE feature in use. Use at your own risk!");</div><div class='ctx'> 	return 0;</div><div class='add'>+failed:</div><div class='add'>+	mutex_unlock(&amp;deflate_resize_mutex);</div><div class='add'>+	z_erofs_deflate_exit();</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,</div><div class='del'>-			       struct page **pagepool)</div><div class='add'>+static const char *__z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+						struct page **pgpl)</div><div class='ctx'> {</div><div class='del'>-	const unsigned int nrpages_out =</div><div class='del'>-		PAGE_ALIGN(rq-&gt;pageofs_out + rq-&gt;outputsize) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	const unsigned int nrpages_in =</div><div class='del'>-		PAGE_ALIGN(rq-&gt;inputsize) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct super_block *sb = rq-&gt;sb;</div><div class='del'>-	unsigned int insz, outsz, pofs;</div><div class='add'>+	struct z_erofs_stream_dctx dctx = { .rq = rq, .no = -1, .ni = 0 };</div><div class='ctx'> 	struct z_erofs_deflate *strm;</div><div class='del'>-	u8 *kin, *kout = NULL;</div><div class='del'>-	bool bounced = false;</div><div class='del'>-	int no = -1, ni = 0, j = 0, zerr, err;</div><div class='add'>+	const char *reason;</div><div class='add'>+	int zerr;</div><div class='ctx'> </div><div class='ctx'> 	/* 1. get the exact DEFLATE compressed size */</div><div class='del'>-	kin = kmap_local_page(*rq-&gt;in);</div><div class='del'>-	err = z_erofs_fixup_insize(rq, kin + rq-&gt;pageofs_in,</div><div class='del'>-			min_t(unsigned int, rq-&gt;inputsize,</div><div class='del'>-			      sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='del'>-	if (err) {</div><div class='del'>-		kunmap_local(kin);</div><div class='del'>-		return err;</div><div class='add'>+	dctx.kin = kmap_local_page(*rq-&gt;in);</div><div class='add'>+	reason = z_erofs_fixup_insize(rq, dctx.kin + rq-&gt;pageofs_in,</div><div class='add'>+			min(rq-&gt;inputsize, sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='add'>+	if (reason) {</div><div class='add'>+		kunmap_local(dctx.kin);</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 2. get an available DEFLATE context */</div><div class='hunk'>@@ -131,117 +128,77 @@ again:</div><div class='ctx'> 	spin_unlock(&amp;z_erofs_deflate_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* 3. multi-call decompress */</div><div class='del'>-	insz = rq-&gt;inputsize;</div><div class='del'>-	outsz = rq-&gt;outputsize;</div><div class='ctx'> 	zerr = zlib_inflateInit2(&amp;strm-&gt;z, -MAX_WBITS);</div><div class='ctx'> 	if (zerr != Z_OK) {</div><div class='del'>-		err = -EIO;</div><div class='add'>+		reason = ERR_PTR(-EINVAL);</div><div class='ctx'> 		goto failed_zinit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pofs = rq-&gt;pageofs_out;</div><div class='del'>-	strm-&gt;z.avail_in = min_t(u32, insz, PAGE_SIZE - rq-&gt;pageofs_in);</div><div class='del'>-	insz -= strm-&gt;z.avail_in;</div><div class='del'>-	strm-&gt;z.next_in = kin + rq-&gt;pageofs_in;</div><div class='add'>+	rq-&gt;fillgaps = true;	/* DEFLATE doesn't support NULL output buffer */</div><div class='add'>+	strm-&gt;z.avail_in = min(rq-&gt;inputsize, PAGE_SIZE - rq-&gt;pageofs_in);</div><div class='add'>+	rq-&gt;inputsize -= strm-&gt;z.avail_in;</div><div class='add'>+	strm-&gt;z.next_in = dctx.kin + rq-&gt;pageofs_in;</div><div class='ctx'> 	strm-&gt;z.avail_out = 0;</div><div class='add'>+	dctx.bounce = strm-&gt;bounce;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (!strm-&gt;z.avail_out) {</div><div class='del'>-			if (++no &gt;= nrpages_out || !outsz) {</div><div class='del'>-				erofs_err(sb, "insufficient space for decompressed data");</div><div class='del'>-				err = -EFSCORRUPTED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (kout)</div><div class='del'>-				kunmap_local(kout);</div><div class='del'>-			strm-&gt;z.avail_out = min_t(u32, outsz, PAGE_SIZE - pofs);</div><div class='del'>-			outsz -= strm-&gt;z.avail_out;</div><div class='del'>-			if (!rq-&gt;out[no]) {</div><div class='del'>-				rq-&gt;out[no] = erofs_allocpage(pagepool,</div><div class='del'>-						GFP_KERNEL | __GFP_NOFAIL);</div><div class='del'>-				set_page_private(rq-&gt;out[no],</div><div class='del'>-						 Z_EROFS_SHORTLIVED_PAGE);</div><div class='del'>-			}</div><div class='del'>-			kout = kmap_local_page(rq-&gt;out[no]);</div><div class='del'>-			strm-&gt;z.next_out = kout + pofs;</div><div class='del'>-			pofs = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strm-&gt;z.avail_in &amp;&amp; insz) {</div><div class='del'>-			if (++ni &gt;= nrpages_in) {</div><div class='del'>-				erofs_err(sb, "invalid compressed data");</div><div class='del'>-				err = -EFSCORRUPTED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (kout) { /* unlike kmap(), take care of the orders */</div><div class='del'>-				j = strm-&gt;z.next_out - kout;</div><div class='del'>-				kunmap_local(kout);</div><div class='del'>-			}</div><div class='del'>-			kunmap_local(kin);</div><div class='del'>-			strm-&gt;z.avail_in = min_t(u32, insz, PAGE_SIZE);</div><div class='del'>-			insz -= strm-&gt;z.avail_in;</div><div class='del'>-			kin = kmap_local_page(rq-&gt;in[ni]);</div><div class='del'>-			strm-&gt;z.next_in = kin;</div><div class='del'>-			bounced = false;</div><div class='del'>-			if (kout) {</div><div class='del'>-				kout = kmap_local_page(rq-&gt;out[no]);</div><div class='del'>-				strm-&gt;z.next_out = kout + j;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Handle overlapping: Use bounced buffer if the compressed</div><div class='del'>-		 * data is under processing; Or use short-lived pages from the</div><div class='del'>-		 * on-stack pagepool where pages share among the same request</div><div class='del'>-		 * and not _all_ inplace I/O pages are needed to be doubled.</div><div class='del'>-		 */</div><div class='del'>-		if (!bounced &amp;&amp; rq-&gt;out[no] == rq-&gt;in[ni]) {</div><div class='del'>-			memcpy(strm-&gt;bounce, strm-&gt;z.next_in, strm-&gt;z.avail_in);</div><div class='del'>-			strm-&gt;z.next_in = strm-&gt;bounce;</div><div class='del'>-			bounced = true;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (j = ni + 1; j &lt; nrpages_in; ++j) {</div><div class='del'>-			struct page *tmppage;</div><div class='del'>-</div><div class='del'>-			if (rq-&gt;out[no] != rq-&gt;in[j])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			DBG_BUGON(erofs_page_is_managed(EROFS_SB(sb),</div><div class='del'>-							rq-&gt;in[j]));</div><div class='del'>-			tmppage = erofs_allocpage(pagepool,</div><div class='del'>-						  GFP_KERNEL | __GFP_NOFAIL);</div><div class='del'>-			set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);</div><div class='del'>-			copy_highpage(tmppage, rq-&gt;in[j]);</div><div class='del'>-			rq-&gt;in[j] = tmppage;</div><div class='del'>-		}</div><div class='add'>+		dctx.avail_out = strm-&gt;z.avail_out;</div><div class='add'>+		dctx.inbuf_sz = strm-&gt;z.avail_in;</div><div class='add'>+		reason = z_erofs_stream_switch_bufs(&amp;dctx,</div><div class='add'>+					(void **)&amp;strm-&gt;z.next_out,</div><div class='add'>+					(void **)&amp;strm-&gt;z.next_in, pgpl);</div><div class='add'>+		if (reason)</div><div class='add'>+			break;</div><div class='add'>+		strm-&gt;z.avail_out = dctx.avail_out;</div><div class='add'>+		strm-&gt;z.avail_in = dctx.inbuf_sz;</div><div class='ctx'> </div><div class='ctx'> 		zerr = zlib_inflate(&amp;strm-&gt;z, Z_SYNC_FLUSH);</div><div class='del'>-		if (zerr != Z_OK || !(outsz + strm-&gt;z.avail_out)) {</div><div class='add'>+		if (zerr != Z_OK || !(rq-&gt;outputsize + strm-&gt;z.avail_out)) {</div><div class='ctx'> 			if (zerr == Z_OK &amp;&amp; rq-&gt;partial_decoding)</div><div class='ctx'> 				break;</div><div class='del'>-			if (zerr == Z_STREAM_END &amp;&amp; !outsz)</div><div class='add'>+			if (zerr == Z_STREAM_END &amp;&amp; !rq-&gt;outputsize)</div><div class='ctx'> 				break;</div><div class='del'>-			erofs_err(sb, "failed to decompress %d in[%u] out[%u]",</div><div class='del'>-				  zerr, rq-&gt;inputsize, rq-&gt;outputsize);</div><div class='del'>-			err = -EFSCORRUPTED;</div><div class='add'>+			reason = (zerr == Z_DATA_ERROR ?</div><div class='add'>+				"corrupted compressed data" :</div><div class='add'>+				"unexpected end of stream");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (zlib_inflateEnd(&amp;strm-&gt;z) != Z_OK &amp;&amp; !err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (kout)</div><div class='del'>-		kunmap_local(kout);</div><div class='add'>+	if (zlib_inflateEnd(&amp;strm-&gt;z) != Z_OK &amp;&amp; !reason)</div><div class='add'>+		reason = ERR_PTR(-EIO);</div><div class='add'>+	if (dctx.kout)</div><div class='add'>+		kunmap_local(dctx.kout);</div><div class='ctx'> failed_zinit:</div><div class='del'>-	kunmap_local(kin);</div><div class='add'>+	kunmap_local(dctx.kin);</div><div class='ctx'> 	/* 4. push back DEFLATE stream context to the global list */</div><div class='ctx'> 	spin_lock(&amp;z_erofs_deflate_lock);</div><div class='ctx'> 	strm-&gt;next = z_erofs_deflate_head;</div><div class='ctx'> 	z_erofs_deflate_head = strm;</div><div class='ctx'> 	spin_unlock(&amp;z_erofs_deflate_lock);</div><div class='ctx'> 	wake_up(&amp;z_erofs_deflate_wq);</div><div class='del'>-	return err;</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static const char *z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+					      struct page **pgpl)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP_ACCEL</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!rq-&gt;partial_decoding) {</div><div class='add'>+		err = z_erofs_crypto_decompress(rq, pgpl);</div><div class='add'>+		if (err != -EOPNOTSUPP)</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return __z_erofs_deflate_decompress(rq, pgpl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct z_erofs_decompressor z_erofs_deflate_decomp = {</div><div class='add'>+	.config = z_erofs_load_deflate_config,</div><div class='add'>+	.decompress = z_erofs_deflate_decompress,</div><div class='add'>+	.init = z_erofs_deflate_init,</div><div class='add'>+	.exit = z_erofs_deflate_exit,</div><div class='add'>+	.name = "deflate",</div><div class='add'>+};</div><div class='head'>diff --git a/fs/erofs/decompressor_lzma.c b/fs/erofs/decompressor_lzma.c<br/>index 2dd14f99c1dc..b4ea6978faae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor_lzma.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/decompressor_lzma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor_lzma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/decompressor_lzma.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> struct z_erofs_lzma {</div><div class='ctx'> 	struct z_erofs_lzma *next;</div><div class='ctx'> 	struct xz_dec_microlzma *state;</div><div class='del'>-	struct xz_buf buf;</div><div class='ctx'> 	u8 bounce[PAGE_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -18,7 +17,7 @@ static DECLARE_WAIT_QUEUE_HEAD(z_erofs_lzma_wq);</div><div class='ctx'> </div><div class='ctx'> module_param_named(lzma_streams, z_erofs_lzma_nstrms, uint, 0444);</div><div class='ctx'> </div><div class='del'>-void z_erofs_lzma_exit(void)</div><div class='add'>+static void z_erofs_lzma_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* there should be no running fs instance */</div><div class='ctx'> 	while (z_erofs_lzma_avail_strms) {</div><div class='hunk'>@@ -46,7 +45,7 @@ void z_erofs_lzma_exit(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init z_erofs_lzma_init(void)</div><div class='add'>+static int __init z_erofs_lzma_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +69,7 @@ int __init z_erofs_lzma_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int z_erofs_load_lzma_config(struct super_block *sb,</div><div class='add'>+static int z_erofs_load_lzma_config(struct super_block *sb,</div><div class='ctx'> 			struct erofs_super_block *dsb, void *data, int size)</div><div class='ctx'> {</div><div class='ctx'> 	static DEFINE_MUTEX(lzma_resize_mutex);</div><div class='hunk'>@@ -147,27 +146,23 @@ again:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,</div><div class='del'>-			    struct page **pagepool)</div><div class='add'>+static const char *z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+					   struct page **pgpl)</div><div class='ctx'> {</div><div class='del'>-	const unsigned int nrpages_out =</div><div class='del'>-		PAGE_ALIGN(rq-&gt;pageofs_out + rq-&gt;outputsize) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	const unsigned int nrpages_in =</div><div class='del'>-		PAGE_ALIGN(rq-&gt;inputsize) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned int inlen, outlen, pageofs;</div><div class='add'>+	struct super_block *sb = rq-&gt;sb;</div><div class='add'>+	struct z_erofs_stream_dctx dctx = { .rq = rq, .no = -1, .ni = 0 };</div><div class='add'>+	struct xz_buf buf = {};</div><div class='ctx'> 	struct z_erofs_lzma *strm;</div><div class='del'>-	u8 *kin;</div><div class='del'>-	bool bounced = false;</div><div class='del'>-	int no, ni, j, err = 0;</div><div class='add'>+	enum xz_ret xz_err;</div><div class='add'>+	const char *reason;</div><div class='ctx'> </div><div class='ctx'> 	/* 1. get the exact LZMA compressed size */</div><div class='del'>-	kin = kmap(*rq-&gt;in);</div><div class='del'>-	err = z_erofs_fixup_insize(rq, kin + rq-&gt;pageofs_in,</div><div class='del'>-			min_t(unsigned int, rq-&gt;inputsize,</div><div class='del'>-			      rq-&gt;sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='del'>-	if (err) {</div><div class='del'>-		kunmap(*rq-&gt;in);</div><div class='del'>-		return err;</div><div class='add'>+	dctx.kin = kmap_local_page(*rq-&gt;in);</div><div class='add'>+	reason = z_erofs_fixup_insize(rq, dctx.kin + rq-&gt;pageofs_in,</div><div class='add'>+			min(rq-&gt;inputsize, sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='add'>+	if (reason) {</div><div class='add'>+		kunmap_local(dctx.kin);</div><div class='add'>+		return reason;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 2. get an available lzma context */</div><div class='hunk'>@@ -183,109 +178,58 @@ again:</div><div class='ctx'> 	spin_unlock(&amp;z_erofs_lzma_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* 3. multi-call decompress */</div><div class='del'>-	inlen = rq-&gt;inputsize;</div><div class='del'>-	outlen = rq-&gt;outputsize;</div><div class='del'>-	xz_dec_microlzma_reset(strm-&gt;state, inlen, outlen,</div><div class='add'>+	xz_dec_microlzma_reset(strm-&gt;state, rq-&gt;inputsize, rq-&gt;outputsize,</div><div class='ctx'> 			       !rq-&gt;partial_decoding);</div><div class='del'>-	pageofs = rq-&gt;pageofs_out;</div><div class='del'>-	strm-&gt;buf.in = kin + rq-&gt;pageofs_in;</div><div class='del'>-	strm-&gt;buf.in_pos = 0;</div><div class='del'>-	strm-&gt;buf.in_size = min_t(u32, inlen, PAGE_SIZE - rq-&gt;pageofs_in);</div><div class='del'>-	inlen -= strm-&gt;buf.in_size;</div><div class='del'>-	strm-&gt;buf.out = NULL;</div><div class='del'>-	strm-&gt;buf.out_pos = 0;</div><div class='del'>-	strm-&gt;buf.out_size = 0;</div><div class='del'>-</div><div class='del'>-	for (ni = 0, no = -1;;) {</div><div class='del'>-		enum xz_ret xz_err;</div><div class='del'>-</div><div class='del'>-		if (strm-&gt;buf.out_pos == strm-&gt;buf.out_size) {</div><div class='del'>-			if (strm-&gt;buf.out) {</div><div class='del'>-				kunmap(rq-&gt;out[no]);</div><div class='del'>-				strm-&gt;buf.out = NULL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (++no &gt;= nrpages_out || !outlen) {</div><div class='del'>-				erofs_err(rq-&gt;sb, "decompressed buf out of bound");</div><div class='del'>-				err = -EFSCORRUPTED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			strm-&gt;buf.out_pos = 0;</div><div class='del'>-			strm-&gt;buf.out_size = min_t(u32, outlen,</div><div class='del'>-						   PAGE_SIZE - pageofs);</div><div class='del'>-			outlen -= strm-&gt;buf.out_size;</div><div class='del'>-			if (!rq-&gt;out[no] &amp;&amp; rq-&gt;fillgaps) {	/* deduped */</div><div class='del'>-				rq-&gt;out[no] = erofs_allocpage(pagepool,</div><div class='del'>-						GFP_KERNEL | __GFP_NOFAIL);</div><div class='del'>-				set_page_private(rq-&gt;out[no],</div><div class='del'>-						 Z_EROFS_SHORTLIVED_PAGE);</div><div class='del'>-			}</div><div class='del'>-			if (rq-&gt;out[no])</div><div class='del'>-				strm-&gt;buf.out = kmap(rq-&gt;out[no]) + pageofs;</div><div class='del'>-			pageofs = 0;</div><div class='del'>-		} else if (strm-&gt;buf.in_pos == strm-&gt;buf.in_size) {</div><div class='del'>-			kunmap(rq-&gt;in[ni]);</div><div class='del'>-</div><div class='del'>-			if (++ni &gt;= nrpages_in || !inlen) {</div><div class='del'>-				erofs_err(rq-&gt;sb, "compressed buf out of bound");</div><div class='del'>-				err = -EFSCORRUPTED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			strm-&gt;buf.in_pos = 0;</div><div class='del'>-			strm-&gt;buf.in_size = min_t(u32, inlen, PAGE_SIZE);</div><div class='del'>-			inlen -= strm-&gt;buf.in_size;</div><div class='del'>-			kin = kmap(rq-&gt;in[ni]);</div><div class='del'>-			strm-&gt;buf.in = kin;</div><div class='del'>-			bounced = false;</div><div class='del'>-		}</div><div class='add'>+	buf.in_size = min(rq-&gt;inputsize, PAGE_SIZE - rq-&gt;pageofs_in);</div><div class='add'>+	rq-&gt;inputsize -= buf.in_size;</div><div class='add'>+	buf.in = dctx.kin + rq-&gt;pageofs_in;</div><div class='add'>+	dctx.bounce = strm-&gt;bounce;</div><div class='add'>+	do {</div><div class='add'>+		dctx.avail_out = buf.out_size - buf.out_pos;</div><div class='add'>+		dctx.inbuf_sz = buf.in_size;</div><div class='add'>+		dctx.inbuf_pos = buf.in_pos;</div><div class='add'>+		reason = z_erofs_stream_switch_bufs(&amp;dctx, (void **)&amp;buf.out,</div><div class='add'>+						    (void **)&amp;buf.in, pgpl);</div><div class='add'>+		if (reason)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Handle overlapping: Use bounced buffer if the compressed</div><div class='del'>-		 * data is under processing; Otherwise, Use short-lived pages</div><div class='del'>-		 * from the on-stack pagepool where pages share with the same</div><div class='del'>-		 * request.</div><div class='del'>-		 */</div><div class='del'>-		if (!bounced &amp;&amp; rq-&gt;out[no] == rq-&gt;in[ni]) {</div><div class='del'>-			memcpy(strm-&gt;bounce, strm-&gt;buf.in, strm-&gt;buf.in_size);</div><div class='del'>-			strm-&gt;buf.in = strm-&gt;bounce;</div><div class='del'>-			bounced = true;</div><div class='add'>+		if (buf.out_size == buf.out_pos) {</div><div class='add'>+			buf.out_size = dctx.avail_out;</div><div class='add'>+			buf.out_pos = 0;</div><div class='ctx'> 		}</div><div class='del'>-		for (j = ni + 1; j &lt; nrpages_in; ++j) {</div><div class='del'>-			struct page *tmppage;</div><div class='add'>+		buf.in_size = dctx.inbuf_sz;</div><div class='add'>+		buf.in_pos = dctx.inbuf_pos;</div><div class='ctx'> </div><div class='del'>-			if (rq-&gt;out[no] != rq-&gt;in[j])</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			DBG_BUGON(erofs_page_is_managed(EROFS_SB(rq-&gt;sb),</div><div class='del'>-							rq-&gt;in[j]));</div><div class='del'>-			tmppage = erofs_allocpage(pagepool,</div><div class='del'>-						  GFP_KERNEL | __GFP_NOFAIL);</div><div class='del'>-			set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);</div><div class='del'>-			copy_highpage(tmppage, rq-&gt;in[j]);</div><div class='del'>-			rq-&gt;in[j] = tmppage;</div><div class='del'>-		}</div><div class='del'>-		xz_err = xz_dec_microlzma_run(strm-&gt;state, &amp;strm-&gt;buf);</div><div class='del'>-		DBG_BUGON(strm-&gt;buf.out_pos &gt; strm-&gt;buf.out_size);</div><div class='del'>-		DBG_BUGON(strm-&gt;buf.in_pos &gt; strm-&gt;buf.in_size);</div><div class='add'>+		xz_err = xz_dec_microlzma_run(strm-&gt;state, &amp;buf);</div><div class='add'>+		DBG_BUGON(buf.out_pos &gt; buf.out_size);</div><div class='add'>+		DBG_BUGON(buf.in_pos &gt; buf.in_size);</div><div class='ctx'> </div><div class='ctx'> 		if (xz_err != XZ_OK) {</div><div class='del'>-			if (xz_err == XZ_STREAM_END &amp;&amp; !outlen)</div><div class='add'>+			if (xz_err == XZ_STREAM_END &amp;&amp; !rq-&gt;outputsize)</div><div class='ctx'> 				break;</div><div class='del'>-			erofs_err(rq-&gt;sb, "failed to decompress %d in[%u] out[%u]",</div><div class='del'>-				  xz_err, rq-&gt;inputsize, rq-&gt;outputsize);</div><div class='del'>-			err = -EFSCORRUPTED;</div><div class='add'>+			reason = (xz_err == XZ_DATA_ERROR ?</div><div class='add'>+				"corrupted compressed data" :</div><div class='add'>+				"unexpected end of stream");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	if (no &lt; nrpages_out &amp;&amp; strm-&gt;buf.out)</div><div class='del'>-		kunmap(rq-&gt;out[no]);</div><div class='del'>-	if (ni &lt; nrpages_in)</div><div class='del'>-		kunmap(rq-&gt;in[ni]);</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	if (dctx.kout)</div><div class='add'>+		kunmap_local(dctx.kout);</div><div class='add'>+	kunmap_local(dctx.kin);</div><div class='ctx'> 	/* 4. push back LZMA stream context to the global list */</div><div class='ctx'> 	spin_lock(&amp;z_erofs_lzma_lock);</div><div class='ctx'> 	strm-&gt;next = z_erofs_lzma_head;</div><div class='ctx'> 	z_erofs_lzma_head = strm;</div><div class='ctx'> 	spin_unlock(&amp;z_erofs_lzma_lock);</div><div class='ctx'> 	wake_up(&amp;z_erofs_lzma_wq);</div><div class='del'>-	return err;</div><div class='add'>+	return reason;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+const struct z_erofs_decompressor z_erofs_lzma_decomp = {</div><div class='add'>+	.config = z_erofs_load_lzma_config,</div><div class='add'>+	.decompress = z_erofs_lzma_decompress,</div><div class='add'>+	.init = z_erofs_lzma_init,</div><div class='add'>+	.exit = z_erofs_lzma_exit,</div><div class='add'>+	.name = "lzma"</div><div class='add'>+};</div><div class='head'>diff --git a/fs/erofs/decompressor_zstd.c b/fs/erofs/decompressor_zstd.c<br/>new file mode 100644<br/>index 000000000000..beae49165c69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/decompressor_zstd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/decompressor_zstd.c</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;linux/zstd.h&gt;</div><div class='add'>+#include "compress.h"</div><div class='add'>+</div><div class='add'>+struct z_erofs_zstd {</div><div class='add'>+	struct z_erofs_zstd *next;</div><div class='add'>+	u8 bounce[PAGE_SIZE];</div><div class='add'>+	void *wksp;</div><div class='add'>+	unsigned int wkspsz;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(z_erofs_zstd_lock);</div><div class='add'>+static unsigned int z_erofs_zstd_max_dictsize;</div><div class='add'>+static unsigned int z_erofs_zstd_nstrms, z_erofs_zstd_avail_strms;</div><div class='add'>+static struct z_erofs_zstd *z_erofs_zstd_head;</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(z_erofs_zstd_wq);</div><div class='add'>+</div><div class='add'>+module_param_named(zstd_streams, z_erofs_zstd_nstrms, uint, 0444);</div><div class='add'>+</div><div class='add'>+static struct z_erofs_zstd *z_erofs_isolate_strms(bool all)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_zstd *strm;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	spin_lock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	strm = z_erofs_zstd_head;</div><div class='add'>+	if (!strm) {</div><div class='add'>+		spin_unlock(&amp;z_erofs_zstd_lock);</div><div class='add'>+		wait_event(z_erofs_zstd_wq, READ_ONCE(z_erofs_zstd_head));</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	z_erofs_zstd_head = all ? NULL : strm-&gt;next;</div><div class='add'>+	spin_unlock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	return strm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void z_erofs_zstd_exit(void)</div><div class='add'>+{</div><div class='add'>+	while (z_erofs_zstd_avail_strms) {</div><div class='add'>+		struct z_erofs_zstd *strm, *n;</div><div class='add'>+</div><div class='add'>+		for (strm = z_erofs_isolate_strms(true); strm; strm = n) {</div><div class='add'>+			n = strm-&gt;next;</div><div class='add'>+</div><div class='add'>+			kvfree(strm-&gt;wksp);</div><div class='add'>+			kfree(strm);</div><div class='add'>+			--z_erofs_zstd_avail_strms;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init z_erofs_zstd_init(void)</div><div class='add'>+{</div><div class='add'>+	/* by default, use # of possible CPUs instead */</div><div class='add'>+	if (!z_erofs_zstd_nstrms)</div><div class='add'>+		z_erofs_zstd_nstrms = num_possible_cpus();</div><div class='add'>+</div><div class='add'>+	for (; z_erofs_zstd_avail_strms &lt; z_erofs_zstd_nstrms;</div><div class='add'>+	     ++z_erofs_zstd_avail_strms) {</div><div class='add'>+		struct z_erofs_zstd *strm;</div><div class='add'>+</div><div class='add'>+		strm = kzalloc(sizeof(*strm), GFP_KERNEL);</div><div class='add'>+		if (!strm) {</div><div class='add'>+			z_erofs_zstd_exit();</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		spin_lock(&amp;z_erofs_zstd_lock);</div><div class='add'>+		strm-&gt;next = z_erofs_zstd_head;</div><div class='add'>+		z_erofs_zstd_head = strm;</div><div class='add'>+		spin_unlock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int z_erofs_load_zstd_config(struct super_block *sb,</div><div class='add'>+			struct erofs_super_block *dsb, void *data, int size)</div><div class='add'>+{</div><div class='add'>+	static DEFINE_MUTEX(zstd_resize_mutex);</div><div class='add'>+	struct z_erofs_zstd_cfgs *zstd = data;</div><div class='add'>+	unsigned int dict_size, wkspsz;</div><div class='add'>+	struct z_erofs_zstd *strm, *head = NULL;</div><div class='add'>+	void *wksp;</div><div class='add'>+</div><div class='add'>+	if (!zstd || size &lt; sizeof(struct z_erofs_zstd_cfgs) || zstd-&gt;format) {</div><div class='add'>+		erofs_err(sb, "unsupported zstd format, size=%u", size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (zstd-&gt;windowlog &gt; ilog2(Z_EROFS_ZSTD_MAX_DICT_SIZE) - 10) {</div><div class='add'>+		erofs_err(sb, "unsupported zstd window log %u", zstd-&gt;windowlog);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dict_size = 1U &lt;&lt; (zstd-&gt;windowlog + 10);</div><div class='add'>+</div><div class='add'>+	/* in case 2 z_erofs_load_zstd_config() race to avoid deadlock */</div><div class='add'>+	mutex_lock(&amp;zstd_resize_mutex);</div><div class='add'>+	if (z_erofs_zstd_max_dictsize &gt;= dict_size) {</div><div class='add'>+		mutex_unlock(&amp;zstd_resize_mutex);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 1. collect/isolate all streams for the following check */</div><div class='add'>+	while (z_erofs_zstd_avail_strms) {</div><div class='add'>+		struct z_erofs_zstd *n;</div><div class='add'>+</div><div class='add'>+		for (strm = z_erofs_isolate_strms(true); strm; strm = n) {</div><div class='add'>+			n = strm-&gt;next;</div><div class='add'>+			strm-&gt;next = head;</div><div class='add'>+			head = strm;</div><div class='add'>+			--z_erofs_zstd_avail_strms;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 2. walk each isolated stream and grow max dict_size if needed */</div><div class='add'>+	wkspsz = zstd_dstream_workspace_bound(dict_size);</div><div class='add'>+	for (strm = head; strm; strm = strm-&gt;next) {</div><div class='add'>+		wksp = kvmalloc(wkspsz, GFP_KERNEL);</div><div class='add'>+		if (!wksp)</div><div class='add'>+			break;</div><div class='add'>+		kvfree(strm-&gt;wksp);</div><div class='add'>+		strm-&gt;wksp = wksp;</div><div class='add'>+		strm-&gt;wkspsz = wkspsz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 3. push back all to the global list and update max dict_size */</div><div class='add'>+	spin_lock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	DBG_BUGON(z_erofs_zstd_head);</div><div class='add'>+	z_erofs_zstd_head = head;</div><div class='add'>+	spin_unlock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	z_erofs_zstd_avail_strms = z_erofs_zstd_nstrms;</div><div class='add'>+	wake_up_all(&amp;z_erofs_zstd_wq);</div><div class='add'>+	if (!strm)</div><div class='add'>+		z_erofs_zstd_max_dictsize = dict_size;</div><div class='add'>+	mutex_unlock(&amp;zstd_resize_mutex);</div><div class='add'>+	return strm ? -ENOMEM : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *z_erofs_zstd_decompress(struct z_erofs_decompress_req *rq,</div><div class='add'>+					   struct page **pgpl)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = rq-&gt;sb;</div><div class='add'>+	struct z_erofs_stream_dctx dctx = { .rq = rq, .no = -1, .ni = 0 };</div><div class='add'>+	zstd_in_buffer in_buf = { NULL, 0, 0 };</div><div class='add'>+	zstd_out_buffer out_buf = { NULL, 0, 0 };</div><div class='add'>+	struct z_erofs_zstd *strm;</div><div class='add'>+	zstd_dstream *stream;</div><div class='add'>+	const char *reason;</div><div class='add'>+	int zerr;</div><div class='add'>+</div><div class='add'>+	/* 1. get the exact compressed size */</div><div class='add'>+	dctx.kin = kmap_local_page(*rq-&gt;in);</div><div class='add'>+	reason = z_erofs_fixup_insize(rq, dctx.kin + rq-&gt;pageofs_in,</div><div class='add'>+			min(rq-&gt;inputsize, sb-&gt;s_blocksize - rq-&gt;pageofs_in));</div><div class='add'>+	if (reason) {</div><div class='add'>+		kunmap_local(dctx.kin);</div><div class='add'>+		return reason;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 2. get an available ZSTD context */</div><div class='add'>+	strm = z_erofs_isolate_strms(false);</div><div class='add'>+</div><div class='add'>+	/* 3. multi-call decompress */</div><div class='add'>+	stream = zstd_init_dstream(z_erofs_zstd_max_dictsize, strm-&gt;wksp, strm-&gt;wkspsz);</div><div class='add'>+	if (!stream) {</div><div class='add'>+		reason = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto failed_zinit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rq-&gt;fillgaps = true;	/* ZSTD doesn't support NULL output buffer */</div><div class='add'>+	in_buf.size = min_t(u32, rq-&gt;inputsize, PAGE_SIZE - rq-&gt;pageofs_in);</div><div class='add'>+	rq-&gt;inputsize -= in_buf.size;</div><div class='add'>+	in_buf.src = dctx.kin + rq-&gt;pageofs_in;</div><div class='add'>+	dctx.bounce = strm-&gt;bounce;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		dctx.inbuf_sz = in_buf.size;</div><div class='add'>+		dctx.inbuf_pos = in_buf.pos;</div><div class='add'>+		reason = z_erofs_stream_switch_bufs(&amp;dctx, &amp;out_buf.dst,</div><div class='add'>+						 (void **)&amp;in_buf.src, pgpl);</div><div class='add'>+		if (reason)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (out_buf.size == out_buf.pos) {</div><div class='add'>+			out_buf.size = dctx.avail_out;</div><div class='add'>+			out_buf.pos = 0;</div><div class='add'>+		}</div><div class='add'>+		in_buf.size = dctx.inbuf_sz;</div><div class='add'>+		in_buf.pos = dctx.inbuf_pos;</div><div class='add'>+</div><div class='add'>+		zerr = zstd_decompress_stream(stream, &amp;out_buf, &amp;in_buf);</div><div class='add'>+		dctx.avail_out = out_buf.size - out_buf.pos;</div><div class='add'>+		if (zstd_is_error(zerr) ||</div><div class='add'>+		    ((rq-&gt;outputsize + dctx.avail_out) &amp;&amp; (!zerr || (zerr &gt; 0 &amp;&amp;</div><div class='add'>+				!(rq-&gt;inputsize + in_buf.size - in_buf.pos))))) {</div><div class='add'>+			reason = zstd_is_error(zerr) ? zstd_get_error_name(zerr) :</div><div class='add'>+					"unexpected end of stream";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (rq-&gt;outputsize + dctx.avail_out);</div><div class='add'>+</div><div class='add'>+	if (dctx.kout)</div><div class='add'>+		kunmap_local(dctx.kout);</div><div class='add'>+failed_zinit:</div><div class='add'>+	kunmap_local(dctx.kin);</div><div class='add'>+	/* 4. push back ZSTD stream context to the global list */</div><div class='add'>+	spin_lock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	strm-&gt;next = z_erofs_zstd_head;</div><div class='add'>+	z_erofs_zstd_head = strm;</div><div class='add'>+	spin_unlock(&amp;z_erofs_zstd_lock);</div><div class='add'>+	wake_up(&amp;z_erofs_zstd_wq);</div><div class='add'>+	return reason;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct z_erofs_decompressor z_erofs_zstd_decomp = {</div><div class='add'>+	.config = z_erofs_load_zstd_config,</div><div class='add'>+	.decompress = z_erofs_zstd_decompress,</div><div class='add'>+	.init = z_erofs_zstd_init,</div><div class='add'>+	.exit = z_erofs_zstd_exit,</div><div class='add'>+	.name = "zstd",</div><div class='add'>+};</div><div class='head'>diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c<br/>index b80abec0531a..32b4f5aa60c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/dir.c</a></div><div class='hunk'>@@ -8,19 +8,15 @@</div><div class='ctx'> </div><div class='ctx'> static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx,</div><div class='ctx'> 			       void *dentry_blk, struct erofs_dirent *de,</div><div class='del'>-			       unsigned int nameoff, unsigned int maxsize)</div><div class='add'>+			       unsigned int nameoff0, unsigned int maxsize)</div><div class='ctx'> {</div><div class='del'>-	const struct erofs_dirent *end = dentry_blk + nameoff;</div><div class='add'>+	const struct erofs_dirent *end = dentry_blk + nameoff0;</div><div class='ctx'> </div><div class='ctx'> 	while (de &lt; end) {</div><div class='del'>-		const char *de_name;</div><div class='add'>+		unsigned char d_type = fs_ftype_to_dtype(de-&gt;file_type);</div><div class='add'>+		unsigned int nameoff = le16_to_cpu(de-&gt;nameoff);</div><div class='add'>+		const char *de_name = (char *)dentry_blk + nameoff;</div><div class='ctx'> 		unsigned int de_namelen;</div><div class='del'>-		unsigned char d_type;</div><div class='del'>-</div><div class='del'>-		d_type = fs_ftype_to_dtype(de-&gt;file_type);</div><div class='del'>-</div><div class='del'>-		nameoff = le16_to_cpu(de-&gt;nameoff);</div><div class='del'>-		de_name = (char *)dentry_blk + nameoff;</div><div class='ctx'> </div><div class='ctx'> 		/* the last dirent in the block? */</div><div class='ctx'> 		if (de + 1 &gt;= end)</div><div class='hunk'>@@ -38,7 +34,8 @@ static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!dir_emit(ctx, de_name, de_namelen,</div><div class='del'>-			      le64_to_cpu(de-&gt;nid), d_type))</div><div class='add'>+			      erofs_nid_to_ino64(EROFS_SB(dir-&gt;i_sb),</div><div class='add'>+						 le64_to_cpu(de-&gt;nid)), d_type))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		++de;</div><div class='ctx'> 		ctx-&gt;pos += sizeof(struct erofs_dirent);</div><div class='hunk'>@@ -51,22 +48,40 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)</div><div class='ctx'> 	struct inode *dir = file_inode(f);</div><div class='ctx'> 	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='add'>+	struct file_ra_state *ra = &amp;f-&gt;f_ra;</div><div class='ctx'> 	unsigned long bsz = sb-&gt;s_blocksize;</div><div class='del'>-	const size_t dirsize = i_size_read(dir);</div><div class='del'>-	unsigned int i = erofs_blknr(sb, ctx-&gt;pos);</div><div class='ctx'> 	unsigned int ofs = erofs_blkoff(sb, ctx-&gt;pos);</div><div class='add'>+	pgoff_t ra_pages = DIV_ROUND_UP_POW2(</div><div class='add'>+			EROFS_I_SB(dir)-&gt;dir_ra_bytes, PAGE_SIZE);</div><div class='add'>+	pgoff_t nr_pages = DIV_ROUND_UP_POW2(dir-&gt;i_size, PAGE_SIZE);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	bool initial = true;</div><div class='ctx'> </div><div class='del'>-	buf.inode = dir;</div><div class='del'>-	while (ctx-&gt;pos &lt; dirsize) {</div><div class='add'>+	buf.mapping = dir-&gt;i_mapping;</div><div class='add'>+	while (ctx-&gt;pos &lt; dir-&gt;i_size) {</div><div class='add'>+		erofs_off_t dbstart = ctx-&gt;pos - ofs;</div><div class='ctx'> 		struct erofs_dirent *de;</div><div class='ctx'> 		unsigned int nameoff, maxsize;</div><div class='ctx'> </div><div class='del'>-		de = erofs_bread(&amp;buf, i, EROFS_KMAP);</div><div class='add'>+		if (fatal_signal_pending(current)) {</div><div class='add'>+			err = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* readahead blocks to enhance performance for large directories */</div><div class='add'>+		if (ra_pages) {</div><div class='add'>+			pgoff_t idx = DIV_ROUND_UP_POW2(ctx-&gt;pos, PAGE_SIZE);</div><div class='add'>+			pgoff_t pages = min(nr_pages - idx, ra_pages);</div><div class='add'>+</div><div class='add'>+			if (pages &gt; 1 &amp;&amp; !ra_has_index(ra, idx))</div><div class='add'>+				page_cache_sync_readahead(dir-&gt;i_mapping, ra,</div><div class='add'>+							  f, idx, pages);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		de = erofs_bread(&amp;buf, dbstart, true);</div><div class='ctx'> 		if (IS_ERR(de)) {</div><div class='del'>-			erofs_err(sb, "fail to readdir of logical block %u of nid %llu",</div><div class='del'>-				  i, EROFS_I(dir)-&gt;nid);</div><div class='add'>+			erofs_err(sb, "failed to readdir of logical block %llu of nid %llu",</div><div class='add'>+				  erofs_blknr(sb, dbstart), EROFS_I(dir)-&gt;nid);</div><div class='ctx'> 			err = PTR_ERR(de);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -79,28 +94,28 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		maxsize = min_t(unsigned int, dirsize - ctx-&gt;pos + ofs, bsz);</div><div class='del'>-</div><div class='add'>+		maxsize = min_t(unsigned int, dir-&gt;i_size - dbstart, bsz);</div><div class='ctx'> 		/* search dirents at the arbitrary position */</div><div class='ctx'> 		if (initial) {</div><div class='ctx'> 			initial = false;</div><div class='del'>-</div><div class='ctx'> 			ofs = roundup(ofs, sizeof(struct erofs_dirent));</div><div class='del'>-			ctx-&gt;pos = erofs_pos(sb, i) + ofs;</div><div class='del'>-			if (ofs &gt;= nameoff)</div><div class='del'>-				goto skip_this;</div><div class='add'>+			ctx-&gt;pos = dbstart + ofs;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = erofs_fill_dentries(dir, ctx, de, (void *)de + ofs,</div><div class='ctx'> 					  nameoff, maxsize);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-skip_this:</div><div class='del'>-		ctx-&gt;pos = erofs_pos(sb, i) + maxsize;</div><div class='del'>-		++i;</div><div class='add'>+		ctx-&gt;pos = dbstart + maxsize;</div><div class='ctx'> 		ofs = 0;</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> 	erofs_put_metabuf(&amp;buf);</div><div class='add'>+	if (EROFS_I(dir)-&gt;dot_omitted &amp;&amp; ctx-&gt;pos == dir-&gt;i_size) {</div><div class='add'>+		if (!dir_emit_dot(f, ctx))</div><div class='add'>+			return 0;</div><div class='add'>+		++ctx-&gt;pos;</div><div class='add'>+	}</div><div class='ctx'> 	return err &lt; 0 ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -108,4 +123,8 @@ const struct file_operations erofs_dir_fops = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='ctx'> 	.iterate_shared	= erofs_readdir,</div><div class='add'>+	.unlocked_ioctl = erofs_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl   = erofs_compat_ioctl,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/erofs/erofs_fs.h b/fs/erofs/erofs_fs.h<br/>index a03ec70ba6f2..e24268acdd62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/erofs_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/erofs_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/erofs_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/erofs_fs.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only OR Apache-2.0 */</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='ctx'> /*</div><div class='ctx'>  * EROFS (Enhanced ROM File System) on-disk format definition</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,11 +9,15 @@</div><div class='ctx'> #ifndef __EROFS_FS_H</div><div class='ctx'> #define __EROFS_FS_H</div><div class='ctx'> </div><div class='add'>+/* to allow for x86 boot sectors and other oddities. */</div><div class='ctx'> #define EROFS_SUPER_OFFSET      1024</div><div class='ctx'> </div><div class='del'>-#define EROFS_FEATURE_COMPAT_SB_CHKSUM          0x00000001</div><div class='del'>-#define EROFS_FEATURE_COMPAT_MTIME              0x00000002</div><div class='del'>-#define EROFS_FEATURE_COMPAT_XATTR_FILTER	0x00000004</div><div class='add'>+#define EROFS_FEATURE_COMPAT_SB_CHKSUM			0x00000001</div><div class='add'>+#define EROFS_FEATURE_COMPAT_MTIME			0x00000002</div><div class='add'>+#define EROFS_FEATURE_COMPAT_XATTR_FILTER		0x00000004</div><div class='add'>+#define EROFS_FEATURE_COMPAT_SHARED_EA_IN_METABOX	0x00000008</div><div class='add'>+#define EROFS_FEATURE_COMPAT_PLAIN_XATTR_PFX		0x00000010</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Any bits that aren't in EROFS_ALL_FEATURE_INCOMPAT should</div><div class='hunk'>@@ -29,42 +33,38 @@</div><div class='ctx'> #define EROFS_FEATURE_INCOMPAT_FRAGMENTS	0x00000020</div><div class='ctx'> #define EROFS_FEATURE_INCOMPAT_DEDUPE		0x00000020</div><div class='ctx'> #define EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES	0x00000040</div><div class='add'>+#define EROFS_FEATURE_INCOMPAT_48BIT		0x00000080</div><div class='add'>+#define EROFS_FEATURE_INCOMPAT_METABOX		0x00000100</div><div class='ctx'> #define EROFS_ALL_FEATURE_INCOMPAT		\</div><div class='del'>-	(EROFS_FEATURE_INCOMPAT_ZERO_PADDING | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_COMPR_CFGS | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_BIG_PCLUSTER | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_CHUNKED_FILE | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_DEVICE_TABLE | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_COMPR_HEAD2 | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_ZTAILPACKING | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_FRAGMENTS | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_DEDUPE | \</div><div class='del'>-	 EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES)</div><div class='add'>+	((EROFS_FEATURE_INCOMPAT_METABOX &lt;&lt; 1) - 1)</div><div class='ctx'> </div><div class='ctx'> #define EROFS_SB_EXTSLOT_SIZE	16</div><div class='ctx'> </div><div class='ctx'> struct erofs_deviceslot {</div><div class='ctx'> 	u8 tag[64];		/* digest(sha256), etc. */</div><div class='del'>-	__le32 blocks;		/* total fs blocks of this device */</div><div class='del'>-	__le32 mapped_blkaddr;	/* map starting at mapped_blkaddr */</div><div class='del'>-	u8 reserved[56];</div><div class='add'>+	__le32 blocks_lo;	/* total blocks count of this device */</div><div class='add'>+	__le32 uniaddr_lo;	/* unified starting block of this device */</div><div class='add'>+	__le32 blocks_hi;	/* total blocks count MSB */</div><div class='add'>+	__le16 uniaddr_hi;	/* unified starting block MSB */</div><div class='add'>+	u8 reserved[50];</div><div class='ctx'> };</div><div class='ctx'> #define EROFS_DEVT_SLOT_SIZE	sizeof(struct erofs_deviceslot)</div><div class='ctx'> </div><div class='del'>-/* erofs on-disk super block (currently 128 bytes) */</div><div class='add'>+/* erofs on-disk super block (currently 144 bytes at maximum) */</div><div class='ctx'> struct erofs_super_block {</div><div class='ctx'> 	__le32 magic;           /* file system magic number */</div><div class='del'>-	__le32 checksum;        /* crc32c(super_block) */</div><div class='add'>+	__le32 checksum;        /* crc32c to avoid unexpected on-disk overlap */</div><div class='ctx'> 	__le32 feature_compat;</div><div class='ctx'> 	__u8 blkszbits;         /* filesystem block size in bit shift */</div><div class='ctx'> 	__u8 sb_extslots;	/* superblock size = 128 + sb_extslots * 16 */</div><div class='del'>-</div><div class='del'>-	__le16 root_nid;	/* nid of root directory */</div><div class='add'>+	union {</div><div class='add'>+		__le16 rootnid_2b;	/* nid of root directory */</div><div class='add'>+		__le16 blocks_hi;	/* (48BIT on) blocks count MSB */</div><div class='add'>+	} __packed rb;</div><div class='ctx'> 	__le64 inos;            /* total valid ino # (== f_files - f_favail) */</div><div class='del'>-</div><div class='del'>-	__le64 build_time;      /* compact inode time derivation */</div><div class='del'>-	__le32 build_time_nsec;	/* compact inode time derivation in ns scale */</div><div class='del'>-	__le32 blocks;          /* used for statfs */</div><div class='add'>+	__le64 epoch;		/* base seconds used for compact inodes */</div><div class='add'>+	__le32 fixed_nsec;	/* fixed nanoseconds for compact inodes */</div><div class='add'>+	__le32 blocks_lo;	/* blocks count LSB */</div><div class='ctx'> 	__le32 meta_blkaddr;	/* start block address of metadata area */</div><div class='ctx'> 	__le32 xattr_blkaddr;	/* start block address of shared xattr area */</div><div class='ctx'> 	__u8 uuid[16];          /* 128-bit uuid for volume */</div><div class='hunk'>@@ -83,7 +83,12 @@ struct erofs_super_block {</div><div class='ctx'> 	__le32 xattr_prefix_start;	/* start of long xattr prefixes */</div><div class='ctx'> 	__le64 packed_nid;	/* nid of the special packed inode */</div><div class='ctx'> 	__u8 xattr_filter_reserved; /* reserved for xattr name filter */</div><div class='del'>-	__u8 reserved2[23];</div><div class='add'>+	__u8 reserved[3];</div><div class='add'>+	__le32 build_time;	/* seconds added to epoch for mkfs time */</div><div class='add'>+	__le64 rootnid_8b;	/* (48BIT on) nid of root directory */</div><div class='add'>+	__le64 reserved2;</div><div class='add'>+	__le64 metabox_nid;     /* (METABOX on) nid of the metabox inode */</div><div class='add'>+	__le64 reserved3;	/* [align to extslot 1] */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -114,19 +119,19 @@ static inline bool erofs_inode_is_data_compressed(unsigned int datamode)</div><div class='ctx'> #define EROFS_I_VERSION_MASK            0x01</div><div class='ctx'> #define EROFS_I_DATALAYOUT_MASK         0x07</div><div class='ctx'> </div><div class='del'>-#define EROFS_I_VERSION_BIT             0</div><div class='del'>-#define EROFS_I_DATALAYOUT_BIT          1</div><div class='del'>-#define EROFS_I_ALL_BIT			4</div><div class='del'>-</div><div class='del'>-#define EROFS_I_ALL	((1 &lt;&lt; EROFS_I_ALL_BIT) - 1)</div><div class='add'>+#define EROFS_I_VERSION_BIT	0</div><div class='add'>+#define EROFS_I_DATALAYOUT_BIT	1</div><div class='add'>+#define EROFS_I_NLINK_1_BIT	4	/* non-directory compact inodes only */</div><div class='add'>+#define EROFS_I_DOT_OMITTED_BIT	4	/* (directories) omit the `.` dirent */</div><div class='add'>+#define EROFS_I_ALL		((1 &lt;&lt; (EROFS_I_NLINK_1_BIT + 1)) - 1)</div><div class='ctx'> </div><div class='ctx'> /* indicate chunk blkbits, thus 'chunksize = blocksize &lt;&lt; chunk blkbits' */</div><div class='ctx'> #define EROFS_CHUNK_FORMAT_BLKBITS_MASK		0x001F</div><div class='del'>-/* with chunk indexes or just a 4-byte blkaddr array */</div><div class='add'>+/* with chunk indexes or just a 4-byte block array */</div><div class='ctx'> #define EROFS_CHUNK_FORMAT_INDEXES		0x0020</div><div class='add'>+#define EROFS_CHUNK_FORMAT_48BIT		0x0040</div><div class='ctx'> </div><div class='del'>-#define EROFS_CHUNK_FORMAT_ALL	\</div><div class='del'>-	(EROFS_CHUNK_FORMAT_BLKBITS_MASK | EROFS_CHUNK_FORMAT_INDEXES)</div><div class='add'>+#define EROFS_CHUNK_FORMAT_ALL	((EROFS_CHUNK_FORMAT_48BIT &lt;&lt; 1) - 1)</div><div class='ctx'> </div><div class='ctx'> /* 32-byte on-disk inode */</div><div class='ctx'> #define EROFS_INODE_LAYOUT_COMPACT	0</div><div class='hunk'>@@ -139,45 +144,40 @@ struct erofs_inode_chunk_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union erofs_inode_i_u {</div><div class='del'>-	/* total compressed blocks for compressed inodes */</div><div class='del'>-	__le32 compressed_blocks;</div><div class='del'>-</div><div class='del'>-	/* block address for uncompressed flat inodes */</div><div class='del'>-	__le32 raw_blkaddr;</div><div class='del'>-</div><div class='del'>-	/* for device files, used to indicate old/new device # */</div><div class='del'>-	__le32 rdev;</div><div class='del'>-</div><div class='del'>-	/* for chunk-based files, it contains the summary info */</div><div class='add'>+	__le32 blocks_lo;	/* total blocks count (if compressed inodes) */</div><div class='add'>+	__le32 startblk_lo;	/* starting block number (if flat inodes) */</div><div class='add'>+	__le32 rdev;		/* device ID (if special inodes) */</div><div class='ctx'> 	struct erofs_inode_chunk_info c;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+union erofs_inode_i_nb {</div><div class='add'>+	__le16 nlink;		/* if EROFS_I_NLINK_1_BIT is unset */</div><div class='add'>+	__le16 blocks_hi;	/* total blocks count MSB */</div><div class='add'>+	__le16 startblk_hi;	/* starting block number MSB */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* 32-byte reduced form of an ondisk inode */</div><div class='ctx'> struct erofs_inode_compact {</div><div class='ctx'> 	__le16 i_format;	/* inode format hints */</div><div class='del'>-</div><div class='del'>-/* 1 header + n-1 * 4 bytes inline xattr to keep continuity */</div><div class='ctx'> 	__le16 i_xattr_icount;</div><div class='ctx'> 	__le16 i_mode;</div><div class='del'>-	__le16 i_nlink;</div><div class='add'>+	union erofs_inode_i_nb i_nb;</div><div class='ctx'> 	__le32 i_size;</div><div class='del'>-	__le32 i_reserved;</div><div class='add'>+	__le32 i_mtime;</div><div class='ctx'> 	union erofs_inode_i_u i_u;</div><div class='ctx'> </div><div class='ctx'> 	__le32 i_ino;		/* only used for 32-bit stat compatibility */</div><div class='ctx'> 	__le16 i_uid;</div><div class='ctx'> 	__le16 i_gid;</div><div class='del'>-	__le32 i_reserved2;</div><div class='add'>+	__le32 i_reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 64-byte complete form of an ondisk inode */</div><div class='ctx'> struct erofs_inode_extended {</div><div class='ctx'> 	__le16 i_format;	/* inode format hints */</div><div class='del'>-</div><div class='del'>-/* 1 header + n-1 * 4 bytes inline xattr to keep continuity */</div><div class='ctx'> 	__le16 i_xattr_icount;</div><div class='ctx'> 	__le16 i_mode;</div><div class='del'>-	__le16 i_reserved;</div><div class='add'>+	union erofs_inode_i_nb i_nb;</div><div class='ctx'> 	__le64 i_size;</div><div class='ctx'> 	union erofs_inode_i_u i_u;</div><div class='ctx'> </div><div class='hunk'>@@ -247,6 +247,7 @@ static inline unsigned int erofs_xattr_ibody_size(__le16 i_xattr_icount)</div><div class='ctx'> 	if (!i_xattr_icount)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* 1 header + n-1 * 4 bytes inline xattr to keep continuity */</div><div class='ctx'> 	return sizeof(struct erofs_xattr_ibody_header) +</div><div class='ctx'> 		sizeof(__u32) * (le16_to_cpu(i_xattr_icount) - 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -265,13 +266,16 @@ static inline unsigned int erofs_xattr_entry_size(struct erofs_xattr_entry *e)</div><div class='ctx'> /* 4-byte block address array */</div><div class='ctx'> #define EROFS_BLOCK_MAP_ENTRY_SIZE	sizeof(__le32)</div><div class='ctx'> </div><div class='del'>-/* 8-byte inode chunk indexes */</div><div class='add'>+/* 8-byte inode chunk index */</div><div class='ctx'> struct erofs_inode_chunk_index {</div><div class='del'>-	__le16 advise;		/* always 0, don't care for now */</div><div class='add'>+	__le16 startblk_hi;	/* starting block number MSB */</div><div class='ctx'> 	__le16 device_id;	/* back-end storage id (with bits masked) */</div><div class='del'>-	__le32 blkaddr;		/* start block address of this inode chunk */</div><div class='add'>+	__le32 startblk_lo;	/* starting block number of this chunk */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define EROFS_DIRENT_NID_METABOX_BIT	63</div><div class='add'>+#define EROFS_DIRENT_NID_MASK	(BIT_ULL(EROFS_DIRENT_NID_METABOX_BIT) - 1)</div><div class='add'>+</div><div class='ctx'> /* dirent sorts in alphabet order, thus we can do binary search */</div><div class='ctx'> struct erofs_dirent {</div><div class='ctx'> 	__le64 nid;     /* node number */</div><div class='hunk'>@@ -288,14 +292,18 @@ struct erofs_dirent {</div><div class='ctx'> </div><div class='ctx'> #define EROFS_NAME_LEN      255</div><div class='ctx'> </div><div class='del'>-/* maximum supported size of a physical compression cluster */</div><div class='add'>+/* maximum supported encoded size of a physical compressed cluster */</div><div class='ctx'> #define Z_EROFS_PCLUSTER_MAX_SIZE	(1024 * 1024)</div><div class='ctx'> </div><div class='add'>+/* maximum supported decoded size of a physical compressed cluster */</div><div class='add'>+#define Z_EROFS_PCLUSTER_MAX_DSIZE	(12 * 1024 * 1024)</div><div class='add'>+</div><div class='ctx'> /* available compression algorithm types (for h_algorithmtype) */</div><div class='ctx'> enum {</div><div class='ctx'> 	Z_EROFS_COMPRESSION_LZ4		= 0,</div><div class='ctx'> 	Z_EROFS_COMPRESSION_LZMA	= 1,</div><div class='ctx'> 	Z_EROFS_COMPRESSION_DEFLATE	= 2,</div><div class='add'>+	Z_EROFS_COMPRESSION_ZSTD	= 3,</div><div class='ctx'> 	Z_EROFS_COMPRESSION_MAX</div><div class='ctx'> };</div><div class='ctx'> #define Z_EROFS_ALL_COMPR_ALGS		((1 &lt;&lt; Z_EROFS_COMPRESSION_MAX) - 1)</div><div class='hunk'>@@ -322,22 +330,30 @@ struct z_erofs_deflate_cfgs {</div><div class='ctx'> 	u8 reserved[5];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* 6 bytes (+ length field = 8 bytes) */</div><div class='add'>+struct z_erofs_zstd_cfgs {</div><div class='add'>+	u8 format;</div><div class='add'>+	u8 windowlog;           /* windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN(10) */</div><div class='add'>+	u8 reserved[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define Z_EROFS_ZSTD_MAX_DICT_SIZE      Z_EROFS_PCLUSTER_MAX_SIZE</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * bit 0 : COMPACTED_2B indexes (0 - off; 1 - on)</div><div class='del'>- *  e.g. for 4k logical cluster size,      4B        if compacted 2B is off;</div><div class='del'>- *                                  (4B) + 2B + (4B) if compacted 2B is on.</div><div class='del'>- * bit 1 : HEAD1 big pcluster (0 - off; 1 - on)</div><div class='del'>- * bit 2 : HEAD2 big pcluster (0 - off; 1 - on)</div><div class='del'>- * bit 3 : tailpacking inline pcluster (0 - off; 1 - on)</div><div class='del'>- * bit 4 : interlaced plain pcluster (0 - off; 1 - on)</div><div class='del'>- * bit 5 : fragment pcluster (0 - off; 1 - on)</div><div class='add'>+ * Enable COMPACTED_2B for EROFS_INODE_COMPRESSED_COMPACT inodes:</div><div class='add'>+ *   4B (disabled) vs 4B+2B+4B (enabled)</div><div class='ctx'>  */</div><div class='ctx'> #define Z_EROFS_ADVISE_COMPACTED_2B		0x0001</div><div class='add'>+/* Enable extent metadata for EROFS_INODE_COMPRESSED_FULL inodes */</div><div class='add'>+#define Z_EROFS_ADVISE_EXTENTS			0x0001</div><div class='ctx'> #define Z_EROFS_ADVISE_BIG_PCLUSTER_1		0x0002</div><div class='ctx'> #define Z_EROFS_ADVISE_BIG_PCLUSTER_2		0x0004</div><div class='ctx'> #define Z_EROFS_ADVISE_INLINE_PCLUSTER		0x0008</div><div class='ctx'> #define Z_EROFS_ADVISE_INTERLACED_PCLUSTER	0x0010</div><div class='ctx'> #define Z_EROFS_ADVISE_FRAGMENT_PCLUSTER	0x0020</div><div class='add'>+/* Indicate the record size for each extent if extent metadata is used */</div><div class='add'>+#define Z_EROFS_ADVISE_EXTRECSZ_BIT		1</div><div class='add'>+#define Z_EROFS_ADVISE_EXTRECSZ_MASK		0x3</div><div class='ctx'> </div><div class='ctx'> #define Z_EROFS_FRAGMENT_INODE_BIT              7</div><div class='ctx'> struct z_erofs_map_header {</div><div class='hunk'>@@ -349,45 +365,24 @@ struct z_erofs_map_header {</div><div class='ctx'> 			/* indicates the encoded size of tailpacking data */</div><div class='ctx'> 			__le16  h_idata_size;</div><div class='ctx'> 		};</div><div class='add'>+		__le32 h_extents_lo;	/* extent count LSB */</div><div class='ctx'> 	};</div><div class='ctx'> 	__le16	h_advise;</div><div class='del'>-	/*</div><div class='del'>-	 * bit 0-3 : algorithm type of head 1 (logical cluster type 01);</div><div class='del'>-	 * bit 4-7 : algorithm type of head 2 (logical cluster type 11).</div><div class='del'>-	 */</div><div class='del'>-	__u8	h_algorithmtype;</div><div class='del'>-	/*</div><div class='del'>-	 * bit 0-2 : logical cluster bits - 12, e.g. 0 for 4096;</div><div class='del'>-	 * bit 3-6 : reserved;</div><div class='del'>-	 * bit 7   : move the whole file into packed inode or not.</div><div class='del'>-	 */</div><div class='del'>-	__u8	h_clusterbits;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* algorithm type (bit 0-3: HEAD1; bit 4-7: HEAD2) */</div><div class='add'>+			__u8	h_algorithmtype;</div><div class='add'>+			/*</div><div class='add'>+			 * bit 0-3 : logical cluster bits - blkszbits</div><div class='add'>+			 * bit 4-6 : reserved</div><div class='add'>+			 * bit 7   : pack the whole file into packed inode</div><div class='add'>+			 */</div><div class='add'>+			__u8	h_clusterbits;</div><div class='add'>+		} __packed;</div><div class='add'>+		__le16 h_extents_hi;	/* extent count MSB */</div><div class='add'>+	} __packed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * On-disk logical cluster type:</div><div class='del'>- *    0   - literal (uncompressed) lcluster</div><div class='del'>- *    1,3 - compressed lcluster (for HEAD lclusters)</div><div class='del'>- *    2   - compressed lcluster (for NONHEAD lclusters)</div><div class='del'>- *</div><div class='del'>- * In detail,</div><div class='del'>- *    0 - literal (uncompressed) lcluster,</div><div class='del'>- *        di_advise = 0</div><div class='del'>- *        di_clusterofs = the literal data offset of the lcluster</div><div class='del'>- *        di_blkaddr = the blkaddr of the literal pcluster</div><div class='del'>- *</div><div class='del'>- *    1,3 - compressed lcluster (for HEAD lclusters)</div><div class='del'>- *        di_advise = 1 or 3</div><div class='del'>- *        di_clusterofs = the decompressed data offset of the lcluster</div><div class='del'>- *        di_blkaddr = the blkaddr of the compressed pcluster</div><div class='del'>- *</div><div class='del'>- *    2 - compressed lcluster (for NONHEAD lclusters)</div><div class='del'>- *        di_advise = 2</div><div class='del'>- *        di_clusterofs =</div><div class='del'>- *           the decompressed data offset in its own HEAD lcluster</div><div class='del'>- *        di_u.delta[0] = distance to this HEAD lcluster</div><div class='del'>- *        di_u.delta[1] = distance to the next HEAD lcluster</div><div class='del'>- */</div><div class='ctx'> enum {</div><div class='ctx'> 	Z_EROFS_LCLUSTER_TYPE_PLAIN	= 0,</div><div class='ctx'> 	Z_EROFS_LCLUSTER_TYPE_HEAD1	= 1,</div><div class='hunk'>@@ -396,17 +391,12 @@ enum {</div><div class='ctx'> 	Z_EROFS_LCLUSTER_TYPE_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define Z_EROFS_LI_LCLUSTER_TYPE_BITS        2</div><div class='del'>-#define Z_EROFS_LI_LCLUSTER_TYPE_BIT         0</div><div class='add'>+#define Z_EROFS_LI_LCLUSTER_TYPE_MASK	(Z_EROFS_LCLUSTER_TYPE_MAX - 1)</div><div class='ctx'> </div><div class='ctx'> /* (noncompact only, HEAD) This pcluster refers to partial decompressed data */</div><div class='ctx'> #define Z_EROFS_LI_PARTIAL_REF		(1 &lt;&lt; 15)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * D0_CBLKCNT will be marked _only_ at the 1st non-head lcluster to store the</div><div class='del'>- * compressed block count of a compressed extent (in logical clusters, aka.</div><div class='del'>- * block count of a pcluster).</div><div class='del'>- */</div><div class='add'>+/* Set on 1st non-head lcluster to store compressed block counti (in blocks) */</div><div class='ctx'> #define Z_EROFS_LI_D0_CBLKCNT		(1 &lt;&lt; 11)</div><div class='ctx'> </div><div class='ctx'> struct z_erofs_lcluster_index {</div><div class='hunk'>@@ -415,19 +405,36 @@ struct z_erofs_lcluster_index {</div><div class='ctx'> 	__le16 di_clusterofs;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='del'>-		/* for the HEAD lclusters */</div><div class='del'>-		__le32 blkaddr;</div><div class='add'>+		__le32 blkaddr;		/* for the HEAD lclusters */</div><div class='ctx'> 		/*</div><div class='del'>-		 * for the NONHEAD lclusters</div><div class='ctx'> 		 * [0] - distance to its HEAD lcluster</div><div class='ctx'> 		 * [1] - distance to the next HEAD lcluster</div><div class='ctx'> 		 */</div><div class='del'>-		__le16 delta[2];</div><div class='add'>+		__le16 delta[2];	/* for the NONHEAD lclusters */</div><div class='ctx'> 	} di_u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define Z_EROFS_FULL_INDEX_ALIGN(end)	\</div><div class='del'>-	(ALIGN(end, 8) + sizeof(struct z_erofs_map_header) + 8)</div><div class='add'>+#define Z_EROFS_MAP_HEADER_END(end)	\</div><div class='add'>+	(ALIGN(end, 8) + sizeof(struct z_erofs_map_header))</div><div class='add'>+#define Z_EROFS_FULL_INDEX_START(end)	(Z_EROFS_MAP_HEADER_END(end) + 8)</div><div class='add'>+</div><div class='add'>+#define Z_EROFS_EXTENT_PLEN_PARTIAL	BIT(27)</div><div class='add'>+#define Z_EROFS_EXTENT_PLEN_FMT_BIT	28</div><div class='add'>+#define Z_EROFS_EXTENT_PLEN_MASK	((Z_EROFS_PCLUSTER_MAX_SIZE &lt;&lt; 1) - 1)</div><div class='add'>+struct z_erofs_extent {</div><div class='add'>+	__le32 plen;		/* encoded length */</div><div class='add'>+	__le32 pstart_lo;	/* physical offset */</div><div class='add'>+	__le32 pstart_hi;	/* physical offset MSB */</div><div class='add'>+	__le32 lstart_lo;	/* logical offset */</div><div class='add'>+	__le32 lstart_hi;	/* logical offset MSB (&gt;= 4GiB inodes) */</div><div class='add'>+	__u8 reserved[12];	/* for future use */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int z_erofs_extent_recsize(unsigned int advise)</div><div class='add'>+{</div><div class='add'>+	return 4 &lt;&lt; ((advise &gt;&gt; Z_EROFS_ADVISE_EXTRECSZ_BIT) &amp;</div><div class='add'>+		Z_EROFS_ADVISE_EXTRECSZ_MASK);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* check the EROFS on-disk layout strictly at compile time */</div><div class='ctx'> static inline void erofs_check_ondisk_layout_definitions(void)</div><div class='hunk'>@@ -436,7 +443,7 @@ static inline void erofs_check_ondisk_layout_definitions(void)</div><div class='ctx'> 		.h_clusterbits = 1 &lt;&lt; Z_EROFS_FRAGMENT_INODE_BIT</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(sizeof(struct erofs_super_block) != 128);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct erofs_super_block) != 144);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct erofs_inode_compact) != 32);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct erofs_inode_extended) != 64);</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct erofs_xattr_ibody_header) != 12);</div><div class='hunk'>@@ -451,8 +458,6 @@ static inline void erofs_check_ondisk_layout_definitions(void)</div><div class='ctx'> 		     sizeof(struct z_erofs_lcluster_index));</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct erofs_deviceslot) != 128);</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(BIT(Z_EROFS_LI_LCLUSTER_TYPE_BITS) &lt;</div><div class='del'>-		     Z_EROFS_LCLUSTER_TYPE_MAX - 1);</div><div class='ctx'> 	/* exclude old compiler versions like gcc 7.5.0 */</div><div class='ctx'> 	BUILD_BUG_ON(__builtin_constant_p(fmh) ?</div><div class='ctx'> 		     fmh != cpu_to_le64(1ULL &lt;&lt; 63) : 0);</div><div class='head'>diff --git a/fs/erofs/fileio.c b/fs/erofs/fileio.c<br/>new file mode 100644<br/>index 000000000000..932e8b353ba1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/fileio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/fileio.c</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024, Alibaba Cloud</div><div class='add'>+ */</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include &lt;trace/events/erofs.h&gt;</div><div class='add'>+</div><div class='add'>+struct erofs_fileio_rq {</div><div class='add'>+	struct bio_vec bvecs[16];</div><div class='add'>+	struct bio bio;</div><div class='add'>+	struct kiocb iocb;</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct erofs_fileio {</div><div class='add'>+	struct erofs_map_blocks map;</div><div class='add'>+	struct erofs_map_dev dev;</div><div class='add'>+	struct erofs_fileio_rq *rq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void erofs_fileio_ki_complete(struct kiocb *iocb, long ret)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fileio_rq *rq =</div><div class='add'>+			container_of(iocb, struct erofs_fileio_rq, iocb);</div><div class='add'>+	struct folio_iter fi;</div><div class='add'>+</div><div class='add'>+	if (ret &gt; 0) {</div><div class='add'>+		if (ret != rq-&gt;bio.bi_iter.bi_size) {</div><div class='add'>+			bio_advance(&amp;rq-&gt;bio, ret);</div><div class='add'>+			zero_fill_bio(&amp;rq-&gt;bio);</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	if (rq-&gt;bio.bi_end_io) {</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; !rq-&gt;bio.bi_status)</div><div class='add'>+			rq-&gt;bio.bi_status = errno_to_blk_status(ret);</div><div class='add'>+	} else {</div><div class='add'>+		bio_for_each_folio_all(fi, &amp;rq-&gt;bio) {</div><div class='add'>+			DBG_BUGON(folio_test_uptodate(fi.folio));</div><div class='add'>+			erofs_onlinefolio_end(fi.folio, ret, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	bio_endio(&amp;rq-&gt;bio);</div><div class='add'>+	bio_uninit(&amp;rq-&gt;bio);</div><div class='add'>+	kfree(rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void erofs_fileio_rq_submit(struct erofs_fileio_rq *rq)</div><div class='add'>+{</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!rq)</div><div class='add'>+		return;</div><div class='add'>+	rq-&gt;iocb.ki_pos = rq-&gt;bio.bi_iter.bi_sector &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+	rq-&gt;iocb.ki_ioprio = get_current_ioprio();</div><div class='add'>+	rq-&gt;iocb.ki_complete = erofs_fileio_ki_complete;</div><div class='add'>+	if (test_opt(&amp;EROFS_SB(rq-&gt;sb)-&gt;opt, DIRECT_IO) &amp;&amp;</div><div class='add'>+	    rq-&gt;iocb.ki_filp-&gt;f_mode &amp; FMODE_CAN_ODIRECT)</div><div class='add'>+		rq-&gt;iocb.ki_flags = IOCB_DIRECT;</div><div class='add'>+	iov_iter_bvec(&amp;iter, ITER_DEST, rq-&gt;bvecs, rq-&gt;bio.bi_vcnt,</div><div class='add'>+		      rq-&gt;bio.bi_iter.bi_size);</div><div class='add'>+	scoped_with_creds(rq-&gt;iocb.ki_filp-&gt;f_cred)</div><div class='add'>+		ret = vfs_iocb_iter_read(rq-&gt;iocb.ki_filp, &amp;rq-&gt;iocb, &amp;iter);</div><div class='add'>+	if (ret != -EIOCBQUEUED)</div><div class='add'>+		erofs_fileio_ki_complete(&amp;rq-&gt;iocb, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct erofs_fileio_rq *erofs_fileio_rq_alloc(struct erofs_map_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fileio_rq *rq = kzalloc(sizeof(*rq),</div><div class='add'>+					     GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+</div><div class='add'>+	bio_init(&amp;rq-&gt;bio, NULL, rq-&gt;bvecs, ARRAY_SIZE(rq-&gt;bvecs), REQ_OP_READ);</div><div class='add'>+	rq-&gt;iocb.ki_filp = mdev-&gt;m_dif-&gt;file;</div><div class='add'>+	rq-&gt;sb = mdev-&gt;m_sb;</div><div class='add'>+	return rq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bio *erofs_fileio_bio_alloc(struct erofs_map_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	return &amp;erofs_fileio_rq_alloc(mdev)-&gt;bio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_fileio_submit_bio(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return erofs_fileio_rq_submit(container_of(bio, struct erofs_fileio_rq,</div><div class='add'>+						   bio));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erofs_fileio_scan_folio(struct erofs_fileio *io, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = folio_inode(folio);</div><div class='add'>+	struct erofs_map_blocks *map = &amp;io-&gt;map;</div><div class='add'>+	unsigned int cur = 0, end = folio_size(folio), len, attached = 0;</div><div class='add'>+	loff_t pos = folio_pos(folio), ofs;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	erofs_onlinefolio_init(folio);</div><div class='add'>+	while (cur &lt; end) {</div><div class='add'>+		if (!in_range(pos + cur, map-&gt;m_la, map-&gt;m_llen)) {</div><div class='add'>+			map-&gt;m_la = pos + cur;</div><div class='add'>+			map-&gt;m_llen = end - cur;</div><div class='add'>+			err = erofs_map_blocks(inode, map);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ofs = folio_pos(folio) + cur - map-&gt;m_la;</div><div class='add'>+		len = min_t(loff_t, map-&gt;m_llen - ofs, end - cur);</div><div class='add'>+		if (map-&gt;m_flags &amp; EROFS_MAP_META) {</div><div class='add'>+			struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='add'>+			void *src;</div><div class='add'>+</div><div class='add'>+			src = erofs_read_metabuf(&amp;buf, inode-&gt;i_sb,</div><div class='add'>+				map-&gt;m_pa + ofs, erofs_inode_in_metabox(inode));</div><div class='add'>+			if (IS_ERR(src)) {</div><div class='add'>+				err = PTR_ERR(src);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			memcpy_to_folio(folio, cur, src, len);</div><div class='add'>+			erofs_put_metabuf(&amp;buf);</div><div class='add'>+		} else if (!(map-&gt;m_flags &amp; EROFS_MAP_MAPPED)) {</div><div class='add'>+			folio_zero_segment(folio, cur, cur + len);</div><div class='add'>+			attached = 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (io-&gt;rq &amp;&amp; (map-&gt;m_pa + ofs != io-&gt;dev.m_pa ||</div><div class='add'>+				       map-&gt;m_deviceid != io-&gt;dev.m_deviceid)) {</div><div class='add'>+io_retry:</div><div class='add'>+				erofs_fileio_rq_submit(io-&gt;rq);</div><div class='add'>+				io-&gt;rq = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!io-&gt;rq) {</div><div class='add'>+				io-&gt;dev = (struct erofs_map_dev) {</div><div class='add'>+					.m_pa = io-&gt;map.m_pa + ofs,</div><div class='add'>+					.m_deviceid = io-&gt;map.m_deviceid,</div><div class='add'>+				};</div><div class='add'>+				err = erofs_map_dev(inode-&gt;i_sb, &amp;io-&gt;dev);</div><div class='add'>+				if (err)</div><div class='add'>+					break;</div><div class='add'>+				io-&gt;rq = erofs_fileio_rq_alloc(&amp;io-&gt;dev);</div><div class='add'>+				io-&gt;rq-&gt;bio.bi_iter.bi_sector =</div><div class='add'>+					(io-&gt;dev.m_dif-&gt;fsoff + io-&gt;dev.m_pa) &gt;&gt; 9;</div><div class='add'>+				attached = 0;</div><div class='add'>+			}</div><div class='add'>+			if (!bio_add_folio(&amp;io-&gt;rq-&gt;bio, folio, len, cur))</div><div class='add'>+				goto io_retry;</div><div class='add'>+			if (!attached++)</div><div class='add'>+				erofs_onlinefolio_split(folio);</div><div class='add'>+			io-&gt;dev.m_pa += len;</div><div class='add'>+		}</div><div class='add'>+		cur += len;</div><div class='add'>+	}</div><div class='add'>+	erofs_onlinefolio_end(folio, err, false);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erofs_fileio_read_folio(struct file *file, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fileio io = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	trace_erofs_read_folio(folio, true);</div><div class='add'>+	err = erofs_fileio_scan_folio(&amp;io, folio);</div><div class='add'>+	erofs_fileio_rq_submit(io.rq);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void erofs_fileio_readahead(struct readahead_control *rac)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = rac-&gt;mapping-&gt;host;</div><div class='add'>+	struct erofs_fileio io = {};</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	trace_erofs_readahead(inode, readahead_index(rac),</div><div class='add'>+			      readahead_count(rac), true);</div><div class='add'>+	while ((folio = readahead_folio(rac))) {</div><div class='add'>+		err = erofs_fileio_scan_folio(&amp;io, folio);</div><div class='add'>+		if (err &amp;&amp; err != -EINTR)</div><div class='add'>+			erofs_err(inode-&gt;i_sb, "readahead error at folio %lu @ nid %llu",</div><div class='add'>+				  folio-&gt;index, EROFS_I(inode)-&gt;nid);</div><div class='add'>+	}</div><div class='add'>+	erofs_fileio_rq_submit(io.rq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct address_space_operations erofs_fileio_aops = {</div><div class='add'>+	.read_folio = erofs_fileio_read_folio,</div><div class='add'>+	.readahead = erofs_fileio_readahead,</div><div class='add'>+};</div><div class='head'>diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c<br/>index bc12030393b2..7a346e20f7b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/fscache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/fscache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/fscache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/fscache.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (C) 2022, Alibaba Cloud</div><div class='ctx'>  * Copyright (C) 2022, Bytedance Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/pseudo_fs.h&gt;</div><div class='ctx'> #include &lt;linux/fscache.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -12,9 +13,27 @@ static LIST_HEAD(erofs_domain_list);</div><div class='ctx'> static LIST_HEAD(erofs_domain_cookies_list);</div><div class='ctx'> static struct vfsmount *erofs_pseudo_mnt;</div><div class='ctx'> </div><div class='del'>-struct erofs_fscache_request {</div><div class='del'>-	struct erofs_fscache_request *primary;</div><div class='del'>-	struct netfs_cache_resources cache_resources;</div><div class='add'>+static int erofs_anon_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type erofs_anon_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name           = "pseudo_erofs",</div><div class='add'>+	.init_fs_context = erofs_anon_init_fs_context,</div><div class='add'>+	.kill_sb        = kill_anon_super,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct erofs_fscache_io {</div><div class='add'>+	struct netfs_cache_resources cres;</div><div class='add'>+	struct iov_iter		iter;</div><div class='add'>+	netfs_io_terminated_t	end_io;</div><div class='add'>+	void			*private;</div><div class='add'>+	refcount_t		ref;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct erofs_fscache_rq {</div><div class='ctx'> 	struct address_space	*mapping;	/* The mapping being accessed */</div><div class='ctx'> 	loff_t			start;		/* Start position */</div><div class='ctx'> 	size_t			len;		/* Length of the request */</div><div class='hunk'>@@ -23,44 +42,17 @@ struct erofs_fscache_request {</div><div class='ctx'> 	refcount_t		ref;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct erofs_fscache_request *erofs_fscache_req_alloc(struct address_space *mapping,</div><div class='del'>-					     loff_t start, size_t len)</div><div class='add'>+static bool erofs_fscache_io_put(struct erofs_fscache_io *io)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fscache_request *req;</div><div class='del'>-</div><div class='del'>-	req = kzalloc(sizeof(struct erofs_fscache_request), GFP_KERNEL);</div><div class='del'>-	if (!req)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	req-&gt;mapping = mapping;</div><div class='del'>-	req-&gt;start   = start;</div><div class='del'>-	req-&gt;len     = len;</div><div class='del'>-	refcount_set(&amp;req-&gt;ref, 1);</div><div class='del'>-</div><div class='del'>-	return req;</div><div class='add'>+	if (!refcount_dec_and_test(&amp;io-&gt;ref))</div><div class='add'>+		return false;</div><div class='add'>+	if (io-&gt;cres.ops)</div><div class='add'>+		io-&gt;cres.ops-&gt;end_operation(&amp;io-&gt;cres);</div><div class='add'>+	kfree(io);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct erofs_fscache_request *erofs_fscache_req_chain(struct erofs_fscache_request *primary,</div><div class='del'>-					     size_t len)</div><div class='del'>-{</div><div class='del'>-	struct erofs_fscache_request *req;</div><div class='del'>-</div><div class='del'>-	/* use primary request for the first submission */</div><div class='del'>-	if (!primary-&gt;submitted) {</div><div class='del'>-		refcount_inc(&amp;primary-&gt;ref);</div><div class='del'>-		return primary;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	req = erofs_fscache_req_alloc(primary-&gt;mapping,</div><div class='del'>-			primary-&gt;start + primary-&gt;submitted, len);</div><div class='del'>-	if (!IS_ERR(req)) {</div><div class='del'>-		req-&gt;primary = primary;</div><div class='del'>-		refcount_inc(&amp;primary-&gt;ref);</div><div class='del'>-	}</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void erofs_fscache_req_complete(struct erofs_fscache_request *req)</div><div class='add'>+static void erofs_fscache_req_complete(struct erofs_fscache_rq *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	bool failed = req-&gt;error;</div><div class='hunk'>@@ -80,120 +72,194 @@ static void erofs_fscache_req_complete(struct erofs_fscache_request *req)</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void erofs_fscache_req_put(struct erofs_fscache_request *req)</div><div class='add'>+static void erofs_fscache_req_put(struct erofs_fscache_rq *req)</div><div class='ctx'> {</div><div class='del'>-	if (refcount_dec_and_test(&amp;req-&gt;ref)) {</div><div class='del'>-		if (req-&gt;cache_resources.ops)</div><div class='del'>-			req-&gt;cache_resources.ops-&gt;end_operation(&amp;req-&gt;cache_resources);</div><div class='del'>-		if (!req-&gt;primary)</div><div class='del'>-			erofs_fscache_req_complete(req);</div><div class='del'>-		else</div><div class='del'>-			erofs_fscache_req_put(req-&gt;primary);</div><div class='del'>-		kfree(req);</div><div class='del'>-	}</div><div class='add'>+	if (!refcount_dec_and_test(&amp;req-&gt;ref))</div><div class='add'>+		return;</div><div class='add'>+	erofs_fscache_req_complete(req);</div><div class='add'>+	kfree(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void erofs_fscache_subreq_complete(void *priv,</div><div class='del'>-		ssize_t transferred_or_error, bool was_async)</div><div class='add'>+static struct erofs_fscache_rq *erofs_fscache_req_alloc(struct address_space *mapping,</div><div class='add'>+						loff_t start, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fscache_request *req = priv;</div><div class='add'>+	struct erofs_fscache_rq *req = kzalloc(sizeof(*req), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_VALUE(transferred_or_error)) {</div><div class='del'>-		if (req-&gt;primary)</div><div class='del'>-			req-&gt;primary-&gt;error = transferred_or_error;</div><div class='del'>-		else</div><div class='del'>-			req-&gt;error = transferred_or_error;</div><div class='del'>-	}</div><div class='del'>-	erofs_fscache_req_put(req);</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+	req-&gt;mapping = mapping;</div><div class='add'>+	req-&gt;start = start;</div><div class='add'>+	req-&gt;len = len;</div><div class='add'>+	refcount_set(&amp;req-&gt;ref, 1);</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void erofs_fscache_req_io_put(struct erofs_fscache_io *io)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fscache_rq *req = io-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (erofs_fscache_io_put(io))</div><div class='add'>+		erofs_fscache_req_put(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void erofs_fscache_req_end_io(void *priv, ssize_t transferred_or_error)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fscache_io *io = priv;</div><div class='add'>+	struct erofs_fscache_rq *req = io-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_VALUE(transferred_or_error))</div><div class='add'>+		req-&gt;error = transferred_or_error;</div><div class='add'>+	erofs_fscache_req_io_put(io);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct erofs_fscache_io *erofs_fscache_req_io_alloc(struct erofs_fscache_rq *req)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fscache_io *io = kzalloc(sizeof(*io), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!io)</div><div class='add'>+		return NULL;</div><div class='add'>+	io-&gt;end_io = erofs_fscache_req_end_io;</div><div class='add'>+	io-&gt;private = req;</div><div class='add'>+	refcount_inc(&amp;req-&gt;ref);</div><div class='add'>+	refcount_set(&amp;io-&gt;ref, 1);</div><div class='add'>+	return io;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Read data from fscache (cookie, pstart, len), and fill the read data into</div><div class='del'>- * page cache described by (req-&gt;mapping, lstart, len). @pstart describeis the</div><div class='del'>- * start physical address in the cache file.</div><div class='add'>+ * Read data from fscache described by cookie at pstart physical address</div><div class='add'>+ * offset, and fill the read data into buffer described by io-&gt;iter.</div><div class='ctx'>  */</div><div class='del'>-static int erofs_fscache_read_folios_async(struct fscache_cookie *cookie,</div><div class='del'>-		struct erofs_fscache_request *req, loff_t pstart, size_t len)</div><div class='add'>+static int erofs_fscache_read_io_async(struct fscache_cookie *cookie,</div><div class='add'>+		loff_t pstart, struct erofs_fscache_io *io)</div><div class='ctx'> {</div><div class='ctx'> 	enum netfs_io_source source;</div><div class='del'>-	struct super_block *sb = req-&gt;mapping-&gt;host-&gt;i_sb;</div><div class='del'>-	struct netfs_cache_resources *cres = &amp;req-&gt;cache_resources;</div><div class='del'>-	struct iov_iter iter;</div><div class='del'>-	loff_t lstart = req-&gt;start + req-&gt;submitted;</div><div class='del'>-	size_t done = 0;</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;io-&gt;cres;</div><div class='add'>+	struct iov_iter *iter = &amp;io-&gt;iter;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	DBG_BUGON(len &gt; req-&gt;len - req-&gt;submitted);</div><div class='del'>-</div><div class='ctx'> 	ret = fscache_begin_read_operation(cres, cookie);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	while (done &lt; len) {</div><div class='del'>-		loff_t sstart = pstart + done;</div><div class='del'>-		size_t slen = len - done;</div><div class='add'>+	while (iov_iter_count(iter)) {</div><div class='add'>+		size_t orig_count = iov_iter_count(iter), len = orig_count;</div><div class='ctx'> 		unsigned long flags = 1 &lt;&lt; NETFS_SREQ_ONDEMAND;</div><div class='ctx'> </div><div class='ctx'> 		source = cres-&gt;ops-&gt;prepare_ondemand_read(cres,</div><div class='del'>-				sstart, &amp;slen, LLONG_MAX, &amp;flags, 0);</div><div class='del'>-		if (WARN_ON(slen == 0))</div><div class='add'>+				pstart, &amp;len, LLONG_MAX, &amp;flags, 0);</div><div class='add'>+		if (WARN_ON(len == 0))</div><div class='ctx'> 			source = NETFS_INVALID_READ;</div><div class='ctx'> 		if (source != NETFS_READ_FROM_CACHE) {</div><div class='del'>-			erofs_err(sb, "failed to fscache prepare_read (source %d)", source);</div><div class='add'>+			erofs_err(NULL, "prepare_ondemand_read failed (source %d)", source);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		refcount_inc(&amp;req-&gt;ref);</div><div class='del'>-		iov_iter_xarray(&amp;iter, ITER_DEST, &amp;req-&gt;mapping-&gt;i_pages,</div><div class='del'>-				lstart + done, slen);</div><div class='del'>-</div><div class='del'>-		ret = fscache_read(cres, sstart, &amp;iter, NETFS_READ_HOLE_FAIL,</div><div class='del'>-				   erofs_fscache_subreq_complete, req);</div><div class='add'>+		iov_iter_truncate(iter, len);</div><div class='add'>+		refcount_inc(&amp;io-&gt;ref);</div><div class='add'>+		ret = fscache_read(cres, pstart, iter, NETFS_READ_HOLE_FAIL,</div><div class='add'>+				   io-&gt;end_io, io);</div><div class='ctx'> 		if (ret == -EIOCBQUEUED)</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			erofs_err(sb, "failed to fscache_read (ret %d)", ret);</div><div class='add'>+			erofs_err(NULL, "fscache_read failed (ret %d)", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		if (WARN_ON(iov_iter_count(iter)))</div><div class='add'>+			return -EIO;</div><div class='ctx'> </div><div class='del'>-		done += slen;</div><div class='add'>+		iov_iter_reexpand(iter, orig_count - len);</div><div class='add'>+		pstart += len;</div><div class='ctx'> 	}</div><div class='del'>-	DBG_BUGON(done != len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)</div><div class='add'>+struct erofs_fscache_bio {</div><div class='add'>+	struct erofs_fscache_io io;</div><div class='add'>+	struct bio bio;		/* w/o bdev to share bio_add_page/endio() */</div><div class='add'>+	struct bio_vec bvecs[BIO_MAX_VECS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void erofs_fscache_bio_endio(void *priv, ssize_t transferred_or_error)</div><div class='ctx'> {</div><div class='add'>+	struct erofs_fscache_bio *io = priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_VALUE(transferred_or_error))</div><div class='add'>+		io-&gt;bio.bi_status = errno_to_blk_status(transferred_or_error);</div><div class='add'>+	bio_endio(&amp;io-&gt;bio);</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct erofs_fscache_bio, io) != 0);</div><div class='add'>+	erofs_fscache_io_put(&amp;io-&gt;io);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bio *erofs_fscache_bio_alloc(struct erofs_map_dev *mdev)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fscache_bio *io;</div><div class='add'>+</div><div class='add'>+	io = kmalloc(sizeof(*io), GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+	bio_init(&amp;io-&gt;bio, NULL, io-&gt;bvecs, BIO_MAX_VECS, REQ_OP_READ);</div><div class='add'>+	io-&gt;io.private = mdev-&gt;m_dif-&gt;fscache-&gt;cookie;</div><div class='add'>+	io-&gt;io.end_io = erofs_fscache_bio_endio;</div><div class='add'>+	refcount_set(&amp;io-&gt;io.ref, 1);</div><div class='add'>+	return &amp;io-&gt;bio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_fscache_submit_bio(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct erofs_fscache_bio *io = container_of(bio,</div><div class='add'>+			struct erofs_fscache_bio, bio);</div><div class='ctx'> 	int ret;</div><div class='add'>+</div><div class='add'>+	iov_iter_bvec(&amp;io-&gt;io.iter, ITER_DEST, io-&gt;bvecs, bio-&gt;bi_vcnt,</div><div class='add'>+		      bio-&gt;bi_iter.bi_size);</div><div class='add'>+	ret = erofs_fscache_read_io_async(io-&gt;io.private,</div><div class='add'>+				bio-&gt;bi_iter.bi_sector &lt;&lt; 9, &amp;io-&gt;io);</div><div class='add'>+	erofs_fscache_io_put(&amp;io-&gt;io);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return;</div><div class='add'>+	bio-&gt;bi_status = errno_to_blk_status(ret);</div><div class='add'>+	bio_endio(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)</div><div class='add'>+{</div><div class='ctx'> 	struct erofs_fscache *ctx = folio-&gt;mapping-&gt;host-&gt;i_private;</div><div class='del'>-	struct erofs_fscache_request *req;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+	struct erofs_fscache_rq *req;</div><div class='add'>+	struct erofs_fscache_io *io;</div><div class='ctx'> </div><div class='ctx'> 	req = erofs_fscache_req_alloc(folio-&gt;mapping,</div><div class='ctx'> 				folio_pos(folio), folio_size(folio));</div><div class='del'>-	if (IS_ERR(req)) {</div><div class='add'>+	if (!req) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='del'>-		return PTR_ERR(req);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = erofs_fscache_read_folios_async(ctx-&gt;cookie, req,</div><div class='del'>-				folio_pos(folio), folio_size(folio));</div><div class='add'>+	io = erofs_fscache_req_io_alloc(req);</div><div class='add'>+	if (!io) {</div><div class='add'>+		req-&gt;error = ret;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	iov_iter_xarray(&amp;io-&gt;iter, ITER_DEST, &amp;folio-&gt;mapping-&gt;i_pages,</div><div class='add'>+			folio_pos(folio), folio_size(folio));</div><div class='add'>+</div><div class='add'>+	ret = erofs_fscache_read_io_async(ctx-&gt;cookie, folio_pos(folio), io);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		req-&gt;error = ret;</div><div class='ctx'> </div><div class='add'>+	erofs_fscache_req_io_put(io);</div><div class='add'>+out:</div><div class='ctx'> 	erofs_fscache_req_put(req);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int erofs_fscache_data_read_slice(struct erofs_fscache_request *primary)</div><div class='add'>+static int erofs_fscache_data_read_slice(struct erofs_fscache_rq *req)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = primary-&gt;mapping;</div><div class='add'>+	struct address_space *mapping = req-&gt;mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct erofs_fscache_request *req;</div><div class='add'>+	struct erofs_fscache_io *io;</div><div class='ctx'> 	struct erofs_map_blocks map;</div><div class='ctx'> 	struct erofs_map_dev mdev;</div><div class='del'>-	struct iov_iter iter;</div><div class='del'>-	loff_t pos = primary-&gt;start + primary-&gt;submitted;</div><div class='add'>+	loff_t pos = req-&gt;start + req-&gt;submitted;</div><div class='ctx'> 	size_t count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -204,35 +270,33 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_request *primary)</div><div class='ctx'> </div><div class='ctx'> 	if (map.m_flags &amp; EROFS_MAP_META) {</div><div class='ctx'> 		struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-		erofs_blk_t blknr;</div><div class='del'>-		size_t offset, size;</div><div class='add'>+		struct iov_iter iter;</div><div class='add'>+		size_t size = map.m_llen;</div><div class='ctx'> 		void *src;</div><div class='ctx'> </div><div class='del'>-		/* For tail packing layout, the offset may be non-zero. */</div><div class='del'>-		offset = erofs_blkoff(sb, map.m_pa);</div><div class='del'>-		blknr = erofs_blknr(sb, map.m_pa);</div><div class='del'>-		size = map.m_llen;</div><div class='del'>-</div><div class='del'>-		src = erofs_read_metabuf(&amp;buf, sb, blknr, EROFS_KMAP);</div><div class='add'>+		src = erofs_read_metabuf(&amp;buf, sb, map.m_pa,</div><div class='add'>+					 erofs_inode_in_metabox(inode));</div><div class='ctx'> 		if (IS_ERR(src))</div><div class='ctx'> 			return PTR_ERR(src);</div><div class='ctx'> </div><div class='ctx'> 		iov_iter_xarray(&amp;iter, ITER_DEST, &amp;mapping-&gt;i_pages, pos, PAGE_SIZE);</div><div class='del'>-		if (copy_to_iter(src + offset, size, &amp;iter) != size) {</div><div class='add'>+		if (copy_to_iter(src, size, &amp;iter) != size) {</div><div class='ctx'> 			erofs_put_metabuf(&amp;buf);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		iov_iter_zero(PAGE_SIZE - size, &amp;iter);</div><div class='ctx'> 		erofs_put_metabuf(&amp;buf);</div><div class='del'>-		primary-&gt;submitted += PAGE_SIZE;</div><div class='add'>+		req-&gt;submitted += PAGE_SIZE;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = primary-&gt;len - primary-&gt;submitted;</div><div class='add'>+	count = req-&gt;len - req-&gt;submitted;</div><div class='ctx'> 	if (!(map.m_flags &amp; EROFS_MAP_MAPPED)) {</div><div class='add'>+		struct iov_iter iter;</div><div class='add'>+</div><div class='ctx'> 		iov_iter_xarray(&amp;iter, ITER_DEST, &amp;mapping-&gt;i_pages, pos, count);</div><div class='ctx'> 		iov_iter_zero(count, &amp;iter);</div><div class='del'>-		primary-&gt;submitted += count;</div><div class='add'>+		req-&gt;submitted += count;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -247,18 +311,19 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_request *primary)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	req = erofs_fscache_req_chain(primary, count);</div><div class='del'>-	if (IS_ERR(req))</div><div class='del'>-		return PTR_ERR(req);</div><div class='add'>+	io = erofs_fscache_req_io_alloc(req);</div><div class='add'>+	if (!io)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	iov_iter_xarray(&amp;io-&gt;iter, ITER_DEST, &amp;mapping-&gt;i_pages, pos, count);</div><div class='add'>+	ret = erofs_fscache_read_io_async(mdev.m_dif-&gt;fscache-&gt;cookie,</div><div class='add'>+			mdev.m_pa + (pos - map.m_la), io);</div><div class='add'>+	erofs_fscache_req_io_put(io);</div><div class='ctx'> </div><div class='del'>-	ret = erofs_fscache_read_folios_async(mdev.m_fscache-&gt;cookie,</div><div class='del'>-			req, mdev.m_pa + (pos - map.m_la), count);</div><div class='del'>-	erofs_fscache_req_put(req);</div><div class='del'>-	primary-&gt;submitted += count;</div><div class='add'>+	req-&gt;submitted += count;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int erofs_fscache_data_read(struct erofs_fscache_request *req)</div><div class='add'>+static int erofs_fscache_data_read(struct erofs_fscache_rq *req)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -267,20 +332,19 @@ static int erofs_fscache_data_read(struct erofs_fscache_request *req)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			req-&gt;error = ret;</div><div class='ctx'> 	} while (!ret &amp;&amp; req-&gt;submitted &lt; req-&gt;len);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_fscache_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fscache_request *req;</div><div class='add'>+	struct erofs_fscache_rq *req;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	req = erofs_fscache_req_alloc(folio-&gt;mapping,</div><div class='ctx'> 			folio_pos(folio), folio_size(folio));</div><div class='del'>-	if (IS_ERR(req)) {</div><div class='add'>+	if (!req) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='del'>-		return PTR_ERR(req);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = erofs_fscache_data_read(req);</div><div class='hunk'>@@ -290,14 +354,14 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> </div><div class='ctx'> static void erofs_fscache_readahead(struct readahead_control *rac)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fscache_request *req;</div><div class='add'>+	struct erofs_fscache_rq *req;</div><div class='ctx'> </div><div class='ctx'> 	if (!readahead_count(rac))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	req = erofs_fscache_req_alloc(rac-&gt;mapping,</div><div class='ctx'> 			readahead_pos(rac), readahead_length(rac));</div><div class='del'>-	if (IS_ERR(req))</div><div class='add'>+	if (!req)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* The request completion will drop refs on the folios. */</div><div class='hunk'>@@ -381,11 +445,12 @@ static int erofs_fscache_init_domain(struct super_block *sb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!erofs_pseudo_mnt) {</div><div class='del'>-		erofs_pseudo_mnt = kern_mount(&amp;erofs_fs_type);</div><div class='del'>-		if (IS_ERR(erofs_pseudo_mnt)) {</div><div class='del'>-			err = PTR_ERR(erofs_pseudo_mnt);</div><div class='add'>+		struct vfsmount *mnt = kern_mount(&amp;erofs_anon_fs_type);</div><div class='add'>+		if (IS_ERR(mnt)) {</div><div class='add'>+			err = PTR_ERR(mnt);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		erofs_pseudo_mnt = mnt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	domain-&gt;volume = sbi-&gt;volume;</div><div class='hunk'>@@ -459,7 +524,7 @@ static struct erofs_fscache *erofs_fscache_acquire_cookie(struct super_block *sb</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_size = OFFSET_MAX;</div><div class='ctx'> 	inode-&gt;i_mapping-&gt;a_ops = &amp;erofs_fscache_meta_aops;</div><div class='del'>-	mapping_set_gfp_mask(inode-&gt;i_mapping, GFP_NOFS);</div><div class='add'>+	mapping_set_gfp_mask(inode-&gt;i_mapping, GFP_KERNEL);</div><div class='ctx'> 	inode-&gt;i_blkbits = EROFS_SB(sb)-&gt;blkszbits;</div><div class='ctx'> 	inode-&gt;i_private = ctx;</div><div class='ctx'> </div><div class='hunk'>@@ -591,7 +656,7 @@ int erofs_fscache_register_fs(struct super_block *sb)</div><div class='ctx'> 	if (IS_ERR(fscache))</div><div class='ctx'> 		return PTR_ERR(fscache);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_fscache = fscache;</div><div class='add'>+	sbi-&gt;dif0.fscache = fscache;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -599,14 +664,14 @@ void erofs_fscache_unregister_fs(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> </div><div class='del'>-	erofs_fscache_unregister_cookie(sbi-&gt;s_fscache);</div><div class='add'>+	erofs_fscache_unregister_cookie(sbi-&gt;dif0.fscache);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;domain)</div><div class='ctx'> 		erofs_fscache_domain_put(sbi-&gt;domain);</div><div class='ctx'> 	else</div><div class='ctx'> 		fscache_relinquish_volume(sbi-&gt;volume, NULL, false);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_fscache = NULL;</div><div class='add'>+	sbi-&gt;dif0.fscache = NULL;</div><div class='ctx'> 	sbi-&gt;volume = NULL;</div><div class='ctx'> 	sbi-&gt;domain = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c<br/>index 3d616dea55dc..bce98c845a18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/inode.c</a></div><div class='hunk'>@@ -5,35 +5,51 @@</div><div class='ctx'>  * Copyright (C) 2021, Alibaba Cloud</div><div class='ctx'>  */</div><div class='ctx'> #include "xattr.h"</div><div class='del'>-</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;trace/events/erofs.h&gt;</div><div class='ctx'> </div><div class='del'>-static void *erofs_read_inode(struct erofs_buf *buf,</div><div class='del'>-			      struct inode *inode, unsigned int *ofs)</div><div class='add'>+static int erofs_fill_symlink(struct inode *inode, void *kaddr,</div><div class='add'>+			      unsigned int m_pofs)</div><div class='add'>+{</div><div class='add'>+	struct erofs_inode *vi = EROFS_I(inode);</div><div class='add'>+	loff_t off;</div><div class='add'>+</div><div class='add'>+	m_pofs += vi-&gt;xattr_isize;</div><div class='add'>+	/* check if it cannot be handled with fast symlink scheme */</div><div class='add'>+	if (vi-&gt;datalayout != EROFS_INODE_FLAT_INLINE ||</div><div class='add'>+	    check_add_overflow(m_pofs, inode-&gt;i_size, &amp;off) ||</div><div class='add'>+	    off &gt; i_blocksize(inode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_link = kmemdup_nul(kaddr + m_pofs, inode-&gt;i_size, GFP_KERNEL);</div><div class='add'>+	return inode-&gt;i_link ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int erofs_read_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	erofs_blk_t blkaddr = erofs_blknr(sb, erofs_iloc(inode));</div><div class='add'>+	unsigned int ofs = erofs_blkoff(sb, erofs_iloc(inode));</div><div class='add'>+	bool in_mbox = erofs_inode_in_metabox(inode);</div><div class='add'>+	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='add'>+	erofs_blk_t addrmask = BIT_ULL(48) - 1;</div><div class='ctx'> 	struct erofs_inode *vi = EROFS_I(inode);</div><div class='del'>-	const erofs_off_t inode_loc = erofs_iloc(inode);</div><div class='del'>-	erofs_blk_t blkaddr, nblks = 0;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	struct erofs_inode_extended *die, copied;</div><div class='ctx'> 	struct erofs_inode_compact *dic;</div><div class='del'>-	struct erofs_inode_extended *die, *copied = NULL;</div><div class='del'>-	union erofs_inode_i_u iu;</div><div class='ctx'> 	unsigned int ifmt;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	blkaddr = erofs_blknr(sb, inode_loc);</div><div class='del'>-	*ofs = erofs_blkoff(sb, inode_loc);</div><div class='add'>+	void *ptr;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	kaddr = erofs_read_metabuf(buf, sb, blkaddr, EROFS_KMAP);</div><div class='del'>-	if (IS_ERR(kaddr)) {</div><div class='del'>-		erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",</div><div class='del'>-			  vi-&gt;nid, PTR_ERR(kaddr));</div><div class='del'>-		return kaddr;</div><div class='add'>+	ptr = erofs_read_metabuf(&amp;buf, sb, erofs_pos(sb, blkaddr), in_mbox);</div><div class='add'>+	if (IS_ERR(ptr)) {</div><div class='add'>+		err = PTR_ERR(ptr);</div><div class='add'>+		erofs_err(sb, "failed to read inode meta block (nid: %llu): %d",</div><div class='add'>+			  vi-&gt;nid, err);</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dic = kaddr + *ofs;</div><div class='add'>+	dic = ptr + ofs;</div><div class='ctx'> 	ifmt = le16_to_cpu(dic-&gt;i_format);</div><div class='ctx'> 	if (ifmt &amp; ~EROFS_I_ALL) {</div><div class='ctx'> 		erofs_err(sb, "unsupported i_format %u of nid %llu",</div><div class='hunk'>@@ -54,57 +70,58 @@ static void *erofs_read_inode(struct erofs_buf *buf,</div><div class='ctx'> 	case EROFS_INODE_LAYOUT_EXTENDED:</div><div class='ctx'> 		vi-&gt;inode_isize = sizeof(struct erofs_inode_extended);</div><div class='ctx'> 		/* check if the extended inode acrosses block boundary */</div><div class='del'>-		if (*ofs + vi-&gt;inode_isize &lt;= sb-&gt;s_blocksize) {</div><div class='del'>-			*ofs += vi-&gt;inode_isize;</div><div class='add'>+		if (ofs + vi-&gt;inode_isize &lt;= sb-&gt;s_blocksize) {</div><div class='add'>+			ofs += vi-&gt;inode_isize;</div><div class='ctx'> 			die = (struct erofs_inode_extended *)dic;</div><div class='add'>+			copied.i_u = die-&gt;i_u;</div><div class='add'>+			copied.i_nb = die-&gt;i_nb;</div><div class='ctx'> 		} else {</div><div class='del'>-			const unsigned int gotten = sb-&gt;s_blocksize - *ofs;</div><div class='del'>-</div><div class='del'>-			copied = kmalloc(vi-&gt;inode_isize, GFP_NOFS);</div><div class='del'>-			if (!copied) {</div><div class='del'>-				err = -ENOMEM;</div><div class='add'>+			const unsigned int gotten = sb-&gt;s_blocksize - ofs;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;copied, dic, gotten);</div><div class='add'>+			ptr = erofs_read_metabuf(&amp;buf, sb,</div><div class='add'>+					erofs_pos(sb, blkaddr + 1), in_mbox);</div><div class='add'>+			if (IS_ERR(ptr)) {</div><div class='add'>+				err = PTR_ERR(ptr);</div><div class='add'>+				erofs_err(sb, "failed to read inode payload block (nid: %llu): %d",</div><div class='add'>+					  vi-&gt;nid, err);</div><div class='ctx'> 				goto err_out;</div><div class='ctx'> 			}</div><div class='del'>-			memcpy(copied, dic, gotten);</div><div class='del'>-			kaddr = erofs_read_metabuf(buf, sb, blkaddr + 1,</div><div class='del'>-						   EROFS_KMAP);</div><div class='del'>-			if (IS_ERR(kaddr)) {</div><div class='del'>-				erofs_err(sb, "failed to get inode payload block (nid: %llu), err %ld",</div><div class='del'>-					  vi-&gt;nid, PTR_ERR(kaddr));</div><div class='del'>-				kfree(copied);</div><div class='del'>-				return kaddr;</div><div class='del'>-			}</div><div class='del'>-			*ofs = vi-&gt;inode_isize - gotten;</div><div class='del'>-			memcpy((u8 *)copied + gotten, kaddr, *ofs);</div><div class='del'>-			die = copied;</div><div class='add'>+			ofs = vi-&gt;inode_isize - gotten;</div><div class='add'>+			memcpy((u8 *)&amp;copied + gotten, ptr, ofs);</div><div class='add'>+			die = &amp;copied;</div><div class='ctx'> 		}</div><div class='ctx'> 		vi-&gt;xattr_isize = erofs_xattr_ibody_size(die-&gt;i_xattr_icount);</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_mode = le16_to_cpu(die-&gt;i_mode);</div><div class='del'>-		iu = die-&gt;i_u;</div><div class='ctx'> 		i_uid_write(inode, le32_to_cpu(die-&gt;i_uid));</div><div class='ctx'> 		i_gid_write(inode, le32_to_cpu(die-&gt;i_gid));</div><div class='ctx'> 		set_nlink(inode, le32_to_cpu(die-&gt;i_nlink));</div><div class='del'>-		/* each extended inode has its own timestamp */</div><div class='del'>-		inode_set_ctime(inode, le64_to_cpu(die-&gt;i_mtime),</div><div class='add'>+		inode_set_mtime(inode, le64_to_cpu(die-&gt;i_mtime),</div><div class='ctx'> 				le32_to_cpu(die-&gt;i_mtime_nsec));</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_size = le64_to_cpu(die-&gt;i_size);</div><div class='del'>-		kfree(copied);</div><div class='del'>-		copied = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EROFS_INODE_LAYOUT_COMPACT:</div><div class='ctx'> 		vi-&gt;inode_isize = sizeof(struct erofs_inode_compact);</div><div class='del'>-		*ofs += vi-&gt;inode_isize;</div><div class='add'>+		ofs += vi-&gt;inode_isize;</div><div class='ctx'> 		vi-&gt;xattr_isize = erofs_xattr_ibody_size(dic-&gt;i_xattr_icount);</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_mode = le16_to_cpu(dic-&gt;i_mode);</div><div class='del'>-		iu = dic-&gt;i_u;</div><div class='add'>+		copied.i_u = dic-&gt;i_u;</div><div class='ctx'> 		i_uid_write(inode, le16_to_cpu(dic-&gt;i_uid));</div><div class='ctx'> 		i_gid_write(inode, le16_to_cpu(dic-&gt;i_gid));</div><div class='del'>-		set_nlink(inode, le16_to_cpu(dic-&gt;i_nlink));</div><div class='del'>-		/* use build time for compact inodes */</div><div class='del'>-		inode_set_ctime(inode, sbi-&gt;build_time, sbi-&gt;build_time_nsec);</div><div class='add'>+		if (!S_ISDIR(inode-&gt;i_mode) &amp;&amp;</div><div class='add'>+		    ((ifmt &gt;&gt; EROFS_I_NLINK_1_BIT) &amp; 1)) {</div><div class='add'>+			set_nlink(inode, 1);</div><div class='add'>+			copied.i_nb = dic-&gt;i_nb;</div><div class='add'>+		} else {</div><div class='add'>+			set_nlink(inode, le16_to_cpu(dic-&gt;i_nb.nlink));</div><div class='add'>+			copied.i_nb.startblk_hi = 0;</div><div class='add'>+			addrmask = BIT_ULL(32) - 1;</div><div class='add'>+		}</div><div class='add'>+		inode_set_mtime(inode, sbi-&gt;epoch + le32_to_cpu(dic-&gt;i_mtime),</div><div class='add'>+				sbi-&gt;fixed_nsec);</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_size = le32_to_cpu(dic-&gt;i_size);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -115,15 +132,32 @@ static void *erofs_read_inode(struct erofs_buf *buf,</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(inode-&gt;i_size &lt; 0)) {</div><div class='add'>+		erofs_err(sb, "negative i_size @ nid %llu", vi-&gt;nid);</div><div class='add'>+		err = -EFSCORRUPTED;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> 	switch (inode-&gt;i_mode &amp; S_IFMT) {</div><div class='del'>-	case S_IFREG:</div><div class='ctx'> 	case S_IFDIR:</div><div class='add'>+		vi-&gt;dot_omitted = (ifmt &gt;&gt; EROFS_I_DOT_OMITTED_BIT) &amp; 1;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case S_IFREG:</div><div class='ctx'> 	case S_IFLNK:</div><div class='del'>-		vi-&gt;raw_blkaddr = le32_to_cpu(iu.raw_blkaddr);</div><div class='add'>+		vi-&gt;startblk = le32_to_cpu(copied.i_u.startblk_lo) |</div><div class='add'>+			((u64)le16_to_cpu(copied.i_nb.startblk_hi) &lt;&lt; 32);</div><div class='add'>+		if (vi-&gt;datalayout == EROFS_INODE_FLAT_PLAIN &amp;&amp;</div><div class='add'>+		    !((vi-&gt;startblk ^ EROFS_NULL_ADDR) &amp; addrmask))</div><div class='add'>+			vi-&gt;startblk = EROFS_NULL_ADDR;</div><div class='add'>+</div><div class='add'>+		if(S_ISLNK(inode-&gt;i_mode)) {</div><div class='add'>+			err = erofs_fill_symlink(inode, ptr, ofs);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_out;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFCHR:</div><div class='ctx'> 	case S_IFBLK:</div><div class='del'>-		inode-&gt;i_rdev = new_decode_dev(le32_to_cpu(iu.rdev));</div><div class='add'>+		inode-&gt;i_rdev = new_decode_dev(le32_to_cpu(copied.i_u.rdev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFIFO:</div><div class='ctx'> 	case S_IFSOCK:</div><div class='hunk'>@@ -136,12 +170,15 @@ static void *erofs_read_inode(struct erofs_buf *buf,</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* total blocks for compressed files */</div><div class='del'>-	if (erofs_inode_is_data_compressed(vi-&gt;datalayout)) {</div><div class='del'>-		nblks = le32_to_cpu(iu.compressed_blocks);</div><div class='del'>-	} else if (vi-&gt;datalayout == EROFS_INODE_CHUNK_BASED) {</div><div class='add'>+	if (erofs_inode_is_data_compressed(vi-&gt;datalayout))</div><div class='add'>+		inode-&gt;i_blocks = le32_to_cpu(copied.i_u.blocks_lo) &lt;&lt;</div><div class='add'>+					(sb-&gt;s_blocksize_bits - 9);</div><div class='add'>+	else</div><div class='add'>+		inode-&gt;i_blocks = round_up(inode-&gt;i_size, sb-&gt;s_blocksize) &gt;&gt; 9;</div><div class='add'>+</div><div class='add'>+	if (vi-&gt;datalayout == EROFS_INODE_CHUNK_BASED) {</div><div class='ctx'> 		/* fill chunked inode summary info */</div><div class='del'>-		vi-&gt;chunkformat = le16_to_cpu(iu.c.format);</div><div class='add'>+		vi-&gt;chunkformat = le16_to_cpu(copied.i_u.c.format);</div><div class='ctx'> 		if (vi-&gt;chunkformat &amp; ~EROFS_CHUNK_FORMAT_ALL) {</div><div class='ctx'> 			erofs_err(sb, "unsupported chunk format %x of nid %llu",</div><div class='ctx'> 				  vi-&gt;chunkformat, vi-&gt;nid);</div><div class='hunk'>@@ -151,88 +188,33 @@ static void *erofs_read_inode(struct erofs_buf *buf,</div><div class='ctx'> 		vi-&gt;chunkbits = sb-&gt;s_blocksize_bits +</div><div class='ctx'> 			(vi-&gt;chunkformat &amp; EROFS_CHUNK_FORMAT_BLKBITS_MASK);</div><div class='ctx'> 	}</div><div class='del'>-	inode_set_mtime_to_ts(inode,</div><div class='del'>-			      inode_set_atime_to_ts(inode, inode_get_ctime(inode)));</div><div class='add'>+	inode_set_atime_to_ts(inode,</div><div class='add'>+			      inode_set_ctime_to_ts(inode, inode_get_mtime(inode)));</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_flags &amp;= ~S_DAX;</div><div class='ctx'> 	if (test_opt(&amp;sbi-&gt;opt, DAX_ALWAYS) &amp;&amp; S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='ctx'> 	    (vi-&gt;datalayout == EROFS_INODE_FLAT_PLAIN ||</div><div class='ctx'> 	     vi-&gt;datalayout == EROFS_INODE_CHUNK_BASED))</div><div class='ctx'> 		inode-&gt;i_flags |= S_DAX;</div><div class='del'>-</div><div class='del'>-	if (!nblks)</div><div class='del'>-		/* measure inode.i_blocks as generic filesystems */</div><div class='del'>-		inode-&gt;i_blocks = round_up(inode-&gt;i_size, sb-&gt;s_blocksize) &gt;&gt; 9;</div><div class='del'>-	else</div><div class='del'>-		inode-&gt;i_blocks = nblks &lt;&lt; (sb-&gt;s_blocksize_bits - 9);</div><div class='del'>-	return kaddr;</div><div class='del'>-</div><div class='ctx'> err_out:</div><div class='del'>-	DBG_BUGON(1);</div><div class='del'>-	kfree(copied);</div><div class='del'>-	erofs_put_metabuf(buf);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int erofs_fill_symlink(struct inode *inode, void *kaddr,</div><div class='del'>-			      unsigned int m_pofs)</div><div class='del'>-{</div><div class='del'>-	struct erofs_inode *vi = EROFS_I(inode);</div><div class='del'>-	unsigned int bsz = i_blocksize(inode);</div><div class='del'>-	char *lnk;</div><div class='del'>-</div><div class='del'>-	/* if it cannot be handled with fast symlink scheme */</div><div class='del'>-	if (vi-&gt;datalayout != EROFS_INODE_FLAT_INLINE ||</div><div class='del'>-	    inode-&gt;i_size &gt;= bsz || inode-&gt;i_size &lt; 0) {</div><div class='del'>-		inode-&gt;i_op = &amp;erofs_symlink_iops;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lnk = kmalloc(inode-&gt;i_size + 1, GFP_KERNEL);</div><div class='del'>-	if (!lnk)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	m_pofs += vi-&gt;xattr_isize;</div><div class='del'>-	/* inline symlink data shouldn't cross block boundary */</div><div class='del'>-	if (m_pofs + inode-&gt;i_size &gt; bsz) {</div><div class='del'>-		kfree(lnk);</div><div class='del'>-		erofs_err(inode-&gt;i_sb,</div><div class='del'>-			  "inline data cross block boundary @ nid %llu",</div><div class='del'>-			  vi-&gt;nid);</div><div class='del'>-		DBG_BUGON(1);</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='del'>-	}</div><div class='del'>-	memcpy(lnk, kaddr + m_pofs, inode-&gt;i_size);</div><div class='del'>-	lnk[inode-&gt;i_size] = '\0';</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_link = lnk;</div><div class='del'>-	inode-&gt;i_op = &amp;erofs_fast_symlink_iops;</div><div class='del'>-	return 0;</div><div class='add'>+	erofs_put_metabuf(&amp;buf);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_fill_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_inode *vi = EROFS_I(inode);</div><div class='del'>-	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-	void *kaddr;</div><div class='del'>-	unsigned int ofs;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	trace_erofs_fill_inode(inode);</div><div class='add'>+	err = erofs_read_inode(inode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	/* read inode base data from disk */</div><div class='del'>-	kaddr = erofs_read_inode(&amp;buf, inode, &amp;ofs);</div><div class='del'>-	if (IS_ERR(kaddr))</div><div class='del'>-		return PTR_ERR(kaddr);</div><div class='del'>-</div><div class='del'>-	/* setup the new inode */</div><div class='ctx'> 	switch (inode-&gt;i_mode &amp; S_IFMT) {</div><div class='ctx'> 	case S_IFREG:</div><div class='ctx'> 		inode-&gt;i_op = &amp;erofs_generic_iops;</div><div class='del'>-		if (erofs_inode_is_data_compressed(vi-&gt;datalayout))</div><div class='del'>-			inode-&gt;i_fop = &amp;generic_ro_fops;</div><div class='del'>-		else</div><div class='del'>-			inode-&gt;i_fop = &amp;erofs_file_fops;</div><div class='add'>+		inode-&gt;i_fop = &amp;erofs_file_fops;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFDIR:</div><div class='ctx'> 		inode-&gt;i_op = &amp;erofs_dir_iops;</div><div class='hunk'>@@ -240,46 +222,40 @@ static int erofs_fill_inode(struct inode *inode)</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFLNK:</div><div class='del'>-		err = erofs_fill_symlink(inode, kaddr, ofs);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		if (inode-&gt;i_link)</div><div class='add'>+			inode-&gt;i_op = &amp;erofs_fast_symlink_iops;</div><div class='add'>+		else</div><div class='add'>+			inode-&gt;i_op = &amp;erofs_symlink_iops;</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 		break;</div><div class='del'>-	case S_IFCHR:</div><div class='del'>-	case S_IFBLK:</div><div class='del'>-	case S_IFIFO:</div><div class='del'>-	case S_IFSOCK:</div><div class='add'>+	default:</div><div class='ctx'> 		inode-&gt;i_op = &amp;erofs_generic_iops;</div><div class='ctx'> 		init_special_inode(inode, inode-&gt;i_mode, inode-&gt;i_rdev);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	default:</div><div class='del'>-		err = -EFSCORRUPTED;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mapping_set_large_folios(inode-&gt;i_mapping);</div><div class='ctx'> 	if (erofs_inode_is_data_compressed(vi-&gt;datalayout)) {</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-		if (!erofs_is_fscache_mode(inode-&gt;i_sb)) {</div><div class='del'>-			DO_ONCE_LITE_IF(inode-&gt;i_sb-&gt;s_blocksize != PAGE_SIZE,</div><div class='del'>-				  erofs_info, inode-&gt;i_sb,</div><div class='del'>-				  "EXPERIMENTAL EROFS subpage compressed block support in use. Use at your own risk!");</div><div class='del'>-			inode-&gt;i_mapping-&gt;a_ops = &amp;z_erofs_aops;</div><div class='del'>-			err = 0;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='add'>+		DO_ONCE_LITE_IF(inode-&gt;i_blkbits != PAGE_SHIFT,</div><div class='add'>+			  erofs_info, inode-&gt;i_sb,</div><div class='add'>+			  "EXPERIMENTAL EROFS subpage compressed block support in use. Use at your own risk!");</div><div class='add'>+		inode-&gt;i_mapping-&gt;a_ops = &amp;z_erofs_aops;</div><div class='add'>+#else</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-	inode-&gt;i_mapping-&gt;a_ops = &amp;erofs_raw_access_aops;</div><div class='del'>-	mapping_set_large_folios(inode-&gt;i_mapping);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		inode-&gt;i_mapping-&gt;a_ops = &amp;erofs_aops;</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ONDEMAND</div><div class='del'>-	if (erofs_is_fscache_mode(inode-&gt;i_sb))</div><div class='del'>-		inode-&gt;i_mapping-&gt;a_ops = &amp;erofs_fscache_access_aops;</div><div class='add'>+		if (erofs_is_fscache_mode(inode-&gt;i_sb))</div><div class='add'>+			inode-&gt;i_mapping-&gt;a_ops = &amp;erofs_fscache_access_aops;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_EROFS_FS_BACKED_BY_FILE</div><div class='add'>+		if (erofs_is_fileio_mode(EROFS_SB(inode-&gt;i_sb)))</div><div class='add'>+			inode-&gt;i_mapping-&gt;a_ops = &amp;erofs_fileio_aops;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	erofs_put_metabuf(&amp;buf);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -287,13 +263,13 @@ out_unlock:</div><div class='ctx'>  * ino_t is 32-bits on 32-bit arch. We have to squash the 64-bit value down</div><div class='ctx'>  * so that it will fit.</div><div class='ctx'>  */</div><div class='del'>-static ino_t erofs_squash_ino(erofs_nid_t nid)</div><div class='add'>+static ino_t erofs_squash_ino(struct super_block *sb, erofs_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	ino_t ino = (ino_t)nid;</div><div class='add'>+	u64 ino64 = erofs_nid_to_ino64(EROFS_SB(sb), nid);</div><div class='ctx'> </div><div class='ctx'> 	if (sizeof(ino_t) &lt; sizeof(erofs_nid_t))</div><div class='del'>-		ino ^= nid &gt;&gt; (sizeof(erofs_nid_t) - sizeof(ino_t)) * 8;</div><div class='del'>-	return ino;</div><div class='add'>+		ino64 ^= ino64 &gt;&gt; (sizeof(erofs_nid_t) - sizeof(ino_t)) * 8;</div><div class='add'>+	return (ino_t)ino64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_iget5_eq(struct inode *inode, void *opaque)</div><div class='hunk'>@@ -305,7 +281,7 @@ static int erofs_iget5_set(struct inode *inode, void *opaque)</div><div class='ctx'> {</div><div class='ctx'> 	const erofs_nid_t nid = *(erofs_nid_t *)opaque;</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_ino = erofs_squash_ino(nid);</div><div class='add'>+	inode-&gt;i_ino = erofs_squash_ino(inode-&gt;i_sb, nid);</div><div class='ctx'> 	EROFS_I(inode)-&gt;nid = nid;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -314,12 +290,12 @@ struct inode *erofs_iget(struct super_block *sb, erofs_nid_t nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	inode = iget5_locked(sb, erofs_squash_ino(nid), erofs_iget5_eq,</div><div class='add'>+	inode = iget5_locked(sb, erofs_squash_ino(sb, nid), erofs_iget5_eq,</div><div class='ctx'> 			     erofs_iget5_set, &amp;nid);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		int err = erofs_fill_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -336,18 +312,67 @@ int erofs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		  unsigned int query_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *const inode = d_inode(path-&gt;dentry);</div><div class='add'>+	struct block_device *bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='add'>+	bool compressed =</div><div class='add'>+		erofs_inode_is_data_compressed(EROFS_I(inode)-&gt;datalayout);</div><div class='ctx'> </div><div class='del'>-	if (erofs_inode_is_data_compressed(EROFS_I(inode)-&gt;datalayout))</div><div class='add'>+	if (compressed)</div><div class='ctx'> 		stat-&gt;attributes |= STATX_ATTR_COMPRESSED;</div><div class='del'>-</div><div class='ctx'> 	stat-&gt;attributes |= STATX_ATTR_IMMUTABLE;</div><div class='ctx'> 	stat-&gt;attributes_mask |= (STATX_ATTR_COMPRESSED |</div><div class='ctx'> 				  STATX_ATTR_IMMUTABLE);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Return the DIO alignment restrictions if requested.</div><div class='add'>+	 *</div><div class='add'>+	 * In EROFS, STATX_DIOALIGN is only supported in bdev-based mode</div><div class='add'>+	 * and uncompressed inodes, otherwise we report no DIO support.</div><div class='add'>+	 */</div><div class='add'>+	if ((request_mask &amp; STATX_DIOALIGN) &amp;&amp; S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		stat-&gt;result_mask |= STATX_DIOALIGN;</div><div class='add'>+		if (bdev &amp;&amp; !compressed) {</div><div class='add'>+			stat-&gt;dio_mem_align = bdev_dma_alignment(bdev) + 1;</div><div class='add'>+			stat-&gt;dio_offset_align = bdev_logical_block_size(bdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	generic_fillattr(idmap, request_mask, inode, stat);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int erofs_ioctl_get_volume_label(struct inode *inode, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_I_SB(inode);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!sbi-&gt;volume_name)</div><div class='add'>+		ret = clear_user(arg, 1);</div><div class='add'>+	else</div><div class='add'>+		ret = copy_to_user(arg, sbi-&gt;volume_name,</div><div class='add'>+				   strlen(sbi-&gt;volume_name));</div><div class='add'>+	return ret ? -EFAULT : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long erofs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(filp);</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case FS_IOC_GETFSLABEL:</div><div class='add'>+		return erofs_ioctl_get_volume_label(inode, argp);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+long erofs_compat_ioctl(struct file *filp, unsigned int cmd,</div><div class='add'>+			unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return erofs_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> const struct inode_operations erofs_generic_iops = {</div><div class='ctx'> 	.getattr = erofs_getattr,</div><div class='ctx'> 	.listxattr = erofs_listxattr,</div><div class='head'>diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h<br/>index 0f0706325b7b..f7f622836198 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/internal.h</a></div><div class='hunk'>@@ -20,18 +20,12 @@</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include "erofs_fs.h"</div><div class='ctx'> </div><div class='del'>-/* redefine pr_fmt "erofs: " */</div><div class='del'>-#undef pr_fmt</div><div class='del'>-#define pr_fmt(fmt) "erofs: " fmt</div><div class='del'>-</div><div class='del'>-__printf(3, 4) void _erofs_err(struct super_block *sb,</div><div class='del'>-			       const char *function, const char *fmt, ...);</div><div class='add'>+__printf(2, 3) void _erofs_printk(struct super_block *sb, const char *fmt, ...);</div><div class='ctx'> #define erofs_err(sb, fmt, ...)	\</div><div class='del'>-	_erofs_err(sb, __func__, fmt "\n", ##__VA_ARGS__)</div><div class='del'>-__printf(3, 4) void _erofs_info(struct super_block *sb,</div><div class='del'>-			       const char *function, const char *fmt, ...);</div><div class='add'>+	_erofs_printk(sb, KERN_ERR fmt "\n", ##__VA_ARGS__)</div><div class='ctx'> #define erofs_info(sb, fmt, ...) \</div><div class='del'>-	_erofs_info(sb, __func__, fmt "\n", ##__VA_ARGS__)</div><div class='add'>+	_erofs_printk(sb, KERN_INFO fmt "\n", ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_DEBUG</div><div class='ctx'> #define DBG_BUGON               BUG_ON</div><div class='ctx'> #else</div><div class='hunk'>@@ -43,18 +37,17 @@ __printf(3, 4) void _erofs_info(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> typedef u64 erofs_nid_t;</div><div class='ctx'> typedef u64 erofs_off_t;</div><div class='del'>-/* data type for filesystem-wide blocks number */</div><div class='del'>-typedef u32 erofs_blk_t;</div><div class='add'>+typedef u64 erofs_blk_t;</div><div class='ctx'> </div><div class='ctx'> struct erofs_device_info {</div><div class='ctx'> 	char *path;</div><div class='ctx'> 	struct erofs_fscache *fscache;</div><div class='del'>-	struct file *bdev_file;</div><div class='add'>+	struct file *file;</div><div class='ctx'> 	struct dax_device *dax_dev;</div><div class='del'>-	u64 dax_part_off;</div><div class='add'>+	u64 fsoff, dax_part_off;</div><div class='ctx'> </div><div class='del'>-	u32 blocks;</div><div class='del'>-	u32 mapped_blkaddr;</div><div class='add'>+	erofs_blk_t blocks;</div><div class='add'>+	erofs_blk_t uniaddr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -64,15 +57,12 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct erofs_mount_opts {</div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP</div><div class='ctx'> 	/* current strategy of how to use managed cache */</div><div class='ctx'> 	unsigned char cache_strategy;</div><div class='ctx'> 	/* strategy of sync decompression (0 - auto, 1 - force on, 2 - force off) */</div><div class='ctx'> 	unsigned int sync_decompress;</div><div class='del'>-</div><div class='ctx'> 	/* threshold for decompression synchronously */</div><div class='ctx'> 	unsigned int max_sync_decompress_pages;</div><div class='del'>-#endif</div><div class='ctx'> 	unsigned int mount_opt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -84,13 +74,6 @@ struct erofs_dev_context {</div><div class='ctx'> 	bool flatdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct erofs_fs_context {</div><div class='del'>-	struct erofs_mount_opts opt;</div><div class='del'>-	struct erofs_dev_context *devs;</div><div class='del'>-	char *fsid;</div><div class='del'>-	char *domain_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* all filesystem-wide lz4 configurations */</div><div class='ctx'> struct erofs_sb_lz4_info {</div><div class='ctx'> 	/* # of pages needed for EROFS lz4 rolling decompression */</div><div class='hunk'>@@ -123,6 +106,7 @@ struct erofs_xattr_prefix_item {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct erofs_sb_info {</div><div class='add'>+	struct erofs_device_info dif0;</div><div class='ctx'> 	struct erofs_mount_opts opt;	/* options */</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='ctx'> 	/* list for all registered superblocks, mainly for shrinker */</div><div class='hunk'>@@ -141,11 +125,9 @@ struct erofs_sb_info {</div><div class='ctx'> 	struct erofs_sb_lz4_info lz4;</div><div class='ctx'> #endif	/* CONFIG_EROFS_FS_ZIP */</div><div class='ctx'> 	struct inode *packed_inode;</div><div class='add'>+	struct inode *metabox_inode;</div><div class='ctx'> 	struct erofs_dev_context *devs;</div><div class='del'>-	struct dax_device *dax_dev;</div><div class='del'>-	u64 dax_part_off;</div><div class='ctx'> 	u64 total_blocks;</div><div class='del'>-	u32 primarydevice_blocks;</div><div class='ctx'> </div><div class='ctx'> 	u32 meta_blkaddr;</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_XATTR</div><div class='hunk'>@@ -161,27 +143,27 @@ struct erofs_sb_info {</div><div class='ctx'> 	unsigned char blkszbits;	/* filesystem block size in bit shift */</div><div class='ctx'> </div><div class='ctx'> 	u32 sb_size;			/* total superblock size */</div><div class='del'>-	u32 build_time_nsec;</div><div class='del'>-	u64 build_time;</div><div class='add'>+	u32 fixed_nsec;</div><div class='add'>+	s64 epoch;</div><div class='ctx'> </div><div class='ctx'> 	/* what we really care is nid, rather than ino.. */</div><div class='ctx'> 	erofs_nid_t root_nid;</div><div class='ctx'> 	erofs_nid_t packed_nid;</div><div class='add'>+	erofs_nid_t metabox_nid;</div><div class='ctx'> 	/* used for statfs, f_files - f_favail */</div><div class='ctx'> 	u64 inos;</div><div class='ctx'> </div><div class='del'>-	u8 uuid[16];                    /* 128-bit uuid for volume */</div><div class='del'>-	u8 volume_name[16];             /* volume name */</div><div class='add'>+	char *volume_name;</div><div class='ctx'> 	u32 feature_compat;</div><div class='ctx'> 	u32 feature_incompat;</div><div class='ctx'> </div><div class='ctx'> 	/* sysfs support */</div><div class='ctx'> 	struct kobject s_kobj;		/* /sys/fs/erofs/&lt;devname&gt; */</div><div class='ctx'> 	struct completion s_kobj_unregister;</div><div class='add'>+	erofs_off_t dir_ra_bytes;</div><div class='ctx'> </div><div class='ctx'> 	/* fscache support */</div><div class='ctx'> 	struct fscache_volume *volume;</div><div class='del'>-	struct erofs_fscache *s_fscache;</div><div class='ctx'> 	struct erofs_domain *domain;</div><div class='ctx'> 	char *fsid;</div><div class='ctx'> 	char *domain_id;</div><div class='hunk'>@@ -195,14 +177,21 @@ struct erofs_sb_info {</div><div class='ctx'> #define EROFS_MOUNT_POSIX_ACL		0x00000020</div><div class='ctx'> #define EROFS_MOUNT_DAX_ALWAYS		0x00000040</div><div class='ctx'> #define EROFS_MOUNT_DAX_NEVER		0x00000080</div><div class='add'>+#define EROFS_MOUNT_DIRECT_IO		0x00000100</div><div class='ctx'> </div><div class='ctx'> #define clear_opt(opt, option)	((opt)-&gt;mount_opt &amp;= ~EROFS_MOUNT_##option)</div><div class='ctx'> #define set_opt(opt, option)	((opt)-&gt;mount_opt |= EROFS_MOUNT_##option)</div><div class='ctx'> #define test_opt(opt, option)	((opt)-&gt;mount_opt &amp; EROFS_MOUNT_##option)</div><div class='ctx'> </div><div class='add'>+static inline bool erofs_is_fileio_mode(struct erofs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_EROFS_FS_BACKED_BY_FILE) &amp;&amp; sbi-&gt;dif0.file;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool erofs_is_fscache_mode(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &amp;&amp; !sb-&gt;s_bdev;</div><div class='add'>+	return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &amp;&amp;</div><div class='add'>+			!erofs_is_fileio_mode(EROFS_SB(sb)) &amp;&amp; !sb-&gt;s_bdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -211,27 +200,17 @@ enum {</div><div class='ctx'> 	EROFS_ZIP_CACHE_READAROUND</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* basic unit of the workstation of a super_block */</div><div class='del'>-struct erofs_workgroup {</div><div class='del'>-	pgoff_t index;</div><div class='del'>-	struct lockref lockref;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum erofs_kmap_type {</div><div class='del'>-	EROFS_NO_KMAP,		/* don't map the buffer */</div><div class='del'>-	EROFS_KMAP,		/* use kmap_local_page() to map the buffer */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct erofs_buf {</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct address_space *mapping;</div><div class='add'>+	struct file *file;</div><div class='add'>+	u64 off;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	void *base;</div><div class='del'>-	enum erofs_kmap_type kmap_type;</div><div class='ctx'> };</div><div class='ctx'> #define __EROFS_BUF_INITIALIZER	((struct erofs_buf){ .page = NULL })</div><div class='ctx'> </div><div class='del'>-#define erofs_blknr(sb, addr)	((addr) &gt;&gt; (sb)-&gt;s_blocksize_bits)</div><div class='del'>-#define erofs_blkoff(sb, addr)	((addr) &amp; ((sb)-&gt;s_blocksize - 1))</div><div class='add'>+#define erofs_blknr(sb, pos)	((erofs_blk_t)((pos) &gt;&gt; (sb)-&gt;s_blocksize_bits))</div><div class='add'>+#define erofs_blkoff(sb, pos)	((pos) &amp; ((sb)-&gt;s_blocksize - 1))</div><div class='ctx'> #define erofs_pos(sb, blk)	((erofs_off_t)(blk) &lt;&lt; (sb)-&gt;s_blocksize_bits)</div><div class='ctx'> #define erofs_iblks(i)	(round_up((i)-&gt;i_size, i_blocksize(i)) &gt;&gt; (i)-&gt;i_blkbits)</div><div class='ctx'> </div><div class='hunk'>@@ -251,8 +230,29 @@ EROFS_FEATURE_FUNCS(ztailpacking, incompat, INCOMPAT_ZTAILPACKING)</div><div class='ctx'> EROFS_FEATURE_FUNCS(fragments, incompat, INCOMPAT_FRAGMENTS)</div><div class='ctx'> EROFS_FEATURE_FUNCS(dedupe, incompat, INCOMPAT_DEDUPE)</div><div class='ctx'> EROFS_FEATURE_FUNCS(xattr_prefixes, incompat, INCOMPAT_XATTR_PREFIXES)</div><div class='add'>+EROFS_FEATURE_FUNCS(48bit, incompat, INCOMPAT_48BIT)</div><div class='add'>+EROFS_FEATURE_FUNCS(metabox, incompat, INCOMPAT_METABOX)</div><div class='ctx'> EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM)</div><div class='ctx'> EROFS_FEATURE_FUNCS(xattr_filter, compat, COMPAT_XATTR_FILTER)</div><div class='add'>+EROFS_FEATURE_FUNCS(shared_ea_in_metabox, compat, COMPAT_SHARED_EA_IN_METABOX)</div><div class='add'>+EROFS_FEATURE_FUNCS(plain_xattr_pfx, compat, COMPAT_PLAIN_XATTR_PFX)</div><div class='add'>+</div><div class='add'>+static inline u64 erofs_nid_to_ino64(struct erofs_sb_info *sbi, erofs_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (!erofs_sb_has_metabox(sbi))</div><div class='add'>+		return nid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When metadata compression is enabled, avoid generating excessively</div><div class='add'>+	 * large inode numbers for metadata-compressed inodes.  Shift NIDs in</div><div class='add'>+	 * the 31-62 bit range left by one and move the metabox flag to bit 31.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: on-disk NIDs remain unchanged as they are primarily used for</div><div class='add'>+	 * compatibility with non-LFS 32-bit applications.</div><div class='add'>+	 */</div><div class='add'>+	return ((nid &lt;&lt; 1) &amp; GENMASK_ULL(63, 32)) | (nid &amp; GENMASK(30, 0)) |</div><div class='add'>+		((nid &gt;&gt; EROFS_DIRENT_NID_METABOX_BIT) &lt;&lt; 31);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* atomic flag definitions */</div><div class='ctx'> #define EROFS_I_EA_INITED_BIT	0</div><div class='hunk'>@@ -262,6 +262,9 @@ EROFS_FEATURE_FUNCS(xattr_filter, compat, COMPAT_XATTR_FILTER)</div><div class='ctx'> #define EROFS_I_BL_XATTR_BIT	(BITS_PER_LONG - 1)</div><div class='ctx'> #define EROFS_I_BL_Z_BIT	(BITS_PER_LONG - 2)</div><div class='ctx'> </div><div class='add'>+/* default readahead size of directories */</div><div class='add'>+#define EROFS_DIR_RA_BYTES	16384</div><div class='add'>+</div><div class='ctx'> struct erofs_inode {</div><div class='ctx'> 	erofs_nid_t nid;</div><div class='ctx'> </div><div class='hunk'>@@ -270,6 +273,7 @@ struct erofs_inode {</div><div class='ctx'> </div><div class='ctx'> 	unsigned char datalayout;</div><div class='ctx'> 	unsigned char inode_isize;</div><div class='add'>+	bool dot_omitted;</div><div class='ctx'> 	unsigned int xattr_isize;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int xattr_name_filter;</div><div class='hunk'>@@ -277,7 +281,7 @@ struct erofs_inode {</div><div class='ctx'> 	unsigned int *xattr_shared_xattrs;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='del'>-		erofs_blk_t raw_blkaddr;</div><div class='add'>+		erofs_blk_t startblk;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			unsigned short	chunkformat;</div><div class='ctx'> 			unsigned char	chunkbits;</div><div class='hunk'>@@ -286,15 +290,13 @@ struct erofs_inode {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			unsigned short z_advise;</div><div class='ctx'> 			unsigned char  z_algorithmtype[2];</div><div class='del'>-			unsigned char  z_logical_clusterbits;</div><div class='del'>-			unsigned long  z_tailextent_headlcn;</div><div class='add'>+			unsigned char  z_lclusterbits;</div><div class='ctx'> 			union {</div><div class='del'>-				struct {</div><div class='del'>-					erofs_off_t    z_idataoff;</div><div class='del'>-					unsigned short z_idata_size;</div><div class='del'>-				};</div><div class='del'>-				erofs_off_t z_fragmentoff;</div><div class='add'>+				u64    z_tailextent_headlcn;</div><div class='add'>+				u64    z_extents;</div><div class='ctx'> 			};</div><div class='add'>+			erofs_off_t    z_fragmentoff;</div><div class='add'>+			unsigned short z_idata_size;</div><div class='ctx'> 		};</div><div class='ctx'> #endif	/* CONFIG_EROFS_FS_ZIP */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -304,12 +306,20 @@ struct erofs_inode {</div><div class='ctx'> </div><div class='ctx'> #define EROFS_I(ptr)	container_of(ptr, struct erofs_inode, vfs_inode)</div><div class='ctx'> </div><div class='add'>+static inline bool erofs_inode_in_metabox(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return EROFS_I(inode)-&gt;nid &amp; BIT_ULL(EROFS_DIRENT_NID_METABOX_BIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline erofs_off_t erofs_iloc(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_I_SB(inode);</div><div class='add'>+	erofs_nid_t nid_lo = EROFS_I(inode)-&gt;nid &amp; EROFS_DIRENT_NID_MASK;</div><div class='ctx'> </div><div class='add'>+	if (erofs_inode_in_metabox(inode))</div><div class='add'>+		return nid_lo &lt;&lt; sbi-&gt;islotbits;</div><div class='ctx'> 	return erofs_pos(inode-&gt;i_sb, sbi-&gt;meta_blkaddr) +</div><div class='del'>-		(EROFS_I(inode)-&gt;nid &lt;&lt; sbi-&gt;islotbits);</div><div class='add'>+		(nid_lo &lt;&lt; sbi-&gt;islotbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int erofs_inode_version(unsigned int ifmt)</div><div class='hunk'>@@ -322,17 +332,13 @@ static inline unsigned int erofs_inode_datalayout(unsigned int ifmt)</div><div class='ctx'> 	return (ifmt &gt;&gt; EROFS_I_DATALAYOUT_BIT) &amp; EROFS_I_DATALAYOUT_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Different from grab_cache_page_nowait(), reclaiming is never triggered</div><div class='del'>- * when allocating new pages.</div><div class='del'>- */</div><div class='del'>-static inline</div><div class='del'>-struct page *erofs_grab_cache_page_nowait(struct address_space *mapping,</div><div class='del'>-					  pgoff_t index)</div><div class='add'>+/* reclaiming is never triggered when allocating new folios. */</div><div class='add'>+static inline struct folio *erofs_grab_folio_nowait(struct address_space *as,</div><div class='add'>+						    pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	return pagecache_get_page(mapping, index,</div><div class='add'>+	return __filemap_get_folio(as, index,</div><div class='ctx'> 			FGP_LOCK|FGP_CREAT|FGP_NOFS|FGP_NOWAIT,</div><div class='del'>-			readahead_gfp_mask(mapping) &amp; ~__GFP_RECLAIM);</div><div class='add'>+			readahead_gfp_mask(as) &amp; ~__GFP_RECLAIM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Has a disk mapping */</div><div class='hunk'>@@ -344,10 +350,12 @@ struct page *erofs_grab_cache_page_nowait(struct address_space *mapping,</div><div class='ctx'> /* The length of extent is full */</div><div class='ctx'> #define EROFS_MAP_FULL_MAPPED	0x0008</div><div class='ctx'> /* Located in the special packed inode */</div><div class='del'>-#define EROFS_MAP_FRAGMENT	0x0010</div><div class='add'>+#define __EROFS_MAP_FRAGMENT	0x0010</div><div class='ctx'> /* The extent refers to partial decompressed data */</div><div class='ctx'> #define EROFS_MAP_PARTIAL_REF	0x0020</div><div class='ctx'> </div><div class='add'>+#define EROFS_MAP_FRAGMENT	(EROFS_MAP_MAPPED | __EROFS_MAP_FRAGMENT)</div><div class='add'>+</div><div class='ctx'> struct erofs_map_blocks {</div><div class='ctx'> 	struct erofs_buf buf;</div><div class='ctx'> </div><div class='hunk'>@@ -376,19 +384,18 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct erofs_map_dev {</div><div class='del'>-	struct erofs_fscache *m_fscache;</div><div class='add'>+	struct super_block *m_sb;</div><div class='add'>+	struct erofs_device_info *m_dif;</div><div class='ctx'> 	struct block_device *m_bdev;</div><div class='del'>-	struct dax_device *m_daxdev;</div><div class='del'>-	u64 m_dax_part_off;</div><div class='ctx'> </div><div class='ctx'> 	erofs_off_t m_pa;</div><div class='ctx'> 	unsigned int m_deviceid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct file_system_type erofs_fs_type;</div><div class='ctx'> extern const struct super_operations erofs_sops;</div><div class='ctx'> </div><div class='del'>-extern const struct address_space_operations erofs_raw_access_aops;</div><div class='add'>+extern const struct address_space_operations erofs_aops;</div><div class='add'>+extern const struct address_space_operations erofs_fileio_aops;</div><div class='ctx'> extern const struct address_space_operations z_erofs_aops;</div><div class='ctx'> extern const struct address_space_operations erofs_fscache_access_aops;</div><div class='ctx'> </div><div class='hunk'>@@ -410,15 +417,18 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,</div><div class='ctx'> 			  erofs_off_t *offset, int *lengthp);</div><div class='ctx'> void erofs_unmap_metabuf(struct erofs_buf *buf);</div><div class='ctx'> void erofs_put_metabuf(struct erofs_buf *buf);</div><div class='del'>-void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,</div><div class='del'>-		  enum erofs_kmap_type type);</div><div class='del'>-void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb);</div><div class='add'>+void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap);</div><div class='add'>+int erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb,</div><div class='add'>+		       bool in_metabox);</div><div class='ctx'> void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,</div><div class='del'>-			 erofs_blk_t blkaddr, enum erofs_kmap_type type);</div><div class='add'>+			 erofs_off_t offset, bool in_metabox);</div><div class='ctx'> int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);</div><div class='ctx'> int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		 u64 start, u64 len);</div><div class='ctx'> int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map);</div><div class='add'>+void erofs_onlinefolio_init(struct folio *folio);</div><div class='add'>+void erofs_onlinefolio_split(struct folio *folio);</div><div class='add'>+void erofs_onlinefolio_end(struct folio *folio, int err, bool dirty);</div><div class='ctx'> struct inode *erofs_iget(struct super_block *sb, erofs_nid_t nid);</div><div class='ctx'> int erofs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		  struct kstat *stat, u32 request_mask,</div><div class='hunk'>@@ -446,7 +456,11 @@ void erofs_unregister_sysfs(struct super_block *sb);</div><div class='ctx'> int __init erofs_init_sysfs(void);</div><div class='ctx'> void erofs_exit_sysfs(void);</div><div class='ctx'> </div><div class='del'>-struct page *erofs_allocpage(struct page **pagepool, gfp_t gfp);</div><div class='add'>+struct page *__erofs_allocpage(struct page **pagepool, gfp_t gfp, bool tryrsv);</div><div class='add'>+static inline struct page *erofs_allocpage(struct page **pagepool, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return __erofs_allocpage(pagepool, gfp, false);</div><div class='add'>+}</div><div class='ctx'> static inline void erofs_pagepool_add(struct page **pagepool, struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	set_page_private(page, (unsigned long)*pagepool);</div><div class='hunk'>@@ -455,56 +469,43 @@ static inline void erofs_pagepool_add(struct page **pagepool, struct page *page)</div><div class='ctx'> void erofs_release_pages(struct page **pagepool);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-void erofs_workgroup_put(struct erofs_workgroup *grp);</div><div class='del'>-struct erofs_workgroup *erofs_find_workgroup(struct super_block *sb,</div><div class='del'>-					     pgoff_t index);</div><div class='del'>-struct erofs_workgroup *erofs_insert_workgroup(struct super_block *sb,</div><div class='del'>-					       struct erofs_workgroup *grp);</div><div class='del'>-void erofs_workgroup_free_rcu(struct erofs_workgroup *grp);</div><div class='add'>+#define MNGD_MAPPING(sbi)	((sbi)-&gt;managed_cache-&gt;i_mapping)</div><div class='add'>+</div><div class='add'>+extern atomic_long_t erofs_global_shrink_cnt;</div><div class='ctx'> void erofs_shrinker_register(struct super_block *sb);</div><div class='ctx'> void erofs_shrinker_unregister(struct super_block *sb);</div><div class='ctx'> int __init erofs_init_shrinker(void);</div><div class='ctx'> void erofs_exit_shrinker(void);</div><div class='del'>-int __init z_erofs_init_zip_subsystem(void);</div><div class='del'>-void z_erofs_exit_zip_subsystem(void);</div><div class='del'>-int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi,</div><div class='del'>-				       struct erofs_workgroup *egrp);</div><div class='add'>+int __init z_erofs_init_subsystem(void);</div><div class='add'>+void z_erofs_exit_subsystem(void);</div><div class='add'>+int z_erofs_init_super(struct super_block *sb);</div><div class='add'>+unsigned long z_erofs_shrink_scan(struct erofs_sb_info *sbi,</div><div class='add'>+				  unsigned long nr_shrink);</div><div class='ctx'> int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map,</div><div class='ctx'> 			    int flags);</div><div class='del'>-void *erofs_get_pcpubuf(unsigned int requiredpages);</div><div class='del'>-void erofs_put_pcpubuf(void *ptr);</div><div class='del'>-int erofs_pcpubuf_growsize(unsigned int nrpages);</div><div class='del'>-void __init erofs_pcpubuf_init(void);</div><div class='del'>-void erofs_pcpubuf_exit(void);</div><div class='del'>-int erofs_init_managed_cache(struct super_block *sb);</div><div class='add'>+void *z_erofs_get_gbuf(unsigned int requiredpages);</div><div class='add'>+void z_erofs_put_gbuf(void *ptr);</div><div class='add'>+int z_erofs_gbuf_growsize(unsigned int nrpages);</div><div class='add'>+int __init z_erofs_gbuf_init(void);</div><div class='add'>+void z_erofs_gbuf_exit(void);</div><div class='ctx'> int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb);</div><div class='ctx'> #else</div><div class='ctx'> static inline void erofs_shrinker_register(struct super_block *sb) {}</div><div class='ctx'> static inline void erofs_shrinker_unregister(struct super_block *sb) {}</div><div class='ctx'> static inline int erofs_init_shrinker(void) { return 0; }</div><div class='ctx'> static inline void erofs_exit_shrinker(void) {}</div><div class='del'>-static inline int z_erofs_init_zip_subsystem(void) { return 0; }</div><div class='del'>-static inline void z_erofs_exit_zip_subsystem(void) {}</div><div class='del'>-static inline void erofs_pcpubuf_init(void) {}</div><div class='del'>-static inline void erofs_pcpubuf_exit(void) {}</div><div class='del'>-static inline int erofs_init_managed_cache(struct super_block *sb) { return 0; }</div><div class='add'>+static inline int z_erofs_init_subsystem(void) { return 0; }</div><div class='add'>+static inline void z_erofs_exit_subsystem(void) {}</div><div class='add'>+static inline int z_erofs_init_super(struct super_block *sb) { return 0; }</div><div class='ctx'> #endif	/* !CONFIG_EROFS_FS_ZIP */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP_LZMA</div><div class='del'>-int __init z_erofs_lzma_init(void);</div><div class='del'>-void z_erofs_lzma_exit(void);</div><div class='add'>+#ifdef CONFIG_EROFS_FS_BACKED_BY_FILE</div><div class='add'>+struct bio *erofs_fileio_bio_alloc(struct erofs_map_dev *mdev);</div><div class='add'>+void erofs_fileio_submit_bio(struct bio *bio);</div><div class='ctx'> #else</div><div class='del'>-static inline int z_erofs_lzma_init(void) { return 0; }</div><div class='del'>-static inline int z_erofs_lzma_exit(void) { return 0; }</div><div class='del'>-#endif	/* !CONFIG_EROFS_FS_ZIP_LZMA */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP_DEFLATE</div><div class='del'>-int __init z_erofs_deflate_init(void);</div><div class='del'>-void z_erofs_deflate_exit(void);</div><div class='del'>-#else</div><div class='del'>-static inline int z_erofs_deflate_init(void) { return 0; }</div><div class='del'>-static inline int z_erofs_deflate_exit(void) { return 0; }</div><div class='del'>-#endif	/* !CONFIG_EROFS_FS_ZIP_DEFLATE */</div><div class='add'>+static inline struct bio *erofs_fileio_bio_alloc(struct erofs_map_dev *mdev) { return NULL; }</div><div class='add'>+static inline void erofs_fileio_submit_bio(struct bio *bio) {}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ONDEMAND</div><div class='ctx'> int erofs_fscache_register_fs(struct super_block *sb);</div><div class='hunk'>@@ -513,6 +514,8 @@ void erofs_fscache_unregister_fs(struct super_block *sb);</div><div class='ctx'> struct erofs_fscache *erofs_fscache_register_cookie(struct super_block *sb,</div><div class='ctx'> 					char *name, unsigned int flags);</div><div class='ctx'> void erofs_fscache_unregister_cookie(struct erofs_fscache *fscache);</div><div class='add'>+struct bio *erofs_fscache_bio_alloc(struct erofs_map_dev *mdev);</div><div class='add'>+void erofs_fscache_submit_bio(struct bio *bio);</div><div class='ctx'> #else</div><div class='ctx'> static inline int erofs_fscache_register_fs(struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -530,8 +533,14 @@ struct erofs_fscache *erofs_fscache_register_cookie(struct super_block *sb,</div><div class='ctx'> static inline void erofs_fscache_unregister_cookie(struct erofs_fscache *fscache)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline struct bio *erofs_fscache_bio_alloc(struct erofs_map_dev *mdev) { return NULL; }</div><div class='add'>+static inline void erofs_fscache_submit_bio(struct bio *bio) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+long erofs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);</div><div class='add'>+long erofs_compat_ioctl(struct file *filp, unsigned int cmd,</div><div class='add'>+			unsigned long arg);</div><div class='add'>+</div><div class='ctx'> #define EFSCORRUPTED    EUCLEAN         /* Filesystem is corrupted */</div><div class='ctx'> </div><div class='ctx'> #endif	/* __EROFS_INTERNAL_H */</div><div class='head'>diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c<br/>index d4f631d39f0f..f7cf4f41af28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/namei.c</a></div><div class='hunk'>@@ -99,8 +99,8 @@ static void *erofs_find_target_block(struct erofs_buf *target,</div><div class='ctx'> 		struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='ctx'> 		struct erofs_dirent *de;</div><div class='ctx'> </div><div class='del'>-		buf.inode = dir;</div><div class='del'>-		de = erofs_bread(&amp;buf, mid, EROFS_KMAP);</div><div class='add'>+		buf.mapping = dir-&gt;i_mapping;</div><div class='add'>+		de = erofs_bread(&amp;buf, erofs_pos(dir-&gt;i_sb, mid), true);</div><div class='ctx'> 		if (!IS_ERR(de)) {</div><div class='ctx'> 			const int nameoff = nameoff_from_disk(de-&gt;nameoff, bsz);</div><div class='ctx'> 			const int ndirents = nameoff / sizeof(*de);</div><div class='hunk'>@@ -130,24 +130,24 @@ static void *erofs_find_target_block(struct erofs_buf *target,</div><div class='ctx'> 			/* string comparison without already matched prefix */</div><div class='ctx'> 			diff = erofs_dirnamecmp(name, &amp;dname, &amp;matched);</div><div class='ctx'> </div><div class='del'>-			if (!diff) {</div><div class='del'>-				*_ndirents = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			} else if (diff &gt; 0) {</div><div class='del'>-				head = mid + 1;</div><div class='del'>-				startprfx = matched;</div><div class='del'>-</div><div class='del'>-				if (!IS_ERR(candidate))</div><div class='del'>-					erofs_put_metabuf(target);</div><div class='del'>-				*target = buf;</div><div class='del'>-				candidate = de;</div><div class='del'>-				*_ndirents = ndirents;</div><div class='del'>-			} else {</div><div class='add'>+			if (diff &lt; 0) {</div><div class='ctx'> 				erofs_put_metabuf(&amp;buf);</div><div class='del'>-</div><div class='ctx'> 				back = mid - 1;</div><div class='ctx'> 				endprfx = matched;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!IS_ERR(candidate))</div><div class='add'>+				erofs_put_metabuf(target);</div><div class='add'>+			*target = buf;</div><div class='add'>+			if (!diff) {</div><div class='add'>+				*_ndirents = 0;</div><div class='add'>+				return de;</div><div class='ctx'> 			}</div><div class='add'>+			head = mid + 1;</div><div class='add'>+			startprfx = matched;</div><div class='add'>+			candidate = de;</div><div class='add'>+			*_ndirents = ndirents;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> out:		/* free if the candidate is valid */</div><div class='hunk'>@@ -171,7 +171,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid,</div><div class='ctx'> </div><div class='ctx'> 	qn.name = name-&gt;name;</div><div class='ctx'> 	qn.end = name-&gt;name + name-&gt;len;</div><div class='del'>-	buf.inode = dir;</div><div class='add'>+	buf.mapping = dir-&gt;i_mapping;</div><div class='ctx'> </div><div class='ctx'> 	ndirents = 0;</div><div class='ctx'> 	de = erofs_find_target_block(&amp;buf, dir, &amp;qn, &amp;ndirents);</div><div class='head'>diff --git a/fs/erofs/pcpubuf.c b/fs/erofs/pcpubuf.c<br/>deleted file mode 100644<br/>index c7a4b1d77069..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/pcpubuf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/pcpubuf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) Gao Xiang &lt;xiang@kernel.org&gt;</div><div class='del'>- *</div><div class='del'>- * For low-latency decompression algorithms (e.g. lz4), reserve consecutive</div><div class='del'>- * per-CPU virtual memory (in pages) in advance to store such inplace I/O</div><div class='del'>- * data if inplace decompression is failed (due to unmet inplace margin for</div><div class='del'>- * example).</div><div class='del'>- */</div><div class='del'>-#include "internal.h"</div><div class='del'>-</div><div class='del'>-struct erofs_pcpubuf {</div><div class='del'>-	raw_spinlock_t lock;</div><div class='del'>-	void *ptr;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	unsigned int nrpages;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(struct erofs_pcpubuf, erofs_pcb);</div><div class='del'>-</div><div class='del'>-void *erofs_get_pcpubuf(unsigned int requiredpages)</div><div class='del'>-	__acquires(pcb-&gt;lock)</div><div class='del'>-{</div><div class='del'>-	struct erofs_pcpubuf *pcb = &amp;get_cpu_var(erofs_pcb);</div><div class='del'>-</div><div class='del'>-	raw_spin_lock(&amp;pcb-&gt;lock);</div><div class='del'>-	/* check if the per-CPU buffer is too small */</div><div class='del'>-	if (requiredpages &gt; pcb-&gt;nrpages) {</div><div class='del'>-		raw_spin_unlock(&amp;pcb-&gt;lock);</div><div class='del'>-		put_cpu_var(erofs_pcb);</div><div class='del'>-		/* (for sparse checker) pretend pcb-&gt;lock is still taken */</div><div class='del'>-		__acquire(pcb-&gt;lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return pcb-&gt;ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void erofs_put_pcpubuf(void *ptr) __releases(pcb-&gt;lock)</div><div class='del'>-{</div><div class='del'>-	struct erofs_pcpubuf *pcb = &amp;per_cpu(erofs_pcb, smp_processor_id());</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(pcb-&gt;ptr != ptr);</div><div class='del'>-	raw_spin_unlock(&amp;pcb-&gt;lock);</div><div class='del'>-	put_cpu_var(erofs_pcb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the next step: support per-CPU page buffers hotplug */</div><div class='del'>-int erofs_pcpubuf_growsize(unsigned int nrpages)</div><div class='del'>-{</div><div class='del'>-	static DEFINE_MUTEX(pcb_resize_mutex);</div><div class='del'>-	static unsigned int pcb_nrpages;</div><div class='del'>-	struct page *pagepool = NULL;</div><div class='del'>-	int delta, cpu, ret, i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;pcb_resize_mutex);</div><div class='del'>-	delta = nrpages - pcb_nrpages;</div><div class='del'>-	ret = 0;</div><div class='del'>-	/* avoid shrinking pcpubuf, since no idea how many fses rely on */</div><div class='del'>-	if (delta &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct erofs_pcpubuf *pcb = &amp;per_cpu(erofs_pcb, cpu);</div><div class='del'>-		struct page **pages, **oldpages;</div><div class='del'>-		void *ptr, *old_ptr;</div><div class='del'>-</div><div class='del'>-		pages = kmalloc_array(nrpages, sizeof(*pages), GFP_KERNEL);</div><div class='del'>-		if (!pages) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nrpages; ++i) {</div><div class='del'>-			pages[i] = erofs_allocpage(&amp;pagepool, GFP_KERNEL);</div><div class='del'>-			if (!pages[i]) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				oldpages = pages;</div><div class='del'>-				goto free_pagearray;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		ptr = vmap(pages, nrpages, VM_MAP, PAGE_KERNEL);</div><div class='del'>-		if (!ptr) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			oldpages = pages;</div><div class='del'>-			goto free_pagearray;</div><div class='del'>-		}</div><div class='del'>-		raw_spin_lock(&amp;pcb-&gt;lock);</div><div class='del'>-		old_ptr = pcb-&gt;ptr;</div><div class='del'>-		pcb-&gt;ptr = ptr;</div><div class='del'>-		oldpages = pcb-&gt;pages;</div><div class='del'>-		pcb-&gt;pages = pages;</div><div class='del'>-		i = pcb-&gt;nrpages;</div><div class='del'>-		pcb-&gt;nrpages = nrpages;</div><div class='del'>-		raw_spin_unlock(&amp;pcb-&gt;lock);</div><div class='del'>-</div><div class='del'>-		if (!oldpages) {</div><div class='del'>-			DBG_BUGON(old_ptr);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (old_ptr)</div><div class='del'>-			vunmap(old_ptr);</div><div class='del'>-free_pagearray:</div><div class='del'>-		while (i)</div><div class='del'>-			erofs_pagepool_add(&amp;pagepool, oldpages[--i]);</div><div class='del'>-		kfree(oldpages);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	pcb_nrpages = nrpages;</div><div class='del'>-	erofs_release_pages(&amp;pagepool);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;pcb_resize_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init erofs_pcpubuf_init(void)</div><div class='del'>-{</div><div class='del'>-	int cpu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct erofs_pcpubuf *pcb = &amp;per_cpu(erofs_pcb, cpu);</div><div class='del'>-</div><div class='del'>-		raw_spin_lock_init(&amp;pcb-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void erofs_pcpubuf_exit(void)</div><div class='del'>-{</div><div class='del'>-	int cpu, i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct erofs_pcpubuf *pcb = &amp;per_cpu(erofs_pcb, cpu);</div><div class='del'>-</div><div class='del'>-		if (pcb-&gt;ptr) {</div><div class='del'>-			vunmap(pcb-&gt;ptr);</div><div class='del'>-			pcb-&gt;ptr = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (!pcb-&gt;pages)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; pcb-&gt;nrpages; ++i)</div><div class='del'>-			if (pcb-&gt;pages[i])</div><div class='del'>-				put_page(pcb-&gt;pages[i]);</div><div class='del'>-		kfree(pcb-&gt;pages);</div><div class='del'>-		pcb-&gt;pages = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/erofs/super.c b/fs/erofs/super.c<br/>index 9b4b66dcdd4f..937a215f626c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/super.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='add'>+#include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='hunk'>@@ -17,65 +18,42 @@</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *erofs_inode_cachep __read_mostly;</div><div class='ctx'> </div><div class='del'>-void _erofs_err(struct super_block *sb, const char *func, const char *fmt, ...)</div><div class='add'>+void _erofs_printk(struct super_block *sb, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='add'>+	int level;</div><div class='ctx'> </div><div class='ctx'> 	va_start(args, fmt);</div><div class='ctx'> </div><div class='del'>-	vaf.fmt = fmt;</div><div class='add'>+	level = printk_get_level(fmt);</div><div class='add'>+	vaf.fmt = printk_skip_level(fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='del'>-</div><div class='del'>-	if (sb)</div><div class='del'>-		pr_err("(device %s): %s: %pV", sb-&gt;s_id, func, &amp;vaf);</div><div class='del'>-	else</div><div class='del'>-		pr_err("%s: %pV", func, &amp;vaf);</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void _erofs_info(struct super_block *sb, const char *func, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct va_format vaf;</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-</div><div class='del'>-	vaf.fmt = fmt;</div><div class='del'>-	vaf.va = &amp;args;</div><div class='del'>-</div><div class='ctx'> 	if (sb)</div><div class='del'>-		pr_info("(device %s): %pV", sb-&gt;s_id, &amp;vaf);</div><div class='add'>+		printk("%c%cerofs (device %s): %pV",</div><div class='add'>+				KERN_SOH_ASCII, level, sb-&gt;s_id, &amp;vaf);</div><div class='ctx'> 	else</div><div class='del'>-		pr_info("%pV", &amp;vaf);</div><div class='add'>+		printk("%c%cerofs: %pV", KERN_SOH_ASCII, level, &amp;vaf);</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_superblock_csum_verify(struct super_block *sb, void *sbdata)</div><div class='ctx'> {</div><div class='del'>-	size_t len = 1 &lt;&lt; EROFS_SB(sb)-&gt;blkszbits;</div><div class='del'>-	struct erofs_super_block *dsb;</div><div class='del'>-	u32 expected_crc, crc;</div><div class='add'>+	struct erofs_super_block *dsb = sbdata + EROFS_SUPER_OFFSET;</div><div class='add'>+	u32 len = 1 &lt;&lt; EROFS_SB(sb)-&gt;blkszbits, crc;</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; EROFS_SUPER_OFFSET)</div><div class='ctx'> 		len -= EROFS_SUPER_OFFSET;</div><div class='add'>+	len -= offsetof(struct erofs_super_block, checksum) +</div><div class='add'>+			sizeof(dsb-&gt;checksum);</div><div class='ctx'> </div><div class='del'>-	dsb = kmemdup(sbdata + EROFS_SUPER_OFFSET, len, GFP_KERNEL);</div><div class='del'>-	if (!dsb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	expected_crc = le32_to_cpu(dsb-&gt;checksum);</div><div class='del'>-	dsb-&gt;checksum = 0;</div><div class='del'>-	/* to allow for x86 boot sectors and other oddities. */</div><div class='del'>-	crc = crc32c(~0, dsb, len);</div><div class='del'>-	kfree(dsb);</div><div class='del'>-</div><div class='del'>-	if (crc != expected_crc) {</div><div class='del'>-		erofs_err(sb, "invalid checksum 0x%08x, 0x%08x expected",</div><div class='del'>-			  crc, expected_crc);</div><div class='del'>-		return -EBADMSG;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	/* skip .magic(pre-verified) and .checksum(0) fields */</div><div class='add'>+	crc = crc32c(0x5045B54A, (&amp;dsb-&gt;checksum) + 1, len);</div><div class='add'>+	if (crc == le32_to_cpu(dsb-&gt;checksum))</div><div class='add'>+		return 0;</div><div class='add'>+	erofs_err(sb, "invalid checksum 0x%08x, 0x%08x expected",</div><div class='add'>+		  crc, le32_to_cpu(dsb-&gt;checksum));</div><div class='add'>+	return -EBADMSG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void erofs_inode_init_once(void *ptr)</div><div class='hunk'>@@ -108,22 +86,6 @@ static void erofs_free_inode(struct inode *inode)</div><div class='ctx'> 	kmem_cache_free(erofs_inode_cachep, vi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool check_layout_compatibility(struct super_block *sb,</div><div class='del'>-				       struct erofs_super_block *dsb)</div><div class='del'>-{</div><div class='del'>-	const unsigned int feature = le32_to_cpu(dsb-&gt;feature_incompat);</div><div class='del'>-</div><div class='del'>-	EROFS_SB(sb)-&gt;feature_incompat = feature;</div><div class='del'>-</div><div class='del'>-	/* check if current kernel meets all mandatory requirements */</div><div class='del'>-	if (feature &amp; (~EROFS_ALL_FEATURE_INCOMPAT)) {</div><div class='del'>-		erofs_err(sb, "unidentified incompatible feature %x, please upgrade kernel",</div><div class='del'>-			   feature &amp; ~EROFS_ALL_FEATURE_INCOMPAT);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* read variable-sized metadata, offset will be aligned by 4-byte */</div><div class='ctx'> void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,</div><div class='ctx'> 			  erofs_off_t *offset, int *lengthp)</div><div class='hunk'>@@ -132,11 +94,11 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,</div><div class='ctx'> 	int len, i, cnt;</div><div class='ctx'> </div><div class='ctx'> 	*offset = round_up(*offset, 4);</div><div class='del'>-	ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);</div><div class='add'>+	ptr = erofs_bread(buf, *offset, true);</div><div class='ctx'> 	if (IS_ERR(ptr))</div><div class='ctx'> 		return ptr;</div><div class='ctx'> </div><div class='del'>-	len = le16_to_cpu(*(__le16 *)&amp;ptr[erofs_blkoff(sb, *offset)]);</div><div class='add'>+	len = le16_to_cpu(*(__le16 *)ptr);</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		len = U16_MAX + 1;</div><div class='ctx'> 	buffer = kmalloc(len, GFP_KERNEL);</div><div class='hunk'>@@ -148,12 +110,12 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,</div><div class='ctx'> 	for (i = 0; i &lt; len; i += cnt) {</div><div class='ctx'> 		cnt = min_t(int, sb-&gt;s_blocksize - erofs_blkoff(sb, *offset),</div><div class='ctx'> 			    len - i);</div><div class='del'>-		ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);</div><div class='add'>+		ptr = erofs_bread(buf, *offset, true);</div><div class='ctx'> 		if (IS_ERR(ptr)) {</div><div class='ctx'> 			kfree(buffer);</div><div class='ctx'> 			return ptr;</div><div class='ctx'> 		}</div><div class='del'>-		memcpy(buffer + i, ptr + erofs_blkoff(sb, *offset), cnt);</div><div class='add'>+		memcpy(buffer + i, ptr, cnt);</div><div class='ctx'> 		*offset += cnt;</div><div class='ctx'> 	}</div><div class='ctx'> 	return buffer;</div><div class='hunk'>@@ -177,13 +139,11 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> 	struct erofs_fscache *fscache;</div><div class='ctx'> 	struct erofs_deviceslot *dis;</div><div class='del'>-	struct file *bdev_file;</div><div class='del'>-	void *ptr;</div><div class='add'>+	struct file *file;</div><div class='ctx'> </div><div class='del'>-	ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *pos), EROFS_KMAP);</div><div class='del'>-	if (IS_ERR(ptr))</div><div class='del'>-		return PTR_ERR(ptr);</div><div class='del'>-	dis = ptr + erofs_blkoff(sb, *pos);</div><div class='add'>+	dis = erofs_read_metabuf(buf, sb, *pos, false);</div><div class='add'>+	if (IS_ERR(dis))</div><div class='add'>+		return PTR_ERR(dis);</div><div class='ctx'> </div><div class='ctx'> 	if (!sbi-&gt;devs-&gt;flatdev &amp;&amp; !dif-&gt;path) {</div><div class='ctx'> 		if (!dis-&gt;tag[0]) {</div><div class='hunk'>@@ -201,17 +161,33 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,</div><div class='ctx'> 			return PTR_ERR(fscache);</div><div class='ctx'> 		dif-&gt;fscache = fscache;</div><div class='ctx'> 	} else if (!sbi-&gt;devs-&gt;flatdev) {</div><div class='del'>-		bdev_file = bdev_file_open_by_path(dif-&gt;path, BLK_OPEN_READ,</div><div class='del'>-						sb-&gt;s_type, NULL);</div><div class='del'>-		if (IS_ERR(bdev_file))</div><div class='del'>-			return PTR_ERR(bdev_file);</div><div class='del'>-		dif-&gt;bdev_file = bdev_file;</div><div class='del'>-		dif-&gt;dax_dev = fs_dax_get_by_bdev(file_bdev(bdev_file),</div><div class='del'>-				&amp;dif-&gt;dax_part_off, NULL, NULL);</div><div class='add'>+		file = erofs_is_fileio_mode(sbi) ?</div><div class='add'>+				filp_open(dif-&gt;path, O_RDONLY | O_LARGEFILE, 0) :</div><div class='add'>+				bdev_file_open_by_path(dif-&gt;path,</div><div class='add'>+						BLK_OPEN_READ, sb-&gt;s_type, NULL);</div><div class='add'>+		if (IS_ERR(file)) {</div><div class='add'>+			if (file == ERR_PTR(-ENOTBLK))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			return PTR_ERR(file);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!erofs_is_fileio_mode(sbi)) {</div><div class='add'>+			dif-&gt;dax_dev = fs_dax_get_by_bdev(file_bdev(file),</div><div class='add'>+					&amp;dif-&gt;dax_part_off, NULL, NULL);</div><div class='add'>+		} else if (!S_ISREG(file_inode(file)-&gt;i_mode)) {</div><div class='add'>+			fput(file);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!dif-&gt;dax_dev &amp;&amp; test_opt(&amp;sbi-&gt;opt, DAX_ALWAYS)) {</div><div class='add'>+			erofs_info(sb, "DAX unsupported by %s. Turning off DAX.",</div><div class='add'>+				   dif-&gt;path);</div><div class='add'>+			clear_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='add'>+		}</div><div class='add'>+		dif-&gt;file = file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dif-&gt;blocks = le32_to_cpu(dis-&gt;blocks);</div><div class='del'>-	dif-&gt;mapped_blkaddr = le32_to_cpu(dis-&gt;mapped_blkaddr);</div><div class='add'>+	dif-&gt;blocks = le32_to_cpu(dis-&gt;blocks_lo);</div><div class='add'>+	dif-&gt;uniaddr = le32_to_cpu(dis-&gt;uniaddr_lo);</div><div class='ctx'> 	sbi-&gt;total_blocks += dif-&gt;blocks;</div><div class='ctx'> 	*pos += EROFS_DEVT_SLOT_SIZE;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -227,7 +203,7 @@ static int erofs_scan_devices(struct super_block *sb,</div><div class='ctx'> 	struct erofs_device_info *dif;</div><div class='ctx'> 	int id, err = 0;</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;total_blocks = sbi-&gt;primarydevice_blocks;</div><div class='add'>+	sbi-&gt;total_blocks = sbi-&gt;dif0.blocks;</div><div class='ctx'> 	if (!erofs_sb_has_device_table(sbi))</div><div class='ctx'> 		ondisk_extradevs = 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -239,6 +215,11 @@ static int erofs_scan_devices(struct super_block *sb,</div><div class='ctx'> 			  ondisk_extradevs, sbi-&gt;devs-&gt;extra_devices);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (test_opt(&amp;sbi-&gt;opt, DAX_ALWAYS) &amp;&amp; !sbi-&gt;dif0.dax_dev) {</div><div class='add'>+		erofs_info(sb, "DAX unsupported by block device. Turning off DAX.");</div><div class='add'>+		clear_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='add'>+	}</div><div class='ctx'> 	if (!ondisk_extradevs)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -281,28 +262,26 @@ static int erofs_scan_devices(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> static int erofs_read_superblock(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_sb_info *sbi;</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> 	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='ctx'> 	struct erofs_super_block *dsb;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	data = erofs_read_metabuf(&amp;buf, sb, 0, EROFS_KMAP);</div><div class='add'>+	data = erofs_read_metabuf(&amp;buf, sb, 0, false);</div><div class='ctx'> 	if (IS_ERR(data)) {</div><div class='ctx'> 		erofs_err(sb, "cannot read erofs superblock");</div><div class='ctx'> 		return PTR_ERR(data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sbi = EROFS_SB(sb);</div><div class='ctx'> 	dsb = (struct erofs_super_block *)(data + EROFS_SUPER_OFFSET);</div><div class='del'>-</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	if (le32_to_cpu(dsb-&gt;magic) != EROFS_SUPER_MAGIC_V1) {</div><div class='ctx'> 		erofs_err(sb, "cannot find valid erofs superblock");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;blkszbits  = dsb-&gt;blkszbits;</div><div class='add'>+	sbi-&gt;blkszbits = dsb-&gt;blkszbits;</div><div class='ctx'> 	if (sbi-&gt;blkszbits &lt; 9 || sbi-&gt;blkszbits &gt; PAGE_SHIFT) {</div><div class='ctx'> 		erofs_err(sb, "blkszbits %u isn't supported", sbi-&gt;blkszbits);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -320,8 +299,12 @@ static int erofs_read_superblock(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='del'>-	if (!check_layout_compatibility(sb, dsb))</div><div class='add'>+	sbi-&gt;feature_incompat = le32_to_cpu(dsb-&gt;feature_incompat);</div><div class='add'>+	if (sbi-&gt;feature_incompat &amp; ~EROFS_ALL_FEATURE_INCOMPAT) {</div><div class='add'>+		erofs_err(sb, "unidentified incompatible feature %x, please upgrade kernel",</div><div class='add'>+			  sbi-&gt;feature_incompat &amp; ~EROFS_ALL_FEATURE_INCOMPAT);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;sb_size = 128 + dsb-&gt;sb_extslots * EROFS_SB_EXTSLOT_SIZE;</div><div class='ctx'> 	if (sbi-&gt;sb_size &gt; PAGE_SIZE - EROFS_SUPER_OFFSET) {</div><div class='hunk'>@@ -329,7 +312,7 @@ static int erofs_read_superblock(struct super_block *sb)</div><div class='ctx'> 			  sbi-&gt;sb_size);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	sbi-&gt;primarydevice_blocks = le32_to_cpu(dsb-&gt;blocks);</div><div class='add'>+	sbi-&gt;dif0.blocks = le32_to_cpu(dsb-&gt;blocks_lo);</div><div class='ctx'> 	sbi-&gt;meta_blkaddr = le32_to_cpu(dsb-&gt;meta_blkaddr);</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_XATTR</div><div class='ctx'> 	sbi-&gt;xattr_blkaddr = le32_to_cpu(dsb-&gt;xattr_blkaddr);</div><div class='hunk'>@@ -338,21 +321,33 @@ static int erofs_read_superblock(struct super_block *sb)</div><div class='ctx'> 	sbi-&gt;xattr_filter_reserved = dsb-&gt;xattr_filter_reserved;</div><div class='ctx'> #endif</div><div class='ctx'> 	sbi-&gt;islotbits = ilog2(sizeof(struct erofs_inode_compact));</div><div class='del'>-	sbi-&gt;root_nid = le16_to_cpu(dsb-&gt;root_nid);</div><div class='add'>+	if (erofs_sb_has_48bit(sbi) &amp;&amp; dsb-&gt;rootnid_8b) {</div><div class='add'>+		sbi-&gt;root_nid = le64_to_cpu(dsb-&gt;rootnid_8b);</div><div class='add'>+		sbi-&gt;dif0.blocks = sbi-&gt;dif0.blocks |</div><div class='add'>+				((u64)le16_to_cpu(dsb-&gt;rb.blocks_hi) &lt;&lt; 32);</div><div class='add'>+	} else {</div><div class='add'>+		sbi-&gt;root_nid = le16_to_cpu(dsb-&gt;rb.rootnid_2b);</div><div class='add'>+	}</div><div class='ctx'> 	sbi-&gt;packed_nid = le64_to_cpu(dsb-&gt;packed_nid);</div><div class='add'>+	if (erofs_sb_has_metabox(sbi)) {</div><div class='add'>+		if (sbi-&gt;sb_size &lt;= offsetof(struct erofs_super_block,</div><div class='add'>+					     metabox_nid))</div><div class='add'>+			return -EFSCORRUPTED;</div><div class='add'>+		sbi-&gt;metabox_nid = le64_to_cpu(dsb-&gt;metabox_nid);</div><div class='add'>+		if (sbi-&gt;metabox_nid &amp; BIT_ULL(EROFS_DIRENT_NID_METABOX_BIT))</div><div class='add'>+			return -EFSCORRUPTED;	/* self-loop detection */</div><div class='add'>+	}</div><div class='ctx'> 	sbi-&gt;inos = le64_to_cpu(dsb-&gt;inos);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;build_time = le64_to_cpu(dsb-&gt;build_time);</div><div class='del'>-	sbi-&gt;build_time_nsec = le32_to_cpu(dsb-&gt;build_time_nsec);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;sb-&gt;s_uuid, dsb-&gt;uuid, sizeof(dsb-&gt;uuid));</div><div class='add'>+	sbi-&gt;epoch = (s64)le64_to_cpu(dsb-&gt;epoch);</div><div class='add'>+	sbi-&gt;fixed_nsec = le32_to_cpu(dsb-&gt;fixed_nsec);</div><div class='add'>+	super_set_uuid(sb, (void *)dsb-&gt;uuid, sizeof(dsb-&gt;uuid));</div><div class='ctx'> </div><div class='del'>-	ret = strscpy(sbi-&gt;volume_name, dsb-&gt;volume_name,</div><div class='del'>-		      sizeof(dsb-&gt;volume_name));</div><div class='del'>-	if (ret &lt; 0) {	/* -E2BIG */</div><div class='del'>-		erofs_err(sb, "bad volume name without NIL terminator");</div><div class='del'>-		ret = -EFSCORRUPTED;</div><div class='del'>-		goto out;</div><div class='add'>+	if (dsb-&gt;volume_name[0]) {</div><div class='add'>+		sbi-&gt;volume_name = kstrndup(dsb-&gt;volume_name,</div><div class='add'>+					    sizeof(dsb-&gt;volume_name), GFP_KERNEL);</div><div class='add'>+		if (!sbi-&gt;volume_name)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* parse on-disk compression configurations */</div><div class='hunk'>@@ -360,41 +355,37 @@ static int erofs_read_superblock(struct super_block *sb)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* handle multiple devices */</div><div class='ctx'> 	ret = erofs_scan_devices(sb, dsb);</div><div class='ctx'> </div><div class='add'>+	if (erofs_sb_has_48bit(sbi))</div><div class='add'>+		erofs_info(sb, "EXPERIMENTAL 48-bit layout support in use. Use at your own risk!");</div><div class='add'>+	if (erofs_sb_has_metabox(sbi))</div><div class='add'>+		erofs_info(sb, "EXPERIMENTAL metadata compression support in use. Use at your own risk!");</div><div class='ctx'> 	if (erofs_is_fscache_mode(sb))</div><div class='del'>-		erofs_info(sb, "EXPERIMENTAL fscache-based on-demand read feature in use. Use at your own risk!");</div><div class='add'>+		erofs_info(sb, "[deprecated] fscache-based on-demand read feature in use. Use at your own risk!");</div><div class='ctx'> out:</div><div class='ctx'> 	erofs_put_metabuf(&amp;buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void erofs_default_options(struct erofs_fs_context *ctx)</div><div class='add'>+static void erofs_default_options(struct erofs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-	ctx-&gt;opt.cache_strategy = EROFS_ZIP_CACHE_READAROUND;</div><div class='del'>-	ctx-&gt;opt.max_sync_decompress_pages = 3;</div><div class='del'>-	ctx-&gt;opt.sync_decompress = EROFS_SYNC_DECOMPRESS_AUTO;</div><div class='add'>+	sbi-&gt;opt.cache_strategy = EROFS_ZIP_CACHE_READAROUND;</div><div class='add'>+	sbi-&gt;opt.max_sync_decompress_pages = 3;</div><div class='add'>+	sbi-&gt;opt.sync_decompress = EROFS_SYNC_DECOMPRESS_AUTO;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_XATTR</div><div class='del'>-	set_opt(&amp;ctx-&gt;opt, XATTR_USER);</div><div class='add'>+	set_opt(&amp;sbi-&gt;opt, XATTR_USER);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_POSIX_ACL</div><div class='del'>-	set_opt(&amp;ctx-&gt;opt, POSIX_ACL);</div><div class='add'>+	set_opt(&amp;sbi-&gt;opt, POSIX_ACL);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_user_xattr,</div><div class='del'>-	Opt_acl,</div><div class='del'>-	Opt_cache_strategy,</div><div class='del'>-	Opt_dax,</div><div class='del'>-	Opt_dax_enum,</div><div class='del'>-	Opt_device,</div><div class='del'>-	Opt_fsid,</div><div class='del'>-	Opt_domain_id,</div><div class='del'>-	Opt_err</div><div class='add'>+	Opt_user_xattr, Opt_acl, Opt_cache_strategy, Opt_dax, Opt_dax_enum,</div><div class='add'>+	Opt_device, Opt_fsid, Opt_domain_id, Opt_directio, Opt_fsoffset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct constant_table erofs_param_cache_strategy[] = {</div><div class='hunk'>@@ -420,23 +411,24 @@ static const struct fs_parameter_spec erofs_fs_parameters[] = {</div><div class='ctx'> 	fsparam_string("device",	Opt_device),</div><div class='ctx'> 	fsparam_string("fsid",		Opt_fsid),</div><div class='ctx'> 	fsparam_string("domain_id",	Opt_domain_id),</div><div class='add'>+	fsparam_flag_no("directio",	Opt_directio),</div><div class='add'>+	fsparam_u64("fsoffset",		Opt_fsoffset),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static bool erofs_fc_set_dax_mode(struct fs_context *fc, unsigned int mode)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_FS_DAX</div><div class='del'>-	struct erofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct erofs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case EROFS_MOUNT_DAX_ALWAYS:</div><div class='del'>-		warnfc(fc, "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");</div><div class='del'>-		set_opt(&amp;ctx-&gt;opt, DAX_ALWAYS);</div><div class='del'>-		clear_opt(&amp;ctx-&gt;opt, DAX_NEVER);</div><div class='add'>+		set_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='add'>+		clear_opt(&amp;sbi-&gt;opt, DAX_NEVER);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	case EROFS_MOUNT_DAX_NEVER:</div><div class='del'>-		set_opt(&amp;ctx-&gt;opt, DAX_NEVER);</div><div class='del'>-		clear_opt(&amp;ctx-&gt;opt, DAX_ALWAYS);</div><div class='add'>+		set_opt(&amp;sbi-&gt;opt, DAX_NEVER);</div><div class='add'>+		clear_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DBG_BUGON(1);</div><div class='hunk'>@@ -451,7 +443,7 @@ static bool erofs_fc_set_dax_mode(struct fs_context *fc, unsigned int mode)</div><div class='ctx'> static int erofs_fc_parse_param(struct fs_context *fc,</div><div class='ctx'> 				struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct erofs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='ctx'> 	struct fs_parse_result result;</div><div class='ctx'> 	struct erofs_device_info *dif;</div><div class='ctx'> 	int opt, ret;</div><div class='hunk'>@@ -464,9 +456,9 @@ static int erofs_fc_parse_param(struct fs_context *fc,</div><div class='ctx'> 	case Opt_user_xattr:</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_XATTR</div><div class='ctx'> 		if (result.boolean)</div><div class='del'>-			set_opt(&amp;ctx-&gt;opt, XATTR_USER);</div><div class='add'>+			set_opt(&amp;sbi-&gt;opt, XATTR_USER);</div><div class='ctx'> 		else</div><div class='del'>-			clear_opt(&amp;ctx-&gt;opt, XATTR_USER);</div><div class='add'>+			clear_opt(&amp;sbi-&gt;opt, XATTR_USER);</div><div class='ctx'> #else</div><div class='ctx'> 		errorfc(fc, "{,no}user_xattr options not supported");</div><div class='ctx'> #endif</div><div class='hunk'>@@ -474,16 +466,16 @@ static int erofs_fc_parse_param(struct fs_context *fc,</div><div class='ctx'> 	case Opt_acl:</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_POSIX_ACL</div><div class='ctx'> 		if (result.boolean)</div><div class='del'>-			set_opt(&amp;ctx-&gt;opt, POSIX_ACL);</div><div class='add'>+			set_opt(&amp;sbi-&gt;opt, POSIX_ACL);</div><div class='ctx'> 		else</div><div class='del'>-			clear_opt(&amp;ctx-&gt;opt, POSIX_ACL);</div><div class='add'>+			clear_opt(&amp;sbi-&gt;opt, POSIX_ACL);</div><div class='ctx'> #else</div><div class='ctx'> 		errorfc(fc, "{,no}acl options not supported");</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_cache_strategy:</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-		ctx-&gt;opt.cache_strategy = result.uint_32;</div><div class='add'>+		sbi-&gt;opt.cache_strategy = result.uint_32;</div><div class='ctx'> #else</div><div class='ctx'> 		errorfc(fc, "compression not supported, cache_strategy ignored");</div><div class='ctx'> #endif</div><div class='hunk'>@@ -505,27 +497,27 @@ static int erofs_fc_parse_param(struct fs_context *fc,</div><div class='ctx'> 			kfree(dif);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		down_write(&amp;ctx-&gt;devs-&gt;rwsem);</div><div class='del'>-		ret = idr_alloc(&amp;ctx-&gt;devs-&gt;tree, dif, 0, 0, GFP_KERNEL);</div><div class='del'>-		up_write(&amp;ctx-&gt;devs-&gt;rwsem);</div><div class='add'>+		down_write(&amp;sbi-&gt;devs-&gt;rwsem);</div><div class='add'>+		ret = idr_alloc(&amp;sbi-&gt;devs-&gt;tree, dif, 0, 0, GFP_KERNEL);</div><div class='add'>+		up_write(&amp;sbi-&gt;devs-&gt;rwsem);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			kfree(dif-&gt;path);</div><div class='ctx'> 			kfree(dif);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		++ctx-&gt;devs-&gt;extra_devices;</div><div class='add'>+		++sbi-&gt;devs-&gt;extra_devices;</div><div class='ctx'> 		break;</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ONDEMAND</div><div class='ctx'> 	case Opt_fsid:</div><div class='del'>-		kfree(ctx-&gt;fsid);</div><div class='del'>-		ctx-&gt;fsid = kstrdup(param-&gt;string, GFP_KERNEL);</div><div class='del'>-		if (!ctx-&gt;fsid)</div><div class='add'>+		kfree(sbi-&gt;fsid);</div><div class='add'>+		sbi-&gt;fsid = kstrdup(param-&gt;string, GFP_KERNEL);</div><div class='add'>+		if (!sbi-&gt;fsid)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_domain_id:</div><div class='del'>-		kfree(ctx-&gt;domain_id);</div><div class='del'>-		ctx-&gt;domain_id = kstrdup(param-&gt;string, GFP_KERNEL);</div><div class='del'>-		if (!ctx-&gt;domain_id)</div><div class='add'>+		kfree(sbi-&gt;domain_id);</div><div class='add'>+		sbi-&gt;domain_id = kstrdup(param-&gt;string, GFP_KERNEL);</div><div class='add'>+		if (!sbi-&gt;domain_id)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		break;</div><div class='ctx'> #else</div><div class='hunk'>@@ -534,30 +526,69 @@ static int erofs_fc_parse_param(struct fs_context *fc,</div><div class='ctx'> 		errorfc(fc, "%s option not supported", erofs_fs_parameters[opt].name);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='del'>-	default:</div><div class='del'>-		return -ENOPARAM;</div><div class='add'>+	case Opt_directio:</div><div class='add'>+#ifdef CONFIG_EROFS_FS_BACKED_BY_FILE</div><div class='add'>+		if (result.boolean)</div><div class='add'>+			set_opt(&amp;sbi-&gt;opt, DIRECT_IO);</div><div class='add'>+		else</div><div class='add'>+			clear_opt(&amp;sbi-&gt;opt, DIRECT_IO);</div><div class='add'>+#else</div><div class='add'>+		errorfc(fc, "%s option not supported", erofs_fs_parameters[opt].name);</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fsoffset:</div><div class='add'>+		sbi-&gt;dif0.fsoff = result.uint_64;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct inode *erofs_nfs_get_inode(struct super_block *sb,</div><div class='del'>-					 u64 ino, u32 generation)</div><div class='add'>+static int erofs_encode_fh(struct inode *inode, u32 *fh, int *max_len,</div><div class='add'>+			   struct inode *parent)</div><div class='ctx'> {</div><div class='del'>-	return erofs_iget(sb, ino);</div><div class='add'>+	erofs_nid_t nid = EROFS_I(inode)-&gt;nid;</div><div class='add'>+	int len = parent ? 6 : 3;</div><div class='add'>+</div><div class='add'>+	if (*max_len &lt; len) {</div><div class='add'>+		*max_len = len;</div><div class='add'>+		return FILEID_INVALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fh[0] = (u32)(nid &gt;&gt; 32);</div><div class='add'>+	fh[1] = (u32)(nid &amp; 0xffffffff);</div><div class='add'>+	fh[2] = inode-&gt;i_generation;</div><div class='add'>+</div><div class='add'>+	if (parent) {</div><div class='add'>+		nid = EROFS_I(parent)-&gt;nid;</div><div class='add'>+</div><div class='add'>+		fh[3] = (u32)(nid &gt;&gt; 32);</div><div class='add'>+		fh[4] = (u32)(nid &amp; 0xffffffff);</div><div class='add'>+		fh[5] = parent-&gt;i_generation;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*max_len = len;</div><div class='add'>+	return parent ? FILEID_INO64_GEN_PARENT : FILEID_INO64_GEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *erofs_fh_to_dentry(struct super_block *sb,</div><div class='ctx'> 		struct fid *fid, int fh_len, int fh_type)</div><div class='ctx'> {</div><div class='del'>-	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,</div><div class='del'>-				    erofs_nfs_get_inode);</div><div class='add'>+	if ((fh_type != FILEID_INO64_GEN &amp;&amp;</div><div class='add'>+	     fh_type != FILEID_INO64_GEN_PARENT) || fh_len &lt; 3)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return d_obtain_alias(erofs_iget(sb,</div><div class='add'>+		((u64)fid-&gt;raw[0] &lt;&lt; 32) | fid-&gt;raw[1]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *erofs_fh_to_parent(struct super_block *sb,</div><div class='ctx'> 		struct fid *fid, int fh_len, int fh_type)</div><div class='ctx'> {</div><div class='del'>-	return generic_fh_to_parent(sb, fid, fh_len, fh_type,</div><div class='del'>-				    erofs_nfs_get_inode);</div><div class='add'>+	if (fh_type != FILEID_INO64_GEN_PARENT || fh_len &lt; 6)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return d_obtain_alias(erofs_iget(sb,</div><div class='add'>+		((u64)fid-&gt;raw[3] &lt;&lt; 32) | fid-&gt;raw[4]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *erofs_get_parent(struct dentry *child)</div><div class='hunk'>@@ -573,24 +604,32 @@ static struct dentry *erofs_get_parent(struct dentry *child)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct export_operations erofs_export_ops = {</div><div class='del'>-	.encode_fh = generic_encode_ino32_fh,</div><div class='add'>+	.encode_fh = erofs_encode_fh,</div><div class='ctx'> 	.fh_to_dentry = erofs_fh_to_dentry,</div><div class='ctx'> 	.fh_to_parent = erofs_fh_to_parent,</div><div class='ctx'> 	.get_parent = erofs_get_parent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int erofs_fc_fill_pseudo_super(struct super_block *sb, struct fs_context *fc)</div><div class='add'>+static void erofs_set_sysfs_name(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	static const struct tree_descr empty_descr = {""};</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> </div><div class='del'>-	return simple_fill_super(sb, EROFS_SUPER_MAGIC, &amp;empty_descr);</div><div class='add'>+	if (sbi-&gt;domain_id)</div><div class='add'>+		super_set_sysfs_name_generic(sb, "%s,%s", sbi-&gt;domain_id,</div><div class='add'>+					     sbi-&gt;fsid);</div><div class='add'>+	else if (sbi-&gt;fsid)</div><div class='add'>+		super_set_sysfs_name_generic(sb, "%s", sbi-&gt;fsid);</div><div class='add'>+	else if (erofs_is_fileio_mode(sbi))</div><div class='add'>+		super_set_sysfs_name_generic(sb, "%s",</div><div class='add'>+					     bdi_dev_name(sb-&gt;s_bdi));</div><div class='add'>+	else</div><div class='add'>+		super_set_sysfs_name_id(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct erofs_sb_info *sbi;</div><div class='del'>-	struct erofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_magic = EROFS_SUPER_MAGIC;</div><div class='hunk'>@@ -598,28 +637,32 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='ctx'> 	sb-&gt;s_op = &amp;erofs_sops;</div><div class='ctx'> </div><div class='del'>-	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='del'>-	if (!sbi)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_fs_info = sbi;</div><div class='del'>-	sbi-&gt;opt = ctx-&gt;opt;</div><div class='del'>-	sbi-&gt;devs = ctx-&gt;devs;</div><div class='del'>-	ctx-&gt;devs = NULL;</div><div class='del'>-	sbi-&gt;fsid = ctx-&gt;fsid;</div><div class='del'>-	ctx-&gt;fsid = NULL;</div><div class='del'>-	sbi-&gt;domain_id = ctx-&gt;domain_id;</div><div class='del'>-	ctx-&gt;domain_id = NULL;</div><div class='del'>-</div><div class='ctx'> 	sbi-&gt;blkszbits = PAGE_SHIFT;</div><div class='del'>-	if (erofs_is_fscache_mode(sb)) {</div><div class='add'>+	if (!sb-&gt;s_bdev) {</div><div class='add'>+		/*</div><div class='add'>+		 * (File-backed mounts) EROFS claims it's safe to nest other</div><div class='add'>+		 * fs contexts (including its own) due to self-controlled RO</div><div class='add'>+		 * accesses/contexts and no side-effect changes that need to</div><div class='add'>+		 * context save &amp; restore so it can reuse the current thread</div><div class='add'>+		 * context.  However, it still needs to bump `s_stack_depth` to</div><div class='add'>+		 * avoid kernel stack overflow from nested filesystems.</div><div class='add'>+		 */</div><div class='add'>+		if (erofs_is_fileio_mode(sbi)) {</div><div class='add'>+			sb-&gt;s_stack_depth =</div><div class='add'>+				file_inode(sbi-&gt;dif0.file)-&gt;i_sb-&gt;s_stack_depth + 1;</div><div class='add'>+			if (sb-&gt;s_stack_depth &gt; FILESYSTEM_MAX_STACK_DEPTH) {</div><div class='add'>+				erofs_err(sb, "maximum fs stacking depth exceeded");</div><div class='add'>+				return -ENOTBLK;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		sb-&gt;s_blocksize = PAGE_SIZE;</div><div class='ctx'> 		sb-&gt;s_blocksize_bits = PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-		err = erofs_fscache_register_fs(sb);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='add'>+		if (erofs_is_fscache_mode(sb)) {</div><div class='add'>+			err = erofs_fscache_register_fs(sb);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> 		err = super_setup_bdi(sb);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -629,9 +672,8 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sbi-&gt;dax_dev = fs_dax_get_by_bdev(sb-&gt;s_bdev,</div><div class='del'>-						  &amp;sbi-&gt;dax_part_off,</div><div class='del'>-						  NULL, NULL);</div><div class='add'>+		sbi-&gt;dif0.dax_dev = fs_dax_get_by_bdev(sb-&gt;s_bdev,</div><div class='add'>+				&amp;sbi-&gt;dif0.dax_part_off, NULL, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = erofs_read_superblock(sb);</div><div class='hunk'>@@ -643,20 +685,27 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 			errorfc(fc, "unsupported blksize for fscache mode");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (!sb_set_blocksize(sb, 1 &lt;&lt; sbi-&gt;blkszbits)) {</div><div class='add'>+</div><div class='add'>+		if (erofs_is_fileio_mode(sbi)) {</div><div class='add'>+			sb-&gt;s_blocksize = 1 &lt;&lt; sbi-&gt;blkszbits;</div><div class='add'>+			sb-&gt;s_blocksize_bits = sbi-&gt;blkszbits;</div><div class='add'>+		} else if (!sb_set_blocksize(sb, 1 &lt;&lt; sbi-&gt;blkszbits)) {</div><div class='ctx'> 			errorfc(fc, "failed to set erofs blksize");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_opt(&amp;sbi-&gt;opt, DAX_ALWAYS)) {</div><div class='del'>-		if (!sbi-&gt;dax_dev) {</div><div class='del'>-			errorfc(fc, "DAX unsupported by block device. Turning off DAX.");</div><div class='del'>-			clear_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='del'>-		} else if (sbi-&gt;blkszbits != PAGE_SHIFT) {</div><div class='del'>-			errorfc(fc, "unsupported blocksize for DAX");</div><div class='del'>-			clear_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='del'>-		}</div><div class='add'>+	if (sbi-&gt;dif0.fsoff) {</div><div class='add'>+		if (sbi-&gt;dif0.fsoff &amp; (sb-&gt;s_blocksize - 1))</div><div class='add'>+			return invalfc(fc, "fsoffset %llu is not aligned to block size %lu",</div><div class='add'>+				       sbi-&gt;dif0.fsoff, sb-&gt;s_blocksize);</div><div class='add'>+		if (erofs_is_fscache_mode(sb))</div><div class='add'>+			return invalfc(fc, "cannot use fsoffset in fscache mode");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_opt(&amp;sbi-&gt;opt, DAX_ALWAYS) &amp;&amp; sbi-&gt;blkszbits != PAGE_SHIFT) {</div><div class='add'>+		erofs_info(sb, "unsupported blocksize for DAX");</div><div class='add'>+		clear_opt(&amp;sbi-&gt;opt, DAX_ALWAYS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='hunk'>@@ -668,9 +717,22 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	else</div><div class='ctx'> 		sb-&gt;s_flags &amp;= ~SB_POSIXACL;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-	xa_init(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-#endif</div><div class='add'>+	err = z_erofs_init_super(sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (erofs_sb_has_fragments(sbi) &amp;&amp; sbi-&gt;packed_nid) {</div><div class='add'>+		inode = erofs_iget(sb, sbi-&gt;packed_nid);</div><div class='add'>+		if (IS_ERR(inode))</div><div class='add'>+			return PTR_ERR(inode);</div><div class='add'>+		sbi-&gt;packed_inode = inode;</div><div class='add'>+	}</div><div class='add'>+	if (erofs_sb_has_metabox(sbi)) {</div><div class='add'>+		inode = erofs_iget(sb, sbi-&gt;metabox_nid);</div><div class='add'>+		if (IS_ERR(inode))</div><div class='add'>+			return PTR_ERR(inode);</div><div class='add'>+		sbi-&gt;metabox_inode = inode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	inode = erofs_iget(sb, sbi-&gt;root_nid);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='hunk'>@@ -682,68 +744,72 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(inode);</div><div class='ctx'> 	if (!sb-&gt;s_root)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	erofs_shrinker_register(sb);</div><div class='del'>-	if (erofs_sb_has_fragments(sbi) &amp;&amp; sbi-&gt;packed_nid) {</div><div class='del'>-		sbi-&gt;packed_inode = erofs_iget(sb, sbi-&gt;packed_nid);</div><div class='del'>-		if (IS_ERR(sbi-&gt;packed_inode)) {</div><div class='del'>-			err = PTR_ERR(sbi-&gt;packed_inode);</div><div class='del'>-			sbi-&gt;packed_inode = NULL;</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	err = erofs_init_managed_cache(sb);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	err = erofs_xattr_prefixes_init(sb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	erofs_set_sysfs_name(sb);</div><div class='ctx'> 	err = erofs_register_sysfs(sb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;dir_ra_bytes = EROFS_DIR_RA_BYTES;</div><div class='ctx'> 	erofs_info(sb, "mounted with root inode @ nid %llu.", sbi-&gt;root_nid);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int erofs_fc_anon_get_tree(struct fs_context *fc)</div><div class='del'>-{</div><div class='del'>-	return get_tree_nodev(fc, erofs_fc_fill_pseudo_super);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int erofs_fc_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct erofs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &amp;&amp; ctx-&gt;fsid)</div><div class='add'>+	if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &amp;&amp; sbi-&gt;fsid)</div><div class='ctx'> 		return get_tree_nodev(fc, erofs_fc_fill_super);</div><div class='ctx'> </div><div class='del'>-	return get_tree_bdev(fc, erofs_fc_fill_super);</div><div class='add'>+	ret = get_tree_bdev_flags(fc, erofs_fc_fill_super,</div><div class='add'>+		IS_ENABLED(CONFIG_EROFS_FS_BACKED_BY_FILE) ?</div><div class='add'>+			GET_TREE_BDEV_QUIET_LOOKUP : 0);</div><div class='add'>+#ifdef CONFIG_EROFS_FS_BACKED_BY_FILE</div><div class='add'>+	if (ret == -ENOTBLK) {</div><div class='add'>+		struct file *file;</div><div class='add'>+</div><div class='add'>+		if (!fc-&gt;source)</div><div class='add'>+			return invalf(fc, "No source specified");</div><div class='add'>+		file = filp_open(fc-&gt;source, O_RDONLY | O_LARGEFILE, 0);</div><div class='add'>+		if (IS_ERR(file))</div><div class='add'>+			return PTR_ERR(file);</div><div class='add'>+		sbi-&gt;dif0.file = file;</div><div class='add'>+</div><div class='add'>+		if (S_ISREG(file_inode(sbi-&gt;dif0.file)-&gt;i_mode) &amp;&amp;</div><div class='add'>+		    sbi-&gt;dif0.file-&gt;f_mapping-&gt;a_ops-&gt;read_folio)</div><div class='add'>+			return get_tree_nodev(fc, erofs_fc_fill_super);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_fc_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='del'>-	struct erofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct erofs_sb_info *new_sbi = fc-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	DBG_BUGON(!sb_rdonly(sb));</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;fsid || ctx-&gt;domain_id)</div><div class='add'>+	if (new_sbi-&gt;fsid || new_sbi-&gt;domain_id)</div><div class='ctx'> 		erofs_info(sb, "ignoring reconfiguration for fsid|domain_id.");</div><div class='ctx'> </div><div class='del'>-	if (test_opt(&amp;ctx-&gt;opt, POSIX_ACL))</div><div class='add'>+	if (test_opt(&amp;new_sbi-&gt;opt, POSIX_ACL))</div><div class='ctx'> 		fc-&gt;sb_flags |= SB_POSIXACL;</div><div class='ctx'> 	else</div><div class='ctx'> 		fc-&gt;sb_flags &amp;= ~SB_POSIXACL;</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;opt = ctx-&gt;opt;</div><div class='add'>+	sbi-&gt;opt = new_sbi-&gt;opt;</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -754,8 +820,8 @@ static int erofs_release_device_info(int id, void *ptr, void *data)</div><div class='ctx'> 	struct erofs_device_info *dif = ptr;</div><div class='ctx'> </div><div class='ctx'> 	fs_put_dax(dif-&gt;dax_dev, NULL);</div><div class='del'>-	if (dif-&gt;bdev_file)</div><div class='del'>-		fput(dif-&gt;bdev_file);</div><div class='add'>+	if (dif-&gt;file)</div><div class='add'>+		fput(dif-&gt;file);</div><div class='ctx'> 	erofs_fscache_unregister_cookie(dif-&gt;fscache);</div><div class='ctx'> 	dif-&gt;fscache = NULL;</div><div class='ctx'> 	kfree(dif-&gt;path);</div><div class='hunk'>@@ -772,14 +838,23 @@ static void erofs_free_dev_context(struct erofs_dev_context *devs)</div><div class='ctx'> 	kfree(devs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void erofs_sb_free(struct erofs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	erofs_free_dev_context(sbi-&gt;devs);</div><div class='add'>+	kfree(sbi-&gt;fsid);</div><div class='add'>+	kfree(sbi-&gt;domain_id);</div><div class='add'>+	if (sbi-&gt;dif0.file)</div><div class='add'>+		fput(sbi-&gt;dif0.file);</div><div class='add'>+	kfree(sbi-&gt;volume_name);</div><div class='add'>+	kfree(sbi);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void erofs_fc_free(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct erofs_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='ctx'> </div><div class='del'>-	erofs_free_dev_context(ctx-&gt;devs);</div><div class='del'>-	kfree(ctx-&gt;fsid);</div><div class='del'>-	kfree(ctx-&gt;domain_id);</div><div class='del'>-	kfree(ctx);</div><div class='add'>+	if (sbi) /* free here if an error occurs before transferring to sb */</div><div class='add'>+		erofs_sb_free(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fs_context_operations erofs_context_ops = {</div><div class='hunk'>@@ -789,62 +864,53 @@ static const struct fs_context_operations erofs_context_ops = {</div><div class='ctx'> 	.free		= erofs_fc_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct fs_context_operations erofs_anon_context_ops = {</div><div class='del'>-	.get_tree       = erofs_fc_anon_get_tree,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int erofs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_fs_context *ctx;</div><div class='del'>-</div><div class='del'>-	/* pseudo mount for anon inodes */</div><div class='del'>-	if (fc-&gt;sb_flags &amp; SB_KERNMOUNT) {</div><div class='del'>-		fc-&gt;ops = &amp;erofs_anon_context_ops;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	struct erofs_sb_info *sbi;</div><div class='ctx'> </div><div class='del'>-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='del'>-	if (!ctx)</div><div class='add'>+	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='add'>+	if (!sbi)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ctx-&gt;devs = kzalloc(sizeof(struct erofs_dev_context), GFP_KERNEL);</div><div class='del'>-	if (!ctx-&gt;devs) {</div><div class='del'>-		kfree(ctx);</div><div class='add'>+</div><div class='add'>+	sbi-&gt;devs = kzalloc(sizeof(struct erofs_dev_context), GFP_KERNEL);</div><div class='add'>+	if (!sbi-&gt;devs) {</div><div class='add'>+		kfree(sbi);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;s_fs_info = sbi;</div><div class='ctx'> </div><div class='del'>-	idr_init(&amp;ctx-&gt;devs-&gt;tree);</div><div class='del'>-	init_rwsem(&amp;ctx-&gt;devs-&gt;rwsem);</div><div class='del'>-	erofs_default_options(ctx);</div><div class='add'>+	idr_init(&amp;sbi-&gt;devs-&gt;tree);</div><div class='add'>+	init_rwsem(&amp;sbi-&gt;devs-&gt;rwsem);</div><div class='add'>+	erofs_default_options(sbi);</div><div class='ctx'> 	fc-&gt;ops = &amp;erofs_context_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void erofs_kill_sb(struct super_block *sb)</div><div class='add'>+static void erofs_drop_internal_inodes(struct erofs_sb_info *sbi)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_sb_info *sbi;</div><div class='add'>+	iput(sbi-&gt;packed_inode);</div><div class='add'>+	sbi-&gt;packed_inode = NULL;</div><div class='add'>+	iput(sbi-&gt;metabox_inode);</div><div class='add'>+	sbi-&gt;metabox_inode = NULL;</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP</div><div class='add'>+	iput(sbi-&gt;managed_cache);</div><div class='add'>+	sbi-&gt;managed_cache = NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* pseudo mount for anon inodes */</div><div class='del'>-	if (sb-&gt;s_flags &amp; SB_KERNMOUNT) {</div><div class='del'>-		kill_anon_super(sb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+static void erofs_kill_sb(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (erofs_is_fscache_mode(sb))</div><div class='add'>+	if ((IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) &amp;&amp; sbi-&gt;fsid) ||</div><div class='add'>+	    sbi-&gt;dif0.file)</div><div class='ctx'> 		kill_anon_super(sb);</div><div class='ctx'> 	else</div><div class='ctx'> 		kill_block_super(sb);</div><div class='del'>-</div><div class='del'>-	sbi = EROFS_SB(sb);</div><div class='del'>-	if (!sbi)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	erofs_free_dev_context(sbi-&gt;devs);</div><div class='del'>-	fs_put_dax(sbi-&gt;dax_dev, NULL);</div><div class='add'>+	erofs_drop_internal_inodes(sbi);</div><div class='add'>+	fs_put_dax(sbi-&gt;dif0.dax_dev, NULL);</div><div class='ctx'> 	erofs_fscache_unregister_fs(sb);</div><div class='del'>-	kfree(sbi-&gt;fsid);</div><div class='del'>-	kfree(sbi-&gt;domain_id);</div><div class='del'>-	kfree(sbi);</div><div class='add'>+	erofs_sb_free(sbi);</div><div class='ctx'> 	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -852,23 +918,16 @@ static void erofs_put_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *const sbi = EROFS_SB(sb);</div><div class='ctx'> </div><div class='del'>-	DBG_BUGON(!sbi);</div><div class='del'>-</div><div class='ctx'> 	erofs_unregister_sysfs(sb);</div><div class='ctx'> 	erofs_shrinker_unregister(sb);</div><div class='ctx'> 	erofs_xattr_prefixes_cleanup(sb);</div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-	iput(sbi-&gt;managed_cache);</div><div class='del'>-	sbi-&gt;managed_cache = NULL;</div><div class='del'>-#endif</div><div class='del'>-	iput(sbi-&gt;packed_inode);</div><div class='del'>-	sbi-&gt;packed_inode = NULL;</div><div class='add'>+	erofs_drop_internal_inodes(sbi);</div><div class='ctx'> 	erofs_free_dev_context(sbi-&gt;devs);</div><div class='ctx'> 	sbi-&gt;devs = NULL;</div><div class='ctx'> 	erofs_fscache_unregister_fs(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct file_system_type erofs_fs_type = {</div><div class='add'>+static struct file_system_type erofs_fs_type = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.name           = "erofs",</div><div class='ctx'> 	.init_fs_context = erofs_init_fs_context,</div><div class='hunk'>@@ -885,7 +944,7 @@ static int __init erofs_module_init(void)</div><div class='ctx'> </div><div class='ctx'> 	erofs_inode_cachep = kmem_cache_create("erofs_inode",</div><div class='ctx'> 			sizeof(struct erofs_inode), 0,</div><div class='del'>-			SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT,</div><div class='add'>+			SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='ctx'> 			erofs_inode_init_once);</div><div class='ctx'> 	if (!erofs_inode_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -894,16 +953,7 @@ static int __init erofs_module_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto shrinker_err;</div><div class='ctx'> </div><div class='del'>-	err = z_erofs_lzma_init();</div><div class='del'>-	if (err)</div><div class='del'>-		goto lzma_err;</div><div class='del'>-</div><div class='del'>-	err = z_erofs_deflate_init();</div><div class='del'>-	if (err)</div><div class='del'>-		goto deflate_err;</div><div class='del'>-</div><div class='del'>-	erofs_pcpubuf_init();</div><div class='del'>-	err = z_erofs_init_zip_subsystem();</div><div class='add'>+	err = z_erofs_init_subsystem();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto zip_err;</div><div class='ctx'> </div><div class='hunk'>@@ -920,12 +970,8 @@ static int __init erofs_module_init(void)</div><div class='ctx'> fs_err:</div><div class='ctx'> 	erofs_exit_sysfs();</div><div class='ctx'> sysfs_err:</div><div class='del'>-	z_erofs_exit_zip_subsystem();</div><div class='add'>+	z_erofs_exit_subsystem();</div><div class='ctx'> zip_err:</div><div class='del'>-	z_erofs_deflate_exit();</div><div class='del'>-deflate_err:</div><div class='del'>-	z_erofs_lzma_exit();</div><div class='del'>-lzma_err:</div><div class='ctx'> 	erofs_exit_shrinker();</div><div class='ctx'> shrinker_err:</div><div class='ctx'> 	kmem_cache_destroy(erofs_inode_cachep);</div><div class='hunk'>@@ -940,34 +986,29 @@ static void __exit erofs_module_exit(void)</div><div class='ctx'> 	rcu_barrier();</div><div class='ctx'> </div><div class='ctx'> 	erofs_exit_sysfs();</div><div class='del'>-	z_erofs_exit_zip_subsystem();</div><div class='del'>-	z_erofs_deflate_exit();</div><div class='del'>-	z_erofs_lzma_exit();</div><div class='add'>+	z_erofs_exit_subsystem();</div><div class='ctx'> 	erofs_exit_shrinker();</div><div class='ctx'> 	kmem_cache_destroy(erofs_inode_cachep);</div><div class='del'>-	erofs_pcpubuf_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int erofs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='del'>-	u64 id = 0;</div><div class='del'>-</div><div class='del'>-	if (!erofs_is_fscache_mode(sb))</div><div class='del'>-		id = huge_encode_dev(sb-&gt;s_bdev-&gt;bd_dev);</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type = sb-&gt;s_magic;</div><div class='ctx'> 	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='ctx'> 	buf-&gt;f_blocks = sbi-&gt;total_blocks;</div><div class='ctx'> 	buf-&gt;f_bfree = buf-&gt;f_bavail = 0;</div><div class='del'>-</div><div class='ctx'> 	buf-&gt;f_files = ULLONG_MAX;</div><div class='ctx'> 	buf-&gt;f_ffree = ULLONG_MAX - sbi-&gt;inos;</div><div class='del'>-</div><div class='ctx'> 	buf-&gt;f_namelen = EROFS_NAME_LEN;</div><div class='ctx'> </div><div class='del'>-	buf-&gt;f_fsid    = u64_to_fsid(id);</div><div class='add'>+	if (uuid_is_null(&amp;sb-&gt;s_uuid))</div><div class='add'>+		buf-&gt;f_fsid = u64_to_fsid(!sb-&gt;s_bdev ? 0 :</div><div class='add'>+				huge_encode_dev(sb-&gt;s_bdev-&gt;bd_dev));</div><div class='add'>+	else</div><div class='add'>+		buf-&gt;f_fsid = uuid_to_fsid(sb-&gt;s_uuid.b);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -976,43 +1017,47 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(root-&gt;d_sb);</div><div class='ctx'> 	struct erofs_mount_opts *opt = &amp;sbi-&gt;opt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EROFS_FS_XATTR</div><div class='del'>-	if (test_opt(opt, XATTR_USER))</div><div class='del'>-		seq_puts(seq, ",user_xattr");</div><div class='del'>-	else</div><div class='del'>-		seq_puts(seq, ",nouser_xattr");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_EROFS_FS_POSIX_ACL</div><div class='del'>-	if (test_opt(opt, POSIX_ACL))</div><div class='del'>-		seq_puts(seq, ",acl");</div><div class='del'>-	else</div><div class='del'>-		seq_puts(seq, ",noacl");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-	if (opt-&gt;cache_strategy == EROFS_ZIP_CACHE_DISABLED)</div><div class='del'>-		seq_puts(seq, ",cache_strategy=disabled");</div><div class='del'>-	else if (opt-&gt;cache_strategy == EROFS_ZIP_CACHE_READAHEAD)</div><div class='del'>-		seq_puts(seq, ",cache_strategy=readahead");</div><div class='del'>-	else if (opt-&gt;cache_strategy == EROFS_ZIP_CACHE_READAROUND)</div><div class='del'>-		seq_puts(seq, ",cache_strategy=readaround");</div><div class='del'>-#endif</div><div class='add'>+	if (IS_ENABLED(CONFIG_EROFS_FS_XATTR))</div><div class='add'>+		seq_puts(seq, test_opt(opt, XATTR_USER) ?</div><div class='add'>+				",user_xattr" : ",nouser_xattr");</div><div class='add'>+	if (IS_ENABLED(CONFIG_EROFS_FS_POSIX_ACL))</div><div class='add'>+		seq_puts(seq, test_opt(opt, POSIX_ACL) ? ",acl" : ",noacl");</div><div class='add'>+	if (IS_ENABLED(CONFIG_EROFS_FS_ZIP))</div><div class='add'>+		seq_printf(seq, ",cache_strategy=%s",</div><div class='add'>+			  erofs_param_cache_strategy[opt-&gt;cache_strategy].name);</div><div class='ctx'> 	if (test_opt(opt, DAX_ALWAYS))</div><div class='ctx'> 		seq_puts(seq, ",dax=always");</div><div class='ctx'> 	if (test_opt(opt, DAX_NEVER))</div><div class='ctx'> 		seq_puts(seq, ",dax=never");</div><div class='add'>+	if (erofs_is_fileio_mode(sbi) &amp;&amp; test_opt(opt, DIRECT_IO))</div><div class='add'>+		seq_puts(seq, ",directio");</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ONDEMAND</div><div class='ctx'> 	if (sbi-&gt;fsid)</div><div class='ctx'> 		seq_printf(seq, ",fsid=%s", sbi-&gt;fsid);</div><div class='ctx'> 	if (sbi-&gt;domain_id)</div><div class='ctx'> 		seq_printf(seq, ",domain_id=%s", sbi-&gt;domain_id);</div><div class='ctx'> #endif</div><div class='add'>+	if (sbi-&gt;dif0.fsoff)</div><div class='add'>+		seq_printf(seq, ",fsoffset=%llu", sbi-&gt;dif0.fsoff);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void erofs_evict_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FS_DAX</div><div class='add'>+	if (IS_DAX(inode))</div><div class='add'>+		dax_break_layout_final(inode);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='add'>+	clear_inode(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct super_operations erofs_sops = {</div><div class='ctx'> 	.put_super = erofs_put_super,</div><div class='ctx'> 	.alloc_inode = erofs_alloc_inode,</div><div class='ctx'> 	.free_inode = erofs_free_inode,</div><div class='add'>+	.evict_inode = erofs_evict_inode,</div><div class='ctx'> 	.statfs = erofs_statfs,</div><div class='ctx'> 	.show_options = erofs_show_options,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c<br/>index 435e515c0792..1e0658a1d95b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/sysfs.c</a></div><div class='hunk'>@@ -7,11 +7,14 @@</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='add'>+#include "compress.h"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	attr_feature,</div><div class='add'>+	attr_drop_caches,</div><div class='ctx'> 	attr_pointer_ui,</div><div class='ctx'> 	attr_pointer_bool,</div><div class='add'>+	attr_accel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -57,11 +60,26 @@ static struct erofs_attr erofs_attr_##_name = {			\</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='ctx'> EROFS_ATTR_RW_UI(sync_decompress, erofs_mount_opts);</div><div class='add'>+EROFS_ATTR_FUNC(drop_caches, 0200);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP_ACCEL</div><div class='add'>+EROFS_ATTR_FUNC(accel, 0644);</div><div class='add'>+#endif</div><div class='add'>+EROFS_ATTR_RW_UI(dir_ra_bytes, erofs_sb_info);</div><div class='ctx'> </div><div class='del'>-static struct attribute *erofs_attrs[] = {</div><div class='add'>+static struct attribute *erofs_sb_attrs[] = {</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_ZIP</div><div class='ctx'> 	ATTR_LIST(sync_decompress),</div><div class='add'>+	ATTR_LIST(drop_caches),</div><div class='add'>+#endif</div><div class='add'>+	ATTR_LIST(dir_ra_bytes),</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(erofs_sb);</div><div class='add'>+</div><div class='add'>+static struct attribute *erofs_attrs[] = {</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP_ACCEL</div><div class='add'>+	ATTR_LIST(accel),</div><div class='ctx'> #endif</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='hunk'>@@ -78,6 +96,8 @@ EROFS_ATTR_FEATURE(sb_chksum);</div><div class='ctx'> EROFS_ATTR_FEATURE(ztailpacking);</div><div class='ctx'> EROFS_ATTR_FEATURE(fragments);</div><div class='ctx'> EROFS_ATTR_FEATURE(dedupe);</div><div class='add'>+EROFS_ATTR_FEATURE(48bit);</div><div class='add'>+EROFS_ATTR_FEATURE(metabox);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *erofs_feat_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(zero_padding),</div><div class='hunk'>@@ -90,6 +110,8 @@ static struct attribute *erofs_feat_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(ztailpacking),</div><div class='ctx'> 	ATTR_LIST(fragments),</div><div class='ctx'> 	ATTR_LIST(dedupe),</div><div class='add'>+	ATTR_LIST(48bit),</div><div class='add'>+	ATTR_LIST(metabox),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(erofs_feat);</div><div class='hunk'>@@ -123,12 +145,14 @@ static ssize_t erofs_attr_show(struct kobject *kobj,</div><div class='ctx'> 		if (!ptr)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		return sysfs_emit(buf, "%d\n", *(bool *)ptr);</div><div class='add'>+	case attr_accel:</div><div class='add'>+		return z_erofs_crypto_show_engines(buf, PAGE_SIZE, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t erofs_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='del'>-						const char *buf, size_t len)</div><div class='add'>+				const char *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *sbi = container_of(kobj, struct erofs_sb_info,</div><div class='ctx'> 						s_kobj);</div><div class='hunk'>@@ -163,6 +187,33 @@ static ssize_t erofs_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		*(bool *)ptr = !!t;</div><div class='ctx'> 		return len;</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP</div><div class='add'>+	case attr_drop_caches:</div><div class='add'>+		ret = kstrtoul(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (t &lt; 1 || t &gt; 3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (t &amp; 2)</div><div class='add'>+			z_erofs_shrink_scan(sbi, ~0UL);</div><div class='add'>+		if (t &amp; 1)</div><div class='add'>+			invalidate_mapping_pages(MNGD_MAPPING(sbi), 0, -1);</div><div class='add'>+		return len;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_EROFS_FS_ZIP_ACCEL</div><div class='add'>+	case attr_accel:</div><div class='add'>+		buf = skip_spaces(buf);</div><div class='add'>+		z_erofs_crypto_disable_all_engines();</div><div class='add'>+		while (*buf) {</div><div class='add'>+			t = strcspn(buf, "\n");</div><div class='add'>+			ret = z_erofs_crypto_enable_engine(buf, t);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			buf += buf[t] != '\0' ? t + 1 : t;</div><div class='add'>+		}</div><div class='add'>+		return len;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -180,12 +231,13 @@ static const struct sysfs_ops erofs_attr_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct kobj_type erofs_sb_ktype = {</div><div class='del'>-	.default_groups = erofs_groups,</div><div class='add'>+	.default_groups = erofs_sb_groups,</div><div class='ctx'> 	.sysfs_ops	= &amp;erofs_attr_ops,</div><div class='ctx'> 	.release	= erofs_sb_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct kobj_type erofs_ktype = {</div><div class='add'>+	.default_groups = erofs_groups,</div><div class='ctx'> 	.sysfs_ops	= &amp;erofs_attr_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -205,34 +257,16 @@ static struct kobject erofs_feat = {</div><div class='ctx'> int erofs_register_sysfs(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='del'>-	char *name;</div><div class='del'>-	char *str = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (erofs_is_fscache_mode(sb)) {</div><div class='del'>-		if (sbi-&gt;domain_id) {</div><div class='del'>-			str = kasprintf(GFP_KERNEL, "%s,%s", sbi-&gt;domain_id,</div><div class='del'>-					sbi-&gt;fsid);</div><div class='del'>-			if (!str)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			name = str;</div><div class='del'>-		} else {</div><div class='del'>-			name = sbi-&gt;fsid;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		name = sb-&gt;s_id;</div><div class='del'>-	}</div><div class='ctx'> 	sbi-&gt;s_kobj.kset = &amp;erofs_root;</div><div class='ctx'> 	init_completion(&amp;sbi-&gt;s_kobj_unregister);</div><div class='del'>-	err = kobject_init_and_add(&amp;sbi-&gt;s_kobj, &amp;erofs_sb_ktype, NULL, "%s", name);</div><div class='del'>-	kfree(str);</div><div class='del'>-	if (err)</div><div class='del'>-		goto put_sb_kobj;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-put_sb_kobj:</div><div class='del'>-	kobject_put(&amp;sbi-&gt;s_kobj);</div><div class='del'>-	wait_for_completion(&amp;sbi-&gt;s_kobj_unregister);</div><div class='add'>+	err = kobject_init_and_add(&amp;sbi-&gt;s_kobj, &amp;erofs_sb_ktype, NULL, "%s",</div><div class='add'>+				   sb-&gt;s_sysfs_name);</div><div class='add'>+	if (err) {</div><div class='add'>+		kobject_put(&amp;sbi-&gt;s_kobj);</div><div class='add'>+		wait_for_completion(&amp;sbi-&gt;s_kobj_unregister);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -247,6 +281,12 @@ void erofs_unregister_sysfs(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void erofs_exit_sysfs(void)</div><div class='add'>+{</div><div class='add'>+	kobject_put(&amp;erofs_feat);</div><div class='add'>+	kset_unregister(&amp;erofs_root);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init erofs_init_sysfs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -254,24 +294,12 @@ int __init erofs_init_sysfs(void)</div><div class='ctx'> 	kobject_set_name(&amp;erofs_root.kobj, "erofs");</div><div class='ctx'> 	erofs_root.kobj.parent = fs_kobj;</div><div class='ctx'> 	ret = kset_register(&amp;erofs_root);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto root_err;</div><div class='del'>-</div><div class='del'>-	ret = kobject_init_and_add(&amp;erofs_feat, &amp;erofs_feat_ktype,</div><div class='del'>-				   NULL, "features");</div><div class='del'>-	if (ret)</div><div class='del'>-		goto feat_err;</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-feat_err:</div><div class='del'>-	kobject_put(&amp;erofs_feat);</div><div class='del'>-	kset_unregister(&amp;erofs_root);</div><div class='del'>-root_err:</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = kobject_init_and_add(&amp;erofs_feat, &amp;erofs_feat_ktype,</div><div class='add'>+					   NULL, "features");</div><div class='add'>+		if (!ret)</div><div class='add'>+			return 0;</div><div class='add'>+		erofs_exit_sysfs();</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void erofs_exit_sysfs(void)</div><div class='del'>-{</div><div class='del'>-	kobject_put(&amp;erofs_feat);</div><div class='del'>-	kset_unregister(&amp;erofs_root);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/erofs/utils.c b/fs/erofs/utils.c<br/>deleted file mode 100644<br/>index 5dea308764b4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/utils.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,287 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2018 HUAWEI, Inc.</div><div class='del'>- *             https://www.huawei.com/</div><div class='del'>- */</div><div class='del'>-#include "internal.h"</div><div class='del'>-</div><div class='del'>-struct page *erofs_allocpage(struct page **pagepool, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct page *page = *pagepool;</div><div class='del'>-</div><div class='del'>-	if (page) {</div><div class='del'>-		DBG_BUGON(page_ref_count(page) != 1);</div><div class='del'>-		*pagepool = (struct page *)page_private(page);</div><div class='del'>-	} else {</div><div class='del'>-		page = alloc_page(gfp);</div><div class='del'>-	}</div><div class='del'>-	return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void erofs_release_pages(struct page **pagepool)</div><div class='del'>-{</div><div class='del'>-	while (*pagepool) {</div><div class='del'>-		struct page *page = *pagepool;</div><div class='del'>-</div><div class='del'>-		*pagepool = (struct page *)page_private(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EROFS_FS_ZIP</div><div class='del'>-/* global shrink count (for all mounted EROFS instances) */</div><div class='del'>-static atomic_long_t erofs_global_shrink_cnt;</div><div class='del'>-</div><div class='del'>-static bool erofs_workgroup_get(struct erofs_workgroup *grp)</div><div class='del'>-{</div><div class='del'>-	if (lockref_get_not_zero(&amp;grp-&gt;lockref))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;grp-&gt;lockref.lock);</div><div class='del'>-	if (__lockref_is_dead(&amp;grp-&gt;lockref)) {</div><div class='del'>-		spin_unlock(&amp;grp-&gt;lockref.lock);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!grp-&gt;lockref.count++)</div><div class='del'>-		atomic_long_dec(&amp;erofs_global_shrink_cnt);</div><div class='del'>-	spin_unlock(&amp;grp-&gt;lockref.lock);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct erofs_workgroup *erofs_find_workgroup(struct super_block *sb,</div><div class='del'>-					     pgoff_t index)</div><div class='del'>-{</div><div class='del'>-	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='del'>-	struct erofs_workgroup *grp;</div><div class='del'>-</div><div class='del'>-repeat:</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	grp = xa_load(&amp;sbi-&gt;managed_pslots, index);</div><div class='del'>-	if (grp) {</div><div class='del'>-		if (!erofs_workgroup_get(grp)) {</div><div class='del'>-			/* prefer to relax rcu read side */</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			goto repeat;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		DBG_BUGON(index != grp-&gt;index);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return grp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct erofs_workgroup *erofs_insert_workgroup(struct super_block *sb,</div><div class='del'>-					       struct erofs_workgroup *grp)</div><div class='del'>-{</div><div class='del'>-	struct erofs_sb_info *const sbi = EROFS_SB(sb);</div><div class='del'>-	struct erofs_workgroup *pre;</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(grp-&gt;lockref.count &lt; 1);</div><div class='del'>-repeat:</div><div class='del'>-	xa_lock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-	pre = __xa_cmpxchg(&amp;sbi-&gt;managed_pslots, grp-&gt;index,</div><div class='del'>-			   NULL, grp, GFP_NOFS);</div><div class='del'>-	if (pre) {</div><div class='del'>-		if (xa_is_err(pre)) {</div><div class='del'>-			pre = ERR_PTR(xa_err(pre));</div><div class='del'>-		} else if (!erofs_workgroup_get(pre)) {</div><div class='del'>-			/* try to legitimize the current in-tree one */</div><div class='del'>-			xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-			cond_resched();</div><div class='del'>-			goto repeat;</div><div class='del'>-		}</div><div class='del'>-		grp = pre;</div><div class='del'>-	}</div><div class='del'>-	xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-	return grp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void  __erofs_workgroup_free(struct erofs_workgroup *grp)</div><div class='del'>-{</div><div class='del'>-	atomic_long_dec(&amp;erofs_global_shrink_cnt);</div><div class='del'>-	erofs_workgroup_free_rcu(grp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void erofs_workgroup_put(struct erofs_workgroup *grp)</div><div class='del'>-{</div><div class='del'>-	if (lockref_put_or_lock(&amp;grp-&gt;lockref))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(__lockref_is_dead(&amp;grp-&gt;lockref));</div><div class='del'>-	if (grp-&gt;lockref.count == 1)</div><div class='del'>-		atomic_long_inc(&amp;erofs_global_shrink_cnt);</div><div class='del'>-	--grp-&gt;lockref.count;</div><div class='del'>-	spin_unlock(&amp;grp-&gt;lockref.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool erofs_try_to_release_workgroup(struct erofs_sb_info *sbi,</div><div class='del'>-					   struct erofs_workgroup *grp)</div><div class='del'>-{</div><div class='del'>-	int free = false;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;grp-&gt;lockref.lock);</div><div class='del'>-	if (grp-&gt;lockref.count)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note that all cached pages should be detached before deleted from</div><div class='del'>-	 * the XArray. Otherwise some cached pages could be still attached to</div><div class='del'>-	 * the orphan old workgroup when the new one is available in the tree.</div><div class='del'>-	 */</div><div class='del'>-	if (erofs_try_to_free_all_cached_pages(sbi, grp))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It's impossible to fail after the workgroup is freezed,</div><div class='del'>-	 * however in order to avoid some race conditions, add a</div><div class='del'>-	 * DBG_BUGON to observe this in advance.</div><div class='del'>-	 */</div><div class='del'>-	DBG_BUGON(__xa_erase(&amp;sbi-&gt;managed_pslots, grp-&gt;index) != grp);</div><div class='del'>-</div><div class='del'>-	lockref_mark_dead(&amp;grp-&gt;lockref);</div><div class='del'>-	free = true;</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;grp-&gt;lockref.lock);</div><div class='del'>-	if (free)</div><div class='del'>-		__erofs_workgroup_free(grp);</div><div class='del'>-	return free;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,</div><div class='del'>-					      unsigned long nr_shrink)</div><div class='del'>-{</div><div class='del'>-	struct erofs_workgroup *grp;</div><div class='del'>-	unsigned int freed = 0;</div><div class='del'>-	unsigned long index;</div><div class='del'>-</div><div class='del'>-	xa_lock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-	xa_for_each(&amp;sbi-&gt;managed_pslots, index, grp) {</div><div class='del'>-		/* try to shrink each valid workgroup */</div><div class='del'>-		if (!erofs_try_to_release_workgroup(sbi, grp))</div><div class='del'>-			continue;</div><div class='del'>-		xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-</div><div class='del'>-		++freed;</div><div class='del'>-		if (!--nr_shrink)</div><div class='del'>-			return freed;</div><div class='del'>-		xa_lock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-	}</div><div class='del'>-	xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='del'>-	return freed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* protected by 'erofs_sb_list_lock' */</div><div class='del'>-static unsigned int shrinker_run_no;</div><div class='del'>-</div><div class='del'>-/* protects the mounted 'erofs_sb_list' */</div><div class='del'>-static DEFINE_SPINLOCK(erofs_sb_list_lock);</div><div class='del'>-static LIST_HEAD(erofs_sb_list);</div><div class='del'>-</div><div class='del'>-void erofs_shrinker_register(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;sbi-&gt;umount_mutex);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;erofs_sb_list_lock);</div><div class='del'>-	list_add(&amp;sbi-&gt;list, &amp;erofs_sb_list);</div><div class='del'>-	spin_unlock(&amp;erofs_sb_list_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void erofs_shrinker_unregister(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct erofs_sb_info *const sbi = EROFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sbi-&gt;umount_mutex);</div><div class='del'>-	/* clean up all remaining workgroups in memory */</div><div class='del'>-	erofs_shrink_workstation(sbi, ~0UL);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;erofs_sb_list_lock);</div><div class='del'>-	list_del(&amp;sbi-&gt;list);</div><div class='del'>-	spin_unlock(&amp;erofs_sb_list_lock);</div><div class='del'>-	mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long erofs_shrink_count(struct shrinker *shrink,</div><div class='del'>-					struct shrink_control *sc)</div><div class='del'>-{</div><div class='del'>-	return atomic_long_read(&amp;erofs_global_shrink_cnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long erofs_shrink_scan(struct shrinker *shrink,</div><div class='del'>-				       struct shrink_control *sc)</div><div class='del'>-{</div><div class='del'>-	struct erofs_sb_info *sbi;</div><div class='del'>-	struct list_head *p;</div><div class='del'>-</div><div class='del'>-	unsigned long nr = sc-&gt;nr_to_scan;</div><div class='del'>-	unsigned int run_no;</div><div class='del'>-	unsigned long freed = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;erofs_sb_list_lock);</div><div class='del'>-	do {</div><div class='del'>-		run_no = ++shrinker_run_no;</div><div class='del'>-	} while (run_no == 0);</div><div class='del'>-</div><div class='del'>-	/* Iterate over all mounted superblocks and try to shrink them */</div><div class='del'>-	p = erofs_sb_list.next;</div><div class='del'>-	while (p != &amp;erofs_sb_list) {</div><div class='del'>-		sbi = list_entry(p, struct erofs_sb_info, list);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We move the ones we do to the end of the list, so we stop</div><div class='del'>-		 * when we see one we have already done.</div><div class='del'>-		 */</div><div class='del'>-		if (sbi-&gt;shrinker_run_no == run_no)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!mutex_trylock(&amp;sbi-&gt;umount_mutex)) {</div><div class='del'>-			p = p-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;erofs_sb_list_lock);</div><div class='del'>-		sbi-&gt;shrinker_run_no = run_no;</div><div class='del'>-</div><div class='del'>-		freed += erofs_shrink_workstation(sbi, nr - freed);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;erofs_sb_list_lock);</div><div class='del'>-		/* Get the next list element before we move this one */</div><div class='del'>-		p = p-&gt;next;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Move this one to the end of the list to provide some</div><div class='del'>-		 * fairness.</div><div class='del'>-		 */</div><div class='del'>-		list_move_tail(&amp;sbi-&gt;list, &amp;erofs_sb_list);</div><div class='del'>-		mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='del'>-</div><div class='del'>-		if (freed &gt;= nr)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;erofs_sb_list_lock);</div><div class='del'>-	return freed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct shrinker *erofs_shrinker_info;</div><div class='del'>-</div><div class='del'>-int __init erofs_init_shrinker(void)</div><div class='del'>-{</div><div class='del'>-	erofs_shrinker_info = shrinker_alloc(0, "erofs-shrinker");</div><div class='del'>-	if (!erofs_shrinker_info)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	erofs_shrinker_info-&gt;count_objects = erofs_shrink_count;</div><div class='del'>-	erofs_shrinker_info-&gt;scan_objects = erofs_shrink_scan;</div><div class='del'>-</div><div class='del'>-	shrinker_register(erofs_shrinker_info);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void erofs_exit_shrinker(void)</div><div class='del'>-{</div><div class='del'>-	shrinker_free(erofs_shrinker_info);</div><div class='del'>-}</div><div class='del'>-#endif	/* !CONFIG_EROFS_FS_ZIP */</div><div class='head'>diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c<br/>index b58316b49a43..396536d9a862 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/xattr.c</a></div><div class='hunk'>@@ -72,22 +72,24 @@ static int erofs_init_inode_xattrs(struct inode *inode)</div><div class='ctx'> 			ret = -EFSCORRUPTED;</div><div class='ctx'> 			goto out_unlock;	/* xattr ondisk layout error */</div><div class='ctx'> 		}</div><div class='del'>-		ret = -ENOATTR;</div><div class='add'>+		ret = -ENODATA;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	it.buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-	erofs_init_metabuf(&amp;it.buf, sb);</div><div class='add'>+	ret = erofs_init_metabuf(&amp;it.buf, sb, erofs_inode_in_metabox(inode));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	it.pos = erofs_iloc(inode) + vi-&gt;inode_isize;</div><div class='ctx'> </div><div class='ctx'> 	/* read in shared xattr array (non-atomic, see kmalloc below) */</div><div class='del'>-	it.kaddr = erofs_bread(&amp;it.buf, erofs_blknr(sb, it.pos), EROFS_KMAP);</div><div class='add'>+	it.kaddr = erofs_bread(&amp;it.buf, it.pos, true);</div><div class='ctx'> 	if (IS_ERR(it.kaddr)) {</div><div class='ctx'> 		ret = PTR_ERR(it.kaddr);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ih = it.kaddr + erofs_blkoff(sb, it.pos);</div><div class='add'>+	ih = it.kaddr;</div><div class='ctx'> 	vi-&gt;xattr_name_filter = le32_to_cpu(ih-&gt;h_name_filter);</div><div class='ctx'> 	vi-&gt;xattr_shared_count = ih-&gt;h_shared_count;</div><div class='ctx'> 	vi-&gt;xattr_shared_xattrs = kmalloc_array(vi-&gt;xattr_shared_count,</div><div class='hunk'>@@ -102,16 +104,14 @@ static int erofs_init_inode_xattrs(struct inode *inode)</div><div class='ctx'> 	it.pos += sizeof(struct erofs_xattr_ibody_header);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; vi-&gt;xattr_shared_count; ++i) {</div><div class='del'>-		it.kaddr = erofs_bread(&amp;it.buf, erofs_blknr(sb, it.pos),</div><div class='del'>-				       EROFS_KMAP);</div><div class='add'>+		it.kaddr = erofs_bread(&amp;it.buf, it.pos, true);</div><div class='ctx'> 		if (IS_ERR(it.kaddr)) {</div><div class='ctx'> 			kfree(vi-&gt;xattr_shared_xattrs);</div><div class='ctx'> 			vi-&gt;xattr_shared_xattrs = NULL;</div><div class='ctx'> 			ret = PTR_ERR(it.kaddr);</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		vi-&gt;xattr_shared_xattrs[i] = le32_to_cpu(*(__le32 *)</div><div class='del'>-				(it.kaddr + erofs_blkoff(sb, it.pos)));</div><div class='add'>+		vi-&gt;xattr_shared_xattrs[i] = le32_to_cpu(*(__le32 *)it.kaddr);</div><div class='ctx'> 		it.pos += sizeof(__le32);</div><div class='ctx'> 	}</div><div class='ctx'> 	erofs_put_metabuf(&amp;it.buf);</div><div class='hunk'>@@ -185,12 +185,11 @@ static int erofs_xattr_copy_to_buffer(struct erofs_xattr_iter *it,</div><div class='ctx'> 	void *src;</div><div class='ctx'> </div><div class='ctx'> 	for (processed = 0; processed &lt; len; processed += slice) {</div><div class='del'>-		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, erofs_blknr(sb, it-&gt;pos),</div><div class='del'>-					EROFS_KMAP);</div><div class='add'>+		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, it-&gt;pos, true);</div><div class='ctx'> 		if (IS_ERR(it-&gt;kaddr))</div><div class='ctx'> 			return PTR_ERR(it-&gt;kaddr);</div><div class='ctx'> </div><div class='del'>-		src = it-&gt;kaddr + erofs_blkoff(sb, it-&gt;pos);</div><div class='add'>+		src = it-&gt;kaddr;</div><div class='ctx'> 		slice = min_t(unsigned int, sb-&gt;s_blocksize -</div><div class='ctx'> 				erofs_blkoff(sb, it-&gt;pos), len - processed);</div><div class='ctx'> 		memcpy(it-&gt;buffer + it-&gt;buffer_ofs, src, slice);</div><div class='hunk'>@@ -208,8 +207,7 @@ static int erofs_listxattr_foreach(struct erofs_xattr_iter *it)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* 1. handle xattr entry */</div><div class='del'>-	entry = *(struct erofs_xattr_entry *)</div><div class='del'>-			(it-&gt;kaddr + erofs_blkoff(it-&gt;sb, it-&gt;pos));</div><div class='add'>+	entry = *(struct erofs_xattr_entry *)it-&gt;kaddr;</div><div class='ctx'> 	it-&gt;pos += sizeof(struct erofs_xattr_entry);</div><div class='ctx'> </div><div class='ctx'> 	base_index = entry.e_name_index;</div><div class='hunk'>@@ -259,8 +257,7 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)</div><div class='ctx'> 	unsigned int slice, processed, value_sz;</div><div class='ctx'> </div><div class='ctx'> 	/* 1. handle xattr entry */</div><div class='del'>-	entry = *(struct erofs_xattr_entry *)</div><div class='del'>-			(it-&gt;kaddr + erofs_blkoff(sb, it-&gt;pos));</div><div class='add'>+	entry = *(struct erofs_xattr_entry *)it-&gt;kaddr;</div><div class='ctx'> 	it-&gt;pos += sizeof(struct erofs_xattr_entry);</div><div class='ctx'> 	value_sz = le16_to_cpu(entry.e_value_size);</div><div class='ctx'> </div><div class='hunk'>@@ -271,28 +268,27 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)</div><div class='ctx'> 			(entry.e_name_index &amp; EROFS_XATTR_LONG_PREFIX_MASK);</div><div class='ctx'> </div><div class='ctx'> 		if (pf &gt;= sbi-&gt;xattr_prefixes + sbi-&gt;xattr_prefix_count)</div><div class='del'>-			return -ENOATTR;</div><div class='add'>+			return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 		if (it-&gt;index != pf-&gt;prefix-&gt;base_index ||</div><div class='ctx'> 		    it-&gt;name.len != entry.e_name_len + pf-&gt;infix_len)</div><div class='del'>-			return -ENOATTR;</div><div class='add'>+			return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 		if (memcmp(it-&gt;name.name, pf-&gt;prefix-&gt;infix, pf-&gt;infix_len))</div><div class='del'>-			return -ENOATTR;</div><div class='add'>+			return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 		it-&gt;infix_len = pf-&gt;infix_len;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (it-&gt;index != entry.e_name_index ||</div><div class='ctx'> 		    it-&gt;name.len != entry.e_name_len)</div><div class='del'>-			return -ENOATTR;</div><div class='add'>+			return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 		it-&gt;infix_len = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 2. handle xattr name */</div><div class='ctx'> 	for (processed = 0; processed &lt; entry.e_name_len; processed += slice) {</div><div class='del'>-		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, erofs_blknr(sb, it-&gt;pos),</div><div class='del'>-					EROFS_KMAP);</div><div class='add'>+		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, it-&gt;pos, true);</div><div class='ctx'> 		if (IS_ERR(it-&gt;kaddr))</div><div class='ctx'> 			return PTR_ERR(it-&gt;kaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -300,8 +296,8 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)</div><div class='ctx'> 				sb-&gt;s_blocksize - erofs_blkoff(sb, it-&gt;pos),</div><div class='ctx'> 				entry.e_name_len - processed);</div><div class='ctx'> 		if (memcmp(it-&gt;name.name + it-&gt;infix_len + processed,</div><div class='del'>-			   it-&gt;kaddr + erofs_blkoff(sb, it-&gt;pos), slice))</div><div class='del'>-			return -ENOATTR;</div><div class='add'>+			   it-&gt;kaddr, slice))</div><div class='add'>+			return -ENODATA;</div><div class='ctx'> 		it-&gt;pos += slice;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -329,20 +325,21 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,</div><div class='ctx'> 			  sizeof(u32) * vi-&gt;xattr_shared_count;</div><div class='ctx'> 	if (xattr_header_sz &gt;= vi-&gt;xattr_isize) {</div><div class='ctx'> 		DBG_BUGON(xattr_header_sz &gt; vi-&gt;xattr_isize);</div><div class='del'>-		return -ENOATTR;</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = erofs_init_metabuf(&amp;it-&gt;buf, it-&gt;sb, erofs_inode_in_metabox(inode));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	remaining = vi-&gt;xattr_isize - xattr_header_sz;</div><div class='ctx'> 	it-&gt;pos = erofs_iloc(inode) + vi-&gt;inode_isize + xattr_header_sz;</div><div class='ctx'> </div><div class='ctx'> 	while (remaining) {</div><div class='del'>-		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, erofs_blknr(it-&gt;sb, it-&gt;pos),</div><div class='del'>-					EROFS_KMAP);</div><div class='add'>+		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, it-&gt;pos, true);</div><div class='ctx'> 		if (IS_ERR(it-&gt;kaddr))</div><div class='ctx'> 			return PTR_ERR(it-&gt;kaddr);</div><div class='ctx'> </div><div class='del'>-		entry_sz = erofs_xattr_entry_size(it-&gt;kaddr +</div><div class='del'>-				erofs_blkoff(it-&gt;sb, it-&gt;pos));</div><div class='add'>+		entry_sz = erofs_xattr_entry_size(it-&gt;kaddr);</div><div class='ctx'> 		/* xattr on-disk corruption: xattr entry beyond xattr_isize */</div><div class='ctx'> 		if (remaining &lt; entry_sz) {</div><div class='ctx'> 			DBG_BUGON(1);</div><div class='hunk'>@@ -355,7 +352,7 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,</div><div class='ctx'> 			ret = erofs_getxattr_foreach(it);</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = erofs_listxattr_foreach(it);</div><div class='del'>-		if ((getxattr &amp;&amp; ret != -ENOATTR) || (!getxattr &amp;&amp; ret))</div><div class='add'>+		if ((getxattr &amp;&amp; ret != -ENODATA) || (!getxattr &amp;&amp; ret))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		it-&gt;pos = next_pos;</div><div class='hunk'>@@ -369,14 +366,18 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_iter *it,</div><div class='ctx'> 	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='ctx'> 	struct super_block *const sb = it-&gt;sb;</div><div class='ctx'> 	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int ret = -ENOATTR;</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; vi-&gt;xattr_shared_count; ++i) {</div><div class='add'>+	ret = erofs_init_metabuf(&amp;it-&gt;buf, sb,</div><div class='add'>+				 erofs_sb_has_shared_ea_in_metabox(sbi));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	while (i &lt; vi-&gt;xattr_shared_count) {</div><div class='ctx'> 		it-&gt;pos = erofs_pos(sb, sbi-&gt;xattr_blkaddr) +</div><div class='del'>-				vi-&gt;xattr_shared_xattrs[i] * sizeof(__le32);</div><div class='del'>-		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, erofs_blknr(sb, it-&gt;pos),</div><div class='del'>-					EROFS_KMAP);</div><div class='add'>+				vi-&gt;xattr_shared_xattrs[i++] * sizeof(__le32);</div><div class='add'>+		it-&gt;kaddr = erofs_bread(&amp;it-&gt;buf, it-&gt;pos, true);</div><div class='ctx'> 		if (IS_ERR(it-&gt;kaddr))</div><div class='ctx'> 			return PTR_ERR(it-&gt;kaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -384,10 +385,10 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_iter *it,</div><div class='ctx'> 			ret = erofs_getxattr_foreach(it);</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = erofs_listxattr_foreach(it);</div><div class='del'>-		if ((getxattr &amp;&amp; ret != -ENOATTR) || (!getxattr &amp;&amp; ret))</div><div class='add'>+		if ((getxattr &amp;&amp; ret != -ENODATA) || (!getxattr &amp;&amp; ret))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	return i ? ret : -ENODATA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int erofs_getxattr(struct inode *inode, int index, const char *name,</div><div class='hunk'>@@ -412,23 +413,22 @@ int erofs_getxattr(struct inode *inode, int index, const char *name,</div><div class='ctx'> 				EROFS_XATTR_FILTER_SEED + index);</div><div class='ctx'> 		hashbit &amp;= EROFS_XATTR_FILTER_BITS - 1;</div><div class='ctx'> 		if (vi-&gt;xattr_name_filter &amp; (1U &lt;&lt; hashbit))</div><div class='del'>-			return -ENOATTR;</div><div class='add'>+			return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	it.index = index;</div><div class='del'>-	it.name = (struct qstr)QSTR_INIT(name, strlen(name));</div><div class='add'>+	it.name = QSTR(name);</div><div class='ctx'> 	if (it.name.len &gt; EROFS_NAME_LEN)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	it.sb = inode-&gt;i_sb;</div><div class='ctx'> 	it.buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-	erofs_init_metabuf(&amp;it.buf, it.sb);</div><div class='ctx'> 	it.buffer = buffer;</div><div class='ctx'> 	it.buffer_size = buffer_size;</div><div class='ctx'> 	it.buffer_ofs = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = erofs_xattr_iter_inline(&amp;it, inode, true);</div><div class='del'>-	if (ret == -ENOATTR)</div><div class='add'>+	if (ret == -ENODATA)</div><div class='ctx'> 		ret = erofs_xattr_iter_shared(&amp;it, inode, true);</div><div class='ctx'> 	erofs_put_metabuf(&amp;it.buf);</div><div class='ctx'> 	return ret ? ret : it.buffer_ofs;</div><div class='hunk'>@@ -441,23 +441,22 @@ ssize_t erofs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='ctx'> 	ret = erofs_init_inode_xattrs(inode);</div><div class='del'>-	if (ret == -ENOATTR)</div><div class='add'>+	if (ret == -ENODATA)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	it.sb = dentry-&gt;d_sb;</div><div class='ctx'> 	it.buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-	erofs_init_metabuf(&amp;it.buf, it.sb);</div><div class='ctx'> 	it.dentry = dentry;</div><div class='ctx'> 	it.buffer = buffer;</div><div class='ctx'> 	it.buffer_size = buffer_size;</div><div class='ctx'> 	it.buffer_ofs = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = erofs_xattr_iter_inline(&amp;it, inode, false);</div><div class='del'>-	if (!ret || ret == -ENOATTR)</div><div class='add'>+	if (!ret || ret == -ENODATA)</div><div class='ctx'> 		ret = erofs_xattr_iter_shared(&amp;it, inode, false);</div><div class='del'>-	if (ret == -ENOATTR)</div><div class='add'>+	if (ret == -ENODATA)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	erofs_put_metabuf(&amp;it.buf);</div><div class='ctx'> 	return ret ? ret : it.buffer_ofs;</div><div class='hunk'>@@ -483,18 +482,25 @@ int erofs_xattr_prefixes_init(struct super_block *sb)</div><div class='ctx'> 	erofs_off_t pos = (erofs_off_t)sbi-&gt;xattr_prefix_start &lt;&lt; 2;</div><div class='ctx'> 	struct erofs_xattr_prefix_item *pfs;</div><div class='ctx'> 	int ret = 0, i, len;</div><div class='add'>+	bool plain = erofs_sb_has_plain_xattr_pfx(sbi);</div><div class='ctx'> </div><div class='ctx'> 	if (!sbi-&gt;xattr_prefix_count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pfs = kzalloc(sbi-&gt;xattr_prefix_count * sizeof(*pfs), GFP_KERNEL);</div><div class='add'>+	pfs = kcalloc(sbi-&gt;xattr_prefix_count, sizeof(*pfs), GFP_KERNEL);</div><div class='ctx'> 	if (!pfs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (sbi-&gt;packed_inode)</div><div class='del'>-		buf.inode = sbi-&gt;packed_inode;</div><div class='del'>-	else</div><div class='del'>-		erofs_init_metabuf(&amp;buf, sb);</div><div class='add'>+	if (!plain) {</div><div class='add'>+		if (erofs_sb_has_metabox(sbi))</div><div class='add'>+			(void)erofs_init_metabuf(&amp;buf, sb, true);</div><div class='add'>+		else if (sbi-&gt;packed_inode)</div><div class='add'>+			buf.mapping = sbi-&gt;packed_inode-&gt;i_mapping;</div><div class='add'>+		else</div><div class='add'>+			plain = true;</div><div class='add'>+	}</div><div class='add'>+	if (plain)</div><div class='add'>+		(void)erofs_init_metabuf(&amp;buf, sb, false);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sbi-&gt;xattr_prefix_count; i++) {</div><div class='ctx'> 		void *ptr = erofs_read_metadata(sb, &amp;buf, &amp;pos, &amp;len);</div><div class='hunk'>@@ -548,7 +554,7 @@ struct posix_acl *erofs_get_acl(struct inode *inode, int type, bool rcu)</div><div class='ctx'> 		rc = erofs_getxattr(inode, prefix, "", value, rc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rc == -ENOATTR)</div><div class='add'>+	if (rc == -ENODATA)</div><div class='ctx'> 		acl = NULL;</div><div class='ctx'> 	else if (rc &lt; 0)</div><div class='ctx'> 		acl = ERR_PTR(rc);</div><div class='head'>diff --git a/fs/erofs/xattr.h b/fs/erofs/xattr.h<br/>index b246cd0e135e..6317caa8413e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/xattr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/xattr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/xattr.h</a></div><div class='hunk'>@@ -10,9 +10,6 @@</div><div class='ctx'> #include &lt;linux/posix_acl_xattr.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Attribute not found */</div><div class='del'>-#define ENOATTR         ENODATA</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_XATTR</div><div class='ctx'> extern const struct xattr_handler erofs_xattr_user_handler;</div><div class='ctx'> extern const struct xattr_handler erofs_xattr_trusted_handler;</div><div class='head'>diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c<br/>index 692c0c39be63..65da21504632 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/zdata.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/zdata.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/zdata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/zdata.c</a></div><div class='hunk'>@@ -12,12 +12,6 @@</div><div class='ctx'> #define Z_EROFS_PCLUSTER_MAX_PAGES	(Z_EROFS_PCLUSTER_MAX_SIZE / PAGE_SIZE)</div><div class='ctx'> #define Z_EROFS_INLINE_BVECS		2</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * let's leave a type here in case of introducing</div><div class='del'>- * another tagged pointer later.</div><div class='del'>- */</div><div class='del'>-typedef void *z_erofs_next_pcluster_t;</div><div class='del'>-</div><div class='ctx'> struct z_erofs_bvec {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	int offset;</div><div class='hunk'>@@ -44,11 +38,14 @@ __Z_EROFS_BVSET(z_erofs_bvset_inline, Z_EROFS_INLINE_BVECS);</div><div class='ctx'>  * A: Field should be accessed / updated in atomic for parallelized code.</div><div class='ctx'>  */</div><div class='ctx'> struct z_erofs_pcluster {</div><div class='del'>-	struct erofs_workgroup obj;</div><div class='ctx'> 	struct mutex lock;</div><div class='add'>+	struct lockref lockref;</div><div class='ctx'> </div><div class='ctx'> 	/* A: point to next chained pcluster or TAILs */</div><div class='del'>-	z_erofs_next_pcluster_t next;</div><div class='add'>+	struct z_erofs_pcluster *next;</div><div class='add'>+</div><div class='add'>+	/* I: start physical position of this pcluster */</div><div class='add'>+	erofs_off_t pos;</div><div class='ctx'> </div><div class='ctx'> 	/* L: the maximum decompression size of this round */</div><div class='ctx'> 	unsigned int length;</div><div class='hunk'>@@ -76,11 +73,14 @@ struct z_erofs_pcluster {</div><div class='ctx'> 	/* I: compression algorithm format */</div><div class='ctx'> 	unsigned char algorithmformat;</div><div class='ctx'> </div><div class='add'>+	/* I: whether compressed data is in-lined or not */</div><div class='add'>+	bool from_meta;</div><div class='add'>+</div><div class='ctx'> 	/* L: whether partial decompression or not */</div><div class='ctx'> 	bool partial;</div><div class='ctx'> </div><div class='del'>-	/* L: indicate several pageofs_outs or not */</div><div class='del'>-	bool multibases;</div><div class='add'>+	/* L: whether extra buffer allocations are best-effort */</div><div class='add'>+	bool besteffort;</div><div class='ctx'> </div><div class='ctx'> 	/* A: compressed bvecs (can be cached or inplaced pages) */</div><div class='ctx'> 	struct z_erofs_bvec compressed_bvecs[];</div><div class='hunk'>@@ -88,12 +88,11 @@ struct z_erofs_pcluster {</div><div class='ctx'> </div><div class='ctx'> /* the end of a chain of pclusters */</div><div class='ctx'> #define Z_EROFS_PCLUSTER_TAIL           ((void *) 0x700 + POISON_POINTER_DELTA)</div><div class='del'>-#define Z_EROFS_PCLUSTER_NIL            (NULL)</div><div class='ctx'> </div><div class='ctx'> struct z_erofs_decompressqueue {</div><div class='ctx'> 	struct super_block *sb;</div><div class='add'>+	struct z_erofs_pcluster *head;</div><div class='ctx'> 	atomic_t pending_bios;</div><div class='del'>-	z_erofs_next_pcluster_t head;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct completion done;</div><div class='hunk'>@@ -103,57 +102,14 @@ struct z_erofs_decompressqueue {</div><div class='ctx'> 	bool eio, sync;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool z_erofs_is_inline_pcluster(struct z_erofs_pcluster *pcl)</div><div class='del'>-{</div><div class='del'>-	return !pcl-&gt;obj.index;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int z_erofs_pclusterpages(struct z_erofs_pcluster *pcl)</div><div class='ctx'> {</div><div class='del'>-	return PAGE_ALIGN(pcl-&gt;pclustersize) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bit 30: I/O error occurred on this page</div><div class='del'>- * bit 0 - 29: remaining parts to complete this page</div><div class='del'>- */</div><div class='del'>-#define Z_EROFS_PAGE_EIO			(1 &lt;&lt; 30)</div><div class='del'>-</div><div class='del'>-static inline void z_erofs_onlinepage_init(struct page *page)</div><div class='del'>-{</div><div class='del'>-	union {</div><div class='del'>-		atomic_t o;</div><div class='del'>-		unsigned long v;</div><div class='del'>-	} u = { .o = ATOMIC_INIT(1) };</div><div class='del'>-</div><div class='del'>-	set_page_private(page, u.v);</div><div class='del'>-	smp_wmb();</div><div class='del'>-	SetPagePrivate(page);</div><div class='add'>+	return PAGE_ALIGN(pcl-&gt;pageofs_in + pcl-&gt;pclustersize) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void z_erofs_onlinepage_split(struct page *page)</div><div class='add'>+static bool erofs_folio_is_managed(struct erofs_sb_info *sbi, struct folio *fo)</div><div class='ctx'> {</div><div class='del'>-	atomic_inc((atomic_t *)&amp;page-&gt;private);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void z_erofs_onlinepage_endio(struct page *page, int err)</div><div class='del'>-{</div><div class='del'>-	int orig, v;</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(!PagePrivate(page));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		orig = atomic_read((atomic_t *)&amp;page-&gt;private);</div><div class='del'>-		v = (orig - 1) | (err ? Z_EROFS_PAGE_EIO : 0);</div><div class='del'>-	} while (atomic_cmpxchg((atomic_t *)&amp;page-&gt;private, orig, v) != orig);</div><div class='del'>-</div><div class='del'>-	if (!(v &amp; ~Z_EROFS_PAGE_EIO)) {</div><div class='del'>-		set_page_private(page, 0);</div><div class='del'>-		ClearPagePrivate(page);</div><div class='del'>-		if (!(v &amp; Z_EROFS_PAGE_EIO))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-	}</div><div class='add'>+	return fo-&gt;mapping == MNGD_MAPPING(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define Z_EROFS_ONSTACK_PAGES		32</div><div class='hunk'>@@ -172,7 +128,7 @@ struct z_erofs_pcluster_slab {</div><div class='ctx'> </div><div class='ctx'> static struct z_erofs_pcluster_slab pcluster_pool[] __read_mostly = {</div><div class='ctx'> 	_PCLP(1), _PCLP(4), _PCLP(16), _PCLP(64), _PCLP(128),</div><div class='del'>-	_PCLP(Z_EROFS_PCLUSTER_MAX_PAGES)</div><div class='add'>+	_PCLP(Z_EROFS_PCLUSTER_MAX_PAGES + 1)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct z_erofs_bvec_iter {</div><div class='hunk'>@@ -230,7 +186,8 @@ static int z_erofs_bvec_enqueue(struct z_erofs_bvec_iter *iter,</div><div class='ctx'> 		struct page *nextpage = *candidate_bvpage;</div><div class='ctx'> </div><div class='ctx'> 		if (!nextpage) {</div><div class='del'>-			nextpage = erofs_allocpage(pagepool, GFP_NOFS);</div><div class='add'>+			nextpage = __erofs_allocpage(pagepool, GFP_KERNEL,</div><div class='add'>+					true);</div><div class='ctx'> 			if (!nextpage)</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			set_page_private(nextpage, Z_EROFS_SHORTLIVED_PAGE);</div><div class='hunk'>@@ -302,10 +259,9 @@ static struct z_erofs_pcluster *z_erofs_alloc_pcluster(unsigned int size)</div><div class='ctx'> 		if (nrpages &gt; pcs-&gt;maxpages)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		pcl = kmem_cache_zalloc(pcs-&gt;slab, GFP_NOFS);</div><div class='add'>+		pcl = kmem_cache_zalloc(pcs-&gt;slab, GFP_KERNEL);</div><div class='ctx'> 		if (!pcl)</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='del'>-		pcl-&gt;pclustersize = size;</div><div class='ctx'> 		return pcl;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -332,6 +288,7 @@ static struct workqueue_struct *z_erofs_workqueue __read_mostly;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EROFS_FS_PCPU_KTHREAD</div><div class='ctx'> static struct kthread_worker __rcu **z_erofs_pcpu_workers;</div><div class='add'>+static atomic_t erofs_percpu_workers_initialized = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> static void erofs_destroy_percpu_workers(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -351,7 +308,7 @@ static void erofs_destroy_percpu_workers(void)</div><div class='ctx'> static struct kthread_worker *erofs_init_percpu_worker(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kthread_worker *worker =</div><div class='del'>-		kthread_create_worker_on_cpu(cpu, 0, "erofs_worker/%u", cpu);</div><div class='add'>+		kthread_run_worker_on_cpu(cpu, 0, "erofs_worker/%u");</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(worker))</div><div class='ctx'> 		return worker;</div><div class='hunk'>@@ -377,12 +334,8 @@ static int erofs_init_percpu_workers(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline void erofs_destroy_percpu_workers(void) {}</div><div class='del'>-static inline int erofs_init_percpu_workers(void) { return 0; }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_HOTPLUG_CPU) &amp;&amp; defined(CONFIG_EROFS_FS_PCPU_KTHREAD)</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> static DEFINE_SPINLOCK(z_erofs_pcpu_worker_lock);</div><div class='ctx'> static enum cpuhp_state erofs_cpuhp_state;</div><div class='ctx'> </div><div class='hunk'>@@ -439,86 +392,114 @@ static void erofs_cpu_hotplug_destroy(void)</div><div class='ctx'> 	if (erofs_cpuhp_state)</div><div class='ctx'> 		cpuhp_remove_state_nocalls(erofs_cpuhp_state);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_HOTPLUG_CPU || !CONFIG_EROFS_FS_PCPU_KTHREAD */</div><div class='add'>+#else /* !CONFIG_HOTPLUG_CPU  */</div><div class='ctx'> static inline int erofs_cpu_hotplug_init(void) { return 0; }</div><div class='ctx'> static inline void erofs_cpu_hotplug_destroy(void) {}</div><div class='del'>-#endif</div><div class='add'>+#endif/* CONFIG_HOTPLUG_CPU */</div><div class='add'>+static int z_erofs_init_pcpu_workers(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (atomic_xchg(&amp;erofs_percpu_workers_initialized, 1))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = erofs_init_percpu_workers();</div><div class='add'>+	if (err) {</div><div class='add'>+		erofs_err(sb, "per-cpu workers: failed to allocate.");</div><div class='add'>+		goto err_init_percpu_workers;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = erofs_cpu_hotplug_init();</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		erofs_err(sb, "per-cpu workers: failed CPU hotplug init.");</div><div class='add'>+		goto err_cpuhp_init;</div><div class='add'>+	}</div><div class='add'>+	erofs_info(sb, "initialized per-cpu workers successfully.");</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_cpuhp_init:</div><div class='add'>+	erofs_destroy_percpu_workers();</div><div class='add'>+err_init_percpu_workers:</div><div class='add'>+	atomic_set(&amp;erofs_percpu_workers_initialized, 0);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-void z_erofs_exit_zip_subsystem(void)</div><div class='add'>+static void z_erofs_destroy_pcpu_workers(void)</div><div class='ctx'> {</div><div class='add'>+	if (!atomic_xchg(&amp;erofs_percpu_workers_initialized, 0))</div><div class='add'>+		return;</div><div class='ctx'> 	erofs_cpu_hotplug_destroy();</div><div class='ctx'> 	erofs_destroy_percpu_workers();</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_EROFS_FS_PCPU_KTHREAD */</div><div class='add'>+static inline int z_erofs_init_pcpu_workers(struct super_block *sb) { return 0; }</div><div class='add'>+static inline void z_erofs_destroy_pcpu_workers(void) {}</div><div class='add'>+#endif/* CONFIG_EROFS_FS_PCPU_KTHREAD */</div><div class='add'>+</div><div class='add'>+void z_erofs_exit_subsystem(void)</div><div class='add'>+{</div><div class='add'>+	z_erofs_destroy_pcpu_workers();</div><div class='ctx'> 	destroy_workqueue(z_erofs_workqueue);</div><div class='ctx'> 	z_erofs_destroy_pcluster_pool();</div><div class='add'>+	z_erofs_crypto_disable_all_engines();</div><div class='add'>+	z_erofs_exit_decompressor();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init z_erofs_init_zip_subsystem(void)</div><div class='add'>+int __init z_erofs_init_subsystem(void)</div><div class='ctx'> {</div><div class='del'>-	int err = z_erofs_create_pcluster_pool();</div><div class='add'>+	int err = z_erofs_init_decompressor();</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_decompressor;</div><div class='ctx'> </div><div class='add'>+	err = z_erofs_create_pcluster_pool();</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_error_pcluster_pool;</div><div class='add'>+		goto err_pcluster_pool;</div><div class='ctx'> </div><div class='ctx'> 	z_erofs_workqueue = alloc_workqueue("erofs_worker",</div><div class='ctx'> 			WQ_UNBOUND | WQ_HIGHPRI, num_possible_cpus());</div><div class='ctx'> 	if (!z_erofs_workqueue) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out_error_workqueue_init;</div><div class='add'>+		goto err_workqueue_init;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = erofs_init_percpu_workers();</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_error_pcpu_worker;</div><div class='del'>-</div><div class='del'>-	err = erofs_cpu_hotplug_init();</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_error_cpuhp_init;</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>-out_error_cpuhp_init:</div><div class='del'>-	erofs_destroy_percpu_workers();</div><div class='del'>-out_error_pcpu_worker:</div><div class='del'>-	destroy_workqueue(z_erofs_workqueue);</div><div class='del'>-out_error_workqueue_init:</div><div class='add'>+err_workqueue_init:</div><div class='ctx'> 	z_erofs_destroy_pcluster_pool();</div><div class='del'>-out_error_pcluster_pool:</div><div class='add'>+err_pcluster_pool:</div><div class='add'>+	z_erofs_exit_decompressor();</div><div class='add'>+err_decompressor:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum z_erofs_pclustermode {</div><div class='add'>+	/* It has previously been linked into another processing chain */</div><div class='ctx'> 	Z_EROFS_PCLUSTER_INFLIGHT,</div><div class='ctx'> 	/*</div><div class='del'>-	 * a weak form of Z_EROFS_PCLUSTER_FOLLOWED, the difference is that it</div><div class='del'>-	 * could be dispatched into bypass queue later due to uptodated managed</div><div class='del'>-	 * pages. All related online pages cannot be reused for inplace I/O (or</div><div class='del'>-	 * bvpage) since it can be directly decoded without I/O submission.</div><div class='add'>+	 * A weaker form of Z_EROFS_PCLUSTER_FOLLOWED; the difference is that it</div><div class='add'>+	 * may be dispatched to the bypass queue later due to uptodated managed</div><div class='add'>+	 * folios.  All file-backed folios related to this pcluster cannot be</div><div class='add'>+	 * reused for in-place I/O (or bvpage) since the pcluster may be decoded</div><div class='add'>+	 * in a separate queue (and thus out of order).</div><div class='ctx'> 	 */</div><div class='ctx'> 	Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE,</div><div class='ctx'> 	/*</div><div class='del'>-	 * The pcluster was just linked to a decompression chain by us.  It can</div><div class='del'>-	 * also be linked with the remaining pclusters, which means if the</div><div class='del'>-	 * processing page is the tail page of a pcluster, this pcluster can</div><div class='del'>-	 * safely use the whole page (since the previous pcluster is within the</div><div class='del'>-	 * same chain) for in-place I/O, as illustrated below:</div><div class='del'>-	 *  ___________________________________________________</div><div class='del'>-	 * |  tail (partial) page  |    head (partial) page    |</div><div class='del'>-	 * |  (of the current pcl) |   (of the previous pcl)   |</div><div class='del'>-	 * |___PCLUSTER_FOLLOWED___|_____PCLUSTER_FOLLOWED_____|</div><div class='del'>-	 *</div><div class='del'>-	 * [  (*) the page above can be used as inplace I/O.   ]</div><div class='add'>+	 * The pcluster has just been linked to our processing chain.</div><div class='add'>+	 * File-backed folios (except for the head page) related to it can be</div><div class='add'>+	 * used for in-place I/O (or bvpage).</div><div class='ctx'> 	 */</div><div class='ctx'> 	Z_EROFS_PCLUSTER_FOLLOWED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct z_erofs_decompress_frontend {</div><div class='add'>+struct z_erofs_frontend {</div><div class='ctx'> 	struct inode *const inode;</div><div class='ctx'> 	struct erofs_map_blocks map;</div><div class='ctx'> 	struct z_erofs_bvec_iter biter;</div><div class='ctx'> </div><div class='ctx'> 	struct page *pagepool;</div><div class='ctx'> 	struct page *candidate_bvpage;</div><div class='del'>-	struct z_erofs_pcluster *pcl;</div><div class='del'>-	z_erofs_next_pcluster_t owned_head;</div><div class='add'>+	struct z_erofs_pcluster *pcl, *head;</div><div class='ctx'> 	enum z_erofs_pclustermode mode;</div><div class='ctx'> </div><div class='ctx'> 	erofs_off_t headoffset;</div><div class='hunk'>@@ -527,11 +508,11 @@ struct z_erofs_decompress_frontend {</div><div class='ctx'> 	unsigned int icur;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DECOMPRESS_FRONTEND_INIT(__i) { \</div><div class='del'>-	.inode = __i, .owned_head = Z_EROFS_PCLUSTER_TAIL, \</div><div class='del'>-	.mode = Z_EROFS_PCLUSTER_FOLLOWED }</div><div class='add'>+#define Z_EROFS_DEFINE_FRONTEND(fe, i, ho) struct z_erofs_frontend fe = { \</div><div class='add'>+	.inode = i, .head = Z_EROFS_PCLUSTER_TAIL, \</div><div class='add'>+	.mode = Z_EROFS_PCLUSTER_FOLLOWED, .headoffset = ho }</div><div class='ctx'> </div><div class='del'>-static bool z_erofs_should_alloc_cache(struct z_erofs_decompress_frontend *fe)</div><div class='add'>+static bool z_erofs_should_alloc_cache(struct z_erofs_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cachestrategy = EROFS_I_SB(fe-&gt;inode)-&gt;opt.cache_strategy;</div><div class='ctx'> </div><div class='hunk'>@@ -548,104 +529,87 @@ static bool z_erofs_should_alloc_cache(struct z_erofs_decompress_frontend *fe)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_bind_cache(struct z_erofs_decompress_frontend *fe)</div><div class='add'>+static void z_erofs_bind_cache(struct z_erofs_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mc = MNGD_MAPPING(EROFS_I_SB(fe-&gt;inode));</div><div class='ctx'> 	struct z_erofs_pcluster *pcl = fe-&gt;pcl;</div><div class='ctx'> 	unsigned int pclusterpages = z_erofs_pclusterpages(pcl);</div><div class='ctx'> 	bool shouldalloc = z_erofs_should_alloc_cache(fe);</div><div class='del'>-	bool standalone = true;</div><div class='del'>-	/*</div><div class='del'>-	 * optimistic allocation without direct reclaim since inplace I/O</div><div class='del'>-	 * can be used if low memory otherwise.</div><div class='del'>-	 */</div><div class='add'>+	pgoff_t poff = pcl-&gt;pos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	bool may_bypass = true;</div><div class='add'>+	/* Optimistic allocation, as in-place I/O can be used as a fallback */</div><div class='ctx'> 	gfp_t gfp = (mapping_gfp_mask(mc) &amp; ~__GFP_DIRECT_RECLAIM) |</div><div class='ctx'> 			__GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN;</div><div class='add'>+	struct folio *folio, *newfolio;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	if (i_blocksize(fe-&gt;inode) != PAGE_SIZE)</div><div class='del'>-		return;</div><div class='del'>-	if (fe-&gt;mode &lt; Z_EROFS_PCLUSTER_FOLLOWED)</div><div class='add'>+	if (i_blocksize(fe-&gt;inode) != PAGE_SIZE ||</div><div class='add'>+	    fe-&gt;mode &lt; Z_EROFS_PCLUSTER_FOLLOWED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pclusterpages; ++i) {</div><div class='del'>-		struct page *page, *newpage;</div><div class='del'>-		void *t;	/* mark pages just found for debugging */</div><div class='del'>-</div><div class='del'>-		/* the compressed page was loaded before */</div><div class='add'>+		/* Inaccurate check w/o locking to avoid unneeded lookups */</div><div class='ctx'> 		if (READ_ONCE(pcl-&gt;compressed_bvecs[i].page))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		page = find_get_page(mc, pcl-&gt;obj.index + i);</div><div class='del'>-</div><div class='del'>-		if (page) {</div><div class='del'>-			t = (void *)((unsigned long)page | 1);</div><div class='del'>-			newpage = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			/* I/O is needed, no possible to decompress directly */</div><div class='del'>-			standalone = false;</div><div class='add'>+		folio = filemap_get_folio(mc, poff + i);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			may_bypass = false;</div><div class='ctx'> 			if (!shouldalloc)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * Try cached I/O if allocation succeeds or fallback to</div><div class='del'>-			 * in-place I/O instead to avoid any direct reclaim.</div><div class='add'>+			 * Allocate a managed folio for cached I/O, or it may be</div><div class='add'>+			 * then filled with a file-backed folio for in-place I/O</div><div class='ctx'> 			 */</div><div class='del'>-			newpage = erofs_allocpage(&amp;fe-&gt;pagepool, gfp);</div><div class='del'>-			if (!newpage)</div><div class='add'>+			newfolio = filemap_alloc_folio(gfp, 0, NULL);</div><div class='add'>+			if (!newfolio)</div><div class='ctx'> 				continue;</div><div class='del'>-			set_page_private(newpage, Z_EROFS_PREALLOCATED_PAGE);</div><div class='del'>-			t = (void *)((unsigned long)newpage | 1);</div><div class='add'>+			newfolio-&gt;private = Z_EROFS_PREALLOCATED_FOLIO;</div><div class='add'>+			folio = NULL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (!cmpxchg_relaxed(&amp;pcl-&gt;compressed_bvecs[i].page, NULL, t))</div><div class='add'>+		spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+		if (!pcl-&gt;compressed_bvecs[i].page) {</div><div class='add'>+			pcl-&gt;compressed_bvecs[i].page =</div><div class='add'>+				folio_page(folio ?: newfolio, 0);</div><div class='add'>+			spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='ctx'> 			continue;</div><div class='del'>-</div><div class='del'>-		if (page)</div><div class='del'>-			put_page(page);</div><div class='del'>-		else if (newpage)</div><div class='del'>-			erofs_pagepool_add(&amp;fe-&gt;pagepool, newpage);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+		folio_put(folio ?: newfolio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * don't do inplace I/O if all compressed pages are available in</div><div class='del'>-	 * managed cache since it can be moved to the bypass queue instead.</div><div class='add'>+	 * Don't perform in-place I/O if all compressed pages are available in</div><div class='add'>+	 * the managed cache, as the pcluster can be moved to the bypass queue.</div><div class='ctx'> 	 */</div><div class='del'>-	if (standalone)</div><div class='add'>+	if (may_bypass)</div><div class='ctx'> 		fe-&gt;mode = Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called by erofs_shrinker to get rid of all compressed_pages */</div><div class='del'>-int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi,</div><div class='del'>-				       struct erofs_workgroup *grp)</div><div class='add'>+/* (erofs_shrinker) disconnect cached encoded data with pclusters */</div><div class='add'>+static int erofs_try_to_free_all_cached_folios(struct erofs_sb_info *sbi,</div><div class='add'>+					       struct z_erofs_pcluster *pcl)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_pcluster *const pcl =</div><div class='del'>-		container_of(grp, struct z_erofs_pcluster, obj);</div><div class='ctx'> 	unsigned int pclusterpages = z_erofs_pclusterpages(pcl);</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	DBG_BUGON(z_erofs_is_inline_pcluster(pcl));</div><div class='del'>-	/*</div><div class='del'>-	 * refcount of workgroup is now freezed as 0,</div><div class='del'>-	 * therefore no need to worry about available decompression users.</div><div class='del'>-	 */</div><div class='add'>+	DBG_BUGON(pcl-&gt;from_meta);</div><div class='add'>+	/* Each cached folio contains one page unless bs &gt; ps is supported */</div><div class='ctx'> 	for (i = 0; i &lt; pclusterpages; ++i) {</div><div class='del'>-		struct page *page = pcl-&gt;compressed_bvecs[i].page;</div><div class='del'>-</div><div class='del'>-		if (!page)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* block other users from reclaiming or migrating the page */</div><div class='del'>-		if (!trylock_page(page))</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		if (!erofs_page_is_managed(sbi, page))</div><div class='del'>-			continue;</div><div class='add'>+		if (pcl-&gt;compressed_bvecs[i].page) {</div><div class='add'>+			folio = page_folio(pcl-&gt;compressed_bvecs[i].page);</div><div class='add'>+			/* Avoid reclaiming or migrating this folio */</div><div class='add'>+			if (!folio_trylock(folio))</div><div class='add'>+				return -EBUSY;</div><div class='ctx'> </div><div class='del'>-		/* barrier is implied in the following 'unlock_page' */</div><div class='del'>-		WRITE_ONCE(pcl-&gt;compressed_bvecs[i].page, NULL);</div><div class='del'>-		detach_page_private(page);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+			if (!erofs_folio_is_managed(sbi, folio))</div><div class='add'>+				continue;</div><div class='add'>+			pcl-&gt;compressed_bvecs[i].page = NULL;</div><div class='add'>+			folio_detach_private(folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -653,30 +617,27 @@ int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi,</div><div class='ctx'> static bool z_erofs_cache_release_folio(struct folio *folio, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_pcluster *pcl = folio_get_private(folio);</div><div class='del'>-	unsigned int pclusterpages = z_erofs_pclusterpages(pcl);</div><div class='add'>+	struct z_erofs_bvec *bvec = pcl-&gt;compressed_bvecs;</div><div class='add'>+	struct z_erofs_bvec *end = bvec + z_erofs_pclusterpages(pcl);</div><div class='ctx'> 	bool ret;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_private(folio))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	ret = false;</div><div class='del'>-	spin_lock(&amp;pcl-&gt;obj.lockref.lock);</div><div class='del'>-	if (pcl-&gt;obj.lockref.count &gt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(z_erofs_is_inline_pcluster(pcl));</div><div class='del'>-	for (i = 0; i &lt; pclusterpages; ++i) {</div><div class='del'>-		if (pcl-&gt;compressed_bvecs[i].page == &amp;folio-&gt;page) {</div><div class='del'>-			WRITE_ONCE(pcl-&gt;compressed_bvecs[i].page, NULL);</div><div class='del'>-			ret = true;</div><div class='del'>-			break;</div><div class='add'>+	spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	if (pcl-&gt;lockref.count &lt;= 0) {</div><div class='add'>+		DBG_BUGON(pcl-&gt;from_meta);</div><div class='add'>+		for (; bvec &lt; end; ++bvec) {</div><div class='add'>+			if (bvec-&gt;page &amp;&amp; page_folio(bvec-&gt;page) == folio) {</div><div class='add'>+				bvec-&gt;page = NULL;</div><div class='add'>+				folio_detach_private(folio);</div><div class='add'>+				ret = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (ret)</div><div class='del'>-		folio_detach_private(folio);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;pcl-&gt;obj.lockref.lock);</div><div class='add'>+	spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -694,7 +655,7 @@ static void z_erofs_cache_invalidate_folio(struct folio *folio,</div><div class='ctx'> 	DBG_BUGON(stop &gt; folio_size(folio) || stop &lt; length);</div><div class='ctx'> </div><div class='ctx'> 	if (offset == 0 &amp;&amp; stop == folio_size(folio))</div><div class='del'>-		while (!z_erofs_cache_release_folio(folio, GFP_NOFS))</div><div class='add'>+		while (!z_erofs_cache_release_folio(folio, 0))</div><div class='ctx'> 			cond_resched();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -703,46 +664,50 @@ static const struct address_space_operations z_erofs_cache_aops = {</div><div class='ctx'> 	.invalidate_folio = z_erofs_cache_invalidate_folio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int erofs_init_managed_cache(struct super_block *sb)</div><div class='add'>+int z_erofs_init_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct inode *const inode = new_inode(sb);</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = z_erofs_init_pcpu_workers(sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	inode = new_inode(sb);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	set_nlink(inode, 1);</div><div class='ctx'> 	inode-&gt;i_size = OFFSET_MAX;</div><div class='ctx'> 	inode-&gt;i_mapping-&gt;a_ops = &amp;z_erofs_cache_aops;</div><div class='del'>-	mapping_set_gfp_mask(inode-&gt;i_mapping, GFP_NOFS);</div><div class='add'>+	mapping_set_gfp_mask(inode-&gt;i_mapping, GFP_KERNEL);</div><div class='ctx'> 	EROFS_SB(sb)-&gt;managed_cache = inode;</div><div class='add'>+	xa_init(&amp;EROFS_SB(sb)-&gt;managed_pslots);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool z_erofs_try_inplace_io(struct z_erofs_decompress_frontend *fe,</div><div class='del'>-				   struct z_erofs_bvec *bvec)</div><div class='del'>-{</div><div class='del'>-	struct z_erofs_pcluster *const pcl = fe-&gt;pcl;</div><div class='del'>-</div><div class='del'>-	while (fe-&gt;icur &gt; 0) {</div><div class='del'>-		if (!cmpxchg(&amp;pcl-&gt;compressed_bvecs[--fe-&gt;icur].page,</div><div class='del'>-			     NULL, bvec-&gt;page)) {</div><div class='del'>-			pcl-&gt;compressed_bvecs[fe-&gt;icur] = *bvec;</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* callers must be with pcluster lock held */</div><div class='del'>-static int z_erofs_attach_page(struct z_erofs_decompress_frontend *fe,</div><div class='add'>+static int z_erofs_attach_page(struct z_erofs_frontend *fe,</div><div class='ctx'> 			       struct z_erofs_bvec *bvec, bool exclusive)</div><div class='ctx'> {</div><div class='add'>+	struct z_erofs_pcluster *pcl = fe-&gt;pcl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (exclusive) {</div><div class='del'>-		/* give priority for inplaceio to use file pages first */</div><div class='del'>-		if (z_erofs_try_inplace_io(fe, bvec))</div><div class='del'>-			return 0;</div><div class='add'>+		/* Inplace I/O is limited to one page for uncompressed data */</div><div class='add'>+		if (pcl-&gt;algorithmformat &lt; Z_EROFS_COMPRESSION_MAX ||</div><div class='add'>+		    fe-&gt;icur &lt;= 1) {</div><div class='add'>+			/* Try to prioritize inplace I/O here */</div><div class='add'>+			spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+			while (fe-&gt;icur &gt; 0) {</div><div class='add'>+				if (pcl-&gt;compressed_bvecs[--fe-&gt;icur].page)</div><div class='add'>+					continue;</div><div class='add'>+				pcl-&gt;compressed_bvecs[fe-&gt;icur] = *bvec;</div><div class='add'>+				spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* otherwise, check if it can be used as a bvpage */</div><div class='ctx'> 		if (fe-&gt;mode &gt;= Z_EROFS_PCLUSTER_FOLLOWED &amp;&amp;</div><div class='ctx'> 		    !fe-&gt;candidate_bvpage)</div><div class='hunk'>@@ -754,53 +719,47 @@ static int z_erofs_attach_page(struct z_erofs_decompress_frontend *fe,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_try_to_claim_pcluster(struct z_erofs_decompress_frontend *f)</div><div class='add'>+static bool z_erofs_get_pcluster(struct z_erofs_pcluster *pcl)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_pcluster *pcl = f-&gt;pcl;</div><div class='del'>-	z_erofs_next_pcluster_t *owned_head = &amp;f-&gt;owned_head;</div><div class='del'>-</div><div class='del'>-	/* type 1, nil pcluster (this pcluster doesn't belong to any chain.) */</div><div class='del'>-	if (cmpxchg(&amp;pcl-&gt;next, Z_EROFS_PCLUSTER_NIL,</div><div class='del'>-		    *owned_head) == Z_EROFS_PCLUSTER_NIL) {</div><div class='del'>-		*owned_head = &amp;pcl-&gt;next;</div><div class='del'>-		/* so we can attach this pcluster to our submission chain. */</div><div class='del'>-		f-&gt;mode = Z_EROFS_PCLUSTER_FOLLOWED;</div><div class='del'>-		return;</div><div class='add'>+	if (lockref_get_not_zero(&amp;pcl-&gt;lockref))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	if (__lockref_is_dead(&amp;pcl-&gt;lockref)) {</div><div class='add'>+		spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* type 2, it belongs to an ongoing chain */</div><div class='del'>-	f-&gt;mode = Z_EROFS_PCLUSTER_INFLIGHT;</div><div class='add'>+	if (!pcl-&gt;lockref.count++)</div><div class='add'>+		atomic_long_dec(&amp;erofs_global_shrink_cnt);</div><div class='add'>+	spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe)</div><div class='add'>+static int z_erofs_register_pcluster(struct z_erofs_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_map_blocks *map = &amp;fe-&gt;map;</div><div class='ctx'> 	struct super_block *sb = fe-&gt;inode-&gt;i_sb;</div><div class='del'>-	bool ztailpacking = map-&gt;m_flags &amp; EROFS_MAP_META;</div><div class='del'>-	struct z_erofs_pcluster *pcl;</div><div class='del'>-	struct erofs_workgroup *grp;</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='add'>+	struct z_erofs_pcluster *pcl, *pre;</div><div class='add'>+	unsigned int pageofs_in;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!(map-&gt;m_flags &amp; EROFS_MAP_ENCODED) ||</div><div class='del'>-	    (!ztailpacking &amp;&amp; !erofs_blknr(sb, map-&gt;m_pa))) {</div><div class='del'>-		DBG_BUGON(1);</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* no available pcluster, let's allocate one */</div><div class='del'>-	pcl = z_erofs_alloc_pcluster(map-&gt;m_plen);</div><div class='add'>+	pageofs_in = erofs_blkoff(sb, map-&gt;m_pa);</div><div class='add'>+	pcl = z_erofs_alloc_pcluster(pageofs_in + map-&gt;m_plen);</div><div class='ctx'> 	if (IS_ERR(pcl))</div><div class='ctx'> 		return PTR_ERR(pcl);</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;pcl-&gt;obj.lockref.lock);</div><div class='del'>-	pcl-&gt;obj.lockref.count = 1;	/* one ref for this request */</div><div class='add'>+	lockref_init(&amp;pcl-&gt;lockref); /* one ref for this request */</div><div class='ctx'> 	pcl-&gt;algorithmformat = map-&gt;m_algorithmformat;</div><div class='add'>+	pcl-&gt;pclustersize = map-&gt;m_plen;</div><div class='ctx'> 	pcl-&gt;length = 0;</div><div class='ctx'> 	pcl-&gt;partial = true;</div><div class='del'>-</div><div class='del'>-	/* new pclusters should be claimed as type 1, primary and followed */</div><div class='del'>-	pcl-&gt;next = fe-&gt;owned_head;</div><div class='add'>+	pcl-&gt;next = fe-&gt;head;</div><div class='add'>+	pcl-&gt;pos = map-&gt;m_pa;</div><div class='add'>+	pcl-&gt;pageofs_in = pageofs_in;</div><div class='ctx'> 	pcl-&gt;pageofs_out = map-&gt;m_la &amp; ~PAGE_MASK;</div><div class='add'>+	pcl-&gt;from_meta = map-&gt;m_flags &amp; EROFS_MAP_META;</div><div class='ctx'> 	fe-&gt;mode = Z_EROFS_PCLUSTER_FOLLOWED;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -810,26 +769,29 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe)</div><div class='ctx'> 	mutex_init(&amp;pcl-&gt;lock);</div><div class='ctx'> 	DBG_BUGON(!mutex_trylock(&amp;pcl-&gt;lock));</div><div class='ctx'> </div><div class='del'>-	if (ztailpacking) {</div><div class='del'>-		pcl-&gt;obj.index = 0;	/* which indicates ztailpacking */</div><div class='del'>-	} else {</div><div class='del'>-		pcl-&gt;obj.index = erofs_blknr(sb, map-&gt;m_pa);</div><div class='del'>-</div><div class='del'>-		grp = erofs_insert_workgroup(fe-&gt;inode-&gt;i_sb, &amp;pcl-&gt;obj);</div><div class='del'>-		if (IS_ERR(grp)) {</div><div class='del'>-			err = PTR_ERR(grp);</div><div class='del'>-			goto err_out;</div><div class='add'>+	if (!pcl-&gt;from_meta) {</div><div class='add'>+		while (1) {</div><div class='add'>+			xa_lock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+			pre = __xa_cmpxchg(&amp;sbi-&gt;managed_pslots, pcl-&gt;pos,</div><div class='add'>+					   NULL, pcl, GFP_KERNEL);</div><div class='add'>+			if (!pre || xa_is_err(pre) || z_erofs_get_pcluster(pre)) {</div><div class='add'>+				xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* try to legitimize the current in-tree one */</div><div class='add'>+			xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+			cond_resched();</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (grp != &amp;pcl-&gt;obj) {</div><div class='del'>-			fe-&gt;pcl = container_of(grp,</div><div class='del'>-					struct z_erofs_pcluster, obj);</div><div class='add'>+		if (xa_is_err(pre)) {</div><div class='add'>+			err = xa_err(pre);</div><div class='add'>+			goto err_out;</div><div class='add'>+		} else if (pre) {</div><div class='add'>+			fe-&gt;pcl = pre;</div><div class='ctx'> 			err = -EEXIST;</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	fe-&gt;owned_head = &amp;pcl-&gt;next;</div><div class='del'>-	fe-&gt;pcl = pcl;</div><div class='add'>+	fe-&gt;head = fe-&gt;pcl = pcl;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='hunk'>@@ -838,28 +800,33 @@ err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe)</div><div class='add'>+static int z_erofs_pcluster_begin(struct z_erofs_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_map_blocks *map = &amp;fe-&gt;map;</div><div class='ctx'> 	struct super_block *sb = fe-&gt;inode-&gt;i_sb;</div><div class='del'>-	erofs_blk_t blknr = erofs_blknr(sb, map-&gt;m_pa);</div><div class='del'>-	struct erofs_workgroup *grp = NULL;</div><div class='add'>+	struct z_erofs_pcluster *pcl = NULL;</div><div class='add'>+	void *ptr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	DBG_BUGON(fe-&gt;pcl);</div><div class='del'>-</div><div class='ctx'> 	/* must be Z_EROFS_PCLUSTER_TAIL or pointed to previous pcluster */</div><div class='del'>-	DBG_BUGON(fe-&gt;owned_head == Z_EROFS_PCLUSTER_NIL);</div><div class='add'>+	DBG_BUGON(!fe-&gt;head);</div><div class='ctx'> </div><div class='ctx'> 	if (!(map-&gt;m_flags &amp; EROFS_MAP_META)) {</div><div class='del'>-		grp = erofs_find_workgroup(sb, blknr);</div><div class='del'>-	} else if ((map-&gt;m_pa &amp; ~PAGE_MASK) + map-&gt;m_plen &gt; PAGE_SIZE) {</div><div class='del'>-		DBG_BUGON(1);</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='add'>+		while (1) {</div><div class='add'>+			rcu_read_lock();</div><div class='add'>+			pcl = xa_load(&amp;EROFS_SB(sb)-&gt;managed_pslots, map-&gt;m_pa);</div><div class='add'>+			if (!pcl || z_erofs_get_pcluster(pcl)) {</div><div class='add'>+				DBG_BUGON(pcl &amp;&amp; map-&gt;m_pa != pcl-&gt;pos);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (grp) {</div><div class='del'>-		fe-&gt;pcl = container_of(grp, struct z_erofs_pcluster, obj);</div><div class='add'>+	if (pcl) {</div><div class='add'>+		fe-&gt;pcl = pcl;</div><div class='ctx'> 		ret = -EEXIST;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = z_erofs_register_pcluster(fe);</div><div class='hunk'>@@ -867,26 +834,35 @@ static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	if (ret == -EEXIST) {</div><div class='ctx'> 		mutex_lock(&amp;fe-&gt;pcl-&gt;lock);</div><div class='del'>-		z_erofs_try_to_claim_pcluster(fe);</div><div class='add'>+		/* check if this pcluster hasn't been linked into any chain. */</div><div class='add'>+		if (!cmpxchg(&amp;fe-&gt;pcl-&gt;next, NULL, fe-&gt;head)) {</div><div class='add'>+			/* .. so it can be attached to our submission chain */</div><div class='add'>+			fe-&gt;head = fe-&gt;pcl;</div><div class='add'>+			fe-&gt;mode = Z_EROFS_PCLUSTER_FOLLOWED;</div><div class='add'>+		} else {	/* otherwise, it belongs to an inflight chain */</div><div class='add'>+			fe-&gt;mode = Z_EROFS_PCLUSTER_INFLIGHT;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (ret) {</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	z_erofs_bvec_iter_begin(&amp;fe-&gt;biter, &amp;fe-&gt;pcl-&gt;bvset,</div><div class='ctx'> 				Z_EROFS_INLINE_BVECS, fe-&gt;pcl-&gt;vcnt);</div><div class='del'>-	if (!z_erofs_is_inline_pcluster(fe-&gt;pcl)) {</div><div class='add'>+	if (!fe-&gt;pcl-&gt;from_meta) {</div><div class='ctx'> 		/* bind cache first when cached decompression is preferred */</div><div class='ctx'> 		z_erofs_bind_cache(fe);</div><div class='ctx'> 	} else {</div><div class='del'>-		void *mptr;</div><div class='del'>-</div><div class='del'>-		mptr = erofs_read_metabuf(&amp;map-&gt;buf, sb, blknr, EROFS_NO_KMAP);</div><div class='del'>-		if (IS_ERR(mptr)) {</div><div class='del'>-			ret = PTR_ERR(mptr);</div><div class='del'>-			erofs_err(sb, "failed to get inline data %d", ret);</div><div class='add'>+		ret = erofs_init_metabuf(&amp;map-&gt;buf, sb,</div><div class='add'>+					 erofs_inode_in_metabox(fe-&gt;inode));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		ptr = erofs_bread(&amp;map-&gt;buf, map-&gt;m_pa, false);</div><div class='add'>+		if (IS_ERR(ptr)) {</div><div class='add'>+			ret = PTR_ERR(ptr);</div><div class='add'>+			erofs_err(sb, "failed to get inline folio %d", ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		get_page(map-&gt;buf.page);</div><div class='add'>+		folio_get(page_folio(map-&gt;buf.page));</div><div class='ctx'> 		WRITE_ONCE(fe-&gt;pcl-&gt;compressed_bvecs[0].page, map-&gt;buf.page);</div><div class='ctx'> 		fe-&gt;pcl-&gt;pageofs_in = map-&gt;m_pa &amp; ~PAGE_MASK;</div><div class='ctx'> 		fe-&gt;mode = Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE;</div><div class='hunk'>@@ -896,25 +872,93 @@ static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * keep in mind that no referenced pclusters will be freed</div><div class='del'>- * only after a RCU grace period.</div><div class='del'>- */</div><div class='ctx'> static void z_erofs_rcu_callback(struct rcu_head *head)</div><div class='ctx'> {</div><div class='del'>-	z_erofs_free_pcluster(container_of(head,</div><div class='del'>-			struct z_erofs_pcluster, rcu));</div><div class='add'>+	z_erofs_free_pcluster(container_of(head, struct z_erofs_pcluster, rcu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void erofs_workgroup_free_rcu(struct erofs_workgroup *grp)</div><div class='add'>+static bool __erofs_try_to_release_pcluster(struct erofs_sb_info *sbi,</div><div class='add'>+					  struct z_erofs_pcluster *pcl)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_pcluster *const pcl =</div><div class='del'>-		container_of(grp, struct z_erofs_pcluster, obj);</div><div class='add'>+	if (pcl-&gt;lockref.count)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	call_rcu(&amp;pcl-&gt;rcu, z_erofs_rcu_callback);</div><div class='add'>+	/*</div><div class='add'>+	 * Note that all cached folios should be detached before deleted from</div><div class='add'>+	 * the XArray.  Otherwise some folios could be still attached to the</div><div class='add'>+	 * orphan old pcluster when the new one is available in the tree.</div><div class='add'>+	 */</div><div class='add'>+	if (erofs_try_to_free_all_cached_folios(sbi, pcl))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It's impossible to fail after the pcluster is freezed, but in order</div><div class='add'>+	 * to avoid some race conditions, add a DBG_BUGON to observe this.</div><div class='add'>+	 */</div><div class='add'>+	DBG_BUGON(__xa_erase(&amp;sbi-&gt;managed_pslots, pcl-&gt;pos) != pcl);</div><div class='add'>+</div><div class='add'>+	lockref_mark_dead(&amp;pcl-&gt;lockref);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool erofs_try_to_release_pcluster(struct erofs_sb_info *sbi,</div><div class='add'>+					  struct z_erofs_pcluster *pcl)</div><div class='add'>+{</div><div class='add'>+	bool free;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	free = __erofs_try_to_release_pcluster(sbi, pcl);</div><div class='add'>+	spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	if (free) {</div><div class='add'>+		atomic_long_dec(&amp;erofs_global_shrink_cnt);</div><div class='add'>+		call_rcu(&amp;pcl-&gt;rcu, z_erofs_rcu_callback);</div><div class='add'>+	}</div><div class='add'>+	return free;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_pcluster_end(struct z_erofs_decompress_frontend *fe)</div><div class='add'>+unsigned long z_erofs_shrink_scan(struct erofs_sb_info *sbi, unsigned long nr)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_pcluster *pcl;</div><div class='add'>+	unsigned long index, freed = 0;</div><div class='add'>+</div><div class='add'>+	xa_lock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+	xa_for_each(&amp;sbi-&gt;managed_pslots, index, pcl) {</div><div class='add'>+		/* try to shrink each valid pcluster */</div><div class='add'>+		if (!erofs_try_to_release_pcluster(sbi, pcl))</div><div class='add'>+			continue;</div><div class='add'>+		xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+</div><div class='add'>+		++freed;</div><div class='add'>+		if (!--nr)</div><div class='add'>+			return freed;</div><div class='add'>+		xa_lock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+	}</div><div class='add'>+	xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+	return freed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void z_erofs_put_pcluster(struct erofs_sb_info *sbi,</div><div class='add'>+		struct z_erofs_pcluster *pcl, bool try_free)</div><div class='add'>+{</div><div class='add'>+	bool free = false;</div><div class='add'>+</div><div class='add'>+	if (lockref_put_or_lock(&amp;pcl-&gt;lockref))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	DBG_BUGON(__lockref_is_dead(&amp;pcl-&gt;lockref));</div><div class='add'>+	if (!--pcl-&gt;lockref.count) {</div><div class='add'>+		if (try_free &amp;&amp; xa_trylock(&amp;sbi-&gt;managed_pslots)) {</div><div class='add'>+			free = __erofs_try_to_release_pcluster(sbi, pcl);</div><div class='add'>+			xa_unlock(&amp;sbi-&gt;managed_pslots);</div><div class='add'>+		}</div><div class='add'>+		atomic_long_add(!free, &amp;erofs_global_shrink_cnt);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	if (free)</div><div class='add'>+		call_rcu(&amp;pcl-&gt;rcu, z_erofs_rcu_callback);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void z_erofs_pcluster_end(struct z_erofs_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_pcluster *pcl = fe-&gt;pcl;</div><div class='ctx'> </div><div class='hunk'>@@ -927,17 +971,13 @@ static void z_erofs_pcluster_end(struct z_erofs_decompress_frontend *fe)</div><div class='ctx'> 	if (fe-&gt;candidate_bvpage)</div><div class='ctx'> 		fe-&gt;candidate_bvpage = NULL;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * if all pending pages are added, don't hold its reference</div><div class='del'>-	 * any longer if the pcluster isn't hosted by ourselves.</div><div class='del'>-	 */</div><div class='add'>+	/* Drop refcount if it doesn't belong to our processing chain */</div><div class='ctx'> 	if (fe-&gt;mode &lt; Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE)</div><div class='del'>-		erofs_workgroup_put(&amp;pcl-&gt;obj);</div><div class='del'>-</div><div class='add'>+		z_erofs_put_pcluster(EROFS_I_SB(fe-&gt;inode), pcl, false);</div><div class='ctx'> 	fe-&gt;pcl = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_read_fragment(struct super_block *sb, struct page *page,</div><div class='add'>+static int z_erofs_read_fragment(struct super_block *sb, struct folio *folio,</div><div class='ctx'> 			unsigned int cur, unsigned int end, erofs_off_t pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *packed_inode = EROFS_SB(sb)-&gt;packed_inode;</div><div class='hunk'>@@ -948,115 +988,110 @@ static int z_erofs_read_fragment(struct super_block *sb, struct page *page,</div><div class='ctx'> 	if (!packed_inode)</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> </div><div class='del'>-	buf.inode = packed_inode;</div><div class='add'>+	buf.mapping = packed_inode-&gt;i_mapping;</div><div class='ctx'> 	for (; cur &lt; end; cur += cnt, pos += cnt) {</div><div class='del'>-		cnt = min_t(unsigned int, end - cur,</div><div class='del'>-			    sb-&gt;s_blocksize - erofs_blkoff(sb, pos));</div><div class='del'>-		src = erofs_bread(&amp;buf, erofs_blknr(sb, pos), EROFS_KMAP);</div><div class='add'>+		cnt = min(end - cur, sb-&gt;s_blocksize - erofs_blkoff(sb, pos));</div><div class='add'>+		src = erofs_bread(&amp;buf, pos, true);</div><div class='ctx'> 		if (IS_ERR(src)) {</div><div class='ctx'> 			erofs_put_metabuf(&amp;buf);</div><div class='ctx'> 			return PTR_ERR(src);</div><div class='ctx'> 		}</div><div class='del'>-		memcpy_to_page(page, cur, src + erofs_blkoff(sb, pos), cnt);</div><div class='add'>+		memcpy_to_folio(folio, cur, src, cnt);</div><div class='ctx'> 	}</div><div class='ctx'> 	erofs_put_metabuf(&amp;buf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,</div><div class='del'>-				struct page *page)</div><div class='add'>+static int z_erofs_scan_folio(struct z_erofs_frontend *f,</div><div class='add'>+			      struct folio *folio, bool ra)</div><div class='ctx'> {</div><div class='del'>-	struct inode *const inode = fe-&gt;inode;</div><div class='del'>-	struct erofs_map_blocks *const map = &amp;fe-&gt;map;</div><div class='del'>-	const loff_t offset = page_offset(page);</div><div class='add'>+	struct inode *const inode = f-&gt;inode;</div><div class='add'>+	struct erofs_map_blocks *const map = &amp;f-&gt;map;</div><div class='add'>+	const loff_t offset = folio_pos(folio);</div><div class='ctx'> 	const unsigned int bs = i_blocksize(inode);</div><div class='del'>-	bool tight = true, exclusive;</div><div class='del'>-	unsigned int cur, end, len, split;</div><div class='add'>+	unsigned int end = folio_size(folio), split = 0, cur, pgs;</div><div class='add'>+	bool tight, excl;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	z_erofs_onlinepage_init(page);</div><div class='del'>-	split = 0;</div><div class='del'>-	end = PAGE_SIZE;</div><div class='del'>-repeat:</div><div class='del'>-	if (offset + end - 1 &lt; map-&gt;m_la ||</div><div class='del'>-	    offset + end - 1 &gt;= map-&gt;m_la + map-&gt;m_llen) {</div><div class='del'>-		z_erofs_pcluster_end(fe);</div><div class='del'>-		map-&gt;m_la = offset + end - 1;</div><div class='del'>-		map-&gt;m_llen = 0;</div><div class='del'>-		err = z_erofs_map_blocks_iter(inode, map, 0);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cur = offset &gt; map-&gt;m_la ? 0 : map-&gt;m_la - offset;</div><div class='del'>-	/* bump split parts first to avoid several separate cases */</div><div class='del'>-	++split;</div><div class='del'>-</div><div class='del'>-	if (!(map-&gt;m_flags &amp; EROFS_MAP_MAPPED)) {</div><div class='del'>-		zero_user_segment(page, cur, end);</div><div class='del'>-		tight = false;</div><div class='del'>-		goto next_part;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (map-&gt;m_flags &amp; EROFS_MAP_FRAGMENT) {</div><div class='del'>-		erofs_off_t fpos = offset + cur - map-&gt;m_la;</div><div class='del'>-</div><div class='del'>-		len = min_t(unsigned int, map-&gt;m_llen - fpos, end - cur);</div><div class='del'>-		err = z_erofs_read_fragment(inode-&gt;i_sb, page, cur, cur + len,</div><div class='del'>-				EROFS_I(inode)-&gt;z_fragmentoff + fpos);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		tight = false;</div><div class='del'>-		goto next_part;</div><div class='del'>-	}</div><div class='add'>+	tight = (bs == PAGE_SIZE);</div><div class='add'>+	erofs_onlinefolio_init(folio);</div><div class='add'>+	do {</div><div class='add'>+		if (offset + end - 1 &lt; map-&gt;m_la ||</div><div class='add'>+		    offset + end - 1 &gt;= map-&gt;m_la + map-&gt;m_llen) {</div><div class='add'>+			z_erofs_pcluster_end(f);</div><div class='add'>+			map-&gt;m_la = offset + end - 1;</div><div class='add'>+			map-&gt;m_llen = 0;</div><div class='add'>+			err = z_erofs_map_blocks_iter(inode, map, 0);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (!fe-&gt;pcl) {</div><div class='del'>-		err = z_erofs_pcluster_begin(fe);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+		cur = offset &gt; map-&gt;m_la ? 0 : map-&gt;m_la - offset;</div><div class='add'>+		pgs = round_down(cur, PAGE_SIZE);</div><div class='add'>+		/* bump split parts first to avoid several separate cases */</div><div class='add'>+		++split;</div><div class='add'>+</div><div class='add'>+		if (!(map-&gt;m_flags &amp; EROFS_MAP_MAPPED)) {</div><div class='add'>+			folio_zero_segment(folio, cur, end);</div><div class='add'>+			tight = false;</div><div class='add'>+		} else if (map-&gt;m_flags &amp; __EROFS_MAP_FRAGMENT) {</div><div class='add'>+			erofs_off_t fpos = offset + cur - map-&gt;m_la;</div><div class='add'>+</div><div class='add'>+			err = z_erofs_read_fragment(inode-&gt;i_sb, folio, cur,</div><div class='add'>+					cur + min(map-&gt;m_llen - fpos, end - cur),</div><div class='add'>+					EROFS_I(inode)-&gt;z_fragmentoff + fpos);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			tight = false;</div><div class='add'>+		} else {</div><div class='add'>+			if (!f-&gt;pcl) {</div><div class='add'>+				err = z_erofs_pcluster_begin(f);</div><div class='add'>+				if (err)</div><div class='add'>+					break;</div><div class='add'>+				f-&gt;pcl-&gt;besteffort |= !ra;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Ensure the current partial page belongs to this submit chain rather</div><div class='del'>-	 * than other concurrent submit chains or the noio(bypass) chain since</div><div class='del'>-	 * those chains are handled asynchronously thus the page cannot be used</div><div class='del'>-	 * for inplace I/O or bvpage (should be processed in a strict order.)</div><div class='del'>-	 */</div><div class='del'>-	tight &amp;= (fe-&gt;mode &gt; Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE);</div><div class='del'>-	exclusive = (!cur &amp;&amp; ((split &lt;= 1) || (tight &amp;&amp; bs == PAGE_SIZE)));</div><div class='del'>-	if (cur)</div><div class='del'>-		tight &amp;= (fe-&gt;mode &gt;= Z_EROFS_PCLUSTER_FOLLOWED);</div><div class='del'>-</div><div class='del'>-	err = z_erofs_attach_page(fe, &amp;((struct z_erofs_bvec) {</div><div class='del'>-					.page = page,</div><div class='del'>-					.offset = offset - map-&gt;m_la,</div><div class='del'>-					.end = end,</div><div class='del'>-				  }), exclusive);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	z_erofs_onlinepage_split(page);</div><div class='del'>-	if (fe-&gt;pcl-&gt;pageofs_out != (map-&gt;m_la &amp; ~PAGE_MASK))</div><div class='del'>-		fe-&gt;pcl-&gt;multibases = true;</div><div class='del'>-	if (fe-&gt;pcl-&gt;length &lt; offset + end - map-&gt;m_la) {</div><div class='del'>-		fe-&gt;pcl-&gt;length = offset + end - map-&gt;m_la;</div><div class='del'>-		fe-&gt;pcl-&gt;pageofs_out = map-&gt;m_la &amp; ~PAGE_MASK;</div><div class='del'>-	}</div><div class='del'>-	if ((map-&gt;m_flags &amp; EROFS_MAP_FULL_MAPPED) &amp;&amp;</div><div class='del'>-	    !(map-&gt;m_flags &amp; EROFS_MAP_PARTIAL_REF) &amp;&amp;</div><div class='del'>-	    fe-&gt;pcl-&gt;length == map-&gt;m_llen)</div><div class='del'>-		fe-&gt;pcl-&gt;partial = false;</div><div class='del'>-next_part:</div><div class='del'>-	/* shorten the remaining extent to update progress */</div><div class='del'>-	map-&gt;m_llen = offset + cur - map-&gt;m_la;</div><div class='del'>-	map-&gt;m_flags &amp;= ~EROFS_MAP_FULL_MAPPED;</div><div class='del'>-</div><div class='del'>-	end = cur;</div><div class='del'>-	if (end &gt; 0)</div><div class='del'>-		goto repeat;</div><div class='add'>+			pgs = round_down(end - 1, PAGE_SIZE);</div><div class='add'>+			/*</div><div class='add'>+			 * Ensure this partial page belongs to this submit chain</div><div class='add'>+			 * rather than other concurrent submit chains or</div><div class='add'>+			 * noio(bypass) chains since those chains are handled</div><div class='add'>+			 * asynchronously thus it cannot be used for inplace I/O</div><div class='add'>+			 * or bvpage (should be processed in the strict order.)</div><div class='add'>+			 */</div><div class='add'>+			tight &amp;= (f-&gt;mode &gt;= Z_EROFS_PCLUSTER_FOLLOWED);</div><div class='add'>+			excl = false;</div><div class='add'>+			if (cur &lt;= pgs) {</div><div class='add'>+				excl = (split &lt;= 1) || tight;</div><div class='add'>+				cur = pgs;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	z_erofs_onlinepage_endio(page, err);</div><div class='add'>+			err = z_erofs_attach_page(f, &amp;((struct z_erofs_bvec) {</div><div class='add'>+				.page = folio_page(folio, pgs &gt;&gt; PAGE_SHIFT),</div><div class='add'>+				.offset = offset + pgs - map-&gt;m_la,</div><div class='add'>+				.end = end - pgs, }), excl);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			erofs_onlinefolio_split(folio);</div><div class='add'>+			if (f-&gt;pcl-&gt;length &lt; offset + end - map-&gt;m_la) {</div><div class='add'>+				f-&gt;pcl-&gt;length = offset + end - map-&gt;m_la;</div><div class='add'>+				f-&gt;pcl-&gt;pageofs_out = map-&gt;m_la &amp; ~PAGE_MASK;</div><div class='add'>+			}</div><div class='add'>+			if ((map-&gt;m_flags &amp; EROFS_MAP_FULL_MAPPED) &amp;&amp;</div><div class='add'>+			    !(map-&gt;m_flags &amp; EROFS_MAP_PARTIAL_REF) &amp;&amp;</div><div class='add'>+			    f-&gt;pcl-&gt;length == map-&gt;m_llen)</div><div class='add'>+				f-&gt;pcl-&gt;partial = false;</div><div class='add'>+		}</div><div class='add'>+		/* shorten the remaining extent to update progress */</div><div class='add'>+		map-&gt;m_llen = offset + cur - map-&gt;m_la;</div><div class='add'>+		map-&gt;m_flags &amp;= ~EROFS_MAP_FULL_MAPPED;</div><div class='add'>+		if (cur &lt;= pgs) {</div><div class='add'>+			split = cur &lt; pgs;</div><div class='add'>+			tight = (bs == PAGE_SIZE);</div><div class='add'>+		}</div><div class='add'>+	} while ((end = cur) &gt; 0);</div><div class='add'>+	erofs_onlinefolio_end(folio, err, false);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1077,14 +1112,13 @@ static bool z_erofs_is_sync_decompress(struct erofs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> static bool z_erofs_page_is_invalidated(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return !page-&gt;mapping &amp;&amp; !z_erofs_is_shortlived_page(page);</div><div class='add'>+	return !page_folio(page)-&gt;mapping &amp;&amp; !z_erofs_is_shortlived_page(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct z_erofs_decompress_backend {</div><div class='add'>+struct z_erofs_backend {</div><div class='ctx'> 	struct page *onstack_pages[Z_EROFS_ONSTACK_PAGES];</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	struct z_erofs_pcluster *pcl;</div><div class='del'>-</div><div class='ctx'> 	/* pages with the longest decompressed length for deduplication */</div><div class='ctx'> 	struct page **decompressed_pages;</div><div class='ctx'> 	/* pages to keep the compressed data */</div><div class='hunk'>@@ -1093,6 +1127,8 @@ struct z_erofs_decompress_backend {</div><div class='ctx'> 	struct list_head decompressed_secondary_bvecs;</div><div class='ctx'> 	struct page **pagepool;</div><div class='ctx'> 	unsigned int onstack_used, nr_pages;</div><div class='add'>+	/* indicate if temporary copies should be preserved for later use */</div><div class='add'>+	bool keepxcpy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct z_erofs_bvec_item {</div><div class='hunk'>@@ -1100,21 +1136,23 @@ struct z_erofs_bvec_item {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void z_erofs_do_decompressed_bvec(struct z_erofs_decompress_backend *be,</div><div class='add'>+static void z_erofs_do_decompressed_bvec(struct z_erofs_backend *be,</div><div class='ctx'> 					 struct z_erofs_bvec *bvec)</div><div class='ctx'> {</div><div class='add'>+	int poff = bvec-&gt;offset + be-&gt;pcl-&gt;pageofs_out;</div><div class='ctx'> 	struct z_erofs_bvec_item *item;</div><div class='del'>-	unsigned int pgnr;</div><div class='del'>-</div><div class='del'>-	if (!((bvec-&gt;offset + be-&gt;pcl-&gt;pageofs_out) &amp; ~PAGE_MASK) &amp;&amp;</div><div class='del'>-	    (bvec-&gt;end == PAGE_SIZE ||</div><div class='del'>-	     bvec-&gt;offset + bvec-&gt;end == be-&gt;pcl-&gt;length)) {</div><div class='del'>-		pgnr = (bvec-&gt;offset + be-&gt;pcl-&gt;pageofs_out) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		DBG_BUGON(pgnr &gt;= be-&gt;nr_pages);</div><div class='del'>-		if (!be-&gt;decompressed_pages[pgnr]) {</div><div class='del'>-			be-&gt;decompressed_pages[pgnr] = bvec-&gt;page;</div><div class='add'>+	struct page **page;</div><div class='add'>+</div><div class='add'>+	if (!(poff &amp; ~PAGE_MASK) &amp;&amp; (bvec-&gt;end == PAGE_SIZE ||</div><div class='add'>+			bvec-&gt;offset + bvec-&gt;end == be-&gt;pcl-&gt;length)) {</div><div class='add'>+		DBG_BUGON((poff &gt;&gt; PAGE_SHIFT) &gt;= be-&gt;nr_pages);</div><div class='add'>+		page = be-&gt;decompressed_pages + (poff &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		if (!*page) {</div><div class='add'>+			*page = bvec-&gt;page;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		be-&gt;keepxcpy = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* (cold path) one pcluster is requested multiple times */</div><div class='hunk'>@@ -1123,8 +1161,7 @@ static void z_erofs_do_decompressed_bvec(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 	list_add(&amp;item-&gt;list, &amp;be-&gt;decompressed_secondary_bvecs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_fill_other_copies(struct z_erofs_decompress_backend *be,</div><div class='del'>-				      int err)</div><div class='add'>+static void z_erofs_fill_other_copies(struct z_erofs_backend *be, int err)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int off0 = be-&gt;pcl-&gt;pageofs_out;</div><div class='ctx'> 	struct list_head *p, *n;</div><div class='hunk'>@@ -1159,13 +1196,13 @@ static void z_erofs_fill_other_copies(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 			cur += len;</div><div class='ctx'> 		}</div><div class='ctx'> 		kunmap_local(dst);</div><div class='del'>-		z_erofs_onlinepage_endio(bvi-&gt;bvec.page, err);</div><div class='add'>+		erofs_onlinefolio_end(page_folio(bvi-&gt;bvec.page), err, true);</div><div class='ctx'> 		list_del(p);</div><div class='ctx'> 		kfree(bvi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_parse_out_bvecs(struct z_erofs_decompress_backend *be)</div><div class='add'>+static void z_erofs_parse_out_bvecs(struct z_erofs_backend *be)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_pcluster *pcl = be-&gt;pcl;</div><div class='ctx'> 	struct z_erofs_bvec_iter biter;</div><div class='hunk'>@@ -1190,8 +1227,7 @@ static void z_erofs_parse_out_bvecs(struct z_erofs_decompress_backend *be)</div><div class='ctx'> 		z_erofs_put_shortlivedpage(be-&gt;pagepool, old_bvpage);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_parse_in_bvecs(struct z_erofs_decompress_backend *be,</div><div class='del'>-				  bool *overlapped)</div><div class='add'>+static int z_erofs_parse_in_bvecs(struct z_erofs_backend *be, bool *overlapped)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_pcluster *pcl = be-&gt;pcl;</div><div class='ctx'> 	unsigned int pclusterpages = z_erofs_pclusterpages(pcl);</div><div class='hunk'>@@ -1202,15 +1238,16 @@ static int z_erofs_parse_in_bvecs(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 		struct z_erofs_bvec *bvec = &amp;pcl-&gt;compressed_bvecs[i];</div><div class='ctx'> 		struct page *page = bvec-&gt;page;</div><div class='ctx'> </div><div class='del'>-		/* compressed data ought to be valid before decompressing */</div><div class='del'>-		if (!page) {</div><div class='del'>-			err = -EIO;</div><div class='add'>+		/* compressed data ought to be valid when decompressing */</div><div class='add'>+		if (IS_ERR(page) || !page) {</div><div class='add'>+			bvec-&gt;page = NULL;	/* clear the failure reason */</div><div class='add'>+			err = page ? PTR_ERR(page) : -EIO;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		be-&gt;compressed_pages[i] = page;</div><div class='ctx'> </div><div class='del'>-		if (z_erofs_is_inline_pcluster(pcl) ||</div><div class='del'>-		    erofs_page_is_managed(EROFS_SB(be-&gt;sb), page)) {</div><div class='add'>+		if (pcl-&gt;from_meta ||</div><div class='add'>+		    erofs_folio_is_managed(EROFS_SB(be-&gt;sb), page_folio(page))) {</div><div class='ctx'> 			if (!PageUptodate(page))</div><div class='ctx'> 				err = -EIO;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1225,17 +1262,18 @@ static int z_erofs_parse_in_bvecs(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,</div><div class='del'>-				       int err)</div><div class='add'>+static int z_erofs_decompress_pcluster(struct z_erofs_backend *be, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_sb_info *const sbi = EROFS_SB(be-&gt;sb);</div><div class='ctx'> 	struct z_erofs_pcluster *pcl = be-&gt;pcl;</div><div class='ctx'> 	unsigned int pclusterpages = z_erofs_pclusterpages(pcl);</div><div class='del'>-	const struct z_erofs_decompressor *decomp =</div><div class='del'>-				&amp;erofs_decompressors[pcl-&gt;algorithmformat];</div><div class='del'>-	int i, err2;</div><div class='add'>+	const struct z_erofs_decompressor *alg =</div><div class='add'>+				z_erofs_decomp[pcl-&gt;algorithmformat];</div><div class='add'>+	bool try_free = true;</div><div class='add'>+	int i, j, jtop, err2;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	bool overlapped;</div><div class='add'>+	const char *reason;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pcl-&gt;lock);</div><div class='ctx'> 	be-&gt;nr_pages = PAGE_ALIGN(pcl-&gt;length + pcl-&gt;pageofs_out) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1267,11 +1305,13 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 	err2 = z_erofs_parse_in_bvecs(be, &amp;overlapped);</div><div class='ctx'> 	if (err2)</div><div class='ctx'> 		err = err2;</div><div class='del'>-	if (!err)</div><div class='del'>-		err = decomp-&gt;decompress(&amp;(struct z_erofs_decompress_req) {</div><div class='add'>+	if (!err) {</div><div class='add'>+		reason = alg-&gt;decompress(&amp;(struct z_erofs_decompress_req) {</div><div class='ctx'> 					.sb = be-&gt;sb,</div><div class='ctx'> 					.in = be-&gt;compressed_pages,</div><div class='ctx'> 					.out = be-&gt;decompressed_pages,</div><div class='add'>+					.inpages = pclusterpages,</div><div class='add'>+					.outpages = be-&gt;nr_pages,</div><div class='ctx'> 					.pageofs_in = pcl-&gt;pageofs_in,</div><div class='ctx'> 					.pageofs_out = pcl-&gt;pageofs_out,</div><div class='ctx'> 					.inputsize = pcl-&gt;pclustersize,</div><div class='hunk'>@@ -1279,21 +1319,37 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 					.alg = pcl-&gt;algorithmformat,</div><div class='ctx'> 					.inplace_io = overlapped,</div><div class='ctx'> 					.partial_decoding = pcl-&gt;partial,</div><div class='del'>-					.fillgaps = pcl-&gt;multibases,</div><div class='add'>+					.fillgaps = be-&gt;keepxcpy,</div><div class='add'>+					.gfp = pcl-&gt;besteffort ? GFP_KERNEL :</div><div class='add'>+						GFP_NOWAIT | __GFP_NORETRY</div><div class='ctx'> 				 }, be-&gt;pagepool);</div><div class='add'>+		if (IS_ERR(reason)) {</div><div class='add'>+			erofs_err(be-&gt;sb, "failed to decompress (%s) %ld @ pa %llu size %u =&gt; %u",</div><div class='add'>+				  alg-&gt;name, PTR_ERR(reason), pcl-&gt;pos,</div><div class='add'>+				  pcl-&gt;pclustersize, pcl-&gt;length);</div><div class='add'>+			err = PTR_ERR(reason);</div><div class='add'>+		} else if (unlikely(reason)) {</div><div class='add'>+			erofs_err(be-&gt;sb, "failed to decompress (%s) %s @ pa %llu size %u =&gt; %u",</div><div class='add'>+				  alg-&gt;name, reason, pcl-&gt;pos,</div><div class='add'>+				  pcl-&gt;pclustersize, pcl-&gt;length);</div><div class='add'>+			err = -EFSCORRUPTED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* must handle all compressed pages before actual file pages */</div><div class='del'>-	if (z_erofs_is_inline_pcluster(pcl)) {</div><div class='del'>-		page = pcl-&gt;compressed_bvecs[0].page;</div><div class='add'>+	if (pcl-&gt;from_meta) {</div><div class='add'>+		folio_put(page_folio(pcl-&gt;compressed_bvecs[0].page));</div><div class='ctx'> 		WRITE_ONCE(pcl-&gt;compressed_bvecs[0].page, NULL);</div><div class='del'>-		put_page(page);</div><div class='ctx'> 	} else {</div><div class='add'>+		/* managed folios are still left in compressed_bvecs[] */</div><div class='ctx'> 		for (i = 0; i &lt; pclusterpages; ++i) {</div><div class='del'>-			/* consider shortlived pages added when decompressing */</div><div class='ctx'> 			page = be-&gt;compressed_pages[i];</div><div class='del'>-</div><div class='del'>-			if (!page || erofs_page_is_managed(sbi, page))</div><div class='add'>+			if (!page)</div><div class='add'>+				continue;</div><div class='add'>+			if (erofs_folio_is_managed(sbi, page_folio(page))) {</div><div class='add'>+				try_free = false;</div><div class='ctx'> 				continue;</div><div class='add'>+			}</div><div class='ctx'> 			(void)z_erofs_put_shortlivedpage(be-&gt;pagepool, page);</div><div class='ctx'> 			WRITE_ONCE(pcl-&gt;compressed_bvecs[i].page, NULL);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1301,59 +1357,70 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,</div><div class='ctx'> 	if (be-&gt;compressed_pages &lt; be-&gt;onstack_pages ||</div><div class='ctx'> 	    be-&gt;compressed_pages &gt;= be-&gt;onstack_pages + Z_EROFS_ONSTACK_PAGES)</div><div class='ctx'> 		kvfree(be-&gt;compressed_pages);</div><div class='del'>-	z_erofs_fill_other_copies(be, err);</div><div class='ctx'> </div><div class='add'>+	jtop = 0;</div><div class='add'>+	z_erofs_fill_other_copies(be, err);</div><div class='ctx'> 	for (i = 0; i &lt; be-&gt;nr_pages; ++i) {</div><div class='ctx'> 		page = be-&gt;decompressed_pages[i];</div><div class='ctx'> 		if (!page)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		DBG_BUGON(z_erofs_page_is_invalidated(page));</div><div class='del'>-</div><div class='del'>-		/* recycle all individual short-lived pages */</div><div class='del'>-		if (z_erofs_put_shortlivedpage(be-&gt;pagepool, page))</div><div class='add'>+		if (!z_erofs_is_shortlived_page(page)) {</div><div class='add'>+			erofs_onlinefolio_end(page_folio(page), err, true);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (pcl-&gt;algorithmformat != Z_EROFS_COMPRESSION_LZ4) {</div><div class='add'>+			erofs_pagepool_add(be-&gt;pagepool, page);</div><div class='ctx'> 			continue;</div><div class='del'>-		z_erofs_onlinepage_endio(page, err);</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; jtop &amp;&amp; be-&gt;decompressed_pages[j] != page; ++j)</div><div class='add'>+			;</div><div class='add'>+		if (j &gt;= jtop)	/* this bounce page is newly detected */</div><div class='add'>+			be-&gt;decompressed_pages[jtop++] = page;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	while (jtop)</div><div class='add'>+		erofs_pagepool_add(be-&gt;pagepool,</div><div class='add'>+				   be-&gt;decompressed_pages[--jtop]);</div><div class='ctx'> 	if (be-&gt;decompressed_pages != be-&gt;onstack_pages)</div><div class='ctx'> 		kvfree(be-&gt;decompressed_pages);</div><div class='ctx'> </div><div class='ctx'> 	pcl-&gt;length = 0;</div><div class='ctx'> 	pcl-&gt;partial = true;</div><div class='del'>-	pcl-&gt;multibases = false;</div><div class='add'>+	pcl-&gt;besteffort = false;</div><div class='ctx'> 	pcl-&gt;bvset.nextpage = NULL;</div><div class='ctx'> 	pcl-&gt;vcnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* pcluster lock MUST be taken before the following line */</div><div class='del'>-	WRITE_ONCE(pcl-&gt;next, Z_EROFS_PCLUSTER_NIL);</div><div class='add'>+	WRITE_ONCE(pcl-&gt;next, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;pcl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (pcl-&gt;from_meta)</div><div class='add'>+		z_erofs_free_pcluster(pcl);</div><div class='add'>+	else</div><div class='add'>+		z_erofs_put_pcluster(sbi, pcl, try_free);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_decompress_queue(const struct z_erofs_decompressqueue *io,</div><div class='del'>-				     struct page **pagepool)</div><div class='add'>+static int z_erofs_decompress_queue(const struct z_erofs_decompressqueue *io,</div><div class='add'>+				    struct page **pagepool)</div><div class='ctx'> {</div><div class='del'>-	struct z_erofs_decompress_backend be = {</div><div class='add'>+	struct z_erofs_backend be = {</div><div class='ctx'> 		.sb = io-&gt;sb,</div><div class='ctx'> 		.pagepool = pagepool,</div><div class='ctx'> 		.decompressed_secondary_bvecs =</div><div class='ctx'> 			LIST_HEAD_INIT(be.decompressed_secondary_bvecs),</div><div class='add'>+		.pcl = io-&gt;head,</div><div class='ctx'> 	};</div><div class='del'>-	z_erofs_next_pcluster_t owned = io-&gt;head;</div><div class='del'>-</div><div class='del'>-	while (owned != Z_EROFS_PCLUSTER_TAIL) {</div><div class='del'>-		DBG_BUGON(owned == Z_EROFS_PCLUSTER_NIL);</div><div class='add'>+	struct z_erofs_pcluster *next;</div><div class='add'>+	int err = io-&gt;eio ? -EIO : 0;</div><div class='ctx'> </div><div class='del'>-		be.pcl = container_of(owned, struct z_erofs_pcluster, next);</div><div class='del'>-		owned = READ_ONCE(be.pcl-&gt;next);</div><div class='del'>-</div><div class='del'>-		z_erofs_decompress_pcluster(&amp;be, io-&gt;eio ? -EIO : 0);</div><div class='del'>-		if (z_erofs_is_inline_pcluster(be.pcl))</div><div class='del'>-			z_erofs_free_pcluster(be.pcl);</div><div class='del'>-		else</div><div class='del'>-			erofs_workgroup_put(&amp;be.pcl-&gt;obj);</div><div class='add'>+	for (; be.pcl != Z_EROFS_PCLUSTER_TAIL; be.pcl = next) {</div><div class='add'>+		DBG_BUGON(!be.pcl);</div><div class='add'>+		next = READ_ONCE(be.pcl-&gt;next);</div><div class='add'>+		err = z_erofs_decompress_pcluster(&amp;be, err) ?: err;</div><div class='ctx'> 	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void z_erofs_decompressqueue_work(struct work_struct *work)</div><div class='hunk'>@@ -1375,6 +1442,16 @@ static void z_erofs_decompressqueue_kthread_work(struct kthread_work *work)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Use (kthread_)work in atomic contexts to minimize scheduling overhead */</div><div class='add'>+static inline bool z_erofs_in_atomic(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_PREEMPTION) &amp;&amp; rcu_preempt_depth())</div><div class='add'>+		return true;</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_COUNT))</div><div class='add'>+		return true;</div><div class='add'>+	return !preemptible();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,</div><div class='ctx'> 				       int bios)</div><div class='ctx'> {</div><div class='hunk'>@@ -1389,8 +1466,7 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_add_return(bios, &amp;io-&gt;pending_bios))</div><div class='ctx'> 		return;</div><div class='del'>-	/* Use (kthread_)work and sync decompression for atomic contexts only */</div><div class='del'>-	if (!in_task() || irqs_disabled() || rcu_read_lock_any_held()) {</div><div class='add'>+	if (z_erofs_in_atomic()) {</div><div class='ctx'> #ifdef CONFIG_EROFS_FS_PCPU_KTHREAD</div><div class='ctx'> 		struct kthread_worker *worker;</div><div class='ctx'> </div><div class='hunk'>@@ -1416,109 +1492,107 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void z_erofs_fill_bio_vec(struct bio_vec *bvec,</div><div class='del'>-				 struct z_erofs_decompress_frontend *f,</div><div class='add'>+				 struct z_erofs_frontend *f,</div><div class='ctx'> 				 struct z_erofs_pcluster *pcl,</div><div class='ctx'> 				 unsigned int nr,</div><div class='ctx'> 				 struct address_space *mc)</div><div class='ctx'> {</div><div class='ctx'> 	gfp_t gfp = mapping_gfp_mask(mc);</div><div class='ctx'> 	bool tocache = false;</div><div class='del'>-	struct z_erofs_bvec *zbv = pcl-&gt;compressed_bvecs + nr;</div><div class='add'>+	struct z_erofs_bvec zbv;</div><div class='ctx'> 	struct address_space *mapping;</div><div class='del'>-	struct page *page, *oldpage;</div><div class='del'>-	int justfound, bs = i_blocksize(f-&gt;inode);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int bs = i_blocksize(f-&gt;inode);</div><div class='ctx'> </div><div class='del'>-	/* Except for inplace pages, the entire page can be used for I/Os */</div><div class='add'>+	/* Except for inplace folios, the entire folio can be used for I/Os */</div><div class='ctx'> 	bvec-&gt;bv_offset = 0;</div><div class='ctx'> 	bvec-&gt;bv_len = PAGE_SIZE;</div><div class='ctx'> repeat:</div><div class='del'>-	oldpage = READ_ONCE(zbv-&gt;page);</div><div class='del'>-	if (!oldpage)</div><div class='del'>-		goto out_allocpage;</div><div class='del'>-</div><div class='del'>-	justfound = (unsigned long)oldpage &amp; 1UL;</div><div class='del'>-	page = (struct page *)((unsigned long)oldpage &amp; ~1UL);</div><div class='del'>-	bvec-&gt;bv_page = page;</div><div class='del'>-</div><div class='del'>-	DBG_BUGON(z_erofs_is_shortlived_page(page));</div><div class='del'>-	/*</div><div class='del'>-	 * Handle preallocated cached pages.  We tried to allocate such pages</div><div class='del'>-	 * without triggering direct reclaim.  If allocation failed, inplace</div><div class='del'>-	 * file-backed pages will be used instead.</div><div class='del'>-	 */</div><div class='del'>-	if (page-&gt;private == Z_EROFS_PREALLOCATED_PAGE) {</div><div class='del'>-		set_page_private(page, 0);</div><div class='del'>-		WRITE_ONCE(zbv-&gt;page, page);</div><div class='add'>+	spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	zbv = pcl-&gt;compressed_bvecs[nr];</div><div class='add'>+	spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	if (!zbv.page)</div><div class='add'>+		goto out_allocfolio;</div><div class='add'>+</div><div class='add'>+	bvec-&gt;bv_page = zbv.page;</div><div class='add'>+	DBG_BUGON(z_erofs_is_shortlived_page(bvec-&gt;bv_page));</div><div class='add'>+</div><div class='add'>+	folio = page_folio(zbv.page);</div><div class='add'>+	/* For preallocated managed folios, add them to page cache here */</div><div class='add'>+	if (folio-&gt;private == Z_EROFS_PREALLOCATED_FOLIO) {</div><div class='ctx'> 		tocache = true;</div><div class='ctx'> 		goto out_tocache;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mapping = READ_ONCE(page-&gt;mapping);</div><div class='add'>+	mapping = READ_ONCE(folio-&gt;mapping);</div><div class='ctx'> 	/*</div><div class='del'>-	 * File-backed pages for inplace I/Os are all locked steady,</div><div class='add'>+	 * File-backed folios for inplace I/Os are all locked steady,</div><div class='ctx'> 	 * therefore it is impossible for `mapping` to be NULL.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mapping &amp;&amp; mapping != mc) {</div><div class='del'>-		if (zbv-&gt;offset &lt; 0)</div><div class='del'>-			bvec-&gt;bv_offset = round_up(-zbv-&gt;offset, bs);</div><div class='del'>-		bvec-&gt;bv_len = round_up(zbv-&gt;end, bs) - bvec-&gt;bv_offset;</div><div class='add'>+		if (zbv.offset &lt; 0)</div><div class='add'>+			bvec-&gt;bv_offset = round_up(-zbv.offset, bs);</div><div class='add'>+		bvec-&gt;bv_len = round_up(zbv.end, bs) - bvec-&gt;bv_offset;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	/* only true if page reclaim goes wrong, should never happen */</div><div class='del'>-	DBG_BUGON(justfound &amp;&amp; PagePrivate(page));</div><div class='del'>-</div><div class='del'>-	/* the cached page is still in managed cache */</div><div class='del'>-	if (page-&gt;mapping == mc) {</div><div class='del'>-		WRITE_ONCE(zbv-&gt;page, page);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	if (likely(folio-&gt;mapping == mc)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * The cached page is still available but without a valid</div><div class='del'>-		 * `-&gt;private` pcluster hint.  Let's reconnect them.</div><div class='add'>+		 * The cached folio is still in managed cache but without</div><div class='add'>+		 * a valid `-&gt;private` pcluster hint.  Let's reconnect them.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!PagePrivate(page)) {</div><div class='del'>-			DBG_BUGON(!justfound);</div><div class='del'>-			/* compressed_bvecs[] already takes a ref */</div><div class='del'>-			attach_page_private(page, pcl);</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (!folio_test_private(folio)) {</div><div class='add'>+			folio_attach_private(folio, pcl);</div><div class='add'>+			/* compressed_bvecs[] already takes a ref before */</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* no need to submit if it is already up-to-date */</div><div class='del'>-		if (PageUptodate(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			bvec-&gt;bv_page = NULL;</div><div class='add'>+		if (likely(folio-&gt;private == pcl))  {</div><div class='add'>+			/* don't submit cache I/Os again if already uptodate */</div><div class='add'>+			if (folio_test_uptodate(folio)) {</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				bvec-&gt;bv_page = NULL;</div><div class='add'>+			}</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-		return;</div><div class='add'>+		/*</div><div class='add'>+		 * Already linked with another pcluster, which only appears in</div><div class='add'>+		 * crafted images by fuzzers for now.  But handle this anyway.</div><div class='add'>+		 */</div><div class='add'>+		tocache = false;	/* use temporary short-lived pages */</div><div class='add'>+	} else {</div><div class='add'>+		DBG_BUGON(1); /* referenced managed folios can't be truncated */</div><div class='add'>+		tocache = true;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It has been truncated, so it's unsafe to reuse this one. Let's</div><div class='del'>-	 * allocate a new page for compressed data.</div><div class='del'>-	 */</div><div class='del'>-	DBG_BUGON(page-&gt;mapping);</div><div class='del'>-	DBG_BUGON(!justfound);</div><div class='del'>-</div><div class='del'>-	tocache = true;</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-out_allocpage:</div><div class='del'>-	page = erofs_allocpage(&amp;f-&gt;pagepool, gfp | __GFP_NOFAIL);</div><div class='del'>-	if (oldpage != cmpxchg(&amp;zbv-&gt;page, oldpage, page)) {</div><div class='del'>-		erofs_pagepool_add(&amp;f-&gt;pagepool, page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+out_allocfolio:</div><div class='add'>+	page = __erofs_allocpage(&amp;f-&gt;pagepool, gfp, true);</div><div class='add'>+	spin_lock(&amp;pcl-&gt;lockref.lock);</div><div class='add'>+	if (unlikely(pcl-&gt;compressed_bvecs[nr].page != zbv.page)) {</div><div class='add'>+		if (page)</div><div class='add'>+			erofs_pagepool_add(&amp;f-&gt;pagepool, page);</div><div class='add'>+		spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='add'>+	pcl-&gt;compressed_bvecs[nr].page = page ? page : ERR_PTR(-ENOMEM);</div><div class='add'>+	spin_unlock(&amp;pcl-&gt;lockref.lock);</div><div class='ctx'> 	bvec-&gt;bv_page = page;</div><div class='add'>+	if (!page)</div><div class='add'>+		return;</div><div class='add'>+	folio = page_folio(page);</div><div class='ctx'> out_tocache:</div><div class='ctx'> 	if (!tocache || bs != PAGE_SIZE ||</div><div class='del'>-	    add_to_page_cache_lru(page, mc, pcl-&gt;obj.index + nr, gfp)) {</div><div class='del'>-		/* turn into a temporary shortlived page (1 ref) */</div><div class='del'>-		set_page_private(page, Z_EROFS_SHORTLIVED_PAGE);</div><div class='add'>+	    filemap_add_folio(mc, folio, (pcl-&gt;pos &gt;&gt; PAGE_SHIFT) + nr, gfp)) {</div><div class='add'>+		/* turn into a temporary shortlived folio (1 ref) */</div><div class='add'>+		folio-&gt;private = (void *)Z_EROFS_SHORTLIVED_PAGE;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	attach_page_private(page, pcl);</div><div class='add'>+	folio_attach_private(folio, pcl);</div><div class='ctx'> 	/* drop a refcount added by allocpage (then 2 refs in total here) */</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct z_erofs_decompressqueue *jobqueue_init(struct super_block *sb,</div><div class='hunk'>@@ -1558,57 +1632,52 @@ enum {</div><div class='ctx'> 	NR_JOBQUEUES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void move_to_bypass_jobqueue(struct z_erofs_pcluster *pcl,</div><div class='del'>-				    z_erofs_next_pcluster_t qtail[],</div><div class='del'>-				    z_erofs_next_pcluster_t owned_head)</div><div class='add'>+static void z_erofs_move_to_bypass_queue(struct z_erofs_pcluster *pcl,</div><div class='add'>+					 struct z_erofs_pcluster *next,</div><div class='add'>+					 struct z_erofs_pcluster **qtail[])</div><div class='ctx'> {</div><div class='del'>-	z_erofs_next_pcluster_t *const submit_qtail = qtail[JQ_SUBMIT];</div><div class='del'>-	z_erofs_next_pcluster_t *const bypass_qtail = qtail[JQ_BYPASS];</div><div class='del'>-</div><div class='ctx'> 	WRITE_ONCE(pcl-&gt;next, Z_EROFS_PCLUSTER_TAIL);</div><div class='del'>-</div><div class='del'>-	WRITE_ONCE(*submit_qtail, owned_head);</div><div class='del'>-	WRITE_ONCE(*bypass_qtail, &amp;pcl-&gt;next);</div><div class='del'>-</div><div class='add'>+	WRITE_ONCE(*qtail[JQ_SUBMIT], next);</div><div class='add'>+	WRITE_ONCE(*qtail[JQ_BYPASS], pcl);</div><div class='ctx'> 	qtail[JQ_BYPASS] = &amp;pcl-&gt;next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_submissionqueue_endio(struct bio *bio)</div><div class='add'>+static void z_erofs_endio(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_decompressqueue *q = bio-&gt;bi_private;</div><div class='ctx'> 	blk_status_t err = bio-&gt;bi_status;</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		struct page *page = bvec-&gt;bv_page;</div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='add'>+		struct folio *folio = fi.folio;</div><div class='ctx'> </div><div class='del'>-		DBG_BUGON(PageUptodate(page));</div><div class='del'>-		DBG_BUGON(z_erofs_page_is_invalidated(page));</div><div class='del'>-		if (erofs_page_is_managed(EROFS_SB(q-&gt;sb), page)) {</div><div class='del'>-			if (!err)</div><div class='del'>-				SetPageUptodate(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-		}</div><div class='add'>+		DBG_BUGON(folio_test_uptodate(folio));</div><div class='add'>+		DBG_BUGON(z_erofs_page_is_invalidated(&amp;folio-&gt;page));</div><div class='add'>+		if (!erofs_folio_is_managed(EROFS_SB(q-&gt;sb), folio))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		q-&gt;eio = true;</div><div class='ctx'> 	z_erofs_decompress_kickoff(q, -1);</div><div class='del'>-	bio_put(bio);</div><div class='add'>+	if (bio-&gt;bi_bdev)</div><div class='add'>+		bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,</div><div class='add'>+static void z_erofs_submit_queue(struct z_erofs_frontend *f,</div><div class='ctx'> 				 struct z_erofs_decompressqueue *fgq,</div><div class='ctx'> 				 bool *force_fg, bool readahead)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = f-&gt;inode-&gt;i_sb;</div><div class='ctx'> 	struct address_space *mc = MNGD_MAPPING(EROFS_SB(sb));</div><div class='del'>-	z_erofs_next_pcluster_t qtail[NR_JOBQUEUES];</div><div class='add'>+	struct z_erofs_pcluster **qtail[NR_JOBQUEUES];</div><div class='ctx'> 	struct z_erofs_decompressqueue *q[NR_JOBQUEUES];</div><div class='del'>-	z_erofs_next_pcluster_t owned_head = f-&gt;owned_head;</div><div class='add'>+	struct z_erofs_pcluster *pcl, *next;</div><div class='ctx'> 	/* bio is NULL initially, so no need to initialize last_{index,bdev} */</div><div class='ctx'> 	erofs_off_t last_pa;</div><div class='del'>-	struct block_device *last_bdev;</div><div class='ctx'> 	unsigned int nr_bios = 0;</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='ctx'> 	unsigned long pflags;</div><div class='hunk'>@@ -1622,42 +1691,43 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,</div><div class='ctx'> 	qtail[JQ_SUBMIT] = &amp;q[JQ_SUBMIT]-&gt;head;</div><div class='ctx'> </div><div class='ctx'> 	/* by default, all need io submission */</div><div class='del'>-	q[JQ_SUBMIT]-&gt;head = owned_head;</div><div class='add'>+	q[JQ_SUBMIT]-&gt;head = next = f-&gt;head;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct erofs_map_dev mdev;</div><div class='del'>-		struct z_erofs_pcluster *pcl;</div><div class='ctx'> 		erofs_off_t cur, end;</div><div class='ctx'> 		struct bio_vec bvec;</div><div class='ctx'> 		unsigned int i = 0;</div><div class='ctx'> 		bool bypass = true;</div><div class='ctx'> </div><div class='del'>-		DBG_BUGON(owned_head == Z_EROFS_PCLUSTER_NIL);</div><div class='del'>-		pcl = container_of(owned_head, struct z_erofs_pcluster, next);</div><div class='del'>-		owned_head = READ_ONCE(pcl-&gt;next);</div><div class='del'>-</div><div class='del'>-		if (z_erofs_is_inline_pcluster(pcl)) {</div><div class='del'>-			move_to_bypass_jobqueue(pcl, qtail, owned_head);</div><div class='add'>+		pcl = next;</div><div class='add'>+		next = READ_ONCE(pcl-&gt;next);</div><div class='add'>+		if (pcl-&gt;from_meta) {</div><div class='add'>+			z_erofs_move_to_bypass_queue(pcl, next, qtail);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* no device id here, thus it will always succeed */</div><div class='ctx'> 		mdev = (struct erofs_map_dev) {</div><div class='del'>-			.m_pa = erofs_pos(sb, pcl-&gt;obj.index),</div><div class='add'>+			.m_pa = round_down(pcl-&gt;pos, sb-&gt;s_blocksize),</div><div class='ctx'> 		};</div><div class='ctx'> 		(void)erofs_map_dev(sb, &amp;mdev);</div><div class='ctx'> </div><div class='ctx'> 		cur = mdev.m_pa;</div><div class='del'>-		end = cur + pcl-&gt;pclustersize;</div><div class='add'>+		end = round_up(cur + pcl-&gt;pageofs_in + pcl-&gt;pclustersize,</div><div class='add'>+			       sb-&gt;s_blocksize);</div><div class='ctx'> 		do {</div><div class='del'>-			z_erofs_fill_bio_vec(&amp;bvec, f, pcl, i++, mc);</div><div class='del'>-			if (!bvec.bv_page)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='add'>+			bvec.bv_page = NULL;</div><div class='ctx'> 			if (bio &amp;&amp; (cur != last_pa ||</div><div class='del'>-				    last_bdev != mdev.m_bdev)) {</div><div class='del'>-submit_bio_retry:</div><div class='del'>-				submit_bio(bio);</div><div class='add'>+				    bio-&gt;bi_bdev != mdev.m_bdev)) {</div><div class='add'>+drain_io:</div><div class='add'>+				if (erofs_is_fileio_mode(EROFS_SB(sb)))</div><div class='add'>+					erofs_fileio_submit_bio(bio);</div><div class='add'>+				else if (erofs_is_fscache_mode(sb))</div><div class='add'>+					erofs_fscache_submit_bio(bio);</div><div class='add'>+				else</div><div class='add'>+					submit_bio(bio);</div><div class='add'>+</div><div class='ctx'> 				if (memstall) {</div><div class='ctx'> 					psi_memstall_leave(&amp;pflags);</div><div class='ctx'> 					memstall = 0;</div><div class='hunk'>@@ -1665,6 +1735,15 @@ submit_bio_retry:</div><div class='ctx'> 				bio = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			if (!bvec.bv_page) {</div><div class='add'>+				z_erofs_fill_bio_vec(&amp;bvec, f, pcl, i++, mc);</div><div class='add'>+				if (!bvec.bv_page)</div><div class='add'>+					continue;</div><div class='add'>+				if (cur + bvec.bv_len &gt; end)</div><div class='add'>+					bvec.bv_len = end - cur;</div><div class='add'>+				DBG_BUGON(bvec.bv_len &lt; sb-&gt;s_blocksize);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (unlikely(PageWorkingset(bvec.bv_page)) &amp;&amp;</div><div class='ctx'> 			    !memstall) {</div><div class='ctx'> 				psi_memstall_enter(&amp;pflags);</div><div class='hunk'>@@ -1672,23 +1751,25 @@ submit_bio_retry:</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (!bio) {</div><div class='del'>-				bio = bio_alloc(mdev.m_bdev, BIO_MAX_VECS,</div><div class='del'>-						REQ_OP_READ, GFP_NOIO);</div><div class='del'>-				bio-&gt;bi_end_io = z_erofs_submissionqueue_endio;</div><div class='del'>-				bio-&gt;bi_iter.bi_sector = cur &gt;&gt; 9;</div><div class='add'>+				if (erofs_is_fileio_mode(EROFS_SB(sb)))</div><div class='add'>+					bio = erofs_fileio_bio_alloc(&amp;mdev);</div><div class='add'>+				else if (erofs_is_fscache_mode(sb))</div><div class='add'>+					bio = erofs_fscache_bio_alloc(&amp;mdev);</div><div class='add'>+				else</div><div class='add'>+					bio = bio_alloc(mdev.m_bdev, BIO_MAX_VECS,</div><div class='add'>+							REQ_OP_READ, GFP_NOIO);</div><div class='add'>+				bio-&gt;bi_end_io = z_erofs_endio;</div><div class='add'>+				bio-&gt;bi_iter.bi_sector =</div><div class='add'>+						(mdev.m_dif-&gt;fsoff + cur) &gt;&gt; 9;</div><div class='ctx'> 				bio-&gt;bi_private = q[JQ_SUBMIT];</div><div class='ctx'> 				if (readahead)</div><div class='ctx'> 					bio-&gt;bi_opf |= REQ_RAHEAD;</div><div class='ctx'> 				++nr_bios;</div><div class='del'>-				last_bdev = mdev.m_bdev;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (cur + bvec.bv_len &gt; end)</div><div class='del'>-				bvec.bv_len = end - cur;</div><div class='ctx'> 			if (!bio_add_page(bio, bvec.bv_page, bvec.bv_len,</div><div class='ctx'> 					  bvec.bv_offset))</div><div class='del'>-				goto submit_bio_retry;</div><div class='del'>-</div><div class='add'>+				goto drain_io;</div><div class='ctx'> 			last_pa = cur + bvec.bv_len;</div><div class='ctx'> 			bypass = false;</div><div class='ctx'> 		} while ((cur += bvec.bv_len) &lt; end);</div><div class='hunk'>@@ -1696,14 +1777,19 @@ submit_bio_retry:</div><div class='ctx'> 		if (!bypass)</div><div class='ctx'> 			qtail[JQ_SUBMIT] = &amp;pcl-&gt;next;</div><div class='ctx'> 		else</div><div class='del'>-			move_to_bypass_jobqueue(pcl, qtail, owned_head);</div><div class='del'>-	} while (owned_head != Z_EROFS_PCLUSTER_TAIL);</div><div class='add'>+			z_erofs_move_to_bypass_queue(pcl, next, qtail);</div><div class='add'>+	} while (next != Z_EROFS_PCLUSTER_TAIL);</div><div class='ctx'> </div><div class='ctx'> 	if (bio) {</div><div class='del'>-		submit_bio(bio);</div><div class='del'>-		if (memstall)</div><div class='del'>-			psi_memstall_leave(&amp;pflags);</div><div class='add'>+		if (erofs_is_fileio_mode(EROFS_SB(sb)))</div><div class='add'>+			erofs_fileio_submit_bio(bio);</div><div class='add'>+		else if (erofs_is_fscache_mode(sb))</div><div class='add'>+			erofs_fscache_submit_bio(bio);</div><div class='add'>+		else</div><div class='add'>+			submit_bio(bio);</div><div class='ctx'> 	}</div><div class='add'>+	if (memstall)</div><div class='add'>+		psi_memstall_leave(&amp;pflags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * although background is preferred, no one is pending for submission.</div><div class='hunk'>@@ -1716,33 +1802,34 @@ submit_bio_retry:</div><div class='ctx'> 	z_erofs_decompress_kickoff(q[JQ_SUBMIT], nr_bios);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void z_erofs_runqueue(struct z_erofs_decompress_frontend *f,</div><div class='del'>-			     bool force_fg, bool ra)</div><div class='add'>+static int z_erofs_runqueue(struct z_erofs_frontend *f, unsigned int rapages)</div><div class='ctx'> {</div><div class='ctx'> 	struct z_erofs_decompressqueue io[NR_JOBQUEUES];</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_I_SB(f-&gt;inode);</div><div class='add'>+	bool force_fg = z_erofs_is_sync_decompress(sbi, rapages);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (f-&gt;owned_head == Z_EROFS_PCLUSTER_TAIL)</div><div class='del'>-		return;</div><div class='del'>-	z_erofs_submit_queue(f, io, &amp;force_fg, ra);</div><div class='add'>+	if (f-&gt;head == Z_EROFS_PCLUSTER_TAIL)</div><div class='add'>+		return 0;</div><div class='add'>+	z_erofs_submit_queue(f, io, &amp;force_fg, !!rapages);</div><div class='ctx'> </div><div class='ctx'> 	/* handle bypass queue (no i/o pclusters) immediately */</div><div class='del'>-	z_erofs_decompress_queue(&amp;io[JQ_BYPASS], &amp;f-&gt;pagepool);</div><div class='del'>-</div><div class='add'>+	err = z_erofs_decompress_queue(&amp;io[JQ_BYPASS], &amp;f-&gt;pagepool);</div><div class='ctx'> 	if (!force_fg)</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* wait until all bios are completed */</div><div class='ctx'> 	wait_for_completion_io(&amp;io[JQ_SUBMIT].u.done);</div><div class='ctx'> </div><div class='ctx'> 	/* handle synchronous decompress queue in the caller context */</div><div class='del'>-	z_erofs_decompress_queue(&amp;io[JQ_SUBMIT], &amp;f-&gt;pagepool);</div><div class='add'>+	return z_erofs_decompress_queue(&amp;io[JQ_SUBMIT], &amp;f-&gt;pagepool) ?: err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Since partial uptodate is still unimplemented for now, we have to use</div><div class='ctx'>  * approximate readmore strategies as a start.</div><div class='ctx'>  */</div><div class='del'>-static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,</div><div class='add'>+static void z_erofs_pcluster_readmore(struct z_erofs_frontend *f,</div><div class='ctx'> 		struct readahead_control *rac, bool backmost)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = f-&gt;inode;</div><div class='hunk'>@@ -1758,7 +1845,7 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,</div><div class='ctx'> 		map-&gt;m_la = end;</div><div class='ctx'> 		err = z_erofs_map_blocks_iter(inode, map,</div><div class='ctx'> 					      EROFS_GET_BLOCKS_READMORE);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err || !(map-&gt;m_flags &amp; EROFS_MAP_ENCODED))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		/* expand ra for the trailing edge if readahead */</div><div class='hunk'>@@ -1770,23 +1857,22 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,</div><div class='ctx'> 		end = round_up(end, PAGE_SIZE);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		end = round_up(map-&gt;m_la, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-		if (!map-&gt;m_llen)</div><div class='add'>+		if (!(map-&gt;m_flags &amp; EROFS_MAP_ENCODED) || !map-&gt;m_llen)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cur = map-&gt;m_la + map-&gt;m_llen - 1;</div><div class='ctx'> 	while ((cur &gt;= end) &amp;&amp; (cur &lt; i_size_read(inode))) {</div><div class='ctx'> 		pgoff_t index = cur &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='del'>-		page = erofs_grab_cache_page_nowait(inode-&gt;i_mapping, index);</div><div class='del'>-		if (page) {</div><div class='del'>-			if (PageUptodate(page))</div><div class='del'>-				unlock_page(page);</div><div class='add'>+		folio = erofs_grab_folio_nowait(inode-&gt;i_mapping, index);</div><div class='add'>+		if (!IS_ERR_OR_NULL(folio)) {</div><div class='add'>+			if (folio_test_uptodate(folio))</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 			else</div><div class='del'>-				(void)z_erofs_do_read_page(f, page);</div><div class='del'>-			put_page(page);</div><div class='add'>+				z_erofs_scan_folio(f, folio, !!rac);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cur &lt; PAGE_SIZE)</div><div class='hunk'>@@ -1798,21 +1884,17 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,</div><div class='ctx'> static int z_erofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *const inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	struct erofs_sb_info *const sbi = EROFS_I_SB(inode);</div><div class='del'>-	struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);</div><div class='add'>+	Z_EROFS_DEFINE_FRONTEND(f, inode, folio_pos(folio));</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	trace_erofs_read_folio(folio, false);</div><div class='del'>-	f.headoffset = (erofs_off_t)folio-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='del'>-</div><div class='ctx'> 	z_erofs_pcluster_readmore(&amp;f, NULL, true);</div><div class='del'>-	err = z_erofs_do_read_page(&amp;f, &amp;folio-&gt;page);</div><div class='add'>+	err = z_erofs_scan_folio(&amp;f, folio, false);</div><div class='ctx'> 	z_erofs_pcluster_readmore(&amp;f, NULL, false);</div><div class='ctx'> 	z_erofs_pcluster_end(&amp;f);</div><div class='ctx'> </div><div class='del'>-	/* if some compressed cluster ready, need submit them anyway */</div><div class='del'>-	z_erofs_runqueue(&amp;f, z_erofs_is_sync_decompress(sbi, 0), false);</div><div class='del'>-</div><div class='add'>+	/* if some pclusters are ready, need submit them anyway */</div><div class='add'>+	err = z_erofs_runqueue(&amp;f, 0) ?: err;</div><div class='ctx'> 	if (err &amp;&amp; err != -EINTR)</div><div class='ctx'> 		erofs_err(inode-&gt;i_sb, "read error %d @ %lu of nid %llu",</div><div class='ctx'> 			  err, folio-&gt;index, EROFS_I(inode)-&gt;nid);</div><div class='hunk'>@@ -1825,18 +1907,13 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> static void z_erofs_readahead(struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *const inode = rac-&gt;mapping-&gt;host;</div><div class='del'>-	struct erofs_sb_info *const sbi = EROFS_I_SB(inode);</div><div class='del'>-	struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);</div><div class='add'>+	Z_EROFS_DEFINE_FRONTEND(f, inode, readahead_pos(rac));</div><div class='add'>+	unsigned int nrpages = readahead_count(rac);</div><div class='ctx'> 	struct folio *head = NULL, *folio;</div><div class='del'>-	unsigned int nr_folios;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	f.headoffset = readahead_pos(rac);</div><div class='del'>-</div><div class='add'>+	trace_erofs_readahead(inode, readahead_index(rac), nrpages, false);</div><div class='ctx'> 	z_erofs_pcluster_readmore(&amp;f, rac, true);</div><div class='del'>-	nr_folios = readahead_count(rac);</div><div class='del'>-	trace_erofs_readpages(inode, readahead_index(rac), nr_folios, false);</div><div class='del'>-</div><div class='ctx'> 	while ((folio = readahead_folio(rac))) {</div><div class='ctx'> 		folio-&gt;private = head;</div><div class='ctx'> 		head = folio;</div><div class='hunk'>@@ -1847,7 +1924,7 @@ static void z_erofs_readahead(struct readahead_control *rac)</div><div class='ctx'> 		folio = head;</div><div class='ctx'> 		head = folio_get_private(folio);</div><div class='ctx'> </div><div class='del'>-		err = z_erofs_do_read_page(&amp;f, &amp;folio-&gt;page);</div><div class='add'>+		err = z_erofs_scan_folio(&amp;f, folio, true);</div><div class='ctx'> 		if (err &amp;&amp; err != -EINTR)</div><div class='ctx'> 			erofs_err(inode-&gt;i_sb, "readahead error at folio %lu @ nid %llu",</div><div class='ctx'> 				  folio-&gt;index, EROFS_I(inode)-&gt;nid);</div><div class='hunk'>@@ -1855,7 +1932,7 @@ static void z_erofs_readahead(struct readahead_control *rac)</div><div class='ctx'> 	z_erofs_pcluster_readmore(&amp;f, rac, false);</div><div class='ctx'> 	z_erofs_pcluster_end(&amp;f);</div><div class='ctx'> </div><div class='del'>-	z_erofs_runqueue(&amp;f, z_erofs_is_sync_decompress(sbi, nr_folios), true);</div><div class='add'>+	(void)z_erofs_runqueue(&amp;f, nrpages);</div><div class='ctx'> 	erofs_put_metabuf(&amp;f.map.buf);</div><div class='ctx'> 	erofs_release_pages(&amp;f.pagepool);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c<br/>index e313c936351d..c8d8e129eb4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/erofs/zmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/erofs/zmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/zmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/zmap.c</a></div><div class='hunk'>@@ -4,14 +4,12 @@</div><div class='ctx'>  *             https://www.huawei.com/</div><div class='ctx'>  */</div><div class='ctx'> #include "internal.h"</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;trace/events/erofs.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct z_erofs_maprecorder {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct erofs_map_blocks *map;</div><div class='del'>-	void *kaddr;</div><div class='del'>-</div><div class='ctx'> 	unsigned long lcn;</div><div class='ctx'> 	/* compression extent information gathered */</div><div class='ctx'> 	u8  type, headtype;</div><div class='hunk'>@@ -19,7 +17,7 @@ struct z_erofs_maprecorder {</div><div class='ctx'> 	u16 delta[2];</div><div class='ctx'> 	erofs_blk_t pblk, compressedblks;</div><div class='ctx'> 	erofs_off_t nextpackoff;</div><div class='del'>-	bool partialref;</div><div class='add'>+	bool partialref, in_mbox;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,</div><div class='hunk'>@@ -27,27 +25,22 @@ static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *const inode = m-&gt;inode;</div><div class='ctx'> 	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='del'>-	const erofs_off_t pos = Z_EROFS_FULL_INDEX_ALIGN(erofs_iloc(inode) +</div><div class='add'>+	const erofs_off_t pos = Z_EROFS_FULL_INDEX_START(erofs_iloc(inode) +</div><div class='ctx'> 			vi-&gt;inode_isize + vi-&gt;xattr_isize) +</div><div class='ctx'> 			lcn * sizeof(struct z_erofs_lcluster_index);</div><div class='ctx'> 	struct z_erofs_lcluster_index *di;</div><div class='del'>-	unsigned int advise, type;</div><div class='del'>-</div><div class='del'>-	m-&gt;kaddr = erofs_read_metabuf(&amp;m-&gt;map-&gt;buf, inode-&gt;i_sb,</div><div class='del'>-				      erofs_blknr(inode-&gt;i_sb, pos), EROFS_KMAP);</div><div class='del'>-	if (IS_ERR(m-&gt;kaddr))</div><div class='del'>-		return PTR_ERR(m-&gt;kaddr);</div><div class='add'>+	unsigned int advise;</div><div class='ctx'> </div><div class='del'>-	m-&gt;nextpackoff = pos + sizeof(struct z_erofs_lcluster_index);</div><div class='add'>+	di = erofs_read_metabuf(&amp;m-&gt;map-&gt;buf, inode-&gt;i_sb, pos, m-&gt;in_mbox);</div><div class='add'>+	if (IS_ERR(di))</div><div class='add'>+		return PTR_ERR(di);</div><div class='ctx'> 	m-&gt;lcn = lcn;</div><div class='del'>-	di = m-&gt;kaddr + erofs_blkoff(inode-&gt;i_sb, pos);</div><div class='add'>+	m-&gt;nextpackoff = pos + sizeof(struct z_erofs_lcluster_index);</div><div class='ctx'> </div><div class='ctx'> 	advise = le16_to_cpu(di-&gt;di_advise);</div><div class='del'>-	type = (advise &gt;&gt; Z_EROFS_LI_LCLUSTER_TYPE_BIT) &amp;</div><div class='del'>-		((1 &lt;&lt; Z_EROFS_LI_LCLUSTER_TYPE_BITS) - 1);</div><div class='del'>-	switch (type) {</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_NONHEAD:</div><div class='del'>-		m-&gt;clusterofs = 1 &lt;&lt; vi-&gt;z_logical_clusterbits;</div><div class='add'>+	m-&gt;type = advise &amp; Z_EROFS_LI_LCLUSTER_TYPE_MASK;</div><div class='add'>+	if (m-&gt;type == Z_EROFS_LCLUSTER_TYPE_NONHEAD) {</div><div class='add'>+		m-&gt;clusterofs = 1 &lt;&lt; vi-&gt;z_lclusterbits;</div><div class='ctx'> 		m-&gt;delta[0] = le16_to_cpu(di-&gt;di_u.delta[0]);</div><div class='ctx'> 		if (m-&gt;delta[0] &amp; Z_EROFS_LI_D0_CBLKCNT) {</div><div class='ctx'> 			if (!(vi-&gt;z_advise &amp; (Z_EROFS_ADVISE_BIG_PCLUSTER_1 |</div><div class='hunk'>@@ -55,29 +48,15 @@ static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,</div><div class='ctx'> 				DBG_BUGON(1);</div><div class='ctx'> 				return -EFSCORRUPTED;</div><div class='ctx'> 			}</div><div class='del'>-			m-&gt;compressedblks = m-&gt;delta[0] &amp;</div><div class='del'>-				~Z_EROFS_LI_D0_CBLKCNT;</div><div class='add'>+			m-&gt;compressedblks = m-&gt;delta[0] &amp; ~Z_EROFS_LI_D0_CBLKCNT;</div><div class='ctx'> 			m-&gt;delta[0] = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		m-&gt;delta[1] = le16_to_cpu(di-&gt;di_u.delta[1]);</div><div class='del'>-		break;</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_PLAIN:</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_HEAD1:</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_HEAD2:</div><div class='del'>-		if (advise &amp; Z_EROFS_LI_PARTIAL_REF)</div><div class='del'>-			m-&gt;partialref = true;</div><div class='add'>+	} else {</div><div class='add'>+		m-&gt;partialref = !!(advise &amp; Z_EROFS_LI_PARTIAL_REF);</div><div class='ctx'> 		m-&gt;clusterofs = le16_to_cpu(di-&gt;di_clusterofs);</div><div class='del'>-		if (m-&gt;clusterofs &gt;= 1 &lt;&lt; vi-&gt;z_logical_clusterbits) {</div><div class='del'>-			DBG_BUGON(1);</div><div class='del'>-			return -EFSCORRUPTED;</div><div class='del'>-		}</div><div class='ctx'> 		m-&gt;pblk = le32_to_cpu(di-&gt;di_u.blkaddr);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		DBG_BUGON(1);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='del'>-	m-&gt;type = type;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,17 +93,48 @@ static int get_compacted_la_distance(unsigned int lobits,</div><div class='ctx'> 	return d1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int unpack_compacted_index(struct z_erofs_maprecorder *m,</div><div class='del'>-				  unsigned int amortizedshift,</div><div class='del'>-				  erofs_off_t pos, bool lookahead)</div><div class='add'>+static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,</div><div class='add'>+					 unsigned long lcn, bool lookahead)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_inode *const vi = EROFS_I(m-&gt;inode);</div><div class='del'>-	const unsigned int lclusterbits = vi-&gt;z_logical_clusterbits;</div><div class='del'>-	unsigned int vcnt, base, lo, lobits, encodebits, nblk, eofs;</div><div class='del'>-	int i;</div><div class='add'>+	struct inode *const inode = m-&gt;inode;</div><div class='add'>+	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='add'>+	const erofs_off_t ebase = Z_EROFS_MAP_HEADER_END(erofs_iloc(inode) +</div><div class='add'>+			vi-&gt;inode_isize + vi-&gt;xattr_isize);</div><div class='add'>+	const unsigned int lclusterbits = vi-&gt;z_lclusterbits;</div><div class='add'>+	const unsigned int totalidx = erofs_iblks(inode);</div><div class='add'>+	unsigned int compacted_4b_initial, compacted_2b, amortizedshift;</div><div class='add'>+	unsigned int vcnt, lo, lobits, encodebits, nblk, bytes;</div><div class='add'>+	bool big_pcluster = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_1;</div><div class='add'>+	erofs_off_t pos;</div><div class='ctx'> 	u8 *in, type;</div><div class='del'>-	bool big_pcluster;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (lcn &gt;= totalidx || lclusterbits &gt; 14)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	m-&gt;lcn = lcn;</div><div class='add'>+	/* used to align to 32-byte (compacted_2b) alignment */</div><div class='add'>+	compacted_4b_initial = ((32 - ebase % 32) / 4) &amp; 7;</div><div class='add'>+	compacted_2b = 0;</div><div class='add'>+	if ((vi-&gt;z_advise &amp; Z_EROFS_ADVISE_COMPACTED_2B) &amp;&amp;</div><div class='add'>+	    compacted_4b_initial &lt; totalidx)</div><div class='add'>+		compacted_2b = rounddown(totalidx - compacted_4b_initial, 16);</div><div class='ctx'> </div><div class='add'>+	pos = ebase;</div><div class='add'>+	amortizedshift = 2;	/* compact_4b */</div><div class='add'>+	if (lcn &gt;= compacted_4b_initial) {</div><div class='add'>+		pos += compacted_4b_initial * 4;</div><div class='add'>+		lcn -= compacted_4b_initial;</div><div class='add'>+		if (lcn &lt; compacted_2b) {</div><div class='add'>+			amortizedshift = 1;</div><div class='add'>+		} else {</div><div class='add'>+			pos += compacted_2b * 2;</div><div class='add'>+			lcn -= compacted_2b;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pos += lcn * (1 &lt;&lt; amortizedshift);</div><div class='add'>+</div><div class='add'>+	/* figure out the lcluster count in this pack */</div><div class='ctx'> 	if (1 &lt;&lt; amortizedshift == 4 &amp;&amp; lclusterbits &lt;= 14)</div><div class='ctx'> 		vcnt = 2;</div><div class='ctx'> 	else if (1 &lt;&lt; amortizedshift == 2 &amp;&amp; lclusterbits &lt;= 12)</div><div class='hunk'>@@ -132,17 +142,18 @@ static int unpack_compacted_index(struct z_erofs_maprecorder *m,</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	in = erofs_read_metabuf(&amp;m-&gt;map-&gt;buf, inode-&gt;i_sb, pos, m-&gt;in_mbox);</div><div class='add'>+	if (IS_ERR(in))</div><div class='add'>+		return PTR_ERR(in);</div><div class='add'>+</div><div class='ctx'> 	/* it doesn't equal to round_up(..) */</div><div class='ctx'> 	m-&gt;nextpackoff = round_down(pos, vcnt &lt;&lt; amortizedshift) +</div><div class='ctx'> 			 (vcnt &lt;&lt; amortizedshift);</div><div class='del'>-	big_pcluster = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_1;</div><div class='ctx'> 	lobits = max(lclusterbits, ilog2(Z_EROFS_LI_D0_CBLKCNT) + 1U);</div><div class='ctx'> 	encodebits = ((vcnt &lt;&lt; amortizedshift) - sizeof(__le32)) * 8 / vcnt;</div><div class='del'>-	eofs = erofs_blkoff(m-&gt;inode-&gt;i_sb, pos);</div><div class='del'>-	base = round_down(eofs, vcnt &lt;&lt; amortizedshift);</div><div class='del'>-	in = m-&gt;kaddr + base;</div><div class='del'>-</div><div class='del'>-	i = (eofs - base) &gt;&gt; amortizedshift;</div><div class='add'>+	bytes = pos &amp; ((vcnt &lt;&lt; amortizedshift) - 1);</div><div class='add'>+	in -= bytes;</div><div class='add'>+	i = bytes &gt;&gt; amortizedshift;</div><div class='ctx'> </div><div class='ctx'> 	lo = decode_compactedbits(lobits, in, encodebits * i, &amp;type);</div><div class='ctx'> 	m-&gt;type = type;</div><div class='hunk'>@@ -222,68 +233,32 @@ static int unpack_compacted_index(struct z_erofs_maprecorder *m,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,</div><div class='del'>-					 unsigned long lcn, bool lookahead)</div><div class='add'>+static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m,</div><div class='add'>+					   unsigned int lcn, bool lookahead)</div><div class='ctx'> {</div><div class='del'>-	struct inode *const inode = m-&gt;inode;</div><div class='del'>-	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='del'>-	const erofs_off_t ebase = sizeof(struct z_erofs_map_header) +</div><div class='del'>-		ALIGN(erofs_iloc(inode) + vi-&gt;inode_isize + vi-&gt;xattr_isize, 8);</div><div class='del'>-	unsigned int totalidx = erofs_iblks(inode);</div><div class='del'>-	unsigned int compacted_4b_initial, compacted_2b;</div><div class='del'>-	unsigned int amortizedshift;</div><div class='del'>-	erofs_off_t pos;</div><div class='del'>-</div><div class='del'>-	if (lcn &gt;= totalidx)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	m-&gt;lcn = lcn;</div><div class='del'>-	/* used to align to 32-byte (compacted_2b) alignment */</div><div class='del'>-	compacted_4b_initial = (32 - ebase % 32) / 4;</div><div class='del'>-	if (compacted_4b_initial == 32 / 4)</div><div class='del'>-		compacted_4b_initial = 0;</div><div class='del'>-</div><div class='del'>-	if ((vi-&gt;z_advise &amp; Z_EROFS_ADVISE_COMPACTED_2B) &amp;&amp;</div><div class='del'>-	    compacted_4b_initial &lt; totalidx)</div><div class='del'>-		compacted_2b = rounddown(totalidx - compacted_4b_initial, 16);</div><div class='del'>-	else</div><div class='del'>-		compacted_2b = 0;</div><div class='del'>-</div><div class='del'>-	pos = ebase;</div><div class='del'>-	if (lcn &lt; compacted_4b_initial) {</div><div class='del'>-		amortizedshift = 2;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	pos += compacted_4b_initial * 4;</div><div class='del'>-	lcn -= compacted_4b_initial;</div><div class='add'>+	struct erofs_inode *vi = EROFS_I(m-&gt;inode);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (lcn &lt; compacted_2b) {</div><div class='del'>-		amortizedshift = 1;</div><div class='del'>-		goto out;</div><div class='add'>+	if (vi-&gt;datalayout == EROFS_INODE_COMPRESSED_COMPACT) {</div><div class='add'>+		err = z_erofs_load_compact_lcluster(m, lcn, lookahead);</div><div class='add'>+	} else {</div><div class='add'>+		DBG_BUGON(vi-&gt;datalayout != EROFS_INODE_COMPRESSED_FULL);</div><div class='add'>+		err = z_erofs_load_full_lcluster(m, lcn);</div><div class='ctx'> 	}</div><div class='del'>-	pos += compacted_2b * 2;</div><div class='del'>-	lcn -= compacted_2b;</div><div class='del'>-	amortizedshift = 2;</div><div class='del'>-out:</div><div class='del'>-	pos += lcn * (1 &lt;&lt; amortizedshift);</div><div class='del'>-	m-&gt;kaddr = erofs_read_metabuf(&amp;m-&gt;map-&gt;buf, inode-&gt;i_sb,</div><div class='del'>-				      erofs_blknr(inode-&gt;i_sb, pos), EROFS_KMAP);</div><div class='del'>-	if (IS_ERR(m-&gt;kaddr))</div><div class='del'>-		return PTR_ERR(m-&gt;kaddr);</div><div class='del'>-	return unpack_compacted_index(m, amortizedshift, pos, lookahead);</div><div class='del'>-}</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m,</div><div class='del'>-					   unsigned int lcn, bool lookahead)</div><div class='del'>-{</div><div class='del'>-	switch (EROFS_I(m-&gt;inode)-&gt;datalayout) {</div><div class='del'>-	case EROFS_INODE_COMPRESSED_FULL:</div><div class='del'>-		return z_erofs_load_full_lcluster(m, lcn);</div><div class='del'>-	case EROFS_INODE_COMPRESSED_COMPACT:</div><div class='del'>-		return z_erofs_load_compact_lcluster(m, lcn, lookahead);</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (m-&gt;type &gt;= Z_EROFS_LCLUSTER_TYPE_MAX) {</div><div class='add'>+		erofs_err(m-&gt;inode-&gt;i_sb, "unknown type %u @ lcn %u of nid %llu",</div><div class='add'>+			  m-&gt;type, lcn, EROFS_I(m-&gt;inode)-&gt;nid);</div><div class='add'>+		DBG_BUGON(1);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	} else if (m-&gt;type != Z_EROFS_LCLUSTER_TYPE_NONHEAD &amp;&amp;</div><div class='add'>+		   m-&gt;clusterofs &gt;= (1 &lt;&lt; vi-&gt;z_lclusterbits)) {</div><div class='add'>+		DBG_BUGON(1);</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,</div><div class='hunk'>@@ -291,36 +266,26 @@ static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = m-&gt;inode-&gt;i_sb;</div><div class='ctx'> 	struct erofs_inode *const vi = EROFS_I(m-&gt;inode);</div><div class='del'>-	const unsigned int lclusterbits = vi-&gt;z_logical_clusterbits;</div><div class='add'>+	const unsigned int lclusterbits = vi-&gt;z_lclusterbits;</div><div class='ctx'> </div><div class='ctx'> 	while (m-&gt;lcn &gt;= lookback_distance) {</div><div class='ctx'> 		unsigned long lcn = m-&gt;lcn - lookback_distance;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='add'>+		if (!lookback_distance)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		err = z_erofs_load_lcluster_from_disk(m, lcn, false);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='del'>-		switch (m-&gt;type) {</div><div class='del'>-		case Z_EROFS_LCLUSTER_TYPE_NONHEAD:</div><div class='add'>+		if (m-&gt;type == Z_EROFS_LCLUSTER_TYPE_NONHEAD) {</div><div class='ctx'> 			lookback_distance = m-&gt;delta[0];</div><div class='del'>-			if (!lookback_distance)</div><div class='del'>-				goto err_bogus;</div><div class='ctx'> 			continue;</div><div class='del'>-		case Z_EROFS_LCLUSTER_TYPE_PLAIN:</div><div class='del'>-		case Z_EROFS_LCLUSTER_TYPE_HEAD1:</div><div class='del'>-		case Z_EROFS_LCLUSTER_TYPE_HEAD2:</div><div class='del'>-			m-&gt;headtype = m-&gt;type;</div><div class='del'>-			m-&gt;map-&gt;m_la = (lcn &lt;&lt; lclusterbits) | m-&gt;clusterofs;</div><div class='del'>-			return 0;</div><div class='del'>-		default:</div><div class='del'>-			erofs_err(sb, "unknown type %u @ lcn %lu of nid %llu",</div><div class='del'>-				  m-&gt;type, lcn, vi-&gt;nid);</div><div class='del'>-			DBG_BUGON(1);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='add'>+		m-&gt;headtype = m-&gt;type;</div><div class='add'>+		m-&gt;map-&gt;m_la = (lcn &lt;&lt; lclusterbits) | m-&gt;clusterofs;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-err_bogus:</div><div class='ctx'> 	erofs_err(sb, "bogus lookback distance %u @ lcn %lu of nid %llu",</div><div class='ctx'> 		  lookback_distance, m-&gt;lcn, vi-&gt;nid);</div><div class='ctx'> 	DBG_BUGON(1);</div><div class='hunk'>@@ -330,27 +295,23 @@ err_bogus:</div><div class='ctx'> static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m,</div><div class='ctx'> 					    unsigned int initial_lcn)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = m-&gt;inode-&gt;i_sb;</div><div class='del'>-	struct erofs_inode *const vi = EROFS_I(m-&gt;inode);</div><div class='del'>-	struct erofs_map_blocks *const map = m-&gt;map;</div><div class='del'>-	const unsigned int lclusterbits = vi-&gt;z_logical_clusterbits;</div><div class='del'>-	unsigned long lcn;</div><div class='add'>+	struct inode *inode = m-&gt;inode;</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	struct erofs_inode *vi = EROFS_I(inode);</div><div class='add'>+	bool bigpcl1 = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_1;</div><div class='add'>+	bool bigpcl2 = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_2;</div><div class='add'>+	unsigned long lcn = m-&gt;lcn + 1;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DBG_BUGON(m-&gt;type != Z_EROFS_LCLUSTER_TYPE_PLAIN &amp;&amp;</div><div class='del'>-		  m-&gt;type != Z_EROFS_LCLUSTER_TYPE_HEAD1 &amp;&amp;</div><div class='del'>-		  m-&gt;type != Z_EROFS_LCLUSTER_TYPE_HEAD2);</div><div class='add'>+	DBG_BUGON(m-&gt;type == Z_EROFS_LCLUSTER_TYPE_NONHEAD);</div><div class='ctx'> 	DBG_BUGON(m-&gt;type != m-&gt;headtype);</div><div class='ctx'> </div><div class='del'>-	if (m-&gt;headtype == Z_EROFS_LCLUSTER_TYPE_PLAIN ||</div><div class='del'>-	    ((m-&gt;headtype == Z_EROFS_LCLUSTER_TYPE_HEAD1) &amp;&amp;</div><div class='del'>-	     !(vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_1)) ||</div><div class='del'>-	    ((m-&gt;headtype == Z_EROFS_LCLUSTER_TYPE_HEAD2) &amp;&amp;</div><div class='del'>-	     !(vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_2))) {</div><div class='del'>-		map-&gt;m_plen = 1ULL &lt;&lt; lclusterbits;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	lcn = m-&gt;lcn + 1;</div><div class='add'>+	if ((m-&gt;headtype == Z_EROFS_LCLUSTER_TYPE_HEAD1 &amp;&amp; !bigpcl1) ||</div><div class='add'>+	    ((m-&gt;headtype == Z_EROFS_LCLUSTER_TYPE_PLAIN ||</div><div class='add'>+	      m-&gt;headtype == Z_EROFS_LCLUSTER_TYPE_HEAD2) &amp;&amp; !bigpcl2) ||</div><div class='add'>+	    (lcn &lt;&lt; vi-&gt;z_lclusterbits) &gt;= inode-&gt;i_size)</div><div class='add'>+		m-&gt;compressedblks = 1;</div><div class='add'>+</div><div class='ctx'> 	if (m-&gt;compressedblks)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -369,35 +330,21 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m,</div><div class='ctx'> 	DBG_BUGON(lcn == initial_lcn &amp;&amp;</div><div class='ctx'> 		  m-&gt;type == Z_EROFS_LCLUSTER_TYPE_NONHEAD);</div><div class='ctx'> </div><div class='del'>-	switch (m-&gt;type) {</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_PLAIN:</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_HEAD1:</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_HEAD2:</div><div class='del'>-		/*</div><div class='del'>-		 * if the 1st NONHEAD lcluster is actually PLAIN or HEAD type</div><div class='del'>-		 * rather than CBLKCNT, it's a 1 lcluster-sized pcluster.</div><div class='del'>-		 */</div><div class='del'>-		m-&gt;compressedblks = 1 &lt;&lt; (lclusterbits - sb-&gt;s_blocksize_bits);</div><div class='del'>-		break;</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_NONHEAD:</div><div class='del'>-		if (m-&gt;delta[0] != 1)</div><div class='del'>-			goto err_bonus_cblkcnt;</div><div class='del'>-		if (m-&gt;compressedblks)</div><div class='del'>-			break;</div><div class='del'>-		fallthrough;</div><div class='del'>-	default:</div><div class='del'>-		erofs_err(sb, "cannot found CBLKCNT @ lcn %lu of nid %llu", lcn,</div><div class='del'>-			  vi-&gt;nid);</div><div class='add'>+	if (m-&gt;type == Z_EROFS_LCLUSTER_TYPE_NONHEAD &amp;&amp; m-&gt;delta[0] != 1) {</div><div class='add'>+		erofs_err(sb, "bogus CBLKCNT @ lcn %lu of nid %llu", lcn, vi-&gt;nid);</div><div class='ctx'> 		DBG_BUGON(1);</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if the 1st NONHEAD lcluster is actually PLAIN or HEAD type rather</div><div class='add'>+	 * than CBLKCNT, it's a 1 block-sized pcluster.</div><div class='add'>+	 */</div><div class='add'>+	if (m-&gt;type != Z_EROFS_LCLUSTER_TYPE_NONHEAD || !m-&gt;compressedblks)</div><div class='add'>+		m-&gt;compressedblks = 1;</div><div class='ctx'> out:</div><div class='del'>-	map-&gt;m_plen = erofs_pos(sb, m-&gt;compressedblks);</div><div class='add'>+	m-&gt;map-&gt;m_plen = erofs_pos(sb, m-&gt;compressedblks);</div><div class='ctx'> 	return 0;</div><div class='del'>-err_bonus_cblkcnt:</div><div class='del'>-	erofs_err(sb, "bogus CBLKCNT @ lcn %lu of nid %llu", lcn, vi-&gt;nid);</div><div class='del'>-	DBG_BUGON(1);</div><div class='del'>-	return -EFSCORRUPTED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m)</div><div class='hunk'>@@ -405,11 +352,11 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m)</div><div class='ctx'> 	struct inode *inode = m-&gt;inode;</div><div class='ctx'> 	struct erofs_inode *vi = EROFS_I(inode);</div><div class='ctx'> 	struct erofs_map_blocks *map = m-&gt;map;</div><div class='del'>-	unsigned int lclusterbits = vi-&gt;z_logical_clusterbits;</div><div class='add'>+	unsigned int lclusterbits = vi-&gt;z_lclusterbits;</div><div class='ctx'> 	u64 lcn = m-&gt;lcn, headlcn = map-&gt;m_la &gt;&gt; lclusterbits;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='add'>+	while (1) {</div><div class='ctx'> 		/* handle the last EOF pcluster (no next HEAD lcluster) */</div><div class='ctx'> 		if ((lcn &lt;&lt; lclusterbits) &gt;= inode-&gt;i_size) {</div><div class='ctx'> 			map-&gt;m_llen = inode-&gt;i_size - map-&gt;m_la;</div><div class='hunk'>@@ -421,45 +368,48 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		if (m-&gt;type == Z_EROFS_LCLUSTER_TYPE_NONHEAD) {</div><div class='del'>-			DBG_BUGON(!m-&gt;delta[1] &amp;&amp;</div><div class='del'>-				  m-&gt;clusterofs != 1 &lt;&lt; lclusterbits);</div><div class='del'>-		} else if (m-&gt;type == Z_EROFS_LCLUSTER_TYPE_PLAIN ||</div><div class='del'>-			   m-&gt;type == Z_EROFS_LCLUSTER_TYPE_HEAD1 ||</div><div class='del'>-			   m-&gt;type == Z_EROFS_LCLUSTER_TYPE_HEAD2) {</div><div class='del'>-			/* go on until the next HEAD lcluster */</div><div class='add'>+			/* work around invalid d1 generated by pre-1.0 mkfs */</div><div class='add'>+			if (unlikely(!m-&gt;delta[1])) {</div><div class='add'>+				m-&gt;delta[1] = 1;</div><div class='add'>+				DBG_BUGON(1);</div><div class='add'>+			}</div><div class='add'>+		} else if (m-&gt;type &lt; Z_EROFS_LCLUSTER_TYPE_MAX) {</div><div class='ctx'> 			if (lcn != headlcn)</div><div class='del'>-				break;</div><div class='add'>+				break;	/* ends at the next HEAD lcluster */</div><div class='ctx'> 			m-&gt;delta[1] = 1;</div><div class='del'>-		} else {</div><div class='del'>-			erofs_err(inode-&gt;i_sb, "unknown type %u @ lcn %llu of nid %llu",</div><div class='del'>-				  m-&gt;type, lcn, vi-&gt;nid);</div><div class='del'>-			DBG_BUGON(1);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 		lcn += m-&gt;delta[1];</div><div class='del'>-	} while (m-&gt;delta[1]);</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	map-&gt;m_llen = (lcn &lt;&lt; lclusterbits) + m-&gt;clusterofs - map-&gt;m_la;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_do_map_blocks(struct inode *inode,</div><div class='add'>+static int z_erofs_map_blocks_fo(struct inode *inode,</div><div class='ctx'> 				 struct erofs_map_blocks *map, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='del'>-	bool ztailpacking = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_INLINE_PCLUSTER;</div><div class='add'>+	struct erofs_inode *vi = EROFS_I(inode);</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	bool fragment = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_FRAGMENT_PCLUSTER;</div><div class='add'>+	bool ztailpacking = vi-&gt;z_idata_size;</div><div class='add'>+	unsigned int lclusterbits = vi-&gt;z_lclusterbits;</div><div class='ctx'> 	struct z_erofs_maprecorder m = {</div><div class='ctx'> 		.inode = inode,</div><div class='ctx'> 		.map = map,</div><div class='add'>+		.in_mbox = erofs_inode_in_metabox(inode),</div><div class='ctx'> 	};</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned int lclusterbits, endoff, afmt;</div><div class='add'>+	unsigned int endoff;</div><div class='ctx'> 	unsigned long initial_lcn;</div><div class='ctx'> 	unsigned long long ofs, end;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	lclusterbits = vi-&gt;z_logical_clusterbits;</div><div class='ctx'> 	ofs = flags &amp; EROFS_GET_BLOCKS_FINDTAIL ? inode-&gt;i_size - 1 : map-&gt;m_la;</div><div class='add'>+	if (fragment &amp;&amp; !(flags &amp; EROFS_GET_BLOCKS_FINDTAIL) &amp;&amp;</div><div class='add'>+	    !vi-&gt;z_tailextent_headlcn) {</div><div class='add'>+		map-&gt;m_la = 0;</div><div class='add'>+		map-&gt;m_llen = inode-&gt;i_size;</div><div class='add'>+		map-&gt;m_flags = EROFS_MAP_FRAGMENT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	initial_lcn = ofs &gt;&gt; lclusterbits;</div><div class='ctx'> 	endoff = ofs &amp; ((1 &lt;&lt; lclusterbits) - 1);</div><div class='ctx'> </div><div class='hunk'>@@ -467,52 +417,31 @@ static int z_erofs_do_map_blocks(struct inode *inode,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unmap_out;</div><div class='ctx'> </div><div class='del'>-	if (ztailpacking &amp;&amp; (flags &amp; EROFS_GET_BLOCKS_FINDTAIL))</div><div class='del'>-		vi-&gt;z_idataoff = m.nextpackoff;</div><div class='del'>-</div><div class='add'>+	if ((flags &amp; EROFS_GET_BLOCKS_FINDTAIL) &amp;&amp; ztailpacking)</div><div class='add'>+		vi-&gt;z_fragmentoff = m.nextpackoff;</div><div class='ctx'> 	map-&gt;m_flags = EROFS_MAP_MAPPED | EROFS_MAP_ENCODED;</div><div class='ctx'> 	end = (m.lcn + 1ULL) &lt;&lt; lclusterbits;</div><div class='ctx'> </div><div class='del'>-	switch (m.type) {</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_PLAIN:</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_HEAD1:</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_HEAD2:</div><div class='del'>-		if (endoff &gt;= m.clusterofs) {</div><div class='del'>-			m.headtype = m.type;</div><div class='del'>-			map-&gt;m_la = (m.lcn &lt;&lt; lclusterbits) | m.clusterofs;</div><div class='del'>-			/*</div><div class='del'>-			 * For ztailpacking files, in order to inline data more</div><div class='del'>-			 * effectively, special EOF lclusters are now supported</div><div class='del'>-			 * which can have three parts at most.</div><div class='del'>-			 */</div><div class='del'>-			if (ztailpacking &amp;&amp; end &gt; inode-&gt;i_size)</div><div class='del'>-				end = inode-&gt;i_size;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* m.lcn should be &gt;= 1 if endoff &lt; m.clusterofs */</div><div class='del'>-		if (!m.lcn) {</div><div class='del'>-			erofs_err(inode-&gt;i_sb,</div><div class='del'>-				  "invalid logical cluster 0 at nid %llu",</div><div class='del'>-				  vi-&gt;nid);</div><div class='del'>-			err = -EFSCORRUPTED;</div><div class='del'>-			goto unmap_out;</div><div class='add'>+	if (m.type != Z_EROFS_LCLUSTER_TYPE_NONHEAD &amp;&amp; endoff &gt;= m.clusterofs) {</div><div class='add'>+		m.headtype = m.type;</div><div class='add'>+		map-&gt;m_la = (m.lcn &lt;&lt; lclusterbits) | m.clusterofs;</div><div class='add'>+		/*</div><div class='add'>+		 * For ztailpacking files, in order to inline data more</div><div class='add'>+		 * effectively, special EOF lclusters are now supported</div><div class='add'>+		 * which can have three parts at most.</div><div class='add'>+		 */</div><div class='add'>+		if (ztailpacking &amp;&amp; end &gt; inode-&gt;i_size)</div><div class='add'>+			end = inode-&gt;i_size;</div><div class='add'>+	} else {</div><div class='add'>+		if (m.type != Z_EROFS_LCLUSTER_TYPE_NONHEAD) {</div><div class='add'>+			end = (m.lcn &lt;&lt; lclusterbits) | m.clusterofs;</div><div class='add'>+			map-&gt;m_flags |= EROFS_MAP_FULL_MAPPED;</div><div class='add'>+			m.delta[0] = 1;</div><div class='ctx'> 		}</div><div class='del'>-		end = (m.lcn &lt;&lt; lclusterbits) | m.clusterofs;</div><div class='del'>-		map-&gt;m_flags |= EROFS_MAP_FULL_MAPPED;</div><div class='del'>-		m.delta[0] = 1;</div><div class='del'>-		fallthrough;</div><div class='del'>-	case Z_EROFS_LCLUSTER_TYPE_NONHEAD:</div><div class='ctx'> 		/* get the corresponding first chunk */</div><div class='ctx'> 		err = z_erofs_extent_lookback(&amp;m, m.delta[0]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unmap_out;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		erofs_err(inode-&gt;i_sb,</div><div class='del'>-			  "unknown type %u @ offset %llu of nid %llu",</div><div class='del'>-			  m.type, ofs, vi-&gt;nid);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto unmap_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (m.partialref)</div><div class='ctx'> 		map-&gt;m_flags |= EROFS_MAP_PARTIAL_REF;</div><div class='hunk'>@@ -526,12 +455,18 @@ static int z_erofs_do_map_blocks(struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ztailpacking &amp;&amp; m.lcn == vi-&gt;z_tailextent_headlcn) {</div><div class='ctx'> 		map-&gt;m_flags |= EROFS_MAP_META;</div><div class='del'>-		map-&gt;m_pa = vi-&gt;z_idataoff;</div><div class='add'>+		map-&gt;m_pa = vi-&gt;z_fragmentoff;</div><div class='ctx'> 		map-&gt;m_plen = vi-&gt;z_idata_size;</div><div class='add'>+		if (erofs_blkoff(sb, map-&gt;m_pa) + map-&gt;m_plen &gt; sb-&gt;s_blocksize) {</div><div class='add'>+			erofs_err(sb, "ztailpacking inline data across blocks @ nid %llu",</div><div class='add'>+				  vi-&gt;nid);</div><div class='add'>+			err = -EFSCORRUPTED;</div><div class='add'>+			goto unmap_out;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (fragment &amp;&amp; m.lcn == vi-&gt;z_tailextent_headlcn) {</div><div class='del'>-		map-&gt;m_flags |= EROFS_MAP_FRAGMENT;</div><div class='add'>+		map-&gt;m_flags = EROFS_MAP_FRAGMENT;</div><div class='ctx'> 	} else {</div><div class='del'>-		map-&gt;m_pa = erofs_pos(inode-&gt;i_sb, m.pblk);</div><div class='add'>+		map-&gt;m_pa = erofs_pos(sb, m.pblk);</div><div class='ctx'> 		err = z_erofs_get_extent_compressedlen(&amp;m, initial_lcn);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unmap_out;</div><div class='hunk'>@@ -543,25 +478,21 @@ static int z_erofs_do_map_blocks(struct inode *inode,</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='ctx'> 			goto unmap_out;</div><div class='ctx'> 		}</div><div class='del'>-		afmt = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_INTERLACED_PCLUSTER ?</div><div class='del'>-			Z_EROFS_COMPRESSION_INTERLACED :</div><div class='del'>-			Z_EROFS_COMPRESSION_SHIFTED;</div><div class='add'>+		if (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_INTERLACED_PCLUSTER)</div><div class='add'>+			map-&gt;m_algorithmformat = Z_EROFS_COMPRESSION_INTERLACED;</div><div class='add'>+		else</div><div class='add'>+			map-&gt;m_algorithmformat = Z_EROFS_COMPRESSION_SHIFTED;</div><div class='add'>+	} else if (m.headtype == Z_EROFS_LCLUSTER_TYPE_HEAD2) {</div><div class='add'>+		map-&gt;m_algorithmformat = vi-&gt;z_algorithmtype[1];</div><div class='ctx'> 	} else {</div><div class='del'>-		afmt = m.headtype == Z_EROFS_LCLUSTER_TYPE_HEAD2 ?</div><div class='del'>-			vi-&gt;z_algorithmtype[1] : vi-&gt;z_algorithmtype[0];</div><div class='del'>-		if (!(EROFS_I_SB(inode)-&gt;available_compr_algs &amp; (1 &lt;&lt; afmt))) {</div><div class='del'>-			erofs_err(inode-&gt;i_sb, "inconsistent algorithmtype %u for nid %llu",</div><div class='del'>-				  afmt, vi-&gt;nid);</div><div class='del'>-			err = -EFSCORRUPTED;</div><div class='del'>-			goto unmap_out;</div><div class='del'>-		}</div><div class='add'>+		map-&gt;m_algorithmformat = vi-&gt;z_algorithmtype[0];</div><div class='ctx'> 	}</div><div class='del'>-	map-&gt;m_algorithmformat = afmt;</div><div class='ctx'> </div><div class='ctx'> 	if ((flags &amp; EROFS_GET_BLOCKS_FIEMAP) ||</div><div class='ctx'> 	    ((flags &amp; EROFS_GET_BLOCKS_READMORE) &amp;&amp;</div><div class='ctx'> 	     (map-&gt;m_algorithmformat == Z_EROFS_COMPRESSION_LZMA ||</div><div class='del'>-	      map-&gt;m_algorithmformat == Z_EROFS_COMPRESSION_DEFLATE) &amp;&amp;</div><div class='add'>+	      map-&gt;m_algorithmformat == Z_EROFS_COMPRESSION_DEFLATE ||</div><div class='add'>+	      map-&gt;m_algorithmformat == Z_EROFS_COMPRESSION_ZSTD) &amp;&amp;</div><div class='ctx'> 	      map-&gt;m_llen &gt;= i_blocksize(inode))) {</div><div class='ctx'> 		err = z_erofs_get_extent_decompressedlen(&amp;m);</div><div class='ctx'> 		if (!err)</div><div class='hunk'>@@ -573,15 +504,122 @@ unmap_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int z_erofs_fill_inode_lazy(struct inode *inode)</div><div class='add'>+static int z_erofs_map_blocks_ext(struct inode *inode,</div><div class='add'>+				  struct erofs_map_blocks *map, int flags)</div><div class='add'>+{</div><div class='add'>+	struct erofs_inode *vi = EROFS_I(inode);</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	bool interlaced = vi-&gt;z_advise &amp; Z_EROFS_ADVISE_INTERLACED_PCLUSTER;</div><div class='add'>+	unsigned int recsz = z_erofs_extent_recsize(vi-&gt;z_advise);</div><div class='add'>+	erofs_off_t pos = round_up(Z_EROFS_MAP_HEADER_END(erofs_iloc(inode) +</div><div class='add'>+				   vi-&gt;inode_isize + vi-&gt;xattr_isize), recsz);</div><div class='add'>+	bool in_mbox = erofs_inode_in_metabox(inode);</div><div class='add'>+	erofs_off_t lend = inode-&gt;i_size;</div><div class='add'>+	erofs_off_t l, r, mid, pa, la, lstart;</div><div class='add'>+	struct z_erofs_extent *ext;</div><div class='add'>+	unsigned int fmt;</div><div class='add'>+	bool last;</div><div class='add'>+</div><div class='add'>+	map-&gt;m_flags = 0;</div><div class='add'>+	if (recsz &lt;= offsetof(struct z_erofs_extent, pstart_hi)) {</div><div class='add'>+		if (recsz &lt;= offsetof(struct z_erofs_extent, pstart_lo)) {</div><div class='add'>+			ext = erofs_read_metabuf(&amp;map-&gt;buf, sb, pos, in_mbox);</div><div class='add'>+			if (IS_ERR(ext))</div><div class='add'>+				return PTR_ERR(ext);</div><div class='add'>+			pa = le64_to_cpu(*(__le64 *)ext);</div><div class='add'>+			pos += sizeof(__le64);</div><div class='add'>+			lstart = 0;</div><div class='add'>+		} else {</div><div class='add'>+			lstart = round_down(map-&gt;m_la, 1 &lt;&lt; vi-&gt;z_lclusterbits);</div><div class='add'>+			pos += (lstart &gt;&gt; vi-&gt;z_lclusterbits) * recsz;</div><div class='add'>+			pa = EROFS_NULL_ADDR;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (; lstart &lt;= map-&gt;m_la; lstart += 1 &lt;&lt; vi-&gt;z_lclusterbits) {</div><div class='add'>+			ext = erofs_read_metabuf(&amp;map-&gt;buf, sb, pos, in_mbox);</div><div class='add'>+			if (IS_ERR(ext))</div><div class='add'>+				return PTR_ERR(ext);</div><div class='add'>+			map-&gt;m_plen = le32_to_cpu(ext-&gt;plen);</div><div class='add'>+			if (pa != EROFS_NULL_ADDR) {</div><div class='add'>+				map-&gt;m_pa = pa;</div><div class='add'>+				pa += map-&gt;m_plen &amp; Z_EROFS_EXTENT_PLEN_MASK;</div><div class='add'>+			} else {</div><div class='add'>+				map-&gt;m_pa = le32_to_cpu(ext-&gt;pstart_lo);</div><div class='add'>+			}</div><div class='add'>+			pos += recsz;</div><div class='add'>+		}</div><div class='add'>+		last = (lstart &gt;= round_up(lend, 1 &lt;&lt; vi-&gt;z_lclusterbits));</div><div class='add'>+		lend = min(lstart, lend);</div><div class='add'>+		lstart -= 1 &lt;&lt; vi-&gt;z_lclusterbits;</div><div class='add'>+	} else {</div><div class='add'>+		lstart = lend;</div><div class='add'>+		for (l = 0, r = vi-&gt;z_extents; l &lt; r; ) {</div><div class='add'>+			mid = l + (r - l) / 2;</div><div class='add'>+			ext = erofs_read_metabuf(&amp;map-&gt;buf, sb,</div><div class='add'>+						 pos + mid * recsz, in_mbox);</div><div class='add'>+			if (IS_ERR(ext))</div><div class='add'>+				return PTR_ERR(ext);</div><div class='add'>+</div><div class='add'>+			la = le32_to_cpu(ext-&gt;lstart_lo);</div><div class='add'>+			pa = le32_to_cpu(ext-&gt;pstart_lo) |</div><div class='add'>+				(u64)le32_to_cpu(ext-&gt;pstart_hi) &lt;&lt; 32;</div><div class='add'>+			if (recsz &gt; offsetof(struct z_erofs_extent, lstart_hi))</div><div class='add'>+				la |= (u64)le32_to_cpu(ext-&gt;lstart_hi) &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+			if (la &gt; map-&gt;m_la) {</div><div class='add'>+				r = mid;</div><div class='add'>+				if (la &gt; lend) {</div><div class='add'>+					DBG_BUGON(1);</div><div class='add'>+					return -EFSCORRUPTED;</div><div class='add'>+				}</div><div class='add'>+				lend = la;</div><div class='add'>+			} else {</div><div class='add'>+				l = mid + 1;</div><div class='add'>+				if (map-&gt;m_la == la)</div><div class='add'>+					r = min(l + 1, r);</div><div class='add'>+				lstart = la;</div><div class='add'>+				map-&gt;m_plen = le32_to_cpu(ext-&gt;plen);</div><div class='add'>+				map-&gt;m_pa = pa;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		last = (l &gt;= vi-&gt;z_extents);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lstart &lt; lend) {</div><div class='add'>+		map-&gt;m_la = lstart;</div><div class='add'>+		if (last &amp;&amp; (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_FRAGMENT_PCLUSTER)) {</div><div class='add'>+			map-&gt;m_flags = EROFS_MAP_FRAGMENT;</div><div class='add'>+			vi-&gt;z_fragmentoff = map-&gt;m_plen;</div><div class='add'>+			if (recsz &gt; offsetof(struct z_erofs_extent, pstart_lo))</div><div class='add'>+				vi-&gt;z_fragmentoff |= map-&gt;m_pa &lt;&lt; 32;</div><div class='add'>+		} else if (map-&gt;m_plen &amp; Z_EROFS_EXTENT_PLEN_MASK) {</div><div class='add'>+			map-&gt;m_flags |= EROFS_MAP_MAPPED |</div><div class='add'>+				EROFS_MAP_FULL_MAPPED | EROFS_MAP_ENCODED;</div><div class='add'>+			fmt = map-&gt;m_plen &gt;&gt; Z_EROFS_EXTENT_PLEN_FMT_BIT;</div><div class='add'>+			if (fmt)</div><div class='add'>+				map-&gt;m_algorithmformat = fmt - 1;</div><div class='add'>+			else if (interlaced &amp;&amp; !erofs_blkoff(sb, map-&gt;m_pa))</div><div class='add'>+				map-&gt;m_algorithmformat =</div><div class='add'>+					Z_EROFS_COMPRESSION_INTERLACED;</div><div class='add'>+			else</div><div class='add'>+				map-&gt;m_algorithmformat =</div><div class='add'>+					Z_EROFS_COMPRESSION_SHIFTED;</div><div class='add'>+			if (map-&gt;m_plen &amp; Z_EROFS_EXTENT_PLEN_PARTIAL)</div><div class='add'>+				map-&gt;m_flags |= EROFS_MAP_PARTIAL_REF;</div><div class='add'>+			map-&gt;m_plen &amp;= Z_EROFS_EXTENT_PLEN_MASK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	map-&gt;m_llen = lend - map-&gt;m_la;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int z_erofs_fill_inode(struct inode *inode, struct erofs_map_blocks *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='ctx'> 	struct super_block *const sb = inode-&gt;i_sb;</div><div class='del'>-	int err, headnr;</div><div class='del'>-	erofs_off_t pos;</div><div class='del'>-	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	struct z_erofs_map_header *h;</div><div class='add'>+	erofs_off_t pos;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(EROFS_I_Z_INITED_BIT, &amp;vi-&gt;flags)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -595,18 +633,16 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)</div><div class='ctx'> 	if (wait_on_bit_lock(&amp;vi-&gt;flags, EROFS_I_BL_Z_BIT, TASK_KILLABLE))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	if (test_bit(EROFS_I_Z_INITED_BIT, &amp;vi-&gt;flags))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	pos = ALIGN(erofs_iloc(inode) + vi-&gt;inode_isize + vi-&gt;xattr_isize, 8);</div><div class='del'>-	kaddr = erofs_read_metabuf(&amp;buf, sb, erofs_blknr(sb, pos), EROFS_KMAP);</div><div class='del'>-	if (IS_ERR(kaddr)) {</div><div class='del'>-		err = PTR_ERR(kaddr);</div><div class='add'>+	h = erofs_read_metabuf(&amp;map-&gt;buf, sb, pos, erofs_inode_in_metabox(inode));</div><div class='add'>+	if (IS_ERR(h)) {</div><div class='add'>+		err = PTR_ERR(h);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	h = kaddr + erofs_blkoff(sb, pos);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if the highest bit of the 8-byte map header is set, the whole file</div><div class='ctx'> 	 * is stored in the packed inode. The rest bits keeps z_fragmentoff.</div><div class='hunk'>@@ -618,26 +654,28 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	vi-&gt;z_advise = le16_to_cpu(h-&gt;h_advise);</div><div class='add'>+	vi-&gt;z_lclusterbits = sb-&gt;s_blocksize_bits + (h-&gt;h_clusterbits &amp; 15);</div><div class='add'>+	if (vi-&gt;datalayout == EROFS_INODE_COMPRESSED_FULL &amp;&amp;</div><div class='add'>+	    (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_EXTENTS)) {</div><div class='add'>+		vi-&gt;z_extents = le32_to_cpu(h-&gt;h_extents_lo) |</div><div class='add'>+			((u64)le16_to_cpu(h-&gt;h_extents_hi) &lt;&lt; 32);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	vi-&gt;z_algorithmtype[0] = h-&gt;h_algorithmtype &amp; 15;</div><div class='ctx'> 	vi-&gt;z_algorithmtype[1] = h-&gt;h_algorithmtype &gt;&gt; 4;</div><div class='add'>+	if (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_FRAGMENT_PCLUSTER)</div><div class='add'>+		vi-&gt;z_fragmentoff = le32_to_cpu(h-&gt;h_fragmentoff);</div><div class='add'>+	else if (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_INLINE_PCLUSTER)</div><div class='add'>+		vi-&gt;z_idata_size = le16_to_cpu(h-&gt;h_idata_size);</div><div class='ctx'> </div><div class='del'>-	headnr = 0;</div><div class='del'>-	if (vi-&gt;z_algorithmtype[0] &gt;= Z_EROFS_COMPRESSION_MAX ||</div><div class='del'>-	    vi-&gt;z_algorithmtype[++headnr] &gt;= Z_EROFS_COMPRESSION_MAX) {</div><div class='del'>-		erofs_err(sb, "unknown HEAD%u format %u for nid %llu, please upgrade kernel",</div><div class='del'>-			  headnr + 1, vi-&gt;z_algorithmtype[headnr], vi-&gt;nid);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out_put_metabuf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vi-&gt;z_logical_clusterbits = sb-&gt;s_blocksize_bits + (h-&gt;h_clusterbits &amp; 7);</div><div class='ctx'> 	if (!erofs_sb_has_big_pcluster(EROFS_SB(sb)) &amp;&amp;</div><div class='ctx'> 	    vi-&gt;z_advise &amp; (Z_EROFS_ADVISE_BIG_PCLUSTER_1 |</div><div class='ctx'> 			    Z_EROFS_ADVISE_BIG_PCLUSTER_2)) {</div><div class='ctx'> 		erofs_err(sb, "per-inode big pcluster without sb feature for nid %llu",</div><div class='ctx'> 			  vi-&gt;nid);</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		goto out_put_metabuf;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (vi-&gt;datalayout == EROFS_INODE_COMPRESSED_COMPACT &amp;&amp;</div><div class='ctx'> 	    !(vi-&gt;z_advise &amp; Z_EROFS_ADVISE_BIG_PCLUSTER_1) ^</div><div class='hunk'>@@ -645,85 +683,85 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)</div><div class='ctx'> 		erofs_err(sb, "big pcluster head1/2 of compact indexes should be consistent for nid %llu",</div><div class='ctx'> 			  vi-&gt;nid);</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		goto out_put_metabuf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_INLINE_PCLUSTER) {</div><div class='del'>-		struct erofs_map_blocks map = {</div><div class='del'>-			.buf = __EROFS_BUF_INITIALIZER</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		vi-&gt;z_idata_size = le16_to_cpu(h-&gt;h_idata_size);</div><div class='del'>-		err = z_erofs_do_map_blocks(inode, &amp;map,</div><div class='del'>-					    EROFS_GET_BLOCKS_FINDTAIL);</div><div class='del'>-		erofs_put_metabuf(&amp;map.buf);</div><div class='del'>-</div><div class='del'>-		if (!map.m_plen ||</div><div class='del'>-		    erofs_blkoff(sb, map.m_pa) + map.m_plen &gt; sb-&gt;s_blocksize) {</div><div class='del'>-			erofs_err(sb, "invalid tail-packing pclustersize %llu",</div><div class='del'>-				  map.m_plen);</div><div class='del'>-			err = -EFSCORRUPTED;</div><div class='del'>-		}</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out_put_metabuf;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_FRAGMENT_PCLUSTER &amp;&amp;</div><div class='del'>-	    !(h-&gt;h_clusterbits &gt;&gt; Z_EROFS_FRAGMENT_INODE_BIT)) {</div><div class='del'>-		struct erofs_map_blocks map = {</div><div class='add'>+	if (vi-&gt;z_idata_size ||</div><div class='add'>+	    (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_FRAGMENT_PCLUSTER)) {</div><div class='add'>+		struct erofs_map_blocks tm = {</div><div class='ctx'> 			.buf = __EROFS_BUF_INITIALIZER</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		vi-&gt;z_fragmentoff = le32_to_cpu(h-&gt;h_fragmentoff);</div><div class='del'>-		err = z_erofs_do_map_blocks(inode, &amp;map,</div><div class='add'>+		err = z_erofs_map_blocks_fo(inode, &amp;tm,</div><div class='ctx'> 					    EROFS_GET_BLOCKS_FINDTAIL);</div><div class='del'>-		erofs_put_metabuf(&amp;map.buf);</div><div class='add'>+		erofs_put_metabuf(&amp;tm.buf);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto out_put_metabuf;</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='ctx'> 	/* paired with smp_mb() at the beginning of the function */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	set_bit(EROFS_I_Z_INITED_BIT, &amp;vi-&gt;flags);</div><div class='del'>-out_put_metabuf:</div><div class='del'>-	erofs_put_metabuf(&amp;buf);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	clear_and_wake_up_bit(EROFS_I_BL_Z_BIT, &amp;vi-&gt;flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int z_erofs_map_sanity_check(struct inode *inode,</div><div class='add'>+				    struct erofs_map_blocks *map)</div><div class='add'>+{</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_I_SB(inode);</div><div class='add'>+	u64 pend;</div><div class='add'>+</div><div class='add'>+	if (!(map-&gt;m_flags &amp; EROFS_MAP_ENCODED))</div><div class='add'>+		return 0;</div><div class='add'>+	if (unlikely(map-&gt;m_algorithmformat &gt;= Z_EROFS_COMPRESSION_RUNTIME_MAX)) {</div><div class='add'>+		erofs_err(inode-&gt;i_sb, "unknown algorithm %d @ pos %llu for nid %llu, please upgrade kernel",</div><div class='add'>+			  map-&gt;m_algorithmformat, map-&gt;m_la, EROFS_I(inode)-&gt;nid);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(map-&gt;m_algorithmformat &lt; Z_EROFS_COMPRESSION_MAX &amp;&amp;</div><div class='add'>+		     !(sbi-&gt;available_compr_algs &amp; (1 &lt;&lt; map-&gt;m_algorithmformat)))) {</div><div class='add'>+		erofs_err(inode-&gt;i_sb, "inconsistent algorithmtype %u for nid %llu",</div><div class='add'>+			  map-&gt;m_algorithmformat, EROFS_I(inode)-&gt;nid);</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(map-&gt;m_plen &gt; Z_EROFS_PCLUSTER_MAX_SIZE ||</div><div class='add'>+		     map-&gt;m_llen &gt; Z_EROFS_PCLUSTER_MAX_DSIZE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	/* Filesystems beyond 48-bit physical block addresses are invalid */</div><div class='add'>+	if (unlikely(check_add_overflow(map-&gt;m_pa, map-&gt;m_plen, &amp;pend) ||</div><div class='add'>+		     (pend &gt;&gt; sbi-&gt;blkszbits) &gt;= BIT_ULL(48)))</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map,</div><div class='ctx'> 			    int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct erofs_inode *const vi = EROFS_I(inode);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	trace_z_erofs_map_blocks_iter_enter(inode, map, flags);</div><div class='del'>-</div><div class='del'>-	/* when trying to read beyond EOF, leave it unmapped */</div><div class='del'>-	if (map-&gt;m_la &gt;= inode-&gt;i_size) {</div><div class='add'>+	trace_erofs_map_blocks_enter(inode, map, flags);</div><div class='add'>+	if (map-&gt;m_la &gt;= inode-&gt;i_size) {	/* post-EOF unmapped extent */</div><div class='ctx'> 		map-&gt;m_llen = map-&gt;m_la + 1 - inode-&gt;i_size;</div><div class='ctx'> 		map-&gt;m_la = inode-&gt;i_size;</div><div class='ctx'> 		map-&gt;m_flags = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = z_erofs_fill_inode_lazy(inode);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if ((vi-&gt;z_advise &amp; Z_EROFS_ADVISE_FRAGMENT_PCLUSTER) &amp;&amp;</div><div class='del'>-	    !vi-&gt;z_tailextent_headlcn) {</div><div class='del'>-		map-&gt;m_la = 0;</div><div class='del'>-		map-&gt;m_llen = inode-&gt;i_size;</div><div class='del'>-		map-&gt;m_flags = EROFS_MAP_MAPPED | EROFS_MAP_FULL_MAPPED |</div><div class='del'>-				EROFS_MAP_FRAGMENT;</div><div class='del'>-		goto out;</div><div class='add'>+	} else {</div><div class='add'>+		err = z_erofs_fill_inode(inode, map);</div><div class='add'>+		if (!err) {</div><div class='add'>+			if (vi-&gt;datalayout == EROFS_INODE_COMPRESSED_FULL &amp;&amp;</div><div class='add'>+			    (vi-&gt;z_advise &amp; Z_EROFS_ADVISE_EXTENTS))</div><div class='add'>+				err = z_erofs_map_blocks_ext(inode, map, flags);</div><div class='add'>+			else</div><div class='add'>+				err = z_erofs_map_blocks_fo(inode, map, flags);</div><div class='add'>+		}</div><div class='add'>+		if (!err)</div><div class='add'>+			err = z_erofs_map_sanity_check(inode, map);</div><div class='add'>+		if (err)</div><div class='add'>+			map-&gt;m_llen = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	err = z_erofs_do_map_blocks(inode, map, flags);</div><div class='del'>-out:</div><div class='del'>-	trace_z_erofs_map_blocks_iter_exit(inode, map, flags, err);</div><div class='add'>+	trace_erofs_map_blocks_exit(inode, map, flags, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -744,7 +782,7 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset,</div><div class='ctx'> 	iomap-&gt;length = map.m_llen;</div><div class='ctx'> 	if (map.m_flags &amp; EROFS_MAP_MAPPED) {</div><div class='ctx'> 		iomap-&gt;type = IOMAP_MAPPED;</div><div class='del'>-		iomap-&gt;addr = map.m_flags &amp; EROFS_MAP_FRAGMENT ?</div><div class='add'>+		iomap-&gt;addr = map.m_flags &amp; __EROFS_MAP_FRAGMENT ?</div><div class='ctx'> 			      IOMAP_NULL_ADDR : map.m_pa;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		iomap-&gt;type = IOMAP_HOLE;</div><div class='head'>diff --git a/fs/erofs/zutil.c b/fs/erofs/zutil.c<br/>new file mode 100644<br/>index 000000000000..55ff2ab5128e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/erofs/zutil.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/erofs/zutil.c</a></div><div class='hunk'>@@ -0,0 +1,317 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2018 HUAWEI, Inc.</div><div class='add'>+ *             https://www.huawei.com/</div><div class='add'>+ * Copyright (C) 2024 Alibaba Cloud</div><div class='add'>+ */</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+struct z_erofs_gbuf {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	void *ptr;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	unsigned int nrpages;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct z_erofs_gbuf *z_erofs_gbufpool, *z_erofs_rsvbuf;</div><div class='add'>+static unsigned int z_erofs_gbuf_count, z_erofs_gbuf_nrpages,</div><div class='add'>+		z_erofs_rsv_nrpages;</div><div class='add'>+</div><div class='add'>+module_param_named(global_buffers, z_erofs_gbuf_count, uint, 0444);</div><div class='add'>+module_param_named(reserved_pages, z_erofs_rsv_nrpages, uint, 0444);</div><div class='add'>+</div><div class='add'>+atomic_long_t erofs_global_shrink_cnt;	/* for all mounted instances */</div><div class='add'>+</div><div class='add'>+/* protects `erofs_sb_list_lock` and the mounted `erofs_sb_list` */</div><div class='add'>+static DEFINE_SPINLOCK(erofs_sb_list_lock);</div><div class='add'>+static LIST_HEAD(erofs_sb_list);</div><div class='add'>+static unsigned int shrinker_run_no;</div><div class='add'>+static struct shrinker *erofs_shrinker_info;</div><div class='add'>+</div><div class='add'>+static unsigned int z_erofs_gbuf_id(void)</div><div class='add'>+{</div><div class='add'>+	return raw_smp_processor_id() % z_erofs_gbuf_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *z_erofs_get_gbuf(unsigned int requiredpages)</div><div class='add'>+	__acquires(gbuf-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_gbuf *gbuf;</div><div class='add'>+</div><div class='add'>+	migrate_disable();</div><div class='add'>+	gbuf = &amp;z_erofs_gbufpool[z_erofs_gbuf_id()];</div><div class='add'>+	spin_lock(&amp;gbuf-&gt;lock);</div><div class='add'>+	/* check if the buffer is too small */</div><div class='add'>+	if (requiredpages &gt; gbuf-&gt;nrpages) {</div><div class='add'>+		spin_unlock(&amp;gbuf-&gt;lock);</div><div class='add'>+		migrate_enable();</div><div class='add'>+		/* (for sparse checker) pretend gbuf-&gt;lock is still taken */</div><div class='add'>+		__acquire(gbuf-&gt;lock);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return gbuf-&gt;ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void z_erofs_put_gbuf(void *ptr) __releases(gbuf-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct z_erofs_gbuf *gbuf;</div><div class='add'>+</div><div class='add'>+	gbuf = &amp;z_erofs_gbufpool[z_erofs_gbuf_id()];</div><div class='add'>+	DBG_BUGON(gbuf-&gt;ptr != ptr);</div><div class='add'>+	spin_unlock(&amp;gbuf-&gt;lock);</div><div class='add'>+	migrate_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int z_erofs_gbuf_growsize(unsigned int nrpages)</div><div class='add'>+{</div><div class='add'>+	static DEFINE_MUTEX(gbuf_resize_mutex);</div><div class='add'>+	struct page **tmp_pages = NULL;</div><div class='add'>+	struct z_erofs_gbuf *gbuf;</div><div class='add'>+	void *ptr, *old_ptr;</div><div class='add'>+	int last, i, j;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;gbuf_resize_mutex);</div><div class='add'>+	/* avoid shrinking gbufs, since no idea how many fses rely on */</div><div class='add'>+	if (nrpages &lt;= z_erofs_gbuf_nrpages) {</div><div class='add'>+		mutex_unlock(&amp;gbuf_resize_mutex);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; z_erofs_gbuf_count; ++i) {</div><div class='add'>+		gbuf = &amp;z_erofs_gbufpool[i];</div><div class='add'>+		tmp_pages = kcalloc(nrpages, sizeof(*tmp_pages), GFP_KERNEL);</div><div class='add'>+		if (!tmp_pages)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; gbuf-&gt;nrpages; ++j)</div><div class='add'>+			tmp_pages[j] = gbuf-&gt;pages[j];</div><div class='add'>+		do {</div><div class='add'>+			last = j;</div><div class='add'>+			j = alloc_pages_bulk(GFP_KERNEL, nrpages,</div><div class='add'>+					     tmp_pages);</div><div class='add'>+			if (last == j)</div><div class='add'>+				goto out;</div><div class='add'>+		} while (j != nrpages);</div><div class='add'>+</div><div class='add'>+		ptr = vmap(tmp_pages, nrpages, VM_MAP, PAGE_KERNEL);</div><div class='add'>+		if (!ptr)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;gbuf-&gt;lock);</div><div class='add'>+		kfree(gbuf-&gt;pages);</div><div class='add'>+		gbuf-&gt;pages = tmp_pages;</div><div class='add'>+		old_ptr = gbuf-&gt;ptr;</div><div class='add'>+		gbuf-&gt;ptr = ptr;</div><div class='add'>+		gbuf-&gt;nrpages = nrpages;</div><div class='add'>+		spin_unlock(&amp;gbuf-&gt;lock);</div><div class='add'>+		if (old_ptr)</div><div class='add'>+			vunmap(old_ptr);</div><div class='add'>+	}</div><div class='add'>+	z_erofs_gbuf_nrpages = nrpages;</div><div class='add'>+out:</div><div class='add'>+	if (i &lt; z_erofs_gbuf_count &amp;&amp; tmp_pages) {</div><div class='add'>+		for (j = 0; j &lt; nrpages; ++j)</div><div class='add'>+			if (tmp_pages[j] &amp;&amp; (j &gt;= gbuf-&gt;nrpages ||</div><div class='add'>+					     tmp_pages[j] != gbuf-&gt;pages[j]))</div><div class='add'>+				__free_page(tmp_pages[j]);</div><div class='add'>+		kfree(tmp_pages);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;gbuf_resize_mutex);</div><div class='add'>+	return i &lt; z_erofs_gbuf_count ? -ENOMEM : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init z_erofs_gbuf_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, total = num_possible_cpus();</div><div class='add'>+</div><div class='add'>+	if (z_erofs_gbuf_count)</div><div class='add'>+		total = min(z_erofs_gbuf_count, total);</div><div class='add'>+	z_erofs_gbuf_count = total;</div><div class='add'>+</div><div class='add'>+	/* The last (special) global buffer is the reserved buffer */</div><div class='add'>+	total += !!z_erofs_rsv_nrpages;</div><div class='add'>+</div><div class='add'>+	z_erofs_gbufpool = kcalloc(total, sizeof(*z_erofs_gbufpool),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!z_erofs_gbufpool)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (z_erofs_rsv_nrpages) {</div><div class='add'>+		z_erofs_rsvbuf = &amp;z_erofs_gbufpool[total - 1];</div><div class='add'>+		z_erofs_rsvbuf-&gt;pages = kcalloc(z_erofs_rsv_nrpages,</div><div class='add'>+				sizeof(*z_erofs_rsvbuf-&gt;pages), GFP_KERNEL);</div><div class='add'>+		if (!z_erofs_rsvbuf-&gt;pages) {</div><div class='add'>+			z_erofs_rsvbuf = NULL;</div><div class='add'>+			z_erofs_rsv_nrpages = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; total; ++i)</div><div class='add'>+		spin_lock_init(&amp;z_erofs_gbufpool[i].lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void z_erofs_gbuf_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; z_erofs_gbuf_count + (!!z_erofs_rsvbuf); ++i) {</div><div class='add'>+		struct z_erofs_gbuf *gbuf = &amp;z_erofs_gbufpool[i];</div><div class='add'>+</div><div class='add'>+		if (gbuf-&gt;ptr) {</div><div class='add'>+			vunmap(gbuf-&gt;ptr);</div><div class='add'>+			gbuf-&gt;ptr = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!gbuf-&gt;pages)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; gbuf-&gt;nrpages; ++j)</div><div class='add'>+			if (gbuf-&gt;pages[j])</div><div class='add'>+				put_page(gbuf-&gt;pages[j]);</div><div class='add'>+		kfree(gbuf-&gt;pages);</div><div class='add'>+		gbuf-&gt;pages = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(z_erofs_gbufpool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct page *__erofs_allocpage(struct page **pagepool, gfp_t gfp, bool tryrsv)</div><div class='add'>+{</div><div class='add'>+	struct page *page = *pagepool;</div><div class='add'>+</div><div class='add'>+	if (page) {</div><div class='add'>+		*pagepool = (struct page *)page_private(page);</div><div class='add'>+	} else if (tryrsv &amp;&amp; z_erofs_rsvbuf &amp;&amp; z_erofs_rsvbuf-&gt;nrpages) {</div><div class='add'>+		spin_lock(&amp;z_erofs_rsvbuf-&gt;lock);</div><div class='add'>+		if (z_erofs_rsvbuf-&gt;nrpages)</div><div class='add'>+			page = z_erofs_rsvbuf-&gt;pages[--z_erofs_rsvbuf-&gt;nrpages];</div><div class='add'>+		spin_unlock(&amp;z_erofs_rsvbuf-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	if (!page)</div><div class='add'>+		page = alloc_page(gfp);</div><div class='add'>+	DBG_BUGON(page &amp;&amp; page_ref_count(page) != 1);</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_release_pages(struct page **pagepool)</div><div class='add'>+{</div><div class='add'>+	while (*pagepool) {</div><div class='add'>+		struct page *page = *pagepool;</div><div class='add'>+</div><div class='add'>+		*pagepool = (struct page *)page_private(page);</div><div class='add'>+		/* try to fill reserved global pool first */</div><div class='add'>+		if (z_erofs_rsvbuf &amp;&amp; z_erofs_rsvbuf-&gt;nrpages &lt;</div><div class='add'>+				z_erofs_rsv_nrpages) {</div><div class='add'>+			spin_lock(&amp;z_erofs_rsvbuf-&gt;lock);</div><div class='add'>+			if (z_erofs_rsvbuf-&gt;nrpages &lt; z_erofs_rsv_nrpages) {</div><div class='add'>+				z_erofs_rsvbuf-&gt;pages[z_erofs_rsvbuf-&gt;nrpages++]</div><div class='add'>+						= page;</div><div class='add'>+				spin_unlock(&amp;z_erofs_rsvbuf-&gt;lock);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock(&amp;z_erofs_rsvbuf-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+		put_page(page);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_shrinker_register(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct erofs_sb_info *sbi = EROFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;sbi-&gt;umount_mutex);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;erofs_sb_list_lock);</div><div class='add'>+	list_add(&amp;sbi-&gt;list, &amp;erofs_sb_list);</div><div class='add'>+	spin_unlock(&amp;erofs_sb_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_shrinker_unregister(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct erofs_sb_info *const sbi = EROFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;umount_mutex);</div><div class='add'>+	while (!xa_empty(&amp;sbi-&gt;managed_pslots)) {</div><div class='add'>+		z_erofs_shrink_scan(sbi, ~0UL);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	spin_lock(&amp;erofs_sb_list_lock);</div><div class='add'>+	list_del(&amp;sbi-&gt;list);</div><div class='add'>+	spin_unlock(&amp;erofs_sb_list_lock);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long erofs_shrink_count(struct shrinker *shrink,</div><div class='add'>+					struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	return atomic_long_read(&amp;erofs_global_shrink_cnt) ?: SHRINK_EMPTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long erofs_shrink_scan(struct shrinker *shrink,</div><div class='add'>+				       struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	struct erofs_sb_info *sbi;</div><div class='add'>+	struct list_head *p;</div><div class='add'>+</div><div class='add'>+	unsigned long nr = sc-&gt;nr_to_scan;</div><div class='add'>+	unsigned int run_no;</div><div class='add'>+	unsigned long freed = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;erofs_sb_list_lock);</div><div class='add'>+	do {</div><div class='add'>+		run_no = ++shrinker_run_no;</div><div class='add'>+	} while (run_no == 0);</div><div class='add'>+</div><div class='add'>+	/* Iterate over all mounted superblocks and try to shrink them */</div><div class='add'>+	p = erofs_sb_list.next;</div><div class='add'>+	while (p != &amp;erofs_sb_list) {</div><div class='add'>+		sbi = list_entry(p, struct erofs_sb_info, list);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We move the ones we do to the end of the list, so we stop</div><div class='add'>+		 * when we see one we have already done.</div><div class='add'>+		 */</div><div class='add'>+		if (sbi-&gt;shrinker_run_no == run_no)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!mutex_trylock(&amp;sbi-&gt;umount_mutex)) {</div><div class='add'>+			p = p-&gt;next;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;erofs_sb_list_lock);</div><div class='add'>+		sbi-&gt;shrinker_run_no = run_no;</div><div class='add'>+		freed += z_erofs_shrink_scan(sbi, nr - freed);</div><div class='add'>+		spin_lock(&amp;erofs_sb_list_lock);</div><div class='add'>+		/* Get the next list element before we move this one */</div><div class='add'>+		p = p-&gt;next;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Move this one to the end of the list to provide some</div><div class='add'>+		 * fairness.</div><div class='add'>+		 */</div><div class='add'>+		list_move_tail(&amp;sbi-&gt;list, &amp;erofs_sb_list);</div><div class='add'>+		mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='add'>+</div><div class='add'>+		if (freed &gt;= nr)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;erofs_sb_list_lock);</div><div class='add'>+	return freed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init erofs_init_shrinker(void)</div><div class='add'>+{</div><div class='add'>+	erofs_shrinker_info = shrinker_alloc(0, "erofs-shrinker");</div><div class='add'>+	if (!erofs_shrinker_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	erofs_shrinker_info-&gt;count_objects = erofs_shrink_count;</div><div class='add'>+	erofs_shrinker_info-&gt;scan_objects = erofs_shrink_scan;</div><div class='add'>+	shrinker_register(erofs_shrinker_info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void erofs_exit_shrinker(void)</div><div class='add'>+{</div><div class='add'>+	shrinker_free(erofs_shrinker_info);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/eventfd.c b/fs/eventfd.c<br/>index ad8186d47ba7..3219e0d596fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/eventfd.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/eventfd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/eventfd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/eventfd.c</a></div><div class='hunk'>@@ -251,7 +251,7 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> 	__u64 ucnt;</div><div class='ctx'> </div><div class='del'>-	if (count &lt; sizeof(ucnt))</div><div class='add'>+	if (count != sizeof(ucnt))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (copy_from_user(&amp;ucnt, buf, sizeof(ucnt)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -283,13 +283,18 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c</div><div class='ctx'> static void eventfd_show_fdinfo(struct seq_file *m, struct file *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct eventfd_ctx *ctx = f-&gt;private_data;</div><div class='add'>+	__u64 cnt;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;ctx-&gt;wqh.lock);</div><div class='del'>-	seq_printf(m, "eventfd-count: %16llx\n",</div><div class='del'>-		   (unsigned long long)ctx-&gt;count);</div><div class='add'>+	cnt = ctx-&gt;count;</div><div class='ctx'> 	spin_unlock_irq(&amp;ctx-&gt;wqh.lock);</div><div class='del'>-	seq_printf(m, "eventfd-id: %d\n", ctx-&gt;id);</div><div class='del'>-	seq_printf(m, "eventfd-semaphore: %d\n",</div><div class='add'>+</div><div class='add'>+	seq_printf(m,</div><div class='add'>+		   "eventfd-count: %16llx\n"</div><div class='add'>+		   "eventfd-id: %d\n"</div><div class='add'>+		   "eventfd-semaphore: %d\n",</div><div class='add'>+		   cnt,</div><div class='add'>+		   ctx-&gt;id,</div><div class='ctx'> 		   !!(ctx-&gt;flags &amp; EFD_SEMAPHORE));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -342,13 +347,10 @@ EXPORT_SYMBOL_GPL(eventfd_fget);</div><div class='ctx'>  */</div><div class='ctx'> struct eventfd_ctx *eventfd_ctx_fdget(int fd)</div><div class='ctx'> {</div><div class='del'>-	struct eventfd_ctx *ctx;</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return ERR_PTR(-EBADF);</div><div class='del'>-	ctx = eventfd_ctx_fileget(f.file);</div><div class='del'>-	fdput(f);</div><div class='del'>-	return ctx;</div><div class='add'>+	return eventfd_ctx_fileget(fd_file(f));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(eventfd_ctx_fdget);</div><div class='ctx'> </div><div class='hunk'>@@ -376,13 +378,12 @@ EXPORT_SYMBOL_GPL(eventfd_ctx_fileget);</div><div class='ctx'> </div><div class='ctx'> static int do_eventfd(unsigned int count, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct eventfd_ctx *ctx;</div><div class='del'>-	struct file *file;</div><div class='del'>-	int fd;</div><div class='add'>+	struct eventfd_ctx *ctx __free(kfree) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the EFD_* constants for consistency.  */</div><div class='ctx'> 	BUILD_BUG_ON(EFD_CLOEXEC != O_CLOEXEC);</div><div class='ctx'> 	BUILD_BUG_ON(EFD_NONBLOCK != O_NONBLOCK);</div><div class='add'>+	BUILD_BUG_ON(EFD_SEMAPHORE != (1 &lt;&lt; 0));</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; ~EFD_FLAGS_SET)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -395,27 +396,19 @@ static int do_eventfd(unsigned int count, int flags)</div><div class='ctx'> 	init_waitqueue_head(&amp;ctx-&gt;wqh);</div><div class='ctx'> 	ctx-&gt;count = count;</div><div class='ctx'> 	ctx-&gt;flags = flags;</div><div class='del'>-	ctx-&gt;id = ida_alloc(&amp;eventfd_ida, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	flags &amp;= EFD_SHARED_FCNTL_FLAGS;</div><div class='ctx'> 	flags |= O_RDWR;</div><div class='del'>-	fd = get_unused_fd_flags(flags);</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	file = anon_inode_getfile("[eventfd]", &amp;eventfd_fops, ctx, flags);</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		put_unused_fd(fd);</div><div class='del'>-		fd = PTR_ERR(file);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	file-&gt;f_mode |= FMODE_NOWAIT;</div><div class='del'>-	fd_install(fd, file);</div><div class='del'>-	return fd;</div><div class='del'>-err:</div><div class='del'>-	eventfd_free_ctx(ctx);</div><div class='del'>-	return fd;</div><div class='add'>+	FD_PREPARE(fdf, flags,</div><div class='add'>+		   anon_inode_getfile_fmode("[eventfd]", &amp;eventfd_fops, ctx,</div><div class='add'>+					    flags, FMODE_NOWAIT));</div><div class='add'>+	if (fdf.err)</div><div class='add'>+		return fdf.err;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;id = ida_alloc(&amp;eventfd_ida, GFP_KERNEL);</div><div class='add'>+	retain_and_null_ptr(ctx);</div><div class='add'>+	return fd_publish(fdf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags)</div><div class='head'>diff --git a/fs/eventpoll.c b/fs/eventpoll.c<br/>index 3534d36a1474..6c36d9dc6926 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/eventpoll.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/eventpoll.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/eventpoll.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/eventpoll.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='add'>+#include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -45,10 +46,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  * 1) epnested_mutex (mutex)</div><div class='ctx'>  * 2) ep-&gt;mtx (mutex)</div><div class='del'>- * 3) ep-&gt;lock (rwlock)</div><div class='add'>+ * 3) ep-&gt;lock (spinlock)</div><div class='ctx'>  *</div><div class='ctx'>  * The acquire order is the one listed above, from 1 to 3.</div><div class='del'>- * We need a rwlock (ep-&gt;lock) because we manipulate objects</div><div class='add'>+ * We need a spinlock (ep-&gt;lock) because we manipulate objects</div><div class='ctx'>  * from inside the poll callback, that might be triggered from</div><div class='ctx'>  * a wake_up() that in turn might be called from IRQ context.</div><div class='ctx'>  * So we can't sleep inside the poll callback and hence we need</div><div class='hunk'>@@ -194,7 +195,7 @@ struct eventpoll {</div><div class='ctx'> 	struct list_head rdllist;</div><div class='ctx'> </div><div class='ctx'> 	/* Lock which protects rdllist and ovflist */</div><div class='del'>-	rwlock_t lock;</div><div class='add'>+	spinlock_t lock;</div><div class='ctx'> </div><div class='ctx'> 	/* RB tree root used to store monitored fd structs */</div><div class='ctx'> 	struct rb_root_cached rbr;</div><div class='hunk'>@@ -206,7 +207,7 @@ struct eventpoll {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct epitem *ovflist;</div><div class='ctx'> </div><div class='del'>-	/* wakeup_source used when ep_scan_ready_list is running */</div><div class='add'>+	/* wakeup_source used when ep_send_events or __ep_eventpoll_poll is running */</div><div class='ctx'> 	struct wakeup_source *ws;</div><div class='ctx'> </div><div class='ctx'> 	/* The user that created the eventpoll descriptor */</div><div class='hunk'>@@ -217,6 +218,7 @@ struct eventpoll {</div><div class='ctx'> 	/* used to optimize loop detection check */</div><div class='ctx'> 	u64 gen;</div><div class='ctx'> 	struct hlist_head refs;</div><div class='add'>+	u8 loop_check_depth;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * usage count, used together with epitem-&gt;dying to</div><div class='hunk'>@@ -227,6 +229,11 @@ struct eventpoll {</div><div class='ctx'> #ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='ctx'> 	/* used to track busy poll napi_id */</div><div class='ctx'> 	unsigned int napi_id;</div><div class='add'>+	/* busy poll timeout */</div><div class='add'>+	u32 busy_poll_usecs;</div><div class='add'>+	/* busy poll packet budget */</div><div class='add'>+	u16 busy_poll_budget;</div><div class='add'>+	bool prefer_busy_poll;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='hunk'>@@ -312,7 +319,7 @@ static void unlist_file(struct epitems_head *head)</div><div class='ctx'> static long long_zero;</div><div class='ctx'> static long long_max = LONG_MAX;</div><div class='ctx'> </div><div class='del'>-static struct ctl_table epoll_table[] = {</div><div class='add'>+static const struct ctl_table epoll_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "max_user_watches",</div><div class='ctx'> 		.data		= &amp;max_user_watches,</div><div class='hunk'>@@ -387,11 +394,43 @@ static inline int ep_events_available(struct eventpoll *ep)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='add'>+/**</div><div class='add'>+ * busy_loop_ep_timeout - check if busy poll has timed out. The timeout value</div><div class='add'>+ * from the epoll instance ep is preferred, but if it is not set fallback to</div><div class='add'>+ * the system-wide global via busy_loop_timeout.</div><div class='add'>+ *</div><div class='add'>+ * @start_time: The start time used to compute the remaining time until timeout.</div><div class='add'>+ * @ep: Pointer to the eventpoll context.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the timeout has expired, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool busy_loop_ep_timeout(unsigned long start_time,</div><div class='add'>+				 struct eventpoll *ep)</div><div class='add'>+{</div><div class='add'>+	unsigned long bp_usec = READ_ONCE(ep-&gt;busy_poll_usecs);</div><div class='add'>+</div><div class='add'>+	if (bp_usec) {</div><div class='add'>+		unsigned long end_time = start_time + bp_usec;</div><div class='add'>+		unsigned long now = busy_loop_current_time();</div><div class='add'>+</div><div class='add'>+		return time_after(now, end_time);</div><div class='add'>+	} else {</div><div class='add'>+		return busy_loop_timeout(start_time);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ep_busy_loop_on(struct eventpoll *ep)</div><div class='add'>+{</div><div class='add'>+	return !!READ_ONCE(ep-&gt;busy_poll_usecs) ||</div><div class='add'>+	       READ_ONCE(ep-&gt;prefer_busy_poll) ||</div><div class='add'>+	       net_busy_loop_on();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool ep_busy_loop_end(void *p, unsigned long start_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct eventpoll *ep = p;</div><div class='ctx'> </div><div class='del'>-	return ep_events_available(ep) || busy_loop_timeout(start_time);</div><div class='add'>+	return ep_events_available(ep) || busy_loop_ep_timeout(start_time, ep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -400,13 +439,18 @@ static bool ep_busy_loop_end(void *p, unsigned long start_time)</div><div class='ctx'>  *</div><div class='ctx'>  * we must do our busy polling with irqs enabled</div><div class='ctx'>  */</div><div class='del'>-static bool ep_busy_loop(struct eventpoll *ep, int nonblock)</div><div class='add'>+static bool ep_busy_loop(struct eventpoll *ep)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int napi_id = READ_ONCE(ep-&gt;napi_id);</div><div class='add'>+	u16 budget = READ_ONCE(ep-&gt;busy_poll_budget);</div><div class='add'>+	bool prefer_busy_poll = READ_ONCE(ep-&gt;prefer_busy_poll);</div><div class='ctx'> </div><div class='del'>-	if ((napi_id &gt;= MIN_NAPI_ID) &amp;&amp; net_busy_loop_on()) {</div><div class='del'>-		napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep, false,</div><div class='del'>-			       BUSY_POLL_BUDGET);</div><div class='add'>+	if (!budget)</div><div class='add'>+		budget = BUSY_POLL_BUDGET;</div><div class='add'>+</div><div class='add'>+	if (napi_id_valid(napi_id) &amp;&amp; ep_busy_loop_on(ep)) {</div><div class='add'>+		napi_busy_loop(napi_id, ep_busy_loop_end,</div><div class='add'>+			       ep, prefer_busy_poll, budget);</div><div class='ctx'> 		if (ep_events_available(ep))</div><div class='ctx'> 			return true;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -414,6 +458,8 @@ static bool ep_busy_loop(struct eventpoll *ep, int nonblock)</div><div class='ctx'> 		 * it back in when we have moved a socket with a valid NAPI</div><div class='ctx'> 		 * ID onto the ready list.</div><div class='ctx'> 		 */</div><div class='add'>+		if (prefer_busy_poll)</div><div class='add'>+			napi_resume_irqs(napi_id);</div><div class='ctx'> 		ep-&gt;napi_id = 0;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -425,12 +471,12 @@ static bool ep_busy_loop(struct eventpoll *ep, int nonblock)</div><div class='ctx'>  */</div><div class='ctx'> static inline void ep_set_busy_poll_napi_id(struct epitem *epi)</div><div class='ctx'> {</div><div class='del'>-	struct eventpoll *ep;</div><div class='add'>+	struct eventpoll *ep = epi-&gt;ep;</div><div class='ctx'> 	unsigned int napi_id;</div><div class='ctx'> 	struct socket *sock;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> </div><div class='del'>-	if (!net_busy_loop_on())</div><div class='add'>+	if (!ep_busy_loop_on(ep))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	sock = sock_from_file(epi-&gt;ffd.file);</div><div class='hunk'>@@ -442,22 +488,80 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	napi_id = READ_ONCE(sk-&gt;sk_napi_id);</div><div class='del'>-	ep = epi-&gt;ep;</div><div class='ctx'> </div><div class='ctx'> 	/* Non-NAPI IDs can be rejected</div><div class='ctx'> 	 *	or</div><div class='ctx'> 	 * Nothing to do if we already have this ID</div><div class='ctx'> 	 */</div><div class='del'>-	if (napi_id &lt; MIN_NAPI_ID || napi_id == ep-&gt;napi_id)</div><div class='add'>+	if (!napi_id_valid(napi_id) || napi_id == ep-&gt;napi_id)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* record NAPI ID for use in next busy poll */</div><div class='ctx'> 	ep-&gt;napi_id = napi_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long ep_eventpoll_bp_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+				  unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct eventpoll *ep = file-&gt;private_data;</div><div class='add'>+	void __user *uarg = (void __user *)arg;</div><div class='add'>+	struct epoll_params epoll_params;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case EPIOCSPARAMS:</div><div class='add'>+		if (copy_from_user(&amp;epoll_params, uarg, sizeof(epoll_params)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		/* pad byte must be zero */</div><div class='add'>+		if (epoll_params.__pad)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (epoll_params.busy_poll_usecs &gt; S32_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (epoll_params.prefer_busy_poll &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (epoll_params.busy_poll_budget &gt; NAPI_POLL_WEIGHT &amp;&amp;</div><div class='add'>+		    !capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(ep-&gt;busy_poll_usecs, epoll_params.busy_poll_usecs);</div><div class='add'>+		WRITE_ONCE(ep-&gt;busy_poll_budget, epoll_params.busy_poll_budget);</div><div class='add'>+		WRITE_ONCE(ep-&gt;prefer_busy_poll, epoll_params.prefer_busy_poll);</div><div class='add'>+		return 0;</div><div class='add'>+	case EPIOCGPARAMS:</div><div class='add'>+		memset(&amp;epoll_params, 0, sizeof(epoll_params));</div><div class='add'>+		epoll_params.busy_poll_usecs = READ_ONCE(ep-&gt;busy_poll_usecs);</div><div class='add'>+		epoll_params.busy_poll_budget = READ_ONCE(ep-&gt;busy_poll_budget);</div><div class='add'>+		epoll_params.prefer_busy_poll = READ_ONCE(ep-&gt;prefer_busy_poll);</div><div class='add'>+		if (copy_to_user(uarg, &amp;epoll_params, sizeof(epoll_params)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_suspend_napi_irqs(struct eventpoll *ep)</div><div class='add'>+{</div><div class='add'>+	unsigned int napi_id = READ_ONCE(ep-&gt;napi_id);</div><div class='add'>+</div><div class='add'>+	if (napi_id_valid(napi_id) &amp;&amp; READ_ONCE(ep-&gt;prefer_busy_poll))</div><div class='add'>+		napi_suspend_irqs(napi_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_resume_napi_irqs(struct eventpoll *ep)</div><div class='add'>+{</div><div class='add'>+	unsigned int napi_id = READ_ONCE(ep-&gt;napi_id);</div><div class='add'>+</div><div class='add'>+	if (napi_id_valid(napi_id) &amp;&amp; READ_ONCE(ep-&gt;prefer_busy_poll))</div><div class='add'>+		napi_resume_irqs(napi_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline bool ep_busy_loop(struct eventpoll *ep, int nonblock)</div><div class='add'>+static inline bool ep_busy_loop(struct eventpoll *ep)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -466,6 +570,20 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long ep_eventpoll_bp_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+				  unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_suspend_napi_irqs(struct eventpoll *ep)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_resume_napi_irqs(struct eventpoll *ep)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_NET_RX_BUSY_POLL */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -623,10 +741,10 @@ static void ep_start_scan(struct eventpoll *ep, struct list_head *txlist)</div><div class='ctx'> 	 * in a lockless way.</div><div class='ctx'> 	 */</div><div class='ctx'> 	lockdep_assert_irqs_enabled();</div><div class='del'>-	write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 	list_splice_init(&amp;ep-&gt;rdllist, txlist);</div><div class='ctx'> 	WRITE_ONCE(ep-&gt;ovflist, NULL);</div><div class='del'>-	write_unlock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ep_done_scan(struct eventpoll *ep,</div><div class='hunk'>@@ -634,7 +752,7 @@ static void ep_done_scan(struct eventpoll *ep,</div><div class='ctx'> {</div><div class='ctx'> 	struct epitem *epi, *nepi;</div><div class='ctx'> </div><div class='del'>-	write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * During the time we spent inside the "sproc" callback, some</div><div class='ctx'> 	 * other events might have been queued by the poll callback.</div><div class='hunk'>@@ -675,13 +793,7 @@ static void ep_done_scan(struct eventpoll *ep,</div><div class='ctx'> 			wake_up(&amp;ep-&gt;wq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_unlock_irq(&amp;ep-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void epi_rcu_free(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct epitem *epi = container_of(head, struct epitem, rcu);</div><div class='del'>-	kmem_cache_free(epi_cache, epi);</div><div class='add'>+	spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ep_get(struct eventpoll *ep)</div><div class='hunk'>@@ -703,6 +815,7 @@ static bool ep_refcount_dec_and_test(struct eventpoll *ep)</div><div class='ctx'> </div><div class='ctx'> static void ep_free(struct eventpoll *ep)</div><div class='ctx'> {</div><div class='add'>+	ep_resume_napi_irqs(ep);</div><div class='ctx'> 	mutex_destroy(&amp;ep-&gt;mtx);</div><div class='ctx'> 	free_uid(ep-&gt;user);</div><div class='ctx'> 	wakeup_source_unregister(ep-&gt;ws);</div><div class='hunk'>@@ -740,7 +853,8 @@ static bool __ep_remove(struct eventpoll *ep, struct epitem *epi, bool force)</div><div class='ctx'> 	to_free = NULL;</div><div class='ctx'> 	head = file-&gt;f_ep;</div><div class='ctx'> 	if (head-&gt;first == &amp;epi-&gt;fllink &amp;&amp; !epi-&gt;fllink.next) {</div><div class='del'>-		file-&gt;f_ep = NULL;</div><div class='add'>+		/* See eventpoll_release() for details. */</div><div class='add'>+		WRITE_ONCE(file-&gt;f_ep, NULL);</div><div class='ctx'> 		if (!is_file_epoll(file)) {</div><div class='ctx'> 			struct epitems_head *v;</div><div class='ctx'> 			v = container_of(head, struct epitems_head, epitems);</div><div class='hunk'>@@ -754,10 +868,10 @@ static bool __ep_remove(struct eventpoll *ep, struct epitem *epi, bool force)</div><div class='ctx'> </div><div class='ctx'> 	rb_erase_cached(&amp;epi-&gt;rbn, &amp;ep-&gt;rbr);</div><div class='ctx'> </div><div class='del'>-	write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 	if (ep_is_linked(epi))</div><div class='ctx'> 		list_del_init(&amp;epi-&gt;rdllink);</div><div class='del'>-	write_unlock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	wakeup_source_unregister(ep_wakeup_source(epi));</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -767,10 +881,10 @@ static bool __ep_remove(struct eventpoll *ep, struct epitem *epi, bool force)</div><div class='ctx'> 	 * ep-&gt;mtx. The rcu read side, reverse_path_check_proc(), does not make</div><div class='ctx'> 	 * use of the rbn field.</div><div class='ctx'> 	 */</div><div class='del'>-	call_rcu(&amp;epi-&gt;rcu, epi_rcu_free);</div><div class='add'>+	kfree_rcu(epi, rcu);</div><div class='ctx'> </div><div class='ctx'> 	percpu_counter_dec(&amp;ep-&gt;user-&gt;epoll_watches);</div><div class='del'>-	return ep_refcount_dec_and_test(ep);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -778,14 +892,14 @@ static bool __ep_remove(struct eventpoll *ep, struct epitem *epi, bool force)</div><div class='ctx'>  */</div><div class='ctx'> static void ep_remove_safe(struct eventpoll *ep, struct epitem *epi)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(__ep_remove(ep, epi, false));</div><div class='add'>+	if (__ep_remove(ep, epi, false))</div><div class='add'>+		WARN_ON_ONCE(ep_refcount_dec_and_test(ep));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ep_clear_and_put(struct eventpoll *ep)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *rbp, *next;</div><div class='ctx'> 	struct epitem *epi;</div><div class='del'>-	bool dispose;</div><div class='ctx'> </div><div class='ctx'> 	/* We need to release all tasks waiting for these file */</div><div class='ctx'> 	if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='hunk'>@@ -818,13 +932,32 @@ static void ep_clear_and_put(struct eventpoll *ep)</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dispose = ep_refcount_dec_and_test(ep);</div><div class='ctx'> 	mutex_unlock(&amp;ep-&gt;mtx);</div><div class='del'>-</div><div class='del'>-	if (dispose)</div><div class='add'>+	if (ep_refcount_dec_and_test(ep))</div><div class='ctx'> 		ep_free(ep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long ep_eventpoll_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			       unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_file_epoll(file))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case EPIOCSPARAMS:</div><div class='add'>+	case EPIOCGPARAMS:</div><div class='add'>+		ret = ep_eventpoll_bp_ioctl(file, cmd, arg);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ep_eventpoll_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct eventpoll *ep = file-&gt;private_data;</div><div class='hunk'>@@ -876,6 +1009,34 @@ static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int dep</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The ffd.file pointer may be in the process of being torn down due to</div><div class='add'>+ * being closed, but we may not have finished eventpoll_release() yet.</div><div class='add'>+ *</div><div class='add'>+ * Normally, even with the atomic_long_inc_not_zero, the file may have</div><div class='add'>+ * been free'd and then gotten re-allocated to something else (since</div><div class='add'>+ * files are not RCU-delayed, they are SLAB_TYPESAFE_BY_RCU).</div><div class='add'>+ *</div><div class='add'>+ * But for epoll, users hold the ep-&gt;mtx mutex, and as such any file in</div><div class='add'>+ * the process of being free'd will block in eventpoll_release_file()</div><div class='add'>+ * and thus the underlying file allocation will not be free'd, and the</div><div class='add'>+ * file re-use cannot happen.</div><div class='add'>+ *</div><div class='add'>+ * For the same reason we can avoid a rcu_read_lock() around the</div><div class='add'>+ * operation - 'ffd.file' cannot go away even if the refcount has</div><div class='add'>+ * reached zero (but we must still not call out to -&gt;poll() functions</div><div class='add'>+ * etc).</div><div class='add'>+ */</div><div class='add'>+static struct file *epi_fget(const struct epitem *epi)</div><div class='add'>+{</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	file = epi-&gt;ffd.file;</div><div class='add'>+	if (!file_ref_get(&amp;file-&gt;f_ref))</div><div class='add'>+		file = NULL;</div><div class='add'>+	return file;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Differs from ep_eventpoll_poll() in that internal callers already have</div><div class='ctx'>  * the ep-&gt;mtx so we need to start from depth=1, such that mutex_lock_nested()</div><div class='ctx'>  * is correctly annotated.</div><div class='hunk'>@@ -883,14 +1044,22 @@ static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int dep</div><div class='ctx'> static __poll_t ep_item_poll(const struct epitem *epi, poll_table *pt,</div><div class='ctx'> 				 int depth)</div><div class='ctx'> {</div><div class='del'>-	struct file *file = epi-&gt;ffd.file;</div><div class='add'>+	struct file *file = epi_fget(epi);</div><div class='ctx'> 	__poll_t res;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We could return EPOLLERR | EPOLLHUP or something, but let's</div><div class='add'>+	 * treat this more as "file doesn't exist, poll didn't happen".</div><div class='add'>+	 */</div><div class='add'>+	if (!file)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	pt-&gt;_key = epi-&gt;event.events;</div><div class='ctx'> 	if (!is_file_epoll(file))</div><div class='ctx'> 		res = vfs_poll(file, pt);</div><div class='ctx'> 	else</div><div class='ctx'> 		res = __ep_eventpoll_poll(file, pt, depth);</div><div class='add'>+	fput(file);</div><div class='ctx'> 	return res &amp; epi-&gt;event.events;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -931,6 +1100,8 @@ static const struct file_operations eventpoll_fops = {</div><div class='ctx'> 	.release	= ep_eventpoll_release,</div><div class='ctx'> 	.poll		= ep_eventpoll_poll,</div><div class='ctx'> 	.llseek		= noop_llseek,</div><div class='add'>+	.unlocked_ioctl	= ep_eventpoll_ioctl,</div><div class='add'>+	.compat_ioctl   = compat_ptr_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -965,7 +1136,7 @@ again:</div><div class='ctx'> 		dispose = __ep_remove(ep, epi, true);</div><div class='ctx'> 		mutex_unlock(&amp;ep-&gt;mtx);</div><div class='ctx'> </div><div class='del'>-		if (dispose)</div><div class='add'>+		if (dispose &amp;&amp; ep_refcount_dec_and_test(ep))</div><div class='ctx'> 			ep_free(ep);</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -981,7 +1152,7 @@ static int ep_alloc(struct eventpoll **pep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;ep-&gt;mtx);</div><div class='del'>-	rwlock_init(&amp;ep-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;ep-&gt;lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;ep-&gt;wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;ep-&gt;poll_wait);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ep-&gt;rdllist);</div><div class='hunk'>@@ -1069,99 +1240,9 @@ struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd,</div><div class='ctx'> #endif /* CONFIG_KCMP */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Adds a new entry to the tail of the list in a lockless way, i.e.</div><div class='del'>- * multiple CPUs are allowed to call this function concurrently.</div><div class='del'>- *</div><div class='del'>- * Beware: it is necessary to prevent any other modifications of the</div><div class='del'>- *         existing list until all changes are completed, in other words</div><div class='del'>- *         concurrent list_add_tail_lockless() calls should be protected</div><div class='del'>- *         with a read lock, where write lock acts as a barrier which</div><div class='del'>- *         makes sure all list_add_tail_lockless() calls are fully</div><div class='del'>- *         completed.</div><div class='del'>- *</div><div class='del'>- *        Also an element can be locklessly added to the list only in one</div><div class='del'>- *        direction i.e. either to the tail or to the head, otherwise</div><div class='del'>- *        concurrent access will corrupt the list.</div><div class='del'>- *</div><div class='del'>- * Return: %false if element has been already added to the list, %true</div><div class='del'>- * otherwise.</div><div class='del'>- */</div><div class='del'>-static inline bool list_add_tail_lockless(struct list_head *new,</div><div class='del'>-					  struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	struct list_head *prev;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is simple 'new-&gt;next = head' operation, but cmpxchg()</div><div class='del'>-	 * is used in order to detect that same element has been just</div><div class='del'>-	 * added to the list from another CPU: the winner observes</div><div class='del'>-	 * new-&gt;next == new.</div><div class='del'>-	 */</div><div class='del'>-	if (!try_cmpxchg(&amp;new-&gt;next, &amp;new, head))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initially -&gt;next of a new element must be updated with the head</div><div class='del'>-	 * (we are inserting to the tail) and only then pointers are atomically</div><div class='del'>-	 * exchanged.  XCHG guarantees memory ordering, thus -&gt;next should be</div><div class='del'>-	 * updated before pointers are actually swapped and pointers are</div><div class='del'>-	 * swapped before prev-&gt;next is updated.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	prev = xchg(&amp;head-&gt;prev, new);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It is safe to modify prev-&gt;next and new-&gt;prev, because a new element</div><div class='del'>-	 * is added only to the tail and new-&gt;next is updated before XCHG.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	prev-&gt;next = new;</div><div class='del'>-	new-&gt;prev = prev;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Chains a new epi entry to the tail of the ep-&gt;ovflist in a lockless way,</div><div class='del'>- * i.e. multiple CPUs are allowed to call this function concurrently.</div><div class='del'>- *</div><div class='del'>- * Return: %false if epi element has been already chained, %true otherwise.</div><div class='del'>- */</div><div class='del'>-static inline bool chain_epi_lockless(struct epitem *epi)</div><div class='del'>-{</div><div class='del'>-	struct eventpoll *ep = epi-&gt;ep;</div><div class='del'>-</div><div class='del'>-	/* Fast preliminary check */</div><div class='del'>-	if (epi-&gt;next != EP_UNACTIVE_PTR)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Check that the same epi has not been just chained from another CPU */</div><div class='del'>-	if (cmpxchg(&amp;epi-&gt;next, EP_UNACTIVE_PTR, NULL) != EP_UNACTIVE_PTR)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/* Atomically exchange tail */</div><div class='del'>-	epi-&gt;next = xchg(&amp;ep-&gt;ovflist, epi);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This is the callback that is passed to the wait queue wakeup</div><div class='ctx'>  * mechanism. It is called by the stored file descriptors when they</div><div class='ctx'>  * have events to report.</div><div class='del'>- *</div><div class='del'>- * This callback takes a read lock in order not to contend with concurrent</div><div class='del'>- * events from another file descriptor, thus all modifications to -&gt;rdllist</div><div class='del'>- * or -&gt;ovflist are lockless.  Read lock is paired with the write lock from</div><div class='del'>- * ep_scan_ready_list(), which stops all list modifications and guarantees</div><div class='del'>- * that lists state is seen correctly.</div><div class='del'>- *</div><div class='del'>- * Another thing worth to mention is that ep_poll_callback() can be called</div><div class='del'>- * concurrently for the same @epi from different CPUs if poll table was inited</div><div class='del'>- * with several wait queues entries.  Plural wakeup from different CPUs of a</div><div class='del'>- * single wait queue is serialized by wq.lock, but the case when multiple wait</div><div class='del'>- * queues are used should be detected accordingly.  This is detected using</div><div class='del'>- * cmpxchg() operation.</div><div class='ctx'>  */</div><div class='ctx'> static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)</div><div class='ctx'> {</div><div class='hunk'>@@ -1172,7 +1253,7 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ewake = 0;</div><div class='ctx'> </div><div class='del'>-	read_lock_irqsave(&amp;ep-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;ep-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	ep_set_busy_poll_napi_id(epi);</div><div class='ctx'> </div><div class='hunk'>@@ -1201,12 +1282,15 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v</div><div class='ctx'> 	 * chained in ep-&gt;ovflist and requeued later on.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (READ_ONCE(ep-&gt;ovflist) != EP_UNACTIVE_PTR) {</div><div class='del'>-		if (chain_epi_lockless(epi))</div><div class='add'>+		if (epi-&gt;next == EP_UNACTIVE_PTR) {</div><div class='add'>+			epi-&gt;next = READ_ONCE(ep-&gt;ovflist);</div><div class='add'>+			WRITE_ONCE(ep-&gt;ovflist, epi);</div><div class='ctx'> 			ep_pm_stay_awake_rcu(epi);</div><div class='add'>+		}</div><div class='ctx'> 	} else if (!ep_is_linked(epi)) {</div><div class='ctx'> 		/* In the usual case, add event to ready list. */</div><div class='del'>-		if (list_add_tail_lockless(&amp;epi-&gt;rdllink, &amp;ep-&gt;rdllist))</div><div class='del'>-			ep_pm_stay_awake_rcu(epi);</div><div class='add'>+		list_add_tail(&amp;epi-&gt;rdllink, &amp;ep-&gt;rdllist);</div><div class='add'>+		ep_pm_stay_awake_rcu(epi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1230,13 +1314,16 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		wake_up(&amp;ep-&gt;wq);</div><div class='add'>+		if (sync)</div><div class='add'>+			wake_up_sync(&amp;ep-&gt;wq);</div><div class='add'>+		else</div><div class='add'>+			wake_up(&amp;ep-&gt;wq);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='ctx'> 		pwake++;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	read_unlock_irqrestore(&amp;ep-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ep-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* We have to call this outside the lock */</div><div class='ctx'> 	if (pwake)</div><div class='hunk'>@@ -1461,7 +1548,8 @@ allocate:</div><div class='ctx'> 			spin_unlock(&amp;file-&gt;f_lock);</div><div class='ctx'> 			goto allocate;</div><div class='ctx'> 		}</div><div class='del'>-		file-&gt;f_ep = head;</div><div class='add'>+		/* See eventpoll_release() for details. */</div><div class='add'>+		WRITE_ONCE(file-&gt;f_ep, head);</div><div class='ctx'> 		to_free = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	hlist_add_head_rcu(&amp;epi-&gt;fllink, file-&gt;f_ep);</div><div class='hunk'>@@ -1570,7 +1658,7 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We have to drop the new item inside our item list to keep track of it */</div><div class='del'>-	write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* record NAPI ID of new item if present */</div><div class='ctx'> 	ep_set_busy_poll_napi_id(epi);</div><div class='hunk'>@@ -1587,7 +1675,7 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,</div><div class='ctx'> 			pwake++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	write_unlock_irq(&amp;ep-&gt;lock);</div><div class='add'>+	spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* We have to call this outside the lock */</div><div class='ctx'> 	if (pwake)</div><div class='hunk'>@@ -1651,7 +1739,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,</div><div class='ctx'> 	 * list, push it inside.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ep_item_poll(epi, &amp;pt, 1)) {</div><div class='del'>-		write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+		spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 		if (!ep_is_linked(epi)) {</div><div class='ctx'> 			list_add_tail(&amp;epi-&gt;rdllink, &amp;ep-&gt;rdllist);</div><div class='ctx'> 			ep_pm_stay_awake(epi);</div><div class='hunk'>@@ -1662,7 +1750,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,</div><div class='ctx'> 			if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='ctx'> 				pwake++;</div><div class='ctx'> 		}</div><div class='del'>-		write_unlock_irq(&amp;ep-&gt;lock);</div><div class='add'>+		spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We have to call this outside the lock */</div><div class='hunk'>@@ -1751,7 +1839,7 @@ static int ep_send_events(struct eventpoll *ep,</div><div class='ctx'> 			 * availability. At this point, no one can insert</div><div class='ctx'> 			 * into ep-&gt;rdllist besides us. The epoll_ctl()</div><div class='ctx'> 			 * callers are locked out by</div><div class='del'>-			 * ep_scan_ready_list() holding "mtx" and the</div><div class='add'>+			 * ep_send_events() holding "mtx" and the</div><div class='ctx'> 			 * poll callback will queue them in ep-&gt;ovflist.</div><div class='ctx'> 			 */</div><div class='ctx'> 			list_add_tail(&amp;epi-&gt;rdllink, &amp;ep-&gt;rdllist);</div><div class='hunk'>@@ -1804,6 +1892,30 @@ static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ep_try_send_events(struct eventpoll *ep,</div><div class='add'>+			      struct epoll_event __user *events, int maxevents)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to transfer events to user space. In case we get 0 events and</div><div class='add'>+	 * there's still timeout left over, we go trying again in search of</div><div class='add'>+	 * more luck.</div><div class='add'>+	 */</div><div class='add'>+	res = ep_send_events(ep, events, maxevents);</div><div class='add'>+	if (res &gt; 0)</div><div class='add'>+		ep_suspend_napi_irqs(ep);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ep_schedule_timeout(ktime_t *to)</div><div class='add'>+{</div><div class='add'>+	if (to)</div><div class='add'>+		return ktime_after(*to, ktime_get());</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ep_poll - Retrieves ready events, and delivers them to the caller-supplied</div><div class='ctx'>  *           event buffer.</div><div class='hunk'>@@ -1855,12 +1967,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (eavail) {</div><div class='del'>-			/*</div><div class='del'>-			 * Try to transfer events to user space. In case we get</div><div class='del'>-			 * 0 events and there's still timeout left over, we go</div><div class='del'>-			 * trying again in search of more luck.</div><div class='del'>-			 */</div><div class='del'>-			res = ep_send_events(ep, events, maxevents);</div><div class='add'>+			res = ep_try_send_events(ep, events, maxevents);</div><div class='ctx'> 			if (res)</div><div class='ctx'> 				return res;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1868,7 +1975,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 		if (timed_out)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		eavail = ep_busy_loop(ep, timed_out);</div><div class='add'>+		eavail = ep_busy_loop(ep);</div><div class='ctx'> 		if (eavail)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1895,7 +2002,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 		init_wait(&amp;wait);</div><div class='ctx'> 		wait.func = ep_autoremove_wake_function;</div><div class='ctx'> </div><div class='del'>-		write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+		spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Barrierless variant, waitqueue_active() is called under</div><div class='ctx'> 		 * the same lock on wakeup ep_poll_callback() side, so it</div><div class='hunk'>@@ -1904,7 +2011,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 		__set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Do the final check under the lock. ep_scan_ready_list()</div><div class='add'>+		 * Do the final check under the lock. ep_start/done_scan()</div><div class='ctx'> 		 * plays with two lists (-&gt;rdllist and -&gt;ovflist) and there</div><div class='ctx'> 		 * is always a race when both lists are empty for short</div><div class='ctx'> 		 * period of time although events are pending, so lock is</div><div class='hunk'>@@ -1914,11 +2021,12 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 		if (!eavail)</div><div class='ctx'> 			__add_wait_queue_exclusive(&amp;ep-&gt;wq, &amp;wait);</div><div class='ctx'> </div><div class='del'>-		write_unlock_irq(&amp;ep-&gt;lock);</div><div class='add'>+		spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		if (!eavail)</div><div class='del'>-			timed_out = !schedule_hrtimeout_range(to, slack,</div><div class='del'>-							      HRTIMER_MODE_ABS);</div><div class='add'>+			timed_out = !ep_schedule_timeout(to) ||</div><div class='add'>+				!schedule_hrtimeout_range(to, slack,</div><div class='add'>+							  HRTIMER_MODE_ABS);</div><div class='ctx'> 		__set_current_state(TASK_RUNNING);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1929,7 +2037,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 		eavail = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (!list_empty_careful(&amp;wait.entry)) {</div><div class='del'>-			write_lock_irq(&amp;ep-&gt;lock);</div><div class='add'>+			spin_lock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If the thread timed out and is not on the wait queue,</div><div class='ctx'> 			 * it means that the thread was woken up after its</div><div class='hunk'>@@ -1940,29 +2048,30 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 			if (timed_out)</div><div class='ctx'> 				eavail = list_empty(&amp;wait.entry);</div><div class='ctx'> 			__remove_wait_queue(&amp;ep-&gt;wq, &amp;wait);</div><div class='del'>-			write_unlock_irq(&amp;ep-&gt;lock);</div><div class='add'>+			spin_unlock_irq(&amp;ep-&gt;lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ep_loop_check_proc - verify that adding an epoll file inside another</div><div class='del'>- *                      epoll structure does not violate the constraints, in</div><div class='del'>- *                      terms of closed loops, or too deep chains (which can</div><div class='del'>- *                      result in excessive stack usage).</div><div class='add'>+ * ep_loop_check_proc - verify that adding an epoll file @ep inside another</div><div class='add'>+ *                      epoll file does not create closed loops, and</div><div class='add'>+ *                      determine the depth of the subtree starting at @ep</div><div class='ctx'>  *</div><div class='ctx'>  * @ep: the &amp;struct eventpoll to be currently checked.</div><div class='ctx'>  * @depth: Current depth of the path being checked.</div><div class='ctx'>  *</div><div class='del'>- * Return: %zero if adding the epoll @file inside current epoll</div><div class='del'>- *          structure @ep does not violate the constraints, or %-1 otherwise.</div><div class='add'>+ * Return: depth of the subtree, or INT_MAX if we found a loop or went too deep.</div><div class='ctx'>  */</div><div class='ctx'> static int ep_loop_check_proc(struct eventpoll *ep, int depth)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='add'>+	int result = 0;</div><div class='ctx'> 	struct rb_node *rbp;</div><div class='ctx'> 	struct epitem *epi;</div><div class='ctx'> </div><div class='add'>+	if (ep-&gt;gen == loop_check_gen)</div><div class='add'>+		return ep-&gt;loop_check_depth;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock_nested(&amp;ep-&gt;mtx, depth + 1);</div><div class='ctx'> 	ep-&gt;gen = loop_check_gen;</div><div class='ctx'> 	for (rbp = rb_first_cached(&amp;ep-&gt;rbr); rbp; rbp = rb_next(rbp)) {</div><div class='hunk'>@@ -1970,13 +2079,11 @@ static int ep_loop_check_proc(struct eventpoll *ep, int depth)</div><div class='ctx'> 		if (unlikely(is_file_epoll(epi-&gt;ffd.file))) {</div><div class='ctx'> 			struct eventpoll *ep_tovisit;</div><div class='ctx'> 			ep_tovisit = epi-&gt;ffd.file-&gt;private_data;</div><div class='del'>-			if (ep_tovisit-&gt;gen == loop_check_gen)</div><div class='del'>-				continue;</div><div class='ctx'> 			if (ep_tovisit == inserting_into || depth &gt; EP_MAX_NESTS)</div><div class='del'>-				error = -1;</div><div class='add'>+				result = INT_MAX;</div><div class='ctx'> 			else</div><div class='del'>-				error = ep_loop_check_proc(ep_tovisit, depth + 1);</div><div class='del'>-			if (error != 0)</div><div class='add'>+				result = max(result, ep_loop_check_proc(ep_tovisit, depth + 1) + 1);</div><div class='add'>+			if (result &gt; EP_MAX_NESTS)</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1990,9 +2097,25 @@ static int ep_loop_check_proc(struct eventpoll *ep, int depth)</div><div class='ctx'> 			list_file(epi-&gt;ffd.file);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	ep-&gt;loop_check_depth = result;</div><div class='ctx'> 	mutex_unlock(&amp;ep-&gt;mtx);</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ep_get_upwards_depth_proc - determine depth of @ep when traversed upwards */</div><div class='add'>+static int ep_get_upwards_depth_proc(struct eventpoll *ep, int depth)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	struct epitem *epi;</div><div class='add'>+</div><div class='add'>+	if (ep-&gt;gen == loop_check_gen)</div><div class='add'>+		return ep-&gt;loop_check_depth;</div><div class='add'>+	hlist_for_each_entry_rcu(epi, &amp;ep-&gt;refs, fllink)</div><div class='add'>+		result = max(result, ep_get_upwards_depth_proc(epi-&gt;ep, depth + 1) + 1);</div><div class='add'>+	ep-&gt;gen = loop_check_gen;</div><div class='add'>+	ep-&gt;loop_check_depth = result;</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2008,8 +2131,22 @@ static int ep_loop_check_proc(struct eventpoll *ep, int depth)</div><div class='ctx'>  */</div><div class='ctx'> static int ep_loop_check(struct eventpoll *ep, struct eventpoll *to)</div><div class='ctx'> {</div><div class='add'>+	int depth, upwards_depth;</div><div class='add'>+</div><div class='ctx'> 	inserting_into = ep;</div><div class='del'>-	return ep_loop_check_proc(to, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * Check how deep down we can get from @to, and whether it is possible</div><div class='add'>+	 * to loop up to @ep.</div><div class='add'>+	 */</div><div class='add'>+	depth = ep_loop_check_proc(to, 0);</div><div class='add'>+	if (depth &gt; EP_MAX_NESTS)</div><div class='add'>+		return -1;</div><div class='add'>+	/* Check how far up we can go from @ep. */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	upwards_depth = ep_get_upwards_depth_proc(ep, 0);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return (depth+1+upwards_depth &gt; EP_MAX_NESTS) ? -1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void clear_tfile_check_list(void)</div><div class='hunk'>@@ -2028,9 +2165,8 @@ static void clear_tfile_check_list(void)</div><div class='ctx'>  */</div><div class='ctx'> static int do_epoll_create(int flags)</div><div class='ctx'> {</div><div class='del'>-	int error, fd;</div><div class='del'>-	struct eventpoll *ep = NULL;</div><div class='del'>-	struct file *file;</div><div class='add'>+	int error;</div><div class='add'>+	struct eventpoll *ep;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the EPOLL_* constant for consistency.  */</div><div class='ctx'> 	BUILD_BUG_ON(EPOLL_CLOEXEC != O_CLOEXEC);</div><div class='hunk'>@@ -2047,26 +2183,15 @@ static int do_epoll_create(int flags)</div><div class='ctx'> 	 * Creates all the items needed to setup an eventpoll file. That is,</div><div class='ctx'> 	 * a file structure and a free file descriptor.</div><div class='ctx'> 	 */</div><div class='del'>-	fd = get_unused_fd_flags(O_RDWR | (flags &amp; O_CLOEXEC));</div><div class='del'>-	if (fd &lt; 0) {</div><div class='del'>-		error = fd;</div><div class='del'>-		goto out_free_ep;</div><div class='del'>-	}</div><div class='del'>-	file = anon_inode_getfile("[eventpoll]", &amp;eventpoll_fops, ep,</div><div class='del'>-				 O_RDWR | (flags &amp; O_CLOEXEC));</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		error = PTR_ERR(file);</div><div class='del'>-		goto out_free_fd;</div><div class='add'>+	FD_PREPARE(fdf, O_RDWR | (flags &amp; O_CLOEXEC),</div><div class='add'>+		   anon_inode_getfile("[eventpoll]", &amp;eventpoll_fops, ep,</div><div class='add'>+				      O_RDWR | (flags &amp; O_CLOEXEC)));</div><div class='add'>+	if (fdf.err) {</div><div class='add'>+		ep_clear_and_put(ep);</div><div class='add'>+		return fdf.err;</div><div class='ctx'> 	}</div><div class='del'>-	ep-&gt;file = file;</div><div class='del'>-	fd_install(fd, file);</div><div class='del'>-	return fd;</div><div class='del'>-</div><div class='del'>-out_free_fd:</div><div class='del'>-	put_unused_fd(fd);</div><div class='del'>-out_free_ep:</div><div class='del'>-	ep_clear_and_put(ep);</div><div class='del'>-	return error;</div><div class='add'>+	ep-&gt;file = fd_prepare_file(fdf);</div><div class='add'>+	return fd_publish(fdf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE1(epoll_create1, int, flags)</div><div class='hunk'>@@ -2112,25 +2237,22 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	int full_check = 0;</div><div class='del'>-	struct fd f, tf;</div><div class='ctx'> 	struct eventpoll *ep;</div><div class='ctx'> 	struct epitem *epi;</div><div class='ctx'> 	struct eventpoll *tep = NULL;</div><div class='ctx'> </div><div class='del'>-	error = -EBADF;</div><div class='del'>-	f = fdget(epfd);</div><div class='del'>-	if (!f.file)</div><div class='del'>-		goto error_return;</div><div class='add'>+	CLASS(fd, f)(epfd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the "struct file *" for the target file */</div><div class='del'>-	tf = fdget(fd);</div><div class='del'>-	if (!tf.file)</div><div class='del'>-		goto error_fput;</div><div class='add'>+	CLASS(fd, tf)(fd);</div><div class='add'>+	if (fd_empty(tf))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	/* The target file descriptor must support poll */</div><div class='del'>-	error = -EPERM;</div><div class='del'>-	if (!file_can_poll(tf.file))</div><div class='del'>-		goto error_tgt_fput;</div><div class='add'>+	if (!file_can_poll(fd_file(tf)))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if EPOLLWAKEUP is allowed */</div><div class='ctx'> 	if (ep_op_has_event(op))</div><div class='hunk'>@@ -2142,7 +2264,7 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,</div><div class='ctx'> 	 * adding an epoll file descriptor inside itself.</div><div class='ctx'> 	 */</div><div class='ctx'> 	error = -EINVAL;</div><div class='del'>-	if (f.file == tf.file || !is_file_epoll(f.file))</div><div class='add'>+	if (fd_file(f) == fd_file(tf) || !is_file_epoll(fd_file(f)))</div><div class='ctx'> 		goto error_tgt_fput;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2153,7 +2275,7 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,</div><div class='ctx'> 	if (ep_op_has_event(op) &amp;&amp; (epds-&gt;events &amp; EPOLLEXCLUSIVE)) {</div><div class='ctx'> 		if (op == EPOLL_CTL_MOD)</div><div class='ctx'> 			goto error_tgt_fput;</div><div class='del'>-		if (op == EPOLL_CTL_ADD &amp;&amp; (is_file_epoll(tf.file) ||</div><div class='add'>+		if (op == EPOLL_CTL_ADD &amp;&amp; (is_file_epoll(fd_file(tf)) ||</div><div class='ctx'> 				(epds-&gt;events &amp; ~EPOLLEXCLUSIVE_OK_BITS)))</div><div class='ctx'> 			goto error_tgt_fput;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2162,7 +2284,7 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,</div><div class='ctx'> 	 * At this point it is safe to assume that the "private_data" contains</div><div class='ctx'> 	 * our own data structure.</div><div class='ctx'> 	 */</div><div class='del'>-	ep = f.file-&gt;private_data;</div><div class='add'>+	ep = fd_file(f)-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When we insert an epoll file descriptor inside another epoll file</div><div class='hunk'>@@ -2183,16 +2305,16 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto error_tgt_fput;</div><div class='ctx'> 	if (op == EPOLL_CTL_ADD) {</div><div class='del'>-		if (READ_ONCE(f.file-&gt;f_ep) || ep-&gt;gen == loop_check_gen ||</div><div class='del'>-		    is_file_epoll(tf.file)) {</div><div class='add'>+		if (READ_ONCE(fd_file(f)-&gt;f_ep) || ep-&gt;gen == loop_check_gen ||</div><div class='add'>+		    is_file_epoll(fd_file(tf))) {</div><div class='ctx'> 			mutex_unlock(&amp;ep-&gt;mtx);</div><div class='ctx'> 			error = epoll_mutex_lock(&amp;epnested_mutex, 0, nonblock);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				goto error_tgt_fput;</div><div class='ctx'> 			loop_check_gen++;</div><div class='ctx'> 			full_check = 1;</div><div class='del'>-			if (is_file_epoll(tf.file)) {</div><div class='del'>-				tep = tf.file-&gt;private_data;</div><div class='add'>+			if (is_file_epoll(fd_file(tf))) {</div><div class='add'>+				tep = fd_file(tf)-&gt;private_data;</div><div class='ctx'> 				error = -ELOOP;</div><div class='ctx'> 				if (ep_loop_check(ep, tep) != 0)</div><div class='ctx'> 					goto error_tgt_fput;</div><div class='hunk'>@@ -2208,14 +2330,14 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,</div><div class='ctx'> 	 * above, we can be sure to be able to use the item looked up by</div><div class='ctx'> 	 * ep_find() till we release the mutex.</div><div class='ctx'> 	 */</div><div class='del'>-	epi = ep_find(ep, tf.file, fd);</div><div class='add'>+	epi = ep_find(ep, fd_file(tf), fd);</div><div class='ctx'> </div><div class='ctx'> 	error = -EINVAL;</div><div class='ctx'> 	switch (op) {</div><div class='ctx'> 	case EPOLL_CTL_ADD:</div><div class='ctx'> 		if (!epi) {</div><div class='ctx'> 			epds-&gt;events |= EPOLLERR | EPOLLHUP;</div><div class='del'>-			error = ep_insert(ep, epds, tf.file, fd, full_check);</div><div class='add'>+			error = ep_insert(ep, epds, fd_file(tf), fd, full_check);</div><div class='ctx'> 		} else</div><div class='ctx'> 			error = -EEXIST;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2249,12 +2371,6 @@ error_tgt_fput:</div><div class='ctx'> 		loop_check_gen++;</div><div class='ctx'> 		mutex_unlock(&amp;epnested_mutex);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	fdput(tf);</div><div class='del'>-error_fput:</div><div class='del'>-	fdput(f);</div><div class='del'>-error_return:</div><div class='del'>-</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2275,50 +2391,74 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,</div><div class='ctx'> 	return do_epoll_ctl(epfd, op, fd, &amp;epds, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Implement the event wait interface for the eventpoll file. It is the kernel</div><div class='del'>- * part of the user space epoll_wait(2).</div><div class='del'>- */</div><div class='del'>-static int do_epoll_wait(int epfd, struct epoll_event __user *events,</div><div class='del'>-			 int maxevents, struct timespec64 *to)</div><div class='add'>+static int ep_check_params(struct file *file, struct epoll_event __user *evs,</div><div class='add'>+			   int maxevents)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='del'>-	struct fd f;</div><div class='del'>-	struct eventpoll *ep;</div><div class='del'>-</div><div class='ctx'> 	/* The maximum number of event must be greater than zero */</div><div class='ctx'> 	if (maxevents &lt;= 0 || maxevents &gt; EP_MAX_EVENTS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify that the area passed by the user is writeable */</div><div class='del'>-	if (!access_ok(events, maxevents * sizeof(struct epoll_event)))</div><div class='add'>+	if (!access_ok(evs, maxevents * sizeof(struct epoll_event)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	/* Get the "struct file *" for the eventpoll file */</div><div class='del'>-	f = fdget(epfd);</div><div class='del'>-	if (!f.file)</div><div class='del'>-		return -EBADF;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to check that the file structure underneath the fd</div><div class='ctx'> 	 * the user passed to us _is_ an eventpoll file.</div><div class='ctx'> 	 */</div><div class='del'>-	error = -EINVAL;</div><div class='del'>-	if (!is_file_epoll(f.file))</div><div class='del'>-		goto error_fput;</div><div class='add'>+	if (!is_file_epoll(file))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int epoll_sendevents(struct file *file, struct epoll_event __user *events,</div><div class='add'>+		     int maxevents)</div><div class='add'>+{</div><div class='add'>+	struct eventpoll *ep;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ep_check_params(file, events, maxevents);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ep = file-&gt;private_data;</div><div class='add'>+	/*</div><div class='add'>+	 * Racy call, but that's ok - it should get retried based on</div><div class='add'>+	 * poll readiness anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (ep_events_available(ep))</div><div class='add'>+		return ep_try_send_events(ep, events, maxevents);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Implement the event wait interface for the eventpoll file. It is the kernel</div><div class='add'>+ * part of the user space epoll_wait(2).</div><div class='add'>+ */</div><div class='add'>+static int do_epoll_wait(int epfd, struct epoll_event __user *events,</div><div class='add'>+			 int maxevents, struct timespec64 *to)</div><div class='add'>+{</div><div class='add'>+	struct eventpoll *ep;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Get the "struct file *" for the eventpoll file */</div><div class='add'>+	CLASS(fd, f)(epfd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	ret = ep_check_params(fd_file(f), events, maxevents);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * At this point it is safe to assume that the "private_data" contains</div><div class='ctx'> 	 * our own data structure.</div><div class='ctx'> 	 */</div><div class='del'>-	ep = f.file-&gt;private_data;</div><div class='add'>+	ep = fd_file(f)-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Time to fish for events ... */</div><div class='del'>-	error = ep_poll(ep, events, maxevents, to);</div><div class='del'>-</div><div class='del'>-error_fput:</div><div class='del'>-	fdput(f);</div><div class='del'>-	return error;</div><div class='add'>+	return ep_poll(ep, events, maxevents, to);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events,</div><div class='head'>diff --git a/fs/exec.c b/fs/exec.c<br/>index 8cdd5b2dd09c..9d5ebc9d15b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exec.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exec.c</a></div><div class='hunk'>@@ -67,6 +67,7 @@</div><div class='ctx'> #include &lt;linux/time_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/user_events.h&gt;</div><div class='ctx'> #include &lt;linux/rseq.h&gt;</div><div class='add'>+#include &lt;linux/ksm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -77,6 +78,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/sched.h&gt;</div><div class='ctx'> </div><div class='add'>+/* For vma exec functions. */</div><div class='add'>+#include "../mm/internal.h"</div><div class='add'>+</div><div class='ctx'> static int bprm_creds_from_file(struct linux_binprm *bprm);</div><div class='ctx'> </div><div class='ctx'> int suid_dumpable = 0;</div><div class='hunk'>@@ -110,72 +114,13 @@ static inline void put_binfmt(struct linux_binfmt * fmt)</div><div class='ctx'> </div><div class='ctx'> bool path_noexec(const struct path *path)</div><div class='ctx'> {</div><div class='add'>+	/* If it's an anonymous inode make sure that we catch any shenanigans. */</div><div class='add'>+	VFS_WARN_ON_ONCE(IS_ANON_FILE(d_inode(path-&gt;dentry)) &amp;&amp;</div><div class='add'>+			 !(path-&gt;mnt-&gt;mnt_sb-&gt;s_iflags &amp; SB_I_NOEXEC));</div><div class='ctx'> 	return (path-&gt;mnt-&gt;mnt_flags &amp; MNT_NOEXEC) ||</div><div class='ctx'> 	       (path-&gt;mnt-&gt;mnt_sb-&gt;s_iflags &amp; SB_I_NOEXEC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USELIB</div><div class='del'>-/*</div><div class='del'>- * Note that a shared library must be both readable and executable due to</div><div class='del'>- * security reasons.</div><div class='del'>- *</div><div class='del'>- * Also note that we take the address to load from the file itself.</div><div class='del'>- */</div><div class='del'>-SYSCALL_DEFINE1(uselib, const char __user *, library)</div><div class='del'>-{</div><div class='del'>-	struct linux_binfmt *fmt;</div><div class='del'>-	struct file *file;</div><div class='del'>-	struct filename *tmp = getname(library);</div><div class='del'>-	int error = PTR_ERR(tmp);</div><div class='del'>-	static const struct open_flags uselib_flags = {</div><div class='del'>-		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,</div><div class='del'>-		.acc_mode = MAY_READ | MAY_EXEC,</div><div class='del'>-		.intent = LOOKUP_OPEN,</div><div class='del'>-		.lookup_flags = LOOKUP_FOLLOW,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(tmp))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	file = do_filp_open(AT_FDCWD, tmp, &amp;uselib_flags);</div><div class='del'>-	putname(tmp);</div><div class='del'>-	error = PTR_ERR(file);</div><div class='del'>-	if (IS_ERR(file))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * may_open() has already checked for this, so it should be</div><div class='del'>-	 * impossible to trip now. But we need to be extra cautious</div><div class='del'>-	 * and check again at the very end too.</div><div class='del'>-	 */</div><div class='del'>-	error = -EACCES;</div><div class='del'>-	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)-&gt;i_mode) ||</div><div class='del'>-			 path_noexec(&amp;file-&gt;f_path)))</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	error = -ENOEXEC;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;binfmt_lock);</div><div class='del'>-	list_for_each_entry(fmt, &amp;formats, lh) {</div><div class='del'>-		if (!fmt-&gt;load_shlib)</div><div class='del'>-			continue;</div><div class='del'>-		if (!try_module_get(fmt-&gt;module))</div><div class='del'>-			continue;</div><div class='del'>-		read_unlock(&amp;binfmt_lock);</div><div class='del'>-		error = fmt-&gt;load_shlib(file);</div><div class='del'>-		read_lock(&amp;binfmt_lock);</div><div class='del'>-		put_binfmt(fmt);</div><div class='del'>-		if (error != -ENOEXEC)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;binfmt_lock);</div><div class='del'>-exit:</div><div class='del'>-	fput(file);</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-#endif /* #ifdef CONFIG_USELIB */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> /*</div><div class='ctx'>  * The nascent bprm-&gt;mm is not visible until exec_mmap() but it can</div><div class='hunk'>@@ -206,18 +151,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Avoid relying on expanding the stack down in GUP (which</div><div class='ctx'> 	 * does not work for STACK_GROWSUP anyway), and just do it</div><div class='del'>-	 * by hand ahead of time.</div><div class='add'>+	 * ahead of time.</div><div class='ctx'> 	 */</div><div class='del'>-	if (write &amp;&amp; pos &lt; vma-&gt;vm_start) {</div><div class='del'>-		mmap_write_lock(mm);</div><div class='del'>-		ret = expand_downwards(vma, pos);</div><div class='del'>-		if (unlikely(ret &lt; 0)) {</div><div class='del'>-			mmap_write_unlock(mm);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		mmap_write_downgrade(mm);</div><div class='del'>-	} else</div><div class='del'>-		mmap_read_lock(mm);</div><div class='add'>+	if (!mmap_read_lock_maybe_expand(mm, vma, pos, write))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are doing an exec().  'current' is the process</div><div class='hunk'>@@ -251,50 +188,6 @@ static void flush_arg_page(struct linux_binprm *bprm, unsigned long pos,</div><div class='ctx'> 	flush_cache_page(bprm-&gt;vma, pos, page_to_pfn(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __bprm_mm_init(struct linux_binprm *bprm)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct vm_area_struct *vma = NULL;</div><div class='del'>-	struct mm_struct *mm = bprm-&gt;mm;</div><div class='del'>-</div><div class='del'>-	bprm-&gt;vma = vma = vm_area_alloc(mm);</div><div class='del'>-	if (!vma)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	vma_set_anonymous(vma);</div><div class='del'>-</div><div class='del'>-	if (mmap_write_lock_killable(mm)) {</div><div class='del'>-		err = -EINTR;</div><div class='del'>-		goto err_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Place the stack at the largest stack address the architecture</div><div class='del'>-	 * supports. Later, we'll move this to an appropriate place. We don't</div><div class='del'>-	 * use STACK_TOP because that can depend on attributes which aren't</div><div class='del'>-	 * configured yet.</div><div class='del'>-	 */</div><div class='del'>-	BUILD_BUG_ON(VM_STACK_FLAGS &amp; VM_STACK_INCOMPLETE_SETUP);</div><div class='del'>-	vma-&gt;vm_end = STACK_TOP_MAX;</div><div class='del'>-	vma-&gt;vm_start = vma-&gt;vm_end - PAGE_SIZE;</div><div class='del'>-	vm_flags_init(vma, VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP);</div><div class='del'>-	vma-&gt;vm_page_prot = vm_get_page_prot(vma-&gt;vm_flags);</div><div class='del'>-</div><div class='del'>-	err = insert_vm_struct(mm, vma);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	mm-&gt;stack_vm = mm-&gt;total_vm = 1;</div><div class='del'>-	mmap_write_unlock(mm);</div><div class='del'>-	bprm-&gt;p = vma-&gt;vm_end - sizeof(void *);</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	mmap_write_unlock(mm);</div><div class='del'>-err_free:</div><div class='del'>-	bprm-&gt;vma = NULL;</div><div class='del'>-	vm_area_free(vma);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool valid_arg_len(struct linux_binprm *bprm, long len)</div><div class='ctx'> {</div><div class='ctx'> 	return len &lt;= MAX_ARG_STRLEN;</div><div class='hunk'>@@ -347,12 +240,6 @@ static void flush_arg_page(struct linux_binprm *bprm, unsigned long pos,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __bprm_mm_init(struct linux_binprm *bprm)</div><div class='del'>-{</div><div class='del'>-	bprm-&gt;p = PAGE_SIZE * MAX_ARG_PAGES - sizeof(void *);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool valid_arg_len(struct linux_binprm *bprm, long len)</div><div class='ctx'> {</div><div class='ctx'> 	return len &lt;= bprm-&gt;p;</div><div class='hunk'>@@ -381,9 +268,13 @@ static int bprm_mm_init(struct linux_binprm *bprm)</div><div class='ctx'> 	bprm-&gt;rlim_stack = current-&gt;signal-&gt;rlim[RLIMIT_STACK];</div><div class='ctx'> 	task_unlock(current-&gt;group_leader);</div><div class='ctx'> </div><div class='del'>-	err = __bprm_mm_init(bprm);</div><div class='add'>+#ifndef CONFIG_MMU</div><div class='add'>+	bprm-&gt;p = PAGE_SIZE * MAX_ARG_PAGES - sizeof(void *);</div><div class='add'>+#else</div><div class='add'>+	err = create_init_stack_vma(bprm-&gt;mm, &amp;bprm-&gt;vma, &amp;bprm-&gt;p);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -475,6 +366,35 @@ static int count_strings_kernel(const char *const *argv)</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int bprm_set_stack_limit(struct linux_binprm *bprm,</div><div class='add'>+				       unsigned long limit)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	/* Avoid a pathological bprm-&gt;p. */</div><div class='add'>+	if (bprm-&gt;p &lt; limit)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	bprm-&gt;argmin = bprm-&gt;p - limit;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline bool bprm_hit_stack_limit(struct linux_binprm *bprm)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	return bprm-&gt;p &lt; bprm-&gt;argmin;</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate bprm-&gt;argmin from:</div><div class='add'>+ * - _STK_LIM</div><div class='add'>+ * - ARG_MAX</div><div class='add'>+ * - bprm-&gt;rlim_stack.rlim_cur</div><div class='add'>+ * - bprm-&gt;argc</div><div class='add'>+ * - bprm-&gt;envc</div><div class='add'>+ * - bprm-&gt;p</div><div class='add'>+ */</div><div class='ctx'> static int bprm_stack_limits(struct linux_binprm *bprm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long limit, ptr_size;</div><div class='hunk'>@@ -494,6 +414,9 @@ static int bprm_stack_limits(struct linux_binprm *bprm)</div><div class='ctx'> 	 * of argument strings even with small stacks</div><div class='ctx'> 	 */</div><div class='ctx'> 	limit = max_t(unsigned long, limit, ARG_MAX);</div><div class='add'>+	/* Reject totally pathological counts. */</div><div class='add'>+	if (bprm-&gt;argc &lt; 0 || bprm-&gt;envc &lt; 0)</div><div class='add'>+		return -E2BIG;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must account for the size of all the argv and envp pointers to</div><div class='ctx'> 	 * the argv and envp strings, since they will also take up space in</div><div class='hunk'>@@ -507,13 +430,14 @@ static int bprm_stack_limits(struct linux_binprm *bprm)</div><div class='ctx'> 	 * argc can never be 0, to keep them from walking envp by accident.</div><div class='ctx'> 	 * See do_execveat_common().</div><div class='ctx'> 	 */</div><div class='del'>-	ptr_size = (max(bprm-&gt;argc, 1) + bprm-&gt;envc) * sizeof(void *);</div><div class='add'>+	if (check_add_overflow(max(bprm-&gt;argc, 1), bprm-&gt;envc, &amp;ptr_size) ||</div><div class='add'>+	    check_mul_overflow(ptr_size, sizeof(void *), &amp;ptr_size))</div><div class='add'>+		return -E2BIG;</div><div class='ctx'> 	if (limit &lt;= ptr_size)</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> 	limit -= ptr_size;</div><div class='ctx'> </div><div class='del'>-	bprm-&gt;argmin = bprm-&gt;p - limit;</div><div class='del'>-	return 0;</div><div class='add'>+	return bprm_set_stack_limit(bprm, limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -551,10 +475,8 @@ static int copy_strings(int argc, struct user_arg_ptr argv,</div><div class='ctx'> 		pos = bprm-&gt;p;</div><div class='ctx'> 		str += len;</div><div class='ctx'> 		bprm-&gt;p -= len;</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-		if (bprm-&gt;p &lt; bprm-&gt;argmin)</div><div class='add'>+		if (bprm_hit_stack_limit(bprm))</div><div class='ctx'> 			goto out;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 		while (len &gt; 0) {</div><div class='ctx'> 			int offset, bytes_to_copy;</div><div class='hunk'>@@ -629,7 +551,7 @@ int copy_string_kernel(const char *arg, struct linux_binprm *bprm)</div><div class='ctx'> 	/* We're going to work our way backwards. */</div><div class='ctx'> 	arg += len;</div><div class='ctx'> 	bprm-&gt;p -= len;</div><div class='del'>-	if (IS_ENABLED(CONFIG_MMU) &amp;&amp; bprm-&gt;p &lt; bprm-&gt;argmin)</div><div class='add'>+	if (bprm_hit_stack_limit(bprm))</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='hunk'>@@ -670,80 +592,6 @@ static int copy_strings_kernel(int argc, const char *const *argv,</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * During bprm_mm_init(), we create a temporary stack at STACK_TOP_MAX.  Once</div><div class='del'>- * the binfmt code determines where the new stack should reside, we shift it to</div><div class='del'>- * its final location.  The process proceeds as follows:</div><div class='del'>- *</div><div class='del'>- * 1) Use shift to calculate the new vma endpoints.</div><div class='del'>- * 2) Extend vma to cover both the old and new ranges.  This ensures the</div><div class='del'>- *    arguments passed to subsequent functions are consistent.</div><div class='del'>- * 3) Move vma's page tables to the new range.</div><div class='del'>- * 4) Free up any cleared pgd range.</div><div class='del'>- * 5) Shrink the vma to cover only the new range.</div><div class='del'>- */</div><div class='del'>-static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)</div><div class='del'>-{</div><div class='del'>-	struct mm_struct *mm = vma-&gt;vm_mm;</div><div class='del'>-	unsigned long old_start = vma-&gt;vm_start;</div><div class='del'>-	unsigned long old_end = vma-&gt;vm_end;</div><div class='del'>-	unsigned long length = old_end - old_start;</div><div class='del'>-	unsigned long new_start = old_start - shift;</div><div class='del'>-	unsigned long new_end = old_end - shift;</div><div class='del'>-	VMA_ITERATOR(vmi, mm, new_start);</div><div class='del'>-	struct vm_area_struct *next;</div><div class='del'>-	struct mmu_gather tlb;</div><div class='del'>-</div><div class='del'>-	BUG_ON(new_start &gt; new_end);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ensure there are no vmas between where we want to go</div><div class='del'>-	 * and where we are</div><div class='del'>-	 */</div><div class='del'>-	if (vma != vma_next(&amp;vmi))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	vma_iter_prev_range(&amp;vmi);</div><div class='del'>-	/*</div><div class='del'>-	 * cover the whole range: [new_start, old_end)</div><div class='del'>-	 */</div><div class='del'>-	if (vma_expand(&amp;vmi, vma, new_start, old_end, vma-&gt;vm_pgoff, NULL))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * move the page tables downwards, on failure we rely on</div><div class='del'>-	 * process cleanup to remove whatever mess we made.</div><div class='del'>-	 */</div><div class='del'>-	if (length != move_page_tables(vma, old_start,</div><div class='del'>-				       vma, new_start, length, false, true))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	lru_add_drain();</div><div class='del'>-	tlb_gather_mmu(&amp;tlb, mm);</div><div class='del'>-	next = vma_next(&amp;vmi);</div><div class='del'>-	if (new_end &gt; old_start) {</div><div class='del'>-		/*</div><div class='del'>-		 * when the old and new regions overlap clear from new_end.</div><div class='del'>-		 */</div><div class='del'>-		free_pgd_range(&amp;tlb, new_end, old_end, new_end,</div><div class='del'>-			next ? next-&gt;vm_start : USER_PGTABLES_CEILING);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * otherwise, clean from old_start; this is done to not touch</div><div class='del'>-		 * the address space in [new_end, old_start) some architectures</div><div class='del'>-		 * have constraints on va-space that make this illegal (IA64) -</div><div class='del'>-		 * for the others its just a little faster.</div><div class='del'>-		 */</div><div class='del'>-		free_pgd_range(&amp;tlb, old_start, old_end, new_end,</div><div class='del'>-			next ? next-&gt;vm_start : USER_PGTABLES_CEILING);</div><div class='del'>-	}</div><div class='del'>-	tlb_finish_mmu(&amp;tlb);</div><div class='del'>-</div><div class='del'>-	vma_prev(&amp;vmi);</div><div class='del'>-	/* Shrink the vma to just the new range */</div><div class='del'>-	return vma_shrink(&amp;vmi, vma, new_start, new_end, vma-&gt;vm_pgoff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Finalizes the stack vm_area_struct. The flags and permissions are updated,</div><div class='ctx'>  * the stack is optionally relocated, and some extra space is added.</div><div class='ctx'>  */</div><div class='hunk'>@@ -751,12 +599,12 @@ int setup_arg_pages(struct linux_binprm *bprm,</div><div class='ctx'> 		    unsigned long stack_top,</div><div class='ctx'> 		    int executable_stack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ret;</div><div class='add'>+	int ret;</div><div class='ctx'> 	unsigned long stack_shift;</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='ctx'> 	struct vm_area_struct *vma = bprm-&gt;vma;</div><div class='ctx'> 	struct vm_area_struct *prev = NULL;</div><div class='del'>-	unsigned long vm_flags;</div><div class='add'>+	vm_flags_t vm_flags;</div><div class='ctx'> 	unsigned long stack_base;</div><div class='ctx'> 	unsigned long stack_size;</div><div class='ctx'> 	unsigned long stack_expand;</div><div class='hunk'>@@ -771,7 +619,8 @@ int setup_arg_pages(struct linux_binprm *bprm,</div><div class='ctx'> 	stack_base = calc_max_stack_size(stack_base);</div><div class='ctx'> </div><div class='ctx'> 	/* Add space for stack randomization. */</div><div class='del'>-	stack_base += (STACK_RND_MASK &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	if (current-&gt;flags &amp; PF_RANDOMIZE)</div><div class='add'>+		stack_base += (STACK_RND_MASK &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we didn't let the argument array grow too large. */</div><div class='ctx'> 	if (vma-&gt;vm_end - vma-&gt;vm_start &gt; stack_base)</div><div class='hunk'>@@ -796,8 +645,6 @@ int setup_arg_pages(struct linux_binprm *bprm,</div><div class='ctx'> 	mm-&gt;arg_start = bprm-&gt;p;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (bprm-&gt;loader)</div><div class='del'>-		bprm-&gt;loader -= stack_shift;</div><div class='ctx'> 	bprm-&gt;exec -= stack_shift;</div><div class='ctx'> </div><div class='ctx'> 	if (mmap_write_lock_killable(mm))</div><div class='hunk'>@@ -835,7 +682,12 @@ int setup_arg_pages(struct linux_binprm *bprm,</div><div class='ctx'> </div><div class='ctx'> 	/* Move stack pages down in memory. */</div><div class='ctx'> 	if (stack_shift) {</div><div class='del'>-		ret = shift_arg_pages(vma, stack_shift);</div><div class='add'>+		/*</div><div class='add'>+		 * During bprm_mm_init(), we create a temporary stack at STACK_TOP_MAX.  Once</div><div class='add'>+		 * the binfmt code determines where the new stack should reside, we shift it to</div><div class='add'>+		 * its final location.</div><div class='add'>+		 */</div><div class='add'>+		ret = relocate_vma_down(vma, stack_shift);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -895,6 +747,7 @@ int transfer_args_to_stack(struct linux_binprm *bprm,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bprm-&gt;exec += *sp_location - MAX_ARG_PAGES * PAGE_SIZE;</div><div class='ctx'> 	*sp_location = sp;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -904,10 +757,14 @@ EXPORT_SYMBOL(transfer_args_to_stack);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * On success, caller must call do_close_execat() on the returned</div><div class='add'>+ * struct file to close it.</div><div class='add'>+ */</div><div class='ctx'> static struct file *do_open_execat(int fd, struct filename *name, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct file *file;</div><div class='ctx'> 	int err;</div><div class='add'>+	struct file *file __free(fput) = NULL;</div><div class='ctx'> 	struct open_flags open_exec_flags = {</div><div class='ctx'> 		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,</div><div class='ctx'> 		.acc_mode = MAY_EXEC,</div><div class='hunk'>@@ -915,7 +772,8 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)</div><div class='ctx'> 		.lookup_flags = LOOKUP_FOLLOW,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((flags &amp; ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH)) != 0)</div><div class='add'>+	if ((flags &amp;</div><div class='add'>+	     ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_EXECVE_CHECK)) != 0)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	if (flags &amp; AT_SYMLINK_NOFOLLOW)</div><div class='ctx'> 		open_exec_flags.lookup_flags &amp;= ~LOOKUP_FOLLOW;</div><div class='hunk'>@@ -924,30 +782,37 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)</div><div class='ctx'> </div><div class='ctx'> 	file = do_filp_open(fd, name, &amp;open_exec_flags);</div><div class='ctx'> 	if (IS_ERR(file))</div><div class='del'>-		goto out;</div><div class='add'>+		return file;</div><div class='add'>+</div><div class='add'>+	if (path_noexec(&amp;file-&gt;f_path))</div><div class='add'>+		return ERR_PTR(-EACCES);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * may_open() has already checked for this, so it should be</div><div class='del'>-	 * impossible to trip now. But we need to be extra cautious</div><div class='del'>-	 * and check again at the very end too.</div><div class='add'>+	 * In the past the regular type check was here. It moved to may_open() in</div><div class='add'>+	 * 633fb6ac3980 ("exec: move S_ISREG() check earlier"). Since then it is</div><div class='add'>+	 * an invariant that all non-regular files error out before we get here.</div><div class='ctx'> 	 */</div><div class='del'>-	err = -EACCES;</div><div class='del'>-	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)-&gt;i_mode) ||</div><div class='del'>-			 path_noexec(&amp;file-&gt;f_path)))</div><div class='del'>-		goto exit;</div><div class='add'>+	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)-&gt;i_mode)))</div><div class='add'>+		return ERR_PTR(-EACCES);</div><div class='ctx'> </div><div class='del'>-	err = deny_write_access(file);</div><div class='add'>+	err = exe_file_deny_write_access(file);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto exit;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return file;</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	fput(file);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+	return no_free_ptr(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * open_exec - Open a path name for execution</div><div class='add'>+ *</div><div class='add'>+ * @name: path name to open with the intent of executing it.</div><div class='add'>+ *</div><div class='add'>+ * Returns ERR_PTR on failure or allocated struct file on success.</div><div class='add'>+ *</div><div class='add'>+ * As this is a wrapper for the internal do_open_execat(), callers</div><div class='add'>+ * must call exe_file_allow_write_access() before fput() on release. Also see</div><div class='add'>+ * do_close_execat().</div><div class='add'>+ */</div><div class='ctx'> struct file *open_exec(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *filename = getname_kernel(name);</div><div class='hunk'>@@ -1012,7 +877,7 @@ static int exec_mmap(struct mm_struct *mm)</div><div class='ctx'> 	active_mm = tsk-&gt;active_mm;</div><div class='ctx'> 	tsk-&gt;active_mm = mm;</div><div class='ctx'> 	tsk-&gt;mm = mm;</div><div class='del'>-	mm_init_cid(mm);</div><div class='add'>+	mm_init_cid(mm, tsk);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This prevents preemption while active_mm is being loaded and</div><div class='ctx'> 	 * it and mm are being updated, which could cause problems for</div><div class='hunk'>@@ -1143,7 +1008,6 @@ static int de_thread(struct task_struct *tsk)</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(leader-&gt;exit_state != EXIT_ZOMBIE);</div><div class='ctx'> 		leader-&gt;exit_state = EXIT_DEAD;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We are going to release_task()-&gt;ptrace_unlink() silently,</div><div class='ctx'> 		 * the tracer can sleep in do_wait(). EXIT_DEAD guarantees</div><div class='hunk'>@@ -1212,27 +1076,17 @@ static int unshare_sighand(struct task_struct *me)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-char *__get_task_comm(char *buf, size_t buf_size, struct task_struct *tsk)</div><div class='del'>-{</div><div class='del'>-	task_lock(tsk);</div><div class='del'>-	/* Always NUL terminated and zero-padded */</div><div class='del'>-	strscpy_pad(buf, tsk-&gt;comm, buf_size);</div><div class='del'>-	task_unlock(tsk);</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(__get_task_comm);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * These functions flushes out all traces of the currently running executable</div><div class='del'>- * so that a new one can be started</div><div class='add'>+ * This is unlocked -- the string will always be NUL-terminated, but</div><div class='add'>+ * may show overlapping contents if racing concurrent reads.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> void __set_task_comm(struct task_struct *tsk, const char *buf, bool exec)</div><div class='ctx'> {</div><div class='del'>-	task_lock(tsk);</div><div class='add'>+	size_t len = min(strlen(buf), sizeof(tsk-&gt;comm) - 1);</div><div class='add'>+</div><div class='ctx'> 	trace_task_rename(tsk, buf);</div><div class='del'>-	strscpy_pad(tsk-&gt;comm, buf, sizeof(tsk-&gt;comm));</div><div class='del'>-	task_unlock(tsk);</div><div class='add'>+	memcpy(tsk-&gt;comm, buf, len);</div><div class='add'>+	memset(&amp;tsk-&gt;comm[len], 0, sizeof(tsk-&gt;comm) - len);</div><div class='ctx'> 	perf_event_comm(tsk, exec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1253,17 +1107,24 @@ int begin_new_exec(struct linux_binprm * bprm)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Ensure all future errors are fatal.</div><div class='add'>+	 * This tracepoint marks the point before flushing the old exec where</div><div class='add'>+	 * the current task is still unchanged, but errors are fatal (point of</div><div class='add'>+	 * no return). The later "sched_process_exec" tracepoint is called after</div><div class='add'>+	 * the current task has successfully switched to the new exec.</div><div class='ctx'> 	 */</div><div class='del'>-	bprm-&gt;point_of_no_return = true;</div><div class='add'>+	trace_sched_prepare_exec(current, bprm);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Make this the only thread in the thread group.</div><div class='add'>+	 * Ensure all future errors are fatal.</div><div class='ctx'> 	 */</div><div class='add'>+	bprm-&gt;point_of_no_return = true;</div><div class='add'>+</div><div class='add'>+	/* Make this the only thread in the thread group */</div><div class='ctx'> 	retval = de_thread(me);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='del'>-</div><div class='add'>+	/* see the comment in check_unsafe_exec() */</div><div class='add'>+	current-&gt;fs-&gt;in_exec = 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Cancel any io_uring activity across execve</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1362,7 +1223,28 @@ int begin_new_exec(struct linux_binprm * bprm)</div><div class='ctx'> 		set_dumpable(current-&gt;mm, SUID_DUMP_USER);</div><div class='ctx'> </div><div class='ctx'> 	perf_event_exec();</div><div class='del'>-	__set_task_comm(me, kbasename(bprm-&gt;filename), true);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the original filename was empty, alloc_bprm() made up a path</div><div class='add'>+	 * that will probably not be useful to admins running ps or similar.</div><div class='add'>+	 * Let's fix it up to be something reasonable.</div><div class='add'>+	 */</div><div class='add'>+	if (bprm-&gt;comm_from_dentry) {</div><div class='add'>+		/*</div><div class='add'>+		 * Hold RCU lock to keep the name from being freed behind our back.</div><div class='add'>+		 * Use acquire semantics to make sure the terminating NUL from</div><div class='add'>+		 * __d_alloc() is seen.</div><div class='add'>+		 *</div><div class='add'>+		 * Note, we're deliberately sloppy here. We don't need to care about</div><div class='add'>+		 * detecting a concurrent rename and just want a terminated name.</div><div class='add'>+		 */</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		__set_task_comm(me, smp_load_acquire(&amp;bprm-&gt;file-&gt;f_path.dentry-&gt;d_name.name),</div><div class='add'>+				true);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		__set_task_comm(me, kbasename(bprm-&gt;filename), true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* An exec changes our domain. We are no longer part of the thread</div><div class='ctx'> 	   group */</div><div class='hunk'>@@ -1398,10 +1280,9 @@ int begin_new_exec(struct linux_binprm * bprm)</div><div class='ctx'> </div><div class='ctx'> 	/* Pass the opened binary to the interpreter. */</div><div class='ctx'> 	if (bprm-&gt;have_execfd) {</div><div class='del'>-		retval = get_unused_fd_flags(0);</div><div class='add'>+		retval = FD_ADD(0, bprm-&gt;executable);</div><div class='ctx'> 		if (retval &lt; 0)</div><div class='ctx'> 			goto out_unlock;</div><div class='del'>-		fd_install(retval, bprm-&gt;executable);</div><div class='ctx'> 		bprm-&gt;executable = NULL;</div><div class='ctx'> 		bprm-&gt;execfd = retval;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1409,6 +1290,9 @@ int begin_new_exec(struct linux_binprm * bprm)</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	up_write(&amp;me-&gt;signal-&gt;exec_update_lock);</div><div class='add'>+	if (!bprm-&gt;cred)</div><div class='add'>+		mutex_unlock(&amp;me-&gt;signal-&gt;cred_guard_mutex);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -1484,6 +1368,15 @@ static int prepare_bprm_creds(struct linux_binprm *bprm)</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Matches do_open_execat() */</div><div class='add'>+static void do_close_execat(struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (!file)</div><div class='add'>+		return;</div><div class='add'>+	exe_file_allow_write_access(file);</div><div class='add'>+	fput(file);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void free_bprm(struct linux_binprm *bprm)</div><div class='ctx'> {</div><div class='ctx'> 	if (bprm-&gt;mm) {</div><div class='hunk'>@@ -1492,13 +1385,12 @@ static void free_bprm(struct linux_binprm *bprm)</div><div class='ctx'> 	}</div><div class='ctx'> 	free_arg_pages(bprm);</div><div class='ctx'> 	if (bprm-&gt;cred) {</div><div class='add'>+		/* in case exec fails before de_thread() succeeds */</div><div class='add'>+		current-&gt;fs-&gt;in_exec = 0;</div><div class='ctx'> 		mutex_unlock(&amp;current-&gt;signal-&gt;cred_guard_mutex);</div><div class='ctx'> 		abort_creds(bprm-&gt;cred);</div><div class='ctx'> 	}</div><div class='del'>-	if (bprm-&gt;file) {</div><div class='del'>-		allow_write_access(bprm-&gt;file);</div><div class='del'>-		fput(bprm-&gt;file);</div><div class='del'>-	}</div><div class='add'>+	do_close_execat(bprm-&gt;file);</div><div class='ctx'> 	if (bprm-&gt;executable)</div><div class='ctx'> 		fput(bprm-&gt;executable);</div><div class='ctx'> 	/* If a binfmt changed the interp, free it. */</div><div class='hunk'>@@ -1520,8 +1412,7 @@ static struct linux_binprm *alloc_bprm(int fd, struct filename *filename, int fl</div><div class='ctx'> </div><div class='ctx'> 	bprm = kzalloc(sizeof(*bprm), GFP_KERNEL);</div><div class='ctx'> 	if (!bprm) {</div><div class='del'>-		allow_write_access(file);</div><div class='del'>-		fput(file);</div><div class='add'>+		do_close_execat(file);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1530,11 +1421,13 @@ static struct linux_binprm *alloc_bprm(int fd, struct filename *filename, int fl</div><div class='ctx'> 	if (fd == AT_FDCWD || filename-&gt;name[0] == '/') {</div><div class='ctx'> 		bprm-&gt;filename = filename-&gt;name;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (filename-&gt;name[0] == '\0')</div><div class='add'>+		if (filename-&gt;name[0] == '\0') {</div><div class='ctx'> 			bprm-&gt;fdpath = kasprintf(GFP_KERNEL, "/dev/fd/%d", fd);</div><div class='del'>-		else</div><div class='add'>+			bprm-&gt;comm_from_dentry = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			bprm-&gt;fdpath = kasprintf(GFP_KERNEL, "/dev/fd/%d/%s",</div><div class='ctx'> 						  fd, filename-&gt;name);</div><div class='add'>+		}</div><div class='ctx'> 		if (!bprm-&gt;fdpath)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> </div><div class='hunk'>@@ -1554,6 +1447,21 @@ static struct linux_binprm *alloc_bprm(int fd, struct filename *filename, int fl</div><div class='ctx'> 	}</div><div class='ctx'> 	bprm-&gt;interp = bprm-&gt;filename;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * At this point, security_file_open() has already been called (with</div><div class='add'>+	 * __FMODE_EXEC) and access control checks for AT_EXECVE_CHECK will</div><div class='add'>+	 * stop just after the security_bprm_creds_for_exec() call in</div><div class='add'>+	 * bprm_execve().  Indeed, the kernel should not try to parse the</div><div class='add'>+	 * content of the file with exec_binprm() nor change the calling</div><div class='add'>+	 * thread, which means that the following security functions will not</div><div class='add'>+	 * be called:</div><div class='add'>+	 * - security_bprm_check()</div><div class='add'>+	 * - security_bprm_creds_from_file()</div><div class='add'>+	 * - security_bprm_committing_creds()</div><div class='add'>+	 * - security_bprm_committed_creds()</div><div class='add'>+	 */</div><div class='add'>+	bprm-&gt;is_check = !!(flags &amp; AT_EXECVE_CHECK);</div><div class='add'>+</div><div class='ctx'> 	retval = bprm_mm_init(bprm);</div><div class='ctx'> 	if (!retval)</div><div class='ctx'> 		return bprm;</div><div class='hunk'>@@ -1600,9 +1508,13 @@ static void check_unsafe_exec(struct linux_binprm *bprm)</div><div class='ctx'> 	 * suid exec because the differently privileged task</div><div class='ctx'> 	 * will be able to manipulate the current directory, etc.</div><div class='ctx'> 	 * It would be nice to force an unshare instead...</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise we set fs-&gt;in_exec = 1 to deny clone(CLONE_FS)</div><div class='add'>+	 * from another sub-thread until de_thread() succeeds, this</div><div class='add'>+	 * state is protected by cred_guard_mutex we hold.</div><div class='ctx'> 	 */</div><div class='ctx'> 	n_fs = 1;</div><div class='del'>-	spin_lock(&amp;p-&gt;fs-&gt;lock);</div><div class='add'>+	read_seqlock_excl(&amp;p-&gt;fs-&gt;seq);</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	for_other_threads(p, t) {</div><div class='ctx'> 		if (t-&gt;fs == p-&gt;fs)</div><div class='hunk'>@@ -1610,11 +1522,12 @@ static void check_unsafe_exec(struct linux_binprm *bprm)</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='add'>+	/* "users" and "in_exec" locked for copy_fs() */</div><div class='ctx'> 	if (p-&gt;fs-&gt;users &gt; n_fs)</div><div class='ctx'> 		bprm-&gt;unsafe |= LSM_UNSAFE_SHARE;</div><div class='ctx'> 	else</div><div class='ctx'> 		p-&gt;fs-&gt;in_exec = 1;</div><div class='del'>-	spin_unlock(&amp;p-&gt;fs-&gt;lock);</div><div class='add'>+	read_sequnlock_excl(&amp;p-&gt;fs-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bprm_fill_uid(struct linux_binprm *bprm, struct file *file)</div><div class='hunk'>@@ -1625,6 +1538,7 @@ static void bprm_fill_uid(struct linux_binprm *bprm, struct file *file)</div><div class='ctx'> 	unsigned int mode;</div><div class='ctx'> 	vfsuid_t vfsuid;</div><div class='ctx'> 	vfsgid_t vfsgid;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!mnt_may_suid(file-&gt;f_path.mnt))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1641,12 +1555,17 @@ static void bprm_fill_uid(struct linux_binprm *bprm, struct file *file)</div><div class='ctx'> 	/* Be careful if suid/sgid is set */</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='del'>-	/* reload atomically mode/uid/gid now that lock held */</div><div class='add'>+	/* Atomically reload and check mode/uid/gid now that lock held. */</div><div class='ctx'> 	mode = inode-&gt;i_mode;</div><div class='ctx'> 	vfsuid = i_uid_into_vfsuid(idmap, inode);</div><div class='ctx'> 	vfsgid = i_gid_into_vfsgid(idmap, inode);</div><div class='add'>+	err = inode_permission(idmap, inode, MAY_EXEC);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='add'>+	/* Did the exec bit vanish out from under us? Give up. */</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* We ignore suid/sgid if there are no mappings for them in the ns */</div><div class='ctx'> 	if (!vfsuid_has_mapping(bprm-&gt;cred-&gt;user_ns, vfsuid) ||</div><div class='ctx'> 	    !vfsgid_has_mapping(bprm-&gt;cred-&gt;user_ns, vfsgid))</div><div class='hunk'>@@ -1696,7 +1615,6 @@ static int prepare_binprm(struct linux_binprm *bprm)</div><div class='ctx'>  */</div><div class='ctx'> int remove_arg_zero(struct linux_binprm *bprm)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> 	struct page *page;</div><div class='hunk'>@@ -1707,10 +1625,8 @@ int remove_arg_zero(struct linux_binprm *bprm)</div><div class='ctx'> 	do {</div><div class='ctx'> 		offset = bprm-&gt;p &amp; ~PAGE_MASK;</div><div class='ctx'> 		page = get_arg_page(bprm, bprm-&gt;p, 0);</div><div class='del'>-		if (!page) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (!page)</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		kaddr = kmap_local_page(page);</div><div class='ctx'> </div><div class='ctx'> 		for (; offset &lt; PAGE_SIZE &amp;&amp; kaddr[offset];</div><div class='hunk'>@@ -1723,20 +1639,16 @@ int remove_arg_zero(struct linux_binprm *bprm)</div><div class='ctx'> </div><div class='ctx'> 	bprm-&gt;p++;</div><div class='ctx'> 	bprm-&gt;argc--;</div><div class='del'>-	ret = 0;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(remove_arg_zero);</div><div class='ctx'> </div><div class='del'>-#define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20&lt;=(c) &amp;&amp; (c)&lt;=0x7e))</div><div class='ctx'> /*</div><div class='ctx'>  * cycle the list of binary formats handler, until one recognizes the image</div><div class='ctx'>  */</div><div class='ctx'> static int search_binary_handler(struct linux_binprm *bprm)</div><div class='ctx'> {</div><div class='del'>-	bool need_retry = IS_ENABLED(CONFIG_MODULES);</div><div class='ctx'> 	struct linux_binfmt *fmt;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='hunk'>@@ -1748,8 +1660,6 @@ static int search_binary_handler(struct linux_binprm *bprm)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	retval = -ENOENT;</div><div class='del'>- retry:</div><div class='ctx'> 	read_lock(&amp;binfmt_lock);</div><div class='ctx'> 	list_for_each_entry(fmt, &amp;formats, lh) {</div><div class='ctx'> 		if (!try_module_get(fmt-&gt;module))</div><div class='hunk'>@@ -1767,17 +1677,7 @@ static int search_binary_handler(struct linux_binprm *bprm)</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;binfmt_lock);</div><div class='ctx'> </div><div class='del'>-	if (need_retry) {</div><div class='del'>-		if (printable(bprm-&gt;buf[0]) &amp;&amp; printable(bprm-&gt;buf[1]) &amp;&amp;</div><div class='del'>-		    printable(bprm-&gt;buf[2]) &amp;&amp; printable(bprm-&gt;buf[3]))</div><div class='del'>-			return retval;</div><div class='del'>-		if (request_module("binfmt-%04x", *(ushort *)(bprm-&gt;buf + 2)) &lt; 0)</div><div class='del'>-			return retval;</div><div class='del'>-		need_retry = false;</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='add'>+	return -ENOEXEC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* binfmt handlers will call back into begin_new_exec() on success. */</div><div class='hunk'>@@ -1808,7 +1708,7 @@ static int exec_binprm(struct linux_binprm *bprm)</div><div class='ctx'> 		bprm-&gt;file = bprm-&gt;interpreter;</div><div class='ctx'> 		bprm-&gt;interpreter = NULL;</div><div class='ctx'> </div><div class='del'>-		allow_write_access(exec);</div><div class='add'>+		exe_file_allow_write_access(exec);</div><div class='ctx'> 		if (unlikely(bprm-&gt;have_execfd)) {</div><div class='ctx'> 			if (bprm-&gt;executable) {</div><div class='ctx'> 				fput(exec);</div><div class='hunk'>@@ -1826,9 +1726,6 @@ static int exec_binprm(struct linux_binprm *bprm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * sys_execve() executes a new program.</div><div class='del'>- */</div><div class='ctx'> static int bprm_execve(struct linux_binprm *bprm)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='hunk'>@@ -1850,7 +1747,7 @@ static int bprm_execve(struct linux_binprm *bprm)</div><div class='ctx'> </div><div class='ctx'> 	/* Set the unchanging part of bprm-&gt;cred */</div><div class='ctx'> 	retval = security_bprm_creds_for_exec(bprm);</div><div class='del'>-	if (retval)</div><div class='add'>+	if (retval || bprm-&gt;is_check)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	retval = exec_binprm(bprm);</div><div class='hunk'>@@ -1858,10 +1755,9 @@ static int bprm_execve(struct linux_binprm *bprm)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	sched_mm_cid_after_execve(current);</div><div class='add'>+	rseq_execve(current);</div><div class='ctx'> 	/* execve succeeded */</div><div class='del'>-	current-&gt;fs-&gt;in_exec = 0;</div><div class='ctx'> 	current-&gt;in_execve = 0;</div><div class='del'>-	rseq_execve(current);</div><div class='ctx'> 	user_events_execve(current);</div><div class='ctx'> 	acct_update_integrals(current);</div><div class='ctx'> 	task_numa_free(current, false);</div><div class='hunk'>@@ -1878,7 +1774,7 @@ out:</div><div class='ctx'> 		force_fatal_sig(SIGSEGV);</div><div class='ctx'> </div><div class='ctx'> 	sched_mm_cid_after_execve(current);</div><div class='del'>-	current-&gt;fs-&gt;in_exec = 0;</div><div class='add'>+	rseq_force_update();</div><div class='ctx'> 	current-&gt;in_execve = 0;</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -1918,9 +1814,6 @@ static int do_execveat_common(int fd, struct filename *filename,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = count(argv, MAX_ARG_STRINGS);</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		pr_warn_once("process '%s' launched '%s' with NULL argv: empty string added\n",</div><div class='del'>-			     current-&gt;comm, bprm-&gt;filename);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	bprm-&gt;argc = retval;</div><div class='hunk'>@@ -1958,6 +1851,9 @@ static int do_execveat_common(int fd, struct filename *filename,</div><div class='ctx'> 		if (retval &lt; 0)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		bprm-&gt;argc = 1;</div><div class='add'>+</div><div class='add'>+		pr_warn_once("process '%s' launched '%s' with NULL argv: empty string added\n",</div><div class='add'>+			     current-&gt;comm, bprm-&gt;filename);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = bprm_execve(bprm);</div><div class='hunk'>@@ -2102,7 +1998,7 @@ void set_dumpable(struct mm_struct *mm, int value)</div><div class='ctx'> 	if (WARN_ON((unsigned)value &gt; SUID_DUMP_ROOT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	set_mask_bits(&amp;mm-&gt;flags, MMF_DUMPABLE_MASK, value);</div><div class='add'>+	__mm_flags_set_mask_dumpable(mm, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE3(execve,</div><div class='hunk'>@@ -2146,17 +2042,17 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> </div><div class='del'>-static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,</div><div class='add'>+static int proc_dointvec_minmax_coredump(const struct ctl_table *table, int write,</div><div class='ctx'> 		void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int error = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> </div><div class='del'>-	if (!error)</div><div class='add'>+	if (!error &amp;&amp; write)</div><div class='ctx'> 		validate_coredump_safety();</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table fs_exec_sysctls[] = {</div><div class='add'>+static const struct ctl_table fs_exec_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "suid_dumpable",</div><div class='ctx'> 		.data		= &amp;suid_dumpable,</div><div class='hunk'>@@ -2176,3 +2072,7 @@ static int __init init_fs_exec_sysctls(void)</div><div class='ctx'> </div><div class='ctx'> fs_initcall(init_fs_exec_sysctls);</div><div class='ctx'> #endif /* CONFIG_SYSCTL */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EXEC_KUNIT_TEST</div><div class='add'>+#include "tests/exec_kunit.c"</div><div class='add'>+#endif</div><div class='head'>diff --git a/fs/exfat/balloc.c b/fs/exfat/balloc.c<br/>index 0356c88252bd..5429041c7eaf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/balloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/balloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/balloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/balloc.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='add'>+#include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "exfat_raw.h"</div><div class='ctx'> #include "exfat_fs.h"</div><div class='hunk'>@@ -26,13 +27,58 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  Allocation Bitmap Management Functions</div><div class='ctx'>  */</div><div class='add'>+static bool exfat_test_bitmap_range(struct super_block *sb, unsigned int clu,</div><div class='add'>+		unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+	unsigned int start = clu;</div><div class='add'>+	unsigned int end = clu + count;</div><div class='add'>+	unsigned int ent_idx, i, b;</div><div class='add'>+	unsigned int bit_offset, bits_to_check;</div><div class='add'>+	__le_long *bitmap_le;</div><div class='add'>+	unsigned long mask, word;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_cluster(sbi, start) || !is_valid_cluster(sbi, end - 1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	while (start &lt; end) {</div><div class='add'>+		ent_idx = CLUSTER_TO_BITMAP_ENT(start);</div><div class='add'>+		i = BITMAP_OFFSET_SECTOR_INDEX(sb, ent_idx);</div><div class='add'>+		b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);</div><div class='add'>+</div><div class='add'>+		bitmap_le = (__le_long *)sbi-&gt;vol_amap[i]-&gt;b_data;</div><div class='add'>+</div><div class='add'>+		/* Calculate how many bits we can check in the current word */</div><div class='add'>+		bit_offset = b % BITS_PER_LONG;</div><div class='add'>+		bits_to_check = min(end - start,</div><div class='add'>+				    (unsigned int)(BITS_PER_LONG - bit_offset));</div><div class='add'>+</div><div class='add'>+		/* Create a bitmask for the range of bits to check */</div><div class='add'>+		if (bits_to_check &gt;= BITS_PER_LONG)</div><div class='add'>+			mask = ~0UL;</div><div class='add'>+		else</div><div class='add'>+			mask = ((1UL &lt;&lt; bits_to_check) - 1) &lt;&lt; bit_offset;</div><div class='add'>+		word = lel_to_cpu(bitmap_le[b / BITS_PER_LONG]);</div><div class='add'>+</div><div class='add'>+		/* Check if all bits in the mask are set */</div><div class='add'>+		if ((word &amp; mask) != mask)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		start += bits_to_check;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int exfat_allocate_bitmap(struct super_block *sb,</div><div class='ctx'> 		struct exfat_dentry *ep)</div><div class='ctx'> {</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+	struct blk_plug plug;</div><div class='ctx'> 	long long map_size;</div><div class='del'>-	unsigned int i, need_map_size;</div><div class='add'>+	unsigned int i, j, need_map_size;</div><div class='ctx'> 	sector_t sector;</div><div class='add'>+	unsigned int max_ra_count;</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;map_clu = le32_to_cpu(ep-&gt;dentry.bitmap.start_clu);</div><div class='ctx'> 	map_size = le64_to_cpu(ep-&gt;dentry.bitmap.size);</div><div class='hunk'>@@ -56,22 +102,37 @@ static int exfat_allocate_bitmap(struct super_block *sb,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	sector = exfat_cluster_to_sector(sbi, sbi-&gt;map_clu);</div><div class='add'>+	max_ra_count = min(sb-&gt;s_bdi-&gt;ra_pages, sb-&gt;s_bdi-&gt;io_pages) &lt;&lt;</div><div class='add'>+		(PAGE_SHIFT - sb-&gt;s_blocksize_bits);</div><div class='ctx'> 	for (i = 0; i &lt; sbi-&gt;map_sectors; i++) {</div><div class='del'>-		sbi-&gt;vol_amap[i] = sb_bread(sb, sector + i);</div><div class='del'>-		if (!sbi-&gt;vol_amap[i]) {</div><div class='del'>-			/* release all buffers and free vol_amap */</div><div class='del'>-			int j = 0;</div><div class='del'>-</div><div class='del'>-			while (j &lt; i)</div><div class='del'>-				brelse(sbi-&gt;vol_amap[j++]);</div><div class='del'>-</div><div class='del'>-			kvfree(sbi-&gt;vol_amap);</div><div class='del'>-			sbi-&gt;vol_amap = NULL;</div><div class='del'>-			return -EIO;</div><div class='add'>+		/* Trigger the next readahead in advance. */</div><div class='add'>+		if (max_ra_count &amp;&amp; 0 == (i % max_ra_count)) {</div><div class='add'>+			blk_start_plug(&amp;plug);</div><div class='add'>+			for (j = i; j &lt; min(max_ra_count, sbi-&gt;map_sectors - i) + i; j++)</div><div class='add'>+				sb_breadahead(sb, sector + j);</div><div class='add'>+			blk_finish_plug(&amp;plug);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		sbi-&gt;vol_amap[i] = sb_bread(sb, sector + i);</div><div class='add'>+		if (!sbi-&gt;vol_amap[i])</div><div class='add'>+			goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (exfat_test_bitmap_range(sb, sbi-&gt;map_clu,</div><div class='add'>+		EXFAT_B_TO_CLU_ROUND_UP(map_size, sbi)) == false)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	j = 0;</div><div class='add'>+	/* release all buffers and free vol_amap */</div><div class='add'>+	while (j &lt; i)</div><div class='add'>+		brelse(sbi-&gt;vol_amap[j++]);</div><div class='add'>+</div><div class='add'>+	kvfree(sbi-&gt;vol_amap);</div><div class='add'>+	sbi-&gt;vol_amap = NULL;</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int exfat_load_bitmap(struct super_block *sb)</div><div class='hunk'>@@ -91,11 +152,8 @@ int exfat_load_bitmap(struct super_block *sb)</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> </div><div class='ctx'> 			type = exfat_get_entry_type(ep);</div><div class='del'>-			if (type == TYPE_UNUSED)</div><div class='del'>-				break;</div><div class='del'>-			if (type != TYPE_BITMAP)</div><div class='del'>-				continue;</div><div class='del'>-			if (ep-&gt;dentry.bitmap.flags == 0x0) {</div><div class='add'>+			if (type == TYPE_BITMAP &amp;&amp;</div><div class='add'>+			    ep-&gt;dentry.bitmap.flags == 0x0) {</div><div class='ctx'> 				int err;</div><div class='ctx'> </div><div class='ctx'> 				err = exfat_allocate_bitmap(sb, ep);</div><div class='hunk'>@@ -103,6 +161,9 @@ int exfat_load_bitmap(struct super_block *sb)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 			brelse(bh);</div><div class='add'>+</div><div class='add'>+			if (type == TYPE_UNUSED)</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (exfat_get_next_cluster(sb, &amp;clu.dir))</div><div class='hunk'>@@ -122,11 +183,10 @@ void exfat_free_bitmap(struct exfat_sb_info *sbi)</div><div class='ctx'> 	kvfree(sbi-&gt;vol_amap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int exfat_set_bitmap(struct inode *inode, unsigned int clu, bool sync)</div><div class='add'>+int exfat_set_bitmap(struct super_block *sb, unsigned int clu, bool sync)</div><div class='ctx'> {</div><div class='ctx'> 	int i, b;</div><div class='ctx'> 	unsigned int ent_idx;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_cluster(sbi, clu))</div><div class='hunk'>@@ -141,36 +201,49 @@ int exfat_set_bitmap(struct inode *inode, unsigned int clu, bool sync)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void exfat_clear_bitmap(struct inode *inode, unsigned int clu, bool sync)</div><div class='add'>+int exfat_clear_bitmap(struct super_block *sb, unsigned int clu, bool sync)</div><div class='ctx'> {</div><div class='ctx'> 	int i, b;</div><div class='ctx'> 	unsigned int ent_idx;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-	struct exfat_mount_options *opts = &amp;sbi-&gt;options;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_cluster(sbi, clu))</div><div class='del'>-		return;</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	ent_idx = CLUSTER_TO_BITMAP_ENT(clu);</div><div class='ctx'> 	i = BITMAP_OFFSET_SECTOR_INDEX(sb, ent_idx);</div><div class='ctx'> 	b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);</div><div class='ctx'> </div><div class='add'>+	if (!test_bit_le(b, sbi-&gt;vol_amap[i]-&gt;b_data))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	clear_bit_le(b, sbi-&gt;vol_amap[i]-&gt;b_data);</div><div class='add'>+</div><div class='ctx'> 	exfat_update_bh(sbi-&gt;vol_amap[i], sync);</div><div class='ctx'> </div><div class='del'>-	if (opts-&gt;discard) {</div><div class='del'>-		int ret_discard;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ret_discard = sb_issue_discard(sb,</div><div class='del'>-			exfat_cluster_to_sector(sbi, clu),</div><div class='del'>-			(1 &lt;&lt; sbi-&gt;sect_per_clus_bits), GFP_NOFS, 0);</div><div class='add'>+bool exfat_test_bitmap(struct super_block *sb, unsigned int clu)</div><div class='add'>+{</div><div class='add'>+	int i, b;</div><div class='add'>+	unsigned int ent_idx;</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> </div><div class='del'>-		if (ret_discard == -EOPNOTSUPP) {</div><div class='del'>-			exfat_err(sb, "discard not supported by device, disabling");</div><div class='del'>-			opts-&gt;discard = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!sbi-&gt;vol_amap)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_cluster(sbi, clu))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ent_idx = CLUSTER_TO_BITMAP_ENT(clu);</div><div class='add'>+	i = BITMAP_OFFSET_SECTOR_INDEX(sb, ent_idx);</div><div class='add'>+	b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);</div><div class='add'>+</div><div class='add'>+	if (!test_bit_le(b, sbi-&gt;vol_amap[i]-&gt;b_data))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/exfat/cache.c b/fs/exfat/cache.c<br/>index 5a2f119b7e8c..d5ce0ae660ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/cache.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "exfat_raw.h"</div><div class='hunk'>@@ -46,7 +46,7 @@ int exfat_cache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	exfat_cachep = kmem_cache_create("exfat_cache",</div><div class='ctx'> 				sizeof(struct exfat_cache),</div><div class='del'>-				0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,</div><div class='add'>+				0, SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 				exfat_cache_init_once);</div><div class='ctx'> 	if (!exfat_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/exfat/dir.c b/fs/exfat/dir.c<br/>index 9f9295847a4e..3045a58e124a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/dir.c</a></div><div class='hunk'>@@ -82,11 +82,8 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent</div><div class='ctx'> 	if (ei-&gt;type != TYPE_DIR)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (ei-&gt;entry == -1)</div><div class='del'>-		exfat_chain_set(&amp;dir, sbi-&gt;root_dir, 0, ALLOC_FAT_CHAIN);</div><div class='del'>-	else</div><div class='del'>-		exfat_chain_set(&amp;dir, ei-&gt;start_clu,</div><div class='del'>-			EXFAT_B_TO_CLU(i_size_read(inode), sbi), ei-&gt;flags);</div><div class='add'>+	exfat_chain_set(&amp;dir, ei-&gt;start_clu,</div><div class='add'>+		EXFAT_B_TO_CLU(i_size_read(inode), sbi), ei-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	dentries_per_clu = sbi-&gt;dentries_per_clu;</div><div class='ctx'> 	max_dentries = (unsigned int)min_t(u64, MAX_EXFAT_DENTRIES,</div><div class='hunk'>@@ -125,7 +122,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent</div><div class='ctx'> 			type = exfat_get_entry_type(ep);</div><div class='ctx'> 			if (type == TYPE_UNUSED) {</div><div class='ctx'> 				brelse(bh);</div><div class='del'>-				break;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (type != TYPE_FILE &amp;&amp; type != TYPE_DIR) {</div><div class='hunk'>@@ -135,21 +132,6 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent</div><div class='ctx'> </div><div class='ctx'> 			num_ext = ep-&gt;dentry.file.num_ext;</div><div class='ctx'> 			dir_entry-&gt;attr = le16_to_cpu(ep-&gt;dentry.file.attr);</div><div class='del'>-			exfat_get_entry_time(sbi, &amp;dir_entry-&gt;crtime,</div><div class='del'>-					ep-&gt;dentry.file.create_tz,</div><div class='del'>-					ep-&gt;dentry.file.create_time,</div><div class='del'>-					ep-&gt;dentry.file.create_date,</div><div class='del'>-					ep-&gt;dentry.file.create_time_cs);</div><div class='del'>-			exfat_get_entry_time(sbi, &amp;dir_entry-&gt;mtime,</div><div class='del'>-					ep-&gt;dentry.file.modify_tz,</div><div class='del'>-					ep-&gt;dentry.file.modify_time,</div><div class='del'>-					ep-&gt;dentry.file.modify_date,</div><div class='del'>-					ep-&gt;dentry.file.modify_time_cs);</div><div class='del'>-			exfat_get_entry_time(sbi, &amp;dir_entry-&gt;atime,</div><div class='del'>-					ep-&gt;dentry.file.access_tz,</div><div class='del'>-					ep-&gt;dentry.file.access_time,</div><div class='del'>-					ep-&gt;dentry.file.access_date,</div><div class='del'>-					0);</div><div class='ctx'> </div><div class='ctx'> 			*uni_name.name = 0x0;</div><div class='ctx'> 			err = exfat_get_uniname_from_ext_entry(sb, &amp;clu, i,</div><div class='hunk'>@@ -166,9 +148,8 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent</div><div class='ctx'> 			ep = exfat_get_dentry(sb, &amp;clu, i + 1, &amp;bh);</div><div class='ctx'> 			if (!ep)</div><div class='ctx'> 				return -EIO;</div><div class='del'>-			dir_entry-&gt;size =</div><div class='del'>-				le64_to_cpu(ep-&gt;dentry.stream.valid_size);</div><div class='del'>-			dir_entry-&gt;entry = dentry;</div><div class='add'>+			dir_entry-&gt;entry = i;</div><div class='add'>+			dir_entry-&gt;dir = clu;</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> </div><div class='ctx'> 			ei-&gt;hint_bmap.off = EXFAT_DEN_TO_CLU(dentry, sbi);</div><div class='hunk'>@@ -189,6 +170,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	dir_entry-&gt;namebuf.lfn[0] = '\0';</div><div class='ctx'> 	*cpos = EXFAT_DEN_TO_B(dentry);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -276,7 +258,7 @@ get_new:</div><div class='ctx'> 	if (!nb-&gt;lfn[0])</div><div class='ctx'> 		goto end_of_dir;</div><div class='ctx'> </div><div class='del'>-	i_pos = ((loff_t)ei-&gt;start_clu &lt;&lt; 32) |	(de.entry &amp; 0xffffffff);</div><div class='add'>+	i_pos = ((loff_t)de.dir.dir &lt;&lt; 32) | (de.entry &amp; 0xffffffff);</div><div class='ctx'> 	tmp = exfat_iget(sb, i_pos);</div><div class='ctx'> 	if (tmp) {</div><div class='ctx'> 		inum = tmp-&gt;i_ino;</div><div class='hunk'>@@ -420,6 +402,7 @@ static void exfat_set_entry_type(struct exfat_dentry *ep, unsigned int type)</div><div class='ctx'> static void exfat_init_stream_entry(struct exfat_dentry *ep,</div><div class='ctx'> 		unsigned int start_clu, unsigned long long size)</div><div class='ctx'> {</div><div class='add'>+	memset(ep, 0, sizeof(*ep));</div><div class='ctx'> 	exfat_set_entry_type(ep, TYPE_STREAM);</div><div class='ctx'> 	if (size == 0)</div><div class='ctx'> 		ep-&gt;dentry.stream.flags = ALLOC_FAT_CHAIN;</div><div class='hunk'>@@ -448,88 +431,35 @@ static void exfat_init_name_entry(struct exfat_dentry *ep,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, unsigned int type, unsigned int start_clu,</div><div class='del'>-		unsigned long long size)</div><div class='add'>+void exfat_init_dir_entry(struct exfat_entry_set_cache *es,</div><div class='add'>+		unsigned int type, unsigned int start_clu,</div><div class='add'>+		unsigned long long size, struct timespec64 *ts)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	struct super_block *sb = es-&gt;sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-	struct timespec64 ts = current_time(inode);</div><div class='ctx'> 	struct exfat_dentry *ep;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We cannot use exfat_get_dentry_set here because file ep is not</div><div class='del'>-	 * initialized yet.</div><div class='del'>-	 */</div><div class='del'>-	ep = exfat_get_dentry(sb, p_dir, entry, &amp;bh);</div><div class='del'>-	if (!ep)</div><div class='del'>-		return -EIO;</div><div class='ctx'> </div><div class='add'>+	ep = exfat_get_dentry_cached(es, ES_IDX_FILE);</div><div class='add'>+	memset(ep, 0, sizeof(*ep));</div><div class='ctx'> 	exfat_set_entry_type(ep, type);</div><div class='del'>-	exfat_set_entry_time(sbi, &amp;ts,</div><div class='add'>+	exfat_set_entry_time(sbi, ts,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.create_tz,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.create_time,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.create_date,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.create_time_cs);</div><div class='del'>-	exfat_set_entry_time(sbi, &amp;ts,</div><div class='add'>+	exfat_set_entry_time(sbi, ts,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.modify_tz,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.modify_time,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.modify_date,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.modify_time_cs);</div><div class='del'>-	exfat_set_entry_time(sbi, &amp;ts,</div><div class='add'>+	exfat_set_entry_time(sbi, ts,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.access_tz,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.access_time,</div><div class='ctx'> 			&amp;ep-&gt;dentry.file.access_date,</div><div class='ctx'> 			NULL);</div><div class='ctx'> </div><div class='del'>-	exfat_update_bh(bh, IS_DIRSYNC(inode));</div><div class='del'>-	brelse(bh);</div><div class='del'>-</div><div class='del'>-	ep = exfat_get_dentry(sb, p_dir, entry + 1, &amp;bh);</div><div class='del'>-	if (!ep)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='add'>+	ep = exfat_get_dentry_cached(es, ES_IDX_STREAM);</div><div class='ctx'> 	exfat_init_stream_entry(ep, start_clu, size);</div><div class='del'>-	exfat_update_bh(bh, IS_DIRSYNC(inode));</div><div class='del'>-	brelse(bh);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int i, num_entries;</div><div class='del'>-	u16 chksum;</div><div class='del'>-	struct exfat_dentry *ep, *fep;</div><div class='del'>-	struct buffer_head *fbh, *bh;</div><div class='del'>-</div><div class='del'>-	fep = exfat_get_dentry(sb, p_dir, entry, &amp;fbh);</div><div class='del'>-	if (!fep)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	num_entries = fep-&gt;dentry.file.num_ext + 1;</div><div class='del'>-	chksum = exfat_calc_chksum16(fep, DENTRY_SIZE, 0, CS_DIR_ENTRY);</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; num_entries; i++) {</div><div class='del'>-		ep = exfat_get_dentry(sb, p_dir, entry + i, &amp;bh);</div><div class='del'>-		if (!ep) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto release_fbh;</div><div class='del'>-		}</div><div class='del'>-		chksum = exfat_calc_chksum16(ep, DENTRY_SIZE, chksum,</div><div class='del'>-				CS_DEFAULT);</div><div class='del'>-		brelse(bh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fep-&gt;dentry.file.checksum = cpu_to_le16(chksum);</div><div class='del'>-	exfat_update_bh(fbh, IS_DIRSYNC(inode));</div><div class='del'>-release_fbh:</div><div class='del'>-	brelse(fbh);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void exfat_free_benign_secondary_clusters(struct inode *inode,</div><div class='hunk'>@@ -551,76 +481,49 @@ static void exfat_free_benign_secondary_clusters(struct inode *inode,</div><div class='ctx'> 	exfat_free_cluster(inode, &amp;dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, int num_entries, struct exfat_uni_name *p_uniname)</div><div class='add'>+void exfat_init_ext_entry(struct exfat_entry_set_cache *es, int num_entries,</div><div class='add'>+		struct exfat_uni_name *p_uniname)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned short *uniname = p_uniname-&gt;name;</div><div class='ctx'> 	struct exfat_dentry *ep;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int sync = IS_DIRSYNC(inode);</div><div class='del'>-</div><div class='del'>-	ep = exfat_get_dentry(sb, p_dir, entry, &amp;bh);</div><div class='del'>-	if (!ep)</div><div class='del'>-		return -EIO;</div><div class='ctx'> </div><div class='add'>+	ep = exfat_get_dentry_cached(es, ES_IDX_FILE);</div><div class='ctx'> 	ep-&gt;dentry.file.num_ext = (unsigned char)(num_entries - 1);</div><div class='del'>-	exfat_update_bh(bh, sync);</div><div class='del'>-	brelse(bh);</div><div class='del'>-</div><div class='del'>-	ep = exfat_get_dentry(sb, p_dir, entry + 1, &amp;bh);</div><div class='del'>-	if (!ep)</div><div class='del'>-		return -EIO;</div><div class='ctx'> </div><div class='add'>+	ep = exfat_get_dentry_cached(es, ES_IDX_STREAM);</div><div class='ctx'> 	ep-&gt;dentry.stream.name_len = p_uniname-&gt;name_len;</div><div class='ctx'> 	ep-&gt;dentry.stream.name_hash = cpu_to_le16(p_uniname-&gt;name_hash);</div><div class='del'>-	exfat_update_bh(bh, sync);</div><div class='del'>-	brelse(bh);</div><div class='del'>-</div><div class='del'>-	for (i = EXFAT_FIRST_CLUSTER; i &lt; num_entries; i++) {</div><div class='del'>-		ep = exfat_get_dentry(sb, p_dir, entry + i, &amp;bh);</div><div class='del'>-		if (!ep)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		if (exfat_get_entry_type(ep) &amp; TYPE_BENIGN_SEC)</div><div class='del'>-			exfat_free_benign_secondary_clusters(inode, ep);</div><div class='ctx'> </div><div class='add'>+	for (i = ES_IDX_FIRST_FILENAME; i &lt; num_entries; i++) {</div><div class='add'>+		ep = exfat_get_dentry_cached(es, i);</div><div class='ctx'> 		exfat_init_name_entry(ep, uniname);</div><div class='del'>-		exfat_update_bh(bh, sync);</div><div class='del'>-		brelse(bh);</div><div class='ctx'> 		uniname += EXFAT_FILE_NAME_LEN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	exfat_update_dir_chksum(inode, p_dir, entry);</div><div class='del'>-	return 0;</div><div class='add'>+	exfat_update_dir_chksum(es);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, int order, int num_entries)</div><div class='add'>+void exfat_remove_entries(struct inode *inode, struct exfat_entry_set_cache *es,</div><div class='add'>+		int order)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct exfat_dentry *ep;</div><div class='del'>-	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-	for (i = order; i &lt; num_entries; i++) {</div><div class='del'>-		ep = exfat_get_dentry(sb, p_dir, entry + i, &amp;bh);</div><div class='del'>-		if (!ep)</div><div class='del'>-			return -EIO;</div><div class='add'>+	for (i = order; i &lt; es-&gt;num_entries; i++) {</div><div class='add'>+		ep = exfat_get_dentry_cached(es, i);</div><div class='ctx'> </div><div class='ctx'> 		if (exfat_get_entry_type(ep) &amp; TYPE_BENIGN_SEC)</div><div class='ctx'> 			exfat_free_benign_secondary_clusters(inode, ep);</div><div class='ctx'> </div><div class='ctx'> 		exfat_set_entry_type(ep, TYPE_DELETED);</div><div class='del'>-		exfat_update_bh(bh, IS_DIRSYNC(inode));</div><div class='del'>-		brelse(bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (order &lt; es-&gt;num_entries)</div><div class='add'>+		es-&gt;modified = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)</div><div class='add'>+void exfat_update_dir_chksum(struct exfat_entry_set_cache *es)</div><div class='ctx'> {</div><div class='ctx'> 	int chksum_type = CS_DIR_ENTRY, i;</div><div class='ctx'> 	unsigned short chksum = 0;</div><div class='hunk'>@@ -701,6 +604,11 @@ static int exfat_find_location(struct super_block *sb, struct exfat_chain *p_dir</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (!exfat_test_bitmap(sb, clu)) {</div><div class='add'>+		exfat_err(sb, "failed to test cluster bit(%u)", clu);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* byte offset in cluster */</div><div class='ctx'> 	off = EXFAT_CLU_OFFSET(off, sbi);</div><div class='ctx'> </div><div class='hunk'>@@ -775,7 +683,6 @@ struct exfat_dentry *exfat_get_dentry(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum exfat_validate_dentry_mode {</div><div class='del'>-	ES_MODE_STARTED,</div><div class='ctx'> 	ES_MODE_GET_FILE_ENTRY,</div><div class='ctx'> 	ES_MODE_GET_STRM_ENTRY,</div><div class='ctx'> 	ES_MODE_GET_NAME_ENTRY,</div><div class='hunk'>@@ -790,11 +697,6 @@ static bool exfat_validate_entry(unsigned int type,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	switch (*mode) {</div><div class='del'>-	case ES_MODE_STARTED:</div><div class='del'>-		if  (type != TYPE_FILE &amp;&amp; type != TYPE_DIR)</div><div class='del'>-			return false;</div><div class='del'>-		*mode = ES_MODE_GET_FILE_ENTRY;</div><div class='del'>-		break;</div><div class='ctx'> 	case ES_MODE_GET_FILE_ENTRY:</div><div class='ctx'> 		if (type != TYPE_STREAM)</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -834,7 +736,7 @@ struct exfat_dentry *exfat_get_dentry_cached(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Returns a set of dentries for a file or dir.</div><div class='add'>+ * Returns a set of dentries.</div><div class='ctx'>  *</div><div class='ctx'>  * Note It provides a direct pointer to bh-&gt;data via exfat_get_dentry_cached().</div><div class='ctx'>  * User should call exfat_get_dentry_set() after setting 'modified' to apply</div><div class='hunk'>@@ -842,22 +744,24 @@ struct exfat_dentry *exfat_get_dentry_cached(</div><div class='ctx'>  *</div><div class='ctx'>  * in:</div><div class='ctx'>  *   sb+p_dir+entry: indicates a file/dir</div><div class='del'>- *   type:  specifies how many dentries should be included.</div><div class='add'>+ *   num_entries: specifies how many dentries should be included.</div><div class='add'>+ *                It will be set to es-&gt;num_entries if it is not 0.</div><div class='add'>+ *                If num_entries is 0, es-&gt;num_entries will be obtained</div><div class='add'>+ *                from the first dentry.</div><div class='add'>+ * out:</div><div class='add'>+ *   es: pointer of entry set on success.</div><div class='ctx'>  * return:</div><div class='del'>- *   pointer of entry set on success,</div><div class='del'>- *   NULL on failure.</div><div class='add'>+ *   0 on success</div><div class='add'>+ *   -error code on failure</div><div class='ctx'>  */</div><div class='del'>-int exfat_get_dentry_set(struct exfat_entry_set_cache *es,</div><div class='add'>+static int __exfat_get_dentry_set(struct exfat_entry_set_cache *es,</div><div class='ctx'> 		struct super_block *sb, struct exfat_chain *p_dir, int entry,</div><div class='del'>-		unsigned int type)</div><div class='add'>+		unsigned int num_entries)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i, num_bh;</div><div class='ctx'> 	unsigned int off;</div><div class='ctx'> 	sector_t sec;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-	struct exfat_dentry *ep;</div><div class='del'>-	int num_entries;</div><div class='del'>-	enum exfat_validate_dentry_mode mode = ES_MODE_STARTED;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	if (p_dir-&gt;dir == DIR_DELETED) {</div><div class='hunk'>@@ -880,17 +784,23 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	es-&gt;bh[es-&gt;num_bh++] = bh;</div><div class='ctx'> </div><div class='del'>-	ep = exfat_get_dentry_cached(es, ES_IDX_FILE);</div><div class='del'>-	if (!exfat_validate_entry(exfat_get_entry_type(ep), &amp;mode))</div><div class='del'>-		goto put_es;</div><div class='add'>+	if (num_entries == ES_ALL_ENTRIES) {</div><div class='add'>+		struct exfat_dentry *ep;</div><div class='add'>+</div><div class='add'>+		ep = exfat_get_dentry_cached(es, ES_IDX_FILE);</div><div class='add'>+		if (ep-&gt;type != EXFAT_FILE) {</div><div class='add'>+			brelse(bh);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		num_entries = ep-&gt;dentry.file.num_ext + 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	num_entries = type == ES_ALL_ENTRIES ?</div><div class='del'>-		ep-&gt;dentry.file.num_ext + 1 : type;</div><div class='ctx'> 	es-&gt;num_entries = num_entries;</div><div class='ctx'> </div><div class='ctx'> 	num_bh = EXFAT_B_TO_BLK_ROUND_UP(off + num_entries * DENTRY_SIZE, sb);</div><div class='ctx'> 	if (num_bh &gt; ARRAY_SIZE(es-&gt;__bh)) {</div><div class='del'>-		es-&gt;bh = kmalloc_array(num_bh, sizeof(*es-&gt;bh), GFP_KERNEL);</div><div class='add'>+		es-&gt;bh = kmalloc_array(num_bh, sizeof(*es-&gt;bh), GFP_NOFS);</div><div class='ctx'> 		if (!es-&gt;bh) {</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -918,8 +828,27 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es,</div><div class='ctx'> 		es-&gt;bh[es-&gt;num_bh++] = bh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+put_es:</div><div class='add'>+	exfat_put_dentry_set(es, false);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int exfat_get_dentry_set(struct exfat_entry_set_cache *es,</div><div class='add'>+		struct super_block *sb, struct exfat_chain *p_dir,</div><div class='add'>+		int entry, unsigned int num_entries)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct exfat_dentry *ep;</div><div class='add'>+	enum exfat_validate_dentry_mode mode = ES_MODE_GET_FILE_ENTRY;</div><div class='add'>+</div><div class='add'>+	ret = __exfat_get_dentry_set(es, sb, p_dir, entry, num_entries);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* validate cached dentries */</div><div class='del'>-	for (i = ES_IDX_STREAM; i &lt; num_entries; i++) {</div><div class='add'>+	for (i = ES_IDX_STREAM; i &lt; es-&gt;num_entries; i++) {</div><div class='ctx'> 		ep = exfat_get_dentry_cached(es, i);</div><div class='ctx'> 		if (!exfat_validate_entry(exfat_get_entry_type(ep), &amp;mode))</div><div class='ctx'> 			goto put_es;</div><div class='hunk'>@@ -931,6 +860,85 @@ put_es:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int exfat_validate_empty_dentry_set(struct exfat_entry_set_cache *es)</div><div class='add'>+{</div><div class='add'>+	struct exfat_dentry *ep;</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+	int i, off;</div><div class='add'>+	bool unused_hit = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ONLY UNUSED OR DELETED DENTRIES ARE ALLOWED:</div><div class='add'>+	 * Although it violates the specification for a deleted entry to</div><div class='add'>+	 * follow an unused entry, some exFAT implementations could work</div><div class='add'>+	 * like this. Therefore, to improve compatibility, let's allow it.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; es-&gt;num_entries; i++) {</div><div class='add'>+		ep = exfat_get_dentry_cached(es, i);</div><div class='add'>+		if (ep-&gt;type == EXFAT_UNUSED) {</div><div class='add'>+			unused_hit = true;</div><div class='add'>+		} else if (!IS_EXFAT_DELETED(ep-&gt;type)) {</div><div class='add'>+			if (unused_hit)</div><div class='add'>+				goto err_used_follow_unused;</div><div class='add'>+			i++;</div><div class='add'>+			goto count_skip_entries;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_used_follow_unused:</div><div class='add'>+	off = es-&gt;start_off + (i &lt;&lt; DENTRY_SIZE_BITS);</div><div class='add'>+	bh = es-&gt;bh[EXFAT_B_TO_BLK(off, es-&gt;sb)];</div><div class='add'>+</div><div class='add'>+	exfat_fs_error(es-&gt;sb,</div><div class='add'>+		"in sector %lld, dentry %d should be unused, but 0x%x",</div><div class='add'>+		bh-&gt;b_blocknr, off &gt;&gt; DENTRY_SIZE_BITS, ep-&gt;type);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+</div><div class='add'>+count_skip_entries:</div><div class='add'>+	es-&gt;num_entries = EXFAT_B_TO_DEN(EXFAT_BLK_TO_B(es-&gt;num_bh, es-&gt;sb) - es-&gt;start_off);</div><div class='add'>+	for (; i &lt; es-&gt;num_entries; i++) {</div><div class='add'>+		ep = exfat_get_dentry_cached(es, i);</div><div class='add'>+		if (IS_EXFAT_DELETED(ep-&gt;type))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get an empty dentry set.</div><div class='add'>+ *</div><div class='add'>+ * in:</div><div class='add'>+ *   sb+p_dir+entry: indicates the empty dentry location</div><div class='add'>+ *   num_entries: specifies how many empty dentries should be included.</div><div class='add'>+ * out:</div><div class='add'>+ *   es: pointer of empty dentry set on success.</div><div class='add'>+ * return:</div><div class='add'>+ *   0  : on success</div><div class='add'>+ *   &gt;0 : the dentries are not empty, the return value is the number of</div><div class='add'>+ *        dentries to be skipped for the next lookup.</div><div class='add'>+ *   &lt;0 : on failure</div><div class='add'>+ */</div><div class='add'>+int exfat_get_empty_dentry_set(struct exfat_entry_set_cache *es,</div><div class='add'>+		struct super_block *sb, struct exfat_chain *p_dir,</div><div class='add'>+		int entry, unsigned int num_entries)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __exfat_get_dentry_set(es, sb, p_dir, entry, num_entries);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = exfat_validate_empty_dentry_set(es);</div><div class='add'>+	if (ret)</div><div class='add'>+		exfat_put_dentry_set(es, false);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void exfat_reset_empty_hint(struct exfat_hint_femp *hint_femp)</div><div class='ctx'> {</div><div class='ctx'> 	hint_femp-&gt;eidx = EXFAT_HINT_NONE;</div><div class='hunk'>@@ -993,6 +1001,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,</div><div class='ctx'> 	struct exfat_hint_femp candi_empty;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	int num_entries = exfat_calc_num_entries(p_uniname);</div><div class='add'>+	unsigned int clu_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (num_entries &lt; 0)</div><div class='ctx'> 		return num_entries;</div><div class='hunk'>@@ -1130,6 +1139,10 @@ rewind:</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (exfat_get_next_cluster(sb, &amp;clu.dir))</div><div class='ctx'> 				return -EIO;</div><div class='add'>+</div><div class='add'>+			/* break if the cluster chain includes a loop */</div><div class='add'>+			if (unlikely(++clu_count &gt; EXFAT_DATA_CLUSTER_COUNT(sbi)))</div><div class='add'>+				goto not_found;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1187,32 +1200,12 @@ found:</div><div class='ctx'> 	return dentry - num_ext;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, struct exfat_dentry *ep)</div><div class='del'>-{</div><div class='del'>-	int i, count = 0;</div><div class='del'>-	unsigned int type;</div><div class='del'>-	struct exfat_dentry *ext_ep;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-</div><div class='del'>-	for (i = 0, entry++; i &lt; ep-&gt;dentry.file.num_ext; i++, entry++) {</div><div class='del'>-		ext_ep = exfat_get_dentry(sb, p_dir, entry, &amp;bh);</div><div class='del'>-		if (!ext_ep)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		type = exfat_get_entry_type(ext_ep);</div><div class='del'>-		brelse(bh);</div><div class='del'>-		if (type &amp; TYPE_CRITICAL_SEC || type &amp; TYPE_BENIGN_SEC)</div><div class='del'>-			count++;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)</div><div class='ctx'> {</div><div class='ctx'> 	int i, count = 0;</div><div class='ctx'> 	int dentries_per_clu;</div><div class='ctx'> 	unsigned int entry_type;</div><div class='add'>+	unsigned int clu_count = 0;</div><div class='ctx'> 	struct exfat_chain clu;</div><div class='ctx'> 	struct exfat_dentry *ep;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='hunk'>@@ -1245,8 +1238,174 @@ int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (exfat_get_next_cluster(sb, &amp;(clu.dir)))</div><div class='ctx'> 				return -EIO;</div><div class='add'>+</div><div class='add'>+			if (unlikely(++clu_count &gt; sbi-&gt;used_clusters)) {</div><div class='add'>+				exfat_fs_error(sb, "FAT or bitmap is corrupted");</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int exfat_get_volume_label_dentry(struct super_block *sb,</div><div class='add'>+		struct exfat_entry_set_cache *es)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int dentry = 0;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+	struct exfat_hint_femp hint_femp;</div><div class='add'>+	struct exfat_inode_info *ei = EXFAT_I(sb-&gt;s_root-&gt;d_inode);</div><div class='add'>+	struct exfat_chain clu;</div><div class='add'>+	struct exfat_dentry *ep;</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+</div><div class='add'>+	hint_femp.eidx = EXFAT_HINT_NONE;</div><div class='add'>+	exfat_chain_set(&amp;clu, sbi-&gt;root_dir, 0, ALLOC_FAT_CHAIN);</div><div class='add'>+</div><div class='add'>+	while (clu.dir != EXFAT_EOF_CLUSTER) {</div><div class='add'>+		for (i = 0; i &lt; sbi-&gt;dentries_per_clu; i++, dentry++) {</div><div class='add'>+			ep = exfat_get_dentry(sb, &amp;clu, i, &amp;bh);</div><div class='add'>+			if (!ep)</div><div class='add'>+				return -EIO;</div><div class='add'>+</div><div class='add'>+			type = exfat_get_entry_type(ep);</div><div class='add'>+			if (hint_femp.eidx == EXFAT_HINT_NONE) {</div><div class='add'>+				if (type == TYPE_DELETED || type == TYPE_UNUSED) {</div><div class='add'>+					hint_femp.cur = clu;</div><div class='add'>+					hint_femp.eidx = dentry;</div><div class='add'>+					hint_femp.count = 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (type == TYPE_UNUSED) {</div><div class='add'>+				brelse(bh);</div><div class='add'>+				goto not_found;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (type != TYPE_VOLUME) {</div><div class='add'>+				brelse(bh);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memset(es, 0, sizeof(*es));</div><div class='add'>+			es-&gt;sb = sb;</div><div class='add'>+			es-&gt;bh = es-&gt;__bh;</div><div class='add'>+			es-&gt;bh[0] = bh;</div><div class='add'>+			es-&gt;num_bh = 1;</div><div class='add'>+			es-&gt;start_off = EXFAT_DEN_TO_B(i) % sb-&gt;s_blocksize;</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (exfat_get_next_cluster(sb, &amp;(clu.dir)))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+not_found:</div><div class='add'>+	if (hint_femp.eidx == EXFAT_HINT_NONE) {</div><div class='add'>+		hint_femp.cur.dir = EXFAT_EOF_CLUSTER;</div><div class='add'>+		hint_femp.eidx = dentry;</div><div class='add'>+		hint_femp.count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ei-&gt;hint_femp = hint_femp;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int exfat_read_volume_label(struct super_block *sb, struct exfat_uni_name *label_out)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+	struct exfat_entry_set_cache es;</div><div class='add'>+	struct exfat_dentry *ep;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='add'>+</div><div class='add'>+	memset(label_out, 0, sizeof(*label_out));</div><div class='add'>+	ret = exfat_get_volume_label_dentry(sb, &amp;es);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * ENOENT signifies that a volume label dentry doesn't exist</div><div class='add'>+		 * We will treat this as an empty volume label and not fail.</div><div class='add'>+		 */</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = 0;</div><div class='add'>+</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep = exfat_get_dentry_cached(&amp;es, 0);</div><div class='add'>+	label_out-&gt;name_len = ep-&gt;dentry.volume_label.char_count;</div><div class='add'>+	if (label_out-&gt;name_len &gt; EXFAT_VOLUME_LABEL_LEN) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		exfat_put_dentry_set(&amp;es, false);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; label_out-&gt;name_len; i++)</div><div class='add'>+		label_out-&gt;name[i] = le16_to_cpu(ep-&gt;dentry.volume_label.volume_label[i]);</div><div class='add'>+</div><div class='add'>+	exfat_put_dentry_set(&amp;es, false);</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int exfat_write_volume_label(struct super_block *sb,</div><div class='add'>+			     struct exfat_uni_name *label)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+	struct inode *root_inode = sb-&gt;s_root-&gt;d_inode;</div><div class='add'>+	struct exfat_entry_set_cache es;</div><div class='add'>+	struct exfat_chain clu;</div><div class='add'>+	struct exfat_dentry *ep;</div><div class='add'>+</div><div class='add'>+	if (label-&gt;name_len &gt; EXFAT_VOLUME_LABEL_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='add'>+</div><div class='add'>+	ret = exfat_get_volume_label_dentry(sb, &amp;es);</div><div class='add'>+	if (ret == -ENOENT) {</div><div class='add'>+		if (label-&gt;name_len == 0) {</div><div class='add'>+			/* No volume label dentry, no need to clear */</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = exfat_find_empty_entry(root_inode, &amp;clu, 1, &amp;es);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ep = exfat_get_dentry_cached(&amp;es, 0);</div><div class='add'>+</div><div class='add'>+	if (label-&gt;name_len == 0 &amp;&amp; ep-&gt;dentry.volume_label.char_count == 0) {</div><div class='add'>+		/* volume label had been cleared */</div><div class='add'>+		exfat_put_dentry_set(&amp;es, 0);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(ep, 0, sizeof(*ep));</div><div class='add'>+	ep-&gt;type = EXFAT_VOLUME;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; label-&gt;name_len; i++)</div><div class='add'>+		ep-&gt;dentry.volume_label.volume_label[i] =</div><div class='add'>+			cpu_to_le16(label-&gt;name[i]);</div><div class='add'>+</div><div class='add'>+	ep-&gt;dentry.volume_label.char_count = label-&gt;name_len;</div><div class='add'>+	es.modified = true;</div><div class='add'>+</div><div class='add'>+	ret = exfat_put_dentry_set(&amp;es, IS_DIRSYNC(root_inode));</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/exfat/exfat_fs.h b/fs/exfat/exfat_fs.h<br/>index 9474cd50da6d..176fef62574c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/exfat_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/exfat_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/exfat_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/exfat_fs.h</a></div><div class='hunk'>@@ -10,11 +10,10 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/nls.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;uapi/linux/exfat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EXFAT_ROOT_INO		1</div><div class='ctx'> </div><div class='del'>-#define EXFAT_CLUSTERS_UNTRACKED (~0u)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * exfat error flags</div><div class='ctx'>  */</div><div class='hunk'>@@ -30,7 +29,6 @@ enum exfat_error_mode {</div><div class='ctx'> enum {</div><div class='ctx'> 	NLS_NAME_NO_LOSSY =	0,	/* no lossy */</div><div class='ctx'> 	NLS_NAME_LOSSY =	1 &lt;&lt; 0,	/* just detected incorrect filename(s) */</div><div class='del'>-	NLS_NAME_OVERLEN =	1 &lt;&lt; 1,	/* the length is over than its limit */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define EXFAT_HASH_BITS		8</div><div class='hunk'>@@ -148,6 +146,9 @@ enum {</div><div class='ctx'> #define DIR_CACHE_SIZE		\</div><div class='ctx'> 	(DIV_ROUND_UP(EXFAT_DEN_TO_B(ES_MAX_ENTRY_NUM), SECTOR_SIZE) + 1)</div><div class='ctx'> </div><div class='add'>+/* Superblock flags */</div><div class='add'>+#define EXFAT_FLAGS_SHUTDOWN	1</div><div class='add'>+</div><div class='ctx'> struct exfat_dentry_namebuf {</div><div class='ctx'> 	char *lfn;</div><div class='ctx'> 	int lfnbuf_len; /* usually MAX_UNINAME_BUF_SIZE */</div><div class='hunk'>@@ -200,7 +201,9 @@ struct exfat_entry_set_cache {</div><div class='ctx'> #define IS_DYNAMIC_ES(es)	((es)-&gt;__bh != (es)-&gt;bh)</div><div class='ctx'> </div><div class='ctx'> struct exfat_dir_entry {</div><div class='add'>+	/* the cluster where file dentry is located */</div><div class='ctx'> 	struct exfat_chain dir;</div><div class='add'>+	/* the index of file dentry in -&gt;dir */</div><div class='ctx'> 	int entry;</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> 	unsigned int start_clu;</div><div class='hunk'>@@ -267,6 +270,8 @@ struct exfat_sb_info {</div><div class='ctx'> 	unsigned int clu_srch_ptr; /* cluster search pointer */</div><div class='ctx'> 	unsigned int used_clusters; /* number of used clusters */</div><div class='ctx'> </div><div class='add'>+	unsigned long s_exfat_flags; /* Exfat superblock flags */</div><div class='add'>+</div><div class='ctx'> 	struct mutex s_lock; /* superblock lock */</div><div class='ctx'> 	struct mutex bitmap_lock; /* bitmap lock */</div><div class='ctx'> 	struct exfat_mount_options options;</div><div class='hunk'>@@ -275,6 +280,7 @@ struct exfat_sb_info {</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t inode_hash_lock;</div><div class='ctx'> 	struct hlist_head inode_hashtable[EXFAT_HASH_SIZE];</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define EXFAT_CACHE_VALID	0</div><div class='hunk'>@@ -283,7 +289,9 @@ struct exfat_sb_info {</div><div class='ctx'>  * EXFAT file system inode in-memory data</div><div class='ctx'>  */</div><div class='ctx'> struct exfat_inode_info {</div><div class='add'>+	/* the cluster where file dentry is located */</div><div class='ctx'> 	struct exfat_chain dir;</div><div class='add'>+	/* the index of file dentry in -&gt;dir */</div><div class='ctx'> 	int entry;</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> 	unsigned short attr;</div><div class='hunk'>@@ -308,13 +316,6 @@ struct exfat_inode_info {</div><div class='ctx'> 	/* for avoiding the race between alloc and free */</div><div class='ctx'> 	unsigned int cache_valid_id;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: i_size_ondisk is 64bits, so must hold -&gt;inode_lock to access.</div><div class='del'>-	 * physically allocated size.</div><div class='del'>-	 */</div><div class='del'>-	loff_t i_size_ondisk;</div><div class='del'>-	/* block-aligned i_size (used in cont_write_begin) */</div><div class='del'>-	loff_t i_size_aligned;</div><div class='ctx'> 	/* on-disk position of directory entry or 0 */</div><div class='ctx'> 	loff_t i_pos;</div><div class='ctx'> 	loff_t valid_size;</div><div class='hunk'>@@ -337,6 +338,11 @@ static inline struct exfat_inode_info *EXFAT_I(struct inode *inode)</div><div class='ctx'> 	return container_of(inode, struct exfat_inode_info, vfs_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int exfat_forced_shutdown(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return test_bit(EXFAT_FLAGS_SHUTDOWN, &amp;EXFAT_SB(sb)-&gt;s_exfat_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * If -&gt;i_mode can't hold 0222 (i.e. ATTR_RO), we use -&gt;i_attrs to</div><div class='ctx'>  * save ATTR_RO instead of -&gt;i_mode.</div><div class='hunk'>@@ -416,6 +422,11 @@ static inline bool is_valid_cluster(struct exfat_sb_info *sbi,</div><div class='ctx'> 	return clus &gt;= EXFAT_FIRST_CLUSTER &amp;&amp; clus &lt; sbi-&gt;num_clusters;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline loff_t exfat_ondisk_size(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return ((loff_t)inode-&gt;i_blocks) &lt;&lt; 9;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* super.c */</div><div class='ctx'> int exfat_set_volume_dirty(struct super_block *sb);</div><div class='ctx'> int exfat_clear_volume_dirty(struct super_block *sb);</div><div class='hunk'>@@ -430,8 +441,6 @@ int exfat_ent_get(struct super_block *sb, unsigned int loc,</div><div class='ctx'> 		unsigned int *content);</div><div class='ctx'> int exfat_ent_set(struct super_block *sb, unsigned int loc,</div><div class='ctx'> 		unsigned int content);</div><div class='del'>-int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, struct exfat_dentry *p_entry);</div><div class='ctx'> int exfat_chain_cont_cluster(struct super_block *sb, unsigned int chain,</div><div class='ctx'> 		unsigned int len);</div><div class='ctx'> int exfat_zeroed_cluster(struct inode *dir, unsigned int clu);</div><div class='hunk'>@@ -443,8 +452,9 @@ int exfat_count_num_clusters(struct super_block *sb,</div><div class='ctx'> /* balloc.c */</div><div class='ctx'> int exfat_load_bitmap(struct super_block *sb);</div><div class='ctx'> void exfat_free_bitmap(struct exfat_sb_info *sbi);</div><div class='del'>-int exfat_set_bitmap(struct inode *inode, unsigned int clu, bool sync);</div><div class='del'>-void exfat_clear_bitmap(struct inode *inode, unsigned int clu, bool sync);</div><div class='add'>+int exfat_set_bitmap(struct super_block *sb, unsigned int clu, bool sync);</div><div class='add'>+int exfat_clear_bitmap(struct super_block *sb, unsigned int clu, bool sync);</div><div class='add'>+bool exfat_test_bitmap(struct super_block *sb, unsigned int clu);</div><div class='ctx'> unsigned int exfat_find_free_bitmap(struct super_block *sb, unsigned int clu);</div><div class='ctx'> int exfat_count_used_clusters(struct super_block *sb, unsigned int *ret_count);</div><div class='ctx'> int exfat_trim_fs(struct inode *inode, struct fstrim_range *range);</div><div class='hunk'>@@ -462,10 +472,14 @@ int exfat_file_fsync(struct file *file, loff_t start, loff_t end, int datasync);</div><div class='ctx'> long exfat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);</div><div class='ctx'> long exfat_compat_ioctl(struct file *filp, unsigned int cmd,</div><div class='ctx'> 				unsigned long arg);</div><div class='add'>+int exfat_force_shutdown(struct super_block *sb, u32 flags);</div><div class='ctx'> </div><div class='ctx'> /* namei.c */</div><div class='ctx'> extern const struct dentry_operations exfat_dentry_ops;</div><div class='ctx'> extern const struct dentry_operations exfat_utf8_dentry_ops;</div><div class='add'>+int exfat_find_empty_entry(struct inode *inode,</div><div class='add'>+		struct exfat_chain *p_dir, int num_entries,</div><div class='add'>+			   struct exfat_entry_set_cache *es);</div><div class='ctx'> </div><div class='ctx'> /* cache.c */</div><div class='ctx'> int exfat_cache_init(void);</div><div class='hunk'>@@ -479,16 +493,14 @@ int exfat_get_cluster(struct inode *inode, unsigned int cluster,</div><div class='ctx'> extern const struct inode_operations exfat_dir_inode_operations;</div><div class='ctx'> extern const struct file_operations exfat_dir_operations;</div><div class='ctx'> unsigned int exfat_get_entry_type(struct exfat_dentry *p_entry);</div><div class='del'>-int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, unsigned int type, unsigned int start_clu,</div><div class='del'>-		unsigned long long size);</div><div class='del'>-int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, int num_entries, struct exfat_uni_name *p_uniname);</div><div class='del'>-int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry, int order, int num_entries);</div><div class='del'>-int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int entry);</div><div class='del'>-void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es);</div><div class='add'>+void exfat_init_dir_entry(struct exfat_entry_set_cache *es,</div><div class='add'>+		unsigned int type, unsigned int start_clu,</div><div class='add'>+		unsigned long long size, struct timespec64 *ts);</div><div class='add'>+void exfat_init_ext_entry(struct exfat_entry_set_cache *es, int num_entries,</div><div class='add'>+		struct exfat_uni_name *p_uniname);</div><div class='add'>+void exfat_remove_entries(struct inode *inode, struct exfat_entry_set_cache *es,</div><div class='add'>+		int order);</div><div class='add'>+void exfat_update_dir_chksum(struct exfat_entry_set_cache *es);</div><div class='ctx'> int exfat_calc_num_entries(struct exfat_uni_name *p_uniname);</div><div class='ctx'> int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,</div><div class='ctx'> 		struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,</div><div class='hunk'>@@ -500,9 +512,18 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es,</div><div class='ctx'> 		int num);</div><div class='ctx'> int exfat_get_dentry_set(struct exfat_entry_set_cache *es,</div><div class='ctx'> 		struct super_block *sb, struct exfat_chain *p_dir, int entry,</div><div class='del'>-		unsigned int type);</div><div class='add'>+		unsigned int num_entries);</div><div class='add'>+#define exfat_get_dentry_set_by_ei(es, sb, ei)		\</div><div class='add'>+	exfat_get_dentry_set(es, sb, &amp;(ei)-&gt;dir, (ei)-&gt;entry, ES_ALL_ENTRIES)</div><div class='add'>+int exfat_get_empty_dentry_set(struct exfat_entry_set_cache *es,</div><div class='add'>+		struct super_block *sb, struct exfat_chain *p_dir, int entry,</div><div class='add'>+		unsigned int num_entries);</div><div class='ctx'> int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync);</div><div class='ctx'> int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir);</div><div class='add'>+int exfat_read_volume_label(struct super_block *sb,</div><div class='add'>+			    struct exfat_uni_name *label_out);</div><div class='add'>+int exfat_write_volume_label(struct super_block *sb,</div><div class='add'>+			     struct exfat_uni_name *label);</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='ctx'> extern const struct inode_operations exfat_file_inode_operations;</div><div class='head'>diff --git a/fs/exfat/exfat_raw.h b/fs/exfat/exfat_raw.h<br/>index 971a1ccd0e89..4082fa7b8c14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/exfat_raw.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/exfat_raw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/exfat_raw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/exfat_raw.h</a></div><div class='hunk'>@@ -80,6 +80,7 @@</div><div class='ctx'> #define BOOTSEC_OLDBPB_LEN		53</div><div class='ctx'> </div><div class='ctx'> #define EXFAT_FILE_NAME_LEN		15</div><div class='add'>+#define EXFAT_VOLUME_LABEL_LEN		11</div><div class='ctx'> </div><div class='ctx'> #define EXFAT_MIN_SECT_SIZE_BITS		9</div><div class='ctx'> #define EXFAT_MAX_SECT_SIZE_BITS		12</div><div class='hunk'>@@ -160,6 +161,11 @@ struct exfat_dentry {</div><div class='ctx'> 			__le64 size;</div><div class='ctx'> 		} __packed upcase; /* up-case table directory entry */</div><div class='ctx'> 		struct {</div><div class='add'>+			__u8 char_count;</div><div class='add'>+			__le16 volume_label[EXFAT_VOLUME_LABEL_LEN];</div><div class='add'>+			__u8 reserved[8];</div><div class='add'>+		} __packed volume_label; /* volume label directory entry */</div><div class='add'>+		struct {</div><div class='ctx'> 			__u8 flags;</div><div class='ctx'> 			__u8 vendor_guid[16];</div><div class='ctx'> 			__u8 vendor_defined[14];</div><div class='head'>diff --git a/fs/exfat/fatent.c b/fs/exfat/fatent.c<br/>index 56b870d9cc0d..c9c5f2e3a05e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/fatent.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/fatent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/fatent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/fatent.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -89,35 +89,36 @@ int exfat_ent_get(struct super_block *sb, unsigned int loc,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_cluster(sbi, loc)) {</div><div class='del'>-		exfat_fs_error(sb, "invalid access to FAT (entry 0x%08x)",</div><div class='add'>+		exfat_fs_error_ratelimit(sb,</div><div class='add'>+			"invalid access to FAT (entry 0x%08x)",</div><div class='ctx'> 			loc);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = __exfat_ent_get(sb, loc, content);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		exfat_fs_error(sb,</div><div class='add'>+		exfat_fs_error_ratelimit(sb,</div><div class='ctx'> 			"failed to access to FAT (entry 0x%08x, err:%d)",</div><div class='ctx'> 			loc, err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*content == EXFAT_FREE_CLUSTER) {</div><div class='del'>-		exfat_fs_error(sb,</div><div class='add'>+		exfat_fs_error_ratelimit(sb,</div><div class='ctx'> 			"invalid access to FAT free cluster (entry 0x%08x)",</div><div class='ctx'> 			loc);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*content == EXFAT_BAD_CLUSTER) {</div><div class='del'>-		exfat_fs_error(sb,</div><div class='add'>+		exfat_fs_error_ratelimit(sb,</div><div class='ctx'> 			"invalid access to FAT bad cluster (entry 0x%08x)",</div><div class='ctx'> 			loc);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*content != EXFAT_EOF_CLUSTER &amp;&amp; !is_valid_cluster(sbi, *content)) {</div><div class='del'>-		exfat_fs_error(sb,</div><div class='add'>+		exfat_fs_error_ratelimit(sb,</div><div class='ctx'> 			"invalid access to FAT (entry 0x%08x) bogus content (0x%08x)",</div><div class='ctx'> 			loc, *content);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -144,6 +145,20 @@ int exfat_chain_cont_cluster(struct super_block *sb, unsigned int chain,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void exfat_discard_cluster(struct super_block *sb,</div><div class='add'>+		unsigned int clu, unsigned int num_clusters)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+</div><div class='add'>+	ret = sb_issue_discard(sb, exfat_cluster_to_sector(sbi, clu),</div><div class='add'>+			sbi-&gt;sect_per_clus * num_clusters, GFP_NOFS, 0);</div><div class='add'>+	if (ret == -EOPNOTSUPP) {</div><div class='add'>+		exfat_err(sb, "discard not supported by device, disabling");</div><div class='add'>+		sbi-&gt;options.discard = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This function must be called with bitmap_lock held */</div><div class='ctx'> static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain)</div><div class='ctx'> {</div><div class='hunk'>@@ -175,6 +190,7 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain</div><div class='ctx'> 		BITMAP_OFFSET_SECTOR_INDEX(sb, CLUSTER_TO_BITMAP_ENT(clu));</div><div class='ctx'> </div><div class='ctx'> 	if (p_chain-&gt;flags == ALLOC_NO_FAT_CHAIN) {</div><div class='add'>+		int err;</div><div class='ctx'> 		unsigned int last_cluster = p_chain-&gt;dir + p_chain-&gt;size - 1;</div><div class='ctx'> 		do {</div><div class='ctx'> 			bool sync = false;</div><div class='hunk'>@@ -189,11 +205,18 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain</div><div class='ctx'> 				cur_cmap_i = next_cmap_i;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			exfat_clear_bitmap(inode, clu, (sync &amp;&amp; IS_DIRSYNC(inode)));</div><div class='add'>+			err = exfat_clear_bitmap(sb, clu, (sync &amp;&amp; IS_DIRSYNC(inode)));</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='ctx'> 			clu++;</div><div class='ctx'> 			num_clusters++;</div><div class='ctx'> 		} while (num_clusters &lt; p_chain-&gt;size);</div><div class='add'>+</div><div class='add'>+		if (sbi-&gt;options.discard)</div><div class='add'>+			exfat_discard_cluster(sb, p_chain-&gt;dir, p_chain-&gt;size);</div><div class='ctx'> 	} else {</div><div class='add'>+		unsigned int nr_clu = 1;</div><div class='add'>+</div><div class='ctx'> 		do {</div><div class='ctx'> 			bool sync = false;</div><div class='ctx'> 			unsigned int n_clu = clu;</div><div class='hunk'>@@ -210,16 +233,36 @@ static int __exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain</div><div class='ctx'> 				cur_cmap_i = next_cmap_i;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			exfat_clear_bitmap(inode, clu, (sync &amp;&amp; IS_DIRSYNC(inode)));</div><div class='add'>+			if (exfat_clear_bitmap(sb, clu, (sync &amp;&amp; IS_DIRSYNC(inode))))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (sbi-&gt;options.discard) {</div><div class='add'>+				if (n_clu == clu + 1)</div><div class='add'>+					nr_clu++;</div><div class='add'>+				else {</div><div class='add'>+					exfat_discard_cluster(sb, clu - nr_clu + 1, nr_clu);</div><div class='add'>+					nr_clu = 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			clu = n_clu;</div><div class='ctx'> 			num_clusters++;</div><div class='ctx'> </div><div class='ctx'> 			if (err)</div><div class='del'>-				goto dec_used_clus;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (num_clusters &gt;= sbi-&gt;num_clusters - EXFAT_FIRST_CLUSTER) {</div><div class='add'>+				/*</div><div class='add'>+				 * The cluster chain includes a loop, scan the</div><div class='add'>+				 * bitmap to get the number of used clusters.</div><div class='add'>+				 */</div><div class='add'>+				exfat_count_used_clusters(sb, &amp;sbi-&gt;used_clusters);</div><div class='add'>+</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='ctx'> 		} while (clu != EXFAT_EOF_CLUSTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-dec_used_clus:</div><div class='ctx'> 	sbi-&gt;used_clusters -= num_clusters;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -252,7 +295,7 @@ int exfat_find_last_cluster(struct super_block *sb, struct exfat_chain *p_chain,</div><div class='ctx'> 		clu = next;</div><div class='ctx'> 		if (exfat_ent_get(sb, clu, &amp;next))</div><div class='ctx'> 			return -EIO;</div><div class='del'>-	} while (next != EXFAT_EOF_CLUSTER);</div><div class='add'>+	} while (next != EXFAT_EOF_CLUSTER &amp;&amp; count &lt;= p_chain-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	if (p_chain-&gt;size != count) {</div><div class='ctx'> 		exfat_fs_error(sb,</div><div class='hunk'>@@ -366,7 +409,7 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* update allocation bitmap */</div><div class='del'>-		if (exfat_set_bitmap(inode, new_clu, sync_bmap)) {</div><div class='add'>+		if (exfat_set_bitmap(sb, new_clu, sync_bmap)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto free_cluster;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -448,5 +491,15 @@ int exfat_count_num_clusters(struct super_block *sb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*ret_count = count;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * since exfat_count_used_clusters() is not called, sbi-&gt;used_clusters</div><div class='add'>+	 * cannot be used here.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(i == sbi-&gt;num_clusters &amp;&amp; clu != EXFAT_EOF_CLUSTER)) {</div><div class='add'>+		exfat_fs_error(sb, "The cluster chain has a loop");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/exfat/file.c b/fs/exfat/file.c<br/>index d25a96a148af..536c8078f0c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/file.c</a></div><div class='hunk'>@@ -25,57 +25,63 @@ static int exfat_cont_expand(struct inode *inode, loff_t size)</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_chain clu;</div><div class='ctx'> </div><div class='add'>+	truncate_pagecache(inode, i_size_read(inode));</div><div class='add'>+</div><div class='ctx'> 	ret = inode_newsize_ok(inode, size);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	num_clusters = EXFAT_B_TO_CLU_ROUND_UP(ei-&gt;i_size_ondisk, sbi);</div><div class='add'>+	num_clusters = EXFAT_B_TO_CLU(exfat_ondisk_size(inode), sbi);</div><div class='ctx'> 	new_num_clusters = EXFAT_B_TO_CLU_ROUND_UP(size, sbi);</div><div class='ctx'> </div><div class='ctx'> 	if (new_num_clusters == num_clusters)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	exfat_chain_set(&amp;clu, ei-&gt;start_clu, num_clusters, ei-&gt;flags);</div><div class='del'>-	ret = exfat_find_last_cluster(sb, &amp;clu, &amp;last_clu);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (num_clusters) {</div><div class='add'>+		exfat_chain_set(&amp;clu, ei-&gt;start_clu, num_clusters, ei-&gt;flags);</div><div class='add'>+		ret = exfat_find_last_cluster(sb, &amp;clu, &amp;last_clu);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		clu.dir = last_clu + 1;</div><div class='add'>+	} else {</div><div class='add'>+		last_clu = EXFAT_EOF_CLUSTER;</div><div class='add'>+		clu.dir = EXFAT_EOF_CLUSTER;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	clu.dir = (last_clu == EXFAT_EOF_CLUSTER) ?</div><div class='del'>-			EXFAT_EOF_CLUSTER : last_clu + 1;</div><div class='ctx'> 	clu.size = 0;</div><div class='ctx'> 	clu.flags = ei-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	ret = exfat_alloc_cluster(inode, new_num_clusters - num_clusters,</div><div class='del'>-			&amp;clu, IS_DIRSYNC(inode));</div><div class='add'>+			&amp;clu, inode_needs_sync(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Append new clusters to chain */</div><div class='del'>-	if (clu.flags != ei-&gt;flags) {</div><div class='del'>-		exfat_chain_cont_cluster(sb, ei-&gt;start_clu, num_clusters);</div><div class='del'>-		ei-&gt;flags = ALLOC_FAT_CHAIN;</div><div class='del'>-	}</div><div class='del'>-	if (clu.flags == ALLOC_FAT_CHAIN)</div><div class='del'>-		if (exfat_ent_set(sb, last_clu, clu.dir))</div><div class='del'>-			goto free_clu;</div><div class='del'>-</div><div class='del'>-	if (num_clusters == 0)</div><div class='add'>+	if (num_clusters) {</div><div class='add'>+		if (clu.flags != ei-&gt;flags)</div><div class='add'>+			if (exfat_chain_cont_cluster(sb, ei-&gt;start_clu, num_clusters))</div><div class='add'>+				goto free_clu;</div><div class='add'>+</div><div class='add'>+		if (clu.flags == ALLOC_FAT_CHAIN)</div><div class='add'>+			if (exfat_ent_set(sb, last_clu, clu.dir))</div><div class='add'>+				goto free_clu;</div><div class='add'>+	} else</div><div class='ctx'> 		ei-&gt;start_clu = clu.dir;</div><div class='ctx'> </div><div class='add'>+	ei-&gt;flags = clu.flags;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='ctx'> 	/* Expanded range not zeroed, do not update valid_size */</div><div class='ctx'> 	i_size_write(inode, size);</div><div class='ctx'> </div><div class='del'>-	ei-&gt;i_size_aligned = round_up(size, sb-&gt;s_blocksize);</div><div class='del'>-	ei-&gt;i_size_ondisk = ei-&gt;i_size_aligned;</div><div class='ctx'> 	inode-&gt;i_blocks = round_up(size, sbi-&gt;cluster_size) &gt;&gt; 9;</div><div class='add'>+	mark_inode_dirty(inode);</div><div class='ctx'> </div><div class='del'>-	if (IS_DIRSYNC(inode))</div><div class='add'>+	if (IS_SYNC(inode))</div><div class='ctx'> 		return write_inode_now(inode, 1);</div><div class='ctx'> </div><div class='del'>-	mark_inode_dirty(inode);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_clu:</div><div class='hunk'>@@ -83,12 +89,14 @@ free_clu:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool exfat_allow_set_time(struct exfat_sb_info *sbi, struct inode *inode)</div><div class='add'>+static bool exfat_allow_set_time(struct mnt_idmap *idmap,</div><div class='add'>+				 struct exfat_sb_info *sbi, struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	mode_t allow_utime = sbi-&gt;options.allow_utime;</div><div class='ctx'> </div><div class='del'>-	if (!uid_eq(current_fsuid(), inode-&gt;i_uid)) {</div><div class='del'>-		if (in_group_p(inode-&gt;i_gid))</div><div class='add'>+	if (!vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode),</div><div class='add'>+			    current_fsuid())) {</div><div class='add'>+		if (vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)))</div><div class='ctx'> 			allow_utime &gt;&gt;= 3;</div><div class='ctx'> 		if (allow_utime &amp; MAY_WRITE)</div><div class='ctx'> 			return true;</div><div class='hunk'>@@ -151,7 +159,7 @@ int __exfat_truncate(struct inode *inode)</div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='ctx'> </div><div class='ctx'> 	num_clusters_new = EXFAT_B_TO_CLU_ROUND_UP(i_size_read(inode), sbi);</div><div class='del'>-	num_clusters_phys = EXFAT_B_TO_CLU_ROUND_UP(ei-&gt;i_size_ondisk, sbi);</div><div class='add'>+	num_clusters_phys = EXFAT_B_TO_CLU(exfat_ondisk_size(inode), sbi);</div><div class='ctx'> </div><div class='ctx'> 	exfat_chain_set(&amp;clu, ei-&gt;start_clu, num_clusters_phys, ei-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -237,8 +245,6 @@ void exfat_truncate(struct inode *inode)</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='del'>-	unsigned int blocksize = i_blocksize(inode);</div><div class='del'>-	loff_t aligned_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='hunk'>@@ -256,17 +262,6 @@ void exfat_truncate(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_blocks = round_up(i_size_read(inode), sbi-&gt;cluster_size) &gt;&gt; 9;</div><div class='ctx'> write_size:</div><div class='del'>-	aligned_size = i_size_read(inode);</div><div class='del'>-	if (aligned_size &amp; (blocksize - 1)) {</div><div class='del'>-		aligned_size |= (blocksize - 1);</div><div class='del'>-		aligned_size++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ei-&gt;i_size_ondisk &gt; i_size_read(inode))</div><div class='del'>-		ei-&gt;i_size_ondisk = aligned_size;</div><div class='del'>-</div><div class='del'>-	if (ei-&gt;i_size_aligned &gt; i_size_read(inode))</div><div class='del'>-		ei-&gt;i_size_aligned = aligned_size;</div><div class='ctx'> 	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -277,7 +272,7 @@ int exfat_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 	struct inode *inode = d_backing_inode(path-&gt;dentry);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='ctx'> </div><div class='del'>-	generic_fillattr(&amp;nop_mnt_idmap, request_mask, inode, stat);</div><div class='add'>+	generic_fillattr(idmap, request_mask, inode, stat);</div><div class='ctx'> 	exfat_truncate_atime(&amp;stat-&gt;atime);</div><div class='ctx'> 	stat-&gt;result_mask |= STATX_BTIME;</div><div class='ctx'> 	stat-&gt;btime.tv_sec = ei-&gt;i_crtime.tv_sec;</div><div class='hunk'>@@ -294,6 +289,9 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	unsigned int ia_valid;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(exfat_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if ((attr-&gt;ia_valid &amp; ATTR_SIZE) &amp;&amp;</div><div class='ctx'> 	    attr-&gt;ia_size &gt; i_size_read(inode)) {</div><div class='ctx'> 		error = exfat_cont_expand(inode, attr-&gt;ia_size);</div><div class='hunk'>@@ -305,20 +303,22 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	/* Check for setting the inode time. */</div><div class='ctx'> 	ia_valid = attr-&gt;ia_valid;</div><div class='ctx'> 	if ((ia_valid &amp; (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) &amp;&amp;</div><div class='del'>-	    exfat_allow_set_time(sbi, inode)) {</div><div class='add'>+	    exfat_allow_set_time(idmap, sbi, inode)) {</div><div class='ctx'> 		attr-&gt;ia_valid &amp;= ~(ATTR_MTIME_SET | ATTR_ATIME_SET |</div><div class='ctx'> 				ATTR_TIMES_SET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = setattr_prepare(&amp;nop_mnt_idmap, dentry, attr);</div><div class='add'>+	error = setattr_prepare(idmap, dentry, attr);</div><div class='ctx'> 	attr-&gt;ia_valid = ia_valid;</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (((attr-&gt;ia_valid &amp; ATTR_UID) &amp;&amp;</div><div class='del'>-	     !uid_eq(attr-&gt;ia_uid, sbi-&gt;options.fs_uid)) ||</div><div class='add'>+	      (!uid_eq(from_vfsuid(idmap, i_user_ns(inode), attr-&gt;ia_vfsuid),</div><div class='add'>+	       sbi-&gt;options.fs_uid))) ||</div><div class='ctx'> 	    ((attr-&gt;ia_valid &amp; ATTR_GID) &amp;&amp;</div><div class='del'>-	     !gid_eq(attr-&gt;ia_gid, sbi-&gt;options.fs_gid)) ||</div><div class='add'>+	      (!gid_eq(from_vfsgid(idmap, i_user_ns(inode), attr-&gt;ia_vfsgid),</div><div class='add'>+	       sbi-&gt;options.fs_gid))) ||</div><div class='ctx'> 	    ((attr-&gt;ia_valid &amp; ATTR_MODE) &amp;&amp;</div><div class='ctx'> 	     (attr-&gt;ia_mode &amp; ~(S_IFREG | S_IFLNK | S_IFDIR | 0777)))) {</div><div class='ctx'> 		error = -EPERM;</div><div class='hunk'>@@ -337,7 +337,7 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	if (attr-&gt;ia_valid &amp; ATTR_SIZE)</div><div class='ctx'> 		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='ctx'> </div><div class='del'>-	setattr_copy(&amp;nop_mnt_idmap, inode, attr);</div><div class='add'>+	setattr_copy(idmap, inode, attr);</div><div class='ctx'> 	exfat_truncate_inode_atime(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;ia_valid &amp; ATTR_SIZE) {</div><div class='hunk'>@@ -475,6 +475,68 @@ static int exfat_ioctl_fitrim(struct inode *inode, unsigned long arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int exfat_ioctl_shutdown(struct super_block *sb, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (get_user(flags, (__u32 __user *)arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return exfat_force_shutdown(sb, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exfat_ioctl_get_volume_label(struct super_block *sb, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	char label[FSLABEL_MAX] = {0};</div><div class='add'>+	struct exfat_uni_name uniname;</div><div class='add'>+</div><div class='add'>+	ret = exfat_read_volume_label(sb, &amp;uniname);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = exfat_utf16_to_nls(sb, &amp;uniname, label, uniname.name_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((char __user *)arg, label, ret + 1))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exfat_ioctl_set_volume_label(struct super_block *sb,</div><div class='add'>+					unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, lossy, label_len;</div><div class='add'>+	char label[FSLABEL_MAX] = {0};</div><div class='add'>+	struct exfat_uni_name uniname;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(label, (char __user *)arg, FSLABEL_MAX))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;uniname, 0, sizeof(uniname));</div><div class='add'>+	label_len = strnlen(label, FSLABEL_MAX - 1);</div><div class='add'>+	if (label[0]) {</div><div class='add'>+		ret = exfat_nls_to_utf16(sb, label, label_len,</div><div class='add'>+					 &amp;uniname, &amp;lossy);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		else if (lossy &amp; NLS_NAME_LOSSY)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uniname.name_len = ret;</div><div class='add'>+</div><div class='add'>+	return exfat_write_volume_label(sb, &amp;uniname);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> long exfat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='hunk'>@@ -485,8 +547,14 @@ long exfat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		return exfat_ioctl_get_attributes(inode, user_attr);</div><div class='ctx'> 	case FAT_IOCTL_SET_ATTRIBUTES:</div><div class='ctx'> 		return exfat_ioctl_set_attributes(filp, user_attr);</div><div class='add'>+	case EXFAT_IOC_SHUTDOWN:</div><div class='add'>+		return exfat_ioctl_shutdown(inode-&gt;i_sb, arg);</div><div class='ctx'> 	case FITRIM:</div><div class='ctx'> 		return exfat_ioctl_fitrim(inode, arg);</div><div class='add'>+	case FS_IOC_GETFSLABEL:</div><div class='add'>+		return exfat_ioctl_get_volume_label(inode-&gt;i_sb, arg);</div><div class='add'>+	case FS_IOC_SETFSLABEL:</div><div class='add'>+		return exfat_ioctl_set_volume_label(inode-&gt;i_sb, arg);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -505,6 +573,9 @@ int exfat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	struct inode *inode = filp-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(exfat_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	err = __generic_file_fsync(filp, start, end, datasync);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -516,37 +587,42 @@ int exfat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	return blkdev_issue_flush(inode-&gt;i_sb-&gt;s_bdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_file_zeroed_range(struct file *file, loff_t start, loff_t end)</div><div class='add'>+static int exfat_extend_valid_size(struct inode *inode, loff_t new_valid_size)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='add'>+	loff_t pos;</div><div class='add'>+	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	const struct address_space_operations *ops = mapping-&gt;a_ops;</div><div class='ctx'> </div><div class='del'>-	while (start &lt; end) {</div><div class='del'>-		u32 zerofrom, len;</div><div class='del'>-		struct page *page = NULL;</div><div class='add'>+	pos = ei-&gt;valid_size;</div><div class='add'>+	while (pos &lt; new_valid_size) {</div><div class='add'>+		u32 len;</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		unsigned long off;</div><div class='ctx'> </div><div class='del'>-		zerofrom = start &amp; (PAGE_SIZE - 1);</div><div class='del'>-		len = PAGE_SIZE - zerofrom;</div><div class='del'>-		if (start + len &gt; end)</div><div class='del'>-			len = end - start;</div><div class='add'>+		len = PAGE_SIZE - (pos &amp; (PAGE_SIZE - 1));</div><div class='add'>+		if (pos + len &gt; new_valid_size)</div><div class='add'>+			len = new_valid_size - pos;</div><div class='ctx'> </div><div class='del'>-		err = ops-&gt;write_begin(file, mapping, start, len, &amp;page, NULL);</div><div class='add'>+		err = ops-&gt;write_begin(NULL, mapping, pos, len, &amp;folio, NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		zero_user_segment(page, zerofrom, zerofrom + len);</div><div class='add'>+		off = offset_in_folio(folio, pos);</div><div class='add'>+		folio_zero_new_buffers(folio, off, off + len);</div><div class='ctx'> </div><div class='del'>-		err = ops-&gt;write_end(file, mapping, start, len, len, page, NULL);</div><div class='add'>+		err = ops-&gt;write_end(NULL, mapping, pos, len, len, folio, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		start += len;</div><div class='add'>+		pos += len;</div><div class='ctx'> </div><div class='ctx'> 		balance_dirty_pages_ratelimited(mapping);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -560,16 +636,32 @@ static ssize_t exfat_file_write_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	loff_t pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	loff_t valid_size;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(exfat_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='add'>+	if (pos &gt; i_size_read(inode))</div><div class='add'>+		truncate_pagecache(inode, i_size_read(inode));</div><div class='add'>+</div><div class='ctx'> 	valid_size = ei-&gt;valid_size;</div><div class='ctx'> </div><div class='ctx'> 	ret = generic_write_checks(iocb, iter);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt;= 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='add'>+		unsigned long align = pos | iov_iter_alignment(iter);</div><div class='add'>+</div><div class='add'>+		if (!IS_ALIGNED(align, i_blocksize(inode)) &amp;&amp;</div><div class='add'>+		    !IS_ALIGNED(align, bdev_logical_block_size(inode-&gt;i_sb-&gt;s_bdev))) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (pos &gt; valid_size) {</div><div class='del'>-		ret = exfat_file_zeroed_range(file, valid_size, pos);</div><div class='add'>+		ret = exfat_extend_valid_size(inode, pos);</div><div class='ctx'> 		if (ret &lt; 0 &amp;&amp; ret != -ENOSPC) {</div><div class='ctx'> 			exfat_err(inode-&gt;i_sb,</div><div class='ctx'> 				"write: fail to zero from %llu to %llu(%zd)",</div><div class='hunk'>@@ -588,9 +680,8 @@ static ssize_t exfat_file_write_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	if (pos &gt; valid_size)</div><div class='ctx'> 		pos = valid_size;</div><div class='ctx'> </div><div class='del'>-	if (iocb_is_dsync(iocb) &amp;&amp; iocb-&gt;ki_pos &gt; pos) {</div><div class='del'>-		ssize_t err = vfs_fsync_range(file, pos, iocb-&gt;ki_pos - 1,</div><div class='del'>-				iocb-&gt;ki_flags &amp; IOCB_SYNC);</div><div class='add'>+	if (iocb-&gt;ki_pos &gt; pos) {</div><div class='add'>+		ssize_t err = generic_write_sync(iocb, iocb-&gt;ki_pos - pos);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -603,39 +694,83 @@ unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static ssize_t exfat_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return generic_file_read_iter(iocb, iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static vm_fault_t exfat_page_mkwrite(struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct vm_area_struct *vma = vmf-&gt;vma;</div><div class='add'>+	struct file *file = vma-&gt;vm_file;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='del'>-	loff_t start = ((loff_t)vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	loff_t end = min_t(loff_t, i_size_read(inode),</div><div class='add'>+	loff_t start, end;</div><div class='add'>+</div><div class='add'>+	if (!inode_trylock(inode))</div><div class='add'>+		return VM_FAULT_RETRY;</div><div class='add'>+</div><div class='add'>+	start = ((loff_t)vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	end = min_t(loff_t, i_size_read(inode),</div><div class='ctx'> 			start + vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='ctx'> </div><div class='del'>-	if ((vma-&gt;vm_flags &amp; VM_WRITE) &amp;&amp; ei-&gt;valid_size &lt; end) {</div><div class='del'>-		ret = exfat_file_zeroed_range(file, ei-&gt;valid_size, end);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			exfat_err(inode-&gt;i_sb,</div><div class='del'>-				  "mmap: fail to zero from %llu to %llu(%d)",</div><div class='del'>-				  start, end, ret);</div><div class='del'>-			return ret;</div><div class='add'>+	if (ei-&gt;valid_size &lt; end) {</div><div class='add'>+		err = exfat_extend_valid_size(inode, end);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			inode_unlock(inode);</div><div class='add'>+			return vmf_fs_error(err);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return generic_file_mmap(file, vma);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+	return filemap_page_mkwrite(vmf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct vm_operations_struct exfat_file_vm_ops = {</div><div class='add'>+	.fault		= filemap_fault,</div><div class='add'>+	.map_pages	= filemap_map_pages,</div><div class='add'>+	.page_mkwrite	= exfat_page_mkwrite,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int exfat_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='add'>+</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(file_inode(desc-&gt;file)-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	file_accessed(file);</div><div class='add'>+	desc-&gt;vm_ops = &amp;exfat_file_vm_ops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t exfat_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+		struct pipe_inode_info *pipe, size_t len, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(file_inode(in)-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return filemap_splice_read(in, ppos, pipe, len, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct file_operations exfat_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='del'>-	.read_iter	= generic_file_read_iter,</div><div class='add'>+	.read_iter	= exfat_file_read_iter,</div><div class='ctx'> 	.write_iter	= exfat_file_write_iter,</div><div class='ctx'> 	.unlocked_ioctl = exfat_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl = exfat_compat_ioctl,</div><div class='ctx'> #endif</div><div class='del'>-	.mmap		= exfat_file_mmap,</div><div class='add'>+	.mmap_prepare	= exfat_file_mmap_prepare,</div><div class='ctx'> 	.fsync		= exfat_file_fsync,</div><div class='del'>-	.splice_read	= filemap_splice_read,</div><div class='add'>+	.splice_read	= exfat_splice_read,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c<br/>index 522edcbb2ce4..f9501c3a3666 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/inode.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ int __exfat_write_inode(struct inode *inode, int sync)</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='del'>-	bool is_dir = (ei-&gt;type == TYPE_DIR) ? true : false;</div><div class='add'>+	bool is_dir = (ei-&gt;type == TYPE_DIR);</div><div class='ctx'> 	struct timespec64 ts;</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_ino == EXFAT_ROOT_INO)</div><div class='hunk'>@@ -43,7 +43,7 @@ int __exfat_write_inode(struct inode *inode, int sync)</div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* get the directory entry of given file or directory */</div><div class='del'>-	if (exfat_get_dentry_set(&amp;es, sb, &amp;(ei-&gt;dir), ei-&gt;entry, ES_ALL_ENTRIES))</div><div class='add'>+	if (exfat_get_dentry_set_by_ei(&amp;es, sb, ei))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	ep = exfat_get_dentry_cached(&amp;es, ES_IDX_FILE);</div><div class='ctx'> 	ep2 = exfat_get_dentry_cached(&amp;es, ES_IDX_STREAM);</div><div class='hunk'>@@ -94,7 +94,7 @@ int __exfat_write_inode(struct inode *inode, int sync)</div><div class='ctx'> 		ep2-&gt;dentry.stream.start_clu = EXFAT_FREE_CLUSTER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	exfat_update_dir_chksum_with_entry_set(&amp;es);</div><div class='add'>+	exfat_update_dir_chksum(&amp;es);</div><div class='ctx'> 	return exfat_put_dentry_set(&amp;es, sync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +102,9 @@ int exfat_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(exfat_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;EXFAT_SB(inode-&gt;i_sb)-&gt;s_lock);</div><div class='ctx'> 	ret = __exfat_write_inode(inode, wbc-&gt;sync_mode == WB_SYNC_ALL);</div><div class='ctx'> 	mutex_unlock(&amp;EXFAT_SB(inode-&gt;i_sb)-&gt;s_lock);</div><div class='hunk'>@@ -130,11 +133,9 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='ctx'> 	unsigned int local_clu_offset = clu_offset;</div><div class='del'>-	unsigned int num_to_be_allocated = 0, num_clusters = 0;</div><div class='add'>+	unsigned int num_to_be_allocated = 0, num_clusters;</div><div class='ctx'> </div><div class='del'>-	if (ei-&gt;i_size_ondisk &gt; 0)</div><div class='del'>-		num_clusters =</div><div class='del'>-			EXFAT_B_TO_CLU_ROUND_UP(ei-&gt;i_size_ondisk, sbi);</div><div class='add'>+	num_clusters = EXFAT_B_TO_CLU(exfat_ondisk_size(inode), sbi);</div><div class='ctx'> </div><div class='ctx'> 	if (clu_offset &gt;= num_clusters)</div><div class='ctx'> 		num_to_be_allocated = clu_offset - num_clusters + 1;</div><div class='hunk'>@@ -260,21 +261,6 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_map_new_buffer(struct exfat_inode_info *ei,</div><div class='del'>-		struct buffer_head *bh, loff_t pos)</div><div class='del'>-{</div><div class='del'>-	if (buffer_delay(bh) &amp;&amp; pos &gt; ei-&gt;i_size_aligned)</div><div class='del'>-		return -EIO;</div><div class='del'>-	set_buffer_new(bh);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Adjust i_size_aligned if i_size_ondisk is bigger than it.</div><div class='del'>-	 */</div><div class='del'>-	if (ei-&gt;i_size_ondisk &gt; ei-&gt;i_size_aligned)</div><div class='del'>-		ei-&gt;i_size_aligned = ei-&gt;i_size_ondisk;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int exfat_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 		struct buffer_head *bh_result, int create)</div><div class='ctx'> {</div><div class='hunk'>@@ -288,10 +274,11 @@ static int exfat_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	sector_t last_block;</div><div class='ctx'> 	sector_t phys = 0;</div><div class='ctx'> 	sector_t valid_blks;</div><div class='del'>-	loff_t pos;</div><div class='add'>+	loff_t i_size;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='del'>-	last_block = EXFAT_B_TO_BLK_ROUND_UP(i_size_read(inode), sb);</div><div class='add'>+	i_size = i_size_read(inode);</div><div class='add'>+	last_block = EXFAT_B_TO_BLK_ROUND_UP(i_size, sb);</div><div class='ctx'> 	if (iblock &gt;= last_block &amp;&amp; !create)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='hunk'>@@ -316,93 +303,103 @@ static int exfat_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	mapped_blocks = sbi-&gt;sect_per_clus - sec_offset;</div><div class='ctx'> 	max_blocks = min(mapped_blocks, max_blocks);</div><div class='ctx'> </div><div class='del'>-	pos = EXFAT_BLK_TO_B((iblock + 1), sb);</div><div class='del'>-	if ((create &amp;&amp; iblock &gt;= last_block) || buffer_delay(bh_result)) {</div><div class='del'>-		if (ei-&gt;i_size_ondisk &lt; pos)</div><div class='del'>-			ei-&gt;i_size_ondisk = pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	map_bh(bh_result, sb, phys);</div><div class='ctx'> 	if (buffer_delay(bh_result))</div><div class='ctx'> 		clear_buffer_delay(bh_result);</div><div class='ctx'> </div><div class='del'>-	if (create) {</div><div class='add'>+	/*</div><div class='add'>+	 * In most cases, we just need to set bh_result to mapped, unmapped</div><div class='add'>+	 * or new status as follows:</div><div class='add'>+	 *  1. i_size == valid_size</div><div class='add'>+	 *  2. write case (create == 1)</div><div class='add'>+	 *  3. direct_read (!bh_result-&gt;b_folio)</div><div class='add'>+	 *     -&gt; the unwritten part will be zeroed in exfat_direct_IO()</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise, in the case of buffered read, it is necessary to take</div><div class='add'>+	 * care the last nested block if valid_size is not equal to i_size.</div><div class='add'>+	 */</div><div class='add'>+	if (i_size == ei-&gt;valid_size || create || !bh_result-&gt;b_folio)</div><div class='ctx'> 		valid_blks = EXFAT_B_TO_BLK_ROUND_UP(ei-&gt;valid_size, sb);</div><div class='add'>+	else</div><div class='add'>+		valid_blks = EXFAT_B_TO_BLK(ei-&gt;valid_size, sb);</div><div class='ctx'> </div><div class='del'>-		if (iblock + max_blocks &lt; valid_blks) {</div><div class='del'>-			/* The range has been written, map it */</div><div class='del'>-			goto done;</div><div class='del'>-		} else if (iblock &lt; valid_blks) {</div><div class='del'>-			/*</div><div class='del'>-			 * The range has been partially written,</div><div class='del'>-			 * map the written part.</div><div class='del'>-			 */</div><div class='del'>-			max_blocks = valid_blks - iblock;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+	/* The range has been fully written, map it */</div><div class='add'>+	if (iblock + max_blocks &lt; valid_blks)</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-		/* The area has not been written, map and mark as new. */</div><div class='del'>-		err = exfat_map_new_buffer(ei, bh_result, pos);</div><div class='del'>-		if (err) {</div><div class='del'>-			exfat_fs_error(sb,</div><div class='del'>-					"requested for bmap out of range(pos : (%llu) &gt; i_size_aligned(%llu)\n",</div><div class='del'>-					pos, ei-&gt;i_size_aligned);</div><div class='del'>-			goto unlock_ret;</div><div class='del'>-		}</div><div class='add'>+	/* The range has been partially written, map the written part */</div><div class='add'>+	if (iblock &lt; valid_blks) {</div><div class='add'>+		max_blocks = valid_blks - iblock;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* The area has not been written, map and mark as new for create case */</div><div class='add'>+	if (create) {</div><div class='add'>+		set_buffer_new(bh_result);</div><div class='ctx'> 		ei-&gt;valid_size = EXFAT_BLK_TO_B(iblock + max_blocks, sb);</div><div class='ctx'> 		mark_inode_dirty(inode);</div><div class='del'>-	} else {</div><div class='del'>-		valid_blks = EXFAT_B_TO_BLK(ei-&gt;valid_size, sb);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The area has just one block partially written.</div><div class='add'>+	 * In that case, we should read and fill the unwritten part of</div><div class='add'>+	 * a block with zero.</div><div class='add'>+	 */</div><div class='add'>+	if (bh_result-&gt;b_folio &amp;&amp; iblock == valid_blks &amp;&amp;</div><div class='add'>+	    (ei-&gt;valid_size &amp; (sb-&gt;s_blocksize - 1))) {</div><div class='add'>+		loff_t size, pos;</div><div class='add'>+		void *addr;</div><div class='ctx'> </div><div class='del'>-		if (iblock + max_blocks &lt; valid_blks) {</div><div class='del'>-			/* The range has been written, map it */</div><div class='add'>+		max_blocks = 1;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * No buffer_head is allocated.</div><div class='add'>+		 * (1) bmap: It's enough to set blocknr without I/O.</div><div class='add'>+		 * (2) read: The unwritten part should be filled with zero.</div><div class='add'>+		 *           If a folio does not have any buffers,</div><div class='add'>+		 *           let's returns -EAGAIN to fallback to</div><div class='add'>+		 *           block_read_full_folio() for per-bh IO.</div><div class='add'>+		 */</div><div class='add'>+		if (!folio_buffers(bh_result-&gt;b_folio)) {</div><div class='add'>+			err = -EAGAIN;</div><div class='ctx'> 			goto done;</div><div class='del'>-		} else if (iblock &lt; valid_blks) {</div><div class='del'>-			/*</div><div class='del'>-			 * The area has been partially written,</div><div class='del'>-			 * map the written part.</div><div class='del'>-			 */</div><div class='del'>-			max_blocks = valid_blks - iblock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos = EXFAT_BLK_TO_B(iblock, sb);</div><div class='add'>+		size = ei-&gt;valid_size - pos;</div><div class='add'>+		addr = folio_address(bh_result-&gt;b_folio) +</div><div class='add'>+			offset_in_folio(bh_result-&gt;b_folio, pos);</div><div class='add'>+</div><div class='add'>+		/* Check if bh-&gt;b_data points to proper addr in folio */</div><div class='add'>+		if (bh_result-&gt;b_data != addr) {</div><div class='add'>+			exfat_fs_error_ratelimit(sb,</div><div class='add'>+					"b_data(%p) != folio_addr(%p)",</div><div class='add'>+					bh_result-&gt;b_data, addr);</div><div class='add'>+			err = -EINVAL;</div><div class='ctx'> 			goto done;</div><div class='del'>-		} else if (iblock == valid_blks &amp;&amp;</div><div class='del'>-			   (ei-&gt;valid_size &amp; (sb-&gt;s_blocksize - 1))) {</div><div class='del'>-			/*</div><div class='del'>-			 * The block has been partially written,</div><div class='del'>-			 * zero the unwritten part and map the block.</div><div class='del'>-			 */</div><div class='del'>-			loff_t size, off;</div><div class='del'>-</div><div class='del'>-			max_blocks = 1;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * For direct read, the unwritten part will be zeroed in</div><div class='del'>-			 * exfat_direct_IO()</div><div class='del'>-			 */</div><div class='del'>-			if (!bh_result-&gt;b_folio)</div><div class='del'>-				goto done;</div><div class='del'>-</div><div class='del'>-			pos -= sb-&gt;s_blocksize;</div><div class='del'>-			size = ei-&gt;valid_size - pos;</div><div class='del'>-			off = pos &amp; (PAGE_SIZE - 1);</div><div class='del'>-</div><div class='del'>-			folio_set_bh(bh_result, bh_result-&gt;b_folio, off);</div><div class='del'>-			err = bh_read(bh_result, 0);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto unlock_ret;</div><div class='del'>-</div><div class='del'>-			folio_zero_segment(bh_result-&gt;b_folio, off + size,</div><div class='del'>-					off + sb-&gt;s_blocksize);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * The range has not been written, clear the mapped flag</div><div class='del'>-			 * to only zero the cache and do not read from disk.</div><div class='del'>-			 */</div><div class='del'>-			clear_buffer_mapped(bh_result);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Read a block */</div><div class='add'>+		err = bh_read(bh_result, 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		/* Zero unwritten part of a block */</div><div class='add'>+		memset(bh_result-&gt;b_data + size, 0, bh_result-&gt;b_size - size);</div><div class='add'>+		err = 0;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The area has not been written, clear mapped for read/bmap cases.</div><div class='add'>+	 * If so, it will be filled with zero without reading from disk.</div><div class='add'>+	 */</div><div class='add'>+	clear_buffer_mapped(bh_result);</div><div class='ctx'> done:</div><div class='ctx'> 	bh_result-&gt;b_size = EXFAT_BLK_TO_B(max_blocks, sb);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		clear_buffer_mapped(bh_result);</div><div class='ctx'> unlock_ret:</div><div class='ctx'> 	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -432,6 +429,9 @@ static void exfat_readahead(struct readahead_control *rac)</div><div class='ctx'> static int exfat_writepages(struct address_space *mapping,</div><div class='ctx'> 		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(mapping-&gt;host-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	return mpage_writepages(mapping, wbc, exfat_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -446,14 +446,17 @@ static void exfat_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned int len,</div><div class='del'>-		struct page **pagep, void **fsdata)</div><div class='add'>+static int exfat_write_begin(const struct kiocb *iocb,</div><div class='add'>+			     struct address_space *mapping,</div><div class='add'>+			     loff_t pos, unsigned int len,</div><div class='add'>+			     struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	ret = block_write_begin(mapping, pos, len, pagep, exfat_get_block);</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(mapping-&gt;host-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = block_write_begin(mapping, pos, len, foliop, exfat_get_block);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		exfat_write_failed(mapping, pos+len);</div><div class='hunk'>@@ -461,23 +464,16 @@ static int exfat_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned int len, unsigned int copied,</div><div class='del'>-		struct page *pagep, void *fsdata)</div><div class='add'>+static int exfat_write_end(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned int len, unsigned int copied,</div><div class='add'>+			   struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = generic_write_end(file, mapping, pos, len, copied, pagep, fsdata);</div><div class='del'>-</div><div class='del'>-	if (ei-&gt;i_size_aligned &lt; i_size_read(inode)) {</div><div class='del'>-		exfat_fs_error(inode-&gt;i_sb,</div><div class='del'>-			"invalid size(size(%llu) &gt; aligned(%llu)\n",</div><div class='del'>-			i_size_read(inode), ei-&gt;i_size_aligned);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	err = generic_write_end(iocb, mapping, pos, len, copied, folio, fsdata);</div><div class='ctx'> 	if (err &lt; len)</div><div class='ctx'> 		exfat_write_failed(mapping, pos+len);</div><div class='ctx'> </div><div class='hunk'>@@ -501,40 +497,35 @@ static ssize_t exfat_direct_IO(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='ctx'> 	loff_t pos = iocb-&gt;ki_pos;</div><div class='del'>-	loff_t size = iocb-&gt;ki_pos + iov_iter_count(iter);</div><div class='add'>+	loff_t size = pos + iov_iter_count(iter);</div><div class='ctx'> 	int rw = iov_iter_rw(iter);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	if (rw == WRITE) {</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: blockdev_direct_IO() doesn't use -&gt;write_begin(),</div><div class='del'>-		 * so we need to update the -&gt;i_size_aligned to block boundary.</div><div class='del'>-		 *</div><div class='del'>-		 * But we must fill the remaining area or hole by nul for</div><div class='del'>-		 * updating -&gt;i_size_aligned</div><div class='del'>-		 *</div><div class='del'>-		 * Return 0, and fallback to normal buffered write.</div><div class='del'>-		 */</div><div class='del'>-		if (EXFAT_I(inode)-&gt;i_size_aligned &lt; size)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Need to use the DIO_LOCKING for avoiding the race</div><div class='ctx'> 	 * condition of exfat_get_block() and -&gt;truncate().</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = blockdev_direct_IO(iocb, inode, iter, exfat_get_block);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		if (rw == WRITE)</div><div class='add'>+		if (rw == WRITE &amp;&amp; ret != -EIOCBQUEUED)</div><div class='ctx'> 			exfat_write_failed(mapping, size);</div><div class='ctx'> </div><div class='del'>-		if (ret != -EIOCBQUEUED)</div><div class='del'>-			return ret;</div><div class='add'>+		return ret;</div><div class='ctx'> 	} else</div><div class='ctx'> 		size = pos + ret;</div><div class='ctx'> </div><div class='del'>-	/* zero the unwritten part in the partially written block */</div><div class='del'>-	if (rw == READ &amp;&amp; pos &lt; ei-&gt;valid_size &amp;&amp; ei-&gt;valid_size &lt; size) {</div><div class='add'>+	if (rw == WRITE) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the block had been partially written before this write,</div><div class='add'>+		 * -&gt;valid_size will not be updated in exfat_get_block(),</div><div class='add'>+		 * update it here.</div><div class='add'>+		 */</div><div class='add'>+		if (ei-&gt;valid_size &lt; size) {</div><div class='add'>+			ei-&gt;valid_size = size;</div><div class='add'>+			mark_inode_dirty(inode);</div><div class='add'>+		}</div><div class='add'>+	} else if (pos &lt; ei-&gt;valid_size &amp;&amp; ei-&gt;valid_size &lt; size) {</div><div class='add'>+		/* zero the unwritten part in the partially written block */</div><div class='ctx'> 		iov_iter_revert(iter, size - ei-&gt;valid_size);</div><div class='ctx'> 		iov_iter_zero(size - ei-&gt;valid_size, iter);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -669,15 +660,6 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)</div><div class='ctx'> </div><div class='ctx'> 	i_size_write(inode, size);</div><div class='ctx'> </div><div class='del'>-	/* ondisk and aligned size should be aligned with block size */</div><div class='del'>-	if (size &amp; (inode-&gt;i_sb-&gt;s_blocksize - 1)) {</div><div class='del'>-		size |= (inode-&gt;i_sb-&gt;s_blocksize - 1);</div><div class='del'>-		size++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ei-&gt;i_size_aligned = size;</div><div class='del'>-	ei-&gt;i_size_ondisk = size;</div><div class='del'>-</div><div class='ctx'> 	exfat_save_attr(inode, info-&gt;attr);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_blocks = round_up(i_size_read(inode), sbi-&gt;cluster_size) &gt;&gt; 9;</div><div class='head'>diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c<br/>index 9c549fd11fc8..dfe957493d49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/namei.c</a></div><div class='hunk'>@@ -31,10 +31,9 @@ static inline void exfat_d_version_set(struct dentry *dentry,</div><div class='ctx'>  * If it happened, the negative dentry isn't actually negative anymore.  So,</div><div class='ctx'>  * drop it.</div><div class='ctx'>  */</div><div class='del'>-static int exfat_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int exfat_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			      struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='ctx'> </div><div class='hunk'>@@ -58,11 +57,7 @@ static int exfat_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	if (flags &amp; (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	ret = inode_eq_iversion(d_inode(dentry-&gt;d_parent),</div><div class='del'>-			exfat_d_version(dentry));</div><div class='del'>-	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	return ret;</div><div class='add'>+	return inode_eq_iversion(dir, exfat_d_version(dentry));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns the length of a struct qstr, ignoring trailing dots if necessary */</div><div class='hunk'>@@ -204,21 +199,16 @@ const struct dentry_operations exfat_utf8_dentry_ops = {</div><div class='ctx'> 	.d_compare	= exfat_utf8_d_cmp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* used only in search empty_slot() */</div><div class='del'>-#define CNT_UNUSED_NOHIT        (-1)</div><div class='del'>-#define CNT_UNUSED_HIT          (-2)</div><div class='ctx'> /* search EMPTY CONTINUOUS "num_entries" entries */</div><div class='ctx'> static int exfat_search_empty_slot(struct super_block *sb,</div><div class='ctx'> 		struct exfat_hint_femp *hint_femp, struct exfat_chain *p_dir,</div><div class='del'>-		int num_entries)</div><div class='add'>+		int num_entries, struct exfat_entry_set_cache *es)</div><div class='ctx'> {</div><div class='del'>-	int i, dentry, num_empty = 0;</div><div class='add'>+	int i, dentry, ret;</div><div class='ctx'> 	int dentries_per_clu;</div><div class='del'>-	unsigned int type;</div><div class='ctx'> 	struct exfat_chain clu;</div><div class='del'>-	struct exfat_dentry *ep;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-	struct buffer_head *bh;</div><div class='add'>+	int total_entries = EXFAT_CLU_TO_DEN(p_dir-&gt;size, sbi);</div><div class='ctx'> </div><div class='ctx'> 	dentries_per_clu = sbi-&gt;dentries_per_clu;</div><div class='ctx'> </div><div class='hunk'>@@ -231,7 +221,7 @@ static int exfat_search_empty_slot(struct super_block *sb,</div><div class='ctx'> 		 * Otherwise, and if "dentry + hint_famp-&gt;count" is also equal</div><div class='ctx'> 		 * to "p_dir-&gt;size * dentries_per_clu", it means ENOSPC.</div><div class='ctx'> 		 */</div><div class='del'>-		if (dentry + hint_femp-&gt;count == p_dir-&gt;size * dentries_per_clu &amp;&amp;</div><div class='add'>+		if (dentry + hint_femp-&gt;count == total_entries &amp;&amp;</div><div class='ctx'> 		    num_entries &gt; hint_femp-&gt;count)</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> </div><div class='hunk'>@@ -242,69 +232,41 @@ static int exfat_search_empty_slot(struct super_block *sb,</div><div class='ctx'> 		dentry = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (clu.dir != EXFAT_EOF_CLUSTER) {</div><div class='add'>+	while (dentry + num_entries &lt;= total_entries &amp;&amp;</div><div class='add'>+	       clu.dir != EXFAT_EOF_CLUSTER) {</div><div class='ctx'> 		i = dentry &amp; (dentries_per_clu - 1);</div><div class='ctx'> </div><div class='del'>-		for (; i &lt; dentries_per_clu; i++, dentry++) {</div><div class='del'>-			ep = exfat_get_dentry(sb, &amp;clu, i, &amp;bh);</div><div class='del'>-			if (!ep)</div><div class='del'>-				return -EIO;</div><div class='del'>-			type = exfat_get_entry_type(ep);</div><div class='del'>-			brelse(bh);</div><div class='del'>-</div><div class='del'>-			if (type == TYPE_UNUSED || type == TYPE_DELETED) {</div><div class='del'>-				num_empty++;</div><div class='del'>-				if (hint_femp-&gt;eidx == EXFAT_HINT_NONE) {</div><div class='del'>-					hint_femp-&gt;eidx = dentry;</div><div class='del'>-					hint_femp-&gt;count = CNT_UNUSED_NOHIT;</div><div class='del'>-					exfat_chain_set(&amp;hint_femp-&gt;cur,</div><div class='del'>-						clu.dir, clu.size, clu.flags);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (type == TYPE_UNUSED &amp;&amp;</div><div class='del'>-				    hint_femp-&gt;count != CNT_UNUSED_HIT)</div><div class='del'>-					hint_femp-&gt;count = CNT_UNUSED_HIT;</div><div class='add'>+		ret = exfat_get_empty_dentry_set(es, sb, &amp;clu, i, num_entries);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		else if (ret == 0)</div><div class='add'>+			return dentry;</div><div class='add'>+</div><div class='add'>+		dentry += ret;</div><div class='add'>+		i += ret;</div><div class='add'>+</div><div class='add'>+		while (i &gt;= dentries_per_clu) {</div><div class='add'>+			if (clu.flags == ALLOC_NO_FAT_CHAIN) {</div><div class='add'>+				if (--clu.size &gt; 0)</div><div class='add'>+					clu.dir++;</div><div class='add'>+				else</div><div class='add'>+					clu.dir = EXFAT_EOF_CLUSTER;</div><div class='ctx'> 			} else {</div><div class='del'>-				if (hint_femp-&gt;eidx != EXFAT_HINT_NONE &amp;&amp;</div><div class='del'>-				    hint_femp-&gt;count == CNT_UNUSED_HIT) {</div><div class='del'>-					/* unused empty group means</div><div class='del'>-					 * an empty group which includes</div><div class='del'>-					 * unused dentry</div><div class='del'>-					 */</div><div class='del'>-					exfat_fs_error(sb,</div><div class='del'>-						"found bogus dentry(%d) beyond unused empty group(%d) (start_clu : %u, cur_clu : %u)",</div><div class='del'>-						dentry, hint_femp-&gt;eidx,</div><div class='del'>-						p_dir-&gt;dir, clu.dir);</div><div class='add'>+				if (exfat_get_next_cluster(sb, &amp;clu.dir))</div><div class='ctx'> 					return -EIO;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				num_empty = 0;</div><div class='del'>-				hint_femp-&gt;eidx = EXFAT_HINT_NONE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (num_empty &gt;= num_entries) {</div><div class='del'>-				/* found and invalidate hint_femp */</div><div class='del'>-				hint_femp-&gt;eidx = EXFAT_HINT_NONE;</div><div class='del'>-				return (dentry - (num_entries - 1));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (clu.flags == ALLOC_NO_FAT_CHAIN) {</div><div class='del'>-			if (--clu.size &gt; 0)</div><div class='del'>-				clu.dir++;</div><div class='del'>-			else</div><div class='del'>-				clu.dir = EXFAT_EOF_CLUSTER;</div><div class='del'>-		} else {</div><div class='del'>-			if (exfat_get_next_cluster(sb, &amp;clu.dir))</div><div class='del'>-				return -EIO;</div><div class='add'>+			i -= dentries_per_clu;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hint_femp-&gt;eidx = p_dir-&gt;size * dentries_per_clu - num_empty;</div><div class='del'>-	hint_femp-&gt;count = num_empty;</div><div class='del'>-	if (num_empty == 0)</div><div class='add'>+	hint_femp-&gt;eidx = dentry;</div><div class='add'>+	hint_femp-&gt;count = 0;</div><div class='add'>+	if (dentry == total_entries || clu.dir == EXFAT_EOF_CLUSTER)</div><div class='ctx'> 		exfat_chain_set(&amp;hint_femp-&gt;cur, EXFAT_EOF_CLUSTER, 0,</div><div class='ctx'> 				clu.flags);</div><div class='add'>+	else</div><div class='add'>+		hint_femp-&gt;cur = clu;</div><div class='ctx'> </div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='hunk'>@@ -321,11 +283,26 @@ static int exfat_check_max_dentries(struct inode *inode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* find empty directory entry.</div><div class='del'>- * if there isn't any empty slot, expand cluster chain.</div><div class='add'>+/*</div><div class='add'>+ * Find an empty directory entry set.</div><div class='add'>+ *</div><div class='add'>+ * If there isn't any empty slot, expand cluster chain.</div><div class='add'>+ *</div><div class='add'>+ * in:</div><div class='add'>+ *   inode: inode of the parent directory</div><div class='add'>+ *   num_entries: specifies how many dentries in the empty directory entry set</div><div class='add'>+ *</div><div class='add'>+ * out:</div><div class='add'>+ *   p_dir: the cluster where the empty directory entry set is located</div><div class='add'>+ *   es: The found empty directory entry set</div><div class='add'>+ *</div><div class='add'>+ * return:</div><div class='add'>+ *   the directory entry index in p_dir is returned on succeeds</div><div class='add'>+ *   -error code is returned on failure</div><div class='ctx'>  */</div><div class='del'>-static int exfat_find_empty_entry(struct inode *inode,</div><div class='del'>-		struct exfat_chain *p_dir, int num_entries)</div><div class='add'>+int exfat_find_empty_entry(struct inode *inode,</div><div class='add'>+		struct exfat_chain *p_dir, int num_entries,</div><div class='add'>+		struct exfat_entry_set_cache *es)</div><div class='ctx'> {</div><div class='ctx'> 	int dentry;</div><div class='ctx'> 	unsigned int ret, last_clu;</div><div class='hunk'>@@ -343,10 +320,13 @@ static int exfat_find_empty_entry(struct inode *inode,</div><div class='ctx'> 		ei-&gt;hint_femp.eidx = EXFAT_HINT_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	exfat_chain_set(p_dir, ei-&gt;start_clu,</div><div class='add'>+			EXFAT_B_TO_CLU(i_size_read(inode), sbi), ei-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	while ((dentry = exfat_search_empty_slot(sb, &amp;hint_femp, p_dir,</div><div class='del'>-					num_entries)) &lt; 0) {</div><div class='del'>-		if (dentry == -EIO)</div><div class='del'>-			break;</div><div class='add'>+					num_entries, es)) &lt; 0) {</div><div class='add'>+		if (dentry != -ENOSPC)</div><div class='add'>+			return dentry;</div><div class='ctx'> </div><div class='ctx'> 		if (exfat_check_max_dentries(inode))</div><div class='ctx'> 			return -ENOSPC;</div><div class='hunk'>@@ -377,6 +357,7 @@ static int exfat_find_empty_entry(struct inode *inode,</div><div class='ctx'> 		if (ei-&gt;start_clu == EXFAT_EOF_CLUSTER) {</div><div class='ctx'> 			ei-&gt;start_clu = clu.dir;</div><div class='ctx'> 			p_dir-&gt;dir = clu.dir;</div><div class='add'>+			hint_femp.eidx = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* append to the FAT chain */</div><div class='hunk'>@@ -404,14 +385,15 @@ static int exfat_find_empty_entry(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		/* directory inode should be updated in here */</div><div class='ctx'> 		i_size_write(inode, size);</div><div class='del'>-		ei-&gt;i_size_ondisk += sbi-&gt;cluster_size;</div><div class='del'>-		ei-&gt;i_size_aligned += sbi-&gt;cluster_size;</div><div class='ctx'> 		ei-&gt;valid_size += sbi-&gt;cluster_size;</div><div class='ctx'> 		ei-&gt;flags = p_dir-&gt;flags;</div><div class='ctx'> 		inode-&gt;i_blocks += sbi-&gt;cluster_size &gt;&gt; 9;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return dentry;</div><div class='add'>+	p_dir-&gt;dir = exfat_sector_to_cluster(sbi, es-&gt;bh[0]-&gt;b_blocknr);</div><div class='add'>+	p_dir-&gt;size -= dentry / sbi-&gt;dentries_per_clu;</div><div class='add'>+</div><div class='add'>+	return dentry &amp; (sbi-&gt;dentries_per_clu - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -419,14 +401,11 @@ static int exfat_find_empty_entry(struct inode *inode,</div><div class='ctx'>  * Zero if it was successful; otherwise nonzero.</div><div class='ctx'>  */</div><div class='ctx'> static int __exfat_resolve_path(struct inode *inode, const unsigned char *path,</div><div class='del'>-		struct exfat_chain *p_dir, struct exfat_uni_name *p_uniname,</div><div class='del'>-		int lookup)</div><div class='add'>+		struct exfat_uni_name *p_uniname, int lookup)</div><div class='ctx'> {</div><div class='ctx'> 	int namelen;</div><div class='ctx'> 	int lossy = NLS_NAME_NO_LOSSY;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='ctx'> 	int pathlen = strlen(path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -463,26 +442,21 @@ static int __exfat_resolve_path(struct inode *inode, const unsigned char *path,</div><div class='ctx'> 		return namelen; /* return error value */</div><div class='ctx'> </div><div class='ctx'> 	if ((lossy &amp;&amp; !lookup) || !namelen)</div><div class='del'>-		return (lossy &amp; NLS_NAME_OVERLEN) ? -ENAMETOOLONG : -EINVAL;</div><div class='del'>-</div><div class='del'>-	exfat_chain_set(p_dir, ei-&gt;start_clu,</div><div class='del'>-		EXFAT_B_TO_CLU(i_size_read(inode), sbi), ei-&gt;flags);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int exfat_resolve_path(struct inode *inode,</div><div class='del'>-		const unsigned char *path, struct exfat_chain *dir,</div><div class='del'>-		struct exfat_uni_name *uni)</div><div class='add'>+		const unsigned char *path, struct exfat_uni_name *uni)</div><div class='ctx'> {</div><div class='del'>-	return __exfat_resolve_path(inode, path, dir, uni, 0);</div><div class='add'>+	return __exfat_resolve_path(inode, path, uni, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int exfat_resolve_path_for_lookup(struct inode *inode,</div><div class='del'>-		const unsigned char *path, struct exfat_chain *dir,</div><div class='del'>-		struct exfat_uni_name *uni)</div><div class='add'>+		const unsigned char *path, struct exfat_uni_name *uni)</div><div class='ctx'> {</div><div class='del'>-	return __exfat_resolve_path(inode, path, dir, uni, 1);</div><div class='add'>+	return __exfat_resolve_path(inode, path, uni, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline loff_t exfat_make_i_pos(struct exfat_dir_entry *info)</div><div class='hunk'>@@ -491,18 +465,19 @@ static inline loff_t exfat_make_i_pos(struct exfat_dir_entry *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exfat_add_entry(struct inode *inode, const char *path,</div><div class='del'>-		struct exfat_chain *p_dir, unsigned int type,</div><div class='del'>-		struct exfat_dir_entry *info)</div><div class='add'>+		unsigned int type, struct exfat_dir_entry *info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, dentry, num_entries;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_uni_name uniname;</div><div class='ctx'> 	struct exfat_chain clu;</div><div class='add'>+	struct timespec64 ts = current_time(inode);</div><div class='add'>+	struct exfat_entry_set_cache es;</div><div class='ctx'> 	int clu_size = 0;</div><div class='ctx'> 	unsigned int start_clu = EXFAT_FREE_CLUSTER;</div><div class='ctx'> </div><div class='del'>-	ret = exfat_resolve_path(inode, path, p_dir, &amp;uniname);</div><div class='add'>+	ret = exfat_resolve_path(inode, path, &amp;uniname);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -513,7 +488,7 @@ static int exfat_add_entry(struct inode *inode, const char *path,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* exfat_find_empty_entry must be called before alloc_cluster() */</div><div class='del'>-	dentry = exfat_find_empty_entry(inode, p_dir, num_entries);</div><div class='add'>+	dentry = exfat_find_empty_entry(inode, &amp;info-&gt;dir, num_entries, &amp;es);</div><div class='ctx'> 	if (dentry &lt; 0) {</div><div class='ctx'> 		ret = dentry; /* -EIO or -ENOSPC */</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -521,8 +496,10 @@ static int exfat_add_entry(struct inode *inode, const char *path,</div><div class='ctx'> </div><div class='ctx'> 	if (type == TYPE_DIR &amp;&amp; !sbi-&gt;options.zero_size_dir) {</div><div class='ctx'> 		ret = exfat_alloc_new_dir(inode, &amp;clu);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (ret) {</div><div class='add'>+			exfat_put_dentry_set(&amp;es, false);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		start_clu = clu.dir;</div><div class='ctx'> 		clu_size = sbi-&gt;cluster_size;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -531,16 +508,13 @@ static int exfat_add_entry(struct inode *inode, const char *path,</div><div class='ctx'> 	/* fill the dos name directory entry information of the created file.</div><div class='ctx'> 	 * the first cluster is not determined yet. (0)</div><div class='ctx'> 	 */</div><div class='del'>-	ret = exfat_init_dir_entry(inode, p_dir, dentry, type,</div><div class='del'>-		start_clu, clu_size);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	exfat_init_dir_entry(&amp;es, type, start_clu, clu_size, &amp;ts);</div><div class='add'>+	exfat_init_ext_entry(&amp;es, num_entries, &amp;uniname);</div><div class='ctx'> </div><div class='del'>-	ret = exfat_init_ext_entry(inode, p_dir, dentry, num_entries, &amp;uniname);</div><div class='add'>+	ret = exfat_put_dentry_set(&amp;es, IS_DIRSYNC(inode));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	info-&gt;dir = *p_dir;</div><div class='ctx'> 	info-&gt;entry = dentry;</div><div class='ctx'> 	info-&gt;flags = ALLOC_NO_FAT_CHAIN;</div><div class='ctx'> 	info-&gt;type = type;</div><div class='hunk'>@@ -573,21 +547,23 @@ static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct exfat_chain cdir;</div><div class='ctx'> 	struct exfat_dir_entry info;</div><div class='ctx'> 	loff_t i_pos;</div><div class='ctx'> 	int err;</div><div class='add'>+	loff_t size = i_size_read(dir);</div><div class='add'>+</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;EXFAT_SB(sb)-&gt;s_lock);</div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='del'>-	err = exfat_add_entry(dir, dentry-&gt;d_name.name, &amp;cdir, TYPE_FILE,</div><div class='del'>-		&amp;info);</div><div class='add'>+	err = exfat_add_entry(dir, dentry-&gt;d_name.name, TYPE_FILE, &amp;info);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_iversion(dir);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='del'>-	if (IS_DIRSYNC(dir))</div><div class='add'>+	if (IS_DIRSYNC(dir) &amp;&amp; size != i_size_read(dir))</div><div class='ctx'> 		exfat_sync_inode(dir);</div><div class='ctx'> 	else</div><div class='ctx'> 		mark_inode_dirty(dir);</div><div class='hunk'>@@ -611,7 +587,7 @@ unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* lookup a file */</div><div class='del'>-static int exfat_find(struct inode *dir, struct qstr *qname,</div><div class='add'>+static int exfat_find(struct inode *dir, const struct qstr *qname,</div><div class='ctx'> 		struct exfat_dir_entry *info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, dentry, count;</div><div class='hunk'>@@ -629,10 +605,13 @@ static int exfat_find(struct inode *dir, struct qstr *qname,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	/* check the validity of directory name in the given pathname */</div><div class='del'>-	ret = exfat_resolve_path_for_lookup(dir, qname-&gt;name, &amp;cdir, &amp;uni_name);</div><div class='add'>+	ret = exfat_resolve_path_for_lookup(dir, qname-&gt;name, &amp;uni_name);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	exfat_chain_set(&amp;cdir, ei-&gt;start_clu,</div><div class='add'>+		EXFAT_B_TO_CLU(i_size_read(dir), sbi), ei-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	/* check the validation of hint_stat and initialize it if required */</div><div class='ctx'> 	if (ei-&gt;version != (inode_peek_iversion_raw(dir) &amp; 0xffffffff)) {</div><div class='ctx'> 		ei-&gt;hint_stat.clu = cdir.dir;</div><div class='hunk'>@@ -646,15 +625,16 @@ static int exfat_find(struct inode *dir, struct qstr *qname,</div><div class='ctx'> 	if (dentry &lt; 0)</div><div class='ctx'> 		return dentry; /* -error value */</div><div class='ctx'> </div><div class='del'>-	info-&gt;dir = cdir;</div><div class='del'>-	info-&gt;entry = dentry;</div><div class='del'>-	info-&gt;num_subdirs = 0;</div><div class='del'>-</div><div class='ctx'> 	/* adjust cdir to the optimized value */</div><div class='ctx'> 	cdir.dir = hint_opt.clu;</div><div class='ctx'> 	if (cdir.flags &amp; ALLOC_NO_FAT_CHAIN)</div><div class='ctx'> 		cdir.size -= dentry / sbi-&gt;dentries_per_clu;</div><div class='ctx'> 	dentry = hint_opt.eidx;</div><div class='add'>+</div><div class='add'>+	info-&gt;dir = cdir;</div><div class='add'>+	info-&gt;entry = dentry;</div><div class='add'>+	info-&gt;num_subdirs = 0;</div><div class='add'>+</div><div class='ctx'> 	if (exfat_get_dentry_set(&amp;es, sb, &amp;cdir, dentry, ES_2_ENTRIES))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	ep = exfat_get_dentry_cached(&amp;es, ES_IDX_FILE);</div><div class='hunk'>@@ -662,17 +642,28 @@ static int exfat_find(struct inode *dir, struct qstr *qname,</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;type = exfat_get_entry_type(ep);</div><div class='ctx'> 	info-&gt;attr = le16_to_cpu(ep-&gt;dentry.file.attr);</div><div class='del'>-	info-&gt;size = le64_to_cpu(ep2-&gt;dentry.stream.valid_size);</div><div class='ctx'> 	info-&gt;valid_size = le64_to_cpu(ep2-&gt;dentry.stream.valid_size);</div><div class='ctx'> 	info-&gt;size = le64_to_cpu(ep2-&gt;dentry.stream.size);</div><div class='add'>+</div><div class='add'>+	info-&gt;start_clu = le32_to_cpu(ep2-&gt;dentry.stream.start_clu);</div><div class='add'>+	if (!is_valid_cluster(sbi, info-&gt;start_clu) &amp;&amp; info-&gt;size) {</div><div class='add'>+		exfat_warn(sb, "start_clu is invalid cluster(0x%x)",</div><div class='add'>+				info-&gt;start_clu);</div><div class='add'>+		info-&gt;size = 0;</div><div class='add'>+		info-&gt;valid_size = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;valid_size &gt; info-&gt;size) {</div><div class='add'>+		exfat_warn(sb, "valid_size(%lld) is greater than size(%lld)",</div><div class='add'>+				info-&gt;valid_size, info-&gt;size);</div><div class='add'>+		info-&gt;valid_size = info-&gt;size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (info-&gt;size == 0) {</div><div class='ctx'> 		info-&gt;flags = ALLOC_NO_FAT_CHAIN;</div><div class='ctx'> 		info-&gt;start_clu = EXFAT_EOF_CLUSTER;</div><div class='del'>-	} else {</div><div class='add'>+	} else</div><div class='ctx'> 		info-&gt;flags = ep2-&gt;dentry.stream.flags;</div><div class='del'>-		info-&gt;start_clu =</div><div class='del'>-			le32_to_cpu(ep2-&gt;dentry.stream.start_clu);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	exfat_get_entry_time(sbi, &amp;info-&gt;crtime,</div><div class='ctx'> 			     ep-&gt;dentry.file.create_tz,</div><div class='hunk'>@@ -691,6 +682,16 @@ static int exfat_find(struct inode *dir, struct qstr *qname,</div><div class='ctx'> 			     0);</div><div class='ctx'> 	exfat_put_dentry_set(&amp;es, false);</div><div class='ctx'> </div><div class='add'>+	if (info-&gt;valid_size &lt; 0) {</div><div class='add'>+		exfat_fs_error(sb, "data valid size is invalid(%lld)", info-&gt;valid_size);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(EXFAT_B_TO_CLU_ROUND_UP(info-&gt;size, sbi) &gt; sbi-&gt;used_clusters)) {</div><div class='add'>+		exfat_fs_error(sb, "data size is invalid(%lld)", info-&gt;size);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ei-&gt;start_clu == EXFAT_FREE_CLUSTER) {</div><div class='ctx'> 		exfat_fs_error(sb,</div><div class='ctx'> 			       "non-zero size file starts with zero cluster (size : %llu, p_dir : %u, entry : 0x%08x)",</div><div class='hunk'>@@ -794,43 +795,36 @@ unlock:</div><div class='ctx'> /* remove an entry, BUT don't truncate */</div><div class='ctx'> static int exfat_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct exfat_chain cdir;</div><div class='del'>-	struct exfat_dentry *ep;</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct inode *inode = dentry-&gt;d_inode;</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int num_entries, entry, err = 0;</div><div class='add'>+	struct exfat_entry_set_cache es;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;EXFAT_SB(sb)-&gt;s_lock);</div><div class='del'>-	exfat_chain_dup(&amp;cdir, &amp;ei-&gt;dir);</div><div class='del'>-	entry = ei-&gt;entry;</div><div class='ctx'> 	if (ei-&gt;dir.dir == DIR_DELETED) {</div><div class='ctx'> 		exfat_err(sb, "abnormal access to deleted dentry");</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ep = exfat_get_dentry(sb, &amp;cdir, entry, &amp;bh);</div><div class='del'>-	if (!ep) {</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-	num_entries = exfat_count_ext_entries(sb, &amp;cdir, entry, ep);</div><div class='del'>-	if (num_entries &lt; 0) {</div><div class='add'>+	err = exfat_get_dentry_set_by_ei(&amp;es, sb, ei);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		brelse(bh);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='del'>-	num_entries++;</div><div class='del'>-	brelse(bh);</div><div class='ctx'> </div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='add'>+</div><div class='ctx'> 	/* update the directory entry */</div><div class='del'>-	if (exfat_remove_entries(dir, &amp;cdir, entry, 0, num_entries)) {</div><div class='del'>-		err = -EIO;</div><div class='add'>+	exfat_remove_entries(inode, &amp;es, ES_IDX_FILE);</div><div class='add'>+</div><div class='add'>+	err = exfat_put_dentry_set(&amp;es, IS_DIRSYNC(inode));</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* This doesn't modify ei */</div><div class='ctx'> 	ei-&gt;dir.dir = DIR_DELETED;</div><div class='hunk'>@@ -838,10 +832,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	inode_inc_iversion(dir);</div><div class='ctx'> 	simple_inode_init_ts(dir);</div><div class='ctx'> 	exfat_truncate_inode_atime(dir);</div><div class='del'>-	if (IS_DIRSYNC(dir))</div><div class='del'>-		exfat_sync_inode(dir);</div><div class='del'>-	else</div><div class='del'>-		mark_inode_dirty(dir);</div><div class='add'>+	mark_inode_dirty(dir);</div><div class='ctx'> </div><div class='ctx'> 	clear_nlink(inode);</div><div class='ctx'> 	simple_inode_init_ts(inode);</div><div class='hunk'>@@ -853,26 +844,28 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		       struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				  struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct exfat_dir_entry info;</div><div class='del'>-	struct exfat_chain cdir;</div><div class='ctx'> 	loff_t i_pos;</div><div class='ctx'> 	int err;</div><div class='add'>+	loff_t size = i_size_read(dir);</div><div class='add'>+</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(sb)))</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;EXFAT_SB(sb)-&gt;s_lock);</div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='del'>-	err = exfat_add_entry(dir, dentry-&gt;d_name.name, &amp;cdir, TYPE_DIR,</div><div class='del'>-		&amp;info);</div><div class='add'>+	err = exfat_add_entry(dir, dentry-&gt;d_name.name, TYPE_DIR, &amp;info);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_iversion(dir);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='del'>-	if (IS_DIRSYNC(dir))</div><div class='add'>+	if (IS_DIRSYNC(dir) &amp;&amp; size != i_size_read(dir))</div><div class='ctx'> 		exfat_sync_inode(dir);</div><div class='ctx'> 	else</div><div class='ctx'> 		mark_inode_dirty(dir);</div><div class='hunk'>@@ -893,7 +886,7 @@ static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	mutex_unlock(&amp;EXFAT_SB(sb)-&gt;s_lock);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exfat_check_dir_empty(struct super_block *sb,</div><div class='hunk'>@@ -901,6 +894,7 @@ static int exfat_check_dir_empty(struct super_block *sb,</div><div class='ctx'> {</div><div class='ctx'> 	int i, dentries_per_clu;</div><div class='ctx'> 	unsigned int type;</div><div class='add'>+	unsigned int clu_count = 0;</div><div class='ctx'> 	struct exfat_chain clu;</div><div class='ctx'> 	struct exfat_dentry *ep;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='hunk'>@@ -937,6 +931,10 @@ static int exfat_check_dir_empty(struct super_block *sb,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (exfat_get_next_cluster(sb, &amp;(clu.dir)))</div><div class='ctx'> 				return -EIO;</div><div class='add'>+</div><div class='add'>+			/* break if the cluster chain includes a loop */</div><div class='add'>+			if (unlikely(++clu_count &gt; EXFAT_DATA_CLUSTER_COUNT(sbi)))</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -946,18 +944,17 @@ static int exfat_check_dir_empty(struct super_block *sb,</div><div class='ctx'> static int exfat_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = dentry-&gt;d_inode;</div><div class='del'>-	struct exfat_dentry *ep;</div><div class='del'>-	struct exfat_chain cdir, clu_to_free;</div><div class='add'>+	struct exfat_chain clu_to_free;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int num_entries, entry, err;</div><div class='add'>+	struct exfat_entry_set_cache es;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;EXFAT_SB(inode-&gt;i_sb)-&gt;s_lock);</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-	exfat_chain_dup(&amp;cdir, &amp;ei-&gt;dir);</div><div class='del'>-	entry = ei-&gt;entry;</div><div class='add'>+	mutex_lock(&amp;EXFAT_SB(inode-&gt;i_sb)-&gt;s_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ei-&gt;dir.dir == DIR_DELETED) {</div><div class='ctx'> 		exfat_err(sb, "abnormal access to deleted dentry");</div><div class='hunk'>@@ -976,27 +973,20 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ep = exfat_get_dentry(sb, &amp;cdir, entry, &amp;bh);</div><div class='del'>-	if (!ep) {</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	num_entries = exfat_count_ext_entries(sb, &amp;cdir, entry, ep);</div><div class='del'>-	if (num_entries &lt; 0) {</div><div class='add'>+	err = exfat_get_dentry_set_by_ei(&amp;es, sb, ei);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		brelse(bh);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='del'>-	num_entries++;</div><div class='del'>-	brelse(bh);</div><div class='ctx'> </div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='del'>-	err = exfat_remove_entries(dir, &amp;cdir, entry, 0, num_entries);</div><div class='del'>-	if (err) {</div><div class='del'>-		exfat_err(sb, "failed to exfat_remove_entries : err(%d)", err);</div><div class='add'>+</div><div class='add'>+	exfat_remove_entries(inode, &amp;es, ES_IDX_FILE);</div><div class='add'>+</div><div class='add'>+	err = exfat_put_dentry_set(&amp;es, IS_DIRSYNC(dir));</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	ei-&gt;dir.dir = DIR_DELETED;</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_iversion(dir);</div><div class='hunk'>@@ -1018,157 +1008,128 @@ unlock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,</div><div class='del'>-		int oldentry, struct exfat_uni_name *p_uniname,</div><div class='del'>-		struct exfat_inode_info *ei)</div><div class='add'>+static int exfat_rename_file(struct inode *parent_inode,</div><div class='add'>+		struct exfat_uni_name *p_uniname, struct exfat_inode_info *ei)</div><div class='ctx'> {</div><div class='del'>-	int ret, num_old_entries, num_new_entries;</div><div class='add'>+	int ret, num_new_entries;</div><div class='ctx'> 	struct exfat_dentry *epold, *epnew;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct buffer_head *new_bh, *old_bh;</div><div class='del'>-	int sync = IS_DIRSYNC(inode);</div><div class='del'>-</div><div class='del'>-	epold = exfat_get_dentry(sb, p_dir, oldentry, &amp;old_bh);</div><div class='del'>-	if (!epold)</div><div class='del'>-		return -EIO;</div><div class='add'>+	struct super_block *sb = parent_inode-&gt;i_sb;</div><div class='add'>+	struct exfat_entry_set_cache old_es, new_es;</div><div class='add'>+	int sync = IS_DIRSYNC(parent_inode);</div><div class='ctx'> </div><div class='del'>-	num_old_entries = exfat_count_ext_entries(sb, p_dir, oldentry, epold);</div><div class='del'>-	if (num_old_entries &lt; 0)</div><div class='add'>+	if (unlikely(exfat_forced_shutdown(sb)))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	num_old_entries++;</div><div class='ctx'> </div><div class='ctx'> 	num_new_entries = exfat_calc_num_entries(p_uniname);</div><div class='ctx'> 	if (num_new_entries &lt; 0)</div><div class='ctx'> 		return num_new_entries;</div><div class='ctx'> </div><div class='del'>-	if (num_old_entries &lt; num_new_entries) {</div><div class='del'>-		int newentry;</div><div class='add'>+	ret = exfat_get_dentry_set_by_ei(&amp;old_es, sb, ei);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		newentry =</div><div class='del'>-			exfat_find_empty_entry(inode, p_dir, num_new_entries);</div><div class='del'>-		if (newentry &lt; 0)</div><div class='del'>-			return newentry; /* -EIO or -ENOSPC */</div><div class='add'>+	epold = exfat_get_dentry_cached(&amp;old_es, ES_IDX_FILE);</div><div class='ctx'> </div><div class='del'>-		epnew = exfat_get_dentry(sb, p_dir, newentry, &amp;new_bh);</div><div class='del'>-		if (!epnew)</div><div class='del'>-			return -EIO;</div><div class='add'>+	if (old_es.num_entries &lt; num_new_entries) {</div><div class='add'>+		int newentry;</div><div class='add'>+		struct exfat_chain dir;</div><div class='add'>+</div><div class='add'>+		newentry = exfat_find_empty_entry(parent_inode, &amp;dir,</div><div class='add'>+				num_new_entries, &amp;new_es);</div><div class='add'>+		if (newentry &lt; 0) {</div><div class='add'>+			ret = newentry; /* -EIO or -ENOSPC */</div><div class='add'>+			goto put_old_es;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		epnew = exfat_get_dentry_cached(&amp;new_es, ES_IDX_FILE);</div><div class='ctx'> 		*epnew = *epold;</div><div class='ctx'> 		if (exfat_get_entry_type(epnew) == TYPE_FILE) {</div><div class='ctx'> 			epnew-&gt;dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);</div><div class='ctx'> 			ei-&gt;attr |= EXFAT_ATTR_ARCHIVE;</div><div class='ctx'> 		}</div><div class='del'>-		exfat_update_bh(new_bh, sync);</div><div class='del'>-		brelse(old_bh);</div><div class='del'>-		brelse(new_bh);</div><div class='del'>-</div><div class='del'>-		epold = exfat_get_dentry(sb, p_dir, oldentry + 1, &amp;old_bh);</div><div class='del'>-		if (!epold)</div><div class='del'>-			return -EIO;</div><div class='del'>-		epnew = exfat_get_dentry(sb, p_dir, newentry + 1, &amp;new_bh);</div><div class='del'>-		if (!epnew) {</div><div class='del'>-			brelse(old_bh);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='add'>+		epold = exfat_get_dentry_cached(&amp;old_es, ES_IDX_STREAM);</div><div class='add'>+		epnew = exfat_get_dentry_cached(&amp;new_es, ES_IDX_STREAM);</div><div class='ctx'> 		*epnew = *epold;</div><div class='del'>-		exfat_update_bh(new_bh, sync);</div><div class='del'>-		brelse(old_bh);</div><div class='del'>-		brelse(new_bh);</div><div class='ctx'> </div><div class='del'>-		ret = exfat_init_ext_entry(inode, p_dir, newentry,</div><div class='del'>-			num_new_entries, p_uniname);</div><div class='add'>+		exfat_init_ext_entry(&amp;new_es, num_new_entries, p_uniname);</div><div class='add'>+</div><div class='add'>+		ret = exfat_put_dentry_set(&amp;new_es, sync);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			goto put_old_es;</div><div class='ctx'> </div><div class='del'>-		exfat_remove_entries(inode, p_dir, oldentry, 0,</div><div class='del'>-			num_old_entries);</div><div class='del'>-		ei-&gt;dir = *p_dir;</div><div class='add'>+		exfat_remove_entries(parent_inode, &amp;old_es, ES_IDX_FILE);</div><div class='add'>+		ei-&gt;dir = dir;</div><div class='ctx'> 		ei-&gt;entry = newentry;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (exfat_get_entry_type(epold) == TYPE_FILE) {</div><div class='ctx'> 			epold-&gt;dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);</div><div class='ctx'> 			ei-&gt;attr |= EXFAT_ATTR_ARCHIVE;</div><div class='ctx'> 		}</div><div class='del'>-		exfat_update_bh(old_bh, sync);</div><div class='del'>-		brelse(old_bh);</div><div class='del'>-		ret = exfat_init_ext_entry(inode, p_dir, oldentry,</div><div class='del'>-			num_new_entries, p_uniname);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='del'>-		exfat_remove_entries(inode, p_dir, oldentry, num_new_entries,</div><div class='del'>-			num_old_entries);</div><div class='add'>+		exfat_remove_entries(parent_inode, &amp;old_es, ES_IDX_FIRST_FILENAME + 1);</div><div class='add'>+		exfat_init_ext_entry(&amp;old_es, num_new_entries, p_uniname);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return exfat_put_dentry_set(&amp;old_es, sync);</div><div class='add'>+</div><div class='add'>+put_old_es:</div><div class='add'>+	exfat_put_dentry_set(&amp;old_es, false);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,</div><div class='del'>-		int oldentry, struct exfat_chain *p_newdir,</div><div class='add'>+static int exfat_move_file(struct inode *parent_inode,</div><div class='ctx'> 		struct exfat_uni_name *p_uniname, struct exfat_inode_info *ei)</div><div class='ctx'> {</div><div class='del'>-	int ret, newentry, num_new_entries, num_old_entries;</div><div class='add'>+	int ret, newentry, num_new_entries;</div><div class='ctx'> 	struct exfat_dentry *epmov, *epnew;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct buffer_head *mov_bh, *new_bh;</div><div class='del'>-</div><div class='del'>-	epmov = exfat_get_dentry(sb, p_olddir, oldentry, &amp;mov_bh);</div><div class='del'>-	if (!epmov)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	num_old_entries = exfat_count_ext_entries(sb, p_olddir, oldentry,</div><div class='del'>-		epmov);</div><div class='del'>-	if (num_old_entries &lt; 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-	num_old_entries++;</div><div class='add'>+	struct exfat_entry_set_cache mov_es, new_es;</div><div class='add'>+	struct exfat_chain newdir;</div><div class='ctx'> </div><div class='ctx'> 	num_new_entries = exfat_calc_num_entries(p_uniname);</div><div class='ctx'> 	if (num_new_entries &lt; 0)</div><div class='ctx'> 		return num_new_entries;</div><div class='ctx'> </div><div class='del'>-	newentry = exfat_find_empty_entry(inode, p_newdir, num_new_entries);</div><div class='del'>-	if (newentry &lt; 0)</div><div class='del'>-		return newentry; /* -EIO or -ENOSPC */</div><div class='del'>-</div><div class='del'>-	epnew = exfat_get_dentry(sb, p_newdir, newentry, &amp;new_bh);</div><div class='del'>-	if (!epnew)</div><div class='add'>+	ret = exfat_get_dentry_set_by_ei(&amp;mov_es, parent_inode-&gt;i_sb, ei);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	newentry = exfat_find_empty_entry(parent_inode, &amp;newdir,</div><div class='add'>+			num_new_entries, &amp;new_es);</div><div class='add'>+	if (newentry &lt; 0) {</div><div class='add'>+		ret = newentry; /* -EIO or -ENOSPC */</div><div class='add'>+		goto put_mov_es;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	epmov = exfat_get_dentry_cached(&amp;mov_es, ES_IDX_FILE);</div><div class='add'>+	epnew = exfat_get_dentry_cached(&amp;new_es, ES_IDX_FILE);</div><div class='ctx'> 	*epnew = *epmov;</div><div class='ctx'> 	if (exfat_get_entry_type(epnew) == TYPE_FILE) {</div><div class='ctx'> 		epnew-&gt;dentry.file.attr |= cpu_to_le16(EXFAT_ATTR_ARCHIVE);</div><div class='ctx'> 		ei-&gt;attr |= EXFAT_ATTR_ARCHIVE;</div><div class='ctx'> 	}</div><div class='del'>-	exfat_update_bh(new_bh, IS_DIRSYNC(inode));</div><div class='del'>-	brelse(mov_bh);</div><div class='del'>-	brelse(new_bh);</div><div class='del'>-</div><div class='del'>-	epmov = exfat_get_dentry(sb, p_olddir, oldentry + 1, &amp;mov_bh);</div><div class='del'>-	if (!epmov)</div><div class='del'>-		return -EIO;</div><div class='del'>-	epnew = exfat_get_dentry(sb, p_newdir, newentry + 1, &amp;new_bh);</div><div class='del'>-	if (!epnew) {</div><div class='del'>-		brelse(mov_bh);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	epmov = exfat_get_dentry_cached(&amp;mov_es, ES_IDX_STREAM);</div><div class='add'>+	epnew = exfat_get_dentry_cached(&amp;new_es, ES_IDX_STREAM);</div><div class='ctx'> 	*epnew = *epmov;</div><div class='del'>-	exfat_update_bh(new_bh, IS_DIRSYNC(inode));</div><div class='del'>-	brelse(mov_bh);</div><div class='del'>-	brelse(new_bh);</div><div class='ctx'> </div><div class='del'>-	ret = exfat_init_ext_entry(inode, p_newdir, newentry, num_new_entries,</div><div class='del'>-		p_uniname);</div><div class='add'>+	exfat_init_ext_entry(&amp;new_es, num_new_entries, p_uniname);</div><div class='add'>+	exfat_remove_entries(parent_inode, &amp;mov_es, ES_IDX_FILE);</div><div class='add'>+</div><div class='add'>+	ei-&gt;dir = newdir;</div><div class='add'>+	ei-&gt;entry = newentry;</div><div class='add'>+</div><div class='add'>+	ret = exfat_put_dentry_set(&amp;new_es, IS_DIRSYNC(parent_inode));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto put_mov_es;</div><div class='ctx'> </div><div class='del'>-	exfat_remove_entries(inode, p_olddir, oldentry, 0, num_old_entries);</div><div class='add'>+	return exfat_put_dentry_set(&amp;mov_es, IS_DIRSYNC(parent_inode));</div><div class='ctx'> </div><div class='del'>-	exfat_chain_set(&amp;ei-&gt;dir, p_newdir-&gt;dir, p_newdir-&gt;size,</div><div class='del'>-		p_newdir-&gt;flags);</div><div class='add'>+put_mov_es:</div><div class='add'>+	exfat_put_dentry_set(&amp;mov_es, false);</div><div class='ctx'> </div><div class='del'>-	ei-&gt;entry = newentry;</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* rename or move a old file into a new file */</div><div class='hunk'>@@ -1177,20 +1138,12 @@ static int __exfat_rename(struct inode *old_parent_inode,</div><div class='ctx'> 		struct dentry *new_dentry)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	int dentry;</div><div class='del'>-	struct exfat_chain olddir, newdir;</div><div class='del'>-	struct exfat_chain *p_dir = NULL;</div><div class='ctx'> 	struct exfat_uni_name uni_name;</div><div class='del'>-	struct exfat_dentry *ep;</div><div class='ctx'> 	struct super_block *sb = old_parent_inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	const unsigned char *new_path = new_dentry-&gt;d_name.name;</div><div class='ctx'> 	struct inode *new_inode = new_dentry-&gt;d_inode;</div><div class='del'>-	int num_entries;</div><div class='ctx'> 	struct exfat_inode_info *new_ei = NULL;</div><div class='del'>-	unsigned int new_entry_type = TYPE_UNUSED;</div><div class='del'>-	int new_entry = 0;</div><div class='del'>-	struct buffer_head *new_bh = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* check the validity of pointer parameters */</div><div class='ctx'> 	if (new_path == NULL || strlen(new_path) == 0)</div><div class='hunk'>@@ -1201,11 +1154,6 @@ static int __exfat_rename(struct inode *old_parent_inode,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	exfat_chain_set(&amp;olddir, EXFAT_I(old_parent_inode)-&gt;start_clu,</div><div class='del'>-		EXFAT_B_TO_CLU_ROUND_UP(i_size_read(old_parent_inode), sbi),</div><div class='del'>-		EXFAT_I(old_parent_inode)-&gt;flags);</div><div class='del'>-	dentry = ei-&gt;entry;</div><div class='del'>-</div><div class='ctx'> 	/* check whether new dir is existing directory and empty */</div><div class='ctx'> 	if (new_inode) {</div><div class='ctx'> 		ret = -EIO;</div><div class='hunk'>@@ -1216,17 +1164,8 @@ static int __exfat_rename(struct inode *old_parent_inode,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		p_dir = &amp;(new_ei-&gt;dir);</div><div class='del'>-		new_entry = new_ei-&gt;entry;</div><div class='del'>-		ep = exfat_get_dentry(sb, p_dir, new_entry, &amp;new_bh);</div><div class='del'>-		if (!ep)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		new_entry_type = exfat_get_entry_type(ep);</div><div class='del'>-		brelse(new_bh);</div><div class='del'>-</div><div class='ctx'> 		/* if new_inode exists, update ei */</div><div class='del'>-		if (new_entry_type == TYPE_DIR) {</div><div class='add'>+		if (S_ISDIR(new_inode-&gt;i_mode)) {</div><div class='ctx'> 			struct exfat_chain new_clu;</div><div class='ctx'> </div><div class='ctx'> 			new_clu.dir = new_ei-&gt;start_clu;</div><div class='hunk'>@@ -1242,43 +1181,35 @@ static int __exfat_rename(struct inode *old_parent_inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check the validity of directory name in the given new pathname */</div><div class='del'>-	ret = exfat_resolve_path(new_parent_inode, new_path, &amp;newdir,</div><div class='del'>-			&amp;uni_name);</div><div class='add'>+	ret = exfat_resolve_path(new_parent_inode, new_path, &amp;uni_name);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	exfat_set_volume_dirty(sb);</div><div class='ctx'> </div><div class='del'>-	if (olddir.dir == newdir.dir)</div><div class='del'>-		ret = exfat_rename_file(new_parent_inode, &amp;olddir, dentry,</div><div class='del'>-				&amp;uni_name, ei);</div><div class='add'>+	if (new_parent_inode == old_parent_inode)</div><div class='add'>+		ret = exfat_rename_file(new_parent_inode, &amp;uni_name, ei);</div><div class='ctx'> 	else</div><div class='del'>-		ret = exfat_move_file(new_parent_inode, &amp;olddir, dentry,</div><div class='del'>-				&amp;newdir, &amp;uni_name, ei);</div><div class='add'>+		ret = exfat_move_file(new_parent_inode, &amp;uni_name, ei);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; new_inode) {</div><div class='add'>+		struct exfat_entry_set_cache es;</div><div class='add'>+</div><div class='ctx'> 		/* delete entries of new_dir */</div><div class='del'>-		ep = exfat_get_dentry(sb, p_dir, new_entry, &amp;new_bh);</div><div class='del'>-		if (!ep) {</div><div class='add'>+		ret = exfat_get_dentry_set_by_ei(&amp;es, sb, new_ei);</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto del_out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		num_entries = exfat_count_ext_entries(sb, p_dir, new_entry, ep);</div><div class='del'>-		if (num_entries &lt; 0) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto del_out;</div><div class='del'>-		}</div><div class='del'>-		brelse(new_bh);</div><div class='add'>+		exfat_remove_entries(new_inode, &amp;es, ES_IDX_FILE);</div><div class='ctx'> </div><div class='del'>-		if (exfat_remove_entries(new_inode, p_dir, new_entry, 0,</div><div class='del'>-				num_entries + 1)) {</div><div class='del'>-			ret = -EIO;</div><div class='add'>+		ret = exfat_put_dentry_set(&amp;es, IS_DIRSYNC(new_inode));</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto del_out;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* Free the clusters if new_inode is a dir(as if exfat_rmdir) */</div><div class='del'>-		if (new_entry_type == TYPE_DIR &amp;&amp;</div><div class='add'>+		if (S_ISDIR(new_inode-&gt;i_mode) &amp;&amp;</div><div class='ctx'> 		    new_ei-&gt;start_clu != EXFAT_EOF_CLUSTER) {</div><div class='ctx'> 			/* new_ei, new_clu_to_free */</div><div class='ctx'> 			struct exfat_chain new_clu_to_free;</div><div class='hunk'>@@ -1317,6 +1248,7 @@ static int exfat_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	struct super_block *sb = old_dir-&gt;i_sb;</div><div class='ctx'> 	loff_t i_pos;</div><div class='ctx'> 	int err;</div><div class='add'>+	loff_t size = i_size_read(new_dir);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The VFS already checks for existence, so for local filesystems</div><div class='hunk'>@@ -1338,7 +1270,7 @@ static int exfat_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);</div><div class='ctx'> 	EXFAT_I(new_dir)-&gt;i_crtime = current_time(new_dir);</div><div class='ctx'> 	exfat_truncate_inode_atime(new_dir);</div><div class='del'>-	if (IS_DIRSYNC(new_dir))</div><div class='add'>+	if (IS_DIRSYNC(new_dir) &amp;&amp; size != i_size_read(new_dir))</div><div class='ctx'> 		exfat_sync_inode(new_dir);</div><div class='ctx'> 	else</div><div class='ctx'> 		mark_inode_dirty(new_dir);</div><div class='hunk'>@@ -1359,9 +1291,7 @@ static int exfat_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_iversion(old_dir);</div><div class='del'>-	if (IS_DIRSYNC(old_dir))</div><div class='del'>-		exfat_sync_inode(old_dir);</div><div class='del'>-	else</div><div class='add'>+	if (new_dir != old_dir)</div><div class='ctx'> 		mark_inode_dirty(old_dir);</div><div class='ctx'> </div><div class='ctx'> 	if (new_inode) {</div><div class='head'>diff --git a/fs/exfat/nls.c b/fs/exfat/nls.c<br/>index 705710f93e2d..57db08a5271c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/nls.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/nls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/nls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/nls.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "exfat_raw.h"</div><div class='ctx'> #include "exfat_fs.h"</div><div class='hunk'>@@ -616,9 +616,6 @@ static int exfat_nls_to_ucs2(struct super_block *sb,</div><div class='ctx'> 		unilen++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (p_cstring[i] != '\0')</div><div class='del'>-		lossy |= NLS_NAME_OVERLEN;</div><div class='del'>-</div><div class='ctx'> 	*uniname = '\0';</div><div class='ctx'> 	p_uniname-&gt;name_len = unilen;</div><div class='ctx'> 	p_uniname-&gt;name_hash = exfat_calc_chksum16(upname, unilen &lt;&lt; 1, 0,</div><div class='hunk'>@@ -655,7 +652,6 @@ static int exfat_load_upcase_table(struct super_block *sb,</div><div class='ctx'> 	unsigned int sect_size = sb-&gt;s_blocksize;</div><div class='ctx'> 	unsigned int i, index = 0;</div><div class='ctx'> 	u32 chksum = 0;</div><div class='del'>-	int ret;</div><div class='ctx'> 	unsigned char skip = false;</div><div class='ctx'> 	unsigned short *upcase_table;</div><div class='ctx'> </div><div class='hunk'>@@ -673,8 +669,7 @@ static int exfat_load_upcase_table(struct super_block *sb,</div><div class='ctx'> 		if (!bh) {</div><div class='ctx'> 			exfat_err(sb, "failed to read sector(0x%llx)",</div><div class='ctx'> 				  (unsigned long long)sector);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto free_table;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		sector++;</div><div class='ctx'> 		for (i = 0; i &lt; sect_size &amp;&amp; index &lt;= 0xFFFF; i += 2) {</div><div class='hunk'>@@ -701,15 +696,12 @@ static int exfat_load_upcase_table(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	exfat_err(sb, "failed to load upcase table (idx : 0x%08x, chksum : 0x%08x, utbl_chksum : 0x%08x)",</div><div class='ctx'> 		  index, chksum, utbl_checksum);</div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-free_table:</div><div class='del'>-	exfat_free_upcase_table(sbi);</div><div class='del'>-	return ret;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exfat_load_default_upcase_table(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	int i, ret = -EIO;</div><div class='add'>+	int i;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	unsigned char skip = false;</div><div class='ctx'> 	unsigned short uni = 0, *upcase_table;</div><div class='hunk'>@@ -740,8 +732,7 @@ static int exfat_load_default_upcase_table(struct super_block *sb)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* FATAL error: default upcase table has error */</div><div class='del'>-	exfat_free_upcase_table(sbi);</div><div class='del'>-	return ret;</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int exfat_create_upcase_table(struct super_block *sb)</div><div class='hunk'>@@ -785,14 +776,17 @@ int exfat_create_upcase_table(struct super_block *sb)</div><div class='ctx'> 				le32_to_cpu(ep-&gt;dentry.upcase.checksum));</div><div class='ctx'> </div><div class='ctx'> 			brelse(bh);</div><div class='del'>-			if (ret &amp;&amp; ret != -EIO)</div><div class='add'>+			if (ret &amp;&amp; ret != -EIO) {</div><div class='add'>+				/* free memory from exfat_load_upcase_table call */</div><div class='add'>+				exfat_free_upcase_table(sbi);</div><div class='ctx'> 				goto load_default;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* load successfully */</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (exfat_get_next_cluster(sb, &amp;(clu.dir)))</div><div class='add'>+		if (exfat_get_next_cluster(sb, &amp;clu.dir))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -804,4 +798,5 @@ load_default:</div><div class='ctx'> void exfat_free_upcase_table(struct exfat_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	kvfree(sbi-&gt;vol_utbl);</div><div class='add'>+	sbi-&gt;vol_utbl = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/exfat/super.c b/fs/exfat/super.c<br/>index d9d4fa91010b..10e872a99663 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exfat/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exfat/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exfat/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exfat/super.c</a></div><div class='hunk'>@@ -31,34 +31,25 @@ static void exfat_free_iocharset(struct exfat_sb_info *sbi)</div><div class='ctx'> 		kfree(sbi-&gt;options.iocharset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exfat_put_super(struct super_block *sb)</div><div class='add'>+static void exfat_set_iocharset(struct exfat_mount_options *opts,</div><div class='add'>+				char *iocharset)</div><div class='ctx'> {</div><div class='del'>-	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='del'>-	exfat_free_bitmap(sbi);</div><div class='del'>-	brelse(sbi-&gt;boot_bh);</div><div class='del'>-	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='del'>-</div><div class='del'>-	unload_nls(sbi-&gt;nls_io);</div><div class='del'>-	exfat_free_upcase_table(sbi);</div><div class='add'>+	opts-&gt;iocharset = iocharset;</div><div class='add'>+	if (!strcmp(opts-&gt;iocharset, "utf8"))</div><div class='add'>+		opts-&gt;utf8 = 1;</div><div class='add'>+	else</div><div class='add'>+		opts-&gt;utf8 = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_sync_fs(struct super_block *sb, int wait)</div><div class='add'>+static void exfat_put_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (!wait)</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	/* If there are some dirty buffers in the bdev inode */</div><div class='ctx'> 	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='del'>-	sync_blockdev(sb-&gt;s_bdev);</div><div class='del'>-	if (exfat_clear_volume_dirty(sb))</div><div class='del'>-		err = -EIO;</div><div class='add'>+	exfat_clear_volume_dirty(sb);</div><div class='add'>+	exfat_free_bitmap(sbi);</div><div class='add'>+	brelse(sbi-&gt;boot_bh);</div><div class='ctx'> 	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='hunk'>@@ -67,15 +58,6 @@ static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	unsigned long long id = huge_encode_dev(sb-&gt;s_bdev-&gt;bd_dev);</div><div class='ctx'> </div><div class='del'>-	if (sbi-&gt;used_clusters == EXFAT_CLUSTERS_UNTRACKED) {</div><div class='del'>-		mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='del'>-		if (exfat_count_used_clusters(sb, &amp;sbi-&gt;used_clusters)) {</div><div class='del'>-			mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	buf-&gt;f_type = sb-&gt;s_magic;</div><div class='ctx'> 	buf-&gt;f_bsize = sbi-&gt;cluster_size;</div><div class='ctx'> 	buf-&gt;f_blocks = sbi-&gt;num_clusters - 2; /* clu 0 &amp; 1 */</div><div class='hunk'>@@ -170,6 +152,41 @@ static int exfat_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int exfat_force_shutdown(struct super_block *sb, u32 flags)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct exfat_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+	struct exfat_mount_options *opts = &amp;sbi-&gt;options;</div><div class='add'>+</div><div class='add'>+	if (exfat_forced_shutdown(sb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (flags) {</div><div class='add'>+	case EXFAT_GOING_DOWN_DEFAULT:</div><div class='add'>+	case EXFAT_GOING_DOWN_FULLSYNC:</div><div class='add'>+		ret = bdev_freeze(sb-&gt;s_bdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		bdev_thaw(sb-&gt;s_bdev);</div><div class='add'>+		set_bit(EXFAT_FLAGS_SHUTDOWN, &amp;sbi-&gt;s_exfat_flags);</div><div class='add'>+		break;</div><div class='add'>+	case EXFAT_GOING_DOWN_NOSYNC:</div><div class='add'>+		set_bit(EXFAT_FLAGS_SHUTDOWN, &amp;sbi-&gt;s_exfat_flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (opts-&gt;discard)</div><div class='add'>+		opts-&gt;discard = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exfat_shutdown(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	exfat_force_shutdown(sb, EXFAT_GOING_DOWN_NOSYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct inode *exfat_alloc_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct exfat_inode_info *ei;</div><div class='hunk'>@@ -193,9 +210,9 @@ static const struct super_operations exfat_sops = {</div><div class='ctx'> 	.write_inode	= exfat_write_inode,</div><div class='ctx'> 	.evict_inode	= exfat_evict_inode,</div><div class='ctx'> 	.put_super	= exfat_put_super,</div><div class='del'>-	.sync_fs	= exfat_sync_fs,</div><div class='ctx'> 	.statfs		= exfat_statfs,</div><div class='ctx'> 	.show_options	= exfat_show_options,</div><div class='add'>+	.shutdown	= exfat_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -228,19 +245,19 @@ static const struct constant_table exfat_param_enums[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fs_parameter_spec exfat_parameters[] = {</div><div class='del'>-	fsparam_u32("uid",			Opt_uid),</div><div class='del'>-	fsparam_u32("gid",			Opt_gid),</div><div class='add'>+	fsparam_uid("uid",			Opt_uid),</div><div class='add'>+	fsparam_gid("gid",			Opt_gid),</div><div class='ctx'> 	fsparam_u32oct("umask",			Opt_umask),</div><div class='ctx'> 	fsparam_u32oct("dmask",			Opt_dmask),</div><div class='ctx'> 	fsparam_u32oct("fmask",			Opt_fmask),</div><div class='ctx'> 	fsparam_u32oct("allow_utime",		Opt_allow_utime),</div><div class='ctx'> 	fsparam_string("iocharset",		Opt_charset),</div><div class='ctx'> 	fsparam_enum("errors",			Opt_errors, exfat_param_enums),</div><div class='del'>-	fsparam_flag("discard",			Opt_discard),</div><div class='add'>+	fsparam_flag_no("discard",		Opt_discard),</div><div class='ctx'> 	fsparam_flag("keep_last_dots",		Opt_keep_last_dots),</div><div class='ctx'> 	fsparam_flag("sys_tz",			Opt_sys_tz),</div><div class='ctx'> 	fsparam_s32("time_offset",		Opt_time_offset),</div><div class='del'>-	fsparam_flag("zero_size_dir",		Opt_zero_size_dir),</div><div class='add'>+	fsparam_flag_no("zero_size_dir",	Opt_zero_size_dir),</div><div class='ctx'> 	__fsparam(NULL, "utf8",			Opt_utf8, fs_param_deprecated,</div><div class='ctx'> 		  NULL),</div><div class='ctx'> 	__fsparam(NULL, "debug",		Opt_debug, fs_param_deprecated,</div><div class='hunk'>@@ -265,10 +282,10 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> </div><div class='ctx'> 	switch (opt) {</div><div class='ctx'> 	case Opt_uid:</div><div class='del'>-		opts-&gt;fs_uid = make_kuid(current_user_ns(), result.uint_32);</div><div class='add'>+		opts-&gt;fs_uid = result.uid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_gid:</div><div class='del'>-		opts-&gt;fs_gid = make_kgid(current_user_ns(), result.uint_32);</div><div class='add'>+		opts-&gt;fs_gid = result.gid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_umask:</div><div class='ctx'> 		opts-&gt;fs_fmask = result.uint_32;</div><div class='hunk'>@@ -285,14 +302,14 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_charset:</div><div class='ctx'> 		exfat_free_iocharset(sbi);</div><div class='del'>-		opts-&gt;iocharset = param-&gt;string;</div><div class='add'>+		exfat_set_iocharset(opts, param-&gt;string);</div><div class='ctx'> 		param-&gt;string = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_errors:</div><div class='ctx'> 		opts-&gt;errors = result.uint_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_discard:</div><div class='del'>-		opts-&gt;discard = 1;</div><div class='add'>+		opts-&gt;discard = !result.negated;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_keep_last_dots:</div><div class='ctx'> 		opts-&gt;keep_last_dots = 1;</div><div class='hunk'>@@ -310,7 +327,7 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		opts-&gt;time_offset = result.int_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_zero_size_dir:</div><div class='del'>-		opts-&gt;zero_size_dir = true;</div><div class='add'>+		opts-&gt;zero_size_dir = !result.negated;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_utf8:</div><div class='ctx'> 	case Opt_debug:</div><div class='hunk'>@@ -334,13 +351,12 @@ static void exfat_hash_init(struct super_block *sb)</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;sbi-&gt;inode_hashtable[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exfat_read_root(struct inode *inode)</div><div class='add'>+static int exfat_read_root(struct inode *inode, struct exfat_chain *root_clu)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> 	struct exfat_inode_info *ei = EXFAT_I(inode);</div><div class='del'>-	struct exfat_chain cdir;</div><div class='del'>-	int num_subdirs, num_clu = 0;</div><div class='add'>+	int num_subdirs;</div><div class='ctx'> </div><div class='ctx'> 	exfat_chain_set(&amp;ei-&gt;dir, sbi-&gt;root_dir, 0, ALLOC_FAT_CHAIN);</div><div class='ctx'> 	ei-&gt;entry = -1;</div><div class='hunk'>@@ -353,12 +369,9 @@ static int exfat_read_root(struct inode *inode)</div><div class='ctx'> 	ei-&gt;hint_stat.clu = sbi-&gt;root_dir;</div><div class='ctx'> 	ei-&gt;hint_femp.eidx = EXFAT_HINT_NONE;</div><div class='ctx'> </div><div class='del'>-	exfat_chain_set(&amp;cdir, sbi-&gt;root_dir, 0, ALLOC_FAT_CHAIN);</div><div class='del'>-	if (exfat_count_num_clusters(sb, &amp;cdir, &amp;num_clu))</div><div class='del'>-		return -EIO;</div><div class='del'>-	i_size_write(inode, num_clu &lt;&lt; sbi-&gt;cluster_size_bits);</div><div class='add'>+	i_size_write(inode, EXFAT_CLU_TO_B(root_clu-&gt;size, sbi));</div><div class='ctx'> </div><div class='del'>-	num_subdirs = exfat_count_dir_entries(sb, &amp;cdir);</div><div class='add'>+	num_subdirs = exfat_count_dir_entries(sb, root_clu);</div><div class='ctx'> 	if (num_subdirs &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	set_nlink(inode, num_subdirs + EXFAT_MIN_SUBDIR);</div><div class='hunk'>@@ -373,8 +386,6 @@ static int exfat_read_root(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_blocks = round_up(i_size_read(inode), sbi-&gt;cluster_size) &gt;&gt; 9;</div><div class='ctx'> 	ei-&gt;i_pos = ((loff_t)sbi-&gt;root_dir &lt;&lt; 32) | 0xffffffff;</div><div class='del'>-	ei-&gt;i_size_aligned = i_size_read(inode);</div><div class='del'>-	ei-&gt;i_size_ondisk = i_size_read(inode);</div><div class='ctx'> </div><div class='ctx'> 	exfat_save_attr(inode, EXFAT_ATTR_SUBDIR);</div><div class='ctx'> 	ei-&gt;i_crtime = simple_inode_init_ts(inode);</div><div class='hunk'>@@ -422,7 +433,10 @@ static int exfat_read_boot_sector(struct super_block *sb)</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* set block size to read super block */</div><div class='del'>-	sb_min_blocksize(sb, 512);</div><div class='add'>+	if (!sb_min_blocksize(sb, 512)) {</div><div class='add'>+		exfat_err(sb, "unable to set blocksize");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* read boot sector */</div><div class='ctx'> 	sbi-&gt;boot_bh = sb_bread(sb, 0);</div><div class='hunk'>@@ -497,7 +511,6 @@ static int exfat_read_boot_sector(struct super_block *sb)</div><div class='ctx'> 	sbi-&gt;vol_flags = le16_to_cpu(p_boot-&gt;vol_flags);</div><div class='ctx'> 	sbi-&gt;vol_flags_persistent = sbi-&gt;vol_flags &amp; (VOLUME_DIRTY | MEDIA_FAILURE);</div><div class='ctx'> 	sbi-&gt;clu_srch_ptr = EXFAT_FIRST_CLUSTER;</div><div class='del'>-	sbi-&gt;used_clusters = EXFAT_CLUSTERS_UNTRACKED;</div><div class='ctx'> </div><div class='ctx'> 	/* check consistencies */</div><div class='ctx'> 	if ((u64)sbi-&gt;num_FAT_sectors &lt;&lt; p_boot-&gt;sect_size_bits &lt;</div><div class='hunk'>@@ -574,7 +587,8 @@ static int exfat_verify_boot_region(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mount the file system volume */</div><div class='del'>-static int __exfat_fill_super(struct super_block *sb)</div><div class='add'>+static int __exfat_fill_super(struct super_block *sb,</div><div class='add'>+		struct exfat_chain *root_clu)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='hunk'>@@ -591,6 +605,18 @@ static int __exfat_fill_super(struct super_block *sb)</div><div class='ctx'> 		goto free_bh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Call exfat_count_num_cluster() before searching for up-case and</div><div class='add'>+	 * bitmap directory entries to avoid infinite loop if they are missing</div><div class='add'>+	 * and the cluster chain includes a loop.</div><div class='add'>+	 */</div><div class='add'>+	exfat_chain_set(root_clu, sbi-&gt;root_dir, 0, ALLOC_FAT_CHAIN);</div><div class='add'>+	ret = exfat_count_num_clusters(sb, root_clu, &amp;root_clu-&gt;size);</div><div class='add'>+	if (ret) {</div><div class='add'>+		exfat_err(sb, "failed to count the number of clusters in root");</div><div class='add'>+		goto free_bh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = exfat_create_upcase_table(sb);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		exfat_err(sb, "failed to load upcase table");</div><div class='hunk'>@@ -600,7 +626,18 @@ static int __exfat_fill_super(struct super_block *sb)</div><div class='ctx'> 	ret = exfat_load_bitmap(sb);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		exfat_err(sb, "failed to load alloc-bitmap");</div><div class='del'>-		goto free_upcase_table;</div><div class='add'>+		goto free_bh;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!exfat_test_bitmap(sb, sbi-&gt;root_dir)) {</div><div class='add'>+		exfat_warn(sb, "failed to test first cluster bit of root dir(%u)",</div><div class='add'>+			   sbi-&gt;root_dir);</div><div class='add'>+		/*</div><div class='add'>+		 * The first cluster bit of the root directory should never</div><div class='add'>+		 * be unset except when storage is corrupted. This bit is</div><div class='add'>+		 * set to allow operations after mount.</div><div class='add'>+		 */</div><div class='add'>+		exfat_set_bitmap(sb, sbi-&gt;root_dir, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = exfat_count_used_clusters(sb, &amp;sbi-&gt;used_clusters);</div><div class='hunk'>@@ -613,8 +650,6 @@ static int __exfat_fill_super(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> free_alloc_bitmap:</div><div class='ctx'> 	exfat_free_bitmap(sbi);</div><div class='del'>-free_upcase_table:</div><div class='del'>-	exfat_free_upcase_table(sbi);</div><div class='ctx'> free_bh:</div><div class='ctx'> 	brelse(sbi-&gt;boot_bh);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -625,6 +660,7 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	struct exfat_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct exfat_mount_options *opts = &amp;sbi-&gt;options;</div><div class='ctx'> 	struct inode *root_inode;</div><div class='add'>+	struct exfat_chain root_clu;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (opts-&gt;allow_utime == (unsigned short)-1)</div><div class='hunk'>@@ -643,7 +679,7 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_time_min = EXFAT_MIN_TIMESTAMP_SECS;</div><div class='ctx'> 	sb-&gt;s_time_max = EXFAT_MAX_TIMESTAMP_SECS;</div><div class='ctx'> </div><div class='del'>-	err = __exfat_fill_super(sb);</div><div class='add'>+	err = __exfat_fill_super(sb, &amp;root_clu);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		exfat_err(sb, "failed to recognize exfat type");</div><div class='ctx'> 		goto check_nls_io;</div><div class='hunk'>@@ -652,8 +688,8 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	/* set up enough so that it can read an inode */</div><div class='ctx'> 	exfat_hash_init(sb);</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(sbi-&gt;options.iocharset, "utf8"))</div><div class='del'>-		opts-&gt;utf8 = 1;</div><div class='add'>+	if (sbi-&gt;options.utf8)</div><div class='add'>+		set_default_d_op(sb, &amp;exfat_utf8_dentry_ops);</div><div class='ctx'> 	else {</div><div class='ctx'> 		sbi-&gt;nls_io = load_nls(sbi-&gt;options.iocharset);</div><div class='ctx'> 		if (!sbi-&gt;nls_io) {</div><div class='hunk'>@@ -662,13 +698,9 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto free_table;</div><div class='ctx'> 		}</div><div class='add'>+		set_default_d_op(sb, &amp;exfat_dentry_ops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sbi-&gt;options.utf8)</div><div class='del'>-		sb-&gt;s_d_op = &amp;exfat_utf8_dentry_ops;</div><div class='del'>-	else</div><div class='del'>-		sb-&gt;s_d_op = &amp;exfat_dentry_ops;</div><div class='del'>-</div><div class='ctx'> 	root_inode = new_inode(sb);</div><div class='ctx'> 	if (!root_inode) {</div><div class='ctx'> 		exfat_err(sb, "failed to allocate root inode");</div><div class='hunk'>@@ -678,7 +710,7 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	root_inode-&gt;i_ino = EXFAT_ROOT_INO;</div><div class='ctx'> 	inode_set_iversion(root_inode, 1);</div><div class='del'>-	err = exfat_read_root(root_inode);</div><div class='add'>+	err = exfat_read_root(root_inode, &amp;root_clu);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		exfat_err(sb, "failed to initialize root inode");</div><div class='ctx'> 		goto put_inode;</div><div class='hunk'>@@ -701,12 +733,10 @@ put_inode:</div><div class='ctx'> 	sb-&gt;s_root = NULL;</div><div class='ctx'> </div><div class='ctx'> free_table:</div><div class='del'>-	exfat_free_upcase_table(sbi);</div><div class='ctx'> 	exfat_free_bitmap(sbi);</div><div class='ctx'> 	brelse(sbi-&gt;boot_bh);</div><div class='ctx'> </div><div class='ctx'> check_nls_io:</div><div class='del'>-	unload_nls(sbi-&gt;nls_io);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -731,10 +761,46 @@ static void exfat_free(struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> static int exfat_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	struct exfat_sb_info *remount_sbi = fc-&gt;s_fs_info;</div><div class='add'>+	struct exfat_sb_info *sbi = EXFAT_SB(sb);</div><div class='add'>+	struct exfat_mount_options *new_opts = &amp;remount_sbi-&gt;options;</div><div class='add'>+	struct exfat_mount_options *cur_opts = &amp;sbi-&gt;options;</div><div class='add'>+</div><div class='ctx'> 	fc-&gt;sb_flags |= SB_NODIRATIME;</div><div class='ctx'> </div><div class='del'>-	/* volume flag will be updated in exfat_sync_fs */</div><div class='del'>-	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	sync_filesystem(sb);</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_lock);</div><div class='add'>+	exfat_clear_volume_dirty(sb);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_lock);</div><div class='add'>+</div><div class='add'>+	if (new_opts-&gt;allow_utime == (unsigned short)-1)</div><div class='add'>+		new_opts-&gt;allow_utime = ~new_opts-&gt;fs_dmask &amp; 0022;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since the old settings of these mount options are cached in</div><div class='add'>+	 * inodes or dentries, they cannot be modified dynamically.</div><div class='add'>+	 */</div><div class='add'>+	if (strcmp(new_opts-&gt;iocharset, cur_opts-&gt;iocharset) ||</div><div class='add'>+	    new_opts-&gt;keep_last_dots != cur_opts-&gt;keep_last_dots ||</div><div class='add'>+	    new_opts-&gt;sys_tz != cur_opts-&gt;sys_tz ||</div><div class='add'>+	    new_opts-&gt;time_offset != cur_opts-&gt;time_offset ||</div><div class='add'>+	    !uid_eq(new_opts-&gt;fs_uid, cur_opts-&gt;fs_uid) ||</div><div class='add'>+	    !gid_eq(new_opts-&gt;fs_gid, cur_opts-&gt;fs_gid) ||</div><div class='add'>+	    new_opts-&gt;fs_fmask != cur_opts-&gt;fs_fmask ||</div><div class='add'>+	    new_opts-&gt;fs_dmask != cur_opts-&gt;fs_dmask ||</div><div class='add'>+	    new_opts-&gt;allow_utime != cur_opts-&gt;allow_utime)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (new_opts-&gt;discard != cur_opts-&gt;discard &amp;&amp;</div><div class='add'>+	    new_opts-&gt;discard &amp;&amp;</div><div class='add'>+	    !bdev_max_discard_sectors(sb-&gt;s_bdev)) {</div><div class='add'>+		exfat_warn(sb, "remounting with \"discard\" option, but the device does not support discard");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	swap(*cur_opts, *new_opts);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -758,26 +824,46 @@ static int exfat_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	ratelimit_state_init(&amp;sbi-&gt;ratelimit, DEFAULT_RATELIMIT_INTERVAL,</div><div class='ctx'> 			DEFAULT_RATELIMIT_BURST);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;options.fs_uid = current_uid();</div><div class='del'>-	sbi-&gt;options.fs_gid = current_gid();</div><div class='del'>-	sbi-&gt;options.fs_fmask = current-&gt;fs-&gt;umask;</div><div class='del'>-	sbi-&gt;options.fs_dmask = current-&gt;fs-&gt;umask;</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE &amp;&amp; fc-&gt;root) {</div><div class='add'>+		struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+		struct exfat_mount_options *cur_opts = &amp;EXFAT_SB(sb)-&gt;options;</div><div class='add'>+</div><div class='add'>+		sbi-&gt;options.fs_uid = cur_opts-&gt;fs_uid;</div><div class='add'>+		sbi-&gt;options.fs_gid = cur_opts-&gt;fs_gid;</div><div class='add'>+		sbi-&gt;options.fs_fmask = cur_opts-&gt;fs_fmask;</div><div class='add'>+		sbi-&gt;options.fs_dmask = cur_opts-&gt;fs_dmask;</div><div class='add'>+	} else {</div><div class='add'>+		sbi-&gt;options.fs_uid = current_uid();</div><div class='add'>+		sbi-&gt;options.fs_gid = current_gid();</div><div class='add'>+		sbi-&gt;options.fs_fmask = current-&gt;fs-&gt;umask;</div><div class='add'>+		sbi-&gt;options.fs_dmask = current-&gt;fs-&gt;umask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sbi-&gt;options.allow_utime = -1;</div><div class='del'>-	sbi-&gt;options.iocharset = exfat_default_iocharset;</div><div class='ctx'> 	sbi-&gt;options.errors = EXFAT_ERRORS_RO;</div><div class='add'>+	exfat_set_iocharset(&amp;sbi-&gt;options, exfat_default_iocharset);</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;s_fs_info = sbi;</div><div class='ctx'> 	fc-&gt;ops = &amp;exfat_context_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void delayed_free(struct rcu_head *p)</div><div class='add'>+{</div><div class='add'>+	struct exfat_sb_info *sbi = container_of(p, struct exfat_sb_info, rcu);</div><div class='add'>+</div><div class='add'>+	unload_nls(sbi-&gt;nls_io);</div><div class='add'>+	exfat_free_upcase_table(sbi);</div><div class='add'>+	exfat_free_sbi(sbi);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void exfat_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct exfat_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	kill_block_super(sb);</div><div class='ctx'> 	if (sbi)</div><div class='del'>-		exfat_free_sbi(sbi);</div><div class='add'>+		call_rcu(&amp;sbi-&gt;rcu, delayed_free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type exfat_fs_type = {</div><div class='hunk'>@@ -786,7 +872,7 @@ static struct file_system_type exfat_fs_type = {</div><div class='ctx'> 	.init_fs_context	= exfat_init_fs_context,</div><div class='ctx'> 	.parameters		= exfat_parameters,</div><div class='ctx'> 	.kill_sb		= exfat_kill_sb,</div><div class='del'>-	.fs_flags		= FS_REQUIRES_DEV,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void exfat_inode_init_once(void *foo)</div><div class='hunk'>@@ -811,7 +897,7 @@ static int __init init_exfat_fs(void)</div><div class='ctx'> </div><div class='ctx'> 	exfat_inode_cachep = kmem_cache_create("exfat_inode_cache",</div><div class='ctx'> 			sizeof(struct exfat_inode_info),</div><div class='del'>-			0, SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD,</div><div class='add'>+			0, SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 			exfat_inode_init_once);</div><div class='ctx'> 	if (!exfat_inode_cachep) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c<br/>index 3ae0154c5680..d3e55de4a2a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/exportfs/expfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/exportfs/expfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/exportfs/expfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/exportfs/expfs.c</a></div><div class='hunk'>@@ -126,10 +126,8 @@ static struct dentry *reconnect_one(struct vfsmount *mnt,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	parent = ERR_PTR(-EACCES);</div><div class='del'>-	inode_lock(dentry-&gt;d_inode);</div><div class='ctx'> 	if (mnt-&gt;mnt_sb-&gt;s_export_op-&gt;get_parent)</div><div class='ctx'> 		parent = mnt-&gt;mnt_sb-&gt;s_export_op-&gt;get_parent(dentry);</div><div class='del'>-	inode_unlock(dentry-&gt;d_inode);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(parent)) {</div><div class='ctx'> 		dprintk("get_parent of %lu failed, err %ld\n",</div><div class='hunk'>@@ -145,7 +143,7 @@ static struct dentry *reconnect_one(struct vfsmount *mnt,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	dprintk("%s: found name: %s\n", __func__, nbuf);</div><div class='del'>-	tmp = lookup_one_unlocked(mnt_idmap(mnt), nbuf, parent, strlen(nbuf));</div><div class='add'>+	tmp = lookup_one_unlocked(mnt_idmap(mnt), &amp;QSTR(nbuf), parent);</div><div class='ctx'> 	if (IS_ERR(tmp)) {</div><div class='ctx'> 		dprintk("lookup failed: %ld\n", PTR_ERR(tmp));</div><div class='ctx'> 		err = PTR_ERR(tmp);</div><div class='hunk'>@@ -255,7 +253,7 @@ static bool filldir_one(struct dir_context *ctx, const char *name, int len,</div><div class='ctx'> 		container_of(ctx, struct getdents_callback, ctx);</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;sequence++;</div><div class='del'>-	if (buf-&gt;ino == ino &amp;&amp; len &lt;= NAME_MAX) {</div><div class='add'>+	if (buf-&gt;ino == ino &amp;&amp; len &lt;= NAME_MAX &amp;&amp; !is_dot_dotdot(name, len)) {</div><div class='ctx'> 		memcpy(buf-&gt;name, name, len);</div><div class='ctx'> 		buf-&gt;name[len] = '\0';</div><div class='ctx'> 		buf-&gt;found = 1;</div><div class='hunk'>@@ -286,6 +284,7 @@ static int get_name(const struct path *path, char *name, struct dentry *child)</div><div class='ctx'> 	};</div><div class='ctx'> 	struct getdents_callback buffer = {</div><div class='ctx'> 		.ctx.actor = filldir_one,</div><div class='add'>+		.ctx.count = INT_MAX,</div><div class='ctx'> 		.name = name,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -382,14 +381,24 @@ int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,</div><div class='ctx'> 			     int *max_len, struct inode *parent, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	const struct export_operations *nop = inode-&gt;i_sb-&gt;s_export_op;</div><div class='add'>+	enum fid_type type;</div><div class='ctx'> </div><div class='ctx'> 	if (!exportfs_can_encode_fh(nop, flags))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (!nop &amp;&amp; (flags &amp; EXPORT_FH_FID))</div><div class='del'>-		return exportfs_encode_ino64_fid(inode, fid, max_len);</div><div class='add'>+		type = exportfs_encode_ino64_fid(inode, fid, max_len);</div><div class='add'>+	else</div><div class='add'>+		type = nop-&gt;encode_fh(inode, fid-&gt;raw, max_len, parent);</div><div class='add'>+</div><div class='add'>+	if (type &gt; 0 &amp;&amp; FILEID_USER_FLAGS(type)) {</div><div class='add'>+		pr_warn_once("%s: unexpected fh type value 0x%x from fstype %s.\n",</div><div class='add'>+			     __func__, type, inode-&gt;i_sb-&gt;s_type-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return type;</div><div class='ctx'> </div><div class='del'>-	return nop-&gt;encode_fh(inode, fid-&gt;raw, max_len, parent);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(exportfs_encode_inode_fh);</div><div class='ctx'> </div><div class='hunk'>@@ -427,7 +436,7 @@ EXPORT_SYMBOL_GPL(exportfs_encode_fh);</div><div class='ctx'> </div><div class='ctx'> struct dentry *</div><div class='ctx'> exportfs_decode_fh_raw(struct vfsmount *mnt, struct fid *fid, int fh_len,</div><div class='del'>-		       int fileid_type,</div><div class='add'>+		       int fileid_type, unsigned int flags,</div><div class='ctx'> 		       int (*acceptable)(void *, struct dentry *),</div><div class='ctx'> 		       void *context)</div><div class='ctx'> {</div><div class='hunk'>@@ -436,6 +445,9 @@ exportfs_decode_fh_raw(struct vfsmount *mnt, struct fid *fid, int fh_len,</div><div class='ctx'> 	char nbuf[NAME_MAX+1];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (fileid_type &lt; 0 || FILEID_USER_FLAGS(fileid_type))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to get any dentry for the given file handle from the filesystem.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -445,6 +457,11 @@ exportfs_decode_fh_raw(struct vfsmount *mnt, struct fid *fid, int fh_len,</div><div class='ctx'> 	if (IS_ERR_OR_NULL(result))</div><div class='ctx'> 		return result;</div><div class='ctx'> </div><div class='add'>+	if ((flags &amp; EXPORT_FH_DIR_ONLY) &amp;&amp; !d_is_dir(result)) {</div><div class='add'>+		err = -ENOTDIR;</div><div class='add'>+		goto err_result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If no acceptance criteria was specified by caller, a disconnected</div><div class='ctx'> 	 * dentry is also accepatable. Callers may use this mode to query if</div><div class='hunk'>@@ -532,16 +549,13 @@ exportfs_decode_fh_raw(struct vfsmount *mnt, struct fid *fid, int fh_len,</div><div class='ctx'> 			goto err_result;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		inode_lock(target_dir-&gt;d_inode);</div><div class='del'>-		nresult = lookup_one(mnt_idmap(mnt), nbuf,</div><div class='del'>-				     target_dir, strlen(nbuf));</div><div class='add'>+		nresult = lookup_one_unlocked(mnt_idmap(mnt), &amp;QSTR(nbuf), target_dir);</div><div class='ctx'> 		if (!IS_ERR(nresult)) {</div><div class='ctx'> 			if (unlikely(nresult-&gt;d_inode != result-&gt;d_inode)) {</div><div class='ctx'> 				dput(nresult);</div><div class='ctx'> 				nresult = ERR_PTR(-ESTALE);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		inode_unlock(target_dir-&gt;d_inode);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * At this point we are done with the parent, but it's pinned</div><div class='ctx'> 		 * by the child dentry anyway.</div><div class='hunk'>@@ -581,7 +595,7 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *ret;</div><div class='ctx'> </div><div class='del'>-	ret = exportfs_decode_fh_raw(mnt, fid, fh_len, fileid_type,</div><div class='add'>+	ret = exportfs_decode_fh_raw(mnt, fid, fh_len, fileid_type, 0,</div><div class='ctx'> 				     acceptable, context);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(ret)) {</div><div class='ctx'> 		if (ret == ERR_PTR(-ENOMEM))</div><div class='hunk'>@@ -592,4 +606,5 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(exportfs_decode_fh);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Code mapping from inodes to file handles");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/ext2/Kconfig b/fs/ext2/Kconfig<br/>index 74d98965902e..d5bce83ad905 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/Kconfig</a></div><div class='hunk'>@@ -1,16 +1,22 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config EXT2_FS</div><div class='del'>-	tristate "Second extended fs support"</div><div class='add'>+	tristate "Second extended fs support (DEPRECATED)"</div><div class='ctx'> 	select BUFFER_HEAD</div><div class='ctx'> 	select FS_IOMAP</div><div class='del'>-	select LEGACY_DIRECT_IO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Ext2 is a standard Linux file system for hard disks.</div><div class='ctx'> </div><div class='del'>-	  To compile this file system support as a module, choose M here: the</div><div class='del'>-	  module will be called ext2.</div><div class='add'>+	  This filesystem driver is deprecated because it does not properly</div><div class='add'>+	  support inode time stamps beyond 03:14:07 UTC on 19 January 2038.</div><div class='ctx'> </div><div class='del'>-	  If unsure, say Y.</div><div class='add'>+	  Ext2 users are advised to use ext4 driver to access their filesystem.</div><div class='add'>+	  The driver is fully compatible, supports filesystems without journal</div><div class='add'>+          or extents, and also supports larger time stamps if the filesystem</div><div class='add'>+          is created with at least 256 byte inodes.</div><div class='add'>+</div><div class='add'>+	  This code is kept as a simple reference for filesystem developers.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config EXT2_FS_XATTR</div><div class='ctx'> 	bool "Ext2 extended attributes"</div><div class='head'>diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c<br/>index e124f3d709b2..b8cfab8f98b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/balloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/balloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/balloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/balloc.c</a></div><div class='hunk'>@@ -77,26 +77,33 @@ static int ext2_valid_block_bitmap(struct super_block *sb,</div><div class='ctx'> 	ext2_grpblk_t next_zero_bit;</div><div class='ctx'> 	ext2_fsblk_t bitmap_blk;</div><div class='ctx'> 	ext2_fsblk_t group_first_block;</div><div class='add'>+	ext2_grpblk_t max_bit;</div><div class='ctx'> </div><div class='ctx'> 	group_first_block = ext2_group_first_block_no(sb, block_group);</div><div class='add'>+	max_bit = ext2_group_last_block_no(sb, block_group) - group_first_block;</div><div class='ctx'> </div><div class='ctx'> 	/* check whether block bitmap block number is set */</div><div class='ctx'> 	bitmap_blk = le32_to_cpu(desc-&gt;bg_block_bitmap);</div><div class='ctx'> 	offset = bitmap_blk - group_first_block;</div><div class='del'>-	if (!ext2_test_bit(offset, bh-&gt;b_data))</div><div class='add'>+	if (offset &lt; 0 || offset &gt; max_bit ||</div><div class='add'>+	    !ext2_test_bit(offset, bh-&gt;b_data))</div><div class='ctx'> 		/* bad block bitmap */</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	/* check whether the inode bitmap block number is set */</div><div class='ctx'> 	bitmap_blk = le32_to_cpu(desc-&gt;bg_inode_bitmap);</div><div class='ctx'> 	offset = bitmap_blk - group_first_block;</div><div class='del'>-	if (!ext2_test_bit(offset, bh-&gt;b_data))</div><div class='add'>+	if (offset &lt; 0 || offset &gt; max_bit ||</div><div class='add'>+	    !ext2_test_bit(offset, bh-&gt;b_data))</div><div class='ctx'> 		/* bad block bitmap */</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	/* check whether the inode table block number is set */</div><div class='ctx'> 	bitmap_blk = le32_to_cpu(desc-&gt;bg_inode_table);</div><div class='ctx'> 	offset = bitmap_blk - group_first_block;</div><div class='add'>+	if (offset &lt; 0 || offset &gt; max_bit ||</div><div class='add'>+	    offset + EXT2_SB(sb)-&gt;s_itb_per_group - 1 &gt; max_bit)</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	next_zero_bit = ext2_find_next_zero_bit(bh-&gt;b_data,</div><div class='ctx'> 				offset + EXT2_SB(sb)-&gt;s_itb_per_group,</div><div class='ctx'> 				offset);</div><div class='hunk'>@@ -412,7 +419,7 @@ void ext2_init_block_alloc_info(struct inode *inode)</div><div class='ctx'> 	struct ext2_block_alloc_info *block_i;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> </div><div class='del'>-	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);</div><div class='add'>+	block_i = kmalloc(sizeof(*block_i), GFP_KERNEL);</div><div class='ctx'> 	if (block_i) {</div><div class='ctx'> 		struct ext2_reserve_window_node *rsv = &amp;block_i-&gt;rsv_window_node;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c<br/>index 4fb155b5a958..b07b3b369710 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/dir.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ static void ext2_commit_chunk(struct folio *folio, loff_t pos, unsigned len)</div><div class='ctx'> 	struct inode *dir = mapping-&gt;host;</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_iversion(dir);</div><div class='del'>-	block_write_end(NULL, mapping, pos, len, len, &amp;folio-&gt;page, NULL);</div><div class='add'>+	block_write_end(pos, len, len, folio);</div><div class='ctx'> </div><div class='ctx'> 	if (pos+len &gt; dir-&gt;i_size) {</div><div class='ctx'> 		i_size_write(dir, pos+len);</div><div class='hunk'>@@ -175,7 +175,6 @@ Eend:</div><div class='ctx'> 			(unsigned long) le32_to_cpu(p-&gt;inode));</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='del'>-	folio_set_error(folio);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -264,7 +263,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	unsigned long n = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long npages = dir_pages(inode);</div><div class='ctx'> 	unsigned chunk_mask = ~(ext2_chunk_size(inode)-1);</div><div class='del'>-	bool need_revalidate = !inode_eq_iversion(inode, file-&gt;f_version);</div><div class='add'>+	bool need_revalidate = !inode_eq_iversion(inode, *(u64 *)file-&gt;private_data);</div><div class='ctx'> 	bool has_filetype;</div><div class='ctx'> </div><div class='ctx'> 	if (pos &gt; inode-&gt;i_size - EXT2_DIR_REC_LEN(1))</div><div class='hunk'>@@ -291,7 +290,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 				offset = ext2_validate_entry(kaddr, offset, chunk_mask);</div><div class='ctx'> 				ctx-&gt;pos = (n&lt;&lt;PAGE_SHIFT) + offset;</div><div class='ctx'> 			}</div><div class='del'>-			file-&gt;f_version = inode_query_iversion(inode);</div><div class='add'>+			*(u64 *)file-&gt;private_data = inode_query_iversion(inode);</div><div class='ctx'> 			need_revalidate = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		de = (ext2_dirent *)(kaddr+offset);</div><div class='hunk'>@@ -435,7 +434,7 @@ int ext2_inode_by_name(struct inode *dir, const struct qstr *child, ino_t *ino)</div><div class='ctx'> </div><div class='ctx'> static int ext2_prepare_chunk(struct folio *folio, loff_t pos, unsigned len)</div><div class='ctx'> {</div><div class='del'>-	return __block_write_begin(&amp;folio-&gt;page, pos, len, ext2_get_block);</div><div class='add'>+	return __block_write_begin(folio, pos, len, ext2_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext2_handle_dirsync(struct inode *dir)</div><div class='hunk'>@@ -704,8 +703,30 @@ not_empty:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext2_dir_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = kzalloc(sizeof(u64), GFP_KERNEL);</div><div class='add'>+	if (!file-&gt;private_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext2_dir_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static loff_t ext2_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='add'>+{</div><div class='add'>+	return generic_llseek_cookie(file, offset, whence,</div><div class='add'>+				     (u64 *)file-&gt;private_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations ext2_dir_operations = {</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='add'>+	.open		= ext2_dir_open,</div><div class='add'>+	.release	= ext2_dir_release,</div><div class='add'>+	.llseek		= ext2_dir_llseek,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='ctx'> 	.iterate_shared	= ext2_readdir,</div><div class='ctx'> 	.unlocked_ioctl = ext2_ioctl,</div><div class='head'>diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h<br/>index 677a9ad45dcb..cf97b76e9fd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/ext2.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/ext2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/ext2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/ext2.h</a></div><div class='hunk'>@@ -368,6 +368,7 @@ struct ext2_inode {</div><div class='ctx'> #define EXT2_MOUNT_ERRORS_CONT		0x000010  /* Continue on errors */</div><div class='ctx'> #define EXT2_MOUNT_ERRORS_RO		0x000020  /* Remount fs ro on errors */</div><div class='ctx'> #define EXT2_MOUNT_ERRORS_PANIC		0x000040  /* Panic on errors */</div><div class='add'>+#define EXT2_MOUNT_ERRORS_MASK		0x000070</div><div class='ctx'> #define EXT2_MOUNT_MINIX_DF		0x000080  /* Mimics the Minix statfs */</div><div class='ctx'> #define EXT2_MOUNT_NOBH			0x000100  /* No buffer_heads */</div><div class='ctx'> #define EXT2_MOUNT_NO_UID32		0x000200  /* Disable 32-bit UIDs */</div><div class='hunk'>@@ -674,7 +675,7 @@ struct ext2_inode_info {</div><div class='ctx'> 	struct inode	vfs_inode;</div><div class='ctx'> 	struct list_head i_orphan;	/* unlinked but open inodes */</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-	struct dquot *i_dquot[MAXQUOTAS];</div><div class='add'>+	struct dquot __rcu *i_dquot[MAXQUOTAS];</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -749,9 +750,9 @@ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		       u64 start, u64 len);</div><div class='ctx'> </div><div class='ctx'> /* ioctl.c */</div><div class='del'>-extern int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+extern int ext2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> extern int ext2_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-			     struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+			     struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> extern long ext2_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext2/file.c b/fs/ext2/file.c<br/>index 4ddc36f4dbd4..76bddce462fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/file.c</a></div><div class='hunk'>@@ -122,17 +122,19 @@ static const struct vm_operations_struct ext2_dax_vm_ops = {</div><div class='ctx'> 	.pfn_mkwrite	= ext2_dax_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ext2_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int ext2_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='add'>+</div><div class='ctx'> 	if (!IS_DAX(file_inode(file)))</div><div class='del'>-		return generic_file_mmap(file, vma);</div><div class='add'>+		return generic_file_mmap_prepare(desc);</div><div class='ctx'> </div><div class='ctx'> 	file_accessed(file);</div><div class='del'>-	vma-&gt;vm_ops = &amp;ext2_dax_vm_ops;</div><div class='add'>+	desc-&gt;vm_ops = &amp;ext2_dax_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-#define ext2_file_mmap	generic_file_mmap</div><div class='add'>+#define ext2_file_mmap_prepare	generic_file_mmap_prepare</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -302,6 +304,12 @@ static ssize_t ext2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	return generic_file_write_iter(iocb, from);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext2_file_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	filp-&gt;f_mode |= FMODE_CAN_ODIRECT;</div><div class='add'>+	return dquot_file_open(inode, filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations ext2_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= ext2_file_read_iter,</div><div class='hunk'>@@ -310,8 +318,8 @@ const struct file_operations ext2_file_operations = {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= ext2_compat_ioctl,</div><div class='ctx'> #endif</div><div class='del'>-	.mmap		= ext2_file_mmap,</div><div class='del'>-	.open		= dquot_file_open,</div><div class='add'>+	.mmap_prepare	= ext2_file_mmap_prepare,</div><div class='add'>+	.open		= ext2_file_open,</div><div class='ctx'> 	.release	= ext2_release_file,</div><div class='ctx'> 	.fsync		= ext2_fsync,</div><div class='ctx'> 	.get_unmapped_area = thp_get_unmapped_area,</div><div class='head'>diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c<br/>index 5a4272b2c6b0..dbfe9098a124 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/inode.c</a></div><div class='hunk'>@@ -754,7 +754,7 @@ static int ext2_get_blocks(struct inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = sb_issue_zeroout(inode-&gt;i_sb,</div><div class='ctx'> 				le32_to_cpu(chain[depth-1].key), count,</div><div class='del'>-				GFP_NOFS);</div><div class='add'>+				GFP_KERNEL);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			mutex_unlock(&amp;ei-&gt;truncate_mutex);</div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -895,9 +895,19 @@ int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	loff_t i_size;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='del'>-	len = min_t(u64, len, i_size_read(inode));</div><div class='add'>+	i_size = i_size_read(inode);</div><div class='add'>+	/*</div><div class='add'>+	 * iomap_fiemap() returns EINVAL for 0 length. Make sure we don't trim</div><div class='add'>+	 * length to 0 but still trim the range as much as possible since</div><div class='add'>+	 * ext2_get_blocks() iterates unmapped space block by block which is</div><div class='add'>+	 * slow.</div><div class='add'>+	 */</div><div class='add'>+	if (i_size == 0)</div><div class='add'>+		i_size = 1;</div><div class='add'>+	len = min_t(u64, len, i_size);</div><div class='ctx'> 	ret = iomap_fiemap(inode, fieinfo, start, len, &amp;ext2_iomap_ops);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -915,24 +925,25 @@ static void ext2_readahead(struct readahead_control *rac)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ext2_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata)</div><div class='add'>+ext2_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		loff_t pos, unsigned len, struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = block_write_begin(mapping, pos, len, pagep, ext2_get_block);</div><div class='add'>+	ret = block_write_begin(mapping, pos, len, foliop, ext2_get_block);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		ext2_write_failed(mapping, pos + len);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext2_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+static int ext2_write_end(const struct kiocb *iocb,</div><div class='add'>+			  struct address_space *mapping,</div><div class='add'>+			  loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			  struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);</div><div class='add'>+	ret = generic_write_end(iocb, mapping, pos, len, copied, folio, fsdata);</div><div class='ctx'> 	if (ret &lt; len)</div><div class='ctx'> 		ext2_write_failed(mapping, pos + len);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -965,7 +976,6 @@ const struct address_space_operations ext2_aops = {</div><div class='ctx'> 	.write_begin		= ext2_write_begin,</div><div class='ctx'> 	.write_end		= ext2_write_end,</div><div class='ctx'> 	.bmap			= ext2_bmap,</div><div class='del'>-	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.writepages		= ext2_writepages,</div><div class='ctx'> 	.migrate_folio		= buffer_migrate_folio,</div><div class='ctx'> 	.is_partially_uptodate	= block_is_partially_uptodate,</div><div class='hunk'>@@ -974,7 +984,6 @@ const struct address_space_operations ext2_aops = {</div><div class='ctx'> </div><div class='ctx'> static const struct address_space_operations ext2_dax_aops = {</div><div class='ctx'> 	.writepages		= ext2_dax_writepages,</div><div class='del'>-	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.dirty_folio		= noop_dirty_folio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1389,7 +1398,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	ei = EXT2_I(inode);</div><div class='head'>diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c<br/>index 44e04484e570..c3fea55b8efa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/ioctl.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/fileattr.h&gt;</div><div class='ctx'> </div><div class='del'>-int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int ext2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext2_inode_info *ei = EXT2_I(d_inode(dentry));</div><div class='ctx'> </div><div class='hunk'>@@ -28,7 +28,7 @@ int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext2_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct ext2_inode_info *ei = EXT2_I(inode);</div><div class='head'>diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c<br/>index 8346ab9534c1..bde617a66cec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/namei.c</a></div><div class='hunk'>@@ -225,15 +225,16 @@ static int ext2_link (struct dentry * old_dentry, struct inode * dir,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext2_mkdir(struct mnt_idmap * idmap,</div><div class='del'>-	struct inode * dir, struct dentry * dentry, umode_t mode)</div><div class='add'>+static struct dentry *ext2_mkdir(struct mnt_idmap * idmap,</div><div class='add'>+				 struct inode * dir, struct dentry * dentry,</div><div class='add'>+				 umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode * inode;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = dquot_initialize(dir);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_link_count(dir);</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +259,7 @@ static int ext2_mkdir(struct mnt_idmap * idmap,</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate_new(dentry, inode);</div><div class='ctx'> out:</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> out_fail:</div><div class='ctx'> 	inode_dec_link_count(inode);</div><div class='head'>diff --git a/fs/ext2/super.c b/fs/ext2/super.c<br/>index 01f9addc8b1f..121e634c792a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/super.c</a></div><div class='hunk'>@@ -23,7 +23,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='hunk'>@@ -40,7 +41,6 @@</div><div class='ctx'> #include "acl.h"</div><div class='ctx'> </div><div class='ctx'> static void ext2_write_super(struct super_block *sb);</div><div class='del'>-static int ext2_remount (struct super_block * sb, int * flags, char * data);</div><div class='ctx'> static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf);</div><div class='ctx'> static int ext2_sync_fs(struct super_block *sb, int wait);</div><div class='ctx'> static int ext2_freeze(struct super_block *sb);</div><div class='hunk'>@@ -81,6 +81,33 @@ void ext2_error(struct super_block *sb, const char *function,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ext2_msg_fc(struct fs_context *fc, const char *prefix,</div><div class='add'>+			const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+	const char *s_id;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		s_id = fc-&gt;root-&gt;d_sb-&gt;s_id;</div><div class='add'>+	} else {</div><div class='add'>+		/* get last path component of source */</div><div class='add'>+		s_id = strrchr(fc-&gt;source, '/');</div><div class='add'>+		if (s_id)</div><div class='add'>+			s_id++;</div><div class='add'>+		else</div><div class='add'>+			s_id = fc-&gt;source;</div><div class='add'>+	}</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+</div><div class='add'>+	printk("%sEXT2-fs (%s): %pV\n", prefix, s_id, &amp;vaf);</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ext2_msg(struct super_block *sb, const char *prefix,</div><div class='ctx'> 		const char *fmt, ...)</div><div class='ctx'> {</div><div class='hunk'>@@ -213,8 +240,7 @@ static int __init init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	ext2_inode_cachep = kmem_cache_create_usercopy("ext2_inode_cache",</div><div class='ctx'> 				sizeof(struct ext2_inode_info), 0,</div><div class='del'>-				(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-					SLAB_ACCOUNT),</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='ctx'> 				offsetof(struct ext2_inode_info, i_data),</div><div class='ctx'> 				sizeof_field(struct ext2_inode_info, i_data),</div><div class='ctx'> 				init_once);</div><div class='hunk'>@@ -320,7 +346,7 @@ static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, siz</div><div class='ctx'> static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);</div><div class='ctx'> static int ext2_quota_on(struct super_block *sb, int type, int format_id,</div><div class='ctx'> 			 const struct path *path);</div><div class='del'>-static struct dquot **ext2_get_dquots(struct inode *inode)</div><div class='add'>+static struct dquot __rcu **ext2_get_dquots(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return EXT2_I(inode)-&gt;i_dquot;</div><div class='ctx'> }</div><div class='hunk'>@@ -347,7 +373,6 @@ static const struct super_operations ext2_sops = {</div><div class='ctx'> 	.freeze_fs	= ext2_freeze,</div><div class='ctx'> 	.unfreeze_fs	= ext2_unfreeze,</div><div class='ctx'> 	.statfs		= ext2_statfs,</div><div class='del'>-	.remount_fs	= ext2_remount,</div><div class='ctx'> 	.show_options	= ext2_show_options,</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	.quota_read	= ext2_quota_read,</div><div class='hunk'>@@ -403,230 +428,218 @@ static const struct export_operations ext2_export_ops = {</div><div class='ctx'> 	.get_parent = ext2_get_parent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned long get_sb_block(void **data)</div><div class='del'>-{</div><div class='del'>-	unsigned long 	sb_block;</div><div class='del'>-	char 		*options = (char *) *data;</div><div class='del'>-</div><div class='del'>-	if (!options || strncmp(options, "sb=", 3) != 0)</div><div class='del'>-		return 1;	/* Default location */</div><div class='del'>-	options += 3;</div><div class='del'>-	sb_block = simple_strtoul(options, &amp;options, 0);</div><div class='del'>-	if (*options &amp;&amp; *options != ',') {</div><div class='del'>-		printk("EXT2-fs: Invalid sb specification: %s\n",</div><div class='del'>-		       (char *) *data);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (*options == ',')</div><div class='del'>-		options++;</div><div class='del'>-	*data = (void *) options;</div><div class='del'>-	return sb_block;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='del'>-	Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,</div><div class='del'>-	Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic,</div><div class='del'>-	Opt_err_ro, Opt_nouid32, Opt_debug,</div><div class='del'>-	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,</div><div class='del'>-	Opt_acl, Opt_noacl, Opt_xip, Opt_dax, Opt_ignore, Opt_err, Opt_quota,</div><div class='del'>-	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation</div><div class='add'>+	Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid, Opt_resgid, Opt_resuid,</div><div class='add'>+	Opt_sb, Opt_errors, Opt_nouid32, Opt_debug, Opt_oldalloc, Opt_orlov,</div><div class='add'>+	Opt_nobh, Opt_user_xattr, Opt_acl, Opt_xip, Opt_dax, Opt_ignore,</div><div class='add'>+	Opt_quota, Opt_usrquota, Opt_grpquota, Opt_reservation,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_bsd_df, "bsddf"},</div><div class='del'>-	{Opt_minix_df, "minixdf"},</div><div class='del'>-	{Opt_grpid, "grpid"},</div><div class='del'>-	{Opt_grpid, "bsdgroups"},</div><div class='del'>-	{Opt_nogrpid, "nogrpid"},</div><div class='del'>-	{Opt_nogrpid, "sysvgroups"},</div><div class='del'>-	{Opt_resgid, "resgid=%u"},</div><div class='del'>-	{Opt_resuid, "resuid=%u"},</div><div class='del'>-	{Opt_sb, "sb=%u"},</div><div class='del'>-	{Opt_err_cont, "errors=continue"},</div><div class='del'>-	{Opt_err_panic, "errors=panic"},</div><div class='del'>-	{Opt_err_ro, "errors=remount-ro"},</div><div class='del'>-	{Opt_nouid32, "nouid32"},</div><div class='del'>-	{Opt_debug, "debug"},</div><div class='del'>-	{Opt_oldalloc, "oldalloc"},</div><div class='del'>-	{Opt_orlov, "orlov"},</div><div class='del'>-	{Opt_nobh, "nobh"},</div><div class='del'>-	{Opt_user_xattr, "user_xattr"},</div><div class='del'>-	{Opt_nouser_xattr, "nouser_xattr"},</div><div class='del'>-	{Opt_acl, "acl"},</div><div class='del'>-	{Opt_noacl, "noacl"},</div><div class='del'>-	{Opt_xip, "xip"},</div><div class='del'>-	{Opt_dax, "dax"},</div><div class='del'>-	{Opt_grpquota, "grpquota"},</div><div class='del'>-	{Opt_ignore, "noquota"},</div><div class='del'>-	{Opt_quota, "quota"},</div><div class='del'>-	{Opt_usrquota, "usrquota"},</div><div class='del'>-	{Opt_reservation, "reservation"},</div><div class='del'>-	{Opt_noreservation, "noreservation"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table ext2_param_errors[] = {</div><div class='add'>+	{"continue",	EXT2_MOUNT_ERRORS_CONT},</div><div class='add'>+	{"panic",	EXT2_MOUNT_ERRORS_PANIC},</div><div class='add'>+	{"remount-ro",	EXT2_MOUNT_ERRORS_RO},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec ext2_param_spec[] = {</div><div class='add'>+	fsparam_flag	("bsddf", Opt_bsd_df),</div><div class='add'>+	fsparam_flag	("minixdf", Opt_minix_df),</div><div class='add'>+	fsparam_flag	("grpid", Opt_grpid),</div><div class='add'>+	fsparam_flag	("bsdgroups", Opt_grpid),</div><div class='add'>+	fsparam_flag	("nogrpid", Opt_nogrpid),</div><div class='add'>+	fsparam_flag	("sysvgroups", Opt_nogrpid),</div><div class='add'>+	fsparam_gid	("resgid", Opt_resgid),</div><div class='add'>+	fsparam_uid	("resuid", Opt_resuid),</div><div class='add'>+	fsparam_u32	("sb", Opt_sb),</div><div class='add'>+	fsparam_enum	("errors", Opt_errors, ext2_param_errors),</div><div class='add'>+	fsparam_flag	("nouid32", Opt_nouid32),</div><div class='add'>+	fsparam_flag	("debug", Opt_debug),</div><div class='add'>+	fsparam_flag	("oldalloc", Opt_oldalloc),</div><div class='add'>+	fsparam_flag	("orlov", Opt_orlov),</div><div class='add'>+	fsparam_flag	("nobh", Opt_nobh),</div><div class='add'>+	fsparam_flag_no	("user_xattr", Opt_user_xattr),</div><div class='add'>+	fsparam_flag_no	("acl", Opt_acl),</div><div class='add'>+	fsparam_flag	("xip", Opt_xip),</div><div class='add'>+	fsparam_flag	("dax", Opt_dax),</div><div class='add'>+	fsparam_flag	("grpquota", Opt_grpquota),</div><div class='add'>+	fsparam_flag	("noquota", Opt_ignore),</div><div class='add'>+	fsparam_flag	("quota", Opt_quota),</div><div class='add'>+	fsparam_flag	("usrquota", Opt_usrquota),</div><div class='add'>+	fsparam_flag_no	("reservation", Opt_reservation),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EXT2_SPEC_s_resuid                      (1 &lt;&lt; 0)</div><div class='add'>+#define EXT2_SPEC_s_resgid                      (1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+struct ext2_fs_context {</div><div class='add'>+	unsigned long	vals_s_flags;	/* Bits to set in s_flags */</div><div class='add'>+	unsigned long	mask_s_flags;	/* Bits changed in s_flags */</div><div class='add'>+	unsigned int	vals_s_mount_opt;</div><div class='add'>+	unsigned int	mask_s_mount_opt;</div><div class='add'>+	kuid_t		s_resuid;</div><div class='add'>+	kgid_t		s_resgid;</div><div class='add'>+	unsigned long	s_sb_block;</div><div class='add'>+	unsigned int	spec;</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(char *options, struct super_block *sb,</div><div class='del'>-			 struct ext2_mount_options *opts)</div><div class='add'>+static inline void ctx_set_mount_opt(struct ext2_fs_context *ctx,</div><div class='add'>+				  unsigned long flag)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep (&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_bsd_df:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, MINIX_DF);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_minix_df:</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, MINIX_DF);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_grpid:</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, GRPID);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nogrpid:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, GRPID);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_resuid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(uid)) {</div><div class='del'>-				ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option);</div><div class='del'>-				return 0;</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-			opts-&gt;s_resuid = uid;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_resgid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(gid)) {</div><div class='del'>-				ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			opts-&gt;s_resgid = gid;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_sb:</div><div class='del'>-			/* handled by get_sb_block() instead of here */</div><div class='del'>-			/* *sb_block = match_int(&amp;args[0]); */</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_panic:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, ERRORS_CONT);</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, ERRORS_RO);</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, ERRORS_PANIC);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_ro:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, ERRORS_CONT);</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, ERRORS_PANIC);</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, ERRORS_RO);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_cont:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, ERRORS_RO);</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, ERRORS_PANIC);</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, ERRORS_CONT);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nouid32:</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, NO_UID32);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_debug:</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, DEBUG);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_oldalloc:</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, OLDALLOC);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_orlov:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, OLDALLOC);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nobh:</div><div class='del'>-			ext2_msg(sb, KERN_INFO,</div><div class='del'>-				"nobh option not supported");</div><div class='del'>-			break;</div><div class='add'>+	ctx-&gt;mask_s_mount_opt |= flag;</div><div class='add'>+	ctx-&gt;vals_s_mount_opt |= flag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ctx_clear_mount_opt(struct ext2_fs_context *ctx,</div><div class='add'>+				    unsigned long flag)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;mask_s_mount_opt |= flag;</div><div class='add'>+	ctx-&gt;vals_s_mount_opt &amp;= ~flag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+ctx_test_mount_opt(struct ext2_fs_context *ctx, unsigned long flag)</div><div class='add'>+{</div><div class='add'>+	return (ctx-&gt;vals_s_mount_opt &amp; flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ctx_parsed_mount_opt(struct ext2_fs_context *ctx, unsigned long flag)</div><div class='add'>+{</div><div class='add'>+	return (ctx-&gt;mask_s_mount_opt &amp; flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ext2_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext2_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct ext2_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	int opt;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, ext2_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_bsd_df:</div><div class='add'>+		ctx_clear_mount_opt(ctx, EXT2_MOUNT_MINIX_DF);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_minix_df:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_MINIX_DF);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_grpid:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_GRPID);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nogrpid:</div><div class='add'>+		ctx_clear_mount_opt(ctx, EXT2_MOUNT_GRPID);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resuid:</div><div class='add'>+		ctx-&gt;s_resuid = result.uid;</div><div class='add'>+		ctx-&gt;spec |= EXT2_SPEC_s_resuid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resgid:</div><div class='add'>+		ctx-&gt;s_resgid = result.gid;</div><div class='add'>+		ctx-&gt;spec |= EXT2_SPEC_s_resgid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_sb:</div><div class='add'>+		/* Note that this is silently ignored on remount */</div><div class='add'>+		ctx-&gt;s_sb_block = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_errors:</div><div class='add'>+		ctx_clear_mount_opt(ctx, EXT2_MOUNT_ERRORS_MASK);</div><div class='add'>+		ctx_set_mount_opt(ctx, result.uint_32);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nouid32:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_NO_UID32);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_debug:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_DEBUG);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_oldalloc:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_OLDALLOC);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_orlov:</div><div class='add'>+		ctx_clear_mount_opt(ctx, EXT2_MOUNT_OLDALLOC);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nobh:</div><div class='add'>+		ext2_msg_fc(fc, KERN_INFO, "nobh option not supported\n");</div><div class='add'>+		break;</div><div class='ctx'> #ifdef CONFIG_EXT2_FS_XATTR</div><div class='del'>-		case Opt_user_xattr:</div><div class='del'>-			set_opt (opts-&gt;s_mount_opt, XATTR_USER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nouser_xattr:</div><div class='del'>-			clear_opt (opts-&gt;s_mount_opt, XATTR_USER);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_user_xattr:</div><div class='add'>+		if (!result.negated)</div><div class='add'>+			ctx_set_mount_opt(ctx, EXT2_MOUNT_XATTR_USER);</div><div class='add'>+		else</div><div class='add'>+			ctx_clear_mount_opt(ctx, EXT2_MOUNT_XATTR_USER);</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_user_xattr:</div><div class='del'>-		case Opt_nouser_xattr:</div><div class='del'>-			ext2_msg(sb, KERN_INFO, "(no)user_xattr options"</div><div class='del'>-				"not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_user_xattr:</div><div class='add'>+		ext2_msg_fc(fc, KERN_INFO, "(no)user_xattr options not supported");</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_EXT2_FS_POSIX_ACL</div><div class='del'>-		case Opt_acl:</div><div class='del'>-			set_opt(opts-&gt;s_mount_opt, POSIX_ACL);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noacl:</div><div class='del'>-			clear_opt(opts-&gt;s_mount_opt, POSIX_ACL);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_acl:</div><div class='add'>+		if (!result.negated)</div><div class='add'>+			ctx_set_mount_opt(ctx, EXT2_MOUNT_POSIX_ACL);</div><div class='add'>+		else</div><div class='add'>+			ctx_clear_mount_opt(ctx, EXT2_MOUNT_POSIX_ACL);</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_acl:</div><div class='del'>-		case Opt_noacl:</div><div class='del'>-			ext2_msg(sb, KERN_INFO,</div><div class='del'>-				"(no)acl options not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_acl:</div><div class='add'>+		ext2_msg_fc(fc, KERN_INFO, "(no)acl options not supported");</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_xip:</div><div class='del'>-			ext2_msg(sb, KERN_INFO, "use dax instead of xip");</div><div class='del'>-			set_opt(opts-&gt;s_mount_opt, XIP);</div><div class='del'>-			fallthrough;</div><div class='del'>-		case Opt_dax:</div><div class='add'>+	case Opt_xip:</div><div class='add'>+		ext2_msg_fc(fc, KERN_INFO, "use dax instead of xip");</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_XIP);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case Opt_dax:</div><div class='ctx'> #ifdef CONFIG_FS_DAX</div><div class='del'>-			ext2_msg(sb, KERN_WARNING,</div><div class='del'>-		"DAX enabled. Warning: EXPERIMENTAL, use at your own risk");</div><div class='del'>-			set_opt(opts-&gt;s_mount_opt, DAX);</div><div class='add'>+		ext2_msg_fc(fc, KERN_WARNING,</div><div class='add'>+		    "DAX enabled. Warning: DAX support in ext2 driver is deprecated"</div><div class='add'>+		    " and will be removed at the end of 2025. Please use ext4 driver instead.");</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_DAX);</div><div class='ctx'> #else</div><div class='del'>-			ext2_msg(sb, KERN_INFO, "dax option not supported");</div><div class='add'>+		ext2_msg_fc(fc, KERN_INFO, "dax option not supported");</div><div class='ctx'> #endif</div><div class='del'>-			break;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_QUOTA)</div><div class='del'>-		case Opt_quota:</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-			set_opt(opts-&gt;s_mount_opt, USRQUOTA);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-			set_opt(opts-&gt;s_mount_opt, GRPQUOTA);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_quota:</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_USRQUOTA);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_GRPQUOTA);</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_quota:</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-			ext2_msg(sb, KERN_INFO,</div><div class='del'>-				"quota operations not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_quota:</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+		ext2_msg_fc(fc, KERN_INFO, "quota operations not supported");</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-		case Opt_reservation:</div><div class='del'>-			set_opt(opts-&gt;s_mount_opt, RESERVATION);</div><div class='del'>-			ext2_msg(sb, KERN_INFO, "reservations ON");</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noreservation:</div><div class='del'>-			clear_opt(opts-&gt;s_mount_opt, RESERVATION);</div><div class='del'>-			ext2_msg(sb, KERN_INFO, "reservations OFF");</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ignore:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='add'>+	case Opt_reservation:</div><div class='add'>+		if (!result.negated) {</div><div class='add'>+			ctx_set_mount_opt(ctx, EXT2_MOUNT_RESERVATION);</div><div class='add'>+			ext2_msg_fc(fc, KERN_INFO, "reservations ON");</div><div class='add'>+		} else {</div><div class='add'>+			ctx_clear_mount_opt(ctx, EXT2_MOUNT_RESERVATION);</div><div class='add'>+			ext2_msg_fc(fc, KERN_INFO, "reservations OFF");</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ignore:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext2_setup_super (struct super_block * sb,</div><div class='hunk'>@@ -802,24 +815,83 @@ static unsigned long descriptor_loc(struct super_block *sb,</div><div class='ctx'> 	return ext2_group_first_block_no(sb, bg) + ext2_bg_has_super(sb, bg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+/*</div><div class='add'>+ * Set all mount options either from defaults on disk, or from parsed</div><div class='add'>+ * options. Parsed/specified options override on-disk defaults.</div><div class='add'>+ */</div><div class='add'>+static void ext2_set_options(struct fs_context *fc, struct ext2_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	struct ext2_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct ext2_super_block *es = sbi-&gt;s_es;</div><div class='add'>+	unsigned long def_mount_opts = le32_to_cpu(es-&gt;s_default_mount_opts);</div><div class='add'>+</div><div class='add'>+	/* Copy parsed mount options to sbi */</div><div class='add'>+	sbi-&gt;s_mount_opt = ctx-&gt;vals_s_mount_opt;</div><div class='add'>+</div><div class='add'>+	/* Use in-superblock defaults only if not specified during parsing */</div><div class='add'>+	if (!ctx_parsed_mount_opt(ctx, EXT2_MOUNT_DEBUG) &amp;&amp;</div><div class='add'>+	    def_mount_opts &amp; EXT2_DEFM_DEBUG)</div><div class='add'>+		set_opt(sbi-&gt;s_mount_opt, DEBUG);</div><div class='add'>+</div><div class='add'>+	if (!ctx_parsed_mount_opt(ctx, EXT2_MOUNT_GRPID) &amp;&amp;</div><div class='add'>+	    def_mount_opts &amp; EXT2_DEFM_BSDGROUPS)</div><div class='add'>+		set_opt(sbi-&gt;s_mount_opt, GRPID);</div><div class='add'>+</div><div class='add'>+	if (!ctx_parsed_mount_opt(ctx, EXT2_MOUNT_NO_UID32) &amp;&amp;</div><div class='add'>+	    def_mount_opts &amp; EXT2_DEFM_UID16)</div><div class='add'>+		set_opt(sbi-&gt;s_mount_opt, NO_UID32);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EXT2_FS_XATTR</div><div class='add'>+	if (!ctx_parsed_mount_opt(ctx, EXT2_MOUNT_XATTR_USER) &amp;&amp;</div><div class='add'>+	    def_mount_opts &amp; EXT2_DEFM_XATTR_USER)</div><div class='add'>+		set_opt(sbi-&gt;s_mount_opt, XATTR_USER);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_EXT2_FS_POSIX_ACL</div><div class='add'>+	if (!ctx_parsed_mount_opt(ctx, EXT2_MOUNT_POSIX_ACL) &amp;&amp;</div><div class='add'>+	    def_mount_opts &amp; EXT2_DEFM_ACL)</div><div class='add'>+		set_opt(sbi-&gt;s_mount_opt, POSIX_ACL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!ctx_parsed_mount_opt(ctx, EXT2_MOUNT_ERRORS_MASK)) {</div><div class='add'>+		if (le16_to_cpu(sbi-&gt;s_es-&gt;s_errors) == EXT2_ERRORS_PANIC)</div><div class='add'>+			set_opt(sbi-&gt;s_mount_opt, ERRORS_PANIC);</div><div class='add'>+		else if (le16_to_cpu(sbi-&gt;s_es-&gt;s_errors) == EXT2_ERRORS_CONTINUE)</div><div class='add'>+			set_opt(sbi-&gt;s_mount_opt, ERRORS_CONT);</div><div class='add'>+		else</div><div class='add'>+			set_opt(sbi-&gt;s_mount_opt, ERRORS_RO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;spec &amp; EXT2_SPEC_s_resuid)</div><div class='add'>+		sbi-&gt;s_resuid = ctx-&gt;s_resuid;</div><div class='add'>+	else</div><div class='add'>+		sbi-&gt;s_resuid = make_kuid(&amp;init_user_ns,</div><div class='add'>+					   le16_to_cpu(es-&gt;s_def_resuid));</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;spec &amp; EXT2_SPEC_s_resgid)</div><div class='add'>+		sbi-&gt;s_resgid = ctx-&gt;s_resgid;</div><div class='add'>+	else</div><div class='add'>+		sbi-&gt;s_resgid = make_kgid(&amp;init_user_ns,</div><div class='add'>+					   le16_to_cpu(es-&gt;s_def_resgid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct ext2_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	struct buffer_head * bh;</div><div class='ctx'> 	struct ext2_sb_info * sbi;</div><div class='ctx'> 	struct ext2_super_block * es;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> 	unsigned long block;</div><div class='del'>-	unsigned long sb_block = get_sb_block(&amp;data);</div><div class='add'>+	unsigned long sb_block = ctx-&gt;s_sb_block;</div><div class='ctx'> 	unsigned long logic_sb_block;</div><div class='ctx'> 	unsigned long offset = 0;</div><div class='del'>-	unsigned long def_mount_opts;</div><div class='ctx'> 	long ret = -ENOMEM;</div><div class='ctx'> 	int blocksize = BLOCK_SIZE;</div><div class='ctx'> 	int db_count;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	__le32 features;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct ext2_mount_options opts;</div><div class='ctx'> </div><div class='ctx'> 	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='ctx'> 	if (!sbi)</div><div class='hunk'>@@ -878,42 +950,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (sb-&gt;s_magic != EXT2_SUPER_MAGIC)</div><div class='ctx'> 		goto cantfind_ext2;</div><div class='ctx'> </div><div class='del'>-	opts.s_mount_opt = 0;</div><div class='del'>-	/* Set defaults before we parse the mount options */</div><div class='del'>-	def_mount_opts = le32_to_cpu(es-&gt;s_default_mount_opts);</div><div class='del'>-	if (def_mount_opts &amp; EXT2_DEFM_DEBUG)</div><div class='del'>-		set_opt(opts.s_mount_opt, DEBUG);</div><div class='del'>-	if (def_mount_opts &amp; EXT2_DEFM_BSDGROUPS)</div><div class='del'>-		set_opt(opts.s_mount_opt, GRPID);</div><div class='del'>-	if (def_mount_opts &amp; EXT2_DEFM_UID16)</div><div class='del'>-		set_opt(opts.s_mount_opt, NO_UID32);</div><div class='del'>-#ifdef CONFIG_EXT2_FS_XATTR</div><div class='del'>-	if (def_mount_opts &amp; EXT2_DEFM_XATTR_USER)</div><div class='del'>-		set_opt(opts.s_mount_opt, XATTR_USER);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_EXT2_FS_POSIX_ACL</div><div class='del'>-	if (def_mount_opts &amp; EXT2_DEFM_ACL)</div><div class='del'>-		set_opt(opts.s_mount_opt, POSIX_ACL);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	if (le16_to_cpu(sbi-&gt;s_es-&gt;s_errors) == EXT2_ERRORS_PANIC)</div><div class='del'>-		set_opt(opts.s_mount_opt, ERRORS_PANIC);</div><div class='del'>-	else if (le16_to_cpu(sbi-&gt;s_es-&gt;s_errors) == EXT2_ERRORS_CONTINUE)</div><div class='del'>-		set_opt(opts.s_mount_opt, ERRORS_CONT);</div><div class='del'>-	else</div><div class='del'>-		set_opt(opts.s_mount_opt, ERRORS_RO);</div><div class='del'>-</div><div class='del'>-	opts.s_resuid = make_kuid(&amp;init_user_ns, le16_to_cpu(es-&gt;s_def_resuid));</div><div class='del'>-	opts.s_resgid = make_kgid(&amp;init_user_ns, le16_to_cpu(es-&gt;s_def_resgid));</div><div class='del'>-	</div><div class='del'>-	set_opt(opts.s_mount_opt, RESERVATION);</div><div class='del'>-</div><div class='del'>-	if (!parse_options((char *) data, sb, &amp;opts))</div><div class='del'>-		goto failed_mount;</div><div class='del'>-</div><div class='del'>-	sbi-&gt;s_mount_opt = opts.s_mount_opt;</div><div class='del'>-	sbi-&gt;s_resuid = opts.s_resuid;</div><div class='del'>-	sbi-&gt;s_resgid = opts.s_resgid;</div><div class='add'>+	ext2_set_options(fc, sbi);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_flags = (sb-&gt;s_flags &amp; ~SB_POSIXACL) |</div><div class='ctx'> 		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);</div><div class='hunk'>@@ -1325,23 +1362,21 @@ static void ext2_write_super(struct super_block *sb)</div><div class='ctx'> 		ext2_sync_fs(sb, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext2_remount (struct super_block * sb, int * flags, char * data)</div><div class='add'>+static int ext2_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct ext2_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct ext2_sb_info * sbi = EXT2_SB(sb);</div><div class='ctx'> 	struct ext2_super_block * es;</div><div class='ctx'> 	struct ext2_mount_options new_opts;</div><div class='add'>+	int flags = fc-&gt;sb_flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_lock);</div><div class='del'>-	new_opts.s_mount_opt = sbi-&gt;s_mount_opt;</div><div class='del'>-	new_opts.s_resuid = sbi-&gt;s_resuid;</div><div class='del'>-	new_opts.s_resgid = sbi-&gt;s_resgid;</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_lock);</div><div class='del'>-</div><div class='del'>-	if (!parse_options(data, sb, &amp;new_opts))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	new_opts.s_mount_opt = ctx-&gt;vals_s_mount_opt;</div><div class='add'>+	new_opts.s_resuid = ctx-&gt;s_resuid;</div><div class='add'>+	new_opts.s_resgid = ctx-&gt;s_resgid;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;s_lock);</div><div class='ctx'> 	es = sbi-&gt;s_es;</div><div class='hunk'>@@ -1350,9 +1385,9 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)</div><div class='ctx'> 			 "dax flag with busy inodes while remounting");</div><div class='ctx'> 		new_opts.s_mount_opt ^= EXT2_MOUNT_DAX;</div><div class='ctx'> 	}</div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='add'>+	if ((bool)(flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='ctx'> 		goto out_set;</div><div class='del'>-	if (*flags &amp; SB_RDONLY) {</div><div class='add'>+	if (flags &amp; SB_RDONLY) {</div><div class='ctx'> 		if (le16_to_cpu(es-&gt;s_state) &amp; EXT2_VALID_FS ||</div><div class='ctx'> 		    !(sbi-&gt;s_mount_state &amp; EXT2_VALID_FS))</div><div class='ctx'> 			goto out_set;</div><div class='hunk'>@@ -1471,10 +1506,9 @@ static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *ext2_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int ext2_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, ext2_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, ext2_fill_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='hunk'>@@ -1557,7 +1591,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 		}</div><div class='ctx'> 		lock_buffer(bh);</div><div class='ctx'> 		memcpy(bh-&gt;b_data+offset, data, tocopy);</div><div class='del'>-		flush_dcache_page(bh-&gt;b_page);</div><div class='add'>+		flush_dcache_folio(bh-&gt;b_folio);</div><div class='ctx'> 		set_buffer_uptodate(bh);</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='hunk'>@@ -1625,12 +1659,49 @@ out:</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static const struct fs_context_operations ext2_context_ops = {</div><div class='add'>+	.parse_param	= ext2_parse_param,</div><div class='add'>+	.get_tree	= ext2_get_tree,</div><div class='add'>+	.reconfigure	= ext2_reconfigure,</div><div class='add'>+	.free		= ext2_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ext2_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct ext2_fs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+		struct ext2_sb_info *sbi = EXT2_SB(sb);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sbi-&gt;s_lock);</div><div class='add'>+		ctx-&gt;vals_s_mount_opt = sbi-&gt;s_mount_opt;</div><div class='add'>+		ctx-&gt;vals_s_flags = sb-&gt;s_flags;</div><div class='add'>+		ctx-&gt;s_resuid = sbi-&gt;s_resuid;</div><div class='add'>+		ctx-&gt;s_resgid = sbi-&gt;s_resgid;</div><div class='add'>+		spin_unlock(&amp;sbi-&gt;s_lock);</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;s_sb_block = 1;</div><div class='add'>+		ctx_set_mount_opt(ctx, EXT2_MOUNT_RESERVATION);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;ext2_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct file_system_type ext2_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "ext2",</div><div class='del'>-	.mount		= ext2_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = ext2_init_fs_context,</div><div class='add'>+	.parameters	= ext2_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("ext2");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c<br/>index e849241ebb8f..c885dcc3bd0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext2/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext2/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext2/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext2/xattr.c</a></div><div class='hunk'>@@ -874,7 +874,7 @@ ext2_xattr_cache_insert(struct mb_cache *cache, struct buffer_head *bh)</div><div class='ctx'> 	__u32 hash = le32_to_cpu(HDR(bh)-&gt;h_hash);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = mb_cache_entry_create(cache, GFP_NOFS, hash, bh-&gt;b_blocknr,</div><div class='add'>+	error = mb_cache_entry_create(cache, GFP_KERNEL, hash, bh-&gt;b_blocknr,</div><div class='ctx'> 				      true);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		if (error == -EBUSY) {</div><div class='head'>diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig<br/>index e20d59221fc0..01873c2a34ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/Kconfig</a></div><div class='hunk'>@@ -1,38 +1,10 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-# Ext3 configs are here for backward compatibility with old configs which may</div><div class='del'>-# have EXT3_FS set but not EXT4_FS set and thus would result in non-bootable</div><div class='del'>-# kernels after the removal of ext3 driver.</div><div class='del'>-config EXT3_FS</div><div class='del'>-	tristate "The Extended 3 (ext3) filesystem"</div><div class='del'>-	select EXT4_FS</div><div class='del'>-	help</div><div class='del'>-	  This config option is here only for backward compatibility. ext3</div><div class='del'>-	  filesystem is now handled by the ext4 driver.</div><div class='del'>-</div><div class='del'>-config EXT3_FS_POSIX_ACL</div><div class='del'>-	bool "Ext3 POSIX Access Control Lists"</div><div class='del'>-	depends on EXT3_FS</div><div class='del'>-	select EXT4_FS_POSIX_ACL</div><div class='del'>-	select FS_POSIX_ACL</div><div class='del'>-	help</div><div class='del'>-	  This config option is here only for backward compatibility. ext3</div><div class='del'>-	  filesystem is now handled by the ext4 driver.</div><div class='del'>-</div><div class='del'>-config EXT3_FS_SECURITY</div><div class='del'>-	bool "Ext3 Security Labels"</div><div class='del'>-	depends on EXT3_FS</div><div class='del'>-	select EXT4_FS_SECURITY</div><div class='del'>-	help</div><div class='del'>-	  This config option is here only for backward compatibility. ext3</div><div class='del'>-	  filesystem is now handled by the ext4 driver.</div><div class='del'>-</div><div class='ctx'> config EXT4_FS</div><div class='ctx'> 	tristate "The Extended 4 (ext4) filesystem"</div><div class='ctx'> 	select BUFFER_HEAD</div><div class='ctx'> 	select JBD2</div><div class='ctx'> 	select CRC16</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_CRC32C</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select FS_IOMAP</div><div class='ctx'> 	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION</div><div class='ctx'> 	help</div><div class='head'>diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h<br/>index ef4c19e5f570..0c5a79c3b5d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/acl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/acl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/acl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/acl.h</a></div><div class='hunk'>@@ -68,11 +68,6 @@ extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);</div><div class='ctx'> static inline int</div><div class='ctx'> ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)</div><div class='ctx'> {</div><div class='del'>-	/* usually, the umask is applied by posix_acl_create(), but if</div><div class='del'>-	   ext4 ACL support is disabled at compile time, we need to do</div><div class='del'>-	   it here, because posix_acl_create() will never be called */</div><div class='del'>-	inode-&gt;i_mode &amp;= ~current_umask();</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif  /* CONFIG_EXT4_FS_POSIX_ACL */</div><div class='head'>diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c<br/>index 591fb3f710be..8040c731b3e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/balloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/balloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/balloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/balloc.c</a></div><div class='hunk'>@@ -550,7 +550,8 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group,</div><div class='ctx'> 	trace_ext4_read_block_bitmap_load(sb, block_group, ignore_locked);</div><div class='ctx'> 	ext4_read_bh_nowait(bh, REQ_META | REQ_PRIO |</div><div class='ctx'> 			    (ignore_locked ? REQ_RAHEAD : 0),</div><div class='del'>-			    ext4_end_bitmap_read);</div><div class='add'>+			    ext4_end_bitmap_read,</div><div class='add'>+			    ext4_simulate_fail(sb, EXT4_SIM_BBITMAP_EIO));</div><div class='ctx'> 	return bh;</div><div class='ctx'> verify:</div><div class='ctx'> 	err = ext4_validate_block_bitmap(sb, desc, block_group, bh);</div><div class='hunk'>@@ -577,7 +578,6 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group,</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	wait_on_buffer(bh);</div><div class='del'>-	ext4_simulate_fail_bh(sb, bh, EXT4_SIM_BBITMAP_EIO);</div><div class='ctx'> 	if (!buffer_uptodate(bh)) {</div><div class='ctx'> 		ext4_error_err(sb, EIO, "Cannot read block bitmap - "</div><div class='ctx'> 			       "block_group = %u, block_bitmap = %llu",</div><div class='hunk'>@@ -649,8 +649,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,</div><div class='ctx'> 	/* Hm, nope.  Are (enough) root reserved clusters available? */</div><div class='ctx'> 	if (uid_eq(sbi-&gt;s_resuid, current_fsuid()) ||</div><div class='ctx'> 	    (!gid_eq(sbi-&gt;s_resgid, GLOBAL_ROOT_GID) &amp;&amp; in_group_p(sbi-&gt;s_resgid)) ||</div><div class='del'>-	    capable(CAP_SYS_RESOURCE) ||</div><div class='del'>-	    (flags &amp; EXT4_MB_USE_ROOT_BLOCKS)) {</div><div class='add'>+	    (flags &amp; EXT4_MB_USE_ROOT_BLOCKS) ||</div><div class='add'>+	    capable(CAP_SYS_RESOURCE)) {</div><div class='ctx'> </div><div class='ctx'> 		if (free_clusters &gt;= (nclusters + dirty_clusters +</div><div class='ctx'> 				      resv_clusters))</div><div class='hunk'>@@ -703,7 +703,7 @@ int ext4_should_retry_alloc(struct super_block *sb, int *retries)</div><div class='ctx'> 	 * possible we just missed a transaction commit that did so</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	if (sbi-&gt;s_mb_free_pending == 0) {</div><div class='add'>+	if (atomic_read(&amp;sbi-&gt;s_mb_free_pending) == 0) {</div><div class='ctx'> 		if (test_opt(sb, DISCARD)) {</div><div class='ctx'> 			atomic_inc(&amp;sbi-&gt;s_retry_alloc_pending);</div><div class='ctx'> 			flush_work(&amp;sbi-&gt;s_discard_work);</div><div class='hunk'>@@ -752,7 +752,7 @@ ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		*count = ar.len;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Account for the allocated meta blocks.  We will never</div><div class='del'>-	 * fail EDQUOT for metdata, but we do account for it.</div><div class='add'>+	 * fail EDQUOT for metadata, but we do account for it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(*errp) &amp;&amp; (flags &amp; EXT4_MB_DELALLOC_RESERVED)) {</div><div class='ctx'> 		dquot_alloc_block_nofail(inode,</div><div class='head'>diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c<br/>index cd725bebe69e..87760fabdd2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/bitmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/bitmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/bitmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/bitmap.c</a></div><div class='hunk'>@@ -18,17 +18,19 @@ unsigned int ext4_count_free(char *bitmap, unsigned int numchars)</div><div class='ctx'> </div><div class='ctx'> int ext4_inode_bitmap_csum_verify(struct super_block *sb,</div><div class='ctx'> 				  struct ext4_group_desc *gdp,</div><div class='del'>-				  struct buffer_head *bh, int sz)</div><div class='add'>+				  struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 hi;</div><div class='ctx'> 	__u32 provided, calculated;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	int sz;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	sz = EXT4_INODES_PER_GROUP(sb) &gt;&gt; 3;</div><div class='ctx'> 	provided = le16_to_cpu(gdp-&gt;bg_inode_bitmap_csum_lo);</div><div class='del'>-	calculated = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='add'>+	calculated = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='ctx'> 	if (sbi-&gt;s_desc_size &gt;= EXT4_BG_INODE_BITMAP_CSUM_HI_END) {</div><div class='ctx'> 		hi = le16_to_cpu(gdp-&gt;bg_inode_bitmap_csum_hi);</div><div class='ctx'> 		provided |= (hi &lt;&lt; 16);</div><div class='hunk'>@@ -40,15 +42,17 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> void ext4_inode_bitmap_csum_set(struct super_block *sb,</div><div class='ctx'> 				struct ext4_group_desc *gdp,</div><div class='del'>-				struct buffer_head *bh, int sz)</div><div class='add'>+				struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	int sz;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='add'>+	sz = EXT4_INODES_PER_GROUP(sb) &gt;&gt; 3;</div><div class='add'>+	csum = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='ctx'> 	gdp-&gt;bg_inode_bitmap_csum_lo = cpu_to_le16(csum &amp; 0xFFFF);</div><div class='ctx'> 	if (sbi-&gt;s_desc_size &gt;= EXT4_BG_INODE_BITMAP_CSUM_HI_END)</div><div class='ctx'> 		gdp-&gt;bg_inode_bitmap_csum_hi = cpu_to_le16(csum &gt;&gt; 16);</div><div class='hunk'>@@ -63,11 +67,11 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb,</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	provided = le16_to_cpu(gdp-&gt;bg_block_bitmap_csum_lo);</div><div class='del'>-	calculated = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='add'>+	calculated = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='ctx'> 	if (sbi-&gt;s_desc_size &gt;= EXT4_BG_BLOCK_BITMAP_CSUM_HI_END) {</div><div class='ctx'> 		hi = le16_to_cpu(gdp-&gt;bg_block_bitmap_csum_hi);</div><div class='ctx'> 		provided |= (hi &lt;&lt; 16);</div><div class='hunk'>@@ -85,10 +89,10 @@ void ext4_block_bitmap_csum_set(struct super_block *sb,</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='add'>+	csum = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)bh-&gt;b_data, sz);</div><div class='ctx'> 	gdp-&gt;bg_block_bitmap_csum_lo = cpu_to_le16(csum &amp; 0xFFFF);</div><div class='ctx'> 	if (sbi-&gt;s_desc_size &gt;= EXT4_BG_BLOCK_BITMAP_CSUM_HI_END)</div><div class='ctx'> 		gdp-&gt;bg_block_bitmap_csum_hi = cpu_to_le16(csum &gt;&gt; 16);</div><div class='head'>diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c<br/>index 6fe3c941b565..e8c5525afc67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/block_validity.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/block_validity.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/block_validity.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/block_validity.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static int add_system_zone(struct ext4_system_blocks *system_blks,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_system_zone *new_entry, *entry;</div><div class='ctx'> 	struct rb_node **n = &amp;system_blks-&gt;root.rb_node, *node;</div><div class='del'>-	struct rb_node *parent = NULL, *new_node = NULL;</div><div class='add'>+	struct rb_node *parent = NULL, *new_node;</div><div class='ctx'> </div><div class='ctx'> 	while (*n) {</div><div class='ctx'> 		parent = *n;</div><div class='hunk'>@@ -351,10 +351,9 @@ int ext4_check_blockref(const char *function, unsigned int line,</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *bref = p;</div><div class='ctx'> 	unsigned int blk;</div><div class='add'>+	journal_t *journal = EXT4_SB(inode-&gt;i_sb)-&gt;s_journal;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_feature_journal(inode-&gt;i_sb) &amp;&amp;</div><div class='del'>-	    (inode-&gt;i_ino ==</div><div class='del'>-	     le32_to_cpu(EXT4_SB(inode-&gt;i_sb)-&gt;s_es-&gt;s_journal_inum)))</div><div class='add'>+	if (journal &amp;&amp; inode == journal-&gt;j_inode)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while (bref &lt; p+max) {</div><div class='head'>diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c<br/>index 7ae0b61258a7..cf0a0970c095 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/crypto.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/crypto.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/crypto.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/crypto.c</a></div><div class='hunk'>@@ -31,11 +31,10 @@ int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname,</div><div class='ctx'> </div><div class='ctx'> 	ext4_fname_from_fscrypt_name(fname, &amp;name);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	err = ext4_fname_setup_ci_filename(dir, iname, fname);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		ext4_fname_free_filename(fname);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -51,11 +50,9 @@ int ext4_fname_prepare_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	ext4_fname_from_fscrypt_name(fname, &amp;name);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	err = ext4_fname_setup_ci_filename(dir, &amp;dentry-&gt;d_name, fname);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		ext4_fname_free_filename(fname);</div><div class='del'>-#endif</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,10 +67,7 @@ void ext4_fname_free_filename(struct ext4_filename *fname)</div><div class='ctx'> 	fname-&gt;usr_fname = NULL;</div><div class='ctx'> 	fname-&gt;disk_name.name = NULL;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	kfree(fname-&gt;cf_name.name);</div><div class='del'>-	fname-&gt;cf_name.name = NULL;</div><div class='del'>-#endif</div><div class='add'>+	ext4_fname_free_ci_filename(fname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool uuid_is_zero(__u8 u[16])</div><div class='hunk'>@@ -233,6 +227,8 @@ static bool ext4_has_stable_inodes(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct fscrypt_operations ext4_cryptops = {</div><div class='add'>+	.inode_info_offs	= (int)offsetof(struct ext4_inode_info, i_crypt_info) -</div><div class='add'>+				  (int)offsetof(struct ext4_inode_info, vfs_inode),</div><div class='ctx'> 	.needs_bounce_pages	= 1,</div><div class='ctx'> 	.has_32bit_inodes	= 1,</div><div class='ctx'> 	.supports_subblock_data_units = 1,</div><div class='head'>diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c<br/>index 3985f8c33f95..256fe2c1d4c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/dir.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,</div><div class='ctx'> 						dir-&gt;i_sb-&gt;s_blocksize);</div><div class='ctx'> 	const int next_offset = ((char *) de - buf) + rlen;</div><div class='ctx'> 	bool fake = is_fake_dir_entry(de);</div><div class='del'>-	bool has_csum = ext4_has_metadata_csum(dir-&gt;i_sb);</div><div class='add'>+	bool has_csum = ext4_has_feature_metadata_csum(dir-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rlen &lt; ext4_dir_rec_len(1, fake ? NULL : dir)))</div><div class='ctx'> 		error_msg = "rec_len is smaller than minimal";</div><div class='hunk'>@@ -104,6 +104,9 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,</div><div class='ctx'> 	else if (unlikely(le32_to_cpu(de-&gt;inode) &gt;</div><div class='ctx'> 			le32_to_cpu(EXT4_SB(dir-&gt;i_sb)-&gt;s_es-&gt;s_inodes_count)))</div><div class='ctx'> 		error_msg = "inode out of bounds";</div><div class='add'>+	else if (unlikely(next_offset == size &amp;&amp; de-&gt;name_len == 1 &amp;&amp;</div><div class='add'>+			  de-&gt;name[0] == '.'))</div><div class='add'>+		error_msg = "'.' directory cannot be the last in data block";</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -133,6 +136,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='ctx'> 	struct fscrypt_str fstr = FSTR_INIT(NULL, 0);</div><div class='add'>+	struct dir_private_info *info = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	err = fscrypt_prepare_readdir(inode);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -144,7 +148,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		/* Can we just clear INDEX flag to ignore htree information? */</div><div class='del'>-		if (!ext4_has_metadata_csum(sb)) {</div><div class='add'>+		if (!ext4_has_feature_metadata_csum(sb)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We don't set the inode dirty flag since it's not</div><div class='ctx'> 			 * critical that it gets flushed back to the disk.</div><div class='hunk'>@@ -188,13 +192,13 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (err &gt; 0) {</div><div class='del'>-			pgoff_t index = map.m_pblk &gt;&gt;</div><div class='del'>-					(PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='add'>+			pgoff_t index = map.m_pblk &lt;&lt; inode-&gt;i_blkbits &gt;&gt;</div><div class='add'>+					PAGE_SHIFT;</div><div class='ctx'> 			if (!ra_has_index(&amp;file-&gt;f_ra, index))</div><div class='ctx'> 				page_cache_sync_readahead(</div><div class='del'>-					sb-&gt;s_bdev-&gt;bd_inode-&gt;i_mapping,</div><div class='del'>-					&amp;file-&gt;f_ra, file,</div><div class='del'>-					index, 1);</div><div class='add'>+					sb-&gt;s_bdev-&gt;bd_mapping,</div><div class='add'>+					&amp;file-&gt;f_ra, file, index,</div><div class='add'>+					1 &lt;&lt; EXT4_SB(sb)-&gt;s_min_folio_order);</div><div class='ctx'> 			file-&gt;f_ra.prev_pos = (loff_t)index &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 			bh = ext4_bread(NULL, inode, map.m_lblk, 0);</div><div class='ctx'> 			if (IS_ERR(bh)) {</div><div class='hunk'>@@ -229,7 +233,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		 * readdir(2), then we might be pointing to an invalid</div><div class='ctx'> 		 * dirent right now.  Scan from the start of the block</div><div class='ctx'> 		 * to make sure. */</div><div class='del'>-		if (!inode_eq_iversion(inode, file-&gt;f_version)) {</div><div class='add'>+		if (!inode_eq_iversion(inode, info-&gt;cookie)) {</div><div class='ctx'> 			for (i = 0; i &lt; sb-&gt;s_blocksize &amp;&amp; i &lt; offset; ) {</div><div class='ctx'> 				de = (struct ext4_dir_entry_2 *)</div><div class='ctx'> 					(bh-&gt;b_data + i);</div><div class='hunk'>@@ -249,7 +253,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			offset = i;</div><div class='ctx'> 			ctx-&gt;pos = (ctx-&gt;pos &amp; ~(sb-&gt;s_blocksize - 1))</div><div class='ctx'> 				| offset;</div><div class='del'>-			file-&gt;f_version = inode_query_iversion(inode);</div><div class='add'>+			info-&gt;cookie = inode_query_iversion(inode);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		while (ctx-&gt;pos &lt; inode-&gt;i_size</div><div class='hunk'>@@ -279,12 +283,20 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 					struct fscrypt_str de_name =</div><div class='ctx'> 							FSTR_INIT(de-&gt;name,</div><div class='ctx'> 								de-&gt;name_len);</div><div class='add'>+					u32 hash;</div><div class='add'>+					u32 minor_hash;</div><div class='add'>+</div><div class='add'>+					if (IS_CASEFOLDED(inode)) {</div><div class='add'>+						hash = EXT4_DIRENT_HASH(de);</div><div class='add'>+						minor_hash = EXT4_DIRENT_MINOR_HASH(de);</div><div class='add'>+					} else {</div><div class='add'>+						hash = 0;</div><div class='add'>+						minor_hash = 0;</div><div class='add'>+					}</div><div class='ctx'> </div><div class='ctx'> 					/* Directory is encrypted */</div><div class='ctx'> 					err = fscrypt_fname_disk_to_usr(inode,</div><div class='del'>-						EXT4_DIRENT_HASH(de),</div><div class='del'>-						EXT4_DIRENT_MINOR_HASH(de),</div><div class='del'>-						&amp;de_name, &amp;fstr);</div><div class='add'>+						hash, minor_hash, &amp;de_name, &amp;fstr);</div><div class='ctx'> 					de_name = fstr;</div><div class='ctx'> 					fstr.len = save_len;</div><div class='ctx'> 					if (err)</div><div class='hunk'>@@ -384,6 +396,7 @@ static inline loff_t ext4_get_htree_eof(struct file *filp)</div><div class='ctx'> static loff_t ext4_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+	struct dir_private_info *info = file-&gt;private_data;</div><div class='ctx'> 	int dx_dir = is_dx_dir(inode);</div><div class='ctx'> 	loff_t ret, htree_max = ext4_get_htree_eof(file);</div><div class='ctx'> </div><div class='hunk'>@@ -392,7 +405,7 @@ static loff_t ext4_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 						    htree_max, htree_max);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = ext4_llseek(file, offset, whence);</div><div class='del'>-	file-&gt;f_version = inode_peek_iversion(inode) - 1;</div><div class='add'>+	info-&gt;cookie = inode_peek_iversion(inode) - 1;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -408,7 +421,7 @@ struct fname {</div><div class='ctx'> 	__u32		inode;</div><div class='ctx'> 	__u8		name_len;</div><div class='ctx'> 	__u8		file_type;</div><div class='del'>-	char		name[];</div><div class='add'>+	char		name[] __counted_by(name_len);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -429,18 +442,15 @@ static void free_rb_tree_fname(struct rb_root *root)</div><div class='ctx'> 	*root = RB_ROOT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct dir_private_info *ext4_htree_create_dir_info(struct file *filp,</div><div class='del'>-							   loff_t pos)</div><div class='add'>+static void ext4_htree_init_dir_info(struct file *filp, loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	struct dir_private_info *p;</div><div class='del'>-</div><div class='del'>-	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='del'>-	if (!p)</div><div class='del'>-		return NULL;</div><div class='del'>-	p-&gt;curr_hash = pos2maj_hash(filp, pos);</div><div class='del'>-	p-&gt;curr_minor_hash = pos2min_hash(filp, pos);</div><div class='del'>-	return p;</div><div class='add'>+	struct dir_private_info *p = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (is_dx_dir(file_inode(filp)) &amp;&amp; !p-&gt;initialized) {</div><div class='add'>+		p-&gt;curr_hash = pos2maj_hash(filp, pos);</div><div class='add'>+		p-&gt;curr_minor_hash = pos2min_hash(filp, pos);</div><div class='add'>+		p-&gt;initialized = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ext4_htree_free_dir_info(struct dir_private_info *p)</div><div class='hunk'>@@ -464,14 +474,13 @@ int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,</div><div class='ctx'> 	struct rb_node **p, *parent = NULL;</div><div class='ctx'> 	struct fname *fname, *new_fn;</div><div class='ctx'> 	struct dir_private_info *info;</div><div class='del'>-	int len;</div><div class='ctx'> </div><div class='ctx'> 	info = dir_file-&gt;private_data;</div><div class='ctx'> 	p = &amp;info-&gt;root.rb_node;</div><div class='ctx'> </div><div class='ctx'> 	/* Create and allocate the fname structure */</div><div class='del'>-	len = sizeof(struct fname) + ent_name-&gt;len + 1;</div><div class='del'>-	new_fn = kzalloc(len, GFP_KERNEL);</div><div class='add'>+	new_fn = kzalloc(struct_size(new_fn, name, ent_name-&gt;len + 1),</div><div class='add'>+			 GFP_KERNEL);</div><div class='ctx'> 	if (!new_fn)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	new_fn-&gt;hash = hash;</div><div class='hunk'>@@ -552,12 +561,7 @@ static int ext4_dx_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	struct fname *fname;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!info) {</div><div class='del'>-		info = ext4_htree_create_dir_info(file, ctx-&gt;pos);</div><div class='del'>-		if (!info)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		file-&gt;private_data = info;</div><div class='del'>-	}</div><div class='add'>+	ext4_htree_init_dir_info(file, ctx-&gt;pos);</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;pos == ext4_get_htree_eof(file))</div><div class='ctx'> 		return 0;	/* EOF */</div><div class='hunk'>@@ -590,10 +594,10 @@ static int ext4_dx_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		 * cached entries.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((!info-&gt;curr_node) ||</div><div class='del'>-		    !inode_eq_iversion(inode, file-&gt;f_version)) {</div><div class='add'>+		    !inode_eq_iversion(inode, info-&gt;cookie)) {</div><div class='ctx'> 			info-&gt;curr_node = NULL;</div><div class='ctx'> 			free_rb_tree_fname(&amp;info-&gt;root);</div><div class='del'>-			file-&gt;f_version = inode_query_iversion(inode);</div><div class='add'>+			info-&gt;cookie = inode_query_iversion(inode);</div><div class='ctx'> 			ret = ext4_htree_fill_tree(file, info-&gt;curr_hash,</div><div class='ctx'> 						   info-&gt;curr_minor_hash,</div><div class='ctx'> 						   &amp;info-&gt;next_hash);</div><div class='hunk'>@@ -664,7 +668,19 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext4_dir_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct dir_private_info *info;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	file-&gt;private_data = info;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations ext4_dir_operations = {</div><div class='add'>+	.open		= ext4_dir_open,</div><div class='ctx'> 	.llseek		= ext4_dir_llseek,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='ctx'> 	.iterate_shared	= ext4_readdir,</div><div class='head'>diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h<br/>index dcdad5da419e..56112f201cac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/ext4.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/blockgroup_lock.h&gt;</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/crc32c.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='ctx'> #include &lt;linux/percpu-rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/fiemap.h&gt;</div><div class='hunk'>@@ -157,7 +157,7 @@ enum criteria {</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reads each block group sequentially, performing disk IO if</div><div class='del'>-	 * necessary, to find find_suitable block group. Tries to</div><div class='add'>+	 * necessary, to find suitable block group. Tries to</div><div class='ctx'> 	 * allocate goal length but might trim the request if nothing</div><div class='ctx'> 	 * is found after enough tries.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -185,14 +185,8 @@ enum criteria {</div><div class='ctx'> </div><div class='ctx'> /* prefer goal again. length */</div><div class='ctx'> #define EXT4_MB_HINT_MERGE		0x0001</div><div class='del'>-/* blocks already reserved */</div><div class='del'>-#define EXT4_MB_HINT_RESERVED		0x0002</div><div class='del'>-/* metadata is being allocated */</div><div class='del'>-#define EXT4_MB_HINT_METADATA		0x0004</div><div class='ctx'> /* first blocks in the file */</div><div class='ctx'> #define EXT4_MB_HINT_FIRST		0x0008</div><div class='del'>-/* search for the best chunk */</div><div class='del'>-#define EXT4_MB_HINT_BEST		0x0010</div><div class='ctx'> /* data is being allocated */</div><div class='ctx'> #define EXT4_MB_HINT_DATA		0x0020</div><div class='ctx'> /* don't preallocate (for tails) */</div><div class='hunk'>@@ -213,12 +207,6 @@ enum criteria {</div><div class='ctx'> #define EXT4_MB_USE_RESERVED		0x2000</div><div class='ctx'> /* Do strict check for free blocks while retrying block allocation */</div><div class='ctx'> #define EXT4_MB_STRICT_CHECK		0x4000</div><div class='del'>-/* Large fragment size list lookup succeeded at least once for cr = 0 */</div><div class='del'>-#define EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED		0x8000</div><div class='del'>-/* Avg fragment size rb tree lookup succeeded at least once for cr = 1 */</div><div class='del'>-#define EXT4_MB_CR_GOAL_LEN_FAST_OPTIMIZED		0x00010000</div><div class='del'>-/* Avg fragment size rb tree lookup succeeded at least once for cr = 1.5 */</div><div class='del'>-#define EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED		0x00020000</div><div class='ctx'> </div><div class='ctx'> struct ext4_allocation_request {</div><div class='ctx'> 	/* target inode for block we're allocating */</div><div class='hunk'>@@ -252,14 +240,27 @@ struct ext4_allocation_request {</div><div class='ctx'> #define EXT4_MAP_MAPPED		BIT(BH_Mapped)</div><div class='ctx'> #define EXT4_MAP_UNWRITTEN	BIT(BH_Unwritten)</div><div class='ctx'> #define EXT4_MAP_BOUNDARY	BIT(BH_Boundary)</div><div class='add'>+#define EXT4_MAP_DELAYED	BIT(BH_Delay)</div><div class='add'>+/*</div><div class='add'>+ * This is for use in ext4_map_query_blocks() for a special case where we can</div><div class='add'>+ * have a physically and logically contiguous blocks split across two leaf</div><div class='add'>+ * nodes instead of a single extent. This is required in case of atomic writes</div><div class='add'>+ * to know whether the returned extent is last in leaf. If yes, then lookup for</div><div class='add'>+ * next in leaf block in ext4_map_query_blocks_next_in_leaf().</div><div class='add'>+ * - This is never going to be added to any buffer head state.</div><div class='add'>+ * - We use the next available bit after BH_BITMAP_UPTODATE.</div><div class='add'>+ */</div><div class='add'>+#define EXT4_MAP_QUERY_LAST_IN_LEAF	BIT(BH_BITMAP_UPTODATE + 1)</div><div class='ctx'> #define EXT4_MAP_FLAGS		(EXT4_MAP_NEW | EXT4_MAP_MAPPED |\</div><div class='del'>-				 EXT4_MAP_UNWRITTEN | EXT4_MAP_BOUNDARY)</div><div class='add'>+				 EXT4_MAP_UNWRITTEN | EXT4_MAP_BOUNDARY |\</div><div class='add'>+				 EXT4_MAP_DELAYED | EXT4_MAP_QUERY_LAST_IN_LEAF)</div><div class='ctx'> </div><div class='ctx'> struct ext4_map_blocks {</div><div class='ctx'> 	ext4_fsblk_t m_pblk;</div><div class='ctx'> 	ext4_lblk_t m_lblk;</div><div class='ctx'> 	unsigned int m_len;</div><div class='ctx'> 	unsigned int m_flags;</div><div class='add'>+	u64 m_seq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -273,7 +274,10 @@ struct ext4_system_blocks {</div><div class='ctx'> /*</div><div class='ctx'>  * Flags for ext4_io_end-&gt;flags</div><div class='ctx'>  */</div><div class='del'>-#define	EXT4_IO_END_UNWRITTEN	0x0001</div><div class='add'>+#define EXT4_IO_END_UNWRITTEN	0x0001</div><div class='add'>+#define EXT4_IO_END_FAILED	0x0002</div><div class='add'>+</div><div class='add'>+#define EXT4_IO_END_DEFER_COMPLETION (EXT4_IO_END_UNWRITTEN | EXT4_IO_END_FAILED)</div><div class='ctx'> </div><div class='ctx'> struct ext4_io_end_vec {</div><div class='ctx'> 	struct list_head list;		/* list of io_end_vec */</div><div class='hunk'>@@ -362,7 +366,16 @@ struct ext4_io_submit {</div><div class='ctx'> #define EXT4_MAX_BLOCKS(size, offset, blkbits) \</div><div class='ctx'> 	((EXT4_BLOCK_ALIGN(size + offset, blkbits) &gt;&gt; blkbits) - (offset &gt;&gt; \</div><div class='ctx'> 								  blkbits))</div><div class='del'>-</div><div class='add'>+#define EXT4_B_TO_LBLK(inode, offset) \</div><div class='add'>+	(round_up((offset), i_blocksize(inode)) &gt;&gt; (inode)-&gt;i_blkbits)</div><div class='add'>+#define EXT4_LBLK_TO_B(inode, lblk) ((loff_t)(lblk) &lt;&lt; (inode)-&gt;i_blkbits)</div><div class='add'>+</div><div class='add'>+/* Translate a block number to a page index */</div><div class='add'>+#define EXT4_LBLK_TO_PG(inode, lblk)	(EXT4_LBLK_TO_B((inode), (lblk)) &gt;&gt; \</div><div class='add'>+					 PAGE_SHIFT)</div><div class='add'>+/* Translate a page index to a block number */</div><div class='add'>+#define EXT4_PG_TO_LBLK(inode, pnum)	(((loff_t)(pnum) &lt;&lt; PAGE_SHIFT) &gt;&gt; \</div><div class='add'>+					 (inode)-&gt;i_blkbits)</div><div class='ctx'> /* Translate a block number to a cluster number */</div><div class='ctx'> #define EXT4_B2C(sbi, blk)	((blk) &gt;&gt; (sbi)-&gt;s_cluster_bits)</div><div class='ctx'> /* Translate a cluster number to a block number */</div><div class='hunk'>@@ -689,16 +702,22 @@ enum {</div><div class='ctx'> 	/* Caller is from the delayed allocation writeout path</div><div class='ctx'> 	 * finally doing the actual allocation of delayed blocks */</div><div class='ctx'> #define EXT4_GET_BLOCKS_DELALLOC_RESERVE	0x0004</div><div class='del'>-	/* caller is from the direct IO path, request to creation of an</div><div class='del'>-	unwritten extents if not allocated, split the unwritten</div><div class='del'>-	extent if blocks has been preallocated already*/</div><div class='del'>-#define EXT4_GET_BLOCKS_PRE_IO			0x0008</div><div class='del'>-#define EXT4_GET_BLOCKS_CONVERT			0x0010</div><div class='del'>-#define EXT4_GET_BLOCKS_IO_CREATE_EXT		(EXT4_GET_BLOCKS_PRE_IO|\</div><div class='del'>-					 EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT)</div><div class='del'>-	/* Convert extent to initialized after IO complete */</div><div class='del'>-#define EXT4_GET_BLOCKS_IO_CONVERT_EXT		(EXT4_GET_BLOCKS_CONVERT|\</div><div class='add'>+	/*</div><div class='add'>+	 * This means that we cannot merge newly allocated extents, and if we</div><div class='add'>+	 * found an unwritten extent, we need to split it.</div><div class='add'>+	 */</div><div class='add'>+#define EXT4_GET_BLOCKS_SPLIT_NOMERGE		0x0008</div><div class='add'>+	/*</div><div class='add'>+	 * Caller is from the dio or dioread_nolock buffered IO, reqest to</div><div class='add'>+	 * create an unwritten extent if it does not exist or split the</div><div class='add'>+	 * found unwritten extent. Also do not merge the newly created</div><div class='add'>+	 * unwritten extent, io end will convert unwritten to written,</div><div class='add'>+	 * and try to merge the written extent.</div><div class='add'>+	 */</div><div class='add'>+#define EXT4_GET_BLOCKS_IO_CREATE_EXT		(EXT4_GET_BLOCKS_SPLIT_NOMERGE|\</div><div class='ctx'> 					 EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT)</div><div class='add'>+	/* Convert unwritten extent to initialized. */</div><div class='add'>+#define EXT4_GET_BLOCKS_CONVERT			0x0010</div><div class='ctx'> 	/* Eventual metadata allocation (due to growing extent tree)</div><div class='ctx'> 	 * should not fail, so try to use reserved blocks for that.*/</div><div class='ctx'> #define EXT4_GET_BLOCKS_METADATA_NOFAIL		0x0020</div><div class='hunk'>@@ -710,11 +729,23 @@ enum {</div><div class='ctx'> #define EXT4_GET_BLOCKS_ZERO			0x0200</div><div class='ctx'> #define EXT4_GET_BLOCKS_CREATE_ZERO		(EXT4_GET_BLOCKS_CREATE |\</div><div class='ctx'> 					EXT4_GET_BLOCKS_ZERO)</div><div class='del'>-	/* Caller will submit data before dropping transaction handle. This</div><div class='del'>-	 * allows jbd2 to avoid submitting data before commit. */</div><div class='add'>+	/* Caller is in the context of data submission, such as writeback,</div><div class='add'>+	 * fsync, etc. Especially, in the generic writeback path, caller will</div><div class='add'>+	 * submit data before dropping transaction handle. This allows jbd2</div><div class='add'>+	 * to avoid submitting data before commit. */</div><div class='ctx'> #define EXT4_GET_BLOCKS_IO_SUBMIT		0x0400</div><div class='add'>+	/* Convert extent to initialized after IO complete */</div><div class='add'>+#define EXT4_GET_BLOCKS_IO_CONVERT_EXT		(EXT4_GET_BLOCKS_CONVERT |\</div><div class='add'>+					 EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT |\</div><div class='add'>+					 EXT4_GET_BLOCKS_IO_SUBMIT)</div><div class='ctx'> 	/* Caller is in the atomic contex, find extent if it has been cached */</div><div class='ctx'> #define EXT4_GET_BLOCKS_CACHED_NOWAIT		0x0800</div><div class='add'>+/*</div><div class='add'>+ * Atomic write caller needs this to query in the slow path of mixed mapping</div><div class='add'>+ * case, when a contiguous extent can be split across two adjacent leaf nodes.</div><div class='add'>+ * Look EXT4_MAP_QUERY_LAST_IN_LEAF.</div><div class='add'>+ */</div><div class='add'>+#define EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF	0x1000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The bit position of these flags must not overlap with any of the</div><div class='hunk'>@@ -728,6 +759,13 @@ enum {</div><div class='ctx'> #define EXT4_EX_NOCACHE				0x40000000</div><div class='ctx'> #define EXT4_EX_FORCE_CACHE			0x20000000</div><div class='ctx'> #define EXT4_EX_NOFAIL				0x10000000</div><div class='add'>+/*</div><div class='add'>+ * ext4_map_query_blocks() uses this filter mask to filter the flags needed to</div><div class='add'>+ * pass while lookup/querying of on disk extent tree.</div><div class='add'>+ */</div><div class='add'>+#define EXT4_EX_QUERY_FILTER	(EXT4_EX_NOCACHE | EXT4_EX_FORCE_CACHE |\</div><div class='add'>+				 EXT4_EX_NOFAIL |\</div><div class='add'>+				 EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flags used by ext4_free_blocks</div><div class='hunk'>@@ -1051,14 +1089,16 @@ struct ext4_inode_info {</div><div class='ctx'> 	/* End of lblk range that needs to be committed in this fast commit */</div><div class='ctx'> 	ext4_lblk_t i_fc_lblk_len;</div><div class='ctx'> </div><div class='del'>-	/* Number of ongoing updates on this inode */</div><div class='del'>-	atomic_t  i_fc_updates;</div><div class='add'>+	spinlock_t i_raw_lock;	/* protects updates to the raw inode */</div><div class='ctx'> </div><div class='ctx'> 	/* Fast commit wait queue for this inode */</div><div class='ctx'> 	wait_queue_head_t i_fc_wait;</div><div class='ctx'> </div><div class='del'>-	/* Protect concurrent accesses on i_fc_lblk_start, i_fc_lblk_len */</div><div class='del'>-	struct mutex i_fc_lock;</div><div class='add'>+	/*</div><div class='add'>+	 * Protect concurrent accesses on i_fc_lblk_start, i_fc_lblk_len</div><div class='add'>+	 * and inode's EXT4_FC_STATE_COMMITTING state bit.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t i_fc_lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * i_disksize keeps track of what the inode size is ON DISK, not</div><div class='hunk'>@@ -1091,8 +1131,6 @@ struct ext4_inode_info {</div><div class='ctx'> 	struct inode vfs_inode;</div><div class='ctx'> 	struct jbd2_inode *jinode;</div><div class='ctx'> </div><div class='del'>-	spinlock_t i_raw_lock;	/* protects updates to the raw inode */</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * File creation time. Its function is same as that of</div><div class='ctx'> 	 * struct timespec64 i_{a,c,m}time in the generic inode.</div><div class='hunk'>@@ -1101,6 +1139,10 @@ struct ext4_inode_info {</div><div class='ctx'> </div><div class='ctx'> 	/* mballoc */</div><div class='ctx'> 	atomic_t i_prealloc_active;</div><div class='add'>+</div><div class='add'>+	/* allocation reservation info for delalloc */</div><div class='add'>+	/* In case of bigalloc, this refer to clusters rather than blocks */</div><div class='add'>+	unsigned int i_reserved_data_blocks;</div><div class='ctx'> 	struct rb_root i_prealloc_node;</div><div class='ctx'> 	rwlock_t i_prealloc_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -1113,14 +1155,12 @@ struct ext4_inode_info {</div><div class='ctx'> 	ext4_lblk_t i_es_shrink_lblk;	/* Offset where we start searching for</div><div class='ctx'> 					   extents to shrink. Protected by</div><div class='ctx'> 					   i_es_lock  */</div><div class='add'>+	u64 i_es_seq;			/* Change counter for extents.</div><div class='add'>+					   Protected by i_es_lock */</div><div class='ctx'> </div><div class='ctx'> 	/* ialloc */</div><div class='ctx'> 	ext4_group_t	i_last_alloc_group;</div><div class='ctx'> </div><div class='del'>-	/* allocation reservation info for delalloc */</div><div class='del'>-	/* In case of bigalloc, this refer to clusters rather than blocks */</div><div class='del'>-	unsigned int i_reserved_data_blocks;</div><div class='del'>-</div><div class='ctx'> 	/* pending cluster reservations for bigalloc file systems */</div><div class='ctx'> 	struct ext4_pending_tree i_pending_tree;</div><div class='ctx'> </div><div class='hunk'>@@ -1135,6 +1175,7 @@ struct ext4_inode_info {</div><div class='ctx'> 	/* quota space reservation, managed internally by quota code */</div><div class='ctx'> 	qsize_t i_reserved_quota;</div><div class='ctx'> #endif</div><div class='add'>+	spinlock_t i_block_reservation_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* Lock protecting lists below */</div><div class='ctx'> 	spinlock_t i_completed_io_lock;</div><div class='hunk'>@@ -1144,9 +1185,6 @@ struct ext4_inode_info {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head i_rsv_conversion_list;</div><div class='ctx'> 	struct work_struct i_rsv_conversion_work;</div><div class='del'>-	atomic_t i_unwritten; /* Nr. of inflight conversions pending */</div><div class='del'>-</div><div class='del'>-	spinlock_t i_block_reservation_lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Transactions that contain inode's metadata needed to complete</div><div class='hunk'>@@ -1156,13 +1194,21 @@ struct ext4_inode_info {</div><div class='ctx'> 	tid_t i_datasync_tid;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-	struct dquot *i_dquot[MAXQUOTAS];</div><div class='add'>+	struct dquot __rcu *i_dquot[MAXQUOTAS];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Precomputed uuid+inum+igen checksum for seeding inode checksums */</div><div class='ctx'> 	__u32 i_csum_seed;</div><div class='ctx'> </div><div class='ctx'> 	kprojid_t i_projid;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	struct fscrypt_inode_info *i_crypt_info;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	struct fsverity_info *i_verity_info;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1342,7 +1388,7 @@ struct ext4_super_block {</div><div class='ctx'> /*60*/	__le32	s_feature_incompat;	/* incompatible feature set */</div><div class='ctx'> 	__le32	s_feature_ro_compat;	/* readonly-compatible feature set */</div><div class='ctx'> /*68*/	__u8	s_uuid[16];		/* 128-bit uuid for volume */</div><div class='del'>-/*78*/	char	s_volume_name[EXT4_LABEL_MAX];	/* volume name */</div><div class='add'>+/*78*/	char	s_volume_name[EXT4_LABEL_MAX] __nonstring; /* volume name */</div><div class='ctx'> /*88*/	char	s_last_mounted[64] __nonstring;	/* directory where last mounted */</div><div class='ctx'> /*C8*/	__le32	s_algorithm_usage_bitmap; /* For compression */</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1423,7 +1469,9 @@ struct ext4_super_block {</div><div class='ctx'> 	__le16  s_encoding;		/* Filename charset encoding */</div><div class='ctx'> 	__le16  s_encoding_flags;	/* Filename charset encoding flags */</div><div class='ctx'> 	__le32  s_orphan_file_inum;	/* Inode for tracking orphan inodes */</div><div class='del'>-	__le32	s_reserved[94];		/* Padding to the end of the block */</div><div class='add'>+	__le16	s_def_resuid_hi;</div><div class='add'>+	__le16	s_def_resgid_hi;</div><div class='add'>+	__le32	s_reserved[93];		/* Padding to the end of the block */</div><div class='ctx'> 	__le32	s_checksum;		/* crc32c(superblock) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1574,16 +1622,14 @@ struct ext4_sb_info {</div><div class='ctx'> 	unsigned short *s_mb_offsets;</div><div class='ctx'> 	unsigned int *s_mb_maxs;</div><div class='ctx'> 	unsigned int s_group_info_size;</div><div class='del'>-	unsigned int s_mb_free_pending;</div><div class='add'>+	atomic_t s_mb_free_pending;</div><div class='ctx'> 	struct list_head s_freed_data_list[2];	/* List of blocks to be freed</div><div class='ctx'> 						   after commit completed */</div><div class='ctx'> 	struct list_head s_discard_list;</div><div class='ctx'> 	struct work_struct s_discard_work;</div><div class='ctx'> 	atomic_t s_retry_alloc_pending;</div><div class='del'>-	struct list_head *s_mb_avg_fragment_size;</div><div class='del'>-	rwlock_t *s_mb_avg_fragment_size_locks;</div><div class='del'>-	struct list_head *s_mb_largest_free_orders;</div><div class='del'>-	rwlock_t *s_mb_largest_free_orders_locks;</div><div class='add'>+	struct xarray *s_mb_avg_fragment_size;</div><div class='add'>+	struct xarray *s_mb_largest_free_orders;</div><div class='ctx'> </div><div class='ctx'> 	/* tunables */</div><div class='ctx'> 	unsigned long s_stripe;</div><div class='hunk'>@@ -1595,12 +1641,15 @@ struct ext4_sb_info {</div><div class='ctx'> 	unsigned int s_mb_order2_reqs;</div><div class='ctx'> 	unsigned int s_mb_group_prealloc;</div><div class='ctx'> 	unsigned int s_max_dir_size_kb;</div><div class='del'>-	/* where last allocation was done - for stream allocation */</div><div class='del'>-	unsigned long s_mb_last_group;</div><div class='del'>-	unsigned long s_mb_last_start;</div><div class='ctx'> 	unsigned int s_mb_prefetch;</div><div class='ctx'> 	unsigned int s_mb_prefetch_limit;</div><div class='ctx'> 	unsigned int s_mb_best_avail_max_trim_order;</div><div class='add'>+	unsigned int s_sb_update_sec;</div><div class='add'>+	unsigned int s_sb_update_kb;</div><div class='add'>+</div><div class='add'>+	/* where last allocation was done - for stream allocation */</div><div class='add'>+	ext4_group_t *s_mb_last_groups;</div><div class='add'>+	unsigned int s_mb_nr_global_goals;</div><div class='ctx'> </div><div class='ctx'> 	/* stats for buddy allocator */</div><div class='ctx'> 	atomic_t s_bal_reqs;	/* number of reqs with len &gt; 1 */</div><div class='hunk'>@@ -1610,12 +1659,10 @@ struct ext4_sb_info {</div><div class='ctx'> 	atomic_t s_bal_cX_ex_scanned[EXT4_MB_NUM_CRS];	/* total extents scanned */</div><div class='ctx'> 	atomic_t s_bal_groups_scanned;	/* number of groups scanned */</div><div class='ctx'> 	atomic_t s_bal_goals;	/* goal hits */</div><div class='add'>+	atomic_t s_bal_stream_goals;	/* stream allocation global goal hits */</div><div class='ctx'> 	atomic_t s_bal_len_goals;	/* len goal hits */</div><div class='ctx'> 	atomic_t s_bal_breaks;	/* too long searches */</div><div class='ctx'> 	atomic_t s_bal_2orders;	/* 2^order hits */</div><div class='del'>-	atomic_t s_bal_p2_aligned_bad_suggestions;</div><div class='del'>-	atomic_t s_bal_goal_fast_bad_suggestions;</div><div class='del'>-	atomic_t s_bal_best_avail_bad_suggestions;</div><div class='ctx'> 	atomic64_t s_bal_cX_groups_considered[EXT4_MB_NUM_CRS];</div><div class='ctx'> 	atomic64_t s_bal_cX_hits[EXT4_MB_NUM_CRS];</div><div class='ctx'> 	atomic64_t s_bal_cX_failed[EXT4_MB_NUM_CRS];		/* cX loop didn't find blocks */</div><div class='hunk'>@@ -1657,8 +1704,10 @@ struct ext4_sb_info {</div><div class='ctx'> 	/* record the last minlen when FITRIM is called. */</div><div class='ctx'> 	unsigned long s_last_trim_minblks;</div><div class='ctx'> </div><div class='del'>-	/* Reference to checksum algorithm driver via cryptoapi */</div><div class='del'>-	struct crypto_shash *s_chksum_driver;</div><div class='add'>+	/* minimum folio order of a page cache allocation */</div><div class='add'>+	u16 s_min_folio_order;</div><div class='add'>+	/* supported maximum folio order, 0 means not supported */</div><div class='add'>+	u16 s_max_folio_order;</div><div class='ctx'> </div><div class='ctx'> 	/* Precomputed FS UUID checksum for seeding other checksums */</div><div class='ctx'> 	__u32 s_csum_seed;</div><div class='hunk'>@@ -1724,6 +1773,10 @@ struct ext4_sb_info {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct work_struct s_sb_upd_work;</div><div class='ctx'> </div><div class='add'>+	/* Atomic write unit values in bytes */</div><div class='add'>+	unsigned int s_awu_min;</div><div class='add'>+	unsigned int s_awu_max;</div><div class='add'>+</div><div class='ctx'> 	/* Ext4 fast commit sub transaction ID */</div><div class='ctx'> 	atomic_t s_fc_subtid;</div><div class='ctx'> </div><div class='hunk'>@@ -1743,7 +1796,7 @@ struct ext4_sb_info {</div><div class='ctx'> 	 * following fields:</div><div class='ctx'> 	 * ei-&gt;i_fc_list, s_fc_dentry_q, s_fc_q, s_fc_bytes, s_fc_bh.</div><div class='ctx'> 	 */</div><div class='del'>-	spinlock_t s_fc_lock;</div><div class='add'>+	struct mutex s_fc_lock;</div><div class='ctx'> 	struct buffer_head *s_fc_bh;</div><div class='ctx'> 	struct ext4_fc_stats s_fc_stats;</div><div class='ctx'> 	tid_t s_fc_ineligible_tid;</div><div class='hunk'>@@ -1793,6 +1846,18 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 		 ino &lt;= le32_to_cpu(EXT4_SB(sb)-&gt;s_es-&gt;s_inodes_count));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ext4_get_resuid(struct ext4_super_block *es)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(es-&gt;s_def_resuid) |</div><div class='add'>+		le16_to_cpu(es-&gt;s_def_resuid_hi) &lt;&lt; 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ext4_get_resgid(struct ext4_super_block *es)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(es-&gt;s_def_resgid) |</div><div class='add'>+		le16_to_cpu(es-&gt;s_def_resgid_hi) &lt;&lt; 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Returns: sbi-&gt;field[index]</div><div class='ctx'>  * Used to access an array element from the following sbi fields which require</div><div class='hunk'>@@ -1815,7 +1880,8 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	EXT4_MF_MNTDIR_SAMPLED,</div><div class='del'>-	EXT4_MF_FC_INELIGIBLE	/* Fast commit ineligible */</div><div class='add'>+	EXT4_MF_FC_INELIGIBLE,	/* Fast commit ineligible */</div><div class='add'>+	EXT4_MF_JOURNAL_DESTROY	/* Journal is in process of destroying */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void ext4_set_mount_flag(struct super_block *sb, int bit)</div><div class='hunk'>@@ -1860,14 +1926,6 @@ static inline bool ext4_simulate_fail(struct super_block *sb,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ext4_simulate_fail_bh(struct super_block *sb,</div><div class='del'>-					 struct buffer_head *bh,</div><div class='del'>-					 unsigned long code)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ERR(bh) &amp;&amp; ext4_simulate_fail(sb, code))</div><div class='del'>-		clear_buffer_uptodate(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Error number codes for s_{first,last}_error_errno</div><div class='ctx'>  *</div><div class='hunk'>@@ -1909,6 +1967,7 @@ enum {</div><div class='ctx'> 	EXT4_STATE_LUSTRE_EA_INODE,	/* Lustre-style ea_inode */</div><div class='ctx'> 	EXT4_STATE_VERITY_IN_PROGRESS,	/* building fs-verity Merkle tree */</div><div class='ctx'> 	EXT4_STATE_FC_COMMITTING,	/* Fast commit ongoing */</div><div class='add'>+	EXT4_STATE_FC_FLUSHING_DATA,	/* Fast commit flushing data */</div><div class='ctx'> 	EXT4_STATE_ORPHAN_FILE,		/* Inode orphaned in orphan file */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1969,6 +2028,16 @@ static inline bool ext4_verity_in_progress(struct inode *inode)</div><div class='ctx'> #define NEXT_ORPHAN(inode) EXT4_I(inode)-&gt;i_dtime</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Check whether the inode is tracked as orphan (either in orphan file or</div><div class='add'>+ * orphan list).</div><div class='add'>+ */</div><div class='add'>+static inline bool ext4_inode_orphan_tracked(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return ext4_test_inode_state(inode, EXT4_STATE_ORPHAN_FILE) ||</div><div class='add'>+		!list_empty(&amp;EXT4_I(inode)-&gt;i_orphan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Codes for operating systems</div><div class='ctx'>  */</div><div class='ctx'> #define EXT4_OS_LINUX		0</div><div class='hunk'>@@ -2234,15 +2303,32 @@ extern int ext4_feature_set_ok(struct super_block *sb, int readonly);</div><div class='ctx'> /*</div><div class='ctx'>  * Superblock flags</div><div class='ctx'>  */</div><div class='del'>-#define EXT4_FLAGS_RESIZING	0</div><div class='del'>-#define EXT4_FLAGS_SHUTDOWN	1</div><div class='del'>-#define EXT4_FLAGS_BDEV_IS_DAX	2</div><div class='add'>+enum {</div><div class='add'>+	EXT4_FLAGS_RESIZING,	/* Avoid superblock update and resize race */</div><div class='add'>+	EXT4_FLAGS_SHUTDOWN,	/* Prevent access to the file system */</div><div class='add'>+	EXT4_FLAGS_BDEV_IS_DAX,	/* Current block device support DAX */</div><div class='add'>+	EXT4_FLAGS_EMERGENCY_RO,/* Emergency read-only due to fs errors */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static inline int ext4_forced_shutdown(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(EXT4_FLAGS_SHUTDOWN, &amp;EXT4_SB(sb)-&gt;s_ext4_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ext4_emergency_ro(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return test_bit(EXT4_FLAGS_EMERGENCY_RO, &amp;EXT4_SB(sb)-&gt;s_ext4_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ext4_emergency_state(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (unlikely(ext4_emergency_ro(sb)))</div><div class='add'>+		return -EROFS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Default values for user and/or group using reserved blocks</div><div class='ctx'>  */</div><div class='hunk'>@@ -2274,10 +2360,19 @@ static inline int ext4_forced_shutdown(struct super_block *sb)</div><div class='ctx'> #define EXT4_DEFM_NODELALLOC	0x0800</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Default journal batch times</div><div class='add'>+ * Default journal batch times and ioprio.</div><div class='ctx'>  */</div><div class='ctx'> #define EXT4_DEF_MIN_BATCH_TIME	0</div><div class='ctx'> #define EXT4_DEF_MAX_BATCH_TIME	15000 /* 15ms */</div><div class='add'>+#define EXT4_DEF_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default values for superblock update</div><div class='add'>+ */</div><div class='add'>+#define EXT4_DEF_SB_UPDATE_INTERVAL_SEC (3600) /* seconds (1 hour) */</div><div class='add'>+#define EXT4_DEF_SB_UPDATE_INTERVAL_KB (16384) /* kilobytes (16MB) */</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Minimum number of groups in a flexgroup before we separate out</div><div class='hunk'>@@ -2333,9 +2428,9 @@ struct ext4_dir_entry_2 {</div><div class='ctx'> 	((struct ext4_dir_entry_hash *) \</div><div class='ctx'> 		(((void *)(entry)) + \</div><div class='ctx'> 		((8 + (entry)-&gt;name_len + EXT4_DIR_ROUND) &amp; ~EXT4_DIR_ROUND)))</div><div class='del'>-#define EXT4_DIRENT_HASH(entry) le32_to_cpu(EXT4_DIRENT_HASHES(de)-&gt;hash)</div><div class='add'>+#define EXT4_DIRENT_HASH(entry) le32_to_cpu(EXT4_DIRENT_HASHES(entry)-&gt;hash)</div><div class='ctx'> #define EXT4_DIRENT_MINOR_HASH(entry) \</div><div class='del'>-		le32_to_cpu(EXT4_DIRENT_HASHES(de)-&gt;minor_hash)</div><div class='add'>+		le32_to_cpu(EXT4_DIRENT_HASHES(entry)-&gt;minor_hash)</div><div class='ctx'> </div><div class='ctx'> static inline bool ext4_hash_in_dirent(const struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -2401,28 +2496,19 @@ static inline unsigned int ext4_dir_rec_len(__u8 name_len,</div><div class='ctx'> 	return (rec_len &amp; ~EXT4_DIR_ROUND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If we ever get support for fs block sizes &gt; page_size, we'll need</div><div class='del'>- * to remove the #if statements in the next two functions...</div><div class='del'>- */</div><div class='ctx'> static inline unsigned int</div><div class='ctx'> ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned len = le16_to_cpu(dlen);</div><div class='ctx'> </div><div class='del'>-#if (PAGE_SIZE &gt;= 65536)</div><div class='ctx'> 	if (len == EXT4_MAX_REC_LEN || len == 0)</div><div class='ctx'> 		return blocksize;</div><div class='ctx'> 	return (len &amp; 65532) | ((len &amp; 3) &lt;&lt; 16);</div><div class='del'>-#else</div><div class='del'>-	return len;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON((len &gt; blocksize) || (blocksize &gt; (1 &lt;&lt; 18)) || (len &amp; 3));</div><div class='del'>-#if (PAGE_SIZE &gt;= 65536)</div><div class='ctx'> 	if (len &lt; 65536)</div><div class='ctx'> 		return cpu_to_le16(len);</div><div class='ctx'> 	if (len == blocksize) {</div><div class='hunk'>@@ -2432,9 +2518,6 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)</div><div class='ctx'> 			return cpu_to_le16(0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return cpu_to_le16((len &amp; 65532) | ((len &gt;&gt; 16) &amp; 3));</div><div class='del'>-#else</div><div class='del'>-	return cpu_to_le16(len);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2457,23 +2540,11 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)</div><div class='ctx'> #define DX_HASH_HALF_MD4_UNSIGNED	4</div><div class='ctx'> #define DX_HASH_TEA_UNSIGNED		5</div><div class='ctx'> #define DX_HASH_SIPHASH			6</div><div class='add'>+#define DX_HASH_LAST 			DX_HASH_SIPHASH</div><div class='ctx'> </div><div class='del'>-static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc,</div><div class='del'>-			      const void *address, unsigned int length)</div><div class='add'>+static inline u32 ext4_chksum(u32 crc, const void *address, unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		struct shash_desc shash;</div><div class='del'>-		char ctx[4];</div><div class='del'>-	} desc;</div><div class='del'>-</div><div class='del'>-	BUG_ON(crypto_shash_descsize(sbi-&gt;s_chksum_driver)!=sizeof(desc.ctx));</div><div class='del'>-</div><div class='del'>-	desc.shash.tfm = sbi-&gt;s_chksum_driver;</div><div class='del'>-	*(u32 *)desc.ctx = crc;</div><div class='del'>-</div><div class='del'>-	BUG_ON(crypto_shash_update(&amp;desc.shash, address, length));</div><div class='del'>-</div><div class='del'>-	return *(u32 *)desc.ctx;</div><div class='add'>+	return crc32c(crc, address, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='hunk'>@@ -2506,7 +2577,7 @@ struct ext4_filename {</div><div class='ctx'> 	struct fscrypt_str crypto_buf;</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	struct fscrypt_str cf_name;</div><div class='add'>+	struct qstr cf_name;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2548,6 +2619,8 @@ struct dir_private_info {</div><div class='ctx'> 	__u32		curr_hash;</div><div class='ctx'> 	__u32		curr_minor_hash;</div><div class='ctx'> 	__u32		next_hash;</div><div class='add'>+	u64		cookie;</div><div class='add'>+	bool		initialized;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* calculate the first block number of the group */</div><div class='hunk'>@@ -2688,10 +2761,10 @@ struct mmpd_data {</div><div class='ctx'> extern unsigned int ext4_count_free(char *bitmap, unsigned numchars);</div><div class='ctx'> void ext4_inode_bitmap_csum_set(struct super_block *sb,</div><div class='ctx'> 				struct ext4_group_desc *gdp,</div><div class='del'>-				struct buffer_head *bh, int sz);</div><div class='add'>+				struct buffer_head *bh);</div><div class='ctx'> int ext4_inode_bitmap_csum_verify(struct super_block *sb,</div><div class='ctx'> 				  struct ext4_group_desc *gdp,</div><div class='del'>-				  struct buffer_head *bh, int sz);</div><div class='add'>+				  struct buffer_head *bh);</div><div class='ctx'> void ext4_block_bitmap_csum_set(struct super_block *sb,</div><div class='ctx'> 				struct ext4_group_desc *gdp,</div><div class='ctx'> 				struct buffer_head *bh);</div><div class='hunk'>@@ -2740,8 +2813,25 @@ ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> extern int ext4_fname_setup_ci_filename(struct inode *dir,</div><div class='del'>-					 const struct qstr *iname,</div><div class='del'>-					 struct ext4_filename *fname);</div><div class='add'>+					const struct qstr *iname,</div><div class='add'>+					struct ext4_filename *fname);</div><div class='add'>+</div><div class='add'>+static inline void ext4_fname_free_ci_filename(struct ext4_filename *fname)</div><div class='add'>+{</div><div class='add'>+	kfree(fname-&gt;cf_name.name);</div><div class='add'>+	fname-&gt;cf_name.name = NULL;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int ext4_fname_setup_ci_filename(struct inode *dir,</div><div class='add'>+					       const struct qstr *iname,</div><div class='add'>+					       struct ext4_filename *fname)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ext4_fname_free_ci_filename(struct ext4_filename *fname)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* ext4 encryption related stuff goes here crypto.c */</div><div class='hunk'>@@ -2764,16 +2854,11 @@ static inline int ext4_fname_setup_filename(struct inode *dir,</div><div class='ctx'> 					    int lookup,</div><div class='ctx'> 					    struct ext4_filename *fname)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	fname-&gt;usr_fname = iname;</div><div class='ctx'> 	fname-&gt;disk_name.name = (unsigned char *) iname-&gt;name;</div><div class='ctx'> 	fname-&gt;disk_name.len = iname-&gt;len;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	err = ext4_fname_setup_ci_filename(dir, iname, fname);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return ext4_fname_setup_ci_filename(dir, iname, fname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ext4_fname_prepare_lookup(struct inode *dir,</div><div class='hunk'>@@ -2785,10 +2870,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> static inline void ext4_fname_free_filename(struct ext4_filename *fname)</div><div class='ctx'> {</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	kfree(fname-&gt;cf_name.name);</div><div class='del'>-	fname-&gt;cf_name.name = NULL;</div><div class='del'>-#endif</div><div class='add'>+	ext4_fname_free_ci_filename(fname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ext4_ioctl_get_encryption_pwsalt(struct file *filp,</div><div class='hunk'>@@ -2812,8 +2894,7 @@ extern int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,</div><div class='ctx'> 				struct ext4_dir_entry_2 *dirent,</div><div class='ctx'> 				struct fscrypt_str *ent_name);</div><div class='ctx'> extern void ext4_htree_free_dir_info(struct dir_private_info *p);</div><div class='del'>-extern int ext4_find_dest_de(struct inode *dir, struct inode *inode,</div><div class='del'>-			     struct buffer_head *bh,</div><div class='add'>+extern int ext4_find_dest_de(struct inode *dir, struct buffer_head *bh,</div><div class='ctx'> 			     void *buf, int buf_size,</div><div class='ctx'> 			     struct ext4_filename *fname,</div><div class='ctx'> 			     struct ext4_dir_entry_2 **dest_de);</div><div class='hunk'>@@ -2895,8 +2976,6 @@ void __ext4_fc_track_create(handle_t *handle, struct inode *inode,</div><div class='ctx'> void ext4_fc_track_create(handle_t *handle, struct dentry *dentry);</div><div class='ctx'> void ext4_fc_track_inode(handle_t *handle, struct inode *inode);</div><div class='ctx'> void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handle);</div><div class='del'>-void ext4_fc_start_update(struct inode *inode);</div><div class='del'>-void ext4_fc_stop_update(struct inode *inode);</div><div class='ctx'> void ext4_fc_del(struct inode *inode);</div><div class='ctx'> bool ext4_fc_replay_check_excluded(struct super_block *sb, ext4_fsblk_t block);</div><div class='ctx'> void ext4_fc_replay_cleanup(struct super_block *sb);</div><div class='hunk'>@@ -2912,10 +2991,10 @@ extern const struct seq_operations ext4_mb_seq_groups_ops;</div><div class='ctx'> extern const struct seq_operations ext4_mb_seq_structs_summary_ops;</div><div class='ctx'> extern int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset);</div><div class='ctx'> extern int ext4_mb_init(struct super_block *);</div><div class='del'>-extern int ext4_mb_release(struct super_block *);</div><div class='add'>+extern void ext4_mb_release(struct super_block *);</div><div class='ctx'> extern ext4_fsblk_t ext4_mb_new_blocks(handle_t *,</div><div class='ctx'> 				struct ext4_allocation_request *, int *);</div><div class='del'>-extern void ext4_discard_preallocations(struct inode *, unsigned int);</div><div class='add'>+extern void ext4_discard_preallocations(struct inode *);</div><div class='ctx'> extern int __init ext4_init_mballoc(void);</div><div class='ctx'> extern void ext4_exit_mballoc(void);</div><div class='ctx'> extern ext4_group_t ext4_mb_prefetch(struct super_block *sb,</div><div class='hunk'>@@ -2946,6 +3025,7 @@ static inline bool ext4_mb_cr_expensive(enum criteria cr)</div><div class='ctx'> void ext4_inode_csum_set(struct inode *inode, struct ext4_inode *raw,</div><div class='ctx'> 			 struct ext4_inode_info *ei);</div><div class='ctx'> int ext4_inode_is_fast_symlink(struct inode *inode);</div><div class='add'>+void ext4_check_map_extents_env(struct inode *inode);</div><div class='ctx'> struct buffer_head *ext4_getblk(handle_t *, struct inode *, ext4_lblk_t, int);</div><div class='ctx'> struct buffer_head *ext4_bread(handle_t *, struct inode *, ext4_lblk_t, int);</div><div class='ctx'> int ext4_bread_batch(struct inode *inode, ext4_lblk_t block, int bh_count,</div><div class='hunk'>@@ -2966,6 +3046,7 @@ int ext4_walk_page_buffers(handle_t *handle,</div><div class='ctx'> 				     struct buffer_head *bh));</div><div class='ctx'> int do_journal_get_write_access(handle_t *handle, struct inode *inode,</div><div class='ctx'> 				struct buffer_head *bh);</div><div class='add'>+void ext4_set_inode_mapping_order(struct inode *inode);</div><div class='ctx'> #define FALL_BACK_TO_NONDELALLOC 1</div><div class='ctx'> #define CONVERT_INLINE_DATA	 2</div><div class='ctx'> </div><div class='hunk'>@@ -3003,13 +3084,17 @@ extern int ext4_inode_attach_jinode(struct inode *inode);</div><div class='ctx'> extern int ext4_can_truncate(struct inode *inode);</div><div class='ctx'> extern int ext4_truncate(struct inode *);</div><div class='ctx'> extern int ext4_break_layouts(struct inode *);</div><div class='add'>+extern int ext4_truncate_page_cache_block_range(struct inode *inode,</div><div class='add'>+						loff_t start, loff_t end);</div><div class='ctx'> extern int ext4_punch_hole(struct file *file, loff_t offset, loff_t length);</div><div class='ctx'> extern void ext4_set_inode_flags(struct inode *, bool init);</div><div class='ctx'> extern int ext4_alloc_da_blocks(struct inode *inode);</div><div class='ctx'> extern void ext4_set_aops(struct inode *inode);</div><div class='del'>-extern int ext4_writepage_trans_blocks(struct inode *);</div><div class='ctx'> extern int ext4_normal_submit_inode_data_buffers(struct jbd2_inode *jinode);</div><div class='ctx'> extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);</div><div class='add'>+extern int ext4_chunk_trans_extent(struct inode *inode, int nrblocks);</div><div class='add'>+extern int ext4_meta_trans_blocks(struct inode *inode, int lblocks,</div><div class='add'>+				  int pextents);</div><div class='ctx'> extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			     loff_t lstart, loff_t lend);</div><div class='ctx'> extern vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf);</div><div class='hunk'>@@ -3021,6 +3106,17 @@ extern void ext4_da_update_reserve_space(struct inode *inode,</div><div class='ctx'> extern int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 			      ext4_fsblk_t pblk, ext4_lblk_t len);</div><div class='ctx'> </div><div class='add'>+static inline bool is_special_ino(struct super_block *sb, unsigned long ino)</div><div class='add'>+{</div><div class='add'>+	struct ext4_super_block *es = EXT4_SB(sb)-&gt;s_es;</div><div class='add'>+</div><div class='add'>+	return (ino &lt; EXT4_FIRST_INO(sb) &amp;&amp; ino != EXT4_ROOT_INO) ||</div><div class='add'>+		ino == le32_to_cpu(es-&gt;s_usr_quota_inum) ||</div><div class='add'>+		ino == le32_to_cpu(es-&gt;s_grp_quota_inum) ||</div><div class='add'>+		ino == le32_to_cpu(es-&gt;s_prj_quota_inum) ||</div><div class='add'>+		ino == le32_to_cpu(es-&gt;s_orphan_file_inum);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* indirect.c */</div><div class='ctx'> extern int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 				struct ext4_map_blocks *map, int flags);</div><div class='hunk'>@@ -3033,8 +3129,8 @@ extern int ext4_ind_remove_space(handle_t *handle, struct inode *inode,</div><div class='ctx'> extern long ext4_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> int ext4_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa);</div><div class='del'>-int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa);</div><div class='add'>+int ext4_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> extern void ext4_reset_inode_seed(struct inode *inode);</div><div class='ctx'> int ext4_update_overhead(struct super_block *sb, bool force);</div><div class='ctx'> int ext4_force_shutdown(struct super_block *sb, u32 flags);</div><div class='hunk'>@@ -3082,16 +3178,17 @@ extern struct buffer_head *ext4_sb_bread(struct super_block *sb,</div><div class='ctx'> 					 sector_t block, blk_opf_t op_flags);</div><div class='ctx'> extern struct buffer_head *ext4_sb_bread_unmovable(struct super_block *sb,</div><div class='ctx'> 						   sector_t block);</div><div class='add'>+extern struct buffer_head *ext4_sb_bread_nofail(struct super_block *sb,</div><div class='add'>+						sector_t block);</div><div class='ctx'> extern void ext4_read_bh_nowait(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='del'>-				bh_end_io_t *end_io);</div><div class='add'>+				bh_end_io_t *end_io, bool simu_fail);</div><div class='ctx'> extern int ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='del'>-			bh_end_io_t *end_io);</div><div class='add'>+			bh_end_io_t *end_io, bool simu_fail);</div><div class='ctx'> extern int ext4_read_bh_lock(struct buffer_head *bh, blk_opf_t op_flags, bool wait);</div><div class='ctx'> extern void ext4_sb_breadahead_unmovable(struct super_block *sb, sector_t block);</div><div class='ctx'> extern int ext4_seq_options_show(struct seq_file *seq, void *offset);</div><div class='ctx'> extern int ext4_calculate_overhead(struct super_block *sb);</div><div class='del'>-extern __le32 ext4_superblock_csum(struct super_block *sb,</div><div class='del'>-				   struct ext4_super_block *es);</div><div class='add'>+extern __le32 ext4_superblock_csum(struct ext4_super_block *es);</div><div class='ctx'> extern void ext4_superblock_csum_set(struct super_block *sb);</div><div class='ctx'> extern int ext4_alloc_flex_bg_array(struct super_block *sb,</div><div class='ctx'> 				    ext4_group_t ngroup);</div><div class='hunk'>@@ -3261,18 +3358,10 @@ extern void ext4_group_desc_csum_set(struct super_block *sb, __u32 group,</div><div class='ctx'> extern int ext4_register_li_request(struct super_block *sb,</div><div class='ctx'> 				    ext4_group_t first_not_zeroed);</div><div class='ctx'> </div><div class='del'>-static inline int ext4_has_metadata_csum(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(ext4_has_feature_metadata_csum(sb) &amp;&amp;</div><div class='del'>-		     !EXT4_SB(sb)-&gt;s_chksum_driver);</div><div class='del'>-</div><div class='del'>-	return ext4_has_feature_metadata_csum(sb) &amp;&amp;</div><div class='del'>-	       (EXT4_SB(sb)-&gt;s_chksum_driver != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int ext4_has_group_desc_csum(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	return ext4_has_feature_gdt_csum(sb) || ext4_has_metadata_csum(sb);</div><div class='add'>+	return ext4_has_feature_gdt_csum(sb) ||</div><div class='add'>+	       ext4_has_feature_metadata_csum(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ext4_read_incompat_64bit_val(es, name) \</div><div class='hunk'>@@ -3357,6 +3446,13 @@ static inline unsigned int ext4_flex_bg_size(struct ext4_sb_info *sbi)</div><div class='ctx'> 	return 1 &lt;&lt; sbi-&gt;s_log_groups_per_flex;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline loff_t ext4_get_maxbytes(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='add'>+		return inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='add'>+	return EXT4_SB(inode-&gt;i_sb)-&gt;s_bitmap_maxbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define ext4_std_error(sb, errno)				\</div><div class='ctx'> do {								\</div><div class='ctx'> 	if ((errno))						\</div><div class='hunk'>@@ -3421,8 +3517,6 @@ struct ext4_group_info {</div><div class='ctx'> 	void            *bb_bitmap;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct rw_semaphore alloc_sem;</div><div class='del'>-	struct list_head bb_avg_fragment_size_node;</div><div class='del'>-	struct list_head bb_largest_free_order_node;</div><div class='ctx'> 	ext4_grpblk_t	bb_counters[];	/* Nr of free power-of-two-block</div><div class='ctx'> 					 * regions, index is order.</div><div class='ctx'> 					 * bb_counters[3] = 5 means</div><div class='hunk'>@@ -3473,23 +3567,28 @@ static inline int ext4_fs_is_busy(struct ext4_sb_info *sbi)</div><div class='ctx'> 	return (atomic_read(&amp;sbi-&gt;s_lock_busy) &gt; EXT4_CONTENTION_THRESHOLD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool ext4_try_lock_group(struct super_block *sb, ext4_group_t group)</div><div class='add'>+{</div><div class='add'>+	if (!spin_trylock(ext4_group_lock_ptr(sb, group)))</div><div class='add'>+		return false;</div><div class='add'>+	/*</div><div class='add'>+	 * We're able to grab the lock right away, so drop the lock</div><div class='add'>+	 * contention counter.</div><div class='add'>+	 */</div><div class='add'>+	atomic_add_unless(&amp;EXT4_SB(sb)-&gt;s_lock_busy, -1, 0);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void ext4_lock_group(struct super_block *sb, ext4_group_t group)</div><div class='ctx'> {</div><div class='del'>-	spinlock_t *lock = ext4_group_lock_ptr(sb, group);</div><div class='del'>-	if (spin_trylock(lock))</div><div class='del'>-		/*</div><div class='del'>-		 * We're able to grab the lock right away, so drop the</div><div class='del'>-		 * lock contention counter.</div><div class='del'>-		 */</div><div class='del'>-		atomic_add_unless(&amp;EXT4_SB(sb)-&gt;s_lock_busy, -1, 0);</div><div class='del'>-	else {</div><div class='add'>+	if (!ext4_try_lock_group(sb, group)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The lock is busy, so bump the contention counter,</div><div class='ctx'> 		 * and then wait on the spin lock.</div><div class='ctx'> 		 */</div><div class='ctx'> 		atomic_add_unless(&amp;EXT4_SB(sb)-&gt;s_lock_busy, 1,</div><div class='ctx'> 				  EXT4_MAX_CONTENTION);</div><div class='del'>-		spin_lock(lock);</div><div class='add'>+		spin_lock(ext4_group_lock_ptr(sb, group));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3544,19 +3643,20 @@ extern loff_t ext4_llseek(struct file *file, loff_t offset, int origin);</div><div class='ctx'> extern int ext4_get_max_inline_size(struct inode *inode);</div><div class='ctx'> extern int ext4_find_inline_data_nolock(struct inode *inode);</div><div class='ctx'> extern int ext4_destroy_inline_data(handle_t *handle, struct inode *inode);</div><div class='add'>+extern void ext4_update_final_de(void *de_buf, int old_size, int new_size);</div><div class='ctx'> </div><div class='ctx'> int ext4_readpage_inline(struct inode *inode, struct folio *folio);</div><div class='ctx'> extern int ext4_try_to_write_inline_data(struct address_space *mapping,</div><div class='ctx'> 					 struct inode *inode,</div><div class='ctx'> 					 loff_t pos, unsigned len,</div><div class='del'>-					 struct page **pagep);</div><div class='add'>+					 struct folio **foliop);</div><div class='ctx'> int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,</div><div class='ctx'> 			       unsigned copied, struct folio *folio);</div><div class='del'>-extern int ext4_da_write_inline_data_begin(struct address_space *mapping,</div><div class='del'>-					   struct inode *inode,</div><div class='del'>-					   loff_t pos, unsigned len,</div><div class='del'>-					   struct page **pagep,</div><div class='del'>-					   void **fsdata);</div><div class='add'>+extern int ext4_generic_write_inline_data(struct address_space *mapping,</div><div class='add'>+					  struct inode *inode,</div><div class='add'>+					  loff_t pos, unsigned len,</div><div class='add'>+					  struct folio **foliop,</div><div class='add'>+					  void **fsdata, bool da);</div><div class='ctx'> extern int ext4_try_add_inline_entry(handle_t *handle,</div><div class='ctx'> 				     struct ext4_filename *fname,</div><div class='ctx'> 				     struct inode *dir, struct inode *inode);</div><div class='hunk'>@@ -3603,10 +3703,10 @@ static inline int ext4_has_inline_data(struct inode *inode)</div><div class='ctx'> extern const struct inode_operations ext4_dir_inode_operations;</div><div class='ctx'> extern const struct inode_operations ext4_special_inode_operations;</div><div class='ctx'> extern struct dentry *ext4_get_parent(struct dentry *child);</div><div class='del'>-extern struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,</div><div class='del'>-				 struct ext4_dir_entry_2 *de,</div><div class='del'>-				 int blocksize, int csum_size,</div><div class='del'>-				 unsigned int parent_ino, int dotdot_real_len);</div><div class='add'>+extern int ext4_init_dirblock(handle_t *handle, struct inode *inode,</div><div class='add'>+			      struct buffer_head *dir_block,</div><div class='add'>+			      unsigned int parent_ino, void *inline_buf,</div><div class='add'>+			      int inline_size);</div><div class='ctx'> extern void ext4_initialize_dirent_tail(struct buffer_head *bh,</div><div class='ctx'> 					unsigned int blocksize);</div><div class='ctx'> extern int ext4_handle_dirty_dirblock(handle_t *handle, struct inode *inode,</div><div class='hunk'>@@ -3689,6 +3789,8 @@ extern long ext4_fallocate(struct file *file, int mode, loff_t offset,</div><div class='ctx'> 			  loff_t len);</div><div class='ctx'> extern int ext4_convert_unwritten_extents(handle_t *handle, struct inode *inode,</div><div class='ctx'> 					  loff_t offset, ssize_t len);</div><div class='add'>+extern int ext4_convert_unwritten_extents_atomic(handle_t *handle,</div><div class='add'>+			struct inode *inode, loff_t offset, ssize_t len);</div><div class='ctx'> extern int ext4_convert_unwritten_io_end_vec(handle_t *handle,</div><div class='ctx'> 					     ext4_io_end_t *io_end);</div><div class='ctx'> extern int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='hunk'>@@ -3696,11 +3798,12 @@ extern int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,</div><div class='ctx'> 						   int num,</div><div class='ctx'> 						   struct ext4_ext_path *path);</div><div class='del'>-extern int ext4_ext_insert_extent(handle_t *, struct inode *,</div><div class='del'>-				  struct ext4_ext_path **,</div><div class='del'>-				  struct ext4_extent *, int);</div><div class='add'>+extern struct ext4_ext_path *ext4_ext_insert_extent(</div><div class='add'>+				handle_t *handle, struct inode *inode,</div><div class='add'>+				struct ext4_ext_path *path,</div><div class='add'>+				struct ext4_extent *newext, int gb_flags);</div><div class='ctx'> extern struct ext4_ext_path *ext4_find_extent(struct inode *, ext4_lblk_t,</div><div class='del'>-					      struct ext4_ext_path **,</div><div class='add'>+					      struct ext4_ext_path *,</div><div class='ctx'> 					      int flags);</div><div class='ctx'> extern void ext4_free_ext_path(struct ext4_ext_path *);</div><div class='ctx'> extern int ext4_ext_check_inode(struct inode *inode);</div><div class='hunk'>@@ -3790,34 +3893,19 @@ static inline void set_bitmap_uptodate(struct buffer_head *bh)</div><div class='ctx'> 	set_bit(BH_BITMAP_UPTODATE, &amp;(bh)-&gt;b_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* For ioend &amp; aio unwritten conversion wait queues */</div><div class='del'>-#define EXT4_WQ_HASH_SZ		37</div><div class='del'>-#define ext4_ioend_wq(v)   (&amp;ext4__ioend_wq[((unsigned long)(v)) %\</div><div class='del'>-					    EXT4_WQ_HASH_SZ])</div><div class='del'>-extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ];</div><div class='del'>-</div><div class='ctx'> extern int ext4_resize_begin(struct super_block *sb);</div><div class='ctx'> extern int ext4_resize_end(struct super_block *sb, bool update_backups);</div><div class='ctx'> </div><div class='del'>-static inline void ext4_set_io_unwritten_flag(struct inode *inode,</div><div class='del'>-					      struct ext4_io_end *io_end)</div><div class='add'>+static inline void ext4_set_io_unwritten_flag(struct ext4_io_end *io_end)</div><div class='ctx'> {</div><div class='del'>-	if (!(io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN)) {</div><div class='add'>+	if (!(io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN))</div><div class='ctx'> 		io_end-&gt;flag |= EXT4_IO_END_UNWRITTEN;</div><div class='del'>-		atomic_inc(&amp;EXT4_I(inode)-&gt;i_unwritten);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = io_end-&gt;inode;</div><div class='del'>-</div><div class='del'>-	if (io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN) {</div><div class='add'>+	if (io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN)</div><div class='ctx'> 		io_end-&gt;flag &amp;= ~EXT4_IO_END_UNWRITTEN;</div><div class='del'>-		/* Wake up anyone waiting on unwritten extent conversion */</div><div class='del'>-		if (atomic_dec_and_test(&amp;EXT4_I(inode)-&gt;i_unwritten))</div><div class='del'>-			wake_up_all(ext4_ioend_wq(inode));</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern const struct iomap_ops ext4_iomap_ops;</div><div class='hunk'>@@ -3837,6 +3925,17 @@ static inline int ext4_buffer_uptodate(struct buffer_head *bh)</div><div class='ctx'> 	return buffer_uptodate(bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool ext4_inode_can_atomic_write(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	return S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='add'>+		ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &amp;&amp;</div><div class='add'>+		EXT4_SB(inode-&gt;i_sb)-&gt;s_awu_min &gt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int ext4_block_write_begin(handle_t *handle, struct folio *folio,</div><div class='add'>+				  loff_t pos, unsigned len,</div><div class='add'>+				  get_block_t *get_block);</div><div class='ctx'> #endif	/* __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> #define EFSBADCRC	EBADMSG		/* Bad CRC detected */</div><div class='head'>diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h<br/>index 26435f3a3094..c484125d963f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4_extents.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4_extents.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4_extents.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/ext4_extents.h</a></div><div class='hunk'>@@ -31,13 +31,6 @@</div><div class='ctx'> #define CHECK_BINSEARCH__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * If EXT_STATS is defined then stats numbers are collected.</div><div class='del'>- * These number will be displayed at umount time.</div><div class='del'>- */</div><div class='del'>-#define EXT_STATS_</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * ext4_inode has i_block array (60 bytes total).</div><div class='ctx'>  * The first 12 bytes store ext4_extent_header;</div><div class='ctx'>  * the remainder stores an array of ext4_extent.</div><div class='head'>diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c<br/>index 5d8055161acd..05e5946ed9b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4_jbd2.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4_jbd2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4_jbd2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/ext4_jbd2.c</a></div><div class='hunk'>@@ -63,12 +63,14 @@ static void ext4_put_nojournal(handle_t *handle)</div><div class='ctx'>  */</div><div class='ctx'> static int ext4_journal_check_start(struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	journal_t *journal;</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(sb_rdonly(sb)))</div><div class='ctx'> 		return -EROFS;</div><div class='hunk'>@@ -206,7 +208,7 @@ static void ext4_journal_abort_handle(const char *caller, unsigned int line,</div><div class='ctx'> </div><div class='ctx'> static void ext4_check_bdev_write_error(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = sb-&gt;s_bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *mapping = sb-&gt;s_bdev-&gt;bd_mapping;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +246,8 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		ext4_check_bdev_write_error(sb);</div><div class='del'>-	if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))</div><div class='add'>+	if (trigger_type == EXT4_JTR_NONE ||</div><div class='add'>+	    !ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	BUG_ON(trigger_type &gt;= EXT4_JOURNAL_TRIGGER_COUNT);</div><div class='ctx'> 	jbd2_journal_set_triggers(bh,</div><div class='hunk'>@@ -276,9 +279,16 @@ int __ext4_forget(const char *where, unsigned int line, handle_t *handle,</div><div class='ctx'> 		  bh, is_metadata, inode-&gt;i_mode,</div><div class='ctx'> 		  test_opt(inode-&gt;i_sb, DATA_FLAGS));</div><div class='ctx'> </div><div class='del'>-	/* In the no journal case, we can just do a bforget and return */</div><div class='add'>+	/*</div><div class='add'>+	 * In the no journal case, we should wait for the ongoing buffer</div><div class='add'>+	 * to complete and do a forget.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!ext4_handle_valid(handle)) {</div><div class='del'>-		bforget(bh);</div><div class='add'>+		if (bh) {</div><div class='add'>+			clear_buffer_dirty(bh);</div><div class='add'>+			wait_on_buffer(bh);</div><div class='add'>+			__bforget(bh);</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -331,7 +341,8 @@ int __ext4_journal_get_create_access(const char *where, unsigned int line,</div><div class='ctx'> 					  err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (trigger_type == EXT4_JTR_NONE || !ext4_has_metadata_csum(sb))</div><div class='add'>+	if (trigger_type == EXT4_JTR_NONE ||</div><div class='add'>+	    !ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	BUG_ON(trigger_type &gt;= EXT4_JOURNAL_TRIGGER_COUNT);</div><div class='ctx'> 	jbd2_journal_set_triggers(bh,</div><div class='head'>diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h<br/>index 0c77697d5e90..63d17c5201b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4_jbd2.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ext4_jbd2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/ext4_jbd2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/ext4_jbd2.h</a></div><div class='hunk'>@@ -122,90 +122,6 @@</div><div class='ctx'> #define EXT4_HT_EXT_CONVERT     11</div><div class='ctx'> #define EXT4_HT_MAX             12</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *   struct ext4_journal_cb_entry - Base structure for callback information.</div><div class='del'>- *</div><div class='del'>- *   This struct is a 'seed' structure for a using with your own callback</div><div class='del'>- *   structs. If you are using callbacks you must allocate one of these</div><div class='del'>- *   or another struct of your own definition which has this struct</div><div class='del'>- *   as it's first element and pass it to ext4_journal_callback_add().</div><div class='del'>- */</div><div class='del'>-struct ext4_journal_cb_entry {</div><div class='del'>-	/* list information for other callbacks attached to the same handle */</div><div class='del'>-	struct list_head jce_list;</div><div class='del'>-</div><div class='del'>-	/*  Function to call with this callback structure */</div><div class='del'>-	void (*jce_func)(struct super_block *sb,</div><div class='del'>-			 struct ext4_journal_cb_entry *jce, int error);</div><div class='del'>-</div><div class='del'>-	/* user data goes here */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ext4_journal_callback_add: add a function to call after transaction commit</div><div class='del'>- * @handle: active journal transaction handle to register callback on</div><div class='del'>- * @func: callback function to call after the transaction has committed:</div><div class='del'>- *        @sb: superblock of current filesystem for transaction</div><div class='del'>- *        @jce: returned journal callback data</div><div class='del'>- *        @rc: journal state at commit (0 = transaction committed properly)</div><div class='del'>- * @jce: journal callback data (internal and function private data struct)</div><div class='del'>- *</div><div class='del'>- * The registered function will be called in the context of the journal thread</div><div class='del'>- * after the transaction for which the handle was created has completed.</div><div class='del'>- *</div><div class='del'>- * No locks are held when the callback function is called, so it is safe to</div><div class='del'>- * call blocking functions from within the callback, but the callback should</div><div class='del'>- * not block or run for too long, or the filesystem will be blocked waiting for</div><div class='del'>- * the next transaction to commit. No journaling functions can be used, or</div><div class='del'>- * there is a risk of deadlock.</div><div class='del'>- *</div><div class='del'>- * There is no guaranteed calling order of multiple registered callbacks on</div><div class='del'>- * the same transaction.</div><div class='del'>- */</div><div class='del'>-static inline void _ext4_journal_callback_add(handle_t *handle,</div><div class='del'>-			struct ext4_journal_cb_entry *jce)</div><div class='del'>-{</div><div class='del'>-	/* Add the jce to transaction's private list */</div><div class='del'>-	list_add_tail(&amp;jce-&gt;jce_list, &amp;handle-&gt;h_transaction-&gt;t_private_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ext4_journal_callback_add(handle_t *handle,</div><div class='del'>-			void (*func)(struct super_block *sb,</div><div class='del'>-				     struct ext4_journal_cb_entry *jce,</div><div class='del'>-				     int rc),</div><div class='del'>-			struct ext4_journal_cb_entry *jce)</div><div class='del'>-{</div><div class='del'>-	struct ext4_sb_info *sbi =</div><div class='del'>-			EXT4_SB(handle-&gt;h_transaction-&gt;t_journal-&gt;j_private);</div><div class='del'>-</div><div class='del'>-	/* Add the jce to transaction's private list */</div><div class='del'>-	jce-&gt;jce_func = func;</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	_ext4_journal_callback_add(handle, jce);</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ext4_journal_callback_del: delete a registered callback</div><div class='del'>- * @handle: active journal transaction handle on which callback was registered</div><div class='del'>- * @jce: registered journal callback entry to unregister</div><div class='del'>- * Return true if object was successfully removed</div><div class='del'>- */</div><div class='del'>-static inline bool ext4_journal_callback_try_del(handle_t *handle,</div><div class='del'>-					     struct ext4_journal_cb_entry *jce)</div><div class='del'>-{</div><div class='del'>-	bool deleted;</div><div class='del'>-	struct ext4_sb_info *sbi =</div><div class='del'>-			EXT4_SB(handle-&gt;h_transaction-&gt;t_journal-&gt;j_private);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	deleted = !list_empty(&amp;jce-&gt;jce_list);</div><div class='del'>-	list_del_init(&amp;jce-&gt;jce_list);</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	return deleted;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int</div><div class='ctx'> ext4_mark_iloc_dirty(handle_t *handle,</div><div class='ctx'> 		     struct inode *inode,</div><div class='hunk'>@@ -403,10 +319,10 @@ static inline int ext4_journal_ensure_credits(handle_t *handle, int credits,</div><div class='ctx'> 				revoke_creds, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ext4_journal_blocks_per_page(struct inode *inode)</div><div class='add'>+static inline int ext4_journal_blocks_per_folio(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (EXT4_JOURNAL(inode) != NULL)</div><div class='del'>-		return jbd2_journal_blocks_per_page(inode);</div><div class='add'>+		return jbd2_journal_blocks_per_folio(inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -513,4 +429,33 @@ static inline int ext4_should_dioread_nolock(struct inode *inode)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Pass journal explicitly as it may not be cached in the sbi-&gt;s_journal in some</div><div class='add'>+ * cases</div><div class='add'>+ */</div><div class='add'>+static inline int ext4_journal_destroy(struct ext4_sb_info *sbi, journal_t *journal)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At this point only two things can be operating on the journal.</div><div class='add'>+	 * JBD2 thread performing transaction commit and s_sb_upd_work</div><div class='add'>+	 * issuing sb update through the journal. Once we set</div><div class='add'>+	 * EXT4_JOURNAL_DESTROY, new ext4_handle_error() calls will not</div><div class='add'>+	 * queue s_sb_upd_work and ext4_force_commit() makes sure any</div><div class='add'>+	 * ext4_handle_error() calls from the running transaction commit are</div><div class='add'>+	 * finished. Hence no new s_sb_upd_work can be queued after we</div><div class='add'>+	 * flush it here.</div><div class='add'>+	 */</div><div class='add'>+	ext4_set_mount_flag(sbi-&gt;s_sb, EXT4_MF_JOURNAL_DESTROY);</div><div class='add'>+</div><div class='add'>+	ext4_force_commit(sbi-&gt;s_sb);</div><div class='add'>+	flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='add'>+</div><div class='add'>+	err = jbd2_journal_destroy(journal);</div><div class='add'>+	sbi-&gt;s_journal = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _EXT4_JBD2_H */</div><div class='head'>diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c<br/>index 01299b55a567..2cf5759ba689 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/extents.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/extents.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/extents.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/extents.c</a></div><div class='hunk'>@@ -50,10 +50,9 @@ static __le32 ext4_extent_block_csum(struct inode *inode,</div><div class='ctx'> 				     struct ext4_extent_header *eh)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, ei-&gt;i_csum_seed, (__u8 *)eh,</div><div class='add'>+	csum = ext4_chksum(ei-&gt;i_csum_seed, (__u8 *)eh,</div><div class='ctx'> 			   EXT4_EXTENT_TAIL_OFFSET(eh));</div><div class='ctx'> 	return cpu_to_le32(csum);</div><div class='ctx'> }</div><div class='hunk'>@@ -63,7 +62,7 @@ static int ext4_extent_block_csum_verify(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_extent_tail *et;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	et = find_ext4_extent_tail(eh);</div><div class='hunk'>@@ -77,19 +76,18 @@ static void ext4_extent_block_csum_set(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_extent_tail *et;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	et = find_ext4_extent_tail(eh);</div><div class='ctx'> 	et-&gt;et_checksum = ext4_extent_block_csum(inode, eh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_split_extent_at(handle_t *handle,</div><div class='del'>-			     struct inode *inode,</div><div class='del'>-			     struct ext4_ext_path **ppath,</div><div class='del'>-			     ext4_lblk_t split,</div><div class='del'>-			     int split_flag,</div><div class='del'>-			     int flags);</div><div class='add'>+static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,</div><div class='add'>+						  struct inode *inode,</div><div class='add'>+						  struct ext4_ext_path *path,</div><div class='add'>+						  ext4_lblk_t split,</div><div class='add'>+						  int split_flag, int flags);</div><div class='ctx'> </div><div class='ctx'> static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped)</div><div class='ctx'> {</div><div class='hunk'>@@ -100,27 +98,33 @@ static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped)</div><div class='ctx'> 	 * i_rwsem. So we can safely drop the i_data_sem here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUG_ON(EXT4_JOURNAL(inode) == NULL);</div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> 	up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 	*dropped = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ext4_ext_path_brelse(struct ext4_ext_path *path)</div><div class='add'>+{</div><div class='add'>+	brelse(path-&gt;p_bh);</div><div class='add'>+	path-&gt;p_bh = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ext4_ext_drop_refs(struct ext4_ext_path *path)</div><div class='ctx'> {</div><div class='ctx'> 	int depth, i;</div><div class='ctx'> </div><div class='del'>-	if (!path)</div><div class='add'>+	if (IS_ERR_OR_NULL(path))</div><div class='ctx'> 		return;</div><div class='ctx'> 	depth = path-&gt;p_depth;</div><div class='del'>-	for (i = 0; i &lt;= depth; i++, path++) {</div><div class='del'>-		brelse(path-&gt;p_bh);</div><div class='del'>-		path-&gt;p_bh = NULL;</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt;= depth; i++, path++)</div><div class='add'>+		ext4_ext_path_brelse(path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ext4_free_ext_path(struct ext4_ext_path *path)</div><div class='ctx'> {</div><div class='add'>+	if (IS_ERR_OR_NULL(path))</div><div class='add'>+		return;</div><div class='ctx'> 	ext4_ext_drop_refs(path);</div><div class='ctx'> 	kfree(path);</div><div class='ctx'> }</div><div class='hunk'>@@ -323,19 +327,18 @@ static inline int ext4_ext_space_root_idx(struct inode *inode, int check)</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static inline struct ext4_ext_path *</div><div class='ctx'> ext4_force_split_extent_at(handle_t *handle, struct inode *inode,</div><div class='del'>-			   struct ext4_ext_path **ppath, ext4_lblk_t lblk,</div><div class='add'>+			   struct ext4_ext_path *path, ext4_lblk_t lblk,</div><div class='ctx'> 			   int nofail)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	int unwritten = ext4_ext_is_unwritten(path[path-&gt;p_depth].p_ext);</div><div class='del'>-	int flags = EXT4_EX_NOCACHE | EXT4_GET_BLOCKS_PRE_IO;</div><div class='add'>+	int flags = EXT4_EX_NOCACHE | EXT4_GET_BLOCKS_SPLIT_NOMERGE;</div><div class='ctx'> </div><div class='ctx'> 	if (nofail)</div><div class='ctx'> 		flags |= EXT4_GET_BLOCKS_METADATA_NOFAIL | EXT4_EX_NOFAIL;</div><div class='ctx'> </div><div class='del'>-	return ext4_split_extent_at(handle, inode, ppath, lblk, unwritten ?</div><div class='add'>+	return ext4_split_extent_at(handle, inode, path, lblk, unwritten ?</div><div class='ctx'> 			EXT4_EXT_MARK_UNWRIT1|EXT4_EXT_MARK_UNWRIT2 : 0,</div><div class='ctx'> 			flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -564,7 +567,7 @@ __read_extent_tree_block(const char *function, unsigned int line,</div><div class='ctx'> </div><div class='ctx'> 	if (!bh_uptodate_or_lock(bh)) {</div><div class='ctx'> 		trace_ext4_ext_load_extent(inode, pblk, _RET_IP_);</div><div class='del'>-		err = ext4_read_bh(bh, 0, NULL);</div><div class='add'>+		err = ext4_read_bh(bh, 0, NULL, false);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -607,6 +610,8 @@ int ext4_ext_precache(struct inode *inode)</div><div class='ctx'> 	if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='ctx'> 		return 0;	/* not an extent-mapped inode */</div><div class='ctx'> </div><div class='add'>+	ext4_check_map_extents_env(inode);</div><div class='add'>+</div><div class='ctx'> 	down_read(&amp;ei-&gt;i_data_sem);</div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -635,8 +640,7 @@ int ext4_ext_precache(struct inode *inode)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((i == depth) ||</div><div class='ctx'> 		    path[i].p_idx &gt; EXT_LAST_INDEX(path[i].p_hdr)) {</div><div class='del'>-			brelse(path[i].p_bh);</div><div class='del'>-			path[i].p_bh = NULL;</div><div class='add'>+			ext4_ext_path_brelse(path + i);</div><div class='ctx'> 			i--;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -689,7 +693,7 @@ static void ext4_ext_show_leaf(struct inode *inode, struct ext4_ext_path *path)</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!path)</div><div class='add'>+	if (IS_ERR_OR_NULL(path))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	eh = path[depth].p_hdr;</div><div class='hunk'>@@ -881,11 +885,10 @@ void ext4_ext_tree_init(handle_t *handle, struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> struct ext4_ext_path *</div><div class='ctx'> ext4_find_extent(struct inode *inode, ext4_lblk_t block,</div><div class='del'>-		 struct ext4_ext_path **orig_path, int flags)</div><div class='add'>+		 struct ext4_ext_path *path, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_extent_header *eh;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	struct ext4_ext_path *path = orig_path ? *orig_path : NULL;</div><div class='ctx'> 	short int depth, i, ppos = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	gfp_t gfp_flags = GFP_NOFS;</div><div class='hunk'>@@ -906,7 +909,7 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,</div><div class='ctx'> 		ext4_ext_drop_refs(path);</div><div class='ctx'> 		if (depth &gt; path[0].p_maxdepth) {</div><div class='ctx'> 			kfree(path);</div><div class='del'>-			*orig_path = path = NULL;</div><div class='add'>+			path = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!path) {</div><div class='hunk'>@@ -961,8 +964,6 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	ext4_free_ext_path(path);</div><div class='del'>-	if (orig_path)</div><div class='del'>-		*orig_path = NULL;</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1395,15 +1396,15 @@ out:</div><div class='ctx'>  * finds empty index and adds new leaf.</div><div class='ctx'>  * if no free index is found, then it requests in-depth growing.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode,</div><div class='del'>-				    unsigned int mb_flags,</div><div class='del'>-				    unsigned int gb_flags,</div><div class='del'>-				    struct ext4_ext_path **ppath,</div><div class='del'>-				    struct ext4_extent *newext)</div><div class='add'>+static struct ext4_ext_path *</div><div class='add'>+ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode,</div><div class='add'>+			 unsigned int mb_flags, unsigned int gb_flags,</div><div class='add'>+			 struct ext4_ext_path *path,</div><div class='add'>+			 struct ext4_extent *newext)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	struct ext4_ext_path *curp;</div><div class='ctx'> 	int depth, i, err = 0;</div><div class='add'>+	ext4_lblk_t ee_block = le32_to_cpu(newext-&gt;ee_block);</div><div class='ctx'> </div><div class='ctx'> repeat:</div><div class='ctx'> 	i = depth = ext_depth(inode);</div><div class='hunk'>@@ -1422,42 +1423,38 @@ repeat:</div><div class='ctx'> 		 * entry: create all needed subtree and add new leaf */</div><div class='ctx'> 		err = ext4_ext_split(handle, inode, mb_flags, path, newext, i);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			goto errout;</div><div class='ctx'> </div><div class='ctx'> 		/* refill path */</div><div class='del'>-		path = ext4_find_extent(inode,</div><div class='del'>-				    (ext4_lblk_t)le32_to_cpu(newext-&gt;ee_block),</div><div class='del'>-				    ppath, gb_flags);</div><div class='del'>-		if (IS_ERR(path))</div><div class='del'>-			err = PTR_ERR(path);</div><div class='del'>-	} else {</div><div class='del'>-		/* tree is full, time to grow in depth */</div><div class='del'>-		err = ext4_ext_grow_indepth(handle, inode, mb_flags);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+		path = ext4_find_extent(inode, ee_block, path, gb_flags);</div><div class='add'>+		return path;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* refill path */</div><div class='del'>-		path = ext4_find_extent(inode,</div><div class='del'>-				   (ext4_lblk_t)le32_to_cpu(newext-&gt;ee_block),</div><div class='del'>-				    ppath, gb_flags);</div><div class='del'>-		if (IS_ERR(path)) {</div><div class='del'>-			err = PTR_ERR(path);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	/* tree is full, time to grow in depth */</div><div class='add'>+	err = ext4_ext_grow_indepth(handle, inode, mb_flags);</div><div class='add'>+	if (err)</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * only first (depth 0 -&gt; 1) produces free space;</div><div class='del'>-		 * in all other cases we have to split the grown tree</div><div class='del'>-		 */</div><div class='del'>-		depth = ext_depth(inode);</div><div class='del'>-		if (path[depth].p_hdr-&gt;eh_entries == path[depth].p_hdr-&gt;eh_max) {</div><div class='del'>-			/* now we need to split */</div><div class='del'>-			goto repeat;</div><div class='del'>-		}</div><div class='add'>+	/* refill path */</div><div class='add'>+	path = ext4_find_extent(inode, ee_block, path, gb_flags);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return path;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * only first (depth 0 -&gt; 1) produces free space;</div><div class='add'>+	 * in all other cases we have to split the grown tree</div><div class='add'>+	 */</div><div class='add'>+	depth = ext_depth(inode);</div><div class='add'>+	if (path[depth].p_hdr-&gt;eh_entries == path[depth].p_hdr-&gt;eh_max) {</div><div class='add'>+		/* now we need to split */</div><div class='add'>+		goto repeat;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return path;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1534,7 +1531,7 @@ static int ext4_ext_search_left(struct inode *inode,</div><div class='ctx'> static int ext4_ext_search_right(struct inode *inode,</div><div class='ctx'> 				 struct ext4_ext_path *path,</div><div class='ctx'> 				 ext4_lblk_t *logical, ext4_fsblk_t *phys,</div><div class='del'>-				 struct ext4_extent *ret_ex)</div><div class='add'>+				 struct ext4_extent *ret_ex, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='ctx'> 	struct ext4_extent_header *eh;</div><div class='hunk'>@@ -1608,7 +1605,8 @@ got_index:</div><div class='ctx'> 	ix++;</div><div class='ctx'> 	while (++depth &lt; path-&gt;p_depth) {</div><div class='ctx'> 		/* subtract from p_depth to get proper eh_depth */</div><div class='del'>-		bh = read_extent_tree_block(inode, ix, path-&gt;p_depth - depth, 0);</div><div class='add'>+		bh = read_extent_tree_block(inode, ix, path-&gt;p_depth - depth,</div><div class='add'>+					    flags);</div><div class='ctx'> 		if (IS_ERR(bh))</div><div class='ctx'> 			return PTR_ERR(bh);</div><div class='ctx'> 		eh = ext_block_hdr(bh);</div><div class='hunk'>@@ -1616,7 +1614,7 @@ got_index:</div><div class='ctx'> 		put_bh(bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bh = read_extent_tree_block(inode, ix, path-&gt;p_depth - depth, 0);</div><div class='add'>+	bh = read_extent_tree_block(inode, ix, path-&gt;p_depth - depth, flags);</div><div class='ctx'> 	if (IS_ERR(bh))</div><div class='ctx'> 		return PTR_ERR(bh);</div><div class='ctx'> 	eh = ext_block_hdr(bh);</div><div class='hunk'>@@ -1749,12 +1747,23 @@ static int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = ext4_ext_get_access(handle, inode, path + k);</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='add'>+			goto clean;</div><div class='ctx'> 		path[k].p_idx-&gt;ei_block = border;</div><div class='ctx'> 		err = ext4_ext_dirty(handle, inode, path + k);</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='add'>+			goto clean;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clean:</div><div class='add'>+	/*</div><div class='add'>+	 * The path[k].p_bh is either unmodified or with no verified bit</div><div class='add'>+	 * set (see ext4_ext_get_access()). So just clear the verified bit</div><div class='add'>+	 * of the successfully modified extents buffers, which will force</div><div class='add'>+	 * these extents to be checked to avoid using inconsistent data.</div><div class='add'>+	 */</div><div class='add'>+	while (++k &lt; depth)</div><div class='add'>+		clear_buffer_verified(path[k].p_bh);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1876,7 +1885,7 @@ static void ext4_ext_try_to_merge_up(handle_t *handle,</div><div class='ctx'> 		(path[1].p_ext - EXT_FIRST_EXTENT(path[1].p_hdr));</div><div class='ctx'> 	path[0].p_hdr-&gt;eh_max = cpu_to_le16(max_root);</div><div class='ctx'> </div><div class='del'>-	brelse(path[1].p_bh);</div><div class='add'>+	ext4_ext_path_brelse(path + 1);</div><div class='ctx'> 	ext4_free_blocks(handle, inode, NULL, blk, 1,</div><div class='ctx'> 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);</div><div class='ctx'> }</div><div class='hunk'>@@ -1964,16 +1973,15 @@ out:</div><div class='ctx'>  * inserts requested extent as new one into the tree,</div><div class='ctx'>  * creating new leaf in the no-space case.</div><div class='ctx'>  */</div><div class='del'>-int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,</div><div class='del'>-				struct ext4_ext_path **ppath,</div><div class='del'>-				struct ext4_extent *newext, int gb_flags)</div><div class='add'>+struct ext4_ext_path *</div><div class='add'>+ext4_ext_insert_extent(handle_t *handle, struct inode *inode,</div><div class='add'>+		       struct ext4_ext_path *path,</div><div class='add'>+		       struct ext4_extent *newext, int gb_flags)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	struct ext4_extent_header *eh;</div><div class='ctx'> 	struct ext4_extent *ex, *fex;</div><div class='ctx'> 	struct ext4_extent *nearex; /* nearest extent */</div><div class='del'>-	struct ext4_ext_path *npath = NULL;</div><div class='del'>-	int depth, len, err;</div><div class='add'>+	int depth, len, err = 0;</div><div class='ctx'> 	ext4_lblk_t next;</div><div class='ctx'> 	int mb_flags = 0, unwritten;</div><div class='ctx'> </div><div class='hunk'>@@ -1981,18 +1989,20 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		mb_flags |= EXT4_MB_DELALLOC_RESERVED;</div><div class='ctx'> 	if (unlikely(ext4_ext_get_actual_len(newext) == 0)) {</div><div class='ctx'> 		EXT4_ERROR_INODE(inode, "ext4_ext_get_actual_len(newext) == 0");</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='add'>+		err = -EFSCORRUPTED;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='ctx'> 	ex = path[depth].p_ext;</div><div class='ctx'> 	eh = path[depth].p_hdr;</div><div class='ctx'> 	if (unlikely(path[depth].p_hdr == NULL)) {</div><div class='ctx'> 		EXT4_ERROR_INODE(inode, "path[%d].p_hdr == NULL", depth);</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='add'>+		err = -EFSCORRUPTED;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* try to insert block into found extent and return */</div><div class='del'>-	if (ex &amp;&amp; !(gb_flags &amp; EXT4_GET_BLOCKS_PRE_IO)) {</div><div class='add'>+	if (ex &amp;&amp; !(gb_flags &amp; EXT4_GET_BLOCKS_SPLIT_NOMERGE)) {</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Try to see whether we should rather test the extent on</div><div class='hunk'>@@ -2026,7 +2036,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			err = ext4_ext_get_access(handle, inode,</div><div class='ctx'> 						  path + depth);</div><div class='ctx'> 			if (err)</div><div class='del'>-				return err;</div><div class='add'>+				goto errout;</div><div class='ctx'> 			unwritten = ext4_ext_is_unwritten(ex);</div><div class='ctx'> 			ex-&gt;ee_len = cpu_to_le16(ext4_ext_get_actual_len(ex)</div><div class='ctx'> 					+ ext4_ext_get_actual_len(newext));</div><div class='hunk'>@@ -2051,7 +2061,7 @@ prepend:</div><div class='ctx'> 			err = ext4_ext_get_access(handle, inode,</div><div class='ctx'> 						  path + depth);</div><div class='ctx'> 			if (err)</div><div class='del'>-				return err;</div><div class='add'>+				goto errout;</div><div class='ctx'> </div><div class='ctx'> 			unwritten = ext4_ext_is_unwritten(ex);</div><div class='ctx'> 			ex-&gt;ee_block = newext-&gt;ee_block;</div><div class='hunk'>@@ -2076,21 +2086,26 @@ prepend:</div><div class='ctx'> 	if (le32_to_cpu(newext-&gt;ee_block) &gt; le32_to_cpu(fex-&gt;ee_block))</div><div class='ctx'> 		next = ext4_ext_next_leaf_block(path);</div><div class='ctx'> 	if (next != EXT_MAX_BLOCKS) {</div><div class='add'>+		struct ext4_ext_path *npath;</div><div class='add'>+</div><div class='ctx'> 		ext_debug(inode, "next leaf block - %u\n", next);</div><div class='del'>-		BUG_ON(npath != NULL);</div><div class='ctx'> 		npath = ext4_find_extent(inode, next, NULL, gb_flags);</div><div class='del'>-		if (IS_ERR(npath))</div><div class='del'>-			return PTR_ERR(npath);</div><div class='add'>+		if (IS_ERR(npath)) {</div><div class='add'>+			err = PTR_ERR(npath);</div><div class='add'>+			goto errout;</div><div class='add'>+		}</div><div class='ctx'> 		BUG_ON(npath-&gt;p_depth != path-&gt;p_depth);</div><div class='ctx'> 		eh = npath[depth].p_hdr;</div><div class='ctx'> 		if (le16_to_cpu(eh-&gt;eh_entries) &lt; le16_to_cpu(eh-&gt;eh_max)) {</div><div class='ctx'> 			ext_debug(inode, "next leaf isn't full(%d)\n",</div><div class='ctx'> 				  le16_to_cpu(eh-&gt;eh_entries));</div><div class='add'>+			ext4_free_ext_path(path);</div><div class='ctx'> 			path = npath;</div><div class='ctx'> 			goto has_space;</div><div class='ctx'> 		}</div><div class='ctx'> 		ext_debug(inode, "next leaf has no free space(%d,%d)\n",</div><div class='ctx'> 			  le16_to_cpu(eh-&gt;eh_entries), le16_to_cpu(eh-&gt;eh_max));</div><div class='add'>+		ext4_free_ext_path(npath);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2099,10 +2114,10 @@ prepend:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (gb_flags &amp; EXT4_GET_BLOCKS_METADATA_NOFAIL)</div><div class='ctx'> 		mb_flags |= EXT4_MB_USE_RESERVED;</div><div class='del'>-	err = ext4_ext_create_new_leaf(handle, inode, mb_flags, gb_flags,</div><div class='del'>-				       ppath, newext);</div><div class='del'>-	if (err)</div><div class='del'>-		goto cleanup;</div><div class='add'>+	path = ext4_ext_create_new_leaf(handle, inode, mb_flags, gb_flags,</div><div class='add'>+					path, newext);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return path;</div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='ctx'> 	eh = path[depth].p_hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -2111,7 +2126,7 @@ has_space:</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_ext_get_access(handle, inode, path + depth);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto cleanup;</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	if (!nearex) {</div><div class='ctx'> 		/* there is no extent in this leaf, create first one */</div><div class='hunk'>@@ -2166,20 +2181,23 @@ has_space:</div><div class='ctx'> </div><div class='ctx'> merge:</div><div class='ctx'> 	/* try to merge extents */</div><div class='del'>-	if (!(gb_flags &amp; EXT4_GET_BLOCKS_PRE_IO))</div><div class='add'>+	if (!(gb_flags &amp; EXT4_GET_BLOCKS_SPLIT_NOMERGE))</div><div class='ctx'> 		ext4_ext_try_to_merge(handle, inode, path, nearex);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* time to correct all indexes above */</div><div class='ctx'> 	err = ext4_ext_correct_indexes(handle, inode, path);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto cleanup;</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_ext_dirty(handle, inode, path + path-&gt;p_depth);</div><div class='add'>+	if (err)</div><div class='add'>+		goto errout;</div><div class='ctx'> </div><div class='del'>-cleanup:</div><div class='del'>-	ext4_free_ext_path(npath);</div><div class='del'>-	return err;</div><div class='add'>+	return path;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_fill_es_cache_info(struct inode *inode,</div><div class='hunk'>@@ -2195,7 +2213,7 @@ static int ext4_fill_es_cache_info(struct inode *inode,</div><div class='ctx'> 	while (block &lt;= end) {</div><div class='ctx'> 		next = 0;</div><div class='ctx'> 		flags = 0;</div><div class='del'>-		if (!ext4_es_lookup_extent(inode, block, &amp;next, &amp;es))</div><div class='add'>+		if (!ext4_es_lookup_extent(inode, block, &amp;next, &amp;es, NULL))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (ext4_es_is_unwritten(&amp;es))</div><div class='ctx'> 			flags |= FIEMAP_EXTENT_UNWRITTEN;</div><div class='hunk'>@@ -2229,7 +2247,7 @@ static int ext4_fill_es_cache_info(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ext4_ext_determine_hole - determine hole around given block</div><div class='add'>+ * ext4_ext_find_hole - find hole around given block according to the given path</div><div class='ctx'>  * @inode:	inode we lookup in</div><div class='ctx'>  * @path:	path in extent tree to @lblk</div><div class='ctx'>  * @lblk:	pointer to logical block around which we want to determine hole</div><div class='hunk'>@@ -2241,9 +2259,9 @@ static int ext4_fill_es_cache_info(struct inode *inode,</div><div class='ctx'>  * The function returns the length of a hole starting at @lblk. We update @lblk</div><div class='ctx'>  * to the beginning of the hole if we managed to find it.</div><div class='ctx'>  */</div><div class='del'>-static ext4_lblk_t ext4_ext_determine_hole(struct inode *inode,</div><div class='del'>-					   struct ext4_ext_path *path,</div><div class='del'>-					   ext4_lblk_t *lblk)</div><div class='add'>+static ext4_lblk_t ext4_ext_find_hole(struct inode *inode,</div><div class='add'>+				      struct ext4_ext_path *path,</div><div class='add'>+				      ext4_lblk_t *lblk)</div><div class='ctx'> {</div><div class='ctx'> 	int depth = ext_depth(inode);</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='hunk'>@@ -2271,30 +2289,6 @@ static ext4_lblk_t ext4_ext_determine_hole(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ext4_ext_put_gap_in_cache:</div><div class='del'>- * calculate boundaries of the gap that the requested block fits into</div><div class='del'>- * and cache this gap</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ext4_ext_put_gap_in_cache(struct inode *inode, ext4_lblk_t hole_start,</div><div class='del'>-			  ext4_lblk_t hole_len)</div><div class='del'>-{</div><div class='del'>-	struct extent_status es;</div><div class='del'>-</div><div class='del'>-	ext4_es_find_extent_range(inode, &amp;ext4_es_is_delayed, hole_start,</div><div class='del'>-				  hole_start + hole_len - 1, &amp;es);</div><div class='del'>-	if (es.es_len) {</div><div class='del'>-		/* There's delayed extent containing lblock? */</div><div class='del'>-		if (es.es_lblk &lt;= hole_start)</div><div class='del'>-			return;</div><div class='del'>-		hole_len = min(es.es_lblk - hole_start, hole_len);</div><div class='del'>-	}</div><div class='del'>-	ext_debug(inode, " -&gt; %u:%u\n", hole_start, hole_len);</div><div class='del'>-	ext4_es_insert_extent(inode, hole_start, hole_len, ~0,</div><div class='del'>-			      EXTENT_STATUS_HOLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * ext4_ext_rm_idx:</div><div class='ctx'>  * removes index from the index block.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2303,27 +2297,26 @@ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	ext4_fsblk_t leaf;</div><div class='add'>+	int k = depth - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* free index block */</div><div class='del'>-	depth--;</div><div class='del'>-	path = path + depth;</div><div class='del'>-	leaf = ext4_idx_pblock(path-&gt;p_idx);</div><div class='del'>-	if (unlikely(path-&gt;p_hdr-&gt;eh_entries == 0)) {</div><div class='del'>-		EXT4_ERROR_INODE(inode, "path-&gt;p_hdr-&gt;eh_entries == 0");</div><div class='add'>+	leaf = ext4_idx_pblock(path[k].p_idx);</div><div class='add'>+	if (unlikely(path[k].p_hdr-&gt;eh_entries == 0)) {</div><div class='add'>+		EXT4_ERROR_INODE(inode, "path[%d].p_hdr-&gt;eh_entries == 0", k);</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='del'>-	err = ext4_ext_get_access(handle, inode, path);</div><div class='add'>+	err = ext4_ext_get_access(handle, inode, path + k);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (path-&gt;p_idx != EXT_LAST_INDEX(path-&gt;p_hdr)) {</div><div class='del'>-		int len = EXT_LAST_INDEX(path-&gt;p_hdr) - path-&gt;p_idx;</div><div class='add'>+	if (path[k].p_idx != EXT_LAST_INDEX(path[k].p_hdr)) {</div><div class='add'>+		int len = EXT_LAST_INDEX(path[k].p_hdr) - path[k].p_idx;</div><div class='ctx'> 		len *= sizeof(struct ext4_extent_idx);</div><div class='del'>-		memmove(path-&gt;p_idx, path-&gt;p_idx + 1, len);</div><div class='add'>+		memmove(path[k].p_idx, path[k].p_idx + 1, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	le16_add_cpu(&amp;path-&gt;p_hdr-&gt;eh_entries, -1);</div><div class='del'>-	err = ext4_ext_dirty(handle, inode, path);</div><div class='add'>+	le16_add_cpu(&amp;path[k].p_hdr-&gt;eh_entries, -1);</div><div class='add'>+	err = ext4_ext_dirty(handle, inode, path + k);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	ext_debug(inode, "index is empty, remove it, free block %llu\n", leaf);</div><div class='hunk'>@@ -2332,18 +2325,29 @@ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	ext4_free_blocks(handle, inode, NULL, leaf, 1,</div><div class='ctx'> 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);</div><div class='ctx'> </div><div class='del'>-	while (--depth &gt;= 0) {</div><div class='del'>-		if (path-&gt;p_idx != EXT_FIRST_INDEX(path-&gt;p_hdr))</div><div class='add'>+	while (--k &gt;= 0) {</div><div class='add'>+		if (path[k + 1].p_idx != EXT_FIRST_INDEX(path[k + 1].p_hdr))</div><div class='ctx'> 			break;</div><div class='del'>-		path--;</div><div class='del'>-		err = ext4_ext_get_access(handle, inode, path);</div><div class='add'>+		err = ext4_ext_get_access(handle, inode, path + k);</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='del'>-		path-&gt;p_idx-&gt;ei_block = (path+1)-&gt;p_idx-&gt;ei_block;</div><div class='del'>-		err = ext4_ext_dirty(handle, inode, path);</div><div class='add'>+			goto clean;</div><div class='add'>+		path[k].p_idx-&gt;ei_block = path[k + 1].p_idx-&gt;ei_block;</div><div class='add'>+		err = ext4_ext_dirty(handle, inode, path + k);</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='add'>+			goto clean;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clean:</div><div class='add'>+	/*</div><div class='add'>+	 * The path[k].p_bh is either unmodified or with no verified bit</div><div class='add'>+	 * set (see ext4_ext_get_access()). So just clear the verified bit</div><div class='add'>+	 * of the successfully modified extents buffers, which will force</div><div class='add'>+	 * these extents to be checked to avoid using inconsistent data.</div><div class='add'>+	 */</div><div class='add'>+	while (++k &lt; depth)</div><div class='add'>+		clear_buffer_verified(path[k].p_bh);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2394,18 +2398,20 @@ int ext4_ext_calc_credits_for_single_extent(struct inode *inode, int nrblocks,</div><div class='ctx'> int ext4_ext_index_trans_blocks(struct inode *inode, int extents)</div><div class='ctx'> {</div><div class='ctx'> 	int index;</div><div class='del'>-	int depth;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are converting the inline data, only one is needed here. */</div><div class='ctx'> 	if (ext4_has_inline_data(inode))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	depth = ext_depth(inode);</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * Extent tree can change between the time we estimate credits and</div><div class='add'>+	 * the time we actually modify the tree. Assume the worst case.</div><div class='add'>+	 */</div><div class='ctx'> 	if (extents &lt;= 1)</div><div class='del'>-		index = depth * 2;</div><div class='add'>+		index = (EXT4_MAX_EXTENT_DEPTH * 2) + extents;</div><div class='ctx'> 	else</div><div class='del'>-		index = depth * 3;</div><div class='add'>+		index = (EXT4_MAX_EXTENT_DEPTH * 3) +</div><div class='add'>+			DIV_ROUND_UP(extents, ext4_ext_space_block(inode, 0));</div><div class='ctx'> </div><div class='ctx'> 	return index;</div><div class='ctx'> }</div><div class='hunk'>@@ -2819,6 +2825,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,</div><div class='ctx'> 	struct partial_cluster partial;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	int i = 0, err = 0;</div><div class='add'>+	int flags = EXT4_EX_NOCACHE | EXT4_EX_NOFAIL;</div><div class='ctx'> </div><div class='ctx'> 	partial.pclu = 0;</div><div class='ctx'> 	partial.lblk = 0;</div><div class='hunk'>@@ -2849,8 +2856,7 @@ again:</div><div class='ctx'> 		ext4_fsblk_t pblk;</div><div class='ctx'> </div><div class='ctx'> 		/* find extent for or closest extent to this block */</div><div class='del'>-		path = ext4_find_extent(inode, end, NULL,</div><div class='del'>-					EXT4_EX_NOCACHE | EXT4_EX_NOFAIL);</div><div class='add'>+		path = ext4_find_extent(inode, end, NULL, flags);</div><div class='ctx'> 		if (IS_ERR(path)) {</div><div class='ctx'> 			ext4_journal_stop(handle);</div><div class='ctx'> 			return PTR_ERR(path);</div><div class='hunk'>@@ -2896,11 +2902,12 @@ again:</div><div class='ctx'> 			 * fail removing space due to ENOSPC so try to use</div><div class='ctx'> 			 * reserved block if that happens.</div><div class='ctx'> 			 */</div><div class='del'>-			err = ext4_force_split_extent_at(handle, inode, &amp;path,</div><div class='del'>-							 end + 1, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='add'>+			path = ext4_force_split_extent_at(handle, inode, path,</div><div class='add'>+							  end + 1, 1);</div><div class='add'>+			if (IS_ERR(path)) {</div><div class='add'>+				err = PTR_ERR(path);</div><div class='ctx'> 				goto out;</div><div class='del'>-</div><div class='add'>+			}</div><div class='ctx'> 		} else if (sbi-&gt;s_cluster_ratio &gt; 1 &amp;&amp; end &gt;= ex_end &amp;&amp;</div><div class='ctx'> 			   partial.state == initial) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2915,7 +2922,7 @@ again:</div><div class='ctx'> 			 */</div><div class='ctx'> 			lblk = ex_end + 1;</div><div class='ctx'> 			err = ext4_ext_search_right(inode, path, &amp;lblk, &amp;pblk,</div><div class='del'>-						    NULL);</div><div class='add'>+						    NULL, flags);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			if (pblk) {</div><div class='hunk'>@@ -2958,8 +2965,7 @@ again:</div><div class='ctx'> 			err = ext4_ext_rm_leaf(handle, inode, path,</div><div class='ctx'> 					       &amp;partial, start, end);</div><div class='ctx'> 			/* root level has p_bh == NULL, brelse() eats this */</div><div class='del'>-			brelse(path[i].p_bh);</div><div class='del'>-			path[i].p_bh = NULL;</div><div class='add'>+			ext4_ext_path_brelse(path + i);</div><div class='ctx'> 			i--;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2992,8 +2998,7 @@ again:</div><div class='ctx'> 				  i + 1, ext4_idx_pblock(path[i].p_idx));</div><div class='ctx'> 			memset(path + i + 1, 0, sizeof(*path));</div><div class='ctx'> 			bh = read_extent_tree_block(inode, path[i].p_idx,</div><div class='del'>-						    depth - i - 1,</div><div class='del'>-						    EXT4_EX_NOCACHE);</div><div class='add'>+						    depth - i - 1, flags);</div><div class='ctx'> 			if (IS_ERR(bh)) {</div><div class='ctx'> 				/* should we reset i_size? */</div><div class='ctx'> 				err = PTR_ERR(bh);</div><div class='hunk'>@@ -3021,8 +3026,7 @@ again:</div><div class='ctx'> 				err = ext4_ext_rm_idx(handle, inode, path, i);</div><div class='ctx'> 			}</div><div class='ctx'> 			/* root level has p_bh == NULL, brelse() eats this */</div><div class='del'>-			brelse(path[i].p_bh);</div><div class='del'>-			path[i].p_bh = NULL;</div><div class='add'>+			ext4_ext_path_brelse(path + i);</div><div class='ctx'> 			i--;</div><div class='ctx'> 			ext_debug(inode, "return to level %d\n", i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3137,7 +3141,7 @@ static void ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,</div><div class='del'>-			      EXTENT_STATUS_WRITTEN);</div><div class='add'>+			      EXTENT_STATUS_WRITTEN, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* FIXME!! we need to try to merge to left or right after zero-out  */</div><div class='hunk'>@@ -3171,16 +3175,14 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)</div><div class='ctx'>  *  a&gt; the extent are splitted into two extent.</div><div class='ctx'>  *  b&gt; split is not needed, and just mark the extent.</div><div class='ctx'>  *</div><div class='del'>- * return 0 on success.</div><div class='add'>+ * Return an extent path pointer on success, or an error pointer on failure.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_split_extent_at(handle_t *handle,</div><div class='del'>-			     struct inode *inode,</div><div class='del'>-			     struct ext4_ext_path **ppath,</div><div class='del'>-			     ext4_lblk_t split,</div><div class='del'>-			     int split_flag,</div><div class='del'>-			     int flags)</div><div class='add'>+static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,</div><div class='add'>+						  struct inode *inode,</div><div class='add'>+						  struct ext4_ext_path *path,</div><div class='add'>+						  ext4_lblk_t split,</div><div class='add'>+						  int split_flag, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	ext4_fsblk_t newblock;</div><div class='ctx'> 	ext4_lblk_t ee_block;</div><div class='ctx'> 	struct ext4_extent *ex, newex, orig_ex, zero_ex;</div><div class='hunk'>@@ -3222,7 +3224,7 @@ static int ext4_split_extent_at(handle_t *handle,</div><div class='ctx'> 		else</div><div class='ctx'> 			ext4_ext_mark_initialized(ex);</div><div class='ctx'> </div><div class='del'>-		if (!(flags &amp; EXT4_GET_BLOCKS_PRE_IO))</div><div class='add'>+		if (!(flags &amp; EXT4_GET_BLOCKS_SPLIT_NOMERGE))</div><div class='ctx'> 			ext4_ext_try_to_merge(handle, inode, path, ex);</div><div class='ctx'> </div><div class='ctx'> 		err = ext4_ext_dirty(handle, inode, path + path-&gt;p_depth);</div><div class='hunk'>@@ -3250,10 +3252,31 @@ static int ext4_split_extent_at(handle_t *handle,</div><div class='ctx'> 	if (split_flag &amp; EXT4_EXT_MARK_UNWRIT2)</div><div class='ctx'> 		ext4_ext_mark_unwritten(ex2);</div><div class='ctx'> </div><div class='del'>-	err = ext4_ext_insert_extent(handle, inode, ppath, &amp;newex, flags);</div><div class='del'>-	if (err != -ENOSPC &amp;&amp; err != -EDQUOT &amp;&amp; err != -ENOMEM)</div><div class='add'>+	path = ext4_ext_insert_extent(handle, inode, path, &amp;newex, flags);</div><div class='add'>+	if (!IS_ERR(path))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	err = PTR_ERR(path);</div><div class='add'>+	if (err != -ENOSPC &amp;&amp; err != -EDQUOT &amp;&amp; err != -ENOMEM)</div><div class='add'>+		return path;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get a new path to try to zeroout or fix the extent length.</div><div class='add'>+	 * Using EXT4_EX_NOFAIL guarantees that ext4_find_extent()</div><div class='add'>+	 * will not return -ENOMEM, otherwise -ENOMEM will cause a</div><div class='add'>+	 * retry in do_writepages(), and a WARN_ON may be triggered</div><div class='add'>+	 * in ext4_da_update_reserve_space() due to an incorrect</div><div class='add'>+	 * ee_len causing the i_reserved_data_blocks exception.</div><div class='add'>+	 */</div><div class='add'>+	path = ext4_find_extent(inode, ee_block, NULL, flags | EXT4_EX_NOFAIL);</div><div class='add'>+	if (IS_ERR(path)) {</div><div class='add'>+		EXT4_ERROR_INODE(inode, "Failed split extent on %u, err %ld",</div><div class='add'>+				 split, PTR_ERR(path));</div><div class='add'>+		return path;</div><div class='add'>+	}</div><div class='add'>+	depth = ext_depth(inode);</div><div class='add'>+	ex = path[depth].p_ext;</div><div class='add'>+</div><div class='ctx'> 	if (EXT4_EXT_MAY_ZEROOUT &amp; split_flag) {</div><div class='ctx'> 		if (split_flag &amp; (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {</div><div class='ctx'> 			if (split_flag &amp; EXT4_EXT_DATA_VALID1) {</div><div class='hunk'>@@ -3304,14 +3327,17 @@ fix_extent_len:</div><div class='ctx'> 	 * and err is a non-zero error code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ext4_ext_dirty(handle, inode, path + path-&gt;p_depth);</div><div class='del'>-	return err;</div><div class='ctx'> out:</div><div class='add'>+	if (err) {</div><div class='add'>+		ext4_free_ext_path(path);</div><div class='add'>+		path = ERR_PTR(err);</div><div class='add'>+	}</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='del'>-	return err;</div><div class='add'>+	return path;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ext4_split_extents() splits an extent and mark extent which is covered</div><div class='add'>+ * ext4_split_extent() splits an extent and mark extent which is covered</div><div class='ctx'>  * by @map as split_flags indicates</div><div class='ctx'>  *</div><div class='ctx'>  * It may result in splitting the extent into multiple extents (up to three)</div><div class='hunk'>@@ -3321,21 +3347,18 @@ out:</div><div class='ctx'>  *   c&gt; Splits in three extents: Somone is splitting in middle of the extent</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int ext4_split_extent(handle_t *handle,</div><div class='del'>-			      struct inode *inode,</div><div class='del'>-			      struct ext4_ext_path **ppath,</div><div class='del'>-			      struct ext4_map_blocks *map,</div><div class='del'>-			      int split_flag,</div><div class='del'>-			      int flags)</div><div class='add'>+static struct ext4_ext_path *ext4_split_extent(handle_t *handle,</div><div class='add'>+					       struct inode *inode,</div><div class='add'>+					       struct ext4_ext_path *path,</div><div class='add'>+					       struct ext4_map_blocks *map,</div><div class='add'>+					       int split_flag, int flags,</div><div class='add'>+					       unsigned int *allocated)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	ext4_lblk_t ee_block;</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='ctx'> 	unsigned int ee_len, depth;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	int unwritten;</div><div class='ctx'> 	int split_flag1, flags1;</div><div class='del'>-	int allocated = map-&gt;m_len;</div><div class='ctx'> </div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='ctx'> 	ex = path[depth].p_ext;</div><div class='hunk'>@@ -3345,34 +3368,33 @@ static int ext4_split_extent(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	if (map-&gt;m_lblk + map-&gt;m_len &lt; ee_block + ee_len) {</div><div class='ctx'> 		split_flag1 = split_flag &amp; EXT4_EXT_MAY_ZEROOUT;</div><div class='del'>-		flags1 = flags | EXT4_GET_BLOCKS_PRE_IO;</div><div class='add'>+		flags1 = flags | EXT4_GET_BLOCKS_SPLIT_NOMERGE;</div><div class='ctx'> 		if (unwritten)</div><div class='ctx'> 			split_flag1 |= EXT4_EXT_MARK_UNWRIT1 |</div><div class='ctx'> 				       EXT4_EXT_MARK_UNWRIT2;</div><div class='ctx'> 		if (split_flag &amp; EXT4_EXT_DATA_VALID2)</div><div class='ctx'> 			split_flag1 |= EXT4_EXT_DATA_VALID1;</div><div class='del'>-		err = ext4_split_extent_at(handle, inode, ppath,</div><div class='add'>+		path = ext4_split_extent_at(handle, inode, path,</div><div class='ctx'> 				map-&gt;m_lblk + map-&gt;m_len, split_flag1, flags1);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	} else {</div><div class='del'>-		allocated = ee_len - (map-&gt;m_lblk - ee_block);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Update path is required because previous ext4_split_extent_at() may</div><div class='del'>-	 * result in split of original leaf or extent zeroout.</div><div class='del'>-	 */</div><div class='del'>-	path = ext4_find_extent(inode, map-&gt;m_lblk, ppath, flags);</div><div class='del'>-	if (IS_ERR(path))</div><div class='del'>-		return PTR_ERR(path);</div><div class='del'>-	depth = ext_depth(inode);</div><div class='del'>-	ex = path[depth].p_ext;</div><div class='del'>-	if (!ex) {</div><div class='del'>-		EXT4_ERROR_INODE(inode, "unexpected hole at %lu",</div><div class='del'>-				 (unsigned long) map-&gt;m_lblk);</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='add'>+		/*</div><div class='add'>+		 * Update path is required because previous ext4_split_extent_at</div><div class='add'>+		 * may result in split of original leaf or extent zeroout.</div><div class='add'>+		 */</div><div class='add'>+		path = ext4_find_extent(inode, map-&gt;m_lblk, path, flags);</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='add'>+		depth = ext_depth(inode);</div><div class='add'>+		ex = path[depth].p_ext;</div><div class='add'>+		if (!ex) {</div><div class='add'>+			EXT4_ERROR_INODE(inode, "unexpected hole at %lu",</div><div class='add'>+					(unsigned long) map-&gt;m_lblk);</div><div class='add'>+			ext4_free_ext_path(path);</div><div class='add'>+			return ERR_PTR(-EFSCORRUPTED);</div><div class='add'>+		}</div><div class='add'>+		unwritten = ext4_ext_is_unwritten(ex);</div><div class='ctx'> 	}</div><div class='del'>-	unwritten = ext4_ext_is_unwritten(ex);</div><div class='ctx'> </div><div class='ctx'> 	if (map-&gt;m_lblk &gt;= ee_block) {</div><div class='ctx'> 		split_flag1 = split_flag &amp; EXT4_EXT_DATA_VALID2;</div><div class='hunk'>@@ -3381,15 +3403,20 @@ static int ext4_split_extent(handle_t *handle,</div><div class='ctx'> 			split_flag1 |= split_flag &amp; (EXT4_EXT_MAY_ZEROOUT |</div><div class='ctx'> 						     EXT4_EXT_MARK_UNWRIT2);</div><div class='ctx'> 		}</div><div class='del'>-		err = ext4_split_extent_at(handle, inode, ppath,</div><div class='add'>+		path = ext4_split_extent_at(handle, inode, path,</div><div class='ctx'> 				map-&gt;m_lblk, split_flag1, flags);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (allocated) {</div><div class='add'>+		if (map-&gt;m_lblk + map-&gt;m_len &gt; ee_block + ee_len)</div><div class='add'>+			*allocated = ee_len - (map-&gt;m_lblk - ee_block);</div><div class='add'>+		else</div><div class='add'>+			*allocated = map-&gt;m_len;</div><div class='add'>+	}</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='del'>-out:</div><div class='del'>-	return err ? err : allocated;</div><div class='add'>+	return path;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3412,13 +3439,11 @@ out:</div><div class='ctx'>  *    that are allocated and initialized.</div><div class='ctx'>  *    It is guaranteed to be &gt;= map-&gt;m_len.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='del'>-					   struct inode *inode,</div><div class='del'>-					   struct ext4_map_blocks *map,</div><div class='del'>-					   struct ext4_ext_path **ppath,</div><div class='del'>-					   int flags)</div><div class='add'>+static struct ext4_ext_path *</div><div class='add'>+ext4_ext_convert_to_initialized(handle_t *handle, struct inode *inode,</div><div class='add'>+			struct ext4_map_blocks *map, struct ext4_ext_path *path,</div><div class='add'>+			int flags, unsigned int *allocated)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	struct ext4_sb_info *sbi;</div><div class='ctx'> 	struct ext4_extent_header *eh;</div><div class='ctx'> 	struct ext4_map_blocks split_map;</div><div class='hunk'>@@ -3426,9 +3451,9 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 	struct ext4_extent *ex, *abut_ex;</div><div class='ctx'> 	ext4_lblk_t ee_block, eof_block;</div><div class='ctx'> 	unsigned int ee_len, depth, map_len = map-&gt;m_len;</div><div class='del'>-	int allocated = 0, max_zeroout = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int split_flag = EXT4_EXT_DATA_VALID2;</div><div class='add'>+	unsigned int max_zeroout = 0;</div><div class='ctx'> </div><div class='ctx'> 	ext_debug(inode, "logical block %llu, max_blocks %u\n",</div><div class='ctx'> 		  (unsigned long long)map-&gt;m_lblk, map_len);</div><div class='hunk'>@@ -3468,6 +3493,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 	 *  - L2: we only attempt to merge with an extent stored in the</div><div class='ctx'> 	 *    same extent tree node.</div><div class='ctx'> 	 */</div><div class='add'>+	*allocated = 0;</div><div class='ctx'> 	if ((map-&gt;m_lblk == ee_block) &amp;&amp;</div><div class='ctx'> 		/* See if we can merge left */</div><div class='ctx'> 		(map_len &lt; ee_len) &amp;&amp;		/*L1*/</div><div class='hunk'>@@ -3497,7 +3523,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 			(prev_len &lt; (EXT_INIT_MAX_LEN - map_len))) {	/*C4*/</div><div class='ctx'> 			err = ext4_ext_get_access(handle, inode, path + depth);</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+				goto errout;</div><div class='ctx'> </div><div class='ctx'> 			trace_ext4_ext_convert_to_initialized_fastpath(inode,</div><div class='ctx'> 				map, ex, abut_ex);</div><div class='hunk'>@@ -3512,7 +3538,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 			abut_ex-&gt;ee_len = cpu_to_le16(prev_len + map_len);</div><div class='ctx'> </div><div class='ctx'> 			/* Result: number of initialized blocks past m_lblk */</div><div class='del'>-			allocated = map_len;</div><div class='add'>+			*allocated = map_len;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (((map-&gt;m_lblk + map_len) == (ee_block + ee_len)) &amp;&amp;</div><div class='ctx'> 		   (map_len &lt; ee_len) &amp;&amp;	/*L1*/</div><div class='hunk'>@@ -3543,7 +3569,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 		    (next_len &lt; (EXT_INIT_MAX_LEN - map_len))) {	/*C4*/</div><div class='ctx'> 			err = ext4_ext_get_access(handle, inode, path + depth);</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+				goto errout;</div><div class='ctx'> </div><div class='ctx'> 			trace_ext4_ext_convert_to_initialized_fastpath(inode,</div><div class='ctx'> 				map, ex, abut_ex);</div><div class='hunk'>@@ -3558,18 +3584,20 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 			abut_ex-&gt;ee_len = cpu_to_le16(next_len + map_len);</div><div class='ctx'> </div><div class='ctx'> 			/* Result: number of initialized blocks past m_lblk */</div><div class='del'>-			allocated = map_len;</div><div class='add'>+			*allocated = map_len;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (allocated) {</div><div class='add'>+	if (*allocated) {</div><div class='ctx'> 		/* Mark the block containing both extents as dirty */</div><div class='ctx'> 		err = ext4_ext_dirty(handle, inode, path + depth);</div><div class='ctx'> </div><div class='ctx'> 		/* Update path to point to the right extent */</div><div class='ctx'> 		path[depth].p_ext = abut_ex;</div><div class='add'>+		if (err)</div><div class='add'>+			goto errout;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	} else</div><div class='del'>-		allocated = ee_len - (map-&gt;m_lblk - ee_block);</div><div class='add'>+		*allocated = ee_len - (map-&gt;m_lblk - ee_block);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(map-&gt;m_lblk &lt; ee_block);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3596,21 +3624,21 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> 	split_map.m_lblk = map-&gt;m_lblk;</div><div class='ctx'> 	split_map.m_len = map-&gt;m_len;</div><div class='ctx'> </div><div class='del'>-	if (max_zeroout &amp;&amp; (allocated &gt; split_map.m_len)) {</div><div class='del'>-		if (allocated &lt;= max_zeroout) {</div><div class='add'>+	if (max_zeroout &amp;&amp; (*allocated &gt; split_map.m_len)) {</div><div class='add'>+		if (*allocated &lt;= max_zeroout) {</div><div class='ctx'> 			/* case 3 or 5 */</div><div class='ctx'> 			zero_ex1.ee_block =</div><div class='ctx'> 				 cpu_to_le32(split_map.m_lblk +</div><div class='ctx'> 					     split_map.m_len);</div><div class='ctx'> 			zero_ex1.ee_len =</div><div class='del'>-				cpu_to_le16(allocated - split_map.m_len);</div><div class='add'>+				cpu_to_le16(*allocated - split_map.m_len);</div><div class='ctx'> 			ext4_ext_store_pblock(&amp;zero_ex1,</div><div class='ctx'> 				ext4_ext_pblock(ex) + split_map.m_lblk +</div><div class='ctx'> 				split_map.m_len - ee_block);</div><div class='ctx'> 			err = ext4_ext_zeroout(inode, &amp;zero_ex1);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto fallback;</div><div class='del'>-			split_map.m_len = allocated;</div><div class='add'>+			split_map.m_len = *allocated;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (split_map.m_lblk - ee_block + split_map.m_len &lt;</div><div class='ctx'> 								max_zeroout) {</div><div class='hunk'>@@ -3628,22 +3656,24 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 			split_map.m_len += split_map.m_lblk - ee_block;</div><div class='ctx'> 			split_map.m_lblk = ee_block;</div><div class='del'>-			allocated = map-&gt;m_len;</div><div class='add'>+			*allocated = map-&gt;m_len;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> fallback:</div><div class='del'>-	err = ext4_split_extent(handle, inode, ppath, &amp;split_map, split_flag,</div><div class='del'>-				flags);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		err = 0;</div><div class='add'>+	path = ext4_split_extent(handle, inode, path, &amp;split_map, split_flag,</div><div class='add'>+				 flags, NULL);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return path;</div><div class='ctx'> out:</div><div class='ctx'> 	/* If we have gotten a failure, don't zero out status tree */</div><div class='del'>-	if (!err) {</div><div class='del'>-		ext4_zeroout_es(inode, &amp;zero_ex1);</div><div class='del'>-		ext4_zeroout_es(inode, &amp;zero_ex2);</div><div class='del'>-	}</div><div class='del'>-	return err ? err : allocated;</div><div class='add'>+	ext4_zeroout_es(inode, &amp;zero_ex1);</div><div class='add'>+	ext4_zeroout_es(inode, &amp;zero_ex2);</div><div class='add'>+	return path;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3668,15 +3698,16 @@ out:</div><div class='ctx'>  * being filled will be convert to initialized by the end_io callback function</div><div class='ctx'>  * via ext4_convert_unwritten_extents().</div><div class='ctx'>  *</div><div class='del'>- * Returns the size of unwritten extent to be written on success.</div><div class='add'>+ * The size of unwritten extent to be written is passed to the caller via the</div><div class='add'>+ * allocated pointer. Return an extent path pointer on success, or an error</div><div class='add'>+ * pointer on failure.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_split_convert_extents(handle_t *handle,</div><div class='add'>+static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle,</div><div class='ctx'> 					struct inode *inode,</div><div class='ctx'> 					struct ext4_map_blocks *map,</div><div class='del'>-					struct ext4_ext_path **ppath,</div><div class='del'>-					int flags)</div><div class='add'>+					struct ext4_ext_path *path,</div><div class='add'>+					int flags, unsigned int *allocated)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	ext4_lblk_t eof_block;</div><div class='ctx'> 	ext4_lblk_t ee_block;</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='hunk'>@@ -3690,10 +3721,6 @@ static int ext4_split_convert_extents(handle_t *handle,</div><div class='ctx'> 			&gt;&gt; inode-&gt;i_sb-&gt;s_blocksize_bits;</div><div class='ctx'> 	if (eof_block &lt; map-&gt;m_lblk + map-&gt;m_len)</div><div class='ctx'> 		eof_block = map-&gt;m_lblk + map-&gt;m_len;</div><div class='del'>-	/*</div><div class='del'>-	 * It is safe to convert extent to initialized via explicit</div><div class='del'>-	 * zeroout only if extent is fully inside i_size or new_size.</div><div class='del'>-	 */</div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='ctx'> 	ex = path[depth].p_ext;</div><div class='ctx'> 	ee_block = le32_to_cpu(ex-&gt;ee_block);</div><div class='hunk'>@@ -3704,20 +3731,24 @@ static int ext4_split_convert_extents(handle_t *handle,</div><div class='ctx'> 		split_flag |= EXT4_EXT_DATA_VALID1;</div><div class='ctx'> 	/* Convert to initialized */</div><div class='ctx'> 	} else if (flags &amp; EXT4_GET_BLOCKS_CONVERT) {</div><div class='add'>+		/*</div><div class='add'>+		 * It is safe to convert extent to initialized via explicit</div><div class='add'>+		 * zeroout only if extent is fully inside i_size or new_size.</div><div class='add'>+		 */</div><div class='ctx'> 		split_flag |= ee_block + ee_len &lt;= eof_block ?</div><div class='ctx'> 			      EXT4_EXT_MAY_ZEROOUT : 0;</div><div class='ctx'> 		split_flag |= (EXT4_EXT_MARK_UNWRIT2 | EXT4_EXT_DATA_VALID2);</div><div class='ctx'> 	}</div><div class='del'>-	flags |= EXT4_GET_BLOCKS_PRE_IO;</div><div class='del'>-	return ext4_split_extent(handle, inode, ppath, map, split_flag, flags);</div><div class='add'>+	flags |= EXT4_GET_BLOCKS_SPLIT_NOMERGE;</div><div class='add'>+	return ext4_split_extent(handle, inode, path, map, split_flag, flags,</div><div class='add'>+				 allocated);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_convert_unwritten_extents_endio(handle_t *handle,</div><div class='del'>-						struct inode *inode,</div><div class='del'>-						struct ext4_map_blocks *map,</div><div class='del'>-						struct ext4_ext_path **ppath)</div><div class='add'>+static struct ext4_ext_path *</div><div class='add'>+ext4_convert_unwritten_extents_endio(handle_t *handle, struct inode *inode,</div><div class='add'>+				     struct ext4_map_blocks *map,</div><div class='add'>+				     struct ext4_ext_path *path)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='ctx'> 	ext4_lblk_t ee_block;</div><div class='ctx'> 	unsigned int ee_len;</div><div class='hunk'>@@ -3745,20 +3776,21 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,</div><div class='ctx'> 			     inode-&gt;i_ino, (unsigned long long)ee_block, ee_len,</div><div class='ctx'> 			     (unsigned long long)map-&gt;m_lblk, map-&gt;m_len);</div><div class='ctx'> #endif</div><div class='del'>-		err = ext4_split_convert_extents(handle, inode, map, ppath,</div><div class='del'>-						 EXT4_GET_BLOCKS_CONVERT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		path = ext4_find_extent(inode, map-&gt;m_lblk, ppath, 0);</div><div class='add'>+		path = ext4_split_convert_extents(handle, inode, map, path,</div><div class='add'>+						EXT4_GET_BLOCKS_CONVERT, NULL);</div><div class='ctx'> 		if (IS_ERR(path))</div><div class='del'>-			return PTR_ERR(path);</div><div class='add'>+			return path;</div><div class='add'>+</div><div class='add'>+		path = ext4_find_extent(inode, map-&gt;m_lblk, path, 0);</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='ctx'> 		depth = ext_depth(inode);</div><div class='ctx'> 		ex = path[depth].p_ext;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_ext_get_access(handle, inode, path + depth);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	/* first mark the extent as initialized */</div><div class='ctx'> 	ext4_ext_mark_initialized(ex);</div><div class='ctx'> </div><div class='hunk'>@@ -3769,18 +3801,23 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	/* Mark modified extent as dirty */</div><div class='ctx'> 	err = ext4_ext_dirty(handle, inode, path + path-&gt;p_depth);</div><div class='del'>-out:</div><div class='add'>+	if (err)</div><div class='add'>+		goto errout;</div><div class='add'>+</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='del'>-	return err;</div><div class='add'>+	return path;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static struct ext4_ext_path *</div><div class='ctx'> convert_initialized_extent(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			   struct ext4_map_blocks *map,</div><div class='del'>-			   struct ext4_ext_path **ppath,</div><div class='add'>+			   struct ext4_ext_path *path,</div><div class='ctx'> 			   unsigned int *allocated)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = *ppath;</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='ctx'> 	ext4_lblk_t ee_block;</div><div class='ctx'> 	unsigned int ee_len;</div><div class='hunk'>@@ -3803,25 +3840,27 @@ convert_initialized_extent(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		  (unsigned long long)ee_block, ee_len);</div><div class='ctx'> </div><div class='ctx'> 	if (ee_block != map-&gt;m_lblk || ee_len &gt; map-&gt;m_len) {</div><div class='del'>-		err = ext4_split_convert_extents(handle, inode, map, ppath,</div><div class='del'>-				EXT4_GET_BLOCKS_CONVERT_UNWRITTEN);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		path = ext4_find_extent(inode, map-&gt;m_lblk, ppath, 0);</div><div class='add'>+		path = ext4_split_convert_extents(handle, inode, map, path,</div><div class='add'>+				EXT4_GET_BLOCKS_CONVERT_UNWRITTEN, NULL);</div><div class='ctx'> 		if (IS_ERR(path))</div><div class='del'>-			return PTR_ERR(path);</div><div class='add'>+			return path;</div><div class='add'>+</div><div class='add'>+		path = ext4_find_extent(inode, map-&gt;m_lblk, path, 0);</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='ctx'> 		depth = ext_depth(inode);</div><div class='ctx'> 		ex = path[depth].p_ext;</div><div class='ctx'> 		if (!ex) {</div><div class='ctx'> 			EXT4_ERROR_INODE(inode, "unexpected hole at %lu",</div><div class='ctx'> 					 (unsigned long) map-&gt;m_lblk);</div><div class='del'>-			return -EFSCORRUPTED;</div><div class='add'>+			err = -EFSCORRUPTED;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_ext_get_access(handle, inode, path + depth);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	/* first mark the extent as unwritten */</div><div class='ctx'> 	ext4_ext_mark_unwritten(ex);</div><div class='ctx'> </div><div class='hunk'>@@ -3833,7 +3872,7 @@ convert_initialized_extent(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	/* Mark modified extent as dirty */</div><div class='ctx'> 	err = ext4_ext_dirty(handle, inode, path + path-&gt;p_depth);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='ctx'> </div><div class='ctx'> 	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='hunk'>@@ -3842,22 +3881,24 @@ convert_initialized_extent(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	if (*allocated &gt; map-&gt;m_len)</div><div class='ctx'> 		*allocated = map-&gt;m_len;</div><div class='ctx'> 	map-&gt;m_len = *allocated;</div><div class='del'>-	return 0;</div><div class='add'>+	return path;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static struct ext4_ext_path *</div><div class='ctx'> ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			struct ext4_map_blocks *map,</div><div class='del'>-			struct ext4_ext_path **ppath, int flags,</div><div class='del'>-			unsigned int allocated, ext4_fsblk_t newblock)</div><div class='add'>+			struct ext4_ext_path *path, int flags,</div><div class='add'>+			unsigned int *allocated, ext4_fsblk_t newblock)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path __maybe_unused *path = *ppath;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	ext_debug(inode, "logical block %llu, max_blocks %u, flags 0x%x, allocated %u\n",</div><div class='ctx'> 		  (unsigned long long)map-&gt;m_lblk, map-&gt;m_len, flags,</div><div class='del'>-		  allocated);</div><div class='add'>+		  *allocated);</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3867,36 +3908,34 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	flags |= EXT4_GET_BLOCKS_METADATA_NOFAIL;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_ext_handle_unwritten_extents(inode, map, flags,</div><div class='del'>-						    allocated, newblock);</div><div class='add'>+						*allocated, newblock);</div><div class='ctx'> </div><div class='ctx'> 	/* get_block() before submitting IO, split the extent */</div><div class='del'>-	if (flags &amp; EXT4_GET_BLOCKS_PRE_IO) {</div><div class='del'>-		ret = ext4_split_convert_extents(handle, inode, map, ppath,</div><div class='del'>-					 flags | EXT4_GET_BLOCKS_CONVERT);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			err = ret;</div><div class='del'>-			goto out2;</div><div class='del'>-		}</div><div class='add'>+	if (flags &amp; EXT4_GET_BLOCKS_SPLIT_NOMERGE) {</div><div class='add'>+		path = ext4_split_convert_extents(handle, inode, map, path,</div><div class='add'>+				flags | EXT4_GET_BLOCKS_CONVERT, allocated);</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='ctx'> 		/*</div><div class='del'>-		 * shouldn't get a 0 return when splitting an extent unless</div><div class='add'>+		 * shouldn't get a 0 allocated when splitting an extent unless</div><div class='ctx'> 		 * m_len is 0 (bug) or extent has been corrupted</div><div class='ctx'> 		 */</div><div class='del'>-		if (unlikely(ret == 0)) {</div><div class='add'>+		if (unlikely(*allocated == 0)) {</div><div class='ctx'> 			EXT4_ERROR_INODE(inode,</div><div class='del'>-					 "unexpected ret == 0, m_len = %u",</div><div class='add'>+					 "unexpected allocated == 0, m_len = %u",</div><div class='ctx'> 					 map-&gt;m_len);</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='del'>-			goto out2;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		}</div><div class='ctx'> 		map-&gt;m_flags |= EXT4_MAP_UNWRITTEN;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* IO end_io complete, convert the filled extent to written */</div><div class='ctx'> 	if (flags &amp; EXT4_GET_BLOCKS_CONVERT) {</div><div class='del'>-		err = ext4_convert_unwritten_extents_endio(handle, inode, map,</div><div class='del'>-							   ppath);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out2;</div><div class='add'>+		path = ext4_convert_unwritten_extents_endio(handle, inode,</div><div class='add'>+							    map, path);</div><div class='add'>+		if (IS_ERR(path))</div><div class='add'>+			return path;</div><div class='ctx'> 		ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> 		goto map_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3928,36 +3967,37 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	 * For buffered writes, at writepage time, etc.  Convert a</div><div class='ctx'> 	 * discovered unwritten extent to written.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ext4_ext_convert_to_initialized(handle, inode, map, ppath, flags);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		err = ret;</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='add'>+	path = ext4_ext_convert_to_initialized(handle, inode, map, path,</div><div class='add'>+					       flags, allocated);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return path;</div><div class='ctx'> 	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> 	/*</div><div class='del'>-	 * shouldn't get a 0 return when converting an unwritten extent</div><div class='add'>+	 * shouldn't get a 0 allocated when converting an unwritten extent</div><div class='ctx'> 	 * unless m_len is 0 (bug) or extent has been corrupted</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(ret == 0)) {</div><div class='del'>-		EXT4_ERROR_INODE(inode, "unexpected ret == 0, m_len = %u",</div><div class='add'>+	if (unlikely(*allocated == 0)) {</div><div class='add'>+		EXT4_ERROR_INODE(inode, "unexpected allocated == 0, m_len = %u",</div><div class='ctx'> 				 map-&gt;m_len);</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		goto out2;</div><div class='add'>+		goto errout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	allocated = ret;</div><div class='ctx'> 	map-&gt;m_flags |= EXT4_MAP_NEW;</div><div class='ctx'> map_out:</div><div class='ctx'> 	map-&gt;m_flags |= EXT4_MAP_MAPPED;</div><div class='ctx'> out1:</div><div class='ctx'> 	map-&gt;m_pblk = newblock;</div><div class='del'>-	if (allocated &gt; map-&gt;m_len)</div><div class='del'>-		allocated = map-&gt;m_len;</div><div class='del'>-	map-&gt;m_len = allocated;</div><div class='add'>+	if (*allocated &gt; map-&gt;m_len)</div><div class='add'>+		*allocated = map-&gt;m_len;</div><div class='add'>+	map-&gt;m_len = *allocated;</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='del'>-out2:</div><div class='del'>-	return err ? err : allocated;</div><div class='add'>+	return path;</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4062,6 +4102,73 @@ static int get_implied_cluster_alloc(struct super_block *sb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Determine hole length around the given logical block, first try to</div><div class='add'>+ * locate and expand the hole from the given @path, and then adjust it</div><div class='add'>+ * if it's partially or completely converted to delayed extents, insert</div><div class='add'>+ * it into the extent cache tree if it's indeed a hole, finally return</div><div class='add'>+ * the length of the determined extent.</div><div class='add'>+ */</div><div class='add'>+static ext4_lblk_t ext4_ext_determine_insert_hole(struct inode *inode,</div><div class='add'>+						  struct ext4_ext_path *path,</div><div class='add'>+						  ext4_lblk_t lblk)</div><div class='add'>+{</div><div class='add'>+	ext4_lblk_t hole_start, len;</div><div class='add'>+	struct extent_status es;</div><div class='add'>+</div><div class='add'>+	hole_start = lblk;</div><div class='add'>+	len = ext4_ext_find_hole(inode, path, &amp;hole_start);</div><div class='add'>+again:</div><div class='add'>+	ext4_es_find_extent_range(inode, &amp;ext4_es_is_delayed, hole_start,</div><div class='add'>+				  hole_start + len - 1, &amp;es);</div><div class='add'>+	if (!es.es_len)</div><div class='add'>+		goto insert_hole;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's a delalloc extent in the hole, handle it if the delalloc</div><div class='add'>+	 * extent is in front of, behind and straddle the queried range.</div><div class='add'>+	 */</div><div class='add'>+	if (lblk &gt;= es.es_lblk + es.es_len) {</div><div class='add'>+		/*</div><div class='add'>+		 * The delalloc extent is in front of the queried range,</div><div class='add'>+		 * find again from the queried start block.</div><div class='add'>+		 */</div><div class='add'>+		len -= lblk - hole_start;</div><div class='add'>+		hole_start = lblk;</div><div class='add'>+		goto again;</div><div class='add'>+	} else if (in_range(lblk, es.es_lblk, es.es_len)) {</div><div class='add'>+		/*</div><div class='add'>+		 * The delalloc extent containing lblk, it must have been</div><div class='add'>+		 * added after ext4_map_blocks() checked the extent status</div><div class='add'>+		 * tree so we are not holding i_rwsem and delalloc info is</div><div class='add'>+		 * only stabilized by i_data_sem we are going to release</div><div class='add'>+		 * soon. Don't modify the extent status tree and report</div><div class='add'>+		 * extent as a hole, just adjust the length to the delalloc</div><div class='add'>+		 * extent's after lblk.</div><div class='add'>+		 */</div><div class='add'>+		len = es.es_lblk + es.es_len - lblk;</div><div class='add'>+		return len;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * The delalloc extent is partially or completely behind</div><div class='add'>+		 * the queried range, update hole length until the</div><div class='add'>+		 * beginning of the delalloc extent.</div><div class='add'>+		 */</div><div class='add'>+		len = min(es.es_lblk - hole_start, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+insert_hole:</div><div class='add'>+	/* Put just found gap into cache to speed up subsequent requests */</div><div class='add'>+	ext_debug(inode, " -&gt; %u:%u\n", hole_start, len);</div><div class='add'>+	ext4_es_insert_extent(inode, hole_start, len, ~0,</div><div class='add'>+			      EXTENT_STATUS_HOLE, false);</div><div class='add'>+</div><div class='add'>+	/* Update hole_len to reflect hole size after lblk */</div><div class='add'>+	if (hole_start != lblk)</div><div class='add'>+		len -= lblk - hole_start;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Block allocation/map/preallocation routine for extents based files</div><div class='hunk'>@@ -4069,10 +4176,10 @@ static int get_implied_cluster_alloc(struct super_block *sb,</div><div class='ctx'>  *</div><div class='ctx'>  * Need to be called with</div><div class='ctx'>  * down_read(&amp;EXT4_I(inode)-&gt;i_data_sem) if not allocating file system block</div><div class='del'>- * (ie, create is zero). Otherwise down_write(&amp;EXT4_I(inode)-&gt;i_data_sem)</div><div class='add'>+ * (ie, flags is zero). Otherwise down_write(&amp;EXT4_I(inode)-&gt;i_data_sem)</div><div class='ctx'>  *</div><div class='ctx'>  * return &gt; 0, number of blocks already mapped/allocated</div><div class='del'>- *          if create == 0 and these are pre-allocated blocks</div><div class='add'>+ *          if flags doesn't contain EXT4_GET_BLOCKS_CREATE and these are pre-allocated blocks</div><div class='ctx'>  *          	buffer head is unmapped</div><div class='ctx'>  *          otherwise blocks are mapped</div><div class='ctx'>  *</div><div class='hunk'>@@ -4088,7 +4195,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	struct ext4_extent newex, *ex, ex2;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	ext4_fsblk_t newblock = 0, pblk;</div><div class='del'>-	int err = 0, depth, ret;</div><div class='add'>+	int err = 0, depth;</div><div class='ctx'> 	unsigned int allocated = 0, offset = 0;</div><div class='ctx'> 	unsigned int allocated_clusters = 0;</div><div class='ctx'> 	struct ext4_allocation_request ar;</div><div class='hunk'>@@ -4098,10 +4205,9 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	trace_ext4_ext_map_blocks_enter(inode, map-&gt;m_lblk, map-&gt;m_len, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* find extent for this block */</div><div class='del'>-	path = ext4_find_extent(inode, map-&gt;m_lblk, NULL, 0);</div><div class='add'>+	path = ext4_find_extent(inode, map-&gt;m_lblk, NULL, flags);</div><div class='ctx'> 	if (IS_ERR(path)) {</div><div class='ctx'> 		err = PTR_ERR(path);</div><div class='del'>-		path = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4150,8 +4256,10 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if ((!ext4_ext_is_unwritten(ex)) &amp;&amp;</div><div class='ctx'> 			    (flags &amp; EXT4_GET_BLOCKS_CONVERT_UNWRITTEN)) {</div><div class='del'>-				err = convert_initialized_extent(handle,</div><div class='del'>-					inode, map, &amp;path, &amp;allocated);</div><div class='add'>+				path = convert_initialized_extent(handle,</div><div class='add'>+					inode, map, path, &amp;allocated);</div><div class='add'>+				if (IS_ERR(path))</div><div class='add'>+					err = PTR_ERR(path);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			} else if (!ext4_ext_is_unwritten(ex)) {</div><div class='ctx'> 				map-&gt;m_flags |= EXT4_MAP_MAPPED;</div><div class='hunk'>@@ -4163,38 +4271,26 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = ext4_ext_handle_unwritten_extents(</div><div class='del'>-				handle, inode, map, &amp;path, flags,</div><div class='del'>-				allocated, newblock);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				err = ret;</div><div class='del'>-			else</div><div class='del'>-				allocated = ret;</div><div class='add'>+			path = ext4_ext_handle_unwritten_extents(</div><div class='add'>+				handle, inode, map, path, flags,</div><div class='add'>+				&amp;allocated, newblock);</div><div class='add'>+			if (IS_ERR(path))</div><div class='add'>+				err = PTR_ERR(path);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * requested block isn't allocated yet;</div><div class='del'>-	 * we couldn't try to create block if create flag is zero</div><div class='add'>+	 * we couldn't try to create block if flags doesn't contain EXT4_GET_BLOCKS_CREATE</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((flags &amp; EXT4_GET_BLOCKS_CREATE) == 0) {</div><div class='del'>-		ext4_lblk_t hole_start, hole_len;</div><div class='add'>+		ext4_lblk_t len;</div><div class='ctx'> </div><div class='del'>-		hole_start = map-&gt;m_lblk;</div><div class='del'>-		hole_len = ext4_ext_determine_hole(inode, path, &amp;hole_start);</div><div class='del'>-		/*</div><div class='del'>-		 * put just found gap into cache to speed up</div><div class='del'>-		 * subsequent requests</div><div class='del'>-		 */</div><div class='del'>-		ext4_ext_put_gap_in_cache(inode, hole_start, hole_len);</div><div class='add'>+		len = ext4_ext_determine_insert_hole(inode, path, map-&gt;m_lblk);</div><div class='ctx'> </div><div class='del'>-		/* Update hole_len to reflect hole size after map-&gt;m_lblk */</div><div class='del'>-		if (hole_start != map-&gt;m_lblk)</div><div class='del'>-			hole_len -= map-&gt;m_lblk - hole_start;</div><div class='ctx'> 		map-&gt;m_pblk = 0;</div><div class='del'>-		map-&gt;m_len = min_t(unsigned int, map-&gt;m_len, hole_len);</div><div class='del'>-</div><div class='add'>+		map-&gt;m_len = min_t(unsigned int, map-&gt;m_len, len);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4221,7 +4317,8 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ar.lright = map-&gt;m_lblk;</div><div class='del'>-	err = ext4_ext_search_right(inode, path, &amp;ar.lright, &amp;ar.pright, &amp;ex2);</div><div class='add'>+	err = ext4_ext_search_right(inode, path, &amp;ar.lright, &amp;ar.pright,</div><div class='add'>+				    &amp;ex2, flags);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -4231,6 +4328,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	    get_implied_cluster_alloc(inode-&gt;i_sb, map, &amp;ex2, path)) {</div><div class='ctx'> 		ar.len = allocated = map-&gt;m_len;</div><div class='ctx'> 		newblock = map-&gt;m_pblk;</div><div class='add'>+		err = 0;</div><div class='ctx'> 		goto got_allocated_blocks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4303,8 +4401,9 @@ got_allocated_blocks:</div><div class='ctx'> 		map-&gt;m_flags |= EXT4_MAP_UNWRITTEN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ext4_ext_insert_extent(handle, inode, &amp;path, &amp;newex, flags);</div><div class='del'>-	if (err) {</div><div class='add'>+	path = ext4_ext_insert_extent(handle, inode, path, &amp;newex, flags);</div><div class='add'>+	if (IS_ERR(path)) {</div><div class='add'>+		err = PTR_ERR(path);</div><div class='ctx'> 		if (allocated_clusters) {</div><div class='ctx'> 			int fb_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4313,7 +4412,7 @@ got_allocated_blocks:</div><div class='ctx'> 			 * not a good idea to call discard here directly,</div><div class='ctx'> 			 * but otherwise we'd need to call it every free().</div><div class='ctx'> 			 */</div><div class='del'>-			ext4_discard_preallocations(inode, 0);</div><div class='add'>+			ext4_discard_preallocations(inode);</div><div class='ctx'> 			if (flags &amp; EXT4_GET_BLOCKS_DELALLOC_RESERVE)</div><div class='ctx'> 				fb_flags = EXT4_FREE_BLOCKS_NO_QUOT_UPDATE;</div><div class='ctx'> 			ext4_free_blocks(handle, inode, NULL, newblock,</div><div class='hunk'>@@ -4324,43 +4423,6 @@ got_allocated_blocks:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Reduce the reserved cluster count to reflect successful deferred</div><div class='del'>-	 * allocation of delayed allocated clusters or direct allocation of</div><div class='del'>-	 * clusters discovered to be delayed allocated.  Once allocated, a</div><div class='del'>-	 * cluster is not included in the reserved count.</div><div class='del'>-	 */</div><div class='del'>-	if (test_opt(inode-&gt;i_sb, DELALLOC) &amp;&amp; allocated_clusters) {</div><div class='del'>-		if (flags &amp; EXT4_GET_BLOCKS_DELALLOC_RESERVE) {</div><div class='del'>-			/*</div><div class='del'>-			 * When allocating delayed allocated clusters, simply</div><div class='del'>-			 * reduce the reserved cluster count and claim quota</div><div class='del'>-			 */</div><div class='del'>-			ext4_da_update_reserve_space(inode, allocated_clusters,</div><div class='del'>-							1);</div><div class='del'>-		} else {</div><div class='del'>-			ext4_lblk_t lblk, len;</div><div class='del'>-			unsigned int n;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * When allocating non-delayed allocated clusters</div><div class='del'>-			 * (from fallocate, filemap, DIO, or clusters</div><div class='del'>-			 * allocated when delalloc has been disabled by</div><div class='del'>-			 * ext4_nonda_switch), reduce the reserved cluster</div><div class='del'>-			 * count by the number of allocated clusters that</div><div class='del'>-			 * have previously been delayed allocated.  Quota</div><div class='del'>-			 * has been claimed by ext4_mb_new_blocks() above,</div><div class='del'>-			 * so release the quota reservations made for any</div><div class='del'>-			 * previously delayed allocated clusters.</div><div class='del'>-			 */</div><div class='del'>-			lblk = EXT4_LBLK_CMASK(sbi, map-&gt;m_lblk);</div><div class='del'>-			len = allocated_clusters &lt;&lt; sbi-&gt;s_cluster_bits;</div><div class='del'>-			n = ext4_es_delayed_clu(inode, lblk, len);</div><div class='del'>-			if (n &gt; 0)</div><div class='del'>-				ext4_da_update_reserve_space(inode, (int) n, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Cache the extent and update transaction to commit on fdatasync only</div><div class='ctx'> 	 * when it is _not_ an unwritten extent.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -4375,6 +4437,20 @@ got_allocated_blocks:</div><div class='ctx'> 	allocated = map-&gt;m_len;</div><div class='ctx'> 	ext4_ext_show_leaf(inode, path);</div><div class='ctx'> out:</div><div class='add'>+	/*</div><div class='add'>+	 * We never use EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF with CREATE flag.</div><div class='add'>+	 * So we know that the depth used here is correct, since there was no</div><div class='add'>+	 * block allocation done if EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF is set.</div><div class='add'>+	 * If tomorrow we start using this QUERY flag with CREATE, then we will</div><div class='add'>+	 * need to re-calculate the depth as it might have changed due to block</div><div class='add'>+	 * allocation.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF) {</div><div class='add'>+		WARN_ON_ONCE(flags &amp; EXT4_GET_BLOCKS_CREATE);</div><div class='add'>+		if (!err &amp;&amp; ex &amp;&amp; (ex == EXT_LAST_EXTENT(path[depth].p_hdr)))</div><div class='add'>+			map-&gt;m_flags |= EXT4_MAP_QUERY_LAST_IN_LEAF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ext4_free_ext_path(path);</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_ext_map_blocks_exit(inode, flags, map,</div><div class='hunk'>@@ -4424,7 +4500,9 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,</div><div class='ctx'> 	int depth = 0;</div><div class='ctx'> 	struct ext4_map_blocks map;</div><div class='ctx'> 	unsigned int credits;</div><div class='del'>-	loff_t epos;</div><div class='add'>+	loff_t epos, old_size = i_size_read(inode);</div><div class='add'>+	unsigned int blkbits = inode-&gt;i_blkbits;</div><div class='add'>+	bool alloc_zero = false;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS));</div><div class='ctx'> 	map.m_lblk = offset;</div><div class='hunk'>@@ -4438,6 +4516,17 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,</div><div class='ctx'> 		flags |= EXT4_GET_BLOCKS_NO_NORMALIZE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Do the actual write zero during a running journal transaction</div><div class='add'>+	 * costs a lot. First allocate an unwritten extent and then</div><div class='add'>+	 * convert it to written after zeroing it out.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; EXT4_GET_BLOCKS_ZERO) {</div><div class='add'>+		flags &amp;= ~EXT4_GET_BLOCKS_ZERO;</div><div class='add'>+		flags |= EXT4_GET_BLOCKS_UNWRIT_EXT;</div><div class='add'>+		alloc_zero = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * credits to insert 1 extent into extent tree</div><div class='ctx'> 	 */</div><div class='ctx'> 	credits = ext4_chunk_trans_blocks(inode, len);</div><div class='hunk'>@@ -4473,9 +4562,7 @@ retry:</div><div class='ctx'> 		 * allow a full retry cycle for any remaining allocations</div><div class='ctx'> 		 */</div><div class='ctx'> 		retries = 0;</div><div class='del'>-		map.m_lblk += ret;</div><div class='del'>-		map.m_len = len = len - ret;</div><div class='del'>-		epos = (loff_t)map.m_lblk &lt;&lt; inode-&gt;i_blkbits;</div><div class='add'>+		epos = EXT4_LBLK_TO_B(inode, map.m_lblk + ret);</div><div class='ctx'> 		inode_set_ctime_current(inode);</div><div class='ctx'> 		if (new_size) {</div><div class='ctx'> 			if (epos &gt; new_size)</div><div class='hunk'>@@ -4483,6 +4570,11 @@ retry:</div><div class='ctx'> 			if (ext4_update_inode_size(inode, epos) &amp; 0x1)</div><div class='ctx'> 				inode_set_mtime_to_ts(inode,</div><div class='ctx'> 						      inode_get_ctime(inode));</div><div class='add'>+			if (epos &gt; old_size) {</div><div class='add'>+				pagecache_isize_extended(inode, old_size, epos);</div><div class='add'>+				ext4_zero_partial_blocks(handle, inode,</div><div class='add'>+						     old_size, epos - old_size);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ret2 = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 		ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='hunk'>@@ -4490,6 +4582,21 @@ retry:</div><div class='ctx'> 		ret2 = ret3 ? ret3 : ret2;</div><div class='ctx'> 		if (unlikely(ret2))</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='add'>+		if (alloc_zero &amp;&amp;</div><div class='add'>+		    (map.m_flags &amp; (EXT4_MAP_MAPPED | EXT4_MAP_UNWRITTEN))) {</div><div class='add'>+			ret2 = ext4_issue_zeroout(inode, map.m_lblk, map.m_pblk,</div><div class='add'>+						  map.m_len);</div><div class='add'>+			if (likely(!ret2))</div><div class='add'>+				ret2 = ext4_convert_unwritten_extents(NULL,</div><div class='add'>+					inode, (loff_t)map.m_lblk &lt;&lt; blkbits,</div><div class='add'>+					(loff_t)map.m_len &lt;&lt; blkbits);</div><div class='add'>+			if (ret2)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		map.m_lblk += ret;</div><div class='add'>+		map.m_len = len = len - ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret == -ENOSPC &amp;&amp; ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries))</div><div class='ctx'> 		goto retry;</div><div class='hunk'>@@ -4505,131 +4612,69 @@ static long ext4_zero_range(struct file *file, loff_t offset,</div><div class='ctx'> 			    loff_t len, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> 	handle_t *handle = NULL;</div><div class='del'>-	unsigned int max_blocks;</div><div class='ctx'> 	loff_t new_size = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int flags;</div><div class='del'>-	int credits;</div><div class='del'>-	int partial_begin, partial_end;</div><div class='del'>-	loff_t start, end;</div><div class='del'>-	ext4_lblk_t lblk;</div><div class='add'>+	loff_t end = offset + len;</div><div class='add'>+	ext4_lblk_t start_lblk, end_lblk;</div><div class='add'>+	unsigned int blocksize = i_blocksize(inode);</div><div class='ctx'> 	unsigned int blkbits = inode-&gt;i_blkbits;</div><div class='add'>+	int ret, flags, credits;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_zero_range(inode, offset, len, mode);</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Round up offset. This is not fallocate, we need to zero out</div><div class='del'>-	 * blocks, so convert interior block aligned part of the range to</div><div class='del'>-	 * unwritten and possibly manually zero out unaligned parts of the</div><div class='del'>-	 * range. Here, start and partial_begin are inclusive, end and</div><div class='del'>-	 * partial_end are exclusive.</div><div class='del'>-	 */</div><div class='del'>-	start = round_up(offset, 1 &lt;&lt; blkbits);</div><div class='del'>-	end = round_down((offset + len), 1 &lt;&lt; blkbits);</div><div class='del'>-</div><div class='del'>-	if (start &lt; offset || end &gt; offset + len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	partial_begin = offset &amp; ((1 &lt;&lt; blkbits) - 1);</div><div class='del'>-	partial_end = (offset + len) &amp; ((1 &lt;&lt; blkbits) - 1);</div><div class='del'>-</div><div class='del'>-	lblk = start &gt;&gt; blkbits;</div><div class='del'>-	max_blocks = (end &gt;&gt; blkbits);</div><div class='del'>-	if (max_blocks &lt; lblk)</div><div class='del'>-		max_blocks = 0;</div><div class='del'>-	else</div><div class='del'>-		max_blocks -= lblk;</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Indirect files do not support unwritten extents</div><div class='del'>-	 */</div><div class='del'>-	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out_mutex;</div><div class='del'>-	}</div><div class='add'>+	/* Indirect files do not support unwritten extents */</div><div class='add'>+	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (!(mode &amp; FALLOC_FL_KEEP_SIZE) &amp;&amp;</div><div class='del'>-	    (offset + len &gt; inode-&gt;i_size ||</div><div class='del'>-	     offset + len &gt; EXT4_I(inode)-&gt;i_disksize)) {</div><div class='del'>-		new_size = offset + len;</div><div class='add'>+	    (end &gt; inode-&gt;i_size || end &gt; EXT4_I(inode)-&gt;i_disksize)) {</div><div class='add'>+		new_size = end;</div><div class='ctx'> 		ret = inode_newsize_ok(inode, new_size);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out_mutex;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;</div><div class='del'>-</div><div class='del'>-	/* Wait all existing dio workers, newcomers will block on i_rwsem */</div><div class='del'>-	inode_dio_wait(inode);</div><div class='del'>-</div><div class='del'>-	ret = file_modified(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mutex;</div><div class='del'>-</div><div class='ctx'> 	/* Preallocate the range including the unaligned edges */</div><div class='del'>-	if (partial_begin || partial_end) {</div><div class='del'>-		ret = ext4_alloc_file_blocks(file,</div><div class='del'>-				round_down(offset, 1 &lt;&lt; blkbits) &gt;&gt; blkbits,</div><div class='del'>-				(round_up((offset + len), 1 &lt;&lt; blkbits) -</div><div class='del'>-				 round_down(offset, 1 &lt;&lt; blkbits)) &gt;&gt; blkbits,</div><div class='del'>-				new_size, flags);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_mutex;</div><div class='add'>+	if (!IS_ALIGNED(offset | end, blocksize)) {</div><div class='add'>+		ext4_lblk_t alloc_lblk = offset &gt;&gt; blkbits;</div><div class='add'>+		ext4_lblk_t len_lblk = EXT4_MAX_BLOCKS(len, offset, blkbits);</div><div class='ctx'> </div><div class='add'>+		ret = ext4_alloc_file_blocks(file, alloc_lblk, len_lblk,</div><div class='add'>+					     new_size, flags);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Zero range excluding the unaligned edges */</div><div class='del'>-	if (max_blocks &gt; 0) {</div><div class='del'>-		flags |= (EXT4_GET_BLOCKS_CONVERT_UNWRITTEN |</div><div class='del'>-			  EXT4_EX_NOCACHE);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Prevent page faults from reinstantiating pages we have</div><div class='del'>-		 * released from page cache.</div><div class='del'>-		 */</div><div class='del'>-		filemap_invalidate_lock(mapping);</div><div class='del'>-</div><div class='del'>-		ret = ext4_break_layouts(inode);</div><div class='del'>-		if (ret) {</div><div class='del'>-			filemap_invalidate_unlock(mapping);</div><div class='del'>-			goto out_mutex;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = ext4_update_disksize_before_punch(inode, offset, len);</div><div class='del'>-		if (ret) {</div><div class='del'>-			filemap_invalidate_unlock(mapping);</div><div class='del'>-			goto out_mutex;</div><div class='del'>-		}</div><div class='add'>+	ret = ext4_update_disksize_before_punch(inode, offset, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * For journalled data we need to write (and checkpoint) pages</div><div class='del'>-		 * before discarding page cache to avoid inconsitent data on</div><div class='del'>-		 * disk in case of crash before zeroing trans is committed.</div><div class='del'>-		 */</div><div class='del'>-		if (ext4_should_journal_data(inode)) {</div><div class='del'>-			ret = filemap_write_and_wait_range(mapping, start,</div><div class='del'>-							   end - 1);</div><div class='del'>-			if (ret) {</div><div class='del'>-				filemap_invalidate_unlock(mapping);</div><div class='del'>-				goto out_mutex;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	/* Now release the pages and zero block aligned part of pages */</div><div class='add'>+	ret = ext4_truncate_page_cache_block_range(inode, offset, end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-		/* Now release the pages and zero block aligned part of pages */</div><div class='del'>-		truncate_pagecache_range(inode, start, end - 1);</div><div class='del'>-		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='add'>+	/* Zero range excluding the unaligned edges */</div><div class='add'>+	start_lblk = EXT4_B_TO_LBLK(inode, offset);</div><div class='add'>+	end_lblk = end &gt;&gt; blkbits;</div><div class='add'>+	if (end_lblk &gt; start_lblk) {</div><div class='add'>+		ext4_lblk_t zero_blks = end_lblk - start_lblk;</div><div class='ctx'> </div><div class='del'>-		ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,</div><div class='del'>-					     flags);</div><div class='del'>-		filemap_invalidate_unlock(mapping);</div><div class='add'>+		if (mode &amp; FALLOC_FL_WRITE_ZEROES)</div><div class='add'>+			flags = EXT4_GET_BLOCKS_CREATE_ZERO | EXT4_EX_NOCACHE;</div><div class='add'>+		else</div><div class='add'>+			flags |= (EXT4_GET_BLOCKS_CONVERT_UNWRITTEN |</div><div class='add'>+				  EXT4_EX_NOCACHE);</div><div class='add'>+		ret = ext4_alloc_file_blocks(file, start_lblk, zero_blks,</div><div class='add'>+					     new_size, flags);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out_mutex;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	if (!partial_begin &amp;&amp; !partial_end)</div><div class='del'>-		goto out_mutex;</div><div class='add'>+	/* Finish zeroing out if it doesn't contain partial block */</div><div class='add'>+	if (IS_ALIGNED(offset | end, blocksize))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In worst case we have to writeout two nonadjacent unwritten</div><div class='hunk'>@@ -4642,27 +4687,69 @@ static long ext4_zero_range(struct file *file, loff_t offset,</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='ctx'> 		ret = PTR_ERR(handle);</div><div class='ctx'> 		ext4_std_error(inode-&gt;i_sb, ret);</div><div class='del'>-		goto out_mutex;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='add'>+	/* Zero out partial block at the edges of the range */</div><div class='add'>+	ret = ext4_zero_partial_blocks(handle, inode, offset, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_handle;</div><div class='add'>+</div><div class='ctx'> 	if (new_size)</div><div class='ctx'> 		ext4_update_inode_size(inode, new_size);</div><div class='ctx'> 	ret = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		goto out_handle;</div><div class='del'>-	/* Zero out partial block at the edges of the range */</div><div class='del'>-	ret = ext4_zero_partial_blocks(handle, inode, offset, len);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> </div><div class='add'>+	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> 	if (file-&gt;f_flags &amp; O_SYNC)</div><div class='ctx'> 		ext4_handle_sync(handle);</div><div class='ctx'> </div><div class='ctx'> out_handle:</div><div class='ctx'> 	ext4_journal_stop(handle);</div><div class='del'>-out_mutex:</div><div class='del'>-	inode_unlock(inode);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long ext4_do_fallocate(struct file *file, loff_t offset,</div><div class='add'>+			      loff_t len, int mode)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	loff_t end = offset + len;</div><div class='add'>+	loff_t new_size = 0;</div><div class='add'>+	ext4_lblk_t start_lblk, len_lblk;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	trace_ext4_fallocate_enter(inode, offset, len, mode);</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='add'>+</div><div class='add'>+	start_lblk = offset &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	len_lblk = EXT4_MAX_BLOCKS(len, offset, inode-&gt;i_blkbits);</div><div class='add'>+</div><div class='add'>+	/* We only support preallocation for extent-based files only. */</div><div class='add'>+	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(mode &amp; FALLOC_FL_KEEP_SIZE) &amp;&amp;</div><div class='add'>+	    (end &gt; inode-&gt;i_size || end &gt; EXT4_I(inode)-&gt;i_disksize)) {</div><div class='add'>+		new_size = end;</div><div class='add'>+		ret = inode_newsize_ok(inode, new_size);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ext4_alloc_file_blocks(file, start_lblk, len_lblk, new_size,</div><div class='add'>+				     EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (file-&gt;f_flags &amp; O_SYNC &amp;&amp; EXT4_SB(inode-&gt;i_sb)-&gt;s_journal) {</div><div class='add'>+		ret = ext4_fc_commit(EXT4_SB(inode-&gt;i_sb)-&gt;s_journal,</div><div class='add'>+					EXT4_I(inode)-&gt;i_sync_tid);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	trace_ext4_fallocate_exit(inode, offset, len_lblk, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4676,12 +4763,8 @@ out_mutex:</div><div class='ctx'> long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	loff_t new_size = 0;</div><div class='del'>-	unsigned int max_blocks;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int flags;</div><div class='del'>-	ext4_lblk_t lblk;</div><div class='del'>-	unsigned int blkbits = inode-&gt;i_blkbits;</div><div class='add'>+	struct address_space *mapping = file-&gt;f_mapping;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Encrypted inodes can't handle collapse range or insert</div><div class='hunk'>@@ -4692,83 +4775,158 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)</div><div class='ctx'> 	if (IS_ENCRYPTED(inode) &amp;&amp;</div><div class='ctx'> 	    (mode &amp; (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='add'>+	/*</div><div class='add'>+	 * Don't allow writing zeroes if the underlying device does not</div><div class='add'>+	 * enable the unmap write zeroes operation.</div><div class='add'>+	 */</div><div class='add'>+	if ((mode &amp; FALLOC_FL_WRITE_ZEROES) &amp;&amp;</div><div class='add'>+	    !bdev_write_zeroes_unmap_sectors(inode-&gt;i_sb-&gt;s_bdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* Return error if mode is not supported */</div><div class='ctx'> 	if (mode &amp; ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE |</div><div class='del'>-		     FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE |</div><div class='del'>-		     FALLOC_FL_INSERT_RANGE))</div><div class='add'>+		     FALLOC_FL_ZERO_RANGE | FALLOC_FL_COLLAPSE_RANGE |</div><div class='add'>+		     FALLOC_FL_INSERT_RANGE | FALLOC_FL_WRITE_ZEROES))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	ret = ext4_convert_inline_data(inode);</div><div class='del'>-	inode_unlock(inode);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto exit;</div><div class='add'>+		goto out_inode_lock;</div><div class='ctx'> </div><div class='del'>-	if (mode &amp; FALLOC_FL_PUNCH_HOLE) {</div><div class='del'>-		ret = ext4_punch_hole(file, offset, len);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	/* Wait all existing dio workers, newcomers will block on i_rwsem */</div><div class='add'>+	inode_dio_wait(inode);</div><div class='ctx'> </div><div class='del'>-	if (mode &amp; FALLOC_FL_COLLAPSE_RANGE) {</div><div class='del'>-		ret = ext4_collapse_range(file, offset, len);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	ret = file_modified(file);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_inode_lock;</div><div class='ctx'> </div><div class='del'>-	if (mode &amp; FALLOC_FL_INSERT_RANGE) {</div><div class='del'>-		ret = ext4_insert_range(file, offset, len);</div><div class='del'>-		goto exit;</div><div class='add'>+	if ((mode &amp; FALLOC_FL_MODE_MASK) == FALLOC_FL_ALLOCATE_RANGE) {</div><div class='add'>+		ret = ext4_do_fallocate(file, offset, len, mode);</div><div class='add'>+		goto out_inode_lock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mode &amp; FALLOC_FL_ZERO_RANGE) {</div><div class='add'>+	/*</div><div class='add'>+	 * Follow-up operations will drop page cache, hold invalidate lock</div><div class='add'>+	 * to prevent page faults from reinstantiating pages we have</div><div class='add'>+	 * released from page cache.</div><div class='add'>+	 */</div><div class='add'>+	filemap_invalidate_lock(mapping);</div><div class='add'>+</div><div class='add'>+	ret = ext4_break_layouts(inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_invalidate_lock;</div><div class='add'>+</div><div class='add'>+	switch (mode &amp; FALLOC_FL_MODE_MASK) {</div><div class='add'>+	case FALLOC_FL_PUNCH_HOLE:</div><div class='add'>+		ret = ext4_punch_hole(file, offset, len);</div><div class='add'>+		break;</div><div class='add'>+	case FALLOC_FL_COLLAPSE_RANGE:</div><div class='add'>+		ret = ext4_collapse_range(file, offset, len);</div><div class='add'>+		break;</div><div class='add'>+	case FALLOC_FL_INSERT_RANGE:</div><div class='add'>+		ret = ext4_insert_range(file, offset, len);</div><div class='add'>+		break;</div><div class='add'>+	case FALLOC_FL_ZERO_RANGE:</div><div class='add'>+	case FALLOC_FL_WRITE_ZEROES:</div><div class='ctx'> 		ret = ext4_zero_range(file, offset, len, mode);</div><div class='del'>-		goto exit;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='del'>-	trace_ext4_fallocate_enter(inode, offset, len, mode);</div><div class='del'>-	lblk = offset &gt;&gt; blkbits;</div><div class='ctx'> </div><div class='add'>+out_invalidate_lock:</div><div class='add'>+	filemap_invalidate_unlock(mapping);</div><div class='add'>+out_inode_lock:</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function converts a range of blocks to written extents. The caller of</div><div class='add'>+ * this function will pass the start offset and the size. all unwritten extents</div><div class='add'>+ * within this range will be converted to written extents.</div><div class='add'>+ *</div><div class='add'>+ * This function is called from the direct IO end io call back function for</div><div class='add'>+ * atomic writes, to convert the unwritten extents after IO is completed.</div><div class='add'>+ *</div><div class='add'>+ * Note that the requirement for atomic writes is that all conversion should</div><div class='add'>+ * happen atomically in a single fs journal transaction. We mainly only allocate</div><div class='add'>+ * unwritten extents either on a hole on a pre-exiting unwritten extent range in</div><div class='add'>+ * ext4_map_blocks_atomic_write(). The only case where we can have multiple</div><div class='add'>+ * unwritten extents in a range [offset, offset+len) is when there is a split</div><div class='add'>+ * unwritten extent between two leaf nodes which was cached in extent status</div><div class='add'>+ * cache during ext4_iomap_alloc() time. That will allow</div><div class='add'>+ * ext4_map_blocks_atomic_write() to return the unwritten extent range w/o going</div><div class='add'>+ * into the slow path. That means we might need a loop for conversion of this</div><div class='add'>+ * unwritten extent split across leaf block within a single journal transaction.</div><div class='add'>+ * Split extents across leaf nodes is a rare case, but let's still handle that</div><div class='add'>+ * to meet the requirements of multi-fsblock atomic writes.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success.</div><div class='add'>+ */</div><div class='add'>+int ext4_convert_unwritten_extents_atomic(handle_t *handle, struct inode *inode,</div><div class='add'>+					  loff_t offset, ssize_t len)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_blocks;</div><div class='add'>+	int ret = 0, ret2 = 0, ret3 = 0;</div><div class='add'>+	struct ext4_map_blocks map;</div><div class='add'>+	unsigned int blkbits = inode-&gt;i_blkbits;</div><div class='add'>+	unsigned int credits = 0;</div><div class='add'>+	int flags = EXT4_GET_BLOCKS_IO_CONVERT_EXT | EXT4_EX_NOCACHE;</div><div class='add'>+</div><div class='add'>+	map.m_lblk = offset &gt;&gt; blkbits;</div><div class='ctx'> 	max_blocks = EXT4_MAX_BLOCKS(len, offset, blkbits);</div><div class='del'>-	flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;</div><div class='ctx'> </div><div class='del'>-	inode_lock(inode);</div><div class='add'>+	if (!handle) {</div><div class='add'>+		/*</div><div class='add'>+		 * TODO: An optimization can be added later by having an extent</div><div class='add'>+		 * status flag e.g. EXTENT_STATUS_SPLIT_LEAF. If we query that</div><div class='add'>+		 * it can tell if the extent in the cache is a split extent.</div><div class='add'>+		 * But for now let's assume pextents as 2 always.</div><div class='add'>+		 */</div><div class='add'>+		credits = ext4_meta_trans_blocks(inode, max_blocks, 2);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We only support preallocation for extent-based files only</div><div class='del'>-	 */</div><div class='del'>-	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='add'>+	if (credits) {</div><div class='add'>+		handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, credits);</div><div class='add'>+		if (IS_ERR(handle)) {</div><div class='add'>+			ret = PTR_ERR(handle);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(mode &amp; FALLOC_FL_KEEP_SIZE) &amp;&amp;</div><div class='del'>-	    (offset + len &gt; inode-&gt;i_size ||</div><div class='del'>-	     offset + len &gt; EXT4_I(inode)-&gt;i_disksize)) {</div><div class='del'>-		new_size = offset + len;</div><div class='del'>-		ret = inode_newsize_ok(inode, new_size);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+	while (ret &gt;= 0 &amp;&amp; ret &lt; max_blocks) {</div><div class='add'>+		map.m_lblk += ret;</div><div class='add'>+		map.m_len = (max_blocks -= ret);</div><div class='add'>+		ret = ext4_map_blocks(handle, inode, &amp;map, flags);</div><div class='add'>+		if (ret != max_blocks)</div><div class='add'>+			ext4_msg(inode-&gt;i_sb, KERN_INFO,</div><div class='add'>+				     "inode #%lu: block %u: len %u: "</div><div class='add'>+				     "split block mapping found for atomic write, "</div><div class='add'>+				     "ret = %d",</div><div class='add'>+				     inode-&gt;i_ino, map.m_lblk,</div><div class='add'>+				     map.m_len, ret);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Wait all existing dio workers, newcomers will block on i_rwsem */</div><div class='del'>-	inode_dio_wait(inode);</div><div class='add'>+	ret2 = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> </div><div class='del'>-	ret = file_modified(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	if (credits) {</div><div class='add'>+		ret3 = ext4_journal_stop(handle);</div><div class='add'>+		if (unlikely(ret3))</div><div class='add'>+			ret2 = ret3;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, flags);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	if (ret &lt;= 0 || ret2)</div><div class='add'>+		ext4_warning(inode-&gt;i_sb,</div><div class='add'>+			     "inode #%lu: block %u: len %u: "</div><div class='add'>+			     "returned %d or %d",</div><div class='add'>+			     inode-&gt;i_ino, map.m_lblk,</div><div class='add'>+			     map.m_len, ret, ret2);</div><div class='ctx'> </div><div class='del'>-	if (file-&gt;f_flags &amp; O_SYNC &amp;&amp; EXT4_SB(inode-&gt;i_sb)-&gt;s_journal) {</div><div class='del'>-		ret = ext4_fc_commit(EXT4_SB(inode-&gt;i_sb)-&gt;s_journal,</div><div class='del'>-					EXT4_I(inode)-&gt;i_sync_tid);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-	trace_ext4_fallocate_exit(inode, offset, max_blocks, ret);</div><div class='del'>-exit:</div><div class='del'>-	return ret;</div><div class='add'>+	return ret &gt; 0 ? ret2 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4810,8 +4968,14 @@ int ext4_convert_unwritten_extents(handle_t *handle, struct inode *inode,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * Do not cache any unrelated extents, as it does not hold the</div><div class='add'>+		 * i_rwsem or invalidate_lock, which could corrupt the extent</div><div class='add'>+		 * status tree.</div><div class='add'>+		 */</div><div class='ctx'> 		ret = ext4_map_blocks(handle, inode, &amp;map,</div><div class='del'>-				      EXT4_GET_BLOCKS_IO_CONVERT_EXT);</div><div class='add'>+				      EXT4_GET_BLOCKS_IO_CONVERT_EXT |</div><div class='add'>+				      EXT4_EX_NOCACHE);</div><div class='ctx'> 		if (ret &lt;= 0)</div><div class='ctx'> 			ext4_warning(inode-&gt;i_sb,</div><div class='ctx'> 				     "inode #%lu: block %u: len %u: "</div><div class='hunk'>@@ -4922,12 +5086,7 @@ static const struct iomap_ops ext4_iomap_xattr_ops = {</div><div class='ctx'> </div><div class='ctx'> static int ext4_fiemap_check_ranges(struct inode *inode, u64 start, u64 *len)</div><div class='ctx'> {</div><div class='del'>-	u64 maxbytes;</div><div class='del'>-</div><div class='del'>-	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='del'>-		maxbytes = inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='del'>-	else</div><div class='del'>-		maxbytes = EXT4_SB(inode-&gt;i_sb)-&gt;s_bitmap_maxbytes;</div><div class='add'>+	u64 maxbytes = ext4_get_maxbytes(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (*len == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -4947,10 +5106,11 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> {</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='add'>+	inode_lock_shared(inode);</div><div class='ctx'> 	if (fieinfo-&gt;fi_flags &amp; FIEMAP_FLAG_CACHE) {</div><div class='ctx'> 		error = ext4_ext_precache(inode);</div><div class='ctx'> 		if (error)</div><div class='del'>-			return error;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		fieinfo-&gt;fi_flags &amp;= ~FIEMAP_FLAG_CACHE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4961,15 +5121,19 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	 */</div><div class='ctx'> 	error = ext4_fiemap_check_ranges(inode, start, &amp;len);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return error;</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (fieinfo-&gt;fi_flags &amp; FIEMAP_FLAG_XATTR) {</div><div class='ctx'> 		fieinfo-&gt;fi_flags &amp;= ~FIEMAP_FLAG_XATTR;</div><div class='del'>-		return iomap_fiemap(inode, fieinfo, start, len,</div><div class='del'>-				    &amp;ext4_iomap_xattr_ops);</div><div class='add'>+		error = iomap_fiemap(inode, fieinfo, start, len,</div><div class='add'>+				     &amp;ext4_iomap_xattr_ops);</div><div class='add'>+	} else {</div><div class='add'>+		error = iomap_fiemap(inode, fieinfo, start, len,</div><div class='add'>+				     &amp;ext4_iomap_report_ops);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return iomap_fiemap(inode, fieinfo, start, len, &amp;ext4_iomap_report_ops);</div><div class='add'>+unlock:</div><div class='add'>+	inode_unlock_shared(inode);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='hunk'>@@ -4990,7 +5154,9 @@ int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fieinfo-&gt;fi_flags &amp; FIEMAP_FLAG_CACHE) {</div><div class='add'>+		inode_lock_shared(inode);</div><div class='ctx'> 		error = ext4_ext_precache(inode);</div><div class='add'>+		inode_unlock_shared(inode);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			return error;</div><div class='ctx'> 		fieinfo-&gt;fi_flags &amp;= ~FIEMAP_FLAG_CACHE;</div><div class='hunk'>@@ -5049,7 +5215,7 @@ ext4_ext_shift_path_extents(struct ext4_ext_path *path, ext4_lblk_t shift,</div><div class='ctx'> 				credits = depth + 2;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			restart_credits = ext4_writepage_trans_blocks(inode);</div><div class='add'>+			restart_credits = ext4_chunk_trans_extent(inode, 0);</div><div class='ctx'> 			err = ext4_datasem_ensure_credits(handle, inode, credits,</div><div class='ctx'> 					restart_credits, 0);</div><div class='ctx'> 			if (err) {</div><div class='hunk'>@@ -5151,7 +5317,7 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,</div><div class='ctx'> 	* won't be shifted beyond EXT_MAX_BLOCKS.</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (SHIFT == SHIFT_LEFT) {</div><div class='del'>-		path = ext4_find_extent(inode, start - 1, &amp;path,</div><div class='add'>+		path = ext4_find_extent(inode, start - 1, path,</div><div class='ctx'> 					EXT4_EX_NOCACHE);</div><div class='ctx'> 		if (IS_ERR(path))</div><div class='ctx'> 			return PTR_ERR(path);</div><div class='hunk'>@@ -5200,7 +5366,7 @@ again:</div><div class='ctx'> 	 * becomes NULL to indicate the end of the loop.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (iterator &amp;&amp; start &lt;= stop) {</div><div class='del'>-		path = ext4_find_extent(inode, *iterator, &amp;path,</div><div class='add'>+		path = ext4_find_extent(inode, *iterator, path,</div><div class='ctx'> 					EXT4_EX_NOCACHE);</div><div class='ctx'> 		if (IS_ERR(path))</div><div class='ctx'> 			return PTR_ERR(path);</div><div class='hunk'>@@ -5269,109 +5435,74 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	ext4_lblk_t punch_start, punch_stop;</div><div class='add'>+	loff_t end = offset + len;</div><div class='add'>+	ext4_lblk_t start_lblk, end_lblk;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	unsigned int credits;</div><div class='del'>-	loff_t new_size, ioffset;</div><div class='add'>+	loff_t start, new_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We need to test this early because xfstests assumes that a</div><div class='del'>-	 * collapse range of (0, 1) will return EOPNOTSUPP if the file</div><div class='del'>-	 * system does not support collapse range.</div><div class='del'>-	 */</div><div class='add'>+	trace_ext4_collapse_range(inode, offset, len);</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='add'>+</div><div class='add'>+	/* Currently just for extent based files */</div><div class='ctx'> 	if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	/* Collapse range works only on fs cluster size aligned regions. */</div><div class='ctx'> 	if (!IS_ALIGNED(offset | len, EXT4_CLUSTER_SIZE(sb)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	trace_ext4_collapse_range(inode, offset, len);</div><div class='del'>-</div><div class='del'>-	punch_start = offset &gt;&gt; EXT4_BLOCK_SIZE_BITS(sb);</div><div class='del'>-	punch_stop = (offset + len) &gt;&gt; EXT4_BLOCK_SIZE_BITS(sb);</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There is no need to overlap collapse range with EOF, in which case</div><div class='ctx'> 	 * it is effectively a truncate operation</div><div class='ctx'> 	 */</div><div class='del'>-	if (offset + len &gt;= inode-&gt;i_size) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_mutex;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Currently just for extent based files */</div><div class='del'>-	if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out_mutex;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Wait for existing dio to complete */</div><div class='del'>-	inode_dio_wait(inode);</div><div class='del'>-</div><div class='del'>-	ret = file_modified(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mutex;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Prevent page faults from reinstantiating pages we have released from</div><div class='del'>-	 * page cache.</div><div class='del'>-	 */</div><div class='del'>-	filemap_invalidate_lock(mapping);</div><div class='del'>-</div><div class='del'>-	ret = ext4_break_layouts(inode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mmap;</div><div class='add'>+	if (end &gt;= inode-&gt;i_size)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Write tail of the last page before removed range and data that</div><div class='add'>+	 * will be shifted since they will get removed from the page cache</div><div class='add'>+	 * below. We are also protected from pages becoming dirty by</div><div class='add'>+	 * i_rwsem and invalidate_lock.</div><div class='ctx'> 	 * Need to round down offset to be aligned with page size boundary</div><div class='ctx'> 	 * for page size &gt; block size.</div><div class='ctx'> 	 */</div><div class='del'>-	ioffset = round_down(offset, PAGE_SIZE);</div><div class='del'>-	/*</div><div class='del'>-	 * Write tail of the last page before removed range since it will get</div><div class='del'>-	 * removed from the page cache below.</div><div class='del'>-	 */</div><div class='del'>-	ret = filemap_write_and_wait_range(mapping, ioffset, offset);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mmap;</div><div class='del'>-	/*</div><div class='del'>-	 * Write data that will be shifted to preserve them when discarding</div><div class='del'>-	 * page cache below. We are also protected from pages becoming dirty</div><div class='del'>-	 * by i_rwsem and invalidate_lock.</div><div class='del'>-	 */</div><div class='del'>-	ret = filemap_write_and_wait_range(mapping, offset + len,</div><div class='del'>-					   LLONG_MAX);</div><div class='add'>+	start = round_down(offset, PAGE_SIZE);</div><div class='add'>+	ret = filemap_write_and_wait_range(mapping, start, offset);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = filemap_write_and_wait_range(mapping, end, LLONG_MAX);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_mmap;</div><div class='del'>-	truncate_pagecache(inode, ioffset);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	truncate_pagecache(inode, start);</div><div class='ctx'> </div><div class='del'>-	credits = ext4_writepage_trans_blocks(inode);</div><div class='add'>+	credits = ext4_chunk_trans_extent(inode, 0);</div><div class='ctx'> 	handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits);</div><div class='del'>-	if (IS_ERR(handle)) {</div><div class='del'>-		ret = PTR_ERR(handle);</div><div class='del'>-		goto out_mmap;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(handle))</div><div class='add'>+		return PTR_ERR(handle);</div><div class='add'>+</div><div class='ctx'> 	ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE, handle);</div><div class='ctx'> </div><div class='add'>+	start_lblk = offset &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	end_lblk = (offset + len) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+</div><div class='add'>+	ext4_check_map_extents_env(inode);</div><div class='add'>+</div><div class='ctx'> 	down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='del'>-	ext4_es_remove_extent(inode, punch_start, EXT_MAX_BLOCKS - punch_start);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='add'>+	ext4_es_remove_extent(inode, start_lblk, EXT_MAX_BLOCKS - start_lblk);</div><div class='ctx'> </div><div class='del'>-	ret = ext4_ext_remove_space(inode, punch_start, punch_stop - 1);</div><div class='add'>+	ret = ext4_ext_remove_space(inode, start_lblk, end_lblk - 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		goto out_stop;</div><div class='add'>+		goto out_handle;</div><div class='ctx'> 	}</div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> </div><div class='del'>-	ret = ext4_ext_shift_extents(inode, handle, punch_stop,</div><div class='del'>-				     punch_stop - punch_start, SHIFT_LEFT);</div><div class='add'>+	ret = ext4_ext_shift_extents(inode, handle, end_lblk,</div><div class='add'>+				     end_lblk - start_lblk, SHIFT_LEFT);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		goto out_stop;</div><div class='add'>+		goto out_handle;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new_size = inode-&gt;i_size - len;</div><div class='hunk'>@@ -5379,18 +5510,16 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	EXT4_I(inode)-&gt;i_disksize = new_size;</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-	if (IS_SYNC(inode))</div><div class='del'>-		ext4_handle_sync(handle);</div><div class='del'>-	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='ctx'> 	ret = ext4_mark_inode_dirty(handle, inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_handle;</div><div class='add'>+</div><div class='ctx'> 	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='add'>+	if (IS_SYNC(inode))</div><div class='add'>+		ext4_handle_sync(handle);</div><div class='ctx'> </div><div class='del'>-out_stop:</div><div class='add'>+out_handle:</div><div class='ctx'> 	ext4_journal_stop(handle);</div><div class='del'>-out_mmap:</div><div class='del'>-	filemap_invalidate_unlock(mapping);</div><div class='del'>-out_mutex:</div><div class='del'>-	inode_unlock(inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5410,99 +5539,65 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	struct ext4_ext_path *path;</div><div class='ctx'> 	struct ext4_extent *extent;</div><div class='del'>-	ext4_lblk_t offset_lblk, len_lblk, ee_start_lblk = 0;</div><div class='add'>+	ext4_lblk_t start_lblk, len_lblk, ee_start_lblk = 0;</div><div class='ctx'> 	unsigned int credits, ee_len;</div><div class='del'>-	int ret = 0, depth, split_flag = 0;</div><div class='del'>-	loff_t ioffset;</div><div class='add'>+	int ret, depth, split_flag = 0;</div><div class='add'>+	loff_t start;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We need to test this early because xfstests assumes that an</div><div class='del'>-	 * insert range of (0, 1) will return EOPNOTSUPP if the file</div><div class='del'>-	 * system does not support insert range.</div><div class='del'>-	 */</div><div class='add'>+	trace_ext4_insert_range(inode, offset, len);</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='add'>+</div><div class='add'>+	/* Currently just for extent based files */</div><div class='ctx'> 	if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	/* Insert range works only on fs cluster size aligned regions. */</div><div class='ctx'> 	if (!IS_ALIGNED(offset | len, EXT4_CLUSTER_SIZE(sb)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	trace_ext4_insert_range(inode, offset, len);</div><div class='del'>-</div><div class='del'>-	offset_lblk = offset &gt;&gt; EXT4_BLOCK_SIZE_BITS(sb);</div><div class='del'>-	len_lblk = len &gt;&gt; EXT4_BLOCK_SIZE_BITS(sb);</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='del'>-	/* Currently just for extent based files */</div><div class='del'>-	if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out_mutex;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check whether the maximum file size would be exceeded */</div><div class='del'>-	if (len &gt; inode-&gt;i_sb-&gt;s_maxbytes - inode-&gt;i_size) {</div><div class='del'>-		ret = -EFBIG;</div><div class='del'>-		goto out_mutex;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Offset must be less than i_size */</div><div class='del'>-	if (offset &gt;= inode-&gt;i_size) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out_mutex;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Wait for existing dio to complete */</div><div class='del'>-	inode_dio_wait(inode);</div><div class='del'>-</div><div class='del'>-	ret = file_modified(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mutex;</div><div class='add'>+	if (offset &gt;= inode-&gt;i_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* Check whether the maximum file size would be exceeded */</div><div class='add'>+	if (len &gt; inode-&gt;i_sb-&gt;s_maxbytes - inode-&gt;i_size)</div><div class='add'>+		return -EFBIG;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Prevent page faults from reinstantiating pages we have released from</div><div class='del'>-	 * page cache.</div><div class='add'>+	 * Write out all dirty pages. Need to round down to align start offset</div><div class='add'>+	 * to page size boundary for page size &gt; block size.</div><div class='ctx'> 	 */</div><div class='del'>-	filemap_invalidate_lock(mapping);</div><div class='del'>-</div><div class='del'>-	ret = ext4_break_layouts(inode);</div><div class='add'>+	start = round_down(offset, PAGE_SIZE);</div><div class='add'>+	ret = filemap_write_and_wait_range(mapping, start, LLONG_MAX);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_mmap;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Need to round down to align start offset to page size boundary</div><div class='del'>-	 * for page size &gt; block size.</div><div class='del'>-	 */</div><div class='del'>-	ioffset = round_down(offset, PAGE_SIZE);</div><div class='del'>-	/* Write out all dirty pages */</div><div class='del'>-	ret = filemap_write_and_wait_range(inode-&gt;i_mapping, ioffset,</div><div class='del'>-			LLONG_MAX);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mmap;</div><div class='del'>-	truncate_pagecache(inode, ioffset);</div><div class='add'>+	truncate_pagecache(inode, start);</div><div class='ctx'> </div><div class='del'>-	credits = ext4_writepage_trans_blocks(inode);</div><div class='add'>+	credits = ext4_chunk_trans_extent(inode, 0);</div><div class='ctx'> 	handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits);</div><div class='del'>-	if (IS_ERR(handle)) {</div><div class='del'>-		ret = PTR_ERR(handle);</div><div class='del'>-		goto out_mmap;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(handle))</div><div class='add'>+		return PTR_ERR(handle);</div><div class='add'>+</div><div class='ctx'> 	ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE, handle);</div><div class='ctx'> </div><div class='ctx'> 	/* Expand file to avoid data loss if there is error while shifting */</div><div class='ctx'> 	inode-&gt;i_size += len;</div><div class='ctx'> 	EXT4_I(inode)-&gt;i_disksize += len;</div><div class='del'>-	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='ctx'> 	ret = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_stop;</div><div class='add'>+		goto out_handle;</div><div class='add'>+</div><div class='add'>+	start_lblk = offset &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	len_lblk = len &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+</div><div class='add'>+	ext4_check_map_extents_env(inode);</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> </div><div class='del'>-	path = ext4_find_extent(inode, offset_lblk, NULL, 0);</div><div class='add'>+	path = ext4_find_extent(inode, start_lblk, NULL, 0);</div><div class='ctx'> 	if (IS_ERR(path)) {</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		goto out_stop;</div><div class='add'>+		ret = PTR_ERR(path);</div><div class='add'>+		goto out_handle;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='hunk'>@@ -5512,51 +5607,47 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len)</div><div class='ctx'> 		ee_len = ext4_ext_get_actual_len(extent);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * If offset_lblk is not the starting block of extent, split</div><div class='del'>-		 * the extent @offset_lblk</div><div class='add'>+		 * If start_lblk is not the starting block of extent, split</div><div class='add'>+		 * the extent @start_lblk</div><div class='ctx'> 		 */</div><div class='del'>-		if ((offset_lblk &gt; ee_start_lblk) &amp;&amp;</div><div class='del'>-				(offset_lblk &lt; (ee_start_lblk + ee_len))) {</div><div class='add'>+		if ((start_lblk &gt; ee_start_lblk) &amp;&amp;</div><div class='add'>+				(start_lblk &lt; (ee_start_lblk + ee_len))) {</div><div class='ctx'> 			if (ext4_ext_is_unwritten(extent))</div><div class='ctx'> 				split_flag = EXT4_EXT_MARK_UNWRIT1 |</div><div class='ctx'> 					EXT4_EXT_MARK_UNWRIT2;</div><div class='del'>-			ret = ext4_split_extent_at(handle, inode, &amp;path,</div><div class='del'>-					offset_lblk, split_flag,</div><div class='add'>+			path = ext4_split_extent_at(handle, inode, path,</div><div class='add'>+					start_lblk, split_flag,</div><div class='ctx'> 					EXT4_EX_NOCACHE |</div><div class='del'>-					EXT4_GET_BLOCKS_PRE_IO |</div><div class='add'>+					EXT4_GET_BLOCKS_SPLIT_NOMERGE |</div><div class='ctx'> 					EXT4_GET_BLOCKS_METADATA_NOFAIL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ext4_free_ext_path(path);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		if (IS_ERR(path)) {</div><div class='ctx'> 			up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-			goto out_stop;</div><div class='add'>+			ret = PTR_ERR(path);</div><div class='add'>+			goto out_handle;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		ext4_free_ext_path(path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ext4_es_remove_extent(inode, offset_lblk, EXT_MAX_BLOCKS - offset_lblk);</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	ext4_es_remove_extent(inode, start_lblk, EXT_MAX_BLOCKS - start_lblk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * if offset_lblk lies in a hole which is at start of file, use</div><div class='add'>+	 * if start_lblk lies in a hole which is at start of file, use</div><div class='ctx'> 	 * ee_start_lblk to shift extents</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = ext4_ext_shift_extents(inode, handle,</div><div class='del'>-		max(ee_start_lblk, offset_lblk), len_lblk, SHIFT_RIGHT);</div><div class='del'>-</div><div class='add'>+		max(ee_start_lblk, start_lblk), len_lblk, SHIFT_RIGHT);</div><div class='ctx'> 	up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_handle;</div><div class='add'>+</div><div class='add'>+	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> 	if (IS_SYNC(inode))</div><div class='ctx'> 		ext4_handle_sync(handle);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> </div><div class='del'>-out_stop:</div><div class='add'>+out_handle:</div><div class='ctx'> 	ext4_journal_stop(handle);</div><div class='del'>-out_mmap:</div><div class='del'>-	filemap_invalidate_unlock(mapping);</div><div class='del'>-out_mutex:</div><div class='del'>-	inode_unlock(inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5603,25 +5694,21 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,</div><div class='ctx'> 		int e1_len, e2_len, len;</div><div class='ctx'> 		int split = 0;</div><div class='ctx'> </div><div class='del'>-		path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE);</div><div class='add'>+		path1 = ext4_find_extent(inode1, lblk1, path1, EXT4_EX_NOCACHE);</div><div class='ctx'> 		if (IS_ERR(path1)) {</div><div class='ctx'> 			*erp = PTR_ERR(path1);</div><div class='del'>-			path1 = NULL;</div><div class='del'>-		finish:</div><div class='del'>-			count = 0;</div><div class='del'>-			goto repeat;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		}</div><div class='del'>-		path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE);</div><div class='add'>+		path2 = ext4_find_extent(inode2, lblk2, path2, EXT4_EX_NOCACHE);</div><div class='ctx'> 		if (IS_ERR(path2)) {</div><div class='ctx'> 			*erp = PTR_ERR(path2);</div><div class='del'>-			path2 = NULL;</div><div class='del'>-			goto finish;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		}</div><div class='ctx'> 		ex1 = path1[path1-&gt;p_depth].p_ext;</div><div class='ctx'> 		ex2 = path2[path2-&gt;p_depth].p_ext;</div><div class='ctx'> 		/* Do we have something to swap ? */</div><div class='ctx'> 		if (unlikely(!ex2 || !ex1))</div><div class='del'>-			goto finish;</div><div class='add'>+			goto errout;</div><div class='ctx'> </div><div class='ctx'> 		e1_blk = le32_to_cpu(ex1-&gt;ee_block);</div><div class='ctx'> 		e2_blk = le32_to_cpu(ex2-&gt;ee_block);</div><div class='hunk'>@@ -5643,7 +5730,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,</div><div class='ctx'> 				next2 = e2_blk;</div><div class='ctx'> 			/* Do we have something to swap */</div><div class='ctx'> 			if (next1 == EXT_MAX_BLOCKS || next2 == EXT_MAX_BLOCKS)</div><div class='del'>-				goto finish;</div><div class='add'>+				goto errout;</div><div class='ctx'> 			/* Move to the rightest boundary */</div><div class='ctx'> 			len = next1 - lblk1;</div><div class='ctx'> 			if (len &lt; next2 - lblk2)</div><div class='hunk'>@@ -5653,28 +5740,32 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,</div><div class='ctx'> 			lblk1 += len;</div><div class='ctx'> 			lblk2 += len;</div><div class='ctx'> 			count -= len;</div><div class='del'>-			goto repeat;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Prepare left boundary */</div><div class='ctx'> 		if (e1_blk &lt; lblk1) {</div><div class='ctx'> 			split = 1;</div><div class='del'>-			*erp = ext4_force_split_extent_at(handle, inode1,</div><div class='del'>-						&amp;path1, lblk1, 0);</div><div class='del'>-			if (unlikely(*erp))</div><div class='del'>-				goto finish;</div><div class='add'>+			path1 = ext4_force_split_extent_at(handle, inode1,</div><div class='add'>+							   path1, lblk1, 0);</div><div class='add'>+			if (IS_ERR(path1)) {</div><div class='add'>+				*erp = PTR_ERR(path1);</div><div class='add'>+				goto errout;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (e2_blk &lt; lblk2) {</div><div class='ctx'> 			split = 1;</div><div class='del'>-			*erp = ext4_force_split_extent_at(handle, inode2,</div><div class='del'>-						&amp;path2,  lblk2, 0);</div><div class='del'>-			if (unlikely(*erp))</div><div class='del'>-				goto finish;</div><div class='add'>+			path2 = ext4_force_split_extent_at(handle, inode2,</div><div class='add'>+							   path2, lblk2, 0);</div><div class='add'>+			if (IS_ERR(path2)) {</div><div class='add'>+				*erp = PTR_ERR(path2);</div><div class='add'>+				goto errout;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* ext4_split_extent_at() may result in leaf extent split,</div><div class='ctx'> 		 * path must to be revalidated. */</div><div class='ctx'> 		if (split)</div><div class='del'>-			goto repeat;</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Prepare right boundary */</div><div class='ctx'> 		len = count;</div><div class='hunk'>@@ -5685,30 +5776,34 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,</div><div class='ctx'> </div><div class='ctx'> 		if (len != e1_len) {</div><div class='ctx'> 			split = 1;</div><div class='del'>-			*erp = ext4_force_split_extent_at(handle, inode1,</div><div class='del'>-						&amp;path1, lblk1 + len, 0);</div><div class='del'>-			if (unlikely(*erp))</div><div class='del'>-				goto finish;</div><div class='add'>+			path1 = ext4_force_split_extent_at(handle, inode1,</div><div class='add'>+							path1, lblk1 + len, 0);</div><div class='add'>+			if (IS_ERR(path1)) {</div><div class='add'>+				*erp = PTR_ERR(path1);</div><div class='add'>+				goto errout;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (len != e2_len) {</div><div class='ctx'> 			split = 1;</div><div class='del'>-			*erp = ext4_force_split_extent_at(handle, inode2,</div><div class='del'>-						&amp;path2, lblk2 + len, 0);</div><div class='del'>-			if (*erp)</div><div class='del'>-				goto finish;</div><div class='add'>+			path2 = ext4_force_split_extent_at(handle, inode2,</div><div class='add'>+							path2, lblk2 + len, 0);</div><div class='add'>+			if (IS_ERR(path2)) {</div><div class='add'>+				*erp = PTR_ERR(path2);</div><div class='add'>+				goto errout;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* ext4_split_extent_at() may result in leaf extent split,</div><div class='ctx'> 		 * path must to be revalidated. */</div><div class='ctx'> 		if (split)</div><div class='del'>-			goto repeat;</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(e2_len != e1_len);</div><div class='ctx'> 		*erp = ext4_ext_get_access(handle, inode1, path1 + path1-&gt;p_depth);</div><div class='ctx'> 		if (unlikely(*erp))</div><div class='del'>-			goto finish;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		*erp = ext4_ext_get_access(handle, inode2, path2 + path2-&gt;p_depth);</div><div class='ctx'> 		if (unlikely(*erp))</div><div class='del'>-			goto finish;</div><div class='add'>+			goto errout;</div><div class='ctx'> </div><div class='ctx'> 		/* Both extents are fully inside boundaries. Swap it now */</div><div class='ctx'> 		tmp_ex = *ex1;</div><div class='hunk'>@@ -5726,7 +5821,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,</div><div class='ctx'> 		*erp = ext4_ext_dirty(handle, inode2, path2 +</div><div class='ctx'> 				      path2-&gt;p_depth);</div><div class='ctx'> 		if (unlikely(*erp))</div><div class='del'>-			goto finish;</div><div class='add'>+			goto errout;</div><div class='ctx'> 		*erp = ext4_ext_dirty(handle, inode1, path1 +</div><div class='ctx'> 				      path1-&gt;p_depth);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -5736,17 +5831,17 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,</div><div class='ctx'> 		 * aborted anyway.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (unlikely(*erp))</div><div class='del'>-			goto finish;</div><div class='add'>+			goto errout;</div><div class='add'>+</div><div class='ctx'> 		lblk1 += len;</div><div class='ctx'> 		lblk2 += len;</div><div class='ctx'> 		replaced_count += len;</div><div class='ctx'> 		count -= len;</div><div class='del'>-</div><div class='del'>-	repeat:</div><div class='del'>-		ext4_free_ext_path(path1);</div><div class='del'>-		ext4_free_ext_path(path2);</div><div class='del'>-		path1 = path2 = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+errout:</div><div class='add'>+	ext4_free_ext_path(path1);</div><div class='add'>+	ext4_free_ext_path(path2);</div><div class='ctx'> 	return replaced_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5781,11 +5876,8 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu)</div><div class='ctx'> </div><div class='ctx'> 	/* search for the extent closest to the first block in the cluster */</div><div class='ctx'> 	path = ext4_find_extent(inode, EXT4_C2B(sbi, lclu), NULL, 0);</div><div class='del'>-	if (IS_ERR(path)) {</div><div class='del'>-		err = PTR_ERR(path);</div><div class='del'>-		path = NULL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		return PTR_ERR(path);</div><div class='ctx'> </div><div class='ctx'> 	depth = ext_depth(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -5847,7 +5939,7 @@ out:</div><div class='ctx'> int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,</div><div class='ctx'> 			      int len, int unwritten, ext4_fsblk_t pblk)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_ext_path *path = NULL, *ppath;</div><div class='add'>+	struct ext4_ext_path *path;</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -5863,30 +5955,34 @@ int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,</div><div class='ctx'> 	if (le32_to_cpu(ex-&gt;ee_block) != start ||</div><div class='ctx'> 		ext4_ext_get_actual_len(ex) != len) {</div><div class='ctx'> 		/* We need to split this extent to match our extent first */</div><div class='del'>-		ppath = path;</div><div class='ctx'> 		down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		ret = ext4_force_split_extent_at(NULL, inode, &amp;ppath, start, 1);</div><div class='add'>+		path = ext4_force_split_extent_at(NULL, inode, path, start, 1);</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (IS_ERR(path)) {</div><div class='add'>+			ret = PTR_ERR(path);</div><div class='ctx'> 			goto out;</div><div class='del'>-		kfree(path);</div><div class='del'>-		path = ext4_find_extent(inode, start, NULL, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		path = ext4_find_extent(inode, start, path, 0);</div><div class='ctx'> 		if (IS_ERR(path))</div><div class='del'>-			return -1;</div><div class='del'>-		ppath = path;</div><div class='add'>+			return PTR_ERR(path);</div><div class='add'>+</div><div class='ctx'> 		ex = path[path-&gt;p_depth].p_ext;</div><div class='ctx'> 		WARN_ON(le32_to_cpu(ex-&gt;ee_block) != start);</div><div class='add'>+</div><div class='ctx'> 		if (ext4_ext_get_actual_len(ex) != len) {</div><div class='ctx'> 			down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-			ret = ext4_force_split_extent_at(NULL, inode, &amp;ppath,</div><div class='del'>-							 start + len, 1);</div><div class='add'>+			path = ext4_force_split_extent_at(NULL, inode, path,</div><div class='add'>+							  start + len, 1);</div><div class='ctx'> 			up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-			if (ret)</div><div class='add'>+			if (IS_ERR(path)) {</div><div class='add'>+				ret = PTR_ERR(path);</div><div class='ctx'> 				goto out;</div><div class='del'>-			kfree(path);</div><div class='del'>-			path = ext4_find_extent(inode, start, NULL, 0);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			path = ext4_find_extent(inode, start, path, 0);</div><div class='ctx'> 			if (IS_ERR(path))</div><div class='del'>-				return -EINVAL;</div><div class='add'>+				return PTR_ERR(path);</div><div class='ctx'> 			ex = path[path-&gt;p_depth].p_ext;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5968,12 +6064,9 @@ int ext4_ext_replay_set_iblocks(struct inode *inode)</div><div class='ctx'> 	if (IS_ERR(path))</div><div class='ctx'> 		return PTR_ERR(path);</div><div class='ctx'> 	ex = path[path-&gt;p_depth].p_ext;</div><div class='del'>-	if (!ex) {</div><div class='del'>-		ext4_free_ext_path(path);</div><div class='add'>+	if (!ex)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	end = le32_to_cpu(ex-&gt;ee_block) + ext4_ext_get_actual_len(ex);</div><div class='del'>-	ext4_free_ext_path(path);</div><div class='ctx'> </div><div class='ctx'> 	/* Count the number of data blocks */</div><div class='ctx'> 	cur = 0;</div><div class='hunk'>@@ -5999,32 +6092,28 @@ int ext4_ext_replay_set_iblocks(struct inode *inode)</div><div class='ctx'> 	ret = skip_hole(inode, &amp;cur);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	path = ext4_find_extent(inode, cur, NULL, 0);</div><div class='add'>+	path = ext4_find_extent(inode, cur, path, 0);</div><div class='ctx'> 	if (IS_ERR(path))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	numblks += path-&gt;p_depth;</div><div class='del'>-	ext4_free_ext_path(path);</div><div class='ctx'> 	while (cur &lt; end) {</div><div class='del'>-		path = ext4_find_extent(inode, cur, NULL, 0);</div><div class='add'>+		path = ext4_find_extent(inode, cur, path, 0);</div><div class='ctx'> 		if (IS_ERR(path))</div><div class='ctx'> 			break;</div><div class='ctx'> 		ex = path[path-&gt;p_depth].p_ext;</div><div class='del'>-		if (!ex) {</div><div class='del'>-			ext4_free_ext_path(path);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		if (!ex)</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='ctx'> 		cur = max(cur + 1, le32_to_cpu(ex-&gt;ee_block) +</div><div class='ctx'> 					ext4_ext_get_actual_len(ex));</div><div class='ctx'> 		ret = skip_hole(inode, &amp;cur);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			ext4_free_ext_path(path);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-		path2 = ext4_find_extent(inode, cur, NULL, 0);</div><div class='del'>-		if (IS_ERR(path2)) {</div><div class='del'>-			ext4_free_ext_path(path);</div><div class='add'>+</div><div class='add'>+		path2 = ext4_find_extent(inode, cur, path2, 0);</div><div class='add'>+		if (IS_ERR(path2))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt;= max(path-&gt;p_depth, path2-&gt;p_depth); i++) {</div><div class='ctx'> 			cmp1 = cmp2 = 0;</div><div class='ctx'> 			if (i &lt;= path-&gt;p_depth)</div><div class='hunk'>@@ -6036,13 +6125,14 @@ int ext4_ext_replay_set_iblocks(struct inode *inode)</div><div class='ctx'> 			if (cmp1 != cmp2 &amp;&amp; cmp2 != 0)</div><div class='ctx'> 				numblks++;</div><div class='ctx'> 		}</div><div class='del'>-		ext4_free_ext_path(path);</div><div class='del'>-		ext4_free_ext_path(path2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	inode-&gt;i_blocks = numblks &lt;&lt; (inode-&gt;i_sb-&gt;s_blocksize_bits - 9);</div><div class='ctx'> 	ext4_mark_inode_dirty(NULL, inode);</div><div class='add'>+cleanup:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='add'>+	ext4_free_ext_path(path2);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6063,12 +6153,9 @@ int ext4_ext_clear_bb(struct inode *inode)</div><div class='ctx'> 	if (IS_ERR(path))</div><div class='ctx'> 		return PTR_ERR(path);</div><div class='ctx'> 	ex = path[path-&gt;p_depth].p_ext;</div><div class='del'>-	if (!ex) {</div><div class='del'>-		ext4_free_ext_path(path);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (!ex)</div><div class='add'>+		goto out;</div><div class='ctx'> 	end = le32_to_cpu(ex-&gt;ee_block) + ext4_ext_get_actual_len(ex);</div><div class='del'>-	ext4_free_ext_path(path);</div><div class='ctx'> </div><div class='ctx'> 	cur = 0;</div><div class='ctx'> 	while (cur &lt; end) {</div><div class='hunk'>@@ -6078,16 +6165,16 @@ int ext4_ext_clear_bb(struct inode *inode)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='del'>-			path = ext4_find_extent(inode, map.m_lblk, NULL, 0);</div><div class='del'>-			if (!IS_ERR_OR_NULL(path)) {</div><div class='add'>+			path = ext4_find_extent(inode, map.m_lblk, path, 0);</div><div class='add'>+			if (!IS_ERR(path)) {</div><div class='ctx'> 				for (j = 0; j &lt; path-&gt;p_depth; j++) {</div><div class='del'>-</div><div class='ctx'> 					ext4_mb_mark_bb(inode-&gt;i_sb,</div><div class='ctx'> 							path[j].p_block, 1, false);</div><div class='ctx'> 					ext4_fc_record_regions(inode-&gt;i_sb, inode-&gt;i_ino,</div><div class='ctx'> 							0, path[j].p_block, 1, 1);</div><div class='ctx'> 				}</div><div class='del'>-				ext4_free_ext_path(path);</div><div class='add'>+			} else {</div><div class='add'>+				path = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 			ext4_mb_mark_bb(inode-&gt;i_sb, map.m_pblk, map.m_len, false);</div><div class='ctx'> 			ext4_fc_record_regions(inode-&gt;i_sb, inode-&gt;i_ino,</div><div class='hunk'>@@ -6096,5 +6183,7 @@ int ext4_ext_clear_bb(struct inode *inode)</div><div class='ctx'> 		cur = cur + map.m_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c<br/>index 4a00e2f019d9..e04fbf10fe4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/extents_status.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/extents_status.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/extents_status.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/extents_status.c</a></div><div class='hunk'>@@ -120,9 +120,40 @@</div><div class='ctx'>  *      memory.  Hence, we will reclaim written/unwritten/hole extents from</div><div class='ctx'>  *      the tree under a heavy memory pressure.</div><div class='ctx'>  *</div><div class='add'>+ * ==========================================================================</div><div class='add'>+ * 3. Assurance of Ext4 extent status tree consistency</div><div class='add'>+ *</div><div class='add'>+ * When mapping blocks, Ext4 queries the extent status tree first and should</div><div class='add'>+ * always trusts that the extent status tree is consistent and up to date.</div><div class='add'>+ * Therefore, it is important to adheres to the following rules when createing,</div><div class='add'>+ * modifying and removing extents.</div><div class='add'>+ *</div><div class='add'>+ *  1. Besides fastcommit replay, when Ext4 creates or queries block mappings,</div><div class='add'>+ *     the extent information should always be processed through the extent</div><div class='add'>+ *     status tree instead of being organized manually through the on-disk</div><div class='add'>+ *     extent tree.</div><div class='add'>+ *</div><div class='add'>+ *  2. When updating the extent tree, Ext4 should acquire the i_data_sem</div><div class='add'>+ *     exclusively and update the extent status tree atomically. If the extents</div><div class='add'>+ *     to be modified are large enough to exceed the range that a single</div><div class='add'>+ *     i_data_sem can process (as ext4_datasem_ensure_credits() may drop</div><div class='add'>+ *     i_data_sem to restart a transaction), it must (e.g. as ext4_punch_hole()</div><div class='add'>+ *     does):</div><div class='add'>+ *</div><div class='add'>+ *     a) Hold the i_rwsem and invalidate_lock exclusively. This ensures</div><div class='add'>+ *        exclusion against page faults, as well as reads and writes that may</div><div class='add'>+ *        concurrently modify the extent status tree.</div><div class='add'>+ *     b) Evict all page cache in the affected range and recommend rebuilding</div><div class='add'>+ *        or dropping the extent status tree after modifying the on-disk</div><div class='add'>+ *        extent tree. This ensures exclusion against concurrent writebacks</div><div class='add'>+ *        that do not hold those locks but only holds a folio lock.</div><div class='add'>+ *</div><div class='add'>+ *  3. Based on the rules above, when querying block mappings, Ext4 should at</div><div class='add'>+ *     least hold the i_rwsem or invalidate_lock or folio lock(s) for the</div><div class='add'>+ *     specified querying range.</div><div class='ctx'>  *</div><div class='ctx'>  * ==========================================================================</div><div class='del'>- * 3. Performance analysis</div><div class='add'>+ * 4. Performance analysis</div><div class='ctx'>  *</div><div class='ctx'>  *   --	overhead</div><div class='ctx'>  *	1. There is a cache extent for write access, so if writes are</div><div class='hunk'>@@ -134,7 +165,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * ==========================================================================</div><div class='del'>- * 4. TODO list</div><div class='add'>+ * 5. TODO list</div><div class='ctx'>  *</div><div class='ctx'>  *   -- Refactor delayed space reservation</div><div class='ctx'>  *</div><div class='hunk'>@@ -204,6 +235,13 @@ static inline ext4_lblk_t ext4_es_end(struct extent_status *es)</div><div class='ctx'> 	return es-&gt;es_lblk + es-&gt;es_len - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ext4_es_inc_seq(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(ei-&gt;i_es_seq, ei-&gt;i_es_seq + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * search through the tree for an delayed extent with a given offset.  If</div><div class='ctx'>  * it can't be found, try to find next extent.</div><div class='hunk'>@@ -310,6 +348,8 @@ void ext4_es_find_extent_range(struct inode *inode,</div><div class='ctx'> 			       ext4_lblk_t lblk, ext4_lblk_t end,</div><div class='ctx'> 			       struct extent_status *es)</div><div class='ctx'> {</div><div class='add'>+	es-&gt;es_lblk = es-&gt;es_len = es-&gt;es_pblk = 0;</div><div class='add'>+</div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -556,8 +596,8 @@ static int ext4_es_can_be_merged(struct extent_status *es1,</div><div class='ctx'> 	if (ext4_es_is_hole(es1))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	/* we need to check delayed extent is without unwritten status */</div><div class='del'>-	if (ext4_es_is_delayed(es1) &amp;&amp; !ext4_es_is_unwritten(es1))</div><div class='add'>+	/* we need to check delayed extent */</div><div class='add'>+	if (ext4_es_is_delayed(es1))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -846,11 +886,12 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 			   ext4_lblk_t len, ext4_fsblk_t pblk,</div><div class='del'>-			   unsigned int status)</div><div class='add'>+			   unsigned int status, bool delalloc_reserve_used)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_status newes;</div><div class='ctx'> 	ext4_lblk_t end = lblk + len - 1;</div><div class='ctx'> 	int err1 = 0, err2 = 0, err3 = 0;</div><div class='add'>+	int resv_used = 0, pending = 0;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct extent_status *es1 = NULL;</div><div class='ctx'> 	struct extent_status *es2 = NULL;</div><div class='hunk'>@@ -860,26 +901,18 @@ void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	es_debug("add [%u/%u) %llu %x to extent status tree of inode %lu\n",</div><div class='del'>-		 lblk, len, pblk, status, inode-&gt;i_ino);</div><div class='add'>+	es_debug("add [%u/%u) %llu %x %d to extent status tree of inode %lu\n",</div><div class='add'>+		 lblk, len, pblk, status, delalloc_reserve_used, inode-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(end &lt; lblk);</div><div class='del'>-</div><div class='del'>-	if ((status &amp; EXTENT_STATUS_DELAYED) &amp;&amp;</div><div class='del'>-	    (status &amp; EXTENT_STATUS_WRITTEN)) {</div><div class='del'>-		ext4_warning(inode-&gt;i_sb, "Inserting extent [%u/%u] as "</div><div class='del'>-				" delayed and written which can potentially "</div><div class='del'>-				" cause data loss.", lblk, len);</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-	}</div><div class='add'>+	WARN_ON_ONCE(status &amp; EXTENT_STATUS_DELAYED);</div><div class='ctx'> </div><div class='ctx'> 	newes.es_lblk = lblk;</div><div class='ctx'> 	newes.es_len = len;</div><div class='ctx'> 	ext4_es_store_pblock_status(&amp;newes, pblk, status);</div><div class='del'>-	trace_ext4_es_insert_extent(inode, &amp;newes);</div><div class='ctx'> </div><div class='ctx'> 	ext4_es_insert_extent_check(inode, &amp;newes);</div><div class='ctx'> </div><div class='hunk'>@@ -892,11 +925,11 @@ retry:</div><div class='ctx'> 		es1 = __es_alloc_extent(true);</div><div class='ctx'> 	if ((err1 || err2) &amp;&amp; !es2)</div><div class='ctx'> 		es2 = __es_alloc_extent(true);</div><div class='del'>-	if ((err1 || err2 || err3) &amp;&amp; revise_pending &amp;&amp; !pr)</div><div class='add'>+	if ((err1 || err2 || err3 &lt; 0) &amp;&amp; revise_pending &amp;&amp; !pr)</div><div class='ctx'> 		pr = __alloc_pending(true);</div><div class='ctx'> 	write_lock(&amp;EXT4_I(inode)-&gt;i_es_lock);</div><div class='ctx'> </div><div class='del'>-	err1 = __es_remove_extent(inode, lblk, end, NULL, es1);</div><div class='add'>+	err1 = __es_remove_extent(inode, lblk, end, &amp;resv_used, es1);</div><div class='ctx'> 	if (err1 != 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	/* Free preallocated extent if it didn't get used. */</div><div class='hunk'>@@ -920,18 +953,46 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	if (revise_pending) {</div><div class='ctx'> 		err3 = __revise_pending(inode, lblk, len, &amp;pr);</div><div class='del'>-		if (err3 != 0)</div><div class='add'>+		if (err3 &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		if (pr) {</div><div class='ctx'> 			__free_pending(pr);</div><div class='ctx'> 			pr = NULL;</div><div class='ctx'> 		}</div><div class='add'>+		pending = err3;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: For cache on-disk extents, there is no need to increment</div><div class='add'>+	 * the sequence counter, this requires future optimization.</div><div class='add'>+	 */</div><div class='add'>+	ext4_es_inc_seq(inode);</div><div class='ctx'> error:</div><div class='ctx'> 	write_unlock(&amp;EXT4_I(inode)-&gt;i_es_lock);</div><div class='del'>-	if (err1 || err2 || err3)</div><div class='add'>+	/*</div><div class='add'>+	 * Reduce the reserved cluster count to reflect successful deferred</div><div class='add'>+	 * allocation of delayed allocated clusters or direct allocation of</div><div class='add'>+	 * clusters discovered to be delayed allocated.  Once allocated, a</div><div class='add'>+	 * cluster is not included in the reserved count.</div><div class='add'>+	 *</div><div class='add'>+	 * When direct allocating (from fallocate, filemap, DIO, or clusters</div><div class='add'>+	 * allocated when delalloc has been disabled by ext4_nonda_switch())</div><div class='add'>+	 * an extent either 1) contains delayed blocks but start with</div><div class='add'>+	 * non-delayed allocated blocks (e.g. hole) or 2) contains non-delayed</div><div class='add'>+	 * allocated blocks which belong to delayed allocated clusters when</div><div class='add'>+	 * bigalloc feature is enabled, quota has already been claimed by</div><div class='add'>+	 * ext4_mb_new_blocks(), so release the quota reservations made for</div><div class='add'>+	 * any previously delayed allocated clusters instead of claim them</div><div class='add'>+	 * again.</div><div class='add'>+	 */</div><div class='add'>+	resv_used += pending;</div><div class='add'>+	if (resv_used)</div><div class='add'>+		ext4_da_update_reserve_space(inode, resv_used,</div><div class='add'>+					     delalloc_reserve_used);</div><div class='add'>+</div><div class='add'>+	if (err1 || err2 || err3 &lt; 0)</div><div class='ctx'> 		goto retry;</div><div class='ctx'> </div><div class='add'>+	trace_ext4_es_insert_extent(inode, &amp;newes);</div><div class='ctx'> 	ext4_es_print_tree(inode);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -978,8 +1039,8 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'>  * Return: 1 on found, 0 on not</div><div class='ctx'>  */</div><div class='ctx'> int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='del'>-			  ext4_lblk_t *next_lblk,</div><div class='del'>-			  struct extent_status *es)</div><div class='add'>+			  ext4_lblk_t *next_lblk, struct extent_status *es,</div><div class='add'>+			  u64 *pseq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_es_tree *tree;</div><div class='ctx'> 	struct ext4_es_stats *stats;</div><div class='hunk'>@@ -1038,6 +1099,8 @@ out:</div><div class='ctx'> 			} else</div><div class='ctx'> 				*next_lblk = 0;</div><div class='ctx'> 		}</div><div class='add'>+		if (pseq)</div><div class='add'>+			*pseq = EXT4_I(inode)-&gt;i_es_seq;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		percpu_counter_inc(&amp;stats-&gt;es_stats_cache_misses);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1049,7 +1112,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct rsvd_count {</div><div class='del'>-	int ndelonly;</div><div class='add'>+	int ndelayed;</div><div class='ctx'> 	bool first_do_lblk_found;</div><div class='ctx'> 	ext4_lblk_t first_do_lblk;</div><div class='ctx'> 	ext4_lblk_t last_do_lblk;</div><div class='hunk'>@@ -1075,10 +1138,10 @@ static void init_rsvd(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	rc-&gt;ndelonly = 0;</div><div class='add'>+	rc-&gt;ndelayed = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * for bigalloc, note the first delonly block in the range has not</div><div class='add'>+	 * for bigalloc, note the first delayed block in the range has not</div><div class='ctx'> 	 * been found, record the extent containing the block to the left of</div><div class='ctx'> 	 * the region to be removed, if any, and note that there's no partial</div><div class='ctx'> 	 * cluster to track</div><div class='hunk'>@@ -1098,9 +1161,8 @@ static void init_rsvd(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * count_rsvd - count the clusters containing delayed and not unwritten</div><div class='del'>- *		(delonly) blocks in a range within an extent and add to</div><div class='del'>- *	        the running tally in rsvd_count</div><div class='add'>+ * count_rsvd - count the clusters containing delayed blocks in a range</div><div class='add'>+ *	        within an extent and add to the running tally in rsvd_count</div><div class='ctx'>  *</div><div class='ctx'>  * @inode - file containing extent</div><div class='ctx'>  * @lblk - first block in range</div><div class='hunk'>@@ -1117,13 +1179,13 @@ static void count_rsvd(struct inode *inode, ext4_lblk_t lblk, long len,</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	ext4_lblk_t i, end, nclu;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_es_is_delonly(es))</div><div class='add'>+	if (!ext4_es_is_delayed(es))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(len &lt;= 0);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;s_cluster_ratio == 1) {</div><div class='del'>-		rc-&gt;ndelonly += (int) len;</div><div class='add'>+		rc-&gt;ndelayed += (int) len;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1133,7 +1195,7 @@ static void count_rsvd(struct inode *inode, ext4_lblk_t lblk, long len,</div><div class='ctx'> 	end = lblk + (ext4_lblk_t) len - 1;</div><div class='ctx'> 	end = (end &gt; ext4_es_end(es)) ? ext4_es_end(es) : end;</div><div class='ctx'> </div><div class='del'>-	/* record the first block of the first delonly extent seen */</div><div class='add'>+	/* record the first block of the first delayed extent seen */</div><div class='ctx'> 	if (!rc-&gt;first_do_lblk_found) {</div><div class='ctx'> 		rc-&gt;first_do_lblk = i;</div><div class='ctx'> 		rc-&gt;first_do_lblk_found = true;</div><div class='hunk'>@@ -1147,7 +1209,7 @@ static void count_rsvd(struct inode *inode, ext4_lblk_t lblk, long len,</div><div class='ctx'> 	 * doesn't start with it, count it and stop tracking</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rc-&gt;partial &amp;&amp; (rc-&gt;lclu != EXT4_B2C(sbi, i))) {</div><div class='del'>-		rc-&gt;ndelonly++;</div><div class='add'>+		rc-&gt;ndelayed++;</div><div class='ctx'> 		rc-&gt;partial = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1157,7 +1219,7 @@ static void count_rsvd(struct inode *inode, ext4_lblk_t lblk, long len,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (EXT4_LBLK_COFF(sbi, i) != 0) {</div><div class='ctx'> 		if (end &gt;= EXT4_LBLK_CFILL(sbi, i)) {</div><div class='del'>-			rc-&gt;ndelonly++;</div><div class='add'>+			rc-&gt;ndelayed++;</div><div class='ctx'> 			rc-&gt;partial = false;</div><div class='ctx'> 			i = EXT4_LBLK_CFILL(sbi, i) + 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1165,11 +1227,11 @@ static void count_rsvd(struct inode *inode, ext4_lblk_t lblk, long len,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if the current cluster starts on a cluster boundary, count the</div><div class='del'>-	 * number of whole delonly clusters in the extent</div><div class='add'>+	 * number of whole delayed clusters in the extent</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((i + sbi-&gt;s_cluster_ratio - 1) &lt;= end) {</div><div class='ctx'> 		nclu = (end - i + 1) &gt;&gt; sbi-&gt;s_cluster_bits;</div><div class='del'>-		rc-&gt;ndelonly += nclu;</div><div class='add'>+		rc-&gt;ndelayed += nclu;</div><div class='ctx'> 		i += nclu &lt;&lt; sbi-&gt;s_cluster_bits;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1229,10 +1291,9 @@ static struct pending_reservation *__pr_tree_search(struct rb_root *root,</div><div class='ctx'>  * @rc - pointer to reserved count data</div><div class='ctx'>  *</div><div class='ctx'>  * The number of reservations to be released is equal to the number of</div><div class='del'>- * clusters containing delayed and not unwritten (delonly) blocks within</div><div class='del'>- * the range, minus the number of clusters still containing delonly blocks</div><div class='del'>- * at the ends of the range, and minus the number of pending reservations</div><div class='del'>- * within the range.</div><div class='add'>+ * clusters containing delayed blocks within the range, minus the number of</div><div class='add'>+ * clusters still containing delayed blocks at the ends of the range, and</div><div class='add'>+ * minus the number of pending reservations within the range.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 			     struct extent_status *right_es,</div><div class='hunk'>@@ -1243,33 +1304,33 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 	struct ext4_pending_tree *tree = &amp;EXT4_I(inode)-&gt;i_pending_tree;</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> 	ext4_lblk_t first_lclu, last_lclu;</div><div class='del'>-	bool left_delonly, right_delonly, count_pending;</div><div class='add'>+	bool left_delayed, right_delayed, count_pending;</div><div class='ctx'> 	struct extent_status *es;</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;s_cluster_ratio &gt; 1) {</div><div class='ctx'> 		/* count any remaining partial cluster */</div><div class='ctx'> 		if (rc-&gt;partial)</div><div class='del'>-			rc-&gt;ndelonly++;</div><div class='add'>+			rc-&gt;ndelayed++;</div><div class='ctx'> </div><div class='del'>-		if (rc-&gt;ndelonly == 0)</div><div class='add'>+		if (rc-&gt;ndelayed == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		first_lclu = EXT4_B2C(sbi, rc-&gt;first_do_lblk);</div><div class='ctx'> 		last_lclu = EXT4_B2C(sbi, rc-&gt;last_do_lblk);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * decrease the delonly count by the number of clusters at the</div><div class='del'>-		 * ends of the range that still contain delonly blocks -</div><div class='add'>+		 * decrease the delayed count by the number of clusters at the</div><div class='add'>+		 * ends of the range that still contain delayed blocks -</div><div class='ctx'> 		 * these clusters still need to be reserved</div><div class='ctx'> 		 */</div><div class='del'>-		left_delonly = right_delonly = false;</div><div class='add'>+		left_delayed = right_delayed = false;</div><div class='ctx'> </div><div class='ctx'> 		es = rc-&gt;left_es;</div><div class='ctx'> 		while (es &amp;&amp; ext4_es_end(es) &gt;=</div><div class='ctx'> 		       EXT4_LBLK_CMASK(sbi, rc-&gt;first_do_lblk)) {</div><div class='del'>-			if (ext4_es_is_delonly(es)) {</div><div class='del'>-				rc-&gt;ndelonly--;</div><div class='del'>-				left_delonly = true;</div><div class='add'>+			if (ext4_es_is_delayed(es)) {</div><div class='add'>+				rc-&gt;ndelayed--;</div><div class='add'>+				left_delayed = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			node = rb_prev(&amp;es-&gt;rb_node);</div><div class='hunk'>@@ -1277,7 +1338,7 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 				break;</div><div class='ctx'> 			es = rb_entry(node, struct extent_status, rb_node);</div><div class='ctx'> 		}</div><div class='del'>-		if (right_es &amp;&amp; (!left_delonly || first_lclu != last_lclu)) {</div><div class='add'>+		if (right_es &amp;&amp; (!left_delayed || first_lclu != last_lclu)) {</div><div class='ctx'> 			if (end &lt; ext4_es_end(right_es)) {</div><div class='ctx'> 				es = right_es;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -1287,9 +1348,9 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 			}</div><div class='ctx'> 			while (es &amp;&amp; es-&gt;es_lblk &lt;=</div><div class='ctx'> 			       EXT4_LBLK_CFILL(sbi, rc-&gt;last_do_lblk)) {</div><div class='del'>-				if (ext4_es_is_delonly(es)) {</div><div class='del'>-					rc-&gt;ndelonly--;</div><div class='del'>-					right_delonly = true;</div><div class='add'>+				if (ext4_es_is_delayed(es)) {</div><div class='add'>+					rc-&gt;ndelayed--;</div><div class='add'>+					right_delayed = true;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				node = rb_next(&amp;es-&gt;rb_node);</div><div class='hunk'>@@ -1303,21 +1364,21 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Determine the block range that should be searched for</div><div class='ctx'> 		 * pending reservations, if any.  Clusters on the ends of the</div><div class='del'>-		 * original removed range containing delonly blocks are</div><div class='add'>+		 * original removed range containing delayed blocks are</div><div class='ctx'> 		 * excluded.  They've already been accounted for and it's not</div><div class='ctx'> 		 * possible to determine if an associated pending reservation</div><div class='ctx'> 		 * should be released with the information available in the</div><div class='ctx'> 		 * extents status tree.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (first_lclu == last_lclu) {</div><div class='del'>-			if (left_delonly | right_delonly)</div><div class='add'>+			if (left_delayed | right_delayed)</div><div class='ctx'> 				count_pending = false;</div><div class='ctx'> 			else</div><div class='ctx'> 				count_pending = true;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (left_delonly)</div><div class='add'>+			if (left_delayed)</div><div class='ctx'> 				first_lclu++;</div><div class='del'>-			if (right_delonly)</div><div class='add'>+			if (right_delayed)</div><div class='ctx'> 				last_lclu--;</div><div class='ctx'> 			if (first_lclu &lt;= last_lclu)</div><div class='ctx'> 				count_pending = true;</div><div class='hunk'>@@ -1328,13 +1389,13 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * a pending reservation found between first_lclu and last_lclu</div><div class='ctx'> 		 * represents an allocated cluster that contained at least one</div><div class='del'>-		 * delonly block, so the delonly total must be reduced by one</div><div class='add'>+		 * delayed block, so the delayed total must be reduced by one</div><div class='ctx'> 		 * for each pending reservation found and released</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (count_pending) {</div><div class='ctx'> 			pr = __pr_tree_search(&amp;tree-&gt;root, first_lclu);</div><div class='ctx'> 			while (pr &amp;&amp; pr-&gt;lclu &lt;= last_lclu) {</div><div class='del'>-				rc-&gt;ndelonly--;</div><div class='add'>+				rc-&gt;ndelayed--;</div><div class='ctx'> 				node = rb_next(&amp;pr-&gt;rb_node);</div><div class='ctx'> 				rb_erase(&amp;pr-&gt;rb_node, &amp;tree-&gt;root);</div><div class='ctx'> 				__free_pending(pr);</div><div class='hunk'>@@ -1345,7 +1406,7 @@ static unsigned int get_rsvd(struct inode *inode, ext4_lblk_t end,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return rc-&gt;ndelonly;</div><div class='add'>+	return rc-&gt;ndelayed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1503,7 +1564,6 @@ void ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	trace_ext4_es_remove_extent(inode, lblk, len);</div><div class='ctx'> 	es_debug("remove [%u/%u) from extent status tree of inode %lu\n",</div><div class='ctx'> 		 lblk, len, inode-&gt;i_ino);</div><div class='ctx'> </div><div class='hunk'>@@ -1523,19 +1583,23 @@ retry:</div><div class='ctx'> 	 */</div><div class='ctx'> 	write_lock(&amp;EXT4_I(inode)-&gt;i_es_lock);</div><div class='ctx'> 	err = __es_remove_extent(inode, lblk, end, &amp;reserved, es);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='ctx'> 	/* Free preallocated extent if it didn't get used. */</div><div class='ctx'> 	if (es) {</div><div class='ctx'> 		if (!es-&gt;es_len)</div><div class='ctx'> 			__es_free_extent(es);</div><div class='ctx'> 		es = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	ext4_es_inc_seq(inode);</div><div class='add'>+error:</div><div class='ctx'> 	write_unlock(&amp;EXT4_I(inode)-&gt;i_es_lock);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto retry;</div><div class='ctx'> </div><div class='add'>+	trace_ext4_es_remove_extent(inode, lblk, len);</div><div class='ctx'> 	ext4_es_print_tree(inode);</div><div class='ctx'> 	ext4_da_release_space(inode, reserved);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __es_shrink(struct ext4_sb_info *sbi, int nr_to_scan,</div><div class='hunk'>@@ -1938,7 +2002,7 @@ static struct pending_reservation *__get_pending(struct inode *inode,</div><div class='ctx'>  * @lblk - logical block in the cluster to be added</div><div class='ctx'>  * @prealloc - preallocated pending entry</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on successful insertion and -ENOMEM on failure.  If the</div><div class='add'>+ * Returns 1 on successful insertion and -ENOMEM on failure.  If the</div><div class='ctx'>  * pending reservation is already in the set, returns successfully.</div><div class='ctx'>  */</div><div class='ctx'> static int __insert_pending(struct inode *inode, ext4_lblk_t lblk,</div><div class='hunk'>@@ -1982,6 +2046,7 @@ static int __insert_pending(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> </div><div class='ctx'> 	rb_link_node(&amp;pr-&gt;rb_node, parent, p);</div><div class='ctx'> 	rb_insert_color(&amp;pr-&gt;rb_node, &amp;tree-&gt;root);</div><div class='add'>+	ret = 1;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2052,34 +2117,47 @@ bool ext4_is_pending(struct inode *inode, ext4_lblk_t lblk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ext4_es_insert_delayed_block - adds a delayed block to the extents status</div><div class='del'>- *                                tree, adding a pending reservation where</div><div class='del'>- *                                needed</div><div class='add'>+ * ext4_es_insert_delayed_extent - adds some delayed blocks to the extents</div><div class='add'>+ *                                 status tree, adding a pending reservation</div><div class='add'>+ *                                 where needed</div><div class='ctx'>  *</div><div class='ctx'>  * @inode - file containing the newly added block</div><div class='del'>- * @lblk - logical block to be added</div><div class='del'>- * @allocated - indicates whether a physical cluster has been allocated for</div><div class='del'>- *              the logical cluster that contains the block</div><div class='add'>+ * @lblk - start logical block to be added</div><div class='add'>+ * @len - length of blocks to be added</div><div class='add'>+ * @lclu_allocated/end_allocated - indicates whether a physical cluster has</div><div class='add'>+ *                                 been allocated for the logical cluster</div><div class='add'>+ *                                 that contains the start/end block. Note that</div><div class='add'>+ *                                 end_allocated should always be set to false</div><div class='add'>+ *                                 if the start and the end block are in the</div><div class='add'>+ *                                 same cluster</div><div class='ctx'>  */</div><div class='del'>-void ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk,</div><div class='del'>-				  bool allocated)</div><div class='add'>+void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='add'>+				   ext4_lblk_t len, bool lclu_allocated,</div><div class='add'>+				   bool end_allocated)</div><div class='ctx'> {</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct extent_status newes;</div><div class='add'>+	ext4_lblk_t end = lblk + len - 1;</div><div class='ctx'> 	int err1 = 0, err2 = 0, err3 = 0;</div><div class='ctx'> 	struct extent_status *es1 = NULL;</div><div class='ctx'> 	struct extent_status *es2 = NULL;</div><div class='del'>-	struct pending_reservation *pr = NULL;</div><div class='add'>+	struct pending_reservation *pr1 = NULL;</div><div class='add'>+	struct pending_reservation *pr2 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	es_debug("add [%u/1) delayed to extent status tree of inode %lu\n",</div><div class='del'>-		 lblk, inode-&gt;i_ino);</div><div class='add'>+	es_debug("add [%u/%u) delayed to extent status tree of inode %lu\n",</div><div class='add'>+		 lblk, len, inode-&gt;i_ino);</div><div class='add'>+	if (!len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE((EXT4_B2C(sbi, lblk) == EXT4_B2C(sbi, end)) &amp;&amp;</div><div class='add'>+		     end_allocated);</div><div class='ctx'> </div><div class='ctx'> 	newes.es_lblk = lblk;</div><div class='del'>-	newes.es_len = 1;</div><div class='add'>+	newes.es_len = len;</div><div class='ctx'> 	ext4_es_store_pblock_status(&amp;newes, ~0, EXTENT_STATUS_DELAYED);</div><div class='del'>-	trace_ext4_es_insert_delayed_block(inode, &amp;newes, allocated);</div><div class='ctx'> </div><div class='ctx'> 	ext4_es_insert_extent_check(inode, &amp;newes);</div><div class='ctx'> </div><div class='hunk'>@@ -2088,11 +2166,15 @@ retry:</div><div class='ctx'> 		es1 = __es_alloc_extent(true);</div><div class='ctx'> 	if ((err1 || err2) &amp;&amp; !es2)</div><div class='ctx'> 		es2 = __es_alloc_extent(true);</div><div class='del'>-	if ((err1 || err2 || err3) &amp;&amp; allocated &amp;&amp; !pr)</div><div class='del'>-		pr = __alloc_pending(true);</div><div class='add'>+	if (err1 || err2 || err3 &lt; 0) {</div><div class='add'>+		if (lclu_allocated &amp;&amp; !pr1)</div><div class='add'>+			pr1 = __alloc_pending(true);</div><div class='add'>+		if (end_allocated &amp;&amp; !pr2)</div><div class='add'>+			pr2 = __alloc_pending(true);</div><div class='add'>+	}</div><div class='ctx'> 	write_lock(&amp;EXT4_I(inode)-&gt;i_es_lock);</div><div class='ctx'> </div><div class='del'>-	err1 = __es_remove_extent(inode, lblk, lblk, NULL, es1);</div><div class='add'>+	err1 = __es_remove_extent(inode, lblk, end, NULL, es1);</div><div class='ctx'> 	if (err1 != 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	/* Free preallocated extent if it didn't get used. */</div><div class='hunk'>@@ -2112,114 +2194,38 @@ retry:</div><div class='ctx'> 		es2 = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (allocated) {</div><div class='del'>-		err3 = __insert_pending(inode, lblk, &amp;pr);</div><div class='del'>-		if (err3 != 0)</div><div class='add'>+	if (lclu_allocated) {</div><div class='add'>+		err3 = __insert_pending(inode, lblk, &amp;pr1);</div><div class='add'>+		if (err3 &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='del'>-		if (pr) {</div><div class='del'>-			__free_pending(pr);</div><div class='del'>-			pr = NULL;</div><div class='add'>+		if (pr1) {</div><div class='add'>+			__free_pending(pr1);</div><div class='add'>+			pr1 = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (end_allocated) {</div><div class='add'>+		err3 = __insert_pending(inode, end, &amp;pr2);</div><div class='add'>+		if (err3 &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		if (pr2) {</div><div class='add'>+			__free_pending(pr2);</div><div class='add'>+			pr2 = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	ext4_es_inc_seq(inode);</div><div class='ctx'> error:</div><div class='ctx'> 	write_unlock(&amp;EXT4_I(inode)-&gt;i_es_lock);</div><div class='del'>-	if (err1 || err2 || err3)</div><div class='add'>+	if (err1 || err2 || err3 &lt; 0)</div><div class='ctx'> 		goto retry;</div><div class='ctx'> </div><div class='add'>+	trace_ext4_es_insert_delayed_extent(inode, &amp;newes, lclu_allocated,</div><div class='add'>+					    end_allocated);</div><div class='ctx'> 	ext4_es_print_tree(inode);</div><div class='ctx'> 	ext4_print_pending_tree(inode);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * __es_delayed_clu - count number of clusters containing blocks that</div><div class='del'>- *                    are delayed only</div><div class='del'>- *</div><div class='del'>- * @inode - file containing block range</div><div class='del'>- * @start - logical block defining start of range</div><div class='del'>- * @end - logical block defining end of range</div><div class='del'>- *</div><div class='del'>- * Returns the number of clusters containing only delayed (not delayed</div><div class='del'>- * and unwritten) blocks in the range specified by @start and @end.  Any</div><div class='del'>- * cluster or part of a cluster within the range and containing a delayed</div><div class='del'>- * and not unwritten block within the range is counted as a whole cluster.</div><div class='del'>- */</div><div class='del'>-static unsigned int __es_delayed_clu(struct inode *inode, ext4_lblk_t start,</div><div class='del'>-				     ext4_lblk_t end)</div><div class='del'>-{</div><div class='del'>-	struct ext4_es_tree *tree = &amp;EXT4_I(inode)-&gt;i_es_tree;</div><div class='del'>-	struct extent_status *es;</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='del'>-	struct rb_node *node;</div><div class='del'>-	ext4_lblk_t first_lclu, last_lclu;</div><div class='del'>-	unsigned long long last_counted_lclu;</div><div class='del'>-	unsigned int n = 0;</div><div class='del'>-</div><div class='del'>-	/* guaranteed to be unequal to any ext4_lblk_t value */</div><div class='del'>-	last_counted_lclu = ~0ULL;</div><div class='del'>-</div><div class='del'>-	es = __es_tree_search(&amp;tree-&gt;root, start);</div><div class='del'>-</div><div class='del'>-	while (es &amp;&amp; (es-&gt;es_lblk &lt;= end)) {</div><div class='del'>-		if (ext4_es_is_delonly(es)) {</div><div class='del'>-			if (es-&gt;es_lblk &lt;= start)</div><div class='del'>-				first_lclu = EXT4_B2C(sbi, start);</div><div class='del'>-			else</div><div class='del'>-				first_lclu = EXT4_B2C(sbi, es-&gt;es_lblk);</div><div class='del'>-</div><div class='del'>-			if (ext4_es_end(es) &gt;= end)</div><div class='del'>-				last_lclu = EXT4_B2C(sbi, end);</div><div class='del'>-			else</div><div class='del'>-				last_lclu = EXT4_B2C(sbi, ext4_es_end(es));</div><div class='del'>-</div><div class='del'>-			if (first_lclu == last_counted_lclu)</div><div class='del'>-				n += last_lclu - first_lclu;</div><div class='del'>-			else</div><div class='del'>-				n += last_lclu - first_lclu + 1;</div><div class='del'>-			last_counted_lclu = last_lclu;</div><div class='del'>-		}</div><div class='del'>-		node = rb_next(&amp;es-&gt;rb_node);</div><div class='del'>-		if (!node)</div><div class='del'>-			break;</div><div class='del'>-		es = rb_entry(node, struct extent_status, rb_node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ext4_es_delayed_clu - count number of clusters containing blocks that</div><div class='del'>- *                       are both delayed and unwritten</div><div class='del'>- *</div><div class='del'>- * @inode - file containing block range</div><div class='del'>- * @lblk - logical block defining start of range</div><div class='del'>- * @len - number of blocks in range</div><div class='del'>- *</div><div class='del'>- * Locking for external use of __es_delayed_clu().</div><div class='del'>- */</div><div class='del'>-unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t lblk,</div><div class='del'>-				 ext4_lblk_t len)</div><div class='del'>-{</div><div class='del'>-	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='del'>-	ext4_lblk_t end;</div><div class='del'>-	unsigned int n;</div><div class='del'>-</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	end = lblk + len - 1;</div><div class='del'>-	WARN_ON(end &lt; lblk);</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;ei-&gt;i_es_lock);</div><div class='del'>-</div><div class='del'>-	n = __es_delayed_clu(inode, lblk, end);</div><div class='del'>-</div><div class='del'>-	read_unlock(&amp;ei-&gt;i_es_lock);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * __revise_pending - makes, cancels, or leaves unchanged pending cluster</div><div class='ctx'>  *                    reservations for a specified block range depending</div><div class='ctx'>  *                    upon the presence or absence of delayed blocks</div><div class='hunk'>@@ -2233,7 +2239,9 @@ unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'>  *</div><div class='ctx'>  * Used after a newly allocated extent is added to the extents status tree.</div><div class='ctx'>  * Requires that the extents in the range have either written or unwritten</div><div class='del'>- * status.  Must be called while holding i_es_lock.</div><div class='add'>+ * status.  Must be called while holding i_es_lock. Returns number of new</div><div class='add'>+ * inserts pending cluster on insert pendings, returns 0 on remove pendings,</div><div class='add'>+ * return -ENOMEM on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 			    ext4_lblk_t len,</div><div class='hunk'>@@ -2243,6 +2251,7 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 	ext4_lblk_t end = lblk + len - 1;</div><div class='ctx'> 	ext4_lblk_t first, last;</div><div class='ctx'> 	bool f_del = false, l_del = false;</div><div class='add'>+	int pendings = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (len == 0)</div><div class='hunk'>@@ -2264,49 +2273,53 @@ static int __revise_pending(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 	if (EXT4_B2C(sbi, lblk) == EXT4_B2C(sbi, end)) {</div><div class='ctx'> 		first = EXT4_LBLK_CMASK(sbi, lblk);</div><div class='ctx'> 		if (first != lblk)</div><div class='del'>-			f_del = __es_scan_range(inode, &amp;ext4_es_is_delonly,</div><div class='add'>+			f_del = __es_scan_range(inode, &amp;ext4_es_is_delayed,</div><div class='ctx'> 						first, lblk - 1);</div><div class='ctx'> 		if (f_del) {</div><div class='ctx'> 			ret = __insert_pending(inode, first, prealloc);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='add'>+			pendings += ret;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			last = EXT4_LBLK_CMASK(sbi, end) +</div><div class='ctx'> 			       sbi-&gt;s_cluster_ratio - 1;</div><div class='ctx'> 			if (last != end)</div><div class='ctx'> 				l_del = __es_scan_range(inode,</div><div class='del'>-							&amp;ext4_es_is_delonly,</div><div class='add'>+							&amp;ext4_es_is_delayed,</div><div class='ctx'> 							end + 1, last);</div><div class='ctx'> 			if (l_del) {</div><div class='ctx'> 				ret = __insert_pending(inode, last, prealloc);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='add'>+				pendings += ret;</div><div class='ctx'> 			} else</div><div class='ctx'> 				__remove_pending(inode, last);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		first = EXT4_LBLK_CMASK(sbi, lblk);</div><div class='ctx'> 		if (first != lblk)</div><div class='del'>-			f_del = __es_scan_range(inode, &amp;ext4_es_is_delonly,</div><div class='add'>+			f_del = __es_scan_range(inode, &amp;ext4_es_is_delayed,</div><div class='ctx'> 						first, lblk - 1);</div><div class='ctx'> 		if (f_del) {</div><div class='ctx'> 			ret = __insert_pending(inode, first, prealloc);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='add'>+			pendings += ret;</div><div class='ctx'> 		} else</div><div class='ctx'> 			__remove_pending(inode, first);</div><div class='ctx'> </div><div class='ctx'> 		last = EXT4_LBLK_CMASK(sbi, end) + sbi-&gt;s_cluster_ratio - 1;</div><div class='ctx'> 		if (last != end)</div><div class='del'>-			l_del = __es_scan_range(inode, &amp;ext4_es_is_delonly,</div><div class='add'>+			l_del = __es_scan_range(inode, &amp;ext4_es_is_delayed,</div><div class='ctx'> 						end + 1, last);</div><div class='ctx'> 		if (l_del) {</div><div class='ctx'> 			ret = __insert_pending(inode, last, prealloc);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='add'>+			pendings += ret;</div><div class='ctx'> 		} else</div><div class='ctx'> 			__remove_pending(inode, last);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return ret;</div><div class='add'>+	return (ret &lt; 0) ? ret : pendings;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h<br/>index d9847a4a25db..f3396cf32b44 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/extents_status.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/extents_status.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/extents_status.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/extents_status.h</a></div><div class='hunk'>@@ -42,6 +42,10 @@ enum {</div><div class='ctx'> #define ES_SHIFT (sizeof(ext4_fsblk_t)*8 - ES_FLAGS)</div><div class='ctx'> #define ES_MASK (~((ext4_fsblk_t)0) &lt;&lt; ES_SHIFT)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Besides EXTENT_STATUS_REFERENCED, all these extent type masks</div><div class='add'>+ * are exclusive, only one type can be set at a time.</div><div class='add'>+ */</div><div class='ctx'> #define EXTENT_STATUS_WRITTEN	(1 &lt;&lt; ES_WRITTEN_B)</div><div class='ctx'> #define EXTENT_STATUS_UNWRITTEN (1 &lt;&lt; ES_UNWRITTEN_B)</div><div class='ctx'> #define EXTENT_STATUS_DELAYED	(1 &lt;&lt; ES_DELAYED_B)</div><div class='hunk'>@@ -51,7 +55,9 @@ enum {</div><div class='ctx'> #define ES_TYPE_MASK	((ext4_fsblk_t)(EXTENT_STATUS_WRITTEN | \</div><div class='ctx'> 			  EXTENT_STATUS_UNWRITTEN | \</div><div class='ctx'> 			  EXTENT_STATUS_DELAYED | \</div><div class='del'>-			  EXTENT_STATUS_HOLE) &lt;&lt; ES_SHIFT)</div><div class='add'>+			  EXTENT_STATUS_HOLE))</div><div class='add'>+</div><div class='add'>+#define ES_TYPE_VALID(type)	((type) &amp;&amp; !((type) &amp; ((type) - 1)))</div><div class='ctx'> </div><div class='ctx'> struct ext4_sb_info;</div><div class='ctx'> struct ext4_extent;</div><div class='hunk'>@@ -129,7 +135,8 @@ extern void ext4_es_init_tree(struct ext4_es_tree *tree);</div><div class='ctx'> </div><div class='ctx'> extern void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 				  ext4_lblk_t len, ext4_fsblk_t pblk,</div><div class='del'>-				  unsigned int status);</div><div class='add'>+				  unsigned int status,</div><div class='add'>+				  bool delalloc_reserve_used);</div><div class='ctx'> extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 				 ext4_lblk_t len, ext4_fsblk_t pblk,</div><div class='ctx'> 				 unsigned int status);</div><div class='hunk'>@@ -141,7 +148,7 @@ extern void ext4_es_find_extent_range(struct inode *inode,</div><div class='ctx'> 				      struct extent_status *es);</div><div class='ctx'> extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='ctx'> 				 ext4_lblk_t *next_lblk,</div><div class='del'>-				 struct extent_status *es);</div><div class='add'>+				 struct extent_status *es, u64 *pseq);</div><div class='ctx'> extern bool ext4_es_scan_range(struct inode *inode,</div><div class='ctx'> 			       int (*matching_fn)(struct extent_status *es),</div><div class='ctx'> 			       ext4_lblk_t lblk, ext4_lblk_t end);</div><div class='hunk'>@@ -156,7 +163,7 @@ static inline unsigned int ext4_es_status(struct extent_status *es)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int ext4_es_type(struct extent_status *es)</div><div class='ctx'> {</div><div class='del'>-	return (es-&gt;es_pblk &amp; ES_TYPE_MASK) &gt;&gt; ES_SHIFT;</div><div class='add'>+	return (es-&gt;es_pblk &gt;&gt; ES_SHIFT) &amp; ES_TYPE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ext4_es_is_written(struct extent_status *es)</div><div class='hunk'>@@ -184,11 +191,6 @@ static inline int ext4_es_is_mapped(struct extent_status *es)</div><div class='ctx'> 	return (ext4_es_is_written(es) || ext4_es_is_unwritten(es));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ext4_es_is_delonly(struct extent_status *es)</div><div class='del'>-{</div><div class='del'>-	return (ext4_es_is_delayed(es) &amp;&amp; !ext4_es_is_unwritten(es));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void ext4_es_set_referenced(struct extent_status *es)</div><div class='ctx'> {</div><div class='ctx'> 	es-&gt;es_pblk |= ((ext4_fsblk_t)EXTENT_STATUS_REFERENCED) &lt;&lt; ES_SHIFT;</div><div class='hunk'>@@ -224,17 +226,12 @@ static inline void ext4_es_store_pblock(struct extent_status *es,</div><div class='ctx'> 	es-&gt;es_pblk = block;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ext4_es_store_status(struct extent_status *es,</div><div class='del'>-					unsigned int status)</div><div class='del'>-{</div><div class='del'>-	es-&gt;es_pblk = (((ext4_fsblk_t)status &lt;&lt; ES_SHIFT) &amp; ES_MASK) |</div><div class='del'>-		      (es-&gt;es_pblk &amp; ~ES_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void ext4_es_store_pblock_status(struct extent_status *es,</div><div class='ctx'> 					       ext4_fsblk_t pb,</div><div class='ctx'> 					       unsigned int status)</div><div class='ctx'> {</div><div class='add'>+	WARN_ON_ONCE(!ES_TYPE_VALID(status &amp; ES_TYPE_MASK));</div><div class='add'>+</div><div class='ctx'> 	es-&gt;es_pblk = (((ext4_fsblk_t)status &lt;&lt; ES_SHIFT) &amp; ES_MASK) |</div><div class='ctx'> 		      (pb &amp; ~ES_MASK);</div><div class='ctx'> }</div><div class='hunk'>@@ -249,10 +246,9 @@ extern void ext4_exit_pending(void);</div><div class='ctx'> extern void ext4_init_pending_tree(struct ext4_pending_tree *tree);</div><div class='ctx'> extern void ext4_remove_pending(struct inode *inode, ext4_lblk_t lblk);</div><div class='ctx'> extern bool ext4_is_pending(struct inode *inode, ext4_lblk_t lblk);</div><div class='del'>-extern void ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk,</div><div class='del'>-					 bool allocated);</div><div class='del'>-extern unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t lblk,</div><div class='del'>-					ext4_lblk_t len);</div><div class='add'>+extern void ext4_es_insert_delayed_extent(struct inode *inode, ext4_lblk_t lblk,</div><div class='add'>+					  ext4_lblk_t len, bool lclu_allocated,</div><div class='add'>+					  bool end_allocated);</div><div class='ctx'> extern void ext4_clear_inode_es(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> #endif /* _EXT4_EXTENTS_STATUS_H */</div><div class='head'>diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c<br/>index 87c009e0c59a..fa66b08de999 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/fast_commit.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fast_commit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/fast_commit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/fast_commit.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include "ext4_extents.h"</div><div class='ctx'> #include "mballoc.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='ctx'> /*</div><div class='ctx'>  * Ext4 Fast Commits</div><div class='ctx'>  * -----------------</div><div class='hunk'>@@ -49,19 +50,27 @@</div><div class='ctx'>  * that need to be committed during a fast commit in another in memory queue of</div><div class='ctx'>  * inodes. During the commit operation, we commit in the following order:</div><div class='ctx'>  *</div><div class='del'>- * [1] Lock inodes for any further data updates by setting COMMITTING state</div><div class='del'>- * [2] Submit data buffers of all the inodes</div><div class='del'>- * [3] Wait for [2] to complete</div><div class='del'>- * [4] Commit all the directory entry updates in the fast commit space</div><div class='del'>- * [5] Commit all the changed inode structures</div><div class='del'>- * [6] Write tail tag (this tag ensures the atomicity, please read the following</div><div class='add'>+ * [1] Prepare all the inodes to write out their data by setting</div><div class='add'>+ *     "EXT4_STATE_FC_FLUSHING_DATA". This ensures that inode cannot be</div><div class='add'>+ *     deleted while it is being flushed.</div><div class='add'>+ * [2] Flush data buffers to disk and clear "EXT4_STATE_FC_FLUSHING_DATA"</div><div class='add'>+ *     state.</div><div class='add'>+ * [3] Lock the journal by calling jbd2_journal_lock_updates. This ensures that</div><div class='add'>+ *     all the exsiting handles finish and no new handles can start.</div><div class='add'>+ * [4] Mark all the fast commit eligible inodes as undergoing fast commit</div><div class='add'>+ *     by setting "EXT4_STATE_FC_COMMITTING" state.</div><div class='add'>+ * [5] Unlock the journal by calling jbd2_journal_unlock_updates. This allows</div><div class='add'>+ *     starting of new handles. If new handles try to start an update on</div><div class='add'>+ *     any of the inodes that are being committed, ext4_fc_track_inode()</div><div class='add'>+ *     will block until those inodes have finished the fast commit.</div><div class='add'>+ * [6] Commit all the directory entry updates in the fast commit space.</div><div class='add'>+ * [7] Commit all the changed inodes in the fast commit space and clear</div><div class='add'>+ *     "EXT4_STATE_FC_COMMITTING" for these inodes.</div><div class='add'>+ * [8] Write tail tag (this tag ensures the atomicity, please read the following</div><div class='ctx'>  *     section for more details).</div><div class='del'>- * [7] Wait for [4], [5] and [6] to complete.</div><div class='ctx'>  *</div><div class='del'>- * All the inode updates must call ext4_fc_start_update() before starting an</div><div class='del'>- * update. If such an ongoing update is present, fast commit waits for it to</div><div class='del'>- * complete. The completion of such an update is marked by</div><div class='del'>- * ext4_fc_stop_update().</div><div class='add'>+ * All the inode updates must be enclosed within jbd2_jounrnal_start()</div><div class='add'>+ * and jbd2_journal_stop() similar to JBD2 journaling.</div><div class='ctx'>  *</div><div class='ctx'>  * Fast Commit Ineligibility</div><div class='ctx'>  * -------------------------</div><div class='hunk'>@@ -142,6 +151,13 @@</div><div class='ctx'>  * similarly. Thus, by converting a non-idempotent procedure into a series of</div><div class='ctx'>  * idempotent outcomes, fast commits ensured idempotence during the replay.</div><div class='ctx'>  *</div><div class='add'>+ * Locking</div><div class='add'>+ * -------</div><div class='add'>+ * sbi-&gt;s_fc_lock protects the fast commit inodes queue and the fast commit</div><div class='add'>+ * dentry queue. ei-&gt;i_fc_lock protects the fast commit related info in a given</div><div class='add'>+ * inode. Most of the code avoids acquiring both the locks, but if one must do</div><div class='add'>+ * that then sbi-&gt;s_fc_lock must be acquired before ei-&gt;i_fc_lock.</div><div class='add'>+ *</div><div class='ctx'>  * TODOs</div><div class='ctx'>  * -----</div><div class='ctx'>  *</div><div class='hunk'>@@ -156,13 +172,12 @@</div><div class='ctx'>  *    fast commit recovery even if that area is invalidated by later full</div><div class='ctx'>  *    commits.</div><div class='ctx'>  *</div><div class='del'>- * 1) Fast commit's commit path locks the entire file system during fast</div><div class='del'>- *    commit. This has significant performance penalty. Instead of that, we</div><div class='del'>- *    should use ext4_fc_start/stop_update functions to start inode level</div><div class='del'>- *    updates from ext4_journal_start/stop. Once we do that we can drop file</div><div class='del'>- *    system locking during commit path.</div><div class='add'>+ * 1) Handle more ineligible cases.</div><div class='ctx'>  *</div><div class='del'>- * 2) Handle more ineligible cases.</div><div class='add'>+ * 2) Change ext4_fc_commit() to lookup logical to physical mapping using extent</div><div class='add'>+ *    status tree. This would get rid of the need to call ext4_fc_track_inode()</div><div class='add'>+ *    before acquiring i_data_sem. To do that we would need to ensure that</div><div class='add'>+ *    modified extents from the extent status tree are not evicted from memory.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/ext4.h&gt;</div><div class='hunk'>@@ -201,32 +216,6 @@ void ext4_fc_init_inode(struct inode *inode)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ei-&gt;i_fc_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ei-&gt;i_fc_dilist);</div><div class='ctx'> 	init_waitqueue_head(&amp;ei-&gt;i_fc_wait);</div><div class='del'>-	atomic_set(&amp;ei-&gt;i_fc_updates, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function must be called with sbi-&gt;s_fc_lock held. */</div><div class='del'>-static void ext4_fc_wait_committing_inode(struct inode *inode)</div><div class='del'>-__releases(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock)</div><div class='del'>-{</div><div class='del'>-	wait_queue_head_t *wq;</div><div class='del'>-	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='del'>-</div><div class='del'>-#if (BITS_PER_LONG &lt; 64)</div><div class='del'>-	DEFINE_WAIT_BIT(wait, &amp;ei-&gt;i_state_flags,</div><div class='del'>-			EXT4_STATE_FC_COMMITTING);</div><div class='del'>-	wq = bit_waitqueue(&amp;ei-&gt;i_state_flags,</div><div class='del'>-				EXT4_STATE_FC_COMMITTING);</div><div class='del'>-#else</div><div class='del'>-	DEFINE_WAIT_BIT(wait, &amp;ei-&gt;i_flags,</div><div class='del'>-			EXT4_STATE_FC_COMMITTING);</div><div class='del'>-	wq = bit_waitqueue(&amp;ei-&gt;i_flags,</div><div class='del'>-				EXT4_STATE_FC_COMMITTING);</div><div class='del'>-#endif</div><div class='del'>-	lockdep_assert_held(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock);</div><div class='del'>-	prepare_to_wait(wq, &amp;wait.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='del'>-	spin_unlock(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock);</div><div class='del'>-	schedule();</div><div class='del'>-	finish_wait(wq, &amp;wait.wq_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ext4_fc_disabled(struct super_block *sb)</div><div class='hunk'>@@ -236,48 +225,6 @@ static bool ext4_fc_disabled(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Inform Ext4's fast about start of an inode update</div><div class='del'>- *</div><div class='del'>- * This function is called by the high level call VFS callbacks before</div><div class='del'>- * performing any inode update. This function blocks if there's an ongoing</div><div class='del'>- * fast commit on the inode in question.</div><div class='del'>- */</div><div class='del'>-void ext4_fc_start_update(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='del'>-</div><div class='del'>-	if (ext4_fc_disabled(inode-&gt;i_sb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-restart:</div><div class='del'>-	spin_lock(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock);</div><div class='del'>-	if (list_empty(&amp;ei-&gt;i_fc_list))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) {</div><div class='del'>-		ext4_fc_wait_committing_inode(inode);</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	atomic_inc(&amp;ei-&gt;i_fc_updates);</div><div class='del'>-	spin_unlock(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stop inode update and wake up waiting fast commits if any.</div><div class='del'>- */</div><div class='del'>-void ext4_fc_stop_update(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='del'>-</div><div class='del'>-	if (ext4_fc_disabled(inode-&gt;i_sb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;ei-&gt;i_fc_updates))</div><div class='del'>-		wake_up_all(&amp;ei-&gt;i_fc_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Remove inode from fast commit list. If the inode is being committed</div><div class='ctx'>  * we wait until inode commit is done.</div><div class='ctx'>  */</div><div class='hunk'>@@ -286,31 +233,62 @@ void ext4_fc_del(struct inode *inode)</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct ext4_fc_dentry_update *fc_dentry;</div><div class='add'>+	wait_queue_head_t *wq;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_fc_disabled(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-restart:</div><div class='del'>-	spin_lock(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock);</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	if (list_empty(&amp;ei-&gt;i_fc_list) &amp;&amp; list_empty(&amp;ei-&gt;i_fc_dilist)) {</div><div class='del'>-		spin_unlock(&amp;EXT4_SB(inode-&gt;i_sb)-&gt;s_fc_lock);</div><div class='add'>+		mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) {</div><div class='del'>-		ext4_fc_wait_committing_inode(inode);</div><div class='del'>-		goto restart;</div><div class='add'>+	/*</div><div class='add'>+	 * Since ext4_fc_del is called from ext4_evict_inode while having a</div><div class='add'>+	 * handle open, there is no need for us to wait here even if a fast</div><div class='add'>+	 * commit is going on. That is because, if this inode is being</div><div class='add'>+	 * committed, ext4_mark_inode_dirty would have waited for inode commit</div><div class='add'>+	 * operation to finish before we come here. So, by the time we come</div><div class='add'>+	 * here, inode's EXT4_STATE_FC_COMMITTING would have been cleared. So,</div><div class='add'>+	 * we shouldn't see EXT4_STATE_FC_COMMITTING to be set on this inode</div><div class='add'>+	 * here.</div><div class='add'>+	 *</div><div class='add'>+	 * We may come here without any handles open in the "no_delete" case of</div><div class='add'>+	 * ext4_evict_inode as well. However, if that happens, we first mark the</div><div class='add'>+	 * file system as fast commit ineligible anyway. So, even in that case,</div><div class='add'>+	 * it is okay to remove the inode from the fc list.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)</div><div class='add'>+		&amp;&amp; !ext4_test_mount_flag(inode-&gt;i_sb, EXT4_MF_FC_INELIGIBLE));</div><div class='add'>+	while (ext4_test_inode_state(inode, EXT4_STATE_FC_FLUSHING_DATA)) {</div><div class='add'>+#if (BITS_PER_LONG &lt; 64)</div><div class='add'>+		DEFINE_WAIT_BIT(wait, &amp;ei-&gt;i_state_flags,</div><div class='add'>+				EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+		wq = bit_waitqueue(&amp;ei-&gt;i_state_flags,</div><div class='add'>+				   EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+#else</div><div class='add'>+		DEFINE_WAIT_BIT(wait, &amp;ei-&gt;i_flags,</div><div class='add'>+				EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+		wq = bit_waitqueue(&amp;ei-&gt;i_flags,</div><div class='add'>+				   EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+#endif</div><div class='add'>+		prepare_to_wait(wq, &amp;wait.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		if (ext4_test_inode_state(inode, EXT4_STATE_FC_FLUSHING_DATA)) {</div><div class='add'>+			mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+			schedule();</div><div class='add'>+			mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+		}</div><div class='add'>+		finish_wait(wq, &amp;wait.wq_entry);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;ei-&gt;i_fc_list))</div><div class='del'>-		list_del_init(&amp;ei-&gt;i_fc_list);</div><div class='add'>+	list_del_init(&amp;ei-&gt;i_fc_list);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since this inode is getting removed, let's also remove all FC</div><div class='ctx'> 	 * dentry create references, since it is not needed to log it anyways.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (list_empty(&amp;ei-&gt;i_fc_dilist)) {</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+		mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -320,14 +298,10 @@ restart:</div><div class='ctx'> 	list_del_init(&amp;fc_dentry-&gt;fcd_dilist);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!list_empty(&amp;ei-&gt;i_fc_dilist));</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> </div><div class='del'>-	if (fc_dentry-&gt;fcd_name.name &amp;&amp;</div><div class='del'>-		fc_dentry-&gt;fcd_name.len &gt; DNAME_INLINE_LEN)</div><div class='del'>-		kfree(fc_dentry-&gt;fcd_name.name);</div><div class='add'>+	release_dentry_name_snapshot(&amp;fc_dentry-&gt;fcd_name);</div><div class='ctx'> 	kmem_cache_free(ext4_fc_dentry_cachep, fc_dentry);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -339,23 +313,28 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	tid_t tid;</div><div class='add'>+	bool has_transaction = true;</div><div class='add'>+	bool is_ineligible;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_fc_disabled(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);</div><div class='ctx'> 	if (handle &amp;&amp; !IS_ERR(handle))</div><div class='ctx'> 		tid = handle-&gt;h_transaction-&gt;t_tid;</div><div class='ctx'> 	else {</div><div class='ctx'> 		read_lock(&amp;sbi-&gt;s_journal-&gt;j_state_lock);</div><div class='del'>-		tid = sbi-&gt;s_journal-&gt;j_running_transaction ?</div><div class='del'>-				sbi-&gt;s_journal-&gt;j_running_transaction-&gt;t_tid : 0;</div><div class='add'>+		if (sbi-&gt;s_journal-&gt;j_running_transaction)</div><div class='add'>+			tid = sbi-&gt;s_journal-&gt;j_running_transaction-&gt;t_tid;</div><div class='add'>+		else</div><div class='add'>+			has_transaction = false;</div><div class='ctx'> 		read_unlock(&amp;sbi-&gt;s_journal-&gt;j_state_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-	if (sbi-&gt;s_fc_ineligible_tid &lt; tid)</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);</div><div class='add'>+	if (has_transaction &amp;&amp; (!is_ineligible || tid_gt(tid, sbi-&gt;s_fc_ineligible_tid)))</div><div class='ctx'> 		sbi-&gt;s_fc_ineligible_tid = tid;</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	WARN_ON(reason &gt;= EXT4_FC_REASON_MAX);</div><div class='ctx'> 	sbi-&gt;s_fc_stats.fc_ineligible_reason_count[reason]++;</div><div class='ctx'> }</div><div class='hunk'>@@ -372,7 +351,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl</div><div class='ctx'>  */</div><div class='ctx'> static int ext4_fc_track_template(</div><div class='ctx'> 	handle_t *handle, struct inode *inode,</div><div class='del'>-	int (*__fc_track_fn)(struct inode *, void *, bool),</div><div class='add'>+	int (*__fc_track_fn)(handle_t *handle, struct inode *, void *, bool),</div><div class='ctx'> 	void *args, int enqueue)</div><div class='ctx'> {</div><div class='ctx'> 	bool update = false;</div><div class='hunk'>@@ -382,27 +361,26 @@ static int ext4_fc_track_template(</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	tid = handle-&gt;h_transaction-&gt;t_tid;</div><div class='del'>-	mutex_lock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+	spin_lock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 	if (tid == ei-&gt;i_sync_tid) {</div><div class='ctx'> 		update = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ext4_fc_reset_inode(inode);</div><div class='ctx'> 		ei-&gt;i_sync_tid = tid;</div><div class='ctx'> 	}</div><div class='del'>-	ret = __fc_track_fn(inode, args, update);</div><div class='del'>-	mutex_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='del'>-</div><div class='add'>+	ret = __fc_track_fn(handle, inode, args, update);</div><div class='add'>+	spin_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 	if (!enqueue)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	if (list_empty(&amp;EXT4_I(inode)-&gt;i_fc_list))</div><div class='ctx'> 		list_add_tail(&amp;EXT4_I(inode)-&gt;i_fc_list,</div><div class='ctx'> 				(sbi-&gt;s_journal-&gt;j_flags &amp; JBD2_FULL_COMMIT_ONGOING ||</div><div class='ctx'> 				 sbi-&gt;s_journal-&gt;j_flags &amp; JBD2_FAST_COMMIT_ONGOING) ?</div><div class='ctx'> 				&amp;sbi-&gt;s_fc_q[FC_Q_STAGING] :</div><div class='ctx'> 				&amp;sbi-&gt;s_fc_q[FC_Q_MAIN]);</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -413,7 +391,8 @@ struct __track_dentry_update_args {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* __track_fn for directory entry updates. Called with ei-&gt;i_fc_lock. */</div><div class='del'>-static int __track_dentry_update(struct inode *inode, void *arg, bool update)</div><div class='add'>+static int __track_dentry_update(handle_t *handle, struct inode *inode,</div><div class='add'>+				 void *arg, bool update)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_fc_dentry_update *node;</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='hunk'>@@ -424,43 +403,29 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+	spin_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENCRYPTED(dir)) {</div><div class='ctx'> 		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_ENCRYPTED_FILENAME,</div><div class='del'>-					NULL);</div><div class='del'>-		mutex_lock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+					handle);</div><div class='add'>+		spin_lock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	node = kmem_cache_alloc(ext4_fc_dentry_cachep, GFP_NOFS);</div><div class='ctx'> 	if (!node) {</div><div class='del'>-		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, NULL);</div><div class='del'>-		mutex_lock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, handle);</div><div class='add'>+		spin_lock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;fcd_op = dentry_update-&gt;op;</div><div class='ctx'> 	node-&gt;fcd_parent = dir-&gt;i_ino;</div><div class='ctx'> 	node-&gt;fcd_ino = inode-&gt;i_ino;</div><div class='del'>-	if (dentry-&gt;d_name.len &gt; DNAME_INLINE_LEN) {</div><div class='del'>-		node-&gt;fcd_name.name = kmalloc(dentry-&gt;d_name.len, GFP_NOFS);</div><div class='del'>-		if (!node-&gt;fcd_name.name) {</div><div class='del'>-			kmem_cache_free(ext4_fc_dentry_cachep, node);</div><div class='del'>-			ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, NULL);</div><div class='del'>-			mutex_lock(&amp;ei-&gt;i_fc_lock);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		memcpy((u8 *)node-&gt;fcd_name.name, dentry-&gt;d_name.name,</div><div class='del'>-			dentry-&gt;d_name.len);</div><div class='del'>-	} else {</div><div class='del'>-		memcpy(node-&gt;fcd_iname, dentry-&gt;d_name.name,</div><div class='del'>-			dentry-&gt;d_name.len);</div><div class='del'>-		node-&gt;fcd_name.name = node-&gt;fcd_iname;</div><div class='del'>-	}</div><div class='del'>-	node-&gt;fcd_name.len = dentry-&gt;d_name.len;</div><div class='add'>+	take_dentry_name_snapshot(&amp;node-&gt;fcd_name, dentry);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;node-&gt;fcd_dilist);</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;node-&gt;fcd_list);</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	if (sbi-&gt;s_journal-&gt;j_flags &amp; JBD2_FULL_COMMIT_ONGOING ||</div><div class='ctx'> 		sbi-&gt;s_journal-&gt;j_flags &amp; JBD2_FAST_COMMIT_ONGOING)</div><div class='ctx'> 		list_add_tail(&amp;node-&gt;fcd_list,</div><div class='hunk'>@@ -481,8 +446,8 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)</div><div class='ctx'> 		WARN_ON(!list_empty(&amp;ei-&gt;i_fc_dilist));</div><div class='ctx'> 		list_add_tail(&amp;node-&gt;fcd_dilist, &amp;ei-&gt;i_fc_dilist);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-	mutex_lock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	spin_lock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -569,7 +534,8 @@ void ext4_fc_track_create(handle_t *handle, struct dentry *dentry)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* __track_fn for inode tracking */</div><div class='del'>-static int __track_inode(struct inode *inode, void *arg, bool update)</div><div class='add'>+static int __track_inode(handle_t *handle, struct inode *inode, void *arg,</div><div class='add'>+			 bool update)</div><div class='ctx'> {</div><div class='ctx'> 	if (update)</div><div class='ctx'> 		return -EEXIST;</div><div class='hunk'>@@ -581,6 +547,8 @@ static int __track_inode(struct inode *inode, void *arg, bool update)</div><div class='ctx'> </div><div class='ctx'> void ext4_fc_track_inode(handle_t *handle, struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='add'>+	wait_queue_head_t *wq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='hunk'>@@ -598,6 +566,35 @@ void ext4_fc_track_inode(handle_t *handle, struct inode *inode)</div><div class='ctx'> 	if (ext4_test_mount_flag(inode-&gt;i_sb, EXT4_MF_FC_INELIGIBLE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If we come here, we may sleep while waiting for the inode to</div><div class='add'>+	 * commit. We shouldn't be holding i_data_sem when we go to sleep since</div><div class='add'>+	 * the commit path needs to grab the lock while committing the inode.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_not_held(&amp;ei-&gt;i_data_sem);</div><div class='add'>+</div><div class='add'>+	while (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) {</div><div class='add'>+#if (BITS_PER_LONG &lt; 64)</div><div class='add'>+		DEFINE_WAIT_BIT(wait, &amp;ei-&gt;i_state_flags,</div><div class='add'>+				EXT4_STATE_FC_COMMITTING);</div><div class='add'>+		wq = bit_waitqueue(&amp;ei-&gt;i_state_flags,</div><div class='add'>+				   EXT4_STATE_FC_COMMITTING);</div><div class='add'>+#else</div><div class='add'>+		DEFINE_WAIT_BIT(wait, &amp;ei-&gt;i_flags,</div><div class='add'>+				EXT4_STATE_FC_COMMITTING);</div><div class='add'>+		wq = bit_waitqueue(&amp;ei-&gt;i_flags,</div><div class='add'>+				   EXT4_STATE_FC_COMMITTING);</div><div class='add'>+#endif</div><div class='add'>+		prepare_to_wait(wq, &amp;wait.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		if (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING))</div><div class='add'>+			schedule();</div><div class='add'>+		finish_wait(wq, &amp;wait.wq_entry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * From this point on, this inode will not be committed either</div><div class='add'>+	 * by fast or full commit as long as the handle is open.</div><div class='add'>+	 */</div><div class='ctx'> 	ret = ext4_fc_track_template(handle, inode, __track_inode, NULL, 1);</div><div class='ctx'> 	trace_ext4_fc_track_inode(handle, inode, ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -607,7 +604,8 @@ struct __track_range_args {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* __track_fn for tracking data updates */</div><div class='del'>-static int __track_range(struct inode *inode, void *arg, bool update)</div><div class='add'>+static int __track_range(handle_t *handle, struct inode *inode, void *arg,</div><div class='add'>+			 bool update)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='ctx'> 	ext4_lblk_t oldstart;</div><div class='hunk'>@@ -649,6 +647,12 @@ void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t star</div><div class='ctx'> 	if (ext4_test_mount_flag(inode-&gt;i_sb, EXT4_MF_FC_INELIGIBLE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (ext4_has_inline_data(inode)) {</div><div class='add'>+		ext4_fc_mark_ineligible(inode-&gt;i_sb, EXT4_FC_REASON_XATTR,</div><div class='add'>+					handle);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	args.start = start;</div><div class='ctx'> 	args.end = end;</div><div class='ctx'> </div><div class='hunk'>@@ -659,7 +663,7 @@ void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t star</div><div class='ctx'> </div><div class='ctx'> static void ext4_fc_submit_bh(struct super_block *sb, bool is_tail)</div><div class='ctx'> {</div><div class='del'>-	blk_opf_t write_flags = REQ_SYNC;</div><div class='add'>+	blk_opf_t write_flags = JBD2_JOURNAL_REQ_FLAGS;</div><div class='ctx'> 	struct buffer_head *bh = EXT4_SB(sb)-&gt;s_fc_bh;</div><div class='ctx'> </div><div class='ctx'> 	/* Add REQ_FUA | REQ_PREFLUSH only its tail */</div><div class='hunk'>@@ -730,7 +734,7 @@ static u8 *ext4_fc_reserve_space(struct super_block *sb, int len, u32 *crc)</div><div class='ctx'> 	tl.fc_len = cpu_to_le16(remaining);</div><div class='ctx'> 	memcpy(dst, &amp;tl, EXT4_FC_TAG_BASE_LEN);</div><div class='ctx'> 	memset(dst + EXT4_FC_TAG_BASE_LEN, 0, remaining);</div><div class='del'>-	*crc = ext4_chksum(sbi, *crc, sbi-&gt;s_fc_bh-&gt;b_data, bsize);</div><div class='add'>+	*crc = ext4_chksum(*crc, sbi-&gt;s_fc_bh-&gt;b_data, bsize);</div><div class='ctx'> </div><div class='ctx'> 	ext4_fc_submit_bh(sb, false);</div><div class='ctx'> </div><div class='hunk'>@@ -777,7 +781,7 @@ static int ext4_fc_write_tail(struct super_block *sb, u32 crc)</div><div class='ctx'> 	tail.fc_tid = cpu_to_le32(sbi-&gt;s_journal-&gt;j_running_transaction-&gt;t_tid);</div><div class='ctx'> 	memcpy(dst, &amp;tail.fc_tid, sizeof(tail.fc_tid));</div><div class='ctx'> 	dst += sizeof(tail.fc_tid);</div><div class='del'>-	crc = ext4_chksum(sbi, crc, sbi-&gt;s_fc_bh-&gt;b_data,</div><div class='add'>+	crc = ext4_chksum(crc, sbi-&gt;s_fc_bh-&gt;b_data,</div><div class='ctx'> 			  dst - (u8 *)sbi-&gt;s_fc_bh-&gt;b_data);</div><div class='ctx'> 	tail.fc_crc = cpu_to_le32(crc);</div><div class='ctx'> 	memcpy(dst, &amp;tail.fc_crc, sizeof(tail.fc_crc));</div><div class='hunk'>@@ -818,7 +822,7 @@ static bool ext4_fc_add_dentry_tlv(struct super_block *sb, u32 *crc,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_fc_dentry_info fcd;</div><div class='ctx'> 	struct ext4_fc_tl tl;</div><div class='del'>-	int dlen = fc_dentry-&gt;fcd_name.len;</div><div class='add'>+	int dlen = fc_dentry-&gt;fcd_name.name.len;</div><div class='ctx'> 	u8 *dst = ext4_fc_reserve_space(sb,</div><div class='ctx'> 			EXT4_FC_TAG_BASE_LEN + sizeof(fcd) + dlen, crc);</div><div class='ctx'> </div><div class='hunk'>@@ -833,7 +837,7 @@ static bool ext4_fc_add_dentry_tlv(struct super_block *sb, u32 *crc,</div><div class='ctx'> 	dst += EXT4_FC_TAG_BASE_LEN;</div><div class='ctx'> 	memcpy(dst, &amp;fcd, sizeof(fcd));</div><div class='ctx'> 	dst += sizeof(fcd);</div><div class='del'>-	memcpy(dst, fc_dentry-&gt;fcd_name.name, dlen);</div><div class='add'>+	memcpy(dst, fc_dentry-&gt;fcd_name.name.name, dlen);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -896,15 +900,15 @@ static int ext4_fc_write_inode_data(struct inode *inode, u32 *crc)</div><div class='ctx'> 	struct ext4_extent *ex;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+	spin_lock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 	if (ei-&gt;i_fc_lblk_len == 0) {</div><div class='del'>-		mutex_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+		spin_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	old_blk_size = ei-&gt;i_fc_lblk_start;</div><div class='ctx'> 	new_blk_size = ei-&gt;i_fc_lblk_start + ei-&gt;i_fc_lblk_len - 1;</div><div class='ctx'> 	ei-&gt;i_fc_lblk_len = 0;</div><div class='del'>-	mutex_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+	spin_unlock(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> </div><div class='ctx'> 	cur_lblk_off = old_blk_size;</div><div class='ctx'> 	ext4_debug("will try writing %d to %d for inode %ld\n",</div><div class='hunk'>@@ -913,7 +917,9 @@ static int ext4_fc_write_inode_data(struct inode *inode, u32 *crc)</div><div class='ctx'> 	while (cur_lblk_off &lt;= new_blk_size) {</div><div class='ctx'> 		map.m_lblk = cur_lblk_off;</div><div class='ctx'> 		map.m_len = new_blk_size - cur_lblk_off + 1;</div><div class='del'>-		ret = ext4_map_blocks(NULL, inode, &amp;map, 0);</div><div class='add'>+		ret = ext4_map_blocks(NULL, inode, &amp;map,</div><div class='add'>+				      EXT4_GET_BLOCKS_IO_SUBMIT |</div><div class='add'>+				      EXT4_EX_NOCACHE);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return -ECANCELED;</div><div class='ctx'> </div><div class='hunk'>@@ -957,69 +963,31 @@ static int ext4_fc_write_inode_data(struct inode *inode, u32 *crc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Submit data for all the fast commit inodes */</div><div class='del'>-static int ext4_fc_submit_inode_data_all(journal_t *journal)</div><div class='add'>+/* Flushes data of all the inodes in the commit queue. */</div><div class='add'>+static int ext4_fc_flush_data(journal_t *journal)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = journal-&gt;j_private;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	struct ext4_inode_info *ei;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	list_for_each_entry(ei, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='del'>-		ext4_set_inode_state(&amp;ei-&gt;vfs_inode, EXT4_STATE_FC_COMMITTING);</div><div class='del'>-		while (atomic_read(&amp;ei-&gt;i_fc_updates)) {</div><div class='del'>-			DEFINE_WAIT(wait);</div><div class='del'>-</div><div class='del'>-			prepare_to_wait(&amp;ei-&gt;i_fc_wait, &amp;wait,</div><div class='del'>-						TASK_UNINTERRUPTIBLE);</div><div class='del'>-			if (atomic_read(&amp;ei-&gt;i_fc_updates)) {</div><div class='del'>-				spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-				schedule();</div><div class='del'>-				spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-			}</div><div class='del'>-			finish_wait(&amp;ei-&gt;i_fc_wait, &amp;wait);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 		ret = jbd2_submit_inode_data(journal, ei-&gt;jinode);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Wait for completion of data for all the fast commit inodes */</div><div class='del'>-static int ext4_fc_wait_inode_data_all(journal_t *journal)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = journal-&gt;j_private;</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='del'>-	struct ext4_inode_info *pos, *n;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-	list_for_each_entry_safe(pos, n, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='del'>-		if (!ext4_test_inode_state(&amp;pos-&gt;vfs_inode,</div><div class='del'>-					   EXT4_STATE_FC_COMMITTING))</div><div class='del'>-			continue;</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> </div><div class='del'>-		ret = jbd2_wait_inode_data(journal, pos-&gt;jinode);</div><div class='add'>+	list_for_each_entry(ei, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='add'>+		ret = jbd2_wait_inode_data(journal, ei-&gt;jinode);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Commit all the directory entry updates */</div><div class='ctx'> static int ext4_fc_commit_dentry_updates(journal_t *journal, u32 *crc)</div><div class='del'>-__acquires(&amp;sbi-&gt;s_fc_lock)</div><div class='del'>-__releases(&amp;sbi-&gt;s_fc_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = journal-&gt;j_private;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='hunk'>@@ -1033,26 +1001,22 @@ __releases(&amp;sbi-&gt;s_fc_lock)</div><div class='ctx'> 	list_for_each_entry_safe(fc_dentry, fc_dentry_n,</div><div class='ctx'> 				 &amp;sbi-&gt;s_fc_dentry_q[FC_Q_MAIN], fcd_list) {</div><div class='ctx'> 		if (fc_dentry-&gt;fcd_op != EXT4_FC_TAG_CREAT) {</div><div class='del'>-			spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-			if (!ext4_fc_add_dentry_tlv(sb, crc, fc_dentry)) {</div><div class='del'>-				ret = -ENOSPC;</div><div class='del'>-				goto lock_and_exit;</div><div class='del'>-			}</div><div class='del'>-			spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+			if (!ext4_fc_add_dentry_tlv(sb, crc, fc_dentry))</div><div class='add'>+				return -ENOSPC;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * With fcd_dilist we need not loop in sbi-&gt;s_fc_q to get the</div><div class='del'>-		 * corresponding inode pointer</div><div class='add'>+		 * corresponding inode. Also, the corresponding inode could have been</div><div class='add'>+		 * deleted, in which case, we don't need to do anything.</div><div class='ctx'> 		 */</div><div class='del'>-		WARN_ON(list_empty(&amp;fc_dentry-&gt;fcd_dilist));</div><div class='add'>+		if (list_empty(&amp;fc_dentry-&gt;fcd_dilist))</div><div class='add'>+			continue;</div><div class='ctx'> 		ei = list_first_entry(&amp;fc_dentry-&gt;fcd_dilist,</div><div class='ctx'> 				struct ext4_inode_info, i_fc_dilist);</div><div class='ctx'> 		inode = &amp;ei-&gt;vfs_inode;</div><div class='ctx'> 		WARN_ON(inode-&gt;i_ino != fc_dentry-&gt;fcd_ino);</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We first write the inode and then the create dirent. This</div><div class='ctx'> 		 * allows the recovery code to create an unnamed inode first</div><div class='hunk'>@@ -1062,23 +1026,14 @@ __releases(&amp;sbi-&gt;s_fc_lock)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = ext4_fc_write_inode(inode, crc);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto lock_and_exit;</div><div class='del'>-</div><div class='add'>+			return ret;</div><div class='ctx'> 		ret = ext4_fc_write_inode_data(inode, crc);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto lock_and_exit;</div><div class='del'>-</div><div class='del'>-		if (!ext4_fc_add_dentry_tlv(sb, crc, fc_dentry)) {</div><div class='del'>-			ret = -ENOSPC;</div><div class='del'>-			goto lock_and_exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+			return ret;</div><div class='add'>+		if (!ext4_fc_add_dentry_tlv(sb, crc, fc_dentry))</div><div class='add'>+			return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-lock_and_exit:</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_fc_perform_commit(journal_t *journal)</div><div class='hunk'>@@ -1092,26 +1047,81 @@ static int ext4_fc_perform_commit(journal_t *journal)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 crc = 0;</div><div class='ctx'> </div><div class='del'>-	ret = ext4_fc_submit_inode_data_all(journal);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Step 1: Mark all inodes on s_fc_q[MAIN] with</div><div class='add'>+	 * EXT4_STATE_FC_FLUSHING_DATA. This prevents these inodes from being</div><div class='add'>+	 * freed until the data flush is over.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	list_for_each_entry(iter, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='add'>+		ext4_set_inode_state(&amp;iter-&gt;vfs_inode,</div><div class='add'>+				     EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+</div><div class='add'>+	/* Step 2: Flush data for all the eligible inodes. */</div><div class='add'>+	ret = ext4_fc_flush_data(journal);</div><div class='ctx'> </div><div class='del'>-	ret = ext4_fc_wait_inode_data_all(journal);</div><div class='add'>+	/*</div><div class='add'>+	 * Step 3: Clear EXT4_STATE_FC_FLUSHING_DATA flag, before returning</div><div class='add'>+	 * any error from step 2. This ensures that waiters waiting on</div><div class='add'>+	 * EXT4_STATE_FC_FLUSHING_DATA can resume.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	list_for_each_entry(iter, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='add'>+		ext4_clear_inode_state(&amp;iter-&gt;vfs_inode,</div><div class='add'>+				       EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+#if (BITS_PER_LONG &lt; 64)</div><div class='add'>+		wake_up_bit(&amp;iter-&gt;i_state_flags, EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+#else</div><div class='add'>+		wake_up_bit(&amp;iter-&gt;i_flags, EXT4_STATE_FC_FLUSHING_DATA);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure clearing of EXT4_STATE_FC_FLUSHING_DATA is visible before</div><div class='add'>+	 * the waiter checks the bit. Pairs with implicit barrier in</div><div class='add'>+	 * prepare_to_wait() in ext4_fc_del().</div><div class='add'>+	 */</div><div class='add'>+	smp_mb();</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we encountered error in Step 2, return it now after clearing</div><div class='add'>+	 * EXT4_STATE_FC_FLUSHING_DATA bit.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	/* Step 4: Mark all inodes as being committed. */</div><div class='add'>+	jbd2_journal_lock_updates(journal);</div><div class='add'>+	/*</div><div class='add'>+	 * The journal is now locked. No more handles can start and all the</div><div class='add'>+	 * previous handles are now drained. We now mark the inodes on the</div><div class='add'>+	 * commit queue as being committed.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	list_for_each_entry(iter, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='add'>+		ext4_set_inode_state(&amp;iter-&gt;vfs_inode,</div><div class='add'>+				     EXT4_STATE_FC_COMMITTING);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	jbd2_journal_unlock_updates(journal);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * If file system device is different from journal device, issue a cache</div><div class='del'>-	 * flush before we start writing fast commit blocks.</div><div class='add'>+	 * Step 5: If file system device is different from journal device,</div><div class='add'>+	 * issue a cache flush before we start writing fast commit blocks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (journal-&gt;j_fs_dev != journal-&gt;j_dev)</div><div class='ctx'> 		blkdev_issue_flush(journal-&gt;j_fs_dev);</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='add'>+	/* Step 6: Write fast commit blocks to disk. */</div><div class='ctx'> 	if (sbi-&gt;s_fc_bytes == 0) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Add a head tag only if this is the first fast commit</div><div class='del'>-		 * in this TID.</div><div class='add'>+		 * Step 6.1: Add a head tag only if this is the first fast</div><div class='add'>+		 * commit in this TID.</div><div class='ctx'> 		 */</div><div class='ctx'> 		head.fc_features = cpu_to_le32(EXT4_FC_SUPPORTED_FEATURES);</div><div class='ctx'> 		head.fc_tid = cpu_to_le32(</div><div class='hunk'>@@ -1123,32 +1133,30 @@ static int ext4_fc_perform_commit(journal_t *journal)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	/* Step 6.2: Now write all the dentry updates. */</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	ret = ext4_fc_commit_dentry_updates(journal, &amp;crc);</div><div class='del'>-	if (ret) {</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	/* Step 6.3: Now write all the changed inodes to disk. */</div><div class='ctx'> 	list_for_each_entry(iter, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN], i_fc_list) {</div><div class='ctx'> 		inode = &amp;iter-&gt;vfs_inode;</div><div class='ctx'> 		if (!ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 		ret = ext4_fc_write_inode_data(inode, &amp;crc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		ret = ext4_fc_write_inode(inode, &amp;crc);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-</div><div class='add'>+	/* Step 6.4: Finally write tail tag to conclude this fast commit. */</div><div class='ctx'> 	ret = ext4_fc_write_tail(sb, crc);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1194,6 +1202,7 @@ int ext4_fc_commit(journal_t *journal, tid_t commit_tid)</div><div class='ctx'> 	int subtid = atomic_read(&amp;sbi-&gt;s_fc_subtid);</div><div class='ctx'> 	int status = EXT4_FC_STATUS_OK, fc_bufs_before = 0;</div><div class='ctx'> 	ktime_t start_time, commit_time;</div><div class='add'>+	int old_ioprio, journal_ioprio;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_opt2(sb, JOURNAL_FAST_COMMIT))</div><div class='ctx'> 		return jbd2_complete_transaction(journal, commit_tid);</div><div class='hunk'>@@ -1201,13 +1210,14 @@ int ext4_fc_commit(journal_t *journal, tid_t commit_tid)</div><div class='ctx'> 	trace_ext4_fc_commit_start(sb, commit_tid);</div><div class='ctx'> </div><div class='ctx'> 	start_time = ktime_get();</div><div class='add'>+	old_ioprio = get_current_ioprio();</div><div class='ctx'> </div><div class='ctx'> restart_fc:</div><div class='ctx'> 	ret = jbd2_fc_begin_commit(journal, commit_tid);</div><div class='ctx'> 	if (ret == -EALREADY) {</div><div class='ctx'> 		/* There was an ongoing commit, check if we need to restart */</div><div class='ctx'> 		if (atomic_read(&amp;sbi-&gt;s_fc_subtid) &lt;= subtid &amp;&amp;</div><div class='del'>-			commit_tid &gt; journal-&gt;j_commit_sequence)</div><div class='add'>+		    tid_gt(commit_tid, journal-&gt;j_commit_sequence))</div><div class='ctx'> 			goto restart_fc;</div><div class='ctx'> 		ext4_fc_update_stats(sb, EXT4_FC_STATUS_SKIPPED, 0, 0,</div><div class='ctx'> 				commit_tid);</div><div class='hunk'>@@ -1231,6 +1241,15 @@ restart_fc:</div><div class='ctx'> 		goto fallback;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Now that we know that this thread is going to do a fast commit,</div><div class='add'>+	 * elevate the priority to match that of the journal thread.</div><div class='add'>+	 */</div><div class='add'>+	if (journal-&gt;j_task-&gt;io_context)</div><div class='add'>+		journal_ioprio = sbi-&gt;s_journal-&gt;j_task-&gt;io_context-&gt;ioprio;</div><div class='add'>+	else</div><div class='add'>+		journal_ioprio = EXT4_DEF_JOURNAL_IOPRIO;</div><div class='add'>+	set_task_ioprio(current, journal_ioprio);</div><div class='ctx'> 	fc_bufs_before = (sbi-&gt;s_fc_bytes + bsize - 1) / bsize;</div><div class='ctx'> 	ret = ext4_fc_perform_commit(journal);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -1245,6 +1264,7 @@ restart_fc:</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_inc(&amp;sbi-&gt;s_fc_subtid);</div><div class='ctx'> 	ret = jbd2_fc_end_commit(journal);</div><div class='add'>+	set_task_ioprio(current, old_ioprio);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * weight the commit time higher than the average time so we</div><div class='ctx'> 	 * don't react too strongly to vast changes in the commit time</div><div class='hunk'>@@ -1254,6 +1274,7 @@ restart_fc:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> fallback:</div><div class='add'>+	set_task_ioprio(current, old_ioprio);</div><div class='ctx'> 	ret = jbd2_fc_end_commit_fallback(journal);</div><div class='ctx'> 	ext4_fc_update_stats(sb, status, 0, 0, commit_tid);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1267,7 +1288,7 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = journal-&gt;j_private;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='del'>-	struct ext4_inode_info *iter, *iter_n;</div><div class='add'>+	struct ext4_inode_info *ei;</div><div class='ctx'> 	struct ext4_fc_dentry_update *fc_dentry;</div><div class='ctx'> </div><div class='ctx'> 	if (full &amp;&amp; sbi-&gt;s_fc_bh)</div><div class='hunk'>@@ -1276,20 +1297,39 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)</div><div class='ctx'> 	trace_ext4_fc_cleanup(journal, full, tid);</div><div class='ctx'> 	jbd2_fc_release_bufs(journal);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='del'>-	list_for_each_entry_safe(iter, iter_n, &amp;sbi-&gt;s_fc_q[FC_Q_MAIN],</div><div class='del'>-				 i_fc_list) {</div><div class='del'>-		list_del_init(&amp;iter-&gt;i_fc_list);</div><div class='del'>-		ext4_clear_inode_state(&amp;iter-&gt;vfs_inode,</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	while (!list_empty(&amp;sbi-&gt;s_fc_q[FC_Q_MAIN])) {</div><div class='add'>+		ei = list_first_entry(&amp;sbi-&gt;s_fc_q[FC_Q_MAIN],</div><div class='add'>+					struct ext4_inode_info,</div><div class='add'>+					i_fc_list);</div><div class='add'>+		list_del_init(&amp;ei-&gt;i_fc_list);</div><div class='add'>+		ext4_clear_inode_state(&amp;ei-&gt;vfs_inode,</div><div class='ctx'> 				       EXT4_STATE_FC_COMMITTING);</div><div class='del'>-		if (iter-&gt;i_sync_tid &lt;= tid)</div><div class='del'>-			ext4_fc_reset_inode(&amp;iter-&gt;vfs_inode);</div><div class='del'>-		/* Make sure EXT4_STATE_FC_COMMITTING bit is clear */</div><div class='add'>+		if (tid_geq(tid, ei-&gt;i_sync_tid)) {</div><div class='add'>+			ext4_fc_reset_inode(&amp;ei-&gt;vfs_inode);</div><div class='add'>+		} else if (full) {</div><div class='add'>+			/*</div><div class='add'>+			 * We are called after a full commit, inode has been</div><div class='add'>+			 * modified while the commit was running. Re-enqueue</div><div class='add'>+			 * the inode into STAGING, which will then be splice</div><div class='add'>+			 * back into MAIN. This cannot happen during</div><div class='add'>+			 * fastcommit because the journal is locked all the</div><div class='add'>+			 * time in that case (and tid doesn't increase so</div><div class='add'>+			 * tid check above isn't reliable).</div><div class='add'>+			 */</div><div class='add'>+			list_add_tail(&amp;ei-&gt;i_fc_list,</div><div class='add'>+				      &amp;sbi-&gt;s_fc_q[FC_Q_STAGING]);</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure clearing of EXT4_STATE_FC_COMMITTING is</div><div class='add'>+		 * visible before we send the wakeup. Pairs with implicit</div><div class='add'>+		 * barrier in prepare_to_wait() in ext4_fc_track_inode().</div><div class='add'>+		 */</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> #if (BITS_PER_LONG &lt; 64)</div><div class='del'>-		wake_up_bit(&amp;iter-&gt;i_state_flags, EXT4_STATE_FC_COMMITTING);</div><div class='add'>+		wake_up_bit(&amp;ei-&gt;i_state_flags, EXT4_STATE_FC_COMMITTING);</div><div class='ctx'> #else</div><div class='del'>-		wake_up_bit(&amp;iter-&gt;i_flags, EXT4_STATE_FC_COMMITTING);</div><div class='add'>+		wake_up_bit(&amp;ei-&gt;i_flags, EXT4_STATE_FC_COMMITTING);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1299,13 +1339,9 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)</div><div class='ctx'> 					     fcd_list);</div><div class='ctx'> 		list_del_init(&amp;fc_dentry-&gt;fcd_list);</div><div class='ctx'> 		list_del_init(&amp;fc_dentry-&gt;fcd_dilist);</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> </div><div class='del'>-		if (fc_dentry-&gt;fcd_name.name &amp;&amp;</div><div class='del'>-			fc_dentry-&gt;fcd_name.len &gt; DNAME_INLINE_LEN)</div><div class='del'>-			kfree(fc_dentry-&gt;fcd_name.name);</div><div class='add'>+		release_dentry_name_snapshot(&amp;fc_dentry-&gt;fcd_name);</div><div class='ctx'> 		kmem_cache_free(ext4_fc_dentry_cachep, fc_dentry);</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_splice_init(&amp;sbi-&gt;s_fc_dentry_q[FC_Q_STAGING],</div><div class='hunk'>@@ -1313,14 +1349,14 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)</div><div class='ctx'> 	list_splice_init(&amp;sbi-&gt;s_fc_q[FC_Q_STAGING],</div><div class='ctx'> 				&amp;sbi-&gt;s_fc_q[FC_Q_MAIN]);</div><div class='ctx'> </div><div class='del'>-	if (tid &gt;= sbi-&gt;s_fc_ineligible_tid) {</div><div class='add'>+	if (tid_geq(tid, sbi-&gt;s_fc_ineligible_tid)) {</div><div class='ctx'> 		sbi-&gt;s_fc_ineligible_tid = 0;</div><div class='ctx'> 		ext4_clear_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (full)</div><div class='ctx'> 		sbi-&gt;s_fc_bytes = 0;</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	trace_ext4_fc_stats(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1766,7 +1802,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 		if (ret == 0) {</div><div class='ctx'> 			/* Range is not mapped */</div><div class='del'>-			path = ext4_find_extent(inode, cur, NULL, 0);</div><div class='add'>+			path = ext4_find_extent(inode, cur, path, 0);</div><div class='ctx'> 			if (IS_ERR(path))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			memset(&amp;newex, 0, sizeof(newex));</div><div class='hunk'>@@ -1777,11 +1813,10 @@ static int ext4_fc_replay_add_range(struct super_block *sb,</div><div class='ctx'> 			if (ext4_ext_is_unwritten(ex))</div><div class='ctx'> 				ext4_ext_mark_unwritten(&amp;newex);</div><div class='ctx'> 			down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-			ret = ext4_ext_insert_extent(</div><div class='del'>-				NULL, inode, &amp;path, &amp;newex, 0);</div><div class='add'>+			path = ext4_ext_insert_extent(NULL, inode,</div><div class='add'>+						      path, &amp;newex, 0);</div><div class='ctx'> 			up_write((&amp;EXT4_I(inode)-&gt;i_data_sem));</div><div class='del'>-			ext4_free_ext_path(path);</div><div class='del'>-			if (ret)</div><div class='add'>+			if (IS_ERR(path))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1830,6 +1865,7 @@ next:</div><div class='ctx'> 	ext4_ext_replay_shrink_inode(inode, i_size_read(inode) &gt;&gt;</div><div class='ctx'> 					sb-&gt;s_blocksize_bits);</div><div class='ctx'> out:</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1930,12 +1966,13 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (ret &gt; 0) {</div><div class='del'>-				path = ext4_find_extent(inode, map.m_lblk, NULL, 0);</div><div class='add'>+				path = ext4_find_extent(inode, map.m_lblk, path, 0);</div><div class='ctx'> 				if (!IS_ERR(path)) {</div><div class='ctx'> 					for (j = 0; j &lt; path-&gt;p_depth; j++)</div><div class='ctx'> 						ext4_mb_mark_bb(inode-&gt;i_sb,</div><div class='ctx'> 							path[j].p_block, 1, true);</div><div class='del'>-					ext4_free_ext_path(path);</div><div class='add'>+				} else {</div><div class='add'>+					path = NULL;</div><div class='ctx'> 				}</div><div class='ctx'> 				cur += ret;</div><div class='ctx'> 				ext4_mb_mark_bb(inode-&gt;i_sb, map.m_pblk,</div><div class='hunk'>@@ -1946,6 +1983,8 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb)</div><div class='ctx'> 		}</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ext4_free_ext_path(path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2094,13 +2133,13 @@ static int ext4_fc_replay_scan(journal_t *journal,</div><div class='ctx'> 		case EXT4_FC_TAG_INODE:</div><div class='ctx'> 		case EXT4_FC_TAG_PAD:</div><div class='ctx'> 			state-&gt;fc_cur_tag++;</div><div class='del'>-			state-&gt;fc_crc = ext4_chksum(sbi, state-&gt;fc_crc, cur,</div><div class='add'>+			state-&gt;fc_crc = ext4_chksum(state-&gt;fc_crc, cur,</div><div class='ctx'> 				EXT4_FC_TAG_BASE_LEN + tl.fc_len);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case EXT4_FC_TAG_TAIL:</div><div class='ctx'> 			state-&gt;fc_cur_tag++;</div><div class='ctx'> 			memcpy(&amp;tail, val, sizeof(tail));</div><div class='del'>-			state-&gt;fc_crc = ext4_chksum(sbi, state-&gt;fc_crc, cur,</div><div class='add'>+			state-&gt;fc_crc = ext4_chksum(state-&gt;fc_crc, cur,</div><div class='ctx'> 						EXT4_FC_TAG_BASE_LEN +</div><div class='ctx'> 						offsetof(struct ext4_fc_tail,</div><div class='ctx'> 						fc_crc));</div><div class='hunk'>@@ -2127,7 +2166,7 @@ static int ext4_fc_replay_scan(journal_t *journal,</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			state-&gt;fc_cur_tag++;</div><div class='del'>-			state-&gt;fc_crc = ext4_chksum(sbi, state-&gt;fc_crc, cur,</div><div class='add'>+			state-&gt;fc_crc = ext4_chksum(state-&gt;fc_crc, cur,</div><div class='ctx'> 				EXT4_FC_TAG_BASE_LEN + tl.fc_len);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='head'>diff --git a/fs/ext4/fast_commit.h b/fs/ext4/fast_commit.h<br/>index 2fadb2c4780c..3bd534e4dbbf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/fast_commit.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fast_commit.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/fast_commit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/fast_commit.h</a></div><div class='hunk'>@@ -109,8 +109,7 @@ struct ext4_fc_dentry_update {</div><div class='ctx'> 	int fcd_op;		/* Type of update create / unlink / link */</div><div class='ctx'> 	int fcd_parent;		/* Parent inode number */</div><div class='ctx'> 	int fcd_ino;		/* Inode number */</div><div class='del'>-	struct qstr fcd_name;	/* Dirent name */</div><div class='del'>-	unsigned char fcd_iname[DNAME_INLINE_LEN];	/* Dirent name string */</div><div class='add'>+	struct name_snapshot fcd_name;	/* Dirent name */</div><div class='ctx'> 	struct list_head fcd_list;</div><div class='ctx'> 	struct list_head fcd_dilist;</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/ext4/file.c b/fs/ext4/file.c<br/>index 6aa15dafc677..7a8b30932189 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/file.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ static int ext4_release_file(struct inode *inode, struct file *filp)</div><div class='ctx'> 			(atomic_read(&amp;inode-&gt;i_writecount) == 1) &amp;&amp;</div><div class='ctx'> 			!EXT4_I(inode)-&gt;i_reserved_data_blocks) {</div><div class='ctx'> 		down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		ext4_discard_preallocations(inode, 0);</div><div class='add'>+		ext4_discard_preallocations(inode);</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (is_dx(inode) &amp;&amp; filp-&gt;private_data)</div><div class='hunk'>@@ -306,7 +306,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,</div><div class='del'>-					   ssize_t count)</div><div class='add'>+					   ssize_t written, ssize_t count)</div><div class='ctx'> {</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> </div><div class='hunk'>@@ -315,7 +315,7 @@ static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,</div><div class='ctx'> 	if (IS_ERR(handle))</div><div class='ctx'> 		return PTR_ERR(handle);</div><div class='ctx'> </div><div class='del'>-	if (ext4_update_inode_size(inode, offset + count)) {</div><div class='add'>+	if (ext4_update_inode_size(inode, offset + written)) {</div><div class='ctx'> 		int ret = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 		if (unlikely(ret)) {</div><div class='ctx'> 			ext4_journal_stop(handle);</div><div class='hunk'>@@ -323,21 +323,21 @@ static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_nlink)</div><div class='add'>+	if ((written == count) &amp;&amp; inode-&gt;i_nlink)</div><div class='ctx'> 		ext4_orphan_del(handle, inode);</div><div class='ctx'> 	ext4_journal_stop(handle);</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	return written;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up the inode after DIO or DAX extending write has completed and the</div><div class='ctx'>  * inode size has been updated using ext4_handle_inode_extension().</div><div class='ctx'>  */</div><div class='del'>-static void ext4_inode_extension_cleanup(struct inode *inode, ssize_t count)</div><div class='add'>+static void ext4_inode_extension_cleanup(struct inode *inode, bool need_trunc)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held_write(&amp;inode-&gt;i_rwsem);</div><div class='del'>-	if (count &lt; 0) {</div><div class='add'>+	if (need_trunc) {</div><div class='ctx'> 		ext4_truncate_failed_write(inode);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the truncate operation failed early, then the inode may</div><div class='hunk'>@@ -354,7 +354,7 @@ static void ext4_inode_extension_cleanup(struct inode *inode, ssize_t count)</div><div class='ctx'> 	 * to cleanup the orphan list in ext4_handle_inode_extension(). Do it</div><div class='ctx'> 	 * now.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!list_empty(&amp;EXT4_I(inode)-&gt;i_orphan) &amp;&amp; inode-&gt;i_nlink) {</div><div class='add'>+	if (ext4_inode_orphan_tracked(inode) &amp;&amp; inode-&gt;i_nlink) {</div><div class='ctx'> 		handle_t *handle = ext4_journal_start(inode, EXT4_HT_INODE, 2);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(handle)) {</div><div class='hunk'>@@ -377,7 +377,12 @@ static int ext4_dio_write_end_io(struct kiocb *iocb, ssize_t size,</div><div class='ctx'> 	loff_t pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='ctx'> </div><div class='del'>-	if (!error &amp;&amp; size &amp;&amp; flags &amp; IOMAP_DIO_UNWRITTEN)</div><div class='add'>+</div><div class='add'>+	if (!error &amp;&amp; size &amp;&amp; (flags &amp; IOMAP_DIO_UNWRITTEN) &amp;&amp;</div><div class='add'>+			(iocb-&gt;ki_flags &amp; IOCB_ATOMIC))</div><div class='add'>+		error = ext4_convert_unwritten_extents_atomic(NULL, inode, pos,</div><div class='add'>+							      size);</div><div class='add'>+	else if (!error &amp;&amp; size &amp;&amp; flags &amp; IOMAP_DIO_UNWRITTEN)</div><div class='ctx'> 		error = ext4_convert_unwritten_extents(NULL, inode, pos, size);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -392,8 +397,9 @@ static int ext4_dio_write_end_io(struct kiocb *iocb, ssize_t size,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pos + size &lt;= READ_ONCE(EXT4_I(inode)-&gt;i_disksize) &amp;&amp;</div><div class='ctx'> 	    pos + size &lt;= i_size_read(inode))</div><div class='del'>-		return size;</div><div class='del'>-	return ext4_handle_inode_extension(inode, pos, size);</div><div class='add'>+		return 0;</div><div class='add'>+	error = ext4_handle_inode_extension(inode, pos, size, size);</div><div class='add'>+	return error &lt; 0 ? error : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct iomap_dio_ops ext4_dio_write_ops = {</div><div class='hunk'>@@ -564,12 +570,9 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = ext4_orphan_add(handle, inode);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ext4_journal_stop(handle);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		ext4_journal_stop(handle);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ilock_shared &amp;&amp; !unwritten)</div><div class='hunk'>@@ -586,7 +589,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		 * writeback of delalloc blocks.</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON_ONCE(ret == -EIOCBQUEUED);</div><div class='del'>-		ext4_inode_extension_cleanup(inode, ret);</div><div class='add'>+		ext4_inode_extension_cleanup(inode, ret &lt; 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -599,6 +602,13 @@ out:</div><div class='ctx'> 		ssize_t err;</div><div class='ctx'> 		loff_t endbyte;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * There is no support for atomic writes on buffered-io yet,</div><div class='add'>+		 * we should never fallback to buffered-io for DIO atomic</div><div class='add'>+		 * writes.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE(iocb-&gt;ki_flags &amp; IOCB_ATOMIC);</div><div class='add'>+</div><div class='ctx'> 		offset = iocb-&gt;ki_pos;</div><div class='ctx'> 		err = ext4_buffered_write_iter(iocb, from);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -669,8 +679,8 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	ret = dax_iomap_rw(iocb, from, &amp;ext4_iomap_ops);</div><div class='ctx'> </div><div class='ctx'> 	if (extend) {</div><div class='del'>-		ret = ext4_handle_inode_extension(inode, offset, ret);</div><div class='del'>-		ext4_inode_extension_cleanup(inode, ret);</div><div class='add'>+		ret = ext4_handle_inode_extension(inode, offset, ret, count);</div><div class='add'>+		ext4_inode_extension_cleanup(inode, ret &lt; (ssize_t)count);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='hunk'>@@ -683,15 +693,30 @@ out:</div><div class='ctx'> static ssize_t</div><div class='ctx'> ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_DAX</div><div class='ctx'> 	if (IS_DAX(inode))</div><div class='ctx'> 		return ext4_dax_write_iter(iocb, from);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_ATOMIC) {</div><div class='add'>+		size_t len = iov_iter_count(from);</div><div class='add'>+</div><div class='add'>+		if (len &lt; EXT4_SB(inode-&gt;i_sb)-&gt;s_awu_min ||</div><div class='add'>+		    len &gt; EXT4_SB(inode-&gt;i_sb)-&gt;s_awu_max)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = generic_atomic_write_valid(iocb, from);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT)</div><div class='ctx'> 		return ext4_dio_write_iter(iocb, from);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -722,7 +747,7 @@ static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf, unsigned int order)</div><div class='ctx'> 	bool write = (vmf-&gt;flags &amp; FAULT_FLAG_WRITE) &amp;&amp;</div><div class='ctx'> 		(vmf-&gt;vma-&gt;vm_flags &amp; VM_SHARED);</div><div class='ctx'> 	struct address_space *mapping = vmf-&gt;vma-&gt;vm_file-&gt;f_mapping;</div><div class='del'>-	pfn_t pfn;</div><div class='add'>+	unsigned long pfn;</div><div class='ctx'> </div><div class='ctx'> 	if (write) {</div><div class='ctx'> 		sb_start_pagefault(sb);</div><div class='hunk'>@@ -779,27 +804,33 @@ static const struct vm_operations_struct ext4_file_vm_ops = {</div><div class='ctx'> 	.page_mkwrite   = ext4_page_mkwrite,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int ext4_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct dax_device *dax_dev = EXT4_SB(inode-&gt;i_sb)-&gt;s_daxdev;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='add'>+		ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	else</div><div class='add'>+		ret = ext4_forced_shutdown(inode-&gt;i_sb) ? -EIO : 0;</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't support synchronous mappings for non-DAX files and</div><div class='ctx'> 	 * for DAX files if underneath dax_device is not synchronous.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!daxdev_mapping_supported(vma, dax_dev))</div><div class='add'>+	if (!daxdev_mapping_supported(desc-&gt;vm_flags, file_inode(file), dax_dev))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	file_accessed(file);</div><div class='ctx'> 	if (IS_DAX(file_inode(file))) {</div><div class='del'>-		vma-&gt;vm_ops = &amp;ext4_dax_vm_ops;</div><div class='del'>-		vm_flags_set(vma, VM_HUGEPAGE);</div><div class='add'>+		desc-&gt;vm_ops = &amp;ext4_dax_vm_ops;</div><div class='add'>+		desc-&gt;vm_flags |= VM_HUGEPAGE;</div><div class='ctx'> 	} else {</div><div class='del'>-		vma-&gt;vm_ops = &amp;ext4_file_vm_ops;</div><div class='add'>+		desc-&gt;vm_ops = &amp;ext4_file_vm_ops;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -816,7 +847,8 @@ static int ext4_sample_last_mounted(struct super_block *sb,</div><div class='ctx'> 	if (likely(ext4_test_mount_flag(sb, EXT4_MF_MNTDIR_SAMPLED)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb))</div><div class='add'>+	if (ext4_emergency_state(sb) || sb_rdonly(sb) ||</div><div class='add'>+	    !sb_start_intwrite_trylock(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ext4_set_mount_flag(sb, EXT4_MF_MNTDIR_SAMPLED);</div><div class='hunk'>@@ -844,8 +876,7 @@ static int ext4_sample_last_mounted(struct super_block *sb,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_journal;</div><div class='ctx'> 	lock_buffer(sbi-&gt;s_sbh);</div><div class='del'>-	strncpy(sbi-&gt;s_es-&gt;s_last_mounted, cp,</div><div class='del'>-		sizeof(sbi-&gt;s_es-&gt;s_last_mounted));</div><div class='add'>+	strtomem_pad(sbi-&gt;s_es-&gt;s_last_mounted, cp, 0);</div><div class='ctx'> 	ext4_superblock_csum_set(sb);</div><div class='ctx'> 	unlock_buffer(sbi-&gt;s_sbh);</div><div class='ctx'> 	ext4_handle_dirty_metadata(handle, NULL, sbi-&gt;s_sbh);</div><div class='hunk'>@@ -860,8 +891,12 @@ static int ext4_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	if (filp-&gt;f_mode &amp; FMODE_WRITE)</div><div class='add'>+		ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	else</div><div class='add'>+		ret = ext4_forced_shutdown(inode-&gt;i_sb) ? -EIO : 0;</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ext4_sample_last_mounted(inode-&gt;i_sb, filp-&gt;f_path.mnt);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -885,8 +920,10 @@ static int ext4_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	filp-&gt;f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC |</div><div class='del'>-			FMODE_DIO_PARALLEL_WRITE;</div><div class='add'>+	if (ext4_inode_can_atomic_write(inode))</div><div class='add'>+		filp-&gt;f_mode |= FMODE_CAN_ATOMIC_WRITE;</div><div class='add'>+</div><div class='add'>+	filp-&gt;f_mode |= FMODE_NOWAIT | FMODE_CAN_ODIRECT;</div><div class='ctx'> 	return dquot_file_open(inode, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -898,12 +935,7 @@ static int ext4_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> loff_t ext4_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='del'>-	loff_t maxbytes;</div><div class='del'>-</div><div class='del'>-	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))</div><div class='del'>-		maxbytes = EXT4_SB(inode-&gt;i_sb)-&gt;s_bitmap_maxbytes;</div><div class='del'>-	else</div><div class='del'>-		maxbytes = inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='add'>+	loff_t maxbytes = ext4_get_maxbytes(inode);</div><div class='ctx'> </div><div class='ctx'> 	switch (whence) {</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -937,8 +969,7 @@ const struct file_operations ext4_file_operations = {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= ext4_compat_ioctl,</div><div class='ctx'> #endif</div><div class='del'>-	.mmap		= ext4_file_mmap,</div><div class='del'>-	.mmap_supported_flags = MAP_SYNC,</div><div class='add'>+	.mmap_prepare	= ext4_file_mmap_prepare,</div><div class='ctx'> 	.open		= ext4_file_open,</div><div class='ctx'> 	.release	= ext4_release_file,</div><div class='ctx'> 	.fsync		= ext4_sync_file,</div><div class='hunk'>@@ -946,6 +977,9 @@ const struct file_operations ext4_file_operations = {</div><div class='ctx'> 	.splice_read	= ext4_file_splice_read,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fallocate	= ext4_fallocate,</div><div class='add'>+	.fop_flags	= FOP_MMAP_SYNC | FOP_BUFFER_RASYNC |</div><div class='add'>+			  FOP_DIO_PARALLEL_WRITE |</div><div class='add'>+			  FOP_DONTCACHE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct inode_operations ext4_file_inode_operations = {</div><div class='head'>diff --git a/fs/ext4/fsmap.c b/fs/ext4/fsmap.c<br/>index df853c4d3a8c..22fc333244ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/fsmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fsmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/fsmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/fsmap.c</a></div><div class='hunk'>@@ -74,7 +74,8 @@ static int ext4_getfsmap_dev_compare(const void *p1, const void *p2)</div><div class='ctx'> static bool ext4_getfsmap_rec_before_low_key(struct ext4_getfsmap_info *info,</div><div class='ctx'> 					     struct ext4_fsmap *rec)</div><div class='ctx'> {</div><div class='del'>-	return rec-&gt;fmr_physical &lt; info-&gt;gfi_low.fmr_physical;</div><div class='add'>+	return rec-&gt;fmr_physical + rec-&gt;fmr_length &lt;=</div><div class='add'>+	       info-&gt;gfi_low.fmr_physical;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -185,6 +186,59 @@ static inline ext4_fsblk_t ext4_fsmap_next_pblk(struct ext4_fsmap *fmr)</div><div class='ctx'> 	return fmr-&gt;fmr_physical + fmr-&gt;fmr_length;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext4_getfsmap_meta_helper(struct super_block *sb,</div><div class='add'>+				     ext4_group_t agno, ext4_grpblk_t start,</div><div class='add'>+				     ext4_grpblk_t len, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct ext4_getfsmap_info *info = priv;</div><div class='add'>+	struct ext4_fsmap *p;</div><div class='add'>+	struct ext4_fsmap *tmp;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	ext4_fsblk_t fsb, fs_start, fs_end;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	fs_start = fsb = (EXT4_C2B(sbi, start) +</div><div class='add'>+			  ext4_group_first_block_no(sb, agno));</div><div class='add'>+	fs_end = fs_start + EXT4_C2B(sbi, len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Return relevant extents from the meta_list. We emit all extents that</div><div class='add'>+	 * partially/fully overlap with the query range</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(p, tmp, &amp;info-&gt;gfi_meta_list, fmr_list) {</div><div class='add'>+		if (p-&gt;fmr_physical + p-&gt;fmr_length &lt;= info-&gt;gfi_next_fsblk) {</div><div class='add'>+			list_del(&amp;p-&gt;fmr_list);</div><div class='add'>+			kfree(p);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (p-&gt;fmr_physical &lt;= fs_end &amp;&amp;</div><div class='add'>+		    p-&gt;fmr_physical + p-&gt;fmr_length &gt; fs_start) {</div><div class='add'>+			/* Emit the retained free extent record if present */</div><div class='add'>+			if (info-&gt;gfi_lastfree.fmr_owner) {</div><div class='add'>+				error = ext4_getfsmap_helper(sb, info,</div><div class='add'>+							&amp;info-&gt;gfi_lastfree);</div><div class='add'>+				if (error)</div><div class='add'>+					return error;</div><div class='add'>+				info-&gt;gfi_lastfree.fmr_owner = 0;</div><div class='add'>+			}</div><div class='add'>+			error = ext4_getfsmap_helper(sb, info, p);</div><div class='add'>+			if (error)</div><div class='add'>+				return error;</div><div class='add'>+			fsb = p-&gt;fmr_physical + p-&gt;fmr_length;</div><div class='add'>+			if (info-&gt;gfi_next_fsblk &lt; fsb)</div><div class='add'>+				info-&gt;gfi_next_fsblk = fsb;</div><div class='add'>+			list_del(&amp;p-&gt;fmr_list);</div><div class='add'>+			kfree(p);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;gfi_next_fsblk &lt; fsb)</div><div class='add'>+		info-&gt;gfi_next_fsblk = fsb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Transform a blockgroup's free record into a fsmap */</div><div class='ctx'> static int ext4_getfsmap_datadev_helper(struct super_block *sb,</div><div class='ctx'> 					ext4_group_t agno, ext4_grpblk_t start,</div><div class='hunk'>@@ -343,6 +397,14 @@ static unsigned int ext4_getfsmap_find_sb(struct super_block *sb,</div><div class='ctx'> 	/* Reserved GDT blocks */</div><div class='ctx'> 	if (!ext4_has_feature_meta_bg(sb) || metagroup &lt; first_meta_bg) {</div><div class='ctx'> 		len = le16_to_cpu(sbi-&gt;s_es-&gt;s_reserved_gdt_blocks);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * mkfs.ext4 can set s_reserved_gdt_blocks as 0 in some cases,</div><div class='add'>+		 * check for that.</div><div class='add'>+		 */</div><div class='add'>+		if (!len)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='ctx'> 		error = ext4_getfsmap_fill(meta_list, fsb, len,</div><div class='ctx'> 					   EXT4_FMR_OWN_RESV_GDT);</div><div class='ctx'> 		if (error)</div><div class='hunk'>@@ -476,6 +538,7 @@ static int ext4_getfsmap_datadev(struct super_block *sb,</div><div class='ctx'> 	ext4_group_t end_ag;</div><div class='ctx'> 	ext4_grpblk_t first_cluster;</div><div class='ctx'> 	ext4_grpblk_t last_cluster;</div><div class='add'>+	struct ext4_fsmap irec;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	bofs = le32_to_cpu(sbi-&gt;s_es-&gt;s_first_data_block);</div><div class='hunk'>@@ -539,6 +602,7 @@ static int ext4_getfsmap_datadev(struct super_block *sb,</div><div class='ctx'> 		error = ext4_mballoc_query_range(sb, info-&gt;gfi_agno,</div><div class='ctx'> 				EXT4_B2C(sbi, info-&gt;gfi_low.fmr_physical),</div><div class='ctx'> 				EXT4_B2C(sbi, info-&gt;gfi_high.fmr_physical),</div><div class='add'>+				ext4_getfsmap_meta_helper,</div><div class='ctx'> 				ext4_getfsmap_datadev_helper, info);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -558,9 +622,18 @@ static int ext4_getfsmap_datadev(struct super_block *sb,</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Report any gaps at the end of the bg */</div><div class='add'>+	/*</div><div class='add'>+	 * The dummy record below will cause ext4_getfsmap_helper() to report</div><div class='add'>+	 * any allocated blocks at the end of the range.</div><div class='add'>+	 */</div><div class='add'>+	irec.fmr_device = 0;</div><div class='add'>+	irec.fmr_physical = end_fsb + 1;</div><div class='add'>+	irec.fmr_length = 0;</div><div class='add'>+	irec.fmr_owner = EXT4_FMR_OWN_FREE;</div><div class='add'>+	irec.fmr_flags = 0;</div><div class='add'>+</div><div class='ctx'> 	info-&gt;gfi_last = true;</div><div class='del'>-	error = ext4_getfsmap_datadev_helper(sb, end_ag, last_cluster, 0, info);</div><div class='add'>+	error = ext4_getfsmap_helper(sb, info, &amp;irec);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c<br/>index b40d3b29f7e5..e476c6de3074 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/fsync.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/fsync.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/fsync.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/fsync.c</a></div><div class='hunk'>@@ -132,20 +132,16 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	bool needs_barrier = false;</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(ext4_journal_current_handle() == NULL);</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_sync_file_enter(file, datasync);</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(inode-&gt;i_sb)) {</div><div class='del'>-		/* Make sure that we read updated s_ext4_flags value */</div><div class='del'>-		smp_rmb();</div><div class='del'>-		if (ext4_forced_shutdown(inode-&gt;i_sb))</div><div class='del'>-			ret = -EROFS;</div><div class='add'>+	if (sb_rdonly(inode-&gt;i_sb))</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!EXT4_SB(inode-&gt;i_sb)-&gt;s_journal) {</div><div class='ctx'> 		ret = ext4_fsync_nojournal(file, start, end, datasync,</div><div class='head'>diff --git a/fs/ext4/hash.c b/fs/ext4/hash.c<br/>index deabe29da7fb..48483cd015d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/hash.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/hash.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/hash.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/hash.c</a></div><div class='hunk'>@@ -268,7 +268,7 @@ static int __ext4fs_dirhash(const struct inode *dir, const char *name, int len,</div><div class='ctx'> 			combined_hash = fscrypt_fname_siphash(dir, &amp;qname);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ext4_warning_inode(dir, "Siphash requires key");</div><div class='del'>-			return -1;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hash = (__u32)(combined_hash &gt;&gt; 32);</div><div class='hunk'>@@ -302,7 +302,7 @@ int ext4fs_dirhash(const struct inode *dir, const char *name, int len,</div><div class='ctx'> </div><div class='ctx'> 	if (len &amp;&amp; IS_CASEFOLDED(dir) &amp;&amp;</div><div class='ctx'> 	   (!IS_ENCRYPTED(dir) || fscrypt_has_encryption_key(dir))) {</div><div class='del'>-		buff = kzalloc(sizeof(char) * PATH_MAX, GFP_KERNEL);</div><div class='add'>+		buff = kzalloc(PATH_MAX, GFP_KERNEL);</div><div class='ctx'> 		if (!buff)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c<br/>index e9bbb1da2d0a..b20a1bf866ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/ialloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ialloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/ialloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/ialloc.c</a></div><div class='hunk'>@@ -87,10 +87,10 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,</div><div class='ctx'> 	if (EXT4_SB(sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	grp = ext4_get_group_info(sb, block_group);</div><div class='del'>-</div><div class='ctx'> 	if (buffer_verified(bh))</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	grp = ext4_get_group_info(sb, block_group);</div><div class='ctx'> 	if (!grp || EXT4_MB_GRP_IBITMAP_CORRUPT(grp))</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> </div><div class='hunk'>@@ -98,8 +98,7 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,</div><div class='ctx'> 	if (buffer_verified(bh))</div><div class='ctx'> 		goto verified;</div><div class='ctx'> 	blk = ext4_inode_bitmap(sb, desc);</div><div class='del'>-	if (!ext4_inode_bitmap_csum_verify(sb, desc, bh,</div><div class='del'>-					   EXT4_INODES_PER_GROUP(sb) / 8) ||</div><div class='add'>+	if (!ext4_inode_bitmap_csum_verify(sb, desc, bh) ||</div><div class='ctx'> 	    ext4_simulate_fail(sb, EXT4_SIM_IBITMAP_CRC)) {</div><div class='ctx'> 		ext4_unlock_group(sb, block_group);</div><div class='ctx'> 		ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "</div><div class='hunk'>@@ -194,8 +193,9 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)</div><div class='ctx'> 	 * submit the buffer_head for reading</div><div class='ctx'> 	 */</div><div class='ctx'> 	trace_ext4_load_inode_bitmap(sb, block_group);</div><div class='del'>-	ext4_read_bh(bh, REQ_META | REQ_PRIO, ext4_end_bitmap_read);</div><div class='del'>-	ext4_simulate_fail_bh(sb, bh, EXT4_SIM_IBITMAP_EIO);</div><div class='add'>+	ext4_read_bh(bh, REQ_META | REQ_PRIO,</div><div class='add'>+		     ext4_end_bitmap_read,</div><div class='add'>+		     ext4_simulate_fail(sb, EXT4_SIM_IBITMAP_EIO));</div><div class='ctx'> 	if (!buffer_uptodate(bh)) {</div><div class='ctx'> 		put_bh(bh);</div><div class='ctx'> 		ext4_error_err(sb, EIO, "Cannot read inode bitmap - "</div><div class='hunk'>@@ -252,10 +252,10 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)</div><div class='ctx'> 		       "nonexistent device\n", __func__, __LINE__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (atomic_read(&amp;inode-&gt;i_count) &gt; 1) {</div><div class='add'>+	if (icount_read(inode) &gt; 1) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "%s:%d: inode #%lu: count=%d",</div><div class='ctx'> 			 __func__, __LINE__, inode-&gt;i_ino,</div><div class='del'>-			 atomic_read(&amp;inode-&gt;i_count));</div><div class='add'>+			 icount_read(inode));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (inode-&gt;i_nlink) {</div><div class='hunk'>@@ -327,8 +327,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)</div><div class='ctx'> 		if (percpu_counter_initialized(&amp;sbi-&gt;s_dirs_counter))</div><div class='ctx'> 			percpu_counter_dec(&amp;sbi-&gt;s_dirs_counter);</div><div class='ctx'> 	}</div><div class='del'>-	ext4_inode_bitmap_csum_set(sb, gdp, bitmap_bh,</div><div class='del'>-				   EXT4_INODES_PER_GROUP(sb) / 8);</div><div class='add'>+	ext4_inode_bitmap_csum_set(sb, gdp, bitmap_bh);</div><div class='ctx'> 	ext4_group_desc_csum_set(sb, block_group, gdp);</div><div class='ctx'> 	ext4_unlock_group(sb, block_group);</div><div class='ctx'> </div><div class='hunk'>@@ -514,6 +513,8 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent,</div><div class='ctx'> 	if (min_inodes &lt; 1)</div><div class='ctx'> 		min_inodes = 1;</div><div class='ctx'> 	min_clusters = avefreec - EXT4_CLUSTERS_PER_GROUP(sb)*flex_size / 4;</div><div class='add'>+	if (min_clusters &lt; 0)</div><div class='add'>+		min_clusters = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start looking in the flex group where we last allocated an</div><div class='hunk'>@@ -690,7 +691,8 @@ static int recently_deleted(struct super_block *sb, ext4_group_t group, int ino)</div><div class='ctx'> 	if (!bh || !buffer_uptodate(bh))</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the block is not in the buffer cache, then it</div><div class='del'>-		 * must have been written out.</div><div class='add'>+		 * must have been written out, or, most unlikely, is</div><div class='add'>+		 * being migrated - false failure should be OK here.</div><div class='ctx'> 		 */</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -755,10 +757,10 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)</div><div class='ctx'> 	struct ext4_group_desc *gdp;</div><div class='ctx'> 	ext4_group_t group;</div><div class='ctx'> 	int bit;</div><div class='del'>-	int err = -EFSCORRUPTED;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (ino &lt; EXT4_FIRST_INO(sb) || ino &gt; max_ino)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='ctx'> </div><div class='ctx'> 	group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);</div><div class='ctx'> 	bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);</div><div class='hunk'>@@ -772,7 +774,7 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gdp = ext4_get_group_desc(sb, group, &amp;group_desc_bh);</div><div class='del'>-	if (!gdp || !group_desc_bh) {</div><div class='add'>+	if (!gdp) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -851,8 +853,7 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)</div><div class='ctx'> </div><div class='ctx'> 	ext4_free_inodes_set(sb, gdp, ext4_free_inodes_count(sb, gdp) - 1);</div><div class='ctx'> 	if (ext4_has_group_desc_csum(sb)) {</div><div class='del'>-		ext4_inode_bitmap_csum_set(sb, gdp, inode_bitmap_bh,</div><div class='del'>-					   EXT4_INODES_PER_GROUP(sb) / 8);</div><div class='add'>+		ext4_inode_bitmap_csum_set(sb, gdp, inode_bitmap_bh);</div><div class='ctx'> 		ext4_group_desc_csum_set(sb, group, gdp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -860,6 +861,7 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)</div><div class='ctx'> 	err = ext4_handle_dirty_metadata(NULL, NULL, group_desc_bh);</div><div class='ctx'> 	sync_dirty_buffer(group_desc_bh);</div><div class='ctx'> out:</div><div class='add'>+	brelse(inode_bitmap_bh);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -950,8 +952,9 @@ struct inode *__ext4_new_inode(struct mnt_idmap *idmap,</div><div class='ctx'> 	sb = dir-&gt;i_sb;</div><div class='ctx'> 	sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='del'>-		return ERR_PTR(-EIO);</div><div class='add'>+	ret2 = ext4_emergency_state(sb);</div><div class='add'>+	if (unlikely(ret2))</div><div class='add'>+		return ERR_PTR(ret2);</div><div class='ctx'> </div><div class='ctx'> 	ngroups = ext4_get_groups_count(sb);</div><div class='ctx'> 	trace_ext4_request_inode(dir, mode);</div><div class='hunk'>@@ -1053,14 +1056,14 @@ got_group:</div><div class='ctx'> 		brelse(inode_bitmap_bh);</div><div class='ctx'> 		inode_bitmap_bh = ext4_read_inode_bitmap(sb, group);</div><div class='ctx'> 		/* Skip groups with suspicious inode tables */</div><div class='del'>-		if (((!(sbi-&gt;s_mount_state &amp; EXT4_FC_REPLAY))</div><div class='del'>-		     &amp;&amp; EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) ||</div><div class='del'>-		    IS_ERR(inode_bitmap_bh)) {</div><div class='add'>+		if (IS_ERR(inode_bitmap_bh)) {</div><div class='ctx'> 			inode_bitmap_bh = NULL;</div><div class='ctx'> 			goto next_group;</div><div class='ctx'> 		}</div><div class='add'>+		if (!(sbi-&gt;s_mount_state &amp; EXT4_FC_REPLAY) &amp;&amp;</div><div class='add'>+		    EXT4_MB_GRP_IBITMAP_CORRUPT(grp))</div><div class='add'>+			goto next_group;</div><div class='ctx'> </div><div class='del'>-repeat_in_this_group:</div><div class='ctx'> 		ret2 = find_inode_bit(sb, group, inode_bitmap_bh, &amp;ino);</div><div class='ctx'> 		if (!ret2)</div><div class='ctx'> 			goto next_group;</div><div class='hunk'>@@ -1110,8 +1113,6 @@ repeat_in_this_group:</div><div class='ctx'> 		if (!ret2)</div><div class='ctx'> 			goto got; /* we grabbed the inode! */</div><div class='ctx'> </div><div class='del'>-		if (ino &lt; EXT4_INODES_PER_GROUP(sb))</div><div class='del'>-			goto repeat_in_this_group;</div><div class='ctx'> next_group:</div><div class='ctx'> 		if (++group == ngroups)</div><div class='ctx'> 			group = 0;</div><div class='hunk'>@@ -1224,8 +1225,7 @@ got:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ext4_has_group_desc_csum(sb)) {</div><div class='del'>-		ext4_inode_bitmap_csum_set(sb, gdp, inode_bitmap_bh,</div><div class='del'>-					   EXT4_INODES_PER_GROUP(sb) / 8);</div><div class='add'>+		ext4_inode_bitmap_csum_set(sb, gdp, inode_bitmap_bh);</div><div class='ctx'> 		ext4_group_desc_csum_set(sb, group, gdp);</div><div class='ctx'> 	}</div><div class='ctx'> 	ext4_unlock_group(sb, group);</div><div class='hunk'>@@ -1284,23 +1284,21 @@ got:</div><div class='ctx'> 	inode-&gt;i_generation = get_random_u32();</div><div class='ctx'> </div><div class='ctx'> 	/* Precompute checksum seed for inode metadata */</div><div class='del'>-	if (ext4_has_metadata_csum(sb)) {</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb)) {</div><div class='ctx'> 		__u32 csum;</div><div class='ctx'> 		__le32 inum = cpu_to_le32(inode-&gt;i_ino);</div><div class='ctx'> 		__le32 gen = cpu_to_le32(inode-&gt;i_generation);</div><div class='del'>-		csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)&amp;inum,</div><div class='add'>+		csum = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)&amp;inum,</div><div class='ctx'> 				   sizeof(inum));</div><div class='del'>-		ei-&gt;i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&amp;gen,</div><div class='del'>-					      sizeof(gen));</div><div class='add'>+		ei-&gt;i_csum_seed = ext4_chksum(csum, (__u8 *)&amp;gen, sizeof(gen));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */</div><div class='ctx'> 	ext4_set_inode_state(inode, EXT4_STATE_NEW);</div><div class='ctx'> </div><div class='ctx'> 	ei-&gt;i_extra_isize = sbi-&gt;s_want_extra_isize;</div><div class='ctx'> 	ei-&gt;i_inline_off = 0;</div><div class='ctx'> 	if (ext4_has_feature_inline_data(sb) &amp;&amp;</div><div class='del'>-	    (!(ei-&gt;i_flags &amp; EXT4_DAX_FL) || S_ISDIR(mode)))</div><div class='add'>+	    (!(ei-&gt;i_flags &amp; (EXT4_DAX_FL|EXT4_EA_INODE_FL)) || S_ISDIR(mode)))</div><div class='ctx'> 		ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);</div><div class='ctx'> 	ret = inode;</div><div class='ctx'> 	err = dquot_alloc_inode(inode);</div><div class='hunk'>@@ -1336,10 +1334,9 @@ got:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext4_handle_valid(handle)) {</div><div class='del'>-		ei-&gt;i_sync_tid = handle-&gt;h_transaction-&gt;t_tid;</div><div class='del'>-		ei-&gt;i_datasync_tid = handle-&gt;h_transaction-&gt;t_tid;</div><div class='del'>-	}</div><div class='add'>+	ext4_set_inode_mapping_order(inode);</div><div class='add'>+</div><div class='add'>+	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 	if (err) {</div><div class='head'>diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c<br/>index a9f3716119d3..da76353b3a57 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/indirect.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/indirect.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/indirect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/indirect.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!bh_uptodate_or_lock(bh)) {</div><div class='del'>-			if (ext4_read_bh(bh, 0, NULL) &lt; 0) {</div><div class='add'>+			if (ext4_read_bh(bh, 0, NULL, false) &lt; 0) {</div><div class='ctx'> 				put_bh(bh);</div><div class='ctx'> 				goto failure;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -539,7 +539,7 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	int indirect_blks;</div><div class='ctx'> 	int blocks_to_boundary = 0;</div><div class='ctx'> 	int depth;</div><div class='del'>-	int count = 0;</div><div class='add'>+	u64 count = 0;</div><div class='ctx'> 	ext4_fsblk_t first_block = 0;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_ind_map_blocks_enter(inode, map-&gt;m_lblk, map-&gt;m_len, flags);</div><div class='hunk'>@@ -588,7 +588,7 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		count++;</div><div class='ctx'> 		/* Fill in size of a hole we found */</div><div class='ctx'> 		map-&gt;m_pblk = 0;</div><div class='del'>-		map-&gt;m_len = min_t(unsigned int, map-&gt;m_len, count);</div><div class='add'>+		map-&gt;m_len = umin(map-&gt;m_len, count);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -652,13 +652,6 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> 	count = ar.len;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Update reserved blocks/metadata blocks after successful block</div><div class='del'>-	 * allocation which had been deferred till now.</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; EXT4_GET_BLOCKS_DELALLOC_RESERVE)</div><div class='del'>-		ext4_da_update_reserve_space(inode, count, 1);</div><div class='del'>-</div><div class='ctx'> got_it:</div><div class='ctx'> 	map-&gt;m_flags |= EXT4_MAP_MAPPED;</div><div class='ctx'> 	map-&gt;m_pblk = le32_to_cpu(chain[depth-1].key);</div><div class='hunk'>@@ -714,7 +707,7 @@ static int ext4_ind_trunc_restart_fn(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	 * i_rwsem. So we can safely drop the i_data_sem here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUG_ON(EXT4_JOURNAL(inode) == NULL);</div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> 	up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 	*dropped = 1;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1032,7 +1025,7 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Go read the buffer for the next level down */</div><div class='del'>-			bh = ext4_sb_bread(inode-&gt;i_sb, nr, 0);</div><div class='add'>+			bh = ext4_sb_bread_nofail(inode-&gt;i_sb, nr);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * A read failure? Report error and clear slot</div><div class='head'>diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c<br/>index d5bd1e3a5d36..1f6bc05593df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/inline.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/inline.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/inline.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/inline.c</a></div><div class='hunk'>@@ -20,6 +20,11 @@</div><div class='ctx'> #define EXT4_INLINE_DOTDOT_OFFSET	2</div><div class='ctx'> #define EXT4_INLINE_DOTDOT_SIZE		4</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,</div><div class='add'>+						 struct inode *inode,</div><div class='add'>+						 void **fsdata);</div><div class='add'>+</div><div class='ctx'> static int ext4_get_inline_size(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (EXT4_I(inode)-&gt;i_inline_off)</div><div class='hunk'>@@ -228,7 +233,7 @@ static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc,</div><div class='ctx'> 	struct ext4_inode *raw_inode;</div><div class='ctx'> 	int cp_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+	if (unlikely(ext4_emergency_state(inode-&gt;i_sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!EXT4_I(inode)-&gt;i_inline_off);</div><div class='hunk'>@@ -298,7 +303,11 @@ static int ext4_create_inline_data(handle_t *handle,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!is.s.not_found);</div><div class='add'>+	if (!is.s.not_found) {</div><div class='add'>+		EXT4_ERROR_INODE(inode, "unexpected inline data xattr");</div><div class='add'>+		error = -EFSCORRUPTED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	error = ext4_xattr_ibody_set(handle, inode, &amp;i, &amp;is);</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -349,7 +358,11 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(is.s.not_found);</div><div class='add'>+	if (is.s.not_found) {</div><div class='add'>+		EXT4_ERROR_INODE(inode, "missing inline data xattr");</div><div class='add'>+		error = -EFSCORRUPTED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	len -= EXT4_MIN_INLINE_DATA_SIZE;</div><div class='ctx'> 	value = kzalloc(len, GFP_NOFS);</div><div class='hunk'>@@ -392,7 +405,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_prepare_inline_data(handle_t *handle, struct inode *inode,</div><div class='del'>-				    unsigned int len)</div><div class='add'>+				    loff_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, size, no_expand;</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='hunk'>@@ -405,7 +418,12 @@ static int ext4_prepare_inline_data(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	ext4_write_lock_xattr(inode, &amp;no_expand);</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * ei-&gt;i_inline_size may have changed since the initial check</div><div class='add'>+	 * if other xattrs were added. Recalculate to ensure</div><div class='add'>+	 * ext4_update_inline_data() validates against current capacity.</div><div class='add'>+	 */</div><div class='add'>+	(void) ext4_find_inline_data_nolock(inode);</div><div class='ctx'> 	if (ei-&gt;i_inline_off)</div><div class='ctx'> 		ret = ext4_update_inline_data(handle, inode, len);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -433,9 +451,13 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle,</div><div class='ctx'> 	if (!ei-&gt;i_inline_off)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	down_write(&amp;ei-&gt;i_data_sem);</div><div class='add'>+</div><div class='ctx'> 	error = ext4_get_inode_loc(inode, &amp;is.iloc);</div><div class='del'>-	if (error)</div><div class='add'>+	if (error) {</div><div class='add'>+		up_write(&amp;ei-&gt;i_data_sem);</div><div class='ctx'> 		return error;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	error = ext4_xattr_ibody_find(inode, &amp;i, &amp;is);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -474,6 +496,7 @@ out:</div><div class='ctx'> 	brelse(is.iloc.bh);</div><div class='ctx'> 	if (error == -ENODATA)</div><div class='ctx'> 		error = 0;</div><div class='add'>+	up_write(&amp;ei-&gt;i_data_sem);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -557,7 +580,7 @@ static int ext4_convert_inline_data_to_extent(struct address_space *mapping,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	needed_blocks = ext4_writepage_trans_blocks(inode);</div><div class='add'>+	needed_blocks = ext4_chunk_trans_extent(inode, 1);</div><div class='ctx'> </div><div class='ctx'> 	ret = ext4_get_inode_loc(inode, &amp;iloc);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -596,15 +619,18 @@ retry:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ext4_fc_track_inode(handle, inode);</div><div class='ctx'> 	ret = ext4_destroy_inline_data_nolock(handle, inode);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_should_dioread_nolock(inode)) {</div><div class='del'>-		ret = __block_write_begin(&amp;folio-&gt;page, from, to,</div><div class='del'>-					  ext4_get_block_unwritten);</div><div class='add'>+		ret = ext4_block_write_begin(handle, folio, from, to,</div><div class='add'>+					     ext4_get_block_unwritten);</div><div class='ctx'> 	} else</div><div class='del'>-		ret = __block_write_begin(&amp;folio-&gt;page, from, to, ext4_get_block);</div><div class='add'>+		ret = ext4_block_write_begin(handle, folio, from, to,</div><div class='add'>+					     ext4_get_block);</div><div class='add'>+	clear_buffer_new(folio_buffers(folio));</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; ext4_should_journal_data(inode)) {</div><div class='ctx'> 		ret = ext4_walk_page_buffers(handle, inode,</div><div class='hunk'>@@ -636,7 +662,7 @@ retry:</div><div class='ctx'> 		goto retry;</div><div class='ctx'> </div><div class='ctx'> 	if (folio)</div><div class='del'>-		block_commit_write(&amp;folio-&gt;page, from, to);</div><div class='add'>+		block_commit_write(folio, from, to);</div><div class='ctx'> out:</div><div class='ctx'> 	if (folio) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='hunk'>@@ -652,91 +678,109 @@ out_nofolio:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Try to write data in the inode.</div><div class='del'>- * If the inode has inline data, check whether the new write can be</div><div class='del'>- * in the inode also. If not, create the page the handle, move the data</div><div class='del'>- * to the page make it update and let the later codes create extent for it.</div><div class='add'>+ * Prepare the write for the inline data.</div><div class='add'>+ * If the data can be written into the inode, we just read</div><div class='add'>+ * the page and make it uptodate, and start the journal.</div><div class='add'>+ * Otherwise read the page, makes it dirty so that it can be</div><div class='add'>+ * handle in writepages(the i_disksize update is left to the</div><div class='add'>+ * normal ext4_da_write_end).</div><div class='ctx'>  */</div><div class='del'>-int ext4_try_to_write_inline_data(struct address_space *mapping,</div><div class='del'>-				  struct inode *inode,</div><div class='del'>-				  loff_t pos, unsigned len,</div><div class='del'>-				  struct page **pagep)</div><div class='add'>+int ext4_generic_write_inline_data(struct address_space *mapping,</div><div class='add'>+					  struct inode *inode,</div><div class='add'>+					  loff_t pos, unsigned len,</div><div class='add'>+					  struct folio **foliop,</div><div class='add'>+					  void **fsdata, bool da)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	struct ext4_iloc iloc;</div><div class='del'>-</div><div class='del'>-	if (pos + len &gt; ext4_get_max_inline_size(inode))</div><div class='del'>-		goto convert;</div><div class='add'>+	int retries = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = ext4_get_inode_loc(inode, &amp;iloc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The possible write could happen in the inode,</div><div class='del'>-	 * so try to reserve the space in inode first.</div><div class='del'>-	 */</div><div class='add'>+retry_journal:</div><div class='ctx'> 	handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='ctx'> 		ret = PTR_ERR(handle);</div><div class='del'>-		handle = NULL;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_release_bh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ext4_prepare_inline_data(handle, inode, pos + len);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -ENOSPC)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_stop_journal;</div><div class='ctx'> </div><div class='del'>-	/* We don't have space in inline inode, so convert it to extent. */</div><div class='ctx'> 	if (ret == -ENOSPC) {</div><div class='ctx'> 		ext4_journal_stop(handle);</div><div class='del'>-		brelse(iloc.bh);</div><div class='del'>-		goto convert;</div><div class='del'>-	}</div><div class='add'>+		if (!da) {</div><div class='add'>+			brelse(iloc.bh);</div><div class='add'>+			/* Retry inside */</div><div class='add'>+			return ext4_convert_inline_data_to_extent(mapping, inode);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	ret = ext4_journal_get_write_access(handle, inode-&gt;i_sb, iloc.bh,</div><div class='del'>-					    EXT4_JTR_NONE);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		ret = ext4_da_convert_inline_data_to_extent(mapping, inode, fsdata);</div><div class='add'>+		if (ret == -ENOSPC &amp;&amp;</div><div class='add'>+		    ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries))</div><div class='add'>+			goto retry_journal;</div><div class='add'>+		goto out_release_bh;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,</div><div class='ctx'> 					mapping_gfp_mask(mapping));</div><div class='ctx'> 	if (IS_ERR(folio)) {</div><div class='ctx'> 		ret = PTR_ERR(folio);</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_stop_journal;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='ctx'> 	down_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='add'>+	/* Someone else had converted it to extent */</div><div class='ctx'> 	if (!ext4_has_inline_data(inode)) {</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-		goto out_up_read;</div><div class='add'>+		goto out_release_folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		ret = ext4_read_inline_folio(inode, folio);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			folio_put(folio);</div><div class='del'>-			goto out_up_read;</div><div class='del'>-		}</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_release_folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = 1;</div><div class='del'>-	handle = NULL;</div><div class='del'>-out_up_read:</div><div class='add'>+	ret = ext4_journal_get_write_access(handle, inode-&gt;i_sb, iloc.bh, EXT4_JTR_NONE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_release_folio;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> 	up_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='del'>-out:</div><div class='del'>-	if (handle &amp;&amp; (ret != 1))</div><div class='del'>-		ext4_journal_stop(handle);</div><div class='add'>+	brelse(iloc.bh);</div><div class='add'>+	return 1;</div><div class='add'>+</div><div class='add'>+out_release_folio:</div><div class='add'>+	up_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+out_stop_journal:</div><div class='add'>+	ext4_journal_stop(handle);</div><div class='add'>+out_release_bh:</div><div class='ctx'> 	brelse(iloc.bh);</div><div class='ctx'> 	return ret;</div><div class='del'>-convert:</div><div class='del'>-	return ext4_convert_inline_data_to_extent(mapping, inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Try to write data in the inode.</div><div class='add'>+ * If the inode has inline data, check whether the new write can be</div><div class='add'>+ * in the inode also. If not, create the page the handle, move the data</div><div class='add'>+ * to the page make it update and let the later codes create extent for it.</div><div class='add'>+ */</div><div class='add'>+int ext4_try_to_write_inline_data(struct address_space *mapping,</div><div class='add'>+				  struct inode *inode,</div><div class='add'>+				  loff_t pos, unsigned len,</div><div class='add'>+				  struct folio **foliop)</div><div class='add'>+{</div><div class='add'>+	if (pos + len &gt; ext4_get_max_inline_size(inode))</div><div class='add'>+		return ext4_convert_inline_data_to_extent(mapping, inode);</div><div class='add'>+	return ext4_generic_write_inline_data(mapping, inode, pos, len,</div><div class='add'>+					      foliop, NULL, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,</div><div class='hunk'>@@ -856,8 +900,8 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = __block_write_begin(&amp;folio-&gt;page, 0, inline_size,</div><div class='del'>-				  ext4_da_get_block_prep);</div><div class='add'>+	ret = ext4_block_write_begin(NULL, folio, 0, inline_size,</div><div class='add'>+				     ext4_da_get_block_prep);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		up_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='ctx'> 		folio_unlock(folio);</div><div class='hunk'>@@ -866,6 +910,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clear_buffer_new(folio_buffers(folio));</div><div class='ctx'> 	folio_mark_dirty(folio);</div><div class='ctx'> 	folio_mark_uptodate(folio);</div><div class='ctx'> 	ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);</div><div class='hunk'>@@ -880,94 +925,6 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Prepare the write for the inline data.</div><div class='del'>- * If the data can be written into the inode, we just read</div><div class='del'>- * the page and make it uptodate, and start the journal.</div><div class='del'>- * Otherwise read the page, makes it dirty so that it can be</div><div class='del'>- * handle in writepages(the i_disksize update is left to the</div><div class='del'>- * normal ext4_da_write_end).</div><div class='del'>- */</div><div class='del'>-int ext4_da_write_inline_data_begin(struct address_space *mapping,</div><div class='del'>-				    struct inode *inode,</div><div class='del'>-				    loff_t pos, unsigned len,</div><div class='del'>-				    struct page **pagep,</div><div class='del'>-				    void **fsdata)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	handle_t *handle;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	struct ext4_iloc iloc;</div><div class='del'>-	int retries = 0;</div><div class='del'>-</div><div class='del'>-	ret = ext4_get_inode_loc(inode, &amp;iloc);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-retry_journal:</div><div class='del'>-	handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);</div><div class='del'>-	if (IS_ERR(handle)) {</div><div class='del'>-		ret = PTR_ERR(handle);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ext4_prepare_inline_data(handle, inode, pos + len);</div><div class='del'>-	if (ret &amp;&amp; ret != -ENOSPC)</div><div class='del'>-		goto out_journal;</div><div class='del'>-</div><div class='del'>-	if (ret == -ENOSPC) {</div><div class='del'>-		ext4_journal_stop(handle);</div><div class='del'>-		ret = ext4_da_convert_inline_data_to_extent(mapping,</div><div class='del'>-							    inode,</div><div class='del'>-							    fsdata);</div><div class='del'>-		if (ret == -ENOSPC &amp;&amp;</div><div class='del'>-		    ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries))</div><div class='del'>-			goto retry_journal;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We cannot recurse into the filesystem as the transaction</div><div class='del'>-	 * is already started.</div><div class='del'>-	 */</div><div class='del'>-	folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,</div><div class='del'>-					mapping_gfp_mask(mapping));</div><div class='del'>-	if (IS_ERR(folio)) {</div><div class='del'>-		ret = PTR_ERR(folio);</div><div class='del'>-		goto out_journal;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='del'>-	if (!ext4_has_inline_data(inode)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out_release_page;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!folio_test_uptodate(folio)) {</div><div class='del'>-		ret = ext4_read_inline_folio(inode, folio);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_release_page;</div><div class='del'>-	}</div><div class='del'>-	ret = ext4_journal_get_write_access(handle, inode-&gt;i_sb, iloc.bh,</div><div class='del'>-					    EXT4_JTR_NONE);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_release_page;</div><div class='del'>-</div><div class='del'>-	up_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='del'>-	brelse(iloc.bh);</div><div class='del'>-	return 1;</div><div class='del'>-out_release_page:</div><div class='del'>-	up_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	folio_put(folio);</div><div class='del'>-out_journal:</div><div class='del'>-	ext4_journal_stop(handle);</div><div class='del'>-out:</div><div class='del'>-	brelse(iloc.bh);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef INLINE_DIR_DEBUG</div><div class='ctx'> void ext4_show_inline_dir(struct inode *dir, struct buffer_head *bh,</div><div class='ctx'> 			  void *inline_start, int inline_size)</div><div class='hunk'>@@ -1011,7 +968,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle,</div><div class='ctx'> 	int		err;</div><div class='ctx'> 	struct ext4_dir_entry_2 *de;</div><div class='ctx'> </div><div class='del'>-	err = ext4_find_dest_de(dir, inode, iloc-&gt;bh, inline_start,</div><div class='add'>+	err = ext4_find_dest_de(dir, iloc-&gt;bh, inline_start,</div><div class='ctx'> 				inline_size, fname, &amp;de);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1058,7 +1015,7 @@ static void *ext4_get_inline_xattr_pos(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the final de to cover the whole block. */</div><div class='del'>-static void ext4_update_final_de(void *de_buf, int old_size, int new_size)</div><div class='add'>+void ext4_update_final_de(void *de_buf, int old_size, int new_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_dir_entry_2 *de, *prev_de;</div><div class='ctx'> 	void *limit;</div><div class='hunk'>@@ -1122,51 +1079,6 @@ static void ext4_restore_inline_data(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_finish_convert_inline_dir(handle_t *handle,</div><div class='del'>-					  struct inode *inode,</div><div class='del'>-					  struct buffer_head *dir_block,</div><div class='del'>-					  void *buf,</div><div class='del'>-					  int inline_size)</div><div class='del'>-{</div><div class='del'>-	int err, csum_size = 0, header_size = 0;</div><div class='del'>-	struct ext4_dir_entry_2 *de;</div><div class='del'>-	void *target = dir_block-&gt;b_data;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * First create "." and ".." and then copy the dir information</div><div class='del'>-	 * back to the block.</div><div class='del'>-	 */</div><div class='del'>-	de = target;</div><div class='del'>-	de = ext4_init_dot_dotdot(inode, de,</div><div class='del'>-		inode-&gt;i_sb-&gt;s_blocksize, csum_size,</div><div class='del'>-		le32_to_cpu(((struct ext4_dir_entry_2 *)buf)-&gt;inode), 1);</div><div class='del'>-	header_size = (void *)de - target;</div><div class='del'>-</div><div class='del'>-	memcpy((void *)de, buf + EXT4_INLINE_DOTDOT_SIZE,</div><div class='del'>-		inline_size - EXT4_INLINE_DOTDOT_SIZE);</div><div class='del'>-</div><div class='del'>-	if (ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='del'>-		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_size = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	i_size_write(inode, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-	EXT4_I(inode)-&gt;i_disksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	ext4_update_final_de(dir_block-&gt;b_data,</div><div class='del'>-			inline_size - EXT4_INLINE_DOTDOT_SIZE + header_size,</div><div class='del'>-			inode-&gt;i_sb-&gt;s_blocksize - csum_size);</div><div class='del'>-</div><div class='del'>-	if (csum_size)</div><div class='del'>-		ext4_initialize_dirent_tail(dir_block,</div><div class='del'>-					    inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-	set_buffer_uptodate(dir_block);</div><div class='del'>-	unlock_buffer(dir_block);</div><div class='del'>-	err = ext4_handle_dirty_dirblock(handle, inode, dir_block);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	set_buffer_verified(dir_block);</div><div class='del'>-	return ext4_mark_inode_dirty(handle, inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ext4_convert_inline_data_nolock(handle_t *handle,</div><div class='ctx'> 					   struct inode *inode,</div><div class='ctx'> 					   struct ext4_iloc *iloc)</div><div class='hunk'>@@ -1238,8 +1150,17 @@ static int ext4_convert_inline_data_nolock(handle_t *handle,</div><div class='ctx'> 		error = ext4_handle_dirty_metadata(handle,</div><div class='ctx'> 						   inode, data_bh);</div><div class='ctx'> 	} else {</div><div class='del'>-		error = ext4_finish_convert_inline_dir(handle, inode, data_bh,</div><div class='del'>-						       buf, inline_size);</div><div class='add'>+		unlock_buffer(data_bh);</div><div class='add'>+		inode-&gt;i_size = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='add'>+		i_size_write(inode, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='add'>+		EXT4_I(inode)-&gt;i_disksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='add'>+</div><div class='add'>+		error = ext4_init_dirblock(handle, inode, data_bh,</div><div class='add'>+			  le32_to_cpu(((struct ext4_dir_entry_2 *)buf)-&gt;inode),</div><div class='add'>+			  buf + EXT4_INLINE_DOTDOT_SIZE,</div><div class='add'>+			  inline_size - EXT4_INLINE_DOTDOT_SIZE);</div><div class='add'>+		if (!error)</div><div class='add'>+			error = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_restore:</div><div class='hunk'>@@ -1378,7 +1299,7 @@ int ext4_inlinedir_to_tree(struct file *dir_file,</div><div class='ctx'> 		if (pos == 0) {</div><div class='ctx'> 			fake.inode = cpu_to_le32(inode-&gt;i_ino);</div><div class='ctx'> 			fake.name_len = 1;</div><div class='del'>-			strcpy(fake.name, ".");</div><div class='add'>+			memcpy(fake.name, ".", 2);</div><div class='ctx'> 			fake.rec_len = ext4_rec_len_to_disk(</div><div class='ctx'> 					  ext4_dir_rec_len(fake.name_len, NULL),</div><div class='ctx'> 					  inline_size);</div><div class='hunk'>@@ -1388,7 +1309,7 @@ int ext4_inlinedir_to_tree(struct file *dir_file,</div><div class='ctx'> 		} else if (pos == EXT4_INLINE_DOTDOT_OFFSET) {</div><div class='ctx'> 			fake.inode = cpu_to_le32(parent_ino);</div><div class='ctx'> 			fake.name_len = 2;</div><div class='del'>-			strcpy(fake.name, "..");</div><div class='add'>+			memcpy(fake.name, "..", 3);</div><div class='ctx'> 			fake.rec_len = ext4_rec_len_to_disk(</div><div class='ctx'> 					  ext4_dir_rec_len(fake.name_len, NULL),</div><div class='ctx'> 					  inline_size);</div><div class='hunk'>@@ -1410,7 +1331,11 @@ int ext4_inlinedir_to_tree(struct file *dir_file,</div><div class='ctx'> 			hinfo-&gt;hash = EXT4_DIRENT_HASH(de);</div><div class='ctx'> 			hinfo-&gt;minor_hash = EXT4_DIRENT_MINOR_HASH(de);</div><div class='ctx'> 		} else {</div><div class='del'>-			ext4fs_dirhash(dir, de-&gt;name, de-&gt;name_len, hinfo);</div><div class='add'>+			err = ext4fs_dirhash(dir, de-&gt;name, de-&gt;name_len, hinfo);</div><div class='add'>+			if (err) {</div><div class='add'>+				ret = err;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((hinfo-&gt;hash &lt; start_hash) ||</div><div class='ctx'> 		    ((hinfo-&gt;hash == start_hash) &amp;&amp;</div><div class='hunk'>@@ -1456,6 +1381,7 @@ int ext4_read_inline_dir(struct file *file,</div><div class='ctx'> 	struct ext4_iloc iloc;</div><div class='ctx'> 	void *dir_buf = NULL;</div><div class='ctx'> 	int dotdot_offset, dotdot_size, extra_offset, extra_size;</div><div class='add'>+	struct dir_private_info *info = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	ret = ext4_get_inode_loc(inode, &amp;iloc);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1499,12 +1425,12 @@ int ext4_read_inline_dir(struct file *file,</div><div class='ctx'> 	extra_size = extra_offset + inline_size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If the version has changed since the last call to</div><div class='add'>+	 * If the cookie has changed since the last call to</div><div class='ctx'> 	 * readdir(2), then we might be pointing to an invalid</div><div class='ctx'> 	 * dirent right now.  Scan from the start of the inline</div><div class='ctx'> 	 * dir to make sure.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!inode_eq_iversion(inode, file-&gt;f_version)) {</div><div class='add'>+	if (!inode_eq_iversion(inode, info-&gt;cookie)) {</div><div class='ctx'> 		for (i = 0; i &lt; extra_size &amp;&amp; i &lt; offset;) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * "." is with offset 0 and</div><div class='hunk'>@@ -1536,7 +1462,7 @@ int ext4_read_inline_dir(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 		offset = i;</div><div class='ctx'> 		ctx-&gt;pos = offset;</div><div class='del'>-		file-&gt;f_version = inode_query_iversion(inode);</div><div class='add'>+		info-&gt;cookie = inode_query_iversion(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (ctx-&gt;pos &lt; extra_size) {</div><div class='hunk'>@@ -1660,24 +1586,36 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,</div><div class='ctx'> 					struct ext4_dir_entry_2 **res_dir,</div><div class='ctx'> 					int *has_inline_data)</div><div class='ctx'> {</div><div class='add'>+	struct ext4_xattr_ibody_find is = {</div><div class='add'>+		.s = { .not_found = -ENODATA, },</div><div class='add'>+	};</div><div class='add'>+	struct ext4_xattr_info i = {</div><div class='add'>+		.name_index = EXT4_XATTR_INDEX_SYSTEM,</div><div class='add'>+		.name = EXT4_XATTR_SYSTEM_DATA,</div><div class='add'>+	};</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct ext4_iloc iloc;</div><div class='ctx'> 	void *inline_start;</div><div class='ctx'> 	int inline_size;</div><div class='ctx'> </div><div class='del'>-	if (ext4_get_inode_loc(dir, &amp;iloc))</div><div class='del'>-		return NULL;</div><div class='add'>+	ret = ext4_get_inode_loc(dir, &amp;is.iloc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;EXT4_I(dir)-&gt;xattr_sem);</div><div class='add'>+</div><div class='add'>+	ret = ext4_xattr_ibody_find(dir, &amp;i, &amp;is);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (!ext4_has_inline_data(dir)) {</div><div class='ctx'> 		*has_inline_data = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inline_start = (void *)ext4_raw_inode(&amp;iloc)-&gt;i_block +</div><div class='add'>+	inline_start = (void *)ext4_raw_inode(&amp;is.iloc)-&gt;i_block +</div><div class='ctx'> 						EXT4_INLINE_DOTDOT_SIZE;</div><div class='ctx'> 	inline_size = EXT4_MIN_INLINE_DATA_SIZE - EXT4_INLINE_DOTDOT_SIZE;</div><div class='del'>-	ret = ext4_search_dir(iloc.bh, inline_start, inline_size,</div><div class='add'>+	ret = ext4_search_dir(is.iloc.bh, inline_start, inline_size,</div><div class='ctx'> 			      dir, fname, 0, res_dir);</div><div class='ctx'> 	if (ret == 1)</div><div class='ctx'> 		goto out_find;</div><div class='hunk'>@@ -1687,20 +1625,23 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,</div><div class='ctx'> 	if (ext4_get_inline_size(dir) == EXT4_MIN_INLINE_DATA_SIZE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inline_start = ext4_get_inline_xattr_pos(dir, &amp;iloc);</div><div class='add'>+	inline_start = ext4_get_inline_xattr_pos(dir, &amp;is.iloc);</div><div class='ctx'> 	inline_size = ext4_get_inline_size(dir) - EXT4_MIN_INLINE_DATA_SIZE;</div><div class='ctx'> </div><div class='del'>-	ret = ext4_search_dir(iloc.bh, inline_start, inline_size,</div><div class='add'>+	ret = ext4_search_dir(is.iloc.bh, inline_start, inline_size,</div><div class='ctx'> 			      dir, fname, 0, res_dir);</div><div class='ctx'> 	if (ret == 1)</div><div class='ctx'> 		goto out_find;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	brelse(iloc.bh);</div><div class='del'>-	iloc.bh = NULL;</div><div class='add'>+	brelse(is.iloc.bh);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		is.iloc.bh = ERR_PTR(ret);</div><div class='add'>+	else</div><div class='add'>+		is.iloc.bh = NULL;</div><div class='ctx'> out_find:</div><div class='ctx'> 	up_read(&amp;EXT4_I(dir)-&gt;xattr_sem);</div><div class='del'>-	return iloc.bh;</div><div class='add'>+	return is.iloc.bh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext4_delete_inline_entry(handle_t *handle,</div><div class='hunk'>@@ -1907,7 +1848,7 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	needed_blocks = ext4_writepage_trans_blocks(inode);</div><div class='add'>+	needed_blocks = ext4_chunk_trans_extent(inode, 1);</div><div class='ctx'> 	handle = ext4_journal_start(inode, EXT4_HT_INODE, needed_blocks);</div><div class='ctx'> 	if (IS_ERR(handle))</div><div class='ctx'> 		return PTR_ERR(handle);</div><div class='hunk'>@@ -1946,7 +1887,12 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline)</div><div class='ctx'> 			if ((err = ext4_xattr_ibody_find(inode, &amp;i, &amp;is)) != 0)</div><div class='ctx'> 				goto out_error;</div><div class='ctx'> </div><div class='del'>-			BUG_ON(is.s.not_found);</div><div class='add'>+			if (is.s.not_found) {</div><div class='add'>+				EXT4_ERROR_INODE(inode,</div><div class='add'>+						 "missing inline data xattr");</div><div class='add'>+				err = -EFSCORRUPTED;</div><div class='add'>+				goto out_error;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			value_len = le32_to_cpu(is.s.here-&gt;e_value_size);</div><div class='ctx'> 			value = kmalloc(value_len, GFP_NOFS);</div><div class='hunk'>@@ -2022,7 +1968,7 @@ int ext4_convert_inline_data(struct inode *inode)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	needed_blocks = ext4_writepage_trans_blocks(inode);</div><div class='add'>+	needed_blocks = ext4_chunk_trans_extent(inode, 1);</div><div class='ctx'> </div><div class='ctx'> 	iloc.bh = NULL;</div><div class='ctx'> 	error = ext4_get_inode_loc(inode, &amp;iloc);</div><div class='head'>diff --git a/fs/ext4/inode-test.c b/fs/ext4/inode-test.c<br/>index f0c0fd507fbc..749af7ad4e09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/inode-test.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/inode-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/inode-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/inode-test.c</a></div><div class='hunk'>@@ -279,4 +279,5 @@ static struct kunit_suite ext4_inode_test_suite = {</div><div class='ctx'> </div><div class='ctx'> kunit_test_suites(&amp;ext4_inode_test_suite);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("KUnit test of ext4 inode timestamp decoding");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c<br/>index 5af1b0b8680e..0c466ccbed69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/inode.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/pagevec.h&gt;</div><div class='ctx'> #include &lt;linux/mpage.h&gt;</div><div class='add'>+#include &lt;linux/rmap.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='hunk'>@@ -49,32 +50,35 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;trace/events/ext4.h&gt;</div><div class='ctx'> </div><div class='add'>+static void ext4_journalled_zero_new_buffers(handle_t *handle,</div><div class='add'>+					    struct inode *inode,</div><div class='add'>+					    struct folio *folio,</div><div class='add'>+					    unsigned from, unsigned to);</div><div class='add'>+</div><div class='ctx'> static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw,</div><div class='ctx'> 			      struct ext4_inode_info *ei)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> 	__u16 dummy_csum = 0;</div><div class='ctx'> 	int offset = offsetof(struct ext4_inode, i_checksum_lo);</div><div class='ctx'> 	unsigned int csum_size = sizeof(dummy_csum);</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, ei-&gt;i_csum_seed, (__u8 *)raw, offset);</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)&amp;dummy_csum, csum_size);</div><div class='add'>+	csum = ext4_chksum(ei-&gt;i_csum_seed, (__u8 *)raw, offset);</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)&amp;dummy_csum, csum_size);</div><div class='ctx'> 	offset += csum_size;</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)raw + offset,</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)raw + offset,</div><div class='ctx'> 			   EXT4_GOOD_OLD_INODE_SIZE - offset);</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_INODE_SIZE(inode-&gt;i_sb) &gt; EXT4_GOOD_OLD_INODE_SIZE) {</div><div class='ctx'> 		offset = offsetof(struct ext4_inode, i_checksum_hi);</div><div class='del'>-		csum = ext4_chksum(sbi, csum, (__u8 *)raw +</div><div class='del'>-				   EXT4_GOOD_OLD_INODE_SIZE,</div><div class='add'>+		csum = ext4_chksum(csum, (__u8 *)raw + EXT4_GOOD_OLD_INODE_SIZE,</div><div class='ctx'> 				   offset - EXT4_GOOD_OLD_INODE_SIZE);</div><div class='ctx'> 		if (EXT4_FITS_IN_INODE(raw, ei, i_checksum_hi)) {</div><div class='del'>-			csum = ext4_chksum(sbi, csum, (__u8 *)&amp;dummy_csum,</div><div class='add'>+			csum = ext4_chksum(csum, (__u8 *)&amp;dummy_csum,</div><div class='ctx'> 					   csum_size);</div><div class='ctx'> 			offset += csum_size;</div><div class='ctx'> 		}</div><div class='del'>-		csum = ext4_chksum(sbi, csum, (__u8 *)raw + offset,</div><div class='add'>+		csum = ext4_chksum(csum, (__u8 *)raw + offset,</div><div class='ctx'> 				   EXT4_INODE_SIZE(inode-&gt;i_sb) - offset);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +92,7 @@ static int ext4_inode_csum_verify(struct inode *inode, struct ext4_inode *raw,</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_es-&gt;s_creator_os !=</div><div class='ctx'> 	    cpu_to_le32(EXT4_OS_LINUX) ||</div><div class='del'>-	    !ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	    !ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	provided = le16_to_cpu(raw-&gt;i_checksum_lo);</div><div class='hunk'>@@ -109,7 +113,7 @@ void ext4_inode_csum_set(struct inode *inode, struct ext4_inode *raw,</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_es-&gt;s_creator_os !=</div><div class='ctx'> 	    cpu_to_le32(EXT4_OS_LINUX) ||</div><div class='del'>-	    !ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	    !ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	csum = ext4_inode_csum(inode, raw, ei);</div><div class='hunk'>@@ -136,16 +140,13 @@ static inline int ext4_begin_ordered_truncate(struct inode *inode,</div><div class='ctx'> 						   new_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,</div><div class='del'>-				  int pextents);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Test whether an inode is a fast symlink.</div><div class='ctx'>  * A fast symlink has its symlink data stored in ext4_inode_info-&gt;i_data.</div><div class='ctx'>  */</div><div class='ctx'> int ext4_inode_is_fast_symlink(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (!(EXT4_I(inode)-&gt;i_flags &amp; EXT4_EA_INODE_FL)) {</div><div class='add'>+	if (!ext4_has_feature_ea_inode(inode-&gt;i_sb)) {</div><div class='ctx'> 		int ea_blocks = EXT4_I(inode)-&gt;i_file_acl ?</div><div class='ctx'> 				EXT4_CLUSTER_SIZE(inode-&gt;i_sb) &gt;&gt; 9 : 0;</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +177,8 @@ void ext4_evict_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_evict_inode(inode);</div><div class='ctx'> </div><div class='add'>+	dax_break_layout_final(inode);</div><div class='add'>+</div><div class='ctx'> 	if (EXT4_I(inode)-&gt;i_flags &amp; EXT4_EA_INODE_FL)</div><div class='ctx'> 		ext4_evict_ea_inode(inode);</div><div class='ctx'> 	if (inode-&gt;i_nlink) {</div><div class='hunk'>@@ -199,8 +202,7 @@ void ext4_evict_inode(struct inode *inode)</div><div class='ctx'> 	 * the inode. Flush worker is ignoring it because of I_FREEING flag but</div><div class='ctx'> 	 * we still need to remove the inode from the writeback lists.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!list_empty_careful(&amp;inode-&gt;i_io_list))</div><div class='del'>-		inode_io_list_del(inode);</div><div class='add'>+	inode_io_list_del(inode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Protect us against freezing - iput() caller didn't have to have any</div><div class='hunk'>@@ -371,17 +373,18 @@ void ext4_da_update_reserve_space(struct inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ei-&gt;i_reserved_data_blocks == 0) &amp;&amp;</div><div class='ctx'> 	    !inode_is_open_for_write(inode))</div><div class='del'>-		ext4_discard_preallocations(inode, 0);</div><div class='add'>+		ext4_discard_preallocations(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __check_block_validity(struct inode *inode, const char *func,</div><div class='ctx'> 				unsigned int line,</div><div class='ctx'> 				struct ext4_map_blocks *map)</div><div class='ctx'> {</div><div class='del'>-	if (ext4_has_feature_journal(inode-&gt;i_sb) &amp;&amp;</div><div class='del'>-	    (inode-&gt;i_ino ==</div><div class='del'>-	     le32_to_cpu(EXT4_SB(inode-&gt;i_sb)-&gt;s_es-&gt;s_journal_inum)))</div><div class='add'>+	journal_t *journal = EXT4_SB(inode-&gt;i_sb)-&gt;s_journal;</div><div class='add'>+</div><div class='add'>+	if (journal &amp;&amp; inode == journal-&gt;j_inode)</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (!ext4_inode_block_valid(inode, map-&gt;m_pblk, map-&gt;m_len)) {</div><div class='ctx'> 		ext4_error_inode(inode, func, line, map-&gt;m_pblk,</div><div class='ctx'> 				 "lblock %lu mapped to illegal pblock %llu "</div><div class='hunk'>@@ -407,6 +410,32 @@ int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For generic regular files, when updating the extent tree, Ext4 should</div><div class='add'>+ * hold the i_rwsem and invalidate_lock exclusively. This ensures</div><div class='add'>+ * exclusion against concurrent page faults, as well as reads and writes.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_EXT4_DEBUG</div><div class='add'>+void ext4_check_map_extents_env(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode) ||</div><div class='add'>+	    IS_NOQUOTA(inode) || IS_VERITY(inode) ||</div><div class='add'>+	    is_special_ino(inode-&gt;i_sb, inode-&gt;i_ino) ||</div><div class='add'>+	    (inode_state_read_once(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) ||</div><div class='add'>+	    ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE) ||</div><div class='add'>+	    ext4_verity_in_progress(inode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode) &amp;&amp;</div><div class='add'>+		     !rwsem_is_locked(&amp;inode-&gt;i_mapping-&gt;invalidate_lock));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void ext4_check_map_extents_env(struct inode *inode) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define check_block_validity(inode, map)	\</div><div class='ctx'> 	__check_block_validity((inode), __func__, __LINE__, (map))</div><div class='ctx'> </div><div class='hunk'>@@ -453,6 +482,191 @@ static void ext4_map_blocks_es_recheck(handle_t *handle,</div><div class='ctx'> }</div><div class='ctx'> #endif /* ES_AGGRESSIVE_TEST */</div><div class='ctx'> </div><div class='add'>+static int ext4_map_query_blocks_next_in_leaf(handle_t *handle,</div><div class='add'>+			struct inode *inode, struct ext4_map_blocks *map,</div><div class='add'>+			unsigned int orig_mlen)</div><div class='add'>+{</div><div class='add'>+	struct ext4_map_blocks map2;</div><div class='add'>+	unsigned int status, status2;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	status = map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='add'>+		EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!(map-&gt;m_flags &amp; EXT4_MAP_QUERY_LAST_IN_LEAF));</div><div class='add'>+	WARN_ON_ONCE(orig_mlen &lt;= map-&gt;m_len);</div><div class='add'>+</div><div class='add'>+	/* Prepare map2 for lookup in next leaf block */</div><div class='add'>+	map2.m_lblk = map-&gt;m_lblk + map-&gt;m_len;</div><div class='add'>+	map2.m_len = orig_mlen - map-&gt;m_len;</div><div class='add'>+	map2.m_flags = 0;</div><div class='add'>+	retval = ext4_ext_map_blocks(handle, inode, &amp;map2, 0);</div><div class='add'>+</div><div class='add'>+	if (retval &lt;= 0) {</div><div class='add'>+		ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len,</div><div class='add'>+				      map-&gt;m_pblk, status, false);</div><div class='add'>+		return map-&gt;m_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(retval != map2.m_len)) {</div><div class='add'>+		ext4_warning(inode-&gt;i_sb,</div><div class='add'>+			     "ES len assertion failed for inode "</div><div class='add'>+			     "%lu: retval %d != map-&gt;m_len %d",</div><div class='add'>+			     inode-&gt;i_ino, retval, map2.m_len);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status2 = map2.m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='add'>+		EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If map2 is contiguous with map, then let's insert it as a single</div><div class='add'>+	 * extent in es cache and return the combined length of both the maps.</div><div class='add'>+	 */</div><div class='add'>+	if (map-&gt;m_pblk + map-&gt;m_len == map2.m_pblk &amp;&amp;</div><div class='add'>+			status == status2) {</div><div class='add'>+		ext4_es_insert_extent(inode, map-&gt;m_lblk,</div><div class='add'>+				      map-&gt;m_len + map2.m_len, map-&gt;m_pblk,</div><div class='add'>+				      status, false);</div><div class='add'>+		map-&gt;m_len += map2.m_len;</div><div class='add'>+	} else {</div><div class='add'>+		ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len,</div><div class='add'>+				      map-&gt;m_pblk, status, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return map-&gt;m_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext4_map_query_blocks(handle_t *handle, struct inode *inode,</div><div class='add'>+				 struct ext4_map_blocks *map, int flags)</div><div class='add'>+{</div><div class='add'>+	unsigned int status;</div><div class='add'>+	int retval;</div><div class='add'>+	unsigned int orig_mlen = map-&gt;m_len;</div><div class='add'>+</div><div class='add'>+	flags &amp;= EXT4_EX_QUERY_FILTER;</div><div class='add'>+	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='add'>+		retval = ext4_ext_map_blocks(handle, inode, map, flags);</div><div class='add'>+	else</div><div class='add'>+		retval = ext4_ind_map_blocks(handle, inode, map, flags);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	/* A hole? */</div><div class='add'>+	if (retval == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (unlikely(retval != map-&gt;m_len)) {</div><div class='add'>+		ext4_warning(inode-&gt;i_sb,</div><div class='add'>+			     "ES len assertion failed for inode "</div><div class='add'>+			     "%lu: retval %d != map-&gt;m_len %d",</div><div class='add'>+			     inode-&gt;i_ino, retval, map-&gt;m_len);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No need to query next in leaf:</div><div class='add'>+	 * - if returned extent is not last in leaf or</div><div class='add'>+	 * - if the last in leaf is the full requested range</div><div class='add'>+	 */</div><div class='add'>+	if (!(map-&gt;m_flags &amp; EXT4_MAP_QUERY_LAST_IN_LEAF) ||</div><div class='add'>+			map-&gt;m_len == orig_mlen) {</div><div class='add'>+		status = map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='add'>+				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='add'>+		ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len,</div><div class='add'>+				      map-&gt;m_pblk, status, false);</div><div class='add'>+	} else {</div><div class='add'>+		retval = ext4_map_query_blocks_next_in_leaf(handle, inode, map,</div><div class='add'>+							    orig_mlen);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	map-&gt;m_seq = READ_ONCE(EXT4_I(inode)-&gt;i_es_seq);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext4_map_create_blocks(handle_t *handle, struct inode *inode,</div><div class='add'>+				  struct ext4_map_blocks *map, int flags)</div><div class='add'>+{</div><div class='add'>+	struct extent_status es;</div><div class='add'>+	unsigned int status;</div><div class='add'>+	int err, retval = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We pass in the magic EXT4_GET_BLOCKS_DELALLOC_RESERVE</div><div class='add'>+	 * indicates that the blocks and quotas has already been</div><div class='add'>+	 * checked when the data was copied into the page cache.</div><div class='add'>+	 */</div><div class='add'>+	if (map-&gt;m_flags &amp; EXT4_MAP_DELAYED)</div><div class='add'>+		flags |= EXT4_GET_BLOCKS_DELALLOC_RESERVE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Here we clear m_flags because after allocating an new extent,</div><div class='add'>+	 * it will be set again.</div><div class='add'>+	 */</div><div class='add'>+	map-&gt;m_flags &amp;= ~EXT4_MAP_FLAGS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to check for EXT4 here because migrate could have</div><div class='add'>+	 * changed the inode type in between.</div><div class='add'>+	 */</div><div class='add'>+	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {</div><div class='add'>+		retval = ext4_ext_map_blocks(handle, inode, map, flags);</div><div class='add'>+	} else {</div><div class='add'>+		retval = ext4_ind_map_blocks(handle, inode, map, flags);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We allocated new blocks which will result in i_data's</div><div class='add'>+		 * format changing. Force the migrate to fail by clearing</div><div class='add'>+		 * migrate flags.</div><div class='add'>+		 */</div><div class='add'>+		if (retval &gt; 0 &amp;&amp; map-&gt;m_flags &amp; EXT4_MAP_NEW)</div><div class='add'>+			ext4_clear_inode_state(inode, EXT4_STATE_EXT_MIGRATE);</div><div class='add'>+	}</div><div class='add'>+	if (retval &lt;= 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	if (unlikely(retval != map-&gt;m_len)) {</div><div class='add'>+		ext4_warning(inode-&gt;i_sb,</div><div class='add'>+			     "ES len assertion failed for inode %lu: "</div><div class='add'>+			     "retval %d != map-&gt;m_len %d",</div><div class='add'>+			     inode-&gt;i_ino, retval, map-&gt;m_len);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have to zeroout blocks before inserting them into extent</div><div class='add'>+	 * status tree. Otherwise someone could look them up there and</div><div class='add'>+	 * use them before they are really zeroed. We also have to</div><div class='add'>+	 * unmap metadata before zeroing as otherwise writeback can</div><div class='add'>+	 * overwrite zeros with stale data from block device.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; EXT4_GET_BLOCKS_ZERO &amp;&amp;</div><div class='add'>+	    map-&gt;m_flags &amp; EXT4_MAP_MAPPED &amp;&amp; map-&gt;m_flags &amp; EXT4_MAP_NEW) {</div><div class='add'>+		err = ext4_issue_zeroout(inode, map-&gt;m_lblk, map-&gt;m_pblk,</div><div class='add'>+					 map-&gt;m_len);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the extent has been zeroed out, we don't need to update</div><div class='add'>+	 * extent status tree.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; EXT4_GET_BLOCKS_SPLIT_NOMERGE &amp;&amp;</div><div class='add'>+	    ext4_es_lookup_extent(inode, map-&gt;m_lblk, NULL, &amp;es, &amp;map-&gt;m_seq)) {</div><div class='add'>+		if (ext4_es_is_written(&amp;es))</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='add'>+			EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='add'>+	ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len, map-&gt;m_pblk,</div><div class='add'>+			      status, flags &amp; EXT4_GET_BLOCKS_DELALLOC_RESERVE);</div><div class='add'>+	map-&gt;m_seq = READ_ONCE(EXT4_I(inode)-&gt;i_es_seq);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The ext4_map_blocks() function tries to look up the requested blocks,</div><div class='ctx'>  * and returns if the blocks are already mapped.</div><div class='hunk'>@@ -465,9 +679,10 @@ static void ext4_map_blocks_es_recheck(handle_t *handle,</div><div class='ctx'>  * Otherwise, call with ext4_ind_map_blocks() to handle indirect mapping</div><div class='ctx'>  * based files</div><div class='ctx'>  *</div><div class='del'>- * On success, it returns the number of blocks being mapped or allocated.  if</div><div class='del'>- * create==0 and the blocks are pre-allocated and unwritten, the resulting @map</div><div class='del'>- * is marked as unwritten. If the create == 1, it will mark @map as mapped.</div><div class='add'>+ * On success, it returns the number of blocks being mapped or allocated.</div><div class='add'>+ * If flags doesn't contain EXT4_GET_BLOCKS_CREATE the blocks are</div><div class='add'>+ * pre-allocated and unwritten, the resulting @map is marked as unwritten.</div><div class='add'>+ * If the flags contain EXT4_GET_BLOCKS_CREATE, it will mark @map as mapped.</div><div class='ctx'>  *</div><div class='ctx'>  * It returns 0 if plain look up failed (blocks have not been allocated), in</div><div class='ctx'>  * that case, @map is returned as unmapped but we still do fill map-&gt;m_len to</div><div class='hunk'>@@ -481,6 +696,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	struct extent_status es;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	unsigned int orig_mlen = map-&gt;m_len;</div><div class='ctx'> #ifdef ES_AGGRESSIVE_TEST</div><div class='ctx'> 	struct ext4_map_blocks orig_map;</div><div class='ctx'> </div><div class='hunk'>@@ -501,9 +717,18 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	if (unlikely(map-&gt;m_lblk &gt;= EXT_MAX_BLOCKS))</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Callers from the context of data submission are the only exceptions</div><div class='add'>+	 * for regular files that do not hold the i_rwsem or invalidate_lock.</div><div class='add'>+	 * However, caching unrelated ranges is not permitted.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; EXT4_GET_BLOCKS_IO_SUBMIT)</div><div class='add'>+		WARN_ON_ONCE(!(flags &amp; EXT4_EX_NOCACHE));</div><div class='add'>+	else</div><div class='add'>+		ext4_check_map_extents_env(inode);</div><div class='add'>+</div><div class='ctx'> 	/* Lookup extent status tree firstly */</div><div class='del'>-	if (!(EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY) &amp;&amp;</div><div class='del'>-	    ext4_es_lookup_extent(inode, map-&gt;m_lblk, NULL, &amp;es)) {</div><div class='add'>+	if (ext4_es_lookup_extent(inode, map-&gt;m_lblk, NULL, &amp;es, &amp;map-&gt;m_seq)) {</div><div class='ctx'> 		if (ext4_es_is_written(&amp;es) || ext4_es_is_unwritten(&amp;es)) {</div><div class='ctx'> 			map-&gt;m_pblk = ext4_es_pblock(&amp;es) +</div><div class='ctx'> 					map-&gt;m_lblk - es.es_lblk;</div><div class='hunk'>@@ -515,6 +740,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			map-&gt;m_len = retval;</div><div class='ctx'> 		} else if (ext4_es_is_delayed(&amp;es) || ext4_es_is_hole(&amp;es)) {</div><div class='ctx'> 			map-&gt;m_pblk = 0;</div><div class='add'>+			map-&gt;m_flags |= ext4_es_is_delayed(&amp;es) ?</div><div class='add'>+					EXT4_MAP_DELAYED : 0;</div><div class='ctx'> 			retval = es.es_len - (map-&gt;m_lblk - es.es_lblk);</div><div class='ctx'> 			if (retval &gt; map-&gt;m_len)</div><div class='ctx'> 				retval = map-&gt;m_len;</div><div class='hunk'>@@ -530,7 +757,11 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		ext4_map_blocks_es_recheck(handle, inode, map,</div><div class='ctx'> 					   &amp;orig_map, flags);</div><div class='ctx'> #endif</div><div class='del'>-		goto found;</div><div class='add'>+		if (!(flags &amp; EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF) ||</div><div class='add'>+				orig_mlen == map-&gt;m_len)</div><div class='add'>+			goto found;</div><div class='add'>+</div><div class='add'>+		map-&gt;m_len = orig_mlen;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In the query cache no-wait mode, nothing we can do more if we</div><div class='hunk'>@@ -544,32 +775,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	 * file system block.</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_read(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {</div><div class='del'>-		retval = ext4_ext_map_blocks(handle, inode, map, 0);</div><div class='del'>-	} else {</div><div class='del'>-		retval = ext4_ind_map_blocks(handle, inode, map, 0);</div><div class='del'>-	}</div><div class='del'>-	if (retval &gt; 0) {</div><div class='del'>-		unsigned int status;</div><div class='del'>-</div><div class='del'>-		if (unlikely(retval != map-&gt;m_len)) {</div><div class='del'>-			ext4_warning(inode-&gt;i_sb,</div><div class='del'>-				     "ES len assertion failed for inode "</div><div class='del'>-				     "%lu: retval %d != map-&gt;m_len %d",</div><div class='del'>-				     inode-&gt;i_ino, retval, map-&gt;m_len);</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='del'>-				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='del'>-		if (!(flags &amp; EXT4_GET_BLOCKS_DELALLOC_RESERVE) &amp;&amp;</div><div class='del'>-		    !(status &amp; EXTENT_STATUS_WRITTEN) &amp;&amp;</div><div class='del'>-		    ext4_es_scan_range(inode, &amp;ext4_es_is_delayed, map-&gt;m_lblk,</div><div class='del'>-				       map-&gt;m_lblk + map-&gt;m_len - 1))</div><div class='del'>-			status |= EXTENT_STATUS_DELAYED;</div><div class='del'>-		ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len,</div><div class='del'>-				      map-&gt;m_pblk, status);</div><div class='del'>-	}</div><div class='add'>+	retval = ext4_map_query_blocks(handle, inode, map, flags);</div><div class='ctx'> 	up_read((&amp;EXT4_I(inode)-&gt;i_data_sem));</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='hunk'>@@ -587,8 +793,7 @@ found:</div><div class='ctx'> 	 * Returns if the blocks have already allocated</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Note that if blocks have been preallocated</div><div class='del'>-	 * ext4_ext_get_block() returns the create = 0</div><div class='del'>-	 * with buffer head unmapped.</div><div class='add'>+	 * ext4_ext_map_blocks() returns with buffer head unmapped</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (retval &gt; 0 &amp;&amp; map-&gt;m_flags &amp; EXT4_MAP_MAPPED)</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -599,12 +804,8 @@ found:</div><div class='ctx'> 		if (!(flags &amp; EXT4_GET_BLOCKS_CONVERT_UNWRITTEN))</div><div class='ctx'> 			return retval;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Here we clear m_flags because after allocating an new extent,</div><div class='del'>-	 * it will be set again.</div><div class='del'>-	 */</div><div class='del'>-	map-&gt;m_flags &amp;= ~EXT4_MAP_FLAGS;</div><div class='ctx'> </div><div class='add'>+	ext4_fc_track_inode(handle, inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * New blocks allocate and/or writing to unwritten extent</div><div class='ctx'> 	 * will possibly result in updating i_data, so we take</div><div class='hunk'>@@ -612,78 +813,15 @@ found:</div><div class='ctx'> 	 * with create == 1 flag.</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	retval = ext4_map_create_blocks(handle, inode, map, flags);</div><div class='add'>+	up_write((&amp;EXT4_I(inode)-&gt;i_data_sem));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We need to check for EXT4 here because migrate</div><div class='del'>-	 * could have changed the inode type in between</div><div class='del'>-	 */</div><div class='del'>-	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {</div><div class='del'>-		retval = ext4_ext_map_blocks(handle, inode, map, flags);</div><div class='del'>-	} else {</div><div class='del'>-		retval = ext4_ind_map_blocks(handle, inode, map, flags);</div><div class='del'>-</div><div class='del'>-		if (retval &gt; 0 &amp;&amp; map-&gt;m_flags &amp; EXT4_MAP_NEW) {</div><div class='del'>-			/*</div><div class='del'>-			 * We allocated new blocks which will result in</div><div class='del'>-			 * i_data's format changing.  Force the migrate</div><div class='del'>-			 * to fail by clearing migrate flags</div><div class='del'>-			 */</div><div class='del'>-			ext4_clear_inode_state(inode, EXT4_STATE_EXT_MIGRATE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (retval &gt; 0) {</div><div class='del'>-		unsigned int status;</div><div class='del'>-</div><div class='del'>-		if (unlikely(retval != map-&gt;m_len)) {</div><div class='del'>-			ext4_warning(inode-&gt;i_sb,</div><div class='del'>-				     "ES len assertion failed for inode "</div><div class='del'>-				     "%lu: retval %d != map-&gt;m_len %d",</div><div class='del'>-				     inode-&gt;i_ino, retval, map-&gt;m_len);</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We have to zeroout blocks before inserting them into extent</div><div class='del'>-		 * status tree. Otherwise someone could look them up there and</div><div class='del'>-		 * use them before they are really zeroed. We also have to</div><div class='del'>-		 * unmap metadata before zeroing as otherwise writeback can</div><div class='del'>-		 * overwrite zeros with stale data from block device.</div><div class='del'>-		 */</div><div class='del'>-		if (flags &amp; EXT4_GET_BLOCKS_ZERO &amp;&amp;</div><div class='del'>-		    map-&gt;m_flags &amp; EXT4_MAP_MAPPED &amp;&amp;</div><div class='del'>-		    map-&gt;m_flags &amp; EXT4_MAP_NEW) {</div><div class='del'>-			ret = ext4_issue_zeroout(inode, map-&gt;m_lblk,</div><div class='del'>-						 map-&gt;m_pblk, map-&gt;m_len);</div><div class='del'>-			if (ret) {</div><div class='del'>-				retval = ret;</div><div class='del'>-				goto out_sem;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the extent has been zeroed out, we don't need to update</div><div class='del'>-		 * extent status tree.</div><div class='del'>-		 */</div><div class='del'>-		if ((flags &amp; EXT4_GET_BLOCKS_PRE_IO) &amp;&amp;</div><div class='del'>-		    ext4_es_lookup_extent(inode, map-&gt;m_lblk, NULL, &amp;es)) {</div><div class='del'>-			if (ext4_es_is_written(&amp;es))</div><div class='del'>-				goto out_sem;</div><div class='del'>-		}</div><div class='del'>-		status = map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='del'>-				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='del'>-		if (!(flags &amp; EXT4_GET_BLOCKS_DELALLOC_RESERVE) &amp;&amp;</div><div class='del'>-		    !(status &amp; EXTENT_STATUS_WRITTEN) &amp;&amp;</div><div class='del'>-		    ext4_es_scan_range(inode, &amp;ext4_es_is_delayed, map-&gt;m_lblk,</div><div class='del'>-				       map-&gt;m_lblk + map-&gt;m_len - 1))</div><div class='del'>-			status |= EXTENT_STATUS_DELAYED;</div><div class='del'>-		ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len,</div><div class='del'>-				      map-&gt;m_pblk, status);</div><div class='del'>-	}</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		ext_debug(inode, "failed with err %d\n", retval);</div><div class='add'>+	if (retval &lt;= 0)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='del'>-out_sem:</div><div class='del'>-	up_write((&amp;EXT4_I(inode)-&gt;i_data_sem));</div><div class='del'>-	if (retval &gt; 0 &amp;&amp; map-&gt;m_flags &amp; EXT4_MAP_MAPPED) {</div><div class='add'>+	if (map-&gt;m_flags &amp; EXT4_MAP_MAPPED) {</div><div class='ctx'> 		ret = check_block_validity(inode, map);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -698,9 +836,8 @@ out_sem:</div><div class='ctx'> 		    !(flags &amp; EXT4_GET_BLOCKS_ZERO) &amp;&amp;</div><div class='ctx'> 		    !ext4_is_quota_file(inode) &amp;&amp;</div><div class='ctx'> 		    ext4_should_order_data(inode)) {</div><div class='del'>-			loff_t start_byte =</div><div class='del'>-				(loff_t)map-&gt;m_lblk &lt;&lt; inode-&gt;i_blkbits;</div><div class='del'>-			loff_t length = (loff_t)map-&gt;m_len &lt;&lt; inode-&gt;i_blkbits;</div><div class='add'>+			loff_t start_byte = EXT4_LBLK_TO_B(inode, map-&gt;m_lblk);</div><div class='add'>+			loff_t length = EXT4_LBLK_TO_B(inode, map-&gt;m_len);</div><div class='ctx'> </div><div class='ctx'> 			if (flags &amp; EXT4_GET_BLOCKS_IO_SUBMIT)</div><div class='ctx'> 				ret = ext4_jbd2_inode_add_wait(handle, inode,</div><div class='hunk'>@@ -712,12 +849,8 @@ out_sem:</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (retval &gt; 0 &amp;&amp; (map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ||</div><div class='del'>-				map-&gt;m_flags &amp; EXT4_MAP_MAPPED))</div><div class='del'>-		ext4_fc_track_range(handle, inode, map-&gt;m_lblk,</div><div class='del'>-					map-&gt;m_lblk + map-&gt;m_len - 1);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		ext_debug(inode, "failed with err %d\n", retval);</div><div class='add'>+	ext4_fc_track_range(handle, inode, map-&gt;m_lblk, map-&gt;m_lblk +</div><div class='add'>+			    map-&gt;m_len - 1);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -733,7 +866,7 @@ static void ext4_update_bh_state(struct buffer_head *bh, unsigned long flags)</div><div class='ctx'> 	flags &amp;= EXT4_MAP_FLAGS;</div><div class='ctx'> </div><div class='ctx'> 	/* Dummy buffer_head? Set non-atomically. */</div><div class='del'>-	if (!bh-&gt;b_page) {</div><div class='add'>+	if (!bh-&gt;b_folio) {</div><div class='ctx'> 		bh-&gt;b_state = (bh-&gt;b_state &amp; ~EXT4_MAP_FLAGS) | flags;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -748,6 +881,26 @@ static void ext4_update_bh_state(struct buffer_head *bh, unsigned long flags)</div><div class='ctx'> 	} while (unlikely(!try_cmpxchg(&amp;bh-&gt;b_state, &amp;old_state, new_state)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Make sure that the current journal transaction has enough credits to map</div><div class='add'>+ * one extent. Return -EAGAIN if it cannot extend the current running</div><div class='add'>+ * transaction.</div><div class='add'>+ */</div><div class='add'>+static inline int ext4_journal_ensure_extent_credits(handle_t *handle,</div><div class='add'>+						     struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	int credits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Called from ext4_da_write_begin() which has no handle started? */</div><div class='add'>+	if (!handle)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	credits = ext4_chunk_trans_blocks(inode, 1);</div><div class='add'>+	ret = __ext4_journal_ensure_credits(handle, credits, credits, 0);</div><div class='add'>+	return ret &lt;= 0 ? ret : -EAGAIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int _ext4_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 			   struct buffer_head *bh, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -838,7 +991,14 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	if (nowait)</div><div class='ctx'> 		return sb_find_get_block(inode-&gt;i_sb, map.m_pblk);</div><div class='ctx'> </div><div class='del'>-	bh = sb_getblk(inode-&gt;i_sb, map.m_pblk);</div><div class='add'>+	/*</div><div class='add'>+	 * Since bh could introduce extra ref count such as referred by</div><div class='add'>+	 * journal_head etc. Try to avoid using __GFP_MOVABLE here</div><div class='add'>+	 * as it may fail the migration when journal_head remains.</div><div class='add'>+	 */</div><div class='add'>+	bh = getblk_unmovable(inode-&gt;i_sb-&gt;s_bdev, map.m_pblk,</div><div class='add'>+				inode-&gt;i_sb-&gt;s_blocksize);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!bh))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	if (map.m_flags &amp; EXT4_MAP_NEW) {</div><div class='hunk'>@@ -980,62 +1140,50 @@ int ext4_walk_page_buffers(handle_t *handle, struct inode *inode,</div><div class='ctx'>  */</div><div class='ctx'> static int ext4_dirty_journalled_data(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	folio_mark_dirty(bh-&gt;b_folio);</div><div class='add'>+	struct folio *folio = bh-&gt;b_folio;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+</div><div class='add'>+	/* only regular files have a_ops */</div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='ctx'> 	return ext4_handle_dirty_metadata(handle, NULL, bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int do_journal_get_write_access(handle_t *handle, struct inode *inode,</div><div class='ctx'> 				struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	int dirty = buffer_dirty(bh);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (!buffer_mapped(bh) || buffer_freed(bh))</div><div class='ctx'> 		return 0;</div><div class='del'>-	/*</div><div class='del'>-	 * __block_write_begin() could have dirtied some buffers. Clean</div><div class='del'>-	 * the dirty bit as jbd2_journal_get_write_access() could complain</div><div class='del'>-	 * otherwise about fs integrity issues. Setting of the dirty bit</div><div class='del'>-	 * by __block_write_begin() isn't a real problem here as we clear</div><div class='del'>-	 * the bit before releasing a page lock and thus writeback cannot</div><div class='del'>-	 * ever write the buffer.</div><div class='del'>-	 */</div><div class='del'>-	if (dirty)</div><div class='del'>-		clear_buffer_dirty(bh);</div><div class='ctx'> 	BUFFER_TRACE(bh, "get write access");</div><div class='del'>-	ret = ext4_journal_get_write_access(handle, inode-&gt;i_sb, bh,</div><div class='add'>+	return ext4_journal_get_write_access(handle, inode-&gt;i_sb, bh,</div><div class='ctx'> 					    EXT4_JTR_NONE);</div><div class='del'>-	if (!ret &amp;&amp; dirty)</div><div class='del'>-		ret = ext4_dirty_journalled_data(handle, bh);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='del'>-				  get_block_t *get_block)</div><div class='add'>+int ext4_block_write_begin(handle_t *handle, struct folio *folio,</div><div class='add'>+			   loff_t pos, unsigned len,</div><div class='add'>+			   get_block_t *get_block)</div><div class='ctx'> {</div><div class='del'>-	unsigned from = pos &amp; (PAGE_SIZE - 1);</div><div class='add'>+	unsigned int from = offset_in_folio(folio, pos);</div><div class='ctx'> 	unsigned to = from + len;</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	unsigned block_start, block_end;</div><div class='ctx'> 	sector_t block;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	unsigned blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	unsigned bbits;</div><div class='add'>+	unsigned int blocksize = i_blocksize(inode);</div><div class='ctx'> 	struct buffer_head *bh, *head, *wait[2];</div><div class='ctx'> 	int nr_wait = 0;</div><div class='ctx'> 	int i;</div><div class='add'>+	bool should_journal_data = ext4_should_journal_data(inode);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!folio_test_locked(folio));</div><div class='del'>-	BUG_ON(from &gt; PAGE_SIZE);</div><div class='del'>-	BUG_ON(to &gt; PAGE_SIZE);</div><div class='add'>+	BUG_ON(to &gt; folio_size(folio));</div><div class='ctx'> 	BUG_ON(from &gt; to);</div><div class='add'>+	WARN_ON_ONCE(blocksize &gt; folio_size(folio));</div><div class='ctx'> </div><div class='ctx'> 	head = folio_buffers(folio);</div><div class='ctx'> 	if (!head)</div><div class='ctx'> 		head = create_empty_buffers(folio, blocksize, 0);</div><div class='del'>-	bbits = ilog2(blocksize);</div><div class='del'>-	block = (sector_t)folio-&gt;index &lt;&lt; (PAGE_SHIFT - bbits);</div><div class='add'>+	block = EXT4_PG_TO_LBLK(inode, folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	for (bh = head, block_start = 0; bh != head || !block_start;</div><div class='ctx'> 	    block++, block_start = block_end, bh = bh-&gt;b_this_page) {</div><div class='hunk'>@@ -1046,18 +1194,32 @@ static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (buffer_new(bh))</div><div class='add'>+		if (WARN_ON_ONCE(buffer_new(bh)))</div><div class='ctx'> 			clear_buffer_new(bh);</div><div class='ctx'> 		if (!buffer_mapped(bh)) {</div><div class='ctx'> 			WARN_ON(bh-&gt;b_size != blocksize);</div><div class='del'>-			err = get_block(inode, block, bh, 1);</div><div class='add'>+			err = ext4_journal_ensure_extent_credits(handle, inode);</div><div class='add'>+			if (!err)</div><div class='add'>+				err = get_block(inode, block, bh, 1);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (buffer_new(bh)) {</div><div class='add'>+				/*</div><div class='add'>+				 * We may be zeroing partial buffers or all new</div><div class='add'>+				 * buffers in case of failure. Prepare JBD2 for</div><div class='add'>+				 * that.</div><div class='add'>+				 */</div><div class='add'>+				if (should_journal_data)</div><div class='add'>+					do_journal_get_write_access(handle,</div><div class='add'>+								    inode, bh);</div><div class='ctx'> 				if (folio_test_uptodate(folio)) {</div><div class='del'>-					clear_buffer_new(bh);</div><div class='add'>+					/*</div><div class='add'>+					 * Unlike __block_write_begin() we leave</div><div class='add'>+					 * dirtying of new uptodate buffers to</div><div class='add'>+					 * -&gt;write_end() time or</div><div class='add'>+					 * folio_zero_new_buffers().</div><div class='add'>+					 */</div><div class='ctx'> 					set_buffer_uptodate(bh);</div><div class='del'>-					mark_buffer_dirty(bh);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (block_end &gt; to || block_start &lt; from)</div><div class='hunk'>@@ -1087,7 +1249,11 @@ static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		folio_zero_new_buffers(folio, from, to);</div><div class='add'>+		if (should_journal_data)</div><div class='add'>+			ext4_journalled_zero_new_buffers(handle, inode, folio,</div><div class='add'>+							 from, to);</div><div class='add'>+		else</div><div class='add'>+			folio_zero_new_buffers(folio, from, to);</div><div class='ctx'> 	} else if (fscrypt_inode_uses_fs_layer_crypto(inode)) {</div><div class='ctx'> 		for (i = 0; i &lt; nr_wait; i++) {</div><div class='ctx'> 			int err2;</div><div class='hunk'>@@ -1103,7 +1269,6 @@ static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * To preserve ordering, it is essential that the hole instantiation and</div><div class='hunk'>@@ -1112,9 +1277,10 @@ static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'>  * and the ext4_write_end().  So doing the jbd2_journal_start at the start of</div><div class='ctx'>  * ext4_write_begin() is the right place.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+static int ext4_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='ctx'> 			    loff_t pos, unsigned len,</div><div class='del'>-			    struct page **pagep, void **fsdata)</div><div class='add'>+			    struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int ret, needed_blocks;</div><div class='hunk'>@@ -1124,22 +1290,22 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	pgoff_t index;</div><div class='ctx'> 	unsigned from, to;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_write_begin(inode, pos, len);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reserve one block more for addition to orphan list in case</div><div class='ctx'> 	 * we allocate blocks but write fails for some reason</div><div class='ctx'> 	 */</div><div class='del'>-	needed_blocks = ext4_writepage_trans_blocks(inode) + 1;</div><div class='add'>+	needed_blocks = ext4_chunk_trans_extent(inode,</div><div class='add'>+			ext4_journal_blocks_per_folio(inode)) + 1;</div><div class='ctx'> 	index = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	from = pos &amp; (PAGE_SIZE - 1);</div><div class='del'>-	to = from + len;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {</div><div class='ctx'> 		ret = ext4_try_to_write_inline_data(mapping, inode, pos, len,</div><div class='del'>-						    pagep);</div><div class='add'>+						    foliop);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		if (ret == 1)</div><div class='hunk'>@@ -1147,17 +1313,23 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * __filemap_get_folio() can take a long time if the</div><div class='add'>+	 * write_begin_get_folio() can take a long time if the</div><div class='ctx'> 	 * system is thrashing due to memory pressure, or if the folio</div><div class='ctx'> 	 * is being written back.  So grab it first before we start</div><div class='ctx'> 	 * the transaction handle.  This also allows us to allocate</div><div class='ctx'> 	 * the folio (if needed) without using GFP_NOFS.</div><div class='ctx'> 	 */</div><div class='ctx'> retry_grab:</div><div class='del'>-	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='del'>-					mapping_gfp_mask(mapping));</div><div class='add'>+	folio = write_begin_get_folio(iocb, mapping, index, len);</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		return PTR_ERR(folio);</div><div class='add'>+</div><div class='add'>+	if (len &gt; folio_next_pos(folio) - pos)</div><div class='add'>+		len = folio_next_pos(folio) - pos;</div><div class='add'>+</div><div class='add'>+	from = offset_in_folio(folio, pos);</div><div class='add'>+	to = from + len;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The same as page allocation, we prealloc buffer heads before</div><div class='ctx'> 	 * starting the handle.</div><div class='hunk'>@@ -1185,19 +1357,12 @@ retry_journal:</div><div class='ctx'> 	/* In case writeback began while the folio was unlocked */</div><div class='ctx'> 	folio_wait_stable(folio);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FS_ENCRYPTION</div><div class='ctx'> 	if (ext4_should_dioread_nolock(inode))</div><div class='del'>-		ret = ext4_block_write_begin(folio, pos, len,</div><div class='add'>+		ret = ext4_block_write_begin(handle, folio, pos, len,</div><div class='ctx'> 					     ext4_get_block_unwritten);</div><div class='ctx'> 	else</div><div class='del'>-		ret = ext4_block_write_begin(folio, pos, len, ext4_get_block);</div><div class='del'>-#else</div><div class='del'>-	if (ext4_should_dioread_nolock(inode))</div><div class='del'>-		ret = __block_write_begin(&amp;folio-&gt;page, pos, len,</div><div class='del'>-					  ext4_get_block_unwritten);</div><div class='del'>-	else</div><div class='del'>-		ret = __block_write_begin(&amp;folio-&gt;page, pos, len, ext4_get_block);</div><div class='del'>-#endif</div><div class='add'>+		ret = ext4_block_write_begin(handle, folio, pos, len,</div><div class='add'>+					     ext4_get_block);</div><div class='ctx'> 	if (!ret &amp;&amp; ext4_should_journal_data(inode)) {</div><div class='ctx'> 		ret = ext4_walk_page_buffers(handle, inode,</div><div class='ctx'> 					     folio_buffers(folio), from, to,</div><div class='hunk'>@@ -1210,7 +1375,7 @@ retry_journal:</div><div class='ctx'> </div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		/*</div><div class='del'>-		 * __block_write_begin may have instantiated a few blocks</div><div class='add'>+		 * ext4_block_write_begin may have instantiated a few blocks</div><div class='ctx'> 		 * outside i_size.  Trim these off again. Don't need</div><div class='ctx'> 		 * i_size_read because we hold i_rwsem.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -1233,13 +1398,14 @@ retry_journal:</div><div class='ctx'> 				ext4_orphan_del(NULL, inode);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (ret == -ENOSPC &amp;&amp;</div><div class='del'>-		    ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries))</div><div class='add'>+		if (ret == -EAGAIN ||</div><div class='add'>+		    (ret == -ENOSPC &amp;&amp;</div><div class='add'>+		     ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries)))</div><div class='ctx'> 			goto retry_journal;</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1254,22 +1420,22 @@ static int write_end_fn(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	ret = ext4_dirty_journalled_data(handle, bh);</div><div class='ctx'> 	clear_buffer_meta(bh);</div><div class='ctx'> 	clear_buffer_prio(bh);</div><div class='add'>+	clear_buffer_new(bh);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We need to pick up the new inode size which generic_commit_write gave us</div><div class='del'>- * `file' can be NULL - eg, when called from page_symlink().</div><div class='add'>+ * `iocb` can be NULL - eg, when called from page_symlink().</div><div class='ctx'>  *</div><div class='ctx'>  * ext4 never places buffers on inode-&gt;i_mapping-&gt;i_private_list.  metadata</div><div class='ctx'>  * buffers are managed internally.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_write_end(struct file *file,</div><div class='add'>+static int ext4_write_end(const struct kiocb *iocb,</div><div class='ctx'> 			  struct address_space *mapping,</div><div class='ctx'> 			  loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			  struct page *page, void *fsdata)</div><div class='add'>+			  struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	handle_t *handle = ext4_journal_current_handle();</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	loff_t old_size = inode-&gt;i_size;</div><div class='hunk'>@@ -1284,7 +1450,7 @@ static int ext4_write_end(struct file *file,</div><div class='ctx'> 		return ext4_write_inline_data_end(inode, pos, len, copied,</div><div class='ctx'> 						  folio);</div><div class='ctx'> </div><div class='del'>-	copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);</div><div class='add'>+	copied = block_write_end(pos, len, copied, folio);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * it's important to update i_size while still holding folio lock:</div><div class='ctx'> 	 * page writeout could otherwise come in and zero beyond i_size.</div><div class='hunk'>@@ -1297,8 +1463,10 @@ static int ext4_write_end(struct file *file,</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	if (old_size &lt; pos &amp;&amp; !verity)</div><div class='add'>+	if (old_size &lt; pos &amp;&amp; !verity) {</div><div class='ctx'> 		pagecache_isize_extended(inode, old_size, pos);</div><div class='add'>+		ext4_zero_partial_blocks(handle, inode, old_size, pos - old_size);</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't mark the inode dirty under folio lock. First, it unnecessarily</div><div class='ctx'> 	 * makes the holding time of folio lock longer. Second, it forces lock</div><div class='hunk'>@@ -1358,9 +1526,9 @@ static void ext4_journalled_zero_new_buffers(handle_t *handle,</div><div class='ctx'> 					size = min(to, block_end) - start;</div><div class='ctx'> </div><div class='ctx'> 					folio_zero_range(folio, start, size);</div><div class='del'>-					write_end_fn(handle, inode, bh);</div><div class='ctx'> 				}</div><div class='ctx'> 				clear_buffer_new(bh);</div><div class='add'>+				write_end_fn(handle, inode, bh);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		block_start = block_end;</div><div class='hunk'>@@ -1368,12 +1536,11 @@ static void ext4_journalled_zero_new_buffers(handle_t *handle,</div><div class='ctx'> 	} while (bh != head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_journalled_write_end(struct file *file,</div><div class='add'>+static int ext4_journalled_write_end(const struct kiocb *iocb,</div><div class='ctx'> 				     struct address_space *mapping,</div><div class='ctx'> 				     loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-				     struct page *page, void *fsdata)</div><div class='add'>+				     struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	handle_t *handle = ext4_journal_current_handle();</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	loff_t old_size = inode-&gt;i_size;</div><div class='hunk'>@@ -1414,8 +1581,10 @@ static int ext4_journalled_write_end(struct file *file,</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	if (old_size &lt; pos &amp;&amp; !verity)</div><div class='add'>+	if (old_size &lt; pos &amp;&amp; !verity) {</div><div class='ctx'> 		pagecache_isize_extended(inode, old_size, pos);</div><div class='add'>+		ext4_zero_partial_blocks(handle, inode, old_size, pos - old_size);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (size_changed) {</div><div class='ctx'> 		ret2 = ext4_mark_inode_dirty(handle, inode);</div><div class='hunk'>@@ -1448,9 +1617,9 @@ static int ext4_journalled_write_end(struct file *file,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Reserve space for a single cluster</div><div class='add'>+ * Reserve space for 'nr_resv' clusters</div><div class='ctx'>  */</div><div class='del'>-static int ext4_da_reserve_space(struct inode *inode)</div><div class='add'>+static int ext4_da_reserve_space(struct inode *inode, int nr_resv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='hunk'>@@ -1461,18 +1630,18 @@ static int ext4_da_reserve_space(struct inode *inode)</div><div class='ctx'> 	 * us from metadata over-estimation, though we may go over by</div><div class='ctx'> 	 * a small amount in the end.  Here we just reserve for data.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = dquot_reserve_block(inode, EXT4_C2B(sbi, 1));</div><div class='add'>+	ret = dquot_reserve_block(inode, EXT4_C2B(sbi, nr_resv));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ei-&gt;i_block_reservation_lock);</div><div class='del'>-	if (ext4_claim_free_clusters(sbi, 1, 0)) {</div><div class='add'>+	if (ext4_claim_free_clusters(sbi, nr_resv, 0)) {</div><div class='ctx'> 		spin_unlock(&amp;ei-&gt;i_block_reservation_lock);</div><div class='del'>-		dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1));</div><div class='add'>+		dquot_release_reservation_block(inode, EXT4_C2B(sbi, nr_resv));</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='del'>-	ei-&gt;i_reserved_data_blocks++;</div><div class='del'>-	trace_ext4_da_reserve_space(inode);</div><div class='add'>+	ei-&gt;i_reserved_data_blocks += nr_resv;</div><div class='add'>+	trace_ext4_da_reserve_space(inode, nr_resv);</div><div class='ctx'> 	spin_unlock(&amp;ei-&gt;i_block_reservation_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;       /* success */</div><div class='hunk'>@@ -1524,11 +1693,12 @@ struct mpage_da_data {</div><div class='ctx'> 	unsigned int can_map:1;	/* Can writepages call map blocks? */</div><div class='ctx'> </div><div class='ctx'> 	/* These are internal state of ext4_do_writepages() */</div><div class='del'>-	pgoff_t first_page;	/* The first page to write */</div><div class='del'>-	pgoff_t next_page;	/* Current page to examine */</div><div class='del'>-	pgoff_t last_page;	/* Last page to examine */</div><div class='add'>+	loff_t start_pos;	/* The start pos to write */</div><div class='add'>+	loff_t next_pos;	/* Current pos to examine */</div><div class='add'>+	loff_t end_pos;		/* Last pos to examine */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Extent to map - this can be after first_page because that can be</div><div class='add'>+	 * Extent to map - this can be after start_pos because that can be</div><div class='ctx'> 	 * fully mapped. We somewhat abuse m_flags to store whether the extent</div><div class='ctx'> 	 * is delalloc or unwritten.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1548,38 +1718,38 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,</div><div class='ctx'> 	struct inode *inode = mpd-&gt;inode;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> </div><div class='del'>-	/* This is necessary when next_page == 0. */</div><div class='del'>-	if (mpd-&gt;first_page &gt;= mpd-&gt;next_page)</div><div class='add'>+	/* This is necessary when next_pos == 0. */</div><div class='add'>+	if (mpd-&gt;start_pos &gt;= mpd-&gt;next_pos)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mpd-&gt;scanned_until_end = 0;</div><div class='del'>-	index = mpd-&gt;first_page;</div><div class='del'>-	end   = mpd-&gt;next_page - 1;</div><div class='ctx'> 	if (invalidate) {</div><div class='ctx'> 		ext4_lblk_t start, last;</div><div class='del'>-		start = index &lt;&lt; (PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='del'>-		last = end &lt;&lt; (PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='add'>+		start = EXT4_B_TO_LBLK(inode, mpd-&gt;start_pos);</div><div class='add'>+		last = mpd-&gt;next_pos &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * avoid racing with extent status tree scans made by</div><div class='ctx'> 		 * ext4_insert_delayed_block()</div><div class='ctx'> 		 */</div><div class='ctx'> 		down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		ext4_es_remove_extent(inode, start, last - start + 1);</div><div class='add'>+		ext4_es_remove_extent(inode, start, last - start);</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='del'>-	while (index &lt;= end) {</div><div class='del'>-		nr = filemap_get_folios(mapping, &amp;index, end, &amp;fbatch);</div><div class='add'>+	index = mpd-&gt;start_pos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	end = mpd-&gt;next_pos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	while (index &lt; end) {</div><div class='add'>+		nr = filemap_get_folios(mapping, &amp;index, end - 1, &amp;fbatch);</div><div class='ctx'> 		if (nr == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		for (i = 0; i &lt; nr; i++) {</div><div class='ctx'> 			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> </div><div class='del'>-			if (folio-&gt;index &lt; mpd-&gt;first_page)</div><div class='add'>+			if (folio_pos(folio) &lt; mpd-&gt;start_pos)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (folio_next_index(folio) - 1 &gt; end)</div><div class='add'>+			if (folio_next_index(folio) &gt; end)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> 			BUG_ON(folio_test_writeback(folio));</div><div class='hunk'>@@ -1619,24 +1789,58 @@ static void ext4_print_free_blocks(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ext4_insert_delayed_block - adds a delayed block to the extents status</div><div class='del'>- *                             tree, incrementing the reserved cluster/block</div><div class='del'>- *                             count or making a pending reservation</div><div class='del'>- *                             where needed</div><div class='add'>+ * Check whether the cluster containing lblk has been allocated or has</div><div class='add'>+ * delalloc reservation.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if the cluster doesn't have either, 1 if it has delalloc</div><div class='add'>+ * reservation, 2 if it's already been allocated, negative error code on</div><div class='add'>+ * failure.</div><div class='add'>+ */</div><div class='add'>+static int ext4_clu_alloc_state(struct inode *inode, ext4_lblk_t lblk)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Has delalloc reservation? */</div><div class='add'>+	if (ext4_es_scan_clu(inode, &amp;ext4_es_is_delayed, lblk))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Already been allocated? */</div><div class='add'>+	if (ext4_es_scan_clu(inode, &amp;ext4_es_is_mapped, lblk))</div><div class='add'>+		return 2;</div><div class='add'>+	ret = ext4_clu_mapped(inode, EXT4_B2C(sbi, lblk));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ext4_insert_delayed_blocks - adds a multiple delayed blocks to the extents</div><div class='add'>+ *                              status tree, incrementing the reserved</div><div class='add'>+ *                              cluster/block count or making pending</div><div class='add'>+ *                              reservations where needed</div><div class='ctx'>  *</div><div class='ctx'>  * @inode - file containing the newly added block</div><div class='del'>- * @lblk - logical block to be added</div><div class='add'>+ * @lblk - start logical block to be added</div><div class='add'>+ * @len - length of blocks to be added</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk)</div><div class='add'>+static int ext4_insert_delayed_blocks(struct inode *inode, ext4_lblk_t lblk,</div><div class='add'>+				      ext4_lblk_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool allocated = false;</div><div class='add'>+	bool lclu_allocated = false;</div><div class='add'>+	bool end_allocated = false;</div><div class='add'>+	ext4_lblk_t resv_clu;</div><div class='add'>+	ext4_lblk_t end = lblk + len - 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If the cluster containing lblk is shared with a delayed,</div><div class='add'>+	 * If the cluster containing lblk or end is shared with a delayed,</div><div class='ctx'> 	 * written, or unwritten extent in a bigalloc file system, it's</div><div class='ctx'> 	 * already been accounted for and does not need to be reserved.</div><div class='ctx'> 	 * A pending reservation must be made for the cluster if it's</div><div class='hunk'>@@ -1647,84 +1851,86 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk)</div><div class='ctx'> 	 * extents status tree doesn't get a match.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sbi-&gt;s_cluster_ratio == 1) {</div><div class='del'>-		ret = ext4_da_reserve_space(inode);</div><div class='add'>+		ret = ext4_da_reserve_space(inode, len);</div><div class='ctx'> 		if (ret != 0)   /* ENOSPC */</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	} else {   /* bigalloc */</div><div class='del'>-		if (!ext4_es_scan_clu(inode, &amp;ext4_es_is_delonly, lblk)) {</div><div class='del'>-			if (!ext4_es_scan_clu(inode,</div><div class='del'>-					      &amp;ext4_es_is_mapped, lblk)) {</div><div class='del'>-				ret = ext4_clu_mapped(inode,</div><div class='del'>-						      EXT4_B2C(sbi, lblk));</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					return ret;</div><div class='del'>-				if (ret == 0) {</div><div class='del'>-					ret = ext4_da_reserve_space(inode);</div><div class='del'>-					if (ret != 0)   /* ENOSPC */</div><div class='del'>-						return ret;</div><div class='del'>-				} else {</div><div class='del'>-					allocated = true;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				allocated = true;</div><div class='add'>+		resv_clu = EXT4_B2C(sbi, end) - EXT4_B2C(sbi, lblk) + 1;</div><div class='add'>+</div><div class='add'>+		ret = ext4_clu_alloc_state(inode, lblk);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			resv_clu--;</div><div class='add'>+			lclu_allocated = (ret == 2);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (EXT4_B2C(sbi, lblk) != EXT4_B2C(sbi, end)) {</div><div class='add'>+			ret = ext4_clu_alloc_state(inode, end);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			if (ret &gt; 0) {</div><div class='add'>+				resv_clu--;</div><div class='add'>+				end_allocated = (ret == 2);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (resv_clu) {</div><div class='add'>+			ret = ext4_da_reserve_space(inode, resv_clu);</div><div class='add'>+			if (ret != 0)   /* ENOSPC */</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ext4_es_insert_delayed_block(inode, lblk, allocated);</div><div class='add'>+	ext4_es_insert_delayed_extent(inode, lblk, len, lclu_allocated,</div><div class='add'>+				      end_allocated);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function is grabs code from the very beginning of</div><div class='del'>- * ext4_map_blocks, but assumes that the caller is from delayed write</div><div class='del'>- * time. This function looks up the requested blocks and sets the</div><div class='del'>- * buffer delay bit under the protection of i_data_sem.</div><div class='add'>+ * Looks up the requested blocks and sets the delalloc extent map.</div><div class='add'>+ * First try to look up for the extent entry that contains the requested</div><div class='add'>+ * blocks in the extent status tree without i_data_sem, then try to look</div><div class='add'>+ * up for the ondisk extent mapping with i_data_sem in read mode,</div><div class='add'>+ * finally hold i_data_sem in write mode, looks up again and add a</div><div class='add'>+ * delalloc extent entry if it still couldn't find any extent. Pass out</div><div class='add'>+ * the mapped extent through @map and return 0 on success.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,</div><div class='del'>-			      struct ext4_map_blocks *map,</div><div class='del'>-			      struct buffer_head *bh)</div><div class='add'>+static int ext4_da_map_blocks(struct inode *inode, struct ext4_map_blocks *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct extent_status es;</div><div class='ctx'> 	int retval;</div><div class='del'>-	sector_t invalid_block = ~((sector_t) 0xffff);</div><div class='ctx'> #ifdef ES_AGGRESSIVE_TEST</div><div class='ctx'> 	struct ext4_map_blocks orig_map;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;orig_map, map, sizeof(*map));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (invalid_block &lt; ext4_blocks_count(EXT4_SB(inode-&gt;i_sb)-&gt;s_es))</div><div class='del'>-		invalid_block = ~0;</div><div class='del'>-</div><div class='ctx'> 	map-&gt;m_flags = 0;</div><div class='ctx'> 	ext_debug(inode, "max_blocks %u, logical block %lu\n", map-&gt;m_len,</div><div class='ctx'> 		  (unsigned long) map-&gt;m_lblk);</div><div class='ctx'> </div><div class='add'>+	ext4_check_map_extents_env(inode);</div><div class='add'>+</div><div class='ctx'> 	/* Lookup extent status tree firstly */</div><div class='del'>-	if (ext4_es_lookup_extent(inode, iblock, NULL, &amp;es)) {</div><div class='del'>-		if (ext4_es_is_hole(&amp;es)) {</div><div class='del'>-			retval = 0;</div><div class='del'>-			down_read(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	if (ext4_es_lookup_extent(inode, map-&gt;m_lblk, NULL, &amp;es, NULL)) {</div><div class='add'>+		map-&gt;m_len = min_t(unsigned int, map-&gt;m_len,</div><div class='add'>+				   es.es_len - (map-&gt;m_lblk - es.es_lblk));</div><div class='add'>+</div><div class='add'>+		if (ext4_es_is_hole(&amp;es))</div><div class='ctx'> 			goto add_delayed;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='add'>+found:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Delayed extent could be allocated by fallocate.</div><div class='ctx'> 		 * So we need to check it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ext4_es_is_delayed(&amp;es) &amp;&amp; !ext4_es_is_unwritten(&amp;es)) {</div><div class='del'>-			map_bh(bh, inode-&gt;i_sb, invalid_block);</div><div class='del'>-			set_buffer_new(bh);</div><div class='del'>-			set_buffer_delay(bh);</div><div class='add'>+		if (ext4_es_is_delayed(&amp;es)) {</div><div class='add'>+			map-&gt;m_flags |= EXT4_MAP_DELAYED;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		map-&gt;m_pblk = ext4_es_pblock(&amp;es) + iblock - es.es_lblk;</div><div class='del'>-		retval = es.es_len - (iblock - es.es_lblk);</div><div class='del'>-		if (retval &gt; map-&gt;m_len)</div><div class='del'>-			retval = map-&gt;m_len;</div><div class='del'>-		map-&gt;m_len = retval;</div><div class='add'>+		map-&gt;m_pblk = ext4_es_pblock(&amp;es) + map-&gt;m_lblk - es.es_lblk;</div><div class='ctx'> 		if (ext4_es_is_written(&amp;es))</div><div class='ctx'> 			map-&gt;m_flags |= EXT4_MAP_MAPPED;</div><div class='ctx'> 		else if (ext4_es_is_unwritten(&amp;es))</div><div class='hunk'>@@ -1735,7 +1941,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,</div><div class='ctx'> #ifdef ES_AGGRESSIVE_TEST</div><div class='ctx'> 		ext4_map_blocks_es_recheck(NULL, inode, map, &amp;orig_map, 0);</div><div class='ctx'> #endif</div><div class='del'>-		return retval;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1745,48 +1951,42 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	down_read(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 	if (ext4_has_inline_data(inode))</div><div class='ctx'> 		retval = 0;</div><div class='del'>-	else if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='del'>-		retval = ext4_ext_map_blocks(NULL, inode, map, 0);</div><div class='ctx'> 	else</div><div class='del'>-		retval = ext4_ind_map_blocks(NULL, inode, map, 0);</div><div class='add'>+		retval = ext4_map_query_blocks(NULL, inode, map, 0);</div><div class='add'>+	up_read(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval &lt; 0 ? retval : 0;</div><div class='ctx'> </div><div class='ctx'> add_delayed:</div><div class='del'>-	if (retval == 0) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: __block_prepare_write() unmaps passed block,</div><div class='del'>-		 * is it OK?</div><div class='del'>-		 */</div><div class='add'>+	down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	/*</div><div class='add'>+	 * Page fault path (ext4_page_mkwrite does not take i_rwsem)</div><div class='add'>+	 * and fallocate path (no folio lock) can race. Make sure we</div><div class='add'>+	 * lookup the extent status tree here again while i_data_sem</div><div class='add'>+	 * is held in write mode, before inserting a new da entry in</div><div class='add'>+	 * the extent status tree.</div><div class='add'>+	 */</div><div class='add'>+	if (ext4_es_lookup_extent(inode, map-&gt;m_lblk, NULL, &amp;es, NULL)) {</div><div class='add'>+		map-&gt;m_len = min_t(unsigned int, map-&gt;m_len,</div><div class='add'>+				   es.es_len - (map-&gt;m_lblk - es.es_lblk));</div><div class='ctx'> </div><div class='del'>-		ret = ext4_insert_delayed_block(inode, map-&gt;m_lblk);</div><div class='del'>-		if (ret != 0) {</div><div class='del'>-			retval = ret;</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		if (!ext4_es_is_hole(&amp;es)) {</div><div class='add'>+			up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+			goto found;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		map_bh(bh, inode-&gt;i_sb, invalid_block);</div><div class='del'>-		set_buffer_new(bh);</div><div class='del'>-		set_buffer_delay(bh);</div><div class='del'>-	} else if (retval &gt; 0) {</div><div class='del'>-		unsigned int status;</div><div class='del'>-</div><div class='del'>-		if (unlikely(retval != map-&gt;m_len)) {</div><div class='del'>-			ext4_warning(inode-&gt;i_sb,</div><div class='del'>-				     "ES len assertion failed for inode "</div><div class='del'>-				     "%lu: retval %d != map-&gt;m_len %d",</div><div class='del'>-				     inode-&gt;i_ino, retval, map-&gt;m_len);</div><div class='del'>-			WARN_ON(1);</div><div class='add'>+	} else if (!ext4_has_inline_data(inode)) {</div><div class='add'>+		retval = ext4_map_query_blocks(NULL, inode, map, 0);</div><div class='add'>+		if (retval) {</div><div class='add'>+			up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+			return retval &lt; 0 ? retval : 0;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		status = map-&gt;m_flags &amp; EXT4_MAP_UNWRITTEN ?</div><div class='del'>-				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;</div><div class='del'>-		ext4_es_insert_extent(inode, map-&gt;m_lblk, map-&gt;m_len,</div><div class='del'>-				      map-&gt;m_pblk, status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	up_read((&amp;EXT4_I(inode)-&gt;i_data_sem));</div><div class='add'>+	map-&gt;m_flags |= EXT4_MAP_DELAYED;</div><div class='add'>+	retval = ext4_insert_delayed_blocks(inode, map-&gt;m_lblk, map-&gt;m_len);</div><div class='add'>+	if (!retval)</div><div class='add'>+		map-&gt;m_seq = READ_ONCE(EXT4_I(inode)-&gt;i_es_seq);</div><div class='add'>+	up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -1807,11 +2007,15 @@ int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,</div><div class='ctx'> 			   struct buffer_head *bh, int create)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_map_blocks map;</div><div class='add'>+	sector_t invalid_block = ~((sector_t) 0xffff);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(create == 0);</div><div class='ctx'> 	BUG_ON(bh-&gt;b_size != inode-&gt;i_sb-&gt;s_blocksize);</div><div class='ctx'> </div><div class='add'>+	if (invalid_block &lt; ext4_blocks_count(EXT4_SB(inode-&gt;i_sb)-&gt;s_es))</div><div class='add'>+		invalid_block = ~0;</div><div class='add'>+</div><div class='ctx'> 	map.m_lblk = iblock;</div><div class='ctx'> 	map.m_len = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1820,10 +2024,17 @@ int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	 * preallocated blocks are unmapped but should treated</div><div class='ctx'> 	 * the same as allocated blocks.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ext4_da_map_blocks(inode, iblock, &amp;map, bh);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='add'>+	ret = ext4_da_map_blocks(inode, &amp;map);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (map.m_flags &amp; EXT4_MAP_DELAYED) {</div><div class='add'>+		map_bh(bh, inode-&gt;i_sb, invalid_block);</div><div class='add'>+		set_buffer_new(bh);</div><div class='add'>+		set_buffer_delay(bh);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	map_bh(bh, inode-&gt;i_sb, map.m_pblk);</div><div class='ctx'> 	ext4_update_bh_state(bh, map.m_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1842,7 +2053,8 @@ int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,</div><div class='ctx'> </div><div class='ctx'> static void mpage_folio_done(struct mpage_da_data *mpd, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	mpd-&gt;first_page += folio_nr_pages(folio);</div><div class='add'>+	mpd-&gt;start_pos += folio_size(folio);</div><div class='add'>+	mpd-&gt;wbc-&gt;nr_to_write -= folio_nr_pages(folio);</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1852,7 +2064,7 @@ static int mpage_submit_folio(struct mpage_da_data *mpd, struct folio *folio)</div><div class='ctx'> 	loff_t size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(folio-&gt;index != mpd-&gt;first_page);</div><div class='add'>+	WARN_ON_ONCE(folio_pos(folio) != mpd-&gt;start_pos);</div><div class='ctx'> 	folio_clear_dirty_for_io(folio);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to be very careful here!  Nothing protects writeback path</div><div class='hunk'>@@ -1871,10 +2083,8 @@ static int mpage_submit_folio(struct mpage_da_data *mpd, struct folio *folio)</div><div class='ctx'> 	len = folio_size(folio);</div><div class='ctx'> 	if (folio_pos(folio) + len &gt; size &amp;&amp;</div><div class='ctx'> 	    !ext4_verity_in_progress(mpd-&gt;inode))</div><div class='del'>-		len = size &amp; ~PAGE_MASK;</div><div class='add'>+		len = size &amp; (len - 1);</div><div class='ctx'> 	err = ext4_bio_write_folio(&amp;mpd-&gt;io_submit, folio, len);</div><div class='del'>-	if (!err)</div><div class='del'>-		mpd-&gt;wbc-&gt;nr_to_write--;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2022,7 +2232,6 @@ static int mpage_process_folio(struct mpage_da_data *mpd, struct folio *folio,</div><div class='ctx'> 	ext4_lblk_t lblk = *m_lblk;</div><div class='ctx'> 	ext4_fsblk_t pblock = *m_pblk;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	int blkbits = mpd-&gt;inode-&gt;i_blkbits;</div><div class='ctx'> 	ssize_t io_end_size = 0;</div><div class='ctx'> 	struct ext4_io_end_vec *io_end_vec = ext4_last_io_end_vec(io_end);</div><div class='ctx'> </div><div class='hunk'>@@ -2048,7 +2257,8 @@ static int mpage_process_folio(struct mpage_da_data *mpd, struct folio *folio,</div><div class='ctx'> 					err = PTR_ERR(io_end_vec);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				io_end_vec-&gt;offset = (loff_t)mpd-&gt;map.m_lblk &lt;&lt; blkbits;</div><div class='add'>+				io_end_vec-&gt;offset = EXT4_LBLK_TO_B(mpd-&gt;inode,</div><div class='add'>+								mpd-&gt;map.m_lblk);</div><div class='ctx'> 			}</div><div class='ctx'> 			*map_bh = true;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2058,7 +2268,7 @@ static int mpage_process_folio(struct mpage_da_data *mpd, struct folio *folio,</div><div class='ctx'> 			bh-&gt;b_blocknr = pblock++;</div><div class='ctx'> 		}</div><div class='ctx'> 		clear_buffer_unwritten(bh);</div><div class='del'>-		io_end_size += (1 &lt;&lt; blkbits);</div><div class='add'>+		io_end_size += i_blocksize(mpd-&gt;inode);</div><div class='ctx'> 	} while (lblk++, (bh = bh-&gt;b_this_page) != head);</div><div class='ctx'> </div><div class='ctx'> 	io_end_vec-&gt;size += io_end_size;</div><div class='hunk'>@@ -2088,16 +2298,14 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> 	unsigned nr, i;</div><div class='ctx'> 	struct inode *inode = mpd-&gt;inode;</div><div class='del'>-	int bpp_bits = PAGE_SHIFT - inode-&gt;i_blkbits;</div><div class='ctx'> 	pgoff_t start, end;</div><div class='ctx'> 	ext4_lblk_t lblk;</div><div class='ctx'> 	ext4_fsblk_t pblock;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool map_bh = false;</div><div class='ctx'> </div><div class='del'>-	start = mpd-&gt;map.m_lblk &gt;&gt; bpp_bits;</div><div class='del'>-	end = (mpd-&gt;map.m_lblk + mpd-&gt;map.m_len - 1) &gt;&gt; bpp_bits;</div><div class='del'>-	lblk = start &lt;&lt; bpp_bits;</div><div class='add'>+	start = EXT4_LBLK_TO_PG(inode, mpd-&gt;map.m_lblk);</div><div class='add'>+	end = EXT4_LBLK_TO_PG(inode, mpd-&gt;map.m_lblk + mpd-&gt;map.m_len - 1);</div><div class='ctx'> 	pblock = mpd-&gt;map.m_pblk;</div><div class='ctx'> </div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='hunk'>@@ -2108,6 +2316,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)</div><div class='ctx'> 		for (i = 0; i &lt; nr; i++) {</div><div class='ctx'> 			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> </div><div class='add'>+			lblk = EXT4_PG_TO_LBLK(inode, folio-&gt;index);</div><div class='ctx'> 			err = mpage_process_folio(mpd, folio, &amp;lblk, &amp;pblock,</div><div class='ctx'> 						 &amp;map_bh);</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2141,6 +2350,11 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd)</div><div class='ctx'> 	int get_blocks_flags;</div><div class='ctx'> 	int err, dioread_nolock;</div><div class='ctx'> </div><div class='add'>+	/* Make sure transaction has enough credits for this extent */</div><div class='add'>+	err = ext4_journal_ensure_extent_credits(handle, inode);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	trace_ext4_da_write_pages_extent(inode, map);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Call ext4_map_blocks() to allocate any delayed allocation blocks, or</div><div class='hunk'>@@ -2150,21 +2364,18 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd)</div><div class='ctx'> 	 * previously reserved. However we must not fail because we're in</div><div class='ctx'> 	 * writeback and there is nothing we can do about it so it might result</div><div class='ctx'> 	 * in data loss.  So use reserved blocks to allocate metadata if</div><div class='del'>-	 * possible.</div><div class='del'>-	 *</div><div class='del'>-	 * We pass in the magic EXT4_GET_BLOCKS_DELALLOC_RESERVE if</div><div class='del'>-	 * the blocks in question are delalloc blocks.  This indicates</div><div class='del'>-	 * that the blocks and quotas has already been checked when</div><div class='del'>-	 * the data was copied into the page cache.</div><div class='add'>+	 * possible. In addition, do not cache any unrelated extents, as it</div><div class='add'>+	 * only holds the folio lock but does not hold the i_rwsem or</div><div class='add'>+	 * invalidate_lock, which could corrupt the extent status tree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	get_blocks_flags = EXT4_GET_BLOCKS_CREATE |</div><div class='ctx'> 			   EXT4_GET_BLOCKS_METADATA_NOFAIL |</div><div class='del'>-			   EXT4_GET_BLOCKS_IO_SUBMIT;</div><div class='add'>+			   EXT4_GET_BLOCKS_IO_SUBMIT |</div><div class='add'>+			   EXT4_EX_NOCACHE;</div><div class='add'>+</div><div class='ctx'> 	dioread_nolock = ext4_should_dioread_nolock(inode);</div><div class='ctx'> 	if (dioread_nolock)</div><div class='ctx'> 		get_blocks_flags |= EXT4_GET_BLOCKS_IO_CREATE_EXT;</div><div class='del'>-	if (map-&gt;m_flags &amp; BIT(BH_Delay))</div><div class='del'>-		get_blocks_flags |= EXT4_GET_BLOCKS_DELALLOC_RESERVE;</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_map_blocks(handle, inode, map, get_blocks_flags);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -2175,7 +2386,7 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd)</div><div class='ctx'> 			mpd-&gt;io_submit.io_end-&gt;handle = handle-&gt;h_rsv_handle;</div><div class='ctx'> 			handle-&gt;h_rsv_handle = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		ext4_set_io_unwritten_flag(inode, mpd-&gt;io_submit.io_end);</div><div class='add'>+		ext4_set_io_unwritten_flag(mpd-&gt;io_submit.io_end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(map-&gt;m_len == 0);</div><div class='hunk'>@@ -2183,6 +2394,47 @@ static int mpage_map_one_extent(handle_t *handle, struct mpage_da_data *mpd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This is used to submit mapped buffers in a single folio that is not fully</div><div class='add'>+ * mapped for various reasons, such as insufficient space or journal credits.</div><div class='add'>+ */</div><div class='add'>+static int mpage_submit_partial_folio(struct mpage_da_data *mpd)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = mpd-&gt;inode;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	loff_t pos;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	folio = filemap_get_folio(inode-&gt;i_mapping,</div><div class='add'>+				  mpd-&gt;start_pos &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	/*</div><div class='add'>+	 * The mapped position should be within the current processing folio</div><div class='add'>+	 * but must not be the folio start position.</div><div class='add'>+	 */</div><div class='add'>+	pos = ((loff_t)mpd-&gt;map.m_lblk) &lt;&lt; inode-&gt;i_blkbits;</div><div class='add'>+	if (WARN_ON_ONCE((folio_pos(folio) == pos) ||</div><div class='add'>+			 !folio_contains(folio, pos &gt;&gt; PAGE_SHIFT)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = mpage_submit_folio(mpd, folio);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * Update start_pos to prevent this folio from being released in</div><div class='add'>+	 * mpage_release_unused_pages(), it will be reset to the aligned folio</div><div class='add'>+	 * pos when this folio is written again in the next round. Additionally,</div><div class='add'>+	 * do not update wbc-&gt;nr_to_write here, as it will be updated once the</div><div class='add'>+	 * entire folio has finished processing.</div><div class='add'>+	 */</div><div class='add'>+	mpd-&gt;start_pos = pos;</div><div class='add'>+out:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * mpage_map_and_submit_extent - map extent starting at mpd-&gt;lblk of length</div><div class='ctx'>  *				 mpd-&gt;len and submit pages underlying it for IO</div><div class='ctx'>  *</div><div class='hunk'>@@ -2217,23 +2469,31 @@ static int mpage_map_and_submit_extent(handle_t *handle,</div><div class='ctx'> 	io_end_vec = ext4_alloc_io_end_vec(io_end);</div><div class='ctx'> 	if (IS_ERR(io_end_vec))</div><div class='ctx'> 		return PTR_ERR(io_end_vec);</div><div class='del'>-	io_end_vec-&gt;offset = ((loff_t)map-&gt;m_lblk) &lt;&lt; inode-&gt;i_blkbits;</div><div class='add'>+	io_end_vec-&gt;offset = EXT4_LBLK_TO_B(inode, map-&gt;m_lblk);</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = mpage_map_one_extent(handle, mpd);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> </div><div class='del'>-			if (ext4_forced_shutdown(sb))</div><div class='add'>+			if (ext4_emergency_state(sb))</div><div class='ctx'> 				goto invalidate_dirty_pages;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Let the uper layers retry transient errors.</div><div class='ctx'> 			 * In the case of ENOSPC, if ext4_count_free_blocks()</div><div class='ctx'> 			 * is non-zero, a commit should free up blocks.</div><div class='ctx'> 			 */</div><div class='del'>-			if ((err == -ENOMEM) ||</div><div class='add'>+			if ((err == -ENOMEM) || (err == -EAGAIN) ||</div><div class='ctx'> 			    (err == -ENOSPC &amp;&amp; ext4_count_free_clusters(sb))) {</div><div class='del'>-				if (progress)</div><div class='add'>+				/*</div><div class='add'>+				 * We may have already allocated extents for</div><div class='add'>+				 * some bhs inside the folio, issue the</div><div class='add'>+				 * corresponding data to prevent stale data.</div><div class='add'>+				 */</div><div class='add'>+				if (progress) {</div><div class='add'>+					if (mpage_submit_partial_folio(mpd))</div><div class='add'>+						goto invalidate_dirty_pages;</div><div class='ctx'> 					goto update_disksize;</div><div class='add'>+				}</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 			ext4_msg(sb, KERN_CRIT,</div><div class='hunk'>@@ -2267,7 +2527,7 @@ update_disksize:</div><div class='ctx'> 	 * Update on-disk size after IO is submitted.  Races with</div><div class='ctx'> 	 * truncate are avoided by checking i_size under i_data_sem.</div><div class='ctx'> 	 */</div><div class='del'>-	disksize = ((loff_t)mpd-&gt;first_page) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	disksize = mpd-&gt;start_pos;</div><div class='ctx'> 	if (disksize &gt; READ_ONCE(EXT4_I(inode)-&gt;i_disksize)) {</div><div class='ctx'> 		int err2;</div><div class='ctx'> 		loff_t i_size;</div><div class='hunk'>@@ -2291,21 +2551,6 @@ update_disksize:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Calculate the total number of credits to reserve for one writepages</div><div class='del'>- * iteration. This is called from ext4_writepages(). We map an extent of</div><div class='del'>- * up to MAX_WRITEPAGES_EXTENT_LEN blocks and then we go on and finish mapping</div><div class='del'>- * the last partial page. So in total we can map MAX_WRITEPAGES_EXTENT_LEN +</div><div class='del'>- * bpp - 1 blocks in bpp different extents.</div><div class='del'>- */</div><div class='del'>-static int ext4_da_writepages_trans_blocks(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	int bpp = ext4_journal_blocks_per_page(inode);</div><div class='del'>-</div><div class='del'>-	return ext4_meta_trans_blocks(inode,</div><div class='del'>-				MAX_WRITEPAGES_EXTENT_LEN + bpp - 1, bpp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ext4_journal_folio_buffers(handle_t *handle, struct folio *folio,</div><div class='ctx'> 				     size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -2336,11 +2581,11 @@ static int mpage_journal_page_buffers(handle_t *handle,</div><div class='ctx'> 	size_t len = folio_size(folio);</div><div class='ctx'> </div><div class='ctx'> 	folio_clear_checked(folio);</div><div class='del'>-	mpd-&gt;wbc-&gt;nr_to_write--;</div><div class='add'>+	mpd-&gt;wbc-&gt;nr_to_write -= folio_nr_pages(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (folio_pos(folio) + len &gt; size &amp;&amp;</div><div class='ctx'> 	    !ext4_verity_in_progress(inode))</div><div class='del'>-		len = size - folio_pos(folio);</div><div class='add'>+		len = size &amp; (len - 1);</div><div class='ctx'> </div><div class='ctx'> 	return ext4_journal_folio_buffers(handle, folio, len);</div><div class='ctx'> }</div><div class='hunk'>@@ -2370,23 +2615,19 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)</div><div class='ctx'> 	struct address_space *mapping = mpd-&gt;inode-&gt;i_mapping;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> 	unsigned int nr_folios;</div><div class='del'>-	pgoff_t index = mpd-&gt;first_page;</div><div class='del'>-	pgoff_t end = mpd-&gt;last_page;</div><div class='add'>+	pgoff_t index = mpd-&gt;start_pos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t end = mpd-&gt;end_pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	xa_mark_t tag;</div><div class='ctx'> 	int i, err = 0;</div><div class='del'>-	int blkbits = mpd-&gt;inode-&gt;i_blkbits;</div><div class='ctx'> 	ext4_lblk_t lblk;</div><div class='ctx'> 	struct buffer_head *head;</div><div class='ctx'> 	handle_t *handle = NULL;</div><div class='del'>-	int bpp = ext4_journal_blocks_per_page(mpd-&gt;inode);</div><div class='add'>+	int bpp = ext4_journal_blocks_per_folio(mpd-&gt;inode);</div><div class='ctx'> </div><div class='del'>-	if (mpd-&gt;wbc-&gt;sync_mode == WB_SYNC_ALL || mpd-&gt;wbc-&gt;tagged_writepages)</div><div class='del'>-		tag = PAGECACHE_TAG_TOWRITE;</div><div class='del'>-	else</div><div class='del'>-		tag = PAGECACHE_TAG_DIRTY;</div><div class='add'>+	tag = wbc_to_tag(mpd-&gt;wbc);</div><div class='ctx'> </div><div class='ctx'> 	mpd-&gt;map.m_len = 0;</div><div class='del'>-	mpd-&gt;next_page = index;</div><div class='add'>+	mpd-&gt;next_pos = mpd-&gt;start_pos;</div><div class='ctx'> 	if (ext4_should_journal_data(mpd-&gt;inode)) {</div><div class='ctx'> 		handle = ext4_journal_start(mpd-&gt;inode, EXT4_HT_WRITE_PAGE,</div><div class='ctx'> 					    bpp);</div><div class='hunk'>@@ -2413,11 +2654,12 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (mpd-&gt;wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='ctx'> 			    mpd-&gt;wbc-&gt;nr_to_write &lt;=</div><div class='del'>-			    mpd-&gt;map.m_len &gt;&gt; (PAGE_SHIFT - blkbits))</div><div class='add'>+			    EXT4_LBLK_TO_PG(mpd-&gt;inode, mpd-&gt;map.m_len))</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			/* If we can't merge this page, we are done. */</div><div class='del'>-			if (mpd-&gt;map.m_len &gt; 0 &amp;&amp; mpd-&gt;next_page != folio-&gt;index)</div><div class='add'>+			if (mpd-&gt;map.m_len &gt; 0 &amp;&amp;</div><div class='add'>+			    mpd-&gt;next_pos != folio_pos(folio))</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			if (handle) {</div><div class='hunk'>@@ -2463,8 +2705,8 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (mpd-&gt;map.m_len == 0)</div><div class='del'>-				mpd-&gt;first_page = folio-&gt;index;</div><div class='del'>-			mpd-&gt;next_page = folio_next_index(folio);</div><div class='add'>+				mpd-&gt;start_pos = folio_pos(folio);</div><div class='add'>+			mpd-&gt;next_pos = folio_next_pos(folio);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Writeout when we cannot modify metadata is simple.</div><div class='ctx'> 			 * Just submit the page. For data=journal mode we</div><div class='hunk'>@@ -2490,8 +2732,7 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)</div><div class='ctx'> 				mpage_folio_done(mpd, folio);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Add all dirty buffers to mpd */</div><div class='del'>-				lblk = ((ext4_lblk_t)folio-&gt;index) &lt;&lt;</div><div class='del'>-					(PAGE_SHIFT - blkbits);</div><div class='add'>+				lblk = EXT4_PG_TO_LBLK(mpd-&gt;inode, folio-&gt;index);</div><div class='ctx'> 				head = folio_buffers(folio);</div><div class='ctx'> 				err = mpage_process_page_bufs(mpd, head, head,</div><div class='ctx'> 						lblk);</div><div class='hunk'>@@ -2549,10 +2790,9 @@ static int ext4_do_writepages(struct mpage_da_data *mpd)</div><div class='ctx'> 	 * *never* be called, so if that ever happens, we would want</div><div class='ctx'> 	 * the stack trace.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(ext4_forced_shutdown(mapping-&gt;host-&gt;i_sb))) {</div><div class='del'>-		ret = -EROFS;</div><div class='add'>+	ret = ext4_emergency_state(mapping-&gt;host-&gt;i_sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='ctx'> 		goto out_writepages;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we have inline data and arrive here, it means that</div><div class='hunk'>@@ -2593,12 +2833,12 @@ static int ext4_do_writepages(struct mpage_da_data *mpd)</div><div class='ctx'> 	mpd-&gt;journalled_more_data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_should_dioread_nolock(inode)) {</div><div class='add'>+		int bpf = ext4_journal_blocks_per_folio(inode);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We may need to convert up to one extent per block in</div><div class='del'>-		 * the page and we may dirty the inode.</div><div class='add'>+		 * the folio and we may dirty the inode.</div><div class='ctx'> 		 */</div><div class='del'>-		rsv_blocks = 1 + ext4_chunk_trans_blocks(inode,</div><div class='del'>-						PAGE_SIZE &gt;&gt; inode-&gt;i_blkbits);</div><div class='add'>+		rsv_blocks = 1 + ext4_ext_index_trans_blocks(inode, bpf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wbc-&gt;range_start == 0 &amp;&amp; wbc-&gt;range_end == LLONG_MAX)</div><div class='hunk'>@@ -2608,18 +2848,18 @@ static int ext4_do_writepages(struct mpage_da_data *mpd)</div><div class='ctx'> 		writeback_index = mapping-&gt;writeback_index;</div><div class='ctx'> 		if (writeback_index)</div><div class='ctx'> 			cycled = 0;</div><div class='del'>-		mpd-&gt;first_page = writeback_index;</div><div class='del'>-		mpd-&gt;last_page = -1;</div><div class='add'>+		mpd-&gt;start_pos = writeback_index &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		mpd-&gt;end_pos = LLONG_MAX;</div><div class='ctx'> 	} else {</div><div class='del'>-		mpd-&gt;first_page = wbc-&gt;range_start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		mpd-&gt;last_page = wbc-&gt;range_end &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		mpd-&gt;start_pos = wbc-&gt;range_start;</div><div class='add'>+		mpd-&gt;end_pos = wbc-&gt;range_end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ext4_io_submit_init(&amp;mpd-&gt;io_submit, wbc);</div><div class='ctx'> retry:</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='del'>-		tag_pages_for_writeback(mapping, mpd-&gt;first_page,</div><div class='del'>-					mpd-&gt;last_page);</div><div class='add'>+		tag_pages_for_writeback(mapping, mpd-&gt;start_pos &gt;&gt; PAGE_SHIFT,</div><div class='add'>+					mpd-&gt;end_pos &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2662,8 +2902,14 @@ retry:</div><div class='ctx'> 		 * not supported by delalloc.</div><div class='ctx'> 		 */</div><div class='ctx'> 		BUG_ON(ext4_should_journal_data(inode));</div><div class='del'>-		needed_blocks = ext4_da_writepages_trans_blocks(inode);</div><div class='del'>-</div><div class='add'>+		/*</div><div class='add'>+		 * Calculate the number of credits needed to reserve for one</div><div class='add'>+		 * extent of up to MAX_WRITEPAGES_EXTENT_LEN blocks. It will</div><div class='add'>+		 * attempt to extend the transaction or start a new iteration</div><div class='add'>+		 * if the reserved credits are insufficient.</div><div class='add'>+		 */</div><div class='add'>+		needed_blocks = ext4_chunk_trans_blocks(inode,</div><div class='add'>+						MAX_WRITEPAGES_EXTENT_LEN);</div><div class='ctx'> 		/* start a new transaction */</div><div class='ctx'> 		handle = ext4_journal_start_with_reserve(inode,</div><div class='ctx'> 				EXT4_HT_WRITE_PAGE, needed_blocks, rsv_blocks);</div><div class='hunk'>@@ -2679,7 +2925,8 @@ retry:</div><div class='ctx'> 		}</div><div class='ctx'> 		mpd-&gt;do_map = 1;</div><div class='ctx'> </div><div class='del'>-		trace_ext4_da_write_pages(inode, mpd-&gt;first_page, wbc);</div><div class='add'>+		trace_ext4_da_write_folios_start(inode, mpd-&gt;start_pos,</div><div class='add'>+				mpd-&gt;next_pos, wbc);</div><div class='ctx'> 		ret = mpage_prepare_extent_to_map(mpd);</div><div class='ctx'> 		if (!ret &amp;&amp; mpd-&gt;map.m_len)</div><div class='ctx'> 			ret = mpage_map_and_submit_extent(handle, mpd,</div><div class='hunk'>@@ -2717,6 +2964,8 @@ retry:</div><div class='ctx'> 		} else</div><div class='ctx'> 			ext4_put_io_end(mpd-&gt;io_submit.io_end);</div><div class='ctx'> 		mpd-&gt;io_submit.io_end = NULL;</div><div class='add'>+		trace_ext4_da_write_folios_end(inode, mpd-&gt;start_pos,</div><div class='add'>+				mpd-&gt;next_pos, wbc, ret);</div><div class='ctx'> </div><div class='ctx'> 		if (ret == -ENOSPC &amp;&amp; sbi-&gt;s_journal) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2728,6 +2977,8 @@ retry:</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+		if (ret == -EAGAIN)</div><div class='add'>+			ret = 0;</div><div class='ctx'> 		/* Fatal error - ENOMEM, EIO... */</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2736,8 +2987,8 @@ unplug:</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> 	if (!ret &amp;&amp; !cycled &amp;&amp; wbc-&gt;nr_to_write &gt; 0) {</div><div class='ctx'> 		cycled = 1;</div><div class='del'>-		mpd-&gt;last_page = writeback_index - 1;</div><div class='del'>-		mpd-&gt;first_page = 0;</div><div class='add'>+		mpd-&gt;end_pos = (writeback_index &lt;&lt; PAGE_SHIFT) - 1;</div><div class='add'>+		mpd-&gt;start_pos = 0;</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2747,7 +2998,7 @@ unplug:</div><div class='ctx'> 		 * Set the writeback_index so that range_cyclic</div><div class='ctx'> 		 * mode will write it back later</div><div class='ctx'> 		 */</div><div class='del'>-		mapping-&gt;writeback_index = mpd-&gt;first_page;</div><div class='add'>+		mapping-&gt;writeback_index = mpd-&gt;start_pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> out_writepages:</div><div class='ctx'> 	trace_ext4_writepages_result(inode, wbc, ret,</div><div class='hunk'>@@ -2767,8 +3018,9 @@ static int ext4_writepages(struct address_space *mapping,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int alloc_ctx;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	alloc_ctx = ext4_writepages_down_read(sb);</div><div class='ctx'> 	ret = ext4_do_writepages(&amp;mpd);</div><div class='hunk'>@@ -2808,8 +3060,9 @@ static int ext4_dax_writepages(struct address_space *mapping,</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int alloc_ctx;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	alloc_ctx = ext4_writepages_down_read(inode-&gt;i_sb);</div><div class='ctx'> 	trace_ext4_writepages(inode, wbc);</div><div class='hunk'>@@ -2856,31 +3109,33 @@ static int ext4_nonda_switch(struct super_block *sb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_da_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+static int ext4_da_write_begin(const struct kiocb *iocb,</div><div class='add'>+			       struct address_space *mapping,</div><div class='ctx'> 			       loff_t pos, unsigned len,</div><div class='del'>-			       struct page **pagep, void **fsdata)</div><div class='add'>+			       struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, retries = 0;</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	pgoff_t index;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	index = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_nonda_switch(inode-&gt;i_sb) || ext4_verity_in_progress(inode)) {</div><div class='ctx'> 		*fsdata = (void *)FALL_BACK_TO_NONDELALLOC;</div><div class='del'>-		return ext4_write_begin(file, mapping, pos,</div><div class='del'>-					len, pagep, fsdata);</div><div class='add'>+		return ext4_write_begin(iocb, mapping, pos,</div><div class='add'>+					len, foliop, fsdata);</div><div class='ctx'> 	}</div><div class='ctx'> 	*fsdata = (void *)0;</div><div class='ctx'> 	trace_ext4_da_write_begin(inode, pos, len);</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {</div><div class='del'>-		ret = ext4_da_write_inline_data_begin(mapping, inode, pos, len,</div><div class='del'>-						      pagep, fsdata);</div><div class='add'>+		ret = ext4_generic_write_inline_data(mapping, inode, pos, len,</div><div class='add'>+						     foliop, fsdata, true);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		if (ret == 1)</div><div class='hunk'>@@ -2888,24 +3143,20 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='del'>-			mapping_gfp_mask(mapping));</div><div class='add'>+	folio = write_begin_get_folio(iocb, mapping, index, len);</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	/* In case writeback began while the folio was unlocked */</div><div class='del'>-	folio_wait_stable(folio);</div><div class='add'>+	if (len &gt; folio_next_pos(folio) - pos)</div><div class='add'>+		len = folio_next_pos(folio) - pos;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-	ret = ext4_block_write_begin(folio, pos, len, ext4_da_get_block_prep);</div><div class='del'>-#else</div><div class='del'>-	ret = __block_write_begin(&amp;folio-&gt;page, pos, len, ext4_da_get_block_prep);</div><div class='del'>-#endif</div><div class='add'>+	ret = ext4_block_write_begin(NULL, folio, pos, len,</div><div class='add'>+				     ext4_da_get_block_prep);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		/*</div><div class='del'>-		 * block_write_begin may have instantiated a few blocks</div><div class='add'>+		 * ext4_block_write_begin may have instantiated a few blocks</div><div class='ctx'> 		 * outside i_size.  Trim these off again. Don't need</div><div class='ctx'> 		 * i_size_read because we hold inode lock.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2918,7 +3169,7 @@ retry:</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2952,14 +3203,19 @@ static int ext4_da_do_write_end(struct address_space *mapping,</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	loff_t old_size = inode-&gt;i_size;</div><div class='ctx'> 	bool disksize_changed = false;</div><div class='del'>-	loff_t new_i_size;</div><div class='add'>+	loff_t new_i_size, zero_len = 0;</div><div class='add'>+	handle_t *handle;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!folio_buffers(folio))) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * block_write_end() will mark the inode as dirty with I_DIRTY_PAGES</div><div class='ctx'> 	 * flag, which all that's needed to trigger page writeback.</div><div class='ctx'> 	 */</div><div class='del'>-	copied = block_write_end(NULL, mapping, pos, len, copied,</div><div class='del'>-			&amp;folio-&gt;page, NULL);</div><div class='add'>+	copied = block_write_end(pos, len, copied, folio);</div><div class='ctx'> 	new_i_size = pos + copied;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2981,7 +3237,7 @@ static int ext4_da_do_write_end(struct address_space *mapping,</div><div class='ctx'> 		unsigned long end;</div><div class='ctx'> </div><div class='ctx'> 		i_size_write(inode, new_i_size);</div><div class='del'>-		end = (new_i_size - 1) &amp; (PAGE_SIZE - 1);</div><div class='add'>+		end = offset_in_folio(folio, new_i_size - 1);</div><div class='ctx'> 		if (copied &amp;&amp; ext4_da_should_update_i_disksize(folio, end)) {</div><div class='ctx'> 			ext4_update_i_disksize(inode, new_i_size);</div><div class='ctx'> 			disksize_changed = true;</div><div class='hunk'>@@ -2991,34 +3247,36 @@ static int ext4_da_do_write_end(struct address_space *mapping,</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	if (old_size &lt; pos)</div><div class='add'>+	if (pos &gt; old_size) {</div><div class='ctx'> 		pagecache_isize_extended(inode, old_size, pos);</div><div class='add'>+		zero_len = pos - old_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (disksize_changed) {</div><div class='del'>-		handle_t *handle;</div><div class='add'>+	if (!disksize_changed &amp;&amp; !zero_len)</div><div class='add'>+		return copied;</div><div class='ctx'> </div><div class='del'>-		handle = ext4_journal_start(inode, EXT4_HT_INODE, 2);</div><div class='del'>-		if (IS_ERR(handle))</div><div class='del'>-			return PTR_ERR(handle);</div><div class='del'>-		ext4_mark_inode_dirty(handle, inode);</div><div class='del'>-		ext4_journal_stop(handle);</div><div class='del'>-	}</div><div class='add'>+	handle = ext4_journal_start(inode, EXT4_HT_INODE, 2);</div><div class='add'>+	if (IS_ERR(handle))</div><div class='add'>+		return PTR_ERR(handle);</div><div class='add'>+	if (zero_len)</div><div class='add'>+		ext4_zero_partial_blocks(handle, inode, old_size, zero_len);</div><div class='add'>+	ext4_mark_inode_dirty(handle, inode);</div><div class='add'>+	ext4_journal_stop(handle);</div><div class='ctx'> </div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_da_write_end(struct file *file,</div><div class='add'>+static int ext4_da_write_end(const struct kiocb *iocb,</div><div class='ctx'> 			     struct address_space *mapping,</div><div class='ctx'> 			     loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			     struct page *page, void *fsdata)</div><div class='add'>+			     struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int write_mode = (int)(unsigned long)fsdata;</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> </div><div class='ctx'> 	if (write_mode == FALL_BACK_TO_NONDELALLOC)</div><div class='del'>-		return ext4_write_end(file, mapping, pos,</div><div class='del'>-				      len, copied, &amp;folio-&gt;page, fsdata);</div><div class='add'>+		return ext4_write_end(iocb, mapping, pos,</div><div class='add'>+				      len, copied, folio, fsdata);</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_da_write_end(inode, pos, len, copied);</div><div class='ctx'> </div><div class='hunk'>@@ -3216,7 +3474,7 @@ static bool ext4_inode_datasync_dirty(struct inode *inode)</div><div class='ctx'> 	/* Any metadata buffers to write? */</div><div class='ctx'> 	if (!list_empty(&amp;inode-&gt;i_mapping-&gt;i_private_list))</div><div class='ctx'> 		return true;</div><div class='del'>-	return inode-&gt;i_state &amp; I_DIRTY_DATASYNC;</div><div class='add'>+	return inode_state_read_once(inode) &amp; I_DIRTY_DATASYNC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ext4_set_iomap(struct inode *inode, struct iomap *iomap,</div><div class='hunk'>@@ -3238,12 +3496,16 @@ static void ext4_set_iomap(struct inode *inode, struct iomap *iomap,</div><div class='ctx'> 	if (map-&gt;m_flags &amp; EXT4_MAP_NEW)</div><div class='ctx'> 		iomap-&gt;flags |= IOMAP_F_NEW;</div><div class='ctx'> </div><div class='add'>+	/* HW-offload atomics are always used */</div><div class='add'>+	if (flags &amp; IOMAP_ATOMIC)</div><div class='add'>+		iomap-&gt;flags |= IOMAP_F_ATOMIC_BIO;</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; IOMAP_DAX)</div><div class='ctx'> 		iomap-&gt;dax_dev = EXT4_SB(inode-&gt;i_sb)-&gt;s_daxdev;</div><div class='ctx'> 	else</div><div class='ctx'> 		iomap-&gt;bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='del'>-	iomap-&gt;offset = (u64) map-&gt;m_lblk &lt;&lt; blkbits;</div><div class='del'>-	iomap-&gt;length = (u64) map-&gt;m_len &lt;&lt; blkbits;</div><div class='add'>+	iomap-&gt;offset = EXT4_LBLK_TO_B(inode, map-&gt;m_lblk);</div><div class='add'>+	iomap-&gt;length = EXT4_LBLK_TO_B(inode, map-&gt;m_len);</div><div class='ctx'> </div><div class='ctx'> 	if ((map-&gt;m_flags &amp; EXT4_MAP_MAPPED) &amp;&amp;</div><div class='ctx'> 	    !ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='hunk'>@@ -3268,18 +3530,157 @@ static void ext4_set_iomap(struct inode *inode, struct iomap *iomap,</div><div class='ctx'> 		iomap-&gt;addr = (u64) map-&gt;m_pblk &lt;&lt; blkbits;</div><div class='ctx'> 		if (flags &amp; IOMAP_DAX)</div><div class='ctx'> 			iomap-&gt;addr += EXT4_SB(inode-&gt;i_sb)-&gt;s_dax_part_off;</div><div class='add'>+	} else if (map-&gt;m_flags &amp; EXT4_MAP_DELAYED) {</div><div class='add'>+		iomap-&gt;type = IOMAP_DELALLOC;</div><div class='add'>+		iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		iomap-&gt;type = IOMAP_HOLE;</div><div class='ctx'> 		iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext4_map_blocks_atomic_write_slow(handle_t *handle,</div><div class='add'>+			struct inode *inode, struct ext4_map_blocks *map)</div><div class='add'>+{</div><div class='add'>+	ext4_lblk_t m_lblk = map-&gt;m_lblk;</div><div class='add'>+	unsigned int m_len = map-&gt;m_len;</div><div class='add'>+	unsigned int mapped_len = 0, m_flags = 0;</div><div class='add'>+	ext4_fsblk_t next_pblk = 0;</div><div class='add'>+	bool check_next_pblk = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!ext4_has_feature_bigalloc(inode-&gt;i_sb));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is a slow path in case of mixed mapping. We use</div><div class='add'>+	 * EXT4_GET_BLOCKS_CREATE_ZERO flag here to make sure we get a single</div><div class='add'>+	 * contiguous mapped mapping. This will ensure any unwritten or hole</div><div class='add'>+	 * regions within the requested range is zeroed out and we return</div><div class='add'>+	 * a single contiguous mapped extent.</div><div class='add'>+	 */</div><div class='add'>+	m_flags = EXT4_GET_BLOCKS_CREATE_ZERO;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = ext4_map_blocks(handle, inode, map, m_flags);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -ENOSPC)</div><div class='add'>+			goto out_err;</div><div class='add'>+		/*</div><div class='add'>+		 * This should never happen, but let's return an error code to</div><div class='add'>+		 * avoid an infinite loop in here.</div><div class='add'>+		 */</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ret = -EFSCORRUPTED;</div><div class='add'>+			ext4_warning_inode(inode,</div><div class='add'>+				"ext4_map_blocks() couldn't allocate blocks m_flags: 0x%x, ret:%d",</div><div class='add'>+				m_flags, ret);</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * With bigalloc we should never get ENOSPC nor discontiguous</div><div class='add'>+		 * physical extents.</div><div class='add'>+		 */</div><div class='add'>+		if ((check_next_pblk &amp;&amp; next_pblk != map-&gt;m_pblk) ||</div><div class='add'>+				ret == -ENOSPC) {</div><div class='add'>+			ext4_warning_inode(inode,</div><div class='add'>+				"Non-contiguous allocation detected: expected %llu, got %llu, "</div><div class='add'>+				"or ext4_map_blocks() returned out of space ret: %d",</div><div class='add'>+				next_pblk, map-&gt;m_pblk, ret);</div><div class='add'>+			ret = -EFSCORRUPTED;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		next_pblk = map-&gt;m_pblk + map-&gt;m_len;</div><div class='add'>+		check_next_pblk = true;</div><div class='add'>+</div><div class='add'>+		mapped_len += map-&gt;m_len;</div><div class='add'>+		map-&gt;m_lblk += map-&gt;m_len;</div><div class='add'>+		map-&gt;m_len = m_len - mapped_len;</div><div class='add'>+	} while (mapped_len &lt; m_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We might have done some work in above loop, so we need to query the</div><div class='add'>+	 * start of the physical extent, based on the origin m_lblk and m_len.</div><div class='add'>+	 * Let's also ensure we were able to allocate the required range for</div><div class='add'>+	 * mixed mapping case.</div><div class='add'>+	 */</div><div class='add'>+	map-&gt;m_lblk = m_lblk;</div><div class='add'>+	map-&gt;m_len = m_len;</div><div class='add'>+	map-&gt;m_flags = 0;</div><div class='add'>+</div><div class='add'>+	ret = ext4_map_blocks(handle, inode, map,</div><div class='add'>+			      EXT4_GET_BLOCKS_QUERY_LAST_IN_LEAF);</div><div class='add'>+	if (ret != m_len) {</div><div class='add'>+		ext4_warning_inode(inode,</div><div class='add'>+			"allocation failed for atomic write request m_lblk:%u, m_len:%u, ret:%d\n",</div><div class='add'>+			m_lblk, m_len, ret);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	/* reset map before returning an error */</div><div class='add'>+	map-&gt;m_lblk = m_lblk;</div><div class='add'>+	map-&gt;m_len = m_len;</div><div class='add'>+	map-&gt;m_flags = 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ext4_map_blocks_atomic: Helper routine to ensure the entire requested</div><div class='add'>+ * range in @map [lblk, lblk + len) is one single contiguous extent with no</div><div class='add'>+ * mixed mappings.</div><div class='add'>+ *</div><div class='add'>+ * We first use m_flags passed to us by our caller (ext4_iomap_alloc()).</div><div class='add'>+ * We only call EXT4_GET_BLOCKS_ZERO in the slow path, when the underlying</div><div class='add'>+ * physical extent for the requested range does not have a single contiguous</div><div class='add'>+ * mapping type i.e. (Hole, Mapped, or Unwritten) throughout.</div><div class='add'>+ * In that case we will loop over the requested range to allocate and zero out</div><div class='add'>+ * the unwritten / holes in between, to get a single mapped extent from</div><div class='add'>+ * [m_lblk, m_lblk +  m_len). Note that this is only possible because we know</div><div class='add'>+ * this can be called only with bigalloc enabled filesystem where the underlying</div><div class='add'>+ * cluster is already allocated. This avoids allocating discontiguous extents</div><div class='add'>+ * in the slow path due to multiple calls to ext4_map_blocks().</div><div class='add'>+ * The slow path is mostly non-performance critical path, so it should be ok to</div><div class='add'>+ * loop using ext4_map_blocks() with appropriate flags to allocate &amp; zero the</div><div class='add'>+ * underlying short holes/unwritten extents within the requested range.</div><div class='add'>+ */</div><div class='add'>+static int ext4_map_blocks_atomic_write(handle_t *handle, struct inode *inode,</div><div class='add'>+				struct ext4_map_blocks *map, int m_flags,</div><div class='add'>+				bool *force_commit)</div><div class='add'>+{</div><div class='add'>+	ext4_lblk_t m_lblk = map-&gt;m_lblk;</div><div class='add'>+	unsigned int m_len = map-&gt;m_len;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(m_len &gt; 1 &amp;&amp; !ext4_has_feature_bigalloc(inode-&gt;i_sb));</div><div class='add'>+</div><div class='add'>+	ret = ext4_map_blocks(handle, inode, map, m_flags);</div><div class='add'>+	if (ret &lt; 0 || ret == m_len)</div><div class='add'>+		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * This is a mixed mapping case where we were not able to allocate</div><div class='add'>+	 * a single contiguous extent. In that case let's reset requested</div><div class='add'>+	 * mapping and call the slow path.</div><div class='add'>+	 */</div><div class='add'>+	map-&gt;m_lblk = m_lblk;</div><div class='add'>+	map-&gt;m_len = m_len;</div><div class='add'>+	map-&gt;m_flags = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * slow path means we have mixed mapping, that means we will need</div><div class='add'>+	 * to force txn commit.</div><div class='add'>+	 */</div><div class='add'>+	*force_commit = true;</div><div class='add'>+	return ext4_map_blocks_atomic_write_slow(handle, inode, map);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ext4_iomap_alloc(struct inode *inode, struct ext4_map_blocks *map,</div><div class='ctx'> 			    unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	handle_t *handle;</div><div class='del'>-	u8 blkbits = inode-&gt;i_blkbits;</div><div class='ctx'> 	int ret, dio_credits, m_flags = 0, retries = 0;</div><div class='add'>+	bool force_commit = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Trim the mapping request to the maximum value that we can map at</div><div class='hunk'>@@ -3287,7 +3688,30 @@ static int ext4_iomap_alloc(struct inode *inode, struct ext4_map_blocks *map,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (map-&gt;m_len &gt; DIO_MAX_BLOCKS)</div><div class='ctx'> 		map-&gt;m_len = DIO_MAX_BLOCKS;</div><div class='del'>-	dio_credits = ext4_chunk_trans_blocks(inode, map-&gt;m_len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * journal credits estimation for atomic writes. We call</div><div class='add'>+	 * ext4_map_blocks(), to find if there could be a mixed mapping. If yes,</div><div class='add'>+	 * then let's assume the no. of pextents required can be m_len i.e.</div><div class='add'>+	 * every alternate block can be unwritten and hole.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; IOMAP_ATOMIC) {</div><div class='add'>+		unsigned int orig_mlen = map-&gt;m_len;</div><div class='add'>+</div><div class='add'>+		ret = ext4_map_blocks(NULL, inode, map, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (map-&gt;m_len &lt; orig_mlen) {</div><div class='add'>+			map-&gt;m_len = orig_mlen;</div><div class='add'>+			dio_credits = ext4_meta_trans_blocks(inode, orig_mlen,</div><div class='add'>+							     map-&gt;m_len);</div><div class='add'>+		} else {</div><div class='add'>+			dio_credits = ext4_chunk_trans_blocks(inode,</div><div class='add'>+							      map-&gt;m_len);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dio_credits = ext4_chunk_trans_blocks(inode, map-&gt;m_len);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3313,12 +3737,16 @@ retry:</div><div class='ctx'> 	 * i_disksize out to i_size. This could be beyond where direct I/O is</div><div class='ctx'> 	 * happening and thus expose allocated blocks to direct I/O reads.</div><div class='ctx'> 	 */</div><div class='del'>-	else if (((loff_t)map-&gt;m_lblk &lt;&lt; blkbits) &gt;= i_size_read(inode))</div><div class='add'>+	else if (EXT4_LBLK_TO_B(inode, map-&gt;m_lblk) &gt;= i_size_read(inode))</div><div class='ctx'> 		m_flags = EXT4_GET_BLOCKS_CREATE;</div><div class='ctx'> 	else if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='ctx'> 		m_flags = EXT4_GET_BLOCKS_IO_CREATE_EXT;</div><div class='ctx'> </div><div class='del'>-	ret = ext4_map_blocks(handle, inode, map, m_flags);</div><div class='add'>+	if (flags &amp; IOMAP_ATOMIC)</div><div class='add'>+		ret = ext4_map_blocks_atomic_write(handle, inode, map, m_flags,</div><div class='add'>+						   &amp;force_commit);</div><div class='add'>+	else</div><div class='add'>+		ret = ext4_map_blocks(handle, inode, map, m_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We cannot fill holes in indirect tree based inodes as that could</div><div class='hunk'>@@ -3332,6 +3760,22 @@ retry:</div><div class='ctx'> 	if (ret == -ENOSPC &amp;&amp; ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries))</div><div class='ctx'> 		goto retry;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Force commit the current transaction if the allocation spans a mixed</div><div class='add'>+	 * mapping range. This ensures any pending metadata updates (like</div><div class='add'>+	 * unwritten to written extents conversion) in this range are in</div><div class='add'>+	 * consistent state with the file data blocks, before performing the</div><div class='add'>+	 * actual write I/O. If the commit fails, the whole I/O must be aborted</div><div class='add'>+	 * to prevent any possible torn writes.</div><div class='add'>+	 */</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; force_commit) {</div><div class='add'>+		int ret2;</div><div class='add'>+</div><div class='add'>+		ret2 = ext4_force_commit(inode-&gt;i_sb);</div><div class='add'>+		if (ret2)</div><div class='add'>+			return ret2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3342,6 +3786,7 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ext4_map_blocks map;</div><div class='ctx'> 	u8 blkbits = inode-&gt;i_blkbits;</div><div class='add'>+	unsigned int orig_mlen;</div><div class='ctx'> </div><div class='ctx'> 	if ((offset &gt;&gt; blkbits) &gt; EXT4_MAX_LOGICAL_BLOCK)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3355,6 +3800,7 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> 	map.m_lblk = offset &gt;&gt; blkbits;</div><div class='ctx'> 	map.m_len = min_t(loff_t, (offset + length - 1) &gt;&gt; blkbits,</div><div class='ctx'> 			  EXT4_MAX_LOGICAL_BLOCK) - map.m_lblk + 1;</div><div class='add'>+	orig_mlen = map.m_len;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; IOMAP_WRITE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3365,11 +3811,23 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (offset + length &lt;= i_size_read(inode)) {</div><div class='ctx'> 			ret = ext4_map_blocks(NULL, inode, &amp;map, 0);</div><div class='del'>-			if (ret &gt; 0 &amp;&amp; (map.m_flags &amp; EXT4_MAP_MAPPED))</div><div class='del'>-				goto out;</div><div class='add'>+			/*</div><div class='add'>+			 * For atomic writes the entire requested length should</div><div class='add'>+			 * be mapped.</div><div class='add'>+			 */</div><div class='add'>+			if (map.m_flags &amp; EXT4_MAP_MAPPED) {</div><div class='add'>+				if ((!(flags &amp; IOMAP_ATOMIC) &amp;&amp; ret &gt; 0) ||</div><div class='add'>+				   (flags &amp; IOMAP_ATOMIC &amp;&amp; ret &gt;= orig_mlen))</div><div class='add'>+					goto out;</div><div class='add'>+			}</div><div class='add'>+			map.m_len = orig_mlen;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = ext4_iomap_alloc(inode, &amp;map, flags);</div><div class='ctx'> 	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * This can be called for overwrites path from</div><div class='add'>+		 * ext4_iomap_overwrite_begin().</div><div class='add'>+		 */</div><div class='ctx'> 		ret = ext4_map_blocks(NULL, inode, &amp;map, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3383,6 +3841,16 @@ out:</div><div class='ctx'> 	 */</div><div class='ctx'> 	map.m_len = fscrypt_limit_io_blocks(inode, map.m_lblk, map.m_len);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Before returning to iomap, let's ensure the allocated mapping</div><div class='add'>+	 * covers the entire requested length for atomic writes.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; IOMAP_ATOMIC) {</div><div class='add'>+		if (map.m_len &lt; (length &gt;&gt; blkbits)) {</div><div class='add'>+			WARN_ON_ONCE(1);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	ext4_set_iomap(inode, iomap, &amp;map, offset, length, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3404,61 +3872,19 @@ static int ext4_iomap_overwrite_begin(struct inode *inode, loff_t offset,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length,</div><div class='del'>-			  ssize_t written, unsigned flags, struct iomap *iomap)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Check to see whether an error occurred while writing out the data to</div><div class='del'>-	 * the allocated blocks. If so, return the magic error code so that we</div><div class='del'>-	 * fallback to buffered I/O and attempt to complete the remainder of</div><div class='del'>-	 * the I/O. Any blocks that may have been allocated in preparation for</div><div class='del'>-	 * the direct I/O will be reused during buffered I/O.</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; (IOMAP_WRITE | IOMAP_DIRECT) &amp;&amp; written == 0)</div><div class='del'>-		return -ENOTBLK;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const struct iomap_ops ext4_iomap_ops = {</div><div class='ctx'> 	.iomap_begin		= ext4_iomap_begin,</div><div class='del'>-	.iomap_end		= ext4_iomap_end,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct iomap_ops ext4_iomap_overwrite_ops = {</div><div class='ctx'> 	.iomap_begin		= ext4_iomap_overwrite_begin,</div><div class='del'>-	.iomap_end		= ext4_iomap_end,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static bool ext4_iomap_is_delalloc(struct inode *inode,</div><div class='del'>-				   struct ext4_map_blocks *map)</div><div class='del'>-{</div><div class='del'>-	struct extent_status es;</div><div class='del'>-	ext4_lblk_t offset = 0, end = map-&gt;m_lblk + map-&gt;m_len - 1;</div><div class='del'>-</div><div class='del'>-	ext4_es_find_extent_range(inode, &amp;ext4_es_is_delayed,</div><div class='del'>-				  map-&gt;m_lblk, end, &amp;es);</div><div class='del'>-</div><div class='del'>-	if (!es.es_len || es.es_lblk &gt; end)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (es.es_lblk &gt; map-&gt;m_lblk) {</div><div class='del'>-		map-&gt;m_len = es.es_lblk - map-&gt;m_lblk;</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	offset = map-&gt;m_lblk - es.es_lblk;</div><div class='del'>-	map-&gt;m_len = es.es_len - offset;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ext4_iomap_begin_report(struct inode *inode, loff_t offset,</div><div class='ctx'> 				   loff_t length, unsigned int flags,</div><div class='ctx'> 				   struct iomap *iomap, struct iomap *srcmap)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool delalloc = false;</div><div class='ctx'> 	struct ext4_map_blocks map;</div><div class='ctx'> 	u8 blkbits = inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='hunk'>@@ -3499,13 +3925,8 @@ static int ext4_iomap_begin_report(struct inode *inode, loff_t offset,</div><div class='ctx'> 	ret = ext4_map_blocks(NULL, inode, &amp;map, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		delalloc = ext4_iomap_is_delalloc(inode, &amp;map);</div><div class='del'>-</div><div class='ctx'> set_iomap:</div><div class='ctx'> 	ext4_set_iomap(inode, iomap, &amp;map, offset, length, flags);</div><div class='del'>-	if (delalloc &amp;&amp; iomap-&gt;type == IOMAP_HOLE)</div><div class='del'>-		iomap-&gt;type = IOMAP_DELALLOC;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3562,7 +3983,6 @@ static const struct address_space_operations ext4_aops = {</div><div class='ctx'> 	.bmap			= ext4_bmap,</div><div class='ctx'> 	.invalidate_folio	= ext4_invalidate_folio,</div><div class='ctx'> 	.release_folio		= ext4_release_folio,</div><div class='del'>-	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.migrate_folio		= buffer_migrate_folio,</div><div class='ctx'> 	.is_partially_uptodate  = block_is_partially_uptodate,</div><div class='ctx'> 	.error_remove_folio	= generic_error_remove_folio,</div><div class='hunk'>@@ -3579,7 +3999,6 @@ static const struct address_space_operations ext4_journalled_aops = {</div><div class='ctx'> 	.bmap			= ext4_bmap,</div><div class='ctx'> 	.invalidate_folio	= ext4_journalled_invalidate_folio,</div><div class='ctx'> 	.release_folio		= ext4_release_folio,</div><div class='del'>-	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.migrate_folio		= buffer_migrate_folio_norefs,</div><div class='ctx'> 	.is_partially_uptodate  = block_is_partially_uptodate,</div><div class='ctx'> 	.error_remove_folio	= generic_error_remove_folio,</div><div class='hunk'>@@ -3596,7 +4015,6 @@ static const struct address_space_operations ext4_da_aops = {</div><div class='ctx'> 	.bmap			= ext4_bmap,</div><div class='ctx'> 	.invalidate_folio	= ext4_invalidate_folio,</div><div class='ctx'> 	.release_folio		= ext4_release_folio,</div><div class='del'>-	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.migrate_folio		= buffer_migrate_folio,</div><div class='ctx'> 	.is_partially_uptodate  = block_is_partially_uptodate,</div><div class='ctx'> 	.error_remove_folio	= generic_error_remove_folio,</div><div class='hunk'>@@ -3605,7 +4023,6 @@ static const struct address_space_operations ext4_da_aops = {</div><div class='ctx'> </div><div class='ctx'> static const struct address_space_operations ext4_dax_aops = {</div><div class='ctx'> 	.writepages		= ext4_dax_writepages,</div><div class='del'>-	.direct_IO		= noop_direct_IO,</div><div class='ctx'> 	.dirty_folio		= noop_dirty_folio,</div><div class='ctx'> 	.bmap			= ext4_bmap,</div><div class='ctx'> 	.swap_activate		= ext4_iomap_swap_activate,</div><div class='hunk'>@@ -3640,9 +4057,7 @@ void ext4_set_aops(struct inode *inode)</div><div class='ctx'> static int __ext4_block_zero_page_range(handle_t *handle,</div><div class='ctx'> 		struct address_space *mapping, loff_t from, loff_t length)</div><div class='ctx'> {</div><div class='del'>-	ext4_fsblk_t index = from &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned offset = from &amp; (PAGE_SIZE-1);</div><div class='del'>-	unsigned blocksize, pos;</div><div class='add'>+	unsigned int offset, blocksize, pos;</div><div class='ctx'> 	ext4_lblk_t iblock;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='hunk'>@@ -3657,13 +4072,14 @@ static int __ext4_block_zero_page_range(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='ctx'> </div><div class='del'>-	iblock = index &lt;&lt; (PAGE_SHIFT - inode-&gt;i_sb-&gt;s_blocksize_bits);</div><div class='add'>+	iblock = EXT4_PG_TO_LBLK(inode, folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	bh = folio_buffers(folio);</div><div class='ctx'> 	if (!bh)</div><div class='ctx'> 		bh = create_empty_buffers(folio, blocksize, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Find the buffer that contains "offset" */</div><div class='add'>+	offset = offset_in_folio(folio, from);</div><div class='ctx'> 	pos = blocksize;</div><div class='ctx'> 	while (offset &gt;= pos) {</div><div class='ctx'> 		bh = bh-&gt;b_this_page;</div><div class='hunk'>@@ -3741,9 +4157,8 @@ static int ext4_block_zero_page_range(handle_t *handle,</div><div class='ctx'> 		struct address_space *mapping, loff_t from, loff_t length)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	unsigned offset = from &amp; (PAGE_SIZE-1);</div><div class='ctx'> 	unsigned blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	unsigned max = blocksize - (offset &amp; (blocksize - 1));</div><div class='add'>+	unsigned int max = blocksize - (from &amp; (blocksize - 1));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * correct length if it does not fall between</div><div class='hunk'>@@ -3768,7 +4183,6 @@ static int ext4_block_zero_page_range(handle_t *handle,</div><div class='ctx'> static int ext4_block_truncate_page(handle_t *handle,</div><div class='ctx'> 		struct address_space *mapping, loff_t from)</div><div class='ctx'> {</div><div class='del'>-	unsigned offset = from &amp; (PAGE_SIZE-1);</div><div class='ctx'> 	unsigned length;</div><div class='ctx'> 	unsigned blocksize;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='hunk'>@@ -3777,8 +4191,8 @@ static int ext4_block_truncate_page(handle_t *handle,</div><div class='ctx'> 	if (IS_ENCRYPTED(inode) &amp;&amp; !fscrypt_has_encryption_key(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	length = blocksize - (offset &amp; (blocksize - 1));</div><div class='add'>+	blocksize = i_blocksize(inode);</div><div class='add'>+	length = blocksize - (from &amp; (blocksize - 1));</div><div class='ctx'> </div><div class='ctx'> 	return ext4_block_zero_page_range(handle, mapping, from, length);</div><div class='ctx'> }</div><div class='hunk'>@@ -3836,7 +4250,11 @@ int ext4_can_truncate(struct inode *inode)</div><div class='ctx'>  * We have to make sure i_disksize gets properly updated before we truncate</div><div class='ctx'>  * page cache due to hole punching or zero range. Otherwise i_disksize update</div><div class='ctx'>  * can get lost as it may have been postponed to submission of writeback but</div><div class='del'>- * that will never happen after we truncate page cache.</div><div class='add'>+ * that will never happen if we remove the folio containing i_size from the</div><div class='add'>+ * page cache. Also if we punch hole within i_size but above i_disksize,</div><div class='add'>+ * following ext4_page_mkwrite() may mistakenly allocate written blocks over</div><div class='add'>+ * the hole and thus introduce allocated blocks beyond i_disksize which is</div><div class='add'>+ * not allowed (e2fsck would complain in case of crash).</div><div class='ctx'>  */</div><div class='ctx'> int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset,</div><div class='ctx'> 				      loff_t len)</div><div class='hunk'>@@ -3847,9 +4265,11 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset,</div><div class='ctx'> 	loff_t size = i_size_read(inode);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!inode_is_locked(inode));</div><div class='del'>-	if (offset &gt; size || offset + len &lt; size)</div><div class='add'>+	if (offset &gt; size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (offset + len &lt; size)</div><div class='add'>+		size = offset + len;</div><div class='ctx'> 	if (EXT4_I(inode)-&gt;i_disksize &gt;= size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3863,6 +4283,68 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ext4_truncate_folio(struct inode *inode,</div><div class='add'>+				       loff_t start, loff_t end)</div><div class='add'>+{</div><div class='add'>+	unsigned long blocksize = i_blocksize(inode);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='add'>+	/* Nothing to be done if no complete block needs to be truncated. */</div><div class='add'>+	if (round_up(start, blocksize) &gt;= round_down(end, blocksize))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	folio = filemap_lock_folio(inode-&gt;i_mapping, start &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (folio_mkclean(folio))</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ext4_truncate_page_cache_block_range(struct inode *inode,</div><div class='add'>+					 loff_t start, loff_t end)</div><div class='add'>+{</div><div class='add'>+	unsigned long blocksize = i_blocksize(inode);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For journalled data we need to write (and checkpoint) pages</div><div class='add'>+	 * before discarding page cache to avoid inconsitent data on disk</div><div class='add'>+	 * in case of crash before freeing or unwritten converting trans</div><div class='add'>+	 * is committed.</div><div class='add'>+	 */</div><div class='add'>+	if (ext4_should_journal_data(inode)) {</div><div class='add'>+		ret = filemap_write_and_wait_range(inode-&gt;i_mapping, start,</div><div class='add'>+						   end - 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		goto truncate_pagecache;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the block size is less than the page size, the file's mapped</div><div class='add'>+	 * blocks within one page could be freed or converted to unwritten.</div><div class='add'>+	 * So it's necessary to remove writable userspace mappings, and then</div><div class='add'>+	 * ext4_page_mkwrite() can be called during subsequent write access</div><div class='add'>+	 * to these partial folios.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ALIGNED(start | end, PAGE_SIZE) &amp;&amp;</div><div class='add'>+	    blocksize &lt; PAGE_SIZE &amp;&amp; start &lt; inode-&gt;i_size) {</div><div class='add'>+		loff_t page_boundary = round_up(start, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		ext4_truncate_folio(inode, start, min(page_boundary, end));</div><div class='add'>+		if (end &gt; page_boundary)</div><div class='add'>+			ext4_truncate_folio(inode,</div><div class='add'>+					    round_down(end, PAGE_SIZE), end);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+truncate_pagecache:</div><div class='add'>+	truncate_pagecache_range(inode, start, end - 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ext4_wait_dax_page(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='hunk'>@@ -3872,24 +4354,10 @@ static void ext4_wait_dax_page(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> int ext4_break_layouts(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='ctx'> 	if (WARN_ON_ONCE(!rwsem_is_locked(&amp;inode-&gt;i_mapping-&gt;invalidate_lock)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		page = dax_layout_busy_page(inode-&gt;i_mapping);</div><div class='del'>-		if (!page)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		error = ___wait_var_event(&amp;page-&gt;_refcount,</div><div class='del'>-				atomic_read(&amp;page-&gt;_refcount) == 1,</div><div class='del'>-				TASK_INTERRUPTIBLE, 0, 0,</div><div class='del'>-				ext4_wait_dax_page(inode));</div><div class='del'>-	} while (error == 0);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='add'>+	return dax_break_layout_inode(inode, ext4_wait_dax_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3907,146 +4375,112 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	ext4_lblk_t first_block, stop_block;</div><div class='del'>-	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	loff_t first_block_offset, last_block_offset, max_length;</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='add'>+	ext4_lblk_t start_lblk, end_lblk;</div><div class='add'>+	loff_t max_end = sb-&gt;s_maxbytes;</div><div class='add'>+	loff_t end = offset + length;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	unsigned int credits;</div><div class='del'>-	int ret = 0, ret2 = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_punch_hole(inode, offset, length, 0);</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Write out all dirty pages to avoid race conditions</div><div class='del'>-	 * Then release them.</div><div class='add'>+	 * For indirect-block based inodes, make sure that the hole within</div><div class='add'>+	 * one block before last range.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {</div><div class='del'>-		ret = filemap_write_and_wait_range(mapping, offset,</div><div class='del'>-						   offset + length - 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='add'>+	if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='add'>+		max_end = EXT4_SB(sb)-&gt;s_bitmap_maxbytes - sb-&gt;s_blocksize;</div><div class='ctx'> </div><div class='ctx'> 	/* No need to punch hole beyond i_size */</div><div class='del'>-	if (offset &gt;= inode-&gt;i_size)</div><div class='del'>-		goto out_mutex;</div><div class='add'>+	if (offset &gt;= inode-&gt;i_size || offset &gt;= max_end)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If the hole extends beyond i_size, set the hole</div><div class='del'>-	 * to end after the page that contains i_size</div><div class='add'>+	 * If the hole extends beyond i_size, set the hole to end after</div><div class='add'>+	 * the block that contains i_size to save pointless tail block zeroing.</div><div class='ctx'> 	 */</div><div class='del'>-	if (offset + length &gt; inode-&gt;i_size) {</div><div class='del'>-		length = inode-&gt;i_size +</div><div class='del'>-		   PAGE_SIZE - (inode-&gt;i_size &amp; (PAGE_SIZE - 1)) -</div><div class='del'>-		   offset;</div><div class='del'>-	}</div><div class='add'>+	if (end &gt;= inode-&gt;i_size)</div><div class='add'>+		end = round_up(inode-&gt;i_size, sb-&gt;s_blocksize);</div><div class='add'>+	if (end &gt; max_end)</div><div class='add'>+		end = max_end;</div><div class='add'>+	length = end - offset;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * For punch hole the length + offset needs to be within one block</div><div class='del'>-	 * before last range. Adjust the length if it goes beyond that limit.</div><div class='add'>+	 * Attach jinode to inode for jbd2 if we do any zeroing of partial</div><div class='add'>+	 * block.</div><div class='ctx'> 	 */</div><div class='del'>-	max_length = sbi-&gt;s_bitmap_maxbytes - inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	if (offset + length &gt; max_length)</div><div class='del'>-		length = max_length - offset;</div><div class='del'>-</div><div class='del'>-	if (offset &amp; (sb-&gt;s_blocksize - 1) ||</div><div class='del'>-	    (offset + length) &amp; (sb-&gt;s_blocksize - 1)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Attach jinode to inode for jbd2 if we do any zeroing of</div><div class='del'>-		 * partial block</div><div class='del'>-		 */</div><div class='add'>+	if (!IS_ALIGNED(offset | end, sb-&gt;s_blocksize)) {</div><div class='ctx'> 		ret = ext4_inode_attach_jinode(inode);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out_mutex;</div><div class='del'>-</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Wait all existing dio workers, newcomers will block on i_rwsem */</div><div class='del'>-	inode_dio_wait(inode);</div><div class='del'>-</div><div class='del'>-	ret = file_modified(file);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_mutex;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Prevent page faults from reinstantiating pages we have released from</div><div class='del'>-	 * page cache.</div><div class='del'>-	 */</div><div class='del'>-	filemap_invalidate_lock(mapping);</div><div class='ctx'> </div><div class='del'>-	ret = ext4_break_layouts(inode);</div><div class='add'>+	ret = ext4_update_disksize_before_punch(inode, offset, length);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_dio;</div><div class='del'>-</div><div class='del'>-	first_block_offset = round_up(offset, sb-&gt;s_blocksize);</div><div class='del'>-	last_block_offset = round_down((offset + length), sb-&gt;s_blocksize) - 1;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Now release the pages and zero block aligned part of pages*/</div><div class='del'>-	if (last_block_offset &gt; first_block_offset) {</div><div class='del'>-		ret = ext4_update_disksize_before_punch(inode, offset, length);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_dio;</div><div class='del'>-		truncate_pagecache_range(inode, first_block_offset,</div><div class='del'>-					 last_block_offset);</div><div class='del'>-	}</div><div class='add'>+	ret = ext4_truncate_page_cache_block_range(inode, offset, end);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='del'>-		credits = ext4_writepage_trans_blocks(inode);</div><div class='add'>+		credits = ext4_chunk_trans_extent(inode, 2);</div><div class='ctx'> 	else</div><div class='ctx'> 		credits = ext4_blocks_for_truncate(inode);</div><div class='ctx'> 	handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits);</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='ctx'> 		ret = PTR_ERR(handle);</div><div class='ctx'> 		ext4_std_error(sb, ret);</div><div class='del'>-		goto out_dio;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ext4_zero_partial_blocks(handle, inode, offset,</div><div class='del'>-				       length);</div><div class='add'>+	ret = ext4_zero_partial_blocks(handle, inode, offset, length);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_stop;</div><div class='del'>-</div><div class='del'>-	first_block = (offset + sb-&gt;s_blocksize - 1) &gt;&gt;</div><div class='del'>-		EXT4_BLOCK_SIZE_BITS(sb);</div><div class='del'>-	stop_block = (offset + length) &gt;&gt; EXT4_BLOCK_SIZE_BITS(sb);</div><div class='add'>+		goto out_handle;</div><div class='ctx'> </div><div class='ctx'> 	/* If there are blocks to remove, do it */</div><div class='del'>-	if (stop_block &gt; first_block) {</div><div class='add'>+	start_lblk = EXT4_B_TO_LBLK(inode, offset);</div><div class='add'>+	end_lblk = end &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='add'>+	if (end_lblk &gt; start_lblk) {</div><div class='add'>+		ext4_lblk_t hole_len = end_lblk - start_lblk;</div><div class='add'>+</div><div class='add'>+		ext4_fc_track_inode(handle, inode);</div><div class='add'>+		ext4_check_map_extents_env(inode);</div><div class='ctx'> 		down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='del'>-		ext4_discard_preallocations(inode, 0);</div><div class='add'>+		ext4_discard_preallocations(inode);</div><div class='ctx'> </div><div class='del'>-		ext4_es_remove_extent(inode, first_block,</div><div class='del'>-				      stop_block - first_block);</div><div class='add'>+		ext4_es_remove_extent(inode, start_lblk, hole_len);</div><div class='ctx'> </div><div class='ctx'> 		if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='del'>-			ret = ext4_ext_remove_space(inode, first_block,</div><div class='del'>-						    stop_block - 1);</div><div class='add'>+			ret = ext4_ext_remove_space(inode, start_lblk,</div><div class='add'>+						    end_lblk - 1);</div><div class='ctx'> 		else</div><div class='del'>-			ret = ext4_ind_remove_space(handle, inode, first_block,</div><div class='del'>-						    stop_block);</div><div class='add'>+			ret = ext4_ind_remove_space(handle, inode, start_lblk,</div><div class='add'>+						    end_lblk);</div><div class='add'>+		if (ret) {</div><div class='add'>+			up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+			goto out_handle;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		ext4_es_insert_extent(inode, start_lblk, hole_len, ~0,</div><div class='add'>+				      EXTENT_STATUS_HOLE, 0);</div><div class='ctx'> 		up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 	}</div><div class='del'>-	ext4_fc_track_range(handle, inode, first_block, stop_block);</div><div class='add'>+	ext4_fc_track_range(handle, inode, start_lblk, end_lblk);</div><div class='add'>+</div><div class='add'>+	ret = ext4_mark_inode_dirty(handle, inode);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto out_handle;</div><div class='add'>+</div><div class='add'>+	ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='ctx'> 	if (IS_SYNC(inode))</div><div class='ctx'> 		ext4_handle_sync(handle);</div><div class='del'>-</div><div class='del'>-	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='del'>-	ret2 = ext4_mark_inode_dirty(handle, inode);</div><div class='del'>-	if (unlikely(ret2))</div><div class='del'>-		ret = ret2;</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ext4_update_inode_fsync_trans(handle, inode, 1);</div><div class='del'>-out_stop:</div><div class='add'>+out_handle:</div><div class='ctx'> 	ext4_journal_stop(handle);</div><div class='del'>-out_dio:</div><div class='del'>-	filemap_invalidate_unlock(mapping);</div><div class='del'>-out_mutex:</div><div class='del'>-	inode_unlock(inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4116,7 +4550,7 @@ int ext4_truncate(struct inode *inode)</div><div class='ctx'> 	 * or it's a completely new inode. In those cases we might not</div><div class='ctx'> 	 * have i_rwsem locked because it's not necessary.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(inode-&gt;i_state &amp; (I_NEW|I_FREEING)))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; (I_NEW | I_FREEING)))</div><div class='ctx'> 		WARN_ON(!inode_is_locked(inode));</div><div class='ctx'> 	trace_ext4_truncate_enter(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -4142,7 +4576,7 @@ int ext4_truncate(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='del'>-		credits = ext4_writepage_trans_blocks(inode);</div><div class='add'>+		credits = ext4_chunk_trans_extent(inode, 1);</div><div class='ctx'> 	else</div><div class='ctx'> 		credits = ext4_blocks_for_truncate(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -4168,9 +4602,11 @@ int ext4_truncate(struct inode *inode)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_stop;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	ext4_fc_track_inode(handle, inode);</div><div class='add'>+	ext4_check_map_extents_env(inode);</div><div class='ctx'> </div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))</div><div class='ctx'> 		err = ext4_ext_truncate(handle, inode);</div><div class='hunk'>@@ -4281,7 +4717,7 @@ static int ext4_fill_raw_inode(struct inode *inode, struct ext4_inode *raw_inode</div><div class='ctx'> 		 * old inodes get re-used with the upper 16 bits of the</div><div class='ctx'> 		 * uid/gid intact.</div><div class='ctx'> 		 */</div><div class='del'>-		if (ei-&gt;i_dtime &amp;&amp; list_empty(&amp;ei-&gt;i_orphan)) {</div><div class='add'>+		if (ei-&gt;i_dtime &amp;&amp; !ext4_inode_orphan_tracked(inode)) {</div><div class='ctx'> 			raw_inode-&gt;i_uid_high = 0;</div><div class='ctx'> 			raw_inode-&gt;i_gid_high = 0;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -4488,10 +4924,10 @@ make_io:</div><div class='ctx'> 	 * Read the block from disk.</div><div class='ctx'> 	 */</div><div class='ctx'> 	trace_ext4_load_inode(sb, ino);</div><div class='del'>-	ext4_read_bh_nowait(bh, REQ_META | REQ_PRIO, NULL);</div><div class='add'>+	ext4_read_bh_nowait(bh, REQ_META | REQ_PRIO, NULL,</div><div class='add'>+			    ext4_simulate_fail(sb, EXT4_SIM_INODE_EIO));</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> 	wait_on_buffer(bh);</div><div class='del'>-	ext4_simulate_fail_bh(sb, bh, EXT4_SIM_INODE_EIO);</div><div class='ctx'> 	if (!buffer_uptodate(bh)) {</div><div class='ctx'> 		if (ret_block)</div><div class='ctx'> 			*ret_block = block;</div><div class='hunk'>@@ -4633,6 +5069,11 @@ static inline int ext4_iget_extra_inode(struct inode *inode,</div><div class='ctx'> 	    *magic == cpu_to_le32(EXT4_XATTR_MAGIC)) {</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='add'>+		err = xattr_check_inode(inode, IHDR(inode, raw_inode),</div><div class='add'>+					ITAIL(inode, raw_inode));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		ext4_set_inode_state(inode, EXT4_STATE_XATTR);</div><div class='ctx'> 		err = ext4_find_inline_data_nolock(inode);</div><div class='ctx'> 		if (!err &amp;&amp; ext4_has_inline_data(inode))</div><div class='hunk'>@@ -4664,22 +5105,62 @@ static inline void ext4_inode_set_iversion_queried(struct inode *inode, u64 val)</div><div class='ctx'> 		inode_set_iversion_queried(inode, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *check_igot_inode(struct inode *inode, ext4_iget_flags flags)</div><div class='del'>-</div><div class='add'>+static int check_igot_inode(struct inode *inode, ext4_iget_flags flags,</div><div class='add'>+			    const char *function, unsigned int line)</div><div class='ctx'> {</div><div class='add'>+	const char *err_str;</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; EXT4_IGET_EA_INODE) {</div><div class='del'>-		if (!(EXT4_I(inode)-&gt;i_flags &amp; EXT4_EA_INODE_FL))</div><div class='del'>-			return "missing EA_INODE flag";</div><div class='add'>+		if (!(EXT4_I(inode)-&gt;i_flags &amp; EXT4_EA_INODE_FL)) {</div><div class='add'>+			err_str = "missing EA_INODE flag";</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='ctx'> 		if (ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||</div><div class='del'>-		    EXT4_I(inode)-&gt;i_file_acl)</div><div class='del'>-			return "ea_inode with extended attributes";</div><div class='add'>+		    EXT4_I(inode)-&gt;i_file_acl) {</div><div class='add'>+			err_str = "ea_inode with extended attributes";</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((EXT4_I(inode)-&gt;i_flags &amp; EXT4_EA_INODE_FL))</div><div class='del'>-			return "unexpected EA_INODE flag";</div><div class='add'>+		if ((EXT4_I(inode)-&gt;i_flags &amp; EXT4_EA_INODE_FL)) {</div><div class='add'>+			/*</div><div class='add'>+			 * open_by_handle_at() could provide an old inode number</div><div class='add'>+			 * that has since been reused for an ea_inode; this does</div><div class='add'>+			 * not indicate filesystem corruption</div><div class='add'>+			 */</div><div class='add'>+			if (flags &amp; EXT4_IGET_HANDLE)</div><div class='add'>+				return -ESTALE;</div><div class='add'>+			err_str = "unexpected EA_INODE flag";</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (is_bad_inode(inode) &amp;&amp; !(flags &amp; EXT4_IGET_BAD))</div><div class='del'>-		return "unexpected bad inode w/o EXT4_IGET_BAD";</div><div class='del'>-	return NULL;</div><div class='add'>+	if (is_bad_inode(inode) &amp;&amp; !(flags &amp; EXT4_IGET_BAD)) {</div><div class='add'>+		err_str = "unexpected bad inode w/o EXT4_IGET_BAD";</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	ext4_error_inode(inode, function, line, 0, "%s", err_str);</div><div class='add'>+	return -EFSCORRUPTED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ext4_set_inode_mapping_order(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	u16 min_order, max_order;</div><div class='add'>+</div><div class='add'>+	max_order = EXT4_SB(sb)-&gt;s_max_folio_order;</div><div class='add'>+	if (!max_order)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	min_order = EXT4_SB(sb)-&gt;s_min_folio_order;</div><div class='add'>+	if (!min_order &amp;&amp; !S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA))</div><div class='add'>+		max_order = min_order;</div><div class='add'>+</div><div class='add'>+	mapping_set_folio_order_range(inode-&gt;i_mapping, min_order, max_order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='hunk'>@@ -4691,7 +5172,6 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	struct ext4_inode_info *ei;</div><div class='ctx'> 	struct ext4_super_block *es = EXT4_SB(sb)-&gt;s_es;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	const char *err_str;</div><div class='ctx'> 	journal_t *journal = EXT4_SB(sb)-&gt;s_journal;</div><div class='ctx'> 	long ret;</div><div class='ctx'> 	loff_t size;</div><div class='hunk'>@@ -4700,12 +5180,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	gid_t i_gid;</div><div class='ctx'> 	projid_t i_projid;</div><div class='ctx'> </div><div class='del'>-	if ((!(flags &amp; EXT4_IGET_SPECIAL) &amp;&amp;</div><div class='del'>-	     ((ino &lt; EXT4_FIRST_INO(sb) &amp;&amp; ino != EXT4_ROOT_INO) ||</div><div class='del'>-	      ino == le32_to_cpu(es-&gt;s_usr_quota_inum) ||</div><div class='del'>-	      ino == le32_to_cpu(es-&gt;s_grp_quota_inum) ||</div><div class='del'>-	      ino == le32_to_cpu(es-&gt;s_prj_quota_inum) ||</div><div class='del'>-	      ino == le32_to_cpu(es-&gt;s_orphan_file_inum))) ||</div><div class='add'>+	if ((!(flags &amp; EXT4_IGET_SPECIAL) &amp;&amp; is_special_ino(sb, ino)) ||</div><div class='ctx'> 	    (ino &lt; EXT4_ROOT_INO) ||</div><div class='ctx'> 	    (ino &gt; le32_to_cpu(es-&gt;s_inodes_count))) {</div><div class='ctx'> 		if (flags &amp; EXT4_IGET_HANDLE)</div><div class='hunk'>@@ -4719,11 +5194,11 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW)) {</div><div class='del'>-		if ((err_str = check_igot_inode(inode, flags)) != NULL) {</div><div class='del'>-			ext4_error_inode(inode, function, line, 0, err_str);</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW)) {</div><div class='add'>+		ret = check_igot_inode(inode, flags, function, line);</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			iput(inode);</div><div class='del'>-			return ERR_PTR(-EFSCORRUPTED);</div><div class='add'>+			return ERR_PTR(ret);</div><div class='ctx'> 		}</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4759,15 +5234,14 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 		ei-&gt;i_extra_isize = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Precompute checksum seed for inode metadata */</div><div class='del'>-	if (ext4_has_metadata_csum(sb)) {</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb)) {</div><div class='ctx'> 		struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 		__u32 csum;</div><div class='ctx'> 		__le32 inum = cpu_to_le32(inode-&gt;i_ino);</div><div class='ctx'> 		__le32 gen = raw_inode-&gt;i_generation;</div><div class='del'>-		csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)&amp;inum,</div><div class='add'>+		csum = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)&amp;inum,</div><div class='ctx'> 				   sizeof(inum));</div><div class='del'>-		ei-&gt;i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&amp;gen,</div><div class='del'>-					      sizeof(gen));</div><div class='add'>+		ei-&gt;i_csum_seed = ext4_chksum(csum, (__u8 *)&amp;gen, sizeof(gen));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((!ext4_inode_csum_verify(inode, raw_inode, ei) ||</div><div class='hunk'>@@ -4798,7 +5272,6 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	ei-&gt;i_projid = make_kprojid(&amp;init_user_ns, i_projid);</div><div class='ctx'> 	set_nlink(inode, le16_to_cpu(raw_inode-&gt;i_links_count));</div><div class='ctx'> </div><div class='del'>-	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */</div><div class='ctx'> 	ei-&gt;i_inline_off = 0;</div><div class='ctx'> 	ei-&gt;i_dir_start_lookup = 0;</div><div class='ctx'> 	ei-&gt;i_dtime = le32_to_cpu(raw_inode-&gt;i_dtime);</div><div class='hunk'>@@ -4829,13 +5302,22 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	}</div><div class='ctx'> 	ei-&gt;i_flags = le32_to_cpu(raw_inode-&gt;i_flags);</div><div class='ctx'> 	ext4_set_inode_flags(inode, true);</div><div class='add'>+	/* Detect invalid flag combination - can't have both inline data and extents */</div><div class='add'>+	if (ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA) &amp;&amp;</div><div class='add'>+	    ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {</div><div class='add'>+		ext4_error_inode(inode, function, line, 0,</div><div class='add'>+			"inode has both inline data and extents flags");</div><div class='add'>+		ret = -EFSCORRUPTED;</div><div class='add'>+		goto bad_inode;</div><div class='add'>+	}</div><div class='ctx'> 	inode-&gt;i_blocks = ext4_inode_blocks(raw_inode, ei);</div><div class='ctx'> 	ei-&gt;i_file_acl = le32_to_cpu(raw_inode-&gt;i_file_acl_lo);</div><div class='ctx'> 	if (ext4_has_feature_64bit(sb))</div><div class='ctx'> 		ei-&gt;i_file_acl |=</div><div class='ctx'> 			((__u64)le16_to_cpu(raw_inode-&gt;i_file_acl_high)) &lt;&lt; 32;</div><div class='ctx'> 	inode-&gt;i_size = ext4_isize(sb, raw_inode);</div><div class='del'>-	if ((size = i_size_read(inode)) &lt; 0) {</div><div class='add'>+	size = i_size_read(inode);</div><div class='add'>+	if (size &lt; 0 || size &gt; ext4_get_maxbytes(inode)) {</div><div class='ctx'> 		ext4_error_inode(inode, function, line, 0,</div><div class='ctx'> 				 "iget: bad i_size value: %lld", size);</div><div class='ctx'> 		ret = -EFSCORRUPTED;</div><div class='hunk'>@@ -4846,7 +5328,8 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	 * we'd normally treat htree data as empty space. But with metadata</div><div class='ctx'> 	 * checksumming that corrupts checksums so forbid that.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ext4_has_feature_dir_index(sb) &amp;&amp; ext4_has_metadata_csum(sb) &amp;&amp;</div><div class='add'>+	if (!ext4_has_feature_dir_index(sb) &amp;&amp;</div><div class='add'>+	    ext4_has_feature_metadata_csum(sb) &amp;&amp;</div><div class='ctx'> 	    ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) {</div><div class='ctx'> 		ext4_error_inode(inode, function, line, 0,</div><div class='ctx'> 			 "iget: Dir with htree data on filesystem without dir_index feature.");</div><div class='hunk'>@@ -4965,10 +5448,19 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 		if (IS_ENCRYPTED(inode)) {</div><div class='ctx'> 			inode-&gt;i_op = &amp;ext4_encrypted_symlink_inode_operations;</div><div class='ctx'> 		} else if (ext4_inode_is_fast_symlink(inode)) {</div><div class='del'>-			inode-&gt;i_link = (char *)ei-&gt;i_data;</div><div class='ctx'> 			inode-&gt;i_op = &amp;ext4_fast_symlink_inode_operations;</div><div class='del'>-			nd_terminate_link(ei-&gt;i_data, inode-&gt;i_size,</div><div class='del'>-				sizeof(ei-&gt;i_data) - 1);</div><div class='add'>+			if (inode-&gt;i_size == 0 ||</div><div class='add'>+			    inode-&gt;i_size &gt;= sizeof(ei-&gt;i_data) ||</div><div class='add'>+			    strnlen((char *)ei-&gt;i_data, inode-&gt;i_size + 1) !=</div><div class='add'>+								inode-&gt;i_size) {</div><div class='add'>+				ext4_error_inode(inode, function, line, 0,</div><div class='add'>+					"invalid fast symlink length %llu",</div><div class='add'>+					 (unsigned long long)inode-&gt;i_size);</div><div class='add'>+				ret = -EFSCORRUPTED;</div><div class='add'>+				goto bad_inode;</div><div class='add'>+			}</div><div class='add'>+			inode_set_cached_link(inode, (char *)ei-&gt;i_data,</div><div class='add'>+					      inode-&gt;i_size);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			inode-&gt;i_op = &amp;ext4_symlink_inode_operations;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4995,13 +5487,26 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 		ret = -EFSCORRUPTED;</div><div class='ctx'> 		goto bad_inode;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err_str = check_igot_inode(inode, flags)) != NULL) {</div><div class='del'>-		ext4_error_inode(inode, function, line, 0, err_str);</div><div class='del'>-		ret = -EFSCORRUPTED;</div><div class='del'>-		goto bad_inode;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	ext4_set_inode_mapping_order(inode);</div><div class='add'>+</div><div class='add'>+	ret = check_igot_inode(inode, flags, function, line);</div><div class='add'>+	/*</div><div class='add'>+	 * -ESTALE here means there is nothing inherently wrong with the inode,</div><div class='add'>+	 * it's just not an inode we can return for an fhandle lookup.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == -ESTALE) {</div><div class='add'>+		brelse(iloc.bh);</div><div class='add'>+		unlock_new_inode(inode);</div><div class='add'>+		iput(inode);</div><div class='add'>+		return ERR_PTR(-ESTALE);</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto bad_inode;</div><div class='ctx'> 	brelse(iloc.bh);</div><div class='add'>+	/* Initialize the "no ACL's" state for the simple cases */</div><div class='add'>+	if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) &amp;&amp; !ei-&gt;i_file_acl)</div><div class='add'>+		cache_no_acl(inode);</div><div class='ctx'> 	unlock_new_inode(inode);</div><div class='ctx'> 	return inode;</div><div class='ctx'> </div><div class='hunk'>@@ -5029,7 +5534,7 @@ static void __ext4_update_other_inode_time(struct super_block *sb,</div><div class='ctx'> 	if (inode_is_dirtytime_only(inode)) {</div><div class='ctx'> 		struct ext4_inode_info	*ei = EXT4_I(inode);</div><div class='ctx'> </div><div class='del'>-		inode-&gt;i_state &amp;= ~I_DIRTY_TIME;</div><div class='add'>+		inode_state_clear(inode, I_DIRTY_TIME);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;ei-&gt;i_raw_lock);</div><div class='hunk'>@@ -5186,8 +5691,9 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	if (WARN_ON_ONCE(current-&gt;flags &amp; PF_MEMALLOC))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	err = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_SB(inode-&gt;i_sb)-&gt;s_journal) {</div><div class='ctx'> 		if (ext4_journal_current_handle()) {</div><div class='hunk'>@@ -5237,8 +5743,9 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned offset;</div><div class='ctx'> 	journal_t *journal = EXT4_SB(inode-&gt;i_sb)-&gt;s_journal;</div><div class='del'>-	tid_t commit_tid = 0;</div><div class='add'>+	tid_t commit_tid;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool has_transaction;</div><div class='ctx'> </div><div class='ctx'> 	offset = inode-&gt;i_size &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5263,12 +5770,14 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		if (ret != -EBUSY)</div><div class='ctx'> 			return;</div><div class='del'>-		commit_tid = 0;</div><div class='add'>+		has_transaction = false;</div><div class='ctx'> 		read_lock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-		if (journal-&gt;j_committing_transaction)</div><div class='add'>+		if (journal-&gt;j_committing_transaction) {</div><div class='ctx'> 			commit_tid = journal-&gt;j_committing_transaction-&gt;t_tid;</div><div class='add'>+			has_transaction = true;</div><div class='add'>+		}</div><div class='ctx'> 		read_unlock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-		if (commit_tid)</div><div class='add'>+		if (has_transaction)</div><div class='ctx'> 			jbd2_log_wait_commit(journal, commit_tid);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -5306,8 +5815,9 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	const unsigned int ia_valid = attr-&gt;ia_valid;</div><div class='ctx'> 	bool inc_ivers = true;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	error = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(error))</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(IS_IMMUTABLE(inode)))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -5414,6 +5924,14 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (attr-&gt;ia_size != inode-&gt;i_size) {</div><div class='add'>+			/* attach jbd2 jinode for EOF folio tail zeroing */</div><div class='add'>+			if (attr-&gt;ia_size &amp; (inode-&gt;i_sb-&gt;s_blocksize - 1) ||</div><div class='add'>+			    oldsize &amp; (inode-&gt;i_sb-&gt;s_blocksize - 1)) {</div><div class='add'>+				error = ext4_inode_attach_jinode(inode);</div><div class='add'>+				if (error)</div><div class='add'>+					goto out_mmap_sem;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			handle = ext4_journal_start(inode, EXT4_HT_INODE, 3);</div><div class='ctx'> 			if (IS_ERR(handle)) {</div><div class='ctx'> 				error = PTR_ERR(handle);</div><div class='hunk'>@@ -5424,12 +5942,17 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 				orphan = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 			/*</div><div class='del'>-			 * Update c/mtime on truncate up, ext4_truncate() will</div><div class='del'>-			 * update c/mtime in shrink case below</div><div class='add'>+			 * Update c/mtime and tail zero the EOF folio on</div><div class='add'>+			 * truncate up. ext4_truncate() handles the shrink case</div><div class='add'>+			 * below.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!shrink)</div><div class='add'>+			if (!shrink) {</div><div class='ctx'> 				inode_set_mtime_to_ts(inode,</div><div class='ctx'> 						      inode_set_ctime_current(inode));</div><div class='add'>+				if (oldsize &amp; (inode-&gt;i_sb-&gt;s_blocksize - 1))</div><div class='add'>+					ext4_block_truncate_page(handle,</div><div class='add'>+							inode-&gt;i_mapping, oldsize);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (shrink)</div><div class='ctx'> 				ext4_fc_track_range(handle, inode,</div><div class='hunk'>@@ -5447,9 +5970,7 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 			down_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='ctx'> 			old_disksize = EXT4_I(inode)-&gt;i_disksize;</div><div class='ctx'> 			EXT4_I(inode)-&gt;i_disksize = attr-&gt;ia_size;</div><div class='del'>-			rc = ext4_mark_inode_dirty(handle, inode);</div><div class='del'>-			if (!error)</div><div class='del'>-				error = rc;</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We have to update i_size under i_data_sem together</div><div class='ctx'> 			 * with i_disksize to avoid races with writeback code</div><div class='hunk'>@@ -5460,6 +5981,9 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 			else</div><div class='ctx'> 				EXT4_I(inode)-&gt;i_disksize = old_disksize;</div><div class='ctx'> 			up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+			rc = ext4_mark_inode_dirty(handle, inode);</div><div class='add'>+			if (!error)</div><div class='add'>+				error = rc;</div><div class='ctx'> 			ext4_journal_stop(handle);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				goto out_mmap_sem;</div><div class='hunk'>@@ -5566,6 +6090,18 @@ int ext4_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((request_mask &amp; STATX_WRITE_ATOMIC) &amp;&amp; S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='add'>+		unsigned int awu_min = 0, awu_max = 0;</div><div class='add'>+</div><div class='add'>+		if (ext4_inode_can_atomic_write(inode)) {</div><div class='add'>+			awu_min = sbi-&gt;s_awu_min;</div><div class='add'>+			awu_max = sbi-&gt;s_awu_max;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		generic_fill_statx_atomic_writes(stat, awu_min, awu_max, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	flags = ei-&gt;i_flags &amp; EXT4_FL_USER_VISIBLE;</div><div class='ctx'> 	if (flags &amp; EXT4_APPEND_FL)</div><div class='ctx'> 		stat-&gt;attributes |= STATX_ATTR_APPEND;</div><div class='hunk'>@@ -5644,8 +6180,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int lblocks,</div><div class='ctx'>  *</div><div class='ctx'>  * Also account for superblock, inode, quota and xattr blocks</div><div class='ctx'>  */</div><div class='del'>-static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,</div><div class='del'>-				  int pextents)</div><div class='add'>+int ext4_meta_trans_blocks(struct inode *inode, int lblocks, int pextents)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_group_t groups, ngroups = ext4_get_groups_count(inode-&gt;i_sb);</div><div class='ctx'> 	int gdpblocks;</div><div class='hunk'>@@ -5653,13 +6188,11 @@ static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * How many index blocks need to touch to map @lblocks logical blocks</div><div class='del'>-	 * to @pextents physical extents?</div><div class='add'>+	 * How many index and leaf blocks need to touch to map @lblocks</div><div class='add'>+	 * logical blocks to @pextents physical extents?</div><div class='ctx'> 	 */</div><div class='ctx'> 	idxblocks = ext4_index_trans_blocks(inode, lblocks, pextents);</div><div class='ctx'> </div><div class='del'>-	ret = idxblocks;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now let's see how many group bitmaps and group descriptors need</div><div class='ctx'> 	 * to account</div><div class='hunk'>@@ -5672,7 +6205,7 @@ static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,</div><div class='ctx'> 		gdpblocks = EXT4_SB(inode-&gt;i_sb)-&gt;s_gdb_count;</div><div class='ctx'> </div><div class='ctx'> 	/* bitmaps and block group descriptor blocks */</div><div class='del'>-	ret += groups + gdpblocks;</div><div class='add'>+	ret = idxblocks + groups + gdpblocks;</div><div class='ctx'> </div><div class='ctx'> 	/* Blocks for super block, inode, quota and xattr blocks */</div><div class='ctx'> 	ret += EXT4_META_TRANS_BLOCKS(inode-&gt;i_sb);</div><div class='hunk'>@@ -5681,25 +6214,19 @@ static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Calculate the total number of credits to reserve to fit</div><div class='del'>- * the modification of a single pages into a single transaction,</div><div class='del'>- * which may include multiple chunks of block allocations.</div><div class='del'>- *</div><div class='del'>- * This could be called via ext4_write_begin()</div><div class='del'>- *</div><div class='del'>- * We need to consider the worse case, when</div><div class='del'>- * one new block per extent.</div><div class='add'>+ * Calculate the journal credits for modifying the number of blocks</div><div class='add'>+ * in a single extent within one transaction. 'nrblocks' is used only</div><div class='add'>+ * for non-extent inodes. For extent type inodes, 'nrblocks' can be</div><div class='add'>+ * zero if the exact number of blocks is unknown.</div><div class='ctx'>  */</div><div class='del'>-int ext4_writepage_trans_blocks(struct inode *inode)</div><div class='add'>+int ext4_chunk_trans_extent(struct inode *inode, int nrblocks)</div><div class='ctx'> {</div><div class='del'>-	int bpp = ext4_journal_blocks_per_page(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ext4_meta_trans_blocks(inode, bpp, bpp);</div><div class='del'>-</div><div class='add'>+	ret = ext4_meta_trans_blocks(inode, nrblocks, 1);</div><div class='ctx'> 	/* Account for data blocks for journalled mode */</div><div class='ctx'> 	if (ext4_should_journal_data(inode))</div><div class='del'>-		ret += bpp;</div><div class='add'>+		ret += nrblocks;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5726,9 +6253,10 @@ int ext4_mark_iloc_dirty(handle_t *handle,</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb))) {</div><div class='add'>+	err = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(err)) {</div><div class='ctx'> 		put_bh(iloc-&gt;bh);</div><div class='del'>-		return -EIO;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	ext4_fc_track_inode(handle, inode);</div><div class='ctx'> </div><div class='hunk'>@@ -5752,8 +6280,9 @@ ext4_reserve_inode_write(handle_t *handle, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	err = ext4_emergency_state(inode-&gt;i_sb);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_get_inode_loc(inode, iloc);</div><div class='ctx'> 	if (!err) {</div><div class='hunk'>@@ -5764,6 +6293,7 @@ ext4_reserve_inode_write(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			brelse(iloc-&gt;bh);</div><div class='ctx'> 			iloc-&gt;bh = NULL;</div><div class='ctx'> 		}</div><div class='add'>+		ext4_fc_track_inode(handle, inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	ext4_std_error(inode-&gt;i_sb, err);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -6007,14 +6537,14 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)</div><div class='ctx'> 	 * dirty data which can be converted only after flushing the dirty</div><div class='ctx'> 	 * data (and journalled aops don't know how to handle these cases).</div><div class='ctx'> 	 */</div><div class='del'>-	if (val) {</div><div class='del'>-		filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='del'>-		err = filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='add'>+	err = filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='add'>+	/* Before switch the inode journalling mode evict all the page cache. */</div><div class='add'>+	truncate_pagecache(inode, 0);</div><div class='ctx'> </div><div class='ctx'> 	alloc_ctx = ext4_writepages_down_write(inode-&gt;i_sb);</div><div class='ctx'> 	jbd2_journal_lock_updates(journal);</div><div class='hunk'>@@ -6034,17 +6564,17 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			jbd2_journal_unlock_updates(journal);</div><div class='ctx'> 			ext4_writepages_up_write(inode-&gt;i_sb, alloc_ctx);</div><div class='add'>+			filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		ext4_clear_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);</div><div class='ctx'> 	}</div><div class='ctx'> 	ext4_set_aops(inode);</div><div class='add'>+	ext4_set_inode_mapping_order(inode);</div><div class='ctx'> </div><div class='ctx'> 	jbd2_journal_unlock_updates(journal);</div><div class='ctx'> 	ext4_writepages_up_write(inode-&gt;i_sb, alloc_ctx);</div><div class='del'>-</div><div class='del'>-	if (val)</div><div class='del'>-		filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='add'>+	filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='ctx'> 	/* Finally we can mark the inode as dirty. */</div><div class='ctx'> </div><div class='hunk'>@@ -6068,6 +6598,55 @@ static int ext4_bh_unmapped(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	return !buffer_mapped(bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext4_block_page_mkwrite(struct inode *inode, struct folio *folio,</div><div class='add'>+				   get_block_t get_block)</div><div class='add'>+{</div><div class='add'>+	handle_t *handle;</div><div class='add'>+	loff_t size;</div><div class='add'>+	unsigned long len;</div><div class='add'>+	int credits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	credits = ext4_chunk_trans_extent(inode,</div><div class='add'>+			ext4_journal_blocks_per_folio(inode));</div><div class='add'>+	handle = ext4_journal_start(inode, EXT4_HT_WRITE_PAGE, credits);</div><div class='add'>+	if (IS_ERR(handle))</div><div class='add'>+		return PTR_ERR(handle);</div><div class='add'>+</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	size = i_size_read(inode);</div><div class='add'>+	/* Page got truncated from under us? */</div><div class='add'>+	if (folio-&gt;mapping != inode-&gt;i_mapping || folio_pos(folio) &gt; size) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = folio_size(folio);</div><div class='add'>+	if (folio_pos(folio) + len &gt; size)</div><div class='add'>+		len = size - folio_pos(folio);</div><div class='add'>+</div><div class='add'>+	ret = ext4_block_write_begin(handle, folio, 0, len, get_block);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_error;</div><div class='add'>+</div><div class='add'>+	if (!ext4_should_journal_data(inode)) {</div><div class='add'>+		block_commit_write(folio, 0, len);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ext4_journal_folio_buffers(handle, folio, len);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_error;</div><div class='add'>+	}</div><div class='add'>+	ext4_journal_stop(handle);</div><div class='add'>+	folio_wait_stable(folio);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	ext4_journal_stop(handle);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> 	struct vm_area_struct *vma = vmf-&gt;vma;</div><div class='hunk'>@@ -6079,8 +6658,7 @@ vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	struct file *file = vma-&gt;vm_file;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	handle_t *handle;</div><div class='del'>-	get_block_t *get_block;</div><div class='add'>+	get_block_t *get_block = ext4_get_block;</div><div class='ctx'> 	int retries = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(IS_IMMUTABLE(inode)))</div><div class='hunk'>@@ -6148,46 +6726,11 @@ vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	/* OK, we need to fill the hole... */</div><div class='ctx'> 	if (ext4_should_dioread_nolock(inode))</div><div class='ctx'> 		get_block = ext4_get_block_unwritten;</div><div class='del'>-	else</div><div class='del'>-		get_block = ext4_get_block;</div><div class='ctx'> retry_alloc:</div><div class='del'>-	handle = ext4_journal_start(inode, EXT4_HT_WRITE_PAGE,</div><div class='del'>-				    ext4_writepage_trans_blocks(inode));</div><div class='del'>-	if (IS_ERR(handle)) {</div><div class='del'>-		ret = VM_FAULT_SIGBUS;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Data journalling can't use block_page_mkwrite() because it</div><div class='del'>-	 * will set_buffer_dirty() before do_journal_get_write_access()</div><div class='del'>-	 * thus might hit warning messages for dirty metadata buffers.</div><div class='del'>-	 */</div><div class='del'>-	if (!ext4_should_journal_data(inode)) {</div><div class='del'>-		err = block_page_mkwrite(vma, vmf, get_block);</div><div class='del'>-	} else {</div><div class='del'>-		folio_lock(folio);</div><div class='del'>-		size = i_size_read(inode);</div><div class='del'>-		/* Page got truncated from under us? */</div><div class='del'>-		if (folio-&gt;mapping != mapping || folio_pos(folio) &gt; size) {</div><div class='del'>-			ret = VM_FAULT_NOPAGE;</div><div class='del'>-			goto out_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len = folio_size(folio);</div><div class='del'>-		if (folio_pos(folio) + len &gt; size)</div><div class='del'>-			len = size - folio_pos(folio);</div><div class='del'>-</div><div class='del'>-		err = __block_write_begin(&amp;folio-&gt;page, 0, len, ext4_get_block);</div><div class='del'>-		if (!err) {</div><div class='del'>-			ret = VM_FAULT_SIGBUS;</div><div class='del'>-			if (ext4_journal_folio_buffers(handle, folio, len))</div><div class='del'>-				goto out_error;</div><div class='del'>-		} else {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ext4_journal_stop(handle);</div><div class='del'>-	if (err == -ENOSPC &amp;&amp; ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries))</div><div class='add'>+	/* Start journal and allocate blocks */</div><div class='add'>+	err = ext4_block_page_mkwrite(inode, folio, get_block);</div><div class='add'>+	if (err == -EAGAIN ||</div><div class='add'>+	    (err == -ENOSPC &amp;&amp; ext4_should_retry_alloc(inode-&gt;i_sb, &amp;retries)))</div><div class='ctx'> 		goto retry_alloc;</div><div class='ctx'> out_ret:</div><div class='ctx'> 	ret = vmf_fs_error(err);</div><div class='hunk'>@@ -6195,8 +6738,4 @@ out:</div><div class='ctx'> 	filemap_invalidate_unlock_shared(mapping);</div><div class='ctx'> 	sb_end_pagefault(inode-&gt;i_sb);</div><div class='ctx'> 	return ret;</div><div class='del'>-out_error:</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	ext4_journal_stop(handle);</div><div class='del'>-	goto out;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c<br/>index aa6be510eb8f..7ce0fc40aec2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/ioctl.c</a></div><div class='hunk'>@@ -27,14 +27,16 @@</div><div class='ctx'> #include "fsmap.h"</div><div class='ctx'> #include &lt;trace/events/ext4.h&gt;</div><div class='ctx'> </div><div class='del'>-typedef void ext4_update_sb_callback(struct ext4_super_block *es,</div><div class='del'>-				       const void *arg);</div><div class='add'>+typedef void ext4_update_sb_callback(struct ext4_sb_info *sbi,</div><div class='add'>+				     struct ext4_super_block *es,</div><div class='add'>+				     const void *arg);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Superblock modification callback function for changing file system</div><div class='ctx'>  * label</div><div class='ctx'>  */</div><div class='del'>-static void ext4_sb_setlabel(struct ext4_super_block *es, const void *arg)</div><div class='add'>+static void ext4_sb_setlabel(struct ext4_sb_info *sbi,</div><div class='add'>+			     struct ext4_super_block *es, const void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	/* Sanity check, this should never happen */</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(es-&gt;s_volume_name) &lt; EXT4_LABEL_MAX);</div><div class='hunk'>@@ -46,7 +48,8 @@ static void ext4_sb_setlabel(struct ext4_super_block *es, const void *arg)</div><div class='ctx'>  * Superblock modification callback function for changing file system</div><div class='ctx'>  * UUID.</div><div class='ctx'>  */</div><div class='del'>-static void ext4_sb_setuuid(struct ext4_super_block *es, const void *arg)</div><div class='add'>+static void ext4_sb_setuuid(struct ext4_sb_info *sbi,</div><div class='add'>+			    struct ext4_super_block *es, const void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(es-&gt;s_uuid, (__u8 *)arg, UUID_SIZE);</div><div class='ctx'> }</div><div class='hunk'>@@ -71,7 +74,7 @@ int ext4_update_primary_sb(struct super_block *sb, handle_t *handle,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	lock_buffer(bh);</div><div class='del'>-	func(es, arg);</div><div class='add'>+	func(sbi, es, arg);</div><div class='ctx'> 	ext4_superblock_csum_set(sb);</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> </div><div class='hunk'>@@ -142,16 +145,16 @@ static int ext4_update_backup_sb(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	es = (struct ext4_super_block *) (bh-&gt;b_data + offset);</div><div class='ctx'> 	lock_buffer(bh);</div><div class='del'>-	if (ext4_has_metadata_csum(sb) &amp;&amp;</div><div class='del'>-	    es-&gt;s_checksum != ext4_superblock_csum(sb, es)) {</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb) &amp;&amp;</div><div class='add'>+	    es-&gt;s_checksum != ext4_superblock_csum(es)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "Invalid checksum for backup "</div><div class='ctx'> 		"superblock %llu", sb_block);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='ctx'> 		goto out_bh;</div><div class='ctx'> 	}</div><div class='del'>-	func(es, arg);</div><div class='del'>-	if (ext4_has_metadata_csum(sb))</div><div class='del'>-		es-&gt;s_checksum = ext4_superblock_csum(sb, es);</div><div class='add'>+	func(EXT4_SB(sb), es, arg);</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb))</div><div class='add'>+		es-&gt;s_checksum = ext4_superblock_csum(es);</div><div class='ctx'> 	set_buffer_uptodate(bh);</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> </div><div class='hunk'>@@ -351,11 +354,11 @@ void ext4_reset_inode_seed(struct inode *inode)</div><div class='ctx'> 	__le32 gen = cpu_to_le32(inode-&gt;i_generation);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)&amp;inum, sizeof(inum));</div><div class='del'>-	ei-&gt;i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&amp;gen, sizeof(gen));</div><div class='add'>+	csum = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)&amp;inum, sizeof(inum));</div><div class='add'>+	ei-&gt;i_csum_seed = ext4_chksum(csum, (__u8 *)&amp;gen, sizeof(gen));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -467,7 +470,7 @@ static long swap_inode_boot_loader(struct super_block *sb,</div><div class='ctx'> 	ext4_reset_inode_seed(inode);</div><div class='ctx'> 	ext4_reset_inode_seed(inode_bl);</div><div class='ctx'> </div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_mark_inode_dirty(handle, inode);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -980,7 +983,7 @@ group_add_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int ext4_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='hunk'>@@ -997,7 +1000,7 @@ int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext4_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	u32 flags = fa-&gt;flags;</div><div class='hunk'>@@ -1150,9 +1153,8 @@ static int ext4_ioctl_getlabel(struct ext4_sb_info *sbi, char __user *user_label</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUILD_BUG_ON(EXT4_LABEL_MAX &gt;= FSLABEL_MAX);</div><div class='ctx'> </div><div class='del'>-	memset(label, 0, sizeof(label));</div><div class='ctx'> 	lock_buffer(sbi-&gt;s_sbh);</div><div class='del'>-	strncpy(label, sbi-&gt;s_es-&gt;s_volume_name, EXT4_LABEL_MAX);</div><div class='add'>+	memtostr_pad(label, sbi-&gt;s_es-&gt;s_volume_name);</div><div class='ctx'> 	unlock_buffer(sbi-&gt;s_sbh);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(user_label, label, sizeof(label)))</div><div class='hunk'>@@ -1206,7 +1208,8 @@ static int ext4_ioctl_setuuid(struct file *filp,</div><div class='ctx'> 	 * If any checksums (group descriptors or metadata) are being used</div><div class='ctx'> 	 * then the checksum seed feature is required to change the UUID.</div><div class='ctx'> 	 */</div><div class='del'>-	if (((ext4_has_feature_gdt_csum(sb) || ext4_has_metadata_csum(sb))</div><div class='add'>+	if (((ext4_has_feature_gdt_csum(sb) ||</div><div class='add'>+	      ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 			&amp;&amp; !ext4_has_feature_csum_seed(sb))</div><div class='ctx'> 		|| ext4_has_feature_stable_inodes(sb))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1230,6 +1233,299 @@ static int ext4_ioctl_setuuid(struct file *filp,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#define TUNE_OPS_SUPPORTED (EXT4_TUNE_FL_ERRORS_BEHAVIOR |    \</div><div class='add'>+	EXT4_TUNE_FL_MNT_COUNT | EXT4_TUNE_FL_MAX_MNT_COUNT | \</div><div class='add'>+	EXT4_TUNE_FL_CHECKINTRVAL | EXT4_TUNE_FL_LAST_CHECK_TIME | \</div><div class='add'>+	EXT4_TUNE_FL_RESERVED_BLOCKS | EXT4_TUNE_FL_RESERVED_UID | \</div><div class='add'>+	EXT4_TUNE_FL_RESERVED_GID | EXT4_TUNE_FL_DEFAULT_MNT_OPTS | \</div><div class='add'>+	EXT4_TUNE_FL_DEF_HASH_ALG | EXT4_TUNE_FL_RAID_STRIDE | \</div><div class='add'>+	EXT4_TUNE_FL_RAID_STRIPE_WIDTH | EXT4_TUNE_FL_MOUNT_OPTS | \</div><div class='add'>+	EXT4_TUNE_FL_FEATURES | EXT4_TUNE_FL_EDIT_FEATURES | \</div><div class='add'>+	EXT4_TUNE_FL_FORCE_FSCK | EXT4_TUNE_FL_ENCODING | \</div><div class='add'>+	EXT4_TUNE_FL_ENCODING_FLAGS)</div><div class='add'>+</div><div class='add'>+#define EXT4_TUNE_SET_COMPAT_SUPP \</div><div class='add'>+		(EXT4_FEATURE_COMPAT_DIR_INDEX |	\</div><div class='add'>+		 EXT4_FEATURE_COMPAT_STABLE_INODES)</div><div class='add'>+#define EXT4_TUNE_SET_INCOMPAT_SUPP \</div><div class='add'>+		(EXT4_FEATURE_INCOMPAT_EXTENTS |	\</div><div class='add'>+		 EXT4_FEATURE_INCOMPAT_EA_INODE |	\</div><div class='add'>+		 EXT4_FEATURE_INCOMPAT_ENCRYPT |	\</div><div class='add'>+		 EXT4_FEATURE_INCOMPAT_CSUM_SEED |	\</div><div class='add'>+		 EXT4_FEATURE_INCOMPAT_LARGEDIR |	\</div><div class='add'>+		 EXT4_FEATURE_INCOMPAT_CASEFOLD)</div><div class='add'>+#define EXT4_TUNE_SET_RO_COMPAT_SUPP \</div><div class='add'>+		(EXT4_FEATURE_RO_COMPAT_LARGE_FILE |	\</div><div class='add'>+		 EXT4_FEATURE_RO_COMPAT_DIR_NLINK |	\</div><div class='add'>+		 EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE |	\</div><div class='add'>+		 EXT4_FEATURE_RO_COMPAT_PROJECT |	\</div><div class='add'>+		 EXT4_FEATURE_RO_COMPAT_VERITY)</div><div class='add'>+</div><div class='add'>+#define EXT4_TUNE_CLEAR_COMPAT_SUPP (0)</div><div class='add'>+#define EXT4_TUNE_CLEAR_INCOMPAT_SUPP (0)</div><div class='add'>+#define EXT4_TUNE_CLEAR_RO_COMPAT_SUPP (0)</div><div class='add'>+</div><div class='add'>+#define SB_ENC_SUPP_MASK (SB_ENC_STRICT_MODE_FL |	\</div><div class='add'>+			  SB_ENC_NO_COMPAT_FALLBACK_FL)</div><div class='add'>+</div><div class='add'>+static int ext4_ioctl_get_tune_sb(struct ext4_sb_info *sbi,</div><div class='add'>+				  struct ext4_tune_sb_params __user *params)</div><div class='add'>+{</div><div class='add'>+	struct ext4_tune_sb_params ret;</div><div class='add'>+	struct ext4_super_block *es = sbi-&gt;s_es;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ret, 0, sizeof(ret));</div><div class='add'>+	ret.set_flags = TUNE_OPS_SUPPORTED;</div><div class='add'>+	ret.errors_behavior = le16_to_cpu(es-&gt;s_errors);</div><div class='add'>+	ret.mnt_count = le16_to_cpu(es-&gt;s_mnt_count);</div><div class='add'>+	ret.max_mnt_count = le16_to_cpu(es-&gt;s_max_mnt_count);</div><div class='add'>+	ret.checkinterval = le32_to_cpu(es-&gt;s_checkinterval);</div><div class='add'>+	ret.last_check_time = le32_to_cpu(es-&gt;s_lastcheck);</div><div class='add'>+	ret.reserved_blocks = ext4_r_blocks_count(es);</div><div class='add'>+	ret.blocks_count = ext4_blocks_count(es);</div><div class='add'>+	ret.reserved_uid = ext4_get_resuid(es);</div><div class='add'>+	ret.reserved_gid = ext4_get_resgid(es);</div><div class='add'>+	ret.default_mnt_opts = le32_to_cpu(es-&gt;s_default_mount_opts);</div><div class='add'>+	ret.def_hash_alg = es-&gt;s_def_hash_version;</div><div class='add'>+	ret.raid_stride = le16_to_cpu(es-&gt;s_raid_stride);</div><div class='add'>+	ret.raid_stripe_width = le32_to_cpu(es-&gt;s_raid_stripe_width);</div><div class='add'>+	ret.encoding = le16_to_cpu(es-&gt;s_encoding);</div><div class='add'>+	ret.encoding_flags = le16_to_cpu(es-&gt;s_encoding_flags);</div><div class='add'>+	strscpy_pad(ret.mount_opts, es-&gt;s_mount_opts);</div><div class='add'>+	ret.feature_compat = le32_to_cpu(es-&gt;s_feature_compat);</div><div class='add'>+	ret.feature_incompat = le32_to_cpu(es-&gt;s_feature_incompat);</div><div class='add'>+	ret.feature_ro_compat = le32_to_cpu(es-&gt;s_feature_ro_compat);</div><div class='add'>+	ret.set_feature_compat_mask = EXT4_TUNE_SET_COMPAT_SUPP;</div><div class='add'>+	ret.set_feature_incompat_mask = EXT4_TUNE_SET_INCOMPAT_SUPP;</div><div class='add'>+	ret.set_feature_ro_compat_mask = EXT4_TUNE_SET_RO_COMPAT_SUPP;</div><div class='add'>+	ret.clear_feature_compat_mask = EXT4_TUNE_CLEAR_COMPAT_SUPP;</div><div class='add'>+	ret.clear_feature_incompat_mask = EXT4_TUNE_CLEAR_INCOMPAT_SUPP;</div><div class='add'>+	ret.clear_feature_ro_compat_mask = EXT4_TUNE_CLEAR_RO_COMPAT_SUPP;</div><div class='add'>+	if (copy_to_user(params, &amp;ret, sizeof(ret)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ext4_sb_setparams(struct ext4_sb_info *sbi,</div><div class='add'>+			      struct ext4_super_block *es, const void *arg)</div><div class='add'>+{</div><div class='add'>+	const struct ext4_tune_sb_params *params = arg;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_ERRORS_BEHAVIOR)</div><div class='add'>+		es-&gt;s_errors = cpu_to_le16(params-&gt;errors_behavior);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_MNT_COUNT)</div><div class='add'>+		es-&gt;s_mnt_count = cpu_to_le16(params-&gt;mnt_count);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_MAX_MNT_COUNT)</div><div class='add'>+		es-&gt;s_max_mnt_count = cpu_to_le16(params-&gt;max_mnt_count);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_CHECKINTRVAL)</div><div class='add'>+		es-&gt;s_checkinterval = cpu_to_le32(params-&gt;checkinterval);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_LAST_CHECK_TIME)</div><div class='add'>+		es-&gt;s_lastcheck = cpu_to_le32(params-&gt;last_check_time);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_RESERVED_BLOCKS) {</div><div class='add'>+		ext4_fsblk_t blk = params-&gt;reserved_blocks;</div><div class='add'>+</div><div class='add'>+		es-&gt;s_r_blocks_count_lo = cpu_to_le32((u32)blk);</div><div class='add'>+		es-&gt;s_r_blocks_count_hi = cpu_to_le32(blk &gt;&gt; 32);</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_RESERVED_UID) {</div><div class='add'>+		int uid = params-&gt;reserved_uid;</div><div class='add'>+</div><div class='add'>+		es-&gt;s_def_resuid = cpu_to_le16(uid &amp; 0xFFFF);</div><div class='add'>+		es-&gt;s_def_resuid_hi = cpu_to_le16(uid &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_RESERVED_GID) {</div><div class='add'>+		int gid = params-&gt;reserved_gid;</div><div class='add'>+</div><div class='add'>+		es-&gt;s_def_resgid = cpu_to_le16(gid &amp; 0xFFFF);</div><div class='add'>+		es-&gt;s_def_resgid_hi = cpu_to_le16(gid &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_DEFAULT_MNT_OPTS)</div><div class='add'>+		es-&gt;s_default_mount_opts = cpu_to_le32(params-&gt;default_mnt_opts);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_DEF_HASH_ALG)</div><div class='add'>+		es-&gt;s_def_hash_version = params-&gt;def_hash_alg;</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_RAID_STRIDE)</div><div class='add'>+		es-&gt;s_raid_stride = cpu_to_le16(params-&gt;raid_stride);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_RAID_STRIPE_WIDTH)</div><div class='add'>+		es-&gt;s_raid_stripe_width =</div><div class='add'>+			cpu_to_le32(params-&gt;raid_stripe_width);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_ENCODING)</div><div class='add'>+		es-&gt;s_encoding = cpu_to_le16(params-&gt;encoding);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_ENCODING_FLAGS)</div><div class='add'>+		es-&gt;s_encoding_flags = cpu_to_le16(params-&gt;encoding_flags);</div><div class='add'>+	strscpy_pad(es-&gt;s_mount_opts, params-&gt;mount_opts);</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_EDIT_FEATURES) {</div><div class='add'>+		es-&gt;s_feature_compat |=</div><div class='add'>+			cpu_to_le32(params-&gt;set_feature_compat_mask);</div><div class='add'>+		es-&gt;s_feature_incompat |=</div><div class='add'>+			cpu_to_le32(params-&gt;set_feature_incompat_mask);</div><div class='add'>+		es-&gt;s_feature_ro_compat |=</div><div class='add'>+			cpu_to_le32(params-&gt;set_feature_ro_compat_mask);</div><div class='add'>+		es-&gt;s_feature_compat &amp;=</div><div class='add'>+			~cpu_to_le32(params-&gt;clear_feature_compat_mask);</div><div class='add'>+		es-&gt;s_feature_incompat &amp;=</div><div class='add'>+			~cpu_to_le32(params-&gt;clear_feature_incompat_mask);</div><div class='add'>+		es-&gt;s_feature_ro_compat &amp;=</div><div class='add'>+			~cpu_to_le32(params-&gt;clear_feature_ro_compat_mask);</div><div class='add'>+		if (params-&gt;set_feature_compat_mask &amp;</div><div class='add'>+		    EXT4_FEATURE_COMPAT_DIR_INDEX)</div><div class='add'>+			es-&gt;s_def_hash_version = sbi-&gt;s_def_hash_version;</div><div class='add'>+		if (params-&gt;set_feature_incompat_mask &amp;</div><div class='add'>+		    EXT4_FEATURE_INCOMPAT_CSUM_SEED)</div><div class='add'>+			es-&gt;s_checksum_seed = cpu_to_le32(sbi-&gt;s_csum_seed);</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;set_flags &amp; EXT4_TUNE_FL_FORCE_FSCK)</div><div class='add'>+		es-&gt;s_state |= cpu_to_le16(EXT4_ERROR_FS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext4_ioctl_set_tune_sb(struct file *filp,</div><div class='add'>+				  struct ext4_tune_sb_params __user *in)</div><div class='add'>+{</div><div class='add'>+	struct ext4_tune_sb_params params;</div><div class='add'>+	struct super_block *sb = file_inode(filp)-&gt;i_sb;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	struct ext4_super_block *es = sbi-&gt;s_es;</div><div class='add'>+	int enabling_casefold = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;params, in, sizeof(params)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (strnlen(params.mount_opts, sizeof(params.mount_opts)) ==</div><div class='add'>+	    sizeof(params.mount_opts))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if ((params.set_flags &amp; ~TUNE_OPS_SUPPORTED) != 0)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if ((params.set_flags &amp; EXT4_TUNE_FL_ERRORS_BEHAVIOR) &amp;&amp;</div><div class='add'>+	    (params.errors_behavior &gt; EXT4_ERRORS_PANIC))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((params.set_flags &amp; EXT4_TUNE_FL_RESERVED_BLOCKS) &amp;&amp;</div><div class='add'>+	    (params.reserved_blocks &gt; ext4_blocks_count(sbi-&gt;s_es) / 2))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if ((params.set_flags &amp; EXT4_TUNE_FL_DEF_HASH_ALG) &amp;&amp;</div><div class='add'>+	    ((params.def_hash_alg &gt; DX_HASH_LAST) ||</div><div class='add'>+	     (params.def_hash_alg == DX_HASH_SIPHASH)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if ((params.set_flags &amp; EXT4_TUNE_FL_FEATURES) &amp;&amp;</div><div class='add'>+	    (params.set_flags &amp; EXT4_TUNE_FL_EDIT_FEATURES))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (params.set_flags &amp; EXT4_TUNE_FL_FEATURES) {</div><div class='add'>+		params.set_feature_compat_mask =</div><div class='add'>+			params.feature_compat &amp;</div><div class='add'>+			~le32_to_cpu(es-&gt;s_feature_compat);</div><div class='add'>+		params.set_feature_incompat_mask =</div><div class='add'>+			params.feature_incompat &amp;</div><div class='add'>+			~le32_to_cpu(es-&gt;s_feature_incompat);</div><div class='add'>+		params.set_feature_ro_compat_mask =</div><div class='add'>+			params.feature_ro_compat &amp;</div><div class='add'>+			~le32_to_cpu(es-&gt;s_feature_ro_compat);</div><div class='add'>+		params.clear_feature_compat_mask =</div><div class='add'>+			~params.feature_compat &amp;</div><div class='add'>+			le32_to_cpu(es-&gt;s_feature_compat);</div><div class='add'>+		params.clear_feature_incompat_mask =</div><div class='add'>+			~params.feature_incompat &amp;</div><div class='add'>+			le32_to_cpu(es-&gt;s_feature_incompat);</div><div class='add'>+		params.clear_feature_ro_compat_mask =</div><div class='add'>+			~params.feature_ro_compat &amp;</div><div class='add'>+			le32_to_cpu(es-&gt;s_feature_ro_compat);</div><div class='add'>+		params.set_flags |= EXT4_TUNE_FL_EDIT_FEATURES;</div><div class='add'>+	}</div><div class='add'>+	if (params.set_flags &amp; EXT4_TUNE_FL_EDIT_FEATURES) {</div><div class='add'>+		if ((params.set_feature_compat_mask &amp;</div><div class='add'>+		     ~EXT4_TUNE_SET_COMPAT_SUPP) ||</div><div class='add'>+		    (params.set_feature_incompat_mask &amp;</div><div class='add'>+		     ~EXT4_TUNE_SET_INCOMPAT_SUPP) ||</div><div class='add'>+		    (params.set_feature_ro_compat_mask &amp;</div><div class='add'>+		     ~EXT4_TUNE_SET_RO_COMPAT_SUPP) ||</div><div class='add'>+		    (params.clear_feature_compat_mask &amp;</div><div class='add'>+		     ~EXT4_TUNE_CLEAR_COMPAT_SUPP) ||</div><div class='add'>+		    (params.clear_feature_incompat_mask &amp;</div><div class='add'>+		     ~EXT4_TUNE_CLEAR_INCOMPAT_SUPP) ||</div><div class='add'>+		    (params.clear_feature_ro_compat_mask &amp;</div><div class='add'>+		     ~EXT4_TUNE_CLEAR_RO_COMPAT_SUPP))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Filter out the features that are already set from</div><div class='add'>+		 * the set_mask.</div><div class='add'>+		 */</div><div class='add'>+		params.set_feature_compat_mask &amp;=</div><div class='add'>+			~le32_to_cpu(es-&gt;s_feature_compat);</div><div class='add'>+		params.set_feature_incompat_mask &amp;=</div><div class='add'>+			~le32_to_cpu(es-&gt;s_feature_incompat);</div><div class='add'>+		params.set_feature_ro_compat_mask &amp;=</div><div class='add'>+			~le32_to_cpu(es-&gt;s_feature_ro_compat);</div><div class='add'>+		if ((params.set_feature_incompat_mask &amp;</div><div class='add'>+		     EXT4_FEATURE_INCOMPAT_CASEFOLD)) {</div><div class='add'>+			enabling_casefold = 1;</div><div class='add'>+			if (!(params.set_flags &amp; EXT4_TUNE_FL_ENCODING)) {</div><div class='add'>+				params.encoding = EXT4_ENC_UTF8_12_1;</div><div class='add'>+				params.set_flags |= EXT4_TUNE_FL_ENCODING;</div><div class='add'>+			}</div><div class='add'>+			if (!(params.set_flags &amp; EXT4_TUNE_FL_ENCODING_FLAGS)) {</div><div class='add'>+				params.encoding_flags = 0;</div><div class='add'>+				params.set_flags |= EXT4_TUNE_FL_ENCODING_FLAGS;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ((params.set_feature_compat_mask &amp;</div><div class='add'>+		     EXT4_FEATURE_COMPAT_DIR_INDEX)) {</div><div class='add'>+			uuid_t	uu;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;uu, sbi-&gt;s_hash_seed, UUID_SIZE);</div><div class='add'>+			if (uuid_is_null(&amp;uu))</div><div class='add'>+				generate_random_uuid((char *)</div><div class='add'>+						     &amp;sbi-&gt;s_hash_seed);</div><div class='add'>+			if (params.set_flags &amp; EXT4_TUNE_FL_DEF_HASH_ALG)</div><div class='add'>+				sbi-&gt;s_def_hash_version = params.def_hash_alg;</div><div class='add'>+			else if (sbi-&gt;s_def_hash_version == 0)</div><div class='add'>+				sbi-&gt;s_def_hash_version = DX_HASH_HALF_MD4;</div><div class='add'>+			if (!(es-&gt;s_flags &amp;</div><div class='add'>+			      cpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH)) &amp;&amp;</div><div class='add'>+			    !(es-&gt;s_flags &amp;</div><div class='add'>+			      cpu_to_le32(EXT2_FLAGS_SIGNED_HASH))) {</div><div class='add'>+#ifdef __CHAR_UNSIGNED__</div><div class='add'>+				sbi-&gt;s_hash_unsigned = 3;</div><div class='add'>+#else</div><div class='add'>+				sbi-&gt;s_hash_unsigned = 0;</div><div class='add'>+#endif</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (params.set_flags &amp; EXT4_TUNE_FL_ENCODING) {</div><div class='add'>+		if (!enabling_casefold)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (params.encoding == 0)</div><div class='add'>+			params.encoding = EXT4_ENC_UTF8_12_1;</div><div class='add'>+		else if (params.encoding != EXT4_ENC_UTF8_12_1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (params.set_flags &amp; EXT4_TUNE_FL_ENCODING_FLAGS) {</div><div class='add'>+		if (!enabling_casefold)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (params.encoding_flags &amp; ~SB_ENC_SUPP_MASK)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mnt_want_write_file(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ext4_update_superblocks_fn(sb, ext4_sb_setparams, &amp;params);</div><div class='add'>+	mnt_drop_write_file(filp);</div><div class='add'>+</div><div class='add'>+	if (params.set_flags &amp; EXT4_TUNE_FL_DEF_HASH_ALG)</div><div class='add'>+		sbi-&gt;s_def_hash_version = params.def_hash_alg;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='hunk'>@@ -1254,7 +1550,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		if (!inode_owner_or_capable(idmap, inode))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		if (ext4_has_metadata_csum(inode-&gt;i_sb)) {</div><div class='add'>+		if (ext4_has_feature_metadata_csum(inode-&gt;i_sb)) {</div><div class='ctx'> 			ext4_warning(sb, "Setting inode version is not "</div><div class='ctx'> 				     "supported with metadata_csum enabled.");</div><div class='ctx'> 			return -ENOTTY;</div><div class='hunk'>@@ -1331,7 +1627,6 @@ group_extend_out:</div><div class='ctx'> </div><div class='ctx'> 	case EXT4_IOC_MOVE_EXT: {</div><div class='ctx'> 		struct move_extent me;</div><div class='del'>-		struct fd donor;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='ctx'> 		if (!(filp-&gt;f_mode &amp; FMODE_READ) ||</div><div class='hunk'>@@ -1343,40 +1638,24 @@ group_extend_out:</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		me.moved_len = 0;</div><div class='ctx'> </div><div class='del'>-		donor = fdget(me.donor_fd);</div><div class='del'>-		if (!donor.file)</div><div class='add'>+		CLASS(fd, donor)(me.donor_fd);</div><div class='add'>+		if (fd_empty(donor))</div><div class='ctx'> 			return -EBADF;</div><div class='ctx'> </div><div class='del'>-		if (!(donor.file-&gt;f_mode &amp; FMODE_WRITE)) {</div><div class='del'>-			err = -EBADF;</div><div class='del'>-			goto mext_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ext4_has_feature_bigalloc(sb)) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR,</div><div class='del'>-				 "Online defrag not supported with bigalloc");</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			goto mext_out;</div><div class='del'>-		} else if (IS_DAX(inode)) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR,</div><div class='del'>-				 "Online defrag not supported with DAX");</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			goto mext_out;</div><div class='del'>-		}</div><div class='add'>+		if (!(fd_file(donor)-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+			return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 		err = mnt_want_write_file(filp);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto mext_out;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		err = ext4_move_extents(filp, donor.file, me.orig_start,</div><div class='add'>+		err = ext4_move_extents(filp, fd_file(donor), me.orig_start,</div><div class='ctx'> 					me.donor_start, me.len, &amp;me.moved_len);</div><div class='ctx'> 		mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='ctx'> 		if (copy_to_user((struct move_extent __user *)arg,</div><div class='ctx'> 				 &amp;me, sizeof(me)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='del'>-mext_out:</div><div class='del'>-		fdput(donor);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1512,8 +1791,14 @@ resizefs_out:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case EXT4_IOC_PRECACHE_EXTENTS:</div><div class='del'>-		return ext4_ext_precache(inode);</div><div class='add'>+	{</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='add'>+		inode_lock_shared(inode);</div><div class='add'>+		ret = ext4_ext_precache(inode);</div><div class='add'>+		inode_unlock_shared(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	case FS_IOC_SET_ENCRYPTION_POLICY:</div><div class='ctx'> 		if (!ext4_has_feature_encrypt(sb))</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='hunk'>@@ -1617,6 +1902,11 @@ resizefs_out:</div><div class='ctx'> 		return ext4_ioctl_getuuid(EXT4_SB(sb), (void __user *)arg);</div><div class='ctx'> 	case EXT4_IOC_SETFSUUID:</div><div class='ctx'> 		return ext4_ioctl_setuuid(filp, (const void __user *)arg);</div><div class='add'>+	case EXT4_IOC_GET_TUNE_SB_PARAM:</div><div class='add'>+		return ext4_ioctl_get_tune_sb(EXT4_SB(sb),</div><div class='add'>+					      (void __user *)arg);</div><div class='add'>+	case EXT4_IOC_SET_TUNE_SB_PARAM:</div><div class='add'>+		return ext4_ioctl_set_tune_sb(filp, (void __user *)arg);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1704,7 +1994,8 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void set_overhead(struct ext4_super_block *es, const void *arg)</div><div class='add'>+static void set_overhead(struct ext4_sb_info *sbi,</div><div class='add'>+			 struct ext4_super_block *es, const void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	es-&gt;s_overhead_clusters = cpu_to_le32(*((unsigned long *) arg));</div><div class='ctx'> }</div><div class='hunk'>@@ -1713,7 +2004,7 @@ int ext4_update_overhead(struct super_block *sb, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(sb))</div><div class='add'>+	if (ext4_emergency_state(sb) || sb_rdonly(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (!force &amp;&amp;</div><div class='ctx'> 	    (sbi-&gt;s_overhead == 0 ||</div><div class='head'>diff --git a/fs/ext4/mballoc-test.c b/fs/ext4/mballoc-test.c<br/>index f94901fd3835..a9416b20ff64 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/mballoc-test.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mballoc-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/mballoc-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/mballoc-test.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;kunit/test.h&gt;</div><div class='ctx'> #include &lt;kunit/static_stub.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ext4.h"</div><div class='ctx'> </div><div class='hunk'>@@ -20,41 +21,160 @@ struct mbt_ctx {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mbt_ext4_super_block {</div><div class='del'>-	struct super_block sb;</div><div class='add'>+	struct ext4_super_block es;</div><div class='add'>+	struct ext4_sb_info sbi;</div><div class='ctx'> 	struct mbt_ctx mbt_ctx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MBT_CTX(_sb) (&amp;(container_of((_sb), struct mbt_ext4_super_block, sb)-&gt;mbt_ctx))</div><div class='add'>+#define MBT_SB(_sb) (container_of((_sb)-&gt;s_fs_info, struct mbt_ext4_super_block, sbi))</div><div class='add'>+#define MBT_CTX(_sb) (&amp;MBT_SB(_sb)-&gt;mbt_ctx)</div><div class='ctx'> #define MBT_GRP_CTX(_sb, _group) (&amp;MBT_CTX(_sb)-&gt;grp_ctx[_group])</div><div class='ctx'> </div><div class='add'>+static struct inode *mbt_alloc_inode(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct ext4_inode_info *ei;</div><div class='add'>+</div><div class='add'>+	ei = kmalloc(sizeof(struct ext4_inode_info), GFP_KERNEL);</div><div class='add'>+	if (!ei)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ei-&gt;i_orphan);</div><div class='add'>+	init_rwsem(&amp;ei-&gt;xattr_sem);</div><div class='add'>+	init_rwsem(&amp;ei-&gt;i_data_sem);</div><div class='add'>+	inode_init_once(&amp;ei-&gt;vfs_inode);</div><div class='add'>+	ext4_fc_init_inode(&amp;ei-&gt;vfs_inode);</div><div class='add'>+</div><div class='add'>+	return &amp;ei-&gt;vfs_inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mbt_free_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	kfree(EXT4_I(inode));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct super_operations mbt_sops = {</div><div class='add'>+	.alloc_inode	= mbt_alloc_inode,</div><div class='add'>+	.free_inode	= mbt_free_inode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mbt_kill_sb(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	generic_shutdown_super(sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type mbt_fs_type = {</div><div class='add'>+	.name			= "mballoc test",</div><div class='add'>+	.kill_sb		= mbt_kill_sb,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mbt_mb_init(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	ext4_fsblk_t block;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* needed by ext4_mb_init-&gt;bdev_nonrot(sb-&gt;s_bdev) */</div><div class='add'>+	sb-&gt;s_bdev = kzalloc(sizeof(*sb-&gt;s_bdev), GFP_KERNEL);</div><div class='add'>+	if (sb-&gt;s_bdev == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_bdev-&gt;bd_queue = kzalloc(sizeof(struct request_queue), GFP_KERNEL);</div><div class='add'>+	if (sb-&gt;s_bdev-&gt;bd_queue == NULL) {</div><div class='add'>+		kfree(sb-&gt;s_bdev);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * needed by ext4_mb_init-&gt;ext4_mb_init_backend-&gt; sbi-&gt;s_buddy_cache =</div><div class='add'>+	 * new_inode(sb);</div><div class='add'>+	 */</div><div class='add'>+	INIT_LIST_HEAD(&amp;sb-&gt;s_inodes);</div><div class='add'>+	sb-&gt;s_op = &amp;mbt_sops;</div><div class='add'>+</div><div class='add'>+	ret = ext4_mb_init(sb);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	block = ext4_count_free_clusters(sb);</div><div class='add'>+	ret = percpu_counter_init(&amp;EXT4_SB(sb)-&gt;s_freeclusters_counter, block,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto err_mb_release;</div><div class='add'>+</div><div class='add'>+	ret = percpu_counter_init(&amp;EXT4_SB(sb)-&gt;s_dirtyclusters_counter, 0,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto err_freeclusters;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_freeclusters:</div><div class='add'>+	percpu_counter_destroy(&amp;EXT4_SB(sb)-&gt;s_freeclusters_counter);</div><div class='add'>+err_mb_release:</div><div class='add'>+	ext4_mb_release(sb);</div><div class='add'>+err_out:</div><div class='add'>+	kfree(sb-&gt;s_bdev-&gt;bd_queue);</div><div class='add'>+	kfree(sb-&gt;s_bdev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mbt_mb_release(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	percpu_counter_destroy(&amp;EXT4_SB(sb)-&gt;s_dirtyclusters_counter);</div><div class='add'>+	percpu_counter_destroy(&amp;EXT4_SB(sb)-&gt;s_freeclusters_counter);</div><div class='add'>+	ext4_mb_release(sb);</div><div class='add'>+	kfree(sb-&gt;s_bdev-&gt;bd_queue);</div><div class='add'>+	kfree(sb-&gt;s_bdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbt_set(struct super_block *sb, void *data)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct super_block *mbt_ext4_alloc_super_block(void)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_super_block *es = kzalloc(sizeof(*es), GFP_KERNEL);</div><div class='del'>-	struct ext4_sb_info *sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='del'>-	struct mbt_ext4_super_block *fsb = kzalloc(sizeof(*fsb), GFP_KERNEL);</div><div class='add'>+	struct mbt_ext4_super_block *fsb;</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+	struct ext4_sb_info *sbi;</div><div class='add'>+</div><div class='add'>+	fsb = kzalloc(sizeof(*fsb), GFP_KERNEL);</div><div class='add'>+	if (fsb == NULL)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (fsb == NULL || sbi == NULL || es == NULL)</div><div class='add'>+	sb = sget(&amp;mbt_fs_type, NULL, mbt_set, 0, NULL);</div><div class='add'>+	if (IS_ERR(sb))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_es = es;</div><div class='del'>-	fsb-&gt;sb.s_fs_info = sbi;</div><div class='del'>-	return &amp;fsb-&gt;sb;</div><div class='add'>+	sbi = &amp;fsb-&gt;sbi;</div><div class='add'>+</div><div class='add'>+	sbi-&gt;s_blockgroup_lock =</div><div class='add'>+		kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);</div><div class='add'>+	if (!sbi-&gt;s_blockgroup_lock)</div><div class='add'>+		goto out_deactivate;</div><div class='add'>+</div><div class='add'>+	bgl_lock_init(sbi-&gt;s_blockgroup_lock);</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;s_es = &amp;fsb-&gt;es;</div><div class='add'>+	sbi-&gt;s_sb = sb;</div><div class='add'>+	sb-&gt;s_fs_info = sbi;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;sb-&gt;s_umount);</div><div class='add'>+	return sb;</div><div class='add'>+</div><div class='add'>+out_deactivate:</div><div class='add'>+	deactivate_locked_super(sb);</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(fsb);</div><div class='del'>-	kfree(sbi);</div><div class='del'>-	kfree(es);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mbt_ext4_free_super_block(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct mbt_ext4_super_block *fsb =</div><div class='del'>-		container_of(sb, struct mbt_ext4_super_block, sb);</div><div class='add'>+	struct mbt_ext4_super_block *fsb = MBT_SB(sb);</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	kfree(sbi-&gt;s_es);</div><div class='del'>-	kfree(sbi);</div><div class='add'>+	kfree(sbi-&gt;s_blockgroup_lock);</div><div class='add'>+	deactivate_super(sb);</div><div class='ctx'> 	kfree(fsb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -82,6 +202,9 @@ static void mbt_init_sb_layout(struct super_block *sb,</div><div class='ctx'> 	sbi-&gt;s_clusters_per_group = layout-&gt;blocks_per_group &gt;&gt;</div><div class='ctx'> 				    layout-&gt;cluster_bits;</div><div class='ctx'> 	sbi-&gt;s_desc_size = layout-&gt;desc_size;</div><div class='add'>+	sbi-&gt;s_desc_per_block_bits =</div><div class='add'>+		sb-&gt;s_blocksize_bits - (fls(layout-&gt;desc_size) - 1);</div><div class='add'>+	sbi-&gt;s_desc_per_block = 1 &lt;&lt; sbi-&gt;s_desc_per_block_bits;</div><div class='ctx'> </div><div class='ctx'> 	es-&gt;s_first_data_block = cpu_to_le32(0);</div><div class='ctx'> 	es-&gt;s_blocks_count_lo = cpu_to_le32(layout-&gt;blocks_per_group *</div><div class='hunk'>@@ -91,9 +214,13 @@ static void mbt_init_sb_layout(struct super_block *sb,</div><div class='ctx'> static int mbt_grp_ctx_init(struct super_block *sb,</div><div class='ctx'> 			    struct mbt_grp_ctx *grp_ctx)</div><div class='ctx'> {</div><div class='add'>+	ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+</div><div class='ctx'> 	grp_ctx-&gt;bitmap_bh.b_data = kzalloc(EXT4_BLOCK_SIZE(sb), GFP_KERNEL);</div><div class='ctx'> 	if (grp_ctx-&gt;bitmap_bh.b_data == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	mb_set_bits(grp_ctx-&gt;bitmap_bh.b_data, max, sb-&gt;s_blocksize * 8 - max);</div><div class='add'>+	ext4_free_group_clusters_set(sb, &amp;grp_ctx-&gt;desc, max);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -112,6 +239,13 @@ static void mbt_ctx_mark_used(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 	mb_set_bits(grp_ctx-&gt;bitmap_bh.b_data, start, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void *mbt_ctx_bitmap(struct super_block *sb, ext4_group_t group)</div><div class='add'>+{</div><div class='add'>+	struct mbt_grp_ctx *grp_ctx = MBT_GRP_CTX(sb, group);</div><div class='add'>+</div><div class='add'>+	return grp_ctx-&gt;bitmap_bh.b_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* called after mbt_init_sb_layout */</div><div class='ctx'> static int mbt_ctx_init(struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -133,6 +267,8 @@ static int mbt_ctx_init(struct super_block *sb)</div><div class='ctx'> 	 * block which will fail ext4_sb_block_valid check.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mb_set_bits(ctx-&gt;grp_ctx[0].bitmap_bh.b_data, 0, 1);</div><div class='add'>+	ext4_free_group_clusters_set(sb, &amp;ctx-&gt;grp_ctx[0].desc,</div><div class='add'>+				     EXT4_CLUSTERS_PER_GROUP(sb) - 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -167,6 +303,13 @@ static int ext4_wait_block_bitmap_stub(struct super_block *sb,</div><div class='ctx'> 				       ext4_group_t block_group,</div><div class='ctx'> 				       struct buffer_head *bh)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * real ext4_wait_block_bitmap will set these flags and</div><div class='add'>+	 * functions like ext4_mb_init_cache will verify the flags.</div><div class='add'>+	 */</div><div class='add'>+	set_buffer_uptodate(bh);</div><div class='add'>+	set_bitmap_uptodate(bh);</div><div class='add'>+	set_buffer_verified(bh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -232,6 +375,14 @@ static int mbt_kunit_init(struct kunit *test)</div><div class='ctx'> 	kunit_activate_static_stub(test,</div><div class='ctx'> 				   ext4_mb_mark_context,</div><div class='ctx'> 				   ext4_mb_mark_context_stub);</div><div class='add'>+</div><div class='add'>+	/* stub function will be called in mbt_mb_init-&gt;ext4_mb_init */</div><div class='add'>+	if (mbt_mb_init(sb) != 0) {</div><div class='add'>+		mbt_ctx_release(sb);</div><div class='add'>+		mbt_ext4_free_super_block(sb);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -239,6 +390,7 @@ static void mbt_kunit_exit(struct kunit *test)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	mbt_mb_release(sb);</div><div class='ctx'> 	mbt_ctx_release(sb);</div><div class='ctx'> 	mbt_ext4_free_super_block(sb);</div><div class='ctx'> }</div><div class='hunk'>@@ -246,14 +398,19 @@ static void mbt_kunit_exit(struct kunit *test)</div><div class='ctx'> static void test_new_blocks_simple(struct kunit *test)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='del'>-	struct inode inode = { .i_sb = sb, };</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	struct ext4_allocation_request ar;</div><div class='ctx'> 	ext4_group_t i, goal_group = TEST_GOAL_GROUP;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	ext4_fsblk_t found;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	ar.inode = &amp;inode;</div><div class='add'>+	inode = kunit_kzalloc(test, sizeof(*inode), GFP_KERNEL);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_sb = sb;</div><div class='add'>+	ar.inode = inode;</div><div class='ctx'> </div><div class='ctx'> 	/* get block at goal */</div><div class='ctx'> 	ar.goal = ext4_group_first_block_no(sb, goal_group);</div><div class='hunk'>@@ -297,6 +454,492 @@ static void test_new_blocks_simple(struct kunit *test)</div><div class='ctx'> 		"unexpectedly get block when no block is available");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define TEST_RANGE_COUNT 8</div><div class='add'>+</div><div class='add'>+struct test_range {</div><div class='add'>+	ext4_grpblk_t start;</div><div class='add'>+	ext4_grpblk_t len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mbt_generate_test_ranges(struct super_block *sb, struct test_range *ranges,</div><div class='add'>+			 int count)</div><div class='add'>+{</div><div class='add'>+	ext4_grpblk_t start, len, max;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	max = EXT4_CLUSTERS_PER_GROUP(sb) / count;</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		start = get_random_u32() % max;</div><div class='add'>+		len = get_random_u32() % max;</div><div class='add'>+		len = min(len, max - start);</div><div class='add'>+</div><div class='add'>+		ranges[i].start = start + i * max;</div><div class='add'>+		ranges[i].len = len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+validate_free_blocks_simple(struct kunit *test, struct super_block *sb,</div><div class='add'>+			    ext4_group_t goal_group, ext4_grpblk_t start,</div><div class='add'>+			    ext4_grpblk_t len)</div><div class='add'>+{</div><div class='add'>+	void *bitmap;</div><div class='add'>+	ext4_grpblk_t bit, max = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	ext4_group_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ext4_get_groups_count(sb); i++) {</div><div class='add'>+		if (i == goal_group)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bitmap = mbt_ctx_bitmap(sb, i);</div><div class='add'>+		bit = mb_find_next_zero_bit(bitmap, max, 0);</div><div class='add'>+		KUNIT_ASSERT_EQ_MSG(test, bit, max,</div><div class='add'>+				    "free block on unexpected group %d", i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bitmap = mbt_ctx_bitmap(sb, goal_group);</div><div class='add'>+	bit = mb_find_next_zero_bit(bitmap, max, 0);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, bit, start);</div><div class='add'>+</div><div class='add'>+	bit = mb_find_next_bit(bitmap, max, bit + 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, bit, start + len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+test_free_blocks_simple_range(struct kunit *test, ext4_group_t goal_group,</div><div class='add'>+			      ext4_grpblk_t start, ext4_grpblk_t len)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	ext4_fsblk_t block;</div><div class='add'>+</div><div class='add'>+	inode = kunit_kzalloc(test, sizeof(*inode), GFP_KERNEL);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+	inode-&gt;i_sb = sb;</div><div class='add'>+</div><div class='add'>+	if (len == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	block = ext4_group_first_block_no(sb, goal_group) +</div><div class='add'>+		EXT4_C2B(sbi, start);</div><div class='add'>+	ext4_free_blocks_simple(inode, block, len);</div><div class='add'>+	validate_free_blocks_simple(test, sb, goal_group, start, len);</div><div class='add'>+	mbt_ctx_mark_used(sb, goal_group, 0, EXT4_CLUSTERS_PER_GROUP(sb));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_free_blocks_simple(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	ext4_group_t i;</div><div class='add'>+	struct test_range ranges[TEST_RANGE_COUNT];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ext4_get_groups_count(sb); i++)</div><div class='add'>+		mbt_ctx_mark_used(sb, i, 0, max);</div><div class='add'>+</div><div class='add'>+	mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);</div><div class='add'>+	for (i = 0; i &lt; TEST_RANGE_COUNT; i++)</div><div class='add'>+		test_free_blocks_simple_range(test, TEST_GOAL_GROUP,</div><div class='add'>+			ranges[i].start, ranges[i].len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+test_mark_diskspace_used_range(struct kunit *test,</div><div class='add'>+			       struct ext4_allocation_context *ac,</div><div class='add'>+			       ext4_grpblk_t start,</div><div class='add'>+			       ext4_grpblk_t len)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+	void *bitmap;</div><div class='add'>+	ext4_grpblk_t i, max;</div><div class='add'>+</div><div class='add'>+	/* ext4_mb_mark_diskspace_used will BUG if len is 0 */</div><div class='add'>+	if (len == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ac-&gt;ac_b_ex.fe_group = TEST_GOAL_GROUP;</div><div class='add'>+	ac-&gt;ac_b_ex.fe_start = start;</div><div class='add'>+	ac-&gt;ac_b_ex.fe_len = len;</div><div class='add'>+</div><div class='add'>+	bitmap = mbt_ctx_bitmap(sb, TEST_GOAL_GROUP);</div><div class='add'>+	memset(bitmap, 0, sb-&gt;s_blocksize);</div><div class='add'>+	ret = ext4_mb_mark_diskspace_used(ac, NULL, 0);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+</div><div class='add'>+	max = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	i = mb_find_next_bit(bitmap, max, 0);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, i, start);</div><div class='add'>+	i = mb_find_next_zero_bit(bitmap, max, i + 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, i, start + len);</div><div class='add'>+	i = mb_find_next_bit(bitmap, max, i + 1);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, max, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mark_diskspace_used(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct ext4_allocation_context ac;</div><div class='add'>+	struct test_range ranges[TEST_RANGE_COUNT];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);</div><div class='add'>+</div><div class='add'>+	inode = kunit_kzalloc(test, sizeof(*inode), GFP_KERNEL);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+	inode-&gt;i_sb = sb;</div><div class='add'>+</div><div class='add'>+	ac.ac_status = AC_STATUS_FOUND;</div><div class='add'>+	ac.ac_sb = sb;</div><div class='add'>+	ac.ac_inode = inode;</div><div class='add'>+	for (i = 0; i &lt; TEST_RANGE_COUNT; i++)</div><div class='add'>+		test_mark_diskspace_used_range(test, &amp;ac, ranges[i].start,</div><div class='add'>+					       ranges[i].len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mbt_generate_buddy(struct super_block *sb, void *buddy,</div><div class='add'>+			       void *bitmap, struct ext4_group_info *grp)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	uint32_t order, off;</div><div class='add'>+	void *bb, *bb_h;</div><div class='add'>+	int max;</div><div class='add'>+</div><div class='add'>+	memset(buddy, 0xff, sb-&gt;s_blocksize);</div><div class='add'>+	memset(grp, 0, offsetof(struct ext4_group_info,</div><div class='add'>+				 bb_counters[MB_NUM_ORDERS(sb)]));</div><div class='add'>+</div><div class='add'>+	bb = bitmap;</div><div class='add'>+	max = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	bb_h = buddy + sbi-&gt;s_mb_offsets[1];</div><div class='add'>+</div><div class='add'>+	off = mb_find_next_zero_bit(bb, max, 0);</div><div class='add'>+	grp-&gt;bb_first_free = off;</div><div class='add'>+	while (off &lt; max) {</div><div class='add'>+		grp-&gt;bb_counters[0]++;</div><div class='add'>+		grp-&gt;bb_free++;</div><div class='add'>+</div><div class='add'>+		if (!(off &amp; 1) &amp;&amp; !mb_test_bit(off + 1, bb)) {</div><div class='add'>+			grp-&gt;bb_free++;</div><div class='add'>+			grp-&gt;bb_counters[0]--;</div><div class='add'>+			mb_clear_bit(off &gt;&gt; 1, bb_h);</div><div class='add'>+			grp-&gt;bb_counters[1]++;</div><div class='add'>+			grp-&gt;bb_largest_free_order = 1;</div><div class='add'>+			off++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		off = mb_find_next_zero_bit(bb, max, off + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (order = 1; order &lt; MB_NUM_ORDERS(sb) - 1; order++) {</div><div class='add'>+		bb = buddy + sbi-&gt;s_mb_offsets[order];</div><div class='add'>+		bb_h = buddy + sbi-&gt;s_mb_offsets[order + 1];</div><div class='add'>+		max = max &gt;&gt; 1;</div><div class='add'>+		off = mb_find_next_zero_bit(bb, max, 0);</div><div class='add'>+</div><div class='add'>+		while (off &lt; max) {</div><div class='add'>+			if (!(off &amp; 1) &amp;&amp; !mb_test_bit(off + 1, bb)) {</div><div class='add'>+				mb_set_bits(bb, off, 2);</div><div class='add'>+				grp-&gt;bb_counters[order] -= 2;</div><div class='add'>+				mb_clear_bit(off &gt;&gt; 1, bb_h);</div><div class='add'>+				grp-&gt;bb_counters[order + 1]++;</div><div class='add'>+				grp-&gt;bb_largest_free_order = order + 1;</div><div class='add'>+				off++;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			off = mb_find_next_zero_bit(bb, max, off + 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	off = mb_find_next_zero_bit(bitmap, max, 0);</div><div class='add'>+	while (off &lt; max) {</div><div class='add'>+		grp-&gt;bb_fragments++;</div><div class='add'>+</div><div class='add'>+		off = mb_find_next_bit(bitmap, max, off + 1);</div><div class='add'>+		if (off + 1 &gt;= max)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		off = mb_find_next_zero_bit(bitmap, max, off + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mbt_validate_group_info(struct kunit *test, struct ext4_group_info *grp1,</div><div class='add'>+			struct ext4_group_info *grp2)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, grp1-&gt;bb_first_free,</div><div class='add'>+			grp2-&gt;bb_first_free);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, grp1-&gt;bb_fragments,</div><div class='add'>+			grp2-&gt;bb_fragments);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, grp1-&gt;bb_free, grp2-&gt;bb_free);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, grp1-&gt;bb_largest_free_order,</div><div class='add'>+			grp2-&gt;bb_largest_free_order);</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; MB_NUM_ORDERS(sb); i++) {</div><div class='add'>+		KUNIT_ASSERT_EQ_MSG(test, grp1-&gt;bb_counters[i],</div><div class='add'>+				    grp2-&gt;bb_counters[i],</div><div class='add'>+				    "bb_counters[%d] diffs, expected %d, generated %d",</div><div class='add'>+				    i, grp1-&gt;bb_counters[i],</div><div class='add'>+				    grp2-&gt;bb_counters[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+do_test_generate_buddy(struct kunit *test, struct super_block *sb, void *bitmap,</div><div class='add'>+			   void *mbt_buddy, struct ext4_group_info *mbt_grp,</div><div class='add'>+			   void *ext4_buddy, struct ext4_group_info *ext4_grp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mbt_generate_buddy(sb, mbt_buddy, bitmap, mbt_grp);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++)</div><div class='add'>+		ext4_grp-&gt;bb_counters[i] = 0;</div><div class='add'>+	/* needed by validation in ext4_mb_generate_buddy */</div><div class='add'>+	ext4_grp-&gt;bb_free = mbt_grp-&gt;bb_free;</div><div class='add'>+	memset(ext4_buddy, 0xff, sb-&gt;s_blocksize);</div><div class='add'>+	ext4_mb_generate_buddy(sb, ext4_buddy, bitmap, TEST_GOAL_GROUP,</div><div class='add'>+			       ext4_grp);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, memcmp(mbt_buddy, ext4_buddy, sb-&gt;s_blocksize),</div><div class='add'>+			0);</div><div class='add'>+	mbt_validate_group_info(test, mbt_grp, ext4_grp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mb_generate_buddy(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	void *bitmap, *expected_bb, *generate_bb;</div><div class='add'>+	struct ext4_group_info *expected_grp, *generate_grp;</div><div class='add'>+	struct test_range ranges[TEST_RANGE_COUNT];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bitmap = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bitmap);</div><div class='add'>+	expected_bb = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, expected_bb);</div><div class='add'>+	generate_bb = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, generate_bb);</div><div class='add'>+	expected_grp = kunit_kzalloc(test, offsetof(struct ext4_group_info,</div><div class='add'>+				bb_counters[MB_NUM_ORDERS(sb)]), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, expected_grp);</div><div class='add'>+	generate_grp = ext4_get_group_info(sb, TEST_GOAL_GROUP);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, generate_grp);</div><div class='add'>+</div><div class='add'>+	mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);</div><div class='add'>+	for (i = 0; i &lt; TEST_RANGE_COUNT; i++) {</div><div class='add'>+		mb_set_bits(bitmap, ranges[i].start, ranges[i].len);</div><div class='add'>+		do_test_generate_buddy(test, sb, bitmap, expected_bb,</div><div class='add'>+				       expected_grp, generate_bb, generate_grp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+test_mb_mark_used_range(struct kunit *test, struct ext4_buddy *e4b,</div><div class='add'>+			ext4_grpblk_t start, ext4_grpblk_t len, void *bitmap,</div><div class='add'>+			void *buddy, struct ext4_group_info *grp)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	struct ext4_free_extent ex;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* mb_mark_used only accepts non-zero len */</div><div class='add'>+	if (len == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ex.fe_start = start;</div><div class='add'>+	ex.fe_len = len;</div><div class='add'>+	ex.fe_group = TEST_GOAL_GROUP;</div><div class='add'>+</div><div class='add'>+	ext4_lock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+	mb_mark_used(e4b, &amp;ex);</div><div class='add'>+	ext4_unlock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+</div><div class='add'>+	mb_set_bits(bitmap, start, len);</div><div class='add'>+	/* bypass bb_free validatoin in ext4_mb_generate_buddy */</div><div class='add'>+	grp-&gt;bb_free -= len;</div><div class='add'>+	memset(buddy, 0xff, sb-&gt;s_blocksize);</div><div class='add'>+	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++)</div><div class='add'>+		grp-&gt;bb_counters[i] = 0;</div><div class='add'>+	ext4_mb_generate_buddy(sb, buddy, bitmap, 0, grp);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, memcmp(buddy, e4b-&gt;bd_buddy, sb-&gt;s_blocksize),</div><div class='add'>+			0);</div><div class='add'>+	mbt_validate_group_info(test, grp, e4b-&gt;bd_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mb_mark_used(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct ext4_buddy e4b;</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	void *bitmap, *buddy;</div><div class='add'>+	struct ext4_group_info *grp;</div><div class='add'>+	int ret;</div><div class='add'>+	struct test_range ranges[TEST_RANGE_COUNT];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* buddy cache assumes that each page contains at least one block */</div><div class='add'>+	if (sb-&gt;s_blocksize &gt; PAGE_SIZE)</div><div class='add'>+		kunit_skip(test, "blocksize exceeds pagesize");</div><div class='add'>+</div><div class='add'>+	bitmap = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bitmap);</div><div class='add'>+	buddy = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buddy);</div><div class='add'>+	grp = kunit_kzalloc(test, offsetof(struct ext4_group_info,</div><div class='add'>+				bb_counters[MB_NUM_ORDERS(sb)]), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, grp);</div><div class='add'>+</div><div class='add'>+	ret = ext4_mb_load_buddy(sb, TEST_GOAL_GROUP, &amp;e4b);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+</div><div class='add'>+	grp-&gt;bb_free = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	grp-&gt;bb_largest_free_order = -1;</div><div class='add'>+	grp-&gt;bb_avg_fragment_size_order = -1;</div><div class='add'>+	mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);</div><div class='add'>+	for (i = 0; i &lt; TEST_RANGE_COUNT; i++)</div><div class='add'>+		test_mb_mark_used_range(test, &amp;e4b, ranges[i].start,</div><div class='add'>+					ranges[i].len, bitmap, buddy, grp);</div><div class='add'>+</div><div class='add'>+	ext4_mb_unload_buddy(&amp;e4b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+test_mb_free_blocks_range(struct kunit *test, struct ext4_buddy *e4b,</div><div class='add'>+			  ext4_grpblk_t start, ext4_grpblk_t len, void *bitmap,</div><div class='add'>+			  void *buddy, struct ext4_group_info *grp)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* mb_free_blocks will WARN if len is 0 */</div><div class='add'>+	if (len == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ext4_lock_group(sb, e4b-&gt;bd_group);</div><div class='add'>+	mb_free_blocks(NULL, e4b, start, len);</div><div class='add'>+	ext4_unlock_group(sb, e4b-&gt;bd_group);</div><div class='add'>+</div><div class='add'>+	mb_clear_bits(bitmap, start, len);</div><div class='add'>+	/* bypass bb_free validatoin in ext4_mb_generate_buddy */</div><div class='add'>+	grp-&gt;bb_free += len;</div><div class='add'>+	memset(buddy, 0xff, sb-&gt;s_blocksize);</div><div class='add'>+	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++)</div><div class='add'>+		grp-&gt;bb_counters[i] = 0;</div><div class='add'>+	ext4_mb_generate_buddy(sb, buddy, bitmap, 0, grp);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, memcmp(buddy, e4b-&gt;bd_buddy, sb-&gt;s_blocksize),</div><div class='add'>+			0);</div><div class='add'>+	mbt_validate_group_info(test, grp, e4b-&gt;bd_info);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mb_free_blocks(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct ext4_buddy e4b;</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	void *bitmap, *buddy;</div><div class='add'>+	struct ext4_group_info *grp;</div><div class='add'>+	struct ext4_free_extent ex;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	struct test_range ranges[TEST_RANGE_COUNT];</div><div class='add'>+</div><div class='add'>+	/* buddy cache assumes that each page contains at least one block */</div><div class='add'>+	if (sb-&gt;s_blocksize &gt; PAGE_SIZE)</div><div class='add'>+		kunit_skip(test, "blocksize exceeds pagesize");</div><div class='add'>+</div><div class='add'>+	bitmap = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bitmap);</div><div class='add'>+	buddy = kunit_kzalloc(test, sb-&gt;s_blocksize, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buddy);</div><div class='add'>+	grp = kunit_kzalloc(test, offsetof(struct ext4_group_info,</div><div class='add'>+				bb_counters[MB_NUM_ORDERS(sb)]), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, grp);</div><div class='add'>+</div><div class='add'>+	ret = ext4_mb_load_buddy(sb, TEST_GOAL_GROUP, &amp;e4b);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+</div><div class='add'>+	ex.fe_start = 0;</div><div class='add'>+	ex.fe_len = EXT4_CLUSTERS_PER_GROUP(sb);</div><div class='add'>+	ex.fe_group = TEST_GOAL_GROUP;</div><div class='add'>+</div><div class='add'>+	ext4_lock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+	mb_mark_used(&amp;e4b, &amp;ex);</div><div class='add'>+	ext4_unlock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+</div><div class='add'>+	grp-&gt;bb_free = 0;</div><div class='add'>+	grp-&gt;bb_largest_free_order = -1;</div><div class='add'>+	grp-&gt;bb_avg_fragment_size_order = -1;</div><div class='add'>+	memset(bitmap, 0xff, sb-&gt;s_blocksize);</div><div class='add'>+</div><div class='add'>+	mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);</div><div class='add'>+	for (i = 0; i &lt; TEST_RANGE_COUNT; i++)</div><div class='add'>+		test_mb_free_blocks_range(test, &amp;e4b, ranges[i].start,</div><div class='add'>+					  ranges[i].len, bitmap, buddy, grp);</div><div class='add'>+</div><div class='add'>+	ext4_mb_unload_buddy(&amp;e4b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define COUNT_FOR_ESTIMATE 100000</div><div class='add'>+static void test_mb_mark_used_cost(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct ext4_buddy e4b;</div><div class='add'>+	struct super_block *sb = (struct super_block *)test-&gt;priv;</div><div class='add'>+	struct ext4_free_extent ex;</div><div class='add'>+	int ret;</div><div class='add'>+	struct test_range ranges[TEST_RANGE_COUNT];</div><div class='add'>+	int i, j;</div><div class='add'>+	unsigned long start, end, all = 0;</div><div class='add'>+</div><div class='add'>+	/* buddy cache assumes that each page contains at least one block */</div><div class='add'>+	if (sb-&gt;s_blocksize &gt; PAGE_SIZE)</div><div class='add'>+		kunit_skip(test, "blocksize exceeds pagesize");</div><div class='add'>+</div><div class='add'>+	ret = ext4_mb_load_buddy(sb, TEST_GOAL_GROUP, &amp;e4b);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, ret, 0);</div><div class='add'>+</div><div class='add'>+	ex.fe_group = TEST_GOAL_GROUP;</div><div class='add'>+	for (j = 0; j &lt; COUNT_FOR_ESTIMATE; j++) {</div><div class='add'>+		mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT);</div><div class='add'>+		start = jiffies;</div><div class='add'>+		for (i = 0; i &lt; TEST_RANGE_COUNT; i++) {</div><div class='add'>+			if (ranges[i].len == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ex.fe_start = ranges[i].start;</div><div class='add'>+			ex.fe_len = ranges[i].len;</div><div class='add'>+			ext4_lock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+			mb_mark_used(&amp;e4b, &amp;ex);</div><div class='add'>+			ext4_unlock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+		}</div><div class='add'>+		end = jiffies;</div><div class='add'>+		all += (end - start);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; TEST_RANGE_COUNT; i++) {</div><div class='add'>+			if (ranges[i].len == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ext4_lock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+			mb_free_blocks(NULL, &amp;e4b, ranges[i].start,</div><div class='add'>+				       ranges[i].len);</div><div class='add'>+			ext4_unlock_group(sb, TEST_GOAL_GROUP);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kunit_info(test, "costed jiffies %lu\n", all);</div><div class='add'>+	ext4_mb_unload_buddy(&amp;e4b);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct mbt_ext4_block_layout mbt_test_layouts[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.blocksize_bits = 10,</div><div class='hunk'>@@ -334,6 +977,13 @@ KUNIT_ARRAY_PARAM(mbt_layouts, mbt_test_layouts, mbt_show_layout);</div><div class='ctx'> </div><div class='ctx'> static struct kunit_case mbt_test_cases[] = {</div><div class='ctx'> 	KUNIT_CASE_PARAM(test_new_blocks_simple, mbt_layouts_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM(test_free_blocks_simple, mbt_layouts_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM(test_mb_generate_buddy, mbt_layouts_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM(test_mb_mark_used, mbt_layouts_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM(test_mb_free_blocks, mbt_layouts_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM(test_mark_diskspace_used, mbt_layouts_gen_params),</div><div class='add'>+	KUNIT_CASE_PARAM_ATTR(test_mb_mark_used_cost, mbt_layouts_gen_params,</div><div class='add'>+			      { .speed = KUNIT_SPEED_SLOW }),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c<br/>index f44f668e407f..56d50fd3310b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/mballoc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mballoc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/mballoc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/mballoc.c</a></div><div class='hunk'>@@ -98,14 +98,14 @@</div><div class='ctx'>  * block bitmap and buddy information. The information are stored in the</div><div class='ctx'>  * inode as:</div><div class='ctx'>  *</div><div class='del'>- *  {                        page                        }</div><div class='add'>+ *  {                        folio                        }</div><div class='ctx'>  *  [ group 0 bitmap][ group 0 buddy] [group 1][ group 1]...</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * one block each for bitmap and buddy information.  So for each group we</div><div class='del'>- * take up 2 blocks. A page can contain blocks_per_page (PAGE_SIZE /</div><div class='del'>- * blocksize) blocks.  So it can have information regarding groups_per_page</div><div class='del'>- * which is blocks_per_page/2</div><div class='add'>+ * take up 2 blocks. A folio can contain blocks_per_folio (folio_size /</div><div class='add'>+ * blocksize) blocks.  So it can have information regarding groups_per_folio</div><div class='add'>+ * which is blocks_per_folio/2</div><div class='ctx'>  *</div><div class='ctx'>  * The buddy cache inode is not stored on disk. The inode is thrown</div><div class='ctx'>  * away when the filesystem is unmounted.</div><div class='hunk'>@@ -132,25 +132,30 @@</div><div class='ctx'>  * If "mb_optimize_scan" mount option is set, we maintain in memory group info</div><div class='ctx'>  * structures in two data structures:</div><div class='ctx'>  *</div><div class='del'>- * 1) Array of largest free order lists (sbi-&gt;s_mb_largest_free_orders)</div><div class='add'>+ * 1) Array of largest free order xarrays (sbi-&gt;s_mb_largest_free_orders)</div><div class='ctx'>  *</div><div class='del'>- *    Locking: sbi-&gt;s_mb_largest_free_orders_locks(array of rw locks)</div><div class='add'>+ *    Locking: Writers use xa_lock, readers use rcu_read_lock.</div><div class='ctx'>  *</div><div class='del'>- *    This is an array of lists where the index in the array represents the</div><div class='add'>+ *    This is an array of xarrays where the index in the array represents the</div><div class='ctx'>  *    largest free order in the buddy bitmap of the participating group infos of</div><div class='del'>- *    that list. So, there are exactly MB_NUM_ORDERS(sb) (which means total</div><div class='del'>- *    number of buddy bitmap orders possible) number of lists. Group-infos are</div><div class='del'>- *    placed in appropriate lists.</div><div class='add'>+ *    that xarray. So, there are exactly MB_NUM_ORDERS(sb) (which means total</div><div class='add'>+ *    number of buddy bitmap orders possible) number of xarrays. Group-infos are</div><div class='add'>+ *    placed in appropriate xarrays.</div><div class='ctx'>  *</div><div class='del'>- * 2) Average fragment size lists (sbi-&gt;s_mb_avg_fragment_size)</div><div class='add'>+ * 2) Average fragment size xarrays (sbi-&gt;s_mb_avg_fragment_size)</div><div class='ctx'>  *</div><div class='del'>- *    Locking: sbi-&gt;s_mb_avg_fragment_size_locks(array of rw locks)</div><div class='add'>+ *    Locking: Writers use xa_lock, readers use rcu_read_lock.</div><div class='ctx'>  *</div><div class='del'>- *    This is an array of lists where in the i-th list there are groups with</div><div class='add'>+ *    This is an array of xarrays where in the i-th xarray there are groups with</div><div class='ctx'>  *    average fragment size &gt;= 2^i and &lt; 2^(i+1). The average fragment size</div><div class='ctx'>  *    is computed as ext4_group_info-&gt;bb_free / ext4_group_info-&gt;bb_fragments.</div><div class='del'>- *    Note that we don't bother with a special list for completely empty groups</div><div class='del'>- *    so we only have MB_NUM_ORDERS(sb) lists.</div><div class='add'>+ *    Note that we don't bother with a special xarray for completely empty</div><div class='add'>+ *    groups so we only have MB_NUM_ORDERS(sb) xarrays. Group-infos are placed</div><div class='add'>+ *    in appropriate xarrays.</div><div class='add'>+ *</div><div class='add'>+ * In xarray, the index is the block group number, the value is the block group</div><div class='add'>+ * information, and a non-empty value indicates the block group is present in</div><div class='add'>+ * the current xarray.</div><div class='ctx'>  *</div><div class='ctx'>  * When "mb_optimize_scan" mount option is set, mballoc consults the above data</div><div class='ctx'>  * structures to decide the order in which groups are to be traversed for</div><div class='hunk'>@@ -187,7 +192,7 @@</div><div class='ctx'>  * /sys/fs/ext4/&lt;partition&gt;/mb_min_to_scan</div><div class='ctx'>  * /sys/fs/ext4/&lt;partition&gt;/mb_max_to_scan</div><div class='ctx'>  * /sys/fs/ext4/&lt;partition&gt;/mb_order2_req</div><div class='del'>- * /sys/fs/ext4/&lt;partition&gt;/mb_linear_limit</div><div class='add'>+ * /sys/fs/ext4/&lt;partition&gt;/mb_max_linear_groups</div><div class='ctx'>  *</div><div class='ctx'>  * The regular allocator uses buddy scan only if the request len is power of</div><div class='ctx'>  * 2 blocks and the order of allocation is &gt;= sbi-&gt;s_mb_order2_reqs. The</div><div class='hunk'>@@ -209,7 +214,7 @@</div><div class='ctx'>  * get traversed linearly. That may result in subsequent allocations being not</div><div class='ctx'>  * close to each other. And so, the underlying device may get filled up in a</div><div class='ctx'>  * non-linear fashion. While that may not matter on non-rotational devices, for</div><div class='del'>- * rotational devices that may result in higher seek times. "mb_linear_limit"</div><div class='add'>+ * rotational devices that may result in higher seek times. "mb_max_linear_groups"</div><div class='ctx'>  * tells mballoc how many groups mballoc should search linearly before</div><div class='ctx'>  * performing consulting above data structures for more efficient lookups. For</div><div class='ctx'>  * non rotational devices, this value defaults to 0 and for rotational devices</div><div class='hunk'>@@ -420,8 +425,8 @@ static void ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap,</div><div class='ctx'> 					ext4_group_t group);</div><div class='ctx'> static void ext4_mb_new_preallocation(struct ext4_allocation_context *ac);</div><div class='ctx'> </div><div class='del'>-static bool ext4_mb_good_group(struct ext4_allocation_context *ac,</div><div class='del'>-			       ext4_group_t group, enum criteria cr);</div><div class='add'>+static int ext4_mb_scan_group(struct ext4_allocation_context *ac,</div><div class='add'>+			      ext4_group_t group);</div><div class='ctx'> </div><div class='ctx'> static int ext4_try_to_trim_range(struct super_block *sb,</div><div class='ctx'> 		struct ext4_buddy *e4b, ext4_grpblk_t start,</div><div class='hunk'>@@ -564,14 +569,14 @@ static void mb_free_blocks_double(struct inode *inode, struct ext4_buddy *e4b,</div><div class='ctx'> </div><div class='ctx'> 			blocknr = ext4_group_first_block_no(sb, e4b-&gt;bd_group);</div><div class='ctx'> 			blocknr += EXT4_C2B(EXT4_SB(sb), first + i);</div><div class='add'>+			ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='add'>+					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			ext4_grp_locked_error(sb, e4b-&gt;bd_group,</div><div class='ctx'> 					      inode ? inode-&gt;i_ino : 0,</div><div class='ctx'> 					      blocknr,</div><div class='ctx'> 					      "freeing block already freed "</div><div class='ctx'> 					      "(bit %u)",</div><div class='ctx'> 					      first + i);</div><div class='del'>-			ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='del'>-					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 		}</div><div class='ctx'> 		mb_clear_bit(first + i, e4b-&gt;bd_info-&gt;bb_bitmap);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -677,7 +682,25 @@ do {									\</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static int __mb_check_buddy(struct ext4_buddy *e4b, char *file,</div><div class='add'>+/*</div><div class='add'>+ * Perform buddy integrity check with the following steps:</div><div class='add'>+ *</div><div class='add'>+ * 1. Top-down validation (from highest order down to order 1, excluding order-0 bitmap):</div><div class='add'>+ *    For each pair of adjacent orders, if a higher-order bit is set (indicating a free block),</div><div class='add'>+ *    at most one of the two corresponding lower-order bits may be clear (free).</div><div class='add'>+ *</div><div class='add'>+ * 2. Order-0 (bitmap) validation, performed on bit pairs:</div><div class='add'>+ *    - If either bit in a pair is set (1, allocated), then all corresponding higher-order bits</div><div class='add'>+ *      must not be free (0).</div><div class='add'>+ *    - If both bits in a pair are clear (0, free), then exactly one of the corresponding</div><div class='add'>+ *      higher-order bits must be free (0).</div><div class='add'>+ *</div><div class='add'>+ * 3. Preallocation (pa) list validation:</div><div class='add'>+ *    For each preallocated block (pa) in the group:</div><div class='add'>+ *    - Verify that pa_pstart falls within the bounds of this block group.</div><div class='add'>+ *    - Ensure the corresponding bit(s) in the order-0 bitmap are marked as allocated (1).</div><div class='add'>+ */</div><div class='add'>+static void __mb_check_buddy(struct ext4_buddy *e4b, char *file,</div><div class='ctx'> 				const char *function, int line)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = e4b-&gt;bd_sb;</div><div class='hunk'>@@ -696,7 +719,7 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file,</div><div class='ctx'> 	void *buddy2;</div><div class='ctx'> </div><div class='ctx'> 	if (e4b-&gt;bd_info-&gt;bb_check_counter++ % 10)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	while (order &gt; 1) {</div><div class='ctx'> 		buddy = mb_find_buddy(e4b, order, &amp;max);</div><div class='hunk'>@@ -718,15 +741,6 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* both bits in buddy2 must be 1 */</div><div class='del'>-			MB_CHECK_ASSERT(mb_test_bit(i &lt;&lt; 1, buddy2));</div><div class='del'>-			MB_CHECK_ASSERT(mb_test_bit((i &lt;&lt; 1) + 1, buddy2));</div><div class='del'>-</div><div class='del'>-			for (j = 0; j &lt; (1 &lt;&lt; order); j++) {</div><div class='del'>-				k = (i * (1 &lt;&lt; order)) + j;</div><div class='del'>-				MB_CHECK_ASSERT(</div><div class='del'>-					!mb_test_bit(k, e4b-&gt;bd_bitmap));</div><div class='del'>-			}</div><div class='ctx'> 			count++;</div><div class='ctx'> 		}</div><div class='ctx'> 		MB_CHECK_ASSERT(e4b-&gt;bd_info-&gt;bb_counters[order] == count);</div><div class='hunk'>@@ -742,15 +756,21 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file,</div><div class='ctx'> 				fragments++;</div><div class='ctx'> 				fstart = i;</div><div class='ctx'> 			}</div><div class='del'>-			continue;</div><div class='add'>+		} else {</div><div class='add'>+			fstart = -1;</div><div class='ctx'> 		}</div><div class='del'>-		fstart = -1;</div><div class='del'>-		/* check used bits only */</div><div class='del'>-		for (j = 0; j &lt; e4b-&gt;bd_blkbits + 1; j++) {</div><div class='del'>-			buddy2 = mb_find_buddy(e4b, j, &amp;max2);</div><div class='del'>-			k = i &gt;&gt; j;</div><div class='del'>-			MB_CHECK_ASSERT(k &lt; max2);</div><div class='del'>-			MB_CHECK_ASSERT(mb_test_bit(k, buddy2));</div><div class='add'>+		if (!(i &amp; 1)) {</div><div class='add'>+			int in_use, zero_bit_count = 0;</div><div class='add'>+</div><div class='add'>+			in_use = mb_test_bit(i, buddy) || mb_test_bit(i + 1, buddy);</div><div class='add'>+			for (j = 1; j &lt; e4b-&gt;bd_blkbits + 2; j++) {</div><div class='add'>+				buddy2 = mb_find_buddy(e4b, j, &amp;max2);</div><div class='add'>+				k = i &gt;&gt; j;</div><div class='add'>+				MB_CHECK_ASSERT(k &lt; max2);</div><div class='add'>+				if (!mb_test_bit(k, buddy2))</div><div class='add'>+					zero_bit_count++;</div><div class='add'>+			}</div><div class='add'>+			MB_CHECK_ASSERT(zero_bit_count == !in_use);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	MB_CHECK_ASSERT(!EXT4_MB_GRP_NEED_INIT(e4b-&gt;bd_info));</div><div class='hunk'>@@ -758,17 +778,18 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file,</div><div class='ctx'> </div><div class='ctx'> 	grp = ext4_get_group_info(sb, e4b-&gt;bd_group);</div><div class='ctx'> 	if (!grp)</div><div class='del'>-		return NULL;</div><div class='add'>+		return;</div><div class='ctx'> 	list_for_each(cur, &amp;grp-&gt;bb_prealloc_list) {</div><div class='ctx'> 		ext4_group_t groupnr;</div><div class='ctx'> 		struct ext4_prealloc_space *pa;</div><div class='ctx'> 		pa = list_entry(cur, struct ext4_prealloc_space, pa_group_list);</div><div class='add'>+		if (!pa-&gt;pa_len)</div><div class='add'>+			continue;</div><div class='ctx'> 		ext4_get_group_no_and_offset(sb, pa-&gt;pa_pstart, &amp;groupnr, &amp;k);</div><div class='ctx'> 		MB_CHECK_ASSERT(groupnr == e4b-&gt;bd_group);</div><div class='ctx'> 		for (i = 0; i &lt; pa-&gt;pa_len; i++)</div><div class='ctx'> 			MB_CHECK_ASSERT(mb_test_bit(k + i, buddy));</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> #undef MB_CHECK_ASSERT</div><div class='ctx'> #define mb_check_buddy(e4b) __mb_check_buddy(e4b,	\</div><div class='hunk'>@@ -832,6 +853,8 @@ static int mb_avg_fragment_size_order(struct super_block *sb, ext4_grpblk_t len)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (order == MB_NUM_ORDERS(sb))</div><div class='ctx'> 		order--;</div><div class='add'>+	if (WARN_ON_ONCE(order &gt; MB_NUM_ORDERS(sb)))</div><div class='add'>+		order = MB_NUM_ORDERS(sb) - 1;</div><div class='ctx'> 	return order;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -840,132 +863,161 @@ static void</div><div class='ctx'> mb_update_avg_fragment_size(struct super_block *sb, struct ext4_group_info *grp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='del'>-	int new_order;</div><div class='add'>+	int new, old;</div><div class='ctx'> </div><div class='del'>-	if (!test_opt2(sb, MB_OPTIMIZE_SCAN) || grp-&gt;bb_free == 0)</div><div class='add'>+	if (!test_opt2(sb, MB_OPTIMIZE_SCAN))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	new_order = mb_avg_fragment_size_order(sb,</div><div class='del'>-					grp-&gt;bb_free / grp-&gt;bb_fragments);</div><div class='del'>-	if (new_order == grp-&gt;bb_avg_fragment_size_order)</div><div class='add'>+	old = grp-&gt;bb_avg_fragment_size_order;</div><div class='add'>+	new = grp-&gt;bb_fragments == 0 ? -1 :</div><div class='add'>+	      mb_avg_fragment_size_order(sb, grp-&gt;bb_free / grp-&gt;bb_fragments);</div><div class='add'>+	if (new == old)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (grp-&gt;bb_avg_fragment_size_order != -1) {</div><div class='del'>-		write_lock(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[</div><div class='del'>-					grp-&gt;bb_avg_fragment_size_order]);</div><div class='del'>-		list_del(&amp;grp-&gt;bb_avg_fragment_size_node);</div><div class='del'>-		write_unlock(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[</div><div class='del'>-					grp-&gt;bb_avg_fragment_size_order]);</div><div class='add'>+	if (old &gt;= 0)</div><div class='add'>+		xa_erase(&amp;sbi-&gt;s_mb_avg_fragment_size[old], grp-&gt;bb_group);</div><div class='add'>+</div><div class='add'>+	grp-&gt;bb_avg_fragment_size_order = new;</div><div class='add'>+	if (new &gt;= 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Cannot use __GFP_NOFAIL because we hold the group lock.</div><div class='add'>+		 * Although allocation for insertion may fails, it's not fatal</div><div class='add'>+		 * as we have linear traversal to fall back on.</div><div class='add'>+		 */</div><div class='add'>+		int err = xa_insert(&amp;sbi-&gt;s_mb_avg_fragment_size[new],</div><div class='add'>+				    grp-&gt;bb_group, grp, GFP_ATOMIC);</div><div class='add'>+		if (err)</div><div class='add'>+			mb_debug(sb, "insert group: %u to s_mb_avg_fragment_size[%d] failed, err %d",</div><div class='add'>+				 grp-&gt;bb_group, new, err);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext4_mb_scan_groups_xa_range(struct ext4_allocation_context *ac,</div><div class='add'>+					struct xarray *xa,</div><div class='add'>+					ext4_group_t start, ext4_group_t end)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = ac-&gt;ac_sb;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	enum criteria cr = ac-&gt;ac_criteria;</div><div class='add'>+	ext4_group_t ngroups = ext4_get_groups_count(sb);</div><div class='add'>+	unsigned long group = start;</div><div class='add'>+	struct ext4_group_info *grp;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(end &gt; ngroups || start &gt;= end))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	xa_for_each_range(xa, group, grp, start, end - 1) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (sbi-&gt;s_mb_stats)</div><div class='add'>+			atomic64_inc(&amp;sbi-&gt;s_bal_cX_groups_considered[cr]);</div><div class='add'>+</div><div class='add'>+		err = ext4_mb_scan_group(ac, grp-&gt;bb_group);</div><div class='add'>+		if (err || ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	grp-&gt;bb_avg_fragment_size_order = new_order;</div><div class='del'>-	write_lock(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[</div><div class='del'>-					grp-&gt;bb_avg_fragment_size_order]);</div><div class='del'>-	list_add_tail(&amp;grp-&gt;bb_avg_fragment_size_node,</div><div class='del'>-		&amp;sbi-&gt;s_mb_avg_fragment_size[grp-&gt;bb_avg_fragment_size_order]);</div><div class='del'>-	write_unlock(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[</div><div class='del'>-					grp-&gt;bb_avg_fragment_size_order]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find a suitable group of given order from the largest free orders xarray.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+ext4_mb_scan_groups_largest_free_order_range(struct ext4_allocation_context *ac,</div><div class='add'>+					     int order, ext4_group_t start,</div><div class='add'>+					     ext4_group_t end)</div><div class='add'>+{</div><div class='add'>+	struct xarray *xa = &amp;EXT4_SB(ac-&gt;ac_sb)-&gt;s_mb_largest_free_orders[order];</div><div class='add'>+</div><div class='add'>+	if (xa_empty(xa))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ext4_mb_scan_groups_xa_range(ac, xa, start, end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Choose next group by traversing largest_free_order lists. Updates *new_cr if</div><div class='ctx'>  * cr level needs an update.</div><div class='ctx'>  */</div><div class='del'>-static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context *ac,</div><div class='del'>-			enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups)</div><div class='add'>+static int ext4_mb_scan_groups_p2_aligned(struct ext4_allocation_context *ac,</div><div class='add'>+					  ext4_group_t group)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='del'>-	struct ext4_group_info *iter;</div><div class='ctx'> 	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	ext4_group_t start, end;</div><div class='ctx'> </div><div class='del'>-	if (ac-&gt;ac_status == AC_STATUS_FOUND)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (unlikely(sbi-&gt;s_mb_stats &amp;&amp; ac-&gt;ac_flags &amp; EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED))</div><div class='del'>-		atomic_inc(&amp;sbi-&gt;s_bal_p2_aligned_bad_suggestions);</div><div class='del'>-</div><div class='add'>+	start = group;</div><div class='add'>+	end = ext4_get_groups_count(ac-&gt;ac_sb);</div><div class='add'>+wrap_around:</div><div class='ctx'> 	for (i = ac-&gt;ac_2order; i &lt; MB_NUM_ORDERS(ac-&gt;ac_sb); i++) {</div><div class='del'>-		if (list_empty(&amp;sbi-&gt;s_mb_largest_free_orders[i]))</div><div class='del'>-			continue;</div><div class='del'>-		read_lock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[i]);</div><div class='del'>-		if (list_empty(&amp;sbi-&gt;s_mb_largest_free_orders[i])) {</div><div class='del'>-			read_unlock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[i]);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		list_for_each_entry(iter, &amp;sbi-&gt;s_mb_largest_free_orders[i],</div><div class='del'>-				    bb_largest_free_order_node) {</div><div class='del'>-			if (sbi-&gt;s_mb_stats)</div><div class='del'>-				atomic64_inc(&amp;sbi-&gt;s_bal_cX_groups_considered[CR_POWER2_ALIGNED]);</div><div class='del'>-			if (likely(ext4_mb_good_group(ac, iter-&gt;bb_group, CR_POWER2_ALIGNED))) {</div><div class='del'>-				*group = iter-&gt;bb_group;</div><div class='del'>-				ac-&gt;ac_flags |= EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED;</div><div class='del'>-				read_unlock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[i]);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		read_unlock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[i]);</div><div class='add'>+		ret = ext4_mb_scan_groups_largest_free_order_range(ac, i,</div><div class='add'>+								   start, end);</div><div class='add'>+		if (ret || ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	if (start) {</div><div class='add'>+		end = start;</div><div class='add'>+		start = 0;</div><div class='add'>+		goto wrap_around;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sbi-&gt;s_mb_stats)</div><div class='add'>+		atomic64_inc(&amp;sbi-&gt;s_bal_cX_failed[ac-&gt;ac_criteria]);</div><div class='add'>+</div><div class='ctx'> 	/* Increment cr and search again if no group is found */</div><div class='del'>-	*new_cr = CR_GOAL_LEN_FAST;</div><div class='add'>+	ac-&gt;ac_criteria = CR_GOAL_LEN_FAST;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Find a suitable group of given order from the average fragments list.</div><div class='add'>+ * Find a suitable group of given order from the average fragments xarray.</div><div class='ctx'>  */</div><div class='del'>-static struct ext4_group_info *</div><div class='del'>-ext4_mb_find_good_group_avg_frag_lists(struct ext4_allocation_context *ac, int order)</div><div class='add'>+static int</div><div class='add'>+ext4_mb_scan_groups_avg_frag_order_range(struct ext4_allocation_context *ac,</div><div class='add'>+					 int order, ext4_group_t start,</div><div class='add'>+					 ext4_group_t end)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='del'>-	struct list_head *frag_list = &amp;sbi-&gt;s_mb_avg_fragment_size[order];</div><div class='del'>-	rwlock_t *frag_list_lock = &amp;sbi-&gt;s_mb_avg_fragment_size_locks[order];</div><div class='del'>-	struct ext4_group_info *grp = NULL, *iter;</div><div class='del'>-	enum criteria cr = ac-&gt;ac_criteria;</div><div class='add'>+	struct xarray *xa = &amp;EXT4_SB(ac-&gt;ac_sb)-&gt;s_mb_avg_fragment_size[order];</div><div class='ctx'> </div><div class='del'>-	if (list_empty(frag_list))</div><div class='del'>-		return NULL;</div><div class='del'>-	read_lock(frag_list_lock);</div><div class='del'>-	if (list_empty(frag_list)) {</div><div class='del'>-		read_unlock(frag_list_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	list_for_each_entry(iter, frag_list, bb_avg_fragment_size_node) {</div><div class='del'>-		if (sbi-&gt;s_mb_stats)</div><div class='del'>-			atomic64_inc(&amp;sbi-&gt;s_bal_cX_groups_considered[cr]);</div><div class='del'>-		if (likely(ext4_mb_good_group(ac, iter-&gt;bb_group, cr))) {</div><div class='del'>-			grp = iter;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock(frag_list_lock);</div><div class='del'>-	return grp;</div><div class='add'>+	if (xa_empty(xa))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ext4_mb_scan_groups_xa_range(ac, xa, start, end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Choose next group by traversing average fragment size list of suitable</div><div class='ctx'>  * order. Updates *new_cr if cr level needs an update.</div><div class='ctx'>  */</div><div class='del'>-static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context *ac,</div><div class='del'>-		enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups)</div><div class='add'>+static int ext4_mb_scan_groups_goal_fast(struct ext4_allocation_context *ac,</div><div class='add'>+					 ext4_group_t group)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='del'>-	struct ext4_group_info *grp = NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (unlikely(ac-&gt;ac_flags &amp; EXT4_MB_CR_GOAL_LEN_FAST_OPTIMIZED)) {</div><div class='del'>-		if (sbi-&gt;s_mb_stats)</div><div class='del'>-			atomic_inc(&amp;sbi-&gt;s_bal_goal_fast_bad_suggestions);</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	ext4_group_t start, end;</div><div class='add'>+</div><div class='add'>+	start = group;</div><div class='add'>+	end = ext4_get_groups_count(ac-&gt;ac_sb);</div><div class='add'>+wrap_around:</div><div class='add'>+	i = mb_avg_fragment_size_order(ac-&gt;ac_sb, ac-&gt;ac_g_ex.fe_len);</div><div class='add'>+	for (; i &lt; MB_NUM_ORDERS(ac-&gt;ac_sb); i++) {</div><div class='add'>+		ret = ext4_mb_scan_groups_avg_frag_order_range(ac, i,</div><div class='add'>+							       start, end);</div><div class='add'>+		if (ret || ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	for (i = mb_avg_fragment_size_order(ac-&gt;ac_sb, ac-&gt;ac_g_ex.fe_len);</div><div class='del'>-	     i &lt; MB_NUM_ORDERS(ac-&gt;ac_sb); i++) {</div><div class='del'>-		grp = ext4_mb_find_good_group_avg_frag_lists(ac, i);</div><div class='del'>-		if (grp) {</div><div class='del'>-			*group = grp-&gt;bb_group;</div><div class='del'>-			ac-&gt;ac_flags |= EXT4_MB_CR_GOAL_LEN_FAST_OPTIMIZED;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (start) {</div><div class='add'>+		end = start;</div><div class='add'>+		start = 0;</div><div class='add'>+		goto wrap_around;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (sbi-&gt;s_mb_stats)</div><div class='add'>+		atomic64_inc(&amp;sbi-&gt;s_bal_cX_failed[ac-&gt;ac_criteria]);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CR_BEST_AVAIL_LEN works based on the concept that we have</div><div class='ctx'> 	 * a larger normalized goal len request which can be trimmed to</div><div class='hunk'>@@ -975,9 +1027,11 @@ static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context *</div><div class='ctx'> 	 * See function ext4_mb_normalize_request() (EXT4_MB_HINT_DATA).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ac-&gt;ac_flags &amp; EXT4_MB_HINT_DATA)</div><div class='del'>-		*new_cr = CR_BEST_AVAIL_LEN;</div><div class='add'>+		ac-&gt;ac_criteria = CR_BEST_AVAIL_LEN;</div><div class='ctx'> 	else</div><div class='del'>-		*new_cr = CR_GOAL_LEN_SLOW;</div><div class='add'>+		ac-&gt;ac_criteria = CR_GOAL_LEN_SLOW;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -989,18 +1043,14 @@ static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context *</div><div class='ctx'>  * preallocations. However, we make sure that we don't trim the request too</div><div class='ctx'>  * much and fall to CR_GOAL_LEN_SLOW in that case.</div><div class='ctx'>  */</div><div class='del'>-static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context *ac,</div><div class='del'>-		enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups)</div><div class='add'>+static int ext4_mb_scan_groups_best_avail(struct ext4_allocation_context *ac,</div><div class='add'>+					  ext4_group_t group)</div><div class='ctx'> {</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='del'>-	struct ext4_group_info *grp = NULL;</div><div class='ctx'> 	int i, order, min_order;</div><div class='ctx'> 	unsigned long num_stripe_clusters = 0;</div><div class='del'>-</div><div class='del'>-	if (unlikely(ac-&gt;ac_flags &amp; EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED)) {</div><div class='del'>-		if (sbi-&gt;s_mb_stats)</div><div class='del'>-			atomic_inc(&amp;sbi-&gt;s_bal_best_avail_bad_suggestions);</div><div class='del'>-	}</div><div class='add'>+	ext4_group_t start, end;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * mb_avg_fragment_size_order() returns order in a way that makes</div><div class='hunk'>@@ -1009,6 +1059,8 @@ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context</div><div class='ctx'> 	 * goal length.</div><div class='ctx'> 	 */</div><div class='ctx'> 	order = fls(ac-&gt;ac_g_ex.fe_len) - 1;</div><div class='add'>+	if (WARN_ON_ONCE(order - 1 &gt; MB_NUM_ORDERS(ac-&gt;ac_sb)))</div><div class='add'>+		order = MB_NUM_ORDERS(ac-&gt;ac_sb);</div><div class='ctx'> 	min_order = order - sbi-&gt;s_mb_best_avail_max_trim_order;</div><div class='ctx'> 	if (min_order &lt; 0)</div><div class='ctx'> 		min_order = 0;</div><div class='hunk'>@@ -1030,6 +1082,9 @@ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context</div><div class='ctx'> 	if (1 &lt;&lt; min_order &lt; ac-&gt;ac_o_ex.fe_len)</div><div class='ctx'> 		min_order = fls(ac-&gt;ac_o_ex.fe_len);</div><div class='ctx'> </div><div class='add'>+	start = group;</div><div class='add'>+	end = ext4_get_groups_count(ac-&gt;ac_sb);</div><div class='add'>+wrap_around:</div><div class='ctx'> 	for (i = order; i &gt;= min_order; i--) {</div><div class='ctx'> 		int frag_order;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1052,17 +1107,24 @@ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context</div><div class='ctx'> 		frag_order = mb_avg_fragment_size_order(ac-&gt;ac_sb,</div><div class='ctx'> 							ac-&gt;ac_g_ex.fe_len);</div><div class='ctx'> </div><div class='del'>-		grp = ext4_mb_find_good_group_avg_frag_lists(ac, frag_order);</div><div class='del'>-		if (grp) {</div><div class='del'>-			*group = grp-&gt;bb_group;</div><div class='del'>-			ac-&gt;ac_flags |= EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+		ret = ext4_mb_scan_groups_avg_frag_order_range(ac, frag_order,</div><div class='add'>+							       start, end);</div><div class='add'>+		if (ret || ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	if (start) {</div><div class='add'>+		end = start;</div><div class='add'>+		start = 0;</div><div class='add'>+		goto wrap_around;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset goal length to original goal length before falling into CR_GOAL_LEN_SLOW */</div><div class='ctx'> 	ac-&gt;ac_g_ex.fe_len = ac-&gt;ac_orig_goal_len;</div><div class='del'>-	*new_cr = CR_GOAL_LEN_SLOW;</div><div class='add'>+	if (sbi-&gt;s_mb_stats)</div><div class='add'>+		atomic64_inc(&amp;sbi-&gt;s_bal_cX_failed[ac-&gt;ac_criteria]);</div><div class='add'>+	ac-&gt;ac_criteria = CR_GOAL_LEN_SLOW;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int should_optimize_scan(struct ext4_allocation_context *ac)</div><div class='hunk'>@@ -1077,66 +1139,91 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Return next linear group for allocation. If linear traversal should not be</div><div class='del'>- * performed, this function just returns the same group</div><div class='add'>+ * next linear group for allocation.</div><div class='ctx'>  */</div><div class='del'>-static ext4_group_t</div><div class='del'>-next_linear_group(struct ext4_allocation_context *ac, ext4_group_t group,</div><div class='del'>-		  ext4_group_t ngroups)</div><div class='add'>+static void next_linear_group(ext4_group_t *group, ext4_group_t ngroups)</div><div class='ctx'> {</div><div class='del'>-	if (!should_optimize_scan(ac))</div><div class='del'>-		goto inc_and_return;</div><div class='del'>-</div><div class='del'>-	if (ac-&gt;ac_groups_linear_remaining) {</div><div class='del'>-		ac-&gt;ac_groups_linear_remaining--;</div><div class='del'>-		goto inc_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return group;</div><div class='del'>-inc_and_return:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Artificially restricted ngroups for non-extent</div><div class='ctx'> 	 * files makes group &gt; ngroups possible on first loop.</div><div class='ctx'> 	 */</div><div class='del'>-	return group + 1 &gt;= ngroups ? 0 : group + 1;</div><div class='add'>+	*group =  *group + 1 &gt;= ngroups ? 0 : *group + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * ext4_mb_choose_next_group: choose next group for allocation.</div><div class='del'>- *</div><div class='del'>- * @ac        Allocation Context</div><div class='del'>- * @new_cr    This is an output parameter. If the there is no good group</div><div class='del'>- *            available at current CR level, this field is updated to indicate</div><div class='del'>- *            the new cr level that should be used.</div><div class='del'>- * @group     This is an input / output parameter. As an input it indicates the</div><div class='del'>- *            next group that the allocator intends to use for allocation. As</div><div class='del'>- *            output, this field indicates the next group that should be used as</div><div class='del'>- *            determined by the optimization functions.</div><div class='del'>- * @ngroups   Total number of groups</div><div class='del'>- */</div><div class='del'>-static void ext4_mb_choose_next_group(struct ext4_allocation_context *ac,</div><div class='del'>-		enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups)</div><div class='add'>+static int ext4_mb_scan_groups_linear(struct ext4_allocation_context *ac,</div><div class='add'>+		ext4_group_t ngroups, ext4_group_t *start, ext4_group_t count)</div><div class='ctx'> {</div><div class='del'>-	*new_cr = ac-&gt;ac_criteria;</div><div class='add'>+	int ret, i;</div><div class='add'>+	enum criteria cr = ac-&gt;ac_criteria;</div><div class='add'>+	struct super_block *sb = ac-&gt;ac_sb;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	ext4_group_t group = *start;</div><div class='ctx'> </div><div class='del'>-	if (!should_optimize_scan(ac) || ac-&gt;ac_groups_linear_remaining) {</div><div class='del'>-		*group = next_linear_group(ac, *group, ngroups);</div><div class='del'>-		return;</div><div class='add'>+	for (i = 0; i &lt; count; i++, next_linear_group(&amp;group, ngroups)) {</div><div class='add'>+		ret = ext4_mb_scan_group(ac, group);</div><div class='add'>+		if (ret || ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+			return ret;</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (*new_cr == CR_POWER2_ALIGNED) {</div><div class='del'>-		ext4_mb_choose_next_group_p2_aligned(ac, new_cr, group, ngroups);</div><div class='del'>-	} else if (*new_cr == CR_GOAL_LEN_FAST) {</div><div class='del'>-		ext4_mb_choose_next_group_goal_fast(ac, new_cr, group, ngroups);</div><div class='del'>-	} else if (*new_cr == CR_BEST_AVAIL_LEN) {</div><div class='del'>-		ext4_mb_choose_next_group_best_avail(ac, new_cr, group, ngroups);</div><div class='del'>-	} else {</div><div class='add'>+	*start = group;</div><div class='add'>+	if (count == ngroups)</div><div class='add'>+		ac-&gt;ac_criteria++;</div><div class='add'>+</div><div class='add'>+	/* Processed all groups and haven't found blocks */</div><div class='add'>+	if (sbi-&gt;s_mb_stats &amp;&amp; i == ngroups)</div><div class='add'>+		atomic64_inc(&amp;sbi-&gt;s_bal_cX_failed[cr]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext4_mb_scan_groups(struct ext4_allocation_context *ac)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	ext4_group_t start;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='add'>+	ext4_group_t ngroups = ext4_get_groups_count(ac-&gt;ac_sb);</div><div class='add'>+</div><div class='add'>+	/* non-extent files are limited to low blocks/groups */</div><div class='add'>+	if (!(ext4_test_inode_flag(ac-&gt;ac_inode, EXT4_INODE_EXTENTS)))</div><div class='add'>+		ngroups = sbi-&gt;s_blockfile_groups;</div><div class='add'>+</div><div class='add'>+	/* searching for the right group start from the goal value specified */</div><div class='add'>+	start = ac-&gt;ac_g_ex.fe_group;</div><div class='add'>+	ac-&gt;ac_prefetch_grp = start;</div><div class='add'>+	ac-&gt;ac_prefetch_nr = 0;</div><div class='add'>+</div><div class='add'>+	if (!should_optimize_scan(ac))</div><div class='add'>+		return ext4_mb_scan_groups_linear(ac, ngroups, &amp;start, ngroups);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Optimized scanning can return non adjacent groups which can cause</div><div class='add'>+	 * seek overhead for rotational disks. So try few linear groups before</div><div class='add'>+	 * trying optimized scan.</div><div class='add'>+	 */</div><div class='add'>+	if (sbi-&gt;s_mb_max_linear_groups)</div><div class='add'>+		ret = ext4_mb_scan_groups_linear(ac, ngroups, &amp;start,</div><div class='add'>+						 sbi-&gt;s_mb_max_linear_groups);</div><div class='add'>+	if (ret || ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch (ac-&gt;ac_criteria) {</div><div class='add'>+	case CR_POWER2_ALIGNED:</div><div class='add'>+		return ext4_mb_scan_groups_p2_aligned(ac, start);</div><div class='add'>+	case CR_GOAL_LEN_FAST:</div><div class='add'>+		return ext4_mb_scan_groups_goal_fast(ac, start);</div><div class='add'>+	case CR_BEST_AVAIL_LEN:</div><div class='add'>+		return ext4_mb_scan_groups_best_avail(ac, start);</div><div class='add'>+	default:</div><div class='ctx'> 		/*</div><div class='del'>-		 * TODO: For CR=2, we can arrange groups in an rb tree sorted by</div><div class='del'>-		 * bb_free. But until that happens, we should never come here.</div><div class='add'>+		 * TODO: For CR_GOAL_LEN_SLOW, we can arrange groups in an</div><div class='add'>+		 * rb tree sorted by bb_free. But until that happens, we should</div><div class='add'>+		 * never come here.</div><div class='ctx'> 		 */</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1147,33 +1234,35 @@ static void</div><div class='ctx'> mb_set_largest_free_order(struct super_block *sb, struct ext4_group_info *grp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='del'>-	int i;</div><div class='add'>+	int new, old = grp-&gt;bb_largest_free_order;</div><div class='ctx'> </div><div class='del'>-	for (i = MB_NUM_ORDERS(sb) - 1; i &gt;= 0; i--)</div><div class='del'>-		if (grp-&gt;bb_counters[i] &gt; 0)</div><div class='add'>+	for (new = MB_NUM_ORDERS(sb) - 1; new &gt;= 0; new--)</div><div class='add'>+		if (grp-&gt;bb_counters[new] &gt; 0)</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 	/* No need to move between order lists? */</div><div class='del'>-	if (!test_opt2(sb, MB_OPTIMIZE_SCAN) ||</div><div class='del'>-	    i == grp-&gt;bb_largest_free_order) {</div><div class='del'>-		grp-&gt;bb_largest_free_order = i;</div><div class='add'>+	if (new == old)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (grp-&gt;bb_largest_free_order &gt;= 0) {</div><div class='del'>-		write_lock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[</div><div class='del'>-					      grp-&gt;bb_largest_free_order]);</div><div class='del'>-		list_del_init(&amp;grp-&gt;bb_largest_free_order_node);</div><div class='del'>-		write_unlock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[</div><div class='del'>-					      grp-&gt;bb_largest_free_order]);</div><div class='add'>+	if (old &gt;= 0) {</div><div class='add'>+		struct xarray *xa = &amp;sbi-&gt;s_mb_largest_free_orders[old];</div><div class='add'>+</div><div class='add'>+		if (!xa_empty(xa) &amp;&amp; xa_load(xa, grp-&gt;bb_group))</div><div class='add'>+			xa_erase(xa, grp-&gt;bb_group);</div><div class='ctx'> 	}</div><div class='del'>-	grp-&gt;bb_largest_free_order = i;</div><div class='del'>-	if (grp-&gt;bb_largest_free_order &gt;= 0 &amp;&amp; grp-&gt;bb_free) {</div><div class='del'>-		write_lock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[</div><div class='del'>-					      grp-&gt;bb_largest_free_order]);</div><div class='del'>-		list_add_tail(&amp;grp-&gt;bb_largest_free_order_node,</div><div class='del'>-		      &amp;sbi-&gt;s_mb_largest_free_orders[grp-&gt;bb_largest_free_order]);</div><div class='del'>-		write_unlock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[</div><div class='del'>-					      grp-&gt;bb_largest_free_order]);</div><div class='add'>+</div><div class='add'>+	grp-&gt;bb_largest_free_order = new;</div><div class='add'>+	if (test_opt2(sb, MB_OPTIMIZE_SCAN) &amp;&amp; new &gt;= 0 &amp;&amp; grp-&gt;bb_free) {</div><div class='add'>+		/*</div><div class='add'>+		 * Cannot use __GFP_NOFAIL because we hold the group lock.</div><div class='add'>+		 * Although allocation for insertion may fails, it's not fatal</div><div class='add'>+		 * as we have linear traversal to fall back on.</div><div class='add'>+		 */</div><div class='add'>+		int err = xa_insert(&amp;sbi-&gt;s_mb_largest_free_orders[new],</div><div class='add'>+				    grp-&gt;bb_group, grp, GFP_ATOMIC);</div><div class='add'>+		if (err)</div><div class='add'>+			mb_debug(sb, "insert group: %u to s_mb_largest_free_orders[%d] failed, err %d",</div><div class='add'>+				 grp-&gt;bb_group, new, err);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1233,32 +1322,49 @@ void ext4_mb_generate_buddy(struct super_block *sb,</div><div class='ctx'> 	atomic64_add(period, &amp;sbi-&gt;s_mb_generation_time);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mb_regenerate_buddy(struct ext4_buddy *e4b)</div><div class='add'>+{</div><div class='add'>+	int count;</div><div class='add'>+	int order = 1;</div><div class='add'>+	void *buddy;</div><div class='add'>+</div><div class='add'>+	while ((buddy = mb_find_buddy(e4b, order++, &amp;count)))</div><div class='add'>+		mb_set_bits(buddy, 0, count);</div><div class='add'>+</div><div class='add'>+	e4b-&gt;bd_info-&gt;bb_fragments = 0;</div><div class='add'>+	memset(e4b-&gt;bd_info-&gt;bb_counters, 0,</div><div class='add'>+		sizeof(*e4b-&gt;bd_info-&gt;bb_counters) *</div><div class='add'>+		(e4b-&gt;bd_sb-&gt;s_blocksize_bits + 2));</div><div class='add'>+</div><div class='add'>+	ext4_mb_generate_buddy(e4b-&gt;bd_sb, e4b-&gt;bd_buddy,</div><div class='add'>+		e4b-&gt;bd_bitmap, e4b-&gt;bd_group, e4b-&gt;bd_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The buddy information is attached the buddy cache inode</div><div class='ctx'>  * for convenience. The information regarding each group</div><div class='ctx'>  * is loaded via ext4_mb_load_buddy. The information involve</div><div class='ctx'>  * block bitmap and buddy information. The information are</div><div class='ctx'>  * stored in the inode as</div><div class='ctx'>  *</div><div class='del'>- * {                        page                        }</div><div class='add'>+ * {                        folio                        }</div><div class='ctx'>  * [ group 0 bitmap][ group 0 buddy] [group 1][ group 1]...</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * one block each for bitmap and buddy information.</div><div class='del'>- * So for each group we take up 2 blocks. A page can</div><div class='del'>- * contain blocks_per_page (PAGE_SIZE / blocksize)  blocks.</div><div class='del'>- * So it can have information regarding groups_per_page which</div><div class='del'>- * is blocks_per_page/2</div><div class='add'>+ * So for each group we take up 2 blocks. A folio can</div><div class='add'>+ * contain blocks_per_folio (folio_size / blocksize)  blocks.</div><div class='add'>+ * So it can have information regarding groups_per_folio which</div><div class='add'>+ * is blocks_per_folio/2</div><div class='ctx'>  *</div><div class='ctx'>  * Locking note:  This routine takes the block group lock of all groups</div><div class='del'>- * for this page; do not hold this lock when calling this routine!</div><div class='add'>+ * for this folio; do not hold this lock when calling this routine!</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='add'>+static int ext4_mb_init_cache(struct folio *folio, char *incore, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_group_t ngroups;</div><div class='ctx'> 	unsigned int blocksize;</div><div class='del'>-	int blocks_per_page;</div><div class='del'>-	int groups_per_page;</div><div class='add'>+	int blocks_per_folio;</div><div class='add'>+	int groups_per_folio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	ext4_group_t first_group, group;</div><div class='hunk'>@@ -1271,31 +1377,28 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 	char *bitmap;</div><div class='ctx'> 	struct ext4_group_info *grinfo;</div><div class='ctx'> </div><div class='del'>-	inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	sb = inode-&gt;i_sb;</div><div class='ctx'> 	ngroups = ext4_get_groups_count(sb);</div><div class='ctx'> 	blocksize = i_blocksize(inode);</div><div class='del'>-	blocks_per_page = PAGE_SIZE / blocksize;</div><div class='add'>+	blocks_per_folio = folio_size(folio) / blocksize;</div><div class='add'>+	WARN_ON_ONCE(!blocks_per_folio);</div><div class='add'>+	groups_per_folio = DIV_ROUND_UP(blocks_per_folio, 2);</div><div class='ctx'> </div><div class='del'>-	mb_debug(sb, "init page %lu\n", page-&gt;index);</div><div class='del'>-</div><div class='del'>-	groups_per_page = blocks_per_page &gt;&gt; 1;</div><div class='del'>-	if (groups_per_page == 0)</div><div class='del'>-		groups_per_page = 1;</div><div class='add'>+	mb_debug(sb, "init folio %lu\n", folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate buffer_heads to read bitmaps */</div><div class='del'>-	if (groups_per_page &gt; 1) {</div><div class='del'>-		i = sizeof(struct buffer_head *) * groups_per_page;</div><div class='add'>+	if (groups_per_folio &gt; 1) {</div><div class='add'>+		i = sizeof(struct buffer_head *) * groups_per_folio;</div><div class='ctx'> 		bh = kzalloc(i, gfp);</div><div class='ctx'> 		if (bh == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	} else</div><div class='ctx'> 		bh = &amp;bhs;</div><div class='ctx'> </div><div class='del'>-	first_group = page-&gt;index * blocks_per_page / 2;</div><div class='del'>-</div><div class='del'>-	/* read all groups the page covers into the cache */</div><div class='del'>-	for (i = 0, group = first_group; i &lt; groups_per_page; i++, group++) {</div><div class='add'>+	/* read all groups the folio covers into the cache */</div><div class='add'>+	first_group = EXT4_PG_TO_LBLK(inode, folio-&gt;index) / 2;</div><div class='add'>+	for (i = 0, group = first_group; i &lt; groups_per_folio; i++, group++) {</div><div class='ctx'> 		if (group &gt;= ngroups)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1303,12 +1406,13 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 		if (!grinfo)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/*</div><div class='del'>-		 * If page is uptodate then we came here after online resize</div><div class='add'>+		 * If folio is uptodate then we came here after online resize</div><div class='ctx'> 		 * which added some new uninitialized group info structs, so</div><div class='del'>-		 * we must skip all initialized uptodate buddies on the page,</div><div class='add'>+		 * we must skip all initialized uptodate buddies on the folio,</div><div class='ctx'> 		 * which may be currently in use by an allocating task.</div><div class='ctx'> 		 */</div><div class='del'>-		if (PageUptodate(page) &amp;&amp; !EXT4_MB_GRP_NEED_INIT(grinfo)) {</div><div class='add'>+		if (folio_test_uptodate(folio) &amp;&amp;</div><div class='add'>+				!EXT4_MB_GRP_NEED_INIT(grinfo)) {</div><div class='ctx'> 			bh[i] = NULL;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1322,7 +1426,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* wait for I/O completion */</div><div class='del'>-	for (i = 0, group = first_group; i &lt; groups_per_page; i++, group++) {</div><div class='add'>+	for (i = 0, group = first_group; i &lt; groups_per_folio; i++, group++) {</div><div class='ctx'> 		int err2;</div><div class='ctx'> </div><div class='ctx'> 		if (!bh[i])</div><div class='hunk'>@@ -1332,8 +1436,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 			err = err2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	first_block = page-&gt;index * blocks_per_page;</div><div class='del'>-	for (i = 0; i &lt; blocks_per_page; i++) {</div><div class='add'>+	first_block = EXT4_PG_TO_LBLK(inode, folio-&gt;index);</div><div class='add'>+	for (i = 0; i &lt; blocks_per_folio; i++) {</div><div class='ctx'> 		group = (first_block + i) &gt;&gt; 1;</div><div class='ctx'> 		if (group &gt;= ngroups)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1353,7 +1457,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 		 * above</div><div class='ctx'> 		 *</div><div class='ctx'> 		 */</div><div class='del'>-		data = page_address(page) + (i * blocksize);</div><div class='add'>+		data = folio_address(folio) + (i * blocksize);</div><div class='ctx'> 		bitmap = bh[group - first_group]-&gt;b_data;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1368,8 +1472,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 		if ((first_block + i) &amp; 1) {</div><div class='ctx'> 			/* this is block of buddy */</div><div class='ctx'> 			BUG_ON(incore == NULL);</div><div class='del'>-			mb_debug(sb, "put buddy for group %u in page %lu/%x\n",</div><div class='del'>-				group, page-&gt;index, i * blocksize);</div><div class='add'>+			mb_debug(sb, "put buddy for group %u in folio %lu/%x\n",</div><div class='add'>+				group, folio-&gt;index, i * blocksize);</div><div class='ctx'> 			trace_ext4_mb_buddy_bitmap_load(sb, group);</div><div class='ctx'> 			grinfo-&gt;bb_fragments = 0;</div><div class='ctx'> 			memset(grinfo-&gt;bb_counters, 0,</div><div class='hunk'>@@ -1387,8 +1491,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* this is block of bitmap */</div><div class='ctx'> 			BUG_ON(incore != NULL);</div><div class='del'>-			mb_debug(sb, "put bitmap for group %u in page %lu/%x\n",</div><div class='del'>-				group, page-&gt;index, i * blocksize);</div><div class='add'>+			mb_debug(sb, "put bitmap for group %u in folio %lu/%x\n",</div><div class='add'>+				group, folio-&gt;index, i * blocksize);</div><div class='ctx'> 			trace_ext4_mb_bitmap_load(sb, group);</div><div class='ctx'> </div><div class='ctx'> 			/* see comments in ext4_mb_put_pa() */</div><div class='hunk'>@@ -1406,11 +1510,11 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)</div><div class='ctx'> 			incore = data;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	SetPageUptodate(page);</div><div class='add'>+	folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (bh) {</div><div class='del'>-		for (i = 0; i &lt; groups_per_page; i++)</div><div class='add'>+		for (i = 0; i &lt; groups_per_folio; i++)</div><div class='ctx'> 			brelse(bh[i]);</div><div class='ctx'> 		if (bh != &amp;bhs)</div><div class='ctx'> 			kfree(bh);</div><div class='hunk'>@@ -1419,67 +1523,71 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Lock the buddy and bitmap pages. This make sure other parallel init_group</div><div class='del'>- * on the same buddy page doesn't happen whild holding the buddy page lock.</div><div class='del'>- * Return locked buddy and bitmap pages on e4b struct. If buddy and bitmap</div><div class='del'>- * are on the same page e4b-&gt;bd_buddy_page is NULL and return value is 0.</div><div class='add'>+ * Lock the buddy and bitmap folios. This makes sure other parallel init_group</div><div class='add'>+ * on the same buddy folio doesn't happen while holding the buddy folio lock.</div><div class='add'>+ * Return locked buddy and bitmap folios on e4b struct. If buddy and bitmap</div><div class='add'>+ * are on the same folio e4b-&gt;bd_buddy_folio is NULL and return value is 0.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_mb_get_buddy_page_lock(struct super_block *sb,</div><div class='add'>+static int ext4_mb_get_buddy_folio_lock(struct super_block *sb,</div><div class='ctx'> 		ext4_group_t group, struct ext4_buddy *e4b, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = EXT4_SB(sb)-&gt;s_buddy_cache;</div><div class='del'>-	int block, pnum, poff;</div><div class='del'>-	int blocks_per_page;</div><div class='del'>-	struct page *page;</div><div class='add'>+	int block, pnum;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='del'>-	e4b-&gt;bd_buddy_page = NULL;</div><div class='del'>-	e4b-&gt;bd_bitmap_page = NULL;</div><div class='add'>+	e4b-&gt;bd_buddy_folio = NULL;</div><div class='add'>+	e4b-&gt;bd_bitmap_folio = NULL;</div><div class='ctx'> </div><div class='del'>-	blocks_per_page = PAGE_SIZE / sb-&gt;s_blocksize;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * the buddy cache inode stores the block bitmap</div><div class='ctx'> 	 * and buddy information in consecutive blocks.</div><div class='ctx'> 	 * So for each group we need two blocks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	block = group * 2;</div><div class='del'>-	pnum = block / blocks_per_page;</div><div class='del'>-	poff = block % blocks_per_page;</div><div class='del'>-	page = find_or_create_page(inode-&gt;i_mapping, pnum, gfp);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	BUG_ON(page-&gt;mapping != inode-&gt;i_mapping);</div><div class='del'>-	e4b-&gt;bd_bitmap_page = page;</div><div class='del'>-	e4b-&gt;bd_bitmap = page_address(page) + (poff * sb-&gt;s_blocksize);</div><div class='add'>+	pnum = EXT4_LBLK_TO_PG(inode, block);</div><div class='add'>+	folio = __filemap_get_folio(inode-&gt;i_mapping, pnum,</div><div class='add'>+			FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	BUG_ON(folio-&gt;mapping != inode-&gt;i_mapping);</div><div class='add'>+	WARN_ON_ONCE(folio_size(folio) &lt; sb-&gt;s_blocksize);</div><div class='add'>+	e4b-&gt;bd_bitmap_folio = folio;</div><div class='add'>+	e4b-&gt;bd_bitmap = folio_address(folio) +</div><div class='add'>+			 offset_in_folio(folio, EXT4_LBLK_TO_B(inode, block));</div><div class='ctx'> </div><div class='del'>-	if (blocks_per_page &gt;= 2) {</div><div class='del'>-		/* buddy and bitmap are on the same page */</div><div class='add'>+	block++;</div><div class='add'>+	pnum = EXT4_LBLK_TO_PG(inode, block);</div><div class='add'>+	if (folio_contains(folio, pnum)) {</div><div class='add'>+		/* buddy and bitmap are on the same folio */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* blocks_per_page == 1, hence we need another page for the buddy */</div><div class='del'>-	page = find_or_create_page(inode-&gt;i_mapping, block + 1, gfp);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	BUG_ON(page-&gt;mapping != inode-&gt;i_mapping);</div><div class='del'>-	e4b-&gt;bd_buddy_page = page;</div><div class='add'>+	/* we need another folio for the buddy */</div><div class='add'>+	folio = __filemap_get_folio(inode-&gt;i_mapping, pnum,</div><div class='add'>+			FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	BUG_ON(folio-&gt;mapping != inode-&gt;i_mapping);</div><div class='add'>+	WARN_ON_ONCE(folio_size(folio) &lt; sb-&gt;s_blocksize);</div><div class='add'>+	e4b-&gt;bd_buddy_folio = folio;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ext4_mb_put_buddy_page_lock(struct ext4_buddy *e4b)</div><div class='add'>+static void ext4_mb_put_buddy_folio_lock(struct ext4_buddy *e4b)</div><div class='ctx'> {</div><div class='del'>-	if (e4b-&gt;bd_bitmap_page) {</div><div class='del'>-		unlock_page(e4b-&gt;bd_bitmap_page);</div><div class='del'>-		put_page(e4b-&gt;bd_bitmap_page);</div><div class='add'>+	if (e4b-&gt;bd_bitmap_folio) {</div><div class='add'>+		folio_unlock(e4b-&gt;bd_bitmap_folio);</div><div class='add'>+		folio_put(e4b-&gt;bd_bitmap_folio);</div><div class='ctx'> 	}</div><div class='del'>-	if (e4b-&gt;bd_buddy_page) {</div><div class='del'>-		unlock_page(e4b-&gt;bd_buddy_page);</div><div class='del'>-		put_page(e4b-&gt;bd_buddy_page);</div><div class='add'>+	if (e4b-&gt;bd_buddy_folio) {</div><div class='add'>+		folio_unlock(e4b-&gt;bd_buddy_folio);</div><div class='add'>+		folio_put(e4b-&gt;bd_buddy_folio);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Locking note:  This routine calls ext4_mb_init_cache(), which takes the</div><div class='del'>- * block group lock of all groups for this page; do not hold the BG lock when</div><div class='add'>+ * block group lock of all groups for this folio; do not hold the BG lock when</div><div class='ctx'>  * calling this routine!</div><div class='ctx'>  */</div><div class='ctx'> static noinline_for_stack</div><div class='hunk'>@@ -1488,7 +1596,7 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	struct ext4_group_info *this_grp;</div><div class='ctx'> 	struct ext4_buddy e4b;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='hunk'>@@ -1499,14 +1607,14 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This ensures that we don't reinit the buddy cache</div><div class='del'>-	 * page which map to the group from which we are already</div><div class='add'>+	 * folio which map to the group from which we are already</div><div class='ctx'> 	 * allocating. If we are looking at the buddy cache we would</div><div class='ctx'> 	 * have taken a reference using ext4_mb_load_buddy and that</div><div class='del'>-	 * would have pinned buddy page to page cache.</div><div class='del'>-	 * The call to ext4_mb_get_buddy_page_lock will mark the</div><div class='del'>-	 * page accessed.</div><div class='add'>+	 * would have pinned buddy folio to page cache.</div><div class='add'>+	 * The call to ext4_mb_get_buddy_folio_lock will mark the</div><div class='add'>+	 * folio accessed.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ext4_mb_get_buddy_page_lock(sb, group, &amp;e4b, gfp);</div><div class='add'>+	ret = ext4_mb_get_buddy_folio_lock(sb, group, &amp;e4b, gfp);</div><div class='ctx'> 	if (ret || !EXT4_MB_GRP_NEED_INIT(this_grp)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * somebody initialized the group</div><div class='hunk'>@@ -1515,52 +1623,50 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page = e4b.bd_bitmap_page;</div><div class='del'>-	ret = ext4_mb_init_cache(page, NULL, gfp);</div><div class='add'>+	folio = e4b.bd_bitmap_folio;</div><div class='add'>+	ret = ext4_mb_init_cache(folio, NULL, gfp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (e4b.bd_buddy_page == NULL) {</div><div class='add'>+	if (e4b.bd_buddy_folio == NULL) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If both the bitmap and buddy are in</div><div class='del'>-		 * the same page we don't need to force</div><div class='add'>+		 * the same folio we don't need to force</div><div class='ctx'> 		 * init the buddy</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* init buddy cache */</div><div class='del'>-	page = e4b.bd_buddy_page;</div><div class='del'>-	ret = ext4_mb_init_cache(page, e4b.bd_bitmap, gfp);</div><div class='add'>+	folio = e4b.bd_buddy_folio;</div><div class='add'>+	ret = ext4_mb_init_cache(folio, e4b.bd_bitmap, gfp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> err:</div><div class='del'>-	ext4_mb_put_buddy_page_lock(&amp;e4b);</div><div class='add'>+	ext4_mb_put_buddy_folio_lock(&amp;e4b);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Locking note:  This routine calls ext4_mb_init_cache(), which takes the</div><div class='del'>- * block group lock of all groups for this page; do not hold the BG lock when</div><div class='add'>+ * block group lock of all groups for this folio; do not hold the BG lock when</div><div class='ctx'>  * calling this routine!</div><div class='ctx'>  */</div><div class='ctx'> static noinline_for_stack int</div><div class='ctx'> ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 		       struct ext4_buddy *e4b, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	int blocks_per_page;</div><div class='ctx'> 	int block;</div><div class='ctx'> 	int pnum;</div><div class='del'>-	int poff;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ext4_group_info *grp;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='hunk'>@@ -1569,7 +1675,6 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> 	mb_debug(sb, "load group %u\n", group);</div><div class='ctx'> </div><div class='del'>-	blocks_per_page = PAGE_SIZE / sb-&gt;s_blocksize;</div><div class='ctx'> 	grp = ext4_get_group_info(sb, group);</div><div class='ctx'> 	if (!grp)</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='hunk'>@@ -1578,8 +1683,8 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 	e4b-&gt;bd_info = grp;</div><div class='ctx'> 	e4b-&gt;bd_sb = sb;</div><div class='ctx'> 	e4b-&gt;bd_group = group;</div><div class='del'>-	e4b-&gt;bd_buddy_page = NULL;</div><div class='del'>-	e4b-&gt;bd_bitmap_page = NULL;</div><div class='add'>+	e4b-&gt;bd_buddy_folio = NULL;</div><div class='add'>+	e4b-&gt;bd_bitmap_folio = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(EXT4_MB_GRP_NEED_INIT(grp))) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1597,105 +1702,114 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 	 * So for each group we need two blocks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	block = group * 2;</div><div class='del'>-	pnum = block / blocks_per_page;</div><div class='del'>-	poff = block % blocks_per_page;</div><div class='del'>-</div><div class='del'>-	/* we could use find_or_create_page(), but it locks page</div><div class='del'>-	 * what we'd like to avoid in fast path ... */</div><div class='del'>-	page = find_get_page_flags(inode-&gt;i_mapping, pnum, FGP_ACCESSED);</div><div class='del'>-	if (page == NULL || !PageUptodate(page)) {</div><div class='del'>-		if (page)</div><div class='add'>+	pnum = EXT4_LBLK_TO_PG(inode, block);</div><div class='add'>+</div><div class='add'>+	/* Avoid locking the folio in the fast path ... */</div><div class='add'>+	folio = __filemap_get_folio(inode-&gt;i_mapping, pnum, FGP_ACCESSED, 0);</div><div class='add'>+	if (IS_ERR(folio) || !folio_test_uptodate(folio)) {</div><div class='add'>+		if (!IS_ERR(folio))</div><div class='ctx'> 			/*</div><div class='del'>-			 * drop the page reference and try</div><div class='del'>-			 * to get the page with lock. If we</div><div class='add'>+			 * drop the folio reference and try</div><div class='add'>+			 * to get the folio with lock. If we</div><div class='ctx'> 			 * are not uptodate that implies</div><div class='del'>-			 * somebody just created the page but</div><div class='del'>-			 * is yet to initialize the same. So</div><div class='add'>+			 * somebody just created the folio but</div><div class='add'>+			 * is yet to initialize it. So</div><div class='ctx'> 			 * wait for it to initialize.</div><div class='ctx'> 			 */</div><div class='del'>-			put_page(page);</div><div class='del'>-		page = find_or_create_page(inode-&gt;i_mapping, pnum, gfp);</div><div class='del'>-		if (page) {</div><div class='del'>-			if (WARN_RATELIMIT(page-&gt;mapping != inode-&gt;i_mapping,</div><div class='del'>-	"ext4: bitmap's paging-&gt;mapping != inode-&gt;i_mapping\n")) {</div><div class='add'>+			folio_put(folio);</div><div class='add'>+		folio = __filemap_get_folio(inode-&gt;i_mapping, pnum,</div><div class='add'>+				FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);</div><div class='add'>+		if (!IS_ERR(folio)) {</div><div class='add'>+			if (WARN_RATELIMIT(folio-&gt;mapping != inode-&gt;i_mapping,</div><div class='add'>+	"ext4: bitmap's mapping != inode-&gt;i_mapping\n")) {</div><div class='ctx'> 				/* should never happen */</div><div class='del'>-				unlock_page(page);</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='del'>-			if (!PageUptodate(page)) {</div><div class='del'>-				ret = ext4_mb_init_cache(page, NULL, gfp);</div><div class='add'>+			if (!folio_test_uptodate(folio)) {</div><div class='add'>+				ret = ext4_mb_init_cache(folio, NULL, gfp);</div><div class='ctx'> 				if (ret) {</div><div class='del'>-					unlock_page(page);</div><div class='add'>+					folio_unlock(folio);</div><div class='ctx'> 					goto err;</div><div class='ctx'> 				}</div><div class='del'>-				mb_cmp_bitmaps(e4b, page_address(page) +</div><div class='del'>-					       (poff * sb-&gt;s_blocksize));</div><div class='add'>+				mb_cmp_bitmaps(e4b, folio_address(folio) +</div><div class='add'>+					offset_in_folio(folio,</div><div class='add'>+						EXT4_LBLK_TO_B(inode, block)));</div><div class='ctx'> 			}</div><div class='del'>-			unlock_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (page == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Pages marked accessed already */</div><div class='del'>-	e4b-&gt;bd_bitmap_page = page;</div><div class='del'>-	e4b-&gt;bd_bitmap = page_address(page) + (poff * sb-&gt;s_blocksize);</div><div class='add'>+	/* Folios marked accessed already */</div><div class='add'>+	e4b-&gt;bd_bitmap_folio = folio;</div><div class='add'>+	e4b-&gt;bd_bitmap = folio_address(folio) +</div><div class='add'>+			 offset_in_folio(folio, EXT4_LBLK_TO_B(inode, block));</div><div class='ctx'> </div><div class='ctx'> 	block++;</div><div class='del'>-	pnum = block / blocks_per_page;</div><div class='del'>-	poff = block % blocks_per_page;</div><div class='del'>-</div><div class='del'>-	page = find_get_page_flags(inode-&gt;i_mapping, pnum, FGP_ACCESSED);</div><div class='del'>-	if (page == NULL || !PageUptodate(page)) {</div><div class='del'>-		if (page)</div><div class='del'>-			put_page(page);</div><div class='del'>-		page = find_or_create_page(inode-&gt;i_mapping, pnum, gfp);</div><div class='del'>-		if (page) {</div><div class='del'>-			if (WARN_RATELIMIT(page-&gt;mapping != inode-&gt;i_mapping,</div><div class='del'>-	"ext4: buddy bitmap's page-&gt;mapping != inode-&gt;i_mapping\n")) {</div><div class='add'>+	pnum = EXT4_LBLK_TO_PG(inode, block);</div><div class='add'>+	/* buddy and bitmap are on the same folio? */</div><div class='add'>+	if (folio_contains(folio, pnum)) {</div><div class='add'>+		folio_get(folio);</div><div class='add'>+		goto update_buddy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we need another folio for the buddy */</div><div class='add'>+	folio = __filemap_get_folio(inode-&gt;i_mapping, pnum, FGP_ACCESSED, 0);</div><div class='add'>+	if (IS_ERR(folio) || !folio_test_uptodate(folio)) {</div><div class='add'>+		if (!IS_ERR(folio))</div><div class='add'>+			folio_put(folio);</div><div class='add'>+		folio = __filemap_get_folio(inode-&gt;i_mapping, pnum,</div><div class='add'>+				FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);</div><div class='add'>+		if (!IS_ERR(folio)) {</div><div class='add'>+			if (WARN_RATELIMIT(folio-&gt;mapping != inode-&gt;i_mapping,</div><div class='add'>+	"ext4: buddy bitmap's mapping != inode-&gt;i_mapping\n")) {</div><div class='ctx'> 				/* should never happen */</div><div class='del'>-				unlock_page(page);</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='del'>-			if (!PageUptodate(page)) {</div><div class='del'>-				ret = ext4_mb_init_cache(page, e4b-&gt;bd_bitmap,</div><div class='add'>+			if (!folio_test_uptodate(folio)) {</div><div class='add'>+				ret = ext4_mb_init_cache(folio, e4b-&gt;bd_bitmap,</div><div class='ctx'> 							 gfp);</div><div class='ctx'> 				if (ret) {</div><div class='del'>-					unlock_page(page);</div><div class='add'>+					folio_unlock(folio);</div><div class='ctx'> 					goto err;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			unlock_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (page == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Pages marked accessed already */</div><div class='del'>-	e4b-&gt;bd_buddy_page = page;</div><div class='del'>-	e4b-&gt;bd_buddy = page_address(page) + (poff * sb-&gt;s_blocksize);</div><div class='add'>+update_buddy:</div><div class='add'>+	/* Folios marked accessed already */</div><div class='add'>+	e4b-&gt;bd_buddy_folio = folio;</div><div class='add'>+	e4b-&gt;bd_buddy = folio_address(folio) +</div><div class='add'>+			offset_in_folio(folio, EXT4_LBLK_TO_B(inode, block));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	if (page)</div><div class='del'>-		put_page(page);</div><div class='del'>-	if (e4b-&gt;bd_bitmap_page)</div><div class='del'>-		put_page(e4b-&gt;bd_bitmap_page);</div><div class='add'>+	if (!IS_ERR_OR_NULL(folio))</div><div class='add'>+		folio_put(folio);</div><div class='add'>+	if (e4b-&gt;bd_bitmap_folio)</div><div class='add'>+		folio_put(e4b-&gt;bd_bitmap_folio);</div><div class='ctx'> </div><div class='ctx'> 	e4b-&gt;bd_buddy = NULL;</div><div class='ctx'> 	e4b-&gt;bd_bitmap = NULL;</div><div class='hunk'>@@ -1710,10 +1824,10 @@ static int ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> </div><div class='ctx'> static void ext4_mb_unload_buddy(struct ext4_buddy *e4b)</div><div class='ctx'> {</div><div class='del'>-	if (e4b-&gt;bd_bitmap_page)</div><div class='del'>-		put_page(e4b-&gt;bd_bitmap_page);</div><div class='del'>-	if (e4b-&gt;bd_buddy_page)</div><div class='del'>-		put_page(e4b-&gt;bd_buddy_page);</div><div class='add'>+	if (e4b-&gt;bd_bitmap_folio)</div><div class='add'>+		folio_put(e4b-&gt;bd_bitmap_folio);</div><div class='add'>+	if (e4b-&gt;bd_buddy_folio)</div><div class='add'>+		folio_put(e4b-&gt;bd_buddy_folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1891,11 +2005,6 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,</div><div class='ctx'> 	mb_check_buddy(e4b);</div><div class='ctx'> 	mb_free_blocks_double(inode, e4b, first, count);</div><div class='ctx'> </div><div class='del'>-	this_cpu_inc(discard_pa_seq);</div><div class='del'>-	e4b-&gt;bd_info-&gt;bb_free += count;</div><div class='del'>-	if (first &lt; e4b-&gt;bd_info-&gt;bb_first_free)</div><div class='del'>-		e4b-&gt;bd_info-&gt;bb_first_free = first;</div><div class='del'>-</div><div class='ctx'> 	/* access memory sequentially: check left neighbour,</div><div class='ctx'> 	 * clear range and then check right neighbour</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1909,21 +2018,31 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,</div><div class='ctx'> 		struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 		ext4_fsblk_t blocknr;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Fastcommit replay can free already freed blocks which</div><div class='add'>+		 * corrupts allocation info. Regenerate it.</div><div class='add'>+		 */</div><div class='add'>+		if (sbi-&gt;s_mount_state &amp; EXT4_FC_REPLAY) {</div><div class='add'>+			mb_regenerate_buddy(e4b);</div><div class='add'>+			goto check;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		blocknr = ext4_group_first_block_no(sb, e4b-&gt;bd_group);</div><div class='ctx'> 		blocknr += EXT4_C2B(sbi, block);</div><div class='del'>-		if (!(sbi-&gt;s_mount_state &amp; EXT4_FC_REPLAY)) {</div><div class='del'>-			ext4_grp_locked_error(sb, e4b-&gt;bd_group,</div><div class='del'>-					      inode ? inode-&gt;i_ino : 0,</div><div class='del'>-					      blocknr,</div><div class='del'>-					      "freeing already freed block (bit %u); block bitmap corrupt.",</div><div class='del'>-					      block);</div><div class='del'>-			ext4_mark_group_bitmap_corrupted(</div><div class='del'>-				sb, e4b-&gt;bd_group,</div><div class='add'>+		ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='ctx'> 				EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='del'>-		}</div><div class='del'>-		goto done;</div><div class='add'>+		ext4_grp_locked_error(sb, e4b-&gt;bd_group,</div><div class='add'>+				      inode ? inode-&gt;i_ino : 0, blocknr,</div><div class='add'>+				      "freeing already freed block (bit %u); block bitmap corrupt.",</div><div class='add'>+				      block);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	this_cpu_inc(discard_pa_seq);</div><div class='add'>+	e4b-&gt;bd_info-&gt;bb_free += count;</div><div class='add'>+	if (first &lt; e4b-&gt;bd_info-&gt;bb_first_free)</div><div class='add'>+		e4b-&gt;bd_info-&gt;bb_first_free = first;</div><div class='add'>+</div><div class='ctx'> 	/* let's maintain fragments counter */</div><div class='ctx'> 	if (left_is_free &amp;&amp; right_is_free)</div><div class='ctx'> 		e4b-&gt;bd_info-&gt;bb_fragments--;</div><div class='hunk'>@@ -1948,9 +2067,9 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,</div><div class='ctx'> 	if (first &lt;= last)</div><div class='ctx'> 		mb_buddy_mark_free(e4b, first &gt;&gt; 1, last &gt;&gt; 1);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='ctx'> 	mb_set_largest_free_order(sb, e4b-&gt;bd_info);</div><div class='ctx'> 	mb_update_avg_fragment_size(sb, e4b-&gt;bd_info);</div><div class='add'>+check:</div><div class='ctx'> 	mb_check_buddy(e4b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2018,13 +2137,12 @@ static int mb_mark_used(struct ext4_buddy *e4b, struct ext4_free_extent *ex)</div><div class='ctx'> 	int ord;</div><div class='ctx'> 	int mlen = 0;</div><div class='ctx'> 	int max = 0;</div><div class='del'>-	int cur;</div><div class='ctx'> 	int start = ex-&gt;fe_start;</div><div class='ctx'> 	int len = ex-&gt;fe_len;</div><div class='ctx'> 	unsigned ret = 0;</div><div class='ctx'> 	int len0 = len;</div><div class='ctx'> 	void *buddy;</div><div class='del'>-	bool split = false;</div><div class='add'>+	int ord_start, ord_end;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(start + len &gt; (e4b-&gt;bd_sb-&gt;s_blocksize &lt;&lt; 3));</div><div class='ctx'> 	BUG_ON(e4b-&gt;bd_group != ex-&gt;fe_group);</div><div class='hunk'>@@ -2049,16 +2167,12 @@ static int mb_mark_used(struct ext4_buddy *e4b, struct ext4_free_extent *ex)</div><div class='ctx'> </div><div class='ctx'> 	/* let's maintain buddy itself */</div><div class='ctx'> 	while (len) {</div><div class='del'>-		if (!split)</div><div class='del'>-			ord = mb_find_order_for_block(e4b, start);</div><div class='add'>+		ord = mb_find_order_for_block(e4b, start);</div><div class='ctx'> </div><div class='ctx'> 		if (((start &gt;&gt; ord) &lt;&lt; ord) == start &amp;&amp; len &gt;= (1 &lt;&lt; ord)) {</div><div class='ctx'> 			/* the whole chunk may be allocated at once! */</div><div class='ctx'> 			mlen = 1 &lt;&lt; ord;</div><div class='del'>-			if (!split)</div><div class='del'>-				buddy = mb_find_buddy(e4b, ord, &amp;max);</div><div class='del'>-			else</div><div class='del'>-				split = false;</div><div class='add'>+			buddy = mb_find_buddy(e4b, ord, &amp;max);</div><div class='ctx'> 			BUG_ON((start &gt;&gt; ord) &gt;= max);</div><div class='ctx'> 			mb_set_bit(start &gt;&gt; ord, buddy);</div><div class='ctx'> 			e4b-&gt;bd_info-&gt;bb_counters[ord]--;</div><div class='hunk'>@@ -2072,20 +2186,29 @@ static int mb_mark_used(struct ext4_buddy *e4b, struct ext4_free_extent *ex)</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			ret = len | (ord &lt;&lt; 16);</div><div class='ctx'> </div><div class='del'>-		/* we have to split large buddy */</div><div class='ctx'> 		BUG_ON(ord &lt;= 0);</div><div class='ctx'> 		buddy = mb_find_buddy(e4b, ord, &amp;max);</div><div class='ctx'> 		mb_set_bit(start &gt;&gt; ord, buddy);</div><div class='ctx'> 		e4b-&gt;bd_info-&gt;bb_counters[ord]--;</div><div class='ctx'> </div><div class='del'>-		ord--;</div><div class='del'>-		cur = (start &gt;&gt; ord) &amp; ~1U;</div><div class='del'>-		buddy = mb_find_buddy(e4b, ord, &amp;max);</div><div class='del'>-		mb_clear_bit(cur, buddy);</div><div class='del'>-		mb_clear_bit(cur + 1, buddy);</div><div class='del'>-		e4b-&gt;bd_info-&gt;bb_counters[ord]++;</div><div class='del'>-		e4b-&gt;bd_info-&gt;bb_counters[ord]++;</div><div class='del'>-		split = true;</div><div class='add'>+		ord_start = (start &gt;&gt; ord) &lt;&lt; ord;</div><div class='add'>+		ord_end = ord_start + (1 &lt;&lt; ord);</div><div class='add'>+		/* first chunk */</div><div class='add'>+		if (start &gt; ord_start)</div><div class='add'>+			ext4_mb_mark_free_simple(e4b-&gt;bd_sb, e4b-&gt;bd_buddy,</div><div class='add'>+						 ord_start, start - ord_start,</div><div class='add'>+						 e4b-&gt;bd_info);</div><div class='add'>+</div><div class='add'>+		/* last chunk */</div><div class='add'>+		if (start + len &lt; ord_end) {</div><div class='add'>+			ext4_mb_mark_free_simple(e4b-&gt;bd_sb, e4b-&gt;bd_buddy,</div><div class='add'>+						 start + len,</div><div class='add'>+						 ord_end - (start + len),</div><div class='add'>+						 e4b-&gt;bd_info);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		len = start + len - ord_end;</div><div class='add'>+		start = ord_end;</div><div class='ctx'> 	}</div><div class='ctx'> 	mb_set_largest_free_order(e4b-&gt;bd_sb, e4b-&gt;bd_info);</div><div class='ctx'> </div><div class='hunk'>@@ -2121,23 +2244,23 @@ static void ext4_mb_use_best_found(struct ext4_allocation_context *ac,</div><div class='ctx'> 	ac-&gt;ac_buddy = ret &gt;&gt; 16;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * take the page reference. We want the page to be pinned</div><div class='add'>+	 * take the folio reference. We want the folio to be pinned</div><div class='ctx'> 	 * so that we don't get a ext4_mb_init_cache_call for this</div><div class='ctx'> 	 * group until we update the bitmap. That would mean we</div><div class='ctx'> 	 * double allocate blocks. The reference is dropped</div><div class='ctx'> 	 * in ext4_mb_release_context</div><div class='ctx'> 	 */</div><div class='del'>-	ac-&gt;ac_bitmap_page = e4b-&gt;bd_bitmap_page;</div><div class='del'>-	get_page(ac-&gt;ac_bitmap_page);</div><div class='del'>-	ac-&gt;ac_buddy_page = e4b-&gt;bd_buddy_page;</div><div class='del'>-	get_page(ac-&gt;ac_buddy_page);</div><div class='add'>+	ac-&gt;ac_bitmap_folio = e4b-&gt;bd_bitmap_folio;</div><div class='add'>+	folio_get(ac-&gt;ac_bitmap_folio);</div><div class='add'>+	ac-&gt;ac_buddy_folio = e4b-&gt;bd_buddy_folio;</div><div class='add'>+	folio_get(ac-&gt;ac_buddy_folio);</div><div class='ctx'> 	/* store last allocated for subsequent stream allocation */</div><div class='ctx'> 	if (ac-&gt;ac_flags &amp; EXT4_MB_STREAM_ALLOC) {</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-		sbi-&gt;s_mb_last_group = ac-&gt;ac_f_ex.fe_group;</div><div class='del'>-		sbi-&gt;s_mb_last_start = ac-&gt;ac_f_ex.fe_start;</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='add'>+		int hash = ac-&gt;ac_inode-&gt;i_ino % sbi-&gt;s_mb_nr_global_goals;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(sbi-&gt;s_mb_last_groups[hash], ac-&gt;ac_f_ex.fe_group);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * As we've just preallocated more space than</div><div class='ctx'> 	 * user requested originally, we store allocated</div><div class='hunk'>@@ -2276,6 +2399,9 @@ void ext4_mb_try_best_found(struct ext4_allocation_context *ac,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ext4_lock_group(ac-&gt;ac_sb, group);</div><div class='add'>+	if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b-&gt;bd_info)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	max = mb_find_extent(e4b, ex.fe_start, ex.fe_len, &amp;ex);</div><div class='ctx'> </div><div class='ctx'> 	if (max &gt; 0) {</div><div class='hunk'>@@ -2283,6 +2409,7 @@ void ext4_mb_try_best_found(struct ext4_allocation_context *ac,</div><div class='ctx'> 		ext4_mb_use_best_found(ac, e4b);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	ext4_unlock_group(ac-&gt;ac_sb, group);</div><div class='ctx'> 	ext4_mb_unload_buddy(e4b);</div><div class='ctx'> }</div><div class='hunk'>@@ -2309,18 +2436,16 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b-&gt;bd_info))) {</div><div class='del'>-		ext4_mb_unload_buddy(e4b);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ext4_lock_group(ac-&gt;ac_sb, group);</div><div class='add'>+	if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b-&gt;bd_info)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	max = mb_find_extent(e4b, ac-&gt;ac_g_ex.fe_start,</div><div class='ctx'> 			     ac-&gt;ac_g_ex.fe_len, &amp;ex);</div><div class='ctx'> 	ex.fe_logical = 0xDEADFA11; /* debug value */</div><div class='ctx'> </div><div class='ctx'> 	if (max &gt;= ac-&gt;ac_g_ex.fe_len &amp;&amp;</div><div class='del'>-	    ac-&gt;ac_g_ex.fe_len == EXT4_B2C(sbi, sbi-&gt;s_stripe)) {</div><div class='add'>+	    ac-&gt;ac_g_ex.fe_len == EXT4_NUM_B2C(sbi, sbi-&gt;s_stripe)) {</div><div class='ctx'> 		ext4_fsblk_t start;</div><div class='ctx'> </div><div class='ctx'> 		start = ext4_grp_offs_to_block(ac-&gt;ac_sb, &amp;ex);</div><div class='hunk'>@@ -2347,6 +2472,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac,</div><div class='ctx'> 		ac-&gt;ac_b_ex = ex;</div><div class='ctx'> 		ext4_mb_use_best_found(ac, e4b);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	ext4_unlock_group(ac-&gt;ac_sb, group);</div><div class='ctx'> 	ext4_mb_unload_buddy(e4b);</div><div class='ctx'> </div><div class='hunk'>@@ -2380,12 +2506,12 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,</div><div class='ctx'> </div><div class='ctx'> 		k = mb_find_next_zero_bit(buddy, max, 0);</div><div class='ctx'> 		if (k &gt;= max) {</div><div class='add'>+			ext4_mark_group_bitmap_corrupted(ac-&gt;ac_sb,</div><div class='add'>+					e4b-&gt;bd_group,</div><div class='add'>+					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			ext4_grp_locked_error(ac-&gt;ac_sb, e4b-&gt;bd_group, 0, 0,</div><div class='ctx'> 				"%d free clusters of order %d. But found 0",</div><div class='ctx'> 				grp-&gt;bb_counters[i], i);</div><div class='del'>-			ext4_mark_group_bitmap_corrupted(ac-&gt;ac_sb,</div><div class='del'>-					 e4b-&gt;bd_group,</div><div class='del'>-					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		ac-&gt;ac_found++;</div><div class='hunk'>@@ -2436,12 +2562,12 @@ void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac,</div><div class='ctx'> 			 * free blocks even though group info says we</div><div class='ctx'> 			 * have free blocks</div><div class='ctx'> 			 */</div><div class='add'>+			ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='add'>+					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			ext4_grp_locked_error(sb, e4b-&gt;bd_group, 0, 0,</div><div class='ctx'> 					"%d free clusters as per "</div><div class='ctx'> 					"group info. But bitmap says 0",</div><div class='ctx'> 					free);</div><div class='del'>-			ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='del'>-					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2467,12 +2593,12 @@ void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac,</div><div class='ctx'> 		if (WARN_ON(ex.fe_len &lt;= 0))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (free &lt; ex.fe_len) {</div><div class='add'>+			ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='add'>+					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			ext4_grp_locked_error(sb, e4b-&gt;bd_group, 0, 0,</div><div class='ctx'> 					"%d free clusters as per "</div><div class='ctx'> 					"group info. But got %d blocks",</div><div class='ctx'> 					free, ex.fe_len);</div><div class='del'>-			ext4_mark_group_bitmap_corrupted(sb, e4b-&gt;bd_group,</div><div class='del'>-					EXT4_GROUP_INFO_BBITMAP_CORRUPT);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The number of free blocks differs. This mostly</div><div class='ctx'> 			 * indicate that the bitmap is corrupt. So exit</div><div class='hunk'>@@ -2516,7 +2642,7 @@ void ext4_mb_scan_aligned(struct ext4_allocation_context *ac,</div><div class='ctx'> 	do_div(a, sbi-&gt;s_stripe);</div><div class='ctx'> 	i = (a * sbi-&gt;s_stripe) - first_group_block;</div><div class='ctx'> </div><div class='del'>-	stripe = EXT4_B2C(sbi, sbi-&gt;s_stripe);</div><div class='add'>+	stripe = EXT4_NUM_B2C(sbi, sbi-&gt;s_stripe);</div><div class='ctx'> 	i = EXT4_B2C(sbi, i);</div><div class='ctx'> 	while (i &lt; EXT4_CLUSTERS_PER_GROUP(sb)) {</div><div class='ctx'> 		if (!mb_test_bit(i, bitmap)) {</div><div class='hunk'>@@ -2534,6 +2660,30 @@ void ext4_mb_scan_aligned(struct ext4_allocation_context *ac,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __ext4_mb_scan_group(struct ext4_allocation_context *ac)</div><div class='add'>+{</div><div class='add'>+	bool is_stripe_aligned;</div><div class='add'>+	struct ext4_sb_info *sbi;</div><div class='add'>+	enum criteria cr = ac-&gt;ac_criteria;</div><div class='add'>+</div><div class='add'>+	ac-&gt;ac_groups_scanned++;</div><div class='add'>+	if (cr == CR_POWER2_ALIGNED)</div><div class='add'>+		return ext4_mb_simple_scan_group(ac, ac-&gt;ac_e4b);</div><div class='add'>+</div><div class='add'>+	sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='add'>+	is_stripe_aligned = false;</div><div class='add'>+	if ((sbi-&gt;s_stripe &gt;= sbi-&gt;s_cluster_ratio) &amp;&amp;</div><div class='add'>+	    !(ac-&gt;ac_g_ex.fe_len % EXT4_NUM_B2C(sbi, sbi-&gt;s_stripe)))</div><div class='add'>+		is_stripe_aligned = true;</div><div class='add'>+</div><div class='add'>+	if ((cr == CR_GOAL_LEN_FAST || cr == CR_BEST_AVAIL_LEN) &amp;&amp;</div><div class='add'>+	    is_stripe_aligned)</div><div class='add'>+		ext4_mb_scan_aligned(ac, ac-&gt;ac_e4b);</div><div class='add'>+</div><div class='add'>+	if (ac-&gt;ac_status == AC_STATUS_CONTINUE)</div><div class='add'>+		ext4_mb_complex_scan_group(ac, ac-&gt;ac_e4b);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is also called BEFORE we load the buddy bitmap.</div><div class='ctx'>  * Returns either 1 or 0 indicating that the group is either suitable</div><div class='hunk'>@@ -2650,7 +2800,7 @@ static int ext4_mb_good_group_nolock(struct ext4_allocation_context *ac,</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * cr=CR_POWER2_ALIGNED/CR_GOAL_LEN_FAST is a very optimistic</div><div class='add'>+		 * CR_POWER2_ALIGNED/CR_GOAL_LEN_FAST is a very optimistic</div><div class='ctx'> 		 * search to find large good chunks almost for free. If buddy</div><div class='ctx'> 		 * data is not ready, then this optimization makes no sense. But</div><div class='ctx'> 		 * we never skip the first block group in a flex_bg, since this</div><div class='hunk'>@@ -2724,6 +2874,37 @@ ext4_group_t ext4_mb_prefetch(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Batch reads of the block allocation bitmaps to get</div><div class='add'>+ * multiple READs in flight; limit prefetching at inexpensive</div><div class='add'>+ * CR, otherwise mballoc can spend a lot of time loading</div><div class='add'>+ * imperfect groups</div><div class='add'>+ */</div><div class='add'>+static void ext4_mb_might_prefetch(struct ext4_allocation_context *ac,</div><div class='add'>+				   ext4_group_t group)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi;</div><div class='add'>+</div><div class='add'>+	if (ac-&gt;ac_prefetch_grp != group)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='add'>+	if (ext4_mb_cr_expensive(ac-&gt;ac_criteria) ||</div><div class='add'>+	    ac-&gt;ac_prefetch_ios &lt; sbi-&gt;s_mb_prefetch_limit) {</div><div class='add'>+		unsigned int nr = sbi-&gt;s_mb_prefetch;</div><div class='add'>+</div><div class='add'>+		if (ext4_has_feature_flex_bg(ac-&gt;ac_sb)) {</div><div class='add'>+			nr = 1 &lt;&lt; sbi-&gt;s_log_groups_per_flex;</div><div class='add'>+			nr -= group &amp; (nr - 1);</div><div class='add'>+			nr = umin(nr, sbi-&gt;s_mb_prefetch);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ac-&gt;ac_prefetch_nr = nr;</div><div class='add'>+		ac-&gt;ac_prefetch_grp = ext4_mb_prefetch(ac-&gt;ac_sb, group, nr,</div><div class='add'>+						       &amp;ac-&gt;ac_prefetch_ios);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Prefetching reads the block bitmap into the buffer cache; but we</div><div class='ctx'>  * need to make sure that the buddy bitmap in the page cache has been</div><div class='ctx'>  * initialized.  Note that ext4_mb_init_group() will block if the I/O</div><div class='hunk'>@@ -2756,24 +2937,58 @@ void ext4_mb_prefetch_fini(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ext4_mb_scan_group(struct ext4_allocation_context *ac,</div><div class='add'>+			      ext4_group_t group)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct super_block *sb = ac-&gt;ac_sb;</div><div class='add'>+	enum criteria cr = ac-&gt;ac_criteria;</div><div class='add'>+</div><div class='add'>+	ext4_mb_might_prefetch(ac, group);</div><div class='add'>+</div><div class='add'>+	/* prevent unnecessary buddy loading. */</div><div class='add'>+	if (cr &lt; CR_ANY_FREE &amp;&amp; spin_is_locked(ext4_group_lock_ptr(sb, group)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* This now checks without needing the buddy folio */</div><div class='add'>+	ret = ext4_mb_good_group_nolock(ac, group, cr);</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		if (!ac-&gt;ac_first_err)</div><div class='add'>+			ac-&gt;ac_first_err = ret;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ext4_mb_load_buddy(sb, group, ac-&gt;ac_e4b);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* skip busy group */</div><div class='add'>+	if (cr &gt;= CR_ANY_FREE)</div><div class='add'>+		ext4_lock_group(sb, group);</div><div class='add'>+	else if (!ext4_try_lock_group(sb, group))</div><div class='add'>+		goto out_unload;</div><div class='add'>+</div><div class='add'>+	/* We need to check again after locking the block group. */</div><div class='add'>+	if (unlikely(!ext4_mb_good_group(ac, group, cr)))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	__ext4_mb_scan_group(ac);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	ext4_unlock_group(sb, group);</div><div class='add'>+out_unload:</div><div class='add'>+	ext4_mb_unload_buddy(ac-&gt;ac_e4b);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static noinline_for_stack int</div><div class='ctx'> ext4_mb_regular_allocator(struct ext4_allocation_context *ac)</div><div class='ctx'> {</div><div class='del'>-	ext4_group_t prefetch_grp = 0, ngroups, group, i;</div><div class='del'>-	enum criteria new_cr, cr = CR_GOAL_LEN_FAST;</div><div class='del'>-	int err = 0, first_err = 0;</div><div class='del'>-	unsigned int nr = 0, prefetch_ios = 0;</div><div class='del'>-	struct ext4_sb_info *sbi;</div><div class='del'>-	struct super_block *sb;</div><div class='add'>+	ext4_group_t i;</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct super_block *sb = ac-&gt;ac_sb;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	struct ext4_buddy e4b;</div><div class='del'>-	int lost;</div><div class='del'>-</div><div class='del'>-	sb = ac-&gt;ac_sb;</div><div class='del'>-	sbi = EXT4_SB(sb);</div><div class='del'>-	ngroups = ext4_get_groups_count(sb);</div><div class='del'>-	/* non-extent files are limited to low blocks/groups */</div><div class='del'>-	if (!(ext4_test_inode_flag(ac-&gt;ac_inode, EXT4_INODE_EXTENTS)))</div><div class='del'>-		ngroups = sbi-&gt;s_blockfile_groups;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ac-&gt;ac_status == AC_STATUS_FOUND);</div><div class='ctx'> </div><div class='hunk'>@@ -2807,11 +3022,11 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)</div><div class='ctx'> </div><div class='ctx'> 	/* if stream allocation is enabled, use global goal */</div><div class='ctx'> 	if (ac-&gt;ac_flags &amp; EXT4_MB_STREAM_ALLOC) {</div><div class='del'>-		/* TBD: may be hot point */</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-		ac-&gt;ac_g_ex.fe_group = sbi-&gt;s_mb_last_group;</div><div class='del'>-		ac-&gt;ac_g_ex.fe_start = sbi-&gt;s_mb_last_start;</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='add'>+		int hash = ac-&gt;ac_inode-&gt;i_ino % sbi-&gt;s_mb_nr_global_goals;</div><div class='add'>+</div><div class='add'>+		ac-&gt;ac_g_ex.fe_group = READ_ONCE(sbi-&gt;s_mb_last_groups[hash]);</div><div class='add'>+		ac-&gt;ac_g_ex.fe_start = -1;</div><div class='add'>+		ac-&gt;ac_flags &amp;= ~EXT4_MB_HINT_TRY_GOAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2819,104 +3034,21 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)</div><div class='ctx'> 	 * start with CR_GOAL_LEN_FAST, unless it is power of 2</div><div class='ctx'> 	 * aligned, in which case let's do that faster approach first.</div><div class='ctx'> 	 */</div><div class='add'>+	ac-&gt;ac_criteria = CR_GOAL_LEN_FAST;</div><div class='ctx'> 	if (ac-&gt;ac_2order)</div><div class='del'>-		cr = CR_POWER2_ALIGNED;</div><div class='del'>-repeat:</div><div class='del'>-	for (; cr &lt; EXT4_MB_NUM_CRS &amp;&amp; ac-&gt;ac_status == AC_STATUS_CONTINUE; cr++) {</div><div class='del'>-		ac-&gt;ac_criteria = cr;</div><div class='del'>-		/*</div><div class='del'>-		 * searching for the right group start</div><div class='del'>-		 * from the goal value specified</div><div class='del'>-		 */</div><div class='del'>-		group = ac-&gt;ac_g_ex.fe_group;</div><div class='del'>-		ac-&gt;ac_groups_linear_remaining = sbi-&gt;s_mb_max_linear_groups;</div><div class='del'>-		prefetch_grp = group;</div><div class='del'>-</div><div class='del'>-		for (i = 0, new_cr = cr; i &lt; ngroups; i++,</div><div class='del'>-		     ext4_mb_choose_next_group(ac, &amp;new_cr, &amp;group, ngroups)) {</div><div class='del'>-			int ret = 0;</div><div class='del'>-</div><div class='del'>-			cond_resched();</div><div class='del'>-			if (new_cr != cr) {</div><div class='del'>-				cr = new_cr;</div><div class='del'>-				goto repeat;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Batch reads of the block allocation bitmaps</div><div class='del'>-			 * to get multiple READs in flight; limit</div><div class='del'>-			 * prefetching at inexpensive CR, otherwise mballoc</div><div class='del'>-			 * can spend a lot of time loading imperfect groups</div><div class='del'>-			 */</div><div class='del'>-			if ((prefetch_grp == group) &amp;&amp;</div><div class='del'>-			    (ext4_mb_cr_expensive(cr) ||</div><div class='del'>-			     prefetch_ios &lt; sbi-&gt;s_mb_prefetch_limit)) {</div><div class='del'>-				nr = sbi-&gt;s_mb_prefetch;</div><div class='del'>-				if (ext4_has_feature_flex_bg(sb)) {</div><div class='del'>-					nr = 1 &lt;&lt; sbi-&gt;s_log_groups_per_flex;</div><div class='del'>-					nr -= group &amp; (nr - 1);</div><div class='del'>-					nr = min(nr, sbi-&gt;s_mb_prefetch);</div><div class='del'>-				}</div><div class='del'>-				prefetch_grp = ext4_mb_prefetch(sb, group,</div><div class='del'>-							nr, &amp;prefetch_ios);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* This now checks without needing the buddy page */</div><div class='del'>-			ret = ext4_mb_good_group_nolock(ac, group, cr);</div><div class='del'>-			if (ret &lt;= 0) {</div><div class='del'>-				if (!first_err)</div><div class='del'>-					first_err = ret;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			err = ext4_mb_load_buddy(sb, group, &amp;e4b);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			ext4_lock_group(sb, group);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * We need to check again after locking the</div><div class='del'>-			 * block group</div><div class='del'>-			 */</div><div class='del'>-			ret = ext4_mb_good_group(ac, group, cr);</div><div class='del'>-			if (ret == 0) {</div><div class='del'>-				ext4_unlock_group(sb, group);</div><div class='del'>-				ext4_mb_unload_buddy(&amp;e4b);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+		ac-&gt;ac_criteria = CR_POWER2_ALIGNED;</div><div class='ctx'> </div><div class='del'>-			ac-&gt;ac_groups_scanned++;</div><div class='del'>-			if (cr == CR_POWER2_ALIGNED)</div><div class='del'>-				ext4_mb_simple_scan_group(ac, &amp;e4b);</div><div class='del'>-			else {</div><div class='del'>-				bool is_stripe_aligned = sbi-&gt;s_stripe &amp;&amp;</div><div class='del'>-					!(ac-&gt;ac_g_ex.fe_len %</div><div class='del'>-					  EXT4_B2C(sbi, sbi-&gt;s_stripe));</div><div class='del'>-</div><div class='del'>-				if ((cr == CR_GOAL_LEN_FAST ||</div><div class='del'>-				     cr == CR_BEST_AVAIL_LEN) &amp;&amp;</div><div class='del'>-				    is_stripe_aligned)</div><div class='del'>-					ext4_mb_scan_aligned(ac, &amp;e4b);</div><div class='del'>-</div><div class='del'>-				if (ac-&gt;ac_status == AC_STATUS_CONTINUE)</div><div class='del'>-					ext4_mb_complex_scan_group(ac, &amp;e4b);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ext4_unlock_group(sb, group);</div><div class='del'>-			ext4_mb_unload_buddy(&amp;e4b);</div><div class='del'>-</div><div class='del'>-			if (ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		/* Processed all groups and haven't found blocks */</div><div class='del'>-		if (sbi-&gt;s_mb_stats &amp;&amp; i == ngroups)</div><div class='del'>-			atomic64_inc(&amp;sbi-&gt;s_bal_cX_failed[cr]);</div><div class='add'>+	ac-&gt;ac_e4b = &amp;e4b;</div><div class='add'>+	ac-&gt;ac_prefetch_ios = 0;</div><div class='add'>+	ac-&gt;ac_first_err = 0;</div><div class='add'>+repeat:</div><div class='add'>+	while (ac-&gt;ac_criteria &lt; EXT4_MB_NUM_CRS) {</div><div class='add'>+		err = ext4_mb_scan_groups(ac);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-		if (i == ngroups &amp;&amp; ac-&gt;ac_criteria == CR_BEST_AVAIL_LEN)</div><div class='del'>-			/* Reset goal length to original goal length before</div><div class='del'>-			 * falling into CR_GOAL_LEN_SLOW */</div><div class='del'>-			ac-&gt;ac_g_ex.fe_len = ac-&gt;ac_orig_goal_len;</div><div class='add'>+		if (ac-&gt;ac_status != AC_STATUS_CONTINUE)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ac-&gt;ac_b_ex.fe_len &gt; 0 &amp;&amp; ac-&gt;ac_status != AC_STATUS_FOUND &amp;&amp;</div><div class='hunk'>@@ -2927,6 +3059,8 @@ repeat:</div><div class='ctx'> 		 */</div><div class='ctx'> 		ext4_mb_try_best_found(ac, &amp;e4b);</div><div class='ctx'> 		if (ac-&gt;ac_status != AC_STATUS_FOUND) {</div><div class='add'>+			int lost;</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Someone more lucky has already allocated it.</div><div class='ctx'> 			 * The only thing we can do is just take first</div><div class='hunk'>@@ -2942,23 +3076,27 @@ repeat:</div><div class='ctx'> 			ac-&gt;ac_b_ex.fe_len = 0;</div><div class='ctx'> 			ac-&gt;ac_status = AC_STATUS_CONTINUE;</div><div class='ctx'> 			ac-&gt;ac_flags |= EXT4_MB_HINT_FIRST;</div><div class='del'>-			cr = CR_ANY_FREE;</div><div class='add'>+			ac-&gt;ac_criteria = CR_ANY_FREE;</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sbi-&gt;s_mb_stats &amp;&amp; ac-&gt;ac_status == AC_STATUS_FOUND)</div><div class='add'>+	if (sbi-&gt;s_mb_stats &amp;&amp; ac-&gt;ac_status == AC_STATUS_FOUND) {</div><div class='ctx'> 		atomic64_inc(&amp;sbi-&gt;s_bal_cX_hits[ac-&gt;ac_criteria]);</div><div class='add'>+		if (ac-&gt;ac_flags &amp; EXT4_MB_STREAM_ALLOC &amp;&amp;</div><div class='add'>+		    ac-&gt;ac_b_ex.fe_group == ac-&gt;ac_g_ex.fe_group)</div><div class='add'>+			atomic_inc(&amp;sbi-&gt;s_bal_stream_goals);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='del'>-	if (!err &amp;&amp; ac-&gt;ac_status != AC_STATUS_FOUND &amp;&amp; first_err)</div><div class='del'>-		err = first_err;</div><div class='add'>+	if (!err &amp;&amp; ac-&gt;ac_status != AC_STATUS_FOUND &amp;&amp; ac-&gt;ac_first_err)</div><div class='add'>+		err = ac-&gt;ac_first_err;</div><div class='ctx'> </div><div class='ctx'> 	mb_debug(sb, "Best len %d, origin len %d, ac_status %u, ac_flags 0x%x, cr %d ret %d\n",</div><div class='ctx'> 		 ac-&gt;ac_b_ex.fe_len, ac-&gt;ac_o_ex.fe_len, ac-&gt;ac_status,</div><div class='del'>-		 ac-&gt;ac_flags, cr, err);</div><div class='add'>+		 ac-&gt;ac_flags, ac-&gt;ac_criteria, err);</div><div class='ctx'> </div><div class='del'>-	if (nr)</div><div class='del'>-		ext4_mb_prefetch_fini(sb, prefetch_grp, nr);</div><div class='add'>+	if (ac-&gt;ac_prefetch_nr)</div><div class='add'>+		ext4_mb_prefetch_fini(sb, ac-&gt;ac_prefetch_grp, ac-&gt;ac_prefetch_nr);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2990,17 +3128,15 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	ext4_group_t group = (ext4_group_t) ((unsigned long) v);</div><div class='del'>-	int i;</div><div class='del'>-	int err, buddy_loaded = 0;</div><div class='add'>+	int i, err;</div><div class='add'>+	char nbuf[16];</div><div class='ctx'> 	struct ext4_buddy e4b;</div><div class='ctx'> 	struct ext4_group_info *grinfo;</div><div class='ctx'> 	unsigned char blocksize_bits = min_t(unsigned char,</div><div class='ctx'> 					     sb-&gt;s_blocksize_bits,</div><div class='ctx'> 					     EXT4_MAX_BLOCK_LOG_SIZE);</div><div class='del'>-	struct sg {</div><div class='del'>-		struct ext4_group_info info;</div><div class='del'>-		ext4_grpblk_t counters[EXT4_MAX_BLOCK_LOG_SIZE + 2];</div><div class='del'>-	} sg;</div><div class='add'>+	DEFINE_RAW_FLEX(struct ext4_group_info, sg, bb_counters,</div><div class='add'>+			EXT4_MAX_BLOCK_LOG_SIZE + 2);</div><div class='ctx'> </div><div class='ctx'> 	group--;</div><div class='ctx'> 	if (group == 0)</div><div class='hunk'>@@ -3008,7 +3144,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			      " 2^0   2^1   2^2   2^3   2^4   2^5   2^6  "</div><div class='ctx'> 			      " 2^7   2^8   2^9   2^10  2^11  2^12  2^13  ]\n");</div><div class='ctx'> </div><div class='del'>-	i = (blocksize_bits + 2) * sizeof(sg.info.bb_counters[0]) +</div><div class='add'>+	i = (blocksize_bits + 2) * sizeof(sg-&gt;bb_counters[0]) +</div><div class='ctx'> 		sizeof(struct ext4_group_info);</div><div class='ctx'> </div><div class='ctx'> 	grinfo = ext4_get_group_info(sb, group);</div><div class='hunk'>@@ -3018,24 +3154,26 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	if (unlikely(EXT4_MB_GRP_NEED_INIT(grinfo))) {</div><div class='ctx'> 		err = ext4_mb_load_buddy(sb, group, &amp;e4b);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			seq_printf(seq, "#%-5u: I/O error\n", group);</div><div class='add'>+			seq_printf(seq, "#%-5u: %s\n", group, ext4_decode_error(NULL, err, nbuf));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		buddy_loaded = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;sg, grinfo, i);</div><div class='del'>-</div><div class='del'>-	if (buddy_loaded)</div><div class='ctx'> 		ext4_mb_unload_buddy(&amp;e4b);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, "#%-5u: %-5u %-5u %-5u [", group, sg.info.bb_free,</div><div class='del'>-			sg.info.bb_fragments, sg.info.bb_first_free);</div><div class='add'>+	/*</div><div class='add'>+	 * We care only about free space counters in the group info and</div><div class='add'>+	 * these are safe to access even after the buddy has been unloaded</div><div class='add'>+	 */</div><div class='add'>+	memcpy(sg, grinfo, i);</div><div class='add'>+	seq_printf(seq, "#%-5u: %-5u %-5u %-5u [", group, sg-&gt;bb_free,</div><div class='add'>+			sg-&gt;bb_fragments, sg-&gt;bb_first_free);</div><div class='ctx'> 	for (i = 0; i &lt;= 13; i++)</div><div class='ctx'> 		seq_printf(seq, " %-5u", i &lt;= blocksize_bits + 1 ?</div><div class='del'>-				sg.info.bb_counters[i] : 0);</div><div class='del'>-	seq_puts(seq, " ]\n");</div><div class='del'>-</div><div class='add'>+				sg-&gt;bb_counters[i] : 0);</div><div class='add'>+	seq_puts(seq, " ]");</div><div class='add'>+	if (EXT4_MB_GRP_BBITMAP_CORRUPT(sg))</div><div class='add'>+		seq_puts(seq, " Block bitmap corrupted!");</div><div class='add'>+	seq_putc(seq, '\n');</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3081,8 +3219,6 @@ int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   atomic_read(&amp;sbi-&gt;s_bal_cX_ex_scanned[CR_POWER2_ALIGNED]));</div><div class='ctx'> 	seq_printf(seq, "\t\tuseless_loops: %llu\n",</div><div class='ctx'> 		   atomic64_read(&amp;sbi-&gt;s_bal_cX_failed[CR_POWER2_ALIGNED]));</div><div class='del'>-	seq_printf(seq, "\t\tbad_suggestions: %u\n",</div><div class='del'>-		   atomic_read(&amp;sbi-&gt;s_bal_p2_aligned_bad_suggestions));</div><div class='ctx'> </div><div class='ctx'> 	/* CR_GOAL_LEN_FAST stats */</div><div class='ctx'> 	seq_puts(seq, "\tcr_goal_fast_stats:\n");</div><div class='hunk'>@@ -3095,8 +3231,6 @@ int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   atomic_read(&amp;sbi-&gt;s_bal_cX_ex_scanned[CR_GOAL_LEN_FAST]));</div><div class='ctx'> 	seq_printf(seq, "\t\tuseless_loops: %llu\n",</div><div class='ctx'> 		   atomic64_read(&amp;sbi-&gt;s_bal_cX_failed[CR_GOAL_LEN_FAST]));</div><div class='del'>-	seq_printf(seq, "\t\tbad_suggestions: %u\n",</div><div class='del'>-		   atomic_read(&amp;sbi-&gt;s_bal_goal_fast_bad_suggestions));</div><div class='ctx'> </div><div class='ctx'> 	/* CR_BEST_AVAIL_LEN stats */</div><div class='ctx'> 	seq_puts(seq, "\tcr_best_avail_stats:\n");</div><div class='hunk'>@@ -3110,8 +3244,6 @@ int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   atomic_read(&amp;sbi-&gt;s_bal_cX_ex_scanned[CR_BEST_AVAIL_LEN]));</div><div class='ctx'> 	seq_printf(seq, "\t\tuseless_loops: %llu\n",</div><div class='ctx'> 		   atomic64_read(&amp;sbi-&gt;s_bal_cX_failed[CR_BEST_AVAIL_LEN]));</div><div class='del'>-	seq_printf(seq, "\t\tbad_suggestions: %u\n",</div><div class='del'>-		   atomic_read(&amp;sbi-&gt;s_bal_best_avail_bad_suggestions));</div><div class='ctx'> </div><div class='ctx'> 	/* CR_GOAL_LEN_SLOW stats */</div><div class='ctx'> 	seq_puts(seq, "\tcr_goal_slow_stats:\n");</div><div class='hunk'>@@ -3141,6 +3273,8 @@ int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	seq_printf(seq, "\textents_scanned: %u\n",</div><div class='ctx'> 		   atomic_read(&amp;sbi-&gt;s_bal_ex_scanned));</div><div class='ctx'> 	seq_printf(seq, "\t\tgoal_hits: %u\n", atomic_read(&amp;sbi-&gt;s_bal_goals));</div><div class='add'>+	seq_printf(seq, "\t\tstream_goal_hits: %u\n",</div><div class='add'>+		   atomic_read(&amp;sbi-&gt;s_bal_stream_goals));</div><div class='ctx'> 	seq_printf(seq, "\t\tlen_goal_hits: %u\n",</div><div class='ctx'> 		   atomic_read(&amp;sbi-&gt;s_bal_len_goals));</div><div class='ctx'> 	seq_printf(seq, "\t\t2^n_hits: %u\n", atomic_read(&amp;sbi-&gt;s_bal_2orders));</div><div class='hunk'>@@ -3158,7 +3292,6 @@ int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *ext4_mb_seq_structs_summary_start(struct seq_file *seq, loff_t *pos)</div><div class='del'>-__acquires(&amp;EXT4_SB(sb)-&gt;s_mb_rb_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	unsigned long position;</div><div class='hunk'>@@ -3188,6 +3321,7 @@ static int ext4_mb_seq_structs_summary_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	unsigned long position = ((unsigned long) v);</div><div class='ctx'> 	struct ext4_group_info *grp;</div><div class='ctx'> 	unsigned int count;</div><div class='add'>+	unsigned long idx;</div><div class='ctx'> </div><div class='ctx'> 	position--;</div><div class='ctx'> 	if (position &gt;= MB_NUM_ORDERS(sb)) {</div><div class='hunk'>@@ -3196,11 +3330,8 @@ static int ext4_mb_seq_structs_summary_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			seq_puts(seq, "avg_fragment_size_lists:\n");</div><div class='ctx'> </div><div class='ctx'> 		count = 0;</div><div class='del'>-		read_lock(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[position]);</div><div class='del'>-		list_for_each_entry(grp, &amp;sbi-&gt;s_mb_avg_fragment_size[position],</div><div class='del'>-				    bb_avg_fragment_size_node)</div><div class='add'>+		xa_for_each(&amp;sbi-&gt;s_mb_avg_fragment_size[position], idx, grp)</div><div class='ctx'> 			count++;</div><div class='del'>-		read_unlock(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[position]);</div><div class='ctx'> 		seq_printf(seq, "\tlist_order_%u_groups: %u\n",</div><div class='ctx'> 					(unsigned int)position, count);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -3212,11 +3343,8 @@ static int ext4_mb_seq_structs_summary_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		seq_puts(seq, "max_free_order_lists:\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	count = 0;</div><div class='del'>-	read_lock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[position]);</div><div class='del'>-	list_for_each_entry(grp, &amp;sbi-&gt;s_mb_largest_free_orders[position],</div><div class='del'>-			    bb_largest_free_order_node)</div><div class='add'>+	xa_for_each(&amp;sbi-&gt;s_mb_largest_free_orders[position], idx, grp)</div><div class='ctx'> 		count++;</div><div class='del'>-	read_unlock(&amp;sbi-&gt;s_mb_largest_free_orders_locks[position]);</div><div class='ctx'> 	seq_printf(seq, "\tlist_order_%u_groups: %u\n",</div><div class='ctx'> 		   (unsigned int)position, count);</div><div class='ctx'> </div><div class='hunk'>@@ -3336,8 +3464,6 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;meta_group_info[i]-&gt;bb_prealloc_list);</div><div class='ctx'> 	init_rwsem(&amp;meta_group_info[i]-&gt;alloc_sem);</div><div class='ctx'> 	meta_group_info[i]-&gt;bb_free_root = RB_ROOT;</div><div class='del'>-	INIT_LIST_HEAD(&amp;meta_group_info[i]-&gt;bb_largest_free_order_node);</div><div class='del'>-	INIT_LIST_HEAD(&amp;meta_group_info[i]-&gt;bb_avg_fragment_size_node);</div><div class='ctx'> 	meta_group_info[i]-&gt;bb_largest_free_order = -1;  /* uninit */</div><div class='ctx'> 	meta_group_info[i]-&gt;bb_avg_fragment_size_order = -1;  /* uninit */</div><div class='ctx'> 	meta_group_info[i]-&gt;bb_group = group;</div><div class='hunk'>@@ -3384,6 +3510,8 @@ static int ext4_mb_init_backend(struct super_block *sb)</div><div class='ctx'> 	 * this will avoid confusion if it ever shows up during debugging. */</div><div class='ctx'> 	sbi-&gt;s_buddy_cache-&gt;i_ino = EXT4_BAD_INO;</div><div class='ctx'> 	EXT4_I(sbi-&gt;s_buddy_cache)-&gt;i_disksize = 0;</div><div class='add'>+	ext4_set_inode_mapping_order(sbi-&gt;s_buddy_cache);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ngroups; i++) {</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		desc = ext4_get_group_desc(sb, i, NULL);</div><div class='hunk'>@@ -3412,10 +3540,11 @@ static int ext4_mb_init_backend(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sbi-&gt;s_mb_prefetch &gt; ext4_get_groups_count(sb))</div><div class='ctx'> 		sbi-&gt;s_mb_prefetch = ext4_get_groups_count(sb);</div><div class='del'>-	/* now many real IOs to prefetch within a single allocation at cr=0</div><div class='del'>-	 * given cr=0 is an CPU-related optimization we shouldn't try to</div><div class='del'>-	 * load too many groups, at some point we should start to use what</div><div class='del'>-	 * we've got in memory.</div><div class='add'>+	/*</div><div class='add'>+	 * now many real IOs to prefetch within a single allocation at</div><div class='add'>+	 * CR_POWER2_ALIGNED. Given CR_POWER2_ALIGNED is an CPU-related</div><div class='add'>+	 * optimization we shouldn't try to load too many groups, at some point</div><div class='add'>+	 * we should start to use what we've got in memory.</div><div class='ctx'> 	 * with an average random access time 5ms, it'd take a second to get</div><div class='ctx'> 	 * 200 groups (* N with flex_bg), so let's make this limit 4</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3546,6 +3675,30 @@ static void ext4_discard_work(struct work_struct *work)</div><div class='ctx'> 		ext4_mb_unload_buddy(&amp;e4b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ext4_mb_avg_fragment_size_destroy(struct ext4_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	if (!sbi-&gt;s_mb_avg_fragment_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; MB_NUM_ORDERS(sbi-&gt;s_sb); i++)</div><div class='add'>+		xa_destroy(&amp;sbi-&gt;s_mb_avg_fragment_size[i]);</div><div class='add'>+</div><div class='add'>+	kfree(sbi-&gt;s_mb_avg_fragment_size);</div><div class='add'>+	sbi-&gt;s_mb_avg_fragment_size = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ext4_mb_largest_free_orders_destroy(struct ext4_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	if (!sbi-&gt;s_mb_largest_free_orders)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; MB_NUM_ORDERS(sbi-&gt;s_sb); i++)</div><div class='add'>+		xa_destroy(&amp;sbi-&gt;s_mb_largest_free_orders[i]);</div><div class='add'>+</div><div class='add'>+	kfree(sbi-&gt;s_mb_largest_free_orders);</div><div class='add'>+	sbi-&gt;s_mb_largest_free_orders = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ext4_mb_init(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='hunk'>@@ -3591,44 +3744,27 @@ int ext4_mb_init(struct super_block *sb)</div><div class='ctx'> 	} while (i &lt; MB_NUM_ORDERS(sb));</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;s_mb_avg_fragment_size =</div><div class='del'>-		kmalloc_array(MB_NUM_ORDERS(sb), sizeof(struct list_head),</div><div class='add'>+		kmalloc_array(MB_NUM_ORDERS(sb), sizeof(struct xarray),</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!sbi-&gt;s_mb_avg_fragment_size) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	sbi-&gt;s_mb_avg_fragment_size_locks =</div><div class='del'>-		kmalloc_array(MB_NUM_ORDERS(sb), sizeof(rwlock_t),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!sbi-&gt;s_mb_avg_fragment_size_locks) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;sbi-&gt;s_mb_avg_fragment_size[i]);</div><div class='del'>-		rwlock_init(&amp;sbi-&gt;s_mb_avg_fragment_size_locks[i]);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++)</div><div class='add'>+		xa_init(&amp;sbi-&gt;s_mb_avg_fragment_size[i]);</div><div class='add'>+</div><div class='ctx'> 	sbi-&gt;s_mb_largest_free_orders =</div><div class='del'>-		kmalloc_array(MB_NUM_ORDERS(sb), sizeof(struct list_head),</div><div class='add'>+		kmalloc_array(MB_NUM_ORDERS(sb), sizeof(struct xarray),</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!sbi-&gt;s_mb_largest_free_orders) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	sbi-&gt;s_mb_largest_free_orders_locks =</div><div class='del'>-		kmalloc_array(MB_NUM_ORDERS(sb), sizeof(rwlock_t),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!sbi-&gt;s_mb_largest_free_orders_locks) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;sbi-&gt;s_mb_largest_free_orders[i]);</div><div class='del'>-		rwlock_init(&amp;sbi-&gt;s_mb_largest_free_orders_locks[i]);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; MB_NUM_ORDERS(sb); i++)</div><div class='add'>+		xa_init(&amp;sbi-&gt;s_mb_largest_free_orders[i]);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	sbi-&gt;s_mb_free_pending = 0;</div><div class='add'>+	atomic_set(&amp;sbi-&gt;s_mb_free_pending, 0);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sbi-&gt;s_freed_data_list[0]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sbi-&gt;s_freed_data_list[1]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sbi-&gt;s_discard_list);</div><div class='hunk'>@@ -3666,13 +3802,22 @@ int ext4_mb_init(struct super_block *sb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sbi-&gt;s_stripe &gt; 1) {</div><div class='ctx'> 		sbi-&gt;s_mb_group_prealloc = roundup(</div><div class='del'>-			sbi-&gt;s_mb_group_prealloc, EXT4_B2C(sbi, sbi-&gt;s_stripe));</div><div class='add'>+			sbi-&gt;s_mb_group_prealloc, EXT4_NUM_B2C(sbi, sbi-&gt;s_stripe));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbi-&gt;s_mb_nr_global_goals = umin(num_possible_cpus(),</div><div class='add'>+					 DIV_ROUND_UP(sbi-&gt;s_groups_count, 4));</div><div class='add'>+	sbi-&gt;s_mb_last_groups = kcalloc(sbi-&gt;s_mb_nr_global_goals,</div><div class='add'>+					sizeof(ext4_group_t), GFP_KERNEL);</div><div class='add'>+	if (sbi-&gt;s_mb_last_groups == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;s_locality_groups = alloc_percpu(struct ext4_locality_group);</div><div class='ctx'> 	if (sbi-&gt;s_locality_groups == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_free_last_groups;</div><div class='ctx'> 	}</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		struct ext4_locality_group *lg;</div><div class='hunk'>@@ -3697,11 +3842,12 @@ int ext4_mb_init(struct super_block *sb)</div><div class='ctx'> out_free_locality_groups:</div><div class='ctx'> 	free_percpu(sbi-&gt;s_locality_groups);</div><div class='ctx'> 	sbi-&gt;s_locality_groups = NULL;</div><div class='add'>+out_free_last_groups:</div><div class='add'>+	kfree(sbi-&gt;s_mb_last_groups);</div><div class='add'>+	sbi-&gt;s_mb_last_groups = NULL;</div><div class='ctx'> out:</div><div class='del'>-	kfree(sbi-&gt;s_mb_avg_fragment_size);</div><div class='del'>-	kfree(sbi-&gt;s_mb_avg_fragment_size_locks);</div><div class='del'>-	kfree(sbi-&gt;s_mb_largest_free_orders);</div><div class='del'>-	kfree(sbi-&gt;s_mb_largest_free_orders_locks);</div><div class='add'>+	ext4_mb_avg_fragment_size_destroy(sbi);</div><div class='add'>+	ext4_mb_largest_free_orders_destroy(sbi);</div><div class='ctx'> 	kfree(sbi-&gt;s_mb_offsets);</div><div class='ctx'> 	sbi-&gt;s_mb_offsets = NULL;</div><div class='ctx'> 	kfree(sbi-&gt;s_mb_maxs);</div><div class='hunk'>@@ -3725,7 +3871,7 @@ static int ext4_mb_cleanup_pa(struct ext4_group_info *grp)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ext4_mb_release(struct super_block *sb)</div><div class='add'>+void ext4_mb_release(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_group_t ngroups = ext4_get_groups_count(sb);</div><div class='ctx'> 	ext4_group_t i;</div><div class='hunk'>@@ -3768,10 +3914,8 @@ int ext4_mb_release(struct super_block *sb)</div><div class='ctx'> 		kvfree(group_info);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='del'>-	kfree(sbi-&gt;s_mb_avg_fragment_size);</div><div class='del'>-	kfree(sbi-&gt;s_mb_avg_fragment_size_locks);</div><div class='del'>-	kfree(sbi-&gt;s_mb_largest_free_orders);</div><div class='del'>-	kfree(sbi-&gt;s_mb_largest_free_orders_locks);</div><div class='add'>+	ext4_mb_avg_fragment_size_destroy(sbi);</div><div class='add'>+	ext4_mb_largest_free_orders_destroy(sbi);</div><div class='ctx'> 	kfree(sbi-&gt;s_mb_offsets);</div><div class='ctx'> 	kfree(sbi-&gt;s_mb_maxs);</div><div class='ctx'> 	iput(sbi-&gt;s_buddy_cache);</div><div class='hunk'>@@ -3801,13 +3945,11 @@ int ext4_mb_release(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	free_percpu(sbi-&gt;s_locality_groups);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	kfree(sbi-&gt;s_mb_last_groups);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ext4_issue_discard(struct super_block *sb,</div><div class='del'>-		ext4_group_t block_group, ext4_grpblk_t cluster, int count,</div><div class='del'>-		struct bio **biop)</div><div class='add'>+		ext4_group_t block_group, ext4_grpblk_t cluster, int count)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_fsblk_t discard_block;</div><div class='ctx'> </div><div class='hunk'>@@ -3816,13 +3958,8 @@ static inline int ext4_issue_discard(struct super_block *sb,</div><div class='ctx'> 	count = EXT4_C2B(EXT4_SB(sb), count);</div><div class='ctx'> 	trace_ext4_discard_blocks(sb,</div><div class='ctx'> 			(unsigned long long) discard_block, count);</div><div class='del'>-	if (biop) {</div><div class='del'>-		return __blkdev_issue_discard(sb-&gt;s_bdev,</div><div class='del'>-			(sector_t)discard_block &lt;&lt; (sb-&gt;s_blocksize_bits - 9),</div><div class='del'>-			(sector_t)count &lt;&lt; (sb-&gt;s_blocksize_bits - 9),</div><div class='del'>-			GFP_NOFS, biop);</div><div class='del'>-	} else</div><div class='del'>-		return sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);</div><div class='add'>+</div><div class='add'>+	return sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ext4_free_data_in_buddy(struct super_block *sb,</div><div class='hunk'>@@ -3839,10 +3976,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb,</div><div class='ctx'> 	/* we expect to find existing buddy because it's pinned */</div><div class='ctx'> 	BUG_ON(err != 0);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;EXT4_SB(sb)-&gt;s_md_lock);</div><div class='del'>-	EXT4_SB(sb)-&gt;s_mb_free_pending -= entry-&gt;efd_count;</div><div class='del'>-	spin_unlock(&amp;EXT4_SB(sb)-&gt;s_md_lock);</div><div class='del'>-</div><div class='add'>+	atomic_sub(entry-&gt;efd_count, &amp;EXT4_SB(sb)-&gt;s_mb_free_pending);</div><div class='ctx'> 	db = e4b.bd_info;</div><div class='ctx'> 	/* there are blocks to put in buddy to make them really free */</div><div class='ctx'> 	count += entry-&gt;efd_count;</div><div class='hunk'>@@ -3854,18 +3988,15 @@ static void ext4_free_data_in_buddy(struct super_block *sb,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the trimmed flag for the group so that the next</div><div class='ctx'> 	 * ext4_trim_fs can trim it.</div><div class='del'>-	 * If the volume is mounted with -o discard, online discard</div><div class='del'>-	 * is supported and the free blocks will be trimmed online.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!test_opt(sb, DISCARD))</div><div class='del'>-		EXT4_MB_GRP_CLEAR_TRIMMED(db);</div><div class='add'>+	EXT4_MB_GRP_CLEAR_TRIMMED(db);</div><div class='ctx'> </div><div class='ctx'> 	if (!db-&gt;bb_free_root.rb_node) {</div><div class='ctx'> 		/* No more items in the per group rb tree</div><div class='ctx'> 		 * balance refcounts from ext4_mb_free_metadata()</div><div class='ctx'> 		 */</div><div class='del'>-		put_page(e4b.bd_buddy_page);</div><div class='del'>-		put_page(e4b.bd_bitmap_page);</div><div class='add'>+		folio_put(e4b.bd_buddy_folio);</div><div class='add'>+		folio_put(e4b.bd_bitmap_folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	ext4_unlock_group(sb, entry-&gt;efd_group);</div><div class='ctx'> 	ext4_mb_unload_buddy(&amp;e4b);</div><div class='hunk'>@@ -3896,7 +4027,7 @@ void ext4_process_freed_data(struct super_block *sb, tid_t commit_tid)</div><div class='ctx'> 		list_splice_tail(&amp;freed_data_list, &amp;sbi-&gt;s_discard_list);</div><div class='ctx'> 		spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='ctx'> 		if (wake)</div><div class='del'>-			queue_work(system_unbound_wq, &amp;sbi-&gt;s_discard_work);</div><div class='add'>+			queue_work(system_dfl_wq, &amp;sbi-&gt;s_discard_work);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		list_for_each_entry_safe(entry, tmp, &amp;freed_data_list, efd_list)</div><div class='ctx'> 			kmem_cache_free(ext4_free_data_cachep, entry);</div><div class='hunk'>@@ -4611,7 +4742,7 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac)</div><div class='ctx'> 				   "ext4: mb_load_buddy failed (%d)", err))</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This should never happen since we pin the</div><div class='del'>-			 * pages in the ext4_allocation_context so</div><div class='add'>+			 * folios in the ext4_allocation_context so</div><div class='ctx'> 			 * ext4_mb_load_buddy() should never fail.</div><div class='ctx'> 			 */</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -5146,10 +5277,16 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)</div><div class='ctx'> 			.fe_len = ac-&gt;ac_orig_goal_len,</div><div class='ctx'> 		};</div><div class='ctx'> 		loff_t orig_goal_end = extent_logical_end(sbi, &amp;ex);</div><div class='add'>+		loff_t o_ex_end = extent_logical_end(sbi, &amp;ac-&gt;ac_o_ex);</div><div class='ctx'> </div><div class='del'>-		/* we can't allocate as much as normalizer wants.</div><div class='del'>-		 * so, found space must get proper lstart</div><div class='del'>-		 * to cover original request */</div><div class='add'>+		/*</div><div class='add'>+		 * We can't allocate as much as normalizer wants, so we try</div><div class='add'>+		 * to get proper lstart to cover the original request, except</div><div class='add'>+		 * when the goal doesn't cover the original request as below:</div><div class='add'>+		 *</div><div class='add'>+		 * orig_ex:2045/2055(10), isize:8417280 -&gt; normalized:0/2048</div><div class='add'>+		 * best_ex:0/200(200) -&gt; adjusted: 1848/2048(200)</div><div class='add'>+		 */</div><div class='ctx'> 		BUG_ON(ac-&gt;ac_g_ex.fe_logical &gt; ac-&gt;ac_o_ex.fe_logical);</div><div class='ctx'> 		BUG_ON(ac-&gt;ac_g_ex.fe_len &lt; ac-&gt;ac_o_ex.fe_len);</div><div class='ctx'> </div><div class='hunk'>@@ -5161,7 +5298,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)</div><div class='ctx'> 		 * 1. Check if best ex can be kept at end of goal (before</div><div class='ctx'> 		 *    cr_best_avail trimmed it) and still cover original start</div><div class='ctx'> 		 * 2. Else, check if best ex can be kept at start of goal and</div><div class='del'>-		 *    still cover original start</div><div class='add'>+		 *    still cover original end</div><div class='ctx'> 		 * 3. Else, keep the best ex at start of original request.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ex.fe_len = ac-&gt;ac_b_ex.fe_len;</div><div class='hunk'>@@ -5171,7 +5308,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)</div><div class='ctx'> 			goto adjust_bex;</div><div class='ctx'> </div><div class='ctx'> 		ex.fe_logical = ac-&gt;ac_g_ex.fe_logical;</div><div class='del'>-		if (ac-&gt;ac_o_ex.fe_logical &lt; extent_logical_end(sbi, &amp;ex))</div><div class='add'>+		if (o_ex_end &lt;= extent_logical_end(sbi, &amp;ex))</div><div class='ctx'> 			goto adjust_bex;</div><div class='ctx'> </div><div class='ctx'> 		ex.fe_logical = ac-&gt;ac_o_ex.fe_logical;</div><div class='hunk'>@@ -5179,7 +5316,6 @@ adjust_bex:</div><div class='ctx'> 		ac-&gt;ac_b_ex.fe_logical = ex.fe_logical;</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(ac-&gt;ac_o_ex.fe_logical &lt; ac-&gt;ac_b_ex.fe_logical);</div><div class='del'>-		BUG_ON(ac-&gt;ac_o_ex.fe_len &gt; ac-&gt;ac_b_ex.fe_len);</div><div class='ctx'> 		BUG_ON(extent_logical_end(sbi, &amp;ex) &gt; orig_goal_end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5284,7 +5420,7 @@ static void ext4_mb_new_preallocation(struct ext4_allocation_context *ac)</div><div class='ctx'>  * the caller MUST hold group/inode locks.</div><div class='ctx'>  * TODO: optimize the case when there are no in-core structures yet</div><div class='ctx'>  */</div><div class='del'>-static noinline_for_stack int</div><div class='add'>+static noinline_for_stack void</div><div class='ctx'> ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,</div><div class='ctx'> 			struct ext4_prealloc_space *pa)</div><div class='ctx'> {</div><div class='hunk'>@@ -5334,11 +5470,9 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_add(free, &amp;sbi-&gt;s_mb_discarded);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline_for_stack int</div><div class='add'>+static noinline_for_stack void</div><div class='ctx'> ext4_mb_release_group_pa(struct ext4_buddy *e4b,</div><div class='ctx'> 				struct ext4_prealloc_space *pa)</div><div class='ctx'> {</div><div class='hunk'>@@ -5352,13 +5486,11 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,</div><div class='ctx'> 	if (unlikely(group != e4b-&gt;bd_group &amp;&amp; pa-&gt;pa_len != 0)) {</div><div class='ctx'> 		ext4_warning(sb, "bad group: expected %u, group %u, pa_start %llu",</div><div class='ctx'> 			     e4b-&gt;bd_group, group, pa-&gt;pa_pstart);</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	mb_free_blocks(pa-&gt;pa_inode, e4b, bit, pa-&gt;pa_len);</div><div class='ctx'> 	atomic_add(pa-&gt;pa_len, &amp;EXT4_SB(sb)-&gt;s_mb_discarded);</div><div class='ctx'> 	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa-&gt;pa_len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5479,7 +5611,7 @@ out_dbg:</div><div class='ctx'>  *</div><div class='ctx'>  * FIXME!! Make sure it is valid at all the call sites</div><div class='ctx'>  */</div><div class='del'>-void ext4_discard_preallocations(struct inode *inode, unsigned int needed)</div><div class='add'>+void ext4_discard_preallocations(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='hunk'>@@ -5491,9 +5623,8 @@ void ext4_discard_preallocations(struct inode *inode, unsigned int needed)</div><div class='ctx'> 	struct rb_node *iter;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_SB(sb)-&gt;s_mount_state &amp; EXT4_FC_REPLAY)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -5501,15 +5632,12 @@ void ext4_discard_preallocations(struct inode *inode, unsigned int needed)</div><div class='ctx'> 	mb_debug(sb, "discard preallocation for inode %lu\n",</div><div class='ctx'> 		 inode-&gt;i_ino);</div><div class='ctx'> 	trace_ext4_discard_preallocations(inode,</div><div class='del'>-			atomic_read(&amp;ei-&gt;i_prealloc_active), needed);</div><div class='del'>-</div><div class='del'>-	if (needed == 0)</div><div class='del'>-		needed = UINT_MAX;</div><div class='add'>+			atomic_read(&amp;ei-&gt;i_prealloc_active));</div><div class='ctx'> </div><div class='ctx'> repeat:</div><div class='ctx'> 	/* first, collect all pa's in the inode */</div><div class='ctx'> 	write_lock(&amp;ei-&gt;i_prealloc_lock);</div><div class='del'>-	for (iter = rb_first(&amp;ei-&gt;i_prealloc_node); iter &amp;&amp; needed;</div><div class='add'>+	for (iter = rb_first(&amp;ei-&gt;i_prealloc_node); iter;</div><div class='ctx'> 	     iter = rb_next(iter)) {</div><div class='ctx'> 		pa = rb_entry(iter, struct ext4_prealloc_space,</div><div class='ctx'> 			      pa_node.inode_node);</div><div class='hunk'>@@ -5533,7 +5661,6 @@ repeat:</div><div class='ctx'> 			spin_unlock(&amp;pa-&gt;pa_lock);</div><div class='ctx'> 			rb_erase(&amp;pa-&gt;pa_node.inode_node, &amp;ei-&gt;i_prealloc_node);</div><div class='ctx'> 			list_add(&amp;pa-&gt;u.pa_tmp_list, &amp;list);</div><div class='del'>-			needed--;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5626,7 +5753,7 @@ static inline void ext4_mb_show_pa(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_group_t i, ngroups;</div><div class='ctx'> </div><div class='del'>-	if (ext4_forced_shutdown(sb))</div><div class='add'>+	if (ext4_emergency_state(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ngroups = ext4_get_groups_count(sb);</div><div class='hunk'>@@ -5660,7 +5787,7 @@ static void ext4_mb_show_ac(struct ext4_allocation_context *ac)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = ac-&gt;ac_sb;</div><div class='ctx'> </div><div class='del'>-	if (ext4_forced_shutdown(sb))</div><div class='add'>+	if (ext4_emergency_state(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mb_debug(sb, "Can't allocate:"</div><div class='hunk'>@@ -5684,7 +5811,7 @@ static void ext4_mb_show_ac(struct ext4_allocation_context *ac)</div><div class='ctx'> 			(unsigned long)ac-&gt;ac_b_ex.fe_logical,</div><div class='ctx'> 			(int)ac-&gt;ac_criteria);</div><div class='ctx'> 	mb_debug(sb, "%u found", ac-&gt;ac_found);</div><div class='del'>-	mb_debug(sb, "used pa: %s, ", ac-&gt;ac_pa ? "yes" : "no");</div><div class='add'>+	mb_debug(sb, "used pa: %s, ", str_yes_no(ac-&gt;ac_pa));</div><div class='ctx'> 	if (ac-&gt;ac_pa)</div><div class='ctx'> 		mb_debug(sb, "pa_type %s\n", ac-&gt;ac_pa-&gt;pa_type == MB_GROUP_PA ?</div><div class='ctx'> 			 "group pa" : "inode pa");</div><div class='hunk'>@@ -5943,7 +6070,7 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac)</div><div class='ctx'> /*</div><div class='ctx'>  * release all resource we used in allocation</div><div class='ctx'>  */</div><div class='del'>-static int ext4_mb_release_context(struct ext4_allocation_context *ac)</div><div class='add'>+static void ext4_mb_release_context(struct ext4_allocation_context *ac)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(ac-&gt;ac_sb);</div><div class='ctx'> 	struct ext4_prealloc_space *pa = ac-&gt;ac_pa;</div><div class='hunk'>@@ -5973,14 +6100,13 @@ static int ext4_mb_release_context(struct ext4_allocation_context *ac)</div><div class='ctx'> </div><div class='ctx'> 		ext4_mb_put_pa(ac, ac-&gt;ac_sb, pa);</div><div class='ctx'> 	}</div><div class='del'>-	if (ac-&gt;ac_bitmap_page)</div><div class='del'>-		put_page(ac-&gt;ac_bitmap_page);</div><div class='del'>-	if (ac-&gt;ac_buddy_page)</div><div class='del'>-		put_page(ac-&gt;ac_buddy_page);</div><div class='add'>+	if (ac-&gt;ac_bitmap_folio)</div><div class='add'>+		folio_put(ac-&gt;ac_bitmap_folio);</div><div class='add'>+	if (ac-&gt;ac_buddy_folio)</div><div class='add'>+		folio_put(ac-&gt;ac_buddy_folio);</div><div class='ctx'> 	if (ac-&gt;ac_flags &amp; EXT4_MB_HINT_GROUP_ALLOC)</div><div class='ctx'> 		mutex_unlock(&amp;ac-&gt;ac_lg-&gt;lg_mutex);</div><div class='ctx'> 	ext4_mb_collect_stats(ac);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_mb_discard_preallocations(struct super_block *sb, int needed)</div><div class='hunk'>@@ -6030,7 +6156,7 @@ static bool ext4_mb_discard_preallocations_should_retry(struct super_block *sb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_dbg:</div><div class='del'>-	mb_debug(sb, "freed %d, retry ? %s\n", freed, ret ? "yes" : "no");</div><div class='add'>+	mb_debug(sb, "freed %d, retry ? %s\n", freed, str_yes_no(ret));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6098,6 +6224,7 @@ ext4_mb_new_blocks_simple(struct ext4_allocation_request *ar, int *errp)</div><div class='ctx'> 	ext4_mb_mark_bb(sb, block, 1, true);</div><div class='ctx'> 	ar-&gt;len = 1;</div><div class='ctx'> </div><div class='add'>+	*errp = 0;</div><div class='ctx'> 	return block;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6253,28 +6380,63 @@ out:</div><div class='ctx'>  * are contiguous, AND the extents were freed by the same transaction,</div><div class='ctx'>  * AND the blocks are associated with the same group.</div><div class='ctx'>  */</div><div class='del'>-static void ext4_try_merge_freed_extent(struct ext4_sb_info *sbi,</div><div class='del'>-					struct ext4_free_data *entry,</div><div class='del'>-					struct ext4_free_data *new_entry,</div><div class='del'>-					struct rb_root *entry_rb_root)</div><div class='add'>+static inline bool</div><div class='add'>+ext4_freed_extents_can_be_merged(struct ext4_free_data *entry1,</div><div class='add'>+				 struct ext4_free_data *entry2)</div><div class='ctx'> {</div><div class='del'>-	if ((entry-&gt;efd_tid != new_entry-&gt;efd_tid) ||</div><div class='del'>-	    (entry-&gt;efd_group != new_entry-&gt;efd_group))</div><div class='del'>-		return;</div><div class='del'>-	if (entry-&gt;efd_start_cluster + entry-&gt;efd_count ==</div><div class='del'>-	    new_entry-&gt;efd_start_cluster) {</div><div class='del'>-		new_entry-&gt;efd_start_cluster = entry-&gt;efd_start_cluster;</div><div class='del'>-		new_entry-&gt;efd_count += entry-&gt;efd_count;</div><div class='del'>-	} else if (new_entry-&gt;efd_start_cluster + new_entry-&gt;efd_count ==</div><div class='del'>-		   entry-&gt;efd_start_cluster) {</div><div class='del'>-		new_entry-&gt;efd_count += entry-&gt;efd_count;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='add'>+	if (entry1-&gt;efd_tid != entry2-&gt;efd_tid)</div><div class='add'>+		return false;</div><div class='add'>+	if (entry1-&gt;efd_start_cluster + entry1-&gt;efd_count !=</div><div class='add'>+	    entry2-&gt;efd_start_cluster)</div><div class='add'>+		return false;</div><div class='add'>+	if (WARN_ON_ONCE(entry1-&gt;efd_group != entry2-&gt;efd_group))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ext4_merge_freed_extents(struct ext4_sb_info *sbi, struct rb_root *root,</div><div class='add'>+			 struct ext4_free_data *entry1,</div><div class='add'>+			 struct ext4_free_data *entry2)</div><div class='add'>+{</div><div class='add'>+	entry1-&gt;efd_count += entry2-&gt;efd_count;</div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	list_del(&amp;entry-&gt;efd_list);</div><div class='add'>+	list_del(&amp;entry2-&gt;efd_list);</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	rb_erase(&amp;entry-&gt;efd_node, entry_rb_root);</div><div class='del'>-	kmem_cache_free(ext4_free_data_cachep, entry);</div><div class='add'>+	rb_erase(&amp;entry2-&gt;efd_node, root);</div><div class='add'>+	kmem_cache_free(ext4_free_data_cachep, entry2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ext4_try_merge_freed_extent_prev(struct ext4_sb_info *sbi, struct rb_root *root,</div><div class='add'>+				 struct ext4_free_data *entry)</div><div class='add'>+{</div><div class='add'>+	struct ext4_free_data *prev;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	node = rb_prev(&amp;entry-&gt;efd_node);</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	prev = rb_entry(node, struct ext4_free_data, efd_node);</div><div class='add'>+	if (ext4_freed_extents_can_be_merged(prev, entry))</div><div class='add'>+		ext4_merge_freed_extents(sbi, root, prev, entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+ext4_try_merge_freed_extent_next(struct ext4_sb_info *sbi, struct rb_root *root,</div><div class='add'>+				 struct ext4_free_data *entry)</div><div class='add'>+{</div><div class='add'>+	struct ext4_free_data *next;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	node = rb_next(&amp;entry-&gt;efd_node);</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	next = rb_entry(node, struct ext4_free_data, efd_node);</div><div class='add'>+	if (ext4_freed_extents_can_be_merged(entry, next))</div><div class='add'>+		ext4_merge_freed_extents(sbi, root, entry, next);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static noinline_for_stack void</div><div class='hunk'>@@ -6284,16 +6446,17 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,</div><div class='ctx'> 	ext4_group_t group = e4b-&gt;bd_group;</div><div class='ctx'> 	ext4_grpblk_t cluster;</div><div class='ctx'> 	ext4_grpblk_t clusters = new_entry-&gt;efd_count;</div><div class='del'>-	struct ext4_free_data *entry;</div><div class='add'>+	struct ext4_free_data *entry = NULL;</div><div class='ctx'> 	struct ext4_group_info *db = e4b-&gt;bd_info;</div><div class='ctx'> 	struct super_block *sb = e4b-&gt;bd_sb;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='del'>-	struct rb_node **n = &amp;db-&gt;bb_free_root.rb_node, *node;</div><div class='add'>+	struct rb_root *root = &amp;db-&gt;bb_free_root;</div><div class='add'>+	struct rb_node **n = &amp;root-&gt;rb_node;</div><div class='ctx'> 	struct rb_node *parent = NULL, *new_node;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ext4_handle_valid(handle));</div><div class='del'>-	BUG_ON(e4b-&gt;bd_bitmap_page == NULL);</div><div class='del'>-	BUG_ON(e4b-&gt;bd_buddy_page == NULL);</div><div class='add'>+	BUG_ON(e4b-&gt;bd_bitmap_folio == NULL);</div><div class='add'>+	BUG_ON(e4b-&gt;bd_buddy_folio == NULL);</div><div class='ctx'> </div><div class='ctx'> 	new_node = &amp;new_entry-&gt;efd_node;</div><div class='ctx'> 	cluster = new_entry-&gt;efd_start_cluster;</div><div class='hunk'>@@ -6304,8 +6467,8 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,</div><div class='ctx'> 		 * otherwise we'll refresh it from</div><div class='ctx'> 		 * on-disk bitmap and lose not-yet-available</div><div class='ctx'> 		 * blocks */</div><div class='del'>-		get_page(e4b-&gt;bd_buddy_page);</div><div class='del'>-		get_page(e4b-&gt;bd_bitmap_page);</div><div class='add'>+		folio_get(e4b-&gt;bd_buddy_folio);</div><div class='add'>+		folio_get(e4b-&gt;bd_bitmap_folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	while (*n) {</div><div class='ctx'> 		parent = *n;</div><div class='hunk'>@@ -6324,27 +6487,30 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rb_link_node(new_node, parent, n);</div><div class='del'>-	rb_insert_color(new_node, &amp;db-&gt;bb_free_root);</div><div class='add'>+	atomic_add(clusters, &amp;sbi-&gt;s_mb_free_pending);</div><div class='add'>+	if (!entry)</div><div class='add'>+		goto insert;</div><div class='ctx'> </div><div class='del'>-	/* Now try to see the extent can be merged to left and right */</div><div class='del'>-	node = rb_prev(new_node);</div><div class='del'>-	if (node) {</div><div class='del'>-		entry = rb_entry(node, struct ext4_free_data, efd_node);</div><div class='del'>-		ext4_try_merge_freed_extent(sbi, entry, new_entry,</div><div class='del'>-					    &amp;(db-&gt;bb_free_root));</div><div class='add'>+	/* Now try to see the extent can be merged to prev and next */</div><div class='add'>+	if (ext4_freed_extents_can_be_merged(new_entry, entry)) {</div><div class='add'>+		entry-&gt;efd_start_cluster = cluster;</div><div class='add'>+		entry-&gt;efd_count += new_entry-&gt;efd_count;</div><div class='add'>+		kmem_cache_free(ext4_free_data_cachep, new_entry);</div><div class='add'>+		ext4_try_merge_freed_extent_prev(sbi, root, entry);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	node = rb_next(new_node);</div><div class='del'>-	if (node) {</div><div class='del'>-		entry = rb_entry(node, struct ext4_free_data, efd_node);</div><div class='del'>-		ext4_try_merge_freed_extent(sbi, entry, new_entry,</div><div class='del'>-					    &amp;(db-&gt;bb_free_root));</div><div class='add'>+	if (ext4_freed_extents_can_be_merged(entry, new_entry)) {</div><div class='add'>+		entry-&gt;efd_count += new_entry-&gt;efd_count;</div><div class='add'>+		kmem_cache_free(ext4_free_data_cachep, new_entry);</div><div class='add'>+		ext4_try_merge_freed_extent_next(sbi, root, entry);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+insert:</div><div class='add'>+	rb_link_node(new_node, parent, n);</div><div class='add'>+	rb_insert_color(new_node, root);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='ctx'> 	list_add_tail(&amp;new_entry-&gt;efd_list, &amp;sbi-&gt;s_freed_data_list[new_entry-&gt;efd_tid &amp; 1]);</div><div class='del'>-	sbi-&gt;s_mb_free_pending += clusters;</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6474,14 +6640,21 @@ do_more:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (test_opt(sb, DISCARD)) {</div><div class='ctx'> 			err = ext4_issue_discard(sb, block_group, bit,</div><div class='del'>-						 count_clusters, NULL);</div><div class='del'>-			if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+						 count_clusters);</div><div class='add'>+			/*</div><div class='add'>+			 * Ignore EOPNOTSUPP error. This is consistent with</div><div class='add'>+			 * what happens when using journal.</div><div class='add'>+			 */</div><div class='add'>+			if (err == -EOPNOTSUPP)</div><div class='add'>+				err = 0;</div><div class='add'>+			if (err)</div><div class='ctx'> 				ext4_msg(sb, KERN_WARNING, "discard request in"</div><div class='ctx'> 					 " group:%u block:%d count:%lu failed"</div><div class='ctx'> 					 " with %d", block_group, bit, count,</div><div class='ctx'> 					 err);</div><div class='del'>-		} else</div><div class='del'>-			EXT4_MB_GRP_CLEAR_TRIMMED(e4b.bd_info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		EXT4_MB_GRP_CLEAR_TRIMMED(e4b.bd_info);</div><div class='ctx'> </div><div class='ctx'> 		ext4_lock_group(sb, block_group);</div><div class='ctx'> 		mb_free_blocks(inode, &amp;e4b, bit, count_clusters);</div><div class='hunk'>@@ -6610,7 +6783,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 			cond_resched();</div><div class='ctx'> 			if (is_metadata)</div><div class='del'>-				bh = sb_find_get_block(inode-&gt;i_sb, block + i);</div><div class='add'>+				bh = sb_find_get_block_nonatomic(inode-&gt;i_sb,</div><div class='add'>+								 block + i);</div><div class='ctx'> 			ext4_forget(handle, is_metadata, inode, bh, block + i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6725,7 +6899,7 @@ __acquires(bitlock)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mb_mark_used(e4b, &amp;ex);</div><div class='ctx'> 	ext4_unlock_group(sb, group);</div><div class='del'>-	ret = ext4_issue_discard(sb, group, start, count, NULL);</div><div class='add'>+	ret = ext4_issue_discard(sb, group, start, count);</div><div class='ctx'> 	ext4_lock_group(sb, group);</div><div class='ctx'> 	mb_free_blocks(NULL, e4b, start, ex.fe_len);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -6761,6 +6935,9 @@ __releases(ext4_group_lock_ptr(sb, e4b-&gt;bd_group))</div><div class='ctx'> 	bool set_trimmed = false;</div><div class='ctx'> 	void *bitmap;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b-&gt;bd_info)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	last = ext4_last_grp_cluster(sb, e4b-&gt;bd_group);</div><div class='ctx'> 	bitmap = e4b-&gt;bd_bitmap;</div><div class='ctx'> 	if (start == 0 &amp;&amp; max &gt;= last)</div><div class='hunk'>@@ -6962,13 +7139,14 @@ int</div><div class='ctx'> ext4_mballoc_query_range(</div><div class='ctx'> 	struct super_block		*sb,</div><div class='ctx'> 	ext4_group_t			group,</div><div class='del'>-	ext4_grpblk_t			start,</div><div class='add'>+	ext4_grpblk_t			first,</div><div class='ctx'> 	ext4_grpblk_t			end,</div><div class='add'>+	ext4_mballoc_query_range_fn	meta_formatter,</div><div class='ctx'> 	ext4_mballoc_query_range_fn	formatter,</div><div class='ctx'> 	void				*priv)</div><div class='ctx'> {</div><div class='ctx'> 	void				*bitmap;</div><div class='del'>-	ext4_grpblk_t			next;</div><div class='add'>+	ext4_grpblk_t			start, next;</div><div class='ctx'> 	struct ext4_buddy		e4b;</div><div class='ctx'> 	int				error;</div><div class='ctx'> </div><div class='hunk'>@@ -6979,10 +7157,19 @@ ext4_mballoc_query_range(</div><div class='ctx'> </div><div class='ctx'> 	ext4_lock_group(sb, group);</div><div class='ctx'> </div><div class='del'>-	start = max(e4b.bd_info-&gt;bb_first_free, start);</div><div class='add'>+	start = max(e4b.bd_info-&gt;bb_first_free, first);</div><div class='ctx'> 	if (end &gt;= EXT4_CLUSTERS_PER_GROUP(sb))</div><div class='ctx'> 		end = EXT4_CLUSTERS_PER_GROUP(sb) - 1;</div><div class='del'>-</div><div class='add'>+	if (meta_formatter &amp;&amp; start != first) {</div><div class='add'>+		if (start &gt; end)</div><div class='add'>+			start = end;</div><div class='add'>+		ext4_unlock_group(sb, group);</div><div class='add'>+		error = meta_formatter(sb, group, first, start - first,</div><div class='add'>+				       priv);</div><div class='add'>+		if (error)</div><div class='add'>+			goto out_unload;</div><div class='add'>+		ext4_lock_group(sb, group);</div><div class='add'>+	}</div><div class='ctx'> 	while (start &lt;= end) {</div><div class='ctx'> 		start = mb_find_next_zero_bit(bitmap, end + 1, start);</div><div class='ctx'> 		if (start &gt; end)</div><div class='head'>diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h<br/>index d7aeb5da7d86..15a049f05d04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/mballoc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mballoc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/mballoc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/mballoc.h</a></div><div class='hunk'>@@ -187,15 +187,19 @@ struct ext4_allocation_context {</div><div class='ctx'> 	struct ext4_free_extent ac_f_ex;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * goal len can change in CR1.5, so save the original len. This is</div><div class='del'>-	 * used while adjusting the PA window and for accounting.</div><div class='add'>+	 * goal len can change in CR_BEST_AVAIL_LEN, so save the original len.</div><div class='add'>+	 * This is used while adjusting the PA window and for accounting.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ext4_grpblk_t	ac_orig_goal_len;</div><div class='ctx'> </div><div class='del'>-	__u32 ac_groups_considered;</div><div class='add'>+	ext4_group_t ac_prefetch_grp;</div><div class='add'>+	unsigned int ac_prefetch_ios;</div><div class='add'>+	unsigned int ac_prefetch_nr;</div><div class='add'>+</div><div class='add'>+	int ac_first_err;</div><div class='add'>+</div><div class='ctx'> 	__u32 ac_flags;		/* allocation hints */</div><div class='ctx'> 	__u16 ac_groups_scanned;</div><div class='del'>-	__u16 ac_groups_linear_remaining;</div><div class='ctx'> 	__u16 ac_found;</div><div class='ctx'> 	__u16 ac_cX_found[EXT4_MB_NUM_CRS];</div><div class='ctx'> 	__u16 ac_tail;</div><div class='hunk'>@@ -205,8 +209,10 @@ struct ext4_allocation_context {</div><div class='ctx'> 	__u8 ac_2order;		/* if request is to allocate 2^N blocks and</div><div class='ctx'> 				 * N &gt; 0, the field stores N, otherwise 0 */</div><div class='ctx'> 	__u8 ac_op;		/* operation, for history only */</div><div class='del'>-	struct page *ac_bitmap_page;</div><div class='del'>-	struct page *ac_buddy_page;</div><div class='add'>+</div><div class='add'>+	struct ext4_buddy *ac_e4b;</div><div class='add'>+	struct folio *ac_bitmap_folio;</div><div class='add'>+	struct folio *ac_buddy_folio;</div><div class='ctx'> 	struct ext4_prealloc_space *ac_pa;</div><div class='ctx'> 	struct ext4_locality_group *ac_lg;</div><div class='ctx'> };</div><div class='hunk'>@@ -216,9 +222,9 @@ struct ext4_allocation_context {</div><div class='ctx'> #define AC_STATUS_BREAK		3</div><div class='ctx'> </div><div class='ctx'> struct ext4_buddy {</div><div class='del'>-	struct page *bd_buddy_page;</div><div class='add'>+	struct folio *bd_buddy_folio;</div><div class='ctx'> 	void *bd_buddy;</div><div class='del'>-	struct page *bd_bitmap_page;</div><div class='add'>+	struct folio *bd_bitmap_folio;</div><div class='ctx'> 	void *bd_bitmap;</div><div class='ctx'> 	struct ext4_group_info *bd_info;</div><div class='ctx'> 	struct super_block *bd_sb;</div><div class='hunk'>@@ -260,6 +266,7 @@ ext4_mballoc_query_range(</div><div class='ctx'> 	ext4_group_t			agno,</div><div class='ctx'> 	ext4_grpblk_t			start,</div><div class='ctx'> 	ext4_grpblk_t			end,</div><div class='add'>+	ext4_mballoc_query_range_fn	meta_formatter,</div><div class='ctx'> 	ext4_mballoc_query_range_fn	formatter,</div><div class='ctx'> 	void				*priv);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c<br/>index d98ac2af8199..1b0dfd963d3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/migrate.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/migrate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/migrate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/migrate.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@ static int finish_range(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	path = ext4_find_extent(inode, lb-&gt;first_block, NULL, 0);</div><div class='ctx'> 	if (IS_ERR(path)) {</div><div class='ctx'> 		retval = PTR_ERR(path);</div><div class='del'>-		path = NULL;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +52,9 @@ static int finish_range(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	retval = ext4_datasem_ensure_credits(handle, inode, needed, needed, 0);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto err_out;</div><div class='del'>-	retval = ext4_ext_insert_extent(handle, inode, &amp;path, &amp;newext, 0);</div><div class='add'>+	path = ext4_ext_insert_extent(handle, inode, path, &amp;newext, 0);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		retval = PTR_ERR(path);</div><div class='ctx'> err_out:</div><div class='ctx'> 	up_write((&amp;EXT4_I(inode)-&gt;i_data_sem));</div><div class='ctx'> 	ext4_free_ext_path(path);</div><div class='hunk'>@@ -663,8 +664,8 @@ int ext4_ind_migrate(struct inode *inode)</div><div class='ctx'> 	if (unlikely(ret2 &amp;&amp; !ret))</div><div class='ctx'> 		ret = ret2;</div><div class='ctx'> errout:</div><div class='del'>-	ext4_journal_stop(handle);</div><div class='ctx'> 	up_write(&amp;EXT4_I(inode)-&gt;i_data_sem);</div><div class='add'>+	ext4_journal_stop(handle);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	ext4_writepages_up_write(inode-&gt;i_sb, alloc_ctx);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c<br/>index bd946d0c71b7..6f57c181ff77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/mmp.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/mmp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/mmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/mmp.c</a></div><div class='hunk'>@@ -14,14 +14,14 @@ static __le32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)</div><div class='ctx'> 	int offset = offsetof(struct mmp_struct, mmp_checksum);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (char *)mmp, offset);</div><div class='add'>+	csum = ext4_chksum(sbi-&gt;s_csum_seed, (char *)mmp, offset);</div><div class='ctx'> </div><div class='ctx'> 	return cpu_to_le32(csum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_mmp_csum_verify(struct super_block *sb, struct mmp_struct *mmp)</div><div class='ctx'> {</div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	return mmp-&gt;mmp_checksum == ext4_mmp_csum(sb, mmp);</div><div class='hunk'>@@ -29,7 +29,7 @@ static int ext4_mmp_csum_verify(struct super_block *sb, struct mmp_struct *mmp)</div><div class='ctx'> </div><div class='ctx'> static void ext4_mmp_csum_set(struct super_block *sb, struct mmp_struct *mmp)</div><div class='ctx'> {</div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mmp-&gt;mmp_checksum = ext4_mmp_csum(sb, mmp);</div><div class='hunk'>@@ -57,16 +57,12 @@ static int write_mmp_block_thawed(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> static int write_mmp_block(struct super_block *sb, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We protect against freezing so that we don't create dirty buffers</div><div class='ctx'> 	 * on frozen filesystem.</div><div class='ctx'> 	 */</div><div class='del'>-	sb_start_write(sb);</div><div class='del'>-	err = write_mmp_block_thawed(sb, bh);</div><div class='del'>-	sb_end_write(sb);</div><div class='del'>-	return err;</div><div class='add'>+	scoped_guard(super_write, sb)</div><div class='add'>+		return write_mmp_block_thawed(sb, bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -94,7 +90,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lock_buffer(*bh);</div><div class='del'>-	ret = ext4_read_bh(*bh, REQ_META | REQ_PRIO, NULL);</div><div class='add'>+	ret = ext4_read_bh(*bh, REQ_META | REQ_PRIO, NULL, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto warn_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +158,7 @@ static int kmmpd(void *data)</div><div class='ctx'> 	memcpy(mmp-&gt;mmp_nodename, init_utsname()-&gt;nodename,</div><div class='ctx'> 	       sizeof(mmp-&gt;mmp_nodename));</div><div class='ctx'> </div><div class='del'>-	while (!kthread_should_stop() &amp;&amp; !ext4_forced_shutdown(sb)) {</div><div class='add'>+	while (!kthread_should_stop() &amp;&amp; !ext4_emergency_state(sb)) {</div><div class='ctx'> 		if (!ext4_has_feature_mmp(sb)) {</div><div class='ctx'> 			ext4_warning(sb, "kmmpd being stopped since MMP feature"</div><div class='ctx'> 				     " has been disabled.");</div><div class='hunk'>@@ -231,9 +227,9 @@ static int kmmpd(void *data)</div><div class='ctx'> 		 * Adjust the mmp_check_interval depending on how much time</div><div class='ctx'> 		 * it took for the MMP block to be written.</div><div class='ctx'> 		 */</div><div class='del'>-		mmp_check_interval = max(min(EXT4_MMP_CHECK_MULT * diff / HZ,</div><div class='del'>-					     EXT4_MMP_MAX_CHECK_INTERVAL),</div><div class='del'>-					 EXT4_MMP_MIN_CHECK_INTERVAL);</div><div class='add'>+		mmp_check_interval = clamp(EXT4_MMP_CHECK_MULT * diff / HZ,</div><div class='add'>+					   EXT4_MMP_MIN_CHECK_INTERVAL,</div><div class='add'>+					   EXT4_MMP_MAX_CHECK_INTERVAL);</div><div class='ctx'> 		mmp-&gt;mmp_check_interval = cpu_to_le16(mmp_check_interval);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c<br/>index 3aa57376d9c2..0550fd30fd10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/move_extent.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/move_extent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/move_extent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/move_extent.c</a></div><div class='hunk'>@@ -13,32 +13,14 @@</div><div class='ctx'> #include "ext4.h"</div><div class='ctx'> #include "ext4_extents.h"</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * get_ext_path() - Find an extent path for designated logical block number.</div><div class='del'>- * @inode:	inode to be searched</div><div class='del'>- * @lblock:	logical block number to find an extent path</div><div class='del'>- * @ppath:	pointer to an extent path pointer (for output)</div><div class='del'>- *</div><div class='del'>- * ext4_find_extent wrapper. Return 0 on success, or a negative error value</div><div class='del'>- * on failure.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-get_ext_path(struct inode *inode, ext4_lblk_t lblock,</div><div class='del'>-		struct ext4_ext_path **ppath)</div><div class='del'>-{</div><div class='del'>-	struct ext4_ext_path *path;</div><div class='del'>-</div><div class='del'>-	path = ext4_find_extent(inode, lblock, ppath, EXT4_EX_NOCACHE);</div><div class='del'>-	if (IS_ERR(path))</div><div class='del'>-		return PTR_ERR(path);</div><div class='del'>-	if (path[ext_depth(inode)].p_ext == NULL) {</div><div class='del'>-		ext4_free_ext_path(path);</div><div class='del'>-		*ppath = NULL;</div><div class='del'>-		return -ENODATA;</div><div class='del'>-	}</div><div class='del'>-	*ppath = path;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#include &lt;trace/events/ext4.h&gt;</div><div class='add'>+</div><div class='add'>+struct mext_data {</div><div class='add'>+	struct inode *orig_inode;	/* Origin file inode */</div><div class='add'>+	struct inode *donor_inode;	/* Donor file inode */</div><div class='add'>+	struct ext4_map_blocks orig_map;/* Origin file's move mapping */</div><div class='add'>+	ext4_lblk_t donor_lblk;		/* Start block of the donor file */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ext4_double_down_write_data_sem() - write lock two inodes's i_data_sem</div><div class='hunk'>@@ -56,7 +38,6 @@ ext4_double_down_write_data_sem(struct inode *first, struct inode *second)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		down_write(&amp;EXT4_I(second)-&gt;i_data_sem);</div><div class='ctx'> 		down_write_nested(&amp;EXT4_I(first)-&gt;i_data_sem, I_DATA_SEM_OTHER);</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -75,57 +56,14 @@ ext4_double_up_write_data_sem(struct inode *orig_inode,</div><div class='ctx'> 	up_write(&amp;EXT4_I(donor_inode)-&gt;i_data_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * mext_check_coverage - Check that all extents in range has the same type</div><div class='del'>- *</div><div class='del'>- * @inode:		inode in question</div><div class='del'>- * @from:		block offset of inode</div><div class='del'>- * @count:		block count to be checked</div><div class='del'>- * @unwritten:		extents expected to be unwritten</div><div class='del'>- * @err:		pointer to save error value</div><div class='del'>- *</div><div class='del'>- * Return 1 if all extents in range has expected type, and zero otherwise.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-mext_check_coverage(struct inode *inode, ext4_lblk_t from, ext4_lblk_t count,</div><div class='del'>-		    int unwritten, int *err)</div><div class='del'>-{</div><div class='del'>-	struct ext4_ext_path *path = NULL;</div><div class='del'>-	struct ext4_extent *ext;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	ext4_lblk_t last = from + count;</div><div class='del'>-	while (from &lt; last) {</div><div class='del'>-		*err = get_ext_path(inode, from, &amp;path);</div><div class='del'>-		if (*err)</div><div class='del'>-			goto out;</div><div class='del'>-		ext = path[ext_depth(inode)].p_ext;</div><div class='del'>-		if (unwritten != ext4_ext_is_unwritten(ext))</div><div class='del'>-			goto out;</div><div class='del'>-		from += ext4_ext_get_actual_len(ext);</div><div class='del'>-	}</div><div class='del'>-	ret = 1;</div><div class='del'>-out:</div><div class='del'>-	ext4_free_ext_path(path);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mext_folio_double_lock - Grab and lock folio on both @inode1 and @inode2</div><div class='del'>- *</div><div class='del'>- * @inode1:	the inode structure</div><div class='del'>- * @inode2:	the inode structure</div><div class='del'>- * @index1:	folio index</div><div class='del'>- * @index2:	folio index</div><div class='del'>- * @folio:	result folio vector</div><div class='del'>- *</div><div class='del'>- * Grab two locked folio for inode's by inode order</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-mext_folio_double_lock(struct inode *inode1, struct inode *inode2,</div><div class='del'>-		      pgoff_t index1, pgoff_t index2, struct folio *folio[2])</div><div class='add'>+/* Grab and lock folio on both @inode1 and @inode2 by inode order. */</div><div class='add'>+static int mext_folio_double_lock(struct inode *inode1, struct inode *inode2,</div><div class='add'>+				  pgoff_t index1, pgoff_t index2, size_t len,</div><div class='add'>+				  struct folio *folio[2])</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping[2];</div><div class='ctx'> 	unsigned int flags;</div><div class='add'>+	fgf_t fgp_flags = FGP_WRITEBEGIN;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!inode1 || !inode2);</div><div class='ctx'> 	if (inode1 &lt; inode2) {</div><div class='hunk'>@@ -138,14 +76,15 @@ mext_folio_double_lock(struct inode *inode1, struct inode *inode2,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flags = memalloc_nofs_save();</div><div class='del'>-	folio[0] = __filemap_get_folio(mapping[0], index1, FGP_WRITEBEGIN,</div><div class='add'>+	fgp_flags |= fgf_set_order(len);</div><div class='add'>+	folio[0] = __filemap_get_folio(mapping[0], index1, fgp_flags,</div><div class='ctx'> 			mapping_gfp_mask(mapping[0]));</div><div class='ctx'> 	if (IS_ERR(folio[0])) {</div><div class='ctx'> 		memalloc_nofs_restore(flags);</div><div class='ctx'> 		return PTR_ERR(folio[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	folio[1] = __filemap_get_folio(mapping[1], index2, FGP_WRITEBEGIN,</div><div class='add'>+	folio[1] = __filemap_get_folio(mapping[1], index2, fgp_flags,</div><div class='ctx'> 			mapping_gfp_mask(mapping[1]));</div><div class='ctx'> 	memalloc_nofs_restore(flags);</div><div class='ctx'> 	if (IS_ERR(folio[1])) {</div><div class='hunk'>@@ -166,15 +105,24 @@ mext_folio_double_lock(struct inode *inode1, struct inode *inode2,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Force page buffers uptodate w/o dropping page's lock */</div><div class='del'>-static int</div><div class='del'>-mext_page_mkuptodate(struct folio *folio, unsigned from, unsigned to)</div><div class='add'>+static void mext_folio_double_unlock(struct folio *folio[2])</div><div class='add'>+{</div><div class='add'>+	folio_unlock(folio[0]);</div><div class='add'>+	folio_put(folio[0]);</div><div class='add'>+	folio_unlock(folio[1]);</div><div class='add'>+	folio_put(folio[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Force folio buffers uptodate w/o dropping folio's lock */</div><div class='add'>+static int mext_folio_mkuptodate(struct folio *folio, size_t from, size_t to)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	sector_t block;</div><div class='del'>-	struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];</div><div class='add'>+	struct buffer_head *bh, *head;</div><div class='ctx'> 	unsigned int blocksize, block_start, block_end;</div><div class='del'>-	int i, err,  nr = 0, partial = 0;</div><div class='add'>+	int nr = 0;</div><div class='add'>+	bool partial = false;</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> 	BUG_ON(folio_test_writeback(folio));</div><div class='ctx'> </div><div class='hunk'>@@ -186,313 +134,366 @@ mext_page_mkuptodate(struct folio *folio, unsigned from, unsigned to)</div><div class='ctx'> 	if (!head)</div><div class='ctx'> 		head = create_empty_buffers(folio, blocksize, 0);</div><div class='ctx'> </div><div class='del'>-	block = (sector_t)folio-&gt;index &lt;&lt; (PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='del'>-	for (bh = head, block_start = 0; bh != head || !block_start;</div><div class='del'>-	     block++, block_start = block_end, bh = bh-&gt;b_this_page) {</div><div class='add'>+	block = folio_pos(folio) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	block_end = 0;</div><div class='add'>+	bh = head;</div><div class='add'>+	do {</div><div class='add'>+		block_start = block_end;</div><div class='ctx'> 		block_end = block_start + blocksize;</div><div class='ctx'> 		if (block_end &lt;= from || block_start &gt;= to) {</div><div class='ctx'> 			if (!buffer_uptodate(bh))</div><div class='del'>-				partial = 1;</div><div class='add'>+				partial = true;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (buffer_uptodate(bh))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!buffer_mapped(bh)) {</div><div class='del'>-			err = ext4_get_block(inode, block, bh, 0);</div><div class='del'>-			if (err) {</div><div class='del'>-				folio_set_error(folio);</div><div class='add'>+			int err = ext4_get_block(inode, block, bh, 0);</div><div class='add'>+			if (err)</div><div class='ctx'> 				return err;</div><div class='del'>-			}</div><div class='ctx'> 			if (!buffer_mapped(bh)) {</div><div class='ctx'> 				folio_zero_range(folio, block_start, blocksize);</div><div class='ctx'> 				set_buffer_uptodate(bh);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		BUG_ON(nr &gt;= MAX_BUF_PER_PAGE);</div><div class='del'>-		arr[nr++] = bh;</div><div class='del'>-	}</div><div class='add'>+		lock_buffer(bh);</div><div class='add'>+		if (buffer_uptodate(bh)) {</div><div class='add'>+			unlock_buffer(bh);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ext4_read_bh_nowait(bh, 0, NULL, false);</div><div class='add'>+		nr++;</div><div class='add'>+	} while (block++, (bh = bh-&gt;b_this_page) != head);</div><div class='add'>+</div><div class='ctx'> 	/* No io required */</div><div class='ctx'> 	if (!nr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		bh = arr[i];</div><div class='del'>-		if (!bh_uptodate_or_lock(bh)) {</div><div class='del'>-			err = ext4_read_bh(bh, 0, NULL);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	bh = head;</div><div class='add'>+	do {</div><div class='add'>+		if (bh_offset(bh) + blocksize &lt;= from)</div><div class='add'>+			continue;</div><div class='add'>+		if (bh_offset(bh) &gt;= to)</div><div class='add'>+			break;</div><div class='add'>+		wait_on_buffer(bh);</div><div class='add'>+		if (buffer_uptodate(bh))</div><div class='add'>+			continue;</div><div class='add'>+		return -EIO;</div><div class='add'>+	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='ctx'> out:</div><div class='ctx'> 	if (!partial)</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * move_extent_per_page - Move extent data per page</div><div class='del'>- *</div><div class='del'>- * @o_filp:			file structure of original file</div><div class='del'>- * @donor_inode:		donor inode</div><div class='del'>- * @orig_page_offset:		page index on original file</div><div class='del'>- * @donor_page_offset:		page index on donor file</div><div class='del'>- * @data_offset_in_page:	block index where data swapping starts</div><div class='del'>- * @block_len_in_page:		the number of blocks to be swapped</div><div class='del'>- * @unwritten:			orig extent is unwritten or not</div><div class='del'>- * @err:			pointer to save return value</div><div class='del'>- *</div><div class='del'>- * Save the data in original inode blocks and replace original inode extents</div><div class='del'>- * with donor inode extents by calling ext4_swap_extents().</div><div class='del'>- * Finally, write out the saved data in new original inode blocks. Return</div><div class='del'>- * replaced block count.</div><div class='add'>+enum mext_move_type {MEXT_SKIP_EXTENT, MEXT_MOVE_EXTENT, MEXT_COPY_DATA};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Start to move extent between the origin inode and the donor inode,</div><div class='add'>+ * hold one folio for each inode and check the candidate moving extent</div><div class='add'>+ * mapping status again.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-move_extent_per_page(struct file *o_filp, struct inode *donor_inode,</div><div class='del'>-		     pgoff_t orig_page_offset, pgoff_t donor_page_offset,</div><div class='del'>-		     int data_offset_in_page,</div><div class='del'>-		     int block_len_in_page, int unwritten, int *err)</div><div class='add'>+static int mext_move_begin(struct mext_data *mext, struct folio *folio[2],</div><div class='add'>+			   enum mext_move_type *move_type)</div><div class='ctx'> {</div><div class='del'>-	struct inode *orig_inode = file_inode(o_filp);</div><div class='del'>-	struct folio *folio[2] = {NULL, NULL};</div><div class='del'>-	handle_t *handle;</div><div class='del'>-	ext4_lblk_t orig_blk_offset, donor_blk_offset;</div><div class='del'>-	unsigned long blocksize = orig_inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	unsigned int tmp_data_size, data_size, replaced_size;</div><div class='del'>-	int i, err2, jblocks, retries = 0;</div><div class='del'>-	int replaced_count = 0;</div><div class='del'>-	int from = data_offset_in_page &lt;&lt; orig_inode-&gt;i_blkbits;</div><div class='del'>-	int blocks_per_page = PAGE_SIZE &gt;&gt; orig_inode-&gt;i_blkbits;</div><div class='del'>-	struct super_block *sb = orig_inode-&gt;i_sb;</div><div class='del'>-	struct buffer_head *bh = NULL;</div><div class='add'>+	struct inode *orig_inode = mext-&gt;orig_inode;</div><div class='add'>+	struct inode *donor_inode = mext-&gt;donor_inode;</div><div class='add'>+	unsigned int blkbits = orig_inode-&gt;i_blkbits;</div><div class='add'>+	struct ext4_map_blocks donor_map = {0};</div><div class='add'>+	loff_t orig_pos, donor_pos;</div><div class='add'>+	size_t move_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	orig_pos = ((loff_t)mext-&gt;orig_map.m_lblk) &lt;&lt; blkbits;</div><div class='add'>+	donor_pos = ((loff_t)mext-&gt;donor_lblk) &lt;&lt; blkbits;</div><div class='add'>+	ret = mext_folio_double_lock(orig_inode, donor_inode,</div><div class='add'>+			orig_pos &gt;&gt; PAGE_SHIFT, donor_pos &gt;&gt; PAGE_SHIFT,</div><div class='add'>+			((size_t)mext-&gt;orig_map.m_len) &lt;&lt; blkbits, folio);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * It needs twice the amount of ordinary journal buffers because</div><div class='del'>-	 * inode and donor_inode may change each different metadata blocks.</div><div class='add'>+	 * Check the origin inode's mapping information again under the</div><div class='add'>+	 * folio lock, as we do not hold the i_data_sem at all times, and</div><div class='add'>+	 * it may change during the concurrent write-back operation.</div><div class='ctx'> 	 */</div><div class='del'>-again:</div><div class='del'>-	*err = 0;</div><div class='del'>-	jblocks = ext4_writepage_trans_blocks(orig_inode) * 2;</div><div class='del'>-	handle = ext4_journal_start(orig_inode, EXT4_HT_MOVE_EXTENTS, jblocks);</div><div class='add'>+	if (mext-&gt;orig_map.m_seq != READ_ONCE(EXT4_I(orig_inode)-&gt;i_es_seq)) {</div><div class='add'>+		ret = -ESTALE;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Adjust the moving length according to the length of shorter folio. */</div><div class='add'>+	move_len = umin(folio_pos(folio[0]) + folio_size(folio[0]) - orig_pos,</div><div class='add'>+			folio_pos(folio[1]) + folio_size(folio[1]) - donor_pos);</div><div class='add'>+	move_len &gt;&gt;= blkbits;</div><div class='add'>+	if (move_len &lt; mext-&gt;orig_map.m_len)</div><div class='add'>+		mext-&gt;orig_map.m_len = move_len;</div><div class='add'>+</div><div class='add'>+	donor_map.m_lblk = mext-&gt;donor_lblk;</div><div class='add'>+	donor_map.m_len = mext-&gt;orig_map.m_len;</div><div class='add'>+	donor_map.m_flags = 0;</div><div class='add'>+	ret = ext4_map_blocks(NULL, donor_inode, &amp;donor_map, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Adjust the moving length according to the donor mapping length. */</div><div class='add'>+	mext-&gt;orig_map.m_len = donor_map.m_len;</div><div class='add'>+</div><div class='add'>+	/* Skip moving if the donor range is a hole or a delalloc extent. */</div><div class='add'>+	if (!(donor_map.m_flags &amp; (EXT4_MAP_MAPPED | EXT4_MAP_UNWRITTEN)))</div><div class='add'>+		*move_type = MEXT_SKIP_EXTENT;</div><div class='add'>+	/* If both mapping ranges are unwritten, no need to copy data. */</div><div class='add'>+	else if ((mext-&gt;orig_map.m_flags &amp; EXT4_MAP_UNWRITTEN) &amp;&amp;</div><div class='add'>+		 (donor_map.m_flags &amp; EXT4_MAP_UNWRITTEN))</div><div class='add'>+		*move_type = MEXT_MOVE_EXTENT;</div><div class='add'>+	else</div><div class='add'>+		*move_type = MEXT_COPY_DATA;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	mext_folio_double_unlock(folio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Re-create the new moved mapping buffers of the original inode and commit</div><div class='add'>+ * the entire written range.</div><div class='add'>+ */</div><div class='add'>+static int mext_folio_mkwrite(struct inode *inode, struct folio *folio,</div><div class='add'>+			      size_t from, size_t to)</div><div class='add'>+{</div><div class='add'>+	unsigned int blocksize = i_blocksize(inode);</div><div class='add'>+	struct buffer_head *bh, *head;</div><div class='add'>+	size_t block_start, block_end;</div><div class='add'>+	sector_t block;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	head = folio_buffers(folio);</div><div class='add'>+	if (!head)</div><div class='add'>+		head = create_empty_buffers(folio, blocksize, 0);</div><div class='add'>+</div><div class='add'>+	block = folio_pos(folio) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	block_end = 0;</div><div class='add'>+	bh = head;</div><div class='add'>+	do {</div><div class='add'>+		block_start = block_end;</div><div class='add'>+		block_end = block_start + blocksize;</div><div class='add'>+		if (block_end &lt;= from || block_start &gt;= to)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ext4_get_block(inode, block, bh, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} while (block++, (bh = bh-&gt;b_this_page) != head);</div><div class='add'>+</div><div class='add'>+	block_commit_write(folio, from, to);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save the data in original inode extent blocks and replace one folio size</div><div class='add'>+ * aligned original inode extent with one or one partial donor inode extent,</div><div class='add'>+ * and then write out the saved data in new original inode blocks. Pass out</div><div class='add'>+ * the replaced block count through m_len. Return 0 on success, and an error</div><div class='add'>+ * code otherwise.</div><div class='add'>+ */</div><div class='add'>+static int mext_move_extent(struct mext_data *mext, u64 *m_len)</div><div class='add'>+{</div><div class='add'>+	struct inode *orig_inode = mext-&gt;orig_inode;</div><div class='add'>+	struct inode *donor_inode = mext-&gt;donor_inode;</div><div class='add'>+	struct ext4_map_blocks *orig_map = &amp;mext-&gt;orig_map;</div><div class='add'>+	unsigned int blkbits = orig_inode-&gt;i_blkbits;</div><div class='add'>+	struct folio *folio[2] = {NULL, NULL};</div><div class='add'>+	loff_t from, length;</div><div class='add'>+	enum mext_move_type move_type = 0;</div><div class='add'>+	handle_t *handle;</div><div class='add'>+	u64 r_len = 0;</div><div class='add'>+	unsigned int credits;</div><div class='add'>+	int ret, ret2;</div><div class='add'>+</div><div class='add'>+	*m_len = 0;</div><div class='add'>+	trace_ext4_move_extent_enter(orig_inode, orig_map, donor_inode,</div><div class='add'>+				     mext-&gt;donor_lblk);</div><div class='add'>+	credits = ext4_chunk_trans_extent(orig_inode, 0) * 2;</div><div class='add'>+	handle = ext4_journal_start(orig_inode, EXT4_HT_MOVE_EXTENTS, credits);</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='del'>-		*err = PTR_ERR(handle);</div><div class='del'>-		return 0;</div><div class='add'>+		ret = PTR_ERR(handle);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	orig_blk_offset = orig_page_offset * blocks_per_page +</div><div class='del'>-		data_offset_in_page;</div><div class='del'>-</div><div class='del'>-	donor_blk_offset = donor_page_offset * blocks_per_page +</div><div class='del'>-		data_offset_in_page;</div><div class='del'>-</div><div class='del'>-	/* Calculate data_size */</div><div class='del'>-	if ((orig_blk_offset + block_len_in_page - 1) ==</div><div class='del'>-	    ((orig_inode-&gt;i_size - 1) &gt;&gt; orig_inode-&gt;i_blkbits)) {</div><div class='del'>-		/* Replace the last block */</div><div class='del'>-		tmp_data_size = orig_inode-&gt;i_size &amp; (blocksize - 1);</div><div class='del'>-		/*</div><div class='del'>-		 * If data_size equal zero, it shows data_size is multiples of</div><div class='del'>-		 * blocksize. So we set appropriate value.</div><div class='del'>-		 */</div><div class='del'>-		if (tmp_data_size == 0)</div><div class='del'>-			tmp_data_size = blocksize;</div><div class='del'>-</div><div class='del'>-		data_size = tmp_data_size +</div><div class='del'>-			((block_len_in_page - 1) &lt;&lt; orig_inode-&gt;i_blkbits);</div><div class='del'>-	} else</div><div class='del'>-		data_size = block_len_in_page &lt;&lt; orig_inode-&gt;i_blkbits;</div><div class='del'>-</div><div class='del'>-	replaced_size = data_size;</div><div class='del'>-</div><div class='del'>-	*err = mext_folio_double_lock(orig_inode, donor_inode, orig_page_offset,</div><div class='del'>-				     donor_page_offset, folio);</div><div class='del'>-	if (unlikely(*err &lt; 0))</div><div class='del'>-		goto stop_journal;</div><div class='add'>+	ret = mext_move_begin(mext, folio, &amp;move_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto stop_handle;</div><div class='add'>+</div><div class='add'>+	if (move_type == MEXT_SKIP_EXTENT)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * If orig extent was unwritten it can become initialized</div><div class='del'>-	 * at any time after i_data_sem was dropped, in order to</div><div class='del'>-	 * serialize with delalloc we have recheck extent while we</div><div class='del'>-	 * hold page's lock, if it is still the case data copy is not</div><div class='del'>-	 * necessary, just swap data blocks between orig and donor.</div><div class='add'>+	 * Copy the data. First, read the original inode data into the page</div><div class='add'>+	 * cache. Then, release the existing mapping relationships and swap</div><div class='add'>+	 * the extent. Finally, re-establish the new mapping relationships</div><div class='add'>+	 * and dirty the page cache.</div><div class='ctx'> 	 */</div><div class='add'>+	if (move_type == MEXT_COPY_DATA) {</div><div class='add'>+		from = offset_in_folio(folio[0],</div><div class='add'>+				((loff_t)orig_map-&gt;m_lblk) &lt;&lt; blkbits);</div><div class='add'>+		length = ((loff_t)orig_map-&gt;m_len) &lt;&lt; blkbits;</div><div class='ctx'> </div><div class='del'>-	VM_BUG_ON_FOLIO(folio_test_large(folio[0]), folio[0]);</div><div class='del'>-	VM_BUG_ON_FOLIO(folio_test_large(folio[1]), folio[1]);</div><div class='del'>-	VM_BUG_ON_FOLIO(folio_nr_pages(folio[0]) != folio_nr_pages(folio[1]), folio[1]);</div><div class='del'>-</div><div class='del'>-	if (unwritten) {</div><div class='del'>-		ext4_double_down_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-		/* If any of extents in range became initialized we have to</div><div class='del'>-		 * fallback to data copying */</div><div class='del'>-		unwritten = mext_check_coverage(orig_inode, orig_blk_offset,</div><div class='del'>-						block_len_in_page, 1, err);</div><div class='del'>-		if (*err)</div><div class='del'>-			goto drop_data_sem;</div><div class='del'>-</div><div class='del'>-		unwritten &amp;= mext_check_coverage(donor_inode, donor_blk_offset,</div><div class='del'>-						 block_len_in_page, 1, err);</div><div class='del'>-		if (*err)</div><div class='del'>-			goto drop_data_sem;</div><div class='del'>-</div><div class='del'>-		if (!unwritten) {</div><div class='del'>-			ext4_double_up_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-			goto data_copy;</div><div class='del'>-		}</div><div class='del'>-		if (!filemap_release_folio(folio[0], 0) ||</div><div class='del'>-		    !filemap_release_folio(folio[1], 0)) {</div><div class='del'>-			*err = -EBUSY;</div><div class='del'>-			goto drop_data_sem;</div><div class='del'>-		}</div><div class='del'>-		replaced_count = ext4_swap_extents(handle, orig_inode,</div><div class='del'>-						   donor_inode, orig_blk_offset,</div><div class='del'>-						   donor_blk_offset,</div><div class='del'>-						   block_len_in_page, 1, err);</div><div class='del'>-	drop_data_sem:</div><div class='del'>-		ext4_double_up_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-		goto unlock_folios;</div><div class='add'>+		ret = mext_folio_mkuptodate(folio[0], from, from + length);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='ctx'> 	}</div><div class='del'>-data_copy:</div><div class='del'>-	*err = mext_page_mkuptodate(folio[0], from, from + replaced_size);</div><div class='del'>-	if (*err)</div><div class='del'>-		goto unlock_folios;</div><div class='ctx'> </div><div class='del'>-	/* At this point all buffers in range are uptodate, old mapping layout</div><div class='del'>-	 * is no longer required, try to drop it now. */</div><div class='ctx'> 	if (!filemap_release_folio(folio[0], 0) ||</div><div class='ctx'> 	    !filemap_release_folio(folio[1], 0)) {</div><div class='del'>-		*err = -EBUSY;</div><div class='del'>-		goto unlock_folios;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Move extent */</div><div class='ctx'> 	ext4_double_down_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-	replaced_count = ext4_swap_extents(handle, orig_inode, donor_inode,</div><div class='del'>-					       orig_blk_offset, donor_blk_offset,</div><div class='del'>-					   block_len_in_page, 1, err);</div><div class='add'>+	*m_len = ext4_swap_extents(handle, orig_inode, donor_inode,</div><div class='add'>+				   orig_map-&gt;m_lblk, mext-&gt;donor_lblk,</div><div class='add'>+				   orig_map-&gt;m_len, 1, &amp;ret);</div><div class='ctx'> 	ext4_double_up_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-	if (*err) {</div><div class='del'>-		if (replaced_count) {</div><div class='del'>-			block_len_in_page = replaced_count;</div><div class='del'>-			replaced_size =</div><div class='del'>-				block_len_in_page &lt;&lt; orig_inode-&gt;i_blkbits;</div><div class='del'>-		} else</div><div class='del'>-			goto unlock_folios;</div><div class='del'>-	}</div><div class='del'>-	/* Perform all necessary steps similar write_begin()/write_end()</div><div class='del'>-	 * but keeping in mind that i_size will not change */</div><div class='del'>-	bh = folio_buffers(folio[0]);</div><div class='del'>-	if (!bh)</div><div class='del'>-		bh = create_empty_buffers(folio[0],</div><div class='del'>-				1 &lt;&lt; orig_inode-&gt;i_blkbits, 0);</div><div class='del'>-	for (i = 0; i &lt; data_offset_in_page; i++)</div><div class='del'>-		bh = bh-&gt;b_this_page;</div><div class='del'>-	for (i = 0; i &lt; block_len_in_page; i++) {</div><div class='del'>-		*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);</div><div class='del'>-		if (*err &lt; 0)</div><div class='del'>-			goto repair_branches;</div><div class='del'>-		bh = bh-&gt;b_this_page;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	block_commit_write(&amp;folio[0]-&gt;page, from, from + replaced_size);</div><div class='add'>+	/* A short-length swap cannot occur after a successful swap extent. */</div><div class='add'>+	if (WARN_ON_ONCE(!ret &amp;&amp; (*m_len != orig_map-&gt;m_len)))</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> </div><div class='del'>-	/* Even in case of data=writeback it is reasonable to pin</div><div class='del'>-	 * inode to transaction, to prevent unexpected data loss */</div><div class='del'>-	*err = ext4_jbd2_inode_add_write(handle, orig_inode,</div><div class='del'>-			(loff_t)orig_page_offset &lt;&lt; PAGE_SHIFT, replaced_size);</div><div class='add'>+	if (!(*m_len) || (move_type == MEXT_MOVE_EXTENT))</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='del'>-unlock_folios:</div><div class='del'>-	folio_unlock(folio[0]);</div><div class='del'>-	folio_put(folio[0]);</div><div class='del'>-	folio_unlock(folio[1]);</div><div class='del'>-	folio_put(folio[1]);</div><div class='del'>-stop_journal:</div><div class='add'>+	/* Copy data */</div><div class='add'>+	length = (*m_len) &lt;&lt; blkbits;</div><div class='add'>+	ret2 = mext_folio_mkwrite(orig_inode, folio[0], from, from + length);</div><div class='add'>+	if (ret2) {</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = ret2;</div><div class='add'>+		goto repair_branches;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Even in case of data=writeback it is reasonable to pin</div><div class='add'>+	 * inode to transaction, to prevent unexpected data loss.</div><div class='add'>+	 */</div><div class='add'>+	ret2 = ext4_jbd2_inode_add_write(handle, orig_inode,</div><div class='add'>+			((loff_t)orig_map-&gt;m_lblk) &lt;&lt; blkbits, length);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = ret2;</div><div class='add'>+unlock:</div><div class='add'>+	mext_folio_double_unlock(folio);</div><div class='add'>+stop_handle:</div><div class='ctx'> 	ext4_journal_stop(handle);</div><div class='del'>-	if (*err == -ENOSPC &amp;&amp;</div><div class='del'>-	    ext4_should_retry_alloc(sb, &amp;retries))</div><div class='del'>-		goto again;</div><div class='del'>-	/* Buffer was busy because probably is pinned to journal transaction,</div><div class='del'>-	 * force transaction commit may help to free it. */</div><div class='del'>-	if (*err == -EBUSY &amp;&amp; retries++ &lt; 4 &amp;&amp; EXT4_SB(sb)-&gt;s_journal &amp;&amp;</div><div class='del'>-	    jbd2_journal_force_commit_nested(EXT4_SB(sb)-&gt;s_journal))</div><div class='del'>-		goto again;</div><div class='del'>-	return replaced_count;</div><div class='add'>+out:</div><div class='add'>+	trace_ext4_move_extent_exit(orig_inode, orig_map-&gt;m_lblk, donor_inode,</div><div class='add'>+				    mext-&gt;donor_lblk, orig_map-&gt;m_len, *m_len,</div><div class='add'>+				    move_type, ret);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> repair_branches:</div><div class='del'>-	/*</div><div class='del'>-	 * This should never ever happen!</div><div class='del'>-	 * Extents are swapped already, but we are not able to copy data.</div><div class='del'>-	 * Try to swap extents to it's original places</div><div class='del'>-	 */</div><div class='del'>-	ext4_double_down_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-	replaced_count = ext4_swap_extents(handle, donor_inode, orig_inode,</div><div class='del'>-					       orig_blk_offset, donor_blk_offset,</div><div class='del'>-					   block_len_in_page, 0, &amp;err2);</div><div class='del'>-	ext4_double_up_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-	if (replaced_count != block_len_in_page) {</div><div class='del'>-		ext4_error_inode_block(orig_inode, (sector_t)(orig_blk_offset),</div><div class='del'>-				       EIO, "Unable to copy data block,"</div><div class='del'>-				       " data will be lost.");</div><div class='del'>-		*err = -EIO;</div><div class='add'>+	ret2 = 0;</div><div class='add'>+	r_len = ext4_swap_extents(handle, donor_inode, orig_inode,</div><div class='add'>+				  mext-&gt;donor_lblk, orig_map-&gt;m_lblk,</div><div class='add'>+				  *m_len, 0, &amp;ret2);</div><div class='add'>+	if (ret2 || r_len != *m_len) {</div><div class='add'>+		ext4_error_inode_block(orig_inode, (sector_t)(orig_map-&gt;m_lblk),</div><div class='add'>+				       EIO, "Unable to copy data block, data will be lost!");</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	replaced_count = 0;</div><div class='del'>-	goto unlock_folios;</div><div class='add'>+	*m_len = 0;</div><div class='add'>+	goto unlock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * mext_check_arguments - Check whether move extent can be done</div><div class='del'>- *</div><div class='del'>- * @orig_inode:		original inode</div><div class='del'>- * @donor_inode:	donor inode</div><div class='del'>- * @orig_start:		logical start offset in block for orig</div><div class='del'>- * @donor_start:	logical start offset in block for donor</div><div class='del'>- * @len:		the number of blocks to be moved</div><div class='del'>- *</div><div class='del'>- * Check the arguments of ext4_move_extents() whether the files can be</div><div class='del'>- * exchanged with each other.</div><div class='del'>- * Return 0 on success, or a negative error value on failure.</div><div class='add'>+/*</div><div class='add'>+ * Check the validity of the basic filesystem environment and the</div><div class='add'>+ * inodes' support status.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-mext_check_arguments(struct inode *orig_inode,</div><div class='del'>-		     struct inode *donor_inode, __u64 orig_start,</div><div class='del'>-		     __u64 donor_start, __u64 *len)</div><div class='add'>+static int mext_check_validity(struct inode *orig_inode,</div><div class='add'>+			       struct inode *donor_inode)</div><div class='ctx'> {</div><div class='del'>-	__u64 orig_eof, donor_eof;</div><div class='del'>-	unsigned int blkbits = orig_inode-&gt;i_blkbits;</div><div class='del'>-	unsigned int blocksize = 1 &lt;&lt; blkbits;</div><div class='add'>+	struct super_block *sb = orig_inode-&gt;i_sb;</div><div class='add'>+</div><div class='add'>+	/* origin and donor should be different inodes */</div><div class='add'>+	if (orig_inode == donor_inode) {</div><div class='add'>+		ext4_debug("ext4 move extent: The argument files should not be same inode [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* origin and donor should belone to the same filesystem */</div><div class='add'>+	if (orig_inode-&gt;i_sb != donor_inode-&gt;i_sb) {</div><div class='add'>+		ext4_debug("ext4 move extent: The argument files should be in same FS [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Regular file check */</div><div class='add'>+	if (!S_ISREG(orig_inode-&gt;i_mode) || !S_ISREG(donor_inode-&gt;i_mode)) {</div><div class='add'>+		ext4_debug("ext4 move extent: The argument files should be regular file [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ext4_has_feature_bigalloc(sb)) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "Online defrag not supported with bigalloc");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_DAX(orig_inode)) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "Online defrag not supported with DAX");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: it's not obvious how to swap blocks for inodes with full</div><div class='add'>+	 * journaling enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (ext4_should_journal_data(orig_inode) ||</div><div class='add'>+	    ext4_should_journal_data(donor_inode)) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "Online defrag not supported with data journaling");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	orig_eof = (i_size_read(orig_inode) + blocksize - 1) &gt;&gt; blkbits;</div><div class='del'>-	donor_eof = (i_size_read(donor_inode) + blocksize - 1) &gt;&gt; blkbits;</div><div class='add'>+	if (IS_ENCRYPTED(orig_inode) || IS_ENCRYPTED(donor_inode)) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "Online defrag not supported for encrypted files");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* Ext4 move extent supports only extent based file */</div><div class='add'>+	if (!(ext4_test_inode_flag(orig_inode, EXT4_INODE_EXTENTS)) ||</div><div class='add'>+	    !(ext4_test_inode_flag(donor_inode, EXT4_INODE_EXTENTS))) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "Online defrag not supported for non-extent files");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (donor_inode-&gt;i_mode &amp; (S_ISUID|S_ISGID)) {</div><div class='del'>-		ext4_debug("ext4 move extent: suid or sgid is set"</div><div class='del'>-			   " to donor file [ino:orig %lu, donor %lu]\n",</div><div class='add'>+		ext4_debug("ext4 move extent: suid or sgid is set to donor file [ino:orig %lu, donor %lu]\n",</div><div class='ctx'> 			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_IMMUTABLE(donor_inode) || IS_APPEND(donor_inode))</div><div class='add'>+	if (IS_IMMUTABLE(donor_inode) || IS_APPEND(donor_inode)) {</div><div class='add'>+		ext4_debug("ext4 move extent: donor should not be immutable or append file [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -EPERM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ext4 move extent does not support swap files */</div><div class='ctx'> 	if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) {</div><div class='ctx'> 		ext4_debug("ext4 move extent: The argument files should not be swap files [ino:orig %lu, donor %lu]\n",</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -ETXTBSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext4_is_quota_file(orig_inode) &amp;&amp; ext4_is_quota_file(donor_inode)) {</div><div class='add'>+	if (ext4_is_quota_file(orig_inode) || ext4_is_quota_file(donor_inode)) {</div><div class='ctx'> 		ext4_debug("ext4 move extent: The argument files should not be quota files [ino:orig %lu, donor %lu]\n",</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ext4 move extent supports only extent based file */</div><div class='del'>-	if (!(ext4_test_inode_flag(orig_inode, EXT4_INODE_EXTENTS))) {</div><div class='del'>-		ext4_debug("ext4 move extent: orig file is not extents "</div><div class='del'>-			"based file [ino:orig %lu]\n", orig_inode-&gt;i_ino);</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	} else if (!(ext4_test_inode_flag(donor_inode, EXT4_INODE_EXTENTS))) {</div><div class='del'>-		ext4_debug("ext4 move extent: donor file is not extents "</div><div class='del'>-			"based file [ino:donor %lu]\n", donor_inode-&gt;i_ino);</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -501,12 +502,25 @@ mext_check_arguments(struct inode *orig_inode,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the moving range of ext4_move_extents() whether the files can be</div><div class='add'>+ * exchanged with each other, and adjust the length to fit within the file</div><div class='add'>+ * size. Return 0 on success, or a negative error value on failure.</div><div class='add'>+ */</div><div class='add'>+static int mext_check_adjust_range(struct inode *orig_inode,</div><div class='add'>+				   struct inode *donor_inode, __u64 orig_start,</div><div class='add'>+				   __u64 donor_start, __u64 *len)</div><div class='add'>+{</div><div class='add'>+	__u64 orig_eof, donor_eof;</div><div class='add'>+</div><div class='ctx'> 	/* Start offset should be same */</div><div class='ctx'> 	if ((orig_start &amp; ~(PAGE_MASK &gt;&gt; orig_inode-&gt;i_blkbits)) !=</div><div class='ctx'> 	    (donor_start &amp; ~(PAGE_MASK &gt;&gt; orig_inode-&gt;i_blkbits))) {</div><div class='del'>-		ext4_debug("ext4 move extent: orig and donor's start "</div><div class='del'>-			"offsets are not aligned [ino:orig %lu, donor %lu]\n",</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='add'>+		ext4_debug("ext4 move extent: orig and donor's start offsets are not aligned [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -515,11 +529,14 @@ mext_check_arguments(struct inode *orig_inode,</div><div class='ctx'> 	    (*len &gt; EXT_MAX_BLOCKS) ||</div><div class='ctx'> 	    (donor_start + *len &gt;= EXT_MAX_BLOCKS) ||</div><div class='ctx'> 	    (orig_start + *len &gt;= EXT_MAX_BLOCKS))  {</div><div class='del'>-		ext4_debug("ext4 move extent: Can't handle over [%u] blocks "</div><div class='del'>-			"[ino:orig %lu, donor %lu]\n", EXT_MAX_BLOCKS,</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='add'>+		ext4_debug("ext4 move extent: Can't handle over [%u] blocks [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   EXT_MAX_BLOCKS,</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	orig_eof = EXT4_B_TO_LBLK(orig_inode, i_size_read(orig_inode));</div><div class='add'>+	donor_eof = EXT4_B_TO_LBLK(donor_inode, i_size_read(donor_inode));</div><div class='ctx'> 	if (orig_eof &lt;= orig_start)</div><div class='ctx'> 		*len = 0;</div><div class='ctx'> 	else if (orig_eof &lt; orig_start + *len - 1)</div><div class='hunk'>@@ -529,9 +546,8 @@ mext_check_arguments(struct inode *orig_inode,</div><div class='ctx'> 	else if (donor_eof &lt; donor_start + *len - 1)</div><div class='ctx'> 		*len = donor_eof - donor_start;</div><div class='ctx'> 	if (!*len) {</div><div class='del'>-		ext4_debug("ext4 move extent: len should not be 0 "</div><div class='del'>-			"[ino:orig %lu, donor %lu]\n", orig_inode-&gt;i_ino,</div><div class='del'>-			donor_inode-&gt;i_ino);</div><div class='add'>+		ext4_debug("ext4 move extent: len should not be 0 [ino:orig %lu, donor %lu]\n",</div><div class='add'>+			   orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -550,151 +566,89 @@ mext_check_arguments(struct inode *orig_inode,</div><div class='ctx'>  *</div><div class='ctx'>  * This function returns 0 and moved block length is set in moved_len</div><div class='ctx'>  * if succeed, otherwise returns error value.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='del'>-ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,</div><div class='del'>-		  __u64 donor_blk, __u64 len, __u64 *moved_len)</div><div class='add'>+int ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk,</div><div class='add'>+		      __u64 donor_blk, __u64 len, __u64 *moved_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *orig_inode = file_inode(o_filp);</div><div class='ctx'> 	struct inode *donor_inode = file_inode(d_filp);</div><div class='del'>-	struct ext4_ext_path *path = NULL;</div><div class='del'>-	int blocks_per_page = PAGE_SIZE &gt;&gt; orig_inode-&gt;i_blkbits;</div><div class='del'>-	ext4_lblk_t o_end, o_start = orig_blk;</div><div class='del'>-	ext4_lblk_t d_start = donor_blk;</div><div class='add'>+	struct mext_data mext;</div><div class='add'>+	struct super_block *sb = orig_inode-&gt;i_sb;</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	int retries = 0;</div><div class='add'>+	u64 m_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (orig_inode-&gt;i_sb != donor_inode-&gt;i_sb) {</div><div class='del'>-		ext4_debug("ext4 move extent: The argument files "</div><div class='del'>-			"should be in same FS [ino:orig %lu, donor %lu]\n",</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* orig and donor should be different inodes */</div><div class='del'>-	if (orig_inode == donor_inode) {</div><div class='del'>-		ext4_debug("ext4 move extent: The argument files should not "</div><div class='del'>-			"be same inode [ino:orig %lu, donor %lu]\n",</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Regular file check */</div><div class='del'>-	if (!S_ISREG(orig_inode-&gt;i_mode) || !S_ISREG(donor_inode-&gt;i_mode)) {</div><div class='del'>-		ext4_debug("ext4 move extent: The argument files should be "</div><div class='del'>-			"regular file [ino:orig %lu, donor %lu]\n",</div><div class='del'>-			orig_inode-&gt;i_ino, donor_inode-&gt;i_ino);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: it's not obvious how to swap blocks for inodes with full</div><div class='del'>-	   journaling enabled */</div><div class='del'>-	if (ext4_should_journal_data(orig_inode) ||</div><div class='del'>-	    ext4_should_journal_data(donor_inode)) {</div><div class='del'>-		ext4_msg(orig_inode-&gt;i_sb, KERN_ERR,</div><div class='del'>-			 "Online defrag not supported with data journaling");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (IS_ENCRYPTED(orig_inode) || IS_ENCRYPTED(donor_inode)) {</div><div class='del'>-		ext4_msg(orig_inode-&gt;i_sb, KERN_ERR,</div><div class='del'>-			 "Online defrag not supported for encrypted files");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	*moved_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Protect orig and donor inodes against a truncate */</div><div class='ctx'> 	lock_two_nondirectories(orig_inode, donor_inode);</div><div class='ctx'> </div><div class='add'>+	ret = mext_check_validity(orig_inode, donor_inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Wait for all existing dio workers */</div><div class='ctx'> 	inode_dio_wait(orig_inode);</div><div class='ctx'> 	inode_dio_wait(donor_inode);</div><div class='ctx'> </div><div class='del'>-	/* Protect extent tree against block allocations via delalloc */</div><div class='del'>-	ext4_double_down_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-	/* Check the filesystem environment whether move_extent can be done */</div><div class='del'>-	ret = mext_check_arguments(orig_inode, donor_inode, orig_blk,</div><div class='del'>-				    donor_blk, &amp;len);</div><div class='add'>+	/* Check and adjust the specified move_extent range. */</div><div class='add'>+	ret = mext_check_adjust_range(orig_inode, donor_inode, orig_blk,</div><div class='add'>+				      donor_blk, &amp;len);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='del'>-	o_end = o_start + len;</div><div class='ctx'> </div><div class='del'>-	while (o_start &lt; o_end) {</div><div class='del'>-		struct ext4_extent *ex;</div><div class='del'>-		ext4_lblk_t cur_blk, next_blk;</div><div class='del'>-		pgoff_t orig_page_index, donor_page_index;</div><div class='del'>-		int offset_in_page;</div><div class='del'>-		int unwritten, cur_len;</div><div class='add'>+	mext.orig_inode = orig_inode;</div><div class='add'>+	mext.donor_inode = donor_inode;</div><div class='add'>+	while (len) {</div><div class='add'>+		mext.orig_map.m_lblk = orig_blk;</div><div class='add'>+		mext.orig_map.m_len = len;</div><div class='add'>+		mext.orig_map.m_flags = 0;</div><div class='add'>+		mext.donor_lblk = donor_blk;</div><div class='ctx'> </div><div class='del'>-		ret = get_ext_path(orig_inode, o_start, &amp;path);</div><div class='del'>-		if (ret)</div><div class='add'>+		ret = ext4_map_blocks(NULL, orig_inode, &amp;mext.orig_map, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		ex = path[path-&gt;p_depth].p_ext;</div><div class='del'>-		cur_blk = le32_to_cpu(ex-&gt;ee_block);</div><div class='del'>-		cur_len = ext4_ext_get_actual_len(ex);</div><div class='del'>-		/* Check hole before the start pos */</div><div class='del'>-		if (cur_blk + cur_len - 1 &lt; o_start) {</div><div class='del'>-			next_blk = ext4_ext_next_allocated_block(path);</div><div class='del'>-			if (next_blk == EXT_MAX_BLOCKS) {</div><div class='del'>-				ret = -ENODATA;</div><div class='del'>-				goto out;</div><div class='add'>+</div><div class='add'>+		/* Skip moving if it is a hole or a delalloc extent. */</div><div class='add'>+		if (mext.orig_map.m_flags &amp;</div><div class='add'>+		    (EXT4_MAP_MAPPED | EXT4_MAP_UNWRITTEN)) {</div><div class='add'>+			ret = mext_move_extent(&amp;mext, &amp;m_len);</div><div class='add'>+			*moved_len += m_len;</div><div class='add'>+			if (!ret)</div><div class='add'>+				goto next;</div><div class='add'>+</div><div class='add'>+			/* Move failed or partially failed. */</div><div class='add'>+			if (m_len) {</div><div class='add'>+				orig_blk += m_len;</div><div class='add'>+				donor_blk += m_len;</div><div class='add'>+				len -= m_len;</div><div class='ctx'> 			}</div><div class='del'>-			d_start += next_blk - o_start;</div><div class='del'>-			o_start = next_blk;</div><div class='del'>-			continue;</div><div class='del'>-		/* Check hole after the start pos */</div><div class='del'>-		} else if (cur_blk &gt; o_start) {</div><div class='del'>-			/* Skip hole */</div><div class='del'>-			d_start += cur_blk - o_start;</div><div class='del'>-			o_start = cur_blk;</div><div class='del'>-			/* Extent inside requested range ?*/</div><div class='del'>-			if (cur_blk &gt;= o_end)</div><div class='del'>-				goto out;</div><div class='del'>-		} else { /* in_range(o_start, o_blk, o_len) */</div><div class='del'>-			cur_len += cur_blk - o_start;</div><div class='add'>+			if (ret == -ESTALE)</div><div class='add'>+				continue;</div><div class='add'>+			if (ret == -ENOSPC &amp;&amp;</div><div class='add'>+			    ext4_should_retry_alloc(sb, &amp;retries))</div><div class='add'>+				continue;</div><div class='add'>+			if (ret == -EBUSY &amp;&amp;</div><div class='add'>+			    sbi-&gt;s_journal &amp;&amp; retries++ &lt; 4 &amp;&amp;</div><div class='add'>+			    jbd2_journal_force_commit_nested(sbi-&gt;s_journal))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		unwritten = ext4_ext_is_unwritten(ex);</div><div class='del'>-		if (o_end - o_start &lt; cur_len)</div><div class='del'>-			cur_len = o_end - o_start;</div><div class='del'>-</div><div class='del'>-		orig_page_index = o_start &gt;&gt; (PAGE_SHIFT -</div><div class='del'>-					       orig_inode-&gt;i_blkbits);</div><div class='del'>-		donor_page_index = d_start &gt;&gt; (PAGE_SHIFT -</div><div class='del'>-					       donor_inode-&gt;i_blkbits);</div><div class='del'>-		offset_in_page = o_start % blocks_per_page;</div><div class='del'>-		if (cur_len &gt; blocks_per_page - offset_in_page)</div><div class='del'>-			cur_len = blocks_per_page - offset_in_page;</div><div class='del'>-		/*</div><div class='del'>-		 * Up semaphore to avoid following problems:</div><div class='del'>-		 * a. transaction deadlock among ext4_journal_start,</div><div class='del'>-		 *    -&gt;write_begin via pagefault, and jbd2_journal_commit</div><div class='del'>-		 * b. racing with -&gt;read_folio, -&gt;write_begin, and</div><div class='del'>-		 *    ext4_get_block in move_extent_per_page</div><div class='del'>-		 */</div><div class='del'>-		ext4_double_up_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-		/* Swap original branches with new branches */</div><div class='del'>-		move_extent_per_page(o_filp, donor_inode,</div><div class='del'>-				     orig_page_index, donor_page_index,</div><div class='del'>-				     offset_in_page, cur_len,</div><div class='del'>-				     unwritten, &amp;ret);</div><div class='del'>-		ext4_double_down_write_data_sem(orig_inode, donor_inode);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		o_start += cur_len;</div><div class='del'>-		d_start += cur_len;</div><div class='add'>+next:</div><div class='add'>+		orig_blk += mext.orig_map.m_len;</div><div class='add'>+		donor_blk += mext.orig_map.m_len;</div><div class='add'>+		len -= mext.orig_map.m_len;</div><div class='add'>+		retries = 0;</div><div class='ctx'> 	}</div><div class='del'>-	*moved_len = o_start - orig_blk;</div><div class='del'>-	if (*moved_len &gt; len)</div><div class='del'>-		*moved_len = len;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (*moved_len) {</div><div class='del'>-		ext4_discard_preallocations(orig_inode, 0);</div><div class='del'>-		ext4_discard_preallocations(donor_inode, 0);</div><div class='add'>+		ext4_discard_preallocations(orig_inode);</div><div class='add'>+		ext4_discard_preallocations(donor_inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ext4_free_ext_path(path);</div><div class='del'>-	ext4_double_up_write_data_sem(orig_inode, donor_inode);</div><div class='ctx'> 	unlock_two_nondirectories(orig_inode, donor_inode);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c<br/>index 05b647e6bc19..c4b5e252af0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/namei.c</a></div><div class='hunk'>@@ -151,10 +151,11 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		return bh;</div><div class='ctx'> 	}</div><div class='del'>-	if (!bh &amp;&amp; (type == INDEX || type == DIRENT_HTREE)) {</div><div class='add'>+	/* The first directory block must not be a hole. */</div><div class='add'>+	if (!bh &amp;&amp; (type == INDEX || type == DIRENT_HTREE || block == 0)) {</div><div class='ctx'> 		ext4_error_inode(inode, func, line, block,</div><div class='del'>-				 "Directory hole found for htree %s block",</div><div class='del'>-				 (type == INDEX) ? "index" : "leaf");</div><div class='add'>+				 "Directory hole found for htree %s block %u",</div><div class='add'>+				 (type == INDEX) ? "index" : "leaf", block);</div><div class='ctx'> 		return ERR_PTR(-EFSCORRUPTED);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!bh)</div><div class='hunk'>@@ -175,7 +176,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		return ERR_PTR(-EFSCORRUPTED);</div><div class='ctx'> 	}</div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb) ||</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb) ||</div><div class='ctx'> 	    buffer_verified(bh))</div><div class='ctx'> 		return bh;</div><div class='ctx'> </div><div class='hunk'>@@ -290,36 +291,6 @@ struct dx_tail {</div><div class='ctx'> 	__le32 dt_checksum;	/* crc32c(uuid+inum+dirblock) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline ext4_lblk_t dx_get_block(struct dx_entry *entry);</div><div class='del'>-static void dx_set_block(struct dx_entry *entry, ext4_lblk_t value);</div><div class='del'>-static inline unsigned dx_get_hash(struct dx_entry *entry);</div><div class='del'>-static void dx_set_hash(struct dx_entry *entry, unsigned value);</div><div class='del'>-static unsigned dx_get_count(struct dx_entry *entries);</div><div class='del'>-static unsigned dx_get_limit(struct dx_entry *entries);</div><div class='del'>-static void dx_set_count(struct dx_entry *entries, unsigned value);</div><div class='del'>-static void dx_set_limit(struct dx_entry *entries, unsigned value);</div><div class='del'>-static unsigned dx_root_limit(struct inode *dir, unsigned infosize);</div><div class='del'>-static unsigned dx_node_limit(struct inode *dir);</div><div class='del'>-static struct dx_frame *dx_probe(struct ext4_filename *fname,</div><div class='del'>-				 struct inode *dir,</div><div class='del'>-				 struct dx_hash_info *hinfo,</div><div class='del'>-				 struct dx_frame *frame);</div><div class='del'>-static void dx_release(struct dx_frame *frames);</div><div class='del'>-static int dx_make_map(struct inode *dir, struct buffer_head *bh,</div><div class='del'>-		       struct dx_hash_info *hinfo,</div><div class='del'>-		       struct dx_map_entry *map_tail);</div><div class='del'>-static void dx_sort_map(struct dx_map_entry *map, unsigned count);</div><div class='del'>-static struct ext4_dir_entry_2 *dx_move_dirents(struct inode *dir, char *from,</div><div class='del'>-					char *to, struct dx_map_entry *offsets,</div><div class='del'>-					int count, unsigned int blocksize);</div><div class='del'>-static struct ext4_dir_entry_2 *dx_pack_dirents(struct inode *dir, char *base,</div><div class='del'>-						unsigned int blocksize);</div><div class='del'>-static void dx_insert_block(struct dx_frame *frame,</div><div class='del'>-					u32 hash, ext4_lblk_t block);</div><div class='del'>-static int ext4_htree_next_block(struct inode *dir, __u32 hash,</div><div class='del'>-				 struct dx_frame *frame,</div><div class='del'>-				 struct dx_frame *frames,</div><div class='del'>-				 __u32 *start_hash);</div><div class='ctx'> static struct buffer_head * ext4_dx_find_entry(struct inode *dir,</div><div class='ctx'> 		struct ext4_filename *fname,</div><div class='ctx'> 		struct ext4_dir_entry_2 **res_dir);</div><div class='hunk'>@@ -375,11 +346,10 @@ static struct ext4_dir_entry_tail *get_dirent_tail(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> static __le32 ext4_dirblock_csum(struct inode *inode, void *dirent, int size)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, ei-&gt;i_csum_seed, (__u8 *)dirent, size);</div><div class='add'>+	csum = ext4_chksum(ei-&gt;i_csum_seed, (__u8 *)dirent, size);</div><div class='ctx'> 	return cpu_to_le32(csum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +367,7 @@ int ext4_dirblock_csum_verify(struct inode *inode, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_dir_entry_tail *t;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	t = get_dirent_tail(inode, bh);</div><div class='hunk'>@@ -418,7 +388,7 @@ static void ext4_dirblock_csum_set(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_dir_entry_tail *t;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	t = get_dirent_tail(inode, bh);</div><div class='hunk'>@@ -471,7 +441,6 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode,</div><div class='ctx'> static __le32 ext4_dx_csum(struct inode *inode, struct ext4_dir_entry *dirent,</div><div class='ctx'> 			   int count_offset, int count, struct dx_tail *t)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct ext4_inode_info *ei = EXT4_I(inode);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> 	int size;</div><div class='hunk'>@@ -479,9 +448,9 @@ static __le32 ext4_dx_csum(struct inode *inode, struct ext4_dir_entry *dirent,</div><div class='ctx'> 	int offset = offsetof(struct dx_tail, dt_checksum);</div><div class='ctx'> </div><div class='ctx'> 	size = count_offset + (count * sizeof(struct dx_entry));</div><div class='del'>-	csum = ext4_chksum(sbi, ei-&gt;i_csum_seed, (__u8 *)dirent, size);</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)t, offset);</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)&amp;dummy_csum, sizeof(dummy_csum));</div><div class='add'>+	csum = ext4_chksum(ei-&gt;i_csum_seed, (__u8 *)dirent, size);</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)t, offset);</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)&amp;dummy_csum, sizeof(dummy_csum));</div><div class='ctx'> </div><div class='ctx'> 	return cpu_to_le32(csum);</div><div class='ctx'> }</div><div class='hunk'>@@ -493,7 +462,7 @@ static int ext4_dx_csum_verify(struct inode *inode,</div><div class='ctx'> 	struct dx_tail *t;</div><div class='ctx'> 	int count_offset, limit, count;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	c = get_dx_countlimit(inode, dirent, &amp;count_offset);</div><div class='hunk'>@@ -522,7 +491,7 @@ static void ext4_dx_csum_set(struct inode *inode, struct ext4_dir_entry *dirent)</div><div class='ctx'> 	struct dx_tail *t;</div><div class='ctx'> 	int count_offset, limit, count;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	c = get_dx_countlimit(inode, dirent, &amp;count_offset);</div><div class='hunk'>@@ -611,7 +580,7 @@ static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)</div><div class='ctx'> 			ext4_dir_rec_len(1, NULL) -</div><div class='ctx'> 			ext4_dir_rec_len(2, NULL) - infosize;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(dir-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(dir-&gt;i_sb))</div><div class='ctx'> 		entry_space -= sizeof(struct dx_tail);</div><div class='ctx'> 	return entry_space / sizeof(struct dx_entry);</div><div class='ctx'> }</div><div class='hunk'>@@ -621,7 +590,7 @@ static inline unsigned dx_node_limit(struct inode *dir)</div><div class='ctx'> 	unsigned int entry_space = dir-&gt;i_sb-&gt;s_blocksize -</div><div class='ctx'> 			ext4_dir_rec_len(0, dir);</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(dir-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(dir-&gt;i_sb))</div><div class='ctx'> 		entry_space -= sizeof(struct dx_tail);</div><div class='ctx'> 	return entry_space / sizeof(struct dx_entry);</div><div class='ctx'> }</div><div class='hunk'>@@ -1075,7 +1044,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,</div><div class='ctx'> 	struct ext4_dir_entry_2 *de, *top;</div><div class='ctx'> 	int err = 0, count = 0;</div><div class='ctx'> 	struct fscrypt_str fname_crypto_str = FSTR_INIT(NULL, 0), tmp_str;</div><div class='del'>-	int csum = ext4_has_metadata_csum(dir-&gt;i_sb);</div><div class='add'>+	int csum = ext4_has_feature_metadata_csum(dir-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'> 	dxtrace(printk(KERN_INFO "In htree dirblock_to_tree: block %lu\n",</div><div class='ctx'> 							(unsigned long)block));</div><div class='hunk'>@@ -1107,7 +1076,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,</div><div class='ctx'> 	for (; de &lt; top; de = ext4_next_entry(de, dir-&gt;i_sb-&gt;s_blocksize)) {</div><div class='ctx'> 		if (ext4_check_dir_entry(dir, NULL, de, bh,</div><div class='ctx'> 				bh-&gt;b_data, bh-&gt;b_size,</div><div class='del'>-				(block&lt;&lt;EXT4_BLOCK_SIZE_BITS(dir-&gt;i_sb))</div><div class='add'>+				EXT4_LBLK_TO_B(dir, block)</div><div class='ctx'> 					 + ((char *)de - bh-&gt;b_data))) {</div><div class='ctx'> 			/* silently ignore the rest of the block */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1319,7 +1288,7 @@ static int dx_make_map(struct inode *dir, struct buffer_head *bh,</div><div class='ctx'> 	struct dx_hash_info h = *hinfo;</div><div class='ctx'> 	int blocksize = EXT4_BLOCK_SIZE(dir-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(dir-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(dir-&gt;i_sb))</div><div class='ctx'> 		buflen -= sizeof(struct ext4_dir_entry_tail);</div><div class='ctx'> </div><div class='ctx'> 	while ((char *) de &lt; base + buflen) {</div><div class='hunk'>@@ -1390,62 +1359,11 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-/*</div><div class='del'>- * Test whether a case-insensitive directory entry matches the filename</div><div class='del'>- * being searched for.  If quick is set, assume the name being looked up</div><div class='del'>- * is already in the casefolded form.</div><div class='del'>- *</div><div class='del'>- * Returns: 0 if the directory entry matches, more than 0 if it</div><div class='del'>- * doesn't match or less than zero on error.</div><div class='del'>- */</div><div class='del'>-static int ext4_ci_compare(const struct inode *parent, const struct qstr *name,</div><div class='del'>-			   u8 *de_name, size_t de_name_len, bool quick)</div><div class='del'>-{</div><div class='del'>-	const struct super_block *sb = parent-&gt;i_sb;</div><div class='del'>-	const struct unicode_map *um = sb-&gt;s_encoding;</div><div class='del'>-	struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len);</div><div class='del'>-	struct qstr entry = QSTR_INIT(de_name, de_name_len);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (IS_ENCRYPTED(parent)) {</div><div class='del'>-		const struct fscrypt_str encrypted_name =</div><div class='del'>-				FSTR_INIT(de_name, de_name_len);</div><div class='del'>-</div><div class='del'>-		decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL);</div><div class='del'>-		if (!decrypted_name.name)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &amp;encrypted_name,</div><div class='del'>-						&amp;decrypted_name);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		entry.name = decrypted_name.name;</div><div class='del'>-		entry.len = decrypted_name.len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (quick)</div><div class='del'>-		ret = utf8_strncasecmp_folded(um, name, &amp;entry);</div><div class='del'>-	else</div><div class='del'>-		ret = utf8_strncasecmp(um, name, &amp;entry);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		/* Handle invalid character sequence as either an error</div><div class='del'>-		 * or as an opaque byte sequence.</div><div class='del'>-		 */</div><div class='del'>-		if (sb_has_strict_encoding(sb))</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		else if (name-&gt;len != entry.len)</div><div class='del'>-			ret = 1;</div><div class='del'>-		else</div><div class='del'>-			ret = !!memcmp(name-&gt;name, entry.name, entry.len);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	kfree(decrypted_name.name);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,</div><div class='ctx'> 				  struct ext4_filename *name)</div><div class='ctx'> {</div><div class='del'>-	struct fscrypt_str *cf_name = &amp;name-&gt;cf_name;</div><div class='add'>+	struct qstr *cf_name = &amp;name-&gt;cf_name;</div><div class='add'>+	unsigned char *buf;</div><div class='ctx'> 	struct dx_hash_info *hinfo = &amp;name-&gt;hinfo;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='hunk'>@@ -1455,18 +1373,18 @@ int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf_name-&gt;name = kmalloc(EXT4_NAME_LEN, GFP_NOFS);</div><div class='del'>-	if (!cf_name-&gt;name)</div><div class='add'>+	buf = kmalloc(EXT4_NAME_LEN, GFP_NOFS);</div><div class='add'>+	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	len = utf8_casefold(dir-&gt;i_sb-&gt;s_encoding,</div><div class='del'>-			    iname, cf_name-&gt;name,</div><div class='del'>-			    EXT4_NAME_LEN);</div><div class='add'>+	len = utf8_casefold(dir-&gt;i_sb-&gt;s_encoding, iname, buf, EXT4_NAME_LEN);</div><div class='ctx'> 	if (len &lt;= 0) {</div><div class='del'>-		kfree(cf_name-&gt;name);</div><div class='del'>-		cf_name-&gt;name = NULL;</div><div class='add'>+		kfree(buf);</div><div class='add'>+		buf = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	cf_name-&gt;name = buf;</div><div class='ctx'> 	cf_name-&gt;len = (unsigned) len;</div><div class='add'>+</div><div class='ctx'> 	if (!IS_ENCRYPTED(dir))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1502,22 +1420,30 @@ static bool ext4_match(struct inode *parent,</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	if (IS_CASEFOLDED(parent) &amp;&amp;</div><div class='ctx'> 	    (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {</div><div class='del'>-		if (fname-&gt;cf_name.name) {</div><div class='del'>-			struct qstr cf = {.name = fname-&gt;cf_name.name,</div><div class='del'>-					  .len = fname-&gt;cf_name.len};</div><div class='del'>-			if (IS_ENCRYPTED(parent)) {</div><div class='del'>-				if (fname-&gt;hinfo.hash != EXT4_DIRENT_HASH(de) ||</div><div class='del'>-					fname-&gt;hinfo.minor_hash !=</div><div class='del'>-						EXT4_DIRENT_MINOR_HASH(de)) {</div><div class='del'>-</div><div class='del'>-					return false;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return !ext4_ci_compare(parent, &amp;cf, de-&gt;name,</div><div class='del'>-							de-&gt;name_len, true);</div><div class='del'>-		}</div><div class='del'>-		return !ext4_ci_compare(parent, fname-&gt;usr_fname, de-&gt;name,</div><div class='del'>-						de-&gt;name_len, false);</div><div class='add'>+		/*</div><div class='add'>+		 * Just checking IS_ENCRYPTED(parent) below is not</div><div class='add'>+		 * sufficient to decide whether one can use the hash for</div><div class='add'>+		 * skipping the string comparison, because the key might</div><div class='add'>+		 * have been added right after</div><div class='add'>+		 * ext4_fname_setup_ci_filename().  In this case, a hash</div><div class='add'>+		 * mismatch will be a false negative.  Therefore, make</div><div class='add'>+		 * sure cf_name was properly initialized before</div><div class='add'>+		 * considering the calculated hash.</div><div class='add'>+		 */</div><div class='add'>+		if (sb_no_casefold_compat_fallback(parent-&gt;i_sb) &amp;&amp;</div><div class='add'>+		    IS_ENCRYPTED(parent) &amp;&amp; fname-&gt;cf_name.name &amp;&amp;</div><div class='add'>+		    (fname-&gt;hinfo.hash != EXT4_DIRENT_HASH(de) ||</div><div class='add'>+		     fname-&gt;hinfo.minor_hash != EXT4_DIRENT_MINOR_HASH(de)))</div><div class='add'>+			return false;</div><div class='add'>+		/*</div><div class='add'>+		 * Treat comparison errors as not a match.  The</div><div class='add'>+		 * only case where it happens is on a disk</div><div class='add'>+		 * corruption or ENOMEM.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		return generic_ci_match(parent, fname-&gt;usr_fname,</div><div class='add'>+					&amp;fname-&gt;cf_name, de-&gt;name,</div><div class='add'>+					de-&gt;name_len) &gt; 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1525,7 +1451,7 @@ static bool ext4_match(struct inode *parent,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Returns 0 if not found, -1 on failure, and 1 on success</div><div class='add'>+ * Returns 0 if not found, -EFSCORRUPTED on failure, and 1 on success</div><div class='ctx'>  */</div><div class='ctx'> int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,</div><div class='ctx'> 		    struct inode *dir, struct ext4_filename *fname,</div><div class='hunk'>@@ -1546,7 +1472,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,</div><div class='ctx'> 			 * a full check */</div><div class='ctx'> 			if (ext4_check_dir_entry(dir, NULL, de, bh, search_buf,</div><div class='ctx'> 						 buf_size, offset))</div><div class='del'>-				return -1;</div><div class='add'>+				return -EFSCORRUPTED;</div><div class='ctx'> 			*res_dir = de;</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1554,7 +1480,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,</div><div class='ctx'> 		de_len = ext4_rec_len_from_disk(de-&gt;rec_len,</div><div class='ctx'> 						dir-&gt;i_sb-&gt;s_blocksize);</div><div class='ctx'> 		if (de_len &lt;= 0)</div><div class='del'>-			return -1;</div><div class='add'>+			return -EFSCORRUPTED;</div><div class='ctx'> 		offset += de_len;</div><div class='ctx'> 		de = (struct ext4_dir_entry_2 *) ((char *) de + de_len);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1617,7 +1543,7 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir,</div><div class='ctx'> 					     &amp;has_inline_data);</div><div class='ctx'> 		if (inlined)</div><div class='ctx'> 			*inlined = has_inline_data;</div><div class='del'>-		if (has_inline_data)</div><div class='add'>+		if (has_inline_data || IS_ERR(ret))</div><div class='ctx'> 			goto cleanup_and_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1638,10 +1564,15 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir,</div><div class='ctx'> 		 * return.  Otherwise, fall back to doing a search the</div><div class='ctx'> 		 * old fashioned way.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!IS_ERR(ret) || PTR_ERR(ret) != ERR_BAD_DX_DIR)</div><div class='add'>+		if (IS_ERR(ret) &amp;&amp; PTR_ERR(ret) == ERR_BAD_DX_DIR)</div><div class='add'>+			dxtrace(printk(KERN_DEBUG "ext4_find_entry: dx failed, "</div><div class='add'>+				       "falling back\n"));</div><div class='add'>+		else if (!sb_no_casefold_compat_fallback(dir-&gt;i_sb) &amp;&amp;</div><div class='add'>+			 *res_dir == NULL &amp;&amp; IS_CASEFOLDED(dir))</div><div class='add'>+			dxtrace(printk(KERN_DEBUG "ext4_find_entry: casefold "</div><div class='add'>+				       "failed, falling back\n"));</div><div class='add'>+		else</div><div class='ctx'> 			goto cleanup_and_exit;</div><div class='del'>-		dxtrace(printk(KERN_DEBUG "ext4_find_entry: dx failed, "</div><div class='del'>-			       "falling back\n"));</div><div class='ctx'> 		ret = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	nblocks = dir-&gt;i_size &gt;&gt; EXT4_BLOCK_SIZE_BITS(sb);</div><div class='hunk'>@@ -1699,15 +1630,17 @@ restart:</div><div class='ctx'> 		}</div><div class='ctx'> 		set_buffer_verified(bh);</div><div class='ctx'> 		i = search_dirblock(bh, dir, fname,</div><div class='del'>-			    block &lt;&lt; EXT4_BLOCK_SIZE_BITS(sb), res_dir);</div><div class='add'>+				    EXT4_LBLK_TO_B(dir, block), res_dir);</div><div class='ctx'> 		if (i == 1) {</div><div class='ctx'> 			EXT4_I(dir)-&gt;i_dir_start_lookup = block;</div><div class='ctx'> 			ret = bh;</div><div class='ctx'> 			goto cleanup_and_exit;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			brelse(bh);</div><div class='del'>-			if (i &lt; 0)</div><div class='add'>+			if (i &lt; 0) {</div><div class='add'>+				ret = ERR_PTR(i);</div><div class='ctx'> 				goto cleanup_and_exit;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	next:</div><div class='ctx'> 		if (++block &gt;= nblocks)</div><div class='hunk'>@@ -1762,7 +1695,6 @@ static struct buffer_head *ext4_lookup_entry(struct inode *dir,</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_fname_prepare_lookup(dir, dentry, &amp;fname);</div><div class='del'>-	generic_set_encrypted_ci_d_ops(dentry);</div><div class='ctx'> 	if (err == -ENOENT)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1778,7 +1710,6 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir,</div><div class='ctx'> 			struct ext4_filename *fname,</div><div class='ctx'> 			struct ext4_dir_entry_2 **res_dir)</div><div class='ctx'> {</div><div class='del'>-	struct super_block * sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct dx_frame frames[EXT4_HTREE_LEVEL], *frame;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	ext4_lblk_t block;</div><div class='hunk'>@@ -1789,7 +1720,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir,</div><div class='ctx'> #endif</div><div class='ctx'> 	frame = dx_probe(fname, dir, NULL, frames);</div><div class='ctx'> 	if (IS_ERR(frame))</div><div class='del'>-		return (struct buffer_head *) frame;</div><div class='add'>+		return ERR_CAST(frame);</div><div class='ctx'> 	do {</div><div class='ctx'> 		block = dx_get_block(frame-&gt;at);</div><div class='ctx'> 		bh = ext4_read_dirblock(dir, block, DIRENT_HTREE);</div><div class='hunk'>@@ -1797,12 +1728,11 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir,</div><div class='ctx'> 			goto errout;</div><div class='ctx'> </div><div class='ctx'> 		retval = search_dirblock(bh, dir, fname,</div><div class='del'>-					 block &lt;&lt; EXT4_BLOCK_SIZE_BITS(sb),</div><div class='del'>-					 res_dir);</div><div class='add'>+					 EXT4_LBLK_TO_B(dir, block), res_dir);</div><div class='ctx'> 		if (retval == 1)</div><div class='ctx'> 			goto success;</div><div class='ctx'> 		brelse(bh);</div><div class='del'>-		if (retval == -1) {</div><div class='add'>+		if (retval &lt; 0) {</div><div class='ctx'> 			bh = ERR_PTR(ERR_BAD_DX_DIR);</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1830,7 +1760,7 @@ success:</div><div class='ctx'> static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct ext4_dir_entry_2 *de;</div><div class='add'>+	struct ext4_dir_entry_2 *de = NULL;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	if (dentry-&gt;d_name.len &gt; EXT4_NAME_LEN)</div><div class='hunk'>@@ -1870,8 +1800,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (!inode &amp;&amp; IS_CASEFOLDED(dir)) {</div><div class='add'>+	if (IS_ENABLED(CONFIG_UNICODE) &amp;&amp; !inode &amp;&amp; IS_CASEFOLDED(dir)) {</div><div class='ctx'> 		/* Eventually we want to call d_add_ci(dentry, NULL)</div><div class='ctx'> 		 * for negative dentries in the encoding case as</div><div class='ctx'> 		 * well.  For now, prevent the negative dentry</div><div class='hunk'>@@ -1879,7 +1808,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi</div><div class='ctx'> 		 */</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	return d_splice_alias(inode, dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1887,7 +1816,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi</div><div class='ctx'> struct dentry *ext4_get_parent(struct dentry *child)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 ino;</div><div class='del'>-	struct ext4_dir_entry_2 * de;</div><div class='add'>+	struct ext4_dir_entry_2 * de = NULL;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	bh = ext4_find_entry(d_inode(child), &amp;dotdot_name, &amp;de, NULL);</div><div class='hunk'>@@ -1988,14 +1917,14 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,</div><div class='ctx'> 	int	csum_size = 0;</div><div class='ctx'> 	int	err = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(dir-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(dir-&gt;i_sb))</div><div class='ctx'> 		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='ctx'> </div><div class='ctx'> 	bh2 = ext4_append(handle, dir, &amp;newblock);</div><div class='ctx'> 	if (IS_ERR(bh2)) {</div><div class='ctx'> 		brelse(*bh);</div><div class='ctx'> 		*bh = NULL;</div><div class='del'>-		return (struct ext4_dir_entry_2 *) bh2;</div><div class='add'>+		return ERR_CAST(bh2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUFFER_TRACE(*bh, "get_write_access");</div><div class='hunk'>@@ -2038,11 +1967,20 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,</div><div class='ctx'> 	 * split it in half by count; each resulting block will have at least</div><div class='ctx'> 	 * half the space free.</div><div class='ctx'> 	 */</div><div class='del'>-	if (i &gt; 0)</div><div class='add'>+	if (i &gt;= 0)</div><div class='ctx'> 		split = count - move;</div><div class='ctx'> 	else</div><div class='ctx'> 		split = count/2;</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(split == 0)) {</div><div class='add'>+		/* Should never happen, but avoid out-of-bounds access below */</div><div class='add'>+		ext4_error_inode_block(dir, (*bh)-&gt;b_blocknr, 0,</div><div class='add'>+			"bad indexed directory? hash=%08x:%08x count=%d move=%u",</div><div class='add'>+			hinfo-&gt;hash, hinfo-&gt;minor_hash, count, move);</div><div class='add'>+		err = -EFSCORRUPTED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hash2 = map[split].hash;</div><div class='ctx'> 	continued = hash2 == map[split - 1].hash;</div><div class='ctx'> 	dxtrace(printk(KERN_INFO "Split block %lu at %x, %i/%i\n",</div><div class='hunk'>@@ -2086,15 +2024,15 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,</div><div class='ctx'> 	return de;</div><div class='ctx'> </div><div class='ctx'> journal_error:</div><div class='add'>+	ext4_std_error(dir-&gt;i_sb, err);</div><div class='add'>+out:</div><div class='ctx'> 	brelse(*bh);</div><div class='ctx'> 	brelse(bh2);</div><div class='ctx'> 	*bh = NULL;</div><div class='del'>-	ext4_std_error(dir-&gt;i_sb, err);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ext4_find_dest_de(struct inode *dir, struct inode *inode,</div><div class='del'>-		      struct buffer_head *bh,</div><div class='add'>+int ext4_find_dest_de(struct inode *dir, struct buffer_head *bh,</div><div class='ctx'> 		      void *buf, int buf_size,</div><div class='ctx'> 		      struct ext4_filename *fname,</div><div class='ctx'> 		      struct ext4_dir_entry_2 **dest_de)</div><div class='hunk'>@@ -2176,11 +2114,11 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,</div><div class='ctx'> 	int		csum_size = 0;</div><div class='ctx'> 	int		err, err2;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='ctx'> </div><div class='ctx'> 	if (!de) {</div><div class='del'>-		err = ext4_find_dest_de(dir, inode, bh, bh-&gt;b_data,</div><div class='add'>+		err = ext4_find_dest_de(dir, bh, bh-&gt;b_data,</div><div class='ctx'> 					blocksize - csum_size, fname, &amp;de);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -2218,6 +2156,52 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,</div><div class='ctx'> 	return err ? err : err2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ext4_check_dx_root(struct inode *dir, struct dx_root *root)</div><div class='add'>+{</div><div class='add'>+	struct fake_dirent *fde;</div><div class='add'>+	const char *error_msg;</div><div class='add'>+	unsigned int rlen;</div><div class='add'>+	unsigned int blocksize = dir-&gt;i_sb-&gt;s_blocksize;</div><div class='add'>+	char *blockend = (char *)root + dir-&gt;i_sb-&gt;s_blocksize;</div><div class='add'>+</div><div class='add'>+	fde = &amp;root-&gt;dot;</div><div class='add'>+	if (unlikely(fde-&gt;name_len != 1)) {</div><div class='add'>+		error_msg = "invalid name_len for '.'";</div><div class='add'>+		goto corrupted;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(strncmp(root-&gt;dot_name, ".", fde-&gt;name_len))) {</div><div class='add'>+		error_msg = "invalid name for '.'";</div><div class='add'>+		goto corrupted;</div><div class='add'>+	}</div><div class='add'>+	rlen = ext4_rec_len_from_disk(fde-&gt;rec_len, blocksize);</div><div class='add'>+	if (unlikely((char *)fde + rlen &gt;= blockend)) {</div><div class='add'>+		error_msg = "invalid rec_len for '.'";</div><div class='add'>+		goto corrupted;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fde = &amp;root-&gt;dotdot;</div><div class='add'>+	if (unlikely(fde-&gt;name_len != 2)) {</div><div class='add'>+		error_msg = "invalid name_len for '..'";</div><div class='add'>+		goto corrupted;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(strncmp(root-&gt;dotdot_name, "..", fde-&gt;name_len))) {</div><div class='add'>+		error_msg = "invalid name for '..'";</div><div class='add'>+		goto corrupted;</div><div class='add'>+	}</div><div class='add'>+	rlen = ext4_rec_len_from_disk(fde-&gt;rec_len, blocksize);</div><div class='add'>+	if (unlikely((char *)fde + rlen &gt;= blockend)) {</div><div class='add'>+		error_msg = "invalid rec_len for '..'";</div><div class='add'>+		goto corrupted;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+corrupted:</div><div class='add'>+	EXT4_ERROR_INODE(dir, "Corrupt dir, %s, running e2fsck is recommended",</div><div class='add'>+			 error_msg);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This converts a one block unindexed directory to a 3 block indexed</div><div class='ctx'>  * directory, and adds the dentry to the indexed directory.</div><div class='hunk'>@@ -2239,7 +2223,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,</div><div class='ctx'> 	struct fake_dirent *fde;</div><div class='ctx'> 	int csum_size = 0;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='ctx'> </div><div class='ctx'> 	blocksize =  dir-&gt;i_sb-&gt;s_blocksize;</div><div class='hunk'>@@ -2252,17 +2236,17 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	root = (struct dx_root *) bh-&gt;b_data;</div><div class='add'>+	if (!ext4_check_dx_root(dir, root)) {</div><div class='add'>+		brelse(bh);</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* The 0th block becomes the root, move the dirents out */</div><div class='ctx'> 	fde = &amp;root-&gt;dotdot;</div><div class='ctx'> 	de = (struct ext4_dir_entry_2 *)((char *)fde +</div><div class='ctx'> 		ext4_rec_len_from_disk(fde-&gt;rec_len, blocksize));</div><div class='del'>-	if ((char *) de &gt;= (((char *) root) + blocksize)) {</div><div class='del'>-		EXT4_ERROR_INODE(dir, "invalid rec_len for '..'");</div><div class='del'>-		brelse(bh);</div><div class='del'>-		return -EFSCORRUPTED;</div><div class='del'>-	}</div><div class='ctx'> 	len = ((char *) root) + (blocksize - csum_size) - (char *) de;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate new block for the 0th block's dirents */</div><div class='hunk'>@@ -2383,7 +2367,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,</div><div class='ctx'> 	ext4_lblk_t block, blocks;</div><div class='ctx'> 	int	csum_size = 0;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='ctx'> </div><div class='ctx'> 	sb = dir-&gt;i_sb;</div><div class='hunk'>@@ -2392,11 +2376,8 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,</div><div class='ctx'> 	if (fscrypt_is_nokey_name(dentry))</div><div class='ctx'> 		return -ENOKEY;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (sb_has_strict_encoding(sb) &amp;&amp; IS_CASEFOLDED(dir) &amp;&amp;</div><div class='del'>-	    utf8_validate(sb-&gt;s_encoding, &amp;dentry-&gt;d_name))</div><div class='add'>+	if (!generic_ci_validate_strict_name(dir, &amp;dentry-&gt;d_name))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	retval = ext4_fname_setup_filename(dir, &amp;dentry-&gt;d_name, 0, &amp;fname);</div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -2417,7 +2398,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,</div><div class='ctx'> 		if (!retval || (retval != ERR_BAD_DX_DIR))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		/* Can we just ignore htree data? */</div><div class='del'>-		if (ext4_has_metadata_csum(sb)) {</div><div class='add'>+		if (ext4_has_feature_metadata_csum(sb)) {</div><div class='ctx'> 			EXT4_ERROR_INODE(dir,</div><div class='ctx'> 				"Directory has corrupted htree index.");</div><div class='ctx'> 			retval = -EFSCORRUPTED;</div><div class='hunk'>@@ -2567,8 +2548,10 @@ again:</div><div class='ctx'> 		BUFFER_TRACE(frame-&gt;bh, "get_write_access");</div><div class='ctx'> 		err = ext4_journal_get_write_access(handle, sb, frame-&gt;bh,</div><div class='ctx'> 						    EXT4_JTR_NONE);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			brelse(bh2);</div><div class='ctx'> 			goto journal_error;</div><div class='add'>+		}</div><div class='ctx'> 		if (!add_level) {</div><div class='ctx'> 			unsigned icount1 = icount/2, icount2 = icount - icount1;</div><div class='ctx'> 			unsigned hash2 = dx_get_hash(entries + icount1);</div><div class='hunk'>@@ -2579,8 +2562,10 @@ again:</div><div class='ctx'> 			err = ext4_journal_get_write_access(handle, sb,</div><div class='ctx'> 							    (frame - 1)-&gt;bh,</div><div class='ctx'> 							    EXT4_JTR_NONE);</div><div class='del'>-			if (err)</div><div class='add'>+			if (err) {</div><div class='add'>+				brelse(bh2);</div><div class='ctx'> 				goto journal_error;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			memcpy((char *) entries2, (char *) (entries + icount1),</div><div class='ctx'> 			       icount2 * sizeof(struct dx_entry));</div><div class='hunk'>@@ -2599,8 +2584,10 @@ again:</div><div class='ctx'> 			dxtrace(dx_show_index("node",</div><div class='ctx'> 			       ((struct dx_node *) bh2-&gt;b_data)-&gt;entries));</div><div class='ctx'> 			err = ext4_handle_dirty_dx_node(handle, dir, bh2);</div><div class='del'>-			if (err)</div><div class='add'>+			if (err) {</div><div class='add'>+				brelse(bh2);</div><div class='ctx'> 				goto journal_error;</div><div class='add'>+			}</div><div class='ctx'> 			brelse (bh2);</div><div class='ctx'> 			err = ext4_handle_dirty_dx_node(handle, dir,</div><div class='ctx'> 						   (frame - 1)-&gt;bh);</div><div class='hunk'>@@ -2625,8 +2612,10 @@ again:</div><div class='ctx'> 				       "Creating %d level index...\n",</div><div class='ctx'> 				       dxroot-&gt;info.indirect_levels));</div><div class='ctx'> 			err = ext4_handle_dirty_dx_node(handle, dir, frame-&gt;bh);</div><div class='del'>-			if (err)</div><div class='add'>+			if (err) {</div><div class='add'>+				brelse(bh2);</div><div class='ctx'> 				goto journal_error;</div><div class='add'>+			}</div><div class='ctx'> 			err = ext4_handle_dirty_dx_node(handle, dir, bh2);</div><div class='ctx'> 			brelse(bh2);</div><div class='ctx'> 			restart = 1;</div><div class='hunk'>@@ -2723,7 +2712,7 @@ static int ext4_delete_entry(handle_t *handle,</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(dir-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(dir-&gt;i_sb))</div><div class='ctx'> 		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='ctx'> </div><div class='ctx'> 	BUFFER_TRACE(bh, "get_write_access");</div><div class='hunk'>@@ -2898,7 +2887,7 @@ retry:</div><div class='ctx'> 	inode = ext4_new_inode_start_handle(idmap, dir, mode,</div><div class='ctx'> 					    NULL, 0, NULL,</div><div class='ctx'> 					    EXT4_HT_DIR,</div><div class='del'>-			EXT4_MAXQUOTAS_INIT_BLOCKS(dir-&gt;i_sb) +</div><div class='add'>+			EXT4_MAXQUOTAS_TRANS_BLOCKS(dir-&gt;i_sb) +</div><div class='ctx'> 			  4 + EXT4_XATTR_TRANS_BLOCKS);</div><div class='ctx'> 	handle = ext4_journal_current_handle();</div><div class='ctx'> 	err = PTR_ERR(inode);</div><div class='hunk'>@@ -2924,48 +2913,59 @@ err_unlock_inode:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,</div><div class='del'>-			  struct ext4_dir_entry_2 *de,</div><div class='del'>-			  int blocksize, int csum_size,</div><div class='del'>-			  unsigned int parent_ino, int dotdot_real_len)</div><div class='add'>+int ext4_init_dirblock(handle_t *handle, struct inode *inode,</div><div class='add'>+		       struct buffer_head *bh, unsigned int parent_ino,</div><div class='add'>+		       void *inline_buf, int inline_size)</div><div class='ctx'> {</div><div class='add'>+	struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) bh-&gt;b_data;</div><div class='add'>+	size_t			blocksize = bh-&gt;b_size;</div><div class='add'>+	int			csum_size = 0, header_size;</div><div class='add'>+</div><div class='add'>+	if (ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='add'>+</div><div class='ctx'> 	de-&gt;inode = cpu_to_le32(inode-&gt;i_ino);</div><div class='ctx'> 	de-&gt;name_len = 1;</div><div class='ctx'> 	de-&gt;rec_len = ext4_rec_len_to_disk(ext4_dir_rec_len(de-&gt;name_len, NULL),</div><div class='ctx'> 					   blocksize);</div><div class='del'>-	strcpy(de-&gt;name, ".");</div><div class='add'>+	memcpy(de-&gt;name, ".", 2);</div><div class='ctx'> 	ext4_set_de_type(inode-&gt;i_sb, de, S_IFDIR);</div><div class='ctx'> </div><div class='ctx'> 	de = ext4_next_entry(de, blocksize);</div><div class='ctx'> 	de-&gt;inode = cpu_to_le32(parent_ino);</div><div class='ctx'> 	de-&gt;name_len = 2;</div><div class='del'>-	if (!dotdot_real_len)</div><div class='del'>-		de-&gt;rec_len = ext4_rec_len_to_disk(blocksize -</div><div class='del'>-					(csum_size + ext4_dir_rec_len(1, NULL)),</div><div class='del'>-					blocksize);</div><div class='del'>-	else</div><div class='add'>+	memcpy(de-&gt;name, "..", 3);</div><div class='add'>+	ext4_set_de_type(inode-&gt;i_sb, de, S_IFDIR);</div><div class='add'>+	if (inline_buf) {</div><div class='ctx'> 		de-&gt;rec_len = ext4_rec_len_to_disk(</div><div class='ctx'> 					ext4_dir_rec_len(de-&gt;name_len, NULL),</div><div class='ctx'> 					blocksize);</div><div class='del'>-	strcpy(de-&gt;name, "..");</div><div class='del'>-	ext4_set_de_type(inode-&gt;i_sb, de, S_IFDIR);</div><div class='add'>+		de = ext4_next_entry(de, blocksize);</div><div class='add'>+		header_size = (char *)de - bh-&gt;b_data;</div><div class='add'>+		memcpy((void *)de, inline_buf, inline_size);</div><div class='add'>+		ext4_update_final_de(bh-&gt;b_data, inline_size + header_size,</div><div class='add'>+			blocksize - csum_size);</div><div class='add'>+	} else {</div><div class='add'>+		de-&gt;rec_len = ext4_rec_len_to_disk(blocksize -</div><div class='add'>+					(csum_size + ext4_dir_rec_len(1, NULL)),</div><div class='add'>+					blocksize);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ext4_next_entry(de, blocksize);</div><div class='add'>+	if (csum_size)</div><div class='add'>+		ext4_initialize_dirent_tail(bh, blocksize);</div><div class='add'>+	BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");</div><div class='add'>+	set_buffer_uptodate(bh);</div><div class='add'>+	set_buffer_verified(bh);</div><div class='add'>+	return ext4_handle_dirty_dirblock(handle, inode, bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext4_init_new_dir(handle_t *handle, struct inode *dir,</div><div class='ctx'> 			     struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *dir_block = NULL;</div><div class='del'>-	struct ext4_dir_entry_2 *de;</div><div class='ctx'> 	ext4_lblk_t block = 0;</div><div class='del'>-	unsigned int blocksize = dir-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	int csum_size = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(dir-&gt;i_sb))</div><div class='del'>-		csum_size = sizeof(struct ext4_dir_entry_tail);</div><div class='del'>-</div><div class='ctx'> 	if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {</div><div class='ctx'> 		err = ext4_try_create_inline_dir(handle, dir, inode);</div><div class='ctx'> 		if (err &lt; 0 &amp;&amp; err != -ENOSPC)</div><div class='hunk'>@@ -2974,39 +2974,30 @@ int ext4_init_new_dir(handle_t *handle, struct inode *dir,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	set_nlink(inode, 2);</div><div class='ctx'> 	inode-&gt;i_size = 0;</div><div class='ctx'> 	dir_block = ext4_append(handle, inode, &amp;block);</div><div class='ctx'> 	if (IS_ERR(dir_block))</div><div class='ctx'> 		return PTR_ERR(dir_block);</div><div class='del'>-	de = (struct ext4_dir_entry_2 *)dir_block-&gt;b_data;</div><div class='del'>-	ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir-&gt;i_ino, 0);</div><div class='del'>-	set_nlink(inode, 2);</div><div class='del'>-	if (csum_size)</div><div class='del'>-		ext4_initialize_dirent_tail(dir_block, blocksize);</div><div class='del'>-</div><div class='del'>-	BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");</div><div class='del'>-	err = ext4_handle_dirty_dirblock(handle, inode, dir_block);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	set_buffer_verified(dir_block);</div><div class='add'>+	err = ext4_init_dirblock(handle, inode, dir_block, dir-&gt;i_ino, NULL, 0);</div><div class='ctx'> out:</div><div class='ctx'> 	brelse(dir_block);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext4_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *ext4_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int err, err2 = 0, credits, retries = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_DIR_LINK_MAX(dir))</div><div class='del'>-		return -EMLINK;</div><div class='add'>+		return ERR_PTR(-EMLINK);</div><div class='ctx'> </div><div class='ctx'> 	err = dquot_initialize(dir);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 	credits = (EXT4_DATA_TRANS_BLOCKS(dir-&gt;i_sb) +</div><div class='ctx'> 		   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3);</div><div class='hunk'>@@ -3056,7 +3047,7 @@ out_stop:</div><div class='ctx'> out_retry:</div><div class='ctx'> 	if (err == -ENOSPC &amp;&amp; ext4_should_retry_alloc(dir-&gt;i_sb, &amp;retries))</div><div class='ctx'> 		goto retry;</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3084,17 +3075,15 @@ bool ext4_empty_dir(struct inode *inode)</div><div class='ctx'> 		EXT4_ERROR_INODE(inode, "invalid size");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='del'>-	/* The first directory block must not be a hole,</div><div class='del'>-	 * so treat it as DIRENT_HTREE</div><div class='del'>-	 */</div><div class='del'>-	bh = ext4_read_dirblock(inode, 0, DIRENT_HTREE);</div><div class='add'>+	bh = ext4_read_dirblock(inode, 0, EITHER);</div><div class='ctx'> 	if (IS_ERR(bh))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	de = (struct ext4_dir_entry_2 *) bh-&gt;b_data;</div><div class='ctx'> 	if (ext4_check_dir_entry(inode, NULL, de, bh, bh-&gt;b_data, bh-&gt;b_size,</div><div class='ctx'> 				 0) ||</div><div class='del'>-	    le32_to_cpu(de-&gt;inode) != inode-&gt;i_ino || strcmp(".", de-&gt;name)) {</div><div class='add'>+	    le32_to_cpu(de-&gt;inode) != inode-&gt;i_ino || de-&gt;name_len != 1 ||</div><div class='add'>+	    de-&gt;name[0] != '.') {</div><div class='ctx'> 		ext4_warning_inode(inode, "directory missing '.'");</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -3103,7 +3092,8 @@ bool ext4_empty_dir(struct inode *inode)</div><div class='ctx'> 	de = ext4_next_entry(de, sb-&gt;s_blocksize);</div><div class='ctx'> 	if (ext4_check_dir_entry(inode, NULL, de, bh, bh-&gt;b_data, bh-&gt;b_size,</div><div class='ctx'> 				 offset) ||</div><div class='del'>-	    le32_to_cpu(de-&gt;inode) == 0 || strcmp("..", de-&gt;name)) {</div><div class='add'>+	    le32_to_cpu(de-&gt;inode) == 0 || de-&gt;name_len != 2 ||</div><div class='add'>+	    de-&gt;name[0] != '.' || de-&gt;name[1] != '.') {</div><div class='ctx'> 		ext4_warning_inode(inode, "directory missing '..'");</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -3141,11 +3131,12 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	struct ext4_dir_entry_2 *de;</div><div class='add'>+	struct ext4_dir_entry_2 *de = NULL;</div><div class='ctx'> 	handle_t *handle = NULL;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(dir-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	retval = ext4_emergency_state(dir-&gt;i_sb);</div><div class='add'>+	if (unlikely(retval))</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize quotas before so that eventual writes go in</div><div class='ctx'> 	 * separate transaction */</div><div class='hunk'>@@ -3209,16 +3200,14 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	ext4_fc_track_unlink(handle, dentry);</div><div class='ctx'> 	retval = ext4_mark_inode_dirty(handle, dir);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	/* VFS negative dentries are incompatible with Encoding and</div><div class='ctx'> 	 * Case-insensitiveness. Eventually we'll want avoid</div><div class='ctx'> 	 * invalidating the dentries here, alongside with returning the</div><div class='ctx'> 	 * negative dentries at ext4_lookup(), when it is better</div><div class='ctx'> 	 * supported by the VFS for the CI case.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_CASEFOLDED(dir))</div><div class='add'>+	if (IS_ENABLED(CONFIG_UNICODE) &amp;&amp; IS_CASEFOLDED(dir))</div><div class='ctx'> 		d_invalidate(dentry);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> end_rmdir:</div><div class='ctx'> 	brelse(bh);</div><div class='hunk'>@@ -3233,7 +3222,7 @@ int __ext4_unlink(struct inode *dir, const struct qstr *d_name,</div><div class='ctx'> {</div><div class='ctx'> 	int retval = -ENOENT;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	struct ext4_dir_entry_2 *de;</div><div class='add'>+	struct ext4_dir_entry_2 *de = NULL;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	int skip_remove_dentry = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3304,8 +3293,9 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(dir-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	retval = ext4_emergency_state(dir-&gt;i_sb);</div><div class='add'>+	if (unlikely(retval))</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_unlink_enter(dir, dentry);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3320,16 +3310,15 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		goto out_trace;</div><div class='ctx'> </div><div class='ctx'> 	retval = __ext4_unlink(dir, &amp;dentry-&gt;d_name, d_inode(dentry), dentry);</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+</div><div class='ctx'> 	/* VFS negative dentries are incompatible with Encoding and</div><div class='ctx'> 	 * Case-insensitiveness. Eventually we'll want avoid</div><div class='ctx'> 	 * invalidating the dentries here, alongside with returning the</div><div class='ctx'> 	 * negative dentries at ext4_lookup(), when it is  better</div><div class='ctx'> 	 * supported by the VFS for the CI case.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_CASEFOLDED(dir))</div><div class='add'>+	if (IS_ENABLED(CONFIG_UNICODE) &amp;&amp; IS_CASEFOLDED(dir))</div><div class='ctx'> 		d_invalidate(dentry);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> out_trace:</div><div class='ctx'> 	trace_ext4_unlink_exit(dentry, retval);</div><div class='hunk'>@@ -3372,8 +3361,9 @@ static int ext4_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	struct fscrypt_str disk_link;</div><div class='ctx'> 	int retries = 0;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(dir-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	err = ext4_emergency_state(dir-&gt;i_sb);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = fscrypt_prepare_symlink(dir, symname, len, dir-&gt;i_sb-&gt;s_blocksize,</div><div class='ctx'> 				      &amp;disk_link);</div><div class='hunk'>@@ -3414,7 +3404,6 @@ retry:</div><div class='ctx'> 			inode-&gt;i_op = &amp;ext4_symlink_inode_operations;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			inode-&gt;i_op = &amp;ext4_fast_symlink_inode_operations;</div><div class='del'>-			inode-&gt;i_link = (char *)&amp;EXT4_I(inode)-&gt;i_data;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3430,6 +3419,9 @@ retry:</div><div class='ctx'> 		       disk_link.len);</div><div class='ctx'> 		inode-&gt;i_size = disk_link.len - 1;</div><div class='ctx'> 		EXT4_I(inode)-&gt;i_disksize = inode-&gt;i_size;</div><div class='add'>+		if (!IS_ENCRYPTED(inode))</div><div class='add'>+			inode_set_cached_link(inode, (char *)&amp;EXT4_I(inode)-&gt;i_data,</div><div class='add'>+					      inode-&gt;i_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = ext4_add_nondir(handle, dentry, &amp;inode);</div><div class='ctx'> 	if (handle)</div><div class='hunk'>@@ -3532,10 +3524,7 @@ static struct buffer_head *ext4_get_first_dir_block(handle_t *handle,</div><div class='ctx'> 		struct ext4_dir_entry_2 *de;</div><div class='ctx'> 		unsigned int offset;</div><div class='ctx'> </div><div class='del'>-		/* The first directory block must not be a hole, so</div><div class='del'>-		 * treat it as DIRENT_HTREE</div><div class='del'>-		 */</div><div class='del'>-		bh = ext4_read_dirblock(inode, 0, DIRENT_HTREE);</div><div class='add'>+		bh = ext4_read_dirblock(inode, 0, EITHER);</div><div class='ctx'> 		if (IS_ERR(bh)) {</div><div class='ctx'> 			*retval = PTR_ERR(bh);</div><div class='ctx'> 			return NULL;</div><div class='hunk'>@@ -3545,7 +3534,7 @@ static struct buffer_head *ext4_get_first_dir_block(handle_t *handle,</div><div class='ctx'> 		if (ext4_check_dir_entry(inode, NULL, de, bh, bh-&gt;b_data,</div><div class='ctx'> 					 bh-&gt;b_size, 0) ||</div><div class='ctx'> 		    le32_to_cpu(de-&gt;inode) != inode-&gt;i_ino ||</div><div class='del'>-		    strcmp(".", de-&gt;name)) {</div><div class='add'>+		    de-&gt;name_len != 1 || de-&gt;name[0] != '.') {</div><div class='ctx'> 			EXT4_ERROR_INODE(inode, "directory missing '.'");</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			*retval = -EFSCORRUPTED;</div><div class='hunk'>@@ -3556,7 +3545,8 @@ static struct buffer_head *ext4_get_first_dir_block(handle_t *handle,</div><div class='ctx'> 		de = ext4_next_entry(de, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='ctx'> 		if (ext4_check_dir_entry(inode, NULL, de, bh, bh-&gt;b_data,</div><div class='ctx'> 					 bh-&gt;b_size, offset) ||</div><div class='del'>-		    le32_to_cpu(de-&gt;inode) == 0 || strcmp("..", de-&gt;name)) {</div><div class='add'>+		    le32_to_cpu(de-&gt;inode) == 0 || de-&gt;name_len != 2 ||</div><div class='add'>+		    de-&gt;name[0] != '.' || de-&gt;name[1] != '.') {</div><div class='ctx'> 			EXT4_ERROR_INODE(inode, "directory missing '..'");</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			*retval = -EFSCORRUPTED;</div><div class='hunk'>@@ -3696,7 +3686,7 @@ static int ext4_find_delete_entry(handle_t *handle, struct inode *dir,</div><div class='ctx'> {</div><div class='ctx'> 	int retval = -ENOENT;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	struct ext4_dir_entry_2 *de;</div><div class='add'>+	struct ext4_dir_entry_2 *de = NULL;</div><div class='ctx'> </div><div class='ctx'> 	bh = ext4_find_entry(dir, d_name, &amp;de, NULL);</div><div class='ctx'> 	if (IS_ERR(bh))</div><div class='hunk'>@@ -4196,8 +4186,9 @@ static int ext4_rename2(struct mnt_idmap *idmap,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(old_dir-&gt;i_sb)))</div><div class='del'>-		return -EIO;</div><div class='add'>+	err = ext4_emergency_state(old_dir-&gt;i_sb);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/fs/ext4/orphan.c b/fs/ext4/orphan.c<br/>index e5b47dda3317..c9b93b670b0f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/orphan.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/orphan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/orphan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/orphan.c</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> #include "ext4.h"</div><div class='ctx'> #include "ext4_jbd2.h"</div><div class='ctx'> </div><div class='add'>+#define EXT4_MAX_ORPHAN_FILE_BLOCKS 512</div><div class='add'>+</div><div class='ctx'> static int ext4_orphan_file_add(handle_t *handle, struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, start;</div><div class='hunk'>@@ -107,13 +109,9 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode)</div><div class='ctx'> 	if (!sbi-&gt;s_journal || is_bad_inode(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(!(inode-&gt;i_state &amp; (I_NEW | I_FREEING)) &amp;&amp;</div><div class='add'>+	WARN_ON_ONCE(!(inode_state_read_once(inode) &amp; (I_NEW | I_FREEING)) &amp;&amp;</div><div class='ctx'> 		     !inode_is_locked(inode));</div><div class='del'>-	/*</div><div class='del'>-	 * Inode orphaned in orphan file or in orphan list?</div><div class='del'>-	 */</div><div class='del'>-	if (ext4_test_inode_state(inode, EXT4_STATE_ORPHAN_FILE) ||</div><div class='del'>-	    !list_empty(&amp;EXT4_I(inode)-&gt;i_orphan))</div><div class='add'>+	if (ext4_inode_orphan_tracked(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -236,7 +234,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode)</div><div class='ctx'> 	if (!sbi-&gt;s_journal &amp;&amp; !(sbi-&gt;s_mount_state &amp; EXT4_ORPHAN_FS))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(!(inode-&gt;i_state &amp; (I_NEW | I_FREEING)) &amp;&amp;</div><div class='add'>+	WARN_ON_ONCE(!(inode_state_read_once(inode) &amp; (I_NEW | I_FREEING)) &amp;&amp;</div><div class='ctx'> 		     !inode_is_locked(inode));</div><div class='ctx'> 	if (ext4_test_inode_state(inode, EXT4_STATE_ORPHAN_FILE))</div><div class='ctx'> 		return ext4_orphan_file_del(handle, inode);</div><div class='hunk'>@@ -517,7 +515,7 @@ void ext4_release_orphan_info(struct super_block *sb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	for (i = 0; i &lt; oi-&gt;of_blocks; i++)</div><div class='ctx'> 		brelse(oi-&gt;of_binfo[i].ob_bh);</div><div class='del'>-	kfree(oi-&gt;of_binfo);</div><div class='add'>+	kvfree(oi-&gt;of_binfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ext4_orphan_block_tail *ext4_orphan_block_tail(</div><div class='hunk'>@@ -537,13 +535,13 @@ static int ext4_orphan_file_block_csum_verify(struct super_block *sb,</div><div class='ctx'> 	struct ext4_orphan_block_tail *ot;</div><div class='ctx'> 	__le64 dsk_block_nr = cpu_to_le64(bh-&gt;b_blocknr);</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	ot = ext4_orphan_block_tail(sb, bh);</div><div class='del'>-	calculated = ext4_chksum(EXT4_SB(sb), oi-&gt;of_csum_seed,</div><div class='del'>-				 (__u8 *)&amp;dsk_block_nr, sizeof(dsk_block_nr));</div><div class='del'>-	calculated = ext4_chksum(EXT4_SB(sb), calculated, (__u8 *)bh-&gt;b_data,</div><div class='add'>+	calculated = ext4_chksum(oi-&gt;of_csum_seed, (__u8 *)&amp;dsk_block_nr,</div><div class='add'>+				 sizeof(dsk_block_nr));</div><div class='add'>+	calculated = ext4_chksum(calculated, (__u8 *)bh-&gt;b_data,</div><div class='ctx'> 				 inodes_per_ob * sizeof(__u32));</div><div class='ctx'> 	return le32_to_cpu(ot-&gt;ob_checksum) == calculated;</div><div class='ctx'> }</div><div class='hunk'>@@ -560,10 +558,9 @@ void ext4_orphan_file_block_trigger(struct jbd2_buffer_trigger_type *triggers,</div><div class='ctx'> 	struct ext4_orphan_block_tail *ot;</div><div class='ctx'> 	__le64 dsk_block_nr = cpu_to_le64(bh-&gt;b_blocknr);</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(EXT4_SB(sb), oi-&gt;of_csum_seed,</div><div class='del'>-			   (__u8 *)&amp;dsk_block_nr, sizeof(dsk_block_nr));</div><div class='del'>-	csum = ext4_chksum(EXT4_SB(sb), csum, (__u8 *)data,</div><div class='del'>-			   inodes_per_ob * sizeof(__u32));</div><div class='add'>+	csum = ext4_chksum(oi-&gt;of_csum_seed, (__u8 *)&amp;dsk_block_nr,</div><div class='add'>+			   sizeof(dsk_block_nr));</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)data, inodes_per_ob * sizeof(__u32));</div><div class='ctx'> 	ot = ext4_orphan_block_tail(sb, bh);</div><div class='ctx'> 	ot-&gt;ob_checksum = cpu_to_le32(csum);</div><div class='ctx'> }</div><div class='hunk'>@@ -588,10 +585,22 @@ int ext4_init_orphan_info(struct super_block *sb)</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "get orphan inode failed");</div><div class='ctx'> 		return PTR_ERR(inode);</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * This is just an artificial limit to prevent corrupted fs from</div><div class='add'>+	 * consuming absurd amounts of memory when pinning blocks of orphan</div><div class='add'>+	 * file in memory.</div><div class='add'>+	 */</div><div class='add'>+	if (inode-&gt;i_size &gt; (EXT4_MAX_ORPHAN_FILE_BLOCKS &lt;&lt; inode-&gt;i_blkbits)) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR, "orphan file too big: %llu",</div><div class='add'>+			 (unsigned long long)inode-&gt;i_size);</div><div class='add'>+		ret = -EFSCORRUPTED;</div><div class='add'>+		goto out_put;</div><div class='add'>+	}</div><div class='ctx'> 	oi-&gt;of_blocks = inode-&gt;i_size &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='ctx'> 	oi-&gt;of_csum_seed = EXT4_I(inode)-&gt;i_csum_seed;</div><div class='del'>-	oi-&gt;of_binfo = kmalloc(oi-&gt;of_blocks*sizeof(struct ext4_orphan_block),</div><div class='del'>-			       GFP_KERNEL);</div><div class='add'>+	oi-&gt;of_binfo = kvmalloc_array(oi-&gt;of_blocks,</div><div class='add'>+				     sizeof(struct ext4_orphan_block),</div><div class='add'>+				     GFP_KERNEL);</div><div class='ctx'> 	if (!oi-&gt;of_binfo) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_put;</div><div class='hunk'>@@ -630,7 +639,7 @@ int ext4_init_orphan_info(struct super_block *sb)</div><div class='ctx'> out_free:</div><div class='ctx'> 	for (i--; i &gt;= 0; i--)</div><div class='ctx'> 		brelse(oi-&gt;of_binfo[i].ob_bh);</div><div class='del'>-	kfree(oi-&gt;of_binfo);</div><div class='add'>+	kvfree(oi-&gt;of_binfo);</div><div class='ctx'> out_put:</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c<br/>index 312bc6813357..39abfeec5f36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/page-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/page-io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/page-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/page-io.c</a></div><div class='hunk'>@@ -117,7 +117,6 @@ static void ext4_finish_bio(struct bio *bio)</div><div class='ctx'> </div><div class='ctx'> 		if (bio-&gt;bi_status) {</div><div class='ctx'> 			int err = blk_status_to_errno(bio-&gt;bi_status);</div><div class='del'>-			folio_set_error(folio);</div><div class='ctx'> 			mapping_set_error(folio-&gt;mapping, err);</div><div class='ctx'> 		}</div><div class='ctx'> 		bh = head = folio_buffers(folio);</div><div class='hunk'>@@ -165,7 +164,8 @@ static void ext4_release_io_end(ext4_io_end_t *io_end)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check a range of space and convert unwritten extents to written. Note that</div><div class='add'>+ * On successful IO, check a range of space and convert unwritten extents to</div><div class='add'>+ * written. On IO failure, check if journal abort is needed. Note that</div><div class='ctx'>  * we are protected from truncate touching same part of extent tree by the</div><div class='ctx'>  * fact that truncate code waits for all DIO to finish (thus exclusion from</div><div class='ctx'>  * direct IO is achieved) and also waits for PageWriteback bits. Thus we</div><div class='hunk'>@@ -176,20 +176,36 @@ static int ext4_end_io_end(ext4_io_end_t *io_end)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = io_end-&gt;inode;</div><div class='ctx'> 	handle_t *handle = io_end-&gt;handle;</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ext4_debug("ext4_end_io_nolock: io_end 0x%p from inode %lu,list-&gt;next 0x%p,"</div><div class='ctx'> 		   "list-&gt;prev 0x%p\n",</div><div class='ctx'> 		   io_end, inode-&gt;i_ino, io_end-&gt;list.next, io_end-&gt;list.prev);</div><div class='ctx'> </div><div class='del'>-	io_end-&gt;handle = NULL;	/* Following call will use up the handle */</div><div class='del'>-	ret = ext4_convert_unwritten_io_end_vec(handle, io_end);</div><div class='del'>-	if (ret &lt; 0 &amp;&amp; !ext4_forced_shutdown(inode-&gt;i_sb)) {</div><div class='del'>-		ext4_msg(inode-&gt;i_sb, KERN_EMERG,</div><div class='add'>+	/*</div><div class='add'>+	 * Do not convert the unwritten extents if data writeback fails,</div><div class='add'>+	 * or stale data may be exposed.</div><div class='add'>+	 */</div><div class='add'>+	io_end-&gt;handle = NULL;  /* Following call will use up the handle */</div><div class='add'>+	if (unlikely(io_end-&gt;flag &amp; EXT4_IO_END_FAILED)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		if (handle)</div><div class='add'>+			jbd2_journal_free_reserved(handle);</div><div class='add'>+</div><div class='add'>+		if (test_opt(sb, DATA_ERR_ABORT))</div><div class='add'>+			jbd2_journal_abort(EXT4_SB(sb)-&gt;s_journal, ret);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ext4_convert_unwritten_io_end_vec(handle, io_end);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; !ext4_emergency_state(sb) &amp;&amp;</div><div class='add'>+	    io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN) {</div><div class='add'>+		ext4_msg(sb, KERN_EMERG,</div><div class='ctx'> 			 "failed to convert unwritten extents to written "</div><div class='ctx'> 			 "extents -- potential data loss!  "</div><div class='ctx'> 			 "(inode %lu, error %d)", inode-&gt;i_ino, ret);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	ext4_clear_io_unwritten_flag(io_end);</div><div class='ctx'> 	ext4_release_io_end(io_end);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -218,6 +234,18 @@ static void dump_completed_IO(struct inode *inode, struct list_head *head)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ext4_io_end_defer_completion(ext4_io_end_t *io_end)</div><div class='add'>+{</div><div class='add'>+	if (io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN &amp;&amp;</div><div class='add'>+	    !list_empty(&amp;io_end-&gt;list_vec))</div><div class='add'>+		return true;</div><div class='add'>+	if (test_opt(io_end-&gt;inode-&gt;i_sb, DATA_ERR_ABORT) &amp;&amp;</div><div class='add'>+	    io_end-&gt;flag &amp; EXT4_IO_END_FAILED &amp;&amp;</div><div class='add'>+	    !ext4_emergency_state(io_end-&gt;inode-&gt;i_sb))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Add the io_end to per-inode completed end_io list. */</div><div class='ctx'> static void ext4_add_complete_io(ext4_io_end_t *io_end)</div><div class='ctx'> {</div><div class='hunk'>@@ -226,9 +254,12 @@ static void ext4_add_complete_io(ext4_io_end_t *io_end)</div><div class='ctx'> 	struct workqueue_struct *wq;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/* Only reserved conversions from writeback should enter here */</div><div class='del'>-	WARN_ON(!(io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN));</div><div class='del'>-	WARN_ON(!io_end-&gt;handle &amp;&amp; sbi-&gt;s_journal);</div><div class='add'>+	/* Only reserved conversions or pending IO errors will enter here. */</div><div class='add'>+	WARN_ON(!(io_end-&gt;flag &amp; EXT4_IO_END_DEFER_COMPLETION));</div><div class='add'>+	WARN_ON(io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN &amp;&amp;</div><div class='add'>+		!io_end-&gt;handle &amp;&amp; sbi-&gt;s_journal);</div><div class='add'>+	WARN_ON(!io_end-&gt;bio);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;ei-&gt;i_completed_io_lock, flags);</div><div class='ctx'> 	wq = sbi-&gt;rsv_conversion_wq;</div><div class='ctx'> 	if (list_empty(&amp;ei-&gt;i_rsv_conversion_list))</div><div class='hunk'>@@ -253,7 +284,7 @@ static int ext4_do_flush_completed_IO(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;unwritten)) {</div><div class='ctx'> 		io_end = list_entry(unwritten.next, ext4_io_end_t, list);</div><div class='del'>-		BUG_ON(!(io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN));</div><div class='add'>+		BUG_ON(!(io_end-&gt;flag &amp; EXT4_IO_END_DEFER_COMPLETION));</div><div class='ctx'> 		list_del_init(&amp;io_end-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 		err = ext4_end_io_end(io_end);</div><div class='hunk'>@@ -264,7 +295,8 @@ static int ext4_do_flush_completed_IO(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * work on completed IO, to convert unwritten extents to extents</div><div class='add'>+ * Used to convert unwritten extents to written extents upon IO completion,</div><div class='add'>+ * or used to abort the journal upon IO errors.</div><div class='ctx'>  */</div><div class='ctx'> void ext4_end_io_rsv_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -289,29 +321,22 @@ ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags)</div><div class='ctx'> void ext4_put_io_end_defer(ext4_io_end_t *io_end)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;io_end-&gt;count)) {</div><div class='del'>-		if (!(io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN) ||</div><div class='del'>-				list_empty(&amp;io_end-&gt;list_vec)) {</div><div class='del'>-			ext4_release_io_end(io_end);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		ext4_add_complete_io(io_end);</div><div class='add'>+		if (ext4_io_end_defer_completion(io_end))</div><div class='add'>+			return ext4_add_complete_io(io_end);</div><div class='add'>+</div><div class='add'>+		ext4_release_io_end(io_end);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ext4_put_io_end(ext4_io_end_t *io_end)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;io_end-&gt;count)) {</div><div class='del'>-		if (io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN) {</div><div class='del'>-			err = ext4_convert_unwritten_io_end_vec(io_end-&gt;handle,</div><div class='del'>-								io_end);</div><div class='del'>-			io_end-&gt;handle = NULL;</div><div class='del'>-			ext4_clear_io_unwritten_flag(io_end);</div><div class='del'>-		}</div><div class='add'>+		if (ext4_io_end_defer_completion(io_end))</div><div class='add'>+			return ext4_end_io_end(io_end);</div><div class='add'>+</div><div class='ctx'> 		ext4_release_io_end(io_end);</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ext4_io_end_t *ext4_get_io_end(ext4_io_end_t *io_end)</div><div class='hunk'>@@ -345,11 +370,12 @@ static void ext4_end_bio(struct bio *bio)</div><div class='ctx'> 			     bio-&gt;bi_status, inode-&gt;i_ino,</div><div class='ctx'> 			     (unsigned long long)</div><div class='ctx'> 			     bi_sector &gt;&gt; (inode-&gt;i_blkbits - 9));</div><div class='add'>+		io_end-&gt;flag |= EXT4_IO_END_FAILED;</div><div class='ctx'> 		mapping_set_error(inode-&gt;i_mapping,</div><div class='ctx'> 				blk_status_to_errno(bio-&gt;bi_status));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (io_end-&gt;flag &amp; EXT4_IO_END_UNWRITTEN) {</div><div class='add'>+	if (ext4_io_end_defer_completion(io_end)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Link bio into list hanging from io_end. We have to do it</div><div class='ctx'> 		 * atomically as bio completions can be racing against each</div><div class='hunk'>@@ -418,11 +444,13 @@ static void io_submit_add_bh(struct ext4_io_submit *io,</div><div class='ctx'> submit_and_retry:</div><div class='ctx'> 		ext4_io_submit(io);</div><div class='ctx'> 	}</div><div class='del'>-	if (io-&gt;io_bio == NULL)</div><div class='add'>+	if (io-&gt;io_bio == NULL) {</div><div class='ctx'> 		io_submit_init_bio(io, bh);</div><div class='add'>+		io-&gt;io_bio-&gt;bi_write_hint = inode-&gt;i_write_hint;</div><div class='add'>+	}</div><div class='ctx'> 	if (!bio_add_folio(io-&gt;io_bio, io_folio, bh-&gt;b_size, bh_offset(bh)))</div><div class='ctx'> 		goto submit_and_retry;</div><div class='del'>-	wbc_account_cgroup_owner(io-&gt;io_wbc, &amp;folio-&gt;page, bh-&gt;b_size);</div><div class='add'>+	wbc_account_cgroup_owner(io-&gt;io_wbc, folio, bh-&gt;b_size);</div><div class='ctx'> 	io-&gt;io_next_block++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -441,8 +469,6 @@ int ext4_bio_write_folio(struct ext4_io_submit *io, struct folio *folio,</div><div class='ctx'> 	BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> 	BUG_ON(folio_test_writeback(folio));</div><div class='ctx'> </div><div class='del'>-	folio_clear_error(folio);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Comments copied from block_write_full_folio:</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -521,9 +547,9 @@ int ext4_bio_write_folio(struct ext4_io_submit *io, struct folio *folio,</div><div class='ctx'> 		 * first page of the bio.  Otherwise it can deadlock.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (io-&gt;io_bio)</div><div class='del'>-			gfp_flags = GFP_NOWAIT | __GFP_NOWARN;</div><div class='add'>+			gfp_flags = GFP_NOWAIT;</div><div class='ctx'> 	retry_encrypt:</div><div class='del'>-		bounce_page = fscrypt_encrypt_pagecache_blocks(&amp;folio-&gt;page,</div><div class='add'>+		bounce_page = fscrypt_encrypt_pagecache_blocks(folio,</div><div class='ctx'> 					enc_bytes, 0, gfp_flags);</div><div class='ctx'> 		if (IS_ERR(bounce_page)) {</div><div class='ctx'> 			ret = PTR_ERR(bounce_page);</div><div class='head'>diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c<br/>index 21e8f0aebb3c..e7f2350c725b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/readpage.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/readpage.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/readpage.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/readpage.c</a></div><div class='hunk'>@@ -213,41 +213,44 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='ctx'> 	sector_t last_block_in_bio = 0;</div><div class='del'>-</div><div class='ctx'> 	const unsigned blkbits = inode-&gt;i_blkbits;</div><div class='del'>-	const unsigned blocks_per_page = PAGE_SIZE &gt;&gt; blkbits;</div><div class='ctx'> 	const unsigned blocksize = 1 &lt;&lt; blkbits;</div><div class='ctx'> 	sector_t next_block;</div><div class='ctx'> 	sector_t block_in_file;</div><div class='ctx'> 	sector_t last_block;</div><div class='ctx'> 	sector_t last_block_in_file;</div><div class='del'>-	sector_t blocks[MAX_BUF_PER_PAGE];</div><div class='add'>+	sector_t first_block;</div><div class='ctx'> 	unsigned page_block;</div><div class='ctx'> 	struct block_device *bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='ctx'> 	int length;</div><div class='ctx'> 	unsigned relative_block = 0;</div><div class='ctx'> 	struct ext4_map_blocks map;</div><div class='del'>-	unsigned int nr_pages = rac ? readahead_count(rac) : 1;</div><div class='add'>+	unsigned int nr_pages, folio_pages;</div><div class='ctx'> </div><div class='ctx'> 	map.m_pblk = 0;</div><div class='ctx'> 	map.m_lblk = 0;</div><div class='ctx'> 	map.m_len = 0;</div><div class='ctx'> 	map.m_flags = 0;</div><div class='ctx'> </div><div class='del'>-	for (; nr_pages; nr_pages--) {</div><div class='add'>+	nr_pages = rac ? readahead_count(rac) : folio_nr_pages(folio);</div><div class='add'>+	for (; nr_pages; nr_pages -= folio_pages) {</div><div class='ctx'> 		int fully_mapped = 1;</div><div class='del'>-		unsigned first_hole = blocks_per_page;</div><div class='add'>+		unsigned int first_hole;</div><div class='add'>+		unsigned int blocks_per_folio;</div><div class='ctx'> </div><div class='ctx'> 		if (rac)</div><div class='ctx'> 			folio = readahead_folio(rac);</div><div class='add'>+</div><div class='add'>+		folio_pages = folio_nr_pages(folio);</div><div class='ctx'> 		prefetchw(&amp;folio-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		if (folio_buffers(folio))</div><div class='ctx'> 			goto confused;</div><div class='ctx'> </div><div class='del'>-		block_in_file = next_block =</div><div class='del'>-			(sector_t)folio-&gt;index &lt;&lt; (PAGE_SHIFT - blkbits);</div><div class='del'>-		last_block = block_in_file + nr_pages * blocks_per_page;</div><div class='add'>+		blocks_per_folio = folio_size(folio) &gt;&gt; blkbits;</div><div class='add'>+		first_hole = blocks_per_folio;</div><div class='add'>+		block_in_file = next_block = EXT4_PG_TO_LBLK(inode, folio-&gt;index);</div><div class='add'>+		last_block = EXT4_PG_TO_LBLK(inode, folio-&gt;index + nr_pages);</div><div class='ctx'> 		last_block_in_file = (ext4_readpage_limit(inode) +</div><div class='ctx'> 				      blocksize - 1) &gt;&gt; blkbits;</div><div class='ctx'> 		if (last_block &gt; last_block_in_file)</div><div class='hunk'>@@ -263,16 +266,15 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> 			unsigned map_offset = block_in_file - map.m_lblk;</div><div class='ctx'> 			unsigned last = map.m_len - map_offset;</div><div class='ctx'> </div><div class='add'>+			first_block = map.m_pblk + map_offset;</div><div class='ctx'> 			for (relative_block = 0; ; relative_block++) {</div><div class='ctx'> 				if (relative_block == last) {</div><div class='ctx'> 					/* needed? */</div><div class='ctx'> 					map.m_flags &amp;= ~EXT4_MAP_MAPPED;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (page_block == blocks_per_page)</div><div class='add'>+				if (page_block == blocks_per_folio)</div><div class='ctx'> 					break;</div><div class='del'>-				blocks[page_block] = map.m_pblk + map_offset +</div><div class='del'>-					relative_block;</div><div class='ctx'> 				page_block++;</div><div class='ctx'> 				block_in_file++;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -282,14 +284,13 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> 		 * Then do more ext4_map_blocks() calls until we are</div><div class='ctx'> 		 * done with this folio.</div><div class='ctx'> 		 */</div><div class='del'>-		while (page_block &lt; blocks_per_page) {</div><div class='add'>+		while (page_block &lt; blocks_per_folio) {</div><div class='ctx'> 			if (block_in_file &lt; last_block) {</div><div class='ctx'> 				map.m_lblk = block_in_file;</div><div class='ctx'> 				map.m_len = last_block - block_in_file;</div><div class='ctx'> </div><div class='ctx'> 				if (ext4_map_blocks(NULL, inode, &amp;map, 0) &lt; 0) {</div><div class='ctx'> 				set_error_page:</div><div class='del'>-					folio_set_error(folio);</div><div class='ctx'> 					folio_zero_segment(folio, 0,</div><div class='ctx'> 							  folio_size(folio));</div><div class='ctx'> 					folio_unlock(folio);</div><div class='hunk'>@@ -298,31 +299,32 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> 			}</div><div class='ctx'> 			if ((map.m_flags &amp; EXT4_MAP_MAPPED) == 0) {</div><div class='ctx'> 				fully_mapped = 0;</div><div class='del'>-				if (first_hole == blocks_per_page)</div><div class='add'>+				if (first_hole == blocks_per_folio)</div><div class='ctx'> 					first_hole = page_block;</div><div class='ctx'> 				page_block++;</div><div class='ctx'> 				block_in_file++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			if (first_hole != blocks_per_page)</div><div class='add'>+			if (first_hole != blocks_per_folio)</div><div class='ctx'> 				goto confused;		/* hole -&gt; non-hole */</div><div class='ctx'> </div><div class='ctx'> 			/* Contiguous blocks? */</div><div class='del'>-			if (page_block &amp;&amp; blocks[page_block-1] != map.m_pblk-1)</div><div class='add'>+			if (!page_block)</div><div class='add'>+				first_block = map.m_pblk;</div><div class='add'>+			else if (first_block + page_block != map.m_pblk)</div><div class='ctx'> 				goto confused;</div><div class='ctx'> 			for (relative_block = 0; ; relative_block++) {</div><div class='ctx'> 				if (relative_block == map.m_len) {</div><div class='ctx'> 					/* needed? */</div><div class='ctx'> 					map.m_flags &amp;= ~EXT4_MAP_MAPPED;</div><div class='ctx'> 					break;</div><div class='del'>-				} else if (page_block == blocks_per_page)</div><div class='add'>+				} else if (page_block == blocks_per_folio)</div><div class='ctx'> 					break;</div><div class='del'>-				blocks[page_block] = map.m_pblk+relative_block;</div><div class='ctx'> 				page_block++;</div><div class='ctx'> 				block_in_file++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (first_hole != blocks_per_page) {</div><div class='add'>+		if (first_hole != blocks_per_folio) {</div><div class='ctx'> 			folio_zero_segment(folio, first_hole &lt;&lt; blkbits,</div><div class='ctx'> 					  folio_size(folio));</div><div class='ctx'> 			if (first_hole == 0) {</div><div class='hunk'>@@ -340,7 +342,7 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> 		 * This folio will go to BIO.  Do we need to send this</div><div class='ctx'> 		 * BIO off first?</div><div class='ctx'> 		 */</div><div class='del'>-		if (bio &amp;&amp; (last_block_in_bio != blocks[0] - 1 ||</div><div class='add'>+		if (bio &amp;&amp; (last_block_in_bio != first_block - 1 ||</div><div class='ctx'> 			    !fscrypt_mergeable_bio(bio, inode, next_block))) {</div><div class='ctx'> 		submit_and_realloc:</div><div class='ctx'> 			submit_bio(bio);</div><div class='hunk'>@@ -356,7 +358,7 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> 			fscrypt_set_bio_crypt_ctx(bio, inode, next_block,</div><div class='ctx'> 						  GFP_KERNEL);</div><div class='ctx'> 			ext4_set_bio_post_read_ctx(bio, inode, folio-&gt;index);</div><div class='del'>-			bio-&gt;bi_iter.bi_sector = blocks[0] &lt;&lt; (blkbits - 9);</div><div class='add'>+			bio-&gt;bi_iter.bi_sector = first_block &lt;&lt; (blkbits - 9);</div><div class='ctx'> 			bio-&gt;bi_end_io = mpage_end_io;</div><div class='ctx'> 			if (rac)</div><div class='ctx'> 				bio-&gt;bi_opf |= REQ_RAHEAD;</div><div class='hunk'>@@ -368,11 +370,11 @@ int ext4_mpage_readpages(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		if (((map.m_flags &amp; EXT4_MAP_BOUNDARY) &amp;&amp;</div><div class='ctx'> 		     (relative_block == map.m_len)) ||</div><div class='del'>-		    (first_hole != blocks_per_page)) {</div><div class='add'>+		    (first_hole != blocks_per_folio)) {</div><div class='ctx'> 			submit_bio(bio);</div><div class='ctx'> 			bio = NULL;</div><div class='ctx'> 		} else</div><div class='del'>-			last_block_in_bio = blocks[blocks_per_page - 1];</div><div class='add'>+			last_block_in_bio = first_block + blocks_per_folio - 1;</div><div class='ctx'> 		continue;</div><div class='ctx'> 	confused:</div><div class='ctx'> 		if (bio) {</div><div class='head'>diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c<br/>index 4d4a5a32e310..050f26168d97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/resize.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/resize.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/resize.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/resize.c</a></div><div class='hunk'>@@ -230,8 +230,8 @@ struct ext4_new_flex_group_data {</div><div class='ctx'> #define MAX_RESIZE_BG				16384</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * alloc_flex_gd() allocates a ext4_new_flex_group_data with size of</div><div class='del'>- * @flexbg_size.</div><div class='add'>+ * alloc_flex_gd() allocates an ext4_new_flex_group_data that satisfies the</div><div class='add'>+ * resizing from @o_group to @n_group, its size is typically @flexbg_size.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns NULL on failure otherwise address of the allocated structure.</div><div class='ctx'>  */</div><div class='hunk'>@@ -239,25 +239,27 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned int flexbg_size,</div><div class='ctx'> 				ext4_group_t o_group, ext4_group_t n_group)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_group_t last_group;</div><div class='add'>+	unsigned int max_resize_bg;</div><div class='ctx'> 	struct ext4_new_flex_group_data *flex_gd;</div><div class='ctx'> </div><div class='ctx'> 	flex_gd = kmalloc(sizeof(*flex_gd), GFP_NOFS);</div><div class='ctx'> 	if (flex_gd == NULL)</div><div class='ctx'> 		goto out3;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(flexbg_size &gt; MAX_RESIZE_BG))</div><div class='del'>-		flex_gd-&gt;resize_bg = MAX_RESIZE_BG;</div><div class='del'>-	else</div><div class='del'>-		flex_gd-&gt;resize_bg = flexbg_size;</div><div class='add'>+	max_resize_bg = umin(flexbg_size, MAX_RESIZE_BG);</div><div class='add'>+	flex_gd-&gt;resize_bg = max_resize_bg;</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid allocating large 'groups' array if not needed */</div><div class='ctx'> 	last_group = o_group | (flex_gd-&gt;resize_bg - 1);</div><div class='ctx'> 	if (n_group &lt;= last_group)</div><div class='del'>-		flex_gd-&gt;resize_bg = 1 &lt;&lt; fls(n_group - o_group + 1);</div><div class='add'>+		flex_gd-&gt;resize_bg = 1 &lt;&lt; fls(n_group - o_group);</div><div class='ctx'> 	else if (n_group - last_group &lt; flex_gd-&gt;resize_bg)</div><div class='del'>-		flex_gd-&gt;resize_bg = 1 &lt;&lt; max(fls(last_group - o_group + 1),</div><div class='add'>+		flex_gd-&gt;resize_bg = 1 &lt;&lt; max(fls(last_group - o_group),</div><div class='ctx'> 					      fls(n_group - last_group));</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(flex_gd-&gt;resize_bg &gt; max_resize_bg))</div><div class='add'>+		flex_gd-&gt;resize_bg = max_resize_bg;</div><div class='add'>+</div><div class='ctx'> 	flex_gd-&gt;groups = kmalloc_array(flex_gd-&gt;resize_bg,</div><div class='ctx'> 					sizeof(struct ext4_new_group_data),</div><div class='ctx'> 					GFP_NOFS);</div><div class='hunk'>@@ -1116,8 +1118,8 @@ static inline void ext4_set_block_group_nr(struct super_block *sb, char *data,</div><div class='ctx'> 	struct ext4_super_block *es = (struct ext4_super_block *) data;</div><div class='ctx'> </div><div class='ctx'> 	es-&gt;s_block_group_nr = cpu_to_le16(group);</div><div class='del'>-	if (ext4_has_metadata_csum(sb))</div><div class='del'>-		es-&gt;s_checksum = ext4_superblock_csum(sb, es);</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb))</div><div class='add'>+		es-&gt;s_checksum = ext4_superblock_csum(es);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1298,7 +1300,7 @@ static struct buffer_head *ext4_get_bitmap(struct super_block *sb, __u64 block)</div><div class='ctx'> 	if (unlikely(!bh))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (!bh_uptodate_or_lock(bh)) {</div><div class='del'>-		if (ext4_read_bh(bh, 0, NULL) &lt; 0) {</div><div class='add'>+		if (ext4_read_bh(bh, 0, NULL, false) &lt; 0) {</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1313,14 +1315,13 @@ static int ext4_set_bitmap_checksums(struct super_block *sb,</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	bh = ext4_get_bitmap(sb, group_data-&gt;inode_bitmap);</div><div class='ctx'> 	if (!bh)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	ext4_inode_bitmap_csum_set(sb, gdp, bh,</div><div class='del'>-				   EXT4_INODES_PER_GROUP(sb) / 8);</div><div class='add'>+	ext4_inode_bitmap_csum_set(sb, gdp, bh);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='ctx'> 	bh = ext4_get_bitmap(sb, group_data-&gt;block_bitmap);</div><div class='hunk'>@@ -1602,7 +1603,8 @@ exit_journal:</div><div class='ctx'> 		int gdb_num = group / EXT4_DESC_PER_BLOCK(sb);</div><div class='ctx'> 		int gdb_num_end = ((group + flex_gd-&gt;count - 1) /</div><div class='ctx'> 				   EXT4_DESC_PER_BLOCK(sb));</div><div class='del'>-		int meta_bg = ext4_has_feature_meta_bg(sb);</div><div class='add'>+		int meta_bg = ext4_has_feature_meta_bg(sb) &amp;&amp;</div><div class='add'>+			      gdb_num &gt;= le32_to_cpu(es-&gt;s_first_meta_bg);</div><div class='ctx'> 		sector_t padding_blocks = meta_bg ? 0 : sbi-&gt;s_sbh-&gt;b_blocknr -</div><div class='ctx'> 					 ext4_group_first_block_no(sb, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -2084,7 +2086,7 @@ retry:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((!resize_inode &amp;&amp; !meta_bg) || n_blocks_count == o_blocks_count) {</div><div class='add'>+	if ((!resize_inode &amp;&amp; !meta_bg &amp;&amp; n_desc_blocks &gt; o_desc_blocks) || n_blocks_count == o_blocks_count) {</div><div class='ctx'> 		err = ext4_convert_meta_bg(sb, resize_inode);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='head'>diff --git a/fs/ext4/super.c b/fs/ext4/super.c<br/>index aa007710cfc3..87205660c5d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/super.c</a></div><div class='hunk'>@@ -79,7 +79,6 @@ static int ext4_unfreeze(struct super_block *sb);</div><div class='ctx'> static int ext4_freeze(struct super_block *sb);</div><div class='ctx'> static inline int ext2_feature_set_ok(struct super_block *sb);</div><div class='ctx'> static inline int ext3_feature_set_ok(struct super_block *sb);</div><div class='del'>-static void ext4_destroy_lazyinit_thread(void);</div><div class='ctx'> static void ext4_unregister_li_request(struct super_block *sb);</div><div class='ctx'> static void ext4_clear_request_list(void);</div><div class='ctx'> static struct inode *ext4_get_journal_inode(struct super_block *sb,</div><div class='hunk'>@@ -161,8 +160,14 @@ MODULE_ALIAS("ext3");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline void __ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='del'>-				  bh_end_io_t *end_io)</div><div class='add'>+				  bh_end_io_t *end_io, bool simu_fail)</div><div class='ctx'> {</div><div class='add'>+	if (simu_fail) {</div><div class='add'>+		clear_buffer_uptodate(bh);</div><div class='add'>+		unlock_buffer(bh);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * buffer's verified bit is no longer valid after reading from</div><div class='ctx'> 	 * disk again due to write out error, clear it to make sure we</div><div class='hunk'>@@ -176,7 +181,7 @@ static inline void __ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ext4_read_bh_nowait(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='del'>-			 bh_end_io_t *end_io)</div><div class='add'>+			 bh_end_io_t *end_io, bool simu_fail)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!buffer_locked(bh));</div><div class='ctx'> </div><div class='hunk'>@@ -184,10 +189,11 @@ void ext4_read_bh_nowait(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	__ext4_read_bh(bh, op_flags, end_io);</div><div class='add'>+	__ext4_read_bh(bh, op_flags, end_io, simu_fail);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags, bh_end_io_t *end_io)</div><div class='add'>+int ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags,</div><div class='add'>+		 bh_end_io_t *end_io, bool simu_fail)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!buffer_locked(bh));</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +202,7 @@ int ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags, bh_end_io_t *end_io</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__ext4_read_bh(bh, op_flags, end_io);</div><div class='add'>+	__ext4_read_bh(bh, op_flags, end_io, simu_fail);</div><div class='ctx'> </div><div class='ctx'> 	wait_on_buffer(bh);</div><div class='ctx'> 	if (buffer_uptodate(bh))</div><div class='hunk'>@@ -208,10 +214,10 @@ int ext4_read_bh_lock(struct buffer_head *bh, blk_opf_t op_flags, bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	lock_buffer(bh);</div><div class='ctx'> 	if (!wait) {</div><div class='del'>-		ext4_read_bh_nowait(bh, op_flags, NULL);</div><div class='add'>+		ext4_read_bh_nowait(bh, op_flags, NULL, false);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return ext4_read_bh(bh, op_flags, NULL);</div><div class='add'>+	return ext4_read_bh(bh, op_flags, NULL, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -244,7 +250,7 @@ static struct buffer_head *__ext4_sb_bread_gfp(struct super_block *sb,</div><div class='ctx'> struct buffer_head *ext4_sb_bread(struct super_block *sb, sector_t block,</div><div class='ctx'> 				   blk_opf_t op_flags)</div><div class='ctx'> {</div><div class='del'>-	gfp_t gfp = mapping_gfp_constraint(sb-&gt;s_bdev-&gt;bd_inode-&gt;i_mapping,</div><div class='add'>+	gfp_t gfp = mapping_gfp_constraint(sb-&gt;s_bdev-&gt;bd_mapping,</div><div class='ctx'> 			~__GFP_FS) | __GFP_MOVABLE;</div><div class='ctx'> </div><div class='ctx'> 	return __ext4_sb_bread_gfp(sb, block, op_flags, gfp);</div><div class='hunk'>@@ -253,20 +259,29 @@ struct buffer_head *ext4_sb_bread(struct super_block *sb, sector_t block,</div><div class='ctx'> struct buffer_head *ext4_sb_bread_unmovable(struct super_block *sb,</div><div class='ctx'> 					    sector_t block)</div><div class='ctx'> {</div><div class='del'>-	gfp_t gfp = mapping_gfp_constraint(sb-&gt;s_bdev-&gt;bd_inode-&gt;i_mapping,</div><div class='add'>+	gfp_t gfp = mapping_gfp_constraint(sb-&gt;s_bdev-&gt;bd_mapping,</div><div class='ctx'> 			~__GFP_FS);</div><div class='ctx'> </div><div class='ctx'> 	return __ext4_sb_bread_gfp(sb, block, 0, gfp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct buffer_head *ext4_sb_bread_nofail(struct super_block *sb,</div><div class='add'>+					 sector_t block)</div><div class='add'>+{</div><div class='add'>+	gfp_t gfp = mapping_gfp_constraint(sb-&gt;s_bdev-&gt;bd_mapping,</div><div class='add'>+			~__GFP_FS) | __GFP_MOVABLE | __GFP_NOFAIL;</div><div class='add'>+</div><div class='add'>+	return __ext4_sb_bread_gfp(sb, block, 0, gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ext4_sb_breadahead_unmovable(struct super_block *sb, sector_t block)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh = bdev_getblk(sb-&gt;s_bdev, block,</div><div class='del'>-			sb-&gt;s_blocksize, GFP_NOWAIT | __GFP_NOWARN);</div><div class='add'>+			sb-&gt;s_blocksize, GFP_NOWAIT);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(bh)) {</div><div class='ctx'> 		if (trylock_buffer(bh))</div><div class='del'>-			ext4_read_bh_nowait(bh, REQ_RAHEAD, NULL);</div><div class='add'>+			ext4_read_bh_nowait(bh, REQ_RAHEAD, NULL, false);</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -280,14 +295,12 @@ static int ext4_verify_csum_type(struct super_block *sb,</div><div class='ctx'> 	return es-&gt;s_checksum_type == EXT4_CRC32C_CHKSUM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__le32 ext4_superblock_csum(struct super_block *sb,</div><div class='del'>-			    struct ext4_super_block *es)</div><div class='add'>+__le32 ext4_superblock_csum(struct ext4_super_block *es)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	int offset = offsetof(struct ext4_super_block, s_checksum);</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, ~0, (char *)es, offset);</div><div class='add'>+	csum = ext4_chksum(~0, (char *)es, offset);</div><div class='ctx'> </div><div class='ctx'> 	return cpu_to_le32(csum);</div><div class='ctx'> }</div><div class='hunk'>@@ -295,20 +308,20 @@ __le32 ext4_superblock_csum(struct super_block *sb,</div><div class='ctx'> static int ext4_superblock_csum_verify(struct super_block *sb,</div><div class='ctx'> 				       struct ext4_super_block *es)</div><div class='ctx'> {</div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	return es-&gt;s_checksum == ext4_superblock_csum(sb, es);</div><div class='add'>+	return es-&gt;s_checksum == ext4_superblock_csum(es);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ext4_superblock_csum_set(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_super_block *es = EXT4_SB(sb)-&gt;s_es;</div><div class='ctx'> </div><div class='del'>-	if (!ext4_has_metadata_csum(sb))</div><div class='add'>+	if (!ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	es-&gt;s_checksum = ext4_superblock_csum(sb, es);</div><div class='add'>+	es-&gt;s_checksum = ext4_superblock_csum(es);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,</div><div class='hunk'>@@ -346,9 +359,9 @@ __u32 ext4_free_group_clusters(struct super_block *sb,</div><div class='ctx'> __u32 ext4_free_inodes_count(struct super_block *sb,</div><div class='ctx'> 			      struct ext4_group_desc *bg)</div><div class='ctx'> {</div><div class='del'>-	return le16_to_cpu(bg-&gt;bg_free_inodes_count_lo) |</div><div class='add'>+	return le16_to_cpu(READ_ONCE(bg-&gt;bg_free_inodes_count_lo)) |</div><div class='ctx'> 		(EXT4_DESC_SIZE(sb) &gt;= EXT4_MIN_DESC_SIZE_64BIT ?</div><div class='del'>-		 (__u32)le16_to_cpu(bg-&gt;bg_free_inodes_count_hi) &lt;&lt; 16 : 0);</div><div class='add'>+		 (__u32)le16_to_cpu(READ_ONCE(bg-&gt;bg_free_inodes_count_hi)) &lt;&lt; 16 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __u32 ext4_used_dirs_count(struct super_block *sb,</div><div class='hunk'>@@ -402,9 +415,9 @@ void ext4_free_group_clusters_set(struct super_block *sb,</div><div class='ctx'> void ext4_free_inodes_set(struct super_block *sb,</div><div class='ctx'> 			  struct ext4_group_desc *bg, __u32 count)</div><div class='ctx'> {</div><div class='del'>-	bg-&gt;bg_free_inodes_count_lo = cpu_to_le16((__u16)count);</div><div class='add'>+	WRITE_ONCE(bg-&gt;bg_free_inodes_count_lo, cpu_to_le16((__u16)count));</div><div class='ctx'> 	if (EXT4_DESC_SIZE(sb) &gt;= EXT4_MIN_DESC_SIZE_64BIT)</div><div class='del'>-		bg-&gt;bg_free_inodes_count_hi = cpu_to_le16(count &gt;&gt; 16);</div><div class='add'>+		WRITE_ONCE(bg-&gt;bg_free_inodes_count_hi, cpu_to_le16(count &gt;&gt; 16));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ext4_used_dirs_set(struct super_block *sb,</div><div class='hunk'>@@ -441,9 +454,6 @@ static time64_t __ext4_get_tstamp(__le32 *lo, __u8 *hi)</div><div class='ctx'> #define ext4_get_tstamp(es, tstamp) \</div><div class='ctx'> 	__ext4_get_tstamp(&amp;(es)-&gt;tstamp, &amp;(es)-&gt;tstamp ## _hi)</div><div class='ctx'> </div><div class='del'>-#define EXT4_SB_REFRESH_INTERVAL_SEC (3600) /* seconds (1 hour) */</div><div class='del'>-#define EXT4_SB_REFRESH_INTERVAL_KB (16384) /* kilobytes (16MB) */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The ext4_maybe_update_superblock() function checks and updates the</div><div class='ctx'>  * superblock if needed.</div><div class='hunk'>@@ -451,8 +461,10 @@ static time64_t __ext4_get_tstamp(__le32 *lo, __u8 *hi)</div><div class='ctx'>  * This function is designed to update the on-disk superblock only under</div><div class='ctx'>  * certain conditions to prevent excessive disk writes and unnecessary</div><div class='ctx'>  * waking of the disk from sleep. The superblock will be updated if:</div><div class='del'>- * 1. More than an hour has passed since the last superblock update, and</div><div class='del'>- * 2. More than 16MB have been written since the last superblock update.</div><div class='add'>+ * 1. More than sbi-&gt;s_sb_update_sec (def: 1 hour) has passed since the last</div><div class='add'>+ *    superblock update</div><div class='add'>+ * 2. More than sbi-&gt;s_sb_update_kb (def: 16MB) kbs have been written since the</div><div class='add'>+ *    last superblock update.</div><div class='ctx'>  *</div><div class='ctx'>  * @sb: The superblock</div><div class='ctx'>  */</div><div class='hunk'>@@ -466,14 +478,15 @@ static void ext4_maybe_update_superblock(struct super_block *sb)</div><div class='ctx'> 	__u64 lifetime_write_kbytes;</div><div class='ctx'> 	__u64 diff_size;</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(sb) || !(sb-&gt;s_flags &amp; SB_ACTIVE) ||</div><div class='del'>-	    !journal || (journal-&gt;j_flags &amp; JBD2_UNMOUNT))</div><div class='add'>+	if (ext4_emergency_state(sb) || sb_rdonly(sb) ||</div><div class='add'>+	    !(sb-&gt;s_flags &amp; SB_ACTIVE) || !journal ||</div><div class='add'>+	    journal-&gt;j_flags &amp; JBD2_UNMOUNT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	now = ktime_get_real_seconds();</div><div class='ctx'> 	last_update = ext4_get_tstamp(es, s_wtime);</div><div class='ctx'> </div><div class='del'>-	if (likely(now - last_update &lt; EXT4_SB_REFRESH_INTERVAL_SEC))</div><div class='add'>+	if (likely(now - last_update &lt; sbi-&gt;s_sb_update_sec))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	lifetime_write_kbytes = sbi-&gt;s_kbytes_written +</div><div class='hunk'>@@ -488,65 +501,23 @@ static void ext4_maybe_update_superblock(struct super_block *sb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	diff_size = lifetime_write_kbytes - le64_to_cpu(es-&gt;s_kbytes_written);</div><div class='ctx'> </div><div class='del'>-	if (diff_size &gt; EXT4_SB_REFRESH_INTERVAL_KB)</div><div class='add'>+	if (diff_size &gt; sbi-&gt;s_sb_update_kb)</div><div class='ctx'> 		schedule_work(&amp;EXT4_SB(sb)-&gt;s_sb_upd_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The del_gendisk() function uninitializes the disk-specific data</div><div class='del'>- * structures, including the bdi structure, without telling anyone</div><div class='del'>- * else.  Once this happens, any attempt to call mark_buffer_dirty()</div><div class='del'>- * (for example, by ext4_commit_super), will cause a kernel OOPS.</div><div class='del'>- * This is a kludge to prevent these oops until we can put in a proper</div><div class='del'>- * hook in del_gendisk() to inform the VFS and file system layers.</div><div class='del'>- */</div><div class='del'>-static int block_device_ejected(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct inode *bd_inode = sb-&gt;s_bdev-&gt;bd_inode;</div><div class='del'>-	struct backing_dev_info *bdi = inode_to_bdi(bd_inode);</div><div class='del'>-</div><div class='del'>-	return bdi-&gt;dev == NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ext4_journal_commit_callback(journal_t *journal, transaction_t *txn)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block		*sb = journal-&gt;j_private;</div><div class='del'>-	struct ext4_sb_info		*sbi = EXT4_SB(sb);</div><div class='del'>-	int				error = is_journal_aborted(journal);</div><div class='del'>-	struct ext4_journal_cb_entry	*jce;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(txn-&gt;t_state == T_FINISHED);</div><div class='ctx'> </div><div class='ctx'> 	ext4_process_freed_data(sb, txn-&gt;t_tid);</div><div class='ctx'> 	ext4_maybe_update_superblock(sb);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	while (!list_empty(&amp;txn-&gt;t_private_list)) {</div><div class='del'>-		jce = list_entry(txn-&gt;t_private_list.next,</div><div class='del'>-				 struct ext4_journal_cb_entry, jce_list);</div><div class='del'>-		list_del_init(&amp;jce-&gt;jce_list);</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-		jce-&gt;jce_func(sb, jce, error);</div><div class='del'>-		spin_lock(&amp;sbi-&gt;s_md_lock);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;s_md_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This writepage callback for write_cache_pages()</div><div class='del'>- * takes care of a few cases after page cleaning.</div><div class='del'>- *</div><div class='del'>- * write_cache_pages() already checks for dirty pages</div><div class='del'>- * and calls clear_page_dirty_for_io(), which we want,</div><div class='del'>- * to write protect the pages.</div><div class='del'>- *</div><div class='del'>- * However, we may have to redirty a page (see below.)</div><div class='del'>- */</div><div class='del'>-static int ext4_journalled_writepage_callback(struct folio *folio,</div><div class='del'>-					      struct writeback_control *wbc,</div><div class='del'>-					      void *data)</div><div class='add'>+static bool ext4_journalled_writepage_needs_redirty(struct jbd2_inode *jinode,</div><div class='add'>+		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	transaction_t *transaction = (transaction_t *) data;</div><div class='ctx'> 	struct buffer_head *bh, *head;</div><div class='ctx'> 	struct journal_head *jh;</div><div class='ctx'> </div><div class='hunk'>@@ -567,15 +538,12 @@ static int ext4_journalled_writepage_callback(struct folio *folio,</div><div class='ctx'> 		 */</div><div class='ctx'> 		jh = bh2jh(bh);</div><div class='ctx'> 		if (buffer_dirty(bh) ||</div><div class='del'>-		    (jh &amp;&amp; (jh-&gt;b_transaction != transaction ||</div><div class='del'>-			    jh-&gt;b_next_transaction))) {</div><div class='del'>-			folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		    (jh &amp;&amp; (jh-&gt;b_transaction != jinode-&gt;i_transaction ||</div><div class='add'>+			    jh-&gt;b_next_transaction)))</div><div class='add'>+			return true;</div><div class='ctx'> 	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return AOP_WRITEPAGE_ACTIVATE;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_journalled_submit_inode_data_buffers(struct jbd2_inode *jinode)</div><div class='hunk'>@@ -587,10 +555,23 @@ static int ext4_journalled_submit_inode_data_buffers(struct jbd2_inode *jinode)</div><div class='ctx'> 		.range_start = jinode-&gt;i_dirty_start,</div><div class='ctx'> 		.range_end = jinode-&gt;i_dirty_end,</div><div class='ctx'>         };</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='del'>-	return write_cache_pages(mapping, &amp;wbc,</div><div class='del'>-				 ext4_journalled_writepage_callback,</div><div class='del'>-				 jinode-&gt;i_transaction);</div><div class='add'>+	/*</div><div class='add'>+	 * writeback_iter() already checks for dirty pages and calls</div><div class='add'>+	 * folio_clear_dirty_for_io(), which we want to write protect the</div><div class='add'>+	 * folios.</div><div class='add'>+	 *</div><div class='add'>+	 * However, we may have to redirty a folio sometimes.</div><div class='add'>+	 */</div><div class='add'>+	while ((folio = writeback_iter(mapping, &amp;wbc, folio, &amp;error))) {</div><div class='add'>+		if (ext4_journalled_writepage_needs_redirty(jinode, folio))</div><div class='add'>+			folio_redirty_for_writepage(&amp;wbc, folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)</div><div class='hunk'>@@ -716,11 +697,8 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,</div><div class='ctx'> 	if (test_opt(sb, WARN_ON_ERROR))</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> </div><div class='del'>-	if (!continue_fs &amp;&amp; !sb_rdonly(sb)) {</div><div class='del'>-		set_bit(EXT4_FLAGS_SHUTDOWN, &amp;EXT4_SB(sb)-&gt;s_ext4_flags);</div><div class='del'>-		if (journal)</div><div class='del'>-			jbd2_journal_abort(journal, -EIO);</div><div class='del'>-	}</div><div class='add'>+	if (!continue_fs &amp;&amp; !ext4_emergency_ro(sb) &amp;&amp; journal)</div><div class='add'>+		jbd2_journal_abort(journal, -error);</div><div class='ctx'> </div><div class='ctx'> 	if (!bdev_read_only(sb-&gt;s_bdev)) {</div><div class='ctx'> 		save_error_info(sb, error, ino, block, func, line);</div><div class='hunk'>@@ -728,9 +706,13 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,</div><div class='ctx'> 		 * In case the fs should keep running, we need to writeout</div><div class='ctx'> 		 * superblock through the journal. Due to lock ordering</div><div class='ctx'> 		 * constraints, it may not be safe to do it right here so we</div><div class='del'>-		 * defer superblock flushing to a workqueue.</div><div class='add'>+		 * defer superblock flushing to a workqueue. We just need to be</div><div class='add'>+		 * careful when the journal is already shutting down. If we get</div><div class='add'>+		 * here in that case, just update the sb directly as the last</div><div class='add'>+		 * transaction won't commit anyway.</div><div class='ctx'> 		 */</div><div class='del'>-		if (continue_fs &amp;&amp; journal)</div><div class='add'>+		if (continue_fs &amp;&amp; journal &amp;&amp;</div><div class='add'>+		    !ext4_test_mount_flag(sb, EXT4_MF_JOURNAL_DESTROY))</div><div class='ctx'> 			schedule_work(&amp;EXT4_SB(sb)-&gt;s_sb_upd_work);</div><div class='ctx'> 		else</div><div class='ctx'> 			ext4_commit_super(sb);</div><div class='hunk'>@@ -746,16 +728,17 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,</div><div class='ctx'> 			sb-&gt;s_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(sb) || continue_fs)</div><div class='add'>+	if (ext4_emergency_ro(sb) || continue_fs)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");</div><div class='ctx'> 	/*</div><div class='del'>-	 * Make sure updated value of -&gt;s_mount_flags will be visible before</div><div class='del'>-	 * -&gt;s_flags update</div><div class='add'>+	 * We don't set SB_RDONLY because that requires sb-&gt;s_umount</div><div class='add'>+	 * semaphore and setting it without proper remount procedure is</div><div class='add'>+	 * confusing code such as freeze_super() leading to deadlocks</div><div class='add'>+	 * and other problems.</div><div class='ctx'> 	 */</div><div class='del'>-	smp_wmb();</div><div class='del'>-	sb-&gt;s_flags |= SB_RDONLY;</div><div class='add'>+	set_bit(EXT4_FLAGS_EMERGENCY_RO, &amp;EXT4_SB(sb)-&gt;s_ext4_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void update_super_work(struct work_struct *work)</div><div class='hunk'>@@ -773,7 +756,8 @@ static void update_super_work(struct work_struct *work)</div><div class='ctx'> 	 * We use directly jbd2 functions here to avoid recursing back into</div><div class='ctx'> 	 * ext4 error handling code during handling of previous errors.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!sb_rdonly(sbi-&gt;s_sb) &amp;&amp; journal) {</div><div class='add'>+	if (!ext4_emergency_state(sbi-&gt;s_sb) &amp;&amp;</div><div class='add'>+	    !sb_rdonly(sbi-&gt;s_sb) &amp;&amp; journal) {</div><div class='ctx'> 		struct buffer_head *sbh = sbi-&gt;s_sbh;</div><div class='ctx'> 		bool call_notify_err = false;</div><div class='ctx'> </div><div class='hunk'>@@ -827,7 +811,7 @@ void __ext4_error(struct super_block *sb, const char *function,</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='add'>+	if (unlikely(ext4_emergency_state(sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_error(sb, function, line);</div><div class='hunk'>@@ -852,7 +836,7 @@ void __ext4_error_inode(struct inode *inode, const char *function,</div><div class='ctx'> 	va_list args;</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+	if (unlikely(ext4_emergency_state(inode-&gt;i_sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_error(inode-&gt;i_sb, function, line);</div><div class='hunk'>@@ -887,7 +871,7 @@ void __ext4_error_file(struct file *file, const char *function,</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	char pathname[80], *path;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+	if (unlikely(ext4_emergency_state(inode-&gt;i_sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_error(inode-&gt;i_sb, function, line);</div><div class='hunk'>@@ -967,7 +951,7 @@ void __ext4_std_error(struct super_block *sb, const char *function,</div><div class='ctx'> 	char nbuf[16];</div><div class='ctx'> 	const char *errstr;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='add'>+	if (unlikely(ext4_emergency_state(sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Special case: if the error is EROFS, and we're not already</div><div class='hunk'>@@ -1061,7 +1045,7 @@ __acquires(bitlock)</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='add'>+	if (unlikely(ext4_emergency_state(sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_error(sb, function, line);</div><div class='hunk'>@@ -1314,18 +1298,17 @@ static void ext4_put_super(struct super_block *sb)</div><div class='ctx'> 	ext4_unregister_li_request(sb);</div><div class='ctx'> 	ext4_quotas_off(sb, EXT4_MAXQUOTAS);</div><div class='ctx'> </div><div class='del'>-	flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='ctx'> 	destroy_workqueue(sbi-&gt;rsv_conversion_wq);</div><div class='ctx'> 	ext4_release_orphan_info(sb);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;s_journal) {</div><div class='ctx'> 		aborted = is_journal_aborted(sbi-&gt;s_journal);</div><div class='del'>-		err = jbd2_journal_destroy(sbi-&gt;s_journal);</div><div class='del'>-		sbi-&gt;s_journal = NULL;</div><div class='add'>+		err = ext4_journal_destroy(sbi, sbi-&gt;s_journal);</div><div class='ctx'> 		if ((err &lt; 0) &amp;&amp; !aborted) {</div><div class='ctx'> 			ext4_abort(sb, -err, "Couldn't clean up the journal");</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='add'>+	} else</div><div class='add'>+		flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='ctx'> </div><div class='ctx'> 	ext4_es_unregister_shrinker(sbi);</div><div class='ctx'> 	timer_shutdown_sync(&amp;sbi-&gt;s_err_report);</div><div class='hunk'>@@ -1333,16 +1316,20 @@ static void ext4_put_super(struct super_block *sb)</div><div class='ctx'> 	ext4_mb_release(sb);</div><div class='ctx'> 	ext4_ext_release(sb);</div><div class='ctx'> </div><div class='del'>-	if (!sb_rdonly(sb) &amp;&amp; !aborted) {</div><div class='del'>-		ext4_clear_feature_journal_needs_recovery(sb);</div><div class='del'>-		ext4_clear_feature_orphan_present(sb);</div><div class='del'>-		es-&gt;s_state = cpu_to_le16(sbi-&gt;s_mount_state);</div><div class='del'>-	}</div><div class='del'>-	if (!sb_rdonly(sb))</div><div class='add'>+	if (!ext4_emergency_state(sb) &amp;&amp; !sb_rdonly(sb)) {</div><div class='add'>+		if (!aborted) {</div><div class='add'>+			ext4_clear_feature_journal_needs_recovery(sb);</div><div class='add'>+			ext4_clear_feature_orphan_present(sb);</div><div class='add'>+			es-&gt;s_state = cpu_to_le16(sbi-&gt;s_mount_state);</div><div class='add'>+		}</div><div class='ctx'> 		ext4_commit_super(sb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ext4_group_desc_free(sbi);</div><div class='ctx'> 	ext4_flex_groups_free(sbi);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!(sbi-&gt;s_mount_state &amp; EXT4_ERROR_FS) &amp;&amp;</div><div class='add'>+		     percpu_counter_sum(&amp;sbi-&gt;s_dirtyclusters_counter));</div><div class='ctx'> 	ext4_percpu_param_destroy(sbi);</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	for (int i = 0; i &lt; EXT4_MAXQUOTAS; i++)</div><div class='hunk'>@@ -1385,8 +1372,6 @@ static void ext4_put_super(struct super_block *sb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	kobject_put(&amp;sbi-&gt;s_kobj);</div><div class='ctx'> 	wait_for_completion(&amp;sbi-&gt;s_kobj_unregister);</div><div class='del'>-	if (sbi-&gt;s_chksum_driver)</div><div class='del'>-		crypto_free_shash(sbi-&gt;s_chksum_driver);</div><div class='ctx'> 	kfree(sbi-&gt;s_blockgroup_lock);</div><div class='ctx'> 	fs_put_dax(sbi-&gt;s_daxdev, NULL);</div><div class='ctx'> 	fscrypt_free_dummy_policy(&amp;sbi-&gt;s_dummy_enc_policy);</div><div class='hunk'>@@ -1411,6 +1396,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	inode_set_iversion(&amp;ei-&gt;vfs_inode, 1);</div><div class='ctx'> 	ei-&gt;i_flags = 0;</div><div class='add'>+	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */</div><div class='ctx'> 	spin_lock_init(&amp;ei-&gt;i_raw_lock);</div><div class='ctx'> 	ei-&gt;i_prealloc_node = RB_ROOT;</div><div class='ctx'> 	atomic_set(&amp;ei-&gt;i_prealloc_active, 0);</div><div class='hunk'>@@ -1421,6 +1407,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	ei-&gt;i_es_all_nr = 0;</div><div class='ctx'> 	ei-&gt;i_es_shk_nr = 0;</div><div class='ctx'> 	ei-&gt;i_es_shrink_lblk = 0;</div><div class='add'>+	ei-&gt;i_es_seq = 0;</div><div class='ctx'> 	ei-&gt;i_reserved_data_blocks = 0;</div><div class='ctx'> 	spin_lock_init(&amp;(ei-&gt;i_block_reservation_lock));</div><div class='ctx'> 	ext4_init_pending_tree(&amp;ei-&gt;i_pending_tree);</div><div class='hunk'>@@ -1433,16 +1420,15 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	spin_lock_init(&amp;ei-&gt;i_completed_io_lock);</div><div class='ctx'> 	ei-&gt;i_sync_tid = 0;</div><div class='ctx'> 	ei-&gt;i_datasync_tid = 0;</div><div class='del'>-	atomic_set(&amp;ei-&gt;i_unwritten, 0);</div><div class='ctx'> 	INIT_WORK(&amp;ei-&gt;i_rsv_conversion_work, ext4_end_io_rsv_work);</div><div class='ctx'> 	ext4_fc_init_inode(&amp;ei-&gt;vfs_inode);</div><div class='del'>-	mutex_init(&amp;ei-&gt;i_fc_lock);</div><div class='add'>+	spin_lock_init(&amp;ei-&gt;i_fc_lock);</div><div class='ctx'> 	return &amp;ei-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_drop_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	int drop = generic_drop_inode(inode);</div><div class='add'>+	int drop = inode_generic_drop(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (!drop)</div><div class='ctx'> 		drop = fscrypt_drop_inode(inode);</div><div class='hunk'>@@ -1463,9 +1449,9 @@ static void ext4_free_in_core_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static void ext4_destroy_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (!list_empty(&amp;(EXT4_I(inode)-&gt;i_orphan))) {</div><div class='add'>+	if (ext4_inode_orphan_tracked(inode)) {</div><div class='ctx'> 		ext4_msg(inode-&gt;i_sb, KERN_ERR,</div><div class='del'>-			 "Inode %lu (%p): orphan list check failed!",</div><div class='add'>+			 "Inode %lu (%p): inode tracked as orphan!",</div><div class='ctx'> 			 inode-&gt;i_ino, EXT4_I(inode));</div><div class='ctx'> 		print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 4,</div><div class='ctx'> 				EXT4_I(inode), sizeof(struct ext4_inode_info),</div><div class='hunk'>@@ -1473,7 +1459,8 @@ static void ext4_destroy_inode(struct inode *inode)</div><div class='ctx'> 		dump_stack();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (EXT4_I(inode)-&gt;i_reserved_data_blocks)</div><div class='add'>+	if (!(EXT4_SB(inode-&gt;i_sb)-&gt;s_mount_state &amp; EXT4_ERROR_FS) &amp;&amp;</div><div class='add'>+	    WARN_ON_ONCE(EXT4_I(inode)-&gt;i_reserved_data_blocks))</div><div class='ctx'> 		ext4_msg(inode-&gt;i_sb, KERN_ERR,</div><div class='ctx'> 			 "Inode %lu (%p): i_reserved_data_blocks (%u) not cleared!",</div><div class='ctx'> 			 inode-&gt;i_ino, EXT4_I(inode),</div><div class='hunk'>@@ -1494,14 +1481,19 @@ static void init_once(void *foo)</div><div class='ctx'> 	init_rwsem(&amp;ei-&gt;i_data_sem);</div><div class='ctx'> 	inode_init_once(&amp;ei-&gt;vfs_inode);</div><div class='ctx'> 	ext4_fc_init_inode(&amp;ei-&gt;vfs_inode);</div><div class='add'>+#ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	ei-&gt;i_crypt_info = NULL;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	ei-&gt;i_verity_info = NULL;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	ext4_inode_cachep = kmem_cache_create_usercopy("ext4_inode_cache",</div><div class='ctx'> 				sizeof(struct ext4_inode_info), 0,</div><div class='del'>-				(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-					SLAB_ACCOUNT),</div><div class='add'>+				SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,</div><div class='ctx'> 				offsetof(struct ext4_inode_info, i_data),</div><div class='ctx'> 				sizeof_field(struct ext4_inode_info, i_data),</div><div class='ctx'> 				init_once);</div><div class='hunk'>@@ -1525,7 +1517,7 @@ void ext4_clear_inode(struct inode *inode)</div><div class='ctx'> 	ext4_fc_del(inode);</div><div class='ctx'> 	invalidate_inode_buffers(inode);</div><div class='ctx'> 	clear_inode(inode);</div><div class='del'>-	ext4_discard_preallocations(inode, 0);</div><div class='add'>+	ext4_discard_preallocations(inode);</div><div class='ctx'> 	ext4_es_remove_extent(inode, 0, EXT_MAX_BLOCKS);</div><div class='ctx'> 	dquot_drop(inode);</div><div class='ctx'> 	if (EXT4_I(inode)-&gt;jinode) {</div><div class='hunk'>@@ -1600,7 +1592,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,</div><div class='ctx'> static int ext4_quota_enable(struct super_block *sb, int type, int format_id,</div><div class='ctx'> 			     unsigned int flags);</div><div class='ctx'> </div><div class='del'>-static struct dquot **ext4_get_dquots(struct inode *inode)</div><div class='add'>+static struct dquot __rcu **ext4_get_dquots(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return EXT4_I(inode)-&gt;i_dquot;</div><div class='ctx'> }</div><div class='hunk'>@@ -1724,10 +1716,6 @@ static const struct constant_table ext4_param_dax[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* String parameter that allows empty argument */</div><div class='del'>-#define fsparam_string_empty(NAME, OPT) \</div><div class='del'>-	__fsparam(fs_param_is_string, NAME, OPT, fs_param_can_be_empty, NULL)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Mount option specification</div><div class='ctx'>  * We don't use fsparam_flag_no because of the way we set the</div><div class='hunk'>@@ -1742,8 +1730,8 @@ static const struct fs_parameter_spec ext4_param_specs[] = {</div><div class='ctx'> 	fsparam_flag	("bsdgroups",		Opt_grpid),</div><div class='ctx'> 	fsparam_flag	("nogrpid",		Opt_nogrpid),</div><div class='ctx'> 	fsparam_flag	("sysvgroups",		Opt_nogrpid),</div><div class='del'>-	fsparam_u32	("resgid",		Opt_resgid),</div><div class='del'>-	fsparam_u32	("resuid",		Opt_resuid),</div><div class='add'>+	fsparam_gid	("resgid",		Opt_resgid),</div><div class='add'>+	fsparam_uid	("resuid",		Opt_resuid),</div><div class='ctx'> 	fsparam_u32	("sb",			Opt_sb),</div><div class='ctx'> 	fsparam_enum	("errors",		Opt_errors, ext4_param_errors),</div><div class='ctx'> 	fsparam_flag	("nouid32",		Opt_nouid32),</div><div class='hunk'>@@ -1834,7 +1822,6 @@ static const struct fs_parameter_spec ext4_param_specs[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))</div><div class='ctx'> </div><div class='ctx'> #define MOPT_SET	0x0001</div><div class='ctx'> #define MOPT_CLEAR	0x0002</div><div class='hunk'>@@ -2028,6 +2015,9 @@ int ext4_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	fc-&gt;fs_private = ctx;</div><div class='ctx'> 	fc-&gt;ops = &amp;ext4_context_ops;</div><div class='ctx'> </div><div class='add'>+	/* i_version is always enabled now */</div><div class='add'>+	fc-&gt;sb_flags |= SB_I_VERSION;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2079,8 +2069,7 @@ static int unnote_qf_name(struct fs_context *fc, int qtype)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;s_qf_names[qtype])</div><div class='del'>-		kfree(ctx-&gt;s_qf_names[qtype]);</div><div class='add'>+	kfree(ctx-&gt;s_qf_names[qtype]);</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;s_qf_names[qtype] = NULL;</div><div class='ctx'> 	ctx-&gt;qname_spec |= 1 &lt;&lt; qtype;</div><div class='hunk'>@@ -2113,16 +2102,16 @@ static int ext4_parse_test_dummy_encryption(const struct fs_parameter *param,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define EXT4_SET_CTX(name)						\</div><div class='del'>-static inline void ctx_set_##name(struct ext4_fs_context *ctx,		\</div><div class='del'>-				  unsigned long flag)			\</div><div class='add'>+static inline __maybe_unused						\</div><div class='add'>+void ctx_set_##name(struct ext4_fs_context *ctx, unsigned long flag)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	ctx-&gt;mask_s_##name |= flag;					\</div><div class='ctx'> 	ctx-&gt;vals_s_##name |= flag;					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define EXT4_CLEAR_CTX(name)						\</div><div class='del'>-static inline void ctx_clear_##name(struct ext4_fs_context *ctx,	\</div><div class='del'>-				    unsigned long flag)			\</div><div class='add'>+static inline __maybe_unused						\</div><div class='add'>+void ctx_clear_##name(struct ext4_fs_context *ctx, unsigned long flag)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	ctx-&gt;mask_s_##name |= flag;					\</div><div class='ctx'> 	ctx-&gt;vals_s_##name &amp;= ~flag;					\</div><div class='hunk'>@@ -2149,8 +2138,6 @@ static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 	struct fs_parse_result result;</div><div class='ctx'> 	const struct mount_opts *m;</div><div class='ctx'> 	int is_remount;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='ctx'> 	int token;</div><div class='ctx'> </div><div class='ctx'> 	token = fs_parse(fc, ext4_param_specs, param, &amp;result);</div><div class='hunk'>@@ -2292,23 +2279,11 @@ static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		ctx-&gt;spec |= EXT4_SPEC_s_stripe;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case Opt_resuid:</div><div class='del'>-		uid = make_kuid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!uid_valid(uid)) {</div><div class='del'>-			ext4_msg(NULL, KERN_ERR, "Invalid uid value %d",</div><div class='del'>-				 result.uint_32);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		ctx-&gt;s_resuid = uid;</div><div class='add'>+		ctx-&gt;s_resuid = result.uid;</div><div class='ctx'> 		ctx-&gt;spec |= EXT4_SPEC_s_resuid;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case Opt_resgid:</div><div class='del'>-		gid = make_kgid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!gid_valid(gid)) {</div><div class='del'>-			ext4_msg(NULL, KERN_ERR, "Invalid gid value %d",</div><div class='del'>-				 result.uint_32);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		ctx-&gt;s_resgid = gid;</div><div class='add'>+		ctx-&gt;s_resgid = result.gid;</div><div class='ctx'> 		ctx-&gt;spec |= EXT4_SPEC_s_resgid;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case Opt_journal_dev:</div><div class='hunk'>@@ -2485,8 +2460,7 @@ static int parse_options(struct fs_context *fc, char *options)</div><div class='ctx'> 			param.size = v_len;</div><div class='ctx'> </div><div class='ctx'> 			ret = ext4_parse_param(fc, &amp;param);</div><div class='del'>-			if (param.string)</div><div class='del'>-				kfree(param.string);</div><div class='add'>+			kfree(param.string);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2503,7 +2477,7 @@ static int parse_apply_sb_mount_options(struct super_block *sb,</div><div class='ctx'> 					struct ext4_fs_context *m_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='del'>-	char *s_mount_opts = NULL;</div><div class='add'>+	char s_mount_opts[64];</div><div class='ctx'> 	struct ext4_fs_context *s_ctx = NULL;</div><div class='ctx'> 	struct fs_context *fc = NULL;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='hunk'>@@ -2511,15 +2485,12 @@ static int parse_apply_sb_mount_options(struct super_block *sb,</div><div class='ctx'> 	if (!sbi-&gt;s_es-&gt;s_mount_opts[0])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	s_mount_opts = kstrndup(sbi-&gt;s_es-&gt;s_mount_opts,</div><div class='del'>-				sizeof(sbi-&gt;s_es-&gt;s_mount_opts),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!s_mount_opts)</div><div class='del'>-		return ret;</div><div class='add'>+	if (strscpy_pad(s_mount_opts, sbi-&gt;s_es-&gt;s_mount_opts) &lt; 0)</div><div class='add'>+		return -E2BIG;</div><div class='ctx'> </div><div class='ctx'> 	fc = kzalloc(sizeof(struct fs_context), GFP_KERNEL);</div><div class='ctx'> 	if (!fc)</div><div class='del'>-		goto out_free;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	s_ctx = kzalloc(sizeof(struct ext4_fs_context), GFP_KERNEL);</div><div class='ctx'> 	if (!s_ctx)</div><div class='hunk'>@@ -2551,11 +2522,8 @@ parse_failed:</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	if (fc) {</div><div class='del'>-		ext4_fc_free(fc);</div><div class='del'>-		kfree(fc);</div><div class='del'>-	}</div><div class='del'>-	kfree(s_mount_opts);</div><div class='add'>+	ext4_fc_free(fc);</div><div class='add'>+	kfree(fc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2812,6 +2780,13 @@ static int ext4_check_opt_consistency(struct fs_context *fc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_remount) {</div><div class='add'>+		if (!sbi-&gt;s_journal &amp;&amp;</div><div class='add'>+		    ctx_test_mount_opt(ctx, EXT4_MOUNT_DATA_ERR_ABORT)) {</div><div class='add'>+			ext4_msg(NULL, KERN_WARNING,</div><div class='add'>+				 "Remounting fs w/o journal so ignoring data_err option");</div><div class='add'>+			ctx_clear_mount_opt(ctx, EXT4_MOUNT_DATA_ERR_ABORT);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (ctx_test_mount_opt(ctx, EXT4_MOUNT_DAX_ALWAYS) &amp;&amp;</div><div class='ctx'> 		    (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)) {</div><div class='ctx'> 			ext4_msg(NULL, KERN_ERR, "can't mount with "</div><div class='hunk'>@@ -2994,11 +2969,11 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nodefs || !uid_eq(sbi-&gt;s_resuid, make_kuid(&amp;init_user_ns, EXT4_DEF_RESUID)) ||</div><div class='del'>-	    le16_to_cpu(es-&gt;s_def_resuid) != EXT4_DEF_RESUID)</div><div class='add'>+	    ext4_get_resuid(es) != EXT4_DEF_RESUID)</div><div class='ctx'> 		SEQ_OPTS_PRINT("resuid=%u",</div><div class='ctx'> 				from_kuid_munged(&amp;init_user_ns, sbi-&gt;s_resuid));</div><div class='ctx'> 	if (nodefs || !gid_eq(sbi-&gt;s_resgid, make_kgid(&amp;init_user_ns, EXT4_DEF_RESGID)) ||</div><div class='del'>-	    le16_to_cpu(es-&gt;s_def_resgid) != EXT4_DEF_RESGID)</div><div class='add'>+	    ext4_get_resgid(es) != EXT4_DEF_RESGID)</div><div class='ctx'> 		SEQ_OPTS_PRINT("resgid=%u",</div><div class='ctx'> 				from_kgid_munged(&amp;init_user_ns, sbi-&gt;s_resgid));</div><div class='ctx'> 	def_errors = nodefs ? -1 : le16_to_cpu(es-&gt;s_errors);</div><div class='hunk'>@@ -3014,6 +2989,8 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,</div><div class='ctx'> 		SEQ_OPTS_PRINT("min_batch_time=%u", sbi-&gt;s_min_batch_time);</div><div class='ctx'> 	if (nodefs || sbi-&gt;s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME)</div><div class='ctx'> 		SEQ_OPTS_PRINT("max_batch_time=%u", sbi-&gt;s_max_batch_time);</div><div class='add'>+	if (nodefs &amp;&amp; sb-&gt;s_flags &amp; SB_I_VERSION)</div><div class='add'>+		SEQ_OPTS_PUTS("i_version");</div><div class='ctx'> 	if (nodefs || sbi-&gt;s_stripe)</div><div class='ctx'> 		SEQ_OPTS_PRINT("stripe=%lu", sbi-&gt;s_stripe);</div><div class='ctx'> 	if (nodefs || EXT4_MOUNT_DATA_FLAGS &amp;</div><div class='hunk'>@@ -3062,6 +3039,15 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,</div><div class='ctx'> 		SEQ_OPTS_PUTS("mb_optimize_scan=1");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (nodefs &amp;&amp; !test_opt(sb, NO_PREFETCH_BLOCK_BITMAPS))</div><div class='add'>+		SEQ_OPTS_PUTS("prefetch_block_bitmaps");</div><div class='add'>+</div><div class='add'>+	if (ext4_emergency_ro(sb))</div><div class='add'>+		SEQ_OPTS_PUTS("emergency_ro");</div><div class='add'>+</div><div class='add'>+	if (ext4_forced_shutdown(sb))</div><div class='add'>+		SEQ_OPTS_PUTS("shutdown");</div><div class='add'>+</div><div class='ctx'> 	ext4_show_quota_options(seq, sb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3078,7 +3064,7 @@ int ext4_seq_options_show(struct seq_file *seq, void *offset)</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, sb_rdonly(sb) ? "ro" : "rw");</div><div class='ctx'> 	rc = _ext4_show_options(seq, sb, 1);</div><div class='del'>-	seq_puts(seq, "\n");</div><div class='add'>+	seq_putc(seq, '\n');</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3229,19 +3215,19 @@ static __le16 ext4_group_desc_csum(struct super_block *sb, __u32 block_group,</div><div class='ctx'> 	__le32 le_group = cpu_to_le32(block_group);</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(sbi-&gt;s_sb)) {</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sbi-&gt;s_sb)) {</div><div class='ctx'> 		/* Use new metadata_csum algorithm */</div><div class='ctx'> 		__u32 csum32;</div><div class='ctx'> 		__u16 dummy_csum = 0;</div><div class='ctx'> </div><div class='del'>-		csum32 = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)&amp;le_group,</div><div class='add'>+		csum32 = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)&amp;le_group,</div><div class='ctx'> 				     sizeof(le_group));</div><div class='del'>-		csum32 = ext4_chksum(sbi, csum32, (__u8 *)gdp, offset);</div><div class='del'>-		csum32 = ext4_chksum(sbi, csum32, (__u8 *)&amp;dummy_csum,</div><div class='add'>+		csum32 = ext4_chksum(csum32, (__u8 *)gdp, offset);</div><div class='add'>+		csum32 = ext4_chksum(csum32, (__u8 *)&amp;dummy_csum,</div><div class='ctx'> 				     sizeof(dummy_csum));</div><div class='ctx'> 		offset += sizeof(dummy_csum);</div><div class='ctx'> 		if (offset &lt; sbi-&gt;s_desc_size)</div><div class='del'>-			csum32 = ext4_chksum(sbi, csum32, (__u8 *)gdp + offset,</div><div class='add'>+			csum32 = ext4_chksum(csum32, (__u8 *)gdp + offset,</div><div class='ctx'> 					     sbi-&gt;s_desc_size - offset);</div><div class='ctx'> </div><div class='ctx'> 		crc = csum32 &amp; 0xFFFF;</div><div class='hunk'>@@ -3609,14 +3595,12 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if !IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (ext4_has_feature_casefold(sb)) {</div><div class='add'>+	if (!IS_ENABLED(CONFIG_UNICODE) &amp;&amp; ext4_has_feature_casefold(sb)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR,</div><div class='ctx'> 			 "Filesystem with casefold feature cannot be "</div><div class='ctx'> 			 "mounted without CONFIG_UNICODE");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (readonly)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -3659,7 +3643,7 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly)</div><div class='ctx'>  */</div><div class='ctx'> static void print_daily_error_info(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = from_timer(sbi, t, s_err_report);</div><div class='add'>+	struct ext4_sb_info *sbi = timer_container_of(sbi, t, s_err_report);</div><div class='ctx'> 	struct super_block *sb = sbi-&gt;s_sb;</div><div class='ctx'> 	struct ext4_super_block *es = sbi-&gt;s_es;</div><div class='ctx'> </div><div class='hunk'>@@ -3719,7 +3703,8 @@ static int ext4_run_li_request(struct ext4_li_request *elr)</div><div class='ctx'> 		if (group &gt;= elr-&gt;lr_next_group) {</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 			if (elr-&gt;lr_first_not_zeroed != ngroups &amp;&amp;</div><div class='del'>-			    !sb_rdonly(sb) &amp;&amp; test_opt(sb, INIT_INODE_TABLE)) {</div><div class='add'>+			    !ext4_emergency_state(sb) &amp;&amp; !sb_rdonly(sb) &amp;&amp;</div><div class='add'>+			    test_opt(sb, INIT_INODE_TABLE)) {</div><div class='ctx'> 				elr-&gt;lr_next_group = elr-&gt;lr_first_not_zeroed;</div><div class='ctx'> 				elr-&gt;lr_mode = EXT4_LI_MODE_ITABLE;</div><div class='ctx'> 				ret = 0;</div><div class='hunk'>@@ -3743,12 +3728,12 @@ static int ext4_run_li_request(struct ext4_li_request *elr)</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		start_time = ktime_get_real_ns();</div><div class='add'>+		start_time = ktime_get_ns();</div><div class='ctx'> 		ret = ext4_init_inode_table(sb, group,</div><div class='ctx'> 					    elr-&gt;lr_timeout ? 0 : 1);</div><div class='ctx'> 		trace_ext4_lazy_itable_init(sb, group);</div><div class='ctx'> 		if (elr-&gt;lr_timeout == 0) {</div><div class='del'>-			elr-&gt;lr_timeout = nsecs_to_jiffies((ktime_get_real_ns() - start_time) *</div><div class='add'>+			elr-&gt;lr_timeout = nsecs_to_jiffies((ktime_get_ns() - start_time) *</div><div class='ctx'> 				EXT4_SB(elr-&gt;lr_super)-&gt;s_li_wait_mult);</div><div class='ctx'> 		}</div><div class='ctx'> 		elr-&gt;lr_next_sched = jiffies + elr-&gt;lr_timeout;</div><div class='hunk'>@@ -3808,8 +3793,9 @@ static int ext4_lazyinit_thread(void *arg)</div><div class='ctx'> </div><div class='ctx'> cont_thread:</div><div class='ctx'> 	while (true) {</div><div class='del'>-		next_wakeup = MAX_JIFFY_OFFSET;</div><div class='add'>+		bool next_wakeup_initialized = false;</div><div class='ctx'> </div><div class='add'>+		next_wakeup = 0;</div><div class='ctx'> 		mutex_lock(&amp;eli-&gt;li_list_mtx);</div><div class='ctx'> 		if (list_empty(&amp;eli-&gt;li_request_list)) {</div><div class='ctx'> 			mutex_unlock(&amp;eli-&gt;li_list_mtx);</div><div class='hunk'>@@ -3822,8 +3808,11 @@ cont_thread:</div><div class='ctx'> 					 lr_request);</div><div class='ctx'> </div><div class='ctx'> 			if (time_before(jiffies, elr-&gt;lr_next_sched)) {</div><div class='del'>-				if (time_before(elr-&gt;lr_next_sched, next_wakeup))</div><div class='add'>+				if (!next_wakeup_initialized ||</div><div class='add'>+				    time_before(elr-&gt;lr_next_sched, next_wakeup)) {</div><div class='ctx'> 					next_wakeup = elr-&gt;lr_next_sched;</div><div class='add'>+					next_wakeup_initialized = true;</div><div class='add'>+				}</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (down_read_trylock(&amp;elr-&gt;lr_super-&gt;s_umount)) {</div><div class='hunk'>@@ -3851,16 +3840,18 @@ cont_thread:</div><div class='ctx'> 				elr-&gt;lr_next_sched = jiffies +</div><div class='ctx'> 					get_random_u32_below(EXT4_DEF_LI_MAX_START_DELAY * HZ);</div><div class='ctx'> 			}</div><div class='del'>-			if (time_before(elr-&gt;lr_next_sched, next_wakeup))</div><div class='add'>+			if (!next_wakeup_initialized ||</div><div class='add'>+			    time_before(elr-&gt;lr_next_sched, next_wakeup)) {</div><div class='ctx'> 				next_wakeup = elr-&gt;lr_next_sched;</div><div class='add'>+				next_wakeup_initialized = true;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;eli-&gt;li_list_mtx);</div><div class='ctx'> </div><div class='ctx'> 		try_to_freeze();</div><div class='ctx'> </div><div class='ctx'> 		cur = jiffies;</div><div class='del'>-		if ((time_after_eq(cur, next_wakeup)) ||</div><div class='del'>-		    (MAX_JIFFY_OFFSET == next_wakeup)) {</div><div class='add'>+		if (!next_wakeup_initialized || time_after_eq(cur, next_wakeup)) {</div><div class='ctx'> 			cond_resched();</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4018,7 +4009,7 @@ int ext4_register_li_request(struct super_block *sb,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(sb) ||</div><div class='add'>+	if (ext4_emergency_state(sb) || sb_rdonly(sb) ||</div><div class='ctx'> 	    (test_opt(sb, NO_PREFETCH_BLOCK_BITMAPS) &amp;&amp;</div><div class='ctx'> 	     (first_not_zeroed == ngroups || !test_opt(sb, INIT_INODE_TABLE))))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4081,7 +4072,7 @@ static int set_journal_csum_feature_set(struct super_block *sb)</div><div class='ctx'> 	int compat, incompat;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(sb)) {</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb)) {</div><div class='ctx'> 		/* journal checksum v3 */</div><div class='ctx'> 		compat = 0;</div><div class='ctx'> 		incompat = JBD2_FEATURE_INCOMPAT_CSUM_V3;</div><div class='hunk'>@@ -4200,7 +4191,7 @@ int ext4_calculate_overhead(struct super_block *sb)</div><div class='ctx'> 	unsigned int j_blocks, j_inum = le32_to_cpu(es-&gt;s_journal_inum);</div><div class='ctx'> 	ext4_group_t i, ngroups = ext4_get_groups_count(sb);</div><div class='ctx'> 	ext4_fsblk_t overhead = 0;</div><div class='del'>-	char *buf = (char *) get_zeroed_page(GFP_NOFS);</div><div class='add'>+	char *buf = kvmalloc(sb-&gt;s_blocksize, GFP_NOFS | __GFP_ZERO);</div><div class='ctx'> </div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -4225,7 +4216,7 @@ int ext4_calculate_overhead(struct super_block *sb)</div><div class='ctx'> 		blks = count_overhead(sb, i, buf);</div><div class='ctx'> 		overhead += blks;</div><div class='ctx'> 		if (blks)</div><div class='del'>-			memset(buf, 0, PAGE_SIZE);</div><div class='add'>+			memset(buf, 0, sb-&gt;s_blocksize);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4248,7 +4239,7 @@ int ext4_calculate_overhead(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> 	sbi-&gt;s_overhead = overhead;</div><div class='ctx'> 	smp_wmb();</div><div class='del'>-	free_page((unsigned long) buf);</div><div class='add'>+	kvfree(buf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4369,7 +4360,7 @@ static void ext4_set_def_opts(struct super_block *sb,</div><div class='ctx'> 	if (ext4_has_feature_fast_commit(sb))</div><div class='ctx'> 		set_opt2(sb, JOURNAL_FAST_COMMIT);</div><div class='ctx'> 	/* don't forget to enable journal_csum when metadata_csum is enabled. */</div><div class='del'>-	if (ext4_has_metadata_csum(sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(sb))</div><div class='ctx'> 		set_opt(sb, JOURNAL_CHECKSUM);</div><div class='ctx'> </div><div class='ctx'> 	if ((def_mount_opts &amp; EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA)</div><div class='hunk'>@@ -4401,8 +4392,7 @@ static void ext4_set_def_opts(struct super_block *sb,</div><div class='ctx'> 	    ((def_mount_opts &amp; EXT4_DEFM_NODELALLOC) == 0))</div><div class='ctx'> 		set_opt(sb, DELALLOC);</div><div class='ctx'> </div><div class='del'>-	if (sb-&gt;s_blocksize &lt;= PAGE_SIZE)</div><div class='del'>-		set_opt(sb, DIOREAD_NOLOCK);</div><div class='add'>+	set_opt(sb, DIOREAD_NOLOCK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_handle_clustersize(struct super_block *sb)</div><div class='hunk'>@@ -4422,22 +4412,6 @@ static int ext4_handle_clustersize(struct super_block *sb)</div><div class='ctx'> 		}</div><div class='ctx'> 		sbi-&gt;s_cluster_bits = le32_to_cpu(es-&gt;s_log_cluster_size) -</div><div class='ctx'> 			le32_to_cpu(es-&gt;s_log_block_size);</div><div class='del'>-		sbi-&gt;s_clusters_per_group =</div><div class='del'>-			le32_to_cpu(es-&gt;s_clusters_per_group);</div><div class='del'>-		if (sbi-&gt;s_clusters_per_group &gt; sb-&gt;s_blocksize * 8) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR,</div><div class='del'>-				 "#clusters per group too big: %lu",</div><div class='del'>-				 sbi-&gt;s_clusters_per_group);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (sbi-&gt;s_blocks_per_group !=</div><div class='del'>-		    (sbi-&gt;s_clusters_per_group * (clustersize / sb-&gt;s_blocksize))) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR, "blocks per group (%lu) and "</div><div class='del'>-				 "clusters per group (%lu) inconsistent",</div><div class='del'>-				 sbi-&gt;s_blocks_per_group,</div><div class='del'>-				 sbi-&gt;s_clusters_per_group);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (clustersize != sb-&gt;s_blocksize) {</div><div class='ctx'> 			ext4_msg(sb, KERN_ERR,</div><div class='hunk'>@@ -4451,9 +4425,21 @@ static int ext4_handle_clustersize(struct super_block *sb)</div><div class='ctx'> 				 sbi-&gt;s_blocks_per_group);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		sbi-&gt;s_clusters_per_group = sbi-&gt;s_blocks_per_group;</div><div class='ctx'> 		sbi-&gt;s_cluster_bits = 0;</div><div class='ctx'> 	}</div><div class='add'>+	sbi-&gt;s_clusters_per_group = le32_to_cpu(es-&gt;s_clusters_per_group);</div><div class='add'>+	if (sbi-&gt;s_clusters_per_group &gt; sb-&gt;s_blocksize * 8) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR, "#clusters per group too big: %lu",</div><div class='add'>+			 sbi-&gt;s_clusters_per_group);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (sbi-&gt;s_blocks_per_group !=</div><div class='add'>+	    (sbi-&gt;s_clusters_per_group * (clustersize / sb-&gt;s_blocksize))) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "blocks per group (%lu) and clusters per group (%lu) inconsistent",</div><div class='add'>+			 sbi-&gt;s_blocks_per_group, sbi-&gt;s_clusters_per_group);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	sbi-&gt;s_cluster_ratio = clustersize / sb-&gt;s_blocksize;</div><div class='ctx'> </div><div class='ctx'> 	/* Do we have standard group size of clustersize * 8 blocks ? */</div><div class='hunk'>@@ -4463,6 +4449,39 @@ static int ext4_handle_clustersize(struct super_block *sb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ext4_atomic_write_init: Initializes filesystem min &amp; max atomic write units.</div><div class='add'>+ * With non-bigalloc filesystem awu will be based upon filesystem blocksize</div><div class='add'>+ * &amp; bdev awu units.</div><div class='add'>+ * With bigalloc it will be based upon bigalloc cluster size &amp; bdev awu units.</div><div class='add'>+ * @sb: super block</div><div class='add'>+ */</div><div class='add'>+static void ext4_atomic_write_init(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	struct block_device *bdev = sb-&gt;s_bdev;</div><div class='add'>+	unsigned int clustersize = EXT4_CLUSTER_SIZE(sb);</div><div class='add'>+</div><div class='add'>+	if (!bdev_can_atomic_write(bdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ext4_has_feature_extents(sb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sbi-&gt;s_awu_min = max(sb-&gt;s_blocksize,</div><div class='add'>+			      bdev_atomic_write_unit_min_bytes(bdev));</div><div class='add'>+	sbi-&gt;s_awu_max = min(clustersize,</div><div class='add'>+			      bdev_atomic_write_unit_max_bytes(bdev));</div><div class='add'>+	if (sbi-&gt;s_awu_min &amp;&amp; sbi-&gt;s_awu_max &amp;&amp;</div><div class='add'>+	    sbi-&gt;s_awu_min &lt;= sbi-&gt;s_awu_max) {</div><div class='add'>+		ext4_msg(sb, KERN_NOTICE, "Supports (experimental) DIO atomic writes awu_min: %u, awu_max: %u",</div><div class='add'>+			 sbi-&gt;s_awu_min, sbi-&gt;s_awu_max);</div><div class='add'>+	} else {</div><div class='add'>+		sbi-&gt;s_awu_min = 0;</div><div class='add'>+		sbi-&gt;s_awu_max = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ext4_fast_commit_init(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='hunk'>@@ -4476,7 +4495,7 @@ static void ext4_fast_commit_init(struct super_block *sb)</div><div class='ctx'> 	sbi-&gt;s_fc_bytes = 0;</div><div class='ctx'> 	ext4_clear_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);</div><div class='ctx'> 	sbi-&gt;s_fc_ineligible_tid = 0;</div><div class='del'>-	spin_lock_init(&amp;sbi-&gt;s_fc_lock);</div><div class='add'>+	mutex_init(&amp;sbi-&gt;s_fc_lock);</div><div class='ctx'> 	memset(&amp;sbi-&gt;s_fc_stats, 0, sizeof(sbi-&gt;s_fc_stats));</div><div class='ctx'> 	sbi-&gt;s_fc_replay_state.fc_regions = NULL;</div><div class='ctx'> 	sbi-&gt;s_fc_replay_state.fc_regions_size = 0;</div><div class='hunk'>@@ -4626,15 +4645,6 @@ static int ext4_init_metadata_csum(struct super_block *sb, struct ext4_super_blo</div><div class='ctx'> 	ext4_setup_csum_trigger(sb, EXT4_JTR_ORPHAN_FILE,</div><div class='ctx'> 				ext4_orphan_file_block_trigger);</div><div class='ctx'> </div><div class='del'>-	/* Load the checksum driver */</div><div class='del'>-	sbi-&gt;s_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);</div><div class='del'>-	if (IS_ERR(sbi-&gt;s_chksum_driver)) {</div><div class='del'>-		int ret = PTR_ERR(sbi-&gt;s_chksum_driver);</div><div class='del'>-		ext4_msg(sb, KERN_ERR, "Cannot load crc32c driver.");</div><div class='del'>-		sbi-&gt;s_chksum_driver = NULL;</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Check superblock checksum */</div><div class='ctx'> 	if (!ext4_superblock_csum_verify(sb, es)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "VFS: Found ext4 filesystem with "</div><div class='hunk'>@@ -4645,8 +4655,9 @@ static int ext4_init_metadata_csum(struct super_block *sb, struct ext4_super_blo</div><div class='ctx'> 	/* Precompute checksum seed for all metadata */</div><div class='ctx'> 	if (ext4_has_feature_csum_seed(sb))</div><div class='ctx'> 		sbi-&gt;s_csum_seed = le32_to_cpu(es-&gt;s_checksum_seed);</div><div class='del'>-	else if (ext4_has_metadata_csum(sb) || ext4_has_feature_ea_inode(sb))</div><div class='del'>-		sbi-&gt;s_csum_seed = ext4_chksum(sbi, ~0, es-&gt;s_uuid,</div><div class='add'>+	else if (ext4_has_feature_metadata_csum(sb) ||</div><div class='add'>+		 ext4_has_feature_ea_inode(sb))</div><div class='add'>+		sbi-&gt;s_csum_seed = ext4_chksum(~0, es-&gt;s_uuid,</div><div class='ctx'> 					       sizeof(es-&gt;s_uuid));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4976,10 +4987,7 @@ static int ext4_load_and_init_journal(struct super_block *sb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	/* flush s_sb_upd_work before destroying the journal. */</div><div class='del'>-	flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='del'>-	jbd2_journal_destroy(sbi-&gt;s_journal);</div><div class='del'>-	sbi-&gt;s_journal = NULL;</div><div class='add'>+	ext4_journal_destroy(sbi, sbi-&gt;s_journal);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5016,6 +5024,59 @@ static int ext4_check_journal_data_mode(struct super_block *sb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *ext4_has_journal_option(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+</div><div class='add'>+	if (test_opt(sb, JOURNAL_ASYNC_COMMIT))</div><div class='add'>+		return "journal_async_commit";</div><div class='add'>+	if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM))</div><div class='add'>+		return "journal_checksum";</div><div class='add'>+	if (sbi-&gt;s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ)</div><div class='add'>+		return "commit=";</div><div class='add'>+	if (EXT4_MOUNT_DATA_FLAGS &amp;</div><div class='add'>+	    (sbi-&gt;s_mount_opt ^ sbi-&gt;s_def_mount_opt))</div><div class='add'>+		return "data=";</div><div class='add'>+	if (test_opt(sb, DATA_ERR_ABORT))</div><div class='add'>+		return "data_err=abort";</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Limit the maximum folio order to 2048 blocks to prevent overestimation</div><div class='add'>+ * of reserve handle credits during the folio writeback in environments</div><div class='add'>+ * where the PAGE_SIZE exceeds 4KB.</div><div class='add'>+ */</div><div class='add'>+#define EXT4_MAX_PAGECACHE_ORDER(sb)		\</div><div class='add'>+		umin(MAX_PAGECACHE_ORDER, (11 + (sb)-&gt;s_blocksize_bits - PAGE_SHIFT))</div><div class='add'>+static void ext4_set_max_mapping_order(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+</div><div class='add'>+	if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)</div><div class='add'>+		sbi-&gt;s_max_folio_order = sbi-&gt;s_min_folio_order;</div><div class='add'>+	else</div><div class='add'>+		sbi-&gt;s_max_folio_order = EXT4_MAX_PAGECACHE_ORDER(sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ext4_check_large_folio(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	const char *err_str = NULL;</div><div class='add'>+</div><div class='add'>+	if (ext4_has_feature_encrypt(sb))</div><div class='add'>+		err_str = "encrypt";</div><div class='add'>+</div><div class='add'>+	if (!err_str) {</div><div class='add'>+		ext4_set_max_mapping_order(sb);</div><div class='add'>+	} else if (sb-&gt;s_blocksize &gt; PAGE_SIZE) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR, "bs(%lu) &gt; ps(%lu) unsupported for %s",</div><div class='add'>+			 sb-&gt;s_blocksize, PAGE_SIZE, err_str);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb,</div><div class='ctx'> 			   int silent)</div><div class='ctx'> {</div><div class='hunk'>@@ -5083,11 +5144,8 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb,</div><div class='ctx'> 	 * If the default block size is not the same as the real block size,</div><div class='ctx'> 	 * we need to reload it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sb-&gt;s_blocksize == blocksize) {</div><div class='del'>-		*lsb = logical_sb_block;</div><div class='del'>-		sbi-&gt;s_sbh = bh;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (sb-&gt;s_blocksize == blocksize)</div><div class='add'>+		goto success;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * bh must be released before kill_bdev(), otherwise</div><div class='hunk'>@@ -5118,6 +5176,9 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb,</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "Magic mismatch, very weird!");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+success:</div><div class='add'>+	sbi-&gt;s_min_folio_order = get_order(blocksize);</div><div class='ctx'> 	*lsb = logical_sb_block;</div><div class='ctx'> 	sbi-&gt;s_sbh = bh;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -5126,16 +5187,27 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ext4_hash_info_init(struct super_block *sb)</div><div class='add'>+static int ext4_hash_info_init(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> 	struct ext4_super_block *es = sbi-&gt;s_es;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;s_def_hash_version = es-&gt;s_def_hash_version;</div><div class='add'>+</div><div class='add'>+	if (sbi-&gt;s_def_hash_version &gt; DX_HASH_LAST) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "Invalid default hash set in the superblock");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (sbi-&gt;s_def_hash_version == DX_HASH_SIPHASH) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR,</div><div class='add'>+			 "SIPHASH is not a valid default hash value");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		sbi-&gt;s_hash_seed[i] = le32_to_cpu(es-&gt;s_hash_seed[i]);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_def_hash_version = es-&gt;s_def_hash_version;</div><div class='ctx'> 	if (ext4_has_feature_dir_index(sb)) {</div><div class='ctx'> 		i = le32_to_cpu(es-&gt;s_flags);</div><div class='ctx'> 		if (i &amp; EXT2_FLAGS_UNSIGNED_HASH)</div><div class='hunk'>@@ -5153,6 +5225,7 @@ static void ext4_hash_info_init(struct super_block *sb)</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ext4_block_group_meta_init(struct super_block *sb, int silent)</div><div class='hunk'>@@ -5204,6 +5277,18 @@ static int ext4_block_group_meta_init(struct super_block *sb, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * It's hard to get stripe aligned blocks if stripe is not aligned with</div><div class='add'>+ * cluster, just disable stripe and alert user to simplify code and avoid</div><div class='add'>+ * stripe aligned allocation which will rarely succeed.</div><div class='add'>+ */</div><div class='add'>+static bool ext4_is_stripe_incompatible(struct super_block *sb, unsigned long stripe)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='add'>+	return (stripe &gt; 0 &amp;&amp; sbi-&gt;s_cluster_ratio &gt; 1 &amp;&amp;</div><div class='add'>+		stripe % sbi-&gt;s_cluster_ratio != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_super_block *es = NULL;</div><div class='hunk'>@@ -5218,7 +5303,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	/* Set defaults for the variables that will be set during parsing */</div><div class='ctx'> 	if (!(ctx-&gt;spec &amp; EXT4_SPEC_JOURNAL_IOPRIO))</div><div class='del'>-		ctx-&gt;journal_ioprio = DEFAULT_JOURNAL_IOPRIO;</div><div class='add'>+		ctx-&gt;journal_ioprio = EXT4_DEF_JOURNAL_IOPRIO;</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;s_inode_readahead_blks = EXT4_DEF_INODE_READAHEAD_BLKS;</div><div class='ctx'> 	sbi-&gt;s_sectors_written_start =</div><div class='hunk'>@@ -5237,11 +5322,13 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	ext4_set_def_opts(sb, es);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_resuid = make_kuid(&amp;init_user_ns, le16_to_cpu(es-&gt;s_def_resuid));</div><div class='del'>-	sbi-&gt;s_resgid = make_kgid(&amp;init_user_ns, le16_to_cpu(es-&gt;s_def_resgid));</div><div class='add'>+	sbi-&gt;s_resuid = make_kuid(&amp;init_user_ns, ext4_get_resuid(es));</div><div class='add'>+	sbi-&gt;s_resgid = make_kgid(&amp;init_user_ns, ext4_get_resuid(es));</div><div class='ctx'> 	sbi-&gt;s_commit_interval = JBD2_DEFAULT_MAX_COMMIT_AGE * HZ;</div><div class='ctx'> 	sbi-&gt;s_min_batch_time = EXT4_DEF_MIN_BATCH_TIME;</div><div class='ctx'> 	sbi-&gt;s_max_batch_time = EXT4_DEF_MAX_BATCH_TIME;</div><div class='add'>+	sbi-&gt;s_sb_update_kb = EXT4_DEF_SB_UPDATE_INTERVAL_KB;</div><div class='add'>+	sbi-&gt;s_sb_update_sec = EXT4_DEF_SB_UPDATE_INTERVAL_SEC;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set default s_li_wait_mult for lazyinit, for the case there is</div><div class='hunk'>@@ -5266,6 +5353,10 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	ext4_apply_options(fc, sb);</div><div class='ctx'> </div><div class='add'>+	err = ext4_check_large_folio(sb);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failed_mount;</div><div class='add'>+</div><div class='ctx'> 	err = ext4_encoding_init(sb, es);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_mount;</div><div class='hunk'>@@ -5277,8 +5368,8 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	sb-&gt;s_flags = (sb-&gt;s_flags &amp; ~SB_POSIXACL) |</div><div class='ctx'> 		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);</div><div class='ctx'> </div><div class='del'>-	/* i_version is always enabled now */</div><div class='del'>-	sb-&gt;s_flags |= SB_I_VERSION;</div><div class='add'>+	/* HSM events are allowed by default. */</div><div class='add'>+	sb-&gt;s_iflags |= SB_I_ALLOW_HSM;</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_check_feature_compatibility(sb, es, silent);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -5288,7 +5379,9 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_mount;</div><div class='ctx'> </div><div class='del'>-	ext4_hash_info_init(sb);</div><div class='add'>+	err = ext4_hash_info_init(sb);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed_mount;</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_handle_clustersize(sb);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -5311,13 +5404,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 		goto failed_mount3;</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;s_stripe = ext4_get_stripe_size(sbi);</div><div class='del'>-	/*</div><div class='del'>-	 * It's hard to get stripe aligned blocks if stripe is not aligned with</div><div class='del'>-	 * cluster, just disable stripe and alert user to simpfy code and avoid</div><div class='del'>-	 * stripe aligned allocation which will rarely successes.</div><div class='del'>-	 */</div><div class='del'>-	if (sbi-&gt;s_stripe &gt; 0 &amp;&amp; sbi-&gt;s_cluster_ratio &gt; 1 &amp;&amp;</div><div class='del'>-	    sbi-&gt;s_stripe % sbi-&gt;s_cluster_ratio != 0) {</div><div class='add'>+	if (ext4_is_stripe_incompatible(sb, sbi-&gt;s_stripe)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_WARNING,</div><div class='ctx'> 			 "stripe (%lu) is not aligned with cluster size (%u), "</div><div class='ctx'> 			 "stripe is disabled",</div><div class='hunk'>@@ -5346,11 +5433,15 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 		sb-&gt;s_qcop = &amp;ext4_qctl_operations;</div><div class='ctx'> 	sb-&gt;s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;</div><div class='ctx'> #endif</div><div class='del'>-	memcpy(&amp;sb-&gt;s_uuid, es-&gt;s_uuid, sizeof(es-&gt;s_uuid));</div><div class='add'>+	super_set_uuid(sb, es-&gt;s_uuid, sizeof(es-&gt;s_uuid));</div><div class='add'>+	super_set_sysfs_name_bdev(sb);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sbi-&gt;s_orphan); /* unlinked but open files */</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;s_orphan_lock);</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;sbi-&gt;s_bdev_wb_lock);</div><div class='add'>+</div><div class='add'>+	ext4_atomic_write_init(sb);</div><div class='ctx'> 	ext4_fast_commit_init(sb);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_root = NULL;</div><div class='hunk'>@@ -5374,36 +5465,25 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 		err = ext4_load_and_init_journal(sb, es, ctx);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto failed_mount3a;</div><div class='add'>+		if (bdev_read_only(sb-&gt;s_bdev))</div><div class='add'>+		    needs_recovery = 0;</div><div class='ctx'> 	} else if (test_opt(sb, NOLOAD) &amp;&amp; !sb_rdonly(sb) &amp;&amp;</div><div class='ctx'> 		   ext4_has_feature_journal_needs_recovery(sb)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "required journal recovery "</div><div class='ctx'> 		       "suppressed and not mounted read-only");</div><div class='ctx'> 		goto failed_mount3a;</div><div class='ctx'> 	} else {</div><div class='add'>+		const char *journal_option;</div><div class='add'>+</div><div class='ctx'> 		/* Nojournal mode, all journal mount options are illegal */</div><div class='del'>-		if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR, "can't mount with "</div><div class='del'>-				 "journal_async_commit, fs mounted w/o journal");</div><div class='add'>+		journal_option = ext4_has_journal_option(sb);</div><div class='add'>+		if (journal_option != NULL) {</div><div class='add'>+			ext4_msg(sb, KERN_ERR,</div><div class='add'>+				 "can't mount with %s, fs mounted w/o journal",</div><div class='add'>+				 journal_option);</div><div class='ctx'> 			goto failed_mount3a;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM)) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR, "can't mount with "</div><div class='del'>-				 "journal_checksum, fs mounted w/o journal");</div><div class='del'>-			goto failed_mount3a;</div><div class='del'>-		}</div><div class='del'>-		if (sbi-&gt;s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR, "can't mount with "</div><div class='del'>-				 "commit=%lu, fs mounted w/o journal",</div><div class='del'>-				 sbi-&gt;s_commit_interval / HZ);</div><div class='del'>-			goto failed_mount3a;</div><div class='del'>-		}</div><div class='del'>-		if (EXT4_MOUNT_DATA_FLAGS &amp;</div><div class='del'>-		    (sbi-&gt;s_mount_opt ^ sbi-&gt;s_def_mount_opt)) {</div><div class='del'>-			ext4_msg(sb, KERN_ERR, "can't mount with "</div><div class='del'>-				 "data=, fs mounted w/o journal");</div><div class='del'>-			goto failed_mount3a;</div><div class='del'>-		}</div><div class='ctx'> 		sbi-&gt;s_def_mount_opt &amp;= ~EXT4_MOUNT_JOURNAL_CHECKSUM;</div><div class='ctx'> 		clear_opt(sb, JOURNAL_CHECKSUM);</div><div class='ctx'> 		clear_opt(sb, DATA_FLAGS);</div><div class='hunk'>@@ -5484,6 +5564,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 		goto failed_mount4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	generic_set_sb_d_ops(sb);</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root);</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "get root dentry failed");</div><div class='hunk'>@@ -5555,19 +5636,15 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_mount6;</div><div class='ctx'> </div><div class='del'>-	err = ext4_register_sysfs(sb);</div><div class='del'>-	if (err)</div><div class='del'>-		goto failed_mount7;</div><div class='del'>-</div><div class='ctx'> 	err = ext4_init_orphan_info(sb);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto failed_mount8;</div><div class='add'>+		goto failed_mount7;</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	/* Enable quota usage during mount. */</div><div class='ctx'> 	if (ext4_has_feature_quota(sb) &amp;&amp; !sb_rdonly(sb)) {</div><div class='ctx'> 		err = ext4_enable_quotas(sb);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto failed_mount9;</div><div class='add'>+			goto failed_mount8;</div><div class='ctx'> 	}</div><div class='ctx'> #endif  /* CONFIG_QUOTA */</div><div class='ctx'> </div><div class='hunk'>@@ -5575,8 +5652,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	 * Save the original bdev mapping's wb_err value which could be</div><div class='ctx'> 	 * used to detect the metadata async write error.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_init(&amp;sbi-&gt;s_bdev_wb_lock);</div><div class='del'>-	errseq_check_and_advance(&amp;sb-&gt;s_bdev-&gt;bd_inode-&gt;i_mapping-&gt;wb_err,</div><div class='add'>+	errseq_check_and_advance(&amp;sb-&gt;s_bdev-&gt;bd_mapping-&gt;wb_err,</div><div class='ctx'> 				 &amp;sbi-&gt;s_bdev_wb_err);</div><div class='ctx'> 	EXT4_SB(sb)-&gt;s_mount_state |= EXT4_ORPHAN_FS;</div><div class='ctx'> 	ext4_orphan_cleanup(sb, es);</div><div class='hunk'>@@ -5593,12 +5669,14 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 		ext4_msg(sb, KERN_INFO, "recovery complete");</div><div class='ctx'> 		err = ext4_mark_recovery_complete(sb, es);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto failed_mount10;</div><div class='add'>+			goto failed_mount9;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_opt(sb, DISCARD) &amp;&amp; !bdev_max_discard_sectors(sb-&gt;s_bdev))</div><div class='add'>+	if (test_opt(sb, DISCARD) &amp;&amp; !bdev_max_discard_sectors(sb-&gt;s_bdev)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_WARNING,</div><div class='ctx'> 			 "mounting with \"discard\" option, but the device does not support discard");</div><div class='add'>+		clear_opt(sb, DISCARD);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (es-&gt;s_error_count)</div><div class='ctx'> 		mod_timer(&amp;sbi-&gt;s_err_report, jiffies + 300*HZ); /* 5 minutes */</div><div class='hunk'>@@ -5610,15 +5688,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	atomic_set(&amp;sbi-&gt;s_warning_count, 0);</div><div class='ctx'> 	atomic_set(&amp;sbi-&gt;s_msg_count, 0);</div><div class='ctx'> </div><div class='add'>+	/* Register sysfs after all initializations are complete. */</div><div class='add'>+	err = ext4_register_sysfs(sb);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed_mount9;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-failed_mount10:</div><div class='add'>+failed_mount9:</div><div class='ctx'> 	ext4_quotas_off(sb, EXT4_MAXQUOTAS);</div><div class='del'>-failed_mount9: __maybe_unused</div><div class='add'>+failed_mount8: __maybe_unused</div><div class='ctx'> 	ext4_release_orphan_info(sb);</div><div class='del'>-failed_mount8:</div><div class='del'>-	ext4_unregister_sysfs(sb);</div><div class='del'>-	kobject_put(&amp;sbi-&gt;s_kobj);</div><div class='ctx'> failed_mount7:</div><div class='ctx'> 	ext4_unregister_li_request(sb);</div><div class='ctx'> failed_mount6:</div><div class='hunk'>@@ -5643,23 +5723,17 @@ failed_mount_wq:</div><div class='ctx'> 	sbi-&gt;s_ea_block_cache = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;s_journal) {</div><div class='del'>-		/* flush s_sb_upd_work before journal destroy. */</div><div class='del'>-		flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='del'>-		jbd2_journal_destroy(sbi-&gt;s_journal);</div><div class='del'>-		sbi-&gt;s_journal = NULL;</div><div class='add'>+		ext4_journal_destroy(sbi, sbi-&gt;s_journal);</div><div class='ctx'> 	}</div><div class='ctx'> failed_mount3a:</div><div class='ctx'> 	ext4_es_unregister_shrinker(sbi);</div><div class='ctx'> failed_mount3:</div><div class='ctx'> 	/* flush s_sb_upd_work before sbi destroy */</div><div class='ctx'> 	flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='del'>-	del_timer_sync(&amp;sbi-&gt;s_err_report);</div><div class='ctx'> 	ext4_stop_mmpd(sbi);</div><div class='add'>+	timer_delete_sync(&amp;sbi-&gt;s_err_report);</div><div class='ctx'> 	ext4_group_desc_free(sbi);</div><div class='ctx'> failed_mount:</div><div class='del'>-	if (sbi-&gt;s_chksum_driver)</div><div class='del'>-		crypto_free_shash(sbi-&gt;s_chksum_driver);</div><div class='del'>-</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	utf8_unload(sb-&gt;s_encoding);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -5672,7 +5746,7 @@ failed_mount:</div><div class='ctx'> 	brelse(sbi-&gt;s_sbh);</div><div class='ctx'> 	if (sbi-&gt;s_journal_bdev_file) {</div><div class='ctx'> 		invalidate_bdev(file_bdev(sbi-&gt;s_journal_bdev_file));</div><div class='del'>-		fput(sbi-&gt;s_journal_bdev_file);</div><div class='add'>+		bdev_fput(sbi-&gt;s_journal_bdev_file);</div><div class='ctx'> 	}</div><div class='ctx'> out_fail:</div><div class='ctx'> 	invalidate_bdev(sb-&gt;s_bdev);</div><div class='hunk'>@@ -5754,10 +5828,6 @@ static void ext4_init_journal_params(struct super_block *sb, journal_t *journal)</div><div class='ctx'> 		journal-&gt;j_flags |= JBD2_BARRIER;</div><div class='ctx'> 	else</div><div class='ctx'> 		journal-&gt;j_flags &amp;= ~JBD2_BARRIER;</div><div class='del'>-	if (test_opt(sb, DATA_ERR_ABORT))</div><div class='del'>-		journal-&gt;j_flags |= JBD2_ABORT_ON_SYNCDATA_ERR;</div><div class='del'>-	else</div><div class='del'>-		journal-&gt;j_flags &amp;= ~JBD2_ABORT_ON_SYNCDATA_ERR;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Always enable journal cycle record option, letting the journal</div><div class='ctx'> 	 * records log transactions continuously between each mount.</div><div class='hunk'>@@ -5813,7 +5883,7 @@ static int ext4_journal_bmap(journal_t *journal, sector_t *block)</div><div class='ctx'> 		ext4_msg(journal-&gt;j_inode-&gt;i_sb, KERN_CRIT,</div><div class='ctx'> 			 "journal bmap failed: block %llu ret %d\n",</div><div class='ctx'> 			 *block, ret);</div><div class='del'>-		jbd2_journal_abort(journal, ret ? ret : -EIO);</div><div class='add'>+		jbd2_journal_abort(journal, ret ? ret : -EFSCORRUPTED);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	*block = map.m_pblk;</div><div class='hunk'>@@ -5877,7 +5947,7 @@ static struct file *ext4_get_journal_blkdev(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	sb_block = EXT4_MIN_BLOCK_SIZE / blocksize;</div><div class='ctx'> 	offset = EXT4_MIN_BLOCK_SIZE % blocksize;</div><div class='del'>-	set_blocksize(bdev, blocksize);</div><div class='add'>+	set_blocksize(bdev_file, blocksize);</div><div class='ctx'> 	bh = __bread(bdev, sb_block, blocksize);</div><div class='ctx'> 	if (!bh) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "couldn't read superblock of "</div><div class='hunk'>@@ -5897,7 +5967,7 @@ static struct file *ext4_get_journal_blkdev(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	if ((le32_to_cpu(es-&gt;s_feature_ro_compat) &amp;</div><div class='ctx'> 	     EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &amp;&amp;</div><div class='del'>-	    es-&gt;s_checksum != ext4_superblock_csum(sb, es)) {</div><div class='add'>+	    es-&gt;s_checksum != ext4_superblock_csum(es)) {</div><div class='ctx'> 		ext4_msg(sb, KERN_ERR, "external journal has corrupt superblock");</div><div class='ctx'> 		errno = -EFSCORRUPTED;</div><div class='ctx'> 		goto out_bh;</div><div class='hunk'>@@ -5917,7 +5987,7 @@ static struct file *ext4_get_journal_blkdev(struct super_block *sb,</div><div class='ctx'> out_bh:</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> out_bdev:</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> 	return ERR_PTR(errno);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5954,9 +6024,9 @@ static journal_t *ext4_open_dev_journal(struct super_block *sb,</div><div class='ctx'> 	return journal;</div><div class='ctx'> </div><div class='ctx'> out_journal:</div><div class='del'>-	jbd2_journal_destroy(journal);</div><div class='add'>+	ext4_journal_destroy(EXT4_SB(sb), journal);</div><div class='ctx'> out_bdev:</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> 	return ERR_PTR(errno);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6071,8 +6141,7 @@ static int ext4_load_journal(struct super_block *sb,</div><div class='ctx'> 	EXT4_SB(sb)-&gt;s_journal = journal;</div><div class='ctx'> 	err = ext4_clear_journal_err(sb, es);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		EXT4_SB(sb)-&gt;s_journal = NULL;</div><div class='del'>-		jbd2_journal_destroy(journal);</div><div class='add'>+		ext4_journal_destroy(EXT4_SB(sb), journal);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6090,7 +6159,7 @@ static int ext4_load_journal(struct super_block *sb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	jbd2_journal_destroy(journal);</div><div class='add'>+	ext4_journal_destroy(EXT4_SB(sb), journal);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6134,8 +6203,8 @@ static void ext4_update_super(struct super_block *sb)</div><div class='ctx'> 			__ext4_update_tstamp(&amp;es-&gt;s_first_error_time,</div><div class='ctx'> 					     &amp;es-&gt;s_first_error_time_hi,</div><div class='ctx'> 					     sbi-&gt;s_first_error_time);</div><div class='del'>-			strncpy(es-&gt;s_first_error_func, sbi-&gt;s_first_error_func,</div><div class='del'>-				sizeof(es-&gt;s_first_error_func));</div><div class='add'>+			strtomem_pad(es-&gt;s_first_error_func,</div><div class='add'>+				     sbi-&gt;s_first_error_func, 0);</div><div class='ctx'> 			es-&gt;s_first_error_line =</div><div class='ctx'> 				cpu_to_le32(sbi-&gt;s_first_error_line);</div><div class='ctx'> 			es-&gt;s_first_error_ino =</div><div class='hunk'>@@ -6148,8 +6217,7 @@ static void ext4_update_super(struct super_block *sb)</div><div class='ctx'> 		__ext4_update_tstamp(&amp;es-&gt;s_last_error_time,</div><div class='ctx'> 				     &amp;es-&gt;s_last_error_time_hi,</div><div class='ctx'> 				     sbi-&gt;s_last_error_time);</div><div class='del'>-		strncpy(es-&gt;s_last_error_func, sbi-&gt;s_last_error_func,</div><div class='del'>-			sizeof(es-&gt;s_last_error_func));</div><div class='add'>+		strtomem_pad(es-&gt;s_last_error_func, sbi-&gt;s_last_error_func, 0);</div><div class='ctx'> 		es-&gt;s_last_error_line = cpu_to_le32(sbi-&gt;s_last_error_line);</div><div class='ctx'> 		es-&gt;s_last_error_ino = cpu_to_le32(sbi-&gt;s_last_error_ino);</div><div class='ctx'> 		es-&gt;s_last_error_block = cpu_to_le64(sbi-&gt;s_last_error_block);</div><div class='hunk'>@@ -6176,8 +6244,6 @@ static int ext4_commit_super(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	if (!sbh)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (block_device_ejected(sb))</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ext4_update_super(sb);</div><div class='ctx'> </div><div class='hunk'>@@ -6320,8 +6386,9 @@ static int ext4_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 	bool needs_barrier = false;</div><div class='ctx'> 	struct ext4_sb_info *sbi = EXT4_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ext4_forced_shutdown(sb)))</div><div class='del'>-		return 0;</div><div class='add'>+	ret = ext4_emergency_state(sb);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	trace_ext4_sync_fs(sb, wait);</div><div class='ctx'> 	flush_workqueue(sbi-&gt;rsv_conversion_wq);</div><div class='hunk'>@@ -6403,7 +6470,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int ext4_unfreeze(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	if (ext4_forced_shutdown(sb))</div><div class='add'>+	if (ext4_emergency_state(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (EXT4_SB(sb)-&gt;s_journal) {</div><div class='hunk'>@@ -6479,8 +6546,17 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 			ctx-&gt;journal_ioprio =</div><div class='ctx'> 				sbi-&gt;s_journal-&gt;j_task-&gt;io_context-&gt;ioprio;</div><div class='ctx'> 		else</div><div class='del'>-			ctx-&gt;journal_ioprio = DEFAULT_JOURNAL_IOPRIO;</div><div class='add'>+			ctx-&gt;journal_ioprio = EXT4_DEF_JOURNAL_IOPRIO;</div><div class='add'>+</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if ((ctx-&gt;spec &amp; EXT4_SPEC_s_stripe) &amp;&amp;</div><div class='add'>+	    ext4_is_stripe_incompatible(sb, ctx-&gt;s_stripe)) {</div><div class='add'>+		ext4_msg(sb, KERN_WARNING,</div><div class='add'>+			 "stripe (%lu) is not aligned with cluster size (%u), "</div><div class='add'>+			 "stripe is disabled",</div><div class='add'>+			 ctx-&gt;s_stripe, sbi-&gt;s_cluster_ratio);</div><div class='add'>+		ctx-&gt;s_stripe = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -6529,8 +6605,12 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 		goto restore_opts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_opt2(sb, ABORT))</div><div class='del'>-		ext4_abort(sb, ESHUTDOWN, "Abort forced by user");</div><div class='add'>+	if ((old_opts.s_mount_opt &amp; EXT4_MOUNT_DELALLOC) &amp;&amp;</div><div class='add'>+	    !test_opt(sb, DELALLOC)) {</div><div class='add'>+		ext4_msg(sb, KERN_ERR, "can't disable delalloc during remount");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto restore_opts;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_flags = (sb-&gt;s_flags &amp; ~SB_POSIXACL) |</div><div class='ctx'> 		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);</div><div class='hunk'>@@ -6546,7 +6626,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	flush_work(&amp;sbi-&gt;s_sb_upd_work);</div><div class='ctx'> </div><div class='ctx'> 	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) != sb_rdonly(sb)) {</div><div class='del'>-		if (ext4_forced_shutdown(sb)) {</div><div class='add'>+		if (ext4_emergency_state(sb)) {</div><div class='ctx'> 			err = -EROFS;</div><div class='ctx'> 			goto restore_opts;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6700,6 +6780,14 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> 	if (!ext4_has_feature_mmp(sb) || sb_rdonly(sb))</div><div class='ctx'> 		ext4_stop_mmpd(sbi);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Handle aborting the filesystem as the last thing during remount to</div><div class='add'>+	 * avoid obsure errors during remount when some option changes fail to</div><div class='add'>+	 * apply due to shutdown filesystem.</div><div class='add'>+	 */</div><div class='add'>+	if (test_opt2(sb, ABORT))</div><div class='add'>+		ext4_abort(sb, ESHUTDOWN, "Abort forced by user");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> restore_opts:</div><div class='hunk'>@@ -6743,6 +6831,7 @@ static int ext4_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool old_ro = sb_rdonly(sb);</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;s_fs_info = EXT4_SB(sb);</div><div class='ctx'> </div><div class='hunk'>@@ -6754,9 +6843,9 @@ static int ext4_reconfigure(struct fs_context *fc)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ext4_msg(sb, KERN_INFO, "re-mounted %pU %s. Quota mode: %s.",</div><div class='del'>-		 &amp;sb-&gt;s_uuid, sb_rdonly(sb) ? "ro" : "r/w",</div><div class='del'>-		 ext4_quota_mode(sb));</div><div class='add'>+	ext4_msg(sb, KERN_INFO, "re-mounted %pU%s.",</div><div class='add'>+		 &amp;sb-&gt;s_uuid,</div><div class='add'>+		 (old_ro != sb_rdonly(sb)) ? (sb_rdonly(sb) ? " ro" : " r/w") : "");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -6780,22 +6869,29 @@ static int ext4_statfs_project(struct super_block *sb,</div><div class='ctx'> 			     dquot-&gt;dq_dqb.dqb_bhardlimit);</div><div class='ctx'> 	limit &gt;&gt;= sb-&gt;s_blocksize_bits;</div><div class='ctx'> </div><div class='del'>-	if (limit &amp;&amp; buf-&gt;f_blocks &gt; limit) {</div><div class='add'>+	if (limit) {</div><div class='add'>+		uint64_t	remaining = 0;</div><div class='add'>+</div><div class='ctx'> 		curblock = (dquot-&gt;dq_dqb.dqb_curspace +</div><div class='ctx'> 			    dquot-&gt;dq_dqb.dqb_rsvspace) &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='del'>-		buf-&gt;f_blocks = limit;</div><div class='del'>-		buf-&gt;f_bfree = buf-&gt;f_bavail =</div><div class='del'>-			(buf-&gt;f_blocks &gt; curblock) ?</div><div class='del'>-			 (buf-&gt;f_blocks - curblock) : 0;</div><div class='add'>+		if (limit &gt; curblock)</div><div class='add'>+			remaining = limit - curblock;</div><div class='add'>+</div><div class='add'>+		buf-&gt;f_blocks = min(buf-&gt;f_blocks, limit);</div><div class='add'>+		buf-&gt;f_bfree = min(buf-&gt;f_bfree, remaining);</div><div class='add'>+		buf-&gt;f_bavail = min(buf-&gt;f_bavail, remaining);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	limit = min_not_zero(dquot-&gt;dq_dqb.dqb_isoftlimit,</div><div class='ctx'> 			     dquot-&gt;dq_dqb.dqb_ihardlimit);</div><div class='del'>-	if (limit &amp;&amp; buf-&gt;f_files &gt; limit) {</div><div class='del'>-		buf-&gt;f_files = limit;</div><div class='del'>-		buf-&gt;f_ffree =</div><div class='del'>-			(buf-&gt;f_files &gt; dquot-&gt;dq_dqb.dqb_curinodes) ?</div><div class='del'>-			 (buf-&gt;f_files - dquot-&gt;dq_dqb.dqb_curinodes) : 0;</div><div class='add'>+	if (limit) {</div><div class='add'>+		uint64_t	remaining = 0;</div><div class='add'>+</div><div class='add'>+		if (limit &gt; dquot-&gt;dq_dqb.dqb_curinodes)</div><div class='add'>+			remaining = limit - dquot-&gt;dq_dqb.dqb_curinodes;</div><div class='add'>+</div><div class='add'>+		buf-&gt;f_files = min(buf-&gt;f_files, limit);</div><div class='add'>+		buf-&gt;f_ffree = min(buf-&gt;f_ffree, remaining);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='hunk'>@@ -6864,6 +6960,10 @@ static int ext4_write_dquot(struct dquot *dquot)</div><div class='ctx'> 	if (IS_ERR(handle))</div><div class='ctx'> 		return PTR_ERR(handle);</div><div class='ctx'> 	ret = dquot_commit(dquot);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ext4_error_err(dquot-&gt;dq_sb, -ret,</div><div class='add'>+			       "Failed to commit dquot type %d",</div><div class='add'>+			       dquot-&gt;dq_id.type);</div><div class='ctx'> 	err = ext4_journal_stop(handle);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = err;</div><div class='hunk'>@@ -6880,6 +6980,10 @@ static int ext4_acquire_dquot(struct dquot *dquot)</div><div class='ctx'> 	if (IS_ERR(handle))</div><div class='ctx'> 		return PTR_ERR(handle);</div><div class='ctx'> 	ret = dquot_acquire(dquot);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ext4_error_err(dquot-&gt;dq_sb, -ret,</div><div class='add'>+			      "Failed to acquire dquot type %d",</div><div class='add'>+			      dquot-&gt;dq_id.type);</div><div class='ctx'> 	err = ext4_journal_stop(handle);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = err;</div><div class='hunk'>@@ -6890,18 +6994,39 @@ static int ext4_release_dquot(struct dquot *dquot)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, err;</div><div class='ctx'> 	handle_t *handle;</div><div class='add'>+	bool freeze_protected = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Trying to sb_start_intwrite() in a running transaction</div><div class='add'>+	 * can result in a deadlock. Further, running transactions</div><div class='add'>+	 * are already protected from freezing.</div><div class='add'>+	 */</div><div class='add'>+	if (!ext4_journal_current_handle()) {</div><div class='add'>+		sb_start_intwrite(dquot-&gt;dq_sb);</div><div class='add'>+		freeze_protected = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	handle = ext4_journal_start(dquot_to_inode(dquot), EXT4_HT_QUOTA,</div><div class='ctx'> 				    EXT4_QUOTA_DEL_BLOCKS(dquot-&gt;dq_sb));</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='ctx'> 		/* Release dquot anyway to avoid endless cycle in dqput() */</div><div class='ctx'> 		dquot_release(dquot);</div><div class='add'>+		if (freeze_protected)</div><div class='add'>+			sb_end_intwrite(dquot-&gt;dq_sb);</div><div class='ctx'> 		return PTR_ERR(handle);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = dquot_release(dquot);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ext4_error_err(dquot-&gt;dq_sb, -ret,</div><div class='add'>+			       "Failed to release dquot type %d",</div><div class='add'>+			       dquot-&gt;dq_id.type);</div><div class='ctx'> 	err = ext4_journal_stop(handle);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = err;</div><div class='add'>+</div><div class='add'>+	if (freeze_protected)</div><div class='add'>+		sb_end_intwrite(dquot-&gt;dq_sb);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7239,7 +7364,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 	}</div><div class='ctx'> 	lock_buffer(bh);</div><div class='ctx'> 	memcpy(bh-&gt;b_data+offset, data, len);</div><div class='del'>-	flush_dcache_page(bh-&gt;b_page);</div><div class='add'>+	flush_dcache_folio(bh-&gt;b_folio);</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> 	err = ext4_handle_dirty_metadata(handle, NULL, bh);</div><div class='ctx'> 	brelse(bh);</div><div class='hunk'>@@ -7319,7 +7444,7 @@ static void ext4_kill_sb(struct super_block *sb)</div><div class='ctx'> 	kill_block_super(sb);</div><div class='ctx'> </div><div class='ctx'> 	if (bdev_file)</div><div class='del'>-		fput(bdev_file);</div><div class='add'>+		bdev_fput(bdev_file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type ext4_fs_type = {</div><div class='hunk'>@@ -7328,16 +7453,14 @@ static struct file_system_type ext4_fs_type = {</div><div class='ctx'> 	.init_fs_context	= ext4_init_fs_context,</div><div class='ctx'> 	.parameters		= ext4_param_specs,</div><div class='ctx'> 	.kill_sb		= ext4_kill_sb,</div><div class='del'>-	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME |</div><div class='add'>+				  FS_LBS,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("ext4");</div><div class='ctx'> </div><div class='del'>-/* Shared across all ext4 file systems */</div><div class='del'>-wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ];</div><div class='del'>-</div><div class='ctx'> static int __init ext4_init_fs(void)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	ratelimit_state_init(&amp;ext4_mount_msg_ratelimit, 30 * HZ, 64);</div><div class='ctx'> 	ext4_li_info = NULL;</div><div class='hunk'>@@ -7345,9 +7468,6 @@ static int __init ext4_init_fs(void)</div><div class='ctx'> 	/* Build-time check for flags consistency */</div><div class='ctx'> 	ext4_check_flag_values();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; EXT4_WQ_HASH_SZ; i++)</div><div class='del'>-		init_waitqueue_head(&amp;ext4__ioend_wq[i]);</div><div class='del'>-</div><div class='ctx'> 	err = ext4_init_es();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -7434,6 +7554,5 @@ static void __exit ext4_exit_fs(void)</div><div class='ctx'> MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");</div><div class='ctx'> MODULE_DESCRIPTION("Fourth Extended Filesystem");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SOFTDEP("pre: crc32c");</div><div class='ctx'> module_init(ext4_init_fs)</div><div class='ctx'> module_exit(ext4_exit_fs)</div><div class='head'>diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c<br/>index 75bf1f88843c..645240cc0229 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/symlink.c</a></div><div class='hunk'>@@ -92,10 +92,12 @@ static const char *ext4_get_link(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	if (!dentry) {</div><div class='ctx'> 		bh = ext4_getblk(NULL, inode, 0, EXT4_GET_BLOCKS_CACHED_NOWAIT);</div><div class='del'>-		if (IS_ERR(bh))</div><div class='del'>-			return ERR_CAST(bh);</div><div class='del'>-		if (!bh || !ext4_buffer_uptodate(bh))</div><div class='add'>+		if (IS_ERR(bh) || !bh)</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='add'>+		if (!ext4_buffer_uptodate(bh)) {</div><div class='add'>+			brelse(bh);</div><div class='add'>+			return ERR_PTR(-ECHILD);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bh = ext4_bread(NULL, inode, 0, 0);</div><div class='ctx'> 		if (IS_ERR(bh))</div><div class='head'>diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c<br/>index 6d332dff79dd..0018e09b867e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/sysfs.c</a></div><div class='hunk'>@@ -29,7 +29,10 @@ typedef enum {</div><div class='ctx'> 	attr_trigger_test_error,</div><div class='ctx'> 	attr_first_error_time,</div><div class='ctx'> 	attr_last_error_time,</div><div class='add'>+	attr_clusters_in_group,</div><div class='add'>+	attr_mb_order,</div><div class='ctx'> 	attr_feature,</div><div class='add'>+	attr_pointer_pi,</div><div class='ctx'> 	attr_pointer_ui,</div><div class='ctx'> 	attr_pointer_ul,</div><div class='ctx'> 	attr_pointer_u64,</div><div class='hunk'>@@ -104,7 +107,7 @@ static ssize_t reserved_clusters_store(struct ext4_sb_info *sbi,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = kstrtoull(skip_spaces(buf), 0, &amp;val);</div><div class='del'>-	if (ret || val &gt;= clusters)</div><div class='add'>+	if (ret || val &gt;= clusters || (s64)val &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	atomic64_set(&amp;sbi-&gt;s_resv_clusters, val);</div><div class='hunk'>@@ -178,6 +181,9 @@ static struct ext4_attr ext4_attr_##_name = {			\</div><div class='ctx'> #define EXT4_RO_ATTR_ES_STRING(_name,_elname,_size)			\</div><div class='ctx'> 	EXT4_ATTR_STRING(_name, 0444, _size, ext4_super_block, _elname)</div><div class='ctx'> </div><div class='add'>+#define EXT4_RW_ATTR_SBI_PI(_name,_elname)      \</div><div class='add'>+	EXT4_ATTR_OFFSET(_name, 0644, pointer_pi, ext4_sb_info, _elname)</div><div class='add'>+</div><div class='ctx'> #define EXT4_RW_ATTR_SBI_UI(_name,_elname)	\</div><div class='ctx'> 	EXT4_ATTR_OFFSET(_name, 0644, pointer_ui, ext4_sb_info, _elname)</div><div class='ctx'> </div><div class='hunk'>@@ -207,23 +213,25 @@ EXT4_ATTR_FUNC(sra_exceeded_retry_limit, 0444);</div><div class='ctx'> </div><div class='ctx'> EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, inode_readahead,</div><div class='ctx'> 		 ext4_sb_info, s_inode_readahead_blks);</div><div class='add'>+EXT4_ATTR_OFFSET(mb_group_prealloc, 0644, clusters_in_group,</div><div class='add'>+		 ext4_sb_info, s_mb_group_prealloc);</div><div class='add'>+EXT4_ATTR_OFFSET(mb_best_avail_max_trim_order, 0644, mb_order,</div><div class='add'>+		 ext4_sb_info, s_mb_best_avail_max_trim_order);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(inode_goal, s_inode_goal);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb);</div><div class='ctx'> EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(err_ratelimit_burst, s_err_ratelimit_state.burst);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);</div><div class='del'>-EXT4_RW_ATTR_SBI_UI(mb_best_avail_max_trim_order, s_mb_best_avail_max_trim_order);</div><div class='add'>+EXT4_RW_ATTR_SBI_PI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);</div><div class='add'>+EXT4_RW_ATTR_SBI_PI(err_ratelimit_burst, s_err_ratelimit_state.burst);</div><div class='add'>+EXT4_RW_ATTR_SBI_PI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);</div><div class='add'>+EXT4_RW_ATTR_SBI_PI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);</div><div class='add'>+EXT4_RW_ATTR_SBI_PI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);</div><div class='add'>+EXT4_RW_ATTR_SBI_PI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);</div><div class='ctx'> #ifdef CONFIG_EXT4_DEBUG</div><div class='ctx'> EXT4_RW_ATTR_SBI_UL(simulate_fail, s_simulate_fail);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -246,6 +254,8 @@ EXT4_ATTR(journal_task, 0444, journal_task);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_prefetch, s_mb_prefetch);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UI(mb_prefetch_limit, s_mb_prefetch_limit);</div><div class='ctx'> EXT4_RW_ATTR_SBI_UL(last_trim_minblks, s_last_trim_minblks);</div><div class='add'>+EXT4_RW_ATTR_SBI_UI(sb_update_sec, s_sb_update_sec);</div><div class='add'>+EXT4_RW_ATTR_SBI_UI(sb_update_kb, s_sb_update_kb);</div><div class='ctx'> </div><div class='ctx'> static unsigned int old_bump_val = 128;</div><div class='ctx'> EXT4_ATTR_PTR(max_writeback_mb_bump, 0444, pointer_ui, &amp;old_bump_val);</div><div class='hunk'>@@ -297,6 +307,8 @@ static struct attribute *ext4_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(mb_prefetch),</div><div class='ctx'> 	ATTR_LIST(mb_prefetch_limit),</div><div class='ctx'> 	ATTR_LIST(last_trim_minblks),</div><div class='add'>+	ATTR_LIST(sb_update_sec),</div><div class='add'>+	ATTR_LIST(sb_update_kb),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(ext4);</div><div class='hunk'>@@ -320,6 +332,9 @@ EXT4_ATTR_FEATURE(fast_commit);</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE) &amp;&amp; defined(CONFIG_FS_ENCRYPTION)</div><div class='ctx'> EXT4_ATTR_FEATURE(encrypted_casefold);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+EXT4_ATTR_FEATURE(blocksize_gt_pagesize);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ext4_feat_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(lazy_itable_init),</div><div class='hunk'>@@ -340,6 +355,9 @@ static struct attribute *ext4_feat_attrs[] = {</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE) &amp;&amp; defined(CONFIG_FS_ENCRYPTION)</div><div class='ctx'> 	ATTR_LIST(encrypted_casefold),</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+	ATTR_LIST(blocksize_gt_pagesize),</div><div class='add'>+#endif</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(ext4_feat);</div><div class='hunk'>@@ -366,13 +384,45 @@ static ssize_t __print_tstamp(char *buf, __le32 lo, __u8 hi)</div><div class='ctx'> #define print_tstamp(buf, es, tstamp) \</div><div class='ctx'> 	__print_tstamp(buf, (es)-&gt;tstamp, (es)-&gt;tstamp ## _hi)</div><div class='ctx'> </div><div class='add'>+static ssize_t ext4_generic_attr_show(struct ext4_attr *a,</div><div class='add'>+				      struct ext4_sb_info *sbi, char *buf)</div><div class='add'>+{</div><div class='add'>+	void *ptr = calc_ptr(a, sbi);</div><div class='add'>+</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (a-&gt;attr_id) {</div><div class='add'>+	case attr_inode_readahead:</div><div class='add'>+	case attr_clusters_in_group:</div><div class='add'>+	case attr_mb_order:</div><div class='add'>+	case attr_pointer_pi:</div><div class='add'>+	case attr_pointer_ui:</div><div class='add'>+		if (a-&gt;attr_ptr == ptr_ext4_super_block_offset)</div><div class='add'>+			return sysfs_emit(buf, "%u\n", le32_to_cpup(ptr));</div><div class='add'>+		return sysfs_emit(buf, "%u\n", *((unsigned int *) ptr));</div><div class='add'>+	case attr_pointer_ul:</div><div class='add'>+		return sysfs_emit(buf, "%lu\n", *((unsigned long *) ptr));</div><div class='add'>+	case attr_pointer_u8:</div><div class='add'>+		return sysfs_emit(buf, "%u\n", *((unsigned char *) ptr));</div><div class='add'>+	case attr_pointer_u64:</div><div class='add'>+		if (a-&gt;attr_ptr == ptr_ext4_super_block_offset)</div><div class='add'>+			return sysfs_emit(buf, "%llu\n", le64_to_cpup(ptr));</div><div class='add'>+		return sysfs_emit(buf, "%llu\n", *((unsigned long long *) ptr));</div><div class='add'>+	case attr_pointer_string:</div><div class='add'>+		return sysfs_emit(buf, "%.*s\n", a-&gt;attr_size, (char *) ptr);</div><div class='add'>+	case attr_pointer_atomic:</div><div class='add'>+		return sysfs_emit(buf, "%d\n", atomic_read((atomic_t *) ptr));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t ext4_attr_show(struct kobject *kobj,</div><div class='ctx'> 			      struct attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_sb_info *sbi = container_of(kobj, struct ext4_sb_info,</div><div class='ctx'> 						s_kobj);</div><div class='ctx'> 	struct ext4_attr *a = container_of(attr, struct ext4_attr, attr);</div><div class='del'>-	void *ptr = calc_ptr(a, sbi);</div><div class='ctx'> </div><div class='ctx'> 	switch (a-&gt;attr_id) {</div><div class='ctx'> 	case attr_delayed_allocation_blocks:</div><div class='hunk'>@@ -391,45 +441,6 @@ static ssize_t ext4_attr_show(struct kobject *kobj,</div><div class='ctx'> 		return sysfs_emit(buf, "%llu\n",</div><div class='ctx'> 				(unsigned long long)</div><div class='ctx'> 			percpu_counter_sum(&amp;sbi-&gt;s_sra_exceeded_retry_limit));</div><div class='del'>-	case attr_inode_readahead:</div><div class='del'>-	case attr_pointer_ui:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		if (a-&gt;attr_ptr == ptr_ext4_super_block_offset)</div><div class='del'>-			return sysfs_emit(buf, "%u\n",</div><div class='del'>-					le32_to_cpup(ptr));</div><div class='del'>-		else</div><div class='del'>-			return sysfs_emit(buf, "%u\n",</div><div class='del'>-					*((unsigned int *) ptr));</div><div class='del'>-	case attr_pointer_ul:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		return sysfs_emit(buf, "%lu\n",</div><div class='del'>-				*((unsigned long *) ptr));</div><div class='del'>-	case attr_pointer_u8:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		return sysfs_emit(buf, "%u\n",</div><div class='del'>-				*((unsigned char *) ptr));</div><div class='del'>-	case attr_pointer_u64:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		if (a-&gt;attr_ptr == ptr_ext4_super_block_offset)</div><div class='del'>-			return sysfs_emit(buf, "%llu\n",</div><div class='del'>-					le64_to_cpup(ptr));</div><div class='del'>-		else</div><div class='del'>-			return sysfs_emit(buf, "%llu\n",</div><div class='del'>-					*((unsigned long long *) ptr));</div><div class='del'>-	case attr_pointer_string:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		return sysfs_emit(buf, "%.*s\n", a-&gt;attr_size,</div><div class='del'>-				(char *) ptr);</div><div class='del'>-	case attr_pointer_atomic:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		return sysfs_emit(buf, "%d\n",</div><div class='del'>-				atomic_read((atomic_t *) ptr));</div><div class='ctx'> 	case attr_feature:</div><div class='ctx'> 		return sysfs_emit(buf, "supported\n");</div><div class='ctx'> 	case attr_first_error_time:</div><div class='hunk'>@@ -438,29 +449,34 @@ static ssize_t ext4_attr_show(struct kobject *kobj,</div><div class='ctx'> 		return print_tstamp(buf, sbi-&gt;s_es, s_last_error_time);</div><div class='ctx'> 	case attr_journal_task:</div><div class='ctx'> 		return journal_task_show(sbi, buf);</div><div class='add'>+	default:</div><div class='add'>+		return ext4_generic_attr_show(a, sbi, buf);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ext4_attr_store(struct kobject *kobj,</div><div class='del'>-			       struct attribute *attr,</div><div class='del'>-			       const char *buf, size_t len)</div><div class='add'>+static ssize_t ext4_generic_attr_store(struct ext4_attr *a,</div><div class='add'>+				       struct ext4_sb_info *sbi,</div><div class='add'>+				       const char *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct ext4_sb_info *sbi = container_of(kobj, struct ext4_sb_info,</div><div class='del'>-						s_kobj);</div><div class='del'>-	struct ext4_attr *a = container_of(attr, struct ext4_attr, attr);</div><div class='del'>-	void *ptr = calc_ptr(a, sbi);</div><div class='del'>-	unsigned long t;</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int t;</div><div class='add'>+	unsigned long lt;</div><div class='add'>+	void *ptr = calc_ptr(a, sbi);</div><div class='add'>+</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (a-&gt;attr_id) {</div><div class='del'>-	case attr_reserved_clusters:</div><div class='del'>-		return reserved_clusters_store(sbi, buf, len);</div><div class='add'>+	case attr_pointer_pi:</div><div class='add'>+		ret = kstrtouint(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if ((int)t &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*((unsigned int *) ptr) = t;</div><div class='add'>+		return len;</div><div class='ctx'> 	case attr_pointer_ui:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		ret = kstrtoul(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+		ret = kstrtouint(skip_spaces(buf), 0, &amp;t);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		if (a-&gt;attr_ptr == ptr_ext4_super_block_offset)</div><div class='hunk'>@@ -468,20 +484,50 @@ static ssize_t ext4_attr_store(struct kobject *kobj,</div><div class='ctx'> 		else</div><div class='ctx'> 			*((unsigned int *) ptr) = t;</div><div class='ctx'> 		return len;</div><div class='add'>+	case attr_mb_order:</div><div class='add'>+		ret = kstrtouint(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (t &gt; 64)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*((unsigned int *) ptr) = t;</div><div class='add'>+		return len;</div><div class='add'>+	case attr_clusters_in_group:</div><div class='add'>+		ret = kstrtouint(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (t &gt; sbi-&gt;s_clusters_per_group)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*((unsigned int *) ptr) = t;</div><div class='add'>+		return len;</div><div class='ctx'> 	case attr_pointer_ul:</div><div class='del'>-		if (!ptr)</div><div class='del'>-			return 0;</div><div class='del'>-		ret = kstrtoul(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+		ret = kstrtoul(skip_spaces(buf), 0, &amp;lt);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		*((unsigned long *) ptr) = t;</div><div class='add'>+		*((unsigned long *) ptr) = lt;</div><div class='ctx'> 		return len;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ext4_attr_store(struct kobject *kobj,</div><div class='add'>+			       struct attribute *attr,</div><div class='add'>+			       const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ext4_sb_info *sbi = container_of(kobj, struct ext4_sb_info,</div><div class='add'>+						s_kobj);</div><div class='add'>+	struct ext4_attr *a = container_of(attr, struct ext4_attr, attr);</div><div class='add'>+</div><div class='add'>+	switch (a-&gt;attr_id) {</div><div class='add'>+	case attr_reserved_clusters:</div><div class='add'>+		return reserved_clusters_store(sbi, buf, len);</div><div class='ctx'> 	case attr_inode_readahead:</div><div class='ctx'> 		return inode_readahead_blks_store(sbi, buf, len);</div><div class='ctx'> 	case attr_trigger_test_error:</div><div class='ctx'> 		return trigger_test_error(sbi, buf, len);</div><div class='add'>+	default:</div><div class='add'>+		return ext4_generic_attr_store(a, sbi, buf, len);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ext4_sb_release(struct kobject *kobj)</div><div class='head'>diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c<br/>index 2f37e1ea3955..415d9c4d8a32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/verity.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/verity.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/verity.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/verity.c</a></div><div class='hunk'>@@ -76,17 +76,17 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,</div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		size_t n = min_t(size_t, count,</div><div class='ctx'> 				 PAGE_SIZE - offset_in_page(pos));</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		void *fsdata = NULL;</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='del'>-		res = aops-&gt;write_begin(NULL, mapping, pos, n, &amp;page, &amp;fsdata);</div><div class='add'>+		res = aops-&gt;write_begin(NULL, mapping, pos, n, &amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return res;</div><div class='ctx'> </div><div class='del'>-		memcpy_to_page(page, offset_in_page(pos), buf, n);</div><div class='add'>+		memcpy_to_folio(folio, offset_in_folio(folio, pos), buf, n);</div><div class='ctx'> </div><div class='del'>-		res = aops-&gt;write_end(NULL, mapping, pos, n, n, page, fsdata);</div><div class='add'>+		res = aops-&gt;write_end(NULL, mapping, pos, n, n, folio, fsdata);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			return res;</div><div class='ctx'> 		if (res != n)</div><div class='hunk'>@@ -302,7 +302,7 @@ static int ext4_get_verity_descriptor_location(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	end_lblk = le32_to_cpu(last_extent-&gt;ee_block) +</div><div class='ctx'> 		   ext4_ext_get_actual_len(last_extent);</div><div class='del'>-	desc_size_pos = (u64)end_lblk &lt;&lt; inode-&gt;i_blkbits;</div><div class='add'>+	desc_size_pos = EXT4_LBLK_TO_B(inode, end_lblk);</div><div class='ctx'> 	ext4_free_ext_path(path);</div><div class='ctx'> </div><div class='ctx'> 	if (desc_size_pos &lt; sizeof(desc_size_disk))</div><div class='hunk'>@@ -389,6 +389,8 @@ static int ext4_write_merkle_tree_block(struct inode *inode, const void *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct fsverity_operations ext4_verityops = {</div><div class='add'>+	.inode_info_offs	= (int)offsetof(struct ext4_inode_info, i_verity_info) -</div><div class='add'>+				  (int)offsetof(struct ext4_inode_info, vfs_inode),</div><div class='ctx'> 	.begin_enable_verity	= ext4_begin_enable_verity,</div><div class='ctx'> 	.end_enable_verity	= ext4_end_enable_verity,</div><div class='ctx'> 	.get_verity_descriptor	= ext4_get_verity_descriptor,</div><div class='head'>diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c<br/>index 82dc5e673d5c..2e02efbddaac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/xattr.c</a></div><div class='hunk'>@@ -139,12 +139,12 @@ static __le32 ext4_xattr_block_csum(struct inode *inode,</div><div class='ctx'> 	__u32 dummy_csum = 0;</div><div class='ctx'> 	int offset = offsetof(struct ext4_xattr_header, h_checksum);</div><div class='ctx'> </div><div class='del'>-	csum = ext4_chksum(sbi, sbi-&gt;s_csum_seed, (__u8 *)&amp;dsk_block_nr,</div><div class='add'>+	csum = ext4_chksum(sbi-&gt;s_csum_seed, (__u8 *)&amp;dsk_block_nr,</div><div class='ctx'> 			   sizeof(dsk_block_nr));</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)hdr, offset);</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)&amp;dummy_csum, sizeof(dummy_csum));</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)hdr, offset);</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)&amp;dummy_csum, sizeof(dummy_csum));</div><div class='ctx'> 	offset += sizeof(dummy_csum);</div><div class='del'>-	csum = ext4_chksum(sbi, csum, (__u8 *)hdr + offset,</div><div class='add'>+	csum = ext4_chksum(csum, (__u8 *)hdr + offset,</div><div class='ctx'> 			   EXT4_BLOCK_SIZE(inode-&gt;i_sb) - offset);</div><div class='ctx'> </div><div class='ctx'> 	return cpu_to_le32(csum);</div><div class='hunk'>@@ -156,7 +156,7 @@ static int ext4_xattr_block_csum_verify(struct inode *inode,</div><div class='ctx'> 	struct ext4_xattr_header *hdr = BHDR(bh);</div><div class='ctx'> 	int ret = 1;</div><div class='ctx'> </div><div class='del'>-	if (ext4_has_metadata_csum(inode-&gt;i_sb)) {</div><div class='add'>+	if (ext4_has_feature_metadata_csum(inode-&gt;i_sb)) {</div><div class='ctx'> 		lock_buffer(bh);</div><div class='ctx'> 		ret = (hdr-&gt;h_checksum == ext4_xattr_block_csum(inode,</div><div class='ctx'> 							bh-&gt;b_blocknr, hdr));</div><div class='hunk'>@@ -168,7 +168,7 @@ static int ext4_xattr_block_csum_verify(struct inode *inode,</div><div class='ctx'> static void ext4_xattr_block_csum_set(struct inode *inode,</div><div class='ctx'> 				      struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	if (ext4_has_metadata_csum(inode-&gt;i_sb))</div><div class='add'>+	if (ext4_has_feature_metadata_csum(inode-&gt;i_sb))</div><div class='ctx'> 		BHDR(bh)-&gt;h_checksum = ext4_xattr_block_csum(inode,</div><div class='ctx'> 						bh-&gt;b_blocknr, BHDR(bh));</div><div class='ctx'> }</div><div class='hunk'>@@ -251,6 +251,10 @@ check_xattrs(struct inode *inode, struct buffer_head *bh,</div><div class='ctx'> 			err_str = "invalid ea_ino";</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		}</div><div class='add'>+		if (ea_ino &amp;&amp; !size) {</div><div class='add'>+			err_str = "invalid size in ea xattr";</div><div class='add'>+			goto errout;</div><div class='add'>+		}</div><div class='ctx'> 		if (size &gt; EXT4_XATTR_SIZE_MAX) {</div><div class='ctx'> 			err_str = "e_value size too large";</div><div class='ctx'> 			goto errout;</div><div class='hunk'>@@ -308,7 +312,7 @@ __ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh,</div><div class='ctx'> 	__ext4_xattr_check_block((inode), (bh),  __func__, __LINE__)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+int</div><div class='ctx'> __xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header,</div><div class='ctx'> 			 void *end, const char *function, unsigned int line)</div><div class='ctx'> {</div><div class='hunk'>@@ -316,9 +320,6 @@ __xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header,</div><div class='ctx'> 			    function, line);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define xattr_check_inode(inode, header, end) \</div><div class='del'>-	__xattr_check_inode((inode), (header), (end), __func__, __LINE__)</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> xattr_find_entry(struct inode *inode, struct ext4_xattr_entry **pentry,</div><div class='ctx'> 		 void *end, int name_index, const char *name, int sorted)</div><div class='hunk'>@@ -341,7 +342,7 @@ xattr_find_entry(struct inode *inode, struct ext4_xattr_entry **pentry,</div><div class='ctx'> 			cmp = name_len - entry-&gt;e_name_len;</div><div class='ctx'> 		if (!cmp)</div><div class='ctx'> 			cmp = memcmp(name, entry-&gt;e_name, name_len);</div><div class='del'>-		if (cmp &lt;= 0 &amp;&amp; (sorted || cmp == 0))</div><div class='add'>+		if (!cmp || (cmp &lt; 0 &amp;&amp; sorted))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	*pentry = entry;</div><div class='hunk'>@@ -351,7 +352,7 @@ xattr_find_entry(struct inode *inode, struct ext4_xattr_entry **pentry,</div><div class='ctx'> static u32</div><div class='ctx'> ext4_xattr_inode_hash(struct ext4_sb_info *sbi, const void *buffer, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return ext4_chksum(sbi, sbi-&gt;s_csum_seed, buffer, size);</div><div class='add'>+	return ext4_chksum(sbi-&gt;s_csum_seed, buffer, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u64 ext4_xattr_inode_get_ref(struct inode *ea_inode)</div><div class='hunk'>@@ -458,7 +459,7 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,</div><div class='ctx'> 		ext4_set_inode_state(inode, EXT4_STATE_LUSTRE_EA_INODE);</div><div class='ctx'> 		ext4_xattr_inode_set_ref(inode, 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		inode_lock(inode);</div><div class='add'>+		inode_lock_nested(inode, I_MUTEX_XATTR);</div><div class='ctx'> 		inode-&gt;i_flags |= S_NOQUOTA;</div><div class='ctx'> 		inode_unlock(inode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -649,10 +650,7 @@ ext4_xattr_ibody_get(struct inode *inode, int name_index, const char *name,</div><div class='ctx'> 		return error;</div><div class='ctx'> 	raw_inode = ext4_raw_inode(&amp;iloc);</div><div class='ctx'> 	header = IHDR(inode, raw_inode);</div><div class='del'>-	end = (void *)raw_inode + EXT4_SB(inode-&gt;i_sb)-&gt;s_inode_size;</div><div class='del'>-	error = xattr_check_inode(inode, header, end);</div><div class='del'>-	if (error)</div><div class='del'>-		goto cleanup;</div><div class='add'>+	end = ITAIL(inode, raw_inode);</div><div class='ctx'> 	entry = IFIRST(header);</div><div class='ctx'> 	error = xattr_find_entry(inode, &amp;entry, end, name_index, name, 0);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -783,7 +781,6 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)</div><div class='ctx'> 	struct ext4_xattr_ibody_header *header;</div><div class='ctx'> 	struct ext4_inode *raw_inode;</div><div class='ctx'> 	struct ext4_iloc iloc;</div><div class='del'>-	void *end;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR))</div><div class='hunk'>@@ -793,14 +790,9 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	raw_inode = ext4_raw_inode(&amp;iloc);</div><div class='ctx'> 	header = IHDR(inode, raw_inode);</div><div class='del'>-	end = (void *)raw_inode + EXT4_SB(inode-&gt;i_sb)-&gt;s_inode_size;</div><div class='del'>-	error = xattr_check_inode(inode, header, end);</div><div class='del'>-	if (error)</div><div class='del'>-		goto cleanup;</div><div class='ctx'> 	error = ext4_xattr_list_entries(dentry, IFIRST(header),</div><div class='ctx'> 					buffer, buffer_size);</div><div class='ctx'> </div><div class='del'>-cleanup:</div><div class='ctx'> 	brelse(iloc.bh);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -868,7 +860,6 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *usage)</div><div class='ctx'> 	struct ext4_xattr_ibody_header *header;</div><div class='ctx'> 	struct ext4_xattr_entry *entry;</div><div class='ctx'> 	qsize_t ea_inode_refs = 0;</div><div class='del'>-	void *end;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held_read(&amp;EXT4_I(inode)-&gt;xattr_sem);</div><div class='hunk'>@@ -879,10 +870,6 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *usage)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		raw_inode = ext4_raw_inode(&amp;iloc);</div><div class='ctx'> 		header = IHDR(inode, raw_inode);</div><div class='del'>-		end = (void *)raw_inode + EXT4_SB(inode-&gt;i_sb)-&gt;s_inode_size;</div><div class='del'>-		ret = xattr_check_inode(inode, header, end);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='ctx'> </div><div class='ctx'> 		for (entry = IFIRST(header); !IS_LAST_ENTRY(entry);</div><div class='ctx'> 		     entry = EXT4_XATTR_NEXT(entry))</div><div class='hunk'>@@ -979,7 +966,7 @@ int __ext4_xattr_set_credits(struct super_block *sb, struct inode *inode,</div><div class='ctx'> 	 * so we need to reserve credits for this eventuality</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (inode &amp;&amp; ext4_has_inline_data(inode))</div><div class='del'>-		credits += ext4_writepage_trans_blocks(inode) + 1;</div><div class='add'>+		credits += ext4_chunk_trans_extent(inode, 1) + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* We are done if ea_inode feature is not enabled. */</div><div class='ctx'> 	if (!ext4_has_feature_ea_inode(sb))</div><div class='hunk'>@@ -1036,23 +1023,27 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,</div><div class='ctx'> 				       int ref_change)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_iloc iloc;</div><div class='del'>-	s64 ref_count;</div><div class='add'>+	u64 ref_count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	inode_lock(ea_inode);</div><div class='add'>+	inode_lock_nested(ea_inode, I_MUTEX_XATTR);</div><div class='ctx'> </div><div class='ctx'> 	ret = ext4_reserve_inode_write(handle, ea_inode, &amp;iloc);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ref_count = ext4_xattr_inode_get_ref(ea_inode);</div><div class='add'>+	if ((ref_count == 0 &amp;&amp; ref_change &lt; 0) || (ref_count == U64_MAX &amp;&amp; ref_change &gt; 0)) {</div><div class='add'>+		ext4_error_inode(ea_inode, __func__, __LINE__, 0,</div><div class='add'>+			"EA inode %lu ref wraparound: ref_count=%lld ref_change=%d",</div><div class='add'>+			ea_inode-&gt;i_ino, ref_count, ref_change);</div><div class='add'>+		ret = -EFSCORRUPTED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	ref_count += ref_change;</div><div class='ctx'> 	ext4_xattr_inode_set_ref(ea_inode, ref_count);</div><div class='ctx'> </div><div class='ctx'> 	if (ref_change &gt; 0) {</div><div class='del'>-		WARN_ONCE(ref_count &lt;= 0, "EA inode %lu ref_count=%lld",</div><div class='del'>-			  ea_inode-&gt;i_ino, ref_count);</div><div class='del'>-</div><div class='ctx'> 		if (ref_count == 1) {</div><div class='ctx'> 			WARN_ONCE(ea_inode-&gt;i_nlink, "EA inode %lu i_nlink=%u",</div><div class='ctx'> 				  ea_inode-&gt;i_ino, ea_inode-&gt;i_nlink);</div><div class='hunk'>@@ -1061,9 +1052,6 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,</div><div class='ctx'> 			ext4_orphan_del(handle, ea_inode);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		WARN_ONCE(ref_count &lt; 0, "EA inode %lu ref_count=%lld",</div><div class='del'>-			  ea_inode-&gt;i_ino, ref_count);</div><div class='del'>-</div><div class='ctx'> 		if (ref_count == 0) {</div><div class='ctx'> 			WARN_ONCE(ea_inode-&gt;i_nlink != 1,</div><div class='ctx'> 				  "EA inode %lu i_nlink=%u",</div><div class='hunk'>@@ -1176,15 +1164,28 @@ ext4_xattr_inode_dec_ref_all(handle_t *handle, struct inode *parent,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ea_inode;</div><div class='ctx'> 	struct ext4_xattr_entry *entry;</div><div class='add'>+	struct ext4_iloc iloc;</div><div class='ctx'> 	bool dirty = false;</div><div class='ctx'> 	unsigned int ea_ino;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int credits;</div><div class='add'>+	void *end;</div><div class='add'>+</div><div class='add'>+	if (block_csum)</div><div class='add'>+		end = (void *)bh-&gt;b_data + bh-&gt;b_size;</div><div class='add'>+	else {</div><div class='add'>+		err = ext4_get_inode_loc(parent, &amp;iloc);</div><div class='add'>+		if (err) {</div><div class='add'>+			EXT4_ERROR_INODE(parent, "parent inode loc (error %d)", err);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		end = (void *)ext4_raw_inode(&amp;iloc) + EXT4_SB(parent-&gt;i_sb)-&gt;s_inode_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* One credit for dec ref on ea_inode, one for orphan list addition, */</div><div class='ctx'> 	credits = 2 + extra_credits;</div><div class='ctx'> </div><div class='del'>-	for (entry = first; !IS_LAST_ENTRY(entry);</div><div class='add'>+	for (entry = first; (void *)entry &lt; end &amp;&amp; !IS_LAST_ENTRY(entry);</div><div class='ctx'> 	     entry = EXT4_XATTR_NEXT(entry)) {</div><div class='ctx'> 		if (!entry-&gt;e_value_inum)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1433,6 +1434,12 @@ retry:</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(bh-&gt;b_data, buf, csize);</div><div class='add'>+		/*</div><div class='add'>+		 * Zero out block tail to avoid writing uninitialized memory</div><div class='add'>+		 * to disk.</div><div class='add'>+		 */</div><div class='add'>+		if (csize &lt; blocksize)</div><div class='add'>+			memset(bh-&gt;b_data + csize, 0, blocksize - csize);</div><div class='ctx'> 		set_buffer_uptodate(bh);</div><div class='ctx'> 		ext4_handle_dirty_metadata(handle, ea_inode, bh);</div><div class='ctx'> </div><div class='hunk'>@@ -1532,7 +1539,7 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value,</div><div class='ctx'> 	WARN_ON_ONCE(ext4_handle_valid(journal_current_handle()) &amp;&amp;</div><div class='ctx'> 		     !(current-&gt;flags &amp; PF_MEMALLOC_NOFS));</div><div class='ctx'> </div><div class='del'>-	ea_data = kvmalloc(value_len, GFP_KERNEL);</div><div class='add'>+	ea_data = kvmalloc(value_len, GFP_NOFS);</div><div class='ctx'> 	if (!ea_data) {</div><div class='ctx'> 		mb_cache_entry_put(ea_inode_cache, ce);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1565,46 +1572,49 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value,</div><div class='ctx'> /*</div><div class='ctx'>  * Add value of the EA in an inode.</div><div class='ctx'>  */</div><div class='del'>-static int ext4_xattr_inode_lookup_create(handle_t *handle, struct inode *inode,</div><div class='del'>-					  const void *value, size_t value_len,</div><div class='del'>-					  struct inode **ret_inode)</div><div class='add'>+static struct inode *ext4_xattr_inode_lookup_create(handle_t *handle,</div><div class='add'>+		struct inode *inode, const void *value, size_t value_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ea_inode;</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Account inode &amp; space to quota even if sharing... */</div><div class='add'>+	err = ext4_xattr_inode_alloc_quota(inode, value_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='ctx'> 	hash = ext4_xattr_inode_hash(EXT4_SB(inode-&gt;i_sb), value, value_len);</div><div class='ctx'> 	ea_inode = ext4_xattr_inode_cache_find(inode, value, value_len, hash);</div><div class='ctx'> 	if (ea_inode) {</div><div class='ctx'> 		err = ext4_xattr_inode_inc_ref(handle, ea_inode);</div><div class='del'>-		if (err) {</div><div class='del'>-			iput(ea_inode);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*ret_inode = ea_inode;</div><div class='del'>-		return 0;</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_err;</div><div class='add'>+		return ea_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create an inode for the EA value */</div><div class='ctx'> 	ea_inode = ext4_xattr_inode_create(handle, inode, hash);</div><div class='del'>-	if (IS_ERR(ea_inode))</div><div class='del'>-		return PTR_ERR(ea_inode);</div><div class='add'>+	if (IS_ERR(ea_inode)) {</div><div class='add'>+		ext4_xattr_inode_free_quota(inode, NULL, value_len);</div><div class='add'>+		return ea_inode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = ext4_xattr_inode_write(handle, ea_inode, value, value_len);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (ext4_xattr_inode_dec_ref(handle, ea_inode))</div><div class='ctx'> 			ext4_warning_inode(ea_inode, "cleanup dec ref error %d", err);</div><div class='del'>-		iput(ea_inode);</div><div class='del'>-		return err;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (EA_INODE_CACHE(inode))</div><div class='ctx'> 		mb_cache_entry_create(EA_INODE_CACHE(inode), GFP_NOFS, hash,</div><div class='ctx'> 				      ea_inode-&gt;i_ino, true /* reusable */);</div><div class='del'>-</div><div class='del'>-	*ret_inode = ea_inode;</div><div class='del'>-	return 0;</div><div class='add'>+	return ea_inode;</div><div class='add'>+out_err:</div><div class='add'>+	iput(ea_inode);</div><div class='add'>+	ext4_xattr_inode_free_quota(inode, NULL, value_len);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1616,6 +1626,7 @@ static int ext4_xattr_inode_lookup_create(handle_t *handle, struct inode *inode,</div><div class='ctx'> static int ext4_xattr_set_entry(struct ext4_xattr_info *i,</div><div class='ctx'> 				struct ext4_xattr_search *s,</div><div class='ctx'> 				handle_t *handle, struct inode *inode,</div><div class='add'>+				struct inode *new_ea_inode,</div><div class='ctx'> 				bool is_block)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_xattr_entry *last, *next;</div><div class='hunk'>@@ -1623,7 +1634,6 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,</div><div class='ctx'> 	size_t min_offs = s-&gt;end - s-&gt;base, name_len = strlen(i-&gt;name);</div><div class='ctx'> 	int in_inode = i-&gt;in_inode;</div><div class='ctx'> 	struct inode *old_ea_inode = NULL;</div><div class='del'>-	struct inode *new_ea_inode = NULL;</div><div class='ctx'> 	size_t old_size, new_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1708,43 +1718,11 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,</div><div class='ctx'> 			old_ea_inode = NULL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	if (i-&gt;value &amp;&amp; in_inode) {</div><div class='del'>-		WARN_ON_ONCE(!i-&gt;value_len);</div><div class='del'>-</div><div class='del'>-		ret = ext4_xattr_inode_alloc_quota(inode, i-&gt;value_len);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ret = ext4_xattr_inode_lookup_create(handle, inode, i-&gt;value,</div><div class='del'>-						     i-&gt;value_len,</div><div class='del'>-						     &amp;new_ea_inode);</div><div class='del'>-		if (ret) {</div><div class='del'>-			new_ea_inode = NULL;</div><div class='del'>-			ext4_xattr_inode_free_quota(inode, NULL, i-&gt;value_len);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (old_ea_inode) {</div><div class='ctx'> 		/* We are ready to release ref count on the old_ea_inode. */</div><div class='ctx'> 		ret = ext4_xattr_inode_dec_ref(handle, old_ea_inode);</div><div class='del'>-		if (ret) {</div><div class='del'>-			/* Release newly required ref count on new_ea_inode. */</div><div class='del'>-			if (new_ea_inode) {</div><div class='del'>-				int err;</div><div class='del'>-</div><div class='del'>-				err = ext4_xattr_inode_dec_ref(handle,</div><div class='del'>-							       new_ea_inode);</div><div class='del'>-				if (err)</div><div class='del'>-					ext4_warning_inode(new_ea_inode,</div><div class='del'>-						  "dec ref new_ea_inode err=%d",</div><div class='del'>-						  err);</div><div class='del'>-				ext4_xattr_inode_free_quota(inode, new_ea_inode,</div><div class='del'>-							    i-&gt;value_len);</div><div class='del'>-			}</div><div class='add'>+		if (ret)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		ext4_xattr_inode_free_quota(inode, old_ea_inode,</div><div class='ctx'> 					    le32_to_cpu(here-&gt;e_value_size));</div><div class='hunk'>@@ -1868,7 +1846,6 @@ update_hash:</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	iput(old_ea_inode);</div><div class='del'>-	iput(new_ea_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1931,9 +1908,21 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	size_t old_ea_inode_quota = 0;</div><div class='ctx'> 	unsigned int ea_ino;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define header(x) ((struct ext4_xattr_header *)(x))</div><div class='ctx'> </div><div class='add'>+	/* If we need EA inode, prepare it before locking the buffer */</div><div class='add'>+	if (i-&gt;value &amp;&amp; i-&gt;in_inode) {</div><div class='add'>+		WARN_ON_ONCE(!i-&gt;value_len);</div><div class='add'>+</div><div class='add'>+		ea_inode = ext4_xattr_inode_lookup_create(handle, inode,</div><div class='add'>+					i-&gt;value, i-&gt;value_len);</div><div class='add'>+		if (IS_ERR(ea_inode)) {</div><div class='add'>+			error = PTR_ERR(ea_inode);</div><div class='add'>+			ea_inode = NULL;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (s-&gt;base) {</div><div class='ctx'> 		int offset = (char *)s-&gt;here - bs-&gt;bh-&gt;b_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1942,6 +1931,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,</div><div class='ctx'> 						      EXT4_JTR_NONE);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto cleanup;</div><div class='add'>+</div><div class='ctx'> 		lock_buffer(bs-&gt;bh);</div><div class='ctx'> </div><div class='ctx'> 		if (header(s-&gt;base)-&gt;h_refcount == cpu_to_le32(1)) {</div><div class='hunk'>@@ -1968,7 +1958,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			}</div><div class='ctx'> 			ea_bdebug(bs-&gt;bh, "modifying in-place");</div><div class='ctx'> 			error = ext4_xattr_set_entry(i, s, handle, inode,</div><div class='del'>-						     true /* is_block */);</div><div class='add'>+					     ea_inode, true /* is_block */);</div><div class='ctx'> 			ext4_xattr_block_csum_set(inode, bs-&gt;bh);</div><div class='ctx'> 			unlock_buffer(bs-&gt;bh);</div><div class='ctx'> 			if (error == -EFSCORRUPTED)</div><div class='hunk'>@@ -2036,33 +2026,22 @@ clone_block:</div><div class='ctx'> 		s-&gt;end = s-&gt;base + sb-&gt;s_blocksize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = ext4_xattr_set_entry(i, s, handle, inode, true /* is_block */);</div><div class='add'>+	error = ext4_xattr_set_entry(i, s, handle, inode, ea_inode,</div><div class='add'>+				     true /* is_block */);</div><div class='ctx'> 	if (error == -EFSCORRUPTED)</div><div class='ctx'> 		goto bad_block;</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (i-&gt;value &amp;&amp; s-&gt;here-&gt;e_value_inum) {</div><div class='del'>-		/*</div><div class='del'>-		 * A ref count on ea_inode has been taken as part of the call to</div><div class='del'>-		 * ext4_xattr_set_entry() above. We would like to drop this</div><div class='del'>-		 * extra ref but we have to wait until the xattr block is</div><div class='del'>-		 * initialized and has its own ref count on the ea_inode.</div><div class='del'>-		 */</div><div class='del'>-		ea_ino = le32_to_cpu(s-&gt;here-&gt;e_value_inum);</div><div class='del'>-		error = ext4_xattr_inode_iget(inode, ea_ino,</div><div class='del'>-					      le32_to_cpu(s-&gt;here-&gt;e_hash),</div><div class='del'>-					      &amp;ea_inode);</div><div class='del'>-		if (error) {</div><div class='del'>-			ea_inode = NULL;</div><div class='add'>+inserted:</div><div class='add'>+	if (!IS_LAST_ENTRY(s-&gt;first)) {</div><div class='add'>+		new_bh = ext4_xattr_block_cache_find(inode, header(s-&gt;base), &amp;ce);</div><div class='add'>+		if (IS_ERR(new_bh)) {</div><div class='add'>+			error = PTR_ERR(new_bh);</div><div class='add'>+			new_bh = NULL;</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-inserted:</div><div class='del'>-	if (!IS_LAST_ENTRY(s-&gt;first)) {</div><div class='del'>-		new_bh = ext4_xattr_block_cache_find(inode, header(s-&gt;base),</div><div class='del'>-						     &amp;ce);</div><div class='ctx'> 		if (new_bh) {</div><div class='ctx'> 			/* We found an identical block in the cache. */</div><div class='ctx'> 			if (new_bh == bs-&gt;bh)</div><div class='hunk'>@@ -2211,17 +2190,16 @@ getblk_failed:</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='ctx'> 	if (ea_inode) {</div><div class='del'>-		int error2;</div><div class='del'>-</div><div class='del'>-		error2 = ext4_xattr_inode_dec_ref(handle, ea_inode);</div><div class='del'>-		if (error2)</div><div class='del'>-			ext4_warning_inode(ea_inode, "dec ref error=%d",</div><div class='del'>-					   error2);</div><div class='add'>+		if (error) {</div><div class='add'>+			int error2;</div><div class='ctx'> </div><div class='del'>-		/* If there was an error, revert the quota charge. */</div><div class='del'>-		if (error)</div><div class='add'>+			error2 = ext4_xattr_inode_dec_ref(handle, ea_inode);</div><div class='add'>+			if (error2)</div><div class='add'>+				ext4_warning_inode(ea_inode, "dec ref error=%d",</div><div class='add'>+						   error2);</div><div class='ctx'> 			ext4_xattr_inode_free_quota(inode, ea_inode,</div><div class='ctx'> 						    i_size_read(ea_inode));</div><div class='add'>+		}</div><div class='ctx'> 		iput(ea_inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ce)</div><div class='hunk'>@@ -2258,11 +2236,8 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i,</div><div class='ctx'> 	header = IHDR(inode, raw_inode);</div><div class='ctx'> 	is-&gt;s.base = is-&gt;s.first = IFIRST(header);</div><div class='ctx'> 	is-&gt;s.here = is-&gt;s.first;</div><div class='del'>-	is-&gt;s.end = (void *)raw_inode + EXT4_SB(inode-&gt;i_sb)-&gt;s_inode_size;</div><div class='add'>+	is-&gt;s.end = ITAIL(inode, raw_inode);</div><div class='ctx'> 	if (ext4_test_inode_state(inode, EXT4_STATE_XATTR)) {</div><div class='del'>-		error = xattr_check_inode(inode, header, is-&gt;s.end);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='ctx'> 		/* Find the named attribute. */</div><div class='ctx'> 		error = xattr_find_entry(inode, &amp;is-&gt;s.here, is-&gt;s.end,</div><div class='ctx'> 					 i-&gt;name_index, i-&gt;name, 0);</div><div class='hunk'>@@ -2279,14 +2254,38 @@ int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext4_xattr_ibody_header *header;</div><div class='ctx'> 	struct ext4_xattr_search *s = &amp;is-&gt;s;</div><div class='add'>+	struct inode *ea_inode = NULL;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (!EXT4_INODE_HAS_XATTR_SPACE(inode))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	error = ext4_xattr_set_entry(i, s, handle, inode, false /* is_block */);</div><div class='del'>-	if (error)</div><div class='add'>+	/* If we need EA inode, prepare it before locking the buffer */</div><div class='add'>+	if (i-&gt;value &amp;&amp; i-&gt;in_inode) {</div><div class='add'>+		WARN_ON_ONCE(!i-&gt;value_len);</div><div class='add'>+</div><div class='add'>+		ea_inode = ext4_xattr_inode_lookup_create(handle, inode,</div><div class='add'>+					i-&gt;value, i-&gt;value_len);</div><div class='add'>+		if (IS_ERR(ea_inode))</div><div class='add'>+			return PTR_ERR(ea_inode);</div><div class='add'>+	}</div><div class='add'>+	error = ext4_xattr_set_entry(i, s, handle, inode, ea_inode,</div><div class='add'>+				     false /* is_block */);</div><div class='add'>+	if (error) {</div><div class='add'>+		if (ea_inode) {</div><div class='add'>+			int error2;</div><div class='add'>+</div><div class='add'>+			error2 = ext4_xattr_inode_dec_ref(handle, ea_inode);</div><div class='add'>+			if (error2)</div><div class='add'>+				ext4_warning_inode(ea_inode, "dec ref error=%d",</div><div class='add'>+						   error2);</div><div class='add'>+</div><div class='add'>+			ext4_xattr_inode_free_quota(inode, ea_inode,</div><div class='add'>+						    i_size_read(ea_inode));</div><div class='add'>+			iput(ea_inode);</div><div class='add'>+		}</div><div class='ctx'> 		return error;</div><div class='add'>+	}</div><div class='ctx'> 	header = IHDR(inode, ext4_raw_inode(&amp;is-&gt;iloc));</div><div class='ctx'> 	if (!IS_LAST_ENTRY(s-&gt;first)) {</div><div class='ctx'> 		header-&gt;h_magic = cpu_to_le32(EXT4_XATTR_MAGIC);</div><div class='hunk'>@@ -2295,6 +2294,7 @@ int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		header-&gt;h_magic = cpu_to_le32(0);</div><div class='ctx'> 		ext4_clear_inode_state(inode, EXT4_STATE_XATTR);</div><div class='ctx'> 	}</div><div class='add'>+	iput(ea_inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2557,6 +2557,8 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 		error = ext4_xattr_set_handle(handle, inode, name_index, name,</div><div class='ctx'> 					      value, value_len, flags);</div><div class='add'>+		ext4_fc_mark_ineligible(inode-&gt;i_sb, EXT4_FC_REASON_XATTR,</div><div class='add'>+					handle);</div><div class='ctx'> 		error2 = ext4_journal_stop(handle);</div><div class='ctx'> 		if (error == -ENOSPC &amp;&amp;</div><div class='ctx'> 		    ext4_should_retry_alloc(sb, &amp;retries))</div><div class='hunk'>@@ -2564,7 +2566,6 @@ retry:</div><div class='ctx'> 		if (error == 0)</div><div class='ctx'> 			error = error2;</div><div class='ctx'> 	}</div><div class='del'>-	ext4_fc_mark_ineligible(inode-&gt;i_sb, EXT4_FC_REASON_XATTR, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -2783,14 +2784,10 @@ retry:</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	base = IFIRST(header);</div><div class='del'>-	end = (void *)raw_inode + EXT4_SB(inode-&gt;i_sb)-&gt;s_inode_size;</div><div class='add'>+	end = ITAIL(inode, raw_inode);</div><div class='ctx'> 	min_offs = end - base;</div><div class='ctx'> 	total_ino = sizeof(struct ext4_xattr_ibody_header) + sizeof(u32);</div><div class='ctx'> </div><div class='del'>-	error = xattr_check_inode(inode, header, end);</div><div class='del'>-	if (error)</div><div class='del'>-		goto cleanup;</div><div class='del'>-</div><div class='ctx'> 	ifree = ext4_xattr_free_space(base, &amp;min_offs, base, &amp;total_ino);</div><div class='ctx'> 	if (ifree &gt;= isize_diff)</div><div class='ctx'> 		goto shift;</div><div class='hunk'>@@ -2877,33 +2874,31 @@ ext4_expand_inode_array(struct ext4_xattr_inode_array **ea_inode_array,</div><div class='ctx'> 	if (*ea_inode_array == NULL) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Start with 15 inodes, so it fits into a power-of-two size.</div><div class='del'>-		 * If *ea_inode_array is NULL, this is essentially offsetof()</div><div class='ctx'> 		 */</div><div class='del'>-		(*ea_inode_array) =</div><div class='del'>-			kmalloc(offsetof(struct ext4_xattr_inode_array,</div><div class='del'>-					 inodes[EIA_MASK]),</div><div class='del'>-				GFP_NOFS);</div><div class='add'>+		(*ea_inode_array) = kmalloc(</div><div class='add'>+			struct_size(*ea_inode_array, inodes, EIA_MASK),</div><div class='add'>+			GFP_NOFS);</div><div class='ctx'> 		if (*ea_inode_array == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		(*ea_inode_array)-&gt;count = 0;</div><div class='ctx'> 	} else if (((*ea_inode_array)-&gt;count &amp; EIA_MASK) == EIA_MASK) {</div><div class='ctx'> 		/* expand the array once all 15 + n * 16 slots are full */</div><div class='ctx'> 		struct ext4_xattr_inode_array *new_array = NULL;</div><div class='del'>-		int count = (*ea_inode_array)-&gt;count;</div><div class='ctx'> </div><div class='del'>-		/* if new_array is NULL, this is essentially offsetof() */</div><div class='ctx'> 		new_array = kmalloc(</div><div class='del'>-				offsetof(struct ext4_xattr_inode_array,</div><div class='del'>-					 inodes[count + EIA_INCR]),</div><div class='del'>-				GFP_NOFS);</div><div class='add'>+			struct_size(*ea_inode_array, inodes,</div><div class='add'>+				    (*ea_inode_array)-&gt;count + EIA_INCR),</div><div class='add'>+			GFP_NOFS);</div><div class='ctx'> 		if (new_array == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		memcpy(new_array, *ea_inode_array,</div><div class='del'>-		       offsetof(struct ext4_xattr_inode_array, inodes[count]));</div><div class='add'>+		       struct_size(*ea_inode_array, inodes,</div><div class='add'>+				   (*ea_inode_array)-&gt;count));</div><div class='ctx'> 		kfree(*ea_inode_array);</div><div class='ctx'> 		*ea_inode_array = new_array;</div><div class='ctx'> 	}</div><div class='del'>-	(*ea_inode_array)-&gt;inodes[(*ea_inode_array)-&gt;count++] = inode;</div><div class='add'>+	(*ea_inode_array)-&gt;count++;</div><div class='add'>+	(*ea_inode_array)-&gt;inodes[(*ea_inode_array)-&gt;count - 1] = inode;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3034,8 +3029,6 @@ void ext4_xattr_inode_array_free(struct ext4_xattr_inode_array *ea_inode_array)</div><div class='ctx'>  *</div><div class='ctx'>  * Create a new entry in the extended attribute block cache, and insert</div><div class='ctx'>  * it unless such an entry is already in the cache.</div><div class='del'>- *</div><div class='del'>- * Returns 0, or a negative error number on failure.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> ext4_xattr_block_cache_insert(struct mb_cache *ea_block_cache,</div><div class='hunk'>@@ -3063,8 +3056,7 @@ ext4_xattr_block_cache_insert(struct mb_cache *ea_block_cache,</div><div class='ctx'>  *</div><div class='ctx'>  * Compare two extended attribute blocks for equality.</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 if the blocks are equal, 1 if they differ, and</div><div class='del'>- * a negative error number on errors.</div><div class='add'>+ * Returns 0 if the blocks are equal, 1 if they differ.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> ext4_xattr_cmp(struct ext4_xattr_header *header1,</div><div class='hunk'>@@ -3103,8 +3095,8 @@ ext4_xattr_cmp(struct ext4_xattr_header *header1,</div><div class='ctx'>  *</div><div class='ctx'>  * Find an identical extended attribute block.</div><div class='ctx'>  *</div><div class='del'>- * Returns a pointer to the block found, or NULL if such a block was</div><div class='del'>- * not found or an error occurred.</div><div class='add'>+ * Returns a pointer to the block found, or NULL if such a block was not</div><div class='add'>+ * found, or an error pointer if an error occurred while reading ea block.</div><div class='ctx'>  */</div><div class='ctx'> static struct buffer_head *</div><div class='ctx'> ext4_xattr_block_cache_find(struct inode *inode,</div><div class='hunk'>@@ -3126,11 +3118,11 @@ ext4_xattr_block_cache_find(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		bh = ext4_sb_bread(inode-&gt;i_sb, ce-&gt;e_value, REQ_PRIO);</div><div class='ctx'> 		if (IS_ERR(bh)) {</div><div class='del'>-			if (PTR_ERR(bh) == -ENOMEM)</div><div class='del'>-				return NULL;</div><div class='del'>-			bh = NULL;</div><div class='del'>-			EXT4_ERROR_INODE(inode, "block %lu read error",</div><div class='del'>-					 (unsigned long)ce-&gt;e_value);</div><div class='add'>+			if (PTR_ERR(bh) != -ENOMEM)</div><div class='add'>+				EXT4_ERROR_INODE(inode, "block %lu read error",</div><div class='add'>+						 (unsigned long)ce-&gt;e_value);</div><div class='add'>+			mb_cache_entry_put(ea_block_cache, ce);</div><div class='add'>+			return bh;</div><div class='ctx'> 		} else if (ext4_xattr_cmp(header, BHDR(bh)) == 0) {</div><div class='ctx'> 			*pce = ce;</div><div class='ctx'> 			return bh;</div><div class='head'>diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h<br/>index bd97c4aa8177..1fedf44d4fb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ext4/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ext4/xattr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ext4/xattr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ext4/xattr.h</a></div><div class='hunk'>@@ -32,8 +32,7 @@ struct ext4_xattr_header {</div><div class='ctx'> 	__le32	h_refcount;	/* reference count */</div><div class='ctx'> 	__le32	h_blocks;	/* number of disk blocks used */</div><div class='ctx'> 	__le32	h_hash;		/* hash value of all attributes */</div><div class='del'>-	__le32	h_checksum;	/* crc32c(uuid+id+xattrblock) */</div><div class='del'>-				/* id = inum if refcount=1, blknum otherwise */</div><div class='add'>+	__le32	h_checksum;	/* crc32c(uuid+blknum+xattrblock) */</div><div class='ctx'> 	__u32	h_reserved[3];	/* zero right now */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +67,9 @@ struct ext4_xattr_entry {</div><div class='ctx'> 		((void *)raw_inode + \</div><div class='ctx'> 		EXT4_GOOD_OLD_INODE_SIZE + \</div><div class='ctx'> 		EXT4_I(inode)-&gt;i_extra_isize))</div><div class='add'>+#define ITAIL(inode, raw_inode) \</div><div class='add'>+	((void *)(raw_inode) + \</div><div class='add'>+	 EXT4_SB((inode)-&gt;i_sb)-&gt;s_inode_size)</div><div class='ctx'> #define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -130,8 +132,8 @@ struct ext4_xattr_ibody_find {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ext4_xattr_inode_array {</div><div class='del'>-	unsigned int count;		/* # of used items in the array */</div><div class='del'>-	struct inode *inodes[];</div><div class='add'>+	unsigned int count;</div><div class='add'>+	struct inode *inodes[] __counted_by(count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct xattr_handler ext4_xattr_user_handler;</div><div class='hunk'>@@ -207,6 +209,13 @@ extern int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,</div><div class='ctx'> extern struct mb_cache *ext4_xattr_create_cache(void);</div><div class='ctx'> extern void ext4_xattr_destroy_cache(struct mb_cache *);</div><div class='ctx'> </div><div class='add'>+extern int</div><div class='add'>+__xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header,</div><div class='add'>+		    void *end, const char *function, unsigned int line);</div><div class='add'>+</div><div class='add'>+#define xattr_check_inode(inode, header, end) \</div><div class='add'>+	__xattr_check_inode((inode), (header), (end), __func__, __LINE__)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_EXT4_FS_SECURITY</div><div class='ctx'> extern int ext4_init_security(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			      struct inode *dir, const struct qstr *qstr);</div><div class='head'>diff --git a/fs/f2fs/Kconfig b/fs/f2fs/Kconfig<br/>index 68a1e23e1557..5916a02fb46d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/Kconfig</a></div><div class='hunk'>@@ -4,8 +4,7 @@ config F2FS_FS</div><div class='ctx'> 	depends on BLOCK</div><div class='ctx'> 	select BUFFER_HEAD</div><div class='ctx'> 	select NLS</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_CRC32</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select F2FS_FS_XATTR if FS_ENCRYPTION</div><div class='ctx'> 	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION</div><div class='ctx'> 	select FS_IOMAP</div><div class='head'>diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c<br/>index ec2aeccb69a3..fa8d81a30fb9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/acl.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001-2003 Andreas Gruenbacher, &lt;agruen@suse.de&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;linux/f2fs_fs.h&gt;</div><div class='ctx'> #include "f2fs.h"</div><div class='ctx'> #include "xattr.h"</div><div class='hunk'>@@ -166,7 +167,7 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct posix_acl *__f2fs_get_acl(struct inode *inode, int type,</div><div class='del'>-						struct page *dpage)</div><div class='add'>+						struct folio *dfolio)</div><div class='ctx'> {</div><div class='ctx'> 	int name_index = F2FS_XATTR_INDEX_POSIX_ACL_DEFAULT;</div><div class='ctx'> 	void *value = NULL;</div><div class='hunk'>@@ -176,13 +177,13 @@ static struct posix_acl *__f2fs_get_acl(struct inode *inode, int type,</div><div class='ctx'> 	if (type == ACL_TYPE_ACCESS)</div><div class='ctx'> 		name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;</div><div class='ctx'> </div><div class='del'>-	retval = f2fs_getxattr(inode, name_index, "", NULL, 0, dpage);</div><div class='add'>+	retval = f2fs_getxattr(inode, name_index, "", NULL, 0, dfolio);</div><div class='ctx'> 	if (retval &gt; 0) {</div><div class='ctx'> 		value = f2fs_kmalloc(F2FS_I_SB(inode), retval, GFP_F2FS_ZERO);</div><div class='ctx'> 		if (!value)</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		retval = f2fs_getxattr(inode, name_index, "", value,</div><div class='del'>-							retval, dpage);</div><div class='add'>+							retval, dfolio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (retval &gt; 0)</div><div class='hunk'>@@ -219,8 +220,7 @@ static int f2fs_acl_update_mode(struct mnt_idmap *idmap,</div><div class='ctx'> 		return error;</div><div class='ctx'> 	if (error == 0)</div><div class='ctx'> 		*acl = NULL;</div><div class='del'>-	if (!vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)) &amp;&amp;</div><div class='del'>-	    !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID))</div><div class='add'>+	if (!in_group_or_capable(idmap, inode, i_gid_into_vfsgid(idmap, inode)))</div><div class='ctx'> 		mode &amp;= ~S_ISGID;</div><div class='ctx'> 	*mode_p = mode;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -228,7 +228,7 @@ static int f2fs_acl_update_mode(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> static int __f2fs_set_acl(struct mnt_idmap *idmap,</div><div class='ctx'> 			struct inode *inode, int type,</div><div class='del'>-			struct posix_acl *acl, struct page *ipage)</div><div class='add'>+			struct posix_acl *acl, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	int name_index;</div><div class='ctx'> 	void *value = NULL;</div><div class='hunk'>@@ -239,9 +239,8 @@ static int __f2fs_set_acl(struct mnt_idmap *idmap,</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ACL_TYPE_ACCESS:</div><div class='ctx'> 		name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;</div><div class='del'>-		if (acl &amp;&amp; !ipage) {</div><div class='del'>-			error = f2fs_acl_update_mode(idmap, inode,</div><div class='del'>-								&amp;mode, &amp;acl);</div><div class='add'>+		if (acl &amp;&amp; !ifolio) {</div><div class='add'>+			error = f2fs_acl_update_mode(idmap, inode, &amp;mode, &amp;acl);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				return error;</div><div class='ctx'> 			set_acl_inode(inode, mode);</div><div class='hunk'>@@ -266,7 +265,7 @@ static int __f2fs_set_acl(struct mnt_idmap *idmap,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = f2fs_setxattr(inode, name_index, "", value, size, ipage, 0);</div><div class='add'>+	error = f2fs_setxattr(inode, name_index, "", value, size, ifolio, 0);</div><div class='ctx'> </div><div class='ctx'> 	kfree(value);</div><div class='ctx'> 	if (!error)</div><div class='hunk'>@@ -297,9 +296,8 @@ static struct posix_acl *f2fs_acl_clone(const struct posix_acl *acl,</div><div class='ctx'> 	struct posix_acl *clone = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (acl) {</div><div class='del'>-		int size = sizeof(struct posix_acl) + acl-&gt;a_count *</div><div class='del'>-				sizeof(struct posix_acl_entry);</div><div class='del'>-		clone = kmemdup(acl, size, flags);</div><div class='add'>+		clone = kmemdup(acl, struct_size(acl, a_entries, acl-&gt;a_count),</div><div class='add'>+				flags);</div><div class='ctx'> 		if (clone)</div><div class='ctx'> 			refcount_set(&amp;clone-&gt;a_refcount, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -362,7 +360,7 @@ static int f2fs_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)</div><div class='ctx'> </div><div class='ctx'> static int f2fs_acl_create(struct inode *dir, umode_t *mode,</div><div class='ctx'> 		struct posix_acl **default_acl, struct posix_acl **acl,</div><div class='del'>-		struct page *dpage)</div><div class='add'>+		struct folio *dfolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct posix_acl *p;</div><div class='ctx'> 	struct posix_acl *clone;</div><div class='hunk'>@@ -374,7 +372,7 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,</div><div class='ctx'> 	if (S_ISLNK(*mode) || !IS_POSIXACL(dir))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	p = __f2fs_get_acl(dir, ACL_TYPE_DEFAULT, dpage);</div><div class='add'>+	p = __f2fs_get_acl(dir, ACL_TYPE_DEFAULT, dfolio);</div><div class='ctx'> 	if (!p || p == ERR_PTR(-EOPNOTSUPP)) {</div><div class='ctx'> 		*mode &amp;= ~current_umask();</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -411,29 +409,29 @@ release_acl:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,</div><div class='del'>-							struct page *dpage)</div><div class='add'>+int f2fs_init_acl(struct inode *inode, struct inode *dir, struct folio *ifolio,</div><div class='add'>+							struct folio *dfolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct posix_acl *default_acl = NULL, *acl = NULL;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = f2fs_acl_create(dir, &amp;inode-&gt;i_mode, &amp;default_acl, &amp;acl, dpage);</div><div class='add'>+	error = f2fs_acl_create(dir, &amp;inode-&gt;i_mode, &amp;default_acl, &amp;acl, dfolio);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> </div><div class='ctx'> 	if (default_acl) {</div><div class='del'>-		error = __f2fs_set_acl(NULL, inode, ACL_TYPE_DEFAULT, default_acl,</div><div class='del'>-				       ipage);</div><div class='add'>+		error = __f2fs_set_acl(NULL, inode, ACL_TYPE_DEFAULT,</div><div class='add'>+				default_acl, ifolio);</div><div class='ctx'> 		posix_acl_release(default_acl);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		inode-&gt;i_default_acl = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (acl) {</div><div class='ctx'> 		if (!error)</div><div class='del'>-			error = __f2fs_set_acl(NULL, inode, ACL_TYPE_ACCESS, acl,</div><div class='del'>-					       ipage);</div><div class='add'>+			error = __f2fs_set_acl(NULL, inode, ACL_TYPE_ACCESS,</div><div class='add'>+					acl, ifolio);</div><div class='ctx'> 		posix_acl_release(acl);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		inode-&gt;i_acl = NULL;</div><div class='head'>diff --git a/fs/f2fs/acl.h b/fs/f2fs/acl.h<br/>index 94ebfbfbdc6f..20e87e63c089 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/acl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/acl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/acl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/acl.h</a></div><div class='hunk'>@@ -33,17 +33,17 @@ struct f2fs_acl_header {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_POSIX_ACL</div><div class='ctx'> </div><div class='del'>-extern struct posix_acl *f2fs_get_acl(struct inode *, int, bool);</div><div class='del'>-extern int f2fs_set_acl(struct mnt_idmap *, struct dentry *,</div><div class='add'>+struct posix_acl *f2fs_get_acl(struct inode *, int, bool);</div><div class='add'>+int f2fs_set_acl(struct mnt_idmap *, struct dentry *,</div><div class='ctx'> 			struct posix_acl *, int);</div><div class='del'>-extern int f2fs_init_acl(struct inode *, struct inode *, struct page *,</div><div class='del'>-							struct page *);</div><div class='add'>+int f2fs_init_acl(struct inode *, struct inode *, struct folio *ifolio,</div><div class='add'>+		struct folio *dfolio);</div><div class='ctx'> #else</div><div class='ctx'> #define f2fs_get_acl	NULL</div><div class='ctx'> #define f2fs_set_acl	NULL</div><div class='ctx'> </div><div class='ctx'> static inline int f2fs_init_acl(struct inode *inode, struct inode *dir,</div><div class='del'>-				struct page *ipage, struct page *dpage)</div><div class='add'>+				struct folio *ifolio, struct folio *dfolio)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c<br/>index b0597a539fc5..300664269eb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/checkpoint.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/checkpoint.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/checkpoint.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/checkpoint.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include "iostat.h"</div><div class='ctx'> #include &lt;trace/events/f2fs.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_CHECKPOINT_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))</div><div class='add'>+#define DEFAULT_CHECKPOINT_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_RT, 3))</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *ino_entry_slab;</div><div class='ctx'> struct kmem_cache *f2fs_inode_entry_slab;</div><div class='hunk'>@@ -29,36 +29,36 @@ struct kmem_cache *f2fs_inode_entry_slab;</div><div class='ctx'> void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io,</div><div class='ctx'> 						unsigned char reason)</div><div class='ctx'> {</div><div class='del'>-	f2fs_build_fault_attr(sbi, 0, 0);</div><div class='add'>+	f2fs_build_fault_attr(sbi, 0, 0, FAULT_ALL);</div><div class='ctx'> 	if (!end_io)</div><div class='ctx'> 		f2fs_flush_merged_writes(sbi);</div><div class='del'>-	f2fs_handle_critical_error(sbi, reason, end_io);</div><div class='add'>+	f2fs_handle_critical_error(sbi, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We guarantee no failure on the returned page.</div><div class='ctx'>  */</div><div class='del'>-struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='add'>+struct folio *f2fs_grab_meta_folio(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = META_MAPPING(sbi);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> repeat:</div><div class='del'>-	page = f2fs_grab_cache_page(mapping, index, false);</div><div class='del'>-	if (!page) {</div><div class='add'>+	folio = f2fs_grab_cache_folio(mapping, index, false);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_wait_on_page_writeback(page, META, true, true);</div><div class='del'>-	if (!PageUptodate(page))</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	return page;</div><div class='add'>+	f2fs_folio_wait_writeback(folio, META, true, true);</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,</div><div class='add'>+static struct folio *__get_meta_folio(struct f2fs_sb_info *sbi, pgoff_t index,</div><div class='ctx'> 							bool is_meta)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = META_MAPPING(sbi);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = sbi,</div><div class='ctx'> 		.type = META,</div><div class='hunk'>@@ -74,64 +74,64 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,</div><div class='ctx'> 	if (unlikely(!is_meta))</div><div class='ctx'> 		fio.op_flags &amp;= ~REQ_META;</div><div class='ctx'> repeat:</div><div class='del'>-	page = f2fs_grab_cache_page(mapping, index, false);</div><div class='del'>-	if (!page) {</div><div class='add'>+	folio = f2fs_grab_cache_folio(mapping, index, false);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='del'>-	if (PageUptodate(page))</div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	fio.page = page;</div><div class='add'>+	fio.folio = folio;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_submit_page_bio(&amp;fio);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_iostat(sbi, NULL, FS_META_READ_IO, F2FS_BLKSIZE);</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	if (unlikely(page-&gt;mapping != mapping)) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	if (unlikely(!is_meta_folio(folio))) {</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!PageUptodate(page))) {</div><div class='del'>-		f2fs_handle_page_eio(sbi, page-&gt;index, META);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+	if (unlikely(!folio_test_uptodate(folio))) {</div><div class='add'>+		f2fs_handle_page_eio(sbi, folio, META);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='add'>+struct folio *f2fs_get_meta_folio(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	return __get_meta_page(sbi, index, true);</div><div class='add'>+	return __get_meta_folio(sbi, index, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='add'>+struct folio *f2fs_get_meta_folio_retry(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	page = __get_meta_page(sbi, index, true);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		if (PTR_ERR(page) == -EIO &amp;&amp;</div><div class='add'>+	folio = __get_meta_folio(sbi, index, true);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		if (PTR_ERR(folio) == -EIO &amp;&amp;</div><div class='ctx'> 				++count &lt;= DEFAULT_RETRY_IO_COUNT)</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_META_PAGE);</div><div class='ctx'> 	}</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* for POR only */</div><div class='del'>-struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='add'>+struct folio *f2fs_get_tmp_folio(struct f2fs_sb_info *sbi, pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	return __get_meta_page(sbi, index, false);</div><div class='add'>+	return __get_meta_folio(sbi, index, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,</div><div class='hunk'>@@ -154,49 +154,47 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,</div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi)))</div><div class='ctx'> 		return exist;</div><div class='ctx'> </div><div class='del'>-	if (exist &amp;&amp; type == DATA_GENERIC_ENHANCE_UPDATE) {</div><div class='del'>-		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",</div><div class='del'>-			 blkaddr, exist);</div><div class='del'>-		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-		return exist;</div><div class='del'>-	}</div><div class='add'>+	if ((exist &amp;&amp; type == DATA_GENERIC_ENHANCE_UPDATE) ||</div><div class='add'>+		(!exist &amp;&amp; type == DATA_GENERIC_ENHANCE))</div><div class='add'>+		goto out_err;</div><div class='add'>+	if (!exist &amp;&amp; type != DATA_GENERIC_ENHANCE_UPDATE)</div><div class='add'>+		goto out_handle;</div><div class='add'>+	return exist;</div><div class='ctx'> </div><div class='del'>-	if (!exist &amp;&amp; type == DATA_GENERIC_ENHANCE) {</div><div class='del'>-		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",</div><div class='del'>-			 blkaddr, exist);</div><div class='del'>-		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-		dump_stack();</div><div class='del'>-	}</div><div class='add'>+out_err:</div><div class='add'>+	f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",</div><div class='add'>+		 blkaddr, exist);</div><div class='add'>+	set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+	dump_stack();</div><div class='add'>+out_handle:</div><div class='add'>+	f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 	return exist;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='add'>+static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					block_t blkaddr, int type)</div><div class='ctx'> {</div><div class='del'>-	if (time_to_inject(sbi, FAULT_BLKADDR))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case META_NAT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case META_SIT:</div><div class='ctx'> 		if (unlikely(blkaddr &gt;= SIT_BLK_CNT(sbi)))</div><div class='del'>-			return false;</div><div class='add'>+			goto check_only;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case META_SSA:</div><div class='ctx'> 		if (unlikely(blkaddr &gt;= MAIN_BLKADDR(sbi) ||</div><div class='ctx'> 			blkaddr &lt; SM_I(sbi)-&gt;ssa_blkaddr))</div><div class='del'>-			return false;</div><div class='add'>+			goto check_only;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case META_CP:</div><div class='ctx'> 		if (unlikely(blkaddr &gt;= SIT_I(sbi)-&gt;sit_base_addr ||</div><div class='ctx'> 			blkaddr &lt; __start_cp_addr(sbi)))</div><div class='del'>-			return false;</div><div class='add'>+			goto check_only;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case META_POR:</div><div class='ctx'> 		if (unlikely(blkaddr &gt;= MAX_BLKADDR(sbi) ||</div><div class='ctx'> 			blkaddr &lt; MAIN_BLKADDR(sbi)))</div><div class='del'>-			return false;</div><div class='add'>+			goto check_only;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DATA_GENERIC:</div><div class='ctx'> 	case DATA_GENERIC_ENHANCE:</div><div class='hunk'>@@ -213,7 +211,7 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				  blkaddr);</div><div class='ctx'> 			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 			dump_stack();</div><div class='del'>-			return false;</div><div class='add'>+			goto err;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			return __is_bitmap_valid(sbi, blkaddr, type);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -221,13 +219,31 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	case META_GENERIC:</div><div class='ctx'> 		if (unlikely(blkaddr &lt; SEG0_BLKADDR(sbi) ||</div><div class='ctx'> 			blkaddr &gt;= MAIN_BLKADDR(sbi)))</div><div class='del'>-			return false;</div><div class='add'>+			goto err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='add'>+err:</div><div class='add'>+	f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+check_only:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='add'>+					block_t blkaddr, int type)</div><div class='add'>+{</div><div class='add'>+	if (time_to_inject(sbi, FAULT_BLKADDR_VALIDITY))</div><div class='add'>+		return false;</div><div class='add'>+	return __f2fs_is_valid_blkaddr(sbi, blkaddr, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi,</div><div class='add'>+					block_t blkaddr, int type)</div><div class='add'>+{</div><div class='add'>+	return __f2fs_is_valid_blkaddr(sbi, blkaddr, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -236,7 +252,6 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,</div><div class='ctx'> 							int type, bool sync)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	block_t blkno = start;</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = sbi,</div><div class='hunk'>@@ -255,6 +270,7 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> 	for (; nrpages-- &gt; 0; blkno++) {</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(sbi, blkno, type))</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -284,18 +300,18 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		page = f2fs_grab_cache_page(META_MAPPING(sbi),</div><div class='add'>+		folio = f2fs_grab_cache_folio(META_MAPPING(sbi),</div><div class='ctx'> 						fio.new_blkaddr, false);</div><div class='del'>-		if (!page)</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (PageUptodate(page)) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		if (folio_test_uptodate(folio)) {</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		fio.page = page;</div><div class='add'>+		fio.folio = folio;</div><div class='ctx'> 		err = f2fs_submit_page_bio(&amp;fio);</div><div class='del'>-		f2fs_put_page(page, err ? 1 : 0);</div><div class='add'>+		f2fs_folio_put(folio, err ? true : false);</div><div class='ctx'> </div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			f2fs_update_iostat(sbi, NULL, FS_META_READ_IO,</div><div class='hunk'>@@ -309,65 +325,54 @@ out:</div><div class='ctx'> void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index,</div><div class='ctx'> 							unsigned int ra_blocks)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	bool readahead = false;</div><div class='ctx'> </div><div class='ctx'> 	if (ra_blocks == RECOVERY_MIN_RA_BLOCKS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	page = find_get_page(META_MAPPING(sbi), index);</div><div class='del'>-	if (!page || !PageUptodate(page))</div><div class='add'>+	folio = filemap_get_folio(META_MAPPING(sbi), index);</div><div class='add'>+	if (IS_ERR(folio) || !folio_test_uptodate(folio))</div><div class='ctx'> 		readahead = true;</div><div class='del'>-	f2fs_put_page(page, 0);</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='ctx'> </div><div class='ctx'> 	if (readahead)</div><div class='ctx'> 		f2fs_ra_meta_pages(sbi, index, ra_blocks, META_POR, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __f2fs_write_meta_page(struct page *page,</div><div class='add'>+static bool __f2fs_write_meta_folio(struct folio *folio,</div><div class='ctx'> 				struct writeback_control *wbc,</div><div class='ctx'> 				enum iostat_type io_type)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(page);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(folio);</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_writepage(page, META);</div><div class='add'>+	trace_f2fs_writepage(folio, META);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='ctx'> 		if (is_sbi_flag_set(sbi, SBI_IS_CLOSE)) {</div><div class='del'>-			ClearPageUptodate(page);</div><div class='add'>+			folio_clear_uptodate(folio);</div><div class='ctx'> 			dec_page_count(sbi, F2FS_DIRTY_META);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			return 0;</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			return true;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto redirty_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))</div><div class='ctx'> 		goto redirty_out;</div><div class='del'>-	if (wbc-&gt;for_reclaim &amp;&amp; page-&gt;index &lt; GET_SUM_BLOCK(sbi, 0))</div><div class='del'>-		goto redirty_out;</div><div class='ctx'> </div><div class='del'>-	f2fs_do_write_meta_page(sbi, page, io_type);</div><div class='add'>+	f2fs_do_write_meta_page(sbi, folio, io_type);</div><div class='ctx'> 	dec_page_count(sbi, F2FS_DIRTY_META);</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;for_reclaim)</div><div class='del'>-		f2fs_submit_merged_write_cond(sbi, NULL, page, 0, META);</div><div class='del'>-</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi)))</div><div class='ctx'> 		f2fs_submit_merged_write(sbi, META);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return true;</div><div class='ctx'> </div><div class='ctx'> redirty_out:</div><div class='del'>-	redirty_page_for_writepage(wbc, page);</div><div class='del'>-	return AOP_WRITEPAGE_ACTIVATE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int f2fs_write_meta_page(struct page *page,</div><div class='del'>-				struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	return __f2fs_write_meta_page(page, wbc, FS_META_IO);</div><div class='add'>+	folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_write_meta_pages(struct address_space *mapping,</div><div class='hunk'>@@ -410,9 +415,7 @@ long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> 	long nwritten = 0;</div><div class='ctx'> 	int nr_folios;</div><div class='del'>-	struct writeback_control wbc = {</div><div class='del'>-		.for_reclaim = 0,</div><div class='del'>-	};</div><div class='add'>+	struct writeback_control wbc = {};</div><div class='ctx'> 	struct blk_plug plug;</div><div class='ctx'> </div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='hunk'>@@ -436,7 +439,7 @@ long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,</div><div class='ctx'> </div><div class='ctx'> 			folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(folio-&gt;mapping != mapping)) {</div><div class='add'>+			if (unlikely(!is_meta_folio(folio))) {</div><div class='ctx'> continue_unlock:</div><div class='ctx'> 				folio_unlock(folio);</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -446,13 +449,12 @@ continue_unlock:</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			f2fs_wait_on_page_writeback(&amp;folio-&gt;page, META,</div><div class='del'>-					true, true);</div><div class='add'>+			f2fs_folio_wait_writeback(folio, META, true, true);</div><div class='ctx'> </div><div class='ctx'> 			if (!folio_clear_dirty_for_io(folio))</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-			if (__f2fs_write_meta_page(&amp;folio-&gt;page, &amp;wbc,</div><div class='add'>+			if (!__f2fs_write_meta_folio(folio, &amp;wbc,</div><div class='ctx'> 						io_type)) {</div><div class='ctx'> 				folio_unlock(folio);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -477,20 +479,19 @@ stop:</div><div class='ctx'> static bool f2fs_dirty_meta_folio(struct address_space *mapping,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	trace_f2fs_set_page_dirty(&amp;folio-&gt;page, META);</div><div class='add'>+	trace_f2fs_set_page_dirty(folio, META);</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_uptodate(folio))</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='ctx'> 	if (filemap_dirty_folio(mapping, folio)) {</div><div class='ctx'> 		inc_page_count(F2FS_M_SB(mapping), F2FS_DIRTY_META);</div><div class='del'>-		set_page_private_reference(&amp;folio-&gt;page);</div><div class='add'>+		folio_set_f2fs_reference(folio);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations f2fs_meta_aops = {</div><div class='del'>-	.writepage	= f2fs_write_meta_page,</div><div class='ctx'> 	.writepages	= f2fs_write_meta_pages,</div><div class='ctx'> 	.dirty_folio	= f2fs_dirty_meta_folio,</div><div class='ctx'> 	.invalidate_folio = f2fs_invalidate_folio,</div><div class='hunk'>@@ -503,6 +504,7 @@ static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode_management *im = &amp;sbi-&gt;im[type];</div><div class='ctx'> 	struct ino_entry *e = NULL, *new = NULL;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (type == FLUSH_INO) {</div><div class='ctx'> 		rcu_read_lock();</div><div class='hunk'>@@ -515,7 +517,8 @@ retry:</div><div class='ctx'> 		new = f2fs_kmem_cache_alloc(ino_entry_slab,</div><div class='ctx'> 						GFP_NOFS, true, NULL);</div><div class='ctx'> </div><div class='del'>-	radix_tree_preload(GFP_NOFS | __GFP_NOFAIL);</div><div class='add'>+	ret = radix_tree_preload(GFP_NOFS | __GFP_NOFAIL);</div><div class='add'>+	f2fs_bug_on(sbi, ret);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;im-&gt;ino_lock);</div><div class='ctx'> 	e = radix_tree_lookup(&amp;im-&gt;ino_root, ino);</div><div class='hunk'>@@ -740,26 +743,26 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	f2fs_ra_meta_pages(sbi, start_blk, orphan_blocks, META_CP, true);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; orphan_blocks; i++) {</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		struct f2fs_orphan_block *orphan_blk;</div><div class='ctx'> </div><div class='del'>-		page = f2fs_get_meta_page(sbi, start_blk + i);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='add'>+		folio = f2fs_get_meta_folio(sbi, start_blk + i);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		orphan_blk = (struct f2fs_orphan_block *)page_address(page);</div><div class='add'>+		orphan_blk = folio_address(folio);</div><div class='ctx'> 		for (j = 0; j &lt; le32_to_cpu(orphan_blk-&gt;entry_count); j++) {</div><div class='ctx'> 			nid_t ino = le32_to_cpu(orphan_blk-&gt;ino[j]);</div><div class='ctx'> </div><div class='ctx'> 			err = recover_orphan_inode(sbi, ino);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				f2fs_put_page(page, 1);</div><div class='add'>+				f2fs_folio_put(folio, true);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* clear Orphan Flag */</div><div class='ctx'> 	clear_ckpt_flags(sbi, CP_ORPHAN_PRESENT_FLAG);</div><div class='hunk'>@@ -776,7 +779,7 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)</div><div class='ctx'> 	unsigned int nentries = 0;</div><div class='ctx'> 	unsigned short index = 1;</div><div class='ctx'> 	unsigned short orphan_blocks;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	struct ino_entry *orphan = NULL;</div><div class='ctx'> 	struct inode_management *im = &amp;sbi-&gt;im[ORPHAN_INO];</div><div class='ctx'> </div><div class='hunk'>@@ -791,10 +794,9 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)</div><div class='ctx'> </div><div class='ctx'> 	/* loop for each orphan inode entry and write them in journal block */</div><div class='ctx'> 	list_for_each_entry(orphan, head, list) {</div><div class='del'>-		if (!page) {</div><div class='del'>-			page = f2fs_grab_meta_page(sbi, start_blk++);</div><div class='del'>-			orphan_blk =</div><div class='del'>-				(struct f2fs_orphan_block *)page_address(page);</div><div class='add'>+		if (!folio) {</div><div class='add'>+			folio = f2fs_grab_meta_folio(sbi, start_blk++);</div><div class='add'>+			orphan_blk = folio_address(folio);</div><div class='ctx'> 			memset(orphan_blk, 0, sizeof(*orphan_blk));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -809,62 +811,61 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)</div><div class='ctx'> 			orphan_blk-&gt;blk_addr = cpu_to_le16(index);</div><div class='ctx'> 			orphan_blk-&gt;blk_count = cpu_to_le16(orphan_blocks);</div><div class='ctx'> 			orphan_blk-&gt;entry_count = cpu_to_le32(nentries);</div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			index++;</div><div class='ctx'> 			nentries = 0;</div><div class='del'>-			page = NULL;</div><div class='add'>+			folio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page) {</div><div class='add'>+	if (folio) {</div><div class='ctx'> 		orphan_blk-&gt;blk_addr = cpu_to_le16(index);</div><div class='ctx'> 		orphan_blk-&gt;blk_count = cpu_to_le16(orphan_blocks);</div><div class='ctx'> 		orphan_blk-&gt;entry_count = cpu_to_le32(nentries);</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u32 f2fs_checkpoint_chksum(struct f2fs_sb_info *sbi,</div><div class='del'>-						struct f2fs_checkpoint *ckpt)</div><div class='add'>+static __u32 f2fs_checkpoint_chksum(struct f2fs_checkpoint *ckpt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int chksum_ofs = le32_to_cpu(ckpt-&gt;checksum_offset);</div><div class='ctx'> 	__u32 chksum;</div><div class='ctx'> </div><div class='del'>-	chksum = f2fs_crc32(sbi, ckpt, chksum_ofs);</div><div class='add'>+	chksum = f2fs_crc32(ckpt, chksum_ofs);</div><div class='ctx'> 	if (chksum_ofs &lt; CP_CHKSUM_OFFSET) {</div><div class='ctx'> 		chksum_ofs += sizeof(chksum);</div><div class='del'>-		chksum = f2fs_chksum(sbi, chksum, (__u8 *)ckpt + chksum_ofs,</div><div class='del'>-						F2FS_BLKSIZE - chksum_ofs);</div><div class='add'>+		chksum = f2fs_chksum(chksum, (__u8 *)ckpt + chksum_ofs,</div><div class='add'>+				     F2FS_BLKSIZE - chksum_ofs);</div><div class='ctx'> 	}</div><div class='ctx'> 	return chksum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_checkpoint_version(struct f2fs_sb_info *sbi, block_t cp_addr,</div><div class='del'>-		struct f2fs_checkpoint **cp_block, struct page **cp_page,</div><div class='add'>+		struct f2fs_checkpoint **cp_block, struct folio **cp_folio,</div><div class='ctx'> 		unsigned long long *version)</div><div class='ctx'> {</div><div class='ctx'> 	size_t crc_offset = 0;</div><div class='ctx'> 	__u32 crc;</div><div class='ctx'> </div><div class='del'>-	*cp_page = f2fs_get_meta_page(sbi, cp_addr);</div><div class='del'>-	if (IS_ERR(*cp_page))</div><div class='del'>-		return PTR_ERR(*cp_page);</div><div class='add'>+	*cp_folio = f2fs_get_meta_folio(sbi, cp_addr);</div><div class='add'>+	if (IS_ERR(*cp_folio))</div><div class='add'>+		return PTR_ERR(*cp_folio);</div><div class='ctx'> </div><div class='del'>-	*cp_block = (struct f2fs_checkpoint *)page_address(*cp_page);</div><div class='add'>+	*cp_block = folio_address(*cp_folio);</div><div class='ctx'> </div><div class='ctx'> 	crc_offset = le32_to_cpu((*cp_block)-&gt;checksum_offset);</div><div class='ctx'> 	if (crc_offset &lt; CP_MIN_CHKSUM_OFFSET ||</div><div class='ctx'> 			crc_offset &gt; CP_CHKSUM_OFFSET) {</div><div class='del'>-		f2fs_put_page(*cp_page, 1);</div><div class='add'>+		f2fs_folio_put(*cp_folio, true);</div><div class='ctx'> 		f2fs_warn(sbi, "invalid crc_offset: %zu", crc_offset);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	crc = f2fs_checkpoint_chksum(sbi, *cp_block);</div><div class='add'>+	crc = f2fs_checkpoint_chksum(*cp_block);</div><div class='ctx'> 	if (crc != cur_cp_crc(*cp_block)) {</div><div class='del'>-		f2fs_put_page(*cp_page, 1);</div><div class='add'>+		f2fs_folio_put(*cp_folio, true);</div><div class='ctx'> 		f2fs_warn(sbi, "invalid crc value");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -873,23 +874,23 @@ static int get_checkpoint_version(struct f2fs_sb_info *sbi, block_t cp_addr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,</div><div class='add'>+static struct folio *validate_checkpoint(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				block_t cp_addr, unsigned long long *version)</div><div class='ctx'> {</div><div class='del'>-	struct page *cp_page_1 = NULL, *cp_page_2 = NULL;</div><div class='add'>+	struct folio *cp_folio_1 = NULL, *cp_folio_2 = NULL;</div><div class='ctx'> 	struct f2fs_checkpoint *cp_block = NULL;</div><div class='ctx'> 	unsigned long long cur_version = 0, pre_version = 0;</div><div class='ctx'> 	unsigned int cp_blocks;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = get_checkpoint_version(sbi, cp_addr, &amp;cp_block,</div><div class='del'>-					&amp;cp_page_1, version);</div><div class='add'>+					&amp;cp_folio_1, version);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	cp_blocks = le32_to_cpu(cp_block-&gt;cp_pack_total_block_count);</div><div class='ctx'> </div><div class='del'>-	if (cp_blocks &gt; sbi-&gt;blocks_per_seg || cp_blocks &lt;= F2FS_CP_PACKS) {</div><div class='add'>+	if (cp_blocks &gt; BLKS_PER_SEG(sbi) || cp_blocks &lt;= F2FS_CP_PACKS) {</div><div class='ctx'> 		f2fs_warn(sbi, "invalid cp_pack_total_block_count:%u",</div><div class='ctx'> 			  le32_to_cpu(cp_block-&gt;cp_pack_total_block_count));</div><div class='ctx'> 		goto invalid_cp;</div><div class='hunk'>@@ -898,19 +899,19 @@ static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 	cp_addr += cp_blocks - 1;</div><div class='ctx'> 	err = get_checkpoint_version(sbi, cp_addr, &amp;cp_block,</div><div class='del'>-					&amp;cp_page_2, version);</div><div class='add'>+					&amp;cp_folio_2, version);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto invalid_cp;</div><div class='ctx'> 	cur_version = *version;</div><div class='ctx'> </div><div class='ctx'> 	if (cur_version == pre_version) {</div><div class='ctx'> 		*version = cur_version;</div><div class='del'>-		f2fs_put_page(cp_page_2, 1);</div><div class='del'>-		return cp_page_1;</div><div class='add'>+		f2fs_folio_put(cp_folio_2, true);</div><div class='add'>+		return cp_folio_1;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_put_page(cp_page_2, 1);</div><div class='add'>+	f2fs_folio_put(cp_folio_2, true);</div><div class='ctx'> invalid_cp:</div><div class='del'>-	f2fs_put_page(cp_page_1, 1);</div><div class='add'>+	f2fs_folio_put(cp_folio_1, true);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -918,7 +919,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_checkpoint *cp_block;</div><div class='ctx'> 	struct f2fs_super_block *fsb = sbi-&gt;raw_super;</div><div class='del'>-	struct page *cp1, *cp2, *cur_page;</div><div class='add'>+	struct folio *cp1, *cp2, *cur_folio;</div><div class='ctx'> 	unsigned long blk_size = sbi-&gt;blocksize;</div><div class='ctx'> 	unsigned long long cp1_version = 0, cp2_version = 0;</div><div class='ctx'> 	unsigned long long cp_start_blk_no;</div><div class='hunk'>@@ -945,22 +946,22 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	if (cp1 &amp;&amp; cp2) {</div><div class='ctx'> 		if (ver_after(cp2_version, cp1_version))</div><div class='del'>-			cur_page = cp2;</div><div class='add'>+			cur_folio = cp2;</div><div class='ctx'> 		else</div><div class='del'>-			cur_page = cp1;</div><div class='add'>+			cur_folio = cp1;</div><div class='ctx'> 	} else if (cp1) {</div><div class='del'>-		cur_page = cp1;</div><div class='add'>+		cur_folio = cp1;</div><div class='ctx'> 	} else if (cp2) {</div><div class='del'>-		cur_page = cp2;</div><div class='add'>+		cur_folio = cp2;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='ctx'> 		goto fail_no_cp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cp_block = (struct f2fs_checkpoint *)page_address(cur_page);</div><div class='add'>+	cp_block = folio_address(cur_folio);</div><div class='ctx'> 	memcpy(sbi-&gt;ckpt, cp_block, blk_size);</div><div class='ctx'> </div><div class='del'>-	if (cur_page == cp1)</div><div class='add'>+	if (cur_folio == cp1)</div><div class='ctx'> 		sbi-&gt;cur_cp_pack = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		sbi-&gt;cur_cp_pack = 2;</div><div class='hunk'>@@ -975,30 +976,30 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	cp_blk_no = le32_to_cpu(fsb-&gt;cp_blkaddr);</div><div class='del'>-	if (cur_page == cp2)</div><div class='add'>+	if (cur_folio == cp2)</div><div class='ctx'> 		cp_blk_no += BIT(le32_to_cpu(fsb-&gt;log_blocks_per_seg));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; cp_blks; i++) {</div><div class='ctx'> 		void *sit_bitmap_ptr;</div><div class='ctx'> 		unsigned char *ckpt = (unsigned char *)sbi-&gt;ckpt;</div><div class='ctx'> </div><div class='del'>-		cur_page = f2fs_get_meta_page(sbi, cp_blk_no + i);</div><div class='del'>-		if (IS_ERR(cur_page)) {</div><div class='del'>-			err = PTR_ERR(cur_page);</div><div class='add'>+		cur_folio = f2fs_get_meta_folio(sbi, cp_blk_no + i);</div><div class='add'>+		if (IS_ERR(cur_folio)) {</div><div class='add'>+			err = PTR_ERR(cur_folio);</div><div class='ctx'> 			goto free_fail_no_cp;</div><div class='ctx'> 		}</div><div class='del'>-		sit_bitmap_ptr = page_address(cur_page);</div><div class='add'>+		sit_bitmap_ptr = folio_address(cur_folio);</div><div class='ctx'> 		memcpy(ckpt + i * blk_size, sit_bitmap_ptr, blk_size);</div><div class='del'>-		f2fs_put_page(cur_page, 1);</div><div class='add'>+		f2fs_folio_put(cur_folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='del'>-	f2fs_put_page(cp1, 1);</div><div class='del'>-	f2fs_put_page(cp2, 1);</div><div class='add'>+	f2fs_folio_put(cp1, true);</div><div class='add'>+	f2fs_folio_put(cp2, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_fail_no_cp:</div><div class='del'>-	f2fs_put_page(cp1, 1);</div><div class='del'>-	f2fs_put_page(cp2, 1);</div><div class='add'>+	f2fs_folio_put(cp1, true);</div><div class='add'>+	f2fs_folio_put(cp2, true);</div><div class='ctx'> fail_no_cp:</div><div class='ctx'> 	kvfree(sbi-&gt;ckpt);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1044,7 +1045,7 @@ void f2fs_update_dirty_folio(struct inode *inode, struct folio *folio)</div><div class='ctx'> 	inode_inc_dirty_pages(inode);</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;inode_lock[type]);</div><div class='ctx'> </div><div class='del'>-	set_page_private_reference(&amp;folio-&gt;page);</div><div class='add'>+	folio_set_f2fs_reference(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_remove_dirty_inode(struct inode *inode)</div><div class='hunk'>@@ -1170,6 +1171,11 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	ckpt-&gt;valid_node_count = cpu_to_le32(valid_node_count(sbi));</div><div class='ctx'> 	ckpt-&gt;valid_inode_count = cpu_to_le32(valid_inode_count(sbi));</div><div class='ctx'> 	ckpt-&gt;next_free_nid = cpu_to_le32(last_nid);</div><div class='add'>+</div><div class='add'>+	/* update user_block_counts */</div><div class='add'>+	sbi-&gt;last_valid_block_count = sbi-&gt;total_valid_block_count;</div><div class='add'>+	percpu_counter_set(&amp;sbi-&gt;alloc_valid_block_count, 0);</div><div class='add'>+	percpu_counter_set(&amp;sbi-&gt;rf_node_block_count, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool __need_flush_quota(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -1203,7 +1209,6 @@ static int block_operations(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	struct writeback_control wbc = {</div><div class='ctx'> 		.sync_mode = WB_SYNC_ALL,</div><div class='ctx'> 		.nr_to_write = LONG_MAX,</div><div class='del'>-		.for_reclaim = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err = 0, cnt = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1215,7 +1220,7 @@ static int block_operations(struct f2fs_sb_info *sbi)</div><div class='ctx'> retry_flush_quotas:</div><div class='ctx'> 	f2fs_lock_all(sbi);</div><div class='ctx'> 	if (__need_flush_quota(sbi)) {</div><div class='del'>-		int locked;</div><div class='add'>+		bool need_lock = sbi-&gt;umount_lock_holder != current;</div><div class='ctx'> </div><div class='ctx'> 		if (++cnt &gt; DEFAULT_RETRY_QUOTA_FLUSH_COUNT) {</div><div class='ctx'> 			set_sbi_flag(sbi, SBI_QUOTA_SKIP_FLUSH);</div><div class='hunk'>@@ -1224,11 +1229,13 @@ retry_flush_quotas:</div><div class='ctx'> 		}</div><div class='ctx'> 		f2fs_unlock_all(sbi);</div><div class='ctx'> </div><div class='del'>-		/* only failed during mount/umount/freeze/quotactl */</div><div class='del'>-		locked = down_read_trylock(&amp;sbi-&gt;sb-&gt;s_umount);</div><div class='del'>-		f2fs_quota_sync(sbi-&gt;sb, -1);</div><div class='del'>-		if (locked)</div><div class='add'>+		/* don't grab s_umount lock during mount/umount/remount/freeze/quotactl */</div><div class='add'>+		if (!need_lock) {</div><div class='add'>+			f2fs_do_quota_sync(sbi-&gt;sb, -1);</div><div class='add'>+		} else if (down_read_trylock(&amp;sbi-&gt;sb-&gt;s_umount)) {</div><div class='add'>+			f2fs_do_quota_sync(sbi-&gt;sb, -1);</div><div class='ctx'> 			up_read(&amp;sbi-&gt;sb-&gt;s_umount);</div><div class='add'>+		}</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto retry_flush_quotas;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1311,7 +1318,7 @@ void f2fs_wait_on_all_pages(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 			f2fs_submit_merged_write(sbi, DATA);</div><div class='ctx'> </div><div class='ctx'> 		prepare_to_wait(&amp;sbi-&gt;cp_wait, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='del'>-		io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+		io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='ctx'> 	}</div><div class='ctx'> 	finish_wait(&amp;sbi-&gt;cp_wait, &amp;wait);</div><div class='ctx'> }</div><div class='hunk'>@@ -1322,21 +1329,13 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (cpc-&gt;reason &amp; CP_UMOUNT) {</div><div class='del'>-		if (le32_to_cpu(ckpt-&gt;cp_pack_total_block_count) +</div><div class='del'>-			NM_I(sbi)-&gt;nat_bits_blocks &gt; sbi-&gt;blocks_per_seg) {</div><div class='del'>-			clear_ckpt_flags(sbi, CP_NAT_BITS_FLAG);</div><div class='del'>-			f2fs_notice(sbi, "Disable nat_bits due to no space");</div><div class='del'>-		} else if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG) &amp;&amp;</div><div class='del'>-						f2fs_nat_bitmap_enabled(sbi)) {</div><div class='del'>-			f2fs_enable_nat_bits(sbi);</div><div class='del'>-			set_ckpt_flags(sbi, CP_NAT_BITS_FLAG);</div><div class='del'>-			f2fs_notice(sbi, "Rebuild and enable nat_bits");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;sbi-&gt;cp_lock, flags);</div><div class='ctx'> </div><div class='add'>+	if ((cpc-&gt;reason &amp; CP_UMOUNT) &amp;&amp;</div><div class='add'>+			le32_to_cpu(ckpt-&gt;cp_pack_total_block_count) &gt;</div><div class='add'>+			sbi-&gt;blocks_per_seg - NM_I(sbi)-&gt;nat_bits_blocks)</div><div class='add'>+		disable_nat_bits(sbi, false);</div><div class='add'>+</div><div class='ctx'> 	if (cpc-&gt;reason &amp; CP_TRIMMED)</div><div class='ctx'> 		__set_ckpt_flags(ckpt, CP_TRIMMED_FLAG);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1393,35 +1392,31 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> static void commit_checkpoint(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	void *src, block_t blk_addr)</div><div class='ctx'> {</div><div class='del'>-	struct writeback_control wbc = {</div><div class='del'>-		.for_reclaim = 0,</div><div class='del'>-	};</div><div class='add'>+	struct writeback_control wbc = {};</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * filemap_get_folios_tag and lock_page again will take</div><div class='add'>+	 * filemap_get_folios_tag and folio_lock again will take</div><div class='ctx'> 	 * some extra time. Therefore, f2fs_update_meta_pages and</div><div class='ctx'> 	 * f2fs_sync_meta_pages are combined in this function.</div><div class='ctx'> 	 */</div><div class='del'>-	struct page *page = f2fs_grab_meta_page(sbi, blk_addr);</div><div class='del'>-	int err;</div><div class='add'>+	struct folio *folio = f2fs_grab_meta_folio(sbi, blk_addr);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(page, META, true, true);</div><div class='add'>+	memcpy(folio_address(folio), src, PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	memcpy(page_address(page), src, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	if (unlikely(!clear_page_dirty_for_io(page)))</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	if (unlikely(!folio_clear_dirty_for_io(folio)))</div><div class='ctx'> 		f2fs_bug_on(sbi, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* writeout cp pack 2 page */</div><div class='del'>-	err = __f2fs_write_meta_page(page, &amp;wbc, FS_CP_META_IO);</div><div class='del'>-	if (unlikely(err &amp;&amp; f2fs_cp_error(sbi))) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='del'>-		return;</div><div class='add'>+	if (unlikely(!__f2fs_write_meta_folio(folio, &amp;wbc, FS_CP_META_IO))) {</div><div class='add'>+		if (f2fs_cp_error(sbi)) {</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		f2fs_bug_on(sbi, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(sbi, err);</div><div class='del'>-	f2fs_put_page(page, 0);</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='ctx'> </div><div class='ctx'> 	/* submit checkpoint (with barrier if NOBARRIER is not set) */</div><div class='ctx'> 	f2fs_submit_merged_write(sbi, META_FLUSH);</div><div class='hunk'>@@ -1447,6 +1442,34 @@ u64 f2fs_get_sectors_written(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return get_sectors_written(sbi-&gt;sb-&gt;s_bdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void stat_cp_time(struct cp_control *cpc, enum cp_time type)</div><div class='add'>+{</div><div class='add'>+	cpc-&gt;stats.times[type] = ktime_get();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void check_cp_time(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='add'>+{</div><div class='add'>+	unsigned long long sb_diff, cur_diff;</div><div class='add'>+	enum cp_time ct;</div><div class='add'>+</div><div class='add'>+	sb_diff = (u64)ktime_ms_delta(sbi-&gt;cp_stats.times[CP_TIME_END],</div><div class='add'>+					sbi-&gt;cp_stats.times[CP_TIME_START]);</div><div class='add'>+	cur_diff = (u64)ktime_ms_delta(cpc-&gt;stats.times[CP_TIME_END],</div><div class='add'>+					cpc-&gt;stats.times[CP_TIME_START]);</div><div class='add'>+</div><div class='add'>+	if (cur_diff &gt; sb_diff) {</div><div class='add'>+		sbi-&gt;cp_stats = cpc-&gt;stats;</div><div class='add'>+		if (cur_diff &lt; CP_LONG_LATENCY_THRESHOLD)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		f2fs_warn(sbi, "checkpoint was blocked for %llu ms", cur_diff);</div><div class='add'>+		for (ct = CP_TIME_START; ct &lt; CP_TIME_MAX - 1; ct++)</div><div class='add'>+			f2fs_warn(sbi, "Step#%d: %llu ms", ct,</div><div class='add'>+				(u64)ktime_ms_delta(cpc-&gt;stats.times[ct + 1],</div><div class='add'>+						cpc-&gt;stats.times[ct]));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);</div><div class='hunk'>@@ -1464,6 +1487,8 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	/* Flush all the NAT/SIT pages */</div><div class='ctx'> 	f2fs_sync_meta_pages(sbi, META, LONG_MAX, FS_CP_META_IO);</div><div class='ctx'> </div><div class='add'>+	stat_cp_time(cpc, CP_TIME_SYNC_META);</div><div class='add'>+</div><div class='ctx'> 	/* start to update checkpoint, cp ver is already updated previously */</div><div class='ctx'> 	ckpt-&gt;elapsed_time = cpu_to_le64(get_mtime(sbi, true));</div><div class='ctx'> 	ckpt-&gt;free_segment_count = cpu_to_le32(free_segments(sbi));</div><div class='hunk'>@@ -1511,7 +1536,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	get_sit_bitmap(sbi, __bitmap_ptr(sbi, SIT_BITMAP));</div><div class='ctx'> 	get_nat_bitmap(sbi, __bitmap_ptr(sbi, NAT_BITMAP));</div><div class='ctx'> </div><div class='del'>-	crc32 = f2fs_checkpoint_chksum(sbi, ckpt);</div><div class='add'>+	crc32 = f2fs_checkpoint_chksum(ckpt);</div><div class='ctx'> 	*((__le32 *)((unsigned char *)ckpt +</div><div class='ctx'> 				le32_to_cpu(ckpt-&gt;checksum_offset)))</div><div class='ctx'> 				= cpu_to_le32(crc32);</div><div class='hunk'>@@ -1519,18 +1544,17 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	start_blk = __start_cp_next_addr(sbi);</div><div class='ctx'> </div><div class='ctx'> 	/* write nat bits */</div><div class='del'>-	if ((cpc-&gt;reason &amp; CP_UMOUNT) &amp;&amp;</div><div class='del'>-			is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG)) {</div><div class='add'>+	if (enabled_nat_bits(sbi, cpc)) {</div><div class='ctx'> 		__u64 cp_ver = cur_cp_version(ckpt);</div><div class='ctx'> 		block_t blk;</div><div class='ctx'> </div><div class='ctx'> 		cp_ver |= ((__u64)crc32 &lt;&lt; 32);</div><div class='ctx'> 		*(__le64 *)nm_i-&gt;nat_bits = cpu_to_le64(cp_ver);</div><div class='ctx'> </div><div class='del'>-		blk = start_blk + sbi-&gt;blocks_per_seg - nm_i-&gt;nat_bits_blocks;</div><div class='add'>+		blk = start_blk + BLKS_PER_SEG(sbi) - nm_i-&gt;nat_bits_blocks;</div><div class='ctx'> 		for (i = 0; i &lt; nm_i-&gt;nat_bits_blocks; i++)</div><div class='ctx'> 			f2fs_update_meta_page(sbi, nm_i-&gt;nat_bits +</div><div class='del'>-					(i &lt;&lt; F2FS_BLKSIZE_BITS), blk + i);</div><div class='add'>+					F2FS_BLK_TO_BYTES(i), blk + i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* write out checkpoint buffer at block 0 */</div><div class='hunk'>@@ -1559,27 +1583,28 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 		start_blk += NR_CURSEG_NODE_TYPE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* update user_block_counts */</div><div class='del'>-	sbi-&gt;last_valid_block_count = sbi-&gt;total_valid_block_count;</div><div class='del'>-	percpu_counter_set(&amp;sbi-&gt;alloc_valid_block_count, 0);</div><div class='del'>-	percpu_counter_set(&amp;sbi-&gt;rf_node_block_count, 0);</div><div class='del'>-</div><div class='ctx'> 	/* Here, we have one bio having CP pack except cp pack 2 page */</div><div class='ctx'> 	f2fs_sync_meta_pages(sbi, META, LONG_MAX, FS_CP_META_IO);</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_SYNC_CP_META);</div><div class='add'>+</div><div class='ctx'> 	/* Wait for all dirty meta pages to be submitted for IO */</div><div class='ctx'> 	f2fs_wait_on_all_pages(sbi, F2FS_DIRTY_META);</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_WAIT_DIRTY_META);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for previous submitted meta pages writeback */</div><div class='ctx'> 	f2fs_wait_on_all_pages(sbi, F2FS_WB_CP_DATA);</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_WAIT_CP_DATA);</div><div class='ctx'> </div><div class='ctx'> 	/* flush all device cache */</div><div class='ctx'> 	err = f2fs_flush_device_cache(sbi);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_FLUSH_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* barrier and flush checkpoint cp pack 2 page if it can */</div><div class='ctx'> 	commit_checkpoint(sbi, ckpt, start_blk);</div><div class='ctx'> 	f2fs_wait_on_all_pages(sbi, F2FS_WB_CP_DATA);</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_WAIT_LAST_CP);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * invalidate intermediate page cache borrowed from meta inode which are</div><div class='hunk'>@@ -1587,8 +1612,9 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (f2fs_sb_has_encrypt(sbi) || f2fs_sb_has_verity(sbi) ||</div><div class='ctx'> 		f2fs_sb_has_compression(sbi))</div><div class='del'>-		invalidate_mapping_pages(META_MAPPING(sbi),</div><div class='del'>-				MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1);</div><div class='add'>+		f2fs_bug_on(sbi,</div><div class='add'>+			invalidate_inode_pages2_range(META_MAPPING(sbi),</div><div class='add'>+				MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1));</div><div class='ctx'> </div><div class='ctx'> 	f2fs_release_ino_entry(sbi, false);</div><div class='ctx'> </div><div class='hunk'>@@ -1623,6 +1649,8 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	unsigned long long ckpt_ver;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	stat_cp_time(cpc, CP_TIME_START);</div><div class='add'>+</div><div class='ctx'> 	if (f2fs_readonly(sbi-&gt;sb) || f2fs_hw_is_readonly(sbi))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='hunk'>@@ -1634,6 +1662,8 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	if (cpc-&gt;reason != CP_RESIZE)</div><div class='ctx'> 		f2fs_down_write(&amp;sbi-&gt;cp_global_sem);</div><div class='ctx'> </div><div class='add'>+	stat_cp_time(cpc, CP_TIME_LOCK);</div><div class='add'>+</div><div class='ctx'> 	if (!is_sbi_flag_set(sbi, SBI_IS_DIRTY) &amp;&amp;</div><div class='ctx'> 		((cpc-&gt;reason &amp; CP_FASTBOOT) || (cpc-&gt;reason &amp; CP_SYNC) ||</div><div class='ctx'> 		((cpc-&gt;reason &amp; CP_DISCARD) &amp;&amp; !sbi-&gt;discard_blks)))</div><div class='hunk'>@@ -1643,13 +1673,15 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_write_checkpoint(sbi-&gt;sb, cpc-&gt;reason, "start block_ops");</div><div class='add'>+	trace_f2fs_write_checkpoint(sbi-&gt;sb, cpc-&gt;reason, CP_PHASE_START_BLOCK_OPS);</div><div class='ctx'> </div><div class='ctx'> 	err = block_operations(sbi);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_write_checkpoint(sbi-&gt;sb, cpc-&gt;reason, "finish block_ops");</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_OP_LOCK);</div><div class='add'>+</div><div class='add'>+	trace_f2fs_write_checkpoint(sbi-&gt;sb, cpc-&gt;reason, CP_PHASE_FINISH_BLOCK_OPS);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_flush_merged_writes(sbi);</div><div class='ctx'> </div><div class='hunk'>@@ -1688,6 +1720,8 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> </div><div class='ctx'> 	f2fs_flush_sit_entries(sbi, cpc);</div><div class='ctx'> </div><div class='add'>+	stat_cp_time(cpc, CP_TIME_FLUSH_META);</div><div class='add'>+</div><div class='ctx'> 	/* save inmem log status */</div><div class='ctx'> 	f2fs_save_inmem_curseg(sbi);</div><div class='ctx'> </div><div class='hunk'>@@ -1701,16 +1735,19 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_restore_inmem_curseg(sbi);</div><div class='add'>+	f2fs_reinit_atgc_curseg(sbi);</div><div class='ctx'> 	stat_inc_cp_count(sbi);</div><div class='ctx'> stop:</div><div class='ctx'> 	unblock_operations(sbi);</div><div class='add'>+	stat_cp_time(cpc, CP_TIME_END);</div><div class='add'>+	check_cp_time(sbi, cpc);</div><div class='ctx'> </div><div class='ctx'> 	if (cpc-&gt;reason &amp; CP_RECOVERY)</div><div class='ctx'> 		f2fs_notice(sbi, "checkpoint: version = %llx", ckpt_ver);</div><div class='ctx'> </div><div class='ctx'> 	/* update CP_TIME to trigger checkpoint periodically */</div><div class='ctx'> 	f2fs_update_time(sbi, CP_TIME);</div><div class='del'>-	trace_f2fs_write_checkpoint(sbi-&gt;sb, cpc-&gt;reason, "finish checkpoint");</div><div class='add'>+	trace_f2fs_write_checkpoint(sbi-&gt;sb, cpc-&gt;reason, CP_PHASE_FINISH_CHECKPOINT);</div><div class='ctx'> out:</div><div class='ctx'> 	if (cpc-&gt;reason != CP_RESIZE)</div><div class='ctx'> 		f2fs_up_write(&amp;sbi-&gt;cp_global_sem);</div><div class='hunk'>@@ -1730,9 +1767,9 @@ void f2fs_init_ino_entry_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		im-&gt;ino_num = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;max_orphans = (sbi-&gt;blocks_per_seg - F2FS_CP_PACKS -</div><div class='add'>+	sbi-&gt;max_orphans = (BLKS_PER_SEG(sbi) - F2FS_CP_PACKS -</div><div class='ctx'> 			NR_CURSEG_PERSIST_TYPE - __cp_payload(sbi)) *</div><div class='del'>-				F2FS_ORPHANS_PER_BLOCK;</div><div class='add'>+			F2FS_ORPHANS_PER_BLOCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init f2fs_create_checkpoint_caches(void)</div><div class='hunk'>@@ -1787,6 +1824,7 @@ static void __checkpoint_and_complete_reqs(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	llist_for_each_entry_safe(req, next, dispatch_list, llnode) {</div><div class='ctx'> 		diff = (u64)ktime_ms_delta(ktime_get(), req-&gt;queue_time);</div><div class='ctx'> 		req-&gt;ret = ret;</div><div class='add'>+		req-&gt;delta_time = diff;</div><div class='ctx'> 		complete(&amp;req-&gt;wait);</div><div class='ctx'> </div><div class='ctx'> 		sum_diff += diff;</div><div class='hunk'>@@ -1848,7 +1886,8 @@ int f2fs_issue_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	struct cp_control cpc;</div><div class='ctx'> </div><div class='ctx'> 	cpc.reason = __get_cp_reason(sbi);</div><div class='del'>-	if (!test_opt(sbi, MERGE_CHECKPOINT) || cpc.reason != CP_SYNC) {</div><div class='add'>+	if (!test_opt(sbi, MERGE_CHECKPOINT) || cpc.reason != CP_SYNC ||</div><div class='add'>+		sbi-&gt;umount_lock_holder == current) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		f2fs_down_write(&amp;sbi-&gt;gc_lock);</div><div class='hunk'>@@ -1881,6 +1920,12 @@ int f2fs_issue_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	else</div><div class='ctx'> 		flush_remained_ckpt_reqs(sbi, &amp;req);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(req.delta_time &gt;= CP_LONG_LATENCY_THRESHOLD)) {</div><div class='add'>+		f2fs_warn_ratelimited(sbi,</div><div class='add'>+			"blocked on checkpoint for %u ms", cprc-&gt;peak_time);</div><div class='add'>+		dump_stack();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return req.ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1929,7 +1974,7 @@ void f2fs_flush_ckpt_thread(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	/* Let's wait for the previous dispatched checkpoint. */</div><div class='ctx'> 	while (atomic_read(&amp;cprc-&gt;queued_ckpt))</div><div class='del'>-		io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+		io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_init_ckpt_req_control(struct f2fs_sb_info *sbi)</div><div class='head'>diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c<br/>index 531517dac079..7b68bf22989d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/compress.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/compress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/compress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/compress.c</a></div><div class='hunk'>@@ -23,20 +23,18 @@</div><div class='ctx'> static struct kmem_cache *cic_entry_slab;</div><div class='ctx'> static struct kmem_cache *dic_entry_slab;</div><div class='ctx'> </div><div class='del'>-static void *page_array_alloc(struct inode *inode, int nr)</div><div class='add'>+static void *page_array_alloc(struct f2fs_sb_info *sbi, int nr)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	unsigned int size = sizeof(struct page *) * nr;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(size &lt;= sbi-&gt;page_array_slab_size))</div><div class='ctx'> 		return f2fs_kmem_cache_alloc(sbi-&gt;page_array_slab,</div><div class='del'>-					GFP_F2FS_ZERO, false, F2FS_I_SB(inode));</div><div class='add'>+					GFP_F2FS_ZERO, false, sbi);</div><div class='ctx'> 	return f2fs_kzalloc(sbi, size, GFP_NOFS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void page_array_free(struct inode *inode, void *pages, int nr)</div><div class='add'>+static void page_array_free(struct f2fs_sb_info *sbi, void *pages, int nr)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	unsigned int size = sizeof(struct page *) * nr;</div><div class='ctx'> </div><div class='ctx'> 	if (!pages)</div><div class='hunk'>@@ -73,28 +71,28 @@ static pgoff_t start_idx_of_cluster(struct compress_ctx *cc)</div><div class='ctx'> 	return cc-&gt;cluster_idx &lt;&lt; cc-&gt;log_cluster_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_is_compressed_page(struct page *page)</div><div class='add'>+bool f2fs_is_compressed_page(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (!PagePrivate(page))</div><div class='add'>+	if (!folio-&gt;private)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (!page_private(page))</div><div class='del'>-		return false;</div><div class='del'>-	if (page_private_nonpointer(page))</div><div class='add'>+	if (folio_test_f2fs_nonpointer(folio))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(F2FS_M_SB(page-&gt;mapping),</div><div class='del'>-		*((u32 *)page_private(page)) != F2FS_COMPRESSED_PAGE_MAGIC);</div><div class='add'>+	f2fs_bug_on(F2FS_F_SB(folio),</div><div class='add'>+		*((u32 *)folio-&gt;private) != F2FS_COMPRESSED_PAGE_MAGIC);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void f2fs_set_compressed_page(struct page *page,</div><div class='ctx'> 		struct inode *inode, pgoff_t index, void *data)</div><div class='ctx'> {</div><div class='del'>-	attach_page_private(page, (void *)data);</div><div class='add'>+	struct folio *folio = page_folio(page);</div><div class='add'>+</div><div class='add'>+	folio_attach_private(folio, (void *)data);</div><div class='ctx'> </div><div class='ctx'> 	/* i_crypto_info and iv index */</div><div class='del'>-	page-&gt;index = index;</div><div class='del'>-	page-&gt;mapping = inode-&gt;i_mapping;</div><div class='add'>+	folio-&gt;index = index;</div><div class='add'>+	folio-&gt;mapping = inode-&gt;i_mapping;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void f2fs_drop_rpages(struct compress_ctx *cc, int len, bool unlock)</div><div class='hunk'>@@ -122,7 +120,7 @@ static void f2fs_unlock_rpages(struct compress_ctx *cc, int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void f2fs_put_rpages_wbc(struct compress_ctx *cc,</div><div class='del'>-		struct writeback_control *wbc, bool redirty, int unlock)</div><div class='add'>+		struct writeback_control *wbc, bool redirty, bool unlock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -135,9 +133,11 @@ static void f2fs_put_rpages_wbc(struct compress_ctx *cc,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_compress_control_page(struct page *page)</div><div class='add'>+struct folio *f2fs_compress_control_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return ((struct compress_io_ctx *)page_private(page))-&gt;rpages[0];</div><div class='add'>+	struct compress_io_ctx *ctx = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	return page_folio(ctx-&gt;rpages[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_init_compress_ctx(struct compress_ctx *cc)</div><div class='hunk'>@@ -145,13 +145,13 @@ int f2fs_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> 	if (cc-&gt;rpages)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	cc-&gt;rpages = page_array_alloc(cc-&gt;inode, cc-&gt;cluster_size);</div><div class='add'>+	cc-&gt;rpages = page_array_alloc(F2FS_I_SB(cc-&gt;inode), cc-&gt;cluster_size);</div><div class='ctx'> 	return cc-&gt;rpages ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse)</div><div class='ctx'> {</div><div class='del'>-	page_array_free(cc-&gt;inode, cc-&gt;rpages, cc-&gt;cluster_size);</div><div class='add'>+	page_array_free(F2FS_I_SB(cc-&gt;inode), cc-&gt;rpages, cc-&gt;cluster_size);</div><div class='ctx'> 	cc-&gt;rpages = NULL;</div><div class='ctx'> 	cc-&gt;nr_rpages = 0;</div><div class='ctx'> 	cc-&gt;nr_cpages = 0;</div><div class='hunk'>@@ -160,24 +160,24 @@ void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse)</div><div class='ctx'> 		cc-&gt;cluster_idx = NULL_CLUSTER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page)</div><div class='add'>+void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cluster_ofs;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_cluster_can_merge_page(cc, page-&gt;index))</div><div class='add'>+	if (!f2fs_cluster_can_merge_page(cc, folio-&gt;index))</div><div class='ctx'> 		f2fs_bug_on(F2FS_I_SB(cc-&gt;inode), 1);</div><div class='ctx'> </div><div class='del'>-	cluster_ofs = offset_in_cluster(cc, page-&gt;index);</div><div class='del'>-	cc-&gt;rpages[cluster_ofs] = page;</div><div class='add'>+	cluster_ofs = offset_in_cluster(cc, folio-&gt;index);</div><div class='add'>+	cc-&gt;rpages[cluster_ofs] = folio_page(folio, 0);</div><div class='ctx'> 	cc-&gt;nr_rpages++;</div><div class='del'>-	cc-&gt;cluster_idx = cluster_idx(cc, page-&gt;index);</div><div class='add'>+	cc-&gt;cluster_idx = cluster_idx(cc, folio-&gt;index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_LZO</div><div class='ctx'> static int lzo_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='del'>-	cc-&gt;private = f2fs_kvmalloc(F2FS_I_SB(cc-&gt;inode),</div><div class='del'>-				LZO1X_MEM_COMPRESS, GFP_NOFS);</div><div class='add'>+	cc-&gt;private = f2fs_vmalloc(F2FS_I_SB(cc-&gt;inode),</div><div class='add'>+					LZO1X_MEM_COMPRESS);</div><div class='ctx'> 	if (!cc-&gt;private)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +187,7 @@ static int lzo_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> </div><div class='ctx'> static void lzo_destroy_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='del'>-	kvfree(cc-&gt;private);</div><div class='add'>+	vfree(cc-&gt;private);</div><div class='ctx'> 	cc-&gt;private = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -198,8 +198,8 @@ static int lzo_compress_pages(struct compress_ctx *cc)</div><div class='ctx'> 	ret = lzo1x_1_compress(cc-&gt;rbuf, cc-&gt;rlen, cc-&gt;cbuf-&gt;cdata,</div><div class='ctx'> 					&amp;cc-&gt;clen, cc-&gt;private);</div><div class='ctx'> 	if (ret != LZO_E_OK) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): lzo compress failed, ret:%d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(cc-&gt;inode)-&gt;sb-&gt;s_id, ret);</div><div class='add'>+		f2fs_err_ratelimited(F2FS_I_SB(cc-&gt;inode),</div><div class='add'>+				"lzo compress failed, ret:%d", ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -212,17 +212,15 @@ static int lzo_decompress_pages(struct decompress_io_ctx *dic)</div><div class='ctx'> 	ret = lzo1x_decompress_safe(dic-&gt;cbuf-&gt;cdata, dic-&gt;clen,</div><div class='ctx'> 						dic-&gt;rbuf, &amp;dic-&gt;rlen);</div><div class='ctx'> 	if (ret != LZO_E_OK) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): lzo decompress failed, ret:%d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id, ret);</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"lzo decompress failed, ret:%d", ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dic-&gt;rlen != PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): lzo invalid rlen:%zu, "</div><div class='del'>-					"expected:%lu\n", KERN_ERR,</div><div class='del'>-					F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='del'>-					dic-&gt;rlen,</div><div class='del'>-					PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size);</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"lzo invalid rlen:%zu, expected:%lu",</div><div class='add'>+				dic-&gt;rlen, PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -246,7 +244,7 @@ static int lz4_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> 		size = LZ4HC_MEM_COMPRESS;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	cc-&gt;private = f2fs_kvmalloc(F2FS_I_SB(cc-&gt;inode), size, GFP_NOFS);</div><div class='add'>+	cc-&gt;private = f2fs_vmalloc(F2FS_I_SB(cc-&gt;inode), size);</div><div class='ctx'> 	if (!cc-&gt;private)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +259,7 @@ static int lz4_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> </div><div class='ctx'> static void lz4_destroy_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='del'>-	kvfree(cc-&gt;private);</div><div class='add'>+	vfree(cc-&gt;private);</div><div class='ctx'> 	cc-&gt;private = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -294,16 +292,15 @@ static int lz4_decompress_pages(struct decompress_io_ctx *dic)</div><div class='ctx'> 	ret = LZ4_decompress_safe(dic-&gt;cbuf-&gt;cdata, dic-&gt;rbuf,</div><div class='ctx'> 						dic-&gt;clen, dic-&gt;rlen);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): lz4 decompress failed, ret:%d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id, ret);</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"lz4 decompress failed, ret:%d", ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret != PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): lz4 invalid ret:%d, "</div><div class='del'>-					"expected:%lu\n", KERN_ERR,</div><div class='del'>-					F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id, ret,</div><div class='del'>-					PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size);</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"lz4 invalid ret:%d, expected:%lu",</div><div class='add'>+				ret, PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -343,17 +340,15 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> 	params = zstd_get_params(level, cc-&gt;rlen);</div><div class='ctx'> 	workspace_size = zstd_cstream_workspace_bound(&amp;params.cParams);</div><div class='ctx'> </div><div class='del'>-	workspace = f2fs_kvmalloc(F2FS_I_SB(cc-&gt;inode),</div><div class='del'>-					workspace_size, GFP_NOFS);</div><div class='add'>+	workspace = f2fs_vmalloc(F2FS_I_SB(cc-&gt;inode), workspace_size);</div><div class='ctx'> 	if (!workspace)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	stream = zstd_init_cstream(&amp;params, 0, workspace, workspace_size);</div><div class='ctx'> 	if (!stream) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): %s zstd_init_cstream failed\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(cc-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='del'>-				__func__);</div><div class='del'>-		kvfree(workspace);</div><div class='add'>+		f2fs_err_ratelimited(F2FS_I_SB(cc-&gt;inode),</div><div class='add'>+				"%s zstd_init_cstream failed", __func__);</div><div class='add'>+		vfree(workspace);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +361,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> </div><div class='ctx'> static void zstd_destroy_compress_ctx(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='del'>-	kvfree(cc-&gt;private);</div><div class='add'>+	vfree(cc-&gt;private);</div><div class='ctx'> 	cc-&gt;private = NULL;</div><div class='ctx'> 	cc-&gt;private2 = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -390,16 +385,16 @@ static int zstd_compress_pages(struct compress_ctx *cc)</div><div class='ctx'> </div><div class='ctx'> 	ret = zstd_compress_stream(stream, &amp;outbuf, &amp;inbuf);</div><div class='ctx'> 	if (zstd_is_error(ret)) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): %s zstd_compress_stream failed, ret: %d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(cc-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='add'>+		f2fs_err_ratelimited(F2FS_I_SB(cc-&gt;inode),</div><div class='add'>+				"%s zstd_compress_stream failed, ret: %d",</div><div class='ctx'> 				__func__, zstd_get_error_code(ret));</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = zstd_end_stream(stream, &amp;outbuf);</div><div class='ctx'> 	if (zstd_is_error(ret)) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): %s zstd_end_stream returned %d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(cc-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='add'>+		f2fs_err_ratelimited(F2FS_I_SB(cc-&gt;inode),</div><div class='add'>+				"%s zstd_end_stream returned %d",</div><div class='ctx'> 				__func__, zstd_get_error_code(ret));</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -425,17 +420,15 @@ static int zstd_init_decompress_ctx(struct decompress_io_ctx *dic)</div><div class='ctx'> </div><div class='ctx'> 	workspace_size = zstd_dstream_workspace_bound(max_window_size);</div><div class='ctx'> </div><div class='del'>-	workspace = f2fs_kvmalloc(F2FS_I_SB(dic-&gt;inode),</div><div class='del'>-					workspace_size, GFP_NOFS);</div><div class='add'>+	workspace = f2fs_vmalloc(dic-&gt;sbi, workspace_size);</div><div class='ctx'> 	if (!workspace)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	stream = zstd_init_dstream(max_window_size, workspace, workspace_size);</div><div class='ctx'> 	if (!stream) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): %s zstd_init_dstream failed\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='del'>-				__func__);</div><div class='del'>-		kvfree(workspace);</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"%s zstd_init_dstream failed", __func__);</div><div class='add'>+		vfree(workspace);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -447,7 +440,7 @@ static int zstd_init_decompress_ctx(struct decompress_io_ctx *dic)</div><div class='ctx'> </div><div class='ctx'> static void zstd_destroy_decompress_ctx(struct decompress_io_ctx *dic)</div><div class='ctx'> {</div><div class='del'>-	kvfree(dic-&gt;private);</div><div class='add'>+	vfree(dic-&gt;private);</div><div class='ctx'> 	dic-&gt;private = NULL;</div><div class='ctx'> 	dic-&gt;private2 = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -469,16 +462,15 @@ static int zstd_decompress_pages(struct decompress_io_ctx *dic)</div><div class='ctx'> </div><div class='ctx'> 	ret = zstd_decompress_stream(stream, &amp;outbuf, &amp;inbuf);</div><div class='ctx'> 	if (zstd_is_error(ret)) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): %s zstd_decompress_stream failed, ret: %d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"%s zstd_decompress_stream failed, ret: %d",</div><div class='ctx'> 				__func__, zstd_get_error_code(ret));</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dic-&gt;rlen != outbuf.pos) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): %s ZSTD invalid rlen:%zu, "</div><div class='del'>-				"expected:%lu\n", KERN_ERR,</div><div class='del'>-				F2FS_I_SB(dic-&gt;inode)-&gt;sb-&gt;s_id,</div><div class='add'>+		f2fs_err_ratelimited(dic-&gt;sbi,</div><div class='add'>+				"%s ZSTD invalid rlen:%zu, expected:%lu",</div><div class='ctx'> 				__func__, dic-&gt;rlen,</div><div class='ctx'> 				PAGE_SIZE &lt;&lt; dic-&gt;log_cluster_size);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -512,8 +504,8 @@ static int lzorle_compress_pages(struct compress_ctx *cc)</div><div class='ctx'> 	ret = lzorle1x_1_compress(cc-&gt;rbuf, cc-&gt;rlen, cc-&gt;cbuf-&gt;cdata,</div><div class='ctx'> 					&amp;cc-&gt;clen, cc-&gt;private);</div><div class='ctx'> 	if (ret != LZO_E_OK) {</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s): lzo-rle compress failed, ret:%d\n",</div><div class='del'>-				KERN_ERR, F2FS_I_SB(cc-&gt;inode)-&gt;sb-&gt;s_id, ret);</div><div class='add'>+		f2fs_err_ratelimited(F2FS_I_SB(cc-&gt;inode),</div><div class='add'>+				"lzo-rle compress failed, ret:%d", ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -597,11 +589,14 @@ static struct page *f2fs_compress_alloc_page(void)</div><div class='ctx'> </div><div class='ctx'> static void f2fs_compress_free_page(struct page *page)</div><div class='ctx'> {</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return;</div><div class='del'>-	detach_page_private(page);</div><div class='del'>-	page-&gt;mapping = NULL;</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio = page_folio(page);</div><div class='add'>+	folio_detach_private(folio);</div><div class='add'>+	folio-&gt;mapping = NULL;</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> 	mempool_free(page, compress_page_pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -623,6 +618,7 @@ static void *f2fs_vmap(struct page **pages, unsigned int count)</div><div class='ctx'> </div><div class='ctx'> static int f2fs_compress_pages(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(cc-&gt;inode);</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(cc-&gt;inode);</div><div class='ctx'> 	const struct f2fs_compress_ops *cops =</div><div class='ctx'> 				f2fs_cops[fi-&gt;i_compress_algorithm];</div><div class='hunk'>@@ -643,7 +639,7 @@ static int f2fs_compress_pages(struct compress_ctx *cc)</div><div class='ctx'> 	cc-&gt;nr_cpages = DIV_ROUND_UP(max_len, PAGE_SIZE);</div><div class='ctx'> 	cc-&gt;valid_nr_cpages = cc-&gt;nr_cpages;</div><div class='ctx'> </div><div class='del'>-	cc-&gt;cpages = page_array_alloc(cc-&gt;inode, cc-&gt;nr_cpages);</div><div class='add'>+	cc-&gt;cpages = page_array_alloc(sbi, cc-&gt;nr_cpages);</div><div class='ctx'> 	if (!cc-&gt;cpages) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto destroy_compress_ctx;</div><div class='hunk'>@@ -678,8 +674,7 @@ static int f2fs_compress_pages(struct compress_ctx *cc)</div><div class='ctx'> 	cc-&gt;cbuf-&gt;clen = cpu_to_le32(cc-&gt;clen);</div><div class='ctx'> </div><div class='ctx'> 	if (fi-&gt;i_compress_flag &amp; BIT(COMPRESS_CHKSUM))</div><div class='del'>-		chksum = f2fs_crc32(F2FS_I_SB(cc-&gt;inode),</div><div class='del'>-					cc-&gt;cbuf-&gt;cdata, cc-&gt;clen);</div><div class='add'>+		chksum = f2fs_crc32(cc-&gt;cbuf-&gt;cdata, cc-&gt;clen);</div><div class='ctx'> 	cc-&gt;cbuf-&gt;chksum = cpu_to_le32(chksum);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; COMPRESS_DATA_RESERVED_SIZE; i++)</div><div class='hunk'>@@ -718,7 +713,7 @@ out_free_cpages:</div><div class='ctx'> 		if (cc-&gt;cpages[i])</div><div class='ctx'> 			f2fs_compress_free_page(cc-&gt;cpages[i]);</div><div class='ctx'> 	}</div><div class='del'>-	page_array_free(cc-&gt;inode, cc-&gt;cpages, cc-&gt;nr_cpages);</div><div class='add'>+	page_array_free(sbi, cc-&gt;cpages, cc-&gt;nr_cpages);</div><div class='ctx'> 	cc-&gt;cpages = NULL;</div><div class='ctx'> destroy_compress_ctx:</div><div class='ctx'> 	if (cops-&gt;destroy_compress_ctx)</div><div class='hunk'>@@ -736,7 +731,7 @@ static void f2fs_release_decomp_mem(struct decompress_io_ctx *dic,</div><div class='ctx'> </div><div class='ctx'> void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(dic-&gt;inode);</div><div class='add'>+	struct f2fs_sb_info *sbi = dic-&gt;sbi;</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(dic-&gt;inode);</div><div class='ctx'> 	const struct f2fs_compress_ops *cops =</div><div class='ctx'> 			f2fs_cops[fi-&gt;i_compress_algorithm];</div><div class='hunk'>@@ -764,10 +759,7 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task)</div><div class='ctx'> 		ret = -EFSCORRUPTED;</div><div class='ctx'> </div><div class='ctx'> 		/* Avoid f2fs_commit_super in irq context */</div><div class='del'>-		if (!in_task)</div><div class='del'>-			f2fs_handle_error_async(sbi, ERROR_FAIL_DECOMPRESSION);</div><div class='del'>-		else</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_FAIL_DECOMPRESSION);</div><div class='add'>+		f2fs_handle_error(sbi, ERROR_FAIL_DECOMPRESSION);</div><div class='ctx'> 		goto out_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -775,14 +767,14 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task)</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; (fi-&gt;i_compress_flag &amp; BIT(COMPRESS_CHKSUM))) {</div><div class='ctx'> 		u32 provided = le32_to_cpu(dic-&gt;cbuf-&gt;chksum);</div><div class='del'>-		u32 calculated = f2fs_crc32(sbi, dic-&gt;cbuf-&gt;cdata, dic-&gt;clen);</div><div class='add'>+		u32 calculated = f2fs_crc32(dic-&gt;cbuf-&gt;cdata, dic-&gt;clen);</div><div class='ctx'> </div><div class='ctx'> 		if (provided != calculated) {</div><div class='ctx'> 			if (!is_inode_flag_set(dic-&gt;inode, FI_COMPRESS_CORRUPT)) {</div><div class='ctx'> 				set_inode_flag(dic-&gt;inode, FI_COMPRESS_CORRUPT);</div><div class='del'>-				printk_ratelimited(</div><div class='del'>-					"%sF2FS-fs (%s): checksum invalid, nid = %lu, %x vs %x",</div><div class='del'>-					KERN_INFO, sbi-&gt;sb-&gt;s_id, dic-&gt;inode-&gt;i_ino,</div><div class='add'>+				f2fs_info_ratelimited(sbi,</div><div class='add'>+					"checksum invalid, nid = %lu, %x vs %x",</div><div class='add'>+					dic-&gt;inode-&gt;i_ino,</div><div class='ctx'> 					provided, calculated);</div><div class='ctx'> 			}</div><div class='ctx'> 			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='hunk'>@@ -798,25 +790,27 @@ out_end_io:</div><div class='ctx'> 	f2fs_decompress_end_io(dic, ret, in_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi,</div><div class='add'>+		struct folio *folio, nid_t ino, block_t blkaddr);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is called when a page of a compressed cluster has been read from disk</div><div class='ctx'>  * (or failed to be read from disk).  It checks whether this page was the last</div><div class='ctx'>  * page being waited on in the cluster, and if so, it decompresses the cluster</div><div class='ctx'>  * (or in the case of a failure, cleans up without actually decompressing).</div><div class='ctx'>  */</div><div class='del'>-void f2fs_end_read_compressed_page(struct page *page, bool failed,</div><div class='add'>+void f2fs_end_read_compressed_page(struct folio *folio, bool failed,</div><div class='ctx'> 		block_t blkaddr, bool in_task)</div><div class='ctx'> {</div><div class='del'>-	struct decompress_io_ctx *dic =</div><div class='del'>-			(struct decompress_io_ctx *)page_private(page);</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(dic-&gt;inode);</div><div class='add'>+	struct decompress_io_ctx *dic = folio-&gt;private;</div><div class='add'>+	struct f2fs_sb_info *sbi = dic-&gt;sbi;</div><div class='ctx'> </div><div class='ctx'> 	dec_page_count(sbi, F2FS_RD_DATA);</div><div class='ctx'> </div><div class='ctx'> 	if (failed)</div><div class='ctx'> 		WRITE_ONCE(dic-&gt;failed, true);</div><div class='ctx'> 	else if (blkaddr &amp;&amp; in_task)</div><div class='del'>-		f2fs_cache_compressed_page(sbi, page,</div><div class='add'>+		f2fs_cache_compressed_page(sbi, folio,</div><div class='ctx'> 					dic-&gt;inode-&gt;i_ino, blkaddr);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_and_test(&amp;dic-&gt;remaining_pages))</div><div class='hunk'>@@ -850,7 +844,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index)</div><div class='ctx'> bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct page **pages,</div><div class='ctx'> 				int index, int nr_pages, bool uptodate)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pgidx = pages[index]-&gt;index;</div><div class='add'>+	unsigned long pgidx = page_folio(pages[index])-&gt;index;</div><div class='ctx'> 	int i = uptodate ? 0 : 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -864,9 +858,11 @@ bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct page **pages,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	for (; i &lt; cc-&gt;cluster_size; i++) {</div><div class='del'>-		if (pages[index + i]-&gt;index != pgidx + i)</div><div class='add'>+		struct folio *folio = page_folio(pages[index + i]);</div><div class='add'>+</div><div class='add'>+		if (folio-&gt;index != pgidx + i)</div><div class='ctx'> 			return false;</div><div class='del'>-		if (uptodate &amp;&amp; !PageUptodate(pages[index + i]))</div><div class='add'>+		if (uptodate &amp;&amp; !folio_test_uptodate(folio))</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -885,7 +881,7 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc)</div><div class='ctx'> 		f2fs_bug_on(F2FS_I_SB(cc-&gt;inode), !page);</div><div class='ctx'> </div><div class='ctx'> 		/* beyond EOF */</div><div class='del'>-		if (page-&gt;index &gt;= nr_pages)</div><div class='add'>+		if (page_folio(page)-&gt;index &gt;= nr_pages)</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -911,7 +907,7 @@ bool f2fs_sanity_check_cluster(struct dnode_of_data *dn)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1, count = 1; i &lt; cluster_size; i++, count++) {</div><div class='del'>-		block_t blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='add'>+		block_t blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='ctx'> 							dn-&gt;ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 		/* [COMPR_ADDR, ..., COMPR_ADDR] */</div><div class='hunk'>@@ -951,8 +947,8 @@ static int __f2fs_get_cluster_blocks(struct inode *inode,</div><div class='ctx'> 	unsigned int cluster_size = F2FS_I(inode)-&gt;i_cluster_size;</div><div class='ctx'> 	int count, i;</div><div class='ctx'> </div><div class='del'>-	for (i = 1, count = 1; i &lt; cluster_size; i++) {</div><div class='del'>-		block_t blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='add'>+	for (i = 0, count = 0; i &lt; cluster_size; i++) {</div><div class='add'>+		block_t blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='ctx'> 							dn-&gt;ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 		if (__is_valid_data_blkaddr(blkaddr))</div><div class='hunk'>@@ -962,8 +958,8 @@ static int __f2fs_get_cluster_blocks(struct inode *inode,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __f2fs_cluster_blocks(struct inode *inode,</div><div class='del'>-				unsigned int cluster_idx, bool compr_blks)</div><div class='add'>+static int __f2fs_cluster_blocks(struct inode *inode, unsigned int cluster_idx,</div><div class='add'>+				enum cluster_check_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	unsigned int start_idx = cluster_idx &lt;&lt;</div><div class='hunk'>@@ -984,10 +980,12 @@ static int __f2fs_cluster_blocks(struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dn.data_blkaddr == COMPRESS_ADDR) {</div><div class='del'>-		if (compr_blks)</div><div class='del'>-			ret = __f2fs_get_cluster_blocks(inode, &amp;dn);</div><div class='del'>-		else</div><div class='add'>+		if (type == CLUSTER_COMPR_BLKS)</div><div class='add'>+			ret = 1 + __f2fs_get_cluster_blocks(inode, &amp;dn);</div><div class='add'>+		else if (type == CLUSTER_IS_COMPR)</div><div class='ctx'> 			ret = 1;</div><div class='add'>+	} else if (type == CLUSTER_RAW_BLKS) {</div><div class='add'>+		ret = __f2fs_get_cluster_blocks(inode, &amp;dn);</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='hunk'>@@ -997,7 +995,16 @@ fail:</div><div class='ctx'> /* return # of compressed blocks in compressed cluster */</div><div class='ctx'> static int f2fs_compressed_blocks(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='del'>-	return __f2fs_cluster_blocks(cc-&gt;inode, cc-&gt;cluster_idx, true);</div><div class='add'>+	return __f2fs_cluster_blocks(cc-&gt;inode, cc-&gt;cluster_idx,</div><div class='add'>+		CLUSTER_COMPR_BLKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return # of raw blocks in non-compressed cluster */</div><div class='add'>+static int f2fs_decompressed_blocks(struct inode *inode,</div><div class='add'>+				unsigned int cluster_idx)</div><div class='add'>+{</div><div class='add'>+	return __f2fs_cluster_blocks(inode, cluster_idx,</div><div class='add'>+		CLUSTER_RAW_BLKS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* return whether cluster is compressed one or not */</div><div class='hunk'>@@ -1005,7 +1012,16 @@ int f2fs_is_compressed_cluster(struct inode *inode, pgoff_t index)</div><div class='ctx'> {</div><div class='ctx'> 	return __f2fs_cluster_blocks(inode,</div><div class='ctx'> 		index &gt;&gt; F2FS_I(inode)-&gt;i_log_cluster_size,</div><div class='del'>-		false);</div><div class='add'>+		CLUSTER_IS_COMPR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return whether cluster contains non raw blocks or not */</div><div class='add'>+bool f2fs_is_sparse_cluster(struct inode *inode, pgoff_t index)</div><div class='add'>+{</div><div class='add'>+	unsigned int cluster_idx = index &gt;&gt; F2FS_I(inode)-&gt;i_log_cluster_size;</div><div class='add'>+</div><div class='add'>+	return f2fs_decompressed_blocks(inode, cluster_idx) !=</div><div class='add'>+		F2FS_I(inode)-&gt;i_cluster_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool cluster_may_compress(struct compress_ctx *cc)</div><div class='hunk'>@@ -1031,6 +1047,31 @@ static void set_cluster_writeback(struct compress_ctx *cc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cancel_cluster_writeback(struct compress_ctx *cc,</div><div class='add'>+			struct compress_io_ctx *cic, int submitted)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Wait for submitted IOs. */</div><div class='add'>+	if (submitted &gt; 1) {</div><div class='add'>+		f2fs_submit_merged_write(F2FS_I_SB(cc-&gt;inode), DATA);</div><div class='add'>+		while (atomic_read(&amp;cic-&gt;pending_pages) !=</div><div class='add'>+					(cc-&gt;valid_nr_cpages - submitted + 1))</div><div class='add'>+			f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cancel writeback and stay locked. */</div><div class='add'>+	for (i = 0; i &lt; cc-&gt;cluster_size; i++) {</div><div class='add'>+		if (i &lt; submitted) {</div><div class='add'>+			inode_inc_dirty_pages(cc-&gt;inode);</div><div class='add'>+			lock_page(cc-&gt;rpages[i]);</div><div class='add'>+		}</div><div class='add'>+		clear_page_private_gcing(cc-&gt;rpages[i]);</div><div class='add'>+		if (folio_test_writeback(page_folio(cc-&gt;rpages[i])))</div><div class='add'>+			end_page_writeback(cc-&gt;rpages[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void set_cluster_dirty(struct compress_ctx *cc)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1047,7 +1088,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(cc-&gt;inode);</div><div class='ctx'> 	struct address_space *mapping = cc-&gt;inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	sector_t last_block_in_bio;</div><div class='ctx'> 	fgf_t fgp_flag = FGP_LOCK | FGP_WRITE | FGP_CREAT;</div><div class='ctx'> 	pgoff_t start_idx = start_idx_of_cluster(cc);</div><div class='hunk'>@@ -1062,26 +1103,26 @@ retry:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* keep page reference to avoid page reclaim */</div><div class='add'>+	/* keep folio reference to avoid page reclaim */</div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;cluster_size; i++) {</div><div class='del'>-		page = f2fs_pagecache_get_page(mapping, start_idx + i,</div><div class='del'>-							fgp_flag, GFP_NOFS);</div><div class='del'>-		if (!page) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='add'>+		folio = f2fs_filemap_get_folio(mapping, start_idx + i,</div><div class='add'>+				fgp_flag, GFP_NOFS);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			ret = PTR_ERR(folio);</div><div class='ctx'> 			goto unlock_pages;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (PageUptodate(page))</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		if (folio_test_uptodate(folio))</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 		else</div><div class='del'>-			f2fs_compress_ctx_add_page(cc, page);</div><div class='add'>+			f2fs_compress_ctx_add_page(cc, folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_cluster_is_empty(cc)) {</div><div class='ctx'> 		struct bio *bio = NULL;</div><div class='ctx'> </div><div class='ctx'> 		ret = f2fs_read_multi_pages(cc, &amp;bio, cc-&gt;cluster_size,</div><div class='del'>-					&amp;last_block_in_bio, false, true);</div><div class='add'>+					&amp;last_block_in_bio, NULL, true);</div><div class='ctx'> 		f2fs_put_rpages(cc);</div><div class='ctx'> 		f2fs_destroy_compress_ctx(cc, true);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1097,16 +1138,17 @@ retry:</div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;cluster_size; i++) {</div><div class='ctx'> 		f2fs_bug_on(sbi, cc-&gt;rpages[i]);</div><div class='ctx'> </div><div class='del'>-		page = find_lock_page(mapping, start_idx + i);</div><div class='del'>-		if (!page) {</div><div class='del'>-			/* page can be truncated */</div><div class='add'>+		folio = filemap_lock_folio(mapping, start_idx + i);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			/* folio could be truncated */</div><div class='ctx'> 			goto release_and_retry;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='del'>-		f2fs_compress_ctx_add_page(cc, page);</div><div class='add'>+		f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='add'>+		f2fs_compress_ctx_add_page(cc, folio);</div><div class='ctx'> </div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='add'>+		if (!folio_test_uptodate(folio)) {</div><div class='add'>+			f2fs_handle_page_eio(sbi, folio, DATA);</div><div class='ctx'> release_and_retry:</div><div class='ctx'> 			f2fs_put_rpages(cc);</div><div class='ctx'> 			f2fs_unlock_rpages(cc, i + 1);</div><div class='hunk'>@@ -1154,12 +1196,13 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,</div><div class='ctx'> 		.cluster_size = F2FS_I(inode)-&gt;i_cluster_size,</div><div class='ctx'> 		.rpages = fsdata,</div><div class='ctx'> 	};</div><div class='del'>-	bool first_index = (index == cc.rpages[0]-&gt;index);</div><div class='add'>+	struct folio *folio = page_folio(cc.rpages[0]);</div><div class='add'>+	bool first_index = (index == folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	if (copied)</div><div class='ctx'> 		set_cluster_dirty(&amp;cc);</div><div class='ctx'> </div><div class='del'>-	f2fs_put_rpages_wbc(&amp;cc, NULL, false, 1);</div><div class='add'>+	f2fs_put_rpages_wbc(&amp;cc, NULL, false, true);</div><div class='ctx'> 	f2fs_destroy_compress_ctx(&amp;cc, false);</div><div class='ctx'> </div><div class='ctx'> 	return first_index;</div><div class='hunk'>@@ -1169,9 +1212,11 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)</div><div class='ctx'> {</div><div class='ctx'> 	void *fsdata = NULL;</div><div class='ctx'> 	struct page *pagep;</div><div class='add'>+	struct page **rpages;</div><div class='ctx'> 	int log_cluster_size = F2FS_I(inode)-&gt;i_log_cluster_size;</div><div class='ctx'> 	pgoff_t start_idx = from &gt;&gt; (PAGE_SHIFT + log_cluster_size) &lt;&lt;</div><div class='ctx'> 							log_cluster_size;</div><div class='add'>+	int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_is_compressed_cluster(inode, start_idx);</div><div class='hunk'>@@ -1192,26 +1237,30 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)</div><div class='ctx'> 	if (err &lt;= 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (err &gt; 0) {</div><div class='del'>-		struct page **rpages = fsdata;</div><div class='del'>-		int cluster_size = F2FS_I(inode)-&gt;i_cluster_size;</div><div class='del'>-		int i;</div><div class='add'>+	rpages = fsdata;</div><div class='ctx'> </div><div class='del'>-		for (i = cluster_size - 1; i &gt;= 0; i--) {</div><div class='del'>-			loff_t start = rpages[i]-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	for (i = (1 &lt;&lt; log_cluster_size) - 1; i &gt;= 0; i--) {</div><div class='add'>+		struct folio *folio = page_folio(rpages[i]);</div><div class='add'>+		loff_t start = (loff_t)folio-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		loff_t offset = from &gt; start ? from - start : 0;</div><div class='ctx'> </div><div class='del'>-			if (from &lt;= start) {</div><div class='del'>-				zero_user_segment(rpages[i], 0, PAGE_SIZE);</div><div class='del'>-			} else {</div><div class='del'>-				zero_user_segment(rpages[i], from - start,</div><div class='del'>-								PAGE_SIZE);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		folio_zero_segment(folio, offset, folio_size(folio));</div><div class='ctx'> </div><div class='del'>-		f2fs_compress_write_end(inode, fsdata, start_idx, true);</div><div class='add'>+		if (from &gt;= start)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	f2fs_compress_write_end(inode, fsdata, start_idx, true);</div><div class='add'>+</div><div class='add'>+	err = filemap_write_and_wait_range(inode-&gt;i_mapping,</div><div class='add'>+			round_down(from, 1 &lt;&lt; log_cluster_size &lt;&lt; PAGE_SHIFT),</div><div class='add'>+			LLONG_MAX);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	truncate_pagecache(inode, from);</div><div class='add'>+</div><div class='add'>+	return f2fs_do_truncate_blocks(inode, round_up(from, PAGE_SIZE), lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='hunk'>@@ -1232,12 +1281,12 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> 		.page = NULL,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.compressed_page = NULL,</div><div class='del'>-		.submitted = 0,</div><div class='ctx'> 		.io_type = io_type,</div><div class='ctx'> 		.io_wbc = wbc,</div><div class='ctx'> 		.encrypted = fscrypt_inode_uses_fs_layer_crypto(cc-&gt;inode) ?</div><div class='ctx'> 									1 : 0,</div><div class='ctx'> 	};</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct node_info ni;</div><div class='ctx'> 	struct compress_io_ctx *cic;</div><div class='hunk'>@@ -1249,7 +1298,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> </div><div class='ctx'> 	/* we should bypass data pages to proceed the kworker jobs */</div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='del'>-		mapping_set_error(cc-&gt;rpages[0]-&gt;mapping, -EIO);</div><div class='add'>+		mapping_set_error(inode-&gt;i_mapping, -EIO);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1271,12 +1320,13 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> 		goto out_unlock_op;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;cluster_size; i++) {</div><div class='del'>-		if (data_blkaddr(dn.inode, dn.node_page,</div><div class='add'>+		if (data_blkaddr(dn.inode, dn.node_folio,</div><div class='ctx'> 					dn.ofs_in_node + i) == NULL_ADDR)</div><div class='ctx'> 			goto out_put_dnode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	psize = (loff_t)(cc-&gt;rpages[last_index]-&gt;index + 1) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	folio = page_folio(cc-&gt;rpages[last_index]);</div><div class='add'>+	psize = folio_next_pos(folio);</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_get_node_info(fio.sbi, dn.nid, &amp;ni, false);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1291,7 +1341,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> 	cic-&gt;magic = F2FS_COMPRESSED_PAGE_MAGIC;</div><div class='ctx'> 	cic-&gt;inode = inode;</div><div class='ctx'> 	atomic_set(&amp;cic-&gt;pending_pages, cc-&gt;valid_nr_cpages);</div><div class='del'>-	cic-&gt;rpages = page_array_alloc(cc-&gt;inode, cc-&gt;cluster_size);</div><div class='add'>+	cic-&gt;rpages = page_array_alloc(sbi, cc-&gt;cluster_size);</div><div class='ctx'> 	if (!cic-&gt;rpages)</div><div class='ctx'> 		goto out_put_cic;</div><div class='ctx'> </div><div class='hunk'>@@ -1299,10 +1349,10 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;valid_nr_cpages; i++) {</div><div class='ctx'> 		f2fs_set_compressed_page(cc-&gt;cpages[i], inode,</div><div class='del'>-					cc-&gt;rpages[i + 1]-&gt;index, cic);</div><div class='add'>+				page_folio(cc-&gt;rpages[i + 1])-&gt;index, cic);</div><div class='ctx'> 		fio.compressed_page = cc-&gt;cpages[i];</div><div class='ctx'> </div><div class='del'>-		fio.old_blkaddr = data_blkaddr(dn.inode, dn.node_page,</div><div class='add'>+		fio.old_blkaddr = data_blkaddr(dn.inode, dn.node_folio,</div><div class='ctx'> 						dn.ofs_in_node + i + 1);</div><div class='ctx'> </div><div class='ctx'> 		/* wait for GCed page writeback via META_MAPPING */</div><div class='hunk'>@@ -1334,7 +1384,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> 			if (blkaddr == COMPRESS_ADDR)</div><div class='ctx'> 				fio.compr_blocks++;</div><div class='ctx'> 			if (__is_valid_data_blkaddr(blkaddr))</div><div class='del'>-				f2fs_invalidate_blocks(sbi, blkaddr);</div><div class='add'>+				f2fs_invalidate_blocks(sbi, blkaddr, 1);</div><div class='ctx'> 			f2fs_update_data_blkaddr(&amp;dn, COMPRESS_ADDR);</div><div class='ctx'> 			goto unlock_continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1344,7 +1394,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> </div><div class='ctx'> 		if (i &gt; cc-&gt;valid_nr_cpages) {</div><div class='ctx'> 			if (__is_valid_data_blkaddr(blkaddr)) {</div><div class='del'>-				f2fs_invalidate_blocks(sbi, blkaddr);</div><div class='add'>+				f2fs_invalidate_blocks(sbi, blkaddr, 1);</div><div class='ctx'> 				f2fs_update_data_blkaddr(&amp;dn, NEW_ADDR);</div><div class='ctx'> 			}</div><div class='ctx'> 			goto unlock_continue;</div><div class='hunk'>@@ -1358,11 +1408,20 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,</div><div class='ctx'> 			fio.compressed_page = cc-&gt;cpages[i - 1];</div><div class='ctx'> </div><div class='ctx'> 		cc-&gt;cpages[i - 1] = NULL;</div><div class='add'>+		fio.submitted = 0;</div><div class='ctx'> 		f2fs_outplace_write_data(&amp;dn, &amp;fio);</div><div class='add'>+		if (unlikely(!fio.submitted)) {</div><div class='add'>+			cancel_cluster_writeback(cc, cic, i);</div><div class='add'>+</div><div class='add'>+			/* To call fscrypt_finalize_bounce_page */</div><div class='add'>+			i = cc-&gt;valid_nr_cpages;</div><div class='add'>+			*submitted = 0;</div><div class='add'>+			goto out_destroy_crypt;</div><div class='add'>+		}</div><div class='ctx'> 		(*submitted)++;</div><div class='ctx'> unlock_continue:</div><div class='ctx'> 		inode_dec_dirty_pages(cc-&gt;inode);</div><div class='del'>-		unlock_page(fio.page);</div><div class='add'>+		folio_unlock(fio.folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fio.compr_blocks)</div><div class='hunk'>@@ -1384,16 +1443,19 @@ unlock_continue:</div><div class='ctx'> 	spin_unlock(&amp;fi-&gt;i_size_lock);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_put_rpages(cc);</div><div class='del'>-	page_array_free(cc-&gt;inode, cc-&gt;cpages, cc-&gt;nr_cpages);</div><div class='add'>+	page_array_free(sbi, cc-&gt;cpages, cc-&gt;nr_cpages);</div><div class='ctx'> 	cc-&gt;cpages = NULL;</div><div class='ctx'> 	f2fs_destroy_compress_ctx(cc, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_destroy_crypt:</div><div class='del'>-	page_array_free(cc-&gt;inode, cic-&gt;rpages, cc-&gt;cluster_size);</div><div class='add'>+	page_array_free(sbi, cic-&gt;rpages, cc-&gt;cluster_size);</div><div class='ctx'> </div><div class='del'>-	for (--i; i &gt;= 0; i--)</div><div class='add'>+	for (--i; i &gt;= 0; i--) {</div><div class='add'>+		if (!cc-&gt;cpages[i])</div><div class='add'>+			continue;</div><div class='ctx'> 		fscrypt_finalize_bounce_page(&amp;cc-&gt;cpages[i]);</div><div class='add'>+	}</div><div class='ctx'> out_put_cic:</div><div class='ctx'> 	kmem_cache_free(cic_entry_slab, cic);</div><div class='ctx'> out_put_dnode:</div><div class='hunk'>@@ -1408,24 +1470,26 @@ out_free:</div><div class='ctx'> 		f2fs_compress_free_page(cc-&gt;cpages[i]);</div><div class='ctx'> 		cc-&gt;cpages[i] = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	page_array_free(cc-&gt;inode, cc-&gt;cpages, cc-&gt;nr_cpages);</div><div class='add'>+	page_array_free(sbi, cc-&gt;cpages, cc-&gt;nr_cpages);</div><div class='ctx'> 	cc-&gt;cpages = NULL;</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_compress_write_end_io(struct bio *bio, struct page *page)</div><div class='add'>+void f2fs_compress_write_end_io(struct bio *bio, struct folio *folio)</div><div class='ctx'> {</div><div class='add'>+	struct page *page = &amp;folio-&gt;page;</div><div class='ctx'> 	struct f2fs_sb_info *sbi = bio-&gt;bi_private;</div><div class='del'>-	struct compress_io_ctx *cic =</div><div class='del'>-			(struct compress_io_ctx *)page_private(page);</div><div class='add'>+	struct compress_io_ctx *cic = folio-&gt;private;</div><div class='add'>+	enum count_type type = WB_DATA_TYPE(folio,</div><div class='add'>+				f2fs_is_compressed_page(folio));</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(bio-&gt;bi_status))</div><div class='add'>+	if (unlikely(bio-&gt;bi_status != BLK_STS_OK))</div><div class='ctx'> 		mapping_set_error(cic-&gt;inode-&gt;i_mapping, -EIO);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_compress_free_page(page);</div><div class='ctx'> </div><div class='del'>-	dec_page_count(sbi, F2FS_WB_DATA);</div><div class='add'>+	dec_page_count(sbi, type);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_return(&amp;cic-&gt;pending_pages))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1436,17 +1500,19 @@ void f2fs_compress_write_end_io(struct bio *bio, struct page *page)</div><div class='ctx'> 		end_page_writeback(cic-&gt;rpages[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page_array_free(cic-&gt;inode, cic-&gt;rpages, cic-&gt;nr_rpages);</div><div class='add'>+	page_array_free(sbi, cic-&gt;rpages, cic-&gt;nr_rpages);</div><div class='ctx'> 	kmem_cache_free(cic_entry_slab, cic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_write_raw_pages(struct compress_ctx *cc,</div><div class='del'>-					int *submitted,</div><div class='add'>+					int *submitted_p,</div><div class='ctx'> 					struct writeback_control *wbc,</div><div class='ctx'> 					enum iostat_type io_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = cc-&gt;inode-&gt;i_mapping;</div><div class='del'>-	int _submitted, compr_blocks, ret, i;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);</div><div class='add'>+	int submitted, compr_blocks, i;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	compr_blocks = f2fs_compressed_blocks(cc);</div><div class='ctx'> </div><div class='hunk'>@@ -1461,58 +1527,68 @@ static int f2fs_write_raw_pages(struct compress_ctx *cc,</div><div class='ctx'> 	if (compr_blocks &lt; 0)</div><div class='ctx'> 		return compr_blocks;</div><div class='ctx'> </div><div class='add'>+	/* overwrite compressed cluster w/ normal cluster */</div><div class='add'>+	if (compr_blocks &gt; 0)</div><div class='add'>+		f2fs_lock_op(sbi);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;cluster_size; i++) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='ctx'> 		if (!cc-&gt;rpages[i])</div><div class='ctx'> 			continue;</div><div class='add'>+		folio = page_folio(cc-&gt;rpages[i]);</div><div class='ctx'> retry_write:</div><div class='del'>-		lock_page(cc-&gt;rpages[i]);</div><div class='add'>+		folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-		if (cc-&gt;rpages[i]-&gt;mapping != mapping) {</div><div class='add'>+		if (folio-&gt;mapping != mapping) {</div><div class='ctx'> continue_unlock:</div><div class='del'>-			unlock_page(cc-&gt;rpages[i]);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!PageDirty(cc-&gt;rpages[i]))</div><div class='add'>+		if (!folio_test_dirty(folio))</div><div class='ctx'> 			goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-		if (PageWriteback(cc-&gt;rpages[i])) {</div><div class='add'>+		if (folio_test_writeback(folio)) {</div><div class='ctx'> 			if (wbc-&gt;sync_mode == WB_SYNC_NONE)</div><div class='ctx'> 				goto continue_unlock;</div><div class='del'>-			f2fs_wait_on_page_writeback(cc-&gt;rpages[i], DATA, true, true);</div><div class='add'>+			f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!clear_page_dirty_for_io(cc-&gt;rpages[i]))</div><div class='add'>+		if (!folio_clear_dirty_for_io(folio))</div><div class='ctx'> 			goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-		ret = f2fs_write_single_data_page(cc-&gt;rpages[i], &amp;_submitted,</div><div class='add'>+		submitted = 0;</div><div class='add'>+		ret = f2fs_write_single_data_page(folio, &amp;submitted,</div><div class='ctx'> 						NULL, NULL, wbc, io_type,</div><div class='ctx'> 						compr_blocks, false);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			if (ret == AOP_WRITEPAGE_ACTIVATE) {</div><div class='del'>-				unlock_page(cc-&gt;rpages[i]);</div><div class='add'>+			if (ret == 1) {</div><div class='ctx'> 				ret = 0;</div><div class='ctx'> 			} else if (ret == -EAGAIN) {</div><div class='add'>+				ret = 0;</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * for quota file, just redirty left pages to</div><div class='ctx'> 				 * avoid deadlock caused by cluster update race</div><div class='ctx'> 				 * from foreground operation.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (IS_NOQUOTA(cc-&gt;inode))</div><div class='del'>-					return 0;</div><div class='del'>-				ret = 0;</div><div class='del'>-				f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+					goto out;</div><div class='add'>+				f2fs_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='ctx'> 				goto retry_write;</div><div class='ctx'> 			}</div><div class='del'>-			return ret;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*submitted += _submitted;</div><div class='add'>+		*submitted_p += submitted;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_balance_fs(F2FS_M_SB(mapping), true);</div><div class='add'>+out:</div><div class='add'>+	if (compr_blocks &gt; 0)</div><div class='add'>+		f2fs_unlock_op(sbi);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	f2fs_balance_fs(sbi, true);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_write_multi_pages(struct compress_ctx *cc,</div><div class='hunk'>@@ -1529,7 +1605,7 @@ int f2fs_write_multi_pages(struct compress_ctx *cc,</div><div class='ctx'> 			add_compr_block_stat(cc-&gt;inode, cc-&gt;cluster_size);</div><div class='ctx'> 			goto write;</div><div class='ctx'> 		} else if (err) {</div><div class='del'>-			f2fs_put_rpages_wbc(cc, wbc, true, 1);</div><div class='add'>+			f2fs_put_rpages_wbc(cc, wbc, true, true);</div><div class='ctx'> 			goto destroy_out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1543,7 +1619,7 @@ write:</div><div class='ctx'> 	f2fs_bug_on(F2FS_I_SB(cc-&gt;inode), *submitted);</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_write_raw_pages(cc, submitted, wbc, io_type);</div><div class='del'>-	f2fs_put_rpages_wbc(cc, wbc, false, 0);</div><div class='add'>+	f2fs_put_rpages_wbc(cc, wbc, false, false);</div><div class='ctx'> destroy_out:</div><div class='ctx'> 	f2fs_destroy_compress_ctx(cc, false);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1558,14 +1634,13 @@ static inline bool allow_memalloc_for_decomp(struct f2fs_sb_info *sbi,</div><div class='ctx'> static int f2fs_prepare_decomp_mem(struct decompress_io_ctx *dic,</div><div class='ctx'> 		bool pre_alloc)</div><div class='ctx'> {</div><div class='del'>-	const struct f2fs_compress_ops *cops =</div><div class='del'>-		f2fs_cops[F2FS_I(dic-&gt;inode)-&gt;i_compress_algorithm];</div><div class='add'>+	const struct f2fs_compress_ops *cops = f2fs_cops[dic-&gt;compress_algorithm];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!allow_memalloc_for_decomp(F2FS_I_SB(dic-&gt;inode), pre_alloc))</div><div class='add'>+	if (!allow_memalloc_for_decomp(dic-&gt;sbi, pre_alloc))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	dic-&gt;tpages = page_array_alloc(dic-&gt;inode, dic-&gt;cluster_size);</div><div class='add'>+	dic-&gt;tpages = page_array_alloc(dic-&gt;sbi, dic-&gt;cluster_size);</div><div class='ctx'> 	if (!dic-&gt;tpages)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1595,10 +1670,9 @@ static int f2fs_prepare_decomp_mem(struct decompress_io_ctx *dic,</div><div class='ctx'> static void f2fs_release_decomp_mem(struct decompress_io_ctx *dic,</div><div class='ctx'> 		bool bypass_destroy_callback, bool pre_alloc)</div><div class='ctx'> {</div><div class='del'>-	const struct f2fs_compress_ops *cops =</div><div class='del'>-		f2fs_cops[F2FS_I(dic-&gt;inode)-&gt;i_compress_algorithm];</div><div class='add'>+	const struct f2fs_compress_ops *cops = f2fs_cops[dic-&gt;compress_algorithm];</div><div class='ctx'> </div><div class='del'>-	if (!allow_memalloc_for_decomp(F2FS_I_SB(dic-&gt;inode), pre_alloc))</div><div class='add'>+	if (!allow_memalloc_for_decomp(dic-&gt;sbi, pre_alloc))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!bypass_destroy_callback &amp;&amp; cops-&gt;destroy_decompress_ctx)</div><div class='hunk'>@@ -1625,7 +1699,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc)</div><div class='ctx'> 	if (!dic)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	dic-&gt;rpages = page_array_alloc(cc-&gt;inode, cc-&gt;cluster_size);</div><div class='add'>+	dic-&gt;rpages = page_array_alloc(sbi, cc-&gt;cluster_size);</div><div class='ctx'> 	if (!dic-&gt;rpages) {</div><div class='ctx'> 		kmem_cache_free(dic_entry_slab, dic);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -1633,6 +1707,8 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc)</div><div class='ctx'> </div><div class='ctx'> 	dic-&gt;magic = F2FS_COMPRESSED_PAGE_MAGIC;</div><div class='ctx'> 	dic-&gt;inode = cc-&gt;inode;</div><div class='add'>+	dic-&gt;sbi = sbi;</div><div class='add'>+	dic-&gt;compress_algorithm = F2FS_I(cc-&gt;inode)-&gt;i_compress_algorithm;</div><div class='ctx'> 	atomic_set(&amp;dic-&gt;remaining_pages, cc-&gt;nr_cpages);</div><div class='ctx'> 	dic-&gt;cluster_idx = cc-&gt;cluster_idx;</div><div class='ctx'> 	dic-&gt;cluster_size = cc-&gt;cluster_size;</div><div class='hunk'>@@ -1646,7 +1722,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc)</div><div class='ctx'> 		dic-&gt;rpages[i] = cc-&gt;rpages[i];</div><div class='ctx'> 	dic-&gt;nr_rpages = cc-&gt;cluster_size;</div><div class='ctx'> </div><div class='del'>-	dic-&gt;cpages = page_array_alloc(dic-&gt;inode, dic-&gt;nr_cpages);</div><div class='add'>+	dic-&gt;cpages = page_array_alloc(sbi, dic-&gt;nr_cpages);</div><div class='ctx'> 	if (!dic-&gt;cpages) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -1676,6 +1752,8 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic,</div><div class='ctx'> 		bool bypass_destroy_callback)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	/* use sbi in dic to avoid UFA of dic-&gt;inode*/</div><div class='add'>+	struct f2fs_sb_info *sbi = dic-&gt;sbi;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_release_decomp_mem(dic, bypass_destroy_callback, true);</div><div class='ctx'> </div><div class='hunk'>@@ -1687,7 +1765,7 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			f2fs_compress_free_page(dic-&gt;tpages[i]);</div><div class='ctx'> 		}</div><div class='del'>-		page_array_free(dic-&gt;inode, dic-&gt;tpages, dic-&gt;cluster_size);</div><div class='add'>+		page_array_free(sbi, dic-&gt;tpages, dic-&gt;cluster_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dic-&gt;cpages) {</div><div class='hunk'>@@ -1696,10 +1774,10 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			f2fs_compress_free_page(dic-&gt;cpages[i]);</div><div class='ctx'> 		}</div><div class='del'>-		page_array_free(dic-&gt;inode, dic-&gt;cpages, dic-&gt;nr_cpages);</div><div class='add'>+		page_array_free(sbi, dic-&gt;cpages, dic-&gt;nr_cpages);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page_array_free(dic-&gt;inode, dic-&gt;rpages, dic-&gt;nr_rpages);</div><div class='add'>+	page_array_free(sbi, dic-&gt;rpages, dic-&gt;nr_rpages);</div><div class='ctx'> 	kmem_cache_free(dic_entry_slab, dic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1718,8 +1796,7 @@ static void f2fs_put_dic(struct decompress_io_ctx *dic, bool in_task)</div><div class='ctx'> 			f2fs_free_dic(dic, false);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			INIT_WORK(&amp;dic-&gt;free_work, f2fs_late_free_dic);</div><div class='del'>-			queue_work(F2FS_I_SB(dic-&gt;inode)-&gt;post_read_wq,</div><div class='del'>-					&amp;dic-&gt;free_work);</div><div class='add'>+			queue_work(dic-&gt;sbi-&gt;post_read_wq, &amp;dic-&gt;free_work);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1790,14 +1867,13 @@ void f2fs_decompress_end_io(struct decompress_io_ctx *dic, bool failed,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Put a reference to a compressed page's decompress_io_ctx.</div><div class='add'>+ * Put a reference to a compressed folio's decompress_io_ctx.</div><div class='ctx'>  *</div><div class='del'>- * This is called when the page is no longer needed and can be freed.</div><div class='add'>+ * This is called when the folio is no longer needed and can be freed.</div><div class='ctx'>  */</div><div class='del'>-void f2fs_put_page_dic(struct page *page, bool in_task)</div><div class='add'>+void f2fs_put_folio_dic(struct folio *folio, bool in_task)</div><div class='ctx'> {</div><div class='del'>-	struct decompress_io_ctx *dic =</div><div class='del'>-			(struct decompress_io_ctx *)page_private(page);</div><div class='add'>+	struct decompress_io_ctx *dic = folio-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_put_dic(dic, in_task);</div><div class='ctx'> }</div><div class='hunk'>@@ -1806,16 +1882,18 @@ void f2fs_put_page_dic(struct page *page, bool in_task)</div><div class='ctx'>  * check whether cluster blocks are contiguous, and add extent cache entry</div><div class='ctx'>  * only if cluster blocks are logically and physically contiguous.</div><div class='ctx'>  */</div><div class='del'>-unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn)</div><div class='add'>+unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn,</div><div class='add'>+						unsigned int ofs_in_node)</div><div class='ctx'> {</div><div class='del'>-	bool compressed = f2fs_data_blkaddr(dn) == COMPRESS_ADDR;</div><div class='add'>+	bool compressed = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='add'>+					ofs_in_node) == COMPRESS_ADDR;</div><div class='ctx'> 	int i = compressed ? 1 : 0;</div><div class='del'>-	block_t first_blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='del'>-						dn-&gt;ofs_in_node + i);</div><div class='add'>+	block_t first_blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='add'>+							ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 	for (i += 1; i &lt; F2FS_I(dn-&gt;inode)-&gt;i_cluster_size; i++) {</div><div class='del'>-		block_t blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='del'>-						dn-&gt;ofs_in_node + i);</div><div class='add'>+		block_t blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='add'>+							ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 		if (!__is_valid_data_blkaddr(blkaddr))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1837,17 +1915,18 @@ struct address_space *COMPRESS_MAPPING(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return sbi-&gt;compress_inode-&gt;i_mapping;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_invalidate_compress_page(struct f2fs_sb_info *sbi, block_t blkaddr)</div><div class='add'>+void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi,</div><div class='add'>+				block_t blkaddr, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	if (!sbi-&gt;compress_inode)</div><div class='ctx'> 		return;</div><div class='del'>-	invalidate_mapping_pages(COMPRESS_MAPPING(sbi), blkaddr, blkaddr);</div><div class='add'>+	invalidate_mapping_pages(COMPRESS_MAPPING(sbi), blkaddr, blkaddr + len - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='del'>-						nid_t ino, block_t blkaddr)</div><div class='add'>+static void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi,</div><div class='add'>+		struct folio *folio, nid_t ino, block_t blkaddr)</div><div class='ctx'> {</div><div class='del'>-	struct page *cpage;</div><div class='add'>+	struct folio *cfolio;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_opt(sbi, COMPRESS_CACHE))</div><div class='hunk'>@@ -1859,53 +1938,49 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 	if (!f2fs_available_free_memory(sbi, COMPRESS_PAGE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	cpage = find_get_page(COMPRESS_MAPPING(sbi), blkaddr);</div><div class='del'>-	if (cpage) {</div><div class='del'>-		f2fs_put_page(cpage, 0);</div><div class='add'>+	cfolio = filemap_get_folio(COMPRESS_MAPPING(sbi), blkaddr);</div><div class='add'>+	if (!IS_ERR(cfolio)) {</div><div class='add'>+		f2fs_folio_put(cfolio, false);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpage = alloc_page(__GFP_NOWARN | __GFP_IO);</div><div class='del'>-	if (!cpage)</div><div class='add'>+	cfolio = filemap_alloc_folio(__GFP_NOWARN | __GFP_IO, 0, NULL);</div><div class='add'>+	if (!cfolio)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = add_to_page_cache_lru(cpage, COMPRESS_MAPPING(sbi),</div><div class='add'>+	ret = filemap_add_folio(COMPRESS_MAPPING(sbi), cfolio,</div><div class='ctx'> 						blkaddr, GFP_NOFS);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		f2fs_put_page(cpage, 0);</div><div class='add'>+		f2fs_folio_put(cfolio, false);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_page_private_data(cpage, ino);</div><div class='add'>+	folio_set_f2fs_data(cfolio, ino);</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	memcpy(page_address(cpage), page_address(page), PAGE_SIZE);</div><div class='del'>-	SetPageUptodate(cpage);</div><div class='del'>-out:</div><div class='del'>-	f2fs_put_page(cpage, 1);</div><div class='add'>+	memcpy(folio_address(cfolio), folio_address(folio), PAGE_SIZE);</div><div class='add'>+	folio_mark_uptodate(cfolio);</div><div class='add'>+	f2fs_folio_put(cfolio, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_load_compressed_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='add'>+bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='ctx'> 								block_t blkaddr)</div><div class='ctx'> {</div><div class='del'>-	struct page *cpage;</div><div class='add'>+	struct folio *cfolio;</div><div class='ctx'> 	bool hitted = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_opt(sbi, COMPRESS_CACHE))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	cpage = f2fs_pagecache_get_page(COMPRESS_MAPPING(sbi),</div><div class='add'>+	cfolio = f2fs_filemap_get_folio(COMPRESS_MAPPING(sbi),</div><div class='ctx'> 				blkaddr, FGP_LOCK | FGP_NOWAIT, GFP_NOFS);</div><div class='del'>-	if (cpage) {</div><div class='del'>-		if (PageUptodate(cpage)) {</div><div class='add'>+	if (!IS_ERR(cfolio)) {</div><div class='add'>+		if (folio_test_uptodate(cfolio)) {</div><div class='ctx'> 			atomic_inc(&amp;sbi-&gt;compress_page_hit);</div><div class='del'>-			memcpy(page_address(page),</div><div class='del'>-				page_address(cpage), PAGE_SIZE);</div><div class='add'>+			memcpy(folio_address(folio),</div><div class='add'>+				folio_address(cfolio), folio_size(folio));</div><div class='ctx'> 			hitted = true;</div><div class='ctx'> 		}</div><div class='del'>-		f2fs_put_page(cpage, 1);</div><div class='add'>+		f2fs_folio_put(cfolio, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return hitted;</div><div class='hunk'>@@ -1939,7 +2014,7 @@ void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (ino != get_page_private_data(&amp;folio-&gt;page)) {</div><div class='add'>+			if (ino != folio_get_f2fs_data(folio)) {</div><div class='ctx'> 				folio_unlock(folio);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c<br/>index 26e317696b33..c30e69392a62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/data.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/data.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/data.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/f2fs_fs.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mpage.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='hunk'>@@ -48,14 +47,14 @@ void f2fs_destroy_bioset(void)</div><div class='ctx'> 	bioset_exit(&amp;f2fs_bioset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __is_cp_guaranteed(struct page *page)</div><div class='add'>+bool f2fs_is_cp_guaranteed(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct f2fs_sb_info *sbi;</div><div class='ctx'> </div><div class='del'>-	if (!mapping)</div><div class='del'>-		return false;</div><div class='add'>+	if (fscrypt_is_bounce_folio(folio))</div><div class='add'>+		return folio_test_f2fs_gcing(fscrypt_pagecache_folio(folio));</div><div class='ctx'> </div><div class='ctx'> 	inode = mapping-&gt;host;</div><div class='ctx'> 	sbi = F2FS_I_SB(inode);</div><div class='hunk'>@@ -65,17 +64,15 @@ static bool __is_cp_guaranteed(struct page *page)</div><div class='ctx'> 			S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (f2fs_is_compressed_page(page))</div><div class='del'>-		return false;</div><div class='ctx'> 	if ((S_ISREG(inode-&gt;i_mode) &amp;&amp; IS_NOQUOTA(inode)) ||</div><div class='del'>-			page_private_gcing(page))</div><div class='add'>+			folio_test_f2fs_gcing(folio))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum count_type __read_io_type(struct page *page)</div><div class='add'>+static enum count_type __read_io_type(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = page_file_mapping(page);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> </div><div class='ctx'> 	if (mapping) {</div><div class='ctx'> 		struct inode *inode = mapping-&gt;host;</div><div class='hunk'>@@ -139,27 +136,22 @@ struct bio_post_read_ctx {</div><div class='ctx'>  */</div><div class='ctx'> static void f2fs_finish_read_bio(struct bio *bio, bool in_task)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec *bv;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> 	struct bio_post_read_ctx *ctx = bio-&gt;bi_private;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bv, bio, iter_all) {</div><div class='del'>-		struct page *page = bv-&gt;bv_page;</div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='add'>+		struct folio *folio = fi.folio;</div><div class='ctx'> </div><div class='del'>-		if (f2fs_is_compressed_page(page)) {</div><div class='add'>+		if (f2fs_is_compressed_page(folio)) {</div><div class='ctx'> 			if (ctx &amp;&amp; !ctx-&gt;decompression_attempted)</div><div class='del'>-				f2fs_end_read_compressed_page(page, true, 0,</div><div class='add'>+				f2fs_end_read_compressed_page(folio, true, 0,</div><div class='ctx'> 							in_task);</div><div class='del'>-			f2fs_put_page_dic(page, in_task);</div><div class='add'>+			f2fs_put_folio_dic(folio, in_task);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (bio-&gt;bi_status)</div><div class='del'>-			ClearPageUptodate(page);</div><div class='del'>-		else</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		dec_page_count(F2FS_P_SB(page), __read_io_type(page));</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		dec_page_count(F2FS_F_SB(folio), __read_io_type(folio));</div><div class='add'>+		folio_end_read(folio, bio-&gt;bi_status == BLK_STS_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ctx)</div><div class='hunk'>@@ -189,14 +181,13 @@ static void f2fs_verify_bio(struct work_struct *work)</div><div class='ctx'> 	 * as those were handled separately by f2fs_end_read_compressed_page().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (may_have_compressed_pages) {</div><div class='del'>-		struct bio_vec *bv;</div><div class='del'>-		struct bvec_iter_all iter_all;</div><div class='add'>+		struct folio_iter fi;</div><div class='ctx'> </div><div class='del'>-		bio_for_each_segment_all(bv, bio, iter_all) {</div><div class='del'>-			struct page *page = bv-&gt;bv_page;</div><div class='add'>+		bio_for_each_folio_all(fi, bio) {</div><div class='add'>+			struct folio *folio = fi.folio;</div><div class='ctx'> </div><div class='del'>-			if (!f2fs_is_compressed_page(page) &amp;&amp;</div><div class='del'>-			    !fsverity_verify_page(page)) {</div><div class='add'>+			if (!f2fs_is_compressed_page(folio) &amp;&amp;</div><div class='add'>+			    !fsverity_verify_page(&amp;folio-&gt;page)) {</div><div class='ctx'> 				bio-&gt;bi_status = BLK_STS_IOERR;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -241,16 +232,15 @@ static void f2fs_verify_and_finish_bio(struct bio *bio, bool in_task)</div><div class='ctx'> static void f2fs_handle_step_decompress(struct bio_post_read_ctx *ctx,</div><div class='ctx'> 		bool in_task)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec *bv;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> 	bool all_compressed = true;</div><div class='ctx'> 	block_t blkaddr = ctx-&gt;fs_blkaddr;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bv, ctx-&gt;bio, iter_all) {</div><div class='del'>-		struct page *page = bv-&gt;bv_page;</div><div class='add'>+	bio_for_each_folio_all(fi, ctx-&gt;bio) {</div><div class='add'>+		struct folio *folio = fi.folio;</div><div class='ctx'> </div><div class='del'>-		if (f2fs_is_compressed_page(page))</div><div class='del'>-			f2fs_end_read_compressed_page(page, false, blkaddr,</div><div class='add'>+		if (f2fs_is_compressed_page(folio))</div><div class='add'>+			f2fs_end_read_compressed_page(folio, false, blkaddr,</div><div class='ctx'> 						      in_task);</div><div class='ctx'> 		else</div><div class='ctx'> 			all_compressed = false;</div><div class='hunk'>@@ -288,9 +278,9 @@ static void f2fs_post_read_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void f2fs_read_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(bio_first_page_all(bio));</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(bio_first_folio_all(bio));</div><div class='ctx'> 	struct bio_post_read_ctx *ctx;</div><div class='del'>-	bool intask = in_task();</div><div class='add'>+	bool intask = in_task() &amp;&amp; !irqs_disabled();</div><div class='ctx'> </div><div class='ctx'> 	iostat_update_and_unbind_ctx(bio);</div><div class='ctx'> 	ctx = bio-&gt;bi_private;</div><div class='hunk'>@@ -298,7 +288,7 @@ static void f2fs_read_end_io(struct bio *bio)</div><div class='ctx'> 	if (time_to_inject(sbi, FAULT_READ_IO))</div><div class='ctx'> 		bio-&gt;bi_status = BLK_STS_IOERR;</div><div class='ctx'> </div><div class='del'>-	if (bio-&gt;bi_status) {</div><div class='add'>+	if (bio-&gt;bi_status != BLK_STS_OK) {</div><div class='ctx'> 		f2fs_finish_read_bio(bio, intask);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -327,8 +317,7 @@ static void f2fs_read_end_io(struct bio *bio)</div><div class='ctx'> static void f2fs_write_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi;</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> </div><div class='ctx'> 	iostat_update_and_unbind_ctx(bio);</div><div class='ctx'> 	sbi = bio-&gt;bi_private;</div><div class='hunk'>@@ -336,45 +325,41 @@ static void f2fs_write_end_io(struct bio *bio)</div><div class='ctx'> 	if (time_to_inject(sbi, FAULT_WRITE_IO))</div><div class='ctx'> 		bio-&gt;bi_status = BLK_STS_IOERR;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		struct page *page = bvec-&gt;bv_page;</div><div class='del'>-		enum count_type type = WB_DATA_TYPE(page);</div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='add'>+		struct folio *folio = fi.folio;</div><div class='add'>+		enum count_type type;</div><div class='ctx'> </div><div class='del'>-		if (page_private_dummy(page)) {</div><div class='del'>-			clear_page_private_dummy(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			mempool_free(page, sbi-&gt;write_io_dummy);</div><div class='add'>+		if (fscrypt_is_bounce_folio(folio)) {</div><div class='add'>+			struct folio *io_folio = folio;</div><div class='ctx'> </div><div class='del'>-			if (unlikely(bio-&gt;bi_status))</div><div class='del'>-				f2fs_stop_checkpoint(sbi, true,</div><div class='del'>-						STOP_CP_REASON_WRITE_FAIL);</div><div class='del'>-			continue;</div><div class='add'>+			folio = fscrypt_pagecache_folio(io_folio);</div><div class='add'>+			fscrypt_free_bounce_page(&amp;io_folio-&gt;page);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		fscrypt_finalize_bounce_page(&amp;page);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-		if (f2fs_is_compressed_page(page)) {</div><div class='del'>-			f2fs_compress_write_end_io(bio, page);</div><div class='add'>+		if (f2fs_is_compressed_page(folio)) {</div><div class='add'>+			f2fs_compress_write_end_io(bio, folio);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		if (unlikely(bio-&gt;bi_status)) {</div><div class='del'>-			mapping_set_error(page-&gt;mapping, -EIO);</div><div class='add'>+		type = WB_DATA_TYPE(folio, false);</div><div class='add'>+</div><div class='add'>+		if (unlikely(bio-&gt;bi_status != BLK_STS_OK)) {</div><div class='add'>+			mapping_set_error(folio-&gt;mapping, -EIO);</div><div class='ctx'> 			if (type == F2FS_WB_CP_DATA)</div><div class='ctx'> 				f2fs_stop_checkpoint(sbi, true,</div><div class='ctx'> 						STOP_CP_REASON_WRITE_FAIL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_bug_on(sbi, page-&gt;mapping == NODE_MAPPING(sbi) &amp;&amp;</div><div class='del'>-					page-&gt;index != nid_of_node(page));</div><div class='add'>+		f2fs_bug_on(sbi, is_node_folio(folio) &amp;&amp;</div><div class='add'>+				folio-&gt;index != nid_of_node(folio));</div><div class='ctx'> </div><div class='ctx'> 		dec_page_count(sbi, type);</div><div class='del'>-		if (f2fs_in_warm_node_list(sbi, page))</div><div class='del'>-			f2fs_del_fsync_node_entry(sbi, page);</div><div class='del'>-		clear_page_private_gcing(page);</div><div class='del'>-		end_page_writeback(page);</div><div class='add'>+		if (f2fs_in_warm_node_list(sbi, folio))</div><div class='add'>+			f2fs_del_fsync_node_entry(sbi, folio);</div><div class='add'>+		folio_clear_f2fs_gcing(folio);</div><div class='add'>+		folio_end_writeback(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!get_pages(sbi, F2FS_WB_CP_DATA) &amp;&amp;</div><div class='ctx'> 				wq_has_sleeper(&amp;sbi-&gt;cp_wait))</div><div class='hunk'>@@ -457,6 +442,11 @@ static blk_opf_t f2fs_io_flags(struct f2fs_io_info *fio)</div><div class='ctx'> 		op_flags |= REQ_META;</div><div class='ctx'> 	if (BIT(fio-&gt;temp) &amp; fua_flag)</div><div class='ctx'> 		op_flags |= REQ_FUA;</div><div class='add'>+</div><div class='add'>+	if (fio-&gt;type == DATA &amp;&amp;</div><div class='add'>+	    F2FS_I(fio-&gt;folio-&gt;mapping-&gt;host)-&gt;ioprio_hint == F2FS_IOPRIO_WRITE)</div><div class='add'>+		op_flags |= REQ_PRIO;</div><div class='add'>+</div><div class='ctx'> 	return op_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -478,6 +468,8 @@ static struct bio *__bio_alloc(struct f2fs_io_info *fio, int npages)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bio-&gt;bi_end_io = f2fs_write_end_io;</div><div class='ctx'> 		bio-&gt;bi_private = sbi;</div><div class='add'>+		bio-&gt;bi_write_hint = f2fs_io_type_to_rw_hint(sbi,</div><div class='add'>+						fio-&gt;type, fio-&gt;temp);</div><div class='ctx'> 	}</div><div class='ctx'> 	iostat_alloc_and_bind_ctx(sbi, bio, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -524,51 +516,10 @@ void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='ctx'> 	submit_bio(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void f2fs_align_write_bio(struct f2fs_sb_info *sbi, struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	unsigned int start =</div><div class='del'>-		(bio-&gt;bi_iter.bi_size &gt;&gt; F2FS_BLKSIZE_BITS) % F2FS_IO_SIZE(sbi);</div><div class='del'>-</div><div class='del'>-	if (start == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* fill dummy pages */</div><div class='del'>-	for (; start &lt; F2FS_IO_SIZE(sbi); start++) {</div><div class='del'>-		struct page *page =</div><div class='del'>-			mempool_alloc(sbi-&gt;write_io_dummy,</div><div class='del'>-				      GFP_NOIO | __GFP_NOFAIL);</div><div class='del'>-		f2fs_bug_on(sbi, !page);</div><div class='del'>-</div><div class='del'>-		lock_page(page);</div><div class='del'>-</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-		set_page_private_dummy(page);</div><div class='del'>-</div><div class='del'>-		if (bio_add_page(bio, page, PAGE_SIZE, 0) &lt; PAGE_SIZE)</div><div class='del'>-			f2fs_bug_on(sbi, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void f2fs_submit_write_bio(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='ctx'> 				  enum page_type type)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(is_read_io(bio_op(bio)));</div><div class='del'>-</div><div class='del'>-	if (type == DATA || type == NODE) {</div><div class='del'>-		if (f2fs_lfs_mode(sbi) &amp;&amp; current-&gt;plug)</div><div class='del'>-			blk_finish_plug(current-&gt;plug);</div><div class='del'>-</div><div class='del'>-		if (F2FS_IO_ALIGNED(sbi)) {</div><div class='del'>-			f2fs_align_write_bio(sbi, bio);</div><div class='del'>-			/*</div><div class='del'>-			 * In the NODE case, we lose next block address chain.</div><div class='del'>-			 * So, we need to do checkpoint in f2fs_sync_file.</div><div class='del'>-			 */</div><div class='del'>-			if (type == NODE)</div><div class='del'>-				set_sbi_flag(sbi, SBI_NEED_CP);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	trace_f2fs_submit_write_bio(sbi-&gt;sb, type, bio);</div><div class='ctx'> 	iostat_update_submit_ctx(bio, type);</div><div class='ctx'> 	submit_bio(bio);</div><div class='hunk'>@@ -592,34 +543,33 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool __has_merged_page(struct bio *bio, struct inode *inode,</div><div class='del'>-						struct page *page, nid_t ino)</div><div class='add'>+						struct folio *folio, nid_t ino)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> </div><div class='ctx'> 	if (!bio)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!inode &amp;&amp; !page &amp;&amp; !ino)</div><div class='add'>+	if (!inode &amp;&amp; !folio &amp;&amp; !ino)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		struct page *target = bvec-&gt;bv_page;</div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='add'>+		struct folio *target = fi.folio;</div><div class='ctx'> </div><div class='del'>-		if (fscrypt_is_bounce_page(target)) {</div><div class='del'>-			target = fscrypt_pagecache_page(target);</div><div class='add'>+		if (fscrypt_is_bounce_folio(target)) {</div><div class='add'>+			target = fscrypt_pagecache_folio(target);</div><div class='ctx'> 			if (IS_ERR(target))</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (f2fs_is_compressed_page(target)) {</div><div class='del'>-			target = f2fs_compress_control_page(target);</div><div class='add'>+			target = f2fs_compress_control_folio(target);</div><div class='ctx'> 			if (IS_ERR(target))</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (inode &amp;&amp; inode == target-&gt;mapping-&gt;host)</div><div class='ctx'> 			return true;</div><div class='del'>-		if (page &amp;&amp; page == target)</div><div class='add'>+		if (folio &amp;&amp; folio == target)</div><div class='ctx'> 			return true;</div><div class='ctx'> 		if (ino &amp;&amp; ino == ino_of_node(target))</div><div class='ctx'> 			return true;</div><div class='hunk'>@@ -643,17 +593,20 @@ int f2fs_init_write_merge_io(struct f2fs_sb_info *sbi)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		for (j = HOT; j &lt; n; j++) {</div><div class='del'>-			init_f2fs_rwsem(&amp;sbi-&gt;write_io[i][j].io_rwsem);</div><div class='del'>-			sbi-&gt;write_io[i][j].sbi = sbi;</div><div class='del'>-			sbi-&gt;write_io[i][j].bio = NULL;</div><div class='del'>-			spin_lock_init(&amp;sbi-&gt;write_io[i][j].io_lock);</div><div class='del'>-			INIT_LIST_HEAD(&amp;sbi-&gt;write_io[i][j].io_list);</div><div class='del'>-			INIT_LIST_HEAD(&amp;sbi-&gt;write_io[i][j].bio_list);</div><div class='del'>-			init_f2fs_rwsem(&amp;sbi-&gt;write_io[i][j].bio_list_lock);</div><div class='add'>+			struct f2fs_bio_info *io = &amp;sbi-&gt;write_io[i][j];</div><div class='add'>+</div><div class='add'>+			init_f2fs_rwsem(&amp;io-&gt;io_rwsem);</div><div class='add'>+			io-&gt;sbi = sbi;</div><div class='add'>+			io-&gt;bio = NULL;</div><div class='add'>+			io-&gt;last_block_in_bio = 0;</div><div class='add'>+			spin_lock_init(&amp;io-&gt;io_lock);</div><div class='add'>+			INIT_LIST_HEAD(&amp;io-&gt;io_list);</div><div class='add'>+			INIT_LIST_HEAD(&amp;io-&gt;bio_list);</div><div class='add'>+			init_f2fs_rwsem(&amp;io-&gt;bio_list_lock);</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-			init_completion(&amp;sbi-&gt;write_io[i][j].zone_wait);</div><div class='del'>-			sbi-&gt;write_io[i][j].zone_pending_bio = NULL;</div><div class='del'>-			sbi-&gt;write_io[i][j].bi_private = NULL;</div><div class='add'>+			init_completion(&amp;io-&gt;zone_wait);</div><div class='add'>+			io-&gt;zone_pending_bio = NULL;</div><div class='add'>+			io-&gt;bi_private = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -685,7 +638,7 @@ unlock_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct inode *inode, struct page *page,</div><div class='add'>+				struct inode *inode, struct folio *folio,</div><div class='ctx'> 				nid_t ino, enum page_type type, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	enum temp_type temp;</div><div class='hunk'>@@ -697,7 +650,7 @@ static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			struct f2fs_bio_info *io = sbi-&gt;write_io[btype] + temp;</div><div class='ctx'> </div><div class='ctx'> 			f2fs_down_read(&amp;io-&gt;io_rwsem);</div><div class='del'>-			ret = __has_merged_page(io-&gt;bio, inode, page, ino);</div><div class='add'>+			ret = __has_merged_page(io-&gt;bio, inode, folio, ino);</div><div class='ctx'> 			f2fs_up_read(&amp;io-&gt;io_rwsem);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -715,10 +668,10 @@ void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct inode *inode, struct page *page,</div><div class='add'>+				struct inode *inode, struct folio *folio,</div><div class='ctx'> 				nid_t ino, enum page_type type)</div><div class='ctx'> {</div><div class='del'>-	__submit_merged_write_cond(sbi, inode, page, ino, type, false);</div><div class='add'>+	__submit_merged_write_cond(sbi, inode, folio, ino, type, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -735,34 +688,29 @@ void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi)</div><div class='ctx'> int f2fs_submit_page_bio(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio;</div><div class='del'>-	struct page *page = fio-&gt;encrypted_page ?</div><div class='del'>-			fio-&gt;encrypted_page : fio-&gt;page;</div><div class='add'>+	struct folio *fio_folio = fio-&gt;folio;</div><div class='add'>+	struct folio *data_folio = fio-&gt;encrypted_page ?</div><div class='add'>+			page_folio(fio-&gt;encrypted_page) : fio_folio;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_valid_blkaddr(fio-&gt;sbi, fio-&gt;new_blkaddr,</div><div class='ctx'> 			fio-&gt;is_por ? META_POR : (__is_meta_io(fio) ?</div><div class='del'>-			META_GENERIC : DATA_GENERIC_ENHANCE))) {</div><div class='del'>-		f2fs_handle_error(fio-&gt;sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+			META_GENERIC : DATA_GENERIC_ENHANCE)))</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_submit_page_bio(page, fio);</div><div class='add'>+	trace_f2fs_submit_folio_bio(data_folio, fio);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new bio */</div><div class='ctx'> 	bio = __bio_alloc(fio, 1);</div><div class='ctx'> </div><div class='del'>-	f2fs_set_bio_crypt_ctx(bio, fio-&gt;page-&gt;mapping-&gt;host,</div><div class='del'>-			       fio-&gt;page-&gt;index, fio, GFP_NOIO);</div><div class='del'>-</div><div class='del'>-	if (bio_add_page(bio, page, PAGE_SIZE, 0) &lt; PAGE_SIZE) {</div><div class='del'>-		bio_put(bio);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	f2fs_set_bio_crypt_ctx(bio, fio_folio-&gt;mapping-&gt;host,</div><div class='add'>+			fio_folio-&gt;index, fio, GFP_NOIO);</div><div class='add'>+	bio_add_folio_nofail(bio, data_folio, folio_size(data_folio), 0);</div><div class='ctx'> </div><div class='ctx'> 	if (fio-&gt;io_wbc &amp;&amp; !is_read_io(fio-&gt;op))</div><div class='del'>-		wbc_account_cgroup_owner(fio-&gt;io_wbc, fio-&gt;page, PAGE_SIZE);</div><div class='add'>+		wbc_account_cgroup_owner(fio-&gt;io_wbc, fio_folio, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	inc_page_count(fio-&gt;sbi, is_read_io(fio-&gt;op) ?</div><div class='del'>-			__read_io_type(page) : WB_DATA_TYPE(fio-&gt;page));</div><div class='add'>+			__read_io_type(data_folio) : WB_DATA_TYPE(fio-&gt;folio, false));</div><div class='ctx'> </div><div class='ctx'> 	if (is_read_io(bio_op(bio)))</div><div class='ctx'> 		f2fs_submit_read_bio(fio-&gt;sbi, bio, fio-&gt;type);</div><div class='hunk'>@@ -785,9 +733,11 @@ static bool page_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='ctx'> static bool io_type_is_mergeable(struct f2fs_bio_info *io,</div><div class='ctx'> 						struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='add'>+	blk_opf_t mask = ~(REQ_PREFLUSH | REQ_FUA);</div><div class='add'>+</div><div class='ctx'> 	if (io-&gt;fio.op != fio-&gt;op)</div><div class='ctx'> 		return false;</div><div class='del'>-	return io-&gt;fio.op_flags == fio-&gt;op_flags;</div><div class='add'>+	return (io-&gt;fio.op_flags &amp; mask) == (fio-&gt;op_flags &amp; mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool io_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='hunk'>@@ -796,23 +746,13 @@ static bool io_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='ctx'> 					block_t last_blkaddr,</div><div class='ctx'> 					block_t cur_blkaddr)</div><div class='ctx'> {</div><div class='del'>-	if (F2FS_IO_ALIGNED(sbi) &amp;&amp; (fio-&gt;type == DATA || fio-&gt;type == NODE)) {</div><div class='del'>-		unsigned int filled_blocks =</div><div class='del'>-				F2FS_BYTES_TO_BLK(bio-&gt;bi_iter.bi_size);</div><div class='del'>-		unsigned int io_size = F2FS_IO_SIZE(sbi);</div><div class='del'>-		unsigned int left_vecs = bio-&gt;bi_max_vecs - bio-&gt;bi_vcnt;</div><div class='del'>-</div><div class='del'>-		/* IOs in bio is aligned and left space of vectors is not enough */</div><div class='del'>-		if (!(filled_blocks % io_size) &amp;&amp; left_vecs &lt; io_size)</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='ctx'> 	if (!page_is_mergeable(sbi, bio, last_blkaddr, cur_blkaddr))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return io_type_is_mergeable(io, fio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void add_bio_entry(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='del'>-				struct page *page, enum temp_type temp)</div><div class='add'>+				struct folio *folio, enum temp_type temp)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_bio_info *io = sbi-&gt;write_io[DATA] + temp;</div><div class='ctx'> 	struct bio_entry *be;</div><div class='hunk'>@@ -821,8 +761,7 @@ static void add_bio_entry(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='ctx'> 	be-&gt;bio = bio;</div><div class='ctx'> 	bio_get(bio);</div><div class='ctx'> </div><div class='del'>-	if (bio_add_page(bio, page, PAGE_SIZE, 0) != PAGE_SIZE)</div><div class='del'>-		f2fs_bug_on(sbi, 1);</div><div class='add'>+	bio_add_folio_nofail(bio, folio, folio_size(folio), 0);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;io-&gt;bio_list_lock);</div><div class='ctx'> 	list_add_tail(&amp;be-&gt;list, &amp;io-&gt;bio_list);</div><div class='hunk'>@@ -836,8 +775,9 @@ static void del_bio_entry(struct bio_entry *be)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,</div><div class='del'>-							struct page *page)</div><div class='add'>+							struct folio *folio)</div><div class='ctx'> {</div><div class='add'>+	struct folio *fio_folio = fio-&gt;folio;</div><div class='ctx'> 	struct f2fs_sb_info *sbi = fio-&gt;sbi;</div><div class='ctx'> 	enum temp_type temp;</div><div class='ctx'> 	bool found = false;</div><div class='hunk'>@@ -859,10 +799,9 @@ static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,</div><div class='ctx'> 							    *fio-&gt;last_block,</div><div class='ctx'> 							    fio-&gt;new_blkaddr));</div><div class='ctx'> 			if (f2fs_crypt_mergeable_bio(*bio,</div><div class='del'>-					fio-&gt;page-&gt;mapping-&gt;host,</div><div class='del'>-					fio-&gt;page-&gt;index, fio) &amp;&amp;</div><div class='del'>-			    bio_add_page(*bio, page, PAGE_SIZE, 0) ==</div><div class='del'>-					PAGE_SIZE) {</div><div class='add'>+					fio_folio-&gt;mapping-&gt;host,</div><div class='add'>+					fio_folio-&gt;index, fio) &amp;&amp;</div><div class='add'>+			    bio_add_folio(*bio, folio, folio_size(folio), 0)) {</div><div class='ctx'> 				ret = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -884,13 +823,13 @@ static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,</div><div class='del'>-					struct bio **bio, struct page *page)</div><div class='add'>+					struct bio **bio, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	enum temp_type temp;</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> 	struct bio *target = bio ? *bio : NULL;</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(sbi, !target &amp;&amp; !page);</div><div class='add'>+	f2fs_bug_on(sbi, !target &amp;&amp; !folio);</div><div class='ctx'> </div><div class='ctx'> 	for (temp = HOT; temp &lt; NR_TEMP_TYPE &amp;&amp; !found; temp++) {</div><div class='ctx'> 		struct f2fs_bio_info *io = sbi-&gt;write_io[DATA] + temp;</div><div class='hunk'>@@ -906,7 +845,7 @@ void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				found = (target == be-&gt;bio);</div><div class='ctx'> 			else</div><div class='ctx'> 				found = __has_merged_page(be-&gt;bio, NULL,</div><div class='del'>-								page, 0);</div><div class='add'>+							folio, 0);</div><div class='ctx'> 			if (found)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -923,7 +862,7 @@ void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				found = (target == be-&gt;bio);</div><div class='ctx'> 			else</div><div class='ctx'> 				found = __has_merged_page(be-&gt;bio, NULL,</div><div class='del'>-								page, 0);</div><div class='add'>+							folio, 0);</div><div class='ctx'> 			if (found) {</div><div class='ctx'> 				target = be-&gt;bio;</div><div class='ctx'> 				del_bio_entry(be);</div><div class='hunk'>@@ -944,16 +883,15 @@ void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,</div><div class='ctx'> int f2fs_merge_page_bio(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = *fio-&gt;bio;</div><div class='del'>-	struct page *page = fio-&gt;encrypted_page ?</div><div class='del'>-			fio-&gt;encrypted_page : fio-&gt;page;</div><div class='add'>+	struct folio *data_folio = fio-&gt;encrypted_page ?</div><div class='add'>+			page_folio(fio-&gt;encrypted_page) : fio-&gt;folio;</div><div class='add'>+	struct folio *folio = fio-&gt;folio;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_valid_blkaddr(fio-&gt;sbi, fio-&gt;new_blkaddr,</div><div class='del'>-			__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) {</div><div class='del'>-		f2fs_handle_error(fio-&gt;sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+			__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC))</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_submit_page_bio(page, fio);</div><div class='add'>+	trace_f2fs_submit_folio_bio(data_folio, fio);</div><div class='ctx'> </div><div class='ctx'> 	if (bio &amp;&amp; !page_is_mergeable(fio-&gt;sbi, bio, *fio-&gt;last_block,</div><div class='ctx'> 						fio-&gt;new_blkaddr))</div><div class='hunk'>@@ -961,19 +899,19 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)</div><div class='ctx'> alloc_new:</div><div class='ctx'> 	if (!bio) {</div><div class='ctx'> 		bio = __bio_alloc(fio, BIO_MAX_VECS);</div><div class='del'>-		f2fs_set_bio_crypt_ctx(bio, fio-&gt;page-&gt;mapping-&gt;host,</div><div class='del'>-				       fio-&gt;page-&gt;index, fio, GFP_NOIO);</div><div class='add'>+		f2fs_set_bio_crypt_ctx(bio, folio-&gt;mapping-&gt;host,</div><div class='add'>+				folio-&gt;index, fio, GFP_NOIO);</div><div class='ctx'> </div><div class='del'>-		add_bio_entry(fio-&gt;sbi, bio, page, fio-&gt;temp);</div><div class='add'>+		add_bio_entry(fio-&gt;sbi, bio, data_folio, fio-&gt;temp);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (add_ipu_page(fio, &amp;bio, page))</div><div class='add'>+		if (add_ipu_page(fio, &amp;bio, data_folio))</div><div class='ctx'> 			goto alloc_new;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fio-&gt;io_wbc)</div><div class='del'>-		wbc_account_cgroup_owner(fio-&gt;io_wbc, fio-&gt;page, PAGE_SIZE);</div><div class='add'>+		wbc_account_cgroup_owner(fio-&gt;io_wbc, folio, folio_size(folio));</div><div class='ctx'> </div><div class='del'>-	inc_page_count(fio-&gt;sbi, WB_DATA_TYPE(page));</div><div class='add'>+	inc_page_count(fio-&gt;sbi, WB_DATA_TYPE(folio, false));</div><div class='ctx'> </div><div class='ctx'> 	*fio-&gt;last_block = fio-&gt;new_blkaddr;</div><div class='ctx'> 	*fio-&gt;bio = bio;</div><div class='hunk'>@@ -984,6 +922,7 @@ alloc_new:</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)</div><div class='ctx'> {</div><div class='add'>+	struct block_device *bdev = sbi-&gt;sb-&gt;s_bdev;</div><div class='ctx'> 	int devi = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_is_multi_device(sbi)) {</div><div class='hunk'>@@ -994,8 +933,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		blkaddr -= FDEV(devi).start_blk;</div><div class='add'>+		bdev = FDEV(devi).bdev;</div><div class='ctx'> 	}</div><div class='del'>-	return bdev_is_zoned(FDEV(devi).bdev) &amp;&amp;</div><div class='add'>+	return bdev_is_zoned(bdev) &amp;&amp;</div><div class='ctx'> 		f2fs_blkz_is_seq(sbi, devi, blkaddr) &amp;&amp;</div><div class='ctx'> 		(blkaddr % sbi-&gt;blocks_per_blkz == sbi-&gt;blocks_per_blkz - 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -1006,12 +946,13 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)</div><div class='ctx'> 	struct f2fs_sb_info *sbi = fio-&gt;sbi;</div><div class='ctx'> 	enum page_type btype = PAGE_TYPE_OF_BIO(fio-&gt;type);</div><div class='ctx'> 	struct f2fs_bio_info *io = sbi-&gt;write_io[btype] + fio-&gt;temp;</div><div class='del'>-	struct page *bio_page;</div><div class='add'>+	struct folio *bio_folio;</div><div class='add'>+	enum count_type type;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_bug_on(sbi, is_read_io(fio-&gt;op));</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;io-&gt;io_rwsem);</div><div class='del'>-</div><div class='add'>+next:</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi) &amp;&amp; btype &lt; META &amp;&amp; io-&gt;zone_pending_bio) {</div><div class='ctx'> 		wait_for_completion_io(&amp;io-&gt;zone_wait);</div><div class='hunk'>@@ -1021,7 +962,6 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-next:</div><div class='ctx'> 	if (fio-&gt;in_list) {</div><div class='ctx'> 		spin_lock(&amp;io-&gt;io_lock);</div><div class='ctx'> 		if (list_empty(&amp;io-&gt;io_list)) {</div><div class='hunk'>@@ -1037,53 +977,44 @@ next:</div><div class='ctx'> 	verify_fio_blkaddr(fio);</div><div class='ctx'> </div><div class='ctx'> 	if (fio-&gt;encrypted_page)</div><div class='del'>-		bio_page = fio-&gt;encrypted_page;</div><div class='add'>+		bio_folio = page_folio(fio-&gt;encrypted_page);</div><div class='ctx'> 	else if (fio-&gt;compressed_page)</div><div class='del'>-		bio_page = fio-&gt;compressed_page;</div><div class='add'>+		bio_folio = page_folio(fio-&gt;compressed_page);</div><div class='ctx'> 	else</div><div class='del'>-		bio_page = fio-&gt;page;</div><div class='add'>+		bio_folio = fio-&gt;folio;</div><div class='ctx'> </div><div class='ctx'> 	/* set submitted = true as a return value */</div><div class='ctx'> 	fio-&gt;submitted = 1;</div><div class='ctx'> </div><div class='del'>-	inc_page_count(sbi, WB_DATA_TYPE(bio_page));</div><div class='add'>+	type = WB_DATA_TYPE(bio_folio, fio-&gt;compressed_page);</div><div class='add'>+	inc_page_count(sbi, type);</div><div class='ctx'> </div><div class='ctx'> 	if (io-&gt;bio &amp;&amp;</div><div class='ctx'> 	    (!io_is_mergeable(sbi, io-&gt;bio, io, fio, io-&gt;last_block_in_bio,</div><div class='ctx'> 			      fio-&gt;new_blkaddr) ||</div><div class='del'>-	     !f2fs_crypt_mergeable_bio(io-&gt;bio, fio-&gt;page-&gt;mapping-&gt;host,</div><div class='del'>-				       bio_page-&gt;index, fio)))</div><div class='add'>+	     !f2fs_crypt_mergeable_bio(io-&gt;bio, fio_inode(fio),</div><div class='add'>+				bio_folio-&gt;index, fio)))</div><div class='ctx'> 		__submit_merged_bio(io);</div><div class='ctx'> alloc_new:</div><div class='ctx'> 	if (io-&gt;bio == NULL) {</div><div class='del'>-		if (F2FS_IO_ALIGNED(sbi) &amp;&amp;</div><div class='del'>-				(fio-&gt;type == DATA || fio-&gt;type == NODE) &amp;&amp;</div><div class='del'>-				fio-&gt;new_blkaddr &amp; F2FS_IO_SIZE_MASK(sbi)) {</div><div class='del'>-			dec_page_count(sbi, WB_DATA_TYPE(bio_page));</div><div class='del'>-			fio-&gt;retry = 1;</div><div class='del'>-			goto skip;</div><div class='del'>-		}</div><div class='ctx'> 		io-&gt;bio = __bio_alloc(fio, BIO_MAX_VECS);</div><div class='del'>-		f2fs_set_bio_crypt_ctx(io-&gt;bio, fio-&gt;page-&gt;mapping-&gt;host,</div><div class='del'>-				       bio_page-&gt;index, fio, GFP_NOIO);</div><div class='add'>+		f2fs_set_bio_crypt_ctx(io-&gt;bio, fio_inode(fio),</div><div class='add'>+				bio_folio-&gt;index, fio, GFP_NOIO);</div><div class='ctx'> 		io-&gt;fio = *fio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bio_add_page(io-&gt;bio, bio_page, PAGE_SIZE, 0) &lt; PAGE_SIZE) {</div><div class='add'>+	if (!bio_add_folio(io-&gt;bio, bio_folio, folio_size(bio_folio), 0)) {</div><div class='ctx'> 		__submit_merged_bio(io);</div><div class='ctx'> 		goto alloc_new;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fio-&gt;io_wbc)</div><div class='del'>-		wbc_account_cgroup_owner(fio-&gt;io_wbc, fio-&gt;page, PAGE_SIZE);</div><div class='add'>+		wbc_account_cgroup_owner(fio-&gt;io_wbc, fio-&gt;folio,</div><div class='add'>+				folio_size(fio-&gt;folio));</div><div class='ctx'> </div><div class='ctx'> 	io-&gt;last_block_in_bio = fio-&gt;new_blkaddr;</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_submit_page_write(fio-&gt;page, fio);</div><div class='del'>-skip:</div><div class='del'>-	if (fio-&gt;in_list)</div><div class='del'>-		goto next;</div><div class='del'>-out:</div><div class='add'>+	trace_f2fs_submit_folio_write(fio-&gt;folio, fio);</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi) &amp;&amp; btype &lt; META &amp;&amp;</div><div class='ctx'> 			is_end_zone_blkaddr(sbi, fio-&gt;new_blkaddr)) {</div><div class='hunk'>@@ -1096,6 +1027,9 @@ out:</div><div class='ctx'> 		__submit_merged_bio(io);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	if (fio-&gt;in_list)</div><div class='add'>+		goto next;</div><div class='add'>+out:</div><div class='ctx'> 	if (is_sbi_flag_set(sbi, SBI_IS_SHUTDOWN) ||</div><div class='ctx'> 				!f2fs_is_checkpoint_ready(sbi))</div><div class='ctx'> 		__submit_merged_bio(io);</div><div class='hunk'>@@ -1116,8 +1050,6 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,</div><div class='ctx'> 	bio = bio_alloc_bioset(bdev, bio_max_segs(nr_pages),</div><div class='ctx'> 			       REQ_OP_READ | op_flag,</div><div class='ctx'> 			       for_write ? GFP_NOIO : GFP_KERNEL, &amp;f2fs_bioset);</div><div class='del'>-	if (!bio)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	bio-&gt;bi_iter.bi_sector = sector;</div><div class='ctx'> 	f2fs_set_bio_crypt_ctx(bio, inode, first_idx, NULL, GFP_NOFS);</div><div class='ctx'> 	bio-&gt;bi_end_io = f2fs_read_end_io;</div><div class='hunk'>@@ -1151,7 +1083,7 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This can handle encryption stuffs */</div><div class='del'>-static int f2fs_submit_page_read(struct inode *inode, struct page *page,</div><div class='add'>+static void f2fs_submit_page_read(struct inode *inode, struct folio *folio,</div><div class='ctx'> 				 block_t blkaddr, blk_opf_t op_flags,</div><div class='ctx'> 				 bool for_write)</div><div class='ctx'> {</div><div class='hunk'>@@ -1159,29 +1091,22 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> </div><div class='ctx'> 	bio = f2fs_grab_read_bio(inode, blkaddr, 1, op_flags,</div><div class='del'>-					page-&gt;index, for_write);</div><div class='del'>-	if (IS_ERR(bio))</div><div class='del'>-		return PTR_ERR(bio);</div><div class='add'>+					folio-&gt;index, for_write);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for GCed page writeback via META_MAPPING */</div><div class='ctx'> 	f2fs_wait_on_block_writeback(inode, blkaddr);</div><div class='ctx'> </div><div class='del'>-	if (bio_add_page(bio, page, PAGE_SIZE, 0) &lt; PAGE_SIZE) {</div><div class='del'>-		iostat_update_and_unbind_ctx(bio);</div><div class='del'>-		if (bio-&gt;bi_private)</div><div class='del'>-			mempool_free(bio-&gt;bi_private, bio_post_read_ctx_pool);</div><div class='del'>-		bio_put(bio);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	if (!bio_add_folio(bio, folio, PAGE_SIZE, 0))</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+</div><div class='ctx'> 	inc_page_count(sbi, F2FS_RD_DATA);</div><div class='ctx'> 	f2fs_update_iostat(sbi, NULL, FS_DATA_READ_IO, F2FS_BLKSIZE);</div><div class='ctx'> 	f2fs_submit_read_bio(sbi, bio, DATA);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)</div><div class='ctx'> {</div><div class='del'>-	__le32 *addr = get_dnode_addr(dn-&gt;inode, dn-&gt;node_page);</div><div class='add'>+	__le32 *addr = get_dnode_addr(dn-&gt;inode, dn-&gt;node_folio);</div><div class='ctx'> </div><div class='ctx'> 	dn-&gt;data_blkaddr = blkaddr;</div><div class='ctx'> 	addr[dn-&gt;ofs_in_node] = cpu_to_le32(dn-&gt;data_blkaddr);</div><div class='hunk'>@@ -1190,14 +1115,14 @@ static void __set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)</div><div class='ctx'> /*</div><div class='ctx'>  * Lock ordering for the change of data block address:</div><div class='ctx'>  * -&gt;data_page</div><div class='del'>- *  -&gt;node_page</div><div class='add'>+ *  -&gt;node_folio</div><div class='ctx'>  *    update block addresses in the node page</div><div class='ctx'>  */</div><div class='ctx'> void f2fs_set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)</div><div class='ctx'> {</div><div class='del'>-	f2fs_wait_on_page_writeback(dn-&gt;node_page, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(dn-&gt;node_folio, NODE, true, true);</div><div class='ctx'> 	__set_data_blkaddr(dn, blkaddr);</div><div class='del'>-	if (set_page_dirty(dn-&gt;node_page))</div><div class='add'>+	if (folio_mark_dirty(dn-&gt;node_folio))</div><div class='ctx'> 		dn-&gt;node_changed = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1218,13 +1143,14 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_inode_flag_set(dn-&gt;inode, FI_NO_ALLOC)))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	if (unlikely((err = inc_valid_block_count(sbi, dn-&gt;inode, &amp;count))))</div><div class='add'>+	err = inc_valid_block_count(sbi, dn-&gt;inode, &amp;count, true);</div><div class='add'>+	if (unlikely(err))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_reserve_new_blocks(dn-&gt;inode, dn-&gt;nid,</div><div class='ctx'> 						dn-&gt;ofs_in_node, count);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(dn-&gt;node_page, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(dn-&gt;node_folio, NODE, true, true);</div><div class='ctx'> </div><div class='ctx'> 	for (; count &gt; 0; dn-&gt;ofs_in_node++) {</div><div class='ctx'> 		block_t blkaddr = f2fs_data_blkaddr(dn);</div><div class='hunk'>@@ -1235,7 +1161,7 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (set_page_dirty(dn-&gt;node_page))</div><div class='add'>+	if (folio_mark_dirty(dn-&gt;node_folio))</div><div class='ctx'> 		dn-&gt;node_changed = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1253,7 +1179,7 @@ int f2fs_reserve_new_block(struct dnode_of_data *dn)</div><div class='ctx'> </div><div class='ctx'> int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	bool need_put = dn-&gt;inode_page ? false : true;</div><div class='add'>+	bool need_put = dn-&gt;inode_folio ? false : true;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_get_dnode_of_data(dn, index, ALLOC_NODE);</div><div class='hunk'>@@ -1267,26 +1193,23 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,</div><div class='del'>-				     blk_opf_t op_flags, bool for_write,</div><div class='del'>-				     pgoff_t *next_pgofs)</div><div class='add'>+struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index,</div><div class='add'>+		blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_cache_page(mapping, index, for_write);</div><div class='del'>-	if (!page)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	folio = f2fs_grab_cache_folio(mapping, index, for_write);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_lookup_read_extent_cache_block(inode, index,</div><div class='ctx'> 						&amp;dn.data_blkaddr)) {</div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), dn.data_blkaddr,</div><div class='ctx'> 						DATA_GENERIC_ENHANCE_READ)) {</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(F2FS_I_SB(inode),</div><div class='del'>-						ERROR_INVALID_BLKADDR);</div><div class='ctx'> 			goto put_err;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto got_it;</div><div class='hunk'>@@ -1312,66 +1235,65 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,</div><div class='ctx'> 						dn.data_blkaddr,</div><div class='ctx'> 						DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		f2fs_handle_error(F2FS_I_SB(inode),</div><div class='del'>-					ERROR_INVALID_BLKADDR);</div><div class='ctx'> 		goto put_err;</div><div class='ctx'> 	}</div><div class='ctx'> got_it:</div><div class='del'>-	if (PageUptodate(page)) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return page;</div><div class='add'>+	if (folio_test_uptodate(folio)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * A new dentry page is allocated but not able to be written, since its</div><div class='ctx'> 	 * new inode page couldn't be allocated due to -ENOSPC.</div><div class='ctx'> 	 * In such the case, its blkaddr can be remained as NEW_ADDR.</div><div class='del'>-	 * see, f2fs_add_link -&gt; f2fs_get_new_data_page -&gt;</div><div class='add'>+	 * see, f2fs_add_link -&gt; f2fs_get_new_data_folio -&gt;</div><div class='ctx'> 	 * f2fs_init_inode_metadata.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dn.data_blkaddr == NEW_ADDR) {</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-		if (!PageUptodate(page))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return page;</div><div class='add'>+		folio_zero_segment(folio, 0, folio_size(folio));</div><div class='add'>+		if (!folio_test_uptodate(folio))</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = f2fs_submit_page_read(inode, page, dn.data_blkaddr,</div><div class='add'>+	f2fs_submit_page_read(inode, folio, dn.data_blkaddr,</div><div class='ctx'> 						op_flags, for_write);</div><div class='del'>-	if (err)</div><div class='del'>-		goto put_err;</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> </div><div class='ctx'> put_err:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,</div><div class='add'>+struct folio *f2fs_find_data_folio(struct inode *inode, pgoff_t index,</div><div class='ctx'> 					pgoff_t *next_pgofs)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	page = find_get_page(mapping, index);</div><div class='del'>-	if (page &amp;&amp; PageUptodate(page))</div><div class='del'>-		return page;</div><div class='del'>-	f2fs_put_page(page, 0);</div><div class='del'>-</div><div class='del'>-	page = f2fs_get_read_data_page(inode, index, 0, false, next_pgofs);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return page;</div><div class='del'>-</div><div class='del'>-	if (PageUptodate(page))</div><div class='del'>-		return page;</div><div class='del'>-</div><div class='del'>-	wait_on_page_locked(page);</div><div class='del'>-	if (unlikely(!PageUptodate(page))) {</div><div class='del'>-		f2fs_put_page(page, 0);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='add'>+	folio = f2fs_filemap_get_folio(mapping, index, FGP_ACCESSED, 0);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		goto read;</div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='add'>+		return folio;</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='add'>+</div><div class='add'>+read:</div><div class='add'>+	folio = f2fs_get_read_data_folio(inode, index, 0, false, next_pgofs);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='add'>+</div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='add'>+		return folio;</div><div class='add'>+</div><div class='add'>+	folio_wait_locked(folio);</div><div class='add'>+	if (unlikely(!folio_test_uptodate(folio))) {</div><div class='add'>+		f2fs_folio_put(folio, false);</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1379,23 +1301,23 @@ struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,</div><div class='ctx'>  * Because, the callers, functions in dir.c and GC, should be able to know</div><div class='ctx'>  * whether this page exists or not.</div><div class='ctx'>  */</div><div class='del'>-struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,</div><div class='add'>+struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,</div><div class='ctx'> 							bool for_write)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_read_data_page(inode, index, 0, for_write, NULL);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return page;</div><div class='add'>+	folio = f2fs_get_read_data_folio(inode, index, 0, for_write, NULL);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='ctx'> 	/* wait for read completion */</div><div class='del'>-	lock_page(page);</div><div class='del'>-	if (unlikely(page-&gt;mapping != mapping || !PageUptodate(page))) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	if (unlikely(folio-&gt;mapping != mapping || !folio_test_uptodate(folio))) {</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1404,57 +1326,57 @@ struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,</div><div class='ctx'>  *</div><div class='ctx'>  * Also, caller should grab and release a rwsem by calling f2fs_lock_op() and</div><div class='ctx'>  * f2fs_unlock_op().</div><div class='del'>- * Note that, ipage is set only by make_empty_dir, and if any error occur,</div><div class='del'>- * ipage should be released by this function.</div><div class='add'>+ * Note that, ifolio is set only by make_empty_dir, and if any error occur,</div><div class='add'>+ * ifolio should be released by this function.</div><div class='ctx'>  */</div><div class='del'>-struct page *f2fs_get_new_data_page(struct inode *inode,</div><div class='del'>-		struct page *ipage, pgoff_t index, bool new_i_size)</div><div class='add'>+struct folio *f2fs_get_new_data_folio(struct inode *inode,</div><div class='add'>+		struct folio *ifolio, pgoff_t index, bool new_i_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_cache_page(mapping, index, true);</div><div class='del'>-	if (!page) {</div><div class='add'>+	folio = f2fs_grab_cache_folio(mapping, index, true);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * before exiting, we should make sure ipage will be released</div><div class='add'>+		 * before exiting, we should make sure ifolio will be released</div><div class='ctx'> 		 * if any error occur.</div><div class='ctx'> 		 */</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, ipage, NULL, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, ifolio, NULL, 0);</div><div class='ctx'> 	err = f2fs_reserve_block(&amp;dn, index);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='del'>-	if (!ipage)</div><div class='add'>+	if (!ifolio)</div><div class='ctx'> 		f2fs_put_dnode(&amp;dn);</div><div class='ctx'> </div><div class='del'>-	if (PageUptodate(page))</div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='ctx'> 		goto got_it;</div><div class='ctx'> </div><div class='ctx'> 	if (dn.data_blkaddr == NEW_ADDR) {</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-		if (!PageUptodate(page))</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+		folio_zero_segment(folio, 0, folio_size(folio));</div><div class='add'>+		if (!folio_test_uptodate(folio))</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='ctx'> 	} else {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='del'>-		/* if ipage exists, blkaddr should be NEW_ADDR */</div><div class='del'>-		f2fs_bug_on(F2FS_I_SB(inode), ipage);</div><div class='del'>-		page = f2fs_get_lock_data_page(inode, index, true);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return page;</div><div class='add'>+		/* if ifolio exists, blkaddr should be NEW_ADDR */</div><div class='add'>+		f2fs_bug_on(F2FS_I_SB(inode), ifolio);</div><div class='add'>+		folio = f2fs_get_lock_data_folio(inode, index, true);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return folio;</div><div class='ctx'> 	}</div><div class='ctx'> got_it:</div><div class='ctx'> 	if (new_i_size &amp;&amp; i_size_read(inode) &lt;</div><div class='ctx'> 				((loff_t)(index + 1) &lt;&lt; PAGE_SHIFT))</div><div class='ctx'> 		f2fs_i_size_write(inode, ((loff_t)(index + 1) &lt;&lt; PAGE_SHIFT));</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)</div><div class='hunk'>@@ -1475,17 +1397,20 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)</div><div class='ctx'> </div><div class='ctx'> 	dn-&gt;data_blkaddr = f2fs_data_blkaddr(dn);</div><div class='ctx'> 	if (dn-&gt;data_blkaddr == NULL_ADDR) {</div><div class='del'>-		err = inc_valid_block_count(sbi, dn-&gt;inode, &amp;count);</div><div class='add'>+		err = inc_valid_block_count(sbi, dn-&gt;inode, &amp;count, true);</div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_summary(&amp;sum, dn-&gt;nid, dn-&gt;ofs_in_node, ni.version);</div><div class='ctx'> 	old_blkaddr = dn-&gt;data_blkaddr;</div><div class='del'>-	f2fs_allocate_data_block(sbi, NULL, old_blkaddr, &amp;dn-&gt;data_blkaddr,</div><div class='del'>-				&amp;sum, seg_type, NULL);</div><div class='add'>+	err = f2fs_allocate_data_block(sbi, NULL, old_blkaddr,</div><div class='add'>+				&amp;dn-&gt;data_blkaddr, &amp;sum, seg_type, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)</div><div class='del'>-		f2fs_invalidate_internal_cache(sbi, old_blkaddr);</div><div class='add'>+		f2fs_invalidate_internal_cache(sbi, old_blkaddr, 1);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_data_blkaddr(dn, dn-&gt;data_blkaddr);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1493,6 +1418,7 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)</div><div class='ctx'> </div><div class='ctx'> static void f2fs_map_lock(struct f2fs_sb_info *sbi, int flag)</div><div class='ctx'> {</div><div class='add'>+	f2fs_down_read(&amp;sbi-&gt;cp_enable_rwsem);</div><div class='ctx'> 	if (flag == F2FS_GET_BLOCK_PRE_AIO)</div><div class='ctx'> 		f2fs_down_read(&amp;sbi-&gt;node_change);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1505,6 +1431,7 @@ static void f2fs_map_unlock(struct f2fs_sb_info *sbi, int flag)</div><div class='ctx'> 		f2fs_up_read(&amp;sbi-&gt;node_change);</div><div class='ctx'> 	else</div><div class='ctx'> 		f2fs_unlock_op(sbi);</div><div class='add'>+	f2fs_up_read(&amp;sbi-&gt;cp_enable_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_get_block_locked(struct dnode_of_data *dn, pgoff_t index)</div><div class='hunk'>@@ -1570,14 +1497,33 @@ static bool f2fs_map_blocks_cached(struct inode *inode,</div><div class='ctx'> 		struct f2fs_dev_info *dev = &amp;sbi-&gt;devs[bidx];</div><div class='ctx'> </div><div class='ctx'> 		map-&gt;m_bdev = dev-&gt;bdev;</div><div class='del'>-		map-&gt;m_pblk -= dev-&gt;start_blk;</div><div class='ctx'> 		map-&gt;m_len = min(map-&gt;m_len, dev-&gt;end_blk + 1 - map-&gt;m_pblk);</div><div class='add'>+		map-&gt;m_pblk -= dev-&gt;start_blk;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		map-&gt;m_bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool map_is_mergeable(struct f2fs_sb_info *sbi,</div><div class='add'>+				struct f2fs_map_blocks *map,</div><div class='add'>+				block_t blkaddr, int flag, int bidx,</div><div class='add'>+				int ofs)</div><div class='add'>+{</div><div class='add'>+	if (map-&gt;m_multidev_dio &amp;&amp; map-&gt;m_bdev != FDEV(bidx).bdev)</div><div class='add'>+		return false;</div><div class='add'>+	if (map-&gt;m_pblk != NEW_ADDR &amp;&amp; blkaddr == (map-&gt;m_pblk + ofs))</div><div class='add'>+		return true;</div><div class='add'>+	if (map-&gt;m_pblk == NEW_ADDR &amp;&amp; blkaddr == NEW_ADDR)</div><div class='add'>+		return true;</div><div class='add'>+	if (flag == F2FS_GET_BLOCK_PRE_DIO)</div><div class='add'>+		return true;</div><div class='add'>+	if (flag == F2FS_GET_BLOCK_DIO &amp;&amp;</div><div class='add'>+		map-&gt;m_pblk == NULL_ADDR &amp;&amp; blkaddr == NULL_ADDR)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * f2fs_map_blocks() tries to find or build mapping relationship which</div><div class='ctx'>  * maps continuous logical blocks to physical blocks, and return such</div><div class='hunk'>@@ -1597,10 +1543,14 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag)</div><div class='ctx'> 	unsigned int start_pgofs;</div><div class='ctx'> 	int bidx = 0;</div><div class='ctx'> 	bool is_hole;</div><div class='add'>+	bool lfs_dio_write;</div><div class='ctx'> </div><div class='ctx'> 	if (!maxblocks)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	lfs_dio_write = (flag == F2FS_GET_BLOCK_DIO &amp;&amp; f2fs_lfs_mode(sbi) &amp;&amp;</div><div class='add'>+				map-&gt;m_may_create);</div><div class='add'>+</div><div class='ctx'> 	if (!map-&gt;m_may_create &amp;&amp; f2fs_map_blocks_cached(inode, map, flag))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1615,9 +1565,15 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag)</div><div class='ctx'> 	pgofs =	(pgoff_t)map-&gt;m_lblk;</div><div class='ctx'> 	end = pgofs + maxblocks;</div><div class='ctx'> </div><div class='add'>+	if (flag == F2FS_GET_BLOCK_PRECACHE)</div><div class='add'>+		mode = LOOKUP_NODE_RA;</div><div class='add'>+</div><div class='ctx'> next_dnode:</div><div class='del'>-	if (map-&gt;m_may_create)</div><div class='add'>+	if (map-&gt;m_may_create) {</div><div class='add'>+		if (f2fs_lfs_mode(sbi))</div><div class='add'>+			f2fs_balance_fs(sbi, true);</div><div class='ctx'> 		f2fs_map_lock(sbi, flag);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* When reading holes, we need its node page */</div><div class='ctx'> 	set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='hunk'>@@ -1633,7 +1589,7 @@ next_dnode:</div><div class='ctx'> 	start_pgofs = pgofs;</div><div class='ctx'> 	prealloc = 0;</div><div class='ctx'> 	last_ofs_in_node = ofs_in_node = dn.ofs_in_node;</div><div class='del'>-	end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+	end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> </div><div class='ctx'> next_block:</div><div class='ctx'> 	blkaddr = f2fs_data_blkaddr(&amp;dn);</div><div class='hunk'>@@ -1641,13 +1597,13 @@ next_block:</div><div class='ctx'> 	if (!is_hole &amp;&amp;</div><div class='ctx'> 	    !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 		goto sync_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* use out-place-update for direct IO under LFS mode */</div><div class='del'>-	if (map-&gt;m_may_create &amp;&amp;</div><div class='del'>-	    (is_hole || (f2fs_lfs_mode(sbi) &amp;&amp; flag == F2FS_GET_BLOCK_DIO))) {</div><div class='add'>+	if (map-&gt;m_may_create &amp;&amp; (is_hole ||</div><div class='add'>+		(flag == F2FS_GET_BLOCK_DIO &amp;&amp; f2fs_lfs_mode(sbi) &amp;&amp;</div><div class='add'>+		!f2fs_is_pinned_file(inode) &amp;&amp; map-&gt;m_last_pblk != blkaddr))) {</div><div class='ctx'> 		if (unlikely(f2fs_cp_error(sbi))) {</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto sync_out;</div><div class='hunk'>@@ -1700,6 +1656,10 @@ next_block:</div><div class='ctx'> 				goto sync_out;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='add'>+		case F2FS_GET_BLOCK_DIO:</div><div class='add'>+			if (map-&gt;m_next_pgofs)</div><div class='add'>+				*map-&gt;m_next_pgofs = pgofs + 1;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* for defragment case */</div><div class='ctx'> 			if (map-&gt;m_next_pgofs)</div><div class='hunk'>@@ -1718,22 +1678,24 @@ next_block:</div><div class='ctx'> 		/* reserved delalloc block should be mapped for fiemap. */</div><div class='ctx'> 		if (blkaddr == NEW_ADDR)</div><div class='ctx'> 			map-&gt;m_flags |= F2FS_MAP_DELALLOC;</div><div class='del'>-		map-&gt;m_flags |= F2FS_MAP_MAPPED;</div><div class='add'>+		/* DIO READ and hole case, should not map the blocks. */</div><div class='add'>+		if (!(flag == F2FS_GET_BLOCK_DIO &amp;&amp; is_hole &amp;&amp; !map-&gt;m_may_create))</div><div class='add'>+			map-&gt;m_flags |= F2FS_MAP_MAPPED;</div><div class='ctx'> </div><div class='ctx'> 		map-&gt;m_pblk = blkaddr;</div><div class='ctx'> 		map-&gt;m_len = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (map-&gt;m_multidev_dio)</div><div class='ctx'> 			map-&gt;m_bdev = FDEV(bidx).bdev;</div><div class='del'>-	} else if ((map-&gt;m_pblk != NEW_ADDR &amp;&amp;</div><div class='del'>-			blkaddr == (map-&gt;m_pblk + ofs)) ||</div><div class='del'>-			(map-&gt;m_pblk == NEW_ADDR &amp;&amp; blkaddr == NEW_ADDR) ||</div><div class='del'>-			flag == F2FS_GET_BLOCK_PRE_DIO) {</div><div class='del'>-		if (map-&gt;m_multidev_dio &amp;&amp; map-&gt;m_bdev != FDEV(bidx).bdev)</div><div class='del'>-			goto sync_out;</div><div class='add'>+</div><div class='add'>+		if (lfs_dio_write)</div><div class='add'>+			map-&gt;m_last_pblk = NULL_ADDR;</div><div class='add'>+	} else if (map_is_mergeable(sbi, map, blkaddr, flag, bidx, ofs)) {</div><div class='ctx'> 		ofs++;</div><div class='ctx'> 		map-&gt;m_len++;</div><div class='ctx'> 	} else {</div><div class='add'>+		if (lfs_dio_write &amp;&amp; !f2fs_is_pinned_file(inode))</div><div class='add'>+			map-&gt;m_last_pblk = blkaddr;</div><div class='ctx'> 		goto sync_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1812,12 +1774,13 @@ sync_out:</div><div class='ctx'> 		if (map-&gt;m_flags &amp; F2FS_MAP_MAPPED) {</div><div class='ctx'> 			unsigned int ofs = start_pgofs - map-&gt;m_lblk;</div><div class='ctx'> </div><div class='del'>-			f2fs_update_read_extent_cache_range(&amp;dn,</div><div class='del'>-				start_pgofs, map-&gt;m_pblk + ofs,</div><div class='del'>-				map-&gt;m_len - ofs);</div><div class='add'>+			if (map-&gt;m_len &gt; ofs)</div><div class='add'>+				f2fs_update_read_extent_cache_range(&amp;dn,</div><div class='add'>+					start_pgofs, map-&gt;m_pblk + ofs,</div><div class='add'>+					map-&gt;m_len - ofs);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (map-&gt;m_next_extent)</div><div class='del'>-			*map-&gt;m_next_extent = pgofs + 1;</div><div class='add'>+			*map-&gt;m_next_extent = is_hole ? pgofs + 1 : pgofs;</div><div class='ctx'> 	}</div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='ctx'> unlock_out:</div><div class='hunk'>@@ -1856,21 +1819,10 @@ bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 bytes_to_blks(struct inode *inode, u64 bytes)</div><div class='del'>-{</div><div class='del'>-	return (bytes &gt;&gt; inode-&gt;i_blkbits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 blks_to_bytes(struct inode *inode, u64 blks)</div><div class='del'>-{</div><div class='del'>-	return (blks &lt;&lt; inode-&gt;i_blkbits);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int f2fs_xattr_fiemap(struct inode *inode,</div><div class='ctx'> 				struct fiemap_extent_info *fieinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	struct node_info ni;</div><div class='ctx'> 	__u64 phys = 0, len;</div><div class='ctx'> 	__u32 flags;</div><div class='hunk'>@@ -1879,19 +1831,19 @@ static int f2fs_xattr_fiemap(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_xattr(inode)) {</div><div class='ctx'> 		int offset;</div><div class='add'>+		struct folio *folio = f2fs_grab_cache_folio(NODE_MAPPING(sbi),</div><div class='add'>+				inode-&gt;i_ino, false);</div><div class='ctx'> </div><div class='del'>-		page = f2fs_grab_cache_page(NODE_MAPPING(sbi),</div><div class='del'>-						inode-&gt;i_ino, false);</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 		err = f2fs_get_node_info(sbi, inode-&gt;i_ino, &amp;ni, false);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		phys = blks_to_bytes(inode, ni.blk_addr);</div><div class='add'>+		phys = F2FS_BLK_TO_BYTES(ni.blk_addr);</div><div class='ctx'> 		offset = offsetof(struct f2fs_inode, i_addr) +</div><div class='ctx'> 					sizeof(__le32) * (DEF_ADDRS_PER_INODE -</div><div class='ctx'> 					get_inline_xattr_addrs(inode));</div><div class='hunk'>@@ -1899,7 +1851,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,</div><div class='ctx'> 		phys += offset;</div><div class='ctx'> 		len = inline_xattr_size(inode);</div><div class='ctx'> </div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 		flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED;</div><div class='ctx'> </div><div class='hunk'>@@ -1913,20 +1865,22 @@ static int f2fs_xattr_fiemap(struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (xnid) {</div><div class='del'>-		page = f2fs_grab_cache_page(NODE_MAPPING(sbi), xnid, false);</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		struct folio *folio = f2fs_grab_cache_folio(NODE_MAPPING(sbi),</div><div class='add'>+				xnid, false);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 		err = f2fs_get_node_info(sbi, xnid, &amp;ni, false);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		phys = blks_to_bytes(inode, ni.blk_addr);</div><div class='add'>+		phys = F2FS_BLK_TO_BYTES(ni.blk_addr);</div><div class='ctx'> 		len = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='ctx'> </div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 		flags = FIEMAP_EXTENT_LAST;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1939,30 +1893,11 @@ static int f2fs_xattr_fiemap(struct inode *inode,</div><div class='ctx'> 	return (err &lt; 0 ? err : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t max_inode_blocks(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	loff_t result = ADDRS_PER_INODE(inode);</div><div class='del'>-	loff_t leaf_count = ADDRS_PER_BLOCK(inode);</div><div class='del'>-</div><div class='del'>-	/* two direct node blocks */</div><div class='del'>-	result += (leaf_count * 2);</div><div class='del'>-</div><div class='del'>-	/* two indirect node blocks */</div><div class='del'>-	leaf_count *= NIDS_PER_BLOCK;</div><div class='del'>-	result += (leaf_count * 2);</div><div class='del'>-</div><div class='del'>-	/* one double indirect node block */</div><div class='del'>-	leaf_count *= NIDS_PER_BLOCK;</div><div class='del'>-	result += leaf_count;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_map_blocks map;</div><div class='del'>-	sector_t start_blk, last_blk;</div><div class='add'>+	sector_t start_blk, last_blk, blk_len, max_len;</div><div class='ctx'> 	pgoff_t next_pgofs;</div><div class='ctx'> 	u64 logical = 0, phys = 0, size = 0;</div><div class='ctx'> 	u32 flags = 0;</div><div class='hunk'>@@ -1984,7 +1919,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> </div><div class='ctx'> 	inode_lock_shared(inode);</div><div class='ctx'> </div><div class='del'>-	maxbytes = max_file_blocks(inode) &lt;&lt; F2FS_BLKSIZE_BITS;</div><div class='add'>+	maxbytes = F2FS_BLK_TO_BYTES(max_file_blocks(inode));</div><div class='ctx'> 	if (start &gt; maxbytes) {</div><div class='ctx'> 		ret = -EFBIG;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2004,16 +1939,15 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bytes_to_blks(inode, len) == 0)</div><div class='del'>-		len = blks_to_bytes(inode, 1);</div><div class='del'>-</div><div class='del'>-	start_blk = bytes_to_blks(inode, start);</div><div class='del'>-	last_blk = bytes_to_blks(inode, start + len - 1);</div><div class='add'>+	start_blk = F2FS_BYTES_TO_BLK(start);</div><div class='add'>+	last_blk = F2FS_BYTES_TO_BLK(start + len - 1);</div><div class='add'>+	blk_len = last_blk - start_blk + 1;</div><div class='add'>+	max_len = F2FS_BYTES_TO_BLK(maxbytes) - start_blk;</div><div class='ctx'> </div><div class='ctx'> next:</div><div class='ctx'> 	memset(&amp;map, 0, sizeof(map));</div><div class='ctx'> 	map.m_lblk = start_blk;</div><div class='del'>-	map.m_len = bytes_to_blks(inode, len);</div><div class='add'>+	map.m_len = blk_len;</div><div class='ctx'> 	map.m_next_pgofs = &amp;next_pgofs;</div><div class='ctx'> 	map.m_seg_type = NO_CHECK_TYPE;</div><div class='ctx'> </div><div class='hunk'>@@ -2030,13 +1964,23 @@ next:</div><div class='ctx'> 	if (!compr_cluster &amp;&amp; !(map.m_flags &amp; F2FS_MAP_FLAGS)) {</div><div class='ctx'> 		start_blk = next_pgofs;</div><div class='ctx'> </div><div class='del'>-		if (blks_to_bytes(inode, start_blk) &lt; blks_to_bytes(inode,</div><div class='del'>-						max_inode_blocks(inode)))</div><div class='add'>+		if (F2FS_BLK_TO_BYTES(start_blk) &lt; maxbytes)</div><div class='ctx'> 			goto prep_next;</div><div class='ctx'> </div><div class='ctx'> 		flags |= FIEMAP_EXTENT_LAST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * current extent may cross boundary of inquiry, increase len to</div><div class='add'>+	 * requery.</div><div class='add'>+	 */</div><div class='add'>+	if (!compr_cluster &amp;&amp; (map.m_flags &amp; F2FS_MAP_MAPPED) &amp;&amp;</div><div class='add'>+				map.m_lblk + map.m_len - 1 == last_blk &amp;&amp;</div><div class='add'>+				blk_len != max_len) {</div><div class='add'>+		blk_len = max_len;</div><div class='add'>+		goto next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	compr_appended = false;</div><div class='ctx'> 	/* In a case of compressed cluster, append this to the last extent */</div><div class='ctx'> 	if (compr_cluster &amp;&amp; ((map.m_flags &amp; F2FS_MAP_DELALLOC) ||</div><div class='hunk'>@@ -2068,14 +2012,14 @@ skip_fill:</div><div class='ctx'> 	} else if (compr_appended) {</div><div class='ctx'> 		unsigned int appended_blks = cluster_size -</div><div class='ctx'> 						count_in_cluster + 1;</div><div class='del'>-		size += blks_to_bytes(inode, appended_blks);</div><div class='add'>+		size += F2FS_BLK_TO_BYTES(appended_blks);</div><div class='ctx'> 		start_blk += appended_blks;</div><div class='ctx'> 		compr_cluster = false;</div><div class='ctx'> 	} else {</div><div class='del'>-		logical = blks_to_bytes(inode, start_blk);</div><div class='add'>+		logical = F2FS_BLK_TO_BYTES(start_blk);</div><div class='ctx'> 		phys = __is_valid_data_blkaddr(map.m_pblk) ?</div><div class='del'>-			blks_to_bytes(inode, map.m_pblk) : 0;</div><div class='del'>-		size = blks_to_bytes(inode, map.m_len);</div><div class='add'>+			F2FS_BLK_TO_BYTES(map.m_pblk) : 0;</div><div class='add'>+		size = F2FS_BLK_TO_BYTES(map.m_len);</div><div class='ctx'> 		flags = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (compr_cluster) {</div><div class='hunk'>@@ -2083,13 +2027,13 @@ skip_fill:</div><div class='ctx'> 			count_in_cluster += map.m_len;</div><div class='ctx'> 			if (count_in_cluster == cluster_size) {</div><div class='ctx'> 				compr_cluster = false;</div><div class='del'>-				size += blks_to_bytes(inode, 1);</div><div class='add'>+				size += F2FS_BLKSIZE;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (map.m_flags &amp; F2FS_MAP_DELALLOC) {</div><div class='ctx'> 			flags = FIEMAP_EXTENT_UNWRITTEN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		start_blk += bytes_to_blks(inode, size);</div><div class='add'>+		start_blk += F2FS_BYTES_TO_BLK(size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> prep_next:</div><div class='hunk'>@@ -2109,30 +2053,36 @@ out:</div><div class='ctx'> static inline loff_t f2fs_readpage_limit(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_FS_VERITY) &amp;&amp; IS_VERITY(inode))</div><div class='del'>-		return inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='add'>+		return F2FS_BLK_TO_BYTES(max_file_blocks(inode));</div><div class='ctx'> </div><div class='ctx'> 	return i_size_read(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_read_single_page(struct inode *inode, struct page *page,</div><div class='add'>+static inline blk_opf_t f2fs_ra_op_flags(struct readahead_control *rac)</div><div class='add'>+{</div><div class='add'>+	return rac ? REQ_RAHEAD : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_read_single_page(struct inode *inode, struct folio *folio,</div><div class='ctx'> 					unsigned nr_pages,</div><div class='ctx'> 					struct f2fs_map_blocks *map,</div><div class='ctx'> 					struct bio **bio_ret,</div><div class='ctx'> 					sector_t *last_block_in_bio,</div><div class='del'>-					bool is_readahead)</div><div class='add'>+					struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = *bio_ret;</div><div class='del'>-	const unsigned blocksize = blks_to_bytes(inode, 1);</div><div class='add'>+	const unsigned int blocksize = F2FS_BLKSIZE;</div><div class='ctx'> 	sector_t block_in_file;</div><div class='ctx'> 	sector_t last_block;</div><div class='ctx'> 	sector_t last_block_in_file;</div><div class='ctx'> 	sector_t block_nr;</div><div class='add'>+	pgoff_t index = folio-&gt;index;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	block_in_file = (sector_t)page_index(page);</div><div class='add'>+	block_in_file = (sector_t)index;</div><div class='ctx'> 	last_block = block_in_file + nr_pages;</div><div class='del'>-	last_block_in_file = bytes_to_blks(inode,</div><div class='del'>-			f2fs_readpage_limit(inode) + blocksize - 1);</div><div class='add'>+	last_block_in_file = F2FS_BYTES_TO_BLK(f2fs_readpage_limit(inode) +</div><div class='add'>+							blocksize - 1);</div><div class='ctx'> 	if (last_block &gt; last_block_in_file)</div><div class='ctx'> 		last_block = last_block_in_file;</div><div class='ctx'> </div><div class='hunk'>@@ -2160,26 +2110,24 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page,</div><div class='ctx'> got_it:</div><div class='ctx'> 	if ((map-&gt;m_flags &amp; F2FS_MAP_MAPPED)) {</div><div class='ctx'> 		block_nr = map-&gt;m_pblk + block_in_file - map-&gt;m_lblk;</div><div class='del'>-		SetPageMappedToDisk(page);</div><div class='add'>+		folio_set_mappedtodisk(folio);</div><div class='ctx'> </div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), block_nr,</div><div class='ctx'> 						DATA_GENERIC_ENHANCE_READ)) {</div><div class='ctx'> 			ret = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(F2FS_I_SB(inode),</div><div class='del'>-						ERROR_INVALID_BLKADDR);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> zero_out:</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-		if (f2fs_need_verity(inode, page-&gt;index) &amp;&amp;</div><div class='del'>-		    !fsverity_verify_page(page)) {</div><div class='add'>+		folio_zero_segment(folio, 0, folio_size(folio));</div><div class='add'>+		if (f2fs_need_verity(inode, index) &amp;&amp;</div><div class='add'>+		    !fsverity_verify_folio(folio)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		if (!PageUptodate(page))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		if (!folio_test_uptodate(folio))</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2189,21 +2137,15 @@ zero_out:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bio &amp;&amp; (!page_is_mergeable(F2FS_I_SB(inode), bio,</div><div class='ctx'> 				       *last_block_in_bio, block_nr) ||</div><div class='del'>-		    !f2fs_crypt_mergeable_bio(bio, inode, page-&gt;index, NULL))) {</div><div class='add'>+		    !f2fs_crypt_mergeable_bio(bio, inode, index, NULL))) {</div><div class='ctx'> submit_and_realloc:</div><div class='ctx'> 		f2fs_submit_read_bio(F2FS_I_SB(inode), bio, DATA);</div><div class='ctx'> 		bio = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (bio == NULL) {</div><div class='add'>+	if (bio == NULL)</div><div class='ctx'> 		bio = f2fs_grab_read_bio(inode, block_nr, nr_pages,</div><div class='del'>-				is_readahead ? REQ_RAHEAD : 0, page-&gt;index,</div><div class='add'>+				f2fs_ra_op_flags(rac), index,</div><div class='ctx'> 				false);</div><div class='del'>-		if (IS_ERR(bio)) {</div><div class='del'>-			ret = PTR_ERR(bio);</div><div class='del'>-			bio = NULL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the page is under writeback, we need to wait for</div><div class='hunk'>@@ -2211,7 +2153,7 @@ submit_and_realloc:</div><div class='ctx'> 	 */</div><div class='ctx'> 	f2fs_wait_on_block_writeback(inode, block_nr);</div><div class='ctx'> </div><div class='del'>-	if (bio_add_page(bio, page, blocksize, 0) &lt; blocksize)</div><div class='add'>+	if (!bio_add_folio(bio, folio, blocksize, 0))</div><div class='ctx'> 		goto submit_and_realloc;</div><div class='ctx'> </div><div class='ctx'> 	inc_page_count(F2FS_I_SB(inode), F2FS_RD_DATA);</div><div class='hunk'>@@ -2226,7 +2168,7 @@ out:</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,</div><div class='ctx'> 				unsigned nr_pages, sector_t *last_block_in_bio,</div><div class='del'>-				bool is_readahead, bool for_write)</div><div class='add'>+				struct readahead_control *rac, bool for_write)</div><div class='ctx'> {</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct inode *inode = cc-&gt;inode;</div><div class='hunk'>@@ -2234,34 +2176,43 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,</div><div class='ctx'> 	struct bio *bio = *bio_ret;</div><div class='ctx'> 	unsigned int start_idx = cc-&gt;cluster_idx &lt;&lt; cc-&gt;log_cluster_size;</div><div class='ctx'> 	sector_t last_block_in_file;</div><div class='del'>-	const unsigned blocksize = blks_to_bytes(inode, 1);</div><div class='add'>+	const unsigned int blocksize = F2FS_BLKSIZE;</div><div class='ctx'> 	struct decompress_io_ctx *dic = NULL;</div><div class='ctx'> 	struct extent_info ei = {};</div><div class='ctx'> 	bool from_dnode = true;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		from_dnode = false;</div><div class='add'>+		goto out_put_dnode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	f2fs_bug_on(sbi, f2fs_cluster_is_empty(cc));</div><div class='ctx'> </div><div class='del'>-	last_block_in_file = bytes_to_blks(inode,</div><div class='del'>-			f2fs_readpage_limit(inode) + blocksize - 1);</div><div class='add'>+	last_block_in_file = F2FS_BYTES_TO_BLK(f2fs_readpage_limit(inode) +</div><div class='add'>+							blocksize - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* get rid of pages beyond EOF */</div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;cluster_size; i++) {</div><div class='ctx'> 		struct page *page = cc-&gt;rpages[i];</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		if (!page)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((sector_t)page-&gt;index &gt;= last_block_in_file) {</div><div class='del'>-			zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-			if (!PageUptodate(page))</div><div class='del'>-				SetPageUptodate(page);</div><div class='del'>-		} else if (!PageUptodate(page)) {</div><div class='add'>+</div><div class='add'>+		folio = page_folio(page);</div><div class='add'>+		if ((sector_t)folio-&gt;index &gt;= last_block_in_file) {</div><div class='add'>+			folio_zero_segment(folio, 0, folio_size(folio));</div><div class='add'>+			if (!folio_test_uptodate(folio))</div><div class='add'>+				folio_mark_uptodate(folio);</div><div class='add'>+		} else if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		if (for_write)</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		cc-&gt;rpages[i] = NULL;</div><div class='ctx'> 		cc-&gt;nr_rpages--;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2281,17 +2232,13 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out_put_dnode;</div><div class='del'>-	}</div><div class='ctx'> 	f2fs_bug_on(sbi, dn.data_blkaddr != COMPRESS_ADDR);</div><div class='ctx'> </div><div class='ctx'> skip_reading_dnode:</div><div class='ctx'> 	for (i = 1; i &lt; cc-&gt;cluster_size; i++) {</div><div class='ctx'> 		block_t blkaddr;</div><div class='ctx'> </div><div class='del'>-		blkaddr = from_dnode ? data_blkaddr(dn.inode, dn.node_page,</div><div class='add'>+		blkaddr = from_dnode ? data_blkaddr(dn.inode, dn.node_folio,</div><div class='ctx'> 					dn.ofs_in_node + i) :</div><div class='ctx'> 					ei.blk + i - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -2321,17 +2268,17 @@ skip_reading_dnode:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cc-&gt;nr_cpages; i++) {</div><div class='del'>-		struct page *page = dic-&gt;cpages[i];</div><div class='add'>+		struct folio *folio = page_folio(dic-&gt;cpages[i]);</div><div class='ctx'> 		block_t blkaddr;</div><div class='ctx'> 		struct bio_post_read_ctx *ctx;</div><div class='ctx'> </div><div class='del'>-		blkaddr = from_dnode ? data_blkaddr(dn.inode, dn.node_page,</div><div class='add'>+		blkaddr = from_dnode ? data_blkaddr(dn.inode, dn.node_folio,</div><div class='ctx'> 					dn.ofs_in_node + i + 1) :</div><div class='ctx'> 					ei.blk + i;</div><div class='ctx'> </div><div class='ctx'> 		f2fs_wait_on_block_writeback(inode, blkaddr);</div><div class='ctx'> </div><div class='del'>-		if (f2fs_load_compressed_page(sbi, page, blkaddr)) {</div><div class='add'>+		if (f2fs_load_compressed_folio(sbi, folio, blkaddr)) {</div><div class='ctx'> 			if (atomic_dec_and_test(&amp;dic-&gt;remaining_pages)) {</div><div class='ctx'> 				f2fs_decompress_cluster(dic, true);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2341,26 +2288,18 @@ skip_reading_dnode:</div><div class='ctx'> </div><div class='ctx'> 		if (bio &amp;&amp; (!page_is_mergeable(sbi, bio,</div><div class='ctx'> 					*last_block_in_bio, blkaddr) ||</div><div class='del'>-		    !f2fs_crypt_mergeable_bio(bio, inode, page-&gt;index, NULL))) {</div><div class='add'>+		    !f2fs_crypt_mergeable_bio(bio, inode, folio-&gt;index, NULL))) {</div><div class='ctx'> submit_and_realloc:</div><div class='ctx'> 			f2fs_submit_read_bio(sbi, bio, DATA);</div><div class='ctx'> 			bio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!bio) {</div><div class='del'>-			bio = f2fs_grab_read_bio(inode, blkaddr, nr_pages,</div><div class='del'>-					is_readahead ? REQ_RAHEAD : 0,</div><div class='del'>-					page-&gt;index, for_write);</div><div class='del'>-			if (IS_ERR(bio)) {</div><div class='del'>-				ret = PTR_ERR(bio);</div><div class='del'>-				f2fs_decompress_end_io(dic, ret, true);</div><div class='del'>-				f2fs_put_dnode(&amp;dn);</div><div class='del'>-				*bio_ret = NULL;</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (!bio)</div><div class='add'>+			bio = f2fs_grab_read_bio(inode, blkaddr, nr_pages - i,</div><div class='add'>+					f2fs_ra_op_flags(rac),</div><div class='add'>+					folio-&gt;index, for_write);</div><div class='ctx'> </div><div class='del'>-		if (bio_add_page(bio, page, blocksize, 0) &lt; blocksize)</div><div class='add'>+		if (!bio_add_folio(bio, folio, blocksize, 0))</div><div class='ctx'> 			goto submit_and_realloc;</div><div class='ctx'> </div><div class='ctx'> 		ctx = get_post_read_ctx(bio);</div><div class='hunk'>@@ -2398,7 +2337,7 @@ out:</div><div class='ctx'>  * Major change was from block_size == page_size in f2fs by default.</div><div class='ctx'>  */</div><div class='ctx'> static int f2fs_mpage_readpages(struct inode *inode,</div><div class='del'>-		struct readahead_control *rac, struct page *page)</div><div class='add'>+		struct readahead_control *rac, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='ctx'> 	sector_t last_block_in_bio = 0;</div><div class='hunk'>@@ -2415,11 +2354,20 @@ static int f2fs_mpage_readpages(struct inode *inode,</div><div class='ctx'> 		.nr_cpages = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	pgoff_t nc_cluster_idx = NULL_CLUSTER;</div><div class='add'>+	pgoff_t index;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned nr_pages = rac ? readahead_count(rac) : 1;</div><div class='ctx'> 	unsigned max_nr_pages = nr_pages;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='add'>+	if (f2fs_compressed_file(inode)) {</div><div class='add'>+		index = rac ? readahead_index(rac) : folio-&gt;index;</div><div class='add'>+		max_nr_pages = round_up(index + nr_pages, cc.cluster_size) -</div><div class='add'>+				round_down(index, cc.cluster_size);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	map.m_pblk = 0;</div><div class='ctx'> 	map.m_lblk = 0;</div><div class='ctx'> 	map.m_len = 0;</div><div class='hunk'>@@ -2431,64 +2379,63 @@ static int f2fs_mpage_readpages(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	for (; nr_pages; nr_pages--) {</div><div class='ctx'> 		if (rac) {</div><div class='del'>-			page = readahead_page(rac);</div><div class='del'>-			prefetchw(&amp;page-&gt;flags);</div><div class='add'>+			folio = readahead_folio(rac);</div><div class='add'>+			prefetchw(&amp;folio-&gt;flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-		if (f2fs_compressed_file(inode)) {</div><div class='del'>-			/* there are remained compressed pages, submit them */</div><div class='del'>-			if (!f2fs_cluster_can_merge_page(&amp;cc, page-&gt;index)) {</div><div class='del'>-				ret = f2fs_read_multi_pages(&amp;cc, &amp;bio,</div><div class='del'>-							max_nr_pages,</div><div class='del'>-							&amp;last_block_in_bio,</div><div class='del'>-							rac != NULL, false);</div><div class='del'>-				f2fs_destroy_compress_ctx(&amp;cc, false);</div><div class='del'>-				if (ret)</div><div class='del'>-					goto set_error_page;</div><div class='del'>-			}</div><div class='del'>-			if (cc.cluster_idx == NULL_CLUSTER) {</div><div class='del'>-				if (nc_cluster_idx ==</div><div class='del'>-					page-&gt;index &gt;&gt; cc.log_cluster_size) {</div><div class='del'>-					goto read_single_page;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				ret = f2fs_is_compressed_cluster(inode, page-&gt;index);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					goto set_error_page;</div><div class='del'>-				else if (!ret) {</div><div class='del'>-					nc_cluster_idx =</div><div class='del'>-						page-&gt;index &gt;&gt; cc.log_cluster_size;</div><div class='del'>-					goto read_single_page;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				nc_cluster_idx = NULL_CLUSTER;</div><div class='del'>-			}</div><div class='del'>-			ret = f2fs_init_compress_ctx(&amp;cc);</div><div class='add'>+		index = folio-&gt;index;</div><div class='add'>+</div><div class='add'>+		if (!f2fs_compressed_file(inode))</div><div class='add'>+			goto read_single_page;</div><div class='add'>+</div><div class='add'>+		/* there are remained compressed pages, submit them */</div><div class='add'>+		if (!f2fs_cluster_can_merge_page(&amp;cc, index)) {</div><div class='add'>+			ret = f2fs_read_multi_pages(&amp;cc, &amp;bio,</div><div class='add'>+						max_nr_pages,</div><div class='add'>+						&amp;last_block_in_bio,</div><div class='add'>+						rac, false);</div><div class='add'>+			f2fs_destroy_compress_ctx(&amp;cc, false);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto set_error_page;</div><div class='add'>+		}</div><div class='add'>+		if (cc.cluster_idx == NULL_CLUSTER) {</div><div class='add'>+			if (nc_cluster_idx == index &gt;&gt; cc.log_cluster_size)</div><div class='add'>+				goto read_single_page;</div><div class='ctx'> </div><div class='del'>-			f2fs_compress_ctx_add_page(&amp;cc, page);</div><div class='add'>+			ret = f2fs_is_compressed_cluster(inode, index);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto set_error_page;</div><div class='add'>+			else if (!ret) {</div><div class='add'>+				nc_cluster_idx =</div><div class='add'>+					index &gt;&gt; cc.log_cluster_size;</div><div class='add'>+				goto read_single_page;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			goto next_page;</div><div class='add'>+			nc_cluster_idx = NULL_CLUSTER;</div><div class='ctx'> 		}</div><div class='add'>+		ret = f2fs_init_compress_ctx(&amp;cc);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto set_error_page;</div><div class='add'>+</div><div class='add'>+		f2fs_compress_ctx_add_page(&amp;cc, folio);</div><div class='add'>+</div><div class='add'>+		goto next_page;</div><div class='ctx'> read_single_page:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		ret = f2fs_read_single_page(inode, page, max_nr_pages, &amp;map,</div><div class='add'>+		ret = f2fs_read_single_page(inode, folio, max_nr_pages, &amp;map,</div><div class='ctx'> 					&amp;bio, &amp;last_block_in_bio, rac);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> set_error_page:</div><div class='ctx'> #endif</div><div class='del'>-			zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-			unlock_page(page);</div><div class='add'>+			folio_zero_segment(folio, 0, folio_size(folio));</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> next_page:</div><div class='ctx'> #endif</div><div class='del'>-		if (rac)</div><div class='del'>-			put_page(page);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 		if (f2fs_compressed_file(inode)) {</div><div class='hunk'>@@ -2497,7 +2444,7 @@ next_page:</div><div class='ctx'> 				ret = f2fs_read_multi_pages(&amp;cc, &amp;bio,</div><div class='ctx'> 							max_nr_pages,</div><div class='ctx'> 							&amp;last_block_in_bio,</div><div class='del'>-							rac != NULL, false);</div><div class='add'>+							rac, false);</div><div class='ctx'> 				f2fs_destroy_compress_ctx(&amp;cc, false);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2510,22 +2457,21 @@ next_page:</div><div class='ctx'> </div><div class='ctx'> static int f2fs_read_data_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct inode *inode = page_file_mapping(page)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	int ret = -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_readpage(page, DATA);</div><div class='add'>+	trace_f2fs_readpage(folio, DATA);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_compress_backend_ready(inode)) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If the file has inline data, try to read it directly */</div><div class='ctx'> 	if (f2fs_has_inline_data(inode))</div><div class='del'>-		ret = f2fs_read_inline_data(inode, page);</div><div class='add'>+		ret = f2fs_read_inline_data(inode, folio);</div><div class='ctx'> 	if (ret == -EAGAIN)</div><div class='del'>-		ret = f2fs_mpage_readpages(inode, NULL, page);</div><div class='add'>+		ret = f2fs_mpage_readpages(inode, NULL, folio);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2547,8 +2493,9 @@ static void f2fs_readahead(struct readahead_control *rac)</div><div class='ctx'> </div><div class='ctx'> int f2fs_encrypt_one_page(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = fio-&gt;page-&gt;mapping-&gt;host;</div><div class='del'>-	struct page *mpage, *page;</div><div class='add'>+	struct inode *inode = fio_inode(fio);</div><div class='add'>+	struct folio *mfolio;</div><div class='add'>+	struct page *page;</div><div class='ctx'> 	gfp_t gfp_flags = GFP_NOFS;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_encrypted_file(inode))</div><div class='hunk'>@@ -2560,7 +2507,7 @@ int f2fs_encrypt_one_page(struct f2fs_io_info *fio)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> retry_encrypt:</div><div class='del'>-	fio-&gt;encrypted_page = fscrypt_encrypt_pagecache_blocks(page,</div><div class='add'>+	fio-&gt;encrypted_page = fscrypt_encrypt_pagecache_blocks(page_folio(page),</div><div class='ctx'> 					PAGE_SIZE, 0, gfp_flags);</div><div class='ctx'> 	if (IS_ERR(fio-&gt;encrypted_page)) {</div><div class='ctx'> 		/* flush pending IOs and wait for a while in the ENOMEM case */</div><div class='hunk'>@@ -2573,12 +2520,12 @@ retry_encrypt:</div><div class='ctx'> 		return PTR_ERR(fio-&gt;encrypted_page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mpage = find_lock_page(META_MAPPING(fio-&gt;sbi), fio-&gt;old_blkaddr);</div><div class='del'>-	if (mpage) {</div><div class='del'>-		if (PageUptodate(mpage))</div><div class='del'>-			memcpy(page_address(mpage),</div><div class='add'>+	mfolio = filemap_lock_folio(META_MAPPING(fio-&gt;sbi), fio-&gt;old_blkaddr);</div><div class='add'>+	if (!IS_ERR(mfolio)) {</div><div class='add'>+		if (folio_test_uptodate(mfolio))</div><div class='add'>+			memcpy(folio_address(mfolio),</div><div class='ctx'> 				page_address(fio-&gt;encrypted_page), PAGE_SIZE);</div><div class='del'>-		f2fs_put_page(mpage, 1);</div><div class='add'>+		f2fs_folio_put(mfolio, true);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2650,7 +2597,7 @@ bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (IS_NOQUOTA(inode))</div><div class='ctx'> 		return true;</div><div class='del'>-	if (f2fs_is_atomic_file(inode))</div><div class='add'>+	if (f2fs_used_in_atomic_write(inode))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	/* rewrite low ratio compress data w/ OPU mode to avoid fragmentation */</div><div class='ctx'> 	if (f2fs_compressed_file(inode) &amp;&amp;</div><div class='hunk'>@@ -2668,8 +2615,6 @@ bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio)</div><div class='ctx'> 	if (fio) {</div><div class='ctx'> 		if (page_private_gcing(fio-&gt;page))</div><div class='ctx'> 			return true;</div><div class='del'>-		if (page_private_dummy(fio-&gt;page))</div><div class='del'>-			return true;</div><div class='ctx'> 		if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED) &amp;&amp;</div><div class='ctx'> 			f2fs_is_checkpointed_data(sbi, fio-&gt;old_blkaddr)))</div><div class='ctx'> 			return true;</div><div class='hunk'>@@ -2679,7 +2624,7 @@ bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio)</div><div class='ctx'> </div><div class='ctx'> static inline bool need_inplace_update(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = fio-&gt;page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = fio_inode(fio);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_should_update_outplace(inode, fio))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -2689,28 +2634,28 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio)</div><div class='ctx'> </div><div class='ctx'> int f2fs_do_write_data_page(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = fio-&gt;page;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct folio *folio = fio-&gt;folio;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct node_info ni;</div><div class='ctx'> 	bool ipu_force = false;</div><div class='add'>+	bool atomic_commit;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Use COW inode to make dnode_of_data for atomic write */</div><div class='del'>-	if (f2fs_is_atomic_file(inode))</div><div class='add'>+	atomic_commit = f2fs_is_atomic_file(inode) &amp;&amp;</div><div class='add'>+				folio_test_f2fs_atomic(folio);</div><div class='add'>+	if (atomic_commit)</div><div class='ctx'> 		set_new_dnode(&amp;dn, F2FS_I(inode)-&gt;cow_inode, NULL, NULL, 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (need_inplace_update(fio) &amp;&amp;</div><div class='del'>-	    f2fs_lookup_read_extent_cache_block(inode, page-&gt;index,</div><div class='add'>+	    f2fs_lookup_read_extent_cache_block(inode, folio-&gt;index,</div><div class='ctx'> 						&amp;fio-&gt;old_blkaddr)) {</div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(fio-&gt;sbi, fio-&gt;old_blkaddr,</div><div class='del'>-						DATA_GENERIC_ENHANCE)) {</div><div class='del'>-			f2fs_handle_error(fio-&gt;sbi,</div><div class='del'>-						ERROR_INVALID_BLKADDR);</div><div class='add'>+						DATA_GENERIC_ENHANCE))</div><div class='ctx'> 			return -EFSCORRUPTED;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		ipu_force = true;</div><div class='ctx'> 		fio-&gt;need_lock = LOCK_DONE;</div><div class='hunk'>@@ -2721,7 +2666,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)</div><div class='ctx'> 	if (fio-&gt;need_lock == LOCK_REQ &amp;&amp; !f2fs_trylock_op(fio-&gt;sbi))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	err = f2fs_get_dnode_of_data(&amp;dn, page-&gt;index, LOOKUP_NODE);</div><div class='add'>+	err = f2fs_get_dnode_of_data(&amp;dn, folio-&gt;index, LOOKUP_NODE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2729,8 +2674,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)</div><div class='ctx'> </div><div class='ctx'> 	/* This page is already truncated */</div><div class='ctx'> 	if (fio-&gt;old_blkaddr == NULL_ADDR) {</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-		clear_page_private_gcing(page);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='add'>+		folio_clear_f2fs_gcing(folio);</div><div class='ctx'> 		goto out_writepage;</div><div class='ctx'> 	}</div><div class='ctx'> got_it:</div><div class='hunk'>@@ -2738,12 +2683,11 @@ got_it:</div><div class='ctx'> 		!f2fs_is_valid_blkaddr(fio-&gt;sbi, fio-&gt;old_blkaddr,</div><div class='ctx'> 						DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		f2fs_handle_error(fio-&gt;sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 		goto out_writepage;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* wait for GCed page writeback via META_MAPPING */</div><div class='del'>-	if (fio-&gt;post_read)</div><div class='add'>+	if (fio-&gt;meta_gc)</div><div class='ctx'> 		f2fs_wait_on_block_writeback(inode, fio-&gt;old_blkaddr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2757,7 +2701,7 @@ got_it:</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_writepage;</div><div class='ctx'> </div><div class='del'>-		set_page_writeback(page);</div><div class='add'>+		folio_start_writeback(folio);</div><div class='ctx'> 		f2fs_put_dnode(&amp;dn);</div><div class='ctx'> 		if (fio-&gt;need_lock == LOCK_REQ)</div><div class='ctx'> 			f2fs_unlock_op(fio-&gt;sbi);</div><div class='hunk'>@@ -2765,12 +2709,11 @@ got_it:</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			if (fscrypt_inode_uses_fs_layer_crypto(inode))</div><div class='ctx'> 				fscrypt_finalize_bounce_page(&amp;fio-&gt;encrypted_page);</div><div class='del'>-			if (PageWriteback(page))</div><div class='del'>-				end_page_writeback(page);</div><div class='add'>+			folio_end_writeback(folio);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			set_inode_flag(inode, FI_UPDATE_WRITE);</div><div class='ctx'> 		}</div><div class='del'>-		trace_f2fs_do_write_data_page(fio-&gt;page, IPU);</div><div class='add'>+		trace_f2fs_do_write_data_page(folio, IPU);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2792,15 +2735,17 @@ got_it:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_writepage;</div><div class='ctx'> </div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (fio-&gt;compr_blocks &amp;&amp; fio-&gt;old_blkaddr == COMPRESS_ADDR)</div><div class='ctx'> 		f2fs_i_compr_blocks_update(inode, fio-&gt;compr_blocks - 1, false);</div><div class='ctx'> </div><div class='ctx'> 	/* LFS mode write path */</div><div class='ctx'> 	f2fs_outplace_write_data(&amp;dn, fio);</div><div class='del'>-	trace_f2fs_do_write_data_page(page, OPU);</div><div class='add'>+	trace_f2fs_do_write_data_page(folio, OPU);</div><div class='ctx'> 	set_inode_flag(inode, FI_APPEND_WRITE);</div><div class='add'>+	if (atomic_commit)</div><div class='add'>+		folio_clear_f2fs_atomic(folio);</div><div class='ctx'> out_writepage:</div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='ctx'> out:</div><div class='hunk'>@@ -2809,7 +2754,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_write_single_data_page(struct page *page, int *submitted,</div><div class='add'>+int f2fs_write_single_data_page(struct folio *folio, int *submitted,</div><div class='ctx'> 				struct bio **bio,</div><div class='ctx'> 				sector_t *last_block,</div><div class='ctx'> 				struct writeback_control *wbc,</div><div class='hunk'>@@ -2817,12 +2762,12 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,</div><div class='ctx'> 				int compr_blocks,</div><div class='ctx'> 				bool allow_balance)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	loff_t i_size = i_size_read(inode);</div><div class='ctx'> 	const pgoff_t end_index = ((unsigned long long)i_size)</div><div class='ctx'> 							&gt;&gt; PAGE_SHIFT;</div><div class='del'>-	loff_t psize = (loff_t)(page-&gt;index + 1) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	loff_t psize = (loff_t)(folio-&gt;index + 1) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned offset = 0;</div><div class='ctx'> 	bool need_balance_fs = false;</div><div class='ctx'> 	bool quota_inode = IS_NOQUOTA(inode);</div><div class='hunk'>@@ -2834,23 +2779,23 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,</div><div class='ctx'> 		.op = REQ_OP_WRITE,</div><div class='ctx'> 		.op_flags = wbc_to_write_flags(wbc),</div><div class='ctx'> 		.old_blkaddr = NULL_ADDR,</div><div class='del'>-		.page = page,</div><div class='add'>+		.folio = folio,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.submitted = 0,</div><div class='ctx'> 		.compr_blocks = compr_blocks,</div><div class='del'>-		.need_lock = LOCK_RETRY,</div><div class='del'>-		.post_read = f2fs_post_read_required(inode) ? 1 : 0,</div><div class='add'>+		.need_lock = compr_blocks ? LOCK_DONE : LOCK_RETRY,</div><div class='add'>+		.meta_gc = f2fs_meta_inode_gc_required(inode) ? 1 : 0,</div><div class='ctx'> 		.io_type = io_type,</div><div class='ctx'> 		.io_wbc = wbc,</div><div class='ctx'> 		.bio = bio,</div><div class='ctx'> 		.last_block = last_block,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_writepage(page, DATA);</div><div class='add'>+	trace_f2fs_writepage(folio, DATA);</div><div class='ctx'> </div><div class='ctx'> 	/* we should bypass data pages to proceed the kworker jobs */</div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='del'>-		mapping_set_error(page-&gt;mapping, -EIO);</div><div class='add'>+		mapping_set_error(folio-&gt;mapping, -EIO);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * don't drop any dirty dentry pages for keeping lastest</div><div class='ctx'> 		 * directory structure.</div><div class='hunk'>@@ -2868,7 +2813,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,</div><div class='ctx'> 	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))</div><div class='ctx'> 		goto redirty_out;</div><div class='ctx'> </div><div class='del'>-	if (page-&gt;index &lt; end_index ||</div><div class='add'>+	if (folio-&gt;index &lt; end_index ||</div><div class='ctx'> 			f2fs_verity_in_progress(inode) ||</div><div class='ctx'> 			compr_blocks)</div><div class='ctx'> 		goto write;</div><div class='hunk'>@@ -2878,10 +2823,10 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,</div><div class='ctx'> 	 * this page does not have to be written to disk.</div><div class='ctx'> 	 */</div><div class='ctx'> 	offset = i_size &amp; (PAGE_SIZE - 1);</div><div class='del'>-	if ((page-&gt;index &gt;= end_index + 1) || !offset)</div><div class='add'>+	if ((folio-&gt;index &gt;= end_index + 1) || !offset)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	zero_user_segment(page, offset, PAGE_SIZE);</div><div class='add'>+	folio_zero_segment(folio, offset, folio_size(folio));</div><div class='ctx'> write:</div><div class='ctx'> 	/* Dentry/quota blocks are controlled by checkpoint */</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode) || quota_inode) {</div><div class='hunk'>@@ -2902,16 +2847,10 @@ write:</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!wbc-&gt;for_reclaim)</div><div class='del'>-		need_balance_fs = true;</div><div class='del'>-	else if (has_not_enough_free_secs(sbi, 0, 0))</div><div class='del'>-		goto redirty_out;</div><div class='del'>-	else</div><div class='del'>-		set_inode_flag(inode, FI_HOT_DATA);</div><div class='del'>-</div><div class='add'>+	need_balance_fs = true;</div><div class='ctx'> 	err = -EAGAIN;</div><div class='ctx'> 	if (f2fs_has_inline_data(inode)) {</div><div class='del'>-		err = f2fs_write_inline_data(inode, page);</div><div class='add'>+		err = f2fs_write_inline_data(inode, folio);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2919,6 +2858,7 @@ write:</div><div class='ctx'> 	if (err == -EAGAIN) {</div><div class='ctx'> 		err = f2fs_do_write_data_page(&amp;fio);</div><div class='ctx'> 		if (err == -EAGAIN) {</div><div class='add'>+			f2fs_bug_on(sbi, compr_blocks);</div><div class='ctx'> 			fio.need_lock = LOCK_REQ;</div><div class='ctx'> 			err = f2fs_do_write_data_page(&amp;fio);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2940,17 +2880,10 @@ done:</div><div class='ctx'> out:</div><div class='ctx'> 	inode_dec_dirty_pages(inode);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-		clear_page_private_gcing(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wbc-&gt;for_reclaim) {</div><div class='del'>-		f2fs_submit_merged_write_cond(sbi, NULL, page, 0, DATA);</div><div class='del'>-		clear_inode_flag(inode, FI_HOT_DATA);</div><div class='del'>-		f2fs_remove_dirty_inode(inode);</div><div class='del'>-		submitted = NULL;</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='add'>+		folio_clear_f2fs_gcing(folio);</div><div class='ctx'> 	}</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> 	if (!S_ISDIR(inode-&gt;i_mode) &amp;&amp; !IS_NOQUOTA(inode) &amp;&amp;</div><div class='ctx'> 			!F2FS_I(inode)-&gt;wb_task &amp;&amp; allow_balance)</div><div class='ctx'> 		f2fs_balance_fs(sbi, need_balance_fs);</div><div class='hunk'>@@ -2968,41 +2901,19 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> redirty_out:</div><div class='del'>-	redirty_page_for_writepage(wbc, page);</div><div class='add'>+	folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pageout() in MM translates EAGAIN, so calls handle_write_error()</div><div class='ctx'> 	 * -&gt; mapping_set_error() -&gt; set_bit(AS_EIO, ...).</div><div class='ctx'> 	 * file_write_and_wait_range() will see EIO error, which is critical</div><div class='ctx'> 	 * to return value of fsync() followed by atomic_write failure to user.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!err || wbc-&gt;for_reclaim)</div><div class='del'>-		return AOP_WRITEPAGE_ACTIVATE;</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 1;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_write_data_page(struct page *page,</div><div class='del'>-					struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-</div><div class='del'>-	if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (f2fs_compressed_file(inode)) {</div><div class='del'>-		if (f2fs_is_compressed_cluster(inode, page-&gt;index)) {</div><div class='del'>-			redirty_page_for_writepage(wbc, page);</div><div class='del'>-			return AOP_WRITEPAGE_ACTIVATE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return f2fs_write_single_data_page(page, NULL, NULL, NULL,</div><div class='del'>-						wbc, FS_DATA_IO, 0, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This function was copied from write_cache_pages from mm/page-writeback.c.</div><div class='ctx'>  * The major change is making write step of cold data page separately from</div><div class='hunk'>@@ -3075,10 +2986,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,</div><div class='ctx'> 		if (wbc-&gt;range_start == 0 &amp;&amp; wbc-&gt;range_end == LLONG_MAX)</div><div class='ctx'> 			range_whole = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='del'>-		tag = PAGECACHE_TAG_TOWRITE;</div><div class='del'>-	else</div><div class='del'>-		tag = PAGECACHE_TAG_DIRTY;</div><div class='add'>+	tag = wbc_to_tag(wbc);</div><div class='ctx'> retry:</div><div class='ctx'> 	retry = 0;</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='hunk'>@@ -3196,7 +3104,7 @@ continue_unlock:</div><div class='ctx'> 			if (folio_test_writeback(folio)) {</div><div class='ctx'> 				if (wbc-&gt;sync_mode == WB_SYNC_NONE)</div><div class='ctx'> 					goto continue_unlock;</div><div class='del'>-				f2fs_wait_on_page_writeback(&amp;folio-&gt;page, DATA, true, true);</div><div class='add'>+				f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (!folio_clear_dirty_for_io(folio))</div><div class='hunk'>@@ -3205,15 +3113,14 @@ continue_unlock:</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 			if (f2fs_compressed_file(inode)) {</div><div class='ctx'> 				folio_get(folio);</div><div class='del'>-				f2fs_compress_ctx_add_page(&amp;cc, &amp;folio-&gt;page);</div><div class='add'>+				f2fs_compress_ctx_add_page(&amp;cc, folio);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> #endif</div><div class='del'>-			ret = f2fs_write_single_data_page(&amp;folio-&gt;page,</div><div class='add'>+			submitted = 0;</div><div class='add'>+			ret = f2fs_write_single_data_page(folio,</div><div class='ctx'> 					&amp;submitted, &amp;bio, &amp;last_block,</div><div class='ctx'> 					wbc, io_type, 0, true);</div><div class='del'>-			if (ret == AOP_WRITEPAGE_ACTIVATE)</div><div class='del'>-				folio_unlock(folio);</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> result:</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3225,14 +3132,14 @@ result:</div><div class='ctx'> 				 * keep nr_to_write, since vfs uses this to</div><div class='ctx'> 				 * get # of written pages.</div><div class='ctx'> 				 */</div><div class='del'>-				if (ret == AOP_WRITEPAGE_ACTIVATE) {</div><div class='add'>+				if (ret == 1) {</div><div class='ctx'> 					ret = 0;</div><div class='ctx'> 					goto next;</div><div class='ctx'> 				} else if (ret == -EAGAIN) {</div><div class='ctx'> 					ret = 0;</div><div class='ctx'> 					if (wbc-&gt;sync_mode == WB_SYNC_ALL) {</div><div class='del'>-						f2fs_io_schedule_timeout(</div><div class='del'>-							DEFAULT_IO_TIMEOUT);</div><div class='add'>+						f2fs_schedule_timeout(</div><div class='add'>+							DEFAULT_SCHEDULE_TIMEOUT);</div><div class='ctx'> 						goto retry_write;</div><div class='ctx'> 					}</div><div class='ctx'> 					goto next;</div><div class='hunk'>@@ -3314,6 +3221,19 @@ static inline bool __should_serialize_io(struct inode *inode,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void account_writeback(struct inode *inode, bool inc)</div><div class='add'>+{</div><div class='add'>+	if (!f2fs_sb_has_compression(F2FS_I_SB(inode)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	f2fs_down_read(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+	if (inc)</div><div class='add'>+		atomic_inc(&amp;F2FS_I(inode)-&gt;writeback);</div><div class='add'>+	else</div><div class='add'>+		atomic_dec(&amp;F2FS_I(inode)-&gt;writeback);</div><div class='add'>+	f2fs_up_read(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __f2fs_write_data_pages(struct address_space *mapping,</div><div class='ctx'> 						struct writeback_control *wbc,</div><div class='ctx'> 						enum iostat_type io_type)</div><div class='hunk'>@@ -3324,10 +3244,6 @@ static int __f2fs_write_data_pages(struct address_space *mapping,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool locked = false;</div><div class='ctx'> </div><div class='del'>-	/* deal with chardevs and other special file */</div><div class='del'>-	if (!mapping-&gt;a_ops-&gt;writepage)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* skip writing if there is no dirty page in this inode */</div><div class='ctx'> 	if (!get_dirty_pages(inode) &amp;&amp; wbc-&gt;sync_mode == WB_SYNC_NONE)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -3363,10 +3279,14 @@ static int __f2fs_write_data_pages(struct address_space *mapping,</div><div class='ctx'> 		locked = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	account_writeback(inode, true);</div><div class='add'>+</div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> 	ret = f2fs_write_cache_pages(mapping, wbc, io_type);</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> </div><div class='add'>+	account_writeback(inode, false);</div><div class='add'>+</div><div class='ctx'> 	if (locked)</div><div class='ctx'> 		mutex_unlock(&amp;sbi-&gt;writepages);</div><div class='ctx'> </div><div class='hunk'>@@ -3417,13 +3337,13 @@ void f2fs_write_failed(struct inode *inode, loff_t to)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int prepare_write_begin(struct f2fs_sb_info *sbi,</div><div class='del'>-			struct page *page, loff_t pos, unsigned len,</div><div class='add'>+			struct folio *folio, loff_t pos, unsigned int len,</div><div class='ctx'> 			block_t *blk_addr, bool *node_changed)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	pgoff_t index = page-&gt;index;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	pgoff_t index = folio-&gt;index;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	bool locked = false;</div><div class='ctx'> 	int flag = F2FS_GET_BLOCK_PRE_AIO;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -3448,29 +3368,34 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> restart:</div><div class='ctx'> 	/* check inline_data */</div><div class='del'>-	ipage = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		err = PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		err = PTR_ERR(ifolio);</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, ipage, ipage, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, ifolio, ifolio, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_data(inode)) {</div><div class='ctx'> 		if (pos + len &lt;= MAX_INLINE_DATA(inode)) {</div><div class='del'>-			f2fs_do_read_inline_data(page, ipage);</div><div class='add'>+			f2fs_do_read_inline_data(folio, ifolio);</div><div class='ctx'> 			set_inode_flag(inode, FI_DATA_EXIST);</div><div class='ctx'> 			if (inode-&gt;i_nlink)</div><div class='del'>-				set_page_private_inline(ipage);</div><div class='add'>+				folio_set_f2fs_inline(ifolio);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		err = f2fs_convert_inline_page(&amp;dn, page);</div><div class='add'>+		err = f2fs_convert_inline_folio(&amp;dn, folio);</div><div class='ctx'> 		if (err || dn.data_blkaddr != NULL_ADDR)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_lookup_read_extent_cache_block(inode, index,</div><div class='ctx'> 						 &amp;dn.data_blkaddr)) {</div><div class='add'>+		if (IS_DEVICE_ALIASING(inode)) {</div><div class='add'>+			err = -ENODATA;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (locked) {</div><div class='ctx'> 			err = f2fs_reserve_block(&amp;dn, index);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3503,14 +3428,14 @@ static int __find_data_block(struct inode *inode, pgoff_t index,</div><div class='ctx'> 				block_t *blk_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage))</div><div class='del'>-		return PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, ipage, ipage, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, ifolio, ifolio, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_lookup_read_extent_cache_block(inode, index,</div><div class='ctx'> 						 &amp;dn.data_blkaddr)) {</div><div class='hunk'>@@ -3531,17 +3456,17 @@ static int __reserve_data_block(struct inode *inode, pgoff_t index,</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO);</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		err = PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		err = PTR_ERR(ifolio);</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='del'>-	set_new_dnode(&amp;dn, inode, ipage, ipage, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, ifolio, ifolio, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_lookup_read_extent_cache_block(dn.inode, index,</div><div class='ctx'> 						&amp;dn.data_blkaddr))</div><div class='hunk'>@@ -3557,12 +3482,12 @@ unlock_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int prepare_atomic_write_begin(struct f2fs_sb_info *sbi,</div><div class='del'>-			struct page *page, loff_t pos, unsigned int len,</div><div class='add'>+			struct folio *folio, loff_t pos, unsigned int len,</div><div class='ctx'> 			block_t *blk_addr, bool *node_changed, bool *use_cow)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct inode *cow_inode = F2FS_I(inode)-&gt;cow_inode;</div><div class='del'>-	pgoff_t index = page-&gt;index;</div><div class='add'>+	pgoff_t index = folio-&gt;index;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	block_t ori_blk_addr = NULL_ADDR;</div><div class='ctx'> </div><div class='hunk'>@@ -3599,13 +3524,15 @@ reserve_block:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata)</div><div class='add'>+static int f2fs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='add'>+			    loff_t pos, unsigned len, struct folio **foliop,</div><div class='add'>+			    void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct page *page = NULL;</div><div class='del'>-	pgoff_t index = ((unsigned long long) pos) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	bool need_balance = false;</div><div class='ctx'> 	bool use_cow = false;</div><div class='ctx'> 	block_t blkaddr = NULL_ADDR;</div><div class='hunk'>@@ -3621,7 +3548,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We should check this at this moment to avoid deadlock on inode page</div><div class='ctx'> 	 * and #0 page. The locking rule for inline_data conversion should be:</div><div class='del'>-	 * lock_page(page #0) -&gt; lock_page(inode_page)</div><div class='add'>+	 * folio_lock(folio #0) -&gt; folio_lock(inode_page)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (index != 0) {</div><div class='ctx'> 		err = f2fs_convert_inline_inode(inode);</div><div class='hunk'>@@ -3632,18 +3559,20 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	if (f2fs_compressed_file(inode)) {</div><div class='ctx'> 		int ret;</div><div class='add'>+		struct page *page;</div><div class='ctx'> </div><div class='ctx'> 		*fsdata = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (len == PAGE_SIZE &amp;&amp; !(f2fs_is_atomic_file(inode)))</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> </div><div class='del'>-		ret = f2fs_prepare_compress_overwrite(inode, pagep,</div><div class='add'>+		ret = f2fs_prepare_compress_overwrite(inode, &amp;page,</div><div class='ctx'> 							index, fsdata);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			err = ret;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		} else if (ret) {</div><div class='add'>+			*foliop = page_folio(page);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3651,92 +3580,93 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> </div><div class='ctx'> repeat:</div><div class='ctx'> 	/*</div><div class='del'>-	 * Do not use grab_cache_page_write_begin() to avoid deadlock due to</div><div class='del'>-	 * wait_for_stable_page. Will wait that below with our IO control.</div><div class='add'>+	 * Do not use FGP_STABLE to avoid deadlock.</div><div class='add'>+	 * Will wait that below with our IO control.</div><div class='ctx'> 	 */</div><div class='del'>-	page = f2fs_pagecache_get_page(mapping, index,</div><div class='del'>-				FGP_LOCK | FGP_WRITE | FGP_CREAT, GFP_NOFS);</div><div class='del'>-	if (!page) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+	folio = f2fs_filemap_get_folio(mapping, index,</div><div class='add'>+				FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_NOFS,</div><div class='add'>+				mapping_gfp_mask(mapping));</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		err = PTR_ERR(folio);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: cluster can be compressed due to race with .writepage */</div><div class='ctx'> </div><div class='del'>-	*pagep = page;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_is_atomic_file(inode))</div><div class='del'>-		err = prepare_atomic_write_begin(sbi, page, pos, len,</div><div class='add'>+		err = prepare_atomic_write_begin(sbi, folio, pos, len,</div><div class='ctx'> 					&amp;blkaddr, &amp;need_balance, &amp;use_cow);</div><div class='ctx'> 	else</div><div class='del'>-		err = prepare_write_begin(sbi, page, pos, len,</div><div class='add'>+		err = prepare_write_begin(sbi, folio, pos, len,</div><div class='ctx'> 					&amp;blkaddr, &amp;need_balance);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto put_folio;</div><div class='ctx'> </div><div class='ctx'> 	if (need_balance &amp;&amp; !IS_NOQUOTA(inode) &amp;&amp;</div><div class='ctx'> 			has_not_enough_free_secs(sbi, 0, 0)) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		f2fs_balance_fs(sbi, true);</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (page-&gt;mapping != mapping) {</div><div class='del'>-			/* The page got truncated from under us */</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (folio-&gt;mapping != mapping) {</div><div class='add'>+			/* The folio got truncated from under us */</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, false, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, false, true);</div><div class='ctx'> </div><div class='del'>-	if (len == PAGE_SIZE || PageUptodate(page))</div><div class='add'>+	if (len == folio_size(folio) || folio_test_uptodate(folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(pos &amp; (PAGE_SIZE - 1)) &amp;&amp; (pos + len) &gt;= i_size_read(inode) &amp;&amp;</div><div class='ctx'> 	    !f2fs_verity_in_progress(inode)) {</div><div class='del'>-		zero_user_segment(page, len, PAGE_SIZE);</div><div class='add'>+		folio_zero_segment(folio, len, folio_size(folio));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (blkaddr == NEW_ADDR) {</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+		folio_zero_segment(folio, 0, folio_size(folio));</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(sbi, blkaddr,</div><div class='ctx'> 				DATA_GENERIC_ENHANCE_READ)) {</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='del'>-			goto fail;</div><div class='add'>+			goto put_folio;</div><div class='ctx'> 		}</div><div class='del'>-		err = f2fs_submit_page_read(use_cow ?</div><div class='del'>-				F2FS_I(inode)-&gt;cow_inode : inode, page,</div><div class='del'>-				blkaddr, 0, true);</div><div class='del'>-		if (err)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (unlikely(page-&gt;mapping != mapping)) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_submit_page_read(use_cow ?</div><div class='add'>+				F2FS_I(inode)-&gt;cow_inode : inode,</div><div class='add'>+				folio, blkaddr, 0, true);</div><div class='add'>+</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (unlikely(folio-&gt;mapping != mapping)) {</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(!PageUptodate(page))) {</div><div class='add'>+		if (unlikely(!folio_test_uptodate(folio))) {</div><div class='ctx'> 			err = -EIO;</div><div class='del'>-			goto fail;</div><div class='add'>+			goto put_folio;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+put_folio:</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> fail:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='ctx'> 	f2fs_write_failed(inode, pos + len);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_write_end(struct file *file,</div><div class='add'>+static int f2fs_write_end(const struct kiocb *iocb,</div><div class='ctx'> 			struct address_space *mapping,</div><div class='ctx'> 			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+			struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_write_end(inode, pos, len, copied);</div><div class='ctx'> </div><div class='hunk'>@@ -3745,17 +3675,17 @@ static int f2fs_write_end(struct file *file,</div><div class='ctx'> 	 * should be PAGE_SIZE. Otherwise, we treat it with zero copied and</div><div class='ctx'> 	 * let generic_perform_write() try to copy data again through copied=0.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		if (unlikely(copied != len))</div><div class='ctx'> 			copied = 0;</div><div class='ctx'> 		else</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	/* overwrite compressed file */</div><div class='ctx'> 	if (f2fs_compressed_file(inode) &amp;&amp; fsdata) {</div><div class='del'>-		f2fs_compress_write_end(inode, fsdata, page-&gt;index, copied);</div><div class='add'>+		f2fs_compress_write_end(inode, fsdata, folio-&gt;index, copied);</div><div class='ctx'> 		f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='ctx'> </div><div class='ctx'> 		if (pos + copied &gt; i_size_read(inode) &amp;&amp;</div><div class='hunk'>@@ -3768,7 +3698,10 @@ static int f2fs_write_end(struct file *file,</div><div class='ctx'> 	if (!copied)</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+</div><div class='add'>+	if (f2fs_is_atomic_file(inode))</div><div class='add'>+		folio_set_f2fs_atomic(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (pos + copied &gt; i_size_read(inode) &amp;&amp;</div><div class='ctx'> 	    !f2fs_verity_in_progress(inode)) {</div><div class='hunk'>@@ -3778,7 +3711,7 @@ static int f2fs_write_end(struct file *file,</div><div class='ctx'> 					pos + copied);</div><div class='ctx'> 	}</div><div class='ctx'> unlock_out:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='hunk'>@@ -3802,7 +3735,7 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)</div><div class='ctx'> 			f2fs_remove_dirty_inode(inode);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	clear_page_private_all(&amp;folio-&gt;page);</div><div class='add'>+	folio_detach_private(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool f2fs_release_folio(struct folio *folio, gfp_t wait)</div><div class='hunk'>@@ -3811,7 +3744,7 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)</div><div class='ctx'> 	if (folio_test_dirty(folio))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	clear_page_private_all(&amp;folio-&gt;page);</div><div class='add'>+	folio_detach_private(folio);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3820,7 +3753,7 @@ static bool f2fs_dirty_data_folio(struct address_space *mapping,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_set_page_dirty(&amp;folio-&gt;page, DATA);</div><div class='add'>+	trace_f2fs_set_page_dirty(folio, DATA);</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_uptodate(folio))</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='hunk'>@@ -3905,38 +3838,48 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	unsigned int blkofs;</div><div class='ctx'> 	unsigned int blk_per_sec = BLKS_PER_SEC(sbi);</div><div class='add'>+	unsigned int end_blk = start_blk + blkcnt - 1;</div><div class='ctx'> 	unsigned int secidx = start_blk / blk_per_sec;</div><div class='del'>-	unsigned int end_sec = secidx + blkcnt / blk_per_sec;</div><div class='add'>+	unsigned int end_sec;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	if (!blkcnt)</div><div class='add'>+		return 0;</div><div class='add'>+	end_sec = end_blk / blk_per_sec;</div><div class='add'>+</div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='ctx'> 	set_inode_flag(inode, FI_ALIGNED_WRITE);</div><div class='ctx'> 	set_inode_flag(inode, FI_OPU_WRITE);</div><div class='ctx'> </div><div class='del'>-	for (; secidx &lt; end_sec; secidx++) {</div><div class='add'>+	for (; secidx &lt;= end_sec; secidx++) {</div><div class='add'>+		unsigned int blkofs_end = secidx == end_sec ?</div><div class='add'>+				end_blk % blk_per_sec : blk_per_sec - 1;</div><div class='add'>+</div><div class='ctx'> 		f2fs_down_write(&amp;sbi-&gt;pin_sem);</div><div class='ctx'> </div><div class='del'>-		f2fs_lock_op(sbi);</div><div class='del'>-		f2fs_allocate_new_section(sbi, CURSEG_COLD_DATA_PINNED, false);</div><div class='del'>-		f2fs_unlock_op(sbi);</div><div class='add'>+		ret = f2fs_allocate_pinning_section(sbi);</div><div class='add'>+		if (ret) {</div><div class='add'>+			f2fs_up_write(&amp;sbi-&gt;pin_sem);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		set_inode_flag(inode, FI_SKIP_WRITES);</div><div class='ctx'> </div><div class='del'>-		for (blkofs = 0; blkofs &lt; blk_per_sec; blkofs++) {</div><div class='del'>-			struct page *page;</div><div class='add'>+		for (blkofs = 0; blkofs &lt;= blkofs_end; blkofs++) {</div><div class='add'>+			struct folio *folio;</div><div class='ctx'> 			unsigned int blkidx = secidx * blk_per_sec + blkofs;</div><div class='ctx'> </div><div class='del'>-			page = f2fs_get_lock_data_page(inode, blkidx, true);</div><div class='del'>-			if (IS_ERR(page)) {</div><div class='add'>+			folio = f2fs_get_lock_data_folio(inode, blkidx, true);</div><div class='add'>+			if (IS_ERR(folio)) {</div><div class='ctx'> 				f2fs_up_write(&amp;sbi-&gt;pin_sem);</div><div class='del'>-				ret = PTR_ERR(page);</div><div class='add'>+				ret = PTR_ERR(folio);</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		clear_inode_flag(inode, FI_SKIP_WRITES);</div><div class='hunk'>@@ -3966,15 +3909,14 @@ static int check_swap_activate(struct swap_info_struct *sis,</div><div class='ctx'> 	struct address_space *mapping = swap_file-&gt;f_mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	sector_t cur_lblock;</div><div class='del'>-	sector_t last_lblock;</div><div class='del'>-	sector_t pblock;</div><div class='del'>-	sector_t lowest_pblock = -1;</div><div class='del'>-	sector_t highest_pblock = 0;</div><div class='add'>+	block_t cur_lblock;</div><div class='add'>+	block_t last_lblock;</div><div class='add'>+	block_t pblock;</div><div class='add'>+	block_t lowest_pblock = -1;</div><div class='add'>+	block_t highest_pblock = 0;</div><div class='ctx'> 	int nr_extents = 0;</div><div class='del'>-	unsigned long nr_pblocks;</div><div class='add'>+	unsigned int nr_pblocks;</div><div class='ctx'> 	unsigned int blks_per_sec = BLKS_PER_SEC(sbi);</div><div class='del'>-	unsigned int sec_blks_mask = BLKS_PER_SEC(sbi) - 1;</div><div class='ctx'> 	unsigned int not_aligned = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3983,7 +3925,7 @@ static int check_swap_activate(struct swap_info_struct *sis,</div><div class='ctx'> 	 * to be very smart.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cur_lblock = 0;</div><div class='del'>-	last_lblock = bytes_to_blks(inode, i_size_read(inode));</div><div class='add'>+	last_lblock = F2FS_BYTES_TO_BLK(i_size_read(inode));</div><div class='ctx'> </div><div class='ctx'> 	while (cur_lblock &lt; last_lblock &amp;&amp; cur_lblock &lt; sis-&gt;max) {</div><div class='ctx'> 		struct f2fs_map_blocks map;</div><div class='hunk'>@@ -4012,28 +3954,35 @@ retry:</div><div class='ctx'> 		pblock = map.m_pblk;</div><div class='ctx'> 		nr_pblocks = map.m_len;</div><div class='ctx'> </div><div class='del'>-		if ((pblock - SM_I(sbi)-&gt;main_blkaddr) &amp; sec_blks_mask ||</div><div class='del'>-				nr_pblocks &amp; sec_blks_mask) {</div><div class='add'>+		if ((pblock - SM_I(sbi)-&gt;main_blkaddr) % blks_per_sec ||</div><div class='add'>+				nr_pblocks % blks_per_sec ||</div><div class='add'>+				f2fs_is_sequential_zone_area(sbi, pblock)) {</div><div class='add'>+			bool last_extent = false;</div><div class='add'>+</div><div class='ctx'> 			not_aligned++;</div><div class='ctx'> </div><div class='ctx'> 			nr_pblocks = roundup(nr_pblocks, blks_per_sec);</div><div class='ctx'> 			if (cur_lblock + nr_pblocks &gt; sis-&gt;max)</div><div class='ctx'> 				nr_pblocks -= blks_per_sec;</div><div class='ctx'> </div><div class='add'>+			/* this extent is last one */</div><div class='ctx'> 			if (!nr_pblocks) {</div><div class='del'>-				/* this extent is last one */</div><div class='del'>-				nr_pblocks = map.m_len;</div><div class='del'>-				f2fs_warn(sbi, "Swapfile: last extent is not aligned to section");</div><div class='del'>-				goto next;</div><div class='add'>+				nr_pblocks = last_lblock - cur_lblock;</div><div class='add'>+				last_extent = true;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ret = f2fs_migrate_blocks(inode, cur_lblock,</div><div class='ctx'> 							nr_pblocks);</div><div class='del'>-			if (ret)</div><div class='add'>+			if (ret) {</div><div class='add'>+				if (ret == -ENOENT)</div><div class='add'>+					ret = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='del'>-			goto retry;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!last_extent)</div><div class='add'>+				goto retry;</div><div class='ctx'> 		}</div><div class='del'>-next:</div><div class='add'>+</div><div class='ctx'> 		if (cur_lblock + nr_pblocks &gt;= sis-&gt;max)</div><div class='ctx'> 			nr_pblocks = sis-&gt;max - cur_lblock;</div><div class='ctx'> </div><div class='hunk'>@@ -4059,7 +4008,6 @@ next:</div><div class='ctx'> 		cur_lblock = 1;	/* force Empty message */</div><div class='ctx'> 	sis-&gt;max = cur_lblock;</div><div class='ctx'> 	sis-&gt;pages = cur_lblock - 1;</div><div class='del'>-	sis-&gt;highest_bit = cur_lblock - 1;</div><div class='ctx'> out:</div><div class='ctx'> 	if (not_aligned)</div><div class='ctx'> 		f2fs_warn(sbi, "Swapfile (%u) is not align to section: 1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate(%lu * N)",</div><div class='hunk'>@@ -4071,17 +4019,17 @@ static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 				sector_t *span)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (f2fs_readonly(F2FS_I_SB(inode)-&gt;sb))</div><div class='add'>+	if (f2fs_readonly(sbi-&gt;sb))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='del'>-	if (f2fs_lfs_mode(F2FS_I_SB(inode))) {</div><div class='del'>-		f2fs_err(F2FS_I_SB(inode),</div><div class='del'>-			"Swapfile not supported in LFS mode");</div><div class='add'>+	if (f2fs_lfs_mode(sbi) &amp;&amp; !f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+		f2fs_err(sbi, "Swapfile not supported in LFS mode");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4092,6 +4040,10 @@ static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> 	if (!f2fs_disable_compressed_file(inode))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ret = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	f2fs_precache_extents(inode);</div><div class='ctx'> </div><div class='ctx'> 	ret = check_swap_activate(sis, file, span);</div><div class='hunk'>@@ -4100,7 +4052,7 @@ static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	stat_inc_swapfile_inode(inode);</div><div class='ctx'> 	set_inode_flag(inode, FI_PIN_FILE);</div><div class='del'>-	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='add'>+	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4126,7 +4078,6 @@ static void f2fs_swap_deactivate(struct file *file)</div><div class='ctx'> const struct address_space_operations f2fs_dblock_aops = {</div><div class='ctx'> 	.read_folio	= f2fs_read_data_folio,</div><div class='ctx'> 	.readahead	= f2fs_readahead,</div><div class='del'>-	.writepage	= f2fs_write_data_page,</div><div class='ctx'> 	.writepages	= f2fs_write_data_pages,</div><div class='ctx'> 	.write_begin	= f2fs_write_begin,</div><div class='ctx'> 	.write_end	= f2fs_write_end,</div><div class='hunk'>@@ -4139,13 +4090,13 @@ const struct address_space_operations f2fs_dblock_aops = {</div><div class='ctx'> 	.swap_deactivate = f2fs_swap_deactivate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void f2fs_clear_page_cache_dirty_tag(struct page *page)</div><div class='add'>+void f2fs_clear_page_cache_dirty_tag(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = page_mapping(page);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	xa_lock_irqsave(&amp;mapping-&gt;i_pages, flags);</div><div class='del'>-	__xa_clear_mark(&amp;mapping-&gt;i_pages, page_index(page),</div><div class='add'>+	__xa_clear_mark(&amp;mapping-&gt;i_pages, folio-&gt;index,</div><div class='ctx'> 						PAGECACHE_TAG_DIRTY);</div><div class='ctx'> 	xa_unlock_irqrestore(&amp;mapping-&gt;i_pages, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -4211,22 +4162,33 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> 			    unsigned int flags, struct iomap *iomap,</div><div class='ctx'> 			    struct iomap *srcmap)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_map_blocks map = {};</div><div class='add'>+	struct f2fs_map_blocks map = { NULL, };</div><div class='ctx'> 	pgoff_t next_pgofs = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	map.m_lblk = bytes_to_blks(inode, offset);</div><div class='del'>-	map.m_len = bytes_to_blks(inode, offset + length - 1) - map.m_lblk + 1;</div><div class='add'>+	map.m_lblk = F2FS_BYTES_TO_BLK(offset);</div><div class='add'>+	map.m_len = F2FS_BYTES_TO_BLK(offset + length - 1) - map.m_lblk + 1;</div><div class='ctx'> 	map.m_next_pgofs = &amp;next_pgofs;</div><div class='del'>-	map.m_seg_type = f2fs_rw_hint_to_seg_type(inode-&gt;i_write_hint);</div><div class='del'>-	if (flags &amp; IOMAP_WRITE)</div><div class='add'>+	map.m_seg_type = f2fs_rw_hint_to_seg_type(F2FS_I_SB(inode),</div><div class='add'>+						inode-&gt;i_write_hint);</div><div class='add'>+	if (flags &amp; IOMAP_WRITE &amp;&amp; iomap-&gt;private) {</div><div class='add'>+		map.m_last_pblk = (unsigned long)iomap-&gt;private;</div><div class='add'>+		iomap-&gt;private = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the blocks being overwritten are already allocated,</div><div class='add'>+	 * f2fs_map_lock and f2fs_balance_fs are not necessary.</div><div class='add'>+	 */</div><div class='add'>+	if ((flags &amp; IOMAP_WRITE) &amp;&amp;</div><div class='add'>+		!f2fs_overwrite_io(inode, offset, length))</div><div class='ctx'> 		map.m_may_create = true;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_map_blocks(inode, &amp;map, F2FS_GET_BLOCK_DIO);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	iomap-&gt;offset = blks_to_bytes(inode, map.m_lblk);</div><div class='add'>+	iomap-&gt;offset = F2FS_BLK_TO_BYTES(map.m_lblk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When inline encryption is enabled, sometimes I/O to an encrypted file</div><div class='hunk'>@@ -4239,29 +4201,41 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='ctx'> 	 * We should never see delalloc or compressed extents here based on</div><div class='ctx'> 	 * prior flushing and checks.</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON_ONCE(map.m_pblk == NEW_ADDR))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (WARN_ON_ONCE(map.m_pblk == COMPRESS_ADDR))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (map.m_pblk != NULL_ADDR) {</div><div class='del'>-		iomap-&gt;length = blks_to_bytes(inode, map.m_len);</div><div class='add'>+	if (map.m_flags &amp; F2FS_MAP_MAPPED) {</div><div class='add'>+		if (WARN_ON_ONCE(map.m_pblk == NEW_ADDR))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		iomap-&gt;length = F2FS_BLK_TO_BYTES(map.m_len);</div><div class='ctx'> 		iomap-&gt;type = IOMAP_MAPPED;</div><div class='ctx'> 		iomap-&gt;flags |= IOMAP_F_MERGED;</div><div class='ctx'> 		iomap-&gt;bdev = map.m_bdev;</div><div class='del'>-		iomap-&gt;addr = blks_to_bytes(inode, map.m_pblk);</div><div class='add'>+		iomap-&gt;addr = F2FS_BLK_TO_BYTES(map.m_pblk);</div><div class='add'>+</div><div class='add'>+		if (flags &amp; IOMAP_WRITE &amp;&amp; map.m_last_pblk)</div><div class='add'>+			iomap-&gt;private = (void *)map.m_last_pblk;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (flags &amp; IOMAP_WRITE)</div><div class='ctx'> 			return -ENOTBLK;</div><div class='del'>-		iomap-&gt;length = blks_to_bytes(inode, next_pgofs) -</div><div class='del'>-				iomap-&gt;offset;</div><div class='del'>-		iomap-&gt;type = IOMAP_HOLE;</div><div class='add'>+</div><div class='add'>+		if (map.m_pblk == NULL_ADDR) {</div><div class='add'>+			iomap-&gt;length = F2FS_BLK_TO_BYTES(next_pgofs) -</div><div class='add'>+							iomap-&gt;offset;</div><div class='add'>+			iomap-&gt;type = IOMAP_HOLE;</div><div class='add'>+		} else if (map.m_pblk == NEW_ADDR) {</div><div class='add'>+			iomap-&gt;length = F2FS_BLK_TO_BYTES(map.m_len);</div><div class='add'>+			iomap-&gt;type = IOMAP_UNWRITTEN;</div><div class='add'>+		} else {</div><div class='add'>+			f2fs_bug_on(F2FS_I_SB(inode), 1);</div><div class='add'>+		}</div><div class='ctx'> 		iomap-&gt;addr = IOMAP_NULL_ADDR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (map.m_flags &amp; F2FS_MAP_NEW)</div><div class='ctx'> 		iomap-&gt;flags |= IOMAP_F_NEW;</div><div class='del'>-	if ((inode-&gt;i_state &amp; I_DIRTY_DATASYNC) ||</div><div class='add'>+	if ((inode_state_read_once(inode) &amp; I_DIRTY_DATASYNC) ||</div><div class='ctx'> 	    offset + length &gt; i_size_read(inode))</div><div class='ctx'> 		iomap-&gt;flags |= IOMAP_F_DIRTY;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c<br/>index fdbf994f1271..032683835569 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/debug.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/debug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/debug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/debug.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include "gc.h"</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(f2fs_stat_list);</div><div class='del'>-static DEFINE_RAW_SPINLOCK(f2fs_stat_lock);</div><div class='add'>+static DEFINE_SPINLOCK(f2fs_stat_lock);</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> static struct dentry *f2fs_debugfs_root;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -41,7 +41,7 @@ void f2fs_update_sit_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	total_vblocks = 0;</div><div class='ctx'> 	blks_per_sec = CAP_BLKS_PER_SEC(sbi);</div><div class='ctx'> 	hblks_per_sec = blks_per_sec / 2;</div><div class='del'>-	for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += sbi-&gt;segs_per_sec) {</div><div class='add'>+	for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += SEGS_PER_SEC(sbi)) {</div><div class='ctx'> 		vblocks = get_valid_blocks(sbi, segno, true);</div><div class='ctx'> 		dist = abs(vblocks - hblks_per_sec);</div><div class='ctx'> 		bimodal += dist * dist;</div><div class='hunk'>@@ -60,6 +60,70 @@ void f2fs_update_sit_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='add'>+static void update_multidevice_stats(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_stat_info *si = F2FS_STAT(sbi);</div><div class='add'>+	struct f2fs_dev_stats *dev_stats = si-&gt;dev_stats;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_is_multi_device(sbi))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(dev_stats, 0, sizeof(struct f2fs_dev_stats) * sbi-&gt;s_ndevs);</div><div class='add'>+	for (i = 0; i &lt; sbi-&gt;s_ndevs; i++) {</div><div class='add'>+		unsigned int start_segno, end_segno;</div><div class='add'>+		block_t start_blk, end_blk;</div><div class='add'>+</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			start_blk = MAIN_BLKADDR(sbi);</div><div class='add'>+			end_blk = FDEV(i).end_blk + 1 - SEG0_BLKADDR(sbi);</div><div class='add'>+		} else {</div><div class='add'>+			start_blk = FDEV(i).start_blk;</div><div class='add'>+			end_blk = FDEV(i).end_blk + 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		start_segno = GET_SEGNO(sbi, start_blk);</div><div class='add'>+		end_segno = GET_SEGNO(sbi, end_blk);</div><div class='add'>+</div><div class='add'>+		for (j = start_segno; j &lt; end_segno; j++) {</div><div class='add'>+			unsigned int seg_blks, sec_blks;</div><div class='add'>+</div><div class='add'>+			seg_blks = get_seg_entry(sbi, j)-&gt;valid_blocks;</div><div class='add'>+</div><div class='add'>+			/* update segment stats */</div><div class='add'>+			if (is_curseg(sbi, j))</div><div class='add'>+				dev_stats[i].devstats[0][DEVSTAT_INUSE]++;</div><div class='add'>+			else if (seg_blks == BLKS_PER_SEG(sbi))</div><div class='add'>+				dev_stats[i].devstats[0][DEVSTAT_FULL]++;</div><div class='add'>+			else if (seg_blks != 0)</div><div class='add'>+				dev_stats[i].devstats[0][DEVSTAT_DIRTY]++;</div><div class='add'>+			else if (!test_bit(j, FREE_I(sbi)-&gt;free_segmap))</div><div class='add'>+				dev_stats[i].devstats[0][DEVSTAT_FREE]++;</div><div class='add'>+			else</div><div class='add'>+				dev_stats[i].devstats[0][DEVSTAT_PREFREE]++;</div><div class='add'>+</div><div class='add'>+			if (!__is_large_section(sbi) ||</div><div class='add'>+				(j % SEGS_PER_SEC(sbi)) != 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			sec_blks = get_sec_entry(sbi, j)-&gt;valid_blocks;</div><div class='add'>+</div><div class='add'>+			/* update section stats */</div><div class='add'>+			if (is_cursec(sbi, GET_SEC_FROM_SEG(sbi, j)))</div><div class='add'>+				dev_stats[i].devstats[1][DEVSTAT_INUSE]++;</div><div class='add'>+			else if (sec_blks == BLKS_PER_SEC(sbi))</div><div class='add'>+				dev_stats[i].devstats[1][DEVSTAT_FULL]++;</div><div class='add'>+			else if (sec_blks != 0)</div><div class='add'>+				dev_stats[i].devstats[1][DEVSTAT_DIRTY]++;</div><div class='add'>+			else if (!test_bit(GET_SEC_FROM_SEG(sbi, j),</div><div class='add'>+					FREE_I(sbi)-&gt;free_secmap))</div><div class='add'>+				dev_stats[i].devstats[1][DEVSTAT_FREE]++;</div><div class='add'>+			else</div><div class='add'>+				dev_stats[i].devstats[1][DEVSTAT_PREFREE]++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void update_general_status(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_stat_info *si = F2FS_STAT(sbi);</div><div class='hunk'>@@ -100,6 +164,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	si-&gt;ndirty_imeta = get_pages(sbi, F2FS_DIRTY_IMETA);</div><div class='ctx'> 	si-&gt;ndirty_dirs = sbi-&gt;ndirty_inode[DIR_INODE];</div><div class='ctx'> 	si-&gt;ndirty_files = sbi-&gt;ndirty_inode[FILE_INODE];</div><div class='add'>+	si-&gt;ndonate_files = sbi-&gt;donate_files;</div><div class='ctx'> 	si-&gt;nquota_files = sbi-&gt;nquota_files;</div><div class='ctx'> 	si-&gt;ndirty_all = sbi-&gt;ndirty_inode[DIRTY_META];</div><div class='ctx'> 	si-&gt;aw_cnt = atomic_read(&amp;sbi-&gt;atomic_files);</div><div class='hunk'>@@ -135,7 +200,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	si-&gt;cur_ckpt_time = sbi-&gt;cprc_info.cur_time;</div><div class='ctx'> 	si-&gt;peak_ckpt_time = sbi-&gt;cprc_info.peak_time;</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;cprc_info.stat_lock);</div><div class='del'>-	si-&gt;total_count = (int)sbi-&gt;user_block_count / sbi-&gt;blocks_per_seg;</div><div class='add'>+	si-&gt;total_count = BLKS_TO_SEGS(sbi, (int)sbi-&gt;user_block_count);</div><div class='ctx'> 	si-&gt;rsvd_segs = reserved_segments(sbi);</div><div class='ctx'> 	si-&gt;overp_segs = overprovision_segments(sbi);</div><div class='ctx'> 	si-&gt;valid_count = valid_user_blocks(sbi);</div><div class='hunk'>@@ -176,17 +241,17 @@ static void update_general_status(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	si-&gt;alloc_nids = NM_I(sbi)-&gt;nid_cnt[PREALLOC_NID];</div><div class='ctx'> 	si-&gt;io_skip_bggc = sbi-&gt;io_skip_bggc;</div><div class='ctx'> 	si-&gt;other_skip_bggc = sbi-&gt;other_skip_bggc;</div><div class='del'>-	si-&gt;util_free = (int)(free_user_blocks(sbi) &gt;&gt; sbi-&gt;log_blocks_per_seg)</div><div class='add'>+	si-&gt;util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))</div><div class='ctx'> 		* 100 / (int)(sbi-&gt;user_block_count &gt;&gt; sbi-&gt;log_blocks_per_seg)</div><div class='ctx'> 		/ 2;</div><div class='del'>-	si-&gt;util_valid = (int)(written_block_count(sbi) &gt;&gt;</div><div class='del'>-						sbi-&gt;log_blocks_per_seg)</div><div class='add'>+	si-&gt;util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))</div><div class='ctx'> 		* 100 / (int)(sbi-&gt;user_block_count &gt;&gt; sbi-&gt;log_blocks_per_seg)</div><div class='ctx'> 		/ 2;</div><div class='ctx'> 	si-&gt;util_invalid = 50 - si-&gt;util_free - si-&gt;util_valid;</div><div class='ctx'> 	for (i = CURSEG_HOT_DATA; i &lt; NO_CHECK_TYPE; i++) {</div><div class='ctx'> 		struct curseg_info *curseg = CURSEG_I(sbi, i);</div><div class='ctx'> </div><div class='add'>+		si-&gt;blkoff[i] = curseg-&gt;next_blkoff;</div><div class='ctx'> 		si-&gt;curseg[i] = curseg-&gt;segno;</div><div class='ctx'> 		si-&gt;cursec[i] = GET_SEC_FROM_SEG(sbi, curseg-&gt;segno);</div><div class='ctx'> 		si-&gt;curzone[i] = GET_ZONE_FROM_SEC(sbi, si-&gt;cursec[i]);</div><div class='hunk'>@@ -208,13 +273,15 @@ static void update_general_status(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		if (!blks)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (blks == sbi-&gt;blocks_per_seg)</div><div class='add'>+		if (blks == BLKS_PER_SEG(sbi))</div><div class='ctx'> 			si-&gt;full_seg[type]++;</div><div class='ctx'> 		else</div><div class='ctx'> 			si-&gt;dirty_seg[type]++;</div><div class='ctx'> 		si-&gt;valid_blks[type] += blks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	update_multidevice_stats(sbi);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; MAX_CALL_TYPE; i++)</div><div class='ctx'> 		si-&gt;cp_call_count[i] = atomic_read(&amp;sbi-&gt;cp_call_count[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +343,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	/* build nm */</div><div class='ctx'> 	si-&gt;base_mem += sizeof(struct f2fs_nm_info);</div><div class='ctx'> 	si-&gt;base_mem += __bitmap_size(sbi, NAT_BITMAP);</div><div class='del'>-	si-&gt;base_mem += (NM_I(sbi)-&gt;nat_bits_blocks &lt;&lt; F2FS_BLKSIZE_BITS);</div><div class='add'>+	si-&gt;base_mem += F2FS_BLK_TO_BYTES(NM_I(sbi)-&gt;nat_bits_blocks);</div><div class='ctx'> 	si-&gt;base_mem += NM_I(sbi)-&gt;nat_blocks *</div><div class='ctx'> 				f2fs_bitmap_size(NAT_ENTRY_PER_BLOCK);</div><div class='ctx'> 	si-&gt;base_mem += NM_I(sbi)-&gt;nat_blocks / 8;</div><div class='hunk'>@@ -373,9 +440,8 @@ static int stat_show(struct seq_file *s, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_stat_info *si;</div><div class='ctx'> 	int i = 0, j = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	raw_spin_lock_irqsave(&amp;f2fs_stat_lock, flags);</div><div class='add'>+	spin_lock(&amp;f2fs_stat_lock);</div><div class='ctx'> 	list_for_each_entry(si, &amp;f2fs_stat_list, stat_list) {</div><div class='ctx'> 		struct f2fs_sb_info *sbi = si-&gt;sbi;</div><div class='ctx'> </div><div class='hunk'>@@ -436,60 +502,70 @@ static int stat_show(struct seq_file *s, void *v)</div><div class='ctx'> 			   si-&gt;compr_inode, si-&gt;compr_blocks);</div><div class='ctx'> 		seq_printf(s, "  - Swapfile Inode: %u\n",</div><div class='ctx'> 			   si-&gt;swapfile_inode);</div><div class='add'>+		seq_printf(s, "  - Donate Inode: %u\n",</div><div class='add'>+			   si-&gt;ndonate_files);</div><div class='ctx'> 		seq_printf(s, "  - Orphan/Append/Update Inode: %u, %u, %u\n",</div><div class='ctx'> 			   si-&gt;orphans, si-&gt;append, si-&gt;update);</div><div class='ctx'> 		seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",</div><div class='ctx'> 			   si-&gt;main_area_segs, si-&gt;main_area_sections,</div><div class='ctx'> 			   si-&gt;main_area_zones);</div><div class='del'>-		seq_printf(s, "    TYPE         %8s %8s %8s %10s %10s %10s\n",</div><div class='del'>-			   "segno", "secno", "zoneno", "dirty_seg", "full_seg", "valid_blk");</div><div class='del'>-		seq_printf(s, "  - COLD   data: %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+		seq_printf(s, "    TYPE         %8s %8s %8s %8s %10s %10s %10s\n",</div><div class='add'>+			   "blkoff", "segno", "secno", "zoneno", "dirty_seg", "full_seg", "valid_blk");</div><div class='add'>+		seq_printf(s, "  - COLD   data: %8d %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_COLD_DATA],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_COLD_DATA],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_COLD_DATA],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_COLD_DATA],</div><div class='ctx'> 			   si-&gt;dirty_seg[CURSEG_COLD_DATA],</div><div class='ctx'> 			   si-&gt;full_seg[CURSEG_COLD_DATA],</div><div class='ctx'> 			   si-&gt;valid_blks[CURSEG_COLD_DATA]);</div><div class='del'>-		seq_printf(s, "  - WARM   data: %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+		seq_printf(s, "  - WARM   data: %8d %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_WARM_DATA],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_WARM_DATA],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_WARM_DATA],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_WARM_DATA],</div><div class='ctx'> 			   si-&gt;dirty_seg[CURSEG_WARM_DATA],</div><div class='ctx'> 			   si-&gt;full_seg[CURSEG_WARM_DATA],</div><div class='ctx'> 			   si-&gt;valid_blks[CURSEG_WARM_DATA]);</div><div class='del'>-		seq_printf(s, "  - HOT    data: %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+		seq_printf(s, "  - HOT    data: %8d %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_HOT_DATA],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_HOT_DATA],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_HOT_DATA],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_HOT_DATA],</div><div class='ctx'> 			   si-&gt;dirty_seg[CURSEG_HOT_DATA],</div><div class='ctx'> 			   si-&gt;full_seg[CURSEG_HOT_DATA],</div><div class='ctx'> 			   si-&gt;valid_blks[CURSEG_HOT_DATA]);</div><div class='del'>-		seq_printf(s, "  - Dir   dnode: %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+		seq_printf(s, "  - Dir   dnode: %8d %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_HOT_NODE],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_HOT_NODE],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_HOT_NODE],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_HOT_NODE],</div><div class='ctx'> 			   si-&gt;dirty_seg[CURSEG_HOT_NODE],</div><div class='ctx'> 			   si-&gt;full_seg[CURSEG_HOT_NODE],</div><div class='ctx'> 			   si-&gt;valid_blks[CURSEG_HOT_NODE]);</div><div class='del'>-		seq_printf(s, "  - File  dnode: %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+		seq_printf(s, "  - File  dnode: %8d %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_WARM_NODE],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_WARM_NODE],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_WARM_NODE],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_WARM_NODE],</div><div class='ctx'> 			   si-&gt;dirty_seg[CURSEG_WARM_NODE],</div><div class='ctx'> 			   si-&gt;full_seg[CURSEG_WARM_NODE],</div><div class='ctx'> 			   si-&gt;valid_blks[CURSEG_WARM_NODE]);</div><div class='del'>-		seq_printf(s, "  - Indir nodes: %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+		seq_printf(s, "  - Indir nodes: %8d %8d %8d %8d %10u %10u %10u\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_COLD_NODE],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_COLD_NODE],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_COLD_NODE],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_COLD_NODE],</div><div class='ctx'> 			   si-&gt;dirty_seg[CURSEG_COLD_NODE],</div><div class='ctx'> 			   si-&gt;full_seg[CURSEG_COLD_NODE],</div><div class='ctx'> 			   si-&gt;valid_blks[CURSEG_COLD_NODE]);</div><div class='del'>-		seq_printf(s, "  - Pinned file: %8d %8d %8d\n",</div><div class='add'>+		seq_printf(s, "  - Pinned file: %8d %8d %8d %8d\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_COLD_DATA_PINNED],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_COLD_DATA_PINNED],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_COLD_DATA_PINNED],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_COLD_DATA_PINNED]);</div><div class='del'>-		seq_printf(s, "  - ATGC   data: %8d %8d %8d\n",</div><div class='add'>+		seq_printf(s, "  - ATGC   data: %8d %8d %8d %8d\n",</div><div class='add'>+			   si-&gt;blkoff[CURSEG_ALL_DATA_ATGC],</div><div class='ctx'> 			   si-&gt;curseg[CURSEG_ALL_DATA_ATGC],</div><div class='ctx'> 			   si-&gt;cursec[CURSEG_ALL_DATA_ATGC],</div><div class='ctx'> 			   si-&gt;curzone[CURSEG_ALL_DATA_ATGC]);</div><div class='hunk'>@@ -499,6 +575,36 @@ static int stat_show(struct seq_file *s, void *v)</div><div class='ctx'> 			   si-&gt;dirty_count);</div><div class='ctx'> 		seq_printf(s, "  - Prefree: %d\n  - Free: %d (%d)\n\n",</div><div class='ctx'> 			   si-&gt;prefree_count, si-&gt;free_segs, si-&gt;free_secs);</div><div class='add'>+		if (f2fs_is_multi_device(sbi)) {</div><div class='add'>+			seq_puts(s, "Multidevice stats:\n");</div><div class='add'>+			seq_printf(s, "  [seg:   %8s %8s %8s %8s %8s]",</div><div class='add'>+					"inuse", "dirty", "full", "free", "prefree");</div><div class='add'>+			if (__is_large_section(sbi))</div><div class='add'>+				seq_printf(s, " [sec:   %8s %8s %8s %8s %8s]\n",</div><div class='add'>+					"inuse", "dirty", "full", "free", "prefree");</div><div class='add'>+			else</div><div class='add'>+				seq_puts(s, "\n");</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; sbi-&gt;s_ndevs; i++) {</div><div class='add'>+				seq_printf(s, "  #%-2d     %8u %8u %8u %8u %8u", i,</div><div class='add'>+					si-&gt;dev_stats[i].devstats[0][DEVSTAT_INUSE],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[0][DEVSTAT_DIRTY],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[0][DEVSTAT_FULL],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[0][DEVSTAT_FREE],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[0][DEVSTAT_PREFREE]);</div><div class='add'>+				if (!__is_large_section(sbi)) {</div><div class='add'>+					seq_puts(s, "\n");</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				seq_printf(s, "          %8u %8u %8u %8u %8u\n",</div><div class='add'>+					si-&gt;dev_stats[i].devstats[1][DEVSTAT_INUSE],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[1][DEVSTAT_DIRTY],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[1][DEVSTAT_FULL],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[1][DEVSTAT_FREE],</div><div class='add'>+					si-&gt;dev_stats[i].devstats[1][DEVSTAT_PREFREE]);</div><div class='add'>+			}</div><div class='add'>+			seq_puts(s, "\n");</div><div class='add'>+		}</div><div class='ctx'> 		seq_printf(s, "CP calls: %d (BG: %d)\n",</div><div class='ctx'> 			   si-&gt;cp_call_count[TOTAL_CALL],</div><div class='ctx'> 			   si-&gt;cp_call_count[BACKGROUND]);</div><div class='hunk'>@@ -599,9 +705,9 @@ static int stat_show(struct seq_file *s, void *v)</div><div class='ctx'> 			   si-&gt;ndirty_node, si-&gt;node_pages);</div><div class='ctx'> 		seq_printf(s, "  - dents: %4d in dirs:%4d (%4d)\n",</div><div class='ctx'> 			   si-&gt;ndirty_dent, si-&gt;ndirty_dirs, si-&gt;ndirty_all);</div><div class='del'>-		seq_printf(s, "  - datas: %4d in files:%4d\n",</div><div class='add'>+		seq_printf(s, "  - data: %4d in files:%4d\n",</div><div class='ctx'> 			   si-&gt;ndirty_data, si-&gt;ndirty_files);</div><div class='del'>-		seq_printf(s, "  - quota datas: %4d in quota files:%4d\n",</div><div class='add'>+		seq_printf(s, "  - quota data: %4d in quota files:%4d\n",</div><div class='ctx'> 			   si-&gt;ndirty_qdata, si-&gt;nquota_files);</div><div class='ctx'> 		seq_printf(s, "  - meta: %4d in %4d\n",</div><div class='ctx'> 			   si-&gt;ndirty_meta, si-&gt;meta_pages);</div><div class='hunk'>@@ -655,7 +761,7 @@ static int stat_show(struct seq_file *s, void *v)</div><div class='ctx'> 		seq_printf(s, "  - paged : %llu KB\n",</div><div class='ctx'> 				si-&gt;page_mem &gt;&gt; 10);</div><div class='ctx'> 	}</div><div class='del'>-	raw_spin_unlock_irqrestore(&amp;f2fs_stat_lock, flags);</div><div class='add'>+	spin_unlock(&amp;f2fs_stat_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -666,13 +772,22 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);</div><div class='ctx'> 	struct f2fs_stat_info *si;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct f2fs_dev_stats *dev_stats;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	si = f2fs_kzalloc(sbi, sizeof(struct f2fs_stat_info), GFP_KERNEL);</div><div class='ctx'> 	if (!si)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	dev_stats = f2fs_kzalloc(sbi, sizeof(struct f2fs_dev_stats) *</div><div class='add'>+						sbi-&gt;s_ndevs, GFP_KERNEL);</div><div class='add'>+	if (!dev_stats) {</div><div class='add'>+		kfree(si);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	si-&gt;dev_stats = dev_stats;</div><div class='add'>+</div><div class='ctx'> 	si-&gt;all_area_segs = le32_to_cpu(raw_super-&gt;segment_count);</div><div class='ctx'> 	si-&gt;sit_area_segs = le32_to_cpu(raw_super-&gt;segment_count_sit);</div><div class='ctx'> 	si-&gt;nat_area_segs = le32_to_cpu(raw_super-&gt;segment_count_nat);</div><div class='hunk'>@@ -709,9 +824,9 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;sbi-&gt;max_aw_cnt, 0);</div><div class='ctx'> </div><div class='del'>-	raw_spin_lock_irqsave(&amp;f2fs_stat_lock, flags);</div><div class='add'>+	spin_lock(&amp;f2fs_stat_lock);</div><div class='ctx'> 	list_add_tail(&amp;si-&gt;stat_list, &amp;f2fs_stat_list);</div><div class='del'>-	raw_spin_unlock_irqrestore(&amp;f2fs_stat_lock, flags);</div><div class='add'>+	spin_unlock(&amp;f2fs_stat_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -719,12 +834,12 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)</div><div class='ctx'> void f2fs_destroy_stats(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_stat_info *si = F2FS_STAT(sbi);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	raw_spin_lock_irqsave(&amp;f2fs_stat_lock, flags);</div><div class='add'>+	spin_lock(&amp;f2fs_stat_lock);</div><div class='ctx'> 	list_del(&amp;si-&gt;stat_list);</div><div class='del'>-	raw_spin_unlock_irqrestore(&amp;f2fs_stat_lock, flags);</div><div class='add'>+	spin_unlock(&amp;f2fs_stat_lock);</div><div class='ctx'> </div><div class='add'>+	kfree(si-&gt;dev_stats);</div><div class='ctx'> 	kfree(si);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c<br/>index 042593aed1ec..48f4f98afb01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/dir.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  * Copyright (c) 2012 Samsung Electronics Co., Ltd.</div><div class='ctx'>  *             http://www.samsung.com/</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/f2fs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='hunk'>@@ -16,6 +16,21 @@</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> #include &lt;trace/events/f2fs.h&gt;</div><div class='ctx'> </div><div class='add'>+static inline bool f2fs_should_fallback_to_linear(struct inode *dir)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='add'>+</div><div class='add'>+	switch (F2FS_OPTION(sbi).lookup_mode) {</div><div class='add'>+	case LOOKUP_PERF:</div><div class='add'>+		return false;</div><div class='add'>+	case LOOKUP_COMPAT:</div><div class='add'>+		return true;</div><div class='add'>+	case LOOKUP_AUTO:</div><div class='add'>+		return !sb_no_casefold_compat_fallback(sbi-&gt;sb);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> extern struct kmem_cache *f2fs_cf_name_slab;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -42,35 +57,49 @@ static unsigned int bucket_blocks(unsigned int level)</div><div class='ctx'> 		return 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> /* If @dir is casefolded, initialize @fname-&gt;cf_name from @fname-&gt;usr_fname. */</div><div class='ctx'> int f2fs_init_casefolded_name(const struct inode *dir,</div><div class='ctx'> 			      struct f2fs_filename *fname)</div><div class='ctx'> {</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_CASEFOLDED(dir) &amp;&amp;</div><div class='ctx'> 	    !is_dot_dotdot(fname-&gt;usr_fname-&gt;name, fname-&gt;usr_fname-&gt;len)) {</div><div class='del'>-		fname-&gt;cf_name.name = f2fs_kmem_cache_alloc(f2fs_cf_name_slab,</div><div class='del'>-					GFP_NOFS, false, F2FS_SB(sb));</div><div class='del'>-		if (!fname-&gt;cf_name.name)</div><div class='add'>+		buf = f2fs_kmem_cache_alloc(f2fs_cf_name_slab,</div><div class='add'>+					    GFP_NOFS, false, F2FS_SB(sb));</div><div class='add'>+		if (!buf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		fname-&gt;cf_name.len = utf8_casefold(sb-&gt;s_encoding,</div><div class='del'>-						   fname-&gt;usr_fname,</div><div class='del'>-						   fname-&gt;cf_name.name,</div><div class='del'>-						   F2FS_NAME_LEN);</div><div class='del'>-		if ((int)fname-&gt;cf_name.len &lt;= 0) {</div><div class='del'>-			kmem_cache_free(f2fs_cf_name_slab, fname-&gt;cf_name.name);</div><div class='del'>-			fname-&gt;cf_name.name = NULL;</div><div class='add'>+</div><div class='add'>+		len = utf8_casefold(sb-&gt;s_encoding, fname-&gt;usr_fname,</div><div class='add'>+				    buf, F2FS_NAME_LEN);</div><div class='add'>+		if (len &lt;= 0) {</div><div class='add'>+			kmem_cache_free(f2fs_cf_name_slab, buf);</div><div class='ctx'> 			if (sb_has_strict_encoding(sb))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			/* fall back to treating name as opaque byte sequence */</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		fname-&gt;cf_name.name = buf;</div><div class='add'>+		fname-&gt;cf_name.len = len;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void f2fs_free_casefolded_name(struct f2fs_filename *fname)</div><div class='add'>+{</div><div class='add'>+	unsigned char *buf = (unsigned char *)fname-&gt;cf_name.name;</div><div class='add'>+</div><div class='add'>+	if (buf) {</div><div class='add'>+		kmem_cache_free(f2fs_cf_name_slab, buf);</div><div class='add'>+		fname-&gt;cf_name.name = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_UNICODE */</div><div class='add'>+</div><div class='ctx'> static int __f2fs_setup_filename(const struct inode *dir,</div><div class='ctx'> 				 const struct fscrypt_name *crypt_name,</div><div class='ctx'> 				 struct f2fs_filename *fname)</div><div class='hunk'>@@ -142,12 +171,7 @@ void f2fs_free_filename(struct f2fs_filename *fname)</div><div class='ctx'> 	kfree(fname-&gt;crypto_buf.name);</div><div class='ctx'> 	fname-&gt;crypto_buf.name = NULL;</div><div class='ctx'> #endif</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (fname-&gt;cf_name.name) {</div><div class='del'>-		kmem_cache_free(f2fs_cf_name_slab, fname-&gt;cf_name.name);</div><div class='del'>-		fname-&gt;cf_name.name = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	f2fs_free_casefolded_name(fname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long dir_block_index(unsigned int level,</div><div class='hunk'>@@ -157,77 +181,27 @@ static unsigned long dir_block_index(unsigned int level,</div><div class='ctx'> 	unsigned long bidx = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; level; i++)</div><div class='del'>-		bidx += dir_buckets(i, dir_level) * bucket_blocks(i);</div><div class='add'>+		bidx += mul_u32_u32(dir_buckets(i, dir_level),</div><div class='add'>+				    bucket_blocks(i));</div><div class='ctx'> 	bidx += idx * bucket_blocks(level);</div><div class='ctx'> 	return bidx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct f2fs_dir_entry *find_in_block(struct inode *dir,</div><div class='del'>-				struct page *dentry_page,</div><div class='add'>+				struct folio *dentry_folio,</div><div class='ctx'> 				const struct f2fs_filename *fname,</div><div class='del'>-				int *max_slots)</div><div class='add'>+				int *max_slots,</div><div class='add'>+				bool use_hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_dentry_block *dentry_blk;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> </div><div class='del'>-	dentry_blk = (struct f2fs_dentry_block *)page_address(dentry_page);</div><div class='add'>+	dentry_blk = folio_address(dentry_folio);</div><div class='ctx'> </div><div class='ctx'> 	make_dentry_ptr_block(dir, &amp;d, dentry_blk);</div><div class='del'>-	return f2fs_find_target_dentry(&amp;d, fname, max_slots);</div><div class='add'>+	return f2fs_find_target_dentry(&amp;d, fname, max_slots, use_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-/*</div><div class='del'>- * Test whether a case-insensitive directory entry matches the filename</div><div class='del'>- * being searched for.</div><div class='del'>- *</div><div class='del'>- * Returns 1 for a match, 0 for no match, and -errno on an error.</div><div class='del'>- */</div><div class='del'>-static int f2fs_match_ci_name(const struct inode *dir, const struct qstr *name,</div><div class='del'>-			       const u8 *de_name, u32 de_name_len)</div><div class='del'>-{</div><div class='del'>-	const struct super_block *sb = dir-&gt;i_sb;</div><div class='del'>-	const struct unicode_map *um = sb-&gt;s_encoding;</div><div class='del'>-	struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len);</div><div class='del'>-	struct qstr entry = QSTR_INIT(de_name, de_name_len);</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	if (IS_ENCRYPTED(dir)) {</div><div class='del'>-		const struct fscrypt_str encrypted_name =</div><div class='del'>-			FSTR_INIT((u8 *)de_name, de_name_len);</div><div class='del'>-</div><div class='del'>-		if (WARN_ON_ONCE(!fscrypt_has_encryption_key(dir)))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL);</div><div class='del'>-		if (!decrypted_name.name)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		res = fscrypt_fname_disk_to_usr(dir, 0, 0, &amp;encrypted_name,</div><div class='del'>-						&amp;decrypted_name);</div><div class='del'>-		if (res &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		entry.name = decrypted_name.name;</div><div class='del'>-		entry.len = decrypted_name.len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = utf8_strncasecmp_folded(um, name, &amp;entry);</div><div class='del'>-	/*</div><div class='del'>-	 * In strict mode, ignore invalid names.  In non-strict mode,</div><div class='del'>-	 * fall back to treating them as opaque byte sequences.</div><div class='del'>-	 */</div><div class='del'>-	if (res &lt; 0 &amp;&amp; !sb_has_strict_encoding(sb)) {</div><div class='del'>-		res = name-&gt;len == entry.len &amp;&amp;</div><div class='del'>-				memcmp(name-&gt;name, entry.name, name-&gt;len) == 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* utf8_strncasecmp_folded returns 0 on match */</div><div class='del'>-		res = (res == 0);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	kfree(decrypted_name.name);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_UNICODE */</div><div class='del'>-</div><div class='ctx'> static inline int f2fs_match_name(const struct inode *dir,</div><div class='ctx'> 				   const struct f2fs_filename *fname,</div><div class='ctx'> 				   const u8 *de_name, u32 de_name_len)</div><div class='hunk'>@@ -235,11 +209,11 @@ static inline int f2fs_match_name(const struct inode *dir,</div><div class='ctx'> 	struct fscrypt_name f;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (fname-&gt;cf_name.name) {</div><div class='del'>-		struct qstr cf = FSTR_TO_QSTR(&amp;fname-&gt;cf_name);</div><div class='add'>+	if (fname-&gt;cf_name.name)</div><div class='add'>+		return generic_ci_match(dir, fname-&gt;usr_fname,</div><div class='add'>+					&amp;fname-&gt;cf_name,</div><div class='add'>+					de_name, de_name_len);</div><div class='ctx'> </div><div class='del'>-		return f2fs_match_ci_name(dir, &amp;cf, de_name, de_name_len);</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> 	f.usr_fname = fname-&gt;usr_fname;</div><div class='ctx'> 	f.disk_name = fname-&gt;disk_name;</div><div class='hunk'>@@ -250,7 +224,8 @@ static inline int f2fs_match_name(const struct inode *dir,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,</div><div class='del'>-			const struct f2fs_filename *fname, int *max_slots)</div><div class='add'>+			const struct f2fs_filename *fname, int *max_slots,</div><div class='add'>+			bool use_hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_dir_entry *de;</div><div class='ctx'> 	unsigned long bit_pos = 0;</div><div class='hunk'>@@ -273,7 +248,7 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (de-&gt;hash_code == fname-&gt;hash) {</div><div class='add'>+		if (!use_hash || de-&gt;hash_code == fname-&gt;hash) {</div><div class='ctx'> 			res = f2fs_match_name(d-&gt;inode, fname,</div><div class='ctx'> 					      d-&gt;filename[bit_pos],</div><div class='ctx'> 					      le16_to_cpu(de-&gt;name_len));</div><div class='hunk'>@@ -300,12 +275,12 @@ found:</div><div class='ctx'> static struct f2fs_dir_entry *find_in_level(struct inode *dir,</div><div class='ctx'> 					unsigned int level,</div><div class='ctx'> 					const struct f2fs_filename *fname,</div><div class='del'>-					struct page **res_page)</div><div class='add'>+					struct folio **res_folio,</div><div class='add'>+					bool use_hash)</div><div class='ctx'> {</div><div class='ctx'> 	int s = GET_DENTRY_SLOTS(fname-&gt;disk_name.len);</div><div class='ctx'> 	unsigned int nbucket, nblock;</div><div class='del'>-	unsigned int bidx, end_block;</div><div class='del'>-	struct page *dentry_page;</div><div class='add'>+	unsigned int bidx, end_block, bucket_no;</div><div class='ctx'> 	struct f2fs_dir_entry *de = NULL;</div><div class='ctx'> 	pgoff_t next_pgofs;</div><div class='ctx'> 	bool room = false;</div><div class='hunk'>@@ -314,62 +289,76 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir,</div><div class='ctx'> 	nbucket = dir_buckets(level, F2FS_I(dir)-&gt;i_dir_level);</div><div class='ctx'> 	nblock = bucket_blocks(level);</div><div class='ctx'> </div><div class='add'>+	bucket_no = use_hash ? le32_to_cpu(fname-&gt;hash) % nbucket : 0;</div><div class='add'>+</div><div class='add'>+start_find_bucket:</div><div class='ctx'> 	bidx = dir_block_index(level, F2FS_I(dir)-&gt;i_dir_level,</div><div class='del'>-			       le32_to_cpu(fname-&gt;hash) % nbucket);</div><div class='add'>+			       bucket_no);</div><div class='ctx'> 	end_block = bidx + nblock;</div><div class='ctx'> </div><div class='ctx'> 	while (bidx &lt; end_block) {</div><div class='ctx'> 		/* no need to allocate new dentry pages to all the indices */</div><div class='del'>-		dentry_page = f2fs_find_data_page(dir, bidx, &amp;next_pgofs);</div><div class='del'>-		if (IS_ERR(dentry_page)) {</div><div class='del'>-			if (PTR_ERR(dentry_page) == -ENOENT) {</div><div class='add'>+		struct folio *dentry_folio;</div><div class='add'>+		dentry_folio = f2fs_find_data_folio(dir, bidx, &amp;next_pgofs);</div><div class='add'>+		if (IS_ERR(dentry_folio)) {</div><div class='add'>+			if (PTR_ERR(dentry_folio) == -ENOENT) {</div><div class='ctx'> 				room = true;</div><div class='ctx'> 				bidx = next_pgofs;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			} else {</div><div class='del'>-				*res_page = dentry_page;</div><div class='add'>+				*res_folio = dentry_folio;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		de = find_in_block(dir, dentry_page, fname, &amp;max_slots);</div><div class='add'>+		de = find_in_block(dir, dentry_folio, fname, &amp;max_slots, use_hash);</div><div class='ctx'> 		if (IS_ERR(de)) {</div><div class='del'>-			*res_page = ERR_CAST(de);</div><div class='add'>+			*res_folio = ERR_CAST(de);</div><div class='ctx'> 			de = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (de) {</div><div class='del'>-			*res_page = dentry_page;</div><div class='add'>+			*res_folio = dentry_folio;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (max_slots &gt;= s)</div><div class='ctx'> 			room = true;</div><div class='del'>-		f2fs_put_page(dentry_page, 0);</div><div class='add'>+		f2fs_folio_put(dentry_folio, false);</div><div class='ctx'> </div><div class='ctx'> 		bidx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!de &amp;&amp; room &amp;&amp; F2FS_I(dir)-&gt;chash != fname-&gt;hash) {</div><div class='del'>-		F2FS_I(dir)-&gt;chash = fname-&gt;hash;</div><div class='del'>-		F2FS_I(dir)-&gt;clevel = level;</div><div class='del'>-	}</div><div class='add'>+	if (de)</div><div class='add'>+		return de;</div><div class='ctx'> </div><div class='del'>-	return de;</div><div class='add'>+	if (likely(use_hash)) {</div><div class='add'>+		if (room &amp;&amp; F2FS_I(dir)-&gt;chash != fname-&gt;hash) {</div><div class='add'>+			F2FS_I(dir)-&gt;chash = fname-&gt;hash;</div><div class='add'>+			F2FS_I(dir)-&gt;clevel = level;</div><div class='add'>+		}</div><div class='add'>+	} else if (++bucket_no &lt; nbucket) {</div><div class='add'>+		goto start_find_bucket;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,</div><div class='ctx'> 					 const struct f2fs_filename *fname,</div><div class='del'>-					 struct page **res_page)</div><div class='add'>+					 struct folio **res_folio)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long npages = dir_blocks(dir);</div><div class='ctx'> 	struct f2fs_dir_entry *de = NULL;</div><div class='ctx'> 	unsigned int max_depth;</div><div class='ctx'> 	unsigned int level;</div><div class='add'>+	bool use_hash = true;</div><div class='ctx'> </div><div class='del'>-	*res_page = NULL;</div><div class='add'>+	*res_folio = NULL;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+start_find_entry:</div><div class='add'>+#endif</div><div class='ctx'> 	if (f2fs_has_inline_dentry(dir)) {</div><div class='del'>-		de = f2fs_find_in_inline_dir(dir, fname, res_page);</div><div class='add'>+		de = f2fs_find_in_inline_dir(dir, fname, res_folio, use_hash);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -385,11 +374,19 @@ struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (level = 0; level &lt; max_depth; level++) {</div><div class='del'>-		de = find_in_level(dir, level, fname, res_page);</div><div class='del'>-		if (de || IS_ERR(*res_page))</div><div class='add'>+		de = find_in_level(dir, level, fname, res_folio, use_hash);</div><div class='add'>+		if (de || IS_ERR(*res_folio))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> out:</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+	if (f2fs_should_fallback_to_linear(dir) &amp;&amp;</div><div class='add'>+		IS_CASEFOLDED(dir) &amp;&amp; !de &amp;&amp; use_hash) {</div><div class='add'>+		use_hash = false;</div><div class='add'>+		goto start_find_entry;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	/* This is to increase the speed of f2fs_create */</div><div class='ctx'> 	if (!de)</div><div class='ctx'> 		F2FS_I(dir)-&gt;task = current;</div><div class='hunk'>@@ -403,7 +400,7 @@ out:</div><div class='ctx'>  * Entry is guaranteed to be valid.</div><div class='ctx'>  */</div><div class='ctx'> struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir,</div><div class='del'>-			const struct qstr *child, struct page **res_page)</div><div class='add'>+			const struct qstr *child, struct folio **res_folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_dir_entry *de = NULL;</div><div class='ctx'> 	struct f2fs_filename fname;</div><div class='hunk'>@@ -412,67 +409,67 @@ struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir,</div><div class='ctx'> 	err = f2fs_setup_filename(dir, child, 1, &amp;fname);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == -ENOENT)</div><div class='del'>-			*res_page = NULL;</div><div class='add'>+			*res_folio = NULL;</div><div class='ctx'> 		else</div><div class='del'>-			*res_page = ERR_PTR(err);</div><div class='add'>+			*res_folio = ERR_PTR(err);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	de = __f2fs_find_entry(dir, &amp;fname, res_page);</div><div class='add'>+	de = __f2fs_find_entry(dir, &amp;fname, res_folio);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_free_filename(&amp;fname);</div><div class='ctx'> 	return de;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p)</div><div class='add'>+struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct folio **f)</div><div class='ctx'> {</div><div class='del'>-	return f2fs_find_entry(dir, &amp;dotdot_name, p);</div><div class='add'>+	return f2fs_find_entry(dir, &amp;dotdot_name, f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,</div><div class='del'>-							struct page **page)</div><div class='add'>+							struct folio **folio)</div><div class='ctx'> {</div><div class='ctx'> 	ino_t res = 0;</div><div class='ctx'> 	struct f2fs_dir_entry *de;</div><div class='ctx'> </div><div class='del'>-	de = f2fs_find_entry(dir, qstr, page);</div><div class='add'>+	de = f2fs_find_entry(dir, qstr, folio);</div><div class='ctx'> 	if (de) {</div><div class='ctx'> 		res = le32_to_cpu(de-&gt;ino);</div><div class='del'>-		f2fs_put_page(*page, 0);</div><div class='add'>+		f2fs_folio_put(*folio, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,</div><div class='del'>-		struct page *page, struct inode *inode)</div><div class='add'>+		struct folio *folio, struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	enum page_type type = f2fs_has_inline_dentry(dir) ? NODE : DATA;</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	f2fs_wait_on_page_writeback(page, type, true, true);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, type, true, true);</div><div class='ctx'> 	de-&gt;ino = cpu_to_le32(inode-&gt;i_ino);</div><div class='ctx'> 	de-&gt;file_type = fs_umode_to_ftype(inode-&gt;i_mode);</div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(dir, false);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_dent_inode(struct inode *dir, struct inode *inode,</div><div class='ctx'> 			    const struct f2fs_filename *fname,</div><div class='del'>-			    struct page *ipage)</div><div class='add'>+			    struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_inode *ri;</div><div class='ctx'> </div><div class='ctx'> 	if (!fname) /* tmpfile case? */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> </div><div class='del'>-	/* copy name info. to this inode page */</div><div class='del'>-	ri = F2FS_INODE(ipage);</div><div class='add'>+	/* copy name info. to this inode folio */</div><div class='add'>+	ri = F2FS_INODE(ifolio);</div><div class='ctx'> 	ri-&gt;i_namelen = cpu_to_le32(fname-&gt;disk_name.len);</div><div class='ctx'> 	memcpy(ri-&gt;i_name, fname-&gt;disk_name.name, fname-&gt;disk_name.len);</div><div class='ctx'> 	if (IS_ENCRYPTED(dir)) {</div><div class='hunk'>@@ -493,7 +490,7 @@ static void init_dent_inode(struct inode *dir, struct inode *inode,</div><div class='ctx'> 				file_lost_pino(inode);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	set_page_dirty(ipage);</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_do_make_empty_dir(struct inode *inode, struct inode *parent,</div><div class='hunk'>@@ -510,72 +507,73 @@ void f2fs_do_make_empty_dir(struct inode *inode, struct inode *parent,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int make_empty_dir(struct inode *inode,</div><div class='del'>-		struct inode *parent, struct page *page)</div><div class='add'>+		struct inode *parent, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *dentry_page;</div><div class='add'>+	struct folio *dentry_folio;</div><div class='ctx'> 	struct f2fs_dentry_block *dentry_blk;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_dentry(inode))</div><div class='del'>-		return f2fs_make_empty_inline_dir(inode, parent, page);</div><div class='add'>+		return f2fs_make_empty_inline_dir(inode, parent, folio);</div><div class='ctx'> </div><div class='del'>-	dentry_page = f2fs_get_new_data_page(inode, page, 0, true);</div><div class='del'>-	if (IS_ERR(dentry_page))</div><div class='del'>-		return PTR_ERR(dentry_page);</div><div class='add'>+	dentry_folio = f2fs_get_new_data_folio(inode, folio, 0, true);</div><div class='add'>+	if (IS_ERR(dentry_folio))</div><div class='add'>+		return PTR_ERR(dentry_folio);</div><div class='ctx'> </div><div class='del'>-	dentry_blk = page_address(dentry_page);</div><div class='add'>+	dentry_blk = folio_address(dentry_folio);</div><div class='ctx'> </div><div class='ctx'> 	make_dentry_ptr_block(NULL, &amp;d, dentry_blk);</div><div class='ctx'> 	f2fs_do_make_empty_dir(inode, parent, &amp;d);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(dentry_page);</div><div class='del'>-	f2fs_put_page(dentry_page, 1);</div><div class='add'>+	folio_mark_dirty(dentry_folio);</div><div class='add'>+	f2fs_folio_put(dentry_folio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,</div><div class='del'>-			const struct f2fs_filename *fname, struct page *dpage)</div><div class='add'>+struct folio *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,</div><div class='add'>+		const struct f2fs_filename *fname, struct folio *dfolio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_NEW_INODE)) {</div><div class='del'>-		page = f2fs_new_inode_page(inode);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return page;</div><div class='add'>+		folio = f2fs_new_inode_folio(inode);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return folio;</div><div class='ctx'> </div><div class='ctx'> 		if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 			/* in order to handle error case */</div><div class='del'>-			get_page(page);</div><div class='del'>-			err = make_empty_dir(inode, dir, page);</div><div class='add'>+			folio_get(folio);</div><div class='add'>+			err = make_empty_dir(inode, dir, folio);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				lock_page(page);</div><div class='add'>+				folio_lock(folio);</div><div class='ctx'> 				goto put_error;</div><div class='ctx'> 			}</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = f2fs_init_acl(inode, dir, page, dpage);</div><div class='add'>+		err = f2fs_init_acl(inode, dir, folio, dfolio);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto put_error;</div><div class='ctx'> </div><div class='ctx'> 		err = f2fs_init_security(inode, dir,</div><div class='del'>-					 fname ? fname-&gt;usr_fname : NULL, page);</div><div class='add'>+					 fname ? fname-&gt;usr_fname : NULL,</div><div class='add'>+					 folio);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto put_error;</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ENCRYPTED(inode)) {</div><div class='del'>-			err = fscrypt_set_context(inode, page);</div><div class='add'>+			err = fscrypt_set_context(inode, folio);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto put_error;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		page = f2fs_get_node_page(F2FS_I_SB(dir), inode-&gt;i_ino);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return page;</div><div class='add'>+		folio = f2fs_get_inode_folio(F2FS_I_SB(dir), inode-&gt;i_ino);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_dent_inode(dir, inode, fname, page);</div><div class='add'>+	init_dent_inode(dir, inode, fname, folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This file should be checkpointed during fsync.</div><div class='hunk'>@@ -592,12 +590,12 @@ struct page *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,</div><div class='ctx'> 			f2fs_remove_orphan_inode(F2FS_I_SB(dir), inode-&gt;i_ino);</div><div class='ctx'> 		f2fs_i_links_write(inode, true);</div><div class='ctx'> 	}</div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> </div><div class='ctx'> put_error:</div><div class='ctx'> 	clear_nlink(inode);</div><div class='del'>-	f2fs_update_inode(inode, page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_update_inode(inode, folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -639,14 +637,14 @@ next:</div><div class='ctx'> 	goto next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_has_enough_room(struct inode *dir, struct page *ipage,</div><div class='add'>+bool f2fs_has_enough_room(struct inode *dir, struct folio *ifolio,</div><div class='ctx'> 			  const struct f2fs_filename *fname)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> 	unsigned int bit_pos;</div><div class='ctx'> 	int slots = GET_DENTRY_SLOTS(fname-&gt;disk_name.len);</div><div class='ctx'> </div><div class='del'>-	make_dentry_ptr_inline(dir, &amp;d, inline_data_addr(dir, ipage));</div><div class='add'>+	make_dentry_ptr_inline(dir, &amp;d, inline_data_addr(dir, ifolio));</div><div class='ctx'> </div><div class='ctx'> 	bit_pos = f2fs_room_for_filename(d.bitmap, slots, d.max);</div><div class='ctx'> </div><div class='hunk'>@@ -683,10 +681,10 @@ int f2fs_add_regular_entry(struct inode *dir, const struct f2fs_filename *fname,</div><div class='ctx'> 	unsigned int current_depth;</div><div class='ctx'> 	unsigned long bidx, block;</div><div class='ctx'> 	unsigned int nbucket, nblock;</div><div class='del'>-	struct page *dentry_page = NULL;</div><div class='add'>+	struct folio *dentry_folio = NULL;</div><div class='ctx'> 	struct f2fs_dentry_block *dentry_blk = NULL;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	int slots, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	level = 0;</div><div class='hunk'>@@ -716,30 +714,30 @@ start:</div><div class='ctx'> 				(le32_to_cpu(fname-&gt;hash) % nbucket));</div><div class='ctx'> </div><div class='ctx'> 	for (block = bidx; block &lt;= (bidx + nblock - 1); block++) {</div><div class='del'>-		dentry_page = f2fs_get_new_data_page(dir, NULL, block, true);</div><div class='del'>-		if (IS_ERR(dentry_page))</div><div class='del'>-			return PTR_ERR(dentry_page);</div><div class='add'>+		dentry_folio = f2fs_get_new_data_folio(dir, NULL, block, true);</div><div class='add'>+		if (IS_ERR(dentry_folio))</div><div class='add'>+			return PTR_ERR(dentry_folio);</div><div class='ctx'> </div><div class='del'>-		dentry_blk = page_address(dentry_page);</div><div class='add'>+		dentry_blk = folio_address(dentry_folio);</div><div class='ctx'> 		bit_pos = f2fs_room_for_filename(&amp;dentry_blk-&gt;dentry_bitmap,</div><div class='ctx'> 						slots, NR_DENTRY_IN_BLOCK);</div><div class='ctx'> 		if (bit_pos &lt; NR_DENTRY_IN_BLOCK)</div><div class='ctx'> 			goto add_dentry;</div><div class='ctx'> </div><div class='del'>-		f2fs_put_page(dentry_page, 1);</div><div class='add'>+		f2fs_folio_put(dentry_folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Move to next level to find the empty slot for new dentry */</div><div class='ctx'> 	++level;</div><div class='ctx'> 	goto start;</div><div class='ctx'> add_dentry:</div><div class='del'>-	f2fs_wait_on_page_writeback(dentry_page, DATA, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(dentry_folio, DATA, true, true);</div><div class='ctx'> </div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='del'>-		page = f2fs_init_inode_metadata(inode, dir, fname, NULL);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='add'>+		folio = f2fs_init_inode_metadata(inode, dir, fname, NULL);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -748,16 +746,16 @@ add_dentry:</div><div class='ctx'> 	f2fs_update_dentry(ino, mode, &amp;d, &amp;fname-&gt;disk_name, fname-&gt;hash,</div><div class='ctx'> 			   bit_pos);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(dentry_page);</div><div class='add'>+	folio_mark_dirty(dentry_folio);</div><div class='ctx'> </div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		f2fs_i_pino_write(inode, dir-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> 		/* synchronize inode page's data from inode cache */</div><div class='ctx'> 		if (is_inode_flag_set(inode, FI_NEW_INODE))</div><div class='del'>-			f2fs_update_inode(inode, page);</div><div class='add'>+			f2fs_update_inode(inode, folio);</div><div class='ctx'> </div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_parent_metadata(dir, inode, current_depth);</div><div class='hunk'>@@ -765,7 +763,7 @@ fail:</div><div class='ctx'> 	if (inode)</div><div class='ctx'> 		f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='ctx'> </div><div class='del'>-	f2fs_put_page(dentry_page, 1);</div><div class='add'>+	f2fs_folio_put(dentry_folio, true);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -799,7 +797,7 @@ int f2fs_do_add_link(struct inode *dir, const struct qstr *name,</div><div class='ctx'> 				struct inode *inode, nid_t ino, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_filename fname;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	struct f2fs_dir_entry *de = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -815,14 +813,14 @@ int f2fs_do_add_link(struct inode *dir, const struct qstr *name,</div><div class='ctx'> 	 * consistency more.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (current != F2FS_I(dir)-&gt;task) {</div><div class='del'>-		de = __f2fs_find_entry(dir, &amp;fname, &amp;page);</div><div class='add'>+		de = __f2fs_find_entry(dir, &amp;fname, &amp;folio);</div><div class='ctx'> 		F2FS_I(dir)-&gt;task = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (de) {</div><div class='del'>-		f2fs_put_page(page, 0);</div><div class='add'>+		f2fs_folio_put(folio, false);</div><div class='ctx'> 		err = -EEXIST;</div><div class='del'>-	} else if (IS_ERR(page)) {</div><div class='del'>-		err = PTR_ERR(page);</div><div class='add'>+	} else if (IS_ERR(folio)) {</div><div class='add'>+		err = PTR_ERR(folio);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = f2fs_add_dentry(dir, &amp;fname, inode, ino, mode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -830,18 +828,19 @@ int f2fs_do_add_link(struct inode *dir, const struct qstr *name,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_do_tmpfile(struct inode *inode, struct inode *dir)</div><div class='add'>+int f2fs_do_tmpfile(struct inode *inode, struct inode *dir,</div><div class='add'>+					struct f2fs_filename *fname)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='del'>-	page = f2fs_init_inode_metadata(inode, dir, NULL, NULL);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		err = PTR_ERR(page);</div><div class='add'>+	folio = f2fs_init_inode_metadata(inode, dir, fname, NULL);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		err = PTR_ERR(folio);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 	clear_inode_flag(inode, FI_NEW_INODE);</div><div class='ctx'> 	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='hunk'>@@ -877,12 +876,13 @@ void f2fs_drop_nlink(struct inode *dir, struct inode *inode)</div><div class='ctx'>  * It only removes the dentry from the dentry page, corresponding name</div><div class='ctx'>  * entry in name page does not need to be touched during deletion.</div><div class='ctx'>  */</div><div class='del'>-void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='add'>+void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct folio *folio,</div><div class='ctx'> 					struct inode *dir, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct	f2fs_dentry_block *dentry_blk;</div><div class='add'>+	struct f2fs_dentry_block *dentry_blk;</div><div class='ctx'> 	unsigned int bit_pos;</div><div class='ctx'> 	int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry-&gt;name_len));</div><div class='add'>+	pgoff_t index = folio-&gt;index;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);</div><div class='hunk'>@@ -891,12 +891,12 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='ctx'> 		f2fs_add_ino_entry(F2FS_I_SB(dir), dir-&gt;i_ino, TRANS_DIR_INO);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_dentry(dir))</div><div class='del'>-		return f2fs_delete_inline_entry(dentry, page, dir, inode);</div><div class='add'>+		return f2fs_delete_inline_entry(dentry, folio, dir, inode);</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> </div><div class='del'>-	dentry_blk = page_address(page);</div><div class='add'>+	dentry_blk = folio_address(folio);</div><div class='ctx'> 	bit_pos = dentry - dentry_blk-&gt;dentry;</div><div class='ctx'> 	for (i = 0; i &lt; slots; i++)</div><div class='ctx'> 		__clear_bit_le(bit_pos + i, &amp;dentry_blk-&gt;dentry_bitmap);</div><div class='hunk'>@@ -905,19 +905,19 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='ctx'> 	bit_pos = find_next_bit_le(&amp;dentry_blk-&gt;dentry_bitmap,</div><div class='ctx'> 			NR_DENTRY_IN_BLOCK,</div><div class='ctx'> 			0);</div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (bit_pos == NR_DENTRY_IN_BLOCK &amp;&amp;</div><div class='del'>-		!f2fs_truncate_hole(dir, page-&gt;index, page-&gt;index + 1)) {</div><div class='del'>-		f2fs_clear_page_cache_dirty_tag(page);</div><div class='del'>-		clear_page_dirty_for_io(page);</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-		clear_page_private_all(page);</div><div class='add'>+		!f2fs_truncate_hole(dir, index, index + 1)) {</div><div class='add'>+		f2fs_clear_page_cache_dirty_tag(folio);</div><div class='add'>+		folio_clear_dirty_for_io(folio);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='add'>+		folio_detach_private(folio);</div><div class='ctx'> </div><div class='ctx'> 		inode_dec_dirty_pages(dir);</div><div class='ctx'> 		f2fs_remove_dirty_inode(dir);</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(dir, false);</div><div class='hunk'>@@ -929,7 +929,6 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='ctx'> bool f2fs_empty_dir(struct inode *dir)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bidx = 0;</div><div class='del'>-	struct page *dentry_page;</div><div class='ctx'> 	unsigned int bit_pos;</div><div class='ctx'> 	struct f2fs_dentry_block *dentry_blk;</div><div class='ctx'> 	unsigned long nblock = dir_blocks(dir);</div><div class='hunk'>@@ -939,10 +938,11 @@ bool f2fs_empty_dir(struct inode *dir)</div><div class='ctx'> </div><div class='ctx'> 	while (bidx &lt; nblock) {</div><div class='ctx'> 		pgoff_t next_pgofs;</div><div class='add'>+		struct folio *dentry_folio;</div><div class='ctx'> </div><div class='del'>-		dentry_page = f2fs_find_data_page(dir, bidx, &amp;next_pgofs);</div><div class='del'>-		if (IS_ERR(dentry_page)) {</div><div class='del'>-			if (PTR_ERR(dentry_page) == -ENOENT) {</div><div class='add'>+		dentry_folio = f2fs_find_data_folio(dir, bidx, &amp;next_pgofs);</div><div class='add'>+		if (IS_ERR(dentry_folio)) {</div><div class='add'>+			if (PTR_ERR(dentry_folio) == -ENOENT) {</div><div class='ctx'> 				bidx = next_pgofs;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -950,7 +950,7 @@ bool f2fs_empty_dir(struct inode *dir)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dentry_blk = page_address(dentry_page);</div><div class='add'>+		dentry_blk = folio_address(dentry_folio);</div><div class='ctx'> 		if (bidx == 0)</div><div class='ctx'> 			bit_pos = 2;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -959,7 +959,7 @@ bool f2fs_empty_dir(struct inode *dir)</div><div class='ctx'> 						NR_DENTRY_IN_BLOCK,</div><div class='ctx'> 						bit_pos);</div><div class='ctx'> </div><div class='del'>-		f2fs_put_page(dentry_page, 0);</div><div class='add'>+		f2fs_folio_put(dentry_folio, false);</div><div class='ctx'> </div><div class='ctx'> 		if (bit_pos &lt; NR_DENTRY_IN_BLOCK)</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -995,9 +995,8 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,</div><div class='ctx'> 		de = &amp;d-&gt;dentry[bit_pos];</div><div class='ctx'> 		if (de-&gt;name_len == 0) {</div><div class='ctx'> 			if (found_valid_dirent || !bit_pos) {</div><div class='del'>-				printk_ratelimited(</div><div class='del'>-					"%sF2FS-fs (%s): invalid namelen(0), ino:%u, run fsck to fix.",</div><div class='del'>-					KERN_WARNING, sbi-&gt;sb-&gt;s_id,</div><div class='add'>+				f2fs_warn_ratelimited(sbi,</div><div class='add'>+					"invalid namelen(0), ino:%u, run fsck to fix.",</div><div class='ctx'> 					le32_to_cpu(de-&gt;ino));</div><div class='ctx'> 				set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1059,7 +1058,6 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	unsigned long npages = dir_blocks(inode);</div><div class='ctx'> 	struct f2fs_dentry_block *dentry_blk = NULL;</div><div class='del'>-	struct page *dentry_page = NULL;</div><div class='ctx'> 	struct file_ra_state *ra = &amp;file-&gt;f_ra;</div><div class='ctx'> 	loff_t start_pos = ctx-&gt;pos;</div><div class='ctx'> 	unsigned int n = ((unsigned long)ctx-&gt;pos / NR_DENTRY_IN_BLOCK);</div><div class='hunk'>@@ -1083,6 +1081,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (; n &lt; npages; ctx-&gt;pos = n * NR_DENTRY_IN_BLOCK) {</div><div class='add'>+		struct folio *dentry_folio;</div><div class='ctx'> 		pgoff_t next_pgofs;</div><div class='ctx'> </div><div class='ctx'> 		/* allow readdir() to be interrupted */</div><div class='hunk'>@@ -1097,9 +1096,9 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			page_cache_sync_readahead(inode-&gt;i_mapping, ra, file, n,</div><div class='ctx'> 				min(npages - n, (pgoff_t)MAX_DIR_RA_PAGES));</div><div class='ctx'> </div><div class='del'>-		dentry_page = f2fs_find_data_page(inode, n, &amp;next_pgofs);</div><div class='del'>-		if (IS_ERR(dentry_page)) {</div><div class='del'>-			err = PTR_ERR(dentry_page);</div><div class='add'>+		dentry_folio = f2fs_find_data_folio(inode, n, &amp;next_pgofs);</div><div class='add'>+		if (IS_ERR(dentry_folio)) {</div><div class='add'>+			err = PTR_ERR(dentry_folio);</div><div class='ctx'> 			if (err == -ENOENT) {</div><div class='ctx'> 				err = 0;</div><div class='ctx'> 				n = next_pgofs;</div><div class='hunk'>@@ -1109,18 +1108,15 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dentry_blk = page_address(dentry_page);</div><div class='add'>+		dentry_blk = folio_address(dentry_folio);</div><div class='ctx'> </div><div class='ctx'> 		make_dentry_ptr_block(inode, &amp;d, dentry_blk);</div><div class='ctx'> </div><div class='ctx'> 		err = f2fs_fill_dentries(ctx, &amp;d,</div><div class='ctx'> 				n * NR_DENTRY_IN_BLOCK, &amp;fstr);</div><div class='del'>-		if (err) {</div><div class='del'>-			f2fs_put_page(dentry_page, 0);</div><div class='add'>+		f2fs_folio_put(dentry_folio, false);</div><div class='add'>+		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		f2fs_put_page(dentry_page, 0);</div><div class='ctx'> </div><div class='ctx'> 		n++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c<br/>index ad8dfac73bd4..0ed84cc065a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/extent_cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/extent_cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/extent_cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/extent_cache.c</a></div><div class='hunk'>@@ -19,37 +19,56 @@</div><div class='ctx'> #include "node.h"</div><div class='ctx'> #include &lt;trace/events/f2fs.h&gt;</div><div class='ctx'> </div><div class='del'>-bool sanity_check_extent_cache(struct inode *inode)</div><div class='add'>+bool sanity_check_extent_cache(struct inode *inode, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='del'>-	struct extent_tree *et = fi-&gt;extent_tree[EX_READ];</div><div class='del'>-	struct extent_info *ei;</div><div class='add'>+	struct f2fs_extent *i_ext = &amp;F2FS_INODE(ifolio)-&gt;i_ext;</div><div class='add'>+	struct extent_info ei;</div><div class='add'>+	int devi;</div><div class='ctx'> </div><div class='del'>-	if (!et)</div><div class='del'>-		return true;</div><div class='add'>+	get_read_extent_info(&amp;ei, i_ext);</div><div class='ctx'> </div><div class='del'>-	ei = &amp;et-&gt;largest;</div><div class='del'>-	if (!ei-&gt;len)</div><div class='add'>+	if (!ei.len)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	/* Let's drop, if checkpoint got corrupted. */</div><div class='del'>-	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {</div><div class='del'>-		ei-&gt;len = 0;</div><div class='del'>-		et-&gt;largest_updated = true;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!f2fs_is_valid_blkaddr(sbi, ei-&gt;blk, DATA_GENERIC_ENHANCE) ||</div><div class='del'>-	    !f2fs_is_valid_blkaddr(sbi, ei-&gt;blk + ei-&gt;len - 1,</div><div class='add'>+	if (!f2fs_is_valid_blkaddr(sbi, ei.blk, DATA_GENERIC_ENHANCE) ||</div><div class='add'>+	    !f2fs_is_valid_blkaddr(sbi, ei.blk + ei.len - 1,</div><div class='ctx'> 					DATA_GENERIC_ENHANCE)) {</div><div class='del'>-		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",</div><div class='ctx'> 			  __func__, inode-&gt;i_ino,</div><div class='del'>-			  ei-&gt;blk, ei-&gt;fofs, ei-&gt;len);</div><div class='add'>+			  ei.blk, ei.fofs, ei.len);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='del'>-	return true;</div><div class='add'>+</div><div class='add'>+	if (!IS_DEVICE_ALIASING(inode))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for (devi = 0; devi &lt; sbi-&gt;s_ndevs; devi++) {</div><div class='add'>+		if (FDEV(devi).start_blk != ei.blk ||</div><div class='add'>+				FDEV(devi).end_blk != ei.blk + ei.len - 1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (devi == 0) {</div><div class='add'>+			f2fs_warn(sbi,</div><div class='add'>+			    "%s: inode (ino=%lx) is an alias of meta device",</div><div class='add'>+			    __func__, inode-&gt;i_ino);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bdev_is_zoned(FDEV(devi).bdev)) {</div><div class='add'>+			f2fs_warn(sbi,</div><div class='add'>+			    "%s: device alias inode (ino=%lx)'s extent info "</div><div class='add'>+			    "[%u, %u, %u] maps to zoned block device",</div><div class='add'>+			    __func__, inode-&gt;i_ino, ei.blk, ei.fofs, ei.len);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	f2fs_warn(sbi, "%s: device alias inode (ino=%lx)'s extent info "</div><div class='add'>+			"[%u, %u, %u] is inconsistent w/ any devices",</div><div class='add'>+			__func__, inode-&gt;i_ino, ei.blk, ei.fofs, ei.len);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __set_extent_info(struct extent_info *ei,</div><div class='hunk'>@@ -87,6 +106,9 @@ static bool __init_may_extent_tree(struct inode *inode, enum extent_type type)</div><div class='ctx'> </div><div class='ctx'> static bool __may_extent_tree(struct inode *inode, enum extent_type type)</div><div class='ctx'> {</div><div class='add'>+	if (IS_DEVICE_ALIASING(inode) &amp;&amp; type == EX_READ)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * for recovered files during mount do not create extents</div><div class='ctx'> 	 * if shrinker is not registered.</div><div class='hunk'>@@ -357,62 +379,66 @@ static struct extent_tree *__grab_extent_tree(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int __free_extent_tree(struct f2fs_sb_info *sbi,</div><div class='del'>-					struct extent_tree *et)</div><div class='add'>+				struct extent_tree *et, unsigned int nr_shrink)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node, *next;</div><div class='ctx'> 	struct extent_node *en;</div><div class='del'>-	unsigned int count = atomic_read(&amp;et-&gt;node_cnt);</div><div class='add'>+	unsigned int count;</div><div class='ctx'> </div><div class='ctx'> 	node = rb_first_cached(&amp;et-&gt;root);</div><div class='del'>-	while (node) {</div><div class='add'>+</div><div class='add'>+	for (count = 0; node &amp;&amp; count &lt; nr_shrink; count++) {</div><div class='ctx'> 		next = rb_next(node);</div><div class='ctx'> 		en = rb_entry(node, struct extent_node, rb_node);</div><div class='ctx'> 		__release_extent_node(sbi, et, en);</div><div class='ctx'> 		node = next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return count - atomic_read(&amp;et-&gt;node_cnt);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __drop_largest_extent(struct extent_tree *et,</div><div class='ctx'> 					pgoff_t fofs, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	if (fofs &lt; et-&gt;largest.fofs + et-&gt;largest.len &amp;&amp;</div><div class='add'>+	if (fofs &lt; (pgoff_t)et-&gt;largest.fofs + et-&gt;largest.len &amp;&amp;</div><div class='ctx'> 			fofs + len &gt; et-&gt;largest.fofs) {</div><div class='ctx'> 		et-&gt;largest.len = 0;</div><div class='ctx'> 		et-&gt;largest_updated = true;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_init_read_extent_tree(struct inode *inode, struct page *ipage)</div><div class='add'>+void f2fs_init_read_extent_tree(struct inode *inode, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct extent_tree_info *eti = &amp;sbi-&gt;extent_tree[EX_READ];</div><div class='del'>-	struct f2fs_extent *i_ext = &amp;F2FS_INODE(ipage)-&gt;i_ext;</div><div class='add'>+	struct f2fs_extent *i_ext = &amp;F2FS_INODE(ifolio)-&gt;i_ext;</div><div class='ctx'> 	struct extent_tree *et;</div><div class='ctx'> 	struct extent_node *en;</div><div class='del'>-	struct extent_info ei;</div><div class='add'>+	struct extent_info ei = {0};</div><div class='ctx'> </div><div class='ctx'> 	if (!__may_extent_tree(inode, EX_READ)) {</div><div class='ctx'> 		/* drop largest read extent */</div><div class='del'>-		if (i_ext &amp;&amp; i_ext-&gt;len) {</div><div class='del'>-			f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+		if (i_ext-&gt;len) {</div><div class='add'>+			f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> 			i_ext-&gt;len = 0;</div><div class='del'>-			set_page_dirty(ipage);</div><div class='add'>+			folio_mark_dirty(ifolio);</div><div class='ctx'> 		}</div><div class='del'>-		goto out;</div><div class='add'>+		set_inode_flag(inode, FI_NO_EXTENT);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	et = __grab_extent_tree(inode, EX_READ);</div><div class='ctx'> </div><div class='del'>-	if (!i_ext || !i_ext-&gt;len)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	get_read_extent_info(&amp;ei, i_ext);</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;et-&gt;lock);</div><div class='del'>-	if (atomic_read(&amp;et-&gt;node_cnt))</div><div class='del'>-		goto unlock_out;</div><div class='add'>+	if (atomic_read(&amp;et-&gt;node_cnt) || !ei.len)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	if (IS_DEVICE_ALIASING(inode)) {</div><div class='add'>+		et-&gt;largest = ei;</div><div class='add'>+		goto skip;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	en = __attach_extent_node(sbi, et, &amp;ei, NULL,</div><div class='ctx'> 				&amp;et-&gt;root.rb_root.rb_node, true);</div><div class='hunk'>@@ -424,11 +450,13 @@ void f2fs_init_read_extent_tree(struct inode *inode, struct page *ipage)</div><div class='ctx'> 		list_add_tail(&amp;en-&gt;list, &amp;eti-&gt;extent_list);</div><div class='ctx'> 		spin_unlock(&amp;eti-&gt;extent_lock);</div><div class='ctx'> 	}</div><div class='del'>-unlock_out:</div><div class='add'>+skip:</div><div class='add'>+	/* Let's drop, if checkpoint got corrupted. */</div><div class='add'>+	if (f2fs_cp_error(sbi)) {</div><div class='add'>+		et-&gt;largest.len = 0;</div><div class='add'>+		et-&gt;largest_updated = true;</div><div class='add'>+	}</div><div class='ctx'> 	write_unlock(&amp;et-&gt;lock);</div><div class='del'>-out:</div><div class='del'>-	if (!F2FS_I(inode)-&gt;extent_tree[EX_READ])</div><div class='del'>-		set_inode_flag(inode, FI_NO_EXTENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_init_age_extent_tree(struct inode *inode)</div><div class='hunk'>@@ -467,13 +495,18 @@ static bool __lookup_extent_tree(struct inode *inode, pgoff_t pgofs,</div><div class='ctx'> </div><div class='ctx'> 	if (type == EX_READ &amp;&amp;</div><div class='ctx'> 			et-&gt;largest.fofs &lt;= pgofs &amp;&amp;</div><div class='del'>-			et-&gt;largest.fofs + et-&gt;largest.len &gt; pgofs) {</div><div class='add'>+			(pgoff_t)et-&gt;largest.fofs + et-&gt;largest.len &gt; pgofs) {</div><div class='ctx'> 		*ei = et-&gt;largest;</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 		stat_inc_largest_node_hit(sbi);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (IS_DEVICE_ALIASING(inode)) {</div><div class='add'>+		ret = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	en = __lookup_extent_node(&amp;et-&gt;root, et-&gt;cached_en, pgofs);</div><div class='ctx'> 	if (!en)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -571,7 +604,13 @@ static struct extent_node *__insert_extent_tree(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			p = &amp;(*p)-&gt;rb_right;</div><div class='ctx'> 			leftmost = false;</div><div class='ctx'> 		} else {</div><div class='add'>+			f2fs_err_ratelimited(sbi, "%s: corrupted extent, type: %d, "</div><div class='add'>+				"extent node in rb tree [%u, %u, %u], age [%llu, %llu], "</div><div class='add'>+				"extent node to insert [%u, %u, %u], age [%llu, %llu]",</div><div class='add'>+				__func__, et-&gt;type, en-&gt;ei.fofs, en-&gt;ei.blk, en-&gt;ei.len, en-&gt;ei.age,</div><div class='add'>+				en-&gt;ei.last_blocks, ei-&gt;fofs, ei-&gt;blk, ei-&gt;len, ei-&gt;age, ei-&gt;last_blocks);</div><div class='ctx'> 			f2fs_bug_on(sbi, 1);</div><div class='add'>+			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -590,6 +629,30 @@ do_insert:</div><div class='ctx'> 	return en;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int __destroy_extent_node(struct inode *inode,</div><div class='add'>+					enum extent_type type)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+	struct extent_tree *et = F2FS_I(inode)-&gt;extent_tree[type];</div><div class='add'>+	unsigned int nr_shrink = type == EX_READ ?</div><div class='add'>+				READ_EXTENT_CACHE_SHRINK_NUMBER :</div><div class='add'>+				AGE_EXTENT_CACHE_SHRINK_NUMBER;</div><div class='add'>+	unsigned int node_cnt = 0;</div><div class='add'>+</div><div class='add'>+	if (!et || !atomic_read(&amp;et-&gt;node_cnt))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while (atomic_read(&amp;et-&gt;node_cnt)) {</div><div class='add'>+		write_lock(&amp;et-&gt;lock);</div><div class='add'>+		node_cnt += __free_extent_tree(sbi, et, nr_shrink);</div><div class='add'>+		write_unlock(&amp;et-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	f2fs_bug_on(sbi, atomic_read(&amp;et-&gt;node_cnt));</div><div class='add'>+</div><div class='add'>+	return node_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __update_extent_tree_range(struct inode *inode,</div><div class='ctx'> 			struct extent_info *tei, enum extent_type type)</div><div class='ctx'> {</div><div class='hunk'>@@ -607,6 +670,15 @@ static void __update_extent_tree_range(struct inode *inode,</div><div class='ctx'> 	if (!et)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(len == 0)) {</div><div class='add'>+		f2fs_err_ratelimited(sbi, "%s: extent len is zero, type: %d, "</div><div class='add'>+			"extent [%u, %u, %u], age [%llu, %llu]",</div><div class='add'>+			__func__, type, tei-&gt;fofs, tei-&gt;blk, tei-&gt;len,</div><div class='add'>+			tei-&gt;age, tei-&gt;last_blocks);</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (type == EX_READ)</div><div class='ctx'> 		trace_f2fs_update_read_extent_tree_range(inode, fofs, len,</div><div class='ctx'> 						tei-&gt;blk, 0);</div><div class='hunk'>@@ -660,7 +732,9 @@ static void __update_extent_tree_range(struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (end &lt; org_end &amp;&amp; (type != EX_READ ||</div><div class='del'>-				org_end - end &gt;= F2FS_MIN_EXTENT_LEN)) {</div><div class='add'>+			(org_end - end &gt;= F2FS_MIN_EXTENT_LEN &amp;&amp;</div><div class='add'>+			atomic_read(&amp;et-&gt;node_cnt) &lt;</div><div class='add'>+					sbi-&gt;max_read_extent_count))) {</div><div class='ctx'> 			if (parts) {</div><div class='ctx'> 				__set_extent_info(&amp;ei,</div><div class='ctx'> 					end, org_end - end,</div><div class='hunk'>@@ -728,16 +802,13 @@ static void __update_extent_tree_range(struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_inode_flag_set(inode, FI_NO_EXTENT))</div><div class='del'>-		__free_extent_tree(sbi, et);</div><div class='del'>-</div><div class='ctx'> 	if (et-&gt;largest_updated) {</div><div class='ctx'> 		et-&gt;largest_updated = false;</div><div class='ctx'> 		updated = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	goto out_read_extent_cache;</div><div class='ctx'> update_age_extent_cache:</div><div class='del'>-	if (!tei-&gt;last_blocks)</div><div class='add'>+	if (tei-&gt;last_blocks == F2FS_EXTENT_AGE_INVALID)</div><div class='ctx'> 		goto out_read_extent_cache;</div><div class='ctx'> </div><div class='ctx'> 	__set_extent_info(&amp;ei, fofs, len, 0, false,</div><div class='hunk'>@@ -748,6 +819,9 @@ update_age_extent_cache:</div><div class='ctx'> out_read_extent_cache:</div><div class='ctx'> 	write_unlock(&amp;et-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (is_inode_flag_set(inode, FI_NO_EXTENT))</div><div class='add'>+		__destroy_extent_node(inode, EX_READ);</div><div class='add'>+</div><div class='ctx'> 	if (updated)</div><div class='ctx'> 		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> }</div><div class='hunk'>@@ -838,7 +912,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei,</div><div class='ctx'> 			cur_age = cur_blocks - tei.last_blocks;</div><div class='ctx'> 		else</div><div class='ctx'> 			/* allocated_data_blocks overflow */</div><div class='del'>-			cur_age = ULLONG_MAX - tei.last_blocks + cur_blocks;</div><div class='add'>+			cur_age = (ULLONG_MAX - 1) - tei.last_blocks + cur_blocks;</div><div class='ctx'> </div><div class='ctx'> 		if (tei.age)</div><div class='ctx'> 			ei-&gt;age = __calculate_block_age(sbi, cur_age, tei.age);</div><div class='hunk'>@@ -856,10 +930,8 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (__is_valid_data_blkaddr(blkaddr) &amp;&amp;</div><div class='del'>-	    !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) {</div><div class='del'>-		f2fs_bug_on(sbi, 1);</div><div class='add'>+	    !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> out:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * init block age with zero, this can happen when the block age extent</div><div class='hunk'>@@ -877,7 +949,7 @@ static void __update_extent_cache(struct dnode_of_data *dn, enum extent_type typ</div><div class='ctx'> 	if (!__may_extent_tree(dn-&gt;inode, type))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ei.fofs = f2fs_start_bidx_of_node(ofs_of_node(dn-&gt;node_page), dn-&gt;inode) +</div><div class='add'>+	ei.fofs = f2fs_start_bidx_of_node(ofs_of_node(dn-&gt;node_folio), dn-&gt;inode) +</div><div class='ctx'> 								dn-&gt;ofs_in_node;</div><div class='ctx'> 	ei.len = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -912,10 +984,14 @@ static unsigned int __shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink</div><div class='ctx'> 	list_for_each_entry_safe(et, next, &amp;eti-&gt;zombie_list, list) {</div><div class='ctx'> 		if (atomic_read(&amp;et-&gt;node_cnt)) {</div><div class='ctx'> 			write_lock(&amp;et-&gt;lock);</div><div class='del'>-			node_cnt += __free_extent_tree(sbi, et);</div><div class='add'>+			node_cnt += __free_extent_tree(sbi, et,</div><div class='add'>+					nr_shrink - node_cnt - tree_cnt);</div><div class='ctx'> 			write_unlock(&amp;et-&gt;lock);</div><div class='ctx'> 		}</div><div class='del'>-		f2fs_bug_on(sbi, atomic_read(&amp;et-&gt;node_cnt));</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;et-&gt;node_cnt))</div><div class='add'>+			goto unlock_out;</div><div class='add'>+</div><div class='ctx'> 		list_del_init(&amp;et-&gt;list);</div><div class='ctx'> 		radix_tree_delete(&amp;eti-&gt;extent_tree_root, et-&gt;ino);</div><div class='ctx'> 		kmem_cache_free(extent_tree_slab, et);</div><div class='hunk'>@@ -1038,6 +1114,7 @@ void f2fs_update_age_extent_cache_range(struct dnode_of_data *dn,</div><div class='ctx'> 	struct extent_info ei = {</div><div class='ctx'> 		.fofs = fofs,</div><div class='ctx'> 		.len = len,</div><div class='add'>+		.last_blocks = F2FS_EXTENT_AGE_INVALID,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!__may_extent_tree(dn-&gt;inode, EX_BLOCK_AGE))</div><div class='hunk'>@@ -1054,23 +1131,6 @@ unsigned int f2fs_shrink_age_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink</div><div class='ctx'> 	return __shrink_extent_tree(sbi, nr_shrink, EX_BLOCK_AGE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __destroy_extent_node(struct inode *inode,</div><div class='del'>-					enum extent_type type)</div><div class='del'>-{</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct extent_tree *et = F2FS_I(inode)-&gt;extent_tree[type];</div><div class='del'>-	unsigned int node_cnt = 0;</div><div class='del'>-</div><div class='del'>-	if (!et || !atomic_read(&amp;et-&gt;node_cnt))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	write_lock(&amp;et-&gt;lock);</div><div class='del'>-	node_cnt = __free_extent_tree(sbi, et);</div><div class='del'>-	write_unlock(&amp;et-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return node_cnt;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void f2fs_destroy_extent_node(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	__destroy_extent_node(inode, EX_READ);</div><div class='hunk'>@@ -1079,7 +1139,6 @@ void f2fs_destroy_extent_node(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static void __drop_extent_tree(struct inode *inode, enum extent_type type)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct extent_tree *et = F2FS_I(inode)-&gt;extent_tree[type];</div><div class='ctx'> 	bool updated = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1087,7 +1146,6 @@ static void __drop_extent_tree(struct inode *inode, enum extent_type type)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;et-&gt;lock);</div><div class='del'>-	__free_extent_tree(sbi, et);</div><div class='ctx'> 	if (type == EX_READ) {</div><div class='ctx'> 		set_inode_flag(inode, FI_NO_EXTENT);</div><div class='ctx'> 		if (et-&gt;largest.len) {</div><div class='hunk'>@@ -1096,6 +1154,9 @@ static void __drop_extent_tree(struct inode *inode, enum extent_type type)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	write_unlock(&amp;et-&gt;lock);</div><div class='add'>+</div><div class='add'>+	__destroy_extent_node(inode, type);</div><div class='add'>+</div><div class='ctx'> 	if (updated)</div><div class='ctx'> 		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> }</div><div class='hunk'>@@ -1169,6 +1230,7 @@ void f2fs_init_extent_cache_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	sbi-&gt;hot_data_age_threshold = DEF_HOT_DATA_AGE_THRESHOLD;</div><div class='ctx'> 	sbi-&gt;warm_data_age_threshold = DEF_WARM_DATA_AGE_THRESHOLD;</div><div class='ctx'> 	sbi-&gt;last_age_weight = LAST_AGE_WEIGHT;</div><div class='add'>+	sbi-&gt;max_read_extent_count = DEF_MAX_READ_EXTENT_COUNT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init f2fs_create_extent_cache(void)</div><div class='head'>diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h<br/>index 6fc172c99915..20edbb99b814 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/f2fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/f2fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/f2fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/f2fs.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='hunk'>@@ -24,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/part_stat.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/rw_hint.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fscrypt.h&gt;</div><div class='ctx'> #include &lt;linux/fsverity.h&gt;</div><div class='hunk'>@@ -60,59 +59,89 @@ enum {</div><div class='ctx'> 	FAULT_SLAB_ALLOC,</div><div class='ctx'> 	FAULT_DQUOT_INIT,</div><div class='ctx'> 	FAULT_LOCK_OP,</div><div class='del'>-	FAULT_BLKADDR,</div><div class='add'>+	FAULT_BLKADDR_VALIDITY,</div><div class='add'>+	FAULT_BLKADDR_CONSISTENCE,</div><div class='add'>+	FAULT_NO_SEGMENT,</div><div class='add'>+	FAULT_INCONSISTENT_FOOTER,</div><div class='add'>+	FAULT_TIMEOUT,</div><div class='add'>+	FAULT_VMALLOC,</div><div class='ctx'> 	FAULT_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='del'>-#define F2FS_ALL_FAULT_TYPE		(GENMASK(FAULT_MAX - 1, 0))</div><div class='add'>+/* indicate which option to update */</div><div class='add'>+enum fault_option {</div><div class='add'>+	FAULT_RATE	= 1,	/* only update fault rate */</div><div class='add'>+	FAULT_TYPE	= 2,	/* only update fault type */</div><div class='add'>+	FAULT_ALL	= 4,	/* reset all fault injection options/stats */</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='ctx'> struct f2fs_fault_info {</div><div class='ctx'> 	atomic_t inject_ops;</div><div class='del'>-	unsigned int inject_rate;</div><div class='add'>+	int inject_rate;</div><div class='ctx'> 	unsigned int inject_type;</div><div class='add'>+	/* Used to account total count of injection for each type */</div><div class='add'>+	unsigned int inject_count[FAULT_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const char *f2fs_fault_name[FAULT_MAX];</div><div class='ctx'> #define IS_FAULT_SET(fi, type) ((fi)-&gt;inject_type &amp; BIT(type))</div><div class='add'>+</div><div class='add'>+/* maximum retry count for injected failure */</div><div class='add'>+#define DEFAULT_FAILURE_RETRY_COUNT		8</div><div class='add'>+#else</div><div class='add'>+#define DEFAULT_FAILURE_RETRY_COUNT		1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For mount options</div><div class='ctx'>  */</div><div class='del'>-#define F2FS_MOUNT_DISABLE_ROLL_FORWARD	0x00000001</div><div class='del'>-#define F2FS_MOUNT_DISCARD		0x00000002</div><div class='del'>-#define F2FS_MOUNT_NOHEAP		0x00000004</div><div class='del'>-#define F2FS_MOUNT_XATTR_USER		0x00000008</div><div class='del'>-#define F2FS_MOUNT_POSIX_ACL		0x00000010</div><div class='del'>-#define F2FS_MOUNT_DISABLE_EXT_IDENTIFY	0x00000020</div><div class='del'>-#define F2FS_MOUNT_INLINE_XATTR		0x00000040</div><div class='del'>-#define F2FS_MOUNT_INLINE_DATA		0x00000080</div><div class='del'>-#define F2FS_MOUNT_INLINE_DENTRY	0x00000100</div><div class='del'>-#define F2FS_MOUNT_FLUSH_MERGE		0x00000200</div><div class='del'>-#define F2FS_MOUNT_NOBARRIER		0x00000400</div><div class='del'>-#define F2FS_MOUNT_FASTBOOT		0x00000800</div><div class='del'>-#define F2FS_MOUNT_READ_EXTENT_CACHE	0x00001000</div><div class='del'>-#define F2FS_MOUNT_DATA_FLUSH		0x00002000</div><div class='del'>-#define F2FS_MOUNT_FAULT_INJECTION	0x00004000</div><div class='del'>-#define F2FS_MOUNT_USRQUOTA		0x00008000</div><div class='del'>-#define F2FS_MOUNT_GRPQUOTA		0x00010000</div><div class='del'>-#define F2FS_MOUNT_PRJQUOTA		0x00020000</div><div class='del'>-#define F2FS_MOUNT_QUOTA		0x00040000</div><div class='del'>-#define F2FS_MOUNT_INLINE_XATTR_SIZE	0x00080000</div><div class='del'>-#define F2FS_MOUNT_RESERVE_ROOT		0x00100000</div><div class='del'>-#define F2FS_MOUNT_DISABLE_CHECKPOINT	0x00200000</div><div class='del'>-#define F2FS_MOUNT_NORECOVERY		0x00400000</div><div class='del'>-#define F2FS_MOUNT_ATGC			0x00800000</div><div class='del'>-#define F2FS_MOUNT_MERGE_CHECKPOINT	0x01000000</div><div class='del'>-#define	F2FS_MOUNT_GC_MERGE		0x02000000</div><div class='del'>-#define F2FS_MOUNT_COMPRESS_CACHE	0x04000000</div><div class='del'>-#define F2FS_MOUNT_AGE_EXTENT_CACHE	0x08000000</div><div class='add'>+enum f2fs_mount_opt {</div><div class='add'>+	F2FS_MOUNT_DISABLE_ROLL_FORWARD,</div><div class='add'>+	F2FS_MOUNT_DISCARD,</div><div class='add'>+	F2FS_MOUNT_NOHEAP,</div><div class='add'>+	F2FS_MOUNT_XATTR_USER,</div><div class='add'>+	F2FS_MOUNT_POSIX_ACL,</div><div class='add'>+	F2FS_MOUNT_DISABLE_EXT_IDENTIFY,</div><div class='add'>+	F2FS_MOUNT_INLINE_XATTR,</div><div class='add'>+	F2FS_MOUNT_INLINE_DATA,</div><div class='add'>+	F2FS_MOUNT_INLINE_DENTRY,</div><div class='add'>+	F2FS_MOUNT_FLUSH_MERGE,</div><div class='add'>+	F2FS_MOUNT_NOBARRIER,</div><div class='add'>+	F2FS_MOUNT_FASTBOOT,</div><div class='add'>+	F2FS_MOUNT_READ_EXTENT_CACHE,</div><div class='add'>+	F2FS_MOUNT_DATA_FLUSH,</div><div class='add'>+	F2FS_MOUNT_FAULT_INJECTION,</div><div class='add'>+	F2FS_MOUNT_USRQUOTA,</div><div class='add'>+	F2FS_MOUNT_GRPQUOTA,</div><div class='add'>+	F2FS_MOUNT_PRJQUOTA,</div><div class='add'>+	F2FS_MOUNT_QUOTA,</div><div class='add'>+	F2FS_MOUNT_INLINE_XATTR_SIZE,</div><div class='add'>+	F2FS_MOUNT_RESERVE_ROOT,</div><div class='add'>+	F2FS_MOUNT_DISABLE_CHECKPOINT,</div><div class='add'>+	F2FS_MOUNT_NORECOVERY,</div><div class='add'>+	F2FS_MOUNT_ATGC,</div><div class='add'>+	F2FS_MOUNT_MERGE_CHECKPOINT,</div><div class='add'>+	F2FS_MOUNT_GC_MERGE,</div><div class='add'>+	F2FS_MOUNT_COMPRESS_CACHE,</div><div class='add'>+	F2FS_MOUNT_AGE_EXTENT_CACHE,</div><div class='add'>+	F2FS_MOUNT_NAT_BITS,</div><div class='add'>+	F2FS_MOUNT_INLINECRYPT,</div><div class='add'>+	/*</div><div class='add'>+	 * Some f2fs environments expect to be able to pass the "lazytime" option</div><div class='add'>+	 * string rather than using the MS_LAZYTIME flag, so this must remain.</div><div class='add'>+	 */</div><div class='add'>+	F2FS_MOUNT_LAZYTIME,</div><div class='add'>+	F2FS_MOUNT_RESERVE_NODE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define F2FS_OPTION(sbi)	((sbi)-&gt;mount_opt)</div><div class='del'>-#define clear_opt(sbi, option)	(F2FS_OPTION(sbi).opt &amp;= ~F2FS_MOUNT_##option)</div><div class='del'>-#define set_opt(sbi, option)	(F2FS_OPTION(sbi).opt |= F2FS_MOUNT_##option)</div><div class='del'>-#define test_opt(sbi, option)	(F2FS_OPTION(sbi).opt &amp; F2FS_MOUNT_##option)</div><div class='add'>+#define clear_opt(sbi, option)		\</div><div class='add'>+	(F2FS_OPTION(sbi).opt &amp;= ~BIT(F2FS_MOUNT_##option))</div><div class='add'>+#define set_opt(sbi, option)		\</div><div class='add'>+	(F2FS_OPTION(sbi).opt |= BIT(F2FS_MOUNT_##option))</div><div class='add'>+#define test_opt(sbi, option)		\</div><div class='add'>+	(F2FS_OPTION(sbi).opt &amp; BIT(F2FS_MOUNT_##option))</div><div class='ctx'> </div><div class='ctx'> #define ver_after(a, b)	(typecheck(unsigned long long, a) &amp;&amp;		\</div><div class='ctx'> 		typecheck(unsigned long long, b) &amp;&amp;			\</div><div class='hunk'>@@ -126,6 +155,24 @@ typedef u32 nid_t;</div><div class='ctx'> </div><div class='ctx'> #define COMPRESS_EXT_NUM		16</div><div class='ctx'> </div><div class='add'>+enum blkzone_allocation_policy {</div><div class='add'>+	BLKZONE_ALLOC_PRIOR_SEQ,	/* Prioritize writing to sequential zones */</div><div class='add'>+	BLKZONE_ALLOC_ONLY_SEQ,		/* Only allow writing to sequential zones */</div><div class='add'>+	BLKZONE_ALLOC_PRIOR_CONV,	/* Prioritize writing to conventional zones */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bggc_io_aware_policy {</div><div class='add'>+	AWARE_ALL_IO,		/* skip background GC if there is any kind of pending IO */</div><div class='add'>+	AWARE_READ_IO,		/* skip background GC if there is pending read IO */</div><div class='add'>+	AWARE_NONE,			/* don't aware IO for background GC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum device_allocation_policy {</div><div class='add'>+	ALLOCATE_FORWARD_NOHINT,</div><div class='add'>+	ALLOCATE_FORWARD_WITHIN_HINT,</div><div class='add'>+	ALLOCATE_FORWARD_FROM_HINT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * An implementation of an rwsem that is explicitly unfair to readers. This</div><div class='ctx'>  * prevents priority inversion when a low-priority reader acquires the read lock</div><div class='hunk'>@@ -141,9 +188,9 @@ struct f2fs_rwsem {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct f2fs_mount_info {</div><div class='del'>-	unsigned int opt;</div><div class='del'>-	int write_io_size_bits;		/* Write IO size bits */</div><div class='add'>+	unsigned long long opt;</div><div class='ctx'> 	block_t root_reserved_blocks;	/* root reserved blocks */</div><div class='add'>+	block_t root_reserved_nodes;	/* root reserved nodes */</div><div class='ctx'> 	kuid_t s_resuid;		/* reserved blocks for uid */</div><div class='ctx'> 	kgid_t s_resgid;		/* reserved blocks for gid */</div><div class='ctx'> 	int active_logs;		/* # of active logs */</div><div class='hunk'>@@ -184,6 +231,7 @@ struct f2fs_mount_info {</div><div class='ctx'> 	int compress_mode;			/* compression mode */</div><div class='ctx'> 	unsigned char extensions[COMPRESS_EXT_NUM][F2FS_EXTENSION_LEN];	/* extensions */</div><div class='ctx'> 	unsigned char noextensions[COMPRESS_EXT_NUM][F2FS_EXTENSION_LEN]; /* extensions */</div><div class='add'>+	unsigned int lookup_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define F2FS_FEATURE_ENCRYPT			0x00000001</div><div class='hunk'>@@ -201,6 +249,8 @@ struct f2fs_mount_info {</div><div class='ctx'> #define F2FS_FEATURE_CASEFOLD			0x00001000</div><div class='ctx'> #define F2FS_FEATURE_COMPRESSION		0x00002000</div><div class='ctx'> #define F2FS_FEATURE_RO				0x00004000</div><div class='add'>+#define F2FS_FEATURE_DEVICE_ALIAS		0x00008000</div><div class='add'>+#define F2FS_FEATURE_PACKED_SSA			0x00010000</div><div class='ctx'> </div><div class='ctx'> #define __F2FS_HAS_FEATURE(raw_super, mask)				\</div><div class='ctx'> 	((raw_super-&gt;feature &amp; cpu_to_le32(mask)) != 0)</div><div class='hunk'>@@ -237,14 +287,42 @@ enum {</div><div class='ctx'> #define DEF_CP_INTERVAL			60	/* 60 secs */</div><div class='ctx'> #define DEF_IDLE_INTERVAL		5	/* 5 secs */</div><div class='ctx'> #define DEF_DISABLE_INTERVAL		5	/* 5 secs */</div><div class='add'>+#define DEF_ENABLE_INTERVAL		5	/* 5 secs */</div><div class='ctx'> #define DEF_DISABLE_QUICK_INTERVAL	1	/* 1 secs */</div><div class='ctx'> #define DEF_UMOUNT_DISCARD_TIMEOUT	5	/* 5 secs */</div><div class='ctx'> </div><div class='add'>+enum cp_time {</div><div class='add'>+	CP_TIME_START,		/* begin */</div><div class='add'>+	CP_TIME_LOCK,		/* after cp_global_sem */</div><div class='add'>+	CP_TIME_OP_LOCK,	/* after block_operation */</div><div class='add'>+	CP_TIME_FLUSH_META,	/* after flush sit/nat */</div><div class='add'>+	CP_TIME_SYNC_META,	/* after sync_meta_pages */</div><div class='add'>+	CP_TIME_SYNC_CP_META,	/* after sync cp meta pages */</div><div class='add'>+	CP_TIME_WAIT_DIRTY_META,/* after wait on dirty meta */</div><div class='add'>+	CP_TIME_WAIT_CP_DATA,	/* after wait on cp data */</div><div class='add'>+	CP_TIME_FLUSH_DEVICE,	/* after flush device cache */</div><div class='add'>+	CP_TIME_WAIT_LAST_CP,	/* after wait on last cp pack */</div><div class='add'>+	CP_TIME_END,		/* after unblock_operation */</div><div class='add'>+	CP_TIME_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* time cost stats of checkpoint */</div><div class='add'>+struct cp_stats {</div><div class='add'>+	ktime_t times[CP_TIME_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct cp_control {</div><div class='ctx'> 	int reason;</div><div class='ctx'> 	__u64 trim_start;</div><div class='ctx'> 	__u64 trim_end;</div><div class='ctx'> 	__u64 trim_minlen;</div><div class='add'>+	struct cp_stats stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum f2fs_cp_phase {</div><div class='add'>+	CP_PHASE_START_BLOCK_OPS,</div><div class='add'>+	CP_PHASE_FINISH_BLOCK_OPS,</div><div class='add'>+	CP_PHASE_FINISH_CHECKPOINT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -278,6 +356,7 @@ enum {</div><div class='ctx'> 	APPEND_INO,		/* for append ino list */</div><div class='ctx'> 	UPDATE_INO,		/* for update ino list */</div><div class='ctx'> 	TRANS_DIR_INO,		/* for transactions dir ino list */</div><div class='add'>+	XATTR_DIR_INO,		/* for xattr updated dir ino list */</div><div class='ctx'> 	FLUSH_INO,		/* for multiple device flushing */</div><div class='ctx'> 	MAX_INO_ENTRY,		/* max. list */</div><div class='ctx'> };</div><div class='hunk'>@@ -296,7 +375,7 @@ struct inode_entry {</div><div class='ctx'> </div><div class='ctx'> struct fsync_node_entry {</div><div class='ctx'> 	struct list_head list;	/* list head */</div><div class='del'>-	struct page *page;	/* warm node page pointer */</div><div class='add'>+	struct folio *folio;	/* warm node folio pointer */</div><div class='ctx'> 	unsigned int seq_id;	/* sequence id */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -304,7 +383,10 @@ struct ckpt_req {</div><div class='ctx'> 	struct completion wait;		/* completion for checkpoint done */</div><div class='ctx'> 	struct llist_node llnode;	/* llist_node to be linked in wait queue */</div><div class='ctx'> 	int ret;			/* return code of checkpoint */</div><div class='del'>-	ktime_t queue_time;		/* request queued time */</div><div class='add'>+	union {</div><div class='add'>+		ktime_t queue_time;	/* request queued time */</div><div class='add'>+		ktime_t delta_time;	/* time in queue */</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ckpt_req_control {</div><div class='hunk'>@@ -320,6 +402,9 @@ struct ckpt_req_control {</div><div class='ctx'> 	unsigned int peak_time;		/* peak wait time in msec until now */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* a time threshold that checkpoint was blocked for, unit: ms */</div><div class='add'>+#define CP_LONG_LATENCY_THRESHOLD	5000</div><div class='add'>+</div><div class='ctx'> /* for the bitmap indicate blocks to be discarded */</div><div class='ctx'> struct discard_entry {</div><div class='ctx'> 	struct list_head list;	/* list head */</div><div class='hunk'>@@ -333,6 +418,8 @@ struct discard_entry {</div><div class='ctx'> #define DEFAULT_DISCARD_GRANULARITY		16</div><div class='ctx'> /* default maximum discard granularity of ordered discard, unit: block count */</div><div class='ctx'> #define DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY	16</div><div class='add'>+/* default interval of periodical discard submission */</div><div class='add'>+#define DEFAULT_DISCARD_INTERVAL	(msecs_to_jiffies(20))</div><div class='ctx'> </div><div class='ctx'> /* max discard pend list number */</div><div class='ctx'> #define MAX_PLIST_NUM		512</div><div class='hunk'>@@ -356,7 +443,7 @@ struct discard_cmd {</div><div class='ctx'> 	struct rb_node rb_node;		/* rb node located in rb-tree */</div><div class='ctx'> 	struct discard_info di;		/* discard info */</div><div class='ctx'> 	struct list_head list;		/* command list */</div><div class='del'>-	struct completion wait;		/* compleation */</div><div class='add'>+	struct completion wait;		/* completion */</div><div class='ctx'> 	struct block_device *bdev;	/* bdev */</div><div class='ctx'> 	unsigned short ref;		/* reference count */</div><div class='ctx'> 	unsigned char state;		/* state */</div><div class='hunk'>@@ -524,7 +611,7 @@ struct f2fs_filename {</div><div class='ctx'> 	 * internal operation where usr_fname is also NULL.  In all these cases</div><div class='ctx'> 	 * we fall back to treating the name as an opaque byte sequence.</div><div class='ctx'> 	 */</div><div class='del'>-	struct fscrypt_str cf_name;</div><div class='add'>+	struct qstr cf_name;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -582,8 +669,11 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_RETRY_IO_COUNT	8	/* maximum retry read IO or flush count */</div><div class='ctx'> </div><div class='del'>-/* congestion wait timeout value, default: 20ms */</div><div class='del'>-#define	DEFAULT_IO_TIMEOUT	(msecs_to_jiffies(20))</div><div class='add'>+/* IO/non-IO congestion wait timeout value, default: 1ms */</div><div class='add'>+#define	DEFAULT_SCHEDULE_TIMEOUT	(msecs_to_jiffies(1))</div><div class='add'>+</div><div class='add'>+/* timeout value injected, default: 1000ms */</div><div class='add'>+#define DEFAULT_FAULT_TIMEOUT	(msecs_to_jiffies(1000))</div><div class='ctx'> </div><div class='ctx'> /* maximum retry quota flush count */</div><div class='ctx'> #define DEFAULT_RETRY_QUOTA_FLUSH_COUNT		8</div><div class='hunk'>@@ -621,6 +711,9 @@ enum {</div><div class='ctx'> #define DEF_HOT_DATA_AGE_THRESHOLD	262144</div><div class='ctx'> #define DEF_WARM_DATA_AGE_THRESHOLD	2621440</div><div class='ctx'> </div><div class='add'>+/* default max read extent count per inode */</div><div class='add'>+#define DEF_MAX_READ_EXTENT_COUNT	10240</div><div class='add'>+</div><div class='ctx'> /* extent cache type */</div><div class='ctx'> enum extent_type {</div><div class='ctx'> 	EX_READ,</div><div class='hunk'>@@ -628,6 +721,12 @@ enum extent_type {</div><div class='ctx'> 	NR_EXTENT_CACHES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Reserved value to mark invalid age extents, hence valid block range</div><div class='add'>+ * from 0 to ULLONG_MAX-1</div><div class='add'>+ */</div><div class='add'>+#define F2FS_EXTENT_AGE_INVALID	ULLONG_MAX</div><div class='add'>+</div><div class='ctx'> struct extent_info {</div><div class='ctx'> 	unsigned int fofs;		/* start offset in a file */</div><div class='ctx'> 	unsigned int len;		/* length of the extent */</div><div class='hunk'>@@ -696,6 +795,7 @@ struct f2fs_map_blocks {</div><div class='ctx'> 	block_t m_lblk;</div><div class='ctx'> 	unsigned int m_len;</div><div class='ctx'> 	unsigned int m_flags;</div><div class='add'>+	unsigned long m_last_pblk;	/* last allocated block, only used for DIO in LFS mode */</div><div class='ctx'> 	pgoff_t *m_next_pgofs;		/* point next possible non-hole pgofs */</div><div class='ctx'> 	pgoff_t *m_next_extent;		/* point to next possible extent */</div><div class='ctx'> 	int m_seg_type;</div><div class='hunk'>@@ -758,11 +858,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define DEF_DIR_LEVEL		0</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	GC_FAILURE_PIN,</div><div class='del'>-	MAX_GC_FAILURE</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* used for f2fs_inode_info-&gt;flags */</div><div class='ctx'> enum {</div><div class='ctx'> 	FI_NEW_INODE,		/* indicate newly allocated inode */</div><div class='hunk'>@@ -782,7 +877,6 @@ enum {</div><div class='ctx'> 	FI_NEED_IPU,		/* used for ipu per file */</div><div class='ctx'> 	FI_ATOMIC_FILE,		/* indicate atomic file */</div><div class='ctx'> 	FI_DATA_EXIST,		/* indicate data exists */</div><div class='del'>-	FI_INLINE_DOTS,		/* indicate inline dot dentries */</div><div class='ctx'> 	FI_SKIP_WRITES,		/* should skip data page writeback */</div><div class='ctx'> 	FI_OPU_WRITE,		/* used for opu per file */</div><div class='ctx'> 	FI_DIRTY_FILE,		/* indicate regular/symlink has dirty pages */</div><div class='hunk'>@@ -800,7 +894,10 @@ enum {</div><div class='ctx'> 	FI_ALIGNED_WRITE,	/* enable aligned write */</div><div class='ctx'> 	FI_COW_FILE,		/* indicate COW file */</div><div class='ctx'> 	FI_ATOMIC_COMMITTED,	/* indicate atomic commit completed except disk sync */</div><div class='add'>+	FI_ATOMIC_DIRTIED,	/* indicate atomic file is dirtied */</div><div class='ctx'> 	FI_ATOMIC_REPLACE,	/* indicate atomic replace */</div><div class='add'>+	FI_OPENED_FILE,		/* indicate file has been opened */</div><div class='add'>+	FI_DONATE_FINISHED,	/* indicate page donation of file has been finished */</div><div class='ctx'> 	FI_MAX,			/* max flag, never be used */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -809,14 +906,16 @@ struct f2fs_inode_info {</div><div class='ctx'> 	unsigned long i_flags;		/* keep an inode flags for ioctl */</div><div class='ctx'> 	unsigned char i_advise;		/* use to give file attribute hints */</div><div class='ctx'> 	unsigned char i_dir_level;	/* use for dentry level for large dir */</div><div class='del'>-	unsigned int i_current_depth;	/* only for directory depth */</div><div class='del'>-	/* for gc failure statistic */</div><div class='del'>-	unsigned int i_gc_failures[MAX_GC_FAILURE];</div><div class='add'>+	union {</div><div class='add'>+		unsigned int i_current_depth;	/* only for directory depth */</div><div class='add'>+		unsigned short i_gc_failures;	/* for gc failure statistic */</div><div class='add'>+	};</div><div class='ctx'> 	unsigned int i_pino;		/* parent inode number */</div><div class='ctx'> 	umode_t i_acl_mode;		/* keep file acl mode temporarily */</div><div class='ctx'> </div><div class='ctx'> 	/* Use below internally in f2fs*/</div><div class='ctx'> 	unsigned long flags[BITS_TO_LONGS(FI_MAX)];	/* use to pass per-file flags */</div><div class='add'>+	unsigned int ioprio_hint;	/* hint for IO priority */</div><div class='ctx'> 	struct f2fs_rwsem i_sem;	/* protect fi info */</div><div class='ctx'> 	atomic_t dirty_pages;		/* # of dirty pages */</div><div class='ctx'> 	f2fs_hash_t chash;		/* hash value of given file name */</div><div class='hunk'>@@ -829,17 +928,27 @@ struct f2fs_inode_info {</div><div class='ctx'> 	spinlock_t i_size_lock;		/* protect last_disk_size */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-	struct dquot *i_dquot[MAXQUOTAS];</div><div class='add'>+	struct dquot __rcu *i_dquot[MAXQUOTAS];</div><div class='ctx'> </div><div class='ctx'> 	/* quota space reservation, managed internally by quota code */</div><div class='ctx'> 	qsize_t i_reserved_quota;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct list_head dirty_list;	/* dirty list for dirs and files */</div><div class='ctx'> 	struct list_head gdirty_list;	/* linked in global dirty list */</div><div class='add'>+</div><div class='add'>+	/* linked in global inode list for cache donation */</div><div class='add'>+	struct list_head gdonate_list;</div><div class='add'>+	pgoff_t donate_start, donate_end; /* inclusive */</div><div class='add'>+	atomic_t open_count;		/* # of open files */</div><div class='add'>+</div><div class='ctx'> 	struct task_struct *atomic_write_task;	/* store atomic write task */</div><div class='ctx'> 	struct extent_tree *extent_tree[NR_EXTENT_CACHES];</div><div class='ctx'> 					/* cached extent_tree entry */</div><div class='del'>-	struct inode *cow_inode;	/* copy-on-write inode for atomic write */</div><div class='add'>+	union {</div><div class='add'>+		struct inode *cow_inode;	/* copy-on-write inode for atomic write */</div><div class='add'>+		struct inode *atomic_inode;</div><div class='add'>+					/* point to atomic_inode, available only for cow_inode */</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* avoid racing between foreground op and gc */</div><div class='ctx'> 	struct f2fs_rwsem i_gc_rwsem[2];</div><div class='hunk'>@@ -858,9 +967,16 @@ struct f2fs_inode_info {</div><div class='ctx'> 	unsigned char i_compress_level;		/* compress level (lz4hc,zstd) */</div><div class='ctx'> 	unsigned char i_compress_flag;		/* compress flag */</div><div class='ctx'> 	unsigned int i_cluster_size;		/* cluster size */</div><div class='add'>+	atomic_t writeback;			/* count # of writeback thread */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int atomic_write_cnt;</div><div class='ctx'> 	loff_t original_i_size;		/* original i_size before atomic write */</div><div class='add'>+#ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	struct fscrypt_inode_info *i_crypt_info; /* filesystem encryption info */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	struct fsverity_info *i_verity_info; /* filesystem verity info */</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void get_read_extent_info(struct extent_info *ext,</div><div class='hunk'>@@ -963,11 +1079,11 @@ struct f2fs_nm_info {</div><div class='ctx'>  */</div><div class='ctx'> struct dnode_of_data {</div><div class='ctx'> 	struct inode *inode;		/* vfs inode pointer */</div><div class='del'>-	struct page *inode_page;	/* its inode page, NULL is possible */</div><div class='del'>-	struct page *node_page;		/* cached direct node page */</div><div class='add'>+	struct folio *inode_folio;	/* its inode folio, NULL is possible */</div><div class='add'>+	struct folio *node_folio;	/* cached direct node folio */</div><div class='ctx'> 	nid_t nid;			/* node id of the direct node block */</div><div class='ctx'> 	unsigned int ofs_in_node;	/* data offset in the node page */</div><div class='del'>-	bool inode_page_locked;		/* inode page is locked or not */</div><div class='add'>+	bool inode_folio_locked;	/* inode folio is locked or not */</div><div class='ctx'> 	bool node_changed;		/* is node block changed */</div><div class='ctx'> 	char cur_level;			/* level of hole node page */</div><div class='ctx'> 	char max_level;			/* level of current page located */</div><div class='hunk'>@@ -975,12 +1091,12 @@ struct dnode_of_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode,</div><div class='del'>-		struct page *ipage, struct page *npage, nid_t nid)</div><div class='add'>+		struct folio *ifolio, struct folio *nfolio, nid_t nid)</div><div class='ctx'> {</div><div class='ctx'> 	memset(dn, 0, sizeof(*dn));</div><div class='ctx'> 	dn-&gt;inode = inode;</div><div class='del'>-	dn-&gt;inode_page = ipage;</div><div class='del'>-	dn-&gt;node_page = npage;</div><div class='add'>+	dn-&gt;inode_folio = ifolio;</div><div class='add'>+	dn-&gt;node_folio = nfolio;</div><div class='ctx'> 	dn-&gt;nid = nid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1004,7 +1120,7 @@ static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode,</div><div class='ctx'> #define NR_CURSEG_PERSIST_TYPE	(NR_CURSEG_DATA_TYPE + NR_CURSEG_NODE_TYPE)</div><div class='ctx'> #define NR_CURSEG_TYPE		(NR_CURSEG_INMEM_TYPE + NR_CURSEG_PERSIST_TYPE)</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+enum log_type {</div><div class='ctx'> 	CURSEG_HOT_DATA	= 0,	/* directory entry blocks */</div><div class='ctx'> 	CURSEG_WARM_DATA,	/* data blocks */</div><div class='ctx'> 	CURSEG_COLD_DATA,	/* multimedia or GCed data blocks */</div><div class='hunk'>@@ -1049,7 +1165,6 @@ struct f2fs_sm_info {</div><div class='ctx'> 	unsigned int segment_count;	/* total # of segments */</div><div class='ctx'> 	unsigned int main_segments;	/* # of segments in main area */</div><div class='ctx'> 	unsigned int reserved_segments;	/* # of reserved segments */</div><div class='del'>-	unsigned int additional_reserved_segments;/* reserved segs for IO align feature */</div><div class='ctx'> 	unsigned int ovp_segments;	/* # of overprovision segments */</div><div class='ctx'> </div><div class='ctx'> 	/* a threshold to reclaim prefree segments */</div><div class='hunk'>@@ -1080,7 +1195,8 @@ struct f2fs_sm_info {</div><div class='ctx'>  * f2fs monitors the number of several block types such as on-writeback,</div><div class='ctx'>  * dirty dentry blocks, dirty node blocks, and dirty meta blocks.</div><div class='ctx'>  */</div><div class='del'>-#define WB_DATA_TYPE(p)	(__is_cp_guaranteed(p) ? F2FS_WB_CP_DATA : F2FS_WB_DATA)</div><div class='add'>+#define WB_DATA_TYPE(folio, f)			\</div><div class='add'>+	(f || f2fs_is_cp_guaranteed(folio) ? F2FS_WB_CP_DATA : F2FS_WB_DATA)</div><div class='ctx'> enum count_type {</div><div class='ctx'> 	F2FS_DIRTY_DENTS,</div><div class='ctx'> 	F2FS_DIRTY_DATA,</div><div class='hunk'>@@ -1110,6 +1226,7 @@ enum count_type {</div><div class='ctx'>  * ...			Only can be used with META.</div><div class='ctx'>  */</div><div class='ctx'> #define PAGE_TYPE_OF_BIO(type)	((type) &gt; META ? META : (type))</div><div class='add'>+#define PAGE_TYPE_ON_MAIN(type)	((type) == DATA || (type) == NODE)</div><div class='ctx'> enum page_type {</div><div class='ctx'> 	DATA = 0,</div><div class='ctx'> 	NODE = 1,	/* should not change this */</div><div class='hunk'>@@ -1145,6 +1262,7 @@ enum cp_reason_type {</div><div class='ctx'> 	CP_FASTBOOT_MODE,</div><div class='ctx'> 	CP_SPEC_LOG_NUM,</div><div class='ctx'> 	CP_RECOVER_DIR,</div><div class='add'>+	CP_XATTR_DIR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum iostat_type {</div><div class='hunk'>@@ -1194,7 +1312,10 @@ struct f2fs_io_info {</div><div class='ctx'> 	blk_opf_t op_flags;	/* req_flag_bits */</div><div class='ctx'> 	block_t new_blkaddr;	/* new block address to be written */</div><div class='ctx'> 	block_t old_blkaddr;	/* old block address before Cow */</div><div class='del'>-	struct page *page;	/* page to be written */</div><div class='add'>+	union {</div><div class='add'>+		struct page *page;	/* page to be written */</div><div class='add'>+		struct folio *folio;</div><div class='add'>+	};</div><div class='ctx'> 	struct page *encrypted_page;	/* encrypted page */</div><div class='ctx'> 	struct page *compressed_page;	/* compressed page */</div><div class='ctx'> 	struct list_head list;		/* serialize IOs */</div><div class='hunk'>@@ -1204,9 +1325,8 @@ struct f2fs_io_info {</div><div class='ctx'> 	unsigned int submitted:1;	/* indicate IO submission */</div><div class='ctx'> 	unsigned int in_list:1;		/* indicate fio is in io_list */</div><div class='ctx'> 	unsigned int is_por:1;		/* indicate IO is from recovery or not */</div><div class='del'>-	unsigned int retry:1;		/* need to reallocate block address */</div><div class='ctx'> 	unsigned int encrypted:1;	/* indicate file is encrypted */</div><div class='del'>-	unsigned int post_read:1;	/* require post read */</div><div class='add'>+	unsigned int meta_gc:1;		/* require meta inode GC */</div><div class='ctx'> 	enum iostat_type io_type;	/* io type */</div><div class='ctx'> 	struct writeback_control *io_wbc; /* writeback control */</div><div class='ctx'> 	struct bio **bio;		/* bio for ipu */</div><div class='hunk'>@@ -1241,7 +1361,7 @@ struct f2fs_bio_info {</div><div class='ctx'> struct f2fs_dev_info {</div><div class='ctx'> 	struct file *bdev_file;</div><div class='ctx'> 	struct block_device *bdev;</div><div class='del'>-	char path[MAX_PATH_LEN];</div><div class='add'>+	char path[MAX_PATH_LEN + 1];</div><div class='ctx'> 	unsigned int total_segments;</div><div class='ctx'> 	block_t start_blk;</div><div class='ctx'> 	block_t end_blk;</div><div class='hunk'>@@ -1255,6 +1375,7 @@ enum inode_type {</div><div class='ctx'> 	DIR_INODE,			/* for dirty dir inode */</div><div class='ctx'> 	FILE_INODE,			/* for dirty regular/symlink inode */</div><div class='ctx'> 	DIRTY_META,			/* for all dirtied inode metadata */</div><div class='add'>+	DONATE_INODE,			/* for all inode to donate pages */</div><div class='ctx'> 	NR_INODE_TYPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1284,6 +1405,7 @@ struct f2fs_gc_control {</div><div class='ctx'> 	bool no_bg_gc;			/* check the space and stop bg_gc */</div><div class='ctx'> 	bool should_migrate_blocks;	/* should migrate blocks */</div><div class='ctx'> 	bool err_gc_skipped;		/* return EAGAIN if GC skipped */</div><div class='add'>+	bool one_time;			/* require one time GC in one migration unit */</div><div class='ctx'> 	unsigned int nr_free_secs;	/* # of free sections to do GC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1317,6 +1439,7 @@ enum {</div><div class='ctx'> 	DISCARD_TIME,</div><div class='ctx'> 	GC_TIME,</div><div class='ctx'> 	DISABLE_TIME,</div><div class='add'>+	ENABLE_TIME,</div><div class='ctx'> 	UMOUNT_DISCARD_TIMEOUT,</div><div class='ctx'> 	MAX_TIME,</div><div class='ctx'> };</div><div class='hunk'>@@ -1380,7 +1503,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MEMORY_MODE_NORMAL,	/* memory mode for normal devices */</div><div class='del'>-	MEMORY_MODE_LOW,	/* memory mode for low memry devices */</div><div class='add'>+	MEMORY_MODE_LOW,	/* memory mode for low memory devices */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum errors_option {</div><div class='hunk'>@@ -1396,6 +1519,12 @@ enum {</div><div class='ctx'> 	TOTAL_CALL = FOREGROUND,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum f2fs_lookup_mode {</div><div class='add'>+	LOOKUP_PERF,</div><div class='add'>+	LOOKUP_COMPAT,</div><div class='add'>+	LOOKUP_AUTO,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline int f2fs_test_bit(unsigned int nr, char *addr);</div><div class='ctx'> static inline void f2fs_set_bit(unsigned int nr, char *addr);</div><div class='ctx'> static inline void f2fs_clear_bit(unsigned int nr, char *addr);</div><div class='hunk'>@@ -1406,10 +1535,10 @@ static inline void f2fs_clear_bit(unsigned int nr, char *addr);</div><div class='ctx'>  * Layout A: lowest bit should be 1</div><div class='ctx'>  * | bit0 = 1 | bit1 | bit2 | ... | bit MAX | private data .... |</div><div class='ctx'>  * bit 0	PAGE_PRIVATE_NOT_POINTER</div><div class='del'>- * bit 1	PAGE_PRIVATE_DUMMY_WRITE</div><div class='del'>- * bit 2	PAGE_PRIVATE_ONGOING_MIGRATION</div><div class='del'>- * bit 3	PAGE_PRIVATE_INLINE_INODE</div><div class='del'>- * bit 4	PAGE_PRIVATE_REF_RESOURCE</div><div class='add'>+ * bit 1	PAGE_PRIVATE_ONGOING_MIGRATION</div><div class='add'>+ * bit 2	PAGE_PRIVATE_INLINE_INODE</div><div class='add'>+ * bit 3	PAGE_PRIVATE_REF_RESOURCE</div><div class='add'>+ * bit 4	PAGE_PRIVATE_ATOMIC_WRITE</div><div class='ctx'>  * bit 5-	f2fs private data</div><div class='ctx'>  *</div><div class='ctx'>  * Layout B: lowest bit should be 0</div><div class='hunk'>@@ -1417,10 +1546,10 @@ static inline void f2fs_clear_bit(unsigned int nr, char *addr);</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	PAGE_PRIVATE_NOT_POINTER,		/* private contains non-pointer data */</div><div class='del'>-	PAGE_PRIVATE_DUMMY_WRITE,		/* data page for padding aligned IO */</div><div class='ctx'> 	PAGE_PRIVATE_ONGOING_MIGRATION,		/* data page which is on-going migrating */</div><div class='ctx'> 	PAGE_PRIVATE_INLINE_INODE,		/* inode page contains inline data */</div><div class='ctx'> 	PAGE_PRIVATE_REF_RESOURCE,		/* dirty page has referenced resources */</div><div class='add'>+	PAGE_PRIVATE_ATOMIC_WRITE,		/* data page from atomic write path */</div><div class='ctx'> 	PAGE_PRIVATE_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1444,7 +1573,7 @@ enum compress_flag {</div><div class='ctx'> #define COMPRESS_DATA_RESERVED_SIZE		4</div><div class='ctx'> struct compress_data {</div><div class='ctx'> 	__le32 clen;			/* compressed data size */</div><div class='del'>-	__le32 chksum;			/* compressed data chksum */</div><div class='add'>+	__le32 chksum;			/* compressed data checksum */</div><div class='ctx'> 	__le32 reserved[COMPRESS_DATA_RESERVED_SIZE];	/* reserved */</div><div class='ctx'> 	u8 cdata[];			/* compressed data */</div><div class='ctx'> };</div><div class='hunk'>@@ -1489,6 +1618,7 @@ struct compress_io_ctx {</div><div class='ctx'> struct decompress_io_ctx {</div><div class='ctx'> 	u32 magic;			/* magic number to indicate page is compressed */</div><div class='ctx'> 	struct inode *inode;		/* inode the context belong to */</div><div class='add'>+	struct f2fs_sb_info *sbi;	/* f2fs_sb_info pointer */</div><div class='ctx'> 	pgoff_t cluster_idx;		/* cluster index number */</div><div class='ctx'> 	unsigned int cluster_size;	/* page count in cluster */</div><div class='ctx'> 	unsigned int log_cluster_size;	/* log of cluster size */</div><div class='hunk'>@@ -1529,6 +1659,7 @@ struct decompress_io_ctx {</div><div class='ctx'> </div><div class='ctx'> 	bool failed;			/* IO error occurred before decompression? */</div><div class='ctx'> 	bool need_verity;		/* need fs-verity verification after decompression? */</div><div class='add'>+	unsigned char compress_algorithm;	/* backup algorithm type */</div><div class='ctx'> 	void *private;			/* payload buffer for specified decompression algorithm */</div><div class='ctx'> 	void *private2;			/* extra payload buffer */</div><div class='ctx'> 	struct work_struct verity_work;	/* work to verify the decompressed pages */</div><div class='hunk'>@@ -1551,6 +1682,10 @@ struct f2fs_sb_info {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 	unsigned int blocks_per_blkz;		/* F2FS blocks per zone */</div><div class='add'>+	unsigned int unusable_blocks_per_sec;   /* unusable blocks per section */</div><div class='add'>+	unsigned int max_open_zones;		/* max open zone resources of the zoned device */</div><div class='add'>+	/* For adjust the priority writing position of data in zone UFS */</div><div class='add'>+	unsigned int blkzone_alloc_policy;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* for node-related operations */</div><div class='hunk'>@@ -1564,7 +1699,6 @@ struct f2fs_sb_info {</div><div class='ctx'> 	struct f2fs_bio_info *write_io[NR_PAGE_TYPE];	/* for write bios */</div><div class='ctx'> 	/* keep migration IO order for LFS mode */</div><div class='ctx'> 	struct f2fs_rwsem io_order_lock;</div><div class='del'>-	mempool_t *write_io_dummy;		/* Dummy pages */</div><div class='ctx'> 	pgoff_t page_eio_ofs[NR_PAGE_TYPE];	/* EIO page offset */</div><div class='ctx'> 	int page_eio_cnt[NR_PAGE_TYPE];		/* EIO count */</div><div class='ctx'> </div><div class='hunk'>@@ -1581,6 +1715,8 @@ struct f2fs_sb_info {</div><div class='ctx'> 	unsigned long last_time[MAX_TIME];	/* to store time in jiffies */</div><div class='ctx'> 	long interval_time[MAX_TIME];		/* to store thresholds */</div><div class='ctx'> 	struct ckpt_req_control cprc_info;	/* for checkpoint request control */</div><div class='add'>+	struct cp_stats cp_stats;		/* for time stat of checkpoint */</div><div class='add'>+	struct f2fs_rwsem cp_enable_rwsem;	/* block cache/dio write */</div><div class='ctx'> </div><div class='ctx'> 	struct inode_management im[MAX_INO_ENTRY];	/* manage inode cache */</div><div class='ctx'> </div><div class='hunk'>@@ -1600,12 +1736,16 @@ struct f2fs_sb_info {</div><div class='ctx'> 	/* for extent tree cache */</div><div class='ctx'> 	struct extent_tree_info extent_tree[NR_EXTENT_CACHES];</div><div class='ctx'> 	atomic64_t allocated_data_blocks;	/* for block age extent_cache */</div><div class='add'>+	unsigned int max_read_extent_count;	/* max read extent count per inode */</div><div class='ctx'> </div><div class='ctx'> 	/* The threshold used for hot and warm data seperation*/</div><div class='ctx'> 	unsigned int hot_data_age_threshold;</div><div class='ctx'> 	unsigned int warm_data_age_threshold;</div><div class='ctx'> 	unsigned int last_age_weight;</div><div class='ctx'> </div><div class='add'>+	/* control donate caches */</div><div class='add'>+	unsigned int donate_files;</div><div class='add'>+</div><div class='ctx'> 	/* basic filesystem units */</div><div class='ctx'> 	unsigned int log_sectors_per_block;	/* log2 sectors per block */</div><div class='ctx'> 	unsigned int log_blocksize;		/* log2 block size */</div><div class='hunk'>@@ -1615,7 +1755,6 @@ struct f2fs_sb_info {</div><div class='ctx'> 	unsigned int meta_ino_num;		/* meta inode number*/</div><div class='ctx'> 	unsigned int log_blocks_per_seg;	/* log2 blocks per segment */</div><div class='ctx'> 	unsigned int blocks_per_seg;		/* blocks per segment */</div><div class='del'>-	unsigned int unusable_blocks_per_sec;	/* unusable blocks per section */</div><div class='ctx'> 	unsigned int segs_per_sec;		/* segments per section */</div><div class='ctx'> 	unsigned int secs_per_zone;		/* sections per zone */</div><div class='ctx'> 	unsigned int total_sections;		/* total section count */</div><div class='hunk'>@@ -1637,6 +1776,7 @@ struct f2fs_sb_info {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int nquota_files;		/* # of quota sysfile */</div><div class='ctx'> 	struct f2fs_rwsem quota_sem;		/* blocking cp for flags */</div><div class='add'>+	struct task_struct *umount_lock_holder;	/* s_umount lock holder */</div><div class='ctx'> </div><div class='ctx'> 	/* # of pages, see count_type */</div><div class='ctx'> 	atomic_t nr_pages[NR_COUNT_TYPE];</div><div class='hunk'>@@ -1670,14 +1810,19 @@ struct f2fs_sb_info {</div><div class='ctx'> 	/* for skip statistic */</div><div class='ctx'> 	unsigned long long skipped_gc_rwsem;		/* FG_GC only */</div><div class='ctx'> </div><div class='add'>+	/* free sections reserved for pinned file */</div><div class='add'>+	unsigned int reserved_pin_section;</div><div class='add'>+</div><div class='ctx'> 	/* threshold for gc trials on pinned files */</div><div class='del'>-	u64 gc_pin_file_threshold;</div><div class='add'>+	unsigned short gc_pin_file_threshold;</div><div class='ctx'> 	struct f2fs_rwsem pin_sem;</div><div class='ctx'> </div><div class='ctx'> 	/* maximum # of trials to find a victim segment for SSR and GC */</div><div class='ctx'> 	unsigned int max_victim_search;</div><div class='ctx'> 	/* migration granularity of garbage collection, unit: segment */</div><div class='ctx'> 	unsigned int migration_granularity;</div><div class='add'>+	/* migration window granularity of garbage collection, unit: segment */</div><div class='add'>+	unsigned int migration_window_granularity;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * for stat information.</div><div class='hunk'>@@ -1737,14 +1882,15 @@ struct f2fs_sb_info {</div><div class='ctx'> 	unsigned int dirty_device;		/* for checkpoint data flush */</div><div class='ctx'> 	spinlock_t dev_lock;			/* protect dirty_device */</div><div class='ctx'> 	bool aligned_blksize;			/* all devices has the same logical blksize */</div><div class='add'>+	unsigned int first_seq_zone_segno;	/* first segno in sequential zone */</div><div class='add'>+	unsigned int bggc_io_aware;		/* For adjust the BG_GC priority when pending IO */</div><div class='add'>+	unsigned int allocate_section_hint;	/* the boundary position between devices */</div><div class='add'>+	unsigned int allocate_section_policy;	/* determine the section writing priority */</div><div class='ctx'> </div><div class='ctx'> 	/* For write statistics */</div><div class='ctx'> 	u64 sectors_written_start;</div><div class='ctx'> 	u64 kbytes_written;</div><div class='ctx'> </div><div class='del'>-	/* Reference to checksum algorithm driver via cryptoapi */</div><div class='del'>-	struct crypto_shash *s_chksum_driver;</div><div class='del'>-</div><div class='ctx'> 	/* Precomputed FS UUID checksum for seeding other checksums */</div><div class='ctx'> 	__u32 s_chksum_seed;</div><div class='ctx'> </div><div class='hunk'>@@ -1760,9 +1906,6 @@ struct f2fs_sb_info {</div><div class='ctx'> 	spinlock_t error_lock;			/* protect errors/stop_reason array */</div><div class='ctx'> 	bool error_dirty;			/* errors of sb is dirty */</div><div class='ctx'> </div><div class='del'>-	struct kmem_cache *inline_xattr_slab;	/* inline xattr entry */</div><div class='del'>-	unsigned int inline_xattr_slab_size;	/* default inline xattr slab size */</div><div class='del'>-</div><div class='ctx'> 	/* For reclaimed segs statistics per each GC mode */</div><div class='ctx'> 	unsigned int gc_segment_mode;		/* GC state for reclaimed segments */</div><div class='ctx'> 	unsigned int gc_reclaimed_segs[MAX_GC_MODE];	/* Reclaimed segs for each mode */</div><div class='hunk'>@@ -1778,6 +1921,9 @@ struct f2fs_sb_info {</div><div class='ctx'> 	u64 committed_atomic_block;</div><div class='ctx'> 	u64 revoked_atomic_block;</div><div class='ctx'> </div><div class='add'>+	/* carve out reserved_blocks from total blocks */</div><div class='add'>+	bool carve_out;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	struct kmem_cache *page_array_slab;	/* page array entry */</div><div class='ctx'> 	unsigned int page_array_slab_size;	/* default page array slab size */</div><div class='hunk'>@@ -1810,6 +1956,37 @@ struct f2fs_sb_info {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Definitions to access f2fs_sb_info */</div><div class='add'>+#define SEGS_TO_BLKS(sbi, segs)					\</div><div class='add'>+		((segs) &lt;&lt; (sbi)-&gt;log_blocks_per_seg)</div><div class='add'>+#define BLKS_TO_SEGS(sbi, blks)					\</div><div class='add'>+		((blks) &gt;&gt; (sbi)-&gt;log_blocks_per_seg)</div><div class='add'>+</div><div class='add'>+#define BLKS_PER_SEG(sbi)	((sbi)-&gt;blocks_per_seg)</div><div class='add'>+#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)-&gt;segs_per_sec))</div><div class='add'>+#define SEGS_PER_SEC(sbi)	((sbi)-&gt;segs_per_sec)</div><div class='add'>+</div><div class='add'>+__printf(3, 4)</div><div class='add'>+void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+#define f2fs_err(sbi, fmt, ...)						\</div><div class='add'>+	f2fs_printk(sbi, false, KERN_ERR fmt, ##__VA_ARGS__)</div><div class='add'>+#define f2fs_warn(sbi, fmt, ...)					\</div><div class='add'>+	f2fs_printk(sbi, false, KERN_WARNING fmt, ##__VA_ARGS__)</div><div class='add'>+#define f2fs_notice(sbi, fmt, ...)					\</div><div class='add'>+	f2fs_printk(sbi, false, KERN_NOTICE fmt, ##__VA_ARGS__)</div><div class='add'>+#define f2fs_info(sbi, fmt, ...)					\</div><div class='add'>+	f2fs_printk(sbi, false, KERN_INFO fmt, ##__VA_ARGS__)</div><div class='add'>+#define f2fs_debug(sbi, fmt, ...)					\</div><div class='add'>+	f2fs_printk(sbi, false, KERN_DEBUG fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define f2fs_err_ratelimited(sbi, fmt, ...)				\</div><div class='add'>+	f2fs_printk(sbi, true, KERN_ERR fmt, ##__VA_ARGS__)</div><div class='add'>+#define f2fs_warn_ratelimited(sbi, fmt, ...)				\</div><div class='add'>+	f2fs_printk(sbi, true, KERN_WARNING fmt, ##__VA_ARGS__)</div><div class='add'>+#define f2fs_info_ratelimited(sbi, fmt, ...)				\</div><div class='add'>+	f2fs_printk(sbi, true, KERN_INFO fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='ctx'> #define time_to_inject(sbi, type) __time_to_inject(sbi, type, __func__,	\</div><div class='ctx'> 									__builtin_return_address(0))</div><div class='hunk'>@@ -1827,9 +2004,9 @@ static inline bool __time_to_inject(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 	atomic_inc(&amp;ffi-&gt;inject_ops);</div><div class='ctx'> 	if (atomic_read(&amp;ffi-&gt;inject_ops) &gt;= ffi-&gt;inject_rate) {</div><div class='ctx'> 		atomic_set(&amp;ffi-&gt;inject_ops, 0);</div><div class='del'>-		printk_ratelimited("%sF2FS-fs (%s) : inject %s in %s of %pS\n",</div><div class='del'>-			KERN_INFO, sbi-&gt;sb-&gt;s_id, f2fs_fault_name[type],</div><div class='del'>-			func, parent_func);</div><div class='add'>+		ffi-&gt;inject_count[type]++;</div><div class='add'>+		f2fs_info_ratelimited(sbi, "inject %s in %s of %pS",</div><div class='add'>+				f2fs_fault_name[type], func, parent_func);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1889,42 +2066,20 @@ static inline unsigned int f2fs_time_to_wait(struct f2fs_sb_info *sbi,</div><div class='ctx'> /*</div><div class='ctx'>  * Inline functions</div><div class='ctx'>  */</div><div class='del'>-static inline u32 __f2fs_crc32(struct f2fs_sb_info *sbi, u32 crc,</div><div class='del'>-			      const void *address, unsigned int length)</div><div class='add'>+static inline u32 __f2fs_crc32(u32 crc, const void *address,</div><div class='add'>+			       unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		struct shash_desc shash;</div><div class='del'>-		char ctx[4];</div><div class='del'>-	} desc;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(crypto_shash_descsize(sbi-&gt;s_chksum_driver) != sizeof(desc.ctx));</div><div class='del'>-</div><div class='del'>-	desc.shash.tfm = sbi-&gt;s_chksum_driver;</div><div class='del'>-	*(u32 *)desc.ctx = crc;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_update(&amp;desc.shash, address, length);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-</div><div class='del'>-	return *(u32 *)desc.ctx;</div><div class='add'>+	return crc32(crc, address, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 f2fs_crc32(struct f2fs_sb_info *sbi, const void *address,</div><div class='del'>-			   unsigned int length)</div><div class='add'>+static inline u32 f2fs_crc32(const void *address, unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	return __f2fs_crc32(sbi, F2FS_SUPER_MAGIC, address, length);</div><div class='add'>+	return __f2fs_crc32(F2FS_SUPER_MAGIC, address, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool f2fs_crc_valid(struct f2fs_sb_info *sbi, __u32 blk_crc,</div><div class='del'>-				  void *buf, size_t buf_size)</div><div class='add'>+static inline u32 f2fs_chksum(u32 crc, const void *address, unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	return f2fs_crc32(sbi, buf, buf_size) == blk_crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 f2fs_chksum(struct f2fs_sb_info *sbi, u32 crc,</div><div class='del'>-			      const void *address, unsigned int length)</div><div class='del'>-{</div><div class='del'>-	return __f2fs_crc32(sbi, crc, address, length);</div><div class='add'>+	return __f2fs_crc32(crc, address, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct f2fs_inode_info *F2FS_I(struct inode *inode)</div><div class='hunk'>@@ -1947,9 +2102,9 @@ static inline struct f2fs_sb_info *F2FS_M_SB(struct address_space *mapping)</div><div class='ctx'> 	return F2FS_I_SB(mapping-&gt;host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct f2fs_sb_info *F2FS_P_SB(struct page *page)</div><div class='add'>+static inline struct f2fs_sb_info *F2FS_F_SB(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return F2FS_M_SB(page_file_mapping(page));</div><div class='add'>+	return F2FS_M_SB(folio-&gt;mapping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct f2fs_super_block *F2FS_RAW_SUPER(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -1957,19 +2112,29 @@ static inline struct f2fs_super_block *F2FS_RAW_SUPER(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return (struct f2fs_super_block *)(sbi-&gt;raw_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct f2fs_super_block *F2FS_SUPER_BLOCK(struct folio *folio,</div><div class='add'>+								pgoff_t index)</div><div class='add'>+{</div><div class='add'>+	pgoff_t idx_in_folio = index % folio_nr_pages(folio);</div><div class='add'>+</div><div class='add'>+	return (struct f2fs_super_block *)</div><div class='add'>+		(page_address(folio_page(folio, idx_in_folio)) +</div><div class='add'>+						F2FS_SUPER_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct f2fs_checkpoint *F2FS_CKPT(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct f2fs_checkpoint *)(sbi-&gt;ckpt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct f2fs_node *F2FS_NODE(struct page *page)</div><div class='add'>+static inline struct f2fs_node *F2FS_NODE(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return (struct f2fs_node *)page_address(page);</div><div class='add'>+	return (struct f2fs_node *)folio_address(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct f2fs_inode *F2FS_INODE(struct page *page)</div><div class='add'>+static inline struct f2fs_inode *F2FS_INODE(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return &amp;((struct f2fs_node *)page_address(page))-&gt;i;</div><div class='add'>+	return &amp;((struct f2fs_node *)folio_address(folio))-&gt;i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct f2fs_nm_info *NM_I(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -2007,6 +2172,16 @@ static inline struct address_space *NODE_MAPPING(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return sbi-&gt;node_inode-&gt;i_mapping;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_meta_folio(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio-&gt;mapping == META_MAPPING(F2FS_F_SB(folio));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_node_folio(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio-&gt;mapping == NODE_MAPPING(F2FS_F_SB(folio));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool is_sbi_flag_set(struct f2fs_sb_info *sbi, unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(type, &amp;sbi-&gt;s_flag);</div><div class='hunk'>@@ -2166,6 +2341,36 @@ static inline void f2fs_up_write(struct f2fs_rwsem *sem)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void disable_nat_bits(struct f2fs_sb_info *sbi, bool lock)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned char *nat_bits;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In order to re-enable nat_bits we need to call fsck.f2fs by</div><div class='add'>+	 * set_sbi_flag(sbi, SBI_NEED_FSCK). But it may give huge cost,</div><div class='add'>+	 * so let's rely on regular fsck or unclean shutdown.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (lock)</div><div class='add'>+		spin_lock_irqsave(&amp;sbi-&gt;cp_lock, flags);</div><div class='add'>+	__clear_ckpt_flags(F2FS_CKPT(sbi), CP_NAT_BITS_FLAG);</div><div class='add'>+	nat_bits = NM_I(sbi)-&gt;nat_bits;</div><div class='add'>+	NM_I(sbi)-&gt;nat_bits = NULL;</div><div class='add'>+	if (lock)</div><div class='add'>+		spin_unlock_irqrestore(&amp;sbi-&gt;cp_lock, flags);</div><div class='add'>+</div><div class='add'>+	kvfree(nat_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool enabled_nat_bits(struct f2fs_sb_info *sbi,</div><div class='add'>+					struct cp_control *cpc)</div><div class='add'>+{</div><div class='add'>+	bool set = is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG);</div><div class='add'>+</div><div class='add'>+	return (cpc) ? (cpc-&gt;reason &amp; CP_UMOUNT) &amp;&amp; set : set;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void f2fs_lock_op(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	f2fs_down_read(&amp;sbi-&gt;cp_rwsem);</div><div class='hunk'>@@ -2230,13 +2435,11 @@ static inline bool f2fs_has_xattr_block(unsigned int ofs)</div><div class='ctx'> 	return ofs == XATTR_NODE_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi,</div><div class='add'>+static inline bool __allow_reserved_root(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					struct inode *inode, bool cap)</div><div class='ctx'> {</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return true;</div><div class='del'>-	if (!test_opt(sbi, RESERVE_ROOT))</div><div class='del'>-		return false;</div><div class='ctx'> 	if (IS_NOQUOTA(inode))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (uid_eq(F2FS_OPTION(sbi).s_resuid, current_fsuid()))</div><div class='hunk'>@@ -2249,11 +2452,32 @@ static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int get_available_block_count(struct f2fs_sb_info *sbi,</div><div class='add'>+						struct inode *inode, bool cap)</div><div class='add'>+{</div><div class='add'>+	block_t avail_user_block_count;</div><div class='add'>+</div><div class='add'>+	avail_user_block_count = sbi-&gt;user_block_count -</div><div class='add'>+					sbi-&gt;current_reserved_blocks;</div><div class='add'>+</div><div class='add'>+	if (test_opt(sbi, RESERVE_ROOT) &amp;&amp; !__allow_reserved_root(sbi, inode, cap))</div><div class='add'>+		avail_user_block_count -= F2FS_OPTION(sbi).root_reserved_blocks;</div><div class='add'>+</div><div class='add'>+	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {</div><div class='add'>+		if (avail_user_block_count &gt; sbi-&gt;unusable_block_count)</div><div class='add'>+			avail_user_block_count -= sbi-&gt;unusable_block_count;</div><div class='add'>+		else</div><div class='add'>+			avail_user_block_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return avail_user_block_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void f2fs_i_blocks_write(struct inode *, block_t, bool, bool);</div><div class='ctx'> static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,</div><div class='del'>-				 struct inode *inode, blkcnt_t *count)</div><div class='add'>+				 struct inode *inode, blkcnt_t *count, bool partial)</div><div class='ctx'> {</div><div class='del'>-	blkcnt_t diff = 0, release = 0;</div><div class='add'>+	long long diff = 0, release = 0;</div><div class='ctx'> 	block_t avail_user_block_count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2273,35 +2497,27 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	percpu_counter_add(&amp;sbi-&gt;alloc_valid_block_count, (*count));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='del'>-	sbi-&gt;total_valid_block_count += (block_t)(*count);</div><div class='del'>-	avail_user_block_count = sbi-&gt;user_block_count -</div><div class='del'>-					sbi-&gt;current_reserved_blocks;</div><div class='del'>-</div><div class='del'>-	if (!__allow_reserved_blocks(sbi, inode, true))</div><div class='del'>-		avail_user_block_count -= F2FS_OPTION(sbi).root_reserved_blocks;</div><div class='del'>-</div><div class='del'>-	if (F2FS_IO_ALIGNED(sbi))</div><div class='del'>-		avail_user_block_count -= sbi-&gt;blocks_per_seg *</div><div class='del'>-				SM_I(sbi)-&gt;additional_reserved_segments;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {</div><div class='del'>-		if (avail_user_block_count &gt; sbi-&gt;unusable_block_count)</div><div class='del'>-			avail_user_block_count -= sbi-&gt;unusable_block_count;</div><div class='del'>-		else</div><div class='del'>-			avail_user_block_count = 0;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(sbi-&gt;total_valid_block_count &gt; avail_user_block_count)) {</div><div class='del'>-		diff = sbi-&gt;total_valid_block_count - avail_user_block_count;</div><div class='add'>+	avail_user_block_count = get_available_block_count(sbi, inode, true);</div><div class='add'>+	diff = (long long)sbi-&gt;total_valid_block_count + *count -</div><div class='add'>+						avail_user_block_count;</div><div class='add'>+	if (unlikely(diff &gt; 0)) {</div><div class='add'>+		if (!partial) {</div><div class='add'>+			spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='add'>+			release = *count;</div><div class='add'>+			goto enospc;</div><div class='add'>+		}</div><div class='ctx'> 		if (diff &gt; *count)</div><div class='ctx'> 			diff = *count;</div><div class='ctx'> 		*count -= diff;</div><div class='ctx'> 		release = diff;</div><div class='del'>-		sbi-&gt;total_valid_block_count -= diff;</div><div class='ctx'> 		if (!*count) {</div><div class='ctx'> 			spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 			goto enospc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	sbi-&gt;total_valid_block_count += (block_t)(*count);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(release)) {</div><div class='hunk'>@@ -2318,21 +2534,14 @@ release_quota:</div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__printf(2, 3)</div><div class='del'>-void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...);</div><div class='del'>-</div><div class='del'>-#define f2fs_err(sbi, fmt, ...)						\</div><div class='del'>-	f2fs_printk(sbi, KERN_ERR fmt, ##__VA_ARGS__)</div><div class='del'>-#define f2fs_warn(sbi, fmt, ...)					\</div><div class='del'>-	f2fs_printk(sbi, KERN_WARNING fmt, ##__VA_ARGS__)</div><div class='del'>-#define f2fs_notice(sbi, fmt, ...)					\</div><div class='del'>-	f2fs_printk(sbi, KERN_NOTICE fmt, ##__VA_ARGS__)</div><div class='del'>-#define f2fs_info(sbi, fmt, ...)					\</div><div class='del'>-	f2fs_printk(sbi, KERN_INFO fmt, ##__VA_ARGS__)</div><div class='del'>-#define f2fs_debug(sbi, fmt, ...)					\</div><div class='del'>-	f2fs_printk(sbi, KERN_DEBUG fmt, ##__VA_ARGS__)</div><div class='del'>-</div><div class='ctx'> #define PAGE_PRIVATE_GET_FUNC(name, flagname) \</div><div class='add'>+static inline bool folio_test_f2fs_##name(const struct folio *folio)	\</div><div class='add'>+{									\</div><div class='add'>+	unsigned long priv = (unsigned long)folio-&gt;private;		\</div><div class='add'>+	unsigned long v = (1UL &lt;&lt; PAGE_PRIVATE_NOT_POINTER) |		\</div><div class='add'>+			     (1UL &lt;&lt; PAGE_PRIVATE_##flagname);		\</div><div class='add'>+	return (priv &amp; v) == v;						\</div><div class='add'>+}									\</div><div class='ctx'> static inline bool page_private_##name(struct page *page) \</div><div class='ctx'> { \</div><div class='ctx'> 	return PagePrivate(page) &amp;&amp; \</div><div class='hunk'>@@ -2341,6 +2550,17 @@ static inline bool page_private_##name(struct page *page) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PAGE_PRIVATE_SET_FUNC(name, flagname) \</div><div class='add'>+static inline void folio_set_f2fs_##name(struct folio *folio)		\</div><div class='add'>+{									\</div><div class='add'>+	unsigned long v = (1UL &lt;&lt; PAGE_PRIVATE_NOT_POINTER) |		\</div><div class='add'>+			     (1UL &lt;&lt; PAGE_PRIVATE_##flagname);		\</div><div class='add'>+	if (!folio-&gt;private)						\</div><div class='add'>+		folio_attach_private(folio, (void *)v);			\</div><div class='add'>+	else {								\</div><div class='add'>+		v |= (unsigned long)folio-&gt;private;			\</div><div class='add'>+		folio-&gt;private = (void *)v;				\</div><div class='add'>+	}								\</div><div class='add'>+}									\</div><div class='ctx'> static inline void set_page_private_##name(struct page *page) \</div><div class='ctx'> { \</div><div class='ctx'> 	if (!PagePrivate(page)) \</div><div class='hunk'>@@ -2350,6 +2570,16 @@ static inline void set_page_private_##name(struct page *page) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PAGE_PRIVATE_CLEAR_FUNC(name, flagname) \</div><div class='add'>+static inline void folio_clear_f2fs_##name(struct folio *folio)		\</div><div class='add'>+{									\</div><div class='add'>+	unsigned long v = (unsigned long)folio-&gt;private;		\</div><div class='add'>+									\</div><div class='add'>+	v &amp;= ~(1UL &lt;&lt; PAGE_PRIVATE_##flagname);				\</div><div class='add'>+	if (v == (1UL &lt;&lt; PAGE_PRIVATE_NOT_POINTER))			\</div><div class='add'>+		folio_detach_private(folio);				\</div><div class='add'>+	else								\</div><div class='add'>+		folio-&gt;private = (void *)v;				\</div><div class='add'>+}									\</div><div class='ctx'> static inline void clear_page_private_##name(struct page *page) \</div><div class='ctx'> { \</div><div class='ctx'> 	clear_bit(PAGE_PRIVATE_##flagname, &amp;page_private(page)); \</div><div class='hunk'>@@ -2360,50 +2590,35 @@ static inline void clear_page_private_##name(struct page *page) \</div><div class='ctx'> PAGE_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER);</div><div class='ctx'> PAGE_PRIVATE_GET_FUNC(inline, INLINE_INODE);</div><div class='ctx'> PAGE_PRIVATE_GET_FUNC(gcing, ONGOING_MIGRATION);</div><div class='del'>-PAGE_PRIVATE_GET_FUNC(dummy, DUMMY_WRITE);</div><div class='add'>+PAGE_PRIVATE_GET_FUNC(atomic, ATOMIC_WRITE);</div><div class='ctx'> </div><div class='ctx'> PAGE_PRIVATE_SET_FUNC(reference, REF_RESOURCE);</div><div class='ctx'> PAGE_PRIVATE_SET_FUNC(inline, INLINE_INODE);</div><div class='ctx'> PAGE_PRIVATE_SET_FUNC(gcing, ONGOING_MIGRATION);</div><div class='del'>-PAGE_PRIVATE_SET_FUNC(dummy, DUMMY_WRITE);</div><div class='add'>+PAGE_PRIVATE_SET_FUNC(atomic, ATOMIC_WRITE);</div><div class='ctx'> </div><div class='ctx'> PAGE_PRIVATE_CLEAR_FUNC(reference, REF_RESOURCE);</div><div class='ctx'> PAGE_PRIVATE_CLEAR_FUNC(inline, INLINE_INODE);</div><div class='ctx'> PAGE_PRIVATE_CLEAR_FUNC(gcing, ONGOING_MIGRATION);</div><div class='del'>-PAGE_PRIVATE_CLEAR_FUNC(dummy, DUMMY_WRITE);</div><div class='add'>+PAGE_PRIVATE_CLEAR_FUNC(atomic, ATOMIC_WRITE);</div><div class='ctx'> </div><div class='del'>-static inline unsigned long get_page_private_data(struct page *page)</div><div class='add'>+static inline unsigned long folio_get_f2fs_data(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	unsigned long data = page_private(page);</div><div class='add'>+	unsigned long data = (unsigned long)folio-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(PAGE_PRIVATE_NOT_POINTER, &amp;data))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return data &gt;&gt; PAGE_PRIVATE_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void set_page_private_data(struct page *page, unsigned long data)</div><div class='del'>-{</div><div class='del'>-	if (!PagePrivate(page))</div><div class='del'>-		attach_page_private(page, (void *)0);</div><div class='del'>-	set_bit(PAGE_PRIVATE_NOT_POINTER, &amp;page_private(page));</div><div class='del'>-	page_private(page) |= data &lt;&lt; PAGE_PRIVATE_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void clear_page_private_data(struct page *page)</div><div class='del'>-{</div><div class='del'>-	page_private(page) &amp;= GENMASK(PAGE_PRIVATE_MAX - 1, 0);</div><div class='del'>-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER))</div><div class='del'>-		detach_page_private(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void clear_page_private_all(struct page *page)</div><div class='add'>+static inline void folio_set_f2fs_data(struct folio *folio, unsigned long data)</div><div class='ctx'> {</div><div class='del'>-	clear_page_private_data(page);</div><div class='del'>-	clear_page_private_reference(page);</div><div class='del'>-	clear_page_private_gcing(page);</div><div class='del'>-	clear_page_private_inline(page);</div><div class='add'>+	data = (1UL &lt;&lt; PAGE_PRIVATE_NOT_POINTER) | (data &lt;&lt; PAGE_PRIVATE_MAX);</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(F2FS_P_SB(page), page_private(page));</div><div class='add'>+	if (!folio_test_private(folio))</div><div class='add'>+		folio_attach_private(folio, (void *)data);</div><div class='add'>+	else</div><div class='add'>+		folio-&gt;private = (void *)((unsigned long)folio-&gt;private | data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void dec_valid_block_count(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -2413,8 +2628,14 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	blkcnt_t sectors = count &lt;&lt; F2FS_LOG_SECTORS_PER_BLOCK;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='del'>-	f2fs_bug_on(sbi, sbi-&gt;total_valid_block_count &lt; (block_t) count);</div><div class='del'>-	sbi-&gt;total_valid_block_count -= (block_t)count;</div><div class='add'>+	if (unlikely(sbi-&gt;total_valid_block_count &lt; count)) {</div><div class='add'>+		f2fs_warn(sbi, "Inconsistent total_valid_block_count:%u, ino:%lu, count:%u",</div><div class='add'>+			  sbi-&gt;total_valid_block_count, inode-&gt;i_ino, count);</div><div class='add'>+		sbi-&gt;total_valid_block_count = 0;</div><div class='add'>+		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+	} else {</div><div class='add'>+		sbi-&gt;total_valid_block_count -= count;</div><div class='add'>+	}</div><div class='ctx'> 	if (sbi-&gt;reserved_blocks &amp;&amp;</div><div class='ctx'> 		sbi-&gt;current_reserved_blocks &lt; sbi-&gt;reserved_blocks)</div><div class='ctx'> 		sbi-&gt;current_reserved_blocks = min(sbi-&gt;reserved_blocks,</div><div class='hunk'>@@ -2504,11 +2725,8 @@ static inline int get_dirty_pages(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static inline int get_blocktype_secs(struct f2fs_sb_info *sbi, int block_type)</div><div class='ctx'> {</div><div class='del'>-	unsigned int pages_per_sec = sbi-&gt;segs_per_sec * sbi-&gt;blocks_per_seg;</div><div class='del'>-	unsigned int segs = (get_pages(sbi, block_type) + pages_per_sec - 1) &gt;&gt;</div><div class='del'>-						sbi-&gt;log_blocks_per_seg;</div><div class='del'>-</div><div class='del'>-	return segs / sbi-&gt;segs_per_sec;</div><div class='add'>+	return div_u64(get_pages(sbi, block_type) + BLKS_PER_SEC(sbi) - 1,</div><div class='add'>+							BLKS_PER_SEC(sbi));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline block_t valid_user_blocks(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -2572,7 +2790,7 @@ static inline block_t __start_cp_addr(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	block_t start_addr = le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;cp_blkaddr);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;cur_cp_pack == 2)</div><div class='del'>-		start_addr += sbi-&gt;blocks_per_seg;</div><div class='add'>+		start_addr += BLKS_PER_SEG(sbi);</div><div class='ctx'> 	return start_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2581,7 +2799,7 @@ static inline block_t __start_cp_next_addr(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	block_t start_addr = le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;cp_blkaddr);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;cur_cp_pack == 1)</div><div class='del'>-		start_addr += sbi-&gt;blocks_per_seg;</div><div class='add'>+		start_addr += BLKS_PER_SEG(sbi);</div><div class='ctx'> 	return start_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2600,7 +2818,8 @@ static inline int inc_valid_node_count(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					struct inode *inode, bool is_inode)</div><div class='ctx'> {</div><div class='ctx'> 	block_t	valid_block_count;</div><div class='del'>-	unsigned int valid_node_count, user_block_count;</div><div class='add'>+	unsigned int valid_node_count, avail_user_node_count;</div><div class='add'>+	unsigned int avail_user_block_count;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (is_inode) {</div><div class='hunk'>@@ -2620,27 +2839,21 @@ static inline int inc_valid_node_count(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> </div><div class='del'>-	valid_block_count = sbi-&gt;total_valid_block_count +</div><div class='del'>-					sbi-&gt;current_reserved_blocks + 1;</div><div class='add'>+	valid_block_count = sbi-&gt;total_valid_block_count + 1;</div><div class='add'>+	avail_user_block_count = get_available_block_count(sbi, inode,</div><div class='add'>+			test_opt(sbi, RESERVE_NODE));</div><div class='ctx'> </div><div class='del'>-	if (!__allow_reserved_blocks(sbi, inode, false))</div><div class='del'>-		valid_block_count += F2FS_OPTION(sbi).root_reserved_blocks;</div><div class='del'>-</div><div class='del'>-	if (F2FS_IO_ALIGNED(sbi))</div><div class='del'>-		valid_block_count += sbi-&gt;blocks_per_seg *</div><div class='del'>-				SM_I(sbi)-&gt;additional_reserved_segments;</div><div class='del'>-</div><div class='del'>-	user_block_count = sbi-&gt;user_block_count;</div><div class='del'>-	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED)))</div><div class='del'>-		user_block_count -= sbi-&gt;unusable_block_count;</div><div class='del'>-</div><div class='del'>-	if (unlikely(valid_block_count &gt; user_block_count)) {</div><div class='add'>+	if (unlikely(valid_block_count &gt; avail_user_block_count)) {</div><div class='ctx'> 		spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 		goto enospc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	avail_user_node_count = sbi-&gt;total_node_count - F2FS_RESERVED_NODE_NUM;</div><div class='add'>+	if (test_opt(sbi, RESERVE_NODE) &amp;&amp;</div><div class='add'>+			!__allow_reserved_root(sbi, inode, true))</div><div class='add'>+		avail_user_node_count -= F2FS_OPTION(sbi).root_reserved_nodes;</div><div class='ctx'> 	valid_node_count = sbi-&gt;total_valid_node_count + 1;</div><div class='del'>-	if (unlikely(valid_node_count &gt; sbi-&gt;total_node_count)) {</div><div class='add'>+	if (unlikely(valid_node_count &gt; avail_user_node_count)) {</div><div class='ctx'> 		spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 		goto enospc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2725,65 +2938,75 @@ static inline s64 valid_inode_count(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return percpu_counter_sum_positive(&amp;sbi-&gt;total_valid_inode_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *f2fs_grab_cache_page(struct address_space *mapping,</div><div class='del'>-						pgoff_t index, bool for_write)</div><div class='add'>+static inline struct folio *f2fs_grab_cache_folio(struct address_space *mapping,</div><div class='add'>+		pgoff_t index, bool for_write)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_F2FS_FAULT_INJECTION)) {</div><div class='add'>+		fgf_t fgf_flags;</div><div class='add'>+</div><div class='ctx'> 		if (!for_write)</div><div class='del'>-			page = find_get_page_flags(mapping, index,</div><div class='del'>-							FGP_LOCK | FGP_ACCESSED);</div><div class='add'>+			fgf_flags = FGP_LOCK | FGP_ACCESSED;</div><div class='ctx'> 		else</div><div class='del'>-			page = find_lock_page(mapping, index);</div><div class='del'>-		if (page)</div><div class='del'>-			return page;</div><div class='add'>+			fgf_flags = FGP_LOCK;</div><div class='add'>+		folio = __filemap_get_folio(mapping, index, fgf_flags, 0);</div><div class='add'>+		if (!IS_ERR(folio))</div><div class='add'>+			return folio;</div><div class='ctx'> </div><div class='ctx'> 		if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC))</div><div class='del'>-			return NULL;</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!for_write)</div><div class='del'>-		return grab_cache_page(mapping, index);</div><div class='add'>+		return filemap_grab_folio(mapping, index);</div><div class='ctx'> </div><div class='ctx'> 	flags = memalloc_nofs_save();</div><div class='del'>-	page = grab_cache_page_write_begin(mapping, index);</div><div class='add'>+	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='ctx'> 	memalloc_nofs_restore(flags);</div><div class='ctx'> </div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *f2fs_pagecache_get_page(</div><div class='add'>+static inline struct folio *f2fs_filemap_get_folio(</div><div class='ctx'> 				struct address_space *mapping, pgoff_t index,</div><div class='ctx'> 				fgf_t fgp_flags, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_GET))</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	return pagecache_get_page(mapping, index, fgp_flags, gfp_mask);</div><div class='add'>+	return __filemap_get_folio(mapping, index, fgp_flags, gfp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void f2fs_put_page(struct page *page, int unlock)</div><div class='add'>+static inline void f2fs_folio_put(struct folio *folio, bool unlock)</div><div class='ctx'> {</div><div class='del'>-	if (!page)</div><div class='add'>+	if (IS_ERR_OR_NULL(folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (unlock) {</div><div class='del'>-		f2fs_bug_on(F2FS_P_SB(page), !PageLocked(page));</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		f2fs_bug_on(F2FS_F_SB(folio), !folio_test_locked(folio));</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void f2fs_put_page(struct page *page, bool unlock)</div><div class='add'>+{</div><div class='add'>+	if (!page)</div><div class='add'>+		return;</div><div class='add'>+	f2fs_folio_put(page_folio(page), unlock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void f2fs_put_dnode(struct dnode_of_data *dn)</div><div class='ctx'> {</div><div class='del'>-	if (dn-&gt;node_page)</div><div class='del'>-		f2fs_put_page(dn-&gt;node_page, 1);</div><div class='del'>-	if (dn-&gt;inode_page &amp;&amp; dn-&gt;node_page != dn-&gt;inode_page)</div><div class='del'>-		f2fs_put_page(dn-&gt;inode_page, 0);</div><div class='del'>-	dn-&gt;node_page = NULL;</div><div class='del'>-	dn-&gt;inode_page = NULL;</div><div class='add'>+	if (dn-&gt;node_folio)</div><div class='add'>+		f2fs_folio_put(dn-&gt;node_folio, true);</div><div class='add'>+	if (dn-&gt;inode_folio &amp;&amp; dn-&gt;node_folio != dn-&gt;inode_folio)</div><div class='add'>+		f2fs_folio_put(dn-&gt;inode_folio, false);</div><div class='add'>+	dn-&gt;node_folio = NULL;</div><div class='add'>+	dn-&gt;inode_folio = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct kmem_cache *f2fs_kmem_cache_create(const char *name,</div><div class='hunk'>@@ -2834,12 +3057,22 @@ static inline bool is_inflight_io(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_inflight_read_io(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	return get_pages(sbi, F2FS_RD_DATA) || get_pages(sbi, F2FS_DIO_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool is_idle(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> {</div><div class='add'>+	bool zoned_gc = (type == GC_TIME &amp;&amp;</div><div class='add'>+			F2FS_HAS_FEATURE(sbi, F2FS_FEATURE_BLKZONED));</div><div class='add'>+</div><div class='ctx'> 	if (sbi-&gt;gc_mode == GC_URGENT_HIGH)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (is_inflight_io(sbi, type))</div><div class='add'>+	if (sbi-&gt;bggc_io_aware == AWARE_READ_IO &amp;&amp; is_inflight_read_io(sbi))</div><div class='add'>+		return false;</div><div class='add'>+	if (sbi-&gt;bggc_io_aware == AWARE_ALL_IO &amp;&amp; is_inflight_io(sbi, type))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;gc_mode == GC_URGENT_MID)</div><div class='hunk'>@@ -2849,6 +3082,9 @@ static inline bool is_idle(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 			(type == DISCARD_TIME || type == GC_TIME))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='add'>+	if (zoned_gc)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	return f2fs_time_over(sbi, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2861,9 +3097,9 @@ static inline void f2fs_radix_tree_insert(struct radix_tree_root *root,</div><div class='ctx'> </div><div class='ctx'> #define RAW_IS_INODE(p)	((p)-&gt;footer.nid == (p)-&gt;footer.ino)</div><div class='ctx'> </div><div class='del'>-static inline bool IS_INODE(struct page *page)</div><div class='add'>+static inline bool IS_INODE(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *p = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_node *p = F2FS_NODE(folio);</div><div class='ctx'> </div><div class='ctx'> 	return RAW_IS_INODE(p);</div><div class='ctx'> }</div><div class='hunk'>@@ -2880,31 +3116,32 @@ static inline __le32 *blkaddr_in_node(struct f2fs_node *node)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int f2fs_has_extra_attr(struct inode *inode);</div><div class='del'>-static inline block_t data_blkaddr(struct inode *inode,</div><div class='del'>-			struct page *node_page, unsigned int offset)</div><div class='add'>+static inline unsigned int get_dnode_base(struct inode *inode,</div><div class='add'>+					struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *raw_node;</div><div class='del'>-	__le32 *addr_array;</div><div class='del'>-	int base = 0;</div><div class='del'>-	bool is_inode = IS_INODE(node_page);</div><div class='add'>+	if (!IS_INODE(node_folio))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	raw_node = F2FS_NODE(node_page);</div><div class='add'>+	return inode ? get_extra_isize(inode) :</div><div class='add'>+			offset_in_addr(&amp;F2FS_NODE(node_folio)-&gt;i);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (is_inode) {</div><div class='del'>-		if (!inode)</div><div class='del'>-			/* from GC path only */</div><div class='del'>-			base = offset_in_addr(&amp;raw_node-&gt;i);</div><div class='del'>-		else if (f2fs_has_extra_attr(inode))</div><div class='del'>-			base = get_extra_isize(inode);</div><div class='del'>-	}</div><div class='add'>+static inline __le32 *get_dnode_addr(struct inode *inode,</div><div class='add'>+					struct folio *node_folio)</div><div class='add'>+{</div><div class='add'>+	return blkaddr_in_node(F2FS_NODE(node_folio)) +</div><div class='add'>+			get_dnode_base(inode, node_folio);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	addr_array = blkaddr_in_node(raw_node);</div><div class='del'>-	return le32_to_cpu(addr_array[base + offset]);</div><div class='add'>+static inline block_t data_blkaddr(struct inode *inode,</div><div class='add'>+			struct folio *node_folio, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(*(get_dnode_addr(inode, node_folio) + offset));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline block_t f2fs_data_blkaddr(struct dnode_of_data *dn)</div><div class='ctx'> {</div><div class='del'>-	return data_blkaddr(dn-&gt;inode, dn-&gt;node_page, dn-&gt;ofs_in_node);</div><div class='add'>+	return data_blkaddr(dn-&gt;inode, dn-&gt;node_folio, dn-&gt;ofs_in_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int f2fs_test_bit(unsigned int nr, char *addr)</div><div class='hunk'>@@ -2981,6 +3218,7 @@ static inline void f2fs_change_bit(unsigned int nr, char *addr)</div><div class='ctx'> #define F2FS_DIRSYNC_FL			0x00010000 /* dirsync behaviour (directories only) */</div><div class='ctx'> #define F2FS_PROJINHERIT_FL		0x20000000 /* Create with parents projid */</div><div class='ctx'> #define F2FS_CASEFOLD_FL		0x40000000 /* Casefolded file */</div><div class='add'>+#define F2FS_DEVICE_ALIAS_FL		0x80000000 /* File for aliasing a device */</div><div class='ctx'> </div><div class='ctx'> #define F2FS_QUOTA_DEFAULT_FL		(F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL)</div><div class='ctx'> </div><div class='hunk'>@@ -2996,6 +3234,8 @@ static inline void f2fs_change_bit(unsigned int nr, char *addr)</div><div class='ctx'> /* Flags that are appropriate for non-directories/regular files. */</div><div class='ctx'> #define F2FS_OTHER_FLMASK	(F2FS_NODUMP_FL | F2FS_NOATIME_FL)</div><div class='ctx'> </div><div class='add'>+#define IS_DEVICE_ALIASING(inode)	(F2FS_I(inode)-&gt;i_flags &amp; F2FS_DEVICE_ALIAS_FL)</div><div class='add'>+</div><div class='ctx'> static inline __u32 f2fs_mask_flags(umode_t mode, __u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (S_ISDIR(mode))</div><div class='hunk'>@@ -3018,7 +3258,6 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,</div><div class='ctx'> 			return;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case FI_DATA_EXIST:</div><div class='del'>-	case FI_INLINE_DOTS:</div><div class='ctx'> 	case FI_PIN_FILE:</div><div class='ctx'> 	case FI_COMPRESS_RELEASED:</div><div class='ctx'> 		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='hunk'>@@ -3114,7 +3353,7 @@ static inline void f2fs_i_depth_write(struct inode *inode, unsigned int depth)</div><div class='ctx'> static inline void f2fs_i_gc_failures_write(struct inode *inode,</div><div class='ctx'> 					unsigned int count)</div><div class='ctx'> {</div><div class='del'>-	F2FS_I(inode)-&gt;i_gc_failures[GC_FAILURE_PIN] = count;</div><div class='add'>+	F2FS_I(inode)-&gt;i_gc_failures = count;</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3142,8 +3381,6 @@ static inline void get_inline_info(struct inode *inode, struct f2fs_inode *ri)</div><div class='ctx'> 		set_bit(FI_INLINE_DENTRY, fi-&gt;flags);</div><div class='ctx'> 	if (ri-&gt;i_inline &amp; F2FS_DATA_EXIST)</div><div class='ctx'> 		set_bit(FI_DATA_EXIST, fi-&gt;flags);</div><div class='del'>-	if (ri-&gt;i_inline &amp; F2FS_INLINE_DOTS)</div><div class='del'>-		set_bit(FI_INLINE_DOTS, fi-&gt;flags);</div><div class='ctx'> 	if (ri-&gt;i_inline &amp; F2FS_EXTRA_ATTR)</div><div class='ctx'> 		set_bit(FI_EXTRA_ATTR, fi-&gt;flags);</div><div class='ctx'> 	if (ri-&gt;i_inline &amp; F2FS_PIN_FILE)</div><div class='hunk'>@@ -3164,8 +3401,6 @@ static inline void set_raw_inline(struct inode *inode, struct f2fs_inode *ri)</div><div class='ctx'> 		ri-&gt;i_inline |= F2FS_INLINE_DENTRY;</div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_DATA_EXIST))</div><div class='ctx'> 		ri-&gt;i_inline |= F2FS_DATA_EXIST;</div><div class='del'>-	if (is_inode_flag_set(inode, FI_INLINE_DOTS))</div><div class='del'>-		ri-&gt;i_inline |= F2FS_INLINE_DOTS;</div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_EXTRA_ATTR))</div><div class='ctx'> 		ri-&gt;i_inline |= F2FS_EXTRA_ATTR;</div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_PIN_FILE))</div><div class='hunk'>@@ -3206,26 +3441,21 @@ static inline bool f2fs_need_compress_data(struct inode *inode)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int addrs_per_inode(struct inode *inode)</div><div class='add'>+static inline unsigned int addrs_per_page(struct inode *inode,</div><div class='add'>+							bool is_inode)</div><div class='ctx'> {</div><div class='del'>-	unsigned int addrs = CUR_ADDRS_PER_INODE(inode) -</div><div class='del'>-				get_inline_xattr_addrs(inode);</div><div class='del'>-</div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='del'>-		return addrs;</div><div class='del'>-	return ALIGN_DOWN(addrs, F2FS_I(inode)-&gt;i_cluster_size);</div><div class='del'>-}</div><div class='add'>+	unsigned int addrs = is_inode ? (CUR_ADDRS_PER_INODE(inode) -</div><div class='add'>+			get_inline_xattr_addrs(inode)) : DEF_ADDRS_PER_BLOCK;</div><div class='ctx'> </div><div class='del'>-static inline unsigned int addrs_per_block(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='del'>-		return DEF_ADDRS_PER_BLOCK;</div><div class='del'>-	return ALIGN_DOWN(DEF_ADDRS_PER_BLOCK, F2FS_I(inode)-&gt;i_cluster_size);</div><div class='add'>+	if (f2fs_compressed_file(inode))</div><div class='add'>+		return ALIGN_DOWN(addrs, F2FS_I(inode)-&gt;i_cluster_size);</div><div class='add'>+	return addrs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *inline_xattr_addr(struct inode *inode, struct page *page)</div><div class='add'>+static inline</div><div class='add'>+void *inline_xattr_addr(struct inode *inode, const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_inode *ri = F2FS_INODE(page);</div><div class='add'>+	struct f2fs_inode *ri = F2FS_INODE(folio);</div><div class='ctx'> </div><div class='ctx'> 	return (void *)&amp;(ri-&gt;i_addr[DEF_ADDRS_PER_INODE -</div><div class='ctx'> 					get_inline_xattr_addrs(inode)]);</div><div class='hunk'>@@ -3240,7 +3470,7 @@ static inline int inline_xattr_size(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Notice: check inline_data flag without inode page lock is unsafe.</div><div class='del'>- * It could change at any time by f2fs_convert_inline_page().</div><div class='add'>+ * It could change at any time by f2fs_convert_inline_folio().</div><div class='ctx'>  */</div><div class='ctx'> static inline int f2fs_has_inline_data(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -3252,11 +3482,6 @@ static inline int f2fs_exist_data(struct inode *inode)</div><div class='ctx'> 	return is_inode_flag_set(inode, FI_DATA_EXIST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int f2fs_has_inline_dots(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return is_inode_flag_set(inode, FI_INLINE_DOTS);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int f2fs_is_mmap_file(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return is_inode_flag_set(inode, FI_MMAP_FILE);</div><div class='hunk'>@@ -3277,11 +3502,9 @@ static inline bool f2fs_is_cow_file(struct inode *inode)</div><div class='ctx'> 	return is_inode_flag_set(inode, FI_COW_FILE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __le32 *get_dnode_addr(struct inode *inode,</div><div class='del'>-					struct page *node_page);</div><div class='del'>-static inline void *inline_data_addr(struct inode *inode, struct page *page)</div><div class='add'>+static inline void *inline_data_addr(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	__le32 *addr = get_dnode_addr(inode, page);</div><div class='add'>+	__le32 *addr = get_dnode_addr(inode, folio);</div><div class='ctx'> </div><div class='ctx'> 	return (void *)(addr + DEF_INLINE_RESERVED_SIZE);</div><div class='ctx'> }</div><div class='hunk'>@@ -3364,17 +3587,6 @@ static inline bool f2fs_cp_error(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return is_set_ckpt_flags(sbi, CP_ERROR_FLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_dot_dotdot(const u8 *name, size_t len)</div><div class='del'>-{</div><div class='del'>-	if (len == 1 &amp;&amp; name[0] == '.')</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	if (len == 2 &amp;&amp; name[0] == '.' &amp;&amp; name[1] == '.')</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					size_t size, gfp_t flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -3418,6 +3630,14 @@ static inline void *f2fs_kvzalloc(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	return f2fs_kvmalloc(sbi, size, flags | __GFP_ZERO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void *f2fs_vmalloc(struct f2fs_sb_info *sbi, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (time_to_inject(sbi, FAULT_VMALLOC))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return vmalloc(size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int get_extra_isize(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return F2FS_I(inode)-&gt;i_extra_isize / sizeof(__le32);</div><div class='hunk'>@@ -3428,17 +3648,6 @@ static inline int get_inline_xattr_addrs(struct inode *inode)</div><div class='ctx'> 	return F2FS_I(inode)-&gt;i_inline_xattr_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __le32 *get_dnode_addr(struct inode *inode,</div><div class='del'>-					struct page *node_page)</div><div class='del'>-{</div><div class='del'>-	int base = 0;</div><div class='del'>-</div><div class='del'>-	if (IS_INODE(node_page) &amp;&amp; f2fs_has_extra_attr(inode))</div><div class='del'>-		base = get_extra_isize(inode);</div><div class='del'>-</div><div class='del'>-	return blkaddr_in_node(F2FS_NODE(node_page)) + base;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define f2fs_get_inode_mode(i) \</div><div class='ctx'> 	((is_inode_flag_set(i, FI_ACL_MODE)) ? \</div><div class='ctx'> 	 (F2FS_I(i)-&gt;i_acl_mode) : ((i)-&gt;i_mode))</div><div class='hunk'>@@ -3455,7 +3664,7 @@ static inline __le32 *get_dnode_addr(struct inode *inode,</div><div class='ctx'> 		sizeof((f2fs_inode)-&gt;field))			\</div><div class='ctx'> 		&lt;= (F2FS_OLD_ATTRIBUTE_SIZE + (extra_isize)))	\</div><div class='ctx'> </div><div class='del'>-#define __is_large_section(sbi)		((sbi)-&gt;segs_per_sec &gt; 1)</div><div class='add'>+#define __is_large_section(sbi)		(SEGS_PER_SEC(sbi) &gt; 1)</div><div class='ctx'> </div><div class='ctx'> #define __is_meta_io(fio) (PAGE_TYPE_OF_BIO((fio)-&gt;type) == META)</div><div class='ctx'> </div><div class='hunk'>@@ -3464,11 +3673,9 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> static inline void verify_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					block_t blkaddr, int type)</div><div class='ctx'> {</div><div class='del'>-	if (!f2fs_is_valid_blkaddr(sbi, blkaddr, type)) {</div><div class='add'>+	if (!f2fs_is_valid_blkaddr(sbi, blkaddr, type))</div><div class='ctx'> 		f2fs_err(sbi, "invalid blkaddr: %u, type: %d, run fsck to fix.",</div><div class='ctx'> 			 blkaddr, type);</div><div class='del'>-		f2fs_bug_on(sbi, 1);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool __is_valid_data_blkaddr(block_t blkaddr)</div><div class='hunk'>@@ -3492,10 +3699,12 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		 struct iattr *attr);</div><div class='ctx'> int f2fs_truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end);</div><div class='ctx'> void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count);</div><div class='add'>+int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag,</div><div class='add'>+						bool readonly, bool need_lock);</div><div class='ctx'> int f2fs_precache_extents(struct inode *inode);</div><div class='del'>-int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int f2fs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int f2fs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);</div><div class='ctx'> long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='ctx'> int f2fs_transfer_project_quota(struct inode *inode, kprojid_t kprojid);</div><div class='hunk'>@@ -3505,14 +3714,15 @@ int f2fs_pin_file_control(struct inode *inode, bool inc);</div><div class='ctx'>  * inode.c</div><div class='ctx'>  */</div><div class='ctx'> void f2fs_set_inode_flags(struct inode *inode);</div><div class='del'>-bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page);</div><div class='del'>-void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct page *page);</div><div class='add'>+bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio);</div><div class='add'>+void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct folio *folio);</div><div class='ctx'> struct inode *f2fs_iget(struct super_block *sb, unsigned long ino);</div><div class='ctx'> struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino);</div><div class='ctx'> int f2fs_try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink);</div><div class='del'>-void f2fs_update_inode(struct inode *inode, struct page *node_page);</div><div class='add'>+void f2fs_update_inode(struct inode *inode, struct folio *node_folio);</div><div class='ctx'> void f2fs_update_inode_page(struct inode *inode);</div><div class='ctx'> int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc);</div><div class='add'>+void f2fs_remove_donate_inode(struct inode *inode);</div><div class='ctx'> void f2fs_evict_inode(struct inode *inode);</div><div class='ctx'> void f2fs_handle_failed_inode(struct inode *inode);</div><div class='ctx'> </div><div class='hunk'>@@ -3528,36 +3738,50 @@ int f2fs_get_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> /*</div><div class='ctx'>  * dir.c</div><div class='ctx'>  */</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> int f2fs_init_casefolded_name(const struct inode *dir,</div><div class='ctx'> 			      struct f2fs_filename *fname);</div><div class='add'>+void f2fs_free_casefolded_name(struct f2fs_filename *fname);</div><div class='add'>+#else</div><div class='add'>+static inline int f2fs_init_casefolded_name(const struct inode *dir,</div><div class='add'>+					    struct f2fs_filename *fname)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void f2fs_free_casefolded_name(struct f2fs_filename *fname)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_UNICODE */</div><div class='add'>+</div><div class='ctx'> int f2fs_setup_filename(struct inode *dir, const struct qstr *iname,</div><div class='ctx'> 			int lookup, struct f2fs_filename *fname);</div><div class='ctx'> int f2fs_prepare_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			struct f2fs_filename *fname);</div><div class='ctx'> void f2fs_free_filename(struct f2fs_filename *fname);</div><div class='ctx'> struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d,</div><div class='del'>-			const struct f2fs_filename *fname, int *max_slots);</div><div class='add'>+			const struct f2fs_filename *fname, int *max_slots,</div><div class='add'>+			bool use_hash);</div><div class='ctx'> int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,</div><div class='ctx'> 			unsigned int start_pos, struct fscrypt_str *fstr);</div><div class='ctx'> void f2fs_do_make_empty_dir(struct inode *inode, struct inode *parent,</div><div class='ctx'> 			struct f2fs_dentry_ptr *d);</div><div class='del'>-struct page *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,</div><div class='del'>-			const struct f2fs_filename *fname, struct page *dpage);</div><div class='add'>+struct folio *f2fs_init_inode_metadata(struct inode *inode, struct inode *dir,</div><div class='add'>+		const struct f2fs_filename *fname, struct folio *dfolio);</div><div class='ctx'> void f2fs_update_parent_metadata(struct inode *dir, struct inode *inode,</div><div class='ctx'> 			unsigned int current_depth);</div><div class='ctx'> int f2fs_room_for_filename(const void *bitmap, int slots, int max_slots);</div><div class='ctx'> void f2fs_drop_nlink(struct inode *dir, struct inode *inode);</div><div class='ctx'> struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,</div><div class='del'>-					 const struct f2fs_filename *fname,</div><div class='del'>-					 struct page **res_page);</div><div class='add'>+		const struct f2fs_filename *fname, struct folio **res_folio);</div><div class='ctx'> struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir,</div><div class='del'>-			const struct qstr *child, struct page **res_page);</div><div class='del'>-struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p);</div><div class='add'>+			const struct qstr *child, struct folio **res_folio);</div><div class='add'>+struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct folio **f);</div><div class='ctx'> ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,</div><div class='del'>-			struct page **page);</div><div class='add'>+			struct folio **folio);</div><div class='ctx'> void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,</div><div class='del'>-			struct page *page, struct inode *inode);</div><div class='del'>-bool f2fs_has_enough_room(struct inode *dir, struct page *ipage,</div><div class='add'>+			struct folio *folio, struct inode *inode);</div><div class='add'>+bool f2fs_has_enough_room(struct inode *dir, struct folio *ifolio,</div><div class='ctx'> 			  const struct f2fs_filename *fname);</div><div class='ctx'> void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *d,</div><div class='ctx'> 			const struct fscrypt_str *name, f2fs_hash_t name_hash,</div><div class='hunk'>@@ -3568,9 +3792,10 @@ int f2fs_add_dentry(struct inode *dir, const struct f2fs_filename *fname,</div><div class='ctx'> 			struct inode *inode, nid_t ino, umode_t mode);</div><div class='ctx'> int f2fs_do_add_link(struct inode *dir, const struct qstr *name,</div><div class='ctx'> 			struct inode *inode, nid_t ino, umode_t mode);</div><div class='del'>-void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='add'>+void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct folio *folio,</div><div class='ctx'> 			struct inode *dir, struct inode *inode);</div><div class='del'>-int f2fs_do_tmpfile(struct inode *inode, struct inode *dir);</div><div class='add'>+int f2fs_do_tmpfile(struct inode *inode, struct inode *dir,</div><div class='add'>+					struct f2fs_filename *fname);</div><div class='ctx'> bool f2fs_empty_dir(struct inode *dir);</div><div class='ctx'> </div><div class='ctx'> static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode)</div><div class='hunk'>@@ -3588,14 +3813,12 @@ int f2fs_inode_dirtied(struct inode *inode, bool sync);</div><div class='ctx'> void f2fs_inode_synced(struct inode *inode);</div><div class='ctx'> int f2fs_dquot_initialize(struct inode *inode);</div><div class='ctx'> int f2fs_enable_quota_files(struct f2fs_sb_info *sbi, bool rdonly);</div><div class='del'>-int f2fs_quota_sync(struct super_block *sb, int type);</div><div class='add'>+int f2fs_do_quota_sync(struct super_block *sb, int type);</div><div class='ctx'> loff_t max_file_blocks(struct inode *inode);</div><div class='ctx'> void f2fs_quota_off_umount(struct super_block *sb);</div><div class='ctx'> void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag);</div><div class='del'>-void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,</div><div class='del'>-							bool irq_context);</div><div class='add'>+void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason);</div><div class='ctx'> void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error);</div><div class='del'>-void f2fs_handle_error_async(struct f2fs_sb_info *sbi, unsigned char error);</div><div class='ctx'> int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover);</div><div class='ctx'> int f2fs_sync_fs(struct super_block *sb, int sync);</div><div class='ctx'> int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi);</div><div class='hunk'>@@ -3609,12 +3832,13 @@ void f2fs_hash_filename(const struct inode *dir, struct f2fs_filename *fname);</div><div class='ctx'>  * node.c</div><div class='ctx'>  */</div><div class='ctx'> struct node_info;</div><div class='add'>+enum node_type;</div><div class='ctx'> </div><div class='ctx'> int f2fs_check_nid_range(struct f2fs_sb_info *sbi, nid_t nid);</div><div class='ctx'> bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type);</div><div class='del'>-bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct page *page);</div><div class='add'>+bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct folio *folio);</div><div class='ctx'> void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi);</div><div class='del'>-void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct page *page);</div><div class='add'>+void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct folio *folio);</div><div class='ctx'> void f2fs_reset_fsync_node_info(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_need_dentry_mark(struct f2fs_sb_info *sbi, nid_t nid);</div><div class='ctx'> bool f2fs_is_checkpointed_node(struct f2fs_sb_info *sbi, nid_t nid);</div><div class='hunk'>@@ -3627,14 +3851,15 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from);</div><div class='ctx'> int f2fs_truncate_xattr_node(struct inode *inode);</div><div class='ctx'> int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					unsigned int seq_id);</div><div class='del'>-bool f2fs_nat_bitmap_enabled(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_remove_inode_page(struct inode *inode);</div><div class='del'>-struct page *f2fs_new_inode_page(struct inode *inode);</div><div class='del'>-struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs);</div><div class='add'>+struct folio *f2fs_new_inode_folio(struct inode *inode);</div><div class='add'>+struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs);</div><div class='ctx'> void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid);</div><div class='del'>-struct page *f2fs_get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid);</div><div class='del'>-struct page *f2fs_get_node_page_ra(struct page *parent, int start);</div><div class='del'>-int f2fs_move_node_page(struct page *node_page, int gc_type);</div><div class='add'>+struct folio *f2fs_get_node_folio(struct f2fs_sb_info *sbi, pgoff_t nid,</div><div class='add'>+						enum node_type node_type);</div><div class='add'>+struct folio *f2fs_get_inode_folio(struct f2fs_sb_info *sbi, pgoff_t ino);</div><div class='add'>+struct folio *f2fs_get_xnode_folio(struct f2fs_sb_info *sbi, pgoff_t xnid);</div><div class='add'>+int f2fs_move_node_folio(struct folio *node_folio, int gc_type);</div><div class='ctx'> void f2fs_flush_inline_data(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,</div><div class='ctx'> 			struct writeback_control *wbc, bool atomic,</div><div class='hunk'>@@ -3647,12 +3872,11 @@ bool f2fs_alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid);</div><div class='ctx'> void f2fs_alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid);</div><div class='ctx'> void f2fs_alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid);</div><div class='ctx'> int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink);</div><div class='del'>-int f2fs_recover_inline_xattr(struct inode *inode, struct page *page);</div><div class='del'>-int f2fs_recover_xattr_data(struct inode *inode, struct page *page);</div><div class='del'>-int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);</div><div class='add'>+int f2fs_recover_inline_xattr(struct inode *inode, struct folio *folio);</div><div class='add'>+int f2fs_recover_xattr_data(struct inode *inode, struct folio *folio);</div><div class='add'>+int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct folio *folio);</div><div class='ctx'> int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			unsigned int segno, struct f2fs_summary_block *sum);</div><div class='del'>-void f2fs_enable_nat_bits(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);</div><div class='ctx'> int f2fs_build_node_manager(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_destroy_node_manager(struct f2fs_sb_info *sbi);</div><div class='hunk'>@@ -3671,7 +3895,8 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino);</div><div class='ctx'> int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_flush_device_cache(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free);</div><div class='del'>-void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr);</div><div class='add'>+void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr,</div><div class='add'>+						unsigned int len);</div><div class='ctx'> bool f2fs_is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);</div><div class='ctx'> int f2fs_start_discard_thread(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_drop_discard_cmd(struct f2fs_sb_info *sbi);</div><div class='hunk'>@@ -3685,22 +3910,22 @@ int f2fs_disable_cp_again(struct f2fs_sb_info *sbi, block_t unusable);</div><div class='ctx'> void f2fs_release_discard_addrs(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);</div><div class='ctx'> bool f2fs_segment_has_free_slot(struct f2fs_sb_info *sbi, int segno);</div><div class='del'>-void f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi);</div><div class='add'>+int f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi);</div><div class='add'>+int f2fs_reinit_atgc_curseg(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_restore_inmem_curseg(struct f2fs_sb_info *sbi);</div><div class='del'>-void f2fs_get_new_segment(struct f2fs_sb_info *sbi,</div><div class='del'>-			unsigned int *newseg, bool new_sec, int dir);</div><div class='del'>-void f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,</div><div class='add'>+int f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 					unsigned int start, unsigned int end);</div><div class='del'>-void f2fs_allocate_new_section(struct f2fs_sb_info *sbi, int type, bool force);</div><div class='del'>-void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi);</div><div class='add'>+int f2fs_allocate_new_section(struct f2fs_sb_info *sbi, int type, bool force);</div><div class='add'>+int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi);</div><div class='add'>+int f2fs_allocate_new_segments(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range);</div><div class='ctx'> bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					struct cp_control *cpc);</div><div class='del'>-struct page *f2fs_get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno);</div><div class='add'>+struct folio *f2fs_get_sum_folio(struct f2fs_sb_info *sbi, unsigned int segno);</div><div class='ctx'> void f2fs_update_meta_page(struct f2fs_sb_info *sbi, void *src,</div><div class='ctx'> 					block_t blk_addr);</div><div class='del'>-void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='add'>+void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='ctx'> 						enum iostat_type io_type);</div><div class='ctx'> void f2fs_do_write_node_page(unsigned int nid, struct f2fs_io_info *fio);</div><div class='ctx'> void f2fs_outplace_write_data(struct dnode_of_data *dn,</div><div class='hunk'>@@ -3714,14 +3939,18 @@ void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn,</div><div class='ctx'> 			block_t old_addr, block_t new_addr,</div><div class='ctx'> 			unsigned char version, bool recover_curseg,</div><div class='ctx'> 			bool recover_newaddr);</div><div class='del'>-void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='add'>+enum temp_type f2fs_get_segment_temp(struct f2fs_sb_info *sbi,</div><div class='add'>+						enum log_type seg_type);</div><div class='add'>+int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='ctx'> 			block_t old_blkaddr, block_t *new_blkaddr,</div><div class='ctx'> 			struct f2fs_summary *sum, int type,</div><div class='ctx'> 			struct f2fs_io_info *fio);</div><div class='ctx'> void f2fs_update_device_state(struct f2fs_sb_info *sbi, nid_t ino,</div><div class='ctx'> 					block_t blkaddr, unsigned int blkcnt);</div><div class='del'>-void f2fs_wait_on_page_writeback(struct page *page,</div><div class='del'>-			enum page_type type, bool ordered, bool locked);</div><div class='add'>+void f2fs_folio_wait_writeback(struct folio *folio, enum page_type type,</div><div class='add'>+		bool ordered, bool locked);</div><div class='add'>+#define f2fs_wait_on_page_writeback(page, type, ordered, locked)	\</div><div class='add'>+		f2fs_folio_wait_writeback(page_folio(page), type, ordered, locked)</div><div class='ctx'> void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr);</div><div class='ctx'> void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,</div><div class='ctx'> 								block_t len);</div><div class='hunk'>@@ -3730,17 +3959,24 @@ void f2fs_write_node_summaries(struct f2fs_sb_info *sbi, block_t start_blk);</div><div class='ctx'> int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type,</div><div class='ctx'> 			unsigned int val, int alloc);</div><div class='ctx'> void f2fs_flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);</div><div class='del'>-int f2fs_fix_curseg_write_pointer(struct f2fs_sb_info *sbi);</div><div class='del'>-int f2fs_check_write_pointer(struct f2fs_sb_info *sbi);</div><div class='add'>+int f2fs_check_and_fix_write_pointer(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_build_segment_manager(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_destroy_segment_manager(struct f2fs_sb_info *sbi);</div><div class='ctx'> int __init f2fs_create_segment_manager_caches(void);</div><div class='ctx'> void f2fs_destroy_segment_manager_caches(void);</div><div class='del'>-int f2fs_rw_hint_to_seg_type(enum rw_hint hint);</div><div class='del'>-unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,</div><div class='del'>-			unsigned int segno);</div><div class='add'>+int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint);</div><div class='add'>+enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi,</div><div class='add'>+			enum page_type type, enum temp_type temp);</div><div class='add'>+unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi);</div><div class='ctx'> unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			unsigned int segno);</div><div class='add'>+unsigned long long f2fs_get_section_mtime(struct f2fs_sb_info *sbi,</div><div class='add'>+			unsigned int segno);</div><div class='add'>+</div><div class='add'>+static inline struct inode *fio_inode(struct f2fs_io_info *fio)</div><div class='add'>+{</div><div class='add'>+	return fio-&gt;folio-&gt;mapping-&gt;host;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define DEF_FRAGMENT_SIZE	4</div><div class='ctx'> #define MIN_FRAGMENT_SIZE	1</div><div class='hunk'>@@ -3758,12 +3994,14 @@ static inline bool f2fs_need_rand_seg(struct f2fs_sb_info *sbi)</div><div class='ctx'> void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io,</div><div class='ctx'> 							unsigned char reason);</div><div class='ctx'> void f2fs_flush_ckpt_thread(struct f2fs_sb_info *sbi);</div><div class='del'>-struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='del'>-struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='del'>-struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='del'>-struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='add'>+struct folio *f2fs_grab_meta_folio(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='add'>+struct folio *f2fs_get_meta_folio(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='add'>+struct folio *f2fs_get_meta_folio_retry(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='add'>+struct folio *f2fs_get_tmp_folio(struct f2fs_sb_info *sbi, pgoff_t index);</div><div class='ctx'> bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					block_t blkaddr, int type);</div><div class='add'>+bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi,</div><div class='add'>+					block_t blkaddr, int type);</div><div class='ctx'> int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,</div><div class='ctx'> 			int type, bool sync);</div><div class='ctx'> void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index,</div><div class='hunk'>@@ -3804,6 +4042,7 @@ void f2fs_init_ckpt_req_control(struct f2fs_sb_info *sbi);</div><div class='ctx'>  */</div><div class='ctx'> int __init f2fs_init_bioset(void);</div><div class='ctx'> void f2fs_destroy_bioset(void);</div><div class='add'>+bool f2fs_is_cp_guaranteed(const struct folio *folio);</div><div class='ctx'> int f2fs_init_bio_entry_cache(void);</div><div class='ctx'> void f2fs_destroy_bio_entry_cache(void);</div><div class='ctx'> void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='hunk'>@@ -3811,10 +4050,10 @@ void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio,</div><div class='ctx'> int f2fs_init_write_merge_io(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type);</div><div class='ctx'> void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct inode *inode, struct page *page,</div><div class='add'>+				struct inode *inode, struct folio *folio,</div><div class='ctx'> 				nid_t ino, enum page_type type);</div><div class='ctx'> void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,</div><div class='del'>-					struct bio **bio, struct page *page);</div><div class='add'>+					struct bio **bio, struct folio *folio);</div><div class='ctx'> void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi);</div><div class='ctx'> int f2fs_submit_page_bio(struct f2fs_io_info *fio);</div><div class='ctx'> int f2fs_merge_page_bio(struct f2fs_io_info *fio);</div><div class='hunk'>@@ -3828,14 +4067,14 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count);</div><div class='ctx'> int f2fs_reserve_new_block(struct dnode_of_data *dn);</div><div class='ctx'> int f2fs_get_block_locked(struct dnode_of_data *dn, pgoff_t index);</div><div class='ctx'> int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index);</div><div class='del'>-struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,</div><div class='del'>-			blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);</div><div class='del'>-struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,</div><div class='del'>-							pgoff_t *next_pgofs);</div><div class='del'>-struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,</div><div class='add'>+struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index,</div><div class='add'>+		blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);</div><div class='add'>+struct folio *f2fs_find_data_folio(struct inode *inode, pgoff_t index,</div><div class='add'>+		pgoff_t *next_pgofs);</div><div class='add'>+struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,</div><div class='ctx'> 			bool for_write);</div><div class='del'>-struct page *f2fs_get_new_data_page(struct inode *inode,</div><div class='del'>-			struct page *ipage, pgoff_t index, bool new_i_size);</div><div class='add'>+struct folio *f2fs_get_new_data_folio(struct inode *inode,</div><div class='add'>+			struct folio *ifolio, pgoff_t index, bool new_i_size);</div><div class='ctx'> int f2fs_do_write_data_page(struct f2fs_io_info *fio);</div><div class='ctx'> int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag);</div><div class='ctx'> int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='hunk'>@@ -3843,7 +4082,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> int f2fs_encrypt_one_page(struct f2fs_io_info *fio);</div><div class='ctx'> bool f2fs_should_update_inplace(struct inode *inode, struct f2fs_io_info *fio);</div><div class='ctx'> bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio);</div><div class='del'>-int f2fs_write_single_data_page(struct page *page, int *submitted,</div><div class='add'>+int f2fs_write_single_data_page(struct folio *folio, int *submitted,</div><div class='ctx'> 				struct bio **bio, sector_t *last_block,</div><div class='ctx'> 				struct writeback_control *wbc,</div><div class='ctx'> 				enum iostat_type io_type,</div><div class='hunk'>@@ -3852,7 +4091,7 @@ void f2fs_write_failed(struct inode *inode, loff_t to);</div><div class='ctx'> void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length);</div><div class='ctx'> bool f2fs_release_folio(struct folio *folio, gfp_t wait);</div><div class='ctx'> bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len);</div><div class='del'>-void f2fs_clear_page_cache_dirty_tag(struct page *page);</div><div class='add'>+void f2fs_clear_page_cache_dirty_tag(struct folio *folio);</div><div class='ctx'> int f2fs_init_post_read_processing(void);</div><div class='ctx'> void f2fs_destroy_post_read_processing(void);</div><div class='ctx'> int f2fs_init_post_read_wq(struct f2fs_sb_info *sbi);</div><div class='hunk'>@@ -3867,13 +4106,16 @@ void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi);</div><div class='ctx'> block_t f2fs_start_bidx_of_node(unsigned int node_ofs, struct inode *inode);</div><div class='ctx'> int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control);</div><div class='ctx'> void f2fs_build_gc_manager(struct f2fs_sb_info *sbi);</div><div class='add'>+int f2fs_gc_range(struct f2fs_sb_info *sbi,</div><div class='add'>+		unsigned int start_seg, unsigned int end_seg,</div><div class='add'>+		bool dry_run, unsigned int dry_run_sections);</div><div class='ctx'> int f2fs_resize_fs(struct file *filp, __u64 block_count);</div><div class='ctx'> int __init f2fs_create_garbage_collection_cache(void);</div><div class='ctx'> void f2fs_destroy_garbage_collection_cache(void);</div><div class='ctx'> /* victim selection function for cleaning and SSR */</div><div class='ctx'> int f2fs_get_victim(struct f2fs_sb_info *sbi, unsigned int *result,</div><div class='ctx'> 			int gc_type, int type, char alloc_mode,</div><div class='del'>-			unsigned long long age);</div><div class='add'>+			unsigned long long age, bool one_time);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * recovery.c</div><div class='hunk'>@@ -3887,6 +4129,19 @@ void f2fs_destroy_recovery_cache(void);</div><div class='ctx'>  * debug.c</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_F2FS_STAT_FS</div><div class='add'>+enum {</div><div class='add'>+	DEVSTAT_INUSE,</div><div class='add'>+	DEVSTAT_DIRTY,</div><div class='add'>+	DEVSTAT_FULL,</div><div class='add'>+	DEVSTAT_FREE,</div><div class='add'>+	DEVSTAT_PREFREE,</div><div class='add'>+	DEVSTAT_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct f2fs_dev_stats {</div><div class='add'>+	unsigned int devstats[2][DEVSTAT_MAX];		/* 0: segs, 1: secs */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct f2fs_stat_info {</div><div class='ctx'> 	struct list_head stat_list;</div><div class='ctx'> 	struct f2fs_sb_info *sbi;</div><div class='hunk'>@@ -3907,7 +4162,8 @@ struct f2fs_stat_info {</div><div class='ctx'> 	unsigned long long allocated_data_blocks;</div><div class='ctx'> 	int ndirty_node, ndirty_dent, ndirty_meta, ndirty_imeta;</div><div class='ctx'> 	int ndirty_data, ndirty_qdata;</div><div class='del'>-	unsigned int ndirty_dirs, ndirty_files, nquota_files, ndirty_all;</div><div class='add'>+	unsigned int ndirty_dirs, ndirty_files, ndirty_all;</div><div class='add'>+	unsigned int nquota_files, ndonate_files;</div><div class='ctx'> 	int nats, dirty_nats, sits, dirty_sits;</div><div class='ctx'> 	int free_nids, avail_nids, alloc_nids;</div><div class='ctx'> 	int total_count, utilization;</div><div class='hunk'>@@ -3938,6 +4194,7 @@ struct f2fs_stat_info {</div><div class='ctx'> 	int gc_secs[2][2];</div><div class='ctx'> 	int tot_blks, data_blks, node_blks;</div><div class='ctx'> 	int bg_data_blks, bg_node_blks;</div><div class='add'>+	int blkoff[NR_CURSEG_TYPE];</div><div class='ctx'> 	int curseg[NR_CURSEG_TYPE];</div><div class='ctx'> 	int cursec[NR_CURSEG_TYPE];</div><div class='ctx'> 	int curzone[NR_CURSEG_TYPE];</div><div class='hunk'>@@ -3950,6 +4207,7 @@ struct f2fs_stat_info {</div><div class='ctx'> 	unsigned int block_count[2];</div><div class='ctx'> 	unsigned int inplace_count;</div><div class='ctx'> 	unsigned long long base_mem, cache_mem, page_mem;</div><div class='add'>+	struct f2fs_dev_stats *dev_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -3959,7 +4217,7 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> #define stat_inc_cp_call_count(sbi, foreground)				\</div><div class='ctx'> 		atomic_inc(&amp;sbi-&gt;cp_call_count[(foreground)])</div><div class='del'>-#define stat_inc_cp_count(si)		(F2FS_STAT(sbi)-&gt;cp_count++)</div><div class='add'>+#define stat_inc_cp_count(sbi)		(F2FS_STAT(sbi)-&gt;cp_count++)</div><div class='ctx'> #define stat_io_skip_bggc_count(sbi)	((sbi)-&gt;io_skip_bggc++)</div><div class='ctx'> #define stat_other_skip_bggc_count(sbi)	((sbi)-&gt;other_skip_bggc++)</div><div class='ctx'> #define stat_inc_dirty_inode(sbi, type)	((sbi)-&gt;ndirty_inode[type]++)</div><div class='hunk'>@@ -4135,27 +4393,26 @@ extern struct kmem_cache *f2fs_inode_entry_slab;</div><div class='ctx'>  * inline.c</div><div class='ctx'>  */</div><div class='ctx'> bool f2fs_may_inline_data(struct inode *inode);</div><div class='del'>-bool f2fs_sanity_check_inline_data(struct inode *inode);</div><div class='add'>+bool f2fs_sanity_check_inline_data(struct inode *inode, struct folio *ifolio);</div><div class='ctx'> bool f2fs_may_inline_dentry(struct inode *inode);</div><div class='del'>-void f2fs_do_read_inline_data(struct page *page, struct page *ipage);</div><div class='del'>-void f2fs_truncate_inline_inode(struct inode *inode,</div><div class='del'>-						struct page *ipage, u64 from);</div><div class='del'>-int f2fs_read_inline_data(struct inode *inode, struct page *page);</div><div class='del'>-int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page);</div><div class='add'>+void f2fs_do_read_inline_data(struct folio *folio, struct folio *ifolio);</div><div class='add'>+void f2fs_truncate_inline_inode(struct inode *inode, struct folio *ifolio,</div><div class='add'>+		u64 from);</div><div class='add'>+int f2fs_read_inline_data(struct inode *inode, struct folio *folio);</div><div class='add'>+int f2fs_convert_inline_folio(struct dnode_of_data *dn, struct folio *folio);</div><div class='ctx'> int f2fs_convert_inline_inode(struct inode *inode);</div><div class='ctx'> int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry);</div><div class='del'>-int f2fs_write_inline_data(struct inode *inode, struct page *page);</div><div class='del'>-int f2fs_recover_inline_data(struct inode *inode, struct page *npage);</div><div class='add'>+int f2fs_write_inline_data(struct inode *inode, struct folio *folio);</div><div class='add'>+int f2fs_recover_inline_data(struct inode *inode, struct folio *nfolio);</div><div class='ctx'> struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,</div><div class='del'>-					const struct f2fs_filename *fname,</div><div class='del'>-					struct page **res_page);</div><div class='add'>+		const struct f2fs_filename *fname, struct folio **res_folio,</div><div class='add'>+		bool use_hash);</div><div class='ctx'> int f2fs_make_empty_inline_dir(struct inode *inode, struct inode *parent,</div><div class='del'>-			struct page *ipage);</div><div class='add'>+			struct folio *ifolio);</div><div class='ctx'> int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,</div><div class='ctx'> 			struct inode *inode, nid_t ino, umode_t mode);</div><div class='ctx'> void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry,</div><div class='del'>-				struct page *page, struct inode *dir,</div><div class='del'>-				struct inode *inode);</div><div class='add'>+		struct folio *folio, struct inode *dir, struct inode *inode);</div><div class='ctx'> bool f2fs_empty_inline_dir(struct inode *dir);</div><div class='ctx'> int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 			struct fscrypt_str *fstr);</div><div class='hunk'>@@ -4170,13 +4427,15 @@ unsigned long f2fs_shrink_count(struct shrinker *shrink,</div><div class='ctx'> 			struct shrink_control *sc);</div><div class='ctx'> unsigned long f2fs_shrink_scan(struct shrinker *shrink,</div><div class='ctx'> 			struct shrink_control *sc);</div><div class='add'>+unsigned int f2fs_donate_files(void);</div><div class='add'>+void f2fs_reclaim_caches(unsigned int reclaim_caches_kb);</div><div class='ctx'> void f2fs_join_shrinker(struct f2fs_sb_info *sbi);</div><div class='ctx'> void f2fs_leave_shrinker(struct f2fs_sb_info *sbi);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * extent_cache.c</div><div class='ctx'>  */</div><div class='del'>-bool sanity_check_extent_cache(struct inode *inode);</div><div class='add'>+bool sanity_check_extent_cache(struct inode *inode, struct folio *ifolio);</div><div class='ctx'> void f2fs_init_extent_tree(struct inode *inode);</div><div class='ctx'> void f2fs_drop_extent_tree(struct inode *inode);</div><div class='ctx'> void f2fs_destroy_extent_node(struct inode *inode);</div><div class='hunk'>@@ -4186,7 +4445,7 @@ int __init f2fs_create_extent_cache(void);</div><div class='ctx'> void f2fs_destroy_extent_cache(void);</div><div class='ctx'> </div><div class='ctx'> /* read extent cache ops */</div><div class='del'>-void f2fs_init_read_extent_tree(struct inode *inode, struct page *ipage);</div><div class='add'>+void f2fs_init_read_extent_tree(struct inode *inode, struct folio *ifolio);</div><div class='ctx'> bool f2fs_lookup_read_extent_cache(struct inode *inode, pgoff_t pgofs,</div><div class='ctx'> 			struct extent_info *ei);</div><div class='ctx'> bool f2fs_lookup_read_extent_cache_block(struct inode *inode, pgoff_t index,</div><div class='hunk'>@@ -4247,47 +4506,64 @@ static inline bool f2fs_post_read_required(struct inode *inode)</div><div class='ctx'> 		f2fs_compressed_file(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool f2fs_used_in_atomic_write(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return f2fs_is_atomic_file(inode) || f2fs_is_cow_file(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool f2fs_meta_inode_gc_required(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return f2fs_post_read_required(inode) || f2fs_used_in_atomic_write(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * compress.c</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-bool f2fs_is_compressed_page(struct page *page);</div><div class='del'>-struct page *f2fs_compress_control_page(struct page *page);</div><div class='add'>+enum cluster_check_type {</div><div class='add'>+	CLUSTER_IS_COMPR,   /* check only if compressed cluster */</div><div class='add'>+	CLUSTER_COMPR_BLKS, /* return # of compressed blocks in a cluster */</div><div class='add'>+	CLUSTER_RAW_BLKS    /* return # of raw blocks in a cluster */</div><div class='add'>+};</div><div class='add'>+bool f2fs_is_compressed_page(struct folio *folio);</div><div class='add'>+struct folio *f2fs_compress_control_folio(struct folio *folio);</div><div class='ctx'> int f2fs_prepare_compress_overwrite(struct inode *inode,</div><div class='ctx'> 			struct page **pagep, pgoff_t index, void **fsdata);</div><div class='ctx'> bool f2fs_compress_write_end(struct inode *inode, void *fsdata,</div><div class='ctx'> 					pgoff_t index, unsigned copied);</div><div class='ctx'> int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);</div><div class='del'>-void f2fs_compress_write_end_io(struct bio *bio, struct page *page);</div><div class='add'>+void f2fs_compress_write_end_io(struct bio *bio, struct folio *folio);</div><div class='ctx'> bool f2fs_is_compress_backend_ready(struct inode *inode);</div><div class='ctx'> bool f2fs_is_compress_level_valid(int alg, int lvl);</div><div class='ctx'> int __init f2fs_init_compress_mempool(void);</div><div class='ctx'> void f2fs_destroy_compress_mempool(void);</div><div class='ctx'> void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task);</div><div class='del'>-void f2fs_end_read_compressed_page(struct page *page, bool failed,</div><div class='add'>+void f2fs_end_read_compressed_page(struct folio *folio, bool failed,</div><div class='ctx'> 				block_t blkaddr, bool in_task);</div><div class='ctx'> bool f2fs_cluster_is_empty(struct compress_ctx *cc);</div><div class='ctx'> bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);</div><div class='ctx'> bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct page **pages,</div><div class='ctx'> 				int index, int nr_pages, bool uptodate);</div><div class='ctx'> bool f2fs_sanity_check_cluster(struct dnode_of_data *dn);</div><div class='del'>-void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page);</div><div class='add'>+void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct folio *folio);</div><div class='ctx'> int f2fs_write_multi_pages(struct compress_ctx *cc,</div><div class='ctx'> 						int *submitted,</div><div class='ctx'> 						struct writeback_control *wbc,</div><div class='ctx'> 						enum iostat_type io_type);</div><div class='ctx'> int f2fs_is_compressed_cluster(struct inode *inode, pgoff_t index);</div><div class='add'>+bool f2fs_is_sparse_cluster(struct inode *inode, pgoff_t index);</div><div class='ctx'> void f2fs_update_read_extent_tree_range_compressed(struct inode *inode,</div><div class='ctx'> 				pgoff_t fofs, block_t blkaddr,</div><div class='ctx'> 				unsigned int llen, unsigned int c_len);</div><div class='ctx'> int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,</div><div class='ctx'> 				unsigned nr_pages, sector_t *last_block_in_bio,</div><div class='del'>-				bool is_readahead, bool for_write);</div><div class='add'>+				struct readahead_control *rac, bool for_write);</div><div class='ctx'> struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc);</div><div class='ctx'> void f2fs_decompress_end_io(struct decompress_io_ctx *dic, bool failed,</div><div class='ctx'> 				bool in_task);</div><div class='del'>-void f2fs_put_page_dic(struct page *page, bool in_task);</div><div class='del'>-unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn);</div><div class='add'>+void f2fs_put_folio_dic(struct folio *folio, bool in_task);</div><div class='add'>+unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn,</div><div class='add'>+						unsigned int ofs_in_node);</div><div class='ctx'> int f2fs_init_compress_ctx(struct compress_ctx *cc);</div><div class='ctx'> void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse);</div><div class='ctx'> void f2fs_init_compress_info(struct f2fs_sb_info *sbi);</div><div class='hunk'>@@ -4298,10 +4574,9 @@ void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi);</div><div class='ctx'> int __init f2fs_init_compress_cache(void);</div><div class='ctx'> void f2fs_destroy_compress_cache(void);</div><div class='ctx'> struct address_space *COMPRESS_MAPPING(struct f2fs_sb_info *sbi);</div><div class='del'>-void f2fs_invalidate_compress_page(struct f2fs_sb_info *sbi, block_t blkaddr);</div><div class='del'>-void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='del'>-						nid_t ino, block_t blkaddr);</div><div class='del'>-bool f2fs_load_compressed_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='add'>+void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi,</div><div class='add'>+					block_t blkaddr, unsigned int len);</div><div class='add'>+bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='ctx'> 								block_t blkaddr);</div><div class='ctx'> void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino);</div><div class='ctx'> #define inc_compr_inode_stat(inode)					\</div><div class='hunk'>@@ -4317,7 +4592,7 @@ void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino);</div><div class='ctx'> 		sbi-&gt;compr_saved_block += diff;				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #else</div><div class='del'>-static inline bool f2fs_is_compressed_page(struct page *page) { return false; }</div><div class='add'>+static inline bool f2fs_is_compressed_page(struct folio *folio) { return false; }</div><div class='ctx'> static inline bool f2fs_is_compress_backend_ready(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (!f2fs_compressed_file(inode))</div><div class='hunk'>@@ -4326,7 +4601,7 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> static inline bool f2fs_is_compress_level_valid(int alg, int lvl) { return false; }</div><div class='del'>-static inline struct page *f2fs_compress_control_page(struct page *page)</div><div class='add'>+static inline struct folio *f2fs_compress_control_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(1);</div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -4335,16 +4610,17 @@ static inline int __init f2fs_init_compress_mempool(void) { return 0; }</div><div class='ctx'> static inline void f2fs_destroy_compress_mempool(void) { }</div><div class='ctx'> static inline void f2fs_decompress_cluster(struct decompress_io_ctx *dic,</div><div class='ctx'> 				bool in_task) { }</div><div class='del'>-static inline void f2fs_end_read_compressed_page(struct page *page,</div><div class='add'>+static inline void f2fs_end_read_compressed_page(struct folio *folio,</div><div class='ctx'> 				bool failed, block_t blkaddr, bool in_task)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(1);</div><div class='ctx'> }</div><div class='del'>-static inline void f2fs_put_page_dic(struct page *page, bool in_task)</div><div class='add'>+static inline void f2fs_put_folio_dic(struct folio *folio, bool in_task)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(1);</div><div class='ctx'> }</div><div class='del'>-static inline unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn) { return 0; }</div><div class='add'>+static inline unsigned int f2fs_cluster_blocks_are_contiguous(</div><div class='add'>+			struct dnode_of_data *dn, unsigned int ofs_in_node) { return 0; }</div><div class='ctx'> static inline bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) { return false; }</div><div class='ctx'> static inline int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) { return 0; }</div><div class='ctx'> static inline void f2fs_destroy_compress_inode(struct f2fs_sb_info *sbi) { }</div><div class='hunk'>@@ -4352,15 +4628,19 @@ static inline int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi) { return</div><div class='ctx'> static inline void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi) { }</div><div class='ctx'> static inline int __init f2fs_init_compress_cache(void) { return 0; }</div><div class='ctx'> static inline void f2fs_destroy_compress_cache(void) { }</div><div class='del'>-static inline void f2fs_invalidate_compress_page(struct f2fs_sb_info *sbi,</div><div class='del'>-				block_t blkaddr) { }</div><div class='del'>-static inline void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct page *page, nid_t ino, block_t blkaddr) { }</div><div class='del'>-static inline bool f2fs_load_compressed_page(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct page *page, block_t blkaddr) { return false; }</div><div class='add'>+static inline void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi,</div><div class='add'>+				block_t blkaddr, unsigned int len) { }</div><div class='add'>+static inline bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi,</div><div class='add'>+		struct folio *folio, block_t blkaddr) { return false; }</div><div class='ctx'> static inline void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi,</div><div class='ctx'> 							nid_t ino) { }</div><div class='ctx'> #define inc_compr_inode_stat(inode)		do { } while (0)</div><div class='add'>+static inline int f2fs_is_compressed_cluster(</div><div class='add'>+				struct inode *inode,</div><div class='add'>+				pgoff_t index) { return 0; }</div><div class='add'>+static inline bool f2fs_is_sparse_cluster(</div><div class='add'>+				struct inode *inode,</div><div class='add'>+				pgoff_t index) { return true; }</div><div class='ctx'> static inline void f2fs_update_read_extent_tree_range_compressed(</div><div class='ctx'> 				struct inode *inode,</div><div class='ctx'> 				pgoff_t fofs, block_t blkaddr,</div><div class='hunk'>@@ -4371,22 +4651,18 @@ static inline int set_compress_context(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> </div><div class='del'>-	F2FS_I(inode)-&gt;i_compress_algorithm =</div><div class='del'>-			F2FS_OPTION(sbi).compress_algorithm;</div><div class='del'>-	F2FS_I(inode)-&gt;i_log_cluster_size =</div><div class='del'>-			F2FS_OPTION(sbi).compress_log_size;</div><div class='del'>-	F2FS_I(inode)-&gt;i_compress_flag =</div><div class='del'>-			F2FS_OPTION(sbi).compress_chksum ?</div><div class='del'>-				BIT(COMPRESS_CHKSUM) : 0;</div><div class='del'>-	F2FS_I(inode)-&gt;i_cluster_size =</div><div class='del'>-			BIT(F2FS_I(inode)-&gt;i_log_cluster_size);</div><div class='del'>-	if ((F2FS_I(inode)-&gt;i_compress_algorithm == COMPRESS_LZ4 ||</div><div class='del'>-		F2FS_I(inode)-&gt;i_compress_algorithm == COMPRESS_ZSTD) &amp;&amp;</div><div class='add'>+	fi-&gt;i_compress_algorithm = F2FS_OPTION(sbi).compress_algorithm;</div><div class='add'>+	fi-&gt;i_log_cluster_size = F2FS_OPTION(sbi).compress_log_size;</div><div class='add'>+	fi-&gt;i_compress_flag = F2FS_OPTION(sbi).compress_chksum ?</div><div class='add'>+					BIT(COMPRESS_CHKSUM) : 0;</div><div class='add'>+	fi-&gt;i_cluster_size = BIT(fi-&gt;i_log_cluster_size);</div><div class='add'>+	if ((fi-&gt;i_compress_algorithm == COMPRESS_LZ4 ||</div><div class='add'>+		fi-&gt;i_compress_algorithm == COMPRESS_ZSTD) &amp;&amp;</div><div class='ctx'> 			F2FS_OPTION(sbi).compress_level)</div><div class='del'>-		F2FS_I(inode)-&gt;i_compress_level =</div><div class='del'>-				F2FS_OPTION(sbi).compress_level;</div><div class='del'>-	F2FS_I(inode)-&gt;i_flags |= F2FS_COMPR_FL;</div><div class='add'>+		fi-&gt;i_compress_level = F2FS_OPTION(sbi).compress_level;</div><div class='add'>+	fi-&gt;i_flags |= F2FS_COMPR_FL;</div><div class='ctx'> 	set_inode_flag(inode, FI_COMPRESSED_FILE);</div><div class='ctx'> 	stat_inc_compr_inode(inode);</div><div class='ctx'> 	inc_compr_inode_stat(inode);</div><div class='hunk'>@@ -4401,15 +4677,24 @@ static inline bool f2fs_disable_compressed_file(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='add'>+	f2fs_down_write(&amp;fi-&gt;i_sem);</div><div class='add'>+</div><div class='add'>+	if (!f2fs_compressed_file(inode)) {</div><div class='add'>+		f2fs_up_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> 		return true;</div><div class='del'>-	if (S_ISREG(inode-&gt;i_mode) &amp;&amp; F2FS_HAS_BLOCKS(inode))</div><div class='add'>+	}</div><div class='add'>+	if (f2fs_is_mmap_file(inode) || atomic_read(&amp;fi-&gt;writeback) ||</div><div class='add'>+		(S_ISREG(inode-&gt;i_mode) &amp;&amp; F2FS_HAS_BLOCKS(inode))) {</div><div class='add'>+		f2fs_up_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fi-&gt;i_flags &amp;= ~F2FS_COMPR_FL;</div><div class='ctx'> 	stat_dec_compr_inode(inode);</div><div class='ctx'> 	clear_inode_flag(inode, FI_COMPRESSED_FILE);</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, true);</div><div class='add'>+</div><div class='add'>+	f2fs_up_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4433,14 +4718,20 @@ F2FS_FEATURE_FUNCS(sb_chksum, SB_CHKSUM);</div><div class='ctx'> F2FS_FEATURE_FUNCS(casefold, CASEFOLD);</div><div class='ctx'> F2FS_FEATURE_FUNCS(compression, COMPRESSION);</div><div class='ctx'> F2FS_FEATURE_FUNCS(readonly, RO);</div><div class='add'>+F2FS_FEATURE_FUNCS(device_alias, DEVICE_ALIAS);</div><div class='add'>+F2FS_FEATURE_FUNCS(packed_ssa, PACKED_SSA);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-static inline bool f2fs_blkz_is_seq(struct f2fs_sb_info *sbi, int devi,</div><div class='del'>-				    block_t blkaddr)</div><div class='add'>+static inline bool f2fs_zone_is_seq(struct f2fs_sb_info *sbi, int devi,</div><div class='add'>+							unsigned int zone)</div><div class='ctx'> {</div><div class='del'>-	unsigned int zno = blkaddr / sbi-&gt;blocks_per_blkz;</div><div class='add'>+	return test_bit(zone, FDEV(devi).blkz_seq);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return test_bit(zno, FDEV(devi).blkz_seq);</div><div class='add'>+static inline bool f2fs_blkz_is_seq(struct f2fs_sb_info *sbi, int devi,</div><div class='add'>+								block_t blkaddr)</div><div class='add'>+{</div><div class='add'>+	return f2fs_zone_is_seq(sbi, devi, blkaddr / sbi-&gt;blocks_per_blkz);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -4483,6 +4774,18 @@ static inline bool f2fs_hw_support_discard(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int f2fs_hw_discard_granularity(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	int i = 1;</div><div class='add'>+	unsigned int discard_granularity = bdev_discard_granularity(sbi-&gt;sb-&gt;s_bdev);</div><div class='add'>+</div><div class='add'>+	if (f2fs_is_multi_device(sbi))</div><div class='add'>+		for (; i &lt; sbi-&gt;s_ndevs &amp;&amp; !bdev_is_zoned(FDEV(i).bdev); i++)</div><div class='add'>+			discard_granularity = max_t(unsigned int, discard_granularity,</div><div class='add'>+						bdev_discard_granularity(FDEV(i).bdev));</div><div class='add'>+	return discard_granularity;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool f2fs_realtime_discard_enable(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	return (test_opt(sbi, DISCARD) &amp;&amp; f2fs_hw_support_discard(sbi)) ||</div><div class='hunk'>@@ -4512,6 +4815,33 @@ static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool f2fs_is_sequential_zone_area(struct f2fs_sb_info *sbi,</div><div class='add'>+					  block_t blkaddr)</div><div class='add'>+{</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+		int devi = f2fs_target_device_index(sbi, blkaddr);</div><div class='add'>+</div><div class='add'>+		if (!bdev_is_zoned(FDEV(devi).bdev))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (f2fs_is_multi_device(sbi)) {</div><div class='add'>+			if (blkaddr &lt; FDEV(devi).start_blk ||</div><div class='add'>+				blkaddr &gt; FDEV(devi).end_blk) {</div><div class='add'>+				f2fs_err(sbi, "Invalid block %x", blkaddr);</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+			blkaddr -= FDEV(devi).start_blk;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return f2fs_blkz_is_seq(sbi, devi, blkaddr);</div><div class='add'>+#else</div><div class='add'>+		return false;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool f2fs_low_mem_mode(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	return F2FS_OPTION(sbi).memory_mode == MEMORY_MODE_LOW;</div><div class='hunk'>@@ -4563,10 +4893,15 @@ static inline bool f2fs_need_verity(const struct inode *inode, pgoff_t idx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='del'>-extern void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate,</div><div class='del'>-							unsigned int type);</div><div class='add'>+extern int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,</div><div class='add'>+					unsigned long type, enum fault_option fo);</div><div class='ctx'> #else</div><div class='del'>-#define f2fs_build_fault_attr(sbi, rate, type)		do { } while (0)</div><div class='add'>+static inline int f2fs_build_fault_attr(struct f2fs_sb_info *sbi,</div><div class='add'>+					unsigned long rate, unsigned long type,</div><div class='add'>+					enum fault_option fo)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline bool is_journalled_quota(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -4587,15 +4922,38 @@ static inline bool f2fs_block_unit_discard(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_BLOCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void f2fs_io_schedule_timeout(long timeout)</div><div class='add'>+static inline void __f2fs_schedule_timeout(long timeout, bool io)</div><div class='ctx'> {</div><div class='ctx'> 	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-	io_schedule_timeout(timeout);</div><div class='add'>+	if (io)</div><div class='add'>+		io_schedule_timeout(timeout);</div><div class='add'>+	else</div><div class='add'>+		schedule_timeout(timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,</div><div class='del'>-					enum page_type type)</div><div class='add'>+#define f2fs_io_schedule_timeout(timeout)		\</div><div class='add'>+			__f2fs_schedule_timeout(timeout, true)</div><div class='add'>+#define f2fs_schedule_timeout(timeout)			\</div><div class='add'>+			__f2fs_schedule_timeout(timeout, false)</div><div class='add'>+</div><div class='add'>+static inline void f2fs_io_schedule_timeout_killable(long timeout)</div><div class='ctx'> {</div><div class='add'>+	while (timeout) {</div><div class='add'>+		if (fatal_signal_pending(current))</div><div class='add'>+			return;</div><div class='add'>+		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+		io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='add'>+		if (timeout &lt;= DEFAULT_SCHEDULE_TIMEOUT)</div><div class='add'>+			return;</div><div class='add'>+		timeout -= DEFAULT_SCHEDULE_TIMEOUT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi,</div><div class='add'>+				struct folio *folio, enum page_type type)</div><div class='add'>+{</div><div class='add'>+	pgoff_t ofs = folio-&gt;index;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -4613,11 +4971,37 @@ static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi-&gt;sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void f2fs_truncate_meta_inode_pages(struct f2fs_sb_info *sbi,</div><div class='add'>+					block_t blkaddr, unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	bool need_submit = false;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='add'>+		folio = filemap_get_folio(META_MAPPING(sbi), blkaddr + i);</div><div class='add'>+		if (!IS_ERR(folio)) {</div><div class='add'>+			if (folio_test_writeback(folio))</div><div class='add'>+				need_submit = true;</div><div class='add'>+			f2fs_folio_put(folio, false);</div><div class='add'>+		}</div><div class='add'>+	} while (++i &lt; cnt &amp;&amp; !need_submit);</div><div class='add'>+</div><div class='add'>+	if (need_submit)</div><div class='add'>+		f2fs_submit_merged_write_cond(sbi, sbi-&gt;meta_inode,</div><div class='add'>+							NULL, 0, DATA);</div><div class='add'>+</div><div class='add'>+	truncate_inode_pages_range(META_MAPPING(sbi),</div><div class='add'>+			F2FS_BLK_TO_BYTES((loff_t)blkaddr),</div><div class='add'>+			F2FS_BLK_END_BYTES((loff_t)(blkaddr + cnt - 1)));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void f2fs_invalidate_internal_cache(struct f2fs_sb_info *sbi,</div><div class='del'>-								block_t blkaddr)</div><div class='add'>+						block_t blkaddr, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	invalidate_mapping_pages(META_MAPPING(sbi), blkaddr, blkaddr);</div><div class='del'>-	f2fs_invalidate_compress_page(sbi, blkaddr);</div><div class='add'>+	f2fs_truncate_meta_inode_pages(sbi, blkaddr, len);</div><div class='add'>+	f2fs_invalidate_compress_pages_range(sbi, blkaddr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define EFSBADCRC	EBADMSG		/* Bad CRC detected */</div><div class='head'>diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c<br/>index b58ab1157b7e..d7047ca6b98d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/file.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/f2fs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='hunk'>@@ -36,9 +35,29 @@</div><div class='ctx'> #include &lt;trace/events/f2fs.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/f2fs.h&gt;</div><div class='ctx'> </div><div class='add'>+static void f2fs_zero_post_eof_page(struct inode *inode,</div><div class='add'>+					loff_t new_size, bool lock)</div><div class='add'>+{</div><div class='add'>+	loff_t old_size = i_size_read(inode);</div><div class='add'>+</div><div class='add'>+	if (old_size &gt;= new_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mapping_empty(inode-&gt;i_mapping))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (lock)</div><div class='add'>+		filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='add'>+	/* zero or drop pages only in range of [old_size, new_size] */</div><div class='add'>+	truncate_inode_pages_range(inode-&gt;i_mapping, old_size, new_size);</div><div class='add'>+	if (lock)</div><div class='add'>+		filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='add'>+	vm_flags_t flags = vmf-&gt;vma-&gt;vm_flags;</div><div class='ctx'> 	vm_fault_t ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = filemap_fault(vmf);</div><div class='hunk'>@@ -46,18 +65,18 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)</div><div class='ctx'> 		f2fs_update_iostat(F2FS_I_SB(inode), inode,</div><div class='ctx'> 					APP_MAPPED_READ_IO, F2FS_BLKSIZE);</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_filemap_fault(inode, vmf-&gt;pgoff, vmf-&gt;vma-&gt;vm_flags, ret);</div><div class='add'>+	trace_f2fs_filemap_fault(inode, vmf-&gt;pgoff, flags, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = vmf-&gt;page;</div><div class='add'>+	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='ctx'> 	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	bool need_alloc = true;</div><div class='add'>+	bool need_alloc = !f2fs_is_pinned_file(inode);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	vm_fault_t ret;</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +104,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	if (f2fs_compressed_file(inode)) {</div><div class='del'>-		int ret = f2fs_is_compressed_cluster(inode, page-&gt;index);</div><div class='add'>+		int ret = f2fs_is_compressed_cluster(inode, folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			err = ret;</div><div class='hunk'>@@ -103,36 +122,38 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> </div><div class='ctx'> 	f2fs_bug_on(sbi, f2fs_has_inline_data(inode));</div><div class='ctx'> </div><div class='add'>+	f2fs_zero_post_eof_page(inode, (folio-&gt;index + 1) &lt;&lt; PAGE_SHIFT, true);</div><div class='add'>+</div><div class='ctx'> 	file_update_time(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> 	filemap_invalidate_lock_shared(inode-&gt;i_mapping);</div><div class='del'>-	lock_page(page);</div><div class='del'>-	if (unlikely(page-&gt;mapping != inode-&gt;i_mapping ||</div><div class='del'>-			page_offset(page) &gt; i_size_read(inode) ||</div><div class='del'>-			!PageUptodate(page))) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	if (unlikely(folio-&gt;mapping != inode-&gt;i_mapping ||</div><div class='add'>+			folio_pos(folio) &gt; i_size_read(inode) ||</div><div class='add'>+			!folio_test_uptodate(folio))) {</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto out_sem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='ctx'> 	if (need_alloc) {</div><div class='ctx'> 		/* block allocation */</div><div class='del'>-		set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='del'>-		err = f2fs_get_block_locked(&amp;dn, page-&gt;index);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-	if (!need_alloc) {</div><div class='del'>-		set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='del'>-		err = f2fs_get_dnode_of_data(&amp;dn, page-&gt;index, LOOKUP_NODE);</div><div class='add'>+		err = f2fs_get_block_locked(&amp;dn, folio-&gt;index);</div><div class='add'>+	} else {</div><div class='add'>+		err = f2fs_get_dnode_of_data(&amp;dn, folio-&gt;index, LOOKUP_NODE);</div><div class='ctx'> 		f2fs_put_dnode(&amp;dn);</div><div class='add'>+		if (f2fs_is_pinned_file(inode) &amp;&amp;</div><div class='add'>+		    !__is_valid_data_blkaddr(dn.data_blkaddr))</div><div class='add'>+			err = -EIO;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	if (err) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		goto out_sem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, false, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, false, true);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for GCed page writeback via META_MAPPING */</div><div class='ctx'> 	f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);</div><div class='hunk'>@@ -140,18 +161,18 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * check to see if the page is mapped already (no holes)</div><div class='ctx'> 	 */</div><div class='del'>-	if (PageMappedToDisk(page))</div><div class='add'>+	if (folio_test_mappedtodisk(folio))</div><div class='ctx'> 		goto out_sem;</div><div class='ctx'> </div><div class='ctx'> 	/* page is wholly or partially inside EOF */</div><div class='del'>-	if (((loff_t)(page-&gt;index + 1) &lt;&lt; PAGE_SHIFT) &gt;</div><div class='add'>+	if (((loff_t)(folio-&gt;index + 1) &lt;&lt; PAGE_SHIFT) &gt;</div><div class='ctx'> 						i_size_read(inode)) {</div><div class='ctx'> 		loff_t offset;</div><div class='ctx'> </div><div class='ctx'> 		offset = i_size_read(inode) &amp; ~PAGE_MASK;</div><div class='del'>-		zero_user_segment(page, offset, PAGE_SIZE);</div><div class='add'>+		folio_zero_segment(folio, offset, folio_size(folio));</div><div class='ctx'> 	}</div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_iostat(sbi, inode, APP_MAPPED_IO, F2FS_BLKSIZE);</div><div class='ctx'> 	f2fs_update_time(sbi, REQ_TIME);</div><div class='hunk'>@@ -163,7 +184,7 @@ out_sem:</div><div class='ctx'> out:</div><div class='ctx'> 	ret = vmf_fs_error(err);</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_vm_page_mkwrite(inode, page-&gt;index, vmf-&gt;vma-&gt;vm_flags, ret);</div><div class='add'>+	trace_f2fs_vm_page_mkwrite(inode, folio-&gt;index, vmf-&gt;vma-&gt;vm_flags, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -185,7 +206,7 @@ static int get_parent_ino(struct inode *inode, nid_t *pino)</div><div class='ctx'> 	if (!dentry)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	*pino = parent_ino(dentry);</div><div class='add'>+	*pino = d_parent_ino(dentry);</div><div class='ctx'> 	dput(dentry);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,18 +239,22 @@ static inline enum cp_reason_type need_do_checkpoint(struct inode *inode)</div><div class='ctx'> 		f2fs_exist_written_data(sbi, F2FS_I(inode)-&gt;i_pino,</div><div class='ctx'> 							TRANS_DIR_INO))</div><div class='ctx'> 		cp_reason = CP_RECOVER_DIR;</div><div class='add'>+	else if (f2fs_exist_written_data(sbi, F2FS_I(inode)-&gt;i_pino,</div><div class='add'>+							XATTR_DIR_INO))</div><div class='add'>+		cp_reason = CP_XATTR_DIR;</div><div class='ctx'> </div><div class='ctx'> 	return cp_reason;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool need_inode_page_update(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> {</div><div class='del'>-	struct page *i = find_get_page(NODE_MAPPING(sbi), ino);</div><div class='add'>+	struct folio *i = filemap_get_folio(NODE_MAPPING(sbi), ino);</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> 	/* But we need to avoid that there are some inode updates */</div><div class='del'>-	if ((i &amp;&amp; PageDirty(i)) || f2fs_need_inode_block_update(sbi, ino))</div><div class='add'>+	if ((!IS_ERR(i) &amp;&amp; folio_test_dirty(i)) ||</div><div class='add'>+	    f2fs_need_inode_block_update(sbi, ino))</div><div class='ctx'> 		ret = true;</div><div class='del'>-	f2fs_put_page(i, 0);</div><div class='add'>+	f2fs_folio_put(i, false);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +283,6 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> 	struct writeback_control wbc = {</div><div class='ctx'> 		.sync_mode = WB_SYNC_ALL,</div><div class='ctx'> 		.nr_to_write = LONG_MAX,</div><div class='del'>-		.for_reclaim = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int seq_id = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -373,8 +397,7 @@ sync_nodes:</div><div class='ctx'> 	f2fs_remove_ino_entry(sbi, ino, APPEND_INO);</div><div class='ctx'> 	clear_inode_flag(inode, FI_APPEND_WRITE);</div><div class='ctx'> flush_out:</div><div class='del'>-	if ((!atomic &amp;&amp; F2FS_OPTION(sbi).fsync_mode != FSYNC_MODE_NOBARRIER) ||</div><div class='del'>-	    (atomic &amp;&amp; !test_opt(sbi, NOBARRIER) &amp;&amp; f2fs_sb_has_blkzoned(sbi)))</div><div class='add'>+	if (!atomic &amp;&amp; F2FS_OPTION(sbi).fsync_mode != FSYNC_MODE_NOBARRIER)</div><div class='ctx'> 		ret = f2fs_issue_flush(sbi, inode-&gt;i_ino);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		f2fs_remove_ino_entry(sbi, ino, UPDATE_INO);</div><div class='hunk'>@@ -394,9 +417,20 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 	return f2fs_do_sync_file(file, start, end, datasync, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool __found_offset(struct address_space *mapping, block_t blkaddr,</div><div class='del'>-				pgoff_t index, int whence)</div><div class='add'>+static bool __found_offset(struct address_space *mapping,</div><div class='add'>+		struct dnode_of_data *dn, pgoff_t index, int whence)</div><div class='ctx'> {</div><div class='add'>+	block_t blkaddr = f2fs_data_blkaddr(dn);</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	bool compressed_cluster = false;</div><div class='add'>+</div><div class='add'>+	if (f2fs_compressed_file(inode)) {</div><div class='add'>+		block_t first_blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='add'>+		    ALIGN_DOWN(dn-&gt;ofs_in_node, F2FS_I(inode)-&gt;i_cluster_size));</div><div class='add'>+</div><div class='add'>+		compressed_cluster = first_blkaddr == COMPRESS_ADDR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (whence) {</div><div class='ctx'> 	case SEEK_DATA:</div><div class='ctx'> 		if (__is_valid_data_blkaddr(blkaddr))</div><div class='hunk'>@@ -404,8 +438,12 @@ static bool __found_offset(struct address_space *mapping, block_t blkaddr,</div><div class='ctx'> 		if (blkaddr == NEW_ADDR &amp;&amp;</div><div class='ctx'> 		    xa_get_mark(&amp;mapping-&gt;i_pages, index, PAGECACHE_TAG_DIRTY))</div><div class='ctx'> 			return true;</div><div class='add'>+		if (compressed_cluster)</div><div class='add'>+			return true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEEK_HOLE:</div><div class='add'>+		if (compressed_cluster)</div><div class='add'>+			return false;</div><div class='ctx'> 		if (blkaddr == NULL_ADDR)</div><div class='ctx'> 			return true;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -416,7 +454,7 @@ static bool __found_offset(struct address_space *mapping, block_t blkaddr,</div><div class='ctx'> static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='del'>-	loff_t maxbytes = inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='add'>+	loff_t maxbytes = F2FS_BLK_TO_BYTES(max_file_blocks(inode));</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	pgoff_t pgofs, end_offset;</div><div class='ctx'> 	loff_t data_ofs = offset;</div><div class='hunk'>@@ -457,7 +495,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+		end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> </div><div class='ctx'> 		/* find data/hole in dnode block */</div><div class='ctx'> 		for (; dn.ofs_in_node &lt; end_offset;</div><div class='hunk'>@@ -474,7 +512,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 				goto fail;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (__found_offset(file-&gt;f_mapping, blkaddr,</div><div class='add'>+			if (__found_offset(file-&gt;f_mapping, &amp;dn,</div><div class='ctx'> 							pgofs, whence)) {</div><div class='ctx'> 				f2fs_put_dnode(&amp;dn);</div><div class='ctx'> 				goto found;</div><div class='hunk'>@@ -498,10 +536,7 @@ fail:</div><div class='ctx'> static loff_t f2fs_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='del'>-	loff_t maxbytes = inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='del'>-</div><div class='del'>-	if (f2fs_compressed_file(inode))</div><div class='del'>-		maxbytes = max_file_blocks(inode) &lt;&lt; F2FS_BLKSIZE_BITS;</div><div class='add'>+	loff_t maxbytes = F2FS_BLK_TO_BYTES(max_file_blocks(inode));</div><div class='ctx'> </div><div class='ctx'> 	switch (whence) {</div><div class='ctx'> 	case SEEK_SET:</div><div class='hunk'>@@ -519,8 +554,9 @@ static loff_t f2fs_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int f2fs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))</div><div class='hunk'>@@ -530,7 +566,7 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	file_accessed(file);</div><div class='del'>-	vma-&gt;vm_ops = &amp;f2fs_file_vm_ops;</div><div class='add'>+	desc-&gt;vm_ops = &amp;f2fs_file_vm_ops;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='ctx'> 	set_inode_flag(inode, FI_MMAP_FILE);</div><div class='hunk'>@@ -539,6 +575,45 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int finish_preallocate_blocks(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool opened;</div><div class='add'>+</div><div class='add'>+	f2fs_down_read(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+	opened = is_inode_flag_set(inode, FI_OPENED_FILE);</div><div class='add'>+	f2fs_up_read(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+	if (opened)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	if (is_inode_flag_set(inode, FI_OPENED_FILE))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (!file_should_truncate(inode))</div><div class='add'>+		goto out_update;</div><div class='add'>+</div><div class='add'>+	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='add'>+</div><div class='add'>+	truncate_setsize(inode, i_size_read(inode));</div><div class='add'>+	ret = f2fs_truncate(inode);</div><div class='add'>+</div><div class='add'>+	filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='add'>+	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	file_dont_truncate(inode);</div><div class='add'>+out_update:</div><div class='add'>+	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+	set_inode_flag(inode, FI_OPENED_FILE);</div><div class='add'>+	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+out_unlock:</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int f2fs_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int err = fscrypt_file_open(inode, filp);</div><div class='hunk'>@@ -553,10 +628,17 @@ static int f2fs_file_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	filp-&gt;f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC;</div><div class='add'>+	filp-&gt;f_mode |= FMODE_NOWAIT;</div><div class='ctx'> 	filp-&gt;f_mode |= FMODE_CAN_ODIRECT;</div><div class='ctx'> </div><div class='del'>-	return dquot_file_open(inode, filp);</div><div class='add'>+	err = dquot_file_open(inode, filp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = finish_preallocate_blocks(inode);</div><div class='add'>+	if (!err)</div><div class='add'>+		atomic_inc(&amp;F2FS_I(inode)-&gt;open_count);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)</div><div class='hunk'>@@ -568,8 +650,11 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)</div><div class='ctx'> 	int cluster_index = 0, valid_blocks = 0;</div><div class='ctx'> 	int cluster_size = F2FS_I(dn-&gt;inode)-&gt;i_cluster_size;</div><div class='ctx'> 	bool released = !atomic_read(&amp;F2FS_I(dn-&gt;inode)-&gt;i_compr_blocks);</div><div class='add'>+	block_t blkstart;</div><div class='add'>+	int blklen = 0;</div><div class='ctx'> </div><div class='del'>-	addr = get_dnode_addr(dn-&gt;inode, dn-&gt;node_page) + ofs;</div><div class='add'>+	addr = get_dnode_addr(dn-&gt;inode, dn-&gt;node_folio) + ofs;</div><div class='add'>+	blkstart = le32_to_cpu(*addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Assumption: truncation starts with cluster */</div><div class='ctx'> 	for (; count &gt; 0; count--, addr++, dn-&gt;ofs_in_node++, cluster_index++) {</div><div class='hunk'>@@ -585,24 +670,44 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (blkaddr == NULL_ADDR)</div><div class='del'>-			continue;</div><div class='add'>+			goto next;</div><div class='ctx'> </div><div class='ctx'> 		f2fs_set_data_blkaddr(dn, NULL_ADDR);</div><div class='ctx'> </div><div class='ctx'> 		if (__is_valid_data_blkaddr(blkaddr)) {</div><div class='del'>-			if (!f2fs_is_valid_blkaddr(sbi, blkaddr,</div><div class='del'>-					DATA_GENERIC_ENHANCE))</div><div class='del'>-				continue;</div><div class='add'>+			if (time_to_inject(sbi, FAULT_BLKADDR_CONSISTENCE))</div><div class='add'>+				goto next;</div><div class='add'>+			if (!f2fs_is_valid_blkaddr_raw(sbi, blkaddr,</div><div class='add'>+						DATA_GENERIC_ENHANCE))</div><div class='add'>+				goto next;</div><div class='ctx'> 			if (compressed_cluster)</div><div class='ctx'> 				valid_blocks++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_invalidate_blocks(sbi, blkaddr);</div><div class='add'>+		if (blkstart + blklen == blkaddr) {</div><div class='add'>+			blklen++;</div><div class='add'>+		} else {</div><div class='add'>+			f2fs_invalidate_blocks(sbi, blkstart, blklen);</div><div class='add'>+			blkstart = blkaddr;</div><div class='add'>+			blklen = 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!released || blkaddr != COMPRESS_ADDR)</div><div class='ctx'> 			nr_free++;</div><div class='add'>+</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+		if (blklen)</div><div class='add'>+			f2fs_invalidate_blocks(sbi, blkstart, blklen);</div><div class='add'>+</div><div class='add'>+		blkstart = le32_to_cpu(*(addr + 1));</div><div class='add'>+		blklen = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (blklen)</div><div class='add'>+		f2fs_invalidate_blocks(sbi, blkstart, blklen);</div><div class='add'>+</div><div class='ctx'> 	if (compressed_cluster)</div><div class='ctx'> 		f2fs_i_compr_blocks_update(dn-&gt;inode, valid_blocks, false);</div><div class='ctx'> </div><div class='hunk'>@@ -612,7 +717,7 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)</div><div class='ctx'> 		 * once we invalidate valid blkaddr in range [ofs, ofs + count],</div><div class='ctx'> 		 * we will invalidate all blkaddr in the whole range.</div><div class='ctx'> 		 */</div><div class='del'>-		fofs = f2fs_start_bidx_of_node(ofs_of_node(dn-&gt;node_page),</div><div class='add'>+		fofs = f2fs_start_bidx_of_node(ofs_of_node(dn-&gt;node_folio),</div><div class='ctx'> 							dn-&gt;inode) + ofs;</div><div class='ctx'> 		f2fs_update_read_extent_cache_range(dn, fofs, 0, len);</div><div class='ctx'> 		f2fs_update_age_extent_cache_range(dn, fofs, len);</div><div class='hunk'>@@ -631,31 +736,33 @@ static int truncate_partial_data_page(struct inode *inode, u64 from,</div><div class='ctx'> 	loff_t offset = from &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	pgoff_t index = from &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	if (!offset &amp;&amp; !cache_only)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cache_only) {</div><div class='del'>-		page = find_lock_page(mapping, index);</div><div class='del'>-		if (page &amp;&amp; PageUptodate(page))</div><div class='add'>+		folio = filemap_lock_folio(mapping, index);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+		       return 0;</div><div class='add'>+		if (folio_test_uptodate(folio))</div><div class='ctx'> 			goto truncate_out;</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_lock_data_page(inode, index, true);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return PTR_ERR(page) == -ENOENT ? 0 : PTR_ERR(page);</div><div class='add'>+	folio = f2fs_get_lock_data_folio(inode, index, true);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio) == -ENOENT ? 0 : PTR_ERR(folio);</div><div class='ctx'> truncate_out:</div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='del'>-	zero_user(page, offset, PAGE_SIZE - offset);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='add'>+	folio_zero_segment(folio, offset, folio_size(folio));</div><div class='ctx'> </div><div class='ctx'> 	/* An encrypted inode should have a key and truncate the last page. */</div><div class='ctx'> 	f2fs_bug_on(F2FS_I_SB(inode), cache_only &amp;&amp; IS_ENCRYPTED(inode));</div><div class='ctx'> 	if (!cache_only)</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -665,11 +772,16 @@ int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock)</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	pgoff_t free_from;</div><div class='ctx'> 	int count = 0, err = 0;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	bool truncate_page = false;</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_truncate_blocks_enter(inode, from);</div><div class='ctx'> </div><div class='add'>+	if (IS_DEVICE_ALIASING(inode) &amp;&amp; from) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	free_from = (pgoff_t)F2FS_BLK_ALIGN(from);</div><div class='ctx'> </div><div class='ctx'> 	if (free_from &gt;= max_file_blocks(inode))</div><div class='hunk'>@@ -678,20 +790,33 @@ int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock)</div><div class='ctx'> 	if (lock)</div><div class='ctx'> 		f2fs_lock_op(sbi);</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		err = PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		err = PTR_ERR(ifolio);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_DEVICE_ALIASING(inode)) {</div><div class='add'>+		struct extent_tree *et = F2FS_I(inode)-&gt;extent_tree[EX_READ];</div><div class='add'>+		struct extent_info ei = et-&gt;largest;</div><div class='add'>+</div><div class='add'>+		f2fs_invalidate_blocks(sbi, ei.blk, ei.len);</div><div class='add'>+</div><div class='add'>+		dec_valid_block_count(sbi, inode, ei.len);</div><div class='add'>+		f2fs_update_time(sbi, REQ_TIME);</div><div class='add'>+</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_data(inode)) {</div><div class='del'>-		f2fs_truncate_inline_inode(inode, ipage, from);</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		f2fs_truncate_inline_inode(inode, ifolio, from);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		truncate_page = true;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, ipage, NULL, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, ifolio, NULL, 0);</div><div class='ctx'> 	err = f2fs_get_dnode_of_data(&amp;dn, free_from, LOOKUP_NODE_RA);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == -ENOENT)</div><div class='hunk'>@@ -699,12 +824,12 @@ int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+	count = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> </div><div class='ctx'> 	count -= dn.ofs_in_node;</div><div class='ctx'> 	f2fs_bug_on(sbi, count &lt; 0);</div><div class='ctx'> </div><div class='del'>-	if (dn.ofs_in_node || IS_INODE(dn.node_page)) {</div><div class='add'>+	if (dn.ofs_in_node || IS_INODE(dn.node_folio)) {</div><div class='ctx'> 		f2fs_truncate_data_blocks_range(&amp;dn, count);</div><div class='ctx'> 		free_from += count;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -719,7 +844,7 @@ free_partial:</div><div class='ctx'> 	/* lastly zero out the first data page */</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = truncate_partial_data_page(inode, from, truncate_page);</div><div class='del'>-</div><div class='add'>+out_err:</div><div class='ctx'> 	trace_f2fs_truncate_blocks_exit(inode, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -785,8 +910,16 @@ int f2fs_truncate(struct inode *inode)</div><div class='ctx'> 	/* we should check inline_data size */</div><div class='ctx'> 	if (!f2fs_may_inline_data(inode)) {</div><div class='ctx'> 		err = f2fs_convert_inline_inode(inode);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			/*</div><div class='add'>+			 * Always truncate page #0 to avoid page cache</div><div class='add'>+			 * leak in evict() path.</div><div class='add'>+			 */</div><div class='add'>+			truncate_inode_pages_range(inode-&gt;i_mapping,</div><div class='add'>+					F2FS_BLK_TO_BYTES(0),</div><div class='add'>+					F2FS_BLK_END_BYTES(0));</div><div class='ctx'> 			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_truncate_blocks(inode, i_size_read(inode), true);</div><div class='hunk'>@@ -808,6 +941,12 @@ static bool f2fs_force_buffered_io(struct inode *inode, int rw)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (f2fs_compressed_file(inode))</div><div class='ctx'> 		return true;</div><div class='add'>+	/*</div><div class='add'>+	 * only force direct read to use buffered IO, for direct write,</div><div class='add'>+	 * it expects inline data conversion before committing IO.</div><div class='add'>+	 */</div><div class='add'>+	if (f2fs_has_inline_data(inode) &amp;&amp; rw == READ)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* disallow direct IO if any of devices has unaligned blksize */</div><div class='ctx'> 	if (f2fs_is_multi_device(sbi) &amp;&amp; !sbi-&gt;aligned_blksize)</div><div class='hunk'>@@ -816,9 +955,8 @@ static bool f2fs_force_buffered_io(struct inode *inode, int rw)</div><div class='ctx'> 	 * for blkzoned device, fallback direct IO to buffered IO, so</div><div class='ctx'> 	 * all IOs can be serialized by log-structured write.</div><div class='ctx'> 	 */</div><div class='del'>-	if (f2fs_sb_has_blkzoned(sbi) &amp;&amp; (rw == WRITE))</div><div class='del'>-		return true;</div><div class='del'>-	if (f2fs_lfs_mode(sbi) &amp;&amp; rw == WRITE &amp;&amp; F2FS_IO_ALIGNED(sbi))</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi) &amp;&amp; (rw == WRITE) &amp;&amp;</div><div class='add'>+	    !f2fs_is_pinned_file(inode))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (is_sbi_flag_set(sbi, SBI_CP_DISABLED))</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -907,10 +1045,8 @@ static void __setattr_copy(struct mnt_idmap *idmap,</div><div class='ctx'> 		inode_set_ctime_to_ts(inode, attr-&gt;ia_ctime);</div><div class='ctx'> 	if (ia_valid &amp; ATTR_MODE) {</div><div class='ctx'> 		umode_t mode = attr-&gt;ia_mode;</div><div class='del'>-		vfsgid_t vfsgid = i_gid_into_vfsgid(idmap, inode);</div><div class='ctx'> </div><div class='del'>-		if (!vfsgid_in_group_p(vfsgid) &amp;&amp;</div><div class='del'>-		    !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID))</div><div class='add'>+		if (!in_group_or_capable(idmap, inode, i_gid_into_vfsgid(idmap, inode)))</div><div class='ctx'> 			mode &amp;= ~S_ISGID;</div><div class='ctx'> 		set_acl_inode(inode, mode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -923,23 +1059,13 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		 struct iattr *attr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))</div><div class='add'>+	if (unlikely(f2fs_cp_error(sbi)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(IS_IMMUTABLE(inode)))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (unlikely(IS_APPEND(inode) &amp;&amp;</div><div class='del'>-			(attr-&gt;ia_valid &amp; (ATTR_MODE | ATTR_UID |</div><div class='del'>-				  ATTR_GID | ATTR_TIMES_SET))))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((attr-&gt;ia_valid &amp; ATTR_SIZE) &amp;&amp;</div><div class='del'>-		!f2fs_is_compress_backend_ready(inode))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	err = setattr_prepare(idmap, dentry, attr);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -952,6 +1078,35 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(IS_IMMUTABLE(inode)))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (unlikely(IS_APPEND(inode) &amp;&amp;</div><div class='add'>+			(attr-&gt;ia_valid &amp; (ATTR_MODE | ATTR_UID |</div><div class='add'>+				  ATTR_GID | ATTR_TIMES_SET))))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if ((attr-&gt;ia_valid &amp; ATTR_SIZE)) {</div><div class='add'>+		if (!f2fs_is_compress_backend_ready(inode) ||</div><div class='add'>+				IS_DEVICE_ALIASING(inode))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED) &amp;&amp;</div><div class='add'>+			!IS_ALIGNED(attr-&gt;ia_size,</div><div class='add'>+			F2FS_BLK_TO_BYTES(fi-&gt;i_cluster_size)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/*</div><div class='add'>+		 * To prevent scattered pin block generation, we don't allow</div><div class='add'>+		 * smaller/equal size unaligned truncation for pinned file.</div><div class='add'>+		 * We only support overwrite IO to pinned file, so don't</div><div class='add'>+		 * care about larger size truncation.</div><div class='add'>+		 */</div><div class='add'>+		if (f2fs_is_pinned_file(inode) &amp;&amp;</div><div class='add'>+			attr-&gt;ia_size &lt;= i_size_read(inode) &amp;&amp;</div><div class='add'>+			!IS_ALIGNED(attr-&gt;ia_size,</div><div class='add'>+			F2FS_BLK_TO_BYTES(CAP_BLKS_PER_SEC(sbi))))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (is_quota_modification(idmap, inode, attr)) {</div><div class='ctx'> 		err = f2fs_dquot_initialize(inode);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -959,12 +1114,11 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i_uid_needs_update(idmap, attr, inode) ||</div><div class='ctx'> 	    i_gid_needs_update(idmap, attr, inode)) {</div><div class='del'>-		f2fs_lock_op(F2FS_I_SB(inode));</div><div class='add'>+		f2fs_lock_op(sbi);</div><div class='ctx'> 		err = dquot_transfer(idmap, inode, attr);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			set_sbi_flag(F2FS_I_SB(inode),</div><div class='del'>-					SBI_QUOTA_NEED_REPAIR);</div><div class='del'>-			f2fs_unlock_op(F2FS_I_SB(inode));</div><div class='add'>+			set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);</div><div class='add'>+			f2fs_unlock_op(sbi);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -974,7 +1128,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		i_uid_update(idmap, attr, inode);</div><div class='ctx'> 		i_gid_update(idmap, attr, inode);</div><div class='ctx'> 		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='del'>-		f2fs_unlock_op(F2FS_I_SB(inode));</div><div class='add'>+		f2fs_unlock_op(sbi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;ia_valid &amp; ATTR_SIZE) {</div><div class='hunk'>@@ -990,9 +1144,18 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+		/*</div><div class='add'>+		 * wait for inflight dio, blocks should be removed after</div><div class='add'>+		 * IO completion.</div><div class='add'>+		 */</div><div class='add'>+		if (attr-&gt;ia_size &lt; old_size)</div><div class='add'>+			inode_dio_wait(inode);</div><div class='add'>+</div><div class='add'>+		f2fs_down_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 		filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='add'>+		if (attr-&gt;ia_size &gt; old_size)</div><div class='add'>+			f2fs_zero_post_eof_page(inode, attr-&gt;ia_size, false);</div><div class='ctx'> 		truncate_setsize(inode, attr-&gt;ia_size);</div><div class='ctx'> </div><div class='ctx'> 		if (attr-&gt;ia_size &lt;= old_size)</div><div class='hunk'>@@ -1002,14 +1165,14 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		 * larger than i_size.</div><div class='ctx'> 		 */</div><div class='ctx'> 		filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='del'>-		f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+		f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;F2FS_I(inode)-&gt;i_size_lock);</div><div class='add'>+		spin_lock(&amp;fi-&gt;i_size_lock);</div><div class='ctx'> 		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='del'>-		F2FS_I(inode)-&gt;last_disk_size = i_size_read(inode);</div><div class='del'>-		spin_unlock(&amp;F2FS_I(inode)-&gt;i_size_lock);</div><div class='add'>+		fi-&gt;last_disk_size = i_size_read(inode);</div><div class='add'>+		spin_unlock(&amp;fi-&gt;i_size_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__setattr_copy(idmap, inode, attr);</div><div class='hunk'>@@ -1019,7 +1182,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 		if (is_inode_flag_set(inode, FI_ACL_MODE)) {</div><div class='ctx'> 			if (!err)</div><div class='del'>-				inode-&gt;i_mode = F2FS_I(inode)-&gt;i_acl_mode;</div><div class='add'>+				inode-&gt;i_mode = fi-&gt;i_acl_mode;</div><div class='ctx'> 			clear_inode_flag(inode, FI_ACL_MODE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1028,7 +1191,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> </div><div class='ctx'> 	/* inode change will produce dirty node pages flushed by checkpoint */</div><div class='del'>-	f2fs_balance_fs(F2FS_I_SB(inode), true);</div><div class='add'>+	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1048,7 +1211,7 @@ static int fill_zero(struct inode *inode, pgoff_t index,</div><div class='ctx'> 					loff_t start, loff_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1056,16 +1219,16 @@ static int fill_zero(struct inode *inode, pgoff_t index,</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_lock_op(sbi);</div><div class='del'>-	page = f2fs_get_new_data_page(inode, NULL, index, false);</div><div class='add'>+	folio = f2fs_get_new_data_folio(inode, NULL, index, false);</div><div class='ctx'> 	f2fs_unlock_op(sbi);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='del'>-	zero_user(page, start, len);</div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='add'>+	folio_zero_range(folio, start, len);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1088,7 +1251,7 @@ int f2fs_truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+		end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> 		count = min(end_offset - dn.ofs_in_node, pg_end - pg_start);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_bug_on(F2FS_I_SB(inode), count == 0 || count &gt; end_offset);</div><div class='hunk'>@@ -1111,6 +1274,8 @@ static int f2fs_punch_hole(struct inode *inode, loff_t offset, loff_t len)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	f2fs_zero_post_eof_page(inode, offset + len, true);</div><div class='add'>+</div><div class='ctx'> 	pg_start = ((unsigned long long) offset) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	pg_end = ((unsigned long long) offset + len) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -1183,7 +1348,7 @@ next_dnode:</div><div class='ctx'> 		goto next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	done = min((pgoff_t)ADDRS_PER_PAGE(dn.node_page, inode) -</div><div class='add'>+	done = min((pgoff_t)ADDRS_PER_PAGE(dn.node_folio, inode) -</div><div class='ctx'> 							dn.ofs_in_node, len);</div><div class='ctx'> 	for (i = 0; i &lt; done; i++, blkaddr++, do_replace++, dn.ofs_in_node++) {</div><div class='ctx'> 		*blkaddr = f2fs_data_blkaddr(&amp;dn);</div><div class='hunk'>@@ -1192,7 +1357,6 @@ next_dnode:</div><div class='ctx'> 			!f2fs_is_valid_blkaddr(sbi, *blkaddr,</div><div class='ctx'> 					DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 			f2fs_put_dnode(&amp;dn);</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 			return -EFSCORRUPTED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1232,7 +1396,7 @@ static int __roll_back_blkaddrs(struct inode *inode, block_t *blkaddr,</div><div class='ctx'> 		ret = f2fs_get_dnode_of_data(&amp;dn, off + i, LOOKUP_NODE_RA);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dec_valid_block_count(sbi, inode, 1);</div><div class='del'>-			f2fs_invalidate_blocks(sbi, *blkaddr);</div><div class='add'>+			f2fs_invalidate_blocks(sbi, *blkaddr, 1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			f2fs_update_data_blkaddr(&amp;dn, *blkaddr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1273,7 +1437,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ilen = min((pgoff_t)</div><div class='del'>-				ADDRS_PER_PAGE(dn.node_page, dst_inode) -</div><div class='add'>+				ADDRS_PER_PAGE(dn.node_folio, dst_inode) -</div><div class='ctx'> 						dn.ofs_in_node, len - i);</div><div class='ctx'> 			do {</div><div class='ctx'> 				dn.data_blkaddr = f2fs_data_blkaddr(&amp;dn);</div><div class='hunk'>@@ -1298,23 +1462,26 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode,</div><div class='ctx'> </div><div class='ctx'> 			f2fs_put_dnode(&amp;dn);</div><div class='ctx'> 		} else {</div><div class='del'>-			struct page *psrc, *pdst;</div><div class='add'>+			struct folio *fsrc, *fdst;</div><div class='ctx'> </div><div class='del'>-			psrc = f2fs_get_lock_data_page(src_inode,</div><div class='add'>+			fsrc = f2fs_get_lock_data_folio(src_inode,</div><div class='ctx'> 							src + i, true);</div><div class='del'>-			if (IS_ERR(psrc))</div><div class='del'>-				return PTR_ERR(psrc);</div><div class='del'>-			pdst = f2fs_get_new_data_page(dst_inode, NULL, dst + i,</div><div class='add'>+			if (IS_ERR(fsrc))</div><div class='add'>+				return PTR_ERR(fsrc);</div><div class='add'>+			fdst = f2fs_get_new_data_folio(dst_inode, NULL, dst + i,</div><div class='ctx'> 								true);</div><div class='del'>-			if (IS_ERR(pdst)) {</div><div class='del'>-				f2fs_put_page(psrc, 1);</div><div class='del'>-				return PTR_ERR(pdst);</div><div class='add'>+			if (IS_ERR(fdst)) {</div><div class='add'>+				f2fs_folio_put(fsrc, true);</div><div class='add'>+				return PTR_ERR(fdst);</div><div class='ctx'> 			}</div><div class='del'>-			memcpy_page(pdst, 0, psrc, 0, PAGE_SIZE);</div><div class='del'>-			set_page_dirty(pdst);</div><div class='del'>-			set_page_private_gcing(pdst);</div><div class='del'>-			f2fs_put_page(pdst, 1);</div><div class='del'>-			f2fs_put_page(psrc, 1);</div><div class='add'>+</div><div class='add'>+			f2fs_folio_wait_writeback(fdst, DATA, true, true);</div><div class='add'>+</div><div class='add'>+			memcpy_folio(fdst, 0, fsrc, 0, PAGE_SIZE);</div><div class='add'>+			folio_mark_dirty(fdst);</div><div class='add'>+			folio_set_f2fs_gcing(fdst);</div><div class='add'>+			f2fs_folio_put(fdst, true);</div><div class='add'>+			f2fs_folio_put(fsrc, true);</div><div class='ctx'> </div><div class='ctx'> 			ret = f2fs_truncate_hole(src_inode,</div><div class='ctx'> 						src + i, src + i + 1);</div><div class='hunk'>@@ -1392,6 +1559,8 @@ static int f2fs_do_collapse(struct inode *inode, loff_t offset, loff_t len)</div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='add'>+	f2fs_zero_post_eof_page(inode, offset + len, false);</div><div class='add'>+</div><div class='ctx'> 	f2fs_lock_op(sbi);</div><div class='ctx'> 	f2fs_drop_extent_tree(inode);</div><div class='ctx'> 	truncate_pagecache(inode, offset);</div><div class='hunk'>@@ -1478,16 +1647,18 @@ static int f2fs_do_zero_range(struct dnode_of_data *dn, pgoff_t start,</div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(sbi, dn-&gt;data_blkaddr,</div><div class='ctx'> 					DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 			ret = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_invalidate_blocks(sbi, dn-&gt;data_blkaddr);</div><div class='add'>+		f2fs_invalidate_blocks(sbi, dn-&gt;data_blkaddr, 1);</div><div class='ctx'> 		f2fs_set_data_blkaddr(dn, NEW_ADDR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_update_read_extent_cache_range(dn, start, 0, index - start);</div><div class='del'>-	f2fs_update_age_extent_cache_range(dn, start, index - start);</div><div class='add'>+	if (index &gt; start) {</div><div class='add'>+		f2fs_update_read_extent_cache_range(dn, start, 0,</div><div class='add'>+							index - start);</div><div class='add'>+		f2fs_update_age_extent_cache_range(dn, start, index - start);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1514,6 +1685,8 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	f2fs_zero_post_eof_page(inode, offset + len, true);</div><div class='add'>+</div><div class='ctx'> 	pg_start = ((unsigned long long) offset) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	pg_end = ((unsigned long long) offset + len) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -1561,7 +1734,7 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+			end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> 			end = min(pg_end, end_offset - dn.ofs_in_node + index);</div><div class='ctx'> </div><div class='ctx'> 			ret = f2fs_do_zero_range(&amp;dn, index, end);</div><div class='hunk'>@@ -1645,6 +1818,8 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)</div><div class='ctx'> 	/* avoid gc operation during block exchange */</div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 	filemap_invalidate_lock(mapping);</div><div class='add'>+</div><div class='add'>+	f2fs_zero_post_eof_page(inode, offset + len, false);</div><div class='ctx'> 	truncate_pagecache(inode, offset);</div><div class='ctx'> </div><div class='ctx'> 	while (!ret &amp;&amp; idx &gt; pg_start) {</div><div class='hunk'>@@ -1662,10 +1837,12 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)</div><div class='ctx'> 	}</div><div class='ctx'> 	filemap_invalidate_unlock(mapping);</div><div class='ctx'> 	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* write out all moved pages, if possible */</div><div class='ctx'> 	filemap_invalidate_lock(mapping);</div><div class='del'>-	filemap_write_and_wait_range(mapping, offset, LLONG_MAX);</div><div class='add'>+	ret = filemap_write_and_wait_range(mapping, offset, LLONG_MAX);</div><div class='ctx'> 	truncate_pagecache(inode, offset);</div><div class='ctx'> 	filemap_invalidate_unlock(mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -1700,6 +1877,8 @@ static int f2fs_expand_inode_data(struct inode *inode, loff_t offset,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	f2fs_zero_post_eof_page(inode, offset + len, true);</div><div class='add'>+</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='ctx'> 	pg_start = ((unsigned long long)offset) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1720,20 +1899,36 @@ static int f2fs_expand_inode_data(struct inode *inode, loff_t offset,</div><div class='ctx'> </div><div class='ctx'> 		map.m_len = sec_blks;</div><div class='ctx'> next_alloc:</div><div class='add'>+		f2fs_down_write(&amp;sbi-&gt;pin_sem);</div><div class='add'>+</div><div class='add'>+		if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {</div><div class='add'>+			if (has_not_enough_free_secs(sbi, 0, 0)) {</div><div class='add'>+				f2fs_up_write(&amp;sbi-&gt;pin_sem);</div><div class='add'>+				err = -ENOSPC;</div><div class='add'>+				f2fs_warn_ratelimited(sbi,</div><div class='add'>+					"ino:%lu, start:%lu, end:%lu, need to trigger GC to "</div><div class='add'>+					"reclaim enough free segment when checkpoint is enabled",</div><div class='add'>+					inode-&gt;i_ino, pg_start, pg_end);</div><div class='add'>+				goto out_err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (has_not_enough_free_secs(sbi, 0,</div><div class='del'>-			GET_SEC_FROM_SEG(sbi, overprovision_segments(sbi)))) {</div><div class='add'>+				sbi-&gt;reserved_pin_section)) {</div><div class='ctx'> 			f2fs_down_write(&amp;sbi-&gt;gc_lock);</div><div class='ctx'> 			stat_inc_gc_call_count(sbi, FOREGROUND);</div><div class='ctx'> 			err = f2fs_gc(sbi, &amp;gc_control);</div><div class='del'>-			if (err &amp;&amp; err != -ENODATA)</div><div class='add'>+			if (err &amp;&amp; err != -ENODATA) {</div><div class='add'>+				f2fs_up_write(&amp;sbi-&gt;pin_sem);</div><div class='ctx'> 				goto out_err;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_down_write(&amp;sbi-&gt;pin_sem);</div><div class='del'>-</div><div class='del'>-		f2fs_lock_op(sbi);</div><div class='del'>-		f2fs_allocate_new_section(sbi, CURSEG_COLD_DATA_PINNED, false);</div><div class='del'>-		f2fs_unlock_op(sbi);</div><div class='add'>+		err = f2fs_allocate_pinning_section(sbi);</div><div class='add'>+		if (err) {</div><div class='add'>+			f2fs_up_write(&amp;sbi-&gt;pin_sem);</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		map.m_seg_type = CURSEG_COLD_DATA_PINNED;</div><div class='ctx'> 		err = f2fs_map_blocks(inode, &amp;map, F2FS_GET_BLOCK_PRE_DIO);</div><div class='hunk'>@@ -1788,7 +1983,7 @@ static long f2fs_fallocate(struct file *file, int mode,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	if (!f2fs_is_checkpoint_ready(F2FS_I_SB(inode)))</div><div class='ctx'> 		return -ENOSPC;</div><div class='del'>-	if (!f2fs_is_compress_backend_ready(inode))</div><div class='add'>+	if (!f2fs_is_compress_backend_ready(inode) || IS_DEVICE_ALIASING(inode))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* f2fs only support -&gt;fallocate for regular file */</div><div class='hunk'>@@ -1799,15 +1994,6 @@ static long f2fs_fallocate(struct file *file, int mode,</div><div class='ctx'> 		(mode &amp; (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Pinned file should not support partial truncation since the block</div><div class='del'>-	 * can be used by applications.</div><div class='del'>-	 */</div><div class='del'>-	if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) &amp;&amp;</div><div class='del'>-		(mode &amp; (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE |</div><div class='del'>-			FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	if (mode &amp; ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE |</div><div class='ctx'> 			FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE |</div><div class='ctx'> 			FALLOC_FL_INSERT_RANGE))</div><div class='hunk'>@@ -1815,10 +2001,27 @@ static long f2fs_fallocate(struct file *file, int mode,</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Pinned file should not support partial truncation since the block</div><div class='add'>+	 * can be used by applications.</div><div class='add'>+	 */</div><div class='add'>+	if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) &amp;&amp;</div><div class='add'>+		(mode &amp; (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE |</div><div class='add'>+			FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE))) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = file_modified(file);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * wait for inflight dio, blocks should be removed after IO</div><div class='add'>+	 * completion.</div><div class='add'>+	 */</div><div class='add'>+	inode_dio_wait(inode);</div><div class='add'>+</div><div class='ctx'> 	if (mode &amp; FALLOC_FL_PUNCH_HOLE) {</div><div class='ctx'> 		if (offset &gt;= inode-&gt;i_size)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1849,6 +2052,9 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int f2fs_release_file(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='add'>+	if (atomic_dec_and_test(&amp;F2FS_I(inode)-&gt;open_count))</div><div class='add'>+		f2fs_remove_donate_inode(inode);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * f2fs_release_file is called at every close calls. So we should</div><div class='ctx'> 	 * not drop any inmemory pages by close called by other process.</div><div class='hunk'>@@ -1920,15 +2126,16 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='del'>-			f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+			f2fs_down_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> 			if (!f2fs_may_compress(inode) ||</div><div class='del'>-					(S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='del'>-					F2FS_HAS_BLOCKS(inode))) {</div><div class='del'>-				f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+				atomic_read(&amp;fi-&gt;writeback) ||</div><div class='add'>+				(S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='add'>+				F2FS_HAS_BLOCKS(inode))) {</div><div class='add'>+				f2fs_up_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			err = set_compress_context(inode);</div><div class='del'>-			f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+			f2fs_up_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> </div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -2047,10 +2254,12 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)</div><div class='ctx'> 	struct mnt_idmap *idmap = file_mnt_idmap(filp);</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct inode *pinode;</div><div class='ctx'> 	loff_t isize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!(filp-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='ctx'> 	if (!inode_owner_or_capable(idmap, inode))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='hunk'>@@ -2066,7 +2275,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_disable_compressed_file(inode)) {</div><div class='add'>+	if (!f2fs_disable_compressed_file(inode) ||</div><div class='add'>+			f2fs_is_pinned_file(inode)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2079,6 +2289,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	f2fs_down_write(&amp;fi-&gt;i_gc_rwsem[READ]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Should wait end_io to count F2FS_WB_CP_DATA correctly by</div><div class='hunk'>@@ -2088,37 +2299,33 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)</div><div class='ctx'> 		f2fs_warn(sbi, "Unexpected flush for atomic writes: ino=%lu, npages=%u",</div><div class='ctx'> 			  inode-&gt;i_ino, get_dirty_pages(inode));</div><div class='ctx'> 	ret = filemap_write_and_wait_range(inode-&gt;i_mapping, 0, LLONG_MAX);</div><div class='del'>-	if (ret) {</div><div class='del'>-		f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the inode already has a COW inode */</div><div class='ctx'> 	if (fi-&gt;cow_inode == NULL) {</div><div class='ctx'> 		/* Create a COW inode for atomic write */</div><div class='del'>-		pinode = f2fs_iget(inode-&gt;i_sb, fi-&gt;i_pino);</div><div class='del'>-		if (IS_ERR(pinode)) {</div><div class='del'>-			f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='del'>-			ret = PTR_ERR(pinode);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		struct dentry *dentry = file_dentry(filp);</div><div class='add'>+		struct inode *dir = d_inode(dentry-&gt;d_parent);</div><div class='ctx'> </div><div class='del'>-		ret = f2fs_get_tmpfile(idmap, pinode, &amp;fi-&gt;cow_inode);</div><div class='del'>-		iput(pinode);</div><div class='del'>-		if (ret) {</div><div class='del'>-			f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		ret = f2fs_get_tmpfile(idmap, dir, &amp;fi-&gt;cow_inode);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 		set_inode_flag(fi-&gt;cow_inode, FI_COW_FILE);</div><div class='ctx'> 		clear_inode_flag(fi-&gt;cow_inode, FI_INLINE_DATA);</div><div class='add'>+</div><div class='add'>+		/* Set the COW inode's atomic_inode to the atomic inode */</div><div class='add'>+		F2FS_I(fi-&gt;cow_inode)-&gt;atomic_inode = inode;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Reuse the already created COW inode */</div><div class='add'>+		f2fs_bug_on(sbi, get_dirty_pages(fi-&gt;cow_inode));</div><div class='add'>+</div><div class='add'>+		invalidate_mapping_pages(fi-&gt;cow_inode-&gt;i_mapping, 0, -1);</div><div class='add'>+</div><div class='ctx'> 		ret = f2fs_do_truncate_blocks(fi-&gt;cow_inode, 0, true);</div><div class='del'>-		if (ret) {</div><div class='del'>-			f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_write_inode(inode, NULL);</div><div class='hunk'>@@ -2137,7 +2344,11 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)</div><div class='ctx'> 	}</div><div class='ctx'> 	f2fs_i_size_write(fi-&gt;cow_inode, isize);</div><div class='ctx'> </div><div class='add'>+out_unlock:</div><div class='add'>+	f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[READ]);</div><div class='ctx'> 	f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	fi-&gt;atomic_write_task = current;</div><div class='hunk'>@@ -2155,6 +2366,9 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)</div><div class='ctx'> 	struct mnt_idmap *idmap = file_mnt_idmap(filp);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!(filp-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='ctx'> 	if (!inode_owner_or_capable(idmap, inode))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='hunk'>@@ -2187,6 +2401,9 @@ static int f2fs_ioc_abort_atomic_write(struct file *filp)</div><div class='ctx'> 	struct mnt_idmap *idmap = file_mnt_idmap(filp);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!(filp-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='ctx'> 	if (!inode_owner_or_capable(idmap, inode))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='hunk'>@@ -2205,34 +2422,13 @@ static int f2fs_ioc_abort_atomic_write(struct file *filp)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)</div><div class='add'>+int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag,</div><div class='add'>+						bool readonly, bool need_lock)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = file_inode(filp);</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct super_block *sb = sbi-&gt;sb;</div><div class='del'>-	__u32 in;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (get_user(in, (__u32 __user *)arg))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (in != F2FS_GOING_DOWN_FULLSYNC) {</div><div class='del'>-		ret = mnt_want_write_file(filp);</div><div class='del'>-		if (ret) {</div><div class='del'>-			if (ret == -EROFS) {</div><div class='del'>-				ret = 0;</div><div class='del'>-				f2fs_stop_checkpoint(sbi, false,</div><div class='del'>-						STOP_CP_REASON_SHUTDOWN);</div><div class='del'>-				trace_f2fs_shutdown(sbi, in, ret);</div><div class='del'>-			}</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (in) {</div><div class='add'>+	switch (flag) {</div><div class='ctx'> 	case F2FS_GOING_DOWN_FULLSYNC:</div><div class='ctx'> 		ret = bdev_freeze(sb-&gt;s_bdev);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -2243,8 +2439,11 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)</div><div class='ctx'> 	case F2FS_GOING_DOWN_METASYNC:</div><div class='ctx'> 		/* do checkpoint only */</div><div class='ctx'> 		ret = f2fs_sync_fs(sb, 1);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret == -EIO)</div><div class='add'>+				ret = 0;</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_SHUTDOWN);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F2FS_GOING_DOWN_NOSYNC:</div><div class='hunk'>@@ -2260,24 +2459,128 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_IS_DIRTY);</div><div class='ctx'> 		/* do checkpoint only */</div><div class='ctx'> 		ret = f2fs_sync_fs(sb, 1);</div><div class='add'>+		if (ret == -EIO)</div><div class='add'>+			ret = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (readonly)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * grab sb-&gt;s_umount to avoid racing w/ remount() and other shutdown</div><div class='add'>+	 * paths.</div><div class='add'>+	 */</div><div class='add'>+	if (need_lock)</div><div class='add'>+		down_write(&amp;sbi-&gt;sb-&gt;s_umount);</div><div class='add'>+</div><div class='ctx'> 	f2fs_stop_gc_thread(sbi);</div><div class='ctx'> 	f2fs_stop_discard_thread(sbi);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_drop_discard_cmd(sbi);</div><div class='ctx'> 	clear_opt(sbi, DISCARD);</div><div class='ctx'> </div><div class='add'>+	if (need_lock)</div><div class='add'>+		up_write(&amp;sbi-&gt;sb-&gt;s_umount);</div><div class='add'>+</div><div class='ctx'> 	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> out:</div><div class='del'>-	if (in != F2FS_GOING_DOWN_FULLSYNC)</div><div class='add'>+</div><div class='add'>+	trace_f2fs_shutdown(sbi, flag, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(filp);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+	__u32 in;</div><div class='add'>+	int ret;</div><div class='add'>+	bool need_drop = false, readonly = false;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (get_user(in, (__u32 __user *)arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (in != F2FS_GOING_DOWN_FULLSYNC) {</div><div class='add'>+		ret = mnt_want_write_file(filp);</div><div class='add'>+		if (ret) {</div><div class='add'>+			if (ret != -EROFS)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			/* fallback to nosync shutdown for readonly fs */</div><div class='add'>+			in = F2FS_GOING_DOWN_NOSYNC;</div><div class='add'>+			readonly = true;</div><div class='add'>+		} else {</div><div class='add'>+			need_drop = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = f2fs_do_shutdown(sbi, in, readonly, true);</div><div class='add'>+</div><div class='add'>+	if (need_drop)</div><div class='ctx'> 		mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_shutdown(sbi, in, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_keep_noreuse_range(struct inode *inode,</div><div class='add'>+				loff_t offset, loff_t len)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+	u64 max_bytes = F2FS_BLK_TO_BYTES(max_file_blocks(inode));</div><div class='add'>+	u64 start, end;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= max_bytes || len &gt; max_bytes ||</div><div class='add'>+	    (offset + len) &gt; max_bytes)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	start = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	end = DIV_ROUND_UP(offset + len, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	if (f2fs_is_atomic_file(inode)) {</div><div class='add'>+		inode_unlock(inode);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+	/* let's remove the range, if len = 0 */</div><div class='add'>+	if (!len) {</div><div class='add'>+		if (!list_empty(&amp;F2FS_I(inode)-&gt;gdonate_list)) {</div><div class='add'>+			list_del_init(&amp;F2FS_I(inode)-&gt;gdonate_list);</div><div class='add'>+			sbi-&gt;donate_files--;</div><div class='add'>+			if (is_inode_flag_set(inode, FI_DONATE_FINISHED))</div><div class='add'>+				ret = -EALREADY;</div><div class='add'>+			else</div><div class='add'>+				set_inode_flag(inode, FI_DONATE_FINISHED);</div><div class='add'>+		} else</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+	} else {</div><div class='add'>+		if (list_empty(&amp;F2FS_I(inode)-&gt;gdonate_list)) {</div><div class='add'>+			list_add_tail(&amp;F2FS_I(inode)-&gt;gdonate_list,</div><div class='add'>+					&amp;sbi-&gt;inode_list[DONATE_INODE]);</div><div class='add'>+			sbi-&gt;donate_files++;</div><div class='add'>+		} else {</div><div class='add'>+			list_move_tail(&amp;F2FS_I(inode)-&gt;gdonate_list,</div><div class='add'>+					&amp;sbi-&gt;inode_list[DONATE_INODE]);</div><div class='add'>+		}</div><div class='add'>+		F2FS_I(inode)-&gt;donate_start = start;</div><div class='add'>+		F2FS_I(inode)-&gt;donate_end = end - 1;</div><div class='add'>+		clear_inode_flag(inode, FI_DONATE_FINISHED);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+	inode_unlock(inode);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2285,14 +2588,14 @@ out:</div><div class='ctx'> static int f2fs_ioc_fitrim(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct fstrim_range range;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_hw_support_discard(F2FS_SB(sb)))</div><div class='add'>+	if (!f2fs_hw_support_discard(sbi))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;range, (struct fstrim_range __user *)arg,</div><div class='hunk'>@@ -2303,9 +2606,9 @@ static int f2fs_ioc_fitrim(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	range.minlen = max((unsigned int)range.minlen,</div><div class='del'>-			   bdev_discard_granularity(sb-&gt;s_bdev));</div><div class='del'>-	ret = f2fs_trim_fs(F2FS_SB(sb), &amp;range);</div><div class='add'>+	range.minlen = max_t(unsigned int, range.minlen,</div><div class='add'>+			f2fs_hw_discard_granularity(sbi));</div><div class='add'>+	ret = f2fs_trim_fs(sbi, &amp;range);</div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2313,7 +2616,7 @@ static int f2fs_ioc_fitrim(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (copy_to_user((struct fstrim_range __user *)arg, &amp;range,</div><div class='ctx'> 				sizeof(range)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='add'>+	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2330,13 +2633,14 @@ static bool uuid_is_nonzero(__u8 u[16])</div><div class='ctx'> static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_sb_has_encrypt(F2FS_I_SB(inode)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	ret = fscrypt_ioctl_set_policy(filp, (const void __user *)arg);</div><div class='ctx'> 	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='del'>-</div><div class='del'>-	return fscrypt_ioctl_set_policy(filp, (const void __user *)arg);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_ioc_get_encryption_policy(struct file *filp, unsigned long arg)</div><div class='hunk'>@@ -2578,20 +2882,21 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					.m_may_create = false };</div><div class='ctx'> 	struct extent_info ei = {};</div><div class='ctx'> 	pgoff_t pg_start, pg_end, next_pgofs;</div><div class='del'>-	unsigned int blk_per_seg = sbi-&gt;blocks_per_seg;</div><div class='ctx'> 	unsigned int total = 0, sec_num;</div><div class='ctx'> 	block_t blk_end = 0;</div><div class='ctx'> 	bool fragmented = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	pg_start = range-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pg_end = (range-&gt;start + range-&gt;len) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='add'>+	pg_start = range-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pg_end = min_t(pgoff_t,</div><div class='add'>+				(range-&gt;start + range-&gt;len) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE));</div><div class='ctx'> </div><div class='del'>-	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='add'>+	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED) ||</div><div class='add'>+		f2fs_is_atomic_file(inode)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2604,8 +2909,9 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* writeback all dirty pages in the range */</div><div class='del'>-	err = filemap_write_and_wait_range(inode-&gt;i_mapping, range-&gt;start,</div><div class='del'>-						range-&gt;start + range-&gt;len - 1);</div><div class='add'>+	err = filemap_write_and_wait_range(inode-&gt;i_mapping,</div><div class='add'>+						pg_start &lt;&lt; PAGE_SHIFT,</div><div class='add'>+						(pg_end &lt;&lt; PAGE_SHIFT) - 1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2614,7 +2920,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	 * block addresses are continuous.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (f2fs_lookup_read_extent_cache(inode, pg_start, &amp;ei)) {</div><div class='del'>-		if (ei.fofs + ei.len &gt;= pg_end)</div><div class='add'>+		if ((pgoff_t)ei.fofs + ei.len &gt;= pg_end)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2687,18 +2993,21 @@ do_map:</div><div class='ctx'> 		set_inode_flag(inode, FI_SKIP_WRITES);</div><div class='ctx'> </div><div class='ctx'> 		idx = map.m_lblk;</div><div class='del'>-		while (idx &lt; map.m_lblk + map.m_len &amp;&amp; cnt &lt; blk_per_seg) {</div><div class='del'>-			struct page *page;</div><div class='add'>+		while (idx &lt; map.m_lblk + map.m_len &amp;&amp;</div><div class='add'>+						cnt &lt; BLKS_PER_SEG(sbi)) {</div><div class='add'>+			struct folio *folio;</div><div class='ctx'> </div><div class='del'>-			page = f2fs_get_lock_data_page(inode, idx, true);</div><div class='del'>-			if (IS_ERR(page)) {</div><div class='del'>-				err = PTR_ERR(page);</div><div class='add'>+			folio = f2fs_get_lock_data_folio(inode, idx, true);</div><div class='add'>+			if (IS_ERR(folio)) {</div><div class='add'>+				err = PTR_ERR(folio);</div><div class='ctx'> 				goto clear_out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			set_page_private_gcing(page);</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='add'>+</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='add'>+			folio_set_f2fs_gcing(folio);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 			idx++;</div><div class='ctx'> 			cnt++;</div><div class='hunk'>@@ -2707,7 +3016,7 @@ do_map:</div><div class='ctx'> </div><div class='ctx'> 		map.m_lblk = idx;</div><div class='ctx'> check:</div><div class='del'>-		if (map.m_lblk &lt; pg_end &amp;&amp; cnt &lt; blk_per_seg)</div><div class='add'>+		if (map.m_lblk &lt; pg_end &amp;&amp; cnt &lt; BLKS_PER_SEG(sbi))</div><div class='ctx'> 			goto do_map;</div><div class='ctx'> </div><div class='ctx'> 		clear_inode_flag(inode, FI_SKIP_WRITES);</div><div class='hunk'>@@ -2737,7 +3046,7 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (!S_ISREG(inode-&gt;i_mode) || f2fs_is_atomic_file(inode))</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_readonly(sbi-&gt;sb))</div><div class='hunk'>@@ -2762,7 +3071,8 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg)</div><div class='ctx'> 	err = f2fs_defragment_range(sbi, filp, &amp;range);</div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='del'>-	f2fs_update_time(sbi, REQ_TIME);</div><div class='add'>+	if (range.len)</div><div class='add'>+		f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2813,11 +3123,17 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f2fs_compressed_file(src) || f2fs_compressed_file(dst)) {</div><div class='add'>+	if (f2fs_compressed_file(src) || f2fs_compressed_file(dst) ||</div><div class='add'>+		f2fs_is_pinned_file(src) || f2fs_is_pinned_file(dst)) {</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (f2fs_is_atomic_file(src) || f2fs_is_atomic_file(dst)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	if (pos_in + len &gt; src-&gt;i_size || pos_in + len &lt; pos_in)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -2869,9 +3185,9 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_lock_op(sbi);</div><div class='del'>-	ret = __exchange_data_block(src, dst, pos_in &gt;&gt; F2FS_BLKSIZE_BITS,</div><div class='del'>-				pos_out &gt;&gt; F2FS_BLKSIZE_BITS,</div><div class='del'>-				len &gt;&gt; F2FS_BLKSIZE_BITS, false);</div><div class='add'>+	ret = __exchange_data_block(src, dst, F2FS_BYTES_TO_BLK(pos_in),</div><div class='add'>+				F2FS_BYTES_TO_BLK(pos_out),</div><div class='add'>+				F2FS_BYTES_TO_BLK(len), false);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		if (dst_max_i_size)</div><div class='hunk'>@@ -2907,32 +3223,27 @@ out:</div><div class='ctx'> static int __f2fs_ioc_move_range(struct file *filp,</div><div class='ctx'> 				struct f2fs_move_range *range)</div><div class='ctx'> {</div><div class='del'>-	struct fd dst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(filp-&gt;f_mode &amp; FMODE_READ) ||</div><div class='ctx'> 			!(filp-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	dst = fdget(range-&gt;dst_fd);</div><div class='del'>-	if (!dst.file)</div><div class='add'>+	CLASS(fd, dst)(range-&gt;dst_fd);</div><div class='add'>+	if (fd_empty(dst))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (!(dst.file-&gt;f_mode &amp; FMODE_WRITE)) {</div><div class='del'>-		err = -EBADF;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='add'>+	if (!(fd_file(dst)-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	err = mnt_want_write_file(filp);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_out;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = f2fs_move_file_range(filp, range-&gt;pos_in, dst.file,</div><div class='add'>+	err = f2fs_move_file_range(filp, range-&gt;pos_in, fd_file(dst),</div><div class='ctx'> 					range-&gt;pos_out, range-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='del'>-err_out:</div><div class='del'>-	fdput(dst);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2976,8 +3287,8 @@ static int f2fs_ioc_flush_device(struct file *filp, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_multi_device(sbi) || sbi-&gt;s_ndevs - 1 &lt;= range.dev_num ||</div><div class='ctx'> 			__is_large_section(sbi)) {</div><div class='del'>-		f2fs_warn(sbi, "Can't flush %u in %d for segs_per_sec %u != 1",</div><div class='del'>-			  range.dev_num, sbi-&gt;s_ndevs, sbi-&gt;segs_per_sec);</div><div class='add'>+		f2fs_warn(sbi, "Can't flush %u in %d for SEGS_PER_SEC %u != 1",</div><div class='add'>+			  range.dev_num, sbi-&gt;s_ndevs, SEGS_PER_SEC(sbi));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3108,7 +3419,7 @@ static int f2fs_ioc_setproject(struct inode *inode, __u32 projid)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int f2fs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='hunk'>@@ -3132,7 +3443,7 @@ int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	u32 fsflags = fa-&gt;flags, mask = F2FS_SETTABLE_FS_FL;</div><div class='hunk'>@@ -3165,24 +3476,27 @@ int f2fs_pin_file_control(struct inode *inode, bool inc)</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> </div><div class='del'>-	/* Use i_gc_failures for normal file as a risk signal. */</div><div class='del'>-	if (inc)</div><div class='del'>-		f2fs_i_gc_failures_write(inode,</div><div class='del'>-				fi-&gt;i_gc_failures[GC_FAILURE_PIN] + 1);</div><div class='add'>+	if (IS_DEVICE_ALIASING(inode))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (fi-&gt;i_gc_failures[GC_FAILURE_PIN] &gt; sbi-&gt;gc_pin_file_threshold) {</div><div class='add'>+	if (fi-&gt;i_gc_failures &gt;= sbi-&gt;gc_pin_file_threshold) {</div><div class='ctx'> 		f2fs_warn(sbi, "%s: Enable GC = ino %lx after %x GC trials",</div><div class='del'>-			  __func__, inode-&gt;i_ino,</div><div class='del'>-			  fi-&gt;i_gc_failures[GC_FAILURE_PIN]);</div><div class='add'>+			  __func__, inode-&gt;i_ino, fi-&gt;i_gc_failures);</div><div class='ctx'> 		clear_inode_flag(inode, FI_PIN_FILE);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Use i_gc_failures for normal file as a risk signal. */</div><div class='add'>+	if (inc)</div><div class='add'>+		f2fs_i_gc_failures_write(inode, fi-&gt;i_gc_failures + 1);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	__u32 pin;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3192,22 +3506,39 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (!S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (f2fs_readonly(F2FS_I_SB(inode)-&gt;sb))</div><div class='add'>+	if (f2fs_readonly(sbi-&gt;sb))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='add'>+	if (!pin &amp;&amp; IS_DEVICE_ALIASING(inode))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	ret = mnt_want_write_file(filp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='add'>+	if (f2fs_is_atomic_file(inode)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!pin) {</div><div class='ctx'> 		clear_inode_flag(inode, FI_PIN_FILE);</div><div class='ctx'> 		f2fs_i_gc_failures_write(inode, 0);</div><div class='ctx'> 		goto done;</div><div class='add'>+	} else if (f2fs_is_pinned_file(inode)) {</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (F2FS_HAS_BLOCKS(inode)) {</div><div class='add'>+		ret = -EFBIG;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f2fs_should_update_outplace(inode, NULL)) {</div><div class='add'>+	/* Let's allow file pinning on zoned device. */</div><div class='add'>+	if (!f2fs_sb_has_blkzoned(sbi) &amp;&amp;</div><div class='add'>+	    f2fs_should_update_outplace(inode, NULL)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3227,9 +3558,9 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_inode_flag(inode, FI_PIN_FILE);</div><div class='del'>-	ret = F2FS_I(inode)-&gt;i_gc_failures[GC_FAILURE_PIN];</div><div class='add'>+	ret = F2FS_I(inode)-&gt;i_gc_failures;</div><div class='ctx'> done:</div><div class='del'>-	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);</div><div class='add'>+	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='hunk'>@@ -3242,10 +3573,33 @@ static int f2fs_ioc_get_pin_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 	__u32 pin = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_PIN_FILE))</div><div class='del'>-		pin = F2FS_I(inode)-&gt;i_gc_failures[GC_FAILURE_PIN];</div><div class='add'>+		pin = F2FS_I(inode)-&gt;i_gc_failures;</div><div class='ctx'> 	return put_user(pin, (u32 __user *)arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int f2fs_ioc_get_dev_alias_file(struct file *filp, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return put_user(IS_DEVICE_ALIASING(file_inode(filp)) ? 1 : 0,</div><div class='add'>+			(u32 __user *)arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_ioc_io_prio(struct file *filp, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(filp);</div><div class='add'>+	__u32 level;</div><div class='add'>+</div><div class='add'>+	if (get_user(level, (__u32 __user *)arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode) || level &gt;= F2FS_IOPRIO_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	F2FS_I(inode)-&gt;ioprio_hint = level;</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int f2fs_precache_extents(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='hunk'>@@ -3432,16 +3786,14 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='add'>+		blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='ctx'> 						dn-&gt;ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 		if (!__is_valid_data_blkaddr(blkaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr,</div><div class='del'>-					DATA_GENERIC_ENHANCE))) {</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+					DATA_GENERIC_ENHANCE)))</div><div class='ctx'> 			return -EFSCORRUPTED;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (count) {</div><div class='hunk'>@@ -3481,6 +3833,7 @@ next:</div><div class='ctx'> static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	pgoff_t page_idx = 0, last_idx;</div><div class='ctx'> 	unsigned int released_blocks = 0;</div><div class='hunk'>@@ -3490,9 +3843,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (!f2fs_sb_has_compression(sbi))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (f2fs_readonly(sbi-&gt;sb))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='hunk'>@@ -3511,7 +3861,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='add'>+	if (!f2fs_compressed_file(inode) ||</div><div class='add'>+		is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3520,7 +3871,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!atomic_read(&amp;F2FS_I(inode)-&gt;i_compr_blocks)) {</div><div class='add'>+	if (!atomic_read(&amp;fi-&gt;i_compr_blocks)) {</div><div class='ctx'> 		ret = -EPERM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3529,7 +3880,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 	inode_set_ctime_current(inode);</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> </div><div class='del'>-	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	f2fs_down_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='ctx'> 	last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);</div><div class='hunk'>@@ -3538,9 +3889,12 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 		struct dnode_of_data dn;</div><div class='ctx'> 		pgoff_t end_offset, count;</div><div class='ctx'> </div><div class='add'>+		f2fs_lock_op(sbi);</div><div class='add'>+</div><div class='ctx'> 		set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='ctx'> 		ret = f2fs_get_dnode_of_data(&amp;dn, page_idx, LOOKUP_NODE);</div><div class='ctx'> 		if (ret) {</div><div class='add'>+			f2fs_unlock_op(sbi);</div><div class='ctx'> 			if (ret == -ENOENT) {</div><div class='ctx'> 				page_idx = f2fs_get_next_page_offset(&amp;dn,</div><div class='ctx'> 								page_idx);</div><div class='hunk'>@@ -3550,14 +3904,16 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+		end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> 		count = min(end_offset - dn.ofs_in_node, last_idx - page_idx);</div><div class='del'>-		count = round_up(count, F2FS_I(inode)-&gt;i_cluster_size);</div><div class='add'>+		count = round_up(count, fi-&gt;i_cluster_size);</div><div class='ctx'> </div><div class='ctx'> 		ret = release_compress_blocks(&amp;dn, count);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_put_dnode(&amp;dn);</div><div class='ctx'> </div><div class='add'>+		f2fs_unlock_op(sbi);</div><div class='add'>+</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -3566,8 +3922,10 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='del'>-	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> out:</div><div class='add'>+	if (released_blocks)</div><div class='add'>+		f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='hunk'>@@ -3575,84 +3933,103 @@ out:</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='ctx'> 		ret = put_user(released_blocks, (u64 __user *)arg);</div><div class='ctx'> 	} else if (released_blocks &amp;&amp;</div><div class='del'>-			atomic_read(&amp;F2FS_I(inode)-&gt;i_compr_blocks)) {</div><div class='add'>+			atomic_read(&amp;fi-&gt;i_compr_blocks)) {</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 		f2fs_warn(sbi, "%s: partial blocks were released i_ino=%lx "</div><div class='ctx'> 			"iblocks=%llu, released=%u, compr_blocks=%u, "</div><div class='ctx'> 			"run fsck to fix.",</div><div class='ctx'> 			__func__, inode-&gt;i_ino, inode-&gt;i_blocks,</div><div class='ctx'> 			released_blocks,</div><div class='del'>-			atomic_read(&amp;F2FS_I(inode)-&gt;i_compr_blocks));</div><div class='add'>+			atomic_read(&amp;fi-&gt;i_compr_blocks));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)</div><div class='add'>+static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count,</div><div class='add'>+		unsigned int *reserved_blocks)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dn-&gt;inode);</div><div class='del'>-	unsigned int reserved_blocks = 0;</div><div class='ctx'> 	int cluster_size = F2FS_I(dn-&gt;inode)-&gt;i_cluster_size;</div><div class='ctx'> 	block_t blkaddr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='add'>+		blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='ctx'> 						dn-&gt;ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 		if (!__is_valid_data_blkaddr(blkaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr,</div><div class='del'>-					DATA_GENERIC_ENHANCE))) {</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+					DATA_GENERIC_ENHANCE)))</div><div class='ctx'> 			return -EFSCORRUPTED;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		int compr_blocks = 0;</div><div class='del'>-		blkcnt_t reserved;</div><div class='add'>+		blkcnt_t reserved = 0;</div><div class='add'>+		blkcnt_t to_reserved;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; cluster_size; i++, dn-&gt;ofs_in_node++) {</div><div class='del'>-			blkaddr = f2fs_data_blkaddr(dn);</div><div class='add'>+		for (i = 0; i &lt; cluster_size; i++) {</div><div class='add'>+			blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='add'>+						dn-&gt;ofs_in_node + i);</div><div class='ctx'> </div><div class='ctx'> 			if (i == 0) {</div><div class='del'>-				if (blkaddr == COMPRESS_ADDR)</div><div class='del'>-					continue;</div><div class='del'>-				dn-&gt;ofs_in_node += cluster_size;</div><div class='del'>-				goto next;</div><div class='add'>+				if (blkaddr != COMPRESS_ADDR) {</div><div class='add'>+					dn-&gt;ofs_in_node += cluster_size;</div><div class='add'>+					goto next;</div><div class='add'>+				}</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * compressed cluster was not released due to it</div><div class='add'>+			 * fails in release_compress_blocks(), so NEW_ADDR</div><div class='add'>+			 * is a possible case.</div><div class='add'>+			 */</div><div class='add'>+			if (blkaddr == NEW_ADDR) {</div><div class='add'>+				reserved++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			if (__is_valid_data_blkaddr(blkaddr)) {</div><div class='ctx'> 				compr_blocks++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			f2fs_set_data_blkaddr(dn, NEW_ADDR);</div><div class='add'>+		to_reserved = cluster_size - compr_blocks - reserved;</div><div class='add'>+</div><div class='add'>+		/* for the case all blocks in cluster were reserved */</div><div class='add'>+		if (reserved &amp;&amp; to_reserved == 1) {</div><div class='add'>+			dn-&gt;ofs_in_node += cluster_size;</div><div class='add'>+			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		reserved = cluster_size - compr_blocks;</div><div class='del'>-		ret = inc_valid_block_count(sbi, dn-&gt;inode, &amp;reserved);</div><div class='del'>-		if (ret)</div><div class='add'>+		ret = inc_valid_block_count(sbi, dn-&gt;inode,</div><div class='add'>+						&amp;to_reserved, false);</div><div class='add'>+		if (unlikely(ret))</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		if (reserved != cluster_size - compr_blocks)</div><div class='del'>-			return -ENOSPC;</div><div class='add'>+		for (i = 0; i &lt; cluster_size; i++, dn-&gt;ofs_in_node++) {</div><div class='add'>+			if (f2fs_data_blkaddr(dn) == NULL_ADDR)</div><div class='add'>+				f2fs_set_data_blkaddr(dn, NEW_ADDR);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		f2fs_i_compr_blocks_update(dn-&gt;inode, compr_blocks, true);</div><div class='ctx'> </div><div class='del'>-		reserved_blocks += reserved;</div><div class='add'>+		*reserved_blocks += to_reserved;</div><div class='ctx'> next:</div><div class='ctx'> 		count -= cluster_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return reserved_blocks;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	pgoff_t page_idx = 0, last_idx;</div><div class='ctx'> 	unsigned int reserved_blocks = 0;</div><div class='hunk'>@@ -3661,9 +4038,6 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (!f2fs_sb_has_compression(sbi))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (f2fs_readonly(sbi-&gt;sb))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='hunk'>@@ -3671,19 +4045,20 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;F2FS_I(inode)-&gt;i_compr_blocks))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='del'>-	if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='add'>+	if (!f2fs_compressed_file(inode) ||</div><div class='add'>+		!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto unlock_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	if (atomic_read(&amp;fi-&gt;i_compr_blocks))</div><div class='add'>+		goto unlock_inode;</div><div class='add'>+</div><div class='add'>+	f2fs_down_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='ctx'> 	last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);</div><div class='hunk'>@@ -3692,9 +4067,12 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 		struct dnode_of_data dn;</div><div class='ctx'> 		pgoff_t end_offset, count;</div><div class='ctx'> </div><div class='add'>+		f2fs_lock_op(sbi);</div><div class='add'>+</div><div class='ctx'> 		set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='ctx'> 		ret = f2fs_get_dnode_of_data(&amp;dn, page_idx, LOOKUP_NODE);</div><div class='ctx'> 		if (ret) {</div><div class='add'>+			f2fs_unlock_op(sbi);</div><div class='ctx'> 			if (ret == -ENOENT) {</div><div class='ctx'> 				page_idx = f2fs_get_next_page_offset(&amp;dn,</div><div class='ctx'> 								page_idx);</div><div class='hunk'>@@ -3704,45 +4082,47 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+		end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> 		count = min(end_offset - dn.ofs_in_node, last_idx - page_idx);</div><div class='del'>-		count = round_up(count, F2FS_I(inode)-&gt;i_cluster_size);</div><div class='add'>+		count = round_up(count, fi-&gt;i_cluster_size);</div><div class='ctx'> </div><div class='del'>-		ret = reserve_compress_blocks(&amp;dn, count);</div><div class='add'>+		ret = reserve_compress_blocks(&amp;dn, count, &amp;reserved_blocks);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_put_dnode(&amp;dn);</div><div class='ctx'> </div><div class='add'>+		f2fs_unlock_op(sbi);</div><div class='add'>+</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		page_idx += count;</div><div class='del'>-		reserved_blocks += ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='del'>-	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='add'>+	f2fs_up_write(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> </div><div class='del'>-	if (ret &gt;= 0) {</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		clear_inode_flag(inode, FI_COMPRESS_RELEASED);</div><div class='ctx'> 		inode_set_ctime_current(inode);</div><div class='ctx'> 		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> 	}</div><div class='ctx'> unlock_inode:</div><div class='add'>+	if (reserved_blocks)</div><div class='add'>+		f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-out:</div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='del'>-	if (ret &gt;= 0) {</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		ret = put_user(reserved_blocks, (u64 __user *)arg);</div><div class='ctx'> 	} else if (reserved_blocks &amp;&amp;</div><div class='del'>-			atomic_read(&amp;F2FS_I(inode)-&gt;i_compr_blocks)) {</div><div class='add'>+			atomic_read(&amp;fi-&gt;i_compr_blocks)) {</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-		f2fs_warn(sbi, "%s: partial blocks were released i_ino=%lx "</div><div class='add'>+		f2fs_warn(sbi, "%s: partial blocks were reserved i_ino=%lx "</div><div class='ctx'> 			"iblocks=%llu, reserved=%u, compr_blocks=%u, "</div><div class='ctx'> 			"run fsck to fix.",</div><div class='ctx'> 			__func__, inode-&gt;i_ino, inode-&gt;i_blocks,</div><div class='ctx'> 			reserved_blocks,</div><div class='del'>-			atomic_read(&amp;F2FS_I(inode)-&gt;i_compr_blocks));</div><div class='add'>+			atomic_read(&amp;fi-&gt;i_compr_blocks));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -3805,7 +4185,9 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 			 IS_ENCRYPTED(inode) &amp;&amp; f2fs_is_multi_device(sbi)))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	file_start_write(filp);</div><div class='add'>+	ret = mnt_want_write_file(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_is_atomic_file(inode) || f2fs_compressed_file(inode) ||</div><div class='hunk'>@@ -3864,7 +4246,7 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);</div><div class='add'>+		end_offset = ADDRS_PER_PAGE(dn.node_folio, inode);</div><div class='ctx'> 		count = min(end_offset - dn.ofs_in_node, pg_end - index);</div><div class='ctx'> 		for (i = 0; i &lt; count; i++, index++, dn.ofs_in_node++) {</div><div class='ctx'> 			struct block_device *cur_bdev;</div><div class='hunk'>@@ -3877,8 +4259,6 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 						DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 				ret = -EFSCORRUPTED;</div><div class='ctx'> 				f2fs_put_dnode(&amp;dn);</div><div class='del'>-				f2fs_handle_error(sbi,</div><div class='del'>-						ERROR_INVALID_BLKADDR);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -3927,12 +4307,13 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)</div><div class='ctx'> 	if (len)</div><div class='ctx'> 		ret = f2fs_secure_erase(prev_bdev, inode, prev_index,</div><div class='ctx'> 				prev_block, len, range.flags);</div><div class='add'>+	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> out:</div><div class='ctx'> 	filemap_invalidate_unlock(mapping);</div><div class='ctx'> 	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> err:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	file_end_write(filp);</div><div class='add'>+	mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -3967,6 +4348,7 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)</div><div class='ctx'> static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct f2fs_comp_option option;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -3981,16 +4363,22 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)</div><div class='ctx'> 				sizeof(option)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_compressed_file(inode) ||</div><div class='del'>-			option.log_cluster_size &lt; MIN_COMPRESS_LOG_SIZE ||</div><div class='del'>-			option.log_cluster_size &gt; MAX_COMPRESS_LOG_SIZE ||</div><div class='del'>-			option.algorithm &gt;= COMPRESS_MAX)</div><div class='add'>+	if (option.log_cluster_size &lt; MIN_COMPRESS_LOG_SIZE ||</div><div class='add'>+		option.log_cluster_size &gt; MAX_COMPRESS_LOG_SIZE ||</div><div class='add'>+		option.algorithm &gt;= COMPRESS_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	file_start_write(filp);</div><div class='add'>+	ret = mnt_want_write_file(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+	if (!f2fs_compressed_file(inode)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4001,27 +4389,27 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	F2FS_I(inode)-&gt;i_compress_algorithm = option.algorithm;</div><div class='del'>-	F2FS_I(inode)-&gt;i_log_cluster_size = option.log_cluster_size;</div><div class='del'>-	F2FS_I(inode)-&gt;i_cluster_size = BIT(option.log_cluster_size);</div><div class='add'>+	fi-&gt;i_compress_algorithm = option.algorithm;</div><div class='add'>+	fi-&gt;i_log_cluster_size = option.log_cluster_size;</div><div class='add'>+	fi-&gt;i_cluster_size = BIT(option.log_cluster_size);</div><div class='ctx'> 	/* Set default level */</div><div class='del'>-	if (F2FS_I(inode)-&gt;i_compress_algorithm == COMPRESS_ZSTD)</div><div class='del'>-		F2FS_I(inode)-&gt;i_compress_level = F2FS_ZSTD_DEFAULT_CLEVEL;</div><div class='add'>+	if (fi-&gt;i_compress_algorithm == COMPRESS_ZSTD)</div><div class='add'>+		fi-&gt;i_compress_level = F2FS_ZSTD_DEFAULT_CLEVEL;</div><div class='ctx'> 	else</div><div class='del'>-		F2FS_I(inode)-&gt;i_compress_level = 0;</div><div class='add'>+		fi-&gt;i_compress_level = 0;</div><div class='ctx'> 	/* Adjust mount option level */</div><div class='ctx'> 	if (option.algorithm == F2FS_OPTION(sbi).compress_algorithm &amp;&amp;</div><div class='ctx'> 	    F2FS_OPTION(sbi).compress_level)</div><div class='del'>-		F2FS_I(inode)-&gt;i_compress_level = F2FS_OPTION(sbi).compress_level;</div><div class='add'>+		fi-&gt;i_compress_level = F2FS_OPTION(sbi).compress_level;</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_compress_backend_ready(inode))</div><div class='ctx'> 		f2fs_warn(sbi, "compression algorithm is successfully set, "</div><div class='ctx'> 			"but current kernel doesn't support this algorithm.");</div><div class='ctx'> out:</div><div class='del'>-	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='add'>+	f2fs_up_write(&amp;fi-&gt;i_sem);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	file_end_write(filp);</div><div class='add'>+	mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4030,32 +4418,36 @@ static int redirty_blocks(struct inode *inode, pgoff_t page_idx, int len)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_READAHEAD(ractl, NULL, NULL, inode-&gt;i_mapping, page_idx);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	pgoff_t redirty_idx = page_idx;</div><div class='del'>-	int i, page_len = 0, ret = 0;</div><div class='add'>+	int page_len = 0, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	page_cache_ra_unbounded(&amp;ractl, len, 0);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; len; i++, page_idx++) {</div><div class='del'>-		page = read_cache_page(mapping, page_idx, NULL, NULL);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			ret = PTR_ERR(page);</div><div class='add'>+	do {</div><div class='add'>+		folio = read_cache_folio(mapping, page_idx, NULL, NULL);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			ret = PTR_ERR(folio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		page_len++;</div><div class='del'>-	}</div><div class='add'>+		page_len += folio_nr_pages(folio) - (page_idx - folio-&gt;index);</div><div class='add'>+		page_idx = folio_next_index(folio);</div><div class='add'>+	} while (page_len &lt; len);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; page_len; i++, redirty_idx++) {</div><div class='del'>-		page = find_lock_page(mapping, redirty_idx);</div><div class='add'>+	do {</div><div class='add'>+		folio = filemap_lock_folio(mapping, redirty_idx);</div><div class='ctx'> </div><div class='del'>-		/* It will never fail, when page has pinned above */</div><div class='del'>-		f2fs_bug_on(F2FS_I_SB(inode), !page);</div><div class='add'>+		/* It will never fail, when folio has pinned above */</div><div class='add'>+		f2fs_bug_on(F2FS_I_SB(inode), IS_ERR(folio));</div><div class='ctx'> </div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		set_page_private_gcing(page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='del'>-		f2fs_put_page(page, 0);</div><div class='del'>-	}</div><div class='add'>+		f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='add'>+</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+		folio_set_f2fs_gcing(folio);</div><div class='add'>+		redirty_idx = folio_next_index(folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put_refs(folio, 2);</div><div class='add'>+	} while (redirty_idx &lt; page_idx);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4065,10 +4457,8 @@ static int f2fs_ioc_decompress_file(struct file *filp)</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='del'>-	pgoff_t page_idx = 0, last_idx;</div><div class='del'>-	unsigned int blk_per_seg = sbi-&gt;blocks_per_seg;</div><div class='del'>-	int cluster_size = fi-&gt;i_cluster_size;</div><div class='del'>-	int count, ret;</div><div class='add'>+	pgoff_t page_idx = 0, last_idx, cluster_idx;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_sb_has_compression(sbi) ||</div><div class='ctx'> 			F2FS_OPTION(sbi).compress_mode != COMPR_MODE_USER)</div><div class='hunk'>@@ -4077,12 +4467,11 @@ static int f2fs_ioc_decompress_file(struct file *filp)</div><div class='ctx'> 	if (!(filp-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='del'>-	file_start_write(filp);</div><div class='add'>+	ret = mnt_want_write_file(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_compress_backend_ready(inode)) {</div><div class='hunk'>@@ -4090,7 +4479,8 @@ static int f2fs_ioc_decompress_file(struct file *filp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='add'>+	if (!f2fs_compressed_file(inode) ||</div><div class='add'>+		is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4103,22 +4493,24 @@ static int f2fs_ioc_decompress_file(struct file *filp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);</div><div class='add'>+	last_idx &gt;&gt;= fi-&gt;i_log_cluster_size;</div><div class='add'>+</div><div class='add'>+	for (cluster_idx = 0; cluster_idx &lt; last_idx; cluster_idx++) {</div><div class='add'>+		page_idx = cluster_idx &lt;&lt; fi-&gt;i_log_cluster_size;</div><div class='ctx'> </div><div class='del'>-	count = last_idx - page_idx;</div><div class='del'>-	while (count &amp;&amp; count &gt;= cluster_size) {</div><div class='del'>-		ret = redirty_blocks(inode, page_idx, cluster_size);</div><div class='add'>+		if (!f2fs_is_compressed_cluster(inode, page_idx))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = redirty_blocks(inode, page_idx, fi-&gt;i_cluster_size);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (get_dirty_pages(inode) &gt;= blk_per_seg) {</div><div class='add'>+		if (get_dirty_pages(inode) &gt;= BLKS_PER_SEG(sbi)) {</div><div class='ctx'> 			ret = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		count -= cluster_size;</div><div class='del'>-		page_idx += cluster_size;</div><div class='del'>-</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		if (fatal_signal_pending(current)) {</div><div class='ctx'> 			ret = -EINTR;</div><div class='hunk'>@@ -4133,9 +4525,10 @@ static int f2fs_ioc_decompress_file(struct file *filp)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		f2fs_warn(sbi, "%s: The file might be partially decompressed (errno=%d). Please delete the file.",</div><div class='ctx'> 			  __func__, ret);</div><div class='add'>+	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	file_end_write(filp);</div><div class='add'>+	mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4144,10 +4537,9 @@ static int f2fs_ioc_compress_file(struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	pgoff_t page_idx = 0, last_idx;</div><div class='del'>-	unsigned int blk_per_seg = sbi-&gt;blocks_per_seg;</div><div class='del'>-	int cluster_size = F2FS_I(inode)-&gt;i_cluster_size;</div><div class='del'>-	int count, ret;</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='add'>+	pgoff_t page_idx = 0, last_idx, cluster_idx;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_sb_has_compression(sbi) ||</div><div class='ctx'> 			F2FS_OPTION(sbi).compress_mode != COMPR_MODE_USER)</div><div class='hunk'>@@ -4156,12 +4548,11 @@ static int f2fs_ioc_compress_file(struct file *filp)</div><div class='ctx'> 	if (!(filp-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_compressed_file(inode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='del'>-	file_start_write(filp);</div><div class='add'>+	ret = mnt_want_write_file(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_compress_backend_ready(inode)) {</div><div class='hunk'>@@ -4169,7 +4560,8 @@ static int f2fs_ioc_compress_file(struct file *filp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='add'>+	if (!f2fs_compressed_file(inode) ||</div><div class='add'>+		is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4181,22 +4573,24 @@ static int f2fs_ioc_compress_file(struct file *filp)</div><div class='ctx'> 	set_inode_flag(inode, FI_ENABLE_COMPRESS);</div><div class='ctx'> </div><div class='ctx'> 	last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);</div><div class='add'>+	last_idx &gt;&gt;= fi-&gt;i_log_cluster_size;</div><div class='add'>+</div><div class='add'>+	for (cluster_idx = 0; cluster_idx &lt; last_idx; cluster_idx++) {</div><div class='add'>+		page_idx = cluster_idx &lt;&lt; fi-&gt;i_log_cluster_size;</div><div class='add'>+</div><div class='add'>+		if (f2fs_is_sparse_cluster(inode, page_idx))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	count = last_idx - page_idx;</div><div class='del'>-	while (count &amp;&amp; count &gt;= cluster_size) {</div><div class='del'>-		ret = redirty_blocks(inode, page_idx, cluster_size);</div><div class='add'>+		ret = redirty_blocks(inode, page_idx, fi-&gt;i_cluster_size);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (get_dirty_pages(inode) &gt;= blk_per_seg) {</div><div class='add'>+		if (get_dirty_pages(inode) &gt;= BLKS_PER_SEG(sbi)) {</div><div class='ctx'> 			ret = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		count -= cluster_size;</div><div class='del'>-		page_idx += cluster_size;</div><div class='del'>-</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		if (fatal_signal_pending(current)) {</div><div class='ctx'> 			ret = -EINTR;</div><div class='hunk'>@@ -4213,9 +4607,10 @@ static int f2fs_ioc_compress_file(struct file *filp)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		f2fs_warn(sbi, "%s: The file might be partially compressed (errno=%d). Please delete the file.",</div><div class='ctx'> 			  __func__, ret);</div><div class='add'>+	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	file_end_write(filp);</div><div class='add'>+	mnt_drop_write_file(filp);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -4306,6 +4701,10 @@ static long __f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		return f2fs_ioc_decompress_file(filp);</div><div class='ctx'> 	case F2FS_IOC_COMPRESS_FILE:</div><div class='ctx'> 		return f2fs_ioc_compress_file(filp);</div><div class='add'>+	case F2FS_IOC_GET_DEV_ALIAS_FILE:</div><div class='add'>+		return f2fs_ioc_get_dev_alias_file(filp, arg);</div><div class='add'>+	case F2FS_IOC_IO_PRIO:</div><div class='add'>+		return f2fs_ioc_io_prio(filp, arg);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4396,6 +4795,13 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 		f2fs_down_read(&amp;fi-&gt;i_gc_rwsem[READ]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* dio is not compatible w/ atomic file */</div><div class='add'>+	if (f2fs_is_atomic_file(inode)) {</div><div class='add'>+		f2fs_up_read(&amp;fi-&gt;i_gc_rwsem[READ]);</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have to use __iomap_dio_rw() and iomap_dio_complete() instead of</div><div class='ctx'> 	 * the higher-level function iomap_dio_rw() in order to ensure that the</div><div class='hunk'>@@ -4447,6 +4853,7 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='ctx'> 	const loff_t pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	ssize_t ret;</div><div class='add'>+	bool dio;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_compress_backend_ready(inode))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -4455,7 +4862,15 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 		f2fs_trace_rw_file_path(iocb-&gt;ki_filp, iocb-&gt;ki_pos,</div><div class='ctx'> 					iov_iter_count(to), READ);</div><div class='ctx'> </div><div class='del'>-	if (f2fs_should_use_dio(inode, iocb, to)) {</div><div class='add'>+	dio = f2fs_should_use_dio(inode, iocb, to);</div><div class='add'>+</div><div class='add'>+	/* In LFS mode, if there is inflight dio, wait for its completion */</div><div class='add'>+	if (f2fs_lfs_mode(F2FS_I_SB(inode)) &amp;&amp;</div><div class='add'>+	    get_pages(F2FS_I_SB(inode), F2FS_DIO_WRITE) &amp;&amp;</div><div class='add'>+		(!f2fs_is_pinned_file(inode) || !dio))</div><div class='add'>+		inode_dio_wait(inode);</div><div class='add'>+</div><div class='add'>+	if (dio) {</div><div class='ctx'> 		ret = f2fs_dio_read_iter(iocb, to);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = filemap_read(iocb, to, 0);</div><div class='hunk'>@@ -4463,8 +4878,7 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 			f2fs_update_iostat(F2FS_I_SB(inode), inode,</div><div class='ctx'> 						APP_BUFFERED_READ_IO, ret);</div><div class='ctx'> 	}</div><div class='del'>-	if (trace_f2fs_dataread_end_enabled())</div><div class='del'>-		trace_f2fs_dataread_end(inode, pos, ret);</div><div class='add'>+	trace_f2fs_dataread_end(inode, pos, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4487,8 +4901,7 @@ static ssize_t f2fs_file_splice_read(struct file *in, loff_t *ppos,</div><div class='ctx'> 		f2fs_update_iostat(F2FS_I_SB(inode), inode,</div><div class='ctx'> 				   APP_BUFFERED_READ_IO, ret);</div><div class='ctx'> </div><div class='del'>-	if (trace_f2fs_dataread_end_enabled())</div><div class='del'>-		trace_f2fs_dataread_end(inode, pos, ret);</div><div class='add'>+	trace_f2fs_dataread_end(inode, pos, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4512,6 +4925,9 @@ static ssize_t f2fs_write_checks(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	err = file_modified(file);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='add'>+</div><div class='add'>+	f2fs_zero_post_eof_page(inode,</div><div class='add'>+		iocb-&gt;ki_pos + iov_iter_count(from), true);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4569,9 +4985,11 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	map.m_may_create = true;</div><div class='add'>+	if (!IS_DEVICE_ALIASING(inode))</div><div class='add'>+		map.m_may_create = true;</div><div class='ctx'> 	if (dio) {</div><div class='del'>-		map.m_seg_type = f2fs_rw_hint_to_seg_type(inode-&gt;i_write_hint);</div><div class='add'>+		map.m_seg_type = f2fs_rw_hint_to_seg_type(sbi,</div><div class='add'>+						inode-&gt;i_write_hint);</div><div class='ctx'> 		flag = F2FS_GET_BLOCK_PRE_DIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		map.m_seg_type = NO_CHECK_TYPE;</div><div class='hunk'>@@ -4619,8 +5037,21 @@ static int f2fs_dio_write_end_io(struct kiocb *iocb, ssize_t size, int error,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void f2fs_dio_write_submit_io(const struct iomap_iter *iter,</div><div class='add'>+					struct bio *bio, loff_t file_offset)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = iter-&gt;inode;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+	enum log_type type = f2fs_rw_hint_to_seg_type(sbi, inode-&gt;i_write_hint);</div><div class='add'>+	enum temp_type temp = f2fs_get_segment_temp(sbi, type);</div><div class='add'>+</div><div class='add'>+	bio-&gt;bi_write_hint = f2fs_io_type_to_rw_hint(sbi, DATA, temp);</div><div class='add'>+	submit_bio(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct iomap_dio_ops f2fs_iomap_dio_write_ops = {</div><div class='del'>-	.end_io = f2fs_dio_write_end_io,</div><div class='add'>+	.end_io		= f2fs_dio_write_end_io,</div><div class='add'>+	.submit_io	= f2fs_dio_write_submit_io,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void f2fs_flush_buffered_write(struct address_space *mapping,</div><div class='hunk'>@@ -4757,6 +5188,8 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	bool dio;</div><div class='ctx'> 	bool may_need_sync = true;</div><div class='ctx'> 	int preallocated;</div><div class='add'>+	const loff_t pos = iocb-&gt;ki_pos;</div><div class='add'>+	const ssize_t count = iov_iter_count(from);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) {</div><div class='hunk'>@@ -4778,6 +5211,12 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		inode_lock(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (f2fs_is_pinned_file(inode) &amp;&amp;</div><div class='add'>+	    !f2fs_overwrite_io(inode, pos, count)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = f2fs_write_checks(iocb, from);</div><div class='ctx'> 	if (ret &lt;= 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -4785,6 +5224,12 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	/* Determine whether we will do a direct write or a buffered write. */</div><div class='ctx'> 	dio = f2fs_should_use_dio(inode, iocb, from);</div><div class='ctx'> </div><div class='add'>+	/* dio is not compatible w/ atomic write */</div><div class='add'>+	if (dio &amp;&amp; f2fs_is_atomic_file(inode)) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Possibly preallocate the blocks for the write. */</div><div class='ctx'> 	target_size = iocb-&gt;ki_pos + iov_iter_count(from);</div><div class='ctx'> 	preallocated = f2fs_preallocate_blocks(iocb, from, dio);</div><div class='hunk'>@@ -4800,8 +5245,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 			f2fs_dio_write_iter(iocb, from, &amp;may_need_sync) :</div><div class='ctx'> 			f2fs_buffered_write_iter(iocb, from);</div><div class='ctx'> </div><div class='del'>-		if (trace_f2fs_datawrite_end_enabled())</div><div class='del'>-			trace_f2fs_datawrite_end(inode, orig_pos, ret);</div><div class='add'>+		trace_f2fs_datawrite_end(inode, orig_pos, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't leave any preallocated blocks around past i_size. */</div><div class='hunk'>@@ -4844,6 +5288,8 @@ static int f2fs_file_fadvise(struct file *filp, loff_t offset, loff_t len,</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	trace_f2fs_fadvise(inode, offset, len, advice);</div><div class='add'>+</div><div class='ctx'> 	if (advice == POSIX_FADV_SEQUENTIAL) {</div><div class='ctx'> 		if (S_ISFIFO(inode-&gt;i_mode))</div><div class='ctx'> 			return -ESPIPE;</div><div class='hunk'>@@ -4865,11 +5311,15 @@ static int f2fs_file_fadvise(struct file *filp, loff_t offset, loff_t len,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = generic_fadvise(filp, offset, len, advice);</div><div class='del'>-	if (!err &amp;&amp; advice == POSIX_FADV_DONTNEED &amp;&amp;</div><div class='del'>-		test_opt(F2FS_I_SB(inode), COMPRESS_CACHE) &amp;&amp;</div><div class='del'>-		f2fs_compressed_file(inode))</div><div class='del'>-		f2fs_invalidate_compress_pages(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	if (advice == POSIX_FADV_DONTNEED &amp;&amp;</div><div class='add'>+	    (test_opt(F2FS_I_SB(inode), COMPRESS_CACHE) &amp;&amp;</div><div class='add'>+	     f2fs_compressed_file(inode)))</div><div class='add'>+		f2fs_invalidate_compress_pages(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	else if (advice == POSIX_FADV_NOREUSE)</div><div class='add'>+		err = f2fs_keep_noreuse_range(inode, offset, len);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4978,6 +5428,8 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case F2FS_IOC_SET_COMPRESS_OPTION:</div><div class='ctx'> 	case F2FS_IOC_DECOMPRESS_FILE:</div><div class='ctx'> 	case F2FS_IOC_COMPRESS_FILE:</div><div class='add'>+	case F2FS_IOC_GET_DEV_ALIAS_FILE:</div><div class='add'>+	case F2FS_IOC_IO_PRIO:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='hunk'>@@ -4993,7 +5445,7 @@ const struct file_operations f2fs_file_operations = {</div><div class='ctx'> 	.iopoll		= iocb_bio_iopoll,</div><div class='ctx'> 	.open		= f2fs_file_open,</div><div class='ctx'> 	.release	= f2fs_release_file,</div><div class='del'>-	.mmap		= f2fs_file_mmap,</div><div class='add'>+	.mmap_prepare	= f2fs_file_mmap_prepare,</div><div class='ctx'> 	.flush		= f2fs_file_flush,</div><div class='ctx'> 	.fsync		= f2fs_sync_file,</div><div class='ctx'> 	.fallocate	= f2fs_fallocate,</div><div class='hunk'>@@ -5004,4 +5456,5 @@ const struct file_operations f2fs_file_operations = {</div><div class='ctx'> 	.splice_read	= f2fs_file_splice_read,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fadvise	= f2fs_file_fadvise,</div><div class='add'>+	.fop_flags	= FOP_BUFFER_RASYNC,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c<br/>index a079eebfb080..384fa7e2085b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/gc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/gc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/gc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/gc.c</a></div><div class='hunk'>@@ -38,13 +38,14 @@ static int gc_thread_func(void *data)</div><div class='ctx'> 	struct f2fs_gc_control gc_control = {</div><div class='ctx'> 		.victim_segno = NULL_SEGNO,</div><div class='ctx'> 		.should_migrate_blocks = false,</div><div class='del'>-		.err_gc_skipped = false };</div><div class='add'>+		.err_gc_skipped = false,</div><div class='add'>+		.one_time = false };</div><div class='ctx'> </div><div class='ctx'> 	wait_ms = gc_th-&gt;min_sleep_time;</div><div class='ctx'> </div><div class='ctx'> 	set_freezable();</div><div class='ctx'> 	do {</div><div class='del'>-		bool sync_mode, foreground = false;</div><div class='add'>+		bool sync_mode, foreground = false, gc_boost = false;</div><div class='ctx'> </div><div class='ctx'> 		wait_event_freezable_timeout(*wq,</div><div class='ctx'> 				kthread_should_stop() ||</div><div class='hunk'>@@ -52,8 +53,12 @@ static int gc_thread_func(void *data)</div><div class='ctx'> 				gc_th-&gt;gc_wake,</div><div class='ctx'> 				msecs_to_jiffies(wait_ms));</div><div class='ctx'> </div><div class='del'>-		if (test_opt(sbi, GC_MERGE) &amp;&amp; waitqueue_active(fggc_wq))</div><div class='add'>+		if (test_opt(sbi, GC_MERGE) &amp;&amp; waitqueue_active(fggc_wq)) {</div><div class='ctx'> 			foreground = true;</div><div class='add'>+			gc_control.one_time = false;</div><div class='add'>+		} else if (f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+			gc_control.one_time = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* give it a try one time */</div><div class='ctx'> 		if (gc_th-&gt;gc_wake)</div><div class='hunk'>@@ -116,18 +121,33 @@ static int gc_thread_func(void *data)</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (has_enough_invalid_blocks(sbi))</div><div class='add'>+		if (f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+			if (has_enough_free_blocks(sbi,</div><div class='add'>+				gc_th-&gt;no_zoned_gc_percent)) {</div><div class='add'>+				wait_ms = gc_th-&gt;no_gc_sleep_time;</div><div class='add'>+				f2fs_up_write(&amp;sbi-&gt;gc_lock);</div><div class='add'>+				goto next;</div><div class='add'>+			}</div><div class='add'>+			if (wait_ms == gc_th-&gt;no_gc_sleep_time)</div><div class='add'>+				wait_ms = gc_th-&gt;max_sleep_time;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (need_to_boost_gc(sbi)) {</div><div class='ctx'> 			decrease_sleep_time(gc_th, &amp;wait_ms);</div><div class='del'>-		else</div><div class='add'>+			if (f2fs_sb_has_blkzoned(sbi))</div><div class='add'>+				gc_boost = true;</div><div class='add'>+		} else {</div><div class='ctx'> 			increase_sleep_time(gc_th, &amp;wait_ms);</div><div class='add'>+		}</div><div class='ctx'> do_gc:</div><div class='ctx'> 		stat_inc_gc_call_count(sbi, foreground ?</div><div class='ctx'> 					FOREGROUND : BACKGROUND);</div><div class='ctx'> </div><div class='del'>-		sync_mode = F2FS_OPTION(sbi).bggc_mode == BGGC_MODE_SYNC;</div><div class='add'>+		sync_mode = (F2FS_OPTION(sbi).bggc_mode == BGGC_MODE_SYNC) ||</div><div class='add'>+			(gc_boost &amp;&amp; gc_th-&gt;boost_gc_greedy);</div><div class='ctx'> </div><div class='ctx'> 		/* foreground GC was been triggered via f2fs_balance_fs() */</div><div class='del'>-		if (foreground)</div><div class='add'>+		if (foreground &amp;&amp; !f2fs_sb_has_blkzoned(sbi))</div><div class='ctx'> 			sync_mode = false;</div><div class='ctx'> </div><div class='ctx'> 		gc_control.init_gc_type = sync_mode ? FG_GC : BG_GC;</div><div class='hunk'>@@ -179,9 +199,23 @@ int f2fs_start_gc_thread(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	gc_th-&gt;urgent_sleep_time = DEF_GC_THREAD_URGENT_SLEEP_TIME;</div><div class='del'>-	gc_th-&gt;min_sleep_time = DEF_GC_THREAD_MIN_SLEEP_TIME;</div><div class='del'>-	gc_th-&gt;max_sleep_time = DEF_GC_THREAD_MAX_SLEEP_TIME;</div><div class='del'>-	gc_th-&gt;no_gc_sleep_time = DEF_GC_THREAD_NOGC_SLEEP_TIME;</div><div class='add'>+	gc_th-&gt;valid_thresh_ratio = DEF_GC_THREAD_VALID_THRESH_RATIO;</div><div class='add'>+	gc_th-&gt;boost_gc_multiple = BOOST_GC_MULTIPLE;</div><div class='add'>+	gc_th-&gt;boost_gc_greedy = GC_GREEDY;</div><div class='add'>+</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+		gc_th-&gt;min_sleep_time = DEF_GC_THREAD_MIN_SLEEP_TIME_ZONED;</div><div class='add'>+		gc_th-&gt;max_sleep_time = DEF_GC_THREAD_MAX_SLEEP_TIME_ZONED;</div><div class='add'>+		gc_th-&gt;no_gc_sleep_time = DEF_GC_THREAD_NOGC_SLEEP_TIME_ZONED;</div><div class='add'>+		gc_th-&gt;no_zoned_gc_percent = LIMIT_NO_ZONED_GC;</div><div class='add'>+		gc_th-&gt;boost_zoned_gc_percent = LIMIT_BOOST_ZONED_GC;</div><div class='add'>+	} else {</div><div class='add'>+		gc_th-&gt;min_sleep_time = DEF_GC_THREAD_MIN_SLEEP_TIME;</div><div class='add'>+		gc_th-&gt;max_sleep_time = DEF_GC_THREAD_MAX_SLEEP_TIME;</div><div class='add'>+		gc_th-&gt;no_gc_sleep_time = DEF_GC_THREAD_NOGC_SLEEP_TIME;</div><div class='add'>+		gc_th-&gt;no_zoned_gc_percent = 0;</div><div class='add'>+		gc_th-&gt;boost_zoned_gc_percent = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gc_th-&gt;gc_wake = false;</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +262,8 @@ static int select_gc_type(struct f2fs_sb_info *sbi, int gc_type)</div><div class='ctx'> </div><div class='ctx'> 	switch (sbi-&gt;gc_mode) {</div><div class='ctx'> 	case GC_IDLE_CB:</div><div class='add'>+	case GC_URGENT_LOW:</div><div class='add'>+	case GC_URGENT_MID:</div><div class='ctx'> 		gc_mode = GC_CB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case GC_IDLE_GREEDY:</div><div class='hunk'>@@ -247,19 +283,14 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,</div><div class='ctx'> {</div><div class='ctx'> 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;alloc_mode == SSR) {</div><div class='del'>-		p-&gt;gc_mode = GC_GREEDY;</div><div class='del'>-		p-&gt;dirty_bitmap = dirty_i-&gt;dirty_segmap[type];</div><div class='del'>-		p-&gt;max_search = dirty_i-&gt;nr_dirty[type];</div><div class='del'>-		p-&gt;ofs_unit = 1;</div><div class='del'>-	} else if (p-&gt;alloc_mode == AT_SSR) {</div><div class='add'>+	if (p-&gt;alloc_mode == SSR || p-&gt;alloc_mode == AT_SSR) {</div><div class='ctx'> 		p-&gt;gc_mode = GC_GREEDY;</div><div class='ctx'> 		p-&gt;dirty_bitmap = dirty_i-&gt;dirty_segmap[type];</div><div class='ctx'> 		p-&gt;max_search = dirty_i-&gt;nr_dirty[type];</div><div class='ctx'> 		p-&gt;ofs_unit = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p-&gt;gc_mode = select_gc_type(sbi, gc_type);</div><div class='del'>-		p-&gt;ofs_unit = sbi-&gt;segs_per_sec;</div><div class='add'>+		p-&gt;ofs_unit = SEGS_PER_SEC(sbi);</div><div class='ctx'> 		if (__is_large_section(sbi)) {</div><div class='ctx'> 			p-&gt;dirty_bitmap = dirty_i-&gt;dirty_secmap;</div><div class='ctx'> 			p-&gt;max_search = count_bits(p-&gt;dirty_bitmap,</div><div class='hunk'>@@ -280,11 +311,11 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,</div><div class='ctx'> 			p-&gt;max_search &gt; sbi-&gt;max_victim_search)</div><div class='ctx'> 		p-&gt;max_search = sbi-&gt;max_victim_search;</div><div class='ctx'> </div><div class='del'>-	/* let's select beginning hot/small space first in no_heap mode*/</div><div class='add'>+	/* let's select beginning hot/small space first. */</div><div class='ctx'> 	if (f2fs_need_rand_seg(sbi))</div><div class='del'>-		p-&gt;offset = get_random_u32_below(MAIN_SECS(sbi) * sbi-&gt;segs_per_sec);</div><div class='del'>-	else if (test_opt(sbi, NOHEAP) &amp;&amp;</div><div class='del'>-		(type == CURSEG_HOT_DATA || IS_NODESEG(type)))</div><div class='add'>+		p-&gt;offset = get_random_u32_below(MAIN_SECS(sbi) *</div><div class='add'>+						SEGS_PER_SEC(sbi));</div><div class='add'>+	else if (type == CURSEG_HOT_DATA || IS_NODESEG(type))</div><div class='ctx'> 		p-&gt;offset = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		p-&gt;offset = SIT_I(sbi)-&gt;last_victim[p-&gt;gc_mode];</div><div class='hunk'>@@ -295,13 +326,13 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,</div><div class='ctx'> {</div><div class='ctx'> 	/* SSR allocates in a segment unit */</div><div class='ctx'> 	if (p-&gt;alloc_mode == SSR)</div><div class='del'>-		return sbi-&gt;blocks_per_seg;</div><div class='add'>+		return BLKS_PER_SEG(sbi);</div><div class='ctx'> 	else if (p-&gt;alloc_mode == AT_SSR)</div><div class='ctx'> 		return UINT_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* LFS */</div><div class='ctx'> 	if (p-&gt;gc_mode == GC_GREEDY)</div><div class='del'>-		return 2 * sbi-&gt;blocks_per_seg * p-&gt;ofs_unit;</div><div class='add'>+		return SEGS_TO_BLKS(sbi, 2 * p-&gt;ofs_unit);</div><div class='ctx'> 	else if (p-&gt;gc_mode == GC_CB)</div><div class='ctx'> 		return UINT_MAX;</div><div class='ctx'> 	else if (p-&gt;gc_mode == GC_AT)</div><div class='hunk'>@@ -332,23 +363,18 @@ static unsigned int check_bg_victims(struct f2fs_sb_info *sbi)</div><div class='ctx'> static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='ctx'> {</div><div class='ctx'> 	struct sit_info *sit_i = SIT_I(sbi);</div><div class='del'>-	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='del'>-	unsigned int start = GET_SEG_FROM_SEC(sbi, secno);</div><div class='ctx'> 	unsigned long long mtime = 0;</div><div class='ctx'> 	unsigned int vblocks;</div><div class='ctx'> 	unsigned char age = 0;</div><div class='ctx'> 	unsigned char u;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	unsigned int usable_segs_per_sec = f2fs_usable_segs_in_sec(sbi, segno);</div><div class='add'>+	unsigned int usable_segs_per_sec = f2fs_usable_segs_in_sec(sbi);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; usable_segs_per_sec; i++)</div><div class='del'>-		mtime += get_seg_entry(sbi, start + i)-&gt;mtime;</div><div class='add'>+	mtime = f2fs_get_section_mtime(sbi, segno);</div><div class='add'>+	f2fs_bug_on(sbi, mtime == INVALID_MTIME);</div><div class='ctx'> 	vblocks = get_valid_blocks(sbi, segno, true);</div><div class='del'>-</div><div class='del'>-	mtime = div_u64(mtime, usable_segs_per_sec);</div><div class='ctx'> 	vblocks = div_u64(vblocks, usable_segs_per_sec);</div><div class='ctx'> </div><div class='del'>-	u = (vblocks * 100) &gt;&gt; sbi-&gt;log_blocks_per_seg;</div><div class='add'>+	u = BLKS_TO_SEGS(sbi, vblocks * 100);</div><div class='ctx'> </div><div class='ctx'> 	/* Handle if the system time has changed by the user */</div><div class='ctx'> 	if (mtime &lt; sit_i-&gt;min_mtime)</div><div class='hunk'>@@ -363,11 +389,17 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int get_gc_cost(struct f2fs_sb_info *sbi,</div><div class='del'>-			unsigned int segno, struct victim_sel_policy *p)</div><div class='add'>+			unsigned int segno, struct victim_sel_policy *p,</div><div class='add'>+			unsigned int valid_thresh_ratio)</div><div class='ctx'> {</div><div class='ctx'> 	if (p-&gt;alloc_mode == SSR)</div><div class='ctx'> 		return get_seg_entry(sbi, segno)-&gt;ckpt_valid_blocks;</div><div class='ctx'> </div><div class='add'>+	if (p-&gt;one_time_gc &amp;&amp; (valid_thresh_ratio &lt; 100) &amp;&amp;</div><div class='add'>+			(get_valid_blocks(sbi, segno, true) &gt;=</div><div class='add'>+			CAP_BLKS_PER_SEC(sbi) * valid_thresh_ratio / 100))</div><div class='add'>+		return UINT_MAX;</div><div class='add'>+</div><div class='ctx'> 	/* alloc_mode == LFS */</div><div class='ctx'> 	if (p-&gt;gc_mode == GC_GREEDY)</div><div class='ctx'> 		return get_valid_blocks(sbi, segno, true);</div><div class='hunk'>@@ -485,10 +517,7 @@ static void add_victim_entry(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				struct victim_sel_policy *p, unsigned int segno)</div><div class='ctx'> {</div><div class='ctx'> 	struct sit_info *sit_i = SIT_I(sbi);</div><div class='del'>-	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='del'>-	unsigned int start = GET_SEG_FROM_SEC(sbi, secno);</div><div class='ctx'> 	unsigned long long mtime = 0;</div><div class='del'>-	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {</div><div class='ctx'> 		if (p-&gt;gc_mode == GC_AT &amp;&amp;</div><div class='hunk'>@@ -496,9 +525,8 @@ static void add_victim_entry(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sbi-&gt;segs_per_sec; i++)</div><div class='del'>-		mtime += get_seg_entry(sbi, start + i)-&gt;mtime;</div><div class='del'>-	mtime = div_u64(mtime, sbi-&gt;segs_per_sec);</div><div class='add'>+	mtime = f2fs_get_section_mtime(sbi, segno);</div><div class='add'>+	f2fs_bug_on(sbi, mtime == INVALID_MTIME);</div><div class='ctx'> </div><div class='ctx'> 	/* Handle if the system time has changed by the user */</div><div class='ctx'> 	if (mtime &lt; sit_i-&gt;min_mtime)</div><div class='hunk'>@@ -599,7 +627,6 @@ static void atssr_lookup_victim(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	unsigned long long age;</div><div class='ctx'> 	unsigned long long max_mtime = sit_i-&gt;dirty_max_mtime;</div><div class='ctx'> 	unsigned long long min_mtime = sit_i-&gt;dirty_min_mtime;</div><div class='del'>-	unsigned int seg_blocks = sbi-&gt;blocks_per_seg;</div><div class='ctx'> 	unsigned int vblocks;</div><div class='ctx'> 	unsigned int dirty_threshold = max(am-&gt;max_candidate_count,</div><div class='ctx'> 					am-&gt;candidate_ratio *</div><div class='hunk'>@@ -629,7 +656,7 @@ next_node:</div><div class='ctx'> 	f2fs_bug_on(sbi, !vblocks);</div><div class='ctx'> </div><div class='ctx'> 	/* rare case */</div><div class='del'>-	if (vblocks == seg_blocks)</div><div class='add'>+	if (vblocks == BLKS_PER_SEG(sbi))</div><div class='ctx'> 		goto skip_node;</div><div class='ctx'> </div><div class='ctx'> 	iter++;</div><div class='hunk'>@@ -743,23 +770,29 @@ static int f2fs_gc_pinned_control(struct inode *inode, int gc_type,</div><div class='ctx'>  */</div><div class='ctx'> int f2fs_get_victim(struct f2fs_sb_info *sbi, unsigned int *result,</div><div class='ctx'> 			int gc_type, int type, char alloc_mode,</div><div class='del'>-			unsigned long long age)</div><div class='add'>+			unsigned long long age, bool one_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);</div><div class='ctx'> 	struct sit_info *sm = SIT_I(sbi);</div><div class='del'>-	struct victim_sel_policy p;</div><div class='add'>+	struct victim_sel_policy p = {0};</div><div class='ctx'> 	unsigned int secno, last_victim;</div><div class='ctx'> 	unsigned int last_segment;</div><div class='ctx'> 	unsigned int nsearched;</div><div class='add'>+	unsigned int valid_thresh_ratio = 100;</div><div class='ctx'> 	bool is_atgc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dirty_i-&gt;seglist_lock);</div><div class='del'>-	last_segment = MAIN_SECS(sbi) * sbi-&gt;segs_per_sec;</div><div class='add'>+	last_segment = MAIN_SECS(sbi) * SEGS_PER_SEC(sbi);</div><div class='ctx'> </div><div class='ctx'> 	p.alloc_mode = alloc_mode;</div><div class='ctx'> 	p.age = age;</div><div class='ctx'> 	p.age_threshold = sbi-&gt;am.age_threshold;</div><div class='add'>+	if (one_time) {</div><div class='add'>+		p.one_time_gc = one_time;</div><div class='add'>+		if (has_enough_free_secs(sbi, 0, NR_PERSISTENT_LOG))</div><div class='add'>+			valid_thresh_ratio = sbi-&gt;gc_thread-&gt;valid_thresh_ratio;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	select_policy(sbi, gc_type, type, &amp;p);</div><div class='hunk'>@@ -779,11 +812,14 @@ retry:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (sec_usage_check(sbi, GET_SEC_FROM_SEG(sbi, *result)))</div><div class='add'>+		if (sec_usage_check(sbi, GET_SEC_FROM_SEG(sbi, *result))) {</div><div class='ctx'> 			ret = -EBUSY;</div><div class='del'>-		else</div><div class='del'>-			p.min_segno = *result;</div><div class='del'>-		goto out;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (gc_type == FG_GC)</div><div class='add'>+			clear_bit(GET_SEC_FROM_SEG(sbi, *result), dirty_i-&gt;victim_secmap);</div><div class='add'>+		p.min_segno = *result;</div><div class='add'>+		goto got_result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENODATA;</div><div class='hunk'>@@ -882,7 +918,7 @@ retry:</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cost = get_gc_cost(sbi, segno, &amp;p);</div><div class='add'>+		cost = get_gc_cost(sbi, segno, &amp;p, valid_thresh_ratio);</div><div class='ctx'> </div><div class='ctx'> 		if (p.min_cost &gt; cost) {</div><div class='ctx'> 			p.min_segno = segno;</div><div class='hunk'>@@ -896,7 +932,7 @@ next:</div><div class='ctx'> 			else</div><div class='ctx'> 				sm-&gt;last_victim[p.gc_mode] = segno + p.ofs_unit;</div><div class='ctx'> 			sm-&gt;last_victim[p.gc_mode] %=</div><div class='del'>-				(MAIN_SECS(sbi) * sbi-&gt;segs_per_sec);</div><div class='add'>+				(MAIN_SECS(sbi) * SEGS_PER_SEC(sbi));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1015,7 +1051,7 @@ next_step:</div><div class='ctx'> </div><div class='ctx'> 	for (off = 0; off &lt; usable_blks_in_seg; off++, entry++) {</div><div class='ctx'> 		nid_t nid = le32_to_cpu(entry-&gt;nid);</div><div class='del'>-		struct page *node_page;</div><div class='add'>+		struct folio *node_folio;</div><div class='ctx'> 		struct node_info ni;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1038,27 +1074,27 @@ next_step:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* phase == 2 */</div><div class='del'>-		node_page = f2fs_get_node_page(sbi, nid);</div><div class='del'>-		if (IS_ERR(node_page))</div><div class='add'>+		node_folio = f2fs_get_node_folio(sbi, nid, NODE_TYPE_REGULAR);</div><div class='add'>+		if (IS_ERR(node_folio))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* block may become invalid during f2fs_get_node_page */</div><div class='add'>+		/* block may become invalid during f2fs_get_node_folio */</div><div class='ctx'> 		if (check_valid_map(sbi, segno, off) == 0) {</div><div class='del'>-			f2fs_put_page(node_page, 1);</div><div class='add'>+			f2fs_folio_put(node_folio, true);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (f2fs_get_node_info(sbi, nid, &amp;ni, false)) {</div><div class='del'>-			f2fs_put_page(node_page, 1);</div><div class='add'>+			f2fs_folio_put(node_folio, true);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ni.blk_addr != start_addr + off) {</div><div class='del'>-			f2fs_put_page(node_page, 1);</div><div class='add'>+			f2fs_folio_put(node_folio, true);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = f2fs_move_node_page(node_page, gc_type);</div><div class='add'>+		err = f2fs_move_node_folio(node_folio, gc_type);</div><div class='ctx'> 		if (!err &amp;&amp; gc_type == FG_GC)</div><div class='ctx'> 			submitted++;</div><div class='ctx'> 		stat_inc_node_blk_count(sbi, 1, gc_type);</div><div class='hunk'>@@ -1104,7 +1140,7 @@ block_t f2fs_start_bidx_of_node(unsigned int node_ofs, struct inode *inode)</div><div class='ctx'> static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 		struct node_info *dni, block_t blkaddr, unsigned int *nofs)</div><div class='ctx'> {</div><div class='del'>-	struct page *node_page;</div><div class='add'>+	struct folio *node_folio;</div><div class='ctx'> 	nid_t nid;</div><div class='ctx'> 	unsigned int ofs_in_node, max_addrs, base;</div><div class='ctx'> 	block_t source_blkaddr;</div><div class='hunk'>@@ -1112,12 +1148,12 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 	nid = le32_to_cpu(sum-&gt;nid);</div><div class='ctx'> 	ofs_in_node = le16_to_cpu(sum-&gt;ofs_in_node);</div><div class='ctx'> </div><div class='del'>-	node_page = f2fs_get_node_page(sbi, nid);</div><div class='del'>-	if (IS_ERR(node_page))</div><div class='add'>+	node_folio = f2fs_get_node_folio(sbi, nid, NODE_TYPE_REGULAR);</div><div class='add'>+	if (IS_ERR(node_folio))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_get_node_info(sbi, nid, dni, false)) {</div><div class='del'>-		f2fs_put_page(node_page, 1);</div><div class='add'>+		f2fs_folio_put(node_folio, true);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1128,12 +1164,12 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_check_nid_range(sbi, dni-&gt;ino)) {</div><div class='del'>-		f2fs_put_page(node_page, 1);</div><div class='add'>+		f2fs_folio_put(node_folio, true);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_INODE(node_page)) {</div><div class='del'>-		base = offset_in_addr(F2FS_INODE(node_page));</div><div class='add'>+	if (IS_INODE(node_folio)) {</div><div class='add'>+		base = offset_in_addr(F2FS_INODE(node_folio));</div><div class='ctx'> 		max_addrs = DEF_ADDRS_PER_INODE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		base = 0;</div><div class='hunk'>@@ -1143,13 +1179,13 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 	if (base + ofs_in_node &gt;= max_addrs) {</div><div class='ctx'> 		f2fs_err(sbi, "Inconsistent blkaddr offset: base:%u, ofs_in_node:%u, max:%u, ino:%u, nid:%u",</div><div class='ctx'> 			base, ofs_in_node, max_addrs, dni-&gt;ino, dni-&gt;nid);</div><div class='del'>-		f2fs_put_page(node_page, 1);</div><div class='add'>+		f2fs_folio_put(node_folio, true);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*nofs = ofs_of_node(node_page);</div><div class='del'>-	source_blkaddr = data_blkaddr(NULL, node_page, ofs_in_node);</div><div class='del'>-	f2fs_put_page(node_page, 1);</div><div class='add'>+	*nofs = ofs_of_node(node_folio);</div><div class='add'>+	source_blkaddr = data_blkaddr(NULL, node_folio, ofs_in_node);</div><div class='add'>+	f2fs_folio_put(node_folio, true);</div><div class='ctx'> </div><div class='ctx'> 	if (source_blkaddr != blkaddr) {</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='hunk'>@@ -1172,9 +1208,10 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> static int ra_data_block(struct inode *inode, pgoff_t index)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *mapping = f2fs_is_cow_file(inode) ?</div><div class='add'>+				F2FS_I(inode)-&gt;atomic_inode-&gt;i_mapping : inode-&gt;i_mapping;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio, *efolio;</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = sbi,</div><div class='ctx'> 		.ino = inode-&gt;i_ino,</div><div class='hunk'>@@ -1184,21 +1221,19 @@ static int ra_data_block(struct inode *inode, pgoff_t index)</div><div class='ctx'> 		.op_flags = 0,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.in_list = 0,</div><div class='del'>-		.retry = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_cache_page(mapping, index, true);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	folio = f2fs_grab_cache_folio(mapping, index, true);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_lookup_read_extent_cache_block(inode, index,</div><div class='ctx'> 						&amp;dn.data_blkaddr)) {</div><div class='ctx'> 		if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr,</div><div class='ctx'> 						DATA_GENERIC_ENHANCE_READ))) {</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='del'>-			goto put_page;</div><div class='add'>+			goto put_folio;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto got_it;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1206,54 +1241,54 @@ static int ra_data_block(struct inode *inode, pgoff_t index)</div><div class='ctx'> 	set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='ctx'> 	err = f2fs_get_dnode_of_data(&amp;dn, index, LOOKUP_NODE);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto put_page;</div><div class='add'>+		goto put_folio;</div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='ctx'> </div><div class='ctx'> 	if (!__is_valid_data_blkaddr(dn.data_blkaddr)) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='del'>-		goto put_page;</div><div class='add'>+		goto put_folio;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr,</div><div class='ctx'> 						DATA_GENERIC_ENHANCE))) {</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='del'>-		f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='del'>-		goto put_page;</div><div class='add'>+		goto put_folio;</div><div class='ctx'> 	}</div><div class='ctx'> got_it:</div><div class='del'>-	/* read page */</div><div class='del'>-	fio.page = page;</div><div class='add'>+	/* read folio */</div><div class='add'>+	fio.folio = folio;</div><div class='ctx'> 	fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * don't cache encrypted data into meta inode until previous dirty</div><div class='ctx'> 	 * data were writebacked to avoid racing between GC and flush.</div><div class='ctx'> 	 */</div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);</div><div class='ctx'> </div><div class='del'>-	fio.encrypted_page = f2fs_pagecache_get_page(META_MAPPING(sbi),</div><div class='del'>-					dn.data_blkaddr,</div><div class='add'>+	efolio = f2fs_filemap_get_folio(META_MAPPING(sbi), dn.data_blkaddr,</div><div class='ctx'> 					FGP_LOCK | FGP_CREAT, GFP_NOFS);</div><div class='del'>-	if (!fio.encrypted_page) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto put_page;</div><div class='add'>+	if (IS_ERR(efolio)) {</div><div class='add'>+		err = PTR_ERR(efolio);</div><div class='add'>+		goto put_folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fio.encrypted_page = &amp;efolio-&gt;page;</div><div class='add'>+</div><div class='ctx'> 	err = f2fs_submit_page_bio(&amp;fio);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto put_encrypted_page;</div><div class='del'>-	f2fs_put_page(fio.encrypted_page, 0);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_put_page(fio.encrypted_page, false);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_iostat(sbi, inode, FS_DATA_READ_IO, F2FS_BLKSIZE);</div><div class='ctx'> 	f2fs_update_iostat(sbi, NULL, FS_GDATA_READ_IO, F2FS_BLKSIZE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> put_encrypted_page:</div><div class='del'>-	f2fs_put_page(fio.encrypted_page, 1);</div><div class='del'>-put_page:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_put_page(fio.encrypted_page, true);</div><div class='add'>+put_folio:</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1264,6 +1299,8 @@ put_page:</div><div class='ctx'> static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 				int gc_type, unsigned int segno, int off)</div><div class='ctx'> {</div><div class='add'>+	struct address_space *mapping = f2fs_is_cow_file(inode) ?</div><div class='add'>+				F2FS_I(inode)-&gt;atomic_inode-&gt;i_mapping : inode-&gt;i_mapping;</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = F2FS_I_SB(inode),</div><div class='ctx'> 		.ino = inode-&gt;i_ino,</div><div class='hunk'>@@ -1273,12 +1310,11 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 		.op_flags = 0,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.in_list = 0,</div><div class='del'>-		.retry = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct f2fs_summary sum;</div><div class='ctx'> 	struct node_info ni;</div><div class='del'>-	struct page *page, *mpage;</div><div class='add'>+	struct folio *folio, *mfolio, *efolio;</div><div class='ctx'> 	block_t newaddr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	bool lfs_mode = f2fs_lfs_mode(fio.sbi);</div><div class='hunk'>@@ -1287,9 +1323,9 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 				CURSEG_ALL_DATA_ATGC : CURSEG_COLD_DATA;</div><div class='ctx'> </div><div class='ctx'> 	/* do not read out */</div><div class='del'>-	page = f2fs_grab_cache_page(inode-&gt;i_mapping, bidx, false);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	folio = f2fs_grab_cache_folio(mapping, bidx, false);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (!check_valid_map(F2FS_I_SB(inode), segno, off)) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='hunk'>@@ -1306,7 +1342,7 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(dn.data_blkaddr == NULL_ADDR)) {</div><div class='del'>-		ClearPageUptodate(page);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		goto put_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1315,7 +1351,7 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 	 * don't cache encrypted data into meta inode until previous dirty</div><div class='ctx'> 	 * data were writebacked to avoid racing between GC and flush.</div><div class='ctx'> 	 */</div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -1324,26 +1360,26 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 		goto put_out;</div><div class='ctx'> </div><div class='ctx'> 	/* read page */</div><div class='del'>-	fio.page = page;</div><div class='add'>+	fio.folio = folio;</div><div class='ctx'> 	fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;</div><div class='ctx'> </div><div class='ctx'> 	if (lfs_mode)</div><div class='ctx'> 		f2fs_down_write(&amp;fio.sbi-&gt;io_order_lock);</div><div class='ctx'> </div><div class='del'>-	mpage = f2fs_grab_cache_page(META_MAPPING(fio.sbi),</div><div class='add'>+	mfolio = f2fs_grab_cache_folio(META_MAPPING(fio.sbi),</div><div class='ctx'> 					fio.old_blkaddr, false);</div><div class='del'>-	if (!mpage) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+	if (IS_ERR(mfolio)) {</div><div class='add'>+		err = PTR_ERR(mfolio);</div><div class='ctx'> 		goto up_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fio.encrypted_page = mpage;</div><div class='add'>+	fio.encrypted_page = folio_file_page(mfolio, fio.old_blkaddr);</div><div class='ctx'> </div><div class='del'>-	/* read source block in mpage */</div><div class='del'>-	if (!PageUptodate(mpage)) {</div><div class='add'>+	/* read source block in mfolio */</div><div class='add'>+	if (!folio_test_uptodate(mfolio)) {</div><div class='ctx'> 		err = f2fs_submit_page_bio(&amp;fio);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			f2fs_put_page(mpage, 1);</div><div class='add'>+			f2fs_folio_put(mfolio, true);</div><div class='ctx'> 			goto up_out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1352,11 +1388,11 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 		f2fs_update_iostat(fio.sbi, NULL, FS_GDATA_READ_IO,</div><div class='ctx'> 							F2FS_BLKSIZE);</div><div class='ctx'> </div><div class='del'>-		lock_page(mpage);</div><div class='del'>-		if (unlikely(mpage-&gt;mapping != META_MAPPING(fio.sbi) ||</div><div class='del'>-						!PageUptodate(mpage))) {</div><div class='add'>+		folio_lock(mfolio);</div><div class='add'>+		if (unlikely(!is_meta_folio(mfolio) ||</div><div class='add'>+			     !folio_test_uptodate(mfolio))) {</div><div class='ctx'> 			err = -EIO;</div><div class='del'>-			f2fs_put_page(mpage, 1);</div><div class='add'>+			f2fs_folio_put(mfolio, true);</div><div class='ctx'> 			goto up_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1364,24 +1400,31 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 	set_summary(&amp;sum, dn.nid, dn.ofs_in_node, ni.version);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate block address */</div><div class='del'>-	f2fs_allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &amp;newaddr,</div><div class='add'>+	err = f2fs_allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &amp;newaddr,</div><div class='ctx'> 				&amp;sum, type, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		f2fs_folio_put(mfolio, true);</div><div class='add'>+		/* filesystem should shutdown, no need to recovery block */</div><div class='add'>+		goto up_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	fio.encrypted_page = f2fs_pagecache_get_page(META_MAPPING(fio.sbi),</div><div class='del'>-				newaddr, FGP_LOCK | FGP_CREAT, GFP_NOFS);</div><div class='del'>-	if (!fio.encrypted_page) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		f2fs_put_page(mpage, 1);</div><div class='add'>+	efolio = f2fs_filemap_get_folio(META_MAPPING(fio.sbi), newaddr,</div><div class='add'>+					FGP_LOCK | FGP_CREAT, GFP_NOFS);</div><div class='add'>+	if (IS_ERR(efolio)) {</div><div class='add'>+		err = PTR_ERR(efolio);</div><div class='add'>+		f2fs_folio_put(mfolio, true);</div><div class='ctx'> 		goto recover_block;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fio.encrypted_page = &amp;efolio-&gt;page;</div><div class='add'>+</div><div class='ctx'> 	/* write target block */</div><div class='ctx'> 	f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true, true);</div><div class='ctx'> 	memcpy(page_address(fio.encrypted_page),</div><div class='del'>-				page_address(mpage), PAGE_SIZE);</div><div class='del'>-	f2fs_put_page(mpage, 1);</div><div class='add'>+				folio_address(mfolio), PAGE_SIZE);</div><div class='add'>+	f2fs_folio_put(mfolio, true);</div><div class='ctx'> </div><div class='del'>-	f2fs_invalidate_internal_cache(fio.sbi, fio.old_blkaddr);</div><div class='add'>+	f2fs_invalidate_internal_cache(fio.sbi, fio.old_blkaddr, 1);</div><div class='ctx'> </div><div class='ctx'> 	set_page_dirty(fio.encrypted_page);</div><div class='ctx'> 	if (clear_page_dirty_for_io(fio.encrypted_page))</div><div class='hunk'>@@ -1393,19 +1436,13 @@ static int move_data_block(struct inode *inode, block_t bidx,</div><div class='ctx'> 	fio.op_flags = REQ_SYNC;</div><div class='ctx'> 	fio.new_blkaddr = newaddr;</div><div class='ctx'> 	f2fs_submit_page_write(&amp;fio);</div><div class='del'>-	if (fio.retry) {</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		if (PageWriteback(fio.encrypted_page))</div><div class='del'>-			end_page_writeback(fio.encrypted_page);</div><div class='del'>-		goto put_page_out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_iostat(fio.sbi, NULL, FS_GC_DATA_IO, F2FS_BLKSIZE);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_data_blkaddr(&amp;dn, newaddr);</div><div class='ctx'> 	set_inode_flag(inode, FI_APPEND_WRITE);</div><div class='del'>-put_page_out:</div><div class='del'>-	f2fs_put_page(fio.encrypted_page, 1);</div><div class='add'>+</div><div class='add'>+	f2fs_put_page(fio.encrypted_page, true);</div><div class='ctx'> recover_block:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		f2fs_do_replace_block(fio.sbi, &amp;sum, newaddr, fio.old_blkaddr,</div><div class='hunk'>@@ -1416,19 +1453,19 @@ up_out:</div><div class='ctx'> put_out:</div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='ctx'> out:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int move_data_page(struct inode *inode, block_t bidx, int gc_type,</div><div class='del'>-							unsigned int segno, int off)</div><div class='add'>+						unsigned int segno, int off)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_lock_data_page(inode, bidx, true);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+	folio = f2fs_get_lock_data_folio(inode, bidx, true);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (!check_valid_map(F2FS_I_SB(inode), segno, off)) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='hunk'>@@ -1440,12 +1477,12 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (gc_type == BG_GC) {</div><div class='del'>-		if (PageWriteback(page)) {</div><div class='add'>+		if (folio_test_writeback(folio)) {</div><div class='ctx'> 			err = -EAGAIN;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		set_page_private_gcing(page);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+		folio_set_f2fs_gcing(folio);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct f2fs_io_info fio = {</div><div class='ctx'> 			.sbi = F2FS_I_SB(inode),</div><div class='hunk'>@@ -1455,37 +1492,37 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type,</div><div class='ctx'> 			.op = REQ_OP_WRITE,</div><div class='ctx'> 			.op_flags = REQ_SYNC,</div><div class='ctx'> 			.old_blkaddr = NULL_ADDR,</div><div class='del'>-			.page = page,</div><div class='add'>+			.folio = folio,</div><div class='ctx'> 			.encrypted_page = NULL,</div><div class='ctx'> 			.need_lock = LOCK_REQ,</div><div class='ctx'> 			.io_type = FS_GC_DATA_IO,</div><div class='ctx'> 		};</div><div class='del'>-		bool is_dirty = PageDirty(page);</div><div class='add'>+		bool is_dirty = folio_test_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-		f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='add'>+		f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> </div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		if (clear_page_dirty_for_io(page)) {</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+		if (folio_clear_dirty_for_io(folio)) {</div><div class='ctx'> 			inode_dec_dirty_pages(inode);</div><div class='ctx'> 			f2fs_remove_dirty_inode(inode);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		set_page_private_gcing(page);</div><div class='add'>+		folio_set_f2fs_gcing(folio);</div><div class='ctx'> </div><div class='ctx'> 		err = f2fs_do_write_data_page(&amp;fio);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			clear_page_private_gcing(page);</div><div class='add'>+			folio_clear_f2fs_gcing(folio);</div><div class='ctx'> 			if (err == -ENOMEM) {</div><div class='ctx'> 				memalloc_retry_wait(GFP_NOFS);</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (is_dirty)</div><div class='del'>-				set_page_dirty(page);</div><div class='add'>+				folio_mark_dirty(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1514,7 +1551,6 @@ next_step:</div><div class='ctx'> 	entry = sum;</div><div class='ctx'> </div><div class='ctx'> 	for (off = 0; off &lt; usable_blks_in_seg; off++, entry++) {</div><div class='del'>-		struct page *data_page;</div><div class='ctx'> 		struct inode *inode;</div><div class='ctx'> 		struct node_info dni; /* dnode info for the data */</div><div class='ctx'> 		unsigned int ofs_in_node, nofs;</div><div class='hunk'>@@ -1557,12 +1593,28 @@ next_step:</div><div class='ctx'> 		ofs_in_node = le16_to_cpu(entry-&gt;ofs_in_node);</div><div class='ctx'> </div><div class='ctx'> 		if (phase == 3) {</div><div class='add'>+			struct folio *data_folio;</div><div class='ctx'> 			int err;</div><div class='ctx'> </div><div class='ctx'> 			inode = f2fs_iget(sb, dni.ino);</div><div class='del'>-			if (IS_ERR(inode) || is_bad_inode(inode) ||</div><div class='del'>-					special_file(inode-&gt;i_mode))</div><div class='add'>+			if (IS_ERR(inode))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (is_bad_inode(inode) ||</div><div class='add'>+					special_file(inode-&gt;i_mode)) {</div><div class='add'>+				iput(inode);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (f2fs_has_inline_data(inode)) {</div><div class='add'>+				iput(inode);</div><div class='add'>+				set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+				f2fs_err_ratelimited(sbi,</div><div class='add'>+					"inode %lx has both inline_data flag and "</div><div class='add'>+					"data block, nid=%u, ofs_in_node=%u",</div><div class='add'>+					inode-&gt;i_ino, dni.nid, ofs_in_node);</div><div class='ctx'> 				continue;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			err = f2fs_gc_pinned_control(inode, gc_type, segno);</div><div class='ctx'> 			if (err == -EAGAIN) {</div><div class='hunk'>@@ -1580,7 +1632,7 @@ next_step:</div><div class='ctx'> 			start_bidx = f2fs_start_bidx_of_node(nofs, inode) +</div><div class='ctx'> 								ofs_in_node;</div><div class='ctx'> </div><div class='del'>-			if (f2fs_post_read_required(inode)) {</div><div class='add'>+			if (f2fs_meta_inode_gc_required(inode)) {</div><div class='ctx'> 				int err = ra_data_block(inode, start_bidx);</div><div class='ctx'> </div><div class='ctx'> 				f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='hunk'>@@ -1592,15 +1644,15 @@ next_step:</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			data_page = f2fs_get_read_data_page(inode, start_bidx,</div><div class='add'>+			data_folio = f2fs_get_read_data_folio(inode, start_bidx,</div><div class='ctx'> 							REQ_RAHEAD, true, NULL);</div><div class='ctx'> 			f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_gc_rwsem[WRITE]);</div><div class='del'>-			if (IS_ERR(data_page)) {</div><div class='add'>+			if (IS_ERR(data_folio)) {</div><div class='ctx'> 				iput(inode);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			f2fs_put_page(data_page, 0);</div><div class='add'>+			f2fs_folio_put(data_folio, false);</div><div class='ctx'> 			add_gc_inode(gc_list, inode);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1631,7 +1683,7 @@ next_step:</div><div class='ctx'> </div><div class='ctx'> 			start_bidx = f2fs_start_bidx_of_node(nofs, inode)</div><div class='ctx'> 								+ ofs_in_node;</div><div class='del'>-			if (f2fs_post_read_required(inode))</div><div class='add'>+			if (f2fs_meta_inode_gc_required(inode))</div><div class='ctx'> 				err = move_data_block(inode, start_bidx,</div><div class='ctx'> 							gc_type, segno, off);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -1639,7 +1691,7 @@ next_step:</div><div class='ctx'> 								segno, off);</div><div class='ctx'> </div><div class='ctx'> 			if (!err &amp;&amp; (gc_type == FG_GC ||</div><div class='del'>-					f2fs_post_read_required(inode)))</div><div class='add'>+					f2fs_meta_inode_gc_required(inode)))</div><div class='ctx'> 				submitted++;</div><div class='ctx'> </div><div class='ctx'> 			if (locked) {</div><div class='hunk'>@@ -1658,13 +1710,14 @@ next_step:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __get_victim(struct f2fs_sb_info *sbi, unsigned int *victim,</div><div class='del'>-			int gc_type)</div><div class='add'>+			int gc_type, bool one_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct sit_info *sit_i = SIT_I(sbi);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;sit_i-&gt;sentry_lock);</div><div class='del'>-	ret = f2fs_get_victim(sbi, victim, gc_type, NO_CHECK_TYPE, LFS, 0);</div><div class='add'>+	ret = f2fs_get_victim(sbi, victim, gc_type, NO_CHECK_TYPE,</div><div class='add'>+			LFS, 0, one_time);</div><div class='ctx'> 	up_write(&amp;sit_i-&gt;sentry_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1672,112 +1725,157 @@ static int __get_victim(struct f2fs_sb_info *sbi, unsigned int *victim,</div><div class='ctx'> static int do_garbage_collect(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				unsigned int start_segno,</div><div class='ctx'> 				struct gc_inode_list *gc_list, int gc_type,</div><div class='del'>-				bool force_migrate)</div><div class='add'>+				bool force_migrate, bool one_time)</div><div class='ctx'> {</div><div class='del'>-	struct page *sum_page;</div><div class='del'>-	struct f2fs_summary_block *sum;</div><div class='ctx'> 	struct blk_plug plug;</div><div class='ctx'> 	unsigned int segno = start_segno;</div><div class='del'>-	unsigned int end_segno = start_segno + sbi-&gt;segs_per_sec;</div><div class='add'>+	unsigned int end_segno = start_segno + SEGS_PER_SEC(sbi);</div><div class='add'>+	unsigned int sec_end_segno;</div><div class='ctx'> 	int seg_freed = 0, migrated = 0;</div><div class='ctx'> 	unsigned char type = IS_DATASEG(get_seg_entry(sbi, segno)-&gt;type) ?</div><div class='ctx'> 						SUM_TYPE_DATA : SUM_TYPE_NODE;</div><div class='ctx'> 	unsigned char data_type = (type == SUM_TYPE_DATA) ? DATA : NODE;</div><div class='del'>-	int submitted = 0;</div><div class='add'>+	int submitted = 0, sum_blk_cnt;</div><div class='ctx'> </div><div class='del'>-	if (__is_large_section(sbi))</div><div class='del'>-		end_segno = rounddown(end_segno, sbi-&gt;segs_per_sec);</div><div class='add'>+	if (__is_large_section(sbi)) {</div><div class='add'>+		sec_end_segno = rounddown(end_segno, SEGS_PER_SEC(sbi));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * zone-capacity can be less than zone-size in zoned devices,</div><div class='del'>-	 * resulting in less than expected usable segments in the zone,</div><div class='del'>-	 * calculate the end segno in the zone which can be garbage collected</div><div class='del'>-	 */</div><div class='del'>-	if (f2fs_sb_has_blkzoned(sbi))</div><div class='del'>-		end_segno -= sbi-&gt;segs_per_sec -</div><div class='del'>-					f2fs_usable_segs_in_sec(sbi, segno);</div><div class='add'>+		/*</div><div class='add'>+		 * zone-capacity can be less than zone-size in zoned devices,</div><div class='add'>+		 * resulting in less than expected usable segments in the zone,</div><div class='add'>+		 * calculate the end segno in the zone which can be garbage</div><div class='add'>+		 * collected</div><div class='add'>+		 */</div><div class='add'>+		if (f2fs_sb_has_blkzoned(sbi))</div><div class='add'>+			sec_end_segno -= SEGS_PER_SEC(sbi) -</div><div class='add'>+					f2fs_usable_segs_in_sec(sbi);</div><div class='add'>+</div><div class='add'>+		if (gc_type == BG_GC || one_time) {</div><div class='add'>+			unsigned int window_granularity =</div><div class='add'>+				sbi-&gt;migration_window_granularity;</div><div class='add'>+</div><div class='add'>+			if (f2fs_sb_has_blkzoned(sbi) &amp;&amp;</div><div class='add'>+					!has_enough_free_blocks(sbi,</div><div class='add'>+					sbi-&gt;gc_thread-&gt;boost_zoned_gc_percent))</div><div class='add'>+				window_granularity *=</div><div class='add'>+					sbi-&gt;gc_thread-&gt;boost_gc_multiple;</div><div class='add'>+</div><div class='add'>+			end_segno = start_segno + window_granularity;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (end_segno &gt; sec_end_segno)</div><div class='add'>+			end_segno = sec_end_segno;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sanity_check_seg_type(sbi, get_seg_entry(sbi, segno)-&gt;type);</div><div class='ctx'> </div><div class='add'>+	segno = rounddown(segno, SUMS_PER_BLOCK);</div><div class='add'>+	sum_blk_cnt = DIV_ROUND_UP(end_segno - segno, SUMS_PER_BLOCK);</div><div class='ctx'> 	/* readahead multi ssa blocks those have contiguous address */</div><div class='ctx'> 	if (__is_large_section(sbi))</div><div class='ctx'> 		f2fs_ra_meta_pages(sbi, GET_SUM_BLOCK(sbi, segno),</div><div class='del'>-					end_segno - segno, META_SSA, true);</div><div class='add'>+					sum_blk_cnt, META_SSA, true);</div><div class='ctx'> </div><div class='ctx'> 	/* reference all summary page */</div><div class='ctx'> 	while (segno &lt; end_segno) {</div><div class='del'>-		sum_page = f2fs_get_sum_page(sbi, segno++);</div><div class='del'>-		if (IS_ERR(sum_page)) {</div><div class='del'>-			int err = PTR_ERR(sum_page);</div><div class='add'>+		struct folio *sum_folio = f2fs_get_sum_folio(sbi, segno);</div><div class='add'>+</div><div class='add'>+		segno += SUMS_PER_BLOCK;</div><div class='add'>+		if (IS_ERR(sum_folio)) {</div><div class='add'>+			int err = PTR_ERR(sum_folio);</div><div class='ctx'> </div><div class='del'>-			end_segno = segno - 1;</div><div class='del'>-			for (segno = start_segno; segno &lt; end_segno; segno++) {</div><div class='del'>-				sum_page = find_get_page(META_MAPPING(sbi),</div><div class='add'>+			end_segno = segno - SUMS_PER_BLOCK;</div><div class='add'>+			segno = rounddown(start_segno, SUMS_PER_BLOCK);</div><div class='add'>+			while (segno &lt; end_segno) {</div><div class='add'>+				sum_folio = filemap_get_folio(META_MAPPING(sbi),</div><div class='ctx'> 						GET_SUM_BLOCK(sbi, segno));</div><div class='del'>-				f2fs_put_page(sum_page, 0);</div><div class='del'>-				f2fs_put_page(sum_page, 0);</div><div class='add'>+				folio_put_refs(sum_folio, 2);</div><div class='add'>+				segno += SUMS_PER_BLOCK;</div><div class='ctx'> 			}</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		unlock_page(sum_page);</div><div class='add'>+		folio_unlock(sum_folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> </div><div class='del'>-	for (segno = start_segno; segno &lt; end_segno; segno++) {</div><div class='add'>+	segno = start_segno;</div><div class='add'>+	while (segno &lt; end_segno) {</div><div class='add'>+		unsigned int cur_segno;</div><div class='ctx'> </div><div class='ctx'> 		/* find segment summary of victim */</div><div class='del'>-		sum_page = find_get_page(META_MAPPING(sbi),</div><div class='add'>+		struct folio *sum_folio = filemap_get_folio(META_MAPPING(sbi),</div><div class='ctx'> 					GET_SUM_BLOCK(sbi, segno));</div><div class='del'>-		f2fs_put_page(sum_page, 0);</div><div class='del'>-</div><div class='del'>-		if (get_valid_blocks(sbi, segno, false) == 0)</div><div class='del'>-			goto freed;</div><div class='del'>-		if (gc_type == BG_GC &amp;&amp; __is_large_section(sbi) &amp;&amp;</div><div class='del'>-				migrated &gt;= sbi-&gt;migration_granularity)</div><div class='del'>-			goto skip;</div><div class='del'>-		if (!PageUptodate(sum_page) || unlikely(f2fs_cp_error(sbi)))</div><div class='del'>-			goto skip;</div><div class='del'>-</div><div class='del'>-		sum = page_address(sum_page);</div><div class='del'>-		if (type != GET_SUM_TYPE((&amp;sum-&gt;footer))) {</div><div class='del'>-			f2fs_err(sbi, "Inconsistent segment (%u) type [%d, %d] in SSA and SIT",</div><div class='del'>-				 segno, type, GET_SUM_TYPE((&amp;sum-&gt;footer)));</div><div class='del'>-			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-			f2fs_stop_checkpoint(sbi, false,</div><div class='del'>-				STOP_CP_REASON_CORRUPTED_SUMMARY);</div><div class='del'>-			goto skip;</div><div class='add'>+		unsigned int block_end_segno = rounddown(segno, SUMS_PER_BLOCK)</div><div class='add'>+					+ SUMS_PER_BLOCK;</div><div class='add'>+</div><div class='add'>+		if (block_end_segno &gt; end_segno)</div><div class='add'>+			block_end_segno = end_segno;</div><div class='add'>+</div><div class='add'>+		if (is_cursec(sbi, GET_SEC_FROM_SEG(sbi, segno))) {</div><div class='add'>+			f2fs_err(sbi, "%s: segment %u is used by log",</div><div class='add'>+							__func__, segno);</div><div class='add'>+			f2fs_bug_on(sbi, 1);</div><div class='add'>+			goto next_block;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * this is to avoid deadlock:</div><div class='del'>-		 * - lock_page(sum_page)         - f2fs_replace_block</div><div class='del'>-		 *  - check_valid_map()            - down_write(sentry_lock)</div><div class='del'>-		 *   - down_read(sentry_lock)     - change_curseg()</div><div class='del'>-		 *                                  - lock_page(sum_page)</div><div class='del'>-		 */</div><div class='del'>-		if (type == SUM_TYPE_NODE)</div><div class='del'>-			submitted += gc_node_segment(sbi, sum-&gt;entries, segno,</div><div class='del'>-								gc_type);</div><div class='del'>-		else</div><div class='del'>-			submitted += gc_data_segment(sbi, sum-&gt;entries, gc_list,</div><div class='del'>-							segno, gc_type,</div><div class='del'>-							force_migrate);</div><div class='add'>+		if (!folio_test_uptodate(sum_folio) ||</div><div class='add'>+		    unlikely(f2fs_cp_error(sbi)))</div><div class='add'>+			goto next_block;</div><div class='ctx'> </div><div class='del'>-		stat_inc_gc_seg_count(sbi, data_type, gc_type);</div><div class='del'>-		sbi-&gt;gc_reclaimed_segs[sbi-&gt;gc_mode]++;</div><div class='del'>-		migrated++;</div><div class='add'>+		for (cur_segno = segno; cur_segno &lt; block_end_segno;</div><div class='add'>+				cur_segno++) {</div><div class='add'>+			struct f2fs_summary_block *sum;</div><div class='ctx'> </div><div class='del'>-freed:</div><div class='del'>-		if (gc_type == FG_GC &amp;&amp;</div><div class='del'>-				get_valid_blocks(sbi, segno, false) == 0)</div><div class='del'>-			seg_freed++;</div><div class='add'>+			if (get_valid_blocks(sbi, cur_segno, false) == 0)</div><div class='add'>+				goto freed;</div><div class='add'>+			if (gc_type == BG_GC &amp;&amp; __is_large_section(sbi) &amp;&amp;</div><div class='add'>+					migrated &gt;= sbi-&gt;migration_granularity)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		if (__is_large_section(sbi))</div><div class='del'>-			sbi-&gt;next_victim_seg[gc_type] =</div><div class='del'>-				(segno + 1 &lt; end_segno) ? segno + 1 : NULL_SEGNO;</div><div class='del'>-skip:</div><div class='del'>-		f2fs_put_page(sum_page, 0);</div><div class='add'>+			sum = SUM_BLK_PAGE_ADDR(sum_folio, cur_segno);</div><div class='add'>+			if (type != GET_SUM_TYPE((&amp;sum-&gt;footer))) {</div><div class='add'>+				f2fs_err(sbi, "Inconsistent segment (%u) type "</div><div class='add'>+						"[%d, %d] in SSA and SIT",</div><div class='add'>+						cur_segno, type,</div><div class='add'>+						GET_SUM_TYPE((&amp;sum-&gt;footer)));</div><div class='add'>+				f2fs_stop_checkpoint(sbi, false,</div><div class='add'>+						STOP_CP_REASON_CORRUPTED_SUMMARY);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * this is to avoid deadlock:</div><div class='add'>+			 *  - lock_page(sum_page)     - f2fs_replace_block</div><div class='add'>+			 *   - check_valid_map()        - down_write(sentry_lock)</div><div class='add'>+			 *    - down_read(sentry_lock) - change_curseg()</div><div class='add'>+			 *                               - lock_page(sum_page)</div><div class='add'>+			 */</div><div class='add'>+			if (type == SUM_TYPE_NODE)</div><div class='add'>+				submitted += gc_node_segment(sbi, sum-&gt;entries,</div><div class='add'>+						cur_segno, gc_type);</div><div class='add'>+			else</div><div class='add'>+				submitted += gc_data_segment(sbi, sum-&gt;entries,</div><div class='add'>+						gc_list, cur_segno,</div><div class='add'>+						gc_type, force_migrate);</div><div class='add'>+</div><div class='add'>+			stat_inc_gc_seg_count(sbi, data_type, gc_type);</div><div class='add'>+			sbi-&gt;gc_reclaimed_segs[sbi-&gt;gc_mode]++;</div><div class='add'>+			migrated++;</div><div class='add'>+</div><div class='add'>+freed:</div><div class='add'>+			if (gc_type == FG_GC &amp;&amp;</div><div class='add'>+					get_valid_blocks(sbi, cur_segno, false) == 0)</div><div class='add'>+				seg_freed++;</div><div class='add'>+</div><div class='add'>+			if (__is_large_section(sbi))</div><div class='add'>+				sbi-&gt;next_victim_seg[gc_type] =</div><div class='add'>+					(cur_segno + 1 &lt; sec_end_segno) ?</div><div class='add'>+					cur_segno + 1 : NULL_SEGNO;</div><div class='add'>+		}</div><div class='add'>+next_block:</div><div class='add'>+		folio_put_refs(sum_folio, 2);</div><div class='add'>+		segno = block_end_segno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (submitted)</div><div class='hunk'>@@ -1830,6 +1928,7 @@ gc_more:</div><div class='ctx'> 	/* Let's run FG_GC, if we don't have enough space. */</div><div class='ctx'> 	if (has_not_enough_free_secs(sbi, 0, 0)) {</div><div class='ctx'> 		gc_type = FG_GC;</div><div class='add'>+		gc_control-&gt;one_time = false;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For example, if there are many prefree_segments below given</div><div class='hunk'>@@ -1852,7 +1951,7 @@ gc_more:</div><div class='ctx'> 		goto stop;</div><div class='ctx'> 	}</div><div class='ctx'> retry:</div><div class='del'>-	ret = __get_victim(sbi, &amp;segno, gc_type);</div><div class='add'>+	ret = __get_victim(sbi, &amp;segno, gc_type, gc_control-&gt;one_time);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* allow to search victim from sections has pinned data */</div><div class='ctx'> 		if (ret == -ENODATA &amp;&amp; gc_type == FG_GC &amp;&amp;</div><div class='hunk'>@@ -1864,17 +1963,21 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seg_freed = do_garbage_collect(sbi, segno, &amp;gc_list, gc_type,</div><div class='del'>-				gc_control-&gt;should_migrate_blocks);</div><div class='add'>+				gc_control-&gt;should_migrate_blocks,</div><div class='add'>+				gc_control-&gt;one_time);</div><div class='ctx'> 	if (seg_freed &lt; 0)</div><div class='ctx'> 		goto stop;</div><div class='ctx'> </div><div class='ctx'> 	total_freed += seg_freed;</div><div class='ctx'> </div><div class='del'>-	if (seg_freed == f2fs_usable_segs_in_sec(sbi, segno)) {</div><div class='add'>+	if (seg_freed == f2fs_usable_segs_in_sec(sbi)) {</div><div class='ctx'> 		sec_freed++;</div><div class='ctx'> 		total_sec_freed++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (gc_control-&gt;one_time)</div><div class='add'>+		goto stop;</div><div class='add'>+</div><div class='ctx'> 	if (gc_type == FG_GC) {</div><div class='ctx'> 		sbi-&gt;cur_victim_sec = NULL_SEGNO;</div><div class='ctx'> </div><div class='hunk'>@@ -1983,10 +2086,52 @@ void f2fs_build_gc_manager(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	init_atgc_management(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int f2fs_gc_range(struct f2fs_sb_info *sbi,</div><div class='add'>+		unsigned int start_seg, unsigned int end_seg,</div><div class='add'>+		bool dry_run, unsigned int dry_run_sections)</div><div class='add'>+{</div><div class='add'>+	unsigned int segno;</div><div class='add'>+	unsigned int gc_secs = dry_run_sections;</div><div class='add'>+</div><div class='add'>+	if (unlikely(f2fs_cp_error(sbi)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	for (segno = start_seg; segno &lt;= end_seg; segno += SEGS_PER_SEC(sbi)) {</div><div class='add'>+		struct gc_inode_list gc_list = {</div><div class='add'>+			.ilist = LIST_HEAD_INIT(gc_list.ilist),</div><div class='add'>+			.iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * avoid migrating empty section, as it can be allocated by</div><div class='add'>+		 * log in parallel.</div><div class='add'>+		 */</div><div class='add'>+		if (!get_valid_blocks(sbi, segno, true))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (is_cursec(sbi, GET_SEC_FROM_SEG(sbi, segno)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		do_garbage_collect(sbi, segno, &amp;gc_list, FG_GC, true, false);</div><div class='add'>+		put_gc_inode(&amp;gc_list);</div><div class='add'>+</div><div class='add'>+		if (!dry_run &amp;&amp; get_valid_blocks(sbi, segno, true))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		if (dry_run &amp;&amp; dry_run_sections &amp;&amp;</div><div class='add'>+		    !get_valid_blocks(sbi, segno, true) &amp;&amp; --gc_secs == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (fatal_signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int free_segment_range(struct f2fs_sb_info *sbi,</div><div class='del'>-				unsigned int secs, bool gc_only)</div><div class='add'>+				unsigned int secs, bool dry_run)</div><div class='ctx'> {</div><div class='del'>-	unsigned int segno, next_inuse, start, end;</div><div class='add'>+	unsigned int next_inuse, start, end;</div><div class='ctx'> 	struct cp_control cpc = { CP_RESIZE, 0, 0, 0 };</div><div class='ctx'> 	int gc_mode, gc_type;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1994,7 +2139,7 @@ static int free_segment_range(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 	/* Force block allocation for GC */</div><div class='ctx'> 	MAIN_SECS(sbi) -= secs;</div><div class='del'>-	start = MAIN_SECS(sbi) * sbi-&gt;segs_per_sec;</div><div class='add'>+	start = MAIN_SECS(sbi) * SEGS_PER_SEC(sbi);</div><div class='ctx'> 	end = MAIN_SEGS(sbi) - 1;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;DIRTY_I(sbi)-&gt;seglist_lock);</div><div class='hunk'>@@ -2008,29 +2153,15 @@ static int free_segment_range(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	mutex_unlock(&amp;DIRTY_I(sbi)-&gt;seglist_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Move out cursegs from the target range */</div><div class='del'>-	for (type = CURSEG_HOT_DATA; type &lt; NR_CURSEG_PERSIST_TYPE; type++)</div><div class='del'>-		f2fs_allocate_segment_for_resize(sbi, type, start, end);</div><div class='del'>-</div><div class='del'>-	/* do GC to move out valid blocks in the range */</div><div class='del'>-	for (segno = start; segno &lt;= end; segno += sbi-&gt;segs_per_sec) {</div><div class='del'>-		struct gc_inode_list gc_list = {</div><div class='del'>-			.ilist = LIST_HEAD_INIT(gc_list.ilist),</div><div class='del'>-			.iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS),</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		do_garbage_collect(sbi, segno, &amp;gc_list, FG_GC, true);</div><div class='del'>-		put_gc_inode(&amp;gc_list);</div><div class='del'>-</div><div class='del'>-		if (!gc_only &amp;&amp; get_valid_blocks(sbi, segno, true)) {</div><div class='del'>-			err = -EAGAIN;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='del'>-			err = -ERESTARTSYS;</div><div class='add'>+	for (type = CURSEG_HOT_DATA; type &lt; NR_CURSEG_PERSIST_TYPE; type++) {</div><div class='add'>+		err = f2fs_allocate_segment_for_resize(sbi, type, start, end);</div><div class='add'>+		if (err)</div><div class='ctx'> 			goto out;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='del'>-	if (gc_only)</div><div class='add'>+</div><div class='add'>+	/* do GC to move out valid blocks in the range */</div><div class='add'>+	err = f2fs_gc_range(sbi, start, end, dry_run, 0);</div><div class='add'>+	if (err || dry_run)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	stat_inc_cp_call_count(sbi, TOTAL_CALL);</div><div class='hunk'>@@ -2056,7 +2187,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)</div><div class='ctx'> 	int segment_count;</div><div class='ctx'> 	int segment_count_main;</div><div class='ctx'> 	long long block_count;</div><div class='del'>-	int segs = secs * sbi-&gt;segs_per_sec;</div><div class='add'>+	int segs = secs * SEGS_PER_SEC(sbi);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;sbi-&gt;sb_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2069,7 +2200,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)</div><div class='ctx'> 	raw_sb-&gt;segment_count = cpu_to_le32(segment_count + segs);</div><div class='ctx'> 	raw_sb-&gt;segment_count_main = cpu_to_le32(segment_count_main + segs);</div><div class='ctx'> 	raw_sb-&gt;block_count = cpu_to_le64(block_count +</div><div class='del'>-					(long long)segs * sbi-&gt;blocks_per_seg);</div><div class='add'>+			(long long)SEGS_TO_BLKS(sbi, segs));</div><div class='ctx'> 	if (f2fs_is_multi_device(sbi)) {</div><div class='ctx'> 		int last_dev = sbi-&gt;s_ndevs - 1;</div><div class='ctx'> 		int dev_segs =</div><div class='hunk'>@@ -2084,14 +2215,16 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)</div><div class='ctx'> </div><div class='ctx'> static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)</div><div class='ctx'> {</div><div class='del'>-	int segs = secs * sbi-&gt;segs_per_sec;</div><div class='del'>-	long long blks = (long long)segs * sbi-&gt;blocks_per_seg;</div><div class='add'>+	int segs = secs * SEGS_PER_SEC(sbi);</div><div class='add'>+	long long blks = SEGS_TO_BLKS(sbi, segs);</div><div class='ctx'> 	long long user_block_count =</div><div class='ctx'> 				le64_to_cpu(F2FS_CKPT(sbi)-&gt;user_block_count);</div><div class='ctx'> </div><div class='ctx'> 	SM_I(sbi)-&gt;segment_count = (int)SM_I(sbi)-&gt;segment_count + segs;</div><div class='ctx'> 	MAIN_SEGS(sbi) = (int)MAIN_SEGS(sbi) + segs;</div><div class='ctx'> 	MAIN_SECS(sbi) += secs;</div><div class='add'>+	if (sbi-&gt;allocate_section_hint &gt; MAIN_SECS(sbi))</div><div class='add'>+		sbi-&gt;allocate_section_hint = MAIN_SECS(sbi);</div><div class='ctx'> 	FREE_I(sbi)-&gt;free_sections = (int)FREE_I(sbi)-&gt;free_sections + secs;</div><div class='ctx'> 	FREE_I(sbi)-&gt;free_segments = (int)FREE_I(sbi)-&gt;free_segments + segs;</div><div class='ctx'> 	F2FS_CKPT(sbi)-&gt;user_block_count = cpu_to_le64(user_block_count + blks);</div><div class='hunk'>@@ -2099,6 +2232,9 @@ static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)</div><div class='ctx'> 	if (f2fs_is_multi_device(sbi)) {</div><div class='ctx'> 		int last_dev = sbi-&gt;s_ndevs - 1;</div><div class='ctx'> </div><div class='add'>+		sbi-&gt;allocate_section_hint = FDEV(0).total_segments /</div><div class='add'>+					SEGS_PER_SEC(sbi);</div><div class='add'>+</div><div class='ctx'> 		FDEV(last_dev).total_segments =</div><div class='ctx'> 				(int)FDEV(last_dev).total_segments + segs;</div><div class='ctx'> 		FDEV(last_dev).end_blk =</div><div class='hunk'>@@ -2127,7 +2263,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)</div><div class='ctx'> 		int last_dev = sbi-&gt;s_ndevs - 1;</div><div class='ctx'> 		__u64 last_segs = FDEV(last_dev).total_segments;</div><div class='ctx'> </div><div class='del'>-		if (block_count + last_segs * sbi-&gt;blocks_per_seg &lt;=</div><div class='add'>+		if (block_count + SEGS_TO_BLKS(sbi, last_segs) &lt;=</div><div class='ctx'> 								old_block_count)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2186,12 +2322,12 @@ out_drop_write:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = freeze_super(sbi-&gt;sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+	err = freeze_super(sbi-&gt;sb, FREEZE_HOLDER_KERNEL, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_readonly(sbi-&gt;sb)) {</div><div class='del'>-		err = thaw_super(sbi-&gt;sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+		err = thaw_super(sbi-&gt;sb, FREEZE_HOLDER_KERNEL, NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		return -EROFS;</div><div class='hunk'>@@ -2248,6 +2384,6 @@ recover_out:</div><div class='ctx'> out_err:</div><div class='ctx'> 	f2fs_up_write(&amp;sbi-&gt;cp_global_sem);</div><div class='ctx'> 	f2fs_up_write(&amp;sbi-&gt;gc_lock);</div><div class='del'>-	thaw_super(sbi-&gt;sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+	thaw_super(sbi-&gt;sb, FREEZE_HOLDER_KERNEL, NULL);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h<br/>index 28a00942802c..6c4d4567571e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/gc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/gc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/gc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/gc.h</a></div><div class='hunk'>@@ -15,17 +15,30 @@</div><div class='ctx'> #define DEF_GC_THREAD_MAX_SLEEP_TIME	60000</div><div class='ctx'> #define DEF_GC_THREAD_NOGC_SLEEP_TIME	300000	/* wait 5 min */</div><div class='ctx'> </div><div class='add'>+/* GC sleep parameters for zoned deivces */</div><div class='add'>+#define DEF_GC_THREAD_MIN_SLEEP_TIME_ZONED	10</div><div class='add'>+#define DEF_GC_THREAD_MAX_SLEEP_TIME_ZONED	20</div><div class='add'>+#define DEF_GC_THREAD_NOGC_SLEEP_TIME_ZONED	60000</div><div class='add'>+</div><div class='ctx'> /* choose candidates from sections which has age of more than 7 days */</div><div class='ctx'> #define DEF_GC_THREAD_AGE_THRESHOLD		(60 * 60 * 24 * 7)</div><div class='ctx'> #define DEF_GC_THREAD_CANDIDATE_RATIO		20	/* select 20% oldest sections as candidates */</div><div class='ctx'> #define DEF_GC_THREAD_MAX_CANDIDATE_COUNT	10	/* select at most 10 sections as candidates */</div><div class='ctx'> #define DEF_GC_THREAD_AGE_WEIGHT		60	/* age weight */</div><div class='add'>+#define DEF_GC_THREAD_VALID_THRESH_RATIO	80	/* do not GC over 80% valid block ratio for one time GC */</div><div class='ctx'> #define DEFAULT_ACCURACY_CLASS			10000	/* accuracy class */</div><div class='ctx'> </div><div class='ctx'> #define LIMIT_INVALID_BLOCK	40 /* percentage over total user space */</div><div class='ctx'> #define LIMIT_FREE_BLOCK	40 /* percentage over invalid + free space */</div><div class='ctx'> </div><div class='add'>+#define LIMIT_NO_ZONED_GC	60 /* percentage over total user space of no gc for zoned devices */</div><div class='add'>+#define LIMIT_BOOST_ZONED_GC	25 /* percentage over total user space of boosted gc for zoned devices */</div><div class='add'>+#define DEF_MIGRATION_WINDOW_GRANULARITY_ZONED	3</div><div class='add'>+#define BOOST_GC_MULTIPLE	5</div><div class='add'>+#define ZONED_PIN_SEC_REQUIRED_COUNT	1</div><div class='add'>+</div><div class='ctx'> #define DEF_GC_FAILED_PINNED_FILES	2048</div><div class='add'>+#define MAX_GC_FAILED_PINNED_FILES	USHRT_MAX</div><div class='ctx'> </div><div class='ctx'> /* Search max. number of dirty segments to select a victim segment */</div><div class='ctx'> #define DEF_MAX_VICTIM_SEARCH 4096 /* covers 8GB */</div><div class='hunk'>@@ -50,6 +63,13 @@ struct f2fs_gc_kthread {</div><div class='ctx'> 						 * caller of f2fs_balance_fs()</div><div class='ctx'> 						 * will wait on this wait queue.</div><div class='ctx'> 						 */</div><div class='add'>+</div><div class='add'>+	/* for gc control for zoned devices */</div><div class='add'>+	unsigned int no_zoned_gc_percent;</div><div class='add'>+	unsigned int boost_zoned_gc_percent;</div><div class='add'>+	unsigned int valid_thresh_ratio;</div><div class='add'>+	unsigned int boost_gc_multiple;</div><div class='add'>+	unsigned int boost_gc_greedy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gc_inode_list {</div><div class='hunk'>@@ -96,7 +116,7 @@ static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi))</div><div class='ctx'> 		return free_segs_blk_count_zoned(sbi);</div><div class='ctx'> </div><div class='del'>-	return free_segments(sbi) &lt;&lt; sbi-&gt;log_blocks_per_seg;</div><div class='add'>+	return SEGS_TO_BLKS(sbi, free_segments(sbi));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -104,7 +124,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	block_t free_blks, ovp_blks;</div><div class='ctx'> </div><div class='ctx'> 	free_blks = free_segs_blk_count(sbi);</div><div class='del'>-	ovp_blks = overprovision_segments(sbi) &lt;&lt; sbi-&gt;log_blocks_per_seg;</div><div class='add'>+	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));</div><div class='ctx'> </div><div class='ctx'> 	if (free_blks &lt; ovp_blks)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -151,6 +171,12 @@ static inline void decrease_sleep_time(struct f2fs_gc_kthread *gc_th,</div><div class='ctx'> 		*wait -= min_time;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool has_enough_free_blocks(struct f2fs_sb_info *sbi,</div><div class='add'>+						unsigned int limit_perc)</div><div class='add'>+{</div><div class='add'>+	return free_sections(sbi) &gt; ((sbi-&gt;total_sections * limit_perc) / 100);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool has_enough_invalid_blocks(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	block_t user_block_count = sbi-&gt;user_block_count;</div><div class='hunk'>@@ -166,3 +192,11 @@ static inline bool has_enough_invalid_blocks(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		free_user_blocks(sbi) &lt;</div><div class='ctx'> 			limit_free_user_blocks(invalid_user_blocks));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool need_to_boost_gc(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi))</div><div class='add'>+		return !has_enough_free_blocks(sbi,</div><div class='add'>+				sbi-&gt;gc_thread-&gt;boost_zoned_gc_percent);</div><div class='add'>+	return has_enough_invalid_blocks(sbi);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c<br/>index ac00423f117b..e5c6a08b7e4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/inline.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/inline.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/inline.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/inline.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> static bool support_inline_data(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (f2fs_is_atomic_file(inode))</div><div class='add'>+	if (f2fs_used_in_atomic_write(inode))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!S_ISREG(inode-&gt;i_mode) &amp;&amp; !S_ISLNK(inode-&gt;i_mode))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -33,11 +33,29 @@ bool f2fs_may_inline_data(struct inode *inode)</div><div class='ctx'> 	return !f2fs_post_read_required(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_sanity_check_inline_data(struct inode *inode)</div><div class='add'>+static bool inode_has_blocks(struct inode *inode, struct folio *ifolio)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_inode *ri = F2FS_INODE(ifolio);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (F2FS_HAS_BLOCKS(inode))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DEF_NIDS_PER_INODE; i++) {</div><div class='add'>+		if (ri-&gt;i_nid[i])</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool f2fs_sanity_check_inline_data(struct inode *inode, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	if (!f2fs_has_inline_data(inode))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	if (inode_has_blocks(inode, ifolio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (!support_inline_data(inode))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='hunk'>@@ -61,70 +79,70 @@ bool f2fs_may_inline_dentry(struct inode *inode)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_do_read_inline_data(struct page *page, struct page *ipage)</div><div class='add'>+void f2fs_do_read_inline_data(struct folio *folio, struct folio *ifolio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-	if (PageUptodate(page))</div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(F2FS_P_SB(page), page-&gt;index);</div><div class='add'>+	f2fs_bug_on(F2FS_I_SB(inode), folio-&gt;index);</div><div class='ctx'> </div><div class='del'>-	zero_user_segment(page, MAX_INLINE_DATA(inode), PAGE_SIZE);</div><div class='add'>+	folio_zero_segment(folio, MAX_INLINE_DATA(inode), folio_size(folio));</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the whole inline data block */</div><div class='del'>-	memcpy_to_page(page, 0, inline_data_addr(inode, ipage),</div><div class='add'>+	memcpy_to_folio(folio, 0, inline_data_addr(inode, ifolio),</div><div class='ctx'> 		       MAX_INLINE_DATA(inode));</div><div class='del'>-	if (!PageUptodate(page))</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_truncate_inline_inode(struct inode *inode,</div><div class='del'>-					struct page *ipage, u64 from)</div><div class='add'>+void f2fs_truncate_inline_inode(struct inode *inode, struct folio *ifolio,</div><div class='add'>+		u64 from)</div><div class='ctx'> {</div><div class='ctx'> 	void *addr;</div><div class='ctx'> </div><div class='ctx'> 	if (from &gt;= MAX_INLINE_DATA(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	addr = inline_data_addr(inode, ipage);</div><div class='add'>+	addr = inline_data_addr(inode, ifolio);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> 	memset(addr + from, 0, MAX_INLINE_DATA(inode) - from);</div><div class='del'>-	set_page_dirty(ipage);</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	if (from == 0)</div><div class='ctx'> 		clear_inode_flag(inode, FI_DATA_EXIST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_read_inline_data(struct inode *inode, struct page *page)</div><div class='add'>+int f2fs_read_inline_data(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_has_inline_data(inode)) {</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page-&gt;index)</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='add'>+	if (folio-&gt;index)</div><div class='add'>+		folio_zero_segment(folio, 0, folio_size(folio));</div><div class='ctx'> 	else</div><div class='del'>-		f2fs_do_read_inline_data(page, ipage);</div><div class='add'>+		f2fs_do_read_inline_data(folio, ifolio);</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page))</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)</div><div class='add'>+int f2fs_convert_inline_folio(struct dnode_of_data *dn, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = F2FS_I_SB(dn-&gt;inode),</div><div class='hunk'>@@ -132,7 +150,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)</div><div class='ctx'> 		.type = DATA,</div><div class='ctx'> 		.op = REQ_OP_WRITE,</div><div class='ctx'> 		.op_flags = REQ_SYNC | REQ_PRIO,</div><div class='del'>-		.page = page,</div><div class='add'>+		.folio = folio,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.io_type = FS_DATA_IO,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -164,20 +182,20 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(F2FS_P_SB(page), PageWriteback(page));</div><div class='add'>+	f2fs_bug_on(F2FS_F_SB(folio), folio_test_writeback(folio));</div><div class='ctx'> </div><div class='del'>-	f2fs_do_read_inline_data(page, dn-&gt;inode_page);</div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	f2fs_do_read_inline_data(folio, dn-&gt;inode_folio);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> 	/* clear dirty state */</div><div class='del'>-	dirty = clear_page_dirty_for_io(page);</div><div class='add'>+	dirty = folio_clear_dirty_for_io(folio);</div><div class='ctx'> </div><div class='ctx'> 	/* write data page to try to make data consistent */</div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> 	fio.old_blkaddr = dn-&gt;data_blkaddr;</div><div class='ctx'> 	set_inode_flag(dn-&gt;inode, FI_HOT_DATA);</div><div class='ctx'> 	f2fs_outplace_write_data(dn, &amp;fio);</div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> 	if (dirty) {</div><div class='ctx'> 		inode_dec_dirty_pages(dn-&gt;inode);</div><div class='ctx'> 		f2fs_remove_dirty_inode(dn-&gt;inode);</div><div class='hunk'>@@ -187,8 +205,8 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)</div><div class='ctx'> 	set_inode_flag(dn-&gt;inode, FI_APPEND_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	/* clear inline data and flag after data writeback */</div><div class='del'>-	f2fs_truncate_inline_inode(dn-&gt;inode, dn-&gt;inode_page, 0);</div><div class='del'>-	clear_page_private_inline(dn-&gt;inode_page);</div><div class='add'>+	f2fs_truncate_inline_inode(dn-&gt;inode, dn-&gt;inode_folio, 0);</div><div class='add'>+	folio_clear_f2fs_inline(dn-&gt;inode_folio);</div><div class='ctx'> clear_out:</div><div class='ctx'> 	stat_dec_inline_inode(dn-&gt;inode);</div><div class='ctx'> 	clear_inode_flag(dn-&gt;inode, FI_INLINE_DATA);</div><div class='hunk'>@@ -200,39 +218,41 @@ int f2fs_convert_inline_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *ipage, *page;</div><div class='add'>+	struct folio *ifolio, *folio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_has_inline_data(inode) ||</div><div class='del'>-			f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi-&gt;sb))</div><div class='add'>+	if (f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi-&gt;sb))</div><div class='add'>+		return -EROFS;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_has_inline_data(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_dquot_initialize(inode);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_cache_page(inode-&gt;i_mapping, 0, false);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	folio = f2fs_grab_cache_folio(inode-&gt;i_mapping, 0, false);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_lock_op(sbi);</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		err = PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		err = PTR_ERR(ifolio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, ipage, ipage, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, ifolio, ifolio, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_data(inode))</div><div class='del'>-		err = f2fs_convert_inline_page(&amp;dn, page);</div><div class='add'>+		err = f2fs_convert_inline_folio(&amp;dn, folio);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='ctx'> out:</div><div class='ctx'> 	f2fs_unlock_op(sbi);</div><div class='ctx'> </div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		f2fs_balance_fs(sbi, dn.node_changed);</div><div class='hunk'>@@ -240,44 +260,42 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_write_inline_data(struct inode *inode, struct page *page)</div><div class='add'>+int f2fs_write_inline_data(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct dnode_of_data dn;</div><div class='del'>-	int err;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='del'>-	err = f2fs_get_dnode_of_data(&amp;dn, 0, LOOKUP_NODE);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_has_inline_data(inode)) {</div><div class='del'>-		f2fs_put_dnode(&amp;dn);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(F2FS_I_SB(inode), page-&gt;index);</div><div class='add'>+	f2fs_bug_on(F2FS_I_SB(inode), folio-&gt;index);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(dn.inode_page, NODE, true, true);</div><div class='del'>-	memcpy_from_page(inline_data_addr(inode, dn.inode_page),</div><div class='del'>-			 page, 0, MAX_INLINE_DATA(inode));</div><div class='del'>-	set_page_dirty(dn.inode_page);</div><div class='add'>+	f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='add'>+	memcpy_from_folio(inline_data_addr(inode, ifolio),</div><div class='add'>+			 folio, 0, MAX_INLINE_DATA(inode));</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='ctx'> </div><div class='del'>-	f2fs_clear_page_cache_dirty_tag(page);</div><div class='add'>+	f2fs_clear_page_cache_dirty_tag(folio);</div><div class='ctx'> </div><div class='ctx'> 	set_inode_flag(inode, FI_APPEND_WRITE);</div><div class='ctx'> 	set_inode_flag(inode, FI_DATA_EXIST);</div><div class='ctx'> </div><div class='del'>-	clear_page_private_inline(dn.inode_page);</div><div class='del'>-	f2fs_put_dnode(&amp;dn);</div><div class='add'>+	folio_clear_f2fs_inline(ifolio);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_recover_inline_data(struct inode *inode, struct page *npage)</div><div class='add'>+int f2fs_recover_inline_data(struct inode *inode, struct folio *nfolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct f2fs_inode *ri = NULL;</div><div class='ctx'> 	void *src_addr, *dst_addr;</div><div class='del'>-	struct page *ipage;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The inline_data recovery policy is as follows.</div><div class='hunk'>@@ -287,38 +305,39 @@ int f2fs_recover_inline_data(struct inode *inode, struct page *npage)</div><div class='ctx'> 	 *    x       o  -&gt; remove data blocks, and then recover inline_data</div><div class='ctx'> 	 *    x       x  -&gt; recover data blocks</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_INODE(npage))</div><div class='del'>-		ri = F2FS_INODE(npage);</div><div class='add'>+	if (IS_INODE(nfolio))</div><div class='add'>+		ri = F2FS_INODE(nfolio);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_data(inode) &amp;&amp;</div><div class='ctx'> 			ri &amp;&amp; (ri-&gt;i_inline &amp; F2FS_INLINE_DATA)) {</div><div class='add'>+		struct folio *ifolio;</div><div class='ctx'> process_inline:</div><div class='del'>-		ipage = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-		if (IS_ERR(ipage))</div><div class='del'>-			return PTR_ERR(ipage);</div><div class='add'>+		ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+		if (IS_ERR(ifolio))</div><div class='add'>+			return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='del'>-		f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+		f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> </div><div class='del'>-		src_addr = inline_data_addr(inode, npage);</div><div class='del'>-		dst_addr = inline_data_addr(inode, ipage);</div><div class='add'>+		src_addr = inline_data_addr(inode, nfolio);</div><div class='add'>+		dst_addr = inline_data_addr(inode, ifolio);</div><div class='ctx'> 		memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode));</div><div class='ctx'> </div><div class='ctx'> 		set_inode_flag(inode, FI_INLINE_DATA);</div><div class='ctx'> 		set_inode_flag(inode, FI_DATA_EXIST);</div><div class='ctx'> </div><div class='del'>-		set_page_dirty(ipage);</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		folio_mark_dirty(ifolio);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_inline_data(inode)) {</div><div class='del'>-		ipage = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-		if (IS_ERR(ipage))</div><div class='del'>-			return PTR_ERR(ipage);</div><div class='del'>-		f2fs_truncate_inline_inode(inode, ipage, 0);</div><div class='add'>+		struct folio *ifolio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+		if (IS_ERR(ifolio))</div><div class='add'>+			return PTR_ERR(ifolio);</div><div class='add'>+		f2fs_truncate_inline_inode(inode, ifolio, 0);</div><div class='ctx'> 		stat_dec_inline_inode(inode);</div><div class='ctx'> 		clear_inode_flag(inode, FI_INLINE_DATA);</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 	} else if (ri &amp;&amp; (ri-&gt;i_inline &amp; F2FS_INLINE_DATA)) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -333,49 +352,50 @@ process_inline:</div><div class='ctx'> </div><div class='ctx'> struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,</div><div class='ctx'> 					const struct f2fs_filename *fname,</div><div class='del'>-					struct page **res_page)</div><div class='add'>+					struct folio **res_folio,</div><div class='add'>+					bool use_hash)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_SB(dir-&gt;i_sb);</div><div class='ctx'> 	struct f2fs_dir_entry *de;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	void *inline_dentry;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, dir-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		*res_page = ipage;</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, dir-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		*res_folio = ifolio;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(dir, ipage);</div><div class='add'>+	inline_dentry = inline_data_addr(dir, ifolio);</div><div class='ctx'> </div><div class='ctx'> 	make_dentry_ptr_inline(dir, &amp;d, inline_dentry);</div><div class='del'>-	de = f2fs_find_target_dentry(&amp;d, fname, NULL);</div><div class='del'>-	unlock_page(ipage);</div><div class='add'>+	de = f2fs_find_target_dentry(&amp;d, fname, NULL, use_hash);</div><div class='add'>+	folio_unlock(ifolio);</div><div class='ctx'> 	if (IS_ERR(de)) {</div><div class='del'>-		*res_page = ERR_CAST(de);</div><div class='add'>+		*res_folio = ERR_CAST(de);</div><div class='ctx'> 		de = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (de)</div><div class='del'>-		*res_page = ipage;</div><div class='add'>+		*res_folio = ifolio;</div><div class='ctx'> 	else</div><div class='del'>-		f2fs_put_page(ipage, 0);</div><div class='add'>+		f2fs_folio_put(ifolio, false);</div><div class='ctx'> </div><div class='ctx'> 	return de;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_make_empty_inline_dir(struct inode *inode, struct inode *parent,</div><div class='del'>-							struct page *ipage)</div><div class='add'>+							struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> 	void *inline_dentry;</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(inode, ipage);</div><div class='add'>+	inline_dentry = inline_data_addr(inode, ifolio);</div><div class='ctx'> </div><div class='ctx'> 	make_dentry_ptr_inline(inode, &amp;d, inline_dentry);</div><div class='ctx'> 	f2fs_do_make_empty_dir(inode, parent, &amp;d);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(ipage);</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	/* update i_size to MAX_INLINE_DATA */</div><div class='ctx'> 	if (i_size_read(inode) &lt; MAX_INLINE_DATA(inode))</div><div class='hunk'>@@ -387,39 +407,39 @@ int f2fs_make_empty_inline_dir(struct inode *inode, struct inode *parent,</div><div class='ctx'>  * NOTE: ipage is grabbed by caller, but if any error occurs, we should</div><div class='ctx'>  * release ipage in this function.</div><div class='ctx'>  */</div><div class='del'>-static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,</div><div class='add'>+static int f2fs_move_inline_dirents(struct inode *dir, struct folio *ifolio,</div><div class='ctx'> 							void *inline_dentry)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct f2fs_dentry_block *dentry_blk;</div><div class='ctx'> 	struct f2fs_dentry_ptr src, dst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_cache_page(dir-&gt;i_mapping, 0, true);</div><div class='del'>-	if (!page) {</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	folio = f2fs_grab_cache_folio(dir-&gt;i_mapping, 0, true);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, dir, ipage, NULL, 0);</div><div class='add'>+	set_new_dnode(&amp;dn, dir, ifolio, NULL, 0);</div><div class='ctx'> 	err = f2fs_reserve_block(&amp;dn, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(dn.data_blkaddr != NEW_ADDR)) {</div><div class='ctx'> 		f2fs_put_dnode(&amp;dn);</div><div class='del'>-		set_sbi_flag(F2FS_P_SB(page), SBI_NEED_FSCK);</div><div class='del'>-		f2fs_warn(F2FS_P_SB(page), "%s: corrupted inline inode ino=%lx, i_addr[0]:0x%x, run fsck to fix.",</div><div class='add'>+		set_sbi_flag(F2FS_F_SB(folio), SBI_NEED_FSCK);</div><div class='add'>+		f2fs_warn(F2FS_F_SB(folio), "%s: corrupted inline inode ino=%lx, i_addr[0]:0x%x, run fsck to fix.",</div><div class='ctx'> 			  __func__, dir-&gt;i_ino, dn.data_blkaddr);</div><div class='del'>-		f2fs_handle_error(F2FS_P_SB(page), ERROR_INVALID_BLKADDR);</div><div class='add'>+		f2fs_handle_error(F2FS_F_SB(folio), ERROR_INVALID_BLKADDR);</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(page, DATA, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, DATA, true, true);</div><div class='ctx'> </div><div class='del'>-	dentry_blk = page_address(page);</div><div class='add'>+	dentry_blk = folio_address(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start by zeroing the full block, to ensure that all unused space is</div><div class='hunk'>@@ -435,12 +455,12 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,</div><div class='ctx'> 	memcpy(dst.dentry, src.dentry, SIZE_OF_DIR_ENTRY * src.max);</div><div class='ctx'> 	memcpy(dst.filename, src.filename, src.max * F2FS_SLOT_LEN);</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page))</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> 	/* clear inline dir and flag after data writeback */</div><div class='del'>-	f2fs_truncate_inline_inode(dir, ipage, 0);</div><div class='add'>+	f2fs_truncate_inline_inode(dir, ifolio, 0);</div><div class='ctx'> </div><div class='ctx'> 	stat_dec_inline_dir(dir);</div><div class='ctx'> 	clear_inode_flag(dir, FI_INLINE_DENTRY);</div><div class='hunk'>@@ -457,7 +477,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,</div><div class='ctx'> 	if (i_size_read(dir) &lt; PAGE_SIZE)</div><div class='ctx'> 		f2fs_i_size_write(dir, PAGE_SIZE);</div><div class='ctx'> out:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -513,7 +533,7 @@ punch_dentry_pages:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage,</div><div class='add'>+static int f2fs_move_rehashed_dirents(struct inode *dir, struct folio *ifolio,</div><div class='ctx'> 							void *inline_dentry)</div><div class='ctx'> {</div><div class='ctx'> 	void *backup_dentry;</div><div class='hunk'>@@ -522,20 +542,20 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage,</div><div class='ctx'> 	backup_dentry = f2fs_kmalloc(F2FS_I_SB(dir),</div><div class='ctx'> 				MAX_INLINE_DATA(dir), GFP_F2FS_ZERO);</div><div class='ctx'> 	if (!backup_dentry) {</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(backup_dentry, inline_dentry, MAX_INLINE_DATA(dir));</div><div class='del'>-	f2fs_truncate_inline_inode(dir, ipage, 0);</div><div class='add'>+	f2fs_truncate_inline_inode(dir, ifolio, 0);</div><div class='ctx'> </div><div class='del'>-	unlock_page(ipage);</div><div class='add'>+	folio_unlock(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_add_inline_entries(dir, backup_dentry);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto recover;</div><div class='ctx'> </div><div class='del'>-	lock_page(ipage);</div><div class='add'>+	folio_lock(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	stat_dec_inline_dir(dir);</div><div class='ctx'> 	clear_inode_flag(dir, FI_INLINE_DENTRY);</div><div class='hunk'>@@ -551,31 +571,31 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage,</div><div class='ctx'> 	kfree(backup_dentry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> recover:</div><div class='del'>-	lock_page(ipage);</div><div class='del'>-	f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+	folio_lock(ifolio);</div><div class='add'>+	f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> 	memcpy(inline_dentry, backup_dentry, MAX_INLINE_DATA(dir));</div><div class='ctx'> 	f2fs_i_depth_write(dir, 0);</div><div class='ctx'> 	f2fs_i_size_write(dir, MAX_INLINE_DATA(dir));</div><div class='del'>-	set_page_dirty(ipage);</div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> </div><div class='ctx'> 	kfree(backup_dentry);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_convert_inline_dir(struct inode *dir, struct page *ipage,</div><div class='add'>+static int do_convert_inline_dir(struct inode *dir, struct folio *ifolio,</div><div class='ctx'> 							void *inline_dentry)</div><div class='ctx'> {</div><div class='ctx'> 	if (!F2FS_I(dir)-&gt;i_dir_level)</div><div class='del'>-		return f2fs_move_inline_dirents(dir, ipage, inline_dentry);</div><div class='add'>+		return f2fs_move_inline_dirents(dir, ifolio, inline_dentry);</div><div class='ctx'> 	else</div><div class='del'>-		return f2fs_move_rehashed_dirents(dir, ipage, inline_dentry);</div><div class='add'>+		return f2fs_move_rehashed_dirents(dir, ifolio, inline_dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	struct f2fs_filename fname;</div><div class='ctx'> 	void *inline_dentry = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -589,22 +609,22 @@ int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, dir-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage)) {</div><div class='del'>-		err = PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, dir-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='add'>+		err = PTR_ERR(ifolio);</div><div class='ctx'> 		goto out_fname;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f2fs_has_enough_room(dir, ipage, &amp;fname)) {</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+	if (f2fs_has_enough_room(dir, ifolio, &amp;fname)) {</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> 		goto out_fname;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(dir, ipage);</div><div class='add'>+	inline_dentry = inline_data_addr(dir, ifolio);</div><div class='ctx'> </div><div class='del'>-	err = do_convert_inline_dir(dir, ipage, inline_dentry);</div><div class='add'>+	err = do_convert_inline_dir(dir, ifolio, inline_dentry);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		f2fs_put_page(ipage, 1);</div><div class='add'>+		f2fs_folio_put(ifolio, true);</div><div class='ctx'> out_fname:</div><div class='ctx'> 	f2fs_free_filename(&amp;fname);</div><div class='ctx'> out:</div><div class='hunk'>@@ -616,24 +636,24 @@ int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,</div><div class='ctx'> 			  struct inode *inode, nid_t ino, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	unsigned int bit_pos;</div><div class='ctx'> 	void *inline_dentry = NULL;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> 	int slots = GET_DENTRY_SLOTS(fname-&gt;disk_name.len);</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, dir-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage))</div><div class='del'>-		return PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, dir-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(dir, ipage);</div><div class='add'>+	inline_dentry = inline_data_addr(dir, ifolio);</div><div class='ctx'> 	make_dentry_ptr_inline(dir, &amp;d, inline_dentry);</div><div class='ctx'> </div><div class='ctx'> 	bit_pos = f2fs_room_for_filename(d.bitmap, slots, d.max);</div><div class='ctx'> 	if (bit_pos &gt;= d.max) {</div><div class='del'>-		err = do_convert_inline_dir(dir, ipage, inline_dentry);</div><div class='add'>+		err = do_convert_inline_dir(dir, ifolio, inline_dentry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		err = -EAGAIN;</div><div class='hunk'>@@ -643,19 +663,19 @@ int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		f2fs_down_write_nested(&amp;F2FS_I(inode)-&gt;i_sem,</div><div class='ctx'> 						SINGLE_DEPTH_NESTING);</div><div class='del'>-		page = f2fs_init_inode_metadata(inode, dir, fname, ipage);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='add'>+		folio = f2fs_init_inode_metadata(inode, dir, fname, ifolio);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_dentry(ino, mode, &amp;d, &amp;fname-&gt;disk_name, fname-&gt;hash,</div><div class='ctx'> 			   bit_pos);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(ipage);</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	/* we don't need to mark_inode_dirty now */</div><div class='ctx'> 	if (inode) {</div><div class='hunk'>@@ -663,9 +683,9 @@ int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,</div><div class='ctx'> </div><div class='ctx'> 		/* synchronize inode page's data from inode cache */</div><div class='ctx'> 		if (is_inode_flag_set(inode, FI_NEW_INODE))</div><div class='del'>-			f2fs_update_inode(inode, page);</div><div class='add'>+			f2fs_update_inode(inode, folio);</div><div class='ctx'> </div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_parent_metadata(dir, inode, 0);</div><div class='hunk'>@@ -673,12 +693,12 @@ fail:</div><div class='ctx'> 	if (inode)</div><div class='ctx'> 		f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_sem);</div><div class='ctx'> out:</div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='del'>-					struct inode *dir, struct inode *inode)</div><div class='add'>+void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry,</div><div class='add'>+		struct folio *folio, struct inode *dir, struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> 	void *inline_dentry;</div><div class='hunk'>@@ -686,18 +706,18 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='ctx'> 	unsigned int bit_pos;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	f2fs_wait_on_page_writeback(page, NODE, true, true);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, NODE, true, true);</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(dir, page);</div><div class='add'>+	inline_dentry = inline_data_addr(dir, folio);</div><div class='ctx'> 	make_dentry_ptr_inline(dir, &amp;d, inline_dentry);</div><div class='ctx'> </div><div class='ctx'> 	bit_pos = dentry - d.dentry;</div><div class='ctx'> 	for (i = 0; i &lt; slots; i++)</div><div class='ctx'> 		__clear_bit_le(bit_pos + i, d.bitmap);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(dir, false);</div><div class='hunk'>@@ -709,21 +729,21 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,</div><div class='ctx'> bool f2fs_empty_inline_dir(struct inode *dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	unsigned int bit_pos = 2;</div><div class='ctx'> 	void *inline_dentry;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(sbi, dir-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage))</div><div class='add'>+	ifolio = f2fs_get_inode_folio(sbi, dir-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(dir, ipage);</div><div class='add'>+	inline_dentry = inline_data_addr(dir, ifolio);</div><div class='ctx'> 	make_dentry_ptr_inline(dir, &amp;d, inline_dentry);</div><div class='ctx'> </div><div class='ctx'> 	bit_pos = find_next_bit_le(d.bitmap, d.max, bit_pos);</div><div class='ctx'> </div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> </div><div class='ctx'> 	if (bit_pos &lt; d.max)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -735,7 +755,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 				struct fscrypt_str *fstr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct page *ipage = NULL;</div><div class='add'>+	struct folio *ifolio = NULL;</div><div class='ctx'> 	struct f2fs_dentry_ptr d;</div><div class='ctx'> 	void *inline_dentry = NULL;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -745,17 +765,17 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 	if (ctx-&gt;pos == d.max)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage))</div><div class='del'>-		return PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * f2fs_readdir was protected by inode.i_rwsem, it is safe to access</div><div class='ctx'> 	 * ipage without page's lock held.</div><div class='ctx'> 	 */</div><div class='del'>-	unlock_page(ipage);</div><div class='add'>+	folio_unlock(ifolio);</div><div class='ctx'> </div><div class='del'>-	inline_dentry = inline_data_addr(inode, ipage);</div><div class='add'>+	inline_dentry = inline_data_addr(inode, ifolio);</div><div class='ctx'> </div><div class='ctx'> 	make_dentry_ptr_inline(inode, &amp;d, inline_dentry);</div><div class='ctx'> </div><div class='hunk'>@@ -763,7 +783,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		ctx-&gt;pos = d.max;</div><div class='ctx'> </div><div class='del'>-	f2fs_put_page(ipage, 0);</div><div class='add'>+	f2fs_folio_put(ifolio, false);</div><div class='ctx'> 	return err &lt; 0 ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -774,12 +794,12 @@ int f2fs_inline_data_fiemap(struct inode *inode,</div><div class='ctx'> 	__u32 flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED |</div><div class='ctx'> 		FIEMAP_EXTENT_LAST;</div><div class='ctx'> 	struct node_info ni;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage))</div><div class='del'>-		return PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	if ((S_ISREG(inode-&gt;i_mode) || S_ISLNK(inode-&gt;i_mode)) &amp;&amp;</div><div class='ctx'> 				!f2fs_has_inline_data(inode)) {</div><div class='hunk'>@@ -804,11 +824,11 @@ int f2fs_inline_data_fiemap(struct inode *inode,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	byteaddr = (__u64)ni.blk_addr &lt;&lt; inode-&gt;i_sb-&gt;s_blocksize_bits;</div><div class='del'>-	byteaddr += (char *)inline_data_addr(inode, ipage) -</div><div class='del'>-					(char *)F2FS_INODE(ipage);</div><div class='add'>+	byteaddr += (char *)inline_data_addr(inode, ifolio) -</div><div class='add'>+					(char *)F2FS_INODE(ifolio);</div><div class='ctx'> 	err = fiemap_fill_next_extent(fieinfo, start, byteaddr, ilen, flags);</div><div class='ctx'> 	trace_f2fs_fiemap(inode, start, byteaddr, ilen, flags, err);</div><div class='ctx'> out:</div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c<br/>index c26effdce9aa..38b8994bc1b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/inode.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/f2fs_fs.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/lz4.h&gt;</div><div class='hunk'>@@ -29,9 +28,17 @@ void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync)</div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_NEW_INODE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (f2fs_readonly(F2FS_I_SB(inode)-&gt;sb))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (f2fs_inode_dirtied(inode, sync))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* only atomic file w/ FI_ATOMIC_COMMITTED can be set vfs dirty */</div><div class='add'>+	if (f2fs_is_atomic_file(inode) &amp;&amp;</div><div class='add'>+			!is_inode_flag_set(inode, FI_ATOMIC_COMMITTED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mark_inode_dirty_sync(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -61,9 +68,9 @@ void f2fs_set_inode_flags(struct inode *inode)</div><div class='ctx'> 			S_ENCRYPTED|S_VERITY|S_CASEFOLD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __get_inode_rdev(struct inode *inode, struct page *node_page)</div><div class='add'>+static void __get_inode_rdev(struct inode *inode, struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	__le32 *addr = get_dnode_addr(inode, node_page);</div><div class='add'>+	__le32 *addr = get_dnode_addr(inode, node_folio);</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode) ||</div><div class='ctx'> 			S_ISFIFO(inode-&gt;i_mode) || S_ISSOCK(inode-&gt;i_mode)) {</div><div class='hunk'>@@ -74,9 +81,9 @@ static void __get_inode_rdev(struct inode *inode, struct page *node_page)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __set_inode_rdev(struct inode *inode, struct page *node_page)</div><div class='add'>+static void __set_inode_rdev(struct inode *inode, struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	__le32 *addr = get_dnode_addr(inode, node_page);</div><div class='add'>+	__le32 *addr = get_dnode_addr(inode, node_folio);</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode)) {</div><div class='ctx'> 		if (old_valid_dev(inode-&gt;i_rdev)) {</div><div class='hunk'>@@ -90,33 +97,34 @@ static void __set_inode_rdev(struct inode *inode, struct page *node_page)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __recover_inline_status(struct inode *inode, struct page *ipage)</div><div class='add'>+static void __recover_inline_status(struct inode *inode, struct folio *ifolio)</div><div class='ctx'> {</div><div class='del'>-	void *inline_data = inline_data_addr(inode, ipage);</div><div class='add'>+	void *inline_data = inline_data_addr(inode, ifolio);</div><div class='ctx'> 	__le32 *start = inline_data;</div><div class='ctx'> 	__le32 *end = start + MAX_INLINE_DATA(inode) / sizeof(__le32);</div><div class='ctx'> </div><div class='ctx'> 	while (start &lt; end) {</div><div class='ctx'> 		if (*start++) {</div><div class='del'>-			f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+			f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> </div><div class='ctx'> 			set_inode_flag(inode, FI_DATA_EXIST);</div><div class='del'>-			set_raw_inline(inode, F2FS_INODE(ipage));</div><div class='del'>-			set_page_dirty(ipage);</div><div class='add'>+			set_raw_inline(inode, F2FS_INODE(ifolio));</div><div class='add'>+			folio_mark_dirty(ifolio);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool f2fs_enable_inode_chksum(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+static</div><div class='add'>+bool f2fs_enable_inode_chksum(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_inode *ri = &amp;F2FS_NODE(page)-&gt;i;</div><div class='add'>+	struct f2fs_inode *ri = &amp;F2FS_NODE(folio)-&gt;i;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_sb_has_inode_chksum(sbi))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!IS_INODE(page) || !(ri-&gt;i_inline &amp; F2FS_EXTRA_ATTR))</div><div class='add'>+	if (!IS_INODE(folio) || !(ri-&gt;i_inline &amp; F2FS_EXTRA_ATTR))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (!F2FS_FITS_IN_INODE(ri, le16_to_cpu(ri-&gt;i_extra_isize),</div><div class='hunk'>@@ -126,9 +134,9 @@ static bool f2fs_enable_inode_chksum(struct f2fs_sb_info *sbi, struct page *page</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __u32 f2fs_inode_chksum(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+static __u32 f2fs_inode_chksum(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *node = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_node *node = F2FS_NODE(folio);</div><div class='ctx'> 	struct f2fs_inode *ri = &amp;node-&gt;i;</div><div class='ctx'> 	__le32 ino = node-&gt;footer.ino;</div><div class='ctx'> 	__le32 gen = ri-&gt;i_generation;</div><div class='hunk'>@@ -137,19 +145,18 @@ static __u32 f2fs_inode_chksum(struct f2fs_sb_info *sbi, struct page *page)</div><div class='ctx'> 	unsigned int offset = offsetof(struct f2fs_inode, i_inode_checksum);</div><div class='ctx'> 	unsigned int cs_size = sizeof(dummy_cs);</div><div class='ctx'> </div><div class='del'>-	chksum = f2fs_chksum(sbi, sbi-&gt;s_chksum_seed, (__u8 *)&amp;ino,</div><div class='del'>-							sizeof(ino));</div><div class='del'>-	chksum_seed = f2fs_chksum(sbi, chksum, (__u8 *)&amp;gen, sizeof(gen));</div><div class='add'>+	chksum = f2fs_chksum(sbi-&gt;s_chksum_seed, (__u8 *)&amp;ino, sizeof(ino));</div><div class='add'>+	chksum_seed = f2fs_chksum(chksum, (__u8 *)&amp;gen, sizeof(gen));</div><div class='ctx'> </div><div class='del'>-	chksum = f2fs_chksum(sbi, chksum_seed, (__u8 *)ri, offset);</div><div class='del'>-	chksum = f2fs_chksum(sbi, chksum, (__u8 *)&amp;dummy_cs, cs_size);</div><div class='add'>+	chksum = f2fs_chksum(chksum_seed, (__u8 *)ri, offset);</div><div class='add'>+	chksum = f2fs_chksum(chksum, (__u8 *)&amp;dummy_cs, cs_size);</div><div class='ctx'> 	offset += cs_size;</div><div class='del'>-	chksum = f2fs_chksum(sbi, chksum, (__u8 *)ri + offset,</div><div class='del'>-						F2FS_BLKSIZE - offset);</div><div class='add'>+	chksum = f2fs_chksum(chksum, (__u8 *)ri + offset,</div><div class='add'>+			     F2FS_BLKSIZE - offset);</div><div class='ctx'> 	return chksum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_inode *ri;</div><div class='ctx'> 	__u32 provided, calculated;</div><div class='hunk'>@@ -158,32 +165,34 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-	if (!f2fs_enable_inode_chksum(sbi, page))</div><div class='add'>+	if (!f2fs_enable_inode_chksum(sbi, folio))</div><div class='ctx'> #else</div><div class='del'>-	if (!f2fs_enable_inode_chksum(sbi, page) ||</div><div class='del'>-			PageDirty(page) || PageWriteback(page))</div><div class='add'>+	if (!f2fs_enable_inode_chksum(sbi, folio) ||</div><div class='add'>+			folio_test_dirty(folio) ||</div><div class='add'>+			folio_test_writeback(folio))</div><div class='ctx'> #endif</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	ri = &amp;F2FS_NODE(page)-&gt;i;</div><div class='add'>+	ri = &amp;F2FS_NODE(folio)-&gt;i;</div><div class='ctx'> 	provided = le32_to_cpu(ri-&gt;i_inode_checksum);</div><div class='del'>-	calculated = f2fs_inode_chksum(sbi, page);</div><div class='add'>+	calculated = f2fs_inode_chksum(sbi, folio);</div><div class='ctx'> </div><div class='ctx'> 	if (provided != calculated)</div><div class='ctx'> 		f2fs_warn(sbi, "checksum invalid, nid = %lu, ino_of_node = %x, %x vs. %x",</div><div class='del'>-			  page-&gt;index, ino_of_node(page), provided, calculated);</div><div class='add'>+			  folio-&gt;index, ino_of_node(folio),</div><div class='add'>+			  provided, calculated);</div><div class='ctx'> </div><div class='ctx'> 	return provided == calculated;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_inode *ri = &amp;F2FS_NODE(page)-&gt;i;</div><div class='add'>+	struct f2fs_inode *ri = &amp;F2FS_NODE(folio)-&gt;i;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_enable_inode_chksum(sbi, page))</div><div class='add'>+	if (!f2fs_enable_inode_chksum(sbi, folio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ri-&gt;i_inode_checksum = cpu_to_le32(f2fs_inode_chksum(sbi, page));</div><div class='add'>+	ri-&gt;i_inode_checksum = cpu_to_le32(f2fs_inode_chksum(sbi, folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool sanity_check_compress_inode(struct inode *inode,</div><div class='hunk'>@@ -258,24 +267,36 @@ err_level:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool sanity_check_inode(struct inode *inode, struct page *node_page)</div><div class='add'>+static bool sanity_check_inode(struct inode *inode, struct folio *node_folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='del'>-	struct f2fs_inode *ri = F2FS_INODE(node_page);</div><div class='add'>+	struct f2fs_inode *ri = F2FS_INODE(node_folio);</div><div class='ctx'> 	unsigned long long iblocks;</div><div class='ctx'> </div><div class='del'>-	iblocks = le64_to_cpu(F2FS_INODE(node_page)-&gt;i_blocks);</div><div class='add'>+	iblocks = le64_to_cpu(F2FS_INODE(node_folio)-&gt;i_blocks);</div><div class='ctx'> 	if (!iblocks) {</div><div class='ctx'> 		f2fs_warn(sbi, "%s: corrupted inode i_blocks i_ino=%lx iblocks=%llu, run fsck to fix.",</div><div class='ctx'> 			  __func__, inode-&gt;i_ino, iblocks);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ino_of_node(node_page) != nid_of_node(node_page)) {</div><div class='add'>+	if (ino_of_node(node_folio) != nid_of_node(node_folio)) {</div><div class='ctx'> 		f2fs_warn(sbi, "%s: corrupted inode footer i_ino=%lx, ino,nid: [%u, %u] run fsck to fix.",</div><div class='ctx'> 			  __func__, inode-&gt;i_ino,</div><div class='del'>-			  ino_of_node(node_page), nid_of_node(node_page));</div><div class='add'>+			  ino_of_node(node_folio), nid_of_node(node_folio));</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ino_of_node(node_folio) == fi-&gt;i_xattr_nid) {</div><div class='add'>+		f2fs_warn(sbi, "%s: corrupted inode i_ino=%lx, xnid=%x, run fsck to fix.",</div><div class='add'>+			  __func__, inode-&gt;i_ino, fi-&gt;i_xattr_nid);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (S_ISDIR(inode-&gt;i_mode) &amp;&amp; unlikely(inode-&gt;i_nlink == 1)) {</div><div class='add'>+		f2fs_warn(sbi, "%s: directory inode (ino=%lx) has a single i_nlink",</div><div class='add'>+			  __func__, inode-&gt;i_ino);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -293,15 +314,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)</div><div class='ctx'> 				  F2FS_TOTAL_EXTRA_ATTR_SIZE);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='del'>-		if (f2fs_sb_has_flexible_inline_xattr(sbi) &amp;&amp;</div><div class='del'>-			f2fs_has_inline_xattr(inode) &amp;&amp;</div><div class='del'>-			(!fi-&gt;i_inline_xattr_size ||</div><div class='del'>-			fi-&gt;i_inline_xattr_size &gt; MAX_INLINE_XATTR_SIZE)) {</div><div class='del'>-			f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %lu",</div><div class='del'>-				  __func__, inode-&gt;i_ino, fi-&gt;i_inline_xattr_size,</div><div class='del'>-				  MAX_INLINE_XATTR_SIZE);</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='ctx'> 		if (f2fs_sb_has_compression(sbi) &amp;&amp;</div><div class='ctx'> 			fi-&gt;i_flags &amp; F2FS_COMPR_FL &amp;&amp;</div><div class='ctx'> 			F2FS_FITS_IN_INODE(ri, fi-&gt;i_extra_isize,</div><div class='hunk'>@@ -309,9 +321,15 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)</div><div class='ctx'> 			if (!sanity_check_compress_inode(inode, ri))</div><div class='ctx'> 				return false;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (f2fs_sb_has_flexible_inline_xattr(sbi)) {</div><div class='del'>-		f2fs_warn(sbi, "%s: corrupted inode ino=%lx, run fsck to fix.",</div><div class='del'>-			  __func__, inode-&gt;i_ino);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (f2fs_sb_has_flexible_inline_xattr(sbi) &amp;&amp;</div><div class='add'>+		f2fs_has_inline_xattr(inode) &amp;&amp;</div><div class='add'>+		(fi-&gt;i_inline_xattr_size &lt; MIN_INLINE_XATTR_SIZE ||</div><div class='add'>+		fi-&gt;i_inline_xattr_size &gt; MAX_INLINE_XATTR_SIZE)) {</div><div class='add'>+		f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, min: %zu, max: %lu",</div><div class='add'>+			  __func__, inode-&gt;i_ino, fi-&gt;i_inline_xattr_size,</div><div class='add'>+			  MIN_INLINE_XATTR_SIZE, MAX_INLINE_XATTR_SIZE);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -343,7 +361,7 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f2fs_sanity_check_inline_data(inode)) {</div><div class='add'>+	if (f2fs_sanity_check_inline_data(inode, node_folio)) {</div><div class='ctx'> 		f2fs_warn(sbi, "%s: inode (ino=%lx, mode=%u) should not have inline_data, run fsck to fix",</div><div class='ctx'> 			  __func__, inode-&gt;i_ino, inode-&gt;i_mode);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -361,6 +379,25 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (fi-&gt;i_xattr_nid &amp;&amp; f2fs_check_nid_range(sbi, fi-&gt;i_xattr_nid)) {</div><div class='add'>+		f2fs_warn(sbi, "%s: inode (ino=%lx) has corrupted i_xattr_nid: %u, run fsck to fix.",</div><div class='add'>+			  __func__, inode-&gt;i_ino, fi-&gt;i_xattr_nid);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_DEVICE_ALIASING(inode)) {</div><div class='add'>+		if (!f2fs_sb_has_device_alias(sbi)) {</div><div class='add'>+			f2fs_warn(sbi, "%s: inode (ino=%lx) has device alias flag, but the feature is off",</div><div class='add'>+				  __func__, inode-&gt;i_ino);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (!f2fs_is_pinned_file(inode)) {</div><div class='add'>+			f2fs_warn(sbi, "%s: inode (ino=%lx) has device alias flag, but is not pinned",</div><div class='add'>+				  __func__, inode-&gt;i_ino);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -377,7 +414,7 @@ static int do_read_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='del'>-	struct page *node_page;</div><div class='add'>+	struct folio *node_folio;</div><div class='ctx'> 	struct f2fs_inode *ri;</div><div class='ctx'> 	projid_t i_projid;</div><div class='ctx'> </div><div class='hunk'>@@ -385,11 +422,11 @@ static int do_read_inode(struct inode *inode)</div><div class='ctx'> 	if (f2fs_check_nid_range(sbi, inode-&gt;i_ino))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	node_page = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(node_page))</div><div class='del'>-		return PTR_ERR(node_page);</div><div class='add'>+	node_folio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(node_folio))</div><div class='add'>+		return PTR_ERR(node_folio);</div><div class='ctx'> </div><div class='del'>-	ri = F2FS_INODE(node_page);</div><div class='add'>+	ri = F2FS_INODE(node_folio);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = le16_to_cpu(ri-&gt;i_mode);</div><div class='ctx'> 	i_uid_write(inode, le32_to_cpu(ri-&gt;i_uid));</div><div class='hunk'>@@ -408,8 +445,7 @@ static int do_read_inode(struct inode *inode)</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		fi-&gt;i_current_depth = le32_to_cpu(ri-&gt;i_current_depth);</div><div class='ctx'> 	else if (S_ISREG(inode-&gt;i_mode))</div><div class='del'>-		fi-&gt;i_gc_failures[GC_FAILURE_PIN] =</div><div class='del'>-					le16_to_cpu(ri-&gt;i_gc_failures);</div><div class='add'>+		fi-&gt;i_gc_failures = le16_to_cpu(ri-&gt;i_gc_failures);</div><div class='ctx'> 	fi-&gt;i_xattr_nid = le32_to_cpu(ri-&gt;i_xattr_nid);</div><div class='ctx'> 	fi-&gt;i_flags = le32_to_cpu(ri-&gt;i_flags);</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode))</div><div class='hunk'>@@ -440,8 +476,8 @@ static int do_read_inode(struct inode *inode)</div><div class='ctx'> 		fi-&gt;i_inline_xattr_size = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!sanity_check_inode(inode, node_page)) {</div><div class='del'>-		f2fs_put_page(node_page, 1);</div><div class='add'>+	if (!sanity_check_inode(inode, node_folio)) {</div><div class='add'>+		f2fs_folio_put(node_folio, true);</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 		f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE);</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='hunk'>@@ -449,17 +485,17 @@ static int do_read_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	/* check data exist */</div><div class='ctx'> 	if (f2fs_has_inline_data(inode) &amp;&amp; !f2fs_exist_data(inode))</div><div class='del'>-		__recover_inline_status(inode, node_page);</div><div class='add'>+		__recover_inline_status(inode, node_folio);</div><div class='ctx'> </div><div class='ctx'> 	/* try to recover cold bit for non-dir inode */</div><div class='del'>-	if (!S_ISDIR(inode-&gt;i_mode) &amp;&amp; !is_cold_node(node_page)) {</div><div class='del'>-		f2fs_wait_on_page_writeback(node_page, NODE, true, true);</div><div class='del'>-		set_cold_node(node_page, false);</div><div class='del'>-		set_page_dirty(node_page);</div><div class='add'>+	if (!S_ISDIR(inode-&gt;i_mode) &amp;&amp; !is_cold_node(node_folio)) {</div><div class='add'>+		f2fs_folio_wait_writeback(node_folio, NODE, true, true);</div><div class='add'>+		set_cold_node(node_folio, false);</div><div class='add'>+		folio_mark_dirty(node_folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get rdev by using inline_info */</div><div class='del'>-	__get_inode_rdev(inode, node_page);</div><div class='add'>+	__get_inode_rdev(inode, node_folio);</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_need_inode_block_update(sbi, inode-&gt;i_ino))</div><div class='ctx'> 		fi-&gt;last_disk_size = inode-&gt;i_size;</div><div class='hunk'>@@ -502,17 +538,17 @@ static int do_read_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	init_idisk_time(inode);</div><div class='ctx'> </div><div class='del'>-	/* Need all the flag bits */</div><div class='del'>-	f2fs_init_read_extent_tree(inode, node_page);</div><div class='del'>-	f2fs_init_age_extent_tree(inode);</div><div class='del'>-</div><div class='del'>-	if (!sanity_check_extent_cache(inode)) {</div><div class='del'>-		f2fs_put_page(node_page, 1);</div><div class='add'>+	if (!sanity_check_extent_cache(inode, node_folio)) {</div><div class='add'>+		f2fs_folio_put(node_folio, true);</div><div class='ctx'> 		f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE);</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_put_page(node_page, 1);</div><div class='add'>+	/* Need all the flag bits */</div><div class='add'>+	f2fs_init_read_extent_tree(inode, node_folio);</div><div class='add'>+	f2fs_init_age_extent_tree(inode);</div><div class='add'>+</div><div class='add'>+	f2fs_folio_put(node_folio, true);</div><div class='ctx'> </div><div class='ctx'> 	stat_inc_inline_xattr(inode);</div><div class='ctx'> 	stat_inc_inline_inode(inode);</div><div class='hunk'>@@ -539,7 +575,7 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW)) {</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW)) {</div><div class='ctx'> 		if (is_meta_ino(sbi, ino)) {</div><div class='ctx'> 			f2fs_err(sbi, "inaccessible inode: %lu, run fsck to repair", ino);</div><div class='ctx'> 			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='hunk'>@@ -604,14 +640,6 @@ make_now:</div><div class='ctx'> 	}</div><div class='ctx'> 	f2fs_set_inode_flags(inode);</div><div class='ctx'> </div><div class='del'>-	if (file_should_truncate(inode) &amp;&amp;</div><div class='del'>-			!is_sbi_flag_set(sbi, SBI_POR_DOING)) {</div><div class='del'>-		ret = f2fs_truncate(inode);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto bad_inode;</div><div class='del'>-		file_dont_truncate(inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	unlock_new_inode(inode);</div><div class='ctx'> 	trace_f2fs_iget(inode);</div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -637,20 +665,21 @@ retry:</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_update_inode(struct inode *inode, struct page *node_page)</div><div class='add'>+void f2fs_update_inode(struct inode *inode, struct folio *node_folio)</div><div class='ctx'> {</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	struct f2fs_inode *ri;</div><div class='del'>-	struct extent_tree *et = F2FS_I(inode)-&gt;extent_tree[EX_READ];</div><div class='add'>+	struct extent_tree *et = fi-&gt;extent_tree[EX_READ];</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(node_page, NODE, true, true);</div><div class='del'>-	set_page_dirty(node_page);</div><div class='add'>+	f2fs_folio_wait_writeback(node_folio, NODE, true, true);</div><div class='add'>+	folio_mark_dirty(node_folio);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_inode_synced(inode);</div><div class='ctx'> </div><div class='del'>-	ri = F2FS_INODE(node_page);</div><div class='add'>+	ri = F2FS_INODE(node_folio);</div><div class='ctx'> </div><div class='ctx'> 	ri-&gt;i_mode = cpu_to_le16(inode-&gt;i_mode);</div><div class='del'>-	ri-&gt;i_advise = F2FS_I(inode)-&gt;i_advise;</div><div class='add'>+	ri-&gt;i_advise = fi-&gt;i_advise;</div><div class='ctx'> 	ri-&gt;i_uid = cpu_to_le32(i_uid_read(inode));</div><div class='ctx'> 	ri-&gt;i_gid = cpu_to_le32(i_gid_read(inode));</div><div class='ctx'> 	ri-&gt;i_links = cpu_to_le32(inode-&gt;i_nlink);</div><div class='hunk'>@@ -676,95 +705,89 @@ void f2fs_update_inode(struct inode *inode, struct page *node_page)</div><div class='ctx'> 	ri-&gt;i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));</div><div class='ctx'> 	ri-&gt;i_mtime_nsec = cpu_to_le32(inode_get_mtime_nsec(inode));</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		ri-&gt;i_current_depth =</div><div class='del'>-			cpu_to_le32(F2FS_I(inode)-&gt;i_current_depth);</div><div class='add'>+		ri-&gt;i_current_depth = cpu_to_le32(fi-&gt;i_current_depth);</div><div class='ctx'> 	else if (S_ISREG(inode-&gt;i_mode))</div><div class='del'>-		ri-&gt;i_gc_failures =</div><div class='del'>-			cpu_to_le16(F2FS_I(inode)-&gt;i_gc_failures[GC_FAILURE_PIN]);</div><div class='del'>-	ri-&gt;i_xattr_nid = cpu_to_le32(F2FS_I(inode)-&gt;i_xattr_nid);</div><div class='del'>-	ri-&gt;i_flags = cpu_to_le32(F2FS_I(inode)-&gt;i_flags);</div><div class='del'>-	ri-&gt;i_pino = cpu_to_le32(F2FS_I(inode)-&gt;i_pino);</div><div class='add'>+		ri-&gt;i_gc_failures = cpu_to_le16(fi-&gt;i_gc_failures);</div><div class='add'>+	ri-&gt;i_xattr_nid = cpu_to_le32(fi-&gt;i_xattr_nid);</div><div class='add'>+	ri-&gt;i_flags = cpu_to_le32(fi-&gt;i_flags);</div><div class='add'>+	ri-&gt;i_pino = cpu_to_le32(fi-&gt;i_pino);</div><div class='ctx'> 	ri-&gt;i_generation = cpu_to_le32(inode-&gt;i_generation);</div><div class='del'>-	ri-&gt;i_dir_level = F2FS_I(inode)-&gt;i_dir_level;</div><div class='add'>+	ri-&gt;i_dir_level = fi-&gt;i_dir_level;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_extra_attr(inode)) {</div><div class='del'>-		ri-&gt;i_extra_isize = cpu_to_le16(F2FS_I(inode)-&gt;i_extra_isize);</div><div class='add'>+		ri-&gt;i_extra_isize = cpu_to_le16(fi-&gt;i_extra_isize);</div><div class='ctx'> </div><div class='ctx'> 		if (f2fs_sb_has_flexible_inline_xattr(F2FS_I_SB(inode)))</div><div class='ctx'> 			ri-&gt;i_inline_xattr_size =</div><div class='del'>-				cpu_to_le16(F2FS_I(inode)-&gt;i_inline_xattr_size);</div><div class='add'>+				cpu_to_le16(fi-&gt;i_inline_xattr_size);</div><div class='ctx'> </div><div class='ctx'> 		if (f2fs_sb_has_project_quota(F2FS_I_SB(inode)) &amp;&amp;</div><div class='del'>-			F2FS_FITS_IN_INODE(ri, F2FS_I(inode)-&gt;i_extra_isize,</div><div class='del'>-								i_projid)) {</div><div class='add'>+			F2FS_FITS_IN_INODE(ri, fi-&gt;i_extra_isize, i_projid)) {</div><div class='ctx'> 			projid_t i_projid;</div><div class='ctx'> </div><div class='del'>-			i_projid = from_kprojid(&amp;init_user_ns,</div><div class='del'>-						F2FS_I(inode)-&gt;i_projid);</div><div class='add'>+			i_projid = from_kprojid(&amp;init_user_ns, fi-&gt;i_projid);</div><div class='ctx'> 			ri-&gt;i_projid = cpu_to_le32(i_projid);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (f2fs_sb_has_inode_crtime(F2FS_I_SB(inode)) &amp;&amp;</div><div class='del'>-			F2FS_FITS_IN_INODE(ri, F2FS_I(inode)-&gt;i_extra_isize,</div><div class='del'>-								i_crtime)) {</div><div class='del'>-			ri-&gt;i_crtime =</div><div class='del'>-				cpu_to_le64(F2FS_I(inode)-&gt;i_crtime.tv_sec);</div><div class='del'>-			ri-&gt;i_crtime_nsec =</div><div class='del'>-				cpu_to_le32(F2FS_I(inode)-&gt;i_crtime.tv_nsec);</div><div class='add'>+			F2FS_FITS_IN_INODE(ri, fi-&gt;i_extra_isize, i_crtime)) {</div><div class='add'>+			ri-&gt;i_crtime = cpu_to_le64(fi-&gt;i_crtime.tv_sec);</div><div class='add'>+			ri-&gt;i_crtime_nsec = cpu_to_le32(fi-&gt;i_crtime.tv_nsec);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (f2fs_sb_has_compression(F2FS_I_SB(inode)) &amp;&amp;</div><div class='del'>-			F2FS_FITS_IN_INODE(ri, F2FS_I(inode)-&gt;i_extra_isize,</div><div class='add'>+			F2FS_FITS_IN_INODE(ri, fi-&gt;i_extra_isize,</div><div class='ctx'> 							i_compress_flag)) {</div><div class='ctx'> 			unsigned short compress_flag;</div><div class='ctx'> </div><div class='del'>-			ri-&gt;i_compr_blocks =</div><div class='del'>-				cpu_to_le64(atomic_read(</div><div class='del'>-					&amp;F2FS_I(inode)-&gt;i_compr_blocks));</div><div class='del'>-			ri-&gt;i_compress_algorithm =</div><div class='del'>-				F2FS_I(inode)-&gt;i_compress_algorithm;</div><div class='del'>-			compress_flag = F2FS_I(inode)-&gt;i_compress_flag |</div><div class='del'>-				F2FS_I(inode)-&gt;i_compress_level &lt;&lt;</div><div class='add'>+			ri-&gt;i_compr_blocks = cpu_to_le64(</div><div class='add'>+					atomic_read(&amp;fi-&gt;i_compr_blocks));</div><div class='add'>+			ri-&gt;i_compress_algorithm = fi-&gt;i_compress_algorithm;</div><div class='add'>+			compress_flag = fi-&gt;i_compress_flag |</div><div class='add'>+						fi-&gt;i_compress_level &lt;&lt;</div><div class='ctx'> 						COMPRESS_LEVEL_OFFSET;</div><div class='ctx'> 			ri-&gt;i_compress_flag = cpu_to_le16(compress_flag);</div><div class='del'>-			ri-&gt;i_log_cluster_size =</div><div class='del'>-				F2FS_I(inode)-&gt;i_log_cluster_size;</div><div class='add'>+			ri-&gt;i_log_cluster_size = fi-&gt;i_log_cluster_size;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__set_inode_rdev(inode, node_page);</div><div class='add'>+	__set_inode_rdev(inode, node_folio);</div><div class='ctx'> </div><div class='ctx'> 	/* deleted inode */</div><div class='ctx'> 	if (inode-&gt;i_nlink == 0)</div><div class='del'>-		clear_page_private_inline(node_page);</div><div class='add'>+		folio_clear_f2fs_inline(node_folio);</div><div class='ctx'> </div><div class='ctx'> 	init_idisk_time(inode);</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-	f2fs_inode_chksum_set(F2FS_I_SB(inode), node_page);</div><div class='add'>+	f2fs_inode_chksum_set(F2FS_I_SB(inode), node_folio);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_update_inode_page(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct page *node_page;</div><div class='add'>+	struct folio *node_folio;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> retry:</div><div class='del'>-	node_page = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(node_page)) {</div><div class='del'>-		int err = PTR_ERR(node_page);</div><div class='add'>+	node_folio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(node_folio)) {</div><div class='add'>+		int err = PTR_ERR(node_folio);</div><div class='ctx'> </div><div class='ctx'> 		/* The node block was truncated. */</div><div class='ctx'> 		if (err == -ENOENT)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='add'>+		if (err == -EFSCORRUPTED)</div><div class='add'>+			goto stop_checkpoint;</div><div class='add'>+</div><div class='ctx'> 		if (err == -ENOMEM || ++count &lt;= DEFAULT_RETRY_IO_COUNT)</div><div class='ctx'> 			goto retry;</div><div class='add'>+stop_checkpoint:</div><div class='ctx'> 		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_UPDATE_INODE);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_update_inode(inode, node_page);</div><div class='del'>-	f2fs_put_page(node_page, 1);</div><div class='add'>+	f2fs_update_inode(inode, node_folio);</div><div class='add'>+	f2fs_folio_put(node_folio, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='hunk'>@@ -782,8 +805,17 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 		!is_inode_flag_set(inode, FI_DIRTY_INODE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_is_checkpoint_ready(sbi))</div><div class='add'>+	/*</div><div class='add'>+	 * no need to update inode page, ultimately f2fs_evict_inode() will</div><div class='add'>+	 * clear dirty status of inode.</div><div class='add'>+	 */</div><div class='add'>+	if (f2fs_cp_error(sbi))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_is_checkpoint_ready(sbi)) {</div><div class='add'>+		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='ctx'> 		return -ENOSPC;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to balance fs here to prevent from producing dirty node pages</div><div class='hunk'>@@ -795,6 +827,19 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void f2fs_remove_donate_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;F2FS_I(inode)-&gt;gdonate_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+	list_del_init(&amp;F2FS_I(inode)-&gt;gdonate_list);</div><div class='add'>+	sbi-&gt;donate_files--;</div><div class='add'>+	spin_unlock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Called at the last iput() if i_nlink is zero</div><div class='ctx'>  */</div><div class='hunk'>@@ -804,11 +849,13 @@ void f2fs_evict_inode(struct inode *inode)</div><div class='ctx'> 	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	nid_t xnid = fi-&gt;i_xattr_nid;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	bool freeze_protected = false;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_abort_atomic_write(inode, true);</div><div class='ctx'> </div><div class='del'>-	if (fi-&gt;cow_inode) {</div><div class='add'>+	if (fi-&gt;cow_inode &amp;&amp; f2fs_is_cow_file(fi-&gt;cow_inode)) {</div><div class='ctx'> 		clear_inode_flag(fi-&gt;cow_inode, FI_COW_FILE);</div><div class='add'>+		F2FS_I(fi-&gt;cow_inode)-&gt;atomic_inode = NULL;</div><div class='ctx'> 		iput(fi-&gt;cow_inode);</div><div class='ctx'> 		fi-&gt;cow_inode = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -827,8 +874,10 @@ void f2fs_evict_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	f2fs_bug_on(sbi, get_dirty_pages(inode));</div><div class='ctx'> 	f2fs_remove_dirty_inode(inode);</div><div class='add'>+	f2fs_remove_donate_inode(inode);</div><div class='ctx'> </div><div class='del'>-	f2fs_destroy_extent_tree(inode);</div><div class='add'>+	if (!IS_DEVICE_ALIASING(inode))</div><div class='add'>+		f2fs_destroy_extent_tree(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_nlink || is_bad_inode(inode))</div><div class='ctx'> 		goto no_delete;</div><div class='hunk'>@@ -843,8 +892,10 @@ void f2fs_evict_inode(struct inode *inode)</div><div class='ctx'> 	f2fs_remove_ino_entry(sbi, inode-&gt;i_ino, UPDATE_INO);</div><div class='ctx'> 	f2fs_remove_ino_entry(sbi, inode-&gt;i_ino, FLUSH_INO);</div><div class='ctx'> </div><div class='del'>-	if (!is_sbi_flag_set(sbi, SBI_IS_FREEZING))</div><div class='add'>+	if (!is_sbi_flag_set(sbi, SBI_IS_FREEZING)) {</div><div class='ctx'> 		sb_start_intwrite(inode-&gt;i_sb);</div><div class='add'>+		freeze_protected = true;</div><div class='add'>+	}</div><div class='ctx'> 	set_inode_flag(inode, FI_NO_ALLOC);</div><div class='ctx'> 	i_size_write(inode, 0);</div><div class='ctx'> retry:</div><div class='hunk'>@@ -882,12 +933,28 @@ retry:</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (IS_DEVICE_ALIASING(inode))</div><div class='add'>+		f2fs_destroy_extent_tree(inode);</div><div class='add'>+</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		f2fs_update_inode_page(inode);</div><div class='ctx'> 		if (dquot_initialize_needed(inode))</div><div class='ctx'> 			set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If both f2fs_truncate() and f2fs_update_inode_page() failed</div><div class='add'>+		 * due to fuzzed corrupted inode, call f2fs_inode_synced() to</div><div class='add'>+		 * avoid triggering later f2fs_bug_on().</div><div class='add'>+		 */</div><div class='add'>+		if (is_inode_flag_set(inode, FI_DIRTY_INODE)) {</div><div class='add'>+			f2fs_warn(sbi,</div><div class='add'>+				"f2fs_evict_inode: inode is dirty, ino:%lu",</div><div class='add'>+				inode-&gt;i_ino);</div><div class='add'>+			f2fs_inode_synced(inode);</div><div class='add'>+			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!is_sbi_flag_set(sbi, SBI_IS_FREEZING))</div><div class='add'>+	if (freeze_protected)</div><div class='ctx'> 		sb_end_intwrite(inode-&gt;i_sb);</div><div class='ctx'> no_delete:</div><div class='ctx'> 	dquot_drop(inode);</div><div class='hunk'>@@ -902,8 +969,12 @@ no_delete:</div><div class='ctx'> 	if (likely(!f2fs_cp_error(sbi) &amp;&amp;</div><div class='ctx'> 				!is_sbi_flag_set(sbi, SBI_CP_DISABLED)))</div><div class='ctx'> 		f2fs_bug_on(sbi, is_inode_flag_set(inode, FI_DIRTY_INODE));</div><div class='del'>-	else</div><div class='del'>-		f2fs_inode_synced(inode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * anyway, it needs to remove the inode from sbi-&gt;inode_list[DIRTY_META]</div><div class='add'>+	 * list to avoid UAF in f2fs_sync_inode_meta() during checkpoint.</div><div class='add'>+	 */</div><div class='add'>+	f2fs_inode_synced(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* for the case f2fs_new_inode() was failed, .i_ino is zero, skip it */</div><div class='ctx'> 	if (inode-&gt;i_ino)</div><div class='head'>diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c<br/>index b3bb815fc6aa..043d20516a21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/namei.c</a></div><div class='hunk'>@@ -221,6 +221,7 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,</div><div class='ctx'> 						const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='add'>+	struct f2fs_inode_info *fi;</div><div class='ctx'> 	nid_t ino;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	bool nid_free = false;</div><div class='hunk'>@@ -241,14 +242,15 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	inode_init_owner(idmap, inode, dir, mode);</div><div class='ctx'> </div><div class='add'>+	fi = F2FS_I(inode);</div><div class='ctx'> 	inode-&gt;i_ino = ino;</div><div class='ctx'> 	inode-&gt;i_blocks = 0;</div><div class='ctx'> 	simple_inode_init_ts(inode);</div><div class='del'>-	F2FS_I(inode)-&gt;i_crtime = inode_get_mtime(inode);</div><div class='add'>+	fi-&gt;i_crtime = inode_get_mtime(inode);</div><div class='ctx'> 	inode-&gt;i_generation = get_random_u32();</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		F2FS_I(inode)-&gt;i_current_depth = 1;</div><div class='add'>+		fi-&gt;i_current_depth = 1;</div><div class='ctx'> </div><div class='ctx'> 	err = insert_inode_locked(inode);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -258,9 +260,9 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_sb_has_project_quota(sbi) &amp;&amp;</div><div class='ctx'> 		(F2FS_I(dir)-&gt;i_flags &amp; F2FS_PROJINHERIT_FL))</div><div class='del'>-		F2FS_I(inode)-&gt;i_projid = F2FS_I(dir)-&gt;i_projid;</div><div class='add'>+		fi-&gt;i_projid = F2FS_I(dir)-&gt;i_projid;</div><div class='ctx'> 	else</div><div class='del'>-		F2FS_I(inode)-&gt;i_projid = make_kprojid(&amp;init_user_ns,</div><div class='add'>+		fi-&gt;i_projid = make_kprojid(&amp;init_user_ns,</div><div class='ctx'> 							F2FS_DEF_PROJID);</div><div class='ctx'> </div><div class='ctx'> 	err = fscrypt_prepare_new_inode(dir, inode, &amp;encrypt);</div><div class='hunk'>@@ -278,7 +280,7 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_sb_has_extra_attr(sbi)) {</div><div class='ctx'> 		set_inode_flag(inode, FI_EXTRA_ATTR);</div><div class='del'>-		F2FS_I(inode)-&gt;i_extra_isize = F2FS_TOTAL_EXTRA_ATTR_SIZE;</div><div class='add'>+		fi-&gt;i_extra_isize = F2FS_TOTAL_EXTRA_ATTR_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_opt(sbi, INLINE_XATTR))</div><div class='hunk'>@@ -296,15 +298,15 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,</div><div class='ctx'> 				f2fs_has_inline_dentry(inode)) {</div><div class='ctx'> 		xattr_size = DEFAULT_INLINE_XATTR_ADDRS;</div><div class='ctx'> 	}</div><div class='del'>-	F2FS_I(inode)-&gt;i_inline_xattr_size = xattr_size;</div><div class='add'>+	fi-&gt;i_inline_xattr_size = xattr_size;</div><div class='ctx'> </div><div class='del'>-	F2FS_I(inode)-&gt;i_flags =</div><div class='add'>+	fi-&gt;i_flags =</div><div class='ctx'> 		f2fs_mask_flags(mode, F2FS_I(dir)-&gt;i_flags &amp; F2FS_FL_INHERITED);</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		F2FS_I(inode)-&gt;i_flags |= F2FS_INDEX_FL;</div><div class='add'>+		fi-&gt;i_flags |= F2FS_INDEX_FL;</div><div class='ctx'> </div><div class='del'>-	if (F2FS_I(inode)-&gt;i_flags &amp; F2FS_PROJINHERIT_FL)</div><div class='add'>+	if (fi-&gt;i_flags &amp; F2FS_PROJINHERIT_FL)</div><div class='ctx'> 		set_inode_flag(inode, FI_PROJ_INHERIT);</div><div class='ctx'> </div><div class='ctx'> 	/* Check compression first. */</div><div class='hunk'>@@ -339,6 +341,7 @@ fail_drop:</div><div class='ctx'> 	trace_f2fs_new_inode(inode, err);</div><div class='ctx'> 	dquot_drop(inode);</div><div class='ctx'> 	inode-&gt;i_flags |= S_NOQUOTA;</div><div class='add'>+	make_bad_inode(inode);</div><div class='ctx'> 	if (nid_free)</div><div class='ctx'> 		set_inode_flag(inode, FI_FREE_NID);</div><div class='ctx'> 	clear_nlink(inode);</div><div class='hunk'>@@ -411,7 +414,7 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	if (is_inode_flag_set(dir, FI_PROJ_INHERIT) &amp;&amp;</div><div class='ctx'> 			(!projid_eq(F2FS_I(dir)-&gt;i_projid,</div><div class='del'>-			F2FS_I(old_dentry-&gt;d_inode)-&gt;i_projid)))</div><div class='add'>+			F2FS_I(inode)-&gt;i_projid)))</div><div class='ctx'> 		return -EXDEV;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_dquot_initialize(dir);</div><div class='hunk'>@@ -444,83 +447,26 @@ out:</div><div class='ctx'> </div><div class='ctx'> struct dentry *f2fs_get_parent(struct dentry *child)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long ino = f2fs_inode_by_name(d_inode(child), &amp;dotdot_name, &amp;page);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	unsigned long ino = f2fs_inode_by_name(d_inode(child), &amp;dotdot_name, &amp;folio);</div><div class='ctx'> </div><div class='ctx'> 	if (!ino) {</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return ERR_CAST(page);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return ERR_CAST(folio);</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> 	return d_obtain_alias(f2fs_iget(child-&gt;d_sb, ino));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __recover_dot_dentries(struct inode *dir, nid_t pino)</div><div class='del'>-{</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='del'>-	struct qstr dot = QSTR_INIT(".", 1);</div><div class='del'>-	struct f2fs_dir_entry *de;</div><div class='del'>-	struct page *page;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (f2fs_readonly(sbi-&gt;sb)) {</div><div class='del'>-		f2fs_info(sbi, "skip recovering inline_dots inode (ino:%lu, pino:%u) in readonly mountpoint",</div><div class='del'>-			  dir-&gt;i_ino, pino);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!S_ISDIR(dir-&gt;i_mode)) {</div><div class='del'>-		f2fs_err(sbi, "inconsistent inode status, skip recovering inline_dots inode (ino:%lu, i_mode:%u, pino:%u)",</div><div class='del'>-			  dir-&gt;i_ino, dir-&gt;i_mode, pino);</div><div class='del'>-		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-		return -ENOTDIR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = f2fs_dquot_initialize(dir);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	f2fs_balance_fs(sbi, true);</div><div class='del'>-</div><div class='del'>-	f2fs_lock_op(sbi);</div><div class='del'>-</div><div class='del'>-	de = f2fs_find_entry(dir, &amp;dot, &amp;page);</div><div class='del'>-	if (de) {</div><div class='del'>-		f2fs_put_page(page, 0);</div><div class='del'>-	} else if (IS_ERR(page)) {</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-		goto out;</div><div class='del'>-	} else {</div><div class='del'>-		err = f2fs_do_add_link(dir, &amp;dot, NULL, dir-&gt;i_ino, S_IFDIR);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	de = f2fs_find_entry(dir, &amp;dotdot_name, &amp;page);</div><div class='del'>-	if (de)</div><div class='del'>-		f2fs_put_page(page, 0);</div><div class='del'>-	else if (IS_ERR(page))</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-	else</div><div class='del'>-		err = f2fs_do_add_link(dir, &amp;dotdot_name, NULL, pino, S_IFDIR);</div><div class='del'>-out:</div><div class='del'>-	if (!err)</div><div class='del'>-		clear_inode_flag(dir, FI_INLINE_DOTS);</div><div class='del'>-</div><div class='del'>-	f2fs_unlock_op(sbi);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> 	struct f2fs_dir_entry *de;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct dentry *new;</div><div class='ctx'> 	nid_t ino = -1;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	unsigned int root_ino = F2FS_ROOT_INO(F2FS_I_SB(dir));</div><div class='ctx'> 	struct f2fs_filename fname;</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_lookup_start(dir, dentry, flags);</div><div class='hunk'>@@ -531,17 +477,16 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_prepare_lookup(dir, dentry, &amp;fname);</div><div class='del'>-	generic_set_encrypted_ci_d_ops(dentry);</div><div class='ctx'> 	if (err == -ENOENT)</div><div class='ctx'> 		goto out_splice;</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='del'>-	de = __f2fs_find_entry(dir, &amp;fname, &amp;page);</div><div class='add'>+	de = __f2fs_find_entry(dir, &amp;fname, &amp;folio);</div><div class='ctx'> 	f2fs_free_filename(&amp;fname);</div><div class='ctx'> </div><div class='ctx'> 	if (!de) {</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = -ENOENT;</div><div class='hunk'>@@ -549,7 +494,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ino = le32_to_cpu(de-&gt;ino);</div><div class='del'>-	f2fs_put_page(page, 0);</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='ctx'> </div><div class='ctx'> 	inode = f2fs_iget(dir-&gt;i_sb, ino);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='hunk'>@@ -557,17 +502,14 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((dir-&gt;i_ino == root_ino) &amp;&amp; f2fs_has_inline_dots(dir)) {</div><div class='del'>-		err = __recover_dot_dentries(dir, root_ino);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_iput;</div><div class='add'>+	if (inode-&gt;i_nlink == 0) {</div><div class='add'>+		f2fs_warn(F2FS_I_SB(inode), "%s: inode (ino=%lx) has zero i_nlink",</div><div class='add'>+			  __func__, inode-&gt;i_ino);</div><div class='add'>+		err = -EFSCORRUPTED;</div><div class='add'>+		set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK);</div><div class='add'>+		goto out_iput;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f2fs_has_inline_dots(inode)) {</div><div class='del'>-		err = __recover_dot_dentries(inode, dir-&gt;i_ino);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_iput;</div><div class='del'>-	}</div><div class='ctx'> 	if (IS_ENCRYPTED(dir) &amp;&amp;</div><div class='ctx'> 	    (S_ISDIR(inode-&gt;i_mode) || S_ISLNK(inode-&gt;i_mode)) &amp;&amp;</div><div class='ctx'> 	    !fscrypt_has_permitted_context(dir, inode)) {</div><div class='hunk'>@@ -577,8 +519,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		goto out_iput;</div><div class='ctx'> 	}</div><div class='ctx'> out_splice:</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (!inode &amp;&amp; IS_CASEFOLDED(dir)) {</div><div class='add'>+	if (IS_ENABLED(CONFIG_UNICODE) &amp;&amp; !inode &amp;&amp; IS_CASEFOLDED(dir)) {</div><div class='ctx'> 		/* Eventually we want to call d_add_ci(dentry, NULL)</div><div class='ctx'> 		 * for negative dentries in the encoding case as</div><div class='ctx'> 		 * well.  For now, prevent the negative dentry</div><div class='hunk'>@@ -587,7 +528,7 @@ out_splice:</div><div class='ctx'> 		trace_f2fs_lookup_end(dir, dentry, ino, err);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	new = d_splice_alias(inode, dentry);</div><div class='ctx'> 	trace_f2fs_lookup_end(dir, !IS_ERR_OR_NULL(new) ? new : dentry,</div><div class='ctx'> 				ino, IS_ERR(new) ? PTR_ERR(new) : err);</div><div class='hunk'>@@ -604,28 +545,38 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct f2fs_dir_entry *de;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_unlink_enter(dir, dentry);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_dquot_initialize(dir);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out;</div><div class='ctx'> 	err = f2fs_dquot_initialize(inode);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto fail;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	de = f2fs_find_entry(dir, &amp;dentry-&gt;d_name, &amp;page);</div><div class='add'>+	de = f2fs_find_entry(dir, &amp;dentry-&gt;d_name, &amp;folio);</div><div class='ctx'> 	if (!de) {</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-		goto fail;</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(inode-&gt;i_nlink == 0)) {</div><div class='add'>+		f2fs_warn(sbi, "%s: inode (ino=%lx) has zero i_nlink",</div><div class='add'>+			  __func__, inode-&gt;i_ino);</div><div class='add'>+		goto corrupted;</div><div class='add'>+	} else if (S_ISDIR(inode-&gt;i_mode) &amp;&amp; unlikely(inode-&gt;i_nlink == 1)) {</div><div class='add'>+		f2fs_warn(sbi, "%s: directory inode (ino=%lx) has a single i_nlink",</div><div class='add'>+			  __func__, inode-&gt;i_ino);</div><div class='add'>+		goto corrupted;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='hunk'>@@ -634,25 +585,30 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	err = f2fs_acquire_orphan_inode(sbi);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		f2fs_unlock_op(sbi);</div><div class='del'>-		f2fs_put_page(page, 0);</div><div class='del'>-		goto fail;</div><div class='add'>+		f2fs_folio_put(folio, false);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_delete_entry(de, page, dir, inode);</div><div class='add'>+	f2fs_delete_entry(de, folio, dir, inode);</div><div class='ctx'> 	f2fs_unlock_op(sbi);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	/* VFS negative dentries are incompatible with Encoding and</div><div class='ctx'> 	 * Case-insensitiveness. Eventually we'll want avoid</div><div class='ctx'> 	 * invalidating the dentries here, alongside with returning the</div><div class='ctx'> 	 * negative dentries at f2fs_lookup(), when it is better</div><div class='ctx'> 	 * supported by the VFS for the CI case.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_CASEFOLDED(dir))</div><div class='add'>+	if (IS_ENABLED(CONFIG_UNICODE) &amp;&amp; IS_CASEFOLDED(dir))</div><div class='ctx'> 		d_invalidate(dentry);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	if (IS_DIRSYNC(dir))</div><div class='ctx'> 		f2fs_sync_fs(sbi-&gt;sb, 1);</div><div class='del'>-fail:</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+corrupted:</div><div class='add'>+	err = -EFSCORRUPTED;</div><div class='add'>+	set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='add'>+out:</div><div class='ctx'> 	trace_f2fs_unlink_exit(inode, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -752,23 +708,23 @@ out_free_encrypted_link:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *f2fs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi)))</div><div class='del'>-		return -EIO;</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_dquot_initialize(dir);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 	inode = f2fs_new_inode(idmap, dir, S_IFDIR | mode, NULL);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='del'>-		return PTR_ERR(inode);</div><div class='add'>+		return ERR_CAST(inode);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_op = &amp;f2fs_dir_inode_operations;</div><div class='ctx'> 	inode-&gt;i_fop = &amp;f2fs_dir_operations;</div><div class='hunk'>@@ -790,12 +746,12 @@ static int f2fs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		f2fs_sync_fs(sbi-&gt;sb, 1);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> </div><div class='ctx'> out_fail:</div><div class='ctx'> 	clear_inode_flag(inode, FI_INC_LINK);</div><div class='ctx'> 	f2fs_handle_failed_inode(inode);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='hunk'>@@ -852,7 +808,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int __f2fs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			  struct file *file, umode_t mode, bool is_whiteout,</div><div class='del'>-			  struct inode **new_inode)</div><div class='add'>+			  struct inode **new_inode, struct f2fs_filename *fname)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -880,7 +836,7 @@ static int __f2fs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = f2fs_do_tmpfile(inode, dir);</div><div class='add'>+	err = f2fs_do_tmpfile(inode, dir, fname);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto release_out;</div><div class='ctx'> </div><div class='hunk'>@@ -895,7 +851,7 @@ static int __f2fs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		f2fs_i_links_write(inode, false);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		inode-&gt;i_state |= I_LINKABLE;</div><div class='add'>+		inode_state_set(inode, I_LINKABLE);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (file)</div><div class='hunk'>@@ -931,22 +887,24 @@ static int f2fs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (!f2fs_is_checkpoint_ready(sbi))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	err = __f2fs_tmpfile(idmap, dir, file, mode, false, NULL);</div><div class='add'>+	err = __f2fs_tmpfile(idmap, dir, file, mode, false, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return finish_open_simple(file, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_create_whiteout(struct mnt_idmap *idmap,</div><div class='del'>-				struct inode *dir, struct inode **whiteout)</div><div class='add'>+				struct inode *dir, struct inode **whiteout,</div><div class='add'>+				struct f2fs_filename *fname)</div><div class='ctx'> {</div><div class='del'>-	return __f2fs_tmpfile(idmap, dir, NULL,</div><div class='del'>-				S_IFCHR | WHITEOUT_MODE, true, whiteout);</div><div class='add'>+	return __f2fs_tmpfile(idmap, dir, NULL, S_IFCHR | WHITEOUT_MODE,</div><div class='add'>+						true, whiteout, fname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_get_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		     struct inode **new_inode)</div><div class='ctx'> {</div><div class='del'>-	return __f2fs_tmpfile(idmap, dir, NULL, S_IFREG, false, new_inode);</div><div class='add'>+	return __f2fs_tmpfile(idmap, dir, NULL, S_IFREG,</div><div class='add'>+				false, new_inode, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='hunk'>@@ -957,8 +915,8 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	struct inode *old_inode = d_inode(old_dentry);</div><div class='ctx'> 	struct inode *new_inode = d_inode(new_dentry);</div><div class='ctx'> 	struct inode *whiteout = NULL;</div><div class='del'>-	struct page *old_dir_page = NULL;</div><div class='del'>-	struct page *old_page, *new_page = NULL;</div><div class='add'>+	struct folio *old_dir_folio = NULL;</div><div class='add'>+	struct folio *old_folio, *new_folio = NULL;</div><div class='ctx'> 	struct f2fs_dir_entry *old_dir_entry = NULL;</div><div class='ctx'> 	struct f2fs_dir_entry *old_entry;</div><div class='ctx'> 	struct f2fs_dir_entry *new_entry;</div><div class='hunk'>@@ -972,7 +930,7 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> </div><div class='ctx'> 	if (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &amp;&amp;</div><div class='ctx'> 			(!projid_eq(F2FS_I(new_dir)-&gt;i_projid,</div><div class='del'>-			F2FS_I(old_dentry-&gt;d_inode)-&gt;i_projid)))</div><div class='add'>+			F2FS_I(old_inode)-&gt;i_projid)))</div><div class='ctx'> 		return -EXDEV;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -990,7 +948,14 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; RENAME_WHITEOUT) {</div><div class='del'>-		err = f2fs_create_whiteout(idmap, old_dir, &amp;whiteout);</div><div class='add'>+		struct f2fs_filename fname;</div><div class='add'>+</div><div class='add'>+		err = f2fs_setup_filename(old_dir, &amp;old_dentry-&gt;d_name,</div><div class='add'>+							0, &amp;fname);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = f2fs_create_whiteout(idmap, old_dir, &amp;whiteout, &amp;fname);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1010,18 +975,18 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOENT;</div><div class='del'>-	old_entry = f2fs_find_entry(old_dir, &amp;old_dentry-&gt;d_name, &amp;old_page);</div><div class='add'>+	old_entry = f2fs_find_entry(old_dir, &amp;old_dentry-&gt;d_name, &amp;old_folio);</div><div class='ctx'> 	if (!old_entry) {</div><div class='del'>-		if (IS_ERR(old_page))</div><div class='del'>-			err = PTR_ERR(old_page);</div><div class='add'>+		if (IS_ERR(old_folio))</div><div class='add'>+			err = PTR_ERR(old_folio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (old_is_dir &amp;&amp; old_dir != new_dir) {</div><div class='del'>-		old_dir_entry = f2fs_parent_dir(old_inode, &amp;old_dir_page);</div><div class='add'>+		old_dir_entry = f2fs_parent_dir(old_inode, &amp;old_dir_folio);</div><div class='ctx'> 		if (!old_dir_entry) {</div><div class='del'>-			if (IS_ERR(old_dir_page))</div><div class='del'>-				err = PTR_ERR(old_dir_page);</div><div class='add'>+			if (IS_ERR(old_dir_folio))</div><div class='add'>+				err = PTR_ERR(old_dir_folio);</div><div class='ctx'> 			goto out_old;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1034,10 +999,10 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> </div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		new_entry = f2fs_find_entry(new_dir, &amp;new_dentry-&gt;d_name,</div><div class='del'>-						&amp;new_page);</div><div class='add'>+						&amp;new_folio);</div><div class='ctx'> 		if (!new_entry) {</div><div class='del'>-			if (IS_ERR(new_page))</div><div class='del'>-				err = PTR_ERR(new_page);</div><div class='add'>+			if (IS_ERR(new_folio))</div><div class='add'>+				err = PTR_ERR(new_folio);</div><div class='ctx'> 			goto out_dir;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1049,8 +1014,8 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto put_out_dir;</div><div class='ctx'> </div><div class='del'>-		f2fs_set_link(new_dir, new_entry, new_page, old_inode);</div><div class='del'>-		new_page = NULL;</div><div class='add'>+		f2fs_set_link(new_dir, new_entry, new_folio, old_inode);</div><div class='add'>+		new_folio = NULL;</div><div class='ctx'> </div><div class='ctx'> 		inode_set_ctime_current(new_inode);</div><div class='ctx'> 		f2fs_down_write(&amp;F2FS_I(new_inode)-&gt;i_sem);</div><div class='hunk'>@@ -1089,30 +1054,29 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 	inode_set_ctime_current(old_inode);</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(old_inode, false);</div><div class='ctx'> </div><div class='del'>-	f2fs_delete_entry(old_entry, old_page, old_dir, NULL);</div><div class='del'>-	old_page = NULL;</div><div class='add'>+	f2fs_delete_entry(old_entry, old_folio, old_dir, NULL);</div><div class='add'>+	old_folio = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (whiteout) {</div><div class='ctx'> 		set_inode_flag(whiteout, FI_INC_LINK);</div><div class='ctx'> 		err = f2fs_add_link(old_dentry, whiteout);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			d_invalidate(old_dentry);</div><div class='add'>+			d_invalidate(new_dentry);</div><div class='ctx'> 			goto put_out_dir;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 		spin_lock(&amp;whiteout-&gt;i_lock);</div><div class='del'>-		whiteout-&gt;i_state &amp;= ~I_LINKABLE;</div><div class='add'>+		inode_state_clear(whiteout, I_LINKABLE);</div><div class='ctx'> 		spin_unlock(&amp;whiteout-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 		iput(whiteout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (old_is_dir) {</div><div class='del'>-		if (old_dir_entry)</div><div class='del'>-			f2fs_set_link(old_inode, old_dir_entry,</div><div class='del'>-						old_dir_page, new_dir);</div><div class='del'>-		else</div><div class='del'>-			f2fs_put_page(old_dir_page, 0);</div><div class='add'>+	if (old_dir_entry)</div><div class='add'>+		f2fs_set_link(old_inode, old_dir_entry, old_dir_folio, new_dir);</div><div class='add'>+	if (old_is_dir)</div><div class='ctx'> 		f2fs_i_links_write(old_dir, false);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (F2FS_OPTION(sbi).fsync_mode == FSYNC_MODE_STRICT) {</div><div class='ctx'> 		f2fs_add_ino_entry(sbi, new_dir-&gt;i_ino, TRANS_DIR_INO);</div><div class='ctx'> 		if (S_ISDIR(old_inode-&gt;i_mode))</div><div class='hunk'>@@ -1130,12 +1094,12 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> </div><div class='ctx'> put_out_dir:</div><div class='ctx'> 	f2fs_unlock_op(sbi);</div><div class='del'>-	f2fs_put_page(new_page, 0);</div><div class='add'>+	f2fs_folio_put(new_folio, false);</div><div class='ctx'> out_dir:</div><div class='ctx'> 	if (old_dir_entry)</div><div class='del'>-		f2fs_put_page(old_dir_page, 0);</div><div class='add'>+		f2fs_folio_put(old_dir_folio, false);</div><div class='ctx'> out_old:</div><div class='del'>-	f2fs_put_page(old_page, 0);</div><div class='add'>+	f2fs_folio_put(old_folio, false);</div><div class='ctx'> out:</div><div class='ctx'> 	iput(whiteout);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1147,8 +1111,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(old_dir);</div><div class='ctx'> 	struct inode *old_inode = d_inode(old_dentry);</div><div class='ctx'> 	struct inode *new_inode = d_inode(new_dentry);</div><div class='del'>-	struct page *old_dir_page, *new_dir_page;</div><div class='del'>-	struct page *old_page, *new_page;</div><div class='add'>+	struct folio *old_dir_folio, *new_dir_folio;</div><div class='add'>+	struct folio *old_folio, *new_folio;</div><div class='ctx'> 	struct f2fs_dir_entry *old_dir_entry = NULL, *new_dir_entry = NULL;</div><div class='ctx'> 	struct f2fs_dir_entry *old_entry, *new_entry;</div><div class='ctx'> 	int old_nlink = 0, new_nlink = 0;</div><div class='hunk'>@@ -1161,10 +1125,10 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> </div><div class='ctx'> 	if ((is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &amp;&amp;</div><div class='ctx'> 			!projid_eq(F2FS_I(new_dir)-&gt;i_projid,</div><div class='del'>-			F2FS_I(old_dentry-&gt;d_inode)-&gt;i_projid)) ||</div><div class='del'>-	    (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &amp;&amp;</div><div class='add'>+			F2FS_I(old_inode)-&gt;i_projid)) ||</div><div class='add'>+	    (is_inode_flag_set(old_dir, FI_PROJ_INHERIT) &amp;&amp;</div><div class='ctx'> 			!projid_eq(F2FS_I(old_dir)-&gt;i_projid,</div><div class='del'>-			F2FS_I(new_dentry-&gt;d_inode)-&gt;i_projid)))</div><div class='add'>+			F2FS_I(new_inode)-&gt;i_projid)))</div><div class='ctx'> 		return -EXDEV;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_dquot_initialize(old_dir);</div><div class='hunk'>@@ -1176,17 +1140,17 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOENT;</div><div class='del'>-	old_entry = f2fs_find_entry(old_dir, &amp;old_dentry-&gt;d_name, &amp;old_page);</div><div class='add'>+	old_entry = f2fs_find_entry(old_dir, &amp;old_dentry-&gt;d_name, &amp;old_folio);</div><div class='ctx'> 	if (!old_entry) {</div><div class='del'>-		if (IS_ERR(old_page))</div><div class='del'>-			err = PTR_ERR(old_page);</div><div class='add'>+		if (IS_ERR(old_folio))</div><div class='add'>+			err = PTR_ERR(old_folio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	new_entry = f2fs_find_entry(new_dir, &amp;new_dentry-&gt;d_name, &amp;new_page);</div><div class='add'>+	new_entry = f2fs_find_entry(new_dir, &amp;new_dentry-&gt;d_name, &amp;new_folio);</div><div class='ctx'> 	if (!new_entry) {</div><div class='del'>-		if (IS_ERR(new_page))</div><div class='del'>-			err = PTR_ERR(new_page);</div><div class='add'>+		if (IS_ERR(new_folio))</div><div class='add'>+			err = PTR_ERR(new_folio);</div><div class='ctx'> 		goto out_old;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1194,20 +1158,20 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> 	if (old_dir != new_dir) {</div><div class='ctx'> 		if (S_ISDIR(old_inode-&gt;i_mode)) {</div><div class='ctx'> 			old_dir_entry = f2fs_parent_dir(old_inode,</div><div class='del'>-							&amp;old_dir_page);</div><div class='add'>+							&amp;old_dir_folio);</div><div class='ctx'> 			if (!old_dir_entry) {</div><div class='del'>-				if (IS_ERR(old_dir_page))</div><div class='del'>-					err = PTR_ERR(old_dir_page);</div><div class='add'>+				if (IS_ERR(old_dir_folio))</div><div class='add'>+					err = PTR_ERR(old_dir_folio);</div><div class='ctx'> 				goto out_new;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (S_ISDIR(new_inode-&gt;i_mode)) {</div><div class='ctx'> 			new_dir_entry = f2fs_parent_dir(new_inode,</div><div class='del'>-							&amp;new_dir_page);</div><div class='add'>+							&amp;new_dir_folio);</div><div class='ctx'> 			if (!new_dir_entry) {</div><div class='del'>-				if (IS_ERR(new_dir_page))</div><div class='del'>-					err = PTR_ERR(new_dir_page);</div><div class='add'>+				if (IS_ERR(new_dir_folio))</div><div class='add'>+					err = PTR_ERR(new_dir_folio);</div><div class='ctx'> 				goto out_old_dir;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1234,14 +1198,14 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> </div><div class='ctx'> 	/* update ".." directory entry info of old dentry */</div><div class='ctx'> 	if (old_dir_entry)</div><div class='del'>-		f2fs_set_link(old_inode, old_dir_entry, old_dir_page, new_dir);</div><div class='add'>+		f2fs_set_link(old_inode, old_dir_entry, old_dir_folio, new_dir);</div><div class='ctx'> </div><div class='ctx'> 	/* update ".." directory entry info of new dentry */</div><div class='ctx'> 	if (new_dir_entry)</div><div class='del'>-		f2fs_set_link(new_inode, new_dir_entry, new_dir_page, old_dir);</div><div class='add'>+		f2fs_set_link(new_inode, new_dir_entry, new_dir_folio, old_dir);</div><div class='ctx'> </div><div class='ctx'> 	/* update directory entry info of old dir inode */</div><div class='del'>-	f2fs_set_link(old_dir, old_entry, old_page, new_inode);</div><div class='add'>+	f2fs_set_link(old_dir, old_entry, old_folio, new_inode);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(old_inode)-&gt;i_sem);</div><div class='ctx'> 	if (!old_dir_entry)</div><div class='hunk'>@@ -1260,7 +1224,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(old_dir, false);</div><div class='ctx'> </div><div class='ctx'> 	/* update directory entry info of new dir inode */</div><div class='del'>-	f2fs_set_link(new_dir, new_entry, new_page, old_inode);</div><div class='add'>+	f2fs_set_link(new_dir, new_entry, new_folio, old_inode);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(new_inode)-&gt;i_sem);</div><div class='ctx'> 	if (!new_dir_entry)</div><div class='hunk'>@@ -1292,16 +1256,16 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_new_dir:</div><div class='ctx'> 	if (new_dir_entry) {</div><div class='del'>-		f2fs_put_page(new_dir_page, 0);</div><div class='add'>+		f2fs_folio_put(new_dir_folio, false);</div><div class='ctx'> 	}</div><div class='ctx'> out_old_dir:</div><div class='ctx'> 	if (old_dir_entry) {</div><div class='del'>-		f2fs_put_page(old_dir_page, 0);</div><div class='add'>+		f2fs_folio_put(old_dir_folio, false);</div><div class='ctx'> 	}</div><div class='ctx'> out_new:</div><div class='del'>-	f2fs_put_page(new_page, 0);</div><div class='add'>+	f2fs_folio_put(new_folio, false);</div><div class='ctx'> out_old:</div><div class='del'>-	f2fs_put_page(old_page, 0);</div><div class='add'>+	f2fs_folio_put(old_folio, false);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1343,19 +1307,19 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry,</div><div class='ctx'> 					   struct inode *inode,</div><div class='ctx'> 					   struct delayed_call *done)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	const char *target;</div><div class='ctx'> </div><div class='ctx'> 	if (!dentry)</div><div class='ctx'> 		return ERR_PTR(-ECHILD);</div><div class='ctx'> </div><div class='del'>-	page = read_mapping_page(inode-&gt;i_mapping, 0, NULL);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return ERR_CAST(page);</div><div class='add'>+	folio = read_mapping_folio(inode-&gt;i_mapping, 0, NULL);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return ERR_CAST(folio);</div><div class='ctx'> </div><div class='del'>-	target = fscrypt_get_symlink(inode, page_address(page),</div><div class='add'>+	target = fscrypt_get_symlink(inode, folio_address(folio),</div><div class='ctx'> 				     inode-&gt;i_sb-&gt;s_blocksize, done);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return target;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c<br/>index 9b546fd21010..482a362f2625 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/node.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/node.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/node.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/node.c</a></div><div class='hunk'>@@ -20,19 +20,24 @@</div><div class='ctx'> #include "iostat.h"</div><div class='ctx'> #include &lt;trace/events/f2fs.h&gt;</div><div class='ctx'> </div><div class='del'>-#define on_f2fs_build_free_nids(nmi) mutex_is_locked(&amp;(nm_i)-&gt;build_lock)</div><div class='add'>+#define on_f2fs_build_free_nids(nm_i) mutex_is_locked(&amp;(nm_i)-&gt;build_lock)</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *nat_entry_slab;</div><div class='ctx'> static struct kmem_cache *free_nid_slab;</div><div class='ctx'> static struct kmem_cache *nat_entry_set_slab;</div><div class='ctx'> static struct kmem_cache *fsync_node_entry_slab;</div><div class='ctx'> </div><div class='add'>+static inline bool is_invalid_nid(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return nid &lt; F2FS_ROOT_INO(sbi) || nid &gt;= NM_I(sbi)-&gt;max_nid;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Check whether the given nid is within node id range.</div><div class='ctx'>  */</div><div class='ctx'> int f2fs_check_nid_range(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(nid &lt; F2FS_ROOT_INO(sbi) || nid &gt;= NM_I(sbi)-&gt;max_nid)) {</div><div class='add'>+	if (unlikely(is_invalid_nid(sbi, nid))) {</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 		f2fs_warn(sbi, "%s: out-of-range nid=%x, run fsck to fix.",</div><div class='ctx'> 			  __func__, nid);</div><div class='hunk'>@@ -120,25 +125,25 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void clear_node_page_dirty(struct page *page)</div><div class='add'>+static void clear_node_folio_dirty(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (PageDirty(page)) {</div><div class='del'>-		f2fs_clear_page_cache_dirty_tag(page);</div><div class='del'>-		clear_page_dirty_for_io(page);</div><div class='del'>-		dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);</div><div class='add'>+	if (folio_test_dirty(folio)) {</div><div class='add'>+		f2fs_clear_page_cache_dirty_tag(folio);</div><div class='add'>+		folio_clear_dirty_for_io(folio);</div><div class='add'>+		dec_page_count(F2FS_F_SB(folio), F2FS_DIRTY_NODES);</div><div class='ctx'> 	}</div><div class='del'>-	ClearPageUptodate(page);</div><div class='add'>+	folio_clear_uptodate(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *get_current_nat_page(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='add'>+static struct folio *get_current_nat_folio(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	return f2fs_get_meta_page_retry(sbi, current_nat_addr(sbi, nid));</div><div class='add'>+	return f2fs_get_meta_folio_retry(sbi, current_nat_addr(sbi, nid));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='add'>+static struct folio *get_next_nat_folio(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	struct page *src_page;</div><div class='del'>-	struct page *dst_page;</div><div class='add'>+	struct folio *src_folio;</div><div class='add'>+	struct folio *dst_folio;</div><div class='ctx'> 	pgoff_t dst_off;</div><div class='ctx'> 	void *src_addr;</div><div class='ctx'> 	void *dst_addr;</div><div class='hunk'>@@ -147,21 +152,21 @@ static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> 	dst_off = next_nat_addr(sbi, current_nat_addr(sbi, nid));</div><div class='ctx'> </div><div class='ctx'> 	/* get current nat block page with lock */</div><div class='del'>-	src_page = get_current_nat_page(sbi, nid);</div><div class='del'>-	if (IS_ERR(src_page))</div><div class='del'>-		return src_page;</div><div class='del'>-	dst_page = f2fs_grab_meta_page(sbi, dst_off);</div><div class='del'>-	f2fs_bug_on(sbi, PageDirty(src_page));</div><div class='del'>-</div><div class='del'>-	src_addr = page_address(src_page);</div><div class='del'>-	dst_addr = page_address(dst_page);</div><div class='add'>+	src_folio = get_current_nat_folio(sbi, nid);</div><div class='add'>+	if (IS_ERR(src_folio))</div><div class='add'>+		return src_folio;</div><div class='add'>+	dst_folio = f2fs_grab_meta_folio(sbi, dst_off);</div><div class='add'>+	f2fs_bug_on(sbi, folio_test_dirty(src_folio));</div><div class='add'>+</div><div class='add'>+	src_addr = folio_address(src_folio);</div><div class='add'>+	dst_addr = folio_address(dst_folio);</div><div class='ctx'> 	memcpy(dst_addr, src_addr, PAGE_SIZE);</div><div class='del'>-	set_page_dirty(dst_page);</div><div class='del'>-	f2fs_put_page(src_page, 1);</div><div class='add'>+	folio_mark_dirty(dst_folio);</div><div class='add'>+	f2fs_folio_put(src_folio, true);</div><div class='ctx'> </div><div class='ctx'> 	set_to_next_nat(nm_i, nid);</div><div class='ctx'> </div><div class='del'>-	return dst_page;</div><div class='add'>+	return dst_folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nat_entry *__alloc_nat_entry(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -185,7 +190,7 @@ static void __free_nat_entry(struct nat_entry *e)</div><div class='ctx'> </div><div class='ctx'> /* must be locked by nat_tree_lock */</div><div class='ctx'> static struct nat_entry *__init_nat_entry(struct f2fs_nm_info *nm_i,</div><div class='del'>-	struct nat_entry *ne, struct f2fs_nat_entry *raw_ne, bool no_fail)</div><div class='add'>+	struct nat_entry *ne, struct f2fs_nat_entry *raw_ne, bool no_fail, bool init_dirty)</div><div class='ctx'> {</div><div class='ctx'> 	if (no_fail)</div><div class='ctx'> 		f2fs_radix_tree_insert(&amp;nm_i-&gt;nat_root, nat_get_nid(ne), ne);</div><div class='hunk'>@@ -195,6 +200,12 @@ static struct nat_entry *__init_nat_entry(struct f2fs_nm_info *nm_i,</div><div class='ctx'> 	if (raw_ne)</div><div class='ctx'> 		node_info_from_raw_nat(&amp;ne-&gt;ni, raw_ne);</div><div class='ctx'> </div><div class='add'>+	if (init_dirty) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;ne-&gt;list);</div><div class='add'>+		nm_i-&gt;nat_cnt[TOTAL_NAT]++;</div><div class='add'>+		return ne;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;nm_i-&gt;nat_list_lock);</div><div class='ctx'> 	list_add_tail(&amp;ne-&gt;list, &amp;nm_i-&gt;nat_entries);</div><div class='ctx'> 	spin_unlock(&amp;nm_i-&gt;nat_list_lock);</div><div class='hunk'>@@ -204,14 +215,17 @@ static struct nat_entry *__init_nat_entry(struct f2fs_nm_info *nm_i,</div><div class='ctx'> 	return ne;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nat_entry *__lookup_nat_cache(struct f2fs_nm_info *nm_i, nid_t n)</div><div class='add'>+static struct nat_entry *__lookup_nat_cache(struct f2fs_nm_info *nm_i, nid_t n, bool for_dirty)</div><div class='ctx'> {</div><div class='ctx'> 	struct nat_entry *ne;</div><div class='ctx'> </div><div class='ctx'> 	ne = radix_tree_lookup(&amp;nm_i-&gt;nat_root, n);</div><div class='ctx'> </div><div class='del'>-	/* for recent accessed nat entry, move it to tail of lru list */</div><div class='del'>-	if (ne &amp;&amp; !get_nat_flag(ne, IS_DIRTY)) {</div><div class='add'>+	/*</div><div class='add'>+	 * for recent accessed nat entry which will not be dirtied soon</div><div class='add'>+	 * later, move it to tail of lru list.</div><div class='add'>+	 */</div><div class='add'>+	if (ne &amp;&amp; !get_nat_flag(ne, IS_DIRTY) &amp;&amp; !for_dirty) {</div><div class='ctx'> 		spin_lock(&amp;nm_i-&gt;nat_list_lock);</div><div class='ctx'> 		if (!list_empty(&amp;ne-&gt;list))</div><div class='ctx'> 			list_move_tail(&amp;ne-&gt;list, &amp;nm_i-&gt;nat_entries);</div><div class='hunk'>@@ -256,7 +270,7 @@ static struct nat_entry_set *__grab_nat_entry_set(struct f2fs_nm_info *nm_i,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __set_nat_cache_dirty(struct f2fs_nm_info *nm_i,</div><div class='del'>-						struct nat_entry *ne)</div><div class='add'>+		struct nat_entry *ne, bool init_dirty)</div><div class='ctx'> {</div><div class='ctx'> 	struct nat_entry_set *head;</div><div class='ctx'> 	bool new_ne = nat_get_blkaddr(ne) == NEW_ADDR;</div><div class='hunk'>@@ -279,7 +293,8 @@ static void __set_nat_cache_dirty(struct f2fs_nm_info *nm_i,</div><div class='ctx'> 		goto refresh_list;</div><div class='ctx'> </div><div class='ctx'> 	nm_i-&gt;nat_cnt[DIRTY_NAT]++;</div><div class='del'>-	nm_i-&gt;nat_cnt[RECLAIMABLE_NAT]--;</div><div class='add'>+	if (!init_dirty)</div><div class='add'>+		nm_i-&gt;nat_cnt[RECLAIMABLE_NAT]--;</div><div class='ctx'> 	set_nat_flag(ne, IS_DIRTY, true);</div><div class='ctx'> refresh_list:</div><div class='ctx'> 	spin_lock(&amp;nm_i-&gt;nat_list_lock);</div><div class='hunk'>@@ -310,10 +325,9 @@ static unsigned int __gang_lookup_nat_set(struct f2fs_nm_info *nm_i,</div><div class='ctx'> 							start, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return NODE_MAPPING(sbi) == page-&gt;mapping &amp;&amp;</div><div class='del'>-			IS_DNODE(page) &amp;&amp; is_cold_node(page);</div><div class='add'>+	return is_node_folio(folio) &amp;&amp; IS_DNODE(folio) &amp;&amp; is_cold_node(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -325,7 +339,7 @@ void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int f2fs_add_fsync_node_entry(struct f2fs_sb_info *sbi,</div><div class='del'>-							struct page *page)</div><div class='add'>+		struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsync_node_entry *fn;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -334,8 +348,8 @@ static unsigned int f2fs_add_fsync_node_entry(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	fn = f2fs_kmem_cache_alloc(fsync_node_entry_slab,</div><div class='ctx'> 					GFP_NOFS, true, NULL);</div><div class='ctx'> </div><div class='del'>-	get_page(page);</div><div class='del'>-	fn-&gt;page = page;</div><div class='add'>+	folio_get(folio);</div><div class='add'>+	fn-&gt;folio = folio;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fn-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;sbi-&gt;fsync_node_lock, flags);</div><div class='hunk'>@@ -348,19 +362,19 @@ static unsigned int f2fs_add_fsync_node_entry(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	return seq_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsync_node_entry *fn;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;sbi-&gt;fsync_node_lock, flags);</div><div class='ctx'> 	list_for_each_entry(fn, &amp;sbi-&gt;fsync_node_list, list) {</div><div class='del'>-		if (fn-&gt;page == page) {</div><div class='add'>+		if (fn-&gt;folio == folio) {</div><div class='ctx'> 			list_del(&amp;fn-&gt;list);</div><div class='ctx'> 			sbi-&gt;fsync_node_num--;</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;sbi-&gt;fsync_node_lock, flags);</div><div class='ctx'> 			kmem_cache_free(fsync_node_entry_slab, fn);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -384,7 +398,7 @@ int f2fs_need_dentry_mark(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> 	bool need = false;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	e = __lookup_nat_cache(nm_i, nid);</div><div class='add'>+	e = __lookup_nat_cache(nm_i, nid, false);</div><div class='ctx'> 	if (e) {</div><div class='ctx'> 		if (!get_nat_flag(e, IS_CHECKPOINTED) &amp;&amp;</div><div class='ctx'> 				!get_nat_flag(e, HAS_FSYNCED_INODE))</div><div class='hunk'>@@ -401,7 +415,7 @@ bool f2fs_is_checkpointed_node(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> 	bool is_cp = true;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	e = __lookup_nat_cache(nm_i, nid);</div><div class='add'>+	e = __lookup_nat_cache(nm_i, nid, false);</div><div class='ctx'> 	if (e &amp;&amp; !get_nat_flag(e, IS_CHECKPOINTED))</div><div class='ctx'> 		is_cp = false;</div><div class='ctx'> 	f2fs_up_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='hunk'>@@ -415,7 +429,7 @@ bool f2fs_need_inode_block_update(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> 	bool need_update = true;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	e = __lookup_nat_cache(nm_i, ino);</div><div class='add'>+	e = __lookup_nat_cache(nm_i, ino, false);</div><div class='ctx'> 	if (e &amp;&amp; get_nat_flag(e, HAS_LAST_FSYNC) &amp;&amp;</div><div class='ctx'> 			(get_nat_flag(e, IS_CHECKPOINTED) ||</div><div class='ctx'> 			 get_nat_flag(e, HAS_FSYNCED_INODE)))</div><div class='hunk'>@@ -440,9 +454,9 @@ static void cache_nat_entry(struct f2fs_sb_info *sbi, nid_t nid,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	e = __lookup_nat_cache(nm_i, nid);</div><div class='add'>+	e = __lookup_nat_cache(nm_i, nid, false);</div><div class='ctx'> 	if (!e)</div><div class='del'>-		e = __init_nat_entry(nm_i, new, ne, false);</div><div class='add'>+		e = __init_nat_entry(nm_i, new, ne, false, false);</div><div class='ctx'> 	else</div><div class='ctx'> 		f2fs_bug_on(sbi, nat_get_ino(e) != le32_to_cpu(ne-&gt;ino) ||</div><div class='ctx'> 				nat_get_blkaddr(e) !=</div><div class='hunk'>@@ -459,11 +473,13 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,</div><div class='ctx'> 	struct f2fs_nm_info *nm_i = NM_I(sbi);</div><div class='ctx'> 	struct nat_entry *e;</div><div class='ctx'> 	struct nat_entry *new = __alloc_nat_entry(sbi, ni-&gt;nid, true);</div><div class='add'>+	bool init_dirty = false;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	e = __lookup_nat_cache(nm_i, ni-&gt;nid);</div><div class='add'>+	e = __lookup_nat_cache(nm_i, ni-&gt;nid, true);</div><div class='ctx'> 	if (!e) {</div><div class='del'>-		e = __init_nat_entry(nm_i, new, NULL, true);</div><div class='add'>+		init_dirty = true;</div><div class='add'>+		e = __init_nat_entry(nm_i, new, NULL, true, true);</div><div class='ctx'> 		copy_node_info(&amp;e-&gt;ni, ni);</div><div class='ctx'> 		f2fs_bug_on(sbi, ni-&gt;blk_addr == NEW_ADDR);</div><div class='ctx'> 	} else if (new_blkaddr == NEW_ADDR) {</div><div class='hunk'>@@ -499,11 +515,11 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,</div><div class='ctx'> 	nat_set_blkaddr(e, new_blkaddr);</div><div class='ctx'> 	if (!__is_valid_data_blkaddr(new_blkaddr))</div><div class='ctx'> 		set_nat_flag(e, IS_CHECKPOINTED, false);</div><div class='del'>-	__set_nat_cache_dirty(nm_i, e);</div><div class='add'>+	__set_nat_cache_dirty(nm_i, e, init_dirty);</div><div class='ctx'> </div><div class='ctx'> 	/* update fsync_mark if its inode nat entry is still alive */</div><div class='ctx'> 	if (ni-&gt;nid != ni-&gt;ino)</div><div class='del'>-		e = __lookup_nat_cache(nm_i, ni-&gt;ino);</div><div class='add'>+		e = __lookup_nat_cache(nm_i, ni-&gt;ino, false);</div><div class='ctx'> 	if (e) {</div><div class='ctx'> 		if (fsync_done &amp;&amp; ni-&gt;nid == ni-&gt;ino)</div><div class='ctx'> 			set_nat_flag(e, HAS_FSYNCED_INODE, true);</div><div class='hunk'>@@ -551,23 +567,28 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,</div><div class='ctx'> 	struct f2fs_journal *journal = curseg-&gt;journal;</div><div class='ctx'> 	nid_t start_nid = START_NID(nid);</div><div class='ctx'> 	struct f2fs_nat_block *nat_blk;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	struct f2fs_nat_entry ne;</div><div class='ctx'> 	struct nat_entry *e;</div><div class='ctx'> 	pgoff_t index;</div><div class='del'>-	block_t blkaddr;</div><div class='ctx'> 	int i;</div><div class='add'>+	bool need_cache = true;</div><div class='ctx'> </div><div class='add'>+	ni-&gt;flag = 0;</div><div class='ctx'> 	ni-&gt;nid = nid;</div><div class='ctx'> retry:</div><div class='ctx'> 	/* Check nat cache */</div><div class='ctx'> 	f2fs_down_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	e = __lookup_nat_cache(nm_i, nid);</div><div class='add'>+	e = __lookup_nat_cache(nm_i, nid, false);</div><div class='ctx'> 	if (e) {</div><div class='ctx'> 		ni-&gt;ino = nat_get_ino(e);</div><div class='ctx'> 		ni-&gt;blk_addr = nat_get_blkaddr(e);</div><div class='ctx'> 		ni-&gt;version = nat_get_version(e);</div><div class='ctx'> 		f2fs_up_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='add'>+		if (IS_ENABLED(CONFIG_F2FS_CHECK_FS)) {</div><div class='add'>+			need_cache = false;</div><div class='add'>+			goto sanity_check;</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -593,38 +614,47 @@ retry:</div><div class='ctx'> 	up_read(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> 	if (i &gt;= 0) {</div><div class='ctx'> 		f2fs_up_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-		goto cache;</div><div class='add'>+		goto sanity_check;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill node_info from nat page */</div><div class='ctx'> 	index = current_nat_addr(sbi, nid);</div><div class='ctx'> 	f2fs_up_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_meta_page(sbi, index);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+	folio = f2fs_get_meta_folio(sbi, index);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	nat_blk = (struct f2fs_nat_block *)page_address(page);</div><div class='add'>+	nat_blk = folio_address(folio);</div><div class='ctx'> 	ne = nat_blk-&gt;entries[nid - start_nid];</div><div class='ctx'> 	node_info_from_raw_nat(ni, &amp;ne);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='del'>-cache:</div><div class='del'>-	blkaddr = le32_to_cpu(ne.block_addr);</div><div class='del'>-	if (__is_valid_data_blkaddr(blkaddr) &amp;&amp;</div><div class='del'>-		!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='add'>+sanity_check:</div><div class='add'>+	if (__is_valid_data_blkaddr(ni-&gt;blk_addr) &amp;&amp;</div><div class='add'>+		!f2fs_is_valid_blkaddr(sbi, ni-&gt;blk_addr,</div><div class='add'>+					DATA_GENERIC_ENHANCE)) {</div><div class='add'>+		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+		f2fs_err_ratelimited(sbi,</div><div class='add'>+			"f2fs_get_node_info of %pS: inconsistent nat entry, "</div><div class='add'>+			"ino:%u, nid:%u, blkaddr:%u, ver:%u, flag:%u",</div><div class='add'>+			__builtin_return_address(0),</div><div class='add'>+			ni-&gt;ino, ni-&gt;nid, ni-&gt;blk_addr, ni-&gt;version, ni-&gt;flag);</div><div class='add'>+		f2fs_handle_error(sbi, ERROR_INCONSISTENT_NAT);</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* cache nat entry */</div><div class='del'>-	cache_nat_entry(sbi, nid, &amp;ne);</div><div class='add'>+	if (need_cache)</div><div class='add'>+		cache_nat_entry(sbi, nid, &amp;ne);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * readahead MAX_RA_NODE number of node pages.</div><div class='ctx'>  */</div><div class='del'>-static void f2fs_ra_node_pages(struct page *parent, int start, int n)</div><div class='add'>+static void f2fs_ra_node_pages(struct folio *parent, int start, int n)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(parent);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(parent);</div><div class='ctx'> 	struct blk_plug plug;</div><div class='ctx'> 	int i, end;</div><div class='ctx'> 	nid_t nid;</div><div class='hunk'>@@ -753,6 +783,8 @@ got:</div><div class='ctx'> 	return level;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct folio *f2fs_get_node_folio_ra(struct folio *parent, int start);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Caller should call f2fs_put_dnode(dn).</div><div class='ctx'>  * Also, it should grab and release a rwsem by calling f2fs_lock_op() and</div><div class='hunk'>@@ -761,8 +793,8 @@ got:</div><div class='ctx'> int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dn-&gt;inode);</div><div class='del'>-	struct page *npage[4];</div><div class='del'>-	struct page *parent = NULL;</div><div class='add'>+	struct folio *nfolio[4];</div><div class='add'>+	struct folio *parent = NULL;</div><div class='ctx'> 	int offset[4];</div><div class='ctx'> 	unsigned int noffset[4];</div><div class='ctx'> 	nid_t nids[4];</div><div class='hunk'>@@ -774,31 +806,42 @@ int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)</div><div class='ctx'> 		return level;</div><div class='ctx'> </div><div class='ctx'> 	nids[0] = dn-&gt;inode-&gt;i_ino;</div><div class='del'>-	npage[0] = dn-&gt;inode_page;</div><div class='ctx'> </div><div class='del'>-	if (!npage[0]) {</div><div class='del'>-		npage[0] = f2fs_get_node_page(sbi, nids[0]);</div><div class='del'>-		if (IS_ERR(npage[0]))</div><div class='del'>-			return PTR_ERR(npage[0]);</div><div class='add'>+	if (!dn-&gt;inode_folio) {</div><div class='add'>+		nfolio[0] = f2fs_get_inode_folio(sbi, nids[0]);</div><div class='add'>+		if (IS_ERR(nfolio[0]))</div><div class='add'>+			return PTR_ERR(nfolio[0]);</div><div class='add'>+	} else {</div><div class='add'>+		nfolio[0] = dn-&gt;inode_folio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if inline_data is set, should not report any block indices */</div><div class='ctx'> 	if (f2fs_has_inline_data(dn-&gt;inode) &amp;&amp; index) {</div><div class='ctx'> 		err = -ENOENT;</div><div class='del'>-		f2fs_put_page(npage[0], 1);</div><div class='add'>+		f2fs_folio_put(nfolio[0], true);</div><div class='ctx'> 		goto release_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	parent = npage[0];</div><div class='add'>+	parent = nfolio[0];</div><div class='ctx'> 	if (level != 0)</div><div class='ctx'> 		nids[1] = get_nid(parent, offset[0], true);</div><div class='del'>-	dn-&gt;inode_page = npage[0];</div><div class='del'>-	dn-&gt;inode_page_locked = true;</div><div class='add'>+	dn-&gt;inode_folio = nfolio[0];</div><div class='add'>+	dn-&gt;inode_folio_locked = true;</div><div class='ctx'> </div><div class='ctx'> 	/* get indirect or direct nodes */</div><div class='ctx'> 	for (i = 1; i &lt;= level; i++) {</div><div class='ctx'> 		bool done = false;</div><div class='ctx'> </div><div class='add'>+		if (nids[i] &amp;&amp; nids[i] == dn-&gt;inode-&gt;i_ino) {</div><div class='add'>+			err = -EFSCORRUPTED;</div><div class='add'>+			f2fs_err_ratelimited(sbi,</div><div class='add'>+				"inode mapping table is corrupted, run fsck to fix it, "</div><div class='add'>+				"ino:%lu, nid:%u, level:%d, offset:%d",</div><div class='add'>+				dn-&gt;inode-&gt;i_ino, nids[i], level, offset[level]);</div><div class='add'>+			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+			goto release_pages;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!nids[i] &amp;&amp; mode == ALLOC_NODE) {</div><div class='ctx'> 			/* alloc new node */</div><div class='ctx'> 			if (!f2fs_alloc_nid(sbi, &amp;(nids[i]))) {</div><div class='hunk'>@@ -807,10 +850,10 @@ int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			dn-&gt;nid = nids[i];</div><div class='del'>-			npage[i] = f2fs_new_node_page(dn, noffset[i]);</div><div class='del'>-			if (IS_ERR(npage[i])) {</div><div class='add'>+			nfolio[i] = f2fs_new_node_folio(dn, noffset[i]);</div><div class='add'>+			if (IS_ERR(nfolio[i])) {</div><div class='ctx'> 				f2fs_alloc_nid_failed(sbi, nids[i]);</div><div class='del'>-				err = PTR_ERR(npage[i]);</div><div class='add'>+				err = PTR_ERR(nfolio[i]);</div><div class='ctx'> 				goto release_pages;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -818,66 +861,75 @@ int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)</div><div class='ctx'> 			f2fs_alloc_nid_done(sbi, nids[i]);</div><div class='ctx'> 			done = true;</div><div class='ctx'> 		} else if (mode == LOOKUP_NODE_RA &amp;&amp; i == level &amp;&amp; level &gt; 1) {</div><div class='del'>-			npage[i] = f2fs_get_node_page_ra(parent, offset[i - 1]);</div><div class='del'>-			if (IS_ERR(npage[i])) {</div><div class='del'>-				err = PTR_ERR(npage[i]);</div><div class='add'>+			nfolio[i] = f2fs_get_node_folio_ra(parent, offset[i - 1]);</div><div class='add'>+			if (IS_ERR(nfolio[i])) {</div><div class='add'>+				err = PTR_ERR(nfolio[i]);</div><div class='ctx'> 				goto release_pages;</div><div class='ctx'> 			}</div><div class='ctx'> 			done = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i == 1) {</div><div class='del'>-			dn-&gt;inode_page_locked = false;</div><div class='del'>-			unlock_page(parent);</div><div class='add'>+			dn-&gt;inode_folio_locked = false;</div><div class='add'>+			folio_unlock(parent);</div><div class='ctx'> 		} else {</div><div class='del'>-			f2fs_put_page(parent, 1);</div><div class='add'>+			f2fs_folio_put(parent, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!done) {</div><div class='del'>-			npage[i] = f2fs_get_node_page(sbi, nids[i]);</div><div class='del'>-			if (IS_ERR(npage[i])) {</div><div class='del'>-				err = PTR_ERR(npage[i]);</div><div class='del'>-				f2fs_put_page(npage[0], 0);</div><div class='add'>+			nfolio[i] = f2fs_get_node_folio(sbi, nids[i],</div><div class='add'>+						NODE_TYPE_NON_INODE);</div><div class='add'>+			if (IS_ERR(nfolio[i])) {</div><div class='add'>+				err = PTR_ERR(nfolio[i]);</div><div class='add'>+				f2fs_folio_put(nfolio[0], false);</div><div class='ctx'> 				goto release_out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i &lt; level) {</div><div class='del'>-			parent = npage[i];</div><div class='add'>+			parent = nfolio[i];</div><div class='ctx'> 			nids[i + 1] = get_nid(parent, offset[i], false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	dn-&gt;nid = nids[level];</div><div class='ctx'> 	dn-&gt;ofs_in_node = offset[level];</div><div class='del'>-	dn-&gt;node_page = npage[level];</div><div class='add'>+	dn-&gt;node_folio = nfolio[level];</div><div class='ctx'> 	dn-&gt;data_blkaddr = f2fs_data_blkaddr(dn);</div><div class='ctx'> </div><div class='ctx'> 	if (is_inode_flag_set(dn-&gt;inode, FI_COMPRESSED_FILE) &amp;&amp;</div><div class='ctx'> 					f2fs_sb_has_readonly(sbi)) {</div><div class='del'>-		unsigned int c_len = f2fs_cluster_blocks_are_contiguous(dn);</div><div class='add'>+		unsigned int cluster_size = F2FS_I(dn-&gt;inode)-&gt;i_cluster_size;</div><div class='add'>+		unsigned int ofs_in_node = dn-&gt;ofs_in_node;</div><div class='add'>+		pgoff_t fofs = index;</div><div class='add'>+		unsigned int c_len;</div><div class='ctx'> 		block_t blkaddr;</div><div class='ctx'> </div><div class='add'>+		/* should align fofs and ofs_in_node to cluster_size */</div><div class='add'>+		if (fofs % cluster_size) {</div><div class='add'>+			fofs = round_down(fofs, cluster_size);</div><div class='add'>+			ofs_in_node = round_down(ofs_in_node, cluster_size);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		c_len = f2fs_cluster_blocks_are_contiguous(dn, ofs_in_node);</div><div class='ctx'> 		if (!c_len)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		blkaddr = f2fs_data_blkaddr(dn);</div><div class='add'>+		blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio, ofs_in_node);</div><div class='ctx'> 		if (blkaddr == COMPRESS_ADDR)</div><div class='del'>-			blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_page,</div><div class='del'>-						dn-&gt;ofs_in_node + 1);</div><div class='add'>+			blkaddr = data_blkaddr(dn-&gt;inode, dn-&gt;node_folio,</div><div class='add'>+						ofs_in_node + 1);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_update_read_extent_tree_range_compressed(dn-&gt;inode,</div><div class='del'>-					index, blkaddr,</div><div class='del'>-					F2FS_I(dn-&gt;inode)-&gt;i_cluster_size,</div><div class='del'>-					c_len);</div><div class='add'>+					fofs, blkaddr, cluster_size, c_len);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> release_pages:</div><div class='del'>-	f2fs_put_page(parent, 1);</div><div class='add'>+	f2fs_folio_put(parent, true);</div><div class='ctx'> 	if (i &gt; 1)</div><div class='del'>-		f2fs_put_page(npage[0], 0);</div><div class='add'>+		f2fs_folio_put(nfolio[0], false);</div><div class='ctx'> release_out:</div><div class='del'>-	dn-&gt;inode_page = NULL;</div><div class='del'>-	dn-&gt;node_page = NULL;</div><div class='add'>+	dn-&gt;inode_folio = NULL;</div><div class='add'>+	dn-&gt;node_folio = NULL;</div><div class='ctx'> 	if (err == -ENOENT) {</div><div class='ctx'> 		dn-&gt;cur_level = i;</div><div class='ctx'> 		dn-&gt;max_level = level;</div><div class='hunk'>@@ -897,8 +949,18 @@ static int truncate_node(struct dnode_of_data *dn)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (ni.blk_addr != NEW_ADDR &amp;&amp;</div><div class='add'>+		!f2fs_is_valid_blkaddr(sbi, ni.blk_addr, DATA_GENERIC_ENHANCE)) {</div><div class='add'>+		f2fs_err_ratelimited(sbi,</div><div class='add'>+			"nat entry is corrupted, run fsck to fix it, ino:%u, "</div><div class='add'>+			"nid:%u, blkaddr:%u", ni.ino, ni.nid, ni.blk_addr);</div><div class='add'>+		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+		f2fs_handle_error(sbi, ERROR_INCONSISTENT_NAT);</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Deallocate node address */</div><div class='del'>-	f2fs_invalidate_blocks(sbi, ni.blk_addr);</div><div class='add'>+	f2fs_invalidate_blocks(sbi, ni.blk_addr, 1);</div><div class='ctx'> 	dec_valid_node_count(sbi, dn-&gt;inode, dn-&gt;nid == dn-&gt;inode-&gt;i_ino);</div><div class='ctx'> 	set_node_addr(sbi, &amp;ni, NULL_ADDR, false);</div><div class='ctx'> </div><div class='hunk'>@@ -908,16 +970,16 @@ static int truncate_node(struct dnode_of_data *dn)</div><div class='ctx'> 		f2fs_inode_synced(dn-&gt;inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clear_node_page_dirty(dn-&gt;node_page);</div><div class='add'>+	clear_node_folio_dirty(dn-&gt;node_folio);</div><div class='ctx'> 	set_sbi_flag(sbi, SBI_IS_DIRTY);</div><div class='ctx'> </div><div class='del'>-	index = dn-&gt;node_page-&gt;index;</div><div class='del'>-	f2fs_put_page(dn-&gt;node_page, 1);</div><div class='add'>+	index = dn-&gt;node_folio-&gt;index;</div><div class='add'>+	f2fs_folio_put(dn-&gt;node_folio, true);</div><div class='ctx'> </div><div class='ctx'> 	invalidate_mapping_pages(NODE_MAPPING(sbi),</div><div class='ctx'> 			index, index);</div><div class='ctx'> </div><div class='del'>-	dn-&gt;node_page = NULL;</div><div class='add'>+	dn-&gt;node_folio = NULL;</div><div class='ctx'> 	trace_f2fs_truncate_node(dn-&gt;inode, dn-&gt;nid, ni.blk_addr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -926,35 +988,35 @@ static int truncate_node(struct dnode_of_data *dn)</div><div class='ctx'> static int truncate_dnode(struct dnode_of_data *dn)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dn-&gt;inode);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (dn-&gt;nid == 0)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* get direct node */</div><div class='del'>-	page = f2fs_get_node_page(sbi, dn-&gt;nid);</div><div class='del'>-	if (PTR_ERR(page) == -ENOENT)</div><div class='add'>+	folio = f2fs_get_node_folio(sbi, dn-&gt;nid, NODE_TYPE_NON_INODE);</div><div class='add'>+	if (PTR_ERR(folio) == -ENOENT)</div><div class='ctx'> 		return 1;</div><div class='del'>-	else if (IS_ERR(page))</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+	else if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	if (IS_INODE(page) || ino_of_node(page) != dn-&gt;inode-&gt;i_ino) {</div><div class='add'>+	if (IS_INODE(folio) || ino_of_node(folio) != dn-&gt;inode-&gt;i_ino) {</div><div class='ctx'> 		f2fs_err(sbi, "incorrect node reference, ino: %lu, nid: %u, ino_of_node: %u",</div><div class='del'>-				dn-&gt;inode-&gt;i_ino, dn-&gt;nid, ino_of_node(page));</div><div class='add'>+				dn-&gt;inode-&gt;i_ino, dn-&gt;nid, ino_of_node(folio));</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='ctx'> 		f2fs_handle_error(sbi, ERROR_INVALID_NODE_REFERENCE);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make dnode_of_data for parameter */</div><div class='del'>-	dn-&gt;node_page = page;</div><div class='add'>+	dn-&gt;node_folio = folio;</div><div class='ctx'> 	dn-&gt;ofs_in_node = 0;</div><div class='ctx'> 	f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn-&gt;inode));</div><div class='ctx'> 	err = truncate_node(dn);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -965,7 +1027,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,</div><div class='ctx'> 						int ofs, int depth)</div><div class='ctx'> {</div><div class='ctx'> 	struct dnode_of_data rdn = *dn;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct f2fs_node *rn;</div><div class='ctx'> 	nid_t child_nid;</div><div class='ctx'> 	unsigned int child_nofs;</div><div class='hunk'>@@ -977,15 +1039,16 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_truncate_nodes_enter(dn-&gt;inode, dn-&gt;nid, dn-&gt;data_blkaddr);</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_node_page(F2FS_I_SB(dn-&gt;inode), dn-&gt;nid);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		trace_f2fs_truncate_nodes_exit(dn-&gt;inode, PTR_ERR(page));</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+	folio = f2fs_get_node_folio(F2FS_I_SB(dn-&gt;inode), dn-&gt;nid,</div><div class='add'>+						NODE_TYPE_NON_INODE);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		trace_f2fs_truncate_nodes_exit(dn-&gt;inode, PTR_ERR(folio));</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_ra_node_pages(page, ofs, NIDS_PER_BLOCK);</div><div class='add'>+	f2fs_ra_node_pages(folio, ofs, NIDS_PER_BLOCK);</div><div class='ctx'> </div><div class='del'>-	rn = F2FS_NODE(page);</div><div class='add'>+	rn = F2FS_NODE(folio);</div><div class='ctx'> 	if (depth &lt; 3) {</div><div class='ctx'> 		for (i = ofs; i &lt; NIDS_PER_BLOCK; i++, freed++) {</div><div class='ctx'> 			child_nid = le32_to_cpu(rn-&gt;in.nid[i]);</div><div class='hunk'>@@ -995,7 +1058,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,</div><div class='ctx'> 			ret = truncate_dnode(&amp;rdn);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out_err;</div><div class='del'>-			if (set_nid(page, i, 0, false))</div><div class='add'>+			if (set_nid(folio, i, 0, false))</div><div class='ctx'> 				dn-&gt;node_changed = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1009,7 +1072,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,</div><div class='ctx'> 			rdn.nid = child_nid;</div><div class='ctx'> 			ret = truncate_nodes(&amp;rdn, child_nofs, 0, depth - 1);</div><div class='ctx'> 			if (ret == (NIDS_PER_BLOCK + 1)) {</div><div class='del'>-				if (set_nid(page, i, 0, false))</div><div class='add'>+				if (set_nid(folio, i, 0, false))</div><div class='ctx'> 					dn-&gt;node_changed = true;</div><div class='ctx'> 				child_nofs += ret;</div><div class='ctx'> 			} else if (ret &lt; 0 &amp;&amp; ret != -ENOENT) {</div><div class='hunk'>@@ -1021,19 +1084,19 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,</div><div class='ctx'> </div><div class='ctx'> 	if (!ofs) {</div><div class='ctx'> 		/* remove current indirect node */</div><div class='del'>-		dn-&gt;node_page = page;</div><div class='add'>+		dn-&gt;node_folio = folio;</div><div class='ctx'> 		ret = truncate_node(dn);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		freed++;</div><div class='ctx'> 	} else {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_f2fs_truncate_nodes_exit(dn-&gt;inode, freed);</div><div class='ctx'> 	return freed;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	trace_f2fs_truncate_nodes_exit(dn-&gt;inode, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1041,59 +1104,60 @@ out_err:</div><div class='ctx'> static int truncate_partial_nodes(struct dnode_of_data *dn,</div><div class='ctx'> 			struct f2fs_inode *ri, int *offset, int depth)</div><div class='ctx'> {</div><div class='del'>-	struct page *pages[2];</div><div class='add'>+	struct folio *folios[2];</div><div class='ctx'> 	nid_t nid[3];</div><div class='ctx'> 	nid_t child_nid;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int idx = depth - 2;</div><div class='ctx'> </div><div class='del'>-	nid[0] = le32_to_cpu(ri-&gt;i_nid[offset[0] - NODE_DIR1_BLOCK]);</div><div class='add'>+	nid[0] = get_nid(dn-&gt;inode_folio, offset[0], true);</div><div class='ctx'> 	if (!nid[0])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* get indirect nodes in the path */</div><div class='ctx'> 	for (i = 0; i &lt; idx + 1; i++) {</div><div class='ctx'> 		/* reference count'll be increased */</div><div class='del'>-		pages[i] = f2fs_get_node_page(F2FS_I_SB(dn-&gt;inode), nid[i]);</div><div class='del'>-		if (IS_ERR(pages[i])) {</div><div class='del'>-			err = PTR_ERR(pages[i]);</div><div class='add'>+		folios[i] = f2fs_get_node_folio(F2FS_I_SB(dn-&gt;inode), nid[i],</div><div class='add'>+							NODE_TYPE_NON_INODE);</div><div class='add'>+		if (IS_ERR(folios[i])) {</div><div class='add'>+			err = PTR_ERR(folios[i]);</div><div class='ctx'> 			idx = i - 1;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='del'>-		nid[i + 1] = get_nid(pages[i], offset[i + 1], false);</div><div class='add'>+		nid[i + 1] = get_nid(folios[i], offset[i + 1], false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_ra_node_pages(pages[idx], offset[idx + 1], NIDS_PER_BLOCK);</div><div class='add'>+	f2fs_ra_node_pages(folios[idx], offset[idx + 1], NIDS_PER_BLOCK);</div><div class='ctx'> </div><div class='ctx'> 	/* free direct nodes linked to a partial indirect node */</div><div class='ctx'> 	for (i = offset[idx + 1]; i &lt; NIDS_PER_BLOCK; i++) {</div><div class='del'>-		child_nid = get_nid(pages[idx], i, false);</div><div class='add'>+		child_nid = get_nid(folios[idx], i, false);</div><div class='ctx'> 		if (!child_nid)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		dn-&gt;nid = child_nid;</div><div class='ctx'> 		err = truncate_dnode(dn);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='del'>-		if (set_nid(pages[idx], i, 0, false))</div><div class='add'>+		if (set_nid(folios[idx], i, 0, false))</div><div class='ctx'> 			dn-&gt;node_changed = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (offset[idx + 1] == 0) {</div><div class='del'>-		dn-&gt;node_page = pages[idx];</div><div class='add'>+		dn-&gt;node_folio = folios[idx];</div><div class='ctx'> 		dn-&gt;nid = nid[idx];</div><div class='ctx'> 		err = truncate_node(dn);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	} else {</div><div class='del'>-		f2fs_put_page(pages[idx], 1);</div><div class='add'>+		f2fs_folio_put(folios[idx], true);</div><div class='ctx'> 	}</div><div class='ctx'> 	offset[idx]++;</div><div class='ctx'> 	offset[idx + 1] = 0;</div><div class='ctx'> 	idx--;</div><div class='ctx'> fail:</div><div class='ctx'> 	for (i = idx; i &gt;= 0; i--)</div><div class='del'>-		f2fs_put_page(pages[i], 1);</div><div class='add'>+		f2fs_folio_put(folios[i], true);</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_truncate_partial_nodes(dn-&gt;inode, nid, depth, err);</div><div class='ctx'> </div><div class='hunk'>@@ -1111,26 +1175,33 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from)</div><div class='ctx'> 	unsigned int nofs = 0;</div><div class='ctx'> 	struct f2fs_inode *ri;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	trace_f2fs_truncate_inode_blocks_enter(inode, from);</div><div class='ctx'> </div><div class='ctx'> 	level = get_node_path(inode, from, offset, noffset);</div><div class='del'>-	if (level &lt; 0) {</div><div class='add'>+	if (level &lt;= 0) {</div><div class='add'>+		if (!level) {</div><div class='add'>+			level = -EFSCORRUPTED;</div><div class='add'>+			f2fs_err(sbi, "%s: inode ino=%lx has corrupted node block, from:%lu addrs:%u",</div><div class='add'>+					__func__, inode-&gt;i_ino,</div><div class='add'>+					from, ADDRS_PER_INODE(inode));</div><div class='add'>+			set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+		}</div><div class='ctx'> 		trace_f2fs_truncate_inode_blocks_exit(inode, level);</div><div class='ctx'> 		return level;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		trace_f2fs_truncate_inode_blocks_exit(inode, PTR_ERR(page));</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+	folio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		trace_f2fs_truncate_inode_blocks_exit(inode, PTR_ERR(folio));</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, page, NULL, 0);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, folio, NULL, 0);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='del'>-	ri = F2FS_INODE(page);</div><div class='add'>+	ri = F2FS_INODE(folio);</div><div class='ctx'> 	switch (level) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -1159,7 +1230,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from)</div><div class='ctx'> </div><div class='ctx'> skip_partial:</div><div class='ctx'> 	while (cont) {</div><div class='del'>-		dn.nid = le32_to_cpu(ri-&gt;i_nid[offset[0] - NODE_DIR1_BLOCK]);</div><div class='add'>+		dn.nid = get_nid(folio, offset[0], true);</div><div class='ctx'> 		switch (offset[0]) {</div><div class='ctx'> 		case NODE_DIR1_BLOCK:</div><div class='ctx'> 		case NODE_DIR2_BLOCK:</div><div class='hunk'>@@ -1179,23 +1250,30 @@ skip_partial:</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='del'>-		if (err &lt; 0 &amp;&amp; err != -ENOENT)</div><div class='add'>+		if (err == -ENOENT) {</div><div class='add'>+			set_sbi_flag(F2FS_F_SB(folio), SBI_NEED_FSCK);</div><div class='add'>+			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+			f2fs_err_ratelimited(sbi,</div><div class='add'>+				"truncate node fail, ino:%lu, nid:%u, "</div><div class='add'>+				"offset[0]:%d, offset[1]:%d, nofs:%d",</div><div class='add'>+				inode-&gt;i_ino, dn.nid, offset[0],</div><div class='add'>+				offset[1], nofs);</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='del'>-		if (offset[1] == 0 &amp;&amp;</div><div class='del'>-				ri-&gt;i_nid[offset[0] - NODE_DIR1_BLOCK]) {</div><div class='del'>-			lock_page(page);</div><div class='del'>-			BUG_ON(page-&gt;mapping != NODE_MAPPING(sbi));</div><div class='del'>-			f2fs_wait_on_page_writeback(page, NODE, true, true);</div><div class='del'>-			ri-&gt;i_nid[offset[0] - NODE_DIR1_BLOCK] = 0;</div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			unlock_page(page);</div><div class='add'>+		if (offset[1] == 0 &amp;&amp; get_nid(folio, offset[0], true)) {</div><div class='add'>+			folio_lock(folio);</div><div class='add'>+			BUG_ON(!is_node_folio(folio));</div><div class='add'>+			set_nid(folio, offset[0], 0, true);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 		offset[1] = 0;</div><div class='ctx'> 		offset[0]++;</div><div class='ctx'> 		nofs += err;</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='del'>-	f2fs_put_page(page, 0);</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='ctx'> 	trace_f2fs_truncate_inode_blocks_exit(inode, err);</div><div class='ctx'> 	return err &gt; 0 ? 0 : err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1206,20 +1284,20 @@ int f2fs_truncate_xattr_node(struct inode *inode)</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	nid_t nid = F2FS_I(inode)-&gt;i_xattr_nid;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='del'>-	struct page *npage;</div><div class='add'>+	struct folio *nfolio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!nid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	npage = f2fs_get_node_page(sbi, nid);</div><div class='del'>-	if (IS_ERR(npage))</div><div class='del'>-		return PTR_ERR(npage);</div><div class='add'>+	nfolio = f2fs_get_xnode_folio(sbi, nid);</div><div class='add'>+	if (IS_ERR(nfolio))</div><div class='add'>+		return PTR_ERR(nfolio);</div><div class='ctx'> </div><div class='del'>-	set_new_dnode(&amp;dn, inode, NULL, npage, nid);</div><div class='add'>+	set_new_dnode(&amp;dn, inode, NULL, nfolio, nid);</div><div class='ctx'> 	err = truncate_node(&amp;dn);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		f2fs_put_page(npage, 1);</div><div class='add'>+		f2fs_folio_put(nfolio, true);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1249,8 +1327,9 @@ int f2fs_remove_inode_page(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* remove potential inline_data blocks */</div><div class='del'>-	if (S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode) ||</div><div class='del'>-				S_ISLNK(inode-&gt;i_mode))</div><div class='add'>+	if (!IS_DEVICE_ALIASING(inode) &amp;&amp;</div><div class='add'>+	    (S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode) ||</div><div class='add'>+	     S_ISLNK(inode-&gt;i_mode)))</div><div class='ctx'> 		f2fs_truncate_data_blocks_range(&amp;dn, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* 0 is possible, after f2fs_new_inode() has failed */</div><div class='hunk'>@@ -1275,30 +1354,30 @@ int f2fs_remove_inode_page(struct inode *inode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_new_inode_page(struct inode *inode)</div><div class='add'>+struct folio *f2fs_new_inode_folio(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate inode page for new inode */</div><div class='ctx'> 	set_new_dnode(&amp;dn, inode, NULL, NULL, inode-&gt;i_ino);</div><div class='ctx'> </div><div class='del'>-	/* caller should f2fs_put_page(page, 1); */</div><div class='del'>-	return f2fs_new_node_page(&amp;dn, 0);</div><div class='add'>+	/* caller should f2fs_folio_put(folio, true); */</div><div class='add'>+	return f2fs_new_node_folio(&amp;dn, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs)</div><div class='add'>+struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(dn-&gt;inode);</div><div class='ctx'> 	struct node_info new_ni;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_inode_flag_set(dn-&gt;inode, FI_NO_ALLOC)))</div><div class='ctx'> 		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_cache_page(NODE_MAPPING(sbi), dn-&gt;nid, false);</div><div class='del'>-	if (!page)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	folio = f2fs_grab_cache_folio(NODE_MAPPING(sbi), dn-&gt;nid, false);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely((err = inc_valid_node_count(sbi, dn-&gt;inode, !ofs))))</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -1311,8 +1390,14 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(new_ni.blk_addr != NULL_ADDR)) {</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='add'>+		dec_valid_node_count(sbi, dn-&gt;inode, !ofs);</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-		f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='add'>+		f2fs_warn_ratelimited(sbi,</div><div class='add'>+			"f2fs_new_node_folio: inconsistent nat entry, "</div><div class='add'>+			"ino:%u, nid:%u, blkaddr:%u, ver:%u, flag:%u",</div><div class='add'>+			new_ni.ino, new_ni.nid, new_ni.blk_addr,</div><div class='add'>+			new_ni.version, new_ni.flag);</div><div class='add'>+		f2fs_handle_error(sbi, ERROR_INCONSISTENT_NAT);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1323,12 +1408,12 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs)</div><div class='ctx'> 	new_ni.version = 0;</div><div class='ctx'> 	set_node_addr(sbi, &amp;new_ni, NEW_ADDR, false);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(page, NODE, true, true);</div><div class='del'>-	fill_node_footer(page, dn-&gt;nid, dn-&gt;inode-&gt;i_ino, ofs, true);</div><div class='del'>-	set_cold_node(page, S_ISDIR(dn-&gt;inode-&gt;i_mode));</div><div class='del'>-	if (!PageUptodate(page))</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	if (set_page_dirty(page))</div><div class='add'>+	f2fs_folio_wait_writeback(folio, NODE, true, true);</div><div class='add'>+	fill_node_footer(folio, dn-&gt;nid, dn-&gt;inode-&gt;i_ino, ofs, true);</div><div class='add'>+	set_cold_node(folio, S_ISDIR(dn-&gt;inode-&gt;i_mode));</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='add'>+	if (folio_mark_dirty(folio))</div><div class='ctx'> 		dn-&gt;node_changed = true;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_xattr_block(ofs))</div><div class='hunk'>@@ -1336,48 +1421,47 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs)</div><div class='ctx'> </div><div class='ctx'> 	if (ofs == 0)</div><div class='ctx'> 		inc_valid_inode_count(sbi);</div><div class='del'>-	return page;</div><div class='del'>-</div><div class='add'>+	return folio;</div><div class='ctx'> fail:</div><div class='del'>-	clear_node_page_dirty(page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	clear_node_folio_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Caller should do after getting the following values.</div><div class='del'>- * 0: f2fs_put_page(page, 0)</div><div class='del'>- * LOCKED_PAGE or error: f2fs_put_page(page, 1)</div><div class='add'>+ * 0: f2fs_folio_put(folio, false)</div><div class='add'>+ * LOCKED_PAGE or error: f2fs_folio_put(folio, true)</div><div class='ctx'>  */</div><div class='del'>-static int read_node_page(struct page *page, blk_opf_t op_flags)</div><div class='add'>+static int read_node_folio(struct folio *folio, blk_opf_t op_flags)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(page);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(folio);</div><div class='ctx'> 	struct node_info ni;</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = sbi,</div><div class='ctx'> 		.type = NODE,</div><div class='ctx'> 		.op = REQ_OP_READ,</div><div class='ctx'> 		.op_flags = op_flags,</div><div class='del'>-		.page = page,</div><div class='add'>+		.folio = folio,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (PageUptodate(page)) {</div><div class='del'>-		if (!f2fs_inode_chksum_verify(sbi, page)) {</div><div class='del'>-			ClearPageUptodate(page);</div><div class='add'>+	if (folio_test_uptodate(folio)) {</div><div class='add'>+		if (!f2fs_inode_chksum_verify(sbi, folio)) {</div><div class='add'>+			folio_clear_uptodate(folio);</div><div class='ctx'> 			return -EFSBADCRC;</div><div class='ctx'> 		}</div><div class='ctx'> 		return LOCKED_PAGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = f2fs_get_node_info(sbi, page-&gt;index, &amp;ni, false);</div><div class='add'>+	err = f2fs_get_node_info(sbi, folio-&gt;index, &amp;ni, false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* NEW_ADDR can be seen, after cp_error drops some dirty node pages */</div><div class='ctx'> 	if (unlikely(ni.blk_addr == NULL_ADDR || ni.blk_addr == NEW_ADDR)) {</div><div class='del'>-		ClearPageUptodate(page);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1396,7 +1480,7 @@ static int read_node_page(struct page *page, blk_opf_t op_flags)</div><div class='ctx'>  */</div><div class='ctx'> void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	struct page *apage;</div><div class='add'>+	struct folio *afolio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!nid)</div><div class='hunk'>@@ -1404,22 +1488,59 @@ void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> 	if (f2fs_check_nid_range(sbi, nid))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	apage = xa_load(&amp;NODE_MAPPING(sbi)-&gt;i_pages, nid);</div><div class='del'>-	if (apage)</div><div class='add'>+	afolio = xa_load(&amp;NODE_MAPPING(sbi)-&gt;i_pages, nid);</div><div class='add'>+	if (afolio)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	apage = f2fs_grab_cache_page(NODE_MAPPING(sbi), nid, false);</div><div class='del'>-	if (!apage)</div><div class='add'>+	afolio = f2fs_grab_cache_folio(NODE_MAPPING(sbi), nid, false);</div><div class='add'>+	if (IS_ERR(afolio))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	err = read_node_page(apage, REQ_RAHEAD);</div><div class='del'>-	f2fs_put_page(apage, err ? 1 : 0);</div><div class='add'>+	err = read_node_folio(afolio, REQ_RAHEAD);</div><div class='add'>+	f2fs_folio_put(afolio, err ? true : false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sanity_check_node_footer(struct f2fs_sb_info *sbi,</div><div class='add'>+					struct folio *folio, pgoff_t nid,</div><div class='add'>+					enum node_type ntype)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(nid != nid_of_node(folio)))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	switch (ntype) {</div><div class='add'>+	case NODE_TYPE_INODE:</div><div class='add'>+		if (!IS_INODE(folio))</div><div class='add'>+			goto out_err;</div><div class='add'>+		break;</div><div class='add'>+	case NODE_TYPE_XATTR:</div><div class='add'>+		if (!f2fs_has_xattr_block(ofs_of_node(folio)))</div><div class='add'>+			goto out_err;</div><div class='add'>+		break;</div><div class='add'>+	case NODE_TYPE_NON_INODE:</div><div class='add'>+		if (IS_INODE(folio))</div><div class='add'>+			goto out_err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (time_to_inject(sbi, FAULT_INCONSISTENT_FOOTER))</div><div class='add'>+		goto out_err;</div><div class='add'>+	return 0;</div><div class='add'>+out_err:</div><div class='add'>+	f2fs_warn(sbi, "inconsistent node block, node_type:%d, nid:%lu, "</div><div class='add'>+		  "node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",</div><div class='add'>+		  ntype, nid, nid_of_node(folio), ino_of_node(folio),</div><div class='add'>+		  ofs_of_node(folio), cpver_of_node(folio),</div><div class='add'>+		  next_blkaddr_of_node(folio));</div><div class='add'>+	set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='add'>+	f2fs_handle_error(sbi, ERROR_INCONSISTENT_FOOTER);</div><div class='add'>+	return -EFSCORRUPTED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid,</div><div class='del'>-					struct page *parent, int start)</div><div class='add'>+static struct folio *__get_node_folio(struct f2fs_sb_info *sbi, pgoff_t nid,</div><div class='add'>+		struct folio *parent, int start, enum node_type ntype)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!nid)</div><div class='hunk'>@@ -1427,75 +1548,77 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid,</div><div class='ctx'> 	if (f2fs_check_nid_range(sbi, nid))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> repeat:</div><div class='del'>-	page = f2fs_grab_cache_page(NODE_MAPPING(sbi), nid, false);</div><div class='del'>-	if (!page)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	folio = f2fs_grab_cache_folio(NODE_MAPPING(sbi), nid, false);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='del'>-	err = read_node_page(page, 0);</div><div class='del'>-	if (err &lt; 0) {</div><div class='add'>+	err = read_node_folio(folio, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto out_put_err;</div><div class='del'>-	} else if (err == LOCKED_PAGE) {</div><div class='del'>-		err = 0;</div><div class='add'>+	if (err == LOCKED_PAGE)</div><div class='ctx'> 		goto page_hit;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		f2fs_ra_node_pages(parent, start + 1, MAX_RA_NODE);</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='add'>+	folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(page-&gt;mapping != NODE_MAPPING(sbi))) {</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+	if (unlikely(!is_node_folio(folio))) {</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!PageUptodate(page))) {</div><div class='add'>+	if (unlikely(!folio_test_uptodate(folio))) {</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		goto out_err;</div><div class='add'>+		goto out_put_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_inode_chksum_verify(sbi, page)) {</div><div class='add'>+	if (!f2fs_inode_chksum_verify(sbi, folio)) {</div><div class='ctx'> 		err = -EFSBADCRC;</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> page_hit:</div><div class='del'>-	if (likely(nid == nid_of_node(page)))</div><div class='del'>-		return page;</div><div class='del'>-</div><div class='del'>-	f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",</div><div class='del'>-			  nid, nid_of_node(page), ino_of_node(page),</div><div class='del'>-			  ofs_of_node(page), cpver_of_node(page),</div><div class='del'>-			  next_blkaddr_of_node(page));</div><div class='del'>-	set_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='del'>-	f2fs_handle_error(sbi, ERROR_INCONSISTENT_FOOTER);</div><div class='del'>-	err = -EFSCORRUPTED;</div><div class='add'>+	err = sanity_check_node_footer(sbi, folio, nid, ntype);</div><div class='add'>+	if (!err)</div><div class='add'>+		return folio;</div><div class='ctx'> out_err:</div><div class='del'>-	ClearPageUptodate(page);</div><div class='add'>+	folio_clear_uptodate(folio);</div><div class='ctx'> out_put_err:</div><div class='del'>-	/* ENOENT comes from read_node_page which is not an error. */</div><div class='add'>+	/* ENOENT comes from read_node_folio which is not an error. */</div><div class='ctx'> 	if (err != -ENOENT)</div><div class='del'>-		f2fs_handle_page_eio(sbi, page-&gt;index, NODE);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+		f2fs_handle_page_eio(sbi, folio, NODE);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid)</div><div class='add'>+struct folio *f2fs_get_node_folio(struct f2fs_sb_info *sbi, pgoff_t nid,</div><div class='add'>+						enum node_type node_type)</div><div class='add'>+{</div><div class='add'>+	return __get_node_folio(sbi, nid, NULL, 0, node_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct folio *f2fs_get_inode_folio(struct f2fs_sb_info *sbi, pgoff_t ino)</div><div class='add'>+{</div><div class='add'>+	return __get_node_folio(sbi, ino, NULL, 0, NODE_TYPE_INODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct folio *f2fs_get_xnode_folio(struct f2fs_sb_info *sbi, pgoff_t xnid)</div><div class='ctx'> {</div><div class='del'>-	return __get_node_page(sbi, nid, NULL, 0);</div><div class='add'>+	return __get_node_folio(sbi, xnid, NULL, 0, NODE_TYPE_XATTR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *f2fs_get_node_page_ra(struct page *parent, int start)</div><div class='add'>+static struct folio *f2fs_get_node_folio_ra(struct folio *parent, int start)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(parent);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(parent);</div><div class='ctx'> 	nid_t nid = get_nid(parent, start, false);</div><div class='ctx'> </div><div class='del'>-	return __get_node_page(sbi, nid, parent, start);</div><div class='add'>+	return __get_node_folio(sbi, nid, parent, start, NODE_TYPE_REGULAR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* should flush inline_data before evict_inode */</div><div class='hunk'>@@ -1503,36 +1626,36 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_pagecache_get_page(inode-&gt;i_mapping, 0,</div><div class='add'>+	folio = f2fs_filemap_get_folio(inode-&gt;i_mapping, 0,</div><div class='ctx'> 					FGP_LOCK|FGP_NOWAIT, 0);</div><div class='del'>-	if (!page)</div><div class='add'>+	if (IS_ERR(folio))</div><div class='ctx'> 		goto iput_out;</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page))</div><div class='del'>-		goto page_out;</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		goto folio_out;</div><div class='ctx'> </div><div class='del'>-	if (!PageDirty(page))</div><div class='del'>-		goto page_out;</div><div class='add'>+	if (!folio_test_dirty(folio))</div><div class='add'>+		goto folio_out;</div><div class='ctx'> </div><div class='del'>-	if (!clear_page_dirty_for_io(page))</div><div class='del'>-		goto page_out;</div><div class='add'>+	if (!folio_clear_dirty_for_io(folio))</div><div class='add'>+		goto folio_out;</div><div class='ctx'> </div><div class='del'>-	ret = f2fs_write_inline_data(inode, page);</div><div class='add'>+	ret = f2fs_write_inline_data(inode, folio);</div><div class='ctx'> 	inode_dec_dirty_pages(inode);</div><div class='ctx'> 	f2fs_remove_dirty_inode(inode);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-page_out:</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+folio_out:</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> iput_out:</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='add'>+static struct folio *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t index;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='del'>-	struct page *last_page = NULL;</div><div class='add'>+	struct folio *last_folio = NULL;</div><div class='ctx'> 	int nr_folios;</div><div class='ctx'> </div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='hunk'>@@ -1544,61 +1667,61 @@ static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; nr_folios; i++) {</div><div class='del'>-			struct page *page = &amp;fbatch.folios[i]-&gt;page;</div><div class='add'>+			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> </div><div class='ctx'> 			if (unlikely(f2fs_cp_error(sbi))) {</div><div class='del'>-				f2fs_put_page(last_page, 0);</div><div class='add'>+				f2fs_folio_put(last_folio, false);</div><div class='ctx'> 				folio_batch_release(&amp;fbatch);</div><div class='ctx'> 				return ERR_PTR(-EIO);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!IS_DNODE(page) || !is_cold_node(page))</div><div class='add'>+			if (!IS_DNODE(folio) || !is_cold_node(folio))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (ino_of_node(page) != ino)</div><div class='add'>+			if (ino_of_node(folio) != ino)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			lock_page(page);</div><div class='add'>+			folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(page-&gt;mapping != NODE_MAPPING(sbi))) {</div><div class='add'>+			if (unlikely(!is_node_folio(folio))) {</div><div class='ctx'> continue_unlock:</div><div class='del'>-				unlock_page(page);</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			if (ino_of_node(page) != ino)</div><div class='add'>+			if (ino_of_node(folio) != ino)</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-			if (!PageDirty(page)) {</div><div class='add'>+			if (!folio_test_dirty(folio)) {</div><div class='ctx'> 				/* someone wrote it for us */</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (last_page)</div><div class='del'>-				f2fs_put_page(last_page, 0);</div><div class='add'>+			if (last_folio)</div><div class='add'>+				f2fs_folio_put(last_folio, false);</div><div class='ctx'> </div><div class='del'>-			get_page(page);</div><div class='del'>-			last_page = page;</div><div class='del'>-			unlock_page(page);</div><div class='add'>+			folio_get(folio);</div><div class='add'>+			last_folio = folio;</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 		folio_batch_release(&amp;fbatch);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	return last_page;</div><div class='add'>+	return last_folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __write_node_page(struct page *page, bool atomic, bool *submitted,</div><div class='add'>+static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted,</div><div class='ctx'> 				struct writeback_control *wbc, bool do_balance,</div><div class='ctx'> 				enum iostat_type io_type, unsigned int *seq_id)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(page);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(folio);</div><div class='ctx'> 	nid_t nid;</div><div class='ctx'> 	struct node_info ni;</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='ctx'> 		.sbi = sbi,</div><div class='del'>-		.ino = ino_of_node(page),</div><div class='add'>+		.ino = ino_of_node(folio),</div><div class='ctx'> 		.type = NODE,</div><div class='ctx'> 		.op = REQ_OP_WRITE,</div><div class='ctx'> 		.op_flags = wbc_to_write_flags(wbc),</div><div class='del'>-		.page = page,</div><div class='add'>+		.folio = folio,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.submitted = 0,</div><div class='ctx'> 		.io_type = io_type,</div><div class='hunk'>@@ -1606,16 +1729,16 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int seq;</div><div class='ctx'> </div><div class='del'>-	trace_f2fs_writepage(page, NODE);</div><div class='add'>+	trace_f2fs_writepage(folio, NODE);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='ctx'> 		/* keep node pages in remount-ro mode */</div><div class='ctx'> 		if (F2FS_OPTION(sbi).errors == MOUNT_ERRORS_READONLY)</div><div class='ctx'> 			goto redirty_out;</div><div class='del'>-		ClearPageUptodate(page);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='ctx'> 		dec_page_count(sbi, F2FS_DIRTY_NODES);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return 0;</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))</div><div class='hunk'>@@ -1623,30 +1746,25 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,</div><div class='ctx'> </div><div class='ctx'> 	if (!is_sbi_flag_set(sbi, SBI_CP_DISABLED) &amp;&amp;</div><div class='ctx'> 			wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='del'>-			IS_DNODE(page) &amp;&amp; is_cold_node(page))</div><div class='add'>+			IS_DNODE(folio) &amp;&amp; is_cold_node(folio))</div><div class='ctx'> 		goto redirty_out;</div><div class='ctx'> </div><div class='ctx'> 	/* get old block addr of this node page */</div><div class='del'>-	nid = nid_of_node(page);</div><div class='del'>-	f2fs_bug_on(sbi, page-&gt;index != nid);</div><div class='add'>+	nid = nid_of_node(folio);</div><div class='add'>+	f2fs_bug_on(sbi, folio-&gt;index != nid);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_get_node_info(sbi, nid, &amp;ni, !do_balance))</div><div class='ctx'> 		goto redirty_out;</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;for_reclaim) {</div><div class='del'>-		if (!f2fs_down_read_trylock(&amp;sbi-&gt;node_write))</div><div class='del'>-			goto redirty_out;</div><div class='del'>-	} else {</div><div class='del'>-		f2fs_down_read(&amp;sbi-&gt;node_write);</div><div class='del'>-	}</div><div class='add'>+	f2fs_down_read(&amp;sbi-&gt;node_write);</div><div class='ctx'> </div><div class='ctx'> 	/* This page is already truncated */</div><div class='ctx'> 	if (unlikely(ni.blk_addr == NULL_ADDR)) {</div><div class='del'>-		ClearPageUptodate(page);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='ctx'> 		dec_page_count(sbi, F2FS_DIRTY_NODES);</div><div class='ctx'> 		f2fs_up_read(&amp;sbi-&gt;node_write);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return 0;</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (__is_valid_data_blkaddr(ni.blk_addr) &amp;&amp;</div><div class='hunk'>@@ -1656,30 +1774,25 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,</div><div class='ctx'> 		goto redirty_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (atomic &amp;&amp; !test_opt(sbi, NOBARRIER) &amp;&amp; !f2fs_sb_has_blkzoned(sbi))</div><div class='add'>+	if (atomic &amp;&amp; !test_opt(sbi, NOBARRIER))</div><div class='ctx'> 		fio.op_flags |= REQ_PREFLUSH | REQ_FUA;</div><div class='ctx'> </div><div class='ctx'> 	/* should add to global list before clearing PAGECACHE status */</div><div class='del'>-	if (f2fs_in_warm_node_list(sbi, page)) {</div><div class='del'>-		seq = f2fs_add_fsync_node_entry(sbi, page);</div><div class='add'>+	if (f2fs_in_warm_node_list(sbi, folio)) {</div><div class='add'>+		seq = f2fs_add_fsync_node_entry(sbi, folio);</div><div class='ctx'> 		if (seq_id)</div><div class='ctx'> 			*seq_id = seq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	fio.old_blkaddr = ni.blk_addr;</div><div class='ctx'> 	f2fs_do_write_node_page(nid, &amp;fio);</div><div class='del'>-	set_node_addr(sbi, &amp;ni, fio.new_blkaddr, is_fsync_dnode(page));</div><div class='add'>+	set_node_addr(sbi, &amp;ni, fio.new_blkaddr, is_fsync_dnode(folio));</div><div class='ctx'> 	dec_page_count(sbi, F2FS_DIRTY_NODES);</div><div class='ctx'> 	f2fs_up_read(&amp;sbi-&gt;node_write);</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;for_reclaim) {</div><div class='del'>-		f2fs_submit_merged_write_cond(sbi, NULL, page, 0, NODE);</div><div class='del'>-		submitted = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi))) {</div><div class='ctx'> 		f2fs_submit_merged_write(sbi, NODE);</div><div class='hunk'>@@ -1690,14 +1803,15 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,</div><div class='ctx'> </div><div class='ctx'> 	if (do_balance)</div><div class='ctx'> 		f2fs_balance_fs(sbi, false);</div><div class='del'>-	return 0;</div><div class='add'>+	return true;</div><div class='ctx'> </div><div class='ctx'> redirty_out:</div><div class='del'>-	redirty_page_for_writepage(wbc, page);</div><div class='del'>-	return AOP_WRITEPAGE_ACTIVATE;</div><div class='add'>+	folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_move_node_page(struct page *node_page, int gc_type)</div><div class='add'>+int f2fs_move_node_folio(struct folio *node_folio, int gc_type)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1705,43 +1819,33 @@ int f2fs_move_node_page(struct page *node_page, int gc_type)</div><div class='ctx'> 		struct writeback_control wbc = {</div><div class='ctx'> 			.sync_mode = WB_SYNC_ALL,</div><div class='ctx'> 			.nr_to_write = 1,</div><div class='del'>-			.for_reclaim = 0,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		f2fs_wait_on_page_writeback(node_page, NODE, true, true);</div><div class='add'>+		f2fs_folio_wait_writeback(node_folio, NODE, true, true);</div><div class='ctx'> </div><div class='del'>-		set_page_dirty(node_page);</div><div class='add'>+		folio_mark_dirty(node_folio);</div><div class='ctx'> </div><div class='del'>-		if (!clear_page_dirty_for_io(node_page)) {</div><div class='add'>+		if (!folio_clear_dirty_for_io(node_folio)) {</div><div class='ctx'> 			err = -EAGAIN;</div><div class='ctx'> 			goto out_page;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (__write_node_page(node_page, false, NULL,</div><div class='del'>-					&amp;wbc, false, FS_GC_NODE_IO, NULL)) {</div><div class='add'>+		if (!__write_node_folio(node_folio, false, NULL,</div><div class='add'>+					&amp;wbc, false, FS_GC_NODE_IO, NULL))</div><div class='ctx'> 			err = -EAGAIN;</div><div class='del'>-			unlock_page(node_page);</div><div class='del'>-		}</div><div class='ctx'> 		goto release_page;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* set page dirty and write it */</div><div class='del'>-		if (!PageWriteback(node_page))</div><div class='del'>-			set_page_dirty(node_page);</div><div class='add'>+		if (!folio_test_writeback(node_folio))</div><div class='add'>+			folio_mark_dirty(node_folio);</div><div class='ctx'> 	}</div><div class='ctx'> out_page:</div><div class='del'>-	unlock_page(node_page);</div><div class='add'>+	folio_unlock(node_folio);</div><div class='ctx'> release_page:</div><div class='del'>-	f2fs_put_page(node_page, 0);</div><div class='add'>+	f2fs_folio_put(node_folio, false);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_write_node_page(struct page *page,</div><div class='del'>-				struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	return __write_node_page(page, false, NULL, wbc, false,</div><div class='del'>-						FS_NODE_IO, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,</div><div class='ctx'> 			struct writeback_control *wbc, bool atomic,</div><div class='ctx'> 			unsigned int *seq_id)</div><div class='hunk'>@@ -1749,16 +1853,16 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,</div><div class='ctx'> 	pgoff_t index;</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct page *last_page = NULL;</div><div class='add'>+	struct folio *last_folio = NULL;</div><div class='ctx'> 	bool marked = false;</div><div class='ctx'> 	nid_t ino = inode-&gt;i_ino;</div><div class='ctx'> 	int nr_folios;</div><div class='ctx'> 	int nwritten = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic) {</div><div class='del'>-		last_page = last_fsync_dnode(sbi, ino);</div><div class='del'>-		if (IS_ERR_OR_NULL(last_page))</div><div class='del'>-			return PTR_ERR_OR_ZERO(last_page);</div><div class='add'>+		last_folio = last_fsync_dnode(sbi, ino);</div><div class='add'>+		if (IS_ERR_OR_NULL(last_folio))</div><div class='add'>+			return PTR_ERR_OR_ZERO(last_folio);</div><div class='ctx'> 	}</div><div class='ctx'> retry:</div><div class='ctx'> 	folio_batch_init(&amp;fbatch);</div><div class='hunk'>@@ -1770,96 +1874,94 @@ retry:</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; nr_folios; i++) {</div><div class='del'>-			struct page *page = &amp;fbatch.folios[i]-&gt;page;</div><div class='add'>+			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> 			bool submitted = false;</div><div class='ctx'> </div><div class='ctx'> 			if (unlikely(f2fs_cp_error(sbi))) {</div><div class='del'>-				f2fs_put_page(last_page, 0);</div><div class='add'>+				f2fs_folio_put(last_folio, false);</div><div class='ctx'> 				folio_batch_release(&amp;fbatch);</div><div class='ctx'> 				ret = -EIO;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!IS_DNODE(page) || !is_cold_node(page))</div><div class='add'>+			if (!IS_DNODE(folio) || !is_cold_node(folio))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (ino_of_node(page) != ino)</div><div class='add'>+			if (ino_of_node(folio) != ino)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			lock_page(page);</div><div class='add'>+			folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(page-&gt;mapping != NODE_MAPPING(sbi))) {</div><div class='add'>+			if (unlikely(!is_node_folio(folio))) {</div><div class='ctx'> continue_unlock:</div><div class='del'>-				unlock_page(page);</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			if (ino_of_node(page) != ino)</div><div class='add'>+			if (ino_of_node(folio) != ino)</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-			if (!PageDirty(page) &amp;&amp; page != last_page) {</div><div class='add'>+			if (!folio_test_dirty(folio) &amp;&amp; folio != last_folio) {</div><div class='ctx'> 				/* someone wrote it for us */</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			f2fs_wait_on_page_writeback(page, NODE, true, true);</div><div class='add'>+			f2fs_folio_wait_writeback(folio, NODE, true, true);</div><div class='ctx'> </div><div class='del'>-			set_fsync_mark(page, 0);</div><div class='del'>-			set_dentry_mark(page, 0);</div><div class='add'>+			set_fsync_mark(folio, 0);</div><div class='add'>+			set_dentry_mark(folio, 0);</div><div class='ctx'> </div><div class='del'>-			if (!atomic || page == last_page) {</div><div class='del'>-				set_fsync_mark(page, 1);</div><div class='add'>+			if (!atomic || folio == last_folio) {</div><div class='add'>+				set_fsync_mark(folio, 1);</div><div class='ctx'> 				percpu_counter_inc(&amp;sbi-&gt;rf_node_block_count);</div><div class='del'>-				if (IS_INODE(page)) {</div><div class='add'>+				if (IS_INODE(folio)) {</div><div class='ctx'> 					if (is_inode_flag_set(inode,</div><div class='ctx'> 								FI_DIRTY_INODE))</div><div class='del'>-						f2fs_update_inode(inode, page);</div><div class='del'>-					set_dentry_mark(page,</div><div class='add'>+						f2fs_update_inode(inode, folio);</div><div class='add'>+					set_dentry_mark(folio,</div><div class='ctx'> 						f2fs_need_dentry_mark(sbi, ino));</div><div class='ctx'> 				}</div><div class='ctx'> 				/* may be written by other thread */</div><div class='del'>-				if (!PageDirty(page))</div><div class='del'>-					set_page_dirty(page);</div><div class='add'>+				if (!folio_test_dirty(folio))</div><div class='add'>+					folio_mark_dirty(folio);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!clear_page_dirty_for_io(page))</div><div class='add'>+			if (!folio_clear_dirty_for_io(folio))</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-			ret = __write_node_page(page, atomic &amp;&amp;</div><div class='del'>-						page == last_page,</div><div class='add'>+			if (!__write_node_folio(folio, atomic &amp;&amp;</div><div class='add'>+						folio == last_folio,</div><div class='ctx'> 						&amp;submitted, wbc, true,</div><div class='del'>-						FS_NODE_IO, seq_id);</div><div class='del'>-			if (ret) {</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				f2fs_put_page(last_page, 0);</div><div class='del'>-				break;</div><div class='del'>-			} else if (submitted) {</div><div class='del'>-				nwritten++;</div><div class='add'>+						FS_NODE_IO, seq_id)) {</div><div class='add'>+				f2fs_folio_put(last_folio, false);</div><div class='add'>+				folio_batch_release(&amp;fbatch);</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='add'>+			if (submitted)</div><div class='add'>+				nwritten++;</div><div class='ctx'> </div><div class='del'>-			if (page == last_page) {</div><div class='del'>-				f2fs_put_page(page, 0);</div><div class='add'>+			if (folio == last_folio) {</div><div class='add'>+				f2fs_folio_put(folio, false);</div><div class='add'>+				folio_batch_release(&amp;fbatch);</div><div class='ctx'> 				marked = true;</div><div class='del'>-				break;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		folio_batch_release(&amp;fbatch);</div><div class='ctx'> 		cond_resched();</div><div class='del'>-</div><div class='del'>-		if (ret || marked)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (!ret &amp;&amp; atomic &amp;&amp; !marked) {</div><div class='add'>+	if (atomic &amp;&amp; !marked) {</div><div class='ctx'> 		f2fs_debug(sbi, "Retry to write fsync mark: ino=%u, idx=%lx",</div><div class='del'>-			   ino, last_page-&gt;index);</div><div class='del'>-		lock_page(last_page);</div><div class='del'>-		f2fs_wait_on_page_writeback(last_page, NODE, true, true);</div><div class='del'>-		set_page_dirty(last_page);</div><div class='del'>-		unlock_page(last_page);</div><div class='add'>+			   ino, last_folio-&gt;index);</div><div class='add'>+		folio_lock(last_folio);</div><div class='add'>+		f2fs_folio_wait_writeback(last_folio, NODE, true, true);</div><div class='add'>+		folio_mark_dirty(last_folio);</div><div class='add'>+		folio_unlock(last_folio);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (nwritten)</div><div class='ctx'> 		f2fs_submit_merged_write_cond(sbi, NULL, NULL, ino, NODE);</div><div class='del'>-	return ret ? -EIO : 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_match_ino(struct inode *inode, unsigned long ino, void *data)</div><div class='hunk'>@@ -1886,18 +1988,18 @@ static int f2fs_match_ino(struct inode *inode, unsigned long ino, void *data)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool flush_dirty_inode(struct page *page)</div><div class='add'>+static bool flush_dirty_inode(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_P_SB(page);</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_F_SB(folio);</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	nid_t ino = ino_of_node(page);</div><div class='add'>+	nid_t ino = ino_of_node(folio);</div><div class='ctx'> </div><div class='ctx'> 	inode = find_inode_nowait(sbi-&gt;sb, ino, f2fs_match_ino, NULL);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	f2fs_update_inode(inode, page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	f2fs_update_inode(inode, folio);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	iput(inode);</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -1917,32 +2019,27 @@ void f2fs_flush_inline_data(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; nr_folios; i++) {</div><div class='del'>-			struct page *page = &amp;fbatch.folios[i]-&gt;page;</div><div class='add'>+			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> </div><div class='del'>-			if (!IS_DNODE(page))</div><div class='add'>+			if (!IS_INODE(folio))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			lock_page(page);</div><div class='add'>+			folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(page-&gt;mapping != NODE_MAPPING(sbi))) {</div><div class='del'>-continue_unlock:</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!PageDirty(page)) {</div><div class='del'>-				/* someone wrote it for us */</div><div class='del'>-				goto continue_unlock;</div><div class='del'>-			}</div><div class='add'>+			if (unlikely(!is_node_folio(folio)))</div><div class='add'>+				goto unlock;</div><div class='add'>+			if (!folio_test_dirty(folio))</div><div class='add'>+				goto unlock;</div><div class='ctx'> </div><div class='ctx'> 			/* flush inline_data, if it's async context. */</div><div class='del'>-			if (page_private_inline(page)) {</div><div class='del'>-				clear_page_private_inline(page);</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				flush_inline_data(sbi, ino_of_node(page));</div><div class='add'>+			if (folio_test_f2fs_inline(folio)) {</div><div class='add'>+				folio_clear_f2fs_inline(folio);</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				flush_inline_data(sbi, ino_of_node(folio));</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			unlock_page(page);</div><div class='add'>+unlock:</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 		folio_batch_release(&amp;fbatch);</div><div class='ctx'> 		cond_resched();</div><div class='hunk'>@@ -1971,7 +2068,7 @@ next_step:</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; nr_folios; i++) {</div><div class='del'>-			struct page *page = &amp;fbatch.folios[i]-&gt;page;</div><div class='add'>+			struct folio *folio = fbatch.folios[i];</div><div class='ctx'> 			bool submitted = false;</div><div class='ctx'> </div><div class='ctx'> 			/* give a priority to WB_SYNC threads */</div><div class='hunk'>@@ -1987,27 +2084,27 @@ next_step:</div><div class='ctx'> 			 * 1. dentry dnodes</div><div class='ctx'> 			 * 2. file dnodes</div><div class='ctx'> 			 */</div><div class='del'>-			if (step == 0 &amp;&amp; IS_DNODE(page))</div><div class='add'>+			if (step == 0 &amp;&amp; IS_DNODE(folio))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (step == 1 &amp;&amp; (!IS_DNODE(page) ||</div><div class='del'>-						is_cold_node(page)))</div><div class='add'>+			if (step == 1 &amp;&amp; (!IS_DNODE(folio) ||</div><div class='add'>+						is_cold_node(folio)))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (step == 2 &amp;&amp; (!IS_DNODE(page) ||</div><div class='del'>-						!is_cold_node(page)))</div><div class='add'>+			if (step == 2 &amp;&amp; (!IS_DNODE(folio) ||</div><div class='add'>+						!is_cold_node(folio)))</div><div class='ctx'> 				continue;</div><div class='ctx'> lock_node:</div><div class='ctx'> 			if (wbc-&gt;sync_mode == WB_SYNC_ALL)</div><div class='del'>-				lock_page(page);</div><div class='del'>-			else if (!trylock_page(page))</div><div class='add'>+				folio_lock(folio);</div><div class='add'>+			else if (!folio_trylock(folio))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (unlikely(page-&gt;mapping != NODE_MAPPING(sbi))) {</div><div class='add'>+			if (unlikely(!is_node_folio(folio))) {</div><div class='ctx'> continue_unlock:</div><div class='del'>-				unlock_page(page);</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!PageDirty(page)) {</div><div class='add'>+			if (!folio_test_dirty(folio)) {</div><div class='ctx'> 				/* someone wrote it for us */</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2017,30 +2114,32 @@ continue_unlock:</div><div class='ctx'> 				goto write_node;</div><div class='ctx'> </div><div class='ctx'> 			/* flush inline_data */</div><div class='del'>-			if (page_private_inline(page)) {</div><div class='del'>-				clear_page_private_inline(page);</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				flush_inline_data(sbi, ino_of_node(page));</div><div class='add'>+			if (folio_test_f2fs_inline(folio)) {</div><div class='add'>+				folio_clear_f2fs_inline(folio);</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				flush_inline_data(sbi, ino_of_node(folio));</div><div class='ctx'> 				goto lock_node;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* flush dirty inode */</div><div class='del'>-			if (IS_INODE(page) &amp;&amp; flush_dirty_inode(page))</div><div class='add'>+			if (IS_INODE(folio) &amp;&amp; flush_dirty_inode(folio))</div><div class='ctx'> 				goto lock_node;</div><div class='ctx'> write_node:</div><div class='del'>-			f2fs_wait_on_page_writeback(page, NODE, true, true);</div><div class='add'>+			f2fs_folio_wait_writeback(folio, NODE, true, true);</div><div class='ctx'> </div><div class='del'>-			if (!clear_page_dirty_for_io(page))</div><div class='add'>+			if (!folio_clear_dirty_for_io(folio))</div><div class='ctx'> 				goto continue_unlock;</div><div class='ctx'> </div><div class='del'>-			set_fsync_mark(page, 0);</div><div class='del'>-			set_dentry_mark(page, 0);</div><div class='add'>+			set_fsync_mark(folio, 0);</div><div class='add'>+			set_dentry_mark(folio, 0);</div><div class='ctx'> </div><div class='del'>-			ret = __write_node_page(page, false, &amp;submitted,</div><div class='del'>-						wbc, do_balance, io_type, NULL);</div><div class='del'>-			if (ret)</div><div class='del'>-				unlock_page(page);</div><div class='del'>-			else if (submitted)</div><div class='add'>+			if (!__write_node_folio(folio, false, &amp;submitted,</div><div class='add'>+					wbc, do_balance, io_type, NULL)) {</div><div class='add'>+				folio_batch_release(&amp;fbatch);</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (submitted)</div><div class='ctx'> 				nwritten++;</div><div class='ctx'> </div><div class='ctx'> 			if (--wbc-&gt;nr_to_write == 0)</div><div class='hunk'>@@ -2075,12 +2174,13 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,</div><div class='ctx'> 						unsigned int seq_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsync_node_entry *fn;</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	struct list_head *head = &amp;sbi-&gt;fsync_node_list;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int cur_seq_id = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (seq_id &amp;&amp; cur_seq_id &lt; seq_id) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='ctx'> 		spin_lock_irqsave(&amp;sbi-&gt;fsync_node_lock, flags);</div><div class='ctx'> 		if (list_empty(head)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;sbi-&gt;fsync_node_lock, flags);</div><div class='hunk'>@@ -2092,13 +2192,13 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cur_seq_id = fn-&gt;seq_id;</div><div class='del'>-		page = fn-&gt;page;</div><div class='del'>-		get_page(page);</div><div class='add'>+		folio = fn-&gt;folio;</div><div class='add'>+		folio_get(folio);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;sbi-&gt;fsync_node_lock, flags);</div><div class='ctx'> </div><div class='del'>-		f2fs_wait_on_page_writeback(page, NODE, true, false);</div><div class='add'>+		f2fs_folio_wait_writeback(folio, NODE, true, false);</div><div class='ctx'> </div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return filemap_check_errors(NODE_MAPPING(sbi));</div><div class='hunk'>@@ -2153,17 +2253,17 @@ skip_write:</div><div class='ctx'> static bool f2fs_dirty_node_folio(struct address_space *mapping,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	trace_f2fs_set_page_dirty(&amp;folio-&gt;page, NODE);</div><div class='add'>+	trace_f2fs_set_page_dirty(folio, NODE);</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_uptodate(folio))</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-	if (IS_INODE(&amp;folio-&gt;page))</div><div class='del'>-		f2fs_inode_chksum_set(F2FS_M_SB(mapping), &amp;folio-&gt;page);</div><div class='add'>+	if (IS_INODE(folio))</div><div class='add'>+		f2fs_inode_chksum_set(F2FS_M_SB(mapping), folio);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (filemap_dirty_folio(mapping, folio)) {</div><div class='ctx'> 		inc_page_count(F2FS_M_SB(mapping), F2FS_DIRTY_NODES);</div><div class='del'>-		set_page_private_reference(&amp;folio-&gt;page);</div><div class='add'>+		folio_set_f2fs_reference(folio);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -2173,7 +2273,6 @@ static bool f2fs_dirty_node_folio(struct address_space *mapping,</div><div class='ctx'>  * Structure of the f2fs node operations</div><div class='ctx'>  */</div><div class='ctx'> const struct address_space_operations f2fs_node_aops = {</div><div class='del'>-	.writepage	= f2fs_write_node_page,</div><div class='ctx'> 	.writepages	= f2fs_write_node_pages,</div><div class='ctx'> 	.dirty_folio	= f2fs_dirty_node_folio,</div><div class='ctx'> 	.invalidate_folio = f2fs_invalidate_folio,</div><div class='hunk'>@@ -2235,24 +2334,6 @@ static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool f2fs_nat_bitmap_enabled(struct f2fs_sb_info *sbi)</div><div class='del'>-{</div><div class='del'>-	struct f2fs_nm_info *nm_i = NM_I(sbi);</div><div class='del'>-	unsigned int i;</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	f2fs_down_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-	for (i = 0; i &lt; nm_i-&gt;nat_blocks; i++) {</div><div class='del'>-		if (!test_bit_le(i, nm_i-&gt;nat_block_bitmap)) {</div><div class='del'>-			ret = false;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	f2fs_up_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void update_free_nid_bitmap(struct f2fs_sb_info *sbi, nid_t nid,</div><div class='ctx'> 							bool set, bool build)</div><div class='ctx'> {</div><div class='hunk'>@@ -2284,7 +2365,7 @@ static bool add_free_nid(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	struct f2fs_nm_info *nm_i = NM_I(sbi);</div><div class='ctx'> 	struct free_nid *i, *e;</div><div class='ctx'> 	struct nat_entry *ne;</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	int err;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	/* 0 nid should not be used */</div><div class='hunk'>@@ -2298,7 +2379,10 @@ static bool add_free_nid(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	i-&gt;nid = nid;</div><div class='ctx'> 	i-&gt;state = FREE_NID;</div><div class='ctx'> </div><div class='del'>-	radix_tree_preload(GFP_NOFS | __GFP_NOFAIL);</div><div class='add'>+	err = radix_tree_preload(GFP_NOFS | __GFP_NOFAIL);</div><div class='add'>+	f2fs_bug_on(sbi, err);</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;nm_i-&gt;nid_list_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2317,14 +2401,14 @@ static bool add_free_nid(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		 *                          - __lookup_nat_cache</div><div class='ctx'> 		 *  - f2fs_add_link</div><div class='ctx'> 		 *   - f2fs_init_inode_metadata</div><div class='del'>-		 *    - f2fs_new_inode_page</div><div class='del'>-		 *     - f2fs_new_node_page</div><div class='add'>+		 *    - f2fs_new_inode_folio</div><div class='add'>+		 *     - f2fs_new_node_folio</div><div class='ctx'> 		 *      - set_node_addr</div><div class='ctx'> 		 *  - f2fs_alloc_nid_done</div><div class='ctx'> 		 *   - __remove_nid_from_list(PREALLOC_NID)</div><div class='ctx'> 		 *                         - __insert_nid_to_list(FREE_NID)</div><div class='ctx'> 		 */</div><div class='del'>-		ne = __lookup_nat_cache(nm_i, nid);</div><div class='add'>+		ne = __lookup_nat_cache(nm_i, nid, false);</div><div class='ctx'> 		if (ne &amp;&amp; (!get_nat_flag(ne, IS_CHECKPOINTED) ||</div><div class='ctx'> 				nat_get_blkaddr(ne) != NULL_ADDR))</div><div class='ctx'> 			goto err_out;</div><div class='hunk'>@@ -2371,10 +2455,9 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int scan_nat_page(struct f2fs_sb_info *sbi,</div><div class='del'>-			struct page *nat_page, nid_t start_nid)</div><div class='add'>+			struct f2fs_nat_block *nat_blk, nid_t start_nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_nm_info *nm_i = NM_I(sbi);</div><div class='del'>-	struct f2fs_nat_block *nat_blk = page_address(nat_page);</div><div class='ctx'> 	block_t blk_addr;</div><div class='ctx'> 	unsigned int nat_ofs = NAT_BLOCK_OFFSET(start_nid);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2494,13 +2577,14 @@ static int __f2fs_build_free_nids(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (!test_bit_le(NAT_BLOCK_OFFSET(nid),</div><div class='ctx'> 						nm_i-&gt;nat_block_bitmap)) {</div><div class='del'>-			struct page *page = get_current_nat_page(sbi, nid);</div><div class='add'>+			struct folio *folio = get_current_nat_folio(sbi, nid);</div><div class='ctx'> </div><div class='del'>-			if (IS_ERR(page)) {</div><div class='del'>-				ret = PTR_ERR(page);</div><div class='add'>+			if (IS_ERR(folio)) {</div><div class='add'>+				ret = PTR_ERR(folio);</div><div class='ctx'> 			} else {</div><div class='del'>-				ret = scan_nat_page(sbi, page, nid);</div><div class='del'>-				f2fs_put_page(page, 1);</div><div class='add'>+				ret = scan_nat_page(sbi, folio_address(folio),</div><div class='add'>+						nid);</div><div class='add'>+				f2fs_folio_put(folio, true);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (ret) {</div><div class='hunk'>@@ -2575,6 +2659,16 @@ retry:</div><div class='ctx'> 		f2fs_bug_on(sbi, list_empty(&amp;nm_i-&gt;free_nid_list));</div><div class='ctx'> 		i = list_first_entry(&amp;nm_i-&gt;free_nid_list,</div><div class='ctx'> 					struct free_nid, list);</div><div class='add'>+</div><div class='add'>+		if (unlikely(is_invalid_nid(sbi, i-&gt;nid))) {</div><div class='add'>+			spin_unlock(&amp;nm_i-&gt;nid_list_lock);</div><div class='add'>+			f2fs_err(sbi, "Corrupted nid %u in free_nid_list",</div><div class='add'>+								i-&gt;nid);</div><div class='add'>+			f2fs_stop_checkpoint(sbi, false,</div><div class='add'>+					STOP_CP_REASON_CORRUPTED_NID);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		*nid = i-&gt;nid;</div><div class='ctx'> </div><div class='ctx'> 		__move_free_nid(sbi, i, FREE_NID, PREALLOC_NID);</div><div class='hunk'>@@ -2676,18 +2770,18 @@ int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink)</div><div class='ctx'> 	return nr - nr_shrink;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_recover_inline_xattr(struct inode *inode, struct page *page)</div><div class='add'>+int f2fs_recover_inline_xattr(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	void *src_addr, *dst_addr;</div><div class='ctx'> 	size_t inline_size;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	struct f2fs_inode *ri;</div><div class='ctx'> </div><div class='del'>-	ipage = f2fs_get_node_page(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='del'>-	if (IS_ERR(ipage))</div><div class='del'>-		return PTR_ERR(ipage);</div><div class='add'>+	ifolio = f2fs_get_inode_folio(F2FS_I_SB(inode), inode-&gt;i_ino);</div><div class='add'>+	if (IS_ERR(ifolio))</div><div class='add'>+		return PTR_ERR(ifolio);</div><div class='ctx'> </div><div class='del'>-	ri = F2FS_INODE(page);</div><div class='add'>+	ri = F2FS_INODE(folio);</div><div class='ctx'> 	if (ri-&gt;i_inline &amp; F2FS_INLINE_XATTR) {</div><div class='ctx'> 		if (!f2fs_has_inline_xattr(inode)) {</div><div class='ctx'> 			set_inode_flag(inode, FI_INLINE_XATTR);</div><div class='hunk'>@@ -2701,26 +2795,26 @@ int f2fs_recover_inline_xattr(struct inode *inode, struct page *page)</div><div class='ctx'> 		goto update_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dst_addr = inline_xattr_addr(inode, ipage);</div><div class='del'>-	src_addr = inline_xattr_addr(inode, page);</div><div class='add'>+	dst_addr = inline_xattr_addr(inode, ifolio);</div><div class='add'>+	src_addr = inline_xattr_addr(inode, folio);</div><div class='ctx'> 	inline_size = inline_xattr_size(inode);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(ipage, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(ifolio, NODE, true, true);</div><div class='ctx'> 	memcpy(dst_addr, src_addr, inline_size);</div><div class='ctx'> update_inode:</div><div class='del'>-	f2fs_update_inode(inode, ipage);</div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='add'>+	f2fs_update_inode(inode, ifolio);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_recover_xattr_data(struct inode *inode, struct page *page)</div><div class='add'>+int f2fs_recover_xattr_data(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	nid_t prev_xnid = F2FS_I(inode)-&gt;i_xattr_nid;</div><div class='ctx'> 	nid_t new_xnid;</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct node_info ni;</div><div class='del'>-	struct page *xpage;</div><div class='add'>+	struct folio *xfolio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!prev_xnid)</div><div class='hunk'>@@ -2731,7 +2825,7 @@ int f2fs_recover_xattr_data(struct inode *inode, struct page *page)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	f2fs_invalidate_blocks(sbi, ni.blk_addr);</div><div class='add'>+	f2fs_invalidate_blocks(sbi, ni.blk_addr, 1);</div><div class='ctx'> 	dec_valid_node_count(sbi, inode, false);</div><div class='ctx'> 	set_node_addr(sbi, &amp;ni, NULL_ADDR, false);</div><div class='ctx'> </div><div class='hunk'>@@ -2741,32 +2835,32 @@ recover_xnid:</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	set_new_dnode(&amp;dn, inode, NULL, NULL, new_xnid);</div><div class='del'>-	xpage = f2fs_new_node_page(&amp;dn, XATTR_NODE_OFFSET);</div><div class='del'>-	if (IS_ERR(xpage)) {</div><div class='add'>+	xfolio = f2fs_new_node_folio(&amp;dn, XATTR_NODE_OFFSET);</div><div class='add'>+	if (IS_ERR(xfolio)) {</div><div class='ctx'> 		f2fs_alloc_nid_failed(sbi, new_xnid);</div><div class='del'>-		return PTR_ERR(xpage);</div><div class='add'>+		return PTR_ERR(xfolio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_alloc_nid_done(sbi, new_xnid);</div><div class='ctx'> 	f2fs_update_inode_page(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* 3: update and set xattr node page dirty */</div><div class='del'>-	if (page) {</div><div class='del'>-		memcpy(F2FS_NODE(xpage), F2FS_NODE(page),</div><div class='add'>+	if (folio) {</div><div class='add'>+		memcpy(F2FS_NODE(xfolio), F2FS_NODE(folio),</div><div class='ctx'> 				VALID_XATTR_BLOCK_SIZE);</div><div class='del'>-		set_page_dirty(xpage);</div><div class='add'>+		folio_mark_dirty(xfolio);</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_put_page(xpage, 1);</div><div class='add'>+	f2fs_folio_put(xfolio, true);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)</div><div class='add'>+int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_inode *src, *dst;</div><div class='del'>-	nid_t ino = ino_of_node(page);</div><div class='add'>+	nid_t ino = ino_of_node(folio);</div><div class='ctx'> 	struct node_info old_ni, new_ni;</div><div class='del'>-	struct page *ipage;</div><div class='add'>+	struct folio *ifolio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_get_node_info(sbi, ino, &amp;old_ni, false);</div><div class='hunk'>@@ -2776,8 +2870,8 @@ int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)</div><div class='ctx'> 	if (unlikely(old_ni.blk_addr != NULL_ADDR))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> retry:</div><div class='del'>-	ipage = f2fs_grab_cache_page(NODE_MAPPING(sbi), ino, false);</div><div class='del'>-	if (!ipage) {</div><div class='add'>+	ifolio = f2fs_grab_cache_folio(NODE_MAPPING(sbi), ino, false);</div><div class='add'>+	if (IS_ERR(ifolio)) {</div><div class='ctx'> 		memalloc_retry_wait(GFP_NOFS);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2785,13 +2879,13 @@ retry:</div><div class='ctx'> 	/* Should not use this inode from free nid list */</div><div class='ctx'> 	remove_free_nid(sbi, ino);</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(ipage))</div><div class='del'>-		SetPageUptodate(ipage);</div><div class='del'>-	fill_node_footer(ipage, ino, ino, 0, true);</div><div class='del'>-	set_cold_node(ipage, false);</div><div class='add'>+	if (!folio_test_uptodate(ifolio))</div><div class='add'>+		folio_mark_uptodate(ifolio);</div><div class='add'>+	fill_node_footer(ifolio, ino, ino, 0, true);</div><div class='add'>+	set_cold_node(ifolio, false);</div><div class='ctx'> </div><div class='del'>-	src = F2FS_INODE(page);</div><div class='del'>-	dst = F2FS_INODE(ipage);</div><div class='add'>+	src = F2FS_INODE(folio);</div><div class='add'>+	dst = F2FS_INODE(ifolio);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dst, src, offsetof(struct f2fs_inode, i_ext));</div><div class='ctx'> 	dst-&gt;i_size = 0;</div><div class='hunk'>@@ -2827,8 +2921,8 @@ retry:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 	set_node_addr(sbi, &amp;new_ni, NEW_ADDR, false);</div><div class='ctx'> 	inc_valid_inode_count(sbi);</div><div class='del'>-	set_page_dirty(ipage);</div><div class='del'>-	f2fs_put_page(ipage, 1);</div><div class='add'>+	folio_mark_dirty(ifolio);</div><div class='add'>+	f2fs_folio_put(ifolio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2841,7 +2935,7 @@ int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	int i, idx, last_offset, nrpages;</div><div class='ctx'> </div><div class='ctx'> 	/* scan the node segment */</div><div class='del'>-	last_offset = sbi-&gt;blocks_per_seg;</div><div class='add'>+	last_offset = BLKS_PER_SEG(sbi);</div><div class='ctx'> 	addr = START_BLOCK(sbi, segno);</div><div class='ctx'> 	sum_entry = &amp;sum-&gt;entries[0];</div><div class='ctx'> </div><div class='hunk'>@@ -2852,17 +2946,17 @@ int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		f2fs_ra_meta_pages(sbi, addr, nrpages, META_POR, true);</div><div class='ctx'> </div><div class='ctx'> 		for (idx = addr; idx &lt; addr + nrpages; idx++) {</div><div class='del'>-			struct page *page = f2fs_get_tmp_page(sbi, idx);</div><div class='add'>+			struct folio *folio = f2fs_get_tmp_folio(sbi, idx);</div><div class='ctx'> </div><div class='del'>-			if (IS_ERR(page))</div><div class='del'>-				return PTR_ERR(page);</div><div class='add'>+			if (IS_ERR(folio))</div><div class='add'>+				return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-			rn = F2FS_NODE(page);</div><div class='add'>+			rn = F2FS_NODE(folio);</div><div class='ctx'> 			sum_entry-&gt;nid = rn-&gt;footer.nid;</div><div class='ctx'> 			sum_entry-&gt;version = 0;</div><div class='ctx'> 			sum_entry-&gt;ofs_in_node = 0;</div><div class='ctx'> 			sum_entry++;</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		invalidate_mapping_pages(META_MAPPING(sbi), addr,</div><div class='hunk'>@@ -2877,6 +2971,7 @@ static void remove_nats_in_journal(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);</div><div class='ctx'> 	struct f2fs_journal *journal = curseg-&gt;journal;</div><div class='ctx'> 	int i;</div><div class='add'>+	bool init_dirty;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> 	for (i = 0; i &lt; nats_in_cursum(journal); i++) {</div><div class='hunk'>@@ -2887,12 +2982,15 @@ static void remove_nats_in_journal(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		if (f2fs_check_nid_range(sbi, nid))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		init_dirty = false;</div><div class='add'>+</div><div class='ctx'> 		raw_ne = nat_in_journal(journal, i);</div><div class='ctx'> </div><div class='del'>-		ne = __lookup_nat_cache(nm_i, nid);</div><div class='add'>+		ne = __lookup_nat_cache(nm_i, nid, true);</div><div class='ctx'> 		if (!ne) {</div><div class='add'>+			init_dirty = true;</div><div class='ctx'> 			ne = __alloc_nat_entry(sbi, nid, true);</div><div class='del'>-			__init_nat_entry(nm_i, ne, &amp;raw_ne, true);</div><div class='add'>+			__init_nat_entry(nm_i, ne, &amp;raw_ne, true, true);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2907,7 +3005,7 @@ static void remove_nats_in_journal(struct f2fs_sb_info *sbi)</div><div class='ctx'> 			spin_unlock(&amp;nm_i-&gt;nid_list_lock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		__set_nat_cache_dirty(nm_i, ne);</div><div class='add'>+		__set_nat_cache_dirty(nm_i, ne, init_dirty);</div><div class='ctx'> 	}</div><div class='ctx'> 	update_nats_in_cursum(journal, -i);</div><div class='ctx'> 	up_write(&amp;curseg-&gt;journal_rwsem);</div><div class='hunk'>@@ -2931,32 +3029,15 @@ add_out:</div><div class='ctx'> 	list_add_tail(&amp;nes-&gt;set_list, head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __update_nat_bits(struct f2fs_nm_info *nm_i, unsigned int nat_ofs,</div><div class='del'>-							unsigned int valid)</div><div class='del'>-{</div><div class='del'>-	if (valid == 0) {</div><div class='del'>-		__set_bit_le(nat_ofs, nm_i-&gt;empty_nat_bits);</div><div class='del'>-		__clear_bit_le(nat_ofs, nm_i-&gt;full_nat_bits);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__clear_bit_le(nat_ofs, nm_i-&gt;empty_nat_bits);</div><div class='del'>-	if (valid == NAT_ENTRY_PER_BLOCK)</div><div class='del'>-		__set_bit_le(nat_ofs, nm_i-&gt;full_nat_bits);</div><div class='del'>-	else</div><div class='del'>-		__clear_bit_le(nat_ofs, nm_i-&gt;full_nat_bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,</div><div class='del'>-						struct page *page)</div><div class='add'>+static void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,</div><div class='add'>+		const struct f2fs_nat_block *nat_blk)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_nm_info *nm_i = NM_I(sbi);</div><div class='ctx'> 	unsigned int nat_index = start_nid / NAT_ENTRY_PER_BLOCK;</div><div class='del'>-	struct f2fs_nat_block *nat_blk = page_address(page);</div><div class='ctx'> 	int valid = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG))</div><div class='add'>+	if (!enabled_nat_bits(sbi, NULL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (nat_index == 0) {</div><div class='hunk'>@@ -2967,36 +3048,17 @@ static void update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,</div><div class='ctx'> 		if (le32_to_cpu(nat_blk-&gt;entries[i].block_addr) != NULL_ADDR)</div><div class='ctx'> 			valid++;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	__update_nat_bits(nm_i, nat_index, valid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void f2fs_enable_nat_bits(struct f2fs_sb_info *sbi)</div><div class='del'>-{</div><div class='del'>-	struct f2fs_nm_info *nm_i = NM_I(sbi);</div><div class='del'>-	unsigned int nat_ofs;</div><div class='del'>-</div><div class='del'>-	f2fs_down_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='del'>-</div><div class='del'>-	for (nat_ofs = 0; nat_ofs &lt; nm_i-&gt;nat_blocks; nat_ofs++) {</div><div class='del'>-		unsigned int valid = 0, nid_ofs = 0;</div><div class='del'>-</div><div class='del'>-		/* handle nid zero due to it should never be used */</div><div class='del'>-		if (unlikely(nat_ofs == 0)) {</div><div class='del'>-			valid = 1;</div><div class='del'>-			nid_ofs = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (; nid_ofs &lt; NAT_ENTRY_PER_BLOCK; nid_ofs++) {</div><div class='del'>-			if (!test_bit_le(nid_ofs,</div><div class='del'>-					nm_i-&gt;free_nid_bitmap[nat_ofs]))</div><div class='del'>-				valid++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__update_nat_bits(nm_i, nat_ofs, valid);</div><div class='add'>+	if (valid == 0) {</div><div class='add'>+		__set_bit_le(nat_index, nm_i-&gt;empty_nat_bits);</div><div class='add'>+		__clear_bit_le(nat_index, nm_i-&gt;full_nat_bits);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_up_read(&amp;nm_i-&gt;nat_tree_lock);</div><div class='add'>+	__clear_bit_le(nat_index, nm_i-&gt;empty_nat_bits);</div><div class='add'>+	if (valid == NAT_ENTRY_PER_BLOCK)</div><div class='add'>+		__set_bit_le(nat_index, nm_i-&gt;full_nat_bits);</div><div class='add'>+	else</div><div class='add'>+		__clear_bit_le(nat_index, nm_i-&gt;full_nat_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -3008,25 +3070,25 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	bool to_journal = true;</div><div class='ctx'> 	struct f2fs_nat_block *nat_blk;</div><div class='ctx'> 	struct nat_entry *ne, *cur;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * there are two steps to flush nat entries:</div><div class='ctx'> 	 * #1, flush nat entries to journal in current hot data summary block.</div><div class='ctx'> 	 * #2, flush nat entries to nat page.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((cpc-&gt;reason &amp; CP_UMOUNT) ||</div><div class='add'>+	if (enabled_nat_bits(sbi, cpc) ||</div><div class='ctx'> 		!__has_cursum_space(journal, set-&gt;entry_cnt, NAT_JOURNAL))</div><div class='ctx'> 		to_journal = false;</div><div class='ctx'> </div><div class='ctx'> 	if (to_journal) {</div><div class='ctx'> 		down_write(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> 	} else {</div><div class='del'>-		page = get_next_nat_page(sbi, start_nid);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+		folio = get_next_nat_folio(sbi, start_nid);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-		nat_blk = page_address(page);</div><div class='add'>+		nat_blk = folio_address(folio);</div><div class='ctx'> 		f2fs_bug_on(sbi, !nat_blk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3062,8 +3124,8 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	if (to_journal) {</div><div class='ctx'> 		up_write(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> 	} else {</div><div class='del'>-		update_nat_bits(sbi, start_nid, page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		__update_nat_bits(sbi, start_nid, nat_blk);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allow dirty nats by node block allocation in write_begin */</div><div class='hunk'>@@ -3093,7 +3155,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	 * during unmount, let's flush nat_bits before checking</div><div class='ctx'> 	 * nat_cnt[DIRTY_NAT].</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpc-&gt;reason &amp; CP_UMOUNT) {</div><div class='add'>+	if (enabled_nat_bits(sbi, cpc)) {</div><div class='ctx'> 		f2fs_down_write(&amp;nm_i-&gt;nat_tree_lock);</div><div class='ctx'> 		remove_nats_in_journal(sbi);</div><div class='ctx'> 		f2fs_up_write(&amp;nm_i-&gt;nat_tree_lock);</div><div class='hunk'>@@ -3109,7 +3171,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	 * entries, remove all entries from journal and merge them</div><div class='ctx'> 	 * into nat entry set.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpc-&gt;reason &amp; CP_UMOUNT ||</div><div class='add'>+	if (enabled_nat_bits(sbi, cpc) ||</div><div class='ctx'> 		!__has_cursum_space(journal,</div><div class='ctx'> 			nm_i-&gt;nat_cnt[DIRTY_NAT], NAT_JOURNAL))</div><div class='ctx'> 		remove_nats_in_journal(sbi);</div><div class='hunk'>@@ -3146,40 +3208,38 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	__u64 cp_ver = cur_cp_version(ckpt);</div><div class='ctx'> 	block_t nat_bits_addr;</div><div class='ctx'> </div><div class='add'>+	if (!enabled_nat_bits(sbi, NULL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	nm_i-&gt;nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes &lt;&lt; 1) + 8);</div><div class='ctx'> 	nm_i-&gt;nat_bits = f2fs_kvzalloc(sbi,</div><div class='del'>-			nm_i-&gt;nat_bits_blocks &lt;&lt; F2FS_BLKSIZE_BITS, GFP_KERNEL);</div><div class='add'>+			F2FS_BLK_TO_BYTES(nm_i-&gt;nat_bits_blocks), GFP_KERNEL);</div><div class='ctx'> 	if (!nm_i-&gt;nat_bits)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	nm_i-&gt;full_nat_bits = nm_i-&gt;nat_bits + 8;</div><div class='del'>-	nm_i-&gt;empty_nat_bits = nm_i-&gt;full_nat_bits + nat_bits_bytes;</div><div class='del'>-</div><div class='del'>-	if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	nat_bits_addr = __start_cp_addr(sbi) + sbi-&gt;blocks_per_seg -</div><div class='add'>+	nat_bits_addr = __start_cp_addr(sbi) + BLKS_PER_SEG(sbi) -</div><div class='ctx'> 						nm_i-&gt;nat_bits_blocks;</div><div class='ctx'> 	for (i = 0; i &lt; nm_i-&gt;nat_bits_blocks; i++) {</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='del'>-		page = f2fs_get_meta_page(sbi, nat_bits_addr++);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+		folio = f2fs_get_meta_folio(sbi, nat_bits_addr++);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-		memcpy(nm_i-&gt;nat_bits + (i &lt;&lt; F2FS_BLKSIZE_BITS),</div><div class='del'>-					page_address(page), F2FS_BLKSIZE);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		memcpy(nm_i-&gt;nat_bits + F2FS_BLK_TO_BYTES(i),</div><div class='add'>+					folio_address(folio), F2FS_BLKSIZE);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cp_ver |= (cur_cp_crc(ckpt) &lt;&lt; 32);</div><div class='ctx'> 	if (cpu_to_le64(cp_ver) != *(__le64 *)nm_i-&gt;nat_bits) {</div><div class='del'>-		clear_ckpt_flags(sbi, CP_NAT_BITS_FLAG);</div><div class='del'>-		f2fs_notice(sbi, "Disable nat_bits due to incorrect cp_ver (%llu, %llu)",</div><div class='del'>-			cp_ver, le64_to_cpu(*(__le64 *)nm_i-&gt;nat_bits));</div><div class='add'>+		disable_nat_bits(sbi, true);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nm_i-&gt;full_nat_bits = nm_i-&gt;nat_bits + 8;</div><div class='add'>+	nm_i-&gt;empty_nat_bits = nm_i-&gt;full_nat_bits + nat_bits_bytes;</div><div class='add'>+</div><div class='ctx'> 	f2fs_notice(sbi, "Found nat_bits in checkpoint");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3190,7 +3250,7 @@ static inline void load_free_nid_bitmap(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	unsigned int i = 0;</div><div class='ctx'> 	nid_t nid, last_nid;</div><div class='ctx'> </div><div class='del'>-	if (!is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG))</div><div class='add'>+	if (!enabled_nat_bits(sbi, NULL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nm_i-&gt;nat_blocks; i++) {</div><div class='hunk'>@@ -3262,6 +3322,9 @@ static int init_node_manager(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	if (!nm_i-&gt;nat_bitmap)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (!test_opt(sbi, NAT_BITS))</div><div class='add'>+		disable_nat_bits(sbi, true);</div><div class='add'>+</div><div class='ctx'> 	err = __get_nat_bitmaps(sbi);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -3402,10 +3465,10 @@ void f2fs_destroy_node_manager(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	}</div><div class='ctx'> 	kvfree(nm_i-&gt;free_nid_count);</div><div class='ctx'> </div><div class='del'>-	kvfree(nm_i-&gt;nat_bitmap);</div><div class='add'>+	kfree(nm_i-&gt;nat_bitmap);</div><div class='ctx'> 	kvfree(nm_i-&gt;nat_bits);</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-	kvfree(nm_i-&gt;nat_bitmap_mir);</div><div class='add'>+	kfree(nm_i-&gt;nat_bitmap_mir);</div><div class='ctx'> #endif</div><div class='ctx'> 	sbi-&gt;nm_info = NULL;</div><div class='ctx'> 	kfree(nm_i);</div><div class='head'>diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h<br/>index 5bd16a95eef8..9cb8dcf8d417 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/node.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/node.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/node.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/node.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> /* control total # of nats */</div><div class='ctx'> #define DEF_NAT_CACHE_THRESHOLD			100000</div><div class='ctx'> </div><div class='del'>-/* control total # of node writes used for roll-fowrad recovery */</div><div class='add'>+/* control total # of node writes used for roll-forward recovery */</div><div class='ctx'> #define DEF_RF_NODE_BLOCKS			0</div><div class='ctx'> </div><div class='ctx'> /* vector size for gang look-up from nat cache that consists of radix tree */</div><div class='hunk'>@@ -52,6 +52,14 @@ enum {</div><div class='ctx'> 	IS_PREALLOC,		/* nat entry is preallocated */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* For node type in __get_node_folio() */</div><div class='add'>+enum node_type {</div><div class='add'>+	NODE_TYPE_REGULAR,</div><div class='add'>+	NODE_TYPE_INODE,</div><div class='add'>+	NODE_TYPE_XATTR,</div><div class='add'>+	NODE_TYPE_NON_INODE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * For node information</div><div class='ctx'>  */</div><div class='hunk'>@@ -208,10 +216,10 @@ static inline pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start)</div><div class='ctx'> </div><div class='ctx'> 	block_addr = (pgoff_t)(nm_i-&gt;nat_blkaddr +</div><div class='ctx'> 		(block_off &lt;&lt; 1) -</div><div class='del'>-		(block_off &amp; (sbi-&gt;blocks_per_seg - 1)));</div><div class='add'>+		(block_off &amp; (BLKS_PER_SEG(sbi) - 1)));</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_test_bit(block_off, nm_i-&gt;nat_bitmap))</div><div class='del'>-		block_addr += sbi-&gt;blocks_per_seg;</div><div class='add'>+		block_addr += BLKS_PER_SEG(sbi);</div><div class='ctx'> </div><div class='ctx'> 	return block_addr;</div><div class='ctx'> }</div><div class='hunk'>@@ -236,41 +244,41 @@ static inline void set_to_next_nat(struct f2fs_nm_info *nm_i, nid_t start_nid)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline nid_t ino_of_node(struct page *node_page)</div><div class='add'>+static inline nid_t ino_of_node(const struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(node_page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(node_folio);</div><div class='ctx'> 	return le32_to_cpu(rn-&gt;footer.ino);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline nid_t nid_of_node(struct page *node_page)</div><div class='add'>+static inline nid_t nid_of_node(const struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(node_page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(node_folio);</div><div class='ctx'> 	return le32_to_cpu(rn-&gt;footer.nid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int ofs_of_node(struct page *node_page)</div><div class='add'>+static inline unsigned int ofs_of_node(const struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(node_page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(node_folio);</div><div class='ctx'> 	unsigned flag = le32_to_cpu(rn-&gt;footer.flag);</div><div class='ctx'> 	return flag &gt;&gt; OFFSET_BIT_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __u64 cpver_of_node(struct page *node_page)</div><div class='add'>+static inline __u64 cpver_of_node(const struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(node_page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(node_folio);</div><div class='ctx'> 	return le64_to_cpu(rn-&gt;footer.cp_ver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline block_t next_blkaddr_of_node(struct page *node_page)</div><div class='add'>+static inline block_t next_blkaddr_of_node(const struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(node_page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(node_folio);</div><div class='ctx'> 	return le32_to_cpu(rn-&gt;footer.next_blkaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void fill_node_footer(struct page *page, nid_t nid,</div><div class='add'>+static inline void fill_node_footer(const struct folio *folio, nid_t nid,</div><div class='ctx'> 				nid_t ino, unsigned int ofs, bool reset)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> 	unsigned int old_flag = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (reset)</div><div class='hunk'>@@ -286,17 +294,18 @@ static inline void fill_node_footer(struct page *page, nid_t nid,</div><div class='ctx'> 					(old_flag &amp; OFFSET_BIT_MASK));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void copy_node_footer(struct page *dst, struct page *src)</div><div class='add'>+static inline void copy_node_footer(const struct folio *dst,</div><div class='add'>+		const struct folio *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_node *src_rn = F2FS_NODE(src);</div><div class='ctx'> 	struct f2fs_node *dst_rn = F2FS_NODE(dst);</div><div class='ctx'> 	memcpy(&amp;dst_rn-&gt;footer, &amp;src_rn-&gt;footer, sizeof(struct node_footer));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)</div><div class='add'>+static inline void fill_node_footer_blkaddr(struct folio *folio, block_t blkaddr)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_F_SB(folio));</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> 	__u64 cp_ver = cur_cp_version(ckpt);</div><div class='ctx'> </div><div class='ctx'> 	if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))</div><div class='hunk'>@@ -306,19 +315,19 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)</div><div class='ctx'> 	rn-&gt;footer.next_blkaddr = cpu_to_le32(blkaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_recoverable_dnode(struct page *page)</div><div class='add'>+static inline bool is_recoverable_dnode(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));</div><div class='add'>+	struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_F_SB(folio));</div><div class='ctx'> 	__u64 cp_ver = cur_cp_version(ckpt);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't care crc part, if fsck.f2fs sets it. */</div><div class='ctx'> 	if (__is_set_ckpt_flags(ckpt, CP_NOCRC_RECOVERY_FLAG))</div><div class='del'>-		return (cp_ver &lt;&lt; 32) == (cpver_of_node(page) &lt;&lt; 32);</div><div class='add'>+		return (cp_ver &lt;&lt; 32) == (cpver_of_node(folio) &lt;&lt; 32);</div><div class='ctx'> </div><div class='ctx'> 	if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))</div><div class='ctx'> 		cp_ver |= (cur_cp_crc(ckpt) &lt;&lt; 32);</div><div class='ctx'> </div><div class='del'>-	return cp_ver == cpver_of_node(page);</div><div class='add'>+	return cp_ver == cpver_of_node(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -342,9 +351,9 @@ static inline bool is_recoverable_dnode(struct page *page)</div><div class='ctx'>  *                 `- indirect node ((6 + 2N) + (N - 1)(N + 1))</div><div class='ctx'>  *                       `- direct node</div><div class='ctx'>  */</div><div class='del'>-static inline bool IS_DNODE(struct page *node_page)</div><div class='add'>+static inline bool IS_DNODE(const struct folio *node_folio)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ofs = ofs_of_node(node_page);</div><div class='add'>+	unsigned int ofs = ofs_of_node(node_folio);</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_has_xattr_block(ofs))</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -360,22 +369,22 @@ static inline bool IS_DNODE(struct page *node_page)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int set_nid(struct page *p, int off, nid_t nid, bool i)</div><div class='add'>+static inline int set_nid(struct folio *folio, int off, nid_t nid, bool i)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(p);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(p, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(folio, NODE, true, true);</div><div class='ctx'> </div><div class='ctx'> 	if (i)</div><div class='ctx'> 		rn-&gt;i.i_nid[off - NODE_DIR1_BLOCK] = cpu_to_le32(nid);</div><div class='ctx'> 	else</div><div class='ctx'> 		rn-&gt;in.nid[off] = cpu_to_le32(nid);</div><div class='del'>-	return set_page_dirty(p);</div><div class='add'>+	return folio_mark_dirty(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline nid_t get_nid(struct page *p, int off, bool i)</div><div class='add'>+static inline nid_t get_nid(const struct folio *folio, int off, bool i)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(p);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return le32_to_cpu(rn-&gt;i.i_nid[off - NODE_DIR1_BLOCK]);</div><div class='hunk'>@@ -389,19 +398,19 @@ static inline nid_t get_nid(struct page *p, int off, bool i)</div><div class='ctx'>  *  - Mark cold data pages in page cache</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline int is_node(struct page *page, int type)</div><div class='add'>+static inline int is_node(const struct folio *folio, int type)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> 	return le32_to_cpu(rn-&gt;footer.flag) &amp; BIT(type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define is_cold_node(page)	is_node(page, COLD_BIT_SHIFT)</div><div class='del'>-#define is_fsync_dnode(page)	is_node(page, FSYNC_BIT_SHIFT)</div><div class='del'>-#define is_dent_dnode(page)	is_node(page, DENT_BIT_SHIFT)</div><div class='add'>+#define is_cold_node(folio)	is_node(folio, COLD_BIT_SHIFT)</div><div class='add'>+#define is_fsync_dnode(folio)	is_node(folio, FSYNC_BIT_SHIFT)</div><div class='add'>+#define is_dent_dnode(folio)	is_node(folio, DENT_BIT_SHIFT)</div><div class='ctx'> </div><div class='del'>-static inline void set_cold_node(struct page *page, bool is_dir)</div><div class='add'>+static inline void set_cold_node(const struct folio *folio, bool is_dir)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> 	unsigned int flag = le32_to_cpu(rn-&gt;footer.flag);</div><div class='ctx'> </div><div class='ctx'> 	if (is_dir)</div><div class='hunk'>@@ -411,9 +420,9 @@ static inline void set_cold_node(struct page *page, bool is_dir)</div><div class='ctx'> 	rn-&gt;footer.flag = cpu_to_le32(flag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void set_mark(struct page *page, int mark, int type)</div><div class='add'>+static inline void set_mark(struct folio *folio, int mark, int type)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_node *rn = F2FS_NODE(page);</div><div class='add'>+	struct f2fs_node *rn = F2FS_NODE(folio);</div><div class='ctx'> 	unsigned int flag = le32_to_cpu(rn-&gt;footer.flag);</div><div class='ctx'> 	if (mark)</div><div class='ctx'> 		flag |= BIT(type);</div><div class='hunk'>@@ -422,8 +431,8 @@ static inline void set_mark(struct page *page, int mark, int type)</div><div class='ctx'> 	rn-&gt;footer.flag = cpu_to_le32(flag);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-	f2fs_inode_chksum_set(F2FS_P_SB(page), page);</div><div class='add'>+	f2fs_inode_chksum_set(F2FS_F_SB(folio), folio);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-#define set_dentry_mark(page, mark)	set_mark(page, mark, DENT_BIT_SHIFT)</div><div class='del'>-#define set_fsync_mark(page, mark)	set_mark(page, mark, FSYNC_BIT_SHIFT)</div><div class='add'>+#define set_dentry_mark(folio, mark)	set_mark(folio, mark, DENT_BIT_SHIFT)</div><div class='add'>+#define set_fsync_mark(folio, mark)	set_mark(folio, mark, FSYNC_BIT_SHIFT)</div><div class='head'>diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c<br/>index d0f24ccbd1ac..c3415ebb9f50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/recovery.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/recovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/recovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/recovery.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  * Copyright (c) 2012 Samsung Electronics Co., Ltd.</div><div class='ctx'>  *             http://www.samsung.com/</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/f2fs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='hunk'>@@ -46,10 +46,6 @@</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *fsync_entry_slab;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-extern struct kmem_cache *f2fs_cf_name_slab;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> bool f2fs_space_for_roll_forward(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	s64 nalloc = percpu_counter_sum_positive(&amp;sbi-&gt;alloc_valid_block_count);</div><div class='hunk'>@@ -153,26 +149,23 @@ static int init_recovered_filename(const struct inode *dir,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		f2fs_hash_filename(dir, fname);</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 		/* Case-sensitive match is fine for recovery */</div><div class='del'>-		kmem_cache_free(f2fs_cf_name_slab, fname-&gt;cf_name.name);</div><div class='del'>-		fname-&gt;cf_name.name = NULL;</div><div class='del'>-#endif</div><div class='add'>+		f2fs_free_casefolded_name(fname);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		f2fs_hash_filename(dir, fname);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int recover_dentry(struct inode *inode, struct page *ipage,</div><div class='add'>+static int recover_dentry(struct inode *inode, struct folio *ifolio,</div><div class='ctx'> 						struct list_head *dir_list)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_inode *raw_inode = F2FS_INODE(ipage);</div><div class='add'>+	struct f2fs_inode *raw_inode = F2FS_INODE(ifolio);</div><div class='ctx'> 	nid_t pino = le32_to_cpu(raw_inode-&gt;i_pino);</div><div class='ctx'> 	struct f2fs_dir_entry *de;</div><div class='ctx'> 	struct f2fs_filename fname;</div><div class='ctx'> 	struct qstr usr_fname;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct inode *dir, *einode;</div><div class='ctx'> 	struct fsync_inode_entry *entry;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -194,7 +187,7 @@ static int recover_dentry(struct inode *inode, struct page *ipage,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> retry:</div><div class='del'>-	de = __f2fs_find_entry(dir, &amp;fname, &amp;page);</div><div class='add'>+	de = __f2fs_find_entry(dir, &amp;fname, &amp;folio);</div><div class='ctx'> 	if (de &amp;&amp; inode-&gt;i_ino == le32_to_cpu(de-&gt;ino))</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> </div><div class='hunk'>@@ -219,11 +212,11 @@ retry:</div><div class='ctx'> 			iput(einode);</div><div class='ctx'> 			goto out_put;</div><div class='ctx'> 		}</div><div class='del'>-		f2fs_delete_entry(de, page, dir, einode);</div><div class='add'>+		f2fs_delete_entry(de, folio, dir, einode);</div><div class='ctx'> 		iput(einode);</div><div class='ctx'> 		goto retry;</div><div class='del'>-	} else if (IS_ERR(page)) {</div><div class='del'>-		err = PTR_ERR(page);</div><div class='add'>+	} else if (IS_ERR(folio)) {</div><div class='add'>+		err = PTR_ERR(folio);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = f2fs_add_dentry(dir, &amp;fname, inode,</div><div class='ctx'> 					inode-&gt;i_ino, inode-&gt;i_mode);</div><div class='hunk'>@@ -233,21 +226,21 @@ retry:</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_put:</div><div class='del'>-	f2fs_put_page(page, 0);</div><div class='add'>+	f2fs_folio_put(folio, false);</div><div class='ctx'> out:</div><div class='ctx'> 	if (file_enc_name(inode))</div><div class='ctx'> 		name = "&lt;encrypted&gt;";</div><div class='ctx'> 	else</div><div class='ctx'> 		name = raw_inode-&gt;i_name;</div><div class='ctx'> 	f2fs_notice(F2FS_I_SB(inode), "%s: ino = %x, name = %s, dir = %lx, err = %d",</div><div class='del'>-		    __func__, ino_of_node(ipage), name,</div><div class='add'>+		    __func__, ino_of_node(ifolio), name,</div><div class='ctx'> 		    IS_ERR(dir) ? 0 : dir-&gt;i_ino, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int recover_quota_data(struct inode *inode, struct page *page)</div><div class='add'>+static int recover_quota_data(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_inode *raw = F2FS_INODE(page);</div><div class='add'>+	struct f2fs_inode *raw = F2FS_INODE(folio);</div><div class='ctx'> 	struct iattr attr;</div><div class='ctx'> 	uid_t i_uid = le32_to_cpu(raw-&gt;i_uid);</div><div class='ctx'> 	gid_t i_gid = le32_to_cpu(raw-&gt;i_gid);</div><div class='hunk'>@@ -284,15 +277,16 @@ static void recover_inline_flags(struct inode *inode, struct f2fs_inode *ri)</div><div class='ctx'> 		clear_inode_flag(inode, FI_DATA_EXIST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int recover_inode(struct inode *inode, struct page *page)</div><div class='add'>+static int recover_inode(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_inode *raw = F2FS_INODE(page);</div><div class='add'>+	struct f2fs_inode *raw = F2FS_INODE(folio);</div><div class='add'>+	struct f2fs_inode_info *fi = F2FS_I(inode);</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = le16_to_cpu(raw-&gt;i_mode);</div><div class='ctx'> </div><div class='del'>-	err = recover_quota_data(inode, page);</div><div class='add'>+	err = recover_quota_data(inode, folio);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -309,12 +303,12 @@ static int recover_inode(struct inode *inode, struct page *page)</div><div class='ctx'> 			i_projid = (projid_t)le32_to_cpu(raw-&gt;i_projid);</div><div class='ctx'> 			kprojid = make_kprojid(&amp;init_user_ns, i_projid);</div><div class='ctx'> </div><div class='del'>-			if (!projid_eq(kprojid, F2FS_I(inode)-&gt;i_projid)) {</div><div class='add'>+			if (!projid_eq(kprojid, fi-&gt;i_projid)) {</div><div class='ctx'> 				err = f2fs_transfer_project_quota(inode,</div><div class='ctx'> 								kprojid);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					return err;</div><div class='del'>-				F2FS_I(inode)-&gt;i_projid = kprojid;</div><div class='add'>+				fi-&gt;i_projid = kprojid;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -327,11 +321,10 @@ static int recover_inode(struct inode *inode, struct page *page)</div><div class='ctx'> 	inode_set_mtime(inode, le64_to_cpu(raw-&gt;i_mtime),</div><div class='ctx'> 			le32_to_cpu(raw-&gt;i_mtime_nsec));</div><div class='ctx'> </div><div class='del'>-	F2FS_I(inode)-&gt;i_advise = raw-&gt;i_advise;</div><div class='del'>-	F2FS_I(inode)-&gt;i_flags = le32_to_cpu(raw-&gt;i_flags);</div><div class='add'>+	fi-&gt;i_advise = raw-&gt;i_advise;</div><div class='add'>+	fi-&gt;i_flags = le32_to_cpu(raw-&gt;i_flags);</div><div class='ctx'> 	f2fs_set_inode_flags(inode);</div><div class='del'>-	F2FS_I(inode)-&gt;i_gc_failures[GC_FAILURE_PIN] =</div><div class='del'>-				le16_to_cpu(raw-&gt;i_gc_failures);</div><div class='add'>+	fi-&gt;i_gc_failures = le16_to_cpu(raw-&gt;i_gc_failures);</div><div class='ctx'> </div><div class='ctx'> 	recover_inline_flags(inode, raw);</div><div class='ctx'> </div><div class='hunk'>@@ -340,10 +333,10 @@ static int recover_inode(struct inode *inode, struct page *page)</div><div class='ctx'> 	if (file_enc_name(inode))</div><div class='ctx'> 		name = "&lt;encrypted&gt;";</div><div class='ctx'> 	else</div><div class='del'>-		name = F2FS_INODE(page)-&gt;i_name;</div><div class='add'>+		name = F2FS_INODE(folio)-&gt;i_name;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_notice(F2FS_I_SB(inode), "recover_inode: ino = %x, name = %s, inline = %x",</div><div class='del'>-		    ino_of_node(page), name, raw-&gt;i_inline);</div><div class='add'>+		    ino_of_node(folio), name, raw-&gt;i_inline);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -354,7 +347,7 @@ static unsigned int adjust_por_ra_blocks(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	if (blkaddr + 1 == next_blkaddr)</div><div class='ctx'> 		ra_blocks = min_t(unsigned int, RECOVERY_MAX_RA_BLOCKS,</div><div class='ctx'> 							ra_blocks * 2);</div><div class='del'>-	else if (next_blkaddr % sbi-&gt;blocks_per_seg)</div><div class='add'>+	else if (next_blkaddr % BLKS_PER_SEG(sbi))</div><div class='ctx'> 		ra_blocks = max_t(unsigned int, RECOVERY_MIN_RA_BLOCKS,</div><div class='ctx'> 							ra_blocks / 2);</div><div class='ctx'> 	return ra_blocks;</div><div class='hunk'>@@ -365,33 +358,34 @@ static int sanity_check_node_chain(struct f2fs_sb_info *sbi, block_t blkaddr,</div><div class='ctx'> 		block_t *blkaddr_fast, bool *is_detecting)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ra_blocks = RECOVERY_MAX_RA_BLOCKS;</div><div class='del'>-	struct page *page = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!*is_detecting)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+</div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(sbi, *blkaddr_fast, META_POR)) {</div><div class='ctx'> 			*is_detecting = false;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		page = f2fs_get_tmp_page(sbi, *blkaddr_fast);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+		folio = f2fs_get_tmp_folio(sbi, *blkaddr_fast);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-		if (!is_recoverable_dnode(page)) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		if (!is_recoverable_dnode(folio)) {</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			*is_detecting = false;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ra_blocks = adjust_por_ra_blocks(sbi, ra_blocks, *blkaddr_fast,</div><div class='del'>-						next_blkaddr_of_node(page));</div><div class='add'>+					next_blkaddr_of_node(folio));</div><div class='ctx'> </div><div class='del'>-		*blkaddr_fast = next_blkaddr_of_node(page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		*blkaddr_fast = next_blkaddr_of_node(folio);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_ra_meta_pages_cond(sbi, *blkaddr_fast, ra_blocks);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -405,10 +399,9 @@ static int sanity_check_node_chain(struct f2fs_sb_info *sbi, block_t blkaddr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head,</div><div class='del'>-				bool check_only)</div><div class='add'>+				bool check_only, bool *new_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg;</div><div class='del'>-	struct page *page = NULL;</div><div class='ctx'> 	block_t blkaddr, blkaddr_fast;</div><div class='ctx'> 	bool is_detecting = true;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -420,60 +413,65 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head,</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct fsync_inode_entry *entry;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		page = f2fs_get_tmp_page(sbi, blkaddr);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='add'>+		folio = f2fs_get_tmp_folio(sbi, blkaddr);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!is_recoverable_dnode(page)) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		if (!is_recoverable_dnode(folio)) {</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!is_fsync_dnode(page))</div><div class='add'>+		if (!is_fsync_dnode(folio))</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='del'>-		entry = get_fsync_inode(head, ino_of_node(page));</div><div class='add'>+		entry = get_fsync_inode(head, ino_of_node(folio));</div><div class='ctx'> 		if (!entry) {</div><div class='ctx'> 			bool quota_inode = false;</div><div class='ctx'> </div><div class='ctx'> 			if (!check_only &amp;&amp;</div><div class='del'>-					IS_INODE(page) &amp;&amp; is_dent_dnode(page)) {</div><div class='del'>-				err = f2fs_recover_inode_page(sbi, page);</div><div class='add'>+					IS_INODE(folio) &amp;&amp;</div><div class='add'>+					is_dent_dnode(folio)) {</div><div class='add'>+				err = f2fs_recover_inode_page(sbi, folio);</div><div class='ctx'> 				if (err) {</div><div class='del'>-					f2fs_put_page(page, 1);</div><div class='add'>+					f2fs_folio_put(folio, true);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				quota_inode = true;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * CP | dnode(F) | inode(DF)</div><div class='del'>-			 * For this case, we should not give up now.</div><div class='del'>-			 */</div><div class='del'>-			entry = add_fsync_inode(sbi, head, ino_of_node(page),</div><div class='add'>+			entry = add_fsync_inode(sbi, head, ino_of_node(folio),</div><div class='ctx'> 								quota_inode);</div><div class='ctx'> 			if (IS_ERR(entry)) {</div><div class='ctx'> 				err = PTR_ERR(entry);</div><div class='del'>-				if (err == -ENOENT)</div><div class='add'>+				/*</div><div class='add'>+				 * CP | dnode(F) | inode(DF)</div><div class='add'>+				 * For this case, we should not give up now.</div><div class='add'>+				 */</div><div class='add'>+				if (err == -ENOENT) {</div><div class='add'>+					if (check_only)</div><div class='add'>+						*new_inode = true;</div><div class='ctx'> 					goto next;</div><div class='del'>-				f2fs_put_page(page, 1);</div><div class='add'>+				}</div><div class='add'>+				f2fs_folio_put(folio, true);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		entry-&gt;blkaddr = blkaddr;</div><div class='ctx'> </div><div class='del'>-		if (IS_INODE(page) &amp;&amp; is_dent_dnode(page))</div><div class='add'>+		if (IS_INODE(folio) &amp;&amp; is_dent_dnode(folio))</div><div class='ctx'> 			entry-&gt;last_dentry = blkaddr;</div><div class='ctx'> next:</div><div class='ctx'> 		/* check next segment */</div><div class='del'>-		blkaddr = next_blkaddr_of_node(page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		blkaddr = next_blkaddr_of_node(folio);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 		err = sanity_check_node_chain(sbi, blkaddr, &amp;blkaddr_fast,</div><div class='ctx'> 				&amp;is_detecting);</div><div class='hunk'>@@ -499,7 +497,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	unsigned short blkoff = GET_BLKOFF_FROM_SEG0(sbi, blkaddr);</div><div class='ctx'> 	struct f2fs_summary_block *sum_node;</div><div class='ctx'> 	struct f2fs_summary sum;</div><div class='del'>-	struct page *sum_page, *node_page;</div><div class='add'>+	struct folio *sum_folio, *node_folio;</div><div class='ctx'> 	struct dnode_of_data tdn = *dn;</div><div class='ctx'> 	nid_t ino, nid;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -521,18 +519,18 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sum_page = f2fs_get_sum_page(sbi, segno);</div><div class='del'>-	if (IS_ERR(sum_page))</div><div class='del'>-		return PTR_ERR(sum_page);</div><div class='del'>-	sum_node = (struct f2fs_summary_block *)page_address(sum_page);</div><div class='add'>+	sum_folio = f2fs_get_sum_folio(sbi, segno);</div><div class='add'>+	if (IS_ERR(sum_folio))</div><div class='add'>+		return PTR_ERR(sum_folio);</div><div class='add'>+	sum_node = SUM_BLK_PAGE_ADDR(sum_folio, segno);</div><div class='ctx'> 	sum = sum_node-&gt;entries[blkoff];</div><div class='del'>-	f2fs_put_page(sum_page, 1);</div><div class='add'>+	f2fs_folio_put(sum_folio, true);</div><div class='ctx'> got_it:</div><div class='ctx'> 	/* Use the locked dnode page and inode */</div><div class='ctx'> 	nid = le32_to_cpu(sum.nid);</div><div class='ctx'> 	ofs_in_node = le16_to_cpu(sum.ofs_in_node);</div><div class='ctx'> </div><div class='del'>-	max_addrs = ADDRS_PER_PAGE(dn-&gt;node_page, dn-&gt;inode);</div><div class='add'>+	max_addrs = ADDRS_PER_PAGE(dn-&gt;node_folio, dn-&gt;inode);</div><div class='ctx'> 	if (ofs_in_node &gt;= max_addrs) {</div><div class='ctx'> 		f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%lu, nid:%u, max:%u",</div><div class='ctx'> 			ofs_in_node, dn-&gt;inode-&gt;i_ino, nid, max_addrs);</div><div class='hunk'>@@ -542,9 +540,9 @@ got_it:</div><div class='ctx'> </div><div class='ctx'> 	if (dn-&gt;inode-&gt;i_ino == nid) {</div><div class='ctx'> 		tdn.nid = nid;</div><div class='del'>-		if (!dn-&gt;inode_page_locked)</div><div class='del'>-			lock_page(dn-&gt;inode_page);</div><div class='del'>-		tdn.node_page = dn-&gt;inode_page;</div><div class='add'>+		if (!dn-&gt;inode_folio_locked)</div><div class='add'>+			folio_lock(dn-&gt;inode_folio);</div><div class='add'>+		tdn.node_folio = dn-&gt;inode_folio;</div><div class='ctx'> 		tdn.ofs_in_node = ofs_in_node;</div><div class='ctx'> 		goto truncate_out;</div><div class='ctx'> 	} else if (dn-&gt;nid == nid) {</div><div class='hunk'>@@ -553,13 +551,13 @@ got_it:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the node page */</div><div class='del'>-	node_page = f2fs_get_node_page(sbi, nid);</div><div class='del'>-	if (IS_ERR(node_page))</div><div class='del'>-		return PTR_ERR(node_page);</div><div class='add'>+	node_folio = f2fs_get_node_folio(sbi, nid, NODE_TYPE_REGULAR);</div><div class='add'>+	if (IS_ERR(node_folio))</div><div class='add'>+		return PTR_ERR(node_folio);</div><div class='ctx'> </div><div class='del'>-	offset = ofs_of_node(node_page);</div><div class='del'>-	ino = ino_of_node(node_page);</div><div class='del'>-	f2fs_put_page(node_page, 1);</div><div class='add'>+	offset = ofs_of_node(node_folio);</div><div class='add'>+	ino = ino_of_node(node_folio);</div><div class='add'>+	f2fs_folio_put(node_folio, true);</div><div class='ctx'> </div><div class='ctx'> 	if (ino != dn-&gt;inode-&gt;i_ino) {</div><div class='ctx'> 		int ret;</div><div class='hunk'>@@ -585,8 +583,8 @@ got_it:</div><div class='ctx'> 	 * if inode page is locked, unlock temporarily, but its reference</div><div class='ctx'> 	 * count keeps alive.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ino == dn-&gt;inode-&gt;i_ino &amp;&amp; dn-&gt;inode_page_locked)</div><div class='del'>-		unlock_page(dn-&gt;inode_page);</div><div class='add'>+	if (ino == dn-&gt;inode-&gt;i_ino &amp;&amp; dn-&gt;inode_folio_locked)</div><div class='add'>+		folio_unlock(dn-&gt;inode_folio);</div><div class='ctx'> </div><div class='ctx'> 	set_new_dnode(&amp;tdn, inode, NULL, NULL, 0);</div><div class='ctx'> 	if (f2fs_get_dnode_of_data(&amp;tdn, bidx, LOOKUP_NODE))</div><div class='hunk'>@@ -599,40 +597,53 @@ got_it:</div><div class='ctx'> out:</div><div class='ctx'> 	if (ino != dn-&gt;inode-&gt;i_ino)</div><div class='ctx'> 		iput(inode);</div><div class='del'>-	else if (dn-&gt;inode_page_locked)</div><div class='del'>-		lock_page(dn-&gt;inode_page);</div><div class='add'>+	else if (dn-&gt;inode_folio_locked)</div><div class='add'>+		folio_lock(dn-&gt;inode_folio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> truncate_out:</div><div class='ctx'> 	if (f2fs_data_blkaddr(&amp;tdn) == blkaddr)</div><div class='ctx'> 		f2fs_truncate_data_blocks_range(&amp;tdn, 1);</div><div class='del'>-	if (dn-&gt;inode-&gt;i_ino == nid &amp;&amp; !dn-&gt;inode_page_locked)</div><div class='del'>-		unlock_page(dn-&gt;inode_page);</div><div class='add'>+	if (dn-&gt;inode-&gt;i_ino == nid &amp;&amp; !dn-&gt;inode_folio_locked)</div><div class='add'>+		folio_unlock(dn-&gt;inode_folio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int f2fs_reserve_new_block_retry(struct dnode_of_data *dn)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = DEFAULT_FAILURE_RETRY_COUNT; i &gt; 0; i--) {</div><div class='add'>+		err = f2fs_reserve_new_block(dn);</div><div class='add'>+		if (!err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,</div><div class='del'>-					struct page *page)</div><div class='add'>+					struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct dnode_of_data dn;</div><div class='ctx'> 	struct node_info ni;</div><div class='del'>-	unsigned int start, end;</div><div class='add'>+	unsigned int start = 0, end = 0, index;</div><div class='ctx'> 	int err = 0, recovered = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* step 1: recover xattr */</div><div class='del'>-	if (IS_INODE(page)) {</div><div class='del'>-		err = f2fs_recover_inline_xattr(inode, page);</div><div class='add'>+	if (IS_INODE(folio)) {</div><div class='add'>+		err = f2fs_recover_inline_xattr(inode, folio);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='del'>-	} else if (f2fs_has_xattr_block(ofs_of_node(page))) {</div><div class='del'>-		err = f2fs_recover_xattr_data(inode, page);</div><div class='add'>+	} else if (f2fs_has_xattr_block(ofs_of_node(folio))) {</div><div class='add'>+		err = f2fs_recover_xattr_data(inode, folio);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			recovered++;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 2: recover inline data */</div><div class='del'>-	err = f2fs_recover_inline_data(inode, page);</div><div class='add'>+	err = f2fs_recover_inline_data(inode, folio);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == 1)</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -640,8 +651,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 3: recover data indices */</div><div class='del'>-	start = f2fs_start_bidx_of_node(ofs_of_node(page), inode);</div><div class='del'>-	end = start + ADDRS_PER_PAGE(page, inode);</div><div class='add'>+	start = f2fs_start_bidx_of_node(ofs_of_node(folio), inode);</div><div class='add'>+	end = start + ADDRS_PER_PAGE(folio, inode);</div><div class='ctx'> </div><div class='ctx'> 	set_new_dnode(&amp;dn, inode, NULL, NULL, 0);</div><div class='ctx'> retry_dn:</div><div class='hunk'>@@ -654,40 +665,38 @@ retry_dn:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_wait_on_page_writeback(dn.node_page, NODE, true, true);</div><div class='add'>+	f2fs_folio_wait_writeback(dn.node_folio, NODE, true, true);</div><div class='ctx'> </div><div class='ctx'> 	err = f2fs_get_node_info(sbi, dn.nid, &amp;ni, false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(sbi, ni.ino != ino_of_node(page));</div><div class='add'>+	f2fs_bug_on(sbi, ni.ino != ino_of_node(folio));</div><div class='ctx'> </div><div class='del'>-	if (ofs_of_node(dn.node_page) != ofs_of_node(page)) {</div><div class='add'>+	if (ofs_of_node(dn.node_folio) != ofs_of_node(folio)) {</div><div class='ctx'> 		f2fs_warn(sbi, "Inconsistent ofs_of_node, ino:%lu, ofs:%u, %u",</div><div class='del'>-			  inode-&gt;i_ino, ofs_of_node(dn.node_page),</div><div class='del'>-			  ofs_of_node(page));</div><div class='add'>+			  inode-&gt;i_ino, ofs_of_node(dn.node_folio),</div><div class='add'>+			  ofs_of_node(folio));</div><div class='ctx'> 		err = -EFSCORRUPTED;</div><div class='ctx'> 		f2fs_handle_error(sbi, ERROR_INCONSISTENT_FOOTER);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (; start &lt; end; start++, dn.ofs_in_node++) {</div><div class='add'>+	for (index = start; index &lt; end; index++, dn.ofs_in_node++) {</div><div class='ctx'> 		block_t src, dest;</div><div class='ctx'> </div><div class='ctx'> 		src = f2fs_data_blkaddr(&amp;dn);</div><div class='del'>-		dest = data_blkaddr(dn.inode, page, dn.ofs_in_node);</div><div class='add'>+		dest = data_blkaddr(dn.inode, folio, dn.ofs_in_node);</div><div class='ctx'> </div><div class='ctx'> 		if (__is_valid_data_blkaddr(src) &amp;&amp;</div><div class='ctx'> 			!f2fs_is_valid_blkaddr(sbi, src, META_POR)) {</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (__is_valid_data_blkaddr(dest) &amp;&amp;</div><div class='ctx'> 			!f2fs_is_valid_blkaddr(sbi, dest, META_POR)) {</div><div class='ctx'> 			err = -EFSCORRUPTED;</div><div class='del'>-			f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -702,9 +711,9 @@ retry_dn:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!file_keep_isize(inode) &amp;&amp;</div><div class='del'>-			(i_size_read(inode) &lt;= ((loff_t)start &lt;&lt; PAGE_SHIFT)))</div><div class='add'>+			(i_size_read(inode) &lt;= ((loff_t)index &lt;&lt; PAGE_SHIFT)))</div><div class='ctx'> 			f2fs_i_size_write(inode,</div><div class='del'>-				(loff_t)(start + 1) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+				(loff_t)(index + 1) &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * dest is reserved block, invalidate src block</div><div class='hunk'>@@ -712,14 +721,8 @@ retry_dn:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dest == NEW_ADDR) {</div><div class='ctx'> 			f2fs_truncate_data_blocks_range(&amp;dn, 1);</div><div class='del'>-			do {</div><div class='del'>-				err = f2fs_reserve_new_block(&amp;dn);</div><div class='del'>-				if (err == -ENOSPC) {</div><div class='del'>-					f2fs_bug_on(sbi, 1);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			} while (err &amp;&amp;</div><div class='del'>-				IS_ENABLED(CONFIG_F2FS_FAULT_INJECTION));</div><div class='add'>+</div><div class='add'>+			err = f2fs_reserve_new_block_retry(&amp;dn);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -727,16 +730,8 @@ retry_dn:</div><div class='ctx'> </div><div class='ctx'> 		/* dest is valid block, try to recover from src to dest */</div><div class='ctx'> 		if (f2fs_is_valid_blkaddr(sbi, dest, META_POR)) {</div><div class='del'>-</div><div class='ctx'> 			if (src == NULL_ADDR) {</div><div class='del'>-				do {</div><div class='del'>-					err = f2fs_reserve_new_block(&amp;dn);</div><div class='del'>-					if (err == -ENOSPC) {</div><div class='del'>-						f2fs_bug_on(sbi, 1);</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				} while (err &amp;&amp;</div><div class='del'>-					IS_ENABLED(CONFIG_F2FS_FAULT_INJECTION));</div><div class='add'>+				err = f2fs_reserve_new_block_retry(&amp;dn);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					goto err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -756,8 +751,6 @@ retry_prev:</div><div class='ctx'> 				f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%lu, ofs:%u",</div><div class='ctx'> 					dest, inode-&gt;i_ino, dn.ofs_in_node);</div><div class='ctx'> 				err = -EFSCORRUPTED;</div><div class='del'>-				f2fs_handle_error(sbi,</div><div class='del'>-						ERROR_INVALID_BLKADDR);</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -768,16 +761,18 @@ retry_prev:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	copy_node_footer(dn.node_page, page);</div><div class='del'>-	fill_node_footer(dn.node_page, dn.nid, ni.ino,</div><div class='del'>-					ofs_of_node(page), false);</div><div class='del'>-	set_page_dirty(dn.node_page);</div><div class='add'>+	copy_node_footer(dn.node_folio, folio);</div><div class='add'>+	fill_node_footer(dn.node_folio, dn.nid, ni.ino,</div><div class='add'>+					ofs_of_node(folio), false);</div><div class='add'>+	folio_mark_dirty(dn.node_folio);</div><div class='ctx'> err:</div><div class='ctx'> 	f2fs_put_dnode(&amp;dn);</div><div class='ctx'> out:</div><div class='del'>-	f2fs_notice(sbi, "recover_data: ino = %lx (i_size: %s) recovered = %d, err = %d",</div><div class='del'>-		    inode-&gt;i_ino, file_keep_isize(inode) ? "keep" : "recover",</div><div class='del'>-		    recovered, err);</div><div class='add'>+	f2fs_notice(sbi, "recover_data: ino = %lx, nid = %x (i_size: %s), "</div><div class='add'>+		    "range (%u, %u), recovered = %d, err = %d",</div><div class='add'>+		    inode-&gt;i_ino, nid_of_node(folio),</div><div class='add'>+		    file_keep_isize(inode) ? "keep" : "recover",</div><div class='add'>+		    start, end, recovered, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -785,10 +780,17 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list,</div><div class='ctx'> 		struct list_head *tmp_inode_list, struct list_head *dir_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg;</div><div class='del'>-	struct page *page = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	block_t blkaddr;</div><div class='ctx'> 	unsigned int ra_blocks = RECOVERY_MAX_RA_BLOCKS;</div><div class='add'>+	unsigned int recoverable_dnode = 0;</div><div class='add'>+	unsigned int fsynced_dnode = 0;</div><div class='add'>+	unsigned int total_dnode = 0;</div><div class='add'>+	unsigned int recovered_inode = 0;</div><div class='add'>+	unsigned int recovered_dentry = 0;</div><div class='add'>+	unsigned int recovered_dnode = 0;</div><div class='add'>+</div><div class='add'>+	f2fs_notice(sbi, "do_recover_data: start to recover dnode");</div><div class='ctx'> </div><div class='ctx'> 	/* get node pages in the current segment */</div><div class='ctx'> 	curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);</div><div class='hunk'>@@ -796,89 +798,101 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list,</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct fsync_inode_entry *entry;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		page = f2fs_get_tmp_page(sbi, blkaddr);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='add'>+		folio = f2fs_get_tmp_folio(sbi, blkaddr);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!is_recoverable_dnode(page)) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		if (!is_recoverable_dnode(folio)) {</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		recoverable_dnode++;</div><div class='ctx'> </div><div class='del'>-		entry = get_fsync_inode(inode_list, ino_of_node(page));</div><div class='add'>+		entry = get_fsync_inode(inode_list, ino_of_node(folio));</div><div class='ctx'> 		if (!entry)</div><div class='ctx'> 			goto next;</div><div class='add'>+		fsynced_dnode++;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * inode(x) | CP | inode(x) | dnode(F)</div><div class='ctx'> 		 * In this case, we can lose the latest inode(x).</div><div class='ctx'> 		 * So, call recover_inode for the inode update.</div><div class='ctx'> 		 */</div><div class='del'>-		if (IS_INODE(page)) {</div><div class='del'>-			err = recover_inode(entry-&gt;inode, page);</div><div class='add'>+		if (IS_INODE(folio)) {</div><div class='add'>+			err = recover_inode(entry-&gt;inode, folio);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				f2fs_put_page(page, 1);</div><div class='add'>+				f2fs_folio_put(folio, true);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			recovered_inode++;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (entry-&gt;last_dentry == blkaddr) {</div><div class='del'>-			err = recover_dentry(entry-&gt;inode, page, dir_list);</div><div class='add'>+			err = recover_dentry(entry-&gt;inode, folio, dir_list);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				f2fs_put_page(page, 1);</div><div class='add'>+				f2fs_folio_put(folio, true);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			recovered_dentry++;</div><div class='ctx'> 		}</div><div class='del'>-		err = do_recover_data(sbi, entry-&gt;inode, page);</div><div class='add'>+		err = do_recover_data(sbi, entry-&gt;inode, folio);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		recovered_dnode++;</div><div class='ctx'> </div><div class='ctx'> 		if (entry-&gt;blkaddr == blkaddr)</div><div class='ctx'> 			list_move_tail(&amp;entry-&gt;list, tmp_inode_list);</div><div class='ctx'> next:</div><div class='ctx'> 		ra_blocks = adjust_por_ra_blocks(sbi, ra_blocks, blkaddr,</div><div class='del'>-						next_blkaddr_of_node(page));</div><div class='add'>+					next_blkaddr_of_node(folio));</div><div class='ctx'> </div><div class='ctx'> 		/* check next segment */</div><div class='del'>-		blkaddr = next_blkaddr_of_node(page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		blkaddr = next_blkaddr_of_node(folio);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_ra_meta_pages_cond(sbi, blkaddr, ra_blocks);</div><div class='add'>+		total_dnode++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!err)</div><div class='del'>-		f2fs_allocate_new_segments(sbi);</div><div class='add'>+		err = f2fs_allocate_new_segments(sbi);</div><div class='add'>+</div><div class='add'>+	f2fs_notice(sbi, "do_recover_data: dnode: (recoverable: %u, fsynced: %u, "</div><div class='add'>+		"total: %u), recovered: (inode: %u, dentry: %u, dnode: %u), err: %d",</div><div class='add'>+		recoverable_dnode, fsynced_dnode, total_dnode, recovered_inode,</div><div class='add'>+		recovered_dentry, recovered_dnode, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)</div><div class='ctx'> {</div><div class='del'>-	struct list_head inode_list, tmp_inode_list;</div><div class='del'>-	struct list_head dir_list;</div><div class='add'>+	LIST_HEAD(inode_list);</div><div class='add'>+	LIST_HEAD(tmp_inode_list);</div><div class='add'>+	LIST_HEAD(dir_list);</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned long s_flags = sbi-&gt;sb-&gt;s_flags;</div><div class='ctx'> 	bool need_writecp = false;</div><div class='del'>-	bool fix_curseg_write_pointer = false;</div><div class='add'>+	bool new_inode = false;</div><div class='add'>+</div><div class='add'>+	f2fs_notice(sbi, "f2fs_recover_fsync_data: recovery fsync data, "</div><div class='add'>+					"check_only: %d", check_only);</div><div class='ctx'> </div><div class='ctx'> 	if (is_sbi_flag_set(sbi, SBI_IS_WRITABLE))</div><div class='ctx'> 		f2fs_info(sbi, "recover fsync data on readonly fs");</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;inode_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;tmp_inode_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dir_list);</div><div class='del'>-</div><div class='ctx'> 	/* prevent checkpoint */</div><div class='ctx'> 	f2fs_down_write(&amp;sbi-&gt;cp_global_sem);</div><div class='ctx'> </div><div class='ctx'> 	/* step #1: find fsynced inode numbers */</div><div class='del'>-	err = find_fsync_dnodes(sbi, &amp;inode_list, check_only);</div><div class='del'>-	if (err || list_empty(&amp;inode_list))</div><div class='add'>+	err = find_fsync_dnodes(sbi, &amp;inode_list, check_only, &amp;new_inode);</div><div class='add'>+	if (err &lt; 0 || (list_empty(&amp;inode_list) &amp;&amp; (!check_only || !new_inode)))</div><div class='ctx'> 		goto skip;</div><div class='ctx'> </div><div class='ctx'> 	if (check_only) {</div><div class='hunk'>@@ -895,8 +909,6 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)</div><div class='ctx'> 	else</div><div class='ctx'> 		f2fs_bug_on(sbi, sbi-&gt;sb-&gt;s_flags &amp; SB_ACTIVE);</div><div class='ctx'> skip:</div><div class='del'>-	fix_curseg_write_pointer = !check_only || list_empty(&amp;inode_list);</div><div class='del'>-</div><div class='ctx'> 	destroy_fsync_dnodes(&amp;inode_list, err);</div><div class='ctx'> 	destroy_fsync_dnodes(&amp;tmp_inode_list, err);</div><div class='ctx'> </div><div class='hunk'>@@ -914,13 +926,8 @@ skip:</div><div class='ctx'> 	 * and the f2fs is not read only, check and fix zoned block devices'</div><div class='ctx'> 	 * write pointer consistency.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!err &amp;&amp; fix_curseg_write_pointer &amp;&amp; !f2fs_readonly(sbi-&gt;sb) &amp;&amp;</div><div class='del'>-			f2fs_sb_has_blkzoned(sbi)) {</div><div class='del'>-		err = f2fs_fix_curseg_write_pointer(sbi);</div><div class='del'>-		if (!err)</div><div class='del'>-			err = f2fs_check_write_pointer(sbi);</div><div class='del'>-		ret = err;</div><div class='del'>-	}</div><div class='add'>+	if (!err)</div><div class='add'>+		err = f2fs_check_and_fix_write_pointer(sbi);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		clear_sbi_flag(sbi, SBI_POR_DOING);</div><div class='head'>diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c<br/>index 4c8836ded90f..c26424f47686 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/segment.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/segment.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/segment.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/segment.c</a></div><div class='hunk'>@@ -192,16 +192,28 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)</div><div class='ctx'> 	if (!f2fs_is_atomic_file(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (clean)</div><div class='add'>+		truncate_inode_pages_final(inode-&gt;i_mapping);</div><div class='add'>+</div><div class='ctx'> 	release_atomic_write_cnt(inode);</div><div class='ctx'> 	clear_inode_flag(inode, FI_ATOMIC_COMMITTED);</div><div class='ctx'> 	clear_inode_flag(inode, FI_ATOMIC_REPLACE);</div><div class='ctx'> 	clear_inode_flag(inode, FI_ATOMIC_FILE);</div><div class='add'>+	if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) {</div><div class='add'>+		clear_inode_flag(inode, FI_ATOMIC_DIRTIED);</div><div class='add'>+		/*</div><div class='add'>+		 * The vfs inode keeps clean during commit, but the f2fs inode</div><div class='add'>+		 * doesn't. So clear the dirty state after commit and let</div><div class='add'>+		 * f2fs_mark_inode_dirty_sync ensure a consistent dirty state.</div><div class='add'>+		 */</div><div class='add'>+		f2fs_inode_synced(inode);</div><div class='add'>+		f2fs_mark_inode_dirty_sync(inode, true);</div><div class='add'>+	}</div><div class='ctx'> 	stat_dec_atomic_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	F2FS_I(inode)-&gt;atomic_write_task = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (clean) {</div><div class='del'>-		truncate_inode_pages_final(inode-&gt;i_mapping);</div><div class='ctx'> 		f2fs_i_size_write(inode, fi-&gt;original_i_size);</div><div class='ctx'> 		fi-&gt;original_i_size = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -222,7 +234,7 @@ retry:</div><div class='ctx'> 	err = f2fs_get_dnode_of_data(&amp;dn, index, ALLOC_NODE);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == -ENOMEM) {</div><div class='del'>-			f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+			memalloc_retry_wait(GFP_NOFS);</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		}</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -239,7 +251,7 @@ retry:</div><div class='ctx'> 		if (!__is_valid_data_blkaddr(new_addr)) {</div><div class='ctx'> 			if (new_addr == NULL_ADDR)</div><div class='ctx'> 				dec_valid_block_count(sbi, inode, 1);</div><div class='del'>-			f2fs_invalidate_blocks(sbi, dn.data_blkaddr);</div><div class='add'>+			f2fs_invalidate_blocks(sbi, dn.data_blkaddr, 1);</div><div class='ctx'> 			f2fs_update_data_blkaddr(&amp;dn, new_addr);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			f2fs_replace_block(sbi, &amp;dn, dn.data_blkaddr,</div><div class='hunk'>@@ -248,7 +260,7 @@ retry:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		blkcnt_t count = 1;</div><div class='ctx'> </div><div class='del'>-		err = inc_valid_block_count(sbi, inode, &amp;count);</div><div class='add'>+		err = inc_valid_block_count(sbi, inode, &amp;count, true);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			f2fs_put_dnode(&amp;dn);</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -322,7 +334,7 @@ static int __f2fs_commit_atomic_write(struct inode *inode)</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		blen = min((pgoff_t)ADDRS_PER_PAGE(dn.node_page, cow_inode),</div><div class='add'>+		blen = min((pgoff_t)ADDRS_PER_PAGE(dn.node_folio, cow_inode),</div><div class='ctx'> 				len);</div><div class='ctx'> 		index = off;</div><div class='ctx'> 		for (i = 0; i &lt; blen; i++, dn.ofs_in_node++, index++) {</div><div class='hunk'>@@ -334,8 +346,6 @@ static int __f2fs_commit_atomic_write(struct inode *inode)</div><div class='ctx'> 					DATA_GENERIC_ENHANCE)) {</div><div class='ctx'> 				f2fs_put_dnode(&amp;dn);</div><div class='ctx'> 				ret = -EFSCORRUPTED;</div><div class='del'>-				f2fs_handle_error(sbi,</div><div class='del'>-						ERROR_INVALID_BLKADDR);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -361,11 +371,24 @@ next:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	if (time_to_inject(sbi, FAULT_TIMEOUT))</div><div class='add'>+		f2fs_io_schedule_timeout_killable(DEFAULT_FAULT_TIMEOUT);</div><div class='add'>+</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		sbi-&gt;revoked_atomic_block += fi-&gt;atomic_write_cnt;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sbi-&gt;committed_atomic_block += fi-&gt;atomic_write_cnt;</div><div class='ctx'> 		set_inode_flag(inode, FI_ATOMIC_COMMITTED);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * inode may has no FI_ATOMIC_DIRTIED flag due to no write</div><div class='add'>+		 * before commit.</div><div class='add'>+		 */</div><div class='add'>+		if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) {</div><div class='add'>+			/* clear atomic dirty status and set vfs dirty status */</div><div class='add'>+			clear_inode_flag(inode, FI_ATOMIC_DIRTIED);</div><div class='add'>+			f2fs_mark_inode_dirty_sync(inode, true);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__complete_revoke_list(inode, &amp;revoke_list, ret ? true : false);</div><div class='hunk'>@@ -400,6 +423,9 @@ int f2fs_commit_atomic_write(struct inode *inode)</div><div class='ctx'>  */</div><div class='ctx'> void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)</div><div class='ctx'> {</div><div class='add'>+	if (f2fs_cp_error(sbi))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (time_to_inject(sbi, FAULT_CHECKPOINT))</div><div class='ctx'> 		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_FAULT_INJECT);</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +433,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)</div><div class='ctx'> 	if (need &amp;&amp; excess_cached_nats(sbi))</div><div class='ctx'> 		f2fs_balance_fs_bg(sbi, false);</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_is_checkpoint_ready(sbi))</div><div class='add'>+	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -429,7 +455,8 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct f2fs_gc_control gc_control = {</div><div class='ctx'> 			.victim_segno = NULL_SEGNO,</div><div class='del'>-			.init_gc_type = BG_GC,</div><div class='add'>+			.init_gc_type = f2fs_sb_has_blkzoned(sbi) ?</div><div class='add'>+				FG_GC : BG_GC,</div><div class='ctx'> 			.no_bg_gc = true,</div><div class='ctx'> 			.should_migrate_blocks = false,</div><div class='ctx'> 			.err_gc_skipped = false,</div><div class='hunk'>@@ -448,8 +475,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);</div><div class='ctx'> 	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);</div><div class='ctx'> 	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);</div><div class='del'>-	unsigned int threshold = sbi-&gt;blocks_per_seg * factor *</div><div class='del'>-					DEFAULT_DIRTY_THRESHOLD;</div><div class='add'>+	unsigned int threshold =</div><div class='add'>+		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));</div><div class='ctx'> 	unsigned int global_threshold = threshold * 3 / 2;</div><div class='ctx'> </div><div class='ctx'> 	if (dents &gt;= threshold || qdata &gt;= threshold ||</div><div class='hunk'>@@ -723,7 +750,7 @@ int f2fs_flush_device_cache(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		do {</div><div class='ctx'> 			ret = __submit_flush_wait(sbi, FDEV(i).bdev);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+				f2fs_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='ctx'> 		} while (ret &amp;&amp; --count);</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -746,7 +773,7 @@ static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,</div><div class='ctx'> 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);</div><div class='ctx'> </div><div class='ctx'> 	/* need not be added */</div><div class='del'>-	if (IS_CURSEG(sbi, segno))</div><div class='add'>+	if (is_curseg(sbi, segno))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_set_bit(segno, dirty_i-&gt;dirty_segmap[dirty_type]))</div><div class='hunk'>@@ -768,10 +795,12 @@ static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,</div><div class='ctx'> 			block_t valid_blocks =</div><div class='ctx'> 				get_valid_blocks(sbi, segno, true);</div><div class='ctx'> </div><div class='del'>-			f2fs_bug_on(sbi, unlikely(!valid_blocks ||</div><div class='del'>-					valid_blocks == CAP_BLKS_PER_SEC(sbi)));</div><div class='add'>+			f2fs_bug_on(sbi,</div><div class='add'>+				(!is_sbi_flag_set(sbi, SBI_CP_DISABLED) &amp;&amp;</div><div class='add'>+				!valid_blocks) ||</div><div class='add'>+				valid_blocks == CAP_BLKS_PER_SEC(sbi));</div><div class='ctx'> </div><div class='del'>-			if (!IS_CURSEC(sbi, secno))</div><div class='add'>+			if (!is_cursec(sbi, secno))</div><div class='ctx'> 				set_bit(secno, dirty_i-&gt;dirty_secmap);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -810,7 +839,7 @@ static void __remove_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!IS_CURSEC(sbi, secno))</div><div class='add'>+			if (!is_cursec(sbi, secno))</div><div class='ctx'> 				set_bit(secno, dirty_i-&gt;dirty_secmap);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -827,7 +856,7 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='ctx'> 	unsigned short valid_blocks, ckpt_valid_blocks;</div><div class='ctx'> 	unsigned int usable_blocks;</div><div class='ctx'> </div><div class='del'>-	if (segno == NULL_SEGNO || IS_CURSEG(sbi, segno))</div><div class='add'>+	if (segno == NULL_SEGNO || is_curseg(sbi, segno))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	usable_blocks = f2fs_usable_blks_in_seg(sbi, segno);</div><div class='hunk'>@@ -860,7 +889,7 @@ void f2fs_dirty_to_prefree(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	for_each_set_bit(segno, dirty_i-&gt;dirty_segmap[DIRTY], MAIN_SEGS(sbi)) {</div><div class='ctx'> 		if (get_valid_blocks(sbi, segno, false))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (IS_CURSEG(sbi, segno))</div><div class='add'>+		if (is_curseg(sbi, segno))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		__locate_dirty_segment(sbi, segno, PRE);</div><div class='ctx'> 		__remove_dirty_segment(sbi, segno, DIRTY);</div><div class='hunk'>@@ -872,7 +901,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	int ovp_hole_segs =</div><div class='ctx'> 		(overprovision_segments(sbi) - reserved_segments(sbi));</div><div class='del'>-	block_t ovp_holes = ovp_hole_segs &lt;&lt; sbi-&gt;log_blocks_per_seg;</div><div class='add'>+	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);</div><div class='ctx'> 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);</div><div class='ctx'> 	block_t holes[2] = {0, 0};	/* DATA and NODE */</div><div class='ctx'> 	block_t unusable;</div><div class='hunk'>@@ -901,11 +930,16 @@ int f2fs_disable_cp_again(struct f2fs_sb_info *sbi, block_t unusable)</div><div class='ctx'> {</div><div class='ctx'> 	int ovp_hole_segs =</div><div class='ctx'> 		(overprovision_segments(sbi) - reserved_segments(sbi));</div><div class='add'>+</div><div class='add'>+	if (F2FS_OPTION(sbi).unusable_cap_perc == 100)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (unusable &gt; F2FS_OPTION(sbi).unusable_cap)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	if (is_sbi_flag_set(sbi, SBI_CP_DISABLED_QUICK) &amp;&amp;</div><div class='ctx'> 		dirty_segments(sbi) &gt; ovp_hole_segs)</div><div class='ctx'> 		return -EAGAIN;</div><div class='add'>+	if (has_not_enough_free_secs(sbi, 0, 0))</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1101,9 +1135,8 @@ static void __remove_discard_cmd(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		dc-&gt;error = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dc-&gt;error)</div><div class='del'>-		printk_ratelimited(</div><div class='del'>-			"%sF2FS-fs (%s): Issue discard(%u, %u, %u) failed, ret: %d",</div><div class='del'>-			KERN_INFO, sbi-&gt;sb-&gt;s_id,</div><div class='add'>+		f2fs_info_ratelimited(sbi,</div><div class='add'>+			"Issue discard(%u, %u, %u) failed, ret: %d",</div><div class='ctx'> 			dc-&gt;di.lstart, dc-&gt;di.start, dc-&gt;di.len, dc-&gt;error);</div><div class='ctx'> 	__detach_discard_cmd(dcc, dc);</div><div class='ctx'> }</div><div class='hunk'>@@ -1132,8 +1165,7 @@ static void __check_sit_bitmap(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	struct seg_entry *sentry;</div><div class='ctx'> 	unsigned int segno;</div><div class='ctx'> 	block_t blk = start;</div><div class='del'>-	unsigned long offset, size, max_blocks = sbi-&gt;blocks_per_seg;</div><div class='del'>-	unsigned long *map;</div><div class='add'>+	unsigned long offset, size, *map;</div><div class='ctx'> </div><div class='ctx'> 	while (blk &lt; end) {</div><div class='ctx'> 		segno = GET_SEGNO(sbi, blk);</div><div class='hunk'>@@ -1143,7 +1175,7 @@ static void __check_sit_bitmap(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		if (end &lt; START_BLOCK(sbi, segno + 1))</div><div class='ctx'> 			size = GET_BLKOFF_FROM_SEG0(sbi, end);</div><div class='ctx'> 		else</div><div class='del'>-			size = max_blocks;</div><div class='add'>+			size = BLKS_PER_SEG(sbi);</div><div class='ctx'> 		map = (unsigned long *)(sentry-&gt;cur_valid_map);</div><div class='ctx'> 		offset = __find_rev_next_bit(map, size, offset);</div><div class='ctx'> 		f2fs_bug_on(sbi, offset != size);</div><div class='hunk'>@@ -1277,6 +1309,15 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * stop issuing discard for any of below cases:</div><div class='add'>+	 * 1. device is conventional zone, but it doesn't support discard.</div><div class='add'>+	 * 2. device is regulare device, after snapshot it doesn't support</div><div class='add'>+	 * discard.</div><div class='add'>+	 */</div><div class='add'>+	if (!bdev_max_discard_sectors(bdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	trace_f2fs_issue_discard(bdev, dc-&gt;di.start, dc-&gt;di.len);</div><div class='ctx'> </div><div class='ctx'> 	lstart = dc-&gt;di.lstart;</div><div class='hunk'>@@ -1302,15 +1343,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 		dc-&gt;di.len += len;</div><div class='ctx'> </div><div class='add'>+		err = 0;</div><div class='ctx'> 		if (time_to_inject(sbi, FAULT_DISCARD)) {</div><div class='ctx'> 			err = -EIO;</div><div class='del'>-		} else {</div><div class='del'>-			err = __blkdev_issue_discard(bdev,</div><div class='del'>-					SECTOR_FROM_BLOCK(start),</div><div class='del'>-					SECTOR_FROM_BLOCK(len),</div><div class='del'>-					GFP_NOFS, &amp;bio);</div><div class='del'>-		}</div><div class='del'>-		if (err) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;dc-&gt;lock, flags);</div><div class='ctx'> 			if (dc-&gt;state == D_PARTIAL)</div><div class='ctx'> 				dc-&gt;state = D_SUBMIT;</div><div class='hunk'>@@ -1319,6 +1354,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		__blkdev_issue_discard(bdev, SECTOR_FROM_BLOCK(start),</div><div class='add'>+				SECTOR_FROM_BLOCK(len), GFP_NOFS, &amp;bio);</div><div class='ctx'> 		f2fs_bug_on(sbi, !bio);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1971,9 +2008,15 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING))) {</div><div class='add'>+			unsigned int nofs_flags;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='ctx'> 			trace_f2fs_issue_reset_zone(bdev, blkstart);</div><div class='del'>-			return blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,</div><div class='del'>-						sector, nr_sects, GFP_NOFS);</div><div class='add'>+			nofs_flags = memalloc_nofs_save();</div><div class='add'>+			ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,</div><div class='add'>+						sector, nr_sects);</div><div class='add'>+			memalloc_nofs_restore(nofs_flags);</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		__queue_zone_reset_cmd(sbi, bdev, blkstart, lblkstart, blklen);</div><div class='hunk'>@@ -2042,7 +2085,6 @@ static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,</div><div class='ctx'> 							bool check_only)</div><div class='ctx'> {</div><div class='ctx'> 	int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long);</div><div class='del'>-	int max_blocks = sbi-&gt;blocks_per_seg;</div><div class='ctx'> 	struct seg_entry *se = get_seg_entry(sbi, cpc-&gt;trim_start);</div><div class='ctx'> 	unsigned long *cur_map = (unsigned long *)se-&gt;cur_valid_map;</div><div class='ctx'> 	unsigned long *ckpt_map = (unsigned long *)se-&gt;ckpt_valid_map;</div><div class='hunk'>@@ -2054,12 +2096,15 @@ static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,</div><div class='ctx'> 	struct list_head *head = &amp;SM_I(sbi)-&gt;dcc_info-&gt;entry_list;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (se-&gt;valid_blocks == max_blocks || !f2fs_hw_support_discard(sbi) ||</div><div class='del'>-			!f2fs_block_unit_discard(sbi))</div><div class='add'>+	if (se-&gt;valid_blocks == BLKS_PER_SEG(sbi) ||</div><div class='add'>+	    !f2fs_hw_support_discard(sbi) ||</div><div class='add'>+	    !f2fs_block_unit_discard(sbi))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (!force) {</div><div class='del'>-		if (!f2fs_realtime_discard_enable(sbi) || !se-&gt;valid_blocks ||</div><div class='add'>+		if (!f2fs_realtime_discard_enable(sbi) ||</div><div class='add'>+			(!se-&gt;valid_blocks &amp;&amp;</div><div class='add'>+				!is_curseg(sbi, cpc-&gt;trim_start)) ||</div><div class='ctx'> 			SM_I(sbi)-&gt;dcc_info-&gt;nr_discards &gt;=</div><div class='ctx'> 				SM_I(sbi)-&gt;dcc_info-&gt;max_discards)</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -2072,13 +2117,14 @@ static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,</div><div class='ctx'> </div><div class='ctx'> 	while (force || SM_I(sbi)-&gt;dcc_info-&gt;nr_discards &lt;=</div><div class='ctx'> 				SM_I(sbi)-&gt;dcc_info-&gt;max_discards) {</div><div class='del'>-		start = __find_rev_next_bit(dmap, max_blocks, end + 1);</div><div class='del'>-		if (start &gt;= max_blocks)</div><div class='add'>+		start = __find_rev_next_bit(dmap, BLKS_PER_SEG(sbi), end + 1);</div><div class='add'>+		if (start &gt;= BLKS_PER_SEG(sbi))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		end = __find_rev_next_zero_bit(dmap, max_blocks, start + 1);</div><div class='del'>-		if (force &amp;&amp; start &amp;&amp; end != max_blocks</div><div class='del'>-					&amp;&amp; (end - start) &lt; cpc-&gt;trim_minlen)</div><div class='add'>+		end = __find_rev_next_zero_bit(dmap,</div><div class='add'>+						BLKS_PER_SEG(sbi), start + 1);</div><div class='add'>+		if (force &amp;&amp; start &amp;&amp; end != BLKS_PER_SEG(sbi) &amp;&amp;</div><div class='add'>+		    (end - start) &lt; cpc-&gt;trim_minlen)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (check_only)</div><div class='hunk'>@@ -2160,8 +2206,8 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,</div><div class='ctx'> 								start + 1);</div><div class='ctx'> </div><div class='ctx'> 		if (section_alignment) {</div><div class='del'>-			start = rounddown(start, sbi-&gt;segs_per_sec);</div><div class='del'>-			end = roundup(end, sbi-&gt;segs_per_sec);</div><div class='add'>+			start = rounddown(start, SEGS_PER_SEC(sbi));</div><div class='add'>+			end = roundup(end, SEGS_PER_SEC(sbi));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (i = start; i &lt; end; i++) {</div><div class='hunk'>@@ -2180,18 +2226,18 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		if (!f2fs_sb_has_blkzoned(sbi) &amp;&amp;</div><div class='ctx'> 		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {</div><div class='ctx'> 			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),</div><div class='del'>-				(end - start) &lt;&lt; sbi-&gt;log_blocks_per_seg);</div><div class='add'>+				SEGS_TO_BLKS(sbi, end - start));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> next:</div><div class='ctx'> 		secno = GET_SEC_FROM_SEG(sbi, start);</div><div class='ctx'> 		start_segno = GET_SEG_FROM_SEC(sbi, secno);</div><div class='del'>-		if (!IS_CURSEC(sbi, secno) &amp;&amp;</div><div class='add'>+		if (!is_cursec(sbi, secno) &amp;&amp;</div><div class='ctx'> 			!get_valid_blocks(sbi, start, true))</div><div class='ctx'> 			f2fs_issue_discard(sbi, START_BLOCK(sbi, start_segno),</div><div class='del'>-				sbi-&gt;segs_per_sec &lt;&lt; sbi-&gt;log_blocks_per_seg);</div><div class='add'>+						BLKS_PER_SEC(sbi));</div><div class='ctx'> </div><div class='del'>-		start = start_segno + sbi-&gt;segs_per_sec;</div><div class='add'>+		start = start_segno + SEGS_PER_SEC(sbi);</div><div class='ctx'> 		if (start &lt; end)</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2210,7 +2256,7 @@ next:</div><div class='ctx'> find_next:</div><div class='ctx'> 		if (is_valid) {</div><div class='ctx'> 			next_pos = find_next_zero_bit_le(entry-&gt;discard_map,</div><div class='del'>-					sbi-&gt;blocks_per_seg, cur_pos);</div><div class='add'>+						BLKS_PER_SEG(sbi), cur_pos);</div><div class='ctx'> 			len = next_pos - cur_pos;</div><div class='ctx'> </div><div class='ctx'> 			if (f2fs_sb_has_blkzoned(sbi) ||</div><div class='hunk'>@@ -2222,13 +2268,13 @@ find_next:</div><div class='ctx'> 			total_len += len;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			next_pos = find_next_bit_le(entry-&gt;discard_map,</div><div class='del'>-					sbi-&gt;blocks_per_seg, cur_pos);</div><div class='add'>+						BLKS_PER_SEG(sbi), cur_pos);</div><div class='ctx'> 		}</div><div class='ctx'> skip:</div><div class='ctx'> 		cur_pos = next_pos;</div><div class='ctx'> 		is_valid = !is_valid;</div><div class='ctx'> </div><div class='del'>-		if (cur_pos &lt; sbi-&gt;blocks_per_seg)</div><div class='add'>+		if (cur_pos &lt; BLKS_PER_SEG(sbi))</div><div class='ctx'> 			goto find_next;</div><div class='ctx'> </div><div class='ctx'> 		release_discard_addr(entry);</div><div class='hunk'>@@ -2245,6 +2291,12 @@ int f2fs_start_discard_thread(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	struct discard_cmd_control *dcc = SM_I(sbi)-&gt;dcc_info;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (f2fs_sb_has_readonly(sbi)) {</div><div class='add'>+		f2fs_info(sbi,</div><div class='add'>+			"Skip to start discard thread for readonly image");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!f2fs_realtime_discard_enable(sbi))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2276,10 +2328,9 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	dcc-&gt;discard_granularity = DEFAULT_DISCARD_GRANULARITY;</div><div class='ctx'> 	dcc-&gt;max_ordered_discard = DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY;</div><div class='ctx'> 	dcc-&gt;discard_io_aware = DPOLICY_IO_AWARE_ENABLE;</div><div class='del'>-	if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT)</div><div class='del'>-		dcc-&gt;discard_granularity = sbi-&gt;blocks_per_seg;</div><div class='del'>-	else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION)</div><div class='del'>-		dcc-&gt;discard_granularity = BLKS_PER_SEC(sbi);</div><div class='add'>+	if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT ||</div><div class='add'>+		F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION)</div><div class='add'>+		dcc-&gt;discard_granularity = BLKS_PER_SEG(sbi);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dcc-&gt;entry_list);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_PLIST_NUM; i++)</div><div class='hunk'>@@ -2291,7 +2342,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	atomic_set(&amp;dcc-&gt;queued_discard, 0);</div><div class='ctx'> 	atomic_set(&amp;dcc-&gt;discard_cmd_cnt, 0);</div><div class='ctx'> 	dcc-&gt;nr_discards = 0;</div><div class='del'>-	dcc-&gt;max_discards = MAIN_SEGS(sbi) &lt;&lt; sbi-&gt;log_blocks_per_seg;</div><div class='add'>+	dcc-&gt;max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));</div><div class='ctx'> 	dcc-&gt;max_discard_request = DEF_MAX_DISCARD_REQUEST;</div><div class='ctx'> 	dcc-&gt;min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;</div><div class='ctx'> 	dcc-&gt;mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;</div><div class='hunk'>@@ -2388,76 +2439,38 @@ static void update_segment_mtime(struct f2fs_sb_info *sbi, block_t blkaddr,</div><div class='ctx'> 		SIT_I(sbi)-&gt;max_mtime = ctime;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)</div><div class='add'>+/*</div><div class='add'>+ * NOTE: when updating multiple blocks at the same time, please ensure</div><div class='add'>+ * that the consecutive input blocks belong to the same segment.</div><div class='add'>+ */</div><div class='add'>+static int update_sit_entry_for_release(struct f2fs_sb_info *sbi, struct seg_entry *se,</div><div class='add'>+				unsigned int segno, block_t blkaddr, unsigned int offset, int del)</div><div class='ctx'> {</div><div class='del'>-	struct seg_entry *se;</div><div class='del'>-	unsigned int segno, offset;</div><div class='del'>-	long int new_vblocks;</div><div class='ctx'> 	bool exist;</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='ctx'> 	bool mir_exist;</div><div class='ctx'> #endif</div><div class='add'>+	int i;</div><div class='add'>+	int del_count = -del;</div><div class='ctx'> </div><div class='del'>-	segno = GET_SEGNO(sbi, blkaddr);</div><div class='del'>-</div><div class='del'>-	se = get_seg_entry(sbi, segno);</div><div class='del'>-	new_vblocks = se-&gt;valid_blocks + del;</div><div class='del'>-	offset = GET_BLKOFF_FROM_SEG0(sbi, blkaddr);</div><div class='del'>-</div><div class='del'>-	f2fs_bug_on(sbi, (new_vblocks &lt; 0 ||</div><div class='del'>-			(new_vblocks &gt; f2fs_usable_blks_in_seg(sbi, segno))));</div><div class='del'>-</div><div class='del'>-	se-&gt;valid_blocks = new_vblocks;</div><div class='del'>-</div><div class='del'>-	/* Update valid block bitmap */</div><div class='del'>-	if (del &gt; 0) {</div><div class='del'>-		exist = f2fs_test_and_set_bit(offset, se-&gt;cur_valid_map);</div><div class='del'>-#ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-		mir_exist = f2fs_test_and_set_bit(offset,</div><div class='del'>-						se-&gt;cur_valid_map_mir);</div><div class='del'>-		if (unlikely(exist != mir_exist)) {</div><div class='del'>-			f2fs_err(sbi, "Inconsistent error when setting bitmap, blk:%u, old bit:%d",</div><div class='del'>-				 blkaddr, exist);</div><div class='del'>-			f2fs_bug_on(sbi, 1);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		if (unlikely(exist)) {</div><div class='del'>-			f2fs_err(sbi, "Bitmap was wrongly set, blk:%u",</div><div class='del'>-				 blkaddr);</div><div class='del'>-			f2fs_bug_on(sbi, 1);</div><div class='del'>-			se-&gt;valid_blocks--;</div><div class='del'>-			del = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (f2fs_block_unit_discard(sbi) &amp;&amp;</div><div class='del'>-				!f2fs_test_and_set_bit(offset, se-&gt;discard_map))</div><div class='del'>-			sbi-&gt;discard_blks--;</div><div class='add'>+	f2fs_bug_on(sbi, GET_SEGNO(sbi, blkaddr) != GET_SEGNO(sbi, blkaddr + del_count - 1));</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * SSR should never reuse block which is checkpointed</div><div class='del'>-		 * or newly invalidated.</div><div class='del'>-		 */</div><div class='del'>-		if (!is_sbi_flag_set(sbi, SBI_CP_DISABLED)) {</div><div class='del'>-			if (!f2fs_test_and_set_bit(offset, se-&gt;ckpt_valid_map))</div><div class='del'>-				se-&gt;ckpt_valid_blocks++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		exist = f2fs_test_and_clear_bit(offset, se-&gt;cur_valid_map);</div><div class='add'>+	for (i = 0; i &lt; del_count; i++) {</div><div class='add'>+		exist = f2fs_test_and_clear_bit(offset + i, se-&gt;cur_valid_map);</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-		mir_exist = f2fs_test_and_clear_bit(offset,</div><div class='add'>+		mir_exist = f2fs_test_and_clear_bit(offset + i,</div><div class='ctx'> 						se-&gt;cur_valid_map_mir);</div><div class='ctx'> 		if (unlikely(exist != mir_exist)) {</div><div class='ctx'> 			f2fs_err(sbi, "Inconsistent error when clearing bitmap, blk:%u, old bit:%d",</div><div class='del'>-				 blkaddr, exist);</div><div class='add'>+				blkaddr + i, exist);</div><div class='ctx'> 			f2fs_bug_on(sbi, 1);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		if (unlikely(!exist)) {</div><div class='del'>-			f2fs_err(sbi, "Bitmap was wrongly cleared, blk:%u",</div><div class='del'>-				 blkaddr);</div><div class='add'>+			f2fs_err(sbi, "Bitmap was wrongly cleared, blk:%u", blkaddr + i);</div><div class='ctx'> 			f2fs_bug_on(sbi, 1);</div><div class='ctx'> 			se-&gt;valid_blocks++;</div><div class='del'>-			del = 0;</div><div class='add'>+			del += 1;</div><div class='ctx'> 		} else if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If checkpoints are off, we must not reuse data that</div><div class='hunk'>@@ -2465,7 +2478,7 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)</div><div class='ctx'> 			 * before, we must track that to know how much space we</div><div class='ctx'> 			 * really have.</div><div class='ctx'> 			 */</div><div class='del'>-			if (f2fs_test_bit(offset, se-&gt;ckpt_valid_map)) {</div><div class='add'>+			if (f2fs_test_bit(offset + i, se-&gt;ckpt_valid_map)) {</div><div class='ctx'> 				spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 				sbi-&gt;unusable_block_count++;</div><div class='ctx'> 				spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='hunk'>@@ -2473,11 +2486,105 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (f2fs_block_unit_discard(sbi) &amp;&amp;</div><div class='del'>-			f2fs_test_and_clear_bit(offset, se-&gt;discard_map))</div><div class='add'>+				f2fs_test_and_clear_bit(offset + i, se-&gt;discard_map))</div><div class='ctx'> 			sbi-&gt;discard_blks++;</div><div class='add'>+</div><div class='add'>+		if (!f2fs_test_bit(offset + i, se-&gt;ckpt_valid_map)) {</div><div class='add'>+			se-&gt;ckpt_valid_blocks -= 1;</div><div class='add'>+			if (__is_large_section(sbi))</div><div class='add'>+				get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks -= 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (__is_large_section(sbi))</div><div class='add'>+		sanity_check_valid_blocks(sbi, segno);</div><div class='add'>+</div><div class='add'>+	return del;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_sit_entry_for_alloc(struct f2fs_sb_info *sbi, struct seg_entry *se,</div><div class='add'>+				unsigned int segno, block_t blkaddr, unsigned int offset, int del)</div><div class='add'>+{</div><div class='add'>+	bool exist;</div><div class='add'>+#ifdef CONFIG_F2FS_CHECK_FS</div><div class='add'>+	bool mir_exist;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	exist = f2fs_test_and_set_bit(offset, se-&gt;cur_valid_map);</div><div class='add'>+#ifdef CONFIG_F2FS_CHECK_FS</div><div class='add'>+	mir_exist = f2fs_test_and_set_bit(offset,</div><div class='add'>+					se-&gt;cur_valid_map_mir);</div><div class='add'>+	if (unlikely(exist != mir_exist)) {</div><div class='add'>+		f2fs_err(sbi, "Inconsistent error when setting bitmap, blk:%u, old bit:%d",</div><div class='add'>+			blkaddr, exist);</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (unlikely(exist)) {</div><div class='add'>+		f2fs_err(sbi, "Bitmap was wrongly set, blk:%u", blkaddr);</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+		se-&gt;valid_blocks--;</div><div class='add'>+		del = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (f2fs_block_unit_discard(sbi) &amp;&amp;</div><div class='add'>+			!f2fs_test_and_set_bit(offset, se-&gt;discard_map))</div><div class='add'>+		sbi-&gt;discard_blks--;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SSR should never reuse block which is checkpointed</div><div class='add'>+	 * or newly invalidated.</div><div class='add'>+	 */</div><div class='add'>+	if (!is_sbi_flag_set(sbi, SBI_CP_DISABLED)) {</div><div class='add'>+		if (!f2fs_test_and_set_bit(offset, se-&gt;ckpt_valid_map)) {</div><div class='add'>+			se-&gt;ckpt_valid_blocks++;</div><div class='add'>+			if (__is_large_section(sbi))</div><div class='add'>+				get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!f2fs_test_bit(offset, se-&gt;ckpt_valid_map))</div><div class='add'>+</div><div class='add'>+	if (!f2fs_test_bit(offset, se-&gt;ckpt_valid_map)) {</div><div class='ctx'> 		se-&gt;ckpt_valid_blocks += del;</div><div class='add'>+		if (__is_large_section(sbi))</div><div class='add'>+			get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks += del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (__is_large_section(sbi))</div><div class='add'>+		sanity_check_valid_blocks(sbi, segno);</div><div class='add'>+</div><div class='add'>+	return del;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If releasing blocks, this function supports updating multiple consecutive blocks</div><div class='add'>+ * at one time, but please note that these consecutive blocks need to belong to the</div><div class='add'>+ * same segment.</div><div class='add'>+ */</div><div class='add'>+static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)</div><div class='add'>+{</div><div class='add'>+	struct seg_entry *se;</div><div class='add'>+	unsigned int segno, offset;</div><div class='add'>+	long int new_vblocks;</div><div class='add'>+</div><div class='add'>+	segno = GET_SEGNO(sbi, blkaddr);</div><div class='add'>+	if (segno == NULL_SEGNO)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	se = get_seg_entry(sbi, segno);</div><div class='add'>+	new_vblocks = se-&gt;valid_blocks + del;</div><div class='add'>+	offset = GET_BLKOFF_FROM_SEG0(sbi, blkaddr);</div><div class='add'>+</div><div class='add'>+	f2fs_bug_on(sbi, (new_vblocks &lt; 0 ||</div><div class='add'>+			(new_vblocks &gt; f2fs_usable_blks_in_seg(sbi, segno))));</div><div class='add'>+</div><div class='add'>+	se-&gt;valid_blocks = new_vblocks;</div><div class='add'>+</div><div class='add'>+	/* Update valid block bitmap */</div><div class='add'>+	if (del &gt; 0) {</div><div class='add'>+		del = update_sit_entry_for_alloc(sbi, se, segno, blkaddr, offset, del);</div><div class='add'>+	} else {</div><div class='add'>+		del = update_sit_entry_for_release(sbi, se, segno, blkaddr, offset, del);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__mark_sit_entry_dirty(sbi, segno);</div><div class='ctx'> </div><div class='hunk'>@@ -2488,25 +2595,43 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)</div><div class='ctx'> 		get_sec_entry(sbi, segno)-&gt;valid_blocks += del;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr)</div><div class='add'>+void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr,</div><div class='add'>+				unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int segno = GET_SEGNO(sbi, addr);</div><div class='ctx'> 	struct sit_info *sit_i = SIT_I(sbi);</div><div class='add'>+	block_t addr_start = addr, addr_end = addr + len - 1;</div><div class='add'>+	unsigned int seg_num = GET_SEGNO(sbi, addr_end) - segno + 1;</div><div class='add'>+	unsigned int i = 1, max_blocks = sbi-&gt;blocks_per_seg, cnt;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_bug_on(sbi, addr == NULL_ADDR);</div><div class='ctx'> 	if (addr == NEW_ADDR || addr == COMPRESS_ADDR)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	f2fs_invalidate_internal_cache(sbi, addr);</div><div class='add'>+	f2fs_invalidate_internal_cache(sbi, addr, len);</div><div class='ctx'> </div><div class='ctx'> 	/* add it into sit main buffer */</div><div class='ctx'> 	down_write(&amp;sit_i-&gt;sentry_lock);</div><div class='ctx'> </div><div class='del'>-	update_segment_mtime(sbi, addr, 0);</div><div class='del'>-	update_sit_entry(sbi, addr, -1);</div><div class='add'>+	if (seg_num == 1)</div><div class='add'>+		cnt = len;</div><div class='add'>+	else</div><div class='add'>+		cnt = max_blocks - GET_BLKOFF_FROM_SEG0(sbi, addr);</div><div class='ctx'> </div><div class='del'>-	/* add it into dirty seglist */</div><div class='del'>-	locate_dirty_segment(sbi, segno);</div><div class='add'>+	do {</div><div class='add'>+		update_segment_mtime(sbi, addr_start, 0);</div><div class='add'>+		update_sit_entry(sbi, addr_start, -cnt);</div><div class='add'>+</div><div class='add'>+		/* add it into dirty seglist */</div><div class='add'>+		locate_dirty_segment(sbi, segno);</div><div class='add'>+</div><div class='add'>+		/* update @addr_start and @cnt and @segno */</div><div class='add'>+		addr_start = START_BLOCK(sbi, ++segno);</div><div class='add'>+		if (++i == seg_num)</div><div class='add'>+			cnt = GET_BLKOFF_FROM_SEG0(sbi, addr_end) + 1;</div><div class='add'>+		else</div><div class='add'>+			cnt = max_blocks;</div><div class='add'>+	} while (i &lt;= seg_num);</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;sit_i-&gt;sentry_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -2540,7 +2665,7 @@ static unsigned short f2fs_curseg_valid_blocks(struct f2fs_sb_info *sbi, int typ</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;ckpt-&gt;alloc_type[type] == SSR)</div><div class='del'>-		return sbi-&gt;blocks_per_seg;</div><div class='add'>+		return BLKS_PER_SEG(sbi);</div><div class='ctx'> 	return curseg-&gt;next_blkoff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2571,40 +2696,60 @@ int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Caller should put this summary page</div><div class='add'>+ * Caller should put this summary folio</div><div class='ctx'>  */</div><div class='del'>-struct page *f2fs_get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='add'>+struct folio *f2fs_get_sum_folio(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(f2fs_cp_error(sbi)))</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='del'>-	return f2fs_get_meta_page_retry(sbi, GET_SUM_BLOCK(sbi, segno));</div><div class='add'>+	return f2fs_get_meta_folio_retry(sbi, GET_SUM_BLOCK(sbi, segno));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_update_meta_page(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					void *src, block_t blk_addr)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = f2fs_grab_meta_page(sbi, blk_addr);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='add'>+	if (SUMS_PER_BLOCK == 1)</div><div class='add'>+		folio = f2fs_grab_meta_folio(sbi, blk_addr);</div><div class='add'>+	else</div><div class='add'>+		folio = f2fs_get_meta_folio_retry(sbi, blk_addr);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	memcpy(page_address(page), src, PAGE_SIZE);</div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	memcpy(folio_address(folio), src, PAGE_SIZE);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void write_sum_page(struct f2fs_sb_info *sbi,</div><div class='del'>-			struct f2fs_summary_block *sum_blk, block_t blk_addr)</div><div class='add'>+		struct f2fs_summary_block *sum_blk, unsigned int segno)</div><div class='ctx'> {</div><div class='del'>-	f2fs_update_meta_page(sbi, (void *)sum_blk, blk_addr);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='add'>+	if (SUMS_PER_BLOCK == 1)</div><div class='add'>+		return f2fs_update_meta_page(sbi, (void *)sum_blk,</div><div class='add'>+				GET_SUM_BLOCK(sbi, segno));</div><div class='add'>+</div><div class='add'>+	folio = f2fs_get_sum_folio(sbi, segno);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(SUM_BLK_PAGE_ADDR(folio, segno), sum_blk, sizeof(*sum_blk));</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void write_current_sum_page(struct f2fs_sb_info *sbi,</div><div class='ctx'> 						int type, block_t blk_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='del'>-	struct page *page = f2fs_grab_meta_page(sbi, blk_addr);</div><div class='add'>+	struct folio *folio = f2fs_grab_meta_folio(sbi, blk_addr);</div><div class='ctx'> 	struct f2fs_summary_block *src = curseg-&gt;sum_blk;</div><div class='ctx'> 	struct f2fs_summary_block *dst;</div><div class='ctx'> </div><div class='del'>-	dst = (struct f2fs_summary_block *)page_address(page);</div><div class='add'>+	dst = folio_address(folio);</div><div class='ctx'> 	memset(dst, 0, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;curseg-&gt;curseg_mutex);</div><div class='hunk'>@@ -2618,17 +2763,17 @@ static void write_current_sum_page(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_next_segment_free(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct curseg_info *curseg, int type)</div><div class='add'>+				struct curseg_info *curseg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int segno = curseg-&gt;segno + 1;</div><div class='ctx'> 	struct free_segmap_info *free_i = FREE_I(sbi);</div><div class='ctx'> </div><div class='del'>-	if (segno &lt; MAIN_SEGS(sbi) &amp;&amp; segno % sbi-&gt;segs_per_sec)</div><div class='add'>+	if (segno &lt; MAIN_SEGS(sbi) &amp;&amp; segno % SEGS_PER_SEC(sbi))</div><div class='ctx'> 		return !test_bit(segno, free_i-&gt;free_segmap);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2637,54 +2782,93 @@ static int is_next_segment_free(struct f2fs_sb_info *sbi,</div><div class='ctx'>  * Find a new segment from the free segments bitmap to right order</div><div class='ctx'>  * This function should be returned with success, otherwise BUG</div><div class='ctx'>  */</div><div class='del'>-static void get_new_segment(struct f2fs_sb_info *sbi,</div><div class='del'>-			unsigned int *newseg, bool new_sec, int dir)</div><div class='add'>+static int get_new_segment(struct f2fs_sb_info *sbi,</div><div class='add'>+			unsigned int *newseg, bool new_sec, bool pinning)</div><div class='ctx'> {</div><div class='ctx'> 	struct free_segmap_info *free_i = FREE_I(sbi);</div><div class='ctx'> 	unsigned int segno, secno, zoneno;</div><div class='ctx'> 	unsigned int total_zones = MAIN_SECS(sbi) / sbi-&gt;secs_per_zone;</div><div class='ctx'> 	unsigned int hint = GET_SEC_FROM_SEG(sbi, *newseg);</div><div class='ctx'> 	unsigned int old_zoneno = GET_ZONE_FROM_SEG(sbi, *newseg);</div><div class='del'>-	unsigned int left_start = hint;</div><div class='add'>+	unsigned int alloc_policy = sbi-&gt;allocate_section_policy;</div><div class='add'>+	unsigned int alloc_hint = sbi-&gt;allocate_section_hint;</div><div class='ctx'> 	bool init = true;</div><div class='del'>-	int go_left = 0;</div><div class='ctx'> 	int i;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;free_i-&gt;segmap_lock);</div><div class='ctx'> </div><div class='del'>-	if (!new_sec &amp;&amp; ((*newseg + 1) % sbi-&gt;segs_per_sec)) {</div><div class='add'>+	if (time_to_inject(sbi, FAULT_NO_SEGMENT)) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!new_sec &amp;&amp; ((*newseg + 1) % SEGS_PER_SEC(sbi))) {</div><div class='ctx'> 		segno = find_next_zero_bit(free_i-&gt;free_segmap,</div><div class='ctx'> 			GET_SEG_FROM_SEC(sbi, hint + 1), *newseg + 1);</div><div class='ctx'> 		if (segno &lt; GET_SEG_FROM_SEC(sbi, hint + 1))</div><div class='ctx'> 			goto got_it;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+	/*</div><div class='add'>+	 * If we format f2fs on zoned storage, let's try to get pinned sections</div><div class='add'>+	 * from beginning of the storage, which should be a conventional one.</div><div class='add'>+	 */</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+		/* Prioritize writing to conventional zones */</div><div class='add'>+		if (sbi-&gt;blkzone_alloc_policy == BLKZONE_ALLOC_PRIOR_CONV || pinning)</div><div class='add'>+			segno = 0;</div><div class='add'>+		else</div><div class='add'>+			segno = max(sbi-&gt;first_seq_zone_segno, *newseg);</div><div class='add'>+		hint = GET_SEC_FROM_SEG(sbi, segno);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Prevent allocate_section_hint from exceeding MAIN_SECS()</div><div class='add'>+	 * due to desynchronization.</div><div class='add'>+	 */</div><div class='add'>+	if (alloc_policy != ALLOCATE_FORWARD_NOHINT &amp;&amp;</div><div class='add'>+		alloc_hint &gt; MAIN_SECS(sbi))</div><div class='add'>+		alloc_hint = MAIN_SECS(sbi);</div><div class='add'>+</div><div class='add'>+	if (alloc_policy == ALLOCATE_FORWARD_FROM_HINT &amp;&amp;</div><div class='add'>+		hint &lt; alloc_hint)</div><div class='add'>+		hint = alloc_hint;</div><div class='add'>+	else if (alloc_policy == ALLOCATE_FORWARD_WITHIN_HINT &amp;&amp;</div><div class='add'>+			hint &gt;= alloc_hint)</div><div class='add'>+		hint = 0;</div><div class='add'>+</div><div class='ctx'> find_other_zone:</div><div class='ctx'> 	secno = find_next_zero_bit(free_i-&gt;free_secmap, MAIN_SECS(sbi), hint);</div><div class='del'>-	if (secno &gt;= MAIN_SECS(sbi)) {</div><div class='del'>-		if (dir == ALLOC_RIGHT) {</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+	if (secno &gt;= MAIN_SECS(sbi) &amp;&amp; f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+		/* Write only to sequential zones */</div><div class='add'>+		if (sbi-&gt;blkzone_alloc_policy == BLKZONE_ALLOC_ONLY_SEQ) {</div><div class='add'>+			hint = GET_SEC_FROM_SEG(sbi, sbi-&gt;first_seq_zone_segno);</div><div class='add'>+			secno = find_next_zero_bit(free_i-&gt;free_secmap, MAIN_SECS(sbi), hint);</div><div class='add'>+		} else</div><div class='ctx'> 			secno = find_first_zero_bit(free_i-&gt;free_secmap,</div><div class='del'>-							MAIN_SECS(sbi));</div><div class='del'>-			f2fs_bug_on(sbi, secno &gt;= MAIN_SECS(sbi));</div><div class='del'>-		} else {</div><div class='del'>-			go_left = 1;</div><div class='del'>-			left_start = hint - 1;</div><div class='add'>+								MAIN_SECS(sbi));</div><div class='add'>+		if (secno &gt;= MAIN_SECS(sbi)) {</div><div class='add'>+			ret = -ENOSPC;</div><div class='add'>+			f2fs_bug_on(sbi, 1);</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (go_left == 0)</div><div class='del'>-		goto skip_left;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	while (test_bit(left_start, free_i-&gt;free_secmap)) {</div><div class='del'>-		if (left_start &gt; 0) {</div><div class='del'>-			left_start--;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		left_start = find_first_zero_bit(free_i-&gt;free_secmap,</div><div class='add'>+	if (secno &gt;= MAIN_SECS(sbi)) {</div><div class='add'>+		secno = find_first_zero_bit(free_i-&gt;free_secmap,</div><div class='ctx'> 							MAIN_SECS(sbi));</div><div class='del'>-		f2fs_bug_on(sbi, left_start &gt;= MAIN_SECS(sbi));</div><div class='del'>-		break;</div><div class='add'>+		if (secno &gt;= MAIN_SECS(sbi)) {</div><div class='add'>+			ret = -ENOSPC;</div><div class='add'>+			f2fs_bug_on(sbi, !pinning);</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	secno = left_start;</div><div class='del'>-skip_left:</div><div class='ctx'> 	segno = GET_SEG_FROM_SEC(sbi, secno);</div><div class='ctx'> 	zoneno = GET_ZONE_FROM_SEC(sbi, secno);</div><div class='ctx'> </div><div class='hunk'>@@ -2695,21 +2879,13 @@ skip_left:</div><div class='ctx'> 		goto got_it;</div><div class='ctx'> 	if (zoneno == old_zoneno)</div><div class='ctx'> 		goto got_it;</div><div class='del'>-	if (dir == ALLOC_LEFT) {</div><div class='del'>-		if (!go_left &amp;&amp; zoneno + 1 &gt;= total_zones)</div><div class='del'>-			goto got_it;</div><div class='del'>-		if (go_left &amp;&amp; zoneno == 0)</div><div class='del'>-			goto got_it;</div><div class='del'>-	}</div><div class='ctx'> 	for (i = 0; i &lt; NR_CURSEG_TYPE; i++)</div><div class='ctx'> 		if (CURSEG_I(sbi, i)-&gt;zone == zoneno)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	if (i &lt; NR_CURSEG_TYPE) {</div><div class='ctx'> 		/* zone is in user, try another */</div><div class='del'>-		if (go_left)</div><div class='del'>-			hint = zoneno * sbi-&gt;secs_per_zone - 1;</div><div class='del'>-		else if (zoneno + 1 &gt;= total_zones)</div><div class='add'>+		if (zoneno + 1 &gt;= total_zones)</div><div class='ctx'> 			hint = 0;</div><div class='ctx'> 		else</div><div class='ctx'> 			hint = (zoneno + 1) * sbi-&gt;secs_per_zone;</div><div class='hunk'>@@ -2718,10 +2894,26 @@ skip_left:</div><div class='ctx'> 	}</div><div class='ctx'> got_it:</div><div class='ctx'> 	/* set it as dirty segment in free segmap */</div><div class='del'>-	f2fs_bug_on(sbi, test_bit(segno, free_i-&gt;free_segmap));</div><div class='add'>+	if (test_bit(segno, free_i-&gt;free_segmap)) {</div><div class='add'>+		ret = -EFSCORRUPTED;</div><div class='add'>+		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_CORRUPTED_FREE_BITMAP);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no free section in conventional device or conventional zone */</div><div class='add'>+	if (new_sec &amp;&amp; pinning &amp;&amp;</div><div class='add'>+		f2fs_is_sequential_zone_area(sbi, START_BLOCK(sbi, segno))) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> 	__set_inuse(sbi, segno);</div><div class='ctx'> 	*newseg = segno;</div><div class='add'>+out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;free_i-&gt;segmap_lock);</div><div class='add'>+</div><div class='add'>+	if (ret == -ENOSPC &amp;&amp; !pinning)</div><div class='add'>+		f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_NO_SEGMENT);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void reset_curseg(struct f2fs_sb_info *sbi, int type, int modified)</div><div class='hunk'>@@ -2730,6 +2922,10 @@ static void reset_curseg(struct f2fs_sb_info *sbi, int type, int modified)</div><div class='ctx'> 	struct summary_footer *sum_footer;</div><div class='ctx'> 	unsigned short seg_type = curseg-&gt;seg_type;</div><div class='ctx'> </div><div class='add'>+	/* only happen when get_new_segment() fails */</div><div class='add'>+	if (curseg-&gt;next_segno == NULL_SEGNO)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	curseg-&gt;inited = true;</div><div class='ctx'> 	curseg-&gt;segno = curseg-&gt;next_segno;</div><div class='ctx'> 	curseg-&gt;zone = GET_ZONE_FROM_SEG(sbi, curseg-&gt;segno);</div><div class='hunk'>@@ -2754,12 +2950,19 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	unsigned short seg_type = curseg-&gt;seg_type;</div><div class='ctx'> </div><div class='ctx'> 	sanity_check_seg_type(sbi, seg_type);</div><div class='del'>-	if (f2fs_need_rand_seg(sbi))</div><div class='del'>-		return get_random_u32_below(MAIN_SECS(sbi) * sbi-&gt;segs_per_sec);</div><div class='add'>+	if (__is_large_section(sbi)) {</div><div class='add'>+		if (f2fs_need_rand_seg(sbi)) {</div><div class='add'>+			unsigned int hint = GET_SEC_FROM_SEG(sbi, curseg-&gt;segno);</div><div class='ctx'> </div><div class='del'>-	/* if segs_per_sec is large than 1, we need to keep original policy. */</div><div class='del'>-	if (__is_large_section(sbi))</div><div class='add'>+			if (GET_SEC_FROM_SEG(sbi, curseg-&gt;segno + 1) != hint)</div><div class='add'>+				return curseg-&gt;segno;</div><div class='add'>+			return get_random_u32_inclusive(curseg-&gt;segno + 1,</div><div class='add'>+					GET_SEG_FROM_SEC(sbi, hint + 1) - 1);</div><div class='add'>+		}</div><div class='ctx'> 		return curseg-&gt;segno;</div><div class='add'>+	} else if (f2fs_need_rand_seg(sbi)) {</div><div class='add'>+		return get_random_u32_below(MAIN_SECS(sbi) * SEGS_PER_SEC(sbi));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* inmem log may not locate on any segment after mount */</div><div class='ctx'> 	if (!curseg-&gt;inited)</div><div class='hunk'>@@ -2768,8 +2971,7 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (test_opt(sbi, NOHEAP) &amp;&amp;</div><div class='del'>-		(seg_type == CURSEG_HOT_DATA || IS_NODESEG(seg_type)))</div><div class='add'>+	if (seg_type == CURSEG_HOT_DATA || IS_NODESEG(seg_type))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (SIT_I(sbi)-&gt;last_victim[ALLOC_NEXT])</div><div class='hunk'>@@ -2782,34 +2984,42 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	return curseg-&gt;segno;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void reset_curseg_fields(struct curseg_info *curseg)</div><div class='add'>+{</div><div class='add'>+	curseg-&gt;inited = false;</div><div class='add'>+	curseg-&gt;segno = NULL_SEGNO;</div><div class='add'>+	curseg-&gt;next_segno = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a current working segment.</div><div class='ctx'>  * This function always allocates a free segment in LFS manner.</div><div class='ctx'>  */</div><div class='del'>-static void new_curseg(struct f2fs_sb_info *sbi, int type, bool new_sec)</div><div class='add'>+static int new_curseg(struct f2fs_sb_info *sbi, int type, bool new_sec)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='del'>-	unsigned short seg_type = curseg-&gt;seg_type;</div><div class='ctx'> 	unsigned int segno = curseg-&gt;segno;</div><div class='del'>-	int dir = ALLOC_LEFT;</div><div class='add'>+	bool pinning = type == CURSEG_COLD_DATA_PINNED;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (curseg-&gt;inited)</div><div class='del'>-		write_sum_page(sbi, curseg-&gt;sum_blk,</div><div class='del'>-				GET_SUM_BLOCK(sbi, segno));</div><div class='del'>-	if (seg_type == CURSEG_WARM_DATA || seg_type == CURSEG_COLD_DATA)</div><div class='del'>-		dir = ALLOC_RIGHT;</div><div class='del'>-</div><div class='del'>-	if (test_opt(sbi, NOHEAP))</div><div class='del'>-		dir = ALLOC_RIGHT;</div><div class='add'>+		write_sum_page(sbi, curseg-&gt;sum_blk, segno);</div><div class='ctx'> </div><div class='ctx'> 	segno = __get_next_segno(sbi, type);</div><div class='del'>-	get_new_segment(sbi, &amp;segno, new_sec, dir);</div><div class='add'>+	ret = get_new_segment(sbi, &amp;segno, new_sec, pinning);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -ENOSPC)</div><div class='add'>+			reset_curseg_fields(curseg);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	curseg-&gt;next_segno = segno;</div><div class='ctx'> 	reset_curseg(sbi, type, 1);</div><div class='ctx'> 	curseg-&gt;alloc_type = LFS;</div><div class='ctx'> 	if (F2FS_OPTION(sbi).fs_mode == FS_MODE_FRAGMENT_BLK)</div><div class='ctx'> 		curseg-&gt;fragment_remained_chunk =</div><div class='ctx'> 				get_random_u32_inclusive(1, sbi-&gt;max_fragment_chunk);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __next_free_blkoff(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -2825,7 +3035,7 @@ static int __next_free_blkoff(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	for (i = 0; i &lt; entries; i++)</div><div class='ctx'> 		target_map[i] = ckpt_map[i] | cur_map[i];</div><div class='ctx'> </div><div class='del'>-	return __find_rev_next_zero_bit(target_map, sbi-&gt;blocks_per_seg, start);</div><div class='add'>+	return __find_rev_next_zero_bit(target_map, BLKS_PER_SEG(sbi), start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_find_next_ssr_block(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -2836,22 +3046,23 @@ static int f2fs_find_next_ssr_block(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> bool f2fs_segment_has_free_slot(struct f2fs_sb_info *sbi, int segno)</div><div class='ctx'> {</div><div class='del'>-	return __next_free_blkoff(sbi, segno, 0) &lt; sbi-&gt;blocks_per_seg;</div><div class='add'>+	return __next_free_blkoff(sbi, segno, 0) &lt; BLKS_PER_SEG(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function always allocates a used segment(from dirty seglist) by SSR</div><div class='ctx'>  * manner, so it should recover the existing segment information of valid blocks</div><div class='ctx'>  */</div><div class='del'>-static void change_curseg(struct f2fs_sb_info *sbi, int type)</div><div class='add'>+static int change_curseg(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='ctx'> 	unsigned int new_segno = curseg-&gt;next_segno;</div><div class='ctx'> 	struct f2fs_summary_block *sum_node;</div><div class='del'>-	struct page *sum_page;</div><div class='add'>+	struct folio *sum_folio;</div><div class='ctx'> </div><div class='del'>-	write_sum_page(sbi, curseg-&gt;sum_blk, GET_SUM_BLOCK(sbi, curseg-&gt;segno));</div><div class='add'>+	if (curseg-&gt;inited)</div><div class='add'>+		write_sum_page(sbi, curseg-&gt;sum_blk, curseg-&gt;segno);</div><div class='ctx'> </div><div class='ctx'> 	__set_test_and_inuse(sbi, new_segno);</div><div class='ctx'> </div><div class='hunk'>@@ -2864,25 +3075,27 @@ static void change_curseg(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	curseg-&gt;alloc_type = SSR;</div><div class='ctx'> 	curseg-&gt;next_blkoff = __next_free_blkoff(sbi, curseg-&gt;segno, 0);</div><div class='ctx'> </div><div class='del'>-	sum_page = f2fs_get_sum_page(sbi, new_segno);</div><div class='del'>-	if (IS_ERR(sum_page)) {</div><div class='add'>+	sum_folio = f2fs_get_sum_folio(sbi, new_segno);</div><div class='add'>+	if (IS_ERR(sum_folio)) {</div><div class='ctx'> 		/* GC won't be able to use stale summary pages by cp_error */</div><div class='ctx'> 		memset(curseg-&gt;sum_blk, 0, SUM_ENTRY_SIZE);</div><div class='del'>-		return;</div><div class='add'>+		return PTR_ERR(sum_folio);</div><div class='ctx'> 	}</div><div class='del'>-	sum_node = (struct f2fs_summary_block *)page_address(sum_page);</div><div class='add'>+	sum_node = SUM_BLK_PAGE_ADDR(sum_folio, new_segno);</div><div class='ctx'> 	memcpy(curseg-&gt;sum_blk, sum_node, SUM_ENTRY_SIZE);</div><div class='del'>-	f2fs_put_page(sum_page, 1);</div><div class='add'>+	f2fs_folio_put(sum_folio, true);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_ssr_segment(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 				int alloc_mode, unsigned long long age);</div><div class='ctx'> </div><div class='del'>-static void get_atssr_segment(struct f2fs_sb_info *sbi, int type,</div><div class='add'>+static int get_atssr_segment(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 					int target_type, int alloc_mode,</div><div class='ctx'> 					unsigned long long age)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	curseg-&gt;seg_type = target_type;</div><div class='ctx'> </div><div class='hunk'>@@ -2890,38 +3103,62 @@ static void get_atssr_segment(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 		struct seg_entry *se = get_seg_entry(sbi, curseg-&gt;next_segno);</div><div class='ctx'> </div><div class='ctx'> 		curseg-&gt;seg_type = se-&gt;type;</div><div class='del'>-		change_curseg(sbi, type);</div><div class='add'>+		ret = change_curseg(sbi, type);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* allocate cold segment by default */</div><div class='ctx'> 		curseg-&gt;seg_type = CURSEG_COLD_DATA;</div><div class='del'>-		new_curseg(sbi, type, true);</div><div class='add'>+		ret = new_curseg(sbi, type, true);</div><div class='ctx'> 	}</div><div class='ctx'> 	stat_inc_seg_type(sbi, curseg);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __f2fs_init_atgc_curseg(struct f2fs_sb_info *sbi)</div><div class='add'>+static int __f2fs_init_atgc_curseg(struct f2fs_sb_info *sbi, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_ALL_DATA_ATGC);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!sbi-&gt;am.atgc_enabled)</div><div class='del'>-		return;</div><div class='add'>+	if (!sbi-&gt;am.atgc_enabled &amp;&amp; !force)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> 	down_write(&amp;SIT_I(sbi)-&gt;sentry_lock);</div><div class='ctx'> </div><div class='del'>-	get_atssr_segment(sbi, CURSEG_ALL_DATA_ATGC, CURSEG_COLD_DATA, SSR, 0);</div><div class='add'>+	ret = get_atssr_segment(sbi, CURSEG_ALL_DATA_ATGC,</div><div class='add'>+					CURSEG_COLD_DATA, SSR, 0);</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;SIT_I(sbi)-&gt;sentry_lock);</div><div class='ctx'> 	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_up_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+int f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	return __f2fs_init_atgc_curseg(sbi, false);</div><div class='ctx'> }</div><div class='del'>-void f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi)</div><div class='add'>+</div><div class='add'>+int f2fs_reinit_atgc_curseg(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='del'>-	__f2fs_init_atgc_curseg(sbi);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!test_opt(sbi, ATGC))</div><div class='add'>+		return 0;</div><div class='add'>+	if (sbi-&gt;am.atgc_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+	if (le64_to_cpu(F2FS_CKPT(sbi)-&gt;elapsed_time) &lt;</div><div class='add'>+			sbi-&gt;am.age_threshold)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = __f2fs_init_atgc_curseg(sbi, true);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		sbi-&gt;am.atgc_enabled = true;</div><div class='add'>+		f2fs_info(sbi, "reenabled age threshold GC");</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi, int type)</div><div class='hunk'>@@ -2933,8 +3170,7 @@ static void __f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (get_valid_blocks(sbi, curseg-&gt;segno, false)) {</div><div class='del'>-		write_sum_page(sbi, curseg-&gt;sum_blk,</div><div class='del'>-				GET_SUM_BLOCK(sbi, curseg-&gt;segno));</div><div class='add'>+		write_sum_page(sbi, curseg-&gt;sum_blk, curseg-&gt;segno);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mutex_lock(&amp;DIRTY_I(sbi)-&gt;seglist_lock);</div><div class='ctx'> 		__set_test_and_free(sbi, curseg-&gt;segno, true);</div><div class='hunk'>@@ -2989,7 +3225,8 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 	sanity_check_seg_type(sbi, seg_type);</div><div class='ctx'> </div><div class='ctx'> 	/* f2fs_need_SSR() already forces to do this */</div><div class='del'>-	if (!f2fs_get_victim(sbi, &amp;segno, BG_GC, seg_type, alloc_mode, age)) {</div><div class='add'>+	if (!f2fs_get_victim(sbi, &amp;segno, BG_GC, seg_type,</div><div class='add'>+				alloc_mode, age, false)) {</div><div class='ctx'> 		curseg-&gt;next_segno = segno;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3016,7 +3253,8 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 	for (; cnt-- &gt; 0; reversed ? i-- : i++) {</div><div class='ctx'> 		if (i == seg_type)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!f2fs_get_victim(sbi, &amp;segno, BG_GC, i, alloc_mode, age)) {</div><div class='add'>+		if (!f2fs_get_victim(sbi, &amp;segno, BG_GC, i,</div><div class='add'>+					alloc_mode, age, false)) {</div><div class='ctx'> 			curseg-&gt;next_segno = segno;</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3040,8 +3278,7 @@ static bool need_new_seg(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	if (!is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) &amp;&amp;</div><div class='ctx'> 	    curseg-&gt;seg_type == CURSEG_WARM_NODE)</div><div class='ctx'> 		return true;</div><div class='del'>-	if (curseg-&gt;alloc_type == LFS &amp;&amp;</div><div class='del'>-	    is_next_segment_free(sbi, curseg, type) &amp;&amp;</div><div class='add'>+	if (curseg-&gt;alloc_type == LFS &amp;&amp; is_next_segment_free(sbi, curseg) &amp;&amp;</div><div class='ctx'> 	    likely(!is_sbi_flag_set(sbi, SBI_CP_DISABLED)))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (!f2fs_need_SSR(sbi) || !get_ssr_segment(sbi, type, SSR, 0))</div><div class='hunk'>@@ -3049,11 +3286,12 @@ static bool need_new_seg(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,</div><div class='add'>+int f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 					unsigned int start, unsigned int end)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='ctx'> 	unsigned int segno;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='ctx'> 	mutex_lock(&amp;curseg-&gt;curseg_mutex);</div><div class='hunk'>@@ -3064,9 +3302,9 @@ void f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_need_SSR(sbi) &amp;&amp; get_ssr_segment(sbi, type, SSR, 0))</div><div class='del'>-		change_curseg(sbi, type);</div><div class='add'>+		ret = change_curseg(sbi, type);</div><div class='ctx'> 	else</div><div class='del'>-		new_curseg(sbi, type, true);</div><div class='add'>+		ret = new_curseg(sbi, type, true);</div><div class='ctx'> </div><div class='ctx'> 	stat_inc_seg_type(sbi, curseg);</div><div class='ctx'> </div><div class='hunk'>@@ -3080,45 +3318,85 @@ unlock:</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> 	f2fs_up_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type,</div><div class='add'>+static int __allocate_new_segment(struct f2fs_sb_info *sbi, int type,</div><div class='ctx'> 						bool new_sec, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='ctx'> 	unsigned int old_segno;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (type == CURSEG_COLD_DATA_PINNED &amp;&amp; !curseg-&gt;inited)</div><div class='add'>+		goto allocate;</div><div class='ctx'> </div><div class='ctx'> 	if (!force &amp;&amp; curseg-&gt;inited &amp;&amp;</div><div class='ctx'> 	    !curseg-&gt;next_blkoff &amp;&amp;</div><div class='ctx'> 	    !get_valid_blocks(sbi, curseg-&gt;segno, new_sec) &amp;&amp;</div><div class='ctx'> 	    !get_ckpt_valid_blocks(sbi, curseg-&gt;segno, new_sec))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='add'>+allocate:</div><div class='ctx'> 	old_segno = curseg-&gt;segno;</div><div class='del'>-	new_curseg(sbi, type, true);</div><div class='add'>+	err = new_curseg(sbi, type, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	stat_inc_seg_type(sbi, curseg);</div><div class='ctx'> 	locate_dirty_segment(sbi, old_segno);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_allocate_new_section(struct f2fs_sb_info *sbi, int type, bool force)</div><div class='add'>+int f2fs_allocate_new_section(struct f2fs_sb_info *sbi, int type, bool force)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	f2fs_down_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='ctx'> 	down_write(&amp;SIT_I(sbi)-&gt;sentry_lock);</div><div class='del'>-	__allocate_new_segment(sbi, type, true, force);</div><div class='add'>+	ret = __allocate_new_segment(sbi, type, true, force);</div><div class='ctx'> 	up_write(&amp;SIT_I(sbi)-&gt;sentry_lock);</div><div class='ctx'> 	f2fs_up_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	bool gc_required = true;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	f2fs_lock_op(sbi);</div><div class='add'>+	err = f2fs_allocate_new_section(sbi, CURSEG_COLD_DATA_PINNED, false);</div><div class='add'>+	f2fs_unlock_op(sbi);</div><div class='add'>+</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi) &amp;&amp; err == -EAGAIN &amp;&amp; gc_required) {</div><div class='add'>+		f2fs_down_write(&amp;sbi-&gt;gc_lock);</div><div class='add'>+		err = f2fs_gc_range(sbi, 0, sbi-&gt;first_seq_zone_segno - 1,</div><div class='add'>+				true, ZONED_PIN_SEC_REQUIRED_COUNT);</div><div class='add'>+		f2fs_up_write(&amp;sbi-&gt;gc_lock);</div><div class='add'>+</div><div class='add'>+		gc_required = false;</div><div class='add'>+		if (!err)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)</div><div class='add'>+int f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='ctx'> 	down_write(&amp;SIT_I(sbi)-&gt;sentry_lock);</div><div class='ctx'> 	for (i = CURSEG_HOT_DATA; i &lt;= CURSEG_COLD_DATA; i++)</div><div class='del'>-		__allocate_new_segment(sbi, i, false, false);</div><div class='add'>+		err += __allocate_new_segment(sbi, i, false, false);</div><div class='ctx'> 	up_write(&amp;SIT_I(sbi)-&gt;sentry_lock);</div><div class='ctx'> 	f2fs_up_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -3189,7 +3467,7 @@ next:</div><div class='ctx'> 			blk_finish_plug(&amp;plug);</div><div class='ctx'> 			mutex_unlock(&amp;dcc-&gt;cmd_lock);</div><div class='ctx'> 			trimmed += __wait_all_discard_cmd(sbi, NULL);</div><div class='del'>-			f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+			f2fs_schedule_timeout(DEFAULT_DISCARD_INTERVAL);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> skip:</div><div class='hunk'>@@ -3236,8 +3514,8 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)</div><div class='ctx'> 	end_segno = (end &gt;= MAX_BLKADDR(sbi)) ? MAIN_SEGS(sbi) - 1 :</div><div class='ctx'> 						GET_SEGNO(sbi, end);</div><div class='ctx'> 	if (need_align) {</div><div class='del'>-		start_segno = rounddown(start_segno, sbi-&gt;segs_per_sec);</div><div class='del'>-		end_segno = roundup(end_segno + 1, sbi-&gt;segs_per_sec) - 1;</div><div class='add'>+		start_segno = rounddown(start_segno, SEGS_PER_SEC(sbi));</div><div class='add'>+		end_segno = roundup(end_segno + 1, SEGS_PER_SEC(sbi)) - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpc.reason = CP_DISCARD;</div><div class='hunk'>@@ -3279,8 +3557,14 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_rw_hint_to_seg_type(enum rw_hint hint)</div><div class='add'>+int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint)</div><div class='ctx'> {</div><div class='add'>+	if (F2FS_OPTION(sbi).active_logs == 2)</div><div class='add'>+		return CURSEG_HOT_DATA;</div><div class='add'>+	else if (F2FS_OPTION(sbi).active_logs == 4)</div><div class='add'>+		return CURSEG_COLD_DATA;</div><div class='add'>+</div><div class='add'>+	/* active_log == 6 */</div><div class='ctx'> 	switch (hint) {</div><div class='ctx'> 	case WRITE_LIFE_SHORT:</div><div class='ctx'> 		return CURSEG_HOT_DATA;</div><div class='hunk'>@@ -3291,6 +3575,65 @@ int f2fs_rw_hint_to_seg_type(enum rw_hint hint)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This returns write hints for each segment type. This hints will be</div><div class='add'>+ * passed down to block layer as below by default.</div><div class='add'>+ *</div><div class='add'>+ * User                  F2FS                     Block</div><div class='add'>+ * ----                  ----                     -----</div><div class='add'>+ *                       META                     WRITE_LIFE_NONE|REQ_META</div><div class='add'>+ *                       HOT_NODE                 WRITE_LIFE_NONE</div><div class='add'>+ *                       WARM_NODE                WRITE_LIFE_MEDIUM</div><div class='add'>+ *                       COLD_NODE                WRITE_LIFE_LONG</div><div class='add'>+ * ioctl(COLD)           COLD_DATA                WRITE_LIFE_EXTREME</div><div class='add'>+ * extension list        "                        "</div><div class='add'>+ *</div><div class='add'>+ * -- buffered io</div><div class='add'>+ *                       COLD_DATA                WRITE_LIFE_EXTREME</div><div class='add'>+ *                       HOT_DATA                 WRITE_LIFE_SHORT</div><div class='add'>+ *                       WARM_DATA                WRITE_LIFE_NOT_SET</div><div class='add'>+ *</div><div class='add'>+ * -- direct io</div><div class='add'>+ * WRITE_LIFE_EXTREME    COLD_DATA                WRITE_LIFE_EXTREME</div><div class='add'>+ * WRITE_LIFE_SHORT      HOT_DATA                 WRITE_LIFE_SHORT</div><div class='add'>+ * WRITE_LIFE_NOT_SET    WARM_DATA                WRITE_LIFE_NOT_SET</div><div class='add'>+ * WRITE_LIFE_NONE       "                        WRITE_LIFE_NONE</div><div class='add'>+ * WRITE_LIFE_MEDIUM     "                        WRITE_LIFE_MEDIUM</div><div class='add'>+ * WRITE_LIFE_LONG       "                        WRITE_LIFE_LONG</div><div class='add'>+ */</div><div class='add'>+enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi,</div><div class='add'>+				enum page_type type, enum temp_type temp)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case DATA:</div><div class='add'>+		switch (temp) {</div><div class='add'>+		case WARM:</div><div class='add'>+			return WRITE_LIFE_NOT_SET;</div><div class='add'>+		case HOT:</div><div class='add'>+			return WRITE_LIFE_SHORT;</div><div class='add'>+		case COLD:</div><div class='add'>+			return WRITE_LIFE_EXTREME;</div><div class='add'>+		default:</div><div class='add'>+			return WRITE_LIFE_NONE;</div><div class='add'>+		}</div><div class='add'>+	case NODE:</div><div class='add'>+		switch (temp) {</div><div class='add'>+		case WARM:</div><div class='add'>+			return WRITE_LIFE_MEDIUM;</div><div class='add'>+		case HOT:</div><div class='add'>+			return WRITE_LIFE_NONE;</div><div class='add'>+		case COLD:</div><div class='add'>+			return WRITE_LIFE_LONG;</div><div class='add'>+		default:</div><div class='add'>+			return WRITE_LIFE_NONE;</div><div class='add'>+		}</div><div class='add'>+	case META:</div><div class='add'>+		return WRITE_LIFE_NONE;</div><div class='add'>+	default:</div><div class='add'>+		return WRITE_LIFE_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __get_segment_type_2(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='ctx'> 	if (fio-&gt;type == DATA)</div><div class='hunk'>@@ -3302,14 +3645,14 @@ static int __get_segment_type_2(struct f2fs_io_info *fio)</div><div class='ctx'> static int __get_segment_type_4(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='ctx'> 	if (fio-&gt;type == DATA) {</div><div class='del'>-		struct inode *inode = fio-&gt;page-&gt;mapping-&gt;host;</div><div class='add'>+		struct inode *inode = fio_inode(fio);</div><div class='ctx'> </div><div class='ctx'> 		if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 			return CURSEG_HOT_DATA;</div><div class='ctx'> 		else</div><div class='ctx'> 			return CURSEG_COLD_DATA;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (IS_DNODE(fio-&gt;page) &amp;&amp; is_cold_node(fio-&gt;page))</div><div class='add'>+		if (IS_DNODE(fio-&gt;folio) &amp;&amp; is_cold_node(fio-&gt;folio))</div><div class='ctx'> 			return CURSEG_WARM_NODE;</div><div class='ctx'> 		else</div><div class='ctx'> 			return CURSEG_COLD_NODE;</div><div class='hunk'>@@ -3336,7 +3679,7 @@ static int __get_age_segment_type(struct inode *inode, pgoff_t pgofs)</div><div class='ctx'> static int __get_segment_type_6(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='ctx'> 	if (fio-&gt;type == DATA) {</div><div class='del'>-		struct inode *inode = fio-&gt;page-&gt;mapping-&gt;host;</div><div class='add'>+		struct inode *inode = fio_inode(fio);</div><div class='ctx'> 		int type;</div><div class='ctx'> </div><div class='ctx'> 		if (is_inode_flag_set(inode, FI_ALIGNED_WRITE))</div><div class='hunk'>@@ -3345,7 +3688,9 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)</div><div class='ctx'> 		if (page_private_gcing(fio-&gt;page)) {</div><div class='ctx'> 			if (fio-&gt;sbi-&gt;am.atgc_enabled &amp;&amp;</div><div class='ctx'> 				(fio-&gt;io_type == FS_DATA_IO) &amp;&amp;</div><div class='del'>-				(fio-&gt;sbi-&gt;gc_mode != GC_URGENT_HIGH))</div><div class='add'>+				(fio-&gt;sbi-&gt;gc_mode != GC_URGENT_HIGH) &amp;&amp;</div><div class='add'>+				__is_valid_data_blkaddr(fio-&gt;old_blkaddr) &amp;&amp;</div><div class='add'>+				!is_inode_flag_set(inode, FI_OPU_WRITE))</div><div class='ctx'> 				return CURSEG_ALL_DATA_ATGC;</div><div class='ctx'> 			else</div><div class='ctx'> 				return CURSEG_COLD_DATA;</div><div class='hunk'>@@ -3353,26 +3698,54 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)</div><div class='ctx'> 		if (file_is_cold(inode) || f2fs_need_compress_data(inode))</div><div class='ctx'> 			return CURSEG_COLD_DATA;</div><div class='ctx'> </div><div class='del'>-		type = __get_age_segment_type(inode, fio-&gt;page-&gt;index);</div><div class='add'>+		type = __get_age_segment_type(inode, fio-&gt;folio-&gt;index);</div><div class='ctx'> 		if (type != NO_CHECK_TYPE)</div><div class='ctx'> 			return type;</div><div class='ctx'> </div><div class='ctx'> 		if (file_is_hot(inode) ||</div><div class='ctx'> 				is_inode_flag_set(inode, FI_HOT_DATA) ||</div><div class='del'>-				f2fs_is_cow_file(inode))</div><div class='add'>+				f2fs_is_cow_file(inode) ||</div><div class='add'>+				is_inode_flag_set(inode, FI_NEED_IPU))</div><div class='ctx'> 			return CURSEG_HOT_DATA;</div><div class='del'>-		return f2fs_rw_hint_to_seg_type(inode-&gt;i_write_hint);</div><div class='add'>+		return f2fs_rw_hint_to_seg_type(F2FS_I_SB(inode),</div><div class='add'>+						inode-&gt;i_write_hint);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (IS_DNODE(fio-&gt;page))</div><div class='del'>-			return is_cold_node(fio-&gt;page) ? CURSEG_WARM_NODE :</div><div class='add'>+		if (IS_DNODE(fio-&gt;folio))</div><div class='add'>+			return is_cold_node(fio-&gt;folio) ? CURSEG_WARM_NODE :</div><div class='ctx'> 						CURSEG_HOT_NODE;</div><div class='ctx'> 		return CURSEG_COLD_NODE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum temp_type f2fs_get_segment_temp(struct f2fs_sb_info *sbi,</div><div class='add'>+						enum log_type type)</div><div class='add'>+{</div><div class='add'>+	struct curseg_info *curseg = CURSEG_I(sbi, type);</div><div class='add'>+	enum temp_type temp = COLD;</div><div class='add'>+</div><div class='add'>+	switch (curseg-&gt;seg_type) {</div><div class='add'>+	case CURSEG_HOT_NODE:</div><div class='add'>+	case CURSEG_HOT_DATA:</div><div class='add'>+		temp = HOT;</div><div class='add'>+		break;</div><div class='add'>+	case CURSEG_WARM_NODE:</div><div class='add'>+	case CURSEG_WARM_DATA:</div><div class='add'>+		temp = WARM;</div><div class='add'>+		break;</div><div class='add'>+	case CURSEG_COLD_NODE:</div><div class='add'>+	case CURSEG_COLD_DATA:</div><div class='add'>+		temp = COLD;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return temp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __get_segment_type(struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='del'>-	int type = 0;</div><div class='add'>+	enum log_type type = CURSEG_HOT_DATA;</div><div class='ctx'> </div><div class='ctx'> 	switch (F2FS_OPTION(fio-&gt;sbi).active_logs) {</div><div class='ctx'> 	case 2:</div><div class='hunk'>@@ -3388,12 +3761,8 @@ static int __get_segment_type(struct f2fs_io_info *fio)</div><div class='ctx'> 		f2fs_bug_on(fio-&gt;sbi, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_HOT(type))</div><div class='del'>-		fio-&gt;temp = HOT;</div><div class='del'>-	else if (IS_WARM(type))</div><div class='del'>-		fio-&gt;temp = WARM;</div><div class='del'>-	else</div><div class='del'>-		fio-&gt;temp = COLD;</div><div class='add'>+	fio-&gt;temp = f2fs_get_segment_temp(fio-&gt;sbi, type);</div><div class='add'>+</div><div class='ctx'> 	return type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3410,7 +3779,7 @@ static void f2fs_randomize_chunk(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		get_random_u32_inclusive(1, sbi-&gt;max_fragment_hole);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='add'>+int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='ctx'> 		block_t old_blkaddr, block_t *new_blkaddr,</div><div class='ctx'> 		struct f2fs_summary *sum, int type,</div><div class='ctx'> 		struct f2fs_io_info *fio)</div><div class='hunk'>@@ -3421,12 +3790,18 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 	bool from_gc = (type == CURSEG_ALL_DATA_ATGC);</div><div class='ctx'> 	struct seg_entry *se = NULL;</div><div class='ctx'> 	bool segment_full = false;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> 	down_write(&amp;sit_i-&gt;sentry_lock);</div><div class='ctx'> </div><div class='add'>+	if (curseg-&gt;segno == NULL_SEGNO) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (from_gc) {</div><div class='ctx'> 		f2fs_bug_on(sbi, GET_SEGNO(sbi, old_blkaddr) == NULL_SEGNO);</div><div class='ctx'> 		se = get_seg_entry(sbi, GET_SEGNO(sbi, old_blkaddr));</div><div class='hunk'>@@ -3435,7 +3810,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 	}</div><div class='ctx'> 	*new_blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(sbi, curseg-&gt;next_blkoff &gt;= sbi-&gt;blocks_per_seg);</div><div class='add'>+	f2fs_bug_on(sbi, curseg-&gt;next_blkoff &gt;= BLKS_PER_SEG(sbi));</div><div class='ctx'> </div><div class='ctx'> 	f2fs_wait_discard_bio(sbi, *new_blkaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -3464,25 +3839,36 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 	 * since SSR needs latest valid block information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	update_sit_entry(sbi, *new_blkaddr, 1);</div><div class='del'>-	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)</div><div class='del'>-		update_sit_entry(sbi, old_blkaddr, -1);</div><div class='add'>+	update_sit_entry(sbi, old_blkaddr, -1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the current segment is full, flush it out and replace it with a</div><div class='ctx'> 	 * new segment.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (segment_full) {</div><div class='add'>+		if (type == CURSEG_COLD_DATA_PINNED &amp;&amp;</div><div class='add'>+		    !((curseg-&gt;segno + 1) % sbi-&gt;segs_per_sec)) {</div><div class='add'>+			write_sum_page(sbi, curseg-&gt;sum_blk, curseg-&gt;segno);</div><div class='add'>+			reset_curseg_fields(curseg);</div><div class='add'>+			goto skip_new_segment;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (from_gc) {</div><div class='del'>-			get_atssr_segment(sbi, type, se-&gt;type,</div><div class='add'>+			ret = get_atssr_segment(sbi, type, se-&gt;type,</div><div class='ctx'> 						AT_SSR, se-&gt;mtime);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (need_new_seg(sbi, type))</div><div class='del'>-				new_curseg(sbi, type, false);</div><div class='add'>+				ret = new_curseg(sbi, type, false);</div><div class='ctx'> 			else</div><div class='del'>-				change_curseg(sbi, type);</div><div class='add'>+				ret = change_curseg(sbi, type);</div><div class='ctx'> 			stat_inc_seg_type(sbi, curseg);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+skip_new_segment:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * segment dirty status should be updated after segment allocation,</div><div class='ctx'> 	 * so we just need to update status only one time after previous</div><div class='hunk'>@@ -3491,23 +3877,25 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 	locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr));</div><div class='ctx'> 	locate_dirty_segment(sbi, GET_SEGNO(sbi, *new_blkaddr));</div><div class='ctx'> </div><div class='del'>-	if (IS_DATASEG(type))</div><div class='del'>-		atomic64_inc(&amp;sbi-&gt;allocated_data_blocks);</div><div class='add'>+	if (IS_DATASEG(curseg-&gt;seg_type)) {</div><div class='add'>+		unsigned long long new_val;</div><div class='add'>+</div><div class='add'>+		new_val = atomic64_inc_return(&amp;sbi-&gt;allocated_data_blocks);</div><div class='add'>+		if (unlikely(new_val == ULLONG_MAX))</div><div class='add'>+			atomic64_set(&amp;sbi-&gt;allocated_data_blocks, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;sit_i-&gt;sentry_lock);</div><div class='ctx'> </div><div class='del'>-	if (page &amp;&amp; IS_NODESEG(type)) {</div><div class='del'>-		fill_node_footer_blkaddr(page, NEXT_FREE_BLKADDR(sbi, curseg));</div><div class='add'>+	if (folio &amp;&amp; IS_NODESEG(curseg-&gt;seg_type)) {</div><div class='add'>+		fill_node_footer_blkaddr(folio, NEXT_FREE_BLKADDR(sbi, curseg));</div><div class='ctx'> </div><div class='del'>-		f2fs_inode_chksum_set(sbi, page);</div><div class='add'>+		f2fs_inode_chksum_set(sbi, folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fio) {</div><div class='ctx'> 		struct f2fs_bio_info *io;</div><div class='ctx'> </div><div class='del'>-		if (F2FS_IO_ALIGNED(sbi))</div><div class='del'>-			fio-&gt;retry = 0;</div><div class='del'>-</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;fio-&gt;list);</div><div class='ctx'> 		fio-&gt;in_list = 1;</div><div class='ctx'> 		io = sbi-&gt;write_io[fio-&gt;type] + fio-&gt;temp;</div><div class='hunk'>@@ -3517,8 +3905,15 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='add'>+	f2fs_up_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+out_err:</div><div class='add'>+	*new_blkaddr = NULL_ADDR;</div><div class='add'>+	up_write(&amp;sit_i-&gt;sentry_lock);</div><div class='add'>+	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> 	f2fs_up_read(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_update_device_state(struct f2fs_sb_info *sbi, nid_t ino,</div><div class='hunk'>@@ -3548,33 +3943,74 @@ void f2fs_update_device_state(struct f2fs_sb_info *sbi, nid_t ino,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int log_type_to_seg_type(enum log_type type)</div><div class='add'>+{</div><div class='add'>+	int seg_type = CURSEG_COLD_DATA;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case CURSEG_HOT_DATA:</div><div class='add'>+	case CURSEG_WARM_DATA:</div><div class='add'>+	case CURSEG_COLD_DATA:</div><div class='add'>+	case CURSEG_HOT_NODE:</div><div class='add'>+	case CURSEG_WARM_NODE:</div><div class='add'>+	case CURSEG_COLD_NODE:</div><div class='add'>+		seg_type = (int)type;</div><div class='add'>+		break;</div><div class='add'>+	case CURSEG_COLD_DATA_PINNED:</div><div class='add'>+	case CURSEG_ALL_DATA_ATGC:</div><div class='add'>+		seg_type = CURSEG_COLD_DATA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return seg_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)</div><div class='ctx'> {</div><div class='del'>-	int type = __get_segment_type(fio);</div><div class='del'>-	bool keep_order = (f2fs_lfs_mode(fio-&gt;sbi) &amp;&amp; type == CURSEG_COLD_DATA);</div><div class='add'>+	struct folio *folio = fio-&gt;folio;</div><div class='add'>+	enum log_type type = __get_segment_type(fio);</div><div class='add'>+	int seg_type = log_type_to_seg_type(type);</div><div class='add'>+	bool keep_order = (f2fs_lfs_mode(fio-&gt;sbi) &amp;&amp;</div><div class='add'>+				seg_type == CURSEG_COLD_DATA);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (keep_order)</div><div class='ctx'> 		f2fs_down_read(&amp;fio-&gt;sbi-&gt;io_order_lock);</div><div class='del'>-reallocate:</div><div class='del'>-	f2fs_allocate_data_block(fio-&gt;sbi, fio-&gt;page, fio-&gt;old_blkaddr,</div><div class='add'>+</div><div class='add'>+	err = f2fs_allocate_data_block(fio-&gt;sbi, folio, fio-&gt;old_blkaddr,</div><div class='ctx'> 			&amp;fio-&gt;new_blkaddr, sum, type, fio);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		f2fs_err_ratelimited(fio-&gt;sbi,</div><div class='add'>+			"%s Failed to allocate data block, ino:%u, index:%lu, type:%d, old_blkaddr:0x%x, new_blkaddr:0x%x, err:%d",</div><div class='add'>+			__func__, fio-&gt;ino, folio-&gt;index, type,</div><div class='add'>+			fio-&gt;old_blkaddr, fio-&gt;new_blkaddr, err);</div><div class='add'>+		if (fscrypt_inode_uses_fs_layer_crypto(folio-&gt;mapping-&gt;host))</div><div class='add'>+			fscrypt_finalize_bounce_page(&amp;fio-&gt;encrypted_page);</div><div class='add'>+		folio_end_writeback(folio);</div><div class='add'>+		if (f2fs_in_warm_node_list(fio-&gt;sbi, folio))</div><div class='add'>+			f2fs_del_fsync_node_entry(fio-&gt;sbi, folio);</div><div class='add'>+		f2fs_bug_on(fio-&gt;sbi, !is_set_ckpt_flags(fio-&gt;sbi,</div><div class='add'>+							CP_ERROR_FLAG));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	f2fs_bug_on(fio-&gt;sbi, !f2fs_is_valid_blkaddr_raw(fio-&gt;sbi,</div><div class='add'>+				fio-&gt;new_blkaddr, DATA_GENERIC_ENHANCE));</div><div class='add'>+</div><div class='ctx'> 	if (GET_SEGNO(fio-&gt;sbi, fio-&gt;old_blkaddr) != NULL_SEGNO)</div><div class='del'>-		f2fs_invalidate_internal_cache(fio-&gt;sbi, fio-&gt;old_blkaddr);</div><div class='add'>+		f2fs_invalidate_internal_cache(fio-&gt;sbi, fio-&gt;old_blkaddr, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* writeout dirty page into bdev */</div><div class='ctx'> 	f2fs_submit_page_write(fio);</div><div class='del'>-	if (fio-&gt;retry) {</div><div class='del'>-		fio-&gt;old_blkaddr = fio-&gt;new_blkaddr;</div><div class='del'>-		goto reallocate;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_update_device_state(fio-&gt;sbi, fio-&gt;ino, fio-&gt;new_blkaddr, 1);</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	if (keep_order)</div><div class='ctx'> 		f2fs_up_read(&amp;fio-&gt;sbi-&gt;io_order_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='add'>+void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='ctx'> 					enum iostat_type io_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_io_info fio = {</div><div class='hunk'>@@ -3583,20 +4019,20 @@ void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct page *page,</div><div class='ctx'> 		.temp = HOT,</div><div class='ctx'> 		.op = REQ_OP_WRITE,</div><div class='ctx'> 		.op_flags = REQ_SYNC | REQ_META | REQ_PRIO,</div><div class='del'>-		.old_blkaddr = page-&gt;index,</div><div class='del'>-		.new_blkaddr = page-&gt;index,</div><div class='del'>-		.page = page,</div><div class='add'>+		.old_blkaddr = folio-&gt;index,</div><div class='add'>+		.new_blkaddr = folio-&gt;index,</div><div class='add'>+		.folio = folio,</div><div class='ctx'> 		.encrypted_page = NULL,</div><div class='ctx'> 		.in_list = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (unlikely(page-&gt;index &gt;= MAIN_BLKADDR(sbi)))</div><div class='add'>+	if (unlikely(folio-&gt;index &gt;= MAIN_BLKADDR(sbi)))</div><div class='ctx'> 		fio.op_flags &amp;= ~REQ_META;</div><div class='ctx'> </div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> 	f2fs_submit_page_write(&amp;fio);</div><div class='ctx'> </div><div class='del'>-	stat_inc_meta_count(sbi, page-&gt;index);</div><div class='add'>+	stat_inc_meta_count(sbi, folio-&gt;index);</div><div class='ctx'> 	f2fs_update_iostat(sbi, NULL, io_type, F2FS_BLKSIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3652,9 +4088,8 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)</div><div class='ctx'> 		goto drop_bio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fio-&gt;post_read)</div><div class='del'>-		invalidate_mapping_pages(META_MAPPING(sbi),</div><div class='del'>-				fio-&gt;new_blkaddr, fio-&gt;new_blkaddr);</div><div class='add'>+	if (fio-&gt;meta_gc)</div><div class='add'>+		f2fs_truncate_meta_inode_pages(sbi, fio-&gt;new_blkaddr, 1);</div><div class='ctx'> </div><div class='ctx'> 	stat_inc_inplace_blocks(fio-&gt;sbi);</div><div class='ctx'> </div><div class='hunk'>@@ -3665,7 +4100,7 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		f2fs_update_device_state(fio-&gt;sbi, fio-&gt;ino,</div><div class='ctx'> 						fio-&gt;new_blkaddr, 1);</div><div class='del'>-		f2fs_update_iostat(fio-&gt;sbi, fio-&gt;page-&gt;mapping-&gt;host,</div><div class='add'>+		f2fs_update_iostat(fio-&gt;sbi, fio_inode(fio),</div><div class='ctx'> 						fio-&gt;io_type, F2FS_BLKSIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3714,14 +4149,14 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> </div><div class='ctx'> 	if (!recover_curseg) {</div><div class='ctx'> 		/* for recovery flow */</div><div class='del'>-		if (se-&gt;valid_blocks == 0 &amp;&amp; !IS_CURSEG(sbi, segno)) {</div><div class='add'>+		if (se-&gt;valid_blocks == 0 &amp;&amp; !is_curseg(sbi, segno)) {</div><div class='ctx'> 			if (old_blkaddr == NULL_ADDR)</div><div class='ctx'> 				type = CURSEG_COLD_DATA;</div><div class='ctx'> 			else</div><div class='ctx'> 				type = CURSEG_WARM_DATA;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (IS_CURSEG(sbi, segno)) {</div><div class='add'>+		if (is_curseg(sbi, segno)) {</div><div class='ctx'> 			/* se-&gt;type is volatile as SSR allocation */</div><div class='ctx'> 			type = __f2fs_get_curseg(sbi, segno);</div><div class='ctx'> 			f2fs_bug_on(sbi, type == NO_CHECK_TYPE);</div><div class='hunk'>@@ -3730,8 +4165,8 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f2fs_bug_on(sbi, !IS_DATASEG(type));</div><div class='ctx'> 	curseg = CURSEG_I(sbi, type);</div><div class='add'>+	f2fs_bug_on(sbi, !IS_DATASEG(curseg-&gt;seg_type));</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> 	down_write(&amp;sit_i-&gt;sentry_lock);</div><div class='hunk'>@@ -3743,7 +4178,8 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 	/* change the current segment */</div><div class='ctx'> 	if (segno != curseg-&gt;segno) {</div><div class='ctx'> 		curseg-&gt;next_segno = segno;</div><div class='del'>-		change_curseg(sbi, type);</div><div class='add'>+		if (change_curseg(sbi, type))</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	curseg-&gt;next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, new_blkaddr);</div><div class='hunk'>@@ -3755,7 +4191,7 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 		update_sit_entry(sbi, new_blkaddr, 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO) {</div><div class='del'>-		f2fs_invalidate_internal_cache(sbi, old_blkaddr);</div><div class='add'>+		f2fs_invalidate_internal_cache(sbi, old_blkaddr, 1);</div><div class='ctx'> 		if (!from_gc)</div><div class='ctx'> 			update_segment_mtime(sbi, old_blkaddr, 0);</div><div class='ctx'> 		update_sit_entry(sbi, old_blkaddr, -1);</div><div class='hunk'>@@ -3769,12 +4205,14 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,</div><div class='ctx'> 	if (recover_curseg) {</div><div class='ctx'> 		if (old_cursegno != curseg-&gt;segno) {</div><div class='ctx'> 			curseg-&gt;next_segno = old_cursegno;</div><div class='del'>-			change_curseg(sbi, type);</div><div class='add'>+			if (change_curseg(sbi, type))</div><div class='add'>+				goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		curseg-&gt;next_blkoff = old_blkoff;</div><div class='ctx'> 		curseg-&gt;alloc_type = old_alloc_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out_unlock:</div><div class='ctx'> 	up_write(&amp;sit_i-&gt;sentry_lock);</div><div class='ctx'> 	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> 	f2fs_up_write(&amp;SM_I(sbi)-&gt;curseg_lock);</div><div class='hunk'>@@ -3795,21 +4233,21 @@ void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn,</div><div class='ctx'> 	f2fs_update_data_blkaddr(dn, new_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_wait_on_page_writeback(struct page *page,</div><div class='del'>-				enum page_type type, bool ordered, bool locked)</div><div class='add'>+void f2fs_folio_wait_writeback(struct folio *folio, enum page_type type,</div><div class='add'>+		bool ordered, bool locked)</div><div class='ctx'> {</div><div class='del'>-	if (PageWriteback(page)) {</div><div class='del'>-		struct f2fs_sb_info *sbi = F2FS_P_SB(page);</div><div class='add'>+	if (folio_test_writeback(folio)) {</div><div class='add'>+		struct f2fs_sb_info *sbi = F2FS_F_SB(folio);</div><div class='ctx'> </div><div class='ctx'> 		/* submit cached LFS IO */</div><div class='del'>-		f2fs_submit_merged_write_cond(sbi, NULL, page, 0, type);</div><div class='add'>+		f2fs_submit_merged_write_cond(sbi, NULL, folio, 0, type);</div><div class='ctx'> 		/* submit cached IPU IO */</div><div class='del'>-		f2fs_submit_merged_ipu_write(sbi, NULL, page);</div><div class='add'>+		f2fs_submit_merged_ipu_write(sbi, NULL, folio);</div><div class='ctx'> 		if (ordered) {</div><div class='del'>-			wait_on_page_writeback(page);</div><div class='del'>-			f2fs_bug_on(sbi, locked &amp;&amp; PageWriteback(page));</div><div class='add'>+			folio_wait_writeback(folio);</div><div class='add'>+			f2fs_bug_on(sbi, locked &amp;&amp; folio_test_writeback(folio));</div><div class='ctx'> 		} else {</div><div class='del'>-			wait_for_stable_page(page);</div><div class='add'>+			folio_wait_stable(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3817,18 +4255,18 @@ void f2fs_wait_on_page_writeback(struct page *page,</div><div class='ctx'> void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='del'>-	struct page *cpage;</div><div class='add'>+	struct folio *cfolio;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_post_read_required(inode))</div><div class='add'>+	if (!f2fs_meta_inode_gc_required(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!__is_valid_data_blkaddr(blkaddr))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	cpage = find_lock_page(META_MAPPING(sbi), blkaddr);</div><div class='del'>-	if (cpage) {</div><div class='del'>-		f2fs_wait_on_page_writeback(cpage, DATA, true, true);</div><div class='del'>-		f2fs_put_page(cpage, 1);</div><div class='add'>+	cfolio = filemap_lock_folio(META_MAPPING(sbi), blkaddr);</div><div class='add'>+	if (!IS_ERR(cfolio)) {</div><div class='add'>+		f2fs_folio_wait_writeback(cfolio, DATA, true, true);</div><div class='add'>+		f2fs_folio_put(cfolio, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3838,13 +4276,13 @@ void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	block_t i;</div><div class='ctx'> </div><div class='del'>-	if (!f2fs_post_read_required(inode))</div><div class='add'>+	if (!f2fs_meta_inode_gc_required(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i++)</div><div class='ctx'> 		f2fs_wait_on_block_writeback(inode, blkaddr + i);</div><div class='ctx'> </div><div class='del'>-	invalidate_mapping_pages(META_MAPPING(sbi), blkaddr, blkaddr + len - 1);</div><div class='add'>+	f2fs_truncate_meta_inode_pages(sbi, blkaddr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_compacted_summaries(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -3852,16 +4290,16 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);</div><div class='ctx'> 	struct curseg_info *seg_i;</div><div class='ctx'> 	unsigned char *kaddr;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	block_t start;</div><div class='ctx'> 	int i, j, offset;</div><div class='ctx'> </div><div class='ctx'> 	start = start_sum_block(sbi);</div><div class='ctx'> </div><div class='del'>-	page = f2fs_get_meta_page(sbi, start++);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return PTR_ERR(page);</div><div class='del'>-	kaddr = (unsigned char *)page_address(page);</div><div class='add'>+	folio = f2fs_get_meta_folio(sbi, start++);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	kaddr = folio_address(folio);</div><div class='ctx'> </div><div class='ctx'> 	/* Step 1: restore nat cache */</div><div class='ctx'> 	seg_i = CURSEG_I(sbi, CURSEG_HOT_DATA);</div><div class='hunk'>@@ -3886,7 +4324,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		seg_i-&gt;next_blkoff = blk_off;</div><div class='ctx'> </div><div class='ctx'> 		if (seg_i-&gt;alloc_type == SSR)</div><div class='del'>-			blk_off = sbi-&gt;blocks_per_seg;</div><div class='add'>+			blk_off = BLKS_PER_SEG(sbi);</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; blk_off; j++) {</div><div class='ctx'> 			struct f2fs_summary *s;</div><div class='hunk'>@@ -3898,17 +4336,16 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)</div><div class='ctx'> 						SUM_FOOTER_SIZE)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='del'>-			page = NULL;</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='del'>-			page = f2fs_get_meta_page(sbi, start++);</div><div class='del'>-			if (IS_ERR(page))</div><div class='del'>-				return PTR_ERR(page);</div><div class='del'>-			kaddr = (unsigned char *)page_address(page);</div><div class='add'>+			folio = f2fs_get_meta_folio(sbi, start++);</div><div class='add'>+			if (IS_ERR(folio))</div><div class='add'>+				return PTR_ERR(folio);</div><div class='add'>+			kaddr = folio_address(folio);</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3917,7 +4354,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);</div><div class='ctx'> 	struct f2fs_summary_block *sum;</div><div class='ctx'> 	struct curseg_info *curseg;</div><div class='del'>-	struct page *new;</div><div class='add'>+	struct folio *new;</div><div class='ctx'> 	unsigned short blk_off;</div><div class='ctx'> 	unsigned int segno = 0;</div><div class='ctx'> 	block_t blk_addr = 0;</div><div class='hunk'>@@ -3944,17 +4381,17 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 			blk_addr = GET_SUM_BLOCK(sbi, segno);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	new = f2fs_get_meta_page(sbi, blk_addr);</div><div class='add'>+	new = f2fs_get_meta_folio(sbi, blk_addr);</div><div class='ctx'> 	if (IS_ERR(new))</div><div class='ctx'> 		return PTR_ERR(new);</div><div class='del'>-	sum = (struct f2fs_summary_block *)page_address(new);</div><div class='add'>+	sum = folio_address(new);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_NODESEG(type)) {</div><div class='ctx'> 		if (__exist_node_summaries(sbi)) {</div><div class='ctx'> 			struct f2fs_summary *ns = &amp;sum-&gt;entries[0];</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; sbi-&gt;blocks_per_seg; i++, ns++) {</div><div class='add'>+			for (i = 0; i &lt; BLKS_PER_SEG(sbi); i++, ns++) {</div><div class='ctx'> 				ns-&gt;version = 0;</div><div class='ctx'> 				ns-&gt;ofs_in_node = 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3982,7 +4419,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	curseg-&gt;next_blkoff = blk_off;</div><div class='ctx'> 	mutex_unlock(&amp;curseg-&gt;curseg_mutex);</div><div class='ctx'> out:</div><div class='del'>-	f2fs_put_page(new, 1);</div><div class='add'>+	f2fs_folio_put(new, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4031,15 +4468,15 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	unsigned char *kaddr;</div><div class='ctx'> 	struct f2fs_summary *summary;</div><div class='ctx'> 	struct curseg_info *seg_i;</div><div class='ctx'> 	int written_size = 0;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_meta_page(sbi, blkaddr++);</div><div class='del'>-	kaddr = (unsigned char *)page_address(page);</div><div class='add'>+	folio = f2fs_grab_meta_folio(sbi, blkaddr++);</div><div class='add'>+	kaddr = folio_address(folio);</div><div class='ctx'> 	memset(kaddr, 0, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Step 1: write nat cache */</div><div class='hunk'>@@ -4056,9 +4493,9 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)</div><div class='ctx'> 	for (i = CURSEG_HOT_DATA; i &lt;= CURSEG_COLD_DATA; i++) {</div><div class='ctx'> 		seg_i = CURSEG_I(sbi, i);</div><div class='ctx'> 		for (j = 0; j &lt; f2fs_curseg_valid_blocks(sbi, i); j++) {</div><div class='del'>-			if (!page) {</div><div class='del'>-				page = f2fs_grab_meta_page(sbi, blkaddr++);</div><div class='del'>-				kaddr = (unsigned char *)page_address(page);</div><div class='add'>+			if (!folio) {</div><div class='add'>+				folio = f2fs_grab_meta_folio(sbi, blkaddr++);</div><div class='add'>+				kaddr = folio_address(folio);</div><div class='ctx'> 				memset(kaddr, 0, PAGE_SIZE);</div><div class='ctx'> 				written_size = 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4070,14 +4507,14 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)</div><div class='ctx'> 							SUM_FOOTER_SIZE)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='del'>-			page = NULL;</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='add'>+			folio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (page) {</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+	if (folio) {</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4130,29 +4567,29 @@ int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type,</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *get_current_sit_page(struct f2fs_sb_info *sbi,</div><div class='add'>+static struct folio *get_current_sit_folio(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					unsigned int segno)</div><div class='ctx'> {</div><div class='del'>-	return f2fs_get_meta_page(sbi, current_sit_addr(sbi, segno));</div><div class='add'>+	return f2fs_get_meta_folio(sbi, current_sit_addr(sbi, segno));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,</div><div class='add'>+static struct folio *get_next_sit_folio(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					unsigned int start)</div><div class='ctx'> {</div><div class='ctx'> 	struct sit_info *sit_i = SIT_I(sbi);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	pgoff_t src_off, dst_off;</div><div class='ctx'> </div><div class='ctx'> 	src_off = current_sit_addr(sbi, start);</div><div class='ctx'> 	dst_off = next_sit_addr(sbi, src_off);</div><div class='ctx'> </div><div class='del'>-	page = f2fs_grab_meta_page(sbi, dst_off);</div><div class='del'>-	seg_info_to_sit_page(sbi, page, start);</div><div class='add'>+	folio = f2fs_grab_meta_folio(sbi, dst_off);</div><div class='add'>+	seg_info_to_sit_folio(sbi, folio, start);</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(page);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='ctx'> 	set_to_next_sit(sit_i, start);</div><div class='ctx'> </div><div class='del'>-	return page;</div><div class='add'>+	return folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sit_entry_set *grab_sit_entry_set(void)</div><div class='hunk'>@@ -4282,7 +4719,7 @@ void f2fs_flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 	 * #2, flush sit entries to sit page.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry_safe(ses, tmp, head, set_list) {</div><div class='del'>-		struct page *page = NULL;</div><div class='add'>+		struct folio *folio = NULL;</div><div class='ctx'> 		struct f2fs_sit_block *raw_sit = NULL;</div><div class='ctx'> 		unsigned int start_segno = ses-&gt;start_segno;</div><div class='ctx'> 		unsigned int end = min(start_segno + SIT_ENTRY_PER_BLOCK,</div><div class='hunk'>@@ -4296,8 +4733,8 @@ void f2fs_flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 		if (to_journal) {</div><div class='ctx'> 			down_write(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> 		} else {</div><div class='del'>-			page = get_next_sit_page(sbi, start_segno);</div><div class='del'>-			raw_sit = page_address(page);</div><div class='add'>+			folio = get_next_sit_folio(sbi, start_segno);</div><div class='add'>+			raw_sit = folio_address(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* flush dirty sit entries in region of current sit set */</div><div class='hunk'>@@ -4335,6 +4772,12 @@ void f2fs_flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 						&amp;raw_sit-&gt;entries[sit_offset]);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			/* update ckpt_valid_block */</div><div class='add'>+			if (__is_large_section(sbi)) {</div><div class='add'>+				set_ckpt_valid_blocks(sbi, segno);</div><div class='add'>+				sanity_check_valid_blocks(sbi, segno);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			__clear_bit(segno, bitmap);</div><div class='ctx'> 			sit_i-&gt;dirty_sentries--;</div><div class='ctx'> 			ses-&gt;entry_cnt--;</div><div class='hunk'>@@ -4343,7 +4786,7 @@ void f2fs_flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)</div><div class='ctx'> 		if (to_journal)</div><div class='ctx'> 			up_write(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> 		else</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 		f2fs_bug_on(sbi, ses-&gt;entry_cnt);</div><div class='ctx'> 		release_sit_entry_set(ses);</div><div class='hunk'>@@ -4460,7 +4903,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	sit_i-&gt;sit_base_addr = le32_to_cpu(raw_super-&gt;sit_blkaddr);</div><div class='del'>-	sit_i-&gt;sit_blocks = sit_segs &lt;&lt; sbi-&gt;log_blocks_per_seg;</div><div class='add'>+	sit_i-&gt;sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);</div><div class='ctx'> 	sit_i-&gt;written_valid_blocks = 0;</div><div class='ctx'> 	sit_i-&gt;bitmap_size = sit_bitmap_size;</div><div class='ctx'> 	sit_i-&gt;dirty_sentries = 0;</div><div class='hunk'>@@ -4527,15 +4970,8 @@ static int build_curseg(struct f2fs_sb_info *sbi)</div><div class='ctx'> 				sizeof(struct f2fs_journal), GFP_KERNEL);</div><div class='ctx'> 		if (!array[i].journal)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		if (i &lt; NR_PERSISTENT_LOG)</div><div class='del'>-			array[i].seg_type = CURSEG_HOT_DATA + i;</div><div class='del'>-		else if (i == CURSEG_COLD_DATA_PINNED)</div><div class='del'>-			array[i].seg_type = CURSEG_COLD_DATA;</div><div class='del'>-		else if (i == CURSEG_ALL_DATA_ATGC)</div><div class='del'>-			array[i].seg_type = CURSEG_COLD_DATA;</div><div class='del'>-		array[i].segno = NULL_SEGNO;</div><div class='del'>-		array[i].next_blkoff = 0;</div><div class='del'>-		array[i].inited = false;</div><div class='add'>+		array[i].seg_type = log_type_to_seg_type(i);</div><div class='add'>+		reset_curseg_fields(&amp;array[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	return restore_curseg_summaries(sbi);</div><div class='ctx'> }</div><div class='hunk'>@@ -4562,15 +4998,15 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 		for (; start &lt; end &amp;&amp; start &lt; MAIN_SEGS(sbi); start++) {</div><div class='ctx'> 			struct f2fs_sit_block *sit_blk;</div><div class='del'>-			struct page *page;</div><div class='add'>+			struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 			se = &amp;sit_i-&gt;sentries[start];</div><div class='del'>-			page = get_current_sit_page(sbi, start);</div><div class='del'>-			if (IS_ERR(page))</div><div class='del'>-				return PTR_ERR(page);</div><div class='del'>-			sit_blk = (struct f2fs_sit_block *)page_address(page);</div><div class='add'>+			folio = get_current_sit_folio(sbi, start);</div><div class='add'>+			if (IS_ERR(folio))</div><div class='add'>+				return PTR_ERR(folio);</div><div class='add'>+			sit_blk = folio_address(folio);</div><div class='ctx'> 			sit = sit_blk-&gt;entries[SIT_ENTRY_OFFSET(sit_i, start)];</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 			err = check_block_count(sbi, start, &amp;sit);</div><div class='ctx'> 			if (err)</div><div class='hunk'>@@ -4587,21 +5023,20 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 			sit_valid_blocks[SE_PAGETYPE(se)] += se-&gt;valid_blocks;</div><div class='ctx'> </div><div class='del'>-			if (f2fs_block_unit_discard(sbi)) {</div><div class='del'>-				/* build discard map only one time */</div><div class='del'>-				if (is_set_ckpt_flags(sbi, CP_TRIMMED_FLAG)) {</div><div class='del'>-					memset(se-&gt;discard_map, 0xff,</div><div class='add'>+			if (!f2fs_block_unit_discard(sbi))</div><div class='add'>+				goto init_discard_map_done;</div><div class='add'>+</div><div class='add'>+			/* build discard map only one time */</div><div class='add'>+			if (is_set_ckpt_flags(sbi, CP_TRIMMED_FLAG)) {</div><div class='add'>+				memset(se-&gt;discard_map, 0xff,</div><div class='ctx'> 						SIT_VBLOCK_MAP_SIZE);</div><div class='del'>-				} else {</div><div class='del'>-					memcpy(se-&gt;discard_map,</div><div class='del'>-						se-&gt;cur_valid_map,</div><div class='add'>+				goto init_discard_map_done;</div><div class='add'>+			}</div><div class='add'>+			memcpy(se-&gt;discard_map, se-&gt;cur_valid_map,</div><div class='ctx'> 						SIT_VBLOCK_MAP_SIZE);</div><div class='del'>-					sbi-&gt;discard_blks +=</div><div class='del'>-						sbi-&gt;blocks_per_seg -</div><div class='add'>+			sbi-&gt;discard_blks += BLKS_PER_SEG(sbi) -</div><div class='ctx'> 						se-&gt;valid_blocks;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='add'>+init_discard_map_done:</div><div class='ctx'> 			if (__is_large_section(sbi))</div><div class='ctx'> 				get_sec_entry(sbi, start)-&gt;valid_blocks +=</div><div class='ctx'> 							se-&gt;valid_blocks;</div><div class='hunk'>@@ -4664,6 +5099,16 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	}</div><div class='ctx'> 	up_read(&amp;curseg-&gt;journal_rwsem);</div><div class='ctx'> </div><div class='add'>+	/* update ckpt_valid_block */</div><div class='add'>+	if (__is_large_section(sbi)) {</div><div class='add'>+		unsigned int segno;</div><div class='add'>+</div><div class='add'>+		for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += SEGS_PER_SEC(sbi)) {</div><div class='add'>+			set_ckpt_valid_blocks(sbi, segno);</div><div class='add'>+			sanity_check_valid_blocks(sbi, segno);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4741,13 +5186,13 @@ static void init_dirty_segmap(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dirty_i-&gt;seglist_lock);</div><div class='del'>-	for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += sbi-&gt;segs_per_sec) {</div><div class='add'>+	for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += SEGS_PER_SEC(sbi)) {</div><div class='ctx'> 		valid_blocks = get_valid_blocks(sbi, segno, true);</div><div class='ctx'> 		secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='ctx'> </div><div class='ctx'> 		if (!valid_blocks || valid_blocks == CAP_BLKS_PER_SEC(sbi))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (IS_CURSEC(sbi, secno))</div><div class='add'>+		if (is_cursec(sbi, secno))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		set_bit(secno, dirty_i-&gt;dirty_secmap);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4840,7 +5285,7 @@ static int sanity_check_curseg(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		if (curseg-&gt;alloc_type == SSR)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		for (blkofs += 1; blkofs &lt; sbi-&gt;blocks_per_seg; blkofs++) {</div><div class='add'>+		for (blkofs += 1; blkofs &lt; BLKS_PER_SEG(sbi); blkofs++) {</div><div class='ctx'> 			if (!f2fs_test_bit(blkofs, se-&gt;cur_valid_map))</div><div class='ctx'> 				continue;</div><div class='ctx'> out:</div><div class='hunk'>@@ -4856,7 +5301,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-</div><div class='ctx'> static int check_zone_write_pointer(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				    struct f2fs_dev_info *fdev,</div><div class='ctx'> 				    struct blk_zone *zone)</div><div class='hunk'>@@ -4865,6 +5309,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	block_t zone_block, valid_block_cnt;</div><div class='ctx'> 	unsigned int log_sectors_per_block = sbi-&gt;log_blocksize - SECTOR_SHIFT;</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int nofs_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (zone-&gt;type != BLK_ZONE_TYPE_SEQWRITE_REQ)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -4876,14 +5321,19 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	 * Skip check of zones cursegs point to, since</div><div class='ctx'> 	 * fix_curseg_write_pointer() checks them.</div><div class='ctx'> 	 */</div><div class='del'>-	if (zone_segno &gt;= MAIN_SEGS(sbi) ||</div><div class='del'>-	    IS_CURSEC(sbi, GET_SEC_FROM_SEG(sbi, zone_segno)))</div><div class='add'>+	if (zone_segno &gt;= MAIN_SEGS(sbi))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get # of valid block of the zone.</div><div class='ctx'> 	 */</div><div class='ctx'> 	valid_block_cnt = get_valid_blocks(sbi, zone_segno, true);</div><div class='add'>+	if (is_cursec(sbi, GET_SEC_FROM_SEG(sbi, zone_segno))) {</div><div class='add'>+		f2fs_notice(sbi, "Open zones: valid block[0x%x,0x%x] cond[%s]",</div><div class='add'>+				zone_segno, valid_block_cnt,</div><div class='add'>+				blk_zone_cond_str(zone-&gt;cond));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((!valid_block_cnt &amp;&amp; zone-&gt;cond == BLK_ZONE_COND_EMPTY) ||</div><div class='ctx'> 	    (valid_block_cnt &amp;&amp; zone-&gt;cond == BLK_ZONE_COND_FULL))</div><div class='hunk'>@@ -4891,8 +5341,8 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 	if (!valid_block_cnt) {</div><div class='ctx'> 		f2fs_notice(sbi, "Zone without valid block has non-zero write "</div><div class='del'>-			    "pointer. Reset the write pointer: cond[0x%x]",</div><div class='del'>-			    zone-&gt;cond);</div><div class='add'>+			    "pointer. Reset the write pointer: cond[%s]",</div><div class='add'>+			    blk_zone_cond_str(zone-&gt;cond));</div><div class='ctx'> 		ret = __f2fs_issue_discard_zone(sbi, fdev-&gt;bdev, zone_block,</div><div class='ctx'> 					zone-&gt;len &gt;&gt; log_sectors_per_block);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -4909,11 +5359,13 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	 * selected for write operation until it get discarded.</div><div class='ctx'> 	 */</div><div class='ctx'> 	f2fs_notice(sbi, "Valid blocks are not aligned with write "</div><div class='del'>-		    "pointer: valid block[0x%x,0x%x] cond[0x%x]",</div><div class='del'>-		    zone_segno, valid_block_cnt, zone-&gt;cond);</div><div class='add'>+		    "pointer: valid block[0x%x,0x%x] cond[%s]",</div><div class='add'>+		    zone_segno, valid_block_cnt, blk_zone_cond_str(zone-&gt;cond));</div><div class='ctx'> </div><div class='add'>+	nofs_flags = memalloc_nofs_save();</div><div class='ctx'> 	ret = blkdev_zone_mgmt(fdev-&gt;bdev, REQ_OP_ZONE_FINISH,</div><div class='del'>-				zone-&gt;start, zone-&gt;len, GFP_NOFS);</div><div class='add'>+				zone-&gt;start, zone-&gt;len);</div><div class='add'>+	memalloc_nofs_restore(nofs_flags);</div><div class='ctx'> 	if (ret == -EOPNOTSUPP) {</div><div class='ctx'> 		ret = blkdev_issue_zeroout(fdev-&gt;bdev, zone-&gt;wp,</div><div class='ctx'> 					zone-&gt;len - (zone-&gt;wp - zone-&gt;start),</div><div class='hunk'>@@ -4952,7 +5404,7 @@ static int report_one_zone_cb(struct blk_zone *zone, unsigned int idx,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)</div><div class='add'>+static int do_fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct curseg_info *cs = CURSEG_I(sbi, type);</div><div class='ctx'> 	struct f2fs_dev_info *zbd;</div><div class='hunk'>@@ -5004,7 +5456,8 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new section if it's not new. */</div><div class='del'>-	if (cs-&gt;next_blkoff) {</div><div class='add'>+	if (cs-&gt;next_blkoff ||</div><div class='add'>+	    cs-&gt;segno != GET_SEG_FROM_SEC(sbi, GET_ZONE_FROM_SEC(sbi, cs_section))) {</div><div class='ctx'> 		unsigned int old_segno = cs-&gt;segno, old_blkoff = cs-&gt;next_blkoff;</div><div class='ctx'> </div><div class='ctx'> 		f2fs_allocate_new_section(sbi, type, true);</div><div class='hunk'>@@ -5056,12 +5509,12 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_fix_curseg_write_pointer(struct f2fs_sb_info *sbi)</div><div class='add'>+static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_PERSISTENT_LOG; i++) {</div><div class='del'>-		ret = fix_curseg_write_pointer(sbi, i);</div><div class='add'>+		ret = do_fix_curseg_write_pointer(sbi, i);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5084,7 +5537,7 @@ static int check_zone_write_pointer_cb(struct blk_zone *zone, unsigned int idx,</div><div class='ctx'> 	return check_zone_write_pointer(args-&gt;sbi, args-&gt;fdev, zone);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_check_write_pointer(struct f2fs_sb_info *sbi)</div><div class='add'>+static int check_write_pointer(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	struct check_zone_write_pointer_args args;</div><div class='hunk'>@@ -5104,6 +5557,21 @@ int f2fs_check_write_pointer(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int f2fs_check_and_fix_write_pointer(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_sb_has_blkzoned(sbi) || f2fs_readonly(sbi-&gt;sb) ||</div><div class='add'>+	    f2fs_hw_is_readonly(sbi))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	f2fs_notice(sbi, "Checking entire write pointers");</div><div class='add'>+	ret = fix_curseg_write_pointer(sbi);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = check_write_pointer(sbi);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Return the number of usable blocks in a segment. The number of blocks</div><div class='ctx'>  * returned is always equal to the number of blocks in a segment for</div><div class='hunk'>@@ -5119,7 +5587,7 @@ static inline unsigned int f2fs_usable_zone_blks_in_seg(</div><div class='ctx'> 	unsigned int secno;</div><div class='ctx'> </div><div class='ctx'> 	if (!sbi-&gt;unusable_blocks_per_sec)</div><div class='del'>-		return sbi-&gt;blocks_per_seg;</div><div class='add'>+		return BLKS_PER_SEG(sbi);</div><div class='ctx'> </div><div class='ctx'> 	secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='ctx'> 	seg_start = START_BLOCK(sbi, segno);</div><div class='hunk'>@@ -5134,18 +5602,13 @@ static inline unsigned int f2fs_usable_zone_blks_in_seg(</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (seg_start &gt;= sec_cap_blkaddr)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (seg_start + sbi-&gt;blocks_per_seg &gt; sec_cap_blkaddr)</div><div class='add'>+	if (seg_start + BLKS_PER_SEG(sbi) &gt; sec_cap_blkaddr)</div><div class='ctx'> 		return sec_cap_blkaddr - seg_start;</div><div class='ctx'> </div><div class='del'>-	return sbi-&gt;blocks_per_seg;</div><div class='add'>+	return BLKS_PER_SEG(sbi);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-int f2fs_fix_curseg_write_pointer(struct f2fs_sb_info *sbi)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int f2fs_check_write_pointer(struct f2fs_sb_info *sbi)</div><div class='add'>+int f2fs_check_and_fix_write_pointer(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5163,16 +5626,50 @@ unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi))</div><div class='ctx'> 		return f2fs_usable_zone_blks_in_seg(sbi, segno);</div><div class='ctx'> </div><div class='del'>-	return sbi-&gt;blocks_per_seg;</div><div class='add'>+	return BLKS_PER_SEG(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,</div><div class='del'>-					unsigned int segno)</div><div class='add'>+unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi))</div><div class='ctx'> 		return CAP_SEGS_PER_SEC(sbi);</div><div class='ctx'> </div><div class='del'>-	return sbi-&gt;segs_per_sec;</div><div class='add'>+	return SEGS_PER_SEC(sbi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long long f2fs_get_section_mtime(struct f2fs_sb_info *sbi,</div><div class='add'>+	unsigned int segno)</div><div class='add'>+{</div><div class='add'>+	unsigned int usable_segs_per_sec = f2fs_usable_segs_in_sec(sbi);</div><div class='add'>+	unsigned int secno = 0, start = 0;</div><div class='add'>+	unsigned int total_valid_blocks = 0;</div><div class='add'>+	unsigned long long mtime = 0;</div><div class='add'>+	unsigned int i = 0;</div><div class='add'>+</div><div class='add'>+	secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='add'>+	start = GET_SEG_FROM_SEC(sbi, secno);</div><div class='add'>+</div><div class='add'>+	if (!__is_large_section(sbi)) {</div><div class='add'>+		mtime = get_seg_entry(sbi, start + i)-&gt;mtime;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; usable_segs_per_sec; i++) {</div><div class='add'>+		/* for large section, only check the mtime of valid segments */</div><div class='add'>+		struct seg_entry *se = get_seg_entry(sbi, start+i);</div><div class='add'>+</div><div class='add'>+		mtime += se-&gt;mtime * se-&gt;valid_blocks;</div><div class='add'>+		total_valid_blocks += se-&gt;valid_blocks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (total_valid_blocks == 0)</div><div class='add'>+		return INVALID_MTIME;</div><div class='add'>+</div><div class='add'>+	mtime = div_u64(mtime, total_valid_blocks);</div><div class='add'>+out:</div><div class='add'>+	if (unlikely(mtime == INVALID_MTIME))</div><div class='add'>+		mtime -= 1;</div><div class='add'>+	return mtime;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5187,14 +5684,10 @@ static void init_min_max_mtime(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	sit_i-&gt;min_mtime = ULLONG_MAX;</div><div class='ctx'> </div><div class='del'>-	for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += sbi-&gt;segs_per_sec) {</div><div class='del'>-		unsigned int i;</div><div class='add'>+	for (segno = 0; segno &lt; MAIN_SEGS(sbi); segno += SEGS_PER_SEC(sbi)) {</div><div class='ctx'> 		unsigned long long mtime = 0;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; sbi-&gt;segs_per_sec; i++)</div><div class='del'>-			mtime += get_seg_entry(sbi, segno + i)-&gt;mtime;</div><div class='del'>-</div><div class='del'>-		mtime = div_u64(mtime, sbi-&gt;segs_per_sec);</div><div class='add'>+		mtime = f2fs_get_section_mtime(sbi, segno);</div><div class='ctx'> </div><div class='ctx'> 		if (sit_i-&gt;min_mtime &gt; mtime)</div><div class='ctx'> 			sit_i-&gt;min_mtime = mtime;</div><div class='hunk'>@@ -5233,7 +5726,7 @@ int f2fs_build_segment_manager(struct f2fs_sb_info *sbi)</div><div class='ctx'> 		sm_info-&gt;ipu_policy = BIT(F2FS_IPU_FSYNC);</div><div class='ctx'> 	sm_info-&gt;min_ipu_util = DEF_MIN_IPU_UTIL;</div><div class='ctx'> 	sm_info-&gt;min_fsync_blocks = DEF_MIN_FSYNC_BLOCKS;</div><div class='del'>-	sm_info-&gt;min_seq_blocks = sbi-&gt;blocks_per_seg;</div><div class='add'>+	sm_info-&gt;min_seq_blocks = BLKS_PER_SEG(sbi);</div><div class='ctx'> 	sm_info-&gt;min_hot_blocks = DEF_MIN_HOT_BLOCKS;</div><div class='ctx'> 	sm_info-&gt;min_ssr_sections = reserved_sections(sbi);</div><div class='ctx'> </div><div class='hunk'>@@ -5362,9 +5855,9 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	kvfree(sit_i-&gt;dirty_sentries_bitmap);</div><div class='ctx'> </div><div class='ctx'> 	SM_I(sbi)-&gt;sit_info = NULL;</div><div class='del'>-	kvfree(sit_i-&gt;sit_bitmap);</div><div class='add'>+	kfree(sit_i-&gt;sit_bitmap);</div><div class='ctx'> #ifdef CONFIG_F2FS_CHECK_FS</div><div class='del'>-	kvfree(sit_i-&gt;sit_bitmap_mir);</div><div class='add'>+	kfree(sit_i-&gt;sit_bitmap_mir);</div><div class='ctx'> 	kvfree(sit_i-&gt;invalid_segmap);</div><div class='ctx'> #endif</div><div class='ctx'> 	kfree(sit_i);</div><div class='head'>diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h<br/>index 8129be788bd5..07dcbcbeb7c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/segment.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/segment.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/segment.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/segment.h</a></div><div class='hunk'>@@ -18,6 +18,8 @@</div><div class='ctx'> #define F2FS_MIN_SEGMENTS	9 /* SB + 2 (CP + SIT + NAT) + SSA + MAIN */</div><div class='ctx'> #define F2FS_MIN_META_SEGMENTS	8 /* SB + 2 (CP + SIT + NAT) + SSA */</div><div class='ctx'> </div><div class='add'>+#define INVALID_MTIME ULLONG_MAX /* no valid blocks in a segment/section */</div><div class='add'>+</div><div class='ctx'> /* L: Logical segment # in volume, R: Relative segment # in main area */</div><div class='ctx'> #define GET_L2R_SEGNO(free_i, segno)	((segno) - (free_i)-&gt;start_segno)</div><div class='ctx'> #define GET_R2L_SEGNO(free_i, segno)	((segno) + (free_i)-&gt;start_segno)</div><div class='hunk'>@@ -32,38 +34,6 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	f2fs_bug_on(sbi, seg_type &gt;= NR_PERSISTENT_LOG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IS_HOT(t)	((t) == CURSEG_HOT_NODE || (t) == CURSEG_HOT_DATA)</div><div class='del'>-#define IS_WARM(t)	((t) == CURSEG_WARM_NODE || (t) == CURSEG_WARM_DATA)</div><div class='del'>-#define IS_COLD(t)	((t) == CURSEG_COLD_NODE || (t) == CURSEG_COLD_DATA)</div><div class='del'>-</div><div class='del'>-#define IS_CURSEG(sbi, seg)						\</div><div class='del'>-	(((seg) == CURSEG_I(sbi, CURSEG_HOT_DATA)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_WARM_DATA)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_COLD_DATA)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_HOT_NODE)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_WARM_NODE)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_COLD_NODE)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_COLD_DATA_PINNED)-&gt;segno) ||	\</div><div class='del'>-	 ((seg) == CURSEG_I(sbi, CURSEG_ALL_DATA_ATGC)-&gt;segno))</div><div class='del'>-</div><div class='del'>-#define IS_CURSEC(sbi, secno)						\</div><div class='del'>-	(((secno) == CURSEG_I(sbi, CURSEG_HOT_DATA)-&gt;segno /		\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_WARM_DATA)-&gt;segno /		\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_COLD_DATA)-&gt;segno /		\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_HOT_NODE)-&gt;segno /		\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_WARM_NODE)-&gt;segno /		\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_COLD_NODE)-&gt;segno /		\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_COLD_DATA_PINNED)-&gt;segno /	\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec) ||	\</div><div class='del'>-	 ((secno) == CURSEG_I(sbi, CURSEG_ALL_DATA_ATGC)-&gt;segno /	\</div><div class='del'>-	  (sbi)-&gt;segs_per_sec))</div><div class='del'>-</div><div class='ctx'> #define MAIN_BLKADDR(sbi)						\</div><div class='ctx'> 	(SM_I(sbi) ? SM_I(sbi)-&gt;main_blkaddr : 				\</div><div class='ctx'> 		le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;main_blkaddr))</div><div class='hunk'>@@ -77,47 +47,55 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,</div><div class='ctx'> #define TOTAL_SEGS(sbi)							\</div><div class='ctx'> 	(SM_I(sbi) ? SM_I(sbi)-&gt;segment_count : 				\</div><div class='ctx'> 		le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;segment_count))</div><div class='del'>-#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) &lt;&lt; (sbi)-&gt;log_blocks_per_seg)</div><div class='add'>+#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))</div><div class='ctx'> </div><div class='ctx'> #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))</div><div class='ctx'> #define SEGMENT_SIZE(sbi)	(1ULL &lt;&lt; ((sbi)-&gt;log_blocksize +	\</div><div class='ctx'> 					(sbi)-&gt;log_blocks_per_seg))</div><div class='ctx'> </div><div class='ctx'> #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\</div><div class='del'>-	 (GET_R2L_SEGNO(FREE_I(sbi), segno) &lt;&lt; (sbi)-&gt;log_blocks_per_seg))</div><div class='add'>+	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))</div><div class='ctx'> </div><div class='ctx'> #define NEXT_FREE_BLKADDR(sbi, curseg)					\</div><div class='ctx'> 	(START_BLOCK(sbi, (curseg)-&gt;segno) + (curseg)-&gt;next_blkoff)</div><div class='ctx'> </div><div class='ctx'> #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))</div><div class='ctx'> #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\</div><div class='del'>-	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) &gt;&gt; (sbi)-&gt;log_blocks_per_seg)</div><div class='add'>+	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))</div><div class='ctx'> #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\</div><div class='del'>-	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) &amp; ((sbi)-&gt;blocks_per_seg - 1))</div><div class='add'>+	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) &amp; (BLKS_PER_SEG(sbi) - 1))</div><div class='ctx'> </div><div class='ctx'> #define GET_SEGNO(sbi, blk_addr)					\</div><div class='ctx'> 	((!__is_valid_data_blkaddr(blk_addr)) ?			\</div><div class='ctx'> 	NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),			\</div><div class='ctx'> 		GET_SEGNO_FROM_SEG0(sbi, blk_addr)))</div><div class='del'>-#define BLKS_PER_SEC(sbi)					\</div><div class='del'>-	((sbi)-&gt;segs_per_sec * (sbi)-&gt;blocks_per_seg)</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> #define CAP_BLKS_PER_SEC(sbi)					\</div><div class='del'>-	((sbi)-&gt;segs_per_sec * (sbi)-&gt;blocks_per_seg -		\</div><div class='del'>-	 (sbi)-&gt;unusable_blocks_per_sec)</div><div class='add'>+	(BLKS_PER_SEC(sbi) - (sbi)-&gt;unusable_blocks_per_sec)</div><div class='ctx'> #define CAP_SEGS_PER_SEC(sbi)					\</div><div class='del'>-	((sbi)-&gt;segs_per_sec - ((sbi)-&gt;unusable_blocks_per_sec &gt;&gt;\</div><div class='del'>-	(sbi)-&gt;log_blocks_per_seg))</div><div class='add'>+	(SEGS_PER_SEC(sbi) -					\</div><div class='add'>+	BLKS_TO_SEGS(sbi, (sbi)-&gt;unusable_blocks_per_sec))</div><div class='add'>+#else</div><div class='add'>+#define CAP_BLKS_PER_SEC(sbi) BLKS_PER_SEC(sbi)</div><div class='add'>+#define CAP_SEGS_PER_SEC(sbi) SEGS_PER_SEC(sbi)</div><div class='add'>+#endif</div><div class='add'>+#define GET_START_SEG_FROM_SEC(sbi, segno)			\</div><div class='add'>+	(rounddown(segno, SEGS_PER_SEC(sbi)))</div><div class='ctx'> #define GET_SEC_FROM_SEG(sbi, segno)				\</div><div class='del'>-	(((segno) == -1) ? -1 : (segno) / (sbi)-&gt;segs_per_sec)</div><div class='add'>+	(((segno) == -1) ? -1 : (segno) / SEGS_PER_SEC(sbi))</div><div class='ctx'> #define GET_SEG_FROM_SEC(sbi, secno)				\</div><div class='del'>-	((secno) * (sbi)-&gt;segs_per_sec)</div><div class='add'>+	((secno) * SEGS_PER_SEC(sbi))</div><div class='ctx'> #define GET_ZONE_FROM_SEC(sbi, secno)				\</div><div class='ctx'> 	(((secno) == -1) ? -1 : (secno) / (sbi)-&gt;secs_per_zone)</div><div class='ctx'> #define GET_ZONE_FROM_SEG(sbi, segno)				\</div><div class='ctx'> 	GET_ZONE_FROM_SEC(sbi, GET_SEC_FROM_SEG(sbi, segno))</div><div class='ctx'> </div><div class='del'>-#define GET_SUM_BLOCK(sbi, segno)				\</div><div class='del'>-	((sbi)-&gt;sm_info-&gt;ssa_blkaddr + (segno))</div><div class='add'>+#define SUMS_PER_BLOCK (F2FS_BLKSIZE / F2FS_SUM_BLKSIZE)</div><div class='add'>+#define GET_SUM_BLOCK(sbi, segno)	\</div><div class='add'>+	(SM_I(sbi)-&gt;ssa_blkaddr + (segno / SUMS_PER_BLOCK))</div><div class='add'>+#define GET_SUM_BLKOFF(segno) (segno % SUMS_PER_BLOCK)</div><div class='add'>+#define SUM_BLK_PAGE_ADDR(folio, segno)	\</div><div class='add'>+	(folio_address(folio) + GET_SUM_BLKOFF(segno) * F2FS_SUM_BLKSIZE)</div><div class='ctx'> </div><div class='ctx'> #define GET_SUM_TYPE(footer) ((footer)-&gt;entry_type)</div><div class='ctx'> #define SET_SUM_TYPE(footer, type) ((footer)-&gt;entry_type = (type))</div><div class='hunk'>@@ -139,16 +117,6 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	((sectors) &gt;&gt; F2FS_LOG_SECTORS_PER_BLOCK)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * indicate a block allocation direction: RIGHT and LEFT.</div><div class='del'>- * RIGHT means allocating new sections towards the end of volume.</div><div class='del'>- * LEFT means the opposite direction.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	ALLOC_RIGHT = 0,</div><div class='del'>-	ALLOC_LEFT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * In the victim_sel_policy-&gt;alloc_mode, there are three block allocation modes.</div><div class='ctx'>  * LFS writes data sequentially with cleaning operations.</div><div class='ctx'>  * SSR (Slack Space Recycle) reuses obsolete space without cleaning operations.</div><div class='hunk'>@@ -201,6 +169,7 @@ struct victim_sel_policy {</div><div class='ctx'> 	unsigned int min_segno;		/* segment # having min. cost */</div><div class='ctx'> 	unsigned long long age;		/* mtime of GCed section*/</div><div class='ctx'> 	unsigned long long age_threshold;/* age threshold */</div><div class='add'>+	bool one_time_gc;		/* one time GC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct seg_entry {</div><div class='hunk'>@@ -223,6 +192,7 @@ struct seg_entry {</div><div class='ctx'> </div><div class='ctx'> struct sec_entry {</div><div class='ctx'> 	unsigned int valid_blocks;	/* # of valid blocks in a section */</div><div class='add'>+	unsigned int ckpt_valid_blocks; /* # of valid blocks last cp in a section */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_SKIP_GC_COUNT			16</div><div class='hunk'>@@ -329,6 +299,28 @@ static inline struct curseg_info *CURSEG_I(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 	return (struct curseg_info *)(SM_I(sbi)-&gt;curseg_array + type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_curseg(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = CURSEG_HOT_DATA; i &lt; NO_CHECK_TYPE; i++) {</div><div class='add'>+		if (segno == CURSEG_I(sbi, i)-&gt;segno)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_cursec(struct f2fs_sb_info *sbi, unsigned int secno)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = CURSEG_HOT_DATA; i &lt; NO_CHECK_TYPE; i++) {</div><div class='add'>+		if (secno == GET_SEC_FROM_SEG(sbi, CURSEG_I(sbi, i)-&gt;segno))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct seg_entry *get_seg_entry(struct f2fs_sb_info *sbi,</div><div class='ctx'> 						unsigned int segno)</div><div class='ctx'> {</div><div class='hunk'>@@ -359,21 +351,57 @@ static inline unsigned int get_valid_blocks(struct f2fs_sb_info *sbi,</div><div class='ctx'> static inline unsigned int get_ckpt_valid_blocks(struct f2fs_sb_info *sbi,</div><div class='ctx'> 				unsigned int segno, bool use_section)</div><div class='ctx'> {</div><div class='del'>-	if (use_section &amp;&amp; __is_large_section(sbi)) {</div><div class='del'>-		unsigned int start_segno = START_SEGNO(segno);</div><div class='del'>-		unsigned int blocks = 0;</div><div class='del'>-		int i;</div><div class='add'>+	if (use_section &amp;&amp; __is_large_section(sbi))</div><div class='add'>+		return get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks;</div><div class='add'>+	else</div><div class='add'>+		return get_seg_entry(sbi, segno)-&gt;ckpt_valid_blocks;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; sbi-&gt;segs_per_sec; i++, start_segno++) {</div><div class='del'>-			struct seg_entry *se = get_seg_entry(sbi, start_segno);</div><div class='add'>+static inline void set_ckpt_valid_blocks(struct f2fs_sb_info *sbi,</div><div class='add'>+		unsigned int segno)</div><div class='add'>+{</div><div class='add'>+	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='add'>+	unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);</div><div class='add'>+	unsigned int blocks = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-			blocks += se-&gt;ckpt_valid_blocks;</div><div class='del'>-		}</div><div class='del'>-		return blocks;</div><div class='add'>+	for (i = 0; i &lt; SEGS_PER_SEC(sbi); i++, start_segno++) {</div><div class='add'>+		struct seg_entry *se = get_seg_entry(sbi, start_segno);</div><div class='add'>+</div><div class='add'>+		blocks += se-&gt;ckpt_valid_blocks;</div><div class='ctx'> 	}</div><div class='del'>-	return get_seg_entry(sbi, segno)-&gt;ckpt_valid_blocks;</div><div class='add'>+	get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks = blocks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_F2FS_CHECK_FS</div><div class='add'>+static inline void sanity_check_valid_blocks(struct f2fs_sb_info *sbi,</div><div class='add'>+		unsigned int segno)</div><div class='add'>+{</div><div class='add'>+	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='add'>+	unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);</div><div class='add'>+	unsigned int blocks = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SEGS_PER_SEC(sbi); i++, start_segno++) {</div><div class='add'>+		struct seg_entry *se = get_seg_entry(sbi, start_segno);</div><div class='add'>+</div><div class='add'>+		blocks += se-&gt;ckpt_valid_blocks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (blocks != get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks) {</div><div class='add'>+		f2fs_err(sbi,</div><div class='add'>+			"Inconsistent ckpt valid blocks: "</div><div class='add'>+			"seg entry(%d) vs sec entry(%d) at secno %d",</div><div class='add'>+			blocks, get_sec_entry(sbi, segno)-&gt;ckpt_valid_blocks, secno);</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void sanity_check_valid_blocks(struct f2fs_sb_info *sbi,</div><div class='add'>+			unsigned int segno)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> static inline void seg_info_from_raw_sit(struct seg_entry *se,</div><div class='ctx'> 					struct f2fs_sit_entry *rs)</div><div class='ctx'> {</div><div class='hunk'>@@ -398,8 +426,8 @@ static inline void __seg_info_to_raw_sit(struct seg_entry *se,</div><div class='ctx'> 	rs-&gt;mtime = cpu_to_le64(se-&gt;mtime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void seg_info_to_sit_page(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct page *page, unsigned int start)</div><div class='add'>+static inline void seg_info_to_sit_folio(struct f2fs_sb_info *sbi,</div><div class='add'>+				struct folio *folio, unsigned int start)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sit_block *raw_sit;</div><div class='ctx'> 	struct seg_entry *se;</div><div class='hunk'>@@ -408,7 +436,7 @@ static inline void seg_info_to_sit_page(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					(unsigned long)MAIN_SEGS(sbi));</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	raw_sit = (struct f2fs_sit_block *)page_address(page);</div><div class='add'>+	raw_sit = folio_address(folio);</div><div class='ctx'> 	memset(raw_sit, 0, PAGE_SIZE);</div><div class='ctx'> 	for (i = 0; i &lt; end - start; i++) {</div><div class='ctx'> 		rs = &amp;raw_sit-&gt;entries[i];</div><div class='hunk'>@@ -442,15 +470,14 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)</div><div class='ctx'> 	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='ctx'> 	unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);</div><div class='ctx'> 	unsigned int next;</div><div class='del'>-	unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi, segno);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;free_i-&gt;segmap_lock);</div><div class='ctx'> 	clear_bit(segno, free_i-&gt;free_segmap);</div><div class='ctx'> 	free_i-&gt;free_segments++;</div><div class='ctx'> </div><div class='ctx'> 	next = find_next_bit(free_i-&gt;free_segmap,</div><div class='del'>-			start_segno + sbi-&gt;segs_per_sec, start_segno);</div><div class='del'>-	if (next &gt;= start_segno + usable_segs) {</div><div class='add'>+			start_segno + SEGS_PER_SEC(sbi), start_segno);</div><div class='add'>+	if (next &gt;= start_segno + f2fs_usable_segs_in_sec(sbi)) {</div><div class='ctx'> 		clear_bit(secno, free_i-&gt;free_secmap);</div><div class='ctx'> 		free_i-&gt;free_sections++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -476,22 +503,36 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	unsigned int secno = GET_SEC_FROM_SEG(sbi, segno);</div><div class='ctx'> 	unsigned int start_segno = GET_SEG_FROM_SEC(sbi, secno);</div><div class='ctx'> 	unsigned int next;</div><div class='del'>-	unsigned int usable_segs = f2fs_usable_segs_in_sec(sbi, segno);</div><div class='add'>+	bool ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;free_i-&gt;segmap_lock);</div><div class='del'>-	if (test_and_clear_bit(segno, free_i-&gt;free_segmap)) {</div><div class='del'>-		free_i-&gt;free_segments++;</div><div class='del'>-</div><div class='del'>-		if (!inmem &amp;&amp; IS_CURSEC(sbi, secno))</div><div class='del'>-			goto skip_free;</div><div class='del'>-		next = find_next_bit(free_i-&gt;free_segmap,</div><div class='del'>-				start_segno + sbi-&gt;segs_per_sec, start_segno);</div><div class='del'>-		if (next &gt;= start_segno + usable_segs) {</div><div class='del'>-			if (test_and_clear_bit(secno, free_i-&gt;free_secmap))</div><div class='del'>-				free_i-&gt;free_sections++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-skip_free:</div><div class='add'>+	ret = test_and_clear_bit(segno, free_i-&gt;free_segmap);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto unlock_out;</div><div class='add'>+</div><div class='add'>+	free_i-&gt;free_segments++;</div><div class='add'>+</div><div class='add'>+	if (!inmem &amp;&amp; is_cursec(sbi, secno))</div><div class='add'>+		goto unlock_out;</div><div class='add'>+</div><div class='add'>+	/* check large section */</div><div class='add'>+	next = find_next_bit(free_i-&gt;free_segmap,</div><div class='add'>+			     start_segno + SEGS_PER_SEC(sbi), start_segno);</div><div class='add'>+	if (next &lt; start_segno + f2fs_usable_segs_in_sec(sbi))</div><div class='add'>+		goto unlock_out;</div><div class='add'>+</div><div class='add'>+	ret = test_and_clear_bit(secno, free_i-&gt;free_secmap);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto unlock_out;</div><div class='add'>+</div><div class='add'>+	free_i-&gt;free_sections++;</div><div class='add'>+</div><div class='add'>+	if (GET_SEC_FROM_SEG(sbi, sbi-&gt;next_victim_seg[BG_GC]) == secno)</div><div class='add'>+		sbi-&gt;next_victim_seg[BG_GC] = NULL_SEGNO;</div><div class='add'>+	if (GET_SEC_FROM_SEG(sbi, sbi-&gt;next_victim_seg[FG_GC]) == secno)</div><div class='add'>+		sbi-&gt;next_victim_seg[FG_GC] = NULL_SEGNO;</div><div class='add'>+</div><div class='add'>+unlock_out:</div><div class='ctx'> 	spin_unlock(&amp;free_i-&gt;segmap_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -535,8 +576,7 @@ static inline unsigned int free_segments(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int reserved_segments(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='del'>-	return SM_I(sbi)-&gt;reserved_segments +</div><div class='del'>-			SM_I(sbi)-&gt;additional_reserved_segments;</div><div class='add'>+	return SM_I(sbi)-&gt;reserved_segments;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int free_sections(struct f2fs_sb_info *sbi)</div><div class='hunk'>@@ -569,35 +609,56 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	return GET_SEC_FROM_SEG(sbi, reserved_segments(sbi));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,</div><div class='del'>-			unsigned int node_blocks, unsigned int dent_blocks)</div><div class='add'>+static inline unsigned int get_left_section_blocks(struct f2fs_sb_info *sbi,</div><div class='add'>+					enum log_type type, unsigned int segno)</div><div class='ctx'> {</div><div class='add'>+	if (f2fs_lfs_mode(sbi)) {</div><div class='add'>+		unsigned int used_blocks = __is_large_section(sbi) ? SEGS_TO_BLKS(sbi,</div><div class='add'>+				(segno - GET_START_SEG_FROM_SEC(sbi, segno))) : 0;</div><div class='add'>+		return CAP_BLKS_PER_SEC(sbi) - used_blocks -</div><div class='add'>+			CURSEG_I(sbi, type)-&gt;next_blkoff;</div><div class='add'>+	}</div><div class='add'>+	return CAP_BLKS_PER_SEC(sbi) - get_ckpt_valid_blocks(sbi, segno, true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	unsigned int segno, left_blocks;</div><div class='add'>+static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,</div><div class='add'>+			unsigned int node_blocks, unsigned int data_blocks,</div><div class='add'>+			unsigned int dent_blocks)</div><div class='add'>+{</div><div class='add'>+	unsigned int segno, left_blocks, blocks;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* check current node segment */</div><div class='del'>-	for (i = CURSEG_HOT_NODE; i &lt;= CURSEG_COLD_NODE; i++) {</div><div class='add'>+	/* check current data/node sections in the worst case. */</div><div class='add'>+	for (i = CURSEG_HOT_DATA; i &lt; NR_PERSISTENT_LOG; i++) {</div><div class='ctx'> 		segno = CURSEG_I(sbi, i)-&gt;segno;</div><div class='del'>-		left_blocks = f2fs_usable_blks_in_seg(sbi, segno) -</div><div class='del'>-				get_seg_entry(sbi, segno)-&gt;ckpt_valid_blocks;</div><div class='ctx'> </div><div class='del'>-		if (node_blocks &gt; left_blocks)</div><div class='add'>+		if (unlikely(segno == NULL_SEGNO))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		left_blocks = get_left_section_blocks(sbi, i, segno);</div><div class='add'>+</div><div class='add'>+		blocks = i &lt;= CURSEG_COLD_DATA ? data_blocks : node_blocks;</div><div class='add'>+		if (blocks &gt; left_blocks)</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* check current data segment */</div><div class='add'>+	/* check current data section for dentry blocks. */</div><div class='ctx'> 	segno = CURSEG_I(sbi, CURSEG_HOT_DATA)-&gt;segno;</div><div class='del'>-	left_blocks = f2fs_usable_blks_in_seg(sbi, segno) -</div><div class='del'>-			get_seg_entry(sbi, segno)-&gt;ckpt_valid_blocks;</div><div class='add'>+</div><div class='add'>+	if (unlikely(segno == NULL_SEGNO))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	left_blocks = get_left_section_blocks(sbi, CURSEG_HOT_DATA, segno);</div><div class='add'>+</div><div class='ctx'> 	if (dent_blocks &gt; left_blocks)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * calculate needed sections for dirty node/dentry</div><div class='del'>- * and call has_curseg_enough_space</div><div class='add'>+ * calculate needed sections for dirty node/dentry and call</div><div class='add'>+ * has_curseg_enough_space, please note that, it needs to account</div><div class='add'>+ * dirty data as well in lfs mode when checkpoint is disabled.</div><div class='ctx'>  */</div><div class='ctx'> static inline void __get_secs_required(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		unsigned int *lower_p, unsigned int *upper_p, bool *curseg_p)</div><div class='hunk'>@@ -606,19 +667,29 @@ static inline void __get_secs_required(struct f2fs_sb_info *sbi,</div><div class='ctx'> 					get_pages(sbi, F2FS_DIRTY_DENTS) +</div><div class='ctx'> 					get_pages(sbi, F2FS_DIRTY_IMETA);</div><div class='ctx'> 	unsigned int total_dent_blocks = get_pages(sbi, F2FS_DIRTY_DENTS);</div><div class='add'>+	unsigned int total_data_blocks = 0;</div><div class='ctx'> 	unsigned int node_secs = total_node_blocks / CAP_BLKS_PER_SEC(sbi);</div><div class='ctx'> 	unsigned int dent_secs = total_dent_blocks / CAP_BLKS_PER_SEC(sbi);</div><div class='add'>+	unsigned int data_secs = 0;</div><div class='ctx'> 	unsigned int node_blocks = total_node_blocks % CAP_BLKS_PER_SEC(sbi);</div><div class='ctx'> 	unsigned int dent_blocks = total_dent_blocks % CAP_BLKS_PER_SEC(sbi);</div><div class='add'>+	unsigned int data_blocks = 0;</div><div class='add'>+</div><div class='add'>+	if (f2fs_lfs_mode(sbi)) {</div><div class='add'>+		total_data_blocks = get_pages(sbi, F2FS_DIRTY_DATA);</div><div class='add'>+		data_secs = total_data_blocks / CAP_BLKS_PER_SEC(sbi);</div><div class='add'>+		data_blocks = total_data_blocks % CAP_BLKS_PER_SEC(sbi);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (lower_p)</div><div class='del'>-		*lower_p = node_secs + dent_secs;</div><div class='add'>+		*lower_p = node_secs + dent_secs + data_secs;</div><div class='ctx'> 	if (upper_p)</div><div class='del'>-		*upper_p = node_secs + dent_secs +</div><div class='del'>-			(node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0);</div><div class='add'>+		*upper_p = node_secs + dent_secs + data_secs +</div><div class='add'>+			(node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0) +</div><div class='add'>+			(data_blocks ? 1 : 0);</div><div class='ctx'> 	if (curseg_p)</div><div class='ctx'> 		*curseg_p = has_curseg_enough_space(sbi,</div><div class='del'>-				node_blocks, dent_blocks);</div><div class='add'>+				node_blocks, data_blocks, dent_blocks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,</div><div class='hunk'>@@ -638,7 +709,7 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> 	if (free_secs &gt; upper_secs)</div><div class='ctx'> 		return false;</div><div class='del'>-	else if (free_secs &lt;= lower_secs)</div><div class='add'>+	if (free_secs &lt;= lower_secs)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return !curseg_space;</div><div class='ctx'> }</div><div class='hunk'>@@ -649,12 +720,30 @@ static inline bool has_enough_free_secs(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	return !has_not_enough_free_secs(sbi, freed, needed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool has_enough_free_blks(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+	unsigned int total_free_blocks = 0;</div><div class='add'>+	unsigned int avail_user_block_count;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='add'>+</div><div class='add'>+	avail_user_block_count = get_available_block_count(sbi, NULL, true);</div><div class='add'>+	total_free_blocks = avail_user_block_count - (unsigned int)valid_user_blocks(sbi);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='add'>+</div><div class='add'>+	return total_free_blocks &gt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool f2fs_is_checkpoint_ready(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely(!is_sbi_flag_set(sbi, SBI_CP_DISABLED)))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (likely(has_enough_free_secs(sbi, 0, 0)))</div><div class='ctx'> 		return true;</div><div class='add'>+	if (!f2fs_lfs_mode(sbi) &amp;&amp;</div><div class='add'>+		likely(has_enough_free_blks(sbi)))</div><div class='add'>+		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -793,10 +882,10 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (usable_blks_per_seg &lt; sbi-&gt;blocks_per_seg)</div><div class='add'>+	if (usable_blks_per_seg &lt; BLKS_PER_SEG(sbi))</div><div class='ctx'> 		f2fs_bug_on(sbi, find_next_bit_le(&amp;raw_sit-&gt;valid_map,</div><div class='del'>-				sbi-&gt;blocks_per_seg,</div><div class='del'>-				usable_blks_per_seg) != sbi-&gt;blocks_per_seg);</div><div class='add'>+				BLKS_PER_SEG(sbi),</div><div class='add'>+				usable_blks_per_seg) != BLKS_PER_SEG(sbi));</div><div class='ctx'> </div><div class='ctx'> 	/* check segment usage, and check boundary of a given segment number */</div><div class='ctx'> 	if (unlikely(GET_SIT_VBLOCKS(raw_sit) &gt; usable_blks_per_seg</div><div class='hunk'>@@ -897,7 +986,7 @@ static inline block_t sum_blk_addr(struct f2fs_sb_info *sbi, int base, int type)</div><div class='ctx'> </div><div class='ctx'> static inline bool sec_usage_check(struct f2fs_sb_info *sbi, unsigned int secno)</div><div class='ctx'> {</div><div class='del'>-	if (IS_CURSEC(sbi, secno) || (sbi-&gt;cur_victim_sec == secno))</div><div class='add'>+	if (is_cursec(sbi, secno) || (sbi-&gt;cur_victim_sec == secno))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -915,9 +1004,9 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (type == DATA)</div><div class='del'>-		return sbi-&gt;blocks_per_seg;</div><div class='add'>+		return BLKS_PER_SEG(sbi);</div><div class='ctx'> 	else if (type == NODE)</div><div class='del'>-		return 8 * sbi-&gt;blocks_per_seg;</div><div class='add'>+		return SEGS_TO_BLKS(sbi, 8);</div><div class='ctx'> 	else if (type == META)</div><div class='ctx'> 		return 8 * BIO_MAX_VECS;</div><div class='ctx'> 	else</div><div class='head'>diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c<br/>index 83d6fb97dcae..b88babcf6ab4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/shrinker.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/shrinker.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/shrinker.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/shrinker.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ unsigned long f2fs_shrink_count(struct shrinker *shrink,</div><div class='ctx'> 		mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;f2fs_list_lock);</div><div class='del'>-	return count;</div><div class='add'>+	return count ?: SHRINK_EMPTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long f2fs_shrink_scan(struct shrinker *shrink,</div><div class='hunk'>@@ -130,6 +130,103 @@ unsigned long f2fs_shrink_scan(struct shrinker *shrink,</div><div class='ctx'> 	return freed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned int f2fs_donate_files(void)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi;</div><div class='add'>+	struct list_head *p;</div><div class='add'>+	unsigned int donate_files = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;f2fs_list_lock);</div><div class='add'>+	p = f2fs_list.next;</div><div class='add'>+	while (p != &amp;f2fs_list) {</div><div class='add'>+		sbi = list_entry(p, struct f2fs_sb_info, s_list);</div><div class='add'>+</div><div class='add'>+		/* stop f2fs_put_super */</div><div class='add'>+		if (!mutex_trylock(&amp;sbi-&gt;umount_mutex)) {</div><div class='add'>+			p = p-&gt;next;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;f2fs_list_lock);</div><div class='add'>+</div><div class='add'>+		donate_files += sbi-&gt;donate_files;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;f2fs_list_lock);</div><div class='add'>+		p = p-&gt;next;</div><div class='add'>+		mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;f2fs_list_lock);</div><div class='add'>+</div><div class='add'>+	return donate_files;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int do_reclaim_caches(struct f2fs_sb_info *sbi,</div><div class='add'>+				unsigned int reclaim_caches_kb)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct f2fs_inode_info *fi;</div><div class='add'>+	unsigned int nfiles = sbi-&gt;donate_files;</div><div class='add'>+	pgoff_t npages = reclaim_caches_kb &gt;&gt; (PAGE_SHIFT - 10);</div><div class='add'>+</div><div class='add'>+	while (npages &amp;&amp; nfiles--) {</div><div class='add'>+		pgoff_t len;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+		if (list_empty(&amp;sbi-&gt;inode_list[DONATE_INODE])) {</div><div class='add'>+			spin_unlock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fi = list_first_entry(&amp;sbi-&gt;inode_list[DONATE_INODE],</div><div class='add'>+					struct f2fs_inode_info, gdonate_list);</div><div class='add'>+		list_move_tail(&amp;fi-&gt;gdonate_list, &amp;sbi-&gt;inode_list[DONATE_INODE]);</div><div class='add'>+		inode = igrab(&amp;fi-&gt;vfs_inode);</div><div class='add'>+		spin_unlock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+</div><div class='add'>+		if (!inode)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		inode_lock(inode);</div><div class='add'>+		if (!is_inode_flag_set(inode, FI_DONATE_FINISHED)) {</div><div class='add'>+			len = fi-&gt;donate_end - fi-&gt;donate_start + 1;</div><div class='add'>+			npages = npages &lt; len ? 0 : npages - len;</div><div class='add'>+</div><div class='add'>+			invalidate_inode_pages2_range(inode-&gt;i_mapping,</div><div class='add'>+					fi-&gt;donate_start, fi-&gt;donate_end);</div><div class='add'>+			set_inode_flag(inode, FI_DONATE_FINISHED);</div><div class='add'>+		}</div><div class='add'>+		inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+		iput(inode);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	return npages &lt;&lt; (PAGE_SHIFT - 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void f2fs_reclaim_caches(unsigned int reclaim_caches_kb)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi;</div><div class='add'>+	struct list_head *p;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;f2fs_list_lock);</div><div class='add'>+	p = f2fs_list.next;</div><div class='add'>+	while (p != &amp;f2fs_list &amp;&amp; reclaim_caches_kb) {</div><div class='add'>+		sbi = list_entry(p, struct f2fs_sb_info, s_list);</div><div class='add'>+</div><div class='add'>+		/* stop f2fs_put_super */</div><div class='add'>+		if (!mutex_trylock(&amp;sbi-&gt;umount_mutex)) {</div><div class='add'>+			p = p-&gt;next;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;f2fs_list_lock);</div><div class='add'>+</div><div class='add'>+		reclaim_caches_kb = do_reclaim_caches(sbi, reclaim_caches_kb);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;f2fs_list_lock);</div><div class='add'>+		p = p-&gt;next;</div><div class='add'>+		mutex_unlock(&amp;sbi-&gt;umount_mutex);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;f2fs_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void f2fs_join_shrinker(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;f2fs_list_lock);</div><div class='head'>diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c<br/>index 557ea5c6c926..c4c225e09dc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/super.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -28,6 +27,8 @@</div><div class='ctx'> #include &lt;linux/part_stat.h&gt;</div><div class='ctx'> #include &lt;linux/zstd.h&gt;</div><div class='ctx'> #include &lt;linux/lz4.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "f2fs.h"</div><div class='ctx'> #include "node.h"</div><div class='hunk'>@@ -44,41 +45,58 @@ static struct kmem_cache *f2fs_inode_cachep;</div><div class='ctx'> #ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='ctx'> </div><div class='ctx'> const char *f2fs_fault_name[FAULT_MAX] = {</div><div class='del'>-	[FAULT_KMALLOC]		= "kmalloc",</div><div class='del'>-	[FAULT_KVMALLOC]	= "kvmalloc",</div><div class='del'>-	[FAULT_PAGE_ALLOC]	= "page alloc",</div><div class='del'>-	[FAULT_PAGE_GET]	= "page get",</div><div class='del'>-	[FAULT_ALLOC_NID]	= "alloc nid",</div><div class='del'>-	[FAULT_ORPHAN]		= "orphan",</div><div class='del'>-	[FAULT_BLOCK]		= "no more block",</div><div class='del'>-	[FAULT_DIR_DEPTH]	= "too big dir depth",</div><div class='del'>-	[FAULT_EVICT_INODE]	= "evict_inode fail",</div><div class='del'>-	[FAULT_TRUNCATE]	= "truncate fail",</div><div class='del'>-	[FAULT_READ_IO]		= "read IO error",</div><div class='del'>-	[FAULT_CHECKPOINT]	= "checkpoint error",</div><div class='del'>-	[FAULT_DISCARD]		= "discard error",</div><div class='del'>-	[FAULT_WRITE_IO]	= "write IO error",</div><div class='del'>-	[FAULT_SLAB_ALLOC]	= "slab alloc",</div><div class='del'>-	[FAULT_DQUOT_INIT]	= "dquot initialize",</div><div class='del'>-	[FAULT_LOCK_OP]		= "lock_op",</div><div class='del'>-	[FAULT_BLKADDR]		= "invalid blkaddr",</div><div class='add'>+	[FAULT_KMALLOC]			= "kmalloc",</div><div class='add'>+	[FAULT_KVMALLOC]		= "kvmalloc",</div><div class='add'>+	[FAULT_PAGE_ALLOC]		= "page alloc",</div><div class='add'>+	[FAULT_PAGE_GET]		= "page get",</div><div class='add'>+	[FAULT_ALLOC_BIO]		= "alloc bio(obsolete)",</div><div class='add'>+	[FAULT_ALLOC_NID]		= "alloc nid",</div><div class='add'>+	[FAULT_ORPHAN]			= "orphan",</div><div class='add'>+	[FAULT_BLOCK]			= "no more block",</div><div class='add'>+	[FAULT_DIR_DEPTH]		= "too big dir depth",</div><div class='add'>+	[FAULT_EVICT_INODE]		= "evict_inode fail",</div><div class='add'>+	[FAULT_TRUNCATE]		= "truncate fail",</div><div class='add'>+	[FAULT_READ_IO]			= "read IO error",</div><div class='add'>+	[FAULT_CHECKPOINT]		= "checkpoint error",</div><div class='add'>+	[FAULT_DISCARD]			= "discard error",</div><div class='add'>+	[FAULT_WRITE_IO]		= "write IO error",</div><div class='add'>+	[FAULT_SLAB_ALLOC]		= "slab alloc",</div><div class='add'>+	[FAULT_DQUOT_INIT]		= "dquot initialize",</div><div class='add'>+	[FAULT_LOCK_OP]			= "lock_op",</div><div class='add'>+	[FAULT_BLKADDR_VALIDITY]	= "invalid blkaddr",</div><div class='add'>+	[FAULT_BLKADDR_CONSISTENCE]	= "inconsistent blkaddr",</div><div class='add'>+	[FAULT_NO_SEGMENT]		= "no free segment",</div><div class='add'>+	[FAULT_INCONSISTENT_FOOTER]	= "inconsistent footer",</div><div class='add'>+	[FAULT_TIMEOUT]			= "timeout",</div><div class='add'>+	[FAULT_VMALLOC]			= "vmalloc",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate,</div><div class='del'>-							unsigned int type)</div><div class='add'>+int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,</div><div class='add'>+				unsigned long type, enum fault_option fo)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_fault_info *ffi = &amp;F2FS_OPTION(sbi).fault_info;</div><div class='ctx'> </div><div class='del'>-	if (rate) {</div><div class='add'>+	if (fo &amp; FAULT_ALL) {</div><div class='add'>+		memset(ffi, 0, sizeof(struct f2fs_fault_info));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fo &amp; FAULT_RATE) {</div><div class='add'>+		if (rate &gt; INT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		atomic_set(&amp;ffi-&gt;inject_ops, 0);</div><div class='del'>-		ffi-&gt;inject_rate = rate;</div><div class='add'>+		ffi-&gt;inject_rate = (int)rate;</div><div class='add'>+		f2fs_info(sbi, "build fault injection rate: %lu", rate);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (type)</div><div class='del'>-		ffi-&gt;inject_type = type;</div><div class='add'>+	if (fo &amp; FAULT_TYPE) {</div><div class='add'>+		if (type &gt;= BIT(FAULT_MAX))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ffi-&gt;inject_type = (unsigned int)type;</div><div class='add'>+		f2fs_info(sbi, "build fault injection type: 0x%lx", type);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!rate &amp;&amp; !type)</div><div class='del'>-		memset(ffi, 0, sizeof(struct f2fs_fault_info));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -109,53 +127,36 @@ enum {</div><div class='ctx'> 	Opt_disable_roll_forward,</div><div class='ctx'> 	Opt_norecovery,</div><div class='ctx'> 	Opt_discard,</div><div class='del'>-	Opt_nodiscard,</div><div class='ctx'> 	Opt_noheap,</div><div class='ctx'> 	Opt_heap,</div><div class='ctx'> 	Opt_user_xattr,</div><div class='del'>-	Opt_nouser_xattr,</div><div class='ctx'> 	Opt_acl,</div><div class='del'>-	Opt_noacl,</div><div class='ctx'> 	Opt_active_logs,</div><div class='ctx'> 	Opt_disable_ext_identify,</div><div class='ctx'> 	Opt_inline_xattr,</div><div class='del'>-	Opt_noinline_xattr,</div><div class='ctx'> 	Opt_inline_xattr_size,</div><div class='ctx'> 	Opt_inline_data,</div><div class='ctx'> 	Opt_inline_dentry,</div><div class='del'>-	Opt_noinline_dentry,</div><div class='ctx'> 	Opt_flush_merge,</div><div class='del'>-	Opt_noflush_merge,</div><div class='ctx'> 	Opt_barrier,</div><div class='del'>-	Opt_nobarrier,</div><div class='ctx'> 	Opt_fastboot,</div><div class='ctx'> 	Opt_extent_cache,</div><div class='del'>-	Opt_noextent_cache,</div><div class='del'>-	Opt_noinline_data,</div><div class='ctx'> 	Opt_data_flush,</div><div class='ctx'> 	Opt_reserve_root,</div><div class='add'>+	Opt_reserve_node,</div><div class='ctx'> 	Opt_resgid,</div><div class='ctx'> 	Opt_resuid,</div><div class='ctx'> 	Opt_mode,</div><div class='del'>-	Opt_io_size_bits,</div><div class='ctx'> 	Opt_fault_injection,</div><div class='ctx'> 	Opt_fault_type,</div><div class='ctx'> 	Opt_lazytime,</div><div class='del'>-	Opt_nolazytime,</div><div class='ctx'> 	Opt_quota,</div><div class='del'>-	Opt_noquota,</div><div class='ctx'> 	Opt_usrquota,</div><div class='ctx'> 	Opt_grpquota,</div><div class='ctx'> 	Opt_prjquota,</div><div class='ctx'> 	Opt_usrjquota,</div><div class='ctx'> 	Opt_grpjquota,</div><div class='ctx'> 	Opt_prjjquota,</div><div class='del'>-	Opt_offusrjquota,</div><div class='del'>-	Opt_offgrpjquota,</div><div class='del'>-	Opt_offprjjquota,</div><div class='del'>-	Opt_jqfmt_vfsold,</div><div class='del'>-	Opt_jqfmt_vfsv0,</div><div class='del'>-	Opt_jqfmt_vfsv1,</div><div class='ctx'> 	Opt_alloc,</div><div class='ctx'> 	Opt_fsync,</div><div class='ctx'> 	Opt_test_dummy_encryption,</div><div class='hunk'>@@ -165,105 +166,221 @@ enum {</div><div class='ctx'> 	Opt_checkpoint_disable_cap_perc,</div><div class='ctx'> 	Opt_checkpoint_enable,</div><div class='ctx'> 	Opt_checkpoint_merge,</div><div class='del'>-	Opt_nocheckpoint_merge,</div><div class='ctx'> 	Opt_compress_algorithm,</div><div class='ctx'> 	Opt_compress_log_size,</div><div class='del'>-	Opt_compress_extension,</div><div class='ctx'> 	Opt_nocompress_extension,</div><div class='add'>+	Opt_compress_extension,</div><div class='ctx'> 	Opt_compress_chksum,</div><div class='ctx'> 	Opt_compress_mode,</div><div class='ctx'> 	Opt_compress_cache,</div><div class='ctx'> 	Opt_atgc,</div><div class='ctx'> 	Opt_gc_merge,</div><div class='del'>-	Opt_nogc_merge,</div><div class='ctx'> 	Opt_discard_unit,</div><div class='ctx'> 	Opt_memory_mode,</div><div class='ctx'> 	Opt_age_extent_cache,</div><div class='ctx'> 	Opt_errors,</div><div class='add'>+	Opt_nat_bits,</div><div class='add'>+	Opt_jqfmt,</div><div class='add'>+	Opt_checkpoint,</div><div class='add'>+	Opt_lookup_mode,</div><div class='ctx'> 	Opt_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t f2fs_tokens = {</div><div class='del'>-	{Opt_gc_background, "background_gc=%s"},</div><div class='del'>-	{Opt_disable_roll_forward, "disable_roll_forward"},</div><div class='del'>-	{Opt_norecovery, "norecovery"},</div><div class='del'>-	{Opt_discard, "discard"},</div><div class='del'>-	{Opt_nodiscard, "nodiscard"},</div><div class='del'>-	{Opt_noheap, "no_heap"},</div><div class='del'>-	{Opt_heap, "heap"},</div><div class='del'>-	{Opt_user_xattr, "user_xattr"},</div><div class='del'>-	{Opt_nouser_xattr, "nouser_xattr"},</div><div class='del'>-	{Opt_acl, "acl"},</div><div class='del'>-	{Opt_noacl, "noacl"},</div><div class='del'>-	{Opt_active_logs, "active_logs=%u"},</div><div class='del'>-	{Opt_disable_ext_identify, "disable_ext_identify"},</div><div class='del'>-	{Opt_inline_xattr, "inline_xattr"},</div><div class='del'>-	{Opt_noinline_xattr, "noinline_xattr"},</div><div class='del'>-	{Opt_inline_xattr_size, "inline_xattr_size=%u"},</div><div class='del'>-	{Opt_inline_data, "inline_data"},</div><div class='del'>-	{Opt_inline_dentry, "inline_dentry"},</div><div class='del'>-	{Opt_noinline_dentry, "noinline_dentry"},</div><div class='del'>-	{Opt_flush_merge, "flush_merge"},</div><div class='del'>-	{Opt_noflush_merge, "noflush_merge"},</div><div class='del'>-	{Opt_barrier, "barrier"},</div><div class='del'>-	{Opt_nobarrier, "nobarrier"},</div><div class='del'>-	{Opt_fastboot, "fastboot"},</div><div class='del'>-	{Opt_extent_cache, "extent_cache"},</div><div class='del'>-	{Opt_noextent_cache, "noextent_cache"},</div><div class='del'>-	{Opt_noinline_data, "noinline_data"},</div><div class='del'>-	{Opt_data_flush, "data_flush"},</div><div class='del'>-	{Opt_reserve_root, "reserve_root=%u"},</div><div class='del'>-	{Opt_resgid, "resgid=%u"},</div><div class='del'>-	{Opt_resuid, "resuid=%u"},</div><div class='del'>-	{Opt_mode, "mode=%s"},</div><div class='del'>-	{Opt_io_size_bits, "io_bits=%u"},</div><div class='del'>-	{Opt_fault_injection, "fault_injection=%u"},</div><div class='del'>-	{Opt_fault_type, "fault_type=%u"},</div><div class='del'>-	{Opt_lazytime, "lazytime"},</div><div class='del'>-	{Opt_nolazytime, "nolazytime"},</div><div class='del'>-	{Opt_quota, "quota"},</div><div class='del'>-	{Opt_noquota, "noquota"},</div><div class='del'>-	{Opt_usrquota, "usrquota"},</div><div class='del'>-	{Opt_grpquota, "grpquota"},</div><div class='del'>-	{Opt_prjquota, "prjquota"},</div><div class='del'>-	{Opt_usrjquota, "usrjquota=%s"},</div><div class='del'>-	{Opt_grpjquota, "grpjquota=%s"},</div><div class='del'>-	{Opt_prjjquota, "prjjquota=%s"},</div><div class='del'>-	{Opt_offusrjquota, "usrjquota="},</div><div class='del'>-	{Opt_offgrpjquota, "grpjquota="},</div><div class='del'>-	{Opt_offprjjquota, "prjjquota="},</div><div class='del'>-	{Opt_jqfmt_vfsold, "jqfmt=vfsold"},</div><div class='del'>-	{Opt_jqfmt_vfsv0, "jqfmt=vfsv0"},</div><div class='del'>-	{Opt_jqfmt_vfsv1, "jqfmt=vfsv1"},</div><div class='del'>-	{Opt_alloc, "alloc_mode=%s"},</div><div class='del'>-	{Opt_fsync, "fsync_mode=%s"},</div><div class='del'>-	{Opt_test_dummy_encryption, "test_dummy_encryption=%s"},</div><div class='del'>-	{Opt_test_dummy_encryption, "test_dummy_encryption"},</div><div class='del'>-	{Opt_inlinecrypt, "inlinecrypt"},</div><div class='del'>-	{Opt_checkpoint_disable, "checkpoint=disable"},</div><div class='del'>-	{Opt_checkpoint_disable_cap, "checkpoint=disable:%u"},</div><div class='del'>-	{Opt_checkpoint_disable_cap_perc, "checkpoint=disable:%u%%"},</div><div class='del'>-	{Opt_checkpoint_enable, "checkpoint=enable"},</div><div class='del'>-	{Opt_checkpoint_merge, "checkpoint_merge"},</div><div class='del'>-	{Opt_nocheckpoint_merge, "nocheckpoint_merge"},</div><div class='del'>-	{Opt_compress_algorithm, "compress_algorithm=%s"},</div><div class='del'>-	{Opt_compress_log_size, "compress_log_size=%u"},</div><div class='del'>-	{Opt_compress_extension, "compress_extension=%s"},</div><div class='del'>-	{Opt_nocompress_extension, "nocompress_extension=%s"},</div><div class='del'>-	{Opt_compress_chksum, "compress_chksum"},</div><div class='del'>-	{Opt_compress_mode, "compress_mode=%s"},</div><div class='del'>-	{Opt_compress_cache, "compress_cache"},</div><div class='del'>-	{Opt_atgc, "atgc"},</div><div class='del'>-	{Opt_gc_merge, "gc_merge"},</div><div class='del'>-	{Opt_nogc_merge, "nogc_merge"},</div><div class='del'>-	{Opt_discard_unit, "discard_unit=%s"},</div><div class='del'>-	{Opt_memory_mode, "memory=%s"},</div><div class='del'>-	{Opt_age_extent_cache, "age_extent_cache"},</div><div class='del'>-	{Opt_errors, "errors=%s"},</div><div class='add'>+static const struct constant_table f2fs_param_background_gc[] = {</div><div class='add'>+	{"on",		BGGC_MODE_ON},</div><div class='add'>+	{"off",		BGGC_MODE_OFF},</div><div class='add'>+	{"sync",	BGGC_MODE_SYNC},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_mode[] = {</div><div class='add'>+	{"adaptive",		FS_MODE_ADAPTIVE},</div><div class='add'>+	{"lfs",			FS_MODE_LFS},</div><div class='add'>+	{"fragment:segment",	FS_MODE_FRAGMENT_SEG},</div><div class='add'>+	{"fragment:block",	FS_MODE_FRAGMENT_BLK},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_jqfmt[] = {</div><div class='add'>+	{"vfsold",	QFMT_VFS_OLD},</div><div class='add'>+	{"vfsv0",	QFMT_VFS_V0},</div><div class='add'>+	{"vfsv1",	QFMT_VFS_V1},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_alloc_mode[] = {</div><div class='add'>+	{"default",	ALLOC_MODE_DEFAULT},</div><div class='add'>+	{"reuse",	ALLOC_MODE_REUSE},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+static const struct constant_table f2fs_param_fsync_mode[] = {</div><div class='add'>+	{"posix",	FSYNC_MODE_POSIX},</div><div class='add'>+	{"strict",	FSYNC_MODE_STRICT},</div><div class='add'>+	{"nobarrier",	FSYNC_MODE_NOBARRIER},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_compress_mode[] = {</div><div class='add'>+	{"fs",		COMPR_MODE_FS},</div><div class='add'>+	{"user",	COMPR_MODE_USER},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_discard_unit[] = {</div><div class='add'>+	{"block",	DISCARD_UNIT_BLOCK},</div><div class='add'>+	{"segment",	DISCARD_UNIT_SEGMENT},</div><div class='add'>+	{"section",	DISCARD_UNIT_SECTION},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_memory_mode[] = {</div><div class='add'>+	{"normal",	MEMORY_MODE_NORMAL},</div><div class='add'>+	{"low",		MEMORY_MODE_LOW},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_errors[] = {</div><div class='add'>+	{"remount-ro",	MOUNT_ERRORS_READONLY},</div><div class='add'>+	{"continue",	MOUNT_ERRORS_CONTINUE},</div><div class='add'>+	{"panic",	MOUNT_ERRORS_PANIC},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table f2fs_param_lookup_mode[] = {</div><div class='add'>+	{"perf",	LOOKUP_PERF},</div><div class='add'>+	{"compat",	LOOKUP_COMPAT},</div><div class='add'>+	{"auto",	LOOKUP_AUTO},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec f2fs_param_specs[] = {</div><div class='add'>+	fsparam_enum("background_gc", Opt_gc_background, f2fs_param_background_gc),</div><div class='add'>+	fsparam_flag("disable_roll_forward", Opt_disable_roll_forward),</div><div class='add'>+	fsparam_flag("norecovery", Opt_norecovery),</div><div class='add'>+	fsparam_flag_no("discard", Opt_discard),</div><div class='add'>+	fsparam_flag("no_heap", Opt_noheap),</div><div class='add'>+	fsparam_flag("heap", Opt_heap),</div><div class='add'>+	fsparam_flag_no("user_xattr", Opt_user_xattr),</div><div class='add'>+	fsparam_flag_no("acl", Opt_acl),</div><div class='add'>+	fsparam_s32("active_logs", Opt_active_logs),</div><div class='add'>+	fsparam_flag("disable_ext_identify", Opt_disable_ext_identify),</div><div class='add'>+	fsparam_flag_no("inline_xattr", Opt_inline_xattr),</div><div class='add'>+	fsparam_s32("inline_xattr_size", Opt_inline_xattr_size),</div><div class='add'>+	fsparam_flag_no("inline_data", Opt_inline_data),</div><div class='add'>+	fsparam_flag_no("inline_dentry", Opt_inline_dentry),</div><div class='add'>+	fsparam_flag_no("flush_merge", Opt_flush_merge),</div><div class='add'>+	fsparam_flag_no("barrier", Opt_barrier),</div><div class='add'>+	fsparam_flag("fastboot", Opt_fastboot),</div><div class='add'>+	fsparam_flag_no("extent_cache", Opt_extent_cache),</div><div class='add'>+	fsparam_flag("data_flush", Opt_data_flush),</div><div class='add'>+	fsparam_u32("reserve_root", Opt_reserve_root),</div><div class='add'>+	fsparam_u32("reserve_node", Opt_reserve_node),</div><div class='add'>+	fsparam_gid("resgid", Opt_resgid),</div><div class='add'>+	fsparam_uid("resuid", Opt_resuid),</div><div class='add'>+	fsparam_enum("mode", Opt_mode, f2fs_param_mode),</div><div class='add'>+	fsparam_s32("fault_injection", Opt_fault_injection),</div><div class='add'>+	fsparam_u32("fault_type", Opt_fault_type),</div><div class='add'>+	fsparam_flag_no("lazytime", Opt_lazytime),</div><div class='add'>+	fsparam_flag_no("quota", Opt_quota),</div><div class='add'>+	fsparam_flag("usrquota", Opt_usrquota),</div><div class='add'>+	fsparam_flag("grpquota", Opt_grpquota),</div><div class='add'>+	fsparam_flag("prjquota", Opt_prjquota),</div><div class='add'>+	fsparam_string_empty("usrjquota", Opt_usrjquota),</div><div class='add'>+	fsparam_string_empty("grpjquota", Opt_grpjquota),</div><div class='add'>+	fsparam_string_empty("prjjquota", Opt_prjjquota),</div><div class='add'>+	fsparam_flag("nat_bits", Opt_nat_bits),</div><div class='add'>+	fsparam_enum("jqfmt", Opt_jqfmt, f2fs_param_jqfmt),</div><div class='add'>+	fsparam_enum("alloc_mode", Opt_alloc, f2fs_param_alloc_mode),</div><div class='add'>+	fsparam_enum("fsync_mode", Opt_fsync, f2fs_param_fsync_mode),</div><div class='add'>+	fsparam_string("test_dummy_encryption", Opt_test_dummy_encryption),</div><div class='add'>+	fsparam_flag("test_dummy_encryption", Opt_test_dummy_encryption),</div><div class='add'>+	fsparam_flag("inlinecrypt", Opt_inlinecrypt),</div><div class='add'>+	fsparam_string("checkpoint", Opt_checkpoint),</div><div class='add'>+	fsparam_flag_no("checkpoint_merge", Opt_checkpoint_merge),</div><div class='add'>+	fsparam_string("compress_algorithm", Opt_compress_algorithm),</div><div class='add'>+	fsparam_u32("compress_log_size", Opt_compress_log_size),</div><div class='add'>+	fsparam_string("compress_extension", Opt_compress_extension),</div><div class='add'>+	fsparam_string("nocompress_extension", Opt_nocompress_extension),</div><div class='add'>+	fsparam_flag("compress_chksum", Opt_compress_chksum),</div><div class='add'>+	fsparam_enum("compress_mode", Opt_compress_mode, f2fs_param_compress_mode),</div><div class='add'>+	fsparam_flag("compress_cache", Opt_compress_cache),</div><div class='add'>+	fsparam_flag("atgc", Opt_atgc),</div><div class='add'>+	fsparam_flag_no("gc_merge", Opt_gc_merge),</div><div class='add'>+	fsparam_enum("discard_unit", Opt_discard_unit, f2fs_param_discard_unit),</div><div class='add'>+	fsparam_enum("memory", Opt_memory_mode, f2fs_param_memory_mode),</div><div class='add'>+	fsparam_flag("age_extent_cache", Opt_age_extent_cache),</div><div class='add'>+	fsparam_enum("errors", Opt_errors, f2fs_param_errors),</div><div class='add'>+	fsparam_enum("lookup_mode", Opt_lookup_mode, f2fs_param_lookup_mode),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Resort to a match_table for this interestingly formatted option */</div><div class='add'>+static match_table_t f2fs_checkpoint_tokens = {</div><div class='add'>+	{Opt_checkpoint_disable, "disable"},</div><div class='add'>+	{Opt_checkpoint_disable_cap, "disable:%u"},</div><div class='add'>+	{Opt_checkpoint_disable_cap_perc, "disable:%u%%"},</div><div class='add'>+	{Opt_checkpoint_enable, "enable"},</div><div class='ctx'> 	{Opt_err, NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...)</div><div class='add'>+#define F2FS_SPEC_background_gc			(1 &lt;&lt; 0)</div><div class='add'>+#define F2FS_SPEC_inline_xattr_size		(1 &lt;&lt; 1)</div><div class='add'>+#define F2FS_SPEC_active_logs			(1 &lt;&lt; 2)</div><div class='add'>+#define F2FS_SPEC_reserve_root			(1 &lt;&lt; 3)</div><div class='add'>+#define F2FS_SPEC_resgid			(1 &lt;&lt; 4)</div><div class='add'>+#define F2FS_SPEC_resuid			(1 &lt;&lt; 5)</div><div class='add'>+#define F2FS_SPEC_mode				(1 &lt;&lt; 6)</div><div class='add'>+#define F2FS_SPEC_fault_injection		(1 &lt;&lt; 7)</div><div class='add'>+#define F2FS_SPEC_fault_type			(1 &lt;&lt; 8)</div><div class='add'>+#define F2FS_SPEC_jqfmt				(1 &lt;&lt; 9)</div><div class='add'>+#define F2FS_SPEC_alloc_mode			(1 &lt;&lt; 10)</div><div class='add'>+#define F2FS_SPEC_fsync_mode			(1 &lt;&lt; 11)</div><div class='add'>+#define F2FS_SPEC_checkpoint_disable_cap	(1 &lt;&lt; 12)</div><div class='add'>+#define F2FS_SPEC_checkpoint_disable_cap_perc	(1 &lt;&lt; 13)</div><div class='add'>+#define F2FS_SPEC_compress_level		(1 &lt;&lt; 14)</div><div class='add'>+#define F2FS_SPEC_compress_algorithm		(1 &lt;&lt; 15)</div><div class='add'>+#define F2FS_SPEC_compress_log_size		(1 &lt;&lt; 16)</div><div class='add'>+#define F2FS_SPEC_compress_extension		(1 &lt;&lt; 17)</div><div class='add'>+#define F2FS_SPEC_nocompress_extension		(1 &lt;&lt; 18)</div><div class='add'>+#define F2FS_SPEC_compress_chksum		(1 &lt;&lt; 19)</div><div class='add'>+#define F2FS_SPEC_compress_mode			(1 &lt;&lt; 20)</div><div class='add'>+#define F2FS_SPEC_discard_unit			(1 &lt;&lt; 21)</div><div class='add'>+#define F2FS_SPEC_memory_mode			(1 &lt;&lt; 22)</div><div class='add'>+#define F2FS_SPEC_errors			(1 &lt;&lt; 23)</div><div class='add'>+#define F2FS_SPEC_lookup_mode			(1 &lt;&lt; 24)</div><div class='add'>+#define F2FS_SPEC_reserve_node			(1 &lt;&lt; 25)</div><div class='add'>+</div><div class='add'>+struct f2fs_fs_context {</div><div class='add'>+	struct f2fs_mount_info info;</div><div class='add'>+	unsigned long long opt_mask;	/* Bits changed */</div><div class='add'>+	unsigned int	spec_mask;</div><div class='add'>+	unsigned short	qname_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define F2FS_CTX_INFO(ctx)	((ctx)-&gt;info)</div><div class='add'>+</div><div class='add'>+static inline void ctx_set_opt(struct f2fs_fs_context *ctx,</div><div class='add'>+			       enum f2fs_mount_opt flag)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;info.opt |= BIT(flag);</div><div class='add'>+	ctx-&gt;opt_mask |= BIT(flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ctx_clear_opt(struct f2fs_fs_context *ctx,</div><div class='add'>+				 enum f2fs_mount_opt flag)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;info.opt &amp;= ~BIT(flag);</div><div class='add'>+	ctx-&gt;opt_mask |= BIT(flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ctx_test_opt(struct f2fs_fs_context *ctx,</div><div class='add'>+				enum f2fs_mount_opt flag)</div><div class='add'>+{</div><div class='add'>+	return ctx-&gt;info.opt &amp; BIT(flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate,</div><div class='add'>+					const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='hunk'>@@ -274,8 +391,20 @@ void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...)</div><div class='ctx'> 	level = printk_get_level(fmt);</div><div class='ctx'> 	vaf.fmt = printk_skip_level(fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='del'>-	printk("%c%cF2FS-fs (%s): %pV\n",</div><div class='del'>-	       KERN_SOH_ASCII, level, sbi-&gt;sb-&gt;s_id, &amp;vaf);</div><div class='add'>+	if (limit_rate)</div><div class='add'>+		if (sbi)</div><div class='add'>+			printk_ratelimited("%c%cF2FS-fs (%s): %pV\n",</div><div class='add'>+				KERN_SOH_ASCII, level, sbi-&gt;sb-&gt;s_id, &amp;vaf);</div><div class='add'>+		else</div><div class='add'>+			printk_ratelimited("%c%cF2FS-fs: %pV\n",</div><div class='add'>+				KERN_SOH_ASCII, level, &amp;vaf);</div><div class='add'>+	else</div><div class='add'>+		if (sbi)</div><div class='add'>+			printk("%c%cF2FS-fs (%s): %pV\n",</div><div class='add'>+				KERN_SOH_ASCII, level, sbi-&gt;sb-&gt;s_id, &amp;vaf);</div><div class='add'>+		else</div><div class='add'>+			printk("%c%cF2FS-fs: %pV\n",</div><div class='add'>+				KERN_SOH_ASCII, level, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='hunk'>@@ -306,7 +435,7 @@ struct kmem_cache *f2fs_cf_name_slab;</div><div class='ctx'> static int __init f2fs_create_casefold_cache(void)</div><div class='ctx'> {</div><div class='ctx'> 	f2fs_cf_name_slab = f2fs_kmem_cache_create("f2fs_casefolded_name",</div><div class='del'>-							F2FS_NAME_LEN);</div><div class='add'>+						   F2FS_NAME_LEN);</div><div class='ctx'> 	return f2fs_cf_name_slab ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -321,68 +450,36 @@ static void f2fs_destroy_casefold_cache(void) { }</div><div class='ctx'> </div><div class='ctx'> static inline void limit_reserve_root(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='del'>-	block_t limit = min((sbi-&gt;user_block_count &gt;&gt; 3),</div><div class='add'>+	block_t block_limit = min((sbi-&gt;user_block_count &gt;&gt; 3),</div><div class='ctx'> 			sbi-&gt;user_block_count - sbi-&gt;reserved_blocks);</div><div class='add'>+	block_t node_limit = sbi-&gt;total_node_count &gt;&gt; 3;</div><div class='ctx'> </div><div class='ctx'> 	/* limit is 12.5% */</div><div class='ctx'> 	if (test_opt(sbi, RESERVE_ROOT) &amp;&amp;</div><div class='del'>-			F2FS_OPTION(sbi).root_reserved_blocks &gt; limit) {</div><div class='del'>-		F2FS_OPTION(sbi).root_reserved_blocks = limit;</div><div class='add'>+			F2FS_OPTION(sbi).root_reserved_blocks &gt; block_limit) {</div><div class='add'>+		F2FS_OPTION(sbi).root_reserved_blocks = block_limit;</div><div class='ctx'> 		f2fs_info(sbi, "Reduce reserved blocks for root = %u",</div><div class='ctx'> 			  F2FS_OPTION(sbi).root_reserved_blocks);</div><div class='ctx'> 	}</div><div class='del'>-	if (!test_opt(sbi, RESERVE_ROOT) &amp;&amp;</div><div class='add'>+	if (test_opt(sbi, RESERVE_NODE) &amp;&amp;</div><div class='add'>+			F2FS_OPTION(sbi).root_reserved_nodes &gt; node_limit) {</div><div class='add'>+		F2FS_OPTION(sbi).root_reserved_nodes = node_limit;</div><div class='add'>+		f2fs_info(sbi, "Reduce reserved nodes for root = %u",</div><div class='add'>+			  F2FS_OPTION(sbi).root_reserved_nodes);</div><div class='add'>+	}</div><div class='add'>+	if (!test_opt(sbi, RESERVE_ROOT) &amp;&amp; !test_opt(sbi, RESERVE_NODE) &amp;&amp;</div><div class='ctx'> 		(!uid_eq(F2FS_OPTION(sbi).s_resuid,</div><div class='ctx'> 				make_kuid(&amp;init_user_ns, F2FS_DEF_RESUID)) ||</div><div class='ctx'> 		!gid_eq(F2FS_OPTION(sbi).s_resgid,</div><div class='ctx'> 				make_kgid(&amp;init_user_ns, F2FS_DEF_RESGID))))</div><div class='del'>-		f2fs_info(sbi, "Ignore s_resuid=%u, s_resgid=%u w/o reserve_root",</div><div class='add'>+		f2fs_info(sbi, "Ignore s_resuid=%u, s_resgid=%u w/o reserve_root"</div><div class='add'>+				" and reserve_node",</div><div class='ctx'> 			  from_kuid_munged(&amp;init_user_ns,</div><div class='ctx'> 					   F2FS_OPTION(sbi).s_resuid),</div><div class='ctx'> 			  from_kgid_munged(&amp;init_user_ns,</div><div class='ctx'> 					   F2FS_OPTION(sbi).s_resgid));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int adjust_reserved_segment(struct f2fs_sb_info *sbi)</div><div class='del'>-{</div><div class='del'>-	unsigned int sec_blks = sbi-&gt;blocks_per_seg * sbi-&gt;segs_per_sec;</div><div class='del'>-	unsigned int avg_vblocks;</div><div class='del'>-	unsigned int wanted_reserved_segments;</div><div class='del'>-	block_t avail_user_block_count;</div><div class='del'>-</div><div class='del'>-	if (!F2FS_IO_ALIGNED(sbi))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* average valid block count in section in worst case */</div><div class='del'>-	avg_vblocks = sec_blks / F2FS_IO_SIZE(sbi);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we need enough free space when migrating one section in worst case</div><div class='del'>-	 */</div><div class='del'>-	wanted_reserved_segments = (F2FS_IO_SIZE(sbi) / avg_vblocks) *</div><div class='del'>-						reserved_segments(sbi);</div><div class='del'>-	wanted_reserved_segments -= reserved_segments(sbi);</div><div class='del'>-</div><div class='del'>-	avail_user_block_count = sbi-&gt;user_block_count -</div><div class='del'>-				sbi-&gt;current_reserved_blocks -</div><div class='del'>-				F2FS_OPTION(sbi).root_reserved_blocks;</div><div class='del'>-</div><div class='del'>-	if (wanted_reserved_segments * sbi-&gt;blocks_per_seg &gt;</div><div class='del'>-					avail_user_block_count) {</div><div class='del'>-		f2fs_err(sbi, "IO align feature can't grab additional reserved segment: %u, available segments: %u",</div><div class='del'>-			wanted_reserved_segments,</div><div class='del'>-			avail_user_block_count &gt;&gt; sbi-&gt;log_blocks_per_seg);</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SM_I(sbi)-&gt;additional_reserved_segments = wanted_reserved_segments;</div><div class='del'>-</div><div class='del'>-	f2fs_info(sbi, "IO align feature needs additional reserved segment: %u",</div><div class='del'>-			 wanted_reserved_segments);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void adjust_unusable_cap_perc(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	if (!F2FS_OPTION(sbi).unusable_cap_perc)</div><div class='hunk'>@@ -404,165 +501,101 @@ static void init_once(void *foo)</div><div class='ctx'> 	struct f2fs_inode_info *fi = (struct f2fs_inode_info *) foo;</div><div class='ctx'> </div><div class='ctx'> 	inode_init_once(&amp;fi-&gt;vfs_inode);</div><div class='add'>+#ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	fi-&gt;i_crypt_info = NULL;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	fi-&gt;i_verity_info = NULL;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> static const char * const quotatypes[] = INITQFNAMES;</div><div class='ctx'> #define QTYPE2NAME(t) (quotatypes[t])</div><div class='del'>-static int f2fs_set_qf_name(struct super_block *sb, int qtype,</div><div class='del'>-							substring_t *args)</div><div class='add'>+/*</div><div class='add'>+ * Note the name of the specified quota file.</div><div class='add'>+ */</div><div class='add'>+static int f2fs_note_qf_name(struct fs_context *fc, int qtype,</div><div class='add'>+			     struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	char *qname;</div><div class='del'>-	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (sb_any_quota_loaded(sb) &amp;&amp; !F2FS_OPTION(sbi).s_qf_names[qtype]) {</div><div class='del'>-		f2fs_err(sbi, "Cannot change journaled quota options when quota turned on");</div><div class='add'>+	if (param-&gt;size &lt; 1) {</div><div class='add'>+		f2fs_err(NULL, "Missing quota name");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (f2fs_sb_has_quota_ino(sbi)) {</div><div class='del'>-		f2fs_info(sbi, "QUOTA feature is enabled, so ignore qf_name");</div><div class='add'>+	if (strchr(param-&gt;string, '/')) {</div><div class='add'>+		f2fs_err(NULL, "quotafile must be on filesystem root");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;info.s_qf_names[qtype]) {</div><div class='add'>+		if (strcmp(ctx-&gt;info.s_qf_names[qtype], param-&gt;string) != 0) {</div><div class='add'>+			f2fs_err(NULL, "Quota file already specified");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qname = match_strdup(args);</div><div class='add'>+	qname = kmemdup_nul(param-&gt;string, param-&gt;size, GFP_KERNEL);</div><div class='ctx'> 	if (!qname) {</div><div class='del'>-		f2fs_err(sbi, "Not enough memory for storing quotafile name");</div><div class='add'>+		f2fs_err(NULL, "Not enough memory for storing quotafile name");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	if (F2FS_OPTION(sbi).s_qf_names[qtype]) {</div><div class='del'>-		if (strcmp(F2FS_OPTION(sbi).s_qf_names[qtype], qname) == 0)</div><div class='del'>-			ret = 0;</div><div class='del'>-		else</div><div class='del'>-			f2fs_err(sbi, "%s quota file already specified",</div><div class='del'>-				 QTYPE2NAME(qtype));</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-	if (strchr(qname, '/')) {</div><div class='del'>-		f2fs_err(sbi, "quotafile must be on filesystem root");</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-	F2FS_OPTION(sbi).s_qf_names[qtype] = qname;</div><div class='del'>-	set_opt(sbi, QUOTA);</div><div class='add'>+	F2FS_CTX_INFO(ctx).s_qf_names[qtype] = qname;</div><div class='add'>+	ctx-&gt;qname_mask |= 1 &lt;&lt; qtype;</div><div class='ctx'> 	return 0;</div><div class='del'>-errout:</div><div class='del'>-	kfree(qname);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_clear_qf_name(struct super_block *sb, int qtype)</div><div class='add'>+/*</div><div class='add'>+ * Clear the name of the specified quota file.</div><div class='add'>+ */</div><div class='add'>+static int f2fs_unnote_qf_name(struct fs_context *fc, int qtype)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> </div><div class='del'>-	if (sb_any_quota_loaded(sb) &amp;&amp; F2FS_OPTION(sbi).s_qf_names[qtype]) {</div><div class='del'>-		f2fs_err(sbi, "Cannot change journaled quota options when quota turned on");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	kfree(F2FS_OPTION(sbi).s_qf_names[qtype]);</div><div class='del'>-	F2FS_OPTION(sbi).s_qf_names[qtype] = NULL;</div><div class='add'>+	kfree(ctx-&gt;info.s_qf_names[qtype]);</div><div class='add'>+	ctx-&gt;info.s_qf_names[qtype] = NULL;</div><div class='add'>+	ctx-&gt;qname_mask |= 1 &lt;&lt; qtype;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_check_quota_options(struct f2fs_sb_info *sbi)</div><div class='add'>+static void f2fs_unnote_qf_name_all(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * We do the test below only for project quotas. 'usrquota' and</div><div class='del'>-	 * 'grpquota' mount options are allowed even without quota feature</div><div class='del'>-	 * to support legacy quotas in quota files.</div><div class='del'>-	 */</div><div class='del'>-	if (test_opt(sbi, PRJQUOTA) &amp;&amp; !f2fs_sb_has_project_quota(sbi)) {</div><div class='del'>-		f2fs_err(sbi, "Project quota feature not enabled. Cannot enable project quota enforcement.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if (F2FS_OPTION(sbi).s_qf_names[USRQUOTA] ||</div><div class='del'>-			F2FS_OPTION(sbi).s_qf_names[GRPQUOTA] ||</div><div class='del'>-			F2FS_OPTION(sbi).s_qf_names[PRJQUOTA]) {</div><div class='del'>-		if (test_opt(sbi, USRQUOTA) &amp;&amp;</div><div class='del'>-				F2FS_OPTION(sbi).s_qf_names[USRQUOTA])</div><div class='del'>-			clear_opt(sbi, USRQUOTA);</div><div class='del'>-</div><div class='del'>-		if (test_opt(sbi, GRPQUOTA) &amp;&amp;</div><div class='del'>-				F2FS_OPTION(sbi).s_qf_names[GRPQUOTA])</div><div class='del'>-			clear_opt(sbi, GRPQUOTA);</div><div class='del'>-</div><div class='del'>-		if (test_opt(sbi, PRJQUOTA) &amp;&amp;</div><div class='del'>-				F2FS_OPTION(sbi).s_qf_names[PRJQUOTA])</div><div class='del'>-			clear_opt(sbi, PRJQUOTA);</div><div class='del'>-</div><div class='del'>-		if (test_opt(sbi, GRPQUOTA) || test_opt(sbi, USRQUOTA) ||</div><div class='del'>-				test_opt(sbi, PRJQUOTA)) {</div><div class='del'>-			f2fs_err(sbi, "old and new quota format mixing");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!F2FS_OPTION(sbi).s_jquota_fmt) {</div><div class='del'>-			f2fs_err(sbi, "journaled quota format not specified");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (f2fs_sb_has_quota_ino(sbi) &amp;&amp; F2FS_OPTION(sbi).s_jquota_fmt) {</div><div class='del'>-		f2fs_info(sbi, "QUOTA feature is enabled, so ignore jquota_fmt");</div><div class='del'>-		F2FS_OPTION(sbi).s_jquota_fmt = 0;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	for (i = 0; i &lt; MAXQUOTAS; i++)</div><div class='add'>+		f2fs_unnote_qf_name(fc, i);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int f2fs_set_test_dummy_encryption(struct super_block *sb,</div><div class='del'>-					  const char *opt,</div><div class='del'>-					  const substring_t *arg,</div><div class='del'>-					  bool is_remount)</div><div class='add'>+static int f2fs_parse_test_dummy_encryption(const struct fs_parameter *param,</div><div class='add'>+					    struct f2fs_fs_context *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='del'>-	struct fs_parameter param = {</div><div class='del'>-		.type = fs_value_is_string,</div><div class='del'>-		.string = arg-&gt;from ? arg-&gt;from : "",</div><div class='del'>-	};</div><div class='del'>-	struct fscrypt_dummy_policy *policy =</div><div class='del'>-		&amp;F2FS_OPTION(sbi).dummy_enc_policy;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_FS_ENCRYPTION)) {</div><div class='del'>-		f2fs_warn(sbi, "test_dummy_encryption option not supported");</div><div class='add'>+		f2fs_warn(NULL, "test_dummy_encryption option not supported");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (!f2fs_sb_has_encrypt(sbi)) {</div><div class='del'>-		f2fs_err(sbi, "Encrypt feature is off");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This mount option is just for testing, and it's not worthwhile to</div><div class='del'>-	 * implement the extra complexity (e.g. RCU protection) that would be</div><div class='del'>-	 * needed to allow it to be set or changed during remount.  We do allow</div><div class='del'>-	 * it to be specified during remount, but only if there is no change.</div><div class='del'>-	 */</div><div class='del'>-	if (is_remount &amp;&amp; !fscrypt_is_dummy_policy_set(policy)) {</div><div class='del'>-		f2fs_warn(sbi, "Can't set test_dummy_encryption on remount");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = fscrypt_parse_test_dummy_encryption(&amp;param, policy);</div><div class='add'>+	err = fscrypt_parse_test_dummy_encryption(param,</div><div class='add'>+					&amp;ctx-&gt;info.dummy_enc_policy);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (err == -EEXIST)</div><div class='del'>-			f2fs_warn(sbi,</div><div class='del'>-				  "Can't change test_dummy_encryption on remount");</div><div class='del'>-		else if (err == -EINVAL)</div><div class='del'>-			f2fs_warn(sbi, "Value of option \"%s\" is unrecognized",</div><div class='del'>-				  opt);</div><div class='add'>+		if (err == -EINVAL)</div><div class='add'>+			f2fs_warn(NULL, "Value of option \"%s\" is unrecognized",</div><div class='add'>+				  param-&gt;key);</div><div class='add'>+		else if (err == -EEXIST)</div><div class='add'>+			f2fs_warn(NULL, "Conflicting test_dummy_encryption options");</div><div class='ctx'> 		else</div><div class='del'>-			f2fs_warn(sbi, "Error processing option \"%s\" [%d]",</div><div class='del'>-				  opt, err);</div><div class='add'>+			f2fs_warn(NULL, "Error processing option \"%s\" [%d]",</div><div class='add'>+				  param-&gt;key, err);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_warn(sbi, "Test dummy encryption mode enabled");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-static bool is_compress_extension_exist(struct f2fs_sb_info *sbi,</div><div class='add'>+static bool is_compress_extension_exist(struct f2fs_mount_info *info,</div><div class='ctx'> 					const char *new_ext, bool is_ext)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char (*ext)[F2FS_EXTENSION_LEN];</div><div class='hunk'>@@ -570,11 +603,11 @@ static bool is_compress_extension_exist(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (is_ext) {</div><div class='del'>-		ext = F2FS_OPTION(sbi).extensions;</div><div class='del'>-		ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;</div><div class='add'>+		ext = info-&gt;extensions;</div><div class='add'>+		ext_cnt = info-&gt;compress_ext_cnt;</div><div class='ctx'> 	} else {</div><div class='del'>-		ext = F2FS_OPTION(sbi).noextensions;</div><div class='del'>-		ext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;</div><div class='add'>+		ext = info-&gt;noextensions;</div><div class='add'>+		ext_cnt = info-&gt;nocompress_ext_cnt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ext_cnt; i++) {</div><div class='hunk'>@@ -592,28 +625,28 @@ static bool is_compress_extension_exist(struct f2fs_sb_info *sbi,</div><div class='ctx'>  * extension will be treated as special cases and will not be compressed.</div><div class='ctx'>  * 3. Don't allow the non-compress extension specifies all files.</div><div class='ctx'>  */</div><div class='del'>-static int f2fs_test_compress_extension(struct f2fs_sb_info *sbi)</div><div class='add'>+static int f2fs_test_compress_extension(unsigned char (*noext)[F2FS_EXTENSION_LEN],</div><div class='add'>+					int noext_cnt,</div><div class='add'>+					unsigned char (*ext)[F2FS_EXTENSION_LEN],</div><div class='add'>+					int ext_cnt)</div><div class='ctx'> {</div><div class='del'>-	unsigned char (*ext)[F2FS_EXTENSION_LEN];</div><div class='del'>-	unsigned char (*noext)[F2FS_EXTENSION_LEN];</div><div class='del'>-	int ext_cnt, noext_cnt, index = 0, no_index = 0;</div><div class='del'>-</div><div class='del'>-	ext = F2FS_OPTION(sbi).extensions;</div><div class='del'>-	ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;</div><div class='del'>-	noext = F2FS_OPTION(sbi).noextensions;</div><div class='del'>-	noext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;</div><div class='add'>+	int index = 0, no_index = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!noext_cnt)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (no_index = 0; no_index &lt; noext_cnt; no_index++) {</div><div class='add'>+		if (strlen(noext[no_index]) == 0)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (!strcasecmp("*", noext[no_index])) {</div><div class='del'>-			f2fs_info(sbi, "Don't allow the nocompress extension specifies all files");</div><div class='add'>+			f2fs_info(NULL, "Don't allow the nocompress extension specifies all files");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (index = 0; index &lt; ext_cnt; index++) {</div><div class='add'>+			if (strlen(ext[index]) == 0)</div><div class='add'>+				continue;</div><div class='ctx'> 			if (!strcasecmp(ext[index], noext[no_index])) {</div><div class='del'>-				f2fs_info(sbi, "Don't allow the same extension %s appear in both compress and nocompress extension",</div><div class='add'>+				f2fs_info(NULL, "Don't allow the same extension %s appear in both compress and nocompress extension",</div><div class='ctx'> 						ext[index]);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -623,759 +656,864 @@ static int f2fs_test_compress_extension(struct f2fs_sb_info *sbi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_LZ4</div><div class='del'>-static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)</div><div class='add'>+static int f2fs_set_lz4hc_level(struct f2fs_fs_context *ctx, const char *str)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_LZ4HC</div><div class='ctx'> 	unsigned int level;</div><div class='ctx'> </div><div class='ctx'> 	if (strlen(str) == 3) {</div><div class='del'>-		F2FS_OPTION(sbi).compress_level = 0;</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_level = 0;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	str += 3;</div><div class='ctx'> </div><div class='ctx'> 	if (str[0] != ':') {</div><div class='del'>-		f2fs_info(sbi, "wrong format, e.g. &lt;alg_name&gt;:&lt;compr_level&gt;");</div><div class='add'>+		f2fs_info(NULL, "wrong format, e.g. &lt;alg_name&gt;:&lt;compr_level&gt;");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (kstrtouint(str + 1, 10, &amp;level))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_is_compress_level_valid(COMPRESS_LZ4, level)) {</div><div class='del'>-		f2fs_info(sbi, "invalid lz4hc compress level: %d", level);</div><div class='add'>+		f2fs_info(NULL, "invalid lz4hc compress level: %d", level);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	F2FS_OPTION(sbi).compress_level = level;</div><div class='add'>+	F2FS_CTX_INFO(ctx).compress_level = level;</div><div class='add'>+	ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='ctx'> 	return 0;</div><div class='ctx'> #else</div><div class='ctx'> 	if (strlen(str) == 3) {</div><div class='del'>-		F2FS_OPTION(sbi).compress_level = 0;</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_level = 0;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_info(sbi, "kernel doesn't support lz4hc compression");</div><div class='add'>+	f2fs_info(NULL, "kernel doesn't support lz4hc compression");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_ZSTD</div><div class='del'>-static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)</div><div class='add'>+static int f2fs_set_zstd_level(struct f2fs_fs_context *ctx, const char *str)</div><div class='ctx'> {</div><div class='del'>-	unsigned int level;</div><div class='add'>+	int level;</div><div class='ctx'> 	int len = 4;</div><div class='ctx'> </div><div class='ctx'> 	if (strlen(str) == len) {</div><div class='del'>-		F2FS_OPTION(sbi).compress_level = F2FS_ZSTD_DEFAULT_CLEVEL;</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_level = F2FS_ZSTD_DEFAULT_CLEVEL;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	str += len;</div><div class='ctx'> </div><div class='ctx'> 	if (str[0] != ':') {</div><div class='del'>-		f2fs_info(sbi, "wrong format, e.g. &lt;alg_name&gt;:&lt;compr_level&gt;");</div><div class='add'>+		f2fs_info(NULL, "wrong format, e.g. &lt;alg_name&gt;:&lt;compr_level&gt;");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (kstrtouint(str + 1, 10, &amp;level))</div><div class='add'>+	if (kstrtoint(str + 1, 10, &amp;level))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* f2fs does not support negative compress level now */</div><div class='add'>+	if (level &lt; 0) {</div><div class='add'>+		f2fs_info(NULL, "do not support negative compress level: %d", level);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!f2fs_is_compress_level_valid(COMPRESS_ZSTD, level)) {</div><div class='del'>-		f2fs_info(sbi, "invalid zstd compress level: %d", level);</div><div class='add'>+		f2fs_info(NULL, "invalid zstd compress level: %d", level);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	F2FS_OPTION(sbi).compress_level = level;</div><div class='add'>+	F2FS_CTX_INFO(ctx).compress_level = level;</div><div class='add'>+	ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int parse_options(struct super_block *sb, char *options, bool is_remount)</div><div class='add'>+static int f2fs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	unsigned char (*ext)[F2FS_EXTENSION_LEN];</div><div class='ctx'> 	unsigned char (*noext)[F2FS_EXTENSION_LEN];</div><div class='ctx'> 	int ext_cnt, noext_cnt;</div><div class='add'>+	char *name;</div><div class='ctx'> #endif</div><div class='del'>-	char *p, *name;</div><div class='del'>-	int arg = 0;</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		goto default_check;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Initialize args struct so we know whether arg was</div><div class='del'>-		 * found; some options take optional arguments.</div><div class='del'>-		 */</div><div class='del'>-		args[0].to = args[0].from = NULL;</div><div class='del'>-		token = match_token(p, f2fs_tokens, args);</div><div class='add'>+	substring_t args[MAX_OPT_ARGS];</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int token, ret, arg;</div><div class='ctx'> </div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_gc_background:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='add'>+	token = fs_parse(fc, f2fs_param_specs, param, &amp;result);</div><div class='add'>+	if (token &lt; 0)</div><div class='add'>+		return token;</div><div class='ctx'> </div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "on")) {</div><div class='del'>-				F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_ON;</div><div class='del'>-			} else if (!strcmp(name, "off")) {</div><div class='del'>-				F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_OFF;</div><div class='del'>-			} else if (!strcmp(name, "sync")) {</div><div class='del'>-				F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_SYNC;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_disable_roll_forward:</div><div class='del'>-			set_opt(sbi, DISABLE_ROLL_FORWARD);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_norecovery:</div><div class='del'>-			/* this option mounts f2fs with ro */</div><div class='del'>-			set_opt(sbi, NORECOVERY);</div><div class='del'>-			if (!f2fs_readonly(sb))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_discard:</div><div class='del'>-			if (!f2fs_hw_support_discard(sbi)) {</div><div class='del'>-				f2fs_warn(sbi, "device does not support discard");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			set_opt(sbi, DISCARD);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nodiscard:</div><div class='del'>-			if (f2fs_hw_should_discard(sbi)) {</div><div class='del'>-				f2fs_warn(sbi, "discard is required for zoned block devices");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			clear_opt(sbi, DISCARD);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noheap:</div><div class='del'>-			set_opt(sbi, NOHEAP);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_heap:</div><div class='del'>-			clear_opt(sbi, NOHEAP);</div><div class='del'>-			break;</div><div class='add'>+	switch (token) {</div><div class='add'>+	case Opt_gc_background:</div><div class='add'>+		F2FS_CTX_INFO(ctx).bggc_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_background_gc;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_disable_roll_forward:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_DISABLE_ROLL_FORWARD);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_norecovery:</div><div class='add'>+		/* requires ro mount, checked in f2fs_validate_options */</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_NORECOVERY);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_discard:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_DISCARD);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_DISCARD);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_noheap:</div><div class='add'>+	case Opt_heap:</div><div class='add'>+		f2fs_warn(NULL, "heap/no_heap options were deprecated");</div><div class='add'>+		break;</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_XATTR</div><div class='del'>-		case Opt_user_xattr:</div><div class='del'>-			set_opt(sbi, XATTR_USER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nouser_xattr:</div><div class='del'>-			clear_opt(sbi, XATTR_USER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inline_xattr:</div><div class='del'>-			set_opt(sbi, INLINE_XATTR);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noinline_xattr:</div><div class='del'>-			clear_opt(sbi, INLINE_XATTR);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inline_xattr_size:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			set_opt(sbi, INLINE_XATTR_SIZE);</div><div class='del'>-			F2FS_OPTION(sbi).inline_xattr_size = arg;</div><div class='del'>-			break;</div><div class='add'>+	case Opt_user_xattr:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_XATTR_USER);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_XATTR_USER);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_inline_xattr:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_INLINE_XATTR);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_INLINE_XATTR);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_inline_xattr_size:</div><div class='add'>+		if (result.int_32 &lt; MIN_INLINE_XATTR_SIZE ||</div><div class='add'>+			result.int_32 &gt; MAX_INLINE_XATTR_SIZE) {</div><div class='add'>+			f2fs_err(NULL, "inline xattr size is out of range: %u ~ %u",</div><div class='add'>+				 (u32)MIN_INLINE_XATTR_SIZE, (u32)MAX_INLINE_XATTR_SIZE);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_INLINE_XATTR_SIZE);</div><div class='add'>+		F2FS_CTX_INFO(ctx).inline_xattr_size = result.int_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_inline_xattr_size;</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_user_xattr:</div><div class='del'>-			f2fs_info(sbi, "user_xattr options not supported");</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nouser_xattr:</div><div class='del'>-			f2fs_info(sbi, "nouser_xattr options not supported");</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inline_xattr:</div><div class='del'>-			f2fs_info(sbi, "inline_xattr options not supported");</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noinline_xattr:</div><div class='del'>-			f2fs_info(sbi, "noinline_xattr options not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_user_xattr:</div><div class='add'>+	case Opt_inline_xattr:</div><div class='add'>+	case Opt_inline_xattr_size:</div><div class='add'>+		f2fs_info(NULL, "%s options not supported", param-&gt;key);</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_POSIX_ACL</div><div class='del'>-		case Opt_acl:</div><div class='del'>-			set_opt(sbi, POSIX_ACL);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noacl:</div><div class='del'>-			clear_opt(sbi, POSIX_ACL);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_acl:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_POSIX_ACL);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_POSIX_ACL);</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_acl:</div><div class='del'>-			f2fs_info(sbi, "acl options not supported");</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noacl:</div><div class='del'>-			f2fs_info(sbi, "noacl options not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_acl:</div><div class='add'>+		f2fs_info(NULL, "%s options not supported", param-&gt;key);</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_active_logs:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (arg != 2 &amp;&amp; arg != 4 &amp;&amp;</div><div class='del'>-				arg != NR_CURSEG_PERSIST_TYPE)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			F2FS_OPTION(sbi).active_logs = arg;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_disable_ext_identify:</div><div class='del'>-			set_opt(sbi, DISABLE_EXT_IDENTIFY);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inline_data:</div><div class='del'>-			set_opt(sbi, INLINE_DATA);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inline_dentry:</div><div class='del'>-			set_opt(sbi, INLINE_DENTRY);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noinline_dentry:</div><div class='del'>-			clear_opt(sbi, INLINE_DENTRY);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_flush_merge:</div><div class='del'>-			set_opt(sbi, FLUSH_MERGE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noflush_merge:</div><div class='del'>-			clear_opt(sbi, FLUSH_MERGE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nobarrier:</div><div class='del'>-			set_opt(sbi, NOBARRIER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_barrier:</div><div class='del'>-			clear_opt(sbi, NOBARRIER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_fastboot:</div><div class='del'>-			set_opt(sbi, FASTBOOT);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_extent_cache:</div><div class='del'>-			set_opt(sbi, READ_EXTENT_CACHE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noextent_cache:</div><div class='del'>-			clear_opt(sbi, READ_EXTENT_CACHE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noinline_data:</div><div class='del'>-			clear_opt(sbi, INLINE_DATA);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_data_flush:</div><div class='del'>-			set_opt(sbi, DATA_FLUSH);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_reserve_root:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (test_opt(sbi, RESERVE_ROOT)) {</div><div class='del'>-				f2fs_info(sbi, "Preserve previous reserve_root=%u",</div><div class='del'>-					  F2FS_OPTION(sbi).root_reserved_blocks);</div><div class='del'>-			} else {</div><div class='del'>-				F2FS_OPTION(sbi).root_reserved_blocks = arg;</div><div class='del'>-				set_opt(sbi, RESERVE_ROOT);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_resuid:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			uid = make_kuid(current_user_ns(), arg);</div><div class='del'>-			if (!uid_valid(uid)) {</div><div class='del'>-				f2fs_err(sbi, "Invalid uid value %d", arg);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			F2FS_OPTION(sbi).s_resuid = uid;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_resgid:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			gid = make_kgid(current_user_ns(), arg);</div><div class='del'>-			if (!gid_valid(gid)) {</div><div class='del'>-				f2fs_err(sbi, "Invalid gid value %d", arg);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			F2FS_OPTION(sbi).s_resgid = gid;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_mode:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "adaptive")) {</div><div class='del'>-				F2FS_OPTION(sbi).fs_mode = FS_MODE_ADAPTIVE;</div><div class='del'>-			} else if (!strcmp(name, "lfs")) {</div><div class='del'>-				F2FS_OPTION(sbi).fs_mode = FS_MODE_LFS;</div><div class='del'>-			} else if (!strcmp(name, "fragment:segment")) {</div><div class='del'>-				F2FS_OPTION(sbi).fs_mode = FS_MODE_FRAGMENT_SEG;</div><div class='del'>-			} else if (!strcmp(name, "fragment:block")) {</div><div class='del'>-				F2FS_OPTION(sbi).fs_mode = FS_MODE_FRAGMENT_BLK;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_io_size_bits:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (arg &lt;= 0 || arg &gt; __ilog2_u32(BIO_MAX_VECS)) {</div><div class='del'>-				f2fs_warn(sbi, "Not support %ld, larger than %d",</div><div class='del'>-					BIT(arg), BIO_MAX_VECS);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			F2FS_OPTION(sbi).write_io_size_bits = arg;</div><div class='del'>-			break;</div><div class='add'>+	case Opt_active_logs:</div><div class='add'>+		if (result.int_32 != 2 &amp;&amp; result.int_32 != 4 &amp;&amp;</div><div class='add'>+			result.int_32 != NR_CURSEG_PERSIST_TYPE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_active_logs;</div><div class='add'>+		F2FS_CTX_INFO(ctx).active_logs = result.int_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_disable_ext_identify:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_DISABLE_EXT_IDENTIFY);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_inline_data:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_INLINE_DATA);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_INLINE_DATA);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_inline_dentry:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_INLINE_DENTRY);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_INLINE_DENTRY);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_flush_merge:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_FLUSH_MERGE);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_FLUSH_MERGE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_barrier:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_NOBARRIER);</div><div class='add'>+		else</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_NOBARRIER);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fastboot:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_FASTBOOT);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_extent_cache:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_READ_EXTENT_CACHE);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_READ_EXTENT_CACHE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_data_flush:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_DATA_FLUSH);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_reserve_root:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_RESERVE_ROOT);</div><div class='add'>+		F2FS_CTX_INFO(ctx).root_reserved_blocks = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_reserve_root;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_reserve_node:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_RESERVE_NODE);</div><div class='add'>+		F2FS_CTX_INFO(ctx).root_reserved_nodes = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_reserve_node;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resuid:</div><div class='add'>+		F2FS_CTX_INFO(ctx).s_resuid = result.uid;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_resuid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resgid:</div><div class='add'>+		F2FS_CTX_INFO(ctx).s_resgid = result.gid;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_resgid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mode:</div><div class='add'>+		F2FS_CTX_INFO(ctx).fs_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_mode;</div><div class='add'>+		break;</div><div class='ctx'> #ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='del'>-		case Opt_fault_injection:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			f2fs_build_fault_attr(sbi, arg, F2FS_ALL_FAULT_TYPE);</div><div class='del'>-			set_opt(sbi, FAULT_INJECTION);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_fault_injection:</div><div class='add'>+		F2FS_CTX_INFO(ctx).fault_info.inject_rate = result.int_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_fault_injection;</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_FAULT_INJECTION);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case Opt_fault_type:</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			f2fs_build_fault_attr(sbi, 0, arg);</div><div class='del'>-			set_opt(sbi, FAULT_INJECTION);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_fault_type:</div><div class='add'>+		if (result.uint_32 &gt; BIT(FAULT_MAX))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		F2FS_CTX_INFO(ctx).fault_info.inject_type = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_fault_type;</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_FAULT_INJECTION);</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_fault_injection:</div><div class='del'>-			f2fs_info(sbi, "fault_injection options not supported");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_fault_type:</div><div class='del'>-			f2fs_info(sbi, "fault_type options not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_fault_injection:</div><div class='add'>+	case Opt_fault_type:</div><div class='add'>+		f2fs_info(NULL, "%s options not supported", param-&gt;key);</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_lazytime:</div><div class='del'>-			sb-&gt;s_flags |= SB_LAZYTIME;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nolazytime:</div><div class='del'>-			sb-&gt;s_flags &amp;= ~SB_LAZYTIME;</div><div class='del'>-			break;</div><div class='add'>+	case Opt_lazytime:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_LAZYTIME);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_LAZYTIME);</div><div class='add'>+		break;</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-		case Opt_quota:</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-			set_opt(sbi, USRQUOTA);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-			set_opt(sbi, GRPQUOTA);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_prjquota:</div><div class='del'>-			set_opt(sbi, PRJQUOTA);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_usrjquota:</div><div class='del'>-			ret = f2fs_set_qf_name(sb, USRQUOTA, &amp;args[0]);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_grpjquota:</div><div class='del'>-			ret = f2fs_set_qf_name(sb, GRPQUOTA, &amp;args[0]);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_prjjquota:</div><div class='del'>-			ret = f2fs_set_qf_name(sb, PRJQUOTA, &amp;args[0]);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_offusrjquota:</div><div class='del'>-			ret = f2fs_clear_qf_name(sb, USRQUOTA);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_offgrpjquota:</div><div class='del'>-			ret = f2fs_clear_qf_name(sb, GRPQUOTA);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_offprjjquota:</div><div class='del'>-			ret = f2fs_clear_qf_name(sb, PRJQUOTA);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_jqfmt_vfsold:</div><div class='del'>-			F2FS_OPTION(sbi).s_jquota_fmt = QFMT_VFS_OLD;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_jqfmt_vfsv0:</div><div class='del'>-			F2FS_OPTION(sbi).s_jquota_fmt = QFMT_VFS_V0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_jqfmt_vfsv1:</div><div class='del'>-			F2FS_OPTION(sbi).s_jquota_fmt = QFMT_VFS_V1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noquota:</div><div class='del'>-			clear_opt(sbi, QUOTA);</div><div class='del'>-			clear_opt(sbi, USRQUOTA);</div><div class='del'>-			clear_opt(sbi, GRPQUOTA);</div><div class='del'>-			clear_opt(sbi, PRJQUOTA);</div><div class='del'>-			break;</div><div class='add'>+	case Opt_quota:</div><div class='add'>+		if (result.negated) {</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_QUOTA);</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_USRQUOTA);</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_GRPQUOTA);</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_PRJQUOTA);</div><div class='add'>+		} else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_USRQUOTA);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_USRQUOTA);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_GRPQUOTA);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_prjquota:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_PRJQUOTA);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_usrjquota:</div><div class='add'>+		if (!*param-&gt;string)</div><div class='add'>+			ret = f2fs_unnote_qf_name(fc, USRQUOTA);</div><div class='add'>+		else</div><div class='add'>+			ret = f2fs_note_qf_name(fc, USRQUOTA, param);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_grpjquota:</div><div class='add'>+		if (!*param-&gt;string)</div><div class='add'>+			ret = f2fs_unnote_qf_name(fc, GRPQUOTA);</div><div class='add'>+		else</div><div class='add'>+			ret = f2fs_note_qf_name(fc, GRPQUOTA, param);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_prjjquota:</div><div class='add'>+		if (!*param-&gt;string)</div><div class='add'>+			ret = f2fs_unnote_qf_name(fc, PRJQUOTA);</div><div class='add'>+		else</div><div class='add'>+			ret = f2fs_note_qf_name(fc, PRJQUOTA, param);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_jqfmt:</div><div class='add'>+		F2FS_CTX_INFO(ctx).s_jquota_fmt = result.int_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_jqfmt;</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_quota:</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-		case Opt_prjquota:</div><div class='del'>-		case Opt_usrjquota:</div><div class='del'>-		case Opt_grpjquota:</div><div class='del'>-		case Opt_prjjquota:</div><div class='del'>-		case Opt_offusrjquota:</div><div class='del'>-		case Opt_offgrpjquota:</div><div class='del'>-		case Opt_offprjjquota:</div><div class='del'>-		case Opt_jqfmt_vfsold:</div><div class='del'>-		case Opt_jqfmt_vfsv0:</div><div class='del'>-		case Opt_jqfmt_vfsv1:</div><div class='del'>-		case Opt_noquota:</div><div class='del'>-			f2fs_info(sbi, "quota operations not supported");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_quota:</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+	case Opt_prjquota:</div><div class='add'>+	case Opt_usrjquota:</div><div class='add'>+	case Opt_grpjquota:</div><div class='add'>+	case Opt_prjjquota:</div><div class='add'>+		f2fs_info(NULL, "quota operations not supported");</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_alloc:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			if (!strcmp(name, "default")) {</div><div class='del'>-				F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_DEFAULT;</div><div class='del'>-			} else if (!strcmp(name, "reuse")) {</div><div class='del'>-				F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_REUSE;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_fsync:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "posix")) {</div><div class='del'>-				F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX;</div><div class='del'>-			} else if (!strcmp(name, "strict")) {</div><div class='del'>-				F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_STRICT;</div><div class='del'>-			} else if (!strcmp(name, "nobarrier")) {</div><div class='del'>-				F2FS_OPTION(sbi).fsync_mode =</div><div class='del'>-							FSYNC_MODE_NOBARRIER;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_test_dummy_encryption:</div><div class='del'>-			ret = f2fs_set_test_dummy_encryption(sb, p, &amp;args[0],</div><div class='del'>-							     is_remount);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inlinecrypt:</div><div class='add'>+	case Opt_alloc:</div><div class='add'>+		F2FS_CTX_INFO(ctx).alloc_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_alloc_mode;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fsync:</div><div class='add'>+		F2FS_CTX_INFO(ctx).fsync_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_fsync_mode;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_test_dummy_encryption:</div><div class='add'>+		ret = f2fs_parse_test_dummy_encryption(param, ctx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_inlinecrypt:</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT</div><div class='del'>-			sb-&gt;s_flags |= SB_INLINECRYPT;</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_INLINECRYPT);</div><div class='ctx'> #else</div><div class='del'>-			f2fs_info(sbi, "inline encryption not supported");</div><div class='add'>+		f2fs_info(NULL, "inline encryption not supported");</div><div class='ctx'> #endif</div><div class='del'>-			break;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_checkpoint:</div><div class='add'>+		/*</div><div class='add'>+		 * Initialize args struct so we know whether arg was</div><div class='add'>+		 * found; some options take optional arguments.</div><div class='add'>+		 */</div><div class='add'>+		args[0].from = args[0].to = NULL;</div><div class='add'>+		arg = 0;</div><div class='add'>+</div><div class='add'>+		/* revert to match_table for checkpoint= options */</div><div class='add'>+		token = match_token(param-&gt;string, f2fs_checkpoint_tokens, args);</div><div class='add'>+		switch (token) {</div><div class='ctx'> 		case Opt_checkpoint_disable_cap_perc:</div><div class='ctx'> 			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			if (arg &lt; 0 || arg &gt; 100)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			F2FS_OPTION(sbi).unusable_cap_perc = arg;</div><div class='del'>-			set_opt(sbi, DISABLE_CHECKPOINT);</div><div class='add'>+			F2FS_CTX_INFO(ctx).unusable_cap_perc = arg;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_checkpoint_disable_cap_perc;</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_DISABLE_CHECKPOINT);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case Opt_checkpoint_disable_cap:</div><div class='ctx'> 			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			F2FS_OPTION(sbi).unusable_cap = arg;</div><div class='del'>-			set_opt(sbi, DISABLE_CHECKPOINT);</div><div class='add'>+			F2FS_CTX_INFO(ctx).unusable_cap = arg;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_checkpoint_disable_cap;</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_DISABLE_CHECKPOINT);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case Opt_checkpoint_disable:</div><div class='del'>-			set_opt(sbi, DISABLE_CHECKPOINT);</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_DISABLE_CHECKPOINT);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case Opt_checkpoint_enable:</div><div class='del'>-			clear_opt(sbi, DISABLE_CHECKPOINT);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_checkpoint_merge:</div><div class='del'>-			set_opt(sbi, MERGE_CHECKPOINT);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocheckpoint_merge:</div><div class='del'>-			clear_opt(sbi, MERGE_CHECKPOINT);</div><div class='add'>+			F2FS_CTX_INFO(ctx).unusable_cap_perc = 0;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_checkpoint_disable_cap_perc;</div><div class='add'>+			F2FS_CTX_INFO(ctx).unusable_cap = 0;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_checkpoint_disable_cap;</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_DISABLE_CHECKPOINT);</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_checkpoint_merge:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_MERGE_CHECKPOINT);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_MERGE_CHECKPOINT);</div><div class='add'>+		break;</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-		case Opt_compress_algorithm:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "lzo")) {</div><div class='add'>+	case Opt_compress_algorithm:</div><div class='add'>+		name = param-&gt;string;</div><div class='add'>+		if (!strcmp(name, "lzo")) {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_LZO</div><div class='del'>-				F2FS_OPTION(sbi).compress_level = 0;</div><div class='del'>-				F2FS_OPTION(sbi).compress_algorithm =</div><div class='del'>-								COMPRESS_LZO;</div><div class='add'>+			F2FS_CTX_INFO(ctx).compress_level = 0;</div><div class='add'>+			F2FS_CTX_INFO(ctx).compress_algorithm = COMPRESS_LZO;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_compress_algorithm;</div><div class='ctx'> #else</div><div class='del'>-				f2fs_info(sbi, "kernel doesn't support lzo compression");</div><div class='add'>+			f2fs_info(NULL, "kernel doesn't support lzo compression");</div><div class='ctx'> #endif</div><div class='del'>-			} else if (!strncmp(name, "lz4", 3)) {</div><div class='add'>+		} else if (!strncmp(name, "lz4", 3)) {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_LZ4</div><div class='del'>-				ret = f2fs_set_lz4hc_level(sbi, name);</div><div class='del'>-				if (ret) {</div><div class='del'>-					kfree(name);</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				}</div><div class='del'>-				F2FS_OPTION(sbi).compress_algorithm =</div><div class='del'>-								COMPRESS_LZ4;</div><div class='add'>+			ret = f2fs_set_lz4hc_level(ctx, name);</div><div class='add'>+			if (ret)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			F2FS_CTX_INFO(ctx).compress_algorithm = COMPRESS_LZ4;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_compress_algorithm;</div><div class='ctx'> #else</div><div class='del'>-				f2fs_info(sbi, "kernel doesn't support lz4 compression");</div><div class='add'>+			f2fs_info(NULL, "kernel doesn't support lz4 compression");</div><div class='ctx'> #endif</div><div class='del'>-			} else if (!strncmp(name, "zstd", 4)) {</div><div class='add'>+		} else if (!strncmp(name, "zstd", 4)) {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_ZSTD</div><div class='del'>-				ret = f2fs_set_zstd_level(sbi, name);</div><div class='del'>-				if (ret) {</div><div class='del'>-					kfree(name);</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				}</div><div class='del'>-				F2FS_OPTION(sbi).compress_algorithm =</div><div class='del'>-								COMPRESS_ZSTD;</div><div class='add'>+			ret = f2fs_set_zstd_level(ctx, name);</div><div class='add'>+			if (ret)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			F2FS_CTX_INFO(ctx).compress_algorithm = COMPRESS_ZSTD;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_compress_algorithm;</div><div class='ctx'> #else</div><div class='del'>-				f2fs_info(sbi, "kernel doesn't support zstd compression");</div><div class='add'>+			f2fs_info(NULL, "kernel doesn't support zstd compression");</div><div class='ctx'> #endif</div><div class='del'>-			} else if (!strcmp(name, "lzo-rle")) {</div><div class='add'>+		} else if (!strcmp(name, "lzo-rle")) {</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_LZORLE</div><div class='del'>-				F2FS_OPTION(sbi).compress_level = 0;</div><div class='del'>-				F2FS_OPTION(sbi).compress_algorithm =</div><div class='del'>-								COMPRESS_LZORLE;</div><div class='add'>+			F2FS_CTX_INFO(ctx).compress_level = 0;</div><div class='add'>+			F2FS_CTX_INFO(ctx).compress_algorithm = COMPRESS_LZORLE;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_compress_level;</div><div class='add'>+			ctx-&gt;spec_mask |= F2FS_SPEC_compress_algorithm;</div><div class='ctx'> #else</div><div class='del'>-				f2fs_info(sbi, "kernel doesn't support lzorle compression");</div><div class='add'>+			f2fs_info(NULL, "kernel doesn't support lzorle compression");</div><div class='ctx'> #endif</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_compress_log_size:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (args-&gt;from &amp;&amp; match_int(args, &amp;arg))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (arg &lt; MIN_COMPRESS_LOG_SIZE ||</div><div class='del'>-				arg &gt; MAX_COMPRESS_LOG_SIZE) {</div><div class='del'>-				f2fs_err(sbi,</div><div class='del'>-					"Compress cluster log size is out of range");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			F2FS_OPTION(sbi).compress_log_size = arg;</div><div class='add'>+		} else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_compress_log_size:</div><div class='add'>+		if (result.uint_32 &lt; MIN_COMPRESS_LOG_SIZE ||</div><div class='add'>+		    result.uint_32 &gt; MAX_COMPRESS_LOG_SIZE) {</div><div class='add'>+			f2fs_err(NULL,</div><div class='add'>+				"Compress cluster log size is out of range");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_log_size = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_log_size;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_compress_extension:</div><div class='add'>+		name = param-&gt;string;</div><div class='add'>+		ext = F2FS_CTX_INFO(ctx).extensions;</div><div class='add'>+		ext_cnt = F2FS_CTX_INFO(ctx).compress_ext_cnt;</div><div class='add'>+</div><div class='add'>+		if (strlen(name) &gt;= F2FS_EXTENSION_LEN ||</div><div class='add'>+		    ext_cnt &gt;= COMPRESS_EXT_NUM) {</div><div class='add'>+			f2fs_err(NULL, "invalid extension length/number");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_compress_extension_exist(&amp;ctx-&gt;info, name, true))</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_compress_extension:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-			ext = F2FS_OPTION(sbi).extensions;</div><div class='del'>-			ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;</div><div class='add'>+		ret = strscpy(ext[ext_cnt], name, F2FS_EXTENSION_LEN);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_ext_cnt++;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_extension;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nocompress_extension:</div><div class='add'>+		name = param-&gt;string;</div><div class='add'>+		noext = F2FS_CTX_INFO(ctx).noextensions;</div><div class='add'>+		noext_cnt = F2FS_CTX_INFO(ctx).nocompress_ext_cnt;</div><div class='add'>+</div><div class='add'>+		if (strlen(name) &gt;= F2FS_EXTENSION_LEN ||</div><div class='add'>+			noext_cnt &gt;= COMPRESS_EXT_NUM) {</div><div class='add'>+			f2fs_err(NULL, "invalid extension length/number");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (strlen(name) &gt;= F2FS_EXTENSION_LEN ||</div><div class='del'>-				ext_cnt &gt;= COMPRESS_EXT_NUM) {</div><div class='del'>-				f2fs_err(sbi,</div><div class='del'>-					"invalid extension length/number");</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='add'>+		if (is_compress_extension_exist(&amp;ctx-&gt;info, name, false))</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-			if (is_compress_extension_exist(sbi, name, true)) {</div><div class='del'>-				kfree(name);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		ret = strscpy(noext[noext_cnt], name, F2FS_EXTENSION_LEN);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		F2FS_CTX_INFO(ctx).nocompress_ext_cnt++;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_nocompress_extension;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_compress_chksum:</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_chksum = true;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_chksum;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_compress_mode:</div><div class='add'>+		F2FS_CTX_INFO(ctx).compress_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_compress_mode;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_compress_cache:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_COMPRESS_CACHE);</div><div class='add'>+		break;</div><div class='add'>+#else</div><div class='add'>+	case Opt_compress_algorithm:</div><div class='add'>+	case Opt_compress_log_size:</div><div class='add'>+	case Opt_compress_extension:</div><div class='add'>+	case Opt_nocompress_extension:</div><div class='add'>+	case Opt_compress_chksum:</div><div class='add'>+	case Opt_compress_mode:</div><div class='add'>+	case Opt_compress_cache:</div><div class='add'>+		f2fs_info(NULL, "compression options not supported");</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	case Opt_atgc:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_ATGC);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gc_merge:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx_clear_opt(ctx, F2FS_MOUNT_GC_MERGE);</div><div class='add'>+		else</div><div class='add'>+			ctx_set_opt(ctx, F2FS_MOUNT_GC_MERGE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_discard_unit:</div><div class='add'>+		F2FS_CTX_INFO(ctx).discard_unit = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_discard_unit;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_memory_mode:</div><div class='add'>+		F2FS_CTX_INFO(ctx).memory_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_memory_mode;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_age_extent_cache:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_AGE_EXTENT_CACHE);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_errors:</div><div class='add'>+		F2FS_CTX_INFO(ctx).errors = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_errors;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nat_bits:</div><div class='add'>+		ctx_set_opt(ctx, F2FS_MOUNT_NAT_BITS);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_lookup_mode:</div><div class='add'>+		F2FS_CTX_INFO(ctx).lookup_mode = result.uint_32;</div><div class='add'>+		ctx-&gt;spec_mask |= F2FS_SPEC_lookup_mode;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			strcpy(ext[ext_cnt], name);</div><div class='del'>-			F2FS_OPTION(sbi).compress_ext_cnt++;</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocompress_extension:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+/*</div><div class='add'>+ * Check quota settings consistency.</div><div class='add'>+ */</div><div class='add'>+static int f2fs_check_quota_consistency(struct fs_context *fc,</div><div class='add'>+					struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+ #ifdef CONFIG_QUOTA</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	bool quota_feature = f2fs_sb_has_quota_ino(sbi);</div><div class='add'>+	bool quota_turnon = sb_any_quota_loaded(sb);</div><div class='add'>+	char *old_qname, *new_qname;</div><div class='add'>+	bool usr_qf_name, grp_qf_name, prj_qf_name, usrquota, grpquota, prjquota;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-			noext = F2FS_OPTION(sbi).noextensions;</div><div class='del'>-			noext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;</div><div class='add'>+	/*</div><div class='add'>+	 * We do the test below only for project quotas. 'usrquota' and</div><div class='add'>+	 * 'grpquota' mount options are allowed even without quota feature</div><div class='add'>+	 * to support legacy quotas in quota files.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx_test_opt(ctx, F2FS_MOUNT_PRJQUOTA) &amp;&amp;</div><div class='add'>+			!f2fs_sb_has_project_quota(sbi)) {</div><div class='add'>+		f2fs_err(sbi, "Project quota feature not enabled. Cannot enable project quota enforcement.");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (strlen(name) &gt;= F2FS_EXTENSION_LEN ||</div><div class='del'>-				noext_cnt &gt;= COMPRESS_EXT_NUM) {</div><div class='del'>-				f2fs_err(sbi,</div><div class='del'>-					"invalid extension length/number");</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='add'>+	if (ctx-&gt;qname_mask) {</div><div class='add'>+		for (i = 0; i &lt; MAXQUOTAS; i++) {</div><div class='add'>+			if (!(ctx-&gt;qname_mask &amp; (1 &lt;&lt; i)))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-			if (is_compress_extension_exist(sbi, name, false)) {</div><div class='del'>-				kfree(name);</div><div class='del'>-				break;</div><div class='add'>+			old_qname = F2FS_OPTION(sbi).s_qf_names[i];</div><div class='add'>+			new_qname = F2FS_CTX_INFO(ctx).s_qf_names[i];</div><div class='add'>+			if (quota_turnon &amp;&amp;</div><div class='add'>+				!!old_qname != !!new_qname)</div><div class='add'>+				goto err_jquota_change;</div><div class='add'>+</div><div class='add'>+			if (old_qname) {</div><div class='add'>+				if (!new_qname) {</div><div class='add'>+					f2fs_info(sbi, "remove qf_name %s",</div><div class='add'>+								old_qname);</div><div class='add'>+					continue;</div><div class='add'>+				} else if (strcmp(old_qname, new_qname) == 0) {</div><div class='add'>+					ctx-&gt;qname_mask &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				goto err_jquota_specified;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			strcpy(noext[noext_cnt], name);</div><div class='del'>-			F2FS_OPTION(sbi).nocompress_ext_cnt++;</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_compress_chksum:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='add'>+			if (quota_feature) {</div><div class='add'>+				f2fs_info(sbi, "QUOTA feature is enabled, so ignore qf_name");</div><div class='add'>+				ctx-&gt;qname_mask &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+				kfree(F2FS_CTX_INFO(ctx).s_qf_names[i]);</div><div class='add'>+				F2FS_CTX_INFO(ctx).s_qf_names[i] = NULL;</div><div class='ctx'> 			}</div><div class='del'>-			F2FS_OPTION(sbi).compress_chksum = true;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_compress_mode:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "fs")) {</div><div class='del'>-				F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;</div><div class='del'>-			} else if (!strcmp(name, "user")) {</div><div class='del'>-				F2FS_OPTION(sbi).compress_mode = COMPR_MODE_USER;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_compress_cache:</div><div class='del'>-			if (!f2fs_sb_has_compression(sbi)) {</div><div class='del'>-				f2fs_info(sbi, "Image doesn't support compression");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			set_opt(sbi, COMPRESS_CACHE);</div><div class='del'>-			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure we don't mix old and new quota format */</div><div class='add'>+	usr_qf_name = F2FS_OPTION(sbi).s_qf_names[USRQUOTA] ||</div><div class='add'>+			F2FS_CTX_INFO(ctx).s_qf_names[USRQUOTA];</div><div class='add'>+	grp_qf_name = F2FS_OPTION(sbi).s_qf_names[GRPQUOTA] ||</div><div class='add'>+			F2FS_CTX_INFO(ctx).s_qf_names[GRPQUOTA];</div><div class='add'>+	prj_qf_name = F2FS_OPTION(sbi).s_qf_names[PRJQUOTA] ||</div><div class='add'>+			F2FS_CTX_INFO(ctx).s_qf_names[PRJQUOTA];</div><div class='add'>+	usrquota = test_opt(sbi, USRQUOTA) ||</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_USRQUOTA);</div><div class='add'>+	grpquota = test_opt(sbi, GRPQUOTA) ||</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_GRPQUOTA);</div><div class='add'>+	prjquota = test_opt(sbi, PRJQUOTA) ||</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_PRJQUOTA);</div><div class='add'>+</div><div class='add'>+	if (usr_qf_name) {</div><div class='add'>+		ctx_clear_opt(ctx, F2FS_MOUNT_USRQUOTA);</div><div class='add'>+		usrquota = false;</div><div class='add'>+	}</div><div class='add'>+	if (grp_qf_name) {</div><div class='add'>+		ctx_clear_opt(ctx, F2FS_MOUNT_GRPQUOTA);</div><div class='add'>+		grpquota = false;</div><div class='add'>+	}</div><div class='add'>+	if (prj_qf_name) {</div><div class='add'>+		ctx_clear_opt(ctx, F2FS_MOUNT_PRJQUOTA);</div><div class='add'>+		prjquota = false;</div><div class='add'>+	}</div><div class='add'>+	if (usr_qf_name || grp_qf_name || prj_qf_name) {</div><div class='add'>+		if (grpquota || usrquota || prjquota) {</div><div class='add'>+			f2fs_err(sbi, "old and new quota format mixing");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (!(ctx-&gt;spec_mask &amp; F2FS_SPEC_jqfmt ||</div><div class='add'>+				F2FS_OPTION(sbi).s_jquota_fmt)) {</div><div class='add'>+			f2fs_err(sbi, "journaled quota format not specified");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_jquota_change:</div><div class='add'>+	f2fs_err(sbi, "Cannot change journaled quota options when quota turned on");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+err_jquota_specified:</div><div class='add'>+	f2fs_err(sbi, "%s quota file already specified",</div><div class='add'>+		 QTYPE2NAME(i));</div><div class='add'>+	return -EINVAL;</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-		case Opt_compress_algorithm:</div><div class='del'>-		case Opt_compress_log_size:</div><div class='del'>-		case Opt_compress_extension:</div><div class='del'>-		case Opt_nocompress_extension:</div><div class='del'>-		case Opt_compress_chksum:</div><div class='del'>-		case Opt_compress_mode:</div><div class='del'>-		case Opt_compress_cache:</div><div class='del'>-			f2fs_info(sbi, "compression options not supported");</div><div class='del'>-			break;</div><div class='add'>+	if (f2fs_readonly(sbi-&gt;sb))</div><div class='add'>+		return 0;</div><div class='add'>+	if (f2fs_sb_has_quota_ino(sbi)) {</div><div class='add'>+		f2fs_info(sbi, "Filesystem with quota feature cannot be mounted RDWR without CONFIG_QUOTA");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (f2fs_sb_has_project_quota(sbi)) {</div><div class='add'>+		f2fs_err(sbi, "Filesystem with project quota feature cannot be mounted RDWR without CONFIG_QUOTA");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_atgc:</div><div class='del'>-			set_opt(sbi, ATGC);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gc_merge:</div><div class='del'>-			set_opt(sbi, GC_MERGE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nogc_merge:</div><div class='del'>-			clear_opt(sbi, GC_MERGE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_discard_unit:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "block")) {</div><div class='del'>-				F2FS_OPTION(sbi).discard_unit =</div><div class='del'>-						DISCARD_UNIT_BLOCK;</div><div class='del'>-			} else if (!strcmp(name, "segment")) {</div><div class='del'>-				F2FS_OPTION(sbi).discard_unit =</div><div class='del'>-						DISCARD_UNIT_SEGMENT;</div><div class='del'>-			} else if (!strcmp(name, "section")) {</div><div class='del'>-				F2FS_OPTION(sbi).discard_unit =</div><div class='del'>-						DISCARD_UNIT_SECTION;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_memory_mode:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "normal")) {</div><div class='del'>-				F2FS_OPTION(sbi).memory_mode =</div><div class='del'>-						MEMORY_MODE_NORMAL;</div><div class='del'>-			} else if (!strcmp(name, "low")) {</div><div class='del'>-				F2FS_OPTION(sbi).memory_mode =</div><div class='del'>-						MEMORY_MODE_LOW;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_check_test_dummy_encryption(struct fs_context *fc,</div><div class='add'>+					    struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+</div><div class='add'>+	if (!fscrypt_is_dummy_policy_set(&amp;F2FS_CTX_INFO(ctx).dummy_enc_policy))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_sb_has_encrypt(sbi)) {</div><div class='add'>+		f2fs_err(sbi, "Encrypt feature is off");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This mount option is just for testing, and it's not worthwhile to</div><div class='add'>+	 * implement the extra complexity (e.g. RCU protection) that would be</div><div class='add'>+	 * needed to allow it to be set or changed during remount.  We do allow</div><div class='add'>+	 * it to be specified during remount, but only if there is no change.</div><div class='add'>+	 */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		if (fscrypt_dummy_policies_equal(&amp;F2FS_OPTION(sbi).dummy_enc_policy,</div><div class='add'>+				&amp;F2FS_CTX_INFO(ctx).dummy_enc_policy))</div><div class='add'>+			return 0;</div><div class='add'>+		f2fs_warn(sbi, "Can't set or change test_dummy_encryption on remount");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool test_compression_spec(unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	return mask &amp; (F2FS_SPEC_compress_algorithm</div><div class='add'>+			| F2FS_SPEC_compress_log_size</div><div class='add'>+			| F2FS_SPEC_compress_extension</div><div class='add'>+			| F2FS_SPEC_nocompress_extension</div><div class='add'>+			| F2FS_SPEC_compress_chksum</div><div class='add'>+			| F2FS_SPEC_compress_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clear_compression_spec(struct f2fs_fs_context *ctx)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;spec_mask &amp;= ~(F2FS_SPEC_compress_algorithm</div><div class='add'>+						| F2FS_SPEC_compress_log_size</div><div class='add'>+						| F2FS_SPEC_compress_extension</div><div class='add'>+						| F2FS_SPEC_nocompress_extension</div><div class='add'>+						| F2FS_SPEC_compress_chksum</div><div class='add'>+						| F2FS_SPEC_compress_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_check_compression(struct fs_context *fc,</div><div class='add'>+				  struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	int i, cnt;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_sb_has_compression(sbi)) {</div><div class='add'>+		if (test_compression_spec(ctx-&gt;spec_mask) ||</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_COMPRESS_CACHE))</div><div class='add'>+			f2fs_info(sbi, "Image doesn't support compression");</div><div class='add'>+		clear_compression_spec(ctx);</div><div class='add'>+		ctx-&gt;opt_mask &amp;= ~BIT(F2FS_MOUNT_COMPRESS_CACHE);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_extension) {</div><div class='add'>+		cnt = F2FS_CTX_INFO(ctx).compress_ext_cnt;</div><div class='add'>+		for (i = 0; i &lt; F2FS_CTX_INFO(ctx).compress_ext_cnt; i++) {</div><div class='add'>+			if (is_compress_extension_exist(&amp;F2FS_OPTION(sbi),</div><div class='add'>+					F2FS_CTX_INFO(ctx).extensions[i], true)) {</div><div class='add'>+				F2FS_CTX_INFO(ctx).extensions[i][0] = '\0';</div><div class='add'>+				cnt--;</div><div class='ctx'> 			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_age_extent_cache:</div><div class='del'>-			set_opt(sbi, AGE_EXTENT_CACHE);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_errors:</div><div class='del'>-			name = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!name)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			if (!strcmp(name, "remount-ro")) {</div><div class='del'>-				F2FS_OPTION(sbi).errors =</div><div class='del'>-						MOUNT_ERRORS_READONLY;</div><div class='del'>-			} else if (!strcmp(name, "continue")) {</div><div class='del'>-				F2FS_OPTION(sbi).errors =</div><div class='del'>-						MOUNT_ERRORS_CONTINUE;</div><div class='del'>-			} else if (!strcmp(name, "panic")) {</div><div class='del'>-				F2FS_OPTION(sbi).errors =</div><div class='del'>-						MOUNT_ERRORS_PANIC;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (F2FS_OPTION(sbi).compress_ext_cnt + cnt &gt; COMPRESS_EXT_NUM) {</div><div class='add'>+			f2fs_err(sbi, "invalid extension length/number");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_nocompress_extension) {</div><div class='add'>+		cnt = F2FS_CTX_INFO(ctx).nocompress_ext_cnt;</div><div class='add'>+		for (i = 0; i &lt; F2FS_CTX_INFO(ctx).nocompress_ext_cnt; i++) {</div><div class='add'>+			if (is_compress_extension_exist(&amp;F2FS_OPTION(sbi),</div><div class='add'>+					F2FS_CTX_INFO(ctx).noextensions[i], false)) {</div><div class='add'>+				F2FS_CTX_INFO(ctx).noextensions[i][0] = '\0';</div><div class='add'>+				cnt--;</div><div class='ctx'> 			}</div><div class='del'>-			kfree(name);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			f2fs_err(sbi, "Unrecognized mount option \"%s\" or missing value",</div><div class='del'>-				 p);</div><div class='add'>+		}</div><div class='add'>+		if (F2FS_OPTION(sbi).nocompress_ext_cnt + cnt &gt; COMPRESS_EXT_NUM) {</div><div class='add'>+			f2fs_err(sbi, "invalid noextension length/number");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-default_check:</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	if (f2fs_check_quota_options(sbi))</div><div class='add'>+</div><div class='add'>+	if (f2fs_test_compress_extension(F2FS_CTX_INFO(ctx).noextensions,</div><div class='add'>+				F2FS_CTX_INFO(ctx).nocompress_ext_cnt,</div><div class='add'>+				F2FS_CTX_INFO(ctx).extensions,</div><div class='add'>+				F2FS_CTX_INFO(ctx).compress_ext_cnt)) {</div><div class='add'>+		f2fs_err(sbi, "new noextensions conflicts with new extensions");</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-#else</div><div class='del'>-	if (f2fs_sb_has_quota_ino(sbi) &amp;&amp; !f2fs_readonly(sbi-&gt;sb)) {</div><div class='del'>-		f2fs_info(sbi, "Filesystem with quota feature cannot be mounted RDWR without CONFIG_QUOTA");</div><div class='add'>+	}</div><div class='add'>+	if (f2fs_test_compress_extension(F2FS_CTX_INFO(ctx).noextensions,</div><div class='add'>+				F2FS_CTX_INFO(ctx).nocompress_ext_cnt,</div><div class='add'>+				F2FS_OPTION(sbi).extensions,</div><div class='add'>+				F2FS_OPTION(sbi).compress_ext_cnt)) {</div><div class='add'>+		f2fs_err(sbi, "new noextensions conflicts with old extensions");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (f2fs_sb_has_project_quota(sbi) &amp;&amp; !f2fs_readonly(sbi-&gt;sb)) {</div><div class='del'>-		f2fs_err(sbi, "Filesystem with project quota feature cannot be mounted RDWR without CONFIG_QUOTA");</div><div class='add'>+	if (f2fs_test_compress_extension(F2FS_OPTION(sbi).noextensions,</div><div class='add'>+				F2FS_OPTION(sbi).nocompress_ext_cnt,</div><div class='add'>+				F2FS_CTX_INFO(ctx).extensions,</div><div class='add'>+				F2FS_CTX_INFO(ctx).compress_ext_cnt)) {</div><div class='add'>+		f2fs_err(sbi, "new extensions conflicts with old noextensions");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-#if !IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (f2fs_sb_has_casefold(sbi)) {</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_check_opt_consistency(struct fs_context *fc,</div><div class='add'>+				      struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ctx_test_opt(ctx, F2FS_MOUNT_NORECOVERY) &amp;&amp; !f2fs_readonly(sb))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (f2fs_hw_should_discard(sbi) &amp;&amp;</div><div class='add'>+			(ctx-&gt;opt_mask &amp; BIT(F2FS_MOUNT_DISCARD)) &amp;&amp;</div><div class='add'>+			!ctx_test_opt(ctx, F2FS_MOUNT_DISCARD)) {</div><div class='add'>+		f2fs_warn(sbi, "discard is required for zoned block devices");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!f2fs_hw_support_discard(sbi) &amp;&amp;</div><div class='add'>+			(ctx-&gt;opt_mask &amp; BIT(F2FS_MOUNT_DISCARD)) &amp;&amp;</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_DISCARD)) {</div><div class='add'>+		f2fs_warn(sbi, "device does not support discard");</div><div class='add'>+		ctx_clear_opt(ctx, F2FS_MOUNT_DISCARD);</div><div class='add'>+		ctx-&gt;opt_mask &amp;= ~BIT(F2FS_MOUNT_DISCARD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (f2fs_sb_has_device_alias(sbi) &amp;&amp;</div><div class='add'>+			(ctx-&gt;opt_mask &amp; BIT(F2FS_MOUNT_READ_EXTENT_CACHE)) &amp;&amp;</div><div class='add'>+			!ctx_test_opt(ctx, F2FS_MOUNT_READ_EXTENT_CACHE)) {</div><div class='add'>+		f2fs_err(sbi, "device aliasing requires extent cache");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_opt(sbi, RESERVE_ROOT) &amp;&amp;</div><div class='add'>+			(ctx-&gt;opt_mask &amp; BIT(F2FS_MOUNT_RESERVE_ROOT)) &amp;&amp;</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_RESERVE_ROOT)) {</div><div class='add'>+		f2fs_info(sbi, "Preserve previous reserve_root=%u",</div><div class='add'>+			F2FS_OPTION(sbi).root_reserved_blocks);</div><div class='add'>+		ctx_clear_opt(ctx, F2FS_MOUNT_RESERVE_ROOT);</div><div class='add'>+		ctx-&gt;opt_mask &amp;= ~BIT(F2FS_MOUNT_RESERVE_ROOT);</div><div class='add'>+	}</div><div class='add'>+	if (test_opt(sbi, RESERVE_NODE) &amp;&amp;</div><div class='add'>+			(ctx-&gt;opt_mask &amp; BIT(F2FS_MOUNT_RESERVE_NODE)) &amp;&amp;</div><div class='add'>+			ctx_test_opt(ctx, F2FS_MOUNT_RESERVE_NODE)) {</div><div class='add'>+		f2fs_info(sbi, "Preserve previous reserve_node=%u",</div><div class='add'>+			F2FS_OPTION(sbi).root_reserved_nodes);</div><div class='add'>+		ctx_clear_opt(ctx, F2FS_MOUNT_RESERVE_NODE);</div><div class='add'>+		ctx-&gt;opt_mask &amp;= ~BIT(F2FS_MOUNT_RESERVE_NODE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = f2fs_check_test_dummy_encryption(fc, sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = f2fs_check_compression(fc, sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = f2fs_check_quota_consistency(fc, sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_UNICODE) &amp;&amp; f2fs_sb_has_casefold(sbi)) {</div><div class='ctx'> 		f2fs_err(sbi,</div><div class='ctx'> 			"Filesystem with casefold feature cannot be mounted without CONFIG_UNICODE");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The BLKZONED feature indicates that the drive was formatted with</div><div class='ctx'> 	 * zone alignment optimization. This is optional for host-aware</div><div class='ctx'> 	 * devices, but mandatory for host-managed zoned block devices.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi)) {</div><div class='add'>+		if (F2FS_CTX_INFO(ctx).bggc_mode == BGGC_MODE_OFF) {</div><div class='add'>+			f2fs_warn(sbi, "zoned devices need bggc");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-		if (F2FS_OPTION(sbi).discard_unit !=</div><div class='del'>-						DISCARD_UNIT_SECTION) {</div><div class='add'>+		if ((ctx-&gt;spec_mask &amp; F2FS_SPEC_discard_unit) &amp;&amp;</div><div class='add'>+		F2FS_CTX_INFO(ctx).discard_unit != DISCARD_UNIT_SECTION) {</div><div class='ctx'> 			f2fs_info(sbi, "Zoned block device doesn't need small discard, set discard_unit=section by default");</div><div class='del'>-			F2FS_OPTION(sbi).discard_unit =</div><div class='del'>-					DISCARD_UNIT_SECTION;</div><div class='add'>+			F2FS_CTX_INFO(ctx).discard_unit = DISCARD_UNIT_SECTION;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (F2FS_OPTION(sbi).fs_mode != FS_MODE_LFS) {</div><div class='add'>+		if ((ctx-&gt;spec_mask &amp; F2FS_SPEC_mode) &amp;&amp;</div><div class='add'>+		F2FS_CTX_INFO(ctx).fs_mode != FS_MODE_LFS) {</div><div class='ctx'> 			f2fs_info(sbi, "Only lfs mode is allowed with zoned block device feature");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1385,49 +1523,25 @@ default_check:</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-	if (f2fs_test_compress_extension(sbi)) {</div><div class='del'>-		f2fs_err(sbi, "invalid compress or nocompress extension");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (F2FS_IO_SIZE_BITS(sbi) &amp;&amp; !f2fs_lfs_mode(sbi)) {</div><div class='del'>-		f2fs_err(sbi, "Should set mode=lfs with %luKB-sized IO",</div><div class='del'>-			 F2FS_IO_SIZE_KB(sbi));</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_opt(sbi, INLINE_XATTR_SIZE)) {</div><div class='del'>-		int min_size, max_size;</div><div class='del'>-</div><div class='add'>+	if (ctx_test_opt(ctx, F2FS_MOUNT_INLINE_XATTR_SIZE)) {</div><div class='ctx'> 		if (!f2fs_sb_has_extra_attr(sbi) ||</div><div class='ctx'> 			!f2fs_sb_has_flexible_inline_xattr(sbi)) {</div><div class='ctx'> 			f2fs_err(sbi, "extra_attr or flexible_inline_xattr feature is off");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (!test_opt(sbi, INLINE_XATTR)) {</div><div class='add'>+		if (!ctx_test_opt(ctx, F2FS_MOUNT_INLINE_XATTR) &amp;&amp; !test_opt(sbi, INLINE_XATTR)) {</div><div class='ctx'> 			f2fs_err(sbi, "inline_xattr_size option should be set with inline_xattr option");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		min_size = MIN_INLINE_XATTR_SIZE;</div><div class='del'>-		max_size = MAX_INLINE_XATTR_SIZE;</div><div class='del'>-</div><div class='del'>-		if (F2FS_OPTION(sbi).inline_xattr_size &lt; min_size ||</div><div class='del'>-				F2FS_OPTION(sbi).inline_xattr_size &gt; max_size) {</div><div class='del'>-			f2fs_err(sbi, "inline xattr size is out of range: %d ~ %d",</div><div class='del'>-				 min_size, max_size);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_opt(sbi, ATGC) &amp;&amp; f2fs_lfs_mode(sbi)) {</div><div class='add'>+	if (ctx_test_opt(ctx, F2FS_MOUNT_ATGC) &amp;&amp;</div><div class='add'>+	    F2FS_CTX_INFO(ctx).fs_mode == FS_MODE_LFS) {</div><div class='ctx'> 		f2fs_err(sbi, "LFS is not compatible with ATGC");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f2fs_is_readonly(sbi) &amp;&amp; test_opt(sbi, FLUSH_MERGE)) {</div><div class='add'>+	if (f2fs_is_readonly(sbi) &amp;&amp; ctx_test_opt(ctx, F2FS_MOUNT_FLUSH_MERGE)) {</div><div class='ctx'> 		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1439,6 +1553,195 @@ default_check:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void f2fs_apply_quota_options(struct fs_context *fc,</div><div class='add'>+				     struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_QUOTA</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	bool quota_feature = f2fs_sb_has_quota_ino(sbi);</div><div class='add'>+	char *qname;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (quota_feature)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAXQUOTAS; i++) {</div><div class='add'>+		if (!(ctx-&gt;qname_mask &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		qname = F2FS_CTX_INFO(ctx).s_qf_names[i];</div><div class='add'>+		if (qname) {</div><div class='add'>+			qname = kstrdup(F2FS_CTX_INFO(ctx).s_qf_names[i],</div><div class='add'>+					GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+			set_opt(sbi, QUOTA);</div><div class='add'>+		}</div><div class='add'>+		F2FS_OPTION(sbi).s_qf_names[i] = qname;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_jqfmt)</div><div class='add'>+		F2FS_OPTION(sbi).s_jquota_fmt = F2FS_CTX_INFO(ctx).s_jquota_fmt;</div><div class='add'>+</div><div class='add'>+	if (quota_feature &amp;&amp; F2FS_OPTION(sbi).s_jquota_fmt) {</div><div class='add'>+		f2fs_info(sbi, "QUOTA feature is enabled, so ignore jquota_fmt");</div><div class='add'>+		F2FS_OPTION(sbi).s_jquota_fmt = 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f2fs_apply_test_dummy_encryption(struct fs_context *fc,</div><div class='add'>+					     struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+</div><div class='add'>+	if (!fscrypt_is_dummy_policy_set(&amp;F2FS_CTX_INFO(ctx).dummy_enc_policy) ||</div><div class='add'>+		/* if already set, it was already verified to be the same */</div><div class='add'>+		fscrypt_is_dummy_policy_set(&amp;F2FS_OPTION(sbi).dummy_enc_policy))</div><div class='add'>+		return;</div><div class='add'>+	swap(F2FS_OPTION(sbi).dummy_enc_policy, F2FS_CTX_INFO(ctx).dummy_enc_policy);</div><div class='add'>+	f2fs_warn(sbi, "Test dummy encryption mode enabled");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f2fs_apply_compression(struct fs_context *fc,</div><div class='add'>+				   struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	unsigned char (*ctx_ext)[F2FS_EXTENSION_LEN];</div><div class='add'>+	unsigned char (*sbi_ext)[F2FS_EXTENSION_LEN];</div><div class='add'>+	int ctx_cnt, sbi_cnt, i;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_level)</div><div class='add'>+		F2FS_OPTION(sbi).compress_level =</div><div class='add'>+					F2FS_CTX_INFO(ctx).compress_level;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_algorithm)</div><div class='add'>+		F2FS_OPTION(sbi).compress_algorithm =</div><div class='add'>+					F2FS_CTX_INFO(ctx).compress_algorithm;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_log_size)</div><div class='add'>+		F2FS_OPTION(sbi).compress_log_size =</div><div class='add'>+					F2FS_CTX_INFO(ctx).compress_log_size;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_chksum)</div><div class='add'>+		F2FS_OPTION(sbi).compress_chksum =</div><div class='add'>+					F2FS_CTX_INFO(ctx).compress_chksum;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_mode)</div><div class='add'>+		F2FS_OPTION(sbi).compress_mode =</div><div class='add'>+					F2FS_CTX_INFO(ctx).compress_mode;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_compress_extension) {</div><div class='add'>+		ctx_ext = F2FS_CTX_INFO(ctx).extensions;</div><div class='add'>+		ctx_cnt = F2FS_CTX_INFO(ctx).compress_ext_cnt;</div><div class='add'>+		sbi_ext = F2FS_OPTION(sbi).extensions;</div><div class='add'>+		sbi_cnt = F2FS_OPTION(sbi).compress_ext_cnt;</div><div class='add'>+		for (i = 0; i &lt; ctx_cnt; i++) {</div><div class='add'>+			if (strlen(ctx_ext[i]) == 0)</div><div class='add'>+				continue;</div><div class='add'>+			strscpy(sbi_ext[sbi_cnt], ctx_ext[i]);</div><div class='add'>+			sbi_cnt++;</div><div class='add'>+		}</div><div class='add'>+		F2FS_OPTION(sbi).compress_ext_cnt = sbi_cnt;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_nocompress_extension) {</div><div class='add'>+		ctx_ext = F2FS_CTX_INFO(ctx).noextensions;</div><div class='add'>+		ctx_cnt = F2FS_CTX_INFO(ctx).nocompress_ext_cnt;</div><div class='add'>+		sbi_ext = F2FS_OPTION(sbi).noextensions;</div><div class='add'>+		sbi_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;</div><div class='add'>+		for (i = 0; i &lt; ctx_cnt; i++) {</div><div class='add'>+			if (strlen(ctx_ext[i]) == 0)</div><div class='add'>+				continue;</div><div class='add'>+			strscpy(sbi_ext[sbi_cnt], ctx_ext[i]);</div><div class='add'>+			sbi_cnt++;</div><div class='add'>+		}</div><div class='add'>+		F2FS_OPTION(sbi).nocompress_ext_cnt = sbi_cnt;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f2fs_apply_options(struct fs_context *fc, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+</div><div class='add'>+	F2FS_OPTION(sbi).opt &amp;= ~ctx-&gt;opt_mask;</div><div class='add'>+	F2FS_OPTION(sbi).opt |= F2FS_CTX_INFO(ctx).opt;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_background_gc)</div><div class='add'>+		F2FS_OPTION(sbi).bggc_mode = F2FS_CTX_INFO(ctx).bggc_mode;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_inline_xattr_size)</div><div class='add'>+		F2FS_OPTION(sbi).inline_xattr_size =</div><div class='add'>+					F2FS_CTX_INFO(ctx).inline_xattr_size;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_active_logs)</div><div class='add'>+		F2FS_OPTION(sbi).active_logs = F2FS_CTX_INFO(ctx).active_logs;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_reserve_root)</div><div class='add'>+		F2FS_OPTION(sbi).root_reserved_blocks =</div><div class='add'>+					F2FS_CTX_INFO(ctx).root_reserved_blocks;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_reserve_node)</div><div class='add'>+		F2FS_OPTION(sbi).root_reserved_nodes =</div><div class='add'>+					F2FS_CTX_INFO(ctx).root_reserved_nodes;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_resgid)</div><div class='add'>+		F2FS_OPTION(sbi).s_resgid = F2FS_CTX_INFO(ctx).s_resgid;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_resuid)</div><div class='add'>+		F2FS_OPTION(sbi).s_resuid = F2FS_CTX_INFO(ctx).s_resuid;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_mode)</div><div class='add'>+		F2FS_OPTION(sbi).fs_mode = F2FS_CTX_INFO(ctx).fs_mode;</div><div class='add'>+#ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_fault_injection)</div><div class='add'>+		(void)f2fs_build_fault_attr(sbi,</div><div class='add'>+		F2FS_CTX_INFO(ctx).fault_info.inject_rate, 0, FAULT_RATE);</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_fault_type)</div><div class='add'>+		(void)f2fs_build_fault_attr(sbi, 0,</div><div class='add'>+			F2FS_CTX_INFO(ctx).fault_info.inject_type, FAULT_TYPE);</div><div class='add'>+#endif</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_alloc_mode)</div><div class='add'>+		F2FS_OPTION(sbi).alloc_mode = F2FS_CTX_INFO(ctx).alloc_mode;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_fsync_mode)</div><div class='add'>+		F2FS_OPTION(sbi).fsync_mode = F2FS_CTX_INFO(ctx).fsync_mode;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_checkpoint_disable_cap)</div><div class='add'>+		F2FS_OPTION(sbi).unusable_cap = F2FS_CTX_INFO(ctx).unusable_cap;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_checkpoint_disable_cap_perc)</div><div class='add'>+		F2FS_OPTION(sbi).unusable_cap_perc =</div><div class='add'>+					F2FS_CTX_INFO(ctx).unusable_cap_perc;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_discard_unit)</div><div class='add'>+		F2FS_OPTION(sbi).discard_unit = F2FS_CTX_INFO(ctx).discard_unit;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_memory_mode)</div><div class='add'>+		F2FS_OPTION(sbi).memory_mode = F2FS_CTX_INFO(ctx).memory_mode;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_errors)</div><div class='add'>+		F2FS_OPTION(sbi).errors = F2FS_CTX_INFO(ctx).errors;</div><div class='add'>+	if (ctx-&gt;spec_mask &amp; F2FS_SPEC_lookup_mode)</div><div class='add'>+		F2FS_OPTION(sbi).lookup_mode = F2FS_CTX_INFO(ctx).lookup_mode;</div><div class='add'>+</div><div class='add'>+	f2fs_apply_compression(fc, sb);</div><div class='add'>+	f2fs_apply_test_dummy_encryption(fc, sb);</div><div class='add'>+	f2fs_apply_quota_options(fc, sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_sanity_check_options(struct f2fs_sb_info *sbi, bool remount)</div><div class='add'>+{</div><div class='add'>+	if (f2fs_sb_has_device_alias(sbi) &amp;&amp;</div><div class='add'>+	    !test_opt(sbi, READ_EXTENT_CACHE)) {</div><div class='add'>+		f2fs_err(sbi, "device aliasing requires extent cache");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!remount)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+	if (f2fs_sb_has_blkzoned(sbi) &amp;&amp;</div><div class='add'>+	    sbi-&gt;max_open_zones &lt; F2FS_OPTION(sbi).active_logs) {</div><div class='add'>+		f2fs_err(sbi,</div><div class='add'>+			"zoned: max open zones %u is too small, need at least %u open zones",</div><div class='add'>+				 sbi-&gt;max_open_zones, F2FS_OPTION(sbi).active_logs);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (f2fs_lfs_mode(sbi) &amp;&amp; !IS_F2FS_IPU_DISABLE(sbi)) {</div><div class='add'>+		f2fs_warn(sbi, "LFS is not compatible with IPU");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct inode *f2fs_alloc_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_inode_info *fi;</div><div class='hunk'>@@ -1455,10 +1758,13 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	/* Initialize f2fs-specific inode info */</div><div class='ctx'> 	atomic_set(&amp;fi-&gt;dirty_pages, 0);</div><div class='ctx'> 	atomic_set(&amp;fi-&gt;i_compr_blocks, 0);</div><div class='add'>+	atomic_set(&amp;fi-&gt;open_count, 0);</div><div class='add'>+	atomic_set(&amp;fi-&gt;writeback, 0);</div><div class='ctx'> 	init_f2fs_rwsem(&amp;fi-&gt;i_sem);</div><div class='ctx'> 	spin_lock_init(&amp;fi-&gt;i_size_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;dirty_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;gdirty_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;fi-&gt;gdonate_list);</div><div class='ctx'> 	init_f2fs_rwsem(&amp;fi-&gt;i_gc_rwsem[READ]);</div><div class='ctx'> 	init_f2fs_rwsem(&amp;fi-&gt;i_gc_rwsem[WRITE]);</div><div class='ctx'> 	init_f2fs_rwsem(&amp;fi-&gt;i_xattr_sem);</div><div class='hunk'>@@ -1493,10 +1799,10 @@ static int f2fs_drop_inode(struct inode *inode)</div><div class='ctx'> 	 *    - f2fs_gc -&gt; iput -&gt; evict</div><div class='ctx'> 	 *       - inode_wait_for_writeback(inode)</div><div class='ctx'> 	 */</div><div class='del'>-	if ((!inode_unhashed(inode) &amp;&amp; inode-&gt;i_state &amp; I_SYNC)) {</div><div class='add'>+	if ((!inode_unhashed(inode) &amp;&amp; inode_state_read(inode) &amp; I_SYNC)) {</div><div class='ctx'> 		if (!inode-&gt;i_nlink &amp;&amp; !is_bad_inode(inode)) {</div><div class='ctx'> 			/* to avoid evict_inode call simultaneously */</div><div class='del'>-			atomic_inc(&amp;inode-&gt;i_count);</div><div class='add'>+			__iget(inode);</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 			/* should remain fi-&gt;extent_tree for writepage */</div><div class='hunk'>@@ -1520,7 +1826,7 @@ static int f2fs_drop_inode(struct inode *inode)</div><div class='ctx'> 		trace_f2fs_drop_inode(inode, 0);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	ret = generic_drop_inode(inode);</div><div class='add'>+	ret = inode_generic_drop(inode);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = fscrypt_drop_inode(inode);</div><div class='ctx'> 	trace_f2fs_drop_inode(inode, ret);</div><div class='hunk'>@@ -1545,6 +1851,12 @@ int f2fs_inode_dirtied(struct inode *inode, bool sync)</div><div class='ctx'> 		inc_page_count(sbi, F2FS_DIRTY_IMETA);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;inode_lock[DIRTY_META]);</div><div class='add'>+</div><div class='add'>+	/* if atomic write is not committed, set inode w/ atomic dirty */</div><div class='add'>+	if (!ret &amp;&amp; f2fs_is_atomic_file(inode) &amp;&amp;</div><div class='add'>+			!is_inode_flag_set(inode, FI_ATOMIC_COMMITTED))</div><div class='add'>+		set_inode_flag(inode, FI_ATOMIC_DIRTIED);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1605,7 +1917,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sbi-&gt;s_ndevs; i++) {</div><div class='ctx'> 		if (i &gt; 0)</div><div class='del'>-			fput(FDEV(i).bdev_file);</div><div class='add'>+			bdev_fput(FDEV(i).bdev_file);</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 		kvfree(FDEV(i).blkz_seq);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1677,14 +1989,6 @@ static void f2fs_put_super(struct super_block *sb)</div><div class='ctx'> 		truncate_inode_pages_final(META_MAPPING(sbi));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NR_COUNT_TYPE; i++) {</div><div class='del'>-		if (!get_pages(sbi, i))</div><div class='del'>-			continue;</div><div class='del'>-		f2fs_err(sbi, "detect filesystem reference count leak during "</div><div class='del'>-			"umount, type: %d, count: %lld", i, get_pages(sbi, i));</div><div class='del'>-		f2fs_bug_on(sbi, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	f2fs_bug_on(sbi, sbi-&gt;fsync_node_num);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_destroy_compress_inode(sbi);</div><div class='hunk'>@@ -1695,6 +1999,15 @@ static void f2fs_put_super(struct super_block *sb)</div><div class='ctx'> 	iput(sbi-&gt;meta_inode);</div><div class='ctx'> 	sbi-&gt;meta_inode = NULL;</div><div class='ctx'> </div><div class='add'>+	/* Should check the page counts after dropping all node/meta pages */</div><div class='add'>+	for (i = 0; i &lt; NR_COUNT_TYPE; i++) {</div><div class='add'>+		if (!get_pages(sbi, i))</div><div class='add'>+			continue;</div><div class='add'>+		f2fs_err(sbi, "detect filesystem reference count leak during "</div><div class='add'>+			"umount, type: %d, count: %lld", i, get_pages(sbi, i));</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * iput() can update stat information, if f2fs_write_checkpoint()</div><div class='ctx'> 	 * above failed with error.</div><div class='hunk'>@@ -1712,13 +2025,9 @@ static void f2fs_put_super(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	kvfree(sbi-&gt;ckpt);</div><div class='ctx'> </div><div class='del'>-	if (sbi-&gt;s_chksum_driver)</div><div class='del'>-		crypto_free_shash(sbi-&gt;s_chksum_driver);</div><div class='ctx'> 	kfree(sbi-&gt;raw_super);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_destroy_page_array_cache(sbi);</div><div class='del'>-	f2fs_destroy_xattr_caches(sbi);</div><div class='del'>-	mempool_destroy(sbi-&gt;write_io_dummy);</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	for (i = 0; i &lt; MAXQUOTAS; i++)</div><div class='ctx'> 		kfree(F2FS_OPTION(sbi).s_qf_names[i]);</div><div class='hunk'>@@ -1727,7 +2036,7 @@ static void f2fs_put_super(struct super_block *sb)</div><div class='ctx'> 	destroy_percpu_info(sbi);</div><div class='ctx'> 	f2fs_destroy_iostat(sbi);</div><div class='ctx'> 	for (i = 0; i &lt; NR_PAGE_TYPE; i++)</div><div class='del'>-		kvfree(sbi-&gt;write_io[i]);</div><div class='add'>+		kfree(sbi-&gt;write_io[i]);</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	utf8_unload(sb-&gt;s_encoding);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1758,27 +2067,45 @@ int f2fs_sync_fs(struct super_block *sb, int sync)</div><div class='ctx'> </div><div class='ctx'> static int f2fs_freeze(struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+</div><div class='ctx'> 	if (f2fs_readonly(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* IO error happened before */</div><div class='del'>-	if (unlikely(f2fs_cp_error(F2FS_SB(sb))))</div><div class='add'>+	if (unlikely(f2fs_cp_error(sbi)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* must be clean, since sync_filesystem() was already called */</div><div class='del'>-	if (is_sbi_flag_set(F2FS_SB(sb), SBI_IS_DIRTY))</div><div class='add'>+	if (is_sbi_flag_set(sbi, SBI_IS_DIRTY))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;umount_lock_holder = current;</div><div class='add'>+</div><div class='ctx'> 	/* Let's flush checkpoints and stop the thread. */</div><div class='del'>-	f2fs_flush_ckpt_thread(F2FS_SB(sb));</div><div class='add'>+	f2fs_flush_ckpt_thread(sbi);</div><div class='add'>+</div><div class='add'>+	sbi-&gt;umount_lock_holder = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* to avoid deadlock on f2fs_evict_inode-&gt;SB_FREEZE_FS */</div><div class='del'>-	set_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING);</div><div class='add'>+	set_sbi_flag(sbi, SBI_IS_FREEZING);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_unfreeze(struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It will update discard_max_bytes of mounted lvm device to zero</div><div class='add'>+	 * after creating snapshot on this lvm device, let's drop all</div><div class='add'>+	 * remained discards.</div><div class='add'>+	 * We don't need to disable real-time discard because discard_max_bytes</div><div class='add'>+	 * will recover after removal of snapshot.</div><div class='add'>+	 */</div><div class='add'>+	if (test_opt(sbi, DISCARD) &amp;&amp; !f2fs_hw_support_discard(sbi))</div><div class='add'>+		f2fs_issue_discard_timeout(sbi);</div><div class='add'>+</div><div class='ctx'> 	clear_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1800,26 +2127,32 @@ static int f2fs_statfs_project(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	limit = min_not_zero(dquot-&gt;dq_dqb.dqb_bsoftlimit,</div><div class='ctx'> 					dquot-&gt;dq_dqb.dqb_bhardlimit);</div><div class='del'>-	if (limit)</div><div class='del'>-		limit &gt;&gt;= sb-&gt;s_blocksize_bits;</div><div class='add'>+	limit &gt;&gt;= sb-&gt;s_blocksize_bits;</div><div class='add'>+</div><div class='add'>+	if (limit) {</div><div class='add'>+		uint64_t remaining = 0;</div><div class='ctx'> </div><div class='del'>-	if (limit &amp;&amp; buf-&gt;f_blocks &gt; limit) {</div><div class='ctx'> 		curblock = (dquot-&gt;dq_dqb.dqb_curspace +</div><div class='ctx'> 			    dquot-&gt;dq_dqb.dqb_rsvspace) &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='del'>-		buf-&gt;f_blocks = limit;</div><div class='del'>-		buf-&gt;f_bfree = buf-&gt;f_bavail =</div><div class='del'>-			(buf-&gt;f_blocks &gt; curblock) ?</div><div class='del'>-			 (buf-&gt;f_blocks - curblock) : 0;</div><div class='add'>+		if (limit &gt; curblock)</div><div class='add'>+			remaining = limit - curblock;</div><div class='add'>+</div><div class='add'>+		buf-&gt;f_blocks = min(buf-&gt;f_blocks, limit);</div><div class='add'>+		buf-&gt;f_bfree = min(buf-&gt;f_bfree, remaining);</div><div class='add'>+		buf-&gt;f_bavail = min(buf-&gt;f_bavail, remaining);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	limit = min_not_zero(dquot-&gt;dq_dqb.dqb_isoftlimit,</div><div class='ctx'> 					dquot-&gt;dq_dqb.dqb_ihardlimit);</div><div class='ctx'> </div><div class='del'>-	if (limit &amp;&amp; buf-&gt;f_files &gt; limit) {</div><div class='del'>-		buf-&gt;f_files = limit;</div><div class='del'>-		buf-&gt;f_ffree =</div><div class='del'>-			(buf-&gt;f_files &gt; dquot-&gt;dq_dqb.dqb_curinodes) ?</div><div class='del'>-			 (buf-&gt;f_files - dquot-&gt;dq_dqb.dqb_curinodes) : 0;</div><div class='add'>+	if (limit) {</div><div class='add'>+		uint64_t remaining = 0;</div><div class='add'>+</div><div class='add'>+		if (limit &gt; dquot-&gt;dq_dqb.dqb_curinodes)</div><div class='add'>+			remaining = limit - dquot-&gt;dq_dqb.dqb_curinodes;</div><div class='add'>+</div><div class='add'>+		buf-&gt;f_files = min(buf-&gt;f_files, limit);</div><div class='add'>+		buf-&gt;f_ffree = min(buf-&gt;f_ffree, remaining);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='hunk'>@@ -1845,7 +2178,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	buf-&gt;f_blocks = total_count - start_count;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='del'>-</div><div class='add'>+	if (sbi-&gt;carve_out)</div><div class='add'>+		buf-&gt;f_blocks -= sbi-&gt;current_reserved_blocks;</div><div class='ctx'> 	user_block_count = sbi-&gt;user_block_count;</div><div class='ctx'> 	total_valid_node_count = valid_node_count(sbi);</div><div class='ctx'> 	avail_node_count = sbi-&gt;total_node_count - F2FS_RESERVED_NODE_NUM;</div><div class='hunk'>@@ -1877,9 +2211,9 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	buf-&gt;f_fsid    = u64_to_fsid(id);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-	if (is_inode_flag_set(dentry-&gt;d_inode, FI_PROJ_INHERIT) &amp;&amp;</div><div class='add'>+	if (is_inode_flag_set(d_inode(dentry), FI_PROJ_INHERIT) &amp;&amp;</div><div class='ctx'> 			sb_has_quota_limits_enabled(sb, PRJQUOTA)) {</div><div class='del'>-		f2fs_statfs_project(sb, F2FS_I(dentry-&gt;d_inode)-&gt;i_projid, buf);</div><div class='add'>+		f2fs_statfs_project(sb, F2FS_I(d_inode(dentry))-&gt;i_projid, buf);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2009,10 +2343,6 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		seq_puts(seq, ",nodiscard");</div><div class='ctx'> 	}</div><div class='del'>-	if (test_opt(sbi, NOHEAP))</div><div class='del'>-		seq_puts(seq, ",no_heap");</div><div class='del'>-	else</div><div class='del'>-		seq_puts(seq, ",heap");</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_XATTR</div><div class='ctx'> 	if (test_opt(sbi, XATTR_USER))</div><div class='ctx'> 		seq_puts(seq, ",user_xattr");</div><div class='hunk'>@@ -2071,16 +2401,15 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> 	else if (F2FS_OPTION(sbi).fs_mode == FS_MODE_FRAGMENT_BLK)</div><div class='ctx'> 		seq_puts(seq, "fragment:block");</div><div class='ctx'> 	seq_printf(seq, ",active_logs=%u", F2FS_OPTION(sbi).active_logs);</div><div class='del'>-	if (test_opt(sbi, RESERVE_ROOT))</div><div class='del'>-		seq_printf(seq, ",reserve_root=%u,resuid=%u,resgid=%u",</div><div class='add'>+	if (test_opt(sbi, RESERVE_ROOT) || test_opt(sbi, RESERVE_NODE))</div><div class='add'>+		seq_printf(seq, ",reserve_root=%u,reserve_node=%u,resuid=%u,"</div><div class='add'>+				"resgid=%u",</div><div class='ctx'> 				F2FS_OPTION(sbi).root_reserved_blocks,</div><div class='add'>+				F2FS_OPTION(sbi).root_reserved_nodes,</div><div class='ctx'> 				from_kuid_munged(&amp;init_user_ns,</div><div class='ctx'> 					F2FS_OPTION(sbi).s_resuid),</div><div class='ctx'> 				from_kgid_munged(&amp;init_user_ns,</div><div class='ctx'> 					F2FS_OPTION(sbi).s_resgid));</div><div class='del'>-	if (F2FS_IO_SIZE_BITS(sbi))</div><div class='del'>-		seq_printf(seq, ",io_bits=%u",</div><div class='del'>-				F2FS_OPTION(sbi).write_io_size_bits);</div><div class='ctx'> #ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='ctx'> 	if (test_opt(sbi, FAULT_INJECTION)) {</div><div class='ctx'> 		seq_printf(seq, ",fault_injection=%u",</div><div class='hunk'>@@ -2144,6 +2473,16 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> 	else if (F2FS_OPTION(sbi).errors == MOUNT_ERRORS_PANIC)</div><div class='ctx'> 		seq_printf(seq, ",errors=%s", "panic");</div><div class='ctx'> </div><div class='add'>+	if (test_opt(sbi, NAT_BITS))</div><div class='add'>+		seq_puts(seq, ",nat_bits");</div><div class='add'>+</div><div class='add'>+	if (F2FS_OPTION(sbi).lookup_mode == LOOKUP_PERF)</div><div class='add'>+		seq_show_option(seq, "lookup_mode", "perf");</div><div class='add'>+	else if (F2FS_OPTION(sbi).lookup_mode == LOOKUP_COMPAT)</div><div class='add'>+		seq_show_option(seq, "lookup_mode", "compat");</div><div class='add'>+	else if (F2FS_OPTION(sbi).lookup_mode == LOOKUP_AUTO)</div><div class='add'>+		seq_show_option(seq, "lookup_mode", "auto");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2187,15 +2526,12 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount)</div><div class='ctx'> 	F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL;</div><div class='ctx'> 	F2FS_OPTION(sbi).errors = MOUNT_ERRORS_CONTINUE;</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;sb-&gt;s_flags &amp;= ~SB_INLINECRYPT;</div><div class='del'>-</div><div class='ctx'> 	set_opt(sbi, INLINE_XATTR);</div><div class='ctx'> 	set_opt(sbi, INLINE_DATA);</div><div class='ctx'> 	set_opt(sbi, INLINE_DENTRY);</div><div class='del'>-	set_opt(sbi, NOHEAP);</div><div class='ctx'> 	set_opt(sbi, MERGE_CHECKPOINT);</div><div class='add'>+	set_opt(sbi, LAZYTIME);</div><div class='ctx'> 	F2FS_OPTION(sbi).unusable_cap = 0;</div><div class='del'>-	sbi-&gt;sb-&gt;s_flags |= SB_LAZYTIME;</div><div class='ctx'> 	if (!f2fs_is_readonly(sbi))</div><div class='ctx'> 		set_opt(sbi, FLUSH_MERGE);</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi))</div><div class='hunk'>@@ -2210,7 +2546,9 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount)</div><div class='ctx'> 	set_opt(sbi, POSIX_ACL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	f2fs_build_fault_attr(sbi, 0, 0);</div><div class='add'>+	f2fs_build_fault_attr(sbi, 0, 0, FAULT_ALL);</div><div class='add'>+</div><div class='add'>+	F2FS_OPTION(sbi).lookup_mode = LOOKUP_PERF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='hunk'>@@ -2247,6 +2585,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> 			.init_gc_type = FG_GC,</div><div class='ctx'> 			.should_migrate_blocks = false,</div><div class='ctx'> 			.err_gc_skipped = true,</div><div class='add'>+			.no_bg_gc = true,</div><div class='ctx'> 			.nr_free_secs = 1 };</div><div class='ctx'> </div><div class='ctx'> 		f2fs_down_write(&amp;sbi-&gt;gc_lock);</div><div class='hunk'>@@ -2290,21 +2629,48 @@ out_unlock:</div><div class='ctx'> restore_flag:</div><div class='ctx'> 	sbi-&gt;gc_mode = gc_mode;</div><div class='ctx'> 	sbi-&gt;sb-&gt;s_flags = s_flags;	/* Restore SB_RDONLY status */</div><div class='add'>+	f2fs_info(sbi, "f2fs_disable_checkpoint() finish, err:%d", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)</div><div class='add'>+static int f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='del'>-	int retry = DEFAULT_RETRY_IO_COUNT;</div><div class='add'>+	unsigned int nr_pages = get_pages(sbi, F2FS_DIRTY_DATA) / 16;</div><div class='add'>+	long long start, writeback, lock, sync_inode, end;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	f2fs_info(sbi, "%s start, meta: %lld, node: %lld, data: %lld",</div><div class='add'>+					__func__,</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_META),</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_NODES),</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_DATA));</div><div class='add'>+</div><div class='add'>+	f2fs_update_time(sbi, ENABLE_TIME);</div><div class='add'>+</div><div class='add'>+	start = ktime_get();</div><div class='ctx'> </div><div class='ctx'> 	/* we should flush all the data to keep data consistency */</div><div class='del'>-	do {</div><div class='add'>+	while (get_pages(sbi, F2FS_DIRTY_DATA)) {</div><div class='add'>+		writeback_inodes_sb_nr(sbi-&gt;sb, nr_pages, WB_REASON_SYNC);</div><div class='add'>+		f2fs_io_schedule_timeout(DEFAULT_SCHEDULE_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		if (f2fs_time_over(sbi, ENABLE_TIME))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	writeback = ktime_get();</div><div class='add'>+</div><div class='add'>+	f2fs_down_write(&amp;sbi-&gt;cp_enable_rwsem);</div><div class='add'>+</div><div class='add'>+	lock = ktime_get();</div><div class='add'>+</div><div class='add'>+	if (get_pages(sbi, F2FS_DIRTY_DATA))</div><div class='ctx'> 		sync_inodes_sb(sbi-&gt;sb);</div><div class='del'>-		f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='del'>-	} while (get_pages(sbi, F2FS_DIRTY_DATA) &amp;&amp; retry--);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(retry &lt; 0))</div><div class='del'>-		f2fs_warn(sbi, "checkpoint=enable has some unwritten data.");</div><div class='add'>+	if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA)))</div><div class='add'>+		f2fs_warn(sbi, "%s: has some unwritten data: %lld",</div><div class='add'>+			__func__, get_pages(sbi, F2FS_DIRTY_DATA));</div><div class='add'>+</div><div class='add'>+	sync_inode = ktime_get();</div><div class='ctx'> </div><div class='ctx'> 	f2fs_down_write(&amp;sbi-&gt;gc_lock);</div><div class='ctx'> 	f2fs_dirty_to_prefree(sbi);</div><div class='hunk'>@@ -2313,17 +2679,40 @@ static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	set_sbi_flag(sbi, SBI_IS_DIRTY);</div><div class='ctx'> 	f2fs_up_write(&amp;sbi-&gt;gc_lock);</div><div class='ctx'> </div><div class='del'>-	f2fs_sync_fs(sbi-&gt;sb, 1);</div><div class='add'>+	f2fs_info(sbi, "%s sync_fs, meta: %lld, imeta: %lld, node: %lld, dents: %lld, qdata: %lld",</div><div class='add'>+					__func__,</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_META),</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_IMETA),</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_NODES),</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_DENTS),</div><div class='add'>+					get_pages(sbi, F2FS_DIRTY_QDATA));</div><div class='add'>+	ret = f2fs_sync_fs(sbi-&gt;sb, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		f2fs_err(sbi, "%s sync_fs failed, ret: %d", __func__, ret);</div><div class='ctx'> </div><div class='ctx'> 	/* Let's ensure there's no pending checkpoint anymore */</div><div class='ctx'> 	f2fs_flush_ckpt_thread(sbi);</div><div class='add'>+</div><div class='add'>+	f2fs_up_write(&amp;sbi-&gt;cp_enable_rwsem);</div><div class='add'>+</div><div class='add'>+	end = ktime_get();</div><div class='add'>+</div><div class='add'>+	f2fs_info(sbi, "%s end, writeback:%llu, "</div><div class='add'>+				"lock:%llu, sync_inode:%llu, sync_fs:%llu",</div><div class='add'>+				__func__,</div><div class='add'>+				ktime_ms_delta(writeback, start),</div><div class='add'>+				ktime_ms_delta(lock, writeback),</div><div class='add'>+				ktime_ms_delta(sync_inode, lock),</div><div class='add'>+				ktime_ms_delta(end, sync_inode));</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int __f2fs_remount(struct fs_context *fc, struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='ctx'> 	struct f2fs_mount_info org_mount_opt;</div><div class='ctx'> 	unsigned long old_sb_flags;</div><div class='add'>+	unsigned int flags = fc-&gt;sb_flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool need_restart_gc = false, need_stop_gc = false;</div><div class='ctx'> 	bool need_restart_flush = false, need_stop_flush = false;</div><div class='hunk'>@@ -2332,11 +2721,11 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	bool no_read_extent_cache = !test_opt(sbi, READ_EXTENT_CACHE);</div><div class='ctx'> 	bool no_age_extent_cache = !test_opt(sbi, AGE_EXTENT_CACHE);</div><div class='ctx'> 	bool enable_checkpoint = !test_opt(sbi, DISABLE_CHECKPOINT);</div><div class='del'>-	bool no_io_align = !F2FS_IO_ALIGNED(sbi);</div><div class='ctx'> 	bool no_atgc = !test_opt(sbi, ATGC);</div><div class='ctx'> 	bool no_discard = !test_opt(sbi, DISCARD);</div><div class='ctx'> 	bool no_compress_cache = !test_opt(sbi, COMPRESS_CACHE);</div><div class='ctx'> 	bool block_unit_discard = f2fs_block_unit_discard(sbi);</div><div class='add'>+	bool no_nat_bits = !test_opt(sbi, NAT_BITS);</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	int i, j;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2348,6 +2737,8 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	org_mount_opt = sbi-&gt;mount_opt;</div><div class='ctx'> 	old_sb_flags = sb-&gt;s_flags;</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;umount_lock_holder = current;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	org_mount_opt.s_jquota_fmt = F2FS_OPTION(sbi).s_jquota_fmt;</div><div class='ctx'> 	for (i = 0; i &lt; MAXQUOTAS; i++) {</div><div class='hunk'>@@ -2367,7 +2758,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* recover superblocks we couldn't write due to previous RO mount */</div><div class='del'>-	if (!(*flags &amp; SB_RDONLY) &amp;&amp; is_sbi_flag_set(sbi, SBI_NEED_SB_WRITE)) {</div><div class='add'>+	if (!(flags &amp; SB_RDONLY) &amp;&amp; is_sbi_flag_set(sbi, SBI_NEED_SB_WRITE)) {</div><div class='ctx'> 		err = f2fs_commit_super(sbi, false);</div><div class='ctx'> 		f2fs_info(sbi, "Try to recover all the superblocks, ret: %d",</div><div class='ctx'> 			  err);</div><div class='hunk'>@@ -2377,8 +2768,13 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> </div><div class='ctx'> 	default_options(sbi, true);</div><div class='ctx'> </div><div class='del'>-	/* parse mount options */</div><div class='del'>-	err = parse_options(sb, data, true);</div><div class='add'>+	err = f2fs_check_opt_consistency(fc, sb);</div><div class='add'>+	if (err)</div><div class='add'>+		goto restore_opts;</div><div class='add'>+</div><div class='add'>+	f2fs_apply_options(fc, sb);</div><div class='add'>+</div><div class='add'>+	err = f2fs_sanity_check_options(sbi, true);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto restore_opts;</div><div class='ctx'> </div><div class='hunk'>@@ -2389,20 +2785,20 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	 * Previous and new state of filesystem is RO,</div><div class='ctx'> 	 * so skip checking GC and FLUSH_MERGE conditions.</div><div class='ctx'> 	 */</div><div class='del'>-	if (f2fs_readonly(sb) &amp;&amp; (*flags &amp; SB_RDONLY))</div><div class='add'>+	if (f2fs_readonly(sb) &amp;&amp; (flags &amp; SB_RDONLY))</div><div class='ctx'> 		goto skip;</div><div class='ctx'> </div><div class='del'>-	if (f2fs_dev_is_readonly(sbi) &amp;&amp; !(*flags &amp; SB_RDONLY)) {</div><div class='add'>+	if (f2fs_dev_is_readonly(sbi) &amp;&amp; !(flags &amp; SB_RDONLY)) {</div><div class='ctx'> 		err = -EROFS;</div><div class='ctx'> 		goto restore_opts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-	if (!f2fs_readonly(sb) &amp;&amp; (*flags &amp; SB_RDONLY)) {</div><div class='add'>+	if (!f2fs_readonly(sb) &amp;&amp; (flags &amp; SB_RDONLY)) {</div><div class='ctx'> 		err = dquot_suspend(sb, -1);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto restore_opts;</div><div class='del'>-	} else if (f2fs_readonly(sb) &amp;&amp; !(*flags &amp; SB_RDONLY)) {</div><div class='add'>+	} else if (f2fs_readonly(sb) &amp;&amp; !(flags &amp; SB_RDONLY)) {</div><div class='ctx'> 		/* dquot_resume needs RW */</div><div class='ctx'> 		sb-&gt;s_flags &amp;= ~SB_RDONLY;</div><div class='ctx'> 		if (sb_any_quota_suspended(sb)) {</div><div class='hunk'>@@ -2414,12 +2810,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (f2fs_lfs_mode(sbi) &amp;&amp; !IS_F2FS_IPU_DISABLE(sbi)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		f2fs_warn(sbi, "LFS is not compatible with IPU");</div><div class='del'>-		goto restore_opts;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* disallow enable atgc dynamically */</div><div class='ctx'> 	if (no_atgc == !!test_opt(sbi, ATGC)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -2440,12 +2830,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		goto restore_opts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (no_io_align == !!F2FS_IO_ALIGNED(sbi)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		f2fs_warn(sbi, "switch io_bits option is not allowed");</div><div class='del'>-		goto restore_opts;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (no_compress_cache == !!test_opt(sbi, COMPRESS_CACHE)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		f2fs_warn(sbi, "switch compress_cache option is not allowed");</div><div class='hunk'>@@ -2458,7 +2842,13 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		goto restore_opts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((*flags &amp; SB_RDONLY) &amp;&amp; test_opt(sbi, DISABLE_CHECKPOINT)) {</div><div class='add'>+	if (no_nat_bits == !!test_opt(sbi, NAT_BITS)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		f2fs_warn(sbi, "switch nat_bits option is not allowed");</div><div class='add'>+		goto restore_opts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; SB_RDONLY) &amp;&amp; test_opt(sbi, DISABLE_CHECKPOINT)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		f2fs_warn(sbi, "disabling checkpoint not compatible with read-only");</div><div class='ctx'> 		goto restore_opts;</div><div class='hunk'>@@ -2469,7 +2859,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	 * or if background_gc = off is passed in mount</div><div class='ctx'> 	 * option. Also sync the filesystem.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((*flags &amp; SB_RDONLY) ||</div><div class='add'>+	if ((flags &amp; SB_RDONLY) ||</div><div class='ctx'> 			(F2FS_OPTION(sbi).bggc_mode == BGGC_MODE_OFF &amp;&amp;</div><div class='ctx'> 			!test_opt(sbi, GC_MERGE))) {</div><div class='ctx'> 		if (sbi-&gt;gc_thread) {</div><div class='hunk'>@@ -2483,7 +2873,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		need_stop_gc = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (*flags &amp; SB_RDONLY) {</div><div class='add'>+	if (flags &amp; SB_RDONLY) {</div><div class='ctx'> 		sync_inodes_sb(sb);</div><div class='ctx'> </div><div class='ctx'> 		set_sbi_flag(sbi, SBI_IS_DIRTY);</div><div class='hunk'>@@ -2496,7 +2886,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	 * We stop issue flush thread if FS is mounted as RO</div><div class='ctx'> 	 * or if flush_merge is not passed in mount option.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((*flags &amp; SB_RDONLY) || !test_opt(sbi, FLUSH_MERGE)) {</div><div class='add'>+	if ((flags &amp; SB_RDONLY) || !test_opt(sbi, FLUSH_MERGE)) {</div><div class='ctx'> 		clear_opt(sbi, FLUSH_MERGE);</div><div class='ctx'> 		f2fs_destroy_flush_cmd_control(sbi, false);</div><div class='ctx'> 		need_restart_flush = true;</div><div class='hunk'>@@ -2520,6 +2910,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	adjust_unusable_cap_perc(sbi);</div><div class='ctx'> 	if (enable_checkpoint == !!test_opt(sbi, DISABLE_CHECKPOINT)) {</div><div class='ctx'> 		if (test_opt(sbi, DISABLE_CHECKPOINT)) {</div><div class='ctx'> 			err = f2fs_disable_checkpoint(sbi);</div><div class='hunk'>@@ -2527,7 +2918,9 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 				goto restore_discard;</div><div class='ctx'> 			need_enable_checkpoint = true;</div><div class='ctx'> 		} else {</div><div class='del'>-			f2fs_enable_checkpoint(sbi);</div><div class='add'>+			err = f2fs_enable_checkpoint(sbi);</div><div class='add'>+			if (err)</div><div class='add'>+				goto restore_discard;</div><div class='ctx'> 			need_disable_checkpoint = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2537,11 +2930,11 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	 * triggered while remount and we need to take care of it before</div><div class='ctx'> 	 * returning from remount.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((*flags &amp; SB_RDONLY) || test_opt(sbi, DISABLE_CHECKPOINT) ||</div><div class='add'>+	if ((flags &amp; SB_RDONLY) || test_opt(sbi, DISABLE_CHECKPOINT) ||</div><div class='ctx'> 			!test_opt(sbi, MERGE_CHECKPOINT)) {</div><div class='ctx'> 		f2fs_stop_ckpt_thread(sbi);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Flush if the prevous checkpoint, if exists. */</div><div class='add'>+		/* Flush if the previous checkpoint, if exists. */</div><div class='ctx'> 		f2fs_flush_ckpt_thread(sbi);</div><div class='ctx'> </div><div class='ctx'> 		err = f2fs_start_ckpt_thread(sbi);</div><div class='hunk'>@@ -2564,12 +2957,14 @@ skip:</div><div class='ctx'> 		(test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0);</div><div class='ctx'> </div><div class='ctx'> 	limit_reserve_root(sbi);</div><div class='del'>-	adjust_unusable_cap_perc(sbi);</div><div class='del'>-	*flags = (*flags &amp; ~SB_LAZYTIME) | (sb-&gt;s_flags &amp; SB_LAZYTIME);</div><div class='add'>+	fc-&gt;sb_flags = (flags &amp; ~SB_LAZYTIME) | (sb-&gt;s_flags &amp; SB_LAZYTIME);</div><div class='add'>+</div><div class='add'>+	sbi-&gt;umount_lock_holder = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> restore_checkpoint:</div><div class='ctx'> 	if (need_enable_checkpoint) {</div><div class='del'>-		f2fs_enable_checkpoint(sbi);</div><div class='add'>+		if (f2fs_enable_checkpoint(sbi))</div><div class='add'>+			f2fs_warn(sbi, "checkpoint has not been enabled");</div><div class='ctx'> 	} else if (need_disable_checkpoint) {</div><div class='ctx'> 		if (f2fs_disable_checkpoint(sbi))</div><div class='ctx'> 			f2fs_warn(sbi, "checkpoint has not been disabled");</div><div class='hunk'>@@ -2606,9 +3001,16 @@ restore_opts:</div><div class='ctx'> #endif</div><div class='ctx'> 	sbi-&gt;mount_opt = org_mount_opt;</div><div class='ctx'> 	sb-&gt;s_flags = old_sb_flags;</div><div class='add'>+</div><div class='add'>+	sbi-&gt;umount_lock_holder = NULL;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void f2fs_shutdown(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	f2fs_do_shutdown(F2FS_SB(sb), F2FS_GOING_DOWN_NOSYNC, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> static bool f2fs_need_recovery(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='hunk'>@@ -2664,12 +3066,9 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = sb_dqopt(sb)-&gt;files[type];</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	block_t blkidx = F2FS_BYTES_TO_BLK(off);</div><div class='del'>-	int offset = off &amp; (sb-&gt;s_blocksize - 1);</div><div class='ctx'> 	int tocopy;</div><div class='ctx'> 	size_t toread;</div><div class='ctx'> 	loff_t i_size = i_size_read(inode);</div><div class='del'>-	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	if (off &gt; i_size)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2678,37 +3077,42 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data,</div><div class='ctx'> 		len = i_size - off;</div><div class='ctx'> 	toread = len;</div><div class='ctx'> 	while (toread &gt; 0) {</div><div class='del'>-		tocopy = min_t(unsigned long, sb-&gt;s_blocksize - offset, toread);</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		size_t offset;</div><div class='add'>+</div><div class='ctx'> repeat:</div><div class='del'>-		page = read_cache_page_gfp(mapping, blkidx, GFP_NOFS);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			if (PTR_ERR(page) == -ENOMEM) {</div><div class='add'>+		folio = mapping_read_folio_gfp(mapping, off &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				GFP_NOFS);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			if (PTR_ERR(folio) == -ENOMEM) {</div><div class='ctx'> 				memalloc_retry_wait(GFP_NOFS);</div><div class='ctx'> 				goto repeat;</div><div class='ctx'> 			}</div><div class='ctx'> 			set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> 		}</div><div class='add'>+		offset = offset_in_folio(folio, off);</div><div class='add'>+		tocopy = min(folio_size(folio) - offset, toread);</div><div class='ctx'> </div><div class='del'>-		lock_page(page);</div><div class='add'>+		folio_lock(folio);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(page-&gt;mapping != mapping)) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='add'>+		if (unlikely(folio-&gt;mapping != mapping)) {</div><div class='add'>+			f2fs_folio_put(folio, true);</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(!PageUptodate(page))) {</div><div class='del'>-			f2fs_put_page(page, 1);</div><div class='del'>-			set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		memcpy_from_page(data, page, offset, tocopy);</div><div class='del'>-		f2fs_put_page(page, 1);</div><div class='add'>+		/*</div><div class='add'>+		 * should never happen, just leave f2fs_bug_on() here to catch</div><div class='add'>+		 * any potential bug.</div><div class='add'>+		 */</div><div class='add'>+		f2fs_bug_on(F2FS_SB(sb), !folio_test_uptodate(folio));</div><div class='add'>+</div><div class='add'>+		memcpy_from_folio(data, folio, offset, tocopy);</div><div class='add'>+		f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='del'>-		offset = 0;</div><div class='ctx'> 		toread -= tocopy;</div><div class='ctx'> 		data += tocopy;</div><div class='del'>-		blkidx++;</div><div class='add'>+		off += tocopy;</div><div class='ctx'> 	}</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -2722,7 +3126,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 	const struct address_space_operations *a_ops = mapping-&gt;a_ops;</div><div class='ctx'> 	int offset = off &amp; (sb-&gt;s_blocksize - 1);</div><div class='ctx'> 	size_t towrite = len;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	void *fsdata = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int tocopy;</div><div class='hunk'>@@ -2732,20 +3136,20 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 								towrite);</div><div class='ctx'> retry:</div><div class='ctx'> 		err = a_ops-&gt;write_begin(NULL, mapping, off, tocopy,</div><div class='del'>-							&amp;page, &amp;fsdata);</div><div class='add'>+							&amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='ctx'> 			if (err == -ENOMEM) {</div><div class='del'>-				f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);</div><div class='add'>+				memalloc_retry_wait(GFP_NOFS);</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 			set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memcpy_to_page(page, offset, data, tocopy);</div><div class='add'>+		memcpy_to_folio(folio, offset_in_folio(folio, off), data, tocopy);</div><div class='ctx'> </div><div class='ctx'> 		a_ops-&gt;write_end(NULL, mapping, off, tocopy, tocopy,</div><div class='del'>-						page, fsdata);</div><div class='add'>+						folio, fsdata);</div><div class='ctx'> 		offset = 0;</div><div class='ctx'> 		towrite -= tocopy;</div><div class='ctx'> 		off += tocopy;</div><div class='hunk'>@@ -2768,7 +3172,7 @@ int f2fs_dquot_initialize(struct inode *inode)</div><div class='ctx'> 	return dquot_initialize(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dquot **f2fs_get_dquots(struct inode *inode)</div><div class='add'>+static struct dquot __rcu **f2fs_get_dquots(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return F2FS_I(inode)-&gt;i_dquot;</div><div class='ctx'> }</div><div class='hunk'>@@ -2917,7 +3321,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_quota_sync(struct super_block *sb, int type)</div><div class='add'>+int f2fs_do_quota_sync(struct super_block *sb, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='hunk'>@@ -2965,11 +3369,21 @@ int f2fs_quota_sync(struct super_block *sb, int type)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int f2fs_quota_sync(struct super_block *sb, int type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	F2FS_SB(sb)-&gt;umount_lock_holder = current;</div><div class='add'>+	ret = f2fs_do_quota_sync(sb, type);</div><div class='add'>+	F2FS_SB(sb)-&gt;umount_lock_holder = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int f2fs_quota_on(struct super_block *sb, int type, int format_id,</div><div class='ctx'> 							const struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* if quota sysfile exists, deny enabling quota with specific file */</div><div class='ctx'> 	if (f2fs_sb_has_quota_ino(F2FS_SB(sb))) {</div><div class='hunk'>@@ -2980,31 +3394,34 @@ static int f2fs_quota_on(struct super_block *sb, int type, int format_id,</div><div class='ctx'> 	if (path-&gt;dentry-&gt;d_sb != sb)</div><div class='ctx'> 		return -EXDEV;</div><div class='ctx'> </div><div class='del'>-	err = f2fs_quota_sync(sb, type);</div><div class='add'>+	F2FS_SB(sb)-&gt;umount_lock_holder = current;</div><div class='add'>+</div><div class='add'>+	err = f2fs_do_quota_sync(sb, type);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	inode = d_inode(path-&gt;dentry);</div><div class='ctx'> </div><div class='ctx'> 	err = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = filemap_fdatawait(inode-&gt;i_mapping);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = dquot_quota_on(sb, type, format_id, path);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	F2FS_I(inode)-&gt;i_flags |= F2FS_QUOTA_DEFAULT_FL;</div><div class='ctx'> 	f2fs_set_inode_flags(inode);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> 	f2fs_mark_inode_dirty_sync(inode, false);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	F2FS_SB(sb)-&gt;umount_lock_holder = NULL;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __f2fs_quota_off(struct super_block *sb, int type)</div><div class='hunk'>@@ -3015,7 +3432,7 @@ static int __f2fs_quota_off(struct super_block *sb, int type)</div><div class='ctx'> 	if (!inode || !igrab(inode))</div><div class='ctx'> 		return dquot_quota_off(sb, type);</div><div class='ctx'> </div><div class='del'>-	err = f2fs_quota_sync(sb, type);</div><div class='add'>+	err = f2fs_do_quota_sync(sb, type);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> </div><div class='hunk'>@@ -3038,6 +3455,8 @@ static int f2fs_quota_off(struct super_block *sb, int type)</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	F2FS_SB(sb)-&gt;umount_lock_holder = current;</div><div class='add'>+</div><div class='ctx'> 	err = __f2fs_quota_off(sb, type);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3047,6 +3466,9 @@ static int f2fs_quota_off(struct super_block *sb, int type)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_journalled_quota(sbi))</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);</div><div class='add'>+</div><div class='add'>+	F2FS_SB(sb)-&gt;umount_lock_holder = NULL;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3179,7 +3601,7 @@ int f2fs_dquot_initialize(struct inode *inode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_quota_sync(struct super_block *sb, int type)</div><div class='add'>+int f2fs_do_quota_sync(struct super_block *sb, int type)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3207,7 +3629,7 @@ static const struct super_operations f2fs_sops = {</div><div class='ctx'> 	.freeze_fs	= f2fs_freeze,</div><div class='ctx'> 	.unfreeze_fs	= f2fs_unfreeze,</div><div class='ctx'> 	.statfs		= f2fs_statfs,</div><div class='del'>-	.remount_fs	= f2fs_remount,</div><div class='add'>+	.shutdown	= f2fs_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='hunk'>@@ -3269,6 +3691,8 @@ static struct block_device **f2fs_get_devices(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fscrypt_operations f2fs_cryptops = {</div><div class='add'>+	.inode_info_offs	= (int)offsetof(struct f2fs_inode_info, i_crypt_info) -</div><div class='add'>+				  (int)offsetof(struct f2fs_inode_info, vfs_inode),</div><div class='ctx'> 	.needs_bounce_pages	= 1,</div><div class='ctx'> 	.has_32bit_inodes	= 1,</div><div class='ctx'> 	.supports_subblock_data_units = 1,</div><div class='hunk'>@@ -3280,7 +3704,7 @@ static const struct fscrypt_operations f2fs_cryptops = {</div><div class='ctx'> 	.has_stable_inodes	= f2fs_has_stable_inodes,</div><div class='ctx'> 	.get_devices		= f2fs_get_devices,</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_FS_ENCRYPTION */</div><div class='ctx'> </div><div class='ctx'> static struct inode *f2fs_nfs_get_inode(struct super_block *sb,</div><div class='ctx'> 		u64 ino, u32 generation)</div><div class='hunk'>@@ -3362,29 +3786,48 @@ loff_t max_file_blocks(struct inode *inode)</div><div class='ctx'> 	 * fit within U32_MAX + 1 data units.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	result = min(result, (((loff_t)U32_MAX + 1) * 4096) &gt;&gt; F2FS_BLKSIZE_BITS);</div><div class='add'>+	result = umin(result, F2FS_BYTES_TO_BLK(((loff_t)U32_MAX + 1) * 4096));</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __f2fs_commit_super(struct buffer_head *bh,</div><div class='del'>-			struct f2fs_super_block *super)</div><div class='add'>+static int __f2fs_commit_super(struct f2fs_sb_info *sbi, struct folio *folio,</div><div class='add'>+						pgoff_t index, bool update)</div><div class='ctx'> {</div><div class='del'>-	lock_buffer(bh);</div><div class='del'>-	if (super)</div><div class='del'>-		memcpy(bh-&gt;b_data + F2FS_SUPER_OFFSET, super, sizeof(*super));</div><div class='del'>-	set_buffer_dirty(bh);</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-</div><div class='add'>+	struct bio *bio;</div><div class='ctx'> 	/* it's rare case, we can do fua all the time */</div><div class='del'>-	return __sync_dirty_buffer(bh, REQ_SYNC | REQ_PREFLUSH | REQ_FUA);</div><div class='add'>+	blk_opf_t opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH | REQ_FUA;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='add'>+	if (update)</div><div class='add'>+		memcpy(F2FS_SUPER_BLOCK(folio, index), F2FS_RAW_SUPER(sbi),</div><div class='add'>+					sizeof(struct f2fs_super_block));</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	folio_clear_dirty_for_io(folio);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+</div><div class='add'>+	bio = bio_alloc(sbi-&gt;sb-&gt;s_bdev, 1, opf, GFP_NOFS);</div><div class='add'>+</div><div class='add'>+	/* it doesn't need to set crypto context for superblock update */</div><div class='add'>+	bio-&gt;bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio-&gt;index);</div><div class='add'>+</div><div class='add'>+	if (!bio_add_folio(bio, folio, folio_size(folio), 0))</div><div class='add'>+		f2fs_bug_on(sbi, 1);</div><div class='add'>+</div><div class='add'>+	ret = submit_bio_wait(bio);</div><div class='add'>+	bio_put(bio);</div><div class='add'>+	folio_end_writeback(folio);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,</div><div class='del'>-					struct buffer_head *bh)</div><div class='add'>+					struct folio *folio, pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	struct f2fs_super_block *raw_super = (struct f2fs_super_block *)</div><div class='del'>-					(bh-&gt;b_data + F2FS_SUPER_OFFSET);</div><div class='add'>+	struct f2fs_super_block *raw_super = F2FS_SUPER_BLOCK(folio, index);</div><div class='ctx'> 	struct super_block *sb = sbi-&gt;sb;</div><div class='ctx'> 	u32 segment0_blkaddr = le32_to_cpu(raw_super-&gt;segment0_blkaddr);</div><div class='ctx'> 	u32 cp_blkaddr = le32_to_cpu(raw_super-&gt;cp_blkaddr);</div><div class='hunk'>@@ -3400,9 +3843,9 @@ static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	u32 segment_count = le32_to_cpu(raw_super-&gt;segment_count);</div><div class='ctx'> 	u32 log_blocks_per_seg = le32_to_cpu(raw_super-&gt;log_blocks_per_seg);</div><div class='ctx'> 	u64 main_end_blkaddr = main_blkaddr +</div><div class='del'>-				(segment_count_main &lt;&lt; log_blocks_per_seg);</div><div class='add'>+				((u64)segment_count_main &lt;&lt; log_blocks_per_seg);</div><div class='ctx'> 	u64 seg_end_blkaddr = segment0_blkaddr +</div><div class='del'>-				(segment_count &lt;&lt; log_blocks_per_seg);</div><div class='add'>+				((u64)segment_count &lt;&lt; log_blocks_per_seg);</div><div class='ctx'> </div><div class='ctx'> 	if (segment0_blkaddr != cp_blkaddr) {</div><div class='ctx'> 		f2fs_info(sbi, "Mismatch start address, segment0(%u) cp_blkaddr(%u)",</div><div class='hunk'>@@ -3459,7 +3902,7 @@ static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			set_sbi_flag(sbi, SBI_NEED_SB_WRITE);</div><div class='ctx'> 			res = "internally";</div><div class='ctx'> 		} else {</div><div class='del'>-			err = __f2fs_commit_super(bh, NULL);</div><div class='add'>+			err = __f2fs_commit_super(sbi, folio, index, false);</div><div class='ctx'> 			res = err ? "failed" : "done";</div><div class='ctx'> 		}</div><div class='ctx'> 		f2fs_info(sbi, "Fix alignment : %s, start(%u) end(%llu) block(%u)",</div><div class='hunk'>@@ -3472,12 +3915,11 @@ static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sanity_check_raw_super(struct f2fs_sb_info *sbi,</div><div class='del'>-				struct buffer_head *bh)</div><div class='add'>+					struct folio *folio, pgoff_t index)</div><div class='ctx'> {</div><div class='ctx'> 	block_t segment_count, segs_per_sec, secs_per_zone, segment_count_main;</div><div class='ctx'> 	block_t total_sections, blocks_per_seg;</div><div class='del'>-	struct f2fs_super_block *raw_super = (struct f2fs_super_block *)</div><div class='del'>-					(bh-&gt;b_data + F2FS_SUPER_OFFSET);</div><div class='add'>+	struct f2fs_super_block *raw_super = F2FS_SUPER_BLOCK(folio, index);</div><div class='ctx'> 	size_t crc_offset = 0;</div><div class='ctx'> 	__u32 crc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3497,13 +3939,13 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,</div><div class='ctx'> 			return -EFSCORRUPTED;</div><div class='ctx'> 		}</div><div class='ctx'> 		crc = le32_to_cpu(raw_super-&gt;crc);</div><div class='del'>-		if (!f2fs_crc_valid(sbi, crc, raw_super, crc_offset)) {</div><div class='add'>+		if (crc != f2fs_crc32(raw_super, crc_offset)) {</div><div class='ctx'> 			f2fs_info(sbi, "Invalid SB checksum value: %u", crc);</div><div class='ctx'> 			return -EFSCORRUPTED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Currently, support only 4KB block size */</div><div class='add'>+	/* only support block_size equals to PAGE_SIZE */</div><div class='ctx'> 	if (le32_to_cpu(raw_super-&gt;log_blocksize) != F2FS_BLKSIZE_BITS) {</div><div class='ctx'> 		f2fs_info(sbi, "Invalid log_blocksize (%u), supports only %u",</div><div class='ctx'> 			  le32_to_cpu(raw_super-&gt;log_blocksize),</div><div class='hunk'>@@ -3635,9 +4077,23 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check CP/SIT/NAT/SSA/MAIN_AREA area boundary */</div><div class='del'>-	if (sanity_check_area_boundary(sbi, bh))</div><div class='add'>+	if (sanity_check_area_boundary(sbi, folio, index))</div><div class='ctx'> 		return -EFSCORRUPTED;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Check for legacy summary layout on 16KB+ block devices.</div><div class='add'>+	 * Modern f2fs-tools packs multiple 4KB summary areas into one block,</div><div class='add'>+	 * whereas legacy versions used one block per summary, leading</div><div class='add'>+	 * to a much larger SSA.</div><div class='add'>+	 */</div><div class='add'>+	if (SUMS_PER_BLOCK &gt; 1 &amp;&amp;</div><div class='add'>+		    !(__F2FS_HAS_FEATURE(raw_super, F2FS_FEATURE_PACKED_SSA))) {</div><div class='add'>+		f2fs_info(sbi, "Error: Device formatted with a legacy version. "</div><div class='add'>+			"Please reformat with a tool supporting the packed ssa "</div><div class='add'>+			"feature for block sizes larger than 4kb.");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3656,6 +4112,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	block_t user_block_count, valid_user_blocks;</div><div class='ctx'> 	block_t avail_node_count, valid_node_count;</div><div class='ctx'> 	unsigned int nat_blocks, nat_bits_bytes, nat_bits_blocks;</div><div class='add'>+	unsigned int sit_blk_cnt;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	total = le32_to_cpu(raw_super-&gt;segment_count);</div><div class='hunk'>@@ -3706,7 +4163,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	main_segs = le32_to_cpu(raw_super-&gt;segment_count_main);</div><div class='del'>-	blocks_per_seg = sbi-&gt;blocks_per_seg;</div><div class='add'>+	blocks_per_seg = BLKS_PER_SEG(sbi);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_CURSEG_NODE_TYPE; i++) {</div><div class='ctx'> 		if (le32_to_cpu(ckpt-&gt;cur_node_segno[i]) &gt;= main_segs ||</div><div class='hunk'>@@ -3767,6 +4224,13 @@ skip_cross:</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sit_blk_cnt = DIV_ROUND_UP(main_segs, SIT_ENTRY_PER_BLOCK);</div><div class='add'>+	if (sit_bitmap_size * 8 &lt; sit_blk_cnt) {</div><div class='add'>+		f2fs_err(sbi, "Wrong bitmap size: sit: %u, sit_blk_cnt:%u",</div><div class='add'>+			 sit_bitmap_size, sit_blk_cnt);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cp_pack_start_sum = __start_sum_addr(sbi);</div><div class='ctx'> 	cp_payload = __cp_payload(sbi);</div><div class='ctx'> 	if (cp_pack_start_sum &lt; cp_payload + 1 ||</div><div class='hunk'>@@ -3818,9 +4282,11 @@ static void init_sb_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	sbi-&gt;segs_per_sec = le32_to_cpu(raw_super-&gt;segs_per_sec);</div><div class='ctx'> 	sbi-&gt;secs_per_zone = le32_to_cpu(raw_super-&gt;secs_per_zone);</div><div class='ctx'> 	sbi-&gt;total_sections = le32_to_cpu(raw_super-&gt;section_count);</div><div class='del'>-	sbi-&gt;total_node_count =</div><div class='del'>-		(le32_to_cpu(raw_super-&gt;segment_count_nat) / 2)</div><div class='del'>-			* sbi-&gt;blocks_per_seg * NAT_ENTRY_PER_BLOCK;</div><div class='add'>+	sbi-&gt;total_node_count = SEGS_TO_BLKS(sbi,</div><div class='add'>+			((le32_to_cpu(raw_super-&gt;segment_count_nat) / 2) *</div><div class='add'>+			NAT_ENTRY_PER_BLOCK));</div><div class='add'>+	sbi-&gt;allocate_section_hint = le32_to_cpu(raw_super-&gt;section_count);</div><div class='add'>+	sbi-&gt;allocate_section_policy = ALLOCATE_FORWARD_NOHINT;</div><div class='ctx'> 	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super-&gt;root_ino);</div><div class='ctx'> 	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super-&gt;node_ino);</div><div class='ctx'> 	F2FS_META_INO(sbi) = le32_to_cpu(raw_super-&gt;meta_ino);</div><div class='hunk'>@@ -3829,7 +4295,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	sbi-&gt;next_victim_seg[BG_GC] = NULL_SEGNO;</div><div class='ctx'> 	sbi-&gt;next_victim_seg[FG_GC] = NULL_SEGNO;</div><div class='ctx'> 	sbi-&gt;max_victim_search = DEF_MAX_VICTIM_SEARCH;</div><div class='del'>-	sbi-&gt;migration_granularity = sbi-&gt;segs_per_sec;</div><div class='add'>+	sbi-&gt;migration_granularity = SEGS_PER_SEC(sbi);</div><div class='add'>+	sbi-&gt;migration_window_granularity = f2fs_sb_has_blkzoned(sbi) ?</div><div class='add'>+		DEF_MIGRATION_WINDOW_GRANULARITY_ZONED : SEGS_PER_SEC(sbi);</div><div class='ctx'> 	sbi-&gt;seq_file_ra_mul = MIN_RA_MUL;</div><div class='ctx'> 	sbi-&gt;max_fragment_chunk = DEF_FRAGMENT_SIZE;</div><div class='ctx'> 	sbi-&gt;max_fragment_hole = DEF_FRAGMENT_SIZE;</div><div class='hunk'>@@ -3842,6 +4310,7 @@ static void init_sb_info(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	sbi-&gt;interval_time[DISCARD_TIME] = DEF_IDLE_INTERVAL;</div><div class='ctx'> 	sbi-&gt;interval_time[GC_TIME] = DEF_IDLE_INTERVAL;</div><div class='ctx'> 	sbi-&gt;interval_time[DISABLE_TIME] = DEF_DISABLE_INTERVAL;</div><div class='add'>+	sbi-&gt;interval_time[ENABLE_TIME] = DEF_ENABLE_INTERVAL;</div><div class='ctx'> 	sbi-&gt;interval_time[UMOUNT_DISCARD_TIMEOUT] =</div><div class='ctx'> 				DEF_UMOUNT_DISCARD_TIMEOUT;</div><div class='ctx'> 	clear_sbi_flag(sbi, SBI_NEED_FSCK);</div><div class='hunk'>@@ -3924,17 +4393,25 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi)</div><div class='ctx'> 	sector_t nr_sectors = bdev_nr_sectors(bdev);</div><div class='ctx'> 	struct f2fs_report_zones_args rep_zone_arg;</div><div class='ctx'> 	u64 zone_sectors;</div><div class='add'>+	unsigned int max_open_zones;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2fs_sb_has_blkzoned(sbi))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	zone_sectors = bdev_zone_sectors(bdev);</div><div class='del'>-	if (!is_power_of_2(zone_sectors)) {</div><div class='del'>-		f2fs_err(sbi, "F2FS does not support non power of 2 zone sizes\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (bdev_is_zoned(FDEV(devi).bdev)) {</div><div class='add'>+		max_open_zones = bdev_max_open_zones(bdev);</div><div class='add'>+		if (max_open_zones &amp;&amp; (max_open_zones &lt; sbi-&gt;max_open_zones))</div><div class='add'>+			sbi-&gt;max_open_zones = max_open_zones;</div><div class='add'>+		if (sbi-&gt;max_open_zones &lt; F2FS_OPTION(sbi).active_logs) {</div><div class='add'>+			f2fs_err(sbi,</div><div class='add'>+				"zoned: max open zones %u is too small, need at least %u open zones",</div><div class='add'>+				sbi-&gt;max_open_zones, F2FS_OPTION(sbi).active_logs);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	zone_sectors = bdev_zone_sectors(bdev);</div><div class='ctx'> 	if (sbi-&gt;blocks_per_blkz &amp;&amp; sbi-&gt;blocks_per_blkz !=</div><div class='ctx'> 				SECTOR_TO_BLOCK(zone_sectors))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3974,7 +4451,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi,</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = sbi-&gt;sb;</div><div class='ctx'> 	int block;</div><div class='del'>-	struct buffer_head *bh;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct f2fs_super_block *super;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3983,32 +4460,32 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for (block = 0; block &lt; 2; block++) {</div><div class='del'>-		bh = sb_bread(sb, block);</div><div class='del'>-		if (!bh) {</div><div class='add'>+		folio = read_mapping_folio(sb-&gt;s_bdev-&gt;bd_mapping, block, NULL);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='ctx'> 			f2fs_err(sbi, "Unable to read %dth superblock",</div><div class='ctx'> 				 block + 1);</div><div class='del'>-			err = -EIO;</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			*recovery = 1;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* sanity checking of raw super */</div><div class='del'>-		err = sanity_check_raw_super(sbi, bh);</div><div class='add'>+		err = sanity_check_raw_super(sbi, folio, block);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			f2fs_err(sbi, "Can't find valid F2FS filesystem in %dth superblock",</div><div class='ctx'> 				 block + 1);</div><div class='del'>-			brelse(bh);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			*recovery = 1;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!*raw_super) {</div><div class='del'>-			memcpy(super, bh-&gt;b_data + F2FS_SUPER_OFFSET,</div><div class='add'>+			memcpy(super, F2FS_SUPER_BLOCK(folio, block),</div><div class='ctx'> 							sizeof(*super));</div><div class='ctx'> 			*valid_super_block = block;</div><div class='ctx'> 			*raw_super = super;</div><div class='ctx'> 		}</div><div class='del'>-		brelse(bh);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No valid superblock */</div><div class='hunk'>@@ -4022,7 +4499,8 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi,</div><div class='ctx'> </div><div class='ctx'> int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)</div><div class='ctx'> {</div><div class='del'>-	struct buffer_head *bh;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	pgoff_t index;</div><div class='ctx'> 	__u32 crc = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -4034,28 +4512,30 @@ int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)</div><div class='ctx'> </div><div class='ctx'> 	/* we should update superblock crc here */</div><div class='ctx'> 	if (!recover &amp;&amp; f2fs_sb_has_sb_chksum(sbi)) {</div><div class='del'>-		crc = f2fs_crc32(sbi, F2FS_RAW_SUPER(sbi),</div><div class='add'>+		crc = f2fs_crc32(F2FS_RAW_SUPER(sbi),</div><div class='ctx'> 				offsetof(struct f2fs_super_block, crc));</div><div class='ctx'> 		F2FS_RAW_SUPER(sbi)-&gt;crc = cpu_to_le32(crc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* write back-up superblock first */</div><div class='del'>-	bh = sb_bread(sbi-&gt;sb, sbi-&gt;valid_super_block ? 0 : 1);</div><div class='del'>-	if (!bh)</div><div class='del'>-		return -EIO;</div><div class='del'>-	err = __f2fs_commit_super(bh, F2FS_RAW_SUPER(sbi));</div><div class='del'>-	brelse(bh);</div><div class='add'>+	index = sbi-&gt;valid_super_block ? 0 : 1;</div><div class='add'>+	folio = read_mapping_folio(sbi-&gt;sb-&gt;s_bdev-&gt;bd_mapping, index, NULL);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	err = __f2fs_commit_super(sbi, folio, index, true);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 	/* if we are in recovery path, skip writing valid superblock */</div><div class='ctx'> 	if (recover || err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* write current valid superblock */</div><div class='del'>-	bh = sb_bread(sbi-&gt;sb, sbi-&gt;valid_super_block);</div><div class='del'>-	if (!bh)</div><div class='del'>-		return -EIO;</div><div class='del'>-	err = __f2fs_commit_super(bh, F2FS_RAW_SUPER(sbi));</div><div class='del'>-	brelse(bh);</div><div class='add'>+	index = sbi-&gt;valid_super_block;</div><div class='add'>+	folio = read_mapping_folio(sbi-&gt;sb-&gt;s_bdev-&gt;bd_mapping, index, NULL);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	err = __f2fs_commit_super(sbi, folio, index, true);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4090,7 +4570,9 @@ static void f2fs_record_stop_reason(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	f2fs_up_write(&amp;sbi-&gt;sb_lock);</div><div class='ctx'> 	if (err)</div><div class='del'>-		f2fs_err(sbi, "f2fs_commit_super fails to record err:%d", err);</div><div class='add'>+		f2fs_err_ratelimited(sbi,</div><div class='add'>+			"f2fs_commit_super fails to record stop_reason, err:%d",</div><div class='add'>+			err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag)</div><div class='hunk'>@@ -4105,49 +4587,9 @@ void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sbi-&gt;error_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool f2fs_update_errors(struct f2fs_sb_info *sbi)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	bool need_update = false;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;sbi-&gt;error_lock, flags);</div><div class='del'>-	if (sbi-&gt;error_dirty) {</div><div class='del'>-		memcpy(F2FS_RAW_SUPER(sbi)-&gt;s_errors, sbi-&gt;errors,</div><div class='del'>-							MAX_F2FS_ERRORS);</div><div class='del'>-		sbi-&gt;error_dirty = false;</div><div class='del'>-		need_update = true;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;sbi-&gt;error_lock, flags);</div><div class='del'>-</div><div class='del'>-	return need_update;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void f2fs_record_errors(struct f2fs_sb_info *sbi, unsigned char error)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	f2fs_down_write(&amp;sbi-&gt;sb_lock);</div><div class='del'>-</div><div class='del'>-	if (!f2fs_update_errors(sbi))</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	err = f2fs_commit_super(sbi, false);</div><div class='del'>-	if (err)</div><div class='del'>-		f2fs_err(sbi, "f2fs_commit_super fails to record errors:%u, err:%d",</div><div class='del'>-								error, err);</div><div class='del'>-out_unlock:</div><div class='del'>-	f2fs_up_write(&amp;sbi-&gt;sb_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error)</div><div class='ctx'> {</div><div class='ctx'> 	f2fs_save_errors(sbi, error);</div><div class='del'>-	f2fs_record_errors(sbi, error);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void f2fs_handle_error_async(struct f2fs_sb_info *sbi, unsigned char error)</div><div class='del'>-{</div><div class='del'>-	f2fs_save_errors(sbi, error);</div><div class='ctx'> </div><div class='ctx'> 	if (!sbi-&gt;error_dirty)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -4162,8 +4604,7 @@ static bool system_going_down(void)</div><div class='ctx'> 		|| system_state == SYSTEM_RESTART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,</div><div class='del'>-							bool irq_context)</div><div class='add'>+void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = sbi-&gt;sb;</div><div class='ctx'> 	bool shutdown = reason == STOP_CP_REASON_SHUTDOWN;</div><div class='hunk'>@@ -4175,10 +4616,12 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,</div><div class='ctx'> 	if (!f2fs_hw_is_readonly(sbi)) {</div><div class='ctx'> 		save_stop_reason(sbi, reason);</div><div class='ctx'> </div><div class='del'>-		if (irq_context &amp;&amp; !shutdown)</div><div class='del'>-			schedule_work(&amp;sbi-&gt;s_error_work);</div><div class='del'>-		else</div><div class='del'>-			f2fs_record_stop_reason(sbi);</div><div class='add'>+		/*</div><div class='add'>+		 * always create an asynchronous task to record stop_reason</div><div class='add'>+		 * in order to avoid potential deadlock when running into</div><div class='add'>+		 * f2fs_record_stop_reason() synchronously.</div><div class='add'>+		 */</div><div class='add'>+		schedule_work(&amp;sbi-&gt;s_error_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4194,18 +4637,28 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,</div><div class='ctx'> </div><div class='ctx'> 	if (shutdown)</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_IS_SHUTDOWN);</div><div class='add'>+	else</div><div class='add'>+		dump_stack();</div><div class='ctx'> </div><div class='del'>-	/* continue filesystem operators if errors=continue */</div><div class='del'>-	if (continue_fs || f2fs_readonly(sb))</div><div class='add'>+	/*</div><div class='add'>+	 * Continue filesystem operators if errors=continue. Should not set</div><div class='add'>+	 * RO by shutdown, since RO bypasses thaw_super which can hang the</div><div class='add'>+	 * system.</div><div class='add'>+	 */</div><div class='add'>+	if (continue_fs || f2fs_readonly(sb) || shutdown) {</div><div class='add'>+		f2fs_warn(sbi, "Stopped filesystem due to reason: %d", reason);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	f2fs_warn(sbi, "Remounting filesystem read-only");</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Make sure updated value of -&gt;s_mount_flags will be visible before</div><div class='del'>-	 * -&gt;s_flags update</div><div class='add'>+	 * We have already set CP_ERROR_FLAG flag to stop all updates</div><div class='add'>+	 * to filesystem, so it doesn't need to set SB_RDONLY flag here</div><div class='add'>+	 * because the flag should be set covered w/ sb-&gt;s_umount semaphore</div><div class='add'>+	 * via remount procedure, otherwise, it will confuse code like</div><div class='add'>+	 * freeze_super() which will lead to deadlocks and other problems.</div><div class='ctx'> 	 */</div><div class='del'>-	smp_wmb();</div><div class='del'>-	sb-&gt;s_flags |= SB_RDONLY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void f2fs_record_error_work(struct work_struct *work)</div><div class='hunk'>@@ -4216,6 +4669,37 @@ static void f2fs_record_error_work(struct work_struct *work)</div><div class='ctx'> 	f2fs_record_stop_reason(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int get_first_seq_zone_segno(struct f2fs_sb_info *sbi)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+	unsigned int zoneno, total_zones;</div><div class='add'>+	int devi;</div><div class='add'>+</div><div class='add'>+	if (!f2fs_sb_has_blkzoned(sbi))</div><div class='add'>+		return NULL_SEGNO;</div><div class='add'>+</div><div class='add'>+	for (devi = 0; devi &lt; sbi-&gt;s_ndevs; devi++) {</div><div class='add'>+		if (!bdev_is_zoned(FDEV(devi).bdev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		total_zones = GET_ZONE_FROM_SEG(sbi, FDEV(devi).total_segments);</div><div class='add'>+</div><div class='add'>+		for (zoneno = 0; zoneno &lt; total_zones; zoneno++) {</div><div class='add'>+			unsigned int segs, blks;</div><div class='add'>+</div><div class='add'>+			if (!f2fs_zone_is_seq(sbi, devi, zoneno))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			segs = GET_SEG_FROM_SEC(sbi,</div><div class='add'>+					zoneno * sbi-&gt;secs_per_zone);</div><div class='add'>+			blks = SEGS_TO_BLKS(sbi, segs);</div><div class='add'>+			return GET_SEGNO(sbi, FDEV(devi).start_blk + blks);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return NULL_SEGNO;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int f2fs_scan_devices(struct f2fs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);</div><div class='hunk'>@@ -4244,8 +4728,22 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)</div><div class='ctx'> </div><div class='ctx'> 	logical_blksize = bdev_logical_block_size(sbi-&gt;sb-&gt;s_bdev);</div><div class='ctx'> 	sbi-&gt;aligned_blksize = true;</div><div class='add'>+	sbi-&gt;bggc_io_aware = AWARE_ALL_IO;</div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+	sbi-&gt;max_open_zones = UINT_MAX;</div><div class='add'>+	sbi-&gt;blkzone_alloc_policy = BLKZONE_ALLOC_PRIOR_SEQ;</div><div class='add'>+	sbi-&gt;bggc_io_aware = AWARE_READ_IO;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_devices; i++) {</div><div class='add'>+		if (max_devices == 1) {</div><div class='add'>+			FDEV(i).total_segments =</div><div class='add'>+				le32_to_cpu(raw_super-&gt;segment_count_main);</div><div class='add'>+			FDEV(i).start_blk = 0;</div><div class='add'>+			FDEV(i).end_blk = FDEV(i).total_segments *</div><div class='add'>+						BLKS_PER_SEG(sbi);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (i == 0)</div><div class='ctx'> 			FDEV(0).bdev_file = sbi-&gt;sb-&gt;s_bdev_file;</div><div class='ctx'> 		else if (!RDEV(i).path[0])</div><div class='hunk'>@@ -4259,14 +4757,16 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)</div><div class='ctx'> 			if (i == 0) {</div><div class='ctx'> 				FDEV(i).start_blk = 0;</div><div class='ctx'> 				FDEV(i).end_blk = FDEV(i).start_blk +</div><div class='del'>-				    (FDEV(i).total_segments &lt;&lt;</div><div class='del'>-				    sbi-&gt;log_blocks_per_seg) - 1 +</div><div class='del'>-				    le32_to_cpu(raw_super-&gt;segment0_blkaddr);</div><div class='add'>+					SEGS_TO_BLKS(sbi,</div><div class='add'>+					FDEV(i).total_segments) - 1 +</div><div class='add'>+					le32_to_cpu(raw_super-&gt;segment0_blkaddr);</div><div class='add'>+				sbi-&gt;allocate_section_hint = FDEV(i).total_segments /</div><div class='add'>+							SEGS_PER_SEC(sbi);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;</div><div class='ctx'> 				FDEV(i).end_blk = FDEV(i).start_blk +</div><div class='del'>-					(FDEV(i).total_segments &lt;&lt;</div><div class='del'>-					sbi-&gt;log_blocks_per_seg) - 1;</div><div class='add'>+						SEGS_TO_BLKS(sbi,</div><div class='add'>+						FDEV(i).total_segments) - 1;</div><div class='ctx'> 				FDEV(i).bdev_file = bdev_file_open_by_path(</div><div class='ctx'> 					FDEV(i).path, mode, sbi-&gt;sb, NULL);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4305,8 +4805,6 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)</div><div class='ctx'> 			  FDEV(i).total_segments,</div><div class='ctx'> 			  FDEV(i).start_blk, FDEV(i).end_blk);</div><div class='ctx'> 	}</div><div class='del'>-	f2fs_info(sbi,</div><div class='del'>-		  "IO Block Size: %8ld KB", F2FS_IO_SIZE_KB(sbi));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4372,14 +4870,14 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)</div><div class='ctx'> 	sbi-&gt;readdir_ra = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int f2fs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct f2fs_sb_info *sbi;</div><div class='ctx'> 	struct f2fs_super_block *raw_super;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool skip_recovery = false, need_fsck = false;</div><div class='del'>-	char *options = NULL;</div><div class='ctx'> 	int recovery, i, valid_super_block;</div><div class='ctx'> 	struct curseg_info *seg_i;</div><div class='ctx'> 	int retry_cnt = 1;</div><div class='hunk'>@@ -4408,6 +4906,7 @@ try_onemore:</div><div class='ctx'> 	init_f2fs_rwsem(&amp;sbi-&gt;node_change);</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 	init_f2fs_rwsem(&amp;sbi-&gt;cp_rwsem);</div><div class='add'>+	init_f2fs_rwsem(&amp;sbi-&gt;cp_enable_rwsem);</div><div class='ctx'> 	init_f2fs_rwsem(&amp;sbi-&gt;quota_sem);</div><div class='ctx'> 	init_waitqueue_head(&amp;sbi-&gt;cp_wait);</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;error_lock);</div><div class='hunk'>@@ -4418,15 +4917,6 @@ try_onemore:</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;flush_lock);</div><div class='ctx'> </div><div class='del'>-	/* Load the checksum driver */</div><div class='del'>-	sbi-&gt;s_chksum_driver = crypto_alloc_shash("crc32", 0, 0);</div><div class='del'>-	if (IS_ERR(sbi-&gt;s_chksum_driver)) {</div><div class='del'>-		f2fs_err(sbi, "Cannot load crc32 driver.");</div><div class='del'>-		err = PTR_ERR(sbi-&gt;s_chksum_driver);</div><div class='del'>-		sbi-&gt;s_chksum_driver = NULL;</div><div class='del'>-		goto free_sbi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* set a block size */</div><div class='ctx'> 	if (unlikely(!sb_set_blocksize(sb, F2FS_BLKSIZE))) {</div><div class='ctx'> 		f2fs_err(sbi, "unable to set blocksize");</div><div class='hunk'>@@ -4447,18 +4937,18 @@ try_onemore:</div><div class='ctx'> </div><div class='ctx'> 	/* precompute checksum seed for metadata */</div><div class='ctx'> 	if (f2fs_sb_has_inode_chksum(sbi))</div><div class='del'>-		sbi-&gt;s_chksum_seed = f2fs_chksum(sbi, ~0, raw_super-&gt;uuid,</div><div class='del'>-						sizeof(raw_super-&gt;uuid));</div><div class='add'>+		sbi-&gt;s_chksum_seed = f2fs_chksum(~0, raw_super-&gt;uuid,</div><div class='add'>+						 sizeof(raw_super-&gt;uuid));</div><div class='ctx'> </div><div class='ctx'> 	default_options(sbi, false);</div><div class='del'>-	/* parse mount options */</div><div class='del'>-	options = kstrdup((const char *)data, GFP_KERNEL);</div><div class='del'>-	if (data &amp;&amp; !options) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = f2fs_check_opt_consistency(fc, sb);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto free_sb_buf;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = parse_options(sb, options, false);</div><div class='add'>+	f2fs_apply_options(fc, sb);</div><div class='add'>+</div><div class='add'>+	err = f2fs_sanity_check_options(sbi, false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_options;</div><div class='ctx'> </div><div class='hunk'>@@ -4496,7 +4986,16 @@ try_onemore:</div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='ctx'> 	sb-&gt;s_flags = (sb-&gt;s_flags &amp; ~SB_POSIXACL) |</div><div class='ctx'> 		(test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0);</div><div class='del'>-	memcpy(&amp;sb-&gt;s_uuid, raw_super-&gt;uuid, sizeof(raw_super-&gt;uuid));</div><div class='add'>+	if (test_opt(sbi, INLINECRYPT))</div><div class='add'>+		sb-&gt;s_flags |= SB_INLINECRYPT;</div><div class='add'>+</div><div class='add'>+	if (test_opt(sbi, LAZYTIME))</div><div class='add'>+		sb-&gt;s_flags |= SB_LAZYTIME;</div><div class='add'>+	else</div><div class='add'>+		sb-&gt;s_flags &amp;= ~SB_LAZYTIME;</div><div class='add'>+</div><div class='add'>+	super_set_uuid(sb, (void *) raw_super-&gt;uuid, sizeof(raw_super-&gt;uuid));</div><div class='add'>+	super_set_sysfs_name_bdev(sb);</div><div class='ctx'> 	sb-&gt;s_iflags |= SB_I_CGROUPWB;</div><div class='ctx'> </div><div class='ctx'> 	/* init f2fs-specific super block info */</div><div class='hunk'>@@ -4519,22 +5018,9 @@ try_onemore:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_iostat;</div><div class='ctx'> </div><div class='del'>-	if (F2FS_IO_ALIGNED(sbi)) {</div><div class='del'>-		sbi-&gt;write_io_dummy =</div><div class='del'>-			mempool_create_page_pool(2 * (F2FS_IO_SIZE(sbi) - 1), 0);</div><div class='del'>-		if (!sbi-&gt;write_io_dummy) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto free_percpu;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* init per sbi slab cache */</div><div class='del'>-	err = f2fs_init_xattr_caches(sbi);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free_io_dummy;</div><div class='ctx'> 	err = f2fs_init_page_array_cache(sbi);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto free_xattr_cache;</div><div class='add'>+		goto free_percpu;</div><div class='ctx'> </div><div class='ctx'> 	/* get an inode for meta space */</div><div class='ctx'> 	sbi-&gt;meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi));</div><div class='hunk'>@@ -4619,13 +5105,16 @@ try_onemore:</div><div class='ctx'> 		goto free_nm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = adjust_reserved_segment(sbi);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free_nm;</div><div class='del'>-</div><div class='ctx'> 	/* For write statistics */</div><div class='ctx'> 	sbi-&gt;sectors_written_start = f2fs_get_sectors_written(sbi);</div><div class='ctx'> </div><div class='add'>+	/* get segno of first zoned block device */</div><div class='add'>+	sbi-&gt;first_seq_zone_segno = get_first_seq_zone_segno(sbi);</div><div class='add'>+</div><div class='add'>+	sbi-&gt;reserved_pin_section = f2fs_sb_has_blkzoned(sbi) ?</div><div class='add'>+			ZONED_PIN_SEC_REQUIRED_COUNT :</div><div class='add'>+			GET_SEC_FROM_SEG(sbi, overprovision_segments(sbi));</div><div class='add'>+</div><div class='ctx'> 	/* Read accumulated write IO statistics if exists */</div><div class='ctx'> 	seg_i = CURSEG_I(sbi, CURSEG_HOT_NODE);</div><div class='ctx'> 	if (__exist_node_summaries(sbi))</div><div class='hunk'>@@ -4660,6 +5149,7 @@ try_onemore:</div><div class='ctx'> 		goto free_node_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	generic_set_sb_d_ops(sb);</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root); /* allocate root dentry */</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -4674,6 +5164,7 @@ try_onemore:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_compress_inode;</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;umount_lock_holder = current;</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	/* Enable quota usage during mount */</div><div class='ctx'> 	if (f2fs_sb_has_quota_ino(sbi) &amp;&amp; !f2fs_readonly(sb)) {</div><div class='hunk'>@@ -4689,8 +5180,10 @@ try_onemore:</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_meta;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(is_set_ckpt_flags(sbi, CP_DISABLED_FLAG)))</div><div class='add'>+	if (unlikely(is_set_ckpt_flags(sbi, CP_DISABLED_FLAG))) {</div><div class='add'>+		skip_recovery = true;</div><div class='ctx'> 		goto reset_checkpoint;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* recover fsynced data */</div><div class='ctx'> 	if (!test_opt(sbi, DISABLE_ROLL_FORWARD) &amp;&amp;</div><div class='hunk'>@@ -4732,40 +5225,47 @@ try_onemore:</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = f2fs_recover_fsync_data(sbi, true);</div><div class='del'>-</div><div class='del'>-		if (!f2fs_readonly(sb) &amp;&amp; err &gt; 0) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			f2fs_err(sbi, "Need to recover fsync data");</div><div class='del'>-			goto free_meta;</div><div class='add'>+		if (err &gt; 0) {</div><div class='add'>+			if (!f2fs_readonly(sb)) {</div><div class='add'>+				f2fs_err(sbi, "Need to recover fsync data");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto free_meta;</div><div class='add'>+			} else {</div><div class='add'>+				f2fs_info(sbi, "drop all fsynced data");</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+reset_checkpoint:</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	f2fs_recover_quota_end(sbi, quota_enabled);</div><div class='ctx'> #endif</div><div class='del'>-reset_checkpoint:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the f2fs is not readonly and fsync data recovery succeeds,</div><div class='del'>-	 * check zoned block devices' write pointer consistency.</div><div class='add'>+	 * write pointer consistency of cursegs and other zones are already</div><div class='add'>+	 * checked and fixed during recovery. However, if recovery fails,</div><div class='add'>+	 * write pointers are left untouched, and retry-mount should check</div><div class='add'>+	 * them here.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!err &amp;&amp; !f2fs_readonly(sb) &amp;&amp; f2fs_sb_has_blkzoned(sbi)) {</div><div class='del'>-		err = f2fs_check_write_pointer(sbi);</div><div class='del'>-		if (err)</div><div class='del'>-			goto free_meta;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f2fs_init_inmem_curseg(sbi);</div><div class='add'>+	if (skip_recovery)</div><div class='add'>+		err = f2fs_check_and_fix_write_pointer(sbi);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_meta;</div><div class='ctx'> </div><div class='ctx'> 	/* f2fs_recover_fsync_data() cleared this already */</div><div class='ctx'> 	clear_sbi_flag(sbi, SBI_POR_DOING);</div><div class='ctx'> </div><div class='del'>-	if (test_opt(sbi, DISABLE_CHECKPOINT)) {</div><div class='add'>+	err = f2fs_init_inmem_curseg(sbi);</div><div class='add'>+	if (err)</div><div class='add'>+		goto sync_free_meta;</div><div class='add'>+</div><div class='add'>+	if (test_opt(sbi, DISABLE_CHECKPOINT))</div><div class='ctx'> 		err = f2fs_disable_checkpoint(sbi);</div><div class='del'>-		if (err)</div><div class='del'>-			goto sync_free_meta;</div><div class='del'>-	} else if (is_set_ckpt_flags(sbi, CP_DISABLED_FLAG)) {</div><div class='del'>-		f2fs_enable_checkpoint(sbi);</div><div class='del'>-	}</div><div class='add'>+	else if (is_set_ckpt_flags(sbi, CP_DISABLED_FLAG))</div><div class='add'>+		err = f2fs_enable_checkpoint(sbi);</div><div class='add'>+	if (err)</div><div class='add'>+		goto sync_free_meta;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If filesystem is not mounted as read-only then</div><div class='hunk'>@@ -4778,7 +5278,6 @@ reset_checkpoint:</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto sync_free_meta;</div><div class='ctx'> 	}</div><div class='del'>-	kvfree(options);</div><div class='ctx'> </div><div class='ctx'> 	/* recover broken superblock */</div><div class='ctx'> 	if (recovery) {</div><div class='hunk'>@@ -4796,6 +5295,8 @@ reset_checkpoint:</div><div class='ctx'> 	f2fs_update_time(sbi, CP_TIME);</div><div class='ctx'> 	f2fs_update_time(sbi, REQ_TIME);</div><div class='ctx'> 	clear_sbi_flag(sbi, SBI_CP_DISABLED_QUICK);</div><div class='add'>+</div><div class='add'>+	sbi-&gt;umount_lock_holder = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> sync_free_meta:</div><div class='hunk'>@@ -4851,17 +5352,13 @@ free_meta_inode:</div><div class='ctx'> 	sbi-&gt;meta_inode = NULL;</div><div class='ctx'> free_page_array_cache:</div><div class='ctx'> 	f2fs_destroy_page_array_cache(sbi);</div><div class='del'>-free_xattr_cache:</div><div class='del'>-	f2fs_destroy_xattr_caches(sbi);</div><div class='del'>-free_io_dummy:</div><div class='del'>-	mempool_destroy(sbi-&gt;write_io_dummy);</div><div class='ctx'> free_percpu:</div><div class='ctx'> 	destroy_percpu_info(sbi);</div><div class='ctx'> free_iostat:</div><div class='ctx'> 	f2fs_destroy_iostat(sbi);</div><div class='ctx'> free_bio_info:</div><div class='ctx'> 	for (i = 0; i &lt; NR_PAGE_TYPE; i++)</div><div class='del'>-		kvfree(sbi-&gt;write_io[i]);</div><div class='add'>+		kfree(sbi-&gt;write_io[i]);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	utf8_unload(sb-&gt;s_encoding);</div><div class='hunk'>@@ -4872,13 +5369,11 @@ free_options:</div><div class='ctx'> 	for (i = 0; i &lt; MAXQUOTAS; i++)</div><div class='ctx'> 		kfree(F2FS_OPTION(sbi).s_qf_names[i]);</div><div class='ctx'> #endif</div><div class='del'>-	fscrypt_free_dummy_policy(&amp;F2FS_OPTION(sbi).dummy_enc_policy);</div><div class='del'>-	kvfree(options);</div><div class='add'>+	/* no need to free dummy_enc_policy, we just keep it in ctx when failed */</div><div class='add'>+	swap(F2FS_CTX_INFO(ctx).dummy_enc_policy, F2FS_OPTION(sbi).dummy_enc_policy);</div><div class='ctx'> free_sb_buf:</div><div class='ctx'> 	kfree(raw_super);</div><div class='ctx'> free_sbi:</div><div class='del'>-	if (sbi-&gt;s_chksum_driver)</div><div class='del'>-		crypto_free_shash(sbi-&gt;s_chksum_driver);</div><div class='ctx'> 	kfree(sbi);</div><div class='ctx'> 	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -4891,17 +5386,46 @@ free_sbi:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *f2fs_mount(struct file_system_type *fs_type, int flags,</div><div class='del'>-			const char *dev_name, void *data)</div><div class='add'>+static int f2fs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, f2fs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f2fs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, f2fs_fill_super);</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+</div><div class='add'>+	return __f2fs_remount(fc, sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void f2fs_fc_free(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_QUOTA</div><div class='add'>+	f2fs_unnote_qf_name_all(fc);</div><div class='add'>+#endif</div><div class='add'>+	fscrypt_free_dummy_policy(&amp;F2FS_CTX_INFO(ctx).dummy_enc_policy);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations f2fs_context_ops = {</div><div class='add'>+	.parse_param	= f2fs_parse_param,</div><div class='add'>+	.get_tree	= f2fs_get_tree,</div><div class='add'>+	.reconfigure = f2fs_reconfigure,</div><div class='add'>+	.free	= f2fs_fc_free,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void kill_f2fs_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='ctx'> </div><div class='ctx'> 	if (sb-&gt;s_root) {</div><div class='add'>+		sbi-&gt;umount_lock_holder = current;</div><div class='add'>+</div><div class='ctx'> 		set_sbi_flag(sbi, SBI_IS_CLOSE);</div><div class='ctx'> 		f2fs_stop_gc_thread(sbi);</div><div class='ctx'> 		f2fs_stop_discard_thread(sbi);</div><div class='hunk'>@@ -4936,10 +5460,24 @@ static void kill_f2fs_super(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int f2fs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_fs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct f2fs_fs_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;f2fs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct file_system_type f2fs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "f2fs",</div><div class='del'>-	.mount		= f2fs_mount,</div><div class='add'>+	.init_fs_context = f2fs_init_fs_context,</div><div class='ctx'> 	.kill_sb	= kill_f2fs_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='ctx'> };</div><div class='hunk'>@@ -4967,12 +5505,6 @@ static int __init init_f2fs_fs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (PAGE_SIZE != F2FS_BLKSIZE) {</div><div class='del'>-		printk("F2FS not supported on PAGE_SIZE(%lu) != BLOCK_SIZE(%lu)\n",</div><div class='del'>-				PAGE_SIZE, F2FS_BLKSIZE);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = init_inodecache();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -5000,9 +5532,6 @@ static int __init init_f2fs_fs(void)</div><div class='ctx'> 	err = f2fs_init_shrinker();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_sysfs;</div><div class='del'>-	err = register_filesystem(&amp;f2fs_fs_type);</div><div class='del'>-	if (err)</div><div class='del'>-		goto free_shrinker;</div><div class='ctx'> 	f2fs_create_root_stats();</div><div class='ctx'> 	err = f2fs_init_post_read_processing();</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -5025,7 +5554,17 @@ static int __init init_f2fs_fs(void)</div><div class='ctx'> 	err = f2fs_create_casefold_cache();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_compress_cache;</div><div class='add'>+	err = f2fs_init_xattr_cache();</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_casefold_cache;</div><div class='add'>+	err = register_filesystem(&amp;f2fs_fs_type);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_xattr_cache;</div><div class='ctx'> 	return 0;</div><div class='add'>+free_xattr_cache:</div><div class='add'>+	f2fs_destroy_xattr_cache();</div><div class='add'>+free_casefold_cache:</div><div class='add'>+	f2fs_destroy_casefold_cache();</div><div class='ctx'> free_compress_cache:</div><div class='ctx'> 	f2fs_destroy_compress_cache();</div><div class='ctx'> free_compress_mempool:</div><div class='hunk'>@@ -5040,8 +5579,6 @@ free_post_read:</div><div class='ctx'> 	f2fs_destroy_post_read_processing();</div><div class='ctx'> free_root_stats:</div><div class='ctx'> 	f2fs_destroy_root_stats();</div><div class='del'>-	unregister_filesystem(&amp;f2fs_fs_type);</div><div class='del'>-free_shrinker:</div><div class='ctx'> 	f2fs_exit_shrinker();</div><div class='ctx'> free_sysfs:</div><div class='ctx'> 	f2fs_exit_sysfs();</div><div class='hunk'>@@ -5065,6 +5602,8 @@ fail:</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_f2fs_fs(void)</div><div class='ctx'> {</div><div class='add'>+	unregister_filesystem(&amp;f2fs_fs_type);</div><div class='add'>+	f2fs_destroy_xattr_cache();</div><div class='ctx'> 	f2fs_destroy_casefold_cache();</div><div class='ctx'> 	f2fs_destroy_compress_cache();</div><div class='ctx'> 	f2fs_destroy_compress_mempool();</div><div class='hunk'>@@ -5073,7 +5612,6 @@ static void __exit exit_f2fs_fs(void)</div><div class='ctx'> 	f2fs_destroy_iostat_processing();</div><div class='ctx'> 	f2fs_destroy_post_read_processing();</div><div class='ctx'> 	f2fs_destroy_root_stats();</div><div class='del'>-	unregister_filesystem(&amp;f2fs_fs_type);</div><div class='ctx'> 	f2fs_exit_shrinker();</div><div class='ctx'> 	f2fs_exit_sysfs();</div><div class='ctx'> 	f2fs_destroy_garbage_collection_cache();</div><div class='hunk'>@@ -5091,5 +5629,3 @@ module_exit(exit_f2fs_fs)</div><div class='ctx'> MODULE_AUTHOR("Samsung Electronics's Praesto Team");</div><div class='ctx'> MODULE_DESCRIPTION("Flash Friendly File System");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SOFTDEP("pre: crc32");</div><div class='del'>-</div><div class='head'>diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c<br/>index a7ec55c7bb20..c42f4f979d13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/sysfs.c</a></div><div class='hunk'>@@ -61,6 +61,12 @@ struct f2fs_attr {</div><div class='ctx'> 	int id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct f2fs_base_attr {</div><div class='add'>+	struct attribute attr;</div><div class='add'>+	ssize_t (*show)(struct f2fs_base_attr *a, char *buf);</div><div class='add'>+	ssize_t (*store)(struct f2fs_base_attr *a, const char *buf, size_t len);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t f2fs_sbi_show(struct f2fs_attr *a,</div><div class='ctx'> 			     struct f2fs_sb_info *sbi, char *buf);</div><div class='ctx'> </div><div class='hunk'>@@ -170,6 +176,12 @@ static ssize_t undiscard_blks_show(struct f2fs_attr *a,</div><div class='ctx'> 				SM_I(sbi)-&gt;dcc_info-&gt;undiscard_blks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t atgc_enabled_show(struct f2fs_attr *a,</div><div class='add'>+		struct f2fs_sb_info *sbi, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sysfs_emit(buf, "%d\n", sbi-&gt;am.atgc_enabled ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t gc_mode_show(struct f2fs_attr *a,</div><div class='ctx'> 		struct f2fs_sb_info *sbi, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -182,50 +194,53 @@ static ssize_t features_show(struct f2fs_attr *a,</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (f2fs_sb_has_encrypt(sbi))</div><div class='del'>-		len += scnprintf(buf, PAGE_SIZE - len, "%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s",</div><div class='ctx'> 						"encryption");</div><div class='ctx'> 	if (f2fs_sb_has_blkzoned(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "blkzoned");</div><div class='ctx'> 	if (f2fs_sb_has_extra_attr(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "extra_attr");</div><div class='ctx'> 	if (f2fs_sb_has_project_quota(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "projquota");</div><div class='ctx'> 	if (f2fs_sb_has_inode_chksum(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "inode_checksum");</div><div class='ctx'> 	if (f2fs_sb_has_flexible_inline_xattr(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "flexible_inline_xattr");</div><div class='ctx'> 	if (f2fs_sb_has_quota_ino(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "quota_ino");</div><div class='ctx'> 	if (f2fs_sb_has_inode_crtime(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "inode_crtime");</div><div class='ctx'> 	if (f2fs_sb_has_lost_found(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "lost_found");</div><div class='ctx'> 	if (f2fs_sb_has_verity(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "verity");</div><div class='ctx'> 	if (f2fs_sb_has_sb_chksum(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "sb_checksum");</div><div class='ctx'> 	if (f2fs_sb_has_casefold(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "casefold");</div><div class='ctx'> 	if (f2fs_sb_has_readonly(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "readonly");</div><div class='ctx'> 	if (f2fs_sb_has_compression(sbi))</div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "compression");</div><div class='del'>-	len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",</div><div class='add'>+	if (f2fs_sb_has_packed_ssa(sbi))</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s%s",</div><div class='add'>+				len ? ", " : "", "packed_ssa");</div><div class='add'>+	len += sysfs_emit_at(buf, len, "%s%s",</div><div class='ctx'> 				len ? ", " : "", "pin_file");</div><div class='del'>-	len += scnprintf(buf + len, PAGE_SIZE - len, "\n");</div><div class='add'>+	len += sysfs_emit_at(buf, len, "\n");</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -262,6 +277,29 @@ static ssize_t encoding_show(struct f2fs_attr *a,</div><div class='ctx'> 	return sysfs_emit(buf, "(none)\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t encoding_flags_show(struct f2fs_attr *a,</div><div class='add'>+		struct f2fs_sb_info *sbi, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sysfs_emit(buf, "%x\n",</div><div class='add'>+		le16_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;s_encoding_flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t effective_lookup_mode_show(struct f2fs_attr *a,</div><div class='add'>+		struct f2fs_sb_info *sbi, char *buf)</div><div class='add'>+{</div><div class='add'>+	switch (F2FS_OPTION(sbi).lookup_mode) {</div><div class='add'>+	case LOOKUP_PERF:</div><div class='add'>+		return sysfs_emit(buf, "perf\n");</div><div class='add'>+	case LOOKUP_COMPAT:</div><div class='add'>+		return sysfs_emit(buf, "compat\n");</div><div class='add'>+	case LOOKUP_AUTO:</div><div class='add'>+		if (sb_no_casefold_compat_fallback(sbi-&gt;sb))</div><div class='add'>+			return sysfs_emit(buf, "auto:perf\n");</div><div class='add'>+		return sysfs_emit(buf, "auto:compat\n");</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t mounted_time_sec_show(struct f2fs_attr *a,</div><div class='ctx'> 		struct f2fs_sb_info *sbi, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -323,30 +361,27 @@ static ssize_t f2fs_sbi_show(struct f2fs_attr *a,</div><div class='ctx'> 		int hot_count = sbi-&gt;raw_super-&gt;hot_ext_count;</div><div class='ctx'> 		int len = 0, i;</div><div class='ctx'> </div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='del'>-						"cold file extension:\n");</div><div class='add'>+		len += sysfs_emit_at(buf, len, "cold file extension:\n");</div><div class='ctx'> 		for (i = 0; i &lt; cold_count; i++)</div><div class='del'>-			len += scnprintf(buf + len, PAGE_SIZE - len, "%s\n",</div><div class='del'>-								extlist[i]);</div><div class='add'>+			len += sysfs_emit_at(buf, len, "%s\n", extlist[i]);</div><div class='ctx'> </div><div class='del'>-		len += scnprintf(buf + len, PAGE_SIZE - len,</div><div class='del'>-						"hot file extension:\n");</div><div class='add'>+		len += sysfs_emit_at(buf, len, "hot file extension:\n");</div><div class='ctx'> 		for (i = cold_count; i &lt; cold_count + hot_count; i++)</div><div class='del'>-			len += scnprintf(buf + len, PAGE_SIZE - len, "%s\n",</div><div class='del'>-								extlist[i]);</div><div class='add'>+			len += sysfs_emit_at(buf, len, "%s\n", extlist[i]);</div><div class='add'>+</div><div class='ctx'> 		return len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(a-&gt;attr.name, "ckpt_thread_ioprio")) {</div><div class='ctx'> 		struct ckpt_req_control *cprc = &amp;sbi-&gt;cprc_info;</div><div class='ctx'> 		int class = IOPRIO_PRIO_CLASS(cprc-&gt;ckpt_thread_ioprio);</div><div class='del'>-		int data = IOPRIO_PRIO_DATA(cprc-&gt;ckpt_thread_ioprio);</div><div class='add'>+		int level = IOPRIO_PRIO_LEVEL(cprc-&gt;ckpt_thread_ioprio);</div><div class='ctx'> </div><div class='ctx'> 		if (class != IOPRIO_CLASS_RT &amp;&amp; class != IOPRIO_CLASS_BE)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		return sysfs_emit(buf, "%s,%d\n",</div><div class='del'>-			class == IOPRIO_CLASS_RT ? "rt" : "be", data);</div><div class='add'>+			class == IOPRIO_CLASS_RT ? "rt" : "be", level);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='hunk'>@@ -450,7 +485,7 @@ out:</div><div class='ctx'> 		const char *name = strim((char *)buf);</div><div class='ctx'> 		struct ckpt_req_control *cprc = &amp;sbi-&gt;cprc_info;</div><div class='ctx'> 		int class;</div><div class='del'>-		long data;</div><div class='add'>+		long level;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='ctx'> 		if (!strncmp(name, "rt,", 3))</div><div class='hunk'>@@ -461,13 +496,13 @@ out:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		name += 3;</div><div class='del'>-		ret = kstrtol(name, 10, &amp;data);</div><div class='add'>+		ret = kstrtol(name, 10, &amp;level);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		if (data &gt;= IOPRIO_NR_LEVELS || data &lt; 0)</div><div class='add'>+		if (level &gt;= IOPRIO_NR_LEVELS || level &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		cprc-&gt;ckpt_thread_ioprio = IOPRIO_PRIO_VALUE(class, data);</div><div class='add'>+		cprc-&gt;ckpt_thread_ioprio = IOPRIO_PRIO_VALUE(class, level);</div><div class='ctx'> 		if (test_opt(sbi, MERGE_CHECKPOINT)) {</div><div class='ctx'> 			ret = set_task_ioprio(cprc-&gt;f2fs_issue_ckpt,</div><div class='ctx'> 					cprc-&gt;ckpt_thread_ioprio);</div><div class='hunk'>@@ -484,17 +519,21 @@ out:</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> #ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='del'>-	if (a-&gt;struct_type == FAULT_INFO_TYPE &amp;&amp; t &gt;= BIT(FAULT_MAX))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (a-&gt;struct_type == FAULT_INFO_RATE &amp;&amp; t &gt;= UINT_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (a-&gt;struct_type == FAULT_INFO_TYPE) {</div><div class='add'>+		if (f2fs_build_fault_attr(sbi, 0, t, FAULT_TYPE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+	if (a-&gt;struct_type == FAULT_INFO_RATE) {</div><div class='add'>+		if (f2fs_build_fault_attr(sbi, t, 0, FAULT_RATE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (a-&gt;struct_type == RESERVED_BLOCKS) {</div><div class='ctx'> 		spin_lock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 		if (t &gt; (unsigned long)(sbi-&gt;user_block_count -</div><div class='del'>-				F2FS_OPTION(sbi).root_reserved_blocks -</div><div class='del'>-				sbi-&gt;blocks_per_seg *</div><div class='del'>-				SM_I(sbi)-&gt;additional_reserved_segments)) {</div><div class='add'>+				F2FS_OPTION(sbi).root_reserved_blocks)) {</div><div class='ctx'> 			spin_unlock(&amp;sbi-&gt;stat_lock);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -551,7 +590,12 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(a-&gt;attr.name, "migration_granularity")) {</div><div class='del'>-		if (t == 0 || t &gt; sbi-&gt;segs_per_sec)</div><div class='add'>+		if (t == 0 || t &gt; SEGS_PER_SEC(sbi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "migration_window_granularity")) {</div><div class='add'>+		if (t == 0 || t &gt; SEGS_PER_SEC(sbi))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -603,6 +647,27 @@ out:</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "gc_no_zoned_gc_percent")) {</div><div class='add'>+		if (t &gt; 100)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*ui = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "gc_boost_zoned_gc_percent")) {</div><div class='add'>+		if (t &gt; 100)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*ui = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "gc_valid_thresh_ratio")) {</div><div class='add'>+		if (t &gt; 100)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*ui = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_F2FS_IOSTAT</div><div class='ctx'> 	if (!strcmp(a-&gt;attr.name, "iostat_enable")) {</div><div class='ctx'> 		sbi-&gt;iostat_enable = !!t;</div><div class='hunk'>@@ -621,6 +686,15 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "blkzone_alloc_policy")) {</div><div class='add'>+		if (t &lt; BLKZONE_ALLOC_PRIOR_SEQ || t &gt; BLKZONE_ALLOC_PRIOR_CONV)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;blkzone_alloc_policy = t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	if (!strcmp(a-&gt;attr.name, "compr_written_block") ||</div><div class='ctx'> 		!strcmp(a-&gt;attr.name, "compr_saved_block")) {</div><div class='hunk'>@@ -675,6 +749,13 @@ out:</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "gc_pin_file_threshold")) {</div><div class='add'>+		if (t &gt; MAX_GC_FAILED_PINNED_FILES)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;gc_pin_file_threshold = t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!strcmp(a-&gt;attr.name, "gc_reclaimed_segments")) {</div><div class='ctx'> 		if (t != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -759,10 +840,18 @@ out:</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "max_read_extent_count")) {</div><div class='add'>+		if (t &gt; UINT_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*ui = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!strcmp(a-&gt;attr.name, "ipu_policy")) {</div><div class='ctx'> 		if (t &gt;= BIT(F2FS_IPU_MAX))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (t &amp;&amp; f2fs_lfs_mode(sbi))</div><div class='add'>+		/* allow F2FS_IPU_NOCACHE only for IPU in the pinned file */</div><div class='add'>+		if (f2fs_lfs_mode(sbi) &amp;&amp; (t &amp; ~BIT(F2FS_IPU_NOCACHE)))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		SM_I(sbi)-&gt;ipu_policy = (unsigned int)t;</div><div class='ctx'> 		return count;</div><div class='hunk'>@@ -775,6 +864,48 @@ out:</div><div class='ctx'> 		return count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "reserved_pin_section")) {</div><div class='add'>+		if (t &gt; GET_SEC_FROM_SEG(sbi, overprovision_segments(sbi)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*ui = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "gc_boost_gc_multiple")) {</div><div class='add'>+		if (t &lt; 1 || t &gt; SEGS_PER_SEC(sbi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;gc_thread-&gt;boost_gc_multiple = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "gc_boost_gc_greedy")) {</div><div class='add'>+		if (t &gt; GC_GREEDY)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;gc_thread-&gt;boost_gc_greedy = (unsigned int)t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "bggc_io_aware")) {</div><div class='add'>+		if (t &lt; AWARE_ALL_IO || t &gt; AWARE_NONE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;bggc_io_aware = t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "allocate_section_hint")) {</div><div class='add'>+		if (t &lt; 0 || t &gt; MAIN_SECS(sbi))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;allocate_section_hint = t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "allocate_section_policy")) {</div><div class='add'>+		if (t &lt; ALLOCATE_FORWARD_NOHINT || t &gt; ALLOCATE_FORWARD_FROM_HINT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sbi-&gt;allocate_section_policy = t;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	*ui = (unsigned int)t;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -826,6 +957,25 @@ static void f2fs_sb_release(struct kobject *kobj)</div><div class='ctx'> 	complete(&amp;sbi-&gt;s_kobj_unregister);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t f2fs_base_attr_show(struct kobject *kobj,</div><div class='add'>+				struct attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_base_attr *a = container_of(attr,</div><div class='add'>+				struct f2fs_base_attr, attr);</div><div class='add'>+</div><div class='add'>+	return a-&gt;show ? a-&gt;show(a, buf) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t f2fs_base_attr_store(struct kobject *kobj,</div><div class='add'>+				struct attribute *attr,</div><div class='add'>+				const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct f2fs_base_attr *a = container_of(attr,</div><div class='add'>+				struct f2fs_base_attr, attr);</div><div class='add'>+</div><div class='add'>+	return a-&gt;store ? a-&gt;store(a, buf, len) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Note that there are three feature list entries:</div><div class='ctx'>  * 1) /sys/fs/f2fs/features</div><div class='hunk'>@@ -844,18 +994,50 @@ static void f2fs_sb_release(struct kobject *kobj)</div><div class='ctx'>  *     please add new on-disk feature in this list only.</div><div class='ctx'>  *     - ref. F2FS_SB_FEATURE_RO_ATTR()</div><div class='ctx'>  */</div><div class='del'>-static ssize_t f2fs_feature_show(struct f2fs_attr *a,</div><div class='del'>-		struct f2fs_sb_info *sbi, char *buf)</div><div class='add'>+static ssize_t f2fs_feature_show(struct f2fs_base_attr *a, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sysfs_emit(buf, "supported\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define F2FS_FEATURE_RO_ATTR(_name)				\</div><div class='del'>-static struct f2fs_attr f2fs_attr_##_name = {			\</div><div class='add'>+static struct f2fs_base_attr f2fs_base_attr_##_name = {		\</div><div class='ctx'> 	.attr = {.name = __stringify(_name), .mode = 0444 },	\</div><div class='ctx'> 	.show	= f2fs_feature_show,				\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t f2fs_tune_show(struct f2fs_base_attr *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int res = 0;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "reclaim_caches_kb"))</div><div class='add'>+		res = f2fs_donate_files();</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%u\n", res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t f2fs_tune_store(struct f2fs_base_attr *a,</div><div class='add'>+			const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	unsigned long t;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul(skip_spaces(buf), 0, &amp;t);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(a-&gt;attr.name, "reclaim_caches_kb"))</div><div class='add'>+		f2fs_reclaim_caches(t);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define F2FS_TUNE_RW_ATTR(_name)				\</div><div class='add'>+static struct f2fs_base_attr f2fs_base_attr_##_name = {		\</div><div class='add'>+	.attr = {.name = __stringify(_name), .mode = 0644 },	\</div><div class='add'>+	.show	= f2fs_tune_show,				\</div><div class='add'>+	.store	= f2fs_tune_store,				\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t f2fs_sb_feature_show(struct f2fs_attr *a,</div><div class='ctx'> 		struct f2fs_sb_info *sbi, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -947,6 +1129,11 @@ GC_THREAD_RW_ATTR(gc_urgent_sleep_time, urgent_sleep_time);</div><div class='ctx'> GC_THREAD_RW_ATTR(gc_min_sleep_time, min_sleep_time);</div><div class='ctx'> GC_THREAD_RW_ATTR(gc_max_sleep_time, max_sleep_time);</div><div class='ctx'> GC_THREAD_RW_ATTR(gc_no_gc_sleep_time, no_gc_sleep_time);</div><div class='add'>+GC_THREAD_RW_ATTR(gc_no_zoned_gc_percent, no_zoned_gc_percent);</div><div class='add'>+GC_THREAD_RW_ATTR(gc_boost_zoned_gc_percent, boost_zoned_gc_percent);</div><div class='add'>+GC_THREAD_RW_ATTR(gc_valid_thresh_ratio, valid_thresh_ratio);</div><div class='add'>+GC_THREAD_RW_ATTR(gc_boost_gc_multiple, boost_gc_multiple);</div><div class='add'>+GC_THREAD_RW_ATTR(gc_boost_gc_greedy, boost_gc_greedy);</div><div class='ctx'> </div><div class='ctx'> /* SM_INFO ATTR */</div><div class='ctx'> SM_INFO_RW_ATTR(reclaim_segments, rec_prefree_segments);</div><div class='hunk'>@@ -956,6 +1143,7 @@ SM_INFO_GENERAL_RW_ATTR(min_fsync_blocks);</div><div class='ctx'> SM_INFO_GENERAL_RW_ATTR(min_seq_blocks);</div><div class='ctx'> SM_INFO_GENERAL_RW_ATTR(min_hot_blocks);</div><div class='ctx'> SM_INFO_GENERAL_RW_ATTR(min_ssr_sections);</div><div class='add'>+SM_INFO_GENERAL_RW_ATTR(reserved_segments);</div><div class='ctx'> </div><div class='ctx'> /* DCC_INFO ATTR */</div><div class='ctx'> DCC_INFO_RW_ATTR(max_small_discards, max_discards);</div><div class='hunk'>@@ -988,7 +1176,10 @@ F2FS_SBI_RW_ATTR(gc_pin_file_thresh, gc_pin_file_threshold);</div><div class='ctx'> F2FS_SBI_RW_ATTR(gc_reclaimed_segments, gc_reclaimed_segs);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(max_victim_search);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(migration_granularity);</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(migration_window_granularity);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(dir_level);</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(allocate_section_hint);</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(allocate_section_policy);</div><div class='ctx'> #ifdef CONFIG_F2FS_IOSTAT</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(iostat_enable);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(iostat_period_ms);</div><div class='hunk'>@@ -1018,9 +1209,16 @@ F2FS_SBI_GENERAL_RW_ATTR(revoked_atomic_block);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(hot_data_age_threshold);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(warm_data_age_threshold);</div><div class='ctx'> F2FS_SBI_GENERAL_RW_ATTR(last_age_weight);</div><div class='add'>+/* read extent cache */</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(max_read_extent_count);</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> F2FS_SBI_GENERAL_RO_ATTR(unusable_blocks_per_sec);</div><div class='add'>+F2FS_SBI_GENERAL_RO_ATTR(max_open_zones);</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(blkzone_alloc_policy);</div><div class='ctx'> #endif</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(carve_out);</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(reserved_pin_section);</div><div class='add'>+F2FS_SBI_GENERAL_RW_ATTR(bggc_io_aware);</div><div class='ctx'> </div><div class='ctx'> /* STAT_INFO ATTR */</div><div class='ctx'> #ifdef CONFIG_F2FS_STAT_FS</div><div class='hunk'>@@ -1056,9 +1254,12 @@ F2FS_GENERAL_RO_ATTR(features);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(current_reserved_blocks);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(unusable);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(encoding);</div><div class='add'>+F2FS_GENERAL_RO_ATTR(encoding_flags);</div><div class='add'>+F2FS_GENERAL_RO_ATTR(effective_lookup_mode);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(mounted_time_sec);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(main_blkaddr);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(pending_discard);</div><div class='add'>+F2FS_GENERAL_RO_ATTR(atgc_enabled);</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(gc_mode);</div><div class='ctx'> #ifdef CONFIG_F2FS_STAT_FS</div><div class='ctx'> F2FS_GENERAL_RO_ATTR(moved_blocks_background);</div><div class='hunk'>@@ -1096,6 +1297,10 @@ F2FS_FEATURE_RO_ATTR(readonly);</div><div class='ctx'> F2FS_FEATURE_RO_ATTR(compression);</div><div class='ctx'> #endif</div><div class='ctx'> F2FS_FEATURE_RO_ATTR(pin_file);</div><div class='add'>+#ifdef CONFIG_UNICODE</div><div class='add'>+F2FS_FEATURE_RO_ATTR(linear_lookup);</div><div class='add'>+#endif</div><div class='add'>+F2FS_FEATURE_RO_ATTR(packed_ssa);</div><div class='ctx'> </div><div class='ctx'> #define ATTR_LIST(name) (&amp;f2fs_attr_##name.attr)</div><div class='ctx'> static struct attribute *f2fs_attrs[] = {</div><div class='hunk'>@@ -1103,6 +1308,11 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(gc_min_sleep_time),</div><div class='ctx'> 	ATTR_LIST(gc_max_sleep_time),</div><div class='ctx'> 	ATTR_LIST(gc_no_gc_sleep_time),</div><div class='add'>+	ATTR_LIST(gc_no_zoned_gc_percent),</div><div class='add'>+	ATTR_LIST(gc_boost_zoned_gc_percent),</div><div class='add'>+	ATTR_LIST(gc_valid_thresh_ratio),</div><div class='add'>+	ATTR_LIST(gc_boost_gc_multiple),</div><div class='add'>+	ATTR_LIST(gc_boost_gc_greedy),</div><div class='ctx'> 	ATTR_LIST(gc_idle),</div><div class='ctx'> 	ATTR_LIST(gc_urgent),</div><div class='ctx'> 	ATTR_LIST(reclaim_segments),</div><div class='hunk'>@@ -1125,8 +1335,10 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(min_seq_blocks),</div><div class='ctx'> 	ATTR_LIST(min_hot_blocks),</div><div class='ctx'> 	ATTR_LIST(min_ssr_sections),</div><div class='add'>+	ATTR_LIST(reserved_segments),</div><div class='ctx'> 	ATTR_LIST(max_victim_search),</div><div class='ctx'> 	ATTR_LIST(migration_granularity),</div><div class='add'>+	ATTR_LIST(migration_window_granularity),</div><div class='ctx'> 	ATTR_LIST(dir_level),</div><div class='ctx'> 	ATTR_LIST(ram_thresh),</div><div class='ctx'> 	ATTR_LIST(ra_nid_pages),</div><div class='hunk'>@@ -1137,6 +1349,7 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(discard_idle_interval),</div><div class='ctx'> 	ATTR_LIST(gc_idle_interval),</div><div class='ctx'> 	ATTR_LIST(umount_discard_timeout),</div><div class='add'>+	ATTR_LIST(bggc_io_aware),</div><div class='ctx'> #ifdef CONFIG_F2FS_IOSTAT</div><div class='ctx'> 	ATTR_LIST(iostat_enable),</div><div class='ctx'> 	ATTR_LIST(iostat_period_ms),</div><div class='hunk'>@@ -1162,6 +1375,8 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(reserved_blocks),</div><div class='ctx'> 	ATTR_LIST(current_reserved_blocks),</div><div class='ctx'> 	ATTR_LIST(encoding),</div><div class='add'>+	ATTR_LIST(encoding_flags),</div><div class='add'>+	ATTR_LIST(effective_lookup_mode),</div><div class='ctx'> 	ATTR_LIST(mounted_time_sec),</div><div class='ctx'> #ifdef CONFIG_F2FS_STAT_FS</div><div class='ctx'> 	ATTR_LIST(cp_foreground_calls),</div><div class='hunk'>@@ -1174,6 +1389,8 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 	ATTR_LIST(unusable_blocks_per_sec),</div><div class='add'>+	ATTR_LIST(max_open_zones),</div><div class='add'>+	ATTR_LIST(blkzone_alloc_policy),</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='ctx'> 	ATTR_LIST(compr_written_block),</div><div class='hunk'>@@ -1187,6 +1404,7 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(atgc_candidate_count),</div><div class='ctx'> 	ATTR_LIST(atgc_age_weight),</div><div class='ctx'> 	ATTR_LIST(atgc_age_threshold),</div><div class='add'>+	ATTR_LIST(atgc_enabled),</div><div class='ctx'> 	ATTR_LIST(seq_file_ra_mul),</div><div class='ctx'> 	ATTR_LIST(gc_segment_mode),</div><div class='ctx'> 	ATTR_LIST(gc_reclaimed_segments),</div><div class='hunk'>@@ -1199,41 +1417,51 @@ static struct attribute *f2fs_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(hot_data_age_threshold),</div><div class='ctx'> 	ATTR_LIST(warm_data_age_threshold),</div><div class='ctx'> 	ATTR_LIST(last_age_weight),</div><div class='add'>+	ATTR_LIST(max_read_extent_count),</div><div class='add'>+	ATTR_LIST(carve_out),</div><div class='add'>+	ATTR_LIST(reserved_pin_section),</div><div class='add'>+	ATTR_LIST(allocate_section_hint),</div><div class='add'>+	ATTR_LIST(allocate_section_policy),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(f2fs);</div><div class='ctx'> </div><div class='add'>+#define BASE_ATTR_LIST(name) (&amp;f2fs_base_attr_##name.attr)</div><div class='ctx'> static struct attribute *f2fs_feat_attrs[] = {</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-	ATTR_LIST(encryption),</div><div class='del'>-	ATTR_LIST(test_dummy_encryption_v2),</div><div class='add'>+	BASE_ATTR_LIST(encryption),</div><div class='add'>+	BASE_ATTR_LIST(test_dummy_encryption_v2),</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	ATTR_LIST(encrypted_casefold),</div><div class='add'>+	BASE_ATTR_LIST(encrypted_casefold),</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_FS_ENCRYPTION */</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-	ATTR_LIST(block_zoned),</div><div class='add'>+	BASE_ATTR_LIST(block_zoned),</div><div class='ctx'> #endif</div><div class='del'>-	ATTR_LIST(atomic_write),</div><div class='del'>-	ATTR_LIST(extra_attr),</div><div class='del'>-	ATTR_LIST(project_quota),</div><div class='del'>-	ATTR_LIST(inode_checksum),</div><div class='del'>-	ATTR_LIST(flexible_inline_xattr),</div><div class='del'>-	ATTR_LIST(quota_ino),</div><div class='del'>-	ATTR_LIST(inode_crtime),</div><div class='del'>-	ATTR_LIST(lost_found),</div><div class='add'>+	BASE_ATTR_LIST(atomic_write),</div><div class='add'>+	BASE_ATTR_LIST(extra_attr),</div><div class='add'>+	BASE_ATTR_LIST(project_quota),</div><div class='add'>+	BASE_ATTR_LIST(inode_checksum),</div><div class='add'>+	BASE_ATTR_LIST(flexible_inline_xattr),</div><div class='add'>+	BASE_ATTR_LIST(quota_ino),</div><div class='add'>+	BASE_ATTR_LIST(inode_crtime),</div><div class='add'>+	BASE_ATTR_LIST(lost_found),</div><div class='ctx'> #ifdef CONFIG_FS_VERITY</div><div class='del'>-	ATTR_LIST(verity),</div><div class='add'>+	BASE_ATTR_LIST(verity),</div><div class='ctx'> #endif</div><div class='del'>-	ATTR_LIST(sb_checksum),</div><div class='add'>+	BASE_ATTR_LIST(sb_checksum),</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	ATTR_LIST(casefold),</div><div class='add'>+	BASE_ATTR_LIST(casefold),</div><div class='ctx'> #endif</div><div class='del'>-	ATTR_LIST(readonly),</div><div class='add'>+	BASE_ATTR_LIST(readonly),</div><div class='ctx'> #ifdef CONFIG_F2FS_FS_COMPRESSION</div><div class='del'>-	ATTR_LIST(compression),</div><div class='add'>+	BASE_ATTR_LIST(compression),</div><div class='add'>+#endif</div><div class='add'>+	BASE_ATTR_LIST(pin_file),</div><div class='add'>+#ifdef CONFIG_UNICODE</div><div class='add'>+	BASE_ATTR_LIST(linear_lookup),</div><div class='ctx'> #endif</div><div class='del'>-	ATTR_LIST(pin_file),</div><div class='add'>+	BASE_ATTR_LIST(packed_ssa),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(f2fs_feat);</div><div class='hunk'>@@ -1268,6 +1496,8 @@ F2FS_SB_FEATURE_RO_ATTR(sb_checksum, SB_CHKSUM);</div><div class='ctx'> F2FS_SB_FEATURE_RO_ATTR(casefold, CASEFOLD);</div><div class='ctx'> F2FS_SB_FEATURE_RO_ATTR(compression, COMPRESSION);</div><div class='ctx'> F2FS_SB_FEATURE_RO_ATTR(readonly, RO);</div><div class='add'>+F2FS_SB_FEATURE_RO_ATTR(device_alias, DEVICE_ALIAS);</div><div class='add'>+F2FS_SB_FEATURE_RO_ATTR(packed_ssa, PACKED_SSA);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *f2fs_sb_feat_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(sb_encryption),</div><div class='hunk'>@@ -1284,10 +1514,20 @@ static struct attribute *f2fs_sb_feat_attrs[] = {</div><div class='ctx'> 	ATTR_LIST(sb_casefold),</div><div class='ctx'> 	ATTR_LIST(sb_compression),</div><div class='ctx'> 	ATTR_LIST(sb_readonly),</div><div class='add'>+	ATTR_LIST(sb_device_alias),</div><div class='add'>+	ATTR_LIST(sb_packed_ssa),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> ATTRIBUTE_GROUPS(f2fs_sb_feat);</div><div class='ctx'> </div><div class='add'>+F2FS_TUNE_RW_ATTR(reclaim_caches_kb);</div><div class='add'>+</div><div class='add'>+static struct attribute *f2fs_tune_attrs[] = {</div><div class='add'>+	BASE_ATTR_LIST(reclaim_caches_kb),</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(f2fs_tune);</div><div class='add'>+</div><div class='ctx'> static const struct sysfs_ops f2fs_attr_ops = {</div><div class='ctx'> 	.show	= f2fs_attr_show,</div><div class='ctx'> 	.store	= f2fs_attr_store,</div><div class='hunk'>@@ -1307,15 +1547,34 @@ static struct kset f2fs_kset = {</div><div class='ctx'> 	.kobj	= {.ktype = &amp;f2fs_ktype},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct sysfs_ops f2fs_feat_attr_ops = {</div><div class='add'>+	.show	= f2fs_base_attr_show,</div><div class='add'>+	.store	= f2fs_base_attr_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct kobj_type f2fs_feat_ktype = {</div><div class='ctx'> 	.default_groups = f2fs_feat_groups,</div><div class='del'>-	.sysfs_ops	= &amp;f2fs_attr_ops,</div><div class='add'>+	.sysfs_ops	= &amp;f2fs_feat_attr_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct kobject f2fs_feat = {</div><div class='ctx'> 	.kset	= &amp;f2fs_kset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct sysfs_ops f2fs_tune_attr_ops = {</div><div class='add'>+	.show	= f2fs_base_attr_show,</div><div class='add'>+	.store	= f2fs_base_attr_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kobj_type f2fs_tune_ktype = {</div><div class='add'>+	.default_groups = f2fs_tune_groups,</div><div class='add'>+	.sysfs_ops	= &amp;f2fs_tune_attr_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kobject f2fs_tune = {</div><div class='add'>+	.kset	= &amp;f2fs_kset,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t f2fs_stat_attr_show(struct kobject *kobj,</div><div class='ctx'> 				struct attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1417,7 +1676,7 @@ static int __maybe_unused segment_bits_seq_show(struct seq_file *seq,</div><div class='ctx'> 			le32_to_cpu(sbi-&gt;raw_super-&gt;segment_count_main);</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	seq_puts(seq, "format: segment_type|valid_blocks|bitmaps\n"</div><div class='add'>+	seq_puts(seq, "format: segment_type|valid_blocks|bitmaps|mtime\n"</div><div class='ctx'> 		"segment_type(0:HD, 1:WD, 2:CD, 3:HN, 4:WN, 5:CN)\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; total_segs; i++) {</div><div class='hunk'>@@ -1427,6 +1686,7 @@ static int __maybe_unused segment_bits_seq_show(struct seq_file *seq,</div><div class='ctx'> 		seq_printf(seq, "%d|%-3u|", se-&gt;type, se-&gt;valid_blocks);</div><div class='ctx'> 		for (j = 0; j &lt; SIT_VBLOCK_MAP_SIZE; j++)</div><div class='ctx'> 			seq_printf(seq, " %.2x", se-&gt;cur_valid_map[j]);</div><div class='add'>+		seq_printf(seq, "| %llx", se-&gt;mtime);</div><div class='ctx'> 		seq_putc(seq, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1492,6 +1752,134 @@ static int __maybe_unused discard_plist_seq_show(struct seq_file *seq,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __maybe_unused disk_map_seq_show(struct seq_file *seq,</div><div class='add'>+						void *offset)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = seq-&gt;private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "Address Layout   : %5luB Block address (# of Segments)\n",</div><div class='add'>+					F2FS_BLKSIZE);</div><div class='add'>+	seq_printf(seq, " SB            : %12s\n", "0/1024B");</div><div class='add'>+	seq_printf(seq, " seg0_blkaddr  : 0x%010x\n", SEG0_BLKADDR(sbi));</div><div class='add'>+	seq_printf(seq, " Checkpoint    : 0x%010x (%10d)\n",</div><div class='add'>+			le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;cp_blkaddr), 2);</div><div class='add'>+	seq_printf(seq, " SIT           : 0x%010x (%10d)\n",</div><div class='add'>+			SIT_I(sbi)-&gt;sit_base_addr,</div><div class='add'>+			le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;segment_count_sit));</div><div class='add'>+	seq_printf(seq, " NAT           : 0x%010x (%10d)\n",</div><div class='add'>+			NM_I(sbi)-&gt;nat_blkaddr,</div><div class='add'>+			le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;segment_count_nat));</div><div class='add'>+	seq_printf(seq, " SSA           : 0x%010x (%10d)\n",</div><div class='add'>+			SM_I(sbi)-&gt;ssa_blkaddr,</div><div class='add'>+			le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;segment_count_ssa));</div><div class='add'>+	seq_printf(seq, " Main          : 0x%010x (%10d)\n",</div><div class='add'>+			SM_I(sbi)-&gt;main_blkaddr,</div><div class='add'>+			le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;segment_count_main));</div><div class='add'>+	seq_printf(seq, " Block size    : %12lu KB\n", F2FS_BLKSIZE &gt;&gt; 10);</div><div class='add'>+	seq_printf(seq, " Segment size  : %12d MB\n",</div><div class='add'>+			(BLKS_PER_SEG(sbi) &lt;&lt; (F2FS_BLKSIZE_BITS - 10)) &gt;&gt; 10);</div><div class='add'>+	seq_printf(seq, " Segs/Sections : %12d\n",</div><div class='add'>+			SEGS_PER_SEC(sbi));</div><div class='add'>+	seq_printf(seq, " Section size  : %12d MB\n",</div><div class='add'>+			(BLKS_PER_SEC(sbi) &lt;&lt; (F2FS_BLKSIZE_BITS - 10)) &gt;&gt; 10);</div><div class='add'>+	seq_printf(seq, " # of Sections : %12d\n",</div><div class='add'>+			le32_to_cpu(F2FS_RAW_SUPER(sbi)-&gt;section_count));</div><div class='add'>+</div><div class='add'>+	if (!f2fs_is_multi_device(sbi))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	seq_puts(seq, "\nDisk Map for multi devices:\n");</div><div class='add'>+	for (i = 0; i &lt; sbi-&gt;s_ndevs; i++)</div><div class='add'>+		seq_printf(seq, "Disk:%2d (zoned=%d): 0x%010x - 0x%010x on %s\n",</div><div class='add'>+			i, bdev_is_zoned(FDEV(i).bdev),</div><div class='add'>+			FDEV(i).start_blk, FDEV(i).end_blk,</div><div class='add'>+			FDEV(i).path);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused donation_list_seq_show(struct seq_file *seq,</div><div class='add'>+						void *offset)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = seq-&gt;private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct f2fs_inode_info *fi;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	char *buf, *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	buf = f2fs_getname(sbi);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "Donation List\n");</div><div class='add'>+	seq_printf(seq, " # of files  : %u\n", sbi-&gt;donate_files);</div><div class='add'>+	seq_printf(seq, " %-50s %10s %20s %20s %22s\n",</div><div class='add'>+			"File path", "Status", "Donation offset (kb)",</div><div class='add'>+			"Donation size (kb)", "File cached size (kb)");</div><div class='add'>+	seq_printf(seq, "---\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sbi-&gt;donate_files; i++) {</div><div class='add'>+		spin_lock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+		if (list_empty(&amp;sbi-&gt;inode_list[DONATE_INODE])) {</div><div class='add'>+			spin_unlock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fi = list_first_entry(&amp;sbi-&gt;inode_list[DONATE_INODE],</div><div class='add'>+					struct f2fs_inode_info, gdonate_list);</div><div class='add'>+		list_move_tail(&amp;fi-&gt;gdonate_list, &amp;sbi-&gt;inode_list[DONATE_INODE]);</div><div class='add'>+		inode = igrab(&amp;fi-&gt;vfs_inode);</div><div class='add'>+		spin_unlock(&amp;sbi-&gt;inode_lock[DONATE_INODE]);</div><div class='add'>+</div><div class='add'>+		if (!inode)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		inode_lock_shared(inode);</div><div class='add'>+</div><div class='add'>+		dentry = d_find_alias(inode);</div><div class='add'>+		if (!dentry) {</div><div class='add'>+			path = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			path = dentry_path_raw(dentry, buf, PATH_MAX);</div><div class='add'>+			if (IS_ERR(path))</div><div class='add'>+				goto next;</div><div class='add'>+		}</div><div class='add'>+		seq_printf(seq, " %-50s %10s %20llu %20llu %22llu\n",</div><div class='add'>+				path ? path : "&lt;unlinked&gt;",</div><div class='add'>+				is_inode_flag_set(inode, FI_DONATE_FINISHED) ?</div><div class='add'>+				"Evicted" : "Donated",</div><div class='add'>+				(loff_t)fi-&gt;donate_start &lt;&lt; (PAGE_SHIFT - 10),</div><div class='add'>+				(loff_t)(fi-&gt;donate_end + 1) &lt;&lt; (PAGE_SHIFT - 10),</div><div class='add'>+				(loff_t)inode-&gt;i_mapping-&gt;nrpages &lt;&lt; (PAGE_SHIFT - 10));</div><div class='add'>+next:</div><div class='add'>+		dput(dentry);</div><div class='add'>+		inode_unlock_shared(inode);</div><div class='add'>+		iput(inode);</div><div class='add'>+	}</div><div class='add'>+	f2fs_putname(buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='add'>+static int __maybe_unused inject_stats_seq_show(struct seq_file *seq,</div><div class='add'>+						void *offset)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = seq-&gt;private;</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_SB(sb);</div><div class='add'>+	struct f2fs_fault_info *ffi = &amp;F2FS_OPTION(sbi).fault_info;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	seq_puts(seq, "fault_type		injected_count\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FAULT_MAX; i++)</div><div class='add'>+		seq_printf(seq, "%-24s%-10u\n", f2fs_fault_name[i],</div><div class='add'>+						ffi-&gt;inject_count[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int __init f2fs_init_sysfs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1507,6 +1895,11 @@ int __init f2fs_init_sysfs(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto put_kobject;</div><div class='ctx'> </div><div class='add'>+	ret = kobject_init_and_add(&amp;f2fs_tune, &amp;f2fs_tune_ktype,</div><div class='add'>+				   NULL, "tuning");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto put_kobject;</div><div class='add'>+</div><div class='ctx'> 	f2fs_proc_root = proc_mkdir("fs/f2fs", NULL);</div><div class='ctx'> 	if (!f2fs_proc_root) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1514,7 +1907,9 @@ int __init f2fs_init_sysfs(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='ctx'> put_kobject:</div><div class='add'>+	kobject_put(&amp;f2fs_tune);</div><div class='ctx'> 	kobject_put(&amp;f2fs_feat);</div><div class='ctx'> 	kset_unregister(&amp;f2fs_kset);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1522,6 +1917,7 @@ put_kobject:</div><div class='ctx'> </div><div class='ctx'> void f2fs_exit_sysfs(void)</div><div class='ctx'> {</div><div class='add'>+	kobject_put(&amp;f2fs_tune);</div><div class='ctx'> 	kobject_put(&amp;f2fs_feat);</div><div class='ctx'> 	kset_unregister(&amp;f2fs_kset);</div><div class='ctx'> 	remove_proc_entry("fs/f2fs", NULL);</div><div class='hunk'>@@ -1573,6 +1969,14 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)</div><div class='ctx'> 				victim_bits_seq_show, sb);</div><div class='ctx'> 	proc_create_single_data("discard_plist_info", 0444, sbi-&gt;s_proc,</div><div class='ctx'> 				discard_plist_seq_show, sb);</div><div class='add'>+	proc_create_single_data("disk_map", 0444, sbi-&gt;s_proc,</div><div class='add'>+				disk_map_seq_show, sb);</div><div class='add'>+	proc_create_single_data("donation_list", 0444, sbi-&gt;s_proc,</div><div class='add'>+				donation_list_seq_show, sb);</div><div class='add'>+#ifdef CONFIG_F2FS_FAULT_INJECTION</div><div class='add'>+	proc_create_single_data("inject_stats", 0444, sbi-&gt;s_proc,</div><div class='add'>+				inject_stats_seq_show, sb);</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> put_feature_list_kobj:</div><div class='ctx'> 	kobject_put(&amp;sbi-&gt;s_feature_list_kobj);</div><div class='head'>diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c<br/>index 4fc95f353a7a..05b935b55216 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/verity.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/verity.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/verity.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/verity.c</a></div><div class='hunk'>@@ -74,23 +74,23 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	const struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='ctx'> </div><div class='del'>-	if (pos + count &gt; inode-&gt;i_sb-&gt;s_maxbytes)</div><div class='add'>+	if (pos + count &gt; F2FS_BLK_TO_BYTES(max_file_blocks(inode)))</div><div class='ctx'> 		return -EFBIG;</div><div class='ctx'> </div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		size_t n = min_t(size_t, count,</div><div class='ctx'> 				 PAGE_SIZE - offset_in_page(pos));</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		void *fsdata = NULL;</div><div class='ctx'> 		int res;</div><div class='ctx'> </div><div class='del'>-		res = aops-&gt;write_begin(NULL, mapping, pos, n, &amp;page, &amp;fsdata);</div><div class='add'>+		res = aops-&gt;write_begin(NULL, mapping, pos, n, &amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return res;</div><div class='ctx'> </div><div class='del'>-		memcpy_to_page(page, offset_in_page(pos), buf, n);</div><div class='add'>+		memcpy_to_folio(folio, offset_in_folio(folio, pos), buf, n);</div><div class='ctx'> </div><div class='del'>-		res = aops-&gt;write_end(NULL, mapping, pos, n, n, page, fsdata);</div><div class='add'>+		res = aops-&gt;write_end(NULL, mapping, pos, n, n, folio, fsdata);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			return res;</div><div class='ctx'> 		if (res != n)</div><div class='hunk'>@@ -237,7 +237,8 @@ static int f2fs_get_verity_descriptor(struct inode *inode, void *buf,</div><div class='ctx'> 	pos = le64_to_cpu(dloc.pos);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the descriptor */</div><div class='del'>-	if (pos + size &lt; pos || pos + size &gt; inode-&gt;i_sb-&gt;s_maxbytes ||</div><div class='add'>+	if (pos + size &lt; pos ||</div><div class='add'>+	    pos + size &gt; F2FS_BLK_TO_BYTES(max_file_blocks(inode)) ||</div><div class='ctx'> 	    pos &lt; f2fs_verity_metadata_pos(inode) || size &gt; INT_MAX) {</div><div class='ctx'> 		f2fs_warn(F2FS_I_SB(inode), "invalid verity xattr");</div><div class='ctx'> 		f2fs_handle_error(F2FS_I_SB(inode),</div><div class='hunk'>@@ -258,21 +259,23 @@ static struct page *f2fs_read_merkle_tree_page(struct inode *inode,</div><div class='ctx'> 					       pgoff_t index,</div><div class='ctx'> 					       unsigned long num_ra_pages)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	index += f2fs_verity_metadata_pos(inode) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	page = find_get_page_flags(inode-&gt;i_mapping, index, FGP_ACCESSED);</div><div class='del'>-	if (!page || !PageUptodate(page)) {</div><div class='add'>+	folio = f2fs_filemap_get_folio(inode-&gt;i_mapping, index, FGP_ACCESSED, 0);</div><div class='add'>+	if (IS_ERR(folio) || !folio_test_uptodate(folio)) {</div><div class='ctx'> 		DEFINE_READAHEAD(ractl, NULL, NULL, inode-&gt;i_mapping, index);</div><div class='ctx'> </div><div class='del'>-		if (page)</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (!IS_ERR(folio))</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		else if (num_ra_pages &gt; 1)</div><div class='ctx'> 			page_cache_ra_unbounded(&amp;ractl, num_ra_pages, 0);</div><div class='del'>-		page = read_mapping_page(inode-&gt;i_mapping, index, NULL);</div><div class='add'>+		folio = read_mapping_folio(inode-&gt;i_mapping, index, NULL);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return ERR_CAST(folio);</div><div class='ctx'> 	}</div><div class='del'>-	return page;</div><div class='add'>+	return folio_file_page(folio, index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int f2fs_write_merkle_tree_block(struct inode *inode, const void *buf,</div><div class='hunk'>@@ -284,6 +287,8 @@ static int f2fs_write_merkle_tree_block(struct inode *inode, const void *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct fsverity_operations f2fs_verityops = {</div><div class='add'>+	.inode_info_offs	= (int)offsetof(struct f2fs_inode_info, i_verity_info) -</div><div class='add'>+				  (int)offsetof(struct f2fs_inode_info, vfs_inode),</div><div class='ctx'> 	.begin_enable_verity	= f2fs_begin_enable_verity,</div><div class='ctx'> 	.end_enable_verity	= f2fs_end_enable_verity,</div><div class='ctx'> 	.get_verity_descriptor	= f2fs_get_verity_descriptor,</div><div class='head'>diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c<br/>index f290fe9327c4..b4e5c406632f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/xattr.c</a></div><div class='hunk'>@@ -23,11 +23,12 @@</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> #include "segment.h"</div><div class='ctx'> </div><div class='add'>+static struct kmem_cache *inline_xattr_slab;</div><div class='ctx'> static void *xattr_alloc(struct f2fs_sb_info *sbi, int size, bool *is_inline)</div><div class='ctx'> {</div><div class='del'>-	if (likely(size == sbi-&gt;inline_xattr_slab_size)) {</div><div class='add'>+	if (likely(size == DEFAULT_XATTR_SLAB_SIZE)) {</div><div class='ctx'> 		*is_inline = true;</div><div class='del'>-		return f2fs_kmem_cache_alloc(sbi-&gt;inline_xattr_slab,</div><div class='add'>+		return f2fs_kmem_cache_alloc(inline_xattr_slab,</div><div class='ctx'> 					GFP_F2FS_ZERO, false, sbi);</div><div class='ctx'> 	}</div><div class='ctx'> 	*is_inline = false;</div><div class='hunk'>@@ -38,7 +39,7 @@ static void xattr_free(struct f2fs_sb_info *sbi, void *xattr_addr,</div><div class='ctx'> 							bool is_inline)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_inline)</div><div class='del'>-		kmem_cache_free(sbi-&gt;inline_xattr_slab, xattr_addr);</div><div class='add'>+		kmem_cache_free(inline_xattr_slab, xattr_addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree(xattr_addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -136,7 +137,7 @@ static int f2fs_xattr_advise_set(const struct xattr_handler *handler,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_SECURITY</div><div class='ctx'> static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,</div><div class='del'>-		void *page)</div><div class='add'>+		void *folio)</div><div class='ctx'> {</div><div class='ctx'> 	const struct xattr *xattr;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -144,7 +145,7 @@ static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,</div><div class='ctx'> 	for (xattr = xattr_array; xattr-&gt;name != NULL; xattr++) {</div><div class='ctx'> 		err = f2fs_setxattr(inode, F2FS_XATTR_INDEX_SECURITY,</div><div class='ctx'> 				xattr-&gt;name, xattr-&gt;value,</div><div class='del'>-				xattr-&gt;value_len, (struct page *)page, 0);</div><div class='add'>+				xattr-&gt;value_len, folio, 0);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -152,10 +153,10 @@ static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_init_security(struct inode *inode, struct inode *dir,</div><div class='del'>-				const struct qstr *qstr, struct page *ipage)</div><div class='add'>+				const struct qstr *qstr, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	return security_inode_init_security(inode, dir, qstr,</div><div class='del'>-				&amp;f2fs_initxattrs, ipage);</div><div class='add'>+				f2fs_initxattrs, ifolio);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -271,25 +272,25 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode,</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int read_inline_xattr(struct inode *inode, struct page *ipage,</div><div class='add'>+static int read_inline_xattr(struct inode *inode, struct folio *ifolio,</div><div class='ctx'> 							void *txattr_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	unsigned int inline_size = inline_xattr_size(inode);</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	void *inline_addr;</div><div class='ctx'> </div><div class='del'>-	if (ipage) {</div><div class='del'>-		inline_addr = inline_xattr_addr(inode, ipage);</div><div class='add'>+	if (ifolio) {</div><div class='add'>+		inline_addr = inline_xattr_addr(inode, ifolio);</div><div class='ctx'> 	} else {</div><div class='del'>-		page = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+		folio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-		inline_addr = inline_xattr_addr(inode, page);</div><div class='add'>+		inline_addr = inline_xattr_addr(inode, folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(txattr_addr, inline_addr, inline_size);</div><div class='del'>-	f2fs_put_page(page, 1);</div><div class='add'>+	f2fs_folio_put(folio, true);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -299,22 +300,22 @@ static int read_xattr_block(struct inode *inode, void *txattr_addr)</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	nid_t xnid = F2FS_I(inode)-&gt;i_xattr_nid;</div><div class='ctx'> 	unsigned int inline_size = inline_xattr_size(inode);</div><div class='del'>-	struct page *xpage;</div><div class='add'>+	struct folio *xfolio;</div><div class='ctx'> 	void *xattr_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* The inode already has an extended attribute block. */</div><div class='del'>-	xpage = f2fs_get_node_page(sbi, xnid);</div><div class='del'>-	if (IS_ERR(xpage))</div><div class='del'>-		return PTR_ERR(xpage);</div><div class='add'>+	xfolio = f2fs_get_xnode_folio(sbi, xnid);</div><div class='add'>+	if (IS_ERR(xfolio))</div><div class='add'>+		return PTR_ERR(xfolio);</div><div class='ctx'> </div><div class='del'>-	xattr_addr = page_address(xpage);</div><div class='add'>+	xattr_addr = folio_address(xfolio);</div><div class='ctx'> 	memcpy(txattr_addr + inline_size, xattr_addr, VALID_XATTR_BLOCK_SIZE);</div><div class='del'>-	f2fs_put_page(xpage, 1);</div><div class='add'>+	f2fs_folio_put(xfolio, true);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lookup_all_xattrs(struct inode *inode, struct page *ipage,</div><div class='add'>+static int lookup_all_xattrs(struct inode *inode, struct folio *ifolio,</div><div class='ctx'> 				unsigned int index, unsigned int len,</div><div class='ctx'> 				const char *name, struct f2fs_xattr_entry **xe,</div><div class='ctx'> 				void **base_addr, int *base_size,</div><div class='hunk'>@@ -338,7 +339,7 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage,</div><div class='ctx'> </div><div class='ctx'> 	/* read from inline xattr */</div><div class='ctx'> 	if (inline_size) {</div><div class='del'>-		err = read_inline_xattr(inode, ipage, txattr_addr);</div><div class='add'>+		err = read_inline_xattr(inode, ifolio, txattr_addr);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +386,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int read_all_xattrs(struct inode *inode, struct page *ipage,</div><div class='add'>+static int read_all_xattrs(struct inode *inode, struct folio *ifolio,</div><div class='ctx'> 							void **base_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_xattr_header *header;</div><div class='hunk'>@@ -402,7 +403,7 @@ static int read_all_xattrs(struct inode *inode, struct page *ipage,</div><div class='ctx'> </div><div class='ctx'> 	/* read from inline xattr */</div><div class='ctx'> 	if (inline_size) {</div><div class='del'>-		err = read_inline_xattr(inode, ipage, txattr_addr);</div><div class='add'>+		err = read_inline_xattr(inode, ifolio, txattr_addr);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -429,14 +430,14 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int write_all_xattrs(struct inode *inode, __u32 hsize,</div><div class='del'>-				void *txattr_addr, struct page *ipage)</div><div class='add'>+				void *txattr_addr, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	size_t inline_size = inline_xattr_size(inode);</div><div class='del'>-	struct page *in_page = NULL;</div><div class='add'>+	struct folio *in_folio = NULL;</div><div class='ctx'> 	void *xattr_addr;</div><div class='ctx'> 	void *inline_addr = NULL;</div><div class='del'>-	struct page *xpage;</div><div class='add'>+	struct folio *xfolio;</div><div class='ctx'> 	nid_t new_nid = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -446,73 +447,73 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,</div><div class='ctx'> </div><div class='ctx'> 	/* write to inline xattr */</div><div class='ctx'> 	if (inline_size) {</div><div class='del'>-		if (ipage) {</div><div class='del'>-			inline_addr = inline_xattr_addr(inode, ipage);</div><div class='add'>+		if (ifolio) {</div><div class='add'>+			inline_addr = inline_xattr_addr(inode, ifolio);</div><div class='ctx'> 		} else {</div><div class='del'>-			in_page = f2fs_get_node_page(sbi, inode-&gt;i_ino);</div><div class='del'>-			if (IS_ERR(in_page)) {</div><div class='add'>+			in_folio = f2fs_get_inode_folio(sbi, inode-&gt;i_ino);</div><div class='add'>+			if (IS_ERR(in_folio)) {</div><div class='ctx'> 				f2fs_alloc_nid_failed(sbi, new_nid);</div><div class='del'>-				return PTR_ERR(in_page);</div><div class='add'>+				return PTR_ERR(in_folio);</div><div class='ctx'> 			}</div><div class='del'>-			inline_addr = inline_xattr_addr(inode, in_page);</div><div class='add'>+			inline_addr = inline_xattr_addr(inode, in_folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		f2fs_wait_on_page_writeback(ipage ? ipage : in_page,</div><div class='add'>+		f2fs_folio_wait_writeback(ifolio ? ifolio : in_folio,</div><div class='ctx'> 							NODE, true, true);</div><div class='ctx'> 		/* no need to use xattr node block */</div><div class='ctx'> 		if (hsize &lt;= inline_size) {</div><div class='ctx'> 			err = f2fs_truncate_xattr_node(inode);</div><div class='ctx'> 			f2fs_alloc_nid_failed(sbi, new_nid);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				f2fs_put_page(in_page, 1);</div><div class='add'>+				f2fs_folio_put(in_folio, true);</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 			memcpy(inline_addr, txattr_addr, inline_size);</div><div class='del'>-			set_page_dirty(ipage ? ipage : in_page);</div><div class='add'>+			folio_mark_dirty(ifolio ? ifolio : in_folio);</div><div class='ctx'> 			goto in_page_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* write to xattr node block */</div><div class='ctx'> 	if (F2FS_I(inode)-&gt;i_xattr_nid) {</div><div class='del'>-		xpage = f2fs_get_node_page(sbi, F2FS_I(inode)-&gt;i_xattr_nid);</div><div class='del'>-		if (IS_ERR(xpage)) {</div><div class='del'>-			err = PTR_ERR(xpage);</div><div class='add'>+		xfolio = f2fs_get_xnode_folio(sbi, F2FS_I(inode)-&gt;i_xattr_nid);</div><div class='add'>+		if (IS_ERR(xfolio)) {</div><div class='add'>+			err = PTR_ERR(xfolio);</div><div class='ctx'> 			f2fs_alloc_nid_failed(sbi, new_nid);</div><div class='ctx'> 			goto in_page_out;</div><div class='ctx'> 		}</div><div class='ctx'> 		f2fs_bug_on(sbi, new_nid);</div><div class='del'>-		f2fs_wait_on_page_writeback(xpage, NODE, true, true);</div><div class='add'>+		f2fs_folio_wait_writeback(xfolio, NODE, true, true);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct dnode_of_data dn;</div><div class='ctx'> </div><div class='ctx'> 		set_new_dnode(&amp;dn, inode, NULL, NULL, new_nid);</div><div class='del'>-		xpage = f2fs_new_node_page(&amp;dn, XATTR_NODE_OFFSET);</div><div class='del'>-		if (IS_ERR(xpage)) {</div><div class='del'>-			err = PTR_ERR(xpage);</div><div class='add'>+		xfolio = f2fs_new_node_folio(&amp;dn, XATTR_NODE_OFFSET);</div><div class='add'>+		if (IS_ERR(xfolio)) {</div><div class='add'>+			err = PTR_ERR(xfolio);</div><div class='ctx'> 			f2fs_alloc_nid_failed(sbi, new_nid);</div><div class='ctx'> 			goto in_page_out;</div><div class='ctx'> 		}</div><div class='ctx'> 		f2fs_alloc_nid_done(sbi, new_nid);</div><div class='ctx'> 	}</div><div class='del'>-	xattr_addr = page_address(xpage);</div><div class='add'>+	xattr_addr = folio_address(xfolio);</div><div class='ctx'> </div><div class='ctx'> 	if (inline_size)</div><div class='ctx'> 		memcpy(inline_addr, txattr_addr, inline_size);</div><div class='ctx'> 	memcpy(xattr_addr, txattr_addr + inline_size, VALID_XATTR_BLOCK_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (inline_size)</div><div class='del'>-		set_page_dirty(ipage ? ipage : in_page);</div><div class='del'>-	set_page_dirty(xpage);</div><div class='add'>+		folio_mark_dirty(ifolio ? ifolio : in_folio);</div><div class='add'>+	folio_mark_dirty(xfolio);</div><div class='ctx'> </div><div class='del'>-	f2fs_put_page(xpage, 1);</div><div class='add'>+	f2fs_folio_put(xfolio, true);</div><div class='ctx'> in_page_out:</div><div class='del'>-	f2fs_put_page(in_page, 1);</div><div class='add'>+	f2fs_folio_put(in_folio, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int f2fs_getxattr(struct inode *inode, int index, const char *name,</div><div class='del'>-		void *buffer, size_t buffer_size, struct page *ipage)</div><div class='add'>+		void *buffer, size_t buffer_size, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_xattr_entry *entry = NULL;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -528,11 +529,11 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,</div><div class='ctx'> 	if (len &gt; F2FS_NAME_LEN)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	if (!ipage)</div><div class='add'>+	if (!ifolio)</div><div class='ctx'> 		f2fs_down_read(&amp;F2FS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-	error = lookup_all_xattrs(inode, ipage, index, len, name,</div><div class='add'>+	error = lookup_all_xattrs(inode, ifolio, index, len, name,</div><div class='ctx'> 				&amp;entry, &amp;base_addr, &amp;base_size, &amp;is_inline);</div><div class='del'>-	if (!ipage)</div><div class='add'>+	if (!ifolio)</div><div class='ctx'> 		f2fs_up_read(&amp;F2FS_I(inode)-&gt;i_xattr_sem);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -627,8 +628,9 @@ static bool f2fs_xattr_value_same(struct f2fs_xattr_entry *entry,</div><div class='ctx'> </div><div class='ctx'> static int __f2fs_setxattr(struct inode *inode, int index,</div><div class='ctx'> 			const char *name, const void *value, size_t size,</div><div class='del'>-			struct page *ipage, int flags)</div><div class='add'>+			struct folio *ifolio, int flags)</div><div class='ctx'> {</div><div class='add'>+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	struct f2fs_xattr_entry *here, *last;</div><div class='ctx'> 	void *base_addr, *last_base_addr;</div><div class='ctx'> 	int found, newsize;</div><div class='hunk'>@@ -650,7 +652,7 @@ static int __f2fs_setxattr(struct inode *inode, int index,</div><div class='ctx'> 	if (size &gt; MAX_VALUE_LEN(inode))</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> retry:</div><div class='del'>-	error = read_all_xattrs(inode, ipage, &amp;base_addr);</div><div class='add'>+	error = read_all_xattrs(inode, ifolio, &amp;base_addr);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -765,16 +767,25 @@ retry:</div><div class='ctx'> 		*(u32 *)((u8 *)last + newsize) = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = write_all_xattrs(inode, new_hsize, base_addr, ipage);</div><div class='add'>+	error = write_all_xattrs(inode, new_hsize, base_addr, ifolio);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	if (index == F2FS_XATTR_INDEX_ENCRYPTION &amp;&amp;</div><div class='ctx'> 			!strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT))</div><div class='ctx'> 		f2fs_set_encrypted_inode(inode);</div><div class='del'>-	if (S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP);</div><div class='ctx'> </div><div class='add'>+	if (!S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+		goto same;</div><div class='add'>+	/*</div><div class='add'>+	 * In restrict mode, fsync() always try to trigger checkpoint for all</div><div class='add'>+	 * metadata consistency, in other mode, it triggers checkpoint when</div><div class='add'>+	 * parent's xattr metadata was updated.</div><div class='add'>+	 */</div><div class='add'>+	if (F2FS_OPTION(sbi).fsync_mode == FSYNC_MODE_STRICT)</div><div class='add'>+		set_sbi_flag(sbi, SBI_NEED_CP);</div><div class='add'>+	else</div><div class='add'>+		f2fs_add_ino_entry(sbi, inode-&gt;i_ino, XATTR_DIR_INO);</div><div class='ctx'> same:</div><div class='ctx'> 	if (is_inode_flag_set(inode, FI_ACL_MODE)) {</div><div class='ctx'> 		inode-&gt;i_mode = F2FS_I(inode)-&gt;i_acl_mode;</div><div class='hunk'>@@ -790,7 +801,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> int f2fs_setxattr(struct inode *inode, int index, const char *name,</div><div class='ctx'> 				const void *value, size_t size,</div><div class='del'>-				struct page *ipage, int flags)</div><div class='add'>+				struct folio *ifolio, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -805,14 +816,14 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* this case is only from f2fs_init_inode_metadata */</div><div class='del'>-	if (ipage)</div><div class='add'>+	if (ifolio)</div><div class='ctx'> 		return __f2fs_setxattr(inode, index, name, value,</div><div class='del'>-						size, ipage, flags);</div><div class='add'>+						size, ifolio, flags);</div><div class='ctx'> 	f2fs_balance_fs(sbi, true);</div><div class='ctx'> </div><div class='ctx'> 	f2fs_lock_op(sbi);</div><div class='ctx'> 	f2fs_down_write(&amp;F2FS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-	err = __f2fs_setxattr(inode, index, name, value, size, ipage, flags);</div><div class='add'>+	err = __f2fs_setxattr(inode, index, name, value, size, NULL, flags);</div><div class='ctx'> 	f2fs_up_write(&amp;F2FS_I(inode)-&gt;i_xattr_sem);</div><div class='ctx'> 	f2fs_unlock_op(sbi);</div><div class='ctx'> </div><div class='hunk'>@@ -820,25 +831,14 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int f2fs_init_xattr_caches(struct f2fs_sb_info *sbi)</div><div class='add'>+int __init f2fs_init_xattr_cache(void)</div><div class='ctx'> {</div><div class='del'>-	dev_t dev = sbi-&gt;sb-&gt;s_bdev-&gt;bd_dev;</div><div class='del'>-	char slab_name[32];</div><div class='del'>-</div><div class='del'>-	sprintf(slab_name, "f2fs_xattr_entry-%u:%u", MAJOR(dev), MINOR(dev));</div><div class='del'>-</div><div class='del'>-	sbi-&gt;inline_xattr_slab_size = F2FS_OPTION(sbi).inline_xattr_size *</div><div class='del'>-					sizeof(__le32) + XATTR_PADDING_SIZE;</div><div class='del'>-</div><div class='del'>-	sbi-&gt;inline_xattr_slab = f2fs_kmem_cache_create(slab_name,</div><div class='del'>-					sbi-&gt;inline_xattr_slab_size);</div><div class='del'>-	if (!sbi-&gt;inline_xattr_slab)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	inline_xattr_slab = f2fs_kmem_cache_create("f2fs_xattr_entry",</div><div class='add'>+					DEFAULT_XATTR_SLAB_SIZE);</div><div class='add'>+	return inline_xattr_slab ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void f2fs_destroy_xattr_caches(struct f2fs_sb_info *sbi)</div><div class='add'>+void f2fs_destroy_xattr_cache(void)</div><div class='ctx'> {</div><div class='del'>-	kmem_cache_destroy(sbi-&gt;inline_xattr_slab);</div><div class='del'>-}</div><div class='add'>+	kmem_cache_destroy(inline_xattr_slab);</div><div class='add'>+}
\ No newline at end of file</div><div class='head'>diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h<br/>index a005ffdcf717..bce3d93e4755 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/f2fs/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/f2fs/xattr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/f2fs/xattr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/f2fs/xattr.h</a></div><div class='hunk'>@@ -89,6 +89,8 @@ struct f2fs_xattr_entry {</div><div class='ctx'> 			F2FS_TOTAL_EXTRA_ATTR_SIZE / sizeof(__le32) -	\</div><div class='ctx'> 			DEF_INLINE_RESERVED_SIZE -			\</div><div class='ctx'> 			MIN_INLINE_DENTRY_SIZE / sizeof(__le32))</div><div class='add'>+#define DEFAULT_XATTR_SLAB_SIZE	(DEFAULT_INLINE_XATTR_ADDRS *		\</div><div class='add'>+				sizeof(__le32) + XATTR_PADDING_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * On-disk structure of f2fs_xattr</div><div class='hunk'>@@ -127,39 +129,39 @@ extern const struct xattr_handler f2fs_xattr_security_handler;</div><div class='ctx'> </div><div class='ctx'> extern const struct xattr_handler * const f2fs_xattr_handlers[];</div><div class='ctx'> </div><div class='del'>-extern int f2fs_setxattr(struct inode *, int, const char *,</div><div class='del'>-				const void *, size_t, struct page *, int);</div><div class='del'>-extern int f2fs_getxattr(struct inode *, int, const char *, void *,</div><div class='del'>-						size_t, struct page *);</div><div class='del'>-extern ssize_t f2fs_listxattr(struct dentry *, char *, size_t);</div><div class='del'>-extern int f2fs_init_xattr_caches(struct f2fs_sb_info *);</div><div class='del'>-extern void f2fs_destroy_xattr_caches(struct f2fs_sb_info *);</div><div class='add'>+int f2fs_setxattr(struct inode *, int, const char *, const void *,</div><div class='add'>+		size_t, struct folio *, int);</div><div class='add'>+int f2fs_getxattr(struct inode *, int, const char *, void *,</div><div class='add'>+		size_t, struct folio *);</div><div class='add'>+ssize_t f2fs_listxattr(struct dentry *, char *, size_t);</div><div class='add'>+int __init f2fs_init_xattr_cache(void);</div><div class='add'>+void f2fs_destroy_xattr_cache(void);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define f2fs_xattr_handlers	NULL</div><div class='ctx'> #define f2fs_listxattr		NULL</div><div class='ctx'> static inline int f2fs_setxattr(struct inode *inode, int index,</div><div class='ctx'> 		const char *name, const void *value, size_t size,</div><div class='del'>-		struct page *page, int flags)</div><div class='add'>+		struct folio *folio, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int f2fs_getxattr(struct inode *inode, int index,</div><div class='ctx'> 			const char *name, void *buffer,</div><div class='del'>-			size_t buffer_size, struct page *dpage)</div><div class='add'>+			size_t buffer_size, struct folio *dfolio)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline int f2fs_init_xattr_caches(struct f2fs_sb_info *sbi) { return 0; }</div><div class='del'>-static inline void f2fs_destroy_xattr_caches(struct f2fs_sb_info *sbi) { }</div><div class='add'>+static inline int __init f2fs_init_xattr_cache(void) { return 0; }</div><div class='add'>+static inline void f2fs_destroy_xattr_cache(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_F2FS_FS_SECURITY</div><div class='del'>-extern int f2fs_init_security(struct inode *, struct inode *,</div><div class='del'>-				const struct qstr *, struct page *);</div><div class='add'>+int f2fs_init_security(struct inode *, struct inode *,</div><div class='add'>+				const struct qstr *, struct folio *);</div><div class='ctx'> #else</div><div class='ctx'> static inline int f2fs_init_security(struct inode *inode, struct inode *dir,</div><div class='del'>-				const struct qstr *qstr, struct page *ipage)</div><div class='add'>+				const struct qstr *qstr, struct folio *ifolio)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/fat/cache.c b/fs/fat/cache.c<br/>index 738e427e2d21..2af424e200b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/cache.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ int __init fat_cache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	fat_cache_cachep = kmem_cache_create("fat_cache",</div><div class='ctx'> 				sizeof(struct fat_cache),</div><div class='del'>-				0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,</div><div class='add'>+				0, SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 				init_once);</div><div class='ctx'> 	if (fat_cache_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/fat/dir.c b/fs/fat/dir.c<br/>index 00235b8a1823..92b091783966 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/dir.c</a></div><div class='hunk'>@@ -269,6 +269,18 @@ enum { PARSE_INVALID = 1, PARSE_NOT_LONGNAME, PARSE_EOF, };</div><div class='ctx'> /**</div><div class='ctx'>  * fat_parse_long - Parse extended directory entry.</div><div class='ctx'>  *</div><div class='add'>+ * @dir: Pointer to the inode that represents the directory.</div><div class='add'>+ * @pos: On input, contains the starting position to read from.</div><div class='add'>+ *       On output, updated with the new position.</div><div class='add'>+ * @bh: Pointer to the buffer head that may be used for reading directory</div><div class='add'>+ *	 entries. May be updated.</div><div class='add'>+ * @de: On input, points to the current directory entry.</div><div class='add'>+ *      On output, points to the next directory entry.</div><div class='add'>+ * @unicode: Pointer to a buffer where the parsed Unicode long filename will be</div><div class='add'>+ *	      stored.</div><div class='add'>+ * @nr_slots: Pointer to a variable that will store the number of longname</div><div class='add'>+ *	       slots found.</div><div class='add'>+ *</div><div class='ctx'>  * This function returns zero on success, negative value on error, or one of</div><div class='ctx'>  * the following:</div><div class='ctx'>  *</div><div class='hunk'>@@ -1197,7 +1209,7 @@ EXPORT_SYMBOL_GPL(fat_alloc_new_dir);</div><div class='ctx'> </div><div class='ctx'> static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,</div><div class='ctx'> 			       int *nr_cluster, struct msdos_dir_entry **de,</div><div class='del'>-			       struct buffer_head **bh, loff_t *i_pos)</div><div class='add'>+			       struct buffer_head **bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct msdos_sb_info *sbi = MSDOS_SB(sb);</div><div class='hunk'>@@ -1257,7 +1269,6 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,</div><div class='ctx'> 	get_bh(bhs[n]);</div><div class='ctx'> 	*bh = bhs[n];</div><div class='ctx'> 	*de = (struct msdos_dir_entry *)((*bh)-&gt;b_data + offset);</div><div class='del'>-	*i_pos = fat_make_i_pos(sb, *bh, *de);</div><div class='ctx'> </div><div class='ctx'> 	/* Second stage: clear the rest of cluster, and write outs */</div><div class='ctx'> 	err = fat_zeroed_cluster(dir, start_blknr, ++n, bhs, MAX_BUF_PER_PAGE);</div><div class='hunk'>@@ -1286,7 +1297,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,</div><div class='ctx'> 	struct buffer_head *bh, *prev, *bhs[3]; /* 32*slots (672bytes) */</div><div class='ctx'> 	struct msdos_dir_entry *de;</div><div class='ctx'> 	int err, free_slots, i, nr_bhs;</div><div class='del'>-	loff_t pos, i_pos;</div><div class='add'>+	loff_t pos;</div><div class='ctx'> </div><div class='ctx'> 	sinfo-&gt;nr_slots = nr_slots;</div><div class='ctx'> </div><div class='hunk'>@@ -1374,7 +1385,7 @@ found:</div><div class='ctx'> 		 * add the cluster to dir.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cluster = fat_add_new_entries(dir, slots, nr_slots, &amp;nr_cluster,</div><div class='del'>-					      &amp;de, &amp;bh, &amp;i_pos);</div><div class='add'>+					      &amp;de, &amp;bh);</div><div class='ctx'> 		if (cluster &lt; 0) {</div><div class='ctx'> 			err = cluster;</div><div class='ctx'> 			goto error_remove;</div><div class='head'>diff --git a/fs/fat/fat.h b/fs/fat/fat.h<br/>index 66cf4778cf3b..d3e426de5f01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/fat.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/fat.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/fat.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/fat.h</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/msdos_fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * vfat shortname flags</div><div class='hunk'>@@ -51,7 +53,8 @@ struct fat_mount_options {</div><div class='ctx'> 		 tz_set:1,	   /* Filesystem timestamps' offset set */</div><div class='ctx'> 		 rodir:1,	   /* allow ATTR_RO for directory */</div><div class='ctx'> 		 discard:1,	   /* Issue discard requests on deletions */</div><div class='del'>-		 dos1xfloppy:1;	   /* Assume default BPB for DOS 1.x floppies */</div><div class='add'>+		 dos1xfloppy:1,	   /* Assume default BPB for DOS 1.x floppies */</div><div class='add'>+		 debug:1;	   /* Not currently used */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FAT_HASH_BITS	8</div><div class='hunk'>@@ -415,12 +418,21 @@ extern struct inode *fat_iget(struct super_block *sb, loff_t i_pos);</div><div class='ctx'> extern struct inode *fat_build_inode(struct super_block *sb,</div><div class='ctx'> 			struct msdos_dir_entry *de, loff_t i_pos);</div><div class='ctx'> extern int fat_sync_inode(struct inode *inode);</div><div class='del'>-extern int fat_fill_super(struct super_block *sb, void *data, int silent,</div><div class='del'>-			  int isvfat, void (*setup)(struct super_block *));</div><div class='add'>+extern int fat_fill_super(struct super_block *sb, struct fs_context *fc,</div><div class='add'>+			  void (*setup)(struct super_block *));</div><div class='ctx'> extern int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de);</div><div class='ctx'> </div><div class='ctx'> extern int fat_flush_inodes(struct super_block *sb, struct inode *i1,</div><div class='ctx'> 			    struct inode *i2);</div><div class='add'>+</div><div class='add'>+extern const struct fs_parameter_spec fat_param_spec[];</div><div class='add'>+int fat_init_fs_context(struct fs_context *fc, bool is_vfat);</div><div class='add'>+void fat_free_fc(struct fs_context *fc);</div><div class='add'>+</div><div class='add'>+int fat_parse_param(struct fs_context *fc, struct fs_parameter *param,</div><div class='add'>+		    bool is_vfat);</div><div class='add'>+int fat_reconfigure(struct fs_context *fc);</div><div class='add'>+</div><div class='ctx'> static inline unsigned long fat_dir_hash(int logstart)</div><div class='ctx'> {</div><div class='ctx'> 	return hash_32(logstart, FAT_HASH_BITS);</div><div class='head'>diff --git a/fs/fat/fat_test.c b/fs/fat/fat_test.c<br/>index 2dab4ca1d0d8..1f0062659067 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/fat_test.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/fat_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/fat_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/fat_test.c</a></div><div class='hunk'>@@ -193,4 +193,5 @@ static struct kunit_suite fat_test_suite = {</div><div class='ctx'> </div><div class='ctx'> kunit_test_suites(&amp;fat_test_suite);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("KUnit tests for FAT filesystems");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c<br/>index 1db348f8f887..a7061c2ad8e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/fatent.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/fatent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/fatent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/fatent.c</a></div><div class='hunk'>@@ -356,7 +356,7 @@ int fat_ent_read(struct inode *inode, struct fat_entry *fatent, int entry)</div><div class='ctx'> </div><div class='ctx'> 	if (!fat_valid_entry(sbi, entry)) {</div><div class='ctx'> 		fatent_brelse(fatent);</div><div class='del'>-		fat_fs_error(sb, "invalid access to FAT (entry 0x%08x)", entry);</div><div class='add'>+		fat_fs_error_ratelimit(sb, "invalid access to FAT (entry 0x%08x)", entry);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/fat/file.c b/fs/fat/file.c<br/>index e887e9ab7472..4fc49a614fb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/file.c</a></div><div class='hunk'>@@ -204,7 +204,7 @@ const struct file_operations fat_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.release	= fat_file_release,</div><div class='ctx'> 	.unlocked_ioctl	= fat_generic_ioctl,</div><div class='ctx'> 	.compat_ioctl	= compat_ptr_ioctl,</div><div class='head'>diff --git a/fs/fat/inode.c b/fs/fat/inode.c<br/>index 1fac3dabf130..0b6009cd1844 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/inode.c</a></div><div class='hunk'>@@ -16,13 +16,13 @@</div><div class='ctx'> #include &lt;linux/mpage.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include "fat.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_FAT_DEFAULT_IOCHARSET</div><div class='hunk'>@@ -220,28 +220,29 @@ static void fat_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fat_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int fat_write_begin(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned len,</div><div class='add'>+			   struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	err = cont_write_begin(file, mapping, pos, len,</div><div class='del'>-				pagep, fsdata, fat_get_block,</div><div class='add'>+	err = cont_write_begin(iocb, mapping, pos, len,</div><div class='add'>+				foliop, fsdata, fat_get_block,</div><div class='ctx'> 				&amp;MSDOS_I(mapping-&gt;host)-&gt;mmu_private);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		fat_write_failed(mapping, pos + len);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fat_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *pagep, void *fsdata)</div><div class='add'>+static int fat_write_end(const struct kiocb *iocb,</div><div class='add'>+			 struct address_space *mapping,</div><div class='add'>+			 loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			 struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int err;</div><div class='del'>-	err = generic_write_end(file, mapping, pos, len, copied, pagep, fsdata);</div><div class='add'>+	err = generic_write_end(iocb, mapping, pos, len, copied, folio, fsdata);</div><div class='ctx'> 	if (err &lt; len)</div><div class='ctx'> 		fat_write_failed(mapping, pos + len);</div><div class='ctx'> 	if (!(err &lt; 0) &amp;&amp; !(MSDOS_I(inode)-&gt;i_attrs &amp; ATTR_ARCH)) {</div><div class='hunk'>@@ -787,7 +788,7 @@ static int __init fat_init_inodecache(void)</div><div class='ctx'> 	fat_inode_cachep = kmem_cache_create("fat_inode_cache",</div><div class='ctx'> 					     sizeof(struct msdos_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (fat_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -804,16 +805,17 @@ static void __exit fat_destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(fat_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fat_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+int fat_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	bool new_rdonly;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct msdos_sb_info *sbi = MSDOS_SB(sb);</div><div class='del'>-	*flags |= SB_NODIRATIME | (sbi-&gt;options.isvfat ? 0 : SB_NOATIME);</div><div class='add'>+	fc-&gt;sb_flags |= SB_NODIRATIME | (sbi-&gt;options.isvfat ? 0 : SB_NOATIME);</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure we update state on remount. */</div><div class='del'>-	new_rdonly = *flags &amp; SB_RDONLY;</div><div class='add'>+	new_rdonly = fc-&gt;sb_flags &amp; SB_RDONLY;</div><div class='ctx'> 	if (new_rdonly != sb_rdonly(sb)) {</div><div class='ctx'> 		if (new_rdonly)</div><div class='ctx'> 			fat_set_state(sb, 0, 0);</div><div class='hunk'>@@ -822,6 +824,7 @@ static int fat_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(fat_reconfigure);</div><div class='ctx'> </div><div class='ctx'> static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -939,8 +942,6 @@ static const struct super_operations fat_sops = {</div><div class='ctx'> 	.evict_inode	= fat_evict_inode,</div><div class='ctx'> 	.put_super	= fat_put_super,</div><div class='ctx'> 	.statfs		= fat_statfs,</div><div class='del'>-	.remount_fs	= fat_remount,</div><div class='del'>-</div><div class='ctx'> 	.show_options	= fat_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1037,355 +1038,282 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_check_n, Opt_check_r, Opt_check_s, Opt_uid, Opt_gid,</div><div class='del'>-	Opt_umask, Opt_dmask, Opt_fmask, Opt_allow_utime, Opt_codepage,</div><div class='del'>-	Opt_usefree, Opt_nocase, Opt_quiet, Opt_showexec, Opt_debug,</div><div class='del'>-	Opt_immutable, Opt_dots, Opt_nodots,</div><div class='del'>-	Opt_charset, Opt_shortname_lower, Opt_shortname_win95,</div><div class='del'>-	Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,</div><div class='del'>-	Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,</div><div class='del'>-	Opt_obsolete, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,</div><div class='del'>-	Opt_err_panic, Opt_err_ro, Opt_discard, Opt_nfs, Opt_time_offset,</div><div class='del'>-	Opt_nfs_stale_rw, Opt_nfs_nostale_ro, Opt_err, Opt_dos1xfloppy,</div><div class='add'>+	Opt_check, Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask,</div><div class='add'>+	Opt_allow_utime, Opt_codepage, Opt_usefree, Opt_nocase, Opt_quiet,</div><div class='add'>+	Opt_showexec, Opt_debug, Opt_immutable, Opt_dots, Opt_dotsOK,</div><div class='add'>+	Opt_charset, Opt_shortname, Opt_utf8, Opt_utf8_bool,</div><div class='add'>+	Opt_uni_xl, Opt_uni_xl_bool, Opt_nonumtail, Opt_nonumtail_bool,</div><div class='add'>+	Opt_obsolete, Opt_flush, Opt_tz, Opt_rodir, Opt_errors, Opt_discard,</div><div class='add'>+	Opt_nfs, Opt_nfs_enum, Opt_time_offset, Opt_dos1xfloppy,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t fat_tokens = {</div><div class='del'>-	{Opt_check_r, "check=relaxed"},</div><div class='del'>-	{Opt_check_s, "check=strict"},</div><div class='del'>-	{Opt_check_n, "check=normal"},</div><div class='del'>-	{Opt_check_r, "check=r"},</div><div class='del'>-	{Opt_check_s, "check=s"},</div><div class='del'>-	{Opt_check_n, "check=n"},</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_umask, "umask=%o"},</div><div class='del'>-	{Opt_dmask, "dmask=%o"},</div><div class='del'>-	{Opt_fmask, "fmask=%o"},</div><div class='del'>-	{Opt_allow_utime, "allow_utime=%o"},</div><div class='del'>-	{Opt_codepage, "codepage=%u"},</div><div class='del'>-	{Opt_usefree, "usefree"},</div><div class='del'>-	{Opt_nocase, "nocase"},</div><div class='del'>-	{Opt_quiet, "quiet"},</div><div class='del'>-	{Opt_showexec, "showexec"},</div><div class='del'>-	{Opt_debug, "debug"},</div><div class='del'>-	{Opt_immutable, "sys_immutable"},</div><div class='del'>-	{Opt_flush, "flush"},</div><div class='del'>-	{Opt_tz_utc, "tz=UTC"},</div><div class='del'>-	{Opt_time_offset, "time_offset=%d"},</div><div class='del'>-	{Opt_err_cont, "errors=continue"},</div><div class='del'>-	{Opt_err_panic, "errors=panic"},</div><div class='del'>-	{Opt_err_ro, "errors=remount-ro"},</div><div class='del'>-	{Opt_discard, "discard"},</div><div class='del'>-	{Opt_nfs_stale_rw, "nfs"},</div><div class='del'>-	{Opt_nfs_stale_rw, "nfs=stale_rw"},</div><div class='del'>-	{Opt_nfs_nostale_ro, "nfs=nostale_ro"},</div><div class='del'>-	{Opt_dos1xfloppy, "dos1xfloppy"},</div><div class='del'>-	{Opt_obsolete, "conv=binary"},</div><div class='del'>-	{Opt_obsolete, "conv=text"},</div><div class='del'>-	{Opt_obsolete, "conv=auto"},</div><div class='del'>-	{Opt_obsolete, "conv=b"},</div><div class='del'>-	{Opt_obsolete, "conv=t"},</div><div class='del'>-	{Opt_obsolete, "conv=a"},</div><div class='del'>-	{Opt_obsolete, "fat=%u"},</div><div class='del'>-	{Opt_obsolete, "blocksize=%u"},</div><div class='del'>-	{Opt_obsolete, "cvf_format=%20s"},</div><div class='del'>-	{Opt_obsolete, "cvf_options=%100s"},</div><div class='del'>-	{Opt_obsolete, "posix"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='del'>-};</div><div class='del'>-static const match_table_t msdos_tokens = {</div><div class='del'>-	{Opt_nodots, "nodots"},</div><div class='del'>-	{Opt_nodots, "dotsOK=no"},</div><div class='del'>-	{Opt_dots, "dots"},</div><div class='del'>-	{Opt_dots, "dotsOK=yes"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table fat_param_check[] = {</div><div class='add'>+	{"relaxed",	'r'},</div><div class='add'>+	{"r",		'r'},</div><div class='add'>+	{"strict",	's'},</div><div class='add'>+	{"s",		's'},</div><div class='add'>+	{"normal",	'n'},</div><div class='add'>+	{"n",		'n'},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='del'>-static const match_table_t vfat_tokens = {</div><div class='del'>-	{Opt_charset, "iocharset=%s"},</div><div class='del'>-	{Opt_shortname_lower, "shortname=lower"},</div><div class='del'>-	{Opt_shortname_win95, "shortname=win95"},</div><div class='del'>-	{Opt_shortname_winnt, "shortname=winnt"},</div><div class='del'>-	{Opt_shortname_mixed, "shortname=mixed"},</div><div class='del'>-	{Opt_utf8_no, "utf8=0"},		/* 0 or no or false */</div><div class='del'>-	{Opt_utf8_no, "utf8=no"},</div><div class='del'>-	{Opt_utf8_no, "utf8=false"},</div><div class='del'>-	{Opt_utf8_yes, "utf8=1"},		/* empty or 1 or yes or true */</div><div class='del'>-	{Opt_utf8_yes, "utf8=yes"},</div><div class='del'>-	{Opt_utf8_yes, "utf8=true"},</div><div class='del'>-	{Opt_utf8_yes, "utf8"},</div><div class='del'>-	{Opt_uni_xl_no, "uni_xlate=0"},		/* 0 or no or false */</div><div class='del'>-	{Opt_uni_xl_no, "uni_xlate=no"},</div><div class='del'>-	{Opt_uni_xl_no, "uni_xlate=false"},</div><div class='del'>-	{Opt_uni_xl_yes, "uni_xlate=1"},	/* empty or 1 or yes or true */</div><div class='del'>-	{Opt_uni_xl_yes, "uni_xlate=yes"},</div><div class='del'>-	{Opt_uni_xl_yes, "uni_xlate=true"},</div><div class='del'>-	{Opt_uni_xl_yes, "uni_xlate"},</div><div class='del'>-	{Opt_nonumtail_no, "nonumtail=0"},	/* 0 or no or false */</div><div class='del'>-	{Opt_nonumtail_no, "nonumtail=no"},</div><div class='del'>-	{Opt_nonumtail_no, "nonumtail=false"},</div><div class='del'>-	{Opt_nonumtail_yes, "nonumtail=1"},	/* empty or 1 or yes or true */</div><div class='del'>-	{Opt_nonumtail_yes, "nonumtail=yes"},</div><div class='del'>-	{Opt_nonumtail_yes, "nonumtail=true"},</div><div class='del'>-	{Opt_nonumtail_yes, "nonumtail"},</div><div class='del'>-	{Opt_rodir, "rodir"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+</div><div class='add'>+static const struct constant_table fat_param_tz[] = {</div><div class='add'>+	{"UTC",		0},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(struct super_block *sb, char *options, int is_vfat,</div><div class='del'>-			 int silent, int *debug, struct fat_mount_options *opts)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-	char *iocharset;</div><div class='add'>+static const struct constant_table fat_param_errors[] = {</div><div class='add'>+	{"continue",	FAT_ERRORS_CONT},</div><div class='add'>+	{"panic",	FAT_ERRORS_PANIC},</div><div class='add'>+	{"remount-ro",	FAT_ERRORS_RO},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	opts-&gt;isvfat = is_vfat;</div><div class='ctx'> </div><div class='del'>-	opts-&gt;fs_uid = current_uid();</div><div class='del'>-	opts-&gt;fs_gid = current_gid();</div><div class='del'>-	opts-&gt;fs_fmask = opts-&gt;fs_dmask = current_umask();</div><div class='del'>-	opts-&gt;allow_utime = -1;</div><div class='del'>-	opts-&gt;codepage = fat_default_codepage;</div><div class='del'>-	fat_reset_iocharset(opts);</div><div class='del'>-	if (is_vfat) {</div><div class='del'>-		opts-&gt;shortname = VFAT_SFN_DISPLAY_WINNT|VFAT_SFN_CREATE_WIN95;</div><div class='del'>-		opts-&gt;rodir = 0;</div><div class='del'>-	} else {</div><div class='del'>-		opts-&gt;shortname = 0;</div><div class='del'>-		opts-&gt;rodir = 1;</div><div class='del'>-	}</div><div class='del'>-	opts-&gt;name_check = 'n';</div><div class='del'>-	opts-&gt;quiet = opts-&gt;showexec = opts-&gt;sys_immutable = opts-&gt;dotsOK =  0;</div><div class='del'>-	opts-&gt;unicode_xlate = 0;</div><div class='del'>-	opts-&gt;numtail = 1;</div><div class='del'>-	opts-&gt;usefree = opts-&gt;nocase = 0;</div><div class='del'>-	opts-&gt;tz_set = 0;</div><div class='del'>-	opts-&gt;nfs = 0;</div><div class='del'>-	opts-&gt;errors = FAT_ERRORS_RO;</div><div class='del'>-	*debug = 0;</div><div class='add'>+static const struct constant_table fat_param_nfs[] = {</div><div class='add'>+	{"stale_rw",	FAT_NFS_STALE_RW},</div><div class='add'>+	{"nostale_ro",	FAT_NFS_NOSTALE_RO},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	opts-&gt;utf8 = IS_ENABLED(CONFIG_FAT_DEFAULT_UTF8) &amp;&amp; is_vfat;</div><div class='add'>+/*</div><div class='add'>+ * These are all obsolete but we still reject invalid options.</div><div class='add'>+ * The corresponding values are therefore meaningless.</div><div class='add'>+ */</div><div class='add'>+static const struct constant_table fat_param_conv[] = {</div><div class='add'>+	{"binary",	0},</div><div class='add'>+	{"text",	0},</div><div class='add'>+	{"auto",	0},</div><div class='add'>+	{"b",		0},</div><div class='add'>+	{"t",		0},</div><div class='add'>+	{"a",		0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (!options)</div><div class='del'>-		goto out;</div><div class='add'>+/* Core options. See below for vfat and msdos extras */</div><div class='add'>+const struct fs_parameter_spec fat_param_spec[] = {</div><div class='add'>+	fsparam_enum	("check",	Opt_check, fat_param_check),</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct	("umask",	Opt_umask),</div><div class='add'>+	fsparam_u32oct	("dmask",	Opt_dmask),</div><div class='add'>+	fsparam_u32oct	("fmask",	Opt_fmask),</div><div class='add'>+	fsparam_u32oct	("allow_utime",	Opt_allow_utime),</div><div class='add'>+	fsparam_u32	("codepage",	Opt_codepage),</div><div class='add'>+	fsparam_flag	("usefree",	Opt_usefree),</div><div class='add'>+	fsparam_flag	("nocase",	Opt_nocase),</div><div class='add'>+	fsparam_flag	("quiet",	Opt_quiet),</div><div class='add'>+	fsparam_flag	("showexec",	Opt_showexec),</div><div class='add'>+	fsparam_flag	("debug",	Opt_debug),</div><div class='add'>+	fsparam_flag	("sys_immutable", Opt_immutable),</div><div class='add'>+	fsparam_flag	("flush",	Opt_flush),</div><div class='add'>+	fsparam_enum	("tz",		Opt_tz, fat_param_tz),</div><div class='add'>+	fsparam_s32	("time_offset",	Opt_time_offset),</div><div class='add'>+	fsparam_enum	("errors",	Opt_errors, fat_param_errors),</div><div class='add'>+	fsparam_flag	("discard",	Opt_discard),</div><div class='add'>+	fsparam_flag	("nfs",		Opt_nfs),</div><div class='add'>+	fsparam_enum	("nfs",		Opt_nfs_enum, fat_param_nfs),</div><div class='add'>+	fsparam_flag	("dos1xfloppy",	Opt_dos1xfloppy),</div><div class='add'>+	__fsparam(fs_param_is_enum,	"conv",</div><div class='add'>+		  Opt_obsolete, fs_param_deprecated, fat_param_conv),</div><div class='add'>+	__fsparam(fs_param_is_u32,	"fat",</div><div class='add'>+		  Opt_obsolete, fs_param_deprecated, NULL),</div><div class='add'>+	__fsparam(fs_param_is_u32,	"blocksize",</div><div class='add'>+		  Opt_obsolete, fs_param_deprecated, NULL),</div><div class='add'>+	__fsparam(fs_param_is_string,	"cvf_format",</div><div class='add'>+		  Opt_obsolete, fs_param_deprecated, NULL),</div><div class='add'>+	__fsparam(fs_param_is_string,	"cvf_options",</div><div class='add'>+		  Opt_obsolete, fs_param_deprecated, NULL),</div><div class='add'>+	__fsparam(NULL,			"posix",</div><div class='add'>+		  Opt_obsolete, fs_param_deprecated, NULL),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(fat_param_spec);</div><div class='ctx'> </div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='add'>+static const struct fs_parameter_spec msdos_param_spec[] = {</div><div class='add'>+	fsparam_flag_no	("dots",	Opt_dots),</div><div class='add'>+	fsparam_bool	("dotsOK",	Opt_dotsOK),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		token = match_token(p, fat_tokens, args);</div><div class='del'>-		if (token == Opt_err) {</div><div class='del'>-			if (is_vfat)</div><div class='del'>-				token = match_token(p, vfat_tokens, args);</div><div class='del'>-			else</div><div class='del'>-				token = match_token(p, msdos_tokens, args);</div><div class='del'>-		}</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_check_s:</div><div class='del'>-			opts-&gt;name_check = 's';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_r:</div><div class='del'>-			opts-&gt;name_check = 'r';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_n:</div><div class='del'>-			opts-&gt;name_check = 'n';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_usefree:</div><div class='del'>-			opts-&gt;usefree = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocase:</div><div class='del'>-			if (!is_vfat)</div><div class='del'>-				opts-&gt;nocase = 1;</div><div class='del'>-			else {</div><div class='del'>-				/* for backward compatibility */</div><div class='del'>-				opts-&gt;shortname = VFAT_SFN_DISPLAY_WIN95</div><div class='del'>-					| VFAT_SFN_CREATE_WIN95;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_quiet:</div><div class='del'>-			opts-&gt;quiet = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_showexec:</div><div class='del'>-			opts-&gt;showexec = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_debug:</div><div class='del'>-			*debug = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_immutable:</div><div class='del'>-			opts-&gt;sys_immutable = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;fs_uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(opts-&gt;fs_uid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;fs_gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(opts-&gt;fs_gid))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_umask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;fs_fmask = opts-&gt;fs_dmask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_dmask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;fs_dmask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_fmask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;fs_fmask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_allow_utime:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;allow_utime = option &amp; (S_IWGRP | S_IWOTH);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_codepage:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;codepage = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_flush:</div><div class='del'>-			opts-&gt;flush = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_time_offset:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			/*</div><div class='del'>-			 * GMT+-12 zones may have DST corrections so at least</div><div class='del'>-			 * 13 hours difference is needed. Make the limit 24</div><div class='del'>-			 * just in case someone invents something unusual.</div><div class='del'>-			 */</div><div class='del'>-			if (option &lt; -24 * 60 || option &gt; 24 * 60)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			opts-&gt;tz_set = 1;</div><div class='del'>-			opts-&gt;time_offset = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_tz_utc:</div><div class='del'>-			opts-&gt;tz_set = 1;</div><div class='del'>-			opts-&gt;time_offset = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_cont:</div><div class='del'>-			opts-&gt;errors = FAT_ERRORS_CONT;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_panic:</div><div class='del'>-			opts-&gt;errors = FAT_ERRORS_PANIC;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_ro:</div><div class='del'>-			opts-&gt;errors = FAT_ERRORS_RO;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nfs_stale_rw:</div><div class='del'>-			opts-&gt;nfs = FAT_NFS_STALE_RW;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nfs_nostale_ro:</div><div class='del'>-			opts-&gt;nfs = FAT_NFS_NOSTALE_RO;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_dos1xfloppy:</div><div class='del'>-			opts-&gt;dos1xfloppy = 1;</div><div class='del'>-			break;</div><div class='add'>+static const struct constant_table fat_param_shortname[] = {</div><div class='add'>+	{"lower",	VFAT_SFN_DISPLAY_LOWER | VFAT_SFN_CREATE_WIN95},</div><div class='add'>+	{"win95",	VFAT_SFN_DISPLAY_WIN95 | VFAT_SFN_CREATE_WIN95},</div><div class='add'>+	{"winnt",	VFAT_SFN_DISPLAY_WINNT | VFAT_SFN_CREATE_WINNT},</div><div class='add'>+	{"mixed",	VFAT_SFN_DISPLAY_WINNT | VFAT_SFN_CREATE_WIN95},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* msdos specific */</div><div class='del'>-		case Opt_dots:</div><div class='del'>-			opts-&gt;dotsOK = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nodots:</div><div class='del'>-			opts-&gt;dotsOK = 0;</div><div class='del'>-			break;</div><div class='add'>+static const struct fs_parameter_spec vfat_param_spec[] = {</div><div class='add'>+	fsparam_string	("iocharset",	Opt_charset),</div><div class='add'>+	fsparam_enum	("shortname",	Opt_shortname, fat_param_shortname),</div><div class='add'>+	fsparam_flag	("utf8",	Opt_utf8),</div><div class='add'>+	fsparam_bool	("utf8",	Opt_utf8_bool),</div><div class='add'>+	fsparam_flag	("uni_xlate",	Opt_uni_xl),</div><div class='add'>+	fsparam_bool	("uni_xlate",	Opt_uni_xl_bool),</div><div class='add'>+	fsparam_flag	("nonumtail",	Opt_nonumtail),</div><div class='add'>+	fsparam_bool	("nonumtail",	Opt_nonumtail_bool),</div><div class='add'>+	fsparam_flag	("rodir",	Opt_rodir),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* vfat specific */</div><div class='del'>-		case Opt_charset:</div><div class='del'>-			fat_reset_iocharset(opts);</div><div class='del'>-			iocharset = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!iocharset)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			opts-&gt;iocharset = iocharset;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_shortname_lower:</div><div class='del'>-			opts-&gt;shortname = VFAT_SFN_DISPLAY_LOWER</div><div class='del'>-					| VFAT_SFN_CREATE_WIN95;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_shortname_win95:</div><div class='del'>-			opts-&gt;shortname = VFAT_SFN_DISPLAY_WIN95</div><div class='del'>-					| VFAT_SFN_CREATE_WIN95;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_shortname_winnt:</div><div class='del'>-			opts-&gt;shortname = VFAT_SFN_DISPLAY_WINNT</div><div class='del'>-					| VFAT_SFN_CREATE_WINNT;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_shortname_mixed:</div><div class='del'>-			opts-&gt;shortname = VFAT_SFN_DISPLAY_WINNT</div><div class='del'>-					| VFAT_SFN_CREATE_WIN95;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_utf8_no:		/* 0 or no or false */</div><div class='del'>-			opts-&gt;utf8 = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_utf8_yes:		/* empty or 1 or yes or true */</div><div class='del'>-			opts-&gt;utf8 = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_uni_xl_no:		/* 0 or no or false */</div><div class='del'>-			opts-&gt;unicode_xlate = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_uni_xl_yes:		/* empty or 1 or yes or true */</div><div class='del'>-			opts-&gt;unicode_xlate = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nonumtail_no:		/* 0 or no or false */</div><div class='del'>-			opts-&gt;numtail = 1;	/* negated option */</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nonumtail_yes:		/* empty or 1 or yes or true */</div><div class='del'>-			opts-&gt;numtail = 0;	/* negated option */</div><div class='del'>-			break;</div><div class='del'>-		case Opt_rodir:</div><div class='del'>-			opts-&gt;rodir = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_discard:</div><div class='del'>-			opts-&gt;discard = 1;</div><div class='del'>-			break;</div><div class='add'>+int fat_parse_param(struct fs_context *fc, struct fs_parameter *param,</div><div class='add'>+			   bool is_vfat)</div><div class='add'>+{</div><div class='add'>+	struct fat_mount_options *opts = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='ctx'> </div><div class='del'>-		/* obsolete mount options */</div><div class='del'>-		case Opt_obsolete:</div><div class='del'>-			fat_msg(sb, KERN_INFO, "\"%s\" option is obsolete, "</div><div class='del'>-			       "not supported now", p);</div><div class='del'>-			break;</div><div class='del'>-		/* unknown option */</div><div class='del'>-		default:</div><div class='del'>-			if (!silent) {</div><div class='del'>-				fat_msg(sb, KERN_ERR,</div><div class='del'>-				       "Unrecognized mount option \"%s\" "</div><div class='del'>-				       "or missing value", p);</div><div class='del'>-			}</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* remount options have traditionally been ignored */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	/* UTF-8 doesn't provide FAT semantics */</div><div class='del'>-	if (!strcmp(opts-&gt;iocharset, "utf8")) {</div><div class='del'>-		fat_msg(sb, KERN_WARNING, "utf8 is not a recommended IO charset"</div><div class='del'>-		       " for FAT filesystems, filesystem will be "</div><div class='del'>-		       "case sensitive!");</div><div class='add'>+	opt = fs_parse(fc, fat_param_spec, param, &amp;result);</div><div class='add'>+	/* If option not found in fat_param_spec, try vfat/msdos options */</div><div class='add'>+	if (opt == -ENOPARAM) {</div><div class='add'>+		if (is_vfat)</div><div class='add'>+			opt = fs_parse(fc, vfat_param_spec, param, &amp;result);</div><div class='add'>+		else</div><div class='add'>+			opt = fs_parse(fc, msdos_param_spec, param, &amp;result);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If user doesn't specify allow_utime, it's initialized from dmask. */</div><div class='del'>-	if (opts-&gt;allow_utime == (unsigned short)-1)</div><div class='del'>-		opts-&gt;allow_utime = ~opts-&gt;fs_dmask &amp; (S_IWGRP | S_IWOTH);</div><div class='del'>-	if (opts-&gt;unicode_xlate)</div><div class='del'>-		opts-&gt;utf8 = 0;</div><div class='del'>-	if (opts-&gt;nfs == FAT_NFS_NOSTALE_RO) {</div><div class='del'>-		sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		sb-&gt;s_export_op = &amp;fat_export_ops_nostale;</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_check:</div><div class='add'>+		opts-&gt;name_check = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_usefree:</div><div class='add'>+		opts-&gt;usefree = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nocase:</div><div class='add'>+		if (!is_vfat)</div><div class='add'>+			opts-&gt;nocase = 1;</div><div class='add'>+		else {</div><div class='add'>+			/* for backward compatibility */</div><div class='add'>+			opts-&gt;shortname = VFAT_SFN_DISPLAY_WIN95</div><div class='add'>+				| VFAT_SFN_CREATE_WIN95;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_quiet:</div><div class='add'>+		opts-&gt;quiet = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_showexec:</div><div class='add'>+		opts-&gt;showexec = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_debug:</div><div class='add'>+		opts-&gt;debug = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_immutable:</div><div class='add'>+		opts-&gt;sys_immutable = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		opts-&gt;fs_uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		opts-&gt;fs_gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_umask:</div><div class='add'>+		opts-&gt;fs_fmask = opts-&gt;fs_dmask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dmask:</div><div class='add'>+		opts-&gt;fs_dmask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fmask:</div><div class='add'>+		opts-&gt;fs_fmask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_allow_utime:</div><div class='add'>+		opts-&gt;allow_utime = result.uint_32 &amp; (S_IWGRP | S_IWOTH);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_codepage:</div><div class='add'>+		opts-&gt;codepage = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_flush:</div><div class='add'>+		opts-&gt;flush = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_time_offset:</div><div class='add'>+		/*</div><div class='add'>+		 * GMT+-12 zones may have DST corrections so at least</div><div class='add'>+		 * 13 hours difference is needed. Make the limit 24</div><div class='add'>+		 * just in case someone invents something unusual.</div><div class='add'>+		 */</div><div class='add'>+		if (result.int_32 &lt; -24 * 60 || result.int_32 &gt; 24 * 60)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		opts-&gt;tz_set = 1;</div><div class='add'>+		opts-&gt;time_offset = result.int_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_tz:</div><div class='add'>+		opts-&gt;tz_set = 1;</div><div class='add'>+		opts-&gt;time_offset = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_errors:</div><div class='add'>+		opts-&gt;errors = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nfs:</div><div class='add'>+		opts-&gt;nfs = FAT_NFS_STALE_RW;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nfs_enum:</div><div class='add'>+		opts-&gt;nfs = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dos1xfloppy:</div><div class='add'>+		opts-&gt;dos1xfloppy = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* msdos specific */</div><div class='add'>+	case Opt_dots:	/* dots / nodots */</div><div class='add'>+		opts-&gt;dotsOK = !result.negated;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dotsOK:	/* dotsOK = yes/no */</div><div class='add'>+		opts-&gt;dotsOK = result.boolean;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* vfat specific */</div><div class='add'>+	case Opt_charset:</div><div class='add'>+		fat_reset_iocharset(opts);</div><div class='add'>+		opts-&gt;iocharset = param-&gt;string;</div><div class='add'>+		param-&gt;string = NULL;	/* Steal string */</div><div class='add'>+		break;</div><div class='add'>+	case Opt_shortname:</div><div class='add'>+		opts-&gt;shortname = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_utf8:</div><div class='add'>+		opts-&gt;utf8 = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_utf8_bool:</div><div class='add'>+		opts-&gt;utf8 = result.boolean;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_uni_xl:</div><div class='add'>+		opts-&gt;unicode_xlate = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_uni_xl_bool:</div><div class='add'>+		opts-&gt;unicode_xlate = result.boolean;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nonumtail:</div><div class='add'>+		opts-&gt;numtail = 0;	/* negated option */</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nonumtail_bool:</div><div class='add'>+		opts-&gt;numtail = !result.boolean; /* negated option */</div><div class='add'>+		break;</div><div class='add'>+	case Opt_rodir:</div><div class='add'>+		opts-&gt;rodir = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_discard:</div><div class='add'>+		opts-&gt;discard = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* obsolete mount options */</div><div class='add'>+	case Opt_obsolete:</div><div class='add'>+		printk(KERN_INFO "FAT-fs: \"%s\" option is obsolete, "</div><div class='add'>+			"not supported now", param-&gt;key);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(fat_parse_param);</div><div class='ctx'> </div><div class='ctx'> static int fat_read_root(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1604,9 +1532,11 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * Read the super block of an MS-DOS FS.</div><div class='ctx'>  */</div><div class='del'>-int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,</div><div class='add'>+int fat_fill_super(struct super_block *sb, struct fs_context *fc,</div><div class='ctx'> 		   void (*setup)(struct super_block *))</div><div class='ctx'> {</div><div class='add'>+	struct fat_mount_options *opts = fc-&gt;fs_private;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	struct inode *root_inode = NULL, *fat_inode = NULL;</div><div class='ctx'> 	struct inode *fsinfo_inode = NULL;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='hunk'>@@ -1614,7 +1544,6 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,</div><div class='ctx'> 	struct msdos_sb_info *sbi;</div><div class='ctx'> 	u16 logical_sector_size;</div><div class='ctx'> 	u32 total_sectors, total_clusters, fat_clusters, rootdir_sectors;</div><div class='del'>-	int debug;</div><div class='ctx'> 	long error;</div><div class='ctx'> 	char buf[50];</div><div class='ctx'> 	struct timespec64 ts;</div><div class='hunk'>@@ -1643,14 +1572,36 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,</div><div class='ctx'> 	ratelimit_state_init(&amp;sbi-&gt;ratelimit, DEFAULT_RATELIMIT_INTERVAL,</div><div class='ctx'> 			     DEFAULT_RATELIMIT_BURST);</div><div class='ctx'> </div><div class='del'>-	error = parse_options(sb, data, isvfat, silent, &amp;debug, &amp;sbi-&gt;options);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out_fail;</div><div class='add'>+	/* UTF-8 doesn't provide FAT semantics */</div><div class='add'>+	if (!strcmp(opts-&gt;iocharset, "utf8")) {</div><div class='add'>+		fat_msg(sb, KERN_WARNING, "utf8 is not a recommended IO charset"</div><div class='add'>+		       " for FAT filesystems, filesystem will be"</div><div class='add'>+		       " case sensitive!");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If user doesn't specify allow_utime, it's initialized from dmask. */</div><div class='add'>+	if (opts-&gt;allow_utime == (unsigned short)-1)</div><div class='add'>+		opts-&gt;allow_utime = ~opts-&gt;fs_dmask &amp; (S_IWGRP | S_IWOTH);</div><div class='add'>+	if (opts-&gt;unicode_xlate)</div><div class='add'>+		opts-&gt;utf8 = 0;</div><div class='add'>+	if (opts-&gt;nfs == FAT_NFS_NOSTALE_RO) {</div><div class='add'>+		sb-&gt;s_flags |= SB_RDONLY;</div><div class='add'>+		sb-&gt;s_export_op = &amp;fat_export_ops_nostale;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Apply parsed options to sbi (structure copy) */</div><div class='add'>+	sbi-&gt;options = *opts;</div><div class='add'>+	/* Transfer ownership of iocharset to sbi-&gt;options */</div><div class='add'>+	opts-&gt;iocharset = NULL;</div><div class='ctx'> </div><div class='ctx'> 	setup(sb); /* flavour-specific stuff that needs options */</div><div class='ctx'> </div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if (!sb_min_blocksize(sb, 512)) {</div><div class='add'>+		fat_msg(sb, KERN_ERR, "unable to set blocksize");</div><div class='add'>+		goto out_fail;</div><div class='add'>+	}</div><div class='ctx'> 	error = -EIO;</div><div class='del'>-	sb_min_blocksize(sb, 512);</div><div class='ctx'> 	bh = sb_bread(sb, 0);</div><div class='ctx'> 	if (bh == NULL) {</div><div class='ctx'> 		fat_msg(sb, KERN_ERR, "unable to read boot sector");</div><div class='hunk'>@@ -1762,6 +1713,9 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,</div><div class='ctx'> 	else /* fat 16 or 12 */</div><div class='ctx'> 		sbi-&gt;vol_id = bpb.fat16_vol_id;</div><div class='ctx'> </div><div class='add'>+	__le32 vol_id_le = cpu_to_le32(sbi-&gt;vol_id);</div><div class='add'>+	super_set_uuid(sb, (void *) &amp;vol_id_le, sizeof(vol_id_le));</div><div class='add'>+</div><div class='ctx'> 	sbi-&gt;dir_per_block = sb-&gt;s_blocksize / sizeof(struct msdos_dir_entry);</div><div class='ctx'> 	sbi-&gt;dir_per_block_bits = ffs(sbi-&gt;dir_per_block) - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1947,6 +1901,57 @@ int fat_flush_inodes(struct super_block *sb, struct inode *i1, struct inode *i2)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fat_flush_inodes);</div><div class='ctx'> </div><div class='add'>+int fat_init_fs_context(struct fs_context *fc, bool is_vfat)</div><div class='add'>+{</div><div class='add'>+	struct fat_mount_options *opts;</div><div class='add'>+</div><div class='add'>+	opts = kzalloc(sizeof(*opts), GFP_KERNEL);</div><div class='add'>+	if (!opts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	opts-&gt;isvfat = is_vfat;</div><div class='add'>+	opts-&gt;fs_uid = current_uid();</div><div class='add'>+	opts-&gt;fs_gid = current_gid();</div><div class='add'>+	opts-&gt;fs_fmask = opts-&gt;fs_dmask = current_umask();</div><div class='add'>+	opts-&gt;allow_utime = -1;</div><div class='add'>+	opts-&gt;codepage = fat_default_codepage;</div><div class='add'>+	fat_reset_iocharset(opts);</div><div class='add'>+	if (is_vfat) {</div><div class='add'>+		opts-&gt;shortname = VFAT_SFN_DISPLAY_WINNT|VFAT_SFN_CREATE_WIN95;</div><div class='add'>+		opts-&gt;rodir = 0;</div><div class='add'>+	} else {</div><div class='add'>+		opts-&gt;shortname = 0;</div><div class='add'>+		opts-&gt;rodir = 1;</div><div class='add'>+	}</div><div class='add'>+	opts-&gt;name_check = 'n';</div><div class='add'>+	opts-&gt;quiet = opts-&gt;showexec = opts-&gt;sys_immutable = opts-&gt;dotsOK =  0;</div><div class='add'>+	opts-&gt;unicode_xlate = 0;</div><div class='add'>+	opts-&gt;numtail = 1;</div><div class='add'>+	opts-&gt;usefree = opts-&gt;nocase = 0;</div><div class='add'>+	opts-&gt;tz_set = 0;</div><div class='add'>+	opts-&gt;nfs = 0;</div><div class='add'>+	opts-&gt;errors = FAT_ERRORS_RO;</div><div class='add'>+	opts-&gt;debug = 0;</div><div class='add'>+</div><div class='add'>+	opts-&gt;utf8 = IS_ENABLED(CONFIG_FAT_DEFAULT_UTF8) &amp;&amp; is_vfat;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = opts;</div><div class='add'>+	/* fc-&gt;ops assigned by caller */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fat_init_fs_context);</div><div class='add'>+</div><div class='add'>+void fat_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct fat_mount_options *opts = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	if (opts-&gt;iocharset != fat_default_iocharset)</div><div class='add'>+		kfree(opts-&gt;iocharset);</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fat_free_fc);</div><div class='add'>+</div><div class='ctx'> static int __init init_fat_fs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1975,4 +1980,5 @@ static void __exit exit_fat_fs(void)</div><div class='ctx'> module_init(init_fat_fs)</div><div class='ctx'> module_exit(exit_fat_fs)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Core FAT filesystem support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/fat/misc.c b/fs/fat/misc.c<br/>index c7a2d27120ba..950da09f0961 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/misc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/misc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/misc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/misc.c</a></div><div class='hunk'>@@ -158,9 +158,9 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster)</div><div class='ctx'> 			mark_inode_dirty(inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (new_fclus != (inode-&gt;i_blocks &gt;&gt; (sbi-&gt;cluster_bits - 9))) {</div><div class='del'>-		fat_fs_error(sb, "clusters badly computed (%d != %llu)",</div><div class='del'>-			     new_fclus,</div><div class='del'>-			     (llu)(inode-&gt;i_blocks &gt;&gt; (sbi-&gt;cluster_bits - 9)));</div><div class='add'>+		fat_fs_error_ratelimit(</div><div class='add'>+			sb, "clusters badly computed (%d != %llu)", new_fclus,</div><div class='add'>+			(llu)(inode-&gt;i_blocks &gt;&gt; (sbi-&gt;cluster_bits - 9)));</div><div class='ctx'> 		fat_cache_inval_inode(inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode-&gt;i_blocks += nr_cluster &lt;&lt; (sbi-&gt;cluster_bits - 9);</div><div class='head'>diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c<br/>index 2116c486843b..0b920ee40a7f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/namei_msdos.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/namei_msdos.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/namei_msdos.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/namei_msdos.c</a></div><div class='hunk'>@@ -339,8 +339,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***** Make a directory */</div><div class='del'>-static int msdos_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		       struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *msdos_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				  struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct fat_slot_info sinfo;</div><div class='hunk'>@@ -389,13 +389,13 @@ static int msdos_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;MSDOS_SB(sb)-&gt;s_lock);</div><div class='ctx'> 	fat_flush_inodes(sb, dir, inode);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	fat_free_clusters(dir, cluster);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;MSDOS_SB(sb)-&gt;s_lock);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***** Unlink a file */</div><div class='hunk'>@@ -646,28 +646,52 @@ static const struct inode_operations msdos_dir_inode_operations = {</div><div class='ctx'> static void setup(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	MSDOS_SB(sb)-&gt;dir_ops = &amp;msdos_dir_inode_operations;</div><div class='del'>-	sb-&gt;s_d_op = &amp;msdos_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;msdos_dentry_operations);</div><div class='ctx'> 	sb-&gt;s_flags |= SB_NOATIME;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int msdos_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int msdos_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return fat_fill_super(sb, fc, setup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msdos_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, msdos_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int msdos_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	return fat_fill_super(sb, data, silent, 0, setup);</div><div class='add'>+	return fat_parse_param(fc, param, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *msdos_mount(struct file_system_type *fs_type,</div><div class='del'>-			int flags, const char *dev_name,</div><div class='del'>-			void *data)</div><div class='add'>+static const struct fs_context_operations msdos_context_ops = {</div><div class='add'>+	.parse_param	= msdos_parse_param,</div><div class='add'>+	.get_tree	= msdos_get_tree,</div><div class='add'>+	.reconfigure	= fat_reconfigure,</div><div class='add'>+	.free		= fat_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int msdos_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, msdos_fill_super);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Initialize with is_vfat == false */</div><div class='add'>+	err = fat_init_fs_context(fc, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fc-&gt;ops = &amp;msdos_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type msdos_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "msdos",</div><div class='del'>-	.mount		= msdos_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='add'>+	.init_fs_context = msdos_init_fs_context,</div><div class='add'>+	.parameters	= fat_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("msdos");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c<br/>index c4d00999a433..5dbc4cbb8fce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/namei_vfat.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/namei_vfat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/namei_vfat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/namei_vfat.c</a></div><div class='hunk'>@@ -43,17 +43,13 @@ static inline void vfat_d_version_set(struct dentry *dentry,</div><div class='ctx'>  * If it happened, the negative dentry isn't actually negative</div><div class='ctx'>  * anymore.  So, drop it.</div><div class='ctx'>  */</div><div class='del'>-static int vfat_revalidate_shortname(struct dentry *dentry)</div><div class='add'>+static bool vfat_revalidate_shortname(struct dentry *dentry, struct inode *dir)</div><div class='ctx'> {</div><div class='del'>-	int ret = 1;</div><div class='del'>-	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	if (!inode_eq_iversion(d_inode(dentry-&gt;d_parent), vfat_d_version(dentry)))</div><div class='del'>-		ret = 0;</div><div class='del'>-	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	return ret;</div><div class='add'>+	return inode_eq_iversion(dir, vfat_d_version(dentry));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vfat_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int vfat_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			   struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='hunk'>@@ -61,10 +57,11 @@ static int vfat_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	/* This is not negative dentry. Always valid. */</div><div class='ctx'> 	if (d_really_is_positive(dentry))</div><div class='ctx'> 		return 1;</div><div class='del'>-	return vfat_revalidate_shortname(dentry);</div><div class='add'>+	return vfat_revalidate_shortname(dentry, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vfat_revalidate_ci(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int vfat_revalidate_ci(struct inode *dir, const struct qstr *name,</div><div class='add'>+			      struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='hunk'>@@ -97,7 +94,7 @@ static int vfat_revalidate_ci(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	if (flags &amp; (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return vfat_revalidate_shortname(dentry);</div><div class='add'>+	return vfat_revalidate_shortname(dentry, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns the length of a struct qstr, ignoring trailing dots */</div><div class='hunk'>@@ -844,8 +841,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *vfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				  struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -880,13 +877,13 @@ static int vfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;MSDOS_SB(sb)-&gt;s_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	fat_free_clusters(dir, cluster);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;MSDOS_SB(sb)-&gt;s_lock);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vfat_get_dotdot_de(struct inode *inode, struct buffer_head **bh,</div><div class='hunk'>@@ -1037,7 +1034,7 @@ error_inode:</div><div class='ctx'> 	if (corrupt &lt; 0) {</div><div class='ctx'> 		fat_fs_error(new_dir-&gt;i_sb,</div><div class='ctx'> 			     "%s: Filesystem corrupted (i_pos %lld)",</div><div class='del'>-			     __func__, sinfo.i_pos);</div><div class='add'>+			     __func__, new_i_pos);</div><div class='ctx'> 	}</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='hunk'>@@ -1190,29 +1187,53 @@ static void setup(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	MSDOS_SB(sb)-&gt;dir_ops = &amp;vfat_dir_inode_operations;</div><div class='ctx'> 	if (MSDOS_SB(sb)-&gt;options.name_check != 's')</div><div class='del'>-		sb-&gt;s_d_op = &amp;vfat_ci_dentry_ops;</div><div class='add'>+		set_default_d_op(sb, &amp;vfat_ci_dentry_ops);</div><div class='ctx'> 	else</div><div class='del'>-		sb-&gt;s_d_op = &amp;vfat_dentry_ops;</div><div class='add'>+		set_default_d_op(sb, &amp;vfat_dentry_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vfat_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return fat_fill_super(sb, fc, setup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vfat_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, vfat_fill_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vfat_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int vfat_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	return fat_fill_super(sb, data, silent, 1, setup);</div><div class='add'>+	return fat_parse_param(fc, param, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *vfat_mount(struct file_system_type *fs_type,</div><div class='del'>-		       int flags, const char *dev_name,</div><div class='del'>-		       void *data)</div><div class='add'>+static const struct fs_context_operations vfat_context_ops = {</div><div class='add'>+	.parse_param	= vfat_parse_param,</div><div class='add'>+	.get_tree	= vfat_get_tree,</div><div class='add'>+	.reconfigure	= fat_reconfigure,</div><div class='add'>+	.free		= fat_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vfat_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, vfat_fill_super);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Initialize with is_vfat == true */</div><div class='add'>+	err = fat_init_fs_context(fc, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fc-&gt;ops = &amp;vfat_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type vfat_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "vfat",</div><div class='del'>-	.mount		= vfat_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='add'>+	.init_fs_context = vfat_init_fs_context,</div><div class='add'>+	.parameters     = fat_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("vfat");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/fat/nfs.c b/fs/fat/nfs.c<br/>index c52e63e10d35..509eea96a457 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fat/nfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fat/nfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fat/nfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fat/nfs.c</a></div><div class='hunk'>@@ -130,6 +130,12 @@ fat_encode_fh_nostale(struct inode *inode, __u32 *fh, int *lenp,</div><div class='ctx'> 		fid-&gt;parent_i_gen = parent-&gt;i_generation;</div><div class='ctx'> 		type = FILEID_FAT_WITH_PARENT;</div><div class='ctx'> 		*lenp = FAT_FID_SIZE_WITH_PARENT;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * We need to initialize this field because the fh is actually</div><div class='add'>+		 * 12 bytes long</div><div class='add'>+		 */</div><div class='add'>+		fid-&gt;parent_i_pos_hi = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return type;</div><div class='head'>diff --git a/fs/fcntl.c b/fs/fcntl.c<br/>index c80a6acad742..f93dbca08435 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fcntl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fcntl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fcntl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fcntl.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/dnotify.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -27,11 +26,14 @@</div><div class='ctx'> #include &lt;linux/memfd.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/rw_hint.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='ctx'> #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)</div><div class='ctx'> </div><div class='ctx'> static int setfl(int fd, struct file * filp, unsigned int arg)</div><div class='hunk'>@@ -86,29 +88,65 @@ static int setfl(int fd, struct file * filp, unsigned int arg)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,</div><div class='del'>-                     int force)</div><div class='add'>+/*</div><div class='add'>+ * Allocate an file-&gt;f_owner struct if it doesn't exist, handling racing</div><div class='add'>+ * allocations correctly.</div><div class='add'>+ */</div><div class='add'>+int file_f_owner_allocate(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	write_lock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='del'>-	if (force || !filp-&gt;f_owner.pid) {</div><div class='del'>-		put_pid(filp-&gt;f_owner.pid);</div><div class='del'>-		filp-&gt;f_owner.pid = get_pid(pid);</div><div class='del'>-		filp-&gt;f_owner.pid_type = type;</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='ctx'> </div><div class='del'>-		if (pid) {</div><div class='del'>-			const struct cred *cred = current_cred();</div><div class='del'>-			filp-&gt;f_owner.uid = cred-&gt;uid;</div><div class='del'>-			filp-&gt;f_owner.euid = cred-&gt;euid;</div><div class='del'>-		}</div><div class='add'>+	f_owner = file_f_owner(file);</div><div class='add'>+	if (f_owner)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	f_owner = kzalloc(sizeof(struct fown_struct), GFP_KERNEL);</div><div class='add'>+	if (!f_owner)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rwlock_init(&amp;f_owner-&gt;lock);</div><div class='add'>+	f_owner-&gt;file = file;</div><div class='add'>+	/* If someone else raced us, drop our allocation. */</div><div class='add'>+	if (unlikely(cmpxchg(&amp;file-&gt;f_owner, NULL, f_owner)))</div><div class='add'>+		kfree(f_owner);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(file_f_owner_allocate);</div><div class='add'>+</div><div class='add'>+void file_f_owner_release(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='add'>+</div><div class='add'>+	f_owner = file_f_owner(file);</div><div class='add'>+	if (f_owner) {</div><div class='add'>+		put_pid(f_owner-&gt;pid);</div><div class='add'>+		kfree(f_owner);</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,</div><div class='ctx'> 		int force)</div><div class='ctx'> {</div><div class='del'>-	security_file_set_fowner(filp);</div><div class='del'>-	f_modown(filp, pid, type, force);</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='add'>+</div><div class='add'>+	f_owner = file_f_owner(filp);</div><div class='add'>+	if (WARN_ON_ONCE(!f_owner))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	write_lock_irq(&amp;f_owner-&gt;lock);</div><div class='add'>+	if (force || !f_owner-&gt;pid) {</div><div class='add'>+		put_pid(f_owner-&gt;pid);</div><div class='add'>+		f_owner-&gt;pid = get_pid(pid);</div><div class='add'>+		f_owner-&gt;pid_type = type;</div><div class='add'>+</div><div class='add'>+		if (pid) {</div><div class='add'>+			const struct cred *cred = current_cred();</div><div class='add'>+			security_file_set_fowner(filp);</div><div class='add'>+			f_owner-&gt;uid = cred-&gt;uid;</div><div class='add'>+			f_owner-&gt;euid = cred-&gt;euid;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	write_unlock_irq(&amp;f_owner-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__f_setown);</div><div class='ctx'> </div><div class='hunk'>@@ -118,6 +156,8 @@ int f_setown(struct file *filp, int who, int force)</div><div class='ctx'> 	struct pid *pid = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='ctx'> 	type = PIDTYPE_TGID;</div><div class='ctx'> 	if (who &lt; 0) {</div><div class='ctx'> 		/* avoid overflow below */</div><div class='hunk'>@@ -128,6 +168,10 @@ int f_setown(struct file *filp, int who, int force)</div><div class='ctx'> 		who = -who;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = file_f_owner_allocate(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	if (who) {</div><div class='ctx'> 		pid = find_vpid(who);</div><div class='hunk'>@@ -145,22 +189,27 @@ EXPORT_SYMBOL(f_setown);</div><div class='ctx'> </div><div class='ctx'> void f_delown(struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	f_modown(filp, NULL, PIDTYPE_TGID, 1);</div><div class='add'>+	__f_setown(filp, NULL, PIDTYPE_TGID, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> pid_t f_getown(struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	pid_t pid = 0;</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='add'>+</div><div class='add'>+	f_owner = file_f_owner(filp);</div><div class='add'>+	if (!f_owner)</div><div class='add'>+		return pid;</div><div class='ctx'> </div><div class='del'>-	read_lock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='add'>+	read_lock_irq(&amp;f_owner-&gt;lock);</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (pid_task(filp-&gt;f_owner.pid, filp-&gt;f_owner.pid_type)) {</div><div class='del'>-		pid = pid_vnr(filp-&gt;f_owner.pid);</div><div class='del'>-		if (filp-&gt;f_owner.pid_type == PIDTYPE_PGID)</div><div class='add'>+	if (pid_task(f_owner-&gt;pid, f_owner-&gt;pid_type)) {</div><div class='add'>+		pid = pid_vnr(f_owner-&gt;pid);</div><div class='add'>+		if (f_owner-&gt;pid_type == PIDTYPE_PGID)</div><div class='ctx'> 			pid = -pid;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	read_unlock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='add'>+	read_unlock_irq(&amp;f_owner-&gt;lock);</div><div class='ctx'> 	return pid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,6 +242,10 @@ static int f_setown_ex(struct file *filp, unsigned long arg)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = file_f_owner_allocate(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	pid = find_vpid(owner.pid);</div><div class='ctx'> 	if (owner.pid &amp;&amp; !pid)</div><div class='hunk'>@@ -209,13 +262,20 @@ static int f_getown_ex(struct file *filp, unsigned long arg)</div><div class='ctx'> 	struct f_owner_ex __user *owner_p = (void __user *)arg;</div><div class='ctx'> 	struct f_owner_ex owner = {};</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='add'>+	enum pid_type pid_type = PIDTYPE_PID;</div><div class='ctx'> </div><div class='del'>-	read_lock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (pid_task(filp-&gt;f_owner.pid, filp-&gt;f_owner.pid_type))</div><div class='del'>-		owner.pid = pid_vnr(filp-&gt;f_owner.pid);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	switch (filp-&gt;f_owner.pid_type) {</div><div class='add'>+	f_owner = file_f_owner(filp);</div><div class='add'>+	if (f_owner) {</div><div class='add'>+		read_lock_irq(&amp;f_owner-&gt;lock);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		if (pid_task(f_owner-&gt;pid, f_owner-&gt;pid_type))</div><div class='add'>+			owner.pid = pid_vnr(f_owner-&gt;pid);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		pid_type = f_owner-&gt;pid_type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (pid_type) {</div><div class='ctx'> 	case PIDTYPE_PID:</div><div class='ctx'> 		owner.type = F_OWNER_TID;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -233,7 +293,8 @@ static int f_getown_ex(struct file *filp, unsigned long arg)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='add'>+	if (f_owner)</div><div class='add'>+		read_unlock_irq(&amp;f_owner-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		ret = copy_to_user(owner_p, &amp;owner, sizeof(owner));</div><div class='hunk'>@@ -247,14 +308,18 @@ static int f_getown_ex(struct file *filp, unsigned long arg)</div><div class='ctx'> static int f_getowner_uids(struct file *filp, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_namespace *user_ns = current_user_ns();</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='ctx'> 	uid_t __user *dst = (void __user *)arg;</div><div class='del'>-	uid_t src[2];</div><div class='add'>+	uid_t src[2] = {0, 0};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	read_lock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='del'>-	src[0] = from_kuid(user_ns, filp-&gt;f_owner.uid);</div><div class='del'>-	src[1] = from_kuid(user_ns, filp-&gt;f_owner.euid);</div><div class='del'>-	read_unlock_irq(&amp;filp-&gt;f_owner.lock);</div><div class='add'>+	f_owner = file_f_owner(filp);</div><div class='add'>+	if (f_owner) {</div><div class='add'>+		read_lock_irq(&amp;f_owner-&gt;lock);</div><div class='add'>+		src[0] = from_kuid(user_ns, f_owner-&gt;uid);</div><div class='add'>+		src[1] = from_kuid(user_ns, f_owner-&gt;euid);</div><div class='add'>+		read_unlock_irq(&amp;f_owner-&gt;lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err  = put_user(src[0], &amp;dst[0]);</div><div class='ctx'> 	err |= put_user(src[1], &amp;dst[1]);</div><div class='hunk'>@@ -268,8 +333,15 @@ static int f_getowner_uids(struct file *filp, unsigned long arg)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static bool rw_hint_valid(enum rw_hint hint)</div><div class='add'>+static bool rw_hint_valid(u64 hint)</div><div class='ctx'> {</div><div class='add'>+	BUILD_BUG_ON(WRITE_LIFE_NOT_SET != RWH_WRITE_LIFE_NOT_SET);</div><div class='add'>+	BUILD_BUG_ON(WRITE_LIFE_NONE != RWH_WRITE_LIFE_NONE);</div><div class='add'>+	BUILD_BUG_ON(WRITE_LIFE_SHORT != RWH_WRITE_LIFE_SHORT);</div><div class='add'>+	BUILD_BUG_ON(WRITE_LIFE_MEDIUM != RWH_WRITE_LIFE_MEDIUM);</div><div class='add'>+	BUILD_BUG_ON(WRITE_LIFE_LONG != RWH_WRITE_LIFE_LONG);</div><div class='add'>+	BUILD_BUG_ON(WRITE_LIFE_EXTREME != RWH_WRITE_LIFE_EXTREME);</div><div class='add'>+</div><div class='ctx'> 	switch (hint) {</div><div class='ctx'> 	case RWH_WRITE_LIFE_NOT_SET:</div><div class='ctx'> 	case RWH_WRITE_LIFE_NONE:</div><div class='hunk'>@@ -283,51 +355,114 @@ static bool rw_hint_valid(enum rw_hint hint)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long fcntl_rw_hint(struct file *file, unsigned int cmd,</div><div class='del'>-			  unsigned long arg)</div><div class='add'>+static long fcntl_get_rw_hint(struct file *file, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	u64 __user *argp = (u64 __user *)arg;</div><div class='del'>-	enum rw_hint hint;</div><div class='del'>-	u64 h;</div><div class='add'>+	u64 hint = READ_ONCE(inode-&gt;i_write_hint);</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case F_GET_RW_HINT:</div><div class='del'>-		h = inode-&gt;i_write_hint;</div><div class='del'>-		if (copy_to_user(argp, &amp;h, sizeof(*argp)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	case F_SET_RW_HINT:</div><div class='del'>-		if (copy_from_user(&amp;h, argp, sizeof(h)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		hint = (enum rw_hint) h;</div><div class='del'>-		if (!rw_hint_valid(hint))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (copy_to_user(argp, &amp;hint, sizeof(*argp)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		inode_lock(inode);</div><div class='del'>-		inode-&gt;i_write_hint = hint;</div><div class='del'>-		inode_unlock(inode);</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='add'>+static long fcntl_set_rw_hint(struct file *file, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	u64 __user *argp = (u64 __user *)arg;</div><div class='add'>+	u64 hint;</div><div class='add'>+</div><div class='add'>+	if (!inode_owner_or_capable(file_mnt_idmap(file), inode))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;hint, argp, sizeof(hint)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (!rw_hint_valid(hint))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(inode-&gt;i_write_hint, hint);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * file-&gt;f_mapping-&gt;host may differ from inode. As an example,</div><div class='add'>+	 * blkdev_open() modifies file-&gt;f_mapping.</div><div class='add'>+	 */</div><div class='add'>+	if (file-&gt;f_mapping-&gt;host != inode)</div><div class='add'>+		WRITE_ONCE(file-&gt;f_mapping-&gt;host-&gt;i_write_hint, hint);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Is the file descriptor a dup of the file? */</div><div class='add'>+static long f_dupfd_query(int fd, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	CLASS(fd_raw, f)(fd);</div><div class='add'>+</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can do the 'fdput()' immediately, as the only thing that</div><div class='add'>+	 * matters is the pointer value which isn't changed by the fdput.</div><div class='add'>+	 *</div><div class='add'>+	 * Technically we didn't need a ref at all, and 'fdget()' was</div><div class='add'>+	 * overkill, but given our lockless file pointer lookup, the</div><div class='add'>+	 * alternatives are complicated.</div><div class='add'>+	 */</div><div class='add'>+	return fd_file(f) == filp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Let the caller figure out whether a given file was just created. */</div><div class='add'>+static long f_created_query(const struct file *filp)</div><div class='add'>+{</div><div class='add'>+	return !!(filp-&gt;f_mode &amp; FMODE_CREATED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f_owner_sig(struct file *filp, int signum, bool setsig)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct fown_struct *f_owner;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (setsig) {</div><div class='add'>+		if (!valid_signal(signum))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = file_f_owner_allocate(filp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	f_owner = file_f_owner(filp);</div><div class='add'>+	if (setsig)</div><div class='add'>+		f_owner-&gt;signum = signum;</div><div class='add'>+	else if (f_owner)</div><div class='add'>+		ret = f_owner-&gt;signum;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 		struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='add'>+	struct delegation deleg;</div><div class='ctx'> 	int argi = (int)arg;</div><div class='ctx'> 	struct flock flock;</div><div class='ctx'> 	long err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case F_CREATED_QUERY:</div><div class='add'>+		err = f_created_query(filp);</div><div class='add'>+		break;</div><div class='ctx'> 	case F_DUPFD:</div><div class='ctx'> 		err = f_dupfd(argi, filp, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_DUPFD_CLOEXEC:</div><div class='ctx'> 		err = f_dupfd(argi, filp, O_CLOEXEC);</div><div class='ctx'> 		break;</div><div class='add'>+	case F_DUPFD_QUERY:</div><div class='add'>+		err = f_dupfd_query(argi, filp);</div><div class='add'>+		break;</div><div class='ctx'> 	case F_GETFD:</div><div class='ctx'> 		err = get_close_on_exec(fd) ? FD_CLOEXEC : 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -388,15 +523,10 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 		err = f_getowner_uids(filp, arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_GETSIG:</div><div class='del'>-		err = filp-&gt;f_owner.signum;</div><div class='add'>+		err = f_owner_sig(filp, 0, false);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_SETSIG:</div><div class='del'>-		/* arg == 0 restores default behaviour. */</div><div class='del'>-		if (!valid_signal(argi)) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		err = 0;</div><div class='del'>-		filp-&gt;f_owner.signum = argi;</div><div class='add'>+		err = f_owner_sig(filp, argi, true);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_GETLEASE:</div><div class='ctx'> 		err = fcntl_getlease(filp);</div><div class='hunk'>@@ -416,8 +546,22 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 		err = memfd_fcntl(filp, cmd, argi);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_GET_RW_HINT:</div><div class='add'>+		err = fcntl_get_rw_hint(filp, arg);</div><div class='add'>+		break;</div><div class='ctx'> 	case F_SET_RW_HINT:</div><div class='del'>-		err = fcntl_rw_hint(filp, cmd, arg);</div><div class='add'>+		err = fcntl_set_rw_hint(filp, arg);</div><div class='add'>+		break;</div><div class='add'>+	case F_GETDELEG:</div><div class='add'>+		if (copy_from_user(&amp;deleg, argp, sizeof(deleg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		err = fcntl_getdeleg(filp, &amp;deleg);</div><div class='add'>+		if (!err &amp;&amp; copy_to_user(argp, &amp;deleg, sizeof(deleg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case F_SETDELEG:</div><div class='add'>+		if (copy_from_user(&amp;deleg, argp, sizeof(deleg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		err = fcntl_setdeleg(fd, filp, &amp;deleg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -428,8 +572,10 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,</div><div class='ctx'> static int check_fcntl_cmd(unsigned cmd)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case F_CREATED_QUERY:</div><div class='ctx'> 	case F_DUPFD:</div><div class='ctx'> 	case F_DUPFD_CLOEXEC:</div><div class='add'>+	case F_DUPFD_QUERY:</div><div class='ctx'> 	case F_GETFD:</div><div class='ctx'> 	case F_SETFD:</div><div class='ctx'> 	case F_GETFL:</div><div class='hunk'>@@ -440,24 +586,21 @@ static int check_fcntl_cmd(unsigned cmd)</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)</div><div class='ctx'> {	</div><div class='del'>-	struct fd f = fdget_raw(fd);</div><div class='del'>-	long err = -EBADF;</div><div class='add'>+	CLASS(fd_raw, f)(fd);</div><div class='add'>+	long err;</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='del'>-		goto out;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(f.file-&gt;f_mode &amp; FMODE_PATH)) {</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_mode &amp; FMODE_PATH)) {</div><div class='ctx'> 		if (!check_fcntl_cmd(cmd))</div><div class='del'>-			goto out1;</div><div class='add'>+			return -EBADF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = security_file_fcntl(f.file, cmd, arg);</div><div class='add'>+	err = security_file_fcntl(fd_file(f), cmd, arg);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = do_fcntl(fd, cmd, arg, f.file);</div><div class='add'>+		err = do_fcntl(fd, cmd, arg, fd_file(f));</div><div class='ctx'> </div><div class='del'>-out1:</div><div class='del'>- 	fdput(f);</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -466,21 +609,21 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 		unsigned long, arg)</div><div class='ctx'> {	</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='del'>-	struct fd f = fdget_raw(fd);</div><div class='add'>+	CLASS(fd_raw, f)(fd);</div><div class='ctx'> 	struct flock64 flock;</div><div class='del'>-	long err = -EBADF;</div><div class='add'>+	long err;</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='del'>-		goto out;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(f.file-&gt;f_mode &amp; FMODE_PATH)) {</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_mode &amp; FMODE_PATH)) {</div><div class='ctx'> 		if (!check_fcntl_cmd(cmd))</div><div class='del'>-			goto out1;</div><div class='add'>+			return -EBADF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = security_file_fcntl(f.file, cmd, arg);</div><div class='add'>+	err = security_file_fcntl(fd_file(f), cmd, arg);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out1;</div><div class='add'>+		return err;</div><div class='ctx'> 	</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case F_GETLK64:</div><div class='hunk'>@@ -488,7 +631,7 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		if (copy_from_user(&amp;flock, argp, sizeof(flock)))</div><div class='ctx'> 			break;</div><div class='del'>-		err = fcntl_getlk64(f.file, cmd, &amp;flock);</div><div class='add'>+		err = fcntl_getlk64(fd_file(f), cmd, &amp;flock);</div><div class='ctx'> 		if (!err &amp;&amp; copy_to_user(argp, &amp;flock, sizeof(flock)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -499,15 +642,12 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		if (copy_from_user(&amp;flock, argp, sizeof(flock)))</div><div class='ctx'> 			break;</div><div class='del'>-		err = fcntl_setlk64(fd, f.file, cmd, &amp;flock);</div><div class='add'>+		err = fcntl_setlk64(fd, fd_file(f), cmd, &amp;flock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err = do_fcntl(fd, cmd, arg, f.file);</div><div class='add'>+		err = do_fcntl(fd, cmd, arg, fd_file(f));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-out1:</div><div class='del'>-	fdput(f);</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -603,28 +743,28 @@ static int fixup_compat_flock(struct flock *flock)</div><div class='ctx'> static long do_compat_fcntl64(unsigned int fd, unsigned int cmd,</div><div class='ctx'> 			     compat_ulong_t arg)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget_raw(fd);</div><div class='add'>+	CLASS(fd_raw, f)(fd);</div><div class='ctx'> 	struct flock flock;</div><div class='del'>-	long err = -EBADF;</div><div class='add'>+	long err;</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='del'>-		return err;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(f.file-&gt;f_mode &amp; FMODE_PATH)) {</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_mode &amp; FMODE_PATH)) {</div><div class='ctx'> 		if (!check_fcntl_cmd(cmd))</div><div class='del'>-			goto out_put;</div><div class='add'>+			return -EBADF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = security_file_fcntl(f.file, cmd, arg);</div><div class='add'>+	err = security_file_fcntl(fd_file(f), cmd, arg);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_put;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case F_GETLK:</div><div class='ctx'> 		err = get_compat_flock(&amp;flock, compat_ptr(arg));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		err = fcntl_getlk(f.file, convert_fcntl_cmd(cmd), &amp;flock);</div><div class='add'>+		err = fcntl_getlk(fd_file(f), convert_fcntl_cmd(cmd), &amp;flock);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> 		err = fixup_compat_flock(&amp;flock);</div><div class='hunk'>@@ -636,7 +776,7 @@ static long do_compat_fcntl64(unsigned int fd, unsigned int cmd,</div><div class='ctx'> 		err = get_compat_flock64(&amp;flock, compat_ptr(arg));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		err = fcntl_getlk(f.file, convert_fcntl_cmd(cmd), &amp;flock);</div><div class='add'>+		err = fcntl_getlk(fd_file(f), convert_fcntl_cmd(cmd), &amp;flock);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = put_compat_flock64(&amp;flock, compat_ptr(arg));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -645,7 +785,7 @@ static long do_compat_fcntl64(unsigned int fd, unsigned int cmd,</div><div class='ctx'> 		err = get_compat_flock(&amp;flock, compat_ptr(arg));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		err = fcntl_setlk(fd, f.file, convert_fcntl_cmd(cmd), &amp;flock);</div><div class='add'>+		err = fcntl_setlk(fd, fd_file(f), convert_fcntl_cmd(cmd), &amp;flock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_SETLK64:</div><div class='ctx'> 	case F_SETLKW64:</div><div class='hunk'>@@ -654,14 +794,12 @@ static long do_compat_fcntl64(unsigned int fd, unsigned int cmd,</div><div class='ctx'> 		err = get_compat_flock64(&amp;flock, compat_ptr(arg));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		err = fcntl_setlk(fd, f.file, convert_fcntl_cmd(cmd), &amp;flock);</div><div class='add'>+		err = fcntl_setlk(fd, fd_file(f), convert_fcntl_cmd(cmd), &amp;flock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err = do_fcntl(fd, cmd, arg, f.file);</div><div class='add'>+		err = do_fcntl(fd, cmd, arg, fd_file(f));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-out_put:</div><div class='del'>-	fdput(f);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -808,14 +946,19 @@ static void send_sigurg_to_task(struct task_struct *p,</div><div class='ctx'> 		do_send_sig_info(SIGURG, SEND_SIG_PRIV, p, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int send_sigurg(struct fown_struct *fown)</div><div class='add'>+int send_sigurg(struct file *file)</div><div class='ctx'> {</div><div class='add'>+	struct fown_struct *fown;</div><div class='ctx'> 	struct task_struct *p;</div><div class='ctx'> 	enum pid_type type;</div><div class='ctx'> 	struct pid *pid;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	</div><div class='add'>+	fown = file_f_owner(file);</div><div class='add'>+	if (!fown)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	read_lock_irqsave(&amp;fown-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	type = fown-&gt;pid_type;</div><div class='hunk'>@@ -846,12 +989,6 @@ int send_sigurg(struct fown_struct *fown)</div><div class='ctx'> static DEFINE_SPINLOCK(fasync_lock);</div><div class='ctx'> static struct kmem_cache *fasync_cache __ro_after_init;</div><div class='ctx'> </div><div class='del'>-static void fasync_free_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(fasync_cache,</div><div class='del'>-			container_of(head, struct fasync_struct, fa_rcu));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Remove a fasync entry. If successfully removed, return</div><div class='ctx'>  * positive and clear the FASYNC flag. If no entry exists,</div><div class='hunk'>@@ -877,7 +1014,7 @@ int fasync_remove_entry(struct file *filp, struct fasync_struct **fapp)</div><div class='ctx'> 		write_unlock_irq(&amp;fa-&gt;fa_lock);</div><div class='ctx'> </div><div class='ctx'> 		*fp = fa-&gt;fa_next;</div><div class='del'>-		call_rcu(&amp;fa-&gt;fa_rcu, fasync_free_rcu);</div><div class='add'>+		kfree_rcu(fa, fa_rcu);</div><div class='ctx'> 		filp-&gt;f_flags &amp;= ~FASYNC;</div><div class='ctx'> 		result = 1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -997,13 +1134,16 @@ static void kill_fasync_rcu(struct fasync_struct *fa, int sig, int band)</div><div class='ctx'> 		}</div><div class='ctx'> 		read_lock_irqsave(&amp;fa-&gt;fa_lock, flags);</div><div class='ctx'> 		if (fa-&gt;fa_file) {</div><div class='del'>-			fown = &amp;fa-&gt;fa_file-&gt;f_owner;</div><div class='add'>+			fown = file_f_owner(fa-&gt;fa_file);</div><div class='add'>+			if (!fown)</div><div class='add'>+				goto next;</div><div class='ctx'> 			/* Don't send SIGURG to processes which have not set a</div><div class='ctx'> 			   queued signum: SIGURG has its own default signalling</div><div class='ctx'> 			   mechanism. */</div><div class='ctx'> 			if (!(sig == SIGURG &amp;&amp; fown-&gt;signum == 0))</div><div class='ctx'> 				send_sigio(fown, fa-&gt;fa_fd, band);</div><div class='ctx'> 		}</div><div class='add'>+next:</div><div class='ctx'> 		read_unlock_irqrestore(&amp;fa-&gt;fa_lock, flags);</div><div class='ctx'> 		fa = rcu_dereference(fa-&gt;fa_next);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1029,10 +1169,10 @@ static int __init fcntl_init(void)</div><div class='ctx'> 	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY</div><div class='ctx'> 	 * is defined as O_NONBLOCK on some platforms and not on others.</div><div class='ctx'> 	 */</div><div class='del'>-	BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ !=</div><div class='add'>+	BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ !=</div><div class='ctx'> 		HWEIGHT32(</div><div class='ctx'> 			(VALID_OPEN_FLAGS &amp; ~(O_NONBLOCK | O_NDELAY)) |</div><div class='del'>-			__FMODE_EXEC | __FMODE_NONOTIFY));</div><div class='add'>+			__FMODE_EXEC));</div><div class='ctx'> </div><div class='ctx'> 	fasync_cache = kmem_cache_create("fasync_cache",</div><div class='ctx'> 					 sizeof(struct fasync_struct), 0,</div><div class='head'>diff --git a/fs/fhandle.c b/fs/fhandle.c<br/>index 18b3ba8dc8ea..3de1547ec9d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fhandle.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fhandle.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fhandle.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fhandle.c</a></div><div class='hunk'>@@ -11,12 +11,14 @@</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/nsfs.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "mount.h"</div><div class='ctx'> </div><div class='ctx'> static long do_sys_name_to_handle(const struct path *path,</div><div class='ctx'> 				  struct file_handle __user *ufh,</div><div class='del'>-				  int __user *mnt_id, int fh_flags)</div><div class='add'>+				  void __user *mnt_id, bool unique_mntid,</div><div class='add'>+				  int fh_flags)</div><div class='ctx'> {</div><div class='ctx'> 	long retval;</div><div class='ctx'> 	struct file_handle f_handle;</div><div class='hunk'>@@ -30,13 +32,21 @@ static long do_sys_name_to_handle(const struct path *path,</div><div class='ctx'> 	if (!exportfs_can_encode_fh(path-&gt;dentry-&gt;d_sb-&gt;s_export_op, fh_flags))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * A request to encode a connectable handle for a disconnected dentry</div><div class='add'>+	 * is unexpected since AT_EMPTY_PATH is not allowed.</div><div class='add'>+	 */</div><div class='add'>+	if (fh_flags &amp; EXPORT_FH_CONNECTABLE &amp;&amp;</div><div class='add'>+	    WARN_ON(path-&gt;dentry-&gt;d_flags &amp; DCACHE_DISCONNECTED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;f_handle, ufh, sizeof(struct file_handle)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (f_handle.handle_bytes &gt; MAX_HANDLE_SZ)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	handle = kmalloc(sizeof(struct file_handle) + f_handle.handle_bytes,</div><div class='add'>+	handle = kzalloc(struct_size(handle, f_handle, f_handle.handle_bytes),</div><div class='ctx'> 			 GFP_KERNEL);</div><div class='ctx'> 	if (!handle)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -44,7 +54,7 @@ static long do_sys_name_to_handle(const struct path *path,</div><div class='ctx'> 	/* convert handle size to multiple of sizeof(u32) */</div><div class='ctx'> 	handle_dwords = f_handle.handle_bytes &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-	/* we ask for a non connectable maybe decodeable file handle */</div><div class='add'>+	/* Encode a possibly decodeable/connectable file handle */</div><div class='ctx'> 	retval = exportfs_encode_fh(path-&gt;dentry,</div><div class='ctx'> 				    (struct fid *)handle-&gt;f_handle,</div><div class='ctx'> 				    &amp;handle_dwords, fh_flags);</div><div class='hunk'>@@ -66,12 +76,37 @@ static long do_sys_name_to_handle(const struct path *path,</div><div class='ctx'> 		 * non variable part of the file_handle</div><div class='ctx'> 		 */</div><div class='ctx'> 		handle_bytes = 0;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * When asked to encode a connectable file handle, encode this</div><div class='add'>+		 * property in the file handle itself, so that we later know</div><div class='add'>+		 * how to decode it.</div><div class='add'>+		 * For sanity, also encode in the file handle if the encoded</div><div class='add'>+		 * object is a directory and verify this during decode, because</div><div class='add'>+		 * decoding directory file handles is quite different than</div><div class='add'>+		 * decoding connectable non-directory file handles.</div><div class='add'>+		 */</div><div class='add'>+		if (fh_flags &amp; EXPORT_FH_CONNECTABLE) {</div><div class='add'>+			handle-&gt;handle_type |= FILEID_IS_CONNECTABLE;</div><div class='add'>+			if (d_is_dir(path-&gt;dentry))</div><div class='add'>+				handle-&gt;handle_type |= FILEID_IS_DIR;</div><div class='add'>+		}</div><div class='ctx'> 		retval = 0;</div><div class='add'>+	}</div><div class='ctx'> 	/* copy the mount id */</div><div class='del'>-	if (put_user(real_mount(path-&gt;mnt)-&gt;mnt_id, mnt_id) ||</div><div class='del'>-	    copy_to_user(ufh, handle,</div><div class='del'>-			 sizeof(struct file_handle) + handle_bytes))</div><div class='add'>+	if (unique_mntid) {</div><div class='add'>+		if (put_user(real_mount(path-&gt;mnt)-&gt;mnt_id_unique,</div><div class='add'>+			     (u64 __user *) mnt_id))</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		if (put_user(real_mount(path-&gt;mnt)-&gt;mnt_id,</div><div class='add'>+			     (int __user *) mnt_id))</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	/* copy the handle */</div><div class='add'>+	if (retval != -EFAULT &amp;&amp;</div><div class='add'>+		copy_to_user(ufh, handle,</div><div class='add'>+			     struct_size(handle, f_handle, handle_bytes)))</div><div class='ctx'> 		retval = -EFAULT;</div><div class='ctx'> 	kfree(handle);</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -83,6 +118,7 @@ static long do_sys_name_to_handle(const struct path *path,</div><div class='ctx'>  * @name: name that should be converted to handle.</div><div class='ctx'>  * @handle: resulting file handle</div><div class='ctx'>  * @mnt_id: mount id of the file system containing the file</div><div class='add'>+ *          (u64 if AT_HANDLE_MNT_ID_UNIQUE, otherwise int)</div><div class='ctx'>  * @flag: flag value to indicate whether to follow symlink or not</div><div class='ctx'>  *        and whether a decodable file handle is required.</div><div class='ctx'>  *</div><div class='hunk'>@@ -92,111 +128,252 @@ static long do_sys_name_to_handle(const struct path *path,</div><div class='ctx'>  * value required.</div><div class='ctx'>  */</div><div class='ctx'> SYSCALL_DEFINE5(name_to_handle_at, int, dfd, const char __user *, name,</div><div class='del'>-		struct file_handle __user *, handle, int __user *, mnt_id,</div><div class='add'>+		struct file_handle __user *, handle, void __user *, mnt_id,</div><div class='ctx'> 		int, flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	int lookup_flags;</div><div class='del'>-	int fh_flags;</div><div class='add'>+	int fh_flags = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (flag &amp; ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH | AT_HANDLE_FID))</div><div class='add'>+	if (flag &amp; ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH | AT_HANDLE_FID |</div><div class='add'>+		     AT_HANDLE_MNT_ID_UNIQUE | AT_HANDLE_CONNECTABLE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AT_HANDLE_FID means there is no intention to decode file handle</div><div class='add'>+	 * AT_HANDLE_CONNECTABLE means there is an intention to decode a</div><div class='add'>+	 * connected fd (with known path), so these flags are conflicting.</div><div class='add'>+	 * AT_EMPTY_PATH could be used along with a dfd that refers to a</div><div class='add'>+	 * disconnected non-directory, which cannot be used to encode a</div><div class='add'>+	 * connectable file handle, because its parent is unknown.</div><div class='add'>+	 */</div><div class='add'>+	if (flag &amp; AT_HANDLE_CONNECTABLE &amp;&amp;</div><div class='add'>+	    flag &amp; (AT_HANDLE_FID | AT_EMPTY_PATH))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	else if (flag &amp; AT_HANDLE_FID)</div><div class='add'>+		fh_flags |= EXPORT_FH_FID;</div><div class='add'>+	else if (flag &amp; AT_HANDLE_CONNECTABLE)</div><div class='add'>+		fh_flags |= EXPORT_FH_CONNECTABLE;</div><div class='ctx'> </div><div class='ctx'> 	lookup_flags = (flag &amp; AT_SYMLINK_FOLLOW) ? LOOKUP_FOLLOW : 0;</div><div class='del'>-	fh_flags = (flag &amp; AT_HANDLE_FID) ? EXPORT_FH_FID : 0;</div><div class='ctx'> 	if (flag &amp; AT_EMPTY_PATH)</div><div class='ctx'> 		lookup_flags |= LOOKUP_EMPTY;</div><div class='ctx'> 	err = user_path_at(dfd, name, lookup_flags, &amp;path);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		err = do_sys_name_to_handle(&amp;path, handle, mnt_id, fh_flags);</div><div class='add'>+		err = do_sys_name_to_handle(&amp;path, handle, mnt_id,</div><div class='add'>+					    flag &amp; AT_HANDLE_MNT_ID_UNIQUE,</div><div class='add'>+					    fh_flags);</div><div class='ctx'> 		path_put(&amp;path);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct vfsmount *get_vfsmount_from_fd(int fd)</div><div class='add'>+static int get_path_anchor(int fd, struct path *root)</div><div class='ctx'> {</div><div class='del'>-	struct vfsmount *mnt;</div><div class='add'>+	if (fd &gt;= 0) {</div><div class='add'>+		CLASS(fd, f)(fd);</div><div class='add'>+		if (fd_empty(f))</div><div class='add'>+			return -EBADF;</div><div class='add'>+		*root = fd_file(f)-&gt;f_path;</div><div class='add'>+		path_get(root);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (fd == AT_FDCWD) {</div><div class='del'>-		struct fs_struct *fs = current-&gt;fs;</div><div class='del'>-		spin_lock(&amp;fs-&gt;lock);</div><div class='del'>-		mnt = mntget(fs-&gt;pwd.mnt);</div><div class='del'>-		spin_unlock(&amp;fs-&gt;lock);</div><div class='del'>-	} else {</div><div class='del'>-		struct fd f = fdget(fd);</div><div class='del'>-		if (!f.file)</div><div class='del'>-			return ERR_PTR(-EBADF);</div><div class='del'>-		mnt = mntget(f.file-&gt;f_path.mnt);</div><div class='del'>-		fdput(f);</div><div class='add'>+		get_fs_pwd(current-&gt;fs, root);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return mnt;</div><div class='add'>+</div><div class='add'>+	if (fd == FD_PIDFS_ROOT) {</div><div class='add'>+		pidfs_get_root(root);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fd == FD_NSFS_ROOT) {</div><div class='add'>+		nsfs_get_root(root);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EBADF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vfs_dentry_acceptable(void *context, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return 1;</div><div class='add'>+	struct handle_to_path_ctx *ctx = context;</div><div class='add'>+	struct user_namespace *user_ns = current_user_ns();</div><div class='add'>+	struct dentry *d, *root = ctx-&gt;root.dentry;</div><div class='add'>+	struct mnt_idmap *idmap = mnt_idmap(ctx-&gt;root.mnt);</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	if (!root)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Old permission model with global CAP_DAC_READ_SEARCH. */</div><div class='add'>+	if (!ctx-&gt;flags)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Verify that the decoded dentry itself has a valid id mapping.</div><div class='add'>+	 * In case the decoded dentry is the mountfd root itself, this</div><div class='add'>+	 * verifies that the mountfd inode itself has a valid id mapping.</div><div class='add'>+	 */</div><div class='add'>+	if (!privileged_wrt_inode_uidgid(user_ns, idmap, d_inode(dentry)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It's racy as we're not taking rename_lock but we're able to ignore</div><div class='add'>+	 * permissions and we just need an approximation whether we were able</div><div class='add'>+	 * to follow a path to the file.</div><div class='add'>+	 *</div><div class='add'>+	 * It's also potentially expensive on some filesystems especially if</div><div class='add'>+	 * there is a deep path.</div><div class='add'>+	 */</div><div class='add'>+	d = dget(dentry);</div><div class='add'>+	while (d != root &amp;&amp; !IS_ROOT(d)) {</div><div class='add'>+		struct dentry *parent = dget_parent(d);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We know that we have the ability to override DAC permissions</div><div class='add'>+		 * as we've verified this earlier via CAP_DAC_READ_SEARCH. But</div><div class='add'>+		 * we also need to make sure that there aren't any unmapped</div><div class='add'>+		 * inodes in the path that would prevent us from reaching the</div><div class='add'>+		 * file.</div><div class='add'>+		 */</div><div class='add'>+		if (!privileged_wrt_inode_uidgid(user_ns, idmap,</div><div class='add'>+						 d_inode(parent))) {</div><div class='add'>+			dput(d);</div><div class='add'>+			dput(parent);</div><div class='add'>+			return retval;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dput(d);</div><div class='add'>+		d = parent;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(ctx-&gt;flags &amp; HANDLE_CHECK_SUBTREE) || d == root)</div><div class='add'>+		retval = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * exportfs_decode_fh_raw() does not call acceptable() callback with</div><div class='add'>+	 * a disconnected directory dentry, so we should have reached either</div><div class='add'>+	 * mount fd directory or sb root.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx-&gt;fh_flags &amp; EXPORT_FH_DIR_ONLY)</div><div class='add'>+		WARN_ON_ONCE(d != root &amp;&amp; d != root-&gt;d_sb-&gt;s_root);</div><div class='add'>+	dput(d);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_handle_to_path(int mountdirfd, struct file_handle *handle,</div><div class='del'>-			     struct path *path)</div><div class='add'>+static int do_handle_to_path(struct file_handle *handle, struct path *path,</div><div class='add'>+			     struct handle_to_path_ctx *ctx)</div><div class='ctx'> {</div><div class='del'>-	int retval = 0;</div><div class='ctx'> 	int handle_dwords;</div><div class='add'>+	struct vfsmount *mnt = ctx-&gt;root.mnt;</div><div class='add'>+	struct dentry *dentry;</div><div class='ctx'> </div><div class='del'>-	path-&gt;mnt = get_vfsmount_from_fd(mountdirfd);</div><div class='del'>-	if (IS_ERR(path-&gt;mnt)) {</div><div class='del'>-		retval = PTR_ERR(path-&gt;mnt);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='ctx'> 	/* change the handle size to multiple of sizeof(u32) */</div><div class='ctx'> 	handle_dwords = handle-&gt;handle_bytes &gt;&gt; 2;</div><div class='del'>-	path-&gt;dentry = exportfs_decode_fh(path-&gt;mnt,</div><div class='del'>-					  (struct fid *)handle-&gt;f_handle,</div><div class='del'>-					  handle_dwords, handle-&gt;handle_type,</div><div class='del'>-					  vfs_dentry_acceptable, NULL);</div><div class='del'>-	if (IS_ERR(path-&gt;dentry)) {</div><div class='del'>-		retval = PTR_ERR(path-&gt;dentry);</div><div class='del'>-		goto out_mnt;</div><div class='add'>+	dentry = exportfs_decode_fh_raw(mnt, (struct fid *)handle-&gt;f_handle,</div><div class='add'>+					handle_dwords, handle-&gt;handle_type,</div><div class='add'>+					ctx-&gt;fh_flags, vfs_dentry_acceptable,</div><div class='add'>+					ctx);</div><div class='add'>+	if (IS_ERR_OR_NULL(dentry)) {</div><div class='add'>+		if (dentry == ERR_PTR(-ENOMEM))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		return -ESTALE;</div><div class='ctx'> 	}</div><div class='add'>+	path-&gt;dentry = dentry;</div><div class='add'>+	path-&gt;mnt = mntget(mnt);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int may_decode_fh(struct handle_to_path_ctx *ctx,</div><div class='add'>+				unsigned int o_flags)</div><div class='add'>+{</div><div class='add'>+	struct path *root = &amp;ctx-&gt;root;</div><div class='add'>+</div><div class='add'>+	if (capable(CAP_DAC_READ_SEARCH))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allow relaxed permissions of file handles if the caller has</div><div class='add'>+	 * the ability to mount the filesystem or create a bind-mount of</div><div class='add'>+	 * the provided @mountdirfd.</div><div class='add'>+	 *</div><div class='add'>+	 * In both cases the caller may be able to get an unobstructed</div><div class='add'>+	 * way to the encoded file handle. If the caller is only able to</div><div class='add'>+	 * create a bind-mount we need to verify that there are no</div><div class='add'>+	 * locked mounts on top of it that could prevent us from getting</div><div class='add'>+	 * to the encoded file.</div><div class='add'>+	 *</div><div class='add'>+	 * In principle, locked mounts can prevent the caller from</div><div class='add'>+	 * mounting the filesystem but that only applies to procfs and</div><div class='add'>+	 * sysfs neither of which support decoding file handles.</div><div class='add'>+	 *</div><div class='add'>+	 * Restrict to O_DIRECTORY to provide a deterministic API that</div><div class='add'>+	 * avoids a confusing api in the face of disconnected non-dir</div><div class='add'>+	 * dentries.</div><div class='add'>+	 *</div><div class='add'>+	 * There's only one dentry for each directory inode (VFS rule)...</div><div class='add'>+	 */</div><div class='add'>+	if (!(o_flags &amp; O_DIRECTORY))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (ns_capable(root-&gt;mnt-&gt;mnt_sb-&gt;s_user_ns, CAP_SYS_ADMIN))</div><div class='add'>+		ctx-&gt;flags = HANDLE_CHECK_PERMS;</div><div class='add'>+	else if (is_mounted(root-&gt;mnt) &amp;&amp;</div><div class='add'>+		 ns_capable(real_mount(root-&gt;mnt)-&gt;mnt_ns-&gt;user_ns,</div><div class='add'>+			    CAP_SYS_ADMIN) &amp;&amp;</div><div class='add'>+		 !has_locked_children(real_mount(root-&gt;mnt), root-&gt;dentry))</div><div class='add'>+		ctx-&gt;flags = HANDLE_CHECK_PERMS | HANDLE_CHECK_SUBTREE;</div><div class='add'>+	else</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* Are we able to override DAC permissions? */</div><div class='add'>+	if (!ns_capable(current_user_ns(), CAP_DAC_READ_SEARCH))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;fh_flags = EXPORT_FH_DIR_ONLY;</div><div class='ctx'> 	return 0;</div><div class='del'>-out_mnt:</div><div class='del'>-	mntput(path-&gt;mnt);</div><div class='del'>-out_err:</div><div class='del'>-	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,</div><div class='del'>-		   struct path *path)</div><div class='add'>+		   struct path *path, unsigned int o_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	struct file_handle f_handle;</div><div class='del'>-	struct file_handle *handle = NULL;</div><div class='add'>+	struct file_handle *handle __free(kfree) = NULL;</div><div class='add'>+	struct handle_to_path_ctx ctx = {};</div><div class='add'>+	const struct export_operations *eops;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;f_handle, ufh, sizeof(struct file_handle)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * With handle we don't look at the execute bit on the</div><div class='del'>-	 * directory. Ideally we would like CAP_DAC_SEARCH.</div><div class='del'>-	 * But we don't have that</div><div class='del'>-	 */</div><div class='del'>-	if (!capable(CAP_DAC_READ_SEARCH)) {</div><div class='del'>-		retval = -EPERM;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	if (copy_from_user(&amp;f_handle, ufh, sizeof(struct file_handle))) {</div><div class='del'>-		retval = -EFAULT;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='ctx'> 	if ((f_handle.handle_bytes &gt; MAX_HANDLE_SZ) ||</div><div class='del'>-	    (f_handle.handle_bytes == 0)) {</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	handle = kmalloc(sizeof(struct file_handle) + f_handle.handle_bytes,</div><div class='add'>+	    (f_handle.handle_bytes == 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (f_handle.handle_type &lt; 0 ||</div><div class='add'>+	    FILEID_USER_FLAGS(f_handle.handle_type) &amp; ~FILEID_VALID_USER_FLAGS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	retval = get_path_anchor(mountdirfd, &amp;ctx.root);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	eops = ctx.root.mnt-&gt;mnt_sb-&gt;s_export_op;</div><div class='add'>+	if (eops &amp;&amp; eops-&gt;permission)</div><div class='add'>+		retval = eops-&gt;permission(&amp;ctx, o_flags);</div><div class='add'>+	else</div><div class='add'>+		retval = may_decode_fh(&amp;ctx, o_flags);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto out_path;</div><div class='add'>+</div><div class='add'>+	handle = kmalloc(struct_size(handle, f_handle, f_handle.handle_bytes),</div><div class='ctx'> 			 GFP_KERNEL);</div><div class='ctx'> 	if (!handle) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		goto out_err;</div><div class='add'>+		goto out_path;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* copy the full handle */</div><div class='ctx'> 	*handle = f_handle;</div><div class='hunk'>@@ -204,44 +381,51 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,</div><div class='ctx'> 			   &amp;ufh-&gt;f_handle,</div><div class='ctx'> 			   f_handle.handle_bytes)) {</div><div class='ctx'> 		retval = -EFAULT;</div><div class='del'>-		goto out_handle;</div><div class='add'>+		goto out_path;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = do_handle_to_path(mountdirfd, handle, path);</div><div class='add'>+	/*</div><div class='add'>+	 * If handle was encoded with AT_HANDLE_CONNECTABLE, verify that we</div><div class='add'>+	 * are decoding an fd with connected path, which is accessible from</div><div class='add'>+	 * the mount fd path.</div><div class='add'>+	 */</div><div class='add'>+	if (f_handle.handle_type &amp; FILEID_IS_CONNECTABLE) {</div><div class='add'>+		ctx.fh_flags |= EXPORT_FH_CONNECTABLE;</div><div class='add'>+		ctx.flags |= HANDLE_CHECK_SUBTREE;</div><div class='add'>+	}</div><div class='add'>+	if (f_handle.handle_type &amp; FILEID_IS_DIR)</div><div class='add'>+		ctx.fh_flags |= EXPORT_FH_DIR_ONLY;</div><div class='add'>+	/* Filesystem code should not be exposed to user flags */</div><div class='add'>+	handle-&gt;handle_type &amp;= ~FILEID_USER_FLAGS_MASK;</div><div class='add'>+	retval = do_handle_to_path(handle, path, &amp;ctx);</div><div class='ctx'> </div><div class='del'>-out_handle:</div><div class='del'>-	kfree(handle);</div><div class='del'>-out_err:</div><div class='add'>+out_path:</div><div class='add'>+	path_put(&amp;ctx.root);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct file *file_open_handle(struct path *path, int open_flag)</div><div class='add'>+{</div><div class='add'>+	const struct export_operations *eops;</div><div class='add'>+</div><div class='add'>+	eops = path-&gt;mnt-&gt;mnt_sb-&gt;s_export_op;</div><div class='add'>+	if (eops-&gt;open)</div><div class='add'>+		return eops-&gt;open(path, open_flag);</div><div class='add'>+</div><div class='add'>+	return file_open_root(path, "", open_flag, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static long do_handle_open(int mountdirfd, struct file_handle __user *ufh,</div><div class='ctx'> 			   int open_flag)</div><div class='ctx'> {</div><div class='del'>-	long retval = 0;</div><div class='del'>-	struct path path;</div><div class='del'>-	struct file *file;</div><div class='del'>-	int fd;</div><div class='add'>+	long retval;</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='ctx'> </div><div class='del'>-	retval = handle_to_path(mountdirfd, ufh, &amp;path);</div><div class='add'>+	retval = handle_to_path(mountdirfd, ufh, &amp;path, open_flag);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	fd = get_unused_fd_flags(open_flag);</div><div class='del'>-	if (fd &lt; 0) {</div><div class='del'>-		path_put(&amp;path);</div><div class='del'>-		return fd;</div><div class='del'>-	}</div><div class='del'>-	file = file_open_root(&amp;path, "", open_flag, 0);</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		put_unused_fd(fd);</div><div class='del'>-		retval =  PTR_ERR(file);</div><div class='del'>-	} else {</div><div class='del'>-		retval = fd;</div><div class='del'>-		fd_install(fd, file);</div><div class='del'>-	}</div><div class='del'>-	path_put(&amp;path);</div><div class='del'>-	return retval;</div><div class='add'>+	return FD_ADD(open_flag, file_open_handle(&amp;path, open_flag));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/file.c b/fs/file.c<br/>index 3b683b9101d8..0a4f3bdb2dec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/file.c</a></div><div class='hunk'>@@ -20,10 +20,79 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/close_range.h&gt;</div><div class='add'>+#include &lt;linux/file_ref.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;linux/init_task.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+static noinline bool __file_ref_put_badval(file_ref_t *ref, unsigned long cnt)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If the reference count was already in the dead zone, then this</div><div class='add'>+	 * put() operation is imbalanced. Warn, put the reference count back to</div><div class='add'>+	 * DEAD and tell the caller to not deconstruct the object.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ONCE(cnt &gt;= FILE_REF_RELEASED, "imbalanced put on file reference count")) {</div><div class='add'>+		atomic_long_set(&amp;ref-&gt;refcnt, FILE_REF_DEAD);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is a put() operation on a saturated refcount. Restore the</div><div class='add'>+	 * mean saturation value and tell the caller to not deconstruct the</div><div class='add'>+	 * object.</div><div class='add'>+	 */</div><div class='add'>+	if (cnt &gt; FILE_REF_MAXREF)</div><div class='add'>+		atomic_long_set(&amp;ref-&gt;refcnt, FILE_REF_SATURATED);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __file_ref_put - Slowpath of file_ref_put()</div><div class='add'>+ * @ref:	Pointer to the reference count</div><div class='add'>+ * @cnt:	Current reference count</div><div class='add'>+ *</div><div class='add'>+ * Invoked when the reference count is outside of the valid zone.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	True if this was the last reference with no future references</div><div class='add'>+ *	possible. This signals the caller that it can safely schedule the</div><div class='add'>+ *	object, which is protected by the reference counter, for</div><div class='add'>+ *	deconstruction.</div><div class='add'>+ *</div><div class='add'>+ *	False if there are still active references or the put() raced</div><div class='add'>+ *	with a concurrent get()/put() pair. Caller is not allowed to</div><div class='add'>+ *	deconstruct the protected object.</div><div class='add'>+ */</div><div class='add'>+bool __file_ref_put(file_ref_t *ref, unsigned long cnt)</div><div class='add'>+{</div><div class='add'>+	/* Did this drop the last reference? */</div><div class='add'>+	if (likely(cnt == FILE_REF_NOREF)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Carefully try to set the reference count to FILE_REF_DEAD.</div><div class='add'>+		 *</div><div class='add'>+		 * This can fail if a concurrent get() operation has</div><div class='add'>+		 * elevated it again or the corresponding put() even marked</div><div class='add'>+		 * it dead already. Both are valid situations and do not</div><div class='add'>+		 * require a retry. If this fails the caller is not</div><div class='add'>+		 * allowed to deconstruct the object.</div><div class='add'>+		 */</div><div class='add'>+		if (!atomic_long_try_cmpxchg_release(&amp;ref-&gt;refcnt, &amp;cnt, FILE_REF_DEAD))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The caller can safely schedule the object for</div><div class='add'>+		 * deconstruction. Provide acquire ordering.</div><div class='add'>+		 */</div><div class='add'>+		smp_acquire__after_ctrl_dep();</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __file_ref_put_badval(ref, cnt);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__file_ref_put);</div><div class='add'>+</div><div class='ctx'> unsigned int sysctl_nr_open __read_mostly = 1024*1024;</div><div class='ctx'> unsigned int sysctl_nr_open_min = BITS_PER_LONG;</div><div class='ctx'> /* our min() is unusable in constant expressions ;-/ */</div><div class='hunk'>@@ -46,27 +115,23 @@ static void free_fdtable_rcu(struct rcu_head *rcu)</div><div class='ctx'> #define BITBIT_NR(nr)	BITS_TO_LONGS(BITS_TO_LONGS(nr))</div><div class='ctx'> #define BITBIT_SIZE(nr)	(BITBIT_NR(nr) * sizeof(long))</div><div class='ctx'> </div><div class='add'>+#define fdt_words(fdt) ((fdt)-&gt;max_fds / BITS_PER_LONG) // words in -&gt;open_fds</div><div class='ctx'> /*</div><div class='ctx'>  * Copy 'count' fd bits from the old table to the new table and clear the extra</div><div class='ctx'>  * space if any.  This does not copy the file pointers.  Called with the files</div><div class='ctx'>  * spinlock held for write.</div><div class='ctx'>  */</div><div class='del'>-static void copy_fd_bitmaps(struct fdtable *nfdt, struct fdtable *ofdt,</div><div class='del'>-			    unsigned int count)</div><div class='add'>+static inline void copy_fd_bitmaps(struct fdtable *nfdt, struct fdtable *ofdt,</div><div class='add'>+			    unsigned int copy_words)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpy, set;</div><div class='del'>-</div><div class='del'>-	cpy = count / BITS_PER_BYTE;</div><div class='del'>-	set = (nfdt-&gt;max_fds - count) / BITS_PER_BYTE;</div><div class='del'>-	memcpy(nfdt-&gt;open_fds, ofdt-&gt;open_fds, cpy);</div><div class='del'>-	memset((char *)nfdt-&gt;open_fds + cpy, 0, set);</div><div class='del'>-	memcpy(nfdt-&gt;close_on_exec, ofdt-&gt;close_on_exec, cpy);</div><div class='del'>-	memset((char *)nfdt-&gt;close_on_exec + cpy, 0, set);</div><div class='del'>-</div><div class='del'>-	cpy = BITBIT_SIZE(count);</div><div class='del'>-	set = BITBIT_SIZE(nfdt-&gt;max_fds) - cpy;</div><div class='del'>-	memcpy(nfdt-&gt;full_fds_bits, ofdt-&gt;full_fds_bits, cpy);</div><div class='del'>-	memset((char *)nfdt-&gt;full_fds_bits + cpy, 0, set);</div><div class='add'>+	unsigned int nwords = fdt_words(nfdt);</div><div class='add'>+</div><div class='add'>+	bitmap_copy_and_extend(nfdt-&gt;open_fds, ofdt-&gt;open_fds,</div><div class='add'>+			copy_words * BITS_PER_LONG, nwords * BITS_PER_LONG);</div><div class='add'>+	bitmap_copy_and_extend(nfdt-&gt;close_on_exec, ofdt-&gt;close_on_exec,</div><div class='add'>+			copy_words * BITS_PER_LONG, nwords * BITS_PER_LONG);</div><div class='add'>+	bitmap_copy_and_extend(nfdt-&gt;full_fds_bits, ofdt-&gt;full_fds_bits,</div><div class='add'>+			copy_words, nwords);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -84,7 +149,7 @@ static void copy_fdtable(struct fdtable *nfdt, struct fdtable *ofdt)</div><div class='ctx'> 	memcpy(nfdt-&gt;fd, ofdt-&gt;fd, cpy);</div><div class='ctx'> 	memset((char *)nfdt-&gt;fd + cpy, 0, set);</div><div class='ctx'> </div><div class='del'>-	copy_fd_bitmaps(nfdt, ofdt, ofdt-&gt;max_fds);</div><div class='add'>+	copy_fd_bitmaps(nfdt, ofdt, fdt_words(ofdt));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -93,18 +158,11 @@ static void copy_fdtable(struct fdtable *nfdt, struct fdtable *ofdt)</div><div class='ctx'>  * 'unsigned long' in some places, but simply because that is how the Linux</div><div class='ctx'>  * kernel bitmaps are defined to work: they are not "bits in an array of bytes",</div><div class='ctx'>  * they are very much "bits in an array of unsigned long".</div><div class='del'>- *</div><div class='del'>- * The ALIGN(nr, BITS_PER_LONG) here is for clarity: since we just multiplied</div><div class='del'>- * by that "1024/sizeof(ptr)" before, we already know there are sufficient</div><div class='del'>- * clear low bits. Clang seems to realize that, gcc ends up being confused.</div><div class='del'>- *</div><div class='del'>- * On a 128-bit machine, the ALIGN() would actually matter. In the meantime,</div><div class='del'>- * let's consider it documentation (and maybe a test-case for gcc to improve</div><div class='del'>- * its code generation ;)</div><div class='ctx'>  */</div><div class='del'>-static struct fdtable * alloc_fdtable(unsigned int nr)</div><div class='add'>+static struct fdtable *alloc_fdtable(unsigned int slots_wanted)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdtable *fdt;</div><div class='add'>+	unsigned int nr;</div><div class='ctx'> 	void *data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -112,22 +170,47 @@ static struct fdtable * alloc_fdtable(unsigned int nr)</div><div class='ctx'> 	 * Allocation steps are keyed to the size of the fdarray, since it</div><div class='ctx'> 	 * grows far faster than any of the other dynamic data. We try to fit</div><div class='ctx'> 	 * the fdarray into comfortable page-tuned chunks: starting at 1024B</div><div class='del'>-	 * and growing in powers of two from there on.</div><div class='add'>+	 * and growing in powers of two from there on.  Since we called only</div><div class='add'>+	 * with slots_wanted &gt; BITS_PER_LONG (embedded instance in files-&gt;fdtab</div><div class='add'>+	 * already gives BITS_PER_LONG slots), the above boils down to</div><div class='add'>+	 * 1.  use the smallest power of two large enough to give us that many</div><div class='add'>+	 * slots.</div><div class='add'>+	 * 2.  on 32bit skip 64 and 128 - the minimal capacity we want there is</div><div class='add'>+	 * 256 slots (i.e. 1Kb fd array).</div><div class='add'>+	 * 3.  on 64bit don't skip anything, 1Kb fd array means 128 slots there</div><div class='add'>+	 * and we are never going to be asked for 64 or less.</div><div class='ctx'> 	 */</div><div class='del'>-	nr /= (1024 / sizeof(struct file *));</div><div class='del'>-	nr = roundup_pow_of_two(nr + 1);</div><div class='del'>-	nr *= (1024 / sizeof(struct file *));</div><div class='del'>-	nr = ALIGN(nr, BITS_PER_LONG);</div><div class='add'>+	if (IS_ENABLED(CONFIG_32BIT) &amp;&amp; slots_wanted &lt; 256)</div><div class='add'>+		nr = 256;</div><div class='add'>+	else</div><div class='add'>+		nr = roundup_pow_of_two(slots_wanted);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that this can drive nr *below* what we had passed if sysctl_nr_open</div><div class='del'>-	 * had been set lower between the check in expand_files() and here.  Deal</div><div class='del'>-	 * with that in caller, it's cheaper that way.</div><div class='add'>+	 * had been set lower between the check in expand_files() and here.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * We make sure that nr remains a multiple of BITS_PER_LONG - otherwise</div><div class='ctx'> 	 * bitmaps handling below becomes unpleasant, to put it mildly...</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(nr &gt; sysctl_nr_open))</div><div class='del'>-		nr = ((sysctl_nr_open - 1) | (BITS_PER_LONG - 1)) + 1;</div><div class='add'>+	if (unlikely(nr &gt; sysctl_nr_open)) {</div><div class='add'>+		nr = round_down(sysctl_nr_open, BITS_PER_LONG);</div><div class='add'>+		if (nr &lt; slots_wanted)</div><div class='add'>+			return ERR_PTR(-EMFILE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the allocation size would exceed INT_MAX. kvmalloc_array()</div><div class='add'>+	 * and kvmalloc() will warn if the allocation size is greater than</div><div class='add'>+	 * INT_MAX, as filp_cachep objects are not __GFP_NOWARN.</div><div class='add'>+	 *</div><div class='add'>+	 * This can happen when sysctl_nr_open is set to a very high value and</div><div class='add'>+	 * a process tries to use a file descriptor near that limit. For example,</div><div class='add'>+	 * if sysctl_nr_open is set to 1073741816 (0x3ffffff8) - which is what</div><div class='add'>+	 * systemd typically sets it to - then trying to use a file descriptor</div><div class='add'>+	 * close to that value will require allocating a file descriptor table</div><div class='add'>+	 * that exceeds 8GB in size.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(nr &gt; INT_MAX / sizeof(struct file *)))</div><div class='add'>+		return ERR_PTR(-EMFILE);</div><div class='ctx'> </div><div class='ctx'> 	fdt = kmalloc(sizeof(struct fdtable), GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!fdt)</div><div class='hunk'>@@ -156,14 +239,14 @@ out_arr:</div><div class='ctx'> out_fdt:</div><div class='ctx'> 	kfree(fdt);</div><div class='ctx'> out:</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(-ENOMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Expand the file descriptor table.</div><div class='ctx'>  * This function will allocate a new fdtable and both fd array and fdset, of</div><div class='ctx'>  * the given size.</div><div class='del'>- * Return &lt;0 error code on error; 1 on successful completion.</div><div class='add'>+ * Return &lt;0 error code on error; 0 on successful completion.</div><div class='ctx'>  * The files-&gt;file_lock should be held on entry, and will be held on exit.</div><div class='ctx'>  */</div><div class='ctx'> static int expand_fdtable(struct files_struct *files, unsigned int nr)</div><div class='hunk'>@@ -173,7 +256,7 @@ static int expand_fdtable(struct files_struct *files, unsigned int nr)</div><div class='ctx'> 	struct fdtable *new_fdt, *cur_fdt;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;files-&gt;file_lock);</div><div class='del'>-	new_fdt = alloc_fdtable(nr);</div><div class='add'>+	new_fdt = alloc_fdtable(nr + 1);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure all fd_install() have seen resize_in_progress</div><div class='ctx'> 	 * or have finished their rcu_read_lock_sched() section.</div><div class='hunk'>@@ -182,16 +265,8 @@ static int expand_fdtable(struct files_struct *files, unsigned int nr)</div><div class='ctx'> 		synchronize_rcu();</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;files-&gt;file_lock);</div><div class='del'>-	if (!new_fdt)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	/*</div><div class='del'>-	 * extremely unlikely race - sysctl_nr_open decreased between the check in</div><div class='del'>-	 * caller and alloc_fdtable().  Cheaper to catch it here...</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(new_fdt-&gt;max_fds &lt;= nr)) {</div><div class='del'>-		__free_fdtable(new_fdt);</div><div class='del'>-		return -EMFILE;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(new_fdt))</div><div class='add'>+		return PTR_ERR(new_fdt);</div><div class='ctx'> 	cur_fdt = files_fdtable(files);</div><div class='ctx'> 	BUG_ON(nr &lt; cur_fdt-&gt;max_fds);</div><div class='ctx'> 	copy_fdtable(new_fdt, cur_fdt);</div><div class='hunk'>@@ -200,15 +275,14 @@ static int expand_fdtable(struct files_struct *files, unsigned int nr)</div><div class='ctx'> 		call_rcu(&amp;cur_fdt-&gt;rcu, free_fdtable_rcu);</div><div class='ctx'> 	/* coupled with smp_rmb() in fd_install() */</div><div class='ctx'> 	smp_wmb();</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Expand files.</div><div class='ctx'>  * This function will expand the file structures, if the requested size exceeds</div><div class='ctx'>  * the current capacity and there is room for expansion.</div><div class='del'>- * Return &lt;0 error code on error; 0 when nothing done; 1 when files were</div><div class='del'>- * expanded and execution may have blocked.</div><div class='add'>+ * Return &lt;0 error code on error; 0 on success.</div><div class='ctx'>  * The files-&gt;file_lock should be held on entry, and will be held on exit.</div><div class='ctx'>  */</div><div class='ctx'> static int expand_files(struct files_struct *files, unsigned int nr)</div><div class='hunk'>@@ -216,50 +290,50 @@ static int expand_files(struct files_struct *files, unsigned int nr)</div><div class='ctx'> 	__acquires(files-&gt;file_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct fdtable *fdt;</div><div class='del'>-	int expanded = 0;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> repeat:</div><div class='ctx'> 	fdt = files_fdtable(files);</div><div class='ctx'> </div><div class='ctx'> 	/* Do we need to expand? */</div><div class='ctx'> 	if (nr &lt; fdt-&gt;max_fds)</div><div class='del'>-		return expanded;</div><div class='del'>-</div><div class='del'>-	/* Can we expand? */</div><div class='del'>-	if (nr &gt;= sysctl_nr_open)</div><div class='del'>-		return -EMFILE;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(files-&gt;resize_in_progress)) {</div><div class='ctx'> 		spin_unlock(&amp;files-&gt;file_lock);</div><div class='del'>-		expanded = 1;</div><div class='ctx'> 		wait_event(files-&gt;resize_wait, !files-&gt;resize_in_progress);</div><div class='ctx'> 		spin_lock(&amp;files-&gt;file_lock);</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Can we expand? */</div><div class='add'>+	if (unlikely(nr &gt;= sysctl_nr_open))</div><div class='add'>+		return -EMFILE;</div><div class='add'>+</div><div class='ctx'> 	/* All good, so we try */</div><div class='ctx'> 	files-&gt;resize_in_progress = true;</div><div class='del'>-	expanded = expand_fdtable(files, nr);</div><div class='add'>+	error = expand_fdtable(files, nr);</div><div class='ctx'> 	files-&gt;resize_in_progress = false;</div><div class='ctx'> </div><div class='ctx'> 	wake_up_all(&amp;files-&gt;resize_wait);</div><div class='del'>-	return expanded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __set_close_on_exec(unsigned int fd, struct fdtable *fdt)</div><div class='del'>-{</div><div class='del'>-	__set_bit(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __clear_close_on_exec(unsigned int fd, struct fdtable *fdt)</div><div class='add'>+static inline void __set_close_on_exec(unsigned int fd, struct fdtable *fdt,</div><div class='add'>+				       bool set)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(fd, fdt-&gt;close_on_exec))</div><div class='del'>-		__clear_bit(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	if (set) {</div><div class='add'>+		__set_bit(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	} else {</div><div class='add'>+		if (test_bit(fd, fdt-&gt;close_on_exec))</div><div class='add'>+			__clear_bit(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __set_open_fd(unsigned int fd, struct fdtable *fdt)</div><div class='add'>+static inline void __set_open_fd(unsigned int fd, struct fdtable *fdt, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	__set_bit(fd, fdt-&gt;open_fds);</div><div class='add'>+	__set_close_on_exec(fd, fdt, set);</div><div class='ctx'> 	fd /= BITS_PER_LONG;</div><div class='ctx'> 	if (!~fdt-&gt;open_fds[fd])</div><div class='ctx'> 		__set_bit(fd, fdt-&gt;full_fds_bits);</div><div class='hunk'>@@ -268,62 +342,54 @@ static inline void __set_open_fd(unsigned int fd, struct fdtable *fdt)</div><div class='ctx'> static inline void __clear_open_fd(unsigned int fd, struct fdtable *fdt)</div><div class='ctx'> {</div><div class='ctx'> 	__clear_bit(fd, fdt-&gt;open_fds);</div><div class='del'>-	__clear_bit(fd / BITS_PER_LONG, fdt-&gt;full_fds_bits);</div><div class='add'>+	fd /= BITS_PER_LONG;</div><div class='add'>+	if (test_bit(fd, fdt-&gt;full_fds_bits))</div><div class='add'>+		__clear_bit(fd, fdt-&gt;full_fds_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int count_open_files(struct fdtable *fdt)</div><div class='add'>+static inline bool fd_is_open(unsigned int fd, const struct fdtable *fdt)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size = fdt-&gt;max_fds;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	/* Find the last open fd */</div><div class='del'>-	for (i = size / BITS_PER_LONG; i &gt; 0; ) {</div><div class='del'>-		if (fdt-&gt;open_fds[--i])</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	i = (i + 1) * BITS_PER_LONG;</div><div class='del'>-	return i;</div><div class='add'>+	return test_bit(fd, fdt-&gt;open_fds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Note that a sane fdtable size always has to be a multiple of</div><div class='ctx'>  * BITS_PER_LONG, since we have bitmaps that are sized by this.</div><div class='ctx'>  *</div><div class='del'>- * 'max_fds' will normally already be properly aligned, but it</div><div class='del'>- * turns out that in the close_range() -&gt; __close_range() -&gt;</div><div class='del'>- * unshare_fd() -&gt; dup_fd() -&gt; sane_fdtable_size() we can end</div><div class='del'>- * up having a 'max_fds' value that isn't already aligned.</div><div class='del'>- *</div><div class='del'>- * Rather than make close_range() have to worry about this,</div><div class='del'>- * just make that BITS_PER_LONG alignment be part of a sane</div><div class='del'>- * fdtable size. Becuase that's really what it is.</div><div class='add'>+ * punch_hole is optional - when close_range() is asked to unshare</div><div class='add'>+ * and close, we don't need to copy descriptors in that range, so</div><div class='add'>+ * a smaller cloned descriptor table might suffice if the last</div><div class='add'>+ * currently opened descriptor falls into that range.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds)</div><div class='add'>+static unsigned int sane_fdtable_size(struct fdtable *fdt, struct fd_range *punch_hole)</div><div class='ctx'> {</div><div class='del'>-	unsigned int count;</div><div class='del'>-</div><div class='del'>-	count = count_open_files(fdt);</div><div class='del'>-	if (max_fds &lt; NR_OPEN_DEFAULT)</div><div class='del'>-		max_fds = NR_OPEN_DEFAULT;</div><div class='del'>-	return ALIGN(min(count, max_fds), BITS_PER_LONG);</div><div class='add'>+	unsigned int last = find_last_bit(fdt-&gt;open_fds, fdt-&gt;max_fds);</div><div class='add'>+</div><div class='add'>+	if (last == fdt-&gt;max_fds)</div><div class='add'>+		return NR_OPEN_DEFAULT;</div><div class='add'>+	if (punch_hole &amp;&amp; punch_hole-&gt;to &gt;= last &amp;&amp; punch_hole-&gt;from &lt;= last) {</div><div class='add'>+		last = find_last_bit(fdt-&gt;open_fds, punch_hole-&gt;from);</div><div class='add'>+		if (last == punch_hole-&gt;from)</div><div class='add'>+			return NR_OPEN_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+	return ALIGN(last + 1, BITS_PER_LONG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Allocate a new files structure and copy contents from the</div><div class='del'>- * passed in files structure.</div><div class='del'>- * errorp will be valid only when the returned files_struct is NULL.</div><div class='add'>+ * Allocate a new descriptor table and copy contents from the passed in</div><div class='add'>+ * instance.  Returns a pointer to cloned table on success, ERR_PTR()</div><div class='add'>+ * on failure.  For 'punch_hole' see sane_fdtable_size().</div><div class='ctx'>  */</div><div class='del'>-struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int *errorp)</div><div class='add'>+struct files_struct *dup_fd(struct files_struct *oldf, struct fd_range *punch_hole)</div><div class='ctx'> {</div><div class='ctx'> 	struct files_struct *newf;</div><div class='ctx'> 	struct file **old_fds, **new_fds;</div><div class='ctx'> 	unsigned int open_files, i;</div><div class='ctx'> 	struct fdtable *old_fdt, *new_fdt;</div><div class='ctx'> </div><div class='del'>-	*errorp = -ENOMEM;</div><div class='ctx'> 	newf = kmem_cache_alloc(files_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (!newf)</div><div class='del'>-		goto out;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;newf-&gt;count, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -340,7 +406,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;oldf-&gt;file_lock);</div><div class='ctx'> 	old_fdt = files_fdtable(oldf);</div><div class='del'>-	open_files = sane_fdtable_size(old_fdt, max_fds);</div><div class='add'>+	open_files = sane_fdtable_size(old_fdt, punch_hole);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check whether we need to allocate a larger fd array and fd set.</div><div class='hunk'>@@ -351,17 +417,10 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int</div><div class='ctx'> 		if (new_fdt != &amp;newf-&gt;fdtab)</div><div class='ctx'> 			__free_fdtable(new_fdt);</div><div class='ctx'> </div><div class='del'>-		new_fdt = alloc_fdtable(open_files - 1);</div><div class='del'>-		if (!new_fdt) {</div><div class='del'>-			*errorp = -ENOMEM;</div><div class='del'>-			goto out_release;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* beyond sysctl_nr_open; nothing to do */</div><div class='del'>-		if (unlikely(new_fdt-&gt;max_fds &lt; open_files)) {</div><div class='del'>-			__free_fdtable(new_fdt);</div><div class='del'>-			*errorp = -EMFILE;</div><div class='del'>-			goto out_release;</div><div class='add'>+		new_fdt = alloc_fdtable(open_files);</div><div class='add'>+		if (IS_ERR(new_fdt)) {</div><div class='add'>+			kmem_cache_free(files_cachep, newf);</div><div class='add'>+			return ERR_CAST(new_fdt);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -371,25 +430,33 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock(&amp;oldf-&gt;file_lock);</div><div class='ctx'> 		old_fdt = files_fdtable(oldf);</div><div class='del'>-		open_files = sane_fdtable_size(old_fdt, max_fds);</div><div class='add'>+		open_files = sane_fdtable_size(old_fdt, punch_hole);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	copy_fd_bitmaps(new_fdt, old_fdt, open_files);</div><div class='add'>+	copy_fd_bitmaps(new_fdt, old_fdt, open_files / BITS_PER_LONG);</div><div class='ctx'> </div><div class='ctx'> 	old_fds = old_fdt-&gt;fd;</div><div class='ctx'> 	new_fds = new_fdt-&gt;fd;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We may be racing against fd allocation from other threads using this</div><div class='add'>+	 * files_struct, despite holding -&gt;file_lock.</div><div class='add'>+	 *</div><div class='add'>+	 * alloc_fd() might have already claimed a slot, while fd_install()</div><div class='add'>+	 * did not populate it yet. Note the latter operates locklessly, so</div><div class='add'>+	 * the file can show up as we are walking the array below.</div><div class='add'>+	 *</div><div class='add'>+	 * At the same time we know no files will disappear as all other</div><div class='add'>+	 * operations take the lock.</div><div class='add'>+	 *</div><div class='add'>+	 * Instead of trying to placate userspace racing with itself, we</div><div class='add'>+	 * ref the file if we see it and mark the fd slot as unused otherwise.</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = open_files; i != 0; i--) {</div><div class='del'>-		struct file *f = *old_fds++;</div><div class='add'>+		struct file *f = rcu_dereference_raw(*old_fds++);</div><div class='ctx'> 		if (f) {</div><div class='ctx'> 			get_file(f);</div><div class='ctx'> 		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * The fd may be claimed in the fd bitmap but not yet</div><div class='del'>-			 * instantiated in the files array if a sibling thread</div><div class='del'>-			 * is partway through open().  So make sure that this</div><div class='del'>-			 * fd is available to the new process.</div><div class='del'>-			 */</div><div class='ctx'> 			__clear_open_fd(open_files - i, new_fdt);</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_assign_pointer(*new_fds++, f);</div><div class='hunk'>@@ -402,11 +469,6 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int</div><div class='ctx'> 	rcu_assign_pointer(newf-&gt;fdt, new_fdt);</div><div class='ctx'> </div><div class='ctx'> 	return newf;</div><div class='del'>-</div><div class='del'>-out_release:</div><div class='del'>-	kmem_cache_free(files_cachep, newf);</div><div class='del'>-out:</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fdtable *close_files(struct files_struct * files)</div><div class='hunk'>@@ -427,7 +489,7 @@ static struct fdtable *close_files(struct files_struct * files)</div><div class='ctx'> 		set = fdt-&gt;open_fds[j++];</div><div class='ctx'> 		while (set) {</div><div class='ctx'> 			if (set &amp; 1) {</div><div class='del'>-				struct file * file = xchg(&amp;fdt-&gt;fd[i], NULL);</div><div class='add'>+				struct file *file = fdt-&gt;fd[i];</div><div class='ctx'> 				if (file) {</div><div class='ctx'> 					filp_close(file, files);</div><div class='ctx'> 					cond_resched();</div><div class='hunk'>@@ -481,12 +543,21 @@ struct files_struct init_files = {</div><div class='ctx'> </div><div class='ctx'> static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start)</div><div class='ctx'> {</div><div class='del'>-	unsigned int maxfd = fdt-&gt;max_fds;</div><div class='add'>+	unsigned int maxfd = fdt-&gt;max_fds; /* always multiple of BITS_PER_LONG */</div><div class='ctx'> 	unsigned int maxbit = maxfd / BITS_PER_LONG;</div><div class='ctx'> 	unsigned int bitbit = start / BITS_PER_LONG;</div><div class='add'>+	unsigned int bit;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to avoid looking at the second level bitmap</div><div class='add'>+	 */</div><div class='add'>+	bit = find_next_zero_bit(&amp;fdt-&gt;open_fds[bitbit], BITS_PER_LONG,</div><div class='add'>+				 start &amp; (BITS_PER_LONG - 1));</div><div class='add'>+	if (bit &lt; BITS_PER_LONG)</div><div class='add'>+		return bit + bitbit * BITS_PER_LONG;</div><div class='ctx'> </div><div class='ctx'> 	bitbit = find_next_zero_bit(fdt-&gt;full_fds_bits, maxbit, bitbit) * BITS_PER_LONG;</div><div class='del'>-	if (bitbit &gt; maxfd)</div><div class='add'>+	if (bitbit &gt;= maxfd)</div><div class='ctx'> 		return maxfd;</div><div class='ctx'> 	if (bitbit &gt; start)</div><div class='ctx'> 		start = bitbit;</div><div class='hunk'>@@ -510,7 +581,7 @@ repeat:</div><div class='ctx'> 	if (fd &lt; files-&gt;next_fd)</div><div class='ctx'> 		fd = files-&gt;next_fd;</div><div class='ctx'> </div><div class='del'>-	if (fd &lt; fdt-&gt;max_fds)</div><div class='add'>+	if (likely(fd &lt; fdt-&gt;max_fds))</div><div class='ctx'> 		fd = find_next_fd(fdt, fd);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -518,36 +589,23 @@ repeat:</div><div class='ctx'> 	 * will limit the total number of files that can be opened.</div><div class='ctx'> 	 */</div><div class='ctx'> 	error = -EMFILE;</div><div class='del'>-	if (fd &gt;= end)</div><div class='add'>+	if (unlikely(fd &gt;= end))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	error = expand_files(files, fd);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	if (unlikely(fd &gt;= fdt-&gt;max_fds)) {</div><div class='add'>+		error = expand_files(files, fd);</div><div class='add'>+		if (error &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If we needed to expand the fs array we</div><div class='del'>-	 * might have blocked - try again.</div><div class='del'>-	 */</div><div class='del'>-	if (error)</div><div class='ctx'> 		goto repeat;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (start &lt;= files-&gt;next_fd)</div><div class='ctx'> 		files-&gt;next_fd = fd + 1;</div><div class='ctx'> </div><div class='del'>-	__set_open_fd(fd, fdt);</div><div class='del'>-	if (flags &amp; O_CLOEXEC)</div><div class='del'>-		__set_close_on_exec(fd, fdt);</div><div class='del'>-	else</div><div class='del'>-		__clear_close_on_exec(fd, fdt);</div><div class='add'>+	__set_open_fd(fd, fdt, flags &amp; O_CLOEXEC);</div><div class='ctx'> 	error = fd;</div><div class='del'>-#if 1</div><div class='del'>-	/* Sanity check */</div><div class='del'>-	if (rcu_access_pointer(fdt-&gt;fd[fd]) != NULL) {</div><div class='del'>-		printk(KERN_WARNING "alloc_fd: slot %d not NULL!\n", fd);</div><div class='del'>-		rcu_assign_pointer(fdt-&gt;fd[fd], NULL);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	VFS_BUG_ON(rcu_access_pointer(fdt-&gt;fd[fd]) != NULL);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;files-&gt;file_lock);</div><div class='hunk'>@@ -584,21 +642,41 @@ void put_unused_fd(unsigned int fd)</div><div class='ctx'> EXPORT_SYMBOL(put_unused_fd);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Install a file pointer in the fd array.</div><div class='add'>+ * Install a file pointer in the fd array while it is being resized.</div><div class='add'>+ *</div><div class='add'>+ * We need to make sure our update to the array does not get lost as the resizing</div><div class='add'>+ * thread can be copying the content as we modify it.</div><div class='ctx'>  *</div><div class='del'>- * The VFS is full of places where we drop the files lock between</div><div class='del'>- * setting the open_fds bitmap and installing the file in the file</div><div class='del'>- * array.  At any such point, we are vulnerable to a dup2() race</div><div class='del'>- * installing a file in the array before us.  We need to detect this and</div><div class='del'>- * fput() the struct file we are about to overwrite in this case.</div><div class='add'>+ * We have two ways to do it:</div><div class='add'>+ * - go off CPU waiting for resize_in_progress to clear</div><div class='add'>+ * - take the spin lock</div><div class='ctx'>  *</div><div class='del'>- * It should never happen - if we allow dup2() do it, _really_ bad things</div><div class='del'>- * will follow.</div><div class='add'>+ * The latter is trivial to implement and saves us from having to might_sleep()</div><div class='add'>+ * for debugging purposes.</div><div class='add'>+ *</div><div class='add'>+ * This is moved out of line from fd_install() to convince gcc to optimize that</div><div class='add'>+ * routine better.</div><div class='add'>+ */</div><div class='add'>+static void noinline fd_install_slowpath(unsigned int fd, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct files_struct *files = current-&gt;files;</div><div class='add'>+	struct fdtable *fdt;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;files-&gt;file_lock);</div><div class='add'>+	fdt = files_fdtable(files);</div><div class='add'>+	VFS_BUG_ON(rcu_access_pointer(fdt-&gt;fd[fd]) != NULL);</div><div class='add'>+	rcu_assign_pointer(fdt-&gt;fd[fd], file);</div><div class='add'>+	spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fd_install - install a file pointer in the fd array</div><div class='add'>+ * @fd: file descriptor to install the file in</div><div class='add'>+ * @file: the file to install</div><div class='ctx'>  *</div><div class='ctx'>  * This consumes the "file" refcount, so callers should treat it</div><div class='ctx'>  * as if they had called fput(file).</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> void fd_install(unsigned int fd, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct files_struct *files = current-&gt;files;</div><div class='hunk'>@@ -608,20 +686,15 @@ void fd_install(unsigned int fd, struct file *file)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock_sched();</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(files-&gt;resize_in_progress)) {</div><div class='ctx'> 		rcu_read_unlock_sched();</div><div class='del'>-		spin_lock(&amp;files-&gt;file_lock);</div><div class='del'>-		fdt = files_fdtable(files);</div><div class='del'>-		BUG_ON(fdt-&gt;fd[fd] != NULL);</div><div class='del'>-		rcu_assign_pointer(fdt-&gt;fd[fd], file);</div><div class='del'>-		spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+		fd_install_slowpath(fd, file);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* coupled with smp_wmb() in expand_fdtable() */</div><div class='ctx'> 	smp_rmb();</div><div class='ctx'> 	fdt = rcu_dereference_sched(files-&gt;fdt);</div><div class='del'>-	BUG_ON(fdt-&gt;fd[fd] != NULL);</div><div class='add'>+	VFS_BUG_ON(rcu_access_pointer(fdt-&gt;fd[fd]) != NULL);</div><div class='ctx'> 	rcu_assign_pointer(fdt-&gt;fd[fd], file);</div><div class='ctx'> 	rcu_read_unlock_sched();</div><div class='ctx'> }</div><div class='hunk'>@@ -650,7 +723,7 @@ struct file *file_close_fd_locked(struct files_struct *files, unsigned fd)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	fd = array_index_nospec(fd, fdt-&gt;max_fds);</div><div class='del'>-	file = fdt-&gt;fd[fd];</div><div class='add'>+	file = rcu_dereference_raw(fdt-&gt;fd[fd]);</div><div class='ctx'> 	if (file) {</div><div class='ctx'> 		rcu_assign_pointer(fdt-&gt;fd[fd], NULL);</div><div class='ctx'> 		__put_unused_fd(files, fd);</div><div class='hunk'>@@ -671,7 +744,7 @@ int close_fd(unsigned fd)</div><div class='ctx'> </div><div class='ctx'> 	return filp_close(file, files);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(close_fd); /* for ksys_close() */</div><div class='add'>+EXPORT_SYMBOL(close_fd);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * last_fd - return last valid index into fd table</div><div class='hunk'>@@ -727,7 +800,7 @@ static inline void __range_close(struct files_struct *files, unsigned int fd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __close_range() - Close all file descriptors in a given range.</div><div class='add'>+ * sys_close_range() - Close all file descriptors in a given range.</div><div class='ctx'>  *</div><div class='ctx'>  * @fd:     starting file descriptor to close</div><div class='ctx'>  * @max_fd: last file descriptor to close</div><div class='hunk'>@@ -735,8 +808,10 @@ static inline void __range_close(struct files_struct *files, unsigned int fd,</div><div class='ctx'>  *</div><div class='ctx'>  * This closes a range of file descriptors. All file descriptors</div><div class='ctx'>  * from @fd up to and including @max_fd are closed.</div><div class='add'>+ * Currently, errors to close a given file descriptor are ignored.</div><div class='ctx'>  */</div><div class='del'>-int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)</div><div class='add'>+SYSCALL_DEFINE3(close_range, unsigned int, fd, unsigned int, max_fd,</div><div class='add'>+		unsigned int, flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *me = current;</div><div class='ctx'> 	struct files_struct *cur_fds = me-&gt;files, *fds = NULL;</div><div class='hunk'>@@ -747,37 +822,25 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)</div><div class='ctx'> 	if (fd &gt; max_fd)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; CLOSE_RANGE_UNSHARE) {</div><div class='del'>-		int ret;</div><div class='del'>-		unsigned int max_unshare_fds = NR_OPEN_MAX;</div><div class='add'>+	if ((flags &amp; CLOSE_RANGE_UNSHARE) &amp;&amp; atomic_read(&amp;cur_fds-&gt;count) &gt; 1) {</div><div class='add'>+		struct fd_range range = {fd, max_fd}, *punch_hole = &amp;range;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the caller requested all fds to be made cloexec we always</div><div class='ctx'> 		 * copy all of the file descriptors since they still want to</div><div class='ctx'> 		 * use them.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(flags &amp; CLOSE_RANGE_CLOEXEC)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If the requested range is greater than the current</div><div class='del'>-			 * maximum, we're closing everything so only copy all</div><div class='del'>-			 * file descriptors beneath the lowest file descriptor.</div><div class='del'>-			 */</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			if (max_fd &gt;= last_fd(files_fdtable(cur_fds)))</div><div class='del'>-				max_unshare_fds = fd;</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = unshare_fd(CLONE_FILES, max_unshare_fds, &amp;fds);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+		if (flags &amp; CLOSE_RANGE_CLOEXEC)</div><div class='add'>+			punch_hole = NULL;</div><div class='ctx'> </div><div class='add'>+		fds = dup_fd(cur_fds, punch_hole);</div><div class='add'>+		if (IS_ERR(fds))</div><div class='add'>+			return PTR_ERR(fds);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We used to share our file descriptor table, and have now</div><div class='ctx'> 		 * created a private one, make sure we're using it below.</div><div class='ctx'> 		 */</div><div class='del'>-		if (fds)</div><div class='del'>-			swap(cur_fds, fds);</div><div class='add'>+		swap(cur_fds, fds);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; CLOSE_RANGE_CLOEXEC)</div><div class='hunk'>@@ -865,7 +928,7 @@ static struct file *__get_file_rcu(struct file __rcu **f)</div><div class='ctx'> 	if (!file)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!atomic_long_inc_not_zero(&amp;file-&gt;f_count)))</div><div class='add'>+	if (unlikely(!file_ref_get(&amp;file-&gt;f_ref)))</div><div class='ctx'> 		return ERR_PTR(-EAGAIN);</div><div class='ctx'> </div><div class='ctx'> 	file_reloaded = rcu_dereference_raw(*f);</div><div class='hunk'>@@ -879,8 +942,8 @@ static struct file *__get_file_rcu(struct file __rcu **f)</div><div class='ctx'> 	OPTIMIZER_HIDE_VAR(file_reloaded_cmp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * atomic_long_inc_not_zero() above provided a full memory</div><div class='del'>-	 * barrier when we acquired a reference.</div><div class='add'>+	 * file_ref_get() above provided a full memory barrier when we</div><div class='add'>+	 * acquired a reference.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This is paired with the write barrier from assigning to the</div><div class='ctx'> 	 * __rcu protected file pointer so that if that pointer still</div><div class='hunk'>@@ -915,13 +978,8 @@ struct file *get_file_rcu(struct file __rcu **f)</div><div class='ctx'> 		struct file __rcu *file;</div><div class='ctx'> </div><div class='ctx'> 		file = __get_file_rcu(f);</div><div class='del'>-		if (unlikely(!file))</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		if (unlikely(IS_ERR(file)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		return file;</div><div class='add'>+		if (!IS_ERR(file))</div><div class='add'>+			return file;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(get_file_rcu);</div><div class='hunk'>@@ -983,11 +1041,11 @@ static inline struct file *__fget_files_rcu(struct files_struct *files,</div><div class='ctx'> 		 * We need to confirm it by incrementing the refcount</div><div class='ctx'> 		 * and then check the lookup again.</div><div class='ctx'> 		 *</div><div class='del'>-		 * atomic_long_inc_not_zero() gives us a full memory</div><div class='del'>-		 * barrier. We only really need an 'acquire' one to</div><div class='del'>-		 * protect the loads below, but we don't have that.</div><div class='add'>+		 * file_ref_get() gives us a full memory barrier. We</div><div class='add'>+		 * only really need an 'acquire' one to protect the</div><div class='add'>+		 * loads below, but we don't have that.</div><div class='ctx'> 		 */</div><div class='del'>-		if (unlikely(!atomic_long_inc_not_zero(&amp;file-&gt;f_count)))</div><div class='add'>+		if (unlikely(!file_ref_get(&amp;file-&gt;f_ref)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1068,29 +1126,7 @@ struct file *fget_task(struct task_struct *task, unsigned int fd)</div><div class='ctx'> 	return file;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct file *lookup_fdget_rcu(unsigned int fd)</div><div class='del'>-{</div><div class='del'>-	return __fget_files_rcu(current-&gt;files, fd, 0);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(lookup_fdget_rcu);</div><div class='del'>-</div><div class='del'>-struct file *task_lookup_fdget_rcu(struct task_struct *task, unsigned int fd)</div><div class='del'>-{</div><div class='del'>-	/* Must be called with rcu_read_lock held */</div><div class='del'>-	struct files_struct *files;</div><div class='del'>-	struct file *file = NULL;</div><div class='del'>-</div><div class='del'>-	task_lock(task);</div><div class='del'>-	files = task-&gt;files;</div><div class='del'>-	if (files)</div><div class='del'>-		file = __fget_files_rcu(files, fd, 0);</div><div class='del'>-	task_unlock(task);</div><div class='del'>-</div><div class='del'>-	return file;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct file *task_lookup_next_fdget_rcu(struct task_struct *task, unsigned int *ret_fd)</div><div class='add'>+struct file *fget_task_next(struct task_struct *task, unsigned int *ret_fd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Must be called with rcu_read_lock held */</div><div class='ctx'> 	struct files_struct *files;</div><div class='hunk'>@@ -1100,17 +1136,19 @@ struct file *task_lookup_next_fdget_rcu(struct task_struct *task, unsigned int *</div><div class='ctx'> 	task_lock(task);</div><div class='ctx'> 	files = task-&gt;files;</div><div class='ctx'> 	if (files) {</div><div class='add'>+		rcu_read_lock();</div><div class='ctx'> 		for (; fd &lt; files_fdtable(files)-&gt;max_fds; fd++) {</div><div class='ctx'> 			file = __fget_files_rcu(files, fd, 0);</div><div class='ctx'> 			if (file)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> 	task_unlock(task);</div><div class='ctx'> 	*ret_fd = fd;</div><div class='ctx'> 	return file;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(task_lookup_next_fdget_rcu);</div><div class='add'>+EXPORT_SYMBOL(fget_task_next);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Lightweight file lookup - no refcnt increment if fd table isn't shared.</div><div class='hunk'>@@ -1127,8 +1165,15 @@ EXPORT_SYMBOL(task_lookup_next_fdget_rcu);</div><div class='ctx'>  *</div><div class='ctx'>  * The fput_needed flag returned by fget_light should be passed to the</div><div class='ctx'>  * corresponding fput_light.</div><div class='add'>+ *</div><div class='add'>+ * (As an exception to rule 2, you can call filp_close between fget_light and</div><div class='add'>+ * fput_light provided that you capture a real refcount with get_file before</div><div class='add'>+ * the call to filp_close, and ensure that this real refcount is fput *after*</div><div class='add'>+ * the fput_light call.)</div><div class='add'>+ *</div><div class='add'>+ * See also the documentation in rust/kernel/file.rs.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long __fget_light(unsigned int fd, fmode_t mask)</div><div class='add'>+static inline struct fd __fget_light(unsigned int fd, fmode_t mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct files_struct *files = current-&gt;files;</div><div class='ctx'> 	struct file *file;</div><div class='hunk'>@@ -1145,22 +1190,22 @@ static unsigned long __fget_light(unsigned int fd, fmode_t mask)</div><div class='ctx'> 	if (likely(atomic_read_acquire(&amp;files-&gt;count) == 1)) {</div><div class='ctx'> 		file = files_lookup_fd_raw(files, fd);</div><div class='ctx'> 		if (!file || unlikely(file-&gt;f_mode &amp; mask))</div><div class='del'>-			return 0;</div><div class='del'>-		return (unsigned long)file;</div><div class='add'>+			return EMPTY_FD;</div><div class='add'>+		return BORROWED_FD(file);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		file = __fget_files(files, fd, mask);</div><div class='ctx'> 		if (!file)</div><div class='del'>-			return 0;</div><div class='del'>-		return FDPUT_FPUT | (unsigned long)file;</div><div class='add'>+			return EMPTY_FD;</div><div class='add'>+		return CLONED_FD(file);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-unsigned long __fdget(unsigned int fd)</div><div class='add'>+struct fd fdget(unsigned int fd)</div><div class='ctx'> {</div><div class='ctx'> 	return __fget_light(fd, FMODE_PATH);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__fdget);</div><div class='add'>+EXPORT_SYMBOL(fdget);</div><div class='ctx'> </div><div class='del'>-unsigned long __fdget_raw(unsigned int fd)</div><div class='add'>+struct fd fdget_raw(unsigned int fd)</div><div class='ctx'> {</div><div class='ctx'> 	return __fget_light(fd, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1177,20 +1222,39 @@ unsigned long __fdget_raw(unsigned int fd)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool file_needs_f_pos_lock(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return (file-&gt;f_mode &amp; FMODE_ATOMIC_POS) &amp;&amp;</div><div class='del'>-		(file_count(file) &gt; 1 || file-&gt;f_op-&gt;iterate_shared);</div><div class='add'>+	if (!(file-&gt;f_mode &amp; FMODE_ATOMIC_POS))</div><div class='add'>+		return false;</div><div class='add'>+	if (__file_ref_read_raw(&amp;file-&gt;f_ref) != FILE_REF_ONEREF)</div><div class='add'>+		return true;</div><div class='add'>+	if (file-&gt;f_op-&gt;iterate_shared)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool file_seek_cur_needs_f_lock(struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (!(file-&gt;f_mode &amp; FMODE_ATOMIC_POS) &amp;&amp; !file-&gt;f_op-&gt;iterate_shared)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note that we are not guaranteed to be called after fdget_pos() on</div><div class='add'>+	 * this file obj, in which case the caller is expected to provide the</div><div class='add'>+	 * appropriate locking.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long __fdget_pos(unsigned int fd)</div><div class='add'>+struct fd fdget_pos(unsigned int fd)</div><div class='ctx'> {</div><div class='del'>-	unsigned long v = __fdget(fd);</div><div class='del'>-	struct file *file = (struct file *)(v &amp; ~3);</div><div class='add'>+	struct fd f = fdget(fd);</div><div class='add'>+	struct file *file = fd_file(f);</div><div class='ctx'> </div><div class='del'>-	if (file &amp;&amp; file_needs_f_pos_lock(file)) {</div><div class='del'>-		v |= FDPUT_POS_UNLOCK;</div><div class='add'>+	if (likely(file) &amp;&amp; file_needs_f_pos_lock(file)) {</div><div class='add'>+		f.word |= FDPUT_POS_UNLOCK;</div><div class='ctx'> 		mutex_lock(&amp;file-&gt;f_pos_lock);</div><div class='ctx'> 	}</div><div class='del'>-	return v;</div><div class='add'>+	return f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __f_unlock_pos(struct file *f)</div><div class='hunk'>@@ -1207,24 +1271,16 @@ void __f_unlock_pos(struct file *f)</div><div class='ctx'> void set_close_on_exec(unsigned int fd, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct files_struct *files = current-&gt;files;</div><div class='del'>-	struct fdtable *fdt;</div><div class='ctx'> 	spin_lock(&amp;files-&gt;file_lock);</div><div class='del'>-	fdt = files_fdtable(files);</div><div class='del'>-	if (flag)</div><div class='del'>-		__set_close_on_exec(fd, fdt);</div><div class='del'>-	else</div><div class='del'>-		__clear_close_on_exec(fd, fdt);</div><div class='add'>+	__set_close_on_exec(fd, files_fdtable(files), flag);</div><div class='ctx'> 	spin_unlock(&amp;files-&gt;file_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool get_close_on_exec(unsigned int fd)</div><div class='ctx'> {</div><div class='del'>-	struct files_struct *files = current-&gt;files;</div><div class='del'>-	struct fdtable *fdt;</div><div class='ctx'> 	bool res;</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	fdt = files_fdtable(files);</div><div class='del'>-	res = close_on_exec(fd, fdt);</div><div class='add'>+	res = close_on_exec(fd, current-&gt;files);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1237,30 +1293,39 @@ __releases(&amp;files-&gt;file_lock)</div><div class='ctx'> 	struct fdtable *fdt;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We need to detect attempts to do dup2() over allocated but still</div><div class='del'>-	 * not finished descriptor.  NB: OpenBSD avoids that at the price of</div><div class='del'>-	 * extra work in their equivalent of fget() - they insert struct</div><div class='del'>-	 * file immediately after grabbing descriptor, mark it larval if</div><div class='del'>-	 * more work (e.g. actual opening) is needed and make sure that</div><div class='del'>-	 * fget() treats larval files as absent.  Potentially interesting,</div><div class='del'>-	 * but while extra work in fget() is trivial, locking implications</div><div class='del'>-	 * and amount of surgery on open()-related paths in VFS are not.</div><div class='del'>-	 * FreeBSD fails with -EBADF in the same situation, NetBSD "solution"</div><div class='del'>-	 * deadlocks in rather amusing ways, AFAICS.  All of that is out of</div><div class='del'>-	 * scope of POSIX or SUS, since neither considers shared descriptor</div><div class='del'>-	 * tables and this condition does not arise without those.</div><div class='add'>+	 * dup2() is expected to close the file installed in the target fd slot</div><div class='add'>+	 * (if any). However, userspace hand-picking a fd may be racing against</div><div class='add'>+	 * its own threads which happened to allocate it in open() et al but did</div><div class='add'>+	 * not populate it yet.</div><div class='add'>+	 *</div><div class='add'>+	 * Broadly speaking we may be racing against the following:</div><div class='add'>+	 * fd = get_unused_fd_flags();     // fd slot reserved, -&gt;fd[fd] == NULL</div><div class='add'>+	 * file = hard_work_goes_here();</div><div class='add'>+	 * fd_install(fd, file);           // only now -&gt;fd[fd] == file</div><div class='add'>+	 *</div><div class='add'>+	 * It is an invariant that a successfully allocated fd has a NULL entry</div><div class='add'>+	 * in the array until the matching fd_install().</div><div class='add'>+	 *</div><div class='add'>+	 * If we fit the window, we have the fd to populate, yet no target file</div><div class='add'>+	 * to close. Trying to ignore it and install our new file would violate</div><div class='add'>+	 * the invariant and make fd_install() overwrite our file.</div><div class='add'>+	 *</div><div class='add'>+	 * Things can be done(tm) to handle this. However, the issue does not</div><div class='add'>+	 * concern legitimate programs and we only need to make sure the kernel</div><div class='add'>+	 * does not trip over it.</div><div class='add'>+	 *</div><div class='add'>+	 * The simplest way out is to return an error if we find ourselves here.</div><div class='add'>+	 *</div><div class='add'>+	 * POSIX is silent on the issue, we return -EBUSY.</div><div class='ctx'> 	 */</div><div class='ctx'> 	fdt = files_fdtable(files);</div><div class='del'>-	tofree = fdt-&gt;fd[fd];</div><div class='add'>+	fd = array_index_nospec(fd, fdt-&gt;max_fds);</div><div class='add'>+	tofree = rcu_dereference_raw(fdt-&gt;fd[fd]);</div><div class='ctx'> 	if (!tofree &amp;&amp; fd_is_open(fd, fdt))</div><div class='ctx'> 		goto Ebusy;</div><div class='ctx'> 	get_file(file);</div><div class='ctx'> 	rcu_assign_pointer(fdt-&gt;fd[fd], file);</div><div class='del'>-	__set_open_fd(fd, fdt);</div><div class='del'>-	if (flags &amp; O_CLOEXEC)</div><div class='del'>-		__set_close_on_exec(fd, fdt);</div><div class='del'>-	else</div><div class='del'>-		__clear_close_on_exec(fd, fdt);</div><div class='add'>+	__set_open_fd(fd, fdt, flags &amp; O_CLOEXEC);</div><div class='ctx'> 	spin_unlock(&amp;files-&gt;file_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (tofree)</div><div class='hunk'>@@ -1288,7 +1353,10 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)</div><div class='ctx'> 	err = expand_files(files, fd);</div><div class='ctx'> 	if (unlikely(err &lt; 0))</div><div class='ctx'> 		goto out_unlock;</div><div class='del'>-	return do_dup2(files, file, fd, flags);</div><div class='add'>+	err = do_dup2(files, file, fd, flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;files-&gt;file_lock);</div><div class='hunk'>@@ -1312,28 +1380,25 @@ out_unlock:</div><div class='ctx'>  */</div><div class='ctx'> int receive_fd(struct file *file, int __user *ufd, unsigned int o_flags)</div><div class='ctx'> {</div><div class='del'>-	int new_fd;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = security_file_receive(file);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	new_fd = get_unused_fd_flags(o_flags);</div><div class='del'>-	if (new_fd &lt; 0)</div><div class='del'>-		return new_fd;</div><div class='add'>+	FD_PREPARE(fdf, o_flags, file);</div><div class='add'>+	if (fdf.err)</div><div class='add'>+		return fdf.err;</div><div class='add'>+	get_file(file);</div><div class='ctx'> </div><div class='ctx'> 	if (ufd) {</div><div class='del'>-		error = put_user(new_fd, ufd);</div><div class='del'>-		if (error) {</div><div class='del'>-			put_unused_fd(new_fd);</div><div class='add'>+		error = put_user(fd_prepare_fd(fdf), ufd);</div><div class='add'>+		if (error)</div><div class='ctx'> 			return error;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fd_install(new_fd, get_file(file));</div><div class='del'>-	__receive_sock(file);</div><div class='del'>-	return new_fd;</div><div class='add'>+	__receive_sock(fd_prepare_file(fdf));</div><div class='add'>+	return fd_publish(fdf);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(receive_fd);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/file_attr.c b/fs/file_attr.c<br/>new file mode 100644<br/>index 000000000000..4c4916632f11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/file_attr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/file_attr.c</a></div><div class='hunk'>@@ -0,0 +1,490 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/fscrypt.h&gt;</div><div class='add'>+#include &lt;linux/fileattr.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fileattr_fill_xflags - initialize fileattr with xflags</div><div class='add'>+ * @fa:		fileattr pointer</div><div class='add'>+ * @xflags:	FS_XFLAG_* flags</div><div class='add'>+ *</div><div class='add'>+ * Set -&gt;fsx_xflags, -&gt;fsx_valid and -&gt;flags (translated xflags).  All</div><div class='add'>+ * other fields are zeroed.</div><div class='add'>+ */</div><div class='add'>+void fileattr_fill_xflags(struct file_kattr *fa, u32 xflags)</div><div class='add'>+{</div><div class='add'>+	memset(fa, 0, sizeof(*fa));</div><div class='add'>+	fa-&gt;fsx_valid = true;</div><div class='add'>+	fa-&gt;fsx_xflags = xflags;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_IMMUTABLE)</div><div class='add'>+		fa-&gt;flags |= FS_IMMUTABLE_FL;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_APPEND)</div><div class='add'>+		fa-&gt;flags |= FS_APPEND_FL;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_SYNC)</div><div class='add'>+		fa-&gt;flags |= FS_SYNC_FL;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_NOATIME)</div><div class='add'>+		fa-&gt;flags |= FS_NOATIME_FL;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_NODUMP)</div><div class='add'>+		fa-&gt;flags |= FS_NODUMP_FL;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_DAX)</div><div class='add'>+		fa-&gt;flags |= FS_DAX_FL;</div><div class='add'>+	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_PROJINHERIT)</div><div class='add'>+		fa-&gt;flags |= FS_PROJINHERIT_FL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fileattr_fill_xflags);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fileattr_fill_flags - initialize fileattr with flags</div><div class='add'>+ * @fa:		fileattr pointer</div><div class='add'>+ * @flags:	FS_*_FL flags</div><div class='add'>+ *</div><div class='add'>+ * Set -&gt;flags, -&gt;flags_valid and -&gt;fsx_xflags (translated flags).</div><div class='add'>+ * All other fields are zeroed.</div><div class='add'>+ */</div><div class='add'>+void fileattr_fill_flags(struct file_kattr *fa, u32 flags)</div><div class='add'>+{</div><div class='add'>+	memset(fa, 0, sizeof(*fa));</div><div class='add'>+	fa-&gt;flags_valid = true;</div><div class='add'>+	fa-&gt;flags = flags;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_SYNC_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_SYNC;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_IMMUTABLE_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_IMMUTABLE;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_APPEND_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_APPEND;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_NODUMP_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_NODUMP;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_NOATIME_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_NOATIME;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_DAX_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_DAX;</div><div class='add'>+	if (fa-&gt;flags &amp; FS_PROJINHERIT_FL)</div><div class='add'>+		fa-&gt;fsx_xflags |= FS_XFLAG_PROJINHERIT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fileattr_fill_flags);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vfs_fileattr_get - retrieve miscellaneous file attributes</div><div class='add'>+ * @dentry:	the object to retrieve from</div><div class='add'>+ * @fa:		fileattr pointer</div><div class='add'>+ *</div><div class='add'>+ * Call i_op-&gt;fileattr_get() callback, if exists.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error on failure.</div><div class='add'>+ */</div><div class='add'>+int vfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (!inode-&gt;i_op-&gt;fileattr_get)</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+</div><div class='add'>+	error = security_inode_file_getattr(dentry, fa);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	return inode-&gt;i_op-&gt;fileattr_get(dentry, fa);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vfs_fileattr_get);</div><div class='add'>+</div><div class='add'>+static void fileattr_to_file_attr(const struct file_kattr *fa,</div><div class='add'>+				  struct file_attr *fattr)</div><div class='add'>+{</div><div class='add'>+	__u32 mask = FS_XFLAGS_MASK;</div><div class='add'>+</div><div class='add'>+	memset(fattr, 0, sizeof(struct file_attr));</div><div class='add'>+	fattr-&gt;fa_xflags = fa-&gt;fsx_xflags &amp; mask;</div><div class='add'>+	fattr-&gt;fa_extsize = fa-&gt;fsx_extsize;</div><div class='add'>+	fattr-&gt;fa_nextents = fa-&gt;fsx_nextents;</div><div class='add'>+	fattr-&gt;fa_projid = fa-&gt;fsx_projid;</div><div class='add'>+	fattr-&gt;fa_cowextsize = fa-&gt;fsx_cowextsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * copy_fsxattr_to_user - copy fsxattr to userspace.</div><div class='add'>+ * @fa:		fileattr pointer</div><div class='add'>+ * @ufa:	fsxattr user pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or -EFAULT on failure.</div><div class='add'>+ */</div><div class='add'>+int copy_fsxattr_to_user(const struct file_kattr *fa, struct fsxattr __user *ufa)</div><div class='add'>+{</div><div class='add'>+	struct fsxattr xfa;</div><div class='add'>+	__u32 mask = FS_XFLAGS_MASK;</div><div class='add'>+</div><div class='add'>+	memset(&amp;xfa, 0, sizeof(xfa));</div><div class='add'>+	xfa.fsx_xflags = fa-&gt;fsx_xflags &amp; mask;</div><div class='add'>+	xfa.fsx_extsize = fa-&gt;fsx_extsize;</div><div class='add'>+	xfa.fsx_nextents = fa-&gt;fsx_nextents;</div><div class='add'>+	xfa.fsx_projid = fa-&gt;fsx_projid;</div><div class='add'>+	xfa.fsx_cowextsize = fa-&gt;fsx_cowextsize;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(ufa, &amp;xfa, sizeof(xfa)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(copy_fsxattr_to_user);</div><div class='add'>+</div><div class='add'>+static int file_attr_to_fileattr(const struct file_attr *fattr,</div><div class='add'>+				 struct file_kattr *fa)</div><div class='add'>+{</div><div class='add'>+	__u64 mask = FS_XFLAGS_MASK;</div><div class='add'>+</div><div class='add'>+	if (fattr-&gt;fa_xflags &amp; ~mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fileattr_fill_xflags(fa, fattr-&gt;fa_xflags);</div><div class='add'>+	fa-&gt;fsx_xflags &amp;= ~FS_XFLAG_RDONLY_MASK;</div><div class='add'>+	fa-&gt;fsx_extsize = fattr-&gt;fa_extsize;</div><div class='add'>+	fa-&gt;fsx_projid = fattr-&gt;fa_projid;</div><div class='add'>+	fa-&gt;fsx_cowextsize = fattr-&gt;fa_cowextsize;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int copy_fsxattr_from_user(struct file_kattr *fa,</div><div class='add'>+				  struct fsxattr __user *ufa)</div><div class='add'>+{</div><div class='add'>+	struct fsxattr xfa;</div><div class='add'>+	__u32 mask = FS_XFLAGS_MASK;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;xfa, ufa, sizeof(xfa)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (xfa.fsx_xflags &amp; ~mask)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	fileattr_fill_xflags(fa, xfa.fsx_xflags);</div><div class='add'>+	fa-&gt;fsx_xflags &amp;= ~FS_XFLAG_RDONLY_MASK;</div><div class='add'>+	fa-&gt;fsx_extsize = xfa.fsx_extsize;</div><div class='add'>+	fa-&gt;fsx_nextents = xfa.fsx_nextents;</div><div class='add'>+	fa-&gt;fsx_projid = xfa.fsx_projid;</div><div class='add'>+	fa-&gt;fsx_cowextsize = xfa.fsx_cowextsize;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic function to check FS_IOC_FSSETXATTR/FS_IOC_SETFLAGS values and reject</div><div class='add'>+ * any invalid configurations.</div><div class='add'>+ *</div><div class='add'>+ * Note: must be called with inode lock held.</div><div class='add'>+ */</div><div class='add'>+static int fileattr_set_prepare(struct inode *inode,</div><div class='add'>+			      const struct file_kattr *old_ma,</div><div class='add'>+			      struct file_kattr *fa)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The IMMUTABLE and APPEND_ONLY flags can only be changed by</div><div class='add'>+	 * the relevant capability.</div><div class='add'>+	 */</div><div class='add'>+	if ((fa-&gt;flags ^ old_ma-&gt;flags) &amp; (FS_APPEND_FL | FS_IMMUTABLE_FL) &amp;&amp;</div><div class='add'>+	    !capable(CAP_LINUX_IMMUTABLE))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	err = fscrypt_prepare_setflags(inode, old_ma-&gt;flags, fa-&gt;flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Project Quota ID state is only allowed to change from within the init</div><div class='add'>+	 * namespace. Enforce that restriction only if we are trying to change</div><div class='add'>+	 * the quota ID state. Everything else is allowed in user namespaces.</div><div class='add'>+	 */</div><div class='add'>+	if (current_user_ns() != &amp;init_user_ns) {</div><div class='add'>+		if (old_ma-&gt;fsx_projid != fa-&gt;fsx_projid)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if ((old_ma-&gt;fsx_xflags ^ fa-&gt;fsx_xflags) &amp;</div><div class='add'>+				FS_XFLAG_PROJINHERIT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Caller is allowed to change the project ID. If it is being</div><div class='add'>+		 * changed, make sure that the new value is valid.</div><div class='add'>+		 */</div><div class='add'>+		if (old_ma-&gt;fsx_projid != fa-&gt;fsx_projid &amp;&amp;</div><div class='add'>+		    !projid_valid(make_kprojid(&amp;init_user_ns, fa-&gt;fsx_projid)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check extent size hints. */</div><div class='add'>+	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_EXTSIZE) &amp;&amp; !S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_EXTSZINHERIT) &amp;&amp;</div><div class='add'>+			!S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_COWEXTSIZE) &amp;&amp;</div><div class='add'>+	    !S_ISREG(inode-&gt;i_mode) &amp;&amp; !S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It is only valid to set the DAX flag on regular files and</div><div class='add'>+	 * directories on filesystems.</div><div class='add'>+	 */</div><div class='add'>+	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_DAX) &amp;&amp;</div><div class='add'>+	    !(S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Extent size hints of zero turn off the flags. */</div><div class='add'>+	if (fa-&gt;fsx_extsize == 0)</div><div class='add'>+		fa-&gt;fsx_xflags &amp;= ~(FS_XFLAG_EXTSIZE | FS_XFLAG_EXTSZINHERIT);</div><div class='add'>+	if (fa-&gt;fsx_cowextsize == 0)</div><div class='add'>+		fa-&gt;fsx_xflags &amp;= ~FS_XFLAG_COWEXTSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vfs_fileattr_set - change miscellaneous file attributes</div><div class='add'>+ * @idmap:	idmap of the mount</div><div class='add'>+ * @dentry:	the object to change</div><div class='add'>+ * @fa:		fileattr pointer</div><div class='add'>+ *</div><div class='add'>+ * After verifying permissions, call i_op-&gt;fileattr_set() callback, if</div><div class='add'>+ * exists.</div><div class='add'>+ *</div><div class='add'>+ * Verifying attributes involves retrieving current attributes with</div><div class='add'>+ * i_op-&gt;fileattr_get(), this also allows initializing attributes that have</div><div class='add'>+ * not been set by the caller to current values.  Inode lock is held</div><div class='add'>+ * thoughout to prevent racing with another instance.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error on failure.</div><div class='add'>+ */</div><div class='add'>+int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		     struct file_kattr *fa)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	struct file_kattr old_ma = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!inode-&gt;i_op-&gt;fileattr_set)</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+</div><div class='add'>+	if (!inode_owner_or_capable(idmap, inode))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	err = vfs_fileattr_get(dentry, &amp;old_ma);</div><div class='add'>+	if (!err) {</div><div class='add'>+		/* initialize missing bits from old_ma */</div><div class='add'>+		if (fa-&gt;flags_valid) {</div><div class='add'>+			fa-&gt;fsx_xflags |= old_ma.fsx_xflags &amp; ~FS_XFLAG_COMMON;</div><div class='add'>+			fa-&gt;fsx_extsize = old_ma.fsx_extsize;</div><div class='add'>+			fa-&gt;fsx_nextents = old_ma.fsx_nextents;</div><div class='add'>+			fa-&gt;fsx_projid = old_ma.fsx_projid;</div><div class='add'>+			fa-&gt;fsx_cowextsize = old_ma.fsx_cowextsize;</div><div class='add'>+		} else {</div><div class='add'>+			fa-&gt;flags |= old_ma.flags &amp; ~FS_COMMON_FL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = fileattr_set_prepare(inode, &amp;old_ma, fa);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		err = security_inode_file_setattr(dentry, fa);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		err = inode-&gt;i_op-&gt;fileattr_set(idmap, dentry, fa);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vfs_fileattr_set);</div><div class='add'>+</div><div class='add'>+int ioctl_getflags(struct file *file, unsigned int __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct file_kattr fa = { .flags_valid = true }; /* hint only */</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = vfs_fileattr_get(file-&gt;f_path.dentry, &amp;fa);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = put_user(fa.flags, argp);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ioctl_setflags(struct file *file, unsigned int __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='add'>+	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='add'>+	struct file_kattr fa;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_user(flags, argp);</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = mnt_want_write_file(file);</div><div class='add'>+		if (!err) {</div><div class='add'>+			fileattr_fill_flags(&amp;fa, flags);</div><div class='add'>+			err = vfs_fileattr_set(idmap, dentry, &amp;fa);</div><div class='add'>+			mnt_drop_write_file(file);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ioctl_fsgetxattr(struct file *file, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct file_kattr fa = { .fsx_valid = true }; /* hint only */</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = vfs_fileattr_get(file-&gt;f_path.dentry, &amp;fa);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = copy_fsxattr_to_user(&amp;fa, argp);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ioctl_fssetxattr(struct file *file, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='add'>+	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='add'>+	struct file_kattr fa;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = copy_fsxattr_from_user(&amp;fa, argp);</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = mnt_want_write_file(file);</div><div class='add'>+		if (!err) {</div><div class='add'>+			err = vfs_fileattr_set(idmap, dentry, &amp;fa);</div><div class='add'>+			mnt_drop_write_file(file);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SYSCALL_DEFINE5(file_getattr, int, dfd, const char __user *, filename,</div><div class='add'>+		struct file_attr __user *, ufattr, size_t, usize,</div><div class='add'>+		unsigned int, at_flags)</div><div class='add'>+{</div><div class='add'>+	struct path filepath __free(path_put) = {};</div><div class='add'>+	struct filename *name __free(putname) = NULL;</div><div class='add'>+	unsigned int lookup_flags = 0;</div><div class='add'>+	struct file_attr fattr;</div><div class='add'>+	struct file_kattr fa;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct file_attr) &lt; FILE_ATTR_SIZE_VER0);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct file_attr) != FILE_ATTR_SIZE_LATEST);</div><div class='add'>+</div><div class='add'>+	if ((at_flags &amp; ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH)) != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(at_flags &amp; AT_SYMLINK_NOFOLLOW))</div><div class='add'>+		lookup_flags |= LOOKUP_FOLLOW;</div><div class='add'>+</div><div class='add'>+	if (usize &gt; PAGE_SIZE)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (usize &lt; FILE_ATTR_SIZE_VER0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	name = getname_maybe_null(filename, at_flags);</div><div class='add'>+	if (IS_ERR(name))</div><div class='add'>+		return PTR_ERR(name);</div><div class='add'>+</div><div class='add'>+	if (!name &amp;&amp; dfd &gt;= 0) {</div><div class='add'>+		CLASS(fd, f)(dfd);</div><div class='add'>+		if (fd_empty(f))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='add'>+		filepath = fd_file(f)-&gt;f_path;</div><div class='add'>+		path_get(&amp;filepath);</div><div class='add'>+	} else {</div><div class='add'>+		error = filename_lookup(dfd, name, lookup_flags, &amp;filepath,</div><div class='add'>+					NULL);</div><div class='add'>+		if (error)</div><div class='add'>+			return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = vfs_fileattr_get(filepath.dentry, &amp;fa);</div><div class='add'>+	if (error == -ENOIOCTLCMD || error == -ENOTTY)</div><div class='add'>+		error = -EOPNOTSUPP;</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	fileattr_to_file_attr(&amp;fa, &amp;fattr);</div><div class='add'>+	error = copy_struct_to_user(ufattr, usize, &amp;fattr,</div><div class='add'>+				    sizeof(struct file_attr), NULL);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SYSCALL_DEFINE5(file_setattr, int, dfd, const char __user *, filename,</div><div class='add'>+		struct file_attr __user *, ufattr, size_t, usize,</div><div class='add'>+		unsigned int, at_flags)</div><div class='add'>+{</div><div class='add'>+	struct path filepath __free(path_put) = {};</div><div class='add'>+	struct filename *name __free(putname) = NULL;</div><div class='add'>+	unsigned int lookup_flags = 0;</div><div class='add'>+	struct file_attr fattr;</div><div class='add'>+	struct file_kattr fa;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct file_attr) &lt; FILE_ATTR_SIZE_VER0);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct file_attr) != FILE_ATTR_SIZE_LATEST);</div><div class='add'>+</div><div class='add'>+	if ((at_flags &amp; ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH)) != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(at_flags &amp; AT_SYMLINK_NOFOLLOW))</div><div class='add'>+		lookup_flags |= LOOKUP_FOLLOW;</div><div class='add'>+</div><div class='add'>+	if (usize &gt; PAGE_SIZE)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (usize &lt; FILE_ATTR_SIZE_VER0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	error = copy_struct_from_user(&amp;fattr, sizeof(struct file_attr), ufattr,</div><div class='add'>+				      usize);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = file_attr_to_fileattr(&amp;fattr, &amp;fa);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	name = getname_maybe_null(filename, at_flags);</div><div class='add'>+	if (IS_ERR(name))</div><div class='add'>+		return PTR_ERR(name);</div><div class='add'>+</div><div class='add'>+	if (!name &amp;&amp; dfd &gt;= 0) {</div><div class='add'>+		CLASS(fd, f)(dfd);</div><div class='add'>+		if (fd_empty(f))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='add'>+		filepath = fd_file(f)-&gt;f_path;</div><div class='add'>+		path_get(&amp;filepath);</div><div class='add'>+	} else {</div><div class='add'>+		error = filename_lookup(dfd, name, lookup_flags, &amp;filepath,</div><div class='add'>+					NULL);</div><div class='add'>+		if (error)</div><div class='add'>+			return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = mnt_want_write(filepath.mnt);</div><div class='add'>+	if (!error) {</div><div class='add'>+		error = vfs_fileattr_set(mnt_idmap(filepath.mnt),</div><div class='add'>+					 filepath.dentry, &amp;fa);</div><div class='add'>+		if (error == -ENOIOCTLCMD || error == -ENOTTY)</div><div class='add'>+			error = -EOPNOTSUPP;</div><div class='add'>+		mnt_drop_write(filepath.mnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/file_table.c b/fs/file_table.c<br/>index 6925522faa0a..cd4a3db4659a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/file_table.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/file_table.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/file_table.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/file_table.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -26,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/task_work.h&gt;</div><div class='del'>-#include &lt;linux/ima.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/kmemleak.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,26 +39,33 @@ static struct files_stat_struct files_stat = {</div><div class='ctx'> </div><div class='ctx'> /* SLAB cache for file structures */</div><div class='ctx'> static struct kmem_cache *filp_cachep __ro_after_init;</div><div class='add'>+static struct kmem_cache *bfilp_cachep __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> static struct percpu_counter nr_files __cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> /* Container for backing file with optional user path */</div><div class='ctx'> struct backing_file {</div><div class='ctx'> 	struct file file;</div><div class='del'>-	struct path user_path;</div><div class='add'>+	union {</div><div class='add'>+		struct path user_path;</div><div class='add'>+		freeptr_t bf_freeptr;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct backing_file *backing_file(struct file *f)</div><div class='del'>-{</div><div class='del'>-	return container_of(f, struct backing_file, file);</div><div class='del'>-}</div><div class='add'>+#define backing_file(f) container_of(f, struct backing_file, file)</div><div class='ctx'> </div><div class='del'>-struct path *backing_file_user_path(struct file *f)</div><div class='add'>+const struct path *backing_file_user_path(const struct file *f)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;backing_file(f)-&gt;user_path;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(backing_file_user_path);</div><div class='ctx'> </div><div class='add'>+void backing_file_set_user_path(struct file *f, const struct path *path)</div><div class='add'>+{</div><div class='add'>+	backing_file(f)-&gt;user_path = *path;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(backing_file_set_user_path);</div><div class='add'>+</div><div class='ctx'> static inline void file_free(struct file *f)</div><div class='ctx'> {</div><div class='ctx'> 	security_file_free(f);</div><div class='hunk'>@@ -69,7 +74,7 @@ static inline void file_free(struct file *f)</div><div class='ctx'> 	put_cred(f-&gt;f_cred);</div><div class='ctx'> 	if (unlikely(f-&gt;f_mode &amp; FMODE_BACKING)) {</div><div class='ctx'> 		path_put(backing_file_user_path(f));</div><div class='del'>-		kfree(backing_file(f));</div><div class='add'>+		kmem_cache_free(bfilp_cachep, backing_file(f));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kmem_cache_free(filp_cachep, f);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -97,14 +102,14 @@ EXPORT_SYMBOL_GPL(get_max_files);</div><div class='ctx'> /*</div><div class='ctx'>  * Handle nr_files sysctl</div><div class='ctx'>  */</div><div class='del'>-static int proc_nr_files(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+static int proc_nr_files(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 			 size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	files_stat.nr_files = get_nr_files();</div><div class='add'>+	files_stat.nr_files = percpu_counter_sum_positive(&amp;nr_files);</div><div class='ctx'> 	return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table fs_stat_sysctls[] = {</div><div class='add'>+static const struct ctl_table fs_stat_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "file-nr",</div><div class='ctx'> 		.data		= &amp;files_stat,</div><div class='hunk'>@@ -126,7 +131,7 @@ static struct ctl_table fs_stat_sysctls[] = {</div><div class='ctx'> 		.data		= &amp;sysctl_nr_open,</div><div class='ctx'> 		.maxlen		= sizeof(unsigned int),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='ctx'> 		.extra1		= &amp;sysctl_nr_open_min,</div><div class='ctx'> 		.extra2		= &amp;sysctl_nr_open_max,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -137,6 +142,7 @@ static int __init init_fs_stat_sysctls(void)</div><div class='ctx'> 	register_sysctl_init("fs", fs_stat_sysctls);</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_BINFMT_MISC)) {</div><div class='ctx'> 		struct ctl_table_header *hdr;</div><div class='add'>+</div><div class='ctx'> 		hdr = register_sysctl_mount_point("fs/binfmt_misc");</div><div class='ctx'> 		kmemleak_not_leak(hdr);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -156,19 +162,46 @@ static int init_file(struct file *f, int flags, const struct cred *cred)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rwlock_init(&amp;f-&gt;f_owner.lock);</div><div class='ctx'> 	spin_lock_init(&amp;f-&gt;f_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Note that f_pos_lock is only used for files raising</div><div class='add'>+	 * FMODE_ATOMIC_POS and directories. Other files such as pipes</div><div class='add'>+	 * don't need it and since f_pos_lock is in a union may reuse</div><div class='add'>+	 * the space for other purposes. They are expected to initialize</div><div class='add'>+	 * the respective member when opening the file.</div><div class='add'>+	 */</div><div class='ctx'> 	mutex_init(&amp;f-&gt;f_pos_lock);</div><div class='del'>-	f-&gt;f_flags = flags;</div><div class='del'>-	f-&gt;f_mode = OPEN_FMODE(flags);</div><div class='del'>-	/* f-&gt;f_version: 0 */</div><div class='add'>+	memset(&amp;f-&gt;__f_path, 0, sizeof(f-&gt;f_path));</div><div class='add'>+	memset(&amp;f-&gt;f_ra, 0, sizeof(f-&gt;f_ra));</div><div class='add'>+</div><div class='add'>+	f-&gt;f_flags	= flags;</div><div class='add'>+	f-&gt;f_mode	= OPEN_FMODE(flags);</div><div class='add'>+</div><div class='add'>+	f-&gt;f_op		= NULL;</div><div class='add'>+	f-&gt;f_mapping	= NULL;</div><div class='add'>+	f-&gt;private_data = NULL;</div><div class='add'>+	f-&gt;f_inode	= NULL;</div><div class='add'>+	f-&gt;f_owner	= NULL;</div><div class='add'>+#ifdef CONFIG_EPOLL</div><div class='add'>+	f-&gt;f_ep		= NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	f-&gt;f_iocb_flags = 0;</div><div class='add'>+	f-&gt;f_pos	= 0;</div><div class='add'>+	f-&gt;f_wb_err	= 0;</div><div class='add'>+	f-&gt;f_sb_err	= 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We're SLAB_TYPESAFE_BY_RCU so initialize f_count last. While</div><div class='add'>+	 * We're SLAB_TYPESAFE_BY_RCU so initialize f_ref last. While</div><div class='ctx'> 	 * fget-rcu pattern users need to be able to handle spurious</div><div class='ctx'> 	 * refcount bumps we should reinitialize the reused file first.</div><div class='ctx'> 	 */</div><div class='del'>-	atomic_long_set(&amp;f-&gt;f_count, 1);</div><div class='add'>+	file_ref_init(&amp;f-&gt;f_ref, 1);</div><div class='add'>+	/*</div><div class='add'>+	 * Disable permission and pre-content events for all files by default.</div><div class='add'>+	 * They may be enabled later by fsnotify_open_perm_and_set_mode().</div><div class='add'>+	 */</div><div class='add'>+	file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +224,8 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Privileged users can go above max_files</div><div class='ctx'> 	 */</div><div class='del'>-	if (get_nr_files() &gt;= files_stat.max_files &amp;&amp; !capable(CAP_SYS_ADMIN)) {</div><div class='add'>+	if (unlikely(get_nr_files() &gt;= files_stat.max_files) &amp;&amp;</div><div class='add'>+	    !capable(CAP_SYS_ADMIN)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * percpu_counters are inaccurate.  Do an expensive check before</div><div class='ctx'> 		 * we go and fail.</div><div class='hunk'>@@ -200,7 +234,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)</div><div class='ctx'> 			goto over;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);</div><div class='add'>+	f = kmem_cache_alloc(filp_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!f))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +268,7 @@ struct file *alloc_empty_file_noaccount(int flags, const struct cred *cred)</div><div class='ctx'> 	struct file *f;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);</div><div class='add'>+	f = kmem_cache_alloc(filp_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!f))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -261,13 +295,13 @@ struct file *alloc_empty_backing_file(int flags, const struct cred *cred)</div><div class='ctx'> 	struct backing_file *ff;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	ff = kzalloc(sizeof(struct backing_file), GFP_KERNEL);</div><div class='add'>+	ff = kmem_cache_alloc(bfilp_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!ff))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	error = init_file(&amp;ff-&gt;file, flags, cred);</div><div class='ctx'> 	if (unlikely(error)) {</div><div class='del'>-		kfree(ff);</div><div class='add'>+		kmem_cache_free(bfilp_cachep, ff);</div><div class='ctx'> 		return ERR_PTR(error);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -285,7 +319,7 @@ struct file *alloc_empty_backing_file(int flags, const struct cred *cred)</div><div class='ctx'> static void file_init_path(struct file *file, const struct path *path,</div><div class='ctx'> 			   const struct file_operations *fop)</div><div class='ctx'> {</div><div class='del'>-	file-&gt;f_path = *path;</div><div class='add'>+	file-&gt;__f_path = *path;</div><div class='ctx'> 	file-&gt;f_inode = path-&gt;dentry-&gt;d_inode;</div><div class='ctx'> 	file-&gt;f_mapping = path-&gt;dentry-&gt;d_inode-&gt;i_mapping;</div><div class='ctx'> 	file-&gt;f_wb_err = filemap_sample_wb_err(file-&gt;f_mapping);</div><div class='hunk'>@@ -326,9 +360,7 @@ static struct file *alloc_file(const struct path *path, int flags,</div><div class='ctx'> static inline int alloc_path_pseudo(const char *name, struct inode *inode,</div><div class='ctx'> 				    struct vfsmount *mnt, struct path *path)</div><div class='ctx'> {</div><div class='del'>-	struct qstr this = QSTR_INIT(name, strlen(name));</div><div class='del'>-</div><div class='del'>-	path-&gt;dentry = d_alloc_pseudo(mnt-&gt;mnt_sb, &amp;this);</div><div class='add'>+	path-&gt;dentry = d_alloc_pseudo(mnt-&gt;mnt_sb, &amp;QSTR(name));</div><div class='ctx'> 	if (!path-&gt;dentry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	path-&gt;mnt = mntget(mnt);</div><div class='hunk'>@@ -352,7 +384,13 @@ struct file *alloc_file_pseudo(struct inode *inode, struct vfsmount *mnt,</div><div class='ctx'> 	if (IS_ERR(file)) {</div><div class='ctx'> 		ihold(inode);</div><div class='ctx'> 		path_put(&amp;path);</div><div class='add'>+		return file;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * Disable all fsnotify events for pseudo files by default.</div><div class='add'>+	 * They may be enabled by caller with file_set_fsnotify_mode().</div><div class='add'>+	 */</div><div class='add'>+	file_set_fsnotify_mode(file, FMODE_NONOTIFY);</div><div class='ctx'> 	return file;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(alloc_file_pseudo);</div><div class='hunk'>@@ -377,6 +415,11 @@ struct file *alloc_file_pseudo_noaccount(struct inode *inode,</div><div class='ctx'> 		return file;</div><div class='ctx'> 	}</div><div class='ctx'> 	file_init_path(file, &amp;path, fops);</div><div class='add'>+	/*</div><div class='add'>+	 * Disable all fsnotify events for pseudo files by default.</div><div class='add'>+	 * They may be enabled by caller with file_set_fsnotify_mode().</div><div class='add'>+	 */</div><div class='add'>+	file_set_fsnotify_mode(file, FMODE_NONOTIFY);</div><div class='ctx'> 	return file;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(alloc_file_pseudo_noaccount);</div><div class='hunk'>@@ -384,7 +427,9 @@ EXPORT_SYMBOL_GPL(alloc_file_pseudo_noaccount);</div><div class='ctx'> struct file *alloc_file_clone(struct file *base, int flags,</div><div class='ctx'> 				const struct file_operations *fops)</div><div class='ctx'> {</div><div class='del'>-	struct file *f = alloc_file(&amp;base-&gt;f_path, flags, fops);</div><div class='add'>+	struct file *f;</div><div class='add'>+</div><div class='add'>+	f = alloc_file(&amp;base-&gt;f_path, flags, fops);</div><div class='ctx'> 	if (!IS_ERR(f)) {</div><div class='ctx'> 		path_get(&amp;f-&gt;f_path);</div><div class='ctx'> 		f-&gt;f_mapping = base-&gt;f_mapping;</div><div class='hunk'>@@ -414,7 +459,7 @@ static void __fput(struct file *file)</div><div class='ctx'> 	eventpoll_release(file);</div><div class='ctx'> 	locks_remove_file(file);</div><div class='ctx'> </div><div class='del'>-	ima_file_free(file);</div><div class='add'>+	security_file_release(file);</div><div class='ctx'> 	if (unlikely(file-&gt;f_flags &amp; FASYNC)) {</div><div class='ctx'> 		if (file-&gt;f_op-&gt;fasync)</div><div class='ctx'> 			file-&gt;f_op-&gt;fasync(-1, file, 0);</div><div class='hunk'>@@ -426,7 +471,7 @@ static void __fput(struct file *file)</div><div class='ctx'> 		cdev_put(inode-&gt;i_cdev);</div><div class='ctx'> 	}</div><div class='ctx'> 	fops_put(file-&gt;f_op);</div><div class='del'>-	put_pid(file-&gt;f_owner.pid);</div><div class='add'>+	file_f_owner_release(file);</div><div class='ctx'> 	put_file_access(file);</div><div class='ctx'> 	dput(dentry);</div><div class='ctx'> 	if (unlikely(mode &amp; FMODE_NEED_UNMOUNT))</div><div class='hunk'>@@ -451,6 +496,8 @@ static void ____fput(struct callback_head *work)</div><div class='ctx'> 	__fput(container_of(work, struct file, f_task_work));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * If kernel thread really needs to have the final fput() it has done</div><div class='ctx'>  * to complete, call this.  The only user right now is the boot - we</div><div class='hunk'>@@ -464,36 +511,41 @@ static void ____fput(struct callback_head *work)</div><div class='ctx'> void flush_delayed_fput(void)</div><div class='ctx'> {</div><div class='ctx'> 	delayed_fput(NULL);</div><div class='add'>+	flush_delayed_work(&amp;delayed_fput_work);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(flush_delayed_fput);</div><div class='ctx'> </div><div class='del'>-static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);</div><div class='del'>-</div><div class='del'>-void fput(struct file *file)</div><div class='add'>+static void __fput_deferred(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_long_dec_and_test(&amp;file-&gt;f_count)) {</div><div class='del'>-		struct task_struct *task = current;</div><div class='add'>+	struct task_struct *task = current;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(!(file-&gt;f_mode &amp; (FMODE_BACKING | FMODE_OPENED)))) {</div><div class='del'>-			file_free(file);</div><div class='add'>+	if (unlikely(!(file-&gt;f_mode &amp; (FMODE_BACKING | FMODE_OPENED)))) {</div><div class='add'>+		file_free(file);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(!in_interrupt() &amp;&amp; !(task-&gt;flags &amp; PF_KTHREAD))) {</div><div class='add'>+		init_task_work(&amp;file-&gt;f_task_work, ____fput);</div><div class='add'>+		if (!task_work_add(task, &amp;file-&gt;f_task_work, TWA_RESUME))</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='del'>-		if (likely(!in_interrupt() &amp;&amp; !(task-&gt;flags &amp; PF_KTHREAD))) {</div><div class='del'>-			init_task_work(&amp;file-&gt;f_task_work, ____fput);</div><div class='del'>-			if (!task_work_add(task, &amp;file-&gt;f_task_work, TWA_RESUME))</div><div class='del'>-				return;</div><div class='del'>-			/*</div><div class='del'>-			 * After this task has run exit_task_work(),</div><div class='del'>-			 * task_work_add() will fail.  Fall through to delayed</div><div class='del'>-			 * fput to avoid leaking *file.</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (llist_add(&amp;file-&gt;f_llist, &amp;delayed_fput_list))</div><div class='del'>-			schedule_delayed_work(&amp;delayed_fput_work, 1);</div><div class='add'>+		/*</div><div class='add'>+		 * After this task has run exit_task_work(),</div><div class='add'>+		 * task_work_add() will fail.  Fall through to delayed</div><div class='add'>+		 * fput to avoid leaking *file.</div><div class='add'>+		 */</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (llist_add(&amp;file-&gt;f_llist, &amp;delayed_fput_list))</div><div class='add'>+		schedule_delayed_work(&amp;delayed_fput_work, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fput(struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(file_ref_put(&amp;file-&gt;f_ref)))</div><div class='add'>+		__fput_deferred(file);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fput);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * synchronous analog of fput(); for kernel threads that might be needed</div><div class='ctx'>  * in some umount() (and thus can't use flush_delayed_fput() without</div><div class='hunk'>@@ -504,18 +556,50 @@ void fput(struct file *file)</div><div class='ctx'>  */</div><div class='ctx'> void __fput_sync(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_long_dec_and_test(&amp;file-&gt;f_count))</div><div class='add'>+	if (file_ref_put(&amp;file-&gt;f_ref))</div><div class='ctx'> 		__fput(file);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(fput);</div><div class='ctx'> EXPORT_SYMBOL(__fput_sync);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Equivalent to __fput_sync(), but optimized for being called with the last</div><div class='add'>+ * reference.</div><div class='add'>+ *</div><div class='add'>+ * See file_ref_put_close() for details.</div><div class='add'>+ */</div><div class='add'>+void fput_close_sync(struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (likely(file_ref_put_close(&amp;file-&gt;f_ref)))</div><div class='add'>+		__fput(file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Equivalent to fput(), but optimized for being called with the last</div><div class='add'>+ * reference.</div><div class='add'>+ *</div><div class='add'>+ * See file_ref_put_close() for details.</div><div class='add'>+ */</div><div class='add'>+void fput_close(struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (file_ref_put_close(&amp;file-&gt;f_ref))</div><div class='add'>+		__fput_deferred(file);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init files_init(void)</div><div class='ctx'> {</div><div class='del'>-	filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0,</div><div class='del'>-				SLAB_TYPESAFE_BY_RCU | SLAB_HWCACHE_ALIGN |</div><div class='del'>-				SLAB_PANIC | SLAB_ACCOUNT, NULL);</div><div class='add'>+	struct kmem_cache_args args = {</div><div class='add'>+		.use_freeptr_offset = true,</div><div class='add'>+		.freeptr_offset = offsetof(struct file, f_freeptr),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	filp_cachep = kmem_cache_create("filp", sizeof(struct file), &amp;args,</div><div class='add'>+				SLAB_HWCACHE_ALIGN | SLAB_PANIC |</div><div class='add'>+				SLAB_ACCOUNT | SLAB_TYPESAFE_BY_RCU);</div><div class='add'>+</div><div class='add'>+	args.freeptr_offset = offsetof(struct backing_file, bf_freeptr);</div><div class='add'>+	bfilp_cachep = kmem_cache_create("bfilp", sizeof(struct backing_file),</div><div class='add'>+				&amp;args, SLAB_HWCACHE_ALIGN | SLAB_PANIC |</div><div class='add'>+				SLAB_ACCOUNT | SLAB_TYPESAFE_BY_RCU);</div><div class='ctx'> 	percpu_counter_init(&amp;nr_files, 0, GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/filesystems.c b/fs/filesystems.c<br/>index 58b9067b2391..95e5256821a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/filesystems.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/filesystems.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/filesystems.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/filesystems.c</a></div><div class='hunk'>@@ -156,15 +156,19 @@ static int fs_index(const char __user * __name)</div><div class='ctx'> static int fs_name(unsigned int index, char __user * buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_system_type * tmp;</div><div class='del'>-	int len, res;</div><div class='add'>+	int len, res = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;file_systems_lock);</div><div class='del'>-	for (tmp = file_systems; tmp; tmp = tmp-&gt;next, index--)</div><div class='del'>-		if (index &lt;= 0 &amp;&amp; try_module_get(tmp-&gt;owner))</div><div class='add'>+	for (tmp = file_systems; tmp; tmp = tmp-&gt;next, index--) {</div><div class='add'>+		if (index == 0) {</div><div class='add'>+			if (try_module_get(tmp-&gt;owner))</div><div class='add'>+				res = 0;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	read_unlock(&amp;file_systems_lock);</div><div class='del'>-	if (!tmp)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='ctx'> </div><div class='ctx'> 	/* OK, we got the reference, so we can safely block */</div><div class='ctx'> 	len = strlen(tmp-&gt;name) + 1;</div><div class='head'>diff --git a/fs/freevxfs/vxfs_dir.h b/fs/freevxfs/vxfs_dir.h<br/>index fbcd603365ad..8c67627f2a3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/freevxfs/vxfs_dir.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/freevxfs/vxfs_dir.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/freevxfs/vxfs_dir.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/freevxfs/vxfs_dir.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> struct vxfs_dirblk {</div><div class='ctx'> 	__fs16		d_free;		/* free space in dirblock */</div><div class='ctx'> 	__fs16		d_nhash;	/* no of hash chains */</div><div class='del'>-	__fs16		d_hash[1];	/* hash chain */</div><div class='add'>+	__fs16		d_hash[];	/* hash chain */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c<br/>index 20600e9ea202..21fc94b98209 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/freevxfs/vxfs_inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/freevxfs/vxfs_inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/freevxfs/vxfs_inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/freevxfs/vxfs_inode.c</a></div><div class='hunk'>@@ -258,7 +258,7 @@ vxfs_iget(struct super_block *sbp, ino_t ino)</div><div class='ctx'> 	ip = iget_locked(sbp, ino);</div><div class='ctx'> 	if (!ip)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(ip-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(ip) &amp; I_NEW))</div><div class='ctx'> 		return ip;</div><div class='ctx'> </div><div class='ctx'> 	vip = VXFS_INO(ip);</div><div class='head'>diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c<br/>index e6e2a2185e7c..fabe60778658 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/freevxfs/vxfs_super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/freevxfs/vxfs_super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/freevxfs/vxfs_super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/freevxfs/vxfs_super.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vxfs.h"</div><div class='ctx'> #include "vxfs_extern.h"</div><div class='hunk'>@@ -91,10 +91,10 @@ vxfs_statfs(struct dentry *dentry, struct kstatfs *bufp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vxfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int vxfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_RDONLY;</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -120,24 +120,24 @@ static const struct super_operations vxfs_super_ops = {</div><div class='ctx'> 	.evict_inode		= vxfs_evict_inode,</div><div class='ctx'> 	.put_super		= vxfs_put_super,</div><div class='ctx'> 	.statfs			= vxfs_statfs,</div><div class='del'>-	.remount_fs		= vxfs_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vxfs_try_sb_magic(struct super_block *sbp, int silent,</div><div class='add'>+static int vxfs_try_sb_magic(struct super_block *sbp, struct fs_context *fc,</div><div class='ctx'> 		unsigned blk, __fs32 magic)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bp;</div><div class='ctx'> 	struct vxfs_sb *rsbp;</div><div class='ctx'> 	struct vxfs_sb_info *infp = VXFS_SBI(sbp);</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	int rc = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	bp = sb_bread(sbp, blk);</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!bp || !buffer_mapped(bp)) {</div><div class='ctx'> 			if (!silent) {</div><div class='del'>-				printk(KERN_WARNING</div><div class='del'>-					"vxfs: unable to read disk superblock at %u\n",</div><div class='del'>-					blk);</div><div class='add'>+				warnf(fc,</div><div class='add'>+				      "vxfs: unable to read disk superblock at %u",</div><div class='add'>+				      blk);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -146,9 +146,9 @@ static int vxfs_try_sb_magic(struct super_block *sbp, int silent,</div><div class='ctx'> 		rsbp = (struct vxfs_sb *)bp-&gt;b_data;</div><div class='ctx'> 		if (rsbp-&gt;vs_magic != magic) {</div><div class='ctx'> 			if (!silent)</div><div class='del'>-				printk(KERN_NOTICE</div><div class='del'>-					"vxfs: WRONG superblock magic %08x at %u\n",</div><div class='del'>-					rsbp-&gt;vs_magic, blk);</div><div class='add'>+				infof(fc,</div><div class='add'>+				      "vxfs: WRONG superblock magic %08x at %u",</div><div class='add'>+				      rsbp-&gt;vs_magic, blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -169,8 +169,7 @@ static int vxfs_try_sb_magic(struct super_block *sbp, int silent,</div><div class='ctx'> /**</div><div class='ctx'>  * vxfs_fill_super - read superblock into memory and initialize filesystem</div><div class='ctx'>  * @sbp:		VFS superblock (to fill)</div><div class='del'>- * @dp:			fs private mount data</div><div class='del'>- * @silent:		do not complain loudly when sth is wrong</div><div class='add'>+ * @fc:			filesytem context</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *   We are called on the first mount of a filesystem to read the</div><div class='hunk'>@@ -182,26 +181,27 @@ static int vxfs_try_sb_magic(struct super_block *sbp, int silent,</div><div class='ctx'>  * Locking:</div><div class='ctx'>  *   We are under @sbp-&gt;s_lock.</div><div class='ctx'>  */</div><div class='del'>-static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)</div><div class='add'>+static int vxfs_fill_super(struct super_block *sbp, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct vxfs_sb_info	*infp;</div><div class='ctx'> 	struct vxfs_sb		*rsbp;</div><div class='ctx'> 	u_long			bsize;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	u32 j;</div><div class='ctx'> </div><div class='ctx'> 	sbp-&gt;s_flags |= SB_RDONLY;</div><div class='ctx'> </div><div class='ctx'> 	infp = kzalloc(sizeof(*infp), GFP_KERNEL);</div><div class='ctx'> 	if (!infp) {</div><div class='del'>-		printk(KERN_WARNING "vxfs: unable to allocate incore superblock\n");</div><div class='add'>+		warnf(fc, "vxfs: unable to allocate incore superblock");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bsize = sb_min_blocksize(sbp, BLOCK_SIZE);</div><div class='ctx'> 	if (!bsize) {</div><div class='del'>-		printk(KERN_WARNING "vxfs: unable to set blocksize\n");</div><div class='add'>+		warnf(fc, "vxfs: unable to set blocksize");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -210,24 +210,24 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)</div><div class='ctx'> 	sbp-&gt;s_time_min = 0;</div><div class='ctx'> 	sbp-&gt;s_time_max = U32_MAX;</div><div class='ctx'> </div><div class='del'>-	if (!vxfs_try_sb_magic(sbp, silent, 1,</div><div class='add'>+	if (!vxfs_try_sb_magic(sbp, fc, 1,</div><div class='ctx'> 			(__force __fs32)cpu_to_le32(VXFS_SUPER_MAGIC))) {</div><div class='ctx'> 		/* Unixware, x86 */</div><div class='ctx'> 		infp-&gt;byte_order = VXFS_BO_LE;</div><div class='del'>-	} else if (!vxfs_try_sb_magic(sbp, silent, 8,</div><div class='add'>+	} else if (!vxfs_try_sb_magic(sbp, fc, 8,</div><div class='ctx'> 			(__force __fs32)cpu_to_be32(VXFS_SUPER_MAGIC))) {</div><div class='ctx'> 		/* HP-UX, parisc */</div><div class='ctx'> 		infp-&gt;byte_order = VXFS_BO_BE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!silent)</div><div class='del'>-			printk(KERN_NOTICE "vxfs: can't find superblock.\n");</div><div class='add'>+			infof(fc, "vxfs: can't find superblock.");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rsbp = infp-&gt;vsi_raw;</div><div class='ctx'> 	j = fs32_to_cpu(infp, rsbp-&gt;vs_version);</div><div class='ctx'> 	if ((j &lt; 2 || j &gt; 4) &amp;&amp; !silent) {</div><div class='del'>-		printk(KERN_NOTICE "vxfs: unsupported VxFS version (%d)\n", j);</div><div class='add'>+		infof(fc, "vxfs: unsupported VxFS version (%d)", j);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -244,17 +244,17 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)</div><div class='ctx'> </div><div class='ctx'> 	j = fs32_to_cpu(infp, rsbp-&gt;vs_bsize);</div><div class='ctx'> 	if (!sb_set_blocksize(sbp, j)) {</div><div class='del'>-		printk(KERN_WARNING "vxfs: unable to set final block size\n");</div><div class='add'>+		warnf(fc, "vxfs: unable to set final block size");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vxfs_read_olt(sbp, bsize)) {</div><div class='del'>-		printk(KERN_WARNING "vxfs: unable to read olt\n");</div><div class='add'>+		warnf(fc, "vxfs: unable to read olt");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vxfs_read_fshead(sbp)) {</div><div class='del'>-		printk(KERN_WARNING "vxfs: unable to read fshead\n");</div><div class='add'>+		warnf(fc, "vxfs: unable to read fshead");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -265,7 +265,7 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)</div><div class='ctx'> 	}</div><div class='ctx'> 	sbp-&gt;s_root = d_make_root(root);</div><div class='ctx'> 	if (!sbp-&gt;s_root) {</div><div class='del'>-		printk(KERN_WARNING "vxfs: unable to get root dentry.\n");</div><div class='add'>+		warnf(fc, "vxfs: unable to get root dentry.");</div><div class='ctx'> 		goto out_free_ilist;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -284,18 +284,29 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * The usual module blurb.</div><div class='ctx'>  */</div><div class='del'>-static struct dentry *vxfs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int vxfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, vxfs_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, vxfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations vxfs_context_ops = {</div><div class='add'>+	.get_tree	= vxfs_get_tree,</div><div class='add'>+	.reconfigure	= vxfs_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vxfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	fc-&gt;ops = &amp;vxfs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type vxfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "vxfs",</div><div class='del'>-	.mount		= vxfs_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = vxfs_init_fs_context,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */</div><div class='ctx'> MODULE_ALIAS("vxfs");</div><div class='hunk'>@@ -307,7 +318,7 @@ vxfs_init(void)</div><div class='ctx'> </div><div class='ctx'> 	vxfs_inode_cachep = kmem_cache_create_usercopy("vxfs_inode",</div><div class='ctx'> 			sizeof(struct vxfs_inode_info), 0,</div><div class='del'>-			SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,</div><div class='add'>+			SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 			offsetof(struct vxfs_inode_info, vii_immed.vi_immed),</div><div class='ctx'> 			sizeof_field(struct vxfs_inode_info,</div><div class='ctx'> 				vii_immed.vi_immed),</div><div class='head'>diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c<br/>index 3d84fcc471c6..6800886c4d10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fs-writeback.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs-writeback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fs-writeback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fs-writeback.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  *		Additions for address_space-based writeback</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/sched/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -32,11 +33,6 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * 4MB minimal write chunk size</div><div class='del'>- */</div><div class='del'>-#define MIN_WRITEBACK_PAGES	(4096UL &gt;&gt; (PAGE_SHIFT - 10))</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Passed into wb_writeback(), essentially a subset of writeback_control</div><div class='ctx'>  */</div><div class='ctx'> struct wb_writeback_work {</div><div class='hunk'>@@ -65,7 +61,7 @@ struct wb_writeback_work {</div><div class='ctx'>  * timestamps written to disk after 12 hours, but in the worst case a</div><div class='ctx'>  * few inodes might not their timestamps updated for 24 hours.</div><div class='ctx'>  */</div><div class='del'>-unsigned int dirtytime_expire_interval = 12 * 60 * 60;</div><div class='add'>+static unsigned int dirtytime_expire_interval = 12 * 60 * 60;</div><div class='ctx'> </div><div class='ctx'> static inline struct inode *wb_inode(struct list_head *head)</div><div class='ctx'> {</div><div class='hunk'>@@ -121,7 +117,7 @@ static bool inode_io_list_move_locked(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	assert_spin_locked(&amp;wb-&gt;list_lock);</div><div class='ctx'> 	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='del'>-	WARN_ON_ONCE(inode-&gt;i_state &amp; I_FREEING);</div><div class='add'>+	WARN_ON_ONCE(inode_state_read(inode) &amp; I_FREEING);</div><div class='ctx'> </div><div class='ctx'> 	list_move(&amp;inode-&gt;i_io_list, head);</div><div class='ctx'> </div><div class='hunk'>@@ -141,8 +137,32 @@ static void wb_wakeup(struct bdi_writeback *wb)</div><div class='ctx'> 	spin_unlock_irq(&amp;wb-&gt;work_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void finish_writeback_work(struct bdi_writeback *wb,</div><div class='del'>-				  struct wb_writeback_work *work)</div><div class='add'>+/*</div><div class='add'>+ * This function is used when the first inode for this wb is marked dirty. It</div><div class='add'>+ * wakes-up the corresponding bdi thread which should then take care of the</div><div class='add'>+ * periodic background write-out of dirty inodes. Since the write-out would</div><div class='add'>+ * starts only 'dirty_writeback_interval' centisecs from now anyway, we just</div><div class='add'>+ * set up a timer which wakes the bdi thread up later.</div><div class='add'>+ *</div><div class='add'>+ * Note, we wouldn't bother setting up the timer, but this function is on the</div><div class='add'>+ * fast-path (used by '__mark_inode_dirty()'), so we save few context switches</div><div class='add'>+ * by delaying the wake-up.</div><div class='add'>+ *</div><div class='add'>+ * We have to be careful not to postpone flush work if it is scheduled for</div><div class='add'>+ * earlier. Thus we use queue_delayed_work().</div><div class='add'>+ */</div><div class='add'>+static void wb_wakeup_delayed(struct bdi_writeback *wb)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	timeout = msecs_to_jiffies(dirty_writeback_interval * 10);</div><div class='add'>+	spin_lock_irq(&amp;wb-&gt;work_lock);</div><div class='add'>+	if (test_bit(WB_registered, &amp;wb-&gt;state))</div><div class='add'>+		queue_delayed_work(bdi_wq, &amp;wb-&gt;dwork, timeout);</div><div class='add'>+	spin_unlock_irq(&amp;wb-&gt;work_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_writeback_work(struct wb_writeback_work *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct wb_completion *done = work-&gt;done;</div><div class='ctx'> </div><div class='hunk'>@@ -171,11 +191,24 @@ static void wb_queue_work(struct bdi_writeback *wb,</div><div class='ctx'> 		list_add_tail(&amp;work-&gt;list, &amp;wb-&gt;work_list);</div><div class='ctx'> 		mod_delayed_work(bdi_wq, &amp;wb-&gt;dwork, 0);</div><div class='ctx'> 	} else</div><div class='del'>-		finish_writeback_work(wb, work);</div><div class='add'>+		finish_writeback_work(work);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;wb-&gt;work_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool wb_wait_for_completion_cb(struct wb_completion *done)</div><div class='add'>+{</div><div class='add'>+	unsigned long waited_secs = (jiffies - done-&gt;wait_start) / HZ;</div><div class='add'>+</div><div class='add'>+	done-&gt;progress_stamp = jiffies;</div><div class='add'>+	if (waited_secs &gt; sysctl_hung_task_timeout_secs)</div><div class='add'>+		pr_info("INFO: The task %s:%d has been waiting for writeback "</div><div class='add'>+			"completion for more than %lu seconds.",</div><div class='add'>+			current-&gt;comm, current-&gt;pid, waited_secs);</div><div class='add'>+</div><div class='add'>+	return !atomic_read(&amp;done-&gt;cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * wb_wait_for_completion - wait for completion of bdi_writeback_works</div><div class='ctx'>  * @done: target wb_completion</div><div class='hunk'>@@ -188,8 +221,9 @@ static void wb_queue_work(struct bdi_writeback *wb,</div><div class='ctx'>  */</div><div class='ctx'> void wb_wait_for_completion(struct wb_completion *done)</div><div class='ctx'> {</div><div class='add'>+	done-&gt;wait_start = jiffies;</div><div class='ctx'> 	atomic_dec(&amp;done-&gt;cnt);		/* put down the initial count */</div><div class='del'>-	wait_event(*done-&gt;waitq, !atomic_read(&amp;done-&gt;cnt));</div><div class='add'>+	wait_event(*done-&gt;waitq, wb_wait_for_completion_cb(done));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CGROUP_WRITEBACK</div><div class='hunk'>@@ -266,7 +300,6 @@ void __inode_attach_wb(struct inode *inode, struct folio *folio)</div><div class='ctx'> 	if (unlikely(cmpxchg(&amp;inode-&gt;i_wb, NULL, wb)))</div><div class='ctx'> 		wb_put(wb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(__inode_attach_wb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * inode_cgwb_move_to_attached - put the inode onto wb-&gt;b_attached list</div><div class='hunk'>@@ -281,9 +314,9 @@ static void inode_cgwb_move_to_attached(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	assert_spin_locked(&amp;wb-&gt;list_lock);</div><div class='ctx'> 	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='del'>-	WARN_ON_ONCE(inode-&gt;i_state &amp; I_FREEING);</div><div class='add'>+	WARN_ON_ONCE(inode_state_read(inode) &amp; I_FREEING);</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_state &amp;= ~I_SYNC_QUEUED;</div><div class='add'>+	inode_state_clear(inode, I_SYNC_QUEUED);</div><div class='ctx'> 	if (wb != &amp;wb-&gt;bdi-&gt;wb)</div><div class='ctx'> 		list_move(&amp;inode-&gt;i_io_list, &amp;wb-&gt;b_attached);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -345,7 +378,8 @@ static struct bdi_writeback *inode_to_wb_and_lock_list(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct inode_switch_wbs_context {</div><div class='del'>-	struct rcu_work		work;</div><div class='add'>+	/* List of queued switching contexts for the wb */</div><div class='add'>+	struct llist_node	list;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Multiple inodes can be switched at once.  The switching procedure</div><div class='hunk'>@@ -355,7 +389,6 @@ struct inode_switch_wbs_context {</div><div class='ctx'> 	 * array embedded into struct inode_switch_wbs_context.  Otherwise</div><div class='ctx'> 	 * an inode could be left in a non-consistent state.</div><div class='ctx'> 	 */</div><div class='del'>-	struct bdi_writeback	*new_wb;</div><div class='ctx'> 	struct inode		*inodes[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +418,7 @@ static bool inode_do_switch_wbs(struct inode *inode,</div><div class='ctx'> 	 * Once I_FREEING or I_WILL_FREE are visible under i_lock, the eviction</div><div class='ctx'> 	 * path owns the inode and we shouldn't modify -&gt;i_io_list.</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(inode-&gt;i_state &amp; (I_FREEING | I_WILL_FREE)))</div><div class='add'>+	if (unlikely(inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE)))</div><div class='ctx'> 		goto skip_switch;</div><div class='ctx'> </div><div class='ctx'> 	trace_inode_switch_wbs(inode, old_wb, new_wb);</div><div class='hunk'>@@ -422,22 +455,23 @@ static bool inode_do_switch_wbs(struct inode *inode,</div><div class='ctx'> 	 * Transfer to @new_wb's IO list if necessary.  If the @inode is dirty,</div><div class='ctx'> 	 * the specific list @inode was on is ignored and the @inode is put on</div><div class='ctx'> 	 * -&gt;b_dirty which is always correct including from -&gt;b_dirty_time.</div><div class='del'>-	 * The transfer preserves @inode-&gt;dirtied_when ordering.  If the @inode</div><div class='del'>-	 * was clean, it means it was on the b_attached list, so move it onto</div><div class='del'>-	 * the b_attached list of @new_wb.</div><div class='add'>+	 * If the @inode was clean, it means it was on the b_attached list, so</div><div class='add'>+	 * move it onto the b_attached list of @new_wb.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!list_empty(&amp;inode-&gt;i_io_list)) {</div><div class='ctx'> 		inode-&gt;i_wb = new_wb;</div><div class='ctx'> </div><div class='del'>-		if (inode-&gt;i_state &amp; I_DIRTY_ALL) {</div><div class='del'>-			struct inode *pos;</div><div class='del'>-</div><div class='del'>-			list_for_each_entry(pos, &amp;new_wb-&gt;b_dirty, i_io_list)</div><div class='del'>-				if (time_after_eq(inode-&gt;dirtied_when,</div><div class='del'>-						  pos-&gt;dirtied_when))</div><div class='del'>-					break;</div><div class='add'>+		if (inode_state_read(inode) &amp; I_DIRTY_ALL) {</div><div class='add'>+			/*</div><div class='add'>+			 * We need to keep b_dirty list sorted by</div><div class='add'>+			 * dirtied_time_when. However properly sorting the</div><div class='add'>+			 * inode in the list gets too expensive when switching</div><div class='add'>+			 * many inodes. So just attach inode at the end of the</div><div class='add'>+			 * dirty list and clobber the dirtied_time_when.</div><div class='add'>+			 */</div><div class='add'>+			inode-&gt;dirtied_time_when = jiffies;</div><div class='ctx'> 			inode_io_list_move_locked(inode, new_wb,</div><div class='del'>-						  pos-&gt;i_io_list.prev);</div><div class='add'>+						  &amp;new_wb-&gt;b_dirty);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			inode_cgwb_move_to_attached(inode, new_wb);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -452,10 +486,11 @@ static bool inode_do_switch_wbs(struct inode *inode,</div><div class='ctx'> 	switched = true;</div><div class='ctx'> skip_switch:</div><div class='ctx'> 	/*</div><div class='del'>-	 * Paired with load_acquire in unlocked_inode_to_wb_begin() and</div><div class='add'>+	 * Paired with an acquire fence in unlocked_inode_to_wb_begin() and</div><div class='ctx'> 	 * ensures that the new wb is visible if they see !I_WB_SWITCH.</div><div class='ctx'> 	 */</div><div class='del'>-	smp_store_release(&amp;inode-&gt;i_state, inode-&gt;i_state &amp; ~I_WB_SWITCH);</div><div class='add'>+	smp_wmb();</div><div class='add'>+	inode_state_clear(inode, I_WB_SWITCH);</div><div class='ctx'> </div><div class='ctx'> 	xa_unlock_irq(&amp;mapping-&gt;i_pages);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -463,13 +498,11 @@ skip_switch:</div><div class='ctx'> 	return switched;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inode_switch_wbs_work_fn(struct work_struct *work)</div><div class='add'>+static void process_inode_switch_wbs(struct bdi_writeback *new_wb,</div><div class='add'>+				     struct inode_switch_wbs_context *isw)</div><div class='ctx'> {</div><div class='del'>-	struct inode_switch_wbs_context *isw =</div><div class='del'>-		container_of(to_rcu_work(work), struct inode_switch_wbs_context, work);</div><div class='ctx'> 	struct backing_dev_info *bdi = inode_to_bdi(isw-&gt;inodes[0]);</div><div class='ctx'> 	struct bdi_writeback *old_wb = isw-&gt;inodes[0]-&gt;i_wb;</div><div class='del'>-	struct bdi_writeback *new_wb = isw-&gt;new_wb;</div><div class='ctx'> 	unsigned long nr_switched = 0;</div><div class='ctx'> 	struct inode **inodep;</div><div class='ctx'> </div><div class='hunk'>@@ -479,6 +512,7 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_read(&amp;bdi-&gt;wb_switch_rwsem);</div><div class='ctx'> </div><div class='add'>+	inodep = isw-&gt;inodes;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * By the time control reaches here, RCU grace period has passed</div><div class='ctx'> 	 * since I_WB_SWITCH assertion and all wb stat update transactions</div><div class='hunk'>@@ -489,6 +523,7 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)</div><div class='ctx'> 	 * gives us exclusion against all wb related operations on @inode</div><div class='ctx'> 	 * including IO list manipulations and stat updates.</div><div class='ctx'> 	 */</div><div class='add'>+relock:</div><div class='ctx'> 	if (old_wb &lt; new_wb) {</div><div class='ctx'> 		spin_lock(&amp;old_wb-&gt;list_lock);</div><div class='ctx'> 		spin_lock_nested(&amp;new_wb-&gt;list_lock, SINGLE_DEPTH_NESTING);</div><div class='hunk'>@@ -497,10 +532,17 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)</div><div class='ctx'> 		spin_lock_nested(&amp;old_wb-&gt;list_lock, SINGLE_DEPTH_NESTING);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (inodep = isw-&gt;inodes; *inodep; inodep++) {</div><div class='add'>+	while (*inodep) {</div><div class='ctx'> 		WARN_ON_ONCE((*inodep)-&gt;i_wb != old_wb);</div><div class='ctx'> 		if (inode_do_switch_wbs(*inodep, old_wb, new_wb))</div><div class='ctx'> 			nr_switched++;</div><div class='add'>+		inodep++;</div><div class='add'>+		if (*inodep &amp;&amp; need_resched()) {</div><div class='add'>+			spin_unlock(&amp;new_wb-&gt;list_lock);</div><div class='add'>+			spin_unlock(&amp;old_wb-&gt;list_lock);</div><div class='add'>+			cond_resched();</div><div class='add'>+			goto relock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;new_wb-&gt;list_lock);</div><div class='hunk'>@@ -520,6 +562,38 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)</div><div class='ctx'> 	atomic_dec(&amp;isw_nr_in_flight);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void inode_switch_wbs_work_fn(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct bdi_writeback *new_wb = container_of(work, struct bdi_writeback,</div><div class='add'>+						    switch_work);</div><div class='add'>+	struct inode_switch_wbs_context *isw, *next_isw;</div><div class='add'>+	struct llist_node *list;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Grab out reference to wb so that it cannot get freed under us</div><div class='add'>+	 * after we process all the isw items.</div><div class='add'>+	 */</div><div class='add'>+	wb_get(new_wb);</div><div class='add'>+	while (1) {</div><div class='add'>+		list = llist_del_all(&amp;new_wb-&gt;switch_wbs_ctxs);</div><div class='add'>+		/* Nothing to do? */</div><div class='add'>+		if (!list)</div><div class='add'>+			break;</div><div class='add'>+		/*</div><div class='add'>+		 * In addition to synchronizing among switchers, I_WB_SWITCH</div><div class='add'>+		 * tells the RCU protected stat update paths to grab the i_page</div><div class='add'>+		 * lock so that stat transfer can synchronize against them.</div><div class='add'>+		 * Let's continue after I_WB_SWITCH is guaranteed to be</div><div class='add'>+		 * visible.</div><div class='add'>+		 */</div><div class='add'>+		synchronize_rcu();</div><div class='add'>+</div><div class='add'>+		llist_for_each_entry_safe(isw, next_isw, list, list)</div><div class='add'>+			process_inode_switch_wbs(new_wb, isw);</div><div class='add'>+	}</div><div class='add'>+	wb_put(new_wb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool inode_prepare_wbs_switch(struct inode *inode,</div><div class='ctx'> 				     struct bdi_writeback *new_wb)</div><div class='ctx'> {</div><div class='hunk'>@@ -537,18 +611,25 @@ static bool inode_prepare_wbs_switch(struct inode *inode,</div><div class='ctx'> 	/* while holding I_WB_SWITCH, no one else can update the association */</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (!(inode-&gt;i_sb-&gt;s_flags &amp; SB_ACTIVE) ||</div><div class='del'>-	    inode-&gt;i_state &amp; (I_WB_SWITCH | I_FREEING | I_WILL_FREE) ||</div><div class='add'>+	    inode_state_read(inode) &amp; (I_WB_SWITCH | I_FREEING | I_WILL_FREE) ||</div><div class='ctx'> 	    inode_to_wb(inode) == new_wb) {</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='del'>-	inode-&gt;i_state |= I_WB_SWITCH;</div><div class='add'>+	inode_state_set(inode, I_WB_SWITCH);</div><div class='ctx'> 	__iget(inode);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void wb_queue_isw(struct bdi_writeback *wb,</div><div class='add'>+			 struct inode_switch_wbs_context *isw)</div><div class='add'>+{</div><div class='add'>+	if (llist_add(&amp;isw-&gt;list, &amp;wb-&gt;switch_wbs_ctxs))</div><div class='add'>+		queue_work(isw_wq, &amp;wb-&gt;switch_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * inode_switch_wbs - change the wb association of an inode</div><div class='ctx'>  * @inode: target inode</div><div class='hunk'>@@ -562,9 +643,10 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)</div><div class='ctx'> 	struct backing_dev_info *bdi = inode_to_bdi(inode);</div><div class='ctx'> 	struct cgroup_subsys_state *memcg_css;</div><div class='ctx'> 	struct inode_switch_wbs_context *isw;</div><div class='add'>+	struct bdi_writeback *new_wb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* noop if seems to be already in progress */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_WB_SWITCH)</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_WB_SWITCH)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* avoid queueing a new switch if too many are already in flight */</div><div class='hunk'>@@ -586,40 +668,35 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)</div><div class='ctx'> 	if (!memcg_css)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	isw-&gt;new_wb = wb_get_create(bdi, memcg_css, GFP_ATOMIC);</div><div class='add'>+	new_wb = wb_get_create(bdi, memcg_css, GFP_ATOMIC);</div><div class='ctx'> 	css_put(memcg_css);</div><div class='del'>-	if (!isw-&gt;new_wb)</div><div class='add'>+	if (!new_wb)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	if (!inode_prepare_wbs_switch(inode, isw-&gt;new_wb))</div><div class='add'>+	if (!inode_prepare_wbs_switch(inode, new_wb))</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	isw-&gt;inodes[0] = inode;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * In addition to synchronizing among switchers, I_WB_SWITCH tells</div><div class='del'>-	 * the RCU protected stat update paths to grab the i_page</div><div class='del'>-	 * lock so that stat transfer can synchronize against them.</div><div class='del'>-	 * Let's continue after I_WB_SWITCH is guaranteed to be visible.</div><div class='del'>-	 */</div><div class='del'>-	INIT_RCU_WORK(&amp;isw-&gt;work, inode_switch_wbs_work_fn);</div><div class='del'>-	queue_rcu_work(isw_wq, &amp;isw-&gt;work);</div><div class='add'>+	trace_inode_switch_wbs_queue(inode-&gt;i_wb, new_wb, 1);</div><div class='add'>+	wb_queue_isw(new_wb, isw);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	atomic_dec(&amp;isw_nr_in_flight);</div><div class='del'>-	if (isw-&gt;new_wb)</div><div class='del'>-		wb_put(isw-&gt;new_wb);</div><div class='add'>+	if (new_wb)</div><div class='add'>+		wb_put(new_wb);</div><div class='ctx'> 	kfree(isw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool isw_prepare_wbs_switch(struct inode_switch_wbs_context *isw,</div><div class='add'>+static bool isw_prepare_wbs_switch(struct bdi_writeback *new_wb,</div><div class='add'>+				   struct inode_switch_wbs_context *isw,</div><div class='ctx'> 				   struct list_head *list, int *nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(inode, list, i_io_list) {</div><div class='del'>-		if (!inode_prepare_wbs_switch(inode, isw-&gt;new_wb))</div><div class='add'>+		if (!inode_prepare_wbs_switch(inode, new_wb))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		isw-&gt;inodes[*nr] = inode;</div><div class='hunk'>@@ -643,6 +720,7 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)</div><div class='ctx'> {</div><div class='ctx'> 	struct cgroup_subsys_state *memcg_css;</div><div class='ctx'> 	struct inode_switch_wbs_context *isw;</div><div class='add'>+	struct bdi_writeback *new_wb;</div><div class='ctx'> 	int nr;</div><div class='ctx'> 	bool restart = false;</div><div class='ctx'> </div><div class='hunk'>@@ -655,12 +733,12 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)</div><div class='ctx'> </div><div class='ctx'> 	for (memcg_css = wb-&gt;memcg_css-&gt;parent; memcg_css;</div><div class='ctx'> 	     memcg_css = memcg_css-&gt;parent) {</div><div class='del'>-		isw-&gt;new_wb = wb_get_create(wb-&gt;bdi, memcg_css, GFP_KERNEL);</div><div class='del'>-		if (isw-&gt;new_wb)</div><div class='add'>+		new_wb = wb_get_create(wb-&gt;bdi, memcg_css, GFP_KERNEL);</div><div class='add'>+		if (new_wb)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(!isw-&gt;new_wb))</div><div class='del'>-		isw-&gt;new_wb = &amp;wb-&gt;bdi-&gt;wb; /* wb_get() is noop for bdi's wb */</div><div class='add'>+	if (unlikely(!new_wb))</div><div class='add'>+		new_wb = &amp;wb-&gt;bdi-&gt;wb; /* wb_get() is noop for bdi's wb */</div><div class='ctx'> </div><div class='ctx'> 	nr = 0;</div><div class='ctx'> 	spin_lock(&amp;wb-&gt;list_lock);</div><div class='hunk'>@@ -672,27 +750,22 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)</div><div class='ctx'> 	 * bandwidth restrictions, as writeback of inode metadata is not</div><div class='ctx'> 	 * accounted for.</div><div class='ctx'> 	 */</div><div class='del'>-	restart = isw_prepare_wbs_switch(isw, &amp;wb-&gt;b_attached, &amp;nr);</div><div class='add'>+	restart = isw_prepare_wbs_switch(new_wb, isw, &amp;wb-&gt;b_attached, &amp;nr);</div><div class='ctx'> 	if (!restart)</div><div class='del'>-		restart = isw_prepare_wbs_switch(isw, &amp;wb-&gt;b_dirty_time, &amp;nr);</div><div class='add'>+		restart = isw_prepare_wbs_switch(new_wb, isw, &amp;wb-&gt;b_dirty_time,</div><div class='add'>+						 &amp;nr);</div><div class='ctx'> 	spin_unlock(&amp;wb-&gt;list_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* no attached inodes? bail out */</div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		atomic_dec(&amp;isw_nr_in_flight);</div><div class='del'>-		wb_put(isw-&gt;new_wb);</div><div class='add'>+		wb_put(new_wb);</div><div class='ctx'> 		kfree(isw);</div><div class='ctx'> 		return restart;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * In addition to synchronizing among switchers, I_WB_SWITCH tells</div><div class='del'>-	 * the RCU protected stat update paths to grab the i_page</div><div class='del'>-	 * lock so that stat transfer can synchronize against them.</div><div class='del'>-	 * Let's continue after I_WB_SWITCH is guaranteed to be visible.</div><div class='del'>-	 */</div><div class='del'>-	INIT_RCU_WORK(&amp;isw-&gt;work, inode_switch_wbs_work_fn);</div><div class='del'>-	queue_rcu_work(isw_wq, &amp;isw-&gt;work);</div><div class='add'>+	trace_inode_switch_wbs_queue(wb, new_wb, nr);</div><div class='add'>+	wb_queue_isw(new_wb, isw);</div><div class='ctx'> </div><div class='ctx'> 	return restart;</div><div class='ctx'> }</div><div class='hunk'>@@ -707,8 +780,9 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)</div><div class='ctx'>  * writeback completion, wbc_detach_inode() should be called.  This is used</div><div class='ctx'>  * to track the cgroup writeback context.</div><div class='ctx'>  */</div><div class='del'>-void wbc_attach_and_unlock_inode(struct writeback_control *wbc,</div><div class='del'>-				 struct inode *inode)</div><div class='add'>+static void wbc_attach_and_unlock_inode(struct writeback_control *wbc,</div><div class='add'>+		struct inode *inode)</div><div class='add'>+	__releases(&amp;inode-&gt;i_lock)</div><div class='ctx'> {</div><div class='ctx'> 	if (!inode_cgwb_enabled(inode)) {</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -738,7 +812,24 @@ void wbc_attach_and_unlock_inode(struct writeback_control *wbc,</div><div class='ctx'> 	if (unlikely(wb_dying(wbc-&gt;wb) &amp;&amp; !css_is_dying(wbc-&gt;wb-&gt;memcg_css)))</div><div class='ctx'> 		inode_switch_wbs(inode, wbc-&gt;wb_id);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wbc_attach_and_unlock_inode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * wbc_attach_fdatawrite_inode - associate wbc and inode for fdatawrite</div><div class='add'>+ * @wbc: writeback_control of interest</div><div class='add'>+ * @inode: target inode</div><div class='add'>+ *</div><div class='add'>+ * This function is to be used by filemap_writeback(), which is an alternative</div><div class='add'>+ * entry point into writeback code, and first ensures @inode is associated with</div><div class='add'>+ * a bdi_writeback and attaches it to @wbc.</div><div class='add'>+ */</div><div class='add'>+void wbc_attach_fdatawrite_inode(struct writeback_control *wbc,</div><div class='add'>+		struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	inode_attach_wb(inode, NULL);</div><div class='add'>+	wbc_attach_and_unlock_inode(wbc, inode);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wbc_attach_fdatawrite_inode);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * wbc_detach_inode - disassociate wbc from inode and perform foreign detection</div><div class='hunk'>@@ -866,17 +957,16 @@ EXPORT_SYMBOL_GPL(wbc_detach_inode);</div><div class='ctx'> /**</div><div class='ctx'>  * wbc_account_cgroup_owner - account writeback to update inode cgroup ownership</div><div class='ctx'>  * @wbc: writeback_control of the writeback in progress</div><div class='del'>- * @page: page being written out</div><div class='add'>+ * @folio: folio being written out</div><div class='ctx'>  * @bytes: number of bytes being written out</div><div class='ctx'>  *</div><div class='del'>- * @bytes from @page are about to written out during the writeback</div><div class='add'>+ * @bytes from @folio are about to written out during the writeback</div><div class='ctx'>  * controlled by @wbc.  Keep the book for foreign inode detection.  See</div><div class='ctx'>  * wbc_detach_inode().</div><div class='ctx'>  */</div><div class='del'>-void wbc_account_cgroup_owner(struct writeback_control *wbc, struct page *page,</div><div class='add'>+void wbc_account_cgroup_owner(struct writeback_control *wbc, struct folio *folio,</div><div class='ctx'> 			      size_t bytes)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio;</div><div class='ctx'> 	struct cgroup_subsys_state *css;</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='hunk'>@@ -889,7 +979,6 @@ void wbc_account_cgroup_owner(struct writeback_control *wbc, struct page *page,</div><div class='ctx'> 	if (!wbc-&gt;wb || wbc-&gt;no_cgroup_owner)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	folio = page_folio(page);</div><div class='ctx'> 	css = mem_cgroup_css_from_folio(folio);</div><div class='ctx'> 	/* dead cgroups shouldn't contribute to inode ownership arbitration */</div><div class='ctx'> 	if (!(css-&gt;flags &amp; CSS_ONLINE))</div><div class='hunk'>@@ -1084,7 +1173,7 @@ int cgroup_writeback_by_id(u64 bdi_id, int memcg_id,</div><div class='ctx'> 	dirty = dirty * 10 / 8;</div><div class='ctx'> </div><div class='ctx'> 	/* issue the writeback work */</div><div class='del'>-	work = kzalloc(sizeof(*work), GFP_NOWAIT | __GFP_NOWARN);</div><div class='add'>+	work = kzalloc(sizeof(*work), GFP_NOWAIT);</div><div class='ctx'> 	if (work) {</div><div class='ctx'> 		work-&gt;nr_pages = dirty;</div><div class='ctx'> 		work-&gt;sync_mode = WB_SYNC_NONE;</div><div class='hunk'>@@ -1108,6 +1197,7 @@ out_bdi_put:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cgroup_writeback_umount - flush inode wb switches for umount</div><div class='add'>+ * @sb: target super_block</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called when a super_block is about to be destroyed and</div><div class='ctx'>  * flushes in-flight inode wb switches.  An inode wb switch goes through</div><div class='hunk'>@@ -1116,8 +1206,12 @@ out_bdi_put:</div><div class='ctx'>  * rare occurrences and synchronize_rcu() can take a while, perform</div><div class='ctx'>  * flushing iff wb switches are in flight.</div><div class='ctx'>  */</div><div class='del'>-void cgroup_writeback_umount(void)</div><div class='add'>+void cgroup_writeback_umount(struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+</div><div class='add'>+	if (!(sb-&gt;s_bdi-&gt;capabilities &amp; BDI_CAP_WRITEBACK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * SB_ACTIVE should be reliably cleared before checking</div><div class='ctx'> 	 * isw_nr_in_flight, see generic_shutdown_super().</div><div class='hunk'>@@ -1136,7 +1230,7 @@ void cgroup_writeback_umount(void)</div><div class='ctx'> </div><div class='ctx'> static int __init cgroup_writeback_init(void)</div><div class='ctx'> {</div><div class='del'>-	isw_wq = alloc_workqueue("inode_switch_wbs", 0, 0);</div><div class='add'>+	isw_wq = alloc_workqueue("inode_switch_wbs", WQ_PERCPU, 0);</div><div class='ctx'> 	if (!isw_wq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1153,9 +1247,9 @@ static void inode_cgwb_move_to_attached(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	assert_spin_locked(&amp;wb-&gt;list_lock);</div><div class='ctx'> 	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='del'>-	WARN_ON_ONCE(inode-&gt;i_state &amp; I_FREEING);</div><div class='add'>+	WARN_ON_ONCE(inode_state_read(inode) &amp; I_FREEING);</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_state &amp;= ~I_SYNC_QUEUED;</div><div class='add'>+	inode_state_clear(inode, I_SYNC_QUEUED);</div><div class='ctx'> 	list_del_init(&amp;inode-&gt;i_io_list);</div><div class='ctx'> 	wb_io_lists_depopulated(wb);</div><div class='ctx'> }</div><div class='hunk'>@@ -1198,6 +1292,13 @@ static void bdi_split_work_to_wbs(struct backing_dev_info *bdi,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void wbc_attach_and_unlock_inode(struct writeback_control *wbc,</div><div class='add'>+					       struct inode *inode)</div><div class='add'>+	__releases(&amp;inode-&gt;i_lock)</div><div class='add'>+{</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_CGROUP_WRITEBACK */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1258,10 +1359,17 @@ void inode_io_list_del(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct bdi_writeback *wb;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: ext4 can call here from ext4_evict_inode() after evict() already</div><div class='add'>+	 * unlinked the inode.</div><div class='add'>+	 */</div><div class='add'>+	if (list_empty_careful(&amp;inode-&gt;i_io_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	wb = inode_to_wb_and_lock_list(inode);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_state &amp;= ~I_SYNC_QUEUED;</div><div class='add'>+	inode_state_clear(inode, I_SYNC_QUEUED);</div><div class='ctx'> 	list_del_init(&amp;inode-&gt;i_io_list);</div><div class='ctx'> 	wb_io_lists_depopulated(wb);</div><div class='ctx'> </div><div class='hunk'>@@ -1319,13 +1427,13 @@ static void redirty_tail_locked(struct inode *inode, struct bdi_writeback *wb)</div><div class='ctx'> {</div><div class='ctx'> 	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_state &amp;= ~I_SYNC_QUEUED;</div><div class='add'>+	inode_state_clear(inode, I_SYNC_QUEUED);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When the inode is being freed just don't bother with dirty list</div><div class='ctx'> 	 * tracking. Flush worker will ignore this inode anyway and it will</div><div class='ctx'> 	 * trigger assertions in inode_io_list_move_locked().</div><div class='ctx'> 	 */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_FREEING) {</div><div class='add'>+	if (inode_state_read(inode) &amp; I_FREEING) {</div><div class='ctx'> 		list_del_init(&amp;inode-&gt;i_io_list);</div><div class='ctx'> 		wb_io_lists_depopulated(wb);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1357,12 +1465,13 @@ static void requeue_io(struct inode *inode, struct bdi_writeback *wb)</div><div class='ctx'> </div><div class='ctx'> static void inode_sync_complete(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	inode-&gt;i_state &amp;= ~I_SYNC;</div><div class='add'>+	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='add'>+	inode_state_clear(inode, I_SYNC);</div><div class='ctx'> 	/* If inode is clean an unused, put it into LRU now... */</div><div class='del'>-	inode_add_lru(inode);</div><div class='del'>-	/* Waiters must see I_SYNC cleared before being woken up */</div><div class='del'>-	smp_mb();</div><div class='del'>-	wake_up_bit(&amp;inode-&gt;i_state, __I_SYNC);</div><div class='add'>+	inode_lru_list_add(inode);</div><div class='add'>+	/* Called with inode-&gt;i_lock which ensures memory ordering. */</div><div class='add'>+	inode_wake_up_bit(inode, __I_SYNC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool inode_dirtied_after(struct inode *inode, unsigned long t)</div><div class='hunk'>@@ -1402,7 +1511,7 @@ static int move_expired_inodes(struct list_head *delaying_queue,</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		list_move(&amp;inode-&gt;i_io_list, &amp;tmp);</div><div class='ctx'> 		moved++;</div><div class='del'>-		inode-&gt;i_state |= I_SYNC_QUEUED;</div><div class='add'>+		inode_state_set(inode, I_SYNC_QUEUED);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		if (sb_is_blkdev_sb(inode-&gt;i_sb))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1481,30 +1590,27 @@ static int write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'>  * Wait for writeback on an inode to complete. Called with i_lock held.</div><div class='ctx'>  * Caller must make sure inode cannot go away when we drop i_lock.</div><div class='ctx'>  */</div><div class='del'>-static void __inode_wait_for_writeback(struct inode *inode)</div><div class='del'>-	__releases(inode-&gt;i_lock)</div><div class='del'>-	__acquires(inode-&gt;i_lock)</div><div class='add'>+void inode_wait_for_writeback(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	DEFINE_WAIT_BIT(wq, &amp;inode-&gt;i_state, __I_SYNC);</div><div class='del'>-	wait_queue_head_t *wqh;</div><div class='add'>+	struct wait_bit_queue_entry wqe;</div><div class='add'>+	struct wait_queue_head *wq_head;</div><div class='add'>+</div><div class='add'>+	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='del'>-	wqh = bit_waitqueue(&amp;inode-&gt;i_state, __I_SYNC);</div><div class='del'>-	while (inode-&gt;i_state &amp; I_SYNC) {</div><div class='add'>+	if (!(inode_state_read(inode) &amp; I_SYNC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wq_head = inode_bit_waitqueue(&amp;wqe, inode, __I_SYNC);</div><div class='add'>+	for (;;) {</div><div class='add'>+		prepare_to_wait_event(wq_head, &amp;wqe.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		/* Checking I_SYNC with inode-&gt;i_lock guarantees memory ordering. */</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_SYNC))</div><div class='add'>+			break;</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-		__wait_on_bit(wqh, &amp;wq, bit_wait,</div><div class='del'>-			      TASK_UNINTERRUPTIBLE);</div><div class='add'>+		schedule();</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait for writeback on an inode to complete. Caller must have inode pinned.</div><div class='del'>- */</div><div class='del'>-void inode_wait_for_writeback(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	__inode_wait_for_writeback(inode);</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	finish_wait(wq_head, &amp;wqe.wq_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1515,16 +1621,20 @@ void inode_wait_for_writeback(struct inode *inode)</div><div class='ctx'> static void inode_sleep_on_writeback(struct inode *inode)</div><div class='ctx'> 	__releases(inode-&gt;i_lock)</div><div class='ctx'> {</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-	wait_queue_head_t *wqh = bit_waitqueue(&amp;inode-&gt;i_state, __I_SYNC);</div><div class='del'>-	int sleep;</div><div class='add'>+	struct wait_bit_queue_entry wqe;</div><div class='add'>+	struct wait_queue_head *wq_head;</div><div class='add'>+	bool sleep;</div><div class='add'>+</div><div class='add'>+	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='del'>-	prepare_to_wait(wqh, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='del'>-	sleep = inode-&gt;i_state &amp; I_SYNC;</div><div class='add'>+	wq_head = inode_bit_waitqueue(&amp;wqe, inode, __I_SYNC);</div><div class='add'>+	prepare_to_wait_event(wq_head, &amp;wqe.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+	/* Checking I_SYNC with inode-&gt;i_lock guarantees memory ordering. */</div><div class='add'>+	sleep = !!(inode_state_read(inode) &amp; I_SYNC);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (sleep)</div><div class='ctx'> 		schedule();</div><div class='del'>-	finish_wait(wqh, &amp;wait);</div><div class='add'>+	finish_wait(wq_head, &amp;wqe.wq_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1536,9 +1646,10 @@ static void inode_sleep_on_writeback(struct inode *inode)</div><div class='ctx'>  * thread's back can have unexpected consequences.</div><div class='ctx'>  */</div><div class='ctx'> static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,</div><div class='del'>-			  struct writeback_control *wbc)</div><div class='add'>+			  struct writeback_control *wbc,</div><div class='add'>+			  unsigned long dirtied_before)</div><div class='ctx'> {</div><div class='del'>-	if (inode-&gt;i_state &amp; I_FREEING)</div><div class='add'>+	if (inode_state_read(inode) &amp; I_FREEING)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1546,7 +1657,7 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,</div><div class='ctx'> 	 * shot. If still dirty, it will be redirty_tail()'ed below.  Update</div><div class='ctx'> 	 * the dirty time to prevent enqueue and sync it again.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((inode-&gt;i_state &amp; I_DIRTY) &amp;&amp;</div><div class='add'>+	if ((inode_state_read(inode) &amp; I_DIRTY) &amp;&amp;</div><div class='ctx'> 	    (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages))</div><div class='ctx'> 		inode-&gt;dirtied_when = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -1557,7 +1668,7 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,</div><div class='ctx'> 		 * is odd for clean inodes, it can happen for some</div><div class='ctx'> 		 * filesystems so handle that gracefully.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode-&gt;i_state &amp; I_DIRTY_ALL)</div><div class='add'>+		if (inode_state_read(inode) &amp; I_DIRTY_ALL)</div><div class='ctx'> 			redirty_tail_locked(inode, wb);</div><div class='ctx'> 		else</div><div class='ctx'> 			inode_cgwb_move_to_attached(inode, wb);</div><div class='hunk'>@@ -1569,7 +1680,8 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,</div><div class='ctx'> 		 * We didn't write back all the pages.  nfs_writepages()</div><div class='ctx'> 		 * sometimes bales out without doing anything.</div><div class='ctx'> 		 */</div><div class='del'>-		if (wbc-&gt;nr_to_write &lt;= 0) {</div><div class='add'>+		if (wbc-&gt;nr_to_write &lt;= 0 &amp;&amp;</div><div class='add'>+		    !inode_dirtied_after(inode, dirtied_before)) {</div><div class='ctx'> 			/* Slice used up. Queue for next turn. */</div><div class='ctx'> 			requeue_io(inode, wb);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1582,17 +1694,17 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,</div><div class='ctx'> 			 */</div><div class='ctx'> 			redirty_tail_locked(inode, wb);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (inode-&gt;i_state &amp; I_DIRTY) {</div><div class='add'>+	} else if (inode_state_read(inode) &amp; I_DIRTY) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Filesystems can dirty the inode during writeback operations,</div><div class='ctx'> 		 * such as delayed allocation during submission or metadata</div><div class='ctx'> 		 * updates after data IO completion.</div><div class='ctx'> 		 */</div><div class='ctx'> 		redirty_tail_locked(inode, wb);</div><div class='del'>-	} else if (inode-&gt;i_state &amp; I_DIRTY_TIME) {</div><div class='add'>+	} else if (inode_state_read(inode) &amp; I_DIRTY_TIME) {</div><div class='ctx'> 		inode-&gt;dirtied_when = jiffies;</div><div class='ctx'> 		inode_io_list_move_locked(inode, wb, &amp;wb-&gt;b_dirty_time);</div><div class='del'>-		inode-&gt;i_state &amp;= ~I_SYNC_QUEUED;</div><div class='add'>+		inode_state_clear(inode, I_SYNC_QUEUED);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* The inode is clean. Remove from writeback lists. */</div><div class='ctx'> 		inode_cgwb_move_to_attached(inode, wb);</div><div class='hunk'>@@ -1618,7 +1730,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	unsigned dirty;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!(inode-&gt;i_state &amp; I_SYNC));</div><div class='add'>+	WARN_ON(!(inode_state_read_once(inode) &amp; I_SYNC));</div><div class='ctx'> </div><div class='ctx'> 	trace_writeback_single_inode_start(inode, wbc, nr_to_write);</div><div class='ctx'> </div><div class='hunk'>@@ -1642,7 +1754,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	 * mark_inode_dirty_sync() to notify the filesystem about it and to</div><div class='ctx'> 	 * change I_DIRTY_TIME into I_DIRTY_SYNC.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((inode-&gt;i_state &amp; I_DIRTY_TIME) &amp;&amp;</div><div class='add'>+	if ((inode_state_read_once(inode) &amp; I_DIRTY_TIME) &amp;&amp;</div><div class='ctx'> 	    (wbc-&gt;sync_mode == WB_SYNC_ALL ||</div><div class='ctx'> 	     time_after(jiffies, inode-&gt;dirtied_time_when +</div><div class='ctx'> 			dirtytime_expire_interval * HZ))) {</div><div class='hunk'>@@ -1657,8 +1769,8 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	 * after handling timestamp expiration, as that may dirty the inode too.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	dirty = inode-&gt;i_state &amp; I_DIRTY;</div><div class='del'>-	inode-&gt;i_state &amp;= ~dirty;</div><div class='add'>+	dirty = inode_state_read(inode) &amp; I_DIRTY;</div><div class='add'>+	inode_state_clear(inode, dirty);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Paired with smp_mb() in __mark_inode_dirty().  This allows</div><div class='hunk'>@@ -1674,10 +1786,10 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='ctx'> 	if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY))</div><div class='del'>-		inode-&gt;i_state |= I_DIRTY_PAGES;</div><div class='del'>-	else if (unlikely(inode-&gt;i_state &amp; I_PINNING_NETFS_WB)) {</div><div class='del'>-		if (!(inode-&gt;i_state &amp; I_DIRTY_PAGES)) {</div><div class='del'>-			inode-&gt;i_state &amp;= ~I_PINNING_NETFS_WB;</div><div class='add'>+		inode_state_set(inode, I_DIRTY_PAGES);</div><div class='add'>+	else if (unlikely(inode_state_read(inode) &amp; I_PINNING_NETFS_WB)) {</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_DIRTY_PAGES)) {</div><div class='add'>+			inode_state_clear(inode, I_PINNING_NETFS_WB);</div><div class='ctx'> 			wbc-&gt;unpinned_netfs_wb = true;</div><div class='ctx'> 			dirty |= I_PINNING_NETFS_WB; /* Cause write_inode */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1712,12 +1824,12 @@ static int writeback_single_inode(struct inode *inode,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if (!atomic_read(&amp;inode-&gt;i_count))</div><div class='del'>-		WARN_ON(!(inode-&gt;i_state &amp; (I_WILL_FREE|I_FREEING)));</div><div class='add'>+	if (!icount_read(inode))</div><div class='add'>+		WARN_ON(!(inode_state_read(inode) &amp; (I_WILL_FREE | I_FREEING)));</div><div class='ctx'> 	else</div><div class='del'>-		WARN_ON(inode-&gt;i_state &amp; I_WILL_FREE);</div><div class='add'>+		WARN_ON(inode_state_read(inode) &amp; I_WILL_FREE);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_SYNC) {</div><div class='add'>+	if (inode_state_read(inode) &amp; I_SYNC) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Writeback is already running on the inode.  For WB_SYNC_NONE,</div><div class='ctx'> 		 * that's enough and we can just return.  For WB_SYNC_ALL, we</div><div class='hunk'>@@ -1726,9 +1838,9 @@ static int writeback_single_inode(struct inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (wbc-&gt;sync_mode != WB_SYNC_ALL)</div><div class='ctx'> 			goto out;</div><div class='del'>-		__inode_wait_for_writeback(inode);</div><div class='add'>+		inode_wait_for_writeback(inode);</div><div class='ctx'> 	}</div><div class='del'>-	WARN_ON(inode-&gt;i_state &amp; I_SYNC);</div><div class='add'>+	WARN_ON(inode_state_read(inode) &amp; I_SYNC);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the inode is already fully clean, then there's nothing to do.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1736,11 +1848,11 @@ static int writeback_single_inode(struct inode *inode,</div><div class='ctx'> 	 * still under writeback, e.g. due to prior WB_SYNC_NONE writeback.  If</div><div class='ctx'> 	 * there are any such pages, we'll need to wait for them.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_DIRTY_ALL) &amp;&amp;</div><div class='add'>+	if (!(inode_state_read(inode) &amp; I_DIRTY_ALL) &amp;&amp;</div><div class='ctx'> 	    (wbc-&gt;sync_mode != WB_SYNC_ALL ||</div><div class='ctx'> 	     !mapping_tagged(inode-&gt;i_mapping, PAGECACHE_TAG_WRITEBACK)))</div><div class='ctx'> 		goto out;</div><div class='del'>-	inode-&gt;i_state |= I_SYNC;</div><div class='add'>+	inode_state_set(inode, I_SYNC);</div><div class='ctx'> 	wbc_attach_and_unlock_inode(wbc, inode);</div><div class='ctx'> </div><div class='ctx'> 	ret = __writeback_single_inode(inode, wbc);</div><div class='hunk'>@@ -1753,18 +1865,18 @@ static int writeback_single_inode(struct inode *inode,</div><div class='ctx'> 	 * If the inode is freeing, its i_io_list shoudn't be updated</div><div class='ctx'> 	 * as it can be finally deleted at this moment.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_FREEING)) {</div><div class='add'>+	if (!(inode_state_read(inode) &amp; I_FREEING)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the inode is now fully clean, then it can be safely</div><div class='ctx'> 		 * removed from its writeback list (if any). Otherwise the</div><div class='ctx'> 		 * flusher threads are responsible for the writeback lists.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(inode-&gt;i_state &amp; I_DIRTY_ALL))</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_DIRTY_ALL))</div><div class='ctx'> 			inode_cgwb_move_to_attached(inode, wb);</div><div class='del'>-		else if (!(inode-&gt;i_state &amp; I_SYNC_QUEUED)) {</div><div class='del'>-			if ((inode-&gt;i_state &amp; I_DIRTY))</div><div class='add'>+		else if (!(inode_state_read(inode) &amp; I_SYNC_QUEUED)) {</div><div class='add'>+			if ((inode_state_read(inode) &amp; I_DIRTY))</div><div class='ctx'> 				redirty_tail_locked(inode, wb);</div><div class='del'>-			else if (inode-&gt;i_state &amp; I_DIRTY_TIME) {</div><div class='add'>+			else if (inode_state_read(inode) &amp; I_DIRTY_TIME) {</div><div class='ctx'> 				inode-&gt;dirtied_when = jiffies;</div><div class='ctx'> 				inode_io_list_move_locked(inode,</div><div class='ctx'> 							  wb,</div><div class='hunk'>@@ -1780,8 +1892,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long writeback_chunk_size(struct bdi_writeback *wb,</div><div class='del'>-				 struct wb_writeback_work *work)</div><div class='add'>+static long writeback_chunk_size(struct super_block *sb,</div><div class='add'>+		struct bdi_writeback *wb, struct wb_writeback_work *work)</div><div class='ctx'> {</div><div class='ctx'> 	long pages;</div><div class='ctx'> </div><div class='hunk'>@@ -1799,16 +1911,13 @@ static long writeback_chunk_size(struct bdi_writeback *wb,</div><div class='ctx'> 	 *                   (maybe slowly) sync all tagged pages</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (work-&gt;sync_mode == WB_SYNC_ALL || work-&gt;tagged_writepages)</div><div class='del'>-		pages = LONG_MAX;</div><div class='del'>-	else {</div><div class='del'>-		pages = min(wb-&gt;avg_write_bandwidth / 2,</div><div class='del'>-			    global_wb_domain.dirty_limit / DIRTY_SCOPE);</div><div class='del'>-		pages = min(pages, work-&gt;nr_pages);</div><div class='del'>-		pages = round_down(pages + MIN_WRITEBACK_PAGES,</div><div class='del'>-				   MIN_WRITEBACK_PAGES);</div><div class='del'>-	}</div><div class='add'>+		return LONG_MAX;</div><div class='ctx'> </div><div class='del'>-	return pages;</div><div class='add'>+	pages = min(wb-&gt;avg_write_bandwidth / 2,</div><div class='add'>+		    global_wb_domain.dirty_limit / DIRTY_SCOPE);</div><div class='add'>+	pages = min(pages, work-&gt;nr_pages);</div><div class='add'>+	return round_down(pages + sb-&gt;s_min_writeback_pages,</div><div class='add'>+			sb-&gt;s_min_writeback_pages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1837,6 +1946,11 @@ static long writeback_sb_inodes(struct super_block *sb,</div><div class='ctx'> 	unsigned long start_time = jiffies;</div><div class='ctx'> 	long write_chunk;</div><div class='ctx'> 	long total_wrote = 0;  /* count both pages and inodes */</div><div class='add'>+	unsigned long dirtied_before = jiffies;</div><div class='add'>+</div><div class='add'>+	if (work-&gt;for_kupdate)</div><div class='add'>+		dirtied_before = jiffies -</div><div class='add'>+			msecs_to_jiffies(dirty_expire_interval * 10);</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;wb-&gt;b_io)) {</div><div class='ctx'> 		struct inode *inode = wb_inode(wb-&gt;b_io.prev);</div><div class='hunk'>@@ -1868,12 +1982,12 @@ static long writeback_sb_inodes(struct super_block *sb,</div><div class='ctx'> 		 * kind writeout is handled by the freer.</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_NEW | I_FREEING | I_WILL_FREE)) {</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_NEW | I_FREEING | I_WILL_FREE)) {</div><div class='ctx'> 			redirty_tail_locked(inode, wb);</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if ((inode-&gt;i_state &amp; I_SYNC) &amp;&amp; wbc.sync_mode != WB_SYNC_ALL) {</div><div class='add'>+		if ((inode_state_read(inode) &amp; I_SYNC) &amp;&amp; wbc.sync_mode != WB_SYNC_ALL) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If this inode is locked for writeback and we are not</div><div class='ctx'> 			 * doing writeback-for-data-integrity, move it to</div><div class='hunk'>@@ -1895,17 +2009,17 @@ static long writeback_sb_inodes(struct super_block *sb,</div><div class='ctx'> 		 * are doing WB_SYNC_NONE writeback. So this catches only the</div><div class='ctx'> 		 * WB_SYNC_ALL case.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode-&gt;i_state &amp; I_SYNC) {</div><div class='add'>+		if (inode_state_read(inode) &amp; I_SYNC) {</div><div class='ctx'> 			/* Wait for I_SYNC. This function drops i_lock... */</div><div class='ctx'> 			inode_sleep_on_writeback(inode);</div><div class='ctx'> 			/* Inode may be gone, start again */</div><div class='ctx'> 			spin_lock(&amp;wb-&gt;list_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		inode-&gt;i_state |= I_SYNC;</div><div class='add'>+		inode_state_set(inode, I_SYNC);</div><div class='ctx'> 		wbc_attach_and_unlock_inode(&amp;wbc, inode);</div><div class='ctx'> </div><div class='del'>-		write_chunk = writeback_chunk_size(wb, work);</div><div class='add'>+		write_chunk = writeback_chunk_size(inode-&gt;i_sb, wb, work);</div><div class='ctx'> 		wbc.nr_to_write = write_chunk;</div><div class='ctx'> 		wbc.pages_skipped = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1915,6 +2029,12 @@ static long writeback_sb_inodes(struct super_block *sb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		__writeback_single_inode(inode, &amp;wbc);</div><div class='ctx'> </div><div class='add'>+		/* Report progress to inform the hung task detector of the progress. */</div><div class='add'>+		if (work-&gt;done &amp;&amp; work-&gt;done-&gt;progress_stamp &amp;&amp;</div><div class='add'>+		   (jiffies - work-&gt;done-&gt;progress_stamp) &gt; HZ *</div><div class='add'>+		   sysctl_hung_task_timeout_secs / 2)</div><div class='add'>+			wake_up_all(work-&gt;done-&gt;waitq);</div><div class='add'>+</div><div class='ctx'> 		wbc_detach_inode(&amp;wbc);</div><div class='ctx'> 		work-&gt;nr_pages -= write_chunk - wbc.nr_to_write;</div><div class='ctx'> 		wrote = write_chunk - wbc.nr_to_write - wbc.pages_skipped;</div><div class='hunk'>@@ -1940,9 +2060,9 @@ static long writeback_sb_inodes(struct super_block *sb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		tmp_wb = inode_to_wb_and_lock_list(inode);</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (!(inode-&gt;i_state &amp; I_DIRTY_ALL))</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_DIRTY_ALL))</div><div class='ctx'> 			total_wrote++;</div><div class='del'>-		requeue_inode(inode, tmp_wb, &amp;wbc);</div><div class='add'>+		requeue_inode(inode, tmp_wb, &amp;wbc, dirtied_before);</div><div class='ctx'> 		inode_sync_complete(inode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2044,6 +2164,7 @@ static long wb_writeback(struct bdi_writeback *wb,</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	long progress;</div><div class='ctx'> 	struct blk_plug plug;</div><div class='add'>+	bool queued = false;</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> 	for (;;) {</div><div class='hunk'>@@ -2073,21 +2194,24 @@ static long wb_writeback(struct bdi_writeback *wb,</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;wb-&gt;list_lock);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Kupdate and background works are special and we want to</div><div class='del'>-		 * include all inodes that need writing. Livelock avoidance is</div><div class='del'>-		 * handled by these works yielding to any other work so we are</div><div class='del'>-		 * safe.</div><div class='del'>-		 */</div><div class='del'>-		if (work-&gt;for_kupdate) {</div><div class='del'>-			dirtied_before = jiffies -</div><div class='del'>-				msecs_to_jiffies(dirty_expire_interval * 10);</div><div class='del'>-		} else if (work-&gt;for_background)</div><div class='del'>-			dirtied_before = jiffies;</div><div class='del'>-</div><div class='ctx'> 		trace_writeback_start(wb, work);</div><div class='del'>-		if (list_empty(&amp;wb-&gt;b_io))</div><div class='add'>+		if (list_empty(&amp;wb-&gt;b_io)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Kupdate and background works are special and we want</div><div class='add'>+			 * to include all inodes that need writing. Livelock</div><div class='add'>+			 * avoidance is handled by these works yielding to any</div><div class='add'>+			 * other work so we are safe.</div><div class='add'>+			 */</div><div class='add'>+			if (work-&gt;for_kupdate) {</div><div class='add'>+				dirtied_before = jiffies -</div><div class='add'>+					msecs_to_jiffies(dirty_expire_interval *</div><div class='add'>+							 10);</div><div class='add'>+			} else if (work-&gt;for_background)</div><div class='add'>+				dirtied_before = jiffies;</div><div class='add'>+</div><div class='ctx'> 			queue_io(wb, work, dirtied_before);</div><div class='add'>+			queued = true;</div><div class='add'>+		}</div><div class='ctx'> 		if (work-&gt;sb)</div><div class='ctx'> 			progress = writeback_sb_inodes(work-&gt;sb, wb, work);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2102,7 +2226,7 @@ static long wb_writeback(struct bdi_writeback *wb,</div><div class='ctx'> 		 * mean the overall work is done. So we keep looping as long</div><div class='ctx'> 		 * as made some progress on cleaning pages or inodes.</div><div class='ctx'> 		 */</div><div class='del'>-		if (progress) {</div><div class='add'>+		if (progress || !queued) {</div><div class='ctx'> 			spin_unlock(&amp;wb-&gt;list_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2237,7 +2361,7 @@ static long wb_do_writeback(struct bdi_writeback *wb)</div><div class='ctx'> 	while ((work = get_next_work_item(wb)) != NULL) {</div><div class='ctx'> 		trace_writeback_exec(wb, work);</div><div class='ctx'> 		wrote += wb_writeback(wb, work);</div><div class='del'>-		finish_writeback_work(wb, work);</div><div class='add'>+		finish_writeback_work(work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2297,8 +2421,7 @@ void wb_workfn(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Start writeback of `nr_pages' pages on this bdi. If `nr_pages' is zero,</div><div class='del'>- * write back the whole world.</div><div class='add'>+ * Start writeback of all dirty pages on this bdi.</div><div class='ctx'>  */</div><div class='ctx'> static void __wakeup_flusher_threads_bdi(struct backing_dev_info *bdi,</div><div class='ctx'> 					 enum wb_reason reason)</div><div class='hunk'>@@ -2372,24 +2495,36 @@ static void wakeup_dirtytime_writeback(struct work_struct *w)</div><div class='ctx'> 	schedule_delayed_work(&amp;dirtytime_work, dirtytime_expire_interval * HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init start_dirtytime_writeback(void)</div><div class='del'>-{</div><div class='del'>-	schedule_delayed_work(&amp;dirtytime_work, dirtytime_expire_interval * HZ);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-__initcall(start_dirtytime_writeback);</div><div class='del'>-</div><div class='del'>-int dirtytime_interval_handler(struct ctl_table *table, int write,</div><div class='add'>+static int dirtytime_interval_handler(const struct ctl_table *table, int write,</div><div class='ctx'> 			       void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> 	if (ret == 0 &amp;&amp; write)</div><div class='del'>-		mod_delayed_work(system_wq, &amp;dirtytime_work, 0);</div><div class='add'>+		mod_delayed_work(system_percpu_wq, &amp;dirtytime_work, 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct ctl_table vm_fs_writeback_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.procname	= "dirtytime_expire_seconds",</div><div class='add'>+		.data		= &amp;dirtytime_expire_interval,</div><div class='add'>+		.maxlen		= sizeof(dirtytime_expire_interval),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= dirtytime_interval_handler,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init start_dirtytime_writeback(void)</div><div class='add'>+{</div><div class='add'>+	schedule_delayed_work(&amp;dirtytime_work, dirtytime_expire_interval * HZ);</div><div class='add'>+	register_sysctl_init("vm", vm_fs_writeback_table);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+__initcall(start_dirtytime_writeback);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * __mark_inode_dirty -	internal function to mark an inode dirty</div><div class='ctx'>  *</div><div class='hunk'>@@ -2431,10 +2566,10 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 		 * We tell -&gt;dirty_inode callback that timestamps need to</div><div class='ctx'> 		 * be updated by setting I_DIRTY_TIME in flags.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode-&gt;i_state &amp; I_DIRTY_TIME) {</div><div class='add'>+		if (inode_state_read_once(inode) &amp; I_DIRTY_TIME) {</div><div class='ctx'> 			spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-			if (inode-&gt;i_state &amp; I_DIRTY_TIME) {</div><div class='del'>-				inode-&gt;i_state &amp;= ~I_DIRTY_TIME;</div><div class='add'>+			if (inode_state_read(inode) &amp; I_DIRTY_TIME) {</div><div class='add'>+				inode_state_clear(inode, I_DIRTY_TIME);</div><div class='ctx'> 				flags |= I_DIRTY_TIME;</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -2471,16 +2606,16 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='del'>-	if ((inode-&gt;i_state &amp; flags) == flags)</div><div class='add'>+	if ((inode_state_read_once(inode) &amp; flags) == flags)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if ((inode-&gt;i_state &amp; flags) != flags) {</div><div class='del'>-		const int was_dirty = inode-&gt;i_state &amp; I_DIRTY;</div><div class='add'>+	if ((inode_state_read(inode) &amp; flags) != flags) {</div><div class='add'>+		const int was_dirty = inode_state_read(inode) &amp; I_DIRTY;</div><div class='ctx'> </div><div class='ctx'> 		inode_attach_wb(inode, NULL);</div><div class='ctx'> </div><div class='del'>-		inode-&gt;i_state |= flags;</div><div class='add'>+		inode_state_set(inode, flags);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Grab inode's wb early because it requires dropping i_lock and we</div><div class='hunk'>@@ -2499,7 +2634,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 		 * the inode it will place it on the appropriate superblock</div><div class='ctx'> 		 * list, based upon its state.</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode-&gt;i_state &amp; I_SYNC_QUEUED)</div><div class='add'>+		if (inode_state_read(inode) &amp; I_SYNC_QUEUED)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2510,7 +2645,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 			if (inode_unhashed(inode))</div><div class='ctx'> 				goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		if (inode-&gt;i_state &amp; I_FREEING)</div><div class='add'>+		if (inode_state_read(inode) &amp; I_FREEING)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2525,7 +2660,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 			if (dirtytime)</div><div class='ctx'> 				inode-&gt;dirtied_time_when = jiffies;</div><div class='ctx'> </div><div class='del'>-			if (inode-&gt;i_state &amp; I_DIRTY)</div><div class='add'>+			if (inode_state_read(inode) &amp; I_DIRTY)</div><div class='ctx'> 				dirty_list = &amp;wb-&gt;b_dirty;</div><div class='ctx'> 			else</div><div class='ctx'> 				dirty_list = &amp;wb-&gt;b_dirty_time;</div><div class='hunk'>@@ -2533,10 +2668,6 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 			wakeup_bdi = inode_io_list_move_locked(inode, wb,</div><div class='ctx'> 							       dirty_list);</div><div class='ctx'> </div><div class='del'>-			spin_unlock(&amp;wb-&gt;list_lock);</div><div class='del'>-			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-			trace_writeback_dirty_inode_enqueue(inode);</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If this is the first dirty inode for this bdi,</div><div class='ctx'> 			 * we have to wake-up the corresponding bdi thread</div><div class='hunk'>@@ -2546,6 +2677,11 @@ void __mark_inode_dirty(struct inode *inode, int flags)</div><div class='ctx'> 			if (wakeup_bdi &amp;&amp;</div><div class='ctx'> 			    (wb-&gt;bdi-&gt;capabilities &amp; BDI_CAP_WRITEBACK))</div><div class='ctx'> 				wb_wakeup_delayed(wb);</div><div class='add'>+</div><div class='add'>+			spin_unlock(&amp;wb-&gt;list_lock);</div><div class='add'>+			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+			trace_writeback_dirty_inode_enqueue(inode);</div><div class='add'>+</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2621,7 +2757,7 @@ static void wait_sb_inodes(struct super_block *sb)</div><div class='ctx'> 		spin_unlock_irq(&amp;sb-&gt;s_inode_wblist_lock);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE|I_NEW)) {</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 			spin_lock_irq(&amp;sb-&gt;s_inode_wblist_lock);</div><div class='hunk'>@@ -2701,7 +2837,7 @@ EXPORT_SYMBOL(writeback_inodes_sb_nr);</div><div class='ctx'>  */</div><div class='ctx'> void writeback_inodes_sb(struct super_block *sb, enum wb_reason reason)</div><div class='ctx'> {</div><div class='del'>-	return writeback_inodes_sb_nr(sb, get_nr_dirty_pages(), reason);</div><div class='add'>+	writeback_inodes_sb_nr(sb, get_nr_dirty_pages(), reason);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(writeback_inodes_sb);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/fs_context.c b/fs/fs_context.c<br/>index 98589aae5208..93b7ebf8d927 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fs_context.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_context.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fs_context.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fs_context.c</a></div><div class='hunk'>@@ -161,25 +161,24 @@ int vfs_parse_fs_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> EXPORT_SYMBOL(vfs_parse_fs_param);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vfs_parse_fs_string - Convenience function to just parse a string.</div><div class='add'>+ * vfs_parse_fs_qstr - Convenience function to just parse a string.</div><div class='ctx'>  * @fc: Filesystem context.</div><div class='ctx'>  * @key: Parameter name.</div><div class='ctx'>  * @value: Default value.</div><div class='del'>- * @v_size: Maximum number of bytes in the value.</div><div class='ctx'>  */</div><div class='del'>-int vfs_parse_fs_string(struct fs_context *fc, const char *key,</div><div class='del'>-			const char *value, size_t v_size)</div><div class='add'>+int vfs_parse_fs_qstr(struct fs_context *fc, const char *key,</div><div class='add'>+			const struct qstr *value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	struct fs_parameter param = {</div><div class='ctx'> 		.key	= key,</div><div class='ctx'> 		.type	= fs_value_is_flag,</div><div class='del'>-		.size	= v_size,</div><div class='add'>+		.size	= value ? value-&gt;len : 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (value) {</div><div class='del'>-		param.string = kmemdup_nul(value, v_size, GFP_KERNEL);</div><div class='add'>+		param.string = kmemdup_nul(value-&gt;name, value-&gt;len, GFP_KERNEL);</div><div class='ctx'> 		if (!param.string)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		param.type = fs_value_is_string;</div><div class='hunk'>@@ -189,7 +188,7 @@ int vfs_parse_fs_string(struct fs_context *fc, const char *key,</div><div class='ctx'> 	kfree(param.string);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(vfs_parse_fs_string);</div><div class='add'>+EXPORT_SYMBOL(vfs_parse_fs_qstr);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vfs_parse_monolithic_sep - Parse key[=val][,key[=val]]* mount data</div><div class='hunk'>@@ -218,16 +217,14 @@ int vfs_parse_monolithic_sep(struct fs_context *fc, void *data,</div><div class='ctx'> </div><div class='ctx'> 	while ((key = sep(&amp;options)) != NULL) {</div><div class='ctx'> 		if (*key) {</div><div class='del'>-			size_t v_len = 0;</div><div class='ctx'> 			char *value = strchr(key, '=');</div><div class='ctx'> </div><div class='ctx'> 			if (value) {</div><div class='del'>-				if (value == key)</div><div class='add'>+				if (unlikely(value == key))</div><div class='ctx'> 					continue;</div><div class='ctx'> 				*value++ = 0;</div><div class='del'>-				v_len = strlen(value);</div><div class='ctx'> 			}</div><div class='del'>-			ret = vfs_parse_fs_string(fc, key, value, v_len);</div><div class='add'>+			ret = vfs_parse_fs_string(fc, key, value);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -449,6 +446,10 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt,</div><div class='ctx'> 			printk(KERN_ERR "%s%s%pV\n", prefix ? prefix : "",</div><div class='ctx'> 						prefix ? ": " : "", &amp;vaf);</div><div class='ctx'> 			break;</div><div class='add'>+		case 'i':</div><div class='add'>+			printk(KERN_INFO "%s%s%pV\n", prefix ? prefix : "",</div><div class='add'>+						prefix ? ": " : "", &amp;vaf);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_NOTICE "%s%s%pV\n", prefix ? prefix : "",</div><div class='ctx'> 						prefix ? ": " : "", &amp;vaf);</div><div class='hunk'>@@ -493,7 +494,7 @@ static void put_fc_log(struct fs_context *fc)</div><div class='ctx'> 	if (log) {</div><div class='ctx'> 		if (refcount_dec_and_test(&amp;log-&gt;usage)) {</div><div class='ctx'> 			fc-&gt;log.log = NULL;</div><div class='del'>-			for (i = 0; i &lt;= 7; i++)</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(log-&gt;buffer) ; i++)</div><div class='ctx'> 				if (log-&gt;need_free &amp; (1 &lt;&lt; i))</div><div class='ctx'> 					kfree(log-&gt;buffer[i]);</div><div class='ctx'> 			kfree(log);</div><div class='head'>diff --git a/fs/fs_types.c b/fs/fs_dirent.c<br/>index 78365e5dc08c..e5e08f213816 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fs_types.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_types.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fs_dirent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fs_dirent.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_dirent.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/fs_parser.c b/fs/fs_parser.c<br/>index edb3712dcfa5..c092a9f79e32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fs_parser.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_parser.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fs_parser.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fs_parser.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-static const struct constant_table bool_names[] = {</div><div class='add'>+const struct constant_table bool_names[] = {</div><div class='ctx'> 	{ "0",		false },</div><div class='ctx'> 	{ "1",		true },</div><div class='ctx'> 	{ "false",	false },</div><div class='hunk'>@@ -22,6 +22,7 @@ static const struct constant_table bool_names[] = {</div><div class='ctx'> 	{ "yes",	true },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL(bool_names);</div><div class='ctx'> </div><div class='ctx'> static const struct constant_table *</div><div class='ctx'> __lookup_constant(const struct constant_table *tbl, const char *name)</div><div class='hunk'>@@ -83,8 +84,8 @@ static const struct fs_parameter_spec *fs_lookup_key(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * fs_parse - Parse a filesystem configuration parameter</div><div class='del'>- * @fc: The filesystem context to log errors through.</div><div class='add'>+ * __fs_parse - Parse a filesystem configuration parameter</div><div class='add'>+ * @log: The filesystem context to log errors through.</div><div class='ctx'>  * @desc: The parameter description to use.</div><div class='ctx'>  * @param: The parameter.</div><div class='ctx'>  * @result: Where to place the result of the parse</div><div class='hunk'>@@ -156,6 +157,7 @@ int fs_lookup_param(struct fs_context *fc,</div><div class='ctx'> 		f = getname_kernel(param-&gt;string);</div><div class='ctx'> 		if (IS_ERR(f))</div><div class='ctx'> 			return PTR_ERR(f);</div><div class='add'>+		param-&gt;dirfd = AT_FDCWD;</div><div class='ctx'> 		put_f = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case fs_value_is_filename:</div><div class='hunk'>@@ -308,74 +310,79 @@ int fs_param_is_fd(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fs_param_is_fd);</div><div class='ctx'> </div><div class='del'>-int fs_param_is_blockdev(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='del'>-		  struct fs_parameter *param, struct fs_parse_result *result)</div><div class='add'>+int fs_param_is_file_or_string(struct p_log *log,</div><div class='add'>+			       const struct fs_parameter_spec *p,</div><div class='add'>+			       struct fs_parameter *param,</div><div class='add'>+			       struct fs_parse_result *result)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	switch (param-&gt;type) {</div><div class='add'>+	case fs_value_is_string:</div><div class='add'>+		return fs_param_is_string(log, p, param, result);</div><div class='add'>+	case fs_value_is_file:</div><div class='add'>+		result-&gt;uint_32 = param-&gt;dirfd;</div><div class='add'>+		if (result-&gt;uint_32 &lt;= INT_MAX)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return fs_param_bad_value(log, param);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(fs_param_is_blockdev);</div><div class='add'>+EXPORT_SYMBOL(fs_param_is_file_or_string);</div><div class='ctx'> </div><div class='del'>-int fs_param_is_path(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='del'>-		     struct fs_parameter *param, struct fs_parse_result *result)</div><div class='add'>+int fs_param_is_uid(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='add'>+		    struct fs_parameter *param, struct fs_parse_result *result)</div><div class='ctx'> {</div><div class='add'>+	kuid_t uid;</div><div class='add'>+</div><div class='add'>+	if (fs_param_is_u32(log, p, param, result) != 0)</div><div class='add'>+		return fs_param_bad_value(log, param);</div><div class='add'>+</div><div class='add'>+	uid = make_kuid(current_user_ns(), result-&gt;uint_32);</div><div class='add'>+	if (!uid_valid(uid))</div><div class='add'>+		return inval_plog(log, "Invalid uid '%s'", param-&gt;string);</div><div class='add'>+</div><div class='add'>+	result-&gt;uid = uid;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(fs_param_is_path);</div><div class='add'>+EXPORT_SYMBOL(fs_param_is_uid);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VALIDATE_FS_PARSER</div><div class='del'>-/**</div><div class='del'>- * validate_constant_table - Validate a constant table</div><div class='del'>- * @tbl: The constant table to validate.</div><div class='del'>- * @tbl_size: The size of the table.</div><div class='del'>- * @low: The lowest permissible value.</div><div class='del'>- * @high: The highest permissible value.</div><div class='del'>- * @special: One special permissible value outside of the range.</div><div class='del'>- */</div><div class='del'>-bool validate_constant_table(const struct constant_table *tbl, size_t tbl_size,</div><div class='del'>-			     int low, int high, int special)</div><div class='add'>+int fs_param_is_gid(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='add'>+		    struct fs_parameter *param, struct fs_parse_result *result)</div><div class='ctx'> {</div><div class='del'>-	size_t i;</div><div class='del'>-	bool good = true;</div><div class='add'>+	kgid_t gid;</div><div class='ctx'> </div><div class='del'>-	if (tbl_size == 0) {</div><div class='del'>-		pr_warn("VALIDATE C-TBL: Empty\n");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='add'>+	if (fs_param_is_u32(log, p, param, result) != 0)</div><div class='add'>+		return fs_param_bad_value(log, param);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; tbl_size; i++) {</div><div class='del'>-		if (!tbl[i].name) {</div><div class='del'>-			pr_err("VALIDATE C-TBL[%zu]: Null\n", i);</div><div class='del'>-			good = false;</div><div class='del'>-		} else if (i &gt; 0 &amp;&amp; tbl[i - 1].name) {</div><div class='del'>-			int c = strcmp(tbl[i-1].name, tbl[i].name);</div><div class='add'>+	gid = make_kgid(current_user_ns(), result-&gt;uint_32);</div><div class='add'>+	if (!gid_valid(gid))</div><div class='add'>+		return inval_plog(log, "Invalid gid '%s'", param-&gt;string);</div><div class='ctx'> </div><div class='del'>-			if (c == 0) {</div><div class='del'>-				pr_err("VALIDATE C-TBL[%zu]: Duplicate %s\n",</div><div class='del'>-				       i, tbl[i].name);</div><div class='del'>-				good = false;</div><div class='del'>-			}</div><div class='del'>-			if (c &gt; 0) {</div><div class='del'>-				pr_err("VALIDATE C-TBL[%zu]: Missorted %s&gt;=%s\n",</div><div class='del'>-				       i, tbl[i-1].name, tbl[i].name);</div><div class='del'>-				good = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	result-&gt;gid = gid;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fs_param_is_gid);</div><div class='ctx'> </div><div class='del'>-		if (tbl[i].value != special &amp;&amp;</div><div class='del'>-		    (tbl[i].value &lt; low || tbl[i].value &gt; high)) {</div><div class='del'>-			pr_err("VALIDATE C-TBL[%zu]: %s-&gt;%d const out of range (%d-%d)\n",</div><div class='del'>-			       i, tbl[i].name, tbl[i].value, low, high);</div><div class='del'>-			good = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+int fs_param_is_blockdev(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='add'>+		  struct fs_parameter *param, struct fs_parse_result *result)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fs_param_is_blockdev);</div><div class='ctx'> </div><div class='del'>-	return good;</div><div class='add'>+int fs_param_is_path(struct p_log *log, const struct fs_parameter_spec *p,</div><div class='add'>+		     struct fs_parameter *param, struct fs_parse_result *result)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(fs_param_is_path);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_VALIDATE_FS_PARSER</div><div class='ctx'> /**</div><div class='del'>- * fs_validate_description - Validate a parameter description</div><div class='del'>- * @name: The parameter name to search for.</div><div class='del'>- * @desc: The parameter description to validate.</div><div class='add'>+ * fs_validate_description - Validate a parameter specification array</div><div class='add'>+ * @name: Owner name of the parameter specification array</div><div class='add'>+ * @desc: The parameter specification array to validate.</div><div class='ctx'>  */</div><div class='ctx'> bool fs_validate_description(const char *name,</div><div class='ctx'> 	const struct fs_parameter_spec *desc)</div><div class='head'>diff --git a/fs/fs_struct.c b/fs/fs_struct.c<br/>index 64c2d0814ed6..b8c46c5a38a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fs_struct.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fs_struct.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fs_struct.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fs_struct.c</a></div><div class='hunk'>@@ -17,12 +17,10 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)</div><div class='ctx'> 	struct path old_root;</div><div class='ctx'> </div><div class='ctx'> 	path_get(path);</div><div class='del'>-	spin_lock(&amp;fs-&gt;lock);</div><div class='del'>-	write_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+	write_seqlock(&amp;fs-&gt;seq);</div><div class='ctx'> 	old_root = fs-&gt;root;</div><div class='ctx'> 	fs-&gt;root = *path;</div><div class='del'>-	write_seqcount_end(&amp;fs-&gt;seq);</div><div class='del'>-	spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+	write_sequnlock(&amp;fs-&gt;seq);</div><div class='ctx'> 	if (old_root.dentry)</div><div class='ctx'> 		path_put(&amp;old_root);</div><div class='ctx'> }</div><div class='hunk'>@@ -36,12 +34,10 @@ void set_fs_pwd(struct fs_struct *fs, const struct path *path)</div><div class='ctx'> 	struct path old_pwd;</div><div class='ctx'> </div><div class='ctx'> 	path_get(path);</div><div class='del'>-	spin_lock(&amp;fs-&gt;lock);</div><div class='del'>-	write_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+	write_seqlock(&amp;fs-&gt;seq);</div><div class='ctx'> 	old_pwd = fs-&gt;pwd;</div><div class='ctx'> 	fs-&gt;pwd = *path;</div><div class='del'>-	write_seqcount_end(&amp;fs-&gt;seq);</div><div class='del'>-	spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+	write_sequnlock(&amp;fs-&gt;seq);</div><div class='ctx'> </div><div class='ctx'> 	if (old_pwd.dentry)</div><div class='ctx'> 		path_put(&amp;old_pwd);</div><div class='hunk'>@@ -67,16 +63,14 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)</div><div class='ctx'> 		fs = p-&gt;fs;</div><div class='ctx'> 		if (fs) {</div><div class='ctx'> 			int hits = 0;</div><div class='del'>-			spin_lock(&amp;fs-&gt;lock);</div><div class='del'>-			write_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+			write_seqlock(&amp;fs-&gt;seq);</div><div class='ctx'> 			hits += replace_path(&amp;fs-&gt;root, old_root, new_root);</div><div class='ctx'> 			hits += replace_path(&amp;fs-&gt;pwd, old_root, new_root);</div><div class='del'>-			write_seqcount_end(&amp;fs-&gt;seq);</div><div class='ctx'> 			while (hits--) {</div><div class='ctx'> 				count++;</div><div class='ctx'> 				path_get(new_root);</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+			write_sequnlock(&amp;fs-&gt;seq);</div><div class='ctx'> 		}</div><div class='ctx'> 		task_unlock(p);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -99,10 +93,10 @@ void exit_fs(struct task_struct *tsk)</div><div class='ctx'> 	if (fs) {</div><div class='ctx'> 		int kill;</div><div class='ctx'> 		task_lock(tsk);</div><div class='del'>-		spin_lock(&amp;fs-&gt;lock);</div><div class='add'>+		read_seqlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> 		tsk-&gt;fs = NULL;</div><div class='ctx'> 		kill = !--fs-&gt;users;</div><div class='del'>-		spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+		read_sequnlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> 		task_unlock(tsk);</div><div class='ctx'> 		if (kill)</div><div class='ctx'> 			free_fs_struct(fs);</div><div class='hunk'>@@ -116,16 +110,15 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)</div><div class='ctx'> 	if (fs) {</div><div class='ctx'> 		fs-&gt;users = 1;</div><div class='ctx'> 		fs-&gt;in_exec = 0;</div><div class='del'>-		spin_lock_init(&amp;fs-&gt;lock);</div><div class='del'>-		seqcount_spinlock_init(&amp;fs-&gt;seq, &amp;fs-&gt;lock);</div><div class='add'>+		seqlock_init(&amp;fs-&gt;seq);</div><div class='ctx'> 		fs-&gt;umask = old-&gt;umask;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;old-&gt;lock);</div><div class='add'>+		read_seqlock_excl(&amp;old-&gt;seq);</div><div class='ctx'> 		fs-&gt;root = old-&gt;root;</div><div class='ctx'> 		path_get(&amp;fs-&gt;root);</div><div class='ctx'> 		fs-&gt;pwd = old-&gt;pwd;</div><div class='ctx'> 		path_get(&amp;fs-&gt;pwd);</div><div class='del'>-		spin_unlock(&amp;old-&gt;lock);</div><div class='add'>+		read_sequnlock_excl(&amp;old-&gt;seq);</div><div class='ctx'> 	}</div><div class='ctx'> 	return fs;</div><div class='ctx'> }</div><div class='hunk'>@@ -140,10 +133,10 @@ int unshare_fs_struct(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	task_lock(current);</div><div class='del'>-	spin_lock(&amp;fs-&gt;lock);</div><div class='add'>+	read_seqlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> 	kill = !--fs-&gt;users;</div><div class='ctx'> 	current-&gt;fs = new_fs;</div><div class='del'>-	spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+	read_sequnlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> 	task_unlock(current);</div><div class='ctx'> </div><div class='ctx'> 	if (kill)</div><div class='hunk'>@@ -153,16 +146,9 @@ int unshare_fs_struct(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(unshare_fs_struct);</div><div class='ctx'> </div><div class='del'>-int current_umask(void)</div><div class='del'>-{</div><div class='del'>-	return current-&gt;fs-&gt;umask;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(current_umask);</div><div class='del'>-</div><div class='ctx'> /* to be mentioned only in INIT_TASK */</div><div class='ctx'> struct fs_struct init_fs = {</div><div class='ctx'> 	.users		= 1,</div><div class='del'>-	.lock		= __SPIN_LOCK_UNLOCKED(init_fs.lock),</div><div class='del'>-	.seq		= SEQCNT_SPINLOCK_ZERO(init_fs.seq, &amp;init_fs.lock),</div><div class='add'>+	.seq		= __SEQLOCK_UNLOCKED(init_fs.seq),</div><div class='ctx'> 	.umask		= 0022,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/fsopen.c b/fs/fsopen.c<br/>index 6593ae518115..f645c99204eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fsopen.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fsopen.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fsopen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fsopen.c</a></div><div class='hunk'>@@ -18,50 +18,56 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "mount.h"</div><div class='ctx'> </div><div class='add'>+static inline const char *fetch_message_locked(struct fc_log *log, size_t len,</div><div class='add'>+					       bool *need_free)</div><div class='add'>+{</div><div class='add'>+	const char *p;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (unlikely(log-&gt;head == log-&gt;tail))</div><div class='add'>+		return ERR_PTR(-ENODATA);</div><div class='add'>+</div><div class='add'>+	index = log-&gt;tail &amp; (ARRAY_SIZE(log-&gt;buffer) - 1);</div><div class='add'>+	p = log-&gt;buffer[index];</div><div class='add'>+	if (unlikely(strlen(p) &gt; len))</div><div class='add'>+		return ERR_PTR(-EMSGSIZE);</div><div class='add'>+</div><div class='add'>+	log-&gt;buffer[index] = NULL;</div><div class='add'>+	*need_free = log-&gt;need_free &amp; (1 &lt;&lt; index);</div><div class='add'>+	log-&gt;need_free &amp;= ~(1 &lt;&lt; index);</div><div class='add'>+	log-&gt;tail++;</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allow the user to read back any error, warning or informational messages.</div><div class='add'>+ * Only one message is returned for each read(2) call.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t fscontext_read(struct file *file,</div><div class='ctx'> 			      char __user *_buf, size_t len, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs_context *fc = file-&gt;private_data;</div><div class='del'>-	struct fc_log *log = fc-&gt;log.log;</div><div class='del'>-	unsigned int logsize = ARRAY_SIZE(log-&gt;buffer);</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	char *p;</div><div class='add'>+	ssize_t err;</div><div class='add'>+	const char *p __free(kfree) = NULL, *message;</div><div class='ctx'> 	bool need_free;</div><div class='del'>-	int index, n;</div><div class='del'>-</div><div class='del'>-	ret = mutex_lock_interruptible(&amp;fc-&gt;uapi_mutex);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	int n;</div><div class='ctx'> </div><div class='del'>-	if (log-&gt;head == log-&gt;tail) {</div><div class='del'>-		mutex_unlock(&amp;fc-&gt;uapi_mutex);</div><div class='del'>-		return -ENODATA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	index = log-&gt;tail &amp; (logsize - 1);</div><div class='del'>-	p = log-&gt;buffer[index];</div><div class='del'>-	need_free = log-&gt;need_free &amp; (1 &lt;&lt; index);</div><div class='del'>-	log-&gt;buffer[index] = NULL;</div><div class='del'>-	log-&gt;need_free &amp;= ~(1 &lt;&lt; index);</div><div class='del'>-	log-&gt;tail++;</div><div class='add'>+	err = mutex_lock_interruptible(&amp;fc-&gt;uapi_mutex);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	message = fetch_message_locked(fc-&gt;log.log, len, &amp;need_free);</div><div class='ctx'> 	mutex_unlock(&amp;fc-&gt;uapi_mutex);</div><div class='add'>+	if (IS_ERR(message))</div><div class='add'>+		return PTR_ERR(message);</div><div class='ctx'> </div><div class='del'>-	ret = -EMSGSIZE;</div><div class='del'>-	n = strlen(p);</div><div class='del'>-	if (n &gt; len)</div><div class='del'>-		goto err_free;</div><div class='del'>-	ret = -EFAULT;</div><div class='del'>-	if (copy_to_user(_buf, p, n) != 0)</div><div class='del'>-		goto err_free;</div><div class='del'>-	ret = n;</div><div class='del'>-</div><div class='del'>-err_free:</div><div class='ctx'> 	if (need_free)</div><div class='del'>-		kfree(p);</div><div class='del'>-	return ret;</div><div class='add'>+		p = message;</div><div class='add'>+</div><div class='add'>+	n = strlen(message);</div><div class='add'>+	if (copy_to_user(_buf, message, n))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fscontext_release(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -78,7 +84,6 @@ static int fscontext_release(struct inode *inode, struct file *file)</div><div class='ctx'> const struct file_operations fscontext_fops = {</div><div class='ctx'> 	.read		= fscontext_read,</div><div class='ctx'> 	.release	= fscontext_release,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -220,10 +225,6 @@ static int vfs_cmd_create(struct fs_context *fc, bool exclusive)</div><div class='ctx'> 	if (!mount_capable(fc))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	/* require the new mount api */</div><div class='del'>-	if (exclusive &amp;&amp; fc-&gt;ops == &amp;legacy_fs_context_ops)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	fc-&gt;phase = FS_CONTEXT_CREATING;</div><div class='ctx'> 	fc-&gt;exclusive = exclusive;</div><div class='ctx'> </div><div class='hunk'>@@ -354,7 +355,6 @@ SYSCALL_DEFINE5(fsconfig,</div><div class='ctx'> 		int, aux)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs_context *fc;</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int lookup_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -397,31 +397,28 @@ SYSCALL_DEFINE5(fsconfig,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-	if (f.file-&gt;f_op != &amp;fscontext_fops)</div><div class='del'>-		goto out_f;</div><div class='add'>+	if (fd_file(f)-&gt;f_op != &amp;fscontext_fops)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	fc = f.file-&gt;private_data;</div><div class='add'>+	fc = fd_file(f)-&gt;private_data;</div><div class='ctx'> 	if (fc-&gt;ops == &amp;legacy_fs_context_ops) {</div><div class='ctx'> 		switch (cmd) {</div><div class='ctx'> 		case FSCONFIG_SET_BINARY:</div><div class='ctx'> 		case FSCONFIG_SET_PATH:</div><div class='ctx'> 		case FSCONFIG_SET_PATH_EMPTY:</div><div class='ctx'> 		case FSCONFIG_SET_FD:</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-			goto out_f;</div><div class='add'>+		case FSCONFIG_CMD_CREATE_EXCL:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (_key) {</div><div class='ctx'> 		param.key = strndup_user(_key, 256);</div><div class='del'>-		if (IS_ERR(param.key)) {</div><div class='del'>-			ret = PTR_ERR(param.key);</div><div class='del'>-			goto out_f;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(param.key))</div><div class='add'>+			return PTR_ERR(param.key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -451,7 +448,7 @@ SYSCALL_DEFINE5(fsconfig,</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case FSCONFIG_SET_PATH:</div><div class='ctx'> 		param.type = fs_value_is_filename;</div><div class='del'>-		param.name = getname_flags(_value, lookup_flags, NULL);</div><div class='add'>+		param.name = getname_flags(_value, lookup_flags);</div><div class='ctx'> 		if (IS_ERR(param.name)) {</div><div class='ctx'> 			ret = PTR_ERR(param.name);</div><div class='ctx'> 			goto out_key;</div><div class='hunk'>@@ -462,7 +459,7 @@ SYSCALL_DEFINE5(fsconfig,</div><div class='ctx'> 	case FSCONFIG_SET_FD:</div><div class='ctx'> 		param.type = fs_value_is_file;</div><div class='ctx'> 		ret = -EBADF;</div><div class='del'>-		param.file = fget(aux);</div><div class='add'>+		param.file = fget_raw(aux);</div><div class='ctx'> 		if (!param.file)</div><div class='ctx'> 			goto out_key;</div><div class='ctx'> 		param.dirfd = aux;</div><div class='hunk'>@@ -500,7 +497,5 @@ SYSCALL_DEFINE5(fsconfig,</div><div class='ctx'> 	}</div><div class='ctx'> out_key:</div><div class='ctx'> 	kfree(param.key);</div><div class='del'>-out_f:</div><div class='del'>-	fdput(f);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig<br/>index 038ed0b9aaa5..3a4ae632c94a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> config FUSE_FS</div><div class='ctx'> 	tristate "FUSE (Filesystem in Userspace) support"</div><div class='ctx'> 	select FS_POSIX_ACL</div><div class='add'>+	select FS_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  With FUSE it is possible to implement a fully functional filesystem</div><div class='ctx'> 	  in a userspace program.</div><div class='hunk'>@@ -12,7 +13,7 @@ config FUSE_FS</div><div class='ctx'> 	  although chances are your distribution already has that library</div><div class='ctx'> 	  installed if you've installed the "fuse" package itself.</div><div class='ctx'> </div><div class='del'>-	  See &lt;file:Documentation/filesystems/fuse.rst&gt; for more information.</div><div class='add'>+	  See &lt;file:Documentation/filesystems/fuse/fuse.rst&gt; for more information.</div><div class='ctx'> 	  See &lt;file:Documentation/Changes&gt; for needed library/utility version.</div><div class='ctx'> </div><div class='ctx'> 	  If you want to develop a userspace FS, or if you want to use</div><div class='hunk'>@@ -52,3 +53,26 @@ config FUSE_DAX</div><div class='ctx'> </div><div class='ctx'> 	  If you want to allow mounting a Virtio Filesystem with the "dax"</div><div class='ctx'> 	  option, answer Y.</div><div class='add'>+</div><div class='add'>+config FUSE_PASSTHROUGH</div><div class='add'>+	bool "FUSE passthrough operations support"</div><div class='add'>+	default y</div><div class='add'>+	depends on FUSE_FS</div><div class='add'>+	select FS_STACK</div><div class='add'>+	help</div><div class='add'>+	  This allows bypassing FUSE server by mapping specific FUSE operations</div><div class='add'>+	  to be performed directly on a backing file.</div><div class='add'>+</div><div class='add'>+	  If you want to allow passthrough operations, answer Y.</div><div class='add'>+</div><div class='add'>+config FUSE_IO_URING</div><div class='add'>+	bool "FUSE communication over io-uring"</div><div class='add'>+	default y</div><div class='add'>+	depends on FUSE_FS</div><div class='add'>+	depends on IO_URING</div><div class='add'>+	help</div><div class='add'>+	  This allows sending FUSE requests over the io-uring interface and</div><div class='add'>+          also adds request core affinity.</div><div class='add'>+</div><div class='add'>+	  If you want to allow fuse server/client communication through io-uring,</div><div class='add'>+	  answer Y</div><div class='head'>diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile<br/>index 0c48b35c058d..22ad9538dfc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/Makefile</a></div><div class='hunk'>@@ -3,11 +3,19 @@</div><div class='ctx'> # Makefile for the FUSE filesystem.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+# Needed for trace events</div><div class='add'>+ccflags-y = -I$(src)</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_FUSE_FS) += fuse.o</div><div class='ctx'> obj-$(CONFIG_CUSE) += cuse.o</div><div class='ctx'> obj-$(CONFIG_VIRTIO_FS) += virtiofs.o</div><div class='ctx'> </div><div class='del'>-fuse-y := dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o ioctl.o</div><div class='add'>+fuse-y := trace.o	# put trace.o first so we see ftrace errors sooner</div><div class='add'>+fuse-y += dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o ioctl.o</div><div class='add'>+fuse-y += iomode.o</div><div class='ctx'> fuse-$(CONFIG_FUSE_DAX) += dax.o</div><div class='add'>+fuse-$(CONFIG_FUSE_PASSTHROUGH) += passthrough.o backing.o</div><div class='add'>+fuse-$(CONFIG_SYSCTL) += sysctl.o</div><div class='add'>+fuse-$(CONFIG_FUSE_IO_URING) += dev_uring.o</div><div class='ctx'> </div><div class='ctx'> virtiofs-y := virtio_fs.o</div><div class='head'>diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c<br/>index 3d192b80a561..8f484b105f13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/acl.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/posix_acl_xattr.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct posix_acl *__fuse_get_acl(struct fuse_conn *fc,</div><div class='del'>-					struct mnt_idmap *idmap,</div><div class='ctx'> 					struct inode *inode, int type, bool rcu)</div><div class='ctx'> {</div><div class='ctx'> 	int size;</div><div class='hunk'>@@ -74,7 +73,7 @@ struct posix_acl *fuse_get_acl(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (fuse_no_acl(fc, inode))</div><div class='ctx'> 		return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> </div><div class='del'>-	return __fuse_get_acl(fc, idmap, inode, type, false);</div><div class='add'>+	return __fuse_get_acl(fc, inode, type, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool rcu)</div><div class='hunk'>@@ -90,8 +89,7 @@ struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool rcu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!fc-&gt;posix_acl)</div><div class='ctx'> 		return NULL;</div><div class='del'>-</div><div class='del'>-	return __fuse_get_acl(fc, &amp;nop_mnt_idmap, inode, type, rcu);</div><div class='add'>+	return __fuse_get_acl(fc,  inode, type, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='hunk'>@@ -146,8 +144,8 @@ int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		 * be stripped.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (fc-&gt;posix_acl &amp;&amp;</div><div class='del'>-		    !vfsgid_in_group_p(i_gid_into_vfsgid(&amp;nop_mnt_idmap, inode)) &amp;&amp;</div><div class='del'>-		    !capable_wrt_inode_uidgid(&amp;nop_mnt_idmap, inode, CAP_FSETID))</div><div class='add'>+		    !in_group_or_capable(idmap, inode,</div><div class='add'>+					 i_gid_into_vfsgid(idmap, inode)))</div><div class='ctx'> 			extra_flags |= FUSE_SETXATTR_ACL_KILL_SGID;</div><div class='ctx'> </div><div class='ctx'> 		ret = fuse_setxattr(inode, name, value, size, 0, extra_flags);</div><div class='head'>diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c<br/>new file mode 100644<br/>index 000000000000..4afda419dd14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/backing.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/backing.c</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * FUSE passthrough to backing file.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 CTERA Networks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+</div><div class='add'>+struct fuse_backing *fuse_backing_get(struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	if (fb &amp;&amp; refcount_inc_not_zero(&amp;fb-&gt;count))</div><div class='add'>+		return fb;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_backing_free(struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	pr_debug("%s: fb=0x%p\n", __func__, fb);</div><div class='add'>+</div><div class='add'>+	if (fb-&gt;file)</div><div class='add'>+		fput(fb-&gt;file);</div><div class='add'>+	put_cred(fb-&gt;cred);</div><div class='add'>+	kfree_rcu(fb, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_backing_put(struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	if (fb &amp;&amp; refcount_dec_and_test(&amp;fb-&gt;count))</div><div class='add'>+		fuse_backing_free(fb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_backing_files_init(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	idr_init(&amp;fc-&gt;backing_files_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_backing_id_alloc(struct fuse_conn *fc, struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	idr_preload(GFP_KERNEL);</div><div class='add'>+	spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	/* FIXME: xarray might be space inefficient */</div><div class='add'>+	id = idr_alloc_cyclic(&amp;fc-&gt;backing_files_map, fb, 1, 0, GFP_ATOMIC);</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+	idr_preload_end();</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(id == 0);</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_backing *fuse_backing_id_remove(struct fuse_conn *fc,</div><div class='add'>+						   int id)</div><div class='add'>+{</div><div class='add'>+	struct fuse_backing *fb;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	fb = idr_remove(&amp;fc-&gt;backing_files_map, id);</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return fb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_backing_id_free(int id, void *p, void *data)</div><div class='add'>+{</div><div class='add'>+	struct fuse_backing *fb = p;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(refcount_read(&amp;fb-&gt;count) != 1);</div><div class='add'>+	fuse_backing_free(fb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_backing_files_free(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	idr_for_each(&amp;fc-&gt;backing_files_map, fuse_backing_id_free, NULL);</div><div class='add'>+	idr_destroy(&amp;fc-&gt;backing_files_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map)</div><div class='add'>+{</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct super_block *backing_sb;</div><div class='add'>+	struct fuse_backing *fb = NULL;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: fd=%d flags=0x%x\n", __func__, map-&gt;fd, map-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* TODO: relax CAP_SYS_ADMIN once backing files are visible to lsof */</div><div class='add'>+	res = -EPERM;</div><div class='add'>+	if (!fc-&gt;passthrough || !capable(CAP_SYS_ADMIN))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	res = -EINVAL;</div><div class='add'>+	if (map-&gt;flags || map-&gt;padding)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	file = fget_raw(map-&gt;fd);</div><div class='add'>+	res = -EBADF;</div><div class='add'>+	if (!file)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* read/write/splice/mmap passthrough only relevant for regular files */</div><div class='add'>+	res = d_is_dir(file-&gt;f_path.dentry) ? -EISDIR : -EINVAL;</div><div class='add'>+	if (!d_is_reg(file-&gt;f_path.dentry))</div><div class='add'>+		goto out_fput;</div><div class='add'>+</div><div class='add'>+	backing_sb = file_inode(file)-&gt;i_sb;</div><div class='add'>+	res = -ELOOP;</div><div class='add'>+	if (backing_sb-&gt;s_stack_depth &gt;= fc-&gt;max_stack_depth)</div><div class='add'>+		goto out_fput;</div><div class='add'>+</div><div class='add'>+	fb = kmalloc(sizeof(struct fuse_backing), GFP_KERNEL);</div><div class='add'>+	res = -ENOMEM;</div><div class='add'>+	if (!fb)</div><div class='add'>+		goto out_fput;</div><div class='add'>+</div><div class='add'>+	fb-&gt;file = file;</div><div class='add'>+	fb-&gt;cred = prepare_creds();</div><div class='add'>+	refcount_set(&amp;fb-&gt;count, 1);</div><div class='add'>+</div><div class='add'>+	res = fuse_backing_id_alloc(fc, fb);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		fuse_backing_free(fb);</div><div class='add'>+		fb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	pr_debug("%s: fb=0x%p, ret=%i\n", __func__, fb, res);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+</div><div class='add'>+out_fput:</div><div class='add'>+	fput(file);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fuse_backing_close(struct fuse_conn *fc, int backing_id)</div><div class='add'>+{</div><div class='add'>+	struct fuse_backing *fb = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: backing_id=%d\n", __func__, backing_id);</div><div class='add'>+</div><div class='add'>+	/* TODO: relax CAP_SYS_ADMIN once backing files are visible to lsof */</div><div class='add'>+	err = -EPERM;</div><div class='add'>+	if (!fc-&gt;passthrough || !capable(CAP_SYS_ADMIN))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (backing_id &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	fb = fuse_backing_id_remove(fc, backing_id);</div><div class='add'>+	if (!fb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fuse_backing_put(fb);</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	pr_debug("%s: fb=0x%p, err=%i\n", __func__, fb, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fuse_backing *fuse_backing_lookup(struct fuse_conn *fc, int backing_id)</div><div class='add'>+{</div><div class='add'>+	struct fuse_backing *fb;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fb = idr_find(&amp;fc-&gt;backing_files_map, backing_id);</div><div class='add'>+	fb = fuse_backing_get(fb);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return fb;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/fuse/control.c b/fs/fuse/control.c<br/>index 284a35006462..140bd5730d99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/control.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/control.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/control.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/control.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FUSE_CTL_SUPER_MAGIC 0x65735543</div><div class='ctx'> </div><div class='hunk'>@@ -174,11 +175,7 @@ static ssize_t fuse_conn_congestion_threshold_write(struct file *file,</div><div class='ctx'> 	if (!fc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;fc-&gt;killsb);</div><div class='del'>-	spin_lock(&amp;fc-&gt;bg_lock);</div><div class='del'>-	fc-&gt;congestion_threshold = val;</div><div class='del'>-	spin_unlock(&amp;fc-&gt;bg_lock);</div><div class='del'>-	up_read(&amp;fc-&gt;killsb);</div><div class='add'>+	WRITE_ONCE(fc-&gt;congestion_threshold, val);</div><div class='ctx'> 	fuse_conn_put(fc);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -187,40 +184,34 @@ out:</div><div class='ctx'> static const struct file_operations fuse_ctl_abort_ops = {</div><div class='ctx'> 	.open = nonseekable_open,</div><div class='ctx'> 	.write = fuse_conn_abort_write,</div><div class='del'>-	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations fuse_ctl_waiting_ops = {</div><div class='ctx'> 	.open = nonseekable_open,</div><div class='ctx'> 	.read = fuse_conn_waiting_read,</div><div class='del'>-	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations fuse_conn_max_background_ops = {</div><div class='ctx'> 	.open = nonseekable_open,</div><div class='ctx'> 	.read = fuse_conn_max_background_read,</div><div class='ctx'> 	.write = fuse_conn_max_background_write,</div><div class='del'>-	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations fuse_conn_congestion_threshold_ops = {</div><div class='ctx'> 	.open = nonseekable_open,</div><div class='ctx'> 	.read = fuse_conn_congestion_threshold_read,</div><div class='ctx'> 	.write = fuse_conn_congestion_threshold_write,</div><div class='del'>-	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,</div><div class='ctx'> 					  struct fuse_conn *fc,</div><div class='del'>-					  const char *name,</div><div class='del'>-					  int mode, int nlink,</div><div class='add'>+					  const char *name, int mode,</div><div class='ctx'> 					  const struct inode_operations *iop,</div><div class='ctx'> 					  const struct file_operations *fop)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(fc-&gt;ctl_ndents &gt;= FUSE_CTL_NUM_DENTRIES);</div><div class='ctx'> 	dentry = d_alloc_name(parent, name);</div><div class='ctx'> 	if (!dentry)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -240,12 +231,19 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,</div><div class='ctx'> 	if (iop)</div><div class='ctx'> 		inode-&gt;i_op = iop;</div><div class='ctx'> 	inode-&gt;i_fop = fop;</div><div class='del'>-	set_nlink(inode, nlink);</div><div class='add'>+	if (S_ISDIR(mode)) {</div><div class='add'>+		inc_nlink(d_inode(parent));</div><div class='add'>+		inc_nlink(inode);</div><div class='add'>+	}</div><div class='ctx'> 	inode-&gt;i_private = fc;</div><div class='del'>-	d_add(dentry, inode);</div><div class='del'>-</div><div class='del'>-	fc-&gt;ctl_dentry[fc-&gt;ctl_ndents++] = dentry;</div><div class='del'>-</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+	dput(dentry);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are returning a borrowed reference here - it's only good while</div><div class='add'>+	 * fuse_mutex is held.  Actually it's d_make_persistent() return</div><div class='add'>+	 * value...</div><div class='add'>+	 */</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -262,22 +260,21 @@ int fuse_ctl_add_conn(struct fuse_conn *fc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	parent = fuse_control_sb-&gt;s_root;</div><div class='del'>-	inc_nlink(d_inode(parent));</div><div class='ctx'> 	sprintf(name, "%u", fc-&gt;dev);</div><div class='del'>-	parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR | 0500, 2,</div><div class='add'>+	parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR | 0500,</div><div class='ctx'> 				     &amp;simple_dir_inode_operations,</div><div class='ctx'> 				     &amp;simple_dir_operations);</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (!fuse_ctl_add_dentry(parent, fc, "waiting", S_IFREG | 0400, 1,</div><div class='add'>+	if (!fuse_ctl_add_dentry(parent, fc, "waiting", S_IFREG | 0400,</div><div class='ctx'> 				 NULL, &amp;fuse_ctl_waiting_ops) ||</div><div class='del'>-	    !fuse_ctl_add_dentry(parent, fc, "abort", S_IFREG | 0200, 1,</div><div class='add'>+	    !fuse_ctl_add_dentry(parent, fc, "abort", S_IFREG | 0200,</div><div class='ctx'> 				 NULL, &amp;fuse_ctl_abort_ops) ||</div><div class='ctx'> 	    !fuse_ctl_add_dentry(parent, fc, "max_background", S_IFREG | 0600,</div><div class='del'>-				 1, NULL, &amp;fuse_conn_max_background_ops) ||</div><div class='add'>+				 NULL, &amp;fuse_conn_max_background_ops) ||</div><div class='ctx'> 	    !fuse_ctl_add_dentry(parent, fc, "congestion_threshold",</div><div class='del'>-				 S_IFREG | 0600, 1, NULL,</div><div class='add'>+				 S_IFREG | 0600, NULL,</div><div class='ctx'> 				 &amp;fuse_conn_congestion_threshold_ops))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -288,27 +285,24 @@ int fuse_ctl_add_conn(struct fuse_conn *fc)</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void remove_one(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	d_inode(dentry)-&gt;i_private = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Remove a connection from the control filesystem (if it exists).</div><div class='ctx'>  * Caller must hold fuse_mutex</div><div class='ctx'>  */</div><div class='ctx'> void fuse_ctl_remove_conn(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	char name[32];</div><div class='ctx'> </div><div class='ctx'> 	if (!fuse_control_sb || fc-&gt;no_control)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = fc-&gt;ctl_ndents - 1; i &gt;= 0; i--) {</div><div class='del'>-		struct dentry *dentry = fc-&gt;ctl_dentry[i];</div><div class='del'>-		d_inode(dentry)-&gt;i_private = NULL;</div><div class='del'>-		if (!i) {</div><div class='del'>-			/* Get rid of submounts: */</div><div class='del'>-			d_invalidate(dentry);</div><div class='del'>-		}</div><div class='del'>-		dput(dentry);</div><div class='del'>-	}</div><div class='del'>-	drop_nlink(d_inode(fuse_control_sb-&gt;s_root));</div><div class='add'>+	sprintf(name, "%u", fc-&gt;dev);</div><div class='add'>+	simple_remove_by_name(fuse_control_sb-&gt;s_root, name, remove_one);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_ctl_fill_super(struct super_block *sb, struct fs_context *fsc)</div><div class='hunk'>@@ -354,15 +348,11 @@ static int fuse_ctl_init_fs_context(struct fs_context *fsc)</div><div class='ctx'> </div><div class='ctx'> static void fuse_ctl_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_conn *fc;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;fuse_mutex);</div><div class='ctx'> 	fuse_control_sb = NULL;</div><div class='del'>-	list_for_each_entry(fc, &amp;fuse_conn_list, entry)</div><div class='del'>-		fc-&gt;ctl_ndents = 0;</div><div class='ctx'> 	mutex_unlock(&amp;fuse_mutex);</div><div class='ctx'> </div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type fuse_ctl_fs_type = {</div><div class='head'>diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c<br/>index 91e89e68177e..28c96961e85d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/cuse.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/cuse.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/cuse.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/cuse.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "fuse_i.h"</div><div class='add'>+#include "fuse_dev_i.h"</div><div class='ctx'> </div><div class='ctx'> #define CUSE_CONNTBL_LEN	64</div><div class='ctx'> </div><div class='hunk'>@@ -303,13 +304,17 @@ struct cuse_init_args {</div><div class='ctx'> 	struct fuse_args_pages ap;</div><div class='ctx'> 	struct cuse_init_in in;</div><div class='ctx'> 	struct cuse_init_out out;</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct fuse_page_desc desc;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	struct fuse_folio_desc desc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cuse_process_init_reply - finish initializing CUSE channel</div><div class='ctx'>  *</div><div class='add'>+ * @fm: The fuse mount information containing the CUSE connection.</div><div class='add'>+ * @args: The arguments passed to the init reply.</div><div class='add'>+ * @error: The error code signifying if any error occurred during the process.</div><div class='add'>+ *</div><div class='ctx'>  * This function creates the character device and sets up all the</div><div class='ctx'>  * required data structures for it.  Please read the comment at the</div><div class='ctx'>  * top of this file for high level overview.</div><div class='hunk'>@@ -322,7 +327,7 @@ static void cuse_process_init_reply(struct fuse_mount *fm,</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;ia-&gt;ap;</div><div class='ctx'> 	struct cuse_conn *cc = fc_to_cc(fc), *pos;</div><div class='ctx'> 	struct cuse_init_out *arg = &amp;ia-&gt;out;</div><div class='del'>-	struct page *page = ap-&gt;pages[0];</div><div class='add'>+	struct folio *folio = ap-&gt;folios[0];</div><div class='ctx'> 	struct cuse_devinfo devinfo = { };</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct cdev *cdev;</div><div class='hunk'>@@ -339,7 +344,7 @@ static void cuse_process_init_reply(struct fuse_mount *fm,</div><div class='ctx'> 	/* parse init reply */</div><div class='ctx'> 	cc-&gt;unrestricted_ioctl = arg-&gt;flags &amp; CUSE_UNRESTRICTED_IOCTL;</div><div class='ctx'> </div><div class='del'>-	rc = cuse_parse_devinfo(page_address(page), ap-&gt;args.out_args[1].size,</div><div class='add'>+	rc = cuse_parse_devinfo(folio_address(folio), ap-&gt;args.out_args[1].size,</div><div class='ctx'> 				&amp;devinfo);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -407,7 +412,7 @@ static void cuse_process_init_reply(struct fuse_mount *fm,</div><div class='ctx'> 	kobject_uevent(&amp;dev-&gt;kobj, KOBJ_ADD);</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(ia);</div><div class='del'>-	__free_page(page);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err_cdev:</div><div class='hunk'>@@ -425,7 +430,7 @@ err:</div><div class='ctx'> static int cuse_send_init(struct cuse_conn *cc)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct fuse_mount *fm = &amp;cc-&gt;fm;</div><div class='ctx'> 	struct cuse_init_args *ia;</div><div class='ctx'> 	struct fuse_args_pages *ap;</div><div class='hunk'>@@ -433,13 +438,14 @@ static int cuse_send_init(struct cuse_conn *cc)</div><div class='ctx'> 	BUILD_BUG_ON(CUSE_INIT_INFO_MAX &gt; PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	rc = -ENOMEM;</div><div class='del'>-	page = alloc_page(GFP_KERNEL | __GFP_ZERO);</div><div class='del'>-	if (!page)</div><div class='add'>+</div><div class='add'>+	folio = folio_alloc(GFP_KERNEL | __GFP_ZERO, 0);</div><div class='add'>+	if (!folio)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	ia = kzalloc(sizeof(*ia), GFP_KERNEL);</div><div class='ctx'> 	if (!ia)</div><div class='del'>-		goto err_free_page;</div><div class='add'>+		goto err_free_folio;</div><div class='ctx'> </div><div class='ctx'> 	ap = &amp;ia-&gt;ap;</div><div class='ctx'> 	ia-&gt;in.major = FUSE_KERNEL_VERSION;</div><div class='hunk'>@@ -455,18 +461,18 @@ static int cuse_send_init(struct cuse_conn *cc)</div><div class='ctx'> 	ap-&gt;args.out_args[1].size = CUSE_INIT_INFO_MAX;</div><div class='ctx'> 	ap-&gt;args.out_argvar = true;</div><div class='ctx'> 	ap-&gt;args.out_pages = true;</div><div class='del'>-	ap-&gt;num_pages = 1;</div><div class='del'>-	ap-&gt;pages = &amp;ia-&gt;page;</div><div class='add'>+	ap-&gt;num_folios = 1;</div><div class='add'>+	ap-&gt;folios = &amp;ia-&gt;folio;</div><div class='ctx'> 	ap-&gt;descs = &amp;ia-&gt;desc;</div><div class='del'>-	ia-&gt;page = page;</div><div class='add'>+	ia-&gt;folio = folio;</div><div class='ctx'> 	ia-&gt;desc.length = ap-&gt;args.out_args[1].size;</div><div class='ctx'> 	ap-&gt;args.end = cuse_process_init_reply;</div><div class='ctx'> </div><div class='ctx'> 	rc = fuse_simple_background(fm, &amp;ap-&gt;args, GFP_KERNEL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		kfree(ia);</div><div class='del'>-err_free_page:</div><div class='del'>-		__free_page(page);</div><div class='add'>+err_free_folio:</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> err:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -474,8 +480,7 @@ err:</div><div class='ctx'> </div><div class='ctx'> static void cuse_fc_release(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='del'>-	struct cuse_conn *cc = fc_to_cc(fc);</div><div class='del'>-	kfree_rcu(cc, fc.rcu);</div><div class='add'>+	kfree(fc_to_cc(fc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -543,7 +548,7 @@ static int cuse_channel_open(struct inode *inode, struct file *file)</div><div class='ctx'>  */</div><div class='ctx'> static int cuse_channel_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_dev *fud = file-&gt;private_data;</div><div class='add'>+	struct fuse_dev *fud = __fuse_get_dev(file);</div><div class='ctx'> 	struct cuse_conn *cc = fc_to_cc(fud-&gt;fc);</div><div class='ctx'> </div><div class='ctx'> 	/* remove from the conntbl, no more access from this point on */</div><div class='head'>diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c<br/>index 12ef91d170bb..ac6d4c1064cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/dax.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dax.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/dax.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/dax.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/dax.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/pfn_t.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include &lt;linux/interval_tree.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -240,11 +239,12 @@ static int fuse_send_removemapping(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	args.opcode = FUSE_REMOVEMAPPING;</div><div class='ctx'> 	args.nodeid = fi-&gt;nodeid;</div><div class='del'>-	args.in_numargs = 2;</div><div class='del'>-	args.in_args[0].size = sizeof(*inargp);</div><div class='del'>-	args.in_args[0].value = inargp;</div><div class='del'>-	args.in_args[1].size = inargp-&gt;count * sizeof(*remove_one);</div><div class='del'>-	args.in_args[1].value = remove_one;</div><div class='add'>+	args.in_numargs = 3;</div><div class='add'>+	fuse_set_zero_arg0(&amp;args);</div><div class='add'>+	args.in_args[1].size = sizeof(*inargp);</div><div class='add'>+	args.in_args[1].value = inargp;</div><div class='add'>+	args.in_args[2].size = inargp-&gt;count * sizeof(*remove_one);</div><div class='add'>+	args.in_args[2].value = remove_one;</div><div class='ctx'> 	return fuse_simple_request(fm, &amp;args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -665,36 +665,12 @@ static void fuse_wait_dax_page(struct inode *inode)</div><div class='ctx'> 	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Should be called with mapping-&gt;invalidate_lock held exclusively */</div><div class='del'>-static int __fuse_dax_break_layouts(struct inode *inode, bool *retry,</div><div class='del'>-				    loff_t start, loff_t end)</div><div class='del'>-{</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	page = dax_layout_busy_page_range(inode-&gt;i_mapping, start, end);</div><div class='del'>-	if (!page)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	*retry = true;</div><div class='del'>-	return ___wait_var_event(&amp;page-&gt;_refcount,</div><div class='del'>-			atomic_read(&amp;page-&gt;_refcount) == 1, TASK_INTERRUPTIBLE,</div><div class='del'>-			0, 0, fuse_wait_dax_page(inode));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* dmap_end == 0 leads to unmapping of whole file */</div><div class='add'>+/* Should be called with mapping-&gt;invalidate_lock held exclusively. */</div><div class='ctx'> int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start,</div><div class='ctx'> 				  u64 dmap_end)</div><div class='ctx'> {</div><div class='del'>-	bool	retry;</div><div class='del'>-	int	ret;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		retry = false;</div><div class='del'>-		ret = __fuse_dax_break_layouts(inode, &amp;retry, dmap_start,</div><div class='del'>-					       dmap_end);</div><div class='del'>-	} while (ret == 0 &amp;&amp; retry);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return dax_break_layout(inode, dmap_start, dmap_end,</div><div class='add'>+				fuse_wait_dax_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t fuse_dax_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='hunk'>@@ -774,23 +750,13 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_dax_writepages(struct address_space *mapping,</div><div class='del'>-			       struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-</div><div class='del'>-	return dax_writeback_mapping_range(mapping, fc-&gt;dax-&gt;dev, wbc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static vm_fault_t __fuse_dax_fault(struct vm_fault *vmf, unsigned int order,</div><div class='ctx'> 		bool write)</div><div class='ctx'> {</div><div class='ctx'> 	vm_fault_t ret;</div><div class='ctx'> 	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	pfn_t pfn;</div><div class='add'>+	unsigned long pfn;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='ctx'> 	struct fuse_conn_dax *fcd = fc-&gt;dax;</div><div class='hunk'>@@ -1323,7 +1289,6 @@ bool fuse_dax_inode_alloc(struct super_block *sb, struct fuse_inode *fi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct address_space_operations fuse_dax_file_aops  = {</div><div class='del'>-	.writepages	= fuse_dax_writepages,</div><div class='ctx'> 	.direct_IO	= noop_direct_IO,</div><div class='ctx'> 	.dirty_folio	= noop_dirty_folio,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c<br/>index 1a8f82f478cb..6d59cbc877c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/dev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/dev.c</a></div><div class='hunk'>@@ -6,7 +6,9 @@</div><div class='ctx'>   See the file COPYING.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#include "dev_uring_i.h"</div><div class='ctx'> #include "fuse_i.h"</div><div class='add'>+#include "fuse_dev_i.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -21,23 +23,107 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/splice.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fuse_trace.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS_MISCDEV(FUSE_MINOR);</div><div class='ctx'> MODULE_ALIAS("devname:fuse");</div><div class='ctx'> </div><div class='del'>-/* Ordinary requests have even IDs, while interrupts IDs are odd */</div><div class='del'>-#define FUSE_INT_REQ_BIT (1ULL &lt;&lt; 0)</div><div class='del'>-#define FUSE_REQ_ID_STEP (1ULL &lt;&lt; 1)</div><div class='del'>-</div><div class='ctx'> static struct kmem_cache *fuse_req_cachep;</div><div class='ctx'> </div><div class='del'>-static struct fuse_dev *fuse_get_dev(struct file *file)</div><div class='add'>+const unsigned long fuse_timeout_timer_freq =</div><div class='add'>+	secs_to_jiffies(FUSE_TIMEOUT_TIMER_FREQ);</div><div class='add'>+</div><div class='add'>+bool fuse_request_expired(struct fuse_conn *fc, struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Lockless access is OK, because file-&gt;private data is set</div><div class='del'>-	 * once during mount and is valid until the file is released.</div><div class='del'>-	 */</div><div class='del'>-	return READ_ONCE(file-&gt;private_data);</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+	req = list_first_entry_or_null(list, struct fuse_req, list);</div><div class='add'>+	if (!req)</div><div class='add'>+		return false;</div><div class='add'>+	return time_is_before_jiffies(req-&gt;create_time + fc-&gt;timeout.req_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fuse_fpq_processing_expired(struct fuse_conn *fc, struct list_head *processing)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FUSE_PQ_HASH_SIZE; i++)</div><div class='add'>+		if (fuse_request_expired(fc, &amp;processing[i]))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if any requests aren't being completed by the time the request timeout</div><div class='add'>+ * elapses. To do so, we:</div><div class='add'>+ * - check the fiq pending list</div><div class='add'>+ * - check the bg queue</div><div class='add'>+ * - check the fpq io and processing lists</div><div class='add'>+ *</div><div class='add'>+ * To make this fast, we only check against the head request on each list since</div><div class='add'>+ * these are generally queued in order of creation time (eg newer requests get</div><div class='add'>+ * queued to the tail). We might miss a few edge cases (eg requests transitioning</div><div class='add'>+ * between lists, re-sent requests at the head of the pending list having a</div><div class='add'>+ * later creation time than other requests on that list, etc.) but that is fine</div><div class='add'>+ * since if the request never gets fulfilled, it will eventually be caught.</div><div class='add'>+ */</div><div class='add'>+void fuse_check_timeout(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dwork = to_delayed_work(work);</div><div class='add'>+	struct fuse_conn *fc = container_of(dwork, struct fuse_conn,</div><div class='add'>+					    timeout.work);</div><div class='add'>+	struct fuse_iqueue *fiq = &amp;fc-&gt;iq;</div><div class='add'>+	struct fuse_dev *fud;</div><div class='add'>+	struct fuse_pqueue *fpq;</div><div class='add'>+	bool expired = false;</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;fc-&gt;num_waiting))</div><div class='add'>+	    goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fiq-&gt;lock);</div><div class='add'>+	expired = fuse_request_expired(fc, &amp;fiq-&gt;pending);</div><div class='add'>+	spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+	if (expired)</div><div class='add'>+		goto abort_conn;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fc-&gt;bg_lock);</div><div class='add'>+	expired = fuse_request_expired(fc, &amp;fc-&gt;bg_queue);</div><div class='add'>+	spin_unlock(&amp;fc-&gt;bg_lock);</div><div class='add'>+	if (expired)</div><div class='add'>+		goto abort_conn;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	if (!fc-&gt;connected) {</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(fud, &amp;fc-&gt;devices, entry) {</div><div class='add'>+		fpq = &amp;fud-&gt;pq;</div><div class='add'>+		spin_lock(&amp;fpq-&gt;lock);</div><div class='add'>+		if (fuse_request_expired(fc, &amp;fpq-&gt;io) ||</div><div class='add'>+		    fuse_fpq_processing_expired(fc, fpq-&gt;processing)) {</div><div class='add'>+			spin_unlock(&amp;fpq-&gt;lock);</div><div class='add'>+			spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+			goto abort_conn;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;fpq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (fuse_uring_request_expired(fc))</div><div class='add'>+	    goto abort_conn;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;fc-&gt;timeout.work,</div><div class='add'>+			   fuse_timeout_timer_freq);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+abort_conn:</div><div class='add'>+	fuse_abort_conn(fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_request_init(struct fuse_mount *fm, struct fuse_req *req)</div><div class='hunk'>@@ -48,6 +134,7 @@ static void fuse_request_init(struct fuse_mount *fm, struct fuse_req *req)</div><div class='ctx'> 	refcount_set(&amp;req-&gt;count, 1);</div><div class='ctx'> 	__set_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='ctx'> 	req-&gt;fm = fm;</div><div class='add'>+	req-&gt;create_time = jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags)</div><div class='hunk'>@@ -84,7 +171,8 @@ void fuse_set_initialized(struct fuse_conn *fc)</div><div class='ctx'> </div><div class='ctx'> static bool fuse_block_alloc(struct fuse_conn *fc, bool for_background)</div><div class='ctx'> {</div><div class='del'>-	return !fc-&gt;initialized || (for_background &amp;&amp; fc-&gt;blocked);</div><div class='add'>+	return !fc-&gt;initialized || (for_background &amp;&amp; fc-&gt;blocked) ||</div><div class='add'>+	       (fc-&gt;io_uring &amp;&amp; fc-&gt;connected &amp;&amp; !fuse_uring_ready(fc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_drop_waiting(struct fuse_conn *fc)</div><div class='hunk'>@@ -103,17 +191,24 @@ static void fuse_drop_waiting(struct fuse_conn *fc)</div><div class='ctx'> </div><div class='ctx'> static void fuse_put_request(struct fuse_req *req);</div><div class='ctx'> </div><div class='del'>-static struct fuse_req *fuse_get_req(struct fuse_mount *fm, bool for_background)</div><div class='add'>+static struct fuse_req *fuse_get_req(struct mnt_idmap *idmap,</div><div class='add'>+				     struct fuse_mount *fm,</div><div class='add'>+				     bool for_background)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = fm-&gt;fc;</div><div class='ctx'> 	struct fuse_req *req;</div><div class='add'>+	bool no_idmap = !fm-&gt;sb || (fm-&gt;sb-&gt;s_iflags &amp; SB_I_NOIDMAP);</div><div class='add'>+	kuid_t fsuid;</div><div class='add'>+	kgid_t fsgid;</div><div class='ctx'> 	int err;</div><div class='add'>+</div><div class='ctx'> 	atomic_inc(&amp;fc-&gt;num_waiting);</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_block_alloc(fc, for_background)) {</div><div class='ctx'> 		err = -EINTR;</div><div class='del'>-		if (wait_event_killable_exclusive(fc-&gt;blocked_waitq,</div><div class='del'>-				!fuse_block_alloc(fc, for_background)))</div><div class='add'>+		if (wait_event_state_exclusive(fc-&gt;blocked_waitq,</div><div class='add'>+				!fuse_block_alloc(fc, for_background),</div><div class='add'>+				(TASK_KILLABLE | TASK_FREEZABLE)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Matches smp_wmb() in fuse_set_initialized() */</div><div class='hunk'>@@ -135,19 +230,32 @@ static struct fuse_req *fuse_get_req(struct fuse_mount *fm, bool for_background)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req-&gt;in.h.uid = from_kuid(fc-&gt;user_ns, current_fsuid());</div><div class='del'>-	req-&gt;in.h.gid = from_kgid(fc-&gt;user_ns, current_fsgid());</div><div class='ctx'> 	req-&gt;in.h.pid = pid_nr_ns(task_pid(current), fc-&gt;pid_ns);</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(FR_WAITING, &amp;req-&gt;flags);</div><div class='ctx'> 	if (for_background)</div><div class='ctx'> 		__set_bit(FR_BACKGROUND, &amp;req-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(req-&gt;in.h.uid == ((uid_t)-1) ||</div><div class='del'>-		     req-&gt;in.h.gid == ((gid_t)-1))) {</div><div class='add'>+	/*</div><div class='add'>+	 * Keep the old behavior when idmappings support was not</div><div class='add'>+	 * declared by a FUSE server.</div><div class='add'>+	 *</div><div class='add'>+	 * For those FUSE servers who support idmapped mounts,</div><div class='add'>+	 * we send UID/GID only along with "inode creation"</div><div class='add'>+	 * fuse requests, otherwise idmap == &amp;invalid_mnt_idmap and</div><div class='add'>+	 * req-&gt;in.h.{u,g}id will be equal to FUSE_INVALID_UIDGID.</div><div class='add'>+	 */</div><div class='add'>+	fsuid = no_idmap ? current_fsuid() : mapped_fsuid(idmap, fc-&gt;user_ns);</div><div class='add'>+	fsgid = no_idmap ? current_fsgid() : mapped_fsgid(idmap, fc-&gt;user_ns);</div><div class='add'>+	req-&gt;in.h.uid = from_kuid(fc-&gt;user_ns, fsuid);</div><div class='add'>+	req-&gt;in.h.gid = from_kgid(fc-&gt;user_ns, fsgid);</div><div class='add'>+</div><div class='add'>+	if (no_idmap &amp;&amp; unlikely(req-&gt;in.h.uid == ((uid_t)-1) ||</div><div class='add'>+				 req-&gt;in.h.gid == ((gid_t)-1))) {</div><div class='ctx'> 		fuse_put_request(req);</div><div class='ctx'> 		return ERR_PTR(-EOVERFLOW);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return req;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -192,17 +300,29 @@ unsigned int fuse_len_args(unsigned int numargs, struct fuse_arg *args)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_len_args);</div><div class='ctx'> </div><div class='del'>-u64 fuse_get_unique(struct fuse_iqueue *fiq)</div><div class='add'>+static u64 fuse_get_unique_locked(struct fuse_iqueue *fiq)</div><div class='ctx'> {</div><div class='ctx'> 	fiq-&gt;reqctr += FUSE_REQ_ID_STEP;</div><div class='ctx'> 	return fiq-&gt;reqctr;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+u64 fuse_get_unique(struct fuse_iqueue *fiq)</div><div class='add'>+{</div><div class='add'>+	u64 ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fiq-&gt;lock);</div><div class='add'>+	ret = fuse_get_unique_locked(fiq);</div><div class='add'>+	spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_get_unique);</div><div class='ctx'> </div><div class='del'>-static unsigned int fuse_req_hash(u64 unique)</div><div class='add'>+unsigned int fuse_req_hash(u64 unique)</div><div class='ctx'> {</div><div class='ctx'> 	return hash_long(unique &amp; ~FUSE_INT_REQ_BIT, FUSE_PQ_HASH_BITS);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(fuse_req_hash);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A new request is available, wake fiq-&gt;waitq</div><div class='hunk'>@@ -215,22 +335,90 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 	spin_unlock(&amp;fiq-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fuse_dev_queue_forget(struct fuse_iqueue *fiq,</div><div class='add'>+			   struct fuse_forget_link *forget)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fiq-&gt;lock);</div><div class='add'>+	if (fiq-&gt;connected) {</div><div class='add'>+		fiq-&gt;forget_list_tail-&gt;next = forget;</div><div class='add'>+		fiq-&gt;forget_list_tail = forget;</div><div class='add'>+		fuse_dev_wake_and_unlock(fiq);</div><div class='add'>+	} else {</div><div class='add'>+		kfree(forget);</div><div class='add'>+		spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_dev_queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fiq-&gt;lock);</div><div class='add'>+	if (list_empty(&amp;req-&gt;intr_entry)) {</div><div class='add'>+		list_add_tail(&amp;req-&gt;intr_entry, &amp;fiq-&gt;interrupts);</div><div class='add'>+		/*</div><div class='add'>+		 * Pairs with smp_mb() implied by test_and_set_bit()</div><div class='add'>+		 * from fuse_request_end().</div><div class='add'>+		 */</div><div class='add'>+		smp_mb();</div><div class='add'>+		if (test_bit(FR_FINISHED, &amp;req-&gt;flags)) {</div><div class='add'>+			list_del_init(&amp;req-&gt;intr_entry);</div><div class='add'>+			spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+		} else  {</div><div class='add'>+			fuse_dev_wake_and_unlock(fiq);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fuse_request_assign_unique_locked(struct fuse_iqueue *fiq,</div><div class='add'>+						     struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;in.h.opcode != FUSE_NOTIFY_REPLY)</div><div class='add'>+		req-&gt;in.h.unique = fuse_get_unique_locked(fiq);</div><div class='add'>+</div><div class='add'>+	/* tracepoint captures in.h.unique and in.h.len */</div><div class='add'>+	trace_fuse_request_send(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline void fuse_request_assign_unique(struct fuse_iqueue *fiq,</div><div class='add'>+				       struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;in.h.opcode != FUSE_NOTIFY_REPLY)</div><div class='add'>+		req-&gt;in.h.unique = fuse_get_unique(fiq);</div><div class='add'>+</div><div class='add'>+	/* tracepoint captures in.h.unique and in.h.len */</div><div class='add'>+	trace_fuse_request_send(req);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fuse_request_assign_unique);</div><div class='add'>+</div><div class='add'>+static void fuse_dev_queue_req(struct fuse_iqueue *fiq, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fiq-&gt;lock);</div><div class='add'>+	if (fiq-&gt;connected) {</div><div class='add'>+		fuse_request_assign_unique_locked(fiq, req);</div><div class='add'>+		list_add_tail(&amp;req-&gt;list, &amp;fiq-&gt;pending);</div><div class='add'>+		fuse_dev_wake_and_unlock(fiq);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+		req-&gt;out.h.error = -ENOTCONN;</div><div class='add'>+		clear_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='add'>+		fuse_request_end(req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct fuse_iqueue_ops fuse_dev_fiq_ops = {</div><div class='del'>-	.wake_forget_and_unlock		= fuse_dev_wake_and_unlock,</div><div class='del'>-	.wake_interrupt_and_unlock	= fuse_dev_wake_and_unlock,</div><div class='del'>-	.wake_pending_and_unlock	= fuse_dev_wake_and_unlock,</div><div class='add'>+	.send_forget	= fuse_dev_queue_forget,</div><div class='add'>+	.send_interrupt	= fuse_dev_queue_interrupt,</div><div class='add'>+	.send_req	= fuse_dev_queue_req,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_dev_fiq_ops);</div><div class='ctx'> </div><div class='del'>-static void queue_request_and_unlock(struct fuse_iqueue *fiq,</div><div class='del'>-				     struct fuse_req *req)</div><div class='del'>-__releases(fiq-&gt;lock)</div><div class='add'>+static void fuse_send_one(struct fuse_iqueue *fiq, struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	req-&gt;in.h.len = sizeof(struct fuse_in_header) +</div><div class='ctx'> 		fuse_len_args(req-&gt;args-&gt;in_numargs,</div><div class='ctx'> 			      (struct fuse_arg *) req-&gt;args-&gt;in_args);</div><div class='del'>-	list_add_tail(&amp;req-&gt;list, &amp;fiq-&gt;pending);</div><div class='del'>-	fiq-&gt;ops-&gt;wake_pending_and_unlock(fiq);</div><div class='add'>+	fiq-&gt;ops-&gt;send_req(fiq, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget,</div><div class='hunk'>@@ -241,15 +429,7 @@ void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget,</div><div class='ctx'> 	forget-&gt;forget_one.nodeid = nodeid;</div><div class='ctx'> 	forget-&gt;forget_one.nlookup = nlookup;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fiq-&gt;lock);</div><div class='del'>-	if (fiq-&gt;connected) {</div><div class='del'>-		fiq-&gt;forget_list_tail-&gt;next = forget;</div><div class='del'>-		fiq-&gt;forget_list_tail = forget;</div><div class='del'>-		fiq-&gt;ops-&gt;wake_forget_and_unlock(fiq);</div><div class='del'>-	} else {</div><div class='del'>-		kfree(forget);</div><div class='del'>-		spin_unlock(&amp;fiq-&gt;lock);</div><div class='del'>-	}</div><div class='add'>+	fiq-&gt;ops-&gt;send_forget(fiq, forget);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void flush_bg_queue(struct fuse_conn *fc)</div><div class='hunk'>@@ -263,9 +443,7 @@ static void flush_bg_queue(struct fuse_conn *fc)</div><div class='ctx'> 		req = list_first_entry(&amp;fc-&gt;bg_queue, struct fuse_req, list);</div><div class='ctx'> 		list_del(&amp;req-&gt;list);</div><div class='ctx'> 		fc-&gt;active_background++;</div><div class='del'>-		spin_lock(&amp;fiq-&gt;lock);</div><div class='del'>-		req-&gt;in.h.unique = fuse_get_unique(fiq);</div><div class='del'>-		queue_request_and_unlock(fiq, req);</div><div class='add'>+		fuse_send_one(fiq, req);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -286,6 +464,7 @@ void fuse_request_end(struct fuse_req *req)</div><div class='ctx'> 	if (test_and_set_bit(FR_FINISHED, &amp;req-&gt;flags))</div><div class='ctx'> 		goto put_request;</div><div class='ctx'> </div><div class='add'>+	trace_fuse_request_end(req);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * test_and_set_bit() implies smp_mb() between bit</div><div class='ctx'> 	 * changing and below FR_INTERRUPTED check. Pairs with</div><div class='hunk'>@@ -335,30 +514,31 @@ static int queue_interrupt(struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_iqueue *fiq = &amp;req-&gt;fm-&gt;fc-&gt;iq;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fiq-&gt;lock);</div><div class='ctx'> 	/* Check for we've sent request to interrupt this req */</div><div class='del'>-	if (unlikely(!test_bit(FR_INTERRUPTED, &amp;req-&gt;flags))) {</div><div class='del'>-		spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+	if (unlikely(!test_bit(FR_INTERRUPTED, &amp;req-&gt;flags)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;req-&gt;intr_entry)) {</div><div class='del'>-		list_add_tail(&amp;req-&gt;intr_entry, &amp;fiq-&gt;interrupts);</div><div class='add'>+	fiq-&gt;ops-&gt;send_interrupt(fiq, req);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool fuse_remove_pending_req(struct fuse_req *req, spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	spin_lock(lock);</div><div class='add'>+	if (test_bit(FR_PENDING, &amp;req-&gt;flags)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Pairs with smp_mb() implied by test_and_set_bit()</div><div class='del'>-		 * from fuse_request_end().</div><div class='add'>+		 * FR_PENDING does not get cleared as the request will end</div><div class='add'>+		 * up in destruction anyway.</div><div class='ctx'> 		 */</div><div class='del'>-		smp_mb();</div><div class='del'>-		if (test_bit(FR_FINISHED, &amp;req-&gt;flags)) {</div><div class='del'>-			list_del_init(&amp;req-&gt;intr_entry);</div><div class='del'>-			spin_unlock(&amp;fiq-&gt;lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		fiq-&gt;ops-&gt;wake_interrupt_and_unlock(fiq);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+		list_del(&amp;req-&gt;list);</div><div class='add'>+		spin_unlock(lock);</div><div class='add'>+		__fuse_put_request(req);</div><div class='add'>+		req-&gt;out.h.error = -EINTR;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	spin_unlock(lock);</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void request_wait_answer(struct fuse_req *req)</div><div class='hunk'>@@ -382,22 +562,20 @@ static void request_wait_answer(struct fuse_req *req)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(FR_FORCE, &amp;req-&gt;flags)) {</div><div class='add'>+		bool removed;</div><div class='add'>+</div><div class='ctx'> 		/* Only fatal signals may interrupt this */</div><div class='ctx'> 		err = wait_event_killable(req-&gt;waitq,</div><div class='ctx'> 					test_bit(FR_FINISHED, &amp;req-&gt;flags));</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;fiq-&gt;lock);</div><div class='del'>-		/* Request is not yet in userspace, bail out */</div><div class='del'>-		if (test_bit(FR_PENDING, &amp;req-&gt;flags)) {</div><div class='del'>-			list_del(&amp;req-&gt;list);</div><div class='del'>-			spin_unlock(&amp;fiq-&gt;lock);</div><div class='del'>-			__fuse_put_request(req);</div><div class='del'>-			req-&gt;out.h.error = -EINTR;</div><div class='add'>+		if (test_bit(FR_URING, &amp;req-&gt;flags))</div><div class='add'>+			removed = fuse_uring_remove_pending_req(req);</div><div class='add'>+		else</div><div class='add'>+			removed = fuse_remove_pending_req(req, &amp;fiq-&gt;lock);</div><div class='add'>+		if (removed)</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;fiq-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -412,21 +590,15 @@ static void __fuse_request_send(struct fuse_req *req)</div><div class='ctx'> 	struct fuse_iqueue *fiq = &amp;req-&gt;fm-&gt;fc-&gt;iq;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(test_bit(FR_BACKGROUND, &amp;req-&gt;flags));</div><div class='del'>-	spin_lock(&amp;fiq-&gt;lock);</div><div class='del'>-	if (!fiq-&gt;connected) {</div><div class='del'>-		spin_unlock(&amp;fiq-&gt;lock);</div><div class='del'>-		req-&gt;out.h.error = -ENOTCONN;</div><div class='del'>-	} else {</div><div class='del'>-		req-&gt;in.h.unique = fuse_get_unique(fiq);</div><div class='del'>-		/* acquire extra reference, since request is still needed</div><div class='del'>-		   after fuse_request_end() */</div><div class='del'>-		__fuse_get_request(req);</div><div class='del'>-		queue_request_and_unlock(fiq, req);</div><div class='ctx'> </div><div class='del'>-		request_wait_answer(req);</div><div class='del'>-		/* Pairs with smp_wmb() in fuse_request_end() */</div><div class='del'>-		smp_rmb();</div><div class='del'>-	}</div><div class='add'>+	/* acquire extra reference, since request is still needed after</div><div class='add'>+	   fuse_request_end() */</div><div class='add'>+	__fuse_get_request(req);</div><div class='add'>+	fuse_send_one(fiq, req);</div><div class='add'>+</div><div class='add'>+	request_wait_answer(req);</div><div class='add'>+	/* Pairs with smp_wmb() in fuse_request_end() */</div><div class='add'>+	smp_rmb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args)</div><div class='hunk'>@@ -466,8 +638,14 @@ static void fuse_force_creds(struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = req-&gt;fm-&gt;fc;</div><div class='ctx'> </div><div class='del'>-	req-&gt;in.h.uid = from_kuid_munged(fc-&gt;user_ns, current_fsuid());</div><div class='del'>-	req-&gt;in.h.gid = from_kgid_munged(fc-&gt;user_ns, current_fsgid());</div><div class='add'>+	if (!req-&gt;fm-&gt;sb || req-&gt;fm-&gt;sb-&gt;s_iflags &amp; SB_I_NOIDMAP) {</div><div class='add'>+		req-&gt;in.h.uid = from_kuid_munged(fc-&gt;user_ns, current_fsuid());</div><div class='add'>+		req-&gt;in.h.gid = from_kgid_munged(fc-&gt;user_ns, current_fsgid());</div><div class='add'>+	} else {</div><div class='add'>+		req-&gt;in.h.uid = FUSE_INVALID_UIDGID;</div><div class='add'>+		req-&gt;in.h.gid = FUSE_INVALID_UIDGID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	req-&gt;in.h.pid = pid_nr_ns(task_pid(current), fc-&gt;pid_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -482,7 +660,9 @@ static void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args)</div><div class='ctx'> 		__set_bit(FR_ASYNC, &amp;req-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)</div><div class='add'>+ssize_t __fuse_simple_request(struct mnt_idmap *idmap,</div><div class='add'>+			      struct fuse_mount *fm,</div><div class='add'>+			      struct fuse_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = fm-&gt;fc;</div><div class='ctx'> 	struct fuse_req *req;</div><div class='hunk'>@@ -499,7 +679,7 @@ ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)</div><div class='ctx'> 		__set_bit(FR_FORCE, &amp;req-&gt;flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON(args-&gt;nocreds);</div><div class='del'>-		req = fuse_get_req(fm, false);</div><div class='add'>+		req = fuse_get_req(idmap, fm, false);</div><div class='ctx'> 		if (IS_ERR(req))</div><div class='ctx'> 			return PTR_ERR(req);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -521,7 +701,25 @@ ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fuse_request_queue_background(struct fuse_req *req)</div><div class='add'>+#ifdef CONFIG_FUSE_IO_URING</div><div class='add'>+static bool fuse_request_queue_background_uring(struct fuse_conn *fc,</div><div class='add'>+					       struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_iqueue *fiq = &amp;fc-&gt;iq;</div><div class='add'>+</div><div class='add'>+	req-&gt;in.h.len = sizeof(struct fuse_in_header) +</div><div class='add'>+		fuse_len_args(req-&gt;args-&gt;in_numargs,</div><div class='add'>+			      (struct fuse_arg *) req-&gt;args-&gt;in_args);</div><div class='add'>+	fuse_request_assign_unique(fiq, req);</div><div class='add'>+</div><div class='add'>+	return fuse_uring_queue_bq_req(req);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @return true if queued</div><div class='add'>+ */</div><div class='add'>+static int fuse_request_queue_background(struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_mount *fm = req-&gt;fm;</div><div class='ctx'> 	struct fuse_conn *fc = fm-&gt;fc;</div><div class='hunk'>@@ -533,6 +731,12 @@ static bool fuse_request_queue_background(struct fuse_req *req)</div><div class='ctx'> 		atomic_inc(&amp;fc-&gt;num_waiting);</div><div class='ctx'> 	}</div><div class='ctx'> 	__set_bit(FR_ISREPLY, &amp;req-&gt;flags);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUSE_IO_URING</div><div class='add'>+	if (fuse_uring_ready(fc))</div><div class='add'>+		return fuse_request_queue_background_uring(fc, req);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;bg_lock);</div><div class='ctx'> 	if (likely(fc-&gt;connected)) {</div><div class='ctx'> 		fc-&gt;num_background++;</div><div class='hunk'>@@ -560,7 +764,7 @@ int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 		__set_bit(FR_BACKGROUND, &amp;req-&gt;flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON(args-&gt;nocreds);</div><div class='del'>-		req = fuse_get_req(fm, true);</div><div class='add'>+		req = fuse_get_req(&amp;invalid_mnt_idmap, fm, true);</div><div class='ctx'> 		if (IS_ERR(req))</div><div class='ctx'> 			return PTR_ERR(req);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -581,9 +785,8 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm,</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_req *req;</div><div class='ctx'> 	struct fuse_iqueue *fiq = &amp;fm-&gt;fc-&gt;iq;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='del'>-	req = fuse_get_req(fm, false);</div><div class='add'>+	req = fuse_get_req(&amp;invalid_mnt_idmap, fm, false);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='ctx'> </div><div class='hunk'>@@ -592,16 +795,9 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm,</div><div class='ctx'> </div><div class='ctx'> 	fuse_args_to_req(req, args);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fiq-&gt;lock);</div><div class='del'>-	if (fiq-&gt;connected) {</div><div class='del'>-		queue_request_and_unlock(fiq, req);</div><div class='del'>-	} else {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		spin_unlock(&amp;fiq-&gt;lock);</div><div class='del'>-		fuse_put_request(req);</div><div class='del'>-	}</div><div class='add'>+	fuse_send_one(fiq, req);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -641,22 +837,8 @@ static int unlock_request(struct fuse_req *req)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fuse_copy_state {</div><div class='del'>-	int write;</div><div class='del'>-	struct fuse_req *req;</div><div class='del'>-	struct iov_iter *iter;</div><div class='del'>-	struct pipe_buffer *pipebufs;</div><div class='del'>-	struct pipe_buffer *currbuf;</div><div class='del'>-	struct pipe_inode_info *pipe;</div><div class='del'>-	unsigned long nr_segs;</div><div class='del'>-	struct page *pg;</div><div class='del'>-	unsigned len;</div><div class='del'>-	unsigned offset;</div><div class='del'>-	unsigned move_pages:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void fuse_copy_init(struct fuse_copy_state *cs, int write,</div><div class='del'>-			   struct iov_iter *iter)</div><div class='add'>+void fuse_copy_init(struct fuse_copy_state *cs, bool write,</div><div class='add'>+		    struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	memset(cs, 0, sizeof(*cs));</div><div class='ctx'> 	cs-&gt;write = write;</div><div class='hunk'>@@ -664,7 +846,7 @@ static void fuse_copy_init(struct fuse_copy_state *cs, int write,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Unmap and put previous page of userspace buffer */</div><div class='del'>-static void fuse_copy_finish(struct fuse_copy_state *cs)</div><div class='add'>+void fuse_copy_finish(struct fuse_copy_state *cs)</div><div class='ctx'> {</div><div class='ctx'> 	if (cs-&gt;currbuf) {</div><div class='ctx'> 		struct pipe_buffer *buf = cs-&gt;currbuf;</div><div class='hunk'>@@ -763,6 +945,9 @@ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)</div><div class='ctx'> 	*size -= ncpy;</div><div class='ctx'> 	cs-&gt;len -= ncpy;</div><div class='ctx'> 	cs-&gt;offset += ncpy;</div><div class='add'>+	if (cs-&gt;is_uring)</div><div class='add'>+		cs-&gt;ring.copied_sz += ncpy;</div><div class='add'>+</div><div class='ctx'> 	return ncpy;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -770,10 +955,9 @@ static int fuse_check_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	if (folio_mapped(folio) ||</div><div class='ctx'> 	    folio-&gt;mapping != NULL ||</div><div class='del'>-	    (folio-&gt;flags &amp; PAGE_FLAGS_CHECK_AT_PREP &amp;</div><div class='add'>+	    (folio-&gt;flags.f &amp; PAGE_FLAGS_CHECK_AT_PREP &amp;</div><div class='ctx'> 	     ~(1 &lt;&lt; PG_locked |</div><div class='ctx'> 	       1 &lt;&lt; PG_referenced |</div><div class='del'>-	       1 &lt;&lt; PG_uptodate |</div><div class='ctx'> 	       1 &lt;&lt; PG_lru |</div><div class='ctx'> 	       1 &lt;&lt; PG_active |</div><div class='ctx'> 	       1 &lt;&lt; PG_workingset |</div><div class='hunk'>@@ -786,10 +970,16 @@ static int fuse_check_folio(struct folio *folio)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)</div><div class='add'>+/*</div><div class='add'>+ * Attempt to steal a page from the splice() pipe and move it into the</div><div class='add'>+ * pagecache. If successful, the pointer in @pagep will be updated. The</div><div class='add'>+ * folio that was originally in @pagep will lose a reference and the new</div><div class='add'>+ * folio returned in @pagep will carry a reference.</div><div class='add'>+ */</div><div class='add'>+static int fuse_try_move_folio(struct fuse_copy_state *cs, struct folio **foliop)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct folio *oldfolio = page_folio(*pagep);</div><div class='add'>+	struct folio *oldfolio = *foliop;</div><div class='ctx'> 	struct folio *newfolio;</div><div class='ctx'> 	struct pipe_buffer *buf = cs-&gt;pipebufs;</div><div class='ctx'> </div><div class='hunk'>@@ -810,7 +1000,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)</div><div class='ctx'> 	cs-&gt;pipebufs++;</div><div class='ctx'> 	cs-&gt;nr_segs--;</div><div class='ctx'> </div><div class='del'>-	if (cs-&gt;len != PAGE_SIZE)</div><div class='add'>+	if (cs-&gt;len != folio_size(oldfolio))</div><div class='ctx'> 		goto out_fallback;</div><div class='ctx'> </div><div class='ctx'> 	if (!pipe_buf_try_steal(cs-&gt;pipe, buf))</div><div class='hunk'>@@ -818,9 +1008,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)</div><div class='ctx'> </div><div class='ctx'> 	newfolio = page_folio(buf-&gt;page);</div><div class='ctx'> </div><div class='del'>-	if (!folio_test_uptodate(newfolio))</div><div class='del'>-		folio_mark_uptodate(newfolio);</div><div class='del'>-</div><div class='add'>+	folio_clear_uptodate(newfolio);</div><div class='ctx'> 	folio_clear_mappedtodisk(newfolio);</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_check_folio(newfolio) != 0)</div><div class='hunk'>@@ -858,7 +1046,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)</div><div class='ctx'> 	if (test_bit(FR_ABORTED, &amp;cs-&gt;req-&gt;flags))</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 	else</div><div class='del'>-		*pagep = &amp;newfolio-&gt;page;</div><div class='add'>+		*foliop = newfolio;</div><div class='ctx'> 	spin_unlock(&amp;cs-&gt;req-&gt;waitq.lock);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -891,8 +1079,8 @@ out_fallback:</div><div class='ctx'> 	goto out_put_old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page,</div><div class='del'>-			 unsigned offset, unsigned count)</div><div class='add'>+static int fuse_ref_folio(struct fuse_copy_state *cs, struct folio *folio,</div><div class='add'>+			  unsigned offset, unsigned count)</div><div class='ctx'> {</div><div class='ctx'> 	struct pipe_buffer *buf;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -900,17 +1088,17 @@ static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page,</div><div class='ctx'> 	if (cs-&gt;nr_segs &gt;= cs-&gt;pipe-&gt;max_usage)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	get_page(page);</div><div class='add'>+	folio_get(folio);</div><div class='ctx'> 	err = unlock_request(cs-&gt;req);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fuse_copy_finish(cs);</div><div class='ctx'> </div><div class='ctx'> 	buf = cs-&gt;pipebufs;</div><div class='del'>-	buf-&gt;page = page;</div><div class='add'>+	buf-&gt;page = &amp;folio-&gt;page;</div><div class='ctx'> 	buf-&gt;offset = offset;</div><div class='ctx'> 	buf-&gt;len = count;</div><div class='ctx'> </div><div class='hunk'>@@ -922,20 +1110,24 @@ static int fuse_ref_page(struct fuse_copy_state *cs, struct page *page,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copy a page in the request to/from the userspace buffer.  Must be</div><div class='add'>+ * Copy a folio in the request to/from the userspace buffer.  Must be</div><div class='ctx'>  * done atomically</div><div class='ctx'>  */</div><div class='del'>-static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,</div><div class='del'>-			  unsigned offset, unsigned count, int zeroing)</div><div class='add'>+static int fuse_copy_folio(struct fuse_copy_state *cs, struct folio **foliop,</div><div class='add'>+			   unsigned offset, unsigned count, int zeroing)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct page *page = *pagep;</div><div class='add'>+	struct folio *folio = *foliop;</div><div class='add'>+	size_t size;</div><div class='ctx'> </div><div class='del'>-	if (page &amp;&amp; zeroing &amp;&amp; count &lt; PAGE_SIZE)</div><div class='del'>-		clear_highpage(page);</div><div class='add'>+	if (folio) {</div><div class='add'>+		size = folio_size(folio);</div><div class='add'>+		if (zeroing &amp;&amp; count &lt; size)</div><div class='add'>+			folio_zero_range(folio, 0, size);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	while (count) {</div><div class='del'>-		if (cs-&gt;write &amp;&amp; cs-&gt;pipebufs &amp;&amp; page) {</div><div class='add'>+		if (cs-&gt;write &amp;&amp; cs-&gt;pipebufs &amp;&amp; folio) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Can't control lifetime of pipe buffers, so always</div><div class='ctx'> 			 * copy user pages.</div><div class='hunk'>@@ -945,12 +1137,12 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					return err;</div><div class='ctx'> 			} else {</div><div class='del'>-				return fuse_ref_page(cs, page, offset, count);</div><div class='add'>+				return fuse_ref_folio(cs, folio, offset, count);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (!cs-&gt;len) {</div><div class='del'>-			if (cs-&gt;move_pages &amp;&amp; page &amp;&amp;</div><div class='del'>-			    offset == 0 &amp;&amp; count == PAGE_SIZE) {</div><div class='del'>-				err = fuse_try_move_page(cs, pagep);</div><div class='add'>+			if (cs-&gt;move_folios &amp;&amp; folio &amp;&amp;</div><div class='add'>+			    offset == 0 &amp;&amp; count == size) {</div><div class='add'>+				err = fuse_try_move_folio(cs, foliop);</div><div class='ctx'> 				if (err &lt;= 0)</div><div class='ctx'> 					return err;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -959,34 +1151,41 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,</div><div class='ctx'> 					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (page) {</div><div class='del'>-			void *mapaddr = kmap_local_page(page);</div><div class='del'>-			void *buf = mapaddr + offset;</div><div class='del'>-			offset += fuse_copy_do(cs, &amp;buf, &amp;count);</div><div class='add'>+		if (folio) {</div><div class='add'>+			void *mapaddr = kmap_local_folio(folio, offset);</div><div class='add'>+			void *buf = mapaddr;</div><div class='add'>+			unsigned int copy = count;</div><div class='add'>+			unsigned int bytes_copied;</div><div class='add'>+</div><div class='add'>+			if (folio_test_highmem(folio) &amp;&amp; count &gt; PAGE_SIZE - offset_in_page(offset))</div><div class='add'>+				copy = PAGE_SIZE - offset_in_page(offset);</div><div class='add'>+</div><div class='add'>+			bytes_copied = fuse_copy_do(cs, &amp;buf, &amp;copy);</div><div class='ctx'> 			kunmap_local(mapaddr);</div><div class='add'>+			offset += bytes_copied;</div><div class='add'>+			count -= bytes_copied;</div><div class='ctx'> 		} else</div><div class='ctx'> 			offset += fuse_copy_do(cs, NULL, &amp;count);</div><div class='ctx'> 	}</div><div class='del'>-	if (page &amp;&amp; !cs-&gt;write)</div><div class='del'>-		flush_dcache_page(page);</div><div class='add'>+	if (folio &amp;&amp; !cs-&gt;write)</div><div class='add'>+		flush_dcache_folio(folio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Copy pages in the request to/from userspace buffer */</div><div class='del'>-static int fuse_copy_pages(struct fuse_copy_state *cs, unsigned nbytes,</div><div class='del'>-			   int zeroing)</div><div class='add'>+/* Copy folios in the request to/from userspace buffer */</div><div class='add'>+static int fuse_copy_folios(struct fuse_copy_state *cs, unsigned nbytes,</div><div class='add'>+			    int zeroing)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> 	struct fuse_req *req = cs-&gt;req;</div><div class='ctx'> 	struct fuse_args_pages *ap = container_of(req-&gt;args, typeof(*ap), args);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages &amp;&amp; (nbytes || zeroing); i++) {</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios &amp;&amp; (nbytes || zeroing); i++) {</div><div class='ctx'> 		int err;</div><div class='ctx'> 		unsigned int offset = ap-&gt;descs[i].offset;</div><div class='ctx'> 		unsigned int count = min(nbytes, ap-&gt;descs[i].length);</div><div class='ctx'> </div><div class='del'>-		err = fuse_copy_page(cs, &amp;ap-&gt;pages[i], offset, count, zeroing);</div><div class='add'>+		err = fuse_copy_folio(cs, &amp;ap-&gt;folios[i], offset, count, zeroing);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1010,9 +1209,9 @@ static int fuse_copy_one(struct fuse_copy_state *cs, void *val, unsigned size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Copy request arguments to/from userspace buffer */</div><div class='del'>-static int fuse_copy_args(struct fuse_copy_state *cs, unsigned numargs,</div><div class='del'>-			  unsigned argpages, struct fuse_arg *args,</div><div class='del'>-			  int zeroing)</div><div class='add'>+int fuse_copy_args(struct fuse_copy_state *cs, unsigned numargs,</div><div class='add'>+		   unsigned argpages, struct fuse_arg *args,</div><div class='add'>+		   int zeroing)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned i;</div><div class='hunk'>@@ -1020,7 +1219,7 @@ static int fuse_copy_args(struct fuse_copy_state *cs, unsigned numargs,</div><div class='ctx'> 	for (i = 0; !err &amp;&amp; i &lt; numargs; i++)  {</div><div class='ctx'> 		struct fuse_arg *arg = &amp;args[i];</div><div class='ctx'> 		if (i == numargs - 1 &amp;&amp; argpages)</div><div class='del'>-			err = fuse_copy_pages(cs, arg-&gt;size, zeroing);</div><div class='add'>+			err = fuse_copy_folios(cs, arg-&gt;size, zeroing);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = fuse_copy_one(cs, arg-&gt;value, arg-&gt;size);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1076,9 +1275,9 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 	return err ? err : reqsize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq,</div><div class='del'>-					     unsigned int max,</div><div class='del'>-					     unsigned int *countp)</div><div class='add'>+static struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq,</div><div class='add'>+						    unsigned int max,</div><div class='add'>+						    unsigned int *countp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_forget_link *head = fiq-&gt;forget_list_head.next;</div><div class='ctx'> 	struct fuse_forget_link **newhead = &amp;head;</div><div class='hunk'>@@ -1097,7 +1296,6 @@ struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq,</div><div class='ctx'> </div><div class='ctx'> 	return head;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(fuse_dequeue_forget);</div><div class='ctx'> </div><div class='ctx'> static int fuse_read_single_forget(struct fuse_iqueue *fiq,</div><div class='ctx'> 				   struct fuse_copy_state *cs,</div><div class='hunk'>@@ -1112,7 +1310,7 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 	struct fuse_in_header ih = {</div><div class='ctx'> 		.opcode = FUSE_FORGET,</div><div class='ctx'> 		.nodeid = forget-&gt;forget_one.nodeid,</div><div class='del'>-		.unique = fuse_get_unique(fiq),</div><div class='add'>+		.unique = fuse_get_unique_locked(fiq),</div><div class='ctx'> 		.len = sizeof(ih) + sizeof(arg),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1143,7 +1341,7 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 	struct fuse_batch_forget_in arg = { .count = 0 };</div><div class='ctx'> 	struct fuse_in_header ih = {</div><div class='ctx'> 		.opcode = FUSE_BATCH_FORGET,</div><div class='del'>-		.unique = fuse_get_unique(fiq),</div><div class='add'>+		.unique = fuse_get_unique_locked(fiq),</div><div class='ctx'> 		.len = sizeof(ih) + sizeof(arg),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1350,19 +1548,39 @@ static int fuse_dev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct fuse_dev *fuse_get_dev(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dev *fud = __fuse_get_dev(file);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (likely(fud))</div><div class='add'>+		return fud;</div><div class='add'>+</div><div class='add'>+	err = wait_event_interruptible(fuse_dev_waitq,</div><div class='add'>+				       READ_ONCE(file-&gt;private_data) != FUSE_DEV_SYNC_INIT);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	fud = __fuse_get_dev(file);</div><div class='add'>+	if (!fud)</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='add'>+</div><div class='add'>+	return fud;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t fuse_dev_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_copy_state cs;</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct fuse_dev *fud = fuse_get_dev(file);</div><div class='ctx'> </div><div class='del'>-	if (!fud)</div><div class='del'>-		return -EPERM;</div><div class='add'>+	if (IS_ERR(fud))</div><div class='add'>+		return PTR_ERR(fud);</div><div class='ctx'> </div><div class='ctx'> 	if (!user_backed_iter(to))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	fuse_copy_init(&amp;cs, 1, to);</div><div class='add'>+	fuse_copy_init(&amp;cs, true, to);</div><div class='ctx'> </div><div class='ctx'> 	return fuse_dev_do_read(fud, file, &amp;cs, iov_iter_count(to));</div><div class='ctx'> }</div><div class='hunk'>@@ -1377,22 +1595,22 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,</div><div class='ctx'> 	struct fuse_copy_state cs;</div><div class='ctx'> 	struct fuse_dev *fud = fuse_get_dev(in);</div><div class='ctx'> </div><div class='del'>-	if (!fud)</div><div class='del'>-		return -EPERM;</div><div class='add'>+	if (IS_ERR(fud))</div><div class='add'>+		return PTR_ERR(fud);</div><div class='ctx'> </div><div class='ctx'> 	bufs = kvmalloc_array(pipe-&gt;max_usage, sizeof(struct pipe_buffer),</div><div class='ctx'> 			      GFP_KERNEL);</div><div class='ctx'> 	if (!bufs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	fuse_copy_init(&amp;cs, 1, NULL);</div><div class='add'>+	fuse_copy_init(&amp;cs, true, NULL);</div><div class='ctx'> 	cs.pipebufs = bufs;</div><div class='ctx'> 	cs.pipe = pipe;</div><div class='ctx'> 	ret = fuse_dev_do_read(fud, in, &amp;cs, len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (pipe_occupancy(pipe-&gt;head, pipe-&gt;tail) + cs.nr_segs &gt; pipe-&gt;max_usage) {</div><div class='add'>+	if (pipe_buf_usage(pipe) + cs.nr_segs &gt; pipe-&gt;max_usage) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1422,35 +1640,31 @@ static int fuse_notify_poll(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 			    struct fuse_copy_state *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_notify_poll_wakeup_out outarg;</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (size != sizeof(outarg))</div><div class='del'>-		goto err;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	fuse_copy_finish(cs);</div><div class='ctx'> 	return fuse_notify_poll_wakeup(fc, &amp;outarg);</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	fuse_copy_finish(cs);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_notify_inval_inode(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 				   struct fuse_copy_state *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_notify_inval_inode_out outarg;</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (size != sizeof(outarg))</div><div class='del'>-		goto err;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+		return err;</div><div class='ctx'> 	fuse_copy_finish(cs);</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;fc-&gt;killsb);</div><div class='hunk'>@@ -1458,39 +1672,33 @@ static int fuse_notify_inval_inode(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 				       outarg.off, outarg.len);</div><div class='ctx'> 	up_read(&amp;fc-&gt;killsb);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	fuse_copy_finish(cs);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 				   struct fuse_copy_state *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_notify_inval_entry_out outarg;</div><div class='del'>-	int err = -ENOMEM;</div><div class='add'>+	int err;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	struct qstr name;</div><div class='ctx'> </div><div class='del'>-	buf = kzalloc(FUSE_NAME_MAX + 1, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (size &lt; sizeof(outarg))</div><div class='del'>-		goto err;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = -ENAMETOOLONG;</div><div class='del'>-	if (outarg.namelen &gt; FUSE_NAME_MAX)</div><div class='del'>-		goto err;</div><div class='add'>+	if (outarg.namelen &gt; fc-&gt;name_max)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	if (size != sizeof(outarg) + outarg.namelen + 1)</div><div class='del'>-		goto err;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(outarg.namelen + 1, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	name.name = buf;</div><div class='ctx'> 	name.len = outarg.namelen;</div><div class='hunk'>@@ -1503,12 +1711,8 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 	down_read(&amp;fc-&gt;killsb);</div><div class='ctx'> 	err = fuse_reverse_inval_entry(fc, outarg.parent, 0, &amp;name, outarg.flags);</div><div class='ctx'> 	up_read(&amp;fc-&gt;killsb);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='ctx'> err:</div><div class='ctx'> 	kfree(buf);</div><div class='del'>-	fuse_copy_finish(cs);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1516,29 +1720,26 @@ static int fuse_notify_delete(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 			      struct fuse_copy_state *cs)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_notify_delete_out outarg;</div><div class='del'>-	int err = -ENOMEM;</div><div class='add'>+	int err;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	struct qstr name;</div><div class='ctx'> </div><div class='del'>-	buf = kzalloc(FUSE_NAME_MAX + 1, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (size &lt; sizeof(outarg))</div><div class='del'>-		goto err;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = -ENAMETOOLONG;</div><div class='del'>-	if (outarg.namelen &gt; FUSE_NAME_MAX)</div><div class='del'>-		goto err;</div><div class='add'>+	if (outarg.namelen &gt; fc-&gt;name_max)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (size != sizeof(outarg) + outarg.namelen + 1)</div><div class='del'>-		goto err;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(outarg.namelen + 1, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	name.name = buf;</div><div class='ctx'> 	name.len = outarg.namelen;</div><div class='hunk'>@@ -1551,12 +1752,8 @@ static int fuse_notify_delete(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 	down_read(&amp;fc-&gt;killsb);</div><div class='ctx'> 	err = fuse_reverse_inval_entry(fc, outarg.parent, outarg.child, &amp;name, 0);</div><div class='ctx'> 	up_read(&amp;fc-&gt;killsb);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='ctx'> err:</div><div class='ctx'> 	kfree(buf);</div><div class='del'>-	fuse_copy_finish(cs);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1574,17 +1771,15 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 	loff_t file_size;</div><div class='ctx'> 	loff_t end;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (size &lt; sizeof(outarg))</div><div class='del'>-		goto out_finish;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_finish;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (size - sizeof(outarg) != outarg.size)</div><div class='del'>-		goto out_finish;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	nodeid = outarg.nodeid;</div><div class='ctx'> </div><div class='hunk'>@@ -1607,29 +1802,35 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> </div><div class='ctx'> 	num = outarg.size;</div><div class='ctx'> 	while (num) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		unsigned int this_num;</div><div class='del'>-</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		page = find_or_create_page(mapping, index,</div><div class='del'>-					   mapping_gfp_mask(mapping));</div><div class='del'>-		if (!page)</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		unsigned int folio_offset;</div><div class='add'>+		unsigned int nr_bytes;</div><div class='add'>+		unsigned int nr_pages;</div><div class='add'>+</div><div class='add'>+		folio = filemap_grab_folio(mapping, index);</div><div class='add'>+		err = PTR_ERR(folio);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			goto out_iput;</div><div class='ctx'> </div><div class='del'>-		this_num = min_t(unsigned, num, PAGE_SIZE - offset);</div><div class='del'>-		err = fuse_copy_page(cs, &amp;page, offset, this_num, 0);</div><div class='del'>-		if (!err &amp;&amp; offset == 0 &amp;&amp;</div><div class='del'>-		    (this_num == PAGE_SIZE || file_size == end))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_offset = ((index - folio-&gt;index) &lt;&lt; PAGE_SHIFT) + offset;</div><div class='add'>+		nr_bytes = min_t(unsigned, num, folio_size(folio) - folio_offset);</div><div class='add'>+		nr_pages = (offset + nr_bytes + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+		err = fuse_copy_folio(cs, &amp;folio, folio_offset, nr_bytes, 0);</div><div class='add'>+		if (!folio_test_uptodate(folio) &amp;&amp; !err &amp;&amp; offset == 0 &amp;&amp;</div><div class='add'>+		    (nr_bytes == folio_size(folio) || file_size == end)) {</div><div class='add'>+			folio_zero_segment(folio, nr_bytes, folio_size(folio));</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+		}</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_iput;</div><div class='ctx'> </div><div class='del'>-		num -= this_num;</div><div class='add'>+		num -= nr_bytes;</div><div class='ctx'> 		offset = 0;</div><div class='del'>-		index++;</div><div class='add'>+		index += nr_pages;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -1638,8 +1839,6 @@ out_iput:</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> out_up_killsb:</div><div class='ctx'> 	up_read(&amp;fc-&gt;killsb);</div><div class='del'>-out_finish:</div><div class='del'>-	fuse_copy_finish(cs);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1654,7 +1853,7 @@ static void fuse_retrieve_end(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	struct fuse_retrieve_args *ra =</div><div class='ctx'> 		container_of(args, typeof(*ra), ap.args);</div><div class='ctx'> </div><div class='del'>-	release_pages(ra-&gt;ap.pages, ra-&gt;ap.num_pages);</div><div class='add'>+	release_pages(ra-&gt;ap.folios, ra-&gt;ap.num_folios);</div><div class='ctx'> 	kfree(ra);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1686,50 +1885,57 @@ static int fuse_retrieve(struct fuse_mount *fm, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	num_pages = (num + offset + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	num_pages = min(num_pages, fc-&gt;max_pages);</div><div class='add'>+	num = min(num, num_pages &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	args_size += num_pages * (sizeof(ap-&gt;pages[0]) + sizeof(ap-&gt;descs[0]));</div><div class='add'>+	args_size += num_pages * (sizeof(ap-&gt;folios[0]) + sizeof(ap-&gt;descs[0]));</div><div class='ctx'> </div><div class='ctx'> 	ra = kzalloc(args_size, GFP_KERNEL);</div><div class='ctx'> 	if (!ra)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ap = &amp;ra-&gt;ap;</div><div class='del'>-	ap-&gt;pages = (void *) (ra + 1);</div><div class='del'>-	ap-&gt;descs = (void *) (ap-&gt;pages + num_pages);</div><div class='add'>+	ap-&gt;folios = (void *) (ra + 1);</div><div class='add'>+	ap-&gt;descs = (void *) (ap-&gt;folios + num_pages);</div><div class='ctx'> </div><div class='ctx'> 	args = &amp;ap-&gt;args;</div><div class='ctx'> 	args-&gt;nodeid = outarg-&gt;nodeid;</div><div class='ctx'> 	args-&gt;opcode = FUSE_NOTIFY_REPLY;</div><div class='del'>-	args-&gt;in_numargs = 2;</div><div class='add'>+	args-&gt;in_numargs = 3;</div><div class='ctx'> 	args-&gt;in_pages = true;</div><div class='ctx'> 	args-&gt;end = fuse_retrieve_end;</div><div class='ctx'> </div><div class='ctx'> 	index = outarg-&gt;offset &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	while (num &amp;&amp; ap-&gt;num_pages &lt; num_pages) {</div><div class='del'>-		struct page *page;</div><div class='del'>-		unsigned int this_num;</div><div class='add'>+	while (num &amp;&amp; ap-&gt;num_folios &lt; num_pages) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		unsigned int folio_offset;</div><div class='add'>+		unsigned int nr_bytes;</div><div class='add'>+		unsigned int nr_pages;</div><div class='ctx'> </div><div class='del'>-		page = find_get_page(mapping, index);</div><div class='del'>-		if (!page)</div><div class='add'>+		folio = filemap_get_folio(mapping, index);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		this_num = min_t(unsigned, num, PAGE_SIZE - offset);</div><div class='del'>-		ap-&gt;pages[ap-&gt;num_pages] = page;</div><div class='del'>-		ap-&gt;descs[ap-&gt;num_pages].offset = offset;</div><div class='del'>-		ap-&gt;descs[ap-&gt;num_pages].length = this_num;</div><div class='del'>-		ap-&gt;num_pages++;</div><div class='add'>+		folio_offset = ((index - folio-&gt;index) &lt;&lt; PAGE_SHIFT) + offset;</div><div class='add'>+		nr_bytes = min(folio_size(folio) - folio_offset, num);</div><div class='add'>+		nr_pages = (offset + nr_bytes + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+		ap-&gt;folios[ap-&gt;num_folios] = folio;</div><div class='add'>+		ap-&gt;descs[ap-&gt;num_folios].offset = folio_offset;</div><div class='add'>+		ap-&gt;descs[ap-&gt;num_folios].length = nr_bytes;</div><div class='add'>+		ap-&gt;num_folios++;</div><div class='ctx'> </div><div class='ctx'> 		offset = 0;</div><div class='del'>-		num -= this_num;</div><div class='del'>-		total_len += this_num;</div><div class='del'>-		index++;</div><div class='add'>+		num -= nr_bytes;</div><div class='add'>+		total_len += nr_bytes;</div><div class='add'>+		index += nr_pages;</div><div class='ctx'> 	}</div><div class='ctx'> 	ra-&gt;inarg.offset = outarg-&gt;offset;</div><div class='ctx'> 	ra-&gt;inarg.size = total_len;</div><div class='del'>-	args-&gt;in_args[0].size = sizeof(ra-&gt;inarg);</div><div class='del'>-	args-&gt;in_args[0].value = &amp;ra-&gt;inarg;</div><div class='del'>-	args-&gt;in_args[1].size = total_len;</div><div class='add'>+	fuse_set_zero_arg0(args);</div><div class='add'>+	args-&gt;in_args[1].size = sizeof(ra-&gt;inarg);</div><div class='add'>+	args-&gt;in_args[1].value = &amp;ra-&gt;inarg;</div><div class='add'>+	args-&gt;in_args[2].size = total_len;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_simple_notify_reply(fm, args, outarg-&gt;notify_unique);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1747,13 +1953,12 @@ static int fuse_notify_retrieve(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 	u64 nodeid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (size != sizeof(outarg))</div><div class='del'>-		goto copy_finish;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto copy_finish;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	fuse_copy_finish(cs);</div><div class='ctx'> </div><div class='hunk'>@@ -1769,17 +1974,126 @@ static int fuse_notify_retrieve(struct fuse_conn *fc, unsigned int size,</div><div class='ctx'> 	up_read(&amp;fc-&gt;killsb);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-copy_finish:</div><div class='del'>-	fuse_copy_finish(cs);</div><div class='del'>-	return err;</div><div class='add'>+/*</div><div class='add'>+ * Resending all processing queue requests.</div><div class='add'>+ *</div><div class='add'>+ * During a FUSE daemon panics and failover, it is possible for some inflight</div><div class='add'>+ * requests to be lost and never returned. As a result, applications awaiting</div><div class='add'>+ * replies would become stuck forever. To address this, we can use notification</div><div class='add'>+ * to trigger resending of these pending requests to the FUSE daemon, ensuring</div><div class='add'>+ * they are properly processed again.</div><div class='add'>+ *</div><div class='add'>+ * Please note that this strategy is applicable only to idempotent requests or</div><div class='add'>+ * if the FUSE daemon takes careful measures to avoid processing duplicated</div><div class='add'>+ * non-idempotent requests.</div><div class='add'>+ */</div><div class='add'>+static void fuse_resend(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dev *fud;</div><div class='add'>+	struct fuse_req *req, *next;</div><div class='add'>+	struct fuse_iqueue *fiq = &amp;fc-&gt;iq;</div><div class='add'>+	LIST_HEAD(to_queue);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	if (!fc-&gt;connected) {</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(fud, &amp;fc-&gt;devices, entry) {</div><div class='add'>+		struct fuse_pqueue *fpq = &amp;fud-&gt;pq;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;fpq-&gt;lock);</div><div class='add'>+		for (i = 0; i &lt; FUSE_PQ_HASH_SIZE; i++)</div><div class='add'>+			list_splice_tail_init(&amp;fpq-&gt;processing[i], &amp;to_queue);</div><div class='add'>+		spin_unlock(&amp;fpq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(req, next, &amp;to_queue, list) {</div><div class='add'>+		set_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='add'>+		clear_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='add'>+		/* mark the request as resend request */</div><div class='add'>+		req-&gt;in.h.unique |= FUSE_UNIQUE_RESEND;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fiq-&gt;lock);</div><div class='add'>+	if (!fiq-&gt;connected) {</div><div class='add'>+		spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+		list_for_each_entry(req, &amp;to_queue, list)</div><div class='add'>+			clear_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='add'>+		fuse_dev_end_requests(&amp;to_queue);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* iq and pq requests are both oldest to newest */</div><div class='add'>+	list_splice(&amp;to_queue, &amp;fiq-&gt;pending);</div><div class='add'>+	fuse_dev_wake_and_unlock(fiq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_notify_resend(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	fuse_resend(fc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Increments the fuse connection epoch.  This will result of dentries from</div><div class='add'>+ * previous epochs to be invalidated.  Additionally, if inval_wq is set, a work</div><div class='add'>+ * queue is scheduled to trigger the invalidation.</div><div class='add'>+ */</div><div class='add'>+static int fuse_notify_inc_epoch(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;fc-&gt;epoch);</div><div class='add'>+	if (inval_wq)</div><div class='add'>+		schedule_work(&amp;fc-&gt;epoch_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_notify_prune(struct fuse_conn *fc, unsigned int size,</div><div class='add'>+			     struct fuse_copy_state *cs)</div><div class='add'>+{</div><div class='add'>+	struct fuse_notify_prune_out outarg;</div><div class='add'>+	const unsigned int batch = 512;</div><div class='add'>+	u64 *nodeids __free(kfree) = kmalloc(sizeof(u64) * batch, GFP_KERNEL);</div><div class='add'>+	unsigned int num, i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!nodeids)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (size &lt; sizeof(outarg))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = fuse_copy_one(cs, &amp;outarg, sizeof(outarg));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (size - sizeof(outarg) != outarg.count * sizeof(u64))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (; outarg.count; outarg.count -= num) {</div><div class='add'>+		num = min(batch, outarg.count);</div><div class='add'>+		err = fuse_copy_one(cs, nodeids, num * sizeof(u64));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		scoped_guard(rwsem_read, &amp;fc-&gt;killsb) {</div><div class='add'>+			for (i = 0; i &lt; num; i++)</div><div class='add'>+				fuse_try_prune_one_inode(fc, nodeids[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_notify(struct fuse_conn *fc, enum fuse_notify_code code,</div><div class='ctx'> 		       unsigned int size, struct fuse_copy_state *cs)</div><div class='ctx'> {</div><div class='del'>-	/* Don't try to move pages (yet) */</div><div class='del'>-	cs-&gt;move_pages = 0;</div><div class='add'>+	/* Don't try to move folios (yet) */</div><div class='add'>+	cs-&gt;move_folios = false;</div><div class='ctx'> </div><div class='ctx'> 	switch (code) {</div><div class='ctx'> 	case FUSE_NOTIFY_POLL:</div><div class='hunk'>@@ -1800,14 +2114,22 @@ static int fuse_notify(struct fuse_conn *fc, enum fuse_notify_code code,</div><div class='ctx'> 	case FUSE_NOTIFY_DELETE:</div><div class='ctx'> 		return fuse_notify_delete(fc, size, cs);</div><div class='ctx'> </div><div class='add'>+	case FUSE_NOTIFY_RESEND:</div><div class='add'>+		return fuse_notify_resend(fc);</div><div class='add'>+</div><div class='add'>+	case FUSE_NOTIFY_INC_EPOCH:</div><div class='add'>+		return fuse_notify_inc_epoch(fc);</div><div class='add'>+</div><div class='add'>+	case FUSE_NOTIFY_PRUNE:</div><div class='add'>+		return fuse_notify_prune(fc, size, cs);</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='del'>-		fuse_copy_finish(cs);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Look up request on processing list by unique ID */</div><div class='del'>-static struct fuse_req *request_find(struct fuse_pqueue *fpq, u64 unique)</div><div class='add'>+struct fuse_req *fuse_request_find(struct fuse_pqueue *fpq, u64 unique)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int hash = fuse_req_hash(unique);</div><div class='ctx'> 	struct fuse_req *req;</div><div class='hunk'>@@ -1819,10 +2141,17 @@ static struct fuse_req *request_find(struct fuse_pqueue *fpq, u64 unique)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,</div><div class='del'>-			 unsigned nbytes)</div><div class='add'>+int fuse_copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,</div><div class='add'>+		       unsigned nbytes)</div><div class='ctx'> {</div><div class='del'>-	unsigned reqsize = sizeof(struct fuse_out_header);</div><div class='add'>+</div><div class='add'>+	unsigned int reqsize = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Uring has all headers separated from args - args is payload only</div><div class='add'>+	 */</div><div class='add'>+	if (!cs-&gt;is_uring)</div><div class='add'>+		reqsize = sizeof(struct fuse_out_header);</div><div class='ctx'> </div><div class='ctx'> 	reqsize += fuse_len_args(args-&gt;out_numargs, args-&gt;out_args);</div><div class='ctx'> </div><div class='hunk'>@@ -1874,7 +2203,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!oh.unique) {</div><div class='ctx'> 		err = fuse_notify(fc, oh.error, nbytes - sizeof(oh), cs);</div><div class='del'>-		goto out;</div><div class='add'>+		goto copy_finish;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='hunk'>@@ -1884,7 +2213,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,</div><div class='ctx'> 	spin_lock(&amp;fpq-&gt;lock);</div><div class='ctx'> 	req = NULL;</div><div class='ctx'> 	if (fpq-&gt;connected)</div><div class='del'>-		req = request_find(fpq, oh.unique &amp; ~FUSE_INT_REQ_BIT);</div><div class='add'>+		req = fuse_request_find(fpq, oh.unique &amp; ~FUSE_INT_REQ_BIT);</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOENT;</div><div class='ctx'> 	if (!req) {</div><div class='hunk'>@@ -1917,12 +2246,12 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,</div><div class='ctx'> 	spin_unlock(&amp;fpq-&gt;lock);</div><div class='ctx'> 	cs-&gt;req = req;</div><div class='ctx'> 	if (!req-&gt;args-&gt;page_replace)</div><div class='del'>-		cs-&gt;move_pages = 0;</div><div class='add'>+		cs-&gt;move_folios = false;</div><div class='ctx'> </div><div class='ctx'> 	if (oh.error)</div><div class='ctx'> 		err = nbytes != sizeof(oh) ? -EINVAL : 0;</div><div class='ctx'> 	else</div><div class='del'>-		err = copy_out_args(cs, req-&gt;args, nbytes);</div><div class='add'>+		err = fuse_copy_out_args(cs, req-&gt;args, nbytes);</div><div class='ctx'> 	fuse_copy_finish(cs);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fpq-&gt;lock);</div><div class='hunk'>@@ -1947,7 +2276,7 @@ copy_finish:</div><div class='ctx'> static ssize_t fuse_dev_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_copy_state cs;</div><div class='del'>-	struct fuse_dev *fud = fuse_get_dev(iocb-&gt;ki_filp);</div><div class='add'>+	struct fuse_dev *fud = __fuse_get_dev(iocb-&gt;ki_filp);</div><div class='ctx'> </div><div class='ctx'> 	if (!fud)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -1955,7 +2284,7 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	if (!user_backed_iter(from))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	fuse_copy_init(&amp;cs, 0, from);</div><div class='add'>+	fuse_copy_init(&amp;cs, false, from);</div><div class='ctx'> </div><div class='ctx'> 	return fuse_dev_do_write(fud, &amp;cs, iov_iter_count(from));</div><div class='ctx'> }</div><div class='hunk'>@@ -1964,16 +2293,15 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,</div><div class='ctx'> 				     struct file *out, loff_t *ppos,</div><div class='ctx'> 				     size_t len, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	unsigned int head, tail, mask, count;</div><div class='add'>+	unsigned int head, tail, count;</div><div class='ctx'> 	unsigned nbuf;</div><div class='ctx'> 	unsigned idx;</div><div class='ctx'> 	struct pipe_buffer *bufs;</div><div class='ctx'> 	struct fuse_copy_state cs;</div><div class='del'>-	struct fuse_dev *fud;</div><div class='add'>+	struct fuse_dev *fud = __fuse_get_dev(out);</div><div class='ctx'> 	size_t rem;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	fud = fuse_get_dev(out);</div><div class='ctx'> 	if (!fud)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='hunk'>@@ -1981,8 +2309,7 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,</div><div class='ctx'> </div><div class='ctx'> 	head = pipe-&gt;head;</div><div class='ctx'> 	tail = pipe-&gt;tail;</div><div class='del'>-	mask = pipe-&gt;ring_size - 1;</div><div class='del'>-	count = head - tail;</div><div class='add'>+	count = pipe_occupancy(head, tail);</div><div class='ctx'> </div><div class='ctx'> 	bufs = kvmalloc_array(count, sizeof(struct pipe_buffer), GFP_KERNEL);</div><div class='ctx'> 	if (!bufs) {</div><div class='hunk'>@@ -1992,8 +2319,8 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,</div><div class='ctx'> </div><div class='ctx'> 	nbuf = 0;</div><div class='ctx'> 	rem = 0;</div><div class='del'>-	for (idx = tail; idx != head &amp;&amp; rem &lt; len; idx++)</div><div class='del'>-		rem += pipe-&gt;bufs[idx &amp; mask].len;</div><div class='add'>+	for (idx = tail; !pipe_empty(head, idx) &amp;&amp; rem &lt; len; idx++)</div><div class='add'>+		rem += pipe_buf(pipe, idx)-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	if (rem &lt; len)</div><div class='hunk'>@@ -2004,10 +2331,10 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,</div><div class='ctx'> 		struct pipe_buffer *ibuf;</div><div class='ctx'> 		struct pipe_buffer *obuf;</div><div class='ctx'> </div><div class='del'>-		if (WARN_ON(nbuf &gt;= count || tail == head))</div><div class='add'>+		if (WARN_ON(nbuf &gt;= count || pipe_empty(head, tail)))</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> </div><div class='del'>-		ibuf = &amp;pipe-&gt;bufs[tail &amp; mask];</div><div class='add'>+		ibuf = pipe_buf(pipe, tail);</div><div class='ctx'> 		obuf = &amp;bufs[nbuf];</div><div class='ctx'> </div><div class='ctx'> 		if (rem &gt;= ibuf-&gt;len) {</div><div class='hunk'>@@ -2030,13 +2357,13 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,</div><div class='ctx'> 	}</div><div class='ctx'> 	pipe_unlock(pipe);</div><div class='ctx'> </div><div class='del'>-	fuse_copy_init(&amp;cs, 0, NULL);</div><div class='add'>+	fuse_copy_init(&amp;cs, false, NULL);</div><div class='ctx'> 	cs.pipebufs = bufs;</div><div class='ctx'> 	cs.nr_segs = nbuf;</div><div class='ctx'> 	cs.pipe = pipe;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; SPLICE_F_MOVE)</div><div class='del'>-		cs.move_pages = 1;</div><div class='add'>+		cs.move_folios = true;</div><div class='ctx'> </div><div class='ctx'> 	ret = fuse_dev_do_write(fud, &amp;cs, len);</div><div class='ctx'> </div><div class='hunk'>@@ -2060,7 +2387,7 @@ static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)</div><div class='ctx'> 	struct fuse_iqueue *fiq;</div><div class='ctx'> 	struct fuse_dev *fud = fuse_get_dev(file);</div><div class='ctx'> </div><div class='del'>-	if (!fud)</div><div class='add'>+	if (IS_ERR(fud))</div><div class='ctx'> 		return EPOLLERR;</div><div class='ctx'> </div><div class='ctx'> 	fiq = &amp;fud-&gt;fc-&gt;iq;</div><div class='hunk'>@@ -2077,7 +2404,7 @@ static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Abort all requests on the given list (pending or processing) */</div><div class='del'>-static void end_requests(struct list_head *head)</div><div class='add'>+void fuse_dev_end_requests(struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	while (!list_empty(head)) {</div><div class='ctx'> 		struct fuse_req *req;</div><div class='hunk'>@@ -2113,7 +2440,7 @@ static void end_polls(struct fuse_conn *fc)</div><div class='ctx'>  * The same effect is usually achievable through killing the filesystem daemon</div><div class='ctx'>  * and all users of the filesystem.  The exception is the combination of an</div><div class='ctx'>  * asynchronous request and the tricky deadlock (see</div><div class='del'>- * Documentation/filesystems/fuse.rst).</div><div class='add'>+ * Documentation/filesystems/fuse/fuse.rst).</div><div class='ctx'>  *</div><div class='ctx'>  * Aborting requests under I/O goes as follows: 1: Separate out unlocked</div><div class='ctx'>  * requests, they should be finished off immediately.  Locked requests will be</div><div class='hunk'>@@ -2133,6 +2460,9 @@ void fuse_abort_conn(struct fuse_conn *fc)</div><div class='ctx'> 		LIST_HEAD(to_end);</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> </div><div class='add'>+		if (fc-&gt;timeout.req_timeout)</div><div class='add'>+			cancel_delayed_work(&amp;fc-&gt;timeout.work);</div><div class='add'>+</div><div class='ctx'> 		/* Background queuing checks fc-&gt;connected under bg_lock */</div><div class='ctx'> 		spin_lock(&amp;fc-&gt;bg_lock);</div><div class='ctx'> 		fc-&gt;connected = 0;</div><div class='hunk'>@@ -2180,7 +2510,13 @@ void fuse_abort_conn(struct fuse_conn *fc)</div><div class='ctx'> 		wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		end_requests(&amp;to_end);</div><div class='add'>+		fuse_dev_end_requests(&amp;to_end);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * fc-&gt;lock must not be taken to avoid conflicts with io-uring</div><div class='add'>+		 * locks</div><div class='add'>+		 */</div><div class='add'>+		fuse_uring_abort(fc);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2192,11 +2528,13 @@ void fuse_wait_aborted(struct fuse_conn *fc)</div><div class='ctx'> 	/* matches implicit memory barrier in fuse_drop_waiting() */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	wait_event(fc-&gt;blocked_waitq, atomic_read(&amp;fc-&gt;num_waiting) == 0);</div><div class='add'>+</div><div class='add'>+	fuse_uring_wait_stopped_queues(fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fuse_dev_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_dev *fud = fuse_get_dev(file);</div><div class='add'>+	struct fuse_dev *fud = __fuse_get_dev(file);</div><div class='ctx'> </div><div class='ctx'> 	if (fud) {</div><div class='ctx'> 		struct fuse_conn *fc = fud-&gt;fc;</div><div class='hunk'>@@ -2210,7 +2548,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)</div><div class='ctx'> 			list_splice_init(&amp;fpq-&gt;processing[i], &amp;to_end);</div><div class='ctx'> 		spin_unlock(&amp;fpq-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		end_requests(&amp;to_end);</div><div class='add'>+		fuse_dev_end_requests(&amp;to_end);</div><div class='ctx'> </div><div class='ctx'> 		/* Are we the last open device? */</div><div class='ctx'> 		if (atomic_dec_and_test(&amp;fc-&gt;dev_count)) {</div><div class='hunk'>@@ -2227,8 +2565,8 @@ static int fuse_dev_fasync(int fd, struct file *file, int on)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_dev *fud = fuse_get_dev(file);</div><div class='ctx'> </div><div class='del'>-	if (!fud)</div><div class='del'>-		return -EPERM;</div><div class='add'>+	if (IS_ERR(fud))</div><div class='add'>+		return PTR_ERR(fud);</div><div class='ctx'> </div><div class='ctx'> 	/* No locking - fasync_helper does its own locking */</div><div class='ctx'> 	return fasync_helper(fd, file, on, &amp;fud-&gt;fc-&gt;iq.fasync);</div><div class='hunk'>@@ -2238,7 +2576,7 @@ static int fuse_device_clone(struct fuse_conn *fc, struct file *new)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_dev *fud;</div><div class='ctx'> </div><div class='del'>-	if (new-&gt;private_data)</div><div class='add'>+	if (__fuse_get_dev(new))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fud = fuse_dev_alloc_install(fc);</div><div class='hunk'>@@ -2251,49 +2589,121 @@ static int fuse_device_clone(struct fuse_conn *fc, struct file *new)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long fuse_dev_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-			   unsigned long arg)</div><div class='add'>+static long fuse_dev_ioctl_clone(struct file *file, __u32 __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> 	int oldfd;</div><div class='ctx'> 	struct fuse_dev *fud = NULL;</div><div class='del'>-	struct fd f;</div><div class='add'>+</div><div class='add'>+	if (get_user(oldfd, argp))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	CLASS(fd, f)(oldfd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check against file-&gt;f_op because CUSE</div><div class='add'>+	 * uses the same ioctl handler.</div><div class='add'>+	 */</div><div class='add'>+	if (fd_file(f)-&gt;f_op == file-&gt;f_op)</div><div class='add'>+		fud = __fuse_get_dev(fd_file(f));</div><div class='add'>+</div><div class='add'>+	res = -EINVAL;</div><div class='add'>+	if (fud) {</div><div class='add'>+		mutex_lock(&amp;fuse_mutex);</div><div class='add'>+		res = fuse_device_clone(fud-&gt;fc, file);</div><div class='add'>+		mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long fuse_dev_ioctl_backing_open(struct file *file,</div><div class='add'>+					struct fuse_backing_map __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dev *fud = fuse_get_dev(file);</div><div class='add'>+	struct fuse_backing_map map;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(fud))</div><div class='add'>+		return PTR_ERR(fud);</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;map, argp, sizeof(map)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return fuse_backing_open(fud-&gt;fc, &amp;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long fuse_dev_ioctl_backing_close(struct file *file, __u32 __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dev *fud = fuse_get_dev(file);</div><div class='add'>+	int backing_id;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(fud))</div><div class='add'>+		return PTR_ERR(fud);</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (get_user(backing_id, argp))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return fuse_backing_close(fud-&gt;fc, backing_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long fuse_dev_ioctl_sync_init(struct file *file)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fuse_mutex);</div><div class='add'>+	if (!__fuse_get_dev(file)) {</div><div class='add'>+		WRITE_ONCE(file-&gt;private_data, FUSE_DEV_SYNC_INIT);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long fuse_dev_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			   unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case FUSE_DEV_IOC_CLONE:</div><div class='del'>-		if (get_user(oldfd, (__u32 __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		return fuse_dev_ioctl_clone(file, argp);</div><div class='ctx'> </div><div class='del'>-		f = fdget(oldfd);</div><div class='del'>-		if (!f.file)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	case FUSE_DEV_IOC_BACKING_OPEN:</div><div class='add'>+		return fuse_dev_ioctl_backing_open(file, argp);</div><div class='add'>+</div><div class='add'>+	case FUSE_DEV_IOC_BACKING_CLOSE:</div><div class='add'>+		return fuse_dev_ioctl_backing_close(file, argp);</div><div class='add'>+</div><div class='add'>+	case FUSE_DEV_IOC_SYNC_INIT:</div><div class='add'>+		return fuse_dev_ioctl_sync_init(file);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Check against file-&gt;f_op because CUSE</div><div class='del'>-		 * uses the same ioctl handler.</div><div class='del'>-		 */</div><div class='del'>-		if (f.file-&gt;f_op == file-&gt;f_op)</div><div class='del'>-			fud = fuse_get_dev(f.file);</div><div class='del'>-</div><div class='del'>-		res = -EINVAL;</div><div class='del'>-		if (fud) {</div><div class='del'>-			mutex_lock(&amp;fuse_mutex);</div><div class='del'>-			res = fuse_device_clone(fud-&gt;fc, file);</div><div class='del'>-			mutex_unlock(&amp;fuse_mutex);</div><div class='del'>-		}</div><div class='del'>-		fdput(f);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='del'>-		res = -ENOTTY;</div><div class='del'>-		break;</div><div class='add'>+		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='del'>-	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+static void fuse_dev_show_fdinfo(struct seq_file *seq, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dev *fud = __fuse_get_dev(file);</div><div class='add'>+	if (!fud)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "fuse_connection:\t%u\n", fud-&gt;fc-&gt;dev);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> const struct file_operations fuse_dev_operations = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= fuse_dev_open,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='ctx'> 	.read_iter	= fuse_dev_read,</div><div class='ctx'> 	.splice_read	= fuse_dev_splice_read,</div><div class='ctx'> 	.write_iter	= fuse_dev_write,</div><div class='hunk'>@@ -2303,6 +2713,12 @@ const struct file_operations fuse_dev_operations = {</div><div class='ctx'> 	.fasync		= fuse_dev_fasync,</div><div class='ctx'> 	.unlocked_ioctl = fuse_dev_ioctl,</div><div class='ctx'> 	.compat_ioctl   = compat_ptr_ioctl,</div><div class='add'>+#ifdef CONFIG_FUSE_IO_URING</div><div class='add'>+	.uring_cmd	= fuse_uring_cmd,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	.show_fdinfo	= fuse_dev_show_fdinfo,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_dev_operations);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c<br/>new file mode 100644<br/>index 000000000000..5ceb217ced1b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/dev_uring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/dev_uring.c</a></div><div class='hunk'>@@ -0,0 +1,1373 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * FUSE: Filesystem in Userspace</div><div class='add'>+ * Copyright (c) 2023-2024 DataDirect Networks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+#include "dev_uring_i.h"</div><div class='add'>+#include "fuse_dev_i.h"</div><div class='add'>+#include "fuse_trace.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/io_uring/cmd.h&gt;</div><div class='add'>+</div><div class='add'>+static bool __read_mostly enable_uring;</div><div class='add'>+module_param(enable_uring, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(enable_uring,</div><div class='add'>+		 "Enable userspace communication through io-uring");</div><div class='add'>+</div><div class='add'>+#define FUSE_URING_IOV_SEGS 2 /* header and payload */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+bool fuse_uring_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return enable_uring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fuse_uring_pdu {</div><div class='add'>+	struct fuse_ring_ent *ent;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fuse_iqueue_ops fuse_io_uring_ops;</div><div class='add'>+</div><div class='add'>+static void uring_cmd_set_ring_ent(struct io_uring_cmd *cmd,</div><div class='add'>+				   struct fuse_ring_ent *ring_ent)</div><div class='add'>+{</div><div class='add'>+	struct fuse_uring_pdu *pdu =</div><div class='add'>+		io_uring_cmd_to_pdu(cmd, struct fuse_uring_pdu);</div><div class='add'>+</div><div class='add'>+	pdu-&gt;ent = ring_ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_ring_ent *uring_cmd_to_ring_ent(struct io_uring_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct fuse_uring_pdu *pdu =</div><div class='add'>+		io_uring_cmd_to_pdu(cmd, struct fuse_uring_pdu);</div><div class='add'>+</div><div class='add'>+	return pdu-&gt;ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_flush_bg(struct fuse_ring_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = queue-&gt;ring;</div><div class='add'>+	struct fuse_conn *fc = ring-&gt;fc;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;queue-&gt;lock);</div><div class='add'>+	lockdep_assert_held(&amp;fc-&gt;bg_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allow one bg request per queue, ignoring global fc limits.</div><div class='add'>+	 * This prevents a single queue from consuming all resources and</div><div class='add'>+	 * eliminates the need for remote queue wake-ups when global</div><div class='add'>+	 * limits are met but this queue has no more waiting requests.</div><div class='add'>+	 */</div><div class='add'>+	while ((fc-&gt;active_background &lt; fc-&gt;max_background ||</div><div class='add'>+		!queue-&gt;active_background) &amp;&amp;</div><div class='add'>+	       (!list_empty(&amp;queue-&gt;fuse_req_bg_queue))) {</div><div class='add'>+		struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+		req = list_first_entry(&amp;queue-&gt;fuse_req_bg_queue,</div><div class='add'>+				       struct fuse_req, list);</div><div class='add'>+		fc-&gt;active_background++;</div><div class='add'>+		queue-&gt;active_background++;</div><div class='add'>+</div><div class='add'>+		list_move_tail(&amp;req-&gt;list, &amp;queue-&gt;fuse_req_queue);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_req_end(struct fuse_ring_ent *ent, struct fuse_req *req,</div><div class='add'>+			       int error)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	struct fuse_ring *ring = queue-&gt;ring;</div><div class='add'>+	struct fuse_conn *fc = ring-&gt;fc;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_not_held(&amp;queue-&gt;lock);</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	ent-&gt;fuse_req = NULL;</div><div class='add'>+	list_del_init(&amp;req-&gt;list);</div><div class='add'>+	if (test_bit(FR_BACKGROUND, &amp;req-&gt;flags)) {</div><div class='add'>+		queue-&gt;active_background--;</div><div class='add'>+		spin_lock(&amp;fc-&gt;bg_lock);</div><div class='add'>+		fuse_uring_flush_bg(queue);</div><div class='add'>+		spin_unlock(&amp;fc-&gt;bg_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		req-&gt;out.h.error = error;</div><div class='add'>+</div><div class='add'>+	clear_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='add'>+	fuse_request_end(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Abort all list queued request on the given ring queue */</div><div class='add'>+static void fuse_uring_abort_end_queue_requests(struct fuse_ring_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+	LIST_HEAD(req_list);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	list_for_each_entry(req, &amp;queue-&gt;fuse_req_queue, list)</div><div class='add'>+		clear_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='add'>+	list_splice_init(&amp;queue-&gt;fuse_req_queue, &amp;req_list);</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* must not hold queue lock to avoid order issues with fi-&gt;lock */</div><div class='add'>+	fuse_dev_end_requests(&amp;req_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_uring_abort_end_requests(struct fuse_ring *ring)</div><div class='add'>+{</div><div class='add'>+	int qid;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	struct fuse_conn *fc = ring-&gt;fc;</div><div class='add'>+</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues; qid++) {</div><div class='add'>+		queue = READ_ONCE(ring-&gt;queues[qid]);</div><div class='add'>+		if (!queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		queue-&gt;stopped = true;</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(ring-&gt;fc-&gt;max_background != UINT_MAX);</div><div class='add'>+		spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+		spin_lock(&amp;fc-&gt;bg_lock);</div><div class='add'>+		fuse_uring_flush_bg(queue);</div><div class='add'>+		spin_unlock(&amp;fc-&gt;bg_lock);</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+		fuse_uring_abort_end_queue_requests(queue);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ent_list_request_expired(struct fuse_conn *fc, struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_ent *ent;</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+	ent = list_first_entry_or_null(list, struct fuse_ring_ent, list);</div><div class='add'>+	if (!ent)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	req = ent-&gt;fuse_req;</div><div class='add'>+</div><div class='add'>+	return time_is_before_jiffies(req-&gt;create_time +</div><div class='add'>+				      fc-&gt;timeout.req_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool fuse_uring_request_expired(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	int qid;</div><div class='add'>+</div><div class='add'>+	if (!ring)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues; qid++) {</div><div class='add'>+		queue = READ_ONCE(ring-&gt;queues[qid]);</div><div class='add'>+		if (!queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+		if (fuse_request_expired(fc, &amp;queue-&gt;fuse_req_queue) ||</div><div class='add'>+		    fuse_request_expired(fc, &amp;queue-&gt;fuse_req_bg_queue) ||</div><div class='add'>+		    ent_list_request_expired(fc, &amp;queue-&gt;ent_w_req_queue) ||</div><div class='add'>+		    ent_list_request_expired(fc, &amp;queue-&gt;ent_in_userspace)) {</div><div class='add'>+			spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_uring_destruct(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+	int qid;</div><div class='add'>+</div><div class='add'>+	if (!ring)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues; qid++) {</div><div class='add'>+		struct fuse_ring_queue *queue = ring-&gt;queues[qid];</div><div class='add'>+		struct fuse_ring_ent *ent, *next;</div><div class='add'>+</div><div class='add'>+		if (!queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON(!list_empty(&amp;queue-&gt;ent_avail_queue));</div><div class='add'>+		WARN_ON(!list_empty(&amp;queue-&gt;ent_w_req_queue));</div><div class='add'>+		WARN_ON(!list_empty(&amp;queue-&gt;ent_commit_queue));</div><div class='add'>+		WARN_ON(!list_empty(&amp;queue-&gt;ent_in_userspace));</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(ent, next, &amp;queue-&gt;ent_released,</div><div class='add'>+					 list) {</div><div class='add'>+			list_del_init(&amp;ent-&gt;list);</div><div class='add'>+			kfree(ent);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(queue-&gt;fpq.processing);</div><div class='add'>+		kfree(queue);</div><div class='add'>+		ring-&gt;queues[qid] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(ring-&gt;queues);</div><div class='add'>+	kfree(ring);</div><div class='add'>+	fc-&gt;ring = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Basic ring setup for this connection based on the provided configuration</div><div class='add'>+ */</div><div class='add'>+static struct fuse_ring *fuse_uring_create(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring;</div><div class='add'>+	size_t nr_queues = num_possible_cpus();</div><div class='add'>+	struct fuse_ring *res = NULL;</div><div class='add'>+	size_t max_payload_size;</div><div class='add'>+</div><div class='add'>+	ring = kzalloc(sizeof(*fc-&gt;ring), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!ring)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ring-&gt;queues = kcalloc(nr_queues, sizeof(struct fuse_ring_queue *),</div><div class='add'>+			       GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!ring-&gt;queues)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	max_payload_size = max(FUSE_MIN_READ_BUFFER, fc-&gt;max_write);</div><div class='add'>+	max_payload_size = max(max_payload_size, fc-&gt;max_pages * PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	if (fc-&gt;ring) {</div><div class='add'>+		/* race, another thread created the ring in the meantime */</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		res = fc-&gt;ring;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;ring-&gt;stop_waitq);</div><div class='add'>+</div><div class='add'>+	ring-&gt;nr_queues = nr_queues;</div><div class='add'>+	ring-&gt;fc = fc;</div><div class='add'>+	ring-&gt;max_payload_sz = max_payload_size;</div><div class='add'>+	smp_store_release(&amp;fc-&gt;ring, ring);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+	return ring;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	kfree(ring-&gt;queues);</div><div class='add'>+	kfree(ring);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,</div><div class='add'>+						       int qid)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = ring-&gt;fc;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	struct list_head *pq;</div><div class='add'>+</div><div class='add'>+	queue = kzalloc(sizeof(*queue), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!queue)</div><div class='add'>+		return NULL;</div><div class='add'>+	pq = kcalloc(FUSE_PQ_HASH_SIZE, sizeof(struct list_head), GFP_KERNEL);</div><div class='add'>+	if (!pq) {</div><div class='add'>+		kfree(queue);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue-&gt;qid = qid;</div><div class='add'>+	queue-&gt;ring = ring;</div><div class='add'>+	spin_lock_init(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;ent_avail_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;ent_commit_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;ent_w_req_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;ent_in_userspace);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;fuse_req_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;fuse_req_bg_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;ent_released);</div><div class='add'>+</div><div class='add'>+	queue-&gt;fpq.processing = pq;</div><div class='add'>+	fuse_pqueue_init(&amp;queue-&gt;fpq);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	if (ring-&gt;queues[qid]) {</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		kfree(queue-&gt;fpq.processing);</div><div class='add'>+		kfree(queue);</div><div class='add'>+		return ring-&gt;queues[qid];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * write_once and lock as the caller mostly doesn't take the lock at all</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(ring-&gt;queues[qid], queue);</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return queue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_stop_fuse_req_end(struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	clear_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='add'>+	req-&gt;out.h.error = -ECONNABORTED;</div><div class='add'>+	fuse_request_end(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Release a request/entry on connection tear down</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_entry_teardown(struct fuse_ring_ent *ent)</div><div class='add'>+{</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+	struct io_uring_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	cmd = ent-&gt;cmd;</div><div class='add'>+	ent-&gt;cmd = NULL;</div><div class='add'>+	req = ent-&gt;fuse_req;</div><div class='add'>+	ent-&gt;fuse_req = NULL;</div><div class='add'>+	if (req) {</div><div class='add'>+		/* remove entry from queue-&gt;fpq-&gt;processing */</div><div class='add'>+		list_del_init(&amp;req-&gt;list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The entry must not be freed immediately, due to access of direct</div><div class='add'>+	 * pointer access of entries through IO_URING_F_CANCEL - there is a risk</div><div class='add'>+	 * of race between daemon termination (which triggers IO_URING_F_CANCEL</div><div class='add'>+	 * and accesses entries without checking the list state first</div><div class='add'>+	 */</div><div class='add'>+	list_move(&amp;ent-&gt;list, &amp;queue-&gt;ent_released);</div><div class='add'>+	ent-&gt;state = FRRS_RELEASED;</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (cmd)</div><div class='add'>+		io_uring_cmd_done(cmd, -ENOTCONN, IO_URING_F_UNLOCKED);</div><div class='add'>+</div><div class='add'>+	if (req)</div><div class='add'>+		fuse_uring_stop_fuse_req_end(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_stop_list_entries(struct list_head *head,</div><div class='add'>+					 struct fuse_ring_queue *queue,</div><div class='add'>+					 enum fuse_ring_req_state exp_state)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = queue-&gt;ring;</div><div class='add'>+	struct fuse_ring_ent *ent, *next;</div><div class='add'>+	ssize_t queue_refs = SSIZE_MAX;</div><div class='add'>+	LIST_HEAD(to_teardown);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	list_for_each_entry_safe(ent, next, head, list) {</div><div class='add'>+		if (ent-&gt;state != exp_state) {</div><div class='add'>+			pr_warn("entry teardown qid=%d state=%d expected=%d",</div><div class='add'>+				queue-&gt;qid, ent-&gt;state, exp_state);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ent-&gt;state = FRRS_TEARDOWN;</div><div class='add'>+		list_move(&amp;ent-&gt;list, &amp;to_teardown);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* no queue lock to avoid lock order issues */</div><div class='add'>+	list_for_each_entry_safe(ent, next, &amp;to_teardown, list) {</div><div class='add'>+		fuse_uring_entry_teardown(ent);</div><div class='add'>+		queue_refs = atomic_dec_return(&amp;ring-&gt;queue_refs);</div><div class='add'>+		WARN_ON_ONCE(queue_refs &lt; 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_teardown_entries(struct fuse_ring_queue *queue)</div><div class='add'>+{</div><div class='add'>+	fuse_uring_stop_list_entries(&amp;queue-&gt;ent_in_userspace, queue,</div><div class='add'>+				     FRRS_USERSPACE);</div><div class='add'>+	fuse_uring_stop_list_entries(&amp;queue-&gt;ent_avail_queue, queue,</div><div class='add'>+				     FRRS_AVAILABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Log state debug info</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_log_ent_state(struct fuse_ring *ring)</div><div class='add'>+{</div><div class='add'>+	int qid;</div><div class='add'>+	struct fuse_ring_ent *ent;</div><div class='add'>+</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues; qid++) {</div><div class='add'>+		struct fuse_ring_queue *queue = ring-&gt;queues[qid];</div><div class='add'>+</div><div class='add'>+		if (!queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+		/*</div><div class='add'>+		 * Log entries from the intermediate queue, the other queues</div><div class='add'>+		 * should be empty</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry(ent, &amp;queue-&gt;ent_w_req_queue, list) {</div><div class='add'>+			pr_info(" ent-req-queue ring=%p qid=%d ent=%p state=%d\n",</div><div class='add'>+				ring, qid, ent, ent-&gt;state);</div><div class='add'>+		}</div><div class='add'>+		list_for_each_entry(ent, &amp;queue-&gt;ent_commit_queue, list) {</div><div class='add'>+			pr_info(" ent-commit-queue ring=%p qid=%d ent=%p state=%d\n",</div><div class='add'>+				ring, qid, ent, ent-&gt;state);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	ring-&gt;stop_debug_log = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_async_stop_queues(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int qid;</div><div class='add'>+	struct fuse_ring *ring =</div><div class='add'>+		container_of(work, struct fuse_ring, async_teardown_work.work);</div><div class='add'>+</div><div class='add'>+	/* XXX code dup */</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues; qid++) {</div><div class='add'>+		struct fuse_ring_queue *queue = READ_ONCE(ring-&gt;queues[qid]);</div><div class='add'>+</div><div class='add'>+		if (!queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fuse_uring_teardown_entries(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some ring entries might be in the middle of IO operations,</div><div class='add'>+	 * i.e. in process to get handled by file_operations::uring_cmd</div><div class='add'>+	 * or on the way to userspace - we could handle that with conditions in</div><div class='add'>+	 * run time code, but easier/cleaner to have an async tear down handler</div><div class='add'>+	 * If there are still queue references left</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;ring-&gt;queue_refs) &gt; 0) {</div><div class='add'>+		if (time_after(jiffies,</div><div class='add'>+			       ring-&gt;teardown_time + FUSE_URING_TEARDOWN_TIMEOUT))</div><div class='add'>+			fuse_uring_log_ent_state(ring);</div><div class='add'>+</div><div class='add'>+		schedule_delayed_work(&amp;ring-&gt;async_teardown_work,</div><div class='add'>+				      FUSE_URING_TEARDOWN_INTERVAL);</div><div class='add'>+	} else {</div><div class='add'>+		wake_up_all(&amp;ring-&gt;stop_waitq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stop the ring queues</div><div class='add'>+ */</div><div class='add'>+void fuse_uring_stop_queues(struct fuse_ring *ring)</div><div class='add'>+{</div><div class='add'>+	int qid;</div><div class='add'>+</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues; qid++) {</div><div class='add'>+		struct fuse_ring_queue *queue = READ_ONCE(ring-&gt;queues[qid]);</div><div class='add'>+</div><div class='add'>+		if (!queue)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fuse_uring_teardown_entries(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;ring-&gt;queue_refs) &gt; 0) {</div><div class='add'>+		ring-&gt;teardown_time = jiffies;</div><div class='add'>+		INIT_DELAYED_WORK(&amp;ring-&gt;async_teardown_work,</div><div class='add'>+				  fuse_uring_async_stop_queues);</div><div class='add'>+		schedule_delayed_work(&amp;ring-&gt;async_teardown_work,</div><div class='add'>+				      FUSE_URING_TEARDOWN_INTERVAL);</div><div class='add'>+	} else {</div><div class='add'>+		wake_up_all(&amp;ring-&gt;stop_waitq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle IO_URING_F_CANCEL, typically should come on daemon termination.</div><div class='add'>+ *</div><div class='add'>+ * Releasing the last entry should trigger fuse_dev_release() if</div><div class='add'>+ * the daemon was terminated</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_cancel(struct io_uring_cmd *cmd,</div><div class='add'>+			      unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_ent *ent = uring_cmd_to_ring_ent(cmd);</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	bool need_cmd_done = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * direct access on ent - it must not be destructed as long as</div><div class='add'>+	 * IO_URING_F_CANCEL might come up</div><div class='add'>+	 */</div><div class='add'>+	queue = ent-&gt;queue;</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	if (ent-&gt;state == FRRS_AVAILABLE) {</div><div class='add'>+		ent-&gt;state = FRRS_USERSPACE;</div><div class='add'>+		list_move_tail(&amp;ent-&gt;list, &amp;queue-&gt;ent_in_userspace);</div><div class='add'>+		need_cmd_done = true;</div><div class='add'>+		ent-&gt;cmd = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (need_cmd_done) {</div><div class='add'>+		/* no queue lock to avoid lock order issues */</div><div class='add'>+		io_uring_cmd_done(cmd, -ENOTCONN, issue_flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_prepare_cancel(struct io_uring_cmd *cmd, int issue_flags,</div><div class='add'>+				      struct fuse_ring_ent *ring_ent)</div><div class='add'>+{</div><div class='add'>+	uring_cmd_set_ring_ent(cmd, ring_ent);</div><div class='add'>+	io_uring_cmd_mark_cancelable(cmd, issue_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Checks for errors and stores it into the request</div><div class='add'>+ */</div><div class='add'>+static int fuse_uring_out_header_has_err(struct fuse_out_header *oh,</div><div class='add'>+					 struct fuse_req *req,</div><div class='add'>+					 struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (oh-&gt;unique == 0) {</div><div class='add'>+		/* Not supported through io-uring yet */</div><div class='add'>+		pr_warn_once("notify through fuse-io-uring not supported\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oh-&gt;error &lt;= -ERESTARTSYS || oh-&gt;error &gt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (oh-&gt;error) {</div><div class='add'>+		err = oh-&gt;error;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	if ((oh-&gt;unique &amp; ~FUSE_INT_REQ_BIT) != req-&gt;in.h.unique) {</div><div class='add'>+		pr_warn_ratelimited("unique mismatch, expected: %llu got %llu\n",</div><div class='add'>+				    req-&gt;in.h.unique,</div><div class='add'>+				    oh-&gt;unique &amp; ~FUSE_INT_REQ_BIT);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Is it an interrupt reply ID?</div><div class='add'>+	 * XXX: Not supported through fuse-io-uring yet, it should not even</div><div class='add'>+	 *      find the request - should not happen.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(oh-&gt;unique &amp; FUSE_INT_REQ_BIT);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_uring_copy_from_ring(struct fuse_ring *ring,</div><div class='add'>+				     struct fuse_req *req,</div><div class='add'>+				     struct fuse_ring_ent *ent)</div><div class='add'>+{</div><div class='add'>+	struct fuse_copy_state cs;</div><div class='add'>+	struct fuse_args *args = req-&gt;args;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	int err;</div><div class='add'>+	struct fuse_uring_ent_in_out ring_in_out;</div><div class='add'>+</div><div class='add'>+	err = copy_from_user(&amp;ring_in_out, &amp;ent-&gt;headers-&gt;ring_ent_in_out,</div><div class='add'>+			     sizeof(ring_in_out));</div><div class='add'>+	if (err)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	err = import_ubuf(ITER_SOURCE, ent-&gt;payload, ring-&gt;max_payload_sz,</div><div class='add'>+			  &amp;iter);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fuse_copy_init(&amp;cs, false, &amp;iter);</div><div class='add'>+	cs.is_uring = true;</div><div class='add'>+	cs.req = req;</div><div class='add'>+</div><div class='add'>+	err = fuse_copy_out_args(&amp;cs, args, ring_in_out.payload_sz);</div><div class='add'>+	fuse_copy_finish(&amp;cs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy data from the req to the ring buffer</div><div class='add'>+ */</div><div class='add'>+static int fuse_uring_args_to_ring(struct fuse_ring *ring, struct fuse_req *req,</div><div class='add'>+				   struct fuse_ring_ent *ent)</div><div class='add'>+{</div><div class='add'>+	struct fuse_copy_state cs;</div><div class='add'>+	struct fuse_args *args = req-&gt;args;</div><div class='add'>+	struct fuse_in_arg *in_args = args-&gt;in_args;</div><div class='add'>+	int num_args = args-&gt;in_numargs;</div><div class='add'>+	int err;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	struct fuse_uring_ent_in_out ent_in_out = {</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.commit_id = req-&gt;in.h.unique,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	err = import_ubuf(ITER_DEST, ent-&gt;payload, ring-&gt;max_payload_sz, &amp;iter);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_info_ratelimited("fuse: Import of user buffer failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fuse_copy_init(&amp;cs, true, &amp;iter);</div><div class='add'>+	cs.is_uring = true;</div><div class='add'>+	cs.req = req;</div><div class='add'>+</div><div class='add'>+	if (num_args &gt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Expectation is that the first argument is the per op header.</div><div class='add'>+		 * Some op code have that as zero size.</div><div class='add'>+		 */</div><div class='add'>+		if (args-&gt;in_args[0].size &gt; 0) {</div><div class='add'>+			err = copy_to_user(&amp;ent-&gt;headers-&gt;op_in, in_args-&gt;value,</div><div class='add'>+					   in_args-&gt;size);</div><div class='add'>+			if (err) {</div><div class='add'>+				pr_info_ratelimited(</div><div class='add'>+					"Copying the header failed.\n");</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		in_args++;</div><div class='add'>+		num_args--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy the payload */</div><div class='add'>+	err = fuse_copy_args(&amp;cs, num_args, args-&gt;in_pages,</div><div class='add'>+			     (struct fuse_arg *)in_args, 0);</div><div class='add'>+	fuse_copy_finish(&amp;cs);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_info_ratelimited("%s fuse_copy_args failed\n", __func__);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ent_in_out.payload_sz = cs.ring.copied_sz;</div><div class='add'>+	err = copy_to_user(&amp;ent-&gt;headers-&gt;ring_ent_in_out, &amp;ent_in_out,</div><div class='add'>+			   sizeof(ent_in_out));</div><div class='add'>+	return err ? -EFAULT : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_uring_copy_to_ring(struct fuse_ring_ent *ent,</div><div class='add'>+				   struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	struct fuse_ring *ring = queue-&gt;ring;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -EIO;</div><div class='add'>+	if (WARN_ON(ent-&gt;state != FRRS_FUSE_REQ)) {</div><div class='add'>+		pr_err("qid=%d ring-req=%p invalid state %d on send\n",</div><div class='add'>+		       queue-&gt;qid, ent, ent-&gt;state);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (WARN_ON(req-&gt;in.h.unique == 0))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* copy the request */</div><div class='add'>+	err = fuse_uring_args_to_ring(ring, req, ent);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		pr_info_ratelimited("Copy to ring failed: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy fuse_in_header */</div><div class='add'>+	err = copy_to_user(&amp;ent-&gt;headers-&gt;in_out, &amp;req-&gt;in.h,</div><div class='add'>+			   sizeof(req-&gt;in.h));</div><div class='add'>+	if (err) {</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_uring_prepare_send(struct fuse_ring_ent *ent,</div><div class='add'>+				   struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fuse_uring_copy_to_ring(ent, req);</div><div class='add'>+	if (!err)</div><div class='add'>+		set_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='add'>+	else</div><div class='add'>+		fuse_uring_req_end(ent, req, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write data to the ring buffer and send the request to userspace,</div><div class='add'>+ * userspace will read it</div><div class='add'>+ * This is comparable with classical read(/dev/fuse)</div><div class='add'>+ */</div><div class='add'>+static int fuse_uring_send_next_to_ring(struct fuse_ring_ent *ent,</div><div class='add'>+					struct fuse_req *req,</div><div class='add'>+					unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	int err;</div><div class='add'>+	struct io_uring_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	err = fuse_uring_prepare_send(ent, req);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	cmd = ent-&gt;cmd;</div><div class='add'>+	ent-&gt;cmd = NULL;</div><div class='add'>+	ent-&gt;state = FRRS_USERSPACE;</div><div class='add'>+	list_move_tail(&amp;ent-&gt;list, &amp;queue-&gt;ent_in_userspace);</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	io_uring_cmd_done(cmd, 0, issue_flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Make a ring entry available for fuse_req assignment</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_ent_avail(struct fuse_ring_ent *ent,</div><div class='add'>+				 struct fuse_ring_queue *queue)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!ent-&gt;cmd);</div><div class='add'>+	list_move(&amp;ent-&gt;list, &amp;queue-&gt;ent_avail_queue);</div><div class='add'>+	ent-&gt;state = FRRS_AVAILABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Used to find the request on SQE commit */</div><div class='add'>+static void fuse_uring_add_to_pq(struct fuse_ring_ent *ent,</div><div class='add'>+				 struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	struct fuse_pqueue *fpq = &amp;queue-&gt;fpq;</div><div class='add'>+	unsigned int hash;</div><div class='add'>+</div><div class='add'>+	req-&gt;ring_entry = ent;</div><div class='add'>+	hash = fuse_req_hash(req-&gt;in.h.unique);</div><div class='add'>+	list_move_tail(&amp;req-&gt;list, &amp;fpq-&gt;processing[hash]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assign a fuse queue entry to the given entry</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_add_req_to_ring_ent(struct fuse_ring_ent *ent,</div><div class='add'>+					   struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(ent-&gt;state != FRRS_AVAILABLE &amp;&amp;</div><div class='add'>+			 ent-&gt;state != FRRS_COMMIT)) {</div><div class='add'>+		pr_warn("%s qid=%d state=%d\n", __func__, ent-&gt;queue-&gt;qid,</div><div class='add'>+			ent-&gt;state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='add'>+	ent-&gt;fuse_req = req;</div><div class='add'>+	ent-&gt;state = FRRS_FUSE_REQ;</div><div class='add'>+	list_move_tail(&amp;ent-&gt;list, &amp;queue-&gt;ent_w_req_queue);</div><div class='add'>+	fuse_uring_add_to_pq(ent, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fetch the next fuse request if available */</div><div class='add'>+static struct fuse_req *fuse_uring_ent_assign_req(struct fuse_ring_ent *ent)</div><div class='add'>+	__must_hold(&amp;queue-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	struct list_head *req_queue = &amp;queue-&gt;fuse_req_queue;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* get and assign the next entry while it is still holding the lock */</div><div class='add'>+	req = list_first_entry_or_null(req_queue, struct fuse_req, list);</div><div class='add'>+	if (req)</div><div class='add'>+		fuse_uring_add_req_to_ring_ent(ent, req);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read data from the ring buffer, which user space has written to</div><div class='add'>+ * This is comparible with handling of classical write(/dev/fuse).</div><div class='add'>+ * Also make the ring request available again for new fuse requests.</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_commit(struct fuse_ring_ent *ent, struct fuse_req *req,</div><div class='add'>+			      unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = ent-&gt;queue-&gt;ring;</div><div class='add'>+	struct fuse_conn *fc = ring-&gt;fc;</div><div class='add'>+	ssize_t err = 0;</div><div class='add'>+</div><div class='add'>+	err = copy_from_user(&amp;req-&gt;out.h, &amp;ent-&gt;headers-&gt;in_out,</div><div class='add'>+			     sizeof(req-&gt;out.h));</div><div class='add'>+	if (err) {</div><div class='add'>+		req-&gt;out.h.error = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fuse_uring_out_header_has_err(&amp;req-&gt;out.h, req, fc);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* req-&gt;out.h.error already set */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fuse_uring_copy_from_ring(ring, req, ent);</div><div class='add'>+out:</div><div class='add'>+	fuse_uring_req_end(ent, req, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the next fuse req and send it</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_next_fuse_req(struct fuse_ring_ent *ent,</div><div class='add'>+				     struct fuse_ring_queue *queue,</div><div class='add'>+				     unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	fuse_uring_ent_avail(ent, queue);</div><div class='add'>+	req = fuse_uring_ent_assign_req(ent);</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (req) {</div><div class='add'>+		err = fuse_uring_send_next_to_ring(ent, req, issue_flags);</div><div class='add'>+		if (err)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_ring_ent_set_commit(struct fuse_ring_ent *ent)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(ent-&gt;state != FRRS_USERSPACE))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ent-&gt;state = FRRS_COMMIT;</div><div class='add'>+	list_move(&amp;ent-&gt;list, &amp;queue-&gt;ent_commit_queue);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FUSE_URING_CMD_COMMIT_AND_FETCH handler */</div><div class='add'>+static int fuse_uring_commit_fetch(struct io_uring_cmd *cmd, int issue_flags,</div><div class='add'>+				   struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	const struct fuse_uring_cmd_req *cmd_req = io_uring_sqe_cmd(cmd-&gt;sqe);</div><div class='add'>+	struct fuse_ring_ent *ent;</div><div class='add'>+	int err;</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	uint64_t commit_id = READ_ONCE(cmd_req-&gt;commit_id);</div><div class='add'>+	unsigned int qid = READ_ONCE(cmd_req-&gt;qid);</div><div class='add'>+	struct fuse_pqueue *fpq;</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+	err = -ENOTCONN;</div><div class='add'>+	if (!ring)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (qid &gt;= ring-&gt;nr_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue = ring-&gt;queues[qid];</div><div class='add'>+	if (!queue)</div><div class='add'>+		return err;</div><div class='add'>+	fpq = &amp;queue-&gt;fpq;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(fc-&gt;connected) || READ_ONCE(queue-&gt;stopped))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	/* Find a request based on the unique ID of the fuse request</div><div class='add'>+	 * This should get revised, as it needs a hash calculation and list</div><div class='add'>+	 * search. And full struct fuse_pqueue is needed (memory overhead).</div><div class='add'>+	 * As well as the link from req to ring_ent.</div><div class='add'>+	 */</div><div class='add'>+	req = fuse_request_find(fpq, commit_id);</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	if (!req) {</div><div class='add'>+		pr_info("qid=%d commit_id %llu not found\n", queue-&gt;qid,</div><div class='add'>+			commit_id);</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	list_del_init(&amp;req-&gt;list);</div><div class='add'>+	ent = req-&gt;ring_entry;</div><div class='add'>+	req-&gt;ring_entry = NULL;</div><div class='add'>+</div><div class='add'>+	err = fuse_ring_ent_set_commit(ent);</div><div class='add'>+	if (err != 0) {</div><div class='add'>+		pr_info_ratelimited("qid=%d commit_id %llu state %d",</div><div class='add'>+				    queue-&gt;qid, commit_id, ent-&gt;state);</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+		req-&gt;out.h.error = err;</div><div class='add'>+		clear_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='add'>+		fuse_request_end(req);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ent-&gt;cmd = cmd;</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* without the queue lock, as other locks are taken */</div><div class='add'>+	fuse_uring_prepare_cancel(cmd, issue_flags, ent);</div><div class='add'>+	fuse_uring_commit(ent, req, issue_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fetching the next request is absolutely required as queued</div><div class='add'>+	 * fuse requests would otherwise not get processed - committing</div><div class='add'>+	 * and fetching is done in one step vs legacy fuse, which has separated</div><div class='add'>+	 * read (fetch request) and write (commit result).</div><div class='add'>+	 */</div><div class='add'>+	fuse_uring_next_fuse_req(ent, queue, issue_flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_ring_ready(struct fuse_ring *ring, int current_qid)</div><div class='add'>+{</div><div class='add'>+	int qid;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	bool ready = true;</div><div class='add'>+</div><div class='add'>+	for (qid = 0; qid &lt; ring-&gt;nr_queues &amp;&amp; ready; qid++) {</div><div class='add'>+		if (current_qid == qid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		queue = ring-&gt;queues[qid];</div><div class='add'>+		if (!queue) {</div><div class='add'>+			ready = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+		if (list_empty(&amp;queue-&gt;ent_avail_queue))</div><div class='add'>+			ready = false;</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ready;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fuse_uring_req_fetch command handling</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_do_register(struct fuse_ring_ent *ent,</div><div class='add'>+				   struct io_uring_cmd *cmd,</div><div class='add'>+				   unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	struct fuse_ring *ring = queue-&gt;ring;</div><div class='add'>+	struct fuse_conn *fc = ring-&gt;fc;</div><div class='add'>+	struct fuse_iqueue *fiq = &amp;fc-&gt;iq;</div><div class='add'>+</div><div class='add'>+	fuse_uring_prepare_cancel(cmd, issue_flags, ent);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	ent-&gt;cmd = cmd;</div><div class='add'>+	fuse_uring_ent_avail(ent, queue);</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!ring-&gt;ready) {</div><div class='add'>+		bool ready = is_ring_ready(ring, queue-&gt;qid);</div><div class='add'>+</div><div class='add'>+		if (ready) {</div><div class='add'>+			WRITE_ONCE(fiq-&gt;ops, &amp;fuse_io_uring_ops);</div><div class='add'>+			WRITE_ONCE(ring-&gt;ready, true);</div><div class='add'>+			wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sqe-&gt;addr is a ptr to an iovec array, iov[0] has the headers, iov[1]</div><div class='add'>+ * the payload</div><div class='add'>+ */</div><div class='add'>+static int fuse_uring_get_iovec_from_sqe(const struct io_uring_sqe *sqe,</div><div class='add'>+					 struct iovec iov[FUSE_URING_IOV_SEGS])</div><div class='add'>+{</div><div class='add'>+	struct iovec __user *uiov = u64_to_user_ptr(READ_ONCE(sqe-&gt;addr));</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (sqe-&gt;len != FUSE_URING_IOV_SEGS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Direction for buffer access will actually be READ and WRITE,</div><div class='add'>+	 * using write for the import should include READ access as well.</div><div class='add'>+	 */</div><div class='add'>+	ret = import_iovec(WRITE, uiov, FUSE_URING_IOV_SEGS,</div><div class='add'>+			   FUSE_URING_IOV_SEGS, &amp;iov, &amp;iter);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_ring_ent *</div><div class='add'>+fuse_uring_create_ring_ent(struct io_uring_cmd *cmd,</div><div class='add'>+			   struct fuse_ring_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = queue-&gt;ring;</div><div class='add'>+	struct fuse_ring_ent *ent;</div><div class='add'>+	size_t payload_size;</div><div class='add'>+	struct iovec iov[FUSE_URING_IOV_SEGS];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fuse_uring_get_iovec_from_sqe(cmd-&gt;sqe, iov);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_info_ratelimited("Failed to get iovec from sqe, err=%d\n",</div><div class='add'>+				    err);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (iov[0].iov_len &lt; sizeof(struct fuse_uring_req_header)) {</div><div class='add'>+		pr_info_ratelimited("Invalid header len %zu\n", iov[0].iov_len);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	payload_size = iov[1].iov_len;</div><div class='add'>+	if (payload_size &lt; ring-&gt;max_payload_sz) {</div><div class='add'>+		pr_info_ratelimited("Invalid req payload len %zu\n",</div><div class='add'>+				    payload_size);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	ent = kzalloc(sizeof(*ent), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!ent)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ent-&gt;list);</div><div class='add'>+</div><div class='add'>+	ent-&gt;queue = queue;</div><div class='add'>+	ent-&gt;headers = iov[0].iov_base;</div><div class='add'>+	ent-&gt;payload = iov[1].iov_base;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ring-&gt;queue_refs);</div><div class='add'>+	return ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register header and payload buffer with the kernel and puts the</div><div class='add'>+ * entry as "ready to get fuse requests" on the queue</div><div class='add'>+ */</div><div class='add'>+static int fuse_uring_register(struct io_uring_cmd *cmd,</div><div class='add'>+			       unsigned int issue_flags, struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	const struct fuse_uring_cmd_req *cmd_req = io_uring_sqe_cmd(cmd-&gt;sqe);</div><div class='add'>+	struct fuse_ring *ring = smp_load_acquire(&amp;fc-&gt;ring);</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	struct fuse_ring_ent *ent;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int qid = READ_ONCE(cmd_req-&gt;qid);</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	if (!ring) {</div><div class='add'>+		ring = fuse_uring_create(fc);</div><div class='add'>+		if (!ring)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qid &gt;= ring-&gt;nr_queues) {</div><div class='add'>+		pr_info_ratelimited("fuse: Invalid ring qid %u\n", qid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue = ring-&gt;queues[qid];</div><div class='add'>+	if (!queue) {</div><div class='add'>+		queue = fuse_uring_create_queue(ring, qid);</div><div class='add'>+		if (!queue)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The created queue above does not need to be destructed in</div><div class='add'>+	 * case of entry errors below, will be done at ring destruction time.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ent = fuse_uring_create_ring_ent(cmd, queue);</div><div class='add'>+	if (IS_ERR(ent))</div><div class='add'>+		return PTR_ERR(ent);</div><div class='add'>+</div><div class='add'>+	fuse_uring_do_register(ent, cmd, issue_flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Entry function from io_uring to handle the given passthrough command</div><div class='add'>+ * (op code IORING_OP_URING_CMD)</div><div class='add'>+ */</div><div class='add'>+int fuse_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dev *fud;</div><div class='add'>+	struct fuse_conn *fc;</div><div class='add'>+	u32 cmd_op = cmd-&gt;cmd_op;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if ((unlikely(issue_flags &amp; IO_URING_F_CANCEL))) {</div><div class='add'>+		fuse_uring_cancel(cmd, issue_flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This extra SQE size holds struct fuse_uring_cmd_req */</div><div class='add'>+	if (!(issue_flags &amp; IO_URING_F_SQE128))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fud = fuse_get_dev(cmd-&gt;file);</div><div class='add'>+	if (IS_ERR(fud)) {</div><div class='add'>+		pr_info_ratelimited("No fuse device found\n");</div><div class='add'>+		return PTR_ERR(fud);</div><div class='add'>+	}</div><div class='add'>+	fc = fud-&gt;fc;</div><div class='add'>+</div><div class='add'>+	/* Once a connection has io-uring enabled on it, it can't be disabled */</div><div class='add'>+	if (!enable_uring &amp;&amp; !fc-&gt;io_uring) {</div><div class='add'>+		pr_info_ratelimited("fuse-io-uring is disabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;aborted)</div><div class='add'>+		return -ECONNABORTED;</div><div class='add'>+	if (!fc-&gt;connected)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * fuse_uring_register() needs the ring to be initialized,</div><div class='add'>+	 * we need to know the max payload size</div><div class='add'>+	 */</div><div class='add'>+	if (!fc-&gt;initialized)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	switch (cmd_op) {</div><div class='add'>+	case FUSE_IO_URING_CMD_REGISTER:</div><div class='add'>+		err = fuse_uring_register(cmd, issue_flags, fc);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_info_once("FUSE_IO_URING_CMD_REGISTER failed err=%d\n",</div><div class='add'>+				     err);</div><div class='add'>+			fc-&gt;io_uring = 0;</div><div class='add'>+			wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case FUSE_IO_URING_CMD_COMMIT_AND_FETCH:</div><div class='add'>+		err = fuse_uring_commit_fetch(cmd, issue_flags, fc);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_info_once("FUSE_IO_URING_COMMIT_AND_FETCH failed err=%d\n",</div><div class='add'>+				     err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIOCBQUEUED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_send(struct fuse_ring_ent *ent, struct io_uring_cmd *cmd,</div><div class='add'>+			    ssize_t ret, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	ent-&gt;state = FRRS_USERSPACE;</div><div class='add'>+	list_move_tail(&amp;ent-&gt;list, &amp;queue-&gt;ent_in_userspace);</div><div class='add'>+	ent-&gt;cmd = NULL;</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	io_uring_cmd_done(cmd, ret, issue_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This prepares and sends the ring request in fuse-uring task context.</div><div class='add'>+ * User buffers are not mapped yet - the application does not have permission</div><div class='add'>+ * to write to it - this has to be executed in ring task context.</div><div class='add'>+ */</div><div class='add'>+static void fuse_uring_send_in_task(struct io_tw_req tw_req, io_tw_token_t tw)</div><div class='add'>+{</div><div class='add'>+	unsigned int issue_flags = IO_URING_CMD_TASK_WORK_ISSUE_FLAGS;</div><div class='add'>+	struct io_uring_cmd *cmd = io_uring_cmd_from_tw(tw_req);</div><div class='add'>+	struct fuse_ring_ent *ent = uring_cmd_to_ring_ent(cmd);</div><div class='add'>+	struct fuse_ring_queue *queue = ent-&gt;queue;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!tw.cancel) {</div><div class='add'>+		err = fuse_uring_prepare_send(ent, ent-&gt;fuse_req);</div><div class='add'>+		if (err) {</div><div class='add'>+			fuse_uring_next_fuse_req(ent, queue, issue_flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fuse_uring_send(ent, cmd, err, issue_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_ring_queue *fuse_uring_task_to_queue(struct fuse_ring *ring)</div><div class='add'>+{</div><div class='add'>+	unsigned int qid;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+</div><div class='add'>+	qid = task_cpu(current);</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(qid &gt;= ring-&gt;nr_queues,</div><div class='add'>+		      "Core number (%u) exceeds nr queues (%zu)\n", qid,</div><div class='add'>+		      ring-&gt;nr_queues))</div><div class='add'>+		qid = 0;</div><div class='add'>+</div><div class='add'>+	queue = ring-&gt;queues[qid];</div><div class='add'>+	WARN_ONCE(!queue, "Missing queue for qid %d\n", qid);</div><div class='add'>+</div><div class='add'>+	return queue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_uring_dispatch_ent(struct fuse_ring_ent *ent)</div><div class='add'>+{</div><div class='add'>+	struct io_uring_cmd *cmd = ent-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	uring_cmd_set_ring_ent(cmd, ent);</div><div class='add'>+	io_uring_cmd_complete_in_task(cmd, fuse_uring_send_in_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* queue a fuse request and send it if a ring entry is available */</div><div class='add'>+void fuse_uring_queue_fuse_req(struct fuse_iqueue *fiq, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = req-&gt;fm-&gt;fc;</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	struct fuse_ring_ent *ent = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	queue = fuse_uring_task_to_queue(ring);</div><div class='add'>+	if (!queue)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	fuse_request_assign_unique(fiq, req);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	err = -ENOTCONN;</div><div class='add'>+	if (unlikely(queue-&gt;stopped))</div><div class='add'>+		goto err_unlock;</div><div class='add'>+</div><div class='add'>+	set_bit(FR_URING, &amp;req-&gt;flags);</div><div class='add'>+	req-&gt;ring_queue = queue;</div><div class='add'>+	ent = list_first_entry_or_null(&amp;queue-&gt;ent_avail_queue,</div><div class='add'>+				       struct fuse_ring_ent, list);</div><div class='add'>+	if (ent)</div><div class='add'>+		fuse_uring_add_req_to_ring_ent(ent, req);</div><div class='add'>+	else</div><div class='add'>+		list_add_tail(&amp;req-&gt;list, &amp;queue-&gt;fuse_req_queue);</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (ent)</div><div class='add'>+		fuse_uring_dispatch_ent(ent);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_unlock:</div><div class='add'>+	spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+err:</div><div class='add'>+	req-&gt;out.h.error = err;</div><div class='add'>+	clear_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='add'>+	fuse_request_end(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool fuse_uring_queue_bq_req(struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = req-&gt;fm-&gt;fc;</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+	struct fuse_ring_ent *ent = NULL;</div><div class='add'>+</div><div class='add'>+	queue = fuse_uring_task_to_queue(ring);</div><div class='add'>+	if (!queue)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;queue-&gt;lock);</div><div class='add'>+	if (unlikely(queue-&gt;stopped)) {</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(FR_URING, &amp;req-&gt;flags);</div><div class='add'>+	req-&gt;ring_queue = queue;</div><div class='add'>+	list_add_tail(&amp;req-&gt;list, &amp;queue-&gt;fuse_req_bg_queue);</div><div class='add'>+</div><div class='add'>+	ent = list_first_entry_or_null(&amp;queue-&gt;ent_avail_queue,</div><div class='add'>+				       struct fuse_ring_ent, list);</div><div class='add'>+	spin_lock(&amp;fc-&gt;bg_lock);</div><div class='add'>+	fc-&gt;num_background++;</div><div class='add'>+	if (fc-&gt;num_background == fc-&gt;max_background)</div><div class='add'>+		fc-&gt;blocked = 1;</div><div class='add'>+	fuse_uring_flush_bg(queue);</div><div class='add'>+	spin_unlock(&amp;fc-&gt;bg_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Due to bg_queue flush limits there might be other bg requests</div><div class='add'>+	 * in the queue that need to be handled first. Or no further req</div><div class='add'>+	 * might be available.</div><div class='add'>+	 */</div><div class='add'>+	req = list_first_entry_or_null(&amp;queue-&gt;fuse_req_queue, struct fuse_req,</div><div class='add'>+				       list);</div><div class='add'>+	if (ent &amp;&amp; req) {</div><div class='add'>+		fuse_uring_add_req_to_ring_ent(ent, req);</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+</div><div class='add'>+		fuse_uring_dispatch_ent(ent);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock(&amp;queue-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool fuse_uring_remove_pending_req(struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring_queue *queue = req-&gt;ring_queue;</div><div class='add'>+</div><div class='add'>+	return fuse_remove_pending_req(req, &amp;queue-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fuse_iqueue_ops fuse_io_uring_ops = {</div><div class='add'>+	/* should be send over io-uring as enhancement */</div><div class='add'>+	.send_forget = fuse_dev_queue_forget,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * could be send over io-uring, but interrupts should be rare,</div><div class='add'>+	 * no need to make the code complex</div><div class='add'>+	 */</div><div class='add'>+	.send_interrupt = fuse_dev_queue_interrupt,</div><div class='add'>+	.send_req = fuse_uring_queue_fuse_req,</div><div class='add'>+};</div><div class='head'>diff --git a/fs/fuse/dev_uring_i.h b/fs/fuse/dev_uring_i.h<br/>new file mode 100644<br/>index 000000000000..51a563922ce1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/dev_uring_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/dev_uring_i.h</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * FUSE: Filesystem in Userspace</div><div class='add'>+ * Copyright (c) 2023-2024 DataDirect Networks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _FS_FUSE_DEV_URING_I_H</div><div class='add'>+#define _FS_FUSE_DEV_URING_I_H</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUSE_IO_URING</div><div class='add'>+</div><div class='add'>+#define FUSE_URING_TEARDOWN_TIMEOUT (5 * HZ)</div><div class='add'>+#define FUSE_URING_TEARDOWN_INTERVAL (HZ/20)</div><div class='add'>+</div><div class='add'>+enum fuse_ring_req_state {</div><div class='add'>+	FRRS_INVALID = 0,</div><div class='add'>+</div><div class='add'>+	/* The ring entry received from userspace and it is being processed */</div><div class='add'>+	FRRS_COMMIT,</div><div class='add'>+</div><div class='add'>+	/* The ring entry is waiting for new fuse requests */</div><div class='add'>+	FRRS_AVAILABLE,</div><div class='add'>+</div><div class='add'>+	/* The ring entry got assigned a fuse req */</div><div class='add'>+	FRRS_FUSE_REQ,</div><div class='add'>+</div><div class='add'>+	/* The ring entry is in or on the way to user space */</div><div class='add'>+	FRRS_USERSPACE,</div><div class='add'>+</div><div class='add'>+	/* The ring entry is in teardown */</div><div class='add'>+	FRRS_TEARDOWN,</div><div class='add'>+</div><div class='add'>+	/* The ring entry is released, but not freed yet */</div><div class='add'>+	FRRS_RELEASED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** A fuse ring entry, part of the ring queue */</div><div class='add'>+struct fuse_ring_ent {</div><div class='add'>+	/* userspace buffer */</div><div class='add'>+	struct fuse_uring_req_header __user *headers;</div><div class='add'>+	void __user *payload;</div><div class='add'>+</div><div class='add'>+	/* the ring queue that owns the request */</div><div class='add'>+	struct fuse_ring_queue *queue;</div><div class='add'>+</div><div class='add'>+	/* fields below are protected by queue-&gt;lock */</div><div class='add'>+</div><div class='add'>+	struct io_uring_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	enum fuse_ring_req_state state;</div><div class='add'>+</div><div class='add'>+	struct fuse_req *fuse_req;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fuse_ring_queue {</div><div class='add'>+	/*</div><div class='add'>+	 * back pointer to the main fuse uring structure that holds this</div><div class='add'>+	 * queue</div><div class='add'>+	 */</div><div class='add'>+	struct fuse_ring *ring;</div><div class='add'>+</div><div class='add'>+	/* queue id, corresponds to the cpu core */</div><div class='add'>+	unsigned int qid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * queue lock, taken when any value in the queue changes _and_ also</div><div class='add'>+	 * a ring entry state changes.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* available ring entries (struct fuse_ring_ent) */</div><div class='add'>+	struct list_head ent_avail_queue;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * entries in the process of being committed or in the process</div><div class='add'>+	 * to be sent to userspace</div><div class='add'>+	 */</div><div class='add'>+	struct list_head ent_w_req_queue;</div><div class='add'>+	struct list_head ent_commit_queue;</div><div class='add'>+</div><div class='add'>+	/* entries in userspace */</div><div class='add'>+	struct list_head ent_in_userspace;</div><div class='add'>+</div><div class='add'>+	/* entries that are released */</div><div class='add'>+	struct list_head ent_released;</div><div class='add'>+</div><div class='add'>+	/* fuse requests waiting for an entry slot */</div><div class='add'>+	struct list_head fuse_req_queue;</div><div class='add'>+</div><div class='add'>+	/* background fuse requests */</div><div class='add'>+	struct list_head fuse_req_bg_queue;</div><div class='add'>+</div><div class='add'>+	struct fuse_pqueue fpq;</div><div class='add'>+</div><div class='add'>+	unsigned int active_background;</div><div class='add'>+</div><div class='add'>+	bool stopped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Describes if uring is for communication and holds alls the data needed</div><div class='add'>+ * for uring communication</div><div class='add'>+ */</div><div class='add'>+struct fuse_ring {</div><div class='add'>+	/* back pointer */</div><div class='add'>+	struct fuse_conn *fc;</div><div class='add'>+</div><div class='add'>+	/* number of ring queues */</div><div class='add'>+	size_t nr_queues;</div><div class='add'>+</div><div class='add'>+	/* maximum payload/arg size */</div><div class='add'>+	size_t max_payload_sz;</div><div class='add'>+</div><div class='add'>+	struct fuse_ring_queue **queues;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Log ring entry states on stop when entries cannot be released</div><div class='add'>+	 */</div><div class='add'>+	unsigned int stop_debug_log : 1;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t stop_waitq;</div><div class='add'>+</div><div class='add'>+	/* async tear down */</div><div class='add'>+	struct delayed_work async_teardown_work;</div><div class='add'>+</div><div class='add'>+	/* log */</div><div class='add'>+	unsigned long teardown_time;</div><div class='add'>+</div><div class='add'>+	atomic_t queue_refs;</div><div class='add'>+</div><div class='add'>+	bool ready;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool fuse_uring_enabled(void);</div><div class='add'>+void fuse_uring_destruct(struct fuse_conn *fc);</div><div class='add'>+void fuse_uring_stop_queues(struct fuse_ring *ring);</div><div class='add'>+void fuse_uring_abort_end_requests(struct fuse_ring *ring);</div><div class='add'>+int fuse_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags);</div><div class='add'>+void fuse_uring_queue_fuse_req(struct fuse_iqueue *fiq, struct fuse_req *req);</div><div class='add'>+bool fuse_uring_queue_bq_req(struct fuse_req *req);</div><div class='add'>+bool fuse_uring_remove_pending_req(struct fuse_req *req);</div><div class='add'>+bool fuse_uring_request_expired(struct fuse_conn *fc);</div><div class='add'>+</div><div class='add'>+static inline void fuse_uring_abort(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+</div><div class='add'>+	if (ring == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;ring-&gt;queue_refs) &gt; 0) {</div><div class='add'>+		fuse_uring_abort_end_requests(ring);</div><div class='add'>+		fuse_uring_stop_queues(ring);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fuse_uring_wait_stopped_queues(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct fuse_ring *ring = fc-&gt;ring;</div><div class='add'>+</div><div class='add'>+	if (ring)</div><div class='add'>+		wait_event(ring-&gt;stop_waitq,</div><div class='add'>+			   atomic_read(&amp;ring-&gt;queue_refs) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fuse_uring_ready(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	return fc-&gt;ring &amp;&amp; fc-&gt;ring-&gt;ready;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_FUSE_IO_URING */</div><div class='add'>+</div><div class='add'>+static inline void fuse_uring_destruct(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fuse_uring_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fuse_uring_abort(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fuse_uring_wait_stopped_queues(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fuse_uring_ready(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fuse_uring_remove_pending_req(struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fuse_uring_request_expired(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_FUSE_IO_URING */</div><div class='add'>+</div><div class='add'>+#endif /* _FS_FUSE_DEV_URING_I_H */</div><div class='head'>diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c<br/>index d19cbf34c634..4b6b3d2758ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/dir.c</a></div><div class='hunk'>@@ -27,6 +27,67 @@ module_param(allow_sys_admin_access, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(allow_sys_admin_access,</div><div class='ctx'> 		 "Allow users with CAP_SYS_ADMIN in initial userns to bypass allow_other access check");</div><div class='ctx'> </div><div class='add'>+struct dentry_bucket {</div><div class='add'>+	struct rb_root tree;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HASH_BITS	5</div><div class='add'>+#define HASH_SIZE	(1 &lt;&lt; HASH_BITS)</div><div class='add'>+static struct dentry_bucket dentry_hash[HASH_SIZE];</div><div class='add'>+struct delayed_work dentry_tree_work;</div><div class='add'>+</div><div class='add'>+/* Minimum invalidation work queue frequency */</div><div class='add'>+#define FUSE_DENTRY_INVAL_FREQ_MIN 5</div><div class='add'>+</div><div class='add'>+unsigned __read_mostly inval_wq;</div><div class='add'>+static int inval_wq_set(const char *val, const struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	unsigned int num;</div><div class='add'>+	unsigned int old = inval_wq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!val)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(val, 0, &amp;num);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if ((num &lt; FUSE_DENTRY_INVAL_FREQ_MIN) &amp;&amp; (num != 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* This should prevent overflow in secs_to_jiffies() */</div><div class='add'>+	if (num &gt; USHRT_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*((unsigned int *)kp-&gt;arg) = num;</div><div class='add'>+</div><div class='add'>+	if (num &amp;&amp; !old)</div><div class='add'>+		schedule_delayed_work(&amp;dentry_tree_work,</div><div class='add'>+				      secs_to_jiffies(num));</div><div class='add'>+	else if (!num &amp;&amp; old)</div><div class='add'>+		cancel_delayed_work_sync(&amp;dentry_tree_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static const struct kernel_param_ops inval_wq_ops = {</div><div class='add'>+	.set = inval_wq_set,</div><div class='add'>+	.get = param_get_uint,</div><div class='add'>+};</div><div class='add'>+module_param_cb(inval_wq, &amp;inval_wq_ops, &amp;inval_wq, 0644);</div><div class='add'>+__MODULE_PARM_TYPE(inval_wq, "uint");</div><div class='add'>+MODULE_PARM_DESC(inval_wq,</div><div class='add'>+		 "Dentries invalidation work queue period in secs (&gt;= "</div><div class='add'>+		 __stringify(FUSE_DENTRY_INVAL_FREQ_MIN) ").");</div><div class='add'>+</div><div class='add'>+static inline struct dentry_bucket *get_dentry_bucket(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	int i = hash_ptr(dentry, HASH_BITS);</div><div class='add'>+</div><div class='add'>+	return &amp;dentry_hash[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fuse_advise_use_readdirplus(struct inode *dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(dir);</div><div class='hunk'>@@ -34,33 +95,151 @@ static void fuse_advise_use_readdirplus(struct inode *dir)</div><div class='ctx'> 	set_bit(FUSE_I_ADVISE_RDPLUS, &amp;fi-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if BITS_PER_LONG &gt;= 64</div><div class='del'>-static inline void __fuse_dentry_settime(struct dentry *entry, u64 time)</div><div class='add'>+struct fuse_dentry {</div><div class='add'>+	u64 time;</div><div class='add'>+	union {</div><div class='add'>+		struct rcu_head rcu;</div><div class='add'>+		struct rb_node node;</div><div class='add'>+	};</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __fuse_dentry_tree_del_node(struct fuse_dentry *fd,</div><div class='add'>+					struct dentry_bucket *bucket)</div><div class='ctx'> {</div><div class='del'>-	entry-&gt;d_fsdata = (void *) time;</div><div class='add'>+	if (!RB_EMPTY_NODE(&amp;fd-&gt;node)) {</div><div class='add'>+		rb_erase(&amp;fd-&gt;node, &amp;bucket-&gt;tree);</div><div class='add'>+		RB_CLEAR_NODE(&amp;fd-&gt;node);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u64 fuse_dentry_time(const struct dentry *entry)</div><div class='add'>+static void fuse_dentry_tree_del_node(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return (u64)entry-&gt;d_fsdata;</div><div class='add'>+	struct fuse_dentry *fd = dentry-&gt;d_fsdata;</div><div class='add'>+	struct dentry_bucket *bucket = get_dentry_bucket(dentry);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bucket-&gt;lock);</div><div class='add'>+	__fuse_dentry_tree_del_node(fd, bucket);</div><div class='add'>+	spin_unlock(&amp;bucket-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-union fuse_dentry {</div><div class='del'>-	u64 time;</div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-};</div><div class='add'>+static void fuse_dentry_tree_add_node(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dentry *fd = dentry-&gt;d_fsdata;</div><div class='add'>+	struct dentry_bucket *bucket;</div><div class='add'>+	struct fuse_dentry *cur;</div><div class='add'>+	struct rb_node **p, *parent = NULL;</div><div class='add'>+</div><div class='add'>+	if (!inval_wq)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bucket = get_dentry_bucket(dentry);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bucket-&gt;lock);</div><div class='add'>+</div><div class='add'>+	__fuse_dentry_tree_del_node(fd, bucket);</div><div class='add'>+</div><div class='add'>+	p = &amp;bucket-&gt;tree.rb_node;</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		cur = rb_entry(*p, struct fuse_dentry, node);</div><div class='add'>+		if (fd-&gt;time &lt; cur-&gt;time)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_left;</div><div class='add'>+		else</div><div class='add'>+			p = &amp;(*p)-&gt;rb_right;</div><div class='add'>+	}</div><div class='add'>+	rb_link_node(&amp;fd-&gt;node, parent, p);</div><div class='add'>+	rb_insert_color(&amp;fd-&gt;node, &amp;bucket-&gt;tree);</div><div class='add'>+	spin_unlock(&amp;bucket-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * work queue which, when enabled, will periodically check for expired dentries</div><div class='add'>+ * in the dentries tree.</div><div class='add'>+ */</div><div class='add'>+static void fuse_dentry_tree_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(dispose);</div><div class='add'>+	struct fuse_dentry *fd;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HASH_SIZE; i++) {</div><div class='add'>+		spin_lock(&amp;dentry_hash[i].lock);</div><div class='add'>+		node = rb_first(&amp;dentry_hash[i].tree);</div><div class='add'>+		while (node) {</div><div class='add'>+			fd = rb_entry(node, struct fuse_dentry, node);</div><div class='add'>+			if (time_after64(get_jiffies_64(), fd-&gt;time)) {</div><div class='add'>+				rb_erase(&amp;fd-&gt;node, &amp;dentry_hash[i].tree);</div><div class='add'>+				RB_CLEAR_NODE(&amp;fd-&gt;node);</div><div class='add'>+				spin_unlock(&amp;dentry_hash[i].lock);</div><div class='add'>+				d_dispose_if_unused(fd-&gt;dentry, &amp;dispose);</div><div class='add'>+				cond_resched();</div><div class='add'>+				spin_lock(&amp;dentry_hash[i].lock);</div><div class='add'>+			} else</div><div class='add'>+				break;</div><div class='add'>+			node = rb_first(&amp;dentry_hash[i].tree);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;dentry_hash[i].lock);</div><div class='add'>+		shrink_dentry_list(&amp;dispose);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inval_wq)</div><div class='add'>+		schedule_delayed_work(&amp;dentry_tree_work,</div><div class='add'>+				      secs_to_jiffies(inval_wq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_epoch_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = container_of(work, struct fuse_conn,</div><div class='add'>+					    epoch_work);</div><div class='add'>+	struct fuse_mount *fm;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;fc-&gt;killsb);</div><div class='add'>+</div><div class='add'>+	inode = fuse_ilookup(fc, FUSE_ROOT_ID, &amp;fm);</div><div class='add'>+	if (inode) {</div><div class='add'>+		iput(inode);</div><div class='add'>+		/* Remove all possible active references to cached inodes */</div><div class='add'>+		shrink_dcache_sb(fm-&gt;sb);</div><div class='add'>+	} else</div><div class='add'>+		pr_warn("Failed to get root inode");</div><div class='add'>+</div><div class='add'>+	up_read(&amp;fc-&gt;killsb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_dentry_tree_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HASH_SIZE; i++) {</div><div class='add'>+		spin_lock_init(&amp;dentry_hash[i].lock);</div><div class='add'>+		dentry_hash[i].tree = RB_ROOT;</div><div class='add'>+	}</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dentry_tree_work, fuse_dentry_tree_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_dentry_tree_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	inval_wq = 0;</div><div class='add'>+	cancel_delayed_work_sync(&amp;dentry_tree_work);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HASH_SIZE; i++)</div><div class='add'>+		WARN_ON_ONCE(!RB_EMPTY_ROOT(&amp;dentry_hash[i].tree));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void __fuse_dentry_settime(struct dentry *dentry, u64 time)</div><div class='ctx'> {</div><div class='del'>-	((union fuse_dentry *) dentry-&gt;d_fsdata)-&gt;time = time;</div><div class='add'>+	((struct fuse_dentry *) dentry-&gt;d_fsdata)-&gt;time = time;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 fuse_dentry_time(const struct dentry *entry)</div><div class='ctx'> {</div><div class='del'>-	return ((union fuse_dentry *) entry-&gt;d_fsdata)-&gt;time;</div><div class='add'>+	return ((struct fuse_dentry *) entry-&gt;d_fsdata)-&gt;time;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void fuse_dentry_settime(struct dentry *dentry, u64 time)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,6 +260,7 @@ static void fuse_dentry_settime(struct dentry *dentry, u64 time)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__fuse_dentry_settime(dentry, time);</div><div class='add'>+	fuse_dentry_tree_add_node(dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -175,9 +355,12 @@ static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args,</div><div class='ctx'> 	memset(outarg, 0, sizeof(struct fuse_entry_out));</div><div class='ctx'> 	args-&gt;opcode = FUSE_LOOKUP;</div><div class='ctx'> 	args-&gt;nodeid = nodeid;</div><div class='del'>-	args-&gt;in_numargs = 1;</div><div class='del'>-	args-&gt;in_args[0].size = name-&gt;len + 1;</div><div class='del'>-	args-&gt;in_args[0].value = name-&gt;name;</div><div class='add'>+	args-&gt;in_numargs = 3;</div><div class='add'>+	fuse_set_zero_arg0(args);</div><div class='add'>+	args-&gt;in_args[1].size = name-&gt;len;</div><div class='add'>+	args-&gt;in_args[1].value = name-&gt;name;</div><div class='add'>+	args-&gt;in_args[2].size = 1;</div><div class='add'>+	args-&gt;in_args[2].value = "";</div><div class='ctx'> 	args-&gt;out_numargs = 1;</div><div class='ctx'> 	args-&gt;out_args[0].size = sizeof(struct fuse_entry_out);</div><div class='ctx'> 	args-&gt;out_args[0].value = outarg;</div><div class='hunk'>@@ -192,14 +375,19 @@ static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args,</div><div class='ctx'>  * the lookup once more.  If the lookup results in the same inode,</div><div class='ctx'>  * then refresh the attributes, timeouts and mark the dentry valid.</div><div class='ctx'>  */</div><div class='del'>-static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)</div><div class='add'>+static int fuse_dentry_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				  struct dentry *entry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct dentry *parent;</div><div class='ctx'> 	struct fuse_mount *fm;</div><div class='add'>+	struct fuse_conn *fc;</div><div class='ctx'> 	struct fuse_inode *fi;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	fc = get_fuse_conn_super(dir-&gt;i_sb);</div><div class='add'>+	if (entry-&gt;d_time &lt; atomic_read(&amp;fc-&gt;epoch))</div><div class='add'>+		goto invalid;</div><div class='add'>+</div><div class='ctx'> 	inode = d_inode_rcu(entry);</div><div class='ctx'> 	if (inode &amp;&amp; fuse_is_bad(inode))</div><div class='ctx'> 		goto invalid;</div><div class='hunk'>@@ -227,11 +415,9 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)</div><div class='ctx'> </div><div class='ctx'> 		attr_version = fuse_get_attr_version(fm-&gt;fc);</div><div class='ctx'> </div><div class='del'>-		parent = dget_parent(entry);</div><div class='del'>-		fuse_lookup_init(fm-&gt;fc, &amp;args, get_node_id(d_inode(parent)),</div><div class='del'>-				 &amp;entry-&gt;d_name, &amp;outarg);</div><div class='add'>+		fuse_lookup_init(fm-&gt;fc, &amp;args, get_node_id(dir),</div><div class='add'>+				 name, &amp;outarg);</div><div class='ctx'> 		ret = fuse_simple_request(fm, &amp;args);</div><div class='del'>-		dput(parent);</div><div class='ctx'> 		/* Zero nodeid is same as -ENOENT */</div><div class='ctx'> 		if (!ret &amp;&amp; !outarg.nodeid)</div><div class='ctx'> 			ret = -ENOENT;</div><div class='hunk'>@@ -265,9 +451,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)</div><div class='ctx'> 			if (test_bit(FUSE_I_INIT_RDPLUS, &amp;fi-&gt;state))</div><div class='ctx'> 				return -ECHILD;</div><div class='ctx'> 		} else if (test_and_clear_bit(FUSE_I_INIT_RDPLUS, &amp;fi-&gt;state)) {</div><div class='del'>-			parent = dget_parent(entry);</div><div class='del'>-			fuse_advise_use_readdirplus(d_inode(parent));</div><div class='del'>-			dput(parent);</div><div class='add'>+			fuse_advise_use_readdirplus(dir);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 1;</div><div class='hunk'>@@ -279,21 +463,36 @@ invalid:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if BITS_PER_LONG &lt; 64</div><div class='ctx'> static int fuse_dentry_init(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	dentry-&gt;d_fsdata = kzalloc(sizeof(union fuse_dentry),</div><div class='del'>-				   GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);</div><div class='add'>+	struct fuse_dentry *fd;</div><div class='ctx'> </div><div class='del'>-	return dentry-&gt;d_fsdata ? 0 : -ENOMEM;</div><div class='add'>+	fd = kzalloc(sizeof(struct fuse_dentry),</div><div class='add'>+			  GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);</div><div class='add'>+	if (!fd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fd-&gt;dentry = dentry;</div><div class='add'>+	RB_CLEAR_NODE(&amp;fd-&gt;node);</div><div class='add'>+	dentry-&gt;d_fsdata = fd;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void fuse_dentry_prune(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct fuse_dentry *fd = dentry-&gt;d_fsdata;</div><div class='add'>+</div><div class='add'>+	if (!RB_EMPTY_NODE(&amp;fd-&gt;node))</div><div class='add'>+		fuse_dentry_tree_del_node(dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fuse_dentry_release(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	union fuse_dentry *fd = dentry-&gt;d_fsdata;</div><div class='add'>+	struct fuse_dentry *fd = dentry-&gt;d_fsdata;</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(fd, rcu);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int fuse_dentry_delete(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='hunk'>@@ -320,9 +519,6 @@ static struct vfsmount *fuse_dentry_automount(struct path *path)</div><div class='ctx'> </div><div class='ctx'> 	/* Create the submount */</div><div class='ctx'> 	mnt = fc_mount(fsc);</div><div class='del'>-	if (!IS_ERR(mnt))</div><div class='del'>-		mntget(mnt);</div><div class='del'>-</div><div class='ctx'> 	put_fs_context(fsc);</div><div class='ctx'> 	return mnt;</div><div class='ctx'> }</div><div class='hunk'>@@ -330,20 +526,12 @@ static struct vfsmount *fuse_dentry_automount(struct path *path)</div><div class='ctx'> const struct dentry_operations fuse_dentry_operations = {</div><div class='ctx'> 	.d_revalidate	= fuse_dentry_revalidate,</div><div class='ctx'> 	.d_delete	= fuse_dentry_delete,</div><div class='del'>-#if BITS_PER_LONG &lt; 64</div><div class='ctx'> 	.d_init		= fuse_dentry_init,</div><div class='add'>+	.d_prune	= fuse_dentry_prune,</div><div class='ctx'> 	.d_release	= fuse_dentry_release,</div><div class='del'>-#endif</div><div class='ctx'> 	.d_automount	= fuse_dentry_automount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct dentry_operations fuse_root_dentry_operations = {</div><div class='del'>-#if BITS_PER_LONG &lt; 64</div><div class='del'>-	.d_init		= fuse_dentry_init,</div><div class='del'>-	.d_release	= fuse_dentry_release,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int fuse_valid_type(int m)</div><div class='ctx'> {</div><div class='ctx'> 	return S_ISREG(m) || S_ISDIR(m) || S_ISLNK(m) || S_ISCHR(m) ||</div><div class='hunk'>@@ -366,12 +554,12 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount_super(sb);</div><div class='ctx'> 	FUSE_ARGS(args);</div><div class='ctx'> 	struct fuse_forget_link *forget;</div><div class='del'>-	u64 attr_version;</div><div class='add'>+	u64 attr_version, evict_ctr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	*inode = NULL;</div><div class='ctx'> 	err = -ENAMETOOLONG;</div><div class='del'>-	if (name-&gt;len &gt; FUSE_NAME_MAX)</div><div class='add'>+	if (name-&gt;len &gt; fm-&gt;fc-&gt;name_max)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -381,6 +569,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	attr_version = fuse_get_attr_version(fm-&gt;fc);</div><div class='add'>+	evict_ctr = fuse_get_evict_ctr(fm-&gt;fc);</div><div class='ctx'> </div><div class='ctx'> 	fuse_lookup_init(fm-&gt;fc, &amp;args, nodeid, name, outarg);</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='hunk'>@@ -391,10 +580,14 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name</div><div class='ctx'> 	err = -EIO;</div><div class='ctx'> 	if (fuse_invalid_attr(&amp;outarg-&gt;attr))</div><div class='ctx'> 		goto out_put_forget;</div><div class='add'>+	if (outarg-&gt;nodeid == FUSE_ROOT_ID &amp;&amp; outarg-&gt;generation != 0) {</div><div class='add'>+		pr_warn_once("root generation should be zero\n");</div><div class='add'>+		outarg-&gt;generation = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*inode = fuse_iget(sb, outarg-&gt;nodeid, outarg-&gt;generation,</div><div class='ctx'> 			   &amp;outarg-&gt;attr, ATTR_TIMEOUT(outarg),</div><div class='del'>-			   attr_version);</div><div class='add'>+			   attr_version, evict_ctr);</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (!*inode) {</div><div class='ctx'> 		fuse_queue_forget(fm-&gt;fc, forget, outarg-&gt;nodeid, 1);</div><div class='hunk'>@@ -411,16 +604,20 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name</div><div class='ctx'> static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 				  unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	struct fuse_entry_out outarg;</div><div class='add'>+	struct fuse_conn *fc;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct dentry *newent;</div><div class='add'>+	int err, epoch;</div><div class='ctx'> 	bool outarg_valid = true;</div><div class='ctx'> 	bool locked;</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_is_bad(dir))</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='add'>+	fc = get_fuse_conn_super(dir-&gt;i_sb);</div><div class='add'>+	epoch = atomic_read(&amp;fc-&gt;epoch);</div><div class='add'>+</div><div class='ctx'> 	locked = fuse_lock_inode(dir);</div><div class='ctx'> 	err = fuse_lookup_name(dir-&gt;i_sb, get_node_id(dir), &amp;entry-&gt;d_name,</div><div class='ctx'> 			       &amp;outarg, &amp;inode);</div><div class='hunk'>@@ -442,6 +639,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	entry = newent ? newent : entry;</div><div class='add'>+	entry-&gt;d_time = epoch;</div><div class='ctx'> 	if (outarg_valid)</div><div class='ctx'> 		fuse_change_entry_timeout(entry, &amp;outarg);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -462,29 +660,29 @@ static int get_security_context(struct dentry *entry, umode_t mode,</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_secctx *fctx;</div><div class='ctx'> 	struct fuse_secctx_header *header;</div><div class='del'>-	void *ctx = NULL, *ptr;</div><div class='del'>-	u32 ctxlen, total_len = sizeof(*header);</div><div class='add'>+	struct lsm_context lsmctx = { };</div><div class='add'>+	void *ptr;</div><div class='add'>+	u32 total_len = sizeof(*header);</div><div class='ctx'> 	int err, nr_ctx = 0;</div><div class='del'>-	const char *name;</div><div class='del'>-	size_t namelen;</div><div class='add'>+	const char *name = NULL;</div><div class='add'>+	size_t namesize;</div><div class='ctx'> </div><div class='ctx'> 	err = security_dentry_init_security(entry, mode, &amp;entry-&gt;d_name,</div><div class='del'>-					    &amp;name, &amp;ctx, &amp;ctxlen);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err != -EOPNOTSUPP)</div><div class='del'>-			goto out_err;</div><div class='del'>-		/* No LSM is supporting this security hook. Ignore error */</div><div class='del'>-		ctxlen = 0;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-	}</div><div class='add'>+					    &amp;name, &amp;lsmctx);</div><div class='ctx'> </div><div class='del'>-	if (ctxlen) {</div><div class='add'>+	/* If no LSM is supporting this security hook ignore error */</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (lsmctx.len) {</div><div class='ctx'> 		nr_ctx = 1;</div><div class='del'>-		namelen = strlen(name) + 1;</div><div class='add'>+		namesize = strlen(name) + 1;</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		if (WARN_ON(namelen &gt; XATTR_NAME_MAX + 1 || ctxlen &gt; S32_MAX))</div><div class='add'>+		if (WARN_ON(namesize &gt; XATTR_NAME_MAX + 1 ||</div><div class='add'>+		    lsmctx.len &gt; S32_MAX))</div><div class='ctx'> 			goto out_err;</div><div class='del'>-		total_len += FUSE_REC_ALIGN(sizeof(*fctx) + namelen + ctxlen);</div><div class='add'>+		total_len += FUSE_REC_ALIGN(sizeof(*fctx) + namesize +</div><div class='add'>+					    lsmctx.len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='hunk'>@@ -497,19 +695,20 @@ static int get_security_context(struct dentry *entry, umode_t mode,</div><div class='ctx'> 	ptr += sizeof(*header);</div><div class='ctx'> 	if (nr_ctx) {</div><div class='ctx'> 		fctx = ptr;</div><div class='del'>-		fctx-&gt;size = ctxlen;</div><div class='add'>+		fctx-&gt;size = lsmctx.len;</div><div class='ctx'> 		ptr += sizeof(*fctx);</div><div class='ctx'> </div><div class='del'>-		strcpy(ptr, name);</div><div class='del'>-		ptr += namelen;</div><div class='add'>+		strscpy(ptr, name, namesize);</div><div class='add'>+		ptr += namesize;</div><div class='ctx'> </div><div class='del'>-		memcpy(ptr, ctx, ctxlen);</div><div class='add'>+		memcpy(ptr, lsmctx.context, lsmctx.len);</div><div class='ctx'> 	}</div><div class='ctx'> 	ext-&gt;size = total_len;</div><div class='ctx'> 	ext-&gt;value = header;</div><div class='ctx'> 	err = 0;</div><div class='ctx'> out_err:</div><div class='del'>-	kfree(ctx);</div><div class='add'>+	if (nr_ctx)</div><div class='add'>+		security_release_secctx(&amp;lsmctx);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -541,17 +740,21 @@ static u32 fuse_ext_size(size_t size)</div><div class='ctx'> /*</div><div class='ctx'>  * This adds just a single supplementary group that matches the parent's group.</div><div class='ctx'>  */</div><div class='del'>-static int get_create_supp_group(struct inode *dir, struct fuse_in_arg *ext)</div><div class='add'>+static int get_create_supp_group(struct mnt_idmap *idmap,</div><div class='add'>+				 struct inode *dir,</div><div class='add'>+				 struct fuse_in_arg *ext)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(dir);</div><div class='ctx'> 	struct fuse_ext_header *xh;</div><div class='ctx'> 	struct fuse_supp_groups *sg;</div><div class='ctx'> 	kgid_t kgid = dir-&gt;i_gid;</div><div class='add'>+	vfsgid_t vfsgid = make_vfsgid(idmap, fc-&gt;user_ns, kgid);</div><div class='ctx'> 	gid_t parent_gid = from_kgid(fc-&gt;user_ns, kgid);</div><div class='add'>+</div><div class='ctx'> 	u32 sg_len = fuse_ext_size(sizeof(*sg) + sizeof(sg-&gt;groups[0]));</div><div class='ctx'> </div><div class='del'>-	if (parent_gid == (gid_t) -1 || gid_eq(kgid, current_fsgid()) ||</div><div class='del'>-	    !in_group_p(kgid))</div><div class='add'>+	if (parent_gid == (gid_t) -1 || vfsgid_eq_kgid(vfsgid, current_fsgid()) ||</div><div class='add'>+	    !vfsgid_in_group_p(vfsgid))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	xh = extend_arg(ext, sg_len);</div><div class='hunk'>@@ -568,7 +771,8 @@ static int get_create_supp_group(struct inode *dir, struct fuse_in_arg *ext)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_create_ext(struct fuse_args *args,</div><div class='add'>+static int get_create_ext(struct mnt_idmap *idmap,</div><div class='add'>+			  struct fuse_args *args,</div><div class='ctx'> 			  struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			  umode_t mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -579,7 +783,7 @@ static int get_create_ext(struct fuse_args *args,</div><div class='ctx'> 	if (fc-&gt;init_security)</div><div class='ctx'> 		err = get_security_context(dentry, mode, &amp;ext);</div><div class='ctx'> 	if (!err &amp;&amp; fc-&gt;create_supp_group)</div><div class='del'>-		err = get_create_supp_group(dir, &amp;ext);</div><div class='add'>+		err = get_create_supp_group(idmap, dir, &amp;ext);</div><div class='ctx'> </div><div class='ctx'> 	if (!err &amp;&amp; ext.size) {</div><div class='ctx'> 		WARN_ON(args-&gt;in_numargs &gt;= ARRAY_SIZE(args-&gt;in_args));</div><div class='hunk'>@@ -605,32 +809,33 @@ static void free_ext_value(struct fuse_args *args)</div><div class='ctx'>  * If the filesystem doesn't support this, then fall back to separate</div><div class='ctx'>  * 'mknod' + 'open' requests.</div><div class='ctx'>  */</div><div class='del'>-static int fuse_create_open(struct inode *dir, struct dentry *entry,</div><div class='del'>-			    struct file *file, unsigned int flags,</div><div class='del'>-			    umode_t mode, u32 opcode)</div><div class='add'>+static int fuse_create_open(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+			    struct dentry *entry, struct file *file,</div><div class='add'>+			    unsigned int flags, umode_t mode, u32 opcode)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(dir);</div><div class='ctx'> 	FUSE_ARGS(args);</div><div class='ctx'> 	struct fuse_forget_link *forget;</div><div class='ctx'> 	struct fuse_create_in inarg;</div><div class='del'>-	struct fuse_open_out outopen;</div><div class='add'>+	struct fuse_open_out *outopenp;</div><div class='ctx'> 	struct fuse_entry_out outentry;</div><div class='ctx'> 	struct fuse_inode *fi;</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='add'>+	int epoch, err;</div><div class='ctx'> 	bool trunc = flags &amp; O_TRUNC;</div><div class='ctx'> </div><div class='ctx'> 	/* Userspace expects S_IFREG in create mode */</div><div class='ctx'> 	BUG_ON((mode &amp; S_IFMT) != S_IFREG);</div><div class='ctx'> </div><div class='add'>+	epoch = atomic_read(&amp;fm-&gt;fc-&gt;epoch);</div><div class='ctx'> 	forget = fuse_alloc_forget();</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (!forget)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	ff = fuse_file_alloc(fm);</div><div class='add'>+	ff = fuse_file_alloc(fm, true);</div><div class='ctx'> 	if (!ff)</div><div class='ctx'> 		goto out_put_forget_req;</div><div class='ctx'> </div><div class='hunk'>@@ -659,14 +864,16 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 	args.out_numargs = 2;</div><div class='ctx'> 	args.out_args[0].size = sizeof(outentry);</div><div class='ctx'> 	args.out_args[0].value = &amp;outentry;</div><div class='del'>-	args.out_args[1].size = sizeof(outopen);</div><div class='del'>-	args.out_args[1].value = &amp;outopen;</div><div class='add'>+	/* Store outarg for fuse_finish_open() */</div><div class='add'>+	outopenp = &amp;ff-&gt;args-&gt;open_outarg;</div><div class='add'>+	args.out_args[1].size = sizeof(*outopenp);</div><div class='add'>+	args.out_args[1].value = outopenp;</div><div class='ctx'> </div><div class='del'>-	err = get_create_ext(&amp;args, dir, entry, mode);</div><div class='add'>+	err = get_create_ext(idmap, &amp;args, dir, entry, mode);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_put_forget_req;</div><div class='add'>+		goto out_free_ff;</div><div class='ctx'> </div><div class='del'>-	err = fuse_simple_request(fm, &amp;args);</div><div class='add'>+	err = fuse_simple_idmap_request(idmap, fm, &amp;args);</div><div class='ctx'> 	free_ext_value(&amp;args);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_free_ff;</div><div class='hunk'>@@ -676,11 +883,11 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 	    fuse_invalid_attr(&amp;outentry.attr))</div><div class='ctx'> 		goto out_free_ff;</div><div class='ctx'> </div><div class='del'>-	ff-&gt;fh = outopen.fh;</div><div class='add'>+	ff-&gt;fh = outopenp-&gt;fh;</div><div class='ctx'> 	ff-&gt;nodeid = outentry.nodeid;</div><div class='del'>-	ff-&gt;open_flags = outopen.open_flags;</div><div class='add'>+	ff-&gt;open_flags = outopenp-&gt;open_flags;</div><div class='ctx'> 	inode = fuse_iget(dir-&gt;i_sb, outentry.nodeid, outentry.generation,</div><div class='del'>-			  &amp;outentry.attr, ATTR_TIMEOUT(&amp;outentry), 0);</div><div class='add'>+			  &amp;outentry.attr, ATTR_TIMEOUT(&amp;outentry), 0, 0);</div><div class='ctx'> 	if (!inode) {</div><div class='ctx'> 		flags &amp;= ~(O_CREAT | O_EXCL | O_TRUNC);</div><div class='ctx'> 		fuse_sync_release(NULL, ff, flags);</div><div class='hunk'>@@ -690,15 +897,18 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(forget);</div><div class='ctx'> 	d_instantiate(entry, inode);</div><div class='add'>+	entry-&gt;d_time = epoch;</div><div class='ctx'> 	fuse_change_entry_timeout(entry, &amp;outentry);</div><div class='ctx'> 	fuse_dir_changed(dir);</div><div class='del'>-	err = finish_open(file, entry, generic_file_open);</div><div class='add'>+	err = generic_file_open(inode, file);</div><div class='add'>+	if (!err) {</div><div class='add'>+		file-&gt;private_data = ff;</div><div class='add'>+		err = finish_open(file, entry, fuse_finish_open);</div><div class='add'>+	}</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		fi = get_fuse_inode(inode);</div><div class='ctx'> 		fuse_sync_release(fi, ff, flags);</div><div class='ctx'> 	} else {</div><div class='del'>-		file-&gt;private_data = ff;</div><div class='del'>-		fuse_finish_open(inode, file);</div><div class='ctx'> 		if (fm-&gt;fc-&gt;atomic_o_trunc &amp;&amp; trunc)</div><div class='ctx'> 			truncate_pagecache(inode, 0);</div><div class='ctx'> 		else if (!(ff-&gt;open_flags &amp; FOPEN_KEEP_CACHE))</div><div class='hunk'>@@ -721,23 +931,20 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 			    umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(dir);</div><div class='del'>-	struct dentry *res = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_is_bad(dir))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (d_in_lookup(entry)) {</div><div class='del'>-		res = fuse_lookup(dir, entry, 0);</div><div class='del'>-		if (IS_ERR(res))</div><div class='del'>-			return PTR_ERR(res);</div><div class='del'>-</div><div class='del'>-		if (res)</div><div class='del'>-			entry = res;</div><div class='add'>+		struct dentry *res = fuse_lookup(dir, entry, 0);</div><div class='add'>+		if (res || d_really_is_positive(entry))</div><div class='add'>+			return finish_no_open(file, res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(flags &amp; O_CREAT) || d_really_is_positive(entry))</div><div class='del'>-		goto no_open;</div><div class='add'>+	if (!(flags &amp; O_CREAT))</div><div class='add'>+		return finish_no_open(file, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Only creates */</div><div class='ctx'> 	file-&gt;f_mode |= FMODE_CREATED;</div><div class='hunk'>@@ -745,43 +952,42 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry,</div><div class='ctx'> 	if (fc-&gt;no_create)</div><div class='ctx'> 		goto mknod;</div><div class='ctx'> </div><div class='del'>-	err = fuse_create_open(dir, entry, file, flags, mode, FUSE_CREATE);</div><div class='add'>+	err = fuse_create_open(idmap, dir, entry, file, flags, mode, FUSE_CREATE);</div><div class='ctx'> 	if (err == -ENOSYS) {</div><div class='ctx'> 		fc-&gt;no_create = 1;</div><div class='ctx'> 		goto mknod;</div><div class='ctx'> 	} else if (err == -EEXIST)</div><div class='ctx'> 		fuse_invalidate_entry(entry);</div><div class='del'>-out_dput:</div><div class='del'>-	dput(res);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> mknod:</div><div class='del'>-	err = fuse_mknod(&amp;nop_mnt_idmap, dir, entry, mode, 0);</div><div class='add'>+	err = fuse_mknod(idmap, dir, entry, mode, 0);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_dput;</div><div class='del'>-no_open:</div><div class='del'>-	return finish_no_open(file, res);</div><div class='add'>+		return err;</div><div class='add'>+	return finish_no_open(file, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Code shared between mknod, mkdir, symlink and link</div><div class='ctx'>  */</div><div class='del'>-static int create_new_entry(struct fuse_mount *fm, struct fuse_args *args,</div><div class='del'>-			    struct inode *dir, struct dentry *entry,</div><div class='del'>-			    umode_t mode)</div><div class='add'>+static struct dentry *create_new_entry(struct mnt_idmap *idmap, struct fuse_mount *fm,</div><div class='add'>+				       struct fuse_args *args, struct inode *dir,</div><div class='add'>+				       struct dentry *entry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_entry_out outarg;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct dentry *d;</div><div class='del'>-	int err;</div><div class='ctx'> 	struct fuse_forget_link *forget;</div><div class='add'>+	int epoch, err;</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_is_bad(dir))</div><div class='del'>-		return -EIO;</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+</div><div class='add'>+	epoch = atomic_read(&amp;fm-&gt;fc-&gt;epoch);</div><div class='ctx'> </div><div class='ctx'> 	forget = fuse_alloc_forget();</div><div class='ctx'> 	if (!forget)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;outarg, 0, sizeof(outarg));</div><div class='ctx'> 	args-&gt;nodeid = get_node_id(dir);</div><div class='hunk'>@@ -790,12 +996,12 @@ static int create_new_entry(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	args-&gt;out_args[0].value = &amp;outarg;</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;opcode != FUSE_LINK) {</div><div class='del'>-		err = get_create_ext(args, dir, entry, mode);</div><div class='add'>+		err = get_create_ext(idmap, args, dir, entry, mode);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_put_forget_req;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = fuse_simple_request(fm, args);</div><div class='add'>+	err = fuse_simple_idmap_request(idmap, fm, args);</div><div class='ctx'> 	free_ext_value(args);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_put_forget_req;</div><div class='hunk'>@@ -808,32 +1014,49 @@ static int create_new_entry(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 		goto out_put_forget_req;</div><div class='ctx'> </div><div class='ctx'> 	inode = fuse_iget(dir-&gt;i_sb, outarg.nodeid, outarg.generation,</div><div class='del'>-			  &amp;outarg.attr, ATTR_TIMEOUT(&amp;outarg), 0);</div><div class='add'>+			  &amp;outarg.attr, ATTR_TIMEOUT(&amp;outarg), 0, 0);</div><div class='ctx'> 	if (!inode) {</div><div class='ctx'> 		fuse_queue_forget(fm-&gt;fc, forget, outarg.nodeid, 1);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(forget);</div><div class='ctx'> </div><div class='ctx'> 	d_drop(entry);</div><div class='ctx'> 	d = d_splice_alias(inode, entry);</div><div class='ctx'> 	if (IS_ERR(d))</div><div class='del'>-		return PTR_ERR(d);</div><div class='add'>+		return d;</div><div class='ctx'> </div><div class='ctx'> 	if (d) {</div><div class='add'>+		d-&gt;d_time = epoch;</div><div class='ctx'> 		fuse_change_entry_timeout(d, &amp;outarg);</div><div class='del'>-		dput(d);</div><div class='ctx'> 	} else {</div><div class='add'>+		entry-&gt;d_time = epoch;</div><div class='ctx'> 		fuse_change_entry_timeout(entry, &amp;outarg);</div><div class='ctx'> 	}</div><div class='ctx'> 	fuse_dir_changed(dir);</div><div class='del'>-	return 0;</div><div class='add'>+	return d;</div><div class='ctx'> </div><div class='ctx'>  out_put_forget_req:</div><div class='ctx'> 	if (err == -EEXIST)</div><div class='ctx'> 		fuse_invalidate_entry(entry);</div><div class='ctx'> 	kfree(forget);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_new_nondir(struct mnt_idmap *idmap, struct fuse_mount *fm,</div><div class='add'>+			     struct fuse_args *args, struct inode *dir,</div><div class='add'>+			     struct dentry *entry, umode_t mode)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Note that when creating anything other than a directory we</div><div class='add'>+	 * can be sure create_new_entry() will NOT return an alternate</div><div class='add'>+	 * dentry as d_splice_alias() only returns an alternate dentry</div><div class='add'>+	 * for directories.  So we don't need to check for that case</div><div class='add'>+	 * when passing back the result.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(S_ISDIR(mode));</div><div class='add'>+</div><div class='add'>+	return PTR_ERR(create_new_entry(idmap, fm, args, dir, entry, mode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -856,13 +1079,13 @@ static int fuse_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	args.in_args[0].value = &amp;inarg;</div><div class='ctx'> 	args.in_args[1].size = entry-&gt;d_name.len + 1;</div><div class='ctx'> 	args.in_args[1].value = entry-&gt;d_name.name;</div><div class='del'>-	return create_new_entry(fm, &amp;args, dir, entry, mode);</div><div class='add'>+	return create_new_nondir(idmap, fm, &amp;args, dir, entry, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		       struct dentry *entry, umode_t mode, bool excl)</div><div class='ctx'> {</div><div class='del'>-	return fuse_mknod(&amp;nop_mnt_idmap, dir, entry, mode, 0);</div><div class='add'>+	return fuse_mknod(idmap, dir, entry, mode, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -874,7 +1097,8 @@ static int fuse_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (fc-&gt;no_tmpfile)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	err = fuse_create_open(dir, file-&gt;f_path.dentry, file, file-&gt;f_flags, mode, FUSE_TMPFILE);</div><div class='add'>+	err = fuse_create_open(idmap, dir, file-&gt;f_path.dentry, file,</div><div class='add'>+			       file-&gt;f_flags, mode, FUSE_TMPFILE);</div><div class='ctx'> 	if (err == -ENOSYS) {</div><div class='ctx'> 		fc-&gt;no_tmpfile = 1;</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='hunk'>@@ -882,8 +1106,8 @@ static int fuse_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *entry, umode_t mode)</div><div class='add'>+static struct dentry *fuse_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *entry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_mkdir_in inarg;</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(dir);</div><div class='hunk'>@@ -901,7 +1125,7 @@ static int fuse_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	args.in_args[0].value = &amp;inarg;</div><div class='ctx'> 	args.in_args[1].size = entry-&gt;d_name.len + 1;</div><div class='ctx'> 	args.in_args[1].value = entry-&gt;d_name.name;</div><div class='del'>-	return create_new_entry(fm, &amp;args, dir, entry, S_IFDIR);</div><div class='add'>+	return create_new_entry(idmap, fm, &amp;args, dir, entry, S_IFDIR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -912,12 +1136,13 @@ static int fuse_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	FUSE_ARGS(args);</div><div class='ctx'> </div><div class='ctx'> 	args.opcode = FUSE_SYMLINK;</div><div class='del'>-	args.in_numargs = 2;</div><div class='del'>-	args.in_args[0].size = entry-&gt;d_name.len + 1;</div><div class='del'>-	args.in_args[0].value = entry-&gt;d_name.name;</div><div class='del'>-	args.in_args[1].size = len;</div><div class='del'>-	args.in_args[1].value = link;</div><div class='del'>-	return create_new_entry(fm, &amp;args, dir, entry, S_IFLNK);</div><div class='add'>+	args.in_numargs = 3;</div><div class='add'>+	fuse_set_zero_arg0(&amp;args);</div><div class='add'>+	args.in_args[1].size = entry-&gt;d_name.len + 1;</div><div class='add'>+	args.in_args[1].value = entry-&gt;d_name.name;</div><div class='add'>+	args.in_args[2].size = len;</div><div class='add'>+	args.in_args[2].value = link;</div><div class='add'>+	return create_new_nondir(idmap, fm, &amp;args, dir, entry, S_IFLNK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fuse_flush_time_update(struct inode *inode)</div><div class='hunk'>@@ -976,9 +1201,10 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)</div><div class='ctx'> </div><div class='ctx'> 	args.opcode = FUSE_UNLINK;</div><div class='ctx'> 	args.nodeid = get_node_id(dir);</div><div class='del'>-	args.in_numargs = 1;</div><div class='del'>-	args.in_args[0].size = entry-&gt;d_name.len + 1;</div><div class='del'>-	args.in_args[0].value = entry-&gt;d_name.name;</div><div class='add'>+	args.in_numargs = 2;</div><div class='add'>+	fuse_set_zero_arg0(&amp;args);</div><div class='add'>+	args.in_args[1].size = entry-&gt;d_name.len + 1;</div><div class='add'>+	args.in_args[1].value = entry-&gt;d_name.name;</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		fuse_dir_changed(dir);</div><div class='hunk'>@@ -999,9 +1225,10 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)</div><div class='ctx'> </div><div class='ctx'> 	args.opcode = FUSE_RMDIR;</div><div class='ctx'> 	args.nodeid = get_node_id(dir);</div><div class='del'>-	args.in_numargs = 1;</div><div class='del'>-	args.in_args[0].size = entry-&gt;d_name.len + 1;</div><div class='del'>-	args.in_args[0].value = entry-&gt;d_name.name;</div><div class='add'>+	args.in_numargs = 2;</div><div class='add'>+	fuse_set_zero_arg0(&amp;args);</div><div class='add'>+	args.in_args[1].size = entry-&gt;d_name.len + 1;</div><div class='add'>+	args.in_args[1].value = entry-&gt;d_name.name;</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		fuse_dir_changed(dir);</div><div class='hunk'>@@ -1011,7 +1238,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_rename_common(struct inode *olddir, struct dentry *oldent,</div><div class='add'>+static int fuse_rename_common(struct mnt_idmap *idmap, struct inode *olddir, struct dentry *oldent,</div><div class='ctx'> 			      struct inode *newdir, struct dentry *newent,</div><div class='ctx'> 			      unsigned int flags, int opcode, size_t argsize)</div><div class='ctx'> {</div><div class='hunk'>@@ -1032,7 +1259,7 @@ static int fuse_rename_common(struct inode *olddir, struct dentry *oldent,</div><div class='ctx'> 	args.in_args[1].value = oldent-&gt;d_name.name;</div><div class='ctx'> 	args.in_args[2].size = newent-&gt;d_name.len + 1;</div><div class='ctx'> 	args.in_args[2].value = newent-&gt;d_name.name;</div><div class='del'>-	err = fuse_simple_request(fm, &amp;args);</div><div class='add'>+	err = fuse_simple_idmap_request(idmap, fm, &amp;args);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		/* ctime changes */</div><div class='ctx'> 		fuse_update_ctime(d_inode(oldent));</div><div class='hunk'>@@ -1078,7 +1305,8 @@ static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='ctx'> 		if (fc-&gt;no_rename2 || fc-&gt;minor &lt; 23)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		err = fuse_rename_common(olddir, oldent, newdir, newent, flags,</div><div class='add'>+		err = fuse_rename_common((flags &amp; RENAME_WHITEOUT) ? idmap : &amp;invalid_mnt_idmap,</div><div class='add'>+					 olddir, oldent, newdir, newent, flags,</div><div class='ctx'> 					 FUSE_RENAME2,</div><div class='ctx'> 					 sizeof(struct fuse_rename2_in));</div><div class='ctx'> 		if (err == -ENOSYS) {</div><div class='hunk'>@@ -1086,7 +1314,7 @@ static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		err = fuse_rename_common(olddir, oldent, newdir, newent, 0,</div><div class='add'>+		err = fuse_rename_common(&amp;invalid_mnt_idmap, olddir, oldent, newdir, newent, 0,</div><div class='ctx'> 					 FUSE_RENAME,</div><div class='ctx'> 					 sizeof(struct fuse_rename_in));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1103,6 +1331,9 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='ctx'> 	FUSE_ARGS(args);</div><div class='ctx'> </div><div class='add'>+	if (fm-&gt;fc-&gt;no_link)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;inarg, 0, sizeof(inarg));</div><div class='ctx'> 	inarg.oldnodeid = get_node_id(inode);</div><div class='ctx'> 	args.opcode = FUSE_LINK;</div><div class='hunk'>@@ -1111,27 +1342,37 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,</div><div class='ctx'> 	args.in_args[0].value = &amp;inarg;</div><div class='ctx'> 	args.in_args[1].size = newent-&gt;d_name.len + 1;</div><div class='ctx'> 	args.in_args[1].value = newent-&gt;d_name.name;</div><div class='del'>-	err = create_new_entry(fm, &amp;args, newdir, newent, inode-&gt;i_mode);</div><div class='add'>+	err = create_new_nondir(&amp;invalid_mnt_idmap, fm, &amp;args, newdir, newent, inode-&gt;i_mode);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		fuse_update_ctime_in_cache(inode);</div><div class='ctx'> 	else if (err == -EINTR)</div><div class='ctx'> 		fuse_invalidate_attr(inode);</div><div class='ctx'> </div><div class='add'>+	if (err == -ENOSYS)</div><div class='add'>+		fm-&gt;fc-&gt;no_link = 1;</div><div class='add'>+out:</div><div class='add'>+	if (fm-&gt;fc-&gt;no_link)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_fillattr(struct inode *inode, struct fuse_attr *attr,</div><div class='del'>-			  struct kstat *stat)</div><div class='add'>+static void fuse_fillattr(struct mnt_idmap *idmap, struct inode *inode,</div><div class='add'>+			  struct fuse_attr *attr, struct kstat *stat)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int blkbits;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	vfsuid_t vfsuid = make_vfsuid(idmap, fc-&gt;user_ns,</div><div class='add'>+				      make_kuid(fc-&gt;user_ns, attr-&gt;uid));</div><div class='add'>+	vfsgid_t vfsgid = make_vfsgid(idmap, fc-&gt;user_ns,</div><div class='add'>+				      make_kgid(fc-&gt;user_ns, attr-&gt;gid));</div><div class='ctx'> </div><div class='ctx'> 	stat-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 	stat-&gt;ino = attr-&gt;ino;</div><div class='ctx'> 	stat-&gt;mode = (inode-&gt;i_mode &amp; S_IFMT) | (attr-&gt;mode &amp; 07777);</div><div class='ctx'> 	stat-&gt;nlink = attr-&gt;nlink;</div><div class='del'>-	stat-&gt;uid = make_kuid(fc-&gt;user_ns, attr-&gt;uid);</div><div class='del'>-	stat-&gt;gid = make_kgid(fc-&gt;user_ns, attr-&gt;gid);</div><div class='add'>+	stat-&gt;uid = vfsuid_into_kuid(vfsuid);</div><div class='add'>+	stat-&gt;gid = vfsgid_into_kgid(vfsgid);</div><div class='ctx'> 	stat-&gt;rdev = inode-&gt;i_rdev;</div><div class='ctx'> 	stat-&gt;atime.tv_sec = attr-&gt;atime;</div><div class='ctx'> 	stat-&gt;atime.tv_nsec = attr-&gt;atimensec;</div><div class='hunk'>@@ -1170,8 +1411,8 @@ static void fuse_statx_to_attr(struct fuse_statx *sx, struct fuse_attr *attr)</div><div class='ctx'> 	attr-&gt;blksize = sx-&gt;blksize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_do_statx(struct inode *inode, struct file *file,</div><div class='del'>-			 struct kstat *stat)</div><div class='add'>+static int fuse_do_statx(struct mnt_idmap *idmap, struct inode *inode,</div><div class='add'>+			 struct file *file, struct kstat *stat)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct fuse_attr attr;</div><div class='hunk'>@@ -1210,7 +1451,7 @@ static int fuse_do_statx(struct inode *inode, struct file *file,</div><div class='ctx'> 	if (((sx-&gt;mask &amp; STATX_SIZE) &amp;&amp; !fuse_valid_size(sx-&gt;size)) ||</div><div class='ctx'> 	    ((sx-&gt;mask &amp; STATX_TYPE) &amp;&amp; (!fuse_valid_type(sx-&gt;mode) ||</div><div class='ctx'> 					 inode_wrong_type(inode, sx-&gt;mode)))) {</div><div class='del'>-		make_bad_inode(inode);</div><div class='add'>+		fuse_make_bad(inode);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1224,15 +1465,15 @@ static int fuse_do_statx(struct inode *inode, struct file *file,</div><div class='ctx'> 		stat-&gt;result_mask = sx-&gt;mask &amp; (STATX_BASIC_STATS | STATX_BTIME);</div><div class='ctx'> 		stat-&gt;btime.tv_sec = sx-&gt;btime.tv_sec;</div><div class='ctx'> 		stat-&gt;btime.tv_nsec = min_t(u32, sx-&gt;btime.tv_nsec, NSEC_PER_SEC - 1);</div><div class='del'>-		fuse_fillattr(inode, &amp;attr, stat);</div><div class='add'>+		fuse_fillattr(idmap, inode, &amp;attr, stat);</div><div class='ctx'> 		stat-&gt;result_mask |= STATX_TYPE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_do_getattr(struct inode *inode, struct kstat *stat,</div><div class='del'>-			   struct file *file)</div><div class='add'>+static int fuse_do_getattr(struct mnt_idmap *idmap, struct inode *inode,</div><div class='add'>+			   struct kstat *stat, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct fuse_getattr_in inarg;</div><div class='hunk'>@@ -1271,15 +1512,15 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,</div><div class='ctx'> 					       ATTR_TIMEOUT(&amp;outarg),</div><div class='ctx'> 					       attr_version);</div><div class='ctx'> 			if (stat)</div><div class='del'>-				fuse_fillattr(inode, &amp;outarg.attr, stat);</div><div class='add'>+				fuse_fillattr(idmap, inode, &amp;outarg.attr, stat);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_update_get_attr(struct inode *inode, struct file *file,</div><div class='del'>-				struct kstat *stat, u32 request_mask,</div><div class='del'>-				unsigned int flags)</div><div class='add'>+static int fuse_update_get_attr(struct mnt_idmap *idmap, struct inode *inode,</div><div class='add'>+				struct file *file, struct kstat *stat,</div><div class='add'>+				u32 request_mask, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='hunk'>@@ -1310,18 +1551,20 @@ retry:</div><div class='ctx'> 		forget_all_cached_acls(inode);</div><div class='ctx'> 		/* Try statx if BTIME is requested */</div><div class='ctx'> 		if (!fc-&gt;no_statx &amp;&amp; (request_mask &amp; ~STATX_BASIC_STATS)) {</div><div class='del'>-			err = fuse_do_statx(inode, file, stat);</div><div class='add'>+			err = fuse_do_statx(idmap, inode, file, stat);</div><div class='ctx'> 			if (err == -ENOSYS) {</div><div class='ctx'> 				fc-&gt;no_statx = 1;</div><div class='add'>+				err = 0;</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			err = fuse_do_getattr(inode, stat, file);</div><div class='add'>+			err = fuse_do_getattr(idmap, inode, stat, file);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (stat) {</div><div class='del'>-		generic_fillattr(&amp;nop_mnt_idmap, request_mask, inode, stat);</div><div class='add'>+		generic_fillattr(idmap, request_mask, inode, stat);</div><div class='ctx'> 		stat-&gt;mode = fi-&gt;orig_i_mode;</div><div class='ctx'> 		stat-&gt;ino = fi-&gt;orig_ino;</div><div class='add'>+		stat-&gt;blksize = 1 &lt;&lt; fi-&gt;cached_i_blkbits;</div><div class='ctx'> 		if (test_bit(FUSE_I_BTIME, &amp;fi-&gt;state)) {</div><div class='ctx'> 			stat-&gt;btime = fi-&gt;i_btime;</div><div class='ctx'> 			stat-&gt;result_mask |= STATX_BTIME;</div><div class='hunk'>@@ -1333,7 +1576,7 @@ retry:</div><div class='ctx'> </div><div class='ctx'> int fuse_update_attributes(struct inode *inode, struct file *file, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	return fuse_update_get_attr(inode, file, NULL, mask, 0);</div><div class='add'>+	return fuse_update_get_attr(&amp;nop_mnt_idmap, inode, file, NULL, mask, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid,</div><div class='hunk'>@@ -1348,27 +1591,25 @@ int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid,</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(parent, I_MUTEX_PARENT);</div><div class='ctx'> 	if (!S_ISDIR(parent-&gt;i_mode))</div><div class='del'>-		goto unlock;</div><div class='add'>+		goto put_parent;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOENT;</div><div class='ctx'> 	dir = d_find_alias(parent);</div><div class='ctx'> 	if (!dir)</div><div class='del'>-		goto unlock;</div><div class='add'>+		goto put_parent;</div><div class='ctx'> </div><div class='del'>-	name-&gt;hash = full_name_hash(dir, name-&gt;name, name-&gt;len);</div><div class='del'>-	entry = d_lookup(dir, name);</div><div class='add'>+	entry = start_removing_noperm(dir, name);</div><div class='ctx'> 	dput(dir);</div><div class='del'>-	if (!entry)</div><div class='del'>-		goto unlock;</div><div class='add'>+	if (IS_ERR(entry))</div><div class='add'>+		goto put_parent;</div><div class='ctx'> </div><div class='ctx'> 	fuse_dir_changed(parent);</div><div class='ctx'> 	if (!(flags &amp; FUSE_EXPIRE_ONLY))</div><div class='ctx'> 		d_invalidate(entry);</div><div class='ctx'> 	fuse_invalidate_entry_cache(entry);</div><div class='ctx'> </div><div class='del'>-	if (child_nodeid != 0 &amp;&amp; d_really_is_positive(entry)) {</div><div class='add'>+	if (child_nodeid != 0) {</div><div class='ctx'> 		inode_lock(d_inode(entry));</div><div class='ctx'> 		if (get_node_id(d_inode(entry)) != child_nodeid) {</div><div class='ctx'> 			err = -ENOENT;</div><div class='hunk'>@@ -1396,10 +1637,9 @@ int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='del'>-	dput(entry);</div><div class='ctx'> </div><div class='del'>- unlock:</div><div class='del'>-	inode_unlock(parent);</div><div class='add'>+	end_removing(entry);</div><div class='add'>+ put_parent:</div><div class='ctx'> 	iput(parent);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1453,6 +1693,14 @@ static int fuse_access(struct inode *inode, int mask)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mask &amp; MAY_NOT_BLOCK);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We should not send FUSE_ACCESS to the userspace</div><div class='add'>+	 * when idmapped mounts are enabled as for this case</div><div class='add'>+	 * we have fc-&gt;default_permissions = 1 and access</div><div class='add'>+	 * permission checks are done on the kernel side.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(!(fm-&gt;sb-&gt;s_iflags &amp; SB_I_NOIDMAP));</div><div class='add'>+</div><div class='ctx'> 	if (fm-&gt;fc-&gt;no_access)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1477,7 +1725,7 @@ static int fuse_perm_getattr(struct inode *inode, int mask)</div><div class='ctx'> 		return -ECHILD;</div><div class='ctx'> </div><div class='ctx'> 	forget_all_cached_acls(inode);</div><div class='del'>-	return fuse_do_getattr(inode, NULL, NULL);</div><div class='add'>+	return fuse_do_getattr(&amp;nop_mnt_idmap, inode, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1485,7 +1733,7 @@ static int fuse_perm_getattr(struct inode *inode, int mask)</div><div class='ctx'>  *</div><div class='ctx'>  * 1) Local access checking ('default_permissions' mount option) based</div><div class='ctx'>  * on file mode.  This is the plain old disk filesystem permission</div><div class='del'>- * modell.</div><div class='add'>+ * model.</div><div class='ctx'>  *</div><div class='ctx'>  * 2) "Remote" access checking, where server is responsible for</div><div class='ctx'>  * checking permission in each inode operation.  An exception to this</div><div class='hunk'>@@ -1525,7 +1773,7 @@ static int fuse_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fc-&gt;default_permissions) {</div><div class='del'>-		err = generic_permission(&amp;nop_mnt_idmap, inode, mask);</div><div class='add'>+		err = generic_permission(idmap, inode, mask);</div><div class='ctx'> </div><div class='ctx'> 		/* If permission is denied, try to refresh file</div><div class='ctx'> 		   attributes.  This is also needed, because the root</div><div class='hunk'>@@ -1533,7 +1781,7 @@ static int fuse_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 		if (err == -EACCES &amp;&amp; !refreshed) {</div><div class='ctx'> 			err = fuse_perm_getattr(inode, mask);</div><div class='ctx'> 			if (!err)</div><div class='del'>-				err = generic_permission(&amp;nop_mnt_idmap,</div><div class='add'>+				err = generic_permission(idmap,</div><div class='ctx'> 							 inode, mask);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1556,13 +1804,13 @@ static int fuse_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_readlink_page(struct inode *inode, struct page *page)</div><div class='add'>+static int fuse_readlink_folio(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='del'>-	struct fuse_page_desc desc = { .length = PAGE_SIZE - 1 };</div><div class='add'>+	struct fuse_folio_desc desc = { .length = folio_size(folio) - 1 };</div><div class='ctx'> 	struct fuse_args_pages ap = {</div><div class='del'>-		.num_pages = 1,</div><div class='del'>-		.pages = &amp;page,</div><div class='add'>+		.num_folios = 1,</div><div class='add'>+		.folios = &amp;folio,</div><div class='ctx'> 		.descs = &amp;desc,</div><div class='ctx'> 	};</div><div class='ctx'> 	char *link;</div><div class='hunk'>@@ -1585,7 +1833,7 @@ static int fuse_readlink_page(struct inode *inode, struct page *page)</div><div class='ctx'> 	if (WARN_ON(res &gt;= PAGE_SIZE))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	link = page_address(page);</div><div class='add'>+	link = folio_address(folio);</div><div class='ctx'> 	link[res] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1595,7 +1843,7 @@ static const char *fuse_get_link(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 				 struct delayed_call *callback)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = -EIO;</div><div class='hunk'>@@ -1603,26 +1851,26 @@ static const char *fuse_get_link(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	if (fc-&gt;cache_symlinks)</div><div class='del'>-		return page_get_link(dentry, inode, callback);</div><div class='add'>+		return page_get_link_raw(dentry, inode, callback);</div><div class='ctx'> </div><div class='ctx'> 	err = -ECHILD;</div><div class='ctx'> 	if (!dentry)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	page = alloc_page(GFP_KERNEL);</div><div class='add'>+	folio = folio_alloc(GFP_KERNEL, 0);</div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	if (!page)</div><div class='add'>+	if (!folio)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	err = fuse_readlink_page(inode, page);</div><div class='add'>+	err = fuse_readlink_folio(inode, folio);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		__free_page(page);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_delayed_call(callback, page_put_link, page);</div><div class='add'>+	set_delayed_call(callback, page_put_link, folio);</div><div class='ctx'> </div><div class='del'>-	return page_address(page);</div><div class='add'>+	return folio_address(folio);</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='hunk'>@@ -1630,7 +1878,32 @@ out_err:</div><div class='ctx'> </div><div class='ctx'> static int fuse_dir_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return fuse_open_common(inode, file, true);</div><div class='add'>+	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (fuse_is_bad(inode))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	err = generic_file_open(inode, file);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = fuse_do_open(fm, get_node_id(inode), file, true);</div><div class='add'>+	if (!err) {</div><div class='add'>+		struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Keep handling FOPEN_STREAM and FOPEN_NONSEEKABLE for</div><div class='add'>+		 * directories for backward compatibility, though it's unlikely</div><div class='add'>+		 * to be useful.</div><div class='add'>+		 */</div><div class='add'>+		if (ff-&gt;open_flags &amp; (FOPEN_STREAM | FOPEN_NONSEEKABLE))</div><div class='add'>+			nonseekable_open(inode, file);</div><div class='add'>+		if (!(ff-&gt;open_flags &amp; FOPEN_KEEP_CACHE))</div><div class='add'>+			invalidate_inode_pages2(inode-&gt;i_mapping);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_dir_release(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1706,17 +1979,29 @@ static bool update_mtime(unsigned ivalid, bool trust_local_mtime)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iattr,</div><div class='del'>-			   struct fuse_setattr_in *arg, bool trust_local_cmtime)</div><div class='add'>+static void iattr_to_fattr(struct mnt_idmap *idmap, struct fuse_conn *fc,</div><div class='add'>+			   struct iattr *iattr, struct fuse_setattr_in *arg,</div><div class='add'>+			   bool trust_local_cmtime)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned ivalid = iattr-&gt;ia_valid;</div><div class='ctx'> </div><div class='ctx'> 	if (ivalid &amp; ATTR_MODE)</div><div class='ctx'> 		arg-&gt;valid |= FATTR_MODE,   arg-&gt;mode = iattr-&gt;ia_mode;</div><div class='del'>-	if (ivalid &amp; ATTR_UID)</div><div class='del'>-		arg-&gt;valid |= FATTR_UID,    arg-&gt;uid = from_kuid(fc-&gt;user_ns, iattr-&gt;ia_uid);</div><div class='del'>-	if (ivalid &amp; ATTR_GID)</div><div class='del'>-		arg-&gt;valid |= FATTR_GID,    arg-&gt;gid = from_kgid(fc-&gt;user_ns, iattr-&gt;ia_gid);</div><div class='add'>+</div><div class='add'>+	if (ivalid &amp; ATTR_UID) {</div><div class='add'>+		kuid_t fsuid = from_vfsuid(idmap, fc-&gt;user_ns, iattr-&gt;ia_vfsuid);</div><div class='add'>+</div><div class='add'>+		arg-&gt;valid |= FATTR_UID;</div><div class='add'>+		arg-&gt;uid = from_kuid(fc-&gt;user_ns, fsuid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ivalid &amp; ATTR_GID) {</div><div class='add'>+		kgid_t fsgid = from_vfsgid(idmap, fc-&gt;user_ns, iattr-&gt;ia_vfsgid);</div><div class='add'>+</div><div class='add'>+		arg-&gt;valid |= FATTR_GID;</div><div class='add'>+		arg-&gt;gid = from_kgid(fc-&gt;user_ns, fsgid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ivalid &amp; ATTR_SIZE)</div><div class='ctx'> 		arg-&gt;valid |= FATTR_SIZE,   arg-&gt;size = iattr-&gt;ia_size;</div><div class='ctx'> 	if (ivalid &amp; ATTR_ATIME) {</div><div class='hunk'>@@ -1836,8 +2121,8 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff)</div><div class='ctx'>  * vmtruncate() doesn't allow for this case, so do the rlimit checking</div><div class='ctx'>  * and the actual truncation by hand.</div><div class='ctx'>  */</div><div class='del'>-int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='del'>-		    struct file *file)</div><div class='add'>+int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		    struct iattr *attr, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='hunk'>@@ -1853,11 +2138,12 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool trust_local_cmtime = is_wb;</div><div class='ctx'> 	bool fault_blocked = false;</div><div class='add'>+	u64 attr_version;</div><div class='ctx'> </div><div class='ctx'> 	if (!fc-&gt;default_permissions)</div><div class='ctx'> 		attr-&gt;ia_valid |= ATTR_FORCE;</div><div class='ctx'> </div><div class='del'>-	err = setattr_prepare(&amp;nop_mnt_idmap, dentry, attr);</div><div class='add'>+	err = setattr_prepare(idmap, dentry, attr);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1870,7 +2156,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='ctx'> 	if (FUSE_IS_DAX(inode) &amp;&amp; is_truncate) {</div><div class='ctx'> 		filemap_invalidate_lock(mapping);</div><div class='ctx'> 		fault_blocked = true;</div><div class='del'>-		err = fuse_dax_break_layouts(inode, 0, 0);</div><div class='add'>+		err = fuse_dax_break_layouts(inode, 0, -1);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			filemap_invalidate_unlock(mapping);</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1916,7 +2202,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;inarg, 0, sizeof(inarg));</div><div class='ctx'> 	memset(&amp;outarg, 0, sizeof(outarg));</div><div class='del'>-	iattr_to_fattr(fc, attr, &amp;inarg, trust_local_cmtime);</div><div class='add'>+	iattr_to_fattr(idmap, fc, attr, &amp;inarg, trust_local_cmtime);</div><div class='ctx'> 	if (file) {</div><div class='ctx'> 		struct fuse_file *ff = file-&gt;private_data;</div><div class='ctx'> 		inarg.valid |= FATTR_FH;</div><div class='hunk'>@@ -1937,6 +2223,8 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='ctx'> 		if (fc-&gt;handle_killpriv_v2 &amp;&amp; !capable(CAP_FSETID))</div><div class='ctx'> 			inarg.valid |= FATTR_KILL_SUIDGID;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	attr_version = fuse_get_attr_version(fm-&gt;fc);</div><div class='ctx'> 	fuse_setattr_fill(fc, &amp;args, inode, &amp;inarg, &amp;outarg);</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1962,9 +2250,17 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='ctx'> 		/* FIXME: clear I_DIRTY_SYNC? */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (fi-&gt;attr_version &gt; attr_version) {</div><div class='add'>+		/*</div><div class='add'>+		 * Apply attributes, for example for fsnotify_change(), but set</div><div class='add'>+		 * attribute timeout to zero.</div><div class='add'>+		 */</div><div class='add'>+		outarg.attr_valid = outarg.attr_valid_nsec = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fuse_change_attributes_common(inode, &amp;outarg.attr, NULL,</div><div class='ctx'> 				      ATTR_TIMEOUT(&amp;outarg),</div><div class='del'>-				      fuse_get_cache_mask(inode));</div><div class='add'>+				      fuse_get_cache_mask(inode), 0);</div><div class='ctx'> 	oldsize = inode-&gt;i_size;</div><div class='ctx'> 	/* see the comment in fuse_change_attributes() */</div><div class='ctx'> 	if (!is_wb || is_truncate)</div><div class='hunk'>@@ -2033,7 +2329,7 @@ static int fuse_setattr(struct mnt_idmap *idmap, struct dentry *entry,</div><div class='ctx'> 			 * ia_mode calculation may have used stale i_mode.</div><div class='ctx'> 			 * Refresh and recalculate.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = fuse_do_getattr(inode, NULL, file);</div><div class='add'>+			ret = fuse_do_getattr(idmap, inode, NULL, file);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2051,7 +2347,7 @@ static int fuse_setattr(struct mnt_idmap *idmap, struct dentry *entry,</div><div class='ctx'> 	if (!attr-&gt;ia_valid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = fuse_do_setattr(entry, attr, file);</div><div class='add'>+	ret = fuse_do_setattr(idmap, entry, attr, file);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If filesystem supports acls it may have updated acl xattrs in</div><div class='hunk'>@@ -2090,7 +2386,7 @@ static int fuse_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return fuse_update_get_attr(inode, NULL, stat, request_mask, flags);</div><div class='add'>+	return fuse_update_get_attr(idmap, inode, NULL, stat, request_mask, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations fuse_dir_inode_operations = {</div><div class='hunk'>@@ -2125,6 +2421,7 @@ static const struct file_operations fuse_dir_operations = {</div><div class='ctx'> 	.fsync		= fuse_dir_fsync,</div><div class='ctx'> 	.unlocked_ioctl	= fuse_dir_ioctl,</div><div class='ctx'> 	.compat_ioctl	= fuse_dir_compat_ioctl,</div><div class='add'>+	.setlease	= simple_nosetlease,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations fuse_common_inode_operations = {</div><div class='hunk'>@@ -2167,7 +2464,7 @@ void fuse_init_dir(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static int fuse_symlink_read_folio(struct file *null, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	int err = fuse_readlink_page(folio-&gt;mapping-&gt;host, &amp;folio-&gt;page);</div><div class='add'>+	int err = fuse_readlink_folio(folio-&gt;mapping-&gt;host, folio);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='head'>diff --git a/fs/fuse/file.c b/fs/fuse/file.c<br/>index 148a71b8b4d0..01bc894e9c2b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/file.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='ctx'> #include &lt;linux/splice.h&gt;</div><div class='add'>+#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='add'>+#include &lt;linux/iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int fuse_send_open(struct fuse_mount *fm, u64 nodeid,</div><div class='ctx'> 			  unsigned int open_flags, int opcode,</div><div class='hunk'>@@ -50,13 +52,7 @@ static int fuse_send_open(struct fuse_mount *fm, u64 nodeid,</div><div class='ctx'> 	return fuse_simple_request(fm, &amp;args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fuse_release_args {</div><div class='del'>-	struct fuse_args args;</div><div class='del'>-	struct fuse_release_in inarg;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct fuse_file *fuse_file_alloc(struct fuse_mount *fm)</div><div class='add'>+struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='ctx'> </div><div class='hunk'>@@ -65,15 +61,15 @@ struct fuse_file *fuse_file_alloc(struct fuse_mount *fm)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	ff-&gt;fm = fm;</div><div class='del'>-	ff-&gt;release_args = kzalloc(sizeof(*ff-&gt;release_args),</div><div class='del'>-				   GFP_KERNEL_ACCOUNT);</div><div class='del'>-	if (!ff-&gt;release_args) {</div><div class='del'>-		kfree(ff);</div><div class='del'>-		return NULL;</div><div class='add'>+	if (release) {</div><div class='add'>+		ff-&gt;args = kzalloc(sizeof(*ff-&gt;args), GFP_KERNEL_ACCOUNT);</div><div class='add'>+		if (!ff-&gt;args) {</div><div class='add'>+			kfree(ff);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ff-&gt;write_entry);</div><div class='del'>-	mutex_init(&amp;ff-&gt;readdir.lock);</div><div class='ctx'> 	refcount_set(&amp;ff-&gt;count, 1);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;ff-&gt;polled_node);</div><div class='ctx'> 	init_waitqueue_head(&amp;ff-&gt;poll_wait);</div><div class='hunk'>@@ -85,8 +81,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_mount *fm)</div><div class='ctx'> </div><div class='ctx'> void fuse_file_free(struct fuse_file *ff)</div><div class='ctx'> {</div><div class='del'>-	kfree(ff-&gt;release_args);</div><div class='del'>-	mutex_destroy(&amp;ff-&gt;readdir.lock);</div><div class='add'>+	kfree(ff-&gt;args);</div><div class='ctx'> 	kfree(ff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -105,13 +100,18 @@ static void fuse_release_end(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	kfree(ra);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_file_put(struct fuse_file *ff, bool sync, bool isdir)</div><div class='add'>+static void fuse_file_put(struct fuse_file *ff, bool sync)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;ff-&gt;count)) {</div><div class='del'>-		struct fuse_args *args = &amp;ff-&gt;release_args-&gt;args;</div><div class='add'>+		struct fuse_release_args *ra = &amp;ff-&gt;args-&gt;release_args;</div><div class='add'>+		struct fuse_args *args = (ra ? &amp;ra-&gt;args : NULL);</div><div class='add'>+</div><div class='add'>+		if (ra &amp;&amp; ra-&gt;inode)</div><div class='add'>+			fuse_file_io_release(ff, ra-&gt;inode);</div><div class='ctx'> </div><div class='del'>-		if (isdir ? ff-&gt;fm-&gt;fc-&gt;no_opendir : ff-&gt;fm-&gt;fc-&gt;no_open) {</div><div class='del'>-			/* Do nothing when client does not implement 'open' */</div><div class='add'>+		if (!args) {</div><div class='add'>+			/* Do nothing when server does not implement 'opendir' */</div><div class='add'>+		} else if (args-&gt;opcode == FUSE_RELEASE &amp;&amp; ff-&gt;fm-&gt;fc-&gt;no_open) {</div><div class='ctx'> 			fuse_release_end(ff-&gt;fm, args, 0);</div><div class='ctx'> 		} else if (sync) {</div><div class='ctx'> 			fuse_simple_request(ff-&gt;fm, args);</div><div class='hunk'>@@ -132,31 +132,45 @@ struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid,</div><div class='ctx'> 	struct fuse_conn *fc = fm-&gt;fc;</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='ctx'> 	int opcode = isdir ? FUSE_OPENDIR : FUSE_OPEN;</div><div class='add'>+	bool open = isdir ? !fc-&gt;no_opendir : !fc-&gt;no_open;</div><div class='add'>+	bool release = !isdir || open;</div><div class='ctx'> </div><div class='del'>-	ff = fuse_file_alloc(fm);</div><div class='add'>+	/*</div><div class='add'>+	 * ff-&gt;args-&gt;release_args still needs to be allocated (so we can hold an</div><div class='add'>+	 * inode reference while there are pending inflight file operations when</div><div class='add'>+	 * -&gt;release() is called, see fuse_prepare_release()) even if</div><div class='add'>+	 * fc-&gt;no_open is set else it becomes possible for reclaim to deadlock</div><div class='add'>+	 * if while servicing the readahead request the server triggers reclaim</div><div class='add'>+	 * and reclaim evicts the inode of the file being read ahead.</div><div class='add'>+	 */</div><div class='add'>+	ff = fuse_file_alloc(fm, release);</div><div class='ctx'> 	if (!ff)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	ff-&gt;fh = 0;</div><div class='ctx'> 	/* Default for no-open */</div><div class='ctx'> 	ff-&gt;open_flags = FOPEN_KEEP_CACHE | (isdir ? FOPEN_CACHE_DIR : 0);</div><div class='del'>-	if (isdir ? !fc-&gt;no_opendir : !fc-&gt;no_open) {</div><div class='del'>-		struct fuse_open_out outarg;</div><div class='add'>+	if (open) {</div><div class='add'>+		/* Store outarg for fuse_finish_open() */</div><div class='add'>+		struct fuse_open_out *outargp = &amp;ff-&gt;args-&gt;open_outarg;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='del'>-		err = fuse_send_open(fm, nodeid, open_flags, opcode, &amp;outarg);</div><div class='add'>+		err = fuse_send_open(fm, nodeid, open_flags, opcode, outargp);</div><div class='ctx'> 		if (!err) {</div><div class='del'>-			ff-&gt;fh = outarg.fh;</div><div class='del'>-			ff-&gt;open_flags = outarg.open_flags;</div><div class='del'>-</div><div class='add'>+			ff-&gt;fh = outargp-&gt;fh;</div><div class='add'>+			ff-&gt;open_flags = outargp-&gt;open_flags;</div><div class='ctx'> 		} else if (err != -ENOSYS) {</div><div class='ctx'> 			fuse_file_free(ff);</div><div class='ctx'> 			return ERR_PTR(err);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (isdir)</div><div class='add'>+			if (isdir) {</div><div class='add'>+				/* No release needed */</div><div class='add'>+				kfree(ff-&gt;args);</div><div class='add'>+				ff-&gt;args = NULL;</div><div class='ctx'> 				fc-&gt;no_opendir = 1;</div><div class='del'>-			else</div><div class='add'>+			} else {</div><div class='ctx'> 				fc-&gt;no_open = 1;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -195,40 +209,50 @@ static void fuse_link_write_file(struct file *file)</div><div class='ctx'> 	spin_unlock(&amp;fi-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fuse_finish_open(struct inode *inode, struct file *file)</div><div class='add'>+int fuse_finish_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_file *ff = file-&gt;private_data;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fuse_file_io_open(file, inode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (ff-&gt;open_flags &amp; FOPEN_STREAM)</div><div class='ctx'> 		stream_open(inode, file);</div><div class='ctx'> 	else if (ff-&gt;open_flags &amp; FOPEN_NONSEEKABLE)</div><div class='ctx'> 		nonseekable_open(inode, file);</div><div class='ctx'> </div><div class='del'>-	if (fc-&gt;atomic_o_trunc &amp;&amp; (file-&gt;f_flags &amp; O_TRUNC)) {</div><div class='del'>-		struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;fi-&gt;lock);</div><div class='del'>-		fi-&gt;attr_version = atomic64_inc_return(&amp;fc-&gt;attr_version);</div><div class='del'>-		i_size_write(inode, 0);</div><div class='del'>-		spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-		file_update_time(file);</div><div class='del'>-		fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);</div><div class='del'>-	}</div><div class='ctx'> 	if ((file-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; fc-&gt;writeback_cache)</div><div class='ctx'> 		fuse_link_write_file(file);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fuse_open_common(struct inode *inode, struct file *file, bool isdir)</div><div class='add'>+static void fuse_truncate_update_attr(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fi-&gt;lock);</div><div class='add'>+	fi-&gt;attr_version = atomic64_inc_return(&amp;fc-&gt;attr_version);</div><div class='add'>+	i_size_write(inode, 0);</div><div class='add'>+	spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+	file_update_time(file);</div><div class='add'>+	fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='ctx'> 	struct fuse_conn *fc = fm-&gt;fc;</div><div class='add'>+	struct fuse_file *ff;</div><div class='ctx'> 	int err;</div><div class='del'>-	bool is_wb_truncate = (file-&gt;f_flags &amp; O_TRUNC) &amp;&amp;</div><div class='del'>-			  fc-&gt;atomic_o_trunc &amp;&amp;</div><div class='del'>-			  fc-&gt;writeback_cache;</div><div class='del'>-	bool dax_truncate = (file-&gt;f_flags &amp; O_TRUNC) &amp;&amp;</div><div class='del'>-			  fc-&gt;atomic_o_trunc &amp;&amp; FUSE_IS_DAX(inode);</div><div class='add'>+	bool is_truncate = (file-&gt;f_flags &amp; O_TRUNC) &amp;&amp; fc-&gt;atomic_o_trunc;</div><div class='add'>+	bool is_wb_truncate = is_truncate &amp;&amp; fc-&gt;writeback_cache;</div><div class='add'>+	bool dax_truncate = is_truncate &amp;&amp; FUSE_IS_DAX(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_is_bad(inode))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -242,7 +266,7 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir)</div><div class='ctx'> </div><div class='ctx'> 	if (dax_truncate) {</div><div class='ctx'> 		filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='del'>-		err = fuse_dax_break_layouts(inode, 0, 0);</div><div class='add'>+		err = fuse_dax_break_layouts(inode, 0, -1);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_inode_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -250,16 +274,20 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir)</div><div class='ctx'> 	if (is_wb_truncate || dax_truncate)</div><div class='ctx'> 		fuse_set_nowrite(inode);</div><div class='ctx'> </div><div class='del'>-	err = fuse_do_open(fm, get_node_id(inode), file, isdir);</div><div class='del'>-	if (!err)</div><div class='del'>-		fuse_finish_open(inode, file);</div><div class='add'>+	err = fuse_do_open(fm, get_node_id(inode), file, false);</div><div class='add'>+	if (!err) {</div><div class='add'>+		ff = file-&gt;private_data;</div><div class='add'>+		err = fuse_finish_open(inode, file);</div><div class='add'>+		if (err)</div><div class='add'>+			fuse_sync_release(fi, ff, file-&gt;f_flags);</div><div class='add'>+		else if (is_truncate)</div><div class='add'>+			fuse_truncate_update_attr(inode, file);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_wb_truncate || dax_truncate)</div><div class='ctx'> 		fuse_release_nowrite(inode);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		struct fuse_file *ff = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-		if (fc-&gt;atomic_o_trunc &amp;&amp; (file-&gt;f_flags &amp; O_TRUNC))</div><div class='add'>+		if (is_truncate)</div><div class='ctx'> 			truncate_pagecache(inode, 0);</div><div class='ctx'> 		else if (!(ff-&gt;open_flags &amp; FOPEN_KEEP_CACHE))</div><div class='ctx'> 			invalidate_inode_pages2(inode-&gt;i_mapping);</div><div class='hunk'>@@ -274,10 +302,13 @@ out_inode_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_prepare_release(struct fuse_inode *fi, struct fuse_file *ff,</div><div class='del'>-				 unsigned int flags, int opcode)</div><div class='add'>+				 unsigned int flags, int opcode, bool sync)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = ff-&gt;fm-&gt;fc;</div><div class='del'>-	struct fuse_release_args *ra = ff-&gt;release_args;</div><div class='add'>+	struct fuse_release_args *ra = &amp;ff-&gt;args-&gt;release_args;</div><div class='add'>+</div><div class='add'>+	if (fuse_file_passthrough(ff))</div><div class='add'>+		fuse_passthrough_release(ff, fuse_inode_backing(fi));</div><div class='ctx'> </div><div class='ctx'> 	/* Inode is NULL on error path of fuse_create_open() */</div><div class='ctx'> 	if (likely(fi)) {</div><div class='hunk'>@@ -292,6 +323,11 @@ static void fuse_prepare_release(struct fuse_inode *fi, struct fuse_file *ff,</div><div class='ctx'> </div><div class='ctx'> 	wake_up_interruptible_all(&amp;ff-&gt;poll_wait);</div><div class='ctx'> </div><div class='add'>+	if (!ra)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* ff-&gt;args was used for open outarg */</div><div class='add'>+	memset(ff-&gt;args, 0, sizeof(*ff-&gt;args));</div><div class='ctx'> 	ra-&gt;inarg.fh = ff-&gt;fh;</div><div class='ctx'> 	ra-&gt;inarg.flags = flags;</div><div class='ctx'> 	ra-&gt;args.in_numargs = 1;</div><div class='hunk'>@@ -301,23 +337,28 @@ static void fuse_prepare_release(struct fuse_inode *fi, struct fuse_file *ff,</div><div class='ctx'> 	ra-&gt;args.nodeid = ff-&gt;nodeid;</div><div class='ctx'> 	ra-&gt;args.force = true;</div><div class='ctx'> 	ra-&gt;args.nocreds = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hold inode until release is finished.</div><div class='add'>+	 * From fuse_sync_release() the refcount is 1 and everything's</div><div class='add'>+	 * synchronous, so we are fine with not doing igrab() here.</div><div class='add'>+	 */</div><div class='add'>+	ra-&gt;inode = sync ? NULL : igrab(&amp;fi-&gt;inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fuse_file_release(struct inode *inode, struct fuse_file *ff,</div><div class='ctx'> 		       unsigned int open_flags, fl_owner_t id, bool isdir)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='del'>-	struct fuse_release_args *ra = ff-&gt;release_args;</div><div class='add'>+	struct fuse_release_args *ra = &amp;ff-&gt;args-&gt;release_args;</div><div class='ctx'> 	int opcode = isdir ? FUSE_RELEASEDIR : FUSE_RELEASE;</div><div class='ctx'> </div><div class='del'>-	fuse_prepare_release(fi, ff, open_flags, opcode);</div><div class='add'>+	fuse_prepare_release(fi, ff, open_flags, opcode, false);</div><div class='ctx'> </div><div class='del'>-	if (ff-&gt;flock) {</div><div class='add'>+	if (ra &amp;&amp; ff-&gt;flock) {</div><div class='ctx'> 		ra-&gt;inarg.release_flags |= FUSE_RELEASE_FLOCK_UNLOCK;</div><div class='ctx'> 		ra-&gt;inarg.lock_owner = fuse_lock_owner_id(ff-&gt;fm-&gt;fc, id);</div><div class='ctx'> 	}</div><div class='del'>-	/* Hold inode until release is finished */</div><div class='del'>-	ra-&gt;inode = igrab(inode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Normally this will send the RELEASE request, however if</div><div class='hunk'>@@ -327,8 +368,14 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff,</div><div class='ctx'> 	 * Make the release synchronous if this is a fuseblk mount,</div><div class='ctx'> 	 * synchronous RELEASE is allowed (and desirable) in this case</div><div class='ctx'> 	 * because the server can be trusted not to screw up.</div><div class='add'>+	 *</div><div class='add'>+	 * Always use the asynchronous file put because the current thread</div><div class='add'>+	 * might be the fuse server.  This can happen if a process starts some</div><div class='add'>+	 * aio and closes the fd before the aio completes.  Since aio takes its</div><div class='add'>+	 * own ref to the file, the IO completion has to drop the ref, which is</div><div class='add'>+	 * how the fuse server can end up closing its clients' files.</div><div class='ctx'> 	 */</div><div class='del'>-	fuse_file_put(ff, ff-&gt;fm-&gt;fc-&gt;destroy, isdir);</div><div class='add'>+	fuse_file_put(ff, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fuse_release_common(struct file *file, bool isdir)</div><div class='hunk'>@@ -337,11 +384,6 @@ void fuse_release_common(struct file *file, bool isdir)</div><div class='ctx'> 			  (fl_owner_t) file, isdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return fuse_open_common(inode, file, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int fuse_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='hunk'>@@ -363,12 +405,8 @@ void fuse_sync_release(struct fuse_inode *fi, struct fuse_file *ff,</div><div class='ctx'> 		       unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(refcount_read(&amp;ff-&gt;count) &gt; 1);</div><div class='del'>-	fuse_prepare_release(fi, ff, flags, FUSE_RELEASE);</div><div class='del'>-	/*</div><div class='del'>-	 * iput(NULL) is a no-op and since the refcount is 1 and everything's</div><div class='del'>-	 * synchronous, we are fine with not doing igrab() here"</div><div class='del'>-	 */</div><div class='del'>-	fuse_file_put(ff, true, false);</div><div class='add'>+	fuse_prepare_release(fi, ff, flags, FUSE_RELEASE, true);</div><div class='add'>+	fuse_file_put(ff, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_sync_release);</div><div class='ctx'> </div><div class='hunk'>@@ -396,74 +434,11 @@ u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id)</div><div class='ctx'> </div><div class='ctx'> struct fuse_writepage_args {</div><div class='ctx'> 	struct fuse_io_args ia;</div><div class='del'>-	struct rb_node writepages_entry;</div><div class='ctx'> 	struct list_head queue_entry;</div><div class='del'>-	struct fuse_writepage_args *next;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct fuse_sync_bucket *bucket;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct fuse_writepage_args *fuse_find_writeback(struct fuse_inode *fi,</div><div class='del'>-					    pgoff_t idx_from, pgoff_t idx_to)</div><div class='del'>-{</div><div class='del'>-	struct rb_node *n;</div><div class='del'>-</div><div class='del'>-	n = fi-&gt;writepages.rb_node;</div><div class='del'>-</div><div class='del'>-	while (n) {</div><div class='del'>-		struct fuse_writepage_args *wpa;</div><div class='del'>-		pgoff_t curr_index;</div><div class='del'>-</div><div class='del'>-		wpa = rb_entry(n, struct fuse_writepage_args, writepages_entry);</div><div class='del'>-		WARN_ON(get_fuse_inode(wpa-&gt;inode) != fi);</div><div class='del'>-		curr_index = wpa-&gt;ia.write.in.offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		if (idx_from &gt;= curr_index + wpa-&gt;ia.ap.num_pages)</div><div class='del'>-			n = n-&gt;rb_right;</div><div class='del'>-		else if (idx_to &lt; curr_index)</div><div class='del'>-			n = n-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return wpa;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check if any page in a range is under writeback</div><div class='del'>- *</div><div class='del'>- * This is currently done by walking the list of writepage requests</div><div class='del'>- * for the inode, which can be pretty inefficient.</div><div class='del'>- */</div><div class='del'>-static bool fuse_range_is_writeback(struct inode *inode, pgoff_t idx_from,</div><div class='del'>-				   pgoff_t idx_to)</div><div class='del'>-{</div><div class='del'>-	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='del'>-	bool found;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;fi-&gt;lock);</div><div class='del'>-	found = fuse_find_writeback(fi, idx_from, idx_to);</div><div class='del'>-	spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool fuse_page_is_writeback(struct inode *inode, pgoff_t index)</div><div class='del'>-{</div><div class='del'>-	return fuse_range_is_writeback(inode, index, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait for page writeback to be completed.</div><div class='del'>- *</div><div class='del'>- * Since fuse doesn't rely on the VM writeback tracking, this has to</div><div class='del'>- * use some other means.</div><div class='del'>- */</div><div class='del'>-static void fuse_wait_on_page_writeback(struct inode *inode, pgoff_t index)</div><div class='del'>-{</div><div class='del'>-	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='del'>-</div><div class='del'>-	wait_event(fi-&gt;page_waitq, !fuse_page_is_writeback(inode, index));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Wait for all pending writepages on the inode to finish.</div><div class='ctx'>  *</div><div class='hunk'>@@ -498,10 +473,6 @@ static int fuse_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	inode_lock(inode);</div><div class='del'>-	fuse_sync_writes(inode);</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-</div><div class='ctx'> 	err = filemap_check_errors(file-&gt;f_mapping);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -626,16 +597,20 @@ void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos,</div><div class='ctx'> 	args-&gt;out_args[0].size = count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_release_user_pages(struct fuse_args_pages *ap,</div><div class='add'>+static void fuse_release_user_pages(struct fuse_args_pages *ap, ssize_t nres,</div><div class='ctx'> 				    bool should_dirty)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages; i++) {</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios; i++) {</div><div class='ctx'> 		if (should_dirty)</div><div class='del'>-			set_page_dirty_lock(ap-&gt;pages[i]);</div><div class='del'>-		put_page(ap-&gt;pages[i]);</div><div class='add'>+			folio_mark_dirty_lock(ap-&gt;folios[i]);</div><div class='add'>+		if (ap-&gt;args.is_pinned)</div><div class='add'>+			unpin_folio(ap-&gt;folios[i]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (nres &gt; 0 &amp;&amp; ap-&gt;args.invalidate_vmap)</div><div class='add'>+		invalidate_kernel_vmap_range(ap-&gt;args.vmap_base, nres);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_io_release(struct kref *kref)</div><div class='hunk'>@@ -705,16 +680,16 @@ static void fuse_aio_complete(struct fuse_io_priv *io, int err, ssize_t pos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fuse_io_args *fuse_io_alloc(struct fuse_io_priv *io,</div><div class='del'>-					  unsigned int npages)</div><div class='add'>+						 unsigned int nfolios)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_io_args *ia;</div><div class='ctx'> </div><div class='ctx'> 	ia = kzalloc(sizeof(*ia), GFP_KERNEL);</div><div class='ctx'> 	if (ia) {</div><div class='ctx'> 		ia-&gt;io = io;</div><div class='del'>-		ia-&gt;ap.pages = fuse_pages_alloc(npages, GFP_KERNEL,</div><div class='del'>-						&amp;ia-&gt;ap.descs);</div><div class='del'>-		if (!ia-&gt;ap.pages) {</div><div class='add'>+		ia-&gt;ap.folios = fuse_folios_alloc(nfolios, GFP_KERNEL,</div><div class='add'>+						  &amp;ia-&gt;ap.descs);</div><div class='add'>+		if (!ia-&gt;ap.folios) {</div><div class='ctx'> 			kfree(ia);</div><div class='ctx'> 			ia = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -724,7 +699,7 @@ static struct fuse_io_args *fuse_io_alloc(struct fuse_io_priv *io,</div><div class='ctx'> </div><div class='ctx'> static void fuse_io_free(struct fuse_io_args *ia)</div><div class='ctx'> {</div><div class='del'>-	kfree(ia-&gt;ap.pages);</div><div class='add'>+	kfree(ia-&gt;ap.folios);</div><div class='ctx'> 	kfree(ia);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -734,25 +709,29 @@ static void fuse_aio_complete_req(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	struct fuse_io_args *ia = container_of(args, typeof(*ia), ap.args);</div><div class='ctx'> 	struct fuse_io_priv *io = ia-&gt;io;</div><div class='ctx'> 	ssize_t pos = -1;</div><div class='del'>-</div><div class='del'>-	fuse_release_user_pages(&amp;ia-&gt;ap, io-&gt;should_dirty);</div><div class='add'>+	size_t nres;</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		/* Nothing */</div><div class='ctx'> 	} else if (io-&gt;write) {</div><div class='ctx'> 		if (ia-&gt;write.out.size &gt; ia-&gt;write.in.size) {</div><div class='ctx'> 			err = -EIO;</div><div class='del'>-		} else if (ia-&gt;write.in.size != ia-&gt;write.out.size) {</div><div class='del'>-			pos = ia-&gt;write.in.offset - io-&gt;offset +</div><div class='del'>-				ia-&gt;write.out.size;</div><div class='add'>+		} else {</div><div class='add'>+			nres = ia-&gt;write.out.size;</div><div class='add'>+			if (ia-&gt;write.in.size != ia-&gt;write.out.size)</div><div class='add'>+				pos = ia-&gt;write.in.offset - io-&gt;offset +</div><div class='add'>+				      ia-&gt;write.out.size;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 outsize = args-&gt;out_args[0].size;</div><div class='ctx'> </div><div class='add'>+		nres = outsize;</div><div class='ctx'> 		if (ia-&gt;read.in.size != outsize)</div><div class='ctx'> 			pos = ia-&gt;read.in.offset - io-&gt;offset + outsize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fuse_release_user_pages(&amp;ia-&gt;ap, err ?: nres, io-&gt;should_dirty);</div><div class='add'>+</div><div class='ctx'> 	fuse_aio_complete(io, err, pos);</div><div class='ctx'> 	fuse_io_free(ia);</div><div class='ctx'> }</div><div class='hunk'>@@ -823,34 +802,31 @@ static void fuse_short_read(struct inode *inode, u64 attr_ver, size_t num_read,</div><div class='ctx'> 	 * reached the client fs yet.  So the hole is not present there.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!fc-&gt;writeback_cache) {</div><div class='del'>-		loff_t pos = page_offset(ap-&gt;pages[0]) + num_read;</div><div class='add'>+		loff_t pos = folio_pos(ap-&gt;folios[0]) + num_read;</div><div class='ctx'> 		fuse_read_update_size(inode, pos, attr_ver);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_do_readpage(struct file *file, struct page *page)</div><div class='add'>+static int fuse_do_readfolio(struct file *file, struct folio *folio,</div><div class='add'>+			     size_t off, size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='del'>-	loff_t pos = page_offset(page);</div><div class='del'>-	struct fuse_page_desc desc = { .length = PAGE_SIZE };</div><div class='add'>+	loff_t pos = folio_pos(folio) + off;</div><div class='add'>+	struct fuse_folio_desc desc = {</div><div class='add'>+		.offset = off,</div><div class='add'>+		.length = len,</div><div class='add'>+	};</div><div class='ctx'> 	struct fuse_io_args ia = {</div><div class='ctx'> 		.ap.args.page_zeroing = true,</div><div class='ctx'> 		.ap.args.out_pages = true,</div><div class='del'>-		.ap.num_pages = 1,</div><div class='del'>-		.ap.pages = &amp;page,</div><div class='add'>+		.ap.num_folios = 1,</div><div class='add'>+		.ap.folios = &amp;folio,</div><div class='ctx'> 		.ap.descs = &amp;desc,</div><div class='ctx'> 	};</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> 	u64 attr_ver;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Page writeback can extend beyond the lifetime of the</div><div class='del'>-	 * page-cache page, so make sure we read a properly synced</div><div class='del'>-	 * page.</div><div class='del'>-	 */</div><div class='del'>-	fuse_wait_on_page_writeback(inode, page-&gt;index);</div><div class='del'>-</div><div class='ctx'> 	attr_ver = fuse_get_attr_version(fm-&gt;fc);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't overflow end offset */</div><div class='hunk'>@@ -867,26 +843,155 @@ static int fuse_do_readpage(struct file *file, struct page *page)</div><div class='ctx'> 	if (res &lt; desc.length)</div><div class='ctx'> 		fuse_short_read(inode, attr_ver, res, &amp;ia.ap);</div><div class='ctx'> </div><div class='del'>-	SetPageUptodate(page);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int fuse_iomap_begin(struct inode *inode, loff_t offset, loff_t length,</div><div class='add'>+			    unsigned int flags, struct iomap *iomap,</div><div class='add'>+			    struct iomap *srcmap)</div><div class='add'>+{</div><div class='add'>+	iomap-&gt;type = IOMAP_MAPPED;</div><div class='add'>+	iomap-&gt;length = length;</div><div class='add'>+	iomap-&gt;offset = offset;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iomap_ops fuse_iomap_ops = {</div><div class='add'>+	.iomap_begin	= fuse_iomap_begin,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fuse_fill_read_data {</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	/* Fields below are used if sending the read request asynchronously */</div><div class='add'>+	struct fuse_conn *fc;</div><div class='add'>+	struct fuse_io_args *ia;</div><div class='add'>+	unsigned int nr_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* forward declarations */</div><div class='add'>+static bool fuse_folios_need_send(struct fuse_conn *fc, loff_t pos,</div><div class='add'>+				  unsigned len, struct fuse_args_pages *ap,</div><div class='add'>+				  unsigned cur_bytes, bool write);</div><div class='add'>+static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file,</div><div class='add'>+				unsigned int count, bool async);</div><div class='add'>+</div><div class='add'>+static int fuse_handle_readahead(struct folio *folio,</div><div class='add'>+				 struct readahead_control *rac,</div><div class='add'>+				 struct fuse_fill_read_data *data, loff_t pos,</div><div class='add'>+				 size_t len)</div><div class='add'>+{</div><div class='add'>+	struct fuse_io_args *ia = data-&gt;ia;</div><div class='add'>+	size_t off = offset_in_folio(folio, pos);</div><div class='add'>+	struct fuse_conn *fc = data-&gt;fc;</div><div class='add'>+	struct fuse_args_pages *ap;</div><div class='add'>+	unsigned int nr_pages;</div><div class='add'>+</div><div class='add'>+	if (ia &amp;&amp; fuse_folios_need_send(fc, pos, len, &amp;ia-&gt;ap, data-&gt;nr_bytes,</div><div class='add'>+					false)) {</div><div class='add'>+		fuse_send_readpages(ia, data-&gt;file, data-&gt;nr_bytes,</div><div class='add'>+				    fc-&gt;async_read);</div><div class='add'>+		data-&gt;nr_bytes = 0;</div><div class='add'>+		data-&gt;ia = NULL;</div><div class='add'>+		ia = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (!ia) {</div><div class='add'>+		if (fc-&gt;num_background &gt;= fc-&gt;congestion_threshold &amp;&amp;</div><div class='add'>+		    rac-&gt;ra-&gt;async_size &gt;= readahead_count(rac))</div><div class='add'>+			/*</div><div class='add'>+			 * Congested and only async pages left, so skip the</div><div class='add'>+			 * rest.</div><div class='add'>+			 */</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		nr_pages = min(fc-&gt;max_pages, readahead_count(rac));</div><div class='add'>+		data-&gt;ia = fuse_io_alloc(NULL, nr_pages);</div><div class='add'>+		if (!data-&gt;ia)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		ia = data-&gt;ia;</div><div class='add'>+	}</div><div class='add'>+	folio_get(folio);</div><div class='add'>+	ap = &amp;ia-&gt;ap;</div><div class='add'>+	ap-&gt;folios[ap-&gt;num_folios] = folio;</div><div class='add'>+	ap-&gt;descs[ap-&gt;num_folios].offset = off;</div><div class='add'>+	ap-&gt;descs[ap-&gt;num_folios].length = len;</div><div class='add'>+	data-&gt;nr_bytes += len;</div><div class='add'>+	ap-&gt;num_folios++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_iomap_read_folio_range_async(const struct iomap_iter *iter,</div><div class='add'>+					     struct iomap_read_folio_ctx *ctx,</div><div class='add'>+					     size_t len)</div><div class='add'>+{</div><div class='add'>+	struct fuse_fill_read_data *data = ctx-&gt;read_ctx;</div><div class='add'>+	struct folio *folio = ctx-&gt;cur_folio;</div><div class='add'>+	loff_t pos =  iter-&gt;pos;</div><div class='add'>+	size_t off = offset_in_folio(folio, pos);</div><div class='add'>+	struct file *file = data-&gt;file;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;rac) {</div><div class='add'>+		ret = fuse_handle_readahead(folio, ctx-&gt;rac, data, pos, len);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 *  for non-readahead read requests, do reads synchronously</div><div class='add'>+		 *  since it's not guaranteed that the server can handle</div><div class='add'>+		 *  out-of-order reads</div><div class='add'>+		 */</div><div class='add'>+		ret = fuse_do_readfolio(file, folio, off, len);</div><div class='add'>+		if (!ret)</div><div class='add'>+			iomap_finish_folio_read(folio, off, len, ret);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_iomap_read_submit(struct iomap_read_folio_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct fuse_fill_read_data *data = ctx-&gt;read_ctx;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;ia)</div><div class='add'>+		fuse_send_readpages(data-&gt;ia, data-&gt;file, data-&gt;nr_bytes,</div><div class='add'>+				    data-&gt;fc-&gt;async_read);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iomap_read_ops fuse_iomap_read_ops = {</div><div class='add'>+	.read_folio_range = fuse_iomap_read_folio_range_async,</div><div class='add'>+	.submit_read = fuse_iomap_read_submit,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int fuse_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	int err;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	struct fuse_fill_read_data data = {</div><div class='add'>+		.file = file,</div><div class='add'>+	};</div><div class='add'>+	struct iomap_read_folio_ctx ctx = {</div><div class='add'>+		.cur_folio = folio,</div><div class='add'>+		.ops = &amp;fuse_iomap_read_ops,</div><div class='add'>+		.read_ctx = &amp;data,</div><div class='ctx'> </div><div class='del'>-	err = -EIO;</div><div class='del'>-	if (fuse_is_bad(inode))</div><div class='del'>-		goto out;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (fuse_is_bad(inode)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = fuse_do_readpage(file, page);</div><div class='add'>+	iomap_read_folio(&amp;fuse_iomap_ops, &amp;ctx);</div><div class='ctx'> 	fuse_invalidate_atime(inode);</div><div class='del'>- out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_iomap_read_folio_range(const struct iomap_iter *iter,</div><div class='add'>+				       struct folio *folio, loff_t pos,</div><div class='add'>+				       size_t len)</div><div class='add'>+{</div><div class='add'>+	struct file *file = iter-&gt;private;</div><div class='add'>+	size_t off = offset_in_folio(folio, pos);</div><div class='add'>+</div><div class='add'>+	return fuse_do_readfolio(file, folio, off, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args,</div><div class='hunk'>@@ -897,46 +1002,39 @@ static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;ia-&gt;ap;</div><div class='ctx'> 	size_t count = ia-&gt;read.in.size;</div><div class='ctx'> 	size_t num_read = args-&gt;out_args[0].size;</div><div class='del'>-	struct address_space *mapping = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; mapping == NULL &amp;&amp; i &lt; ap-&gt;num_pages; i++)</div><div class='del'>-		mapping = ap-&gt;pages[i]-&gt;mapping;</div><div class='del'>-</div><div class='del'>-	if (mapping) {</div><div class='del'>-		struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct address_space *mapping;</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Short read means EOF. If file size is larger, truncate it</div><div class='del'>-		 */</div><div class='del'>-		if (!err &amp;&amp; num_read &lt; count)</div><div class='del'>-			fuse_short_read(inode, ia-&gt;read.attr_ver, num_read, ap);</div><div class='add'>+	WARN_ON_ONCE(!ap-&gt;num_folios);</div><div class='add'>+	mapping = ap-&gt;folios[0]-&gt;mapping;</div><div class='add'>+	inode = mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-		fuse_invalidate_atime(inode);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Short read means EOF. If file size is larger, truncate it</div><div class='add'>+	 */</div><div class='add'>+	if (!err &amp;&amp; num_read &lt; count)</div><div class='add'>+		fuse_short_read(inode, ia-&gt;read.attr_ver, num_read, ap);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages; i++) {</div><div class='del'>-		struct page *page = ap-&gt;pages[i];</div><div class='add'>+	fuse_invalidate_atime(inode);</div><div class='ctx'> </div><div class='del'>-		if (!err)</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		else</div><div class='del'>-			SetPageError(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios; i++) {</div><div class='add'>+		iomap_finish_folio_read(ap-&gt;folios[i], ap-&gt;descs[i].offset,</div><div class='add'>+					ap-&gt;descs[i].length, err);</div><div class='add'>+		folio_put(ap-&gt;folios[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ia-&gt;ff)</div><div class='del'>-		fuse_file_put(ia-&gt;ff, false, false);</div><div class='add'>+		fuse_file_put(ia-&gt;ff, false);</div><div class='ctx'> </div><div class='ctx'> 	fuse_io_free(ia);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)</div><div class='add'>+static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file,</div><div class='add'>+				unsigned int count, bool async)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_file *ff = file-&gt;private_data;</div><div class='ctx'> 	struct fuse_mount *fm = ff-&gt;fm;</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;ia-&gt;ap;</div><div class='del'>-	loff_t pos = page_offset(ap-&gt;pages[0]);</div><div class='del'>-	size_t count = ap-&gt;num_pages &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	loff_t pos = folio_pos(ap-&gt;folios[0]);</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -947,13 +1045,13 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)</div><div class='ctx'> 	/* Don't overflow end offset */</div><div class='ctx'> 	if (pos + (count - 1) == LLONG_MAX) {</div><div class='ctx'> 		count--;</div><div class='del'>-		ap-&gt;descs[ap-&gt;num_pages - 1].length--;</div><div class='add'>+		ap-&gt;descs[ap-&gt;num_folios - 1].length--;</div><div class='ctx'> 	}</div><div class='ctx'> 	WARN_ON((loff_t) (pos + count) &lt; 0);</div><div class='ctx'> </div><div class='ctx'> 	fuse_read_args_fill(ia, file, pos, count, FUSE_READ);</div><div class='ctx'> 	ia-&gt;read.attr_ver = fuse_get_attr_version(fm-&gt;fc);</div><div class='del'>-	if (fm-&gt;fc-&gt;async_read) {</div><div class='add'>+	if (async) {</div><div class='ctx'> 		ia-&gt;ff = fuse_file_get(ff);</div><div class='ctx'> 		ap-&gt;args.end = fuse_readpages_end;</div><div class='ctx'> 		err = fuse_simple_background(fm, &amp;ap-&gt;args, GFP_KERNEL);</div><div class='hunk'>@@ -970,44 +1068,20 @@ static void fuse_readahead(struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = rac-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-	unsigned int i, max_pages, nr_pages = 0;</div><div class='add'>+	struct fuse_fill_read_data data = {</div><div class='add'>+		.file = rac-&gt;file,</div><div class='add'>+		.fc = fc,</div><div class='add'>+	};</div><div class='add'>+	struct iomap_read_folio_ctx ctx = {</div><div class='add'>+		.ops = &amp;fuse_iomap_read_ops,</div><div class='add'>+		.rac = rac,</div><div class='add'>+		.read_ctx = &amp;data</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	if (fuse_is_bad(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	max_pages = min_t(unsigned int, fc-&gt;max_pages,</div><div class='del'>-			fc-&gt;max_read / PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		struct fuse_io_args *ia;</div><div class='del'>-		struct fuse_args_pages *ap;</div><div class='del'>-</div><div class='del'>-		if (fc-&gt;num_background &gt;= fc-&gt;congestion_threshold &amp;&amp;</div><div class='del'>-		    rac-&gt;ra-&gt;async_size &gt;= readahead_count(rac))</div><div class='del'>-			/*</div><div class='del'>-			 * Congested and only async pages left, so skip the</div><div class='del'>-			 * rest.</div><div class='del'>-			 */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		nr_pages = readahead_count(rac) - nr_pages;</div><div class='del'>-		if (nr_pages &gt; max_pages)</div><div class='del'>-			nr_pages = max_pages;</div><div class='del'>-		if (nr_pages == 0)</div><div class='del'>-			break;</div><div class='del'>-		ia = fuse_io_alloc(NULL, nr_pages);</div><div class='del'>-		if (!ia)</div><div class='del'>-			return;</div><div class='del'>-		ap = &amp;ia-&gt;ap;</div><div class='del'>-		nr_pages = __readahead_batch(rac, ap-&gt;pages, nr_pages);</div><div class='del'>-		for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-			fuse_wait_on_page_writeback(inode,</div><div class='del'>-						    readahead_index(rac) + i);</div><div class='del'>-			ap-&gt;descs[i].length = PAGE_SIZE;</div><div class='del'>-		}</div><div class='del'>-		ap-&gt;num_pages = nr_pages;</div><div class='del'>-		fuse_send_readpages(ia, rac-&gt;file);</div><div class='del'>-	}</div><div class='add'>+	iomap_readahead(&amp;fuse_iomap_ops, &amp;ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t fuse_cache_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='hunk'>@@ -1123,8 +1197,8 @@ static ssize_t fuse_send_write_pages(struct fuse_io_args *ia,</div><div class='ctx'> 	bool short_write;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages; i++)</div><div class='del'>-		fuse_wait_on_page_writeback(inode, ap-&gt;pages[i]-&gt;index);</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios; i++)</div><div class='add'>+		folio_wait_writeback(ap-&gt;folios[i]);</div><div class='ctx'> </div><div class='ctx'> 	fuse_write_args_fill(ia, ff, pos, count);</div><div class='ctx'> 	ia-&gt;write.in.flags = fuse_write_flags(iocb);</div><div class='hunk'>@@ -1138,24 +1212,24 @@ static ssize_t fuse_send_write_pages(struct fuse_io_args *ia,</div><div class='ctx'> 	short_write = ia-&gt;write.out.size &lt; count;</div><div class='ctx'> 	offset = ap-&gt;descs[0].offset;</div><div class='ctx'> 	count = ia-&gt;write.out.size;</div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages; i++) {</div><div class='del'>-		struct page *page = ap-&gt;pages[i];</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios; i++) {</div><div class='add'>+		struct folio *folio = ap-&gt;folios[i];</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='del'>-			ClearPageUptodate(page);</div><div class='add'>+			folio_clear_uptodate(folio);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (count &gt;= PAGE_SIZE - offset)</div><div class='del'>-				count -= PAGE_SIZE - offset;</div><div class='add'>+			if (count &gt;= folio_size(folio) - offset)</div><div class='add'>+				count -= folio_size(folio) - offset;</div><div class='ctx'> 			else {</div><div class='ctx'> 				if (short_write)</div><div class='del'>-					ClearPageUptodate(page);</div><div class='add'>+					folio_clear_uptodate(folio);</div><div class='ctx'> 				count = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (ia-&gt;write.page_locked &amp;&amp; (i == ap-&gt;num_pages - 1))</div><div class='del'>-			unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		if (ia-&gt;write.folio_locked &amp;&amp; (i == ap-&gt;num_folios - 1))</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1164,73 +1238,84 @@ static ssize_t fuse_send_write_pages(struct fuse_io_args *ia,</div><div class='ctx'> static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,</div><div class='ctx'> 				     struct address_space *mapping,</div><div class='ctx'> 				     struct iov_iter *ii, loff_t pos,</div><div class='del'>-				     unsigned int max_pages)</div><div class='add'>+				     unsigned int max_folios)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;ia-&gt;ap;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(mapping-&gt;host);</div><div class='ctx'> 	unsigned offset = pos &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	size_t count = 0;</div><div class='del'>-	int err;</div><div class='add'>+	unsigned int num;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	num = min(iov_iter_count(ii), fc-&gt;max_write);</div><div class='ctx'> </div><div class='ctx'> 	ap-&gt;args.in_pages = true;</div><div class='del'>-	ap-&gt;descs[0].offset = offset;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='add'>+	while (num &amp;&amp; ap-&gt;num_folios &lt; max_folios) {</div><div class='ctx'> 		size_t tmp;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		size_t bytes = min_t(size_t, PAGE_SIZE - offset,</div><div class='del'>-				     iov_iter_count(ii));</div><div class='del'>-</div><div class='del'>-		bytes = min_t(size_t, bytes, fc-&gt;max_write - count);</div><div class='add'>+		unsigned int bytes;</div><div class='add'>+		unsigned int folio_offset;</div><div class='ctx'> </div><div class='ctx'>  again:</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		if (fault_in_iov_iter_readable(ii, bytes))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		page = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-		if (!page)</div><div class='add'>+		folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='add'>+					    mapping_gfp_mask(mapping));</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (mapping_writably_mapped(mapping))</div><div class='del'>-			flush_dcache_page(page);</div><div class='add'>+			flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='del'>-		tmp = copy_page_from_iter_atomic(page, offset, bytes, ii);</div><div class='del'>-		flush_dcache_page(page);</div><div class='add'>+		folio_offset = ((index - folio-&gt;index) &lt;&lt; PAGE_SHIFT) + offset;</div><div class='add'>+		bytes = min(folio_size(folio) - folio_offset, num);</div><div class='add'>+</div><div class='add'>+		tmp = copy_folio_from_iter_atomic(folio, folio_offset, bytes, ii);</div><div class='add'>+		flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 		if (!tmp) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Ensure forward progress by faulting in</div><div class='add'>+			 * while not holding the folio lock:</div><div class='add'>+			 */</div><div class='add'>+			if (fault_in_iov_iter_readable(ii, bytes)) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = 0;</div><div class='del'>-		ap-&gt;pages[ap-&gt;num_pages] = page;</div><div class='del'>-		ap-&gt;descs[ap-&gt;num_pages].length = tmp;</div><div class='del'>-		ap-&gt;num_pages++;</div><div class='add'>+		ap-&gt;folios[ap-&gt;num_folios] = folio;</div><div class='add'>+		ap-&gt;descs[ap-&gt;num_folios].offset = folio_offset;</div><div class='add'>+		ap-&gt;descs[ap-&gt;num_folios].length = tmp;</div><div class='add'>+		ap-&gt;num_folios++;</div><div class='ctx'> </div><div class='ctx'> 		count += tmp;</div><div class='ctx'> 		pos += tmp;</div><div class='add'>+		num -= tmp;</div><div class='ctx'> 		offset += tmp;</div><div class='del'>-		if (offset == PAGE_SIZE)</div><div class='add'>+		if (offset == folio_size(folio))</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> </div><div class='del'>-		/* If we copied full page, mark it uptodate */</div><div class='del'>-		if (tmp == PAGE_SIZE)</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+		/* If we copied full folio, mark it uptodate */</div><div class='add'>+		if (tmp == folio_size(folio))</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='del'>-		if (PageUptodate(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='add'>+		if (folio_test_uptodate(folio)) {</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		} else {</div><div class='del'>-			ia-&gt;write.page_locked = true;</div><div class='add'>+			ia-&gt;write.folio_locked = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!fc-&gt;big_writes)</div><div class='add'>+		if (!fc-&gt;big_writes || offset != 0)</div><div class='ctx'> 			break;</div><div class='del'>-	} while (iov_iter_count(ii) &amp;&amp; count &lt; fc-&gt;max_write &amp;&amp;</div><div class='del'>-		 ap-&gt;num_pages &lt; max_pages &amp;&amp; offset == 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return count &gt; 0 ? count : err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1264,8 +1349,8 @@ static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii)</div><div class='ctx'> 		unsigned int nr_pages = fuse_wr_pages(pos, iov_iter_count(ii),</div><div class='ctx'> 						      fc-&gt;max_pages);</div><div class='ctx'> </div><div class='del'>-		ap-&gt;pages = fuse_pages_alloc(nr_pages, GFP_KERNEL, &amp;ap-&gt;descs);</div><div class='del'>-		if (!ap-&gt;pages) {</div><div class='add'>+		ap-&gt;folios = fuse_folios_alloc(nr_pages, GFP_KERNEL, &amp;ap-&gt;descs);</div><div class='add'>+		if (!ap-&gt;folios) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1287,7 +1372,7 @@ static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii)</div><div class='ctx'> 					err = -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		kfree(ap-&gt;pages);</div><div class='add'>+		kfree(ap-&gt;folios);</div><div class='ctx'> 	} while (!err &amp;&amp; iov_iter_count(ii));</div><div class='ctx'> </div><div class='ctx'> 	fuse_write_update_attr(inode, pos, res);</div><div class='hunk'>@@ -1299,14 +1384,100 @@ static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool fuse_io_past_eof(struct kiocb *iocb, struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+</div><div class='add'>+	return iocb-&gt;ki_pos + iov_iter_count(iter) &gt; i_size_read(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @return true if an exclusive lock for direct IO writes is needed</div><div class='add'>+ */</div><div class='add'>+static bool fuse_dio_wr_exclusive_lock(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+{</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	/* Server side has to advise that it supports parallel dio writes. */</div><div class='add'>+	if (!(ff-&gt;open_flags &amp; FOPEN_PARALLEL_DIRECT_WRITES))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Append will need to know the eventual EOF - always needs an</div><div class='add'>+	 * exclusive lock.</div><div class='add'>+	 */</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_APPEND)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* shared locks are not allowed with parallel page cache IO */</div><div class='add'>+	if (test_bit(FUSE_I_CACHE_IO_MODE, &amp;fi-&gt;state))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Parallel dio beyond EOF is not supported, at least for now. */</div><div class='add'>+	if (fuse_io_past_eof(iocb, from))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_dio_lock(struct kiocb *iocb, struct iov_iter *from,</div><div class='add'>+			  bool *exclusive)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	*exclusive = fuse_dio_wr_exclusive_lock(iocb, from);</div><div class='add'>+	if (*exclusive) {</div><div class='add'>+		inode_lock(inode);</div><div class='add'>+	} else {</div><div class='add'>+		inode_lock_shared(inode);</div><div class='add'>+		/*</div><div class='add'>+		 * New parallal dio allowed only if inode is not in caching</div><div class='add'>+		 * mode and denies new opens in caching mode. This check</div><div class='add'>+		 * should be performed only after taking shared inode lock.</div><div class='add'>+		 * Previous past eof check was without inode lock and might</div><div class='add'>+		 * have raced, so check it again.</div><div class='add'>+		 */</div><div class='add'>+		if (fuse_io_past_eof(iocb, from) ||</div><div class='add'>+		    fuse_inode_uncached_io_start(fi, NULL) != 0) {</div><div class='add'>+			inode_unlock_shared(inode);</div><div class='add'>+			inode_lock(inode);</div><div class='add'>+			*exclusive = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_dio_unlock(struct kiocb *iocb, bool exclusive)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	if (exclusive) {</div><div class='add'>+		inode_unlock(inode);</div><div class='add'>+	} else {</div><div class='add'>+		/* Allow opens in caching mode after last parallel dio end */</div><div class='add'>+		fuse_inode_uncached_io_end(fi);</div><div class='add'>+		inode_unlock_shared(inode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iomap_write_ops fuse_iomap_write_ops = {</div><div class='add'>+	.read_folio_range = fuse_iomap_read_folio_range,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='ctx'> 	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> 	ssize_t written = 0;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	ssize_t err;</div><div class='add'>+	ssize_t err, count;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	bool writeback = false;</div><div class='ctx'> </div><div class='ctx'> 	if (fc-&gt;writeback_cache) {</div><div class='ctx'> 		/* Update size (EOF optimization) and mode (SUID clearing) */</div><div class='hunk'>@@ -1315,27 +1486,20 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		if (fc-&gt;handle_killpriv_v2 &amp;&amp;</div><div class='del'>-		    setattr_should_drop_suidgid(&amp;nop_mnt_idmap,</div><div class='del'>-						file_inode(file))) {</div><div class='del'>-			goto writethrough;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return generic_file_write_iter(iocb, from);</div><div class='add'>+		if (!fc-&gt;handle_killpriv_v2 ||</div><div class='add'>+		    !setattr_should_drop_suidgid(idmap, file_inode(file)))</div><div class='add'>+			writeback = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-writethrough:</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='del'>-	err = generic_write_checks(iocb, from);</div><div class='add'>+	err = count = generic_write_checks(iocb, from);</div><div class='ctx'> 	if (err &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = file_remove_privs(file);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+	task_io_account_write(count);</div><div class='ctx'> </div><div class='del'>-	err = file_update_time(file);</div><div class='add'>+	err = kiocb_modified(iocb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1345,6 +1509,15 @@ writethrough:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		written = direct_write_fallback(iocb, from, written,</div><div class='ctx'> 				fuse_perform_write(iocb, from));</div><div class='add'>+	} else if (writeback) {</div><div class='add'>+		/*</div><div class='add'>+		 * Use iomap so that we can do granular uptodate reads</div><div class='add'>+		 * and granular dirty tracking for large folios.</div><div class='add'>+		 */</div><div class='add'>+		written = iomap_file_buffered_write(iocb, from,</div><div class='add'>+						    &amp;fuse_iomap_ops,</div><div class='add'>+						    &amp;fuse_iomap_write_ops,</div><div class='add'>+						    file);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		written = fuse_perform_write(iocb, from);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1369,55 +1542,97 @@ static inline size_t fuse_get_frag_size(const struct iov_iter *ii,</div><div class='ctx'> </div><div class='ctx'> static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii,</div><div class='ctx'> 			       size_t *nbytesp, int write,</div><div class='del'>-			       unsigned int max_pages)</div><div class='add'>+			       unsigned int max_pages,</div><div class='add'>+			       bool use_pages_for_kvec_io)</div><div class='ctx'> {</div><div class='add'>+	bool flush_or_invalidate = false;</div><div class='add'>+	unsigned int nr_pages = 0;</div><div class='ctx'> 	size_t nbytes = 0;  /* # bytes already packed in req */</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* Special case for kernel I/O: can copy directly into the buffer */</div><div class='add'>+	/* Special case for kernel I/O: can copy directly into the buffer.</div><div class='add'>+	 * However if the implementation of fuse_conn requires pages instead of</div><div class='add'>+	 * pointer (e.g., virtio-fs), use iov_iter_extract_pages() instead.</div><div class='add'>+	 */</div><div class='ctx'> 	if (iov_iter_is_kvec(ii)) {</div><div class='del'>-		unsigned long user_addr = fuse_get_user_addr(ii);</div><div class='del'>-		size_t frag_size = fuse_get_frag_size(ii, *nbytesp);</div><div class='add'>+		void *user_addr = (void *)fuse_get_user_addr(ii);</div><div class='ctx'> </div><div class='del'>-		if (write)</div><div class='del'>-			ap-&gt;args.in_args[1].value = (void *) user_addr;</div><div class='del'>-		else</div><div class='del'>-			ap-&gt;args.out_args[0].value = (void *) user_addr;</div><div class='add'>+		if (!use_pages_for_kvec_io) {</div><div class='add'>+			size_t frag_size = fuse_get_frag_size(ii, *nbytesp);</div><div class='ctx'> </div><div class='del'>-		iov_iter_advance(ii, frag_size);</div><div class='del'>-		*nbytesp = frag_size;</div><div class='del'>-		return 0;</div><div class='add'>+			if (write)</div><div class='add'>+				ap-&gt;args.in_args[1].value = user_addr;</div><div class='add'>+			else</div><div class='add'>+				ap-&gt;args.out_args[0].value = user_addr;</div><div class='add'>+</div><div class='add'>+			iov_iter_advance(ii, frag_size);</div><div class='add'>+			*nbytesp = frag_size;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_vmalloc_addr(user_addr)) {</div><div class='add'>+			ap-&gt;args.vmap_base = user_addr;</div><div class='add'>+			flush_or_invalidate = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Until there is support for iov_iter_extract_folios(), we have to</div><div class='add'>+	 * manually extract pages using iov_iter_extract_pages() and then</div><div class='add'>+	 * copy that to a folios array.</div><div class='add'>+	 */</div><div class='add'>+	struct page **pages = kzalloc(max_pages * sizeof(struct page *),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!pages) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (nbytes &lt; *nbytesp &amp;&amp; ap-&gt;num_pages &lt; max_pages) {</div><div class='del'>-		unsigned npages;</div><div class='add'>+	while (nbytes &lt; *nbytesp &amp;&amp; nr_pages &lt; max_pages) {</div><div class='add'>+		unsigned nfolios, i;</div><div class='ctx'> 		size_t start;</div><div class='del'>-		ret = iov_iter_get_pages2(ii, &amp;ap-&gt;pages[ap-&gt;num_pages],</div><div class='del'>-					*nbytesp - nbytes,</div><div class='del'>-					max_pages - ap-&gt;num_pages,</div><div class='del'>-					&amp;start);</div><div class='add'>+</div><div class='add'>+		ret = iov_iter_extract_pages(ii, &amp;pages,</div><div class='add'>+					     *nbytesp - nbytes,</div><div class='add'>+					     max_pages - nr_pages,</div><div class='add'>+					     0, &amp;start);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		nbytes += ret;</div><div class='ctx'> </div><div class='del'>-		ret += start;</div><div class='del'>-		npages = DIV_ROUND_UP(ret, PAGE_SIZE);</div><div class='add'>+		nfolios = DIV_ROUND_UP(ret + start, PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-		ap-&gt;descs[ap-&gt;num_pages].offset = start;</div><div class='del'>-		fuse_page_descs_length_init(ap-&gt;descs, ap-&gt;num_pages, npages);</div><div class='add'>+		for (i = 0; i &lt; nfolios; i++) {</div><div class='add'>+			struct folio *folio = page_folio(pages[i]);</div><div class='add'>+			unsigned int offset = start +</div><div class='add'>+				(folio_page_idx(folio, pages[i]) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+			unsigned int len = min_t(unsigned int, ret, PAGE_SIZE - start);</div><div class='ctx'> </div><div class='del'>-		ap-&gt;num_pages += npages;</div><div class='del'>-		ap-&gt;descs[ap-&gt;num_pages - 1].length -=</div><div class='del'>-			(PAGE_SIZE - ret) &amp; (PAGE_SIZE - 1);</div><div class='add'>+			ap-&gt;descs[ap-&gt;num_folios].offset = offset;</div><div class='add'>+			ap-&gt;descs[ap-&gt;num_folios].length = len;</div><div class='add'>+			ap-&gt;folios[ap-&gt;num_folios] = folio;</div><div class='add'>+			start = 0;</div><div class='add'>+			ret -= len;</div><div class='add'>+			ap-&gt;num_folios++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nr_pages += nfolios;</div><div class='ctx'> 	}</div><div class='add'>+	kfree(pages);</div><div class='add'>+</div><div class='add'>+	if (write &amp;&amp; flush_or_invalidate)</div><div class='add'>+		flush_kernel_vmap_range(ap-&gt;args.vmap_base, nbytes);</div><div class='ctx'> </div><div class='add'>+	ap-&gt;args.invalidate_vmap = !write &amp;&amp; flush_or_invalidate;</div><div class='add'>+	ap-&gt;args.is_pinned = iov_iter_extract_will_pin(ii);</div><div class='ctx'> 	ap-&gt;args.user_pages = true;</div><div class='ctx'> 	if (write)</div><div class='ctx'> 		ap-&gt;args.in_pages = true;</div><div class='ctx'> 	else</div><div class='ctx'> 		ap-&gt;args.out_pages = true;</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	*nbytesp = nbytes;</div><div class='ctx'> </div><div class='ctx'> 	return ret &lt; 0 ? ret : 0;</div><div class='hunk'>@@ -1449,14 +1664,14 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,</div><div class='ctx'> 	if (!ia)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (fopen_direct_io &amp;&amp; fc-&gt;direct_io_allow_mmap) {</div><div class='add'>+	if (fopen_direct_io) {</div><div class='ctx'> 		res = filemap_write_and_wait_range(mapping, pos, pos + count - 1);</div><div class='ctx'> 		if (res) {</div><div class='ctx'> 			fuse_io_free(ia);</div><div class='ctx'> 			return res;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!cuse &amp;&amp; fuse_range_is_writeback(inode, idx_from, idx_to)) {</div><div class='add'>+	if (!cuse &amp;&amp; filemap_range_has_writeback(mapping, pos, (pos + count - 1))) {</div><div class='ctx'> 		if (!write)</div><div class='ctx'> 			inode_lock(inode);</div><div class='ctx'> 		fuse_sync_writes(inode);</div><div class='hunk'>@@ -1479,7 +1694,7 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,</div><div class='ctx'> 		size_t nbytes = min(count, nmax);</div><div class='ctx'> </div><div class='ctx'> 		err = fuse_get_user_pages(&amp;ia-&gt;ap, iter, &amp;nbytes, write,</div><div class='del'>-					  max_pages);</div><div class='add'>+					  max_pages, fc-&gt;use_pages_for_kvec_io);</div><div class='ctx'> 		if (err &amp;&amp; !nbytes)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1493,7 +1708,7 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!io-&gt;async || nres &lt; 0) {</div><div class='del'>-			fuse_release_user_pages(&amp;ia-&gt;ap, io-&gt;should_dirty);</div><div class='add'>+			fuse_release_user_pages(&amp;ia-&gt;ap, nres, io-&gt;should_dirty);</div><div class='ctx'> 			fuse_io_free(ia);</div><div class='ctx'> 		}</div><div class='ctx'> 		ia = NULL;</div><div class='hunk'>@@ -1523,6 +1738,15 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,</div><div class='ctx'> 	if (res &gt; 0)</div><div class='ctx'> 		*ppos = pos;</div><div class='ctx'> </div><div class='add'>+	if (res &gt; 0 &amp;&amp; write &amp;&amp; fopen_direct_io) {</div><div class='add'>+		/*</div><div class='add'>+		 * As in generic_file_direct_write(), invalidate after the</div><div class='add'>+		 * write, to invalidate read-ahead cache that may have competed</div><div class='add'>+		 * with the write.</div><div class='add'>+		 */</div><div class='add'>+		invalidate_inode_pages2_range(mapping, idx_from, idx_to);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return res &gt; 0 ? res : err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_direct_io);</div><div class='hunk'>@@ -1547,7 +1771,7 @@ static ssize_t fuse_direct_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> </div><div class='del'>-	if (!is_sync_kiocb(iocb) &amp;&amp; iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='add'>+	if (!is_sync_kiocb(iocb)) {</div><div class='ctx'> 		res = fuse_direct_IO(iocb, to);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct fuse_io_priv io = FUSE_IO_PRIV_SYNC(iocb);</div><div class='hunk'>@@ -1558,63 +1782,27 @@ static ssize_t fuse_direct_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fuse_direct_write_extending_i_size(struct kiocb *iocb,</div><div class='del'>-					       struct iov_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='del'>-</div><div class='del'>-	return iocb-&gt;ki_pos + iov_iter_count(iter) &gt; i_size_read(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct fuse_file *ff = file-&gt;private_data;</div><div class='del'>-	struct fuse_io_priv io = FUSE_IO_PRIV_SYNC(iocb);</div><div class='ctx'> 	ssize_t res;</div><div class='del'>-	bool exclusive_lock =</div><div class='del'>-		!(ff-&gt;open_flags &amp; FOPEN_PARALLEL_DIRECT_WRITES) ||</div><div class='del'>-		get_fuse_conn(inode)-&gt;direct_io_allow_mmap ||</div><div class='del'>-		iocb-&gt;ki_flags &amp; IOCB_APPEND ||</div><div class='del'>-		fuse_direct_write_extending_i_size(iocb, from);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Take exclusive lock if</div><div class='del'>-	 * - Parallel direct writes are disabled - a user space decision</div><div class='del'>-	 * - Parallel direct writes are enabled and i_size is being extended.</div><div class='del'>-	 * - Shared mmap on direct_io file is supported (FUSE_DIRECT_IO_ALLOW_MMAP).</div><div class='del'>-	 *   This might not be needed at all, but needs further investigation.</div><div class='del'>-	 */</div><div class='del'>-	if (exclusive_lock)</div><div class='del'>-		inode_lock(inode);</div><div class='del'>-	else {</div><div class='del'>-		inode_lock_shared(inode);</div><div class='del'>-</div><div class='del'>-		/* A race with truncate might have come up as the decision for</div><div class='del'>-		 * the lock type was done without holding the lock, check again.</div><div class='del'>-		 */</div><div class='del'>-		if (fuse_direct_write_extending_i_size(iocb, from)) {</div><div class='del'>-			inode_unlock_shared(inode);</div><div class='del'>-			inode_lock(inode);</div><div class='del'>-			exclusive_lock = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	bool exclusive;</div><div class='ctx'> </div><div class='add'>+	fuse_dio_lock(iocb, from, &amp;exclusive);</div><div class='ctx'> 	res = generic_write_checks(iocb, from);</div><div class='ctx'> 	if (res &gt; 0) {</div><div class='del'>-		if (!is_sync_kiocb(iocb) &amp;&amp; iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='add'>+		task_io_account_write(res);</div><div class='add'>+		if (!is_sync_kiocb(iocb)) {</div><div class='ctx'> 			res = fuse_direct_IO(iocb, from);</div><div class='ctx'> 		} else {</div><div class='add'>+			struct fuse_io_priv io = FUSE_IO_PRIV_SYNC(iocb);</div><div class='add'>+</div><div class='ctx'> 			res = fuse_direct_io(&amp;io, from, &amp;iocb-&gt;ki_pos,</div><div class='ctx'> 					     FUSE_DIO_WRITE);</div><div class='ctx'> 			fuse_write_update_attr(inode, iocb-&gt;ki_pos, res);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (exclusive_lock)</div><div class='del'>-		inode_unlock(inode);</div><div class='del'>-	else</div><div class='del'>-		inode_unlock_shared(inode);</div><div class='add'>+	fuse_dio_unlock(iocb, exclusive);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1631,10 +1819,13 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	if (FUSE_IS_DAX(inode))</div><div class='ctx'> 		return fuse_dax_read_iter(iocb, to);</div><div class='ctx'> </div><div class='del'>-	if (!(ff-&gt;open_flags &amp; FOPEN_DIRECT_IO))</div><div class='del'>-		return fuse_cache_read_iter(iocb, to);</div><div class='del'>-	else</div><div class='add'>+	/* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */</div><div class='add'>+	if (ff-&gt;open_flags &amp; FOPEN_DIRECT_IO)</div><div class='ctx'> 		return fuse_direct_read_iter(iocb, to);</div><div class='add'>+	else if (fuse_file_passthrough(ff))</div><div class='add'>+		return fuse_passthrough_read_iter(iocb, to);</div><div class='add'>+	else</div><div class='add'>+		return fuse_cache_read_iter(iocb, to);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='hunk'>@@ -1649,44 +1840,69 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	if (FUSE_IS_DAX(inode))</div><div class='ctx'> 		return fuse_dax_write_iter(iocb, from);</div><div class='ctx'> </div><div class='del'>-	if (!(ff-&gt;open_flags &amp; FOPEN_DIRECT_IO))</div><div class='add'>+	/* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */</div><div class='add'>+	if (ff-&gt;open_flags &amp; FOPEN_DIRECT_IO)</div><div class='add'>+		return fuse_direct_write_iter(iocb, from);</div><div class='add'>+	else if (fuse_file_passthrough(ff))</div><div class='add'>+		return fuse_passthrough_write_iter(iocb, from);</div><div class='add'>+	else</div><div class='ctx'> 		return fuse_cache_write_iter(iocb, from);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t fuse_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+				struct pipe_inode_info *pipe, size_t len,</div><div class='add'>+				unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = in-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */</div><div class='add'>+	if (fuse_file_passthrough(ff) &amp;&amp; !(ff-&gt;open_flags &amp; FOPEN_DIRECT_IO))</div><div class='add'>+		return fuse_passthrough_splice_read(in, ppos, pipe, len, flags);</div><div class='ctx'> 	else</div><div class='del'>-		return fuse_direct_write_iter(iocb, from);</div><div class='add'>+		return filemap_splice_read(in, ppos, pipe, len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t fuse_splice_write(struct pipe_inode_info *pipe, struct file *out,</div><div class='add'>+				 loff_t *ppos, size_t len, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = out-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */</div><div class='add'>+	if (fuse_file_passthrough(ff) &amp;&amp; !(ff-&gt;open_flags &amp; FOPEN_DIRECT_IO))</div><div class='add'>+		return fuse_passthrough_splice_write(pipe, out, ppos, len, flags);</div><div class='add'>+	else</div><div class='add'>+		return iter_file_splice_write(pipe, out, ppos, len, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_writepage_free(struct fuse_writepage_args *wpa)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;wpa-&gt;ia.ap;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (wpa-&gt;bucket)</div><div class='ctx'> 		fuse_sync_bucket_dec(wpa-&gt;bucket);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages; i++)</div><div class='del'>-		__free_page(ap-&gt;pages[i]);</div><div class='del'>-</div><div class='del'>-	if (wpa-&gt;ia.ff)</div><div class='del'>-		fuse_file_put(wpa-&gt;ia.ff, false, false);</div><div class='add'>+	fuse_file_put(wpa-&gt;ia.ff, false);</div><div class='ctx'> </div><div class='del'>-	kfree(ap-&gt;pages);</div><div class='add'>+	kfree(ap-&gt;folios);</div><div class='ctx'> 	kfree(wpa);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_writepage_finish(struct fuse_mount *fm,</div><div class='del'>-				  struct fuse_writepage_args *wpa)</div><div class='add'>+static void fuse_writepage_finish(struct fuse_writepage_args *wpa)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;wpa-&gt;ia.ap;</div><div class='ctx'> 	struct inode *inode = wpa-&gt;inode;</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='del'>-	struct backing_dev_info *bdi = inode_to_bdi(inode);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ap-&gt;num_pages; i++) {</div><div class='del'>-		dec_wb_stat(&amp;bdi-&gt;wb, WB_WRITEBACK);</div><div class='del'>-		dec_node_page_state(ap-&gt;pages[i], NR_WRITEBACK_TEMP);</div><div class='del'>-		wb_writeout_inc(&amp;bdi-&gt;wb);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios; i++)</div><div class='add'>+		/*</div><div class='add'>+		 * Benchmarks showed that ending writeback within the</div><div class='add'>+		 * scope of the fi-&gt;lock alleviates xarray lock</div><div class='add'>+		 * contention and noticeably improves performance.</div><div class='add'>+		 */</div><div class='add'>+		iomap_finish_folio_write(inode, ap-&gt;folios[i],</div><div class='add'>+					 ap-&gt;descs[i].length);</div><div class='add'>+</div><div class='ctx'> 	wake_up(&amp;fi-&gt;page_waitq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1696,12 +1912,15 @@ static void fuse_send_writepage(struct fuse_mount *fm,</div><div class='ctx'> __releases(fi-&gt;lock)</div><div class='ctx'> __acquires(fi-&gt;lock)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_writepage_args *aux, *next;</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(wpa-&gt;inode);</div><div class='add'>+	struct fuse_args_pages *ap = &amp;wpa-&gt;ia.ap;</div><div class='ctx'> 	struct fuse_write_in *inarg = &amp;wpa-&gt;ia.write.in;</div><div class='del'>-	struct fuse_args *args = &amp;wpa-&gt;ia.ap.args;</div><div class='del'>-	__u64 data_size = wpa-&gt;ia.ap.num_pages * PAGE_SIZE;</div><div class='del'>-	int err;</div><div class='add'>+	struct fuse_args *args = &amp;ap-&gt;args;</div><div class='add'>+	__u64 data_size = 0;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ap-&gt;num_folios; i++)</div><div class='add'>+		data_size += ap-&gt;descs[i].length;</div><div class='ctx'> </div><div class='ctx'> 	fi-&gt;writectr++;</div><div class='ctx'> 	if (inarg-&gt;offset + data_size &lt;= size) {</div><div class='hunk'>@@ -1732,17 +1951,8 @@ __acquires(fi-&gt;lock)</div><div class='ctx'> </div><div class='ctx'>  out_free:</div><div class='ctx'> 	fi-&gt;writectr--;</div><div class='del'>-	rb_erase(&amp;wpa-&gt;writepages_entry, &amp;fi-&gt;writepages);</div><div class='del'>-	fuse_writepage_finish(fm, wpa);</div><div class='add'>+	fuse_writepage_finish(wpa);</div><div class='ctx'> 	spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* After fuse_writepage_finish() aux request list is private */</div><div class='del'>-	for (aux = wpa-&gt;next; aux; aux = next) {</div><div class='del'>-		next = aux-&gt;next;</div><div class='del'>-		aux-&gt;next = NULL;</div><div class='del'>-		fuse_writepage_free(aux);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	fuse_writepage_free(wpa);</div><div class='ctx'> 	spin_lock(&amp;fi-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1770,43 +1980,6 @@ __acquires(fi-&gt;lock)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fuse_writepage_args *fuse_insert_writeback(struct rb_root *root,</div><div class='del'>-						struct fuse_writepage_args *wpa)</div><div class='del'>-{</div><div class='del'>-	pgoff_t idx_from = wpa-&gt;ia.write.in.offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t idx_to = idx_from + wpa-&gt;ia.ap.num_pages - 1;</div><div class='del'>-	struct rb_node **p = &amp;root-&gt;rb_node;</div><div class='del'>-	struct rb_node  *parent = NULL;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!wpa-&gt;ia.ap.num_pages);</div><div class='del'>-	while (*p) {</div><div class='del'>-		struct fuse_writepage_args *curr;</div><div class='del'>-		pgoff_t curr_index;</div><div class='del'>-</div><div class='del'>-		parent = *p;</div><div class='del'>-		curr = rb_entry(parent, struct fuse_writepage_args,</div><div class='del'>-				writepages_entry);</div><div class='del'>-		WARN_ON(curr-&gt;inode != wpa-&gt;inode);</div><div class='del'>-		curr_index = curr-&gt;ia.write.in.offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-		if (idx_from &gt;= curr_index + curr-&gt;ia.ap.num_pages)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_right;</div><div class='del'>-		else if (idx_to &lt; curr_index)</div><div class='del'>-			p = &amp;(*p)-&gt;rb_left;</div><div class='del'>-		else</div><div class='del'>-			return curr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb_link_node(&amp;wpa-&gt;writepages_entry, parent, p);</div><div class='del'>-	rb_insert_color(&amp;wpa-&gt;writepages_entry, root);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tree_insert(struct rb_root *root, struct fuse_writepage_args *wpa)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(fuse_insert_writeback(root, wpa));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void fuse_writepage_end(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 			       int error)</div><div class='ctx'> {</div><div class='hunk'>@@ -1826,44 +1999,8 @@ static void fuse_writepage_end(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	if (!fc-&gt;writeback_cache)</div><div class='ctx'> 		fuse_invalidate_attr_mask(inode, FUSE_STATX_MODIFY);</div><div class='ctx'> 	spin_lock(&amp;fi-&gt;lock);</div><div class='del'>-	rb_erase(&amp;wpa-&gt;writepages_entry, &amp;fi-&gt;writepages);</div><div class='del'>-	while (wpa-&gt;next) {</div><div class='del'>-		struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='del'>-		struct fuse_write_in *inarg = &amp;wpa-&gt;ia.write.in;</div><div class='del'>-		struct fuse_writepage_args *next = wpa-&gt;next;</div><div class='del'>-</div><div class='del'>-		wpa-&gt;next = next-&gt;next;</div><div class='del'>-		next-&gt;next = NULL;</div><div class='del'>-		next-&gt;ia.ff = fuse_file_get(wpa-&gt;ia.ff);</div><div class='del'>-		tree_insert(&amp;fi-&gt;writepages, next);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Skip fuse_flush_writepages() to make it easy to crop requests</div><div class='del'>-		 * based on primary request size.</div><div class='del'>-		 *</div><div class='del'>-		 * 1st case (trivial): there are no concurrent activities using</div><div class='del'>-		 * fuse_set/release_nowrite.  Then we're on safe side because</div><div class='del'>-		 * fuse_flush_writepages() would call fuse_send_writepage()</div><div class='del'>-		 * anyway.</div><div class='del'>-		 *</div><div class='del'>-		 * 2nd case: someone called fuse_set_nowrite and it is waiting</div><div class='del'>-		 * now for completion of all in-flight requests.  This happens</div><div class='del'>-		 * rarely and no more than once per page, so this should be</div><div class='del'>-		 * okay.</div><div class='del'>-		 *</div><div class='del'>-		 * 3rd case: someone (e.g. fuse_do_setattr()) is in the middle</div><div class='del'>-		 * of fuse_set_nowrite..fuse_release_nowrite section.  The fact</div><div class='del'>-		 * that fuse_set_nowrite returned implies that all in-flight</div><div class='del'>-		 * requests were completed along with all of their secondary</div><div class='del'>-		 * requests.  Further primary requests are blocked by negative</div><div class='del'>-		 * writectr.  Hence there cannot be any in-flight requests and</div><div class='del'>-		 * no invocations of fuse_writepage_end() while we're in</div><div class='del'>-		 * fuse_set_nowrite..fuse_release_nowrite section.</div><div class='del'>-		 */</div><div class='del'>-		fuse_send_writepage(fm, next, inarg-&gt;offset + inarg-&gt;size);</div><div class='del'>-	}</div><div class='ctx'> 	fi-&gt;writectr--;</div><div class='del'>-	fuse_writepage_finish(fm, wpa);</div><div class='add'>+	fuse_writepage_finish(wpa);</div><div class='ctx'> 	spin_unlock(&amp;fi-&gt;lock);</div><div class='ctx'> 	fuse_writepage_free(wpa);</div><div class='ctx'> }</div><div class='hunk'>@@ -1895,21 +2032,10 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Inode is always written before the last reference is dropped and</div><div class='del'>-	 * hence this should not be reached from reclaim.</div><div class='del'>-	 *</div><div class='del'>-	 * Writing back the inode from reclaim can deadlock if the request</div><div class='del'>-	 * processing itself needs an allocation.  Allocations triggering</div><div class='del'>-	 * reclaim while serving a request can't be prevented, because it can</div><div class='del'>-	 * involve any number of unrelated userspace processes.</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON(wbc-&gt;for_reclaim);</div><div class='del'>-</div><div class='ctx'> 	ff = __fuse_write_file_get(fi);</div><div class='ctx'> 	err = fuse_flush_times(inode, ff);</div><div class='ctx'> 	if (ff)</div><div class='del'>-		fuse_file_put(ff, false, false);</div><div class='add'>+		fuse_file_put(ff, false);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1922,9 +2048,9 @@ static struct fuse_writepage_args *fuse_writepage_args_alloc(void)</div><div class='ctx'> 	wpa = kzalloc(sizeof(*wpa), GFP_NOFS);</div><div class='ctx'> 	if (wpa) {</div><div class='ctx'> 		ap = &amp;wpa-&gt;ia.ap;</div><div class='del'>-		ap-&gt;num_pages = 0;</div><div class='del'>-		ap-&gt;pages = fuse_pages_alloc(1, GFP_NOFS, &amp;ap-&gt;descs);</div><div class='del'>-		if (!ap-&gt;pages) {</div><div class='add'>+		ap-&gt;num_folios = 0;</div><div class='add'>+		ap-&gt;folios = fuse_folios_alloc(1, GFP_NOFS, &amp;ap-&gt;descs);</div><div class='add'>+		if (!ap-&gt;folios) {</div><div class='ctx'> 			kfree(wpa);</div><div class='ctx'> 			wpa = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1947,463 +2073,244 @@ static void fuse_writepage_add_to_bucket(struct fuse_conn *fc,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_writepage_locked(struct page *page)</div><div class='add'>+static void fuse_writepage_args_page_fill(struct fuse_writepage_args *wpa, struct folio *folio,</div><div class='add'>+					  uint32_t folio_index, loff_t offset, unsigned len)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='del'>-	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct fuse_args_pages *ap = &amp;wpa-&gt;ia.ap;</div><div class='add'>+</div><div class='add'>+	ap-&gt;folios[folio_index] = folio;</div><div class='add'>+	ap-&gt;descs[folio_index].offset = offset;</div><div class='add'>+	ap-&gt;descs[folio_index].length = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_writepage_args *fuse_writepage_args_setup(struct folio *folio,</div><div class='add'>+							     size_t offset,</div><div class='add'>+							     struct fuse_file *ff)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='ctx'> 	struct fuse_writepage_args *wpa;</div><div class='ctx'> 	struct fuse_args_pages *ap;</div><div class='del'>-	struct page *tmp_page;</div><div class='del'>-	int error = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	set_page_writeback(page);</div><div class='ctx'> </div><div class='ctx'> 	wpa = fuse_writepage_args_alloc();</div><div class='ctx'> 	if (!wpa)</div><div class='del'>-		goto err;</div><div class='del'>-	ap = &amp;wpa-&gt;ia.ap;</div><div class='del'>-</div><div class='del'>-	tmp_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);</div><div class='del'>-	if (!tmp_page)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	error = -EIO;</div><div class='del'>-	wpa-&gt;ia.ff = fuse_write_file_get(fi);</div><div class='del'>-	if (!wpa-&gt;ia.ff)</div><div class='del'>-		goto err_nofile;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	fuse_writepage_add_to_bucket(fc, wpa);</div><div class='del'>-	fuse_write_args_fill(&amp;wpa-&gt;ia, wpa-&gt;ia.ff, page_offset(page), 0);</div><div class='del'>-</div><div class='del'>-	copy_highpage(tmp_page, page);</div><div class='add'>+	fuse_write_args_fill(&amp;wpa-&gt;ia, ff, folio_pos(folio) + offset, 0);</div><div class='ctx'> 	wpa-&gt;ia.write.in.write_flags |= FUSE_WRITE_CACHE;</div><div class='del'>-	wpa-&gt;next = NULL;</div><div class='del'>-	ap-&gt;args.in_pages = true;</div><div class='del'>-	ap-&gt;num_pages = 1;</div><div class='del'>-	ap-&gt;pages[0] = tmp_page;</div><div class='del'>-	ap-&gt;descs[0].offset = 0;</div><div class='del'>-	ap-&gt;descs[0].length = PAGE_SIZE;</div><div class='del'>-	ap-&gt;args.end = fuse_writepage_end;</div><div class='ctx'> 	wpa-&gt;inode = inode;</div><div class='add'>+	wpa-&gt;ia.ff = ff;</div><div class='ctx'> </div><div class='del'>-	inc_wb_stat(&amp;inode_to_bdi(inode)-&gt;wb, WB_WRITEBACK);</div><div class='del'>-	inc_node_page_state(tmp_page, NR_WRITEBACK_TEMP);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;fi-&gt;lock);</div><div class='del'>-	tree_insert(&amp;fi-&gt;writepages, wpa);</div><div class='del'>-	list_add_tail(&amp;wpa-&gt;queue_entry, &amp;fi-&gt;queued_writes);</div><div class='del'>-	fuse_flush_writepages(inode);</div><div class='del'>-	spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	end_page_writeback(page);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_nofile:</div><div class='del'>-	__free_page(tmp_page);</div><div class='del'>-err_free:</div><div class='del'>-	kfree(wpa);</div><div class='del'>-err:</div><div class='del'>-	mapping_set_error(page-&gt;mapping, error);</div><div class='del'>-	end_page_writeback(page);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fuse_writepage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct fuse_conn *fc = get_fuse_conn(page-&gt;mapping-&gt;host);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (fuse_page_is_writeback(page-&gt;mapping-&gt;host, page-&gt;index)) {</div><div class='del'>-		/*</div><div class='del'>-		 * -&gt;writepages() should be called for sync() and friends.  We</div><div class='del'>-		 * should only get here on direct reclaim and then we are</div><div class='del'>-		 * allowed to skip a page which is already in flight</div><div class='del'>-		 */</div><div class='del'>-		WARN_ON(wbc-&gt;sync_mode == WB_SYNC_ALL);</div><div class='del'>-</div><div class='del'>-		redirty_page_for_writepage(wbc, page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='del'>-	    fc-&gt;num_background &gt;= fc-&gt;congestion_threshold)</div><div class='del'>-		return AOP_WRITEPAGE_ACTIVATE;</div><div class='del'>-</div><div class='del'>-	err = fuse_writepage_locked(page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	ap = &amp;wpa-&gt;ia.ap;</div><div class='add'>+	ap-&gt;args.in_pages = true;</div><div class='add'>+	ap-&gt;args.end = fuse_writepage_end;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return wpa;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct fuse_fill_wb_data {</div><div class='ctx'> 	struct fuse_writepage_args *wpa;</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct page **orig_pages;</div><div class='del'>-	unsigned int max_pages;</div><div class='add'>+	unsigned int max_folios;</div><div class='add'>+	/*</div><div class='add'>+	 * nr_bytes won't overflow since fuse_folios_need_send() caps</div><div class='add'>+	 * wb requests to never exceed fc-&gt;max_pages (which has an upper bound</div><div class='add'>+	 * of U16_MAX).</div><div class='add'>+	 */</div><div class='add'>+	unsigned int nr_bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static bool fuse_pages_realloc(struct fuse_fill_wb_data *data)</div><div class='add'>+static bool fuse_pages_realloc(struct fuse_fill_wb_data *data,</div><div class='add'>+			       unsigned int max_pages)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;data-&gt;wpa-&gt;ia.ap;</div><div class='del'>-	struct fuse_conn *fc = get_fuse_conn(data-&gt;inode);</div><div class='del'>-	struct page **pages;</div><div class='del'>-	struct fuse_page_desc *descs;</div><div class='del'>-	unsigned int npages = min_t(unsigned int,</div><div class='del'>-				    max_t(unsigned int, data-&gt;max_pages * 2,</div><div class='del'>-					  FUSE_DEFAULT_MAX_PAGES_PER_REQ),</div><div class='del'>-				    fc-&gt;max_pages);</div><div class='del'>-	WARN_ON(npages &lt;= data-&gt;max_pages);</div><div class='del'>-</div><div class='del'>-	pages = fuse_pages_alloc(npages, GFP_NOFS, &amp;descs);</div><div class='del'>-	if (!pages)</div><div class='add'>+	struct folio **folios;</div><div class='add'>+	struct fuse_folio_desc *descs;</div><div class='add'>+	unsigned int nfolios = min_t(unsigned int,</div><div class='add'>+				     max_t(unsigned int, data-&gt;max_folios * 2,</div><div class='add'>+					   FUSE_DEFAULT_MAX_PAGES_PER_REQ),</div><div class='add'>+				    max_pages);</div><div class='add'>+	WARN_ON(nfolios &lt;= data-&gt;max_folios);</div><div class='add'>+</div><div class='add'>+	folios = fuse_folios_alloc(nfolios, GFP_NOFS, &amp;descs);</div><div class='add'>+	if (!folios)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	memcpy(pages, ap-&gt;pages, sizeof(struct page *) * ap-&gt;num_pages);</div><div class='del'>-	memcpy(descs, ap-&gt;descs, sizeof(struct fuse_page_desc) * ap-&gt;num_pages);</div><div class='del'>-	kfree(ap-&gt;pages);</div><div class='del'>-	ap-&gt;pages = pages;</div><div class='add'>+	memcpy(folios, ap-&gt;folios, sizeof(struct folio *) * ap-&gt;num_folios);</div><div class='add'>+	memcpy(descs, ap-&gt;descs, sizeof(struct fuse_folio_desc) * ap-&gt;num_folios);</div><div class='add'>+	kfree(ap-&gt;folios);</div><div class='add'>+	ap-&gt;folios = folios;</div><div class='ctx'> 	ap-&gt;descs = descs;</div><div class='del'>-	data-&gt;max_pages = npages;</div><div class='add'>+	data-&gt;max_folios = nfolios;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_writepages_send(struct fuse_fill_wb_data *data)</div><div class='add'>+static void fuse_writepages_send(struct inode *inode,</div><div class='add'>+				 struct fuse_fill_wb_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_writepage_args *wpa = data-&gt;wpa;</div><div class='del'>-	struct inode *inode = data-&gt;inode;</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='del'>-	int num_pages = wpa-&gt;ia.ap.num_pages;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	wpa-&gt;ia.ff = fuse_file_get(data-&gt;ff);</div><div class='ctx'> 	spin_lock(&amp;fi-&gt;lock);</div><div class='ctx'> 	list_add_tail(&amp;wpa-&gt;queue_entry, &amp;fi-&gt;queued_writes);</div><div class='ctx'> 	fuse_flush_writepages(inode);</div><div class='ctx'> 	spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_pages; i++)</div><div class='del'>-		end_page_writeback(data-&gt;orig_pages[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check under fi-&gt;lock if the page is under writeback, and insert it onto the</div><div class='del'>- * rb_tree if not. Otherwise iterate auxiliary write requests, to see if there's</div><div class='del'>- * one already added for a page at this offset.  If there's none, then insert</div><div class='del'>- * this new request onto the auxiliary list, otherwise reuse the existing one by</div><div class='del'>- * swapping the new temp page with the old one.</div><div class='del'>- */</div><div class='del'>-static bool fuse_writepage_add(struct fuse_writepage_args *new_wpa,</div><div class='del'>-			       struct page *page)</div><div class='del'>-{</div><div class='del'>-	struct fuse_inode *fi = get_fuse_inode(new_wpa-&gt;inode);</div><div class='del'>-	struct fuse_writepage_args *tmp;</div><div class='del'>-	struct fuse_writepage_args *old_wpa;</div><div class='del'>-	struct fuse_args_pages *new_ap = &amp;new_wpa-&gt;ia.ap;</div><div class='del'>-</div><div class='del'>-	WARN_ON(new_ap-&gt;num_pages != 0);</div><div class='del'>-	new_ap-&gt;num_pages = 1;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;fi-&gt;lock);</div><div class='del'>-	old_wpa = fuse_insert_writeback(&amp;fi-&gt;writepages, new_wpa);</div><div class='del'>-	if (!old_wpa) {</div><div class='del'>-		spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (tmp = old_wpa-&gt;next; tmp; tmp = tmp-&gt;next) {</div><div class='del'>-		pgoff_t curr_index;</div><div class='del'>-</div><div class='del'>-		WARN_ON(tmp-&gt;inode != new_wpa-&gt;inode);</div><div class='del'>-		curr_index = tmp-&gt;ia.write.in.offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		if (curr_index == page-&gt;index) {</div><div class='del'>-			WARN_ON(tmp-&gt;ia.ap.num_pages != 1);</div><div class='del'>-			swap(tmp-&gt;ia.ap.pages[0], new_ap-&gt;pages[0]);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!tmp) {</div><div class='del'>-		new_wpa-&gt;next = old_wpa-&gt;next;</div><div class='del'>-		old_wpa-&gt;next = new_wpa;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (tmp) {</div><div class='del'>-		struct backing_dev_info *bdi = inode_to_bdi(new_wpa-&gt;inode);</div><div class='del'>-</div><div class='del'>-		dec_wb_stat(&amp;bdi-&gt;wb, WB_WRITEBACK);</div><div class='del'>-		dec_node_page_state(new_ap-&gt;pages[0], NR_WRITEBACK_TEMP);</div><div class='del'>-		wb_writeout_inc(&amp;bdi-&gt;wb);</div><div class='del'>-		fuse_writepage_free(new_wpa);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool fuse_writepage_need_send(struct fuse_conn *fc, struct page *page,</div><div class='del'>-				     struct fuse_args_pages *ap,</div><div class='del'>-				     struct fuse_fill_wb_data *data)</div><div class='add'>+static bool fuse_folios_need_send(struct fuse_conn *fc, loff_t pos,</div><div class='add'>+				  unsigned len, struct fuse_args_pages *ap,</div><div class='add'>+				  unsigned cur_bytes, bool write)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(!ap-&gt;num_pages);</div><div class='add'>+	struct folio *prev_folio;</div><div class='add'>+	struct fuse_folio_desc prev_desc;</div><div class='add'>+	unsigned bytes = cur_bytes + len;</div><div class='add'>+	loff_t prev_pos;</div><div class='add'>+	size_t max_bytes = write ? fc-&gt;max_write : fc-&gt;max_read;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Being under writeback is unlikely but possible.  For example direct</div><div class='del'>-	 * read to an mmaped fuse file will set the page dirty twice; once when</div><div class='del'>-	 * the pages are faulted with get_user_pages(), and then after the read</div><div class='del'>-	 * completed.</div><div class='del'>-	 */</div><div class='del'>-	if (fuse_page_is_writeback(data-&gt;inode, page-&gt;index))</div><div class='del'>-		return true;</div><div class='add'>+	WARN_ON(!ap-&gt;num_folios);</div><div class='ctx'> </div><div class='ctx'> 	/* Reached max pages */</div><div class='del'>-	if (ap-&gt;num_pages == fc-&gt;max_pages)</div><div class='add'>+	if ((bytes + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT &gt; fc-&gt;max_pages)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	/* Reached max write bytes */</div><div class='del'>-	if ((ap-&gt;num_pages + 1) * PAGE_SIZE &gt; fc-&gt;max_write)</div><div class='add'>+	if (bytes &gt; max_bytes)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Discontinuity */</div><div class='del'>-	if (data-&gt;orig_pages[ap-&gt;num_pages - 1]-&gt;index + 1 != page-&gt;index)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* Need to grow the pages array?  If so, did the expansion fail? */</div><div class='del'>-	if (ap-&gt;num_pages == data-&gt;max_pages &amp;&amp; !fuse_pages_realloc(data))</div><div class='add'>+	prev_folio = ap-&gt;folios[ap-&gt;num_folios - 1];</div><div class='add'>+	prev_desc = ap-&gt;descs[ap-&gt;num_folios - 1];</div><div class='add'>+	prev_pos = folio_pos(prev_folio) + prev_desc.offset + prev_desc.length;</div><div class='add'>+	if (prev_pos != pos)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_writepages_fill(struct folio *folio,</div><div class='del'>-		struct writeback_control *wbc, void *_data)</div><div class='add'>+static ssize_t fuse_iomap_writeback_range(struct iomap_writepage_ctx *wpc,</div><div class='add'>+					  struct folio *folio, u64 pos,</div><div class='add'>+					  unsigned len, u64 end_pos)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_fill_wb_data *data = _data;</div><div class='add'>+	struct fuse_fill_wb_data *data = wpc-&gt;wb_ctx;</div><div class='ctx'> 	struct fuse_writepage_args *wpa = data-&gt;wpa;</div><div class='ctx'> 	struct fuse_args_pages *ap = &amp;wpa-&gt;ia.ap;</div><div class='del'>-	struct inode *inode = data-&gt;inode;</div><div class='add'>+	struct inode *inode = wpc-&gt;inode;</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-	struct page *tmp_page;</div><div class='del'>-	int err;</div><div class='add'>+	loff_t offset = offset_in_folio(folio, pos);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!data);</div><div class='ctx'> </div><div class='ctx'> 	if (!data-&gt;ff) {</div><div class='del'>-		err = -EIO;</div><div class='ctx'> 		data-&gt;ff = fuse_write_file_get(fi);</div><div class='ctx'> 		if (!data-&gt;ff)</div><div class='del'>-			goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wpa &amp;&amp; fuse_writepage_need_send(fc, &amp;folio-&gt;page, ap, data)) {</div><div class='del'>-		fuse_writepages_send(data);</div><div class='del'>-		data-&gt;wpa = NULL;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	tmp_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);</div><div class='del'>-	if (!tmp_page)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	if (wpa) {</div><div class='add'>+		bool send = fuse_folios_need_send(fc, pos, len, ap,</div><div class='add'>+						  data-&gt;nr_bytes, true);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The page must not be redirtied until the writeout is completed</div><div class='del'>-	 * (i.e. userspace has sent a reply to the write request).  Otherwise</div><div class='del'>-	 * there could be more than one temporary page instance for each real</div><div class='del'>-	 * page.</div><div class='del'>-	 *</div><div class='del'>-	 * This is ensured by holding the page lock in page_mkwrite() while</div><div class='del'>-	 * checking fuse_page_is_writeback().  We already hold the page lock</div><div class='del'>-	 * since clear_page_dirty_for_io() and keep it held until we add the</div><div class='del'>-	 * request to the fi-&gt;writepages list and increment ap-&gt;num_pages.</div><div class='del'>-	 * After this fuse_page_is_writeback() will indicate that the page is</div><div class='del'>-	 * under writeback, so we can release the page lock.</div><div class='del'>-	 */</div><div class='del'>-	if (data-&gt;wpa == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		wpa = fuse_writepage_args_alloc();</div><div class='del'>-		if (!wpa) {</div><div class='del'>-			__free_page(tmp_page);</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		if (!send) {</div><div class='add'>+			/*</div><div class='add'>+			 * Need to grow the pages array?  If so, did the</div><div class='add'>+			 * expansion fail?</div><div class='add'>+			 */</div><div class='add'>+			send = (ap-&gt;num_folios == data-&gt;max_folios) &amp;&amp;</div><div class='add'>+				!fuse_pages_realloc(data, fc-&gt;max_pages);</div><div class='ctx'> 		}</div><div class='del'>-		fuse_writepage_add_to_bucket(fc, wpa);</div><div class='ctx'> </div><div class='del'>-		data-&gt;max_pages = 1;</div><div class='add'>+		if (send) {</div><div class='add'>+			fuse_writepages_send(inode, data);</div><div class='add'>+			data-&gt;wpa = NULL;</div><div class='add'>+			data-&gt;nr_bytes = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;wpa == NULL) {</div><div class='add'>+		wpa = fuse_writepage_args_setup(folio, offset, data-&gt;ff);</div><div class='add'>+		if (!wpa)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		fuse_file_get(wpa-&gt;ia.ff);</div><div class='add'>+		data-&gt;max_folios = 1;</div><div class='ctx'> 		ap = &amp;wpa-&gt;ia.ap;</div><div class='del'>-		fuse_write_args_fill(&amp;wpa-&gt;ia, data-&gt;ff, folio_pos(folio), 0);</div><div class='del'>-		wpa-&gt;ia.write.in.write_flags |= FUSE_WRITE_CACHE;</div><div class='del'>-		wpa-&gt;next = NULL;</div><div class='del'>-		ap-&gt;args.in_pages = true;</div><div class='del'>-		ap-&gt;args.end = fuse_writepage_end;</div><div class='del'>-		ap-&gt;num_pages = 0;</div><div class='del'>-		wpa-&gt;inode = inode;</div><div class='ctx'> 	}</div><div class='del'>-	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='del'>-	copy_highpage(tmp_page, &amp;folio-&gt;page);</div><div class='del'>-	ap-&gt;pages[ap-&gt;num_pages] = tmp_page;</div><div class='del'>-	ap-&gt;descs[ap-&gt;num_pages].offset = 0;</div><div class='del'>-	ap-&gt;descs[ap-&gt;num_pages].length = PAGE_SIZE;</div><div class='del'>-	data-&gt;orig_pages[ap-&gt;num_pages] = &amp;folio-&gt;page;</div><div class='add'>+	fuse_writepage_args_page_fill(wpa, folio, ap-&gt;num_folios,</div><div class='add'>+				      offset, len);</div><div class='add'>+	data-&gt;nr_bytes += len;</div><div class='ctx'> </div><div class='del'>-	inc_wb_stat(&amp;inode_to_bdi(inode)-&gt;wb, WB_WRITEBACK);</div><div class='del'>-	inc_node_page_state(tmp_page, NR_WRITEBACK_TEMP);</div><div class='add'>+	ap-&gt;num_folios++;</div><div class='add'>+	if (!data-&gt;wpa)</div><div class='add'>+		data-&gt;wpa = wpa;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_iomap_writeback_submit(struct iomap_writepage_ctx *wpc,</div><div class='add'>+				       int error)</div><div class='add'>+{</div><div class='add'>+	struct fuse_fill_wb_data *data = wpc-&gt;wb_ctx;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!data);</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	if (data-&gt;wpa) {</div><div class='del'>-		/*</div><div class='del'>-		 * Protected by fi-&gt;lock against concurrent access by</div><div class='del'>-		 * fuse_page_is_writeback().</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;fi-&gt;lock);</div><div class='del'>-		ap-&gt;num_pages++;</div><div class='del'>-		spin_unlock(&amp;fi-&gt;lock);</div><div class='del'>-	} else if (fuse_writepage_add(wpa, &amp;folio-&gt;page)) {</div><div class='del'>-		data-&gt;wpa = wpa;</div><div class='del'>-	} else {</div><div class='del'>-		folio_end_writeback(folio);</div><div class='add'>+		WARN_ON(!data-&gt;wpa-&gt;ia.ap.num_folios);</div><div class='add'>+		fuse_writepages_send(wpc-&gt;inode, data);</div><div class='ctx'> 	}</div><div class='del'>-out_unlock:</div><div class='del'>-	folio_unlock(folio);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	if (data-&gt;ff)</div><div class='add'>+		fuse_file_put(data-&gt;ff, false);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct iomap_writeback_ops fuse_writeback_ops = {</div><div class='add'>+	.writeback_range	= fuse_iomap_writeback_range,</div><div class='add'>+	.writeback_submit	= fuse_iomap_writeback_submit,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int fuse_writepages(struct address_space *mapping,</div><div class='ctx'> 			   struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-	struct fuse_fill_wb_data data;</div><div class='del'>-	int err;</div><div class='add'>+	struct fuse_fill_wb_data data = {};</div><div class='add'>+	struct iomap_writepage_ctx wpc = {</div><div class='add'>+		.inode = inode,</div><div class='add'>+		.iomap.type = IOMAP_MAPPED,</div><div class='add'>+		.wbc = wbc,</div><div class='add'>+		.ops = &amp;fuse_writeback_ops,</div><div class='add'>+		.wb_ctx	= &amp;data,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	err = -EIO;</div><div class='ctx'> 	if (fuse_is_bad(inode))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='ctx'> 	    fc-&gt;num_background &gt;= fc-&gt;congestion_threshold)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	data.inode = inode;</div><div class='del'>-	data.wpa = NULL;</div><div class='del'>-	data.ff = NULL;</div><div class='del'>-</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	data.orig_pages = kcalloc(fc-&gt;max_pages,</div><div class='del'>-				  sizeof(struct page *),</div><div class='del'>-				  GFP_NOFS);</div><div class='del'>-	if (!data.orig_pages)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = write_cache_pages(mapping, wbc, fuse_writepages_fill, &amp;data);</div><div class='del'>-	if (data.wpa) {</div><div class='del'>-		WARN_ON(!data.wpa-&gt;ia.ap.num_pages);</div><div class='del'>-		fuse_writepages_send(&amp;data);</div><div class='del'>-	}</div><div class='del'>-	if (data.ff)</div><div class='del'>-		fuse_file_put(data.ff, false, false);</div><div class='del'>-</div><div class='del'>-	kfree(data.orig_pages);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * It's worthy to make sure that space is reserved on disk for the write,</div><div class='del'>- * but how to implement it without killing performance need more thinking.</div><div class='del'>- */</div><div class='del'>-static int fuse_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata)</div><div class='del'>-{</div><div class='del'>-	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	struct fuse_conn *fc = get_fuse_conn(file_inode(file));</div><div class='del'>-	struct page *page;</div><div class='del'>-	loff_t fsize;</div><div class='del'>-	int err = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!fc-&gt;writeback_cache);</div><div class='del'>-</div><div class='del'>-	page = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!page)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	fuse_wait_on_page_writeback(mapping-&gt;host, page-&gt;index);</div><div class='del'>-</div><div class='del'>-	if (PageUptodate(page) || len == PAGE_SIZE)</div><div class='del'>-		goto success;</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the start this page comes after the end of file, in which</div><div class='del'>-	 * case the readpage can be optimized away.</div><div class='del'>-	 */</div><div class='del'>-	fsize = i_size_read(mapping-&gt;host);</div><div class='del'>-	if (fsize &lt;= (pos &amp; PAGE_MASK)) {</div><div class='del'>-		size_t off = pos &amp; ~PAGE_MASK;</div><div class='del'>-		if (off)</div><div class='del'>-			zero_user_segment(page, 0, off);</div><div class='del'>-		goto success;</div><div class='del'>-	}</div><div class='del'>-	err = fuse_do_readpage(file, page);</div><div class='del'>-	if (err)</div><div class='del'>-		goto cleanup;</div><div class='del'>-success:</div><div class='del'>-	*pagep = page;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-cleanup:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-error:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fuse_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-		struct page *page, void *fsdata)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-</div><div class='del'>-	/* Haven't copied anything?  Skip zeroing, size extending, dirtying. */</div><div class='del'>-	if (!copied)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	pos += copied;</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		/* Zero any unwritten bytes at the end of the page */</div><div class='del'>-		size_t endoff = pos &amp; ~PAGE_MASK;</div><div class='del'>-		if (endoff)</div><div class='del'>-			zero_user_segment(page, endoff, PAGE_SIZE);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pos &gt; inode-&gt;i_size)</div><div class='del'>-		i_size_write(inode, pos);</div><div class='del'>-</div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-</div><div class='del'>-	return copied;</div><div class='add'>+	return iomap_writepages(&amp;wpc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fuse_launder_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	if (folio_clear_dirty_for_io(folio)) {</div><div class='del'>-		struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	struct fuse_fill_wb_data data = {};</div><div class='add'>+	struct iomap_writepage_ctx wpc = {</div><div class='add'>+		.inode = folio-&gt;mapping-&gt;host,</div><div class='add'>+		.iomap.type = IOMAP_MAPPED,</div><div class='add'>+		.ops = &amp;fuse_writeback_ops,</div><div class='add'>+		.wb_ctx	= &amp;data,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		/* Serialize with pending writeback for the same page */</div><div class='del'>-		fuse_wait_on_page_writeback(inode, folio-&gt;index);</div><div class='del'>-		err = fuse_writepage_locked(&amp;folio-&gt;page);</div><div class='add'>+	if (folio_clear_dirty_for_io(folio)) {</div><div class='add'>+		err = iomap_writeback_folio(&amp;wpc, folio);</div><div class='add'>+		err = fuse_iomap_writeback_submit(&amp;wpc, err);</div><div class='ctx'> 		if (!err)</div><div class='del'>-			fuse_wait_on_page_writeback(inode, folio-&gt;index);</div><div class='add'>+			folio_wait_writeback(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2437,17 +2344,17 @@ static void fuse_vma_close(struct vm_area_struct *vma)</div><div class='ctx'>  */</div><div class='ctx'> static vm_fault_t fuse_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = vmf-&gt;page;</div><div class='add'>+	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='ctx'> 	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> </div><div class='ctx'> 	file_update_time(vmf-&gt;vma-&gt;vm_file);</div><div class='del'>-	lock_page(page);</div><div class='del'>-	if (page-&gt;mapping != inode-&gt;i_mapping) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	if (folio-&gt;mapping != inode-&gt;i_mapping) {</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return VM_FAULT_NOPAGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fuse_wait_on_page_writeback(inode, page-&gt;index);</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='ctx'> 	return VM_FAULT_LOCKED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2462,13 +2369,30 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_file *ff = file-&gt;private_data;</div><div class='ctx'> 	struct fuse_conn *fc = ff-&gt;fm-&gt;fc;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* DAX mmap is superior to direct_io mmap */</div><div class='del'>-	if (FUSE_IS_DAX(file_inode(file)))</div><div class='add'>+	if (FUSE_IS_DAX(inode))</div><div class='ctx'> 		return fuse_dax_mmap(file, vma);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If inode is in passthrough io mode, because it has some file open</div><div class='add'>+	 * in passthrough mode, either mmap to backing file or fail mmap,</div><div class='add'>+	 * because mixing cached mmap and passthrough io mode is not allowed.</div><div class='add'>+	 */</div><div class='add'>+	if (fuse_file_passthrough(ff))</div><div class='add'>+		return fuse_passthrough_mmap(file, vma);</div><div class='add'>+	else if (fuse_inode_backing(get_fuse_inode(inode)))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FOPEN_DIRECT_IO handling is special compared to O_DIRECT,</div><div class='add'>+	 * as does not allow MAP_SHARED mmap without FUSE_DIRECT_IO_ALLOW_MMAP.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ff-&gt;open_flags &amp; FOPEN_DIRECT_IO) {</div><div class='del'>-		/* Can't provide the coherency needed for MAP_SHARED</div><div class='add'>+		/*</div><div class='add'>+		 * Can't provide the coherency needed for MAP_SHARED</div><div class='ctx'> 		 * if FUSE_DIRECT_IO_ALLOW_MMAP isn't set.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((vma-&gt;vm_flags &amp; VM_MAYSHARE) &amp;&amp; !fc-&gt;direct_io_allow_mmap)</div><div class='hunk'>@@ -2476,7 +2400,21 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 		invalidate_inode_pages2(file-&gt;f_mapping);</div><div class='ctx'> </div><div class='del'>-		return generic_file_mmap(file, vma);</div><div class='add'>+		if (!(vma-&gt;vm_flags &amp; VM_MAYSHARE)) {</div><div class='add'>+			/* MAP_PRIVATE */</div><div class='add'>+			return generic_file_mmap(file, vma);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * First mmap of direct_io file enters caching inode io mode.</div><div class='add'>+		 * Also waits for parallel dio writers to go into serial mode</div><div class='add'>+		 * (exclusive instead of shared lock).</div><div class='add'>+		 * After first mmap, the inode stays in caching io mode until</div><div class='add'>+		 * the direct_io file release.</div><div class='add'>+		 */</div><div class='add'>+		rc = fuse_file_cached_io_open(inode, ff);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((vma-&gt;vm_flags &amp; VM_SHARED) &amp;&amp; (vma-&gt;vm_flags &amp; VM_MAYWRITE))</div><div class='hunk'>@@ -2509,14 +2447,14 @@ static int convert_fuse_file_lock(struct fuse_conn *fc,</div><div class='ctx'> 		 * translate it into the caller's pid namespace.</div><div class='ctx'> 		 */</div><div class='ctx'> 		rcu_read_lock();</div><div class='del'>-		fl-&gt;fl_pid = pid_nr_ns(find_pid_ns(ffl-&gt;pid, fc-&gt;pid_ns), &amp;init_pid_ns);</div><div class='add'>+		fl-&gt;c.flc_pid = pid_nr_ns(find_pid_ns(ffl-&gt;pid, fc-&gt;pid_ns), &amp;init_pid_ns);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	fl-&gt;fl_type = ffl-&gt;type;</div><div class='add'>+	fl-&gt;c.flc_type = ffl-&gt;type;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2530,10 +2468,10 @@ static void fuse_lk_fill(struct fuse_args *args, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	memset(inarg, 0, sizeof(*inarg));</div><div class='ctx'> 	inarg-&gt;fh = ff-&gt;fh;</div><div class='del'>-	inarg-&gt;owner = fuse_lock_owner_id(fc, fl-&gt;fl_owner);</div><div class='add'>+	inarg-&gt;owner = fuse_lock_owner_id(fc, fl-&gt;c.flc_owner);</div><div class='ctx'> 	inarg-&gt;lk.start = fl-&gt;fl_start;</div><div class='ctx'> 	inarg-&gt;lk.end = fl-&gt;fl_end;</div><div class='del'>-	inarg-&gt;lk.type = fl-&gt;fl_type;</div><div class='add'>+	inarg-&gt;lk.type = fl-&gt;c.flc_type;</div><div class='ctx'> 	inarg-&gt;lk.pid = pid;</div><div class='ctx'> 	if (flock)</div><div class='ctx'> 		inarg-&gt;lk_flags |= FUSE_LK_FLOCK;</div><div class='hunk'>@@ -2570,8 +2508,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='ctx'> 	FUSE_ARGS(args);</div><div class='ctx'> 	struct fuse_lk_in inarg;</div><div class='del'>-	int opcode = (fl-&gt;fl_flags &amp; FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK;</div><div class='del'>-	struct pid *pid = fl-&gt;fl_type != F_UNLCK ? task_tgid(current) : NULL;</div><div class='add'>+	int opcode = (fl-&gt;c.flc_flags &amp; FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK;</div><div class='add'>+	struct pid *pid = fl-&gt;c.flc_type != F_UNLCK ? task_tgid(current) : NULL;</div><div class='ctx'> 	pid_t pid_nr = pid_nr_ns(pid, fm-&gt;fc-&gt;pid_ns);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2580,10 +2518,6 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Unlock on close is handled by the flush method */</div><div class='del'>-	if ((fl-&gt;fl_flags &amp; FL_CLOSE_POSIX) == FL_CLOSE_POSIX)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	fuse_lk_fill(&amp;args, file, fl, opcode, pid_nr, flock, &amp;inarg);</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> </div><div class='hunk'>@@ -2871,7 +2805,7 @@ static void fuse_do_truncate(struct file *file)</div><div class='ctx'> 	attr.ia_file = file;</div><div class='ctx'> 	attr.ia_valid |= ATTR_FILE;</div><div class='ctx'> </div><div class='del'>-	fuse_do_setattr(file_dentry(file), &amp;attr, file);</div><div class='add'>+	fuse_do_setattr(file_mnt_idmap(file), file_dentry(file), &amp;attr, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline loff_t fuse_round_up(struct fuse_conn *fc, loff_t off)</div><div class='hunk'>@@ -3014,7 +2948,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	if (block_faults) {</div><div class='ctx'> 		filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='del'>-		err = fuse_dax_break_layouts(inode, 0, 0);</div><div class='add'>+		err = fuse_dax_break_layouts(inode, 0, -1);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3101,6 +3035,8 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 		.flags = flags</div><div class='ctx'> 	};</div><div class='ctx'> 	struct fuse_write_out outarg;</div><div class='add'>+	struct fuse_copy_file_range_out outarg_64;</div><div class='add'>+	u64 bytes_copied;</div><div class='ctx'> 	ssize_t err;</div><div class='ctx'> 	/* mark unstable when write-back is not used, and file_out gets</div><div class='ctx'> 	 * extended */</div><div class='hunk'>@@ -3150,30 +3086,51 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	if (is_unstable)</div><div class='ctx'> 		set_bit(FUSE_I_SIZE_UNSTABLE, &amp;fi_out-&gt;state);</div><div class='ctx'> </div><div class='del'>-	args.opcode = FUSE_COPY_FILE_RANGE;</div><div class='add'>+	args.opcode = FUSE_COPY_FILE_RANGE_64;</div><div class='ctx'> 	args.nodeid = ff_in-&gt;nodeid;</div><div class='ctx'> 	args.in_numargs = 1;</div><div class='ctx'> 	args.in_args[0].size = sizeof(inarg);</div><div class='ctx'> 	args.in_args[0].value = &amp;inarg;</div><div class='ctx'> 	args.out_numargs = 1;</div><div class='del'>-	args.out_args[0].size = sizeof(outarg);</div><div class='del'>-	args.out_args[0].value = &amp;outarg;</div><div class='add'>+	args.out_args[0].size = sizeof(outarg_64);</div><div class='add'>+	args.out_args[0].value = &amp;outarg_64;</div><div class='add'>+	if (fc-&gt;no_copy_file_range_64) {</div><div class='add'>+fallback:</div><div class='add'>+		/* Fall back to old op that can't handle large copy length */</div><div class='add'>+		args.opcode = FUSE_COPY_FILE_RANGE;</div><div class='add'>+		args.out_args[0].size = sizeof(outarg);</div><div class='add'>+		args.out_args[0].value = &amp;outarg;</div><div class='add'>+		inarg.len = len = min_t(size_t, len, UINT_MAX &amp; PAGE_MASK);</div><div class='add'>+	}</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (err == -ENOSYS) {</div><div class='del'>-		fc-&gt;no_copy_file_range = 1;</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='add'>+		if (fc-&gt;no_copy_file_range_64) {</div><div class='add'>+			fc-&gt;no_copy_file_range = 1;</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+		} else {</div><div class='add'>+			fc-&gt;no_copy_file_range_64 = 1;</div><div class='add'>+			goto fallback;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	bytes_copied = fc-&gt;no_copy_file_range_64 ?</div><div class='add'>+		outarg.size : outarg_64.bytes_copied;</div><div class='add'>+</div><div class='add'>+	if (bytes_copied &gt; len) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	truncate_inode_pages_range(inode_out-&gt;i_mapping,</div><div class='ctx'> 				   ALIGN_DOWN(pos_out, PAGE_SIZE),</div><div class='del'>-				   ALIGN(pos_out + outarg.size, PAGE_SIZE) - 1);</div><div class='add'>+				   ALIGN(pos_out + bytes_copied, PAGE_SIZE) - 1);</div><div class='ctx'> </div><div class='ctx'> 	file_update_time(file_out);</div><div class='del'>-	fuse_write_update_attr(inode_out, pos_out + outarg.size, outarg.size);</div><div class='add'>+	fuse_write_update_attr(inode_out, pos_out + bytes_copied, bytes_copied);</div><div class='ctx'> </div><div class='del'>-	err = outarg.size;</div><div class='add'>+	err = bytes_copied;</div><div class='ctx'> out:</div><div class='ctx'> 	if (is_unstable)</div><div class='ctx'> 		clear_bit(FUSE_I_SIZE_UNSTABLE, &amp;fi_out-&gt;state);</div><div class='hunk'>@@ -3213,8 +3170,8 @@ static const struct file_operations fuse_file_operations = {</div><div class='ctx'> 	.lock		= fuse_file_lock,</div><div class='ctx'> 	.get_unmapped_area = thp_get_unmapped_area,</div><div class='ctx'> 	.flock		= fuse_file_flock,</div><div class='del'>-	.splice_read	= filemap_splice_read,</div><div class='del'>-	.splice_write	= iter_file_splice_write,</div><div class='add'>+	.splice_read	= fuse_splice_read,</div><div class='add'>+	.splice_write	= fuse_splice_write,</div><div class='ctx'> 	.unlocked_ioctl	= fuse_file_ioctl,</div><div class='ctx'> 	.compat_ioctl	= fuse_file_compat_ioctl,</div><div class='ctx'> 	.poll		= fuse_file_poll,</div><div class='hunk'>@@ -3225,28 +3182,33 @@ static const struct file_operations fuse_file_operations = {</div><div class='ctx'> static const struct address_space_operations fuse_file_aops  = {</div><div class='ctx'> 	.read_folio	= fuse_read_folio,</div><div class='ctx'> 	.readahead	= fuse_readahead,</div><div class='del'>-	.writepage	= fuse_writepage,</div><div class='ctx'> 	.writepages	= fuse_writepages,</div><div class='ctx'> 	.launder_folio	= fuse_launder_folio,</div><div class='del'>-	.dirty_folio	= filemap_dirty_folio,</div><div class='add'>+	.dirty_folio	= iomap_dirty_folio,</div><div class='add'>+	.release_folio	= iomap_release_folio,</div><div class='add'>+	.invalidate_folio = iomap_invalidate_folio,</div><div class='add'>+	.is_partially_uptodate = iomap_is_partially_uptodate,</div><div class='add'>+	.migrate_folio	= filemap_migrate_folio,</div><div class='ctx'> 	.bmap		= fuse_bmap,</div><div class='ctx'> 	.direct_IO	= fuse_direct_IO,</div><div class='del'>-	.write_begin	= fuse_write_begin,</div><div class='del'>-	.write_end	= fuse_write_end,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void fuse_init_file_inode(struct inode *inode, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_fop = &amp;fuse_file_operations;</div><div class='ctx'> 	inode-&gt;i_data.a_ops = &amp;fuse_file_aops;</div><div class='add'>+	if (fc-&gt;writeback_cache)</div><div class='add'>+		mapping_set_writeback_may_deadlock_on_reclaim(&amp;inode-&gt;i_data);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;write_files);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fi-&gt;queued_writes);</div><div class='ctx'> 	fi-&gt;writectr = 0;</div><div class='add'>+	fi-&gt;iocachectr = 0;</div><div class='ctx'> 	init_waitqueue_head(&amp;fi-&gt;page_waitq);</div><div class='del'>-	fi-&gt;writepages = RB_ROOT;</div><div class='add'>+	init_waitqueue_head(&amp;fi-&gt;direct_io_waitq);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ENABLED(CONFIG_FUSE_DAX))</div><div class='ctx'> 		fuse_dax_inode_init(inode, flags);</div><div class='head'>diff --git a/fs/fuse/fuse_dev_i.h b/fs/fuse/fuse_dev_i.h<br/>new file mode 100644<br/>index 000000000000..134bf44aff0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/fuse_dev_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/fuse_dev_i.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * FUSE: Filesystem in Userspace</div><div class='add'>+ * Copyright (C) 2001-2008  Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _FS_FUSE_DEV_I_H</div><div class='add'>+#define _FS_FUSE_DEV_I_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Ordinary requests have even IDs, while interrupts IDs are odd */</div><div class='add'>+#define FUSE_INT_REQ_BIT (1ULL &lt;&lt; 0)</div><div class='add'>+#define FUSE_REQ_ID_STEP (1ULL &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+extern struct wait_queue_head fuse_dev_waitq;</div><div class='add'>+</div><div class='add'>+struct fuse_arg;</div><div class='add'>+struct fuse_args;</div><div class='add'>+struct fuse_pqueue;</div><div class='add'>+struct fuse_req;</div><div class='add'>+struct fuse_iqueue;</div><div class='add'>+struct fuse_forget_link;</div><div class='add'>+</div><div class='add'>+struct fuse_copy_state {</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+	struct iov_iter *iter;</div><div class='add'>+	struct pipe_buffer *pipebufs;</div><div class='add'>+	struct pipe_buffer *currbuf;</div><div class='add'>+	struct pipe_inode_info *pipe;</div><div class='add'>+	unsigned long nr_segs;</div><div class='add'>+	struct page *pg;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	bool write:1;</div><div class='add'>+	bool move_folios:1;</div><div class='add'>+	bool is_uring:1;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int copied_sz; /* copied size into the user buffer */</div><div class='add'>+	} ring;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FUSE_DEV_SYNC_INIT ((struct fuse_dev *) 1)</div><div class='add'>+#define FUSE_DEV_PTR_MASK (~1UL)</div><div class='add'>+</div><div class='add'>+static inline struct fuse_dev *__fuse_get_dev(struct file *file)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Lockless access is OK, because file-&gt;private data is set</div><div class='add'>+	 * once during mount and is valid until the file is released.</div><div class='add'>+	 */</div><div class='add'>+	struct fuse_dev *fud = READ_ONCE(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	return (typeof(fud)) ((unsigned long) fud &amp; FUSE_DEV_PTR_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fuse_dev *fuse_get_dev(struct file *file);</div><div class='add'>+</div><div class='add'>+unsigned int fuse_req_hash(u64 unique);</div><div class='add'>+struct fuse_req *fuse_request_find(struct fuse_pqueue *fpq, u64 unique);</div><div class='add'>+</div><div class='add'>+void fuse_dev_end_requests(struct list_head *head);</div><div class='add'>+</div><div class='add'>+void fuse_copy_init(struct fuse_copy_state *cs, bool write,</div><div class='add'>+			   struct iov_iter *iter);</div><div class='add'>+void fuse_copy_finish(struct fuse_copy_state *cs);</div><div class='add'>+int fuse_copy_args(struct fuse_copy_state *cs, unsigned int numargs,</div><div class='add'>+		   unsigned int argpages, struct fuse_arg *args,</div><div class='add'>+		   int zeroing);</div><div class='add'>+int fuse_copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,</div><div class='add'>+		       unsigned int nbytes);</div><div class='add'>+void fuse_dev_queue_forget(struct fuse_iqueue *fiq,</div><div class='add'>+			   struct fuse_forget_link *forget);</div><div class='add'>+void fuse_dev_queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req);</div><div class='add'>+bool fuse_remove_pending_req(struct fuse_req *req, spinlock_t *lock);</div><div class='add'>+</div><div class='add'>+bool fuse_request_expired(struct fuse_conn *fc, struct list_head *list);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h<br/>index 1df83eebda92..7f16049387d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/fuse_i.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/fuse_i.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/fuse_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/fuse_i.h</a></div><div class='hunk'>@@ -35,18 +35,45 @@</div><div class='ctx'> /** Default max number of pages that can be used in a single read request */</div><div class='ctx'> #define FUSE_DEFAULT_MAX_PAGES_PER_REQ 32</div><div class='ctx'> </div><div class='del'>-/** Maximum of max_pages received in init_out */</div><div class='del'>-#define FUSE_MAX_MAX_PAGES 256</div><div class='del'>-</div><div class='ctx'> /** Bias for fi-&gt;writectr, meaning new writepages must not be sent */</div><div class='ctx'> #define FUSE_NOWRITE INT_MIN</div><div class='ctx'> </div><div class='del'>-/** It could be as large as PATH_MAX, but would that have any uses? */</div><div class='del'>-#define FUSE_NAME_MAX 1024</div><div class='add'>+/** Maximum length of a filename, not including terminating null */</div><div class='add'>+</div><div class='add'>+/* maximum, small enough for FUSE_MIN_READ_BUFFER*/</div><div class='add'>+#define FUSE_NAME_LOW_MAX 1024</div><div class='add'>+/* maximum, but needs a request buffer &gt; FUSE_MIN_READ_BUFFER */</div><div class='add'>+#define FUSE_NAME_MAX (PATH_MAX - 1)</div><div class='ctx'> </div><div class='ctx'> /** Number of dentries for each connection in the control filesystem */</div><div class='ctx'> #define FUSE_CTL_NUM_DENTRIES 5</div><div class='ctx'> </div><div class='add'>+/* Frequency (in seconds) of request timeout checks, if opted into */</div><div class='add'>+#define FUSE_TIMEOUT_TIMER_FREQ 15</div><div class='add'>+</div><div class='add'>+/** Frequency (in jiffies) of request timeout checks, if opted into */</div><div class='add'>+extern const unsigned long fuse_timeout_timer_freq;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Dentries invalidation workqueue period, in seconds.  The value of this</div><div class='add'>+ * parameter shall be &gt;= FUSE_DENTRY_INVAL_FREQ_MIN seconds, or 0 (zero), in</div><div class='add'>+ * which case no workqueue will be created.</div><div class='add'>+ */</div><div class='add'>+extern unsigned inval_wq __read_mostly;</div><div class='add'>+</div><div class='add'>+/** Maximum of max_pages received in init_out */</div><div class='add'>+extern unsigned int fuse_max_pages_limit;</div><div class='add'>+/*</div><div class='add'>+ * Default timeout (in seconds) for the server to reply to a request</div><div class='add'>+ * before the connection is aborted, if no timeout was specified on mount.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int fuse_default_req_timeout;</div><div class='add'>+/*</div><div class='add'>+ * Max timeout (in seconds) for the server to reply to a request before</div><div class='add'>+ * the connection is aborted.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int fuse_max_req_timeout;</div><div class='add'>+</div><div class='ctx'> /** List of active connections */</div><div class='ctx'> extern struct list_head fuse_conn_list;</div><div class='ctx'> </div><div class='hunk'>@@ -54,8 +81,8 @@ extern struct list_head fuse_conn_list;</div><div class='ctx'> extern struct mutex fuse_mutex;</div><div class='ctx'> </div><div class='ctx'> /** Module parameters */</div><div class='del'>-extern unsigned max_user_bgreq;</div><div class='del'>-extern unsigned max_user_congthresh;</div><div class='add'>+extern unsigned int max_user_bgreq;</div><div class='add'>+extern unsigned int max_user_congthresh;</div><div class='ctx'> </div><div class='ctx'> /* One forget request */</div><div class='ctx'> struct fuse_forget_link {</div><div class='hunk'>@@ -76,6 +103,16 @@ struct fuse_submount_lookup {</div><div class='ctx'> 	struct fuse_forget_link *forget;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/** Container for data related to mapping to backing file */</div><div class='add'>+struct fuse_backing {</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct cred *cred;</div><div class='add'>+</div><div class='add'>+	/** refcount */</div><div class='add'>+	refcount_t count;</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /** FUSE inode */</div><div class='ctx'> struct fuse_inode {</div><div class='ctx'> 	/** Inode data */</div><div class='hunk'>@@ -111,7 +148,7 @@ struct fuse_inode {</div><div class='ctx'> 	u64 attr_version;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='del'>-		/* Write related fields (regular file only) */</div><div class='add'>+		/* read/write io cache (regular file only) */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			/* Files usable in writepage.  Protected by fi-&gt;lock */</div><div class='ctx'> 			struct list_head write_files;</div><div class='hunk'>@@ -123,11 +160,14 @@ struct fuse_inode {</div><div class='ctx'> 			 * (FUSE_NOWRITE) means more writes are blocked */</div><div class='ctx'> 			int writectr;</div><div class='ctx'> </div><div class='add'>+			/** Number of files/maps using page cache */</div><div class='add'>+			int iocachectr;</div><div class='add'>+</div><div class='ctx'> 			/* Waitq for writepage completion */</div><div class='ctx'> 			wait_queue_head_t page_waitq;</div><div class='ctx'> </div><div class='del'>-			/* List of writepage requestst (pending or sent) */</div><div class='del'>-			struct rb_root writepages;</div><div class='add'>+			/* waitq for direct-io completion */</div><div class='add'>+			wait_queue_head_t direct_io_waitq;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* readdir cache (directory only) */</div><div class='hunk'>@@ -173,6 +213,16 @@ struct fuse_inode {</div><div class='ctx'> #endif</div><div class='ctx'> 	/** Submount specific lookup tracking */</div><div class='ctx'> 	struct fuse_submount_lookup *submount_lookup;</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+	/** Reference to backing file in passthrough mode */</div><div class='add'>+	struct fuse_backing *fb;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The underlying inode-&gt;i_blkbits value will not be modified,</div><div class='add'>+	 * so preserve the blocksize specified by the server.</div><div class='add'>+	 */</div><div class='add'>+	u8 cached_i_blkbits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** FUSE inode state bits */</div><div class='hunk'>@@ -187,19 +237,26 @@ enum {</div><div class='ctx'> 	FUSE_I_BAD,</div><div class='ctx'> 	/* Has btime */</div><div class='ctx'> 	FUSE_I_BTIME,</div><div class='add'>+	/* Wants or already has page cache IO */</div><div class='add'>+	FUSE_I_CACHE_IO_MODE,</div><div class='add'>+	/*</div><div class='add'>+	 * Client has exclusive access to the inode, either because fs is local</div><div class='add'>+	 * or the fuse server has an exclusive "lease" on distributed fs</div><div class='add'>+	 */</div><div class='add'>+	FUSE_I_EXCLUSIVE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fuse_conn;</div><div class='ctx'> struct fuse_mount;</div><div class='del'>-struct fuse_release_args;</div><div class='add'>+union fuse_file_args;</div><div class='ctx'> </div><div class='ctx'> /** FUSE specific file data */</div><div class='ctx'> struct fuse_file {</div><div class='ctx'> 	/** Fuse connection for this file */</div><div class='ctx'> 	struct fuse_mount *fm;</div><div class='ctx'> </div><div class='del'>-	/* Argument space reserved for release */</div><div class='del'>-	struct fuse_release_args *release_args;</div><div class='add'>+	/* Argument space reserved for open/release */</div><div class='add'>+	union fuse_file_args *args;</div><div class='ctx'> </div><div class='ctx'> 	/** Kernel file handle guaranteed to be unique */</div><div class='ctx'> 	u64 kh;</div><div class='hunk'>@@ -221,12 +278,6 @@ struct fuse_file {</div><div class='ctx'> </div><div class='ctx'> 	/* Readdir related */</div><div class='ctx'> 	struct {</div><div class='del'>-		/*</div><div class='del'>-		 * Protects below fields against (crazy) parallel readdir on</div><div class='del'>-		 * same open file.  Uncontended in the normal case.</div><div class='del'>-		 */</div><div class='del'>-		struct mutex lock;</div><div class='del'>-</div><div class='ctx'> 		/* Dir stream position */</div><div class='ctx'> 		loff_t pos;</div><div class='ctx'> </div><div class='hunk'>@@ -244,6 +295,15 @@ struct fuse_file {</div><div class='ctx'> 	/** Wait queue head for poll */</div><div class='ctx'> 	wait_queue_head_t poll_wait;</div><div class='ctx'> </div><div class='add'>+	/** Does file hold a fi-&gt;iocachectr refcount? */</div><div class='add'>+	enum { IOM_NONE, IOM_CACHED, IOM_UNCACHED } iomode;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+	/** Reference to backing file in passthrough mode */</div><div class='add'>+	struct file *passthrough;</div><div class='add'>+	const struct cred *cred;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/** Has flock been performed on this file? */</div><div class='ctx'> 	bool flock:1;</div><div class='ctx'> };</div><div class='hunk'>@@ -260,8 +320,8 @@ struct fuse_arg {</div><div class='ctx'> 	void *value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** FUSE page descriptor */</div><div class='del'>-struct fuse_page_desc {</div><div class='add'>+/** FUSE folio descriptor */</div><div class='add'>+struct fuse_folio_desc {</div><div class='ctx'> 	unsigned int length;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> };</div><div class='hunk'>@@ -283,16 +343,33 @@ struct fuse_args {</div><div class='ctx'> 	bool page_replace:1;</div><div class='ctx'> 	bool may_block:1;</div><div class='ctx'> 	bool is_ext:1;</div><div class='del'>-	struct fuse_in_arg in_args[3];</div><div class='add'>+	bool is_pinned:1;</div><div class='add'>+	bool invalidate_vmap:1;</div><div class='add'>+	struct fuse_in_arg in_args[4];</div><div class='ctx'> 	struct fuse_arg out_args[2];</div><div class='ctx'> 	void (*end)(struct fuse_mount *fm, struct fuse_args *args, int error);</div><div class='add'>+	/* Used for kvec iter backed by vmalloc address */</div><div class='add'>+	void *vmap_base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fuse_args_pages {</div><div class='ctx'> 	struct fuse_args args;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	struct fuse_page_desc *descs;</div><div class='del'>-	unsigned int num_pages;</div><div class='add'>+	struct folio **folios;</div><div class='add'>+	struct fuse_folio_desc *descs;</div><div class='add'>+	unsigned int num_folios;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fuse_release_args {</div><div class='add'>+	struct fuse_args args;</div><div class='add'>+	struct fuse_release_in inarg;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union fuse_file_args {</div><div class='add'>+	/* Used during open() */</div><div class='add'>+	struct fuse_open_out open_outarg;</div><div class='add'>+	/* Used during release() */</div><div class='add'>+	struct fuse_release_args release_args;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FUSE_ARGS(args) struct fuse_args args = {}</div><div class='hunk'>@@ -336,6 +413,7 @@ struct fuse_io_priv {</div><div class='ctx'>  * FR_FINISHED:		request is finished</div><div class='ctx'>  * FR_PRIVATE:		request is on private list</div><div class='ctx'>  * FR_ASYNC:		request is asynchronous</div><div class='add'>+ * FR_URING:		request is handled through fuse-io-uring</div><div class='ctx'>  */</div><div class='ctx'> enum fuse_req_flag {</div><div class='ctx'> 	FR_ISREPLY,</div><div class='hunk'>@@ -350,6 +428,7 @@ enum fuse_req_flag {</div><div class='ctx'> 	FR_FINISHED,</div><div class='ctx'> 	FR_PRIVATE,</div><div class='ctx'> 	FR_ASYNC,</div><div class='add'>+	FR_URING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -396,6 +475,13 @@ struct fuse_req {</div><div class='ctx'> </div><div class='ctx'> 	/** fuse_mount this request belongs to */</div><div class='ctx'> 	struct fuse_mount *fm;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUSE_IO_URING</div><div class='add'>+	void *ring_entry;</div><div class='add'>+	void *ring_queue;</div><div class='add'>+#endif</div><div class='add'>+	/** When (in jiffies) the request was created */</div><div class='add'>+	unsigned long create_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fuse_iqueue;</div><div class='hunk'>@@ -410,22 +496,19 @@ struct fuse_iqueue;</div><div class='ctx'>  */</div><div class='ctx'> struct fuse_iqueue_ops {</div><div class='ctx'> 	/**</div><div class='del'>-	 * Signal that a forget has been queued</div><div class='add'>+	 * Send one forget</div><div class='ctx'> 	 */</div><div class='del'>-	void (*wake_forget_and_unlock)(struct fuse_iqueue *fiq)</div><div class='del'>-		__releases(fiq-&gt;lock);</div><div class='add'>+	void (*send_forget)(struct fuse_iqueue *fiq, struct fuse_forget_link *link);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * Signal that an INTERRUPT request has been queued</div><div class='add'>+	 * Send interrupt for request</div><div class='ctx'> 	 */</div><div class='del'>-	void (*wake_interrupt_and_unlock)(struct fuse_iqueue *fiq)</div><div class='del'>-		__releases(fiq-&gt;lock);</div><div class='add'>+	void (*send_interrupt)(struct fuse_iqueue *fiq, struct fuse_req *req);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * Signal that a request has been queued</div><div class='add'>+	 * Send one request</div><div class='ctx'> 	 */</div><div class='del'>-	void (*wake_pending_and_unlock)(struct fuse_iqueue *fiq)</div><div class='del'>-		__releases(fiq-&gt;lock);</div><div class='add'>+	void (*send_req)(struct fuse_iqueue *fiq, struct fuse_req *req);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * Clean up when fuse_iqueue is destroyed</div><div class='hunk'>@@ -568,6 +651,11 @@ struct fuse_conn {</div><div class='ctx'> 	/** Number of fuse_dev's */</div><div class='ctx'> 	atomic_t dev_count;</div><div class='ctx'> </div><div class='add'>+	/** Current epoch for up-to-date dentries */</div><div class='add'>+	atomic_t epoch;</div><div class='add'>+</div><div class='add'>+	struct work_struct epoch_work;</div><div class='add'>+</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> </div><div class='ctx'> 	/** The user id for this mount */</div><div class='hunk'>@@ -782,6 +870,9 @@ struct fuse_conn {</div><div class='ctx'> 	/** Does the filesystem support copy_file_range? */</div><div class='ctx'> 	unsigned no_copy_file_range:1;</div><div class='ctx'> </div><div class='add'>+	/** Does the filesystem support copy_file_range_64? */</div><div class='add'>+	unsigned no_copy_file_range_64:1;</div><div class='add'>+</div><div class='ctx'> 	/* Send DESTROY request */</div><div class='ctx'> 	unsigned int destroy:1;</div><div class='ctx'> </div><div class='hunk'>@@ -818,30 +909,48 @@ struct fuse_conn {</div><div class='ctx'> 	/* Is statx not implemented by fs? */</div><div class='ctx'> 	unsigned int no_statx:1;</div><div class='ctx'> </div><div class='add'>+	/** Passthrough support for read/write IO */</div><div class='add'>+	unsigned int passthrough:1;</div><div class='add'>+</div><div class='add'>+	/* Use pages instead of pointer for kernel I/O */</div><div class='add'>+	unsigned int use_pages_for_kvec_io:1;</div><div class='add'>+</div><div class='add'>+	/* Is link not implemented by fs? */</div><div class='add'>+	unsigned int no_link:1;</div><div class='add'>+</div><div class='add'>+	/* Is synchronous FUSE_INIT allowed? */</div><div class='add'>+	unsigned int sync_init:1;</div><div class='add'>+</div><div class='add'>+	/* Use io_uring for communication */</div><div class='add'>+	unsigned int io_uring;</div><div class='add'>+</div><div class='add'>+	/** Maximum stack depth for passthrough backing files */</div><div class='add'>+	int max_stack_depth;</div><div class='add'>+</div><div class='ctx'> 	/** The number of requests waiting for completion */</div><div class='ctx'> 	atomic_t num_waiting;</div><div class='ctx'> </div><div class='ctx'> 	/** Negotiated minor version */</div><div class='ctx'> 	unsigned minor;</div><div class='ctx'> </div><div class='del'>-	/** Entry on the fuse_mount_list */</div><div class='add'>+	/** Entry on the fuse_conn_list */</div><div class='ctx'> 	struct list_head entry;</div><div class='ctx'> </div><div class='ctx'> 	/** Device ID from the root super block */</div><div class='ctx'> 	dev_t dev;</div><div class='ctx'> </div><div class='del'>-	/** Dentries in the control filesystem */</div><div class='del'>-	struct dentry *ctl_dentry[FUSE_CTL_NUM_DENTRIES];</div><div class='del'>-</div><div class='del'>-	/** number of dentries used in the above array */</div><div class='del'>-	int ctl_ndents;</div><div class='del'>-</div><div class='ctx'> 	/** Key for lock owner ID scrambling */</div><div class='ctx'> 	u32 scramble_key[4];</div><div class='ctx'> </div><div class='ctx'> 	/** Version counter for attribute changes */</div><div class='ctx'> 	atomic64_t attr_version;</div><div class='ctx'> </div><div class='add'>+	/** Version counter for evict inode */</div><div class='add'>+	atomic64_t evict_ctr;</div><div class='add'>+</div><div class='add'>+	/* maximum file name length */</div><div class='add'>+	u32 name_max;</div><div class='add'>+</div><div class='ctx'> 	/** Called on final put */</div><div class='ctx'> 	void (*release)(struct fuse_conn *);</div><div class='ctx'> </div><div class='hunk'>@@ -867,6 +976,25 @@ struct fuse_conn {</div><div class='ctx'> </div><div class='ctx'> 	/* New writepages go into this bucket */</div><div class='ctx'> 	struct fuse_sync_bucket __rcu *curr_bucket;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+	/** IDR for backing files ids */</div><div class='add'>+	struct idr backing_files_map;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUSE_IO_URING</div><div class='add'>+	/**  uring connection information*/</div><div class='add'>+	struct fuse_ring *ring;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/** Only used if the connection opts into request timeouts */</div><div class='add'>+	struct {</div><div class='add'>+		/* Worker for checking if any requests have timed out */</div><div class='add'>+		struct delayed_work work;</div><div class='add'>+</div><div class='add'>+		/* Request timeout (in jiffies). 0 = no timeout */</div><div class='add'>+		unsigned int req_timeout;</div><div class='add'>+	} timeout;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -888,8 +1016,22 @@ struct fuse_mount {</div><div class='ctx'> </div><div class='ctx'> 	/* Entry on fc-&gt;mounts */</div><div class='ctx'> 	struct list_head fc_entry;</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Empty header for FUSE opcodes without specific header needs.</div><div class='add'>+ * Used as a placeholder in args-&gt;in_args[0] for consistency</div><div class='add'>+ * across all FUSE operations, simplifying request handling.</div><div class='add'>+ */</div><div class='add'>+struct fuse_zero_header {};</div><div class='add'>+</div><div class='add'>+static inline void fuse_set_zero_arg0(struct fuse_args *args)</div><div class='add'>+{</div><div class='add'>+	args-&gt;in_args[0].size = sizeof(struct fuse_zero_header);</div><div class='add'>+	args-&gt;in_args[0].value = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct fuse_mount *get_fuse_mount_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	return sb-&gt;s_fs_info;</div><div class='hunk'>@@ -910,7 +1052,7 @@ static inline struct fuse_conn *get_fuse_conn(struct inode *inode)</div><div class='ctx'> 	return get_fuse_mount_super(inode-&gt;i_sb)-&gt;fc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct fuse_inode *get_fuse_inode(struct inode *inode)</div><div class='add'>+static inline struct fuse_inode *get_fuse_inode(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(inode, struct fuse_inode, inode);</div><div class='ctx'> }</div><div class='hunk'>@@ -930,6 +1072,11 @@ static inline u64 fuse_get_attr_version(struct fuse_conn *fc)</div><div class='ctx'> 	return atomic64_read(&amp;fc-&gt;attr_version);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 fuse_get_evict_ctr(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	return atomic64_read(&amp;fc-&gt;evict_ctr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool fuse_stale_inode(const struct inode *inode, int generation,</div><div class='ctx'> 				    struct fuse_attr *attr)</div><div class='ctx'> {</div><div class='hunk'>@@ -939,7 +1086,6 @@ static inline bool fuse_stale_inode(const struct inode *inode, int generation,</div><div class='ctx'> </div><div class='ctx'> static inline void fuse_make_bad(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	remove_inode_hash(inode);</div><div class='ctx'> 	set_bit(FUSE_I_BAD, &amp;get_fuse_inode(inode)-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -948,25 +1094,32 @@ static inline bool fuse_is_bad(struct inode *inode)</div><div class='ctx'> 	return unlikely(test_bit(FUSE_I_BAD, &amp;get_fuse_inode(inode)-&gt;state));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags,</div><div class='del'>-					     struct fuse_page_desc **desc)</div><div class='add'>+static inline bool fuse_inode_is_exclusive(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	const struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	return test_bit(FUSE_I_EXCLUSIVE, &amp;fi-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct folio **fuse_folios_alloc(unsigned int nfolios, gfp_t flags,</div><div class='add'>+					       struct fuse_folio_desc **desc)</div><div class='ctx'> {</div><div class='del'>-	struct page **pages;</div><div class='add'>+	struct folio **folios;</div><div class='ctx'> </div><div class='del'>-	pages = kzalloc(npages * (sizeof(struct page *) +</div><div class='del'>-				  sizeof(struct fuse_page_desc)), flags);</div><div class='del'>-	*desc = (void *) (pages + npages);</div><div class='add'>+	folios = kzalloc(nfolios * (sizeof(struct folio *) +</div><div class='add'>+				    sizeof(struct fuse_folio_desc)), flags);</div><div class='add'>+	*desc = (void *) (folios + nfolios);</div><div class='ctx'> </div><div class='del'>-	return pages;</div><div class='add'>+	return folios;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void fuse_page_descs_length_init(struct fuse_page_desc *descs,</div><div class='del'>-					       unsigned int index,</div><div class='del'>-					       unsigned int nr_pages)</div><div class='add'>+static inline void fuse_folio_descs_length_init(struct fuse_folio_desc *descs,</div><div class='add'>+						unsigned int index,</div><div class='add'>+						unsigned int nr_folios)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = index; i &lt; index + nr_pages; i++)</div><div class='add'>+	for (i = index; i &lt; index + nr_folios; i++)</div><div class='ctx'> 		descs[i].length = PAGE_SIZE - descs[i].offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -983,14 +1136,14 @@ static inline void fuse_sync_bucket_dec(struct fuse_sync_bucket *bucket)</div><div class='ctx'> extern const struct file_operations fuse_dev_operations;</div><div class='ctx'> </div><div class='ctx'> extern const struct dentry_operations fuse_dentry_operations;</div><div class='del'>-extern const struct dentry_operations fuse_root_dentry_operations;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Get a filled in inode</div><div class='ctx'>  */</div><div class='ctx'> struct inode *fuse_iget(struct super_block *sb, u64 nodeid,</div><div class='ctx'> 			int generation, struct fuse_attr *attr,</div><div class='del'>-			u64 attr_valid, u64 attr_version);</div><div class='add'>+			u64 attr_valid, u64 attr_version,</div><div class='add'>+			u64 evict_ctr);</div><div class='ctx'> </div><div class='ctx'> int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name,</div><div class='ctx'> 		     struct fuse_entry_out *outarg, struct inode **inode);</div><div class='hunk'>@@ -1003,10 +1156,6 @@ void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget,</div><div class='ctx'> </div><div class='ctx'> struct fuse_forget_link *fuse_alloc_forget(void);</div><div class='ctx'> </div><div class='del'>-struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq,</div><div class='del'>-					     unsigned int max,</div><div class='del'>-					     unsigned int *countp);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize READ or READDIR request</div><div class='ctx'>  */</div><div class='hunk'>@@ -1019,7 +1168,7 @@ struct fuse_io_args {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct fuse_write_in in;</div><div class='ctx'> 			struct fuse_write_out out;</div><div class='del'>-			bool page_locked;</div><div class='add'>+			bool folio_locked;</div><div class='ctx'> 		} write;</div><div class='ctx'> 	};</div><div class='ctx'> 	struct fuse_args_pages ap;</div><div class='hunk'>@@ -1031,14 +1180,9 @@ void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos,</div><div class='ctx'> 			 size_t count, int opcode);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Send OPEN or OPENDIR request</div><div class='del'>- */</div><div class='del'>-int fuse_open_common(struct inode *inode, struct file *file, bool isdir);</div><div class='del'>-</div><div class='del'>-struct fuse_file *fuse_file_alloc(struct fuse_mount *fm);</div><div class='add'>+struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release);</div><div class='ctx'> void fuse_file_free(struct fuse_file *ff);</div><div class='del'>-void fuse_finish_open(struct inode *inode, struct file *file);</div><div class='add'>+int fuse_finish_open(struct inode *inode, struct file *file);</div><div class='ctx'> </div><div class='ctx'> void fuse_sync_release(struct fuse_inode *fi, struct fuse_file *ff,</div><div class='ctx'> 		       unsigned int flags);</div><div class='hunk'>@@ -1089,7 +1233,8 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,</div><div class='ctx'> </div><div class='ctx'> void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr,</div><div class='ctx'> 				   struct fuse_statx *sx,</div><div class='del'>-				   u64 attr_valid, u32 cache_mask);</div><div class='add'>+				   u64 attr_valid, u32 cache_mask,</div><div class='add'>+				   u64 evict_ctr);</div><div class='ctx'> </div><div class='ctx'> u32 fuse_get_cache_mask(struct inode *inode);</div><div class='ctx'> </div><div class='hunk'>@@ -1109,11 +1254,31 @@ void __exit fuse_ctl_cleanup(void);</div><div class='ctx'> /**</div><div class='ctx'>  * Simple request sending that does request allocation and freeing</div><div class='ctx'>  */</div><div class='del'>-ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args);</div><div class='add'>+ssize_t __fuse_simple_request(struct mnt_idmap *idmap,</div><div class='add'>+			      struct fuse_mount *fm,</div><div class='add'>+			      struct fuse_args *args);</div><div class='add'>+</div><div class='add'>+static inline ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)</div><div class='add'>+{</div><div class='add'>+	return __fuse_simple_request(&amp;invalid_mnt_idmap, fm, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline ssize_t fuse_simple_idmap_request(struct mnt_idmap *idmap,</div><div class='add'>+						struct fuse_mount *fm,</div><div class='add'>+						struct fuse_args *args)</div><div class='add'>+{</div><div class='add'>+	return __fuse_simple_request(idmap, fm, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 			   gfp_t gfp_flags);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * Assign a unique id to a fuse request</div><div class='add'>+ */</div><div class='add'>+void fuse_request_assign_unique(struct fuse_iqueue *fiq, struct fuse_req *req);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * End a finished request</div><div class='ctx'>  */</div><div class='ctx'> void fuse_request_end(struct fuse_req *req);</div><div class='hunk'>@@ -1122,6 +1287,14 @@ void fuse_request_end(struct fuse_req *req);</div><div class='ctx'> void fuse_abort_conn(struct fuse_conn *fc);</div><div class='ctx'> void fuse_wait_aborted(struct fuse_conn *fc);</div><div class='ctx'> </div><div class='add'>+/* Check if any requests timed out */</div><div class='add'>+void fuse_check_timeout(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+void fuse_dentry_tree_init(void);</div><div class='add'>+void fuse_dentry_tree_cleanup(void);</div><div class='add'>+</div><div class='add'>+void fuse_epoch_work(struct work_struct *work);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Invalidate inode attributes</div><div class='ctx'>  */</div><div class='hunk'>@@ -1151,6 +1324,11 @@ void fuse_change_entry_timeout(struct dentry *entry, struct fuse_entry_out *o);</div><div class='ctx'> struct fuse_conn *fuse_conn_get(struct fuse_conn *fc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * Initialize the fuse processing queue</div><div class='add'>+ */</div><div class='add'>+void fuse_pqueue_init(struct fuse_pqueue *fpq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * Initialize fuse_conn</div><div class='ctx'>  */</div><div class='ctx'> void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,</div><div class='hunk'>@@ -1166,7 +1344,7 @@ struct fuse_dev *fuse_dev_alloc_install(struct fuse_conn *fc);</div><div class='ctx'> struct fuse_dev *fuse_dev_alloc(void);</div><div class='ctx'> void fuse_dev_install(struct fuse_dev *fud, struct fuse_conn *fc);</div><div class='ctx'> void fuse_dev_free(struct fuse_dev *fud);</div><div class='del'>-void fuse_send_init(struct fuse_mount *fm);</div><div class='add'>+int fuse_send_init(struct fuse_mount *fm);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Fill in superblock and initialize fuse connection</div><div class='hunk'>@@ -1258,6 +1436,12 @@ int fuse_reverse_inval_inode(struct fuse_conn *fc, u64 nodeid,</div><div class='ctx'> int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid,</div><div class='ctx'> 			     u64 child_nodeid, struct qstr *name, u32 flags);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Try to prune this inode.  If neither the inode itself nor dentries associated</div><div class='add'>+ * with this inode have any external reference, then the inode can be freed.</div><div class='add'>+ */</div><div class='add'>+void fuse_try_prune_one_inode(struct fuse_conn *fc, u64 nodeid);</div><div class='add'>+</div><div class='ctx'> int fuse_do_open(struct fuse_mount *fm, u64 nodeid, struct file *file,</div><div class='ctx'> 		 bool isdir);</div><div class='ctx'> </div><div class='hunk'>@@ -1285,8 +1469,8 @@ bool fuse_write_update_attr(struct inode *inode, loff_t pos, ssize_t written);</div><div class='ctx'> int fuse_flush_times(struct inode *inode, struct fuse_file *ff);</div><div class='ctx'> int fuse_write_inode(struct inode *inode, struct writeback_control *wbc);</div><div class='ctx'> </div><div class='del'>-int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,</div><div class='del'>-		    struct file *file);</div><div class='add'>+int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		    struct iattr *attr, struct file *file);</div><div class='ctx'> </div><div class='ctx'> void fuse_set_initialized(struct fuse_conn *fc);</div><div class='ctx'> </div><div class='hunk'>@@ -1344,15 +1528,100 @@ void fuse_dax_cancel_work(struct fuse_conn *fc);</div><div class='ctx'> long fuse_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='ctx'> long fuse_file_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 			    unsigned long arg);</div><div class='del'>-int fuse_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int fuse_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int fuse_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> </div><div class='del'>-/* file.c */</div><div class='add'>+/* iomode.c */</div><div class='add'>+int fuse_file_cached_io_open(struct inode *inode, struct fuse_file *ff);</div><div class='add'>+int fuse_inode_uncached_io_start(struct fuse_inode *fi,</div><div class='add'>+				 struct fuse_backing *fb);</div><div class='add'>+void fuse_inode_uncached_io_end(struct fuse_inode *fi);</div><div class='ctx'> </div><div class='add'>+int fuse_file_io_open(struct file *file, struct inode *inode);</div><div class='add'>+void fuse_file_io_release(struct fuse_file *ff, struct inode *inode);</div><div class='add'>+</div><div class='add'>+/* file.c */</div><div class='ctx'> struct fuse_file *fuse_file_open(struct fuse_mount *fm, u64 nodeid,</div><div class='ctx'> 				 unsigned int open_flags, bool isdir);</div><div class='ctx'> void fuse_file_release(struct inode *inode, struct fuse_file *ff,</div><div class='ctx'> 		       unsigned int open_flags, fl_owner_t id, bool isdir);</div><div class='ctx'> </div><div class='add'>+/* backing.c */</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+struct fuse_backing *fuse_backing_get(struct fuse_backing *fb);</div><div class='add'>+void fuse_backing_put(struct fuse_backing *fb);</div><div class='add'>+struct fuse_backing *fuse_backing_lookup(struct fuse_conn *fc, int backing_id);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline struct fuse_backing *fuse_backing_get(struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fuse_backing_put(struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline struct fuse_backing *fuse_backing_lookup(struct fuse_conn *fc,</div><div class='add'>+						       int backing_id)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void fuse_backing_files_init(struct fuse_conn *fc);</div><div class='add'>+void fuse_backing_files_free(struct fuse_conn *fc);</div><div class='add'>+int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map);</div><div class='add'>+int fuse_backing_close(struct fuse_conn *fc, int backing_id);</div><div class='add'>+</div><div class='add'>+/* passthrough.c */</div><div class='add'>+static inline struct fuse_backing *fuse_inode_backing(struct fuse_inode *fi)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+	return READ_ONCE(fi-&gt;fb);</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct fuse_backing *fuse_inode_backing_set(struct fuse_inode *fi,</div><div class='add'>+							  struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+	return xchg(&amp;fi-&gt;fb, fb);</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fuse_backing *fuse_passthrough_open(struct file *file, int backing_id);</div><div class='add'>+void fuse_passthrough_release(struct fuse_file *ff, struct fuse_backing *fb);</div><div class='add'>+</div><div class='add'>+static inline struct file *fuse_file_passthrough(struct fuse_file *ff)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FUSE_PASSTHROUGH</div><div class='add'>+	return ff-&gt;passthrough;</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter);</div><div class='add'>+ssize_t fuse_passthrough_write_iter(struct kiocb *iocb, struct iov_iter *iter);</div><div class='add'>+ssize_t fuse_passthrough_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+				     struct pipe_inode_info *pipe,</div><div class='add'>+				     size_t len, unsigned int flags);</div><div class='add'>+ssize_t fuse_passthrough_splice_write(struct pipe_inode_info *pipe,</div><div class='add'>+				      struct file *out, loff_t *ppos,</div><div class='add'>+				      size_t len, unsigned int flags);</div><div class='add'>+ssize_t fuse_passthrough_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+extern int fuse_sysctl_register(void);</div><div class='add'>+extern void fuse_sysctl_unregister(void);</div><div class='add'>+#else</div><div class='add'>+#define fuse_sysctl_register()		(0)</div><div class='add'>+#define fuse_sysctl_unregister()	do { } while (0)</div><div class='add'>+#endif /* CONFIG_SYSCTL */</div><div class='add'>+</div><div class='ctx'> #endif /* _FS_FUSE_I_H */</div><div class='head'>diff --git a/fs/fuse/fuse_trace.h b/fs/fuse/fuse_trace.h<br/>new file mode 100644<br/>index 000000000000..bbe9ddd8c716<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/fuse_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/fuse_trace.h</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM fuse</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_FUSE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _TRACE_FUSE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+#define OPCODES							\</div><div class='add'>+	EM( FUSE_LOOKUP,		"FUSE_LOOKUP")		\</div><div class='add'>+	EM( FUSE_FORGET,		"FUSE_FORGET")		\</div><div class='add'>+	EM( FUSE_GETATTR,		"FUSE_GETATTR")		\</div><div class='add'>+	EM( FUSE_SETATTR,		"FUSE_SETATTR")		\</div><div class='add'>+	EM( FUSE_READLINK,		"FUSE_READLINK")	\</div><div class='add'>+	EM( FUSE_SYMLINK,		"FUSE_SYMLINK")		\</div><div class='add'>+	EM( FUSE_MKNOD,			"FUSE_MKNOD")		\</div><div class='add'>+	EM( FUSE_MKDIR,			"FUSE_MKDIR")		\</div><div class='add'>+	EM( FUSE_UNLINK,		"FUSE_UNLINK")		\</div><div class='add'>+	EM( FUSE_RMDIR,			"FUSE_RMDIR")		\</div><div class='add'>+	EM( FUSE_RENAME,		"FUSE_RENAME")		\</div><div class='add'>+	EM( FUSE_LINK,			"FUSE_LINK")		\</div><div class='add'>+	EM( FUSE_OPEN,			"FUSE_OPEN")		\</div><div class='add'>+	EM( FUSE_READ,			"FUSE_READ")		\</div><div class='add'>+	EM( FUSE_WRITE,			"FUSE_WRITE")		\</div><div class='add'>+	EM( FUSE_STATFS,		"FUSE_STATFS")		\</div><div class='add'>+	EM( FUSE_RELEASE,		"FUSE_RELEASE")		\</div><div class='add'>+	EM( FUSE_FSYNC,			"FUSE_FSYNC")		\</div><div class='add'>+	EM( FUSE_SETXATTR,		"FUSE_SETXATTR")	\</div><div class='add'>+	EM( FUSE_GETXATTR,		"FUSE_GETXATTR")	\</div><div class='add'>+	EM( FUSE_LISTXATTR,		"FUSE_LISTXATTR")	\</div><div class='add'>+	EM( FUSE_REMOVEXATTR,		"FUSE_REMOVEXATTR")	\</div><div class='add'>+	EM( FUSE_FLUSH,			"FUSE_FLUSH")		\</div><div class='add'>+	EM( FUSE_INIT,			"FUSE_INIT")		\</div><div class='add'>+	EM( FUSE_OPENDIR,		"FUSE_OPENDIR")		\</div><div class='add'>+	EM( FUSE_READDIR,		"FUSE_READDIR")		\</div><div class='add'>+	EM( FUSE_RELEASEDIR,		"FUSE_RELEASEDIR")	\</div><div class='add'>+	EM( FUSE_FSYNCDIR,		"FUSE_FSYNCDIR")	\</div><div class='add'>+	EM( FUSE_GETLK,			"FUSE_GETLK")		\</div><div class='add'>+	EM( FUSE_SETLK,			"FUSE_SETLK")		\</div><div class='add'>+	EM( FUSE_SETLKW,		"FUSE_SETLKW")		\</div><div class='add'>+	EM( FUSE_ACCESS,		"FUSE_ACCESS")		\</div><div class='add'>+	EM( FUSE_CREATE,		"FUSE_CREATE")		\</div><div class='add'>+	EM( FUSE_INTERRUPT,		"FUSE_INTERRUPT")	\</div><div class='add'>+	EM( FUSE_BMAP,			"FUSE_BMAP")		\</div><div class='add'>+	EM( FUSE_DESTROY,		"FUSE_DESTROY")		\</div><div class='add'>+	EM( FUSE_IOCTL,			"FUSE_IOCTL")		\</div><div class='add'>+	EM( FUSE_POLL,			"FUSE_POLL")		\</div><div class='add'>+	EM( FUSE_NOTIFY_REPLY,		"FUSE_NOTIFY_REPLY")	\</div><div class='add'>+	EM( FUSE_BATCH_FORGET,		"FUSE_BATCH_FORGET")	\</div><div class='add'>+	EM( FUSE_FALLOCATE,		"FUSE_FALLOCATE")	\</div><div class='add'>+	EM( FUSE_READDIRPLUS,		"FUSE_READDIRPLUS")	\</div><div class='add'>+	EM( FUSE_RENAME2,		"FUSE_RENAME2")		\</div><div class='add'>+	EM( FUSE_LSEEK,			"FUSE_LSEEK")		\</div><div class='add'>+	EM( FUSE_COPY_FILE_RANGE,	"FUSE_COPY_FILE_RANGE")	\</div><div class='add'>+	EM( FUSE_SETUPMAPPING,		"FUSE_SETUPMAPPING")	\</div><div class='add'>+	EM( FUSE_REMOVEMAPPING,		"FUSE_REMOVEMAPPING")	\</div><div class='add'>+	EM( FUSE_SYNCFS,		"FUSE_SYNCFS")		\</div><div class='add'>+	EM( FUSE_TMPFILE,		"FUSE_TMPFILE")		\</div><div class='add'>+	EM( FUSE_STATX,			"FUSE_STATX")		\</div><div class='add'>+	EMe(CUSE_INIT,			"CUSE_INIT")</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This will turn the above table into TRACE_DEFINE_ENUM() for each of the</div><div class='add'>+ * entries.</div><div class='add'>+ */</div><div class='add'>+#undef EM</div><div class='add'>+#undef EMe</div><div class='add'>+#define EM(a, b)	TRACE_DEFINE_ENUM(a);</div><div class='add'>+#define EMe(a, b)	TRACE_DEFINE_ENUM(a);</div><div class='add'>+</div><div class='add'>+OPCODES</div><div class='add'>+</div><div class='add'>+/* Now we redfine it with the table that __print_symbolic needs. */</div><div class='add'>+#undef EM</div><div class='add'>+#undef EMe</div><div class='add'>+#define EM(a, b)	{a, b},</div><div class='add'>+#define EMe(a, b)	{a, b}</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(fuse_request_send,</div><div class='add'>+	TP_PROTO(const struct fuse_req *req),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(req),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(dev_t,			connection)</div><div class='add'>+		__field(uint64_t,		unique)</div><div class='add'>+		__field(enum fuse_opcode,	opcode)</div><div class='add'>+		__field(uint32_t,		len)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;connection	=	req-&gt;fm-&gt;fc-&gt;dev;</div><div class='add'>+		__entry-&gt;unique		=	req-&gt;in.h.unique;</div><div class='add'>+		__entry-&gt;opcode		=	req-&gt;in.h.opcode;</div><div class='add'>+		__entry-&gt;len		=	req-&gt;in.h.len;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("connection %u req %llu opcode %u (%s) len %u ",</div><div class='add'>+		  __entry-&gt;connection, __entry-&gt;unique, __entry-&gt;opcode,</div><div class='add'>+		  __print_symbolic(__entry-&gt;opcode, OPCODES), __entry-&gt;len)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(fuse_request_end,</div><div class='add'>+	TP_PROTO(const struct fuse_req *req),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(req),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(dev_t,		connection)</div><div class='add'>+		__field(uint64_t,	unique)</div><div class='add'>+		__field(uint32_t,	len)</div><div class='add'>+		__field(int32_t,	error)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;connection	=	req-&gt;fm-&gt;fc-&gt;dev;</div><div class='add'>+		__entry-&gt;unique		=	req-&gt;in.h.unique;</div><div class='add'>+		__entry-&gt;len		=	req-&gt;out.h.len;</div><div class='add'>+		__entry-&gt;error		=	req-&gt;out.h.error;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("connection %u req %llu len %u error %d", __entry-&gt;connection,</div><div class='add'>+		  __entry-&gt;unique, __entry-&gt;len, __entry-&gt;error)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_FUSE_H */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#define TRACE_INCLUDE_FILE fuse_trace</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c<br/>index 2a6d44f91729..819e50d66622 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/inode.c</a></div><div class='hunk'>@@ -7,7 +7,10 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include "fuse_i.h"</div><div class='add'>+#include "fuse_dev_i.h"</div><div class='add'>+#include "dev_uring_i.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dax.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='hunk'>@@ -32,10 +35,16 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static struct kmem_cache *fuse_inode_cachep;</div><div class='ctx'> struct list_head fuse_conn_list;</div><div class='ctx'> DEFINE_MUTEX(fuse_mutex);</div><div class='add'>+DECLARE_WAIT_QUEUE_HEAD(fuse_dev_waitq);</div><div class='ctx'> </div><div class='ctx'> static int set_global_limit(const char *val, const struct kernel_param *kp);</div><div class='ctx'> </div><div class='del'>-unsigned max_user_bgreq;</div><div class='add'>+unsigned int fuse_max_pages_limit = 256;</div><div class='add'>+/* default is no timeout */</div><div class='add'>+unsigned int fuse_default_req_timeout;</div><div class='add'>+unsigned int fuse_max_req_timeout;</div><div class='add'>+</div><div class='add'>+unsigned int max_user_bgreq;</div><div class='ctx'> module_param_call(max_user_bgreq, set_global_limit, param_get_uint,</div><div class='ctx'> 		  &amp;max_user_bgreq, 0644);</div><div class='ctx'> __MODULE_PARM_TYPE(max_user_bgreq, "uint");</div><div class='hunk'>@@ -43,7 +52,7 @@ MODULE_PARM_DESC(max_user_bgreq,</div><div class='ctx'>  "Global limit for the maximum number of backgrounded requests an "</div><div class='ctx'>  "unprivileged user can set");</div><div class='ctx'> </div><div class='del'>-unsigned max_user_congthresh;</div><div class='add'>+unsigned int max_user_congthresh;</div><div class='ctx'> module_param_call(max_user_congthresh, set_global_limit, param_get_uint,</div><div class='ctx'> 		  &amp;max_user_congthresh, 0644);</div><div class='ctx'> __MODULE_PARM_TYPE(max_user_congthresh, "uint");</div><div class='hunk'>@@ -94,14 +103,11 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	if (!fi)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	fi-&gt;i_time = 0;</div><div class='add'>+	/* Initialize private data (i.e. everything except fi-&gt;inode) */</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct fuse_inode, inode) != 0);</div><div class='add'>+	memset((void *) fi + sizeof(fi-&gt;inode), 0, sizeof(*fi) - sizeof(fi-&gt;inode));</div><div class='add'>+</div><div class='ctx'> 	fi-&gt;inval_mask = ~0;</div><div class='del'>-	fi-&gt;nodeid = 0;</div><div class='del'>-	fi-&gt;nlookup = 0;</div><div class='del'>-	fi-&gt;attr_version = 0;</div><div class='del'>-	fi-&gt;orig_ino = 0;</div><div class='del'>-	fi-&gt;state = 0;</div><div class='del'>-	fi-&gt;submount_lookup = NULL;</div><div class='ctx'> 	mutex_init(&amp;fi-&gt;mutex);</div><div class='ctx'> 	spin_lock_init(&amp;fi-&gt;lock);</div><div class='ctx'> 	fi-&gt;forget = fuse_alloc_forget();</div><div class='hunk'>@@ -111,6 +117,9 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_FUSE_DAX) &amp;&amp; !fuse_dax_inode_alloc(sb, fi))</div><div class='ctx'> 		goto out_free_forget;</div><div class='ctx'> </div><div class='add'>+	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		fuse_inode_backing_set(fi, NULL);</div><div class='add'>+</div><div class='ctx'> 	return &amp;fi-&gt;inode;</div><div class='ctx'> </div><div class='ctx'> out_free_forget:</div><div class='hunk'>@@ -129,6 +138,9 @@ static void fuse_free_inode(struct inode *inode)</div><div class='ctx'> #ifdef CONFIG_FUSE_DAX</div><div class='ctx'> 	kfree(fi-&gt;dax);</div><div class='ctx'> #endif</div><div class='add'>+	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		fuse_backing_put(fuse_inode_backing(fi));</div><div class='add'>+</div><div class='ctx'> 	kmem_cache_free(fuse_inode_cachep, fi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +160,10 @@ static void fuse_evict_inode(struct inode *inode)</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* Will write inode on close/munmap and in all other dirtiers */</div><div class='del'>-	WARN_ON(inode-&gt;i_state &amp; I_DIRTY_INODE);</div><div class='add'>+	WARN_ON(inode_state_read_once(inode) &amp; I_DIRTY_INODE);</div><div class='add'>+</div><div class='add'>+	if (FUSE_IS_DAX(inode))</div><div class='add'>+		dax_break_layout_final(inode);</div><div class='ctx'> </div><div class='ctx'> 	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> 	clear_inode(inode);</div><div class='hunk'>@@ -167,8 +182,17 @@ static void fuse_evict_inode(struct inode *inode)</div><div class='ctx'> 			fuse_cleanup_submount_lookup(fc, fi-&gt;submount_lookup);</div><div class='ctx'> 			fi-&gt;submount_lookup = NULL;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * Evict of non-deleted inode may race with outstanding</div><div class='add'>+		 * LOOKUP/READDIRPLUS requests and result in inconsistency when</div><div class='add'>+		 * the request finishes.  Deal with that here by bumping a</div><div class='add'>+		 * counter that can be compared to the starting value.</div><div class='add'>+		 */</div><div class='add'>+		if (inode-&gt;i_nlink &gt; 0)</div><div class='add'>+			atomic64_inc(&amp;fc-&gt;evict_ctr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode) &amp;&amp; !fuse_is_bad(inode)) {</div><div class='add'>+		WARN_ON(fi-&gt;iocachectr != 0);</div><div class='ctx'> 		WARN_ON(!list_empty(&amp;fi-&gt;write_files));</div><div class='ctx'> 		WARN_ON(!list_empty(&amp;fi-&gt;queued_writes));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -199,17 +223,30 @@ static ino_t fuse_squash_ino(u64 ino64)</div><div class='ctx'> </div><div class='ctx'> void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr,</div><div class='ctx'> 				   struct fuse_statx *sx,</div><div class='del'>-				   u64 attr_valid, u32 cache_mask)</div><div class='add'>+				   u64 attr_valid, u32 cache_mask,</div><div class='add'>+				   u64 evict_ctr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;fi-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Clear basic stats from invalid mask.</div><div class='add'>+	 *</div><div class='add'>+	 * Don't do this if this is coming from a fuse_iget() call and there</div><div class='add'>+	 * might have been a racing evict which would've invalidated the result</div><div class='add'>+	 * if the attr_version would've been preserved.</div><div class='add'>+	 *</div><div class='add'>+	 * !evict_ctr -&gt; this is create</div><div class='add'>+	 * fi-&gt;attr_version != 0 -&gt; this is not a new inode</div><div class='add'>+	 * evict_ctr == fuse_get_evict_ctr() -&gt; no evicts while during request</div><div class='add'>+	 */</div><div class='add'>+	if (!evict_ctr || fi-&gt;attr_version || evict_ctr == fuse_get_evict_ctr(fc))</div><div class='add'>+		set_mask_bits(&amp;fi-&gt;inval_mask, STATX_BASIC_STATS, 0);</div><div class='add'>+</div><div class='ctx'> 	fi-&gt;attr_version = atomic64_inc_return(&amp;fc-&gt;attr_version);</div><div class='ctx'> 	fi-&gt;i_time = attr_valid;</div><div class='del'>-	/* Clear basic stats from invalid mask */</div><div class='del'>-	set_mask_bits(&amp;fi-&gt;inval_mask, STATX_BASIC_STATS, 0);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_ino     = fuse_squash_ino(attr-&gt;ino);</div><div class='ctx'> 	inode-&gt;i_mode    = (inode-&gt;i_mode &amp; S_IFMT) | (attr-&gt;mode &amp; 07777);</div><div class='hunk'>@@ -251,10 +288,10 @@ void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (attr-&gt;blksize != 0)</div><div class='del'>-		inode-&gt;i_blkbits = ilog2(attr-&gt;blksize);</div><div class='add'>+	if (attr-&gt;blksize)</div><div class='add'>+		fi-&gt;cached_i_blkbits = ilog2(attr-&gt;blksize);</div><div class='ctx'> 	else</div><div class='del'>-		inode-&gt;i_blkbits = inode-&gt;i_sb-&gt;s_blocksize_bits;</div><div class='add'>+		fi-&gt;cached_i_blkbits = inode-&gt;i_sb-&gt;s_blocksize_bits;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't set the sticky bit in i_mode, unless we want the VFS</div><div class='hunk'>@@ -288,9 +325,9 @@ u32 fuse_get_cache_mask(struct inode *inode)</div><div class='ctx'> 	return STATX_MTIME | STATX_CTIME | STATX_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,</div><div class='del'>-			    struct fuse_statx *sx,</div><div class='del'>-			    u64 attr_valid, u64 attr_version)</div><div class='add'>+static void fuse_change_attributes_i(struct inode *inode, struct fuse_attr *attr,</div><div class='add'>+				     struct fuse_statx *sx, u64 attr_valid,</div><div class='add'>+				     u64 attr_version, u64 evict_ctr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='ctx'> 	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='hunk'>@@ -324,7 +361,8 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	old_mtime = inode_get_mtime(inode);</div><div class='del'>-	fuse_change_attributes_common(inode, attr, sx, attr_valid, cache_mask);</div><div class='add'>+	fuse_change_attributes_common(inode, attr, sx, attr_valid, cache_mask,</div><div class='add'>+				      evict_ctr);</div><div class='ctx'> </div><div class='ctx'> 	oldsize = inode-&gt;i_size;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -365,6 +403,13 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,</div><div class='ctx'> 		fuse_dax_dontcache(inode, attr-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,</div><div class='add'>+			    struct fuse_statx *sx, u64 attr_valid,</div><div class='add'>+			    u64 attr_version)</div><div class='add'>+{</div><div class='add'>+	fuse_change_attributes_i(inode, attr, sx, attr_valid, attr_version, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fuse_init_submount_lookup(struct fuse_submount_lookup *sl,</div><div class='ctx'> 				      u64 nodeid)</div><div class='ctx'> {</div><div class='hunk'>@@ -419,7 +464,8 @@ static int fuse_inode_set(struct inode *inode, void *_nodeidp)</div><div class='ctx'> </div><div class='ctx'> struct inode *fuse_iget(struct super_block *sb, u64 nodeid,</div><div class='ctx'> 			int generation, struct fuse_attr *attr,</div><div class='del'>-			u64 attr_valid, u64 attr_version)</div><div class='add'>+			u64 attr_valid, u64 attr_version,</div><div class='add'>+			u64 evict_ctr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct fuse_inode *fi;</div><div class='hunk'>@@ -459,7 +505,7 @@ retry:</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if ((inode-&gt;i_state &amp; I_NEW)) {</div><div class='add'>+	if ((inode_state_read_once(inode) &amp; I_NEW)) {</div><div class='ctx'> 		inode-&gt;i_flags |= S_NOATIME;</div><div class='ctx'> 		if (!fc-&gt;writeback_cache || !S_ISREG(attr-&gt;mode))</div><div class='ctx'> 			inode-&gt;i_flags |= S_NOCMTIME;</div><div class='hunk'>@@ -469,16 +515,19 @@ retry:</div><div class='ctx'> 	} else if (fuse_stale_inode(inode, generation, attr)) {</div><div class='ctx'> 		/* nodeid was reused, any I/O on the old inode should fail */</div><div class='ctx'> 		fuse_make_bad(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-		goto retry;</div><div class='add'>+		if (inode != d_inode(sb-&gt;s_root)) {</div><div class='add'>+			remove_inode_hash(inode);</div><div class='add'>+			iput(inode);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	fi = get_fuse_inode(inode);</div><div class='ctx'> 	spin_lock(&amp;fi-&gt;lock);</div><div class='ctx'> 	fi-&gt;nlookup++;</div><div class='ctx'> 	spin_unlock(&amp;fi-&gt;lock);</div><div class='ctx'> done:</div><div class='del'>-	fuse_change_attributes(inode, attr, NULL, attr_valid, attr_version);</div><div class='del'>-</div><div class='add'>+	fuse_change_attributes_i(inode, attr, NULL, attr_valid, attr_version,</div><div class='add'>+				 evict_ctr);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -536,6 +585,17 @@ int fuse_reverse_inval_inode(struct fuse_conn *fc, u64 nodeid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fuse_try_prune_one_inode(struct fuse_conn *fc, u64 nodeid)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	inode = fuse_ilookup(fc, nodeid,  NULL);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+	d_prune_aliases(inode);</div><div class='add'>+	iput(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool fuse_lock_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	bool locked = false;</div><div class='hunk'>@@ -730,8 +790,8 @@ static const struct fs_parameter_spec fuse_fs_parameters[] = {</div><div class='ctx'> 	fsparam_string	("source",		OPT_SOURCE),</div><div class='ctx'> 	fsparam_u32	("fd",			OPT_FD),</div><div class='ctx'> 	fsparam_u32oct	("rootmode",		OPT_ROOTMODE),</div><div class='del'>-	fsparam_u32	("user_id",		OPT_USER_ID),</div><div class='del'>-	fsparam_u32	("group_id",		OPT_GROUP_ID),</div><div class='add'>+	fsparam_uid	("user_id",		OPT_USER_ID),</div><div class='add'>+	fsparam_gid	("group_id",		OPT_GROUP_ID),</div><div class='ctx'> 	fsparam_flag	("default_permissions",	OPT_DEFAULT_PERMISSIONS),</div><div class='ctx'> 	fsparam_flag	("allow_other",		OPT_ALLOW_OTHER),</div><div class='ctx'> 	fsparam_u32	("max_read",		OPT_MAX_READ),</div><div class='hunk'>@@ -745,6 +805,8 @@ static int fuse_parse_param(struct fs_context *fsc, struct fs_parameter *param)</div><div class='ctx'> 	struct fs_parse_result result;</div><div class='ctx'> 	struct fuse_fs_context *ctx = fsc-&gt;fs_private;</div><div class='ctx'> 	int opt;</div><div class='add'>+	kuid_t kuid;</div><div class='add'>+	kgid_t kgid;</div><div class='ctx'> </div><div class='ctx'> 	if (fsc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -789,16 +851,26 @@ static int fuse_parse_param(struct fs_context *fsc, struct fs_parameter *param)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPT_USER_ID:</div><div class='del'>-		ctx-&gt;user_id = make_kuid(fsc-&gt;user_ns, result.uint_32);</div><div class='del'>-		if (!uid_valid(ctx-&gt;user_id))</div><div class='add'>+		kuid = result.uid;</div><div class='add'>+		/*</div><div class='add'>+		 * The requested uid must be representable in the</div><div class='add'>+		 * filesystem's idmapping.</div><div class='add'>+		 */</div><div class='add'>+		if (!kuid_has_mapping(fsc-&gt;user_ns, kuid))</div><div class='ctx'> 			return invalfc(fsc, "Invalid user_id");</div><div class='add'>+		ctx-&gt;user_id = kuid;</div><div class='ctx'> 		ctx-&gt;user_id_present = true;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPT_GROUP_ID:</div><div class='del'>-		ctx-&gt;group_id = make_kgid(fsc-&gt;user_ns, result.uint_32);</div><div class='del'>-		if (!gid_valid(ctx-&gt;group_id))</div><div class='add'>+		kgid = result.gid;</div><div class='add'>+		/*</div><div class='add'>+		 * The requested gid must be representable in the</div><div class='add'>+		 * filesystem's idmapping.</div><div class='add'>+		 */</div><div class='add'>+		if (!kgid_has_mapping(fsc-&gt;user_ns, kgid))</div><div class='ctx'> 			return invalfc(fsc, "Invalid group_id");</div><div class='add'>+		ctx-&gt;group_id = kgid;</div><div class='ctx'> 		ctx-&gt;group_id_present = true;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -883,7 +955,7 @@ static void fuse_iqueue_init(struct fuse_iqueue *fiq,</div><div class='ctx'> 	fiq-&gt;priv = priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_pqueue_init(struct fuse_pqueue *fpq)</div><div class='add'>+void fuse_pqueue_init(struct fuse_pqueue *fpq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -904,6 +976,8 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,</div><div class='ctx'> 	init_rwsem(&amp;fc-&gt;killsb);</div><div class='ctx'> 	refcount_set(&amp;fc-&gt;count, 1);</div><div class='ctx'> 	atomic_set(&amp;fc-&gt;dev_count, 1);</div><div class='add'>+	atomic_set(&amp;fc-&gt;epoch, 1);</div><div class='add'>+	INIT_WORK(&amp;fc-&gt;epoch_work, fuse_epoch_work);</div><div class='ctx'> 	init_waitqueue_head(&amp;fc-&gt;blocked_waitq);</div><div class='ctx'> 	fuse_iqueue_init(&amp;fc-&gt;iq, fiq_ops, fiq_priv);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fc-&gt;bg_queue);</div><div class='hunk'>@@ -918,11 +992,17 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,</div><div class='ctx'> 	fc-&gt;initialized = 0;</div><div class='ctx'> 	fc-&gt;connected = 1;</div><div class='ctx'> 	atomic64_set(&amp;fc-&gt;attr_version, 1);</div><div class='add'>+	atomic64_set(&amp;fc-&gt;evict_ctr, 1);</div><div class='ctx'> 	get_random_bytes(&amp;fc-&gt;scramble_key, sizeof(fc-&gt;scramble_key));</div><div class='ctx'> 	fc-&gt;pid_ns = get_pid_ns(task_active_pid_ns(current));</div><div class='ctx'> 	fc-&gt;user_ns = get_user_ns(user_ns);</div><div class='ctx'> 	fc-&gt;max_pages = FUSE_DEFAULT_MAX_PAGES_PER_REQ;</div><div class='del'>-	fc-&gt;max_pages_limit = FUSE_MAX_MAX_PAGES;</div><div class='add'>+	fc-&gt;max_pages_limit = fuse_max_pages_limit;</div><div class='add'>+	fc-&gt;name_max = FUSE_NAME_LOW_MAX;</div><div class='add'>+	fc-&gt;timeout.req_timeout = 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		fuse_backing_files_init(fc);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fc-&gt;mounts);</div><div class='ctx'> 	list_add(&amp;fm-&gt;fc_entry, &amp;fc-&gt;mounts);</div><div class='hunk'>@@ -930,25 +1010,40 @@ void fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_conn_init);</div><div class='ctx'> </div><div class='add'>+static void delayed_release(struct rcu_head *p)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = container_of(p, struct fuse_conn, rcu);</div><div class='add'>+</div><div class='add'>+	fuse_uring_destruct(fc);</div><div class='add'>+</div><div class='add'>+	put_user_ns(fc-&gt;user_ns);</div><div class='add'>+	fc-&gt;release(fc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void fuse_conn_put(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='del'>-	if (refcount_dec_and_test(&amp;fc-&gt;count)) {</div><div class='del'>-		struct fuse_iqueue *fiq = &amp;fc-&gt;iq;</div><div class='del'>-		struct fuse_sync_bucket *bucket;</div><div class='del'>-</div><div class='del'>-		if (IS_ENABLED(CONFIG_FUSE_DAX))</div><div class='del'>-			fuse_dax_conn_free(fc);</div><div class='del'>-		if (fiq-&gt;ops-&gt;release)</div><div class='del'>-			fiq-&gt;ops-&gt;release(fiq);</div><div class='del'>-		put_pid_ns(fc-&gt;pid_ns);</div><div class='del'>-		put_user_ns(fc-&gt;user_ns);</div><div class='del'>-		bucket = rcu_dereference_protected(fc-&gt;curr_bucket, 1);</div><div class='del'>-		if (bucket) {</div><div class='del'>-			WARN_ON(atomic_read(&amp;bucket-&gt;count) != 1);</div><div class='del'>-			kfree(bucket);</div><div class='del'>-		}</div><div class='del'>-		fc-&gt;release(fc);</div><div class='add'>+	struct fuse_iqueue *fiq = &amp;fc-&gt;iq;</div><div class='add'>+	struct fuse_sync_bucket *bucket;</div><div class='add'>+</div><div class='add'>+	if (!refcount_dec_and_test(&amp;fc-&gt;count))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_FUSE_DAX))</div><div class='add'>+		fuse_dax_conn_free(fc);</div><div class='add'>+	if (fc-&gt;timeout.req_timeout)</div><div class='add'>+		cancel_delayed_work_sync(&amp;fc-&gt;timeout.work);</div><div class='add'>+	cancel_work_sync(&amp;fc-&gt;epoch_work);</div><div class='add'>+	if (fiq-&gt;ops-&gt;release)</div><div class='add'>+		fiq-&gt;ops-&gt;release(fiq);</div><div class='add'>+	put_pid_ns(fc-&gt;pid_ns);</div><div class='add'>+	bucket = rcu_dereference_protected(fc-&gt;curr_bucket, 1);</div><div class='add'>+	if (bucket) {</div><div class='add'>+		WARN_ON(atomic_read(&amp;bucket-&gt;count) != 1);</div><div class='add'>+		kfree(bucket);</div><div class='ctx'> 	}</div><div class='add'>+	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		fuse_backing_files_free(fc);</div><div class='add'>+	call_rcu(&amp;fc-&gt;rcu, delayed_release);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_conn_put);</div><div class='ctx'> </div><div class='hunk'>@@ -959,7 +1054,7 @@ struct fuse_conn *fuse_conn_get(struct fuse_conn *fc)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_conn_get);</div><div class='ctx'> </div><div class='del'>-static struct inode *fuse_get_root_inode(struct super_block *sb, unsigned mode)</div><div class='add'>+static struct inode *fuse_get_root_inode(struct super_block *sb, unsigned int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_attr attr;</div><div class='ctx'> 	memset(&amp;attr, 0, sizeof(attr));</div><div class='hunk'>@@ -967,7 +1062,7 @@ static struct inode *fuse_get_root_inode(struct super_block *sb, unsigned mode)</div><div class='ctx'> 	attr.mode = mode;</div><div class='ctx'> 	attr.ino = FUSE_ROOT_ID;</div><div class='ctx'> 	attr.nlink = 1;</div><div class='del'>-	return fuse_iget(sb, 1, 0, &amp;attr, 0, 0);</div><div class='add'>+	return fuse_iget(sb, FUSE_ROOT_ID, 0, &amp;attr, 0, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct fuse_inode_handle {</div><div class='hunk'>@@ -1110,6 +1205,11 @@ static struct dentry *fuse_get_parent(struct dentry *child)</div><div class='ctx'> 	return parent;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* only for fid encoding; no support for file handle */</div><div class='add'>+static const struct export_operations fuse_export_fid_operations = {</div><div class='add'>+	.encode_fh	= fuse_encode_fh,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct export_operations fuse_export_operations = {</div><div class='ctx'> 	.fh_to_dentry	= fuse_fh_to_dentry,</div><div class='ctx'> 	.fh_to_parent	= fuse_fh_to_parent,</div><div class='hunk'>@@ -1122,14 +1222,14 @@ static const struct super_operations fuse_super_operations = {</div><div class='ctx'> 	.free_inode     = fuse_free_inode,</div><div class='ctx'> 	.evict_inode	= fuse_evict_inode,</div><div class='ctx'> 	.write_inode	= fuse_write_inode,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.umount_begin	= fuse_umount_begin,</div><div class='ctx'> 	.statfs		= fuse_statfs,</div><div class='ctx'> 	.sync_fs	= fuse_sync_fs,</div><div class='ctx'> 	.show_options	= fuse_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void sanitize_global_limit(unsigned *limit)</div><div class='add'>+static void sanitize_global_limit(unsigned int *limit)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The default maximum number of async requests is calculated to consume</div><div class='hunk'>@@ -1150,7 +1250,7 @@ static int set_global_limit(const char *val, const struct kernel_param *kp)</div><div class='ctx'> 	if (rv)</div><div class='ctx'> 		return rv;</div><div class='ctx'> </div><div class='del'>-	sanitize_global_limit((unsigned *)kp-&gt;arg);</div><div class='add'>+	sanitize_global_limit((unsigned int *)kp-&gt;arg);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1182,6 +1282,34 @@ static void process_init_limits(struct fuse_conn *fc, struct fuse_init_out *arg)</div><div class='ctx'> 	spin_unlock(&amp;fc-&gt;bg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void set_request_timeout(struct fuse_conn *fc, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	fc-&gt;timeout.req_timeout = secs_to_jiffies(timeout);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;fc-&gt;timeout.work, fuse_check_timeout);</div><div class='add'>+	queue_delayed_work(system_percpu_wq, &amp;fc-&gt;timeout.work,</div><div class='add'>+			   fuse_timeout_timer_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_server_timeout(struct fuse_conn *fc, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	if (!timeout &amp;&amp; !fuse_max_req_timeout &amp;&amp; !fuse_default_req_timeout)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!timeout)</div><div class='add'>+		timeout = fuse_default_req_timeout;</div><div class='add'>+</div><div class='add'>+	if (fuse_max_req_timeout) {</div><div class='add'>+		if (timeout)</div><div class='add'>+			timeout = min(fuse_max_req_timeout, timeout);</div><div class='add'>+		else</div><div class='add'>+			timeout = fuse_max_req_timeout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timeout = max(FUSE_TIMEOUT_TIMER_FREQ, timeout);</div><div class='add'>+</div><div class='add'>+	set_request_timeout(fc, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct fuse_init_args {</div><div class='ctx'> 	struct fuse_args args;</div><div class='ctx'> 	struct fuse_init_in in;</div><div class='hunk'>@@ -1200,6 +1328,7 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 		ok = false;</div><div class='ctx'> 	else {</div><div class='ctx'> 		unsigned long ra_pages;</div><div class='add'>+		unsigned int timeout = 0;</div><div class='ctx'> </div><div class='ctx'> 		process_init_limits(fc, arg);</div><div class='ctx'> </div><div class='hunk'>@@ -1263,6 +1392,13 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 				fc-&gt;max_pages =</div><div class='ctx'> 					min_t(unsigned int, fc-&gt;max_pages_limit,</div><div class='ctx'> 					max_t(unsigned int, arg-&gt;max_pages, 1));</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * PATH_MAX file names might need two pages for</div><div class='add'>+				 * ops like rename</div><div class='add'>+				 */</div><div class='add'>+				if (fc-&gt;max_pages &gt; 1)</div><div class='add'>+					fc-&gt;name_max = FUSE_NAME_MAX;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (IS_ENABLED(CONFIG_FUSE_DAX)) {</div><div class='ctx'> 				if (flags &amp; FUSE_MAP_ALIGNMENT &amp;&amp;</div><div class='hunk'>@@ -1284,12 +1420,50 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 				fc-&gt;create_supp_group = 1;</div><div class='ctx'> 			if (flags &amp; FUSE_DIRECT_IO_ALLOW_MMAP)</div><div class='ctx'> 				fc-&gt;direct_io_allow_mmap = 1;</div><div class='add'>+			/*</div><div class='add'>+			 * max_stack_depth is the max stack depth of FUSE fs,</div><div class='add'>+			 * so it has to be at least 1 to support passthrough</div><div class='add'>+			 * to backing files.</div><div class='add'>+			 *</div><div class='add'>+			 * with max_stack_depth &gt; 1, the backing files can be</div><div class='add'>+			 * on a stacked fs (e.g. overlayfs) themselves and with</div><div class='add'>+			 * max_stack_depth == 1, FUSE fs can be stacked as the</div><div class='add'>+			 * underlying fs of a stacked fs (e.g. overlayfs).</div><div class='add'>+			 *</div><div class='add'>+			 * Also don't allow the combination of FUSE_PASSTHROUGH</div><div class='add'>+			 * and FUSE_WRITEBACK_CACHE, current design doesn't handle</div><div class='add'>+			 * them together.</div><div class='add'>+			 */</div><div class='add'>+			if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH) &amp;&amp;</div><div class='add'>+			    (flags &amp; FUSE_PASSTHROUGH) &amp;&amp;</div><div class='add'>+			    arg-&gt;max_stack_depth &gt; 0 &amp;&amp;</div><div class='add'>+			    arg-&gt;max_stack_depth &lt;= FILESYSTEM_MAX_STACK_DEPTH &amp;&amp;</div><div class='add'>+			    !(flags &amp; FUSE_WRITEBACK_CACHE))  {</div><div class='add'>+				fc-&gt;passthrough = 1;</div><div class='add'>+				fc-&gt;max_stack_depth = arg-&gt;max_stack_depth;</div><div class='add'>+				fm-&gt;sb-&gt;s_stack_depth = arg-&gt;max_stack_depth;</div><div class='add'>+			}</div><div class='add'>+			if (flags &amp; FUSE_NO_EXPORT_SUPPORT)</div><div class='add'>+				fm-&gt;sb-&gt;s_export_op = &amp;fuse_export_fid_operations;</div><div class='add'>+			if (flags &amp; FUSE_ALLOW_IDMAP) {</div><div class='add'>+				if (fc-&gt;default_permissions)</div><div class='add'>+					fm-&gt;sb-&gt;s_iflags &amp;= ~SB_I_NOIDMAP;</div><div class='add'>+				else</div><div class='add'>+					ok = false;</div><div class='add'>+			}</div><div class='add'>+			if (flags &amp; FUSE_OVER_IO_URING &amp;&amp; fuse_uring_enabled())</div><div class='add'>+				fc-&gt;io_uring = 1;</div><div class='add'>+</div><div class='add'>+			if (flags &amp; FUSE_REQUEST_TIMEOUT)</div><div class='add'>+				timeout = arg-&gt;request_timeout;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ra_pages = fc-&gt;max_read / PAGE_SIZE;</div><div class='ctx'> 			fc-&gt;no_lock = 1;</div><div class='ctx'> 			fc-&gt;no_flock = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		init_server_timeout(fc, timeout);</div><div class='add'>+</div><div class='ctx'> 		fm-&gt;sb-&gt;s_bdi-&gt;ra_pages =</div><div class='ctx'> 				min(fm-&gt;sb-&gt;s_bdi-&gt;ra_pages, ra_pages);</div><div class='ctx'> 		fc-&gt;minor = arg-&gt;minor;</div><div class='hunk'>@@ -1308,7 +1482,7 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 	wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fuse_send_init(struct fuse_mount *fm)</div><div class='add'>+static struct fuse_init_args *fuse_new_init(struct fuse_mount *fm)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_init_args *ia;</div><div class='ctx'> 	u64 flags;</div><div class='hunk'>@@ -1330,7 +1504,9 @@ void fuse_send_init(struct fuse_mount *fm)</div><div class='ctx'> 		FUSE_NO_OPENDIR_SUPPORT | FUSE_EXPLICIT_INVAL_DATA |</div><div class='ctx'> 		FUSE_HANDLE_KILLPRIV_V2 | FUSE_SETXATTR_EXT | FUSE_INIT_EXT |</div><div class='ctx'> 		FUSE_SECURITY_CTX | FUSE_CREATE_SUPP_GROUP |</div><div class='del'>-		FUSE_HAS_EXPIRE_ONLY | FUSE_DIRECT_IO_ALLOW_MMAP;</div><div class='add'>+		FUSE_HAS_EXPIRE_ONLY | FUSE_DIRECT_IO_ALLOW_MMAP |</div><div class='add'>+		FUSE_NO_EXPORT_SUPPORT | FUSE_HAS_RESEND | FUSE_ALLOW_IDMAP |</div><div class='add'>+		FUSE_REQUEST_TIMEOUT;</div><div class='ctx'> #ifdef CONFIG_FUSE_DAX</div><div class='ctx'> 	if (fm-&gt;fc-&gt;dax)</div><div class='ctx'> 		flags |= FUSE_MAP_ALIGNMENT;</div><div class='hunk'>@@ -1339,6 +1515,15 @@ void fuse_send_init(struct fuse_mount *fm)</div><div class='ctx'> #endif</div><div class='ctx'> 	if (fm-&gt;fc-&gt;auto_submounts)</div><div class='ctx'> 		flags |= FUSE_SUBMOUNTS;</div><div class='add'>+	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))</div><div class='add'>+		flags |= FUSE_PASSTHROUGH;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is just an information flag for fuse server. No need to check</div><div class='add'>+	 * the reply - server is either sending IORING_OP_URING_CMD or not.</div><div class='add'>+	 */</div><div class='add'>+	if (fuse_uring_enabled())</div><div class='add'>+		flags |= FUSE_OVER_IO_URING;</div><div class='ctx'> </div><div class='ctx'> 	ia-&gt;in.flags = flags;</div><div class='ctx'> 	ia-&gt;in.flags2 = flags &gt;&gt; 32;</div><div class='hunk'>@@ -1356,17 +1541,37 @@ void fuse_send_init(struct fuse_mount *fm)</div><div class='ctx'> 	ia-&gt;args.out_args[0].value = &amp;ia-&gt;out;</div><div class='ctx'> 	ia-&gt;args.force = true;</div><div class='ctx'> 	ia-&gt;args.nocreds = true;</div><div class='del'>-	ia-&gt;args.end = process_init_reply;</div><div class='ctx'> </div><div class='del'>-	if (fuse_simple_background(fm, &amp;ia-&gt;args, GFP_KERNEL) != 0)</div><div class='del'>-		process_init_reply(fm, &amp;ia-&gt;args, -ENOTCONN);</div><div class='add'>+	return ia;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fuse_send_init(struct fuse_mount *fm)</div><div class='add'>+{</div><div class='add'>+	struct fuse_init_args *ia = fuse_new_init(fm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (fm-&gt;fc-&gt;sync_init) {</div><div class='add'>+		err = fuse_simple_request(fm, &amp;ia-&gt;args);</div><div class='add'>+		/* Ignore size of init reply */</div><div class='add'>+		if (err &gt; 0)</div><div class='add'>+			err = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ia-&gt;args.end = process_init_reply;</div><div class='add'>+		err = fuse_simple_background(fm, &amp;ia-&gt;args, GFP_KERNEL);</div><div class='add'>+		if (!err)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	process_init_reply(fm, &amp;ia-&gt;args, err);</div><div class='add'>+	if (fm-&gt;fc-&gt;conn_error)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_send_init);</div><div class='ctx'> </div><div class='ctx'> void fuse_free_conn(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(!list_empty(&amp;fc-&gt;devices));</div><div class='del'>-	kfree_rcu(fc, rcu);</div><div class='add'>+	kfree(fc);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fuse_free_conn);</div><div class='ctx'> </div><div class='hunk'>@@ -1389,8 +1594,6 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* fuse does it's own writeback accounting */</div><div class='del'>-	sb-&gt;s_bdi-&gt;capabilities &amp;= ~BDI_CAP_WRITEBACK_ACCT;</div><div class='ctx'> 	sb-&gt;s_bdi-&gt;capabilities |= BDI_CAP_STRICTLIMIT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1489,8 +1692,8 @@ static void fuse_fill_attr_from_inode(struct fuse_attr *attr,</div><div class='ctx'> 		.ctimensec	= ctime.tv_nsec,</div><div class='ctx'> 		.mode		= fi-&gt;inode.i_mode,</div><div class='ctx'> 		.nlink		= fi-&gt;inode.i_nlink,</div><div class='del'>-		.uid		= fi-&gt;inode.i_uid.val,</div><div class='del'>-		.gid		= fi-&gt;inode.i_gid.val,</div><div class='add'>+		.uid		= __kuid_val(fi-&gt;inode.i_uid),</div><div class='add'>+		.gid		= __kgid_val(fi-&gt;inode.i_gid),</div><div class='ctx'> 		.rdev		= fi-&gt;inode.i_rdev,</div><div class='ctx'> 		.blksize	= 1u &lt;&lt; fi-&gt;inode.i_blkbits,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1505,6 +1708,7 @@ static void fuse_sb_defaults(struct super_block *sb)</div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='ctx'> 	sb-&gt;s_export_op = &amp;fuse_export_operations;</div><div class='ctx'> 	sb-&gt;s_iflags |= SB_I_IMA_UNVERIFIABLE_SIGNATURE;</div><div class='add'>+	sb-&gt;s_iflags |= SB_I_NOIDMAP;</div><div class='ctx'> 	if (sb-&gt;s_user_ns != &amp;init_user_ns)</div><div class='ctx'> 		sb-&gt;s_iflags |= SB_I_UNTRUSTED_MOUNTER;</div><div class='ctx'> 	sb-&gt;s_flags &amp;= ~(SB_NOSEC | SB_I_VERSION);</div><div class='hunk'>@@ -1527,6 +1731,7 @@ static int fuse_fill_super_submount(struct super_block *sb,</div><div class='ctx'> 	sb-&gt;s_bdi = bdi_get(parent_sb-&gt;s_bdi);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_xattr = parent_sb-&gt;s_xattr;</div><div class='add'>+	sb-&gt;s_export_op = parent_sb-&gt;s_export_op;</div><div class='ctx'> 	sb-&gt;s_time_gran = parent_sb-&gt;s_time_gran;</div><div class='ctx'> 	sb-&gt;s_blocksize = parent_sb-&gt;s_blocksize;</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = parent_sb-&gt;s_blocksize_bits;</div><div class='hunk'>@@ -1535,7 +1740,8 @@ static int fuse_fill_super_submount(struct super_block *sb,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	fuse_fill_attr_from_inode(&amp;root_attr, parent_fi);</div><div class='del'>-	root = fuse_iget(sb, parent_fi-&gt;nodeid, 0, &amp;root_attr, 0, 0);</div><div class='add'>+	root = fuse_iget(sb, parent_fi-&gt;nodeid, 0, &amp;root_attr, 0, 0,</div><div class='add'>+			 fuse_get_evict_ctr(fm-&gt;fc));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This inode is just a duplicate, so it is not looked up and</div><div class='ctx'> 	 * its nlookup should not be incremented.  fuse_iget() does</div><div class='hunk'>@@ -1544,7 +1750,7 @@ static int fuse_fill_super_submount(struct super_block *sb,</div><div class='ctx'> 	fi = get_fuse_inode(root);</div><div class='ctx'> 	fi-&gt;nlookup--;</div><div class='ctx'> </div><div class='del'>-	sb-&gt;s_d_op = &amp;fuse_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;fuse_dentry_operations);</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root);</div><div class='ctx'> 	if (!sb-&gt;s_root)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1636,6 +1842,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx)</div><div class='ctx'> 		if (!sb_set_blocksize(sb, ctx-&gt;blksize))</div><div class='ctx'> 			goto err;</div><div class='ctx'> #endif</div><div class='add'>+		fc-&gt;sync_fs = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sb-&gt;s_blocksize = PAGE_SIZE;</div><div class='ctx'> 		sb-&gt;s_blocksize_bits = PAGE_SHIFT;</div><div class='hunk'>@@ -1679,17 +1886,19 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	root = fuse_get_root_inode(sb, ctx-&gt;rootmode);</div><div class='del'>-	sb-&gt;s_d_op = &amp;fuse_root_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;fuse_dentry_operations);</div><div class='ctx'> 	root_dentry = d_make_root(root);</div><div class='ctx'> 	if (!root_dentry)</div><div class='ctx'> 		goto err_dev_free;</div><div class='del'>-	/* Root dentry doesn't have .d_revalidate */</div><div class='del'>-	sb-&gt;s_d_op = &amp;fuse_dentry_operations;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fuse_mutex);</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (ctx-&gt;fudptr &amp;&amp; *ctx-&gt;fudptr)</div><div class='del'>-		goto err_unlock;</div><div class='add'>+	if (ctx-&gt;fudptr &amp;&amp; *ctx-&gt;fudptr) {</div><div class='add'>+		if (*ctx-&gt;fudptr == FUSE_DEV_SYNC_INIT)</div><div class='add'>+			fc-&gt;sync_init = 1;</div><div class='add'>+		else</div><div class='add'>+			goto err_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = fuse_ctl_add_conn(fc);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1697,8 +1906,10 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;fc-&gt;entry, &amp;fuse_conn_list);</div><div class='ctx'> 	sb-&gt;s_root = root_dentry;</div><div class='del'>-	if (ctx-&gt;fudptr)</div><div class='add'>+	if (ctx-&gt;fudptr) {</div><div class='ctx'> 		*ctx-&gt;fudptr = fud;</div><div class='add'>+		wake_up_all(&amp;fuse_dev_waitq);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;fuse_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1719,6 +1930,7 @@ EXPORT_SYMBOL_GPL(fuse_fill_super_common);</div><div class='ctx'> static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_fs_context *ctx = fsc-&gt;fs_private;</div><div class='add'>+	struct fuse_mount *fm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx-&gt;file || !ctx-&gt;rootmode_present ||</div><div class='hunk'>@@ -1739,8 +1951,10 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* file-&gt;private_data shall be visible on all CPUs after this */</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	fuse_send_init(get_fuse_mount_super(sb));</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	fm = get_fuse_mount_super(sb);</div><div class='add'>+</div><div class='add'>+	return fuse_send_init(fm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1801,7 +2015,7 @@ static int fuse_get_tree(struct fs_context *fsc)</div><div class='ctx'> 	 * Allow creating a fuse mount with an already initialized fuse</div><div class='ctx'> 	 * connection</div><div class='ctx'> 	 */</div><div class='del'>-	fud = READ_ONCE(ctx-&gt;file-&gt;private_data);</div><div class='add'>+	fud = __fuse_get_dev(ctx-&gt;file);</div><div class='ctx'> 	if (ctx-&gt;file-&gt;f_op == &amp;fuse_dev_operations &amp;&amp; fud) {</div><div class='ctx'> 		fsc-&gt;sget_key = fud-&gt;fc;</div><div class='ctx'> 		sb = sget_fc(fsc, fuse_test_super, fuse_set_no_super);</div><div class='hunk'>@@ -1902,7 +2116,7 @@ static void fuse_sb_destroy(struct super_block *sb)</div><div class='ctx'> void fuse_mount_destroy(struct fuse_mount *fm)</div><div class='ctx'> {</div><div class='ctx'> 	fuse_conn_put(fm-&gt;fc);</div><div class='del'>-	kfree(fm);</div><div class='add'>+	kfree_rcu(fm, rcu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fuse_mount_destroy);</div><div class='ctx'> </div><div class='hunk'>@@ -1916,7 +2130,7 @@ static void fuse_kill_sb_anon(struct super_block *sb)</div><div class='ctx'> static struct file_system_type fuse_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "fuse",</div><div class='del'>-	.fs_flags	= FS_HAS_SUBTYPE | FS_USERNS_MOUNT,</div><div class='add'>+	.fs_flags	= FS_HAS_SUBTYPE | FS_USERNS_MOUNT | FS_ALLOW_IDMAP,</div><div class='ctx'> 	.init_fs_context = fuse_init_fs_context,</div><div class='ctx'> 	.parameters	= fuse_fs_parameters,</div><div class='ctx'> 	.kill_sb	= fuse_kill_sb_anon,</div><div class='hunk'>@@ -1937,7 +2151,7 @@ static struct file_system_type fuseblk_fs_type = {</div><div class='ctx'> 	.init_fs_context = fuse_init_fs_context,</div><div class='ctx'> 	.parameters	= fuse_fs_parameters,</div><div class='ctx'> 	.kill_sb	= fuse_kill_sb_blk,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV | FS_HAS_SUBTYPE,</div><div class='add'>+	.fs_flags	= FS_REQUIRES_DEV | FS_HAS_SUBTYPE | FS_ALLOW_IDMAP,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("fuseblk");</div><div class='ctx'> </div><div class='hunk'>@@ -1988,8 +2202,14 @@ static int __init fuse_fs_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out3;</div><div class='ctx'> </div><div class='add'>+	err = fuse_sysctl_register();</div><div class='add'>+	if (err)</div><div class='add'>+		goto out4;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ out4:</div><div class='add'>+	unregister_filesystem(&amp;fuse_fs_type);</div><div class='ctx'>  out3:</div><div class='ctx'> 	unregister_fuseblk();</div><div class='ctx'>  out2:</div><div class='hunk'>@@ -2000,6 +2220,7 @@ static int __init fuse_fs_init(void)</div><div class='ctx'> </div><div class='ctx'> static void fuse_fs_cleanup(void)</div><div class='ctx'> {</div><div class='add'>+	fuse_sysctl_unregister();</div><div class='ctx'> 	unregister_filesystem(&amp;fuse_fs_type);</div><div class='ctx'> 	unregister_fuseblk();</div><div class='ctx'> </div><div class='hunk'>@@ -2065,6 +2286,8 @@ static int __init fuse_init(void)</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto err_sysfs_cleanup;</div><div class='ctx'> </div><div class='add'>+	fuse_dentry_tree_init();</div><div class='add'>+</div><div class='ctx'> 	sanitize_global_limit(&amp;max_user_bgreq);</div><div class='ctx'> 	sanitize_global_limit(&amp;max_user_congthresh);</div><div class='ctx'> </div><div class='hunk'>@@ -2084,6 +2307,7 @@ static void __exit fuse_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("exit\n");</div><div class='ctx'> </div><div class='add'>+	fuse_dentry_tree_cleanup();</div><div class='ctx'> 	fuse_ctl_cleanup();</div><div class='ctx'> 	fuse_sysfs_cleanup();</div><div class='ctx'> 	fuse_fs_cleanup();</div><div class='head'>diff --git a/fs/fuse/ioctl.c b/fs/fuse/ioctl.c<br/>index 726640fa439e..fdc175e93f74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/ioctl.c</a></div><div class='hunk'>@@ -8,6 +8,9 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/fileattr.h&gt;</div><div class='add'>+#include &lt;linux/fsverity.h&gt;</div><div class='add'>+</div><div class='add'>+#define FUSE_VERITY_ENABLE_ARG_MAX_PAGES 256</div><div class='ctx'> </div><div class='ctx'> static ssize_t fuse_send_ioctl(struct fuse_mount *fm, struct fuse_args *args,</div><div class='ctx'> 			       struct fuse_ioctl_out *outarg)</div><div class='hunk'>@@ -117,6 +120,53 @@ static int fuse_copy_ioctl_iovec(struct fuse_conn *fc, struct iovec *dst,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* For fs-verity, determine iov lengths from input */</div><div class='add'>+static int fuse_setup_measure_verity(unsigned long arg, struct iovec *iov)</div><div class='add'>+{</div><div class='add'>+	__u16 digest_size;</div><div class='add'>+	struct fsverity_digest __user *uarg = (void __user *)arg;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;digest_size, &amp;uarg-&gt;digest_size, sizeof(digest_size)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (digest_size &gt; SIZE_MAX - sizeof(struct fsverity_digest))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	iov-&gt;iov_len = sizeof(struct fsverity_digest) + digest_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_setup_enable_verity(unsigned long arg, struct iovec *iov,</div><div class='add'>+				    unsigned int *in_iovs)</div><div class='add'>+{</div><div class='add'>+	struct fsverity_enable_arg enable;</div><div class='add'>+	struct fsverity_enable_arg __user *uarg = (void __user *)arg;</div><div class='add'>+	const __u32 max_buffer_len = FUSE_VERITY_ENABLE_ARG_MAX_PAGES * PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;enable, uarg, sizeof(enable)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (enable.salt_size &gt; max_buffer_len || enable.sig_size &gt; max_buffer_len)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (enable.salt_size &gt; 0) {</div><div class='add'>+		iov++;</div><div class='add'>+		(*in_iovs)++;</div><div class='add'>+</div><div class='add'>+		iov-&gt;iov_base = u64_to_user_ptr(enable.salt_ptr);</div><div class='add'>+		iov-&gt;iov_len = enable.salt_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable.sig_size &gt; 0) {</div><div class='add'>+		iov++;</div><div class='add'>+		(*in_iovs)++;</div><div class='add'>+</div><div class='add'>+		iov-&gt;iov_base = u64_to_user_ptr(enable.sig_ptr);</div><div class='add'>+		iov-&gt;iov_len = enable.sig_size;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For ioctls, there is no generic way to determine how much memory</div><div class='hunk'>@@ -201,12 +251,12 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct fuse_ioctl_iovec) * FUSE_IOCTL_MAX_IOV &gt; PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	ap.pages = fuse_pages_alloc(fm-&gt;fc-&gt;max_pages, GFP_KERNEL, &amp;ap.descs);</div><div class='add'>+	ap.folios = fuse_folios_alloc(fm-&gt;fc-&gt;max_pages, GFP_KERNEL, &amp;ap.descs);</div><div class='ctx'> 	iov_page = (struct iovec *) __get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!ap.pages || !iov_page)</div><div class='add'>+	if (!ap.folios || !iov_page)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	fuse_page_descs_length_init(ap.descs, 0, fm-&gt;fc-&gt;max_pages);</div><div class='add'>+	fuse_folio_descs_length_init(ap.descs, 0, fm-&gt;fc-&gt;max_pages);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If restricted, initialize IO parameters as encoded in @cmd.</div><div class='hunk'>@@ -227,6 +277,18 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 			out_iov = iov;</div><div class='ctx'> 			out_iovs = 1;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		err = 0;</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case FS_IOC_MEASURE_VERITY:</div><div class='add'>+			err = fuse_setup_measure_verity(arg, iov);</div><div class='add'>+			break;</div><div class='add'>+		case FS_IOC_ENABLE_VERITY:</div><div class='add'>+			err = fuse_setup_enable_verity(arg, iov, &amp;in_iovs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  retry:</div><div class='hunk'>@@ -244,14 +306,13 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (max_pages &gt; fm-&gt;fc-&gt;max_pages)</div><div class='ctx'> 		goto out;</div><div class='del'>-	while (ap.num_pages &lt; max_pages) {</div><div class='del'>-		ap.pages[ap.num_pages] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);</div><div class='del'>-		if (!ap.pages[ap.num_pages])</div><div class='add'>+	while (ap.num_folios &lt; max_pages) {</div><div class='add'>+		ap.folios[ap.num_folios] = folio_alloc(GFP_KERNEL | __GFP_HIGHMEM, 0);</div><div class='add'>+		if (!ap.folios[ap.num_folios])</div><div class='ctx'> 			goto out;</div><div class='del'>-		ap.num_pages++;</div><div class='add'>+		ap.num_folios++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* okay, let's send it to the client */</div><div class='ctx'> 	ap.args.opcode = FUSE_IOCTL;</div><div class='ctx'> 	ap.args.nodeid = ff-&gt;nodeid;</div><div class='hunk'>@@ -265,8 +326,8 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,</div><div class='ctx'> </div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		iov_iter_init(&amp;ii, ITER_SOURCE, in_iov, in_iovs, in_size);</div><div class='del'>-		for (i = 0; iov_iter_count(&amp;ii) &amp;&amp; !WARN_ON(i &gt;= ap.num_pages); i++) {</div><div class='del'>-			c = copy_page_from_iter(ap.pages[i], 0, PAGE_SIZE, &amp;ii);</div><div class='add'>+		for (i = 0; iov_iter_count(&amp;ii) &amp;&amp; !WARN_ON(i &gt;= ap.num_folios); i++) {</div><div class='add'>+			c = copy_folio_from_iter(ap.folios[i], 0, PAGE_SIZE, &amp;ii);</div><div class='ctx'> 			if (c != PAGE_SIZE &amp;&amp; iov_iter_count(&amp;ii))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -304,7 +365,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,</div><div class='ctx'> 		    in_iovs + out_iovs &gt; FUSE_IOCTL_MAX_IOV)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		vaddr = kmap_local_page(ap.pages[0]);</div><div class='add'>+		vaddr = kmap_local_folio(ap.folios[0], 0);</div><div class='ctx'> 		err = fuse_copy_ioctl_iovec(fm-&gt;fc, iov_page, vaddr,</div><div class='ctx'> 					    transferred, in_iovs + out_iovs,</div><div class='ctx'> 					    (flags &amp; FUSE_IOCTL_COMPAT) != 0);</div><div class='hunk'>@@ -332,17 +393,17 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,</div><div class='ctx'> </div><div class='ctx'> 	err = -EFAULT;</div><div class='ctx'> 	iov_iter_init(&amp;ii, ITER_DEST, out_iov, out_iovs, transferred);</div><div class='del'>-	for (i = 0; iov_iter_count(&amp;ii) &amp;&amp; !WARN_ON(i &gt;= ap.num_pages); i++) {</div><div class='del'>-		c = copy_page_to_iter(ap.pages[i], 0, PAGE_SIZE, &amp;ii);</div><div class='add'>+	for (i = 0; iov_iter_count(&amp;ii) &amp;&amp; !WARN_ON(i &gt;= ap.num_folios); i++) {</div><div class='add'>+		c = copy_folio_to_iter(ap.folios[i], 0, PAGE_SIZE, &amp;ii);</div><div class='ctx'> 		if (c != PAGE_SIZE &amp;&amp; iov_iter_count(&amp;ii))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'>  out:</div><div class='ctx'> 	free_page((unsigned long) iov_page);</div><div class='del'>-	while (ap.num_pages)</div><div class='del'>-		__free_page(ap.pages[--ap.num_pages]);</div><div class='del'>-	kfree(ap.pages);</div><div class='add'>+	while (ap.num_folios)</div><div class='add'>+		folio_put(ap.folios[--ap.num_folios]);</div><div class='add'>+	kfree(ap.folios);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : outarg.result;</div><div class='ctx'> }</div><div class='hunk'>@@ -441,7 +502,7 @@ static void fuse_priv_ioctl_cleanup(struct inode *inode, struct fuse_file *ff)</div><div class='ctx'> 	fuse_file_release(inode, ff, O_RDONLY, NULL, S_ISDIR(inode-&gt;i_mode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fuse_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int fuse_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='hunk'>@@ -479,7 +540,7 @@ cleanup:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fuse_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='head'>diff --git a/fs/fuse/iomode.c b/fs/fuse/iomode.c<br/>new file mode 100644<br/>index 000000000000..3728933188f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/iomode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/iomode.c</a></div><div class='hunk'>@@ -0,0 +1,275 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * FUSE inode io modes.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2024 CTERA Networks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return true if need to wait for new opens in caching mode.</div><div class='add'>+ */</div><div class='add'>+static inline bool fuse_is_io_cache_wait(struct fuse_inode *fi)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(fi-&gt;iocachectr) &lt; 0 &amp;&amp; !fuse_inode_backing(fi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called on cached file open() and on first mmap() of direct_io file.</div><div class='add'>+ * Takes cached_io inode mode reference to be dropped on file release.</div><div class='add'>+ *</div><div class='add'>+ * Blocks new parallel dio writes and waits for the in-progress parallel dio</div><div class='add'>+ * writes to complete.</div><div class='add'>+ */</div><div class='add'>+int fuse_file_cached_io_open(struct inode *inode, struct fuse_file *ff)</div><div class='add'>+{</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	/* There are no io modes if server does not implement open */</div><div class='add'>+	if (!ff-&gt;args)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fi-&gt;lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Setting the bit advises new direct-io writes to use an exclusive</div><div class='add'>+	 * lock - without it the wait below might be forever.</div><div class='add'>+	 */</div><div class='add'>+	while (fuse_is_io_cache_wait(fi)) {</div><div class='add'>+		set_bit(FUSE_I_CACHE_IO_MODE, &amp;fi-&gt;state);</div><div class='add'>+		spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+		wait_event(fi-&gt;direct_io_waitq, !fuse_is_io_cache_wait(fi));</div><div class='add'>+		spin_lock(&amp;fi-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if inode entered passthrough io mode while waiting for parallel</div><div class='add'>+	 * dio write completion.</div><div class='add'>+	 */</div><div class='add'>+	if (fuse_inode_backing(fi)) {</div><div class='add'>+		clear_bit(FUSE_I_CACHE_IO_MODE, &amp;fi-&gt;state);</div><div class='add'>+		spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+		return -ETXTBSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(ff-&gt;iomode == IOM_UNCACHED);</div><div class='add'>+	if (ff-&gt;iomode == IOM_NONE) {</div><div class='add'>+		ff-&gt;iomode = IOM_CACHED;</div><div class='add'>+		if (fi-&gt;iocachectr == 0)</div><div class='add'>+			set_bit(FUSE_I_CACHE_IO_MODE, &amp;fi-&gt;state);</div><div class='add'>+		fi-&gt;iocachectr++;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_file_cached_io_release(struct fuse_file *ff,</div><div class='add'>+					struct fuse_inode *fi)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fi-&gt;lock);</div><div class='add'>+	WARN_ON(fi-&gt;iocachectr &lt;= 0);</div><div class='add'>+	WARN_ON(ff-&gt;iomode != IOM_CACHED);</div><div class='add'>+	ff-&gt;iomode = IOM_NONE;</div><div class='add'>+	fi-&gt;iocachectr--;</div><div class='add'>+	if (fi-&gt;iocachectr == 0)</div><div class='add'>+		clear_bit(FUSE_I_CACHE_IO_MODE, &amp;fi-&gt;state);</div><div class='add'>+	spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start strictly uncached io mode where cache access is not allowed */</div><div class='add'>+int fuse_inode_uncached_io_start(struct fuse_inode *fi, struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	struct fuse_backing *oldfb;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fi-&gt;lock);</div><div class='add'>+	/* deny conflicting backing files on same fuse inode */</div><div class='add'>+	oldfb = fuse_inode_backing(fi);</div><div class='add'>+	if (fb &amp;&amp; oldfb &amp;&amp; oldfb != fb) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	if (fi-&gt;iocachectr &gt; 0) {</div><div class='add'>+		err = -ETXTBSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	fi-&gt;iocachectr--;</div><div class='add'>+</div><div class='add'>+	/* fuse inode holds a single refcount of backing file */</div><div class='add'>+	if (fb &amp;&amp; !oldfb) {</div><div class='add'>+		oldfb = fuse_inode_backing_set(fi, fb);</div><div class='add'>+		WARN_ON_ONCE(oldfb != NULL);</div><div class='add'>+	} else {</div><div class='add'>+		fuse_backing_put(fb);</div><div class='add'>+	}</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Takes uncached_io inode mode reference to be dropped on file release */</div><div class='add'>+static int fuse_file_uncached_io_open(struct inode *inode,</div><div class='add'>+				      struct fuse_file *ff,</div><div class='add'>+				      struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fuse_inode_uncached_io_start(fi, fb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	WARN_ON(ff-&gt;iomode != IOM_NONE);</div><div class='add'>+	ff-&gt;iomode = IOM_UNCACHED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_inode_uncached_io_end(struct fuse_inode *fi)</div><div class='add'>+{</div><div class='add'>+	struct fuse_backing *oldfb = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fi-&gt;lock);</div><div class='add'>+	WARN_ON(fi-&gt;iocachectr &gt;= 0);</div><div class='add'>+	fi-&gt;iocachectr++;</div><div class='add'>+	if (!fi-&gt;iocachectr) {</div><div class='add'>+		wake_up(&amp;fi-&gt;direct_io_waitq);</div><div class='add'>+		oldfb = fuse_inode_backing_set(fi, NULL);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fi-&gt;lock);</div><div class='add'>+	if (oldfb)</div><div class='add'>+		fuse_backing_put(oldfb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Drop uncached_io reference from passthrough open */</div><div class='add'>+static void fuse_file_uncached_io_release(struct fuse_file *ff,</div><div class='add'>+					  struct fuse_inode *fi)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(ff-&gt;iomode != IOM_UNCACHED);</div><div class='add'>+	ff-&gt;iomode = IOM_NONE;</div><div class='add'>+	fuse_inode_uncached_io_end(fi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Open flags that are allowed in combination with FOPEN_PASSTHROUGH.</div><div class='add'>+ * A combination of FOPEN_PASSTHROUGH and FOPEN_DIRECT_IO means that read/write</div><div class='add'>+ * operations go directly to the server, but mmap is done on the backing file.</div><div class='add'>+ * FOPEN_PASSTHROUGH mode should not co-exist with any users of the fuse inode</div><div class='add'>+ * page cache, so FOPEN_KEEP_CACHE is a strange and undesired combination.</div><div class='add'>+ */</div><div class='add'>+#define FOPEN_PASSTHROUGH_MASK \</div><div class='add'>+	(FOPEN_PASSTHROUGH | FOPEN_DIRECT_IO | FOPEN_PARALLEL_DIRECT_WRITES | \</div><div class='add'>+	 FOPEN_NOFLUSH)</div><div class='add'>+</div><div class='add'>+static int fuse_file_passthrough_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	struct fuse_backing *fb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Check allowed conditions for file open in passthrough mode */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_FUSE_PASSTHROUGH) || !fc-&gt;passthrough ||</div><div class='add'>+	    (ff-&gt;open_flags &amp; ~FOPEN_PASSTHROUGH_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fb = fuse_passthrough_open(file, ff-&gt;args-&gt;open_outarg.backing_id);</div><div class='add'>+	if (IS_ERR(fb))</div><div class='add'>+		return PTR_ERR(fb);</div><div class='add'>+</div><div class='add'>+	/* First passthrough file open denies caching inode io mode */</div><div class='add'>+	err = fuse_file_uncached_io_open(inode, ff, fb);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fuse_passthrough_release(ff, fb);</div><div class='add'>+	fuse_backing_put(fb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Request access to submit new io to inode via open file */</div><div class='add'>+int fuse_file_io_open(struct file *file, struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * io modes are not relevant with DAX and with server that does not</div><div class='add'>+	 * implement open.</div><div class='add'>+	 */</div><div class='add'>+	if (FUSE_IS_DAX(inode) || !ff-&gt;args)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Server is expected to use FOPEN_PASSTHROUGH for all opens of an inode</div><div class='add'>+	 * which is already open for passthrough.</div><div class='add'>+	 */</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (fuse_inode_backing(fi) &amp;&amp; !(ff-&gt;open_flags &amp; FOPEN_PASSTHROUGH))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FOPEN_PARALLEL_DIRECT_WRITES requires FOPEN_DIRECT_IO.</div><div class='add'>+	 */</div><div class='add'>+	if (!(ff-&gt;open_flags &amp; FOPEN_DIRECT_IO))</div><div class='add'>+		ff-&gt;open_flags &amp;= ~FOPEN_PARALLEL_DIRECT_WRITES;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First passthrough file open denies caching inode io mode.</div><div class='add'>+	 * First caching file open enters caching inode io mode.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that if user opens a file open with O_DIRECT, but server did</div><div class='add'>+	 * not specify FOPEN_DIRECT_IO, a later fcntl() could remove O_DIRECT,</div><div class='add'>+	 * so we put the inode in caching mode to prevent parallel dio.</div><div class='add'>+	 */</div><div class='add'>+	if ((ff-&gt;open_flags &amp; FOPEN_DIRECT_IO) &amp;&amp;</div><div class='add'>+	    !(ff-&gt;open_flags &amp; FOPEN_PASSTHROUGH))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;open_flags &amp; FOPEN_PASSTHROUGH)</div><div class='add'>+		err = fuse_file_passthrough_open(inode, file);</div><div class='add'>+	else</div><div class='add'>+		err = fuse_file_cached_io_open(inode, ff);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	pr_debug("failed to open file in requested io mode (open_flags=0x%x, err=%i).\n",</div><div class='add'>+		 ff-&gt;open_flags, err);</div><div class='add'>+	/*</div><div class='add'>+	 * The file open mode determines the inode io mode.</div><div class='add'>+	 * Using incorrect open mode is a server mistake, which results in</div><div class='add'>+	 * user visible failure of open() with EIO error.</div><div class='add'>+	 */</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No more pending io and no new io possible to inode via open/mmapped file */</div><div class='add'>+void fuse_file_io_release(struct fuse_file *ff, struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct fuse_inode *fi = get_fuse_inode(inode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Last passthrough file close allows caching inode io mode.</div><div class='add'>+	 * Last caching file close exits caching inode io mode.</div><div class='add'>+	 */</div><div class='add'>+	switch (ff-&gt;iomode) {</div><div class='add'>+	case IOM_NONE:</div><div class='add'>+		/* Nothing to do */</div><div class='add'>+		break;</div><div class='add'>+	case IOM_UNCACHED:</div><div class='add'>+		fuse_file_uncached_io_release(ff, fi);</div><div class='add'>+		break;</div><div class='add'>+	case IOM_CACHED:</div><div class='add'>+		fuse_file_cached_io_release(ff, fi);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c<br/>new file mode 100644<br/>index 000000000000..72de97c03d0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/passthrough.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/passthrough.c</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * FUSE passthrough to backing file.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 CTERA Networks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/backing-file.h&gt;</div><div class='add'>+#include &lt;linux/splice.h&gt;</div><div class='add'>+</div><div class='add'>+static void fuse_file_accessed(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+</div><div class='add'>+	fuse_invalidate_atime(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_passthrough_end_write(struct kiocb *iocb, ssize_t ret)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+</div><div class='add'>+	fuse_write_update_attr(inode, iocb-&gt;ki_pos, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct file *backing_file = fuse_file_passthrough(ff);</div><div class='add'>+	size_t count = iov_iter_count(iter);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct backing_file_ctx ctx = {</div><div class='add'>+		.cred = ff-&gt;cred,</div><div class='add'>+		.accessed = fuse_file_accessed,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu\n", __func__,</div><div class='add'>+		 backing_file, iocb-&gt;ki_pos, count);</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = backing_file_read_iter(backing_file, iter, iocb, iocb-&gt;ki_flags,</div><div class='add'>+				     &amp;ctx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t fuse_passthrough_write_iter(struct kiocb *iocb,</div><div class='add'>+				    struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct file *backing_file = fuse_file_passthrough(ff);</div><div class='add'>+	size_t count = iov_iter_count(iter);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct backing_file_ctx ctx = {</div><div class='add'>+		.cred = ff-&gt;cred,</div><div class='add'>+		.end_write = fuse_passthrough_end_write,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu\n", __func__,</div><div class='add'>+		 backing_file, iocb-&gt;ki_pos, count);</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	ret = backing_file_write_iter(backing_file, iter, iocb, iocb-&gt;ki_flags,</div><div class='add'>+				      &amp;ctx);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t fuse_passthrough_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+				     struct pipe_inode_info *pipe,</div><div class='add'>+				     size_t len, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = in-&gt;private_data;</div><div class='add'>+	struct file *backing_file = fuse_file_passthrough(ff);</div><div class='add'>+	struct backing_file_ctx ctx = {</div><div class='add'>+		.cred = ff-&gt;cred,</div><div class='add'>+		.accessed = fuse_file_accessed,</div><div class='add'>+	};</div><div class='add'>+	struct kiocb iocb;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,</div><div class='add'>+		 backing_file, *ppos, len, flags);</div><div class='add'>+</div><div class='add'>+	init_sync_kiocb(&amp;iocb, in);</div><div class='add'>+	iocb.ki_pos = *ppos;</div><div class='add'>+	ret = backing_file_splice_read(backing_file, &amp;iocb, pipe, len, flags, &amp;ctx);</div><div class='add'>+	*ppos = iocb.ki_pos;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t fuse_passthrough_splice_write(struct pipe_inode_info *pipe,</div><div class='add'>+				      struct file *out, loff_t *ppos,</div><div class='add'>+				      size_t len, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = out-&gt;private_data;</div><div class='add'>+	struct file *backing_file = fuse_file_passthrough(ff);</div><div class='add'>+	struct inode *inode = file_inode(out);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct backing_file_ctx ctx = {</div><div class='add'>+		.cred = ff-&gt;cred,</div><div class='add'>+		.end_write = fuse_passthrough_end_write,</div><div class='add'>+	};</div><div class='add'>+	struct kiocb iocb;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,</div><div class='add'>+		 backing_file, *ppos, len, flags);</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	init_sync_kiocb(&amp;iocb, out);</div><div class='add'>+	iocb.ki_pos = *ppos;</div><div class='add'>+	ret = backing_file_splice_write(pipe, backing_file, &amp;iocb, len, flags, &amp;ctx);</div><div class='add'>+	*ppos = iocb.ki_pos;</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t fuse_passthrough_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct file *backing_file = fuse_file_passthrough(ff);</div><div class='add'>+	struct backing_file_ctx ctx = {</div><div class='add'>+		.cred = ff-&gt;cred,</div><div class='add'>+		.accessed = fuse_file_accessed,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: backing_file=0x%p, start=%lu, end=%lu\n", __func__,</div><div class='add'>+		 backing_file, vma-&gt;vm_start, vma-&gt;vm_end);</div><div class='add'>+</div><div class='add'>+	return backing_file_mmap(backing_file, vma, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup passthrough to a backing file.</div><div class='add'>+ *</div><div class='add'>+ * Returns an fb object with elevated refcount to be stored in fuse inode.</div><div class='add'>+ */</div><div class='add'>+struct fuse_backing *fuse_passthrough_open(struct file *file, int backing_id)</div><div class='add'>+{</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct fuse_conn *fc = ff-&gt;fm-&gt;fc;</div><div class='add'>+	struct fuse_backing *fb = NULL;</div><div class='add'>+	struct file *backing_file;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (backing_id &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = -ENOENT;</div><div class='add'>+	fb = fuse_backing_lookup(fc, backing_id);</div><div class='add'>+	if (!fb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Allocate backing file per fuse file to store fuse path */</div><div class='add'>+	backing_file = backing_file_open(&amp;file-&gt;f_path, file-&gt;f_flags,</div><div class='add'>+					 &amp;fb-&gt;file-&gt;f_path, fb-&gt;cred);</div><div class='add'>+	err = PTR_ERR(backing_file);</div><div class='add'>+	if (IS_ERR(backing_file)) {</div><div class='add'>+		fuse_backing_put(fb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	ff-&gt;passthrough = backing_file;</div><div class='add'>+	ff-&gt;cred = get_cred(fb-&gt;cred);</div><div class='add'>+out:</div><div class='add'>+	pr_debug("%s: backing_id=%d, fb=0x%p, backing_file=0x%p, err=%i\n", __func__,</div><div class='add'>+		 backing_id, fb, ff-&gt;passthrough, err);</div><div class='add'>+</div><div class='add'>+	return err ? ERR_PTR(err) : fb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_passthrough_release(struct fuse_file *ff, struct fuse_backing *fb)</div><div class='add'>+{</div><div class='add'>+	pr_debug("%s: fb=0x%p, backing_file=0x%p\n", __func__,</div><div class='add'>+		 fb, ff-&gt;passthrough);</div><div class='add'>+</div><div class='add'>+	fput(ff-&gt;passthrough);</div><div class='add'>+	ff-&gt;passthrough = NULL;</div><div class='add'>+	put_cred(ff-&gt;cred);</div><div class='add'>+	ff-&gt;cred = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c<br/>index c66a54d6c7d3..c2aae2eef086 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/readdir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/readdir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/readdir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/readdir.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ static bool fuse_emit(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 		fuse_add_dirent_to_cache(file, dirent, ctx-&gt;pos);</div><div class='ctx'> </div><div class='ctx'> 	return dir_emit(ctx, dirent-&gt;name, dirent-&gt;namelen, dirent-&gt;ino,</div><div class='del'>-			dirent-&gt;type);</div><div class='add'>+			dirent-&gt;type | FILLDIR_FLAG_NOINTR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int parse_dirfile(char *buf, size_t nbytes, struct file *file,</div><div class='hunk'>@@ -149,7 +149,7 @@ static int parse_dirfile(char *buf, size_t nbytes, struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int fuse_direntplus_link(struct file *file,</div><div class='ctx'> 				struct fuse_direntplus *direntplus,</div><div class='del'>-				u64 attr_version)</div><div class='add'>+				u64 attr_version, u64 evict_ctr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_entry_out *o = &amp;direntplus-&gt;entry_out;</div><div class='ctx'> 	struct fuse_dirent *dirent = &amp;direntplus-&gt;dirent;</div><div class='hunk'>@@ -161,6 +161,7 @@ static int fuse_direntplus_link(struct file *file,</div><div class='ctx'> 	struct fuse_conn *fc;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);</div><div class='add'>+	int epoch;</div><div class='ctx'> </div><div class='ctx'> 	if (!o-&gt;nodeid) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -190,6 +191,7 @@ static int fuse_direntplus_link(struct file *file,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	fc = get_fuse_conn(dir);</div><div class='add'>+	epoch = atomic_read(&amp;fc-&gt;epoch);</div><div class='ctx'> </div><div class='ctx'> 	name.hash = full_name_hash(parent, name.name, name.len);</div><div class='ctx'> 	dentry = d_lookup(parent, &amp;name);</div><div class='hunk'>@@ -233,7 +235,7 @@ retry:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		inode = fuse_iget(dir-&gt;i_sb, o-&gt;nodeid, o-&gt;generation,</div><div class='ctx'> 				  &amp;o-&gt;attr, ATTR_TIMEOUT(o),</div><div class='del'>-				  attr_version);</div><div class='add'>+				  attr_version, evict_ctr);</div><div class='ctx'> 		if (!inode)</div><div class='ctx'> 			inode = ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -256,6 +258,7 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fc-&gt;readdirplus_auto)</div><div class='ctx'> 		set_bit(FUSE_I_INIT_RDPLUS, &amp;get_fuse_inode(inode)-&gt;state);</div><div class='add'>+	dentry-&gt;d_time = epoch;</div><div class='ctx'> 	fuse_change_entry_timeout(dentry, o);</div><div class='ctx'> </div><div class='ctx'> 	dput(dentry);</div><div class='hunk'>@@ -284,7 +287,8 @@ static void fuse_force_forget(struct file *file, u64 nodeid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file,</div><div class='del'>-			     struct dir_context *ctx, u64 attr_version)</div><div class='add'>+			     struct dir_context *ctx, u64 attr_version,</div><div class='add'>+			     u64 evict_ctr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_direntplus *direntplus;</div><div class='ctx'> 	struct fuse_dirent *dirent;</div><div class='hunk'>@@ -319,7 +323,7 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file,</div><div class='ctx'> 		buf += reclen;</div><div class='ctx'> 		nbytes -= reclen;</div><div class='ctx'> </div><div class='del'>-		ret = fuse_direntplus_link(file, direntplus, attr_version);</div><div class='add'>+		ret = fuse_direntplus_link(file, direntplus, attr_version, evict_ctr);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			fuse_force_forget(file, direntplus-&gt;entry_out.nodeid);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -331,34 +335,32 @@ static int fuse_readdir_uncached(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int plus;</div><div class='ctx'> 	ssize_t res;</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct fuse_mount *fm = get_fuse_mount(inode);</div><div class='add'>+	struct fuse_conn *fc = fm-&gt;fc;</div><div class='ctx'> 	struct fuse_io_args ia = {};</div><div class='del'>-	struct fuse_args_pages *ap = &amp;ia.ap;</div><div class='del'>-	struct fuse_page_desc desc = { .length = PAGE_SIZE };</div><div class='del'>-	u64 attr_version = 0;</div><div class='add'>+	struct fuse_args *args = &amp;ia.ap.args;</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t bufsize = clamp((unsigned int) ctx-&gt;count, PAGE_SIZE, fc-&gt;max_pages &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	u64 attr_version = 0, evict_ctr = 0;</div><div class='ctx'> 	bool locked;</div><div class='ctx'> </div><div class='del'>-	page = alloc_page(GFP_KERNEL);</div><div class='del'>-	if (!page)</div><div class='add'>+	buf = kvmalloc(bufsize, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	args-&gt;out_args[0].value = buf;</div><div class='add'>+</div><div class='ctx'> 	plus = fuse_use_readdirplus(inode, ctx);</div><div class='del'>-	ap-&gt;args.out_pages = true;</div><div class='del'>-	ap-&gt;num_pages = 1;</div><div class='del'>-	ap-&gt;pages = &amp;page;</div><div class='del'>-	ap-&gt;descs = &amp;desc;</div><div class='ctx'> 	if (plus) {</div><div class='ctx'> 		attr_version = fuse_get_attr_version(fm-&gt;fc);</div><div class='del'>-		fuse_read_args_fill(&amp;ia, file, ctx-&gt;pos, PAGE_SIZE,</div><div class='del'>-				    FUSE_READDIRPLUS);</div><div class='add'>+		evict_ctr = fuse_get_evict_ctr(fm-&gt;fc);</div><div class='add'>+		fuse_read_args_fill(&amp;ia, file, ctx-&gt;pos, bufsize, FUSE_READDIRPLUS);</div><div class='ctx'> 	} else {</div><div class='del'>-		fuse_read_args_fill(&amp;ia, file, ctx-&gt;pos, PAGE_SIZE,</div><div class='del'>-				    FUSE_READDIR);</div><div class='add'>+		fuse_read_args_fill(&amp;ia, file, ctx-&gt;pos, bufsize, FUSE_READDIR);</div><div class='ctx'> 	}</div><div class='ctx'> 	locked = fuse_lock_inode(inode);</div><div class='del'>-	res = fuse_simple_request(fm, &amp;ap-&gt;args);</div><div class='add'>+	res = fuse_simple_request(fm, args);</div><div class='ctx'> 	fuse_unlock_inode(inode, locked);</div><div class='ctx'> 	if (res &gt;= 0) {</div><div class='ctx'> 		if (!res) {</div><div class='hunk'>@@ -367,15 +369,14 @@ static int fuse_readdir_uncached(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			if (ff-&gt;open_flags &amp; FOPEN_CACHE_DIR)</div><div class='ctx'> 				fuse_readdir_cache_end(file, ctx-&gt;pos);</div><div class='ctx'> 		} else if (plus) {</div><div class='del'>-			res = parse_dirplusfile(page_address(page), res,</div><div class='del'>-						file, ctx, attr_version);</div><div class='add'>+			res = parse_dirplusfile(buf, res, file, ctx, attr_version,</div><div class='add'>+						evict_ctr);</div><div class='ctx'> 		} else {</div><div class='del'>-			res = parse_dirfile(page_address(page), res, file,</div><div class='del'>-					    ctx);</div><div class='add'>+			res = parse_dirfile(buf, res, file, ctx);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__free_page(page);</div><div class='add'>+	kvfree(buf);</div><div class='ctx'> 	fuse_invalidate_atime(inode);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -416,7 +417,7 @@ static enum fuse_parse_result fuse_parse_cache(struct fuse_file *ff,</div><div class='ctx'> 		if (ff-&gt;readdir.pos == ctx-&gt;pos) {</div><div class='ctx'> 			res = FOUND_SOME;</div><div class='ctx'> 			if (!dir_emit(ctx, dirent-&gt;name, dirent-&gt;namelen,</div><div class='del'>-				      dirent-&gt;ino, dirent-&gt;type))</div><div class='add'>+				      dirent-&gt;ino, dirent-&gt;type | FILLDIR_FLAG_NOINTR))</div><div class='ctx'> 				return FOUND_ALL;</div><div class='ctx'> 			ctx-&gt;pos = dirent-&gt;off;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -592,15 +593,11 @@ int fuse_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	if (fuse_is_bad(inode))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ff-&gt;readdir.lock);</div><div class='del'>-</div><div class='ctx'> 	err = UNCACHED;</div><div class='ctx'> 	if (ff-&gt;open_flags &amp; FOPEN_CACHE_DIR)</div><div class='ctx'> 		err = fuse_readdir_cached(file, ctx);</div><div class='ctx'> 	if (err == UNCACHED)</div><div class='ctx'> 		err = fuse_readdir_uncached(file, ctx);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ff-&gt;readdir.lock);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/fuse/sysctl.c b/fs/fuse/sysctl.c<br/>new file mode 100644<br/>index 000000000000..e2d921abcb88<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/sysctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/sysctl.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * linux/fs/fuse/fuse_sysctl.c</div><div class='add'>+ *</div><div class='add'>+ * Sysctl interface to fuse parameters</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+</div><div class='add'>+static struct ctl_table_header *fuse_table_header;</div><div class='add'>+</div><div class='add'>+/* Bound by fuse_init_out max_pages, which is a u16 */</div><div class='add'>+static unsigned int sysctl_fuse_max_pages_limit = 65535;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fuse_init_out request timeouts are u16.</div><div class='add'>+ * This goes up to ~18 hours, which is plenty for a timeout.</div><div class='add'>+ */</div><div class='add'>+static unsigned int sysctl_fuse_req_timeout_limit = 65535;</div><div class='add'>+</div><div class='add'>+static const struct ctl_table fuse_sysctl_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.procname	= "max_pages_limit",</div><div class='add'>+		.data		= &amp;fuse_max_pages_limit,</div><div class='add'>+		.maxlen		= sizeof(fuse_max_pages_limit),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='add'>+		.extra2		= &amp;sysctl_fuse_max_pages_limit,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "default_request_timeout",</div><div class='add'>+		.data		= &amp;fuse_default_req_timeout,</div><div class='add'>+		.maxlen		= sizeof(fuse_default_req_timeout),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;sysctl_fuse_req_timeout_limit,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "max_request_timeout",</div><div class='add'>+		.data		= &amp;fuse_max_req_timeout,</div><div class='add'>+		.maxlen		= sizeof(fuse_max_req_timeout),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_douintvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+		.extra2		= &amp;sysctl_fuse_req_timeout_limit,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int fuse_sysctl_register(void)</div><div class='add'>+{</div><div class='add'>+	fuse_table_header = register_sysctl("fs/fuse", fuse_sysctl_table);</div><div class='add'>+	if (!fuse_table_header)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_sysctl_unregister(void)</div><div class='add'>+{</div><div class='add'>+	unregister_sysctl_table(fuse_table_header);</div><div class='add'>+	fuse_table_header = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/fuse/trace.c b/fs/fuse/trace.c<br/>new file mode 100644<br/>index 000000000000..93bd72efc98c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/trace.c</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Oracle.  All Rights Reserved.</div><div class='add'>+ * Author: Darrick J. Wong &lt;djwong@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+#include "dev_uring_i.h"</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+#include "fuse_dev_i.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "fuse_trace.h"</div><div class='head'>diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c<br/>index 5f1be1da92ce..b2f6486fe1d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/virtio_fs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/virtio_fs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/virtio_fs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/virtio_fs.c</a></div><div class='hunk'>@@ -7,7 +7,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/dax.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/pfn_t.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/group_cpus.h&gt;</div><div class='ctx'> #include &lt;linux/memremap.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/virtio.h&gt;</div><div class='hunk'>@@ -16,8 +17,10 @@</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include "fuse_i.h"</div><div class='add'>+#include "fuse_dev_i.h"</div><div class='ctx'> </div><div class='ctx'> /* Used to help calculate the FUSE connection's max_pages limit for a request's</div><div class='ctx'>  * size. Parts of the struct fuse_req are sliced into scattergather lists in</div><div class='hunk'>@@ -31,6 +34,9 @@</div><div class='ctx'> static DEFINE_MUTEX(virtio_fs_mutex);</div><div class='ctx'> static LIST_HEAD(virtio_fs_instances);</div><div class='ctx'> </div><div class='add'>+/* The /sys/fs/virtio_fs/ kset */</div><div class='add'>+static struct kset *virtio_fs_kset;</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	VQ_HIPRIO,</div><div class='ctx'> 	VQ_REQUEST</div><div class='hunk'>@@ -45,17 +51,19 @@ struct virtio_fs_vq {</div><div class='ctx'> 	struct work_struct done_work;</div><div class='ctx'> 	struct list_head queued_reqs;</div><div class='ctx'> 	struct list_head end_reqs;	/* End these requests */</div><div class='del'>-	struct delayed_work dispatch_work;</div><div class='add'>+	struct work_struct dispatch_work;</div><div class='ctx'> 	struct fuse_dev *fud;</div><div class='ctx'> 	bool connected;</div><div class='ctx'> 	long in_flight;</div><div class='ctx'> 	struct completion in_flight_zero; /* No inflight requests */</div><div class='add'>+	struct kobject *kobj;</div><div class='ctx'> 	char name[VQ_NAME_LEN];</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> /* A virtio-fs device instance */</div><div class='ctx'> struct virtio_fs {</div><div class='del'>-	struct kref refcount;</div><div class='add'>+	struct kobject kobj;</div><div class='add'>+	struct kobject *mqs_kobj;</div><div class='ctx'> 	struct list_head list;    /* on virtio_fs_instances */</div><div class='ctx'> 	char *tag;</div><div class='ctx'> 	struct virtio_fs_vq *vqs;</div><div class='hunk'>@@ -63,6 +71,8 @@ struct virtio_fs {</div><div class='ctx'> 	unsigned int num_request_queues; /* number of request queues */</div><div class='ctx'> 	struct dax_device *dax_dev;</div><div class='ctx'> </div><div class='add'>+	unsigned int *mq_map; /* index = cpu id, value = request vq id */</div><div class='add'>+</div><div class='ctx'> 	/* DAX memory window where file contents are mapped */</div><div class='ctx'> 	void *window_kaddr;</div><div class='ctx'> 	phys_addr_t window_phys_addr;</div><div class='hunk'>@@ -87,7 +97,8 @@ struct virtio_fs_req_work {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,</div><div class='del'>-				 struct fuse_req *req, bool in_flight);</div><div class='add'>+				 struct fuse_req *req, bool in_flight,</div><div class='add'>+				 gfp_t gfp);</div><div class='ctx'> </div><div class='ctx'> static const struct constant_table dax_param_enums[] = {</div><div class='ctx'> 	{"always",	FUSE_DAX_ALWAYS },</div><div class='hunk'>@@ -161,27 +172,125 @@ static inline void dec_in_flight_req(struct virtio_fs_vq *fsvq)</div><div class='ctx'> 		complete(&amp;fsvq-&gt;in_flight_zero);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void release_virtio_fs_obj(struct kref *ref)</div><div class='add'>+static ssize_t tag_show(struct kobject *kobj,</div><div class='add'>+		struct kobj_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct virtio_fs *fs = container_of(kobj, struct virtio_fs, kobj);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%s\n", fs-&gt;tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute virtio_fs_tag_attr = __ATTR_RO(tag);</div><div class='add'>+</div><div class='add'>+static struct attribute *virtio_fs_attrs[] = {</div><div class='add'>+	&amp;virtio_fs_tag_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(virtio_fs);</div><div class='add'>+</div><div class='add'>+static void virtio_fs_ktype_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='del'>-	struct virtio_fs *vfs = container_of(ref, struct virtio_fs, refcount);</div><div class='add'>+	struct virtio_fs *vfs = container_of(kobj, struct virtio_fs, kobj);</div><div class='ctx'> </div><div class='add'>+	kfree(vfs-&gt;mq_map);</div><div class='ctx'> 	kfree(vfs-&gt;vqs);</div><div class='ctx'> 	kfree(vfs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct kobj_type virtio_fs_ktype = {</div><div class='add'>+	.release = virtio_fs_ktype_release,</div><div class='add'>+	.sysfs_ops = &amp;kobj_sysfs_ops,</div><div class='add'>+	.default_groups = virtio_fs_groups,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct virtio_fs_vq *virtio_fs_kobj_to_vq(struct virtio_fs *fs,</div><div class='add'>+		struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fs-&gt;nvqs; i++) {</div><div class='add'>+		if (kobj == fs-&gt;vqs[i].kobj)</div><div class='add'>+			return &amp;fs-&gt;vqs[i];</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t name_show(struct kobject *kobj,</div><div class='add'>+		struct kobj_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct virtio_fs *fs = container_of(kobj-&gt;parent-&gt;parent, struct virtio_fs, kobj);</div><div class='add'>+	struct virtio_fs_vq *fsvq = virtio_fs_kobj_to_vq(fs, kobj);</div><div class='add'>+</div><div class='add'>+	if (!fsvq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return sysfs_emit(buf, "%s\n", fsvq-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute virtio_fs_vq_name_attr = __ATTR_RO(name);</div><div class='add'>+</div><div class='add'>+static ssize_t cpu_list_show(struct kobject *kobj,</div><div class='add'>+		struct kobj_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct virtio_fs *fs = container_of(kobj-&gt;parent-&gt;parent, struct virtio_fs, kobj);</div><div class='add'>+	struct virtio_fs_vq *fsvq = virtio_fs_kobj_to_vq(fs, kobj);</div><div class='add'>+	unsigned int cpu, qid;</div><div class='add'>+	const size_t size = PAGE_SIZE - 1;</div><div class='add'>+	bool first = true;</div><div class='add'>+	int ret = 0, pos = 0;</div><div class='add'>+</div><div class='add'>+	if (!fsvq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	qid = fsvq-&gt;vq-&gt;index;</div><div class='add'>+	for (cpu = 0; cpu &lt; nr_cpu_ids; cpu++) {</div><div class='add'>+		if (qid &lt; VQ_REQUEST || (fs-&gt;mq_map[cpu] == qid)) {</div><div class='add'>+			if (first)</div><div class='add'>+				ret = snprintf(buf + pos, size - pos, "%u", cpu);</div><div class='add'>+			else</div><div class='add'>+				ret = snprintf(buf + pos, size - pos, ", %u", cpu);</div><div class='add'>+</div><div class='add'>+			if (ret &gt;= size - pos)</div><div class='add'>+				break;</div><div class='add'>+			first = false;</div><div class='add'>+			pos += ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ret = snprintf(buf + pos, size + 1 - pos, "\n");</div><div class='add'>+	return pos + ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute virtio_fs_vq_cpu_list_attr = __ATTR_RO(cpu_list);</div><div class='add'>+</div><div class='add'>+static struct attribute *virtio_fs_vq_attrs[] = {</div><div class='add'>+	&amp;virtio_fs_vq_name_attr.attr,</div><div class='add'>+	&amp;virtio_fs_vq_cpu_list_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group virtio_fs_vq_attr_group = {</div><div class='add'>+	.attrs = virtio_fs_vq_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Make sure virtiofs_mutex is held */</div><div class='add'>+static void virtio_fs_put_locked(struct virtio_fs *fs)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;virtio_fs_mutex);</div><div class='add'>+</div><div class='add'>+	kobject_put(&amp;fs-&gt;kobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void virtio_fs_put(struct virtio_fs *fs)</div><div class='ctx'> {</div><div class='del'>-	kref_put(&amp;fs-&gt;refcount, release_virtio_fs_obj);</div><div class='add'>+	mutex_lock(&amp;virtio_fs_mutex);</div><div class='add'>+	virtio_fs_put_locked(fs);</div><div class='add'>+	mutex_unlock(&amp;virtio_fs_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void virtio_fs_fiq_release(struct fuse_iqueue *fiq)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_fs *vfs = fiq-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;virtio_fs_mutex);</div><div class='ctx'> 	virtio_fs_put(vfs);</div><div class='del'>-	mutex_unlock(&amp;virtio_fs_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void virtio_fs_drain_queue(struct virtio_fs_vq *fsvq)</div><div class='hunk'>@@ -202,7 +311,7 @@ static void virtio_fs_drain_queue(struct virtio_fs_vq *fsvq)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flush_work(&amp;fsvq-&gt;done_work);</div><div class='del'>-	flush_delayed_work(&amp;fsvq-&gt;dispatch_work);</div><div class='add'>+	flush_work(&amp;fsvq-&gt;dispatch_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void virtio_fs_drain_all_queues_locked(struct virtio_fs *fs)</div><div class='hunk'>@@ -242,27 +351,107 @@ static void virtio_fs_start_all_queues(struct virtio_fs *fs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void virtio_fs_delete_queues_sysfs(struct virtio_fs *fs)</div><div class='add'>+{</div><div class='add'>+	struct virtio_fs_vq *fsvq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fs-&gt;nvqs; i++) {</div><div class='add'>+		fsvq = &amp;fs-&gt;vqs[i];</div><div class='add'>+		kobject_put(fsvq-&gt;kobj);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int virtio_fs_add_queues_sysfs(struct virtio_fs *fs)</div><div class='add'>+{</div><div class='add'>+	struct virtio_fs_vq *fsvq;</div><div class='add'>+	char buff[12];</div><div class='add'>+	int i, j, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fs-&gt;nvqs; i++) {</div><div class='add'>+		fsvq = &amp;fs-&gt;vqs[i];</div><div class='add'>+</div><div class='add'>+		sprintf(buff, "%d", i);</div><div class='add'>+		fsvq-&gt;kobj = kobject_create_and_add(buff, fs-&gt;mqs_kobj);</div><div class='add'>+		if (!fsvq-&gt;kobj) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = sysfs_create_group(fsvq-&gt;kobj, &amp;virtio_fs_vq_attr_group);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kobject_put(fsvq-&gt;kobj);</div><div class='add'>+			goto out_del;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_del:</div><div class='add'>+	for (j = 0; j &lt; i; j++) {</div><div class='add'>+		fsvq = &amp;fs-&gt;vqs[j];</div><div class='add'>+		kobject_put(fsvq-&gt;kobj);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Add a new instance to the list or return -EEXIST if tag name exists*/</div><div class='del'>-static int virtio_fs_add_instance(struct virtio_fs *fs)</div><div class='add'>+static int virtio_fs_add_instance(struct virtio_device *vdev,</div><div class='add'>+				  struct virtio_fs *fs)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_fs *fs2;</div><div class='del'>-	bool duplicate = false;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;virtio_fs_mutex);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(fs2, &amp;virtio_fs_instances, list) {</div><div class='del'>-		if (strcmp(fs-&gt;tag, fs2-&gt;tag) == 0)</div><div class='del'>-			duplicate = true;</div><div class='add'>+		if (strcmp(fs-&gt;tag, fs2-&gt;tag) == 0) {</div><div class='add'>+			mutex_unlock(&amp;virtio_fs_mutex);</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use the virtio_device's index as a unique identifier, there is no</div><div class='add'>+	 * need to allocate our own identifiers because the virtio_fs instance</div><div class='add'>+	 * is only visible to userspace as long as the underlying virtio_device</div><div class='add'>+	 * exists.</div><div class='add'>+	 */</div><div class='add'>+	fs-&gt;kobj.kset = virtio_fs_kset;</div><div class='add'>+	ret = kobject_add(&amp;fs-&gt;kobj, NULL, "%d", vdev-&gt;index);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	fs-&gt;mqs_kobj = kobject_create_and_add("mqs", &amp;fs-&gt;kobj);</div><div class='add'>+	if (!fs-&gt;mqs_kobj) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_del;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!duplicate)</div><div class='del'>-		list_add_tail(&amp;fs-&gt;list, &amp;virtio_fs_instances);</div><div class='add'>+	ret = sysfs_create_link(&amp;fs-&gt;kobj, &amp;vdev-&gt;dev.kobj, "device");</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	ret = virtio_fs_add_queues_sysfs(fs);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_remove;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;fs-&gt;list, &amp;virtio_fs_instances);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;virtio_fs_mutex);</div><div class='ctx'> </div><div class='del'>-	if (duplicate)</div><div class='del'>-		return -EEXIST;</div><div class='add'>+	kobject_uevent(&amp;fs-&gt;kobj, KOBJ_ADD);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_remove:</div><div class='add'>+	sysfs_remove_link(&amp;fs-&gt;kobj, "device");</div><div class='add'>+out_put:</div><div class='add'>+	kobject_put(fs-&gt;mqs_kobj);</div><div class='add'>+out_del:</div><div class='add'>+	kobject_del(&amp;fs-&gt;kobj);</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;virtio_fs_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return the virtio_fs with a given tag, or NULL */</div><div class='hunk'>@@ -274,7 +463,7 @@ static struct virtio_fs *virtio_fs_find_instance(const char *tag)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(fs, &amp;virtio_fs_instances, list) {</div><div class='ctx'> 		if (strcmp(fs-&gt;tag, tag) == 0) {</div><div class='del'>-			kref_get(&amp;fs-&gt;refcount);</div><div class='add'>+			kobject_get(&amp;fs-&gt;kobj);</div><div class='ctx'> 			goto found;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -323,6 +512,17 @@ static int virtio_fs_read_tag(struct virtio_device *vdev, struct virtio_fs *fs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	memcpy(fs-&gt;tag, tag_buf, len);</div><div class='ctx'> 	fs-&gt;tag[len] = '\0';</div><div class='add'>+</div><div class='add'>+	/* While the VIRTIO specification allows any character, newlines are</div><div class='add'>+	 * awkward on mount(8) command-lines and cause problems in the sysfs</div><div class='add'>+	 * "tag" attr and uevent TAG= properties. Forbid them.</div><div class='add'>+	 */</div><div class='add'>+	if (strchr(fs-&gt;tag, '\n')) {</div><div class='add'>+		dev_dbg(&amp;vdev-&gt;dev, "refusing virtiofs tag with newline character\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;vdev-&gt;dev, "discovered new tag: %s\n", fs-&gt;tag);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,7 +545,11 @@ static void virtio_fs_hiprio_done_work(struct work_struct *work)</div><div class='ctx'> 			kfree(req);</div><div class='ctx'> 			dec_in_flight_req(fsvq);</div><div class='ctx'> 		}</div><div class='del'>-	} while (!virtqueue_enable_cb(vq) &amp;&amp; likely(!virtqueue_is_broken(vq)));</div><div class='add'>+	} while (!virtqueue_enable_cb(vq));</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;fsvq-&gt;queued_reqs))</div><div class='add'>+		schedule_work(&amp;fsvq-&gt;dispatch_work);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;fsvq-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -353,7 +557,7 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_req *req;</div><div class='ctx'> 	struct virtio_fs_vq *fsvq = container_of(work, struct virtio_fs_vq,</div><div class='del'>-						 dispatch_work.work);</div><div class='add'>+						 dispatch_work);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("virtio-fs: worker %s called.\n", __func__);</div><div class='hunk'>@@ -373,6 +577,8 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* Dispatch pending requests */</div><div class='ctx'> 	while (1) {</div><div class='add'>+		unsigned int flags;</div><div class='add'>+</div><div class='ctx'> 		spin_lock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 		req = list_first_entry_or_null(&amp;fsvq-&gt;queued_reqs,</div><div class='ctx'> 					       struct fuse_req, list);</div><div class='hunk'>@@ -383,13 +589,13 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)</div><div class='ctx'> 		list_del_init(&amp;req-&gt;list);</div><div class='ctx'> 		spin_unlock(&amp;fsvq-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		ret = virtio_fs_enqueue_req(fsvq, req, true);</div><div class='add'>+		flags = memalloc_nofs_save();</div><div class='add'>+		ret = virtio_fs_enqueue_req(fsvq, req, true, GFP_KERNEL);</div><div class='add'>+		memalloc_nofs_restore(flags);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			if (ret == -ENOMEM || ret == -ENOSPC) {</div><div class='add'>+			if (ret == -ENOSPC) {</div><div class='ctx'> 				spin_lock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 				list_add_tail(&amp;req-&gt;list, &amp;fsvq-&gt;queued_reqs);</div><div class='del'>-				schedule_delayed_work(&amp;fsvq-&gt;dispatch_work,</div><div class='del'>-						      msecs_to_jiffies(1));</div><div class='ctx'> 				spin_unlock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -432,12 +638,10 @@ static int send_forget_request(struct virtio_fs_vq *fsvq,</div><div class='ctx'> </div><div class='ctx'> 	ret = virtqueue_add_outbuf(vq, &amp;sg, 1, forget, GFP_ATOMIC);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		if (ret == -ENOMEM || ret == -ENOSPC) {</div><div class='add'>+		if (ret == -ENOSPC) {</div><div class='ctx'> 			pr_debug("virtio-fs: Could not queue FORGET: err=%d. Will try later\n",</div><div class='ctx'> 				 ret);</div><div class='ctx'> 			list_add_tail(&amp;forget-&gt;list, &amp;fsvq-&gt;queued_reqs);</div><div class='del'>-			schedule_delayed_work(&amp;fsvq-&gt;dispatch_work,</div><div class='del'>-					      msecs_to_jiffies(1));</div><div class='ctx'> 			if (!in_flight)</div><div class='ctx'> 				inc_in_flight_req(fsvq);</div><div class='ctx'> 			/* Queue is full */</div><div class='hunk'>@@ -469,7 +673,7 @@ static void virtio_fs_hiprio_dispatch_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_fs_forget *forget;</div><div class='ctx'> 	struct virtio_fs_vq *fsvq = container_of(work, struct virtio_fs_vq,</div><div class='del'>-						 dispatch_work.work);</div><div class='add'>+						 dispatch_work);</div><div class='ctx'> 	pr_debug("virtio-fs: worker %s called.\n", __func__);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		spin_lock(&amp;fsvq-&gt;lock);</div><div class='hunk'>@@ -488,7 +692,7 @@ static void virtio_fs_hiprio_dispatch_work(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate and copy args into req-&gt;argbuf */</div><div class='del'>-static int copy_args_to_argbuf(struct fuse_req *req)</div><div class='add'>+static int copy_args_to_argbuf(struct fuse_req *req, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_args *args = req-&gt;args;</div><div class='ctx'> 	unsigned int offset = 0;</div><div class='hunk'>@@ -502,7 +706,7 @@ static int copy_args_to_argbuf(struct fuse_req *req)</div><div class='ctx'> 	len = fuse_len_args(num_in, (struct fuse_arg *) args-&gt;in_args) +</div><div class='ctx'> 	      fuse_len_args(num_out, args-&gt;out_args);</div><div class='ctx'> </div><div class='del'>-	req-&gt;argbuf = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+	req-&gt;argbuf = kmalloc(len, gfp);</div><div class='ctx'> 	if (!req-&gt;argbuf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -558,11 +762,10 @@ static void copy_args_from_argbuf(struct fuse_args *args, struct fuse_req *req)</div><div class='ctx'> static void virtio_fs_request_complete(struct fuse_req *req,</div><div class='ctx'> 				       struct virtio_fs_vq *fsvq)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_pqueue *fpq = &amp;fsvq-&gt;fud-&gt;pq;</div><div class='ctx'> 	struct fuse_args *args;</div><div class='ctx'> 	struct fuse_args_pages *ap;</div><div class='ctx'> 	unsigned int len, i, thislen;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO verify that server properly follows FUSE protocol</div><div class='hunk'>@@ -574,12 +777,12 @@ static void virtio_fs_request_complete(struct fuse_req *req,</div><div class='ctx'> 	if (args-&gt;out_pages &amp;&amp; args-&gt;page_zeroing) {</div><div class='ctx'> 		len = args-&gt;out_args[args-&gt;out_numargs - 1].size;</div><div class='ctx'> 		ap = container_of(args, typeof(*ap), args);</div><div class='del'>-		for (i = 0; i &lt; ap-&gt;num_pages; i++) {</div><div class='add'>+		for (i = 0; i &lt; ap-&gt;num_folios; i++) {</div><div class='ctx'> 			thislen = ap-&gt;descs[i].length;</div><div class='ctx'> 			if (len &lt; thislen) {</div><div class='ctx'> 				WARN_ON(ap-&gt;descs[i].offset);</div><div class='del'>-				page = ap-&gt;pages[i];</div><div class='del'>-				zero_user_segment(page, len, thislen);</div><div class='add'>+				folio = ap-&gt;folios[i];</div><div class='add'>+				folio_zero_segment(folio, len, thislen);</div><div class='ctx'> 				len = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				len -= thislen;</div><div class='hunk'>@@ -587,9 +790,7 @@ static void virtio_fs_request_complete(struct fuse_req *req,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fpq-&gt;lock);</div><div class='ctx'> 	clear_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='del'>-	spin_unlock(&amp;fpq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	fuse_request_end(req);</div><div class='ctx'> 	spin_lock(&amp;fsvq-&gt;lock);</div><div class='hunk'>@@ -627,7 +828,7 @@ static void virtio_fs_requests_done_work(struct work_struct *work)</div><div class='ctx'> 			list_move_tail(&amp;req-&gt;list, &amp;reqs);</div><div class='ctx'> 			spin_unlock(&amp;fpq-&gt;lock);</div><div class='ctx'> 		}</div><div class='del'>-	} while (!virtqueue_enable_cb(vq) &amp;&amp; likely(!virtqueue_is_broken(vq)));</div><div class='add'>+	} while (!virtqueue_enable_cb(vq));</div><div class='ctx'> 	spin_unlock(&amp;fsvq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* End requests */</div><div class='hunk'>@@ -647,6 +848,50 @@ static void virtio_fs_requests_done_work(struct work_struct *work)</div><div class='ctx'> 			virtio_fs_request_complete(req, fsvq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Try to push previously queued requests, as the queue might no longer be full */</div><div class='add'>+	spin_lock(&amp;fsvq-&gt;lock);</div><div class='add'>+	if (!list_empty(&amp;fsvq-&gt;queued_reqs))</div><div class='add'>+		schedule_work(&amp;fsvq-&gt;dispatch_work);</div><div class='add'>+	spin_unlock(&amp;fsvq-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void virtio_fs_map_queues(struct virtio_device *vdev, struct virtio_fs *fs)</div><div class='add'>+{</div><div class='add'>+	const struct cpumask *mask, *masks;</div><div class='add'>+	unsigned int q, cpu, nr_masks;</div><div class='add'>+</div><div class='add'>+	/* First attempt to map using existing transport layer affinities</div><div class='add'>+	 * e.g. PCIe MSI-X</div><div class='add'>+	 */</div><div class='add'>+	if (!vdev-&gt;config-&gt;get_vq_affinity)</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	for (q = 0; q &lt; fs-&gt;num_request_queues; q++) {</div><div class='add'>+		mask = vdev-&gt;config-&gt;get_vq_affinity(vdev, VQ_REQUEST + q);</div><div class='add'>+		if (!mask)</div><div class='add'>+			goto fallback;</div><div class='add'>+</div><div class='add'>+		for_each_cpu(cpu, mask)</div><div class='add'>+			fs-&gt;mq_map[cpu] = q + VQ_REQUEST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+fallback:</div><div class='add'>+	/* Attempt to map evenly in groups over the CPUs */</div><div class='add'>+	masks = group_cpus_evenly(fs-&gt;num_request_queues, &amp;nr_masks);</div><div class='add'>+	/* If even this fails we default to all CPUs use first request queue */</div><div class='add'>+	if (!masks) {</div><div class='add'>+		for_each_possible_cpu(cpu)</div><div class='add'>+			fs-&gt;mq_map[cpu] = VQ_REQUEST;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (q = 0; q &lt; fs-&gt;num_request_queues; q++) {</div><div class='add'>+		for_each_cpu(cpu, &amp;masks[q % nr_masks])</div><div class='add'>+			fs-&gt;mq_map[cpu] = q + VQ_REQUEST;</div><div class='add'>+	}</div><div class='add'>+	kfree(masks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Virtqueue interrupt handler */</div><div class='hunk'>@@ -670,12 +915,12 @@ static void virtio_fs_init_vq(struct virtio_fs_vq *fsvq, char *name,</div><div class='ctx'> </div><div class='ctx'> 	if (vq_type == VQ_REQUEST) {</div><div class='ctx'> 		INIT_WORK(&amp;fsvq-&gt;done_work, virtio_fs_requests_done_work);</div><div class='del'>-		INIT_DELAYED_WORK(&amp;fsvq-&gt;dispatch_work,</div><div class='del'>-				  virtio_fs_request_dispatch_work);</div><div class='add'>+		INIT_WORK(&amp;fsvq-&gt;dispatch_work,</div><div class='add'>+				virtio_fs_request_dispatch_work);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		INIT_WORK(&amp;fsvq-&gt;done_work, virtio_fs_hiprio_done_work);</div><div class='del'>-		INIT_DELAYED_WORK(&amp;fsvq-&gt;dispatch_work,</div><div class='del'>-				  virtio_fs_hiprio_dispatch_work);</div><div class='add'>+		INIT_WORK(&amp;fsvq-&gt;dispatch_work,</div><div class='add'>+				virtio_fs_hiprio_dispatch_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -683,9 +928,13 @@ static void virtio_fs_init_vq(struct virtio_fs_vq *fsvq, char *name,</div><div class='ctx'> static int virtio_fs_setup_vqs(struct virtio_device *vdev,</div><div class='ctx'> 			       struct virtio_fs *fs)</div><div class='ctx'> {</div><div class='add'>+	struct virtqueue_info *vqs_info;</div><div class='ctx'> 	struct virtqueue **vqs;</div><div class='del'>-	vq_callback_t **callbacks;</div><div class='del'>-	const char **names;</div><div class='add'>+	/* Specify pre_vectors to ensure that the queues before the</div><div class='add'>+	 * request queues (e.g. hiprio) don't claim any of the CPUs in</div><div class='add'>+	 * the multi-queue mapping and interrupt affinities</div><div class='add'>+	 */</div><div class='add'>+	struct irq_affinity desc = { .pre_vectors = VQ_REQUEST };</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -694,24 +943,27 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev,</div><div class='ctx'> 	if (fs-&gt;num_request_queues == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* Truncate nr of request queues to nr_cpu_id */</div><div class='add'>+	fs-&gt;num_request_queues = min_t(unsigned int, fs-&gt;num_request_queues,</div><div class='add'>+					nr_cpu_ids);</div><div class='ctx'> 	fs-&gt;nvqs = VQ_REQUEST + fs-&gt;num_request_queues;</div><div class='ctx'> 	fs-&gt;vqs = kcalloc(fs-&gt;nvqs, sizeof(fs-&gt;vqs[VQ_HIPRIO]), GFP_KERNEL);</div><div class='ctx'> 	if (!fs-&gt;vqs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	vqs = kmalloc_array(fs-&gt;nvqs, sizeof(vqs[VQ_HIPRIO]), GFP_KERNEL);</div><div class='del'>-	callbacks = kmalloc_array(fs-&gt;nvqs, sizeof(callbacks[VQ_HIPRIO]),</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-	names = kmalloc_array(fs-&gt;nvqs, sizeof(names[VQ_HIPRIO]), GFP_KERNEL);</div><div class='del'>-	if (!vqs || !callbacks || !names) {</div><div class='add'>+	fs-&gt;mq_map = kcalloc_node(nr_cpu_ids, sizeof(*fs-&gt;mq_map), GFP_KERNEL,</div><div class='add'>+					dev_to_node(&amp;vdev-&gt;dev));</div><div class='add'>+	vqs_info = kcalloc(fs-&gt;nvqs, sizeof(*vqs_info), GFP_KERNEL);</div><div class='add'>+	if (!vqs || !vqs_info || !fs-&gt;mq_map) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the hiprio/forget request virtqueue */</div><div class='del'>-	callbacks[VQ_HIPRIO] = virtio_fs_vq_done;</div><div class='add'>+	vqs_info[VQ_HIPRIO].callback = virtio_fs_vq_done;</div><div class='ctx'> 	virtio_fs_init_vq(&amp;fs-&gt;vqs[VQ_HIPRIO], "hiprio", VQ_HIPRIO);</div><div class='del'>-	names[VQ_HIPRIO] = fs-&gt;vqs[VQ_HIPRIO].name;</div><div class='add'>+	vqs_info[VQ_HIPRIO].name = fs-&gt;vqs[VQ_HIPRIO].name;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the requests virtqueues */</div><div class='ctx'> 	for (i = VQ_REQUEST; i &lt; fs-&gt;nvqs; i++) {</div><div class='hunk'>@@ -719,11 +971,11 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev,</div><div class='ctx'> </div><div class='ctx'> 		snprintf(vq_name, VQ_NAME_LEN, "requests.%u", i - VQ_REQUEST);</div><div class='ctx'> 		virtio_fs_init_vq(&amp;fs-&gt;vqs[i], vq_name, VQ_REQUEST);</div><div class='del'>-		callbacks[i] = virtio_fs_vq_done;</div><div class='del'>-		names[i] = fs-&gt;vqs[i].name;</div><div class='add'>+		vqs_info[i].callback = virtio_fs_vq_done;</div><div class='add'>+		vqs_info[i].name = fs-&gt;vqs[i].name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = virtio_find_vqs(vdev, fs-&gt;nvqs, vqs, callbacks, names, NULL);</div><div class='add'>+	ret = virtio_find_vqs(vdev, fs-&gt;nvqs, vqs, vqs_info, &amp;desc);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -732,11 +984,12 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev,</div><div class='ctx'> </div><div class='ctx'> 	virtio_fs_start_all_queues(fs);</div><div class='ctx'> out:</div><div class='del'>-	kfree(names);</div><div class='del'>-	kfree(callbacks);</div><div class='add'>+	kfree(vqs_info);</div><div class='ctx'> 	kfree(vqs);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		kfree(fs-&gt;vqs);</div><div class='add'>+		kfree(fs-&gt;mq_map);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -752,7 +1005,7 @@ static void virtio_fs_cleanup_vqs(struct virtio_device *vdev)</div><div class='ctx'>  */</div><div class='ctx'> static long virtio_fs_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,</div><div class='ctx'> 				    long nr_pages, enum dax_access_mode mode,</div><div class='del'>-				    void **kaddr, pfn_t *pfn)</div><div class='add'>+				    void **kaddr, unsigned long *pfn)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_fs *fs = dax_get_private(dax_dev);</div><div class='ctx'> 	phys_addr_t offset = PFN_PHYS(pgoff);</div><div class='hunk'>@@ -761,8 +1014,7 @@ static long virtio_fs_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,</div><div class='ctx'> 	if (kaddr)</div><div class='ctx'> 		*kaddr = fs-&gt;window_kaddr + offset;</div><div class='ctx'> 	if (pfn)</div><div class='del'>-		*pfn = phys_to_pfn_t(fs-&gt;window_phys_addr + offset,</div><div class='del'>-					PFN_DEV | PFN_MAP);</div><div class='add'>+		*pfn = PHYS_PFN(fs-&gt;window_phys_addr + offset);</div><div class='ctx'> 	return nr_pages &gt; max_nr_pages ? max_nr_pages : nr_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -795,8 +1047,11 @@ static void virtio_fs_cleanup_dax(void *data)</div><div class='ctx'> 	put_dax(dax_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(cleanup_dax, struct dax_dev *, if (!IS_ERR_OR_NULL(_T)) virtio_fs_cleanup_dax(_T))</div><div class='add'>+</div><div class='ctx'> static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)</div><div class='ctx'> {</div><div class='add'>+	struct dax_device *dax_dev __free(cleanup_dax) = NULL;</div><div class='ctx'> 	struct virtio_shm_region cache_reg;</div><div class='ctx'> 	struct dev_pagemap *pgmap;</div><div class='ctx'> 	bool have_cache;</div><div class='hunk'>@@ -804,6 +1059,12 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_FUSE_DAX))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	dax_dev = alloc_dax(fs, &amp;virtio_fs_dax_ops);</div><div class='add'>+	if (IS_ERR(dax_dev)) {</div><div class='add'>+		int rc = PTR_ERR(dax_dev);</div><div class='add'>+		return rc == -EOPNOTSUPP ? 0 : rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Get cache region */</div><div class='ctx'> 	have_cache = virtio_get_shm_region(vdev, &amp;cache_reg,</div><div class='ctx'> 					   (u8)VIRTIO_FS_SHMCAP_ID_CACHE);</div><div class='hunk'>@@ -849,10 +1110,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)</div><div class='ctx'> 	dev_dbg(&amp;vdev-&gt;dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n",</div><div class='ctx'> 		__func__, fs-&gt;window_kaddr, cache_reg.addr, cache_reg.len);</div><div class='ctx'> </div><div class='del'>-	fs-&gt;dax_dev = alloc_dax(fs, &amp;virtio_fs_dax_ops);</div><div class='del'>-	if (IS_ERR(fs-&gt;dax_dev))</div><div class='del'>-		return PTR_ERR(fs-&gt;dax_dev);</div><div class='del'>-</div><div class='add'>+	fs-&gt;dax_dev = no_free_ptr(dax_dev);</div><div class='ctx'> 	return devm_add_action_or_reset(&amp;vdev-&gt;dev, virtio_fs_cleanup_dax,</div><div class='ctx'> 					fs-&gt;dax_dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -865,7 +1123,7 @@ static int virtio_fs_probe(struct virtio_device *vdev)</div><div class='ctx'> 	fs = kzalloc(sizeof(*fs), GFP_KERNEL);</div><div class='ctx'> 	if (!fs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	kref_init(&amp;fs-&gt;refcount);</div><div class='add'>+	kobject_init(&amp;fs-&gt;kobj, &amp;virtio_fs_ktype);</div><div class='ctx'> 	vdev-&gt;priv = fs;</div><div class='ctx'> </div><div class='ctx'> 	ret = virtio_fs_read_tag(vdev, fs);</div><div class='hunk'>@@ -876,7 +1134,7 @@ static int virtio_fs_probe(struct virtio_device *vdev)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* TODO vq affinity */</div><div class='add'>+	virtio_fs_map_queues(vdev, fs);</div><div class='ctx'> </div><div class='ctx'> 	ret = virtio_fs_setup_dax(vdev, fs);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -887,7 +1145,7 @@ static int virtio_fs_probe(struct virtio_device *vdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	virtio_device_ready(vdev);</div><div class='ctx'> </div><div class='del'>-	ret = virtio_fs_add_instance(fs);</div><div class='add'>+	ret = virtio_fs_add_instance(vdev, fs);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_vqs;</div><div class='ctx'> </div><div class='hunk'>@@ -896,11 +1154,10 @@ static int virtio_fs_probe(struct virtio_device *vdev)</div><div class='ctx'> out_vqs:</div><div class='ctx'> 	virtio_reset_device(vdev);</div><div class='ctx'> 	virtio_fs_cleanup_vqs(vdev);</div><div class='del'>-	kfree(fs-&gt;vqs);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	vdev-&gt;priv = NULL;</div><div class='del'>-	kfree(fs);</div><div class='add'>+	kobject_put(&amp;fs-&gt;kobj);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -924,6 +1181,10 @@ static void virtio_fs_remove(struct virtio_device *vdev)</div><div class='ctx'> 	mutex_lock(&amp;virtio_fs_mutex);</div><div class='ctx'> 	/* This device is going away. No one should get new reference */</div><div class='ctx'> 	list_del_init(&amp;fs-&gt;list);</div><div class='add'>+	virtio_fs_delete_queues_sysfs(fs);</div><div class='add'>+	sysfs_remove_link(&amp;fs-&gt;kobj, "device");</div><div class='add'>+	kobject_put(fs-&gt;mqs_kobj);</div><div class='add'>+	kobject_del(&amp;fs-&gt;kobj);</div><div class='ctx'> 	virtio_fs_stop_all_queues(fs);</div><div class='ctx'> 	virtio_fs_drain_all_queues_locked(fs);</div><div class='ctx'> 	virtio_reset_device(vdev);</div><div class='hunk'>@@ -931,7 +1192,7 @@ static void virtio_fs_remove(struct virtio_device *vdev)</div><div class='ctx'> </div><div class='ctx'> 	vdev-&gt;priv = NULL;</div><div class='ctx'> 	/* Put device reference on virtio_fs object */</div><div class='del'>-	virtio_fs_put(fs);</div><div class='add'>+	virtio_fs_put_locked(fs);</div><div class='ctx'> 	mutex_unlock(&amp;virtio_fs_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -959,7 +1220,6 @@ static const unsigned int feature_table[] = {};</div><div class='ctx'> </div><div class='ctx'> static struct virtio_driver virtio_fs_driver = {</div><div class='ctx'> 	.driver.name		= KBUILD_MODNAME,</div><div class='del'>-	.driver.owner		= THIS_MODULE,</div><div class='ctx'> 	.id_table		= id_table,</div><div class='ctx'> 	.feature_table		= feature_table,</div><div class='ctx'> 	.feature_table_size	= ARRAY_SIZE(feature_table),</div><div class='hunk'>@@ -971,22 +1231,13 @@ static struct virtio_driver virtio_fs_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void virtio_fs_wake_forget_and_unlock(struct fuse_iqueue *fiq)</div><div class='del'>-__releases(fiq-&gt;lock)</div><div class='add'>+static void virtio_fs_send_forget(struct fuse_iqueue *fiq, struct fuse_forget_link *link)</div><div class='ctx'> {</div><div class='del'>-	struct fuse_forget_link *link;</div><div class='ctx'> 	struct virtio_fs_forget *forget;</div><div class='ctx'> 	struct virtio_fs_forget_req *req;</div><div class='del'>-	struct virtio_fs *fs;</div><div class='del'>-	struct virtio_fs_vq *fsvq;</div><div class='del'>-	u64 unique;</div><div class='del'>-</div><div class='del'>-	link = fuse_dequeue_forget(fiq, 1, NULL);</div><div class='del'>-	unique = fuse_get_unique(fiq);</div><div class='del'>-</div><div class='del'>-	fs = fiq-&gt;priv;</div><div class='del'>-	fsvq = &amp;fs-&gt;vqs[VQ_HIPRIO];</div><div class='del'>-	spin_unlock(&amp;fiq-&gt;lock);</div><div class='add'>+	struct virtio_fs *fs = fiq-&gt;priv;</div><div class='add'>+	struct virtio_fs_vq *fsvq = &amp;fs-&gt;vqs[VQ_HIPRIO];</div><div class='add'>+	u64 unique = fuse_get_unique(fiq);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a buffer for the request */</div><div class='ctx'> 	forget = kmalloc(sizeof(*forget), GFP_NOFS | __GFP_NOFAIL);</div><div class='hunk'>@@ -1006,8 +1257,7 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 	kfree(link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void virtio_fs_wake_interrupt_and_unlock(struct fuse_iqueue *fiq)</div><div class='del'>-__releases(fiq-&gt;lock)</div><div class='add'>+static void virtio_fs_send_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO interrupts.</div><div class='hunk'>@@ -1016,19 +1266,18 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 	 * Exceptions are blocking lock operations; for example fcntl(F_SETLKW)</div><div class='ctx'> 	 * with shared lock between host and guest.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_unlock(&amp;fiq-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Count number of scatter-gather elements required */</div><div class='del'>-static unsigned int sg_count_fuse_pages(struct fuse_page_desc *page_descs,</div><div class='del'>-				       unsigned int num_pages,</div><div class='del'>-				       unsigned int total_len)</div><div class='add'>+static unsigned int sg_count_fuse_folios(struct fuse_folio_desc *folio_descs,</div><div class='add'>+					 unsigned int num_folios,</div><div class='add'>+					 unsigned int total_len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int this_len;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_pages &amp;&amp; total_len; i++) {</div><div class='del'>-		this_len =  min(page_descs[i].length, total_len);</div><div class='add'>+	for (i = 0; i &lt; num_folios &amp;&amp; total_len; i++) {</div><div class='add'>+		this_len =  min(folio_descs[i].length, total_len);</div><div class='ctx'> 		total_len -= this_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1047,8 +1296,8 @@ static unsigned int sg_count_fuse_req(struct fuse_req *req)</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;in_pages) {</div><div class='ctx'> 		size = args-&gt;in_args[args-&gt;in_numargs - 1].size;</div><div class='del'>-		total_sgs += sg_count_fuse_pages(ap-&gt;descs, ap-&gt;num_pages,</div><div class='del'>-						 size);</div><div class='add'>+		total_sgs += sg_count_fuse_folios(ap-&gt;descs, ap-&gt;num_folios,</div><div class='add'>+						  size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(FR_ISREPLY, &amp;req-&gt;flags))</div><div class='hunk'>@@ -1061,27 +1310,27 @@ static unsigned int sg_count_fuse_req(struct fuse_req *req)</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;out_pages) {</div><div class='ctx'> 		size = args-&gt;out_args[args-&gt;out_numargs - 1].size;</div><div class='del'>-		total_sgs += sg_count_fuse_pages(ap-&gt;descs, ap-&gt;num_pages,</div><div class='del'>-						 size);</div><div class='add'>+		total_sgs += sg_count_fuse_folios(ap-&gt;descs, ap-&gt;num_folios,</div><div class='add'>+						  size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return total_sgs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Add pages to scatter-gather list and return number of elements used */</div><div class='del'>-static unsigned int sg_init_fuse_pages(struct scatterlist *sg,</div><div class='del'>-				       struct page **pages,</div><div class='del'>-				       struct fuse_page_desc *page_descs,</div><div class='del'>-				       unsigned int num_pages,</div><div class='del'>-				       unsigned int total_len)</div><div class='add'>+/* Add folios to scatter-gather list and return number of elements used */</div><div class='add'>+static unsigned int sg_init_fuse_folios(struct scatterlist *sg,</div><div class='add'>+					struct folio **folios,</div><div class='add'>+					struct fuse_folio_desc *folio_descs,</div><div class='add'>+					unsigned int num_folios,</div><div class='add'>+				        unsigned int total_len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int this_len;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_pages &amp;&amp; total_len; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_folios &amp;&amp; total_len; i++) {</div><div class='ctx'> 		sg_init_table(&amp;sg[i], 1);</div><div class='del'>-		this_len =  min(page_descs[i].length, total_len);</div><div class='del'>-		sg_set_page(&amp;sg[i], pages[i], this_len, page_descs[i].offset);</div><div class='add'>+		this_len =  min(folio_descs[i].length, total_len);</div><div class='add'>+		sg_set_folio(&amp;sg[i], folios[i], this_len, folio_descs[i].offset);</div><div class='ctx'> 		total_len -= this_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1106,10 +1355,10 @@ static unsigned int sg_init_fuse_args(struct scatterlist *sg,</div><div class='ctx'> 		sg_init_one(&amp;sg[total_sgs++], argbuf, len);</div><div class='ctx'> </div><div class='ctx'> 	if (argpages)</div><div class='del'>-		total_sgs += sg_init_fuse_pages(&amp;sg[total_sgs],</div><div class='del'>-						ap-&gt;pages, ap-&gt;descs,</div><div class='del'>-						ap-&gt;num_pages,</div><div class='del'>-						args[numargs - 1].size);</div><div class='add'>+		total_sgs += sg_init_fuse_folios(&amp;sg[total_sgs],</div><div class='add'>+						 ap-&gt;folios, ap-&gt;descs,</div><div class='add'>+						 ap-&gt;num_folios,</div><div class='add'>+						 args[numargs - 1].size);</div><div class='ctx'> </div><div class='ctx'> 	if (len_used)</div><div class='ctx'> 		*len_used = len;</div><div class='hunk'>@@ -1119,7 +1368,8 @@ static unsigned int sg_init_fuse_args(struct scatterlist *sg,</div><div class='ctx'> </div><div class='ctx'> /* Add a request to a virtqueue and kick the device */</div><div class='ctx'> static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,</div><div class='del'>-				 struct fuse_req *req, bool in_flight)</div><div class='add'>+				 struct fuse_req *req, bool in_flight,</div><div class='add'>+				 gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	/* requests need at least 4 elements */</div><div class='ctx'> 	struct scatterlist *stack_sgs[6];</div><div class='hunk'>@@ -1132,7 +1382,7 @@ static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,</div><div class='ctx'> 	unsigned int out_sgs = 0;</div><div class='ctx'> 	unsigned int in_sgs = 0;</div><div class='ctx'> 	unsigned int total_sgs;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	unsigned int i, hash;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool notify;</div><div class='ctx'> 	struct fuse_pqueue *fpq;</div><div class='hunk'>@@ -1140,8 +1390,8 @@ static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,</div><div class='ctx'> 	/* Does the sglist fit on the stack? */</div><div class='ctx'> 	total_sgs = sg_count_fuse_req(req);</div><div class='ctx'> 	if (total_sgs &gt; ARRAY_SIZE(stack_sgs)) {</div><div class='del'>-		sgs = kmalloc_array(total_sgs, sizeof(sgs[0]), GFP_ATOMIC);</div><div class='del'>-		sg = kmalloc_array(total_sgs, sizeof(sg[0]), GFP_ATOMIC);</div><div class='add'>+		sgs = kmalloc_array(total_sgs, sizeof(sgs[0]), gfp);</div><div class='add'>+		sg = kmalloc_array(total_sgs, sizeof(sg[0]), gfp);</div><div class='ctx'> 		if (!sgs || !sg) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1149,7 +1399,7 @@ static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Use a bounce buffer since stack args cannot be mapped */</div><div class='del'>-	ret = copy_args_to_argbuf(req);</div><div class='add'>+	ret = copy_args_to_argbuf(req, gfp);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1192,8 +1442,9 @@ static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,</div><div class='ctx'> </div><div class='ctx'> 	/* Request successfully sent. */</div><div class='ctx'> 	fpq = &amp;fsvq-&gt;fud-&gt;pq;</div><div class='add'>+	hash = fuse_req_hash(req-&gt;in.h.unique);</div><div class='ctx'> 	spin_lock(&amp;fpq-&gt;lock);</div><div class='del'>-	list_add_tail(&amp;req-&gt;list, fpq-&gt;processing);</div><div class='add'>+	list_add_tail(&amp;req-&gt;list, &amp;fpq-&gt;processing[hash]);</div><div class='ctx'> 	spin_unlock(&amp;fpq-&gt;lock);</div><div class='ctx'> 	set_bit(FR_SENT, &amp;req-&gt;flags);</div><div class='ctx'> 	/* matches barrier in request_wait_answer() */</div><div class='hunk'>@@ -1221,33 +1472,30 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void virtio_fs_wake_pending_and_unlock(struct fuse_iqueue *fiq)</div><div class='del'>-__releases(fiq-&gt;lock)</div><div class='add'>+static void virtio_fs_send_req(struct fuse_iqueue *fiq, struct fuse_req *req)</div><div class='ctx'> {</div><div class='del'>-	unsigned int queue_id = VQ_REQUEST; /* TODO multiqueue */</div><div class='add'>+	unsigned int queue_id;</div><div class='ctx'> 	struct virtio_fs *fs;</div><div class='del'>-	struct fuse_req *req;</div><div class='ctx'> 	struct virtio_fs_vq *fsvq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(list_empty(&amp;fiq-&gt;pending));</div><div class='del'>-	req = list_last_entry(&amp;fiq-&gt;pending, struct fuse_req, list);</div><div class='add'>+	fuse_request_assign_unique(fiq, req);</div><div class='add'>+</div><div class='ctx'> 	clear_bit(FR_PENDING, &amp;req-&gt;flags);</div><div class='del'>-	list_del_init(&amp;req-&gt;list);</div><div class='del'>-	WARN_ON(!list_empty(&amp;fiq-&gt;pending));</div><div class='del'>-	spin_unlock(&amp;fiq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	fs = fiq-&gt;priv;</div><div class='add'>+	queue_id = fs-&gt;mq_map[raw_smp_processor_id()];</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s: opcode %u unique %#llx nodeid %#llx in.len %u out.len %u\n",</div><div class='del'>-		  __func__, req-&gt;in.h.opcode, req-&gt;in.h.unique,</div><div class='add'>+	pr_debug("%s: opcode %u unique %#llx nodeid %#llx in.len %u out.len %u queue_id %u\n",</div><div class='add'>+		 __func__, req-&gt;in.h.opcode, req-&gt;in.h.unique,</div><div class='ctx'> 		 req-&gt;in.h.nodeid, req-&gt;in.h.len,</div><div class='del'>-		 fuse_len_args(req-&gt;args-&gt;out_numargs, req-&gt;args-&gt;out_args));</div><div class='add'>+		 fuse_len_args(req-&gt;args-&gt;out_numargs, req-&gt;args-&gt;out_args),</div><div class='add'>+		 queue_id);</div><div class='ctx'> </div><div class='ctx'> 	fsvq = &amp;fs-&gt;vqs[queue_id];</div><div class='del'>-	ret = virtio_fs_enqueue_req(fsvq, req, false);</div><div class='add'>+	ret = virtio_fs_enqueue_req(fsvq, req, false, GFP_ATOMIC);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		if (ret == -ENOMEM || ret == -ENOSPC) {</div><div class='add'>+		if (ret == -ENOSPC) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Virtqueue full. Retry submission from worker</div><div class='ctx'> 			 * context as we might be holding fc-&gt;bg_lock.</div><div class='hunk'>@@ -1255,8 +1503,6 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 			spin_lock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 			list_add_tail(&amp;req-&gt;list, &amp;fsvq-&gt;queued_reqs);</div><div class='ctx'> 			inc_in_flight_req(fsvq);</div><div class='del'>-			schedule_delayed_work(&amp;fsvq-&gt;dispatch_work,</div><div class='del'>-						msecs_to_jiffies(1));</div><div class='ctx'> 			spin_unlock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1266,17 +1512,17 @@ __releases(fiq-&gt;lock)</div><div class='ctx'> 		/* Can't end request in submission context. Use a worker */</div><div class='ctx'> 		spin_lock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 		list_add_tail(&amp;req-&gt;list, &amp;fsvq-&gt;end_reqs);</div><div class='del'>-		schedule_delayed_work(&amp;fsvq-&gt;dispatch_work, 0);</div><div class='add'>+		schedule_work(&amp;fsvq-&gt;dispatch_work);</div><div class='ctx'> 		spin_unlock(&amp;fsvq-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fuse_iqueue_ops virtio_fs_fiq_ops = {</div><div class='del'>-	.wake_forget_and_unlock		= virtio_fs_wake_forget_and_unlock,</div><div class='del'>-	.wake_interrupt_and_unlock	= virtio_fs_wake_interrupt_and_unlock,</div><div class='del'>-	.wake_pending_and_unlock	= virtio_fs_wake_pending_and_unlock,</div><div class='del'>-	.release			= virtio_fs_fiq_release,</div><div class='add'>+	.send_forget	= virtio_fs_send_forget,</div><div class='add'>+	.send_interrupt	= virtio_fs_send_interrupt,</div><div class='add'>+	.send_req	= virtio_fs_send_req,</div><div class='add'>+	.release	= virtio_fs_fiq_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void virtio_fs_ctx_set_defaults(struct fuse_fs_context *ctx)</div><div class='hunk'>@@ -1420,6 +1666,9 @@ static int virtio_fs_get_tree(struct fs_context *fsc)</div><div class='ctx'> 	unsigned int virtqueue_size;</div><div class='ctx'> 	int err = -EIO;</div><div class='ctx'> </div><div class='add'>+	if (!fsc-&gt;source)</div><div class='add'>+		return invalf(fsc, "No source specified");</div><div class='add'>+</div><div class='ctx'> 	/* This gets a reference on virtio_fs object. This ptr gets installed</div><div class='ctx'> 	 * in fc-&gt;iq-&gt;priv. Once fuse_conn is going away, it calls -&gt;put()</div><div class='ctx'> 	 * to drop the reference to this object.</div><div class='hunk'>@@ -1448,6 +1697,7 @@ static int virtio_fs_get_tree(struct fs_context *fsc)</div><div class='ctx'> 	fc-&gt;delete_stale = true;</div><div class='ctx'> 	fc-&gt;auto_submounts = true;</div><div class='ctx'> 	fc-&gt;sync_fs = true;</div><div class='add'>+	fc-&gt;use_pages_for_kvec_io = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Tell FUSE to split requests that exceed the virtqueue's size */</div><div class='ctx'> 	fc-&gt;max_pages_limit = min_t(unsigned int, fc-&gt;max_pages_limit,</div><div class='hunk'>@@ -1476,9 +1726,7 @@ static int virtio_fs_get_tree(struct fs_context *fsc)</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='ctx'> 	kfree(fc);</div><div class='del'>-	mutex_lock(&amp;virtio_fs_mutex);</div><div class='ctx'> 	virtio_fs_put(fs);</div><div class='del'>-	mutex_unlock(&amp;virtio_fs_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1508,23 +1756,59 @@ static struct file_system_type virtio_fs_type = {</div><div class='ctx'> 	.name		= "virtiofs",</div><div class='ctx'> 	.init_fs_context = virtio_fs_init_fs_context,</div><div class='ctx'> 	.kill_sb	= virtio_kill_sb,</div><div class='add'>+	.fs_flags	= FS_ALLOW_IDMAP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int virtio_fs_uevent(const struct kobject *kobj, struct kobj_uevent_env *env)</div><div class='add'>+{</div><div class='add'>+	const struct virtio_fs *fs = container_of(kobj, struct virtio_fs, kobj);</div><div class='add'>+</div><div class='add'>+	add_uevent_var(env, "TAG=%s", fs-&gt;tag);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct kset_uevent_ops virtio_fs_uevent_ops = {</div><div class='add'>+	.uevent = virtio_fs_uevent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __init virtio_fs_sysfs_init(void)</div><div class='add'>+{</div><div class='add'>+	virtio_fs_kset = kset_create_and_add("virtiofs", &amp;virtio_fs_uevent_ops,</div><div class='add'>+					     fs_kobj);</div><div class='add'>+	if (!virtio_fs_kset)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void virtio_fs_sysfs_exit(void)</div><div class='add'>+{</div><div class='add'>+	kset_unregister(virtio_fs_kset);</div><div class='add'>+	virtio_fs_kset = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init virtio_fs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = register_virtio_driver(&amp;virtio_fs_driver);</div><div class='add'>+	ret = virtio_fs_sysfs_init();</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = register_virtio_driver(&amp;virtio_fs_driver);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto sysfs_exit;</div><div class='add'>+</div><div class='ctx'> 	ret = register_filesystem(&amp;virtio_fs_type);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		unregister_virtio_driver(&amp;virtio_fs_driver);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto unregister_virtio_driver;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+unregister_virtio_driver:</div><div class='add'>+	unregister_virtio_driver(&amp;virtio_fs_driver);</div><div class='add'>+sysfs_exit:</div><div class='add'>+	virtio_fs_sysfs_exit();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> module_init(virtio_fs_init);</div><div class='ctx'> </div><div class='hunk'>@@ -1532,6 +1816,7 @@ static void __exit virtio_fs_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_filesystem(&amp;virtio_fs_type);</div><div class='ctx'> 	unregister_virtio_driver(&amp;virtio_fs_driver);</div><div class='add'>+	virtio_fs_sysfs_exit();</div><div class='ctx'> }</div><div class='ctx'> module_exit(virtio_fs_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/fuse/xattr.c b/fs/fuse/xattr.c<br/>index 5b423fdbb13f..93dfb06b6cea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/fuse/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/fuse/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/fuse/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/fuse/xattr.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ ssize_t fuse_getxattr(struct inode *inode, const char *name, void *value,</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (!ret &amp;&amp; !size)</div><div class='del'>-		ret = min_t(ssize_t, outarg.size, XATTR_SIZE_MAX);</div><div class='add'>+		ret = min_t(size_t, outarg.size, XATTR_SIZE_MAX);</div><div class='ctx'> 	if (ret == -ENOSYS) {</div><div class='ctx'> 		fm-&gt;fc-&gt;no_getxattr = 1;</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='hunk'>@@ -143,7 +143,7 @@ ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (!ret &amp;&amp; !size)</div><div class='del'>-		ret = min_t(ssize_t, outarg.size, XATTR_LIST_MAX);</div><div class='add'>+		ret = min_t(size_t, outarg.size, XATTR_LIST_MAX);</div><div class='ctx'> 	if (ret &gt; 0 &amp;&amp; size)</div><div class='ctx'> 		ret = fuse_verify_xattr_list(list, ret);</div><div class='ctx'> 	if (ret == -ENOSYS) {</div><div class='hunk'>@@ -164,9 +164,10 @@ int fuse_removexattr(struct inode *inode, const char *name)</div><div class='ctx'> </div><div class='ctx'> 	args.opcode = FUSE_REMOVEXATTR;</div><div class='ctx'> 	args.nodeid = get_node_id(inode);</div><div class='del'>-	args.in_numargs = 1;</div><div class='del'>-	args.in_args[0].size = strlen(name) + 1;</div><div class='del'>-	args.in_args[0].value = name;</div><div class='add'>+	args.in_numargs = 2;</div><div class='add'>+	fuse_set_zero_arg0(&amp;args);</div><div class='add'>+	args.in_args[1].size = strlen(name) + 1;</div><div class='add'>+	args.in_args[1].value = name;</div><div class='ctx'> 	err = fuse_simple_request(fm, &amp;args);</div><div class='ctx'> 	if (err == -ENOSYS) {</div><div class='ctx'> 		fm-&gt;fc-&gt;no_removexattr = 1;</div><div class='head'>diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig<br/>index be7f87a8e11a..7bd231d16d4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,6 @@ config GFS2_FS</div><div class='ctx'> 	select BUFFER_HEAD</div><div class='ctx'> 	select FS_POSIX_ACL</div><div class='ctx'> 	select CRC32</div><div class='del'>-	select LIBCRC32C</div><div class='ctx'> 	select QUOTACTL</div><div class='ctx'> 	select FS_IOMAP</div><div class='ctx'> 	help</div><div class='head'>diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c<br/>index 974aca9c8ea8..e79ad087512a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/aops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/aops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/aops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/aops.c</a></div><div class='hunk'>@@ -37,27 +37,6 @@</div><div class='ctx'> #include "aops.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,</div><div class='del'>-			     size_t from, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *head = folio_buffers(folio);</div><div class='del'>-	unsigned int bsize = head-&gt;b_size;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	size_t to = from + len;</div><div class='del'>-	size_t start, end;</div><div class='del'>-</div><div class='del'>-	for (bh = head, start = 0; bh != head || !start;</div><div class='del'>-	     bh = bh-&gt;b_this_page, start = end) {</div><div class='del'>-		end = start + bsize;</div><div class='del'>-		if (end &lt;= from)</div><div class='del'>-			continue;</div><div class='del'>-		if (start &gt;= to)</div><div class='del'>-			break;</div><div class='del'>-		set_buffer_uptodate(bh);</div><div class='del'>-		gfs2_trans_add_data(ip-&gt;i_gl, bh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_get_block_noalloc - Fills in a buffer head with details about a block</div><div class='ctx'>  * @inode: The inode</div><div class='hunk'>@@ -102,8 +81,7 @@ static int gfs2_write_jdata_folio(struct folio *folio,</div><div class='ctx'> 	 * the page size, the remaining memory is zeroed when mapped, and</div><div class='ctx'> 	 * writes to that region are not written out to the file."</div><div class='ctx'> 	 */</div><div class='del'>-	if (folio_pos(folio) &lt; i_size &amp;&amp;</div><div class='del'>-	    i_size &lt; folio_pos(folio) + folio_size(folio))</div><div class='add'>+	if (folio_pos(folio) &lt; i_size &amp;&amp; i_size &lt; folio_next_pos(folio))</div><div class='ctx'> 		folio_zero_segment(folio, offset_in_folio(folio, i_size),</div><div class='ctx'> 				folio_size(folio));</div><div class='ctx'> </div><div class='hunk'>@@ -116,8 +94,7 @@ static int gfs2_write_jdata_folio(struct folio *folio,</div><div class='ctx'>  * @folio: The folio to write</div><div class='ctx'>  * @wbc: The writeback control</div><div class='ctx'>  *</div><div class='del'>- * This is shared between writepage and writepages and implements the</div><div class='del'>- * core of the writepage operation. If a transaction is required then</div><div class='add'>+ * Implements the core of write back. If a transaction is required then</div><div class='ctx'>  * the checked flag will have been set and the transaction will have</div><div class='ctx'>  * already been started before this is called.</div><div class='ctx'>  */</div><div class='hunk'>@@ -134,38 +111,40 @@ static int __gfs2_jdata_write_folio(struct folio *folio,</div><div class='ctx'> 					inode-&gt;i_sb-&gt;s_blocksize,</div><div class='ctx'> 					BIT(BH_Dirty)|BIT(BH_Uptodate));</div><div class='ctx'> 		}</div><div class='del'>-		gfs2_trans_add_databufs(ip, folio, 0, folio_size(folio));</div><div class='add'>+		gfs2_trans_add_databufs(ip-&gt;i_gl, folio, 0, folio_size(folio));</div><div class='ctx'> 	}</div><div class='ctx'> 	return gfs2_write_jdata_folio(folio, wbc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * gfs2_jdata_writepage - Write complete page</div><div class='del'>- * @page: Page to write</div><div class='add'>+ * gfs2_jdata_writeback - Write jdata folios to the log</div><div class='add'>+ * @mapping: The mapping to write</div><div class='ctx'>  * @wbc: The writeback control</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: errno</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc)</div><div class='add'>+int gfs2_jdata_writeback(struct address_space *mapping, struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='del'>-	struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='add'>+	struct gfs2_sbd *sdp = GFS2_SB(mapping-&gt;host);</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='add'>+	BUG_ON(current-&gt;journal_info);</div><div class='ctx'> 	if (gfs2_assert_withdraw(sdp, ip-&gt;i_gl-&gt;gl_state == LM_ST_EXCLUSIVE))</div><div class='del'>-		goto out;</div><div class='del'>-	if (folio_test_checked(folio) || current-&gt;journal_info)</div><div class='del'>-		goto out_ignore;</div><div class='del'>-	return __gfs2_jdata_write_folio(folio, wbc);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-out_ignore:</div><div class='del'>-	folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-out:</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return 0;</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;error))) {</div><div class='add'>+		if (folio_test_checked(folio)) {</div><div class='add'>+			folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		error = __gfs2_jdata_write_folio(folio, wbc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -179,7 +158,11 @@ static int gfs2_writepages(struct address_space *mapping,</div><div class='ctx'> 			   struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gfs2_mapping2sbd(mapping);</div><div class='del'>-	struct iomap_writepage_ctx wpc = { };</div><div class='add'>+	struct iomap_writepage_ctx wpc = {</div><div class='add'>+		.inode		= mapping-&gt;host,</div><div class='add'>+		.wbc		= wbc,</div><div class='add'>+		.ops		= &amp;gfs2_writeback_ops,</div><div class='add'>+	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -188,7 +171,7 @@ static int gfs2_writepages(struct address_space *mapping,</div><div class='ctx'> 	 * want balance_dirty_pages() to loop indefinitely trying to write out</div><div class='ctx'> 	 * pages held in the ail that it can't find.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = iomap_writepages(mapping, wbc, &amp;wpc, &amp;gfs2_writeback_ops);</div><div class='add'>+	ret = iomap_writepages(&amp;wpc);</div><div class='ctx'> 	if (ret == 0 &amp;&amp; wbc-&gt;nr_to_write &gt; 0)</div><div class='ctx'> 		set_bit(SDF_FORCE_AIL_FLUSH, &amp;sdp-&gt;sd_flags);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -258,24 +241,16 @@ continue_unlock:</div><div class='ctx'> </div><div class='ctx'> 		ret = __gfs2_jdata_write_folio(folio, wbc);</div><div class='ctx'> 		if (unlikely(ret)) {</div><div class='del'>-			if (ret == AOP_WRITEPAGE_ACTIVATE) {</div><div class='del'>-				folio_unlock(folio);</div><div class='del'>-				ret = 0;</div><div class='del'>-			} else {</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * done_index is set past this page,</div><div class='del'>-				 * so media errors will not choke</div><div class='del'>-				 * background writeout for the entire</div><div class='del'>-				 * file. This has consequences for</div><div class='del'>-				 * range_cyclic semantics (ie. it may</div><div class='del'>-				 * not be suitable for data integrity</div><div class='del'>-				 * writeout).</div><div class='del'>-				 */</div><div class='del'>-				*done_index = folio_next_index(folio);</div><div class='del'>-				ret = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+			/*</div><div class='add'>+			 * done_index is set past this page, so media errors</div><div class='add'>+			 * will not choke background writeout for the entire</div><div class='add'>+			 * file. This has consequences for range_cyclic</div><div class='add'>+			 * semantics (ie. it may not be suitable for data</div><div class='add'>+			 * integrity writeout).</div><div class='add'>+			 */</div><div class='add'>+			*done_index = folio_next_index(folio);</div><div class='add'>+			ret = 1;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -335,10 +310,7 @@ static int gfs2_write_cache_jdata(struct address_space *mapping,</div><div class='ctx'> 			range_whole = 1;</div><div class='ctx'> 		cycled = 1; /* ignore range_cyclic tests */</div><div class='ctx'> 	}</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='del'>-		tag = PAGECACHE_TAG_TOWRITE;</div><div class='del'>-	else</div><div class='del'>-		tag = PAGECACHE_TAG_DIRTY;</div><div class='add'>+	tag = wbc_to_tag(wbc);</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL || wbc-&gt;tagged_writepages)</div><div class='hunk'>@@ -448,18 +420,18 @@ static int gfs2_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='del'>-	int error;</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!gfs2_is_jdata(ip) ||</div><div class='ctx'> 	    (i_blocksize(inode) == PAGE_SIZE &amp;&amp; !folio_buffers(folio))) {</div><div class='del'>-		error = iomap_read_folio(folio, &amp;gfs2_iomap_ops);</div><div class='add'>+		iomap_bio_read_folio(folio, &amp;gfs2_iomap_ops);</div><div class='ctx'> 	} else if (gfs2_is_stuffed(ip)) {</div><div class='ctx'> 		error = stuffed_read_folio(ip, folio);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		error = mpage_read_folio(folio, gfs2_block_map);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -527,7 +499,7 @@ static void gfs2_readahead(struct readahead_control *rac)</div><div class='ctx'> 	else if (gfs2_is_jdata(ip))</div><div class='ctx'> 		mpage_readahead(rac, gfs2_block_map);</div><div class='ctx'> 	else</div><div class='del'>-		iomap_readahead(rac, &amp;gfs2_iomap_ops);</div><div class='add'>+		iomap_bio_readahead(rac, &amp;gfs2_iomap_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -570,7 +542,7 @@ out:</div><div class='ctx'> 	gfs2_trans_end(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool jdata_dirty_folio(struct address_space *mapping,</div><div class='add'>+static bool gfs2_jdata_dirty_folio(struct address_space *mapping,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	if (current-&gt;journal_info)</div><div class='hunk'>@@ -749,12 +721,12 @@ static const struct address_space_operations gfs2_aops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct address_space_operations gfs2_jdata_aops = {</div><div class='del'>-	.writepage = gfs2_jdata_writepage,</div><div class='ctx'> 	.writepages = gfs2_jdata_writepages,</div><div class='ctx'> 	.read_folio = gfs2_read_folio,</div><div class='ctx'> 	.readahead = gfs2_readahead,</div><div class='del'>-	.dirty_folio = jdata_dirty_folio,</div><div class='add'>+	.dirty_folio = gfs2_jdata_dirty_folio,</div><div class='ctx'> 	.bmap = gfs2_bmap,</div><div class='add'>+	.migrate_folio = buffer_migrate_folio,</div><div class='ctx'> 	.invalidate_folio = gfs2_invalidate_folio,</div><div class='ctx'> 	.release_folio = gfs2_release_folio,</div><div class='ctx'> 	.is_partially_uptodate = block_is_partially_uptodate,</div><div class='head'>diff --git a/fs/gfs2/aops.h b/fs/gfs2/aops.h<br/>index a10c4334d248..bf002522a782 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/aops.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/aops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/aops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/aops.h</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #include "incore.h"</div><div class='ctx'> </div><div class='ctx'> void adjust_fs_space(struct inode *inode);</div><div class='del'>-void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,</div><div class='del'>-			     size_t from, size_t len);</div><div class='add'>+int gfs2_jdata_writeback(struct address_space *mapping, struct writeback_control *wbc);</div><div class='ctx'> </div><div class='ctx'> #endif /* __AOPS_DOT_H__ */</div><div class='head'>diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c<br/>index d9ccfd27e4f1..131091520de6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/bmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/bmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/bmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/bmap.c</a></div><div class='hunk'>@@ -963,12 +963,16 @@ static struct folio *</div><div class='ctx'> gfs2_iomap_get_folio(struct iomap_iter *iter, loff_t pos, unsigned len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = iter-&gt;inode;</div><div class='add'>+	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	unsigned int blockmask = i_blocksize(inode) - 1;</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='ctx'> 	unsigned int blocks;</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='add'>+	if (!gfs2_is_jdata(ip) &amp;&amp; !gfs2_is_stuffed(ip))</div><div class='add'>+		return iomap_get_folio(iter, pos, len);</div><div class='add'>+</div><div class='ctx'> 	blocks = ((pos &amp; blockmask) + len + blockmask) &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> 	status = gfs2_trans_begin(sdp, RES_DINODE + blocks, 0);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -987,20 +991,22 @@ static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos,</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='ctx'> </div><div class='del'>-	if (!gfs2_is_stuffed(ip))</div><div class='del'>-		gfs2_trans_add_databufs(ip, folio, offset_in_folio(folio, pos),</div><div class='add'>+	if (gfs2_is_jdata(ip) &amp;&amp; !gfs2_is_stuffed(ip))</div><div class='add'>+		gfs2_trans_add_databufs(ip-&gt;i_gl, folio,</div><div class='add'>+					offset_in_folio(folio, pos),</div><div class='ctx'> 					copied);</div><div class='ctx'> </div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	if (tr-&gt;tr_num_buf_new)</div><div class='del'>-		__mark_inode_dirty(inode, I_DIRTY_DATASYNC);</div><div class='del'>-</div><div class='del'>-	gfs2_trans_end(sdp);</div><div class='add'>+	if (gfs2_is_jdata(ip) || gfs2_is_stuffed(ip)) {</div><div class='add'>+		if (tr-&gt;tr_num_buf_new)</div><div class='add'>+			__mark_inode_dirty(inode, I_DIRTY_DATASYNC);</div><div class='add'>+		gfs2_trans_end(sdp);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct iomap_folio_ops gfs2_iomap_folio_ops = {</div><div class='add'>+const struct iomap_write_ops gfs2_iomap_write_ops = {</div><div class='ctx'> 	.get_folio = gfs2_iomap_get_folio,</div><div class='ctx'> 	.put_folio = gfs2_iomap_put_folio,</div><div class='ctx'> };</div><div class='hunk'>@@ -1077,8 +1083,6 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos,</div><div class='ctx'> 		gfs2_trans_end(sdp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gfs2_is_stuffed(ip) || gfs2_is_jdata(ip))</div><div class='del'>-		iomap-&gt;folio_ops = &amp;gfs2_iomap_folio_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_trans_end:</div><div class='hunk'>@@ -1296,11 +1300,14 @@ int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock,</div><div class='ctx'>  * uses iomap write to perform its actions, which begin their own transactions</div><div class='ctx'>  * (iomap_begin, get_folio, etc.)</div><div class='ctx'>  */</div><div class='del'>-static int gfs2_block_zero_range(struct inode *inode, loff_t from,</div><div class='del'>-				 unsigned int length)</div><div class='add'>+static int gfs2_block_zero_range(struct inode *inode, loff_t from, loff_t length)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(current-&gt;journal_info);</div><div class='del'>-	return iomap_zero_range(inode, from, length, NULL, &amp;gfs2_iomap_ops);</div><div class='add'>+	if (from &gt;= inode-&gt;i_size)</div><div class='add'>+		return 0;</div><div class='add'>+	length = min(length, inode-&gt;i_size - from);</div><div class='add'>+	return iomap_zero_range(inode, from, length, NULL, &amp;gfs2_iomap_ops,</div><div class='add'>+			&amp;gfs2_iomap_write_ops, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define GFS2_JTRUNC_REVOKES 8192</div><div class='hunk'>@@ -1718,7 +1725,8 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)</div><div class='ctx'> 	struct buffer_head *dibh, *bh;</div><div class='ctx'> 	struct gfs2_holder rd_gh;</div><div class='ctx'> 	unsigned int bsize_shift = sdp-&gt;sd_sb.sb_bsize_shift;</div><div class='del'>-	u64 lblock = (offset + (1 &lt;&lt; bsize_shift) - 1) &gt;&gt; bsize_shift;</div><div class='add'>+	unsigned int bsize = 1 &lt;&lt; bsize_shift;</div><div class='add'>+	u64 lblock = (offset + bsize - 1) &gt;&gt; bsize_shift;</div><div class='ctx'> 	__u16 start_list[GFS2_MAX_META_HEIGHT];</div><div class='ctx'> 	__u16 __end_list[GFS2_MAX_META_HEIGHT], *end_list = NULL;</div><div class='ctx'> 	unsigned int start_aligned, end_aligned;</div><div class='hunk'>@@ -1729,7 +1737,7 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)</div><div class='ctx'> 	u64 prev_bnr = 0;</div><div class='ctx'> 	__be64 *start, *end;</div><div class='ctx'> </div><div class='del'>-	if (offset &gt;= maxsize) {</div><div class='add'>+	if (offset + bsize - 1 &gt;= maxsize) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The starting point lies beyond the allocated metadata;</div><div class='ctx'> 		 * there are no blocks to deallocate.</div><div class='hunk'>@@ -1826,7 +1834,7 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)</div><div class='ctx'> 			gfs2_assert_withdraw(sdp, bh);</div><div class='ctx'> 			if (gfs2_assert_withdraw(sdp,</div><div class='ctx'> 						 prev_bnr != bh-&gt;b_blocknr)) {</div><div class='del'>-				fs_emerg(sdp, "inode %llu, block:%llu, i_h:%u,"</div><div class='add'>+				fs_emerg(sdp, "inode %llu, block:%llu, i_h:%u, "</div><div class='ctx'> 					 "s_h:%u, mp_h:%u\n",</div><div class='ctx'> 				       (unsigned long long)ip-&gt;i_no_addr,</div><div class='ctx'> 				       prev_bnr, ip-&gt;i_height, strip_h, mp_h);</div><div class='hunk'>@@ -2464,23 +2472,26 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gfs2_map_blocks(struct iomap_writepage_ctx *wpc, struct inode *inode,</div><div class='del'>-		loff_t offset)</div><div class='add'>+static ssize_t gfs2_writeback_range(struct iomap_writepage_ctx *wpc,</div><div class='add'>+		struct folio *folio, u64 offset, unsigned int len, u64 end_pos)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(gfs2_is_stuffed(GFS2_I(inode))))</div><div class='add'>+	if (WARN_ON_ONCE(gfs2_is_stuffed(GFS2_I(wpc-&gt;inode))))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (offset &gt;= wpc-&gt;iomap.offset &amp;&amp;</div><div class='del'>-	    offset &lt; wpc-&gt;iomap.offset + wpc-&gt;iomap.length)</div><div class='del'>-		return 0;</div><div class='add'>+	if (offset &lt; wpc-&gt;iomap.offset ||</div><div class='add'>+	    offset &gt;= wpc-&gt;iomap.offset + wpc-&gt;iomap.length) {</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;wpc-&gt;iomap, 0, sizeof(wpc-&gt;iomap));</div><div class='del'>-	ret = gfs2_iomap_get(inode, offset, INT_MAX, &amp;wpc-&gt;iomap);</div><div class='del'>-	return ret;</div><div class='add'>+		memset(&amp;wpc-&gt;iomap, 0, sizeof(wpc-&gt;iomap));</div><div class='add'>+		ret = gfs2_iomap_get(wpc-&gt;inode, offset, INT_MAX, &amp;wpc-&gt;iomap);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iomap_add_to_ioend(wpc, folio, offset, end_pos, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct iomap_writeback_ops gfs2_writeback_ops = {</div><div class='del'>-	.map_blocks		= gfs2_map_blocks,</div><div class='add'>+	.writeback_range	= gfs2_writeback_range,</div><div class='add'>+	.writeback_submit	= iomap_ioend_writeback_submit,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/gfs2/bmap.h b/fs/gfs2/bmap.h<br/>index 4e8b1e8ebdf3..6cdc72dd55a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/bmap.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/bmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/bmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/bmap.h</a></div><div class='hunk'>@@ -44,6 +44,7 @@ static inline void gfs2_write_calc_reserv(const struct gfs2_inode *ip,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern const struct iomap_ops gfs2_iomap_ops;</div><div class='add'>+extern const struct iomap_write_ops gfs2_iomap_write_ops;</div><div class='ctx'> extern const struct iomap_writeback_ops gfs2_writeback_ops;</div><div class='ctx'> </div><div class='ctx'> int gfs2_unstuff_dinode(struct gfs2_inode *ip);</div><div class='head'>diff --git a/fs/gfs2/dentry.c b/fs/gfs2/dentry.c<br/>index 177f1f41f225..95050e719233 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/dentry.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/dentry.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/dentry.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/dentry.c</a></div><div class='hunk'>@@ -21,7 +21,9 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_drevalidate - Check directory lookup consistency</div><div class='del'>- * @dentry: the mapping to check</div><div class='add'>+ * @dir: expected parent directory inode</div><div class='add'>+ * @name: expexted name</div><div class='add'>+ * @dentry: dentry to check</div><div class='ctx'>  * @flags: lookup flags</div><div class='ctx'>  *</div><div class='ctx'>  * Check to make sure the lookup necessary to arrive at this inode from its</div><div class='hunk'>@@ -30,55 +32,43 @@</div><div class='ctx'>  * Returns: 1 if the dentry is ok, 0 if it isn't</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int gfs2_drevalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int gfs2_drevalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			    struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *parent = NULL;</div><div class='del'>-	struct gfs2_sbd *sdp;</div><div class='del'>-	struct gfs2_inode *dip;</div><div class='del'>-	struct inode *dinode, *inode;</div><div class='add'>+	struct gfs2_sbd *sdp = GFS2_SB(dir);</div><div class='add'>+	struct gfs2_inode *dip = GFS2_I(dir);</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	struct gfs2_holder d_gh;</div><div class='ctx'> 	struct gfs2_inode *ip = NULL;</div><div class='del'>-	int error, valid = 0;</div><div class='add'>+	int error, valid;</div><div class='ctx'> 	int had_lock = 0;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; LOOKUP_RCU) {</div><div class='del'>-		dinode = d_inode_rcu(READ_ONCE(dentry-&gt;d_parent));</div><div class='del'>-		if (!dinode)</div><div class='del'>-			return -ECHILD;</div><div class='del'>-	} else {</div><div class='del'>-		parent = dget_parent(dentry);</div><div class='del'>-		dinode = d_inode(parent);</div><div class='del'>-	}</div><div class='del'>-	sdp = GFS2_SB(dinode);</div><div class='del'>-	dip = GFS2_I(dinode);</div><div class='add'>+	if (flags &amp; LOOKUP_RCU)</div><div class='add'>+		return -ECHILD;</div><div class='add'>+</div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='ctx'> </div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		if (is_bad_inode(inode))</div><div class='del'>-			goto out;</div><div class='add'>+			return 0;</div><div class='ctx'> 		ip = GFS2_I(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_mount == NULL) {</div><div class='del'>-		valid = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_mount == NULL)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	had_lock = (gfs2_glock_is_locked_by_me(dip-&gt;i_gl) != NULL);</div><div class='ctx'> 	if (!had_lock) {</div><div class='del'>-		error = gfs2_glock_nq_init(dip-&gt;i_gl, LM_ST_SHARED,</div><div class='del'>-					   flags &amp; LOOKUP_RCU ? GL_NOBLOCK : 0, &amp;d_gh);</div><div class='add'>+		error = gfs2_glock_nq_init(dip-&gt;i_gl, LM_ST_SHARED, 0, &amp;d_gh);</div><div class='ctx'> 		if (error)</div><div class='del'>-			goto out;</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = gfs2_dir_check(d_inode(parent), &amp;dentry-&gt;d_name, ip);</div><div class='add'>+	error = gfs2_dir_check(dir, name, ip);</div><div class='ctx'> 	valid = inode ? !error : (error == -ENOENT);</div><div class='ctx'> </div><div class='ctx'> 	if (!had_lock)</div><div class='ctx'> 		gfs2_glock_dq_uninit(&amp;d_gh);</div><div class='del'>-out:</div><div class='del'>-	dput(parent);</div><div class='ctx'> 	return valid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c<br/>index 560e4624c09f..509e2f0d97e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/dir.c</a></div><div class='hunk'>@@ -60,6 +60,7 @@</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gfs2.h"</div><div class='ctx'> #include "incore.h"</div><div class='hunk'>@@ -562,15 +563,18 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = gfs2_dirent_offset(GFS2_SB(inode), buf);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto consist_inode;</div><div class='del'>-</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		gfs2_consist_inode(GFS2_I(inode));</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='ctx'> 	offset = ret;</div><div class='ctx'> 	prev = NULL;</div><div class='ctx'> 	dent = buf + offset;</div><div class='ctx'> 	size = be16_to_cpu(dent-&gt;de_rec_len);</div><div class='del'>-	if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size, len, 1))</div><div class='del'>-		goto consist_inode;</div><div class='add'>+	if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size, len, 1)) {</div><div class='add'>+		gfs2_consist_inode(GFS2_I(inode));</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='ctx'> 	do {</div><div class='ctx'> 		ret = scan(dent, name, opaque);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -582,8 +586,10 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,</div><div class='ctx'> 		dent = buf + offset;</div><div class='ctx'> 		size = be16_to_cpu(dent-&gt;de_rec_len);</div><div class='ctx'> 		if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size,</div><div class='del'>-				      len, 0))</div><div class='del'>-			goto consist_inode;</div><div class='add'>+				      len, 0)) {</div><div class='add'>+			gfs2_consist_inode(GFS2_I(inode));</div><div class='add'>+			return ERR_PTR(-EIO);</div><div class='add'>+		}</div><div class='ctx'> 	} while(1);</div><div class='ctx'> </div><div class='ctx'> 	switch(ret) {</div><div class='hunk'>@@ -597,10 +603,6 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,</div><div class='ctx'> 		BUG_ON(ret &gt; 0);</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-consist_inode:</div><div class='del'>-	gfs2_consist_inode(GFS2_I(inode));</div><div class='del'>-	return ERR_PTR(-EIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dirent_check_reclen(struct gfs2_inode *dip,</div><div class='hunk'>@@ -609,14 +611,16 @@ static int dirent_check_reclen(struct gfs2_inode *dip,</div><div class='ctx'> 	const void *ptr = d;</div><div class='ctx'> 	u16 rec_len = be16_to_cpu(d-&gt;de_rec_len);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(rec_len &lt; sizeof(struct gfs2_dirent)))</div><div class='del'>-		goto broken;</div><div class='add'>+	if (unlikely(rec_len &lt; sizeof(struct gfs2_dirent))) {</div><div class='add'>+		gfs2_consist_inode(dip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	ptr += rec_len;</div><div class='ctx'> 	if (ptr &lt; end_p)</div><div class='ctx'> 		return rec_len;</div><div class='ctx'> 	if (ptr == end_p)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-broken:</div><div class='add'>+</div><div class='ctx'> 	gfs2_consist_inode(dip);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -909,7 +913,6 @@ static int dir_make_exhash(struct inode *inode)</div><div class='ctx'> 	struct qstr args;</div><div class='ctx'> 	struct buffer_head *bh, *dibh;</div><div class='ctx'> 	struct gfs2_leaf *leaf;</div><div class='del'>-	int y;</div><div class='ctx'> 	u32 x;</div><div class='ctx'> 	__be64 *lp;</div><div class='ctx'> 	u64 bn;</div><div class='hunk'>@@ -976,9 +979,7 @@ static int dir_make_exhash(struct inode *inode)</div><div class='ctx'> 	i_size_write(inode, sdp-&gt;sd_sb.sb_bsize / 2);</div><div class='ctx'> 	gfs2_add_inode_blocks(&amp;dip-&gt;i_inode, 1);</div><div class='ctx'> 	dip-&gt;i_diskflags |= GFS2_DIF_EXHASH;</div><div class='del'>-</div><div class='del'>-	for (x = sdp-&gt;sd_hash_ptrs, y = -1; x; x &gt;&gt;= 1, y++) ;</div><div class='del'>-	dip-&gt;i_depth = y;</div><div class='add'>+	dip-&gt;i_depth = ilog2(sdp-&gt;sd_hash_ptrs);</div><div class='ctx'> </div><div class='ctx'> 	gfs2_dinode_out(dip, dibh-&gt;b_data);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/export.c b/fs/gfs2/export.c<br/>index d418d8b5367f..3334c394ce9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/export.c</a></div><div class='hunk'>@@ -190,6 +190,5 @@ const struct export_operations gfs2_export_ops = {</div><div class='ctx'> 	.fh_to_parent = gfs2_fh_to_parent,</div><div class='ctx'> 	.get_name = gfs2_get_name,</div><div class='ctx'> 	.get_parent = gfs2_get_parent,</div><div class='del'>-	.flags = EXPORT_OP_ASYNC_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c<br/>index 992ca4effb50..b2d23c98c996 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/file.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ static inline u32 gfs2_gfsflags_to_fsflags(struct inode *inode, u32 gfsflags)</div><div class='ctx'> 	return fsflags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int gfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int gfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='hunk'>@@ -251,6 +251,7 @@ static int do_gfs2_set_flags(struct inode *inode, u32 reqflags, u32 mask)</div><div class='ctx'> 		error = filemap_fdatawait(inode-&gt;i_mapping);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out;</div><div class='add'>+		truncate_inode_pages(inode-&gt;i_mapping, 0);</div><div class='ctx'> 		if (new_flags &amp; GFS2_DIF_JDATA)</div><div class='ctx'> 			gfs2_ordered_del_inode(ip);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -275,7 +276,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int gfs2_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	u32 fsflags = fa-&gt;flags, gfsflags = 0;</div><div class='hunk'>@@ -376,23 +377,23 @@ static void gfs2_size_hint(struct file *filep, loff_t offset, size_t size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * gfs2_allocate_page_backing - Allocate blocks for a write fault</div><div class='del'>- * @page: The (locked) page to allocate backing for</div><div class='add'>+ * gfs2_allocate_folio_backing - Allocate blocks for a write fault</div><div class='add'>+ * @folio: The (locked) folio to allocate backing for</div><div class='ctx'>  * @length: Size of the allocation</div><div class='ctx'>  *</div><div class='del'>- * We try to allocate all the blocks required for the page in one go.  This</div><div class='add'>+ * We try to allocate all the blocks required for the folio in one go.  This</div><div class='ctx'>  * might fail for various reasons, so we keep trying until all the blocks to</div><div class='del'>- * back this page are allocated.  If some of the blocks are already allocated,</div><div class='add'>+ * back this folio are allocated.  If some of the blocks are already allocated,</div><div class='ctx'>  * that is ok too.</div><div class='ctx'>  */</div><div class='del'>-static int gfs2_allocate_page_backing(struct page *page, unsigned int length)</div><div class='add'>+static int gfs2_allocate_folio_backing(struct folio *folio, size_t length)</div><div class='ctx'> {</div><div class='del'>-	u64 pos = page_offset(page);</div><div class='add'>+	u64 pos = folio_pos(folio);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct iomap iomap = { };</div><div class='ctx'> </div><div class='del'>-		if (gfs2_iomap_alloc(page-&gt;mapping-&gt;host, pos, length, &amp;iomap))</div><div class='add'>+		if (gfs2_iomap_alloc(folio-&gt;mapping-&gt;host, pos, length, &amp;iomap))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='ctx'> 		if (length &lt; iomap.length)</div><div class='hunk'>@@ -414,16 +415,16 @@ static int gfs2_allocate_page_backing(struct page *page, unsigned int length)</div><div class='ctx'> </div><div class='ctx'> static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = vmf-&gt;page;</div><div class='add'>+	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='ctx'> 	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='ctx'> 	struct gfs2_alloc_parms ap = {};</div><div class='del'>-	u64 offset = page_offset(page);</div><div class='add'>+	u64 pos = folio_pos(folio);</div><div class='ctx'> 	unsigned int data_blocks, ind_blocks, rblocks;</div><div class='ctx'> 	vm_fault_t ret = VM_FAULT_LOCKED;</div><div class='ctx'> 	struct gfs2_holder gh;</div><div class='del'>-	unsigned int length;</div><div class='add'>+	size_t length;</div><div class='ctx'> 	loff_t size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -436,23 +437,23 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 		goto out_uninit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check page index against inode size */</div><div class='add'>+	/* Check folio index against inode size */</div><div class='ctx'> 	size = i_size_read(inode);</div><div class='del'>-	if (offset &gt;= size) {</div><div class='add'>+	if (pos &gt;= size) {</div><div class='ctx'> 		ret = VM_FAULT_SIGBUS;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Update file times before taking page lock */</div><div class='add'>+	/* Update file times before taking folio lock */</div><div class='ctx'> 	file_update_time(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> </div><div class='del'>-	/* page is wholly or partially inside EOF */</div><div class='del'>-	if (size - offset &lt; PAGE_SIZE)</div><div class='del'>-		length = size - offset;</div><div class='add'>+	/* folio is wholly or partially inside EOF */</div><div class='add'>+	if (size - pos &lt; folio_size(folio))</div><div class='add'>+		length = size - pos;</div><div class='ctx'> 	else</div><div class='del'>-		length = PAGE_SIZE;</div><div class='add'>+		length = folio_size(folio);</div><div class='ctx'> </div><div class='del'>-	gfs2_size_hint(vmf-&gt;vma-&gt;vm_file, offset, length);</div><div class='add'>+	gfs2_size_hint(vmf-&gt;vma-&gt;vm_file, pos, length);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(GLF_DIRTY, &amp;ip-&gt;i_gl-&gt;gl_flags);</div><div class='ctx'> 	set_bit(GIF_SW_PAGED, &amp;ip-&gt;i_flags);</div><div class='hunk'>@@ -463,11 +464,12 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (!gfs2_is_stuffed(ip) &amp;&amp;</div><div class='del'>-	    !gfs2_write_alloc_required(ip, offset, length)) {</div><div class='del'>-		lock_page(page);</div><div class='del'>-		if (!PageUptodate(page) || page-&gt;mapping != inode-&gt;i_mapping) {</div><div class='add'>+	    !gfs2_write_alloc_required(ip, pos, length)) {</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (!folio_test_uptodate(folio) ||</div><div class='add'>+		    folio-&gt;mapping != inode-&gt;i_mapping) {</div><div class='ctx'> 			ret = VM_FAULT_NOPAGE;</div><div class='del'>-			unlock_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -504,7 +506,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 		goto out_trans_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Unstuff, if required, and allocate backing blocks for page */</div><div class='add'>+	/* Unstuff, if required, and allocate backing blocks for folio */</div><div class='ctx'> 	if (gfs2_is_stuffed(ip)) {</div><div class='ctx'> 		err = gfs2_unstuff_dinode(ip);</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -513,22 +515,22 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='add'>+	folio_lock(folio);</div><div class='ctx'> 	/* If truncated, we must retry the operation, we may have raced</div><div class='ctx'> 	 * with the glock demotion code.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!PageUptodate(page) || page-&gt;mapping != inode-&gt;i_mapping) {</div><div class='add'>+	if (!folio_test_uptodate(folio) || folio-&gt;mapping != inode-&gt;i_mapping) {</div><div class='ctx'> 		ret = VM_FAULT_NOPAGE;</div><div class='ctx'> 		goto out_page_locked;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = gfs2_allocate_page_backing(page, length);</div><div class='add'>+	err = gfs2_allocate_folio_backing(folio, length);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		ret = vmf_fs_error(err);</div><div class='ctx'> </div><div class='ctx'> out_page_locked:</div><div class='ctx'> 	if (ret != VM_FAULT_LOCKED)</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> out_trans_end:</div><div class='ctx'> 	gfs2_trans_end(sdp);</div><div class='ctx'> out_trans_fail:</div><div class='hunk'>@@ -540,8 +542,8 @@ out_unlock:</div><div class='ctx'> out_uninit:</div><div class='ctx'> 	gfs2_holder_uninit(&amp;gh);</div><div class='ctx'> 	if (ret == VM_FAULT_LOCKED) {</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		wait_for_stable_page(page);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+		folio_wait_stable(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	sb_end_pagefault(inode-&gt;i_sb);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -742,7 +744,7 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	int sync_state = inode-&gt;i_state &amp; I_DIRTY;</div><div class='add'>+	int sync_state = inode_state_read_once(inode) &amp; I_DIRTY;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	int ret = 0, ret1 = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -818,7 +820,7 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In this function, we disable page faults when we're holding the</div><div class='ctx'> 	 * inode glock while doing I/O.  If a page fault occurs, we indicate</div><div class='del'>-	 * that the inode glock may be dropped, fault in the pages manually,</div><div class='add'>+	 * that the inode glock should be dropped, fault in the pages manually,</div><div class='ctx'> 	 * and retry.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Unlike generic_file_read_iter, for reads, iomap_dio_rw can trigger</div><div class='hunk'>@@ -883,7 +885,7 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In this function, we disable page faults when we're holding the</div><div class='ctx'> 	 * inode glock while doing I/O.  If a page fault occurs, we indicate</div><div class='del'>-	 * that the inode glock may be dropped, fault in the pages manually,</div><div class='add'>+	 * that the inode glock should be dropped, fault in the pages manually,</div><div class='ctx'> 	 * and retry.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * For writes, iomap_dio_rw only triggers manual page faults, so we</div><div class='hunk'>@@ -955,7 +957,7 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In this function, we disable page faults when we're holding the</div><div class='ctx'> 	 * inode glock while doing I/O.  If a page fault occurs, we indicate</div><div class='del'>-	 * that the inode glock may be dropped, fault in the pages manually,</div><div class='add'>+	 * that the inode glock should be dropped, fault in the pages manually,</div><div class='ctx'> 	 * and retry.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='hunk'>@@ -1022,7 +1024,7 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In this function, we disable page faults when we're holding the</div><div class='ctx'> 	 * inode glock while doing I/O.  If a page fault occurs, we indicate</div><div class='del'>-	 * that the inode glock may be dropped, fault in the pages manually,</div><div class='add'>+	 * that the inode glock should be dropped, fault in the pages manually,</div><div class='ctx'> 	 * and retry.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +1058,8 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pagefault_disable();</div><div class='del'>-	ret = iomap_file_buffered_write(iocb, from, &amp;gfs2_iomap_ops);</div><div class='add'>+	ret = iomap_file_buffered_write(iocb, from, &amp;gfs2_iomap_ops,</div><div class='add'>+			&amp;gfs2_iomap_write_ops, NULL);</div><div class='ctx'> 	pagefault_enable();</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		written += ret;</div><div class='hunk'>@@ -1439,22 +1442,29 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(file-&gt;f_mapping-&gt;host);</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(file-&gt;f_mapping-&gt;host);</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_POSIX))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_POSIX))</div><div class='ctx'> 		return -ENOLCK;</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='del'>-		if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='add'>+		if (lock_is_unlock(fl))</div><div class='ctx'> 			locks_lock_file_wait(file, fl);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (cmd == F_CANCELLK)</div><div class='del'>-		return dlm_posix_cancel(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, fl);</div><div class='del'>-	else if (IS_GETLK(cmd))</div><div class='del'>-		return dlm_posix_get(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, fl);</div><div class='del'>-	else if (fl-&gt;fl_type == F_UNLCK)</div><div class='del'>-		return dlm_posix_unlock(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, fl);</div><div class='del'>-	else</div><div class='del'>-		return dlm_posix_lock(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, cmd, fl);</div><div class='add'>+	down_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+	if (likely(ls-&gt;ls_dlm != NULL)) {</div><div class='add'>+		if (cmd == F_CANCELLK)</div><div class='add'>+			ret = dlm_posix_cancel(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, fl);</div><div class='add'>+		else if (IS_GETLK(cmd))</div><div class='add'>+			ret = dlm_posix_get(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, fl);</div><div class='add'>+		else if (lock_is_unlock(fl))</div><div class='add'>+			ret = dlm_posix_unlock(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, fl);</div><div class='add'>+		else</div><div class='add'>+			ret = dlm_posix_lock(ls-&gt;ls_dlm, ip-&gt;i_no_addr, file, cmd, fl);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __flock_holder_uninit(struct file *file, struct gfs2_holder *fl_gh)</div><div class='hunk'>@@ -1483,7 +1493,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	int sleeptime;</div><div class='ctx'> </div><div class='del'>-	state = (fl-&gt;fl_type == F_WRLCK) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;</div><div class='add'>+	state = lock_is_write(fl) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;</div><div class='ctx'> 	flags = GL_EXACT | GL_NOPID;</div><div class='ctx'> 	if (!IS_SETLKW(cmd))</div><div class='ctx'> 		flags |= LM_FLAG_TRY_1CB;</div><div class='hunk'>@@ -1495,8 +1505,8 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 		if (fl_gh-&gt;gh_state == state)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		locks_init_lock(&amp;request);</div><div class='del'>-		request.fl_type = F_UNLCK;</div><div class='del'>-		request.fl_flags = FL_FLOCK;</div><div class='add'>+		request.c.flc_type = F_UNLCK;</div><div class='add'>+		request.c.flc_flags = FL_FLOCK;</div><div class='ctx'> 		locks_lock_file_wait(file, &amp;request);</div><div class='ctx'> 		gfs2_glock_dq(fl_gh);</div><div class='ctx'> 		gfs2_holder_reinit(state, flags, fl_gh);</div><div class='hunk'>@@ -1557,10 +1567,10 @@ static void do_unflock(struct file *file, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_FLOCK))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_FLOCK))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_type == F_UNLCK) {</div><div class='add'>+	if (lock_is_unlock(fl)) {</div><div class='ctx'> 		do_unflock(file, fl);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1585,6 +1595,7 @@ const struct file_operations gfs2_file_fops = {</div><div class='ctx'> 	.splice_write	= gfs2_file_splice_write,</div><div class='ctx'> 	.setlease	= simple_nosetlease,</div><div class='ctx'> 	.fallocate	= gfs2_fallocate,</div><div class='add'>+	.fop_flags	= FOP_ASYNC_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct file_operations gfs2_dir_fops = {</div><div class='hunk'>@@ -1597,6 +1608,7 @@ const struct file_operations gfs2_dir_fops = {</div><div class='ctx'> 	.lock		= gfs2_lock,</div><div class='ctx'> 	.flock		= gfs2_flock,</div><div class='ctx'> 	.llseek		= default_llseek,</div><div class='add'>+	.fop_flags	= FOP_ASYNC_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_GFS2_FS_LOCKING_DLM */</div><div class='head'>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c<br/>index 34540f9d011c..92e029104d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/glock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/glock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/glock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/glock.c</a></div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> #include &lt;linux/lockref.h&gt;</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gfs2.h"</div><div class='ctx'> #include "incore.h"</div><div class='hunk'>@@ -61,12 +61,10 @@ struct gfs2_glock_iter {</div><div class='ctx'> typedef void (*glock_examiner) (struct gfs2_glock * gl);</div><div class='ctx'> </div><div class='ctx'> static void do_xmote(struct gfs2_glock *gl, struct gfs2_holder *gh, unsigned int target);</div><div class='del'>-static void __gfs2_glock_dq(struct gfs2_holder *gh);</div><div class='del'>-static void handle_callback(struct gfs2_glock *gl, unsigned int state,</div><div class='del'>-			    unsigned long delay, bool remote);</div><div class='add'>+static void request_demote(struct gfs2_glock *gl, unsigned int state,</div><div class='add'>+			   unsigned long delay, bool remote);</div><div class='ctx'> </div><div class='ctx'> static struct dentry *gfs2_root;</div><div class='del'>-static struct workqueue_struct *glock_workqueue;</div><div class='ctx'> static LIST_HEAD(lru_list);</div><div class='ctx'> static atomic_t lru_count = ATOMIC_INIT(0);</div><div class='ctx'> static DEFINE_SPINLOCK(lru_lock);</div><div class='hunk'>@@ -139,46 +137,45 @@ static void gfs2_glock_dealloc(struct rcu_head *rcu)</div><div class='ctx'> 		kmem_cache_free(gfs2_glock_cachep, gl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * glock_blocked_by_withdraw - determine if we can still use a glock</div><div class='del'>- * @gl: the glock</div><div class='del'>- *</div><div class='del'>- * We need to allow some glocks to be enqueued, dequeued, promoted, and demoted</div><div class='del'>- * when we're withdrawn. For example, to maintain metadata integrity, we should</div><div class='del'>- * disallow the use of inode and rgrp glocks when withdrawn. Other glocks like</div><div class='del'>- * the iopen or freeze glock may be safely used because none of their</div><div class='del'>- * metadata goes through the journal. So in general, we should disallow all</div><div class='del'>- * glocks that are journaled, and allow all the others. One exception is:</div><div class='del'>- * we need to allow our active journal to be promoted and demoted so others</div><div class='del'>- * may recover it and we can reacquire it when they're done.</div><div class='del'>- */</div><div class='del'>-static bool glock_blocked_by_withdraw(struct gfs2_glock *gl)</div><div class='add'>+static void __gfs2_glock_free(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='add'>+	rhashtable_remove_fast(&amp;gl_hash_table, &amp;gl-&gt;gl_node, ht_parms);</div><div class='add'>+	smp_mb();</div><div class='add'>+	wake_up_glock(gl);</div><div class='add'>+	call_rcu(&amp;gl-&gt;gl_rcu, gfs2_glock_dealloc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gfs2_glock_free(struct gfs2_glock *gl) {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> </div><div class='del'>-	if (!gfs2_withdrawing_or_withdrawn(sdp))</div><div class='del'>-		return false;</div><div class='del'>-	if (gl-&gt;gl_ops-&gt;go_flags &amp; GLOF_NONDISK)</div><div class='del'>-		return false;</div><div class='del'>-	if (!sdp-&gt;sd_jdesc ||</div><div class='del'>-	    gl-&gt;gl_name.ln_number == sdp-&gt;sd_jdesc-&gt;jd_no_addr)</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='add'>+	__gfs2_glock_free(gl);</div><div class='add'>+	if (atomic_dec_and_test(&amp;sdp-&gt;sd_glock_disposal))</div><div class='add'>+		wake_up(&amp;sdp-&gt;sd_kill_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void gfs2_glock_free(struct gfs2_glock *gl)</div><div class='del'>-{</div><div class='add'>+void gfs2_glock_free_later(struct gfs2_glock *gl) {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> </div><div class='del'>-	gfs2_glock_assert_withdraw(gl, atomic_read(&amp;gl-&gt;gl_revokes) == 0);</div><div class='del'>-	rhashtable_remove_fast(&amp;gl_hash_table, &amp;gl-&gt;gl_node, ht_parms);</div><div class='del'>-	smp_mb();</div><div class='del'>-	wake_up_glock(gl);</div><div class='del'>-	call_rcu(&amp;gl-&gt;gl_rcu, gfs2_glock_dealloc);</div><div class='add'>+	spin_lock(&amp;lru_lock);</div><div class='add'>+	list_add(&amp;gl-&gt;gl_lru, &amp;sdp-&gt;sd_dead_glocks);</div><div class='add'>+	spin_unlock(&amp;lru_lock);</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;sdp-&gt;sd_glock_disposal))</div><div class='ctx'> 		wake_up(&amp;sdp-&gt;sd_kill_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void gfs2_free_dead_glocks(struct gfs2_sbd *sdp)</div><div class='add'>+{</div><div class='add'>+	struct list_head *list = &amp;sdp-&gt;sd_dead_glocks;</div><div class='add'>+</div><div class='add'>+	while(!list_empty(list)) {</div><div class='add'>+		struct gfs2_glock *gl;</div><div class='add'>+</div><div class='add'>+		gl = list_first_entry(list, struct gfs2_glock, gl_lru);</div><div class='add'>+		list_del_init(&amp;gl-&gt;gl_lru);</div><div class='add'>+		__gfs2_glock_free(gl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_glock_hold() - increment reference count on glock</div><div class='ctx'>  * @gl: The glock to hold</div><div class='hunk'>@@ -192,34 +189,9 @@ struct gfs2_glock *gfs2_glock_hold(struct gfs2_glock *gl)</div><div class='ctx'> 	return gl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * demote_ok - Check to see if it's ok to unlock a glock</div><div class='del'>- * @gl: the glock</div><div class='del'>- *</div><div class='del'>- * Returns: 1 if it's ok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int demote_ok(const struct gfs2_glock *gl)</div><div class='del'>-{</div><div class='del'>-	const struct gfs2_glock_operations *glops = gl-&gt;gl_ops;</div><div class='del'>-</div><div class='del'>-	if (gl-&gt;gl_state == LM_ST_UNLOCKED)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!list_empty(&amp;gl-&gt;gl_holders))</div><div class='del'>-		return 0;</div><div class='del'>-	if (glops-&gt;go_demote_ok)</div><div class='del'>-		return glops-&gt;go_demote_ok(gl);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void gfs2_glock_add_to_lru(struct gfs2_glock *gl)</div><div class='add'>+static void gfs2_glock_add_to_lru(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='del'>-	if (!(gl-&gt;gl_ops-&gt;go_flags &amp; GLOF_LRU))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;lru_lock);</div><div class='del'>-</div><div class='ctx'> 	list_move_tail(&amp;gl-&gt;gl_lru, &amp;lru_list);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(GLF_LRU, &amp;gl-&gt;gl_flags)) {</div><div class='hunk'>@@ -232,9 +204,6 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl)</div><div class='ctx'> </div><div class='ctx'> static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='del'>-	if (!(gl-&gt;gl_ops-&gt;go_flags &amp; GLOF_LRU))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;lru_lock);</div><div class='ctx'> 	if (test_bit(GLF_LRU, &amp;gl-&gt;gl_flags)) {</div><div class='ctx'> 		list_del_init(&amp;gl-&gt;gl_lru);</div><div class='hunk'>@@ -248,8 +217,10 @@ static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)</div><div class='ctx'>  * Enqueue the glock on the work queue.  Passes one glock reference on to the</div><div class='ctx'>  * work queue.</div><div class='ctx'>  */</div><div class='del'>-static void __gfs2_glock_queue_work(struct gfs2_glock *gl, unsigned long delay) {</div><div class='del'>-	if (!queue_delayed_work(glock_workqueue, &amp;gl-&gt;gl_work, delay)) {</div><div class='add'>+static void gfs2_glock_queue_work(struct gfs2_glock *gl, unsigned long delay) {</div><div class='add'>+	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='add'>+</div><div class='add'>+	if (!queue_delayed_work(sdp-&gt;sd_glock_wq, &amp;gl-&gt;gl_work, delay)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We are holding the lockref spinlock, and the work was still</div><div class='ctx'> 		 * queued above.  The queued work (glock_work_func) takes that</div><div class='hunk'>@@ -261,12 +232,6 @@ static void __gfs2_glock_queue_work(struct gfs2_glock *gl, unsigned long delay)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gfs2_glock_queue_work(struct gfs2_glock *gl, unsigned long delay) {</div><div class='del'>-	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	__gfs2_glock_queue_work(gl, delay);</div><div class='del'>-	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __gfs2_glock_put(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='hunk'>@@ -278,19 +243,25 @@ static void __gfs2_glock_put(struct gfs2_glock *gl)</div><div class='ctx'> 	GLOCK_BUG_ON(gl, !list_empty(&amp;gl-&gt;gl_holders));</div><div class='ctx'> 	if (mapping) {</div><div class='ctx'> 		truncate_inode_pages_final(mapping);</div><div class='del'>-		if (!gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+		if (!gfs2_withdrawn(sdp))</div><div class='ctx'> 			GLOCK_BUG_ON(gl, !mapping_empty(mapping));</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_gfs2_glock_put(gl);</div><div class='ctx'> 	sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_put_lock(gl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Cause the glock to be put in work queue context.</div><div class='del'>- */</div><div class='del'>-void gfs2_glock_queue_put(struct gfs2_glock *gl)</div><div class='add'>+static bool __gfs2_glock_put_or_lock(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='del'>-	gfs2_glock_queue_work(gl, 0);</div><div class='add'>+	if (lockref_put_or_lock(&amp;gl-&gt;gl_lockref))</div><div class='add'>+		return true;</div><div class='add'>+	GLOCK_BUG_ON(gl, gl-&gt;gl_lockref.count != 1);</div><div class='add'>+	if (gl-&gt;gl_state != LM_ST_UNLOCKED) {</div><div class='add'>+		gl-&gt;gl_lockref.count--;</div><div class='add'>+		gfs2_glock_add_to_lru(gl);</div><div class='add'>+		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -301,12 +272,28 @@ void gfs2_glock_queue_put(struct gfs2_glock *gl)</div><div class='ctx'> </div><div class='ctx'> void gfs2_glock_put(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='del'>-	if (lockref_put_or_lock(&amp;gl-&gt;gl_lockref))</div><div class='add'>+	if (__gfs2_glock_put_or_lock(gl))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	__gfs2_glock_put(gl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * gfs2_glock_put_async - Decrement reference count without sleeping</div><div class='add'>+ * @gl: The glock to put</div><div class='add'>+ *</div><div class='add'>+ * Decrement the reference count on glock immediately unless it is the last</div><div class='add'>+ * reference.  Defer putting the last reference to work queue context.</div><div class='add'>+ */</div><div class='add'>+void gfs2_glock_put_async(struct gfs2_glock *gl)</div><div class='add'>+{</div><div class='add'>+	if (__gfs2_glock_put_or_lock(gl))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	gfs2_glock_queue_work(gl, 0);</div><div class='add'>+	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * may_grant - check if it's ok to grant a new lock</div><div class='ctx'>  * @gl: The glock</div><div class='hunk'>@@ -467,14 +454,18 @@ done:</div><div class='ctx'> /**</div><div class='ctx'>  * do_promote - promote as many requests as possible on the current queue</div><div class='ctx'>  * @gl: The glock</div><div class='del'>- * </div><div class='del'>- * Returns true on success (i.e., progress was made or there are no waiters).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static bool do_promote(struct gfs2_glock *gl)</div><div class='add'>+static void do_promote(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='add'>+	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> 	struct gfs2_holder *gh, *current_gh;</div><div class='ctx'> </div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='add'>+		do_error(gl, LM_OUT_ERROR);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	current_gh = find_first_holder(gl);</div><div class='ctx'> 	list_for_each_entry(gh, &amp;gl-&gt;gl_holders, gh_list) {</div><div class='ctx'> 		if (test_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags))</div><div class='hunk'>@@ -482,13 +473,10 @@ static bool do_promote(struct gfs2_glock *gl)</div><div class='ctx'> 		if (!may_grant(gl, current_gh, gh)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we get here, it means we may not grant this</div><div class='del'>-			 * holder for some reason. If this holder is at the</div><div class='del'>-			 * head of the list, it means we have a blocked holder</div><div class='del'>-			 * at the head, so return false.</div><div class='add'>+			 * holder for some reason.</div><div class='ctx'> 			 */</div><div class='del'>-			if (list_is_first(&amp;gh-&gt;gh_list, &amp;gl-&gt;gl_holders))</div><div class='del'>-				return false;</div><div class='del'>-			do_error(gl, 0);</div><div class='add'>+			if (current_gh)</div><div class='add'>+				do_error(gl, 0); /* Fail queued try locks */</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		set_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags);</div><div class='hunk'>@@ -497,7 +485,6 @@ static bool do_promote(struct gfs2_glock *gl)</div><div class='ctx'> 		if (!current_gh)</div><div class='ctx'> 			current_gh = gh;</div><div class='ctx'> 	}</div><div class='del'>-	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -541,18 +528,6 @@ static inline struct gfs2_holder *find_last_waiter(const struct gfs2_glock *gl)</div><div class='ctx'> </div><div class='ctx'> static void state_change(struct gfs2_glock *gl, unsigned int new_state)</div><div class='ctx'> {</div><div class='del'>-	int held1, held2;</div><div class='del'>-</div><div class='del'>-	held1 = (gl-&gt;gl_state != LM_ST_UNLOCKED);</div><div class='del'>-	held2 = (new_state != LM_ST_UNLOCKED);</div><div class='del'>-</div><div class='del'>-	if (held1 != held2) {</div><div class='del'>-		GLOCK_BUG_ON(gl, __lockref_is_dead(&amp;gl-&gt;gl_lockref));</div><div class='del'>-		if (held2)</div><div class='del'>-			gl-&gt;gl_lockref.count++;</div><div class='del'>-		else</div><div class='del'>-			gl-&gt;gl_lockref.count--;</div><div class='del'>-	}</div><div class='ctx'> 	if (new_state != gl-&gt;gl_target)</div><div class='ctx'> 		/* shorten our minimum hold time */</div><div class='ctx'> 		gl-&gt;gl_hold_time = max(gl-&gt;gl_hold_time - GL_GLOCK_HOLD_DECR,</div><div class='hunk'>@@ -561,11 +536,11 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)</div><div class='ctx'> 	gl-&gt;gl_tchange = jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gfs2_set_demote(struct gfs2_glock *gl)</div><div class='add'>+static void gfs2_set_demote(int nr, struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> </div><div class='del'>-	set_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags);</div><div class='add'>+	set_bit(nr, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	wake_up(&amp;sdp-&gt;sd_async_glock_wait);</div><div class='ctx'> }</div><div class='hunk'>@@ -588,32 +563,31 @@ static void gfs2_demote_wake(struct gfs2_glock *gl)</div><div class='ctx'> static void finish_xmote(struct gfs2_glock *gl, unsigned int ret)</div><div class='ctx'> {</div><div class='ctx'> 	const struct gfs2_glock_operations *glops = gl-&gt;gl_ops;</div><div class='del'>-	struct gfs2_holder *gh;</div><div class='del'>-	unsigned state = ret &amp; LM_OUT_ST_MASK;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	trace_gfs2_glock_state_change(gl, state);</div><div class='del'>-	state_change(gl, state);</div><div class='del'>-	gh = find_first_waiter(gl);</div><div class='add'>+	if (!(ret &amp; ~LM_OUT_ST_MASK)) {</div><div class='add'>+		unsigned state = ret &amp; LM_OUT_ST_MASK;</div><div class='add'>+</div><div class='add'>+		trace_gfs2_glock_state_change(gl, state);</div><div class='add'>+		state_change(gl, state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Demote to UN request arrived during demote to SH or DF */</div><div class='ctx'> 	if (test_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='del'>-	    state != LM_ST_UNLOCKED &amp;&amp; gl-&gt;gl_demote_state == LM_ST_UNLOCKED)</div><div class='add'>+	    gl-&gt;gl_state != LM_ST_UNLOCKED &amp;&amp;</div><div class='add'>+	    gl-&gt;gl_demote_state == LM_ST_UNLOCKED)</div><div class='ctx'> 		gl-&gt;gl_target = LM_ST_UNLOCKED;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for state != intended state */</div><div class='del'>-	if (unlikely(state != gl-&gt;gl_target)) {</div><div class='del'>-		if (gh &amp;&amp; (ret &amp; LM_OUT_CANCELED))</div><div class='del'>-			gfs2_holder_wake(gh);</div><div class='add'>+	if (unlikely(gl-&gt;gl_state != gl-&gt;gl_target)) {</div><div class='add'>+		struct gfs2_holder *gh = find_first_waiter(gl);</div><div class='add'>+</div><div class='ctx'> 		if (gh &amp;&amp; !test_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags)) {</div><div class='del'>-			/* move to back of queue and try next entry */</div><div class='ctx'> 			if (ret &amp; LM_OUT_CANCELED) {</div><div class='del'>-				list_move_tail(&amp;gh-&gt;gh_list, &amp;gl-&gt;gl_holders);</div><div class='del'>-				gh = find_first_waiter(gl);</div><div class='del'>-				gl-&gt;gl_target = gh-&gt;gh_state;</div><div class='del'>-				if (do_promote(gl))</div><div class='del'>-					goto out;</div><div class='del'>-				goto retry;</div><div class='add'>+				list_del_init(&amp;gh-&gt;gh_list);</div><div class='add'>+				trace_gfs2_glock_queue(gh, 0);</div><div class='add'>+				gfs2_holder_wake(gh);</div><div class='add'>+				gl-&gt;gl_target = gl-&gt;gl_state;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Some error or failed "try lock" - report it */</div><div class='ctx'> 			if ((ret &amp; LM_OUT_ERROR) ||</div><div class='hunk'>@@ -623,10 +597,9 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		switch(state) {</div><div class='add'>+		switch(gl-&gt;gl_state) {</div><div class='ctx'> 		/* Unlocked due to conversion deadlock, try again */</div><div class='ctx'> 		case LM_ST_UNLOCKED:</div><div class='del'>-retry:</div><div class='ctx'> 			do_xmote(gl, gh, gl-&gt;gl_target);</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* Conversion fails, unlock and try again */</div><div class='hunk'>@@ -635,18 +608,21 @@ retry:</div><div class='ctx'> 			do_xmote(gl, gh, LM_ST_UNLOCKED);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default: /* Everything else */</div><div class='del'>-			fs_err(gl-&gt;gl_name.ln_sbd, "wanted %u got %u\n",</div><div class='del'>-			       gl-&gt;gl_target, state);</div><div class='add'>+			fs_err(gl-&gt;gl_name.ln_sbd,</div><div class='add'>+			       "glock %u:%llu requested=%u ret=%u\n",</div><div class='add'>+			       gl-&gt;gl_name.ln_type, gl-&gt;gl_name.ln_number,</div><div class='add'>+			       gl-&gt;gl_req, ret);</div><div class='ctx'> 			GLOCK_BUG_ON(gl, 1);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fast path - we got what we asked for */</div><div class='del'>-	if (test_and_clear_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags))</div><div class='add'>+	if (test_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+		clear_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		gfs2_demote_wake(gl);</div><div class='del'>-	if (state != LM_ST_UNLOCKED) {</div><div class='add'>+	}</div><div class='add'>+	if (gl-&gt;gl_state != LM_ST_UNLOCKED) {</div><div class='ctx'> 		if (glops-&gt;go_xmote_bh) {</div><div class='ctx'> 			int rv;</div><div class='ctx'> </div><div class='hunk'>@@ -661,18 +637,8 @@ retry:</div><div class='ctx'> 		do_promote(gl);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='del'>-	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_system_glock(struct gfs2_glock *gl)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-	struct gfs2_inode *m_ip = GFS2_I(sdp-&gt;sd_statfs_inode);</div><div class='del'>-</div><div class='del'>-	if (gl == m_ip-&gt;i_gl)</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='add'>+	if (!test_bit(GLF_CANCELING, &amp;gl-&gt;gl_flags))</div><div class='add'>+		clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -690,135 +656,86 @@ __acquires(&amp;gl-&gt;gl_lockref.lock)</div><div class='ctx'> {</div><div class='ctx'> 	const struct gfs2_glock_operations *glops = gl-&gt;gl_ops;</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-	unsigned int lck_flags = (unsigned int)(gh ? gh-&gt;gh_flags : 0);</div><div class='add'>+	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (target != LM_ST_UNLOCKED &amp;&amp; glock_blocked_by_withdraw(gl) &amp;&amp;</div><div class='del'>-	    gh &amp;&amp; !(gh-&gt;gh_flags &amp; LM_FLAG_NOEXP))</div><div class='del'>-		goto skip_inval;</div><div class='add'>+	/*</div><div class='add'>+	 * When a filesystem is withdrawing, the remaining cluster nodes will</div><div class='add'>+	 * take care of recovering the withdrawing node's journal.  We only</div><div class='add'>+	 * need to make sure that once we trigger remote recovery, we won't</div><div class='add'>+	 * write to the shared block device anymore.  This means that here,</div><div class='add'>+	 *</div><div class='add'>+	 * - no new writes to the filesystem must be triggered (-&gt;go_sync()).</div><div class='add'>+	 *</div><div class='add'>+	 * - any cached data should be discarded by calling -&gt;go_inval(), dirty</div><div class='add'>+	 *   or not and journaled or unjournaled.</div><div class='add'>+	 *</div><div class='add'>+	 * - no more dlm locking operations should be issued (-&gt;lm_lock()).</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	lck_flags &amp;= (LM_FLAG_TRY | LM_FLAG_TRY_1CB | LM_FLAG_NOEXP);</div><div class='ctx'> 	GLOCK_BUG_ON(gl, gl-&gt;gl_state == target);</div><div class='ctx'> 	GLOCK_BUG_ON(gl, gl-&gt;gl_state == gl-&gt;gl_target);</div><div class='del'>-	if ((target == LM_ST_UNLOCKED || target == LM_ST_DEFERRED) &amp;&amp;</div><div class='del'>-	    glops-&gt;go_inval) {</div><div class='del'>-		/*</div><div class='del'>-		 * If another process is already doing the invalidate, let that</div><div class='del'>-		 * finish first.  The glock state machine will get back to this</div><div class='del'>-		 * holder again later.</div><div class='del'>-		 */</div><div class='del'>-		if (test_and_set_bit(GLF_INVALIDATE_IN_PROGRESS,</div><div class='del'>-				     &amp;gl-&gt;gl_flags))</div><div class='del'>-			return;</div><div class='del'>-		do_error(gl, 0); /* Fail queued try locks */</div><div class='del'>-	}</div><div class='del'>-	gl-&gt;gl_req = target;</div><div class='del'>-	set_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags);</div><div class='del'>-	if ((gl-&gt;gl_req == LM_ST_UNLOCKED) ||</div><div class='del'>-	    (gl-&gt;gl_state == LM_ST_EXCLUSIVE) ||</div><div class='del'>-	    (lck_flags &amp; (LM_FLAG_TRY|LM_FLAG_TRY_1CB)))</div><div class='del'>-		clear_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags);</div><div class='add'>+</div><div class='add'>+	if (!glops-&gt;go_inval || !glops-&gt;go_sync)</div><div class='add'>+		goto skip_inval;</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	if (glops-&gt;go_sync) {</div><div class='add'>+	if (!gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		ret = glops-&gt;go_sync(gl);</div><div class='del'>-		/* If we had a problem syncing (due to io errors or whatever,</div><div class='del'>-		 * we should not invalidate the metadata or tell dlm to</div><div class='del'>-		 * release the glock to other nodes.</div><div class='del'>-		 */</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			if (cmpxchg(&amp;sdp-&gt;sd_log_error, 0, ret)) {</div><div class='del'>-				fs_err(sdp, "Error %d syncing glock \n", ret);</div><div class='add'>+				fs_err(sdp, "Error %d syncing glock\n", ret);</div><div class='ctx'> 				gfs2_dump_glock(NULL, gl, true);</div><div class='add'>+				gfs2_withdraw(sdp);</div><div class='ctx'> 			}</div><div class='del'>-			goto skip_inval;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &amp;gl-&gt;gl_flags)) {</div><div class='del'>-		/*</div><div class='del'>-		 * The call to go_sync should have cleared out the ail list.</div><div class='del'>-		 * If there are still items, we have a problem. We ought to</div><div class='del'>-		 * withdraw, but we can't because the withdraw code also uses</div><div class='del'>-		 * glocks. Warn about the error, dump the glock, then fall</div><div class='del'>-		 * through and wait for logd to do the withdraw for us.</div><div class='del'>-		 */</div><div class='del'>-		if ((atomic_read(&amp;gl-&gt;gl_ail_count) != 0) &amp;&amp;</div><div class='del'>-		    (!cmpxchg(&amp;sdp-&gt;sd_log_error, 0, -EIO))) {</div><div class='del'>-			gfs2_glock_assert_warn(gl,</div><div class='del'>-					       !atomic_read(&amp;gl-&gt;gl_ail_count));</div><div class='del'>-			gfs2_dump_glock(NULL, gl, true);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+	if (target == LM_ST_UNLOCKED || target == LM_ST_DEFERRED)</div><div class='ctx'> 		glops-&gt;go_inval(gl, target == LM_ST_DEFERRED ? 0 : DIO_METADATA);</div><div class='del'>-		clear_bit(GLF_INVALIDATE_IN_PROGRESS, &amp;gl-&gt;gl_flags);</div><div class='del'>-	}</div><div class='add'>+	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> </div><div class='ctx'> skip_inval:</div><div class='del'>-	gfs2_glock_hold(gl);</div><div class='del'>-	/*</div><div class='del'>-	 * Check for an error encountered since we called go_sync and go_inval.</div><div class='del'>-	 * If so, we can't withdraw from the glock code because the withdraw</div><div class='del'>-	 * code itself uses glocks (see function signal_our_withdraw) to</div><div class='del'>-	 * change the mount to read-only. Most importantly, we must not call</div><div class='del'>-	 * dlm to unlock the glock until the journal is in a known good state</div><div class='del'>-	 * (after journal replay) otherwise other nodes may use the object</div><div class='del'>-	 * (rgrp or dinode) and then later, journal replay will corrupt the</div><div class='del'>-	 * file system. The best we can do here is wait for the logd daemon</div><div class='del'>-	 * to see sd_log_error and withdraw, and in the meantime, requeue the</div><div class='del'>-	 * work for later.</div><div class='del'>-	 *</div><div class='del'>-	 * We make a special exception for some system glocks, such as the</div><div class='del'>-	 * system statfs inode glock, which needs to be granted before the</div><div class='del'>-	 * gfs2_quotad daemon can exit, and that exit needs to finish before</div><div class='del'>-	 * we can unmount the withdrawn file system.</div><div class='del'>-	 *</div><div class='del'>-	 * However, if we're just unlocking the lock (say, for unmount, when</div><div class='del'>-	 * gfs2_gl_hash_clear calls clear_glock) and recovery is complete</div><div class='del'>-	 * then it's okay to tell dlm to unlock it.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(sdp-&gt;sd_log_error) &amp;&amp; !gfs2_withdrawing_or_withdrawn(sdp))</div><div class='del'>-		gfs2_withdraw_delayed(sdp);</div><div class='del'>-	if (glock_blocked_by_withdraw(gl) &amp;&amp;</div><div class='del'>-	    (target != LM_ST_UNLOCKED ||</div><div class='del'>-	     test_bit(SDF_WITHDRAW_RECOVERY, &amp;sdp-&gt;sd_flags))) {</div><div class='del'>-		if (!is_system_glock(gl)) {</div><div class='del'>-			handle_callback(gl, LM_ST_UNLOCKED, 0, false); /* sets demote */</div><div class='del'>-			/*</div><div class='del'>-			 * Ordinarily, we would call dlm and its callback would call</div><div class='del'>-			 * finish_xmote, which would call state_change() to the new state.</div><div class='del'>-			 * Since we withdrew, we won't call dlm, so call state_change</div><div class='del'>-			 * manually, but to the UNLOCKED state we desire.</div><div class='del'>-			 */</div><div class='del'>-			state_change(gl, LM_ST_UNLOCKED);</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='add'>+		if (target != LM_ST_UNLOCKED)</div><div class='add'>+			target = LM_OUT_ERROR;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ls-&gt;ls_ops-&gt;lm_lock) {</div><div class='add'>+		set_bit(GLF_PENDING_REPLY, &amp;gl-&gt;gl_flags);</div><div class='add'>+		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+		ret = ls-&gt;ls_ops-&gt;lm_lock(gl, target, gh ? gh-&gt;gh_flags : 0);</div><div class='add'>+		spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+</div><div class='add'>+		if (!ret) {</div><div class='add'>+			/* The operation will be completed asynchronously. */</div><div class='add'>+			gl-&gt;gl_lockref.count++;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		clear_bit(GLF_PENDING_REPLY, &amp;gl-&gt;gl_flags);</div><div class='add'>+</div><div class='add'>+		if (ret == -ENODEV) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * We skip telling dlm to do the locking, so we won't get a</div><div class='del'>-			 * reply that would otherwise clear GLF_LOCK. So we clear it here.</div><div class='add'>+			 * The lockspace has been released and the lock has</div><div class='add'>+			 * been unlocked implicitly.</div><div class='ctx'> 			 */</div><div class='del'>-			clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='del'>-			clear_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags);</div><div class='del'>-			gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);</div><div class='del'>-			goto out;</div><div class='add'>+			if (target != LM_ST_UNLOCKED) {</div><div class='add'>+				target = LM_OUT_ERROR;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			clear_bit(GLF_INVALIDATE_IN_PROGRESS, &amp;gl-&gt;gl_flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_lock)	{</div><div class='del'>-		/* lock_dlm */</div><div class='del'>-		ret = sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_lock(gl, target, lck_flags);</div><div class='del'>-		if (ret == -EINVAL &amp;&amp; gl-&gt;gl_target == LM_ST_UNLOCKED &amp;&amp;</div><div class='del'>-		    target == LM_ST_UNLOCKED &amp;&amp;</div><div class='del'>-		    test_bit(SDF_SKIP_DLM_UNLOCK, &amp;sdp-&gt;sd_flags)) {</div><div class='del'>-			finish_xmote(gl, target);</div><div class='del'>-			gfs2_glock_queue_work(gl, 0);</div><div class='del'>-		} else if (ret) {</div><div class='ctx'> 			fs_err(sdp, "lm_lock ret %d\n", ret);</div><div class='del'>-			GLOCK_BUG_ON(gl, !gfs2_withdrawing_or_withdrawn(sdp));</div><div class='add'>+			GLOCK_BUG_ON(gl, !gfs2_withdrawn(sdp));</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='del'>-	} else { /* lock_nolock */</div><div class='del'>-		finish_xmote(gl, target);</div><div class='del'>-		gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> out:</div><div class='del'>-	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	/* Complete the operation now. */</div><div class='add'>+	finish_xmote(gl, target);</div><div class='add'>+	gl-&gt;gl_lockref.count++;</div><div class='add'>+	gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -832,15 +749,26 @@ static void run_queue(struct gfs2_glock *gl, const int nonblock)</div><div class='ctx'> __releases(&amp;gl-&gt;gl_lockref.lock)</div><div class='ctx'> __acquires(&amp;gl-&gt;gl_lockref.lock)</div><div class='ctx'> {</div><div class='del'>-	struct gfs2_holder *gh = NULL;</div><div class='add'>+	struct gfs2_holder *gh;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(GLF_LOCK, &amp;gl-&gt;gl_flags))</div><div class='add'>+	if (test_bit(GLF_LOCK, &amp;gl-&gt;gl_flags))</div><div class='ctx'> 		return;</div><div class='add'>+	set_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The GLF_DEMOTE_IN_PROGRESS flag is only set intermittently during</div><div class='add'>+	 * locking operations.  We have just started a locking operation by</div><div class='add'>+	 * setting the GLF_LOCK flag, so the GLF_DEMOTE_IN_PROGRESS flag must</div><div class='add'>+	 * be cleared.</div><div class='add'>+	 */</div><div class='ctx'> 	GLOCK_BUG_ON(gl, test_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags));</div><div class='ctx'> </div><div class='del'>-	if (test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='del'>-	    gl-&gt;gl_demote_state != gl-&gt;gl_state) {</div><div class='add'>+	if (test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+		if (gl-&gt;gl_demote_state == gl-&gt;gl_state) {</div><div class='add'>+			gfs2_demote_wake(gl);</div><div class='add'>+			goto promote;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (find_first_holder(gl))</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		if (nonblock)</div><div class='hunk'>@@ -848,30 +776,33 @@ __acquires(&amp;gl-&gt;gl_lockref.lock)</div><div class='ctx'> 		set_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		GLOCK_BUG_ON(gl, gl-&gt;gl_demote_state == LM_ST_EXCLUSIVE);</div><div class='ctx'> 		gl-&gt;gl_target = gl-&gt;gl_demote_state;</div><div class='del'>-	} else {</div><div class='del'>-		if (test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags))</div><div class='del'>-			gfs2_demote_wake(gl);</div><div class='del'>-		if (do_promote(gl))</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		gh = find_first_waiter(gl);</div><div class='del'>-		gl-&gt;gl_target = gh-&gt;gh_state;</div><div class='del'>-		if (!(gh-&gt;gh_flags &amp; (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))</div><div class='del'>-			do_error(gl, 0); /* Fail queued try locks */</div><div class='add'>+		do_xmote(gl, NULL, gl-&gt;gl_target);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+promote:</div><div class='add'>+	do_promote(gl);</div><div class='add'>+	if (find_first_holder(gl))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	gh = find_first_waiter(gl);</div><div class='add'>+	if (!gh)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	if (nonblock)</div><div class='add'>+		goto out_sched;</div><div class='add'>+	gl-&gt;gl_target = gh-&gt;gh_state;</div><div class='add'>+	if (!(gh-&gt;gh_flags &amp; (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))</div><div class='add'>+		do_error(gl, 0); /* Fail queued try locks */</div><div class='ctx'> 	do_xmote(gl, gh, gl-&gt;gl_target);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_sched:</div><div class='ctx'> 	clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='del'>-	smp_mb__after_atomic();</div><div class='ctx'> 	gl-&gt;gl_lockref.count++;</div><div class='del'>-	__gfs2_glock_queue_work(gl, 0);</div><div class='add'>+	gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='del'>-	smp_mb__after_atomic();</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -887,12 +818,8 @@ void glock_set_object(struct gfs2_glock *gl, void *object)</div><div class='ctx'> 	prev_object = gl-&gt;gl_object;</div><div class='ctx'> 	gl-&gt;gl_object = object;</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	if (gfs2_assert_warn(gl-&gt;gl_name.ln_sbd, prev_object == NULL)) {</div><div class='del'>-		pr_warn("glock=%u/%llx\n",</div><div class='del'>-			gl-&gt;gl_name.ln_type,</div><div class='del'>-			(unsigned long long)gl-&gt;gl_name.ln_number);</div><div class='add'>+	if (gfs2_assert_warn(gl-&gt;gl_name.ln_sbd, prev_object == NULL))</div><div class='ctx'> 		gfs2_dump_glock(NULL, gl, true);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -908,12 +835,8 @@ void glock_clear_object(struct gfs2_glock *gl, void *object)</div><div class='ctx'> 	prev_object = gl-&gt;gl_object;</div><div class='ctx'> 	gl-&gt;gl_object = NULL;</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	if (gfs2_assert_warn(gl-&gt;gl_name.ln_sbd, prev_object == object)) {</div><div class='del'>-		pr_warn("glock=%u/%llx\n",</div><div class='del'>-			gl-&gt;gl_name.ln_type,</div><div class='del'>-			(unsigned long long)gl-&gt;gl_name.ln_number);</div><div class='add'>+	if (gfs2_assert_warn(gl-&gt;gl_name.ln_sbd, prev_object == object))</div><div class='ctx'> 		gfs2_dump_glock(NULL, gl, true);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation)</div><div class='hunk'>@@ -948,48 +871,56 @@ static void gfs2_glock_poke(struct gfs2_glock *gl)</div><div class='ctx'> 	gfs2_holder_uninit(&amp;gh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool gfs2_try_evict(struct gfs2_glock *gl)</div><div class='add'>+static struct gfs2_inode *gfs2_grab_existing_inode(struct gfs2_glock *gl)</div><div class='add'>+{</div><div class='add'>+	struct gfs2_inode *ip;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	ip = gl-&gt;gl_object;</div><div class='add'>+	if (ip &amp;&amp; !igrab(&amp;ip-&gt;i_inode))</div><div class='add'>+		ip = NULL;</div><div class='add'>+	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	if (ip) {</div><div class='add'>+		wait_on_new_inode(&amp;ip-&gt;i_inode);</div><div class='add'>+		if (is_bad_inode(&amp;ip-&gt;i_inode)) {</div><div class='add'>+			iput(&amp;ip-&gt;i_inode);</div><div class='add'>+			ip = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gfs2_try_to_evict(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_inode *ip;</div><div class='del'>-	bool evicted = false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there is contention on the iopen glock and we have an inode, try</div><div class='del'>-	 * to grab and release the inode so that it can be evicted.  This will</div><div class='del'>-	 * allow the remote node to go ahead and delete the inode without us</div><div class='del'>-	 * having to do it, which will avoid rgrp glock thrashing.</div><div class='add'>+	 * to grab and release the inode so that it can be evicted.  The</div><div class='add'>+	 * GLF_DEFER_DELETE flag indicates to gfs2_evict_inode() that the inode</div><div class='add'>+	 * should not be deleted locally.  This will allow the remote node to</div><div class='add'>+	 * go ahead and delete the inode without us having to do it, which will</div><div class='add'>+	 * avoid rgrp glock thrashing.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The remote node is likely still holding the corresponding inode</div><div class='ctx'> 	 * glock, so it will run before we get to verify that the delete has</div><div class='del'>-	 * happened below.</div><div class='add'>+	 * happened below.  (Verification is triggered by the call to</div><div class='add'>+	 * gfs2_queue_verify_delete() in gfs2_evict_inode().)</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	ip = gl-&gt;gl_object;</div><div class='del'>-	if (ip &amp;&amp; !igrab(&amp;ip-&gt;i_inode))</div><div class='del'>-		ip = NULL;</div><div class='del'>-	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	ip = gfs2_grab_existing_inode(gl);</div><div class='ctx'> 	if (ip) {</div><div class='del'>-		gl-&gt;gl_no_formal_ino = ip-&gt;i_no_formal_ino;</div><div class='del'>-		set_bit(GIF_DEFERRED_DELETE, &amp;ip-&gt;i_flags);</div><div class='add'>+		set_bit(GLF_DEFER_DELETE, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		d_prune_aliases(&amp;ip-&gt;i_inode);</div><div class='ctx'> 		iput(&amp;ip-&gt;i_inode);</div><div class='add'>+		clear_bit(GLF_DEFER_DELETE, &amp;gl-&gt;gl_flags);</div><div class='ctx'> </div><div class='ctx'> 		/* If the inode was evicted, gl-&gt;gl_object will now be NULL. */</div><div class='del'>-		spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-		ip = gl-&gt;gl_object;</div><div class='del'>-		if (ip) {</div><div class='del'>-			clear_bit(GIF_DEFERRED_DELETE, &amp;ip-&gt;i_flags);</div><div class='del'>-			if (!igrab(&amp;ip-&gt;i_inode))</div><div class='del'>-				ip = NULL;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+		ip = gfs2_grab_existing_inode(gl);</div><div class='ctx'> 		if (ip) {</div><div class='ctx'> 			gfs2_glock_poke(ip-&gt;i_gl);</div><div class='ctx'> 			iput(&amp;ip-&gt;i_inode);</div><div class='ctx'> 		}</div><div class='del'>-		evicted = !ip;</div><div class='ctx'> 	}</div><div class='del'>-	return evicted;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)</div><div class='hunk'>@@ -998,18 +929,18 @@ bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(GLF_TRY_TO_EVICT, &amp;gl-&gt;gl_flags))</div><div class='ctx'> 		return false;</div><div class='del'>-	return queue_delayed_work(sdp-&gt;sd_delete_wq,</div><div class='del'>-				  &amp;gl-&gt;gl_delete, 0);</div><div class='add'>+	return !mod_delayed_work(sdp-&gt;sd_delete_wq, &amp;gl-&gt;gl_delete, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool gfs2_queue_verify_evict(struct gfs2_glock *gl)</div><div class='add'>+bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='add'>+	unsigned long delay;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(GLF_VERIFY_EVICT, &amp;gl-&gt;gl_flags))</div><div class='add'>+	if (test_and_set_bit(GLF_VERIFY_DELETE, &amp;gl-&gt;gl_flags))</div><div class='ctx'> 		return false;</div><div class='del'>-	return queue_delayed_work(sdp-&gt;sd_delete_wq,</div><div class='del'>-				  &amp;gl-&gt;gl_delete, 5 * HZ);</div><div class='add'>+	delay = later ? HZ + get_random_long() % (HZ * 9) : 0;</div><div class='add'>+	return queue_delayed_work(sdp-&gt;sd_delete_wq, &amp;gl-&gt;gl_delete, delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void delete_work_func(struct work_struct *work)</div><div class='hunk'>@@ -1017,43 +948,27 @@ static void delete_work_func(struct work_struct *work)</div><div class='ctx'> 	struct delayed_work *dwork = to_delayed_work(work);</div><div class='ctx'> 	struct gfs2_glock *gl = container_of(dwork, struct gfs2_glock, gl_delete);</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	u64 no_addr = gl-&gt;gl_name.ln_number;</div><div class='add'>+	bool verify_delete = test_and_clear_bit(GLF_VERIFY_DELETE, &amp;gl-&gt;gl_flags);</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(GLF_TRY_TO_EVICT, &amp;gl-&gt;gl_flags)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we can evict the inode, give the remote node trying to</div><div class='del'>-		 * delete the inode some time before verifying that the delete</div><div class='del'>-		 * has happened.  Otherwise, if we cause contention on the inode glock</div><div class='del'>-		 * immediately, the remote node will think that we still have</div><div class='del'>-		 * the inode in use, and so it will give up waiting.</div><div class='del'>-		 *</div><div class='del'>-		 * If we can't evict the inode, signal to the remote node that</div><div class='del'>-		 * the inode is still in use.  We'll later try to delete the</div><div class='del'>-		 * inode locally in gfs2_evict_inode.</div><div class='del'>-		 *</div><div class='del'>-		 * FIXME: We only need to verify that the remote node has</div><div class='del'>-		 * deleted the inode because nodes before this remote delete</div><div class='del'>-		 * rework won't cooperate.  At a later time, when we no longer</div><div class='del'>-		 * care about compatibility with such nodes, we can skip this</div><div class='del'>-		 * step entirely.</div><div class='del'>-		 */</div><div class='del'>-		if (gfs2_try_evict(gl)) {</div><div class='del'>-			if (test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags))</div><div class='del'>-				goto out;</div><div class='del'>-			if (gfs2_queue_verify_evict(gl))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Check for the GLF_VERIFY_DELETE above: this ensures that we won't</div><div class='add'>+	 * immediately process GLF_VERIFY_DELETE work that the below call to</div><div class='add'>+	 * gfs2_try_to_evict() queues.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(GLF_TRY_TO_EVICT, &amp;gl-&gt;gl_flags))</div><div class='add'>+		gfs2_try_to_evict(gl);</div><div class='add'>+</div><div class='add'>+	if (verify_delete) {</div><div class='add'>+		u64 no_addr = gl-&gt;gl_name.ln_number;</div><div class='add'>+		struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(GLF_VERIFY_EVICT, &amp;gl-&gt;gl_flags)) {</div><div class='ctx'> 		inode = gfs2_lookup_by_inum(sdp, no_addr, gl-&gt;gl_no_formal_ino,</div><div class='ctx'> 					    GFS2_BLKST_UNLINKED);</div><div class='ctx'> 		if (IS_ERR(inode)) {</div><div class='ctx'> 			if (PTR_ERR(inode) == -EAGAIN &amp;&amp;</div><div class='ctx'> 			    !test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags) &amp;&amp;</div><div class='del'>-			    gfs2_queue_verify_evict(gl))</div><div class='add'>+			    gfs2_queue_verify_delete(gl, true))</div><div class='ctx'> 				return;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			d_prune_aliases(inode);</div><div class='hunk'>@@ -1061,7 +976,6 @@ static void delete_work_func(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	gfs2_glock_put(gl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1071,43 +985,44 @@ static void glock_work_func(struct work_struct *work)</div><div class='ctx'> 	struct gfs2_glock *gl = container_of(work, struct gfs2_glock, gl_work.work);</div><div class='ctx'> 	unsigned int drop_refs = 1;</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(GLF_REPLY_PENDING, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	if (test_bit(GLF_HAVE_REPLY, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+		clear_bit(GLF_HAVE_REPLY, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		finish_xmote(gl, gl-&gt;gl_reply);</div><div class='ctx'> 		drop_refs++;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 	if (test_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='ctx'> 	    gl-&gt;gl_state != LM_ST_UNLOCKED &amp;&amp;</div><div class='ctx'> 	    gl-&gt;gl_demote_state != LM_ST_EXCLUSIVE) {</div><div class='del'>-		unsigned long holdtime, now = jiffies;</div><div class='add'>+		if (gl-&gt;gl_name.ln_type == LM_TYPE_INODE) {</div><div class='add'>+			unsigned long holdtime, now = jiffies;</div><div class='ctx'> </div><div class='del'>-		holdtime = gl-&gt;gl_tchange + gl-&gt;gl_hold_time;</div><div class='del'>-		if (time_before(now, holdtime))</div><div class='del'>-			delay = holdtime - now;</div><div class='add'>+			holdtime = gl-&gt;gl_tchange + gl-&gt;gl_hold_time;</div><div class='add'>+			if (time_before(now, holdtime))</div><div class='add'>+				delay = holdtime - now;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!delay) {</div><div class='ctx'> 			clear_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags);</div><div class='del'>-			gfs2_set_demote(gl);</div><div class='add'>+			gfs2_set_demote(GLF_DEMOTE, gl);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	run_queue(gl, 0);</div><div class='ctx'> 	if (delay) {</div><div class='ctx'> 		/* Keep one glock reference for the work we requeue. */</div><div class='ctx'> 		drop_refs--;</div><div class='del'>-		if (gl-&gt;gl_name.ln_type != LM_TYPE_INODE)</div><div class='del'>-			delay = 0;</div><div class='del'>-		__gfs2_glock_queue_work(gl, delay);</div><div class='add'>+		gfs2_glock_queue_work(gl, delay);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Drop the remaining glock references manually here. (Mind that</div><div class='del'>-	 * __gfs2_glock_queue_work depends on the lockref spinlock begin held</div><div class='del'>-	 * here as well.)</div><div class='del'>-	 */</div><div class='add'>+	/* Drop the remaining glock references manually. */</div><div class='add'>+	GLOCK_BUG_ON(gl, gl-&gt;gl_lockref.count &lt; drop_refs);</div><div class='ctx'> 	gl-&gt;gl_lockref.count -= drop_refs;</div><div class='ctx'> 	if (!gl-&gt;gl_lockref.count) {</div><div class='del'>-		__gfs2_glock_put(gl);</div><div class='del'>-		return;</div><div class='add'>+		if (gl-&gt;gl_state == LM_ST_UNLOCKED) {</div><div class='add'>+			__gfs2_glock_put(gl);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		gfs2_glock_add_to_lru(gl);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1143,6 +1058,8 @@ again:</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	finish_wait(wq, &amp;wait.wait);</div><div class='add'>+	if (gl)</div><div class='add'>+		gfs2_glock_remove_from_lru(gl);</div><div class='ctx'> 	return gl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1163,19 +1080,15 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,</div><div class='ctx'> 		   const struct gfs2_glock_operations *glops, int create,</div><div class='ctx'> 		   struct gfs2_glock **glp)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *s = sdp-&gt;sd_vfs;</div><div class='ctx'> 	struct lm_lockname name = { .ln_number = number,</div><div class='ctx'> 				    .ln_type = glops-&gt;go_type,</div><div class='ctx'> 				    .ln_sbd = sdp };</div><div class='ctx'> 	struct gfs2_glock *gl, *tmp;</div><div class='ctx'> 	struct address_space *mapping;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	gl = find_insert_glock(&amp;name, NULL);</div><div class='del'>-	if (gl) {</div><div class='del'>-		*glp = gl;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	if (gl)</div><div class='add'>+		goto found;</div><div class='ctx'> 	if (!create)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -1203,10 +1116,12 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;sdp-&gt;sd_glock_disposal);</div><div class='ctx'> 	gl-&gt;gl_node.next = NULL;</div><div class='del'>-	gl-&gt;gl_flags = glops-&gt;go_instantiate ? BIT(GLF_INSTANTIATE_NEEDED) : 0;</div><div class='add'>+	gl-&gt;gl_flags = BIT(GLF_INITIAL);</div><div class='add'>+	if (glops-&gt;go_instantiate)</div><div class='add'>+		gl-&gt;gl_flags |= BIT(GLF_INSTANTIATE_NEEDED);</div><div class='ctx'> 	gl-&gt;gl_name = name;</div><div class='add'>+	lockref_init(&amp;gl-&gt;gl_lockref);</div><div class='ctx'> 	lockdep_set_subclass(&amp;gl-&gt;gl_lockref.lock, glops-&gt;go_subclass);</div><div class='del'>-	gl-&gt;gl_lockref.count = 1;</div><div class='ctx'> 	gl-&gt;gl_state = LM_ST_UNLOCKED;</div><div class='ctx'> 	gl-&gt;gl_target = LM_ST_UNLOCKED;</div><div class='ctx'> 	gl-&gt;gl_demote_state = LM_ST_EXCLUSIVE;</div><div class='hunk'>@@ -1226,32 +1141,31 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,</div><div class='ctx'> </div><div class='ctx'> 	mapping = gfs2_glock2aspace(gl);</div><div class='ctx'> 	if (mapping) {</div><div class='add'>+		gfp_t gfp_mask;</div><div class='add'>+</div><div class='ctx'>                 mapping-&gt;a_ops = &amp;gfs2_meta_aops;</div><div class='del'>-		mapping-&gt;host = s-&gt;s_bdev-&gt;bd_inode;</div><div class='add'>+		mapping-&gt;host = sdp-&gt;sd_inode;</div><div class='ctx'> 		mapping-&gt;flags = 0;</div><div class='del'>-		mapping_set_gfp_mask(mapping, GFP_NOFS);</div><div class='add'>+		gfp_mask = mapping_gfp_mask(sdp-&gt;sd_inode-&gt;i_mapping);</div><div class='add'>+		mapping_set_gfp_mask(mapping, gfp_mask);</div><div class='ctx'> 		mapping-&gt;i_private_data = NULL;</div><div class='ctx'> 		mapping-&gt;writeback_index = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = find_insert_glock(&amp;name, gl);</div><div class='del'>-	if (!tmp) {</div><div class='del'>-		*glp = gl;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (IS_ERR(tmp)) {</div><div class='del'>-		ret = PTR_ERR(tmp);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-	*glp = tmp;</div><div class='add'>+	if (tmp) {</div><div class='add'>+		gfs2_glock_dealloc(&amp;gl-&gt;gl_rcu);</div><div class='add'>+		if (atomic_dec_and_test(&amp;sdp-&gt;sd_glock_disposal))</div><div class='add'>+			wake_up(&amp;sdp-&gt;sd_kill_wait);</div><div class='ctx'> </div><div class='del'>-out_free:</div><div class='del'>-	gfs2_glock_dealloc(&amp;gl-&gt;gl_rcu);</div><div class='del'>-	if (atomic_dec_and_test(&amp;sdp-&gt;sd_glock_disposal))</div><div class='del'>-		wake_up(&amp;sdp-&gt;sd_kill_wait);</div><div class='add'>+		if (IS_ERR(tmp))</div><div class='add'>+			return PTR_ERR(tmp);</div><div class='add'>+		gl = tmp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+found:</div><div class='add'>+	*glp = gl;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1260,7 +1174,7 @@ out:</div><div class='ctx'>  * @state: the state we're requesting</div><div class='ctx'>  * @flags: the modifier flags</div><div class='ctx'>  * @gh: the holder structure</div><div class='del'>- *</div><div class='add'>+ * @ip: caller's return address for debugging</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void __gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, u16 flags,</div><div class='hunk'>@@ -1421,7 +1335,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * handle_callback - process a demote request</div><div class='add'>+ * request_demote - process a demote request</div><div class='ctx'>  * @gl: the glock</div><div class='ctx'>  * @state: the state the caller wants us to change to</div><div class='ctx'>  * @delay: zero to demote immediately; otherwise pending demote</div><div class='hunk'>@@ -1431,13 +1345,10 @@ out:</div><div class='ctx'>  * practise: LM_ST_SHARED and LM_ST_UNLOCKED</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void handle_callback(struct gfs2_glock *gl, unsigned int state,</div><div class='del'>-			    unsigned long delay, bool remote)</div><div class='add'>+static void request_demote(struct gfs2_glock *gl, unsigned int state,</div><div class='add'>+			   unsigned long delay, bool remote)</div><div class='ctx'> {</div><div class='del'>-	if (delay)</div><div class='del'>-		set_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags);</div><div class='del'>-	else</div><div class='del'>-		gfs2_set_demote(gl);</div><div class='add'>+	gfs2_set_demote(delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE, gl);</div><div class='ctx'> 	if (gl-&gt;gl_demote_state == LM_ST_EXCLUSIVE) {</div><div class='ctx'> 		gl-&gt;gl_demote_state = state;</div><div class='ctx'> 		gl-&gt;gl_demote_time = jiffies;</div><div class='hunk'>@@ -1469,13 +1380,29 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...)</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool gfs2_should_queue_trylock(struct gfs2_glock *gl,</div><div class='add'>+				      struct gfs2_holder *gh)</div><div class='add'>+{</div><div class='add'>+	struct gfs2_holder *current_gh, *gh2;</div><div class='add'>+</div><div class='add'>+	current_gh = find_first_holder(gl);</div><div class='add'>+	if (current_gh &amp;&amp; !may_grant(gl, current_gh, gh))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(gh2, &amp;gl-&gt;gl_holders, gh_list) {</div><div class='add'>+		if (test_bit(HIF_HOLDER, &amp;gh2-&gt;gh_iflags))</div><div class='add'>+			continue;</div><div class='add'>+		if (!(gh2-&gt;gh_flags &amp; (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool pid_is_meaningful(const struct gfs2_holder *gh)</div><div class='ctx'> {</div><div class='ctx'>         if (!(gh-&gt;gh_flags &amp; GL_NOPID))</div><div class='ctx'>                 return true;</div><div class='del'>-        if (gh-&gt;gh_state == LM_ST_UNLOCKED)</div><div class='del'>-                return true;</div><div class='del'>-        return false;</div><div class='add'>+	return !test_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1489,28 +1416,20 @@ static inline bool pid_is_meaningful(const struct gfs2_holder *gh)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline void add_to_queue(struct gfs2_holder *gh)</div><div class='del'>-__releases(&amp;gl-&gt;gl_lockref.lock)</div><div class='del'>-__acquires(&amp;gl-&gt;gl_lockref.lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = gh-&gt;gh_gl;</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-	struct list_head *insert_pt = NULL;</div><div class='ctx'> 	struct gfs2_holder *gh2;</div><div class='del'>-	int try_futile = 0;</div><div class='ctx'> </div><div class='ctx'> 	GLOCK_BUG_ON(gl, gh-&gt;gh_owner_pid == NULL);</div><div class='ctx'> 	if (test_and_set_bit(HIF_WAIT, &amp;gh-&gt;gh_iflags))</div><div class='ctx'> 		GLOCK_BUG_ON(gl, true);</div><div class='ctx'> </div><div class='del'>-	if (gh-&gt;gh_flags &amp; (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) {</div><div class='del'>-		if (test_bit(GLF_LOCK, &amp;gl-&gt;gl_flags)) {</div><div class='del'>-			struct gfs2_holder *current_gh;</div><div class='del'>-</div><div class='del'>-			current_gh = find_first_holder(gl);</div><div class='del'>-			try_futile = !may_grant(gl, current_gh, gh);</div><div class='del'>-		}</div><div class='del'>-		if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &amp;gl-&gt;gl_flags))</div><div class='del'>-			goto fail;</div><div class='add'>+	if ((gh-&gt;gh_flags &amp; (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) &amp;&amp;</div><div class='add'>+	    !gfs2_should_queue_trylock(gl, gh)) {</div><div class='add'>+		gh-&gt;gh_error = GLR_TRYFAILED;</div><div class='add'>+		gfs2_holder_wake(gh);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(gh2, &amp;gl-&gt;gl_holders, gh_list) {</div><div class='hunk'>@@ -1522,29 +1441,10 @@ __acquires(&amp;gl-&gt;gl_lockref.lock)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		goto trap_recursive;</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_entry(gh2, &amp;gl-&gt;gl_holders, gh_list) {</div><div class='del'>-		if (try_futile &amp;&amp;</div><div class='del'>-		    !(gh2-&gt;gh_flags &amp; (LM_FLAG_TRY | LM_FLAG_TRY_1CB))) {</div><div class='del'>-fail:</div><div class='del'>-			gh-&gt;gh_error = GLR_TRYFAILED;</div><div class='del'>-			gfs2_holder_wake(gh);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (test_bit(HIF_HOLDER, &amp;gh2-&gt;gh_iflags))</div><div class='del'>-			continue;</div><div class='del'>-	}</div><div class='ctx'> 	trace_gfs2_glock_queue(gh, 1);</div><div class='ctx'> 	gfs2_glstats_inc(gl, GFS2_LKS_QCOUNT);</div><div class='ctx'> 	gfs2_sbstats_inc(gl, GFS2_LKS_QCOUNT);</div><div class='del'>-	if (likely(insert_pt == NULL)) {</div><div class='del'>-		list_add_tail(&amp;gh-&gt;gh_list, &amp;gl-&gt;gl_holders);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;gh-&gt;gh_list, insert_pt);</div><div class='del'>-	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	if (sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_cancel)</div><div class='del'>-		sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_cancel(gl);</div><div class='del'>-	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	list_add_tail(&amp;gh-&gt;gh_list, &amp;gl-&gt;gl_holders);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> trap_recursive:</div><div class='hunk'>@@ -1572,9 +1472,10 @@ trap_recursive:</div><div class='ctx'> int gfs2_glock_nq(struct gfs2_holder *gh)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = gh-&gt;gh_gl;</div><div class='add'>+	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (glock_blocked_by_withdraw(gl) &amp;&amp; !(gh-&gt;gh_flags &amp; LM_FLAG_NOEXP))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (gh-&gt;gh_flags &amp; GL_NOBLOCK) {</div><div class='hunk'>@@ -1596,17 +1497,14 @@ unlock:</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(GLF_LRU, &amp;gl-&gt;gl_flags))</div><div class='del'>-		gfs2_glock_remove_from_lru(gl);</div><div class='del'>-</div><div class='ctx'> 	gh-&gt;gh_error = 0;</div><div class='ctx'> 	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 	add_to_queue(gh);</div><div class='del'>-	if (unlikely((LM_FLAG_NOEXP &amp; gh-&gt;gh_flags) &amp;&amp;</div><div class='del'>-		     test_and_clear_bit(GLF_FROZEN, &amp;gl-&gt;gl_flags))) {</div><div class='del'>-		set_bit(GLF_REPLY_PENDING, &amp;gl-&gt;gl_flags);</div><div class='add'>+	if (unlikely((LM_FLAG_RECOVER &amp; gh-&gt;gh_flags) &amp;&amp;</div><div class='add'>+		     test_and_clear_bit(GLF_HAVE_FROZEN_REPLY, &amp;gl-&gt;gl_flags))) {</div><div class='add'>+		set_bit(GLF_HAVE_REPLY, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		gl-&gt;gl_lockref.count++;</div><div class='del'>-		__gfs2_glock_queue_work(gl, 0);</div><div class='add'>+		gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	run_queue(gl, 1);</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='hunk'>@@ -1630,12 +1528,6 @@ int gfs2_glock_poll(struct gfs2_holder *gh)</div><div class='ctx'> 	return test_bit(HIF_WAIT, &amp;gh-&gt;gh_iflags) ? 0 : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool needs_demote(struct gfs2_glock *gl)</div><div class='del'>-{</div><div class='del'>-	return (test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags) ||</div><div class='del'>-		test_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __gfs2_glock_dq(struct gfs2_holder *gh)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = gh-&gt;gh_gl;</div><div class='hunk'>@@ -1644,11 +1536,11 @@ static void __gfs2_glock_dq(struct gfs2_holder *gh)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This holder should not be cached, so mark it for demote.</div><div class='del'>-	 * Note: this should be done before the check for needs_demote</div><div class='del'>-	 * below.</div><div class='add'>+	 * Note: this should be done before the glock_needs_demote</div><div class='add'>+	 * check below.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (gh-&gt;gh_flags &amp; GL_NOCACHE)</div><div class='del'>-		handle_callback(gl, LM_ST_UNLOCKED, 0, false);</div><div class='add'>+		request_demote(gl, LM_ST_UNLOCKED, 0, false);</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;gh-&gt;gh_list);</div><div class='ctx'> 	clear_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags);</div><div class='hunk'>@@ -1658,21 +1550,18 @@ static void __gfs2_glock_dq(struct gfs2_holder *gh)</div><div class='ctx'> 	 * If there hasn't been a demote request we are done.</div><div class='ctx'> 	 * (Let the remaining holders, if any, keep holding it.)</div><div class='ctx'> 	 */</div><div class='del'>-	if (!needs_demote(gl)) {</div><div class='add'>+	if (!glock_needs_demote(gl)) {</div><div class='ctx'> 		if (list_empty(&amp;gl-&gt;gl_holders))</div><div class='ctx'> 			fast_path = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(GLF_LFLUSH, &amp;gl-&gt;gl_flags) &amp;&amp; demote_ok(gl))</div><div class='del'>-		gfs2_glock_add_to_lru(gl);</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(!fast_path)) {</div><div class='ctx'> 		gl-&gt;gl_lockref.count++;</div><div class='ctx'> 		if (test_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='ctx'> 		    !test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='ctx'> 		    gl-&gt;gl_name.ln_type == LM_TYPE_INODE)</div><div class='ctx'> 			delay = gl-&gt;gl_hold_time;</div><div class='del'>-		__gfs2_glock_queue_work(gl, delay);</div><div class='add'>+		gfs2_glock_queue_work(gl, delay);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1684,7 +1573,6 @@ static void __gfs2_glock_dq(struct gfs2_holder *gh)</div><div class='ctx'> void gfs2_glock_dq(struct gfs2_holder *gh)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = gh-&gt;gh_gl;</div><div class='del'>-	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 	if (!gfs2_holder_queued(gh)) {</div><div class='hunk'>@@ -1696,29 +1584,19 @@ void gfs2_glock_dq(struct gfs2_holder *gh)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (list_is_first(&amp;gh-&gt;gh_list, &amp;gl-&gt;gl_holders) &amp;&amp;</div><div class='del'>-	    !test_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags)) {</div><div class='add'>+	    !test_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags) &amp;&amp;</div><div class='add'>+	    test_bit(GLF_LOCK, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='add'>+	    !test_bit(GLF_DEMOTE_IN_PROGRESS, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='add'>+	    !test_bit(GLF_CANCELING, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+		set_bit(GLF_CANCELING, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 		gl-&gt;gl_name.ln_sbd-&gt;sd_lockstruct.ls_ops-&gt;lm_cancel(gl);</div><div class='ctx'> 		wait_on_bit(&amp;gh-&gt;gh_iflags, HIF_WAIT, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 		spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're in the process of file system withdraw, we cannot just</div><div class='del'>-	 * dequeue any glocks until our journal is recovered, lest we introduce</div><div class='del'>-	 * file system corruption. We need two exceptions to this rule: We need</div><div class='del'>-	 * to allow unlocking of nondisk glocks and the glock for our own</div><div class='del'>-	 * journal that needs recovery.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(SDF_WITHDRAW_RECOVERY, &amp;sdp-&gt;sd_flags) &amp;&amp;</div><div class='del'>-	    glock_blocked_by_withdraw(gl) &amp;&amp;</div><div class='del'>-	    gh-&gt;gh_gl != sdp-&gt;sd_jinode_gl) {</div><div class='del'>-		sdp-&gt;sd_glock_dqs_held++;</div><div class='del'>-		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-		might_sleep();</div><div class='del'>-		wait_on_bit(&amp;sdp-&gt;sd_flags, SDF_WITHDRAW_RECOVERY,</div><div class='del'>-			    TASK_UNINTERRUPTIBLE);</div><div class='del'>-		spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+		clear_bit(GLF_CANCELING, &amp;gl-&gt;gl_flags);</div><div class='add'>+		clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags);</div><div class='add'>+		if (!gfs2_holder_queued(gh))</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__gfs2_glock_dq(gh);</div><div class='hunk'>@@ -1882,21 +1760,23 @@ void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs)</div><div class='ctx'> void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long delay = 0;</div><div class='del'>-	unsigned long holdtime;</div><div class='del'>-	unsigned long now = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	gfs2_glock_hold(gl);</div><div class='ctx'> 	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	holdtime = gl-&gt;gl_tchange + gl-&gt;gl_hold_time;</div><div class='ctx'> 	if (!list_empty(&amp;gl-&gt;gl_holders) &amp;&amp;</div><div class='ctx'> 	    gl-&gt;gl_name.ln_type == LM_TYPE_INODE) {</div><div class='add'>+		unsigned long now = jiffies;</div><div class='add'>+		unsigned long holdtime;</div><div class='add'>+</div><div class='add'>+		holdtime = gl-&gt;gl_tchange + gl-&gt;gl_hold_time;</div><div class='add'>+</div><div class='ctx'> 		if (time_before(now, holdtime))</div><div class='ctx'> 			delay = holdtime - now;</div><div class='del'>-		if (test_bit(GLF_REPLY_PENDING, &amp;gl-&gt;gl_flags))</div><div class='add'>+		if (test_bit(GLF_HAVE_REPLY, &amp;gl-&gt;gl_flags))</div><div class='ctx'> 			delay = gl-&gt;gl_hold_time;</div><div class='ctx'> 	}</div><div class='del'>-	handle_callback(gl, state, delay, true);</div><div class='del'>-	__gfs2_glock_queue_work(gl, delay);</div><div class='add'>+	request_demote(gl, state, delay, true);</div><div class='add'>+	gfs2_glock_queue_work(gl, delay);</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1906,7 +1786,7 @@ void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state)</div><div class='ctx'>  *</div><div class='ctx'>  * Glocks are not frozen if (a) the result of the dlm operation is</div><div class='ctx'>  * an error, (b) the locking operation was an unlock operation or</div><div class='del'>- * (c) if there is a "noexp" flagged request anywhere in the queue</div><div class='add'>+ * (c) if there is a "recover" flagged request anywhere in the queue</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 1 if freezing should occur, 0 otherwise</div><div class='ctx'>  */</div><div class='hunk'>@@ -1923,7 +1803,7 @@ static int gfs2_should_freeze(const struct gfs2_glock *gl)</div><div class='ctx'> 	list_for_each_entry(gh, &amp;gl-&gt;gl_holders, gh_list) {</div><div class='ctx'> 		if (test_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (LM_FLAG_NOEXP &amp; gh-&gt;gh_flags)</div><div class='add'>+		if (LM_FLAG_RECOVER &amp; gh-&gt;gh_flags)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1944,19 +1824,20 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;gl-&gt;gl_name.ln_sbd-&gt;sd_lockstruct;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	clear_bit(GLF_PENDING_REPLY, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	gl-&gt;gl_reply = ret;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_bit(DFL_BLOCK_LOCKS, &amp;ls-&gt;ls_recover_flags))) {</div><div class='ctx'> 		if (gfs2_should_freeze(gl)) {</div><div class='del'>-			set_bit(GLF_FROZEN, &amp;gl-&gt;gl_flags);</div><div class='add'>+			set_bit(GLF_HAVE_FROZEN_REPLY, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 			spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gl-&gt;gl_lockref.count++;</div><div class='del'>-	set_bit(GLF_REPLY_PENDING, &amp;gl-&gt;gl_flags);</div><div class='del'>-	__gfs2_glock_queue_work(gl, 0);</div><div class='add'>+	set_bit(GLF_HAVE_REPLY, &amp;gl-&gt;gl_flags);</div><div class='add'>+	gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1976,6 +1857,16 @@ static int glock_cmp(void *priv, const struct list_head *a,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool can_free_glock(struct gfs2_glock *gl)</div><div class='add'>+{</div><div class='add'>+	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='add'>+</div><div class='add'>+	return !test_bit(GLF_LOCK, &amp;gl-&gt;gl_flags) &amp;&amp;</div><div class='add'>+	       !gl-&gt;gl_lockref.count &amp;&amp;</div><div class='add'>+	       (!test_bit(GLF_LFLUSH, &amp;gl-&gt;gl_flags) ||</div><div class='add'>+		test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_dispose_glock_lru - Demote a list of glocks</div><div class='ctx'>  * @list: The list to dispose of</div><div class='hunk'>@@ -1990,37 +1881,38 @@ static int glock_cmp(void *priv, const struct list_head *a,</div><div class='ctx'>  * private)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void gfs2_dispose_glock_lru(struct list_head *list)</div><div class='add'>+static unsigned long gfs2_dispose_glock_lru(struct list_head *list)</div><div class='ctx'> __releases(&amp;lru_lock)</div><div class='ctx'> __acquires(&amp;lru_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl;</div><div class='add'>+	unsigned long freed = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_sort(NULL, list, glock_cmp);</div><div class='ctx'> </div><div class='ctx'> 	while(!list_empty(list)) {</div><div class='ctx'> 		gl = list_first_entry(list, struct gfs2_glock, gl_lru);</div><div class='del'>-		list_del_init(&amp;gl-&gt;gl_lru);</div><div class='del'>-		clear_bit(GLF_LRU, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 		if (!spin_trylock(&amp;gl-&gt;gl_lockref.lock)) {</div><div class='ctx'> add_back_to_lru:</div><div class='del'>-			list_add(&amp;gl-&gt;gl_lru, &amp;lru_list);</div><div class='del'>-			set_bit(GLF_LRU, &amp;gl-&gt;gl_flags);</div><div class='del'>-			atomic_inc(&amp;lru_count);</div><div class='add'>+			list_move(&amp;gl-&gt;gl_lru, &amp;lru_list);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (test_and_set_bit(GLF_LOCK, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+		if (!can_free_glock(gl)) {</div><div class='ctx'> 			spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 			goto add_back_to_lru;</div><div class='ctx'> 		}</div><div class='add'>+		list_del_init(&amp;gl-&gt;gl_lru);</div><div class='add'>+		atomic_dec(&amp;lru_count);</div><div class='add'>+		clear_bit(GLF_LRU, &amp;gl-&gt;gl_flags);</div><div class='add'>+		freed++;</div><div class='ctx'> 		gl-&gt;gl_lockref.count++;</div><div class='del'>-		if (demote_ok(gl))</div><div class='del'>-			handle_callback(gl, LM_ST_UNLOCKED, 0, false);</div><div class='del'>-		WARN_ON(!test_and_clear_bit(GLF_LOCK, &amp;gl-&gt;gl_flags));</div><div class='del'>-		__gfs2_glock_queue_work(gl, 0);</div><div class='add'>+		if (gl-&gt;gl_state != LM_ST_UNLOCKED)</div><div class='add'>+			request_demote(gl, LM_ST_UNLOCKED, 0, false);</div><div class='add'>+		gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> 		spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 		cond_resched_lock(&amp;lru_lock);</div><div class='ctx'> 	}</div><div class='add'>+	return freed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2032,32 +1924,21 @@ add_back_to_lru:</div><div class='ctx'>  * gfs2_dispose_glock_lru() above.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static long gfs2_scan_glock_lru(int nr)</div><div class='add'>+static unsigned long gfs2_scan_glock_lru(unsigned long nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl, *next;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='del'>-	long freed = 0;</div><div class='add'>+	unsigned long freed = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;lru_lock);</div><div class='ctx'> 	list_for_each_entry_safe(gl, next, &amp;lru_list, gl_lru) {</div><div class='del'>-		if (nr-- &lt;= 0)</div><div class='add'>+		if (!nr--)</div><div class='ctx'> 			break;</div><div class='del'>-		/* Test for being demotable */</div><div class='del'>-		if (!test_bit(GLF_LOCK, &amp;gl-&gt;gl_flags)) {</div><div class='del'>-			if (!spin_trylock(&amp;gl-&gt;gl_lockref.lock))</div><div class='del'>-				continue;</div><div class='del'>-			if (gl-&gt;gl_lockref.count &lt;= 1 &amp;&amp;</div><div class='del'>-			    (gl-&gt;gl_state == LM_ST_UNLOCKED ||</div><div class='del'>-			     demote_ok(gl))) {</div><div class='del'>-				list_move(&amp;gl-&gt;gl_lru, &amp;dispose);</div><div class='del'>-				atomic_dec(&amp;lru_count);</div><div class='del'>-				freed++;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-		}</div><div class='add'>+		if (can_free_glock(gl))</div><div class='add'>+			list_move(&amp;gl-&gt;gl_lru, &amp;dispose);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!list_empty(&amp;dispose))</div><div class='del'>-		gfs2_dispose_glock_lru(&amp;dispose);</div><div class='add'>+		freed = gfs2_dispose_glock_lru(&amp;dispose);</div><div class='ctx'> 	spin_unlock(&amp;lru_lock);</div><div class='ctx'> </div><div class='ctx'> 	return freed;</div><div class='hunk'>@@ -2113,7 +1994,7 @@ static void glock_hash_walk(glock_examiner examiner, const struct gfs2_sbd *sdp)</div><div class='ctx'> void gfs2_cancel_delete_work(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	clear_bit(GLF_TRY_TO_EVICT, &amp;gl-&gt;gl_flags);</div><div class='del'>-	clear_bit(GLF_VERIFY_EVICT, &amp;gl-&gt;gl_flags);</div><div class='add'>+	clear_bit(GLF_VERIFY_DELETE, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	if (cancel_delayed_work(&amp;gl-&gt;gl_delete))</div><div class='ctx'> 		gfs2_glock_put(gl);</div><div class='ctx'> }</div><div class='hunk'>@@ -2144,12 +2025,16 @@ void gfs2_flush_delete_work(struct gfs2_sbd *sdp)</div><div class='ctx'> </div><div class='ctx'> static void thaw_glock(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='del'>-	if (!test_and_clear_bit(GLF_FROZEN, &amp;gl-&gt;gl_flags))</div><div class='add'>+	if (!test_and_clear_bit(GLF_HAVE_FROZEN_REPLY, &amp;gl-&gt;gl_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!lockref_get_not_dead(&amp;gl-&gt;gl_lockref))</div><div class='ctx'> 		return;</div><div class='del'>-	set_bit(GLF_REPLY_PENDING, &amp;gl-&gt;gl_flags);</div><div class='add'>+</div><div class='add'>+	gfs2_glock_remove_from_lru(gl);</div><div class='add'>+	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='add'>+	set_bit(GLF_HAVE_REPLY, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	gfs2_glock_queue_work(gl, 0);</div><div class='add'>+	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2166,8 +2051,8 @@ static void clear_glock(struct gfs2_glock *gl)</div><div class='ctx'> 	if (!__lockref_is_dead(&amp;gl-&gt;gl_lockref)) {</div><div class='ctx'> 		gl-&gt;gl_lockref.count++;</div><div class='ctx'> 		if (gl-&gt;gl_state != LM_ST_UNLOCKED)</div><div class='del'>-			handle_callback(gl, LM_ST_UNLOCKED, 0, false);</div><div class='del'>-		__gfs2_glock_queue_work(gl, 0);</div><div class='add'>+			request_demote(gl, LM_ST_UNLOCKED, 0, false);</div><div class='add'>+		gfs2_glock_queue_work(gl, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -2195,18 +2080,26 @@ static void dump_glock_func(struct gfs2_glock *gl)</div><div class='ctx'> 	dump_glock(NULL, gl, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void withdraw_dq(struct gfs2_glock *gl)</div><div class='add'>+static void withdraw_glock(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;gl-&gt;gl_lockref.lock);</div><div class='del'>-	if (!__lockref_is_dead(&amp;gl-&gt;gl_lockref) &amp;&amp;</div><div class='del'>-	    glock_blocked_by_withdraw(gl))</div><div class='add'>+	if (!__lockref_is_dead(&amp;gl-&gt;gl_lockref)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We don't want to write back any more dirty data.  Unlock the</div><div class='add'>+		 * remaining inode and resource group glocks; this will cause</div><div class='add'>+		 * their -&gt;go_inval() hooks to toss out all the remaining</div><div class='add'>+		 * cached data, dirty or not.</div><div class='add'>+		 */</div><div class='add'>+		if (gl-&gt;gl_ops-&gt;go_inval &amp;&amp; gl-&gt;gl_state != LM_ST_UNLOCKED)</div><div class='add'>+			request_demote(gl, LM_ST_UNLOCKED, 0, false);</div><div class='ctx'> 		do_error(gl, LM_OUT_ERROR); /* remove pending waiters */</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void gfs2_gl_dq_holders(struct gfs2_sbd *sdp)</div><div class='add'>+void gfs2_withdraw_glocks(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='del'>-	glock_hash_walk(withdraw_dq, sdp);</div><div class='add'>+	glock_hash_walk(withdraw_glock, sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2218,14 +2111,31 @@ void gfs2_gl_dq_holders(struct gfs2_sbd *sdp)</div><div class='ctx'> </div><div class='ctx'> void gfs2_gl_hash_clear(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='add'>+	unsigned long start = jiffies;</div><div class='add'>+	bool timed_out = false;</div><div class='add'>+</div><div class='ctx'> 	set_bit(SDF_SKIP_DLM_UNLOCK, &amp;sdp-&gt;sd_flags);</div><div class='del'>-	flush_workqueue(glock_workqueue);</div><div class='add'>+	flush_workqueue(sdp-&gt;sd_glock_wq);</div><div class='ctx'> 	glock_hash_walk(clear_glock, sdp);</div><div class='del'>-	flush_workqueue(glock_workqueue);</div><div class='del'>-	wait_event_timeout(sdp-&gt;sd_kill_wait,</div><div class='del'>-			   atomic_read(&amp;sdp-&gt;sd_glock_disposal) == 0,</div><div class='del'>-			   HZ * 600);</div><div class='add'>+	flush_workqueue(sdp-&gt;sd_glock_wq);</div><div class='add'>+</div><div class='add'>+	while (!timed_out) {</div><div class='add'>+		wait_event_timeout(sdp-&gt;sd_kill_wait,</div><div class='add'>+				   !atomic_read(&amp;sdp-&gt;sd_glock_disposal),</div><div class='add'>+				   HZ * 60);</div><div class='add'>+		if (!atomic_read(&amp;sdp-&gt;sd_glock_disposal))</div><div class='add'>+			break;</div><div class='add'>+		timed_out = time_after(jiffies, start + (HZ * 600));</div><div class='add'>+		fs_warn(sdp, "%u glocks left after %u seconds%s\n",</div><div class='add'>+			atomic_read(&amp;sdp-&gt;sd_glock_disposal),</div><div class='add'>+			jiffies_to_msecs(jiffies - start) / 1000,</div><div class='add'>+			timed_out ? ":" : "; still waiting");</div><div class='add'>+	}</div><div class='add'>+	gfs2_lm_unmount(sdp);</div><div class='add'>+	gfs2_free_dead_glocks(sdp);</div><div class='ctx'> 	glock_hash_walk(dump_glock_func, sdp);</div><div class='add'>+	destroy_workqueue(sdp-&gt;sd_glock_wq);</div><div class='add'>+	sdp-&gt;sd_glock_wq = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *state2str(unsigned state)</div><div class='hunk'>@@ -2250,7 +2160,7 @@ static const char *hflags2str(char *buf, u16 flags, unsigned long iflags)</div><div class='ctx'> 		*p++ = 't';</div><div class='ctx'> 	if (flags &amp; LM_FLAG_TRY_1CB)</div><div class='ctx'> 		*p++ = 'T';</div><div class='del'>-	if (flags &amp; LM_FLAG_NOEXP)</div><div class='add'>+	if (flags &amp; LM_FLAG_RECOVER)</div><div class='ctx'> 		*p++ = 'e';</div><div class='ctx'> 	if (flags &amp; LM_FLAG_ANY)</div><div class='ctx'> 		*p++ = 'A';</div><div class='hunk'>@@ -2321,13 +2231,13 @@ static const char *gflags2str(char *buf, const struct gfs2_glock *gl)</div><div class='ctx'> 		*p++ = 'y';</div><div class='ctx'> 	if (test_bit(GLF_LFLUSH, gflags))</div><div class='ctx'> 		*p++ = 'f';</div><div class='del'>-	if (test_bit(GLF_INVALIDATE_IN_PROGRESS, gflags))</div><div class='del'>-		*p++ = 'i';</div><div class='del'>-	if (test_bit(GLF_REPLY_PENDING, gflags))</div><div class='add'>+	if (test_bit(GLF_PENDING_REPLY, gflags))</div><div class='add'>+		*p++ = 'R';</div><div class='add'>+	if (test_bit(GLF_HAVE_REPLY, gflags))</div><div class='ctx'> 		*p++ = 'r';</div><div class='ctx'> 	if (test_bit(GLF_INITIAL, gflags))</div><div class='del'>-		*p++ = 'I';</div><div class='del'>-	if (test_bit(GLF_FROZEN, gflags))</div><div class='add'>+		*p++ = 'a';</div><div class='add'>+	if (test_bit(GLF_HAVE_FROZEN_REPLY, gflags))</div><div class='ctx'> 		*p++ = 'F';</div><div class='ctx'> 	if (!list_empty(&amp;gl-&gt;gl_holders))</div><div class='ctx'> 		*p++ = 'q';</div><div class='hunk'>@@ -2337,16 +2247,18 @@ static const char *gflags2str(char *buf, const struct gfs2_glock *gl)</div><div class='ctx'> 		*p++ = 'o';</div><div class='ctx'> 	if (test_bit(GLF_BLOCKING, gflags))</div><div class='ctx'> 		*p++ = 'b';</div><div class='del'>-	if (test_bit(GLF_FREEING, gflags))</div><div class='del'>-		*p++ = 'x';</div><div class='ctx'> 	if (test_bit(GLF_INSTANTIATE_NEEDED, gflags))</div><div class='ctx'> 		*p++ = 'n';</div><div class='ctx'> 	if (test_bit(GLF_INSTANTIATE_IN_PROG, gflags))</div><div class='ctx'> 		*p++ = 'N';</div><div class='ctx'> 	if (test_bit(GLF_TRY_TO_EVICT, gflags))</div><div class='ctx'> 		*p++ = 'e';</div><div class='del'>-	if (test_bit(GLF_VERIFY_EVICT, gflags))</div><div class='add'>+	if (test_bit(GLF_VERIFY_DELETE, gflags))</div><div class='ctx'> 		*p++ = 'E';</div><div class='add'>+	if (test_bit(GLF_DEFER_DELETE, gflags))</div><div class='add'>+		*p++ = 's';</div><div class='add'>+	if (test_bit(GLF_CANCELING, gflags))</div><div class='add'>+		*p++ = 'C';</div><div class='ctx'> 	*p = 0;</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='hunk'>@@ -2490,16 +2402,8 @@ int __init gfs2_glock_init(void)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	glock_workqueue = alloc_workqueue("glock_workqueue", WQ_MEM_RECLAIM |</div><div class='del'>-					  WQ_HIGHPRI | WQ_FREEZABLE, 0);</div><div class='del'>-	if (!glock_workqueue) {</div><div class='del'>-		rhashtable_destroy(&amp;gl_hash_table);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	glock_shrinker = shrinker_alloc(0, "gfs2-glock");</div><div class='ctx'> 	if (!glock_shrinker) {</div><div class='del'>-		destroy_workqueue(glock_workqueue);</div><div class='ctx'> 		rhashtable_destroy(&amp;gl_hash_table);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2519,7 +2423,6 @@ void gfs2_glock_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	shrinker_free(glock_shrinker);</div><div class='ctx'> 	rhashtable_destroy(&amp;gl_hash_table);</div><div class='del'>-	destroy_workqueue(glock_workqueue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi, loff_t n)</div><div class='hunk'>@@ -2529,8 +2432,7 @@ static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi, loff_t n)</div><div class='ctx'> 	if (gl) {</div><div class='ctx'> 		if (n == 0)</div><div class='ctx'> 			return;</div><div class='del'>-		if (!lockref_put_not_zero(&amp;gl-&gt;gl_lockref))</div><div class='del'>-			gfs2_glock_queue_put(gl);</div><div class='add'>+		gfs2_glock_put_async(gl);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		gl = rhashtable_walk_next(&amp;gi-&gt;hti);</div><div class='hunk'>@@ -2752,25 +2654,18 @@ static struct file *gfs2_glockfd_next_file(struct gfs2_glockfd_iter *i)</div><div class='ctx'> 		i-&gt;file = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	for(;; i-&gt;fd++) {</div><div class='del'>-		struct inode *inode;</div><div class='del'>-</div><div class='del'>-		i-&gt;file = task_lookup_next_fdget_rcu(i-&gt;task, &amp;i-&gt;fd);</div><div class='add'>+		i-&gt;file = fget_task_next(i-&gt;task, &amp;i-&gt;fd);</div><div class='ctx'> 		if (!i-&gt;file) {</div><div class='ctx'> 			i-&gt;fd = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		inode = file_inode(i-&gt;file);</div><div class='del'>-		if (inode-&gt;i_sb == i-&gt;sb)</div><div class='add'>+		if (file_inode(i-&gt;file)-&gt;i_sb == i-&gt;sb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		fput(i-&gt;file);</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	return i-&gt;file;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h<br/>index 0114f3e0ebe0..55d5985f32a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/glock.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/glock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/glock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/glock.h</a></div><div class='hunk'>@@ -58,16 +58,20 @@ enum {</div><div class='ctx'>  * LM_FLAG_TRY_1CB</div><div class='ctx'>  * Send one blocking callback if TRY is set and the lock is not granted.</div><div class='ctx'>  *</div><div class='del'>- * LM_FLAG_NOEXP</div><div class='add'>+ * LM_FLAG_RECOVER</div><div class='ctx'>  * GFS sets this flag on lock requests it makes while doing journal recovery.</div><div class='del'>- * These special requests should not be blocked due to the recovery like</div><div class='del'>- * ordinary locks would be.</div><div class='add'>+ * While ordinary requests are blocked until the end of recovery, requests</div><div class='add'>+ * with this flag set do proceed.</div><div class='ctx'>  *</div><div class='ctx'>  * LM_FLAG_ANY</div><div class='ctx'>  * A SHARED request may also be granted in DEFERRED, or a DEFERRED request may</div><div class='ctx'>  * also be granted in SHARED.  The preferred state is whichever is compatible</div><div class='ctx'>  * with other granted locks, or the specified state if no other locks exist.</div><div class='ctx'>  *</div><div class='add'>+ * In addition, when a lock is already held in EX mode locally, a SHARED or</div><div class='add'>+ * DEFERRED mode request with the LM_FLAG_ANY flag set will be granted.</div><div class='add'>+ * (The LM_FLAG_ANY flag is only use for SHARED mode requests currently.)</div><div class='add'>+ *</div><div class='ctx'>  * LM_FLAG_NODE_SCOPE</div><div class='ctx'>  * This holder agrees to share the lock within this node. In other words,</div><div class='ctx'>  * the glock is held in EX mode according to DLM, but local holders on the</div><div class='hunk'>@@ -76,7 +80,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define LM_FLAG_TRY		0x0001</div><div class='ctx'> #define LM_FLAG_TRY_1CB		0x0002</div><div class='del'>-#define LM_FLAG_NOEXP		0x0004</div><div class='add'>+#define LM_FLAG_RECOVER		0x0004</div><div class='ctx'> #define LM_FLAG_ANY		0x0008</div><div class='ctx'> #define LM_FLAG_NODE_SCOPE	0x0020</div><div class='ctx'> #define GL_ASYNC		0x0040</div><div class='hunk'>@@ -92,12 +96,22 @@ enum {</div><div class='ctx'>  * LM_OUT_ST_MASK</div><div class='ctx'>  * Masks the lower two bits of lock state in the returned value.</div><div class='ctx'>  *</div><div class='add'>+ * LM_OUT_TRY_AGAIN</div><div class='add'>+ * The trylock request failed.</div><div class='add'>+ *</div><div class='add'>+ * LM_OUT_DEADLOCK</div><div class='add'>+ * The lock request failed because it would deadlock.</div><div class='add'>+ *</div><div class='ctx'>  * LM_OUT_CANCELED</div><div class='ctx'>  * The lock request was canceled.</div><div class='ctx'>  *</div><div class='add'>+ * LM_OUT_ERROR</div><div class='add'>+ * The lock request timed out or failed.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define LM_OUT_ST_MASK		0x00000003</div><div class='add'>+#define LM_OUT_TRY_AGAIN	0x00000020</div><div class='add'>+#define LM_OUT_DEADLOCK		0x00000010</div><div class='ctx'> #define LM_OUT_CANCELED		0x00000008</div><div class='ctx'> #define LM_OUT_ERROR		0x00000004</div><div class='ctx'> </div><div class='hunk'>@@ -122,7 +136,7 @@ struct lm_lockops {</div><div class='ctx'> 	void (*lm_first_done) (struct gfs2_sbd *sdp);</div><div class='ctx'> 	void (*lm_recovery_result) (struct gfs2_sbd *sdp, unsigned int jid,</div><div class='ctx'> 				    unsigned int result);</div><div class='del'>-	void (*lm_unmount) (struct gfs2_sbd *sdp);</div><div class='add'>+	void (*lm_unmount) (struct gfs2_sbd *sdp, bool clean);</div><div class='ctx'> 	void (*lm_withdraw) (struct gfs2_sbd *sdp);</div><div class='ctx'> 	void (*lm_put_lock) (struct gfs2_glock *gl);</div><div class='ctx'> 	int (*lm_lock) (struct gfs2_glock *gl, unsigned int req_state,</div><div class='hunk'>@@ -172,7 +186,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,</div><div class='ctx'> 		   int create, struct gfs2_glock **glp);</div><div class='ctx'> struct gfs2_glock *gfs2_glock_hold(struct gfs2_glock *gl);</div><div class='ctx'> void gfs2_glock_put(struct gfs2_glock *gl);</div><div class='del'>-void gfs2_glock_queue_put(struct gfs2_glock *gl);</div><div class='add'>+void gfs2_glock_put_async(struct gfs2_glock *gl);</div><div class='ctx'> </div><div class='ctx'> void __gfs2_holder_init(struct gfs2_glock *gl, unsigned int state,</div><div class='ctx'> 		        u16 flags, struct gfs2_holder *gh,</div><div class='hunk'>@@ -245,13 +259,14 @@ static inline int gfs2_glock_nq_init(struct gfs2_glock *gl,</div><div class='ctx'> void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state);</div><div class='ctx'> void gfs2_glock_complete(struct gfs2_glock *gl, int ret);</div><div class='ctx'> bool gfs2_queue_try_to_evict(struct gfs2_glock *gl);</div><div class='add'>+bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later);</div><div class='ctx'> void gfs2_cancel_delete_work(struct gfs2_glock *gl);</div><div class='ctx'> void gfs2_flush_delete_work(struct gfs2_sbd *sdp);</div><div class='ctx'> void gfs2_gl_hash_clear(struct gfs2_sbd *sdp);</div><div class='del'>-void gfs2_gl_dq_holders(struct gfs2_sbd *sdp);</div><div class='add'>+void gfs2_withdraw_glocks(struct gfs2_sbd *sdp);</div><div class='ctx'> void gfs2_glock_thaw(struct gfs2_sbd *sdp);</div><div class='del'>-void gfs2_glock_add_to_lru(struct gfs2_glock *gl);</div><div class='ctx'> void gfs2_glock_free(struct gfs2_glock *gl);</div><div class='add'>+void gfs2_glock_free_later(struct gfs2_glock *gl);</div><div class='ctx'> </div><div class='ctx'> int __init gfs2_glock_init(void);</div><div class='ctx'> void gfs2_glock_exit(void);</div><div class='hunk'>@@ -284,4 +299,10 @@ static inline bool gfs2_holder_queued(struct gfs2_holder *gh)</div><div class='ctx'> void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation);</div><div class='ctx'> bool gfs2_inode_already_deleted(struct gfs2_glock *gl, u64 generation);</div><div class='ctx'> </div><div class='add'>+static inline bool glock_needs_demote(struct gfs2_glock *gl)</div><div class='add'>+{</div><div class='add'>+	return (test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags) ||</div><div class='add'>+		test_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __GLOCK_DOT_H__ */</div><div class='head'>diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c<br/>index 45653cbc8a87..2173ccf5034b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/glops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/glops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/glops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/glops.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/posix_acl.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gfs2.h"</div><div class='ctx'> #include "incore.h"</div><div class='hunk'>@@ -29,8 +30,6 @@</div><div class='ctx'> </div><div class='ctx'> struct workqueue_struct *gfs2_freeze_wq;</div><div class='ctx'> </div><div class='del'>-extern struct workqueue_struct *gfs2_control_wq;</div><div class='del'>-</div><div class='ctx'> static void gfs2_ail_error(struct gfs2_glock *gl, const struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='hunk'>@@ -39,12 +38,12 @@ static void gfs2_ail_error(struct gfs2_glock *gl, const struct buffer_head *bh)</div><div class='ctx'> 	       "AIL buffer %p: blocknr %llu state 0x%08lx mapping %p page "</div><div class='ctx'> 	       "state 0x%lx\n",</div><div class='ctx'> 	       bh, (unsigned long long)bh-&gt;b_blocknr, bh-&gt;b_state,</div><div class='del'>-	       bh-&gt;b_folio-&gt;mapping, bh-&gt;b_folio-&gt;flags);</div><div class='add'>+	       bh-&gt;b_folio-&gt;mapping, bh-&gt;b_folio-&gt;flags.f);</div><div class='ctx'> 	fs_err(sdp, "AIL glock %u:%llu mapping %p\n",</div><div class='ctx'> 	       gl-&gt;gl_name.ln_type, gl-&gt;gl_name.ln_number,</div><div class='ctx'> 	       gfs2_glock2aspace(gl));</div><div class='ctx'> 	gfs2_lm(sdp, "AIL error\n");</div><div class='del'>-	gfs2_withdraw_delayed(sdp);</div><div class='add'>+	gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -165,7 +164,7 @@ void gfs2_ail_flush(struct gfs2_glock *gl, bool fsync)</div><div class='ctx'> static int gfs2_rgrp_metasync(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-	struct address_space *metamapping = &amp;sdp-&gt;sd_aspace;</div><div class='add'>+	struct address_space *metamapping = gfs2_aspace(sdp);</div><div class='ctx'> 	struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl);</div><div class='ctx'> 	const unsigned bsize = sdp-&gt;sd_sb.sb_bsize;</div><div class='ctx'> 	loff_t start = (rgd-&gt;rd_addr * bsize) &amp; PAGE_MASK;</div><div class='hunk'>@@ -174,7 +173,7 @@ static int gfs2_rgrp_metasync(struct gfs2_glock *gl)</div><div class='ctx'> </div><div class='ctx'> 	filemap_fdatawrite_range(metamapping, start, end);</div><div class='ctx'> 	error = filemap_fdatawait_range(metamapping, start, end);</div><div class='del'>-	WARN_ON_ONCE(error &amp;&amp; !gfs2_withdrawing_or_withdrawn(sdp));</div><div class='add'>+	WARN_ON_ONCE(error &amp;&amp; !gfs2_withdrawn(sdp));</div><div class='ctx'> 	mapping_set_error(metamapping, error);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		gfs2_io_error(sdp);</div><div class='hunk'>@@ -222,7 +221,7 @@ static int rgrp_go_sync(struct gfs2_glock *gl)</div><div class='ctx'> static void rgrp_go_inval(struct gfs2_glock *gl, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-	struct address_space *mapping = &amp;sdp-&gt;sd_aspace;</div><div class='add'>+	struct address_space *mapping = gfs2_aspace(sdp);</div><div class='ctx'> 	struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl);</div><div class='ctx'> 	const unsigned bsize = sdp-&gt;sd_sb.sb_bsize;</div><div class='ctx'> 	loff_t start, end;</div><div class='hunk'>@@ -233,6 +232,7 @@ static void rgrp_go_inval(struct gfs2_glock *gl, int flags)</div><div class='ctx'> 	end = PAGE_ALIGN((rgd-&gt;rd_addr + rgd-&gt;rd_length) * bsize) - 1;</div><div class='ctx'> 	gfs2_rgrp_brelse(rgd);</div><div class='ctx'> 	WARN_ON_ONCE(!(flags &amp; DIO_METADATA));</div><div class='add'>+	gfs2_assert_withdraw(sdp, !atomic_read(&amp;gl-&gt;gl_ail_count));</div><div class='ctx'> 	truncate_inode_pages_range(mapping, start, end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -359,6 +359,8 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_inode *ip = gfs2_glock2inode(gl);</div><div class='ctx'> </div><div class='add'>+	gfs2_assert_withdraw(gl-&gt;gl_name.ln_sbd, !atomic_read(&amp;gl-&gt;gl_ail_count));</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; DIO_METADATA) {</div><div class='ctx'> 		struct address_space *mapping = gfs2_glock2aspace(gl);</div><div class='ctx'> 		truncate_inode_pages(mapping, 0);</div><div class='hunk'>@@ -382,23 +384,6 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)</div><div class='ctx'> 	gfs2_clear_glop_pending(ip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * inode_go_demote_ok - Check to see if it's ok to unlock an inode glock</div><div class='del'>- * @gl: the glock</div><div class='del'>- *</div><div class='del'>- * Returns: 1 if it's ok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int inode_go_demote_ok(const struct gfs2_glock *gl)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-</div><div class='del'>-	if (sdp-&gt;sd_jindex == gl-&gt;gl_object || sdp-&gt;sd_rindex == gl-&gt;gl_object)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='hunk'>@@ -407,12 +392,16 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)</div><div class='ctx'> 	u16 height, depth;</div><div class='ctx'> 	umode_t mode = be32_to_cpu(str-&gt;di_mode);</div><div class='ctx'> 	struct inode *inode = &amp;ip-&gt;i_inode;</div><div class='del'>-	bool is_new = inode-&gt;i_state &amp; I_NEW;</div><div class='add'>+	bool is_new = inode_state_read_once(inode) &amp; I_NEW;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ip-&gt;i_no_addr != be64_to_cpu(str-&gt;di_num.no_addr)))</div><div class='del'>-		goto corrupt;</div><div class='del'>-	if (unlikely(!is_new &amp;&amp; inode_wrong_type(inode, mode)))</div><div class='del'>-		goto corrupt;</div><div class='add'>+	if (unlikely(ip-&gt;i_no_addr != be64_to_cpu(str-&gt;di_num.no_addr))) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!is_new &amp;&amp; inode_wrong_type(inode, mode))) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	ip-&gt;i_no_formal_ino = be64_to_cpu(str-&gt;di_num.no_formal_ino);</div><div class='ctx'> 	inode-&gt;i_mode = mode;</div><div class='ctx'> 	if (is_new) {</div><div class='hunk'>@@ -449,26 +438,33 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)</div><div class='ctx'> 	/* i_diskflags and i_eattr must be set before gfs2_set_inode_flags() */</div><div class='ctx'> 	gfs2_set_inode_flags(inode);</div><div class='ctx'> 	height = be16_to_cpu(str-&gt;di_height);</div><div class='del'>-	if (unlikely(height &gt; sdp-&gt;sd_max_height))</div><div class='del'>-		goto corrupt;</div><div class='add'>+	if (unlikely(height &gt; sdp-&gt;sd_max_height)) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	ip-&gt;i_height = (u8)height;</div><div class='ctx'> </div><div class='ctx'> 	depth = be16_to_cpu(str-&gt;di_depth);</div><div class='del'>-	if (unlikely(depth &gt; GFS2_DIR_MAX_DEPTH))</div><div class='del'>-		goto corrupt;</div><div class='add'>+	if (unlikely(depth &gt; GFS2_DIR_MAX_DEPTH)) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	if ((ip-&gt;i_diskflags &amp; GFS2_DIF_EXHASH) &amp;&amp;</div><div class='add'>+	    depth &lt; ilog2(sdp-&gt;sd_hash_ptrs)) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	ip-&gt;i_depth = (u8)depth;</div><div class='ctx'> 	ip-&gt;i_entries = be32_to_cpu(str-&gt;di_entries);</div><div class='ctx'> </div><div class='del'>-	if (gfs2_is_stuffed(ip) &amp;&amp; inode-&gt;i_size &gt; gfs2_max_stuffed_size(ip))</div><div class='del'>-		goto corrupt;</div><div class='del'>-</div><div class='add'>+	if (gfs2_is_stuffed(ip) &amp;&amp; inode-&gt;i_size &gt; gfs2_max_stuffed_size(ip)) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		gfs2_set_aops(inode);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-corrupt:</div><div class='del'>-	gfs2_consist_inode(ip);</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -478,7 +474,7 @@ corrupt:</div><div class='ctx'>  * Returns: errno</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int gfs2_inode_refresh(struct gfs2_inode *ip)</div><div class='add'>+static int gfs2_inode_refresh(struct gfs2_inode *ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *dibh;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -502,11 +498,18 @@ int gfs2_inode_refresh(struct gfs2_inode *ip)</div><div class='ctx'> static int inode_go_instantiate(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_inode *ip = gl-&gt;gl_object;</div><div class='add'>+	struct gfs2_glock *io_gl;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (!ip) /* no inode to populate - read it in later */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return gfs2_inode_refresh(ip);</div><div class='add'>+	error = gfs2_inode_refresh(ip);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	io_gl = ip-&gt;i_iopen_gh.gh_gl;</div><div class='add'>+	io_gl-&gt;gl_no_formal_ino = ip-&gt;i_no_formal_ino;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int inode_go_held(struct gfs2_holder *gh)</div><div class='hunk'>@@ -602,14 +605,13 @@ static int freeze_go_xmote_bh(struct gfs2_glock *gl)</div><div class='ctx'> 	if (test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags)) {</div><div class='ctx'> 		j_gl-&gt;gl_ops-&gt;go_inval(j_gl, DIO_METADATA);</div><div class='ctx'> </div><div class='del'>-		error = gfs2_find_jhead(sdp-&gt;sd_jdesc, &amp;head, false);</div><div class='del'>-		if (gfs2_assert_withdraw_delayed(sdp, !error))</div><div class='add'>+		error = gfs2_find_jhead(sdp-&gt;sd_jdesc, &amp;head);</div><div class='add'>+		if (gfs2_assert_withdraw(sdp, !error))</div><div class='ctx'> 			return error;</div><div class='del'>-		if (gfs2_assert_withdraw_delayed(sdp, head.lh_flags &amp;</div><div class='del'>-						 GFS2_LOG_HEAD_UNMOUNT))</div><div class='add'>+		if (gfs2_assert_withdraw(sdp, head.lh_flags &amp;</div><div class='add'>+					 GFS2_LOG_HEAD_UNMOUNT))</div><div class='ctx'> 			return -EIO;</div><div class='del'>-		sdp-&gt;sd_log_sequence = head.lh_sequence + 1;</div><div class='del'>-		gfs2_log_pointers_init(sdp, head.lh_blkno);</div><div class='add'>+		gfs2_log_pointers_init(sdp, &amp;head);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -626,8 +628,7 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)</div><div class='ctx'> 	struct gfs2_inode *ip = gl-&gt;gl_object;</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> </div><div class='del'>-	if (!remote || sb_rdonly(sdp-&gt;sd_vfs) ||</div><div class='del'>-	    test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags))</div><div class='add'>+	if (!remote || test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (gl-&gt;gl_demote_state == LM_ST_UNLOCKED &amp;&amp;</div><div class='hunk'>@@ -638,88 +639,18 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * inode_go_free - wake up anyone waiting for dlm's unlock ast to free it</div><div class='del'>- * @gl: glock being freed</div><div class='del'>- *</div><div class='del'>- * For now, this is only used for the journal inode glock. In withdraw</div><div class='del'>- * situations, we need to wait for the glock to be freed so that we know</div><div class='del'>- * other nodes may proceed with recovery / journal replay.</div><div class='del'>- */</div><div class='del'>-static void inode_go_free(struct gfs2_glock *gl)</div><div class='del'>-{</div><div class='del'>-	/* Note that we cannot reference gl_object because it's already set</div><div class='del'>-	 * to NULL by this point in its lifecycle. */</div><div class='del'>-	if (!test_bit(GLF_FREEING, &amp;gl-&gt;gl_flags))</div><div class='del'>-		return;</div><div class='del'>-	clear_bit_unlock(GLF_FREEING, &amp;gl-&gt;gl_flags);</div><div class='del'>-	wake_up_bit(&amp;gl-&gt;gl_flags, GLF_FREEING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nondisk_go_callback - used to signal when a node did a withdraw</div><div class='del'>- * @gl: the nondisk glock</div><div class='del'>- * @remote: true if this came from a different cluster node</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void nondisk_go_callback(struct gfs2_glock *gl, bool remote)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='del'>-</div><div class='del'>-	/* Ignore the callback unless it's from another node, and it's the</div><div class='del'>-	   live lock. */</div><div class='del'>-	if (!remote || gl-&gt;gl_name.ln_number != GFS2_LIVE_LOCK)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* First order of business is to cancel the demote request. We don't</div><div class='del'>-	 * really want to demote a nondisk glock. At best it's just to inform</div><div class='del'>-	 * us of another node's withdraw. We'll keep it in SH mode. */</div><div class='del'>-	clear_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags);</div><div class='del'>-	clear_bit(GLF_PENDING_DEMOTE, &amp;gl-&gt;gl_flags);</div><div class='del'>-</div><div class='del'>-	/* Ignore the unlock if we're withdrawn, unmounting, or in recovery. */</div><div class='del'>-	if (test_bit(SDF_NORECOVERY, &amp;sdp-&gt;sd_flags) ||</div><div class='del'>-	    test_bit(SDF_WITHDRAWN, &amp;sdp-&gt;sd_flags) ||</div><div class='del'>-	    test_bit(SDF_REMOTE_WITHDRAW, &amp;sdp-&gt;sd_flags))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We only care when a node wants us to unlock, because that means</div><div class='del'>-	 * they want a journal recovered. */</div><div class='del'>-	if (gl-&gt;gl_demote_state != LM_ST_UNLOCKED)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (sdp-&gt;sd_args.ar_spectator) {</div><div class='del'>-		fs_warn(sdp, "Spectator node cannot recover journals.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fs_warn(sdp, "Some node has withdrawn; checking for recovery.\n");</div><div class='del'>-	set_bit(SDF_REMOTE_WITHDRAW, &amp;sdp-&gt;sd_flags);</div><div class='del'>-	/*</div><div class='del'>-	 * We can't call remote_withdraw directly here or gfs2_recover_journal</div><div class='del'>-	 * because this is called from the glock unlock function and the</div><div class='del'>-	 * remote_withdraw needs to enqueue and dequeue the same "live" glock</div><div class='del'>-	 * we were called from. So we queue it to the control work queue in</div><div class='del'>-	 * lock_dlm.</div><div class='del'>-	 */</div><div class='del'>-	queue_delayed_work(gfs2_control_wq, &amp;sdp-&gt;sd_control_work, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const struct gfs2_glock_operations gfs2_meta_glops = {</div><div class='ctx'> 	.go_type = LM_TYPE_META,</div><div class='del'>-	.go_flags = GLOF_NONDISK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_inode_glops = {</div><div class='ctx'> 	.go_sync = inode_go_sync,</div><div class='ctx'> 	.go_inval = inode_go_inval,</div><div class='del'>-	.go_demote_ok = inode_go_demote_ok,</div><div class='ctx'> 	.go_instantiate = inode_go_instantiate,</div><div class='ctx'> 	.go_held = inode_go_held,</div><div class='ctx'> 	.go_dump = inode_go_dump,</div><div class='ctx'> 	.go_type = LM_TYPE_INODE,</div><div class='del'>-	.go_flags = GLOF_ASPACE | GLOF_LRU | GLOF_LVB,</div><div class='del'>-	.go_free = inode_go_free,</div><div class='add'>+	.go_flags = GLOF_ASPACE | GLOF_LVB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_rgrp_glops = {</div><div class='hunk'>@@ -735,36 +666,30 @@ const struct gfs2_glock_operations gfs2_freeze_glops = {</div><div class='ctx'> 	.go_xmote_bh = freeze_go_xmote_bh,</div><div class='ctx'> 	.go_callback = freeze_go_callback,</div><div class='ctx'> 	.go_type = LM_TYPE_NONDISK,</div><div class='del'>-	.go_flags = GLOF_NONDISK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_iopen_glops = {</div><div class='ctx'> 	.go_type = LM_TYPE_IOPEN,</div><div class='ctx'> 	.go_callback = iopen_go_callback,</div><div class='ctx'> 	.go_dump = inode_go_dump,</div><div class='del'>-	.go_flags = GLOF_LRU | GLOF_NONDISK,</div><div class='ctx'> 	.go_subclass = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_flock_glops = {</div><div class='ctx'> 	.go_type = LM_TYPE_FLOCK,</div><div class='del'>-	.go_flags = GLOF_LRU | GLOF_NONDISK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_nondisk_glops = {</div><div class='ctx'> 	.go_type = LM_TYPE_NONDISK,</div><div class='del'>-	.go_flags = GLOF_NONDISK,</div><div class='del'>-	.go_callback = nondisk_go_callback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_quota_glops = {</div><div class='ctx'> 	.go_type = LM_TYPE_QUOTA,</div><div class='del'>-	.go_flags = GLOF_LVB | GLOF_LRU | GLOF_NONDISK,</div><div class='add'>+	.go_flags = GLOF_LVB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations gfs2_journal_glops = {</div><div class='ctx'> 	.go_type = LM_TYPE_JOURNAL,</div><div class='del'>-	.go_flags = GLOF_NONDISK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct gfs2_glock_operations *gfs2_glops_list[] = {</div><div class='head'>diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h<br/>index 95a334d64da2..d05d8fe4e456 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/incore.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/incore.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/incore.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/incore.h</a></div><div class='hunk'>@@ -218,20 +218,16 @@ struct gfs2_glock_operations {</div><div class='ctx'> 	int (*go_sync) (struct gfs2_glock *gl);</div><div class='ctx'> 	int (*go_xmote_bh)(struct gfs2_glock *gl);</div><div class='ctx'> 	void (*go_inval) (struct gfs2_glock *gl, int flags);</div><div class='del'>-	int (*go_demote_ok) (const struct gfs2_glock *gl);</div><div class='ctx'> 	int (*go_instantiate) (struct gfs2_glock *gl);</div><div class='ctx'> 	int (*go_held)(struct gfs2_holder *gh);</div><div class='ctx'> 	void (*go_dump)(struct seq_file *seq, const struct gfs2_glock *gl,</div><div class='ctx'> 			const char *fs_id_buf);</div><div class='ctx'> 	void (*go_callback)(struct gfs2_glock *gl, bool remote);</div><div class='del'>-	void (*go_free)(struct gfs2_glock *gl);</div><div class='ctx'> 	const int go_subclass;</div><div class='ctx'> 	const int go_type;</div><div class='ctx'> 	const unsigned long go_flags;</div><div class='ctx'> #define GLOF_ASPACE 1 /* address space attached */</div><div class='ctx'> #define GLOF_LVB    2 /* Lock Value Block attached */</div><div class='del'>-#define GLOF_LRU    4 /* LRU managed */</div><div class='del'>-#define GLOF_NONDISK   8 /* not I/O related */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -321,17 +317,18 @@ enum {</div><div class='ctx'> 	GLF_DEMOTE_IN_PROGRESS		= 5,</div><div class='ctx'> 	GLF_DIRTY			= 6,</div><div class='ctx'> 	GLF_LFLUSH			= 7,</div><div class='del'>-	GLF_INVALIDATE_IN_PROGRESS	= 8,</div><div class='del'>-	GLF_REPLY_PENDING		= 9,</div><div class='add'>+	GLF_HAVE_REPLY			= 9,</div><div class='ctx'> 	GLF_INITIAL			= 10,</div><div class='del'>-	GLF_FROZEN			= 11,</div><div class='add'>+	GLF_HAVE_FROZEN_REPLY		= 11,</div><div class='ctx'> 	GLF_INSTANTIATE_IN_PROG		= 12, /* instantiate happening now */</div><div class='ctx'> 	GLF_LRU				= 13,</div><div class='ctx'> 	GLF_OBJECT			= 14, /* Used only for tracing */</div><div class='ctx'> 	GLF_BLOCKING			= 15,</div><div class='del'>-	GLF_FREEING			= 16, /* Wait for glock to be freed */</div><div class='ctx'> 	GLF_TRY_TO_EVICT		= 17, /* iopen glocks only */</div><div class='del'>-	GLF_VERIFY_EVICT		= 18, /* iopen glocks only */</div><div class='add'>+	GLF_VERIFY_DELETE		= 18, /* iopen glocks only */</div><div class='add'>+	GLF_PENDING_REPLY		= 19,</div><div class='add'>+	GLF_DEFER_DELETE		= 20, /* iopen glocks only */</div><div class='add'>+	GLF_CANCELING			= 21,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gfs2_glock {</div><div class='hunk'>@@ -374,11 +371,8 @@ struct gfs2_glock {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	GIF_QD_LOCKED		= 1,</div><div class='del'>-	GIF_ALLOC_FAILED	= 2,</div><div class='ctx'> 	GIF_SW_PAGED		= 3,</div><div class='del'>-	GIF_FREE_VFS_INODE      = 5,</div><div class='ctx'> 	GIF_GLOP_PENDING	= 6,</div><div class='del'>-	GIF_DEFERRED_DELETE	= 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gfs2_inode {</div><div class='hunk'>@@ -523,8 +517,6 @@ struct gfs2_jdesc {</div><div class='ctx'> </div><div class='ctx'> 	struct list_head jd_revoke_list;</div><div class='ctx'> 	unsigned int jd_replay_tail;</div><div class='del'>-</div><div class='del'>-	u64 jd_no_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gfs2_statfs_change_host {</div><div class='hunk'>@@ -545,8 +537,7 @@ struct gfs2_statfs_change_host {</div><div class='ctx'> </div><div class='ctx'> #define GFS2_ERRORS_DEFAULT     GFS2_ERRORS_WITHDRAW</div><div class='ctx'> #define GFS2_ERRORS_WITHDRAW    0</div><div class='del'>-#define GFS2_ERRORS_CONTINUE    1 /* place holder for future feature */</div><div class='del'>-#define GFS2_ERRORS_RO          2 /* place holder for future feature */</div><div class='add'>+#define GFS2_ERRORS_DEACTIVATE  1</div><div class='ctx'> #define GFS2_ERRORS_PANIC       3</div><div class='ctx'> </div><div class='ctx'> struct gfs2_args {</div><div class='hunk'>@@ -562,7 +553,7 @@ struct gfs2_args {</div><div class='ctx'> 	unsigned int ar_data:2;			/* ordered/writeback */</div><div class='ctx'> 	unsigned int ar_meta:1;			/* mount metafs */</div><div class='ctx'> 	unsigned int ar_discard:1;		/* discard requests */</div><div class='del'>-	unsigned int ar_errors:2;               /* errors=withdraw | panic */</div><div class='add'>+	unsigned int ar_errors:2;               /* errors=withdraw | deactivate | panic */</div><div class='ctx'> 	unsigned int ar_nobarrier:1;            /* do not send barriers */</div><div class='ctx'> 	unsigned int ar_rgrplvb:1;		/* use lvbs for rgrp info */</div><div class='ctx'> 	unsigned int ar_got_rgrplvb:1;		/* Was the rgrplvb opt given? */</div><div class='hunk'>@@ -588,6 +579,7 @@ struct gfs2_tune {</div><div class='ctx'> 	unsigned int gt_complain_secs;</div><div class='ctx'> 	unsigned int gt_statfs_quantum;</div><div class='ctx'> 	unsigned int gt_statfs_slow;</div><div class='add'>+	unsigned int gt_withdraw_helper_timeout;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -602,11 +594,6 @@ enum {</div><div class='ctx'> 	SDF_SKIP_DLM_UNLOCK	= 8,</div><div class='ctx'> 	SDF_FORCE_AIL_FLUSH     = 9,</div><div class='ctx'> 	SDF_FREEZE_INITIATOR	= 10,</div><div class='del'>-	SDF_WITHDRAWING		= 11, /* Will withdraw eventually */</div><div class='del'>-	SDF_WITHDRAW_IN_PROG	= 12, /* Withdraw is in progress */</div><div class='del'>-	SDF_REMOTE_WITHDRAW	= 13, /* Performing remote recovery */</div><div class='del'>-	SDF_WITHDRAW_RECOVERY	= 14, /* Wait for journal recovery when we are</div><div class='del'>-					 withdrawing */</div><div class='ctx'> 	SDF_KILL		= 15,</div><div class='ctx'> 	SDF_EVICTING		= 16,</div><div class='ctx'> 	SDF_FROZEN		= 17,</div><div class='hunk'>@@ -659,6 +646,8 @@ struct lm_lockstruct {</div><div class='ctx'> 	struct completion ls_sync_wait; /* {control,mounted}_{lock,unlock} */</div><div class='ctx'> 	char *ls_lvb_bits;</div><div class='ctx'> </div><div class='add'>+	struct rw_semaphore ls_sem;</div><div class='add'>+</div><div class='ctx'> 	spinlock_t ls_recover_spin; /* protects following fields */</div><div class='ctx'> 	unsigned long ls_recover_flags; /* DFL_ */</div><div class='ctx'> 	uint32_t ls_recover_mount; /* gen in first recover_done cb */</div><div class='hunk'>@@ -717,11 +706,13 @@ struct gfs2_sbd {</div><div class='ctx'> 	struct gfs2_glock *sd_rename_gl;</div><div class='ctx'> 	struct gfs2_glock *sd_freeze_gl;</div><div class='ctx'> 	struct work_struct sd_freeze_work;</div><div class='add'>+	struct work_struct sd_withdraw_work;</div><div class='ctx'> 	wait_queue_head_t sd_kill_wait;</div><div class='ctx'> 	wait_queue_head_t sd_async_glock_wait;</div><div class='ctx'> 	atomic_t sd_glock_disposal;</div><div class='ctx'> 	struct completion sd_locking_init;</div><div class='del'>-	struct completion sd_wdack;</div><div class='add'>+	struct completion sd_withdraw_helper;</div><div class='add'>+	int sd_withdraw_helper_status;</div><div class='ctx'> 	struct delayed_work sd_control_work;</div><div class='ctx'> </div><div class='ctx'> 	/* Inode Stuff */</div><div class='hunk'>@@ -762,7 +753,6 @@ struct gfs2_sbd {</div><div class='ctx'> 	struct gfs2_jdesc *sd_jdesc;</div><div class='ctx'> 	struct gfs2_holder sd_journal_gh;</div><div class='ctx'> 	struct gfs2_holder sd_jinode_gh;</div><div class='del'>-	struct gfs2_glock *sd_jinode_gl;</div><div class='ctx'> </div><div class='ctx'> 	struct gfs2_holder sd_sc_gh;</div><div class='ctx'> 	struct buffer_head *sd_sc_bh;</div><div class='hunk'>@@ -772,6 +762,7 @@ struct gfs2_sbd {</div><div class='ctx'> </div><div class='ctx'> 	/* Workqueue stuff */</div><div class='ctx'> </div><div class='add'>+	struct workqueue_struct *sd_glock_wq;</div><div class='ctx'> 	struct workqueue_struct *sd_delete_wq;</div><div class='ctx'> </div><div class='ctx'> 	/* Daemon stuff */</div><div class='hunk'>@@ -783,7 +774,6 @@ struct gfs2_sbd {</div><div class='ctx'> </div><div class='ctx'> 	struct list_head sd_quota_list;</div><div class='ctx'> 	atomic_t sd_quota_count;</div><div class='del'>-	struct mutex sd_quota_mutex;</div><div class='ctx'> 	struct mutex sd_quota_sync_mutex;</div><div class='ctx'> 	wait_queue_head_t sd_quota_wait;</div><div class='ctx'> </div><div class='hunk'>@@ -795,7 +785,7 @@ struct gfs2_sbd {</div><div class='ctx'> </div><div class='ctx'> 	/* Log stuff */</div><div class='ctx'> </div><div class='del'>-	struct address_space sd_aspace;</div><div class='add'>+	struct inode *sd_inode;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t sd_log_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -824,7 +814,6 @@ struct gfs2_sbd {</div><div class='ctx'> 	atomic_t sd_log_in_flight;</div><div class='ctx'> 	wait_queue_head_t sd_log_flush_wait;</div><div class='ctx'> 	int sd_log_error; /* First log error */</div><div class='del'>-	wait_queue_head_t sd_withdraw_wait;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int sd_log_tail;</div><div class='ctx'> 	unsigned int sd_log_flush_tail;</div><div class='hunk'>@@ -838,6 +827,7 @@ struct gfs2_sbd {</div><div class='ctx'> 	/* For quiescing the filesystem */</div><div class='ctx'> 	struct gfs2_holder sd_freeze_gh;</div><div class='ctx'> 	struct mutex sd_freeze_mutex;</div><div class='add'>+	struct list_head sd_dead_glocks;</div><div class='ctx'> </div><div class='ctx'> 	char sd_fsname[GFS2_FSNAME_LEN + 3 * sizeof(int) + 2];</div><div class='ctx'> 	char sd_table_name[GFS2_FSNAME_LEN];</div><div class='hunk'>@@ -847,9 +837,15 @@ struct gfs2_sbd {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long sd_last_warning;</div><div class='ctx'> 	struct dentry *debugfs_dir;    /* debugfs directory */</div><div class='del'>-	unsigned long sd_glock_dqs_held;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define GFS2_BAD_INO 1</div><div class='add'>+</div><div class='add'>+static inline struct address_space *gfs2_aspace(struct gfs2_sbd *sdp)</div><div class='add'>+{</div><div class='add'>+	return sdp-&gt;sd_inode-&gt;i_mapping;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void gfs2_glstats_inc(struct gfs2_glock *gl, int which)</div><div class='ctx'> {</div><div class='ctx'> 	gl-&gt;gl_stats.stats[which]++;</div><div class='head'>diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c<br/>index 6bfc9383b7b8..36618e353199 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/inode.c</a></div><div class='hunk'>@@ -89,6 +89,19 @@ static int iget_set(struct inode *inode, void *opaque)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void gfs2_setup_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	gfp_t gfp_mask;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure all page cache allocations are done from GFP_NOFS context to</div><div class='add'>+	 * prevent direct reclaim recursion back into the filesystem and blowing</div><div class='add'>+	 * stacks or deadlocking.</div><div class='add'>+	 */</div><div class='add'>+	gfp_mask = mapping_gfp_mask(inode-&gt;i_mapping);</div><div class='add'>+	mapping_set_gfp_mask(inode-&gt;i_mapping, gfp_mask &amp; ~__GFP_FS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_inode_lookup - Lookup an inode</div><div class='ctx'>  * @sb: The super block</div><div class='hunk'>@@ -127,11 +140,12 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,</div><div class='ctx'> </div><div class='ctx'> 	ip = GFS2_I(inode);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='ctx'> 		struct gfs2_glock *io_gl;</div><div class='ctx'> 		int extra_flags = 0;</div><div class='ctx'> </div><div class='add'>+		gfs2_setup_inode(inode);</div><div class='ctx'> 		error = gfs2_glock_get(sdp, no_addr, &amp;gfs2_inode_glops, CREATE,</div><div class='ctx'> 				       &amp;ip-&gt;i_gl);</div><div class='ctx'> 		if (unlikely(error))</div><div class='hunk'>@@ -439,6 +453,72 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void gfs2_final_release_pages(struct gfs2_inode *ip)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = &amp;ip-&gt;i_inode;</div><div class='add'>+	struct gfs2_glock *gl = ip-&gt;i_gl;</div><div class='add'>+</div><div class='add'>+	/* This can only happen during incomplete inode creation. */</div><div class='add'>+	if (unlikely(!gl))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	truncate_inode_pages(gfs2_glock2aspace(gl), 0);</div><div class='add'>+	truncate_inode_pages(&amp;inode-&gt;i_data, 0);</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;gl-&gt;gl_revokes) == 0) {</div><div class='add'>+		clear_bit(GLF_LFLUSH, &amp;gl-&gt;gl_flags);</div><div class='add'>+		clear_bit(GLF_DIRTY, &amp;gl-&gt;gl_flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gfs2_dinode_dealloc(struct gfs2_inode *ip)</div><div class='add'>+{</div><div class='add'>+	struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='add'>+	struct gfs2_rgrpd *rgd;</div><div class='add'>+	struct gfs2_holder gh;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (gfs2_get_inode_blocks(&amp;ip-&gt;i_inode) != 1) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gfs2_rindex_update(sdp);</div><div class='add'>+</div><div class='add'>+	error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	rgd = gfs2_blk2rgrpd(sdp, ip-&gt;i_no_addr, 1);</div><div class='add'>+	if (!rgd) {</div><div class='add'>+		gfs2_consist_inode(ip);</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto out_qs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = gfs2_glock_nq_init(rgd-&gt;rd_gl, LM_ST_EXCLUSIVE,</div><div class='add'>+				   LM_FLAG_NODE_SCOPE, &amp;gh);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_qs;</div><div class='add'>+</div><div class='add'>+	error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_STATFS + RES_QUOTA,</div><div class='add'>+				 sdp-&gt;sd_jdesc-&gt;jd_blocks);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_rg_gunlock;</div><div class='add'>+</div><div class='add'>+	gfs2_free_di(rgd, ip);</div><div class='add'>+</div><div class='add'>+	gfs2_final_release_pages(ip);</div><div class='add'>+</div><div class='add'>+	gfs2_trans_end(sdp);</div><div class='add'>+</div><div class='add'>+out_rg_gunlock:</div><div class='add'>+	gfs2_glock_dq_uninit(&amp;gh);</div><div class='add'>+out_qs:</div><div class='add'>+	gfs2_quota_unhold(ip);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gfs2_init_dir(struct buffer_head *dibh,</div><div class='ctx'> 			  const struct gfs2_inode *parent)</div><div class='ctx'> {</div><div class='hunk'>@@ -629,10 +709,11 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct gfs2_inode *dip = GFS2_I(dir), *ip;</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(&amp;dip-&gt;i_inode);</div><div class='ctx'> 	struct gfs2_glock *io_gl;</div><div class='del'>-	int error;</div><div class='add'>+	int error, dealloc_error;</div><div class='ctx'> 	u32 aflags = 0;</div><div class='ctx'> 	unsigned blocks = 1;</div><div class='ctx'> 	struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, };</div><div class='add'>+	bool xattr_initialized = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!name-&gt;len || name-&gt;len &gt; GFS2_FNAMESIZE)</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='hunk'>@@ -659,7 +740,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	if (!IS_ERR(inode)) {</div><div class='ctx'> 		if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 			iput(inode);</div><div class='del'>-			inode = ERR_PTR(-EISDIR);</div><div class='add'>+			inode = NULL;</div><div class='add'>+			error = -EISDIR;</div><div class='ctx'> 			goto fail_gunlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		d_instantiate(dentry, inode);</div><div class='hunk'>@@ -684,6 +766,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	error = -ENOMEM;</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		goto fail_gunlock;</div><div class='add'>+	gfs2_setup_inode(inode);</div><div class='ctx'> 	ip = GFS2_I(inode);</div><div class='ctx'> </div><div class='ctx'> 	error = posix_acl_create(dir, &amp;mode, &amp;default_acl, &amp;acl);</div><div class='hunk'>@@ -744,12 +827,13 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	error = gfs2_glock_get(sdp, ip-&gt;i_no_addr, &amp;gfs2_inode_glops, CREATE, &amp;ip-&gt;i_gl);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto fail_free_inode;</div><div class='add'>+		goto fail_dealloc_inode;</div><div class='ctx'> </div><div class='ctx'> 	error = gfs2_glock_get(sdp, ip-&gt;i_no_addr, &amp;gfs2_iopen_glops, CREATE, &amp;io_gl);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto fail_free_inode;</div><div class='add'>+		goto fail_dealloc_inode;</div><div class='ctx'> 	gfs2_cancel_delete_work(io_gl);</div><div class='add'>+	io_gl-&gt;gl_no_formal_ino = ip-&gt;i_no_formal_ino;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	error = insert_inode_locked4(inode, ip-&gt;i_no_addr, iget_test, &amp;ip-&gt;i_no_addr);</div><div class='hunk'>@@ -766,13 +850,16 @@ retry:</div><div class='ctx'> 	error = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_EXCLUSIVE, GL_SKIP, &amp;gh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail_gunlock3;</div><div class='add'>+	clear_bit(GLF_INSTANTIATE_NEEDED, &amp;ip-&gt;i_gl-&gt;gl_flags);</div><div class='ctx'> </div><div class='ctx'> 	error = gfs2_trans_begin(sdp, blocks, 0);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail_gunlock3;</div><div class='ctx'> </div><div class='del'>-	if (blocks &gt; 1)</div><div class='add'>+	if (blocks &gt; 1) {</div><div class='ctx'> 		gfs2_init_xattr(ip);</div><div class='add'>+		xattr_initialized = true;</div><div class='add'>+	}</div><div class='ctx'> 	init_dinode(dip, ip, symname);</div><div class='ctx'> 	gfs2_trans_end(sdp);</div><div class='ctx'> </div><div class='hunk'>@@ -827,6 +914,17 @@ fail_gunlock3:</div><div class='ctx'> 	gfs2_glock_dq_uninit(&amp;ip-&gt;i_iopen_gh);</div><div class='ctx'> fail_gunlock2:</div><div class='ctx'> 	gfs2_glock_put(io_gl);</div><div class='add'>+fail_dealloc_inode:</div><div class='add'>+	dealloc_error = 0;</div><div class='add'>+	if (ip-&gt;i_eattr)</div><div class='add'>+		dealloc_error = gfs2_ea_dealloc(ip, xattr_initialized);</div><div class='add'>+	clear_nlink(inode);</div><div class='add'>+	mark_inode_dirty(inode);</div><div class='add'>+	if (!dealloc_error)</div><div class='add'>+		dealloc_error = gfs2_dinode_dealloc(ip);</div><div class='add'>+	if (dealloc_error)</div><div class='add'>+		fs_warn(sdp, "%s: %d\n", __func__, dealloc_error);</div><div class='add'>+	ip-&gt;i_no_addr = 0;</div><div class='ctx'> fail_free_inode:</div><div class='ctx'> 	if (ip-&gt;i_gl) {</div><div class='ctx'> 		gfs2_glock_put(ip-&gt;i_gl);</div><div class='hunk'>@@ -841,11 +939,7 @@ fail_gunlock:</div><div class='ctx'> 	gfs2_dir_no_add(&amp;da);</div><div class='ctx'> 	gfs2_glock_dq_uninit(&amp;d_gh);</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(inode)) {</div><div class='del'>-		set_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags);</div><div class='del'>-		clear_nlink(inode);</div><div class='del'>-		if (ip-&gt;i_no_addr)</div><div class='del'>-			mark_inode_dirty(inode);</div><div class='del'>-		if (inode-&gt;i_state &amp; I_NEW)</div><div class='add'>+		if (inode_state_read_once(inode) &amp; I_NEW)</div><div class='ctx'> 			iget_failed(inode);</div><div class='ctx'> 		else</div><div class='ctx'> 			iput(inode);</div><div class='hunk'>@@ -1247,14 +1341,15 @@ static int gfs2_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'>  * @dentry: The dentry of the new directory</div><div class='ctx'>  * @mode: The mode of the new directory</div><div class='ctx'>  *</div><div class='del'>- * Returns: errno</div><div class='add'>+ * Returns: the dentry, or ERR_PTR(errno)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int gfs2_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *gfs2_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned dsize = gfs2_max_stuffed_size(GFS2_I(dir));</div><div class='del'>-	return gfs2_create_inode(dir, dentry, NULL, S_IFDIR | mode, 0, NULL, dsize, 0);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(gfs2_create_inode(dir, dentry, NULL, S_IFDIR | mode, 0, NULL, dsize, 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1288,27 +1383,19 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			    struct file *file, unsigned flags,</div><div class='ctx'> 			    umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *d;</div><div class='ctx'> 	bool excl = !!(flags &amp; O_EXCL);</div><div class='ctx'> </div><div class='del'>-	if (!d_in_lookup(dentry))</div><div class='del'>-		goto skip_lookup;</div><div class='del'>-</div><div class='del'>-	d = __gfs2_lookup(dir, dentry, file);</div><div class='del'>-	if (IS_ERR(d))</div><div class='del'>-		return PTR_ERR(d);</div><div class='del'>-	if (d != NULL)</div><div class='del'>-		dentry = d;</div><div class='del'>-	if (d_really_is_positive(dentry)) {</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_OPENED))</div><div class='add'>+	if (d_in_lookup(dentry)) {</div><div class='add'>+		struct dentry *d = __gfs2_lookup(dir, dentry, file);</div><div class='add'>+		if (file-&gt;f_mode &amp; FMODE_OPENED) {</div><div class='add'>+			if (IS_ERR(d))</div><div class='add'>+				return PTR_ERR(d);</div><div class='add'>+			dput(d);</div><div class='add'>+			return excl &amp;&amp; (flags &amp; O_CREAT) ? -EEXIST : 0;</div><div class='add'>+		}</div><div class='add'>+		if (d || d_really_is_positive(dentry))</div><div class='ctx'> 			return finish_no_open(file, d);</div><div class='del'>-		dput(d);</div><div class='del'>-		return excl &amp;&amp; (flags &amp; O_CREAT) ? -EEXIST : 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(d != NULL);</div><div class='del'>-</div><div class='del'>-skip_lookup:</div><div class='ctx'> 	if (!(flags &amp; O_CREAT))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -1882,10 +1969,10 @@ int gfs2_permission(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> 		WARN_ON_ONCE(!may_not_block);</div><div class='ctx'> 		return -ECHILD;</div><div class='ctx'>         }</div><div class='del'>-	if (gfs2_glock_is_locked_by_me(ip-&gt;i_gl) == NULL) {</div><div class='del'>-		int noblock = may_not_block ? GL_NOBLOCK : 0;</div><div class='del'>-		error = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_SHARED,</div><div class='del'>-					   LM_FLAG_ANY | noblock, &amp;i_gh);</div><div class='add'>+	if (gfs2_glock_is_locked_by_me(gl) == NULL) {</div><div class='add'>+		if (may_not_block)</div><div class='add'>+			return -ECHILD;</div><div class='add'>+		error = gfs2_glock_nq_init(gl, LM_ST_SHARED, LM_FLAG_ANY, &amp;i_gh);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			return error;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h<br/>index fd15d1c6b6fb..2fcd96dd1361 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/inode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/inode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/inode.h</a></div><div class='hunk'>@@ -44,17 +44,17 @@ static inline int gfs2_is_dir(const struct gfs2_inode *ip)</div><div class='ctx'> </div><div class='ctx'> static inline void gfs2_set_inode_blocks(struct inode *inode, u64 blocks)</div><div class='ctx'> {</div><div class='del'>-	inode-&gt;i_blocks = blocks &lt;&lt; (inode-&gt;i_blkbits - 9);</div><div class='add'>+	inode-&gt;i_blocks = blocks &lt;&lt; (inode-&gt;i_blkbits - SECTOR_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u64 gfs2_get_inode_blocks(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;i_blocks &gt;&gt; (inode-&gt;i_blkbits - 9);</div><div class='add'>+	return inode-&gt;i_blocks &gt;&gt; (inode-&gt;i_blkbits - SECTOR_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gfs2_add_inode_blocks(struct inode *inode, s64 change)</div><div class='ctx'> {</div><div class='del'>-	change &lt;&lt;= inode-&gt;i_blkbits - 9;</div><div class='add'>+	change &lt;&lt;= inode-&gt;i_blkbits - SECTOR_SHIFT;</div><div class='ctx'> 	gfs2_assert(GFS2_SB(inode), (change &gt;= 0 || inode-&gt;i_blocks &gt;= -change));</div><div class='ctx'> 	inode-&gt;i_blocks += change;</div><div class='ctx'> }</div><div class='hunk'>@@ -86,14 +86,14 @@ err:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void gfs2_setup_inode(struct inode *inode);</div><div class='ctx'> struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type,</div><div class='ctx'> 			        u64 no_addr, u64 no_formal_ino,</div><div class='ctx'> 			        unsigned int blktype);</div><div class='ctx'> struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr,</div><div class='ctx'> 				  u64 no_formal_ino,</div><div class='ctx'> 				  unsigned int blktype);</div><div class='del'>-</div><div class='del'>-int gfs2_inode_refresh(struct gfs2_inode *ip);</div><div class='add'>+int gfs2_dinode_dealloc(struct gfs2_inode *ip);</div><div class='ctx'> </div><div class='ctx'> struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,</div><div class='ctx'> 			   int is_root);</div><div class='hunk'>@@ -108,9 +108,9 @@ loff_t gfs2_seek_hole(struct file *file, loff_t offset);</div><div class='ctx'> extern const struct file_operations gfs2_file_fops_nolock;</div><div class='ctx'> extern const struct file_operations gfs2_dir_fops_nolock;</div><div class='ctx'> </div><div class='del'>-int gfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int gfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int gfs2_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		      struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		      struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> void gfs2_set_inode_flags(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GFS2_FS_LOCKING_DLM</div><div class='head'>diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c<br/>index d1ac5d0679ea..b8d249925395 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/lock_dlm.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/lock_dlm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/lock_dlm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/lock_dlm.c</a></div><div class='hunk'>@@ -15,9 +15,6 @@</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "incore.h"</div><div class='del'>-#include "glock.h"</div><div class='del'>-#include "glops.h"</div><div class='del'>-#include "recovery.h"</div><div class='ctx'> #include "util.h"</div><div class='ctx'> #include "sys.h"</div><div class='ctx'> #include "trace_gfs2.h"</div><div class='hunk'>@@ -58,6 +55,7 @@ static inline void gfs2_update_stats(struct gfs2_lkstats *s, unsigned index,</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_update_reply_times - Update locking statistics</div><div class='ctx'>  * @gl: The glock to update</div><div class='add'>+ * @blocking: The operation may have been blocking</div><div class='ctx'>  *</div><div class='ctx'>  * This assumes that gl-&gt;gl_dstamp has been set earlier.</div><div class='ctx'>  *</div><div class='hunk'>@@ -72,12 +70,12 @@ static inline void gfs2_update_stats(struct gfs2_lkstats *s, unsigned index,</div><div class='ctx'>  * TRY_1CB flags are set are classified as non-blocking. All</div><div class='ctx'>  * other DLM requests are counted as (potentially) blocking.</div><div class='ctx'>  */</div><div class='del'>-static inline void gfs2_update_reply_times(struct gfs2_glock *gl)</div><div class='add'>+static inline void gfs2_update_reply_times(struct gfs2_glock *gl,</div><div class='add'>+					   bool blocking)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_pcpu_lkstats *lks;</div><div class='ctx'> 	const unsigned gltype = gl-&gt;gl_name.ln_type;</div><div class='del'>-	unsigned index = test_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags) ?</div><div class='del'>-			 GFS2_LKS_SRTTB : GFS2_LKS_SRTT;</div><div class='add'>+	unsigned index = blocking ? GFS2_LKS_SRTTB : GFS2_LKS_SRTT;</div><div class='ctx'> 	s64 rtt;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='hunk'>@@ -119,9 +117,18 @@ static inline void gfs2_update_request_times(struct gfs2_glock *gl)</div><div class='ctx'> static void gdlm_ast(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = arg;</div><div class='del'>-	unsigned ret = gl-&gt;gl_state;</div><div class='add'>+	bool blocking;</div><div class='add'>+	unsigned ret;</div><div class='add'>+</div><div class='add'>+	blocking = test_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags);</div><div class='add'>+	gfs2_update_reply_times(gl, blocking);</div><div class='add'>+	clear_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags);</div><div class='add'>+</div><div class='add'>+	/* If the glock is dead, we only react to a dlm_unlock() reply. */</div><div class='add'>+	if (__lockref_is_dead(&amp;gl-&gt;gl_lockref) &amp;&amp;</div><div class='add'>+	    gl-&gt;gl_lksb.sb_status != -DLM_EUNLOCK)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	gfs2_update_reply_times(gl);</div><div class='ctx'> 	BUG_ON(gl-&gt;gl_lksb.sb_flags &amp; DLM_SBF_DEMOTED);</div><div class='ctx'> </div><div class='ctx'> 	if ((gl-&gt;gl_lksb.sb_flags &amp; DLM_SBF_VALNOTVALID) &amp;&amp; gl-&gt;gl_lksb.sb_lvbptr)</div><div class='hunk'>@@ -129,18 +136,19 @@ static void gdlm_ast(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	switch (gl-&gt;gl_lksb.sb_status) {</div><div class='ctx'> 	case -DLM_EUNLOCK: /* Unlocked, so glock can be freed */</div><div class='del'>-		if (gl-&gt;gl_ops-&gt;go_free)</div><div class='del'>-			gl-&gt;gl_ops-&gt;go_free(gl);</div><div class='ctx'> 		gfs2_glock_free(gl);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case -DLM_ECANCEL: /* Cancel while getting lock */</div><div class='del'>-		ret |= LM_OUT_CANCELED;</div><div class='add'>+		ret = LM_OUT_CANCELED;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	case -EAGAIN: /* Try lock fails */</div><div class='add'>+		ret = LM_OUT_TRY_AGAIN;</div><div class='add'>+		goto out;</div><div class='ctx'> 	case -EDEADLK: /* Deadlock detected */</div><div class='add'>+		ret = LM_OUT_DEADLOCK;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	case -ETIMEDOUT: /* Canceled due to timeout */</div><div class='del'>-		ret |= LM_OUT_ERROR;</div><div class='add'>+		ret = LM_OUT_ERROR;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	case 0: /* Success */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -149,20 +157,22 @@ static void gdlm_ast(void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = gl-&gt;gl_req;</div><div class='del'>-	if (gl-&gt;gl_lksb.sb_flags &amp; DLM_SBF_ALTMODE) {</div><div class='del'>-		if (gl-&gt;gl_req == LM_ST_SHARED)</div><div class='del'>-			ret = LM_ST_DEFERRED;</div><div class='del'>-		else if (gl-&gt;gl_req == LM_ST_DEFERRED)</div><div class='del'>-			ret = LM_ST_SHARED;</div><div class='del'>-		else</div><div class='del'>-			BUG();</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	set_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags);</div><div class='add'>+	/*</div><div class='add'>+	 * The GLF_INITIAL flag is initially set for new glocks.  Upon the</div><div class='add'>+	 * first successful new (non-conversion) request, we clear this flag to</div><div class='add'>+	 * indicate that a DLM lock exists and that gl-&gt;gl_lksb.sb_lkid is the</div><div class='add'>+	 * identifier to use for identifying it.</div><div class='add'>+	 *</div><div class='add'>+	 * Any failed initial requests do not create a DLM lock, so we ignore</div><div class='add'>+	 * the gl-&gt;gl_lksb.sb_lkid values that come with such requests.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	clear_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	gfs2_glock_complete(gl, ret);</div><div class='ctx'> 	return;</div><div class='ctx'> out:</div><div class='del'>-	if (!test_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags))</div><div class='add'>+	if (test_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags))</div><div class='ctx'> 		gl-&gt;gl_lksb.sb_lkid = 0;</div><div class='ctx'> 	gfs2_glock_complete(gl, ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -171,6 +181,9 @@ static void gdlm_bast(void *arg, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = arg;</div><div class='ctx'> </div><div class='add'>+	if (__lockref_is_dead(&amp;gl-&gt;gl_lockref))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DLM_LOCK_EX:</div><div class='ctx'> 		gfs2_glock_cb(gl, LM_ST_UNLOCKED);</div><div class='hunk'>@@ -206,8 +219,21 @@ static int make_mode(struct gfs2_sbd *sdp, const unsigned int lmstate)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Taken from fs/dlm/lock.c. */</div><div class='add'>+</div><div class='add'>+static bool middle_conversion(int cur, int req)</div><div class='add'>+{</div><div class='add'>+	return (cur == DLM_LOCK_PR &amp;&amp; req == DLM_LOCK_CW) ||</div><div class='add'>+	       (cur == DLM_LOCK_CW &amp;&amp; req == DLM_LOCK_PR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool down_conversion(int cur, int req)</div><div class='add'>+{</div><div class='add'>+	return !middle_conversion(cur, req) &amp;&amp; req &lt; cur;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 make_flags(struct gfs2_glock *gl, const unsigned int gfs_flags,</div><div class='del'>-		      const int req)</div><div class='add'>+		      const int req, bool blocking)</div><div class='ctx'> {</div><div class='ctx'> 	u32 lkf = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -222,18 +248,16 @@ static u32 make_flags(struct gfs2_glock *gl, const unsigned int gfs_flags,</div><div class='ctx'> 		lkf |= DLM_LKF_NOQUEUEBAST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gfs_flags &amp; LM_FLAG_ANY) {</div><div class='del'>-		if (req == DLM_LOCK_PR)</div><div class='del'>-			lkf |= DLM_LKF_ALTCW;</div><div class='del'>-		else if (req == DLM_LOCK_CW)</div><div class='del'>-			lkf |= DLM_LKF_ALTPR;</div><div class='del'>-		else</div><div class='del'>-			BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (gl-&gt;gl_lksb.sb_lkid != 0) {</div><div class='add'>+	if (!test_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags)) {</div><div class='ctx'> 		lkf |= DLM_LKF_CONVERT;</div><div class='del'>-		if (test_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags))</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The DLM_LKF_QUECVT flag needs to be set for "first come,</div><div class='add'>+		 * first served" semantics, but it must only be set for</div><div class='add'>+		 * "upward" lock conversions or else DLM will reject the</div><div class='add'>+		 * request as invalid.</div><div class='add'>+		 */</div><div class='add'>+		if (blocking)</div><div class='ctx'> 			lkf |= DLM_LKF_QUECVT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -253,31 +277,43 @@ static int gdlm_lock(struct gfs2_glock *gl, unsigned int req_state,</div><div class='ctx'> 		     unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;gl-&gt;gl_name.ln_sbd-&gt;sd_lockstruct;</div><div class='del'>-	int req;</div><div class='add'>+	bool blocking;</div><div class='add'>+	int cur, req;</div><div class='ctx'> 	u32 lkf;</div><div class='ctx'> 	char strname[GDLM_STRNAME_BYTES] = "";</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	gl-&gt;gl_req = req_state;</div><div class='add'>+	cur = make_mode(gl-&gt;gl_name.ln_sbd, gl-&gt;gl_state);</div><div class='ctx'> 	req = make_mode(gl-&gt;gl_name.ln_sbd, req_state);</div><div class='del'>-	lkf = make_flags(gl, flags, req);</div><div class='add'>+	blocking = !down_conversion(cur, req) &amp;&amp;</div><div class='add'>+		   !(flags &amp; (LM_FLAG_TRY|LM_FLAG_TRY_1CB));</div><div class='add'>+	lkf = make_flags(gl, flags, req, blocking);</div><div class='add'>+	if (blocking)</div><div class='add'>+		set_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	gfs2_glstats_inc(gl, GFS2_LKS_DCOUNT);</div><div class='ctx'> 	gfs2_sbstats_inc(gl, GFS2_LKS_DCOUNT);</div><div class='del'>-	if (gl-&gt;gl_lksb.sb_lkid) {</div><div class='del'>-		gfs2_update_request_times(gl);</div><div class='del'>-	} else {</div><div class='add'>+	if (test_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags)) {</div><div class='ctx'> 		memset(strname, ' ', GDLM_STRNAME_BYTES - 1);</div><div class='ctx'> 		strname[GDLM_STRNAME_BYTES - 1] = '\0';</div><div class='ctx'> 		gfs2_reverse_hex(strname + 7, gl-&gt;gl_name.ln_type);</div><div class='ctx'> 		gfs2_reverse_hex(strname + 23, gl-&gt;gl_name.ln_number);</div><div class='ctx'> 		gl-&gt;gl_dstamp = ktime_get_real();</div><div class='add'>+	} else {</div><div class='add'>+		gfs2_update_request_times(gl);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Submit the actual lock request.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	error = dlm_lock(ls-&gt;ls_dlm, req, &amp;gl-&gt;gl_lksb, lkf, strname,</div><div class='del'>-			GDLM_STRNAME_BYTES - 1, 0, gdlm_ast, gl, gdlm_bast);</div><div class='add'>+	down_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	error = -ENODEV;</div><div class='add'>+	if (likely(ls-&gt;ls_dlm != NULL)) {</div><div class='add'>+		error = dlm_lock(ls-&gt;ls_dlm, req, &amp;gl-&gt;gl_lksb, lkf, strname,</div><div class='add'>+				GDLM_STRNAME_BYTES - 1, 0, gdlm_ast, gl, gdlm_bast);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;ls-&gt;ls_sem);</div><div class='ctx'> 	if (error == -EBUSY) {</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 		goto again;</div><div class='hunk'>@@ -289,54 +325,75 @@ static void gdlm_put_lock(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = gl-&gt;gl_name.ln_sbd;</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='add'>+	uint32_t flags = 0;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (gl-&gt;gl_lksb.sb_lkid == 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+	BUG_ON(!__lockref_is_dead(&amp;gl-&gt;gl_lockref));</div><div class='add'>+</div><div class='add'>+	if (test_bit(GLF_INITIAL, &amp;gl-&gt;gl_flags)) {</div><div class='add'>+		gfs2_glock_free(gl);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	clear_bit(GLF_BLOCKING, &amp;gl-&gt;gl_flags);</div><div class='ctx'> 	gfs2_glstats_inc(gl, GFS2_LKS_DCOUNT);</div><div class='ctx'> 	gfs2_sbstats_inc(gl, GFS2_LKS_DCOUNT);</div><div class='ctx'> 	gfs2_update_request_times(gl);</div><div class='ctx'> </div><div class='del'>-	/* don't want to call dlm if we've unmounted the lock protocol */</div><div class='del'>-	if (test_bit(DFL_UNMOUNT, &amp;ls-&gt;ls_recover_flags))</div><div class='del'>-		goto out_free;</div><div class='del'>-	/* don't want to skip dlm_unlock writing the lvb when lock has one */</div><div class='add'>+	/*</div><div class='add'>+	 * When the lockspace is released, all remaining glocks will be</div><div class='add'>+	 * unlocked automatically.  This is more efficient than unlocking them</div><div class='add'>+	 * individually, but when the lock is held in DLM_LOCK_EX or</div><div class='add'>+	 * DLM_LOCK_PW mode, the lock value block (LVB) would be lost.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(SDF_SKIP_DLM_UNLOCK, &amp;sdp-&gt;sd_flags) &amp;&amp;</div><div class='del'>-	    !gl-&gt;gl_lksb.sb_lvbptr)</div><div class='del'>-		goto out_free;</div><div class='add'>+	    (!gl-&gt;gl_lksb.sb_lvbptr || gl-&gt;gl_state != LM_ST_EXCLUSIVE)) {</div><div class='add'>+		gfs2_glock_free_later(gl);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gl-&gt;gl_lksb.sb_lvbptr)</div><div class='add'>+		flags |= DLM_LKF_VALBLK;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	error = dlm_unlock(ls-&gt;ls_dlm, gl-&gt;gl_lksb.sb_lkid, DLM_LKF_VALBLK,</div><div class='del'>-			   NULL, gl);</div><div class='add'>+	down_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	error = -ENODEV;</div><div class='add'>+	if (likely(ls-&gt;ls_dlm != NULL)) {</div><div class='add'>+		error = dlm_unlock(ls-&gt;ls_dlm, gl-&gt;gl_lksb.sb_lkid, flags,</div><div class='add'>+				   NULL, gl);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;ls-&gt;ls_sem);</div><div class='ctx'> 	if (error == -EBUSY) {</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 		goto again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (error == -ENODEV) {</div><div class='add'>+		gfs2_glock_free(gl);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fs_err(sdp, "gdlm_unlock %x,%llx err=%d\n",</div><div class='ctx'> 		       gl-&gt;gl_name.ln_type,</div><div class='ctx'> 		       (unsigned long long)gl-&gt;gl_name.ln_number, error);</div><div class='ctx'> 	}</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	gfs2_glock_free(gl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gdlm_cancel(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;gl-&gt;gl_name.ln_sbd-&gt;sd_lockstruct;</div><div class='del'>-	dlm_unlock(ls-&gt;ls_dlm, gl-&gt;gl_lksb.sb_lkid, DLM_LKF_CANCEL, NULL, gl);</div><div class='add'>+</div><div class='add'>+	down_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	if (likely(ls-&gt;ls_dlm != NULL)) {</div><div class='add'>+		dlm_unlock(ls-&gt;ls_dlm, gl-&gt;gl_lksb.sb_lkid, DLM_LKF_CANCEL, NULL, gl);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;ls-&gt;ls_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dlm/gfs2 recovery coordination using dlm_recover callbacks</div><div class='ctx'>  *</div><div class='del'>- *  0. gfs2 checks for another cluster node withdraw, needing journal replay</div><div class='ctx'>  *  1. dlm_controld sees lockspace members change</div><div class='ctx'>  *  2. dlm_controld blocks dlm-kernel locking activity</div><div class='ctx'>  *  3. dlm_controld within dlm-kernel notifies gfs2 (recover_prep)</div><div class='hunk'>@@ -511,7 +568,11 @@ static int sync_unlock(struct gfs2_sbd *sdp, struct dlm_lksb *lksb, char *name)</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = dlm_unlock(ls-&gt;ls_dlm, lksb-&gt;sb_lkid, 0, lksb, ls);</div><div class='add'>+	down_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	error = -ENODEV;</div><div class='add'>+	if (likely(ls-&gt;ls_dlm != NULL))</div><div class='add'>+		error = dlm_unlock(ls-&gt;ls_dlm, lksb-&gt;sb_lkid, 0, lksb, ls);</div><div class='add'>+	up_read(&amp;ls-&gt;ls_sem);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fs_err(sdp, "%s lkid %x error %d\n",</div><div class='ctx'> 		       name, lksb-&gt;sb_lkid, error);</div><div class='hunk'>@@ -538,9 +599,14 @@ static int sync_lock(struct gfs2_sbd *sdp, int mode, uint32_t flags,</div><div class='ctx'> 	memset(strname, 0, GDLM_STRNAME_BYTES);</div><div class='ctx'> 	snprintf(strname, GDLM_STRNAME_BYTES, "%8x%16x", LM_TYPE_NONDISK, num);</div><div class='ctx'> </div><div class='del'>-	error = dlm_lock(ls-&gt;ls_dlm, mode, lksb, flags,</div><div class='del'>-			 strname, GDLM_STRNAME_BYTES - 1,</div><div class='del'>-			 0, sync_wait_cb, ls, NULL);</div><div class='add'>+	down_read(&amp;ls-&gt;ls_sem);</div><div class='add'>+	error = -ENODEV;</div><div class='add'>+	if (likely(ls-&gt;ls_dlm != NULL)) {</div><div class='add'>+		error = dlm_lock(ls-&gt;ls_dlm, mode, lksb, flags,</div><div class='add'>+				 strname, GDLM_STRNAME_BYTES - 1,</div><div class='add'>+				 0, sync_wait_cb, ls, NULL);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;ls-&gt;ls_sem);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fs_err(sdp, "%s lkid %x flags %x mode %d error %d\n",</div><div class='ctx'> 		       name, lksb-&gt;sb_lkid, flags, mode, error);</div><div class='hunk'>@@ -585,28 +651,6 @@ static int control_lock(struct gfs2_sbd *sdp, int mode, uint32_t flags)</div><div class='ctx'> 			 &amp;ls-&gt;ls_control_lksb, "control_lock");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * remote_withdraw - react to a node withdrawing from the file system</div><div class='del'>- * @sdp: The superblock</div><div class='del'>- */</div><div class='del'>-static void remote_withdraw(struct gfs2_sbd *sdp)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_jdesc *jd;</div><div class='del'>-	int ret = 0, count = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(jd, &amp;sdp-&gt;sd_jindex_list, jd_list) {</div><div class='del'>-		if (jd-&gt;jd_jid == sdp-&gt;sd_lockstruct.ls_jid)</div><div class='del'>-			continue;</div><div class='del'>-		ret = gfs2_recover_journal(jd, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-		count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now drop the additional reference we acquired */</div><div class='del'>-	fs_err(sdp, "Journals checked: %d, ret = %d.\n", count, ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void gfs2_control_func(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = container_of(work, struct gfs2_sbd, sd_control_work.work);</div><div class='hunk'>@@ -617,13 +661,6 @@ static void gfs2_control_func(struct work_struct *work)</div><div class='ctx'> 	int recover_size;</div><div class='ctx'> 	int i, error;</div><div class='ctx'> </div><div class='del'>-	/* First check for other nodes that may have done a withdraw. */</div><div class='del'>-	if (test_bit(SDF_REMOTE_WITHDRAW, &amp;sdp-&gt;sd_flags)) {</div><div class='del'>-		remote_withdraw(sdp);</div><div class='del'>-		clear_bit(SDF_REMOTE_WITHDRAW, &amp;sdp-&gt;sd_flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;ls-&gt;ls_recover_spin);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No MOUNT_DONE means we're still mounting; control_mount()</div><div class='hunk'>@@ -947,14 +984,15 @@ locks_done:</div><div class='ctx'> 		if (sdp-&gt;sd_args.ar_spectator) {</div><div class='ctx'> 			fs_info(sdp, "Recovery is required. Waiting for a "</div><div class='ctx'> 				"non-spectator to mount.\n");</div><div class='add'>+			spin_unlock(&amp;ls-&gt;ls_recover_spin);</div><div class='ctx'> 			msleep_interruptible(1000);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fs_info(sdp, "control_mount wait1 block %u start %u "</div><div class='ctx'> 				"mount %u lvb %u flags %lx\n", block_gen,</div><div class='ctx'> 				start_gen, mount_gen, lvb_gen,</div><div class='ctx'> 				ls-&gt;ls_recover_flags);</div><div class='add'>+			spin_unlock(&amp;ls-&gt;ls_recover_spin);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;ls-&gt;ls_recover_spin);</div><div class='ctx'> 		goto restart;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1122,7 +1160,7 @@ static void gdlm_recover_prep(void *arg)</div><div class='ctx'> 	struct gfs2_sbd *sdp = arg;</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		fs_err(sdp, "recover_prep ignored due to withdraw.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1148,7 +1186,7 @@ static void gdlm_recover_slot(void *arg, struct dlm_slot *slot)</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> 	int jid = slot-&gt;slot - 1;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		fs_err(sdp, "recover_slot jid %d ignored due to withdraw.\n",</div><div class='ctx'> 		       jid);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1177,7 +1215,7 @@ static void gdlm_recover_done(void *arg, struct dlm_slot *slots, int num_slots,</div><div class='ctx'> 	struct gfs2_sbd *sdp = arg;</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		fs_err(sdp, "recover_done ignored due to withdraw.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1208,7 +1246,7 @@ static void gdlm_recovery_result(struct gfs2_sbd *sdp, unsigned int jid,</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		fs_err(sdp, "recovery_result jid %d ignored due to withdraw.\n",</div><div class='ctx'> 		       jid);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1266,6 +1304,7 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;sdp-&gt;sd_control_work, gfs2_control_func);</div><div class='add'>+	ls-&gt;ls_dlm = NULL;</div><div class='ctx'> 	spin_lock_init(&amp;ls-&gt;ls_recover_spin);</div><div class='ctx'> 	ls-&gt;ls_recover_flags = 0;</div><div class='ctx'> 	ls-&gt;ls_recover_mount = 0;</div><div class='hunk'>@@ -1300,6 +1339,7 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)</div><div class='ctx'> 	 * create/join lockspace</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	init_rwsem(&amp;ls-&gt;ls_sem);</div><div class='ctx'> 	error = dlm_new_lockspace(fsname, cluster, flags, GDLM_LVB_SIZE,</div><div class='ctx'> 				  &amp;gdlm_lockspace_ops, sdp, &amp;ops_result,</div><div class='ctx'> 				  &amp;ls-&gt;ls_dlm);</div><div class='hunk'>@@ -1343,7 +1383,7 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_release:</div><div class='del'>-	dlm_release_lockspace(ls-&gt;ls_dlm, 2);</div><div class='add'>+	dlm_release_lockspace(ls-&gt;ls_dlm, DLM_RELEASE_NORMAL);</div><div class='ctx'> fail_free:</div><div class='ctx'> 	free_recover_size(ls);</div><div class='ctx'> fail:</div><div class='hunk'>@@ -1363,7 +1403,15 @@ static void gdlm_first_done(struct gfs2_sbd *sdp)</div><div class='ctx'> 		fs_err(sdp, "mount first_done error %d\n", error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gdlm_unmount(struct gfs2_sbd *sdp)</div><div class='add'>+/*</div><div class='add'>+ * gdlm_unmount - release our lockspace</div><div class='add'>+ * @sdp: the superblock</div><div class='add'>+ * @clean: Indicates whether or not the remaining nodes in the cluster should</div><div class='add'>+ *	   perform recovery.  Recovery is necessary when a node withdraws and</div><div class='add'>+ *	   its journal remains dirty.  Recovery isn't necessary when a node</div><div class='add'>+ *	   cleanly unmounts a filesystem.</div><div class='add'>+ */</div><div class='add'>+static void gdlm_unmount(struct gfs2_sbd *sdp, bool clean)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> </div><div class='hunk'>@@ -1379,10 +1427,14 @@ static void gdlm_unmount(struct gfs2_sbd *sdp)</div><div class='ctx'> </div><div class='ctx'> 	/* mounted_lock and control_lock will be purged in dlm recovery */</div><div class='ctx'> release:</div><div class='add'>+	down_write(&amp;ls-&gt;ls_sem);</div><div class='ctx'> 	if (ls-&gt;ls_dlm) {</div><div class='del'>-		dlm_release_lockspace(ls-&gt;ls_dlm, 2);</div><div class='add'>+		dlm_release_lockspace(ls-&gt;ls_dlm,</div><div class='add'>+				      clean ? DLM_RELEASE_NORMAL :</div><div class='add'>+					      DLM_RELEASE_RECOVER);</div><div class='ctx'> 		ls-&gt;ls_dlm = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	up_write(&amp;ls-&gt;ls_sem);</div><div class='ctx'> </div><div class='ctx'> 	free_recover_size(ls);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c<br/>index 8cddf955ebc0..8312cd2cdae4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/log.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/log.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/log.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/log.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include "dir.h"</div><div class='ctx'> #include "trace_gfs2.h"</div><div class='ctx'> #include "trans.h"</div><div class='add'>+#include "aops.h"</div><div class='ctx'> </div><div class='ctx'> static void gfs2_log_shutdown(struct gfs2_sbd *sdp);</div><div class='ctx'> </div><div class='hunk'>@@ -80,15 +81,6 @@ void gfs2_remove_from_ail(struct gfs2_bufdata *bd)</div><div class='ctx'> 	brelse(bd-&gt;bd_bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __gfs2_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='del'>-		       void *data)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = data;</div><div class='del'>-	int ret = mapping-&gt;a_ops-&gt;writepage(&amp;folio-&gt;page, wbc);</div><div class='del'>-	mapping_set_error(mapping, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_ail1_start_one - Start I/O on a transaction</div><div class='ctx'>  * @sdp: The superblock</div><div class='hunk'>@@ -120,13 +112,11 @@ __acquires(&amp;sdp-&gt;sd_ail_lock)</div><div class='ctx'> 					  &amp;tr-&gt;tr_ail2_list);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			if (!cmpxchg(&amp;sdp-&gt;sd_log_error, 0, -EIO)) {</div><div class='add'>+			if (!cmpxchg(&amp;sdp-&gt;sd_log_error, 0, -EIO))</div><div class='ctx'> 				gfs2_io_error_bh(sdp, bh);</div><div class='del'>-				gfs2_withdraw_delayed(sdp);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+		if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 			gfs2_remove_from_ail(bd);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -140,7 +130,11 @@ __acquires(&amp;sdp-&gt;sd_ail_lock)</div><div class='ctx'> 		if (!mapping)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		spin_unlock(&amp;sdp-&gt;sd_ail_lock);</div><div class='del'>-		ret = write_cache_pages(mapping, wbc, __gfs2_writepage, mapping);</div><div class='add'>+		BUG_ON(GFS2_SB(mapping-&gt;host) != sdp);</div><div class='add'>+		if (gfs2_is_jdata(GFS2_I(mapping-&gt;host)))</div><div class='add'>+			ret = gfs2_jdata_writeback(mapping, wbc);</div><div class='add'>+		else</div><div class='add'>+			ret = mapping-&gt;a_ops-&gt;writepages(mapping, wbc);</div><div class='ctx'> 		if (need_resched()) {</div><div class='ctx'> 			blk_finish_plug(plug);</div><div class='ctx'> 			cond_resched();</div><div class='hunk'>@@ -149,6 +143,7 @@ __acquires(&amp;sdp-&gt;sd_ail_lock)</div><div class='ctx'> 		spin_lock(&amp;sdp-&gt;sd_ail_lock);</div><div class='ctx'> 		if (ret == -ENODATA) /* if a jdata write into a new hole */</div><div class='ctx'> 			ret = 0; /* ignore it */</div><div class='add'>+		mapping_set_error(mapping, ret);</div><div class='ctx'> 		if (ret || wbc-&gt;nr_to_write &lt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -327,10 +322,8 @@ static int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_trans *tr,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!buffer_uptodate(bh) &amp;&amp;</div><div class='del'>-		    !cmpxchg(&amp;sdp-&gt;sd_log_error, 0, -EIO)) {</div><div class='add'>+		    !cmpxchg(&amp;sdp-&gt;sd_log_error, 0, -EIO))</div><div class='ctx'> 			gfs2_io_error_bh(sdp, bh);</div><div class='del'>-			gfs2_withdraw_delayed(sdp);</div><div class='del'>-		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we have space for revokes and the bd is no longer on any</div><div class='ctx'> 		 * buf list, we can just add a revoke for it immediately and</div><div class='hunk'>@@ -786,7 +779,7 @@ void gfs2_glock_remove_revoke(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_dec_return(&amp;gl-&gt;gl_revokes) == 0) {</div><div class='ctx'> 		clear_bit(GLF_LFLUSH, &amp;gl-&gt;gl_flags);</div><div class='del'>-		gfs2_glock_queue_put(gl);</div><div class='add'>+		gfs2_glock_put_async(gl);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -810,9 +803,6 @@ void gfs2_flush_revokes(struct gfs2_sbd *sdp)</div><div class='ctx'> 	gfs2_log_lock(sdp);</div><div class='ctx'> 	gfs2_ail1_empty(sdp, max_revokes);</div><div class='ctx'> 	gfs2_log_unlock(sdp);</div><div class='del'>-</div><div class='del'>-	if (gfs2_withdrawing(sdp))</div><div class='del'>-		gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -840,7 +830,7 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,</div><div class='ctx'> 	struct super_block *sb = sdp-&gt;sd_vfs;</div><div class='ctx'> 	u64 dblock;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	page = mempool_alloc(gfs2_page_pool, GFP_NOIO);</div><div class='hunk'>@@ -987,12 +977,9 @@ static void empty_ail1_list(struct gfs2_sbd *sdp)</div><div class='ctx'> 		gfs2_ail1_wait(sdp);</div><div class='ctx'> 		empty = gfs2_ail1_empty(sdp, 0);</div><div class='ctx'> </div><div class='del'>-		if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+		if (gfs2_withdrawn(sdp))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (gfs2_withdrawing(sdp))</div><div class='del'>-		gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1053,7 +1040,7 @@ repeat:</div><div class='ctx'> 	 * Do this check while holding the log_flush_lock to prevent new</div><div class='ctx'> 	 * buffers from being added to the ail via gfs2_pin()</div><div class='ctx'> 	 */</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp) ||</div><div class='add'>+	if (gfs2_withdrawn(sdp) ||</div><div class='ctx'> 	    !test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1074,7 +1061,7 @@ repeat:</div><div class='ctx'> 			sdp-&gt;sd_log_tr = NULL;</div><div class='ctx'> 			tr-&gt;tr_first = first_log_head;</div><div class='ctx'> 			if (unlikely(frozen)) {</div><div class='del'>-				if (gfs2_assert_withdraw_delayed(sdp,</div><div class='add'>+				if (gfs2_assert_withdraw(sdp,</div><div class='ctx'> 				       !tr-&gt;tr_num_buf_new &amp;&amp; !tr-&gt;tr_num_databuf_new))</div><div class='ctx'> 					goto out_withdraw;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1099,17 +1086,18 @@ repeat:</div><div class='ctx'> 		clear_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(frozen))</div><div class='del'>-		if (gfs2_assert_withdraw_delayed(sdp, !reserved_revokes))</div><div class='add'>+		if (gfs2_assert_withdraw(sdp, !reserved_revokes))</div><div class='ctx'> 			goto out_withdraw;</div><div class='ctx'> </div><div class='ctx'> 	gfs2_ordered_write(sdp);</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		goto out_withdraw;</div><div class='ctx'> 	lops_before_commit(sdp, tr);</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		goto out_withdraw;</div><div class='del'>-	gfs2_log_submit_bio(&amp;sdp-&gt;sd_jdesc-&gt;jd_log_bio, REQ_OP_WRITE);</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (sdp-&gt;sd_jdesc)</div><div class='add'>+		gfs2_log_submit_bio(&amp;sdp-&gt;sd_jdesc-&gt;jd_log_bio, REQ_OP_WRITE);</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		goto out_withdraw;</div><div class='ctx'> </div><div class='ctx'> 	if (sdp-&gt;sd_log_head != sdp-&gt;sd_log_flush_head) {</div><div class='hunk'>@@ -1117,7 +1105,7 @@ repeat:</div><div class='ctx'> 	} else if (sdp-&gt;sd_log_tail != sdp-&gt;sd_log_flush_tail &amp;&amp; !sdp-&gt;sd_log_idle) {</div><div class='ctx'> 		log_write_header(sdp, flags);</div><div class='ctx'> 	}</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		goto out_withdraw;</div><div class='ctx'> 	lops_after_commit(sdp, tr);</div><div class='ctx'> </div><div class='hunk'>@@ -1135,7 +1123,7 @@ repeat:</div><div class='ctx'> 	if (!(flags &amp; GFS2_LOG_HEAD_FLUSH_NORMAL)) {</div><div class='ctx'> 		if (!sdp-&gt;sd_log_idle) {</div><div class='ctx'> 			empty_ail1_list(sdp);</div><div class='del'>-			if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+			if (gfs2_withdrawn(sdp))</div><div class='ctx'> 				goto out_withdraw;</div><div class='ctx'> 			log_write_header(sdp, flags);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1153,13 +1141,11 @@ out_end:</div><div class='ctx'> 		reserved_blocks += (reserved_revokes - sdp-&gt;sd_ldptrs) / sdp-&gt;sd_inptrs;</div><div class='ctx'> out:</div><div class='ctx'> 	if (used_blocks != reserved_blocks) {</div><div class='del'>-		gfs2_assert_withdraw_delayed(sdp, used_blocks &lt; reserved_blocks);</div><div class='add'>+		gfs2_assert_withdraw(sdp, used_blocks &lt; reserved_blocks);</div><div class='ctx'> 		gfs2_log_release(sdp, reserved_blocks - used_blocks);</div><div class='ctx'> 	}</div><div class='ctx'> 	up_write(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='ctx'> 	gfs2_trans_free(sdp, tr);</div><div class='del'>-	if (gfs2_withdrawing(sdp))</div><div class='del'>-		gfs2_withdraw(sdp);</div><div class='ctx'> 	trace_gfs2_log_flush(sdp, 0, flags);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -1306,19 +1292,8 @@ int gfs2_logd(void *data)</div><div class='ctx'> </div><div class='ctx'> 	set_freezable();</div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='del'>-		if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Check for errors writing to the journal */</div><div class='del'>-		if (sdp-&gt;sd_log_error) {</div><div class='del'>-			gfs2_lm(sdp,</div><div class='del'>-				"GFS2: fsid=%s: error %d: "</div><div class='del'>-				"withdrawing the file system to "</div><div class='del'>-				"prevent further damage.\n",</div><div class='del'>-				sdp-&gt;sd_fsname, sdp-&gt;sd_log_error);</div><div class='del'>-			gfs2_withdraw(sdp);</div><div class='add'>+		if (gfs2_withdrawn(sdp))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (gfs2_jrnl_flush_reqd(sdp) || t == 0) {</div><div class='ctx'> 			gfs2_ail1_empty(sdp, 0);</div><div class='hunk'>@@ -1342,15 +1317,11 @@ int gfs2_logd(void *data)</div><div class='ctx'> 				test_bit(SDF_FORCE_AIL_FLUSH, &amp;sdp-&gt;sd_flags) ||</div><div class='ctx'> 				gfs2_ail_flush_reqd(sdp) ||</div><div class='ctx'> 				gfs2_jrnl_flush_reqd(sdp) ||</div><div class='del'>-				sdp-&gt;sd_log_error ||</div><div class='del'>-				gfs2_withdrawing_or_withdrawn(sdp) ||</div><div class='add'>+				gfs2_withdrawn(sdp) ||</div><div class='ctx'> 				kthread_should_stop(),</div><div class='ctx'> 				t);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing(sdp))</div><div class='del'>-		gfs2_withdraw(sdp);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/log.h b/fs/gfs2/log.h<br/>index c27b05099c1e..fc30ebdad83a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/log.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/log.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/log.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/log.h</a></div><div class='hunk'>@@ -44,17 +44,6 @@ __releases(&amp;sdp-&gt;sd_log_lock)</div><div class='ctx'> 	spin_unlock(&amp;sdp-&gt;sd_log_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void gfs2_log_pointers_init(struct gfs2_sbd *sdp,</div><div class='del'>-					  unsigned int value)</div><div class='del'>-{</div><div class='del'>-	if (++value == sdp-&gt;sd_jdesc-&gt;jd_blocks) {</div><div class='del'>-		value = 0;</div><div class='del'>-	}</div><div class='del'>-	sdp-&gt;sd_log_tail = value;</div><div class='del'>-	sdp-&gt;sd_log_flush_tail = value;</div><div class='del'>-	sdp-&gt;sd_log_head = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='head'>diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c<br/>index 314ec2a70167..97ebe457c00a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/lops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/lops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/lops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/lops.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)</div><div class='ctx'> 	if (test_set_buffer_pinned(bh))</div><div class='ctx'> 		gfs2_assert_withdraw(sdp, 0);</div><div class='ctx'> 	if (!buffer_uptodate(bh))</div><div class='del'>-		gfs2_io_error_bh_wd(sdp, bh);</div><div class='add'>+		gfs2_io_error_bh(sdp, bh);</div><div class='ctx'> 	bd = bh-&gt;b_private;</div><div class='ctx'> 	/* If this buffer is in the AIL and it has already been written</div><div class='ctx'> 	 * to in-place disk block, remove it from the AIL.</div><div class='hunk'>@@ -157,7 +157,9 @@ u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lblock)</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_end_log_write_bh - end log write of pagecache data with buffers</div><div class='ctx'>  * @sdp: The superblock</div><div class='del'>- * @bvec: The bio_vec</div><div class='add'>+ * @folio: The folio</div><div class='add'>+ * @offset: The first byte within the folio that completed</div><div class='add'>+ * @size: The number of bytes that completed</div><div class='ctx'>  * @error: The i/o status</div><div class='ctx'>  *</div><div class='ctx'>  * This finds the relevant buffers and unlocks them and sets the</div><div class='hunk'>@@ -166,17 +168,13 @@ u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lblock)</div><div class='ctx'>  * that is pinned in the pagecache.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp,</div><div class='del'>-				  struct bio_vec *bvec,</div><div class='del'>-				  blk_status_t error)</div><div class='add'>+static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp, struct folio *folio,</div><div class='add'>+		size_t offset, size_t size, blk_status_t error)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh, *next;</div><div class='del'>-	struct page *page = bvec-&gt;bv_page;</div><div class='del'>-	unsigned size;</div><div class='ctx'> </div><div class='del'>-	bh = page_buffers(page);</div><div class='del'>-	size = bvec-&gt;bv_len;</div><div class='del'>-	while (bh_offset(bh) &lt; bvec-&gt;bv_offset)</div><div class='add'>+	bh = folio_buffers(folio);</div><div class='add'>+	while (bh_offset(bh) &lt; offset)</div><div class='ctx'> 		bh = bh-&gt;b_this_page;</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (error)</div><div class='hunk'>@@ -186,7 +184,7 @@ static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp,</div><div class='ctx'> 		size -= bh-&gt;b_size;</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		bh = next;</div><div class='del'>-	} while(bh &amp;&amp; size);</div><div class='add'>+	} while (bh &amp;&amp; size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -203,23 +201,24 @@ static void gfs2_end_log_write(struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = bio-&gt;bi_private;</div><div class='ctx'> 	struct bio_vec *bvec;</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	struct bvec_iter_all iter_all;</div><div class='ctx'> </div><div class='ctx'> 	if (bio-&gt;bi_status) {</div><div class='del'>-		if (!cmpxchg(&amp;sdp-&gt;sd_log_error, 0, (int)bio-&gt;bi_status))</div><div class='add'>+		int err = blk_status_to_errno(bio-&gt;bi_status);</div><div class='add'>+</div><div class='add'>+		if (!cmpxchg(&amp;sdp-&gt;sd_log_error, 0, err))</div><div class='ctx'> 			fs_err(sdp, "Error %d writing to journal, jid=%u\n",</div><div class='del'>-			       bio-&gt;bi_status, sdp-&gt;sd_jdesc-&gt;jd_jid);</div><div class='del'>-		gfs2_withdraw_delayed(sdp);</div><div class='del'>-		/* prevent more writes to the journal */</div><div class='del'>-		clear_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags);</div><div class='del'>-		wake_up(&amp;sdp-&gt;sd_logd_waitq);</div><div class='add'>+			       err, sdp-&gt;sd_jdesc-&gt;jd_jid);</div><div class='add'>+		gfs2_withdraw(sdp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		page = bvec-&gt;bv_page;</div><div class='del'>-		if (page_has_buffers(page))</div><div class='del'>-			gfs2_end_log_write_bh(sdp, bvec, bio-&gt;bi_status);</div><div class='add'>+		struct page *page = bvec-&gt;bv_page;</div><div class='add'>+		struct folio *folio = page_folio(page);</div><div class='add'>+</div><div class='add'>+		if (folio &amp;&amp; folio_buffers(folio))</div><div class='add'>+			gfs2_end_log_write_bh(sdp, folio, bvec-&gt;bv_offset,</div><div class='add'>+					bvec-&gt;bv_len, bio-&gt;bi_status);</div><div class='ctx'> 		else</div><div class='ctx'> 			mempool_free(page, gfs2_page_pool);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -359,8 +358,8 @@ static void gfs2_log_write_bh(struct gfs2_sbd *sdp, struct buffer_head *bh)</div><div class='ctx'> </div><div class='ctx'> 	dblock = gfs2_log_bmap(sdp-&gt;sd_jdesc, sdp-&gt;sd_log_flush_head);</div><div class='ctx'> 	gfs2_log_incr_head(sdp);</div><div class='del'>-	gfs2_log_write(sdp, sdp-&gt;sd_jdesc, bh-&gt;b_page, bh-&gt;b_size,</div><div class='del'>-		       bh_offset(bh), dblock);</div><div class='add'>+	gfs2_log_write(sdp, sdp-&gt;sd_jdesc, folio_page(bh-&gt;b_folio, 0),</div><div class='add'>+			bh-&gt;b_size, bh_offset(bh), dblock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -406,17 +405,16 @@ static void gfs2_end_log_read(struct bio *bio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * gfs2_jhead_pg_srch - Look for the journal head in a given page.</div><div class='add'>+ * gfs2_jhead_folio_search - Look for the journal head in a given page.</div><div class='ctx'>  * @jd: The journal descriptor</div><div class='ctx'>  * @head: The journal head to start from</div><div class='del'>- * @page: The page to look in</div><div class='add'>+ * @folio: The folio to look in</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 1 if found, 0 otherwise.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,</div><div class='del'>-			      struct gfs2_log_header_host *head,</div><div class='del'>-			      struct page *page)</div><div class='add'>+static bool gfs2_jhead_folio_search(struct gfs2_jdesc *jd,</div><div class='add'>+				    struct gfs2_log_header_host *head,</div><div class='add'>+				    struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(jd-&gt;jd_inode);</div><div class='ctx'> 	struct gfs2_log_header_host lh;</div><div class='hunk'>@@ -424,7 +422,8 @@ static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_local_page(page);</div><div class='add'>+	VM_BUG_ON_FOLIO(folio_test_large(folio), folio);</div><div class='add'>+	kaddr = kmap_local_folio(folio, 0);</div><div class='ctx'> 	for (offset = 0; offset &lt; PAGE_SIZE; offset += sdp-&gt;sd_sb.sb_bsize) {</div><div class='ctx'> 		if (!__get_log_header(sdp, kaddr + offset, 0, &amp;lh)) {</div><div class='ctx'> 			if (lh.lh_sequence &gt;= head-&gt;lh_sequence)</div><div class='hunk'>@@ -449,7 +448,7 @@ static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,</div><div class='ctx'>  * Find the folio with 'index' in the journal's mapping. Search the folio for</div><div class='ctx'>  * the journal head if requested (cleanup == false). Release refs on the</div><div class='ctx'>  * folio so the page cache can reclaim it. We grabbed a</div><div class='del'>- * reference on this folio twice, first when we did a grab_cache_page()</div><div class='add'>+ * reference on this folio twice, first when we did a filemap_grab_folio()</div><div class='ctx'>  * to obtain the folio to add it to the bio and second when we do a</div><div class='ctx'>  * filemap_get_folio() here to get the folio to wait on while I/O on it is being</div><div class='ctx'>  * completed.</div><div class='hunk'>@@ -472,9 +471,9 @@ static void gfs2_jhead_process_page(struct gfs2_jdesc *jd, unsigned long index,</div><div class='ctx'> 		*done = true;</div><div class='ctx'> </div><div class='ctx'> 	if (!*done)</div><div class='del'>-		*done = gfs2_jhead_pg_srch(jd, head, &amp;folio-&gt;page);</div><div class='add'>+		*done = gfs2_jhead_folio_search(jd, head, folio);</div><div class='ctx'> </div><div class='del'>-	/* filemap_get_folio() and the earlier grab_cache_page() */</div><div class='add'>+	/* filemap_get_folio() and the earlier filemap_grab_folio() */</div><div class='ctx'> 	folio_put_refs(folio, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -485,7 +484,7 @@ static struct bio *gfs2_chain_bio(struct bio *prev, unsigned int nr_iovecs)</div><div class='ctx'> 	new = bio_alloc(prev-&gt;bi_bdev, nr_iovecs, prev-&gt;bi_opf, GFP_NOIO);</div><div class='ctx'> 	bio_clone_blkg_association(new, prev);</div><div class='ctx'> 	new-&gt;bi_iter.bi_sector = bio_end_sector(prev);</div><div class='del'>-	bio_chain(new, prev);</div><div class='add'>+	bio_chain(prev, new);</div><div class='ctx'> 	submit_bio(prev);</div><div class='ctx'> 	return new;</div><div class='ctx'> }</div><div class='hunk'>@@ -494,15 +493,13 @@ static struct bio *gfs2_chain_bio(struct bio *prev, unsigned int nr_iovecs)</div><div class='ctx'>  * gfs2_find_jhead - find the head of a log</div><div class='ctx'>  * @jd: The journal descriptor</div><div class='ctx'>  * @head: The log descriptor for the head of the log is returned here</div><div class='del'>- * @keep_cache: If set inode pages will not be truncated</div><div class='ctx'>  *</div><div class='ctx'>  * Do a search of a journal by reading it in large chunks using bios and find</div><div class='ctx'>  * the valid log entry with the highest sequence number.  (i.e. the log head)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 0 on success, errno otherwise</div><div class='ctx'>  */</div><div class='del'>-int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head,</div><div class='del'>-		    bool keep_cache)</div><div class='add'>+int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(jd-&gt;jd_inode);</div><div class='ctx'> 	struct address_space *mapping = jd-&gt;jd_inode-&gt;i_mapping;</div><div class='hunk'>@@ -512,9 +509,9 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head,</div><div class='ctx'> 	unsigned int shift = PAGE_SHIFT - bsize_shift;</div><div class='ctx'> 	unsigned int max_blocks = 2 * 1024 * 1024 &gt;&gt; bsize_shift;</div><div class='ctx'> 	struct gfs2_journal_extent *je;</div><div class='del'>-	int sz, ret = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	bool done = false;</div><div class='ctx'> 	errseq_t since;</div><div class='ctx'> </div><div class='hunk'>@@ -527,10 +524,11 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head,</div><div class='ctx'> 		u64 dblock = je-&gt;dblock;</div><div class='ctx'> </div><div class='ctx'> 		for (; block &lt; je-&gt;lblock + je-&gt;blocks; block++, dblock++) {</div><div class='del'>-			if (!page) {</div><div class='del'>-				page = grab_cache_page(mapping, block &gt;&gt; shift);</div><div class='del'>-				if (!page) {</div><div class='del'>-					ret = -ENOMEM;</div><div class='add'>+			if (!folio) {</div><div class='add'>+				folio = filemap_grab_folio(mapping,</div><div class='add'>+						block &gt;&gt; shift);</div><div class='add'>+				if (IS_ERR(folio)) {</div><div class='add'>+					ret = PTR_ERR(folio);</div><div class='ctx'> 					done = true;</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -541,8 +539,7 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head,</div><div class='ctx'> 				sector_t sector = dblock &lt;&lt; sdp-&gt;sd_fsb2bb_shift;</div><div class='ctx'> </div><div class='ctx'> 				if (bio_end_sector(bio) == sector) {</div><div class='del'>-					sz = bio_add_page(bio, page, bsize, off);</div><div class='del'>-					if (sz == bsize)</div><div class='add'>+					if (bio_add_folio(bio, folio, bsize, off))</div><div class='ctx'> 						goto block_added;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (off) {</div><div class='hunk'>@@ -562,12 +559,11 @@ int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head,</div><div class='ctx'> 			bio = gfs2_log_alloc_bio(sdp, dblock, gfs2_end_log_read);</div><div class='ctx'> 			bio-&gt;bi_opf = REQ_OP_READ;</div><div class='ctx'> add_block_to_new_bio:</div><div class='del'>-			sz = bio_add_page(bio, page, bsize, off);</div><div class='del'>-			BUG_ON(sz != bsize);</div><div class='add'>+			bio_add_folio_nofail(bio, folio, bsize, off);</div><div class='ctx'> block_added:</div><div class='ctx'> 			off += bsize;</div><div class='del'>-			if (off == PAGE_SIZE)</div><div class='del'>-				page = NULL;</div><div class='add'>+			if (off == folio_size(folio))</div><div class='add'>+				folio = NULL;</div><div class='ctx'> 			if (blocks_submitted &lt;= blocks_read + max_blocks) {</div><div class='ctx'> 				/* Keep at least one bio in flight */</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -591,8 +587,7 @@ out:</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = filemap_check_wb_err(mapping, since);</div><div class='ctx'> </div><div class='del'>-	if (!keep_cache)</div><div class='del'>-		truncate_inode_pages(mapping, 0);</div><div class='add'>+	truncate_inode_pages(mapping, 0);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -615,15 +610,13 @@ static struct page *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type,</div><div class='ctx'> </div><div class='ctx'> static void gfs2_check_magic(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	__be32 *ptr;</div><div class='ctx'> </div><div class='ctx'> 	clear_buffer_escaped(bh);</div><div class='del'>-	kaddr = kmap_local_page(bh-&gt;b_page);</div><div class='del'>-	ptr = kaddr + bh_offset(bh);</div><div class='add'>+	ptr = kmap_local_folio(bh-&gt;b_folio, bh_offset(bh));</div><div class='ctx'> 	if (*ptr == cpu_to_be32(GFS2_MAGIC))</div><div class='ctx'> 		set_buffer_escaped(bh);</div><div class='del'>-	kunmap_local(kaddr);</div><div class='add'>+	kunmap_local(ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int blocknr_cmp(void *priv, const struct list_head *a,</div><div class='head'>diff --git a/fs/gfs2/lops.h b/fs/gfs2/lops.h<br/>index 07890c7b145d..be740bf33666 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/lops.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/lops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/lops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/lops.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@ void gfs2_log_write(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,</div><div class='ctx'> void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf);</div><div class='ctx'> void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh);</div><div class='ctx'> int gfs2_find_jhead(struct gfs2_jdesc *jd,</div><div class='del'>-		    struct gfs2_log_header_host *head, bool keep_cache);</div><div class='add'>+		    struct gfs2_log_header_host *head);</div><div class='ctx'> void gfs2_drain_revokes(struct gfs2_sbd *sdp);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int buf_limit(struct gfs2_sbd *sdp)</div><div class='head'>diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c<br/>index 79be0cdc730c..9d65719353fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/main.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/main.c</a></div><div class='hunk'>@@ -51,7 +51,6 @@ static void gfs2_init_glock_once(void *foo)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_glock *gl = foo;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;gl-&gt;gl_lockref.lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;gl-&gt;gl_holders);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;gl-&gt;gl_lru);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;gl-&gt;gl_ail_list);</div><div class='hunk'>@@ -111,7 +110,6 @@ static int __init init_gfs2_fs(void)</div><div class='ctx'> 	gfs2_inode_cachep = kmem_cache_create("gfs2_inode",</div><div class='ctx'> 					      sizeof(struct gfs2_inode),</div><div class='ctx'> 					      0,  SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						  SLAB_MEM_SPREAD|</div><div class='ctx'> 						  SLAB_ACCOUNT,</div><div class='ctx'> 					      gfs2_init_inode_once);</div><div class='ctx'> 	if (!gfs2_inode_cachep)</div><div class='hunk'>@@ -153,7 +151,8 @@ static int __init init_gfs2_fs(void)</div><div class='ctx'> </div><div class='ctx'> 	error = -ENOMEM;</div><div class='ctx'> 	gfs2_recovery_wq = alloc_workqueue("gfs2_recovery",</div><div class='del'>-					  WQ_MEM_RECLAIM | WQ_FREEZABLE, 0);</div><div class='add'>+					  WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_PERCPU,</div><div class='add'>+					  0);</div><div class='ctx'> 	if (!gfs2_recovery_wq)</div><div class='ctx'> 		goto fail_wq1;</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +161,7 @@ static int __init init_gfs2_fs(void)</div><div class='ctx'> 	if (!gfs2_control_wq)</div><div class='ctx'> 		goto fail_wq2;</div><div class='ctx'> </div><div class='del'>-	gfs2_freeze_wq = alloc_workqueue("gfs2_freeze", 0, 0);</div><div class='add'>+	gfs2_freeze_wq = alloc_workqueue("gfs2_freeze", WQ_PERCPU, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!gfs2_freeze_wq)</div><div class='ctx'> 		goto fail_wq3;</div><div class='head'>diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c<br/>index f814054c8cd0..e4356198d8d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/meta_io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/meta_io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/meta_io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/meta_io.c</a></div><div class='hunk'>@@ -30,16 +30,16 @@</div><div class='ctx'> #include "util.h"</div><div class='ctx'> #include "trace_gfs2.h"</div><div class='ctx'> </div><div class='del'>-static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wbc)</div><div class='add'>+static void gfs2_aspace_write_folio(struct folio *folio,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh, *head;</div><div class='ctx'> 	int nr_underway = 0;</div><div class='ctx'> 	blk_opf_t write_flags = REQ_META | REQ_PRIO | wbc_to_write_flags(wbc);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	BUG_ON(!page_has_buffers(page));</div><div class='add'>+	BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> </div><div class='del'>-	head = page_buffers(page);</div><div class='add'>+	head = folio_buffers(folio);</div><div class='ctx'> 	bh = head;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='hunk'>@@ -55,7 +55,7 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb</div><div class='ctx'> 		if (wbc-&gt;sync_mode != WB_SYNC_NONE) {</div><div class='ctx'> 			lock_buffer(bh);</div><div class='ctx'> 		} else if (!trylock_buffer(bh)) {</div><div class='del'>-			redirty_page_for_writepage(wbc, page);</div><div class='add'>+			folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (test_clear_buffer_dirty(bh)) {</div><div class='hunk'>@@ -66,11 +66,11 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb</div><div class='ctx'> 	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The page and its buffers are protected by PageWriteback(), so we can</div><div class='del'>-	 * drop the bh refcounts early.</div><div class='add'>+	 * The folio and its buffers are protected from truncation by</div><div class='add'>+	 * the writeback flag, so we can drop the bh refcounts early.</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(PageWriteback(page));</div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	BUG_ON(folio_test_writeback(folio));</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='hunk'>@@ -80,26 +80,38 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb</div><div class='ctx'> 		}</div><div class='ctx'> 		bh = next;</div><div class='ctx'> 	} while (bh != head);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (nr_underway == 0)</div><div class='del'>-		end_page_writeback(page);</div><div class='add'>+		folio_end_writeback(folio);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static int gfs2_aspace_writepages(struct address_space *mapping,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)))</div><div class='add'>+		gfs2_aspace_write_folio(folio, wbc);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations gfs2_meta_aops = {</div><div class='ctx'> 	.dirty_folio	= block_dirty_folio,</div><div class='ctx'> 	.invalidate_folio = block_invalidate_folio,</div><div class='del'>-	.writepage = gfs2_aspace_writepage,</div><div class='add'>+	.writepages = gfs2_aspace_writepages,</div><div class='ctx'> 	.release_folio = gfs2_release_folio,</div><div class='add'>+	.migrate_folio = buffer_migrate_folio_norefs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations gfs2_rgrp_aops = {</div><div class='ctx'> 	.dirty_folio	= block_dirty_folio,</div><div class='ctx'> 	.invalidate_folio = block_invalidate_folio,</div><div class='del'>-	.writepage = gfs2_aspace_writepage,</div><div class='add'>+	.writepages = gfs2_aspace_writepages,</div><div class='ctx'> 	.release_folio = gfs2_release_folio,</div><div class='add'>+	.migrate_folio = buffer_migrate_folio_norefs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -122,7 +134,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)</div><div class='ctx'> 	unsigned int bufnum;</div><div class='ctx'> </div><div class='ctx'> 	if (mapping == NULL)</div><div class='del'>-		mapping = &amp;sdp-&gt;sd_aspace;</div><div class='add'>+		mapping = gfs2_aspace(sdp);</div><div class='ctx'> </div><div class='ctx'> 	shift = PAGE_SHIFT - sdp-&gt;sd_sb.sb_bsize_shift;</div><div class='ctx'> 	index = blkno &gt;&gt; shift;             /* convert block to page */</div><div class='hunk'>@@ -188,15 +200,14 @@ struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno)</div><div class='ctx'> </div><div class='ctx'> static void gfs2_meta_read_endio(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct bio_vec *bvec;</div><div class='del'>-	struct bvec_iter_all iter_all;</div><div class='add'>+	struct folio_iter fi;</div><div class='ctx'> </div><div class='del'>-	bio_for_each_segment_all(bvec, bio, iter_all) {</div><div class='del'>-		struct page *page = bvec-&gt;bv_page;</div><div class='del'>-		struct buffer_head *bh = page_buffers(page);</div><div class='del'>-		unsigned int len = bvec-&gt;bv_len;</div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='add'>+		struct folio *folio = fi.folio;</div><div class='add'>+		struct buffer_head *bh = folio_buffers(folio);</div><div class='add'>+		size_t len = fi.length;</div><div class='ctx'> </div><div class='del'>-		while (bh_offset(bh) &lt; bvec-&gt;bv_offset)</div><div class='add'>+		while (bh_offset(bh) &lt; fi.offset)</div><div class='ctx'> 			bh = bh-&gt;b_this_page;</div><div class='ctx'> 		do {</div><div class='ctx'> 			struct buffer_head *next = bh-&gt;b_this_page;</div><div class='hunk'>@@ -219,10 +230,10 @@ static void gfs2_submit_bhs(blk_opf_t opf, struct buffer_head *bhs[], int num)</div><div class='ctx'> 		struct bio *bio;</div><div class='ctx'> </div><div class='ctx'> 		bio = bio_alloc(bh-&gt;b_bdev, num, opf, GFP_NOIO);</div><div class='del'>-		bio-&gt;bi_iter.bi_sector = bh-&gt;b_blocknr * (bh-&gt;b_size &gt;&gt; 9);</div><div class='add'>+		bio-&gt;bi_iter.bi_sector = bh-&gt;b_blocknr * (bh-&gt;b_size &gt;&gt; SECTOR_SHIFT);</div><div class='ctx'> 		while (num &gt; 0) {</div><div class='ctx'> 			bh = *bhs;</div><div class='del'>-			if (!bio_add_page(bio, bh-&gt;b_page, bh-&gt;b_size, bh_offset(bh))) {</div><div class='add'>+			if (!bio_add_folio(bio, bh-&gt;b_folio, bh-&gt;b_size, bh_offset(bh))) {</div><div class='ctx'> 				BUG_ON(bio-&gt;bi_iter.bi_size == 0);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -252,8 +263,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,</div><div class='ctx'> 	struct buffer_head *bh, *bhs[2];</div><div class='ctx'> 	int num = 0;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp) &amp;&amp;</div><div class='del'>-	    !gfs2_withdraw_in_prog(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		*bhp = NULL;</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -292,7 +302,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,</div><div class='ctx'> 	if (unlikely(!buffer_uptodate(bh))) {</div><div class='ctx'> 		struct gfs2_trans *tr = current-&gt;journal_info;</div><div class='ctx'> 		if (tr &amp;&amp; test_bit(TR_TOUCHED, &amp;tr-&gt;tr_flags))</div><div class='del'>-			gfs2_io_error_bh_wd(sdp, bh);</div><div class='add'>+			gfs2_io_error_bh(sdp, bh);</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		*bhp = NULL;</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -311,8 +321,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,</div><div class='ctx'> </div><div class='ctx'> int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp) &amp;&amp;</div><div class='del'>-	    !gfs2_withdraw_in_prog(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	wait_on_buffer(bh);</div><div class='hunk'>@@ -320,11 +329,10 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)</div><div class='ctx'> 	if (!buffer_uptodate(bh)) {</div><div class='ctx'> 		struct gfs2_trans *tr = current-&gt;journal_info;</div><div class='ctx'> 		if (tr &amp;&amp; test_bit(TR_TOUCHED, &amp;tr-&gt;tr_flags))</div><div class='del'>-			gfs2_io_error_bh_wd(sdp, bh);</div><div class='add'>+			gfs2_io_error_bh(sdp, bh);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp) &amp;&amp;</div><div class='del'>-	    !gfs2_withdraw_in_prog(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -434,11 +442,9 @@ void gfs2_journal_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen)</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	int ty;</div><div class='ctx'> </div><div class='del'>-	if (!ip-&gt;i_gl) {</div><div class='del'>-		/* This can only happen during incomplete inode creation. */</div><div class='del'>-		BUG_ON(!test_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags));</div><div class='add'>+	/* This can only happen during incomplete inode creation. */</div><div class='add'>+	if (!ip-&gt;i_gl)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	gfs2_ail1_wipe(sdp, bstart, blen);</div><div class='ctx'> 	while (blen) {</div><div class='head'>diff --git a/fs/gfs2/meta_io.h b/fs/gfs2/meta_io.h<br/>index 831d988c2ceb..b7c8a6684d02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/meta_io.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/meta_io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/meta_io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/meta_io.h</a></div><div class='hunk'>@@ -44,9 +44,7 @@ static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping)</div><div class='ctx'> 		struct gfs2_glock_aspace *gla =</div><div class='ctx'> 			container_of(mapping, struct gfs2_glock_aspace, mapping);</div><div class='ctx'> 		return gla-&gt;glock.gl_name.ln_sbd;</div><div class='del'>-	} else if (mapping-&gt;a_ops == &amp;gfs2_rgrp_aops)</div><div class='del'>-		return container_of(mapping, struct gfs2_sbd, sd_aspace);</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='ctx'> 		return inode-&gt;i_sb-&gt;s_fs_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c<br/>index 1281e60be639..e7a88b717991 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/ops_fstype.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/ops_fstype.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/ops_fstype.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/ops_fstype.c</a></div><div class='hunk'>@@ -60,19 +60,21 @@ static void gfs2_tune_init(struct gfs2_tune *gt)</div><div class='ctx'> 	gt-&gt;gt_new_files_jdata = 0;</div><div class='ctx'> 	gt-&gt;gt_max_readahead = BIT(18);</div><div class='ctx'> 	gt-&gt;gt_complain_secs = 10;</div><div class='add'>+	gt-&gt;gt_withdraw_helper_timeout = 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void free_sbd(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='del'>-	if (sdp-&gt;sd_lkstats)</div><div class='del'>-		free_percpu(sdp-&gt;sd_lkstats);</div><div class='add'>+	struct super_block *sb = sdp-&gt;sd_vfs;</div><div class='add'>+</div><div class='add'>+	free_percpu(sdp-&gt;sd_lkstats);</div><div class='add'>+	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> 	kfree(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct gfs2_sbd *init_sbd(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp;</div><div class='del'>-	struct address_space *mapping;</div><div class='ctx'> </div><div class='ctx'> 	sdp = kzalloc(sizeof(struct gfs2_sbd), GFP_KERNEL);</div><div class='ctx'> 	if (!sdp)</div><div class='hunk'>@@ -91,7 +93,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)</div><div class='ctx'> 	init_waitqueue_head(&amp;sdp-&gt;sd_async_glock_wait);</div><div class='ctx'> 	atomic_set(&amp;sdp-&gt;sd_glock_disposal, 0);</div><div class='ctx'> 	init_completion(&amp;sdp-&gt;sd_locking_init);</div><div class='del'>-	init_completion(&amp;sdp-&gt;sd_wdack);</div><div class='add'>+	init_completion(&amp;sdp-&gt;sd_withdraw_helper);</div><div class='ctx'> 	spin_lock_init(&amp;sdp-&gt;sd_statfs_spin);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;sdp-&gt;sd_rindex_spin);</div><div class='hunk'>@@ -103,23 +105,12 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)</div><div class='ctx'> 	init_completion(&amp;sdp-&gt;sd_journal_ready);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sdp-&gt;sd_quota_list);</div><div class='del'>-	mutex_init(&amp;sdp-&gt;sd_quota_mutex);</div><div class='ctx'> 	mutex_init(&amp;sdp-&gt;sd_quota_sync_mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;sdp-&gt;sd_quota_wait);</div><div class='ctx'> 	spin_lock_init(&amp;sdp-&gt;sd_bitmap_lock);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sdp-&gt;sd_sc_inodes_list);</div><div class='ctx'> </div><div class='del'>-	mapping = &amp;sdp-&gt;sd_aspace;</div><div class='del'>-</div><div class='del'>-	address_space_init_once(mapping);</div><div class='del'>-	mapping-&gt;a_ops = &amp;gfs2_rgrp_aops;</div><div class='del'>-	mapping-&gt;host = sb-&gt;s_bdev-&gt;bd_inode;</div><div class='del'>-	mapping-&gt;flags = 0;</div><div class='del'>-	mapping_set_gfp_mask(mapping, GFP_NOFS);</div><div class='del'>-	mapping-&gt;i_private_data = NULL;</div><div class='del'>-	mapping-&gt;writeback_index = 0;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;sdp-&gt;sd_log_lock);</div><div class='ctx'> 	atomic_set(&amp;sdp-&gt;sd_log_pinned, 0);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sdp-&gt;sd_log_revokes);</div><div class='hunk'>@@ -136,6 +127,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)</div><div class='ctx'> 	atomic_set(&amp;sdp-&gt;sd_log_in_flight, 0);</div><div class='ctx'> 	init_waitqueue_head(&amp;sdp-&gt;sd_log_flush_wait);</div><div class='ctx'> 	mutex_init(&amp;sdp-&gt;sd_freeze_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdp-&gt;sd_dead_glocks);</div><div class='ctx'> </div><div class='ctx'> 	return sdp;</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +164,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sb-&gt;sb_bsize &lt; 512 || sb-&gt;sb_bsize &gt; PAGE_SIZE ||</div><div class='add'>+	if (sb-&gt;sb_bsize &lt; SECTOR_SIZE || sb-&gt;sb_bsize &gt; PAGE_SIZE ||</div><div class='ctx'> 	    (sb-&gt;sb_bsize &amp; (sb-&gt;sb_bsize - 1))) {</div><div class='ctx'> 		pr_warn("Invalid block size\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -184,22 +176,10 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void end_bio_io_page(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	struct page *page = bio-&gt;bi_private;</div><div class='del'>-</div><div class='del'>-	if (!bio-&gt;bi_status)</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	else</div><div class='del'>-		pr_warn("error %d reading superblock\n", bio-&gt;bi_status);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gfs2_sb_in(struct gfs2_sbd *sdp, const void *buf)</div><div class='add'>+static void gfs2_sb_in(struct gfs2_sbd *sdp, const struct gfs2_sb *str)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sb_host *sb = &amp;sdp-&gt;sd_sb;</div><div class='ctx'> 	struct super_block *s = sdp-&gt;sd_vfs;</div><div class='del'>-	const struct gfs2_sb *str = buf;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;sb_magic = be32_to_cpu(str-&gt;sb_header.mh_magic);</div><div class='ctx'> 	sb-&gt;sb_type = be32_to_cpu(str-&gt;sb_header.mh_type);</div><div class='hunk'>@@ -214,7 +194,7 @@ static void gfs2_sb_in(struct gfs2_sbd *sdp, const void *buf)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(sb-&gt;sb_lockproto, str-&gt;sb_lockproto, GFS2_LOCKNAME_LEN);</div><div class='ctx'> 	memcpy(sb-&gt;sb_locktable, str-&gt;sb_locktable, GFS2_LOCKNAME_LEN);</div><div class='del'>-	memcpy(&amp;s-&gt;s_uuid, str-&gt;sb_uuid, 16);</div><div class='add'>+	super_set_uuid(s, str-&gt;sb_uuid, 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -238,36 +218,22 @@ static void gfs2_sb_in(struct gfs2_sbd *sdp, const void *buf)</div><div class='ctx'> </div><div class='ctx'> static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = sdp-&gt;sd_vfs;</div><div class='del'>-	struct gfs2_sb *p;</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct bio *bio;</div><div class='add'>+	struct gfs2_sb *sb;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	page = alloc_page(GFP_NOFS);</div><div class='del'>-	if (unlikely(!page))</div><div class='add'>+	sb = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!sb))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ClearPageUptodate(page);</div><div class='del'>-	ClearPageDirty(page);</div><div class='del'>-	lock_page(page);</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc(sb-&gt;s_bdev, 1, REQ_OP_READ | REQ_META, GFP_NOFS);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector = sector * (sb-&gt;s_blocksize &gt;&gt; 9);</div><div class='del'>-	__bio_add_page(bio, page, PAGE_SIZE, 0);</div><div class='del'>-</div><div class='del'>-	bio-&gt;bi_end_io = end_bio_io_page;</div><div class='del'>-	bio-&gt;bi_private = page;</div><div class='del'>-	submit_bio(bio);</div><div class='del'>-	wait_on_page_locked(page);</div><div class='del'>-	bio_put(bio);</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		__free_page(page);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	p = kmap(page);</div><div class='del'>-	gfs2_sb_in(sdp, p);</div><div class='del'>-	kunmap(page);</div><div class='del'>-	__free_page(page);</div><div class='add'>+	err = bdev_rw_virt(sdp-&gt;sd_vfs-&gt;s_bdev,</div><div class='add'>+			   sector &lt;&lt; (sdp-&gt;sd_vfs-&gt;s_blocksize_bits - SECTOR_SHIFT),</div><div class='add'>+			   sb, PAGE_SIZE, REQ_OP_READ | REQ_META);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_warn("error %d reading superblock\n", err);</div><div class='add'>+		kfree(sb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	gfs2_sb_in(sdp, sb);</div><div class='add'>+	kfree(sb);</div><div class='ctx'> 	return gfs2_check_sb(sdp, silent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +258,7 @@ static int gfs2_read_sb(struct gfs2_sbd *sdp, int silent)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdp-&gt;sd_fsb2bb_shift = sdp-&gt;sd_sb.sb_bsize_shift - 9;</div><div class='add'>+	sdp-&gt;sd_fsb2bb_shift = sdp-&gt;sd_sb.sb_bsize_shift - SECTOR_SHIFT;</div><div class='ctx'> 	sdp-&gt;sd_fsb2bb = BIT(sdp-&gt;sd_fsb2bb_shift);</div><div class='ctx'> 	sdp-&gt;sd_diptrs = (sdp-&gt;sd_sb.sb_bsize -</div><div class='ctx'> 			  sizeof(struct gfs2_dinode)) / sizeof(u64);</div><div class='hunk'>@@ -405,7 +371,7 @@ static int init_locking(struct gfs2_sbd *sdp, struct gfs2_holder *mount_gh,</div><div class='ctx'> 	error = gfs2_glock_nq_num(sdp,</div><div class='ctx'> 				  GFS2_MOUNT_LOCK, &amp;gfs2_nondisk_glops,</div><div class='ctx'> 				  LM_ST_EXCLUSIVE,</div><div class='del'>-				  LM_FLAG_NOEXP | GL_NOCACHE | GL_NOPID,</div><div class='add'>+				  LM_FLAG_RECOVER | GL_NOCACHE | GL_NOPID,</div><div class='ctx'> 				  mount_gh);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fs_err(sdp, "can't acquire mount glock: %d\n", error);</div><div class='hunk'>@@ -415,7 +381,7 @@ static int init_locking(struct gfs2_sbd *sdp, struct gfs2_holder *mount_gh,</div><div class='ctx'> 	error = gfs2_glock_nq_num(sdp,</div><div class='ctx'> 				  GFS2_LIVE_LOCK, &amp;gfs2_nondisk_glops,</div><div class='ctx'> 				  LM_ST_SHARED,</div><div class='del'>-				  LM_FLAG_NOEXP | GL_EXACT | GL_NOPID,</div><div class='add'>+				  LM_FLAG_RECOVER | GL_EXACT | GL_NOPID,</div><div class='ctx'> 				  &amp;sdp-&gt;sd_live_gh);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fs_err(sdp, "can't acquire live glock: %d\n", error);</div><div class='hunk'>@@ -520,7 +486,9 @@ static int init_sb(struct gfs2_sbd *sdp, int silent)</div><div class='ctx'> 		       sdp-&gt;sd_sb.sb_bsize, (unsigned int)PAGE_SIZE);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	sb_set_blocksize(sb, sdp-&gt;sd_sb.sb_bsize);</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (!sb_set_blocksize(sb, sdp-&gt;sd_sb.sb_bsize))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the root inode */</div><div class='ctx'> 	no_addr = sdp-&gt;sd_sb.sb_root_dir.no_addr;</div><div class='hunk'>@@ -575,8 +543,6 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)</div><div class='ctx'> 	mutex_lock(&amp;sdp-&gt;sd_jindex_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		struct gfs2_inode *jip;</div><div class='del'>-</div><div class='ctx'> 		error = gfs2_glock_nq_init(dip-&gt;i_gl, LM_ST_SHARED, 0, ji_gh);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -617,8 +583,6 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)</div><div class='ctx'> 		d_mark_dontcache(jd-&gt;jd_inode);</div><div class='ctx'> 		spin_lock(&amp;sdp-&gt;sd_jindex_spin);</div><div class='ctx'> 		jd-&gt;jd_jid = sdp-&gt;sd_journals++;</div><div class='del'>-		jip = GFS2_I(jd-&gt;jd_inode);</div><div class='del'>-		jd-&gt;jd_no_addr = jip-&gt;i_no_addr;</div><div class='ctx'> 		list_add_tail(&amp;jd-&gt;jd_list, &amp;sdp-&gt;sd_jindex_list);</div><div class='ctx'> 		spin_unlock(&amp;sdp-&gt;sd_jindex_spin);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -778,7 +742,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)</div><div class='ctx'> 		error = gfs2_glock_nq_num(sdp, sdp-&gt;sd_lockstruct.ls_jid,</div><div class='ctx'> 					  &amp;gfs2_journal_glops,</div><div class='ctx'> 					  LM_ST_EXCLUSIVE,</div><div class='del'>-					  LM_FLAG_NOEXP | GL_NOCACHE | GL_NOPID,</div><div class='add'>+					  LM_FLAG_RECOVER | GL_NOPID,</div><div class='ctx'> 					  &amp;sdp-&gt;sd_journal_gh);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			fs_err(sdp, "can't acquire journal glock: %d\n", error);</div><div class='hunk'>@@ -786,9 +750,8 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ip = GFS2_I(sdp-&gt;sd_jdesc-&gt;jd_inode);</div><div class='del'>-		sdp-&gt;sd_jinode_gl = ip-&gt;i_gl;</div><div class='ctx'> 		error = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_SHARED,</div><div class='del'>-					   LM_FLAG_NOEXP | GL_EXACT |</div><div class='add'>+					   LM_FLAG_RECOVER | GL_EXACT |</div><div class='ctx'> 					   GL_NOCACHE | GL_NOPID,</div><div class='ctx'> 					   &amp;sdp-&gt;sd_jinode_gh);</div><div class='ctx'> 		if (error) {</div><div class='hunk'>@@ -854,13 +817,10 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)</div><div class='ctx'> fail_statfs:</div><div class='ctx'> 	uninit_statfs(sdp);</div><div class='ctx'> fail_jinode_gh:</div><div class='del'>-	/* A withdraw may have done dq/uninit so now we need to check it */</div><div class='del'>-	if (!sdp-&gt;sd_args.ar_spectator &amp;&amp;</div><div class='del'>-	    gfs2_holder_initialized(&amp;sdp-&gt;sd_jinode_gh))</div><div class='add'>+	if (!sdp-&gt;sd_args.ar_spectator)</div><div class='ctx'> 		gfs2_glock_dq_uninit(&amp;sdp-&gt;sd_jinode_gh);</div><div class='ctx'> fail_journal_gh:</div><div class='del'>-	if (!sdp-&gt;sd_args.ar_spectator &amp;&amp;</div><div class='del'>-	    gfs2_holder_initialized(&amp;sdp-&gt;sd_journal_gh))</div><div class='add'>+	if (!sdp-&gt;sd_args.ar_spectator)</div><div class='ctx'> 		gfs2_glock_dq_uninit(&amp;sdp-&gt;sd_journal_gh);</div><div class='ctx'> fail_jindex:</div><div class='ctx'> 	gfs2_jindex_free(sdp);</div><div class='hunk'>@@ -1073,8 +1033,8 @@ hostdata_error:</div><div class='ctx'> void gfs2_lm_unmount(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='ctx'> 	const struct lm_lockops *lm = sdp-&gt;sd_lockstruct.ls_ops;</div><div class='del'>-	if (!gfs2_withdrawing_or_withdrawn(sdp) &amp;&amp; lm-&gt;lm_unmount)</div><div class='del'>-		lm-&gt;lm_unmount(sdp);</div><div class='add'>+	if (!gfs2_withdrawn(sdp) &amp;&amp; lm-&gt;lm_unmount)</div><div class='add'>+		lm-&gt;lm_unmount(sdp, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wait_on_journal(struct gfs2_sbd *sdp)</div><div class='hunk'>@@ -1155,6 +1115,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	struct gfs2_sbd *sdp;</div><div class='ctx'> 	struct gfs2_holder mount_gh;</div><div class='add'>+	struct address_space *mapping;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	sdp = init_sbd(sb);</div><div class='hunk'>@@ -1176,7 +1137,8 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_flags |= SB_NOSEC;</div><div class='ctx'> 	sb-&gt;s_magic = GFS2_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op = &amp;gfs2_super_ops;</div><div class='del'>-	sb-&gt;s_d_op = &amp;gfs2_dops;</div><div class='add'>+</div><div class='add'>+	set_default_d_op(sb, &amp;gfs2_dops);</div><div class='ctx'> 	sb-&gt;s_export_op = &amp;gfs2_export_ops;</div><div class='ctx'> 	sb-&gt;s_qcop = &amp;gfs2_quotactl_ops;</div><div class='ctx'> 	sb-&gt;s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;</div><div class='hunk'>@@ -1186,9 +1148,12 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the buffer cache and fill in some fake block size values</div><div class='ctx'> 	   to allow us to read-in the on-disk superblock. */</div><div class='del'>-	sdp-&gt;sd_sb.sb_bsize = sb_min_blocksize(sb, 512);</div><div class='add'>+	sdp-&gt;sd_sb.sb_bsize = sb_min_blocksize(sb, SECTOR_SIZE);</div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if (!sdp-&gt;sd_sb.sb_bsize)</div><div class='add'>+		goto fail_free;</div><div class='ctx'> 	sdp-&gt;sd_sb.sb_bsize_shift = sb-&gt;s_blocksize_bits;</div><div class='del'>-	sdp-&gt;sd_fsb2bb_shift = sdp-&gt;sd_sb.sb_bsize_shift - 9;</div><div class='add'>+	sdp-&gt;sd_fsb2bb_shift = sdp-&gt;sd_sb.sb_bsize_shift - SECTOR_SHIFT;</div><div class='ctx'> 	sdp-&gt;sd_fsb2bb = BIT(sdp-&gt;sd_fsb2bb_shift);</div><div class='ctx'> </div><div class='ctx'> 	sdp-&gt;sd_tune.gt_logd_secs = sdp-&gt;sd_args.ar_commit;</div><div class='hunk'>@@ -1201,17 +1166,37 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		sdp-&gt;sd_tune.gt_statfs_quantum = 30;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Set up an address space for metadata writes */</div><div class='add'>+	sdp-&gt;sd_inode = new_inode(sb);</div><div class='add'>+	error = -ENOMEM;</div><div class='add'>+	if (!sdp-&gt;sd_inode)</div><div class='add'>+		goto fail_free;</div><div class='add'>+	sdp-&gt;sd_inode-&gt;i_ino = GFS2_BAD_INO;</div><div class='add'>+	sdp-&gt;sd_inode-&gt;i_size = OFFSET_MAX;</div><div class='add'>+</div><div class='add'>+	mapping = gfs2_aspace(sdp);</div><div class='add'>+	mapping-&gt;a_ops = &amp;gfs2_rgrp_aops;</div><div class='add'>+	gfs2_setup_inode(sdp-&gt;sd_inode);</div><div class='add'>+</div><div class='ctx'> 	error = init_names(sdp, silent);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto fail_free;</div><div class='add'>+		goto fail_iput;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(sdp-&gt;sd_fsname, sizeof(sdp-&gt;sd_fsname), "%s", sdp-&gt;sd_table_name);</div><div class='ctx'> </div><div class='del'>-	sdp-&gt;sd_delete_wq = alloc_workqueue("gfs2-delete/%s",</div><div class='del'>-			WQ_MEM_RECLAIM | WQ_FREEZABLE, 0, sdp-&gt;sd_fsname);</div><div class='ctx'> 	error = -ENOMEM;</div><div class='add'>+	sdp-&gt;sd_glock_wq = alloc_workqueue("gfs2-glock/%s",</div><div class='add'>+			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_FREEZABLE | WQ_PERCPU,</div><div class='add'>+			0,</div><div class='add'>+			sdp-&gt;sd_fsname);</div><div class='add'>+	if (!sdp-&gt;sd_glock_wq)</div><div class='add'>+		goto fail_iput;</div><div class='add'>+</div><div class='add'>+	sdp-&gt;sd_delete_wq = alloc_workqueue("gfs2-delete/%s",</div><div class='add'>+			WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_PERCPU, 0,</div><div class='add'>+			sdp-&gt;sd_fsname);</div><div class='ctx'> 	if (!sdp-&gt;sd_delete_wq)</div><div class='del'>-		goto fail_free;</div><div class='add'>+		goto fail_glock_wq;</div><div class='ctx'> </div><div class='ctx'> 	error = gfs2_sys_fs_add(sdp);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -1223,6 +1208,8 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail_debug;</div><div class='ctx'> </div><div class='add'>+	INIT_WORK(&amp;sdp-&gt;sd_withdraw_work, gfs2_withdraw_func);</div><div class='add'>+</div><div class='ctx'> 	error = init_locking(sdp, &amp;mount_gh, DO);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail_lm;</div><div class='hunk'>@@ -1288,7 +1275,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		error = gfs2_make_fs_rw(sdp);</div><div class='ctx'> </div><div class='ctx'> 	if (error) {</div><div class='del'>-		gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='add'>+		gfs2_freeze_unlock(sdp);</div><div class='ctx'> 		gfs2_destroy_threads(sdp);</div><div class='ctx'> 		fs_err(sdp, "can't make FS RW: %d\n", error);</div><div class='ctx'> 		goto fail_per_node;</div><div class='hunk'>@@ -1320,9 +1307,13 @@ fail_debug:</div><div class='ctx'> 	gfs2_sys_fs_del(sdp);</div><div class='ctx'> fail_delete_wq:</div><div class='ctx'> 	destroy_workqueue(sdp-&gt;sd_delete_wq);</div><div class='add'>+fail_glock_wq:</div><div class='add'>+	if (sdp-&gt;sd_glock_wq)</div><div class='add'>+		destroy_workqueue(sdp-&gt;sd_glock_wq);</div><div class='add'>+fail_iput:</div><div class='add'>+	iput(sdp-&gt;sd_inode);</div><div class='ctx'> fail_free:</div><div class='ctx'> 	free_sbd(sdp);</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1405,12 +1396,14 @@ static const struct constant_table gfs2_param_data[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum opt_errors {</div><div class='del'>-	Opt_errors_withdraw = GFS2_ERRORS_WITHDRAW,</div><div class='del'>-	Opt_errors_panic    = GFS2_ERRORS_PANIC,</div><div class='add'>+	Opt_errors_withdraw   = GFS2_ERRORS_WITHDRAW,</div><div class='add'>+	Opt_errors_deactivate = GFS2_ERRORS_DEACTIVATE,</div><div class='add'>+	Opt_errors_panic      = GFS2_ERRORS_PANIC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct constant_table gfs2_param_errors[] = {</div><div class='ctx'> 	{"withdraw",   Opt_errors_withdraw },</div><div class='add'>+	{"deactivate", Opt_errors_deactivate },</div><div class='ctx'> 	{"panic",      Opt_errors_panic },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='hunk'>@@ -1755,12 +1748,12 @@ static void gfs2_evict_inodes(struct super_block *sb)</div><div class='ctx'> 	spin_lock(&amp;sb-&gt;s_inode_list_lock);</div><div class='ctx'> 	list_for_each_entry(inode, &amp;sb-&gt;s_inodes, i_sb_list) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if ((inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE|I_NEW)) &amp;&amp;</div><div class='add'>+		if ((inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) &amp;&amp;</div><div class='ctx'> 		    !need_resched()) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		atomic_inc(&amp;inode-&gt;i_count);</div><div class='add'>+		__iget(inode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		spin_unlock(&amp;sb-&gt;s_inode_list_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c<br/>index aa9cf0102848..b1692f12a602 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/quota.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/quota.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/quota.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/quota.c</a></div><div class='hunk'>@@ -75,9 +75,6 @@</div><div class='ctx'> #define GFS2_QD_HASH_SIZE       BIT(GFS2_QD_HASH_SHIFT)</div><div class='ctx'> #define GFS2_QD_HASH_MASK       (GFS2_QD_HASH_SIZE - 1)</div><div class='ctx'> </div><div class='del'>-#define QC_CHANGE 0</div><div class='del'>-#define QC_SYNC 1</div><div class='del'>-</div><div class='ctx'> /* Lock order: qd_lock -&gt; bucket lock -&gt; qd-&gt;lockref.lock -&gt; lru lock */</div><div class='ctx'> /*                     -&gt; sd_bitmap_lock                              */</div><div class='ctx'> static DEFINE_SPINLOCK(qd_lock);</div><div class='hunk'>@@ -128,7 +125,7 @@ static void gfs2_qd_dispose(struct gfs2_quota_data *qd)</div><div class='ctx'> 	hlist_bl_del_rcu(&amp;qd-&gt;qd_hlist);</div><div class='ctx'> 	spin_unlock_bucket(qd-&gt;qd_hash);</div><div class='ctx'> </div><div class='del'>-	if (!gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (!gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		gfs2_assert_warn(sdp, !qd-&gt;qd_change);</div><div class='ctx'> 		gfs2_assert_warn(sdp, !qd-&gt;qd_slot_ref);</div><div class='ctx'> 		gfs2_assert_warn(sdp, !qd-&gt;qd_bh_count);</div><div class='hunk'>@@ -152,7 +149,7 @@ static void gfs2_qd_list_dispose(struct list_head *list)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static enum lru_status gfs2_qd_isolate(struct list_head *item,</div><div class='del'>-		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)</div><div class='add'>+		struct list_lru_one *lru, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *dispose = arg;</div><div class='ctx'> 	struct gfs2_quota_data *qd =</div><div class='hunk'>@@ -239,8 +236,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	qd-&gt;qd_sbd = sdp;</div><div class='del'>-	qd-&gt;qd_lockref.count = 0;</div><div class='del'>-	spin_lock_init(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	lockref_init(&amp;qd-&gt;qd_lockref);</div><div class='ctx'> 	qd-&gt;qd_id = qid;</div><div class='ctx'> 	qd-&gt;qd_slot = -1;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;qd-&gt;qd_lru);</div><div class='hunk'>@@ -301,7 +297,6 @@ static int qd_get(struct gfs2_sbd *sdp, struct kqid qid,</div><div class='ctx'> 	spin_lock_bucket(hash);</div><div class='ctx'> 	*qdp = qd = gfs2_qd_search_bucket(hash, sdp, qid);</div><div class='ctx'> 	if (qd == NULL) {</div><div class='del'>-		new_qd-&gt;qd_lockref.count++;</div><div class='ctx'> 		*qdp = new_qd;</div><div class='ctx'> 		list_add(&amp;new_qd-&gt;qd_list, &amp;sdp-&gt;sd_quota_list);</div><div class='ctx'> 		hlist_bl_add_head_rcu(&amp;new_qd-&gt;qd_hlist, &amp;qd_hash_table[hash]);</div><div class='hunk'>@@ -319,11 +314,11 @@ static int qd_get(struct gfs2_sbd *sdp, struct kqid qid,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void qd_hold(struct gfs2_quota_data *qd)</div><div class='add'>+static void __qd_hold(struct gfs2_quota_data *qd)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = qd-&gt;qd_sbd;</div><div class='del'>-	gfs2_assert(sdp, !__lockref_is_dead(&amp;qd-&gt;qd_lockref));</div><div class='del'>-	lockref_get(&amp;qd-&gt;qd_lockref);</div><div class='add'>+	gfs2_assert(sdp, qd-&gt;qd_lockref.count &gt; 0);</div><div class='add'>+	qd-&gt;qd_lockref.count++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qd_put(struct gfs2_quota_data *qd)</div><div class='hunk'>@@ -400,16 +395,17 @@ static int bh_get(struct gfs2_quota_data *qd)</div><div class='ctx'> 	struct inode *inode = sdp-&gt;sd_qc_inode;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	unsigned int block, offset;</div><div class='del'>-	struct buffer_head *bh;</div><div class='add'>+	struct buffer_head *bh = NULL;</div><div class='ctx'> 	struct iomap iomap = { };</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='del'>-</div><div class='del'>-	if (qd-&gt;qd_bh_count++) {</div><div class='del'>-		mutex_unlock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	if (qd-&gt;qd_bh_count) {</div><div class='add'>+		qd-&gt;qd_bh_count++;</div><div class='add'>+		spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> </div><div class='ctx'> 	block = qd-&gt;qd_slot / sdp-&gt;sd_qc_per_block;</div><div class='ctx'> 	offset = qd-&gt;qd_slot % sdp-&gt;sd_qc_per_block;</div><div class='hunk'>@@ -418,122 +414,83 @@ static int bh_get(struct gfs2_quota_data *qd)</div><div class='ctx'> 			       (loff_t)block &lt;&lt; inode-&gt;i_blkbits,</div><div class='ctx'> 			       i_blocksize(inode), &amp;iomap);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto fail;</div><div class='add'>+		return error;</div><div class='ctx'> 	error = -ENOENT;</div><div class='ctx'> 	if (iomap.type != IOMAP_MAPPED)</div><div class='del'>-		goto fail;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = gfs2_meta_read(ip-&gt;i_gl, iomap.addr &gt;&gt; inode-&gt;i_blkbits,</div><div class='ctx'> 			       DIO_WAIT, 0, &amp;bh);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto fail;</div><div class='add'>+		return error;</div><div class='ctx'> 	error = -EIO;</div><div class='ctx'> 	if (gfs2_metatype_check(sdp, bh, GFS2_METATYPE_QC))</div><div class='del'>-		goto fail_brelse;</div><div class='del'>-</div><div class='del'>-	qd-&gt;qd_bh = bh;</div><div class='del'>-	qd-&gt;qd_bh_qc = (struct gfs2_quota_change *)</div><div class='del'>-		(bh-&gt;b_data + sizeof(struct gfs2_meta_header) +</div><div class='del'>-		 offset * sizeof(struct gfs2_quota_change));</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	if (qd-&gt;qd_bh == NULL) {</div><div class='add'>+		qd-&gt;qd_bh = bh;</div><div class='add'>+		qd-&gt;qd_bh_qc = (struct gfs2_quota_change *)</div><div class='add'>+			(bh-&gt;b_data + sizeof(struct gfs2_meta_header) +</div><div class='add'>+			 offset * sizeof(struct gfs2_quota_change));</div><div class='add'>+		bh = NULL;</div><div class='add'>+	}</div><div class='add'>+	qd-&gt;qd_bh_count++;</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	error = 0;</div><div class='ctx'> </div><div class='del'>-fail_brelse:</div><div class='add'>+out:</div><div class='ctx'> 	brelse(bh);</div><div class='del'>-fail:</div><div class='del'>-	qd-&gt;qd_bh_count--;</div><div class='del'>-	mutex_unlock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bh_put(struct gfs2_quota_data *qd)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = qd-&gt;qd_sbd;</div><div class='add'>+	struct buffer_head *bh = NULL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	gfs2_assert(sdp, qd-&gt;qd_bh_count);</div><div class='ctx'> 	if (!--qd-&gt;qd_bh_count) {</div><div class='del'>-		brelse(qd-&gt;qd_bh);</div><div class='add'>+		bh = qd-&gt;qd_bh;</div><div class='ctx'> 		qd-&gt;qd_bh = NULL;</div><div class='ctx'> 		qd-&gt;qd_bh_qc = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	brelse(bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qd_check_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd,</div><div class='del'>-			 u64 *sync_gen)</div><div class='add'>+static bool qd_grab_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd,</div><div class='add'>+			 u64 sync_gen)</div><div class='ctx'> {</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	if (test_bit(QDF_LOCKED, &amp;qd-&gt;qd_flags) ||</div><div class='ctx'> 	    !test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags) ||</div><div class='del'>-	    (sync_gen &amp;&amp; (qd-&gt;qd_sync_gen &gt;= *sync_gen)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If qd_change is 0 it means a pending quota change was negated.</div><div class='del'>-	 * We should not sync it, but we still have a qd reference and slot</div><div class='del'>-	 * reference taken by gfs2_quota_change -&gt; do_qc that need to be put.</div><div class='del'>-	 */</div><div class='del'>-	if (!qd-&gt;qd_change &amp;&amp; test_and_clear_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags)) {</div><div class='del'>-		slot_put(qd);</div><div class='del'>-		qd_put(qd);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	    qd-&gt;qd_sync_gen &gt;= sync_gen)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!lockref_get_not_dead(&amp;qd-&gt;qd_lockref))</div><div class='del'>-		return 0;</div><div class='add'>+	if (__lockref_is_dead(&amp;qd-&gt;qd_lockref))</div><div class='add'>+		goto out;</div><div class='add'>+	qd-&gt;qd_lockref.count++;</div><div class='ctx'> </div><div class='ctx'> 	list_move_tail(&amp;qd-&gt;qd_list, &amp;sdp-&gt;sd_quota_list);</div><div class='ctx'> 	set_bit(QDF_LOCKED, &amp;qd-&gt;qd_flags);</div><div class='ctx'> 	qd-&gt;qd_change_sync = qd-&gt;qd_change;</div><div class='ctx'> 	slot_hold(qd);</div><div class='del'>-	return 1;</div><div class='add'>+	ret = true;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qd_bh_get_or_undo(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd)</div><div class='add'>+static void qd_ungrab_sync(struct gfs2_quota_data *qd)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = bh_get(qd);</div><div class='del'>-	if (!error)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	clear_bit(QDF_LOCKED, &amp;qd-&gt;qd_flags);</div><div class='ctx'> 	slot_put(qd);</div><div class='ctx'> 	qd_put(qd);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_quota_data *qd = NULL, *iter;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	*qdp = NULL;</div><div class='del'>-</div><div class='del'>-	if (sb_rdonly(sdp-&gt;sd_vfs))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;qd_lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(iter, &amp;sdp-&gt;sd_quota_list, qd_list) {</div><div class='del'>-		if (qd_check_sync(sdp, iter, &amp;sdp-&gt;sd_quota_sync_gen)) {</div><div class='del'>-			qd = iter;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;qd_lock);</div><div class='del'>-</div><div class='del'>-	if (qd) {</div><div class='del'>-		error = qd_bh_get_or_undo(sdp, qd);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='del'>-		*qdp = qd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qdsb_put(struct gfs2_quota_data *qd)</div><div class='hunk'>@@ -545,8 +502,10 @@ static void qdsb_put(struct gfs2_quota_data *qd)</div><div class='ctx'> </div><div class='ctx'> static void qd_unlock(struct gfs2_quota_data *qd)</div><div class='ctx'> {</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	gfs2_assert_warn(qd-&gt;qd_sbd, test_bit(QDF_LOCKED, &amp;qd-&gt;qd_flags));</div><div class='ctx'> 	clear_bit(QDF_LOCKED, &amp;qd-&gt;qd_flags);</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	qdsb_put(qd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -710,48 +669,57 @@ static int sort_qd(const void *a, const void *b)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void do_qc(struct gfs2_quota_data *qd, s64 change, int qc_type)</div><div class='add'>+static void do_qc(struct gfs2_quota_data *qd, s64 change)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = qd-&gt;qd_sbd;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(sdp-&gt;sd_qc_inode);</div><div class='ctx'> 	struct gfs2_quota_change *qc = qd-&gt;qd_bh_qc;</div><div class='add'>+	bool needs_put = false;</div><div class='ctx'> 	s64 x;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='ctx'> 	gfs2_trans_add_meta(ip-&gt;i_gl, qd-&gt;qd_bh);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags)) {</div><div class='del'>-		qc-&gt;qc_change = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * The QDF_CHANGE flag indicates that the slot in the quota change file</div><div class='add'>+	 * is used.  Here, we use the value of qc-&gt;qc_change when the slot is</div><div class='add'>+	 * used, and we assume a value of 0 otherwise.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+</div><div class='add'>+	x = 0;</div><div class='add'>+	if (test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags))</div><div class='add'>+		x = be64_to_cpu(qc-&gt;qc_change);</div><div class='add'>+	x += change;</div><div class='add'>+	qd-&gt;qd_change += change;</div><div class='add'>+</div><div class='add'>+	if (!x &amp;&amp; test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags)) {</div><div class='add'>+		/* The slot in the quota change file becomes unused. */</div><div class='add'>+		clear_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags);</div><div class='add'>+		qc-&gt;qc_flags = 0;</div><div class='add'>+		qc-&gt;qc_id = 0;</div><div class='add'>+		needs_put = true;</div><div class='add'>+	} else if (x &amp;&amp; !test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags)) {</div><div class='add'>+		/* The slot in the quota change file becomes used. */</div><div class='add'>+		set_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags);</div><div class='add'>+		__qd_hold(qd);</div><div class='add'>+		slot_hold(qd);</div><div class='add'>+</div><div class='ctx'> 		qc-&gt;qc_flags = 0;</div><div class='ctx'> 		if (qd-&gt;qd_id.type == USRQUOTA)</div><div class='ctx'> 			qc-&gt;qc_flags = cpu_to_be32(GFS2_QCF_USER);</div><div class='ctx'> 		qc-&gt;qc_id = cpu_to_be32(from_kqid(&amp;init_user_ns, qd-&gt;qd_id));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	x = be64_to_cpu(qc-&gt;qc_change) + change;</div><div class='ctx'> 	qc-&gt;qc_change = cpu_to_be64(x);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;qd_lock);</div><div class='del'>-	qd-&gt;qd_change = x;</div><div class='del'>-	spin_unlock(&amp;qd_lock);</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> </div><div class='del'>-	if (qc_type == QC_CHANGE) {</div><div class='del'>-		if (!test_and_set_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags)) {</div><div class='del'>-			qd_hold(qd);</div><div class='del'>-			slot_hold(qd);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		gfs2_assert_warn(sdp, test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags));</div><div class='del'>-		clear_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags);</div><div class='del'>-		qc-&gt;qc_flags = 0;</div><div class='del'>-		qc-&gt;qc_id = 0;</div><div class='add'>+	if (needs_put) {</div><div class='ctx'> 		slot_put(qd);</div><div class='ctx'> 		qd_put(qd);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	if (change &lt; 0) /* Reset quiet flag if we freed some blocks */</div><div class='ctx'> 		clear_bit(QDF_QMSG_QUIET, &amp;qd-&gt;qd_flags);</div><div class='del'>-	mutex_unlock(&amp;sdp-&gt;sd_quota_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gfs2_write_buf_to_page(struct gfs2_sbd *sdp, unsigned long index,</div><div class='hunk'>@@ -890,6 +858,7 @@ static int gfs2_adjust_quota(struct gfs2_sbd *sdp, loff_t loc,</div><div class='ctx'> 	be64_add_cpu(&amp;q.qu_value, change);</div><div class='ctx'> 	if (((s64)be64_to_cpu(q.qu_value)) &lt; 0)</div><div class='ctx'> 		q.qu_value = 0; /* Never go negative on quota usage */</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	qd-&gt;qd_qb.qb_value = q.qu_value;</div><div class='ctx'> 	if (fdq) {</div><div class='ctx'> 		if (fdq-&gt;d_fieldmask &amp; QC_SPC_SOFT) {</div><div class='hunk'>@@ -905,6 +874,7 @@ static int gfs2_adjust_quota(struct gfs2_sbd *sdp, loff_t loc,</div><div class='ctx'> 			qd-&gt;qd_qb.qb_value = q.qu_value;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> </div><div class='ctx'> 	err = gfs2_write_disk_quota(sdp, &amp;q, loc);</div><div class='ctx'> 	if (!err) {</div><div class='hunk'>@@ -919,7 +889,8 @@ static int gfs2_adjust_quota(struct gfs2_sbd *sdp, loff_t loc,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)</div><div class='add'>+static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda,</div><div class='add'>+		   u64 sync_gen)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = (*qda)-&gt;qd_sbd;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(sdp-&gt;sd_quota_inode);</div><div class='hunk'>@@ -992,7 +963,7 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out_end_trans;</div><div class='ctx'> </div><div class='del'>-		do_qc(qd, -qd-&gt;qd_change_sync, QC_SYNC);</div><div class='add'>+		do_qc(qd, -qd-&gt;qd_change_sync);</div><div class='ctx'> 		set_bit(QDF_REFRESH, &amp;qd-&gt;qd_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1010,8 +981,13 @@ out_dq:</div><div class='ctx'> 	gfs2_log_flush(ip-&gt;i_gl-&gt;gl_name.ln_sbd, ip-&gt;i_gl,</div><div class='ctx'> 		       GFS2_LOG_HEAD_FLUSH_NORMAL | GFS2_LFC_DO_SYNC);</div><div class='ctx'> 	if (!error) {</div><div class='del'>-		for (x = 0; x &lt; num_qd; x++)</div><div class='del'>-			qda[x]-&gt;qd_sync_gen = sdp-&gt;sd_quota_sync_gen;</div><div class='add'>+		for (x = 0; x &lt; num_qd; x++) {</div><div class='add'>+			qd = qda[x];</div><div class='add'>+			spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+			if (qd-&gt;qd_sync_gen &lt; sync_gen)</div><div class='add'>+				qd-&gt;qd_sync_gen = sync_gen;</div><div class='add'>+			spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -1036,7 +1012,9 @@ static int update_qd(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd)</div><div class='ctx'> 	qlvb-&gt;qb_limit = q.qu_limit;</div><div class='ctx'> 	qlvb-&gt;qb_warn = q.qu_warn;</div><div class='ctx'> 	qlvb-&gt;qb_value = q.qu_value;</div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	qd-&gt;qd_qb = *qlvb;</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1058,7 +1036,9 @@ restart:</div><div class='ctx'> 	if (test_and_clear_bit(QDF_REFRESH, &amp;qd-&gt;qd_flags))</div><div class='ctx'> 		force_refresh = FORCE;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	qd-&gt;qd_qb = *(struct gfs2_quota_lvb *)qd-&gt;qd_gl-&gt;gl_lksb.sb_lvbptr;</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> </div><div class='ctx'> 	if (force_refresh || qd-&gt;qd_qb.qb_magic != cpu_to_be32(GFS2_MAGIC)) {</div><div class='ctx'> 		gfs2_glock_dq_uninit(q_gh);</div><div class='hunk'>@@ -1129,35 +1109,36 @@ static bool need_sync(struct gfs2_quota_data *qd)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = qd-&gt;qd_sbd;</div><div class='ctx'> 	struct gfs2_tune *gt = &amp;sdp-&gt;sd_tune;</div><div class='del'>-	s64 value;</div><div class='add'>+	s64 value, change, limit;</div><div class='ctx'> 	unsigned int num, den;</div><div class='add'>+	int ret = false;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 	if (!qd-&gt;qd_qb.qb_limit)</div><div class='del'>-		return false;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;qd_lock);</div><div class='del'>-	value = qd-&gt;qd_change;</div><div class='del'>-	spin_unlock(&amp;qd_lock);</div><div class='add'>+	change = qd-&gt;qd_change;</div><div class='add'>+	if (change &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+	value = (s64)be64_to_cpu(qd-&gt;qd_qb.qb_value);</div><div class='add'>+	limit = (s64)be64_to_cpu(qd-&gt;qd_qb.qb_limit);</div><div class='add'>+	if (value &gt;= limit)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gt-&gt;gt_spin);</div><div class='ctx'> 	num = gt-&gt;gt_quota_scale_num;</div><div class='ctx'> 	den = gt-&gt;gt_quota_scale_den;</div><div class='ctx'> 	spin_unlock(&amp;gt-&gt;gt_spin);</div><div class='ctx'> </div><div class='del'>-	if (value &lt;= 0)</div><div class='del'>-		return false;</div><div class='del'>-	else if ((s64)be64_to_cpu(qd-&gt;qd_qb.qb_value) &gt;=</div><div class='del'>-		 (s64)be64_to_cpu(qd-&gt;qd_qb.qb_limit))</div><div class='del'>-		return false;</div><div class='del'>-	else {</div><div class='del'>-		value *= gfs2_jindex_size(sdp) * num;</div><div class='del'>-		value = div_s64(value, den);</div><div class='del'>-		value += (s64)be64_to_cpu(qd-&gt;qd_qb.qb_value);</div><div class='del'>-		if (value &lt; (s64)be64_to_cpu(qd-&gt;qd_qb.qb_limit))</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='add'>+	change *= gfs2_jindex_size(sdp) * num;</div><div class='add'>+	change = div_s64(change, den);</div><div class='add'>+	if (value + change &lt; limit)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	ret = true;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void gfs2_quota_unlock(struct gfs2_inode *ip)</div><div class='hunk'>@@ -1166,7 +1147,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)</div><div class='ctx'> 	struct gfs2_quota_data *qda[2 * GFS2_MAXQUOTAS];</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	u32 x;</div><div class='del'>-	int found;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_clear_bit(GIF_QD_LOCKED, &amp;ip-&gt;i_flags))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1174,6 +1154,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)</div><div class='ctx'> 	for (x = 0; x &lt; ip-&gt;i_qadata-&gt;qa_qd_num; x++) {</div><div class='ctx'> 		struct gfs2_quota_data *qd;</div><div class='ctx'> 		bool sync;</div><div class='add'>+		int error;</div><div class='ctx'> </div><div class='ctx'> 		qd = ip-&gt;i_qadata-&gt;qa_qd[x];</div><div class='ctx'> 		sync = need_sync(qd);</div><div class='hunk'>@@ -1183,18 +1164,26 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;qd_lock);</div><div class='del'>-		found = qd_check_sync(sdp, qd, NULL);</div><div class='add'>+		sync = qd_grab_sync(sdp, qd, U64_MAX);</div><div class='ctx'> 		spin_unlock(&amp;qd_lock);</div><div class='ctx'> </div><div class='del'>-		if (!found)</div><div class='add'>+		if (!sync)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!qd_bh_get_or_undo(sdp, qd))</div><div class='del'>-			qda[count++] = qd;</div><div class='add'>+		gfs2_assert_warn(sdp, qd-&gt;qd_change_sync);</div><div class='add'>+		error = bh_get(qd);</div><div class='add'>+		if (error) {</div><div class='add'>+			qd_ungrab_sync(qd);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		qda[count++] = qd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (count) {</div><div class='del'>-		do_sync(count, qda);</div><div class='add'>+		u64 sync_gen = READ_ONCE(sdp-&gt;sd_quota_sync_gen);</div><div class='add'>+</div><div class='add'>+		do_sync(count, qda, sync_gen);</div><div class='ctx'> 		for (x = 0; x &lt; count; x++)</div><div class='ctx'> 			qd_unlock(qda[x]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1253,12 +1242,12 @@ int gfs2_quota_check(struct gfs2_inode *ip, kuid_t uid, kgid_t gid,</div><div class='ctx'> 		      qid_eq(qd-&gt;qd_id, make_kqid_gid(gid))))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		spin_lock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> 		warn = (s64)be64_to_cpu(qd-&gt;qd_qb.qb_warn);</div><div class='ctx'> 		limit = (s64)be64_to_cpu(qd-&gt;qd_qb.qb_limit);</div><div class='ctx'> 		value = (s64)be64_to_cpu(qd-&gt;qd_qb.qb_value);</div><div class='del'>-		spin_lock(&amp;qd_lock);</div><div class='ctx'> 		value += qd-&gt;qd_change;</div><div class='del'>-		spin_unlock(&amp;qd_lock);</div><div class='add'>+		spin_unlock(&amp;qd-&gt;qd_lockref.lock);</div><div class='ctx'> </div><div class='ctx'> 		if (limit &gt; 0 &amp;&amp; (limit - value) &lt; ap-&gt;allowed)</div><div class='ctx'> 			ap-&gt;allowed = limit - value;</div><div class='hunk'>@@ -1312,39 +1301,20 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change,</div><div class='ctx'> </div><div class='ctx'> 		if (qid_eq(qd-&gt;qd_id, make_kqid_uid(uid)) ||</div><div class='ctx'> 		    qid_eq(qd-&gt;qd_id, make_kqid_gid(gid))) {</div><div class='del'>-			do_qc(qd, change, QC_CHANGE);</div><div class='add'>+			do_qc(qd, change);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool qd_changed(struct gfs2_sbd *sdp)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_quota_data *qd;</div><div class='del'>-	bool changed = false;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;qd_lock);</div><div class='del'>-	list_for_each_entry(qd, &amp;sdp-&gt;sd_quota_list, qd_list) {</div><div class='del'>-		if (test_bit(QDF_LOCKED, &amp;qd-&gt;qd_flags) ||</div><div class='del'>-		    !test_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		changed = true;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;qd_lock);</div><div class='del'>-	return changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int gfs2_quota_sync(struct super_block *sb, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct gfs2_quota_data **qda;</div><div class='ctx'> 	unsigned int max_qd = PAGE_SIZE / sizeof(struct gfs2_holder);</div><div class='del'>-	unsigned int num_qd;</div><div class='del'>-	unsigned int x;</div><div class='add'>+	u64 sync_gen;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='del'>-	if (!qd_changed(sdp))</div><div class='add'>+	if (sb_rdonly(sdp-&gt;sd_vfs))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	qda = kcalloc(max_qd, sizeof(struct gfs2_quota_data *), GFP_KERNEL);</div><div class='hunk'>@@ -1352,27 +1322,44 @@ int gfs2_quota_sync(struct super_block *sb, int type)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sdp-&gt;sd_quota_sync_mutex);</div><div class='del'>-	sdp-&gt;sd_quota_sync_gen++;</div><div class='add'>+	sync_gen = sdp-&gt;sd_quota_sync_gen + 1;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		num_qd = 0;</div><div class='add'>+		struct gfs2_quota_data *iter;</div><div class='add'>+		unsigned int num_qd = 0;</div><div class='add'>+		unsigned int x;</div><div class='ctx'> </div><div class='del'>-		for (;;) {</div><div class='del'>-			error = qd_fish(sdp, qda + num_qd);</div><div class='del'>-			if (error || !qda[num_qd])</div><div class='del'>-				break;</div><div class='del'>-			if (++num_qd == max_qd)</div><div class='del'>-				break;</div><div class='add'>+		spin_lock(&amp;qd_lock);</div><div class='add'>+		list_for_each_entry(iter, &amp;sdp-&gt;sd_quota_list, qd_list) {</div><div class='add'>+			if (qd_grab_sync(sdp, iter, sync_gen)) {</div><div class='add'>+				qda[num_qd++] = iter;</div><div class='add'>+				if (num_qd == max_qd)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock(&amp;qd_lock);</div><div class='ctx'> </div><div class='del'>-		if (num_qd) {</div><div class='add'>+		if (!num_qd)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		for (x = 0; x &lt; num_qd; x++) {</div><div class='add'>+			error = bh_get(qda[x]);</div><div class='ctx'> 			if (!error)</div><div class='del'>-				error = do_sync(num_qd, qda);</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-			for (x = 0; x &lt; num_qd; x++)</div><div class='del'>-				qd_unlock(qda[x]);</div><div class='add'>+			while (x &lt; num_qd)</div><div class='add'>+				qd_ungrab_sync(qda[--num_qd]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!error) {</div><div class='add'>+			WRITE_ONCE(sdp-&gt;sd_quota_sync_gen, sync_gen);</div><div class='add'>+			error = do_sync(num_qd, qda, sync_gen);</div><div class='ctx'> 		}</div><div class='del'>-	} while (!error &amp;&amp; num_qd == max_qd);</div><div class='add'>+</div><div class='add'>+		for (x = 0; x &lt; num_qd; x++)</div><div class='add'>+			qd_unlock(qda[x]);</div><div class='add'>+	} while (!error);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;sdp-&gt;sd_quota_sync_mutex);</div><div class='ctx'> 	kfree(qda);</div><div class='hunk'>@@ -1407,6 +1394,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)</div><div class='ctx'> 	unsigned int found = 0;</div><div class='ctx'> 	unsigned int hash;</div><div class='ctx'> 	unsigned int bm_size;</div><div class='add'>+	struct buffer_head *bh;</div><div class='ctx'> 	u64 dblock;</div><div class='ctx'> 	u32 extlen = 0;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -1426,8 +1414,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	for (x = 0; x &lt; blocks; x++) {</div><div class='del'>-		struct buffer_head *bh;</div><div class='del'>-		const struct gfs2_quota_change *qc;</div><div class='add'>+		struct gfs2_quota_change *qc;</div><div class='ctx'> 		unsigned int y;</div><div class='ctx'> </div><div class='ctx'> 		if (!extlen) {</div><div class='hunk'>@@ -1440,15 +1427,13 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)</div><div class='ctx'> 		bh = gfs2_meta_ra(ip-&gt;i_gl, dblock, extlen);</div><div class='ctx'> 		if (!bh)</div><div class='ctx'> 			goto fail;</div><div class='del'>-		if (gfs2_metatype_check(sdp, bh, GFS2_METATYPE_QC)) {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='add'>+		if (gfs2_metatype_check(sdp, bh, GFS2_METATYPE_QC))</div><div class='add'>+			goto fail_brelse;</div><div class='ctx'> </div><div class='del'>-		qc = (const struct gfs2_quota_change *)(bh-&gt;b_data + sizeof(struct gfs2_meta_header));</div><div class='add'>+		qc = (struct gfs2_quota_change *)(bh-&gt;b_data + sizeof(struct gfs2_meta_header));</div><div class='ctx'> 		for (y = 0; y &lt; sdp-&gt;sd_qc_per_block &amp;&amp; slot &lt; sdp-&gt;sd_quota_slots;</div><div class='ctx'> 		     y++, slot++) {</div><div class='del'>-			struct gfs2_quota_data *qd;</div><div class='add'>+			struct gfs2_quota_data *old_qd, *qd;</div><div class='ctx'> 			s64 qc_change = be64_to_cpu(qc-&gt;qc_change);</div><div class='ctx'> 			u32 qc_flags = be32_to_cpu(qc-&gt;qc_flags);</div><div class='ctx'> 			enum quota_type qtype = (qc_flags &amp; GFS2_QCF_USER) ?</div><div class='hunk'>@@ -1461,29 +1446,51 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)</div><div class='ctx'> </div><div class='ctx'> 			hash = gfs2_qd_hash(sdp, qc_id);</div><div class='ctx'> 			qd = qd_alloc(hash, sdp, qc_id);</div><div class='del'>-			if (qd == NULL) {</div><div class='del'>-				brelse(bh);</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='add'>+			if (qd == NULL)</div><div class='add'>+				goto fail_brelse;</div><div class='ctx'> </div><div class='add'>+			qd-&gt;qd_lockref.count = 0;</div><div class='ctx'> 			set_bit(QDF_CHANGE, &amp;qd-&gt;qd_flags);</div><div class='ctx'> 			qd-&gt;qd_change = qc_change;</div><div class='ctx'> 			qd-&gt;qd_slot = slot;</div><div class='ctx'> 			qd-&gt;qd_slot_ref = 1;</div><div class='ctx'> </div><div class='ctx'> 			spin_lock(&amp;qd_lock);</div><div class='add'>+			spin_lock_bucket(hash);</div><div class='add'>+			old_qd = gfs2_qd_search_bucket(hash, sdp, qc_id);</div><div class='add'>+			if (old_qd) {</div><div class='add'>+				fs_err(sdp, "Corruption found in quota_change%u"</div><div class='add'>+					    "file: duplicate identifier in "</div><div class='add'>+					    "slot %u\n",</div><div class='add'>+					    sdp-&gt;sd_jdesc-&gt;jd_jid, slot);</div><div class='add'>+</div><div class='add'>+				spin_unlock_bucket(hash);</div><div class='add'>+				spin_unlock(&amp;qd_lock);</div><div class='add'>+				qd_put(old_qd);</div><div class='add'>+</div><div class='add'>+				gfs2_glock_put(qd-&gt;qd_gl);</div><div class='add'>+				kmem_cache_free(gfs2_quotad_cachep, qd);</div><div class='add'>+</div><div class='add'>+				/* zero out the duplicate slot */</div><div class='add'>+				lock_buffer(bh);</div><div class='add'>+				memset(qc, 0, sizeof(*qc));</div><div class='add'>+				mark_buffer_dirty(bh);</div><div class='add'>+				unlock_buffer(bh);</div><div class='add'>+</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			BUG_ON(test_and_set_bit(slot, sdp-&gt;sd_quota_bitmap));</div><div class='ctx'> 			list_add(&amp;qd-&gt;qd_list, &amp;sdp-&gt;sd_quota_list);</div><div class='ctx'> 			atomic_inc(&amp;sdp-&gt;sd_quota_count);</div><div class='del'>-			spin_unlock(&amp;qd_lock);</div><div class='del'>-</div><div class='del'>-			spin_lock_bucket(hash);</div><div class='ctx'> 			hlist_bl_add_head_rcu(&amp;qd-&gt;qd_hlist, &amp;qd_hash_table[hash]);</div><div class='ctx'> 			spin_unlock_bucket(hash);</div><div class='add'>+			spin_unlock(&amp;qd_lock);</div><div class='ctx'> </div><div class='ctx'> 			found++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (buffer_dirty(bh))</div><div class='add'>+			sync_dirty_buffer(bh);</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		dblock++;</div><div class='ctx'> 		extlen--;</div><div class='hunk'>@@ -1494,6 +1501,10 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+fail_brelse:</div><div class='add'>+	if (buffer_dirty(bh))</div><div class='add'>+		sync_dirty_buffer(bh);</div><div class='add'>+	brelse(bh);</div><div class='ctx'> fail:</div><div class='ctx'> 	gfs2_quota_cleanup(sdp);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -1540,27 +1551,13 @@ static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error)</div><div class='ctx'> {</div><div class='ctx'> 	if (error == 0 || error == -EROFS)</div><div class='ctx'> 		return;</div><div class='del'>-	if (!gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (!gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		if (!cmpxchg(&amp;sdp-&gt;sd_log_error, 0, error))</div><div class='ctx'> 			fs_err(sdp, "gfs2_quotad: %s error %d\n", msg, error);</div><div class='ctx'> 		wake_up(&amp;sdp-&gt;sd_logd_waitq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void quotad_check_timeo(struct gfs2_sbd *sdp, const char *msg,</div><div class='del'>-			       int (*fxn)(struct super_block *sb, int type),</div><div class='del'>-			       unsigned long t, unsigned long *timeo,</div><div class='del'>-			       unsigned int *new_timeo)</div><div class='del'>-{</div><div class='del'>-	if (t &gt;= *timeo) {</div><div class='del'>-		int error = fxn(sdp-&gt;sd_vfs, 0);</div><div class='del'>-		quotad_error(sdp, msg, error);</div><div class='del'>-		*timeo = gfs2_tune_get_i(&amp;sdp-&gt;sd_tune, new_timeo) * HZ;</div><div class='del'>-	} else {</div><div class='del'>-		*timeo -= t;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void gfs2_wake_up_statfs(struct gfs2_sbd *sdp) {</div><div class='ctx'> 	if (!sdp-&gt;sd_statfs_force_sync) {</div><div class='ctx'> 		sdp-&gt;sd_statfs_force_sync = 1;</div><div class='hunk'>@@ -1578,36 +1575,46 @@ void gfs2_wake_up_statfs(struct gfs2_sbd *sdp) {</div><div class='ctx'> int gfs2_quotad(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = data;</div><div class='del'>-	struct gfs2_tune *tune = &amp;sdp-&gt;sd_tune;</div><div class='del'>-	unsigned long statfs_timeo = 0;</div><div class='del'>-	unsigned long quotad_timeo = 0;</div><div class='del'>-	unsigned long t = 0;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	unsigned long statfs_deadline = now;</div><div class='add'>+	unsigned long quotad_deadline = now;</div><div class='ctx'> </div><div class='ctx'> 	set_freezable();</div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='del'>-		if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+		unsigned long t;</div><div class='add'>+</div><div class='add'>+		if (gfs2_withdrawn(sdp))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* Update the master statfs file */</div><div class='del'>-		if (sdp-&gt;sd_statfs_force_sync) {</div><div class='del'>-			int error = gfs2_statfs_sync(sdp-&gt;sd_vfs, 0);</div><div class='add'>+		now = jiffies;</div><div class='add'>+		if (sdp-&gt;sd_statfs_force_sync ||</div><div class='add'>+		    time_after(now, statfs_deadline)) {</div><div class='add'>+			unsigned int quantum;</div><div class='add'>+			int error;</div><div class='add'>+</div><div class='add'>+			/* Update the master statfs file */</div><div class='add'>+			error = gfs2_statfs_sync(sdp-&gt;sd_vfs, 0);</div><div class='ctx'> 			quotad_error(sdp, "statfs", error);</div><div class='del'>-			statfs_timeo = gfs2_tune_get(sdp, gt_statfs_quantum) * HZ;</div><div class='add'>+</div><div class='add'>+			quantum = gfs2_tune_get(sdp, gt_statfs_quantum);</div><div class='add'>+			statfs_deadline = now + quantum * HZ;</div><div class='ctx'> 		}</div><div class='del'>-		else</div><div class='del'>-			quotad_check_timeo(sdp, "statfs", gfs2_statfs_sync, t,</div><div class='del'>-				   	   &amp;statfs_timeo,</div><div class='del'>-					   &amp;tune-&gt;gt_statfs_quantum);</div><div class='add'>+		if (time_after(now, quotad_deadline)) {</div><div class='add'>+			unsigned int quantum;</div><div class='add'>+			int error;</div><div class='ctx'> </div><div class='del'>-		/* Update quota file */</div><div class='del'>-		quotad_check_timeo(sdp, "sync", gfs2_quota_sync, t,</div><div class='del'>-				   &amp;quotad_timeo, &amp;tune-&gt;gt_quota_quantum);</div><div class='add'>+			/* Update the quota file */</div><div class='add'>+			error = gfs2_quota_sync(sdp-&gt;sd_vfs, 0);</div><div class='add'>+			quotad_error(sdp, "sync", error);</div><div class='ctx'> </div><div class='del'>-		t = min(quotad_timeo, statfs_timeo);</div><div class='add'>+			quantum = gfs2_tune_get(sdp, gt_quota_quantum);</div><div class='add'>+			quotad_deadline = now + quantum * HZ;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		t = wait_event_freezable_timeout(sdp-&gt;sd_quota_wait,</div><div class='add'>+		t = min(statfs_deadline - now, quotad_deadline - now);</div><div class='add'>+		wait_event_freezable_timeout(sdp-&gt;sd_quota_wait,</div><div class='ctx'> 				sdp-&gt;sd_statfs_force_sync ||</div><div class='del'>-				gfs2_withdrawing_or_withdrawn(sdp) ||</div><div class='add'>+				gfs2_withdrawn(sdp) ||</div><div class='ctx'> 				kthread_should_stop(),</div><div class='ctx'> 				t);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/quota.h b/fs/gfs2/quota.h<br/>index f462d9cb3087..988f38dc5b2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/quota.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/quota.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/quota.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/quota.h</a></div><div class='hunk'>@@ -44,8 +44,8 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ap-&gt;allowed = UINT_MAX; /* Assume we are permitted a whole lot */</div><div class='del'>-	if (capable(CAP_SYS_RESOURCE) ||</div><div class='del'>-	    sdp-&gt;sd_args.ar_quota == GFS2_QUOTA_OFF)</div><div class='add'>+	if (sdp-&gt;sd_args.ar_quota == GFS2_QUOTA_OFF ||</div><div class='add'>+	    capable(CAP_SYS_RESOURCE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c<br/>index f4fe7039f725..8c8202c68b64 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/recovery.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/recovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/recovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/recovery.c</a></div><div class='hunk'>@@ -118,6 +118,7 @@ void gfs2_revoke_clean(struct gfs2_jdesc *jd)</div><div class='ctx'> int __get_log_header(struct gfs2_sbd *sdp, const struct gfs2_log_header *lh,</div><div class='ctx'> 		     unsigned int blkno, struct gfs2_log_header_host *head)</div><div class='ctx'> {</div><div class='add'>+	const u32 zero = 0;</div><div class='ctx'> 	u32 hash, crc;</div><div class='ctx'> </div><div class='ctx'> 	if (lh-&gt;lh_header.mh_magic != cpu_to_be32(GFS2_MAGIC) ||</div><div class='hunk'>@@ -126,7 +127,7 @@ int __get_log_header(struct gfs2_sbd *sdp, const struct gfs2_log_header *lh,</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	hash = crc32(~0, lh, LH_V1_SIZE - 4);</div><div class='del'>-	hash = ~crc32_le_shift(hash, 4); /* assume lh_hash is zero */</div><div class='add'>+	hash = ~crc32(hash, &amp;zero, 4); /* assume lh_hash is zero */</div><div class='ctx'> </div><div class='ctx'> 	if (be32_to_cpu(lh-&gt;lh_hash) != hash)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -263,16 +264,12 @@ static void clean_journal(struct gfs2_jdesc *jd,</div><div class='ctx'> 			  struct gfs2_log_header_host *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(jd-&gt;jd_inode);</div><div class='del'>-	u32 lblock = head-&gt;lh_blkno;</div><div class='ctx'> </div><div class='del'>-	gfs2_replay_incr_blk(jd, &amp;lblock);</div><div class='del'>-	gfs2_write_log_header(sdp, jd, head-&gt;lh_sequence + 1, 0, lblock,</div><div class='add'>+	gfs2_replay_incr_blk(jd, &amp;head-&gt;lh_blkno);</div><div class='add'>+	head-&gt;lh_sequence++;</div><div class='add'>+	gfs2_write_log_header(sdp, jd, head-&gt;lh_sequence, 0, head-&gt;lh_blkno,</div><div class='ctx'> 			      GFS2_LOG_HEAD_UNMOUNT | GFS2_LOG_HEAD_RECOVERY,</div><div class='ctx'> 			      REQ_PREFLUSH | REQ_FUA | REQ_META | REQ_SYNC);</div><div class='del'>-	if (jd-&gt;jd_jid == sdp-&gt;sd_lockstruct.ls_jid) {</div><div class='del'>-		sdp-&gt;sd_log_flush_head = lblock;</div><div class='del'>-		gfs2_log_incr_head(sdp);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +408,7 @@ void gfs2_recover_func(struct work_struct *work)</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	int jlocked = 0;</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		fs_err(sdp, "jid=%u: Recovery not attempted due to withdraw.\n",</div><div class='ctx'> 		       jd-&gt;jd_jid);</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -427,7 +424,8 @@ void gfs2_recover_func(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		error = gfs2_glock_nq_num(sdp, jd-&gt;jd_jid, &amp;gfs2_journal_glops,</div><div class='ctx'> 					  LM_ST_EXCLUSIVE,</div><div class='del'>-					  LM_FLAG_NOEXP | LM_FLAG_TRY | GL_NOCACHE,</div><div class='add'>+					  LM_FLAG_RECOVER | LM_FLAG_TRY |</div><div class='add'>+					  GL_NOCACHE,</div><div class='ctx'> 					  &amp;j_gh);</div><div class='ctx'> 		switch (error) {</div><div class='ctx'> 		case 0:</div><div class='hunk'>@@ -443,7 +441,8 @@ void gfs2_recover_func(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		error = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_SHARED,</div><div class='del'>-					   LM_FLAG_NOEXP | GL_NOCACHE, &amp;ji_gh);</div><div class='add'>+					   LM_FLAG_RECOVER | GL_NOCACHE,</div><div class='add'>+					   &amp;ji_gh);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto fail_gunlock_j;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -457,7 +456,7 @@ void gfs2_recover_func(struct work_struct *work)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail_gunlock_ji;</div><div class='ctx'> </div><div class='del'>-	error = gfs2_find_jhead(jd, &amp;head, true);</div><div class='add'>+	error = gfs2_find_jhead(jd, &amp;head);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail_gunlock_ji;</div><div class='ctx'> 	t_jhd = ktime_get();</div><div class='hunk'>@@ -533,6 +532,9 @@ void gfs2_recover_func(struct work_struct *work)</div><div class='ctx'> 			ktime_ms_delta(t_rep, t_tlck));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (jd-&gt;jd_jid == sdp-&gt;sd_lockstruct.ls_jid)</div><div class='add'>+		gfs2_log_pointers_init(sdp, &amp;head);</div><div class='add'>+</div><div class='ctx'> 	gfs2_recovery_done(sdp, jd-&gt;jd_jid, LM_RD_SUCCESS);</div><div class='ctx'> </div><div class='ctx'> 	if (jlocked) {</div><div class='hunk'>@@ -580,3 +582,13 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd, bool wait)</div><div class='ctx'> 	return wait ? jd-&gt;jd_recover_error : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void gfs2_log_pointers_init(struct gfs2_sbd *sdp,</div><div class='add'>+			    struct gfs2_log_header_host *head)</div><div class='add'>+{</div><div class='add'>+	sdp-&gt;sd_log_sequence = head-&gt;lh_sequence + 1;</div><div class='add'>+	gfs2_replay_incr_blk(sdp-&gt;sd_jdesc, &amp;head-&gt;lh_blkno);</div><div class='add'>+	sdp-&gt;sd_log_tail = head-&gt;lh_blkno;</div><div class='add'>+	sdp-&gt;sd_log_flush_head = head-&gt;lh_blkno;</div><div class='add'>+	sdp-&gt;sd_log_flush_tail = head-&gt;lh_blkno;</div><div class='add'>+	sdp-&gt;sd_log_head = head-&gt;lh_blkno;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/gfs2/recovery.h b/fs/gfs2/recovery.h<br/>index 6a0fd42e1120..5a5ba72ecd75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/recovery.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/recovery.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/recovery.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/recovery.h</a></div><div class='hunk'>@@ -29,6 +29,8 @@ void gfs2_recover_func(struct work_struct *work);</div><div class='ctx'> int __get_log_header(struct gfs2_sbd *sdp,</div><div class='ctx'> 		     const struct gfs2_log_header *lh, unsigned int blkno,</div><div class='ctx'> 		     struct gfs2_log_header_host *head);</div><div class='add'>+void gfs2_log_pointers_init(struct gfs2_sbd *sdp,</div><div class='add'>+			    struct gfs2_log_header_host *head);</div><div class='ctx'> </div><div class='ctx'> #endif /* __RECOVERY_DOT_H__ */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c<br/>index 26d6c1eea559..b14e54b38ee8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/rgrp.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/rgrp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/rgrp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/rgrp.c</a></div><div class='hunk'>@@ -814,11 +814,11 @@ static int compute_bitstructs(struct gfs2_rgrpd *rgd)</div><div class='ctx'> 	bi = rgd-&gt;rd_bits + (length - 1);</div><div class='ctx'> 	if ((bi-&gt;bi_start + bi-&gt;bi_bytes) * GFS2_NBBY != rgd-&gt;rd_data) {</div><div class='ctx'> 		gfs2_lm(sdp,</div><div class='del'>-			"ri_addr = %llu\n"</div><div class='del'>-			"ri_length = %u\n"</div><div class='del'>-			"ri_data0 = %llu\n"</div><div class='del'>-			"ri_data = %u\n"</div><div class='del'>-			"ri_bitbytes = %u\n"</div><div class='add'>+			"ri_addr=%llu "</div><div class='add'>+			"ri_length=%u "</div><div class='add'>+			"ri_data0=%llu "</div><div class='add'>+			"ri_data=%u "</div><div class='add'>+			"ri_bitbytes=%u "</div><div class='ctx'> 			"start=%u len=%u offset=%u\n",</div><div class='ctx'> 			(unsigned long long)rgd-&gt;rd_addr,</div><div class='ctx'> 			rgd-&gt;rd_length,</div><div class='hunk'>@@ -1879,7 +1879,7 @@ static void try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked, u64 skip</div><div class='ctx'> 		 */</div><div class='ctx'> 		ip = gl-&gt;gl_object;</div><div class='ctx'> </div><div class='del'>-		if (ip || !gfs2_queue_try_to_evict(gl))</div><div class='add'>+		if (ip || !gfs2_queue_verify_delete(gl, false))</div><div class='ctx'> 			gfs2_glock_put(gl);</div><div class='ctx'> 		else</div><div class='ctx'> 			found++;</div><div class='hunk'>@@ -1987,10 +1987,8 @@ static bool gfs2_rgrp_used_recently(const struct gfs2_blkreserv *rs,</div><div class='ctx'> static u32 gfs2_orlov_skip(const struct gfs2_inode *ip)</div><div class='ctx'> {</div><div class='ctx'> 	const struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='del'>-	u32 skip;</div><div class='ctx'> </div><div class='del'>-	get_random_bytes(&amp;skip, sizeof(skip));</div><div class='del'>-	return skip % sdp-&gt;sd_rgrps;</div><div class='add'>+	return get_random_u32() % sdp-&gt;sd_rgrps;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool gfs2_select_rgrp(struct gfs2_rgrpd **pos, const struct gfs2_rgrpd *begin)</div><div class='head'>diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c<br/>index e5f79466340d..f6cd907b3ec6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/super.c</a></div><div class='hunk'>@@ -44,10 +44,10 @@</div><div class='ctx'> #include "xattr.h"</div><div class='ctx'> #include "lops.h"</div><div class='ctx'> </div><div class='del'>-enum dinode_demise {</div><div class='del'>-	SHOULD_DELETE_DINODE,</div><div class='del'>-	SHOULD_NOT_DELETE_DINODE,</div><div class='del'>-	SHOULD_DEFER_EVICTION,</div><div class='add'>+enum evict_behavior {</div><div class='add'>+	EVICT_SHOULD_DELETE,</div><div class='add'>+	EVICT_SHOULD_SKIP_DELETE,</div><div class='add'>+	EVICT_SHOULD_DEFER_DELETE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -67,9 +67,13 @@ void gfs2_jindex_free(struct gfs2_sbd *sdp)</div><div class='ctx'> 	sdp-&gt;sd_journals = 0;</div><div class='ctx'> 	spin_unlock(&amp;sdp-&gt;sd_jindex_spin);</div><div class='ctx'> </div><div class='add'>+	down_write(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='ctx'> 	sdp-&gt;sd_jdesc = NULL;</div><div class='add'>+	up_write(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='add'>+</div><div class='ctx'> 	while (!list_empty(&amp;list)) {</div><div class='ctx'> 		jd = list_first_entry(&amp;list, struct gfs2_jdesc, jd_list);</div><div class='add'>+		BUG_ON(jd-&gt;jd_log_bio);</div><div class='ctx'> 		gfs2_free_journal_extents(jd);</div><div class='ctx'> 		list_del(&amp;jd-&gt;jd_list);</div><div class='ctx'> 		iput(jd-&gt;jd_inode);</div><div class='hunk'>@@ -130,30 +134,20 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(sdp-&gt;sd_jdesc-&gt;jd_inode);</div><div class='ctx'> 	struct gfs2_glock *j_gl = ip-&gt;i_gl;</div><div class='del'>-	struct gfs2_log_header_host head;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	j_gl-&gt;gl_ops-&gt;go_inval(j_gl, DIO_METADATA);</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	error = gfs2_find_jhead(sdp-&gt;sd_jdesc, &amp;head, false);</div><div class='del'>-	if (error) {</div><div class='del'>-		gfs2_consist(sdp);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(head.lh_flags &amp; GFS2_LOG_HEAD_UNMOUNT)) {</div><div class='del'>-		gfs2_consist(sdp);</div><div class='add'>+	if (sdp-&gt;sd_log_sequence == 0) {</div><div class='add'>+		fs_err(sdp, "unknown status of our own journal jid %d",</div><div class='add'>+		       sdp-&gt;sd_lockstruct.ls_jid);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*  Initialize some head of the log stuff  */</div><div class='del'>-	sdp-&gt;sd_log_sequence = head.lh_sequence + 1;</div><div class='del'>-	gfs2_log_pointers_init(sdp, head.lh_blkno);</div><div class='del'>-</div><div class='ctx'> 	error = gfs2_quota_init(sdp);</div><div class='del'>-	if (!error &amp;&amp; gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (!error &amp;&amp; gfs2_withdrawn(sdp))</div><div class='ctx'> 		error = -EIO;</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		set_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags);</div><div class='hunk'>@@ -354,10 +348,10 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp)</div><div class='ctx'> 		list_add(&amp;lfcc-&gt;list, &amp;list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='add'>+	gfs2_freeze_unlock(sdp);</div><div class='ctx'> </div><div class='ctx'> 	error = gfs2_glock_nq_init(sdp-&gt;sd_freeze_gl, LM_ST_EXCLUSIVE,</div><div class='del'>-				   LM_FLAG_NOEXP | GL_NOPID,</div><div class='add'>+				   LM_FLAG_RECOVER | GL_NOPID,</div><div class='ctx'> 				   &amp;sdp-&gt;sd_freeze_gh);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto relock_shared;</div><div class='hunk'>@@ -366,7 +360,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp)</div><div class='ctx'> 		error = gfs2_jdesc_check(jd);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='del'>-		error = gfs2_find_jhead(jd, &amp;lh, false);</div><div class='add'>+		error = gfs2_find_jhead(jd, &amp;lh);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (!(lh.lh_flags &amp; GFS2_LOG_HEAD_UNMOUNT)) {</div><div class='hunk'>@@ -378,7 +372,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp)</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		goto out;  /* success */</div><div class='ctx'> </div><div class='del'>-	gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='add'>+	gfs2_freeze_unlock(sdp);</div><div class='ctx'> </div><div class='ctx'> relock_shared:</div><div class='ctx'> 	error2 = gfs2_freeze_lock_shared(sdp);</div><div class='hunk'>@@ -493,13 +487,11 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)</div><div class='ctx'> 	int need_endtrans = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!ip-&gt;i_gl)) {</div><div class='del'>-		/* This can only happen during incomplete inode creation. */</div><div class='del'>-		BUG_ON(!test_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags));</div><div class='add'>+	/* This can only happen during incomplete inode creation. */</div><div class='add'>+	if (unlikely(!ip-&gt;i_gl))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!gfs2_glock_is_locked_by_me(ip-&gt;i_gl)) {</div><div class='ctx'> 		ret = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_EXCLUSIVE, 0, &amp;gh);</div><div class='hunk'>@@ -605,19 +597,19 @@ restart:</div><div class='ctx'> 	if (!sb_rdonly(sb))</div><div class='ctx'> 		gfs2_make_fs_ro(sdp);</div><div class='ctx'> 	else {</div><div class='del'>-		if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+		if (gfs2_withdrawn(sdp))</div><div class='ctx'> 			gfs2_destroy_threads(sdp);</div><div class='ctx'> </div><div class='ctx'> 		gfs2_quota_cleanup(sdp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(gfs2_withdrawing(sdp));</div><div class='add'>+	flush_work(&amp;sdp-&gt;sd_withdraw_work);</div><div class='ctx'> </div><div class='ctx'> 	/*  At this point, we're through modifying the disk  */</div><div class='ctx'> </div><div class='ctx'> 	/*  Release stuff  */</div><div class='ctx'> </div><div class='del'>-	gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='add'>+	gfs2_freeze_unlock(sdp);</div><div class='ctx'> </div><div class='ctx'> 	iput(sdp-&gt;sd_jindex);</div><div class='ctx'> 	iput(sdp-&gt;sd_statfs_inode);</div><div class='hunk'>@@ -644,12 +636,9 @@ restart:</div><div class='ctx'> 	gfs2_jindex_free(sdp);</div><div class='ctx'> 	/*  Take apart glock structures and buffer lists  */</div><div class='ctx'> 	gfs2_gl_hash_clear(sdp);</div><div class='del'>-	truncate_inode_pages_final(&amp;sdp-&gt;sd_aspace);</div><div class='add'>+	iput(sdp-&gt;sd_inode);</div><div class='ctx'> 	gfs2_delete_debugfs_file(sdp);</div><div class='del'>-	/*  Unmount the locking protocol  */</div><div class='del'>-	gfs2_lm_unmount(sdp);</div><div class='ctx'> </div><div class='del'>-	/*  At this point, we're through participating in the lockspace  */</div><div class='ctx'> 	gfs2_sys_fs_del(sdp);</div><div class='ctx'> 	free_sbd(sdp);</div><div class='ctx'> }</div><div class='hunk'>@@ -673,7 +662,7 @@ static int gfs2_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 	return sdp-&gt;sd_log_error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gfs2_do_thaw(struct gfs2_sbd *sdp)</div><div class='add'>+static int gfs2_do_thaw(struct gfs2_sbd *sdp, enum freeze_holder who, const void *freeze_owner)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = sdp-&gt;sd_vfs;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -681,7 +670,7 @@ static int gfs2_do_thaw(struct gfs2_sbd *sdp)</div><div class='ctx'> 	error = gfs2_freeze_lock_shared(sdp);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	error = thaw_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+	error = thaw_super(sb, who, freeze_owner);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -702,14 +691,14 @@ void gfs2_freeze_func(struct work_struct *work)</div><div class='ctx'> 	if (test_bit(SDF_FROZEN, &amp;sdp-&gt;sd_flags))</div><div class='ctx'> 		goto freeze_failed;</div><div class='ctx'> </div><div class='del'>-	error = freeze_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+	error = freeze_super(sb, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto freeze_failed;</div><div class='ctx'> </div><div class='del'>-	gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='add'>+	gfs2_freeze_unlock(sdp);</div><div class='ctx'> 	set_bit(SDF_FROZEN, &amp;sdp-&gt;sd_flags);</div><div class='ctx'> </div><div class='del'>-	error = gfs2_do_thaw(sdp);</div><div class='add'>+	error = gfs2_do_thaw(sdp, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -727,10 +716,13 @@ out:</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_freeze_super - prevent further writes to the filesystem</div><div class='ctx'>  * @sb: the VFS structure for the filesystem</div><div class='add'>+ * @who: freeze flags</div><div class='add'>+ * @freeze_owner: owner of the freeze</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who)</div><div class='add'>+static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who,</div><div class='add'>+			     const void *freeze_owner)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = sb-&gt;s_fs_info;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -743,7 +735,7 @@ static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		error = freeze_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+		error = freeze_super(sb, who, freeze_owner);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			fs_info(sdp, "GFS2: couldn't freeze filesystem: %d\n",</div><div class='ctx'> 				error);</div><div class='hunk'>@@ -757,9 +749,7 @@ static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		error = gfs2_do_thaw(sdp);</div><div class='del'>-		if (error)</div><div class='del'>-			goto out;</div><div class='add'>+		(void)gfs2_do_thaw(sdp, who, freeze_owner);</div><div class='ctx'> </div><div class='ctx'> 		if (error == -EBUSY)</div><div class='ctx'> 			fs_err(sdp, "waiting for recovery before freeze\n");</div><div class='hunk'>@@ -786,7 +776,7 @@ static int gfs2_freeze_fs(struct super_block *sb)</div><div class='ctx'> 	if (test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags)) {</div><div class='ctx'> 		gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_FREEZE |</div><div class='ctx'> 			       GFS2_LFC_FREEZE_GO_SYNC);</div><div class='del'>-		if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+		if (gfs2_withdrawn(sdp))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -795,10 +785,13 @@ static int gfs2_freeze_fs(struct super_block *sb)</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_thaw_super - reallow writes to the filesystem</div><div class='ctx'>  * @sb: the VFS structure for the filesystem</div><div class='add'>+ * @who: freeze flags</div><div class='add'>+ * @freeze_owner: owner of the freeze</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who)</div><div class='add'>+static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who,</div><div class='add'>+			   const void *freeze_owner)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = sb-&gt;s_fs_info;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -811,9 +804,9 @@ static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;sb-&gt;s_active);</div><div class='del'>-	gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='add'>+	gfs2_freeze_unlock(sdp);</div><div class='ctx'> </div><div class='del'>-	error = gfs2_do_thaw(sdp);</div><div class='add'>+	error = gfs2_do_thaw(sdp, who, freeze_owner);</div><div class='ctx'> </div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		clear_bit(SDF_FREEZE_INITIATOR, &amp;sdp-&gt;sd_flags);</div><div class='hunk'>@@ -824,20 +817,6 @@ static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void gfs2_thaw_freeze_initiator(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_sbd *sdp = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sdp-&gt;sd_freeze_mutex);</div><div class='del'>-	if (!test_bit(SDF_FREEZE_INITIATOR, &amp;sdp-&gt;sd_flags))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	gfs2_freeze_unlock(&amp;sdp-&gt;sd_freeze_gh);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;sdp-&gt;sd_freeze_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * statfs_slow_fill - fill in the sg for a given RG</div><div class='ctx'>  * @rgd: the RG</div><div class='hunk'>@@ -1029,7 +1008,7 @@ static int gfs2_drop_inode(struct inode *inode)</div><div class='ctx'> 	if (inode-&gt;i_nlink &amp;&amp;</div><div class='ctx'> 	    gfs2_holder_initialized(&amp;ip-&gt;i_iopen_gh)) {</div><div class='ctx'> 		struct gfs2_glock *gl = ip-&gt;i_iopen_gh.gh_gl;</div><div class='del'>-		if (test_bit(GLF_DEMOTE, &amp;gl-&gt;gl_flags))</div><div class='add'>+		if (glock_needs_demote(gl))</div><div class='ctx'> 			clear_nlink(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1044,8 +1023,8 @@ static int gfs2_drop_inode(struct inode *inode)</div><div class='ctx'> 		struct gfs2_glock *gl = ip-&gt;i_iopen_gh.gh_gl;</div><div class='ctx'> </div><div class='ctx'> 		gfs2_glock_hold(gl);</div><div class='del'>-		if (!gfs2_queue_try_to_evict(gl))</div><div class='del'>-			gfs2_glock_queue_put(gl);</div><div class='add'>+		if (!gfs2_queue_verify_delete(gl, true))</div><div class='add'>+			gfs2_glock_put_async(gl);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1055,7 +1034,7 @@ static int gfs2_drop_inode(struct inode *inode)</div><div class='ctx'> 	if (test_bit(SDF_EVICTING, &amp;sdp-&gt;sd_flags))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	return generic_drop_inode(inode);</div><div class='add'>+	return inode_generic_drop(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1152,6 +1131,9 @@ static int gfs2_show_options(struct seq_file *s, struct dentry *root)</div><div class='ctx'> 		case GFS2_ERRORS_WITHDRAW:</div><div class='ctx'> 			state = "withdraw";</div><div class='ctx'> 			break;</div><div class='add'>+		case GFS2_ERRORS_DEACTIVATE:</div><div class='add'>+			state = "deactivate";</div><div class='add'>+			break;</div><div class='ctx'> 		case GFS2_ERRORS_PANIC:</div><div class='ctx'> 			state = "panic";</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1172,74 +1154,6 @@ static int gfs2_show_options(struct seq_file *s, struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gfs2_final_release_pages(struct gfs2_inode *ip)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = &amp;ip-&gt;i_inode;</div><div class='del'>-	struct gfs2_glock *gl = ip-&gt;i_gl;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!gl)) {</div><div class='del'>-		/* This can only happen during incomplete inode creation. */</div><div class='del'>-		BUG_ON(!test_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	truncate_inode_pages(gfs2_glock2aspace(gl), 0);</div><div class='del'>-	truncate_inode_pages(&amp;inode-&gt;i_data, 0);</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;gl-&gt;gl_revokes) == 0) {</div><div class='del'>-		clear_bit(GLF_LFLUSH, &amp;gl-&gt;gl_flags);</div><div class='del'>-		clear_bit(GLF_DIRTY, &amp;gl-&gt;gl_flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gfs2_dinode_dealloc(struct gfs2_inode *ip)</div><div class='del'>-{</div><div class='del'>-	struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='del'>-	struct gfs2_rgrpd *rgd;</div><div class='del'>-	struct gfs2_holder gh;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	if (gfs2_get_inode_blocks(&amp;ip-&gt;i_inode) != 1) {</div><div class='del'>-		gfs2_consist_inode(ip);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gfs2_rindex_update(sdp);</div><div class='del'>-</div><div class='del'>-	error = gfs2_quota_hold(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	rgd = gfs2_blk2rgrpd(sdp, ip-&gt;i_no_addr, 1);</div><div class='del'>-	if (!rgd) {</div><div class='del'>-		gfs2_consist_inode(ip);</div><div class='del'>-		error = -EIO;</div><div class='del'>-		goto out_qs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = gfs2_glock_nq_init(rgd-&gt;rd_gl, LM_ST_EXCLUSIVE,</div><div class='del'>-				   LM_FLAG_NODE_SCOPE, &amp;gh);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out_qs;</div><div class='del'>-</div><div class='del'>-	error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_STATFS + RES_QUOTA,</div><div class='del'>-				 sdp-&gt;sd_jdesc-&gt;jd_blocks);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out_rg_gunlock;</div><div class='del'>-</div><div class='del'>-	gfs2_free_di(rgd, ip);</div><div class='del'>-</div><div class='del'>-	gfs2_final_release_pages(ip);</div><div class='del'>-</div><div class='del'>-	gfs2_trans_end(sdp);</div><div class='del'>-</div><div class='del'>-out_rg_gunlock:</div><div class='del'>-	gfs2_glock_dq_uninit(&amp;gh);</div><div class='del'>-out_qs:</div><div class='del'>-	gfs2_quota_unhold(ip);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_glock_put_eventually</div><div class='ctx'>  * @gl:	The glock to put</div><div class='hunk'>@@ -1251,17 +1165,16 @@ out_qs:</div><div class='ctx'> static void gfs2_glock_put_eventually(struct gfs2_glock *gl)</div><div class='ctx'> {</div><div class='ctx'> 	if (current-&gt;flags &amp; PF_MEMALLOC)</div><div class='del'>-		gfs2_glock_queue_put(gl);</div><div class='add'>+		gfs2_glock_put_async(gl);</div><div class='ctx'> 	else</div><div class='ctx'> 		gfs2_glock_put(gl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool gfs2_upgrade_iopen_glock(struct inode *inode)</div><div class='add'>+static enum evict_behavior gfs2_upgrade_iopen_glock(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(inode);</div><div class='ctx'> 	struct gfs2_holder *gh = &amp;ip-&gt;i_iopen_gh;</div><div class='del'>-	long timeout = 5 * HZ;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	gh-&gt;gh_flags |= GL_NOCACHE;</div><div class='hunk'>@@ -1272,9 +1185,9 @@ static bool gfs2_upgrade_iopen_glock(struct inode *inode)</div><div class='ctx'> 	 * exclusive access to the iopen glock here.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Otherwise, the other nodes holding the lock will be notified about</div><div class='del'>-	 * our locking request.  If they do not have the inode open, they are</div><div class='del'>-	 * expected to evict the cached inode and release the lock, allowing us</div><div class='del'>-	 * to proceed.</div><div class='add'>+	 * our locking request (see iopen_go_callback()).  If they do not have</div><div class='add'>+	 * the inode open, they are expected to evict the cached inode and</div><div class='add'>+	 * release the lock, allowing us to proceed.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Otherwise, if they cannot evict the inode, they are expected to poke</div><div class='ctx'> 	 * the inode glock (note: not the iopen glock).  We will notice that</div><div class='hunk'>@@ -1290,17 +1203,22 @@ static bool gfs2_upgrade_iopen_glock(struct inode *inode)</div><div class='ctx'> 	gfs2_holder_reinit(LM_ST_EXCLUSIVE, GL_ASYNC | GL_NOCACHE, gh);</div><div class='ctx'> 	error = gfs2_glock_nq(gh);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return false;</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='ctx'> </div><div class='del'>-	timeout = wait_event_interruptible_timeout(sdp-&gt;sd_async_glock_wait,</div><div class='add'>+	wait_event_interruptible_timeout(sdp-&gt;sd_async_glock_wait,</div><div class='ctx'> 		!test_bit(HIF_WAIT, &amp;gh-&gt;gh_iflags) ||</div><div class='del'>-		test_bit(GLF_DEMOTE, &amp;ip-&gt;i_gl-&gt;gl_flags),</div><div class='del'>-		timeout);</div><div class='add'>+		glock_needs_demote(ip-&gt;i_gl),</div><div class='add'>+		5 * HZ);</div><div class='ctx'> 	if (!test_bit(HIF_HOLDER, &amp;gh-&gt;gh_iflags)) {</div><div class='ctx'> 		gfs2_glock_dq(gh);</div><div class='del'>-		return false;</div><div class='add'>+		if (glock_needs_demote(ip-&gt;i_gl))</div><div class='add'>+			return EVICT_SHOULD_SKIP_DELETE;</div><div class='add'>+		return EVICT_SHOULD_DEFER_DELETE;</div><div class='ctx'> 	}</div><div class='del'>-	return gfs2_glock_holder_ready(gh) == 0;</div><div class='add'>+	error = gfs2_glock_holder_ready(gh);</div><div class='add'>+	if (error)</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='add'>+	return EVICT_SHOULD_DELETE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1313,58 +1231,47 @@ static bool gfs2_upgrade_iopen_glock(struct inode *inode)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: the fate of the dinode</div><div class='ctx'>  */</div><div class='del'>-static enum dinode_demise evict_should_delete(struct inode *inode,</div><div class='del'>-					      struct gfs2_holder *gh)</div><div class='add'>+static enum evict_behavior evict_should_delete(struct inode *inode,</div><div class='add'>+					       struct gfs2_holder *gh)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct gfs2_sbd *sdp = sb-&gt;s_fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags)))</div><div class='del'>-		goto should_delete;</div><div class='del'>-</div><div class='del'>-	if (test_bit(GIF_DEFERRED_DELETE, &amp;ip-&gt;i_flags))</div><div class='del'>-		return SHOULD_DEFER_EVICTION;</div><div class='add'>+	if (gfs2_holder_initialized(&amp;ip-&gt;i_iopen_gh) &amp;&amp;</div><div class='add'>+	    test_bit(GLF_DEFER_DELETE, &amp;ip-&gt;i_iopen_gh.gh_gl-&gt;gl_flags))</div><div class='add'>+		return EVICT_SHOULD_DEFER_DELETE;</div><div class='ctx'> </div><div class='ctx'> 	/* Deletes should never happen under memory pressure anymore.  */</div><div class='ctx'> 	if (WARN_ON_ONCE(current-&gt;flags &amp; PF_MEMALLOC))</div><div class='del'>-		return SHOULD_DEFER_EVICTION;</div><div class='add'>+		return EVICT_SHOULD_DEFER_DELETE;</div><div class='ctx'> </div><div class='ctx'> 	/* Must not read inode block until block type has been verified */</div><div class='ctx'> 	ret = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_EXCLUSIVE, GL_SKIP, gh);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		glock_clear_object(ip-&gt;i_iopen_gh.gh_gl, ip);</div><div class='del'>-		ip-&gt;i_iopen_gh.gh_flags |= GL_NOCACHE;</div><div class='del'>-		gfs2_glock_dq_uninit(&amp;ip-&gt;i_iopen_gh);</div><div class='del'>-		return SHOULD_DEFER_EVICTION;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='ctx'> </div><div class='ctx'> 	if (gfs2_inode_already_deleted(ip-&gt;i_gl, ip-&gt;i_no_formal_ino))</div><div class='del'>-		return SHOULD_NOT_DELETE_DINODE;</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='ctx'> 	ret = gfs2_check_blk_type(sdp, ip-&gt;i_no_addr, GFS2_BLKST_UNLINKED);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return SHOULD_NOT_DELETE_DINODE;</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='ctx'> </div><div class='ctx'> 	ret = gfs2_instantiate(gh);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return SHOULD_NOT_DELETE_DINODE;</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The inode may have been recreated in the meantime.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (inode-&gt;i_nlink)</div><div class='del'>-		return SHOULD_NOT_DELETE_DINODE;</div><div class='add'>+		return EVICT_SHOULD_SKIP_DELETE;</div><div class='ctx'> </div><div class='del'>-should_delete:</div><div class='ctx'> 	if (gfs2_holder_initialized(&amp;ip-&gt;i_iopen_gh) &amp;&amp;</div><div class='del'>-	    test_bit(HIF_HOLDER, &amp;ip-&gt;i_iopen_gh.gh_iflags)) {</div><div class='del'>-		if (!gfs2_upgrade_iopen_glock(inode)) {</div><div class='del'>-			gfs2_holder_uninit(&amp;ip-&gt;i_iopen_gh);</div><div class='del'>-			return SHOULD_NOT_DELETE_DINODE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return SHOULD_DELETE_DINODE;</div><div class='add'>+	    test_bit(HIF_HOLDER, &amp;ip-&gt;i_iopen_gh.gh_iflags))</div><div class='add'>+		return gfs2_upgrade_iopen_glock(inode);</div><div class='add'>+	return EVICT_SHOULD_DELETE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1384,7 +1291,7 @@ static int evict_unlinked_inode(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ip-&gt;i_eattr) {</div><div class='del'>-		ret = gfs2_ea_dealloc(ip);</div><div class='add'>+		ret = gfs2_ea_dealloc(ip, true);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1475,8 +1382,10 @@ static void gfs2_evict_inode(struct inode *inode)</div><div class='ctx'> 	struct gfs2_sbd *sdp = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct gfs2_inode *ip = GFS2_I(inode);</div><div class='ctx'> 	struct gfs2_holder gh;</div><div class='add'>+	enum evict_behavior behavior;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	gfs2_holder_mark_uninitialized(&amp;gh);</div><div class='ctx'> 	if (inode-&gt;i_nlink || sb_rdonly(sb) || !ip-&gt;i_no_addr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1488,11 +1397,20 @@ static void gfs2_evict_inode(struct inode *inode)</div><div class='ctx'> 	if (!sdp-&gt;sd_jdesc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	gfs2_holder_mark_uninitialized(&amp;gh);</div><div class='del'>-	ret = evict_should_delete(inode, &amp;gh);</div><div class='del'>-	if (ret == SHOULD_DEFER_EVICTION)</div><div class='del'>-		goto out;</div><div class='del'>-	if (ret == SHOULD_DELETE_DINODE)</div><div class='add'>+	behavior = evict_should_delete(inode, &amp;gh);</div><div class='add'>+	if (behavior == EVICT_SHOULD_DEFER_DELETE &amp;&amp;</div><div class='add'>+	    !test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags)) {</div><div class='add'>+		struct gfs2_glock *io_gl = ip-&gt;i_iopen_gh.gh_gl;</div><div class='add'>+</div><div class='add'>+		if (io_gl) {</div><div class='add'>+			gfs2_glock_hold(io_gl);</div><div class='add'>+			if (!gfs2_queue_verify_delete(io_gl, true))</div><div class='add'>+				gfs2_glock_put(io_gl);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		behavior = EVICT_SHOULD_SKIP_DELETE;</div><div class='add'>+	}</div><div class='add'>+	if (behavior == EVICT_SHOULD_DELETE)</div><div class='ctx'> 		ret = evict_unlinked_inode(inode);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = evict_linked_inode(inode);</div><div class='hunk'>@@ -1500,11 +1418,11 @@ static void gfs2_evict_inode(struct inode *inode)</div><div class='ctx'> 	if (gfs2_rs_active(&amp;ip-&gt;i_res))</div><div class='ctx'> 		gfs2_rs_deltree(&amp;ip-&gt;i_res);</div><div class='ctx'> </div><div class='del'>-	if (gfs2_holder_initialized(&amp;gh))</div><div class='del'>-		gfs2_glock_dq_uninit(&amp;gh);</div><div class='ctx'> 	if (ret &amp;&amp; ret != GLR_TRYFAILED &amp;&amp; ret != -EROFS)</div><div class='ctx'> 		fs_warn(sdp, "gfs2_evict_inode: %d\n", ret);</div><div class='ctx'> out:</div><div class='add'>+	if (gfs2_holder_initialized(&amp;gh))</div><div class='add'>+		gfs2_glock_dq_uninit(&amp;gh);</div><div class='ctx'> 	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> 	if (ip-&gt;i_qadata)</div><div class='ctx'> 		gfs2_assert_warn(sdp, ip-&gt;i_qadata-&gt;qa_ref == 0);</div><div class='hunk'>@@ -1524,7 +1442,6 @@ out:</div><div class='ctx'> 	if (ip-&gt;i_gl) {</div><div class='ctx'> 		glock_clear_object(ip-&gt;i_gl, ip);</div><div class='ctx'> 		wait_on_bit_io(&amp;ip-&gt;i_flags, GIF_GLOP_PENDING, TASK_UNINTERRUPTIBLE);</div><div class='del'>-		gfs2_glock_add_to_lru(ip-&gt;i_gl);</div><div class='ctx'> 		gfs2_glock_put_eventually(ip-&gt;i_gl);</div><div class='ctx'> 		rcu_assign_pointer(ip-&gt;i_gl, NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1538,11 +1455,13 @@ static struct inode *gfs2_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	if (!ip)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	ip-&gt;i_no_addr = 0;</div><div class='add'>+	ip-&gt;i_no_formal_ino = 0;</div><div class='ctx'> 	ip-&gt;i_flags = 0;</div><div class='ctx'> 	ip-&gt;i_gl = NULL;</div><div class='ctx'> 	gfs2_holder_mark_uninitialized(&amp;ip-&gt;i_iopen_gh);</div><div class='ctx'> 	memset(&amp;ip-&gt;i_res, 0, sizeof(ip-&gt;i_res));</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;ip-&gt;i_res.rs_node);</div><div class='add'>+	ip-&gt;i_diskflags = 0;</div><div class='ctx'> 	ip-&gt;i_rahead = 0;</div><div class='ctx'> 	return &amp;ip-&gt;i_inode;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/gfs2/super.h b/fs/gfs2/super.h<br/>index b27a774d9580..173f1e74c2a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/super.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/super.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/super.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/super.h</a></div><div class='hunk'>@@ -47,7 +47,6 @@ void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc,</div><div class='ctx'> void update_statfs(struct gfs2_sbd *sdp, struct buffer_head *m_bh);</div><div class='ctx'> int gfs2_statfs_sync(struct super_block *sb, int type);</div><div class='ctx'> void gfs2_freeze_func(struct work_struct *work);</div><div class='del'>-void gfs2_thaw_freeze_initiator(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> void free_local_statfs_inodes(struct gfs2_sbd *sdp);</div><div class='ctx'> struct inode *find_local_statfs_inode(struct gfs2_sbd *sdp,</div><div class='head'>diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c<br/>index 250f340cb44d..7051db9dbea0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/sys.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/sys.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/sys.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/sys.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static struct kset *gfs2_kset;</div><div class='ctx'> </div><div class='ctx'> static ssize_t id_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u:%u\n",</div><div class='add'>+	return sysfs_emit(buf, "%u:%u\n",</div><div class='ctx'> 			MAJOR(sdp-&gt;sd_vfs-&gt;s_dev), MINOR(sdp-&gt;sd_vfs-&gt;s_dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -68,7 +68,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> 	unsigned long f = sdp-&gt;sd_flags;</div><div class='ctx'> 	ssize_t s;</div><div class='ctx'> </div><div class='del'>-	s = snprintf(buf, PAGE_SIZE,</div><div class='add'>+	s = sysfs_emit(buf,</div><div class='ctx'> 		     "Journal Checked:          %d\n"</div><div class='ctx'> 		     "Journal Live:             %d\n"</div><div class='ctx'> 		     "Journal ID:               %d\n"</div><div class='hunk'>@@ -84,11 +84,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> 		     "Force AIL Flush:          %d\n"</div><div class='ctx'> 		     "FS Freeze Initiator:      %d\n"</div><div class='ctx'> 		     "FS Frozen:                %d\n"</div><div class='del'>-		     "Withdrawing:              %d\n"</div><div class='del'>-		     "Withdraw In Prog:         %d\n"</div><div class='del'>-		     "Remote Withdraw:          %d\n"</div><div class='del'>-		     "Withdraw Recovery:        %d\n"</div><div class='del'>-		     "Deactivating:             %d\n"</div><div class='add'>+		     "Killing:                  %d\n"</div><div class='ctx'> 		     "sd_log_error:             %d\n"</div><div class='ctx'> 		     "sd_log_flush_lock:        %d\n"</div><div class='ctx'> 		     "sd_log_num_revoke:        %u\n"</div><div class='hunk'>@@ -117,10 +113,6 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> 		     test_bit(SDF_FORCE_AIL_FLUSH, &amp;f),</div><div class='ctx'> 		     test_bit(SDF_FREEZE_INITIATOR, &amp;f),</div><div class='ctx'> 		     test_bit(SDF_FROZEN, &amp;f),</div><div class='del'>-		     test_bit(SDF_WITHDRAWING, &amp;f),</div><div class='del'>-		     test_bit(SDF_WITHDRAW_IN_PROG, &amp;f),</div><div class='del'>-		     test_bit(SDF_REMOTE_WITHDRAW, &amp;f),</div><div class='del'>-		     test_bit(SDF_WITHDRAW_RECOVERY, &amp;f),</div><div class='ctx'> 		     test_bit(SDF_KILL, &amp;f),</div><div class='ctx'> 		     sdp-&gt;sd_log_error,</div><div class='ctx'> 		     rwsem_is_locked(&amp;sdp-&gt;sd_log_flush_lock),</div><div class='hunk'>@@ -140,7 +132,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> </div><div class='ctx'> static ssize_t fsname_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n", sdp-&gt;sd_fsname);</div><div class='add'>+	return sysfs_emit(buf, "%s\n", sdp-&gt;sd_fsname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)</div><div class='hunk'>@@ -150,7 +142,7 @@ static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> 	buf[0] = '\0';</div><div class='ctx'> 	if (uuid_is_null(&amp;s-&gt;s_uuid))</div><div class='ctx'> 		return 0;</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%pUB\n", &amp;s-&gt;s_uuid);</div><div class='add'>+	return sysfs_emit(buf, "%pUB\n", &amp;s-&gt;s_uuid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)</div><div class='hunk'>@@ -158,7 +150,7 @@ static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> 	struct super_block *sb = sdp-&gt;sd_vfs;</div><div class='ctx'> 	int frozen = (sb-&gt;s_writers.frozen == SB_UNFROZEN) ? 0 : 1;</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", frozen);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", frozen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='hunk'>@@ -174,10 +166,10 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	switch (n) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		error = thaw_super(sdp-&gt;sd_vfs, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+		error = thaw_super(sdp-&gt;sd_vfs, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		error = freeze_super(sdp-&gt;sd_vfs, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+		error = freeze_super(sdp-&gt;sd_vfs, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -193,8 +185,8 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='del'>-	unsigned int b = gfs2_withdrawing_or_withdrawn(sdp);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n", b);</div><div class='add'>+	unsigned int b = gfs2_withdrawn(sdp);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='hunk'>@@ -336,7 +328,7 @@ static ssize_t demote_rq_store(struct gfs2_sbd *sdp, const char *buf, size_t len</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (!test_and_set_bit(SDF_DEMOTE, &amp;sdp-&gt;sd_flags))</div><div class='ctx'> 		fs_info(sdp, "demote interface used\n");</div><div class='del'>-	rv = gfs2_glock_get(sdp, glnum, glops, 0, &amp;gl);</div><div class='add'>+	rv = gfs2_glock_get(sdp, glnum, glops, NO_CREATE, &amp;gl);</div><div class='ctx'> 	if (rv)</div><div class='ctx'> 		return rv;</div><div class='ctx'> 	gfs2_glock_cb(gl, glmode);</div><div class='hunk'>@@ -397,7 +389,7 @@ static struct kobj_type gfs2_ktype = {</div><div class='ctx'> static ssize_t proto_name_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	const struct lm_lockops *ops = sdp-&gt;sd_lockstruct.ls_ops;</div><div class='del'>-	return sprintf(buf, "%s\n", ops-&gt;lm_proto_name);</div><div class='add'>+	return sysfs_emit(buf, "%s\n", ops-&gt;lm_proto_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t block_show(struct gfs2_sbd *sdp, char *buf)</div><div class='hunk'>@@ -408,7 +400,7 @@ static ssize_t block_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DFL_BLOCK_LOCKS, &amp;ls-&gt;ls_recover_flags))</div><div class='ctx'> 		val = 1;</div><div class='del'>-	ret = sprintf(buf, "%d\n", val);</div><div class='add'>+	ret = sysfs_emit(buf, "%d\n", val);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -433,33 +425,27 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t wdack_show(struct gfs2_sbd *sdp, char *buf)</div><div class='del'>-{</div><div class='del'>-	int val = completion_done(&amp;sdp-&gt;sd_wdack) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d\n", val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t wdack_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='add'>+static ssize_t withdraw_helper_status_store(struct gfs2_sbd *sdp,</div><div class='add'>+					    const char *buf,</div><div class='add'>+					    size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, val;</div><div class='ctx'> </div><div class='ctx'> 	ret = kstrtoint(buf, 0, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-</div><div class='del'>-	if ((val == 1) &amp;&amp;</div><div class='del'>-	    !strcmp(sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_proto_name, "lock_dlm"))</div><div class='del'>-		complete(&amp;sdp-&gt;sd_wdack);</div><div class='del'>-	else</div><div class='add'>+	if (val &lt; 0 || val &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sdp-&gt;sd_withdraw_helper_status = val;</div><div class='add'>+	complete(&amp;sdp-&gt;sd_withdraw_helper);</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='del'>-	return sprintf(buf, "%d\n", ls-&gt;ls_first);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", ls-&gt;ls_first);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t lkfirst_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='hunk'>@@ -492,7 +478,7 @@ out:</div><div class='ctx'> static ssize_t first_done_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='del'>-	return sprintf(buf, "%d\n", !!test_bit(DFL_FIRST_MOUNT_DONE, &amp;ls-&gt;ls_recover_flags));</div><div class='add'>+	return sysfs_emit(buf, "%d\n", !!test_bit(DFL_FIRST_MOUNT_DONE, &amp;ls-&gt;ls_recover_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int gfs2_recover_set(struct gfs2_sbd *sdp, unsigned jid)</div><div class='hunk'>@@ -550,18 +536,18 @@ out:</div><div class='ctx'> static ssize_t recover_done_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='del'>-	return sprintf(buf, "%d\n", ls-&gt;ls_recover_jid_done);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", ls-&gt;ls_recover_jid_done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t recover_status_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='del'>-	return sprintf(buf, "%d\n", ls-&gt;ls_recover_jid_status);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", ls-&gt;ls_recover_jid_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t jid_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%d\n", sdp-&gt;sd_lockstruct.ls_jid);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", sdp-&gt;sd_lockstruct.ls_jid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t jid_store(struct gfs2_sbd *sdp, const char *buf, size_t len)</div><div class='hunk'>@@ -599,7 +585,7 @@ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store)</div><div class='ctx'> </div><div class='ctx'> GDLM_ATTR(proto_name,		0444, proto_name_show,		NULL);</div><div class='ctx'> GDLM_ATTR(block,		0644, block_show,		block_store);</div><div class='del'>-GDLM_ATTR(withdraw,		0644, wdack_show,		wdack_store);</div><div class='add'>+GDLM_ATTR(withdraw,		0200, NULL,			withdraw_helper_status_store);</div><div class='ctx'> GDLM_ATTR(jid,			0644, jid_show,			jid_store);</div><div class='ctx'> GDLM_ATTR(first,		0644, lkfirst_show,		lkfirst_store);</div><div class='ctx'> GDLM_ATTR(first_done,		0444, first_done_show,		NULL);</div><div class='hunk'>@@ -626,7 +612,7 @@ static struct attribute *lock_module_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> static ssize_t quota_scale_show(struct gfs2_sbd *sdp, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u %u\n",</div><div class='add'>+	return sysfs_emit(buf, "%u %u\n",</div><div class='ctx'> 			sdp-&gt;sd_tune.gt_quota_scale_num,</div><div class='ctx'> 			sdp-&gt;sd_tune.gt_quota_scale_den);</div><div class='ctx'> }</div><div class='hunk'>@@ -679,7 +665,7 @@ static struct gfs2_attr tune_attr_##name = __ATTR(name, 0644, show, store)</div><div class='ctx'> #define TUNE_ATTR_2(name, store)                                              \</div><div class='ctx'> static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf)                   \</div><div class='ctx'> {                                                                             \</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n", sdp-&gt;sd_tune.gt_##name);      \</div><div class='add'>+	return sysfs_emit(buf, "%u\n", sdp-&gt;sd_tune.gt_##name);               \</div><div class='ctx'> }                                                                             \</div><div class='ctx'> TUNE_ATTR_3(name, name##_show, store)</div><div class='ctx'> </div><div class='hunk'>@@ -698,6 +684,7 @@ TUNE_ATTR(statfs_slow, 0);</div><div class='ctx'> TUNE_ATTR(new_files_jdata, 0);</div><div class='ctx'> TUNE_ATTR(statfs_quantum, 1);</div><div class='ctx'> TUNE_ATTR_3(quota_scale, quota_scale_show, quota_scale_store);</div><div class='add'>+TUNE_ATTR(withdraw_helper_timeout, 1);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *tune_attrs[] = {</div><div class='ctx'> 	&amp;tune_attr_quota_warn_period.attr,</div><div class='hunk'>@@ -708,6 +695,7 @@ static struct attribute *tune_attrs[] = {</div><div class='ctx'> 	&amp;tune_attr_statfs_quantum.attr,</div><div class='ctx'> 	&amp;tune_attr_quota_scale.attr,</div><div class='ctx'> 	&amp;tune_attr_new_files_jdata.attr,</div><div class='add'>+	&amp;tune_attr_withdraw_helper_timeout.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -764,7 +752,6 @@ fail_reg:</div><div class='ctx'> 	fs_err(sdp, "error %d adding sysfs files\n", error);</div><div class='ctx'> 	kobject_put(&amp;sdp-&gt;sd_kobj);</div><div class='ctx'> 	wait_for_completion(&amp;sdp-&gt;sd_kobj_unregister);</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/gfs2/trace_gfs2.h b/fs/gfs2/trace_gfs2.h<br/>index a5deb9f86831..fcfbf68ec725 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/trace_gfs2.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/trace_gfs2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/trace_gfs2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/trace_gfs2.h</a></div><div class='hunk'>@@ -52,13 +52,19 @@</div><div class='ctx'> 	{(1UL &lt;&lt; GLF_DEMOTE_IN_PROGRESS),	"p" },		\</div><div class='ctx'> 	{(1UL &lt;&lt; GLF_DIRTY),			"y" },		\</div><div class='ctx'> 	{(1UL &lt;&lt; GLF_LFLUSH),			"f" },		\</div><div class='del'>-	{(1UL &lt;&lt; GLF_INVALIDATE_IN_PROGRESS),	"i" },		\</div><div class='del'>-	{(1UL &lt;&lt; GLF_REPLY_PENDING),		"r" },		\</div><div class='del'>-	{(1UL &lt;&lt; GLF_INITIAL),			"I" },		\</div><div class='del'>-	{(1UL &lt;&lt; GLF_FROZEN),			"F" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_PENDING_REPLY),		"R" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_HAVE_REPLY),		"r" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_INITIAL),			"a" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_HAVE_FROZEN_REPLY),	"F" },		\</div><div class='ctx'> 	{(1UL &lt;&lt; GLF_LRU),			"L" },		\</div><div class='ctx'> 	{(1UL &lt;&lt; GLF_OBJECT),			"o" },		\</div><div class='del'>-	{(1UL &lt;&lt; GLF_BLOCKING),			"b" })</div><div class='add'>+	{(1UL &lt;&lt; GLF_BLOCKING),			"b" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_INSTANTIATE_NEEDED),	"n" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_INSTANTIATE_IN_PROG),	"N" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_TRY_TO_EVICT),		"e" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_VERIFY_DELETE),		"E" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_DEFER_DELETE),		"s" },		\</div><div class='add'>+	{(1UL &lt;&lt; GLF_CANCELING),		"C" })</div><div class='ctx'> </div><div class='ctx'> #ifndef NUMPTY</div><div class='ctx'> #define NUMPTY</div><div class='head'>diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c<br/>index 192213c7359a..6df65540e13d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/trans.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/trans.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/trans.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/trans.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ int __gfs2_trans_begin(struct gfs2_trans *tr, struct gfs2_sbd *sdp,</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(blocks == 0 &amp;&amp; revokes == 0);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='ctx'> 	tr-&gt;tr_ip = ip;</div><div class='hunk'>@@ -85,25 +85,30 @@ int __gfs2_trans_begin(struct gfs2_trans *tr, struct gfs2_sbd *sdp,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='add'>+	if (unlikely(!test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags)))</div><div class='add'>+		goto out_not_live;</div><div class='ctx'> 	if (gfs2_log_try_reserve(sdp, tr, &amp;extra_revokes))</div><div class='ctx'> 		goto reserved;</div><div class='add'>+</div><div class='ctx'> 	up_read(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='ctx'> 	gfs2_log_reserve(sdp, tr, &amp;extra_revokes);</div><div class='ctx'> 	down_read(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='del'>-</div><div class='del'>-reserved:</div><div class='del'>-	gfs2_log_release_revokes(sdp, extra_revokes);</div><div class='ctx'> 	if (unlikely(!test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags))) {</div><div class='del'>-		gfs2_log_release_revokes(sdp, tr-&gt;tr_revokes);</div><div class='del'>-		up_read(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='add'>+		revokes = tr-&gt;tr_revokes + extra_revokes;</div><div class='add'>+		gfs2_log_release_revokes(sdp, revokes);</div><div class='ctx'> 		gfs2_log_release(sdp, tr-&gt;tr_reserved);</div><div class='del'>-		sb_end_intwrite(sdp-&gt;sd_vfs);</div><div class='del'>-		return -EROFS;</div><div class='add'>+		goto out_not_live;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+reserved:</div><div class='add'>+	gfs2_log_release_revokes(sdp, extra_revokes);</div><div class='ctx'> 	current-&gt;journal_info = tr;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_not_live:</div><div class='add'>+	up_read(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='add'>+	sb_end_intwrite(sdp-&gt;sd_vfs);</div><div class='add'>+	return -EROFS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,</div><div class='hunk'>@@ -226,6 +231,27 @@ out:</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void gfs2_trans_add_databufs(struct gfs2_glock *gl, struct folio *folio,</div><div class='add'>+			     size_t from, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct buffer_head *head = folio_buffers(folio);</div><div class='add'>+	unsigned int bsize = head-&gt;b_size;</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+	size_t to = from + len;</div><div class='add'>+	size_t start, end;</div><div class='add'>+</div><div class='add'>+	for (bh = head, start = 0; bh != head || !start;</div><div class='add'>+	     bh = bh-&gt;b_this_page, start = end) {</div><div class='add'>+		end = start + bsize;</div><div class='add'>+		if (end &lt;= from)</div><div class='add'>+			continue;</div><div class='add'>+		if (start &gt;= to)</div><div class='add'>+			break;</div><div class='add'>+		set_buffer_uptodate(bh);</div><div class='add'>+		gfs2_trans_add_data(gl, bh);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +260,6 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)</div><div class='ctx'> 	struct gfs2_bufdata *bd;</div><div class='ctx'> 	struct gfs2_meta_header *mh;</div><div class='ctx'> 	struct gfs2_trans *tr = current-&gt;journal_info;</div><div class='del'>-	bool withdraw = false;</div><div class='ctx'> </div><div class='ctx'> 	lock_buffer(bh);</div><div class='ctx'> 	if (buffer_pinned(bh)) {</div><div class='hunk'>@@ -246,12 +271,12 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)</div><div class='ctx'> 	if (bd == NULL) {</div><div class='ctx'> 		gfs2_log_unlock(sdp);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='del'>-		lock_page(bh-&gt;b_page);</div><div class='add'>+		folio_lock(bh-&gt;b_folio);</div><div class='ctx'> 		if (bh-&gt;b_private == NULL)</div><div class='ctx'> 			bd = gfs2_alloc_bufdata(gl, bh);</div><div class='ctx'> 		else</div><div class='ctx'> 			bd = bh-&gt;b_private;</div><div class='del'>-		unlock_page(bh-&gt;b_page);</div><div class='add'>+		folio_unlock(bh-&gt;b_folio);</div><div class='ctx'> 		lock_buffer(bh);</div><div class='ctx'> 		gfs2_log_lock(sdp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -268,14 +293,14 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)</div><div class='ctx'> 		       (unsigned long long)bd-&gt;bd_bh-&gt;b_blocknr);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp)) {</div><div class='add'>+	if (gfs2_withdrawn(sdp)) {</div><div class='ctx'> 		fs_info(sdp, "GFS2:adding buf while withdrawn! 0x%llx\n",</div><div class='ctx'> 			(unsigned long long)bd-&gt;bd_bh-&gt;b_blocknr);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(sb-&gt;s_writers.frozen == SB_FREEZE_COMPLETE)) {</div><div class='ctx'> 		fs_info(sdp, "GFS2:adding buf while frozen\n");</div><div class='del'>-		withdraw = true;</div><div class='add'>+		gfs2_withdraw(sdp);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	gfs2_pin(sdp, bd-&gt;bd_bh);</div><div class='hunk'>@@ -285,8 +310,6 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)</div><div class='ctx'> 	tr-&gt;tr_num_buf_new++;</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	gfs2_log_unlock(sdp);</div><div class='del'>-	if (withdraw)</div><div class='del'>-		gfs2_assert_withdraw(sdp, 0);</div><div class='ctx'> out:</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/gfs2/trans.h b/fs/gfs2/trans.h<br/>index f8ce5302280d..790c55f59e61 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/trans.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/trans.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/trans.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/trans.h</a></div><div class='hunk'>@@ -42,6 +42,8 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,</div><div class='ctx'> </div><div class='ctx'> void gfs2_trans_end(struct gfs2_sbd *sdp);</div><div class='ctx'> void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh);</div><div class='add'>+void gfs2_trans_add_databufs(struct gfs2_glock *gl, struct folio *folio,</div><div class='add'>+			     size_t from, size_t len);</div><div class='ctx'> void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh);</div><div class='ctx'> void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd);</div><div class='ctx'> void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len);</div><div class='head'>diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c<br/>index f52141ce9485..02603200846d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/util.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/util.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,</div><div class='ctx'> 	struct gfs2_inode *ip;</div><div class='ctx'> </div><div class='ctx'> 	ip = GFS2_I(jd-&gt;jd_inode);</div><div class='del'>-	error = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_SHARED, LM_FLAG_NOEXP |</div><div class='add'>+	error = gfs2_glock_nq_init(ip-&gt;i_gl, LM_ST_SHARED, LM_FLAG_RECOVER |</div><div class='ctx'> 				   GL_EXACT | GL_NOCACHE, &amp;j_gh);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		if (verbose)</div><div class='hunk'>@@ -73,7 +73,7 @@ int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,</div><div class='ctx'> 			       "mount.\n");</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	error = gfs2_find_jhead(jd, &amp;head, false);</div><div class='add'>+	error = gfs2_find_jhead(jd, &amp;head);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		if (verbose)</div><div class='ctx'> 			fs_err(sdp, "Error parsing journal for spectator "</div><div class='hunk'>@@ -99,207 +99,48 @@ out_unlock:</div><div class='ctx'>  */</div><div class='ctx'> int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='add'>+	int flags = LM_FLAG_RECOVER | GL_EXACT;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = gfs2_glock_nq_init(sdp-&gt;sd_freeze_gl, LM_ST_SHARED,</div><div class='del'>-				   LM_FLAG_NOEXP | GL_EXACT,</div><div class='add'>+	error = gfs2_glock_nq_init(sdp-&gt;sd_freeze_gl, LM_ST_SHARED, flags,</div><div class='ctx'> 				   &amp;sdp-&gt;sd_freeze_gh);</div><div class='del'>-	if (error)</div><div class='add'>+	if (error &amp;&amp; error != GLR_TRYFAILED)</div><div class='ctx'> 		fs_err(sdp, "can't lock the freeze glock: %d\n", error);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh)</div><div class='add'>+void gfs2_freeze_unlock(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='del'>-	if (gfs2_holder_initialized(freeze_gh))</div><div class='del'>-		gfs2_glock_dq_uninit(freeze_gh);</div><div class='add'>+	if (gfs2_holder_initialized(&amp;sdp-&gt;sd_freeze_gh))</div><div class='add'>+		gfs2_glock_dq_uninit(&amp;sdp-&gt;sd_freeze_gh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void signal_our_withdraw(struct gfs2_sbd *sdp)</div><div class='add'>+static void do_withdraw(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='del'>-	struct gfs2_glock *live_gl = sdp-&gt;sd_live_gh.gh_gl;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct gfs2_inode *ip;</div><div class='del'>-	struct gfs2_glock *i_gl;</div><div class='del'>-	u64 no_formal_ino;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int tries;</div><div class='del'>-</div><div class='del'>-	if (test_bit(SDF_NORECOVERY, &amp;sdp-&gt;sd_flags) || !sdp-&gt;sd_jdesc)</div><div class='add'>+	down_write(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='add'>+	if (!test_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags)) {</div><div class='add'>+		up_write(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='ctx'> 		return;</div><div class='del'>-</div><div class='del'>-	gfs2_ail_drain(sdp); /* frees all transactions */</div><div class='del'>-	inode = sdp-&gt;sd_jdesc-&gt;jd_inode;</div><div class='del'>-	ip = GFS2_I(inode);</div><div class='del'>-	i_gl = ip-&gt;i_gl;</div><div class='del'>-	no_formal_ino = ip-&gt;i_no_formal_ino;</div><div class='del'>-</div><div class='del'>-	/* Prevent any glock dq until withdraw recovery is complete */</div><div class='del'>-	set_bit(SDF_WITHDRAW_RECOVERY, &amp;sdp-&gt;sd_flags);</div><div class='del'>-	/*</div><div class='del'>-	 * Don't tell dlm we're bailing until we have no more buffers in the</div><div class='del'>-	 * wind. If journal had an IO error, the log code should just purge</div><div class='del'>-	 * the outstanding buffers rather than submitting new IO. Making the</div><div class='del'>-	 * file system read-only will flush the journal, etc.</div><div class='del'>-	 *</div><div class='del'>-	 * During a normal unmount, gfs2_make_fs_ro calls gfs2_log_shutdown</div><div class='del'>-	 * which clears SDF_JOURNAL_LIVE. In a withdraw, we must not write</div><div class='del'>-	 * any UNMOUNT log header, so we can't call gfs2_log_shutdown, and</div><div class='del'>-	 * therefore we need to clear SDF_JOURNAL_LIVE manually.</div><div class='del'>-	 */</div><div class='del'>-	clear_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags);</div><div class='del'>-	if (!sb_rdonly(sdp-&gt;sd_vfs)) {</div><div class='del'>-		bool locked = mutex_trylock(&amp;sdp-&gt;sd_freeze_mutex);</div><div class='del'>-</div><div class='del'>-		wake_up(&amp;sdp-&gt;sd_logd_waitq);</div><div class='del'>-		wake_up(&amp;sdp-&gt;sd_quota_wait);</div><div class='del'>-</div><div class='del'>-		wait_event_timeout(sdp-&gt;sd_log_waitq,</div><div class='del'>-				   gfs2_log_is_empty(sdp),</div><div class='del'>-				   HZ * 5);</div><div class='del'>-</div><div class='del'>-		sdp-&gt;sd_vfs-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-</div><div class='del'>-		if (locked)</div><div class='del'>-			mutex_unlock(&amp;sdp-&gt;sd_freeze_mutex);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Dequeue any pending non-system glock holders that can no</div><div class='del'>-		 * longer be granted because the file system is withdrawn.</div><div class='del'>-		 */</div><div class='del'>-		gfs2_gl_dq_holders(sdp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_lock == NULL) { /* lock_nolock */</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		clear_bit(SDF_WITHDRAW_RECOVERY, &amp;sdp-&gt;sd_flags);</div><div class='del'>-		goto skip_recovery;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Drop the glock for our journal so another node can recover it.</div><div class='del'>-	 */</div><div class='del'>-	if (gfs2_holder_initialized(&amp;sdp-&gt;sd_journal_gh)) {</div><div class='del'>-		gfs2_glock_dq_wait(&amp;sdp-&gt;sd_journal_gh);</div><div class='del'>-		gfs2_holder_uninit(&amp;sdp-&gt;sd_journal_gh);</div><div class='del'>-	}</div><div class='del'>-	sdp-&gt;sd_jinode_gh.gh_flags |= GL_NOCACHE;</div><div class='del'>-	gfs2_glock_dq(&amp;sdp-&gt;sd_jinode_gh);</div><div class='del'>-	gfs2_thaw_freeze_initiator(sdp-&gt;sd_vfs);</div><div class='del'>-	wait_on_bit(&amp;i_gl-&gt;gl_flags, GLF_DEMOTE, TASK_UNINTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * holder_uninit to force glock_put, to force dlm to let go</div><div class='del'>-	 */</div><div class='del'>-	gfs2_holder_uninit(&amp;sdp-&gt;sd_jinode_gh);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Note: We need to be careful here:</div><div class='del'>-	 * Our iput of jd_inode will evict it. The evict will dequeue its</div><div class='del'>-	 * glock, but the glock dq will wait for the withdraw unless we have</div><div class='del'>-	 * exception code in glock_dq.</div><div class='del'>-	 */</div><div class='del'>-	iput(inode);</div><div class='del'>-	sdp-&gt;sd_jdesc-&gt;jd_inode = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * Wait until the journal inode's glock is freed. This allows try locks</div><div class='del'>-	 * on other nodes to be successful, otherwise we remain the owner of</div><div class='del'>-	 * the glock as far as dlm is concerned.</div><div class='del'>-	 */</div><div class='del'>-	if (i_gl-&gt;gl_ops-&gt;go_free) {</div><div class='del'>-		set_bit(GLF_FREEING, &amp;i_gl-&gt;gl_flags);</div><div class='del'>-		wait_on_bit(&amp;i_gl-&gt;gl_flags, GLF_FREEING, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 	}</div><div class='add'>+	clear_bit(SDF_JOURNAL_LIVE, &amp;sdp-&gt;sd_flags);</div><div class='add'>+	up_write(&amp;sdp-&gt;sd_log_flush_lock);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Dequeue the "live" glock, but keep a reference so it's never freed.</div><div class='del'>-	 */</div><div class='del'>-	gfs2_glock_hold(live_gl);</div><div class='del'>-	gfs2_glock_dq_wait(&amp;sdp-&gt;sd_live_gh);</div><div class='del'>-	/*</div><div class='del'>-	 * We enqueue the "live" glock in EX so that all other nodes</div><div class='del'>-	 * get a demote request and act on it. We don't really want the</div><div class='del'>-	 * lock in EX, so we send a "try" lock with 1CB to produce a callback.</div><div class='del'>-	 */</div><div class='del'>-	fs_warn(sdp, "Requesting recovery of jid %d.\n",</div><div class='del'>-		sdp-&gt;sd_lockstruct.ls_jid);</div><div class='del'>-	gfs2_holder_reinit(LM_ST_EXCLUSIVE,</div><div class='del'>-			   LM_FLAG_TRY_1CB | LM_FLAG_NOEXP | GL_NOPID,</div><div class='del'>-			   &amp;sdp-&gt;sd_live_gh);</div><div class='del'>-	msleep(GL_GLOCK_MAX_HOLD);</div><div class='del'>-	/*</div><div class='del'>-	 * This will likely fail in a cluster, but succeed standalone:</div><div class='del'>-	 */</div><div class='del'>-	ret = gfs2_glock_nq(&amp;sdp-&gt;sd_live_gh);</div><div class='add'>+	gfs2_ail_drain(sdp); /* frees all transactions */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If we actually got the "live" lock in EX mode, there are no other</div><div class='del'>-	 * nodes available to replay our journal. So we try to replay it</div><div class='del'>-	 * ourselves. We hold the "live" glock to prevent other mounters</div><div class='del'>-	 * during recovery, then just dequeue it and reacquire it in our</div><div class='del'>-	 * normal SH mode. Just in case the problem that caused us to</div><div class='del'>-	 * withdraw prevents us from recovering our journal (e.g. io errors</div><div class='del'>-	 * and such) we still check if the journal is clean before proceeding</div><div class='del'>-	 * but we may wait forever until another mounter does the recovery.</div><div class='del'>-	 */</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		fs_warn(sdp, "No other mounters found. Trying to recover our "</div><div class='del'>-			"own journal jid %d.\n", sdp-&gt;sd_lockstruct.ls_jid);</div><div class='del'>-		if (gfs2_recover_journal(sdp-&gt;sd_jdesc, 1))</div><div class='del'>-			fs_warn(sdp, "Unable to recover our journal jid %d.\n",</div><div class='del'>-				sdp-&gt;sd_lockstruct.ls_jid);</div><div class='del'>-		gfs2_glock_dq_wait(&amp;sdp-&gt;sd_live_gh);</div><div class='del'>-		gfs2_holder_reinit(LM_ST_SHARED,</div><div class='del'>-				   LM_FLAG_NOEXP | GL_EXACT | GL_NOPID,</div><div class='del'>-				   &amp;sdp-&gt;sd_live_gh);</div><div class='del'>-		gfs2_glock_nq(&amp;sdp-&gt;sd_live_gh);</div><div class='del'>-	}</div><div class='add'>+	wake_up(&amp;sdp-&gt;sd_logd_waitq);</div><div class='add'>+	wake_up(&amp;sdp-&gt;sd_quota_wait);</div><div class='ctx'> </div><div class='del'>-	gfs2_glock_queue_put(live_gl); /* drop extra reference we acquired */</div><div class='del'>-	clear_bit(SDF_WITHDRAW_RECOVERY, &amp;sdp-&gt;sd_flags);</div><div class='add'>+	wait_event_timeout(sdp-&gt;sd_log_waitq,</div><div class='add'>+			   gfs2_log_is_empty(sdp),</div><div class='add'>+			   HZ * 5);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * At this point our journal is evicted, so we need to get a new inode</div><div class='del'>-	 * for it. Once done, we need to call gfs2_find_jhead which</div><div class='del'>-	 * calls gfs2_map_journal_extents to map it for us again.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that we don't really want it to look up a FREE block. The</div><div class='del'>-	 * GFS2_BLKST_FREE simply overrides a block check in gfs2_inode_lookup</div><div class='del'>-	 * which would otherwise fail because it requires grabbing an rgrp</div><div class='del'>-	 * glock, which would fail with -EIO because we're withdrawing.</div><div class='del'>-	 */</div><div class='del'>-	inode = gfs2_inode_lookup(sdp-&gt;sd_vfs, DT_UNKNOWN,</div><div class='del'>-				  sdp-&gt;sd_jdesc-&gt;jd_no_addr, no_formal_ino,</div><div class='del'>-				  GFS2_BLKST_FREE);</div><div class='del'>-	if (IS_ERR(inode)) {</div><div class='del'>-		fs_warn(sdp, "Reprocessing of jid %d failed with %ld.\n",</div><div class='del'>-			sdp-&gt;sd_lockstruct.ls_jid, PTR_ERR(inode));</div><div class='del'>-		goto skip_recovery;</div><div class='del'>-	}</div><div class='del'>-	sdp-&gt;sd_jdesc-&gt;jd_inode = inode;</div><div class='del'>-	d_mark_dontcache(inode);</div><div class='add'>+	sdp-&gt;sd_vfs-&gt;s_flags |= SB_RDONLY;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Now wait until recovery is complete.</div><div class='add'>+	 * Dequeue any pending non-system glock holders that can no</div><div class='add'>+	 * longer be granted because the file system is withdrawn.</div><div class='ctx'> 	 */</div><div class='del'>-	for (tries = 0; tries &lt; 10; tries++) {</div><div class='del'>-		ret = check_journal_clean(sdp, sdp-&gt;sd_jdesc, false);</div><div class='del'>-		if (!ret)</div><div class='del'>-			break;</div><div class='del'>-		msleep(HZ);</div><div class='del'>-		fs_warn(sdp, "Waiting for journal recovery jid %d.\n",</div><div class='del'>-			sdp-&gt;sd_lockstruct.ls_jid);</div><div class='del'>-	}</div><div class='del'>-skip_recovery:</div><div class='del'>-	if (!ret)</div><div class='del'>-		fs_warn(sdp, "Journal recovery complete for jid %d.\n",</div><div class='del'>-			sdp-&gt;sd_lockstruct.ls_jid);</div><div class='del'>-	else</div><div class='del'>-		fs_warn(sdp, "Journal recovery skipped for jid %d until next "</div><div class='del'>-			"mount.\n", sdp-&gt;sd_lockstruct.ls_jid);</div><div class='del'>-	fs_warn(sdp, "Glock dequeues delayed: %lu\n", sdp-&gt;sd_glock_dqs_held);</div><div class='del'>-	sdp-&gt;sd_glock_dqs_held = 0;</div><div class='del'>-	wake_up_bit(&amp;sdp-&gt;sd_flags, SDF_WITHDRAW_RECOVERY);</div><div class='add'>+	gfs2_withdraw_glocks(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...)</div><div class='hunk'>@@ -318,50 +159,108 @@ void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...)</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int gfs2_withdraw(struct gfs2_sbd *sdp)</div><div class='add'>+/**</div><div class='add'>+ * gfs2_offline_uevent - run gfs2_withdraw_helper</div><div class='add'>+ * @sdp: The GFS2 superblock</div><div class='add'>+ */</div><div class='add'>+static bool gfs2_offline_uevent(struct gfs2_sbd *sdp)</div><div class='add'>+{</div><div class='add'>+	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='add'>+	long timeout;</div><div class='add'>+</div><div class='add'>+	/* Skip protocol "lock_nolock" which doesn't require shared storage. */</div><div class='add'>+	if (!ls-&gt;ls_ops-&gt;lm_lock)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The gfs2_withdraw_helper replies by writing one of the following</div><div class='add'>+	 * status codes to "/sys$DEVPATH/lock_module/withdraw":</div><div class='add'>+	 *</div><div class='add'>+	 * 0 - The shared block device has been marked inactive.  Future write</div><div class='add'>+	 *     operations will fail.</div><div class='add'>+	 *</div><div class='add'>+	 * 1 - The shared block device may still be active and carry out</div><div class='add'>+	 *     write operations.</div><div class='add'>+	 *</div><div class='add'>+	 * If the "offline" uevent isn't reacted upon in time, the event</div><div class='add'>+	 * handler is assumed to have failed.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	sdp-&gt;sd_withdraw_helper_status = -1;</div><div class='add'>+	kobject_uevent(&amp;sdp-&gt;sd_kobj, KOBJ_OFFLINE);</div><div class='add'>+	timeout = gfs2_tune_get(sdp, gt_withdraw_helper_timeout) * HZ;</div><div class='add'>+	wait_for_completion_timeout(&amp;sdp-&gt;sd_withdraw_helper, timeout);</div><div class='add'>+	if (sdp-&gt;sd_withdraw_helper_status == -1) {</div><div class='add'>+		fs_err(sdp, "%s timed out\n", "gfs2_withdraw_helper");</div><div class='add'>+	} else {</div><div class='add'>+		fs_err(sdp, "%s %s with status %d\n",</div><div class='add'>+		       "gfs2_withdraw_helper",</div><div class='add'>+		       sdp-&gt;sd_withdraw_helper_status == 0 ?</div><div class='add'>+		       "succeeded" : "failed",</div><div class='add'>+		       sdp-&gt;sd_withdraw_helper_status);</div><div class='add'>+	}</div><div class='add'>+	return sdp-&gt;sd_withdraw_helper_status == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gfs2_withdraw_func(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct gfs2_sbd *sdp = container_of(work, struct gfs2_sbd, sd_withdraw_work);</div><div class='ctx'> 	struct lm_lockstruct *ls = &amp;sdp-&gt;sd_lockstruct;</div><div class='ctx'> 	const struct lm_lockops *lm = ls-&gt;ls_ops;</div><div class='add'>+	bool device_inactive;</div><div class='ctx'> </div><div class='del'>-	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_WITHDRAW) {</div><div class='del'>-		unsigned long old = READ_ONCE(sdp-&gt;sd_flags), new;</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			if (old &amp; BIT(SDF_WITHDRAWN)) {</div><div class='del'>-				wait_on_bit(&amp;sdp-&gt;sd_flags,</div><div class='del'>-					    SDF_WITHDRAW_IN_PROG,</div><div class='del'>-					    TASK_UNINTERRUPTIBLE);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			new = old | BIT(SDF_WITHDRAWN) | BIT(SDF_WITHDRAW_IN_PROG);</div><div class='del'>-		} while (unlikely(!try_cmpxchg(&amp;sdp-&gt;sd_flags, &amp;old, new)));</div><div class='add'>+	if (test_bit(SDF_KILL, &amp;sdp-&gt;sd_flags))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		fs_err(sdp, "about to withdraw this file system\n");</div><div class='del'>-		BUG_ON(sdp-&gt;sd_args.ar_debug);</div><div class='add'>+	BUG_ON(sdp-&gt;sd_args.ar_debug);</div><div class='ctx'> </div><div class='del'>-		signal_our_withdraw(sdp);</div><div class='add'>+	/*</div><div class='add'>+	 * Try to deactivate the shared block device so that no more I/O will</div><div class='add'>+	 * go through.  If successful, we can immediately trigger remote</div><div class='add'>+	 * recovery.  Otherwise, we must first empty out all our local caches.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-		kobject_uevent(&amp;sdp-&gt;sd_kobj, KOBJ_OFFLINE);</div><div class='add'>+	device_inactive = gfs2_offline_uevent(sdp);</div><div class='ctx'> </div><div class='del'>-		if (!strcmp(sdp-&gt;sd_lockstruct.ls_ops-&gt;lm_proto_name, "lock_dlm"))</div><div class='del'>-			wait_for_completion(&amp;sdp-&gt;sd_wdack);</div><div class='add'>+	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_DEACTIVATE &amp;&amp; !device_inactive)</div><div class='add'>+		panic("GFS2: fsid=%s: panic requested\n", sdp-&gt;sd_fsname);</div><div class='ctx'> </div><div class='del'>-		if (lm-&gt;lm_unmount) {</div><div class='del'>-			fs_err(sdp, "telling LM to unmount\n");</div><div class='del'>-			lm-&gt;lm_unmount(sdp);</div><div class='add'>+	if (lm-&gt;lm_unmount) {</div><div class='add'>+		if (device_inactive) {</div><div class='add'>+			lm-&gt;lm_unmount(sdp, false);</div><div class='add'>+			do_withdraw(sdp);</div><div class='add'>+		} else {</div><div class='add'>+			do_withdraw(sdp);</div><div class='add'>+			lm-&gt;lm_unmount(sdp, false);</div><div class='ctx'> 		}</div><div class='del'>-		set_bit(SDF_SKIP_DLM_UNLOCK, &amp;sdp-&gt;sd_flags);</div><div class='del'>-		fs_err(sdp, "File system withdrawn\n");</div><div class='add'>+	} else {</div><div class='add'>+		do_withdraw(sdp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fs_err(sdp, "file system withdrawn\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gfs2_withdraw(struct gfs2_sbd *sdp)</div><div class='add'>+{</div><div class='add'>+	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_WITHDRAW ||</div><div class='add'>+	    sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_DEACTIVATE) {</div><div class='add'>+		if (test_and_set_bit(SDF_WITHDRAWN, &amp;sdp-&gt;sd_flags))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		dump_stack();</div><div class='del'>-		clear_bit(SDF_WITHDRAW_IN_PROG, &amp;sdp-&gt;sd_flags);</div><div class='del'>-		smp_mb__after_atomic();</div><div class='del'>-		wake_up_bit(&amp;sdp-&gt;sd_flags, SDF_WITHDRAW_IN_PROG);</div><div class='add'>+		/*</div><div class='add'>+		 * There is no need to withdraw when the superblock hasn't been</div><div class='add'>+		 * fully initialized, yet.</div><div class='add'>+		 */</div><div class='add'>+		if (!(sdp-&gt;sd_vfs-&gt;s_flags &amp; SB_BORN))</div><div class='add'>+			return;</div><div class='add'>+		fs_err(sdp, "about to withdraw this file system\n");</div><div class='add'>+		schedule_work(&amp;sdp-&gt;sd_withdraw_work);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_PANIC)</div><div class='ctx'> 		panic("GFS2: fsid=%s: panic requested\n", sdp-&gt;sd_fsname);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -369,28 +268,17 @@ int gfs2_withdraw(struct gfs2_sbd *sdp)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion,</div><div class='del'>-			    const char *function, char *file, unsigned int line,</div><div class='del'>-			    bool delayed)</div><div class='add'>+			    const char *function, char *file, unsigned int line)</div><div class='ctx'> {</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	fs_err(sdp,</div><div class='del'>-	       "fatal: assertion \"%s\" failed\n"</div><div class='del'>-	       "   function = %s, file = %s, line = %u\n",</div><div class='add'>+	       "fatal: assertion \"%s\" failed - "</div><div class='add'>+	       "function = %s, file = %s, line = %u\n",</div><div class='ctx'> 	       assertion, function, file, line);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If errors=panic was specified on mount, it won't help to delay the</div><div class='del'>-	 * withdraw.</div><div class='del'>-	 */</div><div class='del'>-	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_PANIC)</div><div class='del'>-		delayed = false;</div><div class='del'>-</div><div class='del'>-	if (delayed)</div><div class='del'>-		gfs2_withdraw_delayed(sdp);</div><div class='del'>-	else</div><div class='del'>-		gfs2_withdraw(sdp);</div><div class='add'>+	gfs2_withdraw(sdp);</div><div class='ctx'> 	dump_stack();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +295,8 @@ void gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_WITHDRAW)</div><div class='del'>-		fs_warn(sdp, "warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n",</div><div class='add'>+		fs_warn(sdp, "warning: assertion \"%s\" failed - "</div><div class='add'>+			"function = %s, file = %s, line = %u\n",</div><div class='ctx'> 			assertion, function, file, line);</div><div class='ctx'> </div><div class='ctx'> 	if (sdp-&gt;sd_args.ar_debug)</div><div class='hunk'>@@ -416,10 +305,10 @@ void gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,</div><div class='ctx'> 		dump_stack();</div><div class='ctx'> </div><div class='ctx'> 	if (sdp-&gt;sd_args.ar_errors == GFS2_ERRORS_PANIC)</div><div class='del'>-		panic("GFS2: fsid=%s: warning: assertion \"%s\" failed\n"</div><div class='del'>-		      "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",</div><div class='add'>+		panic("GFS2: fsid=%s: warning: assertion \"%s\" failed - "</div><div class='add'>+		      "function = %s, file = %s, line = %u\n",</div><div class='ctx'> 		      sdp-&gt;sd_fsname, assertion,</div><div class='del'>-		      sdp-&gt;sd_fsname, function, file, line);</div><div class='add'>+		      function, file, line);</div><div class='ctx'> </div><div class='ctx'> 	sdp-&gt;sd_last_warning = jiffies;</div><div class='ctx'> }</div><div class='hunk'>@@ -432,7 +321,8 @@ void gfs2_consist_i(struct gfs2_sbd *sdp, const char *function,</div><div class='ctx'> 		    char *file, unsigned int line)</div><div class='ctx'> {</div><div class='ctx'> 	gfs2_lm(sdp,</div><div class='del'>-		"fatal: filesystem consistency error - function = %s, file = %s, line = %u\n",</div><div class='add'>+		"fatal: filesystem consistency error - "</div><div class='add'>+		"function = %s, file = %s, line = %u\n",</div><div class='ctx'> 		function, file, line);</div><div class='ctx'> 	gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='hunk'>@@ -447,9 +337,9 @@ void gfs2_consist_inode_i(struct gfs2_inode *ip,</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='ctx'> </div><div class='ctx'> 	gfs2_lm(sdp,</div><div class='del'>-		"fatal: filesystem consistency error\n"</div><div class='del'>-		"  inode = %llu %llu\n"</div><div class='del'>-		"  function = %s, file = %s, line = %u\n",</div><div class='add'>+		"fatal: filesystem consistency error - "</div><div class='add'>+		"inode = %llu %llu, "</div><div class='add'>+		"function = %s, file = %s, line = %u\n",</div><div class='ctx'> 		(unsigned long long)ip-&gt;i_no_formal_ino,</div><div class='ctx'> 		(unsigned long long)ip-&gt;i_no_addr,</div><div class='ctx'> 		function, file, line);</div><div class='hunk'>@@ -470,9 +360,9 @@ void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,</div><div class='ctx'> 	sprintf(fs_id_buf, "fsid=%s: ", sdp-&gt;sd_fsname);</div><div class='ctx'> 	gfs2_rgrp_dump(NULL, rgd, fs_id_buf);</div><div class='ctx'> 	gfs2_lm(sdp,</div><div class='del'>-		"fatal: filesystem consistency error\n"</div><div class='del'>-		"  RG = %llu\n"</div><div class='del'>-		"  function = %s, file = %s, line = %u\n",</div><div class='add'>+		"fatal: filesystem consistency error - "</div><div class='add'>+		"RG = %llu, "</div><div class='add'>+		"function = %s, file = %s, line = %u\n",</div><div class='ctx'> 		(unsigned long long)rgd-&gt;rd_addr,</div><div class='ctx'> 		function, file, line);</div><div class='ctx'> 	gfs2_dump_glock(NULL, rgd-&gt;rd_gl, 1);</div><div class='hunk'>@@ -481,46 +371,36 @@ void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * gfs2_meta_check_ii - Flag a magic number consistency error and withdraw</div><div class='del'>- * Returns: -1 if this call withdrew the machine,</div><div class='del'>- *          -2 if it was already withdrawn</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='del'>-		       const char *type, const char *function, char *file,</div><div class='del'>-		       unsigned int line)</div><div class='add'>+void gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='add'>+			const char *function, char *file,</div><div class='add'>+			unsigned int line)</div><div class='ctx'> {</div><div class='del'>-	int me;</div><div class='del'>-</div><div class='ctx'> 	gfs2_lm(sdp,</div><div class='del'>-		"fatal: invalid metadata block\n"</div><div class='del'>-		"  bh = %llu (%s)\n"</div><div class='del'>-		"  function = %s, file = %s, line = %u\n",</div><div class='del'>-		(unsigned long long)bh-&gt;b_blocknr, type,</div><div class='add'>+		"fatal: invalid metadata block - "</div><div class='add'>+		"bh = %llu (bad magic number), "</div><div class='add'>+		"function = %s, file = %s, line = %u\n",</div><div class='add'>+		(unsigned long long)bh-&gt;b_blocknr,</div><div class='ctx'> 		function, file, line);</div><div class='del'>-	me = gfs2_withdraw(sdp);</div><div class='del'>-	return (me) ? -1 : -2;</div><div class='add'>+	gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * gfs2_metatype_check_ii - Flag a metadata type consistency error and withdraw</div><div class='del'>- * Returns: -1 if this call withdrew the machine,</div><div class='del'>- *          -2 if it was already withdrawn</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='del'>-			   u16 type, u16 t, const char *function,</div><div class='del'>-			   char *file, unsigned int line)</div><div class='add'>+void gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='add'>+			    u16 type, u16 t, const char *function,</div><div class='add'>+			    char *file, unsigned int line)</div><div class='ctx'> {</div><div class='del'>-	int me;</div><div class='del'>-</div><div class='ctx'> 	gfs2_lm(sdp,</div><div class='del'>-		"fatal: invalid metadata block\n"</div><div class='del'>-		"  bh = %llu (type: exp=%u, found=%u)\n"</div><div class='del'>-		"  function = %s, file = %s, line = %u\n",</div><div class='add'>+		"fatal: invalid metadata block - "</div><div class='add'>+		"bh = %llu (type: exp=%u, found=%u), "</div><div class='add'>+		"function = %s, file = %s, line = %u\n",</div><div class='ctx'> 		(unsigned long long)bh-&gt;b_blocknr, type, t,</div><div class='ctx'> 		function, file, line);</div><div class='del'>-	me = gfs2_withdraw(sdp);</div><div class='del'>-	return (me) ? -1 : -2;</div><div class='add'>+	gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -529,33 +409,29 @@ int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='ctx'>  *          0 if it was already withdrawn</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, char *file,</div><div class='del'>-		    unsigned int line)</div><div class='add'>+void gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, char *file,</div><div class='add'>+		     unsigned int line)</div><div class='ctx'> {</div><div class='ctx'> 	gfs2_lm(sdp,</div><div class='del'>-		"fatal: I/O error\n"</div><div class='del'>-		"  function = %s, file = %s, line = %u\n",</div><div class='add'>+		"fatal: I/O error - "</div><div class='add'>+		"function = %s, file = %s, line = %u\n",</div><div class='ctx'> 		function, file, line);</div><div class='del'>-	return gfs2_withdraw(sdp);</div><div class='add'>+	gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * gfs2_io_error_bh_i - Flag a buffer I/O error</div><div class='del'>- * @withdraw: withdraw the filesystem</div><div class='add'>+ * gfs2_io_error_bh_i - Flag a buffer I/O error and withdraw</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='del'>-			const char *function, char *file, unsigned int line,</div><div class='del'>-			bool withdraw)</div><div class='add'>+			const char *function, char *file, unsigned int line)</div><div class='ctx'> {</div><div class='del'>-	if (gfs2_withdrawing_or_withdrawn(sdp))</div><div class='add'>+	if (gfs2_withdrawn(sdp))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fs_err(sdp, "fatal: I/O error\n"</div><div class='del'>-	       "  block = %llu\n"</div><div class='del'>-	       "  function = %s, file = %s, line = %u\n",</div><div class='add'>+	fs_err(sdp, "fatal: I/O error - "</div><div class='add'>+	       "block = %llu, "</div><div class='add'>+	       "function = %s, file = %s, line = %u\n",</div><div class='ctx'> 	       (unsigned long long)bh-&gt;b_blocknr, function, file, line);</div><div class='del'>-	if (withdraw)</div><div class='del'>-		gfs2_withdraw(sdp);</div><div class='add'>+	gfs2_withdraw(sdp);</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h<br/>index ba071998461f..ffcc47d6b0b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/util.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/util.h</a></div><div class='hunk'>@@ -37,24 +37,14 @@ do { \</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion,</div><div class='del'>-			    const char *function, char *file, unsigned int line,</div><div class='del'>-			    bool delayed);</div><div class='add'>+			    const char *function, char *file, unsigned int line);</div><div class='ctx'> </div><div class='ctx'> #define gfs2_assert_withdraw(sdp, assertion) \</div><div class='ctx'> 	({ \</div><div class='ctx'> 		bool _bool = (assertion); \</div><div class='ctx'> 		if (unlikely(!_bool)) \</div><div class='ctx'> 			gfs2_assert_withdraw_i((sdp), #assertion, \</div><div class='del'>-					__func__, __FILE__, __LINE__, false); \</div><div class='del'>-		!_bool; \</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define gfs2_assert_withdraw_delayed(sdp, assertion) \</div><div class='del'>-	({ \</div><div class='del'>-		bool _bool = (assertion); \</div><div class='del'>-		if (unlikely(!_bool)) \</div><div class='del'>-			gfs2_assert_withdraw_i((sdp), #assertion, \</div><div class='del'>-					__func__, __FILE__, __LINE__, true); \</div><div class='add'>+					__func__, __FILE__, __LINE__); \</div><div class='ctx'> 		!_bool; \</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='hunk'>@@ -91,9 +81,9 @@ void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,</div><div class='ctx'> gfs2_consist_rgrpd_i((rgd), __func__, __FILE__, __LINE__)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='del'>-		       const char *type, const char *function,</div><div class='del'>-		       char *file, unsigned int line);</div><div class='add'>+void gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='add'>+			const char *function,</div><div class='add'>+			char *file, unsigned int line);</div><div class='ctx'> </div><div class='ctx'> static inline int gfs2_meta_check(struct gfs2_sbd *sdp,</div><div class='ctx'> 				    struct buffer_head *bh)</div><div class='hunk'>@@ -108,10 +98,10 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='del'>-			   u16 type, u16 t,</div><div class='del'>-			   const char *function,</div><div class='del'>-			   char *file, unsigned int line);</div><div class='add'>+void gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='add'>+			    u16 type, u16 t,</div><div class='add'>+			    const char *function,</div><div class='add'>+			    char *file, unsigned int line);</div><div class='ctx'> </div><div class='ctx'> static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp,</div><div class='ctx'> 					struct buffer_head *bh,</div><div class='hunk'>@@ -122,12 +112,16 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp,</div><div class='ctx'> 	struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh-&gt;b_data;</div><div class='ctx'> 	u32 magic = be32_to_cpu(mh-&gt;mh_magic);</div><div class='ctx'> 	u16 t = be32_to_cpu(mh-&gt;mh_type);</div><div class='del'>-	if (unlikely(magic != GFS2_MAGIC))</div><div class='del'>-		return gfs2_meta_check_ii(sdp, bh, "magic number", function,</div><div class='del'>-					  file, line);</div><div class='del'>-        if (unlikely(t != type))</div><div class='del'>-		return gfs2_metatype_check_ii(sdp, bh, type, t, function,</div><div class='del'>-					      file, line);</div><div class='add'>+	if (unlikely(magic != GFS2_MAGIC)) {</div><div class='add'>+		gfs2_meta_check_ii(sdp, bh, function,</div><div class='add'>+				   file, line);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+        if (unlikely(t != type)) {</div><div class='add'>+		gfs2_metatype_check_ii(sdp, bh, type, t, function,</div><div class='add'>+				       file, line);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -144,27 +138,23 @@ static inline void gfs2_metatype_set(struct buffer_head *bh, u16 type,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function,</div><div class='del'>-		    char *file, unsigned int line);</div><div class='add'>+void gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function,</div><div class='add'>+		     char *file, unsigned int line);</div><div class='ctx'> </div><div class='ctx'> int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,</div><div class='ctx'> 		        bool verbose);</div><div class='ctx'> int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp);</div><div class='del'>-void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh);</div><div class='add'>+void gfs2_freeze_unlock(struct gfs2_sbd *sdp);</div><div class='ctx'> </div><div class='ctx'> #define gfs2_io_error(sdp) \</div><div class='ctx'> gfs2_io_error_i((sdp), __func__, __FILE__, __LINE__)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,</div><div class='del'>-			const char *function, char *file, unsigned int line,</div><div class='del'>-			bool withdraw);</div><div class='del'>-</div><div class='del'>-#define gfs2_io_error_bh_wd(sdp, bh) \</div><div class='del'>-gfs2_io_error_bh_i((sdp), (bh), __func__, __FILE__, __LINE__, true)</div><div class='add'>+			const char *function, char *file, unsigned int line);</div><div class='ctx'> </div><div class='ctx'> #define gfs2_io_error_bh(sdp, bh) \</div><div class='del'>-gfs2_io_error_bh_i((sdp), (bh), __func__, __FILE__, __LINE__, false)</div><div class='add'>+gfs2_io_error_bh_i((sdp), (bh), __func__, __FILE__, __LINE__)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *gfs2_glock_cachep;</div><div class='hunk'>@@ -189,38 +179,12 @@ static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * gfs2_withdraw_delayed - withdraw as soon as possible without deadlocks</div><div class='add'>+ * gfs2_withdrawn - test whether the file system is withdrawn</div><div class='ctx'>  * @sdp: the superblock</div><div class='ctx'>  */</div><div class='del'>-static inline void gfs2_withdraw_delayed(struct gfs2_sbd *sdp)</div><div class='add'>+static inline bool gfs2_withdrawn(struct gfs2_sbd *sdp)</div><div class='ctx'> {</div><div class='del'>-	set_bit(SDF_WITHDRAWING, &amp;sdp-&gt;sd_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gfs2_withdrawing_or_withdrawn - test whether the file system is withdrawing</div><div class='del'>- *                                 or withdrawn</div><div class='del'>- * @sdp: the superblock</div><div class='del'>- */</div><div class='del'>-static inline bool gfs2_withdrawing_or_withdrawn(struct gfs2_sbd *sdp)</div><div class='del'>-{</div><div class='del'>-	return unlikely(test_bit(SDF_WITHDRAWN, &amp;sdp-&gt;sd_flags) ||</div><div class='del'>-			test_bit(SDF_WITHDRAWING, &amp;sdp-&gt;sd_flags));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gfs2_withdrawing - check if a withdraw is pending</div><div class='del'>- * @sdp: the superblock</div><div class='del'>- */</div><div class='del'>-static inline bool gfs2_withdrawing(struct gfs2_sbd *sdp)</div><div class='del'>-{</div><div class='del'>-	return unlikely(test_bit(SDF_WITHDRAWING, &amp;sdp-&gt;sd_flags) &amp;&amp;</div><div class='del'>-			!test_bit(SDF_WITHDRAWN, &amp;sdp-&gt;sd_flags));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool gfs2_withdraw_in_prog(struct gfs2_sbd *sdp)</div><div class='del'>-{</div><div class='del'>-	return unlikely(test_bit(SDF_WITHDRAW_IN_PROG, &amp;sdp-&gt;sd_flags));</div><div class='add'>+	return unlikely(test_bit(SDF_WITHDRAWN, &amp;sdp-&gt;sd_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define gfs2_tune_get(sdp, field) \</div><div class='hunk'>@@ -228,6 +192,8 @@ gfs2_tune_get_i(&amp;(sdp)-&gt;sd_tune, &amp;(sdp)-&gt;sd_tune.field)</div><div class='ctx'> </div><div class='ctx'> __printf(2, 3)</div><div class='ctx'> void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...);</div><div class='del'>-int gfs2_withdraw(struct gfs2_sbd *sdp);</div><div class='add'>+</div><div class='add'>+void gfs2_withdraw_func(struct work_struct *work);</div><div class='add'>+void gfs2_withdraw(struct gfs2_sbd *sdp);</div><div class='ctx'> </div><div class='ctx'> #endif /* __UTIL_DOT_H__ */</div><div class='head'>diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c<br/>index 8c96ba6230d1..df9c93de94c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/xattr.c</a></div><div class='hunk'>@@ -96,30 +96,34 @@ static int ea_foreach_i(struct gfs2_inode *ip, struct buffer_head *bh,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	for (ea = GFS2_EA_BH2FIRST(bh);; prev = ea, ea = GFS2_EA2NEXT(ea)) {</div><div class='del'>-		if (!GFS2_EA_REC_LEN(ea))</div><div class='del'>-			goto fail;</div><div class='add'>+		if (!GFS2_EA_REC_LEN(ea)) {</div><div class='add'>+			gfs2_consist_inode(ip);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 		if (!(bh-&gt;b_data &lt;= (char *)ea &amp;&amp; (char *)GFS2_EA2NEXT(ea) &lt;=</div><div class='del'>-						  bh-&gt;b_data + bh-&gt;b_size))</div><div class='del'>-			goto fail;</div><div class='del'>-		if (!gfs2_eatype_valid(sdp, ea-&gt;ea_type))</div><div class='del'>-			goto fail;</div><div class='add'>+						  bh-&gt;b_data + bh-&gt;b_size)) {</div><div class='add'>+			gfs2_consist_inode(ip);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		if (!gfs2_eatype_valid(sdp, ea-&gt;ea_type)) {</div><div class='add'>+			gfs2_consist_inode(ip);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 		error = ea_call(ip, bh, ea, prev, data);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			return error;</div><div class='ctx'> </div><div class='ctx'> 		if (GFS2_EA_IS_LAST(ea)) {</div><div class='ctx'> 			if ((char *)GFS2_EA2NEXT(ea) !=</div><div class='del'>-			    bh-&gt;b_data + bh-&gt;b_size)</div><div class='del'>-				goto fail;</div><div class='add'>+			    bh-&gt;b_data + bh-&gt;b_size) {</div><div class='add'>+				gfs2_consist_inode(ip);</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	gfs2_consist_inode(ip);</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ea_foreach(struct gfs2_inode *ip, ea_call_t ea_call, void *data)</div><div class='hunk'>@@ -1379,7 +1383,7 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ea_dealloc_block(struct gfs2_inode *ip)</div><div class='add'>+static int ea_dealloc_block(struct gfs2_inode *ip, bool initialized)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfs2_sbd *sdp = GFS2_SB(&amp;ip-&gt;i_inode);</div><div class='ctx'> 	struct gfs2_rgrpd *rgd;</div><div class='hunk'>@@ -1412,7 +1416,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip)</div><div class='ctx'> 	ip-&gt;i_eattr = 0;</div><div class='ctx'> 	gfs2_add_inode_blocks(&amp;ip-&gt;i_inode, -1);</div><div class='ctx'> </div><div class='del'>-	if (likely(!test_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags))) {</div><div class='add'>+	if (initialized) {</div><div class='ctx'> 		error = gfs2_meta_inode_buffer(ip, &amp;dibh);</div><div class='ctx'> 		if (!error) {</div><div class='ctx'> 			gfs2_trans_add_meta(ip-&gt;i_gl, dibh);</div><div class='hunk'>@@ -1431,11 +1435,12 @@ out_gunlock:</div><div class='ctx'> /**</div><div class='ctx'>  * gfs2_ea_dealloc - deallocate the extended attribute fork</div><div class='ctx'>  * @ip: the inode</div><div class='add'>+ * @initialized: xattrs have been initialized</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: errno</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int gfs2_ea_dealloc(struct gfs2_inode *ip)</div><div class='add'>+int gfs2_ea_dealloc(struct gfs2_inode *ip, bool initialized)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -1447,7 +1452,7 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	if (likely(!test_bit(GIF_ALLOC_FAILED, &amp;ip-&gt;i_flags))) {</div><div class='add'>+	if (initialized) {</div><div class='ctx'> 		error = ea_foreach(ip, ea_dealloc_unstuffed, NULL);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out_quota;</div><div class='hunk'>@@ -1459,7 +1464,7 @@ int gfs2_ea_dealloc(struct gfs2_inode *ip)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = ea_dealloc_block(ip);</div><div class='add'>+	error = ea_dealloc_block(ip, initialized);</div><div class='ctx'> </div><div class='ctx'> out_quota:</div><div class='ctx'> 	gfs2_quota_unhold(ip);</div><div class='head'>diff --git a/fs/gfs2/xattr.h b/fs/gfs2/xattr.h<br/>index eb12eb7e37c1..3c9788e0e137 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/gfs2/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/gfs2/xattr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/gfs2/xattr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/gfs2/xattr.h</a></div><div class='hunk'>@@ -54,7 +54,7 @@ int __gfs2_xattr_set(struct inode *inode, const char *name,</div><div class='ctx'> 		     const void *value, size_t size,</div><div class='ctx'> 		     int flags, int type);</div><div class='ctx'> ssize_t gfs2_listxattr(struct dentry *dentry, char *buffer, size_t size);</div><div class='del'>-int gfs2_ea_dealloc(struct gfs2_inode *ip);</div><div class='add'>+int gfs2_ea_dealloc(struct gfs2_inode *ip, bool initialized);</div><div class='ctx'> </div><div class='ctx'> /* Exported to acl.c */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfs/.kunitconfig b/fs/hfs/.kunitconfig<br/>new file mode 100644<br/>index 000000000000..5caa9af1e3bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/.kunitconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/.kunitconfig</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+CONFIG_KUNIT=y</div><div class='add'>+CONFIG_HFS_FS=y</div><div class='add'>+CONFIG_HFS_KUNIT_TEST=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_BUFFER_HEAD=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_LEGACY_DIRECT_IO=y</div><div class='head'>diff --git a/fs/hfs/Kconfig b/fs/hfs/Kconfig<br/>index 5ea5cd8ecea9..7f3cbe43b4b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/Kconfig</a></div><div class='hunk'>@@ -13,3 +13,18 @@ config HFS_FS</div><div class='ctx'> </div><div class='ctx'> 	  To compile this file system support as a module, choose M here: the</div><div class='ctx'> 	  module will be called hfs.</div><div class='add'>+</div><div class='add'>+config HFS_KUNIT_TEST</div><div class='add'>+	tristate "KUnit tests for HFS filesystem" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on HFS_FS &amp;&amp; KUNIT</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  This builds KUnit tests for the HFS filesystem.</div><div class='add'>+</div><div class='add'>+	  KUnit tests run during boot and output the results to the debug</div><div class='add'>+	  log in TAP format (https://testanything.org/). Only useful for</div><div class='add'>+	  kernel devs running KUnit test harness and are not for inclusion</div><div class='add'>+	  into a production build.</div><div class='add'>+</div><div class='add'>+	  For more information on KUnit and unit tests in general please</div><div class='add'>+	  refer to the KUnit documentation in Documentation/dev-tools/kunit/.</div><div class='head'>diff --git a/fs/hfs/Makefile b/fs/hfs/Makefile<br/>index b65459bf3dc4..a7c9ce6b4609 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/Makefile</a></div><div class='hunk'>@@ -9,3 +9,5 @@ hfs-objs := bitmap.o bfind.o bnode.o brec.o btree.o \</div><div class='ctx'> 	    catalog.o dir.o extent.o inode.o attr.o mdb.o \</div><div class='ctx'>             part_tbl.o string.o super.o sysdep.o trans.o</div><div class='ctx'> </div><div class='add'>+# KUnit tests</div><div class='add'>+obj-$(CONFIG_HFS_KUNIT_TEST) += string_test.o</div><div class='head'>diff --git a/fs/hfs/bfind.c b/fs/hfs/bfind.c<br/>index ef9498a6e88a..d56e47bdc517 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/bfind.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/bfind.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/bfind.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/bfind.c</a></div><div class='hunk'>@@ -16,14 +16,17 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd)</div><div class='ctx'> {</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> </div><div class='add'>+	if (!tree || !fd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	fd-&gt;tree = tree;</div><div class='ctx'> 	fd-&gt;bnode = NULL;</div><div class='del'>-	ptr = kmalloc(tree-&gt;max_key_len * 2 + 4, GFP_KERNEL);</div><div class='add'>+	ptr = kzalloc(tree-&gt;max_key_len * 2 + 4, GFP_KERNEL);</div><div class='ctx'> 	if (!ptr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	fd-&gt;search_key = ptr;</div><div class='ctx'> 	fd-&gt;key = ptr + tree-&gt;max_key_len + 2;</div><div class='del'>-	hfs_dbg(BNODE_REFS, "find_init: %d (%p)\n",</div><div class='add'>+	hfs_dbg("cnid %d, caller %ps\n",</div><div class='ctx'> 		tree-&gt;cnid, __builtin_return_address(0));</div><div class='ctx'> 	switch (tree-&gt;cnid) {</div><div class='ctx'> 	case HFS_CAT_CNID:</div><div class='hunk'>@@ -45,7 +48,7 @@ void hfs_find_exit(struct hfs_find_data *fd)</div><div class='ctx'> {</div><div class='ctx'> 	hfs_bnode_put(fd-&gt;bnode);</div><div class='ctx'> 	kfree(fd-&gt;search_key);</div><div class='del'>-	hfs_dbg(BNODE_REFS, "find_exit: %d (%p)\n",</div><div class='add'>+	hfs_dbg("cnid %d, caller %ps\n",</div><div class='ctx'> 		fd-&gt;tree-&gt;cnid, __builtin_return_address(0));</div><div class='ctx'> 	mutex_unlock(&amp;fd-&gt;tree-&gt;tree_lock);</div><div class='ctx'> 	fd-&gt;tree = NULL;</div><div class='hunk'>@@ -112,6 +115,12 @@ int hfs_brec_find(struct hfs_find_data *fd)</div><div class='ctx'> 	__be32 data;</div><div class='ctx'> 	int height, res;</div><div class='ctx'> </div><div class='add'>+	fd-&gt;record = -1;</div><div class='add'>+	fd-&gt;keyoffset = -1;</div><div class='add'>+	fd-&gt;keylength = -1;</div><div class='add'>+	fd-&gt;entryoffset = -1;</div><div class='add'>+	fd-&gt;entrylength = -1;</div><div class='add'>+</div><div class='ctx'> 	tree = fd-&gt;tree;</div><div class='ctx'> 	if (fd-&gt;bnode)</div><div class='ctx'> 		hfs_bnode_put(fd-&gt;bnode);</div><div class='hunk'>@@ -158,7 +167,7 @@ release:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfs_brec_read(struct hfs_find_data *fd, void *rec, int rec_len)</div><div class='add'>+int hfs_brec_read(struct hfs_find_data *fd, void *rec, u32 rec_len)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfs/bitmap.c b/fs/hfs/bitmap.c<br/>index 28307bc9ec1e..5e84833a4743 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/bitmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/bitmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/bitmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/bitmap.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ u32 hfs_vbm_search_free(struct super_block *sb, u32 goal, u32 *num_bits)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BITMAP, "alloc_bits: %u,%u\n", pos, *num_bits);</div><div class='add'>+	hfs_dbg("pos %u, num_bits %u\n", pos, *num_bits);</div><div class='ctx'> 	HFS_SB(sb)-&gt;free_ablocks -= *num_bits;</div><div class='ctx'> 	hfs_bitmap_dirty(sb);</div><div class='ctx'> out:</div><div class='hunk'>@@ -200,7 +200,7 @@ int hfs_clear_vbm_bits(struct super_block *sb, u16 start, u16 count)</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BITMAP, "clear_bits: %u,%u\n", start, count);</div><div class='add'>+	hfs_dbg("start %u, count %u\n", start, count);</div><div class='ctx'> 	/* are all of the bits in range? */</div><div class='ctx'> 	if ((start + count) &gt; HFS_SB(sb)-&gt;fs_ablocks)</div><div class='ctx'> 		return -2;</div><div class='head'>diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c<br/>index 6add6ebfef89..13d58c51fc46 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/bnode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/bnode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/bnode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/bnode.c</a></div><div class='hunk'>@@ -15,12 +15,68 @@</div><div class='ctx'> </div><div class='ctx'> #include "btree.h"</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='add'>+static inline</div><div class='add'>+bool is_bnode_offset_valid(struct hfs_bnode *node, u32 off)</div><div class='add'>+{</div><div class='add'>+	bool is_valid = off &lt; node-&gt;tree-&gt;node_size;</div><div class='add'>+</div><div class='add'>+	if (!is_valid) {</div><div class='add'>+		pr_err("requested invalid offset: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return is_valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 check_and_correct_requested_length(struct hfs_bnode *node, u32 off, u32 len)</div><div class='add'>+{</div><div class='add'>+	unsigned int node_size;</div><div class='add'>+</div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	node_size = node-&gt;tree-&gt;node_size;</div><div class='add'>+</div><div class='add'>+	if ((off + len) &gt; node_size) {</div><div class='add'>+		u32 new_len = node_size - off;</div><div class='add'>+</div><div class='add'>+		pr_err("requested length has been corrected: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, "</div><div class='add'>+		       "requested_len %u, corrected_len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len, new_len);</div><div class='add'>+</div><div class='add'>+		return new_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hfs_bnode_read(struct hfs_bnode *node, void *buf, u32 off, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	int pagenum;</div><div class='del'>-	int bytes_read;</div><div class='del'>-	int bytes_to_read;</div><div class='add'>+	u32 pagenum;</div><div class='add'>+	u32 bytes_read;</div><div class='add'>+	u32 bytes_to_read;</div><div class='add'>+</div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len == 0) {</div><div class='add'>+		pr_err("requested zero length: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='ctx'> </div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	pagenum = off &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -30,7 +86,7 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='ctx'> 		if (pagenum &gt;= node-&gt;tree-&gt;pages_per_bnode)</div><div class='ctx'> 			break;</div><div class='ctx'> 		page = node-&gt;page[pagenum];</div><div class='del'>-		bytes_to_read = min_t(int, len - bytes_read, PAGE_SIZE - off);</div><div class='add'>+		bytes_to_read = min_t(u32, len - bytes_read, PAGE_SIZE - off);</div><div class='ctx'> </div><div class='ctx'> 		memcpy_from_page(buf + bytes_read, page, off, bytes_to_read);</div><div class='ctx'> </div><div class='hunk'>@@ -39,7 +95,7 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)</div><div class='add'>+u16 hfs_bnode_read_u16(struct hfs_bnode *node, u32 off)</div><div class='ctx'> {</div><div class='ctx'> 	__be16 data;</div><div class='ctx'> 	// optimize later...</div><div class='hunk'>@@ -47,7 +103,7 @@ u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)</div><div class='ctx'> 	return be16_to_cpu(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off)</div><div class='add'>+u8 hfs_bnode_read_u8(struct hfs_bnode *node, u32 off)</div><div class='ctx'> {</div><div class='ctx'> 	u8 data;</div><div class='ctx'> 	// optimize later...</div><div class='hunk'>@@ -55,10 +111,10 @@ u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off)</div><div class='add'>+void hfs_bnode_read_key(struct hfs_bnode *node, void *key, u32 off)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfs_btree *tree;</div><div class='del'>-	int key_len;</div><div class='add'>+	u32 key_len;</div><div class='ctx'> </div><div class='ctx'> 	tree = node-&gt;tree;</div><div class='ctx'> 	if (node-&gt;type == HFS_NODE_LEAF ||</div><div class='hunk'>@@ -67,13 +123,33 @@ void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off)</div><div class='ctx'> 	else</div><div class='ctx'> 		key_len = tree-&gt;max_key_len + 1;</div><div class='ctx'> </div><div class='add'>+	if (key_len &gt; sizeof(hfs_btree_key) || key_len &lt; 1) {</div><div class='add'>+		memset(key, 0, sizeof(hfs_btree_key));</div><div class='add'>+		pr_err("hfs: Invalid key length: %u\n", key_len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hfs_bnode_read(node, key, off, key_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='add'>+void hfs_bnode_write(struct hfs_bnode *node, void *buf, u32 off, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len == 0) {</div><div class='add'>+		pr_err("requested zero length: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='add'>+</div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	page = node-&gt;page[0];</div><div class='ctx'> </div><div class='hunk'>@@ -81,23 +157,37 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='ctx'> 	set_page_dirty(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_write_u16(struct hfs_bnode *node, int off, u16 data)</div><div class='add'>+void hfs_bnode_write_u16(struct hfs_bnode *node, u32 off, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	__be16 v = cpu_to_be16(data);</div><div class='ctx'> 	// optimize later...</div><div class='ctx'> 	hfs_bnode_write(node, &amp;v, off, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_write_u8(struct hfs_bnode *node, int off, u8 data)</div><div class='add'>+void hfs_bnode_write_u8(struct hfs_bnode *node, u32 off, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	// optimize later...</div><div class='ctx'> 	hfs_bnode_write(node, &amp;data, off, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)</div><div class='add'>+void hfs_bnode_clear(struct hfs_bnode *node, u32 off, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len == 0) {</div><div class='add'>+		pr_err("requested zero length: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='add'>+</div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	page = node-&gt;page[0];</div><div class='ctx'> </div><div class='hunk'>@@ -105,14 +195,18 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)</div><div class='ctx'> 	set_page_dirty(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,</div><div class='del'>-		struct hfs_bnode *src_node, int src, int len)</div><div class='add'>+void hfs_bnode_copy(struct hfs_bnode *dst_node, u32 dst,</div><div class='add'>+		    struct hfs_bnode *src_node, u32 src, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *src_page, *dst_page;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len);</div><div class='add'>+	hfs_dbg("dst %u, src %u, len %u\n", dst, src, len);</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(src_node, src, len);</div><div class='add'>+	len = check_and_correct_requested_length(dst_node, dst, len);</div><div class='add'>+</div><div class='ctx'> 	src += src_node-&gt;page_offset;</div><div class='ctx'> 	dst += dst_node-&gt;page_offset;</div><div class='ctx'> 	src_page = src_node-&gt;page[0];</div><div class='hunk'>@@ -122,14 +216,18 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,</div><div class='ctx'> 	set_page_dirty(dst_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)</div><div class='add'>+void hfs_bnode_move(struct hfs_bnode *node, u32 dst, u32 src, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len);</div><div class='add'>+	hfs_dbg("dst %u, src %u, len %u\n", dst, src, len);</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, src, len);</div><div class='add'>+	len = check_and_correct_requested_length(node, dst, len);</div><div class='add'>+</div><div class='ctx'> 	src += node-&gt;page_offset;</div><div class='ctx'> 	dst += node-&gt;page_offset;</div><div class='ctx'> 	page = node-&gt;page[0];</div><div class='hunk'>@@ -145,16 +243,16 @@ void hfs_bnode_dump(struct hfs_bnode *node)</div><div class='ctx'> 	__be32 cnid;</div><div class='ctx'> 	int i, off, key_off;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "bnode: %d\n", node-&gt;this);</div><div class='add'>+	hfs_dbg("node %d\n", node-&gt;this);</div><div class='ctx'> 	hfs_bnode_read(node, &amp;desc, 0, sizeof(desc));</div><div class='del'>-	hfs_dbg(BNODE_MOD, "%d, %d, %d, %d, %d\n",</div><div class='add'>+	hfs_dbg("next %d, prev %d, type %d, height %d, num_recs %d\n",</div><div class='ctx'> 		be32_to_cpu(desc.next), be32_to_cpu(desc.prev),</div><div class='ctx'> 		desc.type, desc.height, be16_to_cpu(desc.num_recs));</div><div class='ctx'> </div><div class='ctx'> 	off = node-&gt;tree-&gt;node_size - 2;</div><div class='ctx'> 	for (i = be16_to_cpu(desc.num_recs); i &gt;= 0; off -= 2, i--) {</div><div class='ctx'> 		key_off = hfs_bnode_read_u16(node, off);</div><div class='del'>-		hfs_dbg_cont(BNODE_MOD, " %d", key_off);</div><div class='add'>+		hfs_dbg(" key_off %d", key_off);</div><div class='ctx'> 		if (i &amp;&amp; node-&gt;type == HFS_NODE_INDEX) {</div><div class='ctx'> 			int tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -162,18 +260,18 @@ void hfs_bnode_dump(struct hfs_bnode *node)</div><div class='ctx'> 				tmp = (hfs_bnode_read_u8(node, key_off) | 1) + 1;</div><div class='ctx'> 			else</div><div class='ctx'> 				tmp = node-&gt;tree-&gt;max_key_len + 1;</div><div class='del'>-			hfs_dbg_cont(BNODE_MOD, " (%d,%d",</div><div class='del'>-				     tmp, hfs_bnode_read_u8(node, key_off));</div><div class='add'>+			hfs_dbg(" (%d,%d",</div><div class='add'>+				tmp, hfs_bnode_read_u8(node, key_off));</div><div class='ctx'> 			hfs_bnode_read(node, &amp;cnid, key_off + tmp, 4);</div><div class='del'>-			hfs_dbg_cont(BNODE_MOD, ",%d)", be32_to_cpu(cnid));</div><div class='add'>+			hfs_dbg(", cnid %d)", be32_to_cpu(cnid));</div><div class='ctx'> 		} else if (i &amp;&amp; node-&gt;type == HFS_NODE_LEAF) {</div><div class='ctx'> 			int tmp;</div><div class='ctx'> </div><div class='ctx'> 			tmp = hfs_bnode_read_u8(node, key_off);</div><div class='del'>-			hfs_dbg_cont(BNODE_MOD, " (%d)", tmp);</div><div class='add'>+			hfs_dbg(" (%d)", tmp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	hfs_dbg_cont(BNODE_MOD, "\n");</div><div class='add'>+	hfs_dbg("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hfs_bnode_unlink(struct hfs_bnode *node)</div><div class='hunk'>@@ -263,7 +361,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)</div><div class='ctx'> 	node-&gt;this = cnid;</div><div class='ctx'> 	set_bit(HFS_BNODE_NEW, &amp;node-&gt;flags);</div><div class='ctx'> 	atomic_set(&amp;node-&gt;refcnt, 1);</div><div class='del'>-	hfs_dbg(BNODE_REFS, "new_node(%d:%d): 1\n",</div><div class='add'>+	hfs_dbg("cnid %d, node %d, refcnt 1\n",</div><div class='ctx'> 		node-&gt;tree-&gt;cnid, node-&gt;this);</div><div class='ctx'> 	init_waitqueue_head(&amp;node-&gt;lock_wq);</div><div class='ctx'> 	spin_lock(&amp;tree-&gt;hash_lock);</div><div class='hunk'>@@ -303,7 +401,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfs_bnode **p;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_REFS, "remove_node(%d:%d): %d\n",</div><div class='add'>+	hfs_dbg("cnid %d, node %d, refcnt %d\n",</div><div class='ctx'> 		node-&gt;tree-&gt;cnid, node-&gt;this, atomic_read(&amp;node-&gt;refcnt));</div><div class='ctx'> 	for (p = &amp;node-&gt;tree-&gt;node_hash[hfs_bnode_hash(node-&gt;this)];</div><div class='ctx'> 	     *p &amp;&amp; *p != node; p = &amp;(*p)-&gt;next_hash)</div><div class='hunk'>@@ -448,7 +546,7 @@ void hfs_bnode_get(struct hfs_bnode *node)</div><div class='ctx'> {</div><div class='ctx'> 	if (node) {</div><div class='ctx'> 		atomic_inc(&amp;node-&gt;refcnt);</div><div class='del'>-		hfs_dbg(BNODE_REFS, "get_node(%d:%d): %d\n",</div><div class='add'>+		hfs_dbg("cnid %d, node %d, refcnt %d\n",</div><div class='ctx'> 			node-&gt;tree-&gt;cnid, node-&gt;this,</div><div class='ctx'> 			atomic_read(&amp;node-&gt;refcnt));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -461,7 +559,7 @@ void hfs_bnode_put(struct hfs_bnode *node)</div><div class='ctx'> 		struct hfs_btree *tree = node-&gt;tree;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		hfs_dbg(BNODE_REFS, "put_node(%d:%d): %d\n",</div><div class='add'>+		hfs_dbg("cnid %d, node %d, refcnt %d\n",</div><div class='ctx'> 			node-&gt;tree-&gt;cnid, node-&gt;this,</div><div class='ctx'> 			atomic_read(&amp;node-&gt;refcnt));</div><div class='ctx'> 		BUG_ON(!atomic_read(&amp;node-&gt;refcnt));</div><div class='hunk'>@@ -476,6 +574,7 @@ void hfs_bnode_put(struct hfs_bnode *node)</div><div class='ctx'> 		if (test_bit(HFS_BNODE_DELETED, &amp;node-&gt;flags)) {</div><div class='ctx'> 			hfs_bnode_unhash(node);</div><div class='ctx'> 			spin_unlock(&amp;tree-&gt;hash_lock);</div><div class='add'>+			hfs_bnode_clear(node, 0, tree-&gt;node_size);</div><div class='ctx'> 			hfs_bmap_free(node);</div><div class='ctx'> 			hfs_bnode_free(node);</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/fs/hfs/brec.c b/fs/hfs/brec.c<br/>index 896396554bcc..5a2f740ddefd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/brec.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/brec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/brec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/brec.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len)</div><div class='add'>+int hfs_brec_insert(struct hfs_find_data *fd, void *entry, u32 entry_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfs_btree *tree;</div><div class='ctx'> 	struct hfs_bnode *node, *new_node;</div><div class='hunk'>@@ -94,7 +94,7 @@ again:</div><div class='ctx'> 	end_rec_off = tree-&gt;node_size - (node-&gt;num_recs + 1) * 2;</div><div class='ctx'> 	end_off = hfs_bnode_read_u16(node, end_rec_off);</div><div class='ctx'> 	end_rec_off -= 2;</div><div class='del'>-	hfs_dbg(BNODE_MOD, "insert_rec: %d, %d, %d, %d\n",</div><div class='add'>+	hfs_dbg("rec %d, size %d, end_off %d, end_rec_off %d\n",</div><div class='ctx'> 		rec, size, end_off, end_rec_off);</div><div class='ctx'> 	if (size &gt; end_rec_off - end_off) {</div><div class='ctx'> 		if (new_node)</div><div class='hunk'>@@ -179,6 +179,7 @@ int hfs_brec_remove(struct hfs_find_data *fd)</div><div class='ctx'> 	struct hfs_btree *tree;</div><div class='ctx'> 	struct hfs_bnode *node, *parent;</div><div class='ctx'> 	int end_off, rec_off, data_off, size;</div><div class='add'>+	int src, dst, len;</div><div class='ctx'> </div><div class='ctx'> 	tree = fd-&gt;tree;</div><div class='ctx'> 	node = fd-&gt;bnode;</div><div class='hunk'>@@ -191,7 +192,7 @@ again:</div><div class='ctx'> 		mark_inode_dirty(tree-&gt;inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	hfs_bnode_dump(node);</div><div class='del'>-	hfs_dbg(BNODE_MOD, "remove_rec: %d, %d\n",</div><div class='add'>+	hfs_dbg("rec %d, len %d\n",</div><div class='ctx'> 		fd-&gt;record, fd-&gt;keylength + fd-&gt;entrylength);</div><div class='ctx'> 	if (!--node-&gt;num_recs) {</div><div class='ctx'> 		hfs_bnode_unlink(node);</div><div class='hunk'>@@ -208,10 +209,14 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> 	hfs_bnode_write_u16(node, offsetof(struct hfs_bnode_desc, num_recs), node-&gt;num_recs);</div><div class='ctx'> </div><div class='del'>-	if (rec_off == end_off)</div><div class='del'>-		goto skip;</div><div class='ctx'> 	size = fd-&gt;keylength + fd-&gt;entrylength;</div><div class='ctx'> </div><div class='add'>+	if (rec_off == end_off) {</div><div class='add'>+		src = fd-&gt;keyoffset;</div><div class='add'>+		hfs_bnode_clear(node, src, size);</div><div class='add'>+		goto skip;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		data_off = hfs_bnode_read_u16(node, rec_off);</div><div class='ctx'> 		hfs_bnode_write_u16(node, rec_off + 2, data_off - size);</div><div class='hunk'>@@ -219,9 +224,23 @@ again:</div><div class='ctx'> 	} while (rec_off &gt;= end_off);</div><div class='ctx'> </div><div class='ctx'> 	/* fill hole */</div><div class='del'>-	hfs_bnode_move(node, fd-&gt;keyoffset, fd-&gt;keyoffset + size,</div><div class='del'>-		       data_off - fd-&gt;keyoffset - size);</div><div class='add'>+	dst = fd-&gt;keyoffset;</div><div class='add'>+	src = fd-&gt;keyoffset + size;</div><div class='add'>+	len = data_off - src;</div><div class='add'>+</div><div class='add'>+	hfs_bnode_move(node, dst, src, len);</div><div class='add'>+</div><div class='add'>+	src = dst + len;</div><div class='add'>+	len = data_off - src;</div><div class='add'>+</div><div class='add'>+	hfs_bnode_clear(node, src, len);</div><div class='add'>+</div><div class='ctx'> skip:</div><div class='add'>+	/*</div><div class='add'>+	 * Remove the obsolete offset to free space.</div><div class='add'>+	 */</div><div class='add'>+	hfs_bnode_write_u16(node, end_off, 0);</div><div class='add'>+</div><div class='ctx'> 	hfs_bnode_dump(node);</div><div class='ctx'> 	if (!fd-&gt;record)</div><div class='ctx'> 		hfs_brec_update_parent(fd);</div><div class='hunk'>@@ -242,7 +261,7 @@ static struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)</div><div class='ctx'> 	if (IS_ERR(new_node))</div><div class='ctx'> 		return new_node;</div><div class='ctx'> 	hfs_bnode_get(node);</div><div class='del'>-	hfs_dbg(BNODE_MOD, "split_nodes: %d - %d - %d\n",</div><div class='add'>+	hfs_dbg("this %d, new %d, next %d\n",</div><div class='ctx'> 		node-&gt;this, new_node-&gt;this, node-&gt;next);</div><div class='ctx'> 	new_node-&gt;next = node-&gt;next;</div><div class='ctx'> 	new_node-&gt;prev = node-&gt;this;</div><div class='hunk'>@@ -378,7 +397,7 @@ again:</div><div class='ctx'> 		newkeylen = (hfs_bnode_read_u8(node, 14) | 1) + 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		fd-&gt;keylength = newkeylen = tree-&gt;max_key_len + 1;</div><div class='del'>-	hfs_dbg(BNODE_MOD, "update_rec: %d, %d, %d\n",</div><div class='add'>+	hfs_dbg("rec %d, keylength %d, newkeylen %d\n",</div><div class='ctx'> 		rec, fd-&gt;keylength, newkeylen);</div><div class='ctx'> </div><div class='ctx'> 	rec_off = tree-&gt;node_size - (rec + 2) * 2;</div><div class='head'>diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c<br/>index 2fa4b1f8cc7f..7bc425283d49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/btree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/btree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/btree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/btree.c</a></div><div class='hunk'>@@ -21,8 +21,12 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke</div><div class='ctx'> 	struct hfs_btree *tree;</div><div class='ctx'> 	struct hfs_btree_header_rec *head;</div><div class='ctx'> 	struct address_space *mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	struct buffer_head *bh;</div><div class='ctx'> 	unsigned int size;</div><div class='add'>+	u16 dblock;</div><div class='add'>+	sector_t start_block;</div><div class='add'>+	loff_t offset;</div><div class='ctx'> </div><div class='ctx'> 	tree = kzalloc(sizeof(*tree), GFP_KERNEL);</div><div class='ctx'> 	if (!tree)</div><div class='hunk'>@@ -38,7 +42,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke</div><div class='ctx'> 	tree-&gt;inode = iget_locked(sb, id);</div><div class='ctx'> 	if (!tree-&gt;inode)</div><div class='ctx'> 		goto free_tree;</div><div class='del'>-	BUG_ON(!(tree-&gt;inode-&gt;i_state &amp; I_NEW));</div><div class='add'>+	BUG_ON(!(inode_state_read_once(tree-&gt;inode) &amp; I_NEW));</div><div class='ctx'> 	{</div><div class='ctx'> 	struct hfs_mdb *mdb = HFS_SB(sb)-&gt;mdb;</div><div class='ctx'> 	HFS_I(tree-&gt;inode)-&gt;flags = 0;</div><div class='hunk'>@@ -75,12 +79,40 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke</div><div class='ctx'> 	unlock_new_inode(tree-&gt;inode);</div><div class='ctx'> </div><div class='ctx'> 	mapping = tree-&gt;inode-&gt;i_mapping;</div><div class='del'>-	page = read_mapping_page(mapping, 0, NULL);</div><div class='del'>-	if (IS_ERR(page))</div><div class='add'>+	folio = filemap_grab_folio(mapping, 0);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='ctx'> 		goto free_inode;</div><div class='ctx'> </div><div class='add'>+	folio_zero_range(folio, 0, folio_size(folio));</div><div class='add'>+</div><div class='add'>+	dblock = hfs_ext_find_block(HFS_I(tree-&gt;inode)-&gt;first_extents, 0);</div><div class='add'>+	start_block = HFS_SB(sb)-&gt;fs_start + (dblock * HFS_SB(sb)-&gt;fs_div);</div><div class='add'>+</div><div class='add'>+	size = folio_size(folio);</div><div class='add'>+	offset = 0;</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		size_t len;</div><div class='add'>+</div><div class='add'>+		bh = sb_bread(sb, start_block);</div><div class='add'>+		if (!bh) {</div><div class='add'>+			pr_err("unable to read tree header\n");</div><div class='add'>+			goto put_folio;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = min_t(size_t, folio_size(folio), sb-&gt;s_blocksize);</div><div class='add'>+		memcpy_to_folio(folio, offset, bh-&gt;b_data, sb-&gt;s_blocksize);</div><div class='add'>+</div><div class='add'>+		brelse(bh);</div><div class='add'>+</div><div class='add'>+		start_block++;</div><div class='add'>+		offset += len;</div><div class='add'>+		size -= len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	folio_mark_uptodate(folio);</div><div class='add'>+</div><div class='ctx'> 	/* Load the header */</div><div class='del'>-	head = (struct hfs_btree_header_rec *)(kmap_local_page(page) +</div><div class='add'>+	head = (struct hfs_btree_header_rec *)(kmap_local_folio(folio, 0) +</div><div class='ctx'> 					       sizeof(struct hfs_bnode_desc));</div><div class='ctx'> 	tree-&gt;root = be32_to_cpu(head-&gt;root);</div><div class='ctx'> 	tree-&gt;leaf_count = be32_to_cpu(head-&gt;leaf_count);</div><div class='hunk'>@@ -95,22 +127,22 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke</div><div class='ctx'> </div><div class='ctx'> 	size = tree-&gt;node_size;</div><div class='ctx'> 	if (!is_power_of_2(size))</div><div class='del'>-		goto fail_page;</div><div class='add'>+		goto fail_folio;</div><div class='ctx'> 	if (!tree-&gt;node_count)</div><div class='del'>-		goto fail_page;</div><div class='add'>+		goto fail_folio;</div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case HFS_EXT_CNID:</div><div class='ctx'> 		if (tree-&gt;max_key_len != HFS_MAX_EXT_KEYLEN) {</div><div class='ctx'> 			pr_err("invalid extent max_key_len %d\n",</div><div class='ctx'> 			       tree-&gt;max_key_len);</div><div class='del'>-			goto fail_page;</div><div class='add'>+			goto fail_folio;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HFS_CAT_CNID:</div><div class='ctx'> 		if (tree-&gt;max_key_len != HFS_MAX_CAT_KEYLEN) {</div><div class='ctx'> 			pr_err("invalid catalog max_key_len %d\n",</div><div class='ctx'> 			       tree-&gt;max_key_len);</div><div class='del'>-			goto fail_page;</div><div class='add'>+			goto fail_folio;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -121,12 +153,15 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke</div><div class='ctx'> 	tree-&gt;pages_per_bnode = (tree-&gt;node_size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	kunmap_local(head);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return tree;</div><div class='ctx'> </div><div class='del'>-fail_page:</div><div class='add'>+fail_folio:</div><div class='ctx'> 	kunmap_local(head);</div><div class='del'>-	put_page(page);</div><div class='add'>+put_folio:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> free_inode:</div><div class='ctx'> 	tree-&gt;inode-&gt;i_mapping-&gt;a_ops = &amp;hfs_aops;</div><div class='ctx'> 	iput(tree-&gt;inode);</div><div class='hunk'>@@ -224,7 +259,7 @@ static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Make sure @tree has enough space for the @rsvd_nodes */</div><div class='del'>-int hfs_bmap_reserve(struct hfs_btree *tree, int rsvd_nodes)</div><div class='add'>+int hfs_bmap_reserve(struct hfs_btree *tree, u32 rsvd_nodes)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = tree-&gt;inode;</div><div class='ctx'> 	u32 count;</div><div class='hunk'>@@ -329,7 +364,7 @@ void hfs_bmap_free(struct hfs_bnode *node)</div><div class='ctx'> 	u32 nidx;</div><div class='ctx'> 	u8 *data, byte, m;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "btree_free_node: %u\n", node-&gt;this);</div><div class='add'>+	hfs_dbg("node %u\n", node-&gt;this);</div><div class='ctx'> 	tree = node-&gt;tree;</div><div class='ctx'> 	nidx = node-&gt;this;</div><div class='ctx'> 	node = hfs_bnode_find(tree, 0);</div><div class='head'>diff --git a/fs/hfs/btree.h b/fs/hfs/btree.h<br/>index 0e6baee93245..99be858b2446 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/btree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/btree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/btree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/btree.h</a></div><div class='hunk'>@@ -86,87 +86,46 @@ struct hfs_find_data {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* btree.c */</div><div class='del'>-extern struct hfs_btree *hfs_btree_open(struct super_block *, u32, btree_keycmp);</div><div class='del'>-extern void hfs_btree_close(struct hfs_btree *);</div><div class='del'>-extern void hfs_btree_write(struct hfs_btree *);</div><div class='del'>-extern int hfs_bmap_reserve(struct hfs_btree *, int);</div><div class='del'>-extern struct hfs_bnode * hfs_bmap_alloc(struct hfs_btree *);</div><div class='add'>+extern struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id,</div><div class='add'>+					btree_keycmp keycmp);</div><div class='add'>+extern void hfs_btree_close(struct hfs_btree *tree);</div><div class='add'>+extern void hfs_btree_write(struct hfs_btree *tree);</div><div class='add'>+extern int hfs_bmap_reserve(struct hfs_btree *tree, u32 rsvd_nodes);</div><div class='add'>+extern struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree);</div><div class='ctx'> extern void hfs_bmap_free(struct hfs_bnode *node);</div><div class='ctx'> </div><div class='ctx'> /* bnode.c */</div><div class='del'>-extern void hfs_bnode_read(struct hfs_bnode *, void *, int, int);</div><div class='del'>-extern u16 hfs_bnode_read_u16(struct hfs_bnode *, int);</div><div class='del'>-extern u8 hfs_bnode_read_u8(struct hfs_bnode *, int);</div><div class='del'>-extern void hfs_bnode_read_key(struct hfs_bnode *, void *, int);</div><div class='del'>-extern void hfs_bnode_write(struct hfs_bnode *, void *, int, int);</div><div class='del'>-extern void hfs_bnode_write_u16(struct hfs_bnode *, int, u16);</div><div class='del'>-extern void hfs_bnode_write_u8(struct hfs_bnode *, int, u8);</div><div class='del'>-extern void hfs_bnode_clear(struct hfs_bnode *, int, int);</div><div class='del'>-extern void hfs_bnode_copy(struct hfs_bnode *, int,</div><div class='del'>-			   struct hfs_bnode *, int, int);</div><div class='del'>-extern void hfs_bnode_move(struct hfs_bnode *, int, int, int);</div><div class='del'>-extern void hfs_bnode_dump(struct hfs_bnode *);</div><div class='del'>-extern void hfs_bnode_unlink(struct hfs_bnode *);</div><div class='del'>-extern struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *, u32);</div><div class='del'>-extern struct hfs_bnode *hfs_bnode_find(struct hfs_btree *, u32);</div><div class='del'>-extern void hfs_bnode_unhash(struct hfs_bnode *);</div><div class='del'>-extern void hfs_bnode_free(struct hfs_bnode *);</div><div class='del'>-extern struct hfs_bnode *hfs_bnode_create(struct hfs_btree *, u32);</div><div class='del'>-extern void hfs_bnode_get(struct hfs_bnode *);</div><div class='del'>-extern void hfs_bnode_put(struct hfs_bnode *);</div><div class='add'>+extern void hfs_bnode_read(struct hfs_bnode *node, void *buf, u32 off, u32 len);</div><div class='add'>+extern u16 hfs_bnode_read_u16(struct hfs_bnode *node, u32 off);</div><div class='add'>+extern u8 hfs_bnode_read_u8(struct hfs_bnode *node, u32 off);</div><div class='add'>+extern void hfs_bnode_read_key(struct hfs_bnode *node, void *key, u32 off);</div><div class='add'>+extern void hfs_bnode_write(struct hfs_bnode *node, void *buf, u32 off, u32 len);</div><div class='add'>+extern void hfs_bnode_write_u16(struct hfs_bnode *node, u32 off, u16 data);</div><div class='add'>+extern void hfs_bnode_write_u8(struct hfs_bnode *node, u32 off, u8 data);</div><div class='add'>+extern void hfs_bnode_clear(struct hfs_bnode *node, u32 off, u32 len);</div><div class='add'>+extern void hfs_bnode_copy(struct hfs_bnode *dst_node, u32 dst,</div><div class='add'>+			   struct hfs_bnode *src_node, u32 src, u32 len);</div><div class='add'>+extern void hfs_bnode_move(struct hfs_bnode *node, u32 dst, u32 src, u32 len);</div><div class='add'>+extern void hfs_bnode_dump(struct hfs_bnode *node);</div><div class='add'>+extern void hfs_bnode_unlink(struct hfs_bnode *node);</div><div class='add'>+extern struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid);</div><div class='add'>+extern struct hfs_bnode *hfs_bnode_find(struct hfs_btree *tree, u32 num);</div><div class='add'>+extern void hfs_bnode_unhash(struct hfs_bnode *node);</div><div class='add'>+extern void hfs_bnode_free(struct hfs_bnode *node);</div><div class='add'>+extern struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num);</div><div class='add'>+extern void hfs_bnode_get(struct hfs_bnode *node);</div><div class='add'>+extern void hfs_bnode_put(struct hfs_bnode *node);</div><div class='ctx'> </div><div class='ctx'> /* brec.c */</div><div class='del'>-extern u16 hfs_brec_lenoff(struct hfs_bnode *, u16, u16 *);</div><div class='del'>-extern u16 hfs_brec_keylen(struct hfs_bnode *, u16);</div><div class='del'>-extern int hfs_brec_insert(struct hfs_find_data *, void *, int);</div><div class='del'>-extern int hfs_brec_remove(struct hfs_find_data *);</div><div class='add'>+extern u16 hfs_brec_lenoff(struct hfs_bnode *node, u16 rec, u16 *off);</div><div class='add'>+extern u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec);</div><div class='add'>+extern int hfs_brec_insert(struct hfs_find_data *fd, void *entry, u32 entry_len);</div><div class='add'>+extern int hfs_brec_remove(struct hfs_find_data *fd);</div><div class='ctx'> </div><div class='ctx'> /* bfind.c */</div><div class='del'>-extern int hfs_find_init(struct hfs_btree *, struct hfs_find_data *);</div><div class='del'>-extern void hfs_find_exit(struct hfs_find_data *);</div><div class='del'>-extern int __hfs_brec_find(struct hfs_bnode *, struct hfs_find_data *);</div><div class='del'>-extern int hfs_brec_find(struct hfs_find_data *);</div><div class='del'>-extern int hfs_brec_read(struct hfs_find_data *, void *, int);</div><div class='del'>-extern int hfs_brec_goto(struct hfs_find_data *, int);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hfs_bnode_desc {</div><div class='del'>-	__be32 next;		/* (V) Number of the next node at this level */</div><div class='del'>-	__be32 prev;		/* (V) Number of the prev node at this level */</div><div class='del'>-	u8 type;		/* (F) The type of node */</div><div class='del'>-	u8 height;		/* (F) The level of this node (leaves=1) */</div><div class='del'>-	__be16 num_recs;	/* (V) The number of records in this node */</div><div class='del'>-	u16 reserved;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFS_NODE_INDEX	0x00	/* An internal (index) node */</div><div class='del'>-#define HFS_NODE_HEADER	0x01	/* The tree header node (node 0) */</div><div class='del'>-#define HFS_NODE_MAP	0x02	/* Holds part of the bitmap of used nodes */</div><div class='del'>-#define HFS_NODE_LEAF	0xFF	/* A leaf (ndNHeight==1) node */</div><div class='del'>-</div><div class='del'>-struct hfs_btree_header_rec {</div><div class='del'>-	__be16 depth;		/* (V) The number of levels in this B-tree */</div><div class='del'>-	__be32 root;		/* (V) The node number of the root node */</div><div class='del'>-	__be32 leaf_count;	/* (V) The number of leaf records */</div><div class='del'>-	__be32 leaf_head;	/* (V) The number of the first leaf node */</div><div class='del'>-	__be32 leaf_tail;	/* (V) The number of the last leaf node */</div><div class='del'>-	__be16 node_size;	/* (F) The number of bytes in a node (=512) */</div><div class='del'>-	__be16 max_key_len;	/* (F) The length of a key in an index node */</div><div class='del'>-	__be32 node_count;	/* (V) The total number of nodes */</div><div class='del'>-	__be32 free_nodes;	/* (V) The number of unused nodes */</div><div class='del'>-	u16 reserved1;</div><div class='del'>-	__be32 clump_size;	/* (F) clump size. not usually used. */</div><div class='del'>-	u8 btree_type;		/* (F) BTree type */</div><div class='del'>-	u8 reserved2;</div><div class='del'>-	__be32 attributes;	/* (F) attributes */</div><div class='del'>-	u32 reserved3[16];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define BTREE_ATTR_BADCLOSE	0x00000001	/* b-tree not closed properly. not</div><div class='del'>-						   used by hfsplus. */</div><div class='del'>-#define HFS_TREE_BIGKEYS	0x00000002	/* key length is u16 instead of u8.</div><div class='del'>-						   used by hfsplus. */</div><div class='del'>-#define HFS_TREE_VARIDXKEYS	0x00000004	/* variable key length instead of</div><div class='del'>-						   max key length. use din catalog</div><div class='del'>-						   b-tree but not in extents</div><div class='del'>-						   b-tree (hfsplus). */</div><div class='add'>+extern int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd);</div><div class='add'>+extern void hfs_find_exit(struct hfs_find_data *fd);</div><div class='add'>+extern int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd);</div><div class='add'>+extern int hfs_brec_find(struct hfs_find_data *fd);</div><div class='add'>+extern int hfs_brec_read(struct hfs_find_data *fd, void *rec, u32 rec_len);</div><div class='add'>+extern int hfs_brec_goto(struct hfs_find_data *fd, int cnt);</div><div class='head'>diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c<br/>index d63880e7d9d6..b80ba40e3877 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/catalog.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/catalog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/catalog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/catalog.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct i</div><div class='ctx'> 	int entry_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",</div><div class='add'>+	hfs_dbg("name %s, cnid %u, i_nlink %d\n",</div><div class='ctx'> 		str-&gt;name, cnid, inode-&gt;i_nlink);</div><div class='ctx'> 	if (dir-&gt;i_size &gt;= HFS_MAX_VALENCE)</div><div class='ctx'> 		return -ENOSPC;</div><div class='hunk'>@@ -211,6 +211,124 @@ int hfs_cat_find_brec(struct super_block *sb, u32 cnid,</div><div class='ctx'> 	return hfs_brec_find(fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline</div><div class='add'>+void hfs_set_next_unused_CNID(struct super_block *sb,</div><div class='add'>+				u32 deleted_cnid, u32 found_cnid)</div><div class='add'>+{</div><div class='add'>+	if (found_cnid &lt; HFS_FIRSTUSER_CNID) {</div><div class='add'>+		atomic64_cmpxchg(&amp;HFS_SB(sb)-&gt;next_id,</div><div class='add'>+				 deleted_cnid + 1, HFS_FIRSTUSER_CNID);</div><div class='add'>+	} else {</div><div class='add'>+		atomic64_cmpxchg(&amp;HFS_SB(sb)-&gt;next_id,</div><div class='add'>+				 deleted_cnid + 1, found_cnid + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * hfs_correct_next_unused_CNID()</div><div class='add'>+ *</div><div class='add'>+ * Correct the next unused CNID of Catalog Tree.</div><div class='add'>+ */</div><div class='add'>+static</div><div class='add'>+int hfs_correct_next_unused_CNID(struct super_block *sb, u32 cnid)</div><div class='add'>+{</div><div class='add'>+	struct hfs_btree *cat_tree;</div><div class='add'>+	struct hfs_bnode *node;</div><div class='add'>+	s64 leaf_head;</div><div class='add'>+	s64 leaf_tail;</div><div class='add'>+	s64 node_id;</div><div class='add'>+</div><div class='add'>+	hfs_dbg("cnid %u, next_id %lld\n",</div><div class='add'>+		cnid, atomic64_read(&amp;HFS_SB(sb)-&gt;next_id));</div><div class='add'>+</div><div class='add'>+	if ((cnid + 1) &lt; atomic64_read(&amp;HFS_SB(sb)-&gt;next_id)) {</div><div class='add'>+		/* next ID should be unchanged */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cat_tree = HFS_SB(sb)-&gt;cat_tree;</div><div class='add'>+	leaf_head = cat_tree-&gt;leaf_head;</div><div class='add'>+	leaf_tail = cat_tree-&gt;leaf_tail;</div><div class='add'>+</div><div class='add'>+	if (leaf_head &gt; leaf_tail) {</div><div class='add'>+		pr_err("node is corrupted: leaf_head %lld, leaf_tail %lld\n",</div><div class='add'>+			leaf_head, leaf_tail);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node = hfs_bnode_find(cat_tree, leaf_tail);</div><div class='add'>+	if (IS_ERR(node)) {</div><div class='add'>+		pr_err("fail to find leaf node: node ID %lld\n",</div><div class='add'>+			leaf_tail);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_id = leaf_tail;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		if (node_id != leaf_tail) {</div><div class='add'>+			node = hfs_bnode_find(cat_tree, node_id);</div><div class='add'>+			if (IS_ERR(node))</div><div class='add'>+				return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hfs_dbg("node %lld, leaf_tail %lld, leaf_head %lld\n",</div><div class='add'>+			node_id, leaf_tail, leaf_head);</div><div class='add'>+</div><div class='add'>+		hfs_bnode_dump(node);</div><div class='add'>+</div><div class='add'>+		for (i = node-&gt;num_recs - 1; i &gt;= 0; i--) {</div><div class='add'>+			hfs_cat_rec rec;</div><div class='add'>+			u16 off, len, keylen;</div><div class='add'>+			int entryoffset;</div><div class='add'>+			int entrylength;</div><div class='add'>+			u32 found_cnid;</div><div class='add'>+</div><div class='add'>+			len = hfs_brec_lenoff(node, i, &amp;off);</div><div class='add'>+			keylen = hfs_brec_keylen(node, i);</div><div class='add'>+			if (keylen == 0) {</div><div class='add'>+				pr_err("fail to get the keylen: "</div><div class='add'>+					"node_id %lld, record index %d\n",</div><div class='add'>+					node_id, i);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			entryoffset = off + keylen;</div><div class='add'>+			entrylength = len - keylen;</div><div class='add'>+</div><div class='add'>+			if (entrylength &gt; sizeof(rec)) {</div><div class='add'>+				pr_err("unexpected record length: "</div><div class='add'>+					"entrylength %d\n",</div><div class='add'>+					entrylength);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			hfs_bnode_read(node, &amp;rec, entryoffset, entrylength);</div><div class='add'>+</div><div class='add'>+			if (rec.type == HFS_CDR_DIR) {</div><div class='add'>+				found_cnid = be32_to_cpu(rec.dir.DirID);</div><div class='add'>+				hfs_dbg("found_cnid %u\n", found_cnid);</div><div class='add'>+				hfs_set_next_unused_CNID(sb, cnid, found_cnid);</div><div class='add'>+				hfs_bnode_put(node);</div><div class='add'>+				return 0;</div><div class='add'>+			} else if (rec.type == HFS_CDR_FIL) {</div><div class='add'>+				found_cnid = be32_to_cpu(rec.file.FlNum);</div><div class='add'>+				hfs_dbg("found_cnid %u\n", found_cnid);</div><div class='add'>+				hfs_set_next_unused_CNID(sb, cnid, found_cnid);</div><div class='add'>+				hfs_bnode_put(node);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		node_id = node-&gt;prev;</div><div class='add'>+		hfs_bnode_put(node);</div><div class='add'>+</div><div class='add'>+	} while (node_id &gt;= leaf_head);</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * hfs_cat_delete()</div><div class='hunk'>@@ -225,7 +343,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)</div><div class='ctx'> 	struct hfs_readdir_data *rd;</div><div class='ctx'> 	int res, type;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str-&gt;name : NULL, cnid);</div><div class='add'>+	hfs_dbg("name %s, cnid %u\n", str ? str-&gt;name : NULL, cnid);</div><div class='ctx'> 	sb = dir-&gt;i_sb;</div><div class='ctx'> 	res = hfs_find_init(HFS_SB(sb)-&gt;cat_tree, &amp;fd);</div><div class='ctx'> 	if (res)</div><div class='hunk'>@@ -271,6 +389,11 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)</div><div class='ctx'> 	dir-&gt;i_size--;</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	mark_inode_dirty(dir);</div><div class='add'>+</div><div class='add'>+	res = hfs_correct_next_unused_CNID(sb, cnid);</div><div class='add'>+	if (res)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	res = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	hfs_find_exit(&amp;fd);</div><div class='hunk'>@@ -294,7 +417,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,</div><div class='ctx'> 	int entry_size, type;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",</div><div class='add'>+	hfs_dbg("cnid %u - (ino %lu, name %s) - (ino %lu, name %s)\n",</div><div class='ctx'> 		cnid, src_dir-&gt;i_ino, src_name-&gt;name,</div><div class='ctx'> 		dst_dir-&gt;i_ino, dst_name-&gt;name);</div><div class='ctx'> 	sb = src_dir-&gt;i_sb;</div><div class='head'>diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c<br/>index b75c26045df4..86a6b317b474 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/dir.c</a></div><div class='hunk'>@@ -219,26 +219,26 @@ static int hfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'>  * in a directory, given the inode for the parent directory and the</div><div class='ctx'>  * name (and its length) of the new directory.</div><div class='ctx'>  */</div><div class='del'>-static int hfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		     struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *hfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	inode = hfs_new_inode(dir, &amp;dentry-&gt;d_name, S_IFDIR | mode);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	res = hfs_cat_create(inode-&gt;i_ino, dir, &amp;dentry-&gt;d_name, inode);</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		clear_nlink(inode);</div><div class='ctx'> 		hfs_delete_inode(inode);</div><div class='ctx'> 		iput(inode);</div><div class='del'>-		return res;</div><div class='add'>+		return ERR_PTR(res);</div><div class='ctx'> 	}</div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='ctx'> 	mark_inode_dirty(inode);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c<br/>index 6d1878b99b30..a097908b269d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/extent.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/extent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/extent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/extent.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ int hfs_ext_keycmp(const btree_key *key1, const btree_key *key2)</div><div class='ctx'>  *</div><div class='ctx'>  * Find a block within an extent record</div><div class='ctx'>  */</div><div class='del'>-static u16 hfs_ext_find_block(struct hfs_extent *ext, u16 off)</div><div class='add'>+u16 hfs_ext_find_block(struct hfs_extent *ext, u16 off)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 count;</div><div class='hunk'>@@ -209,12 +209,12 @@ static void hfs_dump_extent(struct hfs_extent *extent)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(EXTENT, "   ");</div><div class='add'>+	hfs_dbg("extent:   ");</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		hfs_dbg_cont(EXTENT, " %u:%u",</div><div class='del'>-			     be16_to_cpu(extent[i].block),</div><div class='del'>-			     be16_to_cpu(extent[i].count));</div><div class='del'>-	hfs_dbg_cont(EXTENT, "\n");</div><div class='add'>+		hfs_dbg(" block %u, count %u",</div><div class='add'>+			be16_to_cpu(extent[i].block),</div><div class='add'>+			be16_to_cpu(extent[i].count));</div><div class='add'>+	hfs_dbg("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hfs_add_extent(struct hfs_extent *extent, u16 offset,</div><div class='hunk'>@@ -411,10 +411,11 @@ int hfs_extend_file(struct inode *inode)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(EXTENT, "extend %lu: %u,%u\n", inode-&gt;i_ino, start, len);</div><div class='add'>+	hfs_dbg("ino %lu, start %u, len %u\n", inode-&gt;i_ino, start, len);</div><div class='ctx'> 	if (HFS_I(inode)-&gt;alloc_blocks == HFS_I(inode)-&gt;first_blocks) {</div><div class='ctx'> 		if (!HFS_I(inode)-&gt;first_blocks) {</div><div class='del'>-			hfs_dbg(EXTENT, "first extents\n");</div><div class='add'>+			hfs_dbg("first_extent: start %u, len %u\n",</div><div class='add'>+				start, len);</div><div class='ctx'> 			/* no extents yet */</div><div class='ctx'> 			HFS_I(inode)-&gt;first_extents[0].block = cpu_to_be16(start);</div><div class='ctx'> 			HFS_I(inode)-&gt;first_extents[0].count = cpu_to_be16(len);</div><div class='hunk'>@@ -456,7 +457,7 @@ out:</div><div class='ctx'> 	return res;</div><div class='ctx'> </div><div class='ctx'> insert_extent:</div><div class='del'>-	hfs_dbg(EXTENT, "insert new extent\n");</div><div class='add'>+	hfs_dbg("insert new extent\n");</div><div class='ctx'> 	res = hfs_ext_write_extent(inode);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -481,21 +482,21 @@ void hfs_file_truncate(struct inode *inode)</div><div class='ctx'> 	u32 size;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(INODE, "truncate: %lu, %Lu -&gt; %Lu\n",</div><div class='add'>+	hfs_dbg("ino %lu, phys_size %llu -&gt; i_size %llu\n",</div><div class='ctx'> 		inode-&gt;i_ino, (long long)HFS_I(inode)-&gt;phys_size,</div><div class='ctx'> 		inode-&gt;i_size);</div><div class='ctx'> 	if (inode-&gt;i_size &gt; HFS_I(inode)-&gt;phys_size) {</div><div class='ctx'> 		struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 		void *fsdata = NULL;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 		/* XXX: Can use generic_cont_expand? */</div><div class='ctx'> 		size = inode-&gt;i_size - 1;</div><div class='del'>-		res = hfs_write_begin(NULL, mapping, size + 1, 0, &amp;page,</div><div class='add'>+		res = hfs_write_begin(NULL, mapping, size + 1, 0, &amp;folio,</div><div class='ctx'> 				&amp;fsdata);</div><div class='ctx'> 		if (!res) {</div><div class='ctx'> 			res = generic_write_end(NULL, mapping, size + 1, 0, 0,</div><div class='del'>-					page, fsdata);</div><div class='add'>+					folio, fsdata);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			inode-&gt;i_size = HFS_I(inode)-&gt;phys_size;</div><div class='head'>diff --git a/fs/hfs/hfs.h b/fs/hfs/hfs.h<br/>index 6f194d0768b6..3f2293ff6fdd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/hfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/hfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/hfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/hfs.h</a></div><div class='hunk'>@@ -9,274 +9,7 @@</div><div class='ctx'> #ifndef _HFS_H</div><div class='ctx'> #define _HFS_H</div><div class='ctx'> </div><div class='del'>-/* offsets to various blocks */</div><div class='del'>-#define HFS_DD_BLK		0 /* Driver Descriptor block */</div><div class='del'>-#define HFS_PMAP_BLK		1 /* First block of partition map */</div><div class='del'>-#define HFS_MDB_BLK		2 /* Block (w/i partition) of MDB */</div><div class='del'>-</div><div class='del'>-/* magic numbers for various disk blocks */</div><div class='del'>-#define HFS_DRVR_DESC_MAGIC	0x4552 /* "ER": driver descriptor map */</div><div class='del'>-#define HFS_OLD_PMAP_MAGIC	0x5453 /* "TS": old-type partition map */</div><div class='del'>-#define HFS_NEW_PMAP_MAGIC	0x504D /* "PM": new-type partition map */</div><div class='del'>-#define HFS_SUPER_MAGIC		0x4244 /* "BD": HFS MDB (super block) */</div><div class='del'>-#define HFS_MFS_SUPER_MAGIC	0xD2D7 /* MFS MDB (super block) */</div><div class='del'>-</div><div class='del'>-/* various FIXED size parameters */</div><div class='del'>-#define HFS_SECTOR_SIZE		512    /* size of an HFS sector */</div><div class='del'>-#define HFS_SECTOR_SIZE_BITS	9      /* log_2(HFS_SECTOR_SIZE) */</div><div class='del'>-#define HFS_NAMELEN		31     /* maximum length of an HFS filename */</div><div class='del'>-#define HFS_MAX_NAMELEN		128</div><div class='del'>-#define HFS_MAX_VALENCE		32767U</div><div class='del'>-</div><div class='del'>-/* Meanings of the drAtrb field of the MDB,</div><div class='del'>- * Reference: _Inside Macintosh: Files_ p. 2-61</div><div class='del'>- */</div><div class='del'>-#define HFS_SB_ATTRIB_HLOCK	(1 &lt;&lt; 7)</div><div class='del'>-#define HFS_SB_ATTRIB_UNMNT	(1 &lt;&lt; 8)</div><div class='del'>-#define HFS_SB_ATTRIB_SPARED	(1 &lt;&lt; 9)</div><div class='del'>-#define HFS_SB_ATTRIB_INCNSTNT	(1 &lt;&lt; 11)</div><div class='del'>-#define HFS_SB_ATTRIB_SLOCK	(1 &lt;&lt; 15)</div><div class='del'>-</div><div class='del'>-/* Some special File ID numbers */</div><div class='del'>-#define HFS_POR_CNID		1	/* Parent Of the Root */</div><div class='del'>-#define HFS_ROOT_CNID		2	/* ROOT directory */</div><div class='del'>-#define HFS_EXT_CNID		3	/* EXTents B-tree */</div><div class='del'>-#define HFS_CAT_CNID		4	/* CATalog B-tree */</div><div class='del'>-#define HFS_BAD_CNID		5	/* BAD blocks file */</div><div class='del'>-#define HFS_ALLOC_CNID		6	/* ALLOCation file (HFS+) */</div><div class='del'>-#define HFS_START_CNID		7	/* STARTup file (HFS+) */</div><div class='del'>-#define HFS_ATTR_CNID		8	/* ATTRibutes file (HFS+) */</div><div class='del'>-#define HFS_EXCH_CNID		15	/* ExchangeFiles temp id */</div><div class='del'>-#define HFS_FIRSTUSER_CNID	16</div><div class='del'>-</div><div class='del'>-/* values for hfs_cat_rec.cdrType */</div><div class='del'>-#define HFS_CDR_DIR    0x01    /* folder (directory) */</div><div class='del'>-#define HFS_CDR_FIL    0x02    /* file */</div><div class='del'>-#define HFS_CDR_THD    0x03    /* folder (directory) thread */</div><div class='del'>-#define HFS_CDR_FTH    0x04    /* file thread */</div><div class='del'>-</div><div class='del'>-/* legal values for hfs_ext_key.FkType and hfs_file.fork */</div><div class='del'>-#define HFS_FK_DATA	0x00</div><div class='del'>-#define HFS_FK_RSRC	0xFF</div><div class='del'>-</div><div class='del'>-/* bits in hfs_fil_entry.Flags */</div><div class='del'>-#define HFS_FIL_LOCK	0x01  /* locked */</div><div class='del'>-#define HFS_FIL_THD	0x02  /* file thread */</div><div class='del'>-#define HFS_FIL_DOPEN   0x04  /* data fork open */</div><div class='del'>-#define HFS_FIL_ROPEN   0x08  /* resource fork open */</div><div class='del'>-#define HFS_FIL_DIR     0x10  /* directory (always clear) */</div><div class='del'>-#define HFS_FIL_NOCOPY  0x40  /* copy-protected file */</div><div class='del'>-#define HFS_FIL_USED	0x80  /* open */</div><div class='del'>-</div><div class='del'>-/* bits in hfs_dir_entry.Flags. dirflags is 16 bits. */</div><div class='del'>-#define HFS_DIR_LOCK        0x01  /* locked */</div><div class='del'>-#define HFS_DIR_THD         0x02  /* directory thread */</div><div class='del'>-#define HFS_DIR_INEXPFOLDER 0x04  /* in a shared area */</div><div class='del'>-#define HFS_DIR_MOUNTED     0x08  /* mounted */</div><div class='del'>-#define HFS_DIR_DIR         0x10  /* directory (always set) */</div><div class='del'>-#define HFS_DIR_EXPFOLDER   0x20  /* share point */</div><div class='del'>-</div><div class='del'>-/* bits hfs_finfo.fdFlags */</div><div class='del'>-#define HFS_FLG_INITED		0x0100</div><div class='del'>-#define HFS_FLG_LOCKED		0x1000</div><div class='del'>-#define HFS_FLG_INVISIBLE	0x4000</div><div class='del'>-</div><div class='del'>-/*======== HFS structures as they appear on the disk ========*/</div><div class='del'>-</div><div class='del'>-/* Pascal-style string of up to 31 characters */</div><div class='del'>-struct hfs_name {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 name[HFS_NAMELEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfs_point {</div><div class='del'>-	__be16 v;</div><div class='del'>-	__be16 h;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfs_rect {</div><div class='del'>-	__be16 top;</div><div class='del'>-	__be16 left;</div><div class='del'>-	__be16 bottom;</div><div class='del'>-	__be16 right;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfs_finfo {</div><div class='del'>-	__be32 fdType;</div><div class='del'>-	__be32 fdCreator;</div><div class='del'>-	__be16 fdFlags;</div><div class='del'>-	struct hfs_point fdLocation;</div><div class='del'>-	__be16 fdFldr;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfs_fxinfo {</div><div class='del'>-	__be16 fdIconID;</div><div class='del'>-	u8 fdUnused[8];</div><div class='del'>-	__be16 fdComment;</div><div class='del'>-	__be32 fdPutAway;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfs_dinfo {</div><div class='del'>-	struct hfs_rect frRect;</div><div class='del'>-	__be16 frFlags;</div><div class='del'>-	struct hfs_point frLocation;</div><div class='del'>-	__be16 frView;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfs_dxinfo {</div><div class='del'>-	struct hfs_point frScroll;</div><div class='del'>-	__be32 frOpenChain;</div><div class='del'>-	__be16 frUnused;</div><div class='del'>-	__be16 frComment;</div><div class='del'>-	__be32 frPutAway;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union hfs_finder_info {</div><div class='del'>-	struct {</div><div class='del'>-		struct hfs_finfo finfo;</div><div class='del'>-		struct hfs_fxinfo fxinfo;</div><div class='del'>-	} file;</div><div class='del'>-	struct {</div><div class='del'>-		struct hfs_dinfo dinfo;</div><div class='del'>-		struct hfs_dxinfo dxinfo;</div><div class='del'>-	} dir;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Cast to a pointer to a generic bkey */</div><div class='del'>-#define	HFS_BKEY(X)	(((void)((X)-&gt;KeyLen)), ((struct hfs_bkey *)(X)))</div><div class='del'>-</div><div class='del'>-/* The key used in the catalog b-tree: */</div><div class='del'>-struct hfs_cat_key {</div><div class='del'>-	u8 key_len;		/* number of bytes in the key */</div><div class='del'>-	u8 reserved;		/* padding */</div><div class='del'>-	__be32 ParID;		/* CNID of the parent dir */</div><div class='del'>-	struct hfs_name	CName;	/* The filename of the entry */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* The key used in the extents b-tree: */</div><div class='del'>-struct hfs_ext_key {</div><div class='del'>-	u8 key_len;		/* number of bytes in the key */</div><div class='del'>-	u8 FkType;		/* HFS_FK_{DATA,RSRC} */</div><div class='del'>-	__be32 FNum;		/* The File ID of the file */</div><div class='del'>-	__be16 FABN;		/* allocation blocks number*/</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-typedef union hfs_btree_key {</div><div class='del'>-	u8 key_len;			/* number of bytes in the key */</div><div class='del'>-	struct hfs_cat_key cat;</div><div class='del'>-	struct hfs_ext_key ext;</div><div class='del'>-} hfs_btree_key;</div><div class='del'>-</div><div class='del'>-#define HFS_MAX_CAT_KEYLEN	(sizeof(struct hfs_cat_key) - sizeof(u8))</div><div class='del'>-#define HFS_MAX_EXT_KEYLEN	(sizeof(struct hfs_ext_key) - sizeof(u8))</div><div class='del'>-</div><div class='del'>-typedef union hfs_btree_key btree_key;</div><div class='del'>-</div><div class='del'>-struct hfs_extent {</div><div class='del'>-	__be16 block;</div><div class='del'>-	__be16 count;</div><div class='del'>-};</div><div class='del'>-typedef struct hfs_extent hfs_extent_rec[3];</div><div class='del'>-</div><div class='del'>-/* The catalog record for a file */</div><div class='del'>-struct hfs_cat_file {</div><div class='del'>-	s8 type;			/* The type of entry */</div><div class='del'>-	u8 reserved;</div><div class='del'>-	u8 Flags;			/* Flags such as read-only */</div><div class='del'>-	s8 Typ;				/* file version number = 0 */</div><div class='del'>-	struct hfs_finfo UsrWds;	/* data used by the Finder */</div><div class='del'>-	__be32 FlNum;			/* The CNID */</div><div class='del'>-	__be16 StBlk;			/* obsolete */</div><div class='del'>-	__be32 LgLen;			/* The logical EOF of the data fork*/</div><div class='del'>-	__be32 PyLen;			/* The physical EOF of the data fork */</div><div class='del'>-	__be16 RStBlk;			/* obsolete */</div><div class='del'>-	__be32 RLgLen;			/* The logical EOF of the rsrc fork */</div><div class='del'>-	__be32 RPyLen;			/* The physical EOF of the rsrc fork */</div><div class='del'>-	__be32 CrDat;			/* The creation date */</div><div class='del'>-	__be32 MdDat;			/* The modified date */</div><div class='del'>-	__be32 BkDat;			/* The last backup date */</div><div class='del'>-	struct hfs_fxinfo FndrInfo;	/* more data for the Finder */</div><div class='del'>-	__be16 ClpSize;			/* number of bytes to allocate</div><div class='del'>-					   when extending files */</div><div class='del'>-	hfs_extent_rec ExtRec;		/* first extent record</div><div class='del'>-					   for the data fork */</div><div class='del'>-	hfs_extent_rec RExtRec;		/* first extent record</div><div class='del'>-					   for the resource fork */</div><div class='del'>-	u32 Resrv;			/* reserved by Apple */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* the catalog record for a directory */</div><div class='del'>-struct hfs_cat_dir {</div><div class='del'>-	s8 type;			/* The type of entry */</div><div class='del'>-	u8 reserved;</div><div class='del'>-	__be16 Flags;			/* flags */</div><div class='del'>-	__be16 Val;			/* Valence: number of files and</div><div class='del'>-					   dirs in the directory */</div><div class='del'>-	__be32 DirID;			/* The CNID */</div><div class='del'>-	__be32 CrDat;			/* The creation date */</div><div class='del'>-	__be32 MdDat;			/* The modification date */</div><div class='del'>-	__be32 BkDat;			/* The last backup date */</div><div class='del'>-	struct hfs_dinfo UsrInfo;	/* data used by the Finder */</div><div class='del'>-	struct hfs_dxinfo FndrInfo;	/* more data used by Finder */</div><div class='del'>-	u8 Resrv[16];			/* reserved by Apple */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* the catalog record for a thread */</div><div class='del'>-struct hfs_cat_thread {</div><div class='del'>-	s8 type;			/* The type of entry */</div><div class='del'>-	u8 reserved[9];			/* reserved by Apple */</div><div class='del'>-	__be32 ParID;			/* CNID of parent directory */</div><div class='del'>-	struct hfs_name CName;		/* The name of this entry */</div><div class='del'>-}  __packed;</div><div class='del'>-</div><div class='del'>-/* A catalog tree record */</div><div class='del'>-typedef union hfs_cat_rec {</div><div class='del'>-	s8 type;			/* The type of entry */</div><div class='del'>-	struct hfs_cat_file file;</div><div class='del'>-	struct hfs_cat_dir dir;</div><div class='del'>-	struct hfs_cat_thread thread;</div><div class='del'>-} hfs_cat_rec;</div><div class='del'>-</div><div class='del'>-struct hfs_mdb {</div><div class='del'>-	__be16 drSigWord;		/* Signature word indicating fs type */</div><div class='del'>-	__be32 drCrDate;		/* fs creation date/time */</div><div class='del'>-	__be32 drLsMod;			/* fs modification date/time */</div><div class='del'>-	__be16 drAtrb;			/* fs attributes */</div><div class='del'>-	__be16 drNmFls;			/* number of files in root directory */</div><div class='del'>-	__be16 drVBMSt;			/* location (in 512-byte blocks)</div><div class='del'>-					   of the volume bitmap */</div><div class='del'>-	__be16 drAllocPtr;		/* location (in allocation blocks)</div><div class='del'>-					   to begin next allocation search */</div><div class='del'>-	__be16 drNmAlBlks;		/* number of allocation blocks */</div><div class='del'>-	__be32 drAlBlkSiz;		/* bytes in an allocation block */</div><div class='del'>-	__be32 drClpSiz;		/* clumpsize, the number of bytes to</div><div class='del'>-					   allocate when extending a file */</div><div class='del'>-	__be16 drAlBlSt;		/* location (in 512-byte blocks)</div><div class='del'>-					   of the first allocation block */</div><div class='del'>-	__be32 drNxtCNID;		/* CNID to assign to the next</div><div class='del'>-					   file or directory created */</div><div class='del'>-	__be16 drFreeBks;		/* number of free allocation blocks */</div><div class='del'>-	u8 drVN[28];			/* the volume label */</div><div class='del'>-	__be32 drVolBkUp;		/* fs backup date/time */</div><div class='del'>-	__be16 drVSeqNum;		/* backup sequence number */</div><div class='del'>-	__be32 drWrCnt;			/* fs write count */</div><div class='del'>-	__be32 drXTClpSiz;		/* clumpsize for the extents B-tree */</div><div class='del'>-	__be32 drCTClpSiz;		/* clumpsize for the catalog B-tree */</div><div class='del'>-	__be16 drNmRtDirs;		/* number of directories in</div><div class='del'>-					   the root directory */</div><div class='del'>-	__be32 drFilCnt;		/* number of files in the fs */</div><div class='del'>-	__be32 drDirCnt;		/* number of directories in the fs */</div><div class='del'>-	u8 drFndrInfo[32];		/* data used by the Finder */</div><div class='del'>-	__be16 drEmbedSigWord;		/* embedded volume signature */</div><div class='del'>-	__be32 drEmbedExtent;		/* starting block number (xdrStABN)</div><div class='del'>-					   and number of allocation blocks</div><div class='del'>-					   (xdrNumABlks) occupied by embedded</div><div class='del'>-					   volume */</div><div class='del'>-	__be32 drXTFlSize;		/* bytes in the extents B-tree */</div><div class='del'>-	hfs_extent_rec drXTExtRec;	/* extents B-tree's first 3 extents */</div><div class='del'>-	__be32 drCTFlSize;		/* bytes in the catalog B-tree */</div><div class='del'>-	hfs_extent_rec drCTExtRec;	/* catalog B-tree's first 3 extents */</div><div class='del'>-} __packed;</div><div class='add'>+#include &lt;linux/hfs_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*======== Data structures kept in memory ========*/</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h<br/>index b5a6ad5df357..e94dbc04a1e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/hfs_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/hfs_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/hfs_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/hfs_fs.h</a></div><div class='hunk'>@@ -9,12 +9,6 @@</div><div class='ctx'> #ifndef _LINUX_HFS_FS_H</div><div class='ctx'> #define _LINUX_HFS_FS_H</div><div class='ctx'> </div><div class='del'>-#ifdef pr_fmt</div><div class='del'>-#undef pr_fmt</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -27,32 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "hfs.h"</div><div class='ctx'> </div><div class='del'>-#define DBG_BNODE_REFS	0x00000001</div><div class='del'>-#define DBG_BNODE_MOD	0x00000002</div><div class='del'>-#define DBG_CAT_MOD	0x00000004</div><div class='del'>-#define DBG_INODE	0x00000008</div><div class='del'>-#define DBG_SUPER	0x00000010</div><div class='del'>-#define DBG_EXTENT	0x00000020</div><div class='del'>-#define DBG_BITMAP	0x00000040</div><div class='del'>-</div><div class='del'>-//#define DBG_MASK	(DBG_EXTENT|DBG_INODE|DBG_BNODE_MOD|DBG_CAT_MOD|DBG_BITMAP)</div><div class='del'>-//#define DBG_MASK	(DBG_BNODE_MOD|DBG_CAT_MOD|DBG_INODE)</div><div class='del'>-//#define DBG_MASK	(DBG_CAT_MOD|DBG_BNODE_REFS|DBG_INODE|DBG_EXTENT)</div><div class='del'>-#define DBG_MASK	(0)</div><div class='del'>-</div><div class='del'>-#define hfs_dbg(flg, fmt, ...)					\</div><div class='del'>-do {								\</div><div class='del'>-	if (DBG_##flg &amp; DBG_MASK)				\</div><div class='del'>-		printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define hfs_dbg_cont(flg, fmt, ...)				\</div><div class='del'>-do {								\</div><div class='del'>-	if (DBG_##flg &amp; DBG_MASK)				\</div><div class='del'>-		pr_cont(fmt, ##__VA_ARGS__);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * struct hfs_inode_info</div><div class='ctx'>  *</div><div class='hunk'>@@ -112,13 +80,13 @@ struct hfs_sb_info {</div><div class='ctx'> 						   the extents b-tree */</div><div class='ctx'> 	struct hfs_btree *cat_tree;			/* Information about</div><div class='ctx'> 						   the catalog b-tree */</div><div class='del'>-	u32 file_count;				/* The number of</div><div class='add'>+	atomic64_t file_count;			/* The number of</div><div class='ctx'> 						   regular files in</div><div class='ctx'> 						   the filesystem */</div><div class='del'>-	u32 folder_count;			/* The number of</div><div class='add'>+	atomic64_t folder_count;		/* The number of</div><div class='ctx'> 						   directories in the</div><div class='ctx'> 						   filesystem */</div><div class='del'>-	u32 next_id;				/* The next available</div><div class='add'>+	atomic64_t next_id;			/* The next available</div><div class='ctx'> 						   file id number */</div><div class='ctx'> 	u32 clumpablks;				/* The number of allocation</div><div class='ctx'> 						   blocks to try to add when</div><div class='hunk'>@@ -171,73 +139,90 @@ struct hfs_sb_info {</div><div class='ctx'> #define HFS_FLG_ALT_MDB_DIRTY	2</div><div class='ctx'> </div><div class='ctx'> /* bitmap.c */</div><div class='del'>-extern u32 hfs_vbm_search_free(struct super_block *, u32, u32 *);</div><div class='del'>-extern int hfs_clear_vbm_bits(struct super_block *, u16, u16);</div><div class='add'>+extern u32 hfs_vbm_search_free(struct super_block *sb, u32 goal, u32 *num_bits);</div><div class='add'>+extern int hfs_clear_vbm_bits(struct super_block *sb, u16 start, u16 count);</div><div class='ctx'> </div><div class='ctx'> /* catalog.c */</div><div class='del'>-extern int hfs_cat_keycmp(const btree_key *, const btree_key *);</div><div class='add'>+extern int hfs_cat_keycmp(const btree_key *key1, const btree_key *key2);</div><div class='ctx'> struct hfs_find_data;</div><div class='del'>-extern int hfs_cat_find_brec(struct super_block *, u32, struct hfs_find_data *);</div><div class='del'>-extern int hfs_cat_create(u32, struct inode *, const struct qstr *, struct inode *);</div><div class='del'>-extern int hfs_cat_delete(u32, struct inode *, const struct qstr *);</div><div class='del'>-extern int hfs_cat_move(u32, struct inode *, const struct qstr *,</div><div class='del'>-			struct inode *, const struct qstr *);</div><div class='del'>-extern void hfs_cat_build_key(struct super_block *, btree_key *, u32, const struct qstr *);</div><div class='add'>+extern int hfs_cat_find_brec(struct super_block *sb, u32 cnid,</div><div class='add'>+			     struct hfs_find_data *fd);</div><div class='add'>+extern int hfs_cat_create(u32 cnid, struct inode *dir,</div><div class='add'>+			  const struct qstr *str, struct inode *inode);</div><div class='add'>+extern int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str);</div><div class='add'>+extern int hfs_cat_move(u32 cnid, struct inode *src_dir,</div><div class='add'>+			const struct qstr *src_name,</div><div class='add'>+			struct inode *dst_dir,</div><div class='add'>+			const struct qstr *dst_name);</div><div class='add'>+extern void hfs_cat_build_key(struct super_block *sb, btree_key *key,</div><div class='add'>+			      u32 parent, const struct qstr *name);</div><div class='ctx'> </div><div class='ctx'> /* dir.c */</div><div class='ctx'> extern const struct file_operations hfs_dir_operations;</div><div class='ctx'> extern const struct inode_operations hfs_dir_inode_operations;</div><div class='ctx'> </div><div class='ctx'> /* extent.c */</div><div class='del'>-extern int hfs_ext_keycmp(const btree_key *, const btree_key *);</div><div class='del'>-extern int hfs_free_fork(struct super_block *, struct hfs_cat_file *, int);</div><div class='del'>-extern int hfs_ext_write_extent(struct inode *);</div><div class='del'>-extern int hfs_extend_file(struct inode *);</div><div class='del'>-extern void hfs_file_truncate(struct inode *);</div><div class='add'>+extern int hfs_ext_keycmp(const btree_key *key1, const btree_key *key2);</div><div class='add'>+extern u16 hfs_ext_find_block(struct hfs_extent *ext, u16 off);</div><div class='add'>+extern int hfs_free_fork(struct super_block *sb,</div><div class='add'>+			 struct hfs_cat_file *file, int type);</div><div class='add'>+extern int hfs_ext_write_extent(struct inode *inode);</div><div class='add'>+extern int hfs_extend_file(struct inode *inode);</div><div class='add'>+extern void hfs_file_truncate(struct inode *inode);</div><div class='ctx'> </div><div class='del'>-extern int hfs_get_block(struct inode *, sector_t, struct buffer_head *, int);</div><div class='add'>+extern int hfs_get_block(struct inode *inode, sector_t block,</div><div class='add'>+			 struct buffer_head *bh_result, int create);</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='ctx'> extern const struct address_space_operations hfs_aops;</div><div class='ctx'> extern const struct address_space_operations hfs_btree_aops;</div><div class='ctx'> </div><div class='del'>-int hfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata);</div><div class='del'>-extern struct inode *hfs_new_inode(struct inode *, const struct qstr *, umode_t);</div><div class='del'>-extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *);</div><div class='del'>-extern int hfs_write_inode(struct inode *, struct writeback_control *);</div><div class='del'>-extern int hfs_inode_setattr(struct mnt_idmap *, struct dentry *,</div><div class='del'>-			     struct iattr *);</div><div class='add'>+int hfs_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		    loff_t pos, unsigned int len, struct folio **foliop,</div><div class='add'>+		    void **fsdata);</div><div class='add'>+extern struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name,</div><div class='add'>+				   umode_t mode);</div><div class='add'>+extern void hfs_inode_write_fork(struct inode *inode, struct hfs_extent *ext,</div><div class='add'>+				 __be32 *log_size, __be32 *phys_size);</div><div class='add'>+extern int hfs_write_inode(struct inode *inode, struct writeback_control *wbc);</div><div class='add'>+extern int hfs_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+			     struct iattr *attr);</div><div class='ctx'> extern void hfs_inode_read_fork(struct inode *inode, struct hfs_extent *ext,</div><div class='del'>-			__be32 log_size, __be32 phys_size, u32 clump_size);</div><div class='del'>-extern struct inode *hfs_iget(struct super_block *, struct hfs_cat_key *, hfs_cat_rec *);</div><div class='del'>-extern void hfs_evict_inode(struct inode *);</div><div class='del'>-extern void hfs_delete_inode(struct inode *);</div><div class='add'>+				__be32 __log_size, __be32 phys_size,</div><div class='add'>+				u32 clump_size);</div><div class='add'>+extern struct inode *hfs_iget(struct super_block *sb, struct hfs_cat_key *key,</div><div class='add'>+				hfs_cat_rec *rec);</div><div class='add'>+extern void hfs_evict_inode(struct inode *inode);</div><div class='add'>+extern void hfs_delete_inode(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> /* attr.c */</div><div class='ctx'> extern const struct xattr_handler * const hfs_xattr_handlers[];</div><div class='ctx'> </div><div class='ctx'> /* mdb.c */</div><div class='del'>-extern int hfs_mdb_get(struct super_block *);</div><div class='del'>-extern void hfs_mdb_commit(struct super_block *);</div><div class='del'>-extern void hfs_mdb_close(struct super_block *);</div><div class='del'>-extern void hfs_mdb_put(struct super_block *);</div><div class='add'>+extern int hfs_mdb_get(struct super_block *sb);</div><div class='add'>+extern void hfs_mdb_commit(struct super_block *sb);</div><div class='add'>+extern void hfs_mdb_close(struct super_block *sb);</div><div class='add'>+extern void hfs_mdb_put(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> /* part_tbl.c */</div><div class='del'>-extern int hfs_part_find(struct super_block *, sector_t *, sector_t *);</div><div class='add'>+extern int hfs_part_find(struct super_block *sb,</div><div class='add'>+			 sector_t *part_start, sector_t *part_size);</div><div class='ctx'> </div><div class='ctx'> /* string.c */</div><div class='ctx'> extern const struct dentry_operations hfs_dentry_operations;</div><div class='ctx'> </div><div class='del'>-extern int hfs_hash_dentry(const struct dentry *, struct qstr *);</div><div class='del'>-extern int hfs_strcmp(const unsigned char *, unsigned int,</div><div class='del'>-		      const unsigned char *, unsigned int);</div><div class='add'>+extern int hfs_hash_dentry(const struct dentry *dentry, struct qstr *this);</div><div class='add'>+extern int hfs_strcmp(const unsigned char *s1, unsigned int len1,</div><div class='add'>+		      const unsigned char *s2, unsigned int len2);</div><div class='ctx'> extern int hfs_compare_dentry(const struct dentry *dentry,</div><div class='del'>-		unsigned int len, const char *str, const struct qstr *name);</div><div class='add'>+				unsigned int len, const char *str,</div><div class='add'>+				const struct qstr *name);</div><div class='ctx'> </div><div class='ctx'> /* trans.c */</div><div class='del'>-extern void hfs_asc2mac(struct super_block *, struct hfs_name *, const struct qstr *);</div><div class='del'>-extern int hfs_mac2asc(struct super_block *, char *, const struct hfs_name *);</div><div class='add'>+extern void hfs_asc2mac(struct super_block *sb,</div><div class='add'>+			struct hfs_name *out, const struct qstr *in);</div><div class='add'>+extern int hfs_mac2asc(struct super_block *sb,</div><div class='add'>+			char *out, const struct hfs_name *in);</div><div class='ctx'> </div><div class='ctx'> /* super.c */</div><div class='ctx'> extern void hfs_mark_mdb_dirty(struct super_block *sb);</div><div class='head'>diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c<br/>index 8c34798a0715..524db1389737 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/inode.c</a></div><div class='hunk'>@@ -44,13 +44,13 @@ static void hfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata)</div><div class='add'>+int hfs_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		    loff_t pos, unsigned int len, struct folio **foliop,</div><div class='add'>+		    void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,</div><div class='add'>+	ret = cont_write_begin(iocb, mapping, pos, len, foliop, fsdata,</div><div class='ctx'> 				hfs_get_block,</div><div class='ctx'> 				&amp;HFS_I(mapping-&gt;host)-&gt;phys_size);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='hunk'>@@ -184,6 +184,10 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct inode *inode = new_inode(sb);</div><div class='add'>+	s64 next_id;</div><div class='add'>+	s64 file_count;</div><div class='add'>+	s64 folder_count;</div><div class='add'>+</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +195,9 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;HFS_I(inode)-&gt;open_dir_list);</div><div class='ctx'> 	spin_lock_init(&amp;HFS_I(inode)-&gt;open_dir_lock);</div><div class='ctx'> 	hfs_cat_build_key(sb, (btree_key *)&amp;HFS_I(inode)-&gt;cat_key, dir-&gt;i_ino, name);</div><div class='del'>-	inode-&gt;i_ino = HFS_SB(sb)-&gt;next_id++;</div><div class='add'>+	next_id = atomic64_inc_return(&amp;HFS_SB(sb)-&gt;next_id);</div><div class='add'>+	BUG_ON(next_id &gt; U32_MAX);</div><div class='add'>+	inode-&gt;i_ino = (u32)next_id;</div><div class='ctx'> 	inode-&gt;i_mode = mode;</div><div class='ctx'> 	inode-&gt;i_uid = current_fsuid();</div><div class='ctx'> 	inode-&gt;i_gid = current_fsgid();</div><div class='hunk'>@@ -200,9 +206,11 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t</div><div class='ctx'> 	HFS_I(inode)-&gt;flags = 0;</div><div class='ctx'> 	HFS_I(inode)-&gt;rsrc_inode = NULL;</div><div class='ctx'> 	HFS_I(inode)-&gt;fs_blocks = 0;</div><div class='add'>+	HFS_I(inode)-&gt;tz_secondswest = sys_tz.tz_minuteswest * 60;</div><div class='ctx'> 	if (S_ISDIR(mode)) {</div><div class='ctx'> 		inode-&gt;i_size = 2;</div><div class='del'>-		HFS_SB(sb)-&gt;folder_count++;</div><div class='add'>+		folder_count = atomic64_inc_return(&amp;HFS_SB(sb)-&gt;folder_count);</div><div class='add'>+		BUG_ON(folder_count &gt; U32_MAX);</div><div class='ctx'> 		if (dir-&gt;i_ino == HFS_ROOT_CNID)</div><div class='ctx'> 			HFS_SB(sb)-&gt;root_dirs++;</div><div class='ctx'> 		inode-&gt;i_op = &amp;hfs_dir_inode_operations;</div><div class='hunk'>@@ -211,7 +219,8 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t</div><div class='ctx'> 		inode-&gt;i_mode &amp;= ~HFS_SB(inode-&gt;i_sb)-&gt;s_dir_umask;</div><div class='ctx'> 	} else if (S_ISREG(mode)) {</div><div class='ctx'> 		HFS_I(inode)-&gt;clump_blocks = HFS_SB(sb)-&gt;clumpablks;</div><div class='del'>-		HFS_SB(sb)-&gt;file_count++;</div><div class='add'>+		file_count = atomic64_inc_return(&amp;HFS_SB(sb)-&gt;file_count);</div><div class='add'>+		BUG_ON(file_count &gt; U32_MAX);</div><div class='ctx'> 		if (dir-&gt;i_ino == HFS_ROOT_CNID)</div><div class='ctx'> 			HFS_SB(sb)-&gt;root_files++;</div><div class='ctx'> 		inode-&gt;i_op = &amp;hfs_file_inode_operations;</div><div class='hunk'>@@ -241,16 +250,19 @@ void hfs_delete_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(INODE, "delete_inode: %lu\n", inode-&gt;i_ino);</div><div class='add'>+	hfs_dbg("ino %lu\n", inode-&gt;i_ino);</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-		HFS_SB(sb)-&gt;folder_count--;</div><div class='add'>+		BUG_ON(atomic64_read(&amp;HFS_SB(sb)-&gt;folder_count) &gt; U32_MAX);</div><div class='add'>+		atomic64_dec(&amp;HFS_SB(sb)-&gt;folder_count);</div><div class='ctx'> 		if (HFS_I(inode)-&gt;cat_key.ParID == cpu_to_be32(HFS_ROOT_CNID))</div><div class='ctx'> 			HFS_SB(sb)-&gt;root_dirs--;</div><div class='ctx'> 		set_bit(HFS_FLG_MDB_DIRTY, &amp;HFS_SB(sb)-&gt;flags);</div><div class='ctx'> 		hfs_mark_mdb_dirty(sb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	HFS_SB(sb)-&gt;file_count--;</div><div class='add'>+</div><div class='add'>+	BUG_ON(atomic64_read(&amp;HFS_SB(sb)-&gt;file_count) &gt; U32_MAX);</div><div class='add'>+	atomic64_dec(&amp;HFS_SB(sb)-&gt;file_count);</div><div class='ctx'> 	if (HFS_I(inode)-&gt;cat_key.ParID == cpu_to_be32(HFS_ROOT_CNID))</div><div class='ctx'> 		HFS_SB(sb)-&gt;root_files--;</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode)) {</div><div class='hunk'>@@ -275,6 +287,8 @@ void hfs_inode_read_fork(struct inode *inode, struct hfs_extent *ext,</div><div class='ctx'> 	for (count = 0, i = 0; i &lt; 3; i++)</div><div class='ctx'> 		count += be16_to_cpu(ext[i].count);</div><div class='ctx'> 	HFS_I(inode)-&gt;first_blocks = count;</div><div class='add'>+	HFS_I(inode)-&gt;cached_start = 0;</div><div class='add'>+	HFS_I(inode)-&gt;cached_blocks = 0;</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_size = HFS_I(inode)-&gt;phys_size = log_size;</div><div class='ctx'> 	HFS_I(inode)-&gt;fs_blocks = (log_size + sb-&gt;s_blocksize - 1) &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='hunk'>@@ -399,7 +413,7 @@ struct inode *hfs_iget(struct super_block *sb, struct hfs_cat_key *key, hfs_cat_</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	inode = iget5_locked(sb, cnid, hfs_test_inode, hfs_read_inode, &amp;data);</div><div class='del'>-	if (inode &amp;&amp; (inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (inode &amp;&amp; (inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -423,7 +437,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> 	hfs_cat_rec rec;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(INODE, "hfs_write_inode: %lu\n", inode-&gt;i_ino);</div><div class='add'>+	hfs_dbg("ino %lu\n", inode-&gt;i_ino);</div><div class='ctx'> 	res = hfs_ext_write_extent(inode);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='hunk'>@@ -688,8 +702,9 @@ static const struct file_operations hfs_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='add'>+	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fsync		= hfs_file_fsync,</div><div class='ctx'> 	.open		= hfs_file_open,</div><div class='ctx'> 	.release	= hfs_file_release,</div><div class='head'>diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c<br/>index 8082eb01127c..53f3fae60217 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/mdb.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/mdb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/mdb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/mdb.c</a></div><div class='hunk'>@@ -150,11 +150,11 @@ int hfs_mdb_get(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	/* These parameters are read from and written to the MDB */</div><div class='ctx'> 	HFS_SB(sb)-&gt;free_ablocks = be16_to_cpu(mdb-&gt;drFreeBks);</div><div class='del'>-	HFS_SB(sb)-&gt;next_id = be32_to_cpu(mdb-&gt;drNxtCNID);</div><div class='add'>+	atomic64_set(&amp;HFS_SB(sb)-&gt;next_id, be32_to_cpu(mdb-&gt;drNxtCNID));</div><div class='ctx'> 	HFS_SB(sb)-&gt;root_files = be16_to_cpu(mdb-&gt;drNmFls);</div><div class='ctx'> 	HFS_SB(sb)-&gt;root_dirs = be16_to_cpu(mdb-&gt;drNmRtDirs);</div><div class='del'>-	HFS_SB(sb)-&gt;file_count = be32_to_cpu(mdb-&gt;drFilCnt);</div><div class='del'>-	HFS_SB(sb)-&gt;folder_count = be32_to_cpu(mdb-&gt;drDirCnt);</div><div class='add'>+	atomic64_set(&amp;HFS_SB(sb)-&gt;file_count, be32_to_cpu(mdb-&gt;drFilCnt));</div><div class='add'>+	atomic64_set(&amp;HFS_SB(sb)-&gt;folder_count, be32_to_cpu(mdb-&gt;drDirCnt));</div><div class='ctx'> </div><div class='ctx'> 	/* TRY to get the alternate (backup) MDB. */</div><div class='ctx'> 	sect = part_start + part_size - 2;</div><div class='hunk'>@@ -172,7 +172,7 @@ int hfs_mdb_get(struct super_block *sb)</div><div class='ctx'> 		pr_warn("continuing without an alternate MDB\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	HFS_SB(sb)-&gt;bitmap = kmalloc(8192, GFP_KERNEL);</div><div class='add'>+	HFS_SB(sb)-&gt;bitmap = kzalloc(8192, GFP_KERNEL);</div><div class='ctx'> 	if (!HFS_SB(sb)-&gt;bitmap)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -273,11 +273,17 @@ void hfs_mdb_commit(struct super_block *sb)</div><div class='ctx'> 		/* These parameters may have been modified, so write them back */</div><div class='ctx'> 		mdb-&gt;drLsMod = hfs_mtime();</div><div class='ctx'> 		mdb-&gt;drFreeBks = cpu_to_be16(HFS_SB(sb)-&gt;free_ablocks);</div><div class='del'>-		mdb-&gt;drNxtCNID = cpu_to_be32(HFS_SB(sb)-&gt;next_id);</div><div class='add'>+		BUG_ON(atomic64_read(&amp;HFS_SB(sb)-&gt;next_id) &gt; U32_MAX);</div><div class='add'>+		mdb-&gt;drNxtCNID =</div><div class='add'>+			cpu_to_be32((u32)atomic64_read(&amp;HFS_SB(sb)-&gt;next_id));</div><div class='ctx'> 		mdb-&gt;drNmFls = cpu_to_be16(HFS_SB(sb)-&gt;root_files);</div><div class='ctx'> 		mdb-&gt;drNmRtDirs = cpu_to_be16(HFS_SB(sb)-&gt;root_dirs);</div><div class='del'>-		mdb-&gt;drFilCnt = cpu_to_be32(HFS_SB(sb)-&gt;file_count);</div><div class='del'>-		mdb-&gt;drDirCnt = cpu_to_be32(HFS_SB(sb)-&gt;folder_count);</div><div class='add'>+		BUG_ON(atomic64_read(&amp;HFS_SB(sb)-&gt;file_count) &gt; U32_MAX);</div><div class='add'>+		mdb-&gt;drFilCnt =</div><div class='add'>+			cpu_to_be32((u32)atomic64_read(&amp;HFS_SB(sb)-&gt;file_count));</div><div class='add'>+		BUG_ON(atomic64_read(&amp;HFS_SB(sb)-&gt;folder_count) &gt; U32_MAX);</div><div class='add'>+		mdb-&gt;drDirCnt =</div><div class='add'>+			cpu_to_be32((u32)atomic64_read(&amp;HFS_SB(sb)-&gt;folder_count));</div><div class='ctx'> </div><div class='ctx'> 		/* write MDB to disk */</div><div class='ctx'> 		mark_buffer_dirty(HFS_SB(sb)-&gt;mdb_bh);</div><div class='head'>diff --git a/fs/hfs/string.c b/fs/hfs/string.c<br/>index 3912209153a8..0cfa35e82abc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/string.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/string.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/string.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/string.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #include "hfs_fs.h"</div><div class='ctx'> #include &lt;linux/dcache.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;kunit/visibility.h&gt;</div><div class='add'>+</div><div class='ctx'> /*================ File-local variables ================*/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -65,6 +67,7 @@ int hfs_hash_dentry(const struct dentry *dentry, struct qstr *this)</div><div class='ctx'> 	this-&gt;hash = end_name_hash(hash);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfs_hash_dentry);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Compare two strings in the HFS filename character ordering</div><div class='hunk'>@@ -87,6 +90,7 @@ int hfs_strcmp(const unsigned char *s1, unsigned int len1,</div><div class='ctx'> 	}</div><div class='ctx'> 	return len1 - len2;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfs_strcmp);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Test for equality of two strings in the HFS filename character ordering.</div><div class='hunk'>@@ -112,3 +116,4 @@ int hfs_compare_dentry(const struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfs_compare_dentry);</div><div class='head'>diff --git a/fs/hfs/string_test.c b/fs/hfs/string_test.c<br/>new file mode 100644<br/>index 000000000000..e1bf6f954312<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/string_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/string_test.c</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for HFS string operations</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Viacheslav Dubeyko &lt;slava@dubeyko.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;linux/dcache.h&gt;</div><div class='add'>+#include "hfs_fs.h"</div><div class='add'>+</div><div class='add'>+/* Test hfs_strcmp function */</div><div class='add'>+static void hfs_strcmp_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	/* Test equal strings */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("hello", 5, "hello", 5));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("test", 4, "test", 4));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("", 0, "", 0));</div><div class='add'>+</div><div class='add'>+	/* Test unequal strings */</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfs_strcmp("hello", 5, "world", 5));</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfs_strcmp("test", 4, "testing", 7));</div><div class='add'>+</div><div class='add'>+	/* Test different lengths */</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfs_strcmp("test", 4, "testing", 7), 0);</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfs_strcmp("testing", 7, "test", 4), 0);</div><div class='add'>+</div><div class='add'>+	/* Test case insensitive comparison (HFS should handle case) */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("Test", 4, "TEST", 4));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("hello", 5, "HELLO", 5));</div><div class='add'>+</div><div class='add'>+	/* Test with special characters */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("file.txt", 8, "file.txt", 8));</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfs_strcmp("file.txt", 8, "file.dat", 8));</div><div class='add'>+</div><div class='add'>+	/* Test boundary cases */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_strcmp("a", 1, "a", 1));</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfs_strcmp("a", 1, "b", 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfs_hash_dentry function */</div><div class='add'>+static void hfs_hash_dentry_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct qstr test_name1, test_name2, test_name3;</div><div class='add'>+	struct dentry dentry = {};</div><div class='add'>+	char name1[] = "testfile";</div><div class='add'>+	char name2[] = "TestFile";</div><div class='add'>+	char name3[] = "different";</div><div class='add'>+</div><div class='add'>+	/* Initialize test strings */</div><div class='add'>+	test_name1.name = name1;</div><div class='add'>+	test_name1.len = strlen(name1);</div><div class='add'>+	test_name1.hash = 0;</div><div class='add'>+</div><div class='add'>+	test_name2.name = name2;</div><div class='add'>+	test_name2.len = strlen(name2);</div><div class='add'>+	test_name2.hash = 0;</div><div class='add'>+</div><div class='add'>+	test_name3.name = name3;</div><div class='add'>+	test_name3.len = strlen(name3);</div><div class='add'>+	test_name3.hash = 0;</div><div class='add'>+</div><div class='add'>+	/* Test hashing */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_hash_dentry(&amp;dentry, &amp;test_name1));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_hash_dentry(&amp;dentry, &amp;test_name2));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_hash_dentry(&amp;dentry, &amp;test_name3));</div><div class='add'>+</div><div class='add'>+	/* Case insensitive names should hash the same */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, test_name1.hash, test_name2.hash);</div><div class='add'>+</div><div class='add'>+	/* Different names should have different hashes */</div><div class='add'>+	KUNIT_EXPECT_NE(test, test_name1.hash, test_name3.hash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfs_compare_dentry function */</div><div class='add'>+static void hfs_compare_dentry_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct qstr test_name;</div><div class='add'>+	struct dentry dentry = {};</div><div class='add'>+	char name[] = "TestFile";</div><div class='add'>+</div><div class='add'>+	test_name.name = name;</div><div class='add'>+	test_name.len = strlen(name);</div><div class='add'>+</div><div class='add'>+	/* Test exact match */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_compare_dentry(&amp;dentry, 8,</div><div class='add'>+						    "TestFile", &amp;test_name));</div><div class='add'>+</div><div class='add'>+	/* Test case insensitive match */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_compare_dentry(&amp;dentry, 8,</div><div class='add'>+						    "testfile", &amp;test_name));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_compare_dentry(&amp;dentry, 8,</div><div class='add'>+						    "TESTFILE", &amp;test_name));</div><div class='add'>+</div><div class='add'>+	/* Test different names */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, hfs_compare_dentry(&amp;dentry, 8,</div><div class='add'>+						    "DiffFile", &amp;test_name));</div><div class='add'>+</div><div class='add'>+	/* Test different lengths */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, hfs_compare_dentry(&amp;dentry, 7,</div><div class='add'>+						    "TestFil", &amp;test_name));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, hfs_compare_dentry(&amp;dentry, 9,</div><div class='add'>+						    "TestFiles", &amp;test_name));</div><div class='add'>+</div><div class='add'>+	/* Test empty string */</div><div class='add'>+	test_name.name = "";</div><div class='add'>+	test_name.len = 0;</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_compare_dentry(&amp;dentry, 0, "", &amp;test_name));</div><div class='add'>+</div><div class='add'>+	/* Test HFS_NAMELEN boundary */</div><div class='add'>+	test_name.name = "This_is_a_very_long_filename_that_exceeds_normal_limits";</div><div class='add'>+	test_name.len = strlen(test_name.name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfs_compare_dentry(&amp;dentry, HFS_NAMELEN,</div><div class='add'>+			"This_is_a_very_long_filename_th", &amp;test_name));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case hfs_string_test_cases[] = {</div><div class='add'>+	KUNIT_CASE(hfs_strcmp_test),</div><div class='add'>+	KUNIT_CASE(hfs_hash_dentry_test),</div><div class='add'>+	KUNIT_CASE(hfs_compare_dentry_test),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite hfs_string_test_suite = {</div><div class='add'>+	.name = "hfs_string",</div><div class='add'>+	.test_cases = hfs_string_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(hfs_string_test_suite);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("KUnit tests for HFS string operations");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='head'>diff --git a/fs/hfs/super.c b/fs/hfs/super.c<br/>index 6764afa98a6f..47f50fa555a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/super.c</a></div><div class='hunk'>@@ -15,10 +15,11 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/nls.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='hunk'>@@ -28,6 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *hfs_inode_cachep;</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Apple Macintosh file system support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int hfs_sync_fs(struct super_block *sb, int wait)</div><div class='hunk'>@@ -110,21 +112,24 @@ static int hfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int hfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_NODIRATIME;</div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='add'>+	fc-&gt;sb_flags |= SB_NODIRATIME;</div><div class='add'>+	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!(*flags &amp; SB_RDONLY)) {</div><div class='add'>+</div><div class='add'>+	if (!(fc-&gt;sb_flags &amp; SB_RDONLY)) {</div><div class='ctx'> 		if (!(HFS_SB(sb)-&gt;mdb-&gt;drAtrb &amp; cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {</div><div class='ctx'> 			pr_warn("filesystem was not cleanly unmounted, running fsck.hfs is recommended.  leaving read-only.\n");</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			*flags |= SB_RDONLY;</div><div class='add'>+			fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 		} else if (HFS_SB(sb)-&gt;mdb-&gt;drAtrb &amp; cpu_to_be16(HFS_SB_ATTRIB_SLOCK)) {</div><div class='ctx'> 			pr_warn("filesystem is marked locked, leaving read-only.\n");</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			*flags |= SB_RDONLY;</div><div class='add'>+			fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -179,7 +184,6 @@ static const struct super_operations hfs_super_operations = {</div><div class='ctx'> 	.put_super	= hfs_put_super,</div><div class='ctx'> 	.sync_fs	= hfs_sync_fs,</div><div class='ctx'> 	.statfs		= hfs_statfs,</div><div class='del'>-	.remount_fs     = hfs_remount,</div><div class='ctx'> 	.show_options	= hfs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -187,181 +191,112 @@ enum {</div><div class='ctx'> 	opt_uid, opt_gid, opt_umask, opt_file_umask, opt_dir_umask,</div><div class='ctx'> 	opt_part, opt_session, opt_type, opt_creator, opt_quiet,</div><div class='ctx'> 	opt_codepage, opt_iocharset,</div><div class='del'>-	opt_err</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{ opt_uid, "uid=%u" },</div><div class='del'>-	{ opt_gid, "gid=%u" },</div><div class='del'>-	{ opt_umask, "umask=%o" },</div><div class='del'>-	{ opt_file_umask, "file_umask=%o" },</div><div class='del'>-	{ opt_dir_umask, "dir_umask=%o" },</div><div class='del'>-	{ opt_part, "part=%u" },</div><div class='del'>-	{ opt_session, "session=%u" },</div><div class='del'>-	{ opt_type, "type=%s" },</div><div class='del'>-	{ opt_creator, "creator=%s" },</div><div class='del'>-	{ opt_quiet, "quiet" },</div><div class='del'>-	{ opt_codepage, "codepage=%s" },</div><div class='del'>-	{ opt_iocharset, "iocharset=%s" },</div><div class='del'>-	{ opt_err, NULL }</div><div class='add'>+static const struct fs_parameter_spec hfs_param_spec[] = {</div><div class='add'>+	fsparam_u32	("uid",		opt_uid),</div><div class='add'>+	fsparam_u32	("gid",		opt_gid),</div><div class='add'>+	fsparam_u32oct	("umask",	opt_umask),</div><div class='add'>+	fsparam_u32oct	("file_umask",	opt_file_umask),</div><div class='add'>+	fsparam_u32oct	("dir_umask",	opt_dir_umask),</div><div class='add'>+	fsparam_u32	("part",	opt_part),</div><div class='add'>+	fsparam_u32	("session",	opt_session),</div><div class='add'>+	fsparam_string	("type",	opt_type),</div><div class='add'>+	fsparam_string	("creator",	opt_creator),</div><div class='add'>+	fsparam_flag	("quiet",	opt_quiet),</div><div class='add'>+	fsparam_string	("codepage",	opt_codepage),</div><div class='add'>+	fsparam_string	("iocharset",	opt_iocharset),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int match_fourchar(substring_t *arg, u32 *result)</div><div class='del'>-{</div><div class='del'>-	if (arg-&gt;to - arg-&gt;from != 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	memcpy(result, arg-&gt;from, 4);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * parse_options()</div><div class='add'>+ * hfs_parse_param()</div><div class='ctx'>  *</div><div class='del'>- * adapted from linux/fs/msdos/inode.c written 1992,93 by Werner Almesberger</div><div class='del'>- * This function is called by hfs_read_super() to parse the mount options.</div><div class='add'>+ * This function is called by the vfs to parse the mount options.</div><div class='ctx'>  */</div><div class='del'>-static int parse_options(char *options, struct hfs_sb_info *hsb)</div><div class='add'>+static int hfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int tmp, token;</div><div class='del'>-</div><div class='del'>-	/* initialize the sb with defaults */</div><div class='del'>-	hsb-&gt;s_uid = current_uid();</div><div class='del'>-	hsb-&gt;s_gid = current_gid();</div><div class='del'>-	hsb-&gt;s_file_umask = 0133;</div><div class='del'>-	hsb-&gt;s_dir_umask = 0022;</div><div class='del'>-	hsb-&gt;s_type = hsb-&gt;s_creator = cpu_to_be32(0x3f3f3f3f);	/* == '????' */</div><div class='del'>-	hsb-&gt;s_quiet = 0;</div><div class='del'>-	hsb-&gt;part = -1;</div><div class='del'>-	hsb-&gt;session = -1;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("uid requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			hsb-&gt;s_uid = make_kuid(current_user_ns(), (uid_t)tmp);</div><div class='del'>-			if (!uid_valid(hsb-&gt;s_uid)) {</div><div class='del'>-				pr_err("invalid uid %d\n", tmp);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("gid requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			hsb-&gt;s_gid = make_kgid(current_user_ns(), (gid_t)tmp);</div><div class='del'>-			if (!gid_valid(hsb-&gt;s_gid)) {</div><div class='del'>-				pr_err("invalid gid %d\n", tmp);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_umask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("umask requires a value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			hsb-&gt;s_file_umask = (umode_t)tmp;</div><div class='del'>-			hsb-&gt;s_dir_umask = (umode_t)tmp;</div><div class='del'>-			break;</div><div class='del'>-		case opt_file_umask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("file_umask requires a value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			hsb-&gt;s_file_umask = (umode_t)tmp;</div><div class='del'>-			break;</div><div class='del'>-		case opt_dir_umask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("dir_umask requires a value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			hsb-&gt;s_dir_umask = (umode_t)tmp;</div><div class='del'>-			break;</div><div class='del'>-		case opt_part:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;hsb-&gt;part)) {</div><div class='del'>-				pr_err("part requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_session:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;hsb-&gt;session)) {</div><div class='del'>-				pr_err("session requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_type:</div><div class='del'>-			if (match_fourchar(&amp;args[0], &amp;hsb-&gt;s_type)) {</div><div class='del'>-				pr_err("type requires a 4 character value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_creator:</div><div class='del'>-			if (match_fourchar(&amp;args[0], &amp;hsb-&gt;s_creator)) {</div><div class='del'>-				pr_err("creator requires a 4 character value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_quiet:</div><div class='del'>-			hsb-&gt;s_quiet = 1;</div><div class='del'>-			break;</div><div class='del'>-		case opt_codepage:</div><div class='del'>-			if (hsb-&gt;nls_disk) {</div><div class='del'>-				pr_err("unable to change codepage\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			p = match_strdup(&amp;args[0]);</div><div class='del'>-			if (p)</div><div class='del'>-				hsb-&gt;nls_disk = load_nls(p);</div><div class='del'>-			if (!hsb-&gt;nls_disk) {</div><div class='del'>-				pr_err("unable to load codepage \"%s\"\n", p);</div><div class='del'>-				kfree(p);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			kfree(p);</div><div class='del'>-			break;</div><div class='del'>-		case opt_iocharset:</div><div class='del'>-			if (hsb-&gt;nls_io) {</div><div class='del'>-				pr_err("unable to change iocharset\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			p = match_strdup(&amp;args[0]);</div><div class='del'>-			if (p)</div><div class='del'>-				hsb-&gt;nls_io = load_nls(p);</div><div class='del'>-			if (!hsb-&gt;nls_io) {</div><div class='del'>-				pr_err("unable to load iocharset \"%s\"\n", p);</div><div class='del'>-				kfree(p);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			kfree(p);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct hfs_sb_info *hsb = fc-&gt;s_fs_info;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	/* hfs does not honor any fs-specific options on remount */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (hsb-&gt;nls_disk &amp;&amp; !hsb-&gt;nls_io) {</div><div class='del'>-		hsb-&gt;nls_io = load_nls_default();</div><div class='add'>+	opt = fs_parse(fc, hfs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case opt_uid:</div><div class='add'>+		hsb-&gt;s_uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case opt_gid:</div><div class='add'>+		hsb-&gt;s_gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case opt_umask:</div><div class='add'>+		hsb-&gt;s_file_umask = (umode_t)result.uint_32;</div><div class='add'>+		hsb-&gt;s_dir_umask = (umode_t)result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_file_umask:</div><div class='add'>+		hsb-&gt;s_file_umask = (umode_t)result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_dir_umask:</div><div class='add'>+		hsb-&gt;s_dir_umask = (umode_t)result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_part:</div><div class='add'>+		hsb-&gt;part = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_session:</div><div class='add'>+		hsb-&gt;session = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_type:</div><div class='add'>+		if (strlen(param-&gt;string) != 4) {</div><div class='add'>+			pr_err("type requires a 4 character value\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(&amp;hsb-&gt;s_type, param-&gt;string, 4);</div><div class='add'>+		break;</div><div class='add'>+	case opt_creator:</div><div class='add'>+		if (strlen(param-&gt;string) != 4) {</div><div class='add'>+			pr_err("creator requires a 4 character value\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(&amp;hsb-&gt;s_creator, param-&gt;string, 4);</div><div class='add'>+		break;</div><div class='add'>+	case opt_quiet:</div><div class='add'>+		hsb-&gt;s_quiet = 1;</div><div class='add'>+		break;</div><div class='add'>+	case opt_codepage:</div><div class='add'>+		if (hsb-&gt;nls_disk) {</div><div class='add'>+			pr_err("unable to change codepage\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		hsb-&gt;nls_disk = load_nls(param-&gt;string);</div><div class='add'>+		if (!hsb-&gt;nls_disk) {</div><div class='add'>+			pr_err("unable to load codepage \"%s\"\n",</div><div class='add'>+					param-&gt;string);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case opt_iocharset:</div><div class='add'>+		if (hsb-&gt;nls_io) {</div><div class='add'>+			pr_err("unable to change iocharset\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		hsb-&gt;nls_io = load_nls(param-&gt;string);</div><div class='ctx'> 		if (!hsb-&gt;nls_io) {</div><div class='del'>-			pr_err("unable to load default iocharset\n");</div><div class='del'>-			return 0;</div><div class='add'>+			pr_err("unable to load iocharset \"%s\"\n",</div><div class='add'>+					param-&gt;string);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	hsb-&gt;s_dir_umask &amp;= 0777;</div><div class='del'>-	hsb-&gt;s_file_umask &amp;= 0577;</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -375,29 +310,29 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)</div><div class='ctx'>  * hfs_btree_init() to get the necessary data about the extents and</div><div class='ctx'>  * catalog B-trees and, finally, reading the root inode into memory.</div><div class='ctx'>  */</div><div class='del'>-static int hfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int hfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct hfs_sb_info *sbi;</div><div class='add'>+	struct hfs_sb_info *sbi = HFS_SB(sb);</div><div class='ctx'> 	struct hfs_find_data fd;</div><div class='ctx'> 	hfs_cat_rec rec;</div><div class='ctx'> 	struct inode *root_inode;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL);</div><div class='del'>-	if (!sbi)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	atomic64_set(&amp;sbi-&gt;file_count, 0);</div><div class='add'>+	atomic64_set(&amp;sbi-&gt;folder_count, 0);</div><div class='add'>+	atomic64_set(&amp;sbi-&gt;next_id, 0);</div><div class='add'>+</div><div class='add'>+	/* load_nls_default does not fail */</div><div class='add'>+	if (sbi-&gt;nls_disk &amp;&amp; !sbi-&gt;nls_io)</div><div class='add'>+		sbi-&gt;nls_io = load_nls_default();</div><div class='add'>+	sbi-&gt;s_dir_umask &amp;= 0777;</div><div class='add'>+	sbi-&gt;s_file_umask &amp;= 0577;</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;sb = sb;</div><div class='del'>-	sb-&gt;s_fs_info = sbi;</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;work_lock);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;sbi-&gt;mdb_work, flush_mdb);</div><div class='ctx'> </div><div class='del'>-	res = -EINVAL;</div><div class='del'>-	if (!parse_options((char *)data, sbi)) {</div><div class='del'>-		pr_err("unable to parse mount options\n");</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	sbi-&gt;sb = sb;</div><div class='ctx'> 	sb-&gt;s_op = &amp;hfs_super_operations;</div><div class='ctx'> 	sb-&gt;s_xattr = hfs_xattr_handlers;</div><div class='ctx'> 	sb-&gt;s_flags |= SB_NODIRATIME;</div><div class='hunk'>@@ -418,11 +353,13 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		goto bail_no_root;</div><div class='ctx'> 	res = hfs_cat_find_brec(sb, HFS_ROOT_CNID, &amp;fd);</div><div class='ctx'> 	if (!res) {</div><div class='del'>-		if (fd.entrylength &gt; sizeof(rec) || fd.entrylength &lt; 0) {</div><div class='add'>+		if (fd.entrylength != sizeof(rec.dir)) {</div><div class='ctx'> 			res =  -EIO;</div><div class='ctx'> 			goto bail_hfs_find;</div><div class='ctx'> 		}</div><div class='ctx'> 		hfs_bnode_read(fd.bnode, &amp;rec, fd.entryoffset, fd.entrylength);</div><div class='add'>+		if (rec.type != HFS_CDR_DIR)</div><div class='add'>+			res = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto bail_hfs_find;</div><div class='hunk'>@@ -432,7 +369,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!root_inode)</div><div class='ctx'> 		goto bail_no_root;</div><div class='ctx'> </div><div class='del'>-	sb-&gt;s_d_op = &amp;hfs_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;hfs_dentry_operations);</div><div class='ctx'> 	res = -ENOMEM;</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root_inode);</div><div class='ctx'> 	if (!sb-&gt;s_root)</div><div class='hunk'>@@ -450,18 +387,56 @@ bail:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *hfs_mount(struct file_system_type *fs_type,</div><div class='del'>-		      int flags, const char *dev_name, void *data)</div><div class='add'>+static int hfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, hfs_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, hfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hfs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;s_fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations hfs_context_ops = {</div><div class='add'>+	.parse_param	= hfs_parse_param,</div><div class='add'>+	.get_tree	= hfs_get_tree,</div><div class='add'>+	.reconfigure	= hfs_reconfigure,</div><div class='add'>+	.free		= hfs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct hfs_sb_info *hsb;</div><div class='add'>+</div><div class='add'>+	hsb = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL);</div><div class='add'>+	if (!hsb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fc-&gt;s_fs_info = hsb;</div><div class='add'>+	fc-&gt;ops = &amp;hfs_context_ops;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose != FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		/* initialize options with defaults */</div><div class='add'>+		hsb-&gt;s_uid = current_uid();</div><div class='add'>+		hsb-&gt;s_gid = current_gid();</div><div class='add'>+		hsb-&gt;s_file_umask = 0133;</div><div class='add'>+		hsb-&gt;s_dir_umask = 0022;</div><div class='add'>+		hsb-&gt;s_type = cpu_to_be32(0x3f3f3f3f); /* == '????' */</div><div class='add'>+		hsb-&gt;s_creator = cpu_to_be32(0x3f3f3f3f); /* == '????' */</div><div class='add'>+		hsb-&gt;s_quiet = 0;</div><div class='add'>+		hsb-&gt;part = -1;</div><div class='add'>+		hsb-&gt;session = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "hfs",</div><div class='del'>-	.mount		= hfs_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = hfs_init_fs_context,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("hfs");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c<br/>index 76fa02e3835b..ef54fc8093cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfs/sysdep.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfs/sysdep.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfs/sysdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfs/sysdep.c</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> </div><div class='ctx'> /* dentry case-handling: just lowercase everything */</div><div class='ctx'> </div><div class='del'>-static int hfs_revalidate_dentry(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int hfs_revalidate_dentry(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int diff;</div><div class='head'>diff --git a/fs/hfsplus/.kunitconfig b/fs/hfsplus/.kunitconfig<br/>new file mode 100644<br/>index 000000000000..6c96dc7e872c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/.kunitconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/.kunitconfig</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+CONFIG_KUNIT=y</div><div class='add'>+CONFIG_HFSPLUS_FS=y</div><div class='add'>+CONFIG_HFSPLUS_KUNIT_TEST=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_BUFFER_HEAD=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+CONFIG_LEGACY_DIRECT_IO=y</div><div class='head'>diff --git a/fs/hfsplus/Kconfig b/fs/hfsplus/Kconfig<br/>index 8ce4a33a9ac7..ca8401cb6954 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/Kconfig</a></div><div class='hunk'>@@ -14,3 +14,18 @@ config HFSPLUS_FS</div><div class='ctx'> 	  MacOS 8. It includes all Mac specific filesystem data such as</div><div class='ctx'> 	  data forks and creator codes, but it also has several UNIX</div><div class='ctx'> 	  style features such as file ownership and permissions.</div><div class='add'>+</div><div class='add'>+config HFSPLUS_KUNIT_TEST</div><div class='add'>+	tristate "KUnit tests for HFS+ filesystem" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on HFSPLUS_FS &amp;&amp; KUNIT</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  This builds KUnit tests for the HFS+ filesystem.</div><div class='add'>+</div><div class='add'>+	  KUnit tests run during boot and output the results to the debug</div><div class='add'>+	  log in TAP format (https://testanything.org/). Only useful for</div><div class='add'>+	  kernel devs running KUnit test harness and are not for inclusion</div><div class='add'>+	  into a production build.</div><div class='add'>+</div><div class='add'>+	  For more information on KUnit and unit tests in general please</div><div class='add'>+	  refer to the KUnit documentation in Documentation/dev-tools/kunit/.</div><div class='head'>diff --git a/fs/hfsplus/Makefile b/fs/hfsplus/Makefile<br/>index 9ed20e64b983..f2a9ae697e81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/Makefile</a></div><div class='hunk'>@@ -8,3 +8,6 @@ obj-$(CONFIG_HFSPLUS_FS) += hfsplus.o</div><div class='ctx'> hfsplus-objs := super.o options.o inode.o ioctl.o extents.o catalog.o dir.o btree.o \</div><div class='ctx'> 		bnode.o brec.o bfind.o tables.o unicode.o wrapper.o bitmap.o part_tbl.o \</div><div class='ctx'> 		attributes.o xattr.o xattr_user.o xattr_security.o xattr_trusted.o</div><div class='add'>+</div><div class='add'>+# KUnit tests</div><div class='add'>+obj-$(CONFIG_HFSPLUS_KUNIT_TEST) += unicode_test.o</div><div class='head'>diff --git a/fs/hfsplus/attributes.c b/fs/hfsplus/attributes.c<br/>index eeebe80c6be4..ba26980cc503 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/attributes.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/attributes.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/attributes.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/attributes.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ int hfsplus_find_attr(struct super_block *sb, u32 cnid,</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(ATTR_MOD, "find_attr: %s,%d\n", name ? name : NULL, cnid);</div><div class='add'>+	hfs_dbg("name %s, cnid %d\n", name ? name : NULL, cnid);</div><div class='ctx'> </div><div class='ctx'> 	if (!HFSPLUS_SB(sb)-&gt;attr_tree) {</div><div class='ctx'> 		pr_err("attributes file doesn't exist\n");</div><div class='hunk'>@@ -201,7 +201,7 @@ int hfsplus_create_attr(struct inode *inode,</div><div class='ctx'> 	int entry_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(ATTR_MOD, "create_attr: %s,%ld\n",</div><div class='add'>+	hfs_dbg("name %s, ino %ld\n",</div><div class='ctx'> 		name ? name : NULL, inode-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> 	if (!HFSPLUS_SB(sb)-&gt;attr_tree) {</div><div class='hunk'>@@ -310,7 +310,7 @@ int hfsplus_delete_attr(struct inode *inode, const char *name)</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct hfs_find_data fd;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(ATTR_MOD, "delete_attr: %s,%ld\n",</div><div class='add'>+	hfs_dbg("name %s, ino %ld\n",</div><div class='ctx'> 		name ? name : NULL, inode-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> 	if (!HFSPLUS_SB(sb)-&gt;attr_tree) {</div><div class='hunk'>@@ -356,7 +356,7 @@ int hfsplus_delete_all_attrs(struct inode *dir, u32 cnid)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct hfs_find_data fd;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(ATTR_MOD, "delete_all_attrs: %d\n", cnid);</div><div class='add'>+	hfs_dbg("cnid %d\n", cnid);</div><div class='ctx'> </div><div class='ctx'> 	if (!HFSPLUS_SB(dir-&gt;i_sb)-&gt;attr_tree) {</div><div class='ctx'> 		pr_err("attributes file doesn't exist\n");</div><div class='head'>diff --git a/fs/hfsplus/bfind.c b/fs/hfsplus/bfind.c<br/>index ca2ba8c9f82e..336d654861c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/bfind.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/bfind.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/bfind.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/bfind.c</a></div><div class='hunk'>@@ -18,26 +18,15 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd)</div><div class='ctx'> </div><div class='ctx'> 	fd-&gt;tree = tree;</div><div class='ctx'> 	fd-&gt;bnode = NULL;</div><div class='del'>-	ptr = kmalloc(tree-&gt;max_key_len * 2 + 4, GFP_KERNEL);</div><div class='add'>+	ptr = kzalloc(tree-&gt;max_key_len * 2 + 4, GFP_KERNEL);</div><div class='ctx'> 	if (!ptr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	fd-&gt;search_key = ptr;</div><div class='ctx'> 	fd-&gt;key = ptr + tree-&gt;max_key_len + 2;</div><div class='del'>-	hfs_dbg(BNODE_REFS, "find_init: %d (%p)\n",</div><div class='add'>+	hfs_dbg("cnid %d, caller %ps\n",</div><div class='ctx'> 		tree-&gt;cnid, __builtin_return_address(0));</div><div class='del'>-	switch (tree-&gt;cnid) {</div><div class='del'>-	case HFSPLUS_CAT_CNID:</div><div class='del'>-		mutex_lock_nested(&amp;tree-&gt;tree_lock, CATALOG_BTREE_MUTEX);</div><div class='del'>-		break;</div><div class='del'>-	case HFSPLUS_EXT_CNID:</div><div class='del'>-		mutex_lock_nested(&amp;tree-&gt;tree_lock, EXTENTS_BTREE_MUTEX);</div><div class='del'>-		break;</div><div class='del'>-	case HFSPLUS_ATTR_CNID:</div><div class='del'>-		mutex_lock_nested(&amp;tree-&gt;tree_lock, ATTR_BTREE_MUTEX);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='add'>+	mutex_lock_nested(&amp;tree-&gt;tree_lock,</div><div class='add'>+			hfsplus_btree_lock_class(tree));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +34,7 @@ void hfs_find_exit(struct hfs_find_data *fd)</div><div class='ctx'> {</div><div class='ctx'> 	hfs_bnode_put(fd-&gt;bnode);</div><div class='ctx'> 	kfree(fd-&gt;search_key);</div><div class='del'>-	hfs_dbg(BNODE_REFS, "find_exit: %d (%p)\n",</div><div class='add'>+	hfs_dbg("cnid %d, caller %ps\n",</div><div class='ctx'> 		fd-&gt;tree-&gt;cnid, __builtin_return_address(0));</div><div class='ctx'> 	mutex_unlock(&amp;fd-&gt;tree-&gt;tree_lock);</div><div class='ctx'> 	fd-&gt;tree = NULL;</div><div class='hunk'>@@ -169,6 +158,12 @@ int hfs_brec_find(struct hfs_find_data *fd, search_strategy_t do_key_compare)</div><div class='ctx'> 	__be32 data;</div><div class='ctx'> 	int height, res;</div><div class='ctx'> </div><div class='add'>+	fd-&gt;record = -1;</div><div class='add'>+	fd-&gt;keyoffset = -1;</div><div class='add'>+	fd-&gt;keylength = -1;</div><div class='add'>+	fd-&gt;entryoffset = -1;</div><div class='add'>+	fd-&gt;entrylength = -1;</div><div class='add'>+</div><div class='ctx'> 	tree = fd-&gt;tree;</div><div class='ctx'> 	if (fd-&gt;bnode)</div><div class='ctx'> 		hfs_bnode_put(fd-&gt;bnode);</div><div class='hunk'>@@ -215,7 +210,7 @@ release:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfs_brec_read(struct hfs_find_data *fd, void *rec, int rec_len)</div><div class='add'>+int hfs_brec_read(struct hfs_find_data *fd, void *rec, u32 rec_len)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c<br/>index bd8dcea85588..1b3af8c87cad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/bitmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/bitmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/bitmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/bitmap.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return size;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);</div><div class='add'>+	hfs_dbg("size %u, offset %u, len %u\n", size, offset, len);</div><div class='ctx'> 	mutex_lock(&amp;sbi-&gt;alloc_mutex);</div><div class='ctx'> 	mapping = sbi-&gt;alloc_file-&gt;i_mapping;</div><div class='ctx'> 	page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS, NULL);</div><div class='hunk'>@@ -90,14 +90,14 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,</div><div class='ctx'> 		else</div><div class='ctx'> 			end = pptr + ((size + 31) &amp; (PAGE_CACHE_BITS - 1)) / 32;</div><div class='ctx'> 	}</div><div class='del'>-	hfs_dbg(BITMAP, "bitmap full\n");</div><div class='add'>+	hfs_dbg("bitmap full\n");</div><div class='ctx'> 	start = size;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='ctx'> 	start = offset + (curr - pptr) * 32 + i;</div><div class='ctx'> 	if (start &gt;= size) {</div><div class='del'>-		hfs_dbg(BITMAP, "bitmap full\n");</div><div class='add'>+		hfs_dbg("bitmap full\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* do any partial u32 at the start */</div><div class='hunk'>@@ -155,7 +155,7 @@ done:</div><div class='ctx'> 	*max = offset + (curr - pptr) * 32 + i - start;</div><div class='ctx'> 	sbi-&gt;free_blocks -= *max;</div><div class='ctx'> 	hfsplus_mark_mdb_dirty(sb);</div><div class='del'>-	hfs_dbg(BITMAP, "-&gt; %u,%u\n", start, *max);</div><div class='add'>+	hfs_dbg("start %u, max %u\n", start, *max);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;sbi-&gt;alloc_mutex);</div><div class='ctx'> 	return start;</div><div class='hunk'>@@ -174,7 +174,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BITMAP, "block_free: %u,%u\n", offset, count);</div><div class='add'>+	hfs_dbg("offset %u, count %u\n", offset, count);</div><div class='ctx'> 	/* are all of the bits in range? */</div><div class='ctx'> 	if ((offset + count) &gt; sbi-&gt;total_blocks)</div><div class='ctx'> 		return -ENOENT;</div><div class='head'>diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c<br/>index 87974d5e6791..191661af9677 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/bnode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/bnode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/bnode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/bnode.c</a></div><div class='hunk'>@@ -18,27 +18,42 @@</div><div class='ctx'> #include "hfsplus_fs.h"</div><div class='ctx'> #include "hfsplus_raw.h"</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Copy a specified range of bytes from the raw data of a node */</div><div class='del'>-void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='add'>+void hfs_bnode_read(struct hfs_bnode *node, void *buf, u32 off, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page **pagep;</div><div class='del'>-	int l;</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len == 0) {</div><div class='add'>+		pr_err("requested zero length: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='ctx'> </div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	pagep = node-&gt;page + (off &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	off &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-	l = min_t(int, len, PAGE_SIZE - off);</div><div class='add'>+	l = min_t(u32, len, PAGE_SIZE - off);</div><div class='ctx'> 	memcpy_from_page(buf, *pagep, off, l);</div><div class='ctx'> </div><div class='ctx'> 	while ((len -= l) != 0) {</div><div class='ctx'> 		buf += l;</div><div class='del'>-		l = min_t(int, len, PAGE_SIZE);</div><div class='add'>+		l = min_t(u32, len, PAGE_SIZE);</div><div class='ctx'> 		memcpy_from_page(buf, *++pagep, 0, l);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)</div><div class='add'>+u16 hfs_bnode_read_u16(struct hfs_bnode *node, u32 off)</div><div class='ctx'> {</div><div class='ctx'> 	__be16 data;</div><div class='ctx'> 	/* TODO: optimize later... */</div><div class='hunk'>@@ -46,7 +61,7 @@ u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)</div><div class='ctx'> 	return be16_to_cpu(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off)</div><div class='add'>+u8 hfs_bnode_read_u8(struct hfs_bnode *node, u32 off)</div><div class='ctx'> {</div><div class='ctx'> 	u8 data;</div><div class='ctx'> 	/* TODO: optimize later... */</div><div class='hunk'>@@ -54,10 +69,10 @@ u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off)</div><div class='add'>+void hfs_bnode_read_key(struct hfs_bnode *node, void *key, u32 off)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfs_btree *tree;</div><div class='del'>-	int key_len;</div><div class='add'>+	u32 key_len;</div><div class='ctx'> </div><div class='ctx'> 	tree = node-&gt;tree;</div><div class='ctx'> 	if (node-&gt;type == HFS_NODE_LEAF ||</div><div class='hunk'>@@ -67,66 +82,104 @@ void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off)</div><div class='ctx'> 	else</div><div class='ctx'> 		key_len = tree-&gt;max_key_len + 2;</div><div class='ctx'> </div><div class='add'>+	if (key_len &gt; sizeof(hfsplus_btree_key) || key_len &lt; 1) {</div><div class='add'>+		memset(key, 0, sizeof(hfsplus_btree_key));</div><div class='add'>+		pr_err("hfsplus: Invalid key length: %u\n", key_len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hfs_bnode_read(node, key, off, key_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)</div><div class='add'>+void hfs_bnode_write(struct hfs_bnode *node, void *buf, u32 off, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page **pagep;</div><div class='del'>-	int l;</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len == 0) {</div><div class='add'>+		pr_err("requested zero length: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='ctx'> </div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	pagep = node-&gt;page + (off &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	off &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-	l = min_t(int, len, PAGE_SIZE - off);</div><div class='add'>+	l = min_t(u32, len, PAGE_SIZE - off);</div><div class='ctx'> 	memcpy_to_page(*pagep, off, buf, l);</div><div class='ctx'> 	set_page_dirty(*pagep);</div><div class='ctx'> </div><div class='ctx'> 	while ((len -= l) != 0) {</div><div class='ctx'> 		buf += l;</div><div class='del'>-		l = min_t(int, len, PAGE_SIZE);</div><div class='add'>+		l = min_t(u32, len, PAGE_SIZE);</div><div class='ctx'> 		memcpy_to_page(*++pagep, 0, buf, l);</div><div class='ctx'> 		set_page_dirty(*pagep);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_write_u16(struct hfs_bnode *node, int off, u16 data)</div><div class='add'>+void hfs_bnode_write_u16(struct hfs_bnode *node, u32 off, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	__be16 v = cpu_to_be16(data);</div><div class='ctx'> 	/* TODO: optimize later... */</div><div class='ctx'> 	hfs_bnode_write(node, &amp;v, off, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)</div><div class='add'>+void hfs_bnode_clear(struct hfs_bnode *node, u32 off, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page **pagep;</div><div class='del'>-	int l;</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (len == 0) {</div><div class='add'>+		pr_err("requested zero length: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='ctx'> </div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	pagep = node-&gt;page + (off &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	off &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-	l = min_t(int, len, PAGE_SIZE - off);</div><div class='add'>+	l = min_t(u32, len, PAGE_SIZE - off);</div><div class='ctx'> 	memzero_page(*pagep, off, l);</div><div class='ctx'> 	set_page_dirty(*pagep);</div><div class='ctx'> </div><div class='ctx'> 	while ((len -= l) != 0) {</div><div class='del'>-		l = min_t(int, len, PAGE_SIZE);</div><div class='add'>+		l = min_t(u32, len, PAGE_SIZE);</div><div class='ctx'> 		memzero_page(*++pagep, 0, l);</div><div class='ctx'> 		set_page_dirty(*pagep);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,</div><div class='del'>-		    struct hfs_bnode *src_node, int src, int len)</div><div class='add'>+void hfs_bnode_copy(struct hfs_bnode *dst_node, u32 dst,</div><div class='add'>+		    struct hfs_bnode *src_node, u32 src, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page **src_page, **dst_page;</div><div class='del'>-	int l;</div><div class='add'>+	u32 l;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len);</div><div class='add'>+	hfs_dbg("dst %u, src %u, len %u\n", dst, src, len);</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(src_node, src, len);</div><div class='add'>+	len = check_and_correct_requested_length(dst_node, dst, len);</div><div class='add'>+</div><div class='ctx'> 	src += src_node-&gt;page_offset;</div><div class='ctx'> 	dst += dst_node-&gt;page_offset;</div><div class='ctx'> 	src_page = src_node-&gt;page + (src &gt;&gt; PAGE_SHIFT);</div><div class='hunk'>@@ -135,12 +188,12 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,</div><div class='ctx'> 	dst &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (src == dst) {</div><div class='del'>-		l = min_t(int, len, PAGE_SIZE - src);</div><div class='add'>+		l = min_t(u32, len, PAGE_SIZE - src);</div><div class='ctx'> 		memcpy_page(*dst_page, src, *src_page, src, l);</div><div class='ctx'> 		set_page_dirty(*dst_page);</div><div class='ctx'> </div><div class='ctx'> 		while ((len -= l) != 0) {</div><div class='del'>-			l = min_t(int, len, PAGE_SIZE);</div><div class='add'>+			l = min_t(u32, len, PAGE_SIZE);</div><div class='ctx'> 			memcpy_page(*++dst_page, 0, *++src_page, 0, l);</div><div class='ctx'> 			set_page_dirty(*dst_page);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -172,15 +225,19 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)</div><div class='add'>+void hfs_bnode_move(struct hfs_bnode *node, u32 dst, u32 src, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct page **src_page, **dst_page;</div><div class='ctx'> 	void *src_ptr, *dst_ptr;</div><div class='del'>-	int l;</div><div class='add'>+	u32 l;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len);</div><div class='add'>+	hfs_dbg("dst %u, src %u, len %u\n", dst, src, len);</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	len = check_and_correct_requested_length(node, src, len);</div><div class='add'>+	len = check_and_correct_requested_length(node, dst, len);</div><div class='add'>+</div><div class='ctx'> 	src += node-&gt;page_offset;</div><div class='ctx'> 	dst += node-&gt;page_offset;</div><div class='ctx'> 	if (dst &gt; src) {</div><div class='hunk'>@@ -242,7 +299,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)</div><div class='ctx'> 		dst &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 		if (src == dst) {</div><div class='del'>-			l = min_t(int, len, PAGE_SIZE - src);</div><div class='add'>+			l = min_t(u32, len, PAGE_SIZE - src);</div><div class='ctx'> </div><div class='ctx'> 			dst_ptr = kmap_local_page(*dst_page) + src;</div><div class='ctx'> 			src_ptr = kmap_local_page(*src_page) + src;</div><div class='hunk'>@@ -252,7 +309,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)</div><div class='ctx'> 			kunmap_local(dst_ptr);</div><div class='ctx'> </div><div class='ctx'> 			while ((len -= l) != 0) {</div><div class='del'>-				l = min_t(int, len, PAGE_SIZE);</div><div class='add'>+				l = min_t(u32, len, PAGE_SIZE);</div><div class='ctx'> 				dst_ptr = kmap_local_page(*++dst_page);</div><div class='ctx'> 				src_ptr = kmap_local_page(*++src_page);</div><div class='ctx'> 				memmove(dst_ptr, src_ptr, l);</div><div class='hunk'>@@ -294,16 +351,16 @@ void hfs_bnode_dump(struct hfs_bnode *node)</div><div class='ctx'> 	__be32 cnid;</div><div class='ctx'> 	int i, off, key_off;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "bnode: %d\n", node-&gt;this);</div><div class='add'>+	hfs_dbg("node %d\n", node-&gt;this);</div><div class='ctx'> 	hfs_bnode_read(node, &amp;desc, 0, sizeof(desc));</div><div class='del'>-	hfs_dbg(BNODE_MOD, "%d, %d, %d, %d, %d\n",</div><div class='add'>+	hfs_dbg("next %d, prev %d, type %d, height %d, num_recs %d\n",</div><div class='ctx'> 		be32_to_cpu(desc.next), be32_to_cpu(desc.prev),</div><div class='ctx'> 		desc.type, desc.height, be16_to_cpu(desc.num_recs));</div><div class='ctx'> </div><div class='ctx'> 	off = node-&gt;tree-&gt;node_size - 2;</div><div class='ctx'> 	for (i = be16_to_cpu(desc.num_recs); i &gt;= 0; off -= 2, i--) {</div><div class='ctx'> 		key_off = hfs_bnode_read_u16(node, off);</div><div class='del'>-		hfs_dbg(BNODE_MOD, " %d", key_off);</div><div class='add'>+		hfs_dbg(" key_off %d", key_off);</div><div class='ctx'> 		if (i &amp;&amp; node-&gt;type == HFS_NODE_INDEX) {</div><div class='ctx'> 			int tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -312,17 +369,17 @@ void hfs_bnode_dump(struct hfs_bnode *node)</div><div class='ctx'> 				tmp = hfs_bnode_read_u16(node, key_off) + 2;</div><div class='ctx'> 			else</div><div class='ctx'> 				tmp = node-&gt;tree-&gt;max_key_len + 2;</div><div class='del'>-			hfs_dbg_cont(BNODE_MOD, " (%d", tmp);</div><div class='add'>+			hfs_dbg(" (%d", tmp);</div><div class='ctx'> 			hfs_bnode_read(node, &amp;cnid, key_off + tmp, 4);</div><div class='del'>-			hfs_dbg_cont(BNODE_MOD, ",%d)", be32_to_cpu(cnid));</div><div class='add'>+			hfs_dbg(", cnid %d)", be32_to_cpu(cnid));</div><div class='ctx'> 		} else if (i &amp;&amp; node-&gt;type == HFS_NODE_LEAF) {</div><div class='ctx'> 			int tmp;</div><div class='ctx'> </div><div class='ctx'> 			tmp = hfs_bnode_read_u16(node, key_off);</div><div class='del'>-			hfs_dbg_cont(BNODE_MOD, " (%d)", tmp);</div><div class='add'>+			hfs_dbg(" (%d)", tmp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	hfs_dbg_cont(BNODE_MOD, "\n");</div><div class='add'>+	hfs_dbg("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hfs_bnode_unlink(struct hfs_bnode *node)</div><div class='hunk'>@@ -358,7 +415,7 @@ void hfs_bnode_unlink(struct hfs_bnode *node)</div><div class='ctx'> </div><div class='ctx'> 	/* move down? */</div><div class='ctx'> 	if (!node-&gt;prev &amp;&amp; !node-&gt;next)</div><div class='del'>-		hfs_dbg(BNODE_MOD, "hfs_btree_del_level\n");</div><div class='add'>+		hfs_dbg("btree delete level\n");</div><div class='ctx'> 	if (!node-&gt;parent) {</div><div class='ctx'> 		tree-&gt;root = 0;</div><div class='ctx'> 		tree-&gt;depth = 0;</div><div class='hunk'>@@ -413,7 +470,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)</div><div class='ctx'> 	node-&gt;this = cnid;</div><div class='ctx'> 	set_bit(HFS_BNODE_NEW, &amp;node-&gt;flags);</div><div class='ctx'> 	atomic_set(&amp;node-&gt;refcnt, 1);</div><div class='del'>-	hfs_dbg(BNODE_REFS, "new_node(%d:%d): 1\n",</div><div class='add'>+	hfs_dbg("cnid %d, node %d, refcnt 1\n",</div><div class='ctx'> 		node-&gt;tree-&gt;cnid, node-&gt;this);</div><div class='ctx'> 	init_waitqueue_head(&amp;node-&gt;lock_wq);</div><div class='ctx'> 	spin_lock(&amp;tree-&gt;hash_lock);</div><div class='hunk'>@@ -424,6 +481,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)</div><div class='ctx'> 		tree-&gt;node_hash[hash] = node;</div><div class='ctx'> 		tree-&gt;node_hash_cnt++;</div><div class='ctx'> 	} else {</div><div class='add'>+		hfs_bnode_get(node2);</div><div class='ctx'> 		spin_unlock(&amp;tree-&gt;hash_lock);</div><div class='ctx'> 		kfree(node);</div><div class='ctx'> 		wait_event(node2-&gt;lock_wq,</div><div class='hunk'>@@ -453,7 +511,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfs_bnode **p;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_REFS, "remove_node(%d:%d): %d\n",</div><div class='add'>+	hfs_dbg("cnid %d, node %d, refcnt %d\n",</div><div class='ctx'> 		node-&gt;tree-&gt;cnid, node-&gt;this, atomic_read(&amp;node-&gt;refcnt));</div><div class='ctx'> 	for (p = &amp;node-&gt;tree-&gt;node_hash[hfs_bnode_hash(node-&gt;this)];</div><div class='ctx'> 	     *p &amp;&amp; *p != node; p = &amp;(*p)-&gt;next_hash)</div><div class='hunk'>@@ -599,7 +657,7 @@ void hfs_bnode_get(struct hfs_bnode *node)</div><div class='ctx'> {</div><div class='ctx'> 	if (node) {</div><div class='ctx'> 		atomic_inc(&amp;node-&gt;refcnt);</div><div class='del'>-		hfs_dbg(BNODE_REFS, "get_node(%d:%d): %d\n",</div><div class='add'>+		hfs_dbg("cnid %d, node %d, refcnt %d\n",</div><div class='ctx'> 			node-&gt;tree-&gt;cnid, node-&gt;this,</div><div class='ctx'> 			atomic_read(&amp;node-&gt;refcnt));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -612,7 +670,7 @@ void hfs_bnode_put(struct hfs_bnode *node)</div><div class='ctx'> 		struct hfs_btree *tree = node-&gt;tree;</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		hfs_dbg(BNODE_REFS, "put_node(%d:%d): %d\n",</div><div class='add'>+		hfs_dbg("cnid %d, node %d, refcnt %d\n",</div><div class='ctx'> 			node-&gt;tree-&gt;cnid, node-&gt;this,</div><div class='ctx'> 			atomic_read(&amp;node-&gt;refcnt));</div><div class='ctx'> 		BUG_ON(!atomic_read(&amp;node-&gt;refcnt));</div><div class='hunk'>@@ -647,6 +705,5 @@ bool hfs_bnode_need_zeroout(struct hfs_btree *tree)</div><div class='ctx'> 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);</div><div class='ctx'> 	const u32 volume_attr = be32_to_cpu(sbi-&gt;s_vhdr-&gt;attributes);</div><div class='ctx'> </div><div class='del'>-	return tree-&gt;cnid == HFSPLUS_CAT_CNID &amp;&amp;</div><div class='del'>-		volume_attr &amp; HFSPLUS_VOL_UNUSED_NODE_FIX;</div><div class='add'>+	return volume_attr &amp; HFSPLUS_VOL_UNUSED_NODE_FIX;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c<br/>index 1918544a7871..6796c1a80e99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/brec.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/brec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/brec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/brec.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len)</div><div class='add'>+int hfs_brec_insert(struct hfs_find_data *fd, void *entry, u32 entry_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfs_btree *tree;</div><div class='ctx'> 	struct hfs_bnode *node, *new_node;</div><div class='hunk'>@@ -92,7 +92,7 @@ again:</div><div class='ctx'> 	end_rec_off = tree-&gt;node_size - (node-&gt;num_recs + 1) * 2;</div><div class='ctx'> 	end_off = hfs_bnode_read_u16(node, end_rec_off);</div><div class='ctx'> 	end_rec_off -= 2;</div><div class='del'>-	hfs_dbg(BNODE_MOD, "insert_rec: %d, %d, %d, %d\n",</div><div class='add'>+	hfs_dbg("rec %d, size %d, end_off %d, end_rec_off %d\n",</div><div class='ctx'> 		rec, size, end_off, end_rec_off);</div><div class='ctx'> 	if (size &gt; end_rec_off - end_off) {</div><div class='ctx'> 		if (new_node)</div><div class='hunk'>@@ -193,7 +193,7 @@ again:</div><div class='ctx'> 		mark_inode_dirty(tree-&gt;inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	hfs_bnode_dump(node);</div><div class='del'>-	hfs_dbg(BNODE_MOD, "remove_rec: %d, %d\n",</div><div class='add'>+	hfs_dbg("rec %d, len %d\n",</div><div class='ctx'> 		fd-&gt;record, fd-&gt;keylength + fd-&gt;entrylength);</div><div class='ctx'> 	if (!--node-&gt;num_recs) {</div><div class='ctx'> 		hfs_bnode_unlink(node);</div><div class='hunk'>@@ -246,7 +246,7 @@ static struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)</div><div class='ctx'> 	if (IS_ERR(new_node))</div><div class='ctx'> 		return new_node;</div><div class='ctx'> 	hfs_bnode_get(node);</div><div class='del'>-	hfs_dbg(BNODE_MOD, "split_nodes: %d - %d - %d\n",</div><div class='add'>+	hfs_dbg("this %d - new %d - next %d\n",</div><div class='ctx'> 		node-&gt;this, new_node-&gt;this, node-&gt;next);</div><div class='ctx'> 	new_node-&gt;next = node-&gt;next;</div><div class='ctx'> 	new_node-&gt;prev = node-&gt;this;</div><div class='hunk'>@@ -383,7 +383,7 @@ again:</div><div class='ctx'> 		newkeylen = hfs_bnode_read_u16(node, 14) + 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		fd-&gt;keylength = newkeylen = tree-&gt;max_key_len + 2;</div><div class='del'>-	hfs_dbg(BNODE_MOD, "update_rec: %d, %d, %d\n",</div><div class='add'>+	hfs_dbg("rec %d, keylength %d, newkeylen %d\n",</div><div class='ctx'> 		rec, fd-&gt;keylength, newkeylen);</div><div class='ctx'> </div><div class='ctx'> 	rec_off = tree-&gt;node_size - (rec + 2) * 2;</div><div class='hunk'>@@ -395,7 +395,7 @@ again:</div><div class='ctx'> 		end_off = hfs_bnode_read_u16(parent, end_rec_off);</div><div class='ctx'> 		if (end_rec_off - end_off &lt; diff) {</div><div class='ctx'> </div><div class='del'>-			hfs_dbg(BNODE_MOD, "splitting index node\n");</div><div class='add'>+			hfs_dbg("splitting index node\n");</div><div class='ctx'> 			fd-&gt;bnode = parent;</div><div class='ctx'> 			new_node = hfs_bnode_split(fd);</div><div class='ctx'> 			if (IS_ERR(new_node))</div><div class='head'>diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c<br/>index 9e1732a2b92a..229f25dc7c49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/btree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/btree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/btree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/btree.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Make sure @tree has enough space for the @rsvd_nodes */</div><div class='del'>-int hfs_bmap_reserve(struct hfs_btree *tree, int rsvd_nodes)</div><div class='add'>+int hfs_bmap_reserve(struct hfs_btree *tree, u32 rsvd_nodes)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = tree-&gt;inode;</div><div class='ctx'> 	struct hfsplus_inode_info *hip = HFSPLUS_I(inode);</div><div class='hunk'>@@ -393,6 +393,12 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)</div><div class='ctx'> 	len = hfs_brec_lenoff(node, 2, &amp;off16);</div><div class='ctx'> 	off = off16;</div><div class='ctx'> </div><div class='add'>+	if (!is_bnode_offset_valid(node, off)) {</div><div class='add'>+		hfs_bnode_put(node);</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='add'>+	len = check_and_correct_requested_length(node, off, len);</div><div class='add'>+</div><div class='ctx'> 	off += node-&gt;page_offset;</div><div class='ctx'> 	pagep = node-&gt;page + (off &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	data = kmap_local_page(*pagep);</div><div class='hunk'>@@ -428,7 +434,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)</div><div class='ctx'> 		kunmap_local(data);</div><div class='ctx'> 		nidx = node-&gt;next;</div><div class='ctx'> 		if (!nidx) {</div><div class='del'>-			hfs_dbg(BNODE_MOD, "create new bmap node\n");</div><div class='add'>+			hfs_dbg("create new bmap node\n");</div><div class='ctx'> 			next_node = hfs_bmap_new_bmap(node, idx);</div><div class='ctx'> 		} else</div><div class='ctx'> 			next_node = hfs_bnode_find(tree, nidx);</div><div class='hunk'>@@ -454,7 +460,7 @@ void hfs_bmap_free(struct hfs_bnode *node)</div><div class='ctx'> 	u32 nidx;</div><div class='ctx'> 	u8 *data, byte, m;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(BNODE_MOD, "btree_free_node: %u\n", node-&gt;this);</div><div class='add'>+	hfs_dbg("node %u\n", node-&gt;this);</div><div class='ctx'> 	BUG_ON(!node-&gt;this);</div><div class='ctx'> 	tree = node-&gt;tree;</div><div class='ctx'> 	nidx = node-&gt;this;</div><div class='head'>diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c<br/>index 1995bafee839..02c1eee4a4b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/catalog.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/catalog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/catalog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/catalog.c</a></div><div class='hunk'>@@ -259,7 +259,7 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,</div><div class='ctx'> 	int entry_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",</div><div class='add'>+	hfs_dbg("name %s, cnid %u, i_nlink %d\n",</div><div class='ctx'> 		str-&gt;name, cnid, inode-&gt;i_nlink);</div><div class='ctx'> 	err = hfs_find_init(HFSPLUS_SB(sb)-&gt;cat_tree, &amp;fd);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -336,7 +336,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, const struct qstr *str)</div><div class='ctx'> 	int err, off;</div><div class='ctx'> 	u16 type;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str-&gt;name : NULL, cnid);</div><div class='add'>+	hfs_dbg("name %s, cnid %u\n", str ? str-&gt;name : NULL, cnid);</div><div class='ctx'> 	err = hfs_find_init(HFSPLUS_SB(sb)-&gt;cat_tree, &amp;fd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -441,7 +441,7 @@ int hfsplus_rename_cat(u32 cnid,</div><div class='ctx'> 	int entry_size, type;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",</div><div class='add'>+	hfs_dbg("cnid %u - ino %lu, name %s - ino %lu, name %s\n",</div><div class='ctx'> 		cnid, src_dir-&gt;i_ino, src_name-&gt;name,</div><div class='ctx'> 		dst_dir-&gt;i_ino, dst_name-&gt;name);</div><div class='ctx'> 	err = hfs_find_init(HFSPLUS_SB(sb)-&gt;cat_tree, &amp;src_fd);</div><div class='head'>diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c<br/>index f5c4b3e31a1c..cadf0b5f9342 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/dir.c</a></div><div class='hunk'>@@ -204,7 +204,7 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			fd.entrylength);</div><div class='ctx'> 		type = be16_to_cpu(entry.type);</div><div class='ctx'> 		len = NLS_MAX_CHARSET_SIZE * HFSPLUS_MAX_STRLEN;</div><div class='del'>-		err = hfsplus_uni2asc(sb, &amp;fd.key-&gt;cat.name, strbuf, &amp;len);</div><div class='add'>+		err = hfsplus_uni2asc_str(sb, &amp;fd.key-&gt;cat.name, strbuf, &amp;len);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (type == HFSPLUS_FOLDER) {</div><div class='hunk'>@@ -523,10 +523,10 @@ static int hfsplus_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	return hfsplus_mknod(&amp;nop_mnt_idmap, dir, dentry, mode, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hfsplus_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			 struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *hfsplus_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				    struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	return hfsplus_mknod(&amp;nop_mnt_idmap, dir, dentry, mode | S_IFDIR, 0);</div><div class='add'>+	return ERR_PTR(hfsplus_mknod(&amp;nop_mnt_idmap, dir, dentry, mode | S_IFDIR, 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hfsplus_rename(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -552,8 +552,13 @@ static int hfsplus_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	res = hfsplus_rename_cat((u32)(unsigned long)old_dentry-&gt;d_fsdata,</div><div class='ctx'> 				 old_dir, &amp;old_dentry-&gt;d_name,</div><div class='ctx'> 				 new_dir, &amp;new_dentry-&gt;d_name);</div><div class='del'>-	if (!res)</div><div class='add'>+	if (!res) {</div><div class='ctx'> 		new_dentry-&gt;d_fsdata = old_dentry-&gt;d_fsdata;</div><div class='add'>+</div><div class='add'>+		res = hfsplus_cat_write_inode(old_dir);</div><div class='add'>+		if (!res)</div><div class='add'>+			res = hfsplus_cat_write_inode(new_dir);</div><div class='add'>+	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c<br/>index 3c572e44f2ad..8e886514d27f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/extents.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/extents.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/extents.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/extents.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	mutex_unlock(&amp;hip-&gt;extents_lock);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	hfs_dbg(EXTENT, "get_block(%lu): %llu - %u\n",</div><div class='add'>+	hfs_dbg("ino %lu, iblock %llu - dblock %u\n",</div><div class='ctx'> 		inode-&gt;i_ino, (long long)iblock, dblock);</div><div class='ctx'> </div><div class='ctx'> 	mask = (1 &lt;&lt; sbi-&gt;fs_shift) - 1;</div><div class='hunk'>@@ -298,12 +298,12 @@ static void hfsplus_dump_extent(struct hfsplus_extent *extent)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(EXTENT, "   ");</div><div class='add'>+	hfs_dbg("extent   ");</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		hfs_dbg_cont(EXTENT, " %u:%u",</div><div class='del'>-			     be32_to_cpu(extent[i].start_block),</div><div class='del'>-			     be32_to_cpu(extent[i].block_count));</div><div class='del'>-	hfs_dbg_cont(EXTENT, "\n");</div><div class='add'>+		hfs_dbg(" start_block %u, block_count %u",</div><div class='add'>+			be32_to_cpu(extent[i].start_block),</div><div class='add'>+			be32_to_cpu(extent[i].block_count));</div><div class='add'>+	hfs_dbg("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hfsplus_add_extent(struct hfsplus_extent *extent, u32 offset,</div><div class='hunk'>@@ -342,9 +342,6 @@ static int hfsplus_free_extents(struct super_block *sb,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	/* Mapping the allocation file may lock the extent tree */</div><div class='del'>-	WARN_ON(mutex_is_locked(&amp;HFSPLUS_SB(sb)-&gt;ext_tree-&gt;tree_lock));</div><div class='del'>-</div><div class='ctx'> 	hfsplus_dump_extent(extent);</div><div class='ctx'> 	for (i = 0; i &lt; 8; extent++, i++) {</div><div class='ctx'> 		count = be32_to_cpu(extent-&gt;block_count);</div><div class='hunk'>@@ -362,8 +359,7 @@ found:</div><div class='ctx'> 		if (count &lt;= block_nr) {</div><div class='ctx'> 			err = hfsplus_block_free(sb, start, count);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				pr_err("can't free extent\n");</div><div class='del'>-				hfs_dbg(EXTENT, " start: %u count: %u\n",</div><div class='add'>+				pr_err("can't free extent: start %u, count %u\n",</div><div class='ctx'> 					start, count);</div><div class='ctx'> 			}</div><div class='ctx'> 			extent-&gt;block_count = 0;</div><div class='hunk'>@@ -373,8 +369,7 @@ found:</div><div class='ctx'> 			count -= block_nr;</div><div class='ctx'> 			err = hfsplus_block_free(sb, start + count, block_nr);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				pr_err("can't free extent\n");</div><div class='del'>-				hfs_dbg(EXTENT, " start: %u count: %u\n",</div><div class='add'>+				pr_err("can't free extent: start %u, count %u\n",</div><div class='ctx'> 					start, count);</div><div class='ctx'> 			}</div><div class='ctx'> 			extent-&gt;block_count = cpu_to_be32(count);</div><div class='hunk'>@@ -430,7 +425,8 @@ int hfsplus_free_fork(struct super_block *sb, u32 cnid,</div><div class='ctx'> 		hfsplus_free_extents(sb, ext_entry, total_blocks - start,</div><div class='ctx'> 				     total_blocks);</div><div class='ctx'> 		total_blocks = start;</div><div class='del'>-		mutex_lock(&amp;fd.tree-&gt;tree_lock);</div><div class='add'>+		mutex_lock_nested(&amp;fd.tree-&gt;tree_lock,</div><div class='add'>+			hfsplus_btree_lock_class(fd.tree));</div><div class='ctx'> 	} while (total_blocks &gt; blocks);</div><div class='ctx'> 	hfs_find_exit(&amp;fd);</div><div class='ctx'> </div><div class='hunk'>@@ -480,11 +476,12 @@ int hfsplus_file_extend(struct inode *inode, bool zeroout)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(EXTENT, "extend %lu: %u,%u\n", inode-&gt;i_ino, start, len);</div><div class='add'>+	hfs_dbg("ino %lu, start %u, len %u\n", inode-&gt;i_ino, start, len);</div><div class='ctx'> </div><div class='ctx'> 	if (hip-&gt;alloc_blocks &lt;= hip-&gt;first_blocks) {</div><div class='ctx'> 		if (!hip-&gt;first_blocks) {</div><div class='del'>-			hfs_dbg(EXTENT, "first extents\n");</div><div class='add'>+			hfs_dbg("first_extent: start %u, len %u\n",</div><div class='add'>+				start, len);</div><div class='ctx'> 			/* no extents yet */</div><div class='ctx'> 			hip-&gt;first_extents[0].start_block = cpu_to_be32(start);</div><div class='ctx'> 			hip-&gt;first_extents[0].block_count = cpu_to_be32(len);</div><div class='hunk'>@@ -523,7 +520,7 @@ out:</div><div class='ctx'> 	return res;</div><div class='ctx'> </div><div class='ctx'> insert_extent:</div><div class='del'>-	hfs_dbg(EXTENT, "insert new extent\n");</div><div class='add'>+	hfs_dbg("insert new extent\n");</div><div class='ctx'> 	res = hfsplus_ext_write_extent_locked(inode);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -548,21 +545,21 @@ void hfsplus_file_truncate(struct inode *inode)</div><div class='ctx'> 	u32 alloc_cnt, blk_cnt, start;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(INODE, "truncate: %lu, %llu -&gt; %llu\n",</div><div class='add'>+	hfs_dbg("ino %lu, phys_size %llu -&gt; i_size %llu\n",</div><div class='ctx'> 		inode-&gt;i_ino, (long long)hip-&gt;phys_size, inode-&gt;i_size);</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_size &gt; hip-&gt;phys_size) {</div><div class='ctx'> 		struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		void *fsdata = NULL;</div><div class='ctx'> 		loff_t size = inode-&gt;i_size;</div><div class='ctx'> </div><div class='ctx'> 		res = hfsplus_write_begin(NULL, mapping, size, 0,</div><div class='del'>-					  &amp;page, &amp;fsdata);</div><div class='add'>+					  &amp;folio, &amp;fsdata);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return;</div><div class='ctx'> 		res = generic_write_end(NULL, mapping, size, 0, 0,</div><div class='del'>-					page, fsdata);</div><div class='add'>+					folio, fsdata);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			return;</div><div class='ctx'> 		mark_inode_dirty(inode);</div><div class='hunk'>@@ -592,7 +589,8 @@ void hfsplus_file_truncate(struct inode *inode)</div><div class='ctx'> 					     alloc_cnt, alloc_cnt - blk_cnt);</div><div class='ctx'> 			hfsplus_dump_extent(hip-&gt;first_extents);</div><div class='ctx'> 			hip-&gt;first_blocks = blk_cnt;</div><div class='del'>-			mutex_lock(&amp;fd.tree-&gt;tree_lock);</div><div class='add'>+			mutex_lock_nested(&amp;fd.tree-&gt;tree_lock,</div><div class='add'>+				hfsplus_btree_lock_class(fd.tree));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		res = __hfsplus_ext_cache_extent(&amp;fd, inode, alloc_cnt);</div><div class='hunk'>@@ -606,7 +604,8 @@ void hfsplus_file_truncate(struct inode *inode)</div><div class='ctx'> 		hfsplus_free_extents(sb, hip-&gt;cached_extents,</div><div class='ctx'> 				     alloc_cnt - start, alloc_cnt - blk_cnt);</div><div class='ctx'> 		hfsplus_dump_extent(hip-&gt;cached_extents);</div><div class='del'>-		mutex_lock(&amp;fd.tree-&gt;tree_lock);</div><div class='add'>+		mutex_lock_nested(&amp;fd.tree-&gt;tree_lock,</div><div class='add'>+				hfsplus_btree_lock_class(fd.tree));</div><div class='ctx'> 		if (blk_cnt &gt; start) {</div><div class='ctx'> 			hip-&gt;extent_state |= HFSPLUS_EXT_DIRTY;</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h<br/>index 7ededcb720c1..45fe3a12ecba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/hfsplus_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/hfsplus_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/hfsplus_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/hfsplus_fs.h</a></div><div class='hunk'>@@ -11,46 +11,13 @@</div><div class='ctx'> #ifndef _LINUX_HFSPLUS_FS_H</div><div class='ctx'> #define _LINUX_HFSPLUS_FS_H</div><div class='ctx'> </div><div class='del'>-#ifdef pr_fmt</div><div class='del'>-#undef pr_fmt</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include "hfsplus_raw.h"</div><div class='ctx'> </div><div class='del'>-#define DBG_BNODE_REFS	0x00000001</div><div class='del'>-#define DBG_BNODE_MOD	0x00000002</div><div class='del'>-#define DBG_CAT_MOD	0x00000004</div><div class='del'>-#define DBG_INODE	0x00000008</div><div class='del'>-#define DBG_SUPER	0x00000010</div><div class='del'>-#define DBG_EXTENT	0x00000020</div><div class='del'>-#define DBG_BITMAP	0x00000040</div><div class='del'>-#define DBG_ATTR_MOD	0x00000080</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#define DBG_MASK	(DBG_EXTENT|DBG_INODE|DBG_BNODE_MOD)</div><div class='del'>-#define DBG_MASK	(DBG_BNODE_MOD|DBG_CAT_MOD|DBG_INODE)</div><div class='del'>-#define DBG_MASK	(DBG_CAT_MOD|DBG_BNODE_REFS|DBG_INODE|DBG_EXTENT)</div><div class='del'>-#endif</div><div class='del'>-#define DBG_MASK	(0)</div><div class='del'>-</div><div class='del'>-#define hfs_dbg(flg, fmt, ...)					\</div><div class='del'>-do {								\</div><div class='del'>-	if (DBG_##flg &amp; DBG_MASK)				\</div><div class='del'>-		printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define hfs_dbg_cont(flg, fmt, ...)				\</div><div class='del'>-do {								\</div><div class='del'>-	if (DBG_##flg &amp; DBG_MASK)				\</div><div class='del'>-		pr_cont(fmt, ##__VA_ARGS__);			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> /* Runtime config options */</div><div class='ctx'> #define HFSPLUS_DEF_CR_TYPE    0x3F3F3F3F  /* '????' */</div><div class='ctx'> </div><div class='hunk'>@@ -156,6 +123,7 @@ struct hfsplus_sb_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Runtime variables */</div><div class='ctx'> 	u32 blockoffset;</div><div class='add'>+	u32 min_io_size;</div><div class='ctx'> 	sector_t part_start;</div><div class='ctx'> 	sector_t sect_count;</div><div class='ctx'> 	int fs_shift;</div><div class='hunk'>@@ -190,6 +158,7 @@ struct hfsplus_sb_info {</div><div class='ctx'> 	int work_queued;               /* non-zero delayed work is queued */</div><div class='ctx'> 	struct delayed_work sync_work; /* FS sync delayed work */</div><div class='ctx'> 	spinlock_t work_lock;          /* protects sync_work and work_queued */</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HFSPLUS_SB_WRITEBACKUP	0</div><div class='hunk'>@@ -306,7 +275,7 @@ struct hfsplus_readdir_data {</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned short hfsplus_min_io_size(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	return max_t(unsigned short, bdev_logical_block_size(sb-&gt;s_bdev),</div><div class='add'>+	return max_t(unsigned short, HFSPLUS_SB(sb)-&gt;min_io_size,</div><div class='ctx'> 		     HFSPLUS_SECTOR_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -387,21 +356,21 @@ u32 hfsplus_calc_btree_clump_size(u32 block_size, u32 node_size, u64 sectors,</div><div class='ctx'> struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id);</div><div class='ctx'> void hfs_btree_close(struct hfs_btree *tree);</div><div class='ctx'> int hfs_btree_write(struct hfs_btree *tree);</div><div class='del'>-int hfs_bmap_reserve(struct hfs_btree *tree, int rsvd_nodes);</div><div class='add'>+int hfs_bmap_reserve(struct hfs_btree *tree, u32 rsvd_nodes);</div><div class='ctx'> struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree);</div><div class='ctx'> void hfs_bmap_free(struct hfs_bnode *node);</div><div class='ctx'> </div><div class='ctx'> /* bnode.c */</div><div class='del'>-void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len);</div><div class='del'>-u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off);</div><div class='del'>-u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off);</div><div class='del'>-void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off);</div><div class='del'>-void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len);</div><div class='del'>-void hfs_bnode_write_u16(struct hfs_bnode *node, int off, u16 data);</div><div class='del'>-void hfs_bnode_clear(struct hfs_bnode *node, int off, int len);</div><div class='del'>-void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,</div><div class='del'>-		    struct hfs_bnode *src_node, int src, int len);</div><div class='del'>-void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len);</div><div class='add'>+void hfs_bnode_read(struct hfs_bnode *node, void *buf, u32 off, u32 len);</div><div class='add'>+u16 hfs_bnode_read_u16(struct hfs_bnode *node, u32 off);</div><div class='add'>+u8 hfs_bnode_read_u8(struct hfs_bnode *node, u32 off);</div><div class='add'>+void hfs_bnode_read_key(struct hfs_bnode *node, void *key, u32 off);</div><div class='add'>+void hfs_bnode_write(struct hfs_bnode *node, void *buf, u32 off, u32 len);</div><div class='add'>+void hfs_bnode_write_u16(struct hfs_bnode *node, u32 off, u16 data);</div><div class='add'>+void hfs_bnode_clear(struct hfs_bnode *node, u32 off, u32 len);</div><div class='add'>+void hfs_bnode_copy(struct hfs_bnode *dst_node, u32 dst,</div><div class='add'>+		    struct hfs_bnode *src_node, u32 src, u32 len);</div><div class='add'>+void hfs_bnode_move(struct hfs_bnode *node, u32 dst, u32 src, u32 len);</div><div class='ctx'> void hfs_bnode_dump(struct hfs_bnode *node);</div><div class='ctx'> void hfs_bnode_unlink(struct hfs_bnode *node);</div><div class='ctx'> struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid);</div><div class='hunk'>@@ -416,7 +385,7 @@ bool hfs_bnode_need_zeroout(struct hfs_btree *tree);</div><div class='ctx'> /* brec.c */</div><div class='ctx'> u16 hfs_brec_lenoff(struct hfs_bnode *node, u16 rec, u16 *off);</div><div class='ctx'> u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec);</div><div class='del'>-int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len);</div><div class='add'>+int hfs_brec_insert(struct hfs_find_data *fd, void *entry, u32 entry_len);</div><div class='ctx'> int hfs_brec_remove(struct hfs_find_data *fd);</div><div class='ctx'> </div><div class='ctx'> /* bfind.c */</div><div class='hunk'>@@ -429,7 +398,7 @@ int hfs_find_rec_by_key(struct hfs_bnode *bnode, struct hfs_find_data *fd,</div><div class='ctx'> int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd,</div><div class='ctx'> 		    search_strategy_t rec_found);</div><div class='ctx'> int hfs_brec_find(struct hfs_find_data *fd, search_strategy_t do_key_compare);</div><div class='del'>-int hfs_brec_read(struct hfs_find_data *fd, void *rec, int rec_len);</div><div class='add'>+int hfs_brec_read(struct hfs_find_data *fd, void *rec, u32 rec_len);</div><div class='ctx'> int hfs_brec_goto(struct hfs_find_data *fd, int cnt);</div><div class='ctx'> </div><div class='ctx'> /* catalog.c */</div><div class='hunk'>@@ -470,8 +439,10 @@ extern const struct address_space_operations hfsplus_aops;</div><div class='ctx'> extern const struct address_space_operations hfsplus_btree_aops;</div><div class='ctx'> extern const struct dentry_operations hfsplus_dentry_operations;</div><div class='ctx'> </div><div class='del'>-int hfsplus_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata);</div><div class='add'>+int hfsplus_write_begin(const struct kiocb *iocb,</div><div class='add'>+			struct address_space *mapping,</div><div class='add'>+			loff_t pos, unsigned len, struct folio **foliop,</div><div class='add'>+			void **fsdata);</div><div class='ctx'> struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir,</div><div class='ctx'> 				umode_t mode);</div><div class='ctx'> void hfsplus_delete_inode(struct inode *inode);</div><div class='hunk'>@@ -486,17 +457,16 @@ int hfsplus_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		    unsigned int query_flags);</div><div class='ctx'> int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> 		       int datasync);</div><div class='del'>-int hfsplus_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int hfsplus_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int hfsplus_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-			 struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+			 struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> </div><div class='ctx'> /* ioctl.c */</div><div class='ctx'> long hfsplus_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);</div><div class='ctx'> </div><div class='ctx'> /* options.c */</div><div class='ctx'> void hfsplus_fill_defaults(struct hfsplus_sb_info *opts);</div><div class='del'>-int hfsplus_parse_options_remount(char *input, int *force);</div><div class='del'>-int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi);</div><div class='add'>+int hfsplus_parse_param(struct fs_context *fc, struct fs_parameter *param);</div><div class='ctx'> int hfsplus_show_options(struct seq_file *seq, struct dentry *root);</div><div class='ctx'> </div><div class='ctx'> /* part_tbl.c */</div><div class='hunk'>@@ -506,6 +476,8 @@ int hfs_part_find(struct super_block *sb, sector_t *part_start,</div><div class='ctx'> /* super.c */</div><div class='ctx'> struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino);</div><div class='ctx'> void hfsplus_mark_mdb_dirty(struct super_block *sb);</div><div class='add'>+void hfsplus_prepare_volume_header_for_commit(struct hfsplus_vh *vhdr);</div><div class='add'>+int hfsplus_commit_superblock(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> /* tables.c */</div><div class='ctx'> extern u16 hfsplus_case_fold_table[];</div><div class='hunk'>@@ -517,8 +489,12 @@ int hfsplus_strcasecmp(const struct hfsplus_unistr *s1,</div><div class='ctx'> 		       const struct hfsplus_unistr *s2);</div><div class='ctx'> int hfsplus_strcmp(const struct hfsplus_unistr *s1,</div><div class='ctx'> 		   const struct hfsplus_unistr *s2);</div><div class='del'>-int hfsplus_uni2asc(struct super_block *sb, const struct hfsplus_unistr *ustr,</div><div class='del'>-		    char *astr, int *len_p);</div><div class='add'>+int hfsplus_uni2asc_str(struct super_block *sb,</div><div class='add'>+			const struct hfsplus_unistr *ustr, char *astr,</div><div class='add'>+			int *len_p);</div><div class='add'>+int hfsplus_uni2asc_xattr_str(struct super_block *sb,</div><div class='add'>+			      const struct hfsplus_attr_unistr *ustr,</div><div class='add'>+			      char *astr, int *len_p);</div><div class='ctx'> int hfsplus_asc2uni(struct super_block *sb, struct hfsplus_unistr *ustr,</div><div class='ctx'> 		    int max_unistr_len, const char *astr, int len);</div><div class='ctx'> int hfsplus_hash_dentry(const struct dentry *dentry, struct qstr *str);</div><div class='hunk'>@@ -552,6 +528,69 @@ static inline __be32 __hfsp_ut2mt(time64_t ut)</div><div class='ctx'> 	return cpu_to_be32(lower_32_bits(ut) + HFSPLUS_UTC_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline enum hfsplus_btree_mutex_classes</div><div class='add'>+hfsplus_btree_lock_class(struct hfs_btree *tree)</div><div class='add'>+{</div><div class='add'>+	enum hfsplus_btree_mutex_classes class;</div><div class='add'>+</div><div class='add'>+	switch (tree-&gt;cnid) {</div><div class='add'>+	case HFSPLUS_CAT_CNID:</div><div class='add'>+		class = CATALOG_BTREE_MUTEX;</div><div class='add'>+		break;</div><div class='add'>+	case HFSPLUS_EXT_CNID:</div><div class='add'>+		class = EXTENTS_BTREE_MUTEX;</div><div class='add'>+		break;</div><div class='add'>+	case HFSPLUS_ATTR_CNID:</div><div class='add'>+		class = ATTR_BTREE_MUTEX;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	return class;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool is_bnode_offset_valid(struct hfs_bnode *node, u32 off)</div><div class='add'>+{</div><div class='add'>+	bool is_valid = off &lt; node-&gt;tree-&gt;node_size;</div><div class='add'>+</div><div class='add'>+	if (!is_valid) {</div><div class='add'>+		pr_err("requested invalid offset: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return is_valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+u32 check_and_correct_requested_length(struct hfs_bnode *node, u32 off, u32 len)</div><div class='add'>+{</div><div class='add'>+	unsigned int node_size;</div><div class='add'>+</div><div class='add'>+	if (!is_bnode_offset_valid(node, off))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	node_size = node-&gt;tree-&gt;node_size;</div><div class='add'>+</div><div class='add'>+	if ((off + len) &gt; node_size) {</div><div class='add'>+		u32 new_len = node_size - off;</div><div class='add'>+</div><div class='add'>+		pr_err("requested length has been corrected: "</div><div class='add'>+		       "NODE: id %u, type %#x, height %u, "</div><div class='add'>+		       "node_size %u, offset %u, "</div><div class='add'>+		       "requested_len %u, corrected_len %u\n",</div><div class='add'>+		       node-&gt;this, node-&gt;type, node-&gt;height,</div><div class='add'>+		       node-&gt;tree-&gt;node_size, off, len, new_len);</div><div class='add'>+</div><div class='add'>+		return new_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* compatibility */</div><div class='ctx'> #define hfsp_mt2ut(t)		(struct timespec64){ .tv_sec = __hfsp_mt2ut(t) }</div><div class='ctx'> #define hfsp_ut2mt(t)		__hfsp_ut2mt((t).tv_sec)</div><div class='head'>diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h<br/>index 68b4240c6191..83b5dbde924b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/hfsplus_raw.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/hfsplus_raw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/hfsplus_raw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/hfsplus_raw.h</a></div><div class='hunk'>@@ -15,398 +15,6 @@</div><div class='ctx'> #define _LINUX_HFSPLUS_RAW_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* Some constants */</div><div class='del'>-#define HFSPLUS_SECTOR_SIZE        512</div><div class='del'>-#define HFSPLUS_SECTOR_SHIFT         9</div><div class='del'>-#define HFSPLUS_VOLHEAD_SECTOR       2</div><div class='del'>-#define HFSPLUS_VOLHEAD_SIG     0x482b</div><div class='del'>-#define HFSPLUS_VOLHEAD_SIGX    0x4858</div><div class='del'>-#define HFSPLUS_SUPER_MAGIC     0x482b</div><div class='del'>-#define HFSPLUS_MIN_VERSION          4</div><div class='del'>-#define HFSPLUS_CURRENT_VERSION      5</div><div class='del'>-</div><div class='del'>-#define HFSP_WRAP_MAGIC         0x4244</div><div class='del'>-#define HFSP_WRAP_ATTRIB_SLOCK  0x8000</div><div class='del'>-#define HFSP_WRAP_ATTRIB_SPARED 0x0200</div><div class='del'>-</div><div class='del'>-#define HFSP_WRAPOFF_SIG          0x00</div><div class='del'>-#define HFSP_WRAPOFF_ATTRIB       0x0A</div><div class='del'>-#define HFSP_WRAPOFF_ABLKSIZE     0x14</div><div class='del'>-#define HFSP_WRAPOFF_ABLKSTART    0x1C</div><div class='del'>-#define HFSP_WRAPOFF_EMBEDSIG     0x7C</div><div class='del'>-#define HFSP_WRAPOFF_EMBEDEXT     0x7E</div><div class='del'>-</div><div class='del'>-#define HFSP_HIDDENDIR_NAME \</div><div class='del'>-	"\xe2\x90\x80\xe2\x90\x80\xe2\x90\x80\xe2\x90\x80HFS+ Private Data"</div><div class='del'>-</div><div class='del'>-#define HFSP_HARDLINK_TYPE	0x686c6e6b	/* 'hlnk' */</div><div class='del'>-#define HFSP_HFSPLUS_CREATOR	0x6866732b	/* 'hfs+' */</div><div class='del'>-</div><div class='del'>-#define HFSP_SYMLINK_TYPE	0x736c6e6b	/* 'slnk' */</div><div class='del'>-#define HFSP_SYMLINK_CREATOR	0x72686170	/* 'rhap' */</div><div class='del'>-</div><div class='del'>-#define HFSP_MOUNT_VERSION	0x482b4c78	/* 'H+Lx' */</div><div class='del'>-</div><div class='del'>-/* Structures used on disk */</div><div class='del'>-</div><div class='del'>-typedef __be32 hfsplus_cnid;</div><div class='del'>-typedef __be16 hfsplus_unichr;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_MAX_STRLEN 255</div><div class='del'>-#define HFSPLUS_ATTR_MAX_STRLEN 127</div><div class='del'>-</div><div class='del'>-/* A "string" as used in filenames, etc. */</div><div class='del'>-struct hfsplus_unistr {</div><div class='del'>-	__be16 length;</div><div class='del'>-	hfsplus_unichr unicode[HFSPLUS_MAX_STRLEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A "string" is used in attributes file</div><div class='del'>- * for name of extended attribute</div><div class='del'>- */</div><div class='del'>-struct hfsplus_attr_unistr {</div><div class='del'>-	__be16 length;</div><div class='del'>-	hfsplus_unichr unicode[HFSPLUS_ATTR_MAX_STRLEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* POSIX permissions */</div><div class='del'>-struct hfsplus_perm {</div><div class='del'>-	__be32 owner;</div><div class='del'>-	__be32 group;</div><div class='del'>-	u8  rootflags;</div><div class='del'>-	u8  userflags;</div><div class='del'>-	__be16 mode;</div><div class='del'>-	__be32 dev;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_FLG_NODUMP	0x01</div><div class='del'>-#define HFSPLUS_FLG_IMMUTABLE	0x02</div><div class='del'>-#define HFSPLUS_FLG_APPEND	0x04</div><div class='del'>-</div><div class='del'>-/* A single contiguous area of a file */</div><div class='del'>-struct hfsplus_extent {</div><div class='del'>-	__be32 start_block;</div><div class='del'>-	__be32 block_count;</div><div class='del'>-} __packed;</div><div class='del'>-typedef struct hfsplus_extent hfsplus_extent_rec[8];</div><div class='del'>-</div><div class='del'>-/* Information for a "Fork" in a file */</div><div class='del'>-struct hfsplus_fork_raw {</div><div class='del'>-	__be64 total_size;</div><div class='del'>-	__be32 clump_size;</div><div class='del'>-	__be32 total_blocks;</div><div class='del'>-	hfsplus_extent_rec extents;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS+ Volume Header */</div><div class='del'>-struct hfsplus_vh {</div><div class='del'>-	__be16 signature;</div><div class='del'>-	__be16 version;</div><div class='del'>-	__be32 attributes;</div><div class='del'>-	__be32 last_mount_vers;</div><div class='del'>-	u32 reserved;</div><div class='del'>-</div><div class='del'>-	__be32 create_date;</div><div class='del'>-	__be32 modify_date;</div><div class='del'>-	__be32 backup_date;</div><div class='del'>-	__be32 checked_date;</div><div class='del'>-</div><div class='del'>-	__be32 file_count;</div><div class='del'>-	__be32 folder_count;</div><div class='del'>-</div><div class='del'>-	__be32 blocksize;</div><div class='del'>-	__be32 total_blocks;</div><div class='del'>-	__be32 free_blocks;</div><div class='del'>-</div><div class='del'>-	__be32 next_alloc;</div><div class='del'>-	__be32 rsrc_clump_sz;</div><div class='del'>-	__be32 data_clump_sz;</div><div class='del'>-	hfsplus_cnid next_cnid;</div><div class='del'>-</div><div class='del'>-	__be32 write_count;</div><div class='del'>-	__be64 encodings_bmp;</div><div class='del'>-</div><div class='del'>-	u32 finder_info[8];</div><div class='del'>-</div><div class='del'>-	struct hfsplus_fork_raw alloc_file;</div><div class='del'>-	struct hfsplus_fork_raw ext_file;</div><div class='del'>-	struct hfsplus_fork_raw cat_file;</div><div class='del'>-	struct hfsplus_fork_raw attr_file;</div><div class='del'>-	struct hfsplus_fork_raw start_file;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS+ volume attributes */</div><div class='del'>-#define HFSPLUS_VOL_UNMNT		(1 &lt;&lt; 8)</div><div class='del'>-#define HFSPLUS_VOL_SPARE_BLK		(1 &lt;&lt; 9)</div><div class='del'>-#define HFSPLUS_VOL_NOCACHE		(1 &lt;&lt; 10)</div><div class='del'>-#define HFSPLUS_VOL_INCNSTNT		(1 &lt;&lt; 11)</div><div class='del'>-#define HFSPLUS_VOL_NODEID_REUSED	(1 &lt;&lt; 12)</div><div class='del'>-#define HFSPLUS_VOL_JOURNALED		(1 &lt;&lt; 13)</div><div class='del'>-#define HFSPLUS_VOL_SOFTLOCK		(1 &lt;&lt; 15)</div><div class='del'>-#define HFSPLUS_VOL_UNUSED_NODE_FIX	(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-/* HFS+ BTree node descriptor */</div><div class='del'>-struct hfs_bnode_desc {</div><div class='del'>-	__be32 next;</div><div class='del'>-	__be32 prev;</div><div class='del'>-	s8 type;</div><div class='del'>-	u8 height;</div><div class='del'>-	__be16 num_recs;</div><div class='del'>-	u16 reserved;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS+ BTree node types */</div><div class='del'>-#define HFS_NODE_INDEX	0x00	/* An internal (index) node */</div><div class='del'>-#define HFS_NODE_HEADER	0x01	/* The tree header node (node 0) */</div><div class='del'>-#define HFS_NODE_MAP	0x02	/* Holds part of the bitmap of used nodes */</div><div class='del'>-#define HFS_NODE_LEAF	0xFF	/* A leaf (ndNHeight==1) node */</div><div class='del'>-</div><div class='del'>-/* HFS+ BTree header */</div><div class='del'>-struct hfs_btree_header_rec {</div><div class='del'>-	__be16 depth;</div><div class='del'>-	__be32 root;</div><div class='del'>-	__be32 leaf_count;</div><div class='del'>-	__be32 leaf_head;</div><div class='del'>-	__be32 leaf_tail;</div><div class='del'>-	__be16 node_size;</div><div class='del'>-	__be16 max_key_len;</div><div class='del'>-	__be32 node_count;</div><div class='del'>-	__be32 free_nodes;</div><div class='del'>-	u16 reserved1;</div><div class='del'>-	__be32 clump_size;</div><div class='del'>-	u8 btree_type;</div><div class='del'>-	u8 key_type;</div><div class='del'>-	__be32 attributes;</div><div class='del'>-	u32 reserved3[16];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* BTree attributes */</div><div class='del'>-#define HFS_TREE_BIGKEYS	2</div><div class='del'>-#define HFS_TREE_VARIDXKEYS	4</div><div class='del'>-</div><div class='del'>-/* HFS+ BTree misc info */</div><div class='del'>-#define HFSPLUS_TREE_HEAD 0</div><div class='del'>-#define HFSPLUS_NODE_MXSZ 32768</div><div class='del'>-#define HFSPLUS_ATTR_TREE_NODE_SIZE		8192</div><div class='del'>-#define HFSPLUS_BTREE_HDR_NODE_RECS_COUNT	3</div><div class='del'>-#define HFSPLUS_BTREE_HDR_USER_BYTES		128</div><div class='del'>-</div><div class='del'>-/* Some special File ID numbers (stolen from hfs.h) */</div><div class='del'>-#define HFSPLUS_POR_CNID		1	/* Parent Of the Root */</div><div class='del'>-#define HFSPLUS_ROOT_CNID		2	/* ROOT directory */</div><div class='del'>-#define HFSPLUS_EXT_CNID		3	/* EXTents B-tree */</div><div class='del'>-#define HFSPLUS_CAT_CNID		4	/* CATalog B-tree */</div><div class='del'>-#define HFSPLUS_BAD_CNID		5	/* BAD blocks file */</div><div class='del'>-#define HFSPLUS_ALLOC_CNID		6	/* ALLOCation file */</div><div class='del'>-#define HFSPLUS_START_CNID		7	/* STARTup file */</div><div class='del'>-#define HFSPLUS_ATTR_CNID		8	/* ATTRibutes file */</div><div class='del'>-#define HFSPLUS_EXCH_CNID		15	/* ExchangeFiles temp id */</div><div class='del'>-#define HFSPLUS_FIRSTUSER_CNID		16	/* first available user id */</div><div class='del'>-</div><div class='del'>-/* btree key type */</div><div class='del'>-#define HFSPLUS_KEY_CASEFOLDING		0xCF	/* case-insensitive */</div><div class='del'>-#define HFSPLUS_KEY_BINARY		0xBC	/* case-sensitive */</div><div class='del'>-</div><div class='del'>-/* HFS+ catalog entry key */</div><div class='del'>-struct hfsplus_cat_key {</div><div class='del'>-	__be16 key_len;</div><div class='del'>-	hfsplus_cnid parent;</div><div class='del'>-	struct hfsplus_unistr name;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_CAT_KEYLEN	(sizeof(struct hfsplus_cat_key))</div><div class='del'>-</div><div class='del'>-/* Structs from hfs.h */</div><div class='del'>-struct hfsp_point {</div><div class='del'>-	__be16 v;</div><div class='del'>-	__be16 h;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hfsp_rect {</div><div class='del'>-	__be16 top;</div><div class='del'>-	__be16 left;</div><div class='del'>-	__be16 bottom;</div><div class='del'>-	__be16 right;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* HFS directory info (stolen from hfs.h */</div><div class='del'>-struct DInfo {</div><div class='del'>-	struct hfsp_rect frRect;</div><div class='del'>-	__be16 frFlags;</div><div class='del'>-	struct hfsp_point frLocation;</div><div class='del'>-	__be16 frView;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct DXInfo {</div><div class='del'>-	struct hfsp_point frScroll;</div><div class='del'>-	__be32 frOpenChain;</div><div class='del'>-	__be16 frUnused;</div><div class='del'>-	__be16 frComment;</div><div class='del'>-	__be32 frPutAway;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS+ folder data (part of an hfsplus_cat_entry) */</div><div class='del'>-struct hfsplus_cat_folder {</div><div class='del'>-	__be16 type;</div><div class='del'>-	__be16 flags;</div><div class='del'>-	__be32 valence;</div><div class='del'>-	hfsplus_cnid id;</div><div class='del'>-	__be32 create_date;</div><div class='del'>-	__be32 content_mod_date;</div><div class='del'>-	__be32 attribute_mod_date;</div><div class='del'>-	__be32 access_date;</div><div class='del'>-	__be32 backup_date;</div><div class='del'>-	struct hfsplus_perm permissions;</div><div class='del'>-	struct_group_attr(info, __packed,</div><div class='del'>-		struct DInfo user_info;</div><div class='del'>-		struct DXInfo finder_info;</div><div class='del'>-	);</div><div class='del'>-	__be32 text_encoding;</div><div class='del'>-	__be32 subfolders;	/* Subfolder count in HFSX. Reserved in HFS+. */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS file info (stolen from hfs.h) */</div><div class='del'>-struct FInfo {</div><div class='del'>-	__be32 fdType;</div><div class='del'>-	__be32 fdCreator;</div><div class='del'>-	__be16 fdFlags;</div><div class='del'>-	struct hfsp_point fdLocation;</div><div class='del'>-	__be16 fdFldr;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct FXInfo {</div><div class='del'>-	__be16 fdIconID;</div><div class='del'>-	u8 fdUnused[8];</div><div class='del'>-	__be16 fdComment;</div><div class='del'>-	__be32 fdPutAway;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS+ file data (part of a cat_entry) */</div><div class='del'>-struct hfsplus_cat_file {</div><div class='del'>-	__be16 type;</div><div class='del'>-	__be16 flags;</div><div class='del'>-	u32 reserved1;</div><div class='del'>-	hfsplus_cnid id;</div><div class='del'>-	__be32 create_date;</div><div class='del'>-	__be32 content_mod_date;</div><div class='del'>-	__be32 attribute_mod_date;</div><div class='del'>-	__be32 access_date;</div><div class='del'>-	__be32 backup_date;</div><div class='del'>-	struct hfsplus_perm permissions;</div><div class='del'>-	struct_group_attr(info, __packed,</div><div class='del'>-		struct FInfo user_info;</div><div class='del'>-		struct FXInfo finder_info;</div><div class='del'>-	);</div><div class='del'>-	__be32 text_encoding;</div><div class='del'>-	u32 reserved2;</div><div class='del'>-</div><div class='del'>-	struct hfsplus_fork_raw data_fork;</div><div class='del'>-	struct hfsplus_fork_raw rsrc_fork;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* File and folder flag bits */</div><div class='del'>-#define HFSPLUS_FILE_LOCKED		0x0001</div><div class='del'>-#define HFSPLUS_FILE_THREAD_EXISTS	0x0002</div><div class='del'>-#define HFSPLUS_XATTR_EXISTS		0x0004</div><div class='del'>-#define HFSPLUS_ACL_EXISTS		0x0008</div><div class='del'>-#define HFSPLUS_HAS_FOLDER_COUNT	0x0010	/* Folder has subfolder count</div><div class='del'>-						 * (HFSX only) */</div><div class='del'>-</div><div class='del'>-/* HFS+ catalog thread (part of a cat_entry) */</div><div class='del'>-struct hfsplus_cat_thread {</div><div class='del'>-	__be16 type;</div><div class='del'>-	s16 reserved;</div><div class='del'>-	hfsplus_cnid parentID;</div><div class='del'>-	struct hfsplus_unistr nodeName;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_MIN_THREAD_SZ 10</div><div class='del'>-</div><div class='del'>-/* A data record in the catalog tree */</div><div class='del'>-typedef union {</div><div class='del'>-	__be16 type;</div><div class='del'>-	struct hfsplus_cat_folder folder;</div><div class='del'>-	struct hfsplus_cat_file file;</div><div class='del'>-	struct hfsplus_cat_thread thread;</div><div class='del'>-} __packed hfsplus_cat_entry;</div><div class='del'>-</div><div class='del'>-/* HFS+ catalog entry type */</div><div class='del'>-#define HFSPLUS_FOLDER         0x0001</div><div class='del'>-#define HFSPLUS_FILE           0x0002</div><div class='del'>-#define HFSPLUS_FOLDER_THREAD  0x0003</div><div class='del'>-#define HFSPLUS_FILE_THREAD    0x0004</div><div class='del'>-</div><div class='del'>-/* HFS+ extents tree key */</div><div class='del'>-struct hfsplus_ext_key {</div><div class='del'>-	__be16 key_len;</div><div class='del'>-	u8 fork_type;</div><div class='del'>-	u8 pad;</div><div class='del'>-	hfsplus_cnid cnid;</div><div class='del'>-	__be32 start_block;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_EXT_KEYLEN	sizeof(struct hfsplus_ext_key)</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_XATTR_FINDER_INFO_NAME "com.apple.FinderInfo"</div><div class='del'>-#define HFSPLUS_XATTR_ACL_NAME "com.apple.system.Security"</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_ATTR_INLINE_DATA 0x10</div><div class='del'>-#define HFSPLUS_ATTR_FORK_DATA   0x20</div><div class='del'>-#define HFSPLUS_ATTR_EXTENTS     0x30</div><div class='del'>-</div><div class='del'>-/* HFS+ attributes tree key */</div><div class='del'>-struct hfsplus_attr_key {</div><div class='del'>-	__be16 key_len;</div><div class='del'>-	__be16 pad;</div><div class='del'>-	hfsplus_cnid cnid;</div><div class='del'>-	__be32 start_block;</div><div class='del'>-	struct hfsplus_attr_unistr key_name;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_ATTR_KEYLEN	sizeof(struct hfsplus_attr_key)</div><div class='del'>-</div><div class='del'>-/* HFS+ fork data attribute */</div><div class='del'>-struct hfsplus_attr_fork_data {</div><div class='del'>-	__be32 record_type;</div><div class='del'>-	__be32 reserved;</div><div class='del'>-	struct hfsplus_fork_raw the_fork;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HFS+ extension attribute */</div><div class='del'>-struct hfsplus_attr_extents {</div><div class='del'>-	__be32 record_type;</div><div class='del'>-	__be32 reserved;</div><div class='del'>-	struct hfsplus_extent extents;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HFSPLUS_MAX_INLINE_DATA_SIZE 3802</div><div class='del'>-</div><div class='del'>-/* HFS+ attribute inline data */</div><div class='del'>-struct hfsplus_attr_inline_data {</div><div class='del'>-	__be32 record_type;</div><div class='del'>-	__be32 reserved1;</div><div class='del'>-	u8 reserved2[6];</div><div class='del'>-	__be16 length;</div><div class='del'>-	u8 raw_bytes[HFSPLUS_MAX_INLINE_DATA_SIZE];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* A data record in the attributes tree */</div><div class='del'>-typedef union {</div><div class='del'>-	__be32 record_type;</div><div class='del'>-	struct hfsplus_attr_fork_data fork_data;</div><div class='del'>-	struct hfsplus_attr_extents extents;</div><div class='del'>-	struct hfsplus_attr_inline_data inline_data;</div><div class='del'>-} __packed hfsplus_attr_entry;</div><div class='del'>-</div><div class='del'>-/* HFS+ generic BTree key */</div><div class='del'>-typedef union {</div><div class='del'>-	__be16 key_len;</div><div class='del'>-	struct hfsplus_cat_key cat;</div><div class='del'>-	struct hfsplus_ext_key ext;</div><div class='del'>-	struct hfsplus_attr_key attr;</div><div class='del'>-} __packed hfsplus_btree_key;</div><div class='add'>+#include &lt;linux/hfs_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c<br/>index 3d326926c195..7ae6745ca7ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/inode.c</a></div><div class='hunk'>@@ -38,13 +38,14 @@ static void hfsplus_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfsplus_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, struct page **pagep, void **fsdata)</div><div class='add'>+int hfsplus_write_begin(const struct kiocb *iocb,</div><div class='add'>+			struct address_space *mapping, loff_t pos,</div><div class='add'>+			unsigned len, struct folio **foliop,</div><div class='add'>+			void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,</div><div class='add'>+	ret = cont_write_begin(iocb, mapping, pos, len, foliop, fsdata,</div><div class='ctx'> 				hfsplus_get_block,</div><div class='ctx'> 				&amp;HFSPLUS_I(mapping-&gt;host)-&gt;phys_size);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='hunk'>@@ -179,13 +180,29 @@ const struct dentry_operations hfsplus_dentry_operations = {</div><div class='ctx'> 	.d_compare    = hfsplus_compare_dentry,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void hfsplus_get_perms(struct inode *inode,</div><div class='del'>-		struct hfsplus_perm *perms, int dir)</div><div class='add'>+static int hfsplus_get_perms(struct inode *inode,</div><div class='add'>+			     struct hfsplus_perm *perms, int dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode-&gt;i_sb);</div><div class='ctx'> 	u16 mode;</div><div class='ctx'> </div><div class='ctx'> 	mode = be16_to_cpu(perms-&gt;mode);</div><div class='add'>+	if (dir) {</div><div class='add'>+		if (mode &amp;&amp; !S_ISDIR(mode))</div><div class='add'>+			goto bad_type;</div><div class='add'>+	} else if (mode) {</div><div class='add'>+		switch (mode &amp; S_IFMT) {</div><div class='add'>+		case S_IFREG:</div><div class='add'>+		case S_IFLNK:</div><div class='add'>+		case S_IFCHR:</div><div class='add'>+		case S_IFBLK:</div><div class='add'>+		case S_IFIFO:</div><div class='add'>+		case S_IFSOCK:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto bad_type;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	i_uid_write(inode, be32_to_cpu(perms-&gt;owner));</div><div class='ctx'> 	if ((test_bit(HFSPLUS_SB_UID, &amp;sbi-&gt;flags)) || (!i_uid_read(inode) &amp;&amp; !mode))</div><div class='hunk'>@@ -211,6 +228,10 @@ static void hfsplus_get_perms(struct inode *inode,</div><div class='ctx'> 		inode-&gt;i_flags |= S_APPEND;</div><div class='ctx'> 	else</div><div class='ctx'> 		inode-&gt;i_flags &amp;= ~S_APPEND;</div><div class='add'>+	return 0;</div><div class='add'>+bad_type:</div><div class='add'>+	pr_err("invalid file type 0%04o for inode %lu\n", mode, inode-&gt;i_ino);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hfsplus_file_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -304,6 +325,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct hfsplus_inode_info *hip = HFSPLUS_I(inode);</div><div class='ctx'> 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode-&gt;i_sb);</div><div class='add'>+	struct hfsplus_vh *vhdr = sbi-&gt;s_vhdr;</div><div class='ctx'> 	int error = 0, error2;</div><div class='ctx'> </div><div class='ctx'> 	error = file_write_and_wait_range(file, start, end);</div><div class='hunk'>@@ -347,6 +369,14 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> 			error = error2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;sbi-&gt;vh_mutex);</div><div class='add'>+	hfsplus_prepare_volume_header_for_commit(vhdr);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;vh_mutex);</div><div class='add'>+</div><div class='add'>+	error2 = hfsplus_commit_superblock(inode-&gt;i_sb);</div><div class='add'>+	if (!error)</div><div class='add'>+		error = error2;</div><div class='add'>+</div><div class='ctx'> 	if (!test_bit(HFSPLUS_SB_NOBARRIER, &amp;sbi-&gt;flags))</div><div class='ctx'> 		blkdev_issue_flush(inode-&gt;i_sb-&gt;s_bdev);</div><div class='ctx'> </div><div class='hunk'>@@ -367,8 +397,9 @@ static const struct file_operations hfsplus_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='add'>+	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fsync		= hfsplus_file_fsync,</div><div class='ctx'> 	.open		= hfsplus_file_open,</div><div class='ctx'> 	.release	= hfsplus_file_release,</div><div class='hunk'>@@ -514,7 +545,9 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)</div><div class='ctx'> 		}</div><div class='ctx'> 		hfs_bnode_read(fd-&gt;bnode, &amp;entry, fd-&gt;entryoffset,</div><div class='ctx'> 					sizeof(struct hfsplus_cat_folder));</div><div class='del'>-		hfsplus_get_perms(inode, &amp;folder-&gt;permissions, 1);</div><div class='add'>+		res = hfsplus_get_perms(inode, &amp;folder-&gt;permissions, 1);</div><div class='add'>+		if (res)</div><div class='add'>+			goto out;</div><div class='ctx'> 		set_nlink(inode, 1);</div><div class='ctx'> 		inode-&gt;i_size = 2 + be32_to_cpu(folder-&gt;valence);</div><div class='ctx'> 		inode_set_atime_to_ts(inode, hfsp_mt2ut(folder-&gt;access_date));</div><div class='hunk'>@@ -543,7 +576,9 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)</div><div class='ctx'> </div><div class='ctx'> 		hfsplus_inode_read_fork(inode, HFSPLUS_IS_RSRC(inode) ?</div><div class='ctx'> 					&amp;file-&gt;rsrc_fork : &amp;file-&gt;data_fork);</div><div class='del'>-		hfsplus_get_perms(inode, &amp;file-&gt;permissions, 0);</div><div class='add'>+		res = hfsplus_get_perms(inode, &amp;file-&gt;permissions, 0);</div><div class='add'>+		if (res)</div><div class='add'>+			goto out;</div><div class='ctx'> 		set_nlink(inode, 1);</div><div class='ctx'> 		if (S_ISREG(inode-&gt;i_mode)) {</div><div class='ctx'> 			if (file-&gt;permissions.dev)</div><div class='hunk'>@@ -655,7 +690,7 @@ out:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfsplus_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int hfsplus_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct hfsplus_inode_info *hip = HFSPLUS_I(inode);</div><div class='hunk'>@@ -674,7 +709,7 @@ int hfsplus_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hfsplus_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-			 struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+			 struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct hfsplus_inode_info *hip = HFSPLUS_I(inode);</div><div class='head'>diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c<br/>index 5661a2e24d03..40d04dba13ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/ioctl.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags)</div><div class='ctx'> </div><div class='ctx'> 	/* Directory containing the bootable system */</div><div class='ctx'> 	vh-&gt;finder_info[0] = bvh-&gt;finder_info[0] =</div><div class='del'>-		cpu_to_be32(parent_ino(dentry));</div><div class='add'>+		cpu_to_be32(d_parent_ino(dentry));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bootloader. Just using the inode here breaks in the case of</div><div class='hunk'>@@ -51,7 +51,7 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags)</div><div class='ctx'> </div><div class='ctx'> 	/* Per spec, the OS X system folder - same as finder_info[0] here */</div><div class='ctx'> 	vh-&gt;finder_info[5] = bvh-&gt;finder_info[5] =</div><div class='del'>-		cpu_to_be32(parent_ino(dentry));</div><div class='add'>+		cpu_to_be32(d_parent_ino(dentry));</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;sbi-&gt;vh_mutex);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c<br/>index c94a58762ad6..9b377481f397 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/options.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/options.c</a></div><div class='hunk'>@@ -12,7 +12,9 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/nls.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -23,26 +25,23 @@ enum {</div><div class='ctx'> 	opt_creator, opt_type,</div><div class='ctx'> 	opt_umask, opt_uid, opt_gid,</div><div class='ctx'> 	opt_part, opt_session, opt_nls,</div><div class='del'>-	opt_nodecompose, opt_decompose,</div><div class='del'>-	opt_barrier, opt_nobarrier,</div><div class='del'>-	opt_force, opt_err</div><div class='add'>+	opt_decompose, opt_barrier,</div><div class='add'>+	opt_force,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{ opt_creator, "creator=%s" },</div><div class='del'>-	{ opt_type, "type=%s" },</div><div class='del'>-	{ opt_umask, "umask=%o" },</div><div class='del'>-	{ opt_uid, "uid=%u" },</div><div class='del'>-	{ opt_gid, "gid=%u" },</div><div class='del'>-	{ opt_part, "part=%u" },</div><div class='del'>-	{ opt_session, "session=%u" },</div><div class='del'>-	{ opt_nls, "nls=%s" },</div><div class='del'>-	{ opt_decompose, "decompose" },</div><div class='del'>-	{ opt_nodecompose, "nodecompose" },</div><div class='del'>-	{ opt_barrier, "barrier" },</div><div class='del'>-	{ opt_nobarrier, "nobarrier" },</div><div class='del'>-	{ opt_force, "force" },</div><div class='del'>-	{ opt_err, NULL }</div><div class='add'>+static const struct fs_parameter_spec hfs_param_spec[] = {</div><div class='add'>+	fsparam_string	("creator",	opt_creator),</div><div class='add'>+	fsparam_string	("type",	opt_type),</div><div class='add'>+	fsparam_u32oct	("umask",	opt_umask),</div><div class='add'>+	fsparam_u32	("uid",		opt_uid),</div><div class='add'>+	fsparam_u32	("gid",		opt_gid),</div><div class='add'>+	fsparam_u32	("part",	opt_part),</div><div class='add'>+	fsparam_u32	("session",	opt_session),</div><div class='add'>+	fsparam_string	("nls",		opt_nls),</div><div class='add'>+	fsparam_flag_no	("decompose",	opt_decompose),</div><div class='add'>+	fsparam_flag_no	("barrier",	opt_barrier),</div><div class='add'>+	fsparam_flag	("force",	opt_force),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Initialize an options object to reasonable defaults */</div><div class='hunk'>@@ -60,162 +59,89 @@ void hfsplus_fill_defaults(struct hfsplus_sb_info *opts)</div><div class='ctx'> 	opts-&gt;session = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* convert a "four byte character" to a 32 bit int with error checks */</div><div class='del'>-static inline int match_fourchar(substring_t *arg, u32 *result)</div><div class='add'>+/* Parse options from mount. Returns nonzero errno on failure */</div><div class='add'>+int hfsplus_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	if (arg-&gt;to - arg-&gt;from != 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	memcpy(result, arg-&gt;from, 4);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int hfsplus_parse_options_remount(char *input, int *force)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int token;</div><div class='del'>-</div><div class='del'>-	if (!input)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;input, ",")) != NULL) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case opt_force:</div><div class='del'>-			*force = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='add'>+	struct hfsplus_sb_info *sbi = fc-&gt;s_fs_info;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only the force option is examined during remount, all others</div><div class='add'>+	 * are ignored.</div><div class='add'>+	 */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE &amp;&amp;</div><div class='add'>+	    strncmp(param-&gt;key, "force", 5))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, hfs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case opt_creator:</div><div class='add'>+		if (strlen(param-&gt;string) != 4) {</div><div class='add'>+			pr_err("creator requires a 4 character value\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parse options from mount. Returns 0 on failure */</div><div class='del'>-/* input is the options passed to mount() as a string */</div><div class='del'>-int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int tmp, token;</div><div class='del'>-</div><div class='del'>-	if (!input)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;input, ",")) != NULL) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case opt_creator:</div><div class='del'>-			if (match_fourchar(&amp;args[0], &amp;sbi-&gt;creator)) {</div><div class='del'>-				pr_err("creator requires a 4 character value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_type:</div><div class='del'>-			if (match_fourchar(&amp;args[0], &amp;sbi-&gt;type)) {</div><div class='del'>-				pr_err("type requires a 4 character value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_umask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("umask requires a value\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			sbi-&gt;umask = (umode_t)tmp;</div><div class='del'>-			break;</div><div class='del'>-		case opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("uid requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			sbi-&gt;uid = make_kuid(current_user_ns(), (uid_t)tmp);</div><div class='del'>-			if (!uid_valid(sbi-&gt;uid)) {</div><div class='del'>-				pr_err("invalid uid specified\n");</div><div class='del'>-				return 0;</div><div class='del'>-			} else {</div><div class='del'>-				set_bit(HFSPLUS_SB_UID, &amp;sbi-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;tmp)) {</div><div class='del'>-				pr_err("gid requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			sbi-&gt;gid = make_kgid(current_user_ns(), (gid_t)tmp);</div><div class='del'>-			if (!gid_valid(sbi-&gt;gid)) {</div><div class='del'>-				pr_err("invalid gid specified\n");</div><div class='del'>-				return 0;</div><div class='del'>-			} else {</div><div class='del'>-				set_bit(HFSPLUS_SB_GID, &amp;sbi-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_part:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;sbi-&gt;part)) {</div><div class='del'>-				pr_err("part requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_session:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;sbi-&gt;session)) {</div><div class='del'>-				pr_err("session requires an argument\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case opt_nls:</div><div class='del'>-			if (sbi-&gt;nls) {</div><div class='del'>-				pr_err("unable to change nls mapping\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			p = match_strdup(&amp;args[0]);</div><div class='del'>-			if (p)</div><div class='del'>-				sbi-&gt;nls = load_nls(p);</div><div class='del'>-			if (!sbi-&gt;nls) {</div><div class='del'>-				pr_err("unable to load nls mapping \"%s\"\n",</div><div class='del'>-				       p);</div><div class='del'>-				kfree(p);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			kfree(p);</div><div class='del'>-			break;</div><div class='del'>-		case opt_decompose:</div><div class='del'>-			clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;sbi-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case opt_nodecompose:</div><div class='add'>+		memcpy(&amp;sbi-&gt;creator, param-&gt;string, 4);</div><div class='add'>+		break;</div><div class='add'>+	case opt_type:</div><div class='add'>+		if (strlen(param-&gt;string) != 4) {</div><div class='add'>+			pr_err("type requires a 4 character value\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(&amp;sbi-&gt;type, param-&gt;string, 4);</div><div class='add'>+		break;</div><div class='add'>+	case opt_umask:</div><div class='add'>+		sbi-&gt;umask = (umode_t)result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_uid:</div><div class='add'>+		sbi-&gt;uid = result.uid;</div><div class='add'>+		set_bit(HFSPLUS_SB_UID, &amp;sbi-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	case opt_gid:</div><div class='add'>+		sbi-&gt;gid = result.gid;</div><div class='add'>+		set_bit(HFSPLUS_SB_GID, &amp;sbi-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	case opt_part:</div><div class='add'>+		sbi-&gt;part = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_session:</div><div class='add'>+		sbi-&gt;session = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case opt_nls:</div><div class='add'>+		if (sbi-&gt;nls) {</div><div class='add'>+			pr_err("unable to change nls mapping\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		sbi-&gt;nls = load_nls(param-&gt;string);</div><div class='add'>+		if (!sbi-&gt;nls) {</div><div class='add'>+			pr_err("unable to load nls mapping \"%s\"\n",</div><div class='add'>+			       param-&gt;string);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case opt_decompose:</div><div class='add'>+		if (result.negated)</div><div class='ctx'> 			set_bit(HFSPLUS_SB_NODECOMPOSE, &amp;sbi-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case opt_barrier:</div><div class='del'>-			clear_bit(HFSPLUS_SB_NOBARRIER, &amp;sbi-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case opt_nobarrier:</div><div class='add'>+		else</div><div class='add'>+			clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;sbi-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	case opt_barrier:</div><div class='add'>+		if (result.negated)</div><div class='ctx'> 			set_bit(HFSPLUS_SB_NOBARRIER, &amp;sbi-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		case opt_force:</div><div class='del'>-			set_bit(HFSPLUS_SB_FORCE, &amp;sbi-&gt;flags);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (!sbi-&gt;nls) {</div><div class='del'>-		/* try utf8 first, as this is the old default behaviour */</div><div class='del'>-		sbi-&gt;nls = load_nls("utf8");</div><div class='del'>-		if (!sbi-&gt;nls)</div><div class='del'>-			sbi-&gt;nls = load_nls_default();</div><div class='del'>-		if (!sbi-&gt;nls)</div><div class='del'>-			return 0;</div><div class='add'>+		else</div><div class='add'>+			clear_bit(HFSPLUS_SB_NOBARRIER, &amp;sbi-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	case opt_force:</div><div class='add'>+		set_bit(HFSPLUS_SB_FORCE, &amp;sbi-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hfsplus_show_options(struct seq_file *seq, struct dentry *root)</div><div class='head'>diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c<br/>index 1986b4f18a90..aaffa9e060a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/super.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/nls.h&gt;</div><div class='hunk'>@@ -64,16 +65,29 @@ struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;HFSPLUS_I(inode)-&gt;open_dir_list);</div><div class='del'>-	spin_lock_init(&amp;HFSPLUS_I(inode)-&gt;open_dir_lock);</div><div class='del'>-	mutex_init(&amp;HFSPLUS_I(inode)-&gt;extents_lock);</div><div class='del'>-	HFSPLUS_I(inode)-&gt;flags = 0;</div><div class='add'>+	atomic_set(&amp;HFSPLUS_I(inode)-&gt;opencnt, 0);</div><div class='add'>+	HFSPLUS_I(inode)-&gt;first_blocks = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;clump_blocks = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;alloc_blocks = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;cached_start = U32_MAX;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;cached_blocks = 0;</div><div class='add'>+	memset(HFSPLUS_I(inode)-&gt;first_extents, 0, sizeof(hfsplus_extent_rec));</div><div class='add'>+	memset(HFSPLUS_I(inode)-&gt;cached_extents, 0, sizeof(hfsplus_extent_rec));</div><div class='ctx'> 	HFSPLUS_I(inode)-&gt;extent_state = 0;</div><div class='add'>+	mutex_init(&amp;HFSPLUS_I(inode)-&gt;extents_lock);</div><div class='ctx'> 	HFSPLUS_I(inode)-&gt;rsrc_inode = NULL;</div><div class='del'>-	atomic_set(&amp;HFSPLUS_I(inode)-&gt;opencnt, 0);</div><div class='add'>+	HFSPLUS_I(inode)-&gt;create_date = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;linkid = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;flags = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;fs_blocks = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;userflags = 0;</div><div class='add'>+	HFSPLUS_I(inode)-&gt;subfolders = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;HFSPLUS_I(inode)-&gt;open_dir_list);</div><div class='add'>+	spin_lock_init(&amp;HFSPLUS_I(inode)-&gt;open_dir_lock);</div><div class='add'>+	HFSPLUS_I(inode)-&gt;phys_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (inode-&gt;i_ino &gt;= HFSPLUS_FIRSTUSER_CNID ||</div><div class='ctx'> 	    inode-&gt;i_ino == HFSPLUS_ROOT_CNID) {</div><div class='hunk'>@@ -149,7 +163,7 @@ static int hfsplus_write_inode(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(INODE, "hfsplus_write_inode: %lu\n", inode-&gt;i_ino);</div><div class='add'>+	hfs_dbg("ino %lu\n", inode-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> 	err = hfsplus_ext_write_extent(inode);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -164,7 +178,7 @@ static int hfsplus_write_inode(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> static void hfsplus_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	hfs_dbg(INODE, "hfsplus_evict_inode: %lu\n", inode-&gt;i_ino);</div><div class='add'>+	hfs_dbg("ino %lu\n", inode-&gt;i_ino);</div><div class='ctx'> 	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> 	clear_inode(inode);</div><div class='ctx'> 	if (HFSPLUS_IS_RSRC(inode)) {</div><div class='hunk'>@@ -173,17 +187,62 @@ static void hfsplus_evict_inode(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hfsplus_sync_fs(struct super_block *sb, int wait)</div><div class='add'>+int hfsplus_commit_superblock(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);</div><div class='ctx'> 	struct hfsplus_vh *vhdr = sbi-&gt;s_vhdr;</div><div class='ctx'> 	int write_backup = 0;</div><div class='add'>+	int error = 0, error2;</div><div class='add'>+</div><div class='add'>+	hfs_dbg("starting...\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;vh_mutex);</div><div class='add'>+	mutex_lock(&amp;sbi-&gt;alloc_mutex);</div><div class='add'>+	vhdr-&gt;free_blocks = cpu_to_be32(sbi-&gt;free_blocks);</div><div class='add'>+	vhdr-&gt;next_cnid = cpu_to_be32(sbi-&gt;next_cnid);</div><div class='add'>+	vhdr-&gt;folder_count = cpu_to_be32(sbi-&gt;folder_count);</div><div class='add'>+	vhdr-&gt;file_count = cpu_to_be32(sbi-&gt;file_count);</div><div class='add'>+</div><div class='add'>+	hfs_dbg("free_blocks %u, next_cnid %u, folder_count %u, file_count %u\n",</div><div class='add'>+		sbi-&gt;free_blocks, sbi-&gt;next_cnid,</div><div class='add'>+		sbi-&gt;folder_count, sbi-&gt;file_count);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(HFSPLUS_SB_WRITEBACKUP, &amp;sbi-&gt;flags)) {</div><div class='add'>+		memcpy(sbi-&gt;s_backup_vhdr, sbi-&gt;s_vhdr, sizeof(*sbi-&gt;s_vhdr));</div><div class='add'>+		write_backup = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error2 = hfsplus_submit_bio(sb,</div><div class='add'>+				   sbi-&gt;part_start + HFSPLUS_VOLHEAD_SECTOR,</div><div class='add'>+				   sbi-&gt;s_vhdr_buf, NULL, REQ_OP_WRITE);</div><div class='add'>+	if (!error)</div><div class='add'>+		error = error2;</div><div class='add'>+	if (!write_backup)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	error2 = hfsplus_submit_bio(sb,</div><div class='add'>+				  sbi-&gt;part_start + sbi-&gt;sect_count - 2,</div><div class='add'>+				  sbi-&gt;s_backup_vhdr_buf, NULL, REQ_OP_WRITE);</div><div class='add'>+	if (!error)</div><div class='add'>+		error = error2;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;alloc_mutex);</div><div class='add'>+	mutex_unlock(&amp;sbi-&gt;vh_mutex);</div><div class='add'>+</div><div class='add'>+	hfs_dbg("finished: err %d\n", error);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hfsplus_sync_fs(struct super_block *sb, int wait)</div><div class='add'>+{</div><div class='add'>+	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);</div><div class='ctx'> 	int error, error2;</div><div class='ctx'> </div><div class='ctx'> 	if (!wait)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(SUPER, "hfsplus_sync_fs\n");</div><div class='add'>+	hfs_dbg("starting...\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Explicitly write out the special metadata inodes.</div><div class='hunk'>@@ -207,40 +266,15 @@ static int hfsplus_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = error2;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sbi-&gt;vh_mutex);</div><div class='del'>-	mutex_lock(&amp;sbi-&gt;alloc_mutex);</div><div class='del'>-	vhdr-&gt;free_blocks = cpu_to_be32(sbi-&gt;free_blocks);</div><div class='del'>-	vhdr-&gt;next_cnid = cpu_to_be32(sbi-&gt;next_cnid);</div><div class='del'>-	vhdr-&gt;folder_count = cpu_to_be32(sbi-&gt;folder_count);</div><div class='del'>-	vhdr-&gt;file_count = cpu_to_be32(sbi-&gt;file_count);</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(HFSPLUS_SB_WRITEBACKUP, &amp;sbi-&gt;flags)) {</div><div class='del'>-		memcpy(sbi-&gt;s_backup_vhdr, sbi-&gt;s_vhdr, sizeof(*sbi-&gt;s_vhdr));</div><div class='del'>-		write_backup = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error2 = hfsplus_submit_bio(sb,</div><div class='del'>-				   sbi-&gt;part_start + HFSPLUS_VOLHEAD_SECTOR,</div><div class='del'>-				   sbi-&gt;s_vhdr_buf, NULL, REQ_OP_WRITE |</div><div class='del'>-				   REQ_SYNC);</div><div class='add'>+	error2 = hfsplus_commit_superblock(sb);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = error2;</div><div class='del'>-	if (!write_backup)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	error2 = hfsplus_submit_bio(sb,</div><div class='del'>-				  sbi-&gt;part_start + sbi-&gt;sect_count - 2,</div><div class='del'>-				  sbi-&gt;s_backup_vhdr_buf, NULL, REQ_OP_WRITE |</div><div class='del'>-				  REQ_SYNC);</div><div class='del'>-	if (!error)</div><div class='del'>-		error2 = error;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;sbi-&gt;alloc_mutex);</div><div class='del'>-	mutex_unlock(&amp;sbi-&gt;vh_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(HFSPLUS_SB_NOBARRIER, &amp;sbi-&gt;flags))</div><div class='ctx'> 		blkdev_issue_flush(sb-&gt;s_bdev);</div><div class='ctx'> </div><div class='add'>+	hfs_dbg("finished: err %d\n", error);</div><div class='add'>+</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -277,11 +311,19 @@ void hfsplus_mark_mdb_dirty(struct super_block *sb)</div><div class='ctx'> 	spin_unlock(&amp;sbi-&gt;work_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void delayed_free(struct rcu_head *p)</div><div class='add'>+{</div><div class='add'>+	struct hfsplus_sb_info *sbi = container_of(p, struct hfsplus_sb_info, rcu);</div><div class='add'>+</div><div class='add'>+	unload_nls(sbi-&gt;nls);</div><div class='add'>+	kfree(sbi);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void hfsplus_put_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(SUPER, "hfsplus_put_super\n");</div><div class='add'>+	hfs_dbg("starting...\n");</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;sbi-&gt;sync_work);</div><div class='ctx'> </div><div class='hunk'>@@ -302,9 +344,9 @@ static void hfsplus_put_super(struct super_block *sb)</div><div class='ctx'> 	hfs_btree_close(sbi-&gt;ext_tree);</div><div class='ctx'> 	kfree(sbi-&gt;s_vhdr_buf);</div><div class='ctx'> 	kfree(sbi-&gt;s_backup_vhdr_buf);</div><div class='del'>-	unload_nls(sbi-&gt;nls);</div><div class='del'>-	kfree(sb-&gt;s_fs_info);</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='add'>+	call_rcu(&amp;sbi-&gt;rcu, delayed_free);</div><div class='add'>+</div><div class='add'>+	hfs_dbg("finished\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='hunk'>@@ -326,34 +368,33 @@ static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hfsplus_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int hfsplus_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='add'>+	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!(*flags &amp; SB_RDONLY)) {</div><div class='del'>-		struct hfsplus_vh *vhdr = HFSPLUS_SB(sb)-&gt;s_vhdr;</div><div class='del'>-		int force = 0;</div><div class='del'>-</div><div class='del'>-		if (!hfsplus_parse_options_remount(data, &amp;force))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (!(fc-&gt;sb_flags &amp; SB_RDONLY)) {</div><div class='add'>+		struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);</div><div class='add'>+		struct hfsplus_vh *vhdr = sbi-&gt;s_vhdr;</div><div class='ctx'> </div><div class='ctx'> 		if (!(vhdr-&gt;attributes &amp; cpu_to_be32(HFSPLUS_VOL_UNMNT))) {</div><div class='ctx'> 			pr_warn("filesystem was not cleanly unmounted, running fsck.hfsplus is recommended.  leaving read-only.\n");</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			*flags |= SB_RDONLY;</div><div class='del'>-		} else if (force) {</div><div class='add'>+			fc-&gt;sb_flags |= SB_RDONLY;</div><div class='add'>+		} else if (test_bit(HFSPLUS_SB_FORCE, &amp;sbi-&gt;flags)) {</div><div class='ctx'> 			/* nothing */</div><div class='ctx'> 		} else if (vhdr-&gt;attributes &amp;</div><div class='ctx'> 				cpu_to_be32(HFSPLUS_VOL_SOFTLOCK)) {</div><div class='ctx'> 			pr_warn("filesystem is marked locked, leaving read-only.\n");</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			*flags |= SB_RDONLY;</div><div class='add'>+			fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 		} else if (vhdr-&gt;attributes &amp;</div><div class='ctx'> 				cpu_to_be32(HFSPLUS_VOL_JOURNALED)) {</div><div class='ctx'> 			pr_warn("filesystem is marked journaled, leaving read-only.\n");</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			*flags |= SB_RDONLY;</div><div class='add'>+			fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -367,38 +408,42 @@ static const struct super_operations hfsplus_sops = {</div><div class='ctx'> 	.put_super	= hfsplus_put_super,</div><div class='ctx'> 	.sync_fs	= hfsplus_sync_fs,</div><div class='ctx'> 	.statfs		= hfsplus_statfs,</div><div class='del'>-	.remount_fs	= hfsplus_remount,</div><div class='ctx'> 	.show_options	= hfsplus_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+void hfsplus_prepare_volume_header_for_commit(struct hfsplus_vh *vhdr)</div><div class='add'>+{</div><div class='add'>+	vhdr-&gt;last_mount_vers = cpu_to_be32(HFSP_MOUNT_VERSION);</div><div class='add'>+	vhdr-&gt;modify_date = hfsp_now2mt();</div><div class='add'>+	be32_add_cpu(&amp;vhdr-&gt;write_count, 1);</div><div class='add'>+	vhdr-&gt;attributes &amp;= cpu_to_be32(~HFSPLUS_VOL_UNMNT);</div><div class='add'>+	vhdr-&gt;attributes |= cpu_to_be32(HFSPLUS_VOL_INCNSTNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hfsplus_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct hfsplus_vh *vhdr;</div><div class='del'>-	struct hfsplus_sb_info *sbi;</div><div class='add'>+	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);</div><div class='ctx'> 	hfsplus_cat_entry entry;</div><div class='ctx'> 	struct hfs_find_data fd;</div><div class='ctx'> 	struct inode *root, *inode;</div><div class='ctx'> 	struct qstr str;</div><div class='del'>-	struct nls_table *nls = NULL;</div><div class='add'>+	struct nls_table *nls;</div><div class='ctx'> 	u64 last_fs_block, last_fs_page;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='del'>-	if (!sbi)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_fs_info = sbi;</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;alloc_mutex);</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;vh_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;work_lock);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;sbi-&gt;sync_work, delayed_sync_fs);</div><div class='del'>-	hfsplus_fill_defaults(sbi);</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (!hfsplus_parse_options(data, sbi)) {</div><div class='del'>-		pr_err("unable to parse mount options\n");</div><div class='del'>-		goto out_unload_nls;</div><div class='add'>+	if (!sbi-&gt;nls) {</div><div class='add'>+		/* try utf8 first, as this is the old default behaviour */</div><div class='add'>+		sbi-&gt;nls = load_nls("utf8");</div><div class='add'>+		if (!sbi-&gt;nls)</div><div class='add'>+			sbi-&gt;nls = load_nls_default();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* temporarily use utf8 to correctly find the hidden dir below */</div><div class='hunk'>@@ -507,7 +552,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		goto out_put_alloc_file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sb-&gt;s_d_op = &amp;hfsplus_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;hfsplus_dentry_operations);</div><div class='ctx'> 	sb-&gt;s_root = d_make_root(root);</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -525,7 +570,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!hfs_brec_read(&amp;fd, &amp;entry, sizeof(entry))) {</div><div class='ctx'> 		hfs_find_exit(&amp;fd);</div><div class='ctx'> 		if (entry.type != cpu_to_be16(HFSPLUS_FOLDER)) {</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+			err = -EIO;</div><div class='ctx'> 			goto out_put_root;</div><div class='ctx'> 		}</div><div class='ctx'> 		inode = hfsplus_iget(sb, be32_to_cpu(entry.folder.id));</div><div class='hunk'>@@ -542,11 +587,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		 * H+LX == hfsplusutils, H+Lx == this driver, H+lx is unused</div><div class='ctx'> 		 * all three are registered with Apple for our use</div><div class='ctx'> 		 */</div><div class='del'>-		vhdr-&gt;last_mount_vers = cpu_to_be32(HFSP_MOUNT_VERSION);</div><div class='del'>-		vhdr-&gt;modify_date = hfsp_now2mt();</div><div class='del'>-		be32_add_cpu(&amp;vhdr-&gt;write_count, 1);</div><div class='del'>-		vhdr-&gt;attributes &amp;= cpu_to_be32(~HFSPLUS_VOL_UNMNT);</div><div class='del'>-		vhdr-&gt;attributes |= cpu_to_be32(HFSPLUS_VOL_INCNSTNT);</div><div class='add'>+		hfsplus_prepare_volume_header_for_commit(vhdr);</div><div class='ctx'> 		hfsplus_sync_fs(sb, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (!sbi-&gt;hidden_dir) {</div><div class='hunk'>@@ -610,7 +651,6 @@ out_unload_nls:</div><div class='ctx'> 	unload_nls(sbi-&gt;nls);</div><div class='ctx'> 	unload_nls(nls);</div><div class='ctx'> 	kfree(sbi);</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -635,18 +675,46 @@ static void hfsplus_free_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> #define HFSPLUS_INODE_SIZE	sizeof(struct hfsplus_inode_info)</div><div class='ctx'> </div><div class='del'>-static struct dentry *hfsplus_mount(struct file_system_type *fs_type,</div><div class='del'>-			  int flags, const char *dev_name, void *data)</div><div class='add'>+static int hfsplus_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, hfsplus_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hfsplus_free_fc(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super);</div><div class='add'>+	kfree(fc-&gt;s_fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations hfsplus_context_ops = {</div><div class='add'>+	.parse_param	= hfsplus_parse_param,</div><div class='add'>+	.get_tree	= hfsplus_get_tree,</div><div class='add'>+	.reconfigure	= hfsplus_reconfigure,</div><div class='add'>+	.free		= hfsplus_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hfsplus_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct hfsplus_sb_info *sbi;</div><div class='add'>+</div><div class='add'>+	sbi = kzalloc(sizeof(struct hfsplus_sb_info), GFP_KERNEL);</div><div class='add'>+	if (!sbi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose != FS_CONTEXT_FOR_RECONFIGURE)</div><div class='add'>+		hfsplus_fill_defaults(sbi);</div><div class='add'>+</div><div class='add'>+	fc-&gt;s_fs_info = sbi;</div><div class='add'>+	fc-&gt;ops = &amp;hfsplus_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hfsplus_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "hfsplus",</div><div class='del'>-	.mount		= hfsplus_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = hfsplus_init_fs_context,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("hfsplus");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/unicode.c<br/>index 73342c925a4b..d3a142f4518b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/unicode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/unicode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/unicode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/unicode.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/nls.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/visibility.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "hfsplus_fs.h"</div><div class='ctx'> #include "hfsplus_raw.h"</div><div class='ctx'> </div><div class='hunk'>@@ -40,6 +43,18 @@ int hfsplus_strcasecmp(const struct hfsplus_unistr *s1,</div><div class='ctx'> 	p1 = s1-&gt;unicode;</div><div class='ctx'> 	p2 = s2-&gt;unicode;</div><div class='ctx'> </div><div class='add'>+	if (len1 &gt; HFSPLUS_MAX_STRLEN) {</div><div class='add'>+		len1 = HFSPLUS_MAX_STRLEN;</div><div class='add'>+		pr_err("invalid length %u has been corrected to %d\n",</div><div class='add'>+			be16_to_cpu(s1-&gt;length), len1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len2 &gt; HFSPLUS_MAX_STRLEN) {</div><div class='add'>+		len2 = HFSPLUS_MAX_STRLEN;</div><div class='add'>+		pr_err("invalid length %u has been corrected to %d\n",</div><div class='add'>+			be16_to_cpu(s2-&gt;length), len2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		c1 = c2 = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +75,7 @@ int hfsplus_strcasecmp(const struct hfsplus_unistr *s1,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_strcasecmp);</div><div class='ctx'> </div><div class='ctx'> /* Compare names as a sequence of 16-bit unsigned integers */</div><div class='ctx'> int hfsplus_strcmp(const struct hfsplus_unistr *s1,</div><div class='hunk'>@@ -74,6 +90,18 @@ int hfsplus_strcmp(const struct hfsplus_unistr *s1,</div><div class='ctx'> 	p1 = s1-&gt;unicode;</div><div class='ctx'> 	p2 = s2-&gt;unicode;</div><div class='ctx'> </div><div class='add'>+	if (len1 &gt; HFSPLUS_MAX_STRLEN) {</div><div class='add'>+		len1 = HFSPLUS_MAX_STRLEN;</div><div class='add'>+		pr_err("invalid length %u has been corrected to %d\n",</div><div class='add'>+			be16_to_cpu(s1-&gt;length), len1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len2 &gt; HFSPLUS_MAX_STRLEN) {</div><div class='add'>+		len2 = HFSPLUS_MAX_STRLEN;</div><div class='add'>+		pr_err("invalid length %u has been corrected to %d\n",</div><div class='add'>+			be16_to_cpu(s2-&gt;length), len2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (len = min(len1, len2); len &gt; 0; len--) {</div><div class='ctx'> 		c1 = be16_to_cpu(*p1);</div><div class='ctx'> 		c2 = be16_to_cpu(*p2);</div><div class='hunk'>@@ -86,7 +114,7 @@ int hfsplus_strcmp(const struct hfsplus_unistr *s1,</div><div class='ctx'> 	return len1 &lt; len2 ? -1 :</div><div class='ctx'> 	       len1 &gt; len2 ? 1 : 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_strcmp);</div><div class='ctx'> </div><div class='ctx'> #define Hangul_SBase	0xac00</div><div class='ctx'> #define Hangul_LBase	0x1100</div><div class='hunk'>@@ -119,9 +147,9 @@ static u16 *hfsplus_compose_lookup(u16 *p, u16 cc)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hfsplus_uni2asc(struct super_block *sb,</div><div class='del'>-		const struct hfsplus_unistr *ustr,</div><div class='del'>-		char *astr, int *len_p)</div><div class='add'>+static int hfsplus_uni2asc(struct super_block *sb,</div><div class='add'>+			   const struct hfsplus_unistr *ustr,</div><div class='add'>+			   int max_len, char *astr, int *len_p)</div><div class='ctx'> {</div><div class='ctx'> 	const hfsplus_unichr *ip;</div><div class='ctx'> 	struct nls_table *nls = HFSPLUS_SB(sb)-&gt;nls;</div><div class='hunk'>@@ -132,7 +160,14 @@ int hfsplus_uni2asc(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	op = astr;</div><div class='ctx'> 	ip = ustr-&gt;unicode;</div><div class='add'>+</div><div class='ctx'> 	ustrlen = be16_to_cpu(ustr-&gt;length);</div><div class='add'>+	if (ustrlen &gt; max_len) {</div><div class='add'>+		ustrlen = max_len;</div><div class='add'>+		pr_err("invalid length %u has been corrected to %d\n",</div><div class='add'>+			be16_to_cpu(ustr-&gt;length), ustrlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	len = *len_p;</div><div class='ctx'> 	ce1 = NULL;</div><div class='ctx'> 	compose = !test_bit(HFSPLUS_SB_NODECOMPOSE, &amp;HFSPLUS_SB(sb)-&gt;flags);</div><div class='hunk'>@@ -249,6 +284,23 @@ out:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+inline int hfsplus_uni2asc_str(struct super_block *sb,</div><div class='add'>+			       const struct hfsplus_unistr *ustr, char *astr,</div><div class='add'>+			       int *len_p)</div><div class='add'>+{</div><div class='add'>+	return hfsplus_uni2asc(sb, ustr, HFSPLUS_MAX_STRLEN, astr, len_p);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_uni2asc_str);</div><div class='add'>+</div><div class='add'>+inline int hfsplus_uni2asc_xattr_str(struct super_block *sb,</div><div class='add'>+				     const struct hfsplus_attr_unistr *ustr,</div><div class='add'>+				     char *astr, int *len_p)</div><div class='add'>+{</div><div class='add'>+	return hfsplus_uni2asc(sb, (const struct hfsplus_unistr *)ustr,</div><div class='add'>+			       HFSPLUS_ATTR_MAX_STRLEN, astr, len_p);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_uni2asc_xattr_str);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Convert one or more ASCII characters into a single unicode character.</div><div class='ctx'>  * Returns the number of ASCII characters corresponding to the unicode char.</div><div class='hunk'>@@ -375,6 +427,7 @@ int hfsplus_asc2uni(struct super_block *sb,</div><div class='ctx'> 		return -ENAMETOOLONG;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_asc2uni);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Hash a string to an integer as appropriate for the HFS+ filesystem.</div><div class='hunk'>@@ -427,6 +480,7 @@ int hfsplus_hash_dentry(const struct dentry *dentry, struct qstr *str)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_hash_dentry);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Compare strings with HFS+ filename ordering.</div><div class='hunk'>@@ -518,3 +572,4 @@ int hfsplus_compare_dentry(const struct dentry *dentry,</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_IF_KUNIT(hfsplus_compare_dentry);</div><div class='head'>diff --git a/fs/hfsplus/unicode_test.c b/fs/hfsplus/unicode_test.c<br/>new file mode 100644<br/>index 000000000000..5a7a6859efe3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/unicode_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/unicode_test.c</a></div><div class='hunk'>@@ -0,0 +1,1579 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * KUnit tests for HFS+ Unicode string operations</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Viacheslav Dubeyko &lt;slava@dubeyko.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;linux/nls.h&gt;</div><div class='add'>+#include &lt;linux/dcache.h&gt;</div><div class='add'>+#include &lt;linux/stringhash.h&gt;</div><div class='add'>+#include "hfsplus_fs.h"</div><div class='add'>+</div><div class='add'>+struct test_mock_string_env {</div><div class='add'>+	struct hfsplus_unistr str1;</div><div class='add'>+	struct hfsplus_unistr str2;</div><div class='add'>+	char *buf;</div><div class='add'>+	u32 buf_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct test_mock_string_env *setup_mock_str_env(u32 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_string_env *env;</div><div class='add'>+</div><div class='add'>+	env = kzalloc(sizeof(struct test_mock_string_env), GFP_KERNEL);</div><div class='add'>+	if (!env)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	env-&gt;buf = kzalloc(buf_size, GFP_KERNEL);</div><div class='add'>+	if (!env-&gt;buf) {</div><div class='add'>+		kfree(env);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	env-&gt;buf_size = buf_size;</div><div class='add'>+</div><div class='add'>+	return env;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_mock_str_env(struct test_mock_string_env *env)</div><div class='add'>+{</div><div class='add'>+	if (env-&gt;buf)</div><div class='add'>+		kfree(env-&gt;buf);</div><div class='add'>+	kfree(env);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper function to create hfsplus_unistr */</div><div class='add'>+static void create_unistr(struct hfsplus_unistr *ustr, const char *ascii_str)</div><div class='add'>+{</div><div class='add'>+	int len = strlen(ascii_str);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(ustr-&gt;unicode, 0, sizeof(ustr-&gt;unicode));</div><div class='add'>+</div><div class='add'>+	ustr-&gt;length = cpu_to_be16(len);</div><div class='add'>+	for (i = 0; i &lt; len &amp;&amp; i &lt; HFSPLUS_MAX_STRLEN; i++)</div><div class='add'>+		ustr-&gt;unicode[i] = cpu_to_be16((u16)ascii_str[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void corrupt_unistr(struct hfsplus_unistr *ustr)</div><div class='add'>+{</div><div class='add'>+	ustr-&gt;length = cpu_to_be16(U16_MAX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfsplus_strcasecmp function */</div><div class='add'>+static void hfsplus_strcasecmp_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	/* Test identical strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "hello");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "hello");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test case insensitive comparison */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "Hello");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "hello");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "HELLO");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "hello");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test different strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "apple");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "banana");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "zebra");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "apple");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test different lengths */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "testing");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "testing");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test empty strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test single characters */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "A");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "a");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "A");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "B");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test maximum length strings */</div><div class='add'>+	memset(mock_env-&gt;buf, 'a', HFSPLUS_MAX_STRLEN);</div><div class='add'>+	mock_env-&gt;buf[HFSPLUS_MAX_STRLEN] = '\0';</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, mock_env-&gt;buf);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, mock_env-&gt;buf);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Change one character in the middle */</div><div class='add'>+	mock_env-&gt;buf[HFSPLUS_MAX_STRLEN / 2] = 'b';</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, mock_env-&gt;buf);</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test corrupted strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "");</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str2);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "testing");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "testing");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str2);</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "testing");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "testing");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str2);</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfsplus_strcmp function (case-sensitive) */</div><div class='add'>+static void hfsplus_strcmp_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	/* Test identical strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "hello");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "hello");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test case sensitive comparison - should NOT be equal */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "Hello");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "hello");</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+	 /* 'H' &lt; 'h' in Unicode */</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test lexicographic ordering */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "apple");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "banana");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "zebra");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "apple");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test different lengths with common prefix */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "testing");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "testing");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test empty strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "");</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test maximum length strings */</div><div class='add'>+	memset(mock_env-&gt;buf, 'a', HFSPLUS_MAX_STRLEN);</div><div class='add'>+	mock_env-&gt;buf[HFSPLUS_MAX_STRLEN] = '\0';</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, mock_env-&gt;buf);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, mock_env-&gt;buf);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Change one character in the middle */</div><div class='add'>+	mock_env-&gt;buf[HFSPLUS_MAX_STRLEN / 2] = 'b';</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, mock_env-&gt;buf);</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test corrupted strings */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "");</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str2);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "testing");</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "testing");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str2);</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "testing");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1);</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "testing");</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str2, "test");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str2);</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test Unicode edge cases */</div><div class='add'>+static void hfsplus_unicode_edge_cases_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	/* Test with special characters */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(3);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16(0x00E9); /* é */</div><div class='add'>+	mock_env-&gt;str1.unicode[1] = cpu_to_be16(0x00F1); /* ñ */</div><div class='add'>+	mock_env-&gt;str1.unicode[2] = cpu_to_be16(0x00FC); /* ü */</div><div class='add'>+</div><div class='add'>+	mock_env-&gt;str2.length = cpu_to_be16(3);</div><div class='add'>+	mock_env-&gt;str2.unicode[0] = cpu_to_be16(0x00E9); /* é */</div><div class='add'>+	mock_env-&gt;str2.unicode[1] = cpu_to_be16(0x00F1); /* ñ */</div><div class='add'>+	mock_env-&gt;str2.unicode[2] = cpu_to_be16(0x00FC); /* ü */</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test with different special characters */</div><div class='add'>+	mock_env-&gt;str2.unicode[1] = cpu_to_be16(0x00F2); /* ò */</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test null characters within string (should be handled correctly) */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(3);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16('a');</div><div class='add'>+	mock_env-&gt;str1.unicode[1] = cpu_to_be16(0x0000); /* null */</div><div class='add'>+	mock_env-&gt;str1.unicode[2] = cpu_to_be16('b');</div><div class='add'>+</div><div class='add'>+	mock_env-&gt;str2.length = cpu_to_be16(3);</div><div class='add'>+	mock_env-&gt;str2.unicode[0] = cpu_to_be16('a');</div><div class='add'>+	mock_env-&gt;str2.unicode[1] = cpu_to_be16(0x0000); /* null */</div><div class='add'>+	mock_env-&gt;str2.unicode[2] = cpu_to_be16('b');</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test boundary conditions */</div><div class='add'>+static void hfsplus_unicode_boundary_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	/* Test maximum length boundary */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(HFSPLUS_MAX_STRLEN);</div><div class='add'>+	mock_env-&gt;str2.length = cpu_to_be16(HFSPLUS_MAX_STRLEN);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HFSPLUS_MAX_STRLEN; i++) {</div><div class='add'>+		mock_env-&gt;str1.unicode[i] = cpu_to_be16('A');</div><div class='add'>+		mock_env-&gt;str2.unicode[i] = cpu_to_be16('A');</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Change last character */</div><div class='add'>+	mock_env-&gt;str2.unicode[HFSPLUS_MAX_STRLEN - 1] = cpu_to_be16('B');</div><div class='add'>+	KUNIT_EXPECT_LT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	/* Test zero length strings */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(0);</div><div class='add'>+	mock_env-&gt;str2.length = cpu_to_be16(0);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						&amp;mock_env-&gt;str2));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						    &amp;mock_env-&gt;str2));</div><div class='add'>+</div><div class='add'>+	/* Test one character vs empty */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(1);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16('A');</div><div class='add'>+	mock_env-&gt;str2.length = cpu_to_be16(0);</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcmp(&amp;mock_env-&gt;str1,</div><div class='add'>+					     &amp;mock_env-&gt;str2), 0);</div><div class='add'>+	KUNIT_EXPECT_GT(test, hfsplus_strcasecmp(&amp;mock_env-&gt;str1,</div><div class='add'>+						 &amp;mock_env-&gt;str2), 0);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Mock superblock and NLS table for testing hfsplus_uni2asc */</div><div class='add'>+struct test_mock_sb {</div><div class='add'>+	struct nls_table nls;</div><div class='add'>+	struct hfsplus_sb_info sb_info;</div><div class='add'>+	struct super_block sb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct test_mock_sb *setup_mock_sb(void)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *ptr;</div><div class='add'>+</div><div class='add'>+	ptr = kzalloc(sizeof(struct test_mock_sb), GFP_KERNEL);</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ptr-&gt;nls.charset = "utf8";</div><div class='add'>+	ptr-&gt;nls.uni2char = NULL; /* Will use default behavior */</div><div class='add'>+	ptr-&gt;sb_info.nls = &amp;ptr-&gt;nls;</div><div class='add'>+	ptr-&gt;sb.s_fs_info = &amp;ptr-&gt;sb_info;</div><div class='add'>+</div><div class='add'>+	/* Set default flags - no decomposition, no case folding */</div><div class='add'>+	clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;ptr-&gt;sb_info.flags);</div><div class='add'>+	clear_bit(HFSPLUS_SB_CASEFOLD, &amp;ptr-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_mock_sb(struct test_mock_sb *ptr)</div><div class='add'>+{</div><div class='add'>+	kfree(ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Simple uni2char implementation for testing */</div><div class='add'>+static int test_uni2char(wchar_t uni, unsigned char *out, int boundlen)</div><div class='add'>+{</div><div class='add'>+	if (boundlen &lt;= 0)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+</div><div class='add'>+	if (uni &lt; 0x80) {</div><div class='add'>+		*out = (unsigned char)uni;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For non-ASCII, just use '?' as fallback */</div><div class='add'>+	*out = '?';</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfsplus_uni2asc basic functionality */</div><div class='add'>+static void hfsplus_uni2asc_basic_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int len, result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.uni2char = test_uni2char;</div><div class='add'>+</div><div class='add'>+	/* Test simple ASCII string conversion */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "hello");</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 5, len);</div><div class='add'>+	KUNIT_EXPECT_STREQ(test, "hello", mock_env-&gt;buf);</div><div class='add'>+</div><div class='add'>+	/* Test empty string */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "");</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, len);</div><div class='add'>+</div><div class='add'>+	/* Test single character */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "A");</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, len);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'A', mock_env-&gt;buf[0]);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test special character handling */</div><div class='add'>+static void hfsplus_uni2asc_special_chars_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int len, result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.uni2char = test_uni2char;</div><div class='add'>+</div><div class='add'>+	/* Test null character conversion (should become 0x2400) */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(1);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16(0x0000);</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, len);</div><div class='add'>+	/* Our test implementation returns '?' for non-ASCII */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '?', mock_env-&gt;buf[0]);</div><div class='add'>+</div><div class='add'>+	/* Test forward slash conversion (should become colon) */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(1);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16('/');</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, len);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, ':', mock_env-&gt;buf[0]);</div><div class='add'>+</div><div class='add'>+	/* Test string with mixed special characters */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(3);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16('a');</div><div class='add'>+	mock_env-&gt;str1.unicode[1] = cpu_to_be16('/');</div><div class='add'>+	mock_env-&gt;str1.unicode[2] = cpu_to_be16('b');</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 3, len);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'a', mock_env-&gt;buf[0]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, ':', mock_env-&gt;buf[1]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'b', mock_env-&gt;buf[2]);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test buffer length handling */</div><div class='add'>+static void hfsplus_uni2asc_buffer_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int len, result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(10);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.uni2char = test_uni2char;</div><div class='add'>+</div><div class='add'>+	/* Test insufficient buffer space */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "toolongstring");</div><div class='add'>+	len = 5; /* Buffer too small */</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENAMETOOLONG, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 5, len); /* Should be set to consumed length */</div><div class='add'>+</div><div class='add'>+	/* Test exact buffer size */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "exact");</div><div class='add'>+	len = 5;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 5, len);</div><div class='add'>+</div><div class='add'>+	/* Test zero length buffer */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	len = 0;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENAMETOOLONG, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, len);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test corrupted unicode string handling */</div><div class='add'>+static void hfsplus_uni2asc_corrupted_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int len, result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.uni2char = test_uni2char;</div><div class='add'>+</div><div class='add'>+	/* Test corrupted length (too large) */</div><div class='add'>+	create_unistr(&amp;mock_env-&gt;str1, "test");</div><div class='add'>+	corrupt_unistr(&amp;mock_env-&gt;str1); /* Sets length to U16_MAX */</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	/* Should still work but with corrected length */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	/*</div><div class='add'>+	 * Length should be corrected to HFSPLUS_MAX_STRLEN</div><div class='add'>+	 * and processed accordingly</div><div class='add'>+	 */</div><div class='add'>+	KUNIT_EXPECT_GT(test, len, 0);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test edge cases and boundary conditions */</div><div class='add'>+static void hfsplus_uni2asc_edge_cases_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int len, result;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN * 2);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.uni2char = test_uni2char;</div><div class='add'>+</div><div class='add'>+	/* Test maximum length string */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(HFSPLUS_MAX_STRLEN);</div><div class='add'>+	for (i = 0; i &lt; HFSPLUS_MAX_STRLEN; i++)</div><div class='add'>+		mock_env-&gt;str1.unicode[i] = cpu_to_be16('a');</div><div class='add'>+</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, HFSPLUS_MAX_STRLEN, len);</div><div class='add'>+</div><div class='add'>+	/* Verify all characters are 'a' */</div><div class='add'>+	for (i = 0; i &lt; HFSPLUS_MAX_STRLEN; i++)</div><div class='add'>+		KUNIT_EXPECT_EQ(test, 'a', mock_env-&gt;buf[i]);</div><div class='add'>+</div><div class='add'>+	/* Test string with high Unicode values (non-ASCII) */</div><div class='add'>+	mock_env-&gt;str1.length = cpu_to_be16(3);</div><div class='add'>+	mock_env-&gt;str1.unicode[0] = cpu_to_be16(0x00E9); /* é */</div><div class='add'>+	mock_env-&gt;str1.unicode[1] = cpu_to_be16(0x00F1); /* ñ */</div><div class='add'>+	mock_env-&gt;str1.unicode[2] = cpu_to_be16(0x00FC); /* ü */</div><div class='add'>+	len = mock_env-&gt;buf_size;</div><div class='add'>+	result = hfsplus_uni2asc_str(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				     mock_env-&gt;buf, &amp;len);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 3, len);</div><div class='add'>+	/* Our test implementation converts non-ASCII to '?' */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '?', mock_env-&gt;buf[0]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '?', mock_env-&gt;buf[1]);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '?', mock_env-&gt;buf[2]);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Simple char2uni implementation for testing */</div><div class='add'>+static int test_char2uni(const unsigned char *rawstring,</div><div class='add'>+			 int boundlen, wchar_t *uni)</div><div class='add'>+{</div><div class='add'>+	if (boundlen &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*uni = (wchar_t)*rawstring;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper function to check unicode string contents */</div><div class='add'>+static void check_unistr_content(struct kunit *test,</div><div class='add'>+				 struct hfsplus_unistr *ustr,</div><div class='add'>+				 const char *expected_ascii)</div><div class='add'>+{</div><div class='add'>+	int expected_len = strlen(expected_ascii);</div><div class='add'>+	int actual_len = be16_to_cpu(ustr-&gt;length);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, expected_len, actual_len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; expected_len &amp;&amp; i &lt; actual_len; i++) {</div><div class='add'>+		u16 expected_char = (u16)expected_ascii[i];</div><div class='add'>+		u16 actual_char = be16_to_cpu(ustr-&gt;unicode[i]);</div><div class='add'>+</div><div class='add'>+		KUNIT_EXPECT_EQ(test, expected_char, actual_char);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfsplus_asc2uni basic functionality */</div><div class='add'>+static void hfsplus_asc2uni_basic_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test simple ASCII string conversion */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "hello", 5);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;mock_env-&gt;str1, "hello");</div><div class='add'>+</div><div class='add'>+	/* Test empty string */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "", 0);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+</div><div class='add'>+	/* Test single character */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "A", 1);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;mock_env-&gt;str1, "A");</div><div class='add'>+</div><div class='add'>+	/* Test null-terminated string with explicit length */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "test\0extra", 4);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;mock_env-&gt;str1, "test");</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test special character handling in asc2uni */</div><div class='add'>+static void hfsplus_asc2uni_special_chars_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test colon conversion (should become forward slash) */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, ":", 1);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 1, be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '/', be16_to_cpu(mock_env-&gt;str1.unicode[0]));</div><div class='add'>+</div><div class='add'>+	/* Test string with mixed special characters */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "a:b", 3);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 3, be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'a', be16_to_cpu(mock_env-&gt;str1.unicode[0]));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '/', be16_to_cpu(mock_env-&gt;str1.unicode[1]));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'b', be16_to_cpu(mock_env-&gt;str1.unicode[2]));</div><div class='add'>+</div><div class='add'>+	/* Test multiple special characters */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, ":::", 3);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 3, be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '/', be16_to_cpu(mock_env-&gt;str1.unicode[0]));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '/', be16_to_cpu(mock_env-&gt;str1.unicode[1]));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, '/', be16_to_cpu(mock_env-&gt;str1.unicode[2]));</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test buffer length limits */</div><div class='add'>+static void hfsplus_asc2uni_buffer_limits_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 10);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test exact maximum length */</div><div class='add'>+	memset(mock_env-&gt;buf, 'a', HFSPLUS_MAX_STRLEN);</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;mock_env-&gt;str1, HFSPLUS_MAX_STRLEN,</div><div class='add'>+				 mock_env-&gt;buf, HFSPLUS_MAX_STRLEN);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, HFSPLUS_MAX_STRLEN,</div><div class='add'>+			be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+</div><div class='add'>+	/* Test exceeding maximum length */</div><div class='add'>+	memset(mock_env-&gt;buf, 'a', HFSPLUS_MAX_STRLEN + 5);</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;mock_env-&gt;str1, HFSPLUS_MAX_STRLEN,</div><div class='add'>+				 mock_env-&gt;buf, HFSPLUS_MAX_STRLEN + 5);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENAMETOOLONG, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, HFSPLUS_MAX_STRLEN,</div><div class='add'>+			be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+</div><div class='add'>+	/* Test with smaller max_unistr_len */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;mock_env-&gt;str1, 5, "toolongstring", 13);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENAMETOOLONG, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 5, be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+</div><div class='add'>+	/* Test zero max length */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1, 0, "test", 4);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, -ENAMETOOLONG, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, be16_to_cpu(mock_env-&gt;str1.length));</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test error handling and edge cases */</div><div class='add'>+static void hfsplus_asc2uni_edge_cases_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct hfsplus_unistr ustr;</div><div class='add'>+	char test_str[] = {'a', '\0', 'b'};</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test zero length input */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;ustr, HFSPLUS_MAX_STRLEN, "test", 0);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, be16_to_cpu(ustr.length));</div><div class='add'>+</div><div class='add'>+	/* Test input with length mismatch */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;ustr, HFSPLUS_MAX_STRLEN, "hello", 3);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;ustr, "hel");</div><div class='add'>+</div><div class='add'>+	/* Test with various printable ASCII characters */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;ustr, HFSPLUS_MAX_STRLEN, "ABC123!@#", 9);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;ustr, "ABC123!@#");</div><div class='add'>+</div><div class='add'>+	/* Test null character in the middle */</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb,</div><div class='add'>+				 &amp;ustr, HFSPLUS_MAX_STRLEN, test_str, 3);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 3, be16_to_cpu(ustr.length));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'a', be16_to_cpu(ustr.unicode[0]));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, be16_to_cpu(ustr.unicode[1]));</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 'b', be16_to_cpu(ustr.unicode[2]));</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test decomposition flag behavior */</div><div class='add'>+static void hfsplus_asc2uni_decompose_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test with decomposition disabled (default) */</div><div class='add'>+	clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str1,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "test", 4);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;mock_env-&gt;str1, "test");</div><div class='add'>+</div><div class='add'>+	/* Test with decomposition enabled */</div><div class='add'>+	set_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+	result = hfsplus_asc2uni(&amp;mock_sb-&gt;sb, &amp;mock_env-&gt;str2,</div><div class='add'>+				 HFSPLUS_MAX_STRLEN, "test", 4);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	check_unistr_content(test, &amp;mock_env-&gt;str2, "test");</div><div class='add'>+</div><div class='add'>+	/* For simple ASCII, both should produce the same result */</div><div class='add'>+	KUNIT_EXPECT_EQ(test,</div><div class='add'>+			be16_to_cpu(mock_env-&gt;str1.length),</div><div class='add'>+			be16_to_cpu(mock_env-&gt;str2.length));</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Mock dentry for testing hfsplus_hash_dentry */</div><div class='add'>+static struct dentry test_dentry;</div><div class='add'>+</div><div class='add'>+static void setup_mock_dentry(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;test_dentry, 0, sizeof(test_dentry));</div><div class='add'>+	test_dentry.d_sb = sb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper function to create qstr */</div><div class='add'>+static void create_qstr(struct qstr *str, const char *name)</div><div class='add'>+{</div><div class='add'>+	str-&gt;name = name;</div><div class='add'>+	str-&gt;len = strlen(name);</div><div class='add'>+	str-&gt;hash = 0; /* Will be set by hash function */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfsplus_hash_dentry basic functionality */</div><div class='add'>+static void hfsplus_hash_dentry_basic_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr str1, str2;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test basic string hashing */</div><div class='add'>+	create_qstr(&amp;str1, "hello");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, str1.hash);</div><div class='add'>+</div><div class='add'>+	/* Test that identical strings produce identical hashes */</div><div class='add'>+	create_qstr(&amp;str2, "hello");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	/* Test empty string */</div><div class='add'>+	create_qstr(&amp;str1, "");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+</div><div class='add'>+	/* Empty string should still produce a hash */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test single character */</div><div class='add'>+	create_qstr(&amp;str1, "A");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, str1.hash);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test case folding behavior in hash */</div><div class='add'>+static void hfsplus_hash_dentry_casefold_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr str1, str2;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test with case folding disabled (default) */</div><div class='add'>+	clear_bit(HFSPLUS_SB_CASEFOLD, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str1, "Hello");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "hello");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Without case folding, different cases</div><div class='add'>+	 * should produce different hashes</div><div class='add'>+	 */</div><div class='add'>+	KUNIT_EXPECT_NE(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	/* Test with case folding enabled */</div><div class='add'>+	set_bit(HFSPLUS_SB_CASEFOLD, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str1, "Hello");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "hello");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* With case folding, different cases should produce same hash */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	/* Test mixed case */</div><div class='add'>+	create_qstr(&amp;str1, "HeLLo");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test special character handling in hash */</div><div class='add'>+static void hfsplus_hash_dentry_special_chars_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr str1, str2;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test colon conversion (: becomes /) */</div><div class='add'>+	create_qstr(&amp;str1, "file:name");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "file/name");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* After conversion, these should produce the same hash */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	/* Test multiple special characters */</div><div class='add'>+	create_qstr(&amp;str1, ":::");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "///");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test decomposition flag behavior in hash */</div><div class='add'>+static void hfsplus_hash_dentry_decompose_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr str1, str2;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test with decomposition disabled (default) */</div><div class='add'>+	clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str1, "test");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test with decomposition enabled */</div><div class='add'>+	set_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "test");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For simple ASCII, decomposition shouldn't change</div><div class='add'>+	 * the hash much but the function should still work correctly</div><div class='add'>+	 */</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, str2.hash);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hash consistency and distribution */</div><div class='add'>+static void hfsplus_hash_dentry_consistency_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr str1, str2, str3;</div><div class='add'>+	unsigned long hash1;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test that same string always produces same hash */</div><div class='add'>+	create_qstr(&amp;str1, "consistent");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	hash1 = str1.hash;</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "consistent");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, hash1, str2.hash);</div><div class='add'>+</div><div class='add'>+	/* Test that different strings produce different hashes */</div><div class='add'>+	create_qstr(&amp;str3, "different");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str3);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_NE(test, str1.hash, str3.hash);</div><div class='add'>+</div><div class='add'>+	/* Test similar strings should have different hashes */</div><div class='add'>+	create_qstr(&amp;str1, "file1");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str2, "file2");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str2);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_NE(test, str1.hash, str2.hash);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test edge cases and boundary conditions */</div><div class='add'>+static void hfsplus_hash_dentry_edge_cases_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct test_mock_string_env *mock_env;</div><div class='add'>+	struct qstr str;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_env = setup_mock_str_env(HFSPLUS_MAX_STRLEN + 1);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_env);</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test very long filename */</div><div class='add'>+	memset(mock_env-&gt;buf, 'a', mock_env-&gt;buf_size - 1);</div><div class='add'>+	mock_env-&gt;buf[mock_env-&gt;buf_size - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;str, mock_env-&gt;buf);</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, str.hash);</div><div class='add'>+</div><div class='add'>+	/* Test filename with all printable ASCII characters */</div><div class='add'>+	create_qstr(&amp;str, "!@#$%^&amp;*()_+-=[]{}|;':\",./&lt;&gt;?");</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, str.hash);</div><div class='add'>+</div><div class='add'>+	/* Test with embedded null (though not typical for filenames) */</div><div class='add'>+	str.name = "file\0hidden";</div><div class='add'>+	str.len = 11; /* Include the null and text after it */</div><div class='add'>+	str.hash = 0;</div><div class='add'>+	result = hfsplus_hash_dentry(&amp;test_dentry, &amp;str);</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, str.hash);</div><div class='add'>+</div><div class='add'>+	free_mock_str_env(mock_env);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test hfsplus_compare_dentry basic functionality */</div><div class='add'>+static void hfsplus_compare_dentry_basic_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test identical strings */</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "hello", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test different strings - lexicographic order */</div><div class='add'>+	create_qstr(&amp;name, "world");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "hello", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0); /* "hello" &lt; "world" */</div><div class='add'>+</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "world", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "world", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_GT(test, result, 0); /* "world" &gt; "hello" */</div><div class='add'>+</div><div class='add'>+	/* Test empty strings */</div><div class='add'>+	create_qstr(&amp;name, "");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 0, "", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test one empty, one non-empty */</div><div class='add'>+	create_qstr(&amp;name, "test");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 0, "", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0); /* "" &lt; "test" */</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "test", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_GT(test, result, 0); /* "test" &gt; "" */</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test case folding behavior in comparison */</div><div class='add'>+static void hfsplus_compare_dentry_casefold_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test with case folding disabled (default) */</div><div class='add'>+	clear_bit(HFSPLUS_SB_CASEFOLD, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "Hello", &amp;name);</div><div class='add'>+	/* Case sensitive: "Hello" != "hello" */</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "Hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "hello", &amp;name);</div><div class='add'>+	/* Case sensitive: "hello" != "Hello" */</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test with case folding enabled */</div><div class='add'>+	set_bit(HFSPLUS_SB_CASEFOLD, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "Hello", &amp;name);</div><div class='add'>+	/* Case insensitive: "Hello" == "hello" */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "Hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "hello", &amp;name);</div><div class='add'>+	/* Case insensitive: "hello" == "Hello" */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test mixed case */</div><div class='add'>+	create_qstr(&amp;name, "TeSt");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "test", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "test");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "TEST", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test special character handling in comparison */</div><div class='add'>+static void hfsplus_compare_dentry_special_chars_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test colon conversion (: becomes /) */</div><div class='add'>+	create_qstr(&amp;name, "file/name");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 9, "file:name", &amp;name);</div><div class='add'>+	/* "file:name" == "file/name" after conversion */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "file:name");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 9, "file/name", &amp;name);</div><div class='add'>+	/* "file/name" == "file:name" after conversion */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test multiple special characters */</div><div class='add'>+	create_qstr(&amp;name, "///");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 3, ":::", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test mixed special and regular characters */</div><div class='add'>+	create_qstr(&amp;name, "a/b:c");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "a:b/c", &amp;name);</div><div class='add'>+	/* Both become "a/b/c" after conversion */</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test length differences */</div><div class='add'>+static void hfsplus_compare_dentry_length_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test different lengths with common prefix */</div><div class='add'>+	create_qstr(&amp;name, "testing");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "test", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0); /* "test" &lt; "testing" */</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "test");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 7, "testing", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_GT(test, result, 0); /* "testing" &gt; "test" */</div><div class='add'>+</div><div class='add'>+	/* Test exact length match */</div><div class='add'>+	create_qstr(&amp;name, "exact");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "exact", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test length parameter vs actual string content */</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 3, "hel", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0); /* "hel" &lt; "hello" */</div><div class='add'>+</div><div class='add'>+	/* Test longer first string but shorter length parameter */</div><div class='add'>+	create_qstr(&amp;name, "hi");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 2, "hello", &amp;name);</div><div class='add'>+	/* "he" &lt; "hi" (only first 2 chars compared) */</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test decomposition flag behavior */</div><div class='add'>+static void hfsplus_compare_dentry_decompose_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test with decomposition disabled (default) */</div><div class='add'>+	clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "test");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "test", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test with decomposition enabled */</div><div class='add'>+	set_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "test");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "test", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* For simple ASCII, decomposition shouldn't affect the result */</div><div class='add'>+	create_qstr(&amp;name, "different");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 4, "test", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, result);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test edge cases and boundary conditions */</div><div class='add'>+static void hfsplus_compare_dentry_edge_cases_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	char *long_str;</div><div class='add'>+	char *long_str2;</div><div class='add'>+	u32 str_size = HFSPLUS_MAX_STRLEN + 1;</div><div class='add'>+	struct qstr null_name = {</div><div class='add'>+		.name = "a\0b",</div><div class='add'>+		.len = 3,</div><div class='add'>+		.hash = 0</div><div class='add'>+	};</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	long_str = kzalloc(str_size, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, long_str);</div><div class='add'>+</div><div class='add'>+	long_str2 = kzalloc(str_size, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, long_str2);</div><div class='add'>+</div><div class='add'>+	/* Test very long strings */</div><div class='add'>+	memset(long_str, 'a', str_size - 1);</div><div class='add'>+	long_str[str_size - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, long_str);</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, str_size - 1,</div><div class='add'>+					long_str, &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test with difference at the end of long strings */</div><div class='add'>+	memset(long_str2, 'a', str_size - 1);</div><div class='add'>+	long_str2[str_size - 1] = '\0';</div><div class='add'>+	long_str2[str_size - 2] = 'b';</div><div class='add'>+	create_qstr(&amp;name, long_str2);</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, str_size - 1,</div><div class='add'>+					long_str, &amp;name);</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0); /* 'a' &lt; 'b' */</div><div class='add'>+</div><div class='add'>+	/* Test single character differences */</div><div class='add'>+	create_qstr(&amp;name, "b");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 1, "a", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_LT(test, result, 0); /* 'a' &lt; 'b' */</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "a");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 1, "b", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_GT(test, result, 0); /* 'b' &gt; 'a' */</div><div class='add'>+</div><div class='add'>+	/* Test with null characters in the middle */</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 3, "a\0b", &amp;null_name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test all printable ASCII characters */</div><div class='add'>+	create_qstr(&amp;name, "!@#$%^&amp;*()");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 10, "!@#$%^&amp;*()", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	kfree(long_str);</div><div class='add'>+	kfree(long_str2);</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test combined flag behaviors */</div><div class='add'>+static void hfsplus_compare_dentry_combined_flags_test(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct test_mock_sb *mock_sb;</div><div class='add'>+	struct qstr name;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mock_sb = setup_mock_sb();</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, mock_sb);</div><div class='add'>+</div><div class='add'>+	setup_mock_dentry(&amp;mock_sb-&gt;sb);</div><div class='add'>+	mock_sb-&gt;nls.char2uni = test_char2uni;</div><div class='add'>+</div><div class='add'>+	/* Test with both casefold and decompose enabled */</div><div class='add'>+	set_bit(HFSPLUS_SB_CASEFOLD, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+	set_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "HELLO", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test special chars with case folding */</div><div class='add'>+	create_qstr(&amp;name, "File/Name");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 9, "file:name", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	/* Test with both flags disabled */</div><div class='add'>+	clear_bit(HFSPLUS_SB_CASEFOLD, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+	clear_bit(HFSPLUS_SB_NODECOMPOSE, &amp;mock_sb-&gt;sb_info.flags);</div><div class='add'>+</div><div class='add'>+	create_qstr(&amp;name, "hello");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 5, "HELLO", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_NE(test, 0, result); /* Case sensitive */</div><div class='add'>+</div><div class='add'>+	/* But special chars should still be converted */</div><div class='add'>+	create_qstr(&amp;name, "file/name");</div><div class='add'>+	result = hfsplus_compare_dentry(&amp;test_dentry, 9, "file:name", &amp;name);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, 0, result);</div><div class='add'>+</div><div class='add'>+	free_mock_sb(mock_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case hfsplus_unicode_test_cases[] = {</div><div class='add'>+	KUNIT_CASE(hfsplus_strcasecmp_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_strcmp_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_unicode_edge_cases_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_unicode_boundary_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_uni2asc_basic_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_uni2asc_special_chars_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_uni2asc_buffer_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_uni2asc_corrupted_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_uni2asc_edge_cases_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_asc2uni_basic_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_asc2uni_special_chars_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_asc2uni_buffer_limits_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_asc2uni_edge_cases_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_asc2uni_decompose_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_hash_dentry_basic_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_hash_dentry_casefold_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_hash_dentry_special_chars_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_hash_dentry_decompose_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_hash_dentry_consistency_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_hash_dentry_edge_cases_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_basic_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_casefold_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_special_chars_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_length_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_decompose_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_edge_cases_test),</div><div class='add'>+	KUNIT_CASE(hfsplus_compare_dentry_combined_flags_test),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite hfsplus_unicode_test_suite = {</div><div class='add'>+	.name = "hfsplus_unicode",</div><div class='add'>+	.test_cases = hfsplus_unicode_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(hfsplus_unicode_test_suite);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("KUnit tests for HFS+ Unicode string operations");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");</div><div class='head'>diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c<br/>index b0cb70400996..30cf4fe78b3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/wrapper.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/wrapper.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/wrapper.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/wrapper.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hfsplus_fs.h"</div><div class='ctx'> #include "hfsplus_raw.h"</div><div class='hunk'>@@ -30,7 +30,7 @@ struct hfsplus_wd {</div><div class='ctx'>  * @sector: block to read or write, for blocks of HFSPLUS_SECTOR_SIZE bytes</div><div class='ctx'>  * @buf: buffer for I/O</div><div class='ctx'>  * @data: output pointer for location of requested data</div><div class='del'>- * @opf: request op flags</div><div class='add'>+ * @opf: I/O operation type and flags</div><div class='ctx'>  *</div><div class='ctx'>  * The unit of I/O is hfsplus_min_io_size(sb), which may be bigger than</div><div class='ctx'>  * HFSPLUS_SECTOR_SIZE, and @buf must be sized accordingly. On reads</div><div class='hunk'>@@ -48,47 +48,19 @@ struct hfsplus_wd {</div><div class='ctx'> int hfsplus_submit_bio(struct super_block *sb, sector_t sector,</div><div class='ctx'> 		       void *buf, void **data, blk_opf_t opf)</div><div class='ctx'> {</div><div class='del'>-	const enum req_op op = opf &amp; REQ_OP_MASK;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u64 io_size;</div><div class='del'>-	loff_t start;</div><div class='del'>-	int offset;</div><div class='add'>+	u64 io_size = hfsplus_min_io_size(sb);</div><div class='add'>+	loff_t start = (loff_t)sector &lt;&lt; HFSPLUS_SECTOR_SHIFT;</div><div class='add'>+	int offset = start &amp; (io_size - 1);</div><div class='add'>+</div><div class='add'>+	if ((opf &amp; REQ_OP_MASK) != REQ_OP_WRITE &amp;&amp; data)</div><div class='add'>+		*data = (u8 *)buf + offset;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Align sector to hardware sector size and find offset. We</div><div class='del'>-	 * assume that io_size is a power of two, which _should_</div><div class='del'>-	 * be true.</div><div class='add'>+	 * Align sector to hardware sector size and find offset. We assume that</div><div class='add'>+	 * io_size is a power of two, which _should_ be true.</div><div class='ctx'> 	 */</div><div class='del'>-	io_size = hfsplus_min_io_size(sb);</div><div class='del'>-	start = (loff_t)sector &lt;&lt; HFSPLUS_SECTOR_SHIFT;</div><div class='del'>-	offset = start &amp; (io_size - 1);</div><div class='ctx'> 	sector &amp;= ~((io_size &gt;&gt; HFSPLUS_SECTOR_SHIFT) - 1);</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc(sb-&gt;s_bdev, 1, opf, GFP_NOIO);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector = sector;</div><div class='del'>-</div><div class='del'>-	if (op != REQ_OP_WRITE &amp;&amp; data)</div><div class='del'>-		*data = (u8 *)buf + offset;</div><div class='del'>-</div><div class='del'>-	while (io_size &gt; 0) {</div><div class='del'>-		unsigned int page_offset = offset_in_page(buf);</div><div class='del'>-		unsigned int len = min_t(unsigned int, PAGE_SIZE - page_offset,</div><div class='del'>-					 io_size);</div><div class='del'>-</div><div class='del'>-		ret = bio_add_page(bio, virt_to_page(buf), len, page_offset);</div><div class='del'>-		if (ret != len) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		io_size -= len;</div><div class='del'>-		buf = (u8 *)buf + len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = submit_bio_wait(bio);</div><div class='del'>-out:</div><div class='del'>-	bio_put(bio);</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='add'>+	return bdev_rw_virt(sb-&gt;s_bdev, sector, buf, io_size, opf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hfsplus_read_mdb(void *bufptr, struct hfsplus_wd *wd)</div><div class='hunk'>@@ -172,6 +144,8 @@ int hfsplus_read_wrapper(struct super_block *sb)</div><div class='ctx'> 	if (!blocksize)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;min_io_size = blocksize;</div><div class='add'>+</div><div class='ctx'> 	if (hfsplus_get_last_session(sb, &amp;part_start, &amp;part_size))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c<br/>index 9c9ff6b8c6f7..da95a9de9a65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hfsplus/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hfsplus/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hfsplus/xattr.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static void hfsplus_init_header_node(struct inode *attr_file,</div><div class='ctx'> 	u32 used_bmp_bytes;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(ATTR_MOD, "init_hdr_attr_file: clump %u, node_size %u\n",</div><div class='add'>+	hfs_dbg("clump %u, node_size %u\n",</div><div class='ctx'> 		clump_size, node_size);</div><div class='ctx'> </div><div class='ctx'> 	/* The end of the node contains list of record offsets */</div><div class='hunk'>@@ -132,7 +132,7 @@ static int hfsplus_create_attributes_file(struct super_block *sb)</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	int old_state = HFSPLUS_EMPTY_ATTR_TREE;</div><div class='ctx'> </div><div class='del'>-	hfs_dbg(ATTR_MOD, "create_attr_file: ino %d\n", HFSPLUS_ATTR_CNID);</div><div class='add'>+	hfs_dbg("ino %d\n", HFSPLUS_ATTR_CNID);</div><div class='ctx'> </div><div class='ctx'> check_attr_tree_state_again:</div><div class='ctx'> 	switch (atomic_read(&amp;sbi-&gt;attr_tree_state)) {</div><div class='hunk'>@@ -172,7 +172,11 @@ check_attr_tree_state_again:</div><div class='ctx'> 		return PTR_ERR(attr_file);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(i_size_read(attr_file) != 0);</div><div class='add'>+	if (i_size_read(attr_file) != 0) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		pr_err("detected inconsistent attributes file, running fsck.hfsplus is recommended.\n");</div><div class='add'>+		goto end_attr_file_creation;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hip = HFSPLUS_I(attr_file);</div><div class='ctx'> </div><div class='hunk'>@@ -261,10 +265,8 @@ int __hfsplus_setxattr(struct inode *inode, const char *name,</div><div class='ctx'> 	struct hfs_find_data cat_fd;</div><div class='ctx'> 	hfsplus_cat_entry entry;</div><div class='ctx'> 	u16 cat_entry_flags, cat_entry_type;</div><div class='del'>-	u16 folder_finderinfo_len = sizeof(struct DInfo) +</div><div class='del'>-					sizeof(struct DXInfo);</div><div class='del'>-	u16 file_finderinfo_len = sizeof(struct FInfo) +</div><div class='del'>-					sizeof(struct FXInfo);</div><div class='add'>+	u16 folder_finderinfo_len = sizeof(DInfo) + sizeof(DXInfo);</div><div class='add'>+	u16 file_finderinfo_len = sizeof(FInfo) + sizeof(FXInfo);</div><div class='ctx'> </div><div class='ctx'> 	if ((!S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='ctx'> 			!S_ISDIR(inode-&gt;i_mode)) ||</div><div class='hunk'>@@ -400,21 +402,19 @@ static int name_len(const char *xattr_name, int xattr_name_len)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_name(char *buffer, const char *xattr_name, int name_len)</div><div class='add'>+static ssize_t copy_name(char *buffer, const char *xattr_name, int name_len)</div><div class='ctx'> {</div><div class='del'>-	int len = name_len;</div><div class='del'>-	int offset = 0;</div><div class='del'>-</div><div class='del'>-	if (!is_known_namespace(xattr_name)) {</div><div class='del'>-		memcpy(buffer, XATTR_MAC_OSX_PREFIX, XATTR_MAC_OSX_PREFIX_LEN);</div><div class='del'>-		offset += XATTR_MAC_OSX_PREFIX_LEN;</div><div class='del'>-		len += XATTR_MAC_OSX_PREFIX_LEN;</div><div class='del'>-	}</div><div class='add'>+	ssize_t len;</div><div class='ctx'> </div><div class='del'>-	strncpy(buffer + offset, xattr_name, name_len);</div><div class='del'>-	memset(buffer + offset + name_len, 0, 1);</div><div class='del'>-	len += 1;</div><div class='add'>+	if (!is_known_namespace(xattr_name))</div><div class='add'>+		len = scnprintf(buffer, name_len + XATTR_MAC_OSX_PREFIX_LEN,</div><div class='add'>+				 "%s%s", XATTR_MAC_OSX_PREFIX, xattr_name);</div><div class='add'>+	else</div><div class='add'>+		len = strscpy(buffer, xattr_name, name_len + 1);</div><div class='ctx'> </div><div class='add'>+	/* include NUL-byte in length for non-empty name */</div><div class='add'>+	if (len &gt;= 0)</div><div class='add'>+		len++;</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -442,11 +442,11 @@ static ssize_t hfsplus_getxattr_finder_info(struct inode *inode,</div><div class='ctx'> 	ssize_t res = 0;</div><div class='ctx'> 	struct hfs_find_data fd;</div><div class='ctx'> 	u16 entry_type;</div><div class='del'>-	u16 folder_rec_len = sizeof(struct DInfo) + sizeof(struct DXInfo);</div><div class='del'>-	u16 file_rec_len = sizeof(struct FInfo) + sizeof(struct FXInfo);</div><div class='add'>+	u16 folder_rec_len = sizeof(DInfo) + sizeof(DXInfo);</div><div class='add'>+	u16 file_rec_len = sizeof(FInfo) + sizeof(FXInfo);</div><div class='ctx'> 	u16 record_len = max(folder_rec_len, file_rec_len);</div><div class='del'>-	u8 folder_finder_info[sizeof(struct DInfo) + sizeof(struct DXInfo)];</div><div class='del'>-	u8 file_finder_info[sizeof(struct FInfo) + sizeof(struct FXInfo)];</div><div class='add'>+	u8 folder_finder_info[sizeof(DInfo) + sizeof(DXInfo)];</div><div class='add'>+	u8 file_finder_info[sizeof(FInfo) + sizeof(FXInfo)];</div><div class='ctx'> </div><div class='ctx'> 	if (size &gt;= record_len) {</div><div class='ctx'> 		res = hfs_find_init(HFSPLUS_SB(inode-&gt;i_sb)-&gt;cat_tree, &amp;fd);</div><div class='hunk'>@@ -610,8 +610,8 @@ static ssize_t hfsplus_listxattr_finder_info(struct dentry *dentry,</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct hfs_find_data fd;</div><div class='ctx'> 	u16 entry_type;</div><div class='del'>-	u8 folder_finder_info[sizeof(struct DInfo) + sizeof(struct DXInfo)];</div><div class='del'>-	u8 file_finder_info[sizeof(struct FInfo) + sizeof(struct FXInfo)];</div><div class='add'>+	u8 folder_finder_info[sizeof(DInfo) + sizeof(DXInfo)];</div><div class='add'>+	u8 file_finder_info[sizeof(FInfo) + sizeof(FXInfo)];</div><div class='ctx'> 	unsigned long len, found_bit;</div><div class='ctx'> 	int xattr_name_len, symbols_count;</div><div class='ctx'> </div><div class='hunk'>@@ -627,14 +627,14 @@ static ssize_t hfsplus_listxattr_finder_info(struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 	entry_type = hfs_bnode_read_u16(fd.bnode, fd.entryoffset);</div><div class='ctx'> 	if (entry_type == HFSPLUS_FOLDER) {</div><div class='del'>-		len = sizeof(struct DInfo) + sizeof(struct DXInfo);</div><div class='add'>+		len = sizeof(DInfo) + sizeof(DXInfo);</div><div class='ctx'> 		hfs_bnode_read(fd.bnode, folder_finder_info,</div><div class='ctx'> 				fd.entryoffset +</div><div class='ctx'> 				offsetof(struct hfsplus_cat_folder, user_info),</div><div class='ctx'> 				len);</div><div class='ctx'> 		found_bit = find_first_bit((void *)folder_finder_info, len*8);</div><div class='ctx'> 	} else if (entry_type == HFSPLUS_FILE) {</div><div class='del'>-		len = sizeof(struct FInfo) + sizeof(struct FXInfo);</div><div class='add'>+		len = sizeof(FInfo) + sizeof(FXInfo);</div><div class='ctx'> 		hfs_bnode_read(fd.bnode, file_finder_info,</div><div class='ctx'> 				fd.entryoffset +</div><div class='ctx'> 				offsetof(struct hfsplus_cat_file, user_info),</div><div class='hunk'>@@ -698,7 +698,7 @@ ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strbuf = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN +</div><div class='add'>+	strbuf = kzalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN +</div><div class='ctx'> 			XATTR_MAC_OSX_PREFIX_LEN + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!strbuf) {</div><div class='ctx'> 		res = -ENOMEM;</div><div class='hunk'>@@ -733,9 +733,9 @@ ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size)</div><div class='ctx'> 			goto end_listxattr;</div><div class='ctx'> </div><div class='ctx'> 		xattr_name_len = NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN;</div><div class='del'>-		if (hfsplus_uni2asc(inode-&gt;i_sb,</div><div class='del'>-			(const struct hfsplus_unistr *)&amp;fd.key-&gt;attr.key_name,</div><div class='del'>-					strbuf, &amp;xattr_name_len)) {</div><div class='add'>+		if (hfsplus_uni2asc_xattr_str(inode-&gt;i_sb,</div><div class='add'>+					      &amp;fd.key-&gt;attr.key_name, strbuf,</div><div class='add'>+					      &amp;xattr_name_len)) {</div><div class='ctx'> 			pr_err("unicode conversion failed\n");</div><div class='ctx'> 			res = -EIO;</div><div class='ctx'> 			goto end_listxattr;</div><div class='head'>diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h<br/>index 0239e3af3945..aa02599b770f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hostfs/hostfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hostfs/hostfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hostfs/hostfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hostfs/hostfs.h</a></div><div class='hunk'>@@ -3,40 +3,8 @@</div><div class='ctx'> #define __UM_FS_HOSTFS</div><div class='ctx'> </div><div class='ctx'> #include &lt;os.h&gt;</div><div class='add'>+#include &lt;generated/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * These are exactly the same definitions as in fs.h, but the names are</div><div class='del'>- * changed so that this file can be included in both kernel and user files.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HOSTFS_ATTR_MODE	1</div><div class='del'>-#define HOSTFS_ATTR_UID 	2</div><div class='del'>-#define HOSTFS_ATTR_GID 	4</div><div class='del'>-#define HOSTFS_ATTR_SIZE	8</div><div class='del'>-#define HOSTFS_ATTR_ATIME	16</div><div class='del'>-#define HOSTFS_ATTR_MTIME	32</div><div class='del'>-#define HOSTFS_ATTR_CTIME	64</div><div class='del'>-#define HOSTFS_ATTR_ATIME_SET	128</div><div class='del'>-#define HOSTFS_ATTR_MTIME_SET	256</div><div class='del'>-</div><div class='del'>-/* This one is unused by hostfs. */</div><div class='del'>-#define HOSTFS_ATTR_FORCE	512	/* Not a change, but a change it */</div><div class='del'>-#define HOSTFS_ATTR_ATTR_FLAG	1024</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If you are very careful, you'll notice that these two are missing:</div><div class='del'>- *</div><div class='del'>- * #define ATTR_KILL_SUID	2048</div><div class='del'>- * #define ATTR_KILL_SGID	4096</div><div class='del'>- *</div><div class='del'>- * and this is because they were added in 2.5 development.</div><div class='del'>- * Actually, they are not needed by most -&gt;setattr() methods - they are set by</div><div class='del'>- * callers of notify_change() to notify that the setuid/setgid bits must be</div><div class='del'>- * dropped.</div><div class='del'>- * notify_change() will delete those flags, make sure attr-&gt;ia_valid &amp; ATTR_MODE</div><div class='del'>- * is on, and remove the appropriate bits from attr-&gt;ia_mode (attr is a</div><div class='del'>- * "struct iattr *"). -BlaisorBlade</div><div class='del'>- */</div><div class='ctx'> struct hostfs_timespec {</div><div class='ctx'> 	long long tv_sec;</div><div class='ctx'> 	long long tv_nsec;</div><div class='hunk'>@@ -60,12 +28,13 @@ struct hostfs_stat {</div><div class='ctx'> 	unsigned int uid;</div><div class='ctx'> 	unsigned int gid;</div><div class='ctx'> 	unsigned long long size;</div><div class='del'>-	struct hostfs_timespec atime, mtime, ctime;</div><div class='add'>+	struct hostfs_timespec atime, mtime, ctime, btime;</div><div class='ctx'> 	unsigned int blksize;</div><div class='ctx'> 	unsigned long long blocks;</div><div class='del'>-	unsigned int maj;</div><div class='del'>-	unsigned int min;</div><div class='del'>-	dev_t dev;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int maj;</div><div class='add'>+		unsigned int min;</div><div class='add'>+	} rdev, dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int stat_file(const char *path, struct hostfs_stat *p, int fd);</div><div class='head'>diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c<br/>index a73d27c4dd58..51d26aa2b93e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hostfs/hostfs_kern.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hostfs/hostfs_kern.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hostfs/hostfs_kern.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hostfs/hostfs_kern.c</a></div><div class='hunk'>@@ -16,17 +16,24 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include "hostfs.h"</div><div class='ctx'> #include &lt;init.h&gt;</div><div class='ctx'> #include &lt;kern.h&gt;</div><div class='ctx'> </div><div class='add'>+struct hostfs_fs_info {</div><div class='add'>+	char *host_root_path;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hostfs_inode_info {</div><div class='ctx'> 	int fd;</div><div class='ctx'> 	fmode_t mode;</div><div class='ctx'> 	struct inode vfs_inode;</div><div class='ctx'> 	struct mutex open_mutex;</div><div class='ctx'> 	dev_t dev;</div><div class='add'>+	struct hostfs_timespec btime;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)</div><div class='hunk'>@@ -51,6 +58,7 @@ static int __init hostfs_args(char *options, int *add)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr;</div><div class='ctx'> </div><div class='add'>+	*add = 0;</div><div class='ctx'> 	ptr = strchr(options, ',');</div><div class='ctx'> 	if (ptr != NULL)</div><div class='ctx'> 		*ptr++ = '\0';</div><div class='hunk'>@@ -88,30 +96,17 @@ __uml_setup("hostfs=", hostfs_args,</div><div class='ctx'> static char *__dentry_name(struct dentry *dentry, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	char *p = dentry_path_raw(dentry, name, PATH_MAX);</div><div class='del'>-	char *root;</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	root = dentry-&gt;d_sb-&gt;s_fs_info;</div><div class='del'>-	len = strlen(root);</div><div class='del'>-	if (IS_ERR(p)) {</div><div class='del'>-		__putname(name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	struct hostfs_fs_info *fsi = dentry-&gt;d_sb-&gt;s_fs_info;</div><div class='add'>+	char *root = fsi-&gt;host_root_path;</div><div class='add'>+	size_t len = strlen(root);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This function relies on the fact that dentry_path_raw() will place</div><div class='del'>-	 * the path name at the end of the provided buffer.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(p + strlen(p) + 1 != name + PATH_MAX);</div><div class='del'>-</div><div class='del'>-	strscpy(name, root, PATH_MAX);</div><div class='del'>-	if (len &gt; p - name) {</div><div class='add'>+	if (IS_ERR(p) || len &gt; p - name) {</div><div class='ctx'> 		__putname(name);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (p &gt; name + len)</div><div class='del'>-		strcpy(name + len, p);</div><div class='add'>+	memcpy(name, root, len);</div><div class='add'>+	memmove(name + len, p, name + PATH_MAX - p);</div><div class='ctx'> </div><div class='ctx'> 	return name;</div><div class='ctx'> }</div><div class='hunk'>@@ -196,8 +191,10 @@ static int hostfs_statfs(struct dentry *dentry, struct kstatfs *sf)</div><div class='ctx'> 	long long f_bavail;</div><div class='ctx'> 	long long f_files;</div><div class='ctx'> 	long long f_ffree;</div><div class='add'>+	struct hostfs_fs_info *fsi;</div><div class='ctx'> </div><div class='del'>-	err = do_statfs(dentry-&gt;d_sb-&gt;s_fs_info,</div><div class='add'>+	fsi = dentry-&gt;d_sb-&gt;s_fs_info;</div><div class='add'>+	err = do_statfs(fsi-&gt;host_root_path,</div><div class='ctx'> 			&amp;sf-&gt;f_bsize, &amp;f_blocks, &amp;f_bfree, &amp;f_bavail, &amp;f_files,</div><div class='ctx'> 			&amp;f_ffree, &amp;sf-&gt;f_fsid, sizeof(sf-&gt;f_fsid),</div><div class='ctx'> 			&amp;sf-&gt;f_namelen);</div><div class='hunk'>@@ -245,7 +242,11 @@ static void hostfs_free_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static int hostfs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> {</div><div class='del'>-	const char *root_path = root-&gt;d_sb-&gt;s_fs_info;</div><div class='add'>+	struct hostfs_fs_info *fsi;</div><div class='add'>+	const char *root_path;</div><div class='add'>+</div><div class='add'>+	fsi = root-&gt;d_sb-&gt;s_fs_info;</div><div class='add'>+	root_path = fsi-&gt;host_root_path;</div><div class='ctx'> 	size_t offset = strlen(root_ino) + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (strlen(root_path) &gt; offset)</div><div class='hunk'>@@ -260,7 +261,7 @@ static int hostfs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> static const struct super_operations hostfs_sbops = {</div><div class='ctx'> 	.alloc_inode	= hostfs_alloc_inode,</div><div class='ctx'> 	.free_inode	= hostfs_free_inode,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.evict_inode	= hostfs_evict_inode,</div><div class='ctx'> 	.statfs		= hostfs_statfs,</div><div class='ctx'> 	.show_options	= hostfs_show_options,</div><div class='hunk'>@@ -381,7 +382,7 @@ static const struct file_operations hostfs_file_fops = {</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.open		= hostfs_open,</div><div class='ctx'> 	.release	= hostfs_file_release,</div><div class='ctx'> 	.fsync		= hostfs_fsync,</div><div class='hunk'>@@ -395,98 +396,85 @@ static const struct file_operations hostfs_dir_fops = {</div><div class='ctx'> 	.fsync		= hostfs_fsync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hostfs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='add'>+static int hostfs_writepages(struct address_space *mapping,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	char *buffer;</div><div class='del'>-	loff_t base = page_offset(page);</div><div class='del'>-	int count = PAGE_SIZE;</div><div class='del'>-	int end_index = inode-&gt;i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (page-&gt;index &gt;= end_index)</div><div class='del'>-		count = inode-&gt;i_size &amp; (PAGE_SIZE-1);</div><div class='del'>-</div><div class='del'>-	buffer = kmap_local_page(page);</div><div class='del'>-</div><div class='del'>-	err = write_file(HOSTFS_I(inode)-&gt;fd, &amp;base, buffer, count);</div><div class='del'>-	if (err != count) {</div><div class='del'>-		if (err &gt;= 0)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		mapping_set_error(mapping, err);</div><div class='del'>-		goto out;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	loff_t i_size = i_size_read(inode);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;err))) {</div><div class='add'>+		loff_t pos = folio_pos(folio);</div><div class='add'>+		size_t count = folio_size(folio);</div><div class='add'>+		char *buffer;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (count &gt; i_size - pos)</div><div class='add'>+			count = i_size - pos;</div><div class='add'>+</div><div class='add'>+		buffer = kmap_local_folio(folio, 0);</div><div class='add'>+		ret = write_file(HOSTFS_I(inode)-&gt;fd, &amp;pos, buffer, count);</div><div class='add'>+		kunmap_local(buffer);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		if (ret != count) {</div><div class='add'>+			err = ret &lt; 0 ? ret : -EIO;</div><div class='add'>+			mapping_set_error(mapping, err);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (base &gt; inode-&gt;i_size)</div><div class='del'>-		inode-&gt;i_size = base;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	kunmap_local(buffer);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hostfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='ctx'> 	char *buffer;</div><div class='del'>-	loff_t start = page_offset(page);</div><div class='add'>+	loff_t start = folio_pos(folio);</div><div class='ctx'> 	int bytes_read, ret = 0;</div><div class='ctx'> </div><div class='del'>-	buffer = kmap_local_page(page);</div><div class='add'>+	buffer = kmap_local_folio(folio, 0);</div><div class='ctx'> 	bytes_read = read_file(FILE_HOSTFS_I(file)-&gt;fd, &amp;start, buffer,</div><div class='ctx'> 			PAGE_SIZE);</div><div class='del'>-	if (bytes_read &lt; 0) {</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-		SetPageError(page);</div><div class='add'>+	if (bytes_read &lt; 0)</div><div class='ctx'> 		ret = bytes_read;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(buffer + bytes_read, 0, PAGE_SIZE - bytes_read);</div><div class='del'>-</div><div class='del'>-	ClearPageError(page);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	flush_dcache_page(page);</div><div class='add'>+	else</div><div class='add'>+		buffer = folio_zero_tail(folio, bytes_read, buffer + bytes_read);</div><div class='ctx'> 	kunmap_local(buffer);</div><div class='del'>-	unlock_page(page);</div><div class='ctx'> </div><div class='add'>+	folio_end_read(folio, ret == 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hostfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+static int hostfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			      struct address_space *mapping,</div><div class='ctx'> 			      loff_t pos, unsigned len,</div><div class='del'>-			      struct page **pagep, void **fsdata)</div><div class='add'>+			      struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	*pagep = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!*pagep)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	*foliop = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='add'>+	if (IS_ERR(*foliop))</div><div class='add'>+		return PTR_ERR(*foliop);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hostfs_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+static int hostfs_write_end(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='ctx'> 			    loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			    struct page *page, void *fsdata)</div><div class='add'>+			    struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	void *buffer;</div><div class='del'>-	unsigned from = pos &amp; (PAGE_SIZE - 1);</div><div class='add'>+	size_t from = offset_in_folio(folio, pos);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	buffer = kmap_local_page(page);</div><div class='del'>-	err = write_file(FILE_HOSTFS_I(file)-&gt;fd, &amp;pos, buffer + from, copied);</div><div class='add'>+	buffer = kmap_local_folio(folio, from);</div><div class='add'>+	err = write_file(FILE_HOSTFS_I(iocb-&gt;ki_filp)-&gt;fd, &amp;pos, buffer, copied);</div><div class='ctx'> 	kunmap_local(buffer);</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page) &amp;&amp; err == PAGE_SIZE)</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+	if (!folio_test_uptodate(folio) &amp;&amp; err == folio_size(folio))</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If err &gt; 0, write_file has added err to pos, so we are comparing</div><div class='hunk'>@@ -494,18 +482,19 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (err &gt; 0 &amp;&amp; (pos &gt; inode-&gt;i_size))</div><div class='ctx'> 		inode-&gt;i_size = pos;</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct address_space_operations hostfs_aops = {</div><div class='del'>-	.writepage 	= hostfs_writepage,</div><div class='add'>+	.writepages 	= hostfs_writepages,</div><div class='ctx'> 	.read_folio	= hostfs_read_folio,</div><div class='ctx'> 	.dirty_folio	= filemap_dirty_folio,</div><div class='ctx'> 	.write_begin	= hostfs_write_begin,</div><div class='ctx'> 	.write_end	= hostfs_write_end,</div><div class='add'>+	.migrate_folio	= filemap_migrate_folio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int hostfs_inode_update(struct inode *ino, const struct hostfs_stat *st)</div><div class='hunk'>@@ -530,10 +519,11 @@ static int hostfs_inode_update(struct inode *ino, const struct hostfs_stat *st)</div><div class='ctx'> static int hostfs_inode_set(struct inode *ino, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hostfs_stat *st = data;</div><div class='del'>-	dev_t rdev;</div><div class='add'>+	dev_t dev, rdev;</div><div class='ctx'> </div><div class='ctx'> 	/* Reencode maj and min with the kernel encoding.*/</div><div class='del'>-	rdev = MKDEV(st-&gt;maj, st-&gt;min);</div><div class='add'>+	rdev = MKDEV(st-&gt;rdev.maj, st-&gt;rdev.min);</div><div class='add'>+	dev = MKDEV(st-&gt;dev.maj, st-&gt;dev.min);</div><div class='ctx'> </div><div class='ctx'> 	switch (st-&gt;mode &amp; S_IFMT) {</div><div class='ctx'> 	case S_IFLNK:</div><div class='hunk'>@@ -559,7 +549,8 @@ static int hostfs_inode_set(struct inode *ino, void *data)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	HOSTFS_I(ino)-&gt;dev = st-&gt;dev;</div><div class='add'>+	HOSTFS_I(ino)-&gt;dev = dev;</div><div class='add'>+	HOSTFS_I(ino)-&gt;btime = st-&gt;btime;</div><div class='ctx'> 	ino-&gt;i_ino = st-&gt;ino;</div><div class='ctx'> 	ino-&gt;i_mode = st-&gt;mode;</div><div class='ctx'> 	return hostfs_inode_update(ino, st);</div><div class='hunk'>@@ -568,8 +559,12 @@ static int hostfs_inode_set(struct inode *ino, void *data)</div><div class='ctx'> static int hostfs_inode_test(struct inode *inode, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	const struct hostfs_stat *st = data;</div><div class='add'>+	dev_t dev = MKDEV(st-&gt;dev.maj, st-&gt;dev.min);</div><div class='ctx'> </div><div class='del'>-	return inode-&gt;i_ino == st-&gt;ino &amp;&amp; HOSTFS_I(inode)-&gt;dev == st-&gt;dev;</div><div class='add'>+	return inode-&gt;i_ino == st-&gt;ino &amp;&amp; HOSTFS_I(inode)-&gt;dev == dev &amp;&amp;</div><div class='add'>+	       (inode-&gt;i_mode &amp; S_IFMT) == (st-&gt;mode &amp; S_IFMT) &amp;&amp;</div><div class='add'>+	       HOSTFS_I(inode)-&gt;btime.tv_sec == st-&gt;btime.tv_sec &amp;&amp;</div><div class='add'>+	       HOSTFS_I(inode)-&gt;btime.tv_nsec == st-&gt;btime.tv_nsec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct inode *hostfs_iget(struct super_block *sb, char *name)</div><div class='hunk'>@@ -586,7 +581,7 @@ static struct inode *hostfs_iget(struct super_block *sb, char *name)</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -691,17 +686,25 @@ static int hostfs_symlink(struct mnt_idmap *idmap, struct inode *ino,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hostfs_mkdir(struct mnt_idmap *idmap, struct inode *ino,</div><div class='del'>-			struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *hostfs_mkdir(struct mnt_idmap *idmap, struct inode *ino,</div><div class='add'>+				   struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	char *file;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if ((file = dentry_name(dentry)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	err = do_mkdir(file, mode);</div><div class='add'>+	if (err) {</div><div class='add'>+		dentry = ERR_PTR(err);</div><div class='add'>+	} else {</div><div class='add'>+		inode = hostfs_iget(dentry-&gt;d_sb, file);</div><div class='add'>+		d_drop(dentry);</div><div class='add'>+		dentry = d_splice_alias(inode, dentry);</div><div class='add'>+	}</div><div class='ctx'> 	__putname(file);</div><div class='del'>-	return err;</div><div class='add'>+	return dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hostfs_rmdir(struct inode *ino, struct dentry *dentry)</div><div class='hunk'>@@ -922,32 +925,23 @@ static const struct inode_operations hostfs_link_iops = {</div><div class='ctx'> 	.get_link	= hostfs_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)</div><div class='add'>+static int hostfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct hostfs_fs_info *fsi = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct inode *root_inode;</div><div class='del'>-	char *host_root_path, *req_root = d;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_blocksize = 1024;</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = 10;</div><div class='ctx'> 	sb-&gt;s_magic = HOSTFS_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op = &amp;hostfs_sbops;</div><div class='del'>-	sb-&gt;s_d_op = &amp;simple_dentry_operations;</div><div class='add'>+	sb-&gt;s_d_flags = DCACHE_DONTCACHE;</div><div class='ctx'> 	sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='ctx'> 	err = super_setup_bdi(sb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* NULL is printed as '(null)' by printf(): avoid that. */</div><div class='del'>-	if (req_root == NULL)</div><div class='del'>-		req_root = "";</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_fs_info = host_root_path =</div><div class='del'>-		kasprintf(GFP_KERNEL, "%s/%s", root_ino, req_root);</div><div class='del'>-	if (host_root_path == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	root_inode = hostfs_iget(sb, host_root_path);</div><div class='add'>+	root_inode = hostfs_iget(sb, fsi-&gt;host_root_path);</div><div class='ctx'> 	if (IS_ERR(root_inode))</div><div class='ctx'> 		return PTR_ERR(root_inode);</div><div class='ctx'> </div><div class='hunk'>@@ -955,7 +949,7 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)</div><div class='ctx'> 		char *name;</div><div class='ctx'> </div><div class='ctx'> 		iput(root_inode);</div><div class='del'>-		name = follow_link(host_root_path);</div><div class='add'>+		name = follow_link(fsi-&gt;host_root_path);</div><div class='ctx'> 		if (IS_ERR(name))</div><div class='ctx'> 			return PTR_ERR(name);</div><div class='ctx'> </div><div class='hunk'>@@ -972,11 +966,99 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *hostfs_read_sb(struct file_system_type *type,</div><div class='del'>-			  int flags, const char *dev_name,</div><div class='del'>-			  void *data)</div><div class='add'>+enum hostfs_parma {</div><div class='add'>+	Opt_hostfs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec hostfs_param_specs[] = {</div><div class='add'>+	fsparam_string_empty("hostfs",		Opt_hostfs),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hostfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	return mount_nodev(type, flags, data, hostfs_fill_sb_common);</div><div class='add'>+	struct hostfs_fs_info *fsi = fc-&gt;s_fs_info;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	char *host_root, *tmp_root;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, hostfs_param_specs, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_hostfs:</div><div class='add'>+		host_root = param-&gt;string;</div><div class='add'>+		if (!*host_root)</div><div class='add'>+			break;</div><div class='add'>+		tmp_root = kasprintf(GFP_KERNEL, "%s%s",</div><div class='add'>+				     fsi-&gt;host_root_path, host_root);</div><div class='add'>+		if (!tmp_root)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		kfree(fsi-&gt;host_root_path);</div><div class='add'>+		fsi-&gt;host_root_path = tmp_root;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hostfs_parse_monolithic(struct fs_context *fc, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hostfs_fs_info *fsi = fc-&gt;s_fs_info;</div><div class='add'>+	char *tmp_root, *host_root = (char *)data;</div><div class='add'>+</div><div class='add'>+	/* NULL is printed as '(null)' by printf(): avoid that. */</div><div class='add'>+	if (host_root == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tmp_root = kasprintf(GFP_KERNEL, "%s%s", fsi-&gt;host_root_path, host_root);</div><div class='add'>+	if (!tmp_root)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	kfree(fsi-&gt;host_root_path);</div><div class='add'>+	fsi-&gt;host_root_path = tmp_root;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hostfs_fc_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_nodev(fc, hostfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hostfs_fc_free(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct hostfs_fs_info *fsi = fc-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	if (!fsi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kfree(fsi-&gt;host_root_path);</div><div class='add'>+	kfree(fsi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations hostfs_context_ops = {</div><div class='add'>+	.parse_monolithic = hostfs_parse_monolithic,</div><div class='add'>+	.parse_param	= hostfs_parse_param,</div><div class='add'>+	.get_tree	= hostfs_fc_get_tree,</div><div class='add'>+	.free		= hostfs_fc_free,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hostfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct hostfs_fs_info *fsi;</div><div class='add'>+</div><div class='add'>+	fsi = kzalloc(sizeof(*fsi), GFP_KERNEL);</div><div class='add'>+	if (!fsi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fsi-&gt;host_root_path = kasprintf(GFP_KERNEL, "%s/", root_ino);</div><div class='add'>+	if (!fsi-&gt;host_root_path) {</div><div class='add'>+		kfree(fsi);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	fc-&gt;s_fs_info = fsi;</div><div class='add'>+	fc-&gt;ops = &amp;hostfs_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hostfs_kill_sb(struct super_block *s)</div><div class='hunk'>@@ -986,11 +1068,11 @@ static void hostfs_kill_sb(struct super_block *s)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hostfs_type = {</div><div class='del'>-	.owner 		= THIS_MODULE,</div><div class='del'>-	.name 		= "hostfs",</div><div class='del'>-	.mount	 	= hostfs_read_sb,</div><div class='del'>-	.kill_sb	= hostfs_kill_sb,</div><div class='del'>-	.fs_flags 	= 0,</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "hostfs",</div><div class='add'>+	.init_fs_context	= hostfs_init_fs_context,</div><div class='add'>+	.kill_sb		= hostfs_kill_sb,</div><div class='add'>+	.fs_flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("hostfs");</div><div class='ctx'> </div><div class='hunk'>@@ -1010,4 +1092,5 @@ static void __exit exit_hostfs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_hostfs)</div><div class='ctx'> module_exit(exit_hostfs)</div><div class='add'>+MODULE_DESCRIPTION("User-Mode Linux Host filesystem");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c<br/>index 840619e39a1a..3bcd9f35e70b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hostfs/hostfs_user.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hostfs/hostfs_user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hostfs/hostfs_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hostfs/hostfs_user.c</a></div><div class='hunk'>@@ -18,38 +18,48 @@</div><div class='ctx'> #include "hostfs.h"</div><div class='ctx'> #include &lt;utime.h&gt;</div><div class='ctx'> </div><div class='del'>-static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p)</div><div class='add'>+static void statx_to_hostfs(const struct statx *buf, struct hostfs_stat *p)</div><div class='ctx'> {</div><div class='del'>-	p-&gt;ino = buf-&gt;st_ino;</div><div class='del'>-	p-&gt;mode = buf-&gt;st_mode;</div><div class='del'>-	p-&gt;nlink = buf-&gt;st_nlink;</div><div class='del'>-	p-&gt;uid = buf-&gt;st_uid;</div><div class='del'>-	p-&gt;gid = buf-&gt;st_gid;</div><div class='del'>-	p-&gt;size = buf-&gt;st_size;</div><div class='del'>-	p-&gt;atime.tv_sec = buf-&gt;st_atime;</div><div class='del'>-	p-&gt;atime.tv_nsec = 0;</div><div class='del'>-	p-&gt;ctime.tv_sec = buf-&gt;st_ctime;</div><div class='del'>-	p-&gt;ctime.tv_nsec = 0;</div><div class='del'>-	p-&gt;mtime.tv_sec = buf-&gt;st_mtime;</div><div class='del'>-	p-&gt;mtime.tv_nsec = 0;</div><div class='del'>-	p-&gt;blksize = buf-&gt;st_blksize;</div><div class='del'>-	p-&gt;blocks = buf-&gt;st_blocks;</div><div class='del'>-	p-&gt;maj = os_major(buf-&gt;st_rdev);</div><div class='del'>-	p-&gt;min = os_minor(buf-&gt;st_rdev);</div><div class='del'>-	p-&gt;dev = buf-&gt;st_dev;</div><div class='add'>+	p-&gt;ino = buf-&gt;stx_ino;</div><div class='add'>+	p-&gt;mode = buf-&gt;stx_mode;</div><div class='add'>+	p-&gt;nlink = buf-&gt;stx_nlink;</div><div class='add'>+	p-&gt;uid = buf-&gt;stx_uid;</div><div class='add'>+	p-&gt;gid = buf-&gt;stx_gid;</div><div class='add'>+	p-&gt;size = buf-&gt;stx_size;</div><div class='add'>+	p-&gt;atime.tv_sec = buf-&gt;stx_atime.tv_sec;</div><div class='add'>+	p-&gt;atime.tv_nsec = buf-&gt;stx_atime.tv_nsec;</div><div class='add'>+	p-&gt;ctime.tv_sec = buf-&gt;stx_ctime.tv_sec;</div><div class='add'>+	p-&gt;ctime.tv_nsec = buf-&gt;stx_ctime.tv_nsec;</div><div class='add'>+	p-&gt;mtime.tv_sec = buf-&gt;stx_mtime.tv_sec;</div><div class='add'>+	p-&gt;mtime.tv_nsec = buf-&gt;stx_mtime.tv_nsec;</div><div class='add'>+	if (buf-&gt;stx_mask &amp; STATX_BTIME) {</div><div class='add'>+		p-&gt;btime.tv_sec = buf-&gt;stx_btime.tv_sec;</div><div class='add'>+		p-&gt;btime.tv_nsec = buf-&gt;stx_btime.tv_nsec;</div><div class='add'>+	} else {</div><div class='add'>+		memset(&amp;p-&gt;btime, 0, sizeof(p-&gt;btime));</div><div class='add'>+	}</div><div class='add'>+	p-&gt;blksize = buf-&gt;stx_blksize;</div><div class='add'>+	p-&gt;blocks = buf-&gt;stx_blocks;</div><div class='add'>+	p-&gt;rdev.maj = buf-&gt;stx_rdev_major;</div><div class='add'>+	p-&gt;rdev.min = buf-&gt;stx_rdev_minor;</div><div class='add'>+	p-&gt;dev.maj = buf-&gt;stx_dev_major;</div><div class='add'>+	p-&gt;dev.min = buf-&gt;stx_dev_minor;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int stat_file(const char *path, struct hostfs_stat *p, int fd)</div><div class='ctx'> {</div><div class='del'>-	struct stat64 buf;</div><div class='add'>+	struct statx buf;</div><div class='add'>+	int flags = AT_SYMLINK_NOFOLLOW;</div><div class='ctx'> </div><div class='ctx'> 	if (fd &gt;= 0) {</div><div class='del'>-		if (fstat64(fd, &amp;buf) &lt; 0)</div><div class='del'>-			return -errno;</div><div class='del'>-	} else if (lstat64(path, &amp;buf) &lt; 0) {</div><div class='del'>-		return -errno;</div><div class='add'>+		flags |= AT_EMPTY_PATH;</div><div class='add'>+		path = "";</div><div class='ctx'> 	}</div><div class='del'>-	stat64_to_hostfs(&amp;buf, p);</div><div class='add'>+</div><div class='add'>+	if ((statx(fd, path, flags, STATX_BASIC_STATS | STATX_BTIME, &amp;buf)) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	statx_to_hostfs(&amp;buf, p);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hpfs/anode.c b/fs/hpfs/anode.c<br/>index c14c9a035ee0..a4f5321eafae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/anode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/anode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/anode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/anode.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ secno hpfs_bplus_lookup(struct super_block *s, struct inode *inode,</div><div class='ctx'> 				a = le32_to_cpu(btree-&gt;u.internal[i].down);</div><div class='ctx'> 				brelse(bh);</div><div class='ctx'> 				if (!(anode = hpfs_map_anode(s, a, &amp;bh))) return -1;</div><div class='del'>-				btree = &amp;anode-&gt;btree;</div><div class='add'>+				btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 				goto go_down;</div><div class='ctx'> 			}</div><div class='ctx'> 		hpfs_error(s, "sector %08x not found in internal anode %08x", sec, a);</div><div class='hunk'>@@ -69,12 +69,13 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi</div><div class='ctx'> 	int n;</div><div class='ctx'> 	unsigned fs;</div><div class='ctx'> 	int c1, c2 = 0;</div><div class='add'>+</div><div class='ctx'> 	if (fnod) {</div><div class='ctx'> 		if (!(fnode = hpfs_map_fnode(s, node, &amp;bh))) return -1;</div><div class='del'>-		btree = &amp;fnode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;fnode-&gt;btree);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, node, &amp;bh))) return -1;</div><div class='del'>-		btree = &amp;anode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 	}</div><div class='ctx'> 	a = node;</div><div class='ctx'> 	go_down:</div><div class='hunk'>@@ -91,7 +92,7 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi</div><div class='ctx'> 		if (hpfs_sb(s)-&gt;sb_chk)</div><div class='ctx'> 			if (hpfs_stop_cycles(s, a, &amp;c1, &amp;c2, "hpfs_add_sector_to_btree #1")) return -1;</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, a, &amp;bh))) return -1;</div><div class='del'>-		btree = &amp;anode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 		goto go_down;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (n &gt;= 0) {</div><div class='hunk'>@@ -151,7 +152,7 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi</div><div class='ctx'> 		}</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		bh = bh1;</div><div class='del'>-		btree = &amp;anode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 	}</div><div class='ctx'> 	btree-&gt;n_free_nodes--; n = btree-&gt;n_used_nodes++;</div><div class='ctx'> 	le16_add_cpu(&amp;btree-&gt;first_free, 12);</div><div class='hunk'>@@ -168,10 +169,10 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi</div><div class='ctx'> 			if (hpfs_stop_cycles(s, up, &amp;c1, &amp;c2, "hpfs_add_sector_to_btree #2")) return -1;</div><div class='ctx'> 		if (up != node || !fnod) {</div><div class='ctx'> 			if (!(anode = hpfs_map_anode(s, up, &amp;bh))) return -1;</div><div class='del'>-			btree = &amp;anode-&gt;btree;</div><div class='add'>+			btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!(fnode = hpfs_map_fnode(s, up, &amp;bh))) return -1;</div><div class='del'>-			btree = &amp;fnode-&gt;btree;</div><div class='add'>+			btree = GET_BTREE_PTR(&amp;fnode-&gt;btree);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (btree-&gt;n_free_nodes) {</div><div class='ctx'> 			btree-&gt;n_free_nodes--; n = btree-&gt;n_used_nodes++;</div><div class='hunk'>@@ -206,8 +207,8 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi</div><div class='ctx'> 			anode-&gt;btree.n_used_nodes = 1;</div><div class='ctx'> 			anode-&gt;btree.n_free_nodes = 59;</div><div class='ctx'> 			anode-&gt;btree.first_free = cpu_to_le16(16);</div><div class='del'>-			anode-&gt;btree.u.internal[0].down = cpu_to_le32(a);</div><div class='del'>-			anode-&gt;btree.u.internal[0].file_secno = cpu_to_le32(-1);</div><div class='add'>+			GET_BTREE_PTR(&amp;anode-&gt;btree)-&gt;u.internal[0].down = cpu_to_le32(a);</div><div class='add'>+			GET_BTREE_PTR(&amp;anode-&gt;btree)-&gt;u.internal[0].file_secno = cpu_to_le32(-1);</div><div class='ctx'> 			mark_buffer_dirty(bh);</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			if ((anode = hpfs_map_anode(s, a, &amp;bh))) {</div><div class='hunk'>@@ -229,20 +230,20 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi</div><div class='ctx'> 			brelse(bh2);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		btree = &amp;anode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(fnode = hpfs_map_fnode(s, node, &amp;bh))) {</div><div class='ctx'> 			brelse(bh2);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		btree = &amp;fnode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;fnode-&gt;btree);</div><div class='ctx'> 	}</div><div class='ctx'> 	ranode-&gt;up = cpu_to_le32(node);</div><div class='ctx'> 	memcpy(&amp;ranode-&gt;btree, btree, le16_to_cpu(btree-&gt;first_free));</div><div class='ctx'> 	if (fnod)</div><div class='ctx'> 		ranode-&gt;btree.flags |= BP_fnode_parent;</div><div class='del'>-	ranode-&gt;btree.n_free_nodes = (bp_internal(&amp;ranode-&gt;btree) ? 60 : 40) - ranode-&gt;btree.n_used_nodes;</div><div class='del'>-	if (bp_internal(&amp;ranode-&gt;btree)) for (n = 0; n &lt; ranode-&gt;btree.n_used_nodes; n++) {</div><div class='add'>+	GET_BTREE_PTR(&amp;ranode-&gt;btree)-&gt;n_free_nodes = (bp_internal(GET_BTREE_PTR(&amp;ranode-&gt;btree)) ? 60 : 40) - GET_BTREE_PTR(&amp;ranode-&gt;btree)-&gt;n_used_nodes;</div><div class='add'>+	if (bp_internal(GET_BTREE_PTR(&amp;ranode-&gt;btree))) for (n = 0; n &lt; GET_BTREE_PTR(&amp;ranode-&gt;btree)-&gt;n_used_nodes; n++) {</div><div class='ctx'> 		struct anode *unode;</div><div class='ctx'> 		if ((unode = hpfs_map_anode(s, le32_to_cpu(ranode-&gt;u.internal[n].down), &amp;bh1))) {</div><div class='ctx'> 			unode-&gt;up = cpu_to_le32(ra);</div><div class='hunk'>@@ -291,7 +292,7 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree)</div><div class='ctx'> 			if (hpfs_stop_cycles(s, ano, &amp;d1, &amp;d2, "hpfs_remove_btree #1"))</div><div class='ctx'> 				return;</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, ano, &amp;bh))) return;</div><div class='del'>-		btree1 = &amp;anode-&gt;btree;</div><div class='add'>+		btree1 = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 		level++;</div><div class='ctx'> 		pos = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -307,7 +308,7 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree)</div><div class='ctx'> 	ano = le32_to_cpu(anode-&gt;up);</div><div class='ctx'> 	if (--level) {</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, ano, &amp;bh))) return;</div><div class='del'>-		btree1 = &amp;anode-&gt;btree;</div><div class='add'>+		btree1 = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 	} else btree1 = btree;</div><div class='ctx'> 	for (i = 0; i &lt; btree1-&gt;n_used_nodes; i++) {</div><div class='ctx'> 		if (le32_to_cpu(btree1-&gt;u.internal[i].down) == oano) {</div><div class='hunk'>@@ -332,7 +333,7 @@ static secno anode_lookup(struct super_block *s, anode_secno a, unsigned sec)</div><div class='ctx'> 	struct anode *anode;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	if (!(anode = hpfs_map_anode(s, a, &amp;bh))) return -1;</div><div class='del'>-	return hpfs_bplus_lookup(s, NULL, &amp;anode-&gt;btree, sec, bh);</div><div class='add'>+	return hpfs_bplus_lookup(s, NULL, GET_BTREE_PTR(&amp;anode-&gt;btree), sec, bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hpfs_ea_read(struct super_block *s, secno a, int ano, unsigned pos,</div><div class='hunk'>@@ -388,7 +389,7 @@ void hpfs_ea_remove(struct super_block *s, secno a, int ano, unsigned len)</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	if (ano) {</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, a, &amp;bh))) return;</div><div class='del'>-		hpfs_remove_btree(s, &amp;anode-&gt;btree);</div><div class='add'>+		hpfs_remove_btree(s, GET_BTREE_PTR(&amp;anode-&gt;btree));</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		hpfs_free_sectors(s, a, 1);</div><div class='ctx'> 	} else hpfs_free_sectors(s, a, (len + 511) &gt;&gt; 9);</div><div class='hunk'>@@ -407,10 +408,10 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs)</div><div class='ctx'> 	int c1, c2 = 0;</div><div class='ctx'> 	if (fno) {</div><div class='ctx'> 		if (!(fnode = hpfs_map_fnode(s, f, &amp;bh))) return;</div><div class='del'>-		btree = &amp;fnode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;fnode-&gt;btree);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, f, &amp;bh))) return;</div><div class='del'>-		btree = &amp;anode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!secs) {</div><div class='ctx'> 		hpfs_remove_btree(s, btree);</div><div class='hunk'>@@ -448,7 +449,7 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs)</div><div class='ctx'> 			if (hpfs_stop_cycles(s, node, &amp;c1, &amp;c2, "hpfs_truncate_btree"))</div><div class='ctx'> 				return;</div><div class='ctx'> 		if (!(anode = hpfs_map_anode(s, node, &amp;bh))) return;</div><div class='del'>-		btree = &amp;anode-&gt;btree;</div><div class='add'>+		btree = GET_BTREE_PTR(&amp;anode-&gt;btree);</div><div class='ctx'> 	}	</div><div class='ctx'> 	nodes = btree-&gt;n_used_nodes + btree-&gt;n_free_nodes;</div><div class='ctx'> 	for (i = 0; i &lt; btree-&gt;n_used_nodes; i++)</div><div class='hunk'>@@ -485,7 +486,7 @@ void hpfs_remove_fnode(struct super_block *s, fnode_secno fno)</div><div class='ctx'> 	struct extended_attribute *ea;</div><div class='ctx'> 	struct extended_attribute *ea_end;</div><div class='ctx'> 	if (!(fnode = hpfs_map_fnode(s, fno, &amp;bh))) return;</div><div class='del'>-	if (!fnode_is_dir(fnode)) hpfs_remove_btree(s, &amp;fnode-&gt;btree);</div><div class='add'>+	if (!fnode_is_dir(fnode)) hpfs_remove_btree(s, GET_BTREE_PTR(&amp;fnode-&gt;btree));</div><div class='ctx'> 	else hpfs_remove_dtree(s, le32_to_cpu(fnode-&gt;u.external[0].disk_secno));</div><div class='ctx'> 	ea_end = fnode_end_ea(fnode);</div><div class='ctx'> 	for (ea = fnode_ea(fnode); ea &lt; ea_end; ea = next_ea(ea))</div><div class='head'>diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c<br/>index 49dd585c2b17..ceb50b2dc91a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/dir.c</a></div><div class='hunk'>@@ -247,7 +247,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in</div><div class='ctx'> 		result = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto bail1;</div><div class='ctx'> 	}</div><div class='del'>-	if (result-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(result) &amp; I_NEW) {</div><div class='ctx'> 		hpfs_init_inode(result);</div><div class='ctx'> 		if (de-&gt;directory)</div><div class='ctx'> 			hpfs_read_inode(result);</div><div class='head'>diff --git a/fs/hpfs/ea.c b/fs/hpfs/ea.c<br/>index 102ba18e561f..2149d3ca530b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/ea.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/ea.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/ea.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/ea.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len)</div><div class='ctx'> 		struct buffer_head *bh;</div><div class='ctx'> 		struct anode *anode;</div><div class='ctx'> 		if ((anode = hpfs_map_anode(s, a, &amp;bh))) {</div><div class='del'>-			hpfs_remove_btree(s, &amp;anode-&gt;btree);</div><div class='add'>+			hpfs_remove_btree(s, GET_BTREE_PTR(&amp;anode-&gt;btree));</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			hpfs_free_sectors(s, a, 1);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c<br/>index 1bb8d97cd9ae..29e876705369 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/file.c</a></div><div class='hunk'>@@ -51,7 +51,9 @@ static secno hpfs_bmap(struct inode *inode, unsigned file_secno, unsigned *n_sec</div><div class='ctx'> 		return hpfs_inode-&gt;i_disk_sec + n;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(fnode = hpfs_map_fnode(inode-&gt;i_sb, inode-&gt;i_ino, &amp;bh))) return 0;</div><div class='del'>-	disk_secno = hpfs_bplus_lookup(inode-&gt;i_sb, inode, &amp;fnode-&gt;btree, file_secno, bh);</div><div class='add'>+	disk_secno = hpfs_bplus_lookup(inode-&gt;i_sb, inode,</div><div class='add'>+				       GET_BTREE_PTR(&amp;fnode-&gt;btree),</div><div class='add'>+				       file_secno, bh);</div><div class='ctx'> 	if (disk_secno == -1) return 0;</div><div class='ctx'> 	if (hpfs_chk_sectors(inode-&gt;i_sb, disk_secno, 1, "bmap")) return 0;</div><div class='ctx'> 	n = file_secno - hpfs_inode-&gt;i_file_sec;</div><div class='hunk'>@@ -188,14 +190,14 @@ static void hpfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	hpfs_unlock(inode-&gt;i_sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hpfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int hpfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='add'>+			    loff_t pos, unsigned len,</div><div class='add'>+			    struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='del'>-	ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,</div><div class='add'>+	ret = cont_write_begin(iocb, mapping, pos, len, foliop, fsdata,</div><div class='ctx'> 				hpfs_get_block,</div><div class='ctx'> 				&amp;hpfs_i(mapping-&gt;host)-&gt;mmu_private);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='hunk'>@@ -204,13 +206,14 @@ static int hpfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hpfs_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *pagep, void *fsdata)</div><div class='add'>+static int hpfs_write_end(const struct kiocb *iocb,</div><div class='add'>+			  struct address_space *mapping,</div><div class='add'>+			  loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			  struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	int err;</div><div class='del'>-	err = generic_write_end(file, mapping, pos, len, copied, pagep, fsdata);</div><div class='add'>+	err = generic_write_end(iocb, mapping, pos, len, copied, folio, fsdata);</div><div class='ctx'> 	if (err &lt; len)</div><div class='ctx'> 		hpfs_write_failed(mapping, pos + len);</div><div class='ctx'> 	if (!(err &lt; 0)) {</div><div class='hunk'>@@ -256,7 +259,7 @@ const struct file_operations hpfs_file_ops =</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.release	= hpfs_file_release,</div><div class='ctx'> 	.fsync		= hpfs_file_fsync,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='head'>diff --git a/fs/hpfs/hpfs.h b/fs/hpfs/hpfs.h<br/>index 281dec8f636b..353f73c914d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/hpfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/hpfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/hpfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/hpfs.h</a></div><div class='hunk'>@@ -394,27 +394,45 @@ enum {</div><div class='ctx'> 	BP_binary_search = 0x40,</div><div class='ctx'> 	BP_internal = 0x80</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * GET_BTREE_PTR() - Get a pointer to struct bplus_header</div><div class='add'>+ *</div><div class='add'>+ * Wrapper around container_of() to retrieve a pointer to struct</div><div class='add'>+ * bplus_header from a pointer to struct bplus_header_fixed.</div><div class='add'>+ *</div><div class='add'>+ * @ptr: Pointer to struct bplus_header_fixed.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define GET_BTREE_PTR(ptr) \</div><div class='add'>+	container_of(ptr, struct bplus_header, __hdr)</div><div class='add'>+</div><div class='ctx'> struct bplus_header</div><div class='ctx'> {</div><div class='del'>-  u8 flags;				/* bit 0 - high bit of first free entry offset</div><div class='add'>+	/* New members MUST be added within the struct_group() macro below. */</div><div class='add'>+	struct_group_tagged(bplus_header_fixed, __hdr,</div><div class='add'>+		u8 flags;		/* bit 0 - high bit of first free entry offset</div><div class='ctx'> 					   bit 5 - we're pointed to by an fnode,</div><div class='ctx'> 					   the data btree or some ea or the</div><div class='ctx'> 					   main ea bootage pointer ea_secno</div><div class='ctx'> 					   bit 6 - suggest binary search (unused)</div><div class='ctx'> 					   bit 7 - 1 -&gt; (internal) tree of anodes</div><div class='ctx'> 						   0 -&gt; (leaf) list of extents */</div><div class='del'>-  u8 fill[3];</div><div class='del'>-  u8 n_free_nodes;			/* free nodes in following array */</div><div class='del'>-  u8 n_used_nodes;			/* used nodes in following array */</div><div class='del'>-  __le16 first_free;			/* offset from start of header to</div><div class='add'>+		u8 fill[3];</div><div class='add'>+		u8 n_free_nodes;	/* free nodes in following array */</div><div class='add'>+		u8 n_used_nodes;	/* used nodes in following array */</div><div class='add'>+		__le16 first_free;	/* offset from start of header to</div><div class='ctx'> 					   first free node in array */</div><div class='del'>-  union {</div><div class='del'>-	/* (internal) 2-word entries giving subtree pointers */</div><div class='del'>-	DECLARE_FLEX_ARRAY(struct bplus_internal_node, internal);</div><div class='del'>-	/* (external) 3-word entries giving sector runs */</div><div class='del'>-	DECLARE_FLEX_ARRAY(struct bplus_leaf_node, external);</div><div class='del'>-  } u;</div><div class='add'>+	);</div><div class='add'>+	union {</div><div class='add'>+		/* (internal) 2-word entries giving subtree pointers */</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct bplus_internal_node, internal);</div><div class='add'>+		/* (external) 3-word entries giving sector runs */</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct bplus_leaf_node, external);</div><div class='add'>+	} u;</div><div class='ctx'> };</div><div class='add'>+static_assert(offsetof(struct bplus_header, u.internal) == sizeof(struct bplus_header_fixed),</div><div class='add'>+	      "struct member likely outside of struct_group_tagged()");</div><div class='ctx'> </div><div class='ctx'> static inline bool bp_internal(struct bplus_header *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -453,7 +471,7 @@ struct fnode</div><div class='ctx'>   __le16 flags;				/* bit 1 set -&gt; ea_secno is an anode */</div><div class='ctx'> 					/* bit 8 set -&gt; directory.  first &amp; only extent</div><div class='ctx'> 					   points to dnode. */</div><div class='del'>-  struct bplus_header btree;		/* b+ tree, 8 extents or 12 subtrees */</div><div class='add'>+  struct bplus_header_fixed btree;	/* b+ tree, 8 extents or 12 subtrees */</div><div class='ctx'>   union {</div><div class='ctx'>     struct bplus_leaf_node external[8];</div><div class='ctx'>     struct bplus_internal_node internal[12];</div><div class='hunk'>@@ -495,7 +513,7 @@ struct anode</div><div class='ctx'>   __le32 self;				/* pointer to this anode */</div><div class='ctx'>   __le32 up;				/* parent anode or fnode */</div><div class='ctx'> </div><div class='del'>-  struct bplus_header btree;		/* b+tree, 40 extents or 60 subtrees */</div><div class='add'>+  struct bplus_header_fixed btree;	/* b+tree, 40 extents or 60 subtrees */</div><div class='ctx'>   union {</div><div class='ctx'>     struct bplus_leaf_node external[40];</div><div class='ctx'>     struct bplus_internal_node internal[60];</div><div class='head'>diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h<br/>index f5a2476c47bf..237c1c23e855 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/hpfs_fn.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/hpfs_fn.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/hpfs_fn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/hpfs_fn.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hpfs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c<br/>index a59e8fa630db..93d528f4f4f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/inode.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ void hpfs_write_inode(struct inode *i)</div><div class='ctx'> 	struct hpfs_inode_info *hpfs_inode = hpfs_i(i);</div><div class='ctx'> 	struct inode *parent;</div><div class='ctx'> 	if (i-&gt;i_ino == hpfs_sb(i-&gt;i_sb)-&gt;sb_root) return;</div><div class='del'>-	if (hpfs_inode-&gt;i_rddir_off &amp;&amp; !atomic_read(&amp;i-&gt;i_count)) {</div><div class='add'>+	if (hpfs_inode-&gt;i_rddir_off &amp;&amp; !icount_read(i)) {</div><div class='ctx'> 		if (*hpfs_inode-&gt;i_rddir_off)</div><div class='ctx'> 			pr_err("write_inode: some position still there\n");</div><div class='ctx'> 		kfree(hpfs_inode-&gt;i_rddir_off);</div><div class='hunk'>@@ -196,7 +196,7 @@ void hpfs_write_inode(struct inode *i)</div><div class='ctx'> 	parent = iget_locked(i-&gt;i_sb, hpfs_inode-&gt;i_parent_dir);</div><div class='ctx'> 	if (parent) {</div><div class='ctx'> 		hpfs_inode-&gt;i_dirty = 0;</div><div class='del'>-		if (parent-&gt;i_state &amp; I_NEW) {</div><div class='add'>+		if (inode_state_read_once(parent) &amp; I_NEW) {</div><div class='ctx'> 			hpfs_init_inode(parent);</div><div class='ctx'> 			hpfs_read_inode(parent);</div><div class='ctx'> 			unlock_new_inode(parent);</div><div class='head'>diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c<br/>index ecd9fccd1663..be73233502f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/map.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/map.c</a></div><div class='hunk'>@@ -178,14 +178,14 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!fnode_is_dir(fnode)) {</div><div class='ctx'> 				if ((unsigned)fnode-&gt;btree.n_used_nodes + (unsigned)fnode-&gt;btree.n_free_nodes !=</div><div class='del'>-				    (bp_internal(&amp;fnode-&gt;btree) ? 12 : 8)) {</div><div class='add'>+				    (bp_internal(GET_BTREE_PTR(&amp;fnode-&gt;btree)) ? 12 : 8)) {</div><div class='ctx'> 					hpfs_error(s,</div><div class='ctx'> 					   "bad number of nodes in fnode %08lx",</div><div class='ctx'> 					    (unsigned long)ino);</div><div class='ctx'> 					goto bail;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (le16_to_cpu(fnode-&gt;btree.first_free) !=</div><div class='del'>-				    8 + fnode-&gt;btree.n_used_nodes * (bp_internal(&amp;fnode-&gt;btree) ? 8 : 12)) {</div><div class='add'>+				    8 + fnode-&gt;btree.n_used_nodes * (bp_internal(GET_BTREE_PTR(&amp;fnode-&gt;btree)) ? 8 : 12)) {</div><div class='ctx'> 					hpfs_error(s,</div><div class='ctx'> 					    "bad first_free pointer in fnode %08lx",</div><div class='ctx'> 					    (unsigned long)ino);</div><div class='hunk'>@@ -233,12 +233,12 @@ struct anode *hpfs_map_anode(struct super_block *s, anode_secno ano, struct buff</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='ctx'> 			if ((unsigned)anode-&gt;btree.n_used_nodes + (unsigned)anode-&gt;btree.n_free_nodes !=</div><div class='del'>-			    (bp_internal(&amp;anode-&gt;btree) ? 60 : 40)) {</div><div class='add'>+			    (bp_internal(GET_BTREE_PTR(&amp;anode-&gt;btree)) ? 60 : 40)) {</div><div class='ctx'> 				hpfs_error(s, "bad number of nodes in anode %08x", ano);</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (le16_to_cpu(anode-&gt;btree.first_free) !=</div><div class='del'>-			    8 + anode-&gt;btree.n_used_nodes * (bp_internal(&amp;anode-&gt;btree) ? 8 : 12)) {</div><div class='add'>+			    8 + anode-&gt;btree.n_used_nodes * (bp_internal(GET_BTREE_PTR(&amp;anode-&gt;btree)) ? 8 : 12)) {</div><div class='ctx'> 				hpfs_error(s, "bad first_free pointer in anode %08x", ano);</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c<br/>index 9184b4584b01..353e13a615f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/namei.c</a></div><div class='hunk'>@@ -19,8 +19,8 @@ static void hpfs_update_directory_times(struct inode *dir)</div><div class='ctx'> 	hpfs_write_inode_nolock(dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hpfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *hpfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned char *name = dentry-&gt;d_name.name;</div><div class='ctx'> 	unsigned len = dentry-&gt;d_name.len;</div><div class='hunk'>@@ -35,7 +35,7 @@ static int hpfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct hpfs_dirent dee;</div><div class='ctx'> 	int err;</div><div class='del'>-	if ((err = hpfs_chk_name(name, &amp;len))) return err==-ENOENT ? -EINVAL : err;</div><div class='add'>+	if ((err = hpfs_chk_name(name, &amp;len))) return ERR_PTR(err==-ENOENT ? -EINVAL : err);</div><div class='ctx'> 	hpfs_lock(dir-&gt;i_sb);</div><div class='ctx'> 	err = -ENOSPC;</div><div class='ctx'> 	fnode = hpfs_alloc_fnode(dir-&gt;i_sb, hpfs_i(dir)-&gt;i_dno, &amp;fno, &amp;bh);</div><div class='hunk'>@@ -52,8 +52,10 @@ static int hpfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	dee.fnode = cpu_to_le32(fno);</div><div class='ctx'> 	dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(local_get_seconds(dir-&gt;i_sb));</div><div class='ctx'> 	result = new_inode(dir-&gt;i_sb);</div><div class='del'>-	if (!result)</div><div class='add'>+	if (!result) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto bail2;</div><div class='add'>+	}</div><div class='ctx'> 	hpfs_init_inode(result);</div><div class='ctx'> 	result-&gt;i_ino = fno;</div><div class='ctx'> 	hpfs_i(result)-&gt;i_parent_dir = dir-&gt;i_ino;</div><div class='hunk'>@@ -112,7 +114,7 @@ static int hpfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	hpfs_update_directory_times(dir);</div><div class='ctx'> 	d_instantiate(dentry, result);</div><div class='ctx'> 	hpfs_unlock(dir-&gt;i_sb);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> bail3:</div><div class='ctx'> 	iput(result);</div><div class='ctx'> bail2:</div><div class='hunk'>@@ -123,7 +125,7 @@ bail1:</div><div class='ctx'> 	hpfs_free_sectors(dir-&gt;i_sb, fno, 1);</div><div class='ctx'> bail:</div><div class='ctx'> 	hpfs_unlock(dir-&gt;i_sb);</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -153,9 +155,10 @@ static int hpfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(local_get_seconds(dir-&gt;i_sb));</div><div class='ctx'> </div><div class='ctx'> 	result = new_inode(dir-&gt;i_sb);</div><div class='del'>-	if (!result)</div><div class='add'>+	if (!result) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto bail1;</div><div class='del'>-	</div><div class='add'>+	}</div><div class='ctx'> 	hpfs_init_inode(result);</div><div class='ctx'> 	result-&gt;i_ino = fno;</div><div class='ctx'> 	result-&gt;i_mode |= S_IFREG;</div><div class='hunk'>@@ -239,9 +242,10 @@ static int hpfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(local_get_seconds(dir-&gt;i_sb));</div><div class='ctx'> </div><div class='ctx'> 	result = new_inode(dir-&gt;i_sb);</div><div class='del'>-	if (!result)</div><div class='add'>+	if (!result) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto bail1;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	hpfs_init_inode(result);</div><div class='ctx'> 	result-&gt;i_ino = fno;</div><div class='ctx'> 	hpfs_i(result)-&gt;i_parent_dir = dir-&gt;i_ino;</div><div class='hunk'>@@ -314,8 +318,10 @@ static int hpfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(local_get_seconds(dir-&gt;i_sb));</div><div class='ctx'> </div><div class='ctx'> 	result = new_inode(dir-&gt;i_sb);</div><div class='del'>-	if (!result)</div><div class='add'>+	if (!result) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto bail1;</div><div class='add'>+	}</div><div class='ctx'> 	result-&gt;i_ino = fno;</div><div class='ctx'> 	hpfs_init_inode(result);</div><div class='ctx'> 	hpfs_i(result)-&gt;i_parent_dir = dir-&gt;i_ino;</div><div class='hunk'>@@ -472,9 +478,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int hpfs_symlink_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	char *link = page_address(page);</div><div class='del'>-	struct inode *i = page-&gt;mapping-&gt;host;</div><div class='add'>+	char *link = folio_address(folio);</div><div class='add'>+	struct inode *i = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct fnode *fnode;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -485,17 +490,9 @@ static int hpfs_symlink_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	err = hpfs_read_ea(i-&gt;i_sb, fnode, "SYMLINK", link, PAGE_SIZE);</div><div class='ctx'> 	brelse(bh);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail;</div><div class='del'>-	hpfs_unlock(i-&gt;i_sb);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='ctx'> fail:</div><div class='ctx'> 	hpfs_unlock(i-&gt;i_sb);</div><div class='del'>-	SetPageError(page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_end_read(folio, err == 0);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c<br/>index 6b0ba3c1efba..371aa6de8075 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hpfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hpfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hpfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hpfs/super.c</a></div><div class='hunk'>@@ -9,7 +9,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "hpfs_fn.h"</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='hunk'>@@ -90,7 +92,7 @@ void hpfs_error(struct super_block *s, const char *fmt, ...)</div><div class='ctx'> 	hpfs_sb(s)-&gt;sb_was_error = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * A little trick to detect cycles in many hpfs structures and don't let the</div><div class='ctx'>  * kernel crash on corrupted filesystem. When first called, set c2 to 0.</div><div class='ctx'>  *</div><div class='hunk'>@@ -255,7 +257,7 @@ static int init_inodecache(void)</div><div class='ctx'> 	hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",</div><div class='ctx'> 					     sizeof(struct hpfs_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (hpfs_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -272,146 +274,70 @@ static void destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(hpfs_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A tiny parser for option strings, stolen from dosfs.</div><div class='del'>- * Stolen again from read-only hpfs.</div><div class='del'>- * And updated for table-driven option parsing.</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='del'>-	Opt_help, Opt_uid, Opt_gid, Opt_umask, Opt_case_lower, Opt_case_asis,</div><div class='del'>-	Opt_check_none, Opt_check_normal, Opt_check_strict,</div><div class='del'>-	Opt_err_cont, Opt_err_ro, Opt_err_panic,</div><div class='del'>-	Opt_eas_no, Opt_eas_ro, Opt_eas_rw,</div><div class='del'>-	Opt_chkdsk_no, Opt_chkdsk_errors, Opt_chkdsk_always,</div><div class='del'>-	Opt_timeshift, Opt_err,</div><div class='add'>+	Opt_help, Opt_uid, Opt_gid, Opt_umask, Opt_case,</div><div class='add'>+	Opt_check, Opt_err, Opt_eas, Opt_chkdsk, Opt_timeshift,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_help, "help"},</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_umask, "umask=%o"},</div><div class='del'>-	{Opt_case_lower, "case=lower"},</div><div class='del'>-	{Opt_case_asis, "case=asis"},</div><div class='del'>-	{Opt_check_none, "check=none"},</div><div class='del'>-	{Opt_check_normal, "check=normal"},</div><div class='del'>-	{Opt_check_strict, "check=strict"},</div><div class='del'>-	{Opt_err_cont, "errors=continue"},</div><div class='del'>-	{Opt_err_ro, "errors=remount-ro"},</div><div class='del'>-	{Opt_err_panic, "errors=panic"},</div><div class='del'>-	{Opt_eas_no, "eas=no"},</div><div class='del'>-	{Opt_eas_ro, "eas=ro"},</div><div class='del'>-	{Opt_eas_rw, "eas=rw"},</div><div class='del'>-	{Opt_chkdsk_no, "chkdsk=no"},</div><div class='del'>-	{Opt_chkdsk_errors, "chkdsk=errors"},</div><div class='del'>-	{Opt_chkdsk_always, "chkdsk=always"},</div><div class='del'>-	{Opt_timeshift, "timeshift=%d"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='add'>+static const struct constant_table hpfs_param_case[] = {</div><div class='add'>+	{"asis",	0},</div><div class='add'>+	{"lower",	1},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_opts(char *opts, kuid_t *uid, kgid_t *gid, umode_t *umask,</div><div class='del'>-		      int *lowercase, int *eas, int *chk, int *errs,</div><div class='del'>-		      int *chkdsk, int *timeshift)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	int option;</div><div class='add'>+static const struct constant_table hpfs_param_check[] = {</div><div class='add'>+	{"none",	0},</div><div class='add'>+	{"normal",	1},</div><div class='add'>+	{"strict",	2},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (!opts)</div><div class='del'>-		return 1;</div><div class='add'>+static const struct constant_table hpfs_param_err[] = {</div><div class='add'>+	{"continue",	0},</div><div class='add'>+	{"remount-ro",	1},</div><div class='add'>+	{"panic",	2},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	/*pr_info("Parsing opts: '%s'\n",opts);*/</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;opts, ",")) != NULL) {</div><div class='del'>-		substring_t args[MAX_OPT_ARGS];</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_help:</div><div class='del'>-			return 2;</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(args, &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			*uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(*uid))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(args, &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			*gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(*gid))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_umask:</div><div class='del'>-			if (match_octal(args, &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			*umask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_case_lower:</div><div class='del'>-			*lowercase = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_case_asis:</div><div class='del'>-			*lowercase = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_none:</div><div class='del'>-			*chk = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_normal:</div><div class='del'>-			*chk = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_strict:</div><div class='del'>-			*chk = 2;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_cont:</div><div class='del'>-			*errs = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_ro:</div><div class='del'>-			*errs = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_panic:</div><div class='del'>-			*errs = 2;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_eas_no:</div><div class='del'>-			*eas = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_eas_ro:</div><div class='del'>-			*eas = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_eas_rw:</div><div class='del'>-			*eas = 2;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_chkdsk_no:</div><div class='del'>-			*chkdsk = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_chkdsk_errors:</div><div class='del'>-			*chkdsk = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_chkdsk_always:</div><div class='del'>-			*chkdsk = 2;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_timeshift:</div><div class='del'>-		{</div><div class='del'>-			int m = 1;</div><div class='del'>-			char *rhs = args[0].from;</div><div class='del'>-			if (!rhs || !*rhs)</div><div class='del'>-				return 0;</div><div class='del'>-			if (*rhs == '-') m = -1;</div><div class='del'>-			if (*rhs == '+' || *rhs == '-') rhs++;</div><div class='del'>-			*timeshift = simple_strtoul(rhs, &amp;rhs, 0) * m;</div><div class='del'>-			if (*rhs)</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='add'>+static const struct constant_table hpfs_param_eas[] = {</div><div class='add'>+	{"no",		0},</div><div class='add'>+	{"ro",		1},</div><div class='add'>+	{"rw",		2},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table hpfs_param_chkdsk[] = {</div><div class='add'>+	{"no",		0},</div><div class='add'>+	{"errors",	1},</div><div class='add'>+	{"always",	2},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec hpfs_param_spec[] = {</div><div class='add'>+	fsparam_flag	("help",	Opt_help),</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct	("umask",	Opt_umask),</div><div class='add'>+	fsparam_enum	("case",	Opt_case,	hpfs_param_case),</div><div class='add'>+	fsparam_enum	("check",	Opt_check,	hpfs_param_check),</div><div class='add'>+	fsparam_enum	("errors",	Opt_err,	hpfs_param_err),</div><div class='add'>+	fsparam_enum	("eas",		Opt_eas,	hpfs_param_eas),</div><div class='add'>+	fsparam_enum	("chkdsk",	Opt_chkdsk,	hpfs_param_chkdsk),</div><div class='add'>+	fsparam_s32	("timeshift",	Opt_timeshift),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpfs_fc_context {</div><div class='add'>+	kuid_t uid;</div><div class='add'>+	kgid_t gid;</div><div class='add'>+	umode_t umask;</div><div class='add'>+	int lowercase;</div><div class='add'>+	int eas;</div><div class='add'>+	int chk;</div><div class='add'>+	int errs;</div><div class='add'>+	int chkdsk;</div><div class='add'>+	int timeshift;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static inline void hpfs_help(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -439,49 +365,88 @@ HPFS filesystem options:\n\</div><div class='ctx'> \n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)</div><div class='add'>+static int hpfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-	umode_t umask;</div><div class='del'>-	int lowercase, eas, chk, errs, chkdsk, timeshift;</div><div class='del'>-	int o;</div><div class='add'>+	struct hpfs_fc_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, hpfs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_help:</div><div class='add'>+		hpfs_help();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		ctx-&gt;uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		ctx-&gt;gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_umask:</div><div class='add'>+		ctx-&gt;umask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_case:</div><div class='add'>+		ctx-&gt;lowercase = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_check:</div><div class='add'>+		ctx-&gt;chk = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_err:</div><div class='add'>+		ctx-&gt;errs = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_eas:</div><div class='add'>+		ctx-&gt;eas = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_chkdsk:</div><div class='add'>+		ctx-&gt;chkdsk = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_timeshift:</div><div class='add'>+		{</div><div class='add'>+			char *rhs = param-&gt;string;</div><div class='add'>+			int timeshift;</div><div class='add'>+</div><div class='add'>+			if (kstrtoint(rhs, 0, &amp;timeshift))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			ctx-&gt;timeshift = timeshift;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hpfs_reconfigure(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct hpfs_fc_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct super_block *s = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct hpfs_sb_info *sbi = hpfs_sb(s);</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(s);</div><div class='ctx'> </div><div class='del'>-	*flags |= SB_NOATIME;</div><div class='add'>+	fc-&gt;sb_flags |= SB_NOATIME;</div><div class='ctx'> </div><div class='ctx'> 	hpfs_lock(s);</div><div class='del'>-	uid = sbi-&gt;sb_uid; gid = sbi-&gt;sb_gid;</div><div class='del'>-	umask = 0777 &amp; ~sbi-&gt;sb_mode;</div><div class='del'>-	lowercase = sbi-&gt;sb_lowercase;</div><div class='del'>-	eas = sbi-&gt;sb_eas; chk = sbi-&gt;sb_chk; chkdsk = sbi-&gt;sb_chkdsk;</div><div class='del'>-	errs = sbi-&gt;sb_err; timeshift = sbi-&gt;sb_timeshift;</div><div class='del'>-</div><div class='del'>-	if (!(o = parse_opts(data, &amp;uid, &amp;gid, &amp;umask, &amp;lowercase,</div><div class='del'>-	    &amp;eas, &amp;chk, &amp;errs, &amp;chkdsk, &amp;timeshift))) {</div><div class='del'>-		pr_err("bad mount options.\n");</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	if (o == 2) {</div><div class='del'>-		hpfs_help();</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	if (timeshift != sbi-&gt;sb_timeshift) {</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;timeshift != sbi-&gt;sb_timeshift) {</div><div class='ctx'> 		pr_err("timeshift can't be changed using remount.\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	unmark_dirty(s);</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;sb_uid = uid; sbi-&gt;sb_gid = gid;</div><div class='del'>-	sbi-&gt;sb_mode = 0777 &amp; ~umask;</div><div class='del'>-	sbi-&gt;sb_lowercase = lowercase;</div><div class='del'>-	sbi-&gt;sb_eas = eas; sbi-&gt;sb_chk = chk; sbi-&gt;sb_chkdsk = chkdsk;</div><div class='del'>-	sbi-&gt;sb_err = errs; sbi-&gt;sb_timeshift = timeshift;</div><div class='add'>+	sbi-&gt;sb_uid = ctx-&gt;uid; sbi-&gt;sb_gid = ctx-&gt;gid;</div><div class='add'>+	sbi-&gt;sb_mode = 0777 &amp; ~ctx-&gt;umask;</div><div class='add'>+	sbi-&gt;sb_lowercase = ctx-&gt;lowercase;</div><div class='add'>+	sbi-&gt;sb_eas = ctx-&gt;eas; sbi-&gt;sb_chk = ctx-&gt;chk;</div><div class='add'>+	sbi-&gt;sb_chkdsk = ctx-&gt;chkdsk;</div><div class='add'>+	sbi-&gt;sb_err = ctx-&gt;errs; sbi-&gt;sb_timeshift = ctx-&gt;timeshift;</div><div class='ctx'> </div><div class='del'>-	if (!(*flags &amp; SB_RDONLY)) mark_dirty(s, 1);</div><div class='add'>+	if (!(fc-&gt;sb_flags &amp; SB_RDONLY)) mark_dirty(s, 1);</div><div class='ctx'> </div><div class='ctx'> 	hpfs_unlock(s);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -530,30 +495,24 @@ static const struct super_operations hpfs_sops =</div><div class='ctx'> 	.evict_inode	= hpfs_evict_inode,</div><div class='ctx'> 	.put_super	= hpfs_put_super,</div><div class='ctx'> 	.statfs		= hpfs_statfs,</div><div class='del'>-	.remount_fs	= hpfs_remount_fs,</div><div class='ctx'> 	.show_options	= hpfs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hpfs_fill_super(struct super_block *s, void *options, int silent)</div><div class='add'>+static int hpfs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct hpfs_fc_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct buffer_head *bh0, *bh1, *bh2;</div><div class='ctx'> 	struct hpfs_boot_block *bootblock;</div><div class='ctx'> 	struct hpfs_super_block *superblock;</div><div class='ctx'> 	struct hpfs_spare_block *spareblock;</div><div class='ctx'> 	struct hpfs_sb_info *sbi;</div><div class='ctx'> 	struct inode *root;</div><div class='del'>-</div><div class='del'>-	kuid_t uid;</div><div class='del'>-	kgid_t gid;</div><div class='del'>-	umode_t umask;</div><div class='del'>-	int lowercase, eas, chk, errs, chkdsk, timeshift;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	dnode_secno root_dno;</div><div class='ctx'> 	struct hpfs_dirent *de = NULL;</div><div class='ctx'> 	struct quad_buffer_head qbh;</div><div class='ctx'> </div><div class='del'>-	int o;</div><div class='del'>-</div><div class='ctx'> 	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='ctx'> 	if (!sbi) {</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -563,26 +522,6 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)</div><div class='ctx'> 	mutex_init(&amp;sbi-&gt;hpfs_mutex);</div><div class='ctx'> 	hpfs_lock(s);</div><div class='ctx'> </div><div class='del'>-	uid = current_uid();</div><div class='del'>-	gid = current_gid();</div><div class='del'>-	umask = current_umask();</div><div class='del'>-	lowercase = 0;</div><div class='del'>-	eas = 2;</div><div class='del'>-	chk = 1;</div><div class='del'>-	errs = 1;</div><div class='del'>-	chkdsk = 1;</div><div class='del'>-	timeshift = 0;</div><div class='del'>-</div><div class='del'>-	if (!(o = parse_opts(options, &amp;uid, &amp;gid, &amp;umask, &amp;lowercase,</div><div class='del'>-	    &amp;eas, &amp;chk, &amp;errs, &amp;chkdsk, &amp;timeshift))) {</div><div class='del'>-		pr_err("bad mount options.\n");</div><div class='del'>-		goto bail0;</div><div class='del'>-	}</div><div class='del'>-	if (o==2) {</div><div class='del'>-		hpfs_help();</div><div class='del'>-		goto bail0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*sbi-&gt;sb_mounting = 1;*/</div><div class='ctx'> 	sb_set_blocksize(s, 512);</div><div class='ctx'> 	sbi-&gt;sb_fs_size = -1;</div><div class='hunk'>@@ -612,7 +551,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)</div><div class='ctx'> 	/* Fill superblock stuff */</div><div class='ctx'> 	s-&gt;s_magic = HPFS_SUPER_MAGIC;</div><div class='ctx'> 	s-&gt;s_op = &amp;hpfs_sops;</div><div class='del'>-	s-&gt;s_d_op = &amp;hpfs_dentry_operations;</div><div class='add'>+	set_default_d_op(s, &amp;hpfs_dentry_operations);</div><div class='ctx'> 	s-&gt;s_time_min =  local_to_gmt(s, 0);</div><div class='ctx'> 	s-&gt;s_time_max =  local_to_gmt(s, U32_MAX);</div><div class='ctx'> </div><div class='hunk'>@@ -622,17 +561,17 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)</div><div class='ctx'> 	sbi-&gt;sb_dirband_start = le32_to_cpu(superblock-&gt;dir_band_start);</div><div class='ctx'> 	sbi-&gt;sb_dirband_size = le32_to_cpu(superblock-&gt;n_dir_band);</div><div class='ctx'> 	sbi-&gt;sb_dmap = le32_to_cpu(superblock-&gt;dir_band_bitmap);</div><div class='del'>-	sbi-&gt;sb_uid = uid;</div><div class='del'>-	sbi-&gt;sb_gid = gid;</div><div class='del'>-	sbi-&gt;sb_mode = 0777 &amp; ~umask;</div><div class='add'>+	sbi-&gt;sb_uid = ctx-&gt;uid;</div><div class='add'>+	sbi-&gt;sb_gid = ctx-&gt;gid;</div><div class='add'>+	sbi-&gt;sb_mode = 0777 &amp; ~ctx-&gt;umask;</div><div class='ctx'> 	sbi-&gt;sb_n_free = -1;</div><div class='ctx'> 	sbi-&gt;sb_n_free_dnodes = -1;</div><div class='del'>-	sbi-&gt;sb_lowercase = lowercase;</div><div class='del'>-	sbi-&gt;sb_eas = eas;</div><div class='del'>-	sbi-&gt;sb_chk = chk;</div><div class='del'>-	sbi-&gt;sb_chkdsk = chkdsk;</div><div class='del'>-	sbi-&gt;sb_err = errs;</div><div class='del'>-	sbi-&gt;sb_timeshift = timeshift;</div><div class='add'>+	sbi-&gt;sb_lowercase = ctx-&gt;lowercase;</div><div class='add'>+	sbi-&gt;sb_eas = ctx-&gt;eas;</div><div class='add'>+	sbi-&gt;sb_chk = ctx-&gt;chk;</div><div class='add'>+	sbi-&gt;sb_chkdsk = ctx-&gt;chkdsk;</div><div class='add'>+	sbi-&gt;sb_err = ctx-&gt;errs;</div><div class='add'>+	sbi-&gt;sb_timeshift = ctx-&gt;timeshift;</div><div class='ctx'> 	sbi-&gt;sb_was_error = 0;</div><div class='ctx'> 	sbi-&gt;sb_cp_table = NULL;</div><div class='ctx'> 	sbi-&gt;sb_c_bitmap = -1;</div><div class='hunk'>@@ -653,7 +592,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Check for general fs errors*/</div><div class='ctx'> 	if (spareblock-&gt;dirty &amp;&amp; !spareblock-&gt;old_wrote) {</div><div class='del'>-		if (errs == 2) {</div><div class='add'>+		if (sbi-&gt;sb_err == 2) {</div><div class='ctx'> 			pr_err("Improperly stopped, not mounted\n");</div><div class='ctx'> 			goto bail4;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -667,16 +606,16 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (le32_to_cpu(spareblock-&gt;n_dnode_spares) != le32_to_cpu(spareblock-&gt;n_dnode_spares_free)) {</div><div class='del'>-		if (errs &gt;= 2) {</div><div class='add'>+		if (sbi-&gt;sb_err &gt;= 2) {</div><div class='ctx'> 			pr_err("Spare dnodes used, try chkdsk\n");</div><div class='ctx'> 			mark_dirty(s, 0);</div><div class='ctx'> 			goto bail4;</div><div class='ctx'> 		}</div><div class='ctx'> 		hpfs_error(s, "warning: spare dnodes used, try chkdsk");</div><div class='del'>-		if (errs == 0)</div><div class='add'>+		if (sbi-&gt;sb_err == 0)</div><div class='ctx'> 			pr_err("Proceeding, but your filesystem could be corrupted if you delete files or directories\n");</div><div class='ctx'> 	}</div><div class='del'>-	if (chk) {</div><div class='add'>+	if (sbi-&gt;sb_chk) {</div><div class='ctx'> 		unsigned a;</div><div class='ctx'> 		if (le32_to_cpu(superblock-&gt;dir_band_end) - le32_to_cpu(superblock-&gt;dir_band_start) + 1 != le32_to_cpu(superblock-&gt;n_dir_band) ||</div><div class='ctx'> 		    le32_to_cpu(superblock-&gt;dir_band_end) &lt; le32_to_cpu(superblock-&gt;dir_band_start) || le32_to_cpu(superblock-&gt;n_dir_band) &gt; 0x4000) {</div><div class='hunk'>@@ -755,18 +694,70 @@ bail0:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *hpfs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int hpfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, hpfs_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, hpfs_fill_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hpfs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations hpfs_fc_context_ops = {</div><div class='add'>+	.parse_param	= hpfs_parse_param,</div><div class='add'>+	.get_tree	= hpfs_get_tree,</div><div class='add'>+	.reconfigure	= hpfs_reconfigure,</div><div class='add'>+	.free		= hpfs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hpfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct hpfs_fc_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct hpfs_fc_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+		struct hpfs_sb_info *sbi = hpfs_sb(sb);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;uid = sbi-&gt;sb_uid;</div><div class='add'>+		ctx-&gt;gid = sbi-&gt;sb_gid;</div><div class='add'>+		ctx-&gt;umask = 0777 &amp; ~sbi-&gt;sb_mode;</div><div class='add'>+		ctx-&gt;lowercase = sbi-&gt;sb_lowercase;</div><div class='add'>+		ctx-&gt;eas = sbi-&gt;sb_eas;</div><div class='add'>+		ctx-&gt;chk = sbi-&gt;sb_chk;</div><div class='add'>+		ctx-&gt;chkdsk = sbi-&gt;sb_chkdsk;</div><div class='add'>+		ctx-&gt;errs = sbi-&gt;sb_err;</div><div class='add'>+		ctx-&gt;timeshift = sbi-&gt;sb_timeshift;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;uid = current_uid();</div><div class='add'>+		ctx-&gt;gid = current_gid();</div><div class='add'>+		ctx-&gt;umask = current_umask();</div><div class='add'>+		ctx-&gt;lowercase = 0;</div><div class='add'>+		ctx-&gt;eas = 2;</div><div class='add'>+		ctx-&gt;chk = 1;</div><div class='add'>+		ctx-&gt;errs = 1;</div><div class='add'>+		ctx-&gt;chkdsk = 1;</div><div class='add'>+		ctx-&gt;timeshift = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;hpfs_fc_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct file_system_type hpfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "hpfs",</div><div class='del'>-	.mount		= hpfs_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = hpfs_init_fs_context,</div><div class='add'>+	.parameters	= hpfs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("hpfs");</div><div class='ctx'> </div><div class='hunk'>@@ -793,4 +784,5 @@ static void __exit exit_hpfs_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_hpfs_fs)</div><div class='ctx'> module_exit(exit_hpfs_fs)</div><div class='add'>+MODULE_DESCRIPTION("OS/2 HPFS file system support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c<br/>index ea5b8e57d904..3b4c152c5c73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/hugetlbfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/hugetlbfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/hugetlbfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/hugetlbfs/inode.c</a></div><div class='hunk'>@@ -39,8 +39,11 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> </div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/hugetlbfs.h&gt;</div><div class='add'>+</div><div class='ctx'> static const struct address_space_operations hugetlbfs_aops;</div><div class='del'>-const struct file_operations hugetlbfs_file_operations;</div><div class='add'>+static const struct file_operations hugetlbfs_file_operations;</div><div class='ctx'> static const struct inode_operations hugetlbfs_dir_inode_operations;</div><div class='ctx'> static const struct inode_operations hugetlbfs_inode_operations;</div><div class='ctx'> </div><div class='hunk'>@@ -73,13 +76,13 @@ enum hugetlb_param {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fs_parameter_spec hugetlb_fs_parameters[] = {</div><div class='del'>-	fsparam_u32   ("gid",		Opt_gid),</div><div class='add'>+	fsparam_gid   ("gid",		Opt_gid),</div><div class='ctx'> 	fsparam_string("min_size",	Opt_min_size),</div><div class='ctx'> 	fsparam_u32oct("mode",		Opt_mode),</div><div class='ctx'> 	fsparam_string("nr_inodes",	Opt_nr_inodes),</div><div class='ctx'> 	fsparam_string("pagesize",	Opt_pagesize),</div><div class='ctx'> 	fsparam_string("size",		Opt_size),</div><div class='del'>-	fsparam_u32   ("uid",		Opt_uid),</div><div class='add'>+	fsparam_uid   ("uid",		Opt_uid),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -93,13 +96,20 @@ static const struct fs_parameter_spec hugetlb_fs_parameters[] = {</div><div class='ctx'> #define PGOFF_LOFFT_MAX \</div><div class='ctx'> 	(((1UL &lt;&lt; (PAGE_SHIFT + 1)) - 1) &lt;&lt;  (BITS_PER_LONG - (PAGE_SHIFT + 1)))</div><div class='ctx'> </div><div class='del'>-static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int hugetlb_file_mmap_prepare_success(const struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	/* Unfortunate we have to reassign vma-&gt;vm_private_data. */</div><div class='add'>+	return hugetlb_vma_lock_alloc((struct vm_area_struct *)vma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hugetlbfs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);</div><div class='ctx'> 	loff_t len, vma_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct hstate *h = hstate_file(file);</div><div class='add'>+	vm_flags_t vm_flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * vma address alignment (but not the pgoff alignment) has</div><div class='hunk'>@@ -109,12 +119,8 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	 * way when do_mmap unwinds (may be important on powerpc</div><div class='ctx'> 	 * and ia64).</div><div class='ctx'> 	 */</div><div class='del'>-	vm_flags_set(vma, VM_HUGETLB | VM_DONTEXPAND);</div><div class='del'>-	vma-&gt;vm_ops = &amp;hugetlb_vm_ops;</div><div class='del'>-</div><div class='del'>-	ret = seal_check_write(info-&gt;seals, vma);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	desc-&gt;vm_flags |= VM_HUGETLB | VM_DONTEXPAND;</div><div class='add'>+	desc-&gt;vm_ops = &amp;hugetlb_vm_ops;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * page based offset in vm_pgoff could be sufficiently large to</div><div class='hunk'>@@ -123,16 +129,16 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	 * sizeof(unsigned long).  So, only check in those instances.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sizeof(unsigned long) == sizeof(loff_t)) {</div><div class='del'>-		if (vma-&gt;vm_pgoff &amp; PGOFF_LOFFT_MAX)</div><div class='add'>+		if (desc-&gt;pgoff &amp; PGOFF_LOFFT_MAX)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* must be huge page aligned */</div><div class='del'>-	if (vma-&gt;vm_pgoff &amp; (~huge_page_mask(h) &gt;&gt; PAGE_SHIFT))</div><div class='add'>+	if (desc-&gt;pgoff &amp; (~huge_page_mask(h) &gt;&gt; PAGE_SHIFT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	vma_len = (loff_t)(vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='del'>-	len = vma_len + ((loff_t)vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	vma_len = (loff_t)vma_desc_size(desc);</div><div class='add'>+	len = vma_len + ((loff_t)desc-&gt;pgoff &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> 	/* check for overflow */</div><div class='ctx'> 	if (len &lt; vma_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -141,18 +147,41 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	file_accessed(file);</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='del'>-	if (!hugetlb_reserve_pages(inode,</div><div class='del'>-				vma-&gt;vm_pgoff &gt;&gt; huge_page_order(h),</div><div class='del'>-				len &gt;&gt; huge_page_shift(h), vma,</div><div class='del'>-				vma-&gt;vm_flags))</div><div class='add'>+</div><div class='add'>+	vm_flags = desc-&gt;vm_flags;</div><div class='add'>+	/*</div><div class='add'>+	 * for SHM_HUGETLB, the pages are reserved in the shmget() call so skip</div><div class='add'>+	 * reserving here. Note: only for SHM hugetlbfs file, the inode</div><div class='add'>+	 * flag S_PRIVATE is set.</div><div class='add'>+	 */</div><div class='add'>+	if (inode-&gt;i_flags &amp; S_PRIVATE)</div><div class='add'>+		vm_flags |= VM_NORESERVE;</div><div class='add'>+</div><div class='add'>+	if (hugetlb_reserve_pages(inode,</div><div class='add'>+			desc-&gt;pgoff &gt;&gt; huge_page_order(h),</div><div class='add'>+			len &gt;&gt; huge_page_shift(h), desc,</div><div class='add'>+			vm_flags) &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_WRITE &amp;&amp; inode-&gt;i_size &lt; len)</div><div class='add'>+	if ((desc-&gt;vm_flags &amp; VM_WRITE) &amp;&amp; inode-&gt;i_size &lt; len)</div><div class='ctx'> 		i_size_write(inode, len);</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* Allocate the VMA lock after we set it up. */</div><div class='add'>+		desc-&gt;action.success_hook = hugetlb_file_mmap_prepare_success;</div><div class='add'>+		/*</div><div class='add'>+		 * We cannot permit the rmap finding this VMA in the time</div><div class='add'>+		 * between the VMA being inserted into the VMA tree and the</div><div class='add'>+		 * completion/success hook being invoked.</div><div class='add'>+		 *</div><div class='add'>+		 * This is because we establish a per-VMA hugetlb lock which can</div><div class='add'>+		 * be raced by rmap.</div><div class='add'>+		 */</div><div class='add'>+		desc-&gt;action.hide_from_rmap_until_complete = true;</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -160,138 +189,47 @@ out:</div><div class='ctx'>  * Called under mmap_write_lock(mm).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned long</div><div class='del'>-hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr,</div><div class='del'>-		unsigned long len, unsigned long pgoff, unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	struct hstate *h = hstate_file(file);</div><div class='del'>-	struct vm_unmapped_area_info info;</div><div class='del'>-</div><div class='del'>-	info.flags = 0;</div><div class='del'>-	info.length = len;</div><div class='del'>-	info.low_limit = current-&gt;mm-&gt;mmap_base;</div><div class='del'>-	info.high_limit = arch_get_mmap_end(addr, len, flags);</div><div class='del'>-	info.align_mask = PAGE_MASK &amp; ~huge_page_mask(h);</div><div class='del'>-	info.align_offset = 0;</div><div class='del'>-	return vm_unmapped_area(&amp;info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr,</div><div class='del'>-		unsigned long len, unsigned long pgoff, unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	struct hstate *h = hstate_file(file);</div><div class='del'>-	struct vm_unmapped_area_info info;</div><div class='del'>-</div><div class='del'>-	info.flags = VM_UNMAPPED_AREA_TOPDOWN;</div><div class='del'>-	info.length = len;</div><div class='del'>-	info.low_limit = PAGE_SIZE;</div><div class='del'>-	info.high_limit = arch_get_mmap_base(addr, current-&gt;mm-&gt;mmap_base);</div><div class='del'>-	info.align_mask = PAGE_MASK &amp; ~huge_page_mask(h);</div><div class='del'>-	info.align_offset = 0;</div><div class='del'>-	addr = vm_unmapped_area(&amp;info);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * A failed mmap() very likely causes application failure,</div><div class='del'>-	 * so fall back to the bottom-up function here. This scenario</div><div class='del'>-	 * can happen with large stack limits and large mmap()</div><div class='del'>-	 * allocations.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(offset_in_page(addr))) {</div><div class='del'>-		VM_BUG_ON(addr != -ENOMEM);</div><div class='del'>-		info.flags = 0;</div><div class='del'>-		info.low_limit = current-&gt;mm-&gt;mmap_base;</div><div class='del'>-		info.high_limit = arch_get_mmap_end(addr, len, flags);</div><div class='del'>-		addr = vm_unmapped_area(&amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> unsigned long</div><div class='del'>-generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='del'>-				  unsigned long len, unsigned long pgoff,</div><div class='del'>-				  unsigned long flags)</div><div class='add'>+hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='add'>+			    unsigned long len, unsigned long pgoff,</div><div class='add'>+			    unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	struct mm_struct *mm = current-&gt;mm;</div><div class='del'>-	struct vm_area_struct *vma;</div><div class='add'>+	unsigned long addr0 = 0;</div><div class='ctx'> 	struct hstate *h = hstate_file(file);</div><div class='del'>-	const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (len &amp; ~huge_page_mask(h))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (len &gt; TASK_SIZE)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; MAP_FIXED) {</div><div class='del'>-		if (prepare_hugepage_range(file, addr, len))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		return addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (addr) {</div><div class='del'>-		addr = ALIGN(addr, huge_page_size(h));</div><div class='del'>-		vma = find_vma(mm, addr);</div><div class='del'>-		if (mmap_end - len &gt;= addr &amp;&amp;</div><div class='del'>-		    (!vma || addr + len &lt;= vm_start_gap(vma)))</div><div class='del'>-			return addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Use mm-&gt;get_unmapped_area value as a hint to use topdown routine.</div><div class='del'>-	 * If architectures have special needs, they should define their own</div><div class='del'>-	 * version of hugetlb_get_unmapped_area.</div><div class='del'>-	 */</div><div class='del'>-	if (mm-&gt;get_unmapped_area == arch_get_unmapped_area_topdown)</div><div class='del'>-		return hugetlb_get_unmapped_area_topdown(file, addr, len,</div><div class='del'>-				pgoff, flags);</div><div class='del'>-	return hugetlb_get_unmapped_area_bottomup(file, addr, len,</div><div class='del'>-			pgoff, flags);</div><div class='del'>-}</div><div class='add'>+	if ((flags &amp; MAP_FIXED) &amp;&amp; (addr &amp; ~huge_page_mask(h)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (addr)</div><div class='add'>+		addr0 = ALIGN(addr, huge_page_size(h));</div><div class='ctx'> </div><div class='del'>-#ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA</div><div class='del'>-static unsigned long</div><div class='del'>-hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='del'>-			  unsigned long len, unsigned long pgoff,</div><div class='del'>-			  unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	return generic_hugetlb_get_unmapped_area(file, addr, len, pgoff, flags);</div><div class='add'>+	return mm_get_unmapped_area_vmflags(file, addr0, len, pgoff, flags, 0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Someone wants to read @bytes from a HWPOISON hugetlb @page from @offset.</div><div class='add'>+ * Someone wants to read @bytes from a HWPOISON hugetlb @folio from @offset.</div><div class='ctx'>  * Returns the maximum number of bytes one can read without touching the 1st raw</div><div class='del'>- * HWPOISON subpage.</div><div class='del'>- *</div><div class='del'>- * The implementation borrows the iteration logic from copy_page_to_iter*.</div><div class='add'>+ * HWPOISON page.</div><div class='ctx'>  */</div><div class='del'>-static size_t adjust_range_hwpoison(struct page *page, size_t offset, size_t bytes)</div><div class='add'>+static size_t adjust_range_hwpoison(struct folio *folio, size_t offset,</div><div class='add'>+		size_t bytes)</div><div class='ctx'> {</div><div class='del'>-	size_t n = 0;</div><div class='del'>-	size_t res = 0;</div><div class='add'>+	struct page *page = folio_page(folio, offset / PAGE_SIZE);</div><div class='add'>+	size_t safe_bytes;</div><div class='ctx'> </div><div class='del'>-	/* First subpage to start the loop. */</div><div class='del'>-	page = nth_page(page, offset / PAGE_SIZE);</div><div class='del'>-	offset %= PAGE_SIZE;</div><div class='del'>-	while (1) {</div><div class='del'>-		if (is_raw_hwpoison_page_in_hugepage(page))</div><div class='del'>-			break;</div><div class='add'>+	if (is_raw_hwpoison_page_in_hugepage(page))</div><div class='add'>+		return 0;</div><div class='add'>+	/* Safe to read the remaining bytes in this page. */</div><div class='add'>+	safe_bytes = PAGE_SIZE - (offset % PAGE_SIZE);</div><div class='add'>+	page++;</div><div class='ctx'> </div><div class='del'>-		/* Safe to read n bytes without touching HWPOISON subpage. */</div><div class='del'>-		n = min(bytes, (size_t)PAGE_SIZE - offset);</div><div class='del'>-		res += n;</div><div class='del'>-		bytes -= n;</div><div class='del'>-		if (!bytes || !n)</div><div class='add'>+	/* Check each remaining page as long as we are not done yet. */</div><div class='add'>+	for (; safe_bytes &lt; bytes; safe_bytes += PAGE_SIZE, page++)</div><div class='add'>+		if (is_raw_hwpoison_page_in_hugepage(page))</div><div class='ctx'> 			break;</div><div class='del'>-		offset += n;</div><div class='del'>-		if (offset == PAGE_SIZE) {</div><div class='del'>-			page = nth_page(page, 1);</div><div class='del'>-			offset = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return res;</div><div class='add'>+	return min(safe_bytes, bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -340,15 +278,15 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			folio_unlock(folio);</div><div class='ctx'> </div><div class='del'>-			if (!folio_test_has_hwpoisoned(folio))</div><div class='add'>+			if (!folio_test_hwpoison(folio))</div><div class='ctx'> 				want = nr;</div><div class='ctx'> 			else {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Adjust how many bytes safe to read without</div><div class='del'>-				 * touching the 1st raw HWPOISON subpage after</div><div class='add'>+				 * touching the 1st raw HWPOISON page after</div><div class='ctx'> 				 * offset.</div><div class='ctx'> 				 */</div><div class='del'>-				want = adjust_range_hwpoison(&amp;folio-&gt;page, offset, nr);</div><div class='add'>+				want = adjust_range_hwpoison(folio, offset, nr);</div><div class='ctx'> 				if (want == 0) {</div><div class='ctx'> 					folio_put(folio);</div><div class='ctx'> 					retval = -EIO;</div><div class='hunk'>@@ -376,17 +314,18 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hugetlbfs_write_begin(struct file *file,</div><div class='add'>+static int hugetlbfs_write_begin(const struct kiocb *iocb,</div><div class='ctx'> 			struct address_space *mapping,</div><div class='ctx'> 			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+			struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hugetlbfs_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+static int hugetlbfs_write_end(const struct kiocb *iocb,</div><div class='add'>+			       struct address_space *mapping,</div><div class='add'>+			       loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			       struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -405,8 +344,8 @@ static void hugetlb_delete_from_page_cache(struct folio *folio)</div><div class='ctx'>  * mutex for the page in the mapping.  So, we can not race with page being</div><div class='ctx'>  * faulted into the vma.</div><div class='ctx'>  */</div><div class='del'>-static bool hugetlb_vma_maps_page(struct vm_area_struct *vma,</div><div class='del'>-				unsigned long addr, struct page *page)</div><div class='add'>+static bool hugetlb_vma_maps_pfn(struct vm_area_struct *vma,</div><div class='add'>+				unsigned long addr, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	pte_t *ptep, pte;</div><div class='ctx'> </div><div class='hunk'>@@ -414,11 +353,11 @@ static bool hugetlb_vma_maps_page(struct vm_area_struct *vma,</div><div class='ctx'> 	if (!ptep)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	pte = huge_ptep_get(ptep);</div><div class='add'>+	pte = huge_ptep_get(vma-&gt;vm_mm, addr, ptep);</div><div class='ctx'> 	if (huge_pte_none(pte) || !pte_present(pte))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (pte_page(pte) == page)</div><div class='add'>+	if (pte_pfn(pte) == pfn)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -463,7 +402,7 @@ static void hugetlb_unmap_file_folio(struct hstate *h,</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_root_cached *root = &amp;mapping-&gt;i_mmap;</div><div class='ctx'> 	struct hugetlb_vma_lock *vma_lock;</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='add'>+	unsigned long pfn = folio_pfn(folio);</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long v_start;</div><div class='ctx'> 	unsigned long v_end;</div><div class='hunk'>@@ -479,7 +418,7 @@ retry:</div><div class='ctx'> 		v_start = vma_offset_start(vma, start);</div><div class='ctx'> 		v_end = vma_offset_end(vma, end);</div><div class='ctx'> </div><div class='del'>-		if (!hugetlb_vma_maps_page(vma, v_start, page))</div><div class='add'>+		if (!hugetlb_vma_maps_pfn(vma, v_start, pfn))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!hugetlb_vma_trylock_write(vma)) {</div><div class='hunk'>@@ -529,7 +468,7 @@ retry:</div><div class='ctx'> 		 */</div><div class='ctx'> 		v_start = vma_offset_start(vma, start);</div><div class='ctx'> 		v_end = vma_offset_end(vma, end);</div><div class='del'>-		if (hugetlb_vma_maps_page(vma, v_start, page))</div><div class='add'>+		if (hugetlb_vma_maps_pfn(vma, v_start, pfn))</div><div class='ctx'> 			unmap_hugepage_range(vma, v_start, v_end, NULL,</div><div class='ctx'> 					     ZAP_FLAG_DROP_MARKER);</div><div class='ctx'> </div><div class='hunk'>@@ -585,14 +524,16 @@ static bool remove_inode_single_folio(struct hstate *h, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If folio is mapped, it was faulted in after being</div><div class='del'>-	 * unmapped in caller.  Unmap (again) while holding</div><div class='del'>-	 * the fault mutex.  The mutex will prevent faults</div><div class='del'>-	 * until we finish removing the folio.</div><div class='add'>+	 * unmapped in caller or hugetlb_vmdelete_list() skips</div><div class='add'>+	 * unmapping it due to fail to grab lock.  Unmap (again)</div><div class='add'>+	 * while holding the fault mutex.  The mutex will prevent</div><div class='add'>+	 * faults until we finish removing the folio.  Hold folio</div><div class='add'>+	 * lock to guarantee no concurrent migration.</div><div class='ctx'> 	 */</div><div class='add'>+	folio_lock(folio);</div><div class='ctx'> 	if (unlikely(folio_mapped(folio)))</div><div class='ctx'> 		hugetlb_unmap_file_folio(h, mapping, folio, index);</div><div class='ctx'> </div><div class='del'>-	folio_lock(folio);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must remove the folio from page cache before removing</div><div class='ctx'> 	 * the region/ reserve map (hugetlb_unreserve_pages).  In</div><div class='hunk'>@@ -678,6 +619,7 @@ static void hugetlbfs_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct resv_map *resv_map;</div><div class='ctx'> </div><div class='add'>+	trace_hugetlbfs_evict_inode(inode);</div><div class='ctx'> 	remove_inode_hugepages(inode, 0, LLONG_MAX);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -805,8 +747,10 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,</div><div class='ctx'> 	if (mode &amp; ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (mode &amp; FALLOC_FL_PUNCH_HOLE)</div><div class='del'>-		return hugetlbfs_punch_hole(inode, offset, len);</div><div class='add'>+	if (mode &amp; FALLOC_FL_PUNCH_HOLE) {</div><div class='add'>+		error = hugetlbfs_punch_hole(inode, offset, len);</div><div class='add'>+		goto out_nolock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Default preallocate case.</div><div class='hunk'>@@ -878,13 +822,13 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,</div><div class='ctx'> 		 * folios in these areas, we need to consume the reserves</div><div class='ctx'> 		 * to keep reservation accounting consistent.</div><div class='ctx'> 		 */</div><div class='del'>-		folio = alloc_hugetlb_folio(&amp;pseudo_vma, addr, 0);</div><div class='add'>+		folio = alloc_hugetlb_folio(&amp;pseudo_vma, addr, false);</div><div class='ctx'> 		if (IS_ERR(folio)) {</div><div class='ctx'> 			mutex_unlock(&amp;hugetlb_fault_mutex_table[hash]);</div><div class='ctx'> 			error = PTR_ERR(folio);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		clear_huge_page(&amp;folio-&gt;page, addr, pages_per_huge_page(h));</div><div class='add'>+		folio_zero_user(folio, addr);</div><div class='ctx'> 		__folio_mark_uptodate(folio);</div><div class='ctx'> 		error = hugetlb_add_to_page_cache(folio, mapping, index);</div><div class='ctx'> 		if (unlikely(error)) {</div><div class='hunk'>@@ -910,6 +854,9 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,</div><div class='ctx'> 	inode_set_ctime_current(inode);</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='add'>+</div><div class='add'>+out_nolock:</div><div class='add'>+	trace_hugetlbfs_fallocate(inode, mode, offset, len, error);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -922,10 +869,12 @@ static int hugetlbfs_setattr(struct mnt_idmap *idmap,</div><div class='ctx'> 	unsigned int ia_valid = attr-&gt;ia_valid;</div><div class='ctx'> 	struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);</div><div class='ctx'> </div><div class='del'>-	error = setattr_prepare(&amp;nop_mnt_idmap, dentry, attr);</div><div class='add'>+	error = setattr_prepare(idmap, dentry, attr);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='add'>+	trace_hugetlbfs_setattr(inode, dentry, attr);</div><div class='add'>+</div><div class='ctx'> 	if (ia_valid &amp; ATTR_SIZE) {</div><div class='ctx'> 		loff_t oldsize = inode-&gt;i_size;</div><div class='ctx'> 		loff_t newsize = attr-&gt;ia_size;</div><div class='hunk'>@@ -939,7 +888,7 @@ static int hugetlbfs_setattr(struct mnt_idmap *idmap,</div><div class='ctx'> 		hugetlb_vmtruncate(inode, newsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	setattr_copy(&amp;nop_mnt_idmap, inode, attr);</div><div class='add'>+	setattr_copy(idmap, inode, attr);</div><div class='ctx'> 	mark_inode_dirty(inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -974,6 +923,7 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb,</div><div class='ctx'> static struct lock_class_key hugetlbfs_i_mmap_rwsem_key;</div><div class='ctx'> </div><div class='ctx'> static struct inode *hugetlbfs_get_inode(struct super_block *sb,</div><div class='add'>+					struct mnt_idmap *idmap,</div><div class='ctx'> 					struct inode *dir,</div><div class='ctx'> 					umode_t mode, dev_t dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -995,7 +945,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,</div><div class='ctx'> 		struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);</div><div class='ctx'> </div><div class='ctx'> 		inode-&gt;i_ino = get_next_ino();</div><div class='del'>-		inode_init_owner(&amp;nop_mnt_idmap, inode, dir, mode);</div><div class='add'>+		inode_init_owner(idmap, inode, dir, mode);</div><div class='ctx'> 		lockdep_set_class(&amp;inode-&gt;i_mapping-&gt;i_mmap_rwsem,</div><div class='ctx'> 				&amp;hugetlbfs_i_mmap_rwsem_key);</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = &amp;hugetlbfs_aops;</div><div class='hunk'>@@ -1023,6 +973,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		lockdep_annotate_inode_mutex_key(inode);</div><div class='add'>+		trace_hugetlbfs_alloc_inode(inode, dir, mode);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (resv_map)</div><div class='ctx'> 			kref_put(&amp;resv_map-&gt;refs, resv_map_release);</div><div class='hunk'>@@ -1039,30 +990,29 @@ static int hugetlbfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	inode = hugetlbfs_get_inode(dir-&gt;i_sb, dir, mode, dev);</div><div class='add'>+	inode = hugetlbfs_get_inode(dir-&gt;i_sb, idmap, dir, mode, dev);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	dget(dentry);/* Extra count - pin the dentry in core */</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hugetlbfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			   struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *hugetlbfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				      struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	int retval = hugetlbfs_mknod(&amp;nop_mnt_idmap, dir, dentry,</div><div class='add'>+	int retval = hugetlbfs_mknod(idmap, dir, dentry,</div><div class='ctx'> 				     mode | S_IFDIR, 0);</div><div class='ctx'> 	if (!retval)</div><div class='ctx'> 		inc_nlink(dir);</div><div class='del'>-	return retval;</div><div class='add'>+	return ERR_PTR(retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hugetlbfs_create(struct mnt_idmap *idmap,</div><div class='ctx'> 			    struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			    umode_t mode, bool excl)</div><div class='ctx'> {</div><div class='del'>-	return hugetlbfs_mknod(&amp;nop_mnt_idmap, dir, dentry, mode | S_IFREG, 0);</div><div class='add'>+	return hugetlbfs_mknod(idmap, dir, dentry, mode | S_IFREG, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hugetlbfs_tmpfile(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -1071,7 +1021,7 @@ static int hugetlbfs_tmpfile(struct mnt_idmap *idmap,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	inode = hugetlbfs_get_inode(dir-&gt;i_sb, dir, mode | S_IFREG, 0);</div><div class='add'>+	inode = hugetlbfs_get_inode(dir-&gt;i_sb, idmap, dir, mode | S_IFREG, 0);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='hunk'>@@ -1083,17 +1033,17 @@ static int hugetlbfs_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> 			     struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			     const char *symname)</div><div class='ctx'> {</div><div class='add'>+	const umode_t mode = S_IFLNK|S_IRWXUGO;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int error = -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	inode = hugetlbfs_get_inode(dir-&gt;i_sb, dir, S_IFLNK|S_IRWXUGO, 0);</div><div class='add'>+	inode = hugetlbfs_get_inode(dir-&gt;i_sb, idmap, dir, mode, 0);</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		int l = strlen(symname)+1;</div><div class='ctx'> 		error = page_symlink(inode, symname, l);</div><div class='del'>-		if (!error) {</div><div class='del'>-			d_instantiate(dentry, inode);</div><div class='del'>-			dget(dentry);</div><div class='del'>-		} else</div><div class='add'>+		if (!error)</div><div class='add'>+			d_make_persistent(dentry, inode);</div><div class='add'>+		else</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='hunk'>@@ -1109,7 +1059,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = migrate_huge_page_move_mapping(mapping, dst, src);</div><div class='del'>-	if (rc != MIGRATEPAGE_SUCCESS)</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if (hugetlb_folio_subpool(src)) {</div><div class='hunk'>@@ -1118,12 +1068,9 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,</div><div class='ctx'> 		hugetlb_set_folio_subpool(src, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mode != MIGRATE_SYNC_NO_COPY)</div><div class='del'>-		folio_migrate_copy(dst, src);</div><div class='del'>-	else</div><div class='del'>-		folio_migrate_flags(dst, src);</div><div class='add'>+	folio_migrate_flags(dst, src);</div><div class='ctx'> </div><div class='del'>-	return MIGRATEPAGE_SUCCESS;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define hugetlbfs_migrate_folio NULL</div><div class='hunk'>@@ -1264,6 +1211,7 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> static void hugetlbfs_free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	trace_hugetlbfs_free_inode(inode);</div><div class='ctx'> 	kmem_cache_free(hugetlbfs_inode_cachep, HUGETLBFS_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1288,13 +1236,14 @@ static void init_once(void *foo)</div><div class='ctx'> 	inode_init_once(&amp;ei-&gt;vfs_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct file_operations hugetlbfs_file_operations = {</div><div class='add'>+static const struct file_operations hugetlbfs_file_operations = {</div><div class='ctx'> 	.read_iter		= hugetlbfs_read_iter,</div><div class='del'>-	.mmap			= hugetlbfs_file_mmap,</div><div class='add'>+	.mmap_prepare		= hugetlbfs_file_mmap_prepare,</div><div class='ctx'> 	.fsync			= noop_fsync,</div><div class='ctx'> 	.get_unmapped_area	= hugetlb_get_unmapped_area,</div><div class='ctx'> 	.llseek			= default_llseek,</div><div class='ctx'> 	.fallocate		= hugetlbfs_fallocate,</div><div class='add'>+	.fop_flags		= FOP_HUGE_PAGES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations hugetlbfs_dir_inode_operations = {</div><div class='hunk'>@@ -1354,6 +1303,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par</div><div class='ctx'> {</div><div class='ctx'> 	struct hugetlbfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct fs_parse_result result;</div><div class='add'>+	struct hstate *h;</div><div class='ctx'> 	char *rest;</div><div class='ctx'> 	unsigned long ps;</div><div class='ctx'> 	int opt;</div><div class='hunk'>@@ -1364,15 +1314,11 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par</div><div class='ctx'> </div><div class='ctx'> 	switch (opt) {</div><div class='ctx'> 	case Opt_uid:</div><div class='del'>-		ctx-&gt;uid = make_kuid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!uid_valid(ctx-&gt;uid))</div><div class='del'>-			goto bad_val;</div><div class='add'>+		ctx-&gt;uid = result.uid;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case Opt_gid:</div><div class='del'>-		ctx-&gt;gid = make_kgid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!gid_valid(ctx-&gt;gid))</div><div class='del'>-			goto bad_val;</div><div class='add'>+		ctx-&gt;gid = result.gid;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case Opt_mode:</div><div class='hunk'>@@ -1398,11 +1344,12 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par</div><div class='ctx'> </div><div class='ctx'> 	case Opt_pagesize:</div><div class='ctx'> 		ps = memparse(param-&gt;string, &amp;rest);</div><div class='del'>-		ctx-&gt;hstate = size_to_hstate(ps);</div><div class='del'>-		if (!ctx-&gt;hstate) {</div><div class='add'>+		h = size_to_hstate(ps);</div><div class='add'>+		if (!h) {</div><div class='ctx'> 			pr_err("Unsupported page size %lu MB\n", ps / SZ_1M);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		ctx-&gt;hstate = h;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case Opt_min_size:</div><div class='hunk'>@@ -1490,6 +1437,7 @@ hugetlbfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = huge_page_shift(ctx-&gt;hstate);</div><div class='ctx'> 	sb-&gt;s_magic = HUGETLBFS_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op = &amp;hugetlbfs_ops;</div><div class='add'>+	sb-&gt;s_d_flags = DCACHE_DONTCACHE;</div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1552,7 +1500,8 @@ static struct file_system_type hugetlbfs_fs_type = {</div><div class='ctx'> 	.name			= "hugetlbfs",</div><div class='ctx'> 	.init_fs_context	= hugetlbfs_init_fs_context,</div><div class='ctx'> 	.parameters		= hugetlb_fs_parameters,</div><div class='del'>-	.kill_sb		= kill_litter_super,</div><div class='add'>+	.kill_sb		= kill_anon_super,</div><div class='add'>+	.fs_flags               = FS_ALLOW_IDMAP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];</div><div class='hunk'>@@ -1606,7 +1555,9 @@ struct file *hugetlb_file_setup(const char *name, size_t size,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	file = ERR_PTR(-ENOSPC);</div><div class='del'>-	inode = hugetlbfs_get_inode(mnt-&gt;mnt_sb, NULL, S_IFREG | S_IRWXUGO, 0);</div><div class='add'>+	/* hugetlbfs_vfsmount[] mounts do not use idmapped mounts.  */</div><div class='add'>+	inode = hugetlbfs_get_inode(mnt-&gt;mnt_sb, &amp;nop_mnt_idmap, NULL,</div><div class='add'>+				    S_IFREG | S_IRWXUGO, 0);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (creat_flags == HUGETLB_SHMFS_INODE)</div><div class='hunk'>@@ -1615,9 +1566,9 @@ struct file *hugetlb_file_setup(const char *name, size_t size,</div><div class='ctx'> 	inode-&gt;i_size = size;</div><div class='ctx'> 	clear_nlink(inode);</div><div class='ctx'> </div><div class='del'>-	if (!hugetlb_reserve_pages(inode, 0,</div><div class='add'>+	if (hugetlb_reserve_pages(inode, 0,</div><div class='ctx'> 			size &gt;&gt; huge_page_shift(hstate_inode(inode)), NULL,</div><div class='del'>-			acctflag))</div><div class='add'>+			acctflag) &lt; 0)</div><div class='ctx'> 		file = ERR_PTR(-ENOMEM);</div><div class='ctx'> 	else</div><div class='ctx'> 		file = alloc_file_pseudo(inode, mnt, name, O_RDWR,</div><div class='hunk'>@@ -1641,7 +1592,7 @@ static struct vfsmount *__init mount_one_hugetlbfs(struct hstate *h)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct hugetlbfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 		ctx-&gt;hstate = h;</div><div class='del'>-		mnt = fc_mount(fc);</div><div class='add'>+		mnt = fc_mount_longterm(fc);</div><div class='ctx'> 		put_fs_context(fc);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (IS_ERR(mnt))</div><div class='head'>diff --git a/fs/init.c b/fs/init.c<br/>index e9387b6c4f30..e0f5429c0a49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/init.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/init.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ int __init init_mknod(const char *filename, umode_t mode, unsigned int dev)</div><div class='ctx'> 	else if (!(S_ISBLK(mode) || S_ISCHR(mode)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dentry = kern_path_create(AT_FDCWD, filename, &amp;path, 0);</div><div class='add'>+	dentry = start_creating_path(AT_FDCWD, filename, &amp;path, 0);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return PTR_ERR(dentry);</div><div class='ctx'> </div><div class='hunk'>@@ -157,8 +157,8 @@ int __init init_mknod(const char *filename, umode_t mode, unsigned int dev)</div><div class='ctx'> 	error = security_path_mknod(&amp;path, dentry, mode, dev);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = vfs_mknod(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='del'>-				  dentry, mode, new_decode_dev(dev));</div><div class='del'>-	done_path_create(&amp;path, dentry);</div><div class='add'>+				  dentry, mode, new_decode_dev(dev), NULL);</div><div class='add'>+	end_creating_path(&amp;path, dentry);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +173,7 @@ int __init init_link(const char *oldname, const char *newname)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	new_dentry = kern_path_create(AT_FDCWD, newname, &amp;new_path, 0);</div><div class='add'>+	new_dentry = start_creating_path(AT_FDCWD, newname, &amp;new_path, 0);</div><div class='ctx'> 	error = PTR_ERR(new_dentry);</div><div class='ctx'> 	if (IS_ERR(new_dentry))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -191,7 +191,7 @@ int __init init_link(const char *oldname, const char *newname)</div><div class='ctx'> 	error = vfs_link(old_path.dentry, idmap, new_path.dentry-&gt;d_inode,</div><div class='ctx'> 			 new_dentry, NULL);</div><div class='ctx'> out_dput:</div><div class='del'>-	done_path_create(&amp;new_path, new_dentry);</div><div class='add'>+	end_creating_path(&amp;new_path, new_dentry);</div><div class='ctx'> out:</div><div class='ctx'> 	path_put(&amp;old_path);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -203,14 +203,14 @@ int __init init_symlink(const char *oldname, const char *newname)</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	dentry = kern_path_create(AT_FDCWD, newname, &amp;path, 0);</div><div class='add'>+	dentry = start_creating_path(AT_FDCWD, newname, &amp;path, 0);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return PTR_ERR(dentry);</div><div class='ctx'> 	error = security_path_symlink(&amp;path, dentry, oldname);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = vfs_symlink(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='del'>-				    dentry, oldname);</div><div class='del'>-	done_path_create(&amp;path, dentry);</div><div class='add'>+				    dentry, oldname, NULL);</div><div class='add'>+	end_creating_path(&amp;path, dentry);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -225,15 +225,19 @@ int __init init_mkdir(const char *pathname, umode_t mode)</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	dentry = kern_path_create(AT_FDCWD, pathname, &amp;path, LOOKUP_DIRECTORY);</div><div class='add'>+	dentry = start_creating_path(AT_FDCWD, pathname, &amp;path,</div><div class='add'>+				     LOOKUP_DIRECTORY);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return PTR_ERR(dentry);</div><div class='ctx'> 	mode = mode_strip_umask(d_inode(path.dentry), mode);</div><div class='ctx'> 	error = security_path_mkdir(&amp;path, dentry, mode);</div><div class='del'>-	if (!error)</div><div class='del'>-		error = vfs_mkdir(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='del'>-				  dentry, mode);</div><div class='del'>-	done_path_create(&amp;path, dentry);</div><div class='add'>+	if (!error) {</div><div class='add'>+		dentry = vfs_mkdir(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='add'>+				  dentry, mode, NULL);</div><div class='add'>+		if (IS_ERR(dentry))</div><div class='add'>+			error = PTR_ERR(dentry);</div><div class='add'>+	}</div><div class='add'>+	end_creating_path(&amp;path, dentry);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/inode.c b/fs/inode.c<br/>index 91048c4c9c9e..521383223d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/inode.c</a></div><div class='hunk'>@@ -20,7 +20,13 @@</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/list_lru.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='add'>+#include &lt;linux/rw_hint.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;trace/events/writeback.h&gt;</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include &lt;trace/events/timestamp.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -97,6 +103,70 @@ long get_nr_dirty_inodes(void)</div><div class='ctx'> 	return nr_dirty &gt; 0 ? nr_dirty : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+static DEFINE_PER_CPU(long, mg_ctime_updates);</div><div class='add'>+static DEFINE_PER_CPU(long, mg_fine_stamps);</div><div class='add'>+static DEFINE_PER_CPU(long, mg_ctime_swaps);</div><div class='add'>+</div><div class='add'>+static unsigned long get_mg_ctime_updates(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		sum += data_race(per_cpu(mg_ctime_updates, i));</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long get_mg_fine_stamps(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		sum += data_race(per_cpu(mg_fine_stamps, i));</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long get_mg_ctime_swaps(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		sum += data_race(per_cpu(mg_ctime_swaps, i));</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mgtime_counter_inc(__var)	this_cpu_inc(__var)</div><div class='add'>+</div><div class='add'>+static int mgts_show(struct seq_file *s, void *p)</div><div class='add'>+{</div><div class='add'>+	unsigned long ctime_updates = get_mg_ctime_updates();</div><div class='add'>+	unsigned long ctime_swaps = get_mg_ctime_swaps();</div><div class='add'>+	unsigned long fine_stamps = get_mg_fine_stamps();</div><div class='add'>+	unsigned long floor_swaps = timekeeping_get_mg_floor_swaps();</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%lu %lu %lu %lu\n",</div><div class='add'>+		   ctime_updates, ctime_swaps, fine_stamps, floor_swaps);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(mgts);</div><div class='add'>+</div><div class='add'>+static int __init mg_debugfs_init(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("multigrain_timestamps", S_IFREG | S_IRUGO, NULL, NULL, &amp;mgts_fops);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(mg_debugfs_init);</div><div class='add'>+</div><div class='add'>+#else /* ! CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+#define mgtime_counter_inc(__var)	do { } while (0)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Handle nr_inode sysctl</div><div class='ctx'>  */</div><div class='hunk'>@@ -106,7 +176,7 @@ long get_nr_dirty_inodes(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct inodes_stat_t inodes_stat;</div><div class='ctx'> </div><div class='del'>-static int proc_nr_inodes(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+static int proc_nr_inodes(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 			  size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	inodes_stat.nr_inodes = get_nr_inodes();</div><div class='hunk'>@@ -114,7 +184,7 @@ static int proc_nr_inodes(struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 	return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table inodes_sysctls[] = {</div><div class='add'>+static const struct ctl_table inodes_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "inode-nr",</div><div class='ctx'> 		.data		= &amp;inodes_stat,</div><div class='hunk'>@@ -145,14 +215,16 @@ static int no_open(struct inode *inode, struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * inode_init_always - perform inode structure initialisation</div><div class='add'>+ * inode_init_always_gfp - perform inode structure initialisation</div><div class='ctx'>  * @sb: superblock inode belongs to</div><div class='ctx'>  * @inode: inode to initialise</div><div class='add'>+ * @gfp: allocation flags</div><div class='ctx'>  *</div><div class='ctx'>  * These are initializations that need to be done on every inode</div><div class='ctx'>  * allocation as the fields are not initialised by slab allocation.</div><div class='add'>+ * If there are additional allocations required @gfp is used.</div><div class='ctx'>  */</div><div class='del'>-int inode_init_always(struct super_block *sb, struct inode *inode)</div><div class='add'>+int inode_init_always_gfp(struct super_block *sb, struct inode *inode, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct inode_operations empty_iops;</div><div class='ctx'> 	static const struct file_operations no_open_fops = {.open = no_open};</div><div class='hunk'>@@ -161,6 +233,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode)</div><div class='ctx'> 	inode-&gt;i_sb = sb;</div><div class='ctx'> 	inode-&gt;i_blkbits = sb-&gt;s_blocksize_bits;</div><div class='ctx'> 	inode-&gt;i_flags = 0;</div><div class='add'>+	inode_state_assign_raw(inode, 0);</div><div class='ctx'> 	atomic64_set(&amp;inode-&gt;i_sequence, 0);</div><div class='ctx'> 	atomic_set(&amp;inode-&gt;i_count, 1);</div><div class='ctx'> 	inode-&gt;i_op = &amp;empty_iops;</div><div class='hunk'>@@ -170,6 +243,8 @@ int inode_init_always(struct super_block *sb, struct inode *inode)</div><div class='ctx'> 	inode-&gt;i_opflags = 0;</div><div class='ctx'> 	if (sb-&gt;s_xattr)</div><div class='ctx'> 		inode-&gt;i_opflags |= IOP_XATTR;</div><div class='add'>+	if (sb-&gt;s_type-&gt;fs_flags &amp; FS_MGTIME)</div><div class='add'>+		inode-&gt;i_opflags |= IOP_MGTIME;</div><div class='ctx'> 	i_uid_write(inode, 0);</div><div class='ctx'> 	i_gid_write(inode, 0);</div><div class='ctx'> 	atomic_set(&amp;inode-&gt;i_writecount, 0);</div><div class='hunk'>@@ -228,13 +303,14 @@ int inode_init_always(struct super_block *sb, struct inode *inode)</div><div class='ctx'> #endif</div><div class='ctx'> 	inode-&gt;i_flctx = NULL;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(security_inode_alloc(inode)))</div><div class='add'>+	if (unlikely(security_inode_alloc(inode, gfp)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	this_cpu_inc(nr_inodes);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inode_init_always);</div><div class='add'>+EXPORT_SYMBOL(inode_init_always_gfp);</div><div class='ctx'> </div><div class='ctx'> void free_inode_nonrcu(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,7 +327,17 @@ static void i_callback(struct rcu_head *head)</div><div class='ctx'> 		free_inode_nonrcu(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct inode *alloc_inode(struct super_block *sb)</div><div class='add'>+/**</div><div class='add'>+ *	alloc_inode 	- obtain an inode</div><div class='add'>+ *	@sb: superblock</div><div class='add'>+ *</div><div class='add'>+ *	Allocates a new inode for given superblock.</div><div class='add'>+ *	Inode wont be chained in superblock s_inodes list</div><div class='add'>+ *	This means :</div><div class='add'>+ *	- fs can't be unmount</div><div class='add'>+ *	- quotas, fsnotify, writeback can't work</div><div class='add'>+ */</div><div class='add'>+struct inode *alloc_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	const struct super_operations *ops = sb-&gt;s_op;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -385,7 +471,7 @@ EXPORT_SYMBOL(set_nlink);</div><div class='ctx'> void inc_nlink(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(inode-&gt;i_nlink == 0)) {</div><div class='del'>-		WARN_ON(!(inode-&gt;i_state &amp; I_LINKABLE));</div><div class='add'>+		WARN_ON(!(inode_state_read_once(inode) &amp; I_LINKABLE));</div><div class='ctx'> 		atomic_long_dec(&amp;inode-&gt;i_sb-&gt;s_remove_count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -436,14 +522,6 @@ static void init_once(void *foo)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * inode-&gt;i_lock must be held</div><div class='del'>- */</div><div class='del'>-void __iget(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	atomic_inc(&amp;inode-&gt;i_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * get additional reference to inode; caller must already hold one.</div><div class='ctx'>  */</div><div class='ctx'> void ihold(struct inode *inode)</div><div class='hunk'>@@ -452,11 +530,50 @@ void ihold(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ihold);</div><div class='ctx'> </div><div class='del'>-static void __inode_add_lru(struct inode *inode, bool rotate)</div><div class='add'>+struct wait_queue_head *inode_bit_waitqueue(struct wait_bit_queue_entry *wqe,</div><div class='add'>+					    struct inode *inode, u32 bit)</div><div class='add'>+{</div><div class='add'>+	void *bit_address;</div><div class='add'>+</div><div class='add'>+	bit_address = inode_state_wait_address(inode, bit);</div><div class='add'>+	init_wait_var_entry(wqe, bit_address, 0);</div><div class='add'>+	return __var_waitqueue(bit_address);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inode_bit_waitqueue);</div><div class='add'>+</div><div class='add'>+void wait_on_new_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (inode-&gt;i_state &amp; (I_DIRTY_ALL | I_SYNC | I_FREEING | I_WILL_FREE))</div><div class='add'>+	struct wait_bit_queue_entry wqe;</div><div class='add'>+	struct wait_queue_head *wq_head;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (!(inode_state_read(inode) &amp; I_NEW)) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		return;</div><div class='del'>-	if (atomic_read(&amp;inode-&gt;i_count))</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wq_head = inode_bit_waitqueue(&amp;wqe, inode, __I_NEW);</div><div class='add'>+	for (;;) {</div><div class='add'>+		prepare_to_wait_event(wq_head, &amp;wqe.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_NEW))</div><div class='add'>+			break;</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		schedule();</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	}</div><div class='add'>+	finish_wait(wq_head, &amp;wqe.wq_entry);</div><div class='add'>+	WARN_ON(inode_state_read(inode) &amp; I_NEW);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(wait_on_new_inode);</div><div class='add'>+</div><div class='add'>+static void __inode_lru_list_add(struct inode *inode, bool rotate)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='add'>+	if (inode_state_read(inode) &amp; (I_DIRTY_ALL | I_SYNC | I_FREEING | I_WILL_FREE))</div><div class='add'>+		return;</div><div class='add'>+	if (icount_read(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!(inode-&gt;i_sb-&gt;s_flags &amp; SB_ACTIVE))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -466,43 +583,91 @@ static void __inode_add_lru(struct inode *inode, bool rotate)</div><div class='ctx'> 	if (list_lru_add_obj(&amp;inode-&gt;i_sb-&gt;s_inode_lru, &amp;inode-&gt;i_lru))</div><div class='ctx'> 		this_cpu_inc(nr_unused);</div><div class='ctx'> 	else if (rotate)</div><div class='del'>-		inode-&gt;i_state |= I_REFERENCED;</div><div class='add'>+		inode_state_set(inode, I_REFERENCED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Add inode to LRU if needed (inode is unused and clean).</div><div class='del'>- *</div><div class='del'>- * Needs inode-&gt;i_lock held.</div><div class='ctx'>  */</div><div class='del'>-void inode_add_lru(struct inode *inode)</div><div class='add'>+void inode_lru_list_add(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	__inode_add_lru(inode, false);</div><div class='add'>+	__inode_lru_list_add(inode, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inode_lru_list_del(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	if (list_empty(&amp;inode-&gt;i_lru))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (list_lru_del_obj(&amp;inode-&gt;i_sb-&gt;s_inode_lru, &amp;inode-&gt;i_lru))</div><div class='ctx'> 		this_cpu_dec(nr_unused);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void inode_pin_lru_isolating(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	WARN_ON(inode_state_read(inode) &amp; (I_LRU_ISOLATING | I_FREEING | I_WILL_FREE));</div><div class='add'>+	inode_state_set(inode, I_LRU_ISOLATING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inode_unpin_lru_isolating(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	WARN_ON(!(inode_state_read(inode) &amp; I_LRU_ISOLATING));</div><div class='add'>+	inode_state_clear(inode, I_LRU_ISOLATING);</div><div class='add'>+	/* Called with inode-&gt;i_lock which ensures memory ordering. */</div><div class='add'>+	inode_wake_up_bit(inode, __I_LRU_ISOLATING);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inode_wait_for_lru_isolating(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct wait_bit_queue_entry wqe;</div><div class='add'>+	struct wait_queue_head *wq_head;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (!(inode_state_read(inode) &amp; I_LRU_ISOLATING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wq_head = inode_bit_waitqueue(&amp;wqe, inode, __I_LRU_ISOLATING);</div><div class='add'>+	for (;;) {</div><div class='add'>+		prepare_to_wait_event(wq_head, &amp;wqe.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		/*</div><div class='add'>+		 * Checking I_LRU_ISOLATING with inode-&gt;i_lock guarantees</div><div class='add'>+		 * memory ordering.</div><div class='add'>+		 */</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_LRU_ISOLATING))</div><div class='add'>+			break;</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		schedule();</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	}</div><div class='add'>+	finish_wait(wq_head, &amp;wqe.wq_entry);</div><div class='add'>+	WARN_ON(inode_state_read(inode) &amp; I_LRU_ISOLATING);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * inode_sb_list_add - add inode to the superblock list of inodes</div><div class='ctx'>  * @inode: inode to add</div><div class='ctx'>  */</div><div class='ctx'> void inode_sb_list_add(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;inode-&gt;i_sb-&gt;s_inode_list_lock);</div><div class='del'>-	list_add(&amp;inode-&gt;i_sb_list, &amp;inode-&gt;i_sb-&gt;s_inodes);</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_sb-&gt;s_inode_list_lock);</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sb-&gt;s_inode_list_lock);</div><div class='add'>+	list_add(&amp;inode-&gt;i_sb_list, &amp;sb-&gt;s_inodes);</div><div class='add'>+	spin_unlock(&amp;sb-&gt;s_inode_list_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inode_sb_list_add);</div><div class='ctx'> </div><div class='ctx'> static inline void inode_sb_list_del(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+</div><div class='ctx'> 	if (!list_empty(&amp;inode-&gt;i_sb_list)) {</div><div class='del'>-		spin_lock(&amp;inode-&gt;i_sb-&gt;s_inode_list_lock);</div><div class='add'>+		spin_lock(&amp;sb-&gt;s_inode_list_lock);</div><div class='ctx'> 		list_del_init(&amp;inode-&gt;i_sb_list);</div><div class='del'>-		spin_unlock(&amp;inode-&gt;i_sb-&gt;s_inode_list_lock);</div><div class='add'>+		spin_unlock(&amp;sb-&gt;s_inode_list_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -559,6 +724,7 @@ void dump_mapping(const struct address_space *mapping)</div><div class='ctx'> 	struct hlist_node *dentry_first;</div><div class='ctx'> 	struct dentry *dentry_ptr;</div><div class='ctx'> 	struct dentry dentry;</div><div class='add'>+	char fname[64] = {};</div><div class='ctx'> 	unsigned long ino;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -588,17 +754,21 @@ void dump_mapping(const struct address_space *mapping)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dentry_ptr = container_of(dentry_first, struct dentry, d_u.d_alias);</div><div class='del'>-	if (get_kernel_nofault(dentry, dentry_ptr)) {</div><div class='add'>+	if (get_kernel_nofault(dentry, dentry_ptr) ||</div><div class='add'>+	    !dentry.d_parent || !dentry.d_name.name) {</div><div class='ctx'> 		pr_warn("aops:%ps ino:%lx invalid dentry:%px\n",</div><div class='ctx'> 				a_ops, ino, dentry_ptr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (strncpy_from_kernel_nofault(fname, dentry.d_name.name, 63) &lt; 0)</div><div class='add'>+		strscpy(fname, "&lt;invalid&gt;");</div><div class='ctx'> 	/*</div><div class='del'>-	 * if dentry is corrupted, the %pd handler may still crash,</div><div class='del'>-	 * but it's unlikely that we reach here with a corrupt mapping</div><div class='add'>+	 * Even if strncpy_from_kernel_nofault() succeeded,</div><div class='add'>+	 * the fname could be unreliable</div><div class='ctx'> 	 */</div><div class='del'>-	pr_warn("aops:%ps ino:%lx dentry name:\"%pd\"\n", a_ops, ino, &amp;dentry);</div><div class='add'>+	pr_warn("aops:%ps ino:%lx dentry name(?):\"%s\"\n",</div><div class='add'>+		a_ops, ino, fname);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void clear_inode(struct inode *inode)</div><div class='hunk'>@@ -620,11 +790,11 @@ void clear_inode(struct inode *inode)</div><div class='ctx'> 	 */</div><div class='ctx'> 	xa_unlock_irq(&amp;inode-&gt;i_data.i_pages);</div><div class='ctx'> 	BUG_ON(!list_empty(&amp;inode-&gt;i_data.i_private_list));</div><div class='del'>-	BUG_ON(!(inode-&gt;i_state &amp; I_FREEING));</div><div class='del'>-	BUG_ON(inode-&gt;i_state &amp; I_CLEAR);</div><div class='add'>+	BUG_ON(!(inode_state_read_once(inode) &amp; I_FREEING));</div><div class='add'>+	BUG_ON(inode_state_read_once(inode) &amp; I_CLEAR);</div><div class='ctx'> 	BUG_ON(!list_empty(&amp;inode-&gt;i_wb_list));</div><div class='ctx'> 	/* don't need i_lock here, no concurrent mods to i_state */</div><div class='del'>-	inode-&gt;i_state = I_FREEING | I_CLEAR;</div><div class='add'>+	inode_state_assign_raw(inode, I_FREEING | I_CLEAR);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(clear_inode);</div><div class='ctx'> </div><div class='hunk'>@@ -645,14 +815,15 @@ static void evict(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	const struct super_operations *op = inode-&gt;i_sb-&gt;s_op;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!(inode-&gt;i_state &amp; I_FREEING));</div><div class='add'>+	BUG_ON(!(inode_state_read_once(inode) &amp; I_FREEING));</div><div class='ctx'> 	BUG_ON(!list_empty(&amp;inode-&gt;i_lru));</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;inode-&gt;i_io_list))</div><div class='del'>-		inode_io_list_del(inode);</div><div class='del'>-</div><div class='add'>+	inode_io_list_del(inode);</div><div class='ctx'> 	inode_sb_list_del(inode);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	inode_wait_for_lru_isolating(inode);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wait for flusher thread to be done with the inode so that filesystem</div><div class='ctx'> 	 * does not start destroying it while writeback is still running. Since</div><div class='hunk'>@@ -660,6 +831,7 @@ static void evict(struct inode *inode)</div><div class='ctx'> 	 * the inode.  We just have to wait for running writeback to finish.</div><div class='ctx'> 	 */</div><div class='ctx'> 	inode_wait_for_writeback(inode);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;evict_inode) {</div><div class='ctx'> 		op-&gt;evict_inode(inode);</div><div class='hunk'>@@ -672,10 +844,19 @@ static void evict(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	remove_inode_hash(inode);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	wake_up_bit(&amp;inode-&gt;i_state, __I_NEW);</div><div class='del'>-	BUG_ON(inode-&gt;i_state != (I_FREEING | I_CLEAR));</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Wake up waiters in __wait_on_freeing_inode().</div><div class='add'>+	 *</div><div class='add'>+	 * It is an invariant that any thread we need to wake up is already</div><div class='add'>+	 * accounted for before remove_inode_hash() acquires -&gt;i_lock -- both</div><div class='add'>+	 * sides take the lock and sleep is aborted if the inode is found</div><div class='add'>+	 * unhashed. Thus either the sleeper wins and goes off CPU, or removal</div><div class='add'>+	 * wins and the sleeper aborts after testing with the lock.</div><div class='add'>+	 *</div><div class='add'>+	 * This also means we don't need any fences for the call below.</div><div class='add'>+	 */</div><div class='add'>+	inode_wake_up_bit(inode, __I_NEW);</div><div class='add'>+	BUG_ON(inode_state_read_once(inode) != (I_FREEING | I_CLEAR));</div><div class='ctx'> </div><div class='ctx'> 	destroy_inode(inode);</div><div class='ctx'> }</div><div class='hunk'>@@ -711,22 +892,26 @@ static void dispose_list(struct list_head *head)</div><div class='ctx'>  */</div><div class='ctx'> void evict_inodes(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode, *next;</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	spin_lock(&amp;sb-&gt;s_inode_list_lock);</div><div class='del'>-	list_for_each_entry_safe(inode, next, &amp;sb-&gt;s_inodes, i_sb_list) {</div><div class='del'>-		if (atomic_read(&amp;inode-&gt;i_count))</div><div class='add'>+	list_for_each_entry(inode, &amp;sb-&gt;s_inodes, i_sb_list) {</div><div class='add'>+		if (icount_read(inode))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_NEW | I_FREEING | I_WILL_FREE)) {</div><div class='add'>+		if (icount_read(inode)) {</div><div class='add'>+			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_NEW | I_FREEING | I_WILL_FREE)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		inode-&gt;i_state |= I_FREEING;</div><div class='add'>+		inode_state_set(inode, I_FREEING);</div><div class='ctx'> 		inode_lru_list_del(inode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		list_add(&amp;inode-&gt;i_lru, &amp;dispose);</div><div class='hunk'>@@ -749,46 +934,6 @@ again:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(evict_inodes);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * invalidate_inodes	- attempt to free all inodes on a superblock</div><div class='del'>- * @sb:		superblock to operate on</div><div class='del'>- *</div><div class='del'>- * Attempts to free all inodes (including dirty inodes) for a given superblock.</div><div class='del'>- */</div><div class='del'>-void invalidate_inodes(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode, *next;</div><div class='del'>-	LIST_HEAD(dispose);</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	spin_lock(&amp;sb-&gt;s_inode_list_lock);</div><div class='del'>-	list_for_each_entry_safe(inode, next, &amp;sb-&gt;s_inodes, i_sb_list) {</div><div class='del'>-		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_NEW | I_FREEING | I_WILL_FREE)) {</div><div class='del'>-			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (atomic_read(&amp;inode-&gt;i_count)) {</div><div class='del'>-			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		inode-&gt;i_state |= I_FREEING;</div><div class='del'>-		inode_lru_list_del(inode);</div><div class='del'>-		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-		list_add(&amp;inode-&gt;i_lru, &amp;dispose);</div><div class='del'>-		if (need_resched()) {</div><div class='del'>-			spin_unlock(&amp;sb-&gt;s_inode_list_lock);</div><div class='del'>-			cond_resched();</div><div class='del'>-			dispose_list(&amp;dispose);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;sb-&gt;s_inode_list_lock);</div><div class='del'>-</div><div class='del'>-	dispose_list(&amp;dispose);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Isolate the inode from the LRU in preparation for freeing it.</div><div class='ctx'>  *</div><div class='hunk'>@@ -801,7 +946,7 @@ again:</div><div class='ctx'>  * with this flag set because they are the inodes that are out of order.</div><div class='ctx'>  */</div><div class='ctx'> static enum lru_status inode_lru_isolate(struct list_head *item,</div><div class='del'>-		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)</div><div class='add'>+		struct list_lru_one *lru, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *freeable = arg;</div><div class='ctx'> 	struct inode	*inode = container_of(item, struct inode, i_lru);</div><div class='hunk'>@@ -819,8 +964,8 @@ static enum lru_status inode_lru_isolate(struct list_head *item,</div><div class='ctx'> 	 * unreclaimable for a while. Remove them lazily here; iput,</div><div class='ctx'> 	 * sync, or the last page cache deletion will requeue them.</div><div class='ctx'> 	 */</div><div class='del'>-	if (atomic_read(&amp;inode-&gt;i_count) ||</div><div class='del'>-	    (inode-&gt;i_state &amp; ~I_REFERENCED) ||</div><div class='add'>+	if (icount_read(inode) ||</div><div class='add'>+	    (inode_state_read(inode) &amp; ~I_REFERENCED) ||</div><div class='ctx'> 	    !mapping_shrinkable(&amp;inode-&gt;i_data)) {</div><div class='ctx'> 		list_lru_isolate(lru, &amp;inode-&gt;i_lru);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -829,8 +974,8 @@ static enum lru_status inode_lru_isolate(struct list_head *item,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Recently referenced inodes get one more pass */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_REFERENCED) {</div><div class='del'>-		inode-&gt;i_state &amp;= ~I_REFERENCED;</div><div class='add'>+	if (inode_state_read(inode) &amp; I_REFERENCED) {</div><div class='add'>+		inode_state_clear(inode, I_REFERENCED);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		return LRU_ROTATE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -841,9 +986,9 @@ static enum lru_status inode_lru_isolate(struct list_head *item,</div><div class='ctx'> 	 * be under pressure before the cache inside the highmem zone.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (inode_has_buffers(inode) || !mapping_empty(&amp;inode-&gt;i_data)) {</div><div class='del'>-		__iget(inode);</div><div class='add'>+		inode_pin_lru_isolating(inode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-		spin_unlock(lru_lock);</div><div class='add'>+		spin_unlock(&amp;lru-&gt;lock);</div><div class='ctx'> 		if (remove_inode_buffers(inode)) {</div><div class='ctx'> 			unsigned long reap;</div><div class='ctx'> 			reap = invalidate_mapping_pages(&amp;inode-&gt;i_data, 0, -1);</div><div class='hunk'>@@ -853,13 +998,12 @@ static enum lru_status inode_lru_isolate(struct list_head *item,</div><div class='ctx'> 				__count_vm_events(PGINODESTEAL, reap);</div><div class='ctx'> 			mm_account_reclaimed_pages(reap);</div><div class='ctx'> 		}</div><div class='del'>-		iput(inode);</div><div class='del'>-		spin_lock(lru_lock);</div><div class='add'>+		inode_unpin_lru_isolating(inode);</div><div class='ctx'> 		return LRU_RETRY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN_ON(inode-&gt;i_state &amp; I_NEW);</div><div class='del'>-	inode-&gt;i_state |= I_FREEING;</div><div class='add'>+	WARN_ON(inode_state_read(inode) &amp; I_NEW);</div><div class='add'>+	inode_state_set(inode, I_FREEING);</div><div class='ctx'> 	list_lru_isolate_move(lru, &amp;inode-&gt;i_lru, freeable);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -884,36 +1028,47 @@ long prune_icache_sb(struct super_block *sb, struct shrink_control *sc)</div><div class='ctx'> 	return freed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __wait_on_freeing_inode(struct inode *inode);</div><div class='add'>+static void __wait_on_freeing_inode(struct inode *inode, bool is_inode_hash_locked);</div><div class='ctx'> /*</div><div class='ctx'>  * Called with the inode lock held.</div><div class='ctx'>  */</div><div class='ctx'> static struct inode *find_inode(struct super_block *sb,</div><div class='ctx'> 				struct hlist_head *head,</div><div class='ctx'> 				int (*test)(struct inode *, void *),</div><div class='del'>-				void *data)</div><div class='add'>+				void *data, bool is_inode_hash_locked,</div><div class='add'>+				bool *isnew)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> </div><div class='add'>+	if (is_inode_hash_locked)</div><div class='add'>+		lockdep_assert_held(&amp;inode_hash_lock);</div><div class='add'>+	else</div><div class='add'>+		lockdep_assert_not_held(&amp;inode_hash_lock);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> repeat:</div><div class='del'>-	hlist_for_each_entry(inode, head, i_hash) {</div><div class='add'>+	hlist_for_each_entry_rcu(inode, head, i_hash) {</div><div class='ctx'> 		if (inode-&gt;i_sb != sb)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!test(inode, data))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE)) {</div><div class='del'>-			__wait_on_freeing_inode(inode);</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE)) {</div><div class='add'>+			__wait_on_freeing_inode(inode, is_inode_hash_locked);</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(inode-&gt;i_state &amp; I_CREATING)) {</div><div class='add'>+		if (unlikely(inode_state_read(inode) &amp; I_CREATING)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return ERR_PTR(-ESTALE);</div><div class='ctx'> 		}</div><div class='ctx'> 		__iget(inode);</div><div class='add'>+		*isnew = !!(inode_state_read(inode) &amp; I_NEW);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -922,29 +1077,40 @@ repeat:</div><div class='ctx'>  * iget_locked for details.</div><div class='ctx'>  */</div><div class='ctx'> static struct inode *find_inode_fast(struct super_block *sb,</div><div class='del'>-				struct hlist_head *head, unsigned long ino)</div><div class='add'>+				struct hlist_head *head, unsigned long ino,</div><div class='add'>+				bool is_inode_hash_locked, bool *isnew)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> </div><div class='add'>+	if (is_inode_hash_locked)</div><div class='add'>+		lockdep_assert_held(&amp;inode_hash_lock);</div><div class='add'>+	else</div><div class='add'>+		lockdep_assert_not_held(&amp;inode_hash_lock);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> repeat:</div><div class='del'>-	hlist_for_each_entry(inode, head, i_hash) {</div><div class='add'>+	hlist_for_each_entry_rcu(inode, head, i_hash) {</div><div class='ctx'> 		if (inode-&gt;i_ino != ino)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (inode-&gt;i_sb != sb)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE)) {</div><div class='del'>-			__wait_on_freeing_inode(inode);</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE)) {</div><div class='add'>+			__wait_on_freeing_inode(inode, is_inode_hash_locked);</div><div class='ctx'> 			goto repeat;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(inode-&gt;i_state &amp; I_CREATING)) {</div><div class='add'>+		if (unlikely(inode_state_read(inode) &amp; I_CREATING)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+			rcu_read_unlock();</div><div class='ctx'> 			return ERR_PTR(-ESTALE);</div><div class='ctx'> 		}</div><div class='ctx'> 		__iget(inode);</div><div class='add'>+		*isnew = !!(inode_state_read(inode) &amp; I_NEW);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		return inode;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -991,28 +1157,6 @@ unsigned int get_next_ino(void)</div><div class='ctx'> EXPORT_SYMBOL(get_next_ino);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	new_inode_pseudo 	- obtain an inode</div><div class='del'>- *	@sb: superblock</div><div class='del'>- *</div><div class='del'>- *	Allocates a new inode for given superblock.</div><div class='del'>- *	Inode wont be chained in superblock s_inodes list</div><div class='del'>- *	This means :</div><div class='del'>- *	- fs can't be unmount</div><div class='del'>- *	- quotas, fsnotify, writeback can't work</div><div class='del'>- */</div><div class='del'>-struct inode *new_inode_pseudo(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = alloc_inode(sb);</div><div class='del'>-</div><div class='del'>-	if (inode) {</div><div class='del'>-		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		inode-&gt;i_state = 0;</div><div class='del'>-		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-	}</div><div class='del'>-	return inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	new_inode 	- obtain an inode</div><div class='ctx'>  *	@sb: superblock</div><div class='ctx'>  *</div><div class='hunk'>@@ -1028,7 +1172,7 @@ struct inode *new_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	inode = new_inode_pseudo(sb);</div><div class='add'>+	inode = alloc_inode(sb);</div><div class='ctx'> 	if (inode)</div><div class='ctx'> 		inode_sb_list_add(inode);</div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -1044,9 +1188,8 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode)</div><div class='ctx'> 		/* Set new key only if filesystem hasn't already changed it */</div><div class='ctx'> 		if (lockdep_match_class(&amp;inode-&gt;i_rwsem, &amp;type-&gt;i_mutex_key)) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * ensure nobody is actually holding i_mutex</div><div class='add'>+			 * ensure nobody is actually holding i_rwsem</div><div class='ctx'> 			 */</div><div class='del'>-			// mutex_destroy(&amp;inode-&gt;i_mutex);</div><div class='ctx'> 			init_rwsem(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> 			lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='ctx'> 					  &amp;type-&gt;i_mutex_dir_key);</div><div class='hunk'>@@ -1067,10 +1210,9 @@ void unlock_new_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_annotate_inode_mutex_key(inode);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	WARN_ON(!(inode-&gt;i_state &amp; I_NEW));</div><div class='del'>-	inode-&gt;i_state &amp;= ~I_NEW &amp; ~I_CREATING;</div><div class='del'>-	smp_mb();</div><div class='del'>-	wake_up_bit(&amp;inode-&gt;i_state, __I_NEW);</div><div class='add'>+	WARN_ON(!(inode_state_read(inode) &amp; I_NEW));</div><div class='add'>+	inode_state_clear(inode, I_NEW | I_CREATING);</div><div class='add'>+	inode_wake_up_bit(inode, __I_NEW);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(unlock_new_inode);</div><div class='hunk'>@@ -1079,10 +1221,9 @@ void discard_new_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_annotate_inode_mutex_key(inode);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	WARN_ON(!(inode-&gt;i_state &amp; I_NEW));</div><div class='del'>-	inode-&gt;i_state &amp;= ~I_NEW;</div><div class='del'>-	smp_mb();</div><div class='del'>-	wake_up_bit(&amp;inode-&gt;i_state, __I_NEW);</div><div class='add'>+	WARN_ON(!(inode_state_read(inode) &amp; I_NEW));</div><div class='add'>+	inode_state_clear(inode, I_NEW);</div><div class='add'>+	inode_wake_up_bit(inode, __I_NEW);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> }</div><div class='hunk'>@@ -1137,18 +1278,18 @@ EXPORT_SYMBOL(unlock_two_nondirectories);</div><div class='ctx'>  * @test:	callback used for comparisons between inodes</div><div class='ctx'>  * @set:	callback used to initialize a new struct inode</div><div class='ctx'>  * @data:	opaque data pointer to pass to @test and @set</div><div class='add'>+ * @isnew:	pointer to a bool which will indicate whether I_NEW is set</div><div class='ctx'>  *</div><div class='ctx'>  * Search for the inode specified by @hashval and @data in the inode cache,</div><div class='del'>- * and if present it is return it with an increased reference count. This is</div><div class='del'>- * a variant of iget5_locked() for callers that don't want to fail on memory</div><div class='del'>- * allocation of inode.</div><div class='add'>+ * and if present return it with an increased reference count. This is a</div><div class='add'>+ * variant of iget5_locked() that doesn't allocate an inode.</div><div class='ctx'>  *</div><div class='del'>- * If the inode is not in cache, insert the pre-allocated inode to cache and</div><div class='add'>+ * If the inode is not present in the cache, insert the pre-allocated inode and</div><div class='ctx'>  * return it locked, hashed, and with the I_NEW flag set. The file system gets</div><div class='ctx'>  * to fill it in before unlocking it via unlock_new_inode().</div><div class='ctx'>  *</div><div class='del'>- * Note both @test and @set are called with the inode_hash_lock held, so can't</div><div class='del'>- * sleep.</div><div class='add'>+ * Note that both @test and @set are called with the inode_hash_lock held, so</div><div class='add'>+ * they can't sleep.</div><div class='ctx'>  */</div><div class='ctx'> struct inode *inode_insert5(struct inode *inode, unsigned long hashval,</div><div class='ctx'> 			    int (*test)(struct inode *, void *),</div><div class='hunk'>@@ -1156,10 +1297,13 @@ struct inode *inode_insert5(struct inode *inode, unsigned long hashval,</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *head = inode_hashtable + hash(inode-&gt;i_sb, hashval);</div><div class='ctx'> 	struct inode *old;</div><div class='add'>+	bool isnew;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	spin_lock(&amp;inode_hash_lock);</div><div class='del'>-	old = find_inode(inode-&gt;i_sb, head, test, data);</div><div class='add'>+	old = find_inode(inode-&gt;i_sb, head, test, data, true, &amp;isnew);</div><div class='ctx'> 	if (unlikely(old)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Uhhuh, somebody else created the same inode under us.</div><div class='hunk'>@@ -1168,7 +1312,8 @@ again:</div><div class='ctx'> 		spin_unlock(&amp;inode_hash_lock);</div><div class='ctx'> 		if (IS_ERR(old))</div><div class='ctx'> 			return NULL;</div><div class='del'>-		wait_on_inode(old);</div><div class='add'>+		if (unlikely(isnew))</div><div class='add'>+			wait_on_new_inode(old);</div><div class='ctx'> 		if (unlikely(inode_unhashed(old))) {</div><div class='ctx'> 			iput(old);</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -1177,8 +1322,8 @@ again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (set &amp;&amp; unlikely(set(inode, data))) {</div><div class='del'>-		inode = NULL;</div><div class='del'>-		goto unlock;</div><div class='add'>+		spin_unlock(&amp;inode_hash_lock);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1186,18 +1331,18 @@ again:</div><div class='ctx'> 	 * caller is responsible for filling in the contents</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	inode-&gt;i_state |= I_NEW;</div><div class='add'>+	inode_state_set(inode, I_NEW);</div><div class='ctx'> 	hlist_add_head_rcu(&amp;inode-&gt;i_hash, head);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='add'>+	spin_unlock(&amp;inode_hash_lock);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add inode to the sb list if it's not already. It has I_NEW at this</div><div class='ctx'> 	 * point, so it should be safe to test i_sb_list locklessly.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (list_empty(&amp;inode-&gt;i_sb_list))</div><div class='ctx'> 		inode_sb_list_add(inode);</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock(&amp;inode_hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -1212,16 +1357,16 @@ EXPORT_SYMBOL(inode_insert5);</div><div class='ctx'>  * @data:	opaque data pointer to pass to @test and @set</div><div class='ctx'>  *</div><div class='ctx'>  * Search for the inode specified by @hashval and @data in the inode cache,</div><div class='del'>- * and if present it is return it with an increased reference count. This is</div><div class='del'>- * a generalized version of iget_locked() for file systems where the inode</div><div class='add'>+ * and if present return it with an increased reference count. This is a</div><div class='add'>+ * generalized version of iget_locked() for file systems where the inode</div><div class='ctx'>  * number is not sufficient for unique identification of an inode.</div><div class='ctx'>  *</div><div class='del'>- * If the inode is not in cache, allocate a new inode and return it locked,</div><div class='del'>- * hashed, and with the I_NEW flag set. The file system gets to fill it in</div><div class='del'>- * before unlocking it via unlock_new_inode().</div><div class='add'>+ * If the inode is not present in the cache, allocate and insert a new inode</div><div class='add'>+ * and return it locked, hashed, and with the I_NEW flag set. The file system</div><div class='add'>+ * gets to fill it in before unlocking it via unlock_new_inode().</div><div class='ctx'>  *</div><div class='del'>- * Note both @test and @set are called with the inode_hash_lock held, so can't</div><div class='del'>- * sleep.</div><div class='add'>+ * Note that both @test and @set are called with the inode_hash_lock held, so</div><div class='add'>+ * they can't sleep.</div><div class='ctx'>  */</div><div class='ctx'> struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,</div><div class='ctx'> 		int (*test)(struct inode *, void *),</div><div class='hunk'>@@ -1233,7 +1378,6 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,</div><div class='ctx'> 		struct inode *new = alloc_inode(sb);</div><div class='ctx'> </div><div class='ctx'> 		if (new) {</div><div class='del'>-			new-&gt;i_state = 0;</div><div class='ctx'> 			inode = inode_insert5(new, hashval, test, set, data);</div><div class='ctx'> 			if (unlikely(inode != new))</div><div class='ctx'> 				destroy_inode(new);</div><div class='hunk'>@@ -1244,6 +1388,51 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,</div><div class='ctx'> EXPORT_SYMBOL(iget5_locked);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * iget5_locked_rcu - obtain an inode from a mounted file system</div><div class='add'>+ * @sb:		super block of file system</div><div class='add'>+ * @hashval:	hash value (usually inode number) to get</div><div class='add'>+ * @test:	callback used for comparisons between inodes</div><div class='add'>+ * @set:	callback used to initialize a new struct inode</div><div class='add'>+ * @data:	opaque data pointer to pass to @test and @set</div><div class='add'>+ *</div><div class='add'>+ * This is equivalent to iget5_locked, except the @test callback must</div><div class='add'>+ * tolerate the inode not being stable, including being mid-teardown.</div><div class='add'>+ */</div><div class='add'>+struct inode *iget5_locked_rcu(struct super_block *sb, unsigned long hashval,</div><div class='add'>+		int (*test)(struct inode *, void *),</div><div class='add'>+		int (*set)(struct inode *, void *), void *data)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = inode_hashtable + hash(sb, hashval);</div><div class='add'>+	struct inode *inode, *new;</div><div class='add'>+	bool isnew;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	inode = find_inode(sb, head, test, data, false, &amp;isnew);</div><div class='add'>+	if (inode) {</div><div class='add'>+		if (IS_ERR(inode))</div><div class='add'>+			return NULL;</div><div class='add'>+		if (unlikely(isnew))</div><div class='add'>+			wait_on_new_inode(inode);</div><div class='add'>+		if (unlikely(inode_unhashed(inode))) {</div><div class='add'>+			iput(inode);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+		return inode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new = alloc_inode(sb);</div><div class='add'>+	if (new) {</div><div class='add'>+		inode = inode_insert5(new, hashval, test, set, data);</div><div class='add'>+		if (unlikely(inode != new))</div><div class='add'>+			destroy_inode(new);</div><div class='add'>+	}</div><div class='add'>+	return inode;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iget5_locked_rcu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * iget_locked - obtain an inode from a mounted file system</div><div class='ctx'>  * @sb:		super block of file system</div><div class='ctx'>  * @ino:	inode number to get</div><div class='hunk'>@@ -1260,14 +1449,17 @@ struct inode *iget_locked(struct super_block *sb, unsigned long ino)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *head = inode_hashtable + hash(sb, ino);</div><div class='ctx'> 	struct inode *inode;</div><div class='add'>+	bool isnew;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='ctx'> again:</div><div class='del'>-	spin_lock(&amp;inode_hash_lock);</div><div class='del'>-	inode = find_inode_fast(sb, head, ino);</div><div class='del'>-	spin_unlock(&amp;inode_hash_lock);</div><div class='add'>+	inode = find_inode_fast(sb, head, ino, false, &amp;isnew);</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='ctx'> 			return NULL;</div><div class='del'>-		wait_on_inode(inode);</div><div class='add'>+		if (unlikely(isnew))</div><div class='add'>+			wait_on_new_inode(inode);</div><div class='ctx'> 		if (unlikely(inode_unhashed(inode))) {</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -1281,15 +1473,15 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode_hash_lock);</div><div class='ctx'> 		/* We released the lock, so.. */</div><div class='del'>-		old = find_inode_fast(sb, head, ino);</div><div class='add'>+		old = find_inode_fast(sb, head, ino, true, &amp;isnew);</div><div class='ctx'> 		if (!old) {</div><div class='ctx'> 			inode-&gt;i_ino = ino;</div><div class='ctx'> 			spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-			inode-&gt;i_state = I_NEW;</div><div class='add'>+			inode_state_assign(inode, I_NEW);</div><div class='ctx'> 			hlist_add_head_rcu(&amp;inode-&gt;i_hash, head);</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-			inode_sb_list_add(inode);</div><div class='ctx'> 			spin_unlock(&amp;inode_hash_lock);</div><div class='add'>+			inode_sb_list_add(inode);</div><div class='ctx'> </div><div class='ctx'> 			/* Return the locked inode with I_NEW set, the</div><div class='ctx'> 			 * caller is responsible for filling in the contents</div><div class='hunk'>@@ -1307,7 +1499,8 @@ again:</div><div class='ctx'> 		if (IS_ERR(old))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		inode = old;</div><div class='del'>-		wait_on_inode(inode);</div><div class='add'>+		if (unlikely(isnew))</div><div class='add'>+			wait_on_new_inode(inode);</div><div class='ctx'> 		if (unlikely(inode_unhashed(inode))) {</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -1378,7 +1571,7 @@ EXPORT_SYMBOL(iunique);</div><div class='ctx'> struct inode *igrab(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE))) {</div><div class='add'>+	if (!(inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE))) {</div><div class='ctx'> 		__iget(inode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1411,13 +1604,13 @@ EXPORT_SYMBOL(igrab);</div><div class='ctx'>  * Note2: @test is called with the inode_hash_lock held, so can't sleep.</div><div class='ctx'>  */</div><div class='ctx'> struct inode *ilookup5_nowait(struct super_block *sb, unsigned long hashval,</div><div class='del'>-		int (*test)(struct inode *, void *), void *data)</div><div class='add'>+		int (*test)(struct inode *, void *), void *data, bool *isnew)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *head = inode_hashtable + hash(sb, hashval);</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode_hash_lock);</div><div class='del'>-	inode = find_inode(sb, head, test, data);</div><div class='add'>+	inode = find_inode(sb, head, test, data, true, isnew);</div><div class='ctx'> 	spin_unlock(&amp;inode_hash_lock);</div><div class='ctx'> </div><div class='ctx'> 	return IS_ERR(inode) ? NULL : inode;</div><div class='hunk'>@@ -1445,10 +1638,15 @@ struct inode *ilookup5(struct super_block *sb, unsigned long hashval,</div><div class='ctx'> 		int (*test)(struct inode *, void *), void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='add'>+	bool isnew;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='ctx'> again:</div><div class='del'>-	inode = ilookup5_nowait(sb, hashval, test, data);</div><div class='add'>+	inode = ilookup5_nowait(sb, hashval, test, data, &amp;isnew);</div><div class='ctx'> 	if (inode) {</div><div class='del'>-		wait_on_inode(inode);</div><div class='add'>+		if (unlikely(isnew))</div><div class='add'>+			wait_on_new_inode(inode);</div><div class='ctx'> 		if (unlikely(inode_unhashed(inode))) {</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -1470,15 +1668,18 @@ struct inode *ilookup(struct super_block *sb, unsigned long ino)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *head = inode_hashtable + hash(sb, ino);</div><div class='ctx'> 	struct inode *inode;</div><div class='add'>+	bool isnew;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='ctx'> again:</div><div class='del'>-	spin_lock(&amp;inode_hash_lock);</div><div class='del'>-	inode = find_inode_fast(sb, head, ino);</div><div class='del'>-	spin_unlock(&amp;inode_hash_lock);</div><div class='add'>+	inode = find_inode_fast(sb, head, ino, false, &amp;isnew);</div><div class='ctx'> </div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='ctx'> 			return NULL;</div><div class='del'>-		wait_on_inode(inode);</div><div class='add'>+		if (unlikely(isnew))</div><div class='add'>+			wait_on_new_inode(inode);</div><div class='ctx'> 		if (unlikely(inode_unhashed(inode))) {</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 			goto again;</div><div class='hunk'>@@ -1570,7 +1771,7 @@ struct inode *find_inode_rcu(struct super_block *sb, unsigned long hashval,</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry_rcu(inode, head, i_hash) {</div><div class='ctx'> 		if (inode-&gt;i_sb == sb &amp;&amp;</div><div class='del'>-		    !(READ_ONCE(inode-&gt;i_state) &amp; (I_FREEING | I_WILL_FREE)) &amp;&amp;</div><div class='add'>+		    !(inode_state_read_once(inode) &amp; (I_FREEING | I_WILL_FREE)) &amp;&amp;</div><div class='ctx'> 		    test(inode, data))</div><div class='ctx'> 			return inode;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1609,7 +1810,7 @@ struct inode *find_inode_by_ino_rcu(struct super_block *sb,</div><div class='ctx'> 	hlist_for_each_entry_rcu(inode, head, i_hash) {</div><div class='ctx'> 		if (inode-&gt;i_ino == ino &amp;&amp;</div><div class='ctx'> 		    inode-&gt;i_sb == sb &amp;&amp;</div><div class='del'>-		    !(READ_ONCE(inode-&gt;i_state) &amp; (I_FREEING | I_WILL_FREE)))</div><div class='add'>+		    !(inode_state_read_once(inode) &amp; (I_FREEING | I_WILL_FREE)))</div><div class='ctx'> 		    return inode;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -1621,6 +1822,9 @@ int insert_inode_locked(struct inode *inode)</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	ino_t ino = inode-&gt;i_ino;</div><div class='ctx'> 	struct hlist_head *head = inode_hashtable + hash(sb, ino);</div><div class='add'>+	bool isnew;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct inode *old = NULL;</div><div class='hunk'>@@ -1631,7 +1835,7 @@ int insert_inode_locked(struct inode *inode)</div><div class='ctx'> 			if (old-&gt;i_sb != sb)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			spin_lock(&amp;old-&gt;i_lock);</div><div class='del'>-			if (old-&gt;i_state &amp; (I_FREEING|I_WILL_FREE)) {</div><div class='add'>+			if (inode_state_read(old) &amp; (I_FREEING | I_WILL_FREE)) {</div><div class='ctx'> 				spin_unlock(&amp;old-&gt;i_lock);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1639,21 +1843,23 @@ int insert_inode_locked(struct inode *inode)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (likely(!old)) {</div><div class='ctx'> 			spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-			inode-&gt;i_state |= I_NEW | I_CREATING;</div><div class='add'>+			inode_state_set(inode, I_NEW | I_CREATING);</div><div class='ctx'> 			hlist_add_head_rcu(&amp;inode-&gt;i_hash, head);</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			spin_unlock(&amp;inode_hash_lock);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(old-&gt;i_state &amp; I_CREATING)) {</div><div class='add'>+		if (unlikely(inode_state_read(old) &amp; I_CREATING)) {</div><div class='ctx'> 			spin_unlock(&amp;old-&gt;i_lock);</div><div class='ctx'> 			spin_unlock(&amp;inode_hash_lock);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		__iget(old);</div><div class='add'>+		isnew = !!(inode_state_read(old) &amp; I_NEW);</div><div class='ctx'> 		spin_unlock(&amp;old-&gt;i_lock);</div><div class='ctx'> 		spin_unlock(&amp;inode_hash_lock);</div><div class='del'>-		wait_on_inode(old);</div><div class='add'>+		if (isnew)</div><div class='add'>+			wait_on_new_inode(old);</div><div class='ctx'> 		if (unlikely(!inode_unhashed(old))) {</div><div class='ctx'> 			iput(old);</div><div class='ctx'> 			return -EBUSY;</div><div class='hunk'>@@ -1668,7 +1874,9 @@ int insert_inode_locked4(struct inode *inode, unsigned long hashval,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *old;</div><div class='ctx'> </div><div class='del'>-	inode-&gt;i_state |= I_CREATING;</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	inode_state_set_raw(inode, I_CREATING);</div><div class='ctx'> 	old = inode_insert5(inode, hashval, test, NULL, data);</div><div class='ctx'> </div><div class='ctx'> 	if (old != inode) {</div><div class='hunk'>@@ -1680,11 +1888,11 @@ int insert_inode_locked4(struct inode *inode, unsigned long hashval,</div><div class='ctx'> EXPORT_SYMBOL(insert_inode_locked4);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int generic_delete_inode(struct inode *inode)</div><div class='add'>+int inode_just_drop(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(generic_delete_inode);</div><div class='add'>+EXPORT_SYMBOL(inode_just_drop);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called when we're dropping the last reference</div><div class='hunk'>@@ -1700,40 +1908,44 @@ static void iput_final(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	const struct super_operations *op = inode-&gt;i_sb-&gt;s_op;</div><div class='del'>-	unsigned long state;</div><div class='ctx'> 	int drop;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(inode-&gt;i_state &amp; I_NEW);</div><div class='add'>+	WARN_ON(inode_state_read(inode) &amp; I_NEW);</div><div class='add'>+	VFS_BUG_ON_INODE(atomic_read(&amp;inode-&gt;i_count) != 0, inode);</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;drop_inode)</div><div class='ctx'> 		drop = op-&gt;drop_inode(inode);</div><div class='ctx'> 	else</div><div class='del'>-		drop = generic_drop_inode(inode);</div><div class='add'>+		drop = inode_generic_drop(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (!drop &amp;&amp;</div><div class='del'>-	    !(inode-&gt;i_state &amp; I_DONTCACHE) &amp;&amp;</div><div class='add'>+	    !(inode_state_read(inode) &amp; I_DONTCACHE) &amp;&amp;</div><div class='ctx'> 	    (sb-&gt;s_flags &amp; SB_ACTIVE)) {</div><div class='del'>-		__inode_add_lru(inode, true);</div><div class='add'>+		__inode_lru_list_add(inode, true);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	state = inode-&gt;i_state;</div><div class='del'>-	if (!drop) {</div><div class='del'>-		WRITE_ONCE(inode-&gt;i_state, state | I_WILL_FREE);</div><div class='add'>+	/*</div><div class='add'>+	 * Re-check -&gt;i_count in case the -&gt;drop_inode() hooks played games.</div><div class='add'>+	 * Note we only execute this if the verdict was to drop the inode.</div><div class='add'>+	 */</div><div class='add'>+	VFS_BUG_ON_INODE(atomic_read(&amp;inode-&gt;i_count) != 0, inode);</div><div class='add'>+</div><div class='add'>+	if (drop) {</div><div class='add'>+		inode_state_set(inode, I_FREEING);</div><div class='add'>+	} else {</div><div class='add'>+		inode_state_set(inode, I_WILL_FREE);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 		write_inode_now(inode, 1);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		state = inode-&gt;i_state;</div><div class='del'>-		WARN_ON(state &amp; I_NEW);</div><div class='del'>-		state &amp;= ~I_WILL_FREE;</div><div class='add'>+		WARN_ON(inode_state_read(inode) &amp; I_NEW);</div><div class='add'>+		inode_state_replace(inode, I_WILL_FREE, I_FREEING);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WRITE_ONCE(inode-&gt;i_state, state | I_FREEING);</div><div class='del'>-	if (!list_empty(&amp;inode-&gt;i_lru))</div><div class='del'>-		inode_lru_list_del(inode);</div><div class='add'>+	inode_lru_list_del(inode);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 	evict(inode);</div><div class='hunk'>@@ -1750,23 +1962,61 @@ static void iput_final(struct inode *inode)</div><div class='ctx'>  */</div><div class='ctx'> void iput(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (!inode)</div><div class='add'>+	might_sleep();</div><div class='add'>+	if (unlikely(!inode))</div><div class='ctx'> 		return;</div><div class='del'>-	BUG_ON(inode-&gt;i_state &amp; I_CLEAR);</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='del'>-	if (atomic_dec_and_lock(&amp;inode-&gt;i_count, &amp;inode-&gt;i_lock)) {</div><div class='del'>-		if (inode-&gt;i_nlink &amp;&amp; (inode-&gt;i_state &amp; I_DIRTY_TIME)) {</div><div class='del'>-			atomic_inc(&amp;inode-&gt;i_count);</div><div class='del'>-			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-			trace_writeback_lazytime_iput(inode);</div><div class='del'>-			mark_inode_dirty_sync(inode);</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-		iput_final(inode);</div><div class='add'>+	lockdep_assert_not_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	VFS_BUG_ON_INODE(inode_state_read_once(inode) &amp; (I_FREEING | I_CLEAR), inode);</div><div class='add'>+	/*</div><div class='add'>+	 * Note this assert is technically racy as if the count is bogusly</div><div class='add'>+	 * equal to one, then two CPUs racing to further drop it can both</div><div class='add'>+	 * conclude it's fine.</div><div class='add'>+	 */</div><div class='add'>+	VFS_BUG_ON_INODE(atomic_read(&amp;inode-&gt;i_count) &lt; 1, inode);</div><div class='add'>+</div><div class='add'>+	if (atomic_add_unless(&amp;inode-&gt;i_count, -1, 1))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((inode_state_read_once(inode) &amp; I_DIRTY_TIME) &amp;&amp; inode-&gt;i_nlink) {</div><div class='add'>+		trace_writeback_lazytime_iput(inode);</div><div class='add'>+		mark_inode_dirty_sync(inode);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (unlikely((inode_state_read(inode) &amp; I_DIRTY_TIME) &amp;&amp; inode-&gt;i_nlink)) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!atomic_dec_and_test(&amp;inode-&gt;i_count)) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * iput_final() drops -&gt;i_lock, we can't assert on it as the inode may</div><div class='add'>+	 * be deallocated by the time the call returns.</div><div class='add'>+	 */</div><div class='add'>+	iput_final(inode);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(iput);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	iput_not_last	- put an inode assuming this is not the last reference</div><div class='add'>+ *	@inode: inode to put</div><div class='add'>+ */</div><div class='add'>+void iput_not_last(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	VFS_BUG_ON_INODE(inode_state_read_once(inode) &amp; (I_FREEING | I_CLEAR), inode);</div><div class='add'>+	VFS_BUG_ON_INODE(atomic_read(&amp;inode-&gt;i_count) &lt; 2, inode);</div><div class='add'>+</div><div class='add'>+	WARN_ON(atomic_sub_return(1, &amp;inode-&gt;i_count) == 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iput_not_last);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> /**</div><div class='ctx'>  *	bmap	- find a block number in a file</div><div class='hunk'>@@ -2031,7 +2281,7 @@ static int __remove_privs(struct mnt_idmap *idmap,</div><div class='ctx'> 	return notify_change(idmap, dentry, &amp;newattrs, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __file_remove_privs(struct file *file, unsigned int flags)</div><div class='add'>+static int file_remove_privs_flags(struct file *file, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = file_dentry(file);</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='hunk'>@@ -2068,45 +2318,82 @@ static int __file_remove_privs(struct file *file, unsigned int flags)</div><div class='ctx'>  */</div><div class='ctx'> int file_remove_privs(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return __file_remove_privs(file, 0);</div><div class='add'>+	return file_remove_privs_flags(file, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(file_remove_privs);</div><div class='ctx'> </div><div class='del'>-static int inode_needs_update_time(struct inode *inode)</div><div class='add'>+/**</div><div class='add'>+ * current_time - Return FS time (possibly fine-grained)</div><div class='add'>+ * @inode: inode.</div><div class='add'>+ *</div><div class='add'>+ * Return the current time truncated to the time granularity supported by</div><div class='add'>+ * the fs, as suitable for a ctime/mtime change. If the ctime is flagged</div><div class='add'>+ * as having been QUERIED, get a fine-grained timestamp, but don't update</div><div class='add'>+ * the floor.</div><div class='add'>+ *</div><div class='add'>+ * For a multigrain inode, this is effectively an estimate of the timestamp</div><div class='add'>+ * that a file would receive. An actual update must go through</div><div class='add'>+ * inode_set_ctime_current().</div><div class='add'>+ */</div><div class='add'>+struct timespec64 current_time(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 now;</div><div class='add'>+	u32 cns;</div><div class='add'>+</div><div class='add'>+	ktime_get_coarse_real_ts64_mg(&amp;now);</div><div class='add'>+</div><div class='add'>+	if (!is_mgtime(inode))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* If nothing has queried it, then coarse time is fine */</div><div class='add'>+	cns = smp_load_acquire(&amp;inode-&gt;i_ctime_nsec);</div><div class='add'>+	if (cns &amp; I_CTIME_QUERIED) {</div><div class='add'>+		/*</div><div class='add'>+		 * If there is no apparent change, then get a fine-grained</div><div class='add'>+		 * timestamp.</div><div class='add'>+		 */</div><div class='add'>+		if (now.tv_nsec == (cns &amp; ~I_CTIME_QUERIED))</div><div class='add'>+			ktime_get_real_ts64(&amp;now);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return timestamp_truncate(now, inode);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(current_time);</div><div class='add'>+</div><div class='add'>+static int file_update_time_flags(struct file *file, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	int sync_it = 0;</div><div class='del'>-	struct timespec64 now = current_time(inode);</div><div class='del'>-	struct timespec64 ts;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct timespec64 now, ts;</div><div class='add'>+	int sync_mode = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* First try to exhaust all avenues to not sync */</div><div class='ctx'> 	if (IS_NOCMTIME(inode))</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (unlikely(file-&gt;f_mode &amp; FMODE_NOCMTIME))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	now = current_time(inode);</div><div class='ctx'> </div><div class='ctx'> 	ts = inode_get_mtime(inode);</div><div class='ctx'> 	if (!timespec64_equal(&amp;ts, &amp;now))</div><div class='del'>-		sync_it = S_MTIME;</div><div class='del'>-</div><div class='add'>+		sync_mode |= S_MTIME;</div><div class='ctx'> 	ts = inode_get_ctime(inode);</div><div class='ctx'> 	if (!timespec64_equal(&amp;ts, &amp;now))</div><div class='del'>-		sync_it |= S_CTIME;</div><div class='del'>-</div><div class='add'>+		sync_mode |= S_CTIME;</div><div class='ctx'> 	if (IS_I_VERSION(inode) &amp;&amp; inode_iversion_need_inc(inode))</div><div class='del'>-		sync_it |= S_VERSION;</div><div class='del'>-</div><div class='del'>-	return sync_it;</div><div class='del'>-}</div><div class='add'>+		sync_mode |= S_VERSION;</div><div class='ctx'> </div><div class='del'>-static int __file_update_time(struct file *file, int sync_mode)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='add'>+	if (!sync_mode)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	/* try to update time settings */</div><div class='del'>-	if (!mnt_get_write_access_file(file)) {</div><div class='del'>-		ret = inode_update_time(inode, sync_mode);</div><div class='del'>-		mnt_put_write_access_file(file);</div><div class='del'>-	}</div><div class='add'>+	if (flags &amp; IOCB_NOWAIT)</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> </div><div class='add'>+	if (mnt_get_write_access_file(file))</div><div class='add'>+		return 0;</div><div class='add'>+	ret = inode_update_time(inode, sync_mode);</div><div class='add'>+	mnt_put_write_access_file(file);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2126,14 +2413,7 @@ static int __file_update_time(struct file *file, int sync_mode)</div><div class='ctx'>  */</div><div class='ctx'> int file_update_time(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='del'>-</div><div class='del'>-	ret = inode_needs_update_time(inode);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return __file_update_time(file, ret);</div><div class='add'>+	return file_update_time_flags(file, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(file_update_time);</div><div class='ctx'> </div><div class='hunk'>@@ -2155,26 +2435,15 @@ EXPORT_SYMBOL(file_update_time);</div><div class='ctx'> static int file_modified_flags(struct file *file, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct inode *inode = file_inode(file);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the security bits if the process is not being run by root.</div><div class='ctx'> 	 * This keeps people from modifying setuid and setgid binaries.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = __file_remove_privs(file, flags);</div><div class='add'>+	ret = file_remove_privs_flags(file, flags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(file-&gt;f_mode &amp; FMODE_NOCMTIME))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = inode_needs_update_time(inode);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return ret;</div><div class='del'>-	if (flags &amp; IOCB_NOWAIT)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	return __file_update_time(file, ret);</div><div class='add'>+	return file_update_time_flags(file, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2232,17 +2501,31 @@ EXPORT_SYMBOL(inode_needs_sync);</div><div class='ctx'>  * wake_up_bit(&amp;inode-&gt;i_state, __I_NEW) after removing from the hash list</div><div class='ctx'>  * will DTRT.</div><div class='ctx'>  */</div><div class='del'>-static void __wait_on_freeing_inode(struct inode *inode)</div><div class='add'>+static void __wait_on_freeing_inode(struct inode *inode, bool is_inode_hash_locked)</div><div class='ctx'> {</div><div class='del'>-	wait_queue_head_t *wq;</div><div class='del'>-	DEFINE_WAIT_BIT(wait, &amp;inode-&gt;i_state, __I_NEW);</div><div class='del'>-	wq = bit_waitqueue(&amp;inode-&gt;i_state, __I_NEW);</div><div class='del'>-	prepare_to_wait(wq, &amp;wait.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='add'>+	struct wait_bit_queue_entry wqe;</div><div class='add'>+	struct wait_queue_head *wq_head;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Handle racing against evict(), see that routine for more details.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(inode_unhashed(inode))) {</div><div class='add'>+		WARN_ON(is_inode_hash_locked);</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wq_head = inode_bit_waitqueue(&amp;wqe, inode, __I_NEW);</div><div class='add'>+	prepare_to_wait_event(wq_head, &amp;wqe.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-	spin_unlock(&amp;inode_hash_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (is_inode_hash_locked)</div><div class='add'>+		spin_unlock(&amp;inode_hash_lock);</div><div class='ctx'> 	schedule();</div><div class='del'>-	finish_wait(wq, &amp;wait.wq_entry);</div><div class='del'>-	spin_lock(&amp;inode_hash_lock);</div><div class='add'>+	finish_wait(wq_head, &amp;wqe.wq_entry);</div><div class='add'>+	if (is_inode_hash_locked)</div><div class='add'>+		spin_lock(&amp;inode_hash_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __initdata unsigned long ihash_entries;</div><div class='hunk'>@@ -2285,7 +2568,7 @@ void __init inode_init(void)</div><div class='ctx'> 					 sizeof(struct inode),</div><div class='ctx'> 					 0,</div><div class='ctx'> 					 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|</div><div class='del'>-					 SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+					 SLAB_ACCOUNT),</div><div class='ctx'> 					 init_once);</div><div class='ctx'> </div><div class='ctx'> 	/* Hash may have been set up in inode_init_early */</div><div class='hunk'>@@ -2307,21 +2590,28 @@ void __init inode_init(void)</div><div class='ctx'> void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev)</div><div class='ctx'> {</div><div class='ctx'> 	inode-&gt;i_mode = mode;</div><div class='del'>-	if (S_ISCHR(mode)) {</div><div class='add'>+	switch (inode-&gt;i_mode &amp; S_IFMT) {</div><div class='add'>+	case S_IFCHR:</div><div class='ctx'> 		inode-&gt;i_fop = &amp;def_chr_fops;</div><div class='ctx'> 		inode-&gt;i_rdev = rdev;</div><div class='del'>-	} else if (S_ISBLK(mode)) {</div><div class='add'>+		break;</div><div class='add'>+	case S_IFBLK:</div><div class='ctx'> 		if (IS_ENABLED(CONFIG_BLOCK))</div><div class='ctx'> 			inode-&gt;i_fop = &amp;def_blk_fops;</div><div class='ctx'> 		inode-&gt;i_rdev = rdev;</div><div class='del'>-	} else if (S_ISFIFO(mode))</div><div class='add'>+		break;</div><div class='add'>+	case S_IFIFO:</div><div class='ctx'> 		inode-&gt;i_fop = &amp;pipefifo_fops;</div><div class='del'>-	else if (S_ISSOCK(mode))</div><div class='del'>-		;	/* leave it no_open_fops */</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	case S_IFSOCK:</div><div class='add'>+		/* leave it no_open_fops */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		printk(KERN_DEBUG "init_special_inode: bogus i_mode (%o) for"</div><div class='ctx'> 				  " inode %s:%lu\n", mode, inode-&gt;i_sb-&gt;s_id,</div><div class='ctx'> 				  inode-&gt;i_ino);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(init_special_inode);</div><div class='ctx'> </div><div class='hunk'>@@ -2388,18 +2678,11 @@ EXPORT_SYMBOL(inode_owner_or_capable);</div><div class='ctx'> /*</div><div class='ctx'>  * Direct i/o helper functions</div><div class='ctx'>  */</div><div class='del'>-static void __inode_dio_wait(struct inode *inode)</div><div class='add'>+bool inode_dio_finished(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	wait_queue_head_t *wq = bit_waitqueue(&amp;inode-&gt;i_state, __I_DIO_WAKEUP);</div><div class='del'>-	DEFINE_WAIT_BIT(q, &amp;inode-&gt;i_state, __I_DIO_WAKEUP);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		prepare_to_wait(wq, &amp;q.wq_entry, TASK_UNINTERRUPTIBLE);</div><div class='del'>-		if (atomic_read(&amp;inode-&gt;i_dio_count))</div><div class='del'>-			schedule();</div><div class='del'>-	} while (atomic_read(&amp;inode-&gt;i_dio_count));</div><div class='del'>-	finish_wait(wq, &amp;q.wq_entry);</div><div class='add'>+	return atomic_read(&amp;inode-&gt;i_dio_count) == 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(inode_dio_finished);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * inode_dio_wait - wait for outstanding DIO requests to finish</div><div class='hunk'>@@ -2409,19 +2692,25 @@ static void __inode_dio_wait(struct inode *inode)</div><div class='ctx'>  * proceed with a truncate or equivalent operation.</div><div class='ctx'>  *</div><div class='ctx'>  * Must be called under a lock that serializes taking new references</div><div class='del'>- * to i_dio_count, usually by inode-&gt;i_mutex.</div><div class='add'>+ * to i_dio_count, usually by inode-&gt;i_rwsem.</div><div class='ctx'>  */</div><div class='ctx'> void inode_dio_wait(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_read(&amp;inode-&gt;i_dio_count))</div><div class='del'>-		__inode_dio_wait(inode);</div><div class='add'>+	wait_var_event(&amp;inode-&gt;i_dio_count, inode_dio_finished(inode));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inode_dio_wait);</div><div class='ctx'> </div><div class='add'>+void inode_dio_wait_interruptible(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	wait_var_event_interruptible(&amp;inode-&gt;i_dio_count,</div><div class='add'>+				     inode_dio_finished(inode));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inode_dio_wait_interruptible);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * inode_set_flags - atomically set some inode flags</div><div class='ctx'>  *</div><div class='del'>- * Note: the caller should be holding i_mutex, or else be sure that</div><div class='add'>+ * Note: the caller should be holding i_rwsem exclusively, or else be sure that</div><div class='ctx'>  * they have exclusive access to the inode structure (i.e., while the</div><div class='ctx'>  * inode is being instantiated).  The reason for the cmpxchg() loop</div><div class='ctx'>  * --- which wouldn't be necessary if all code paths which modify</div><div class='hunk'>@@ -2429,7 +2718,7 @@ EXPORT_SYMBOL(inode_dio_wait);</div><div class='ctx'>  * code path which doesn't today so we use cmpxchg() out of an abundance</div><div class='ctx'>  * of caution.</div><div class='ctx'>  *</div><div class='del'>- * In the long run, i_mutex is overkill, and we should probably look</div><div class='add'>+ * In the long run, i_rwsem is overkill, and we should probably look</div><div class='ctx'>  * at using the i_lock spinlock to protect i_flags, and then make sure</div><div class='ctx'>  * it is so documented in include/linux/fs.h and that all code follows</div><div class='ctx'>  * the locking convention!!</div><div class='hunk'>@@ -2448,6 +2737,16 @@ void inode_nohighmem(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inode_nohighmem);</div><div class='ctx'> </div><div class='add'>+struct timespec64 inode_set_ctime_to_ts(struct inode *inode, struct timespec64 ts)</div><div class='add'>+{</div><div class='add'>+	trace_inode_set_ctime_to_ts(inode, &amp;ts);</div><div class='add'>+	set_normalized_timespec64(&amp;ts, ts.tv_sec, ts.tv_nsec);</div><div class='add'>+	inode-&gt;i_ctime_sec = ts.tv_sec;</div><div class='add'>+	inode-&gt;i_ctime_nsec = ts.tv_nsec;</div><div class='add'>+	return ts;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(inode_set_ctime_to_ts);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * timestamp_truncate - Truncate timespec to a granularity</div><div class='ctx'>  * @t: Timespec</div><div class='hunk'>@@ -2480,39 +2779,159 @@ struct timespec64 timestamp_truncate(struct timespec64 t, struct inode *inode)</div><div class='ctx'> EXPORT_SYMBOL(timestamp_truncate);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * current_time - Return FS time</div><div class='del'>- * @inode: inode.</div><div class='add'>+ * inode_set_ctime_current - set the ctime to current_time</div><div class='add'>+ * @inode: inode</div><div class='ctx'>  *</div><div class='del'>- * Return the current time truncated to the time granularity supported by</div><div class='del'>- * the fs.</div><div class='add'>+ * Set the inode's ctime to the current value for the inode. Returns the</div><div class='add'>+ * current value that was assigned. If this is not a multigrain inode, then we</div><div class='add'>+ * set it to the later of the coarse time and floor value.</div><div class='add'>+ *</div><div class='add'>+ * If it is multigrain, then we first see if the coarse-grained timestamp is</div><div class='add'>+ * distinct from what is already there. If so, then use that. Otherwise, get a</div><div class='add'>+ * fine-grained timestamp.</div><div class='ctx'>  *</div><div class='del'>- * Note that inode and inode-&gt;sb cannot be NULL.</div><div class='del'>- * Otherwise, the function warns and returns time without truncation.</div><div class='add'>+ * After that, try to swap the new value into i_ctime_nsec. Accept the</div><div class='add'>+ * resulting ctime, regardless of the outcome of the swap. If it has</div><div class='add'>+ * already been replaced, then that timestamp is later than the earlier</div><div class='add'>+ * unacceptable one, and is thus acceptable.</div><div class='ctx'>  */</div><div class='del'>-struct timespec64 current_time(struct inode *inode)</div><div class='add'>+struct timespec64 inode_set_ctime_current(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec64 now;</div><div class='add'>+	u32 cns, cur;</div><div class='ctx'> </div><div class='del'>-	ktime_get_coarse_real_ts64(&amp;now);</div><div class='del'>-	return timestamp_truncate(now, inode);</div><div class='add'>+	ktime_get_coarse_real_ts64_mg(&amp;now);</div><div class='add'>+	now = timestamp_truncate(now, inode);</div><div class='add'>+</div><div class='add'>+	/* Just return that if this is not a multigrain fs */</div><div class='add'>+	if (!is_mgtime(inode)) {</div><div class='add'>+		inode_set_ctime_to_ts(inode, now);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A fine-grained time is only needed if someone has queried</div><div class='add'>+	 * for timestamps, and the current coarse grained time isn't</div><div class='add'>+	 * later than what's already there.</div><div class='add'>+	 */</div><div class='add'>+	cns = smp_load_acquire(&amp;inode-&gt;i_ctime_nsec);</div><div class='add'>+	if (cns &amp; I_CTIME_QUERIED) {</div><div class='add'>+		struct timespec64 ctime = { .tv_sec = inode-&gt;i_ctime_sec,</div><div class='add'>+					    .tv_nsec = cns &amp; ~I_CTIME_QUERIED };</div><div class='add'>+</div><div class='add'>+		if (timespec64_compare(&amp;now, &amp;ctime) &lt;= 0) {</div><div class='add'>+			ktime_get_real_ts64_mg(&amp;now);</div><div class='add'>+			now = timestamp_truncate(now, inode);</div><div class='add'>+			mgtime_counter_inc(mg_fine_stamps);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mgtime_counter_inc(mg_ctime_updates);</div><div class='add'>+</div><div class='add'>+	/* No need to cmpxchg if it's exactly the same */</div><div class='add'>+	if (cns == now.tv_nsec &amp;&amp; inode-&gt;i_ctime_sec == now.tv_sec) {</div><div class='add'>+		trace_ctime_xchg_skip(inode, &amp;now);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	cur = cns;</div><div class='add'>+retry:</div><div class='add'>+	/* Try to swap the nsec value into place. */</div><div class='add'>+	if (try_cmpxchg(&amp;inode-&gt;i_ctime_nsec, &amp;cur, now.tv_nsec)) {</div><div class='add'>+		/* If swap occurred, then we're (mostly) done */</div><div class='add'>+		inode-&gt;i_ctime_sec = now.tv_sec;</div><div class='add'>+		trace_ctime_ns_xchg(inode, cns, now.tv_nsec, cur);</div><div class='add'>+		mgtime_counter_inc(mg_ctime_swaps);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Was the change due to someone marking the old ctime QUERIED?</div><div class='add'>+		 * If so then retry the swap. This can only happen once since</div><div class='add'>+		 * the only way to clear I_CTIME_QUERIED is to stamp the inode</div><div class='add'>+		 * with a new ctime.</div><div class='add'>+		 */</div><div class='add'>+		if (!(cns &amp; I_CTIME_QUERIED) &amp;&amp; (cns | I_CTIME_QUERIED) == cur) {</div><div class='add'>+			cns = cur;</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		/* Otherwise, keep the existing ctime */</div><div class='add'>+		now.tv_sec = inode-&gt;i_ctime_sec;</div><div class='add'>+		now.tv_nsec = cur &amp; ~I_CTIME_QUERIED;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return now;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(current_time);</div><div class='add'>+EXPORT_SYMBOL(inode_set_ctime_current);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * inode_set_ctime_current - set the ctime to current_time</div><div class='del'>- * @inode: inode</div><div class='add'>+ * inode_set_ctime_deleg - try to update the ctime on a delegated inode</div><div class='add'>+ * @inode: inode to update</div><div class='add'>+ * @update: timespec64 to set the ctime</div><div class='add'>+ *</div><div class='add'>+ * Attempt to atomically update the ctime on behalf of a delegation holder.</div><div class='ctx'>  *</div><div class='del'>- * Set the inode-&gt;i_ctime to the current value for the inode. Returns</div><div class='del'>- * the current value that was assigned to i_ctime.</div><div class='add'>+ * The nfs server can call back the holder of a delegation to get updated</div><div class='add'>+ * inode attributes, including the mtime. When updating the mtime, update</div><div class='add'>+ * the ctime to a value at least equal to that.</div><div class='add'>+ *</div><div class='add'>+ * This can race with concurrent updates to the inode, in which</div><div class='add'>+ * case the update is skipped.</div><div class='add'>+ *</div><div class='add'>+ * Note that this works even when multigrain timestamps are not enabled,</div><div class='add'>+ * so it is used in either case.</div><div class='ctx'>  */</div><div class='del'>-struct timespec64 inode_set_ctime_current(struct inode *inode)</div><div class='add'>+struct timespec64 inode_set_ctime_deleg(struct inode *inode, struct timespec64 update)</div><div class='ctx'> {</div><div class='del'>-	struct timespec64 now = current_time(inode);</div><div class='add'>+	struct timespec64 now, cur_ts;</div><div class='add'>+	u32 cur, old;</div><div class='ctx'> </div><div class='del'>-	inode_set_ctime(inode, now.tv_sec, now.tv_nsec);</div><div class='del'>-	return now;</div><div class='add'>+	/* pairs with try_cmpxchg below */</div><div class='add'>+	cur = smp_load_acquire(&amp;inode-&gt;i_ctime_nsec);</div><div class='add'>+	cur_ts.tv_nsec = cur &amp; ~I_CTIME_QUERIED;</div><div class='add'>+	cur_ts.tv_sec = inode-&gt;i_ctime_sec;</div><div class='add'>+</div><div class='add'>+	/* If the update is older than the existing value, skip it. */</div><div class='add'>+	if (timespec64_compare(&amp;update, &amp;cur_ts) &lt;= 0)</div><div class='add'>+		return cur_ts;</div><div class='add'>+</div><div class='add'>+	ktime_get_coarse_real_ts64_mg(&amp;now);</div><div class='add'>+</div><div class='add'>+	/* Clamp the update to "now" if it's in the future */</div><div class='add'>+	if (timespec64_compare(&amp;update, &amp;now) &gt; 0)</div><div class='add'>+		update = now;</div><div class='add'>+</div><div class='add'>+	update = timestamp_truncate(update, inode);</div><div class='add'>+</div><div class='add'>+	/* No need to update if the values are already the same */</div><div class='add'>+	if (timespec64_equal(&amp;update, &amp;cur_ts))</div><div class='add'>+		return cur_ts;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to swap the nsec value into place. If it fails, that means</div><div class='add'>+	 * it raced with an update due to a write or similar activity. That</div><div class='add'>+	 * stamp takes precedence, so just skip the update.</div><div class='add'>+	 */</div><div class='add'>+retry:</div><div class='add'>+	old = cur;</div><div class='add'>+	if (try_cmpxchg(&amp;inode-&gt;i_ctime_nsec, &amp;cur, update.tv_nsec)) {</div><div class='add'>+		inode-&gt;i_ctime_sec = update.tv_sec;</div><div class='add'>+		mgtime_counter_inc(mg_ctime_swaps);</div><div class='add'>+		return update;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Was the change due to another task marking the old ctime QUERIED?</div><div class='add'>+	 *</div><div class='add'>+	 * If so, then retry the swap. This can only happen once since</div><div class='add'>+	 * the only way to clear I_CTIME_QUERIED is to stamp the inode</div><div class='add'>+	 * with a new ctime.</div><div class='add'>+	 */</div><div class='add'>+	if (!(old &amp; I_CTIME_QUERIED) &amp;&amp; (cur == (old | I_CTIME_QUERIED)))</div><div class='add'>+		goto retry;</div><div class='add'>+</div><div class='add'>+	/* Otherwise, it was a new timestamp. */</div><div class='add'>+	cur_ts.tv_sec = inode-&gt;i_ctime_sec;</div><div class='add'>+	cur_ts.tv_nsec = cur &amp; ~I_CTIME_QUERIED;</div><div class='add'>+	return cur_ts;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(inode_set_ctime_current);</div><div class='add'>+EXPORT_SYMBOL(inode_set_ctime_deleg);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * in_group_or_capable - check whether caller is CAP_FSETID privileged</div><div class='hunk'>@@ -2520,7 +2939,7 @@ EXPORT_SYMBOL(inode_set_ctime_current);</div><div class='ctx'>  * @inode:	inode to check</div><div class='ctx'>  * @vfsgid:	the new/current vfsgid of @inode</div><div class='ctx'>  *</div><div class='del'>- * Check wether @vfsgid is in the caller's group list or if the caller is</div><div class='add'>+ * Check whether @vfsgid is in the caller's group list or if the caller is</div><div class='ctx'>  * privileged with CAP_FSETID over @inode. This can be used to determine</div><div class='ctx'>  * whether the setgid bit can be kept or must be dropped.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2535,6 +2954,7 @@ bool in_group_or_capable(struct mnt_idmap *idmap,</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(in_group_or_capable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * mode_strip_sgid - handle the sgid bit for non-directories</div><div class='hunk'>@@ -2562,3 +2982,26 @@ umode_t mode_strip_sgid(struct mnt_idmap *idmap,</div><div class='ctx'> 	return mode &amp; ~S_ISGID;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mode_strip_sgid);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_VFS</div><div class='add'>+/*</div><div class='add'>+ * Dump an inode.</div><div class='add'>+ *</div><div class='add'>+ * TODO: add a proper inode dumping routine, this is a stub to get debug off the</div><div class='add'>+ * ground.</div><div class='add'>+ *</div><div class='add'>+ * TODO: handle getting to fs type with get_kernel_nofault()?</div><div class='add'>+ * See dump_mapping() above.</div><div class='add'>+ */</div><div class='add'>+void dump_inode(struct inode *inode, const char *reason)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+</div><div class='add'>+	pr_warn("%s encountered for inode %px\n"</div><div class='add'>+		"fs %s mode %ho opflags 0x%hx flags 0x%x state 0x%x count %d\n",</div><div class='add'>+		reason, inode, sb-&gt;s_type-&gt;name, inode-&gt;i_mode, inode-&gt;i_opflags,</div><div class='add'>+		inode-&gt;i_flags, inode_state_read_once(inode), atomic_read(&amp;inode-&gt;i_count));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(dump_inode);</div><div class='add'>+#endif</div><div class='head'>diff --git a/fs/internal.h b/fs/internal.h<br/>index b67406435fc0..ab638d41ab81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/internal.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@ struct fs_context;</div><div class='ctx'> struct pipe_inode_info;</div><div class='ctx'> struct iov_iter;</div><div class='ctx'> struct mnt_idmap;</div><div class='add'>+struct ns_common;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * block/bdev.c</div><div class='hunk'>@@ -52,7 +53,7 @@ extern int finish_clean_context(struct fs_context *fc);</div><div class='ctx'>  * namei.c</div><div class='ctx'>  */</div><div class='ctx'> extern int filename_lookup(int dfd, struct filename *name, unsigned flags,</div><div class='del'>-			   struct path *path, struct path *root);</div><div class='add'>+			   struct path *path, const struct path *root);</div><div class='ctx'> int do_rmdir(int dfd, struct filename *name);</div><div class='ctx'> int do_unlinkat(int dfd, struct filename *name);</div><div class='ctx'> int may_linkat(struct mnt_idmap *idmap, const struct path *link);</div><div class='hunk'>@@ -62,6 +63,13 @@ int do_mkdirat(int dfd, struct filename *name, umode_t mode);</div><div class='ctx'> int do_symlinkat(struct filename *from, int newdfd, struct filename *to);</div><div class='ctx'> int do_linkat(int olddfd, struct filename *old, int newdfd,</div><div class='ctx'> 			struct filename *new, int flags);</div><div class='add'>+int vfs_tmpfile(struct mnt_idmap *idmap,</div><div class='add'>+		const struct path *parentpath,</div><div class='add'>+		struct file *file, umode_t mode);</div><div class='add'>+struct dentry *d_hash_and_lookup(struct dentry *, struct qstr *);</div><div class='add'>+struct dentry *start_dirop(struct dentry *parent, struct qstr *name,</div><div class='add'>+			   unsigned int lookup_flags);</div><div class='add'>+int lookup_noperm_common(struct qstr *qname, struct dentry *base);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * namespace.c</div><div class='hunk'>@@ -79,9 +87,9 @@ void mnt_put_write_access_file(struct file *file);</div><div class='ctx'> extern void dissolve_on_fput(struct vfsmount *);</div><div class='ctx'> extern bool may_mount(void);</div><div class='ctx'> </div><div class='del'>-int path_mount(const char *dev_name, struct path *path,</div><div class='add'>+int path_mount(const char *dev_name, const struct path *path,</div><div class='ctx'> 		const char *type_page, unsigned long flags, void *data_page);</div><div class='del'>-int path_umount(struct path *path, int flags);</div><div class='add'>+int path_umount(const struct path *path, int flags);</div><div class='ctx'> </div><div class='ctx'> int show_path(struct seq_file *m, struct dentry *root);</div><div class='ctx'> </div><div class='hunk'>@@ -96,6 +104,7 @@ extern void chroot_fs_refs(const struct path *, const struct path *);</div><div class='ctx'> struct file *alloc_empty_file(int flags, const struct cred *cred);</div><div class='ctx'> struct file *alloc_empty_file_noaccount(int flags, const struct cred *cred);</div><div class='ctx'> struct file *alloc_empty_backing_file(int flags, const struct cred *cred);</div><div class='add'>+void backing_file_set_user_path(struct file *f, const struct path *path);</div><div class='ctx'> </div><div class='ctx'> static inline void file_put_write_access(struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -114,6 +123,9 @@ static inline void put_file_access(struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fput_close_sync(struct file *);</div><div class='add'>+void fput_close(struct file *);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * super.c</div><div class='ctx'>  */</div><div class='hunk'>@@ -183,7 +195,8 @@ extern struct open_how build_open_how(int flags, umode_t mode);</div><div class='ctx'> extern int build_open_flags(const struct open_how *how, struct open_flags *op);</div><div class='ctx'> struct file *file_close_fd_locked(struct files_struct *files, unsigned fd);</div><div class='ctx'> </div><div class='del'>-long do_sys_ftruncate(unsigned int fd, loff_t length, int small);</div><div class='add'>+int do_ftruncate(struct file *file, loff_t length, int small);</div><div class='add'>+int do_sys_ftruncate(unsigned int fd, loff_t length, int small);</div><div class='ctx'> int chmod_common(const struct path *path, umode_t mode);</div><div class='ctx'> int do_fchownat(int dfd, const char __user *filename, uid_t user, gid_t group,</div><div class='ctx'> 		int flag);</div><div class='hunk'>@@ -202,7 +215,6 @@ bool in_group_or_capable(struct mnt_idmap *idmap,</div><div class='ctx'>  * fs-writeback.c</div><div class='ctx'>  */</div><div class='ctx'> extern long get_nr_dirty_inodes(void);</div><div class='del'>-void invalidate_inodes(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dcache.c</div><div class='hunk'>@@ -218,7 +230,6 @@ extern void shrink_dcache_for_umount(struct super_block *);</div><div class='ctx'> extern struct dentry *__d_lookup(const struct dentry *, const struct qstr *);</div><div class='ctx'> extern struct dentry *__d_lookup_rcu(const struct dentry *parent,</div><div class='ctx'> 				const struct qstr *name, unsigned *seq);</div><div class='del'>-extern void d_genocide(struct dentry *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * pipe.c</div><div class='hunk'>@@ -235,14 +246,16 @@ extern void mnt_pin_kill(struct mount *m);</div><div class='ctx'>  * fs/nsfs.c</div><div class='ctx'>  */</div><div class='ctx'> extern const struct dentry_operations ns_dentry_operations;</div><div class='add'>+int open_namespace(struct ns_common *ns);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * fs/stat.c:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int getname_statx_lookup_flags(int flags);</div><div class='ctx'> int do_statx(int dfd, struct filename *filename, unsigned int flags,</div><div class='ctx'> 	     unsigned int mask, struct statx __user *buffer);</div><div class='add'>+int do_statx_fd(int fd, unsigned int flags, unsigned int mask,</div><div class='add'>+		struct statx __user *buffer);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * fs/splice.c:</div><div class='hunk'>@@ -259,7 +272,7 @@ struct xattr_name {</div><div class='ctx'> 	char name[XATTR_NAME_MAX + 1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct xattr_ctx {</div><div class='add'>+struct kernel_xattr_ctx {</div><div class='ctx'> 	/* Value of attribute */</div><div class='ctx'> 	union {</div><div class='ctx'> 		const void __user *cvalue;</div><div class='hunk'>@@ -272,14 +285,15 @@ struct xattr_ctx {</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+ssize_t file_getxattr(struct file *file, struct kernel_xattr_ctx *ctx);</div><div class='add'>+ssize_t filename_getxattr(int dfd, struct filename *filename,</div><div class='add'>+			  unsigned int lookup_flags, struct kernel_xattr_ctx *ctx);</div><div class='add'>+int file_setxattr(struct file *file, struct kernel_xattr_ctx *ctx);</div><div class='add'>+int filename_setxattr(int dfd, struct filename *filename,</div><div class='add'>+		      unsigned int lookup_flags, struct kernel_xattr_ctx *ctx);</div><div class='add'>+int setxattr_copy(const char __user *name, struct kernel_xattr_ctx *ctx);</div><div class='add'>+int import_xattr_name(struct xattr_name *kname, const char __user *name);</div><div class='ctx'> </div><div class='del'>-ssize_t do_getxattr(struct mnt_idmap *idmap,</div><div class='del'>-		    struct dentry *d,</div><div class='del'>-		    struct xattr_ctx *ctx);</div><div class='del'>-</div><div class='del'>-int setxattr_copy(const char __user *name, struct xattr_ctx *ctx);</div><div class='del'>-int do_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		struct xattr_ctx *ctx);</div><div class='ctx'> int may_write_xattr(struct mnt_idmap *idmap, struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_POSIX_ACL</div><div class='hunk'>@@ -310,3 +324,37 @@ ssize_t __kernel_write_iter(struct file *file, struct iov_iter *from, loff_t *po</div><div class='ctx'> struct mnt_idmap *alloc_mnt_idmap(struct user_namespace *mnt_userns);</div><div class='ctx'> struct mnt_idmap *mnt_idmap_get(struct mnt_idmap *idmap);</div><div class='ctx'> void mnt_idmap_put(struct mnt_idmap *idmap);</div><div class='add'>+struct stashed_operations {</div><div class='add'>+	struct dentry *(*stash_dentry)(struct dentry **stashed,</div><div class='add'>+				       struct dentry *dentry);</div><div class='add'>+	void (*put_data)(void *data);</div><div class='add'>+	int (*init_inode)(struct inode *inode, void *data);</div><div class='add'>+};</div><div class='add'>+int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,</div><div class='add'>+		      struct path *path);</div><div class='add'>+void stashed_dentry_prune(struct dentry *dentry);</div><div class='add'>+struct dentry *stash_dentry(struct dentry **stashed, struct dentry *dentry);</div><div class='add'>+struct dentry *stashed_dentry_get(struct dentry **stashed);</div><div class='add'>+/**</div><div class='add'>+ * path_mounted - check whether path is mounted</div><div class='add'>+ * @path: path to check</div><div class='add'>+ *</div><div class='add'>+ * Determine whether @path refers to the root of a mount.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if @path is the root of a mount, false if not.</div><div class='add'>+ */</div><div class='add'>+static inline bool path_mounted(const struct path *path)</div><div class='add'>+{</div><div class='add'>+	return path-&gt;mnt-&gt;mnt_root == path-&gt;dentry;</div><div class='add'>+}</div><div class='add'>+void file_f_owner_release(struct file *file);</div><div class='add'>+bool file_seek_cur_needs_f_lock(struct file *file);</div><div class='add'>+int statmount_mnt_idmap(struct mnt_idmap *idmap, struct seq_file *seq, bool uid_map);</div><div class='add'>+struct dentry *find_next_child(struct dentry *parent, struct dentry *prev);</div><div class='add'>+int anon_inode_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='add'>+		       struct kstat *stat, u32 request_mask,</div><div class='add'>+		       unsigned int query_flags);</div><div class='add'>+int anon_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		       struct iattr *attr);</div><div class='add'>+void pidfs_get_root(struct path *path);</div><div class='add'>+void nsfs_get_root(struct path *path);</div><div class='head'>diff --git a/fs/ioctl.c b/fs/ioctl.c<br/>index 76cf22ac97d7..1c152c2b1b67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ioctl.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, -errno on error.</div><div class='ctx'>  */</div><div class='del'>-long vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	int error = -ENOTTY;</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +54,6 @@ long vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'>  out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(vfs_ioctl);</div><div class='ctx'> </div><div class='ctx'> static int ioctl_fibmap(struct file *filp, int __user *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -228,16 +227,16 @@ static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd,</div><div class='del'>-			     u64 off, u64 olen, u64 destoff)</div><div class='add'>+static int ioctl_file_clone(struct file *dst_file, unsigned long srcfd,</div><div class='add'>+			    u64 off, u64 olen, u64 destoff)</div><div class='ctx'> {</div><div class='del'>-	struct fd src_file = fdget(srcfd);</div><div class='add'>+	CLASS(fd, src_file)(srcfd);</div><div class='ctx'> 	loff_t cloned;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!src_file.file)</div><div class='add'>+	if (fd_empty(src_file))</div><div class='ctx'> 		return -EBADF;</div><div class='del'>-	cloned = vfs_clone_file_range(src_file.file, off, dst_file, destoff,</div><div class='add'>+	cloned = vfs_clone_file_range(fd_file(src_file), off, dst_file, destoff,</div><div class='ctx'> 				      olen, 0);</div><div class='ctx'> 	if (cloned &lt; 0)</div><div class='ctx'> 		ret = cloned;</div><div class='hunk'>@@ -245,12 +244,11 @@ static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd,</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='del'>-	fdput(src_file);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long ioctl_file_clone_range(struct file *file,</div><div class='del'>-				   struct file_clone_range __user *argp)</div><div class='add'>+static int ioctl_file_clone_range(struct file *file,</div><div class='add'>+				  struct file_clone_range __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_clone_range args;</div><div class='ctx'> </div><div class='hunk'>@@ -397,8 +395,8 @@ static int ioctl_fsfreeze(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	/* Freeze */</div><div class='ctx'> 	if (sb-&gt;s_op-&gt;freeze_super)</div><div class='del'>-		return sb-&gt;s_op-&gt;freeze_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='del'>-	return freeze_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+		return sb-&gt;s_op-&gt;freeze_super(sb, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='add'>+	return freeze_super(sb, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ioctl_fsthaw(struct file *filp)</div><div class='hunk'>@@ -410,8 +408,8 @@ static int ioctl_fsthaw(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	/* Thaw */</div><div class='ctx'> 	if (sb-&gt;s_op-&gt;thaw_super)</div><div class='del'>-		return sb-&gt;s_op-&gt;thaw_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='del'>-	return thaw_super(sb, FREEZE_HOLDER_USERSPACE);</div><div class='add'>+		return sb-&gt;s_op-&gt;thaw_super(sb, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='add'>+	return thaw_super(sb, FREEZE_HOLDER_USERSPACE, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ioctl_file_dedupe_range(struct file *file,</div><div class='hunk'>@@ -427,7 +425,7 @@ static int ioctl_file_dedupe_range(struct file *file,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = offsetof(struct file_dedupe_range, info[count]);</div><div class='add'>+	size = struct_size(same, info, count);</div><div class='ctx'> 	if (size &gt; PAGE_SIZE) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -454,313 +452,31 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * fileattr_fill_xflags - initialize fileattr with xflags</div><div class='del'>- * @fa:		fileattr pointer</div><div class='del'>- * @xflags:	FS_XFLAG_* flags</div><div class='del'>- *</div><div class='del'>- * Set -&gt;fsx_xflags, -&gt;fsx_valid and -&gt;flags (translated xflags).  All</div><div class='del'>- * other fields are zeroed.</div><div class='del'>- */</div><div class='del'>-void fileattr_fill_xflags(struct fileattr *fa, u32 xflags)</div><div class='del'>-{</div><div class='del'>-	memset(fa, 0, sizeof(*fa));</div><div class='del'>-	fa-&gt;fsx_valid = true;</div><div class='del'>-	fa-&gt;fsx_xflags = xflags;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_IMMUTABLE)</div><div class='del'>-		fa-&gt;flags |= FS_IMMUTABLE_FL;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_APPEND)</div><div class='del'>-		fa-&gt;flags |= FS_APPEND_FL;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_SYNC)</div><div class='del'>-		fa-&gt;flags |= FS_SYNC_FL;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_NOATIME)</div><div class='del'>-		fa-&gt;flags |= FS_NOATIME_FL;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_NODUMP)</div><div class='del'>-		fa-&gt;flags |= FS_NODUMP_FL;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_DAX)</div><div class='del'>-		fa-&gt;flags |= FS_DAX_FL;</div><div class='del'>-	if (fa-&gt;fsx_xflags &amp; FS_XFLAG_PROJINHERIT)</div><div class='del'>-		fa-&gt;flags |= FS_PROJINHERIT_FL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(fileattr_fill_xflags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fileattr_fill_flags - initialize fileattr with flags</div><div class='del'>- * @fa:		fileattr pointer</div><div class='del'>- * @flags:	FS_*_FL flags</div><div class='del'>- *</div><div class='del'>- * Set -&gt;flags, -&gt;flags_valid and -&gt;fsx_xflags (translated flags).</div><div class='del'>- * All other fields are zeroed.</div><div class='del'>- */</div><div class='del'>-void fileattr_fill_flags(struct fileattr *fa, u32 flags)</div><div class='del'>-{</div><div class='del'>-	memset(fa, 0, sizeof(*fa));</div><div class='del'>-	fa-&gt;flags_valid = true;</div><div class='del'>-	fa-&gt;flags = flags;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_SYNC_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_SYNC;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_IMMUTABLE_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_IMMUTABLE;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_APPEND_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_APPEND;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_NODUMP_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_NODUMP;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_NOATIME_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_NOATIME;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_DAX_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_DAX;</div><div class='del'>-	if (fa-&gt;flags &amp; FS_PROJINHERIT_FL)</div><div class='del'>-		fa-&gt;fsx_xflags |= FS_XFLAG_PROJINHERIT;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(fileattr_fill_flags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vfs_fileattr_get - retrieve miscellaneous file attributes</div><div class='del'>- * @dentry:	the object to retrieve from</div><div class='del'>- * @fa:		fileattr pointer</div><div class='del'>- *</div><div class='del'>- * Call i_op-&gt;fileattr_get() callback, if exists.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or a negative error on failure.</div><div class='del'>- */</div><div class='del'>-int vfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-</div><div class='del'>-	if (!inode-&gt;i_op-&gt;fileattr_get)</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	return inode-&gt;i_op-&gt;fileattr_get(dentry, fa);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vfs_fileattr_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * copy_fsxattr_to_user - copy fsxattr to userspace.</div><div class='del'>- * @fa:		fileattr pointer</div><div class='del'>- * @ufa:	fsxattr user pointer</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or -EFAULT on failure.</div><div class='del'>- */</div><div class='del'>-int copy_fsxattr_to_user(const struct fileattr *fa, struct fsxattr __user *ufa)</div><div class='del'>-{</div><div class='del'>-	struct fsxattr xfa;</div><div class='del'>-</div><div class='del'>-	memset(&amp;xfa, 0, sizeof(xfa));</div><div class='del'>-	xfa.fsx_xflags = fa-&gt;fsx_xflags;</div><div class='del'>-	xfa.fsx_extsize = fa-&gt;fsx_extsize;</div><div class='del'>-	xfa.fsx_nextents = fa-&gt;fsx_nextents;</div><div class='del'>-	xfa.fsx_projid = fa-&gt;fsx_projid;</div><div class='del'>-	xfa.fsx_cowextsize = fa-&gt;fsx_cowextsize;</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(ufa, &amp;xfa, sizeof(xfa)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(copy_fsxattr_to_user);</div><div class='del'>-</div><div class='del'>-static int copy_fsxattr_from_user(struct fileattr *fa,</div><div class='del'>-				  struct fsxattr __user *ufa)</div><div class='del'>-{</div><div class='del'>-	struct fsxattr xfa;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;xfa, ufa, sizeof(xfa)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	fileattr_fill_xflags(fa, xfa.fsx_xflags);</div><div class='del'>-	fa-&gt;fsx_extsize = xfa.fsx_extsize;</div><div class='del'>-	fa-&gt;fsx_nextents = xfa.fsx_nextents;</div><div class='del'>-	fa-&gt;fsx_projid = xfa.fsx_projid;</div><div class='del'>-	fa-&gt;fsx_cowextsize = xfa.fsx_cowextsize;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generic function to check FS_IOC_FSSETXATTR/FS_IOC_SETFLAGS values and reject</div><div class='del'>- * any invalid configurations.</div><div class='del'>- *</div><div class='del'>- * Note: must be called with inode lock held.</div><div class='del'>- */</div><div class='del'>-static int fileattr_set_prepare(struct inode *inode,</div><div class='del'>-			      const struct fileattr *old_ma,</div><div class='del'>-			      struct fileattr *fa)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The IMMUTABLE and APPEND_ONLY flags can only be changed by</div><div class='del'>-	 * the relevant capability.</div><div class='del'>-	 */</div><div class='del'>-	if ((fa-&gt;flags ^ old_ma-&gt;flags) &amp; (FS_APPEND_FL | FS_IMMUTABLE_FL) &amp;&amp;</div><div class='del'>-	    !capable(CAP_LINUX_IMMUTABLE))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	err = fscrypt_prepare_setflags(inode, old_ma-&gt;flags, fa-&gt;flags);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Project Quota ID state is only allowed to change from within the init</div><div class='del'>-	 * namespace. Enforce that restriction only if we are trying to change</div><div class='del'>-	 * the quota ID state. Everything else is allowed in user namespaces.</div><div class='del'>-	 */</div><div class='del'>-	if (current_user_ns() != &amp;init_user_ns) {</div><div class='del'>-		if (old_ma-&gt;fsx_projid != fa-&gt;fsx_projid)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if ((old_ma-&gt;fsx_xflags ^ fa-&gt;fsx_xflags) &amp;</div><div class='del'>-				FS_XFLAG_PROJINHERIT)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Caller is allowed to change the project ID. If it is being</div><div class='del'>-		 * changed, make sure that the new value is valid.</div><div class='del'>-		 */</div><div class='del'>-		if (old_ma-&gt;fsx_projid != fa-&gt;fsx_projid &amp;&amp;</div><div class='del'>-		    !projid_valid(make_kprojid(&amp;init_user_ns, fa-&gt;fsx_projid)))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check extent size hints. */</div><div class='del'>-	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_EXTSIZE) &amp;&amp; !S_ISREG(inode-&gt;i_mode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_EXTSZINHERIT) &amp;&amp;</div><div class='del'>-			!S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_COWEXTSIZE) &amp;&amp;</div><div class='del'>-	    !S_ISREG(inode-&gt;i_mode) &amp;&amp; !S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It is only valid to set the DAX flag on regular files and</div><div class='del'>-	 * directories on filesystems.</div><div class='del'>-	 */</div><div class='del'>-	if ((fa-&gt;fsx_xflags &amp; FS_XFLAG_DAX) &amp;&amp;</div><div class='del'>-	    !(S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Extent size hints of zero turn off the flags. */</div><div class='del'>-	if (fa-&gt;fsx_extsize == 0)</div><div class='del'>-		fa-&gt;fsx_xflags &amp;= ~(FS_XFLAG_EXTSIZE | FS_XFLAG_EXTSZINHERIT);</div><div class='del'>-	if (fa-&gt;fsx_cowextsize == 0)</div><div class='del'>-		fa-&gt;fsx_xflags &amp;= ~FS_XFLAG_COWEXTSIZE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vfs_fileattr_set - change miscellaneous file attributes</div><div class='del'>- * @idmap:	idmap of the mount</div><div class='del'>- * @dentry:	the object to change</div><div class='del'>- * @fa:		fileattr pointer</div><div class='del'>- *</div><div class='del'>- * After verifying permissions, call i_op-&gt;fileattr_set() callback, if</div><div class='del'>- * exists.</div><div class='del'>- *</div><div class='del'>- * Verifying attributes involves retrieving current attributes with</div><div class='del'>- * i_op-&gt;fileattr_get(), this also allows initializing attributes that have</div><div class='del'>- * not been set by the caller to current values.  Inode lock is held</div><div class='del'>- * thoughout to prevent racing with another instance.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, or a negative error on failure.</div><div class='del'>- */</div><div class='del'>-int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		     struct fileattr *fa)</div><div class='add'>+static int ioctl_getfsuuid(struct file *file, void __user *argp)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct fileattr old_ma = {};</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!inode-&gt;i_op-&gt;fileattr_set)</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-	if (!inode_owner_or_capable(idmap, inode))</div><div class='del'>-		return -EPERM;</div><div class='add'>+	struct super_block *sb = file_inode(file)-&gt;i_sb;</div><div class='add'>+	struct fsuuid2 u = { .len = sb-&gt;s_uuid_len, };</div><div class='ctx'> </div><div class='del'>-	inode_lock(inode);</div><div class='del'>-	err = vfs_fileattr_get(dentry, &amp;old_ma);</div><div class='del'>-	if (!err) {</div><div class='del'>-		/* initialize missing bits from old_ma */</div><div class='del'>-		if (fa-&gt;flags_valid) {</div><div class='del'>-			fa-&gt;fsx_xflags |= old_ma.fsx_xflags &amp; ~FS_XFLAG_COMMON;</div><div class='del'>-			fa-&gt;fsx_extsize = old_ma.fsx_extsize;</div><div class='del'>-			fa-&gt;fsx_nextents = old_ma.fsx_nextents;</div><div class='del'>-			fa-&gt;fsx_projid = old_ma.fsx_projid;</div><div class='del'>-			fa-&gt;fsx_cowextsize = old_ma.fsx_cowextsize;</div><div class='del'>-		} else {</div><div class='del'>-			fa-&gt;flags |= old_ma.flags &amp; ~FS_COMMON_FL;</div><div class='del'>-		}</div><div class='del'>-		err = fileattr_set_prepare(inode, &amp;old_ma, fa);</div><div class='del'>-		if (!err)</div><div class='del'>-			err = inode-&gt;i_op-&gt;fileattr_set(idmap, dentry, fa);</div><div class='del'>-	}</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vfs_fileattr_set);</div><div class='add'>+	if (!sb-&gt;s_uuid_len)</div><div class='add'>+		return -ENOTTY;</div><div class='ctx'> </div><div class='del'>-static int ioctl_getflags(struct file *file, unsigned int __user *argp)</div><div class='del'>-{</div><div class='del'>-	struct fileattr fa = { .flags_valid = true }; /* hint only */</div><div class='del'>-	int err;</div><div class='add'>+	memcpy(&amp;u.uuid[0], &amp;sb-&gt;s_uuid, sb-&gt;s_uuid_len);</div><div class='ctx'> </div><div class='del'>-	err = vfs_fileattr_get(file-&gt;f_path.dentry, &amp;fa);</div><div class='del'>-	if (!err)</div><div class='del'>-		err = put_user(fa.flags, argp);</div><div class='del'>-	return err;</div><div class='add'>+	return copy_to_user(argp, &amp;u, sizeof(u)) ? -EFAULT : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ioctl_setflags(struct file *file, unsigned int __user *argp)</div><div class='add'>+static int ioctl_get_fs_sysfs_path(struct file *file, void __user *argp)</div><div class='ctx'> {</div><div class='del'>-	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='del'>-	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='del'>-	struct fileattr fa;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = get_user(flags, argp);</div><div class='del'>-	if (!err) {</div><div class='del'>-		err = mnt_want_write_file(file);</div><div class='del'>-		if (!err) {</div><div class='del'>-			fileattr_fill_flags(&amp;fa, flags);</div><div class='del'>-			err = vfs_fileattr_set(idmap, dentry, &amp;fa);</div><div class='del'>-			mnt_drop_write_file(file);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	struct super_block *sb = file_inode(file)-&gt;i_sb;</div><div class='ctx'> </div><div class='del'>-static int ioctl_fsgetxattr(struct file *file, void __user *argp)</div><div class='del'>-{</div><div class='del'>-	struct fileattr fa = { .fsx_valid = true }; /* hint only */</div><div class='del'>-	int err;</div><div class='add'>+	if (!strlen(sb-&gt;s_sysfs_name))</div><div class='add'>+		return -ENOTTY;</div><div class='ctx'> </div><div class='del'>-	err = vfs_fileattr_get(file-&gt;f_path.dentry, &amp;fa);</div><div class='del'>-	if (!err)</div><div class='del'>-		err = copy_fsxattr_to_user(&amp;fa, argp);</div><div class='add'>+	struct fs_sysfs_path u = {};</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	u.len = scnprintf(u.name, sizeof(u.name), "%s/%s", sb-&gt;s_type-&gt;name, sb-&gt;s_sysfs_name);</div><div class='ctx'> </div><div class='del'>-static int ioctl_fssetxattr(struct file *file, void __user *argp)</div><div class='del'>-{</div><div class='del'>-	struct mnt_idmap *idmap = file_mnt_idmap(file);</div><div class='del'>-	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='del'>-	struct fileattr fa;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = copy_fsxattr_from_user(&amp;fa, argp);</div><div class='del'>-	if (!err) {</div><div class='del'>-		err = mnt_want_write_file(file);</div><div class='del'>-		if (!err) {</div><div class='del'>-			err = vfs_fileattr_set(idmap, dentry, &amp;fa);</div><div class='del'>-			mnt_drop_write_file(file);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	return copy_to_user(argp, &amp;u, sizeof(u)) ? -EFAULT : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -769,6 +485,9 @@ static int ioctl_fssetxattr(struct file *file, void __user *argp)</div><div class='ctx'>  *</div><div class='ctx'>  * When you add any new common ioctls to the switches above and below,</div><div class='ctx'>  * please ensure they have compatible arguments in compat mode.</div><div class='add'>+ *</div><div class='add'>+ * The LSM mailing list should also be notified of any command additions or</div><div class='add'>+ * changes, as specific LSMs may be affected.</div><div class='ctx'>  */</div><div class='ctx'> static int do_vfs_ioctl(struct file *filp, unsigned int fd,</div><div class='ctx'> 			unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -792,7 +511,8 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd,</div><div class='ctx'> 		return ioctl_fioasync(fd, filp, argp);</div><div class='ctx'> </div><div class='ctx'> 	case FIOQSIZE:</div><div class='del'>-		if (S_ISDIR(inode-&gt;i_mode) || S_ISREG(inode-&gt;i_mode) ||</div><div class='add'>+		if (S_ISDIR(inode-&gt;i_mode) ||</div><div class='add'>+		    (S_ISREG(inode-&gt;i_mode) &amp;&amp; !IS_ANON_FILE(inode)) ||</div><div class='ctx'> 		    S_ISLNK(inode-&gt;i_mode)) {</div><div class='ctx'> 			loff_t res = inode_get_bytes(inode);</div><div class='ctx'> 			return copy_to_user(argp, &amp;res, sizeof(res)) ?</div><div class='hunk'>@@ -827,7 +547,7 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd,</div><div class='ctx'> 		return ioctl_file_dedupe_range(filp, argp);</div><div class='ctx'> </div><div class='ctx'> 	case FIONREAD:</div><div class='del'>-		if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		if (!S_ISREG(inode-&gt;i_mode) || IS_ANON_FILE(inode))</div><div class='ctx'> 			return vfs_ioctl(filp, cmd, arg);</div><div class='ctx'> </div><div class='ctx'> 		return put_user(i_size_read(inode) - filp-&gt;f_pos,</div><div class='hunk'>@@ -845,8 +565,14 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd,</div><div class='ctx'> 	case FS_IOC_FSSETXATTR:</div><div class='ctx'> 		return ioctl_fssetxattr(filp, argp);</div><div class='ctx'> </div><div class='add'>+	case FS_IOC_GETFSUUID:</div><div class='add'>+		return ioctl_getfsuuid(filp, argp);</div><div class='add'>+</div><div class='add'>+	case FS_IOC_GETFSSYSFSPATH:</div><div class='add'>+		return ioctl_get_fs_sysfs_path(filp, argp);</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='del'>-		if (S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		if (S_ISREG(inode-&gt;i_mode) &amp;&amp; !IS_ANON_FILE(inode))</div><div class='ctx'> 			return file_ioctl(filp, cmd, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -856,22 +582,20 @@ static int do_vfs_ioctl(struct file *filp, unsigned int fd,</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = security_file_ioctl(f.file, cmd, arg);</div><div class='add'>+	error = security_file_ioctl(fd_file(f), cmd, arg);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	error = do_vfs_ioctl(f.file, fd, cmd, arg);</div><div class='add'>+	error = do_vfs_ioctl(fd_file(f), fd, cmd, arg);</div><div class='ctx'> 	if (error == -ENOIOCTLCMD)</div><div class='del'>-		error = vfs_ioctl(f.file, cmd, arg);</div><div class='add'>+		error = vfs_ioctl(fd_file(f), cmd, arg);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	fdput(f);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -914,35 +638,35 @@ EXPORT_SYMBOL(compat_ptr_ioctl);</div><div class='ctx'> COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 		       compat_ulong_t, arg)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = security_file_ioctl_compat(f.file, cmd, arg);</div><div class='add'>+	error = security_file_ioctl_compat(fd_file(f), cmd, arg);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	/* FICLONE takes an int argument, so don't use compat_ptr() */</div><div class='ctx'> 	case FICLONE:</div><div class='del'>-		error = ioctl_file_clone(f.file, arg, 0, 0, 0);</div><div class='add'>+		error = ioctl_file_clone(fd_file(f), arg, 0, 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_X86_64)</div><div class='ctx'> 	/* these get messy on amd64 due to alignment differences */</div><div class='ctx'> 	case FS_IOC_RESVSP_32:</div><div class='ctx'> 	case FS_IOC_RESVSP64_32:</div><div class='del'>-		error = compat_ioctl_preallocate(f.file, 0, compat_ptr(arg));</div><div class='add'>+		error = compat_ioctl_preallocate(fd_file(f), 0, compat_ptr(arg));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FS_IOC_UNRESVSP_32:</div><div class='ctx'> 	case FS_IOC_UNRESVSP64_32:</div><div class='del'>-		error = compat_ioctl_preallocate(f.file, FALLOC_FL_PUNCH_HOLE,</div><div class='add'>+		error = compat_ioctl_preallocate(fd_file(f), FALLOC_FL_PUNCH_HOLE,</div><div class='ctx'> 				compat_ptr(arg));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FS_IOC_ZERO_RANGE_32:</div><div class='del'>-		error = compat_ioctl_preallocate(f.file, FALLOC_FL_ZERO_RANGE,</div><div class='add'>+		error = compat_ioctl_preallocate(fd_file(f), FALLOC_FL_ZERO_RANGE,</div><div class='ctx'> 				compat_ptr(arg));</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -962,21 +686,17 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 	 * argument.</div><div class='ctx'> 	 */</div><div class='ctx'> 	default:</div><div class='del'>-		error = do_vfs_ioctl(f.file, fd, cmd,</div><div class='add'>+		error = do_vfs_ioctl(fd_file(f), fd, cmd,</div><div class='ctx'> 				     (unsigned long)compat_ptr(arg));</div><div class='ctx'> 		if (error != -ENOIOCTLCMD)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (f.file-&gt;f_op-&gt;compat_ioctl)</div><div class='del'>-			error = f.file-&gt;f_op-&gt;compat_ioctl(f.file, cmd, arg);</div><div class='add'>+		if (fd_file(f)-&gt;f_op-&gt;compat_ioctl)</div><div class='add'>+			error = fd_file(f)-&gt;f_op-&gt;compat_ioctl(fd_file(f), cmd, arg);</div><div class='ctx'> 		if (error == -ENOIOCTLCMD)</div><div class='ctx'> 			error = -ENOTTY;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	fdput(f);</div><div class='del'>-</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/iomap/Makefile b/fs/iomap/Makefile<br/>index fc070184b7fa..a572b8808524 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/Makefile</a></div><div class='hunk'>@@ -4,14 +4,16 @@</div><div class='ctx'> # All Rights Reserved.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ccflags-y += -I $(srctree)/$(src)		# needed for trace events</div><div class='add'>+ccflags-y += -I $(src)		# needed for trace events</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FS_IOMAP)		+= iomap.o</div><div class='ctx'> </div><div class='ctx'> iomap-y				+= trace.o \</div><div class='del'>-				   iter.o</div><div class='del'>-iomap-$(CONFIG_BLOCK)		+= buffered-io.o \</div><div class='del'>-				   direct-io.o \</div><div class='add'>+				   iter.o \</div><div class='add'>+				   buffered-io.o</div><div class='add'>+iomap-$(CONFIG_BLOCK)		+= direct-io.o \</div><div class='add'>+				   ioend.o \</div><div class='ctx'> 				   fiemap.o \</div><div class='del'>-				   seek.o</div><div class='add'>+				   seek.o \</div><div class='add'>+				   bio.o</div><div class='ctx'> iomap-$(CONFIG_SWAP)		+= swapfile.o</div><div class='head'>diff --git a/fs/iomap/bio.c b/fs/iomap/bio.c<br/>new file mode 100644<br/>index 000000000000..fc045f2e4c45<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/bio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/bio.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2010 Red Hat, Inc.</div><div class='add'>+ * Copyright (C) 2016-2023 Christoph Hellwig.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/iomap.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+static void iomap_read_end_io(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	int error = blk_status_to_errno(bio-&gt;bi_status);</div><div class='add'>+	struct folio_iter fi;</div><div class='add'>+</div><div class='add'>+	bio_for_each_folio_all(fi, bio)</div><div class='add'>+		iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error);</div><div class='add'>+	bio_put(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bio *bio = ctx-&gt;read_ctx;</div><div class='add'>+</div><div class='add'>+	if (bio)</div><div class='add'>+		submit_bio(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_bio_read_folio_range(const struct iomap_iter *iter,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx, size_t plen)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio = ctx-&gt;cur_folio;</div><div class='add'>+	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='add'>+	size_t poff = offset_in_folio(folio, pos);</div><div class='add'>+	loff_t length = iomap_length(iter);</div><div class='add'>+	sector_t sector;</div><div class='add'>+	struct bio *bio = ctx-&gt;read_ctx;</div><div class='add'>+</div><div class='add'>+	sector = iomap_sector(iomap, pos);</div><div class='add'>+	if (!bio || bio_end_sector(bio) != sector ||</div><div class='add'>+	    !bio_add_folio(bio, folio, plen, poff)) {</div><div class='add'>+		gfp_t gfp = mapping_gfp_constraint(folio-&gt;mapping, GFP_KERNEL);</div><div class='add'>+		gfp_t orig_gfp = gfp;</div><div class='add'>+		unsigned int nr_vecs = DIV_ROUND_UP(length, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		if (bio)</div><div class='add'>+			submit_bio(bio);</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;rac) /* same as readahead_gfp_mask */</div><div class='add'>+			gfp |= __GFP_NORETRY | __GFP_NOWARN;</div><div class='add'>+		bio = bio_alloc(iomap-&gt;bdev, bio_max_segs(nr_vecs), REQ_OP_READ,</div><div class='add'>+				     gfp);</div><div class='add'>+		/*</div><div class='add'>+		 * If the bio_alloc fails, try it again for a single page to</div><div class='add'>+		 * avoid having to deal with partial page reads.  This emulates</div><div class='add'>+		 * what do_mpage_read_folio does.</div><div class='add'>+		 */</div><div class='add'>+		if (!bio)</div><div class='add'>+			bio = bio_alloc(iomap-&gt;bdev, 1, REQ_OP_READ, orig_gfp);</div><div class='add'>+		if (ctx-&gt;rac)</div><div class='add'>+			bio-&gt;bi_opf |= REQ_RAHEAD;</div><div class='add'>+		bio-&gt;bi_iter.bi_sector = sector;</div><div class='add'>+		bio-&gt;bi_end_io = iomap_read_end_io;</div><div class='add'>+		bio_add_folio_nofail(bio, folio, plen, poff);</div><div class='add'>+		ctx-&gt;read_ctx = bio;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct iomap_read_ops iomap_bio_read_ops = {</div><div class='add'>+	.read_folio_range = iomap_bio_read_folio_range,</div><div class='add'>+	.submit_read = iomap_bio_submit_read,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_bio_read_ops);</div><div class='add'>+</div><div class='add'>+int iomap_bio_read_folio_range_sync(const struct iomap_iter *iter,</div><div class='add'>+		struct folio *folio, loff_t pos, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='add'>+	struct bio_vec bvec;</div><div class='add'>+	struct bio bio;</div><div class='add'>+</div><div class='add'>+	bio_init(&amp;bio, srcmap-&gt;bdev, &amp;bvec, 1, REQ_OP_READ);</div><div class='add'>+	bio.bi_iter.bi_sector = iomap_sector(srcmap, pos);</div><div class='add'>+	bio_add_folio_nofail(&amp;bio, folio, len, offset_in_folio(folio, pos));</div><div class='add'>+	return submit_bio_wait(&amp;bio);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c<br/>index 093c4515b22a..e5c1ca440d93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/buffered-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/buffered-io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/buffered-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/buffered-io.c</a></div><div class='hunk'>@@ -1,29 +1,18 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2010 Red Hat, Inc.</div><div class='del'>- * Copyright (C) 2016-2019 Christoph Hellwig.</div><div class='add'>+ * Copyright (C) 2016-2023 Christoph Hellwig.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/dax.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/list_sort.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/migrate.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='ctx'> #include "../internal.h"</div><div class='ctx'> </div><div class='del'>-#define IOEND_BATCH_SIZE	4096</div><div class='del'>-</div><div class='del'>-typedef int (*iomap_punch_t)(struct inode *inode, loff_t offset, loff_t length);</div><div class='ctx'> /*</div><div class='ctx'>  * Structure allocated for each folio to track per-block uptodate, dirty state</div><div class='ctx'>  * and I/O completions.</div><div class='hunk'>@@ -41,8 +30,6 @@ struct iomap_folio_state {</div><div class='ctx'> 	unsigned long		state[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct bio_set iomap_ioend_bioset;</div><div class='del'>-</div><div class='ctx'> static inline bool ifs_is_fully_uptodate(struct folio *folio,</div><div class='ctx'> 		struct iomap_folio_state *ifs)</div><div class='ctx'> {</div><div class='hunk'>@@ -51,10 +38,28 @@ static inline bool ifs_is_fully_uptodate(struct folio *folio,</div><div class='ctx'> 	return bitmap_full(ifs-&gt;state, i_blocks_per_folio(inode, folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ifs_block_is_uptodate(struct iomap_folio_state *ifs,</div><div class='del'>-		unsigned int block)</div><div class='add'>+/*</div><div class='add'>+ * Find the next uptodate block in the folio. end_blk is inclusive.</div><div class='add'>+ * If no uptodate block is found, this will return end_blk + 1.</div><div class='add'>+ */</div><div class='add'>+static unsigned ifs_next_uptodate_block(struct folio *folio,</div><div class='add'>+		unsigned start_blk, unsigned end_blk)</div><div class='add'>+{</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	return find_next_bit(ifs-&gt;state, end_blk + 1, start_blk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find the next non-uptodate block in the folio. end_blk is inclusive.</div><div class='add'>+ * If no non-uptodate block is found, this will return end_blk + 1.</div><div class='add'>+ */</div><div class='add'>+static unsigned ifs_next_nonuptodate_block(struct folio *folio,</div><div class='add'>+		unsigned start_blk, unsigned end_blk)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(block, ifs-&gt;state);</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	return find_next_zero_bit(ifs-&gt;state, end_blk + 1, start_blk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ifs_set_range_uptodate(struct folio *folio,</div><div class='hunk'>@@ -76,6 +81,9 @@ static void iomap_set_range_uptodate(struct folio *folio, size_t off,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool uptodate = true;</div><div class='ctx'> </div><div class='add'>+	if (folio_test_uptodate(folio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (ifs) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;ifs-&gt;state_lock, flags);</div><div class='ctx'> 		uptodate = ifs_set_range_uptodate(folio, ifs, off, len);</div><div class='hunk'>@@ -86,13 +94,71 @@ static void iomap_set_range_uptodate(struct folio *folio, size_t off,</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ifs_block_is_dirty(struct folio *folio,</div><div class='del'>-		struct iomap_folio_state *ifs, int block)</div><div class='add'>+/*</div><div class='add'>+ * Find the next dirty block in the folio. end_blk is inclusive.</div><div class='add'>+ * If no dirty block is found, this will return end_blk + 1.</div><div class='add'>+ */</div><div class='add'>+static unsigned ifs_next_dirty_block(struct folio *folio,</div><div class='add'>+		unsigned start_blk, unsigned end_blk)</div><div class='ctx'> {</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	unsigned int blks_per_folio = i_blocks_per_folio(inode, folio);</div><div class='add'>+	unsigned int blks = i_blocks_per_folio(inode, folio);</div><div class='ctx'> </div><div class='del'>-	return test_bit(block + blks_per_folio, ifs-&gt;state);</div><div class='add'>+	return find_next_bit(ifs-&gt;state, blks + end_blk + 1,</div><div class='add'>+			blks + start_blk) - blks;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find the next clean block in the folio. end_blk is inclusive.</div><div class='add'>+ * If no clean block is found, this will return end_blk + 1.</div><div class='add'>+ */</div><div class='add'>+static unsigned ifs_next_clean_block(struct folio *folio,</div><div class='add'>+		unsigned start_blk, unsigned end_blk)</div><div class='add'>+{</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	unsigned int blks = i_blocks_per_folio(inode, folio);</div><div class='add'>+</div><div class='add'>+	return find_next_zero_bit(ifs-&gt;state, blks + end_blk + 1,</div><div class='add'>+			blks + start_blk) - blks;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned ifs_find_dirty_range(struct folio *folio,</div><div class='add'>+		struct iomap_folio_state *ifs, u64 *range_start, u64 range_end)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	unsigned start_blk =</div><div class='add'>+		offset_in_folio(folio, *range_start) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	unsigned end_blk = min_not_zero(</div><div class='add'>+		offset_in_folio(folio, range_end) &gt;&gt; inode-&gt;i_blkbits,</div><div class='add'>+		i_blocks_per_folio(inode, folio)) - 1;</div><div class='add'>+	unsigned nblks;</div><div class='add'>+</div><div class='add'>+	start_blk = ifs_next_dirty_block(folio, start_blk, end_blk);</div><div class='add'>+	if (start_blk &gt; end_blk)</div><div class='add'>+		return 0;</div><div class='add'>+	if (start_blk == end_blk)</div><div class='add'>+		nblks = 1;</div><div class='add'>+	else</div><div class='add'>+		nblks = ifs_next_clean_block(folio, start_blk + 1, end_blk) -</div><div class='add'>+				start_blk;</div><div class='add'>+</div><div class='add'>+	*range_start = folio_pos(folio) + (start_blk &lt;&lt; inode-&gt;i_blkbits);</div><div class='add'>+	return nblks &lt;&lt; inode-&gt;i_blkbits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned iomap_find_dirty_range(struct folio *folio, u64 *range_start,</div><div class='add'>+		u64 range_end)</div><div class='add'>+{</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (*range_start &gt;= range_end)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ifs)</div><div class='add'>+		return ifs_find_dirty_range(folio, ifs, range_start, range_end);</div><div class='add'>+	return range_end - *range_start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ifs_clear_range_dirty(struct folio *folio,</div><div class='hunk'>@@ -191,6 +257,22 @@ static void ifs_free(struct folio *folio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Calculate how many bytes to truncate based off the number of blocks to</div><div class='add'>+ * truncate and the end position to start truncating from.</div><div class='add'>+ */</div><div class='add'>+static size_t iomap_bytes_to_truncate(loff_t end_pos, unsigned block_bits,</div><div class='add'>+		unsigned blocks_truncated)</div><div class='add'>+{</div><div class='add'>+	unsigned block_size = 1 &lt;&lt; block_bits;</div><div class='add'>+	unsigned block_offset = end_pos &amp; (block_size - 1);</div><div class='add'>+</div><div class='add'>+	if (!block_offset)</div><div class='add'>+		return blocks_truncated &lt;&lt; block_bits;</div><div class='add'>+</div><div class='add'>+	return ((blocks_truncated - 1) &lt;&lt; block_bits) + block_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Calculate the range inside the folio that we actually need to read.</div><div class='ctx'>  */</div><div class='ctx'> static void iomap_adjust_read_range(struct inode *inode, struct folio *folio,</div><div class='hunk'>@@ -203,6 +285,7 @@ static void iomap_adjust_read_range(struct inode *inode, struct folio *folio,</div><div class='ctx'> 	unsigned block_size = (1 &lt;&lt; block_bits);</div><div class='ctx'> 	size_t poff = offset_in_folio(folio, *pos);</div><div class='ctx'> 	size_t plen = min_t(loff_t, folio_size(folio) - poff, length);</div><div class='add'>+	size_t orig_plen = plen;</div><div class='ctx'> 	unsigned first = poff &gt;&gt; block_bits;</div><div class='ctx'> 	unsigned last = (poff + plen - 1) &gt;&gt; block_bits;</div><div class='ctx'> </div><div class='hunk'>@@ -212,24 +295,29 @@ static void iomap_adjust_read_range(struct inode *inode, struct folio *folio,</div><div class='ctx'> 	 * to avoid reading in already uptodate ranges.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ifs) {</div><div class='del'>-		unsigned int i;</div><div class='del'>-</div><div class='del'>-		/* move forward for each leading block marked uptodate */</div><div class='del'>-		for (i = first; i &lt;= last; i++) {</div><div class='del'>-			if (!ifs_block_is_uptodate(ifs, i))</div><div class='del'>-				break;</div><div class='del'>-			*pos += block_size;</div><div class='del'>-			poff += block_size;</div><div class='del'>-			plen -= block_size;</div><div class='del'>-			first++;</div><div class='add'>+		unsigned int next, blocks_skipped;</div><div class='add'>+</div><div class='add'>+		next = ifs_next_nonuptodate_block(folio, first, last);</div><div class='add'>+		blocks_skipped = next - first;</div><div class='add'>+</div><div class='add'>+		if (blocks_skipped) {</div><div class='add'>+			unsigned long block_offset = *pos &amp; (block_size - 1);</div><div class='add'>+			unsigned bytes_skipped =</div><div class='add'>+				(blocks_skipped &lt;&lt; block_bits) - block_offset;</div><div class='add'>+</div><div class='add'>+			*pos += bytes_skipped;</div><div class='add'>+			poff += bytes_skipped;</div><div class='add'>+			plen -= bytes_skipped;</div><div class='ctx'> 		}</div><div class='add'>+		first = next;</div><div class='ctx'> </div><div class='ctx'> 		/* truncate len if we find any trailing uptodate block(s) */</div><div class='del'>-		for ( ; i &lt;= last; i++) {</div><div class='del'>-			if (ifs_block_is_uptodate(ifs, i)) {</div><div class='del'>-				plen -= (last - i + 1) * block_size;</div><div class='del'>-				last = i - 1;</div><div class='del'>-				break;</div><div class='add'>+		if (++next &lt;= last) {</div><div class='add'>+			next = ifs_next_uptodate_block(folio, next, last);</div><div class='add'>+			if (next &lt;= last) {</div><div class='add'>+				plen -= iomap_bytes_to_truncate(*pos + plen,</div><div class='add'>+						block_bits, last - next + 1);</div><div class='add'>+				last = next - 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -239,58 +327,28 @@ static void iomap_adjust_read_range(struct inode *inode, struct folio *folio,</div><div class='ctx'> 	 * handle both halves separately so that we properly zero data in the</div><div class='ctx'> 	 * page cache for blocks that are entirely outside of i_size.</div><div class='ctx'> 	 */</div><div class='del'>-	if (orig_pos &lt;= isize &amp;&amp; orig_pos + length &gt; isize) {</div><div class='add'>+	if (orig_pos &lt;= isize &amp;&amp; orig_pos + orig_plen &gt; isize) {</div><div class='ctx'> 		unsigned end = offset_in_folio(folio, isize - 1) &gt;&gt; block_bits;</div><div class='ctx'> </div><div class='ctx'> 		if (first &lt;= end &amp;&amp; last &gt; end)</div><div class='del'>-			plen -= (last - end) * block_size;</div><div class='add'>+			plen -= iomap_bytes_to_truncate(*pos + plen, block_bits,</div><div class='add'>+					last - end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*offp = poff;</div><div class='ctx'> 	*lenp = plen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iomap_finish_folio_read(struct folio *folio, size_t off,</div><div class='del'>-		size_t len, int error)</div><div class='del'>-{</div><div class='del'>-	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='del'>-	bool uptodate = !error;</div><div class='del'>-	bool finished = true;</div><div class='del'>-</div><div class='del'>-	if (ifs) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;ifs-&gt;state_lock, flags);</div><div class='del'>-		if (!error)</div><div class='del'>-			uptodate = ifs_set_range_uptodate(folio, ifs, off, len);</div><div class='del'>-		ifs-&gt;read_bytes_pending -= len;</div><div class='del'>-		finished = !ifs-&gt;read_bytes_pending;</div><div class='del'>-		spin_unlock_irqrestore(&amp;ifs-&gt;state_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (error)</div><div class='del'>-		folio_set_error(folio);</div><div class='del'>-	if (finished)</div><div class='del'>-		folio_end_read(folio, uptodate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iomap_read_end_io(struct bio *bio)</div><div class='add'>+static inline bool iomap_block_needs_zeroing(const struct iomap_iter *iter,</div><div class='add'>+		loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	int error = blk_status_to_errno(bio-&gt;bi_status);</div><div class='del'>-	struct folio_iter fi;</div><div class='add'>+	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='ctx'> </div><div class='del'>-	bio_for_each_folio_all(fi, bio)</div><div class='del'>-		iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error);</div><div class='del'>-	bio_put(bio);</div><div class='add'>+	return srcmap-&gt;type != IOMAP_MAPPED ||</div><div class='add'>+		(srcmap-&gt;flags &amp; IOMAP_F_NEW) ||</div><div class='add'>+		pos &gt;= i_size_read(iter-&gt;inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct iomap_readpage_ctx {</div><div class='del'>-	struct folio		*cur_folio;</div><div class='del'>-	bool			cur_folio_in_bio;</div><div class='del'>-	struct bio		*bio;</div><div class='del'>-	struct readahead_control *rac;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * iomap_read_inline_data - copy inline data into the page cache</div><div class='ctx'>  * @iter: iteration structure</div><div class='hunk'>@@ -307,6 +365,9 @@ static int iomap_read_inline_data(const struct iomap_iter *iter,</div><div class='ctx'> 	size_t size = i_size_read(iter-&gt;inode) - iomap-&gt;offset;</div><div class='ctx'> 	size_t offset = offset_in_folio(folio, iomap-&gt;offset);</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!iomap-&gt;inline_data))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (folio_test_uptodate(folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -320,157 +381,233 @@ static int iomap_read_inline_data(const struct iomap_iter *iter,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool iomap_block_needs_zeroing(const struct iomap_iter *iter,</div><div class='del'>-		loff_t pos)</div><div class='add'>+void iomap_finish_folio_read(struct folio *folio, size_t off, size_t len,</div><div class='add'>+		int error)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='add'>+	bool uptodate = !error;</div><div class='add'>+	bool finished = true;</div><div class='ctx'> </div><div class='del'>-	return srcmap-&gt;type != IOMAP_MAPPED ||</div><div class='del'>-		(srcmap-&gt;flags &amp; IOMAP_F_NEW) ||</div><div class='del'>-		pos &gt;= i_size_read(iter-&gt;inode);</div><div class='add'>+	if (ifs) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ifs-&gt;state_lock, flags);</div><div class='add'>+		if (!error)</div><div class='add'>+			uptodate = ifs_set_range_uptodate(folio, ifs, off, len);</div><div class='add'>+		ifs-&gt;read_bytes_pending -= len;</div><div class='add'>+		finished = !ifs-&gt;read_bytes_pending;</div><div class='add'>+		spin_unlock_irqrestore(&amp;ifs-&gt;state_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (finished)</div><div class='add'>+		folio_end_read(folio, uptodate);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_finish_folio_read);</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_readpage_iter(const struct iomap_iter *iter,</div><div class='del'>-		struct iomap_readpage_ctx *ctx, loff_t offset)</div><div class='add'>+static void iomap_read_init(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='del'>-	loff_t pos = iter-&gt;pos + offset;</div><div class='del'>-	loff_t length = iomap_length(iter) - offset;</div><div class='del'>-	struct folio *folio = ctx-&gt;cur_folio;</div><div class='del'>-	struct iomap_folio_state *ifs;</div><div class='del'>-	loff_t orig_pos = pos;</div><div class='del'>-	size_t poff, plen;</div><div class='del'>-	sector_t sector;</div><div class='del'>-</div><div class='del'>-	if (iomap-&gt;type == IOMAP_INLINE)</div><div class='del'>-		return iomap_read_inline_data(iter, folio);</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='ctx'> </div><div class='del'>-	/* zero post-eof blocks as the page may be mapped */</div><div class='del'>-	ifs = ifs_alloc(iter-&gt;inode, folio, iter-&gt;flags);</div><div class='del'>-	iomap_adjust_read_range(iter-&gt;inode, folio, &amp;pos, length, &amp;poff, &amp;plen);</div><div class='del'>-	if (plen == 0)</div><div class='del'>-		goto done;</div><div class='add'>+	if (ifs) {</div><div class='add'>+		size_t len = folio_size(folio);</div><div class='ctx'> </div><div class='del'>-	if (iomap_block_needs_zeroing(iter, pos)) {</div><div class='del'>-		folio_zero_range(folio, poff, plen);</div><div class='del'>-		iomap_set_range_uptodate(folio, poff, plen);</div><div class='del'>-		goto done;</div><div class='add'>+		/*</div><div class='add'>+		 * ifs-&gt;read_bytes_pending is used to track how many bytes are</div><div class='add'>+		 * read in asynchronously by the IO helper. We need to track</div><div class='add'>+		 * this so that we can know when the IO helper has finished</div><div class='add'>+		 * reading in all the necessary ranges of the folio and can end</div><div class='add'>+		 * the read.</div><div class='add'>+		 *</div><div class='add'>+		 * Increase -&gt;read_bytes_pending by the folio size to start, and</div><div class='add'>+		 * add a +1 bias. We'll subtract the bias and any uptodate /</div><div class='add'>+		 * zeroed ranges that did not require IO in iomap_read_end()</div><div class='add'>+		 * after we're done processing the folio.</div><div class='add'>+		 *</div><div class='add'>+		 * We do this because otherwise, we would have to increment</div><div class='add'>+		 * ifs-&gt;read_bytes_pending every time a range in the folio needs</div><div class='add'>+		 * to be read in, which can get expensive since the spinlock</div><div class='add'>+		 * needs to be held whenever modifying ifs-&gt;read_bytes_pending.</div><div class='add'>+		 *</div><div class='add'>+		 * We add the bias to ensure the read has not been ended on the</div><div class='add'>+		 * folio when iomap_read_end() is called, even if the IO helper</div><div class='add'>+		 * has already finished reading in the entire folio.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irq(&amp;ifs-&gt;state_lock);</div><div class='add'>+		WARN_ON_ONCE(ifs-&gt;read_bytes_pending != 0);</div><div class='add'>+		ifs-&gt;read_bytes_pending = len + 1;</div><div class='add'>+		spin_unlock_irq(&amp;ifs-&gt;state_lock);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This ends IO if no bytes were submitted to an IO helper.</div><div class='add'>+ *</div><div class='add'>+ * Otherwise, this calibrates ifs-&gt;read_bytes_pending to represent only the</div><div class='add'>+ * submitted bytes (see comment in iomap_read_init()). If all bytes submitted</div><div class='add'>+ * have already been completed by the IO helper, then this will end the read.</div><div class='add'>+ * Else the IO helper will end the read after all submitted ranges have been</div><div class='add'>+ * read.</div><div class='add'>+ */</div><div class='add'>+static void iomap_read_end(struct folio *folio, size_t bytes_submitted)</div><div class='add'>+{</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;cur_folio_in_bio = true;</div><div class='ctx'> 	if (ifs) {</div><div class='add'>+		bool end_read, uptodate;</div><div class='add'>+</div><div class='ctx'> 		spin_lock_irq(&amp;ifs-&gt;state_lock);</div><div class='del'>-		ifs-&gt;read_bytes_pending += plen;</div><div class='del'>-		spin_unlock_irq(&amp;ifs-&gt;state_lock);</div><div class='del'>-	}</div><div class='add'>+		if (!ifs-&gt;read_bytes_pending) {</div><div class='add'>+			WARN_ON_ONCE(bytes_submitted);</div><div class='add'>+			spin_unlock_irq(&amp;ifs-&gt;state_lock);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	sector = iomap_sector(iomap, pos);</div><div class='del'>-	if (!ctx-&gt;bio ||</div><div class='del'>-	    bio_end_sector(ctx-&gt;bio) != sector ||</div><div class='del'>-	    !bio_add_folio(ctx-&gt;bio, folio, plen, poff)) {</div><div class='del'>-		gfp_t gfp = mapping_gfp_constraint(folio-&gt;mapping, GFP_KERNEL);</div><div class='del'>-		gfp_t orig_gfp = gfp;</div><div class='del'>-		unsigned int nr_vecs = DIV_ROUND_UP(length, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-		if (ctx-&gt;bio)</div><div class='del'>-			submit_bio(ctx-&gt;bio);</div><div class='del'>-</div><div class='del'>-		if (ctx-&gt;rac) /* same as readahead_gfp_mask */</div><div class='del'>-			gfp |= __GFP_NORETRY | __GFP_NOWARN;</div><div class='del'>-		ctx-&gt;bio = bio_alloc(iomap-&gt;bdev, bio_max_segs(nr_vecs),</div><div class='del'>-				     REQ_OP_READ, gfp);</div><div class='ctx'> 		/*</div><div class='del'>-		 * If the bio_alloc fails, try it again for a single page to</div><div class='del'>-		 * avoid having to deal with partial page reads.  This emulates</div><div class='del'>-		 * what do_mpage_read_folio does.</div><div class='add'>+		 * Subtract any bytes that were initially accounted to</div><div class='add'>+		 * read_bytes_pending but skipped for IO. The +1 accounts for</div><div class='add'>+		 * the bias we added in iomap_read_init().</div><div class='ctx'> 		 */</div><div class='del'>-		if (!ctx-&gt;bio) {</div><div class='del'>-			ctx-&gt;bio = bio_alloc(iomap-&gt;bdev, 1, REQ_OP_READ,</div><div class='del'>-					     orig_gfp);</div><div class='del'>-		}</div><div class='del'>-		if (ctx-&gt;rac)</div><div class='del'>-			ctx-&gt;bio-&gt;bi_opf |= REQ_RAHEAD;</div><div class='del'>-		ctx-&gt;bio-&gt;bi_iter.bi_sector = sector;</div><div class='del'>-		ctx-&gt;bio-&gt;bi_end_io = iomap_read_end_io;</div><div class='del'>-		bio_add_folio_nofail(ctx-&gt;bio, folio, plen, poff);</div><div class='add'>+		ifs-&gt;read_bytes_pending -=</div><div class='add'>+			(folio_size(folio) + 1 - bytes_submitted);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If !ifs-&gt;read_bytes_pending, this means all pending reads by</div><div class='add'>+		 * the IO helper have already completed, which means we need to</div><div class='add'>+		 * end the folio read here. If ifs-&gt;read_bytes_pending != 0,</div><div class='add'>+		 * the IO helper will end the folio read.</div><div class='add'>+		 */</div><div class='add'>+		end_read = !ifs-&gt;read_bytes_pending;</div><div class='add'>+		if (end_read)</div><div class='add'>+			uptodate = ifs_is_fully_uptodate(folio, ifs);</div><div class='add'>+		spin_unlock_irq(&amp;ifs-&gt;state_lock);</div><div class='add'>+		if (end_read)</div><div class='add'>+			folio_end_read(folio, uptodate);</div><div class='add'>+	} else if (!bytes_submitted) {</div><div class='add'>+		/*</div><div class='add'>+		 * If there were no bytes submitted, this means we are</div><div class='add'>+		 * responsible for unlocking the folio here, since no IO helper</div><div class='add'>+		 * has taken ownership of it. If there were bytes submitted,</div><div class='add'>+		 * then the IO helper will end the read via</div><div class='add'>+		 * iomap_finish_folio_read().</div><div class='add'>+		 */</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	/*</div><div class='del'>-	 * Move the caller beyond our range so that it keeps making progress.</div><div class='del'>-	 * For that, we have to include any leading non-uptodate ranges, but</div><div class='del'>-	 * we can skip trailing ones as they will be handled in the next</div><div class='del'>-	 * iteration.</div><div class='del'>-	 */</div><div class='del'>-	return pos - orig_pos + plen;</div><div class='add'>+static int iomap_read_folio_iter(struct iomap_iter *iter,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx, size_t *bytes_submitted)</div><div class='add'>+{</div><div class='add'>+	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='add'>+	loff_t length = iomap_length(iter);</div><div class='add'>+	struct folio *folio = ctx-&gt;cur_folio;</div><div class='add'>+	size_t poff, plen;</div><div class='add'>+	loff_t pos_diff;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (iomap-&gt;type == IOMAP_INLINE) {</div><div class='add'>+		ret = iomap_read_inline_data(iter, folio);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		return iomap_iter_advance(iter, length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ifs_alloc(iter-&gt;inode, folio, iter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	length = min_t(loff_t, length,</div><div class='add'>+			folio_size(folio) - offset_in_folio(folio, pos));</div><div class='add'>+	while (length) {</div><div class='add'>+		iomap_adjust_read_range(iter-&gt;inode, folio, &amp;pos, length, &amp;poff,</div><div class='add'>+				&amp;plen);</div><div class='add'>+</div><div class='add'>+		pos_diff = pos - iter-&gt;pos;</div><div class='add'>+		if (WARN_ON_ONCE(pos_diff + plen &gt; length))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		ret = iomap_iter_advance(iter, pos_diff);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (plen == 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* zero post-eof blocks as the page may be mapped */</div><div class='add'>+		if (iomap_block_needs_zeroing(iter, pos)) {</div><div class='add'>+			folio_zero_range(folio, poff, plen);</div><div class='add'>+			iomap_set_range_uptodate(folio, poff, plen);</div><div class='add'>+		} else {</div><div class='add'>+			if (!*bytes_submitted)</div><div class='add'>+				iomap_read_init(folio);</div><div class='add'>+			ret = ctx-&gt;ops-&gt;read_folio_range(iter, ctx, plen);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			*bytes_submitted += plen;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = iomap_iter_advance(iter, plen);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		length -= pos_diff + plen;</div><div class='add'>+		pos = iter-&gt;pos;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops)</div><div class='add'>+void iomap_read_folio(const struct iomap_ops *ops,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx)</div><div class='ctx'> {</div><div class='add'>+	struct folio *folio = ctx-&gt;cur_folio;</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode		= folio-&gt;mapping-&gt;host,</div><div class='ctx'> 		.pos		= folio_pos(folio),</div><div class='ctx'> 		.len		= folio_size(folio),</div><div class='ctx'> 	};</div><div class='del'>-	struct iomap_readpage_ctx ctx = {</div><div class='del'>-		.cur_folio	= folio,</div><div class='del'>-	};</div><div class='add'>+	size_t bytes_submitted = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	trace_iomap_readpage(iter.inode, 1);</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_readpage_iter(&amp;iter, &amp;ctx, 0);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		folio_set_error(folio);</div><div class='add'>+		iter.status = iomap_read_folio_iter(&amp;iter, ctx,</div><div class='add'>+				&amp;bytes_submitted);</div><div class='ctx'> </div><div class='del'>-	if (ctx.bio) {</div><div class='del'>-		submit_bio(ctx.bio);</div><div class='del'>-		WARN_ON_ONCE(!ctx.cur_folio_in_bio);</div><div class='del'>-	} else {</div><div class='del'>-		WARN_ON_ONCE(ctx.cur_folio_in_bio);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-	}</div><div class='add'>+	if (ctx-&gt;ops-&gt;submit_read)</div><div class='add'>+		ctx-&gt;ops-&gt;submit_read(ctx);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Just like mpage_readahead and block_read_full_folio, we always</div><div class='del'>-	 * return 0 and just set the folio error flag on errors.  This</div><div class='del'>-	 * should be cleaned up throughout the stack eventually.</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='add'>+	iomap_read_end(folio, bytes_submitted);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_read_folio);</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_readahead_iter(const struct iomap_iter *iter,</div><div class='del'>-		struct iomap_readpage_ctx *ctx)</div><div class='add'>+static int iomap_readahead_iter(struct iomap_iter *iter,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx, size_t *cur_bytes_submitted)</div><div class='ctx'> {</div><div class='del'>-	loff_t length = iomap_length(iter);</div><div class='del'>-	loff_t done, ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	for (done = 0; done &lt; length; done += ret) {</div><div class='add'>+	while (iomap_length(iter)) {</div><div class='ctx'> 		if (ctx-&gt;cur_folio &amp;&amp;</div><div class='del'>-		    offset_in_folio(ctx-&gt;cur_folio, iter-&gt;pos + done) == 0) {</div><div class='del'>-			if (!ctx-&gt;cur_folio_in_bio)</div><div class='del'>-				folio_unlock(ctx-&gt;cur_folio);</div><div class='add'>+		    offset_in_folio(ctx-&gt;cur_folio, iter-&gt;pos) == 0) {</div><div class='add'>+			iomap_read_end(ctx-&gt;cur_folio, *cur_bytes_submitted);</div><div class='ctx'> 			ctx-&gt;cur_folio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!ctx-&gt;cur_folio) {</div><div class='ctx'> 			ctx-&gt;cur_folio = readahead_folio(ctx-&gt;rac);</div><div class='del'>-			ctx-&gt;cur_folio_in_bio = false;</div><div class='add'>+			if (WARN_ON_ONCE(!ctx-&gt;cur_folio))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			*cur_bytes_submitted = 0;</div><div class='ctx'> 		}</div><div class='del'>-		ret = iomap_readpage_iter(iter, ctx, done);</div><div class='del'>-		if (ret &lt;= 0)</div><div class='add'>+		ret = iomap_read_folio_iter(iter, ctx, cur_bytes_submitted);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return done;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iomap_readahead - Attempt to read pages from a file.</div><div class='del'>- * @rac: Describes the pages to be read.</div><div class='ctx'>  * @ops: The operations vector for the filesystem.</div><div class='add'>+ * @ctx: The ctx used for issuing readahead.</div><div class='ctx'>  *</div><div class='ctx'>  * This function is for filesystems to call to implement their readahead</div><div class='ctx'>  * address_space operation.</div><div class='hunk'>@@ -482,28 +619,28 @@ static loff_t iomap_readahead_iter(const struct iomap_iter *iter,</div><div class='ctx'>  * function is called with memalloc_nofs set, so allocations will not cause</div><div class='ctx'>  * the filesystem to be reentered.</div><div class='ctx'>  */</div><div class='del'>-void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)</div><div class='add'>+void iomap_readahead(const struct iomap_ops *ops,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx)</div><div class='ctx'> {</div><div class='add'>+	struct readahead_control *rac = ctx-&gt;rac;</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode	= rac-&gt;mapping-&gt;host,</div><div class='ctx'> 		.pos	= readahead_pos(rac),</div><div class='ctx'> 		.len	= readahead_length(rac),</div><div class='ctx'> 	};</div><div class='del'>-	struct iomap_readpage_ctx ctx = {</div><div class='del'>-		.rac	= rac,</div><div class='del'>-	};</div><div class='add'>+	size_t cur_bytes_submitted;</div><div class='ctx'> </div><div class='ctx'> 	trace_iomap_readahead(rac-&gt;mapping-&gt;host, readahead_count(rac));</div><div class='ctx'> </div><div class='ctx'> 	while (iomap_iter(&amp;iter, ops) &gt; 0)</div><div class='del'>-		iter.processed = iomap_readahead_iter(&amp;iter, &amp;ctx);</div><div class='add'>+		iter.status = iomap_readahead_iter(&amp;iter, ctx,</div><div class='add'>+					&amp;cur_bytes_submitted);</div><div class='ctx'> </div><div class='del'>-	if (ctx.bio)</div><div class='del'>-		submit_bio(ctx.bio);</div><div class='del'>-	if (ctx.cur_folio) {</div><div class='del'>-		if (!ctx.cur_folio_in_bio)</div><div class='del'>-			folio_unlock(ctx.cur_folio);</div><div class='del'>-	}</div><div class='add'>+	if (ctx-&gt;ops-&gt;submit_read)</div><div class='add'>+		ctx-&gt;ops-&gt;submit_read(ctx);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;cur_folio)</div><div class='add'>+		iomap_read_end(ctx-&gt;cur_folio, cur_bytes_submitted);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_readahead);</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +655,7 @@ bool iomap_is_partially_uptodate(struct folio *folio, size_t from, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	unsigned first, last, i;</div><div class='add'>+	unsigned first, last;</div><div class='ctx'> </div><div class='ctx'> 	if (!ifs)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -530,10 +667,7 @@ bool iomap_is_partially_uptodate(struct folio *folio, size_t from, size_t count)</div><div class='ctx'> 	first = from &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> 	last = (from + count - 1) &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='del'>-	for (i = first; i &lt;= last; i++)</div><div class='del'>-		if (!ifs_block_is_uptodate(ifs, i))</div><div class='del'>-			return false;</div><div class='del'>-	return true;</div><div class='add'>+	return ifs_next_nonuptodate_block(folio, first, last) &gt; last;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_is_partially_uptodate);</div><div class='ctx'> </div><div class='hunk'>@@ -552,6 +686,8 @@ struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	if (iter-&gt;flags &amp; IOMAP_NOWAIT)</div><div class='ctx'> 		fgp |= FGP_NOWAIT;</div><div class='add'>+	if (iter-&gt;flags &amp; IOMAP_DONTCACHE)</div><div class='add'>+		fgp |= FGP_DONTCACHE;</div><div class='ctx'> 	fgp |= fgf_set_order(len);</div><div class='ctx'> </div><div class='ctx'> 	return __filemap_get_folio(iter-&gt;inode-&gt;i_mapping, pos &gt;&gt; PAGE_SHIFT,</div><div class='hunk'>@@ -618,23 +754,12 @@ iomap_write_failed(struct inode *inode, loff_t pos, unsigned len)</div><div class='ctx'> 					 pos + len - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iomap_read_folio_sync(loff_t block_start, struct folio *folio,</div><div class='del'>-		size_t poff, size_t plen, const struct iomap *iomap)</div><div class='del'>-{</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	struct bio bio;</div><div class='del'>-</div><div class='del'>-	bio_init(&amp;bio, iomap-&gt;bdev, &amp;bvec, 1, REQ_OP_READ);</div><div class='del'>-	bio.bi_iter.bi_sector = iomap_sector(iomap, block_start);</div><div class='del'>-	bio_add_folio_nofail(&amp;bio, folio, plen, poff);</div><div class='del'>-	return submit_bio_wait(&amp;bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,</div><div class='del'>-		size_t len, struct folio *folio)</div><div class='add'>+static int __iomap_write_begin(const struct iomap_iter *iter,</div><div class='add'>+		const struct iomap_write_ops *write_ops, size_t len,</div><div class='add'>+		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='ctx'> 	struct iomap_folio_state *ifs;</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='ctx'> 	loff_t block_size = i_blocksize(iter-&gt;inode);</div><div class='ctx'> 	loff_t block_start = round_down(pos, block_size);</div><div class='ctx'> 	loff_t block_end = round_up(pos + len, block_size);</div><div class='hunk'>@@ -650,7 +775,7 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 	 * are not changing pagecache contents.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(iter-&gt;flags &amp; IOMAP_UNSHARE) &amp;&amp; pos &lt;= folio_pos(folio) &amp;&amp;</div><div class='del'>-	    pos + len &gt;= folio_pos(folio) + folio_size(folio))</div><div class='add'>+	    pos + len &gt;= folio_next_pos(folio))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ifs = ifs_alloc(iter-&gt;inode, folio, iter-&gt;flags);</div><div class='hunk'>@@ -659,7 +784,6 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_uptodate(folio))</div><div class='ctx'> 		return 0;</div><div class='del'>-	folio_clear_error(folio);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		iomap_adjust_read_range(iter-&gt;inode, folio, &amp;block_start,</div><div class='hunk'>@@ -667,9 +791,12 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 		if (plen == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!(iter-&gt;flags &amp; IOMAP_UNSHARE) &amp;&amp;</div><div class='del'>-		    (from &lt;= poff || from &gt;= poff + plen) &amp;&amp;</div><div class='del'>-		    (to &lt;= poff || to &gt;= poff + plen))</div><div class='add'>+		/*</div><div class='add'>+		 * If the read range will be entirely overwritten by the write,</div><div class='add'>+		 * we can skip having to zero/read it in.</div><div class='add'>+		 */</div><div class='add'>+		if (!(iter-&gt;flags &amp; IOMAP_UNSHARE) &amp;&amp; from &lt;= poff &amp;&amp;</div><div class='add'>+		    to &gt;= poff + plen)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (iomap_block_needs_zeroing(iter, block_start)) {</div><div class='hunk'>@@ -682,8 +809,12 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 			if (iter-&gt;flags &amp; IOMAP_NOWAIT)</div><div class='ctx'> 				return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-			status = iomap_read_folio_sync(block_start, folio,</div><div class='del'>-					poff, plen, srcmap);</div><div class='add'>+			if (write_ops &amp;&amp; write_ops-&gt;read_folio_range)</div><div class='add'>+				status = write_ops-&gt;read_folio_range(iter,</div><div class='add'>+						folio, block_start, plen);</div><div class='add'>+			else</div><div class='add'>+				status = iomap_bio_read_folio_range_sync(iter,</div><div class='add'>+						folio, block_start, plen);</div><div class='ctx'> 			if (status)</div><div class='ctx'> 				return status;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -693,30 +824,71 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct folio *__iomap_get_folio(struct iomap_iter *iter, loff_t pos,</div><div class='del'>-		size_t len)</div><div class='add'>+static struct folio *__iomap_get_folio(struct iomap_iter *iter,</div><div class='add'>+		const struct iomap_write_ops *write_ops, size_t len)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap_folio_ops *folio_ops = iter-&gt;iomap.folio_ops;</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='ctx'> </div><div class='del'>-	if (folio_ops &amp;&amp; folio_ops-&gt;get_folio)</div><div class='del'>-		return folio_ops-&gt;get_folio(iter, pos, len);</div><div class='del'>-	else</div><div class='del'>-		return iomap_get_folio(iter, pos, len);</div><div class='add'>+	if (!mapping_large_folio_support(iter-&gt;inode-&gt;i_mapping))</div><div class='add'>+		len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos));</div><div class='add'>+</div><div class='add'>+	if (iter-&gt;fbatch) {</div><div class='add'>+		struct folio *folio = folio_batch_next(iter-&gt;fbatch);</div><div class='add'>+</div><div class='add'>+		if (!folio)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The folio mapping generally shouldn't have changed based on</div><div class='add'>+		 * fs locks, but be consistent with filemap lookup and retry</div><div class='add'>+		 * the iter if it does.</div><div class='add'>+		 */</div><div class='add'>+		folio_lock(folio);</div><div class='add'>+		if (unlikely(folio-&gt;mapping != iter-&gt;inode-&gt;i_mapping)) {</div><div class='add'>+			iter-&gt;iomap.flags |= IOMAP_F_STALE;</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		folio_get(folio);</div><div class='add'>+		return folio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (write_ops &amp;&amp; write_ops-&gt;get_folio)</div><div class='add'>+		return write_ops-&gt;get_folio(iter, pos, len);</div><div class='add'>+	return iomap_get_folio(iter, pos, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __iomap_put_folio(struct iomap_iter *iter, loff_t pos, size_t ret,</div><div class='add'>+static void __iomap_put_folio(struct iomap_iter *iter,</div><div class='add'>+		const struct iomap_write_ops *write_ops, size_t ret,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap_folio_ops *folio_ops = iter-&gt;iomap.folio_ops;</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='ctx'> </div><div class='del'>-	if (folio_ops &amp;&amp; folio_ops-&gt;put_folio) {</div><div class='del'>-		folio_ops-&gt;put_folio(iter-&gt;inode, pos, ret, folio);</div><div class='add'>+	if (write_ops &amp;&amp; write_ops-&gt;put_folio) {</div><div class='add'>+		write_ops-&gt;put_folio(iter-&gt;inode, pos, ret, folio);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* trim pos and bytes to within a given folio */</div><div class='add'>+static loff_t iomap_trim_folio_range(struct iomap_iter *iter,</div><div class='add'>+		struct folio *folio, size_t *offset, u64 *bytes)</div><div class='add'>+{</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='add'>+	size_t fsize = folio_size(folio);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(pos &lt; folio_pos(folio));</div><div class='add'>+	WARN_ON_ONCE(pos &gt;= folio_pos(folio) + fsize);</div><div class='add'>+</div><div class='add'>+	*offset = offset_in_folio(folio, pos);</div><div class='add'>+	*bytes = min(*bytes, fsize - *offset);</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int iomap_write_begin_inline(const struct iomap_iter *iter,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='hunk'>@@ -726,29 +898,42 @@ static int iomap_write_begin_inline(const struct iomap_iter *iter,</div><div class='ctx'> 	return iomap_read_inline_data(iter, folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iomap_write_begin(struct iomap_iter *iter, loff_t pos,</div><div class='del'>-		size_t len, struct folio **foliop)</div><div class='add'>+/*</div><div class='add'>+ * Grab and prepare a folio for write based on iter state. Returns the folio,</div><div class='add'>+ * offset, and length. Callers can optionally pass a max length *plen,</div><div class='add'>+ * otherwise init to zero.</div><div class='add'>+ */</div><div class='add'>+static int iomap_write_begin(struct iomap_iter *iter,</div><div class='add'>+		const struct iomap_write_ops *write_ops, struct folio **foliop,</div><div class='add'>+		size_t *poffset, u64 *plen)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap_folio_ops *folio_ops = iter-&gt;iomap.folio_ops;</div><div class='ctx'> 	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='add'>+	loff_t pos;</div><div class='add'>+	u64 len = min_t(u64, SIZE_MAX, iomap_length(iter));</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(pos + len &gt; iter-&gt;iomap.offset + iter-&gt;iomap.length);</div><div class='del'>-	if (srcmap != &amp;iter-&gt;iomap)</div><div class='del'>-		BUG_ON(pos + len &gt; srcmap-&gt;offset + srcmap-&gt;length);</div><div class='add'>+	len = min_not_zero(len, *plen);</div><div class='add'>+	*foliop = NULL;</div><div class='add'>+	*plen = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fatal_signal_pending(current))</div><div class='ctx'> 		return -EINTR;</div><div class='ctx'> </div><div class='del'>-	if (!mapping_large_folio_support(iter-&gt;inode-&gt;i_mapping))</div><div class='del'>-		len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos));</div><div class='del'>-</div><div class='del'>-	folio = __iomap_get_folio(iter, pos, len);</div><div class='add'>+	folio = __iomap_get_folio(iter, write_ops, len);</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * No folio means we're done with a batch. We still have range to</div><div class='add'>+	 * process so return and let the caller iterate and refill the batch.</div><div class='add'>+	 */</div><div class='add'>+	if (!folio) {</div><div class='add'>+		WARN_ON_ONCE(!iter-&gt;fbatch);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Now we have a locked folio, before we do anything with it we need to</div><div class='ctx'> 	 * check that the iomap we have cached is not stale. The inode extent</div><div class='ctx'> 	 * mapping can change due to concurrent IO in flight (e.g.</div><div class='hunk'>@@ -758,8 +943,8 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 	 * could do the wrong thing here (zero a page range incorrectly or fail</div><div class='ctx'> 	 * to zero) and corrupt data.</div><div class='ctx'> 	 */</div><div class='del'>-	if (folio_ops &amp;&amp; folio_ops-&gt;iomap_valid) {</div><div class='del'>-		bool iomap_valid = folio_ops-&gt;iomap_valid(iter-&gt;inode,</div><div class='add'>+	if (write_ops &amp;&amp; write_ops-&gt;iomap_valid) {</div><div class='add'>+		bool iomap_valid = write_ops-&gt;iomap_valid(iter-&gt;inode,</div><div class='ctx'> 							 &amp;iter-&gt;iomap);</div><div class='ctx'> 		if (!iomap_valid) {</div><div class='ctx'> 			iter-&gt;iomap.flags |= IOMAP_F_STALE;</div><div class='hunk'>@@ -768,30 +953,44 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pos + len &gt; folio_pos(folio) + folio_size(folio))</div><div class='del'>-		len = folio_pos(folio) + folio_size(folio) - pos;</div><div class='add'>+	/*</div><div class='add'>+	 * The folios in a batch may not be contiguous. If we've skipped</div><div class='add'>+	 * forward, advance the iter to the pos of the current folio. If the</div><div class='add'>+	 * folio starts beyond the end of the mapping, it may have been trimmed</div><div class='add'>+	 * since the lookup for whatever reason. Return a NULL folio to</div><div class='add'>+	 * terminate the op.</div><div class='add'>+	 */</div><div class='add'>+	if (folio_pos(folio) &gt; iter-&gt;pos) {</div><div class='add'>+		len = min_t(u64, folio_pos(folio) - iter-&gt;pos,</div><div class='add'>+				 iomap_length(iter));</div><div class='add'>+		status = iomap_iter_advance(iter, len);</div><div class='add'>+		len = iomap_length(iter);</div><div class='add'>+		if (status || !len)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = iomap_trim_folio_range(iter, folio, poffset, &amp;len);</div><div class='ctx'> </div><div class='ctx'> 	if (srcmap-&gt;type == IOMAP_INLINE)</div><div class='ctx'> 		status = iomap_write_begin_inline(iter, folio);</div><div class='ctx'> 	else if (srcmap-&gt;flags &amp; IOMAP_F_BUFFER_HEAD)</div><div class='ctx'> 		status = __block_write_begin_int(folio, pos, len, NULL, srcmap);</div><div class='ctx'> 	else</div><div class='del'>-		status = __iomap_write_begin(iter, pos, len, folio);</div><div class='add'>+		status = __iomap_write_begin(iter, write_ops, len, folio);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(status))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	*foliop = folio;</div><div class='add'>+	*plen = len;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	__iomap_put_folio(iter, pos, 0, folio);</div><div class='del'>-	iomap_write_failed(iter-&gt;inode, pos, len);</div><div class='del'>-</div><div class='add'>+	__iomap_put_folio(iter, write_ops, 0, folio);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len,</div><div class='add'>+static bool __iomap_write_end(struct inode *inode, loff_t pos, size_t len,</div><div class='ctx'> 		size_t copied, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	flush_dcache_folio(folio);</div><div class='hunk'>@@ -808,14 +1007,14 @@ static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len,</div><div class='ctx'> 	 * redo the whole thing.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(copied &lt; len &amp;&amp; !folio_test_uptodate(folio)))</div><div class='del'>-		return 0;</div><div class='add'>+		return false;</div><div class='ctx'> 	iomap_set_range_uptodate(folio, offset_in_folio(folio, pos), len);</div><div class='ctx'> 	iomap_set_range_dirty(folio, offset_in_folio(folio, pos), copied);</div><div class='ctx'> 	filemap_dirty_folio(inode-&gt;i_mapping, folio);</div><div class='del'>-	return copied;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t iomap_write_end_inline(const struct iomap_iter *iter,</div><div class='add'>+static bool iomap_write_end_inline(const struct iomap_iter *iter,</div><div class='ctx'> 		struct folio *folio, loff_t pos, size_t copied)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='hunk'>@@ -824,77 +1023,71 @@ static size_t iomap_write_end_inline(const struct iomap_iter *iter,</div><div class='ctx'> 	WARN_ON_ONCE(!folio_test_uptodate(folio));</div><div class='ctx'> 	BUG_ON(!iomap_inline_data_valid(iomap));</div><div class='ctx'> </div><div class='add'>+	if (WARN_ON_ONCE(!iomap-&gt;inline_data))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	flush_dcache_folio(folio);</div><div class='ctx'> 	addr = kmap_local_folio(folio, pos);</div><div class='ctx'> 	memcpy(iomap_inline_data(iomap, pos), addr, copied);</div><div class='ctx'> 	kunmap_local(addr);</div><div class='ctx'> </div><div class='ctx'> 	mark_inode_dirty(iter-&gt;inode);</div><div class='del'>-	return copied;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Returns the number of bytes copied.  May be 0.  Cannot be an errno. */</div><div class='del'>-static size_t iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len,</div><div class='del'>-		size_t copied, struct folio *folio)</div><div class='add'>+/*</div><div class='add'>+ * Returns true if all copied bytes have been written to the pagecache,</div><div class='add'>+ * otherwise return false.</div><div class='add'>+ */</div><div class='add'>+static bool iomap_write_end(struct iomap_iter *iter, size_t len, size_t copied,</div><div class='add'>+		struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='del'>-	loff_t old_size = iter-&gt;inode-&gt;i_size;</div><div class='del'>-	size_t ret;</div><div class='del'>-</div><div class='del'>-	if (srcmap-&gt;type == IOMAP_INLINE) {</div><div class='del'>-		ret = iomap_write_end_inline(iter, folio, pos, copied);</div><div class='del'>-	} else if (srcmap-&gt;flags &amp; IOMAP_F_BUFFER_HEAD) {</div><div class='del'>-		ret = block_write_end(NULL, iter-&gt;inode-&gt;i_mapping, pos, len,</div><div class='del'>-				copied, &amp;folio-&gt;page, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		ret = __iomap_write_end(iter-&gt;inode, pos, len, copied, folio);</div><div class='del'>-	}</div><div class='add'>+	loff_t pos = iter-&gt;pos;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Update the in-memory inode size after copying the data into the page</div><div class='del'>-	 * cache.  It's up to the file system to write the updated size to disk,</div><div class='del'>-	 * preferably after I/O completion so that no stale data is exposed.</div><div class='del'>-	 */</div><div class='del'>-	if (pos + ret &gt; old_size) {</div><div class='del'>-		i_size_write(iter-&gt;inode, pos + ret);</div><div class='del'>-		iter-&gt;iomap.flags |= IOMAP_F_SIZE_CHANGED;</div><div class='add'>+	if (srcmap-&gt;type == IOMAP_INLINE)</div><div class='add'>+		return iomap_write_end_inline(iter, folio, pos, copied);</div><div class='add'>+</div><div class='add'>+	if (srcmap-&gt;flags &amp; IOMAP_F_BUFFER_HEAD) {</div><div class='add'>+		size_t bh_written;</div><div class='add'>+</div><div class='add'>+		bh_written = block_write_end(pos, len, copied, folio);</div><div class='add'>+		WARN_ON_ONCE(bh_written != copied &amp;&amp; bh_written != 0);</div><div class='add'>+		return bh_written == copied;</div><div class='ctx'> 	}</div><div class='del'>-	__iomap_put_folio(iter, pos, ret, folio);</div><div class='ctx'> </div><div class='del'>-	if (old_size &lt; pos)</div><div class='del'>-		pagecache_isize_extended(iter-&gt;inode, old_size, pos);</div><div class='del'>-	if (ret &lt; len)</div><div class='del'>-		iomap_write_failed(iter-&gt;inode, pos + ret, len - ret);</div><div class='del'>-	return ret;</div><div class='add'>+	return __iomap_write_end(iter-&gt;inode, pos, len, copied, folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)</div><div class='add'>+static int iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i,</div><div class='add'>+		const struct iomap_write_ops *write_ops)</div><div class='ctx'> {</div><div class='del'>-	loff_t length = iomap_length(iter);</div><div class='del'>-	size_t chunk = PAGE_SIZE &lt;&lt; MAX_PAGECACHE_ORDER;</div><div class='del'>-	loff_t pos = iter-&gt;pos;</div><div class='del'>-	ssize_t written = 0;</div><div class='del'>-	long status = 0;</div><div class='add'>+	ssize_t total_written = 0;</div><div class='add'>+	int status = 0;</div><div class='ctx'> 	struct address_space *mapping = iter-&gt;inode-&gt;i_mapping;</div><div class='add'>+	size_t chunk = mapping_max_folio_size(mapping);</div><div class='ctx'> 	unsigned int bdp_flags = (iter-&gt;flags &amp; IOMAP_NOWAIT) ? BDP_ASYNC : 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct folio *folio;</div><div class='add'>+		loff_t old_size;</div><div class='ctx'> 		size_t offset;		/* Offset into folio */</div><div class='del'>-		size_t bytes;		/* Bytes to write to folio */</div><div class='add'>+		u64 bytes;		/* Bytes to write to folio */</div><div class='ctx'> 		size_t copied;		/* Bytes copied from user */</div><div class='add'>+		u64 written;		/* Bytes have been written */</div><div class='add'>+		loff_t pos;</div><div class='ctx'> </div><div class='ctx'> 		bytes = iov_iter_count(i);</div><div class='ctx'> retry:</div><div class='del'>-		offset = pos &amp; (chunk - 1);</div><div class='add'>+		offset = iter-&gt;pos &amp; (chunk - 1);</div><div class='ctx'> 		bytes = min(chunk - offset, bytes);</div><div class='ctx'> 		status = balance_dirty_pages_ratelimited_flags(mapping,</div><div class='ctx'> 							       bdp_flags);</div><div class='ctx'> 		if (unlikely(status))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (bytes &gt; length)</div><div class='del'>-			bytes = length;</div><div class='add'>+		if (bytes &gt; iomap_length(iter))</div><div class='add'>+			bytes = iomap_length(iter);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Bring in the user page that we'll copy from _first_.</div><div class='hunk'>@@ -911,33 +1104,52 @@ retry:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		status = iomap_write_begin(iter, pos, bytes, &amp;folio);</div><div class='del'>-		if (unlikely(status))</div><div class='add'>+		status = iomap_write_begin(iter, write_ops, &amp;folio, &amp;offset,</div><div class='add'>+				&amp;bytes);</div><div class='add'>+		if (unlikely(status)) {</div><div class='add'>+			iomap_write_failed(iter-&gt;inode, iter-&gt;pos, bytes);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (iter-&gt;iomap.flags &amp; IOMAP_F_STALE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		offset = offset_in_folio(folio, pos);</div><div class='del'>-		if (bytes &gt; folio_size(folio) - offset)</div><div class='del'>-			bytes = folio_size(folio) - offset;</div><div class='add'>+		pos = iter-&gt;pos;</div><div class='ctx'> </div><div class='ctx'> 		if (mapping_writably_mapped(mapping))</div><div class='ctx'> 			flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 		copied = copy_folio_from_iter_atomic(folio, offset, bytes, i);</div><div class='del'>-		status = iomap_write_end(iter, pos, bytes, copied, folio);</div><div class='add'>+		written = iomap_write_end(iter, bytes, copied, folio) ?</div><div class='add'>+			  copied : 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Update the in-memory inode size after copying the data into</div><div class='add'>+		 * the page cache.  It's up to the file system to write the</div><div class='add'>+		 * updated size to disk, preferably after I/O completion so that</div><div class='add'>+		 * no stale data is exposed.  Only once that's done can we</div><div class='add'>+		 * unlock and release the folio.</div><div class='add'>+		 */</div><div class='add'>+		old_size = iter-&gt;inode-&gt;i_size;</div><div class='add'>+		if (pos + written &gt; old_size) {</div><div class='add'>+			i_size_write(iter-&gt;inode, pos + written);</div><div class='add'>+			iter-&gt;iomap.flags |= IOMAP_F_SIZE_CHANGED;</div><div class='add'>+		}</div><div class='add'>+		__iomap_put_folio(iter, write_ops, written, folio);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(copied != status))</div><div class='del'>-			iov_iter_revert(i, copied - status);</div><div class='add'>+		if (old_size &lt; pos)</div><div class='add'>+			pagecache_isize_extended(iter-&gt;inode, old_size, pos);</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='del'>-		if (unlikely(status == 0)) {</div><div class='add'>+		if (unlikely(written == 0)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * A short copy made iomap_write_end() reject the</div><div class='ctx'> 			 * thing entirely.  Might be memory poisoning</div><div class='ctx'> 			 * halfway through, might be a race with munmap,</div><div class='ctx'> 			 * might be severe memory pressure.</div><div class='ctx'> 			 */</div><div class='add'>+			iomap_write_failed(iter-&gt;inode, pos, bytes);</div><div class='add'>+			iov_iter_revert(i, copied);</div><div class='add'>+</div><div class='ctx'> 			if (chunk &gt; PAGE_SIZE)</div><div class='ctx'> 				chunk /= 2;</div><div class='ctx'> 			if (copied) {</div><div class='hunk'>@@ -945,36 +1157,35 @@ retry:</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			pos += status;</div><div class='del'>-			written += status;</div><div class='del'>-			length -= status;</div><div class='add'>+			total_written += written;</div><div class='add'>+			iomap_iter_advance(iter, written);</div><div class='ctx'> 		}</div><div class='del'>-	} while (iov_iter_count(i) &amp;&amp; length);</div><div class='add'>+	} while (iov_iter_count(i) &amp;&amp; iomap_length(iter));</div><div class='ctx'> </div><div class='del'>-	if (status == -EAGAIN) {</div><div class='del'>-		iov_iter_revert(i, written);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	return written ? written : status;</div><div class='add'>+	return total_written ? 0 : status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t</div><div class='ctx'> iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,</div><div class='del'>-		const struct iomap_ops *ops)</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops, void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode		= iocb-&gt;ki_filp-&gt;f_mapping-&gt;host,</div><div class='ctx'> 		.pos		= iocb-&gt;ki_pos,</div><div class='ctx'> 		.len		= iov_iter_count(i),</div><div class='ctx'> 		.flags		= IOMAP_WRITE,</div><div class='add'>+		.private	= private,</div><div class='ctx'> 	};</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT)</div><div class='ctx'> 		iter.flags |= IOMAP_NOWAIT;</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_DONTCACHE)</div><div class='add'>+		iter.flags |= IOMAP_DONTCACHE;</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_write_iter(&amp;iter, i);</div><div class='add'>+		iter.status = iomap_write_iter(&amp;iter, i, write_ops);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(iter.pos == iocb-&gt;ki_pos))</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -984,15 +1195,14 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_file_buffered_write);</div><div class='ctx'> </div><div class='del'>-static int iomap_write_delalloc_ifs_punch(struct inode *inode,</div><div class='add'>+static void iomap_write_delalloc_ifs_punch(struct inode *inode,</div><div class='ctx'> 		struct folio *folio, loff_t start_byte, loff_t end_byte,</div><div class='del'>-		iomap_punch_t punch)</div><div class='add'>+		struct iomap *iomap, iomap_punch_t punch)</div><div class='ctx'> {</div><div class='del'>-	unsigned int first_blk, last_blk, i;</div><div class='add'>+	unsigned int first_blk, last_blk;</div><div class='ctx'> 	loff_t last_byte;</div><div class='ctx'> 	u8 blkbits = inode-&gt;i_blkbits;</div><div class='ctx'> 	struct iomap_folio_state *ifs;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When we have per-block dirty tracking, there can be</div><div class='hunk'>@@ -1002,56 +1212,41 @@ static int iomap_write_delalloc_ifs_punch(struct inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ifs = folio-&gt;private;</div><div class='ctx'> 	if (!ifs)</div><div class='del'>-		return ret;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	last_byte = min_t(loff_t, end_byte - 1,</div><div class='del'>-			folio_pos(folio) + folio_size(folio) - 1);</div><div class='add'>+	last_byte = min_t(loff_t, end_byte - 1, folio_next_pos(folio) - 1);</div><div class='ctx'> 	first_blk = offset_in_folio(folio, start_byte) &gt;&gt; blkbits;</div><div class='ctx'> 	last_blk = offset_in_folio(folio, last_byte) &gt;&gt; blkbits;</div><div class='del'>-	for (i = first_blk; i &lt;= last_blk; i++) {</div><div class='del'>-		if (!ifs_block_is_dirty(folio, ifs, i)) {</div><div class='del'>-			ret = punch(inode, folio_pos(folio) + (i &lt;&lt; blkbits),</div><div class='del'>-				    1 &lt;&lt; blkbits);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='add'>+	while ((first_blk = ifs_next_clean_block(folio, first_blk, last_blk))</div><div class='add'>+		       &lt;= last_blk) {</div><div class='add'>+		punch(inode, folio_pos(folio) + (first_blk &lt;&lt; blkbits),</div><div class='add'>+				1 &lt;&lt; blkbits, iomap);</div><div class='add'>+		first_blk++;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int iomap_write_delalloc_punch(struct inode *inode, struct folio *folio,</div><div class='add'>+static void iomap_write_delalloc_punch(struct inode *inode, struct folio *folio,</div><div class='ctx'> 		loff_t *punch_start_byte, loff_t start_byte, loff_t end_byte,</div><div class='del'>-		iomap_punch_t punch)</div><div class='add'>+		struct iomap *iomap, iomap_punch_t punch)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='ctx'> 	if (!folio_test_dirty(folio))</div><div class='del'>-		return ret;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* if dirty, punch up to offset */</div><div class='ctx'> 	if (start_byte &gt; *punch_start_byte) {</div><div class='del'>-		ret = punch(inode, *punch_start_byte,</div><div class='del'>-				start_byte - *punch_start_byte);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+		punch(inode, *punch_start_byte, start_byte - *punch_start_byte,</div><div class='add'>+				iomap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Punch non-dirty blocks within folio */</div><div class='del'>-	ret = iomap_write_delalloc_ifs_punch(inode, folio, start_byte,</div><div class='del'>-			end_byte, punch);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	iomap_write_delalloc_ifs_punch(inode, folio, start_byte, end_byte,</div><div class='add'>+			iomap, punch);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure the next punch start is correctly bound to</div><div class='ctx'> 	 * the end of this data range, not the end of the folio.</div><div class='ctx'> 	 */</div><div class='del'>-	*punch_start_byte = min_t(loff_t, end_byte,</div><div class='del'>-				folio_pos(folio) + folio_size(folio));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	*punch_start_byte = min_t(loff_t, end_byte, folio_next_pos(folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1071,13 +1266,12 @@ static int iomap_write_delalloc_punch(struct inode *inode, struct folio *folio,</div><div class='ctx'>  * This function uses [start_byte, end_byte) intervals (i.e. open ended) to</div><div class='ctx'>  * simplify range iterations.</div><div class='ctx'>  */</div><div class='del'>-static int iomap_write_delalloc_scan(struct inode *inode,</div><div class='add'>+static void iomap_write_delalloc_scan(struct inode *inode,</div><div class='ctx'> 		loff_t *punch_start_byte, loff_t start_byte, loff_t end_byte,</div><div class='del'>-		iomap_punch_t punch)</div><div class='add'>+		struct iomap *iomap, iomap_punch_t punch)</div><div class='ctx'> {</div><div class='ctx'> 	while (start_byte &lt; end_byte) {</div><div class='ctx'> 		struct folio	*folio;</div><div class='del'>-		int ret;</div><div class='ctx'> </div><div class='ctx'> 		/* grab locked page */</div><div class='ctx'> 		folio = filemap_lock_folio(inode-&gt;i_mapping,</div><div class='hunk'>@@ -1088,27 +1282,47 @@ static int iomap_write_delalloc_scan(struct inode *inode,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = iomap_write_delalloc_punch(inode, folio, punch_start_byte,</div><div class='del'>-						 start_byte, end_byte, punch);</div><div class='del'>-		if (ret) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			folio_put(folio);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		iomap_write_delalloc_punch(inode, folio, punch_start_byte,</div><div class='add'>+				start_byte, end_byte, iomap, punch);</div><div class='ctx'> </div><div class='ctx'> 		/* move offset to start of next folio in range */</div><div class='del'>-		start_byte = folio_next_index(folio) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		start_byte = folio_next_pos(folio);</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * When a short write occurs, the filesystem might need to use -&gt;iomap_end</div><div class='add'>+ * to remove space reservations created in -&gt;iomap_begin.</div><div class='add'>+ *</div><div class='add'>+ * For filesystems that use delayed allocation, there can be dirty pages over</div><div class='add'>+ * the delalloc extent outside the range of a short write but still within the</div><div class='add'>+ * delalloc extent allocated for this iomap if the write raced with page</div><div class='add'>+ * faults.</div><div class='add'>+ *</div><div class='ctx'>  * Punch out all the delalloc blocks in the range given except for those that</div><div class='ctx'>  * have dirty data still pending in the page cache - those are going to be</div><div class='ctx'>  * written and so must still retain the delalloc backing for writeback.</div><div class='ctx'>  *</div><div class='add'>+ * The punch() callback *must* only punch delalloc extents in the range passed</div><div class='add'>+ * to it. It must skip over all other types of extents in the range and leave</div><div class='add'>+ * them completely unchanged. It must do this punch atomically with respect to</div><div class='add'>+ * other extent modifications.</div><div class='add'>+ *</div><div class='add'>+ * The punch() callback may be called with a folio locked to prevent writeback</div><div class='add'>+ * extent allocation racing at the edge of the range we are currently punching.</div><div class='add'>+ * The locked folio may or may not cover the range being punched, so it is not</div><div class='add'>+ * safe for the punch() callback to lock folios itself.</div><div class='add'>+ *</div><div class='add'>+ * Lock order is:</div><div class='add'>+ *</div><div class='add'>+ * inode-&gt;i_rwsem (shared or exclusive)</div><div class='add'>+ *   inode-&gt;i_mapping-&gt;invalidate_lock (exclusive)</div><div class='add'>+ *     folio_lock()</div><div class='add'>+ *       -&gt;punch</div><div class='add'>+ *         internal filesystem allocation lock</div><div class='add'>+ *</div><div class='ctx'>  * As we are scanning the page cache for data, we don't need to reimplement the</div><div class='ctx'>  * wheel - mapping_seek_hole_data() does exactly what we need to identify the</div><div class='ctx'>  * start and end of data ranges correctly even for sub-folio block sizes. This</div><div class='hunk'>@@ -1137,20 +1351,21 @@ static int iomap_write_delalloc_scan(struct inode *inode,</div><div class='ctx'>  * require sprinkling this code with magic "+ 1" and "- 1" arithmetic and expose</div><div class='ctx'>  * the code to subtle off-by-one bugs....</div><div class='ctx'>  */</div><div class='del'>-static int iomap_write_delalloc_release(struct inode *inode,</div><div class='del'>-		loff_t start_byte, loff_t end_byte, iomap_punch_t punch)</div><div class='add'>+void iomap_write_delalloc_release(struct inode *inode, loff_t start_byte,</div><div class='add'>+		loff_t end_byte, unsigned flags, struct iomap *iomap,</div><div class='add'>+		iomap_punch_t punch)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t punch_start_byte = start_byte;</div><div class='ctx'> 	loff_t scan_end_byte = min(i_size_read(inode), end_byte);</div><div class='del'>-	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Lock the mapping to avoid races with page faults re-instantiating</div><div class='del'>-	 * folios and dirtying them via -&gt;page_mkwrite whilst we walk the</div><div class='del'>-	 * cache and perform delalloc extent removal. Failing to do this can</div><div class='del'>-	 * leave dirty pages with no space reservation in the cache.</div><div class='add'>+	 * The caller must hold invalidate_lock to avoid races with page faults</div><div class='add'>+	 * re-instantiating folios and dirtying them via -&gt;page_mkwrite whilst</div><div class='add'>+	 * we walk the cache and perform delalloc extent removal.  Failing to do</div><div class='add'>+	 * this can leave dirty pages with no space reservation in the cache.</div><div class='ctx'> 	 */</div><div class='del'>-	filemap_invalidate_lock(inode-&gt;i_mapping);</div><div class='add'>+	lockdep_assert_held_write(&amp;inode-&gt;i_mapping-&gt;invalidate_lock);</div><div class='add'>+</div><div class='ctx'> 	while (start_byte &lt; scan_end_byte) {</div><div class='ctx'> 		loff_t		data_end;</div><div class='ctx'> </div><div class='hunk'>@@ -1159,13 +1374,15 @@ static int iomap_write_delalloc_release(struct inode *inode,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If there is no more data to scan, all that is left is to</div><div class='ctx'> 		 * punch out the remaining range.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that mapping_seek_hole_data is only supposed to return</div><div class='add'>+		 * either an offset or -ENXIO, so WARN on any other error as</div><div class='add'>+		 * that would be an API change without updating the callers.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (start_byte == -ENXIO || start_byte == scan_end_byte)</div><div class='ctx'> 			break;</div><div class='del'>-		if (start_byte &lt; 0) {</div><div class='del'>-			error = start_byte;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (WARN_ON_ONCE(start_byte &lt; 0))</div><div class='add'>+			return;</div><div class='ctx'> 		WARN_ON_ONCE(start_byte &lt; punch_start_byte);</div><div class='ctx'> 		WARN_ON_ONCE(start_byte &gt; scan_end_byte);</div><div class='ctx'> </div><div class='hunk'>@@ -1175,225 +1392,233 @@ static int iomap_write_delalloc_release(struct inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> 		data_end = mapping_seek_hole_data(inode-&gt;i_mapping, start_byte,</div><div class='ctx'> 				scan_end_byte, SEEK_HOLE);</div><div class='del'>-		if (data_end &lt; 0) {</div><div class='del'>-			error = data_end;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-		WARN_ON_ONCE(data_end &lt;= start_byte);</div><div class='add'>+		if (WARN_ON_ONCE(data_end &lt; 0))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we race with post-direct I/O invalidation of the page cache,</div><div class='add'>+		 * there might be no data left at start_byte.</div><div class='add'>+		 */</div><div class='add'>+		if (data_end == start_byte)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(data_end &lt; start_byte);</div><div class='ctx'> 		WARN_ON_ONCE(data_end &gt; scan_end_byte);</div><div class='ctx'> </div><div class='del'>-		error = iomap_write_delalloc_scan(inode, &amp;punch_start_byte,</div><div class='del'>-				start_byte, data_end, punch);</div><div class='del'>-		if (error)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+		iomap_write_delalloc_scan(inode, &amp;punch_start_byte, start_byte,</div><div class='add'>+				data_end, iomap, punch);</div><div class='ctx'> </div><div class='ctx'> 		/* The next data search starts at the end of this one. */</div><div class='ctx'> 		start_byte = data_end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (punch_start_byte &lt; end_byte)</div><div class='del'>-		error = punch(inode, punch_start_byte,</div><div class='del'>-				end_byte - punch_start_byte);</div><div class='del'>-out_unlock:</div><div class='del'>-	filemap_invalidate_unlock(inode-&gt;i_mapping);</div><div class='del'>-	return error;</div><div class='add'>+		punch(inode, punch_start_byte, end_byte - punch_start_byte,</div><div class='add'>+				iomap);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_write_delalloc_release);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * When a short write occurs, the filesystem may need to remove reserved space</div><div class='del'>- * that was allocated in -&gt;iomap_begin from it's -&gt;iomap_end method. For</div><div class='del'>- * filesystems that use delayed allocation, we need to punch out delalloc</div><div class='del'>- * extents from the range that are not dirty in the page cache. As the write can</div><div class='del'>- * race with page faults, there can be dirty pages over the delalloc extent</div><div class='del'>- * outside the range of a short write but still within the delalloc extent</div><div class='del'>- * allocated for this iomap.</div><div class='del'>- *</div><div class='del'>- * This function uses [start_byte, end_byte) intervals (i.e. open ended) to</div><div class='del'>- * simplify range iterations.</div><div class='del'>- *</div><div class='del'>- * The punch() callback *must* only punch delalloc extents in the range passed</div><div class='del'>- * to it. It must skip over all other types of extents in the range and leave</div><div class='del'>- * them completely unchanged. It must do this punch atomically with respect to</div><div class='del'>- * other extent modifications.</div><div class='del'>- *</div><div class='del'>- * The punch() callback may be called with a folio locked to prevent writeback</div><div class='del'>- * extent allocation racing at the edge of the range we are currently punching.</div><div class='del'>- * The locked folio may or may not cover the range being punched, so it is not</div><div class='del'>- * safe for the punch() callback to lock folios itself.</div><div class='del'>- *</div><div class='del'>- * Lock order is:</div><div class='del'>- *</div><div class='del'>- * inode-&gt;i_rwsem (shared or exclusive)</div><div class='del'>- *   inode-&gt;i_mapping-&gt;invalidate_lock (exclusive)</div><div class='del'>- *     folio_lock()</div><div class='del'>- *       -&gt;punch</div><div class='del'>- *         internal filesystem allocation lock</div><div class='del'>- */</div><div class='del'>-int iomap_file_buffered_write_punch_delalloc(struct inode *inode,</div><div class='del'>-		struct iomap *iomap, loff_t pos, loff_t length,</div><div class='del'>-		ssize_t written, iomap_punch_t punch)</div><div class='del'>-{</div><div class='del'>-	loff_t			start_byte;</div><div class='del'>-	loff_t			end_byte;</div><div class='del'>-	unsigned int		blocksize = i_blocksize(inode);</div><div class='del'>-</div><div class='del'>-	if (iomap-&gt;type != IOMAP_DELALLOC)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* If we didn't reserve the blocks, we're not allowed to punch them. */</div><div class='del'>-	if (!(iomap-&gt;flags &amp; IOMAP_F_NEW))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * start_byte refers to the first unused block after a short write. If</div><div class='del'>-	 * nothing was written, round offset down to point at the first block in</div><div class='del'>-	 * the range.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!written))</div><div class='del'>-		start_byte = round_down(pos, blocksize);</div><div class='del'>-	else</div><div class='del'>-		start_byte = round_up(pos + written, blocksize);</div><div class='del'>-	end_byte = round_up(pos + length, blocksize);</div><div class='del'>-</div><div class='del'>-	/* Nothing to do if we've written the entire delalloc extent */</div><div class='del'>-	if (start_byte &gt;= end_byte)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return iomap_write_delalloc_release(inode, start_byte, end_byte,</div><div class='del'>-					punch);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(iomap_file_buffered_write_punch_delalloc);</div><div class='del'>-</div><div class='del'>-static loff_t iomap_unshare_iter(struct iomap_iter *iter)</div><div class='add'>+static int iomap_unshare_iter(struct iomap_iter *iter,</div><div class='add'>+		const struct iomap_write_ops *write_ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='del'>-	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='del'>-	loff_t pos = iter-&gt;pos;</div><div class='del'>-	loff_t length = iomap_length(iter);</div><div class='del'>-	loff_t written = 0;</div><div class='add'>+	u64 bytes = iomap_length(iter);</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='del'>-	/* don't bother with blocks that are not shared to start with */</div><div class='del'>-	if (!(iomap-&gt;flags &amp; IOMAP_F_SHARED))</div><div class='del'>-		return length;</div><div class='del'>-	/* don't bother with holes or unwritten extents */</div><div class='del'>-	if (srcmap-&gt;type == IOMAP_HOLE || srcmap-&gt;type == IOMAP_UNWRITTEN)</div><div class='del'>-		return length;</div><div class='add'>+	if (!iomap_want_unshare_iter(iter))</div><div class='add'>+		return iomap_iter_advance(iter, bytes);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct folio *folio;</div><div class='del'>-		int status;</div><div class='ctx'> 		size_t offset;</div><div class='del'>-		size_t bytes = min_t(u64, SIZE_MAX, length);</div><div class='add'>+		bool ret;</div><div class='ctx'> </div><div class='del'>-		status = iomap_write_begin(iter, pos, bytes, &amp;folio);</div><div class='add'>+		bytes = min_t(u64, SIZE_MAX, bytes);</div><div class='add'>+		status = iomap_write_begin(iter, write_ops, &amp;folio, &amp;offset,</div><div class='add'>+				&amp;bytes);</div><div class='ctx'> 		if (unlikely(status))</div><div class='ctx'> 			return status;</div><div class='ctx'> 		if (iomap-&gt;flags &amp; IOMAP_F_STALE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		offset = offset_in_folio(folio, pos);</div><div class='del'>-		if (bytes &gt; folio_size(folio) - offset)</div><div class='del'>-			bytes = folio_size(folio) - offset;</div><div class='del'>-</div><div class='del'>-		bytes = iomap_write_end(iter, pos, bytes, bytes, folio);</div><div class='del'>-		if (WARN_ON_ONCE(bytes == 0))</div><div class='add'>+		ret = iomap_write_end(iter, bytes, bytes, folio);</div><div class='add'>+		__iomap_put_folio(iter, write_ops, bytes, folio);</div><div class='add'>+		if (WARN_ON_ONCE(!ret))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='ctx'> 		cond_resched();</div><div class='ctx'> </div><div class='del'>-		pos += bytes;</div><div class='del'>-		written += bytes;</div><div class='del'>-		length -= bytes;</div><div class='del'>-</div><div class='ctx'> 		balance_dirty_pages_ratelimited(iter-&gt;inode-&gt;i_mapping);</div><div class='del'>-	} while (length &gt; 0);</div><div class='ctx'> </div><div class='del'>-	return written;</div><div class='add'>+		status = iomap_iter_advance(iter, bytes);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+	} while ((bytes = iomap_length(iter)) &gt; 0);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,</div><div class='del'>-		const struct iomap_ops *ops)</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode		= inode,</div><div class='ctx'> 		.pos		= pos,</div><div class='del'>-		.len		= len,</div><div class='ctx'> 		.flags		= IOMAP_WRITE | IOMAP_UNSHARE,</div><div class='ctx'> 	};</div><div class='add'>+	loff_t size = i_size_read(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (pos &lt; 0 || pos &gt;= size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iter.len = min(len, size - pos);</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_unshare_iter(&amp;iter);</div><div class='add'>+		iter.status = iomap_unshare_iter(&amp;iter, write_ops);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_file_unshare);</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_zero_iter(struct iomap_iter *iter, bool *did_zero)</div><div class='add'>+/*</div><div class='add'>+ * Flush the remaining range of the iter and mark the current mapping stale.</div><div class='add'>+ * This is used when zero range sees an unwritten mapping that may have had</div><div class='add'>+ * dirty pagecache over it.</div><div class='add'>+ */</div><div class='add'>+static inline int iomap_zero_iter_flush_and_stale(struct iomap_iter *i)</div><div class='ctx'> {</div><div class='del'>-	const struct iomap *srcmap = iomap_iter_srcmap(iter);</div><div class='del'>-	loff_t pos = iter-&gt;pos;</div><div class='del'>-	loff_t length = iomap_length(iter);</div><div class='del'>-	loff_t written = 0;</div><div class='add'>+	struct address_space *mapping = i-&gt;inode-&gt;i_mapping;</div><div class='add'>+	loff_t end = i-&gt;pos + i-&gt;len - 1;</div><div class='ctx'> </div><div class='del'>-	/* already zeroed?  we're done. */</div><div class='del'>-	if (srcmap-&gt;type == IOMAP_HOLE || srcmap-&gt;type == IOMAP_UNWRITTEN)</div><div class='del'>-		return length;</div><div class='add'>+	i-&gt;iomap.flags |= IOMAP_F_STALE;</div><div class='add'>+	return filemap_write_and_wait_range(mapping, i-&gt;pos, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_zero_iter(struct iomap_iter *iter, bool *did_zero,</div><div class='add'>+		const struct iomap_write_ops *write_ops)</div><div class='add'>+{</div><div class='add'>+	u64 bytes = iomap_length(iter);</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct folio *folio;</div><div class='del'>-		int status;</div><div class='ctx'> 		size_t offset;</div><div class='del'>-		size_t bytes = min_t(u64, SIZE_MAX, length);</div><div class='add'>+		bool ret;</div><div class='ctx'> </div><div class='del'>-		status = iomap_write_begin(iter, pos, bytes, &amp;folio);</div><div class='add'>+		bytes = min_t(u64, SIZE_MAX, bytes);</div><div class='add'>+		status = iomap_write_begin(iter, write_ops, &amp;folio, &amp;offset,</div><div class='add'>+				&amp;bytes);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			return status;</div><div class='ctx'> 		if (iter-&gt;iomap.flags &amp; IOMAP_F_STALE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		offset = offset_in_folio(folio, pos);</div><div class='del'>-		if (bytes &gt; folio_size(folio) - offset)</div><div class='del'>-			bytes = folio_size(folio) - offset;</div><div class='add'>+		/* a NULL folio means we're done with a folio batch */</div><div class='add'>+		if (!folio) {</div><div class='add'>+			status = iomap_iter_advance_full(iter);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* warn about zeroing folios beyond eof that won't write back */</div><div class='add'>+		WARN_ON_ONCE(folio_pos(folio) &gt; iter-&gt;inode-&gt;i_size);</div><div class='add'>+</div><div class='add'>+		trace_iomap_zero_iter(iter-&gt;inode, folio_pos(folio) + offset,</div><div class='add'>+				bytes);</div><div class='ctx'> </div><div class='ctx'> 		folio_zero_range(folio, offset, bytes);</div><div class='ctx'> 		folio_mark_accessed(folio);</div><div class='ctx'> </div><div class='del'>-		bytes = iomap_write_end(iter, pos, bytes, bytes, folio);</div><div class='del'>-		if (WARN_ON_ONCE(bytes == 0))</div><div class='add'>+		ret = iomap_write_end(iter, bytes, bytes, folio);</div><div class='add'>+		__iomap_put_folio(iter, write_ops, bytes, folio);</div><div class='add'>+		if (WARN_ON_ONCE(!ret))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='del'>-		pos += bytes;</div><div class='del'>-		length -= bytes;</div><div class='del'>-		written += bytes;</div><div class='del'>-	} while (length &gt; 0);</div><div class='add'>+		status = iomap_iter_advance(iter, bytes);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+	} while ((bytes = iomap_length(iter)) &gt; 0);</div><div class='ctx'> </div><div class='ctx'> 	if (did_zero)</div><div class='ctx'> 		*did_zero = true;</div><div class='del'>-	return written;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+loff_t</div><div class='add'>+iomap_fill_dirty_folios(</div><div class='add'>+	struct iomap_iter	*iter,</div><div class='add'>+	loff_t			offset,</div><div class='add'>+	loff_t			length)</div><div class='add'>+{</div><div class='add'>+	struct address_space	*mapping = iter-&gt;inode-&gt;i_mapping;</div><div class='add'>+	pgoff_t			start = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgoff_t			end = (offset + length - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	iter-&gt;fbatch = kmalloc(sizeof(struct folio_batch), GFP_KERNEL);</div><div class='add'>+	if (!iter-&gt;fbatch)</div><div class='add'>+		return offset + length;</div><div class='add'>+	folio_batch_init(iter-&gt;fbatch);</div><div class='add'>+</div><div class='add'>+	filemap_get_folios_dirty(mapping, &amp;start, end, iter-&gt;fbatch);</div><div class='add'>+	return (start &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_fill_dirty_folios);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero,</div><div class='del'>-		const struct iomap_ops *ops)</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops, void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode		= inode,</div><div class='ctx'> 		.pos		= pos,</div><div class='ctx'> 		.len		= len,</div><div class='ctx'> 		.flags		= IOMAP_ZERO,</div><div class='add'>+		.private	= private,</div><div class='ctx'> 	};</div><div class='add'>+	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool range_dirty;</div><div class='ctx'> </div><div class='del'>-	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_zero_iter(&amp;iter, did_zero);</div><div class='add'>+	/*</div><div class='add'>+	 * To avoid an unconditional flush, check pagecache state and only flush</div><div class='add'>+	 * if dirty and the fs returns a mapping that might convert on</div><div class='add'>+	 * writeback.</div><div class='add'>+	 */</div><div class='add'>+	range_dirty = filemap_range_needs_writeback(mapping, iter.pos,</div><div class='add'>+					iter.pos + iter.len - 1);</div><div class='add'>+	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0) {</div><div class='add'>+		const struct iomap *srcmap = iomap_iter_srcmap(&amp;iter);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(iter.fbatch &amp;&amp;</div><div class='add'>+				 srcmap-&gt;type != IOMAP_UNWRITTEN))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		if (!iter.fbatch &amp;&amp;</div><div class='add'>+		    (srcmap-&gt;type == IOMAP_HOLE ||</div><div class='add'>+		     srcmap-&gt;type == IOMAP_UNWRITTEN)) {</div><div class='add'>+			s64 status;</div><div class='add'>+</div><div class='add'>+			if (range_dirty) {</div><div class='add'>+				range_dirty = false;</div><div class='add'>+				status = iomap_zero_iter_flush_and_stale(&amp;iter);</div><div class='add'>+			} else {</div><div class='add'>+				status = iomap_iter_advance_full(&amp;iter);</div><div class='add'>+			}</div><div class='add'>+			iter.status = status;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iter.status = iomap_zero_iter(&amp;iter, did_zero, write_ops);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_zero_range);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,</div><div class='del'>-		const struct iomap_ops *ops)</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops, void *private)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int blocksize = i_blocksize(inode);</div><div class='ctx'> 	unsigned int off = pos &amp; (blocksize - 1);</div><div class='hunk'>@@ -1401,11 +1626,12 @@ iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,</div><div class='ctx'> 	/* Block boundary? Nothing to do */</div><div class='ctx'> 	if (!off)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops);</div><div class='add'>+	return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops,</div><div class='add'>+			write_ops, private);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_truncate_page);</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter,</div><div class='add'>+static int iomap_folio_mkwrite_iter(struct iomap_iter *iter,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t length = iomap_length(iter);</div><div class='hunk'>@@ -1416,20 +1642,22 @@ static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter,</div><div class='ctx'> 					      &amp;iter-&gt;iomap);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		block_commit_write(&amp;folio-&gt;page, 0, length);</div><div class='add'>+		block_commit_write(folio, 0, length);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON_ONCE(!folio_test_uptodate(folio));</div><div class='ctx'> 		folio_mark_dirty(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return length;</div><div class='add'>+	return iomap_iter_advance(iter, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)</div><div class='add'>+vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,</div><div class='add'>+		void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_iter iter = {</div><div class='ctx'> 		.inode		= file_inode(vmf-&gt;vma-&gt;vm_file),</div><div class='ctx'> 		.flags		= IOMAP_WRITE | IOMAP_FAULT,</div><div class='add'>+		.private	= private,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='ctx'> 	ssize_t ret;</div><div class='hunk'>@@ -1441,7 +1669,7 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)</div><div class='ctx'> 	iter.pos = folio_pos(folio);</div><div class='ctx'> 	iter.len = ret;</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_folio_mkwrite_iter(&amp;iter, folio);</div><div class='add'>+		iter.status = iomap_folio_mkwrite_iter(&amp;iter, folio);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -1453,397 +1681,173 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_page_mkwrite);</div><div class='ctx'> </div><div class='del'>-static void iomap_finish_folio_write(struct inode *inode, struct folio *folio,</div><div class='del'>-		size_t len, int error)</div><div class='add'>+static void iomap_writeback_init(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (error) {</div><div class='del'>-		folio_set_error(folio);</div><div class='del'>-		mapping_set_error(inode-&gt;i_mapping, error);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	WARN_ON_ONCE(i_blocks_per_folio(inode, folio) &gt; 1 &amp;&amp; !ifs);</div><div class='del'>-	WARN_ON_ONCE(ifs &amp;&amp; atomic_read(&amp;ifs-&gt;write_bytes_pending) &lt;= 0);</div><div class='del'>-</div><div class='del'>-	if (!ifs || atomic_sub_and_test(len, &amp;ifs-&gt;write_bytes_pending))</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We're now finished for good with this ioend structure.  Update the page</div><div class='del'>- * state, release holds on bios, and finally free up memory.  Do not use the</div><div class='del'>- * ioend after this.</div><div class='del'>- */</div><div class='del'>-static u32</div><div class='del'>-iomap_finish_ioend(struct iomap_ioend *ioend, int error)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = ioend-&gt;io_inode;</div><div class='del'>-	struct bio *bio = &amp;ioend-&gt;io_inline_bio;</div><div class='del'>-	struct bio *last = ioend-&gt;io_bio, *next;</div><div class='del'>-	u64 start = bio-&gt;bi_iter.bi_sector;</div><div class='del'>-	loff_t offset = ioend-&gt;io_offset;</div><div class='del'>-	bool quiet = bio_flagged(bio, BIO_QUIET);</div><div class='del'>-	u32 folio_count = 0;</div><div class='del'>-</div><div class='del'>-	for (bio = &amp;ioend-&gt;io_inline_bio; bio; bio = next) {</div><div class='del'>-		struct folio_iter fi;</div><div class='del'>-</div><div class='add'>+	if (ifs) {</div><div class='add'>+		WARN_ON_ONCE(atomic_read(&amp;ifs-&gt;write_bytes_pending) != 0);</div><div class='ctx'> 		/*</div><div class='del'>-		 * For the last bio, bi_private points to the ioend, so we</div><div class='del'>-		 * need to explicitly end the iteration here.</div><div class='add'>+		 * Set this to the folio size. After processing the folio for</div><div class='add'>+		 * writeback in iomap_writeback_folio(), we'll subtract any</div><div class='add'>+		 * ranges not written back.</div><div class='add'>+		 *</div><div class='add'>+		 * We do this because otherwise, we would have to atomically</div><div class='add'>+		 * increment ifs-&gt;write_bytes_pending every time a range in the</div><div class='add'>+		 * folio needs to be written back.</div><div class='ctx'> 		 */</div><div class='del'>-		if (bio == last)</div><div class='del'>-			next = NULL;</div><div class='del'>-		else</div><div class='del'>-			next = bio-&gt;bi_private;</div><div class='del'>-</div><div class='del'>-		/* walk all folios in bio, ending page IO on them */</div><div class='del'>-		bio_for_each_folio_all(fi, bio) {</div><div class='del'>-			iomap_finish_folio_write(inode, fi.folio, fi.length,</div><div class='del'>-					error);</div><div class='del'>-			folio_count++;</div><div class='del'>-		}</div><div class='del'>-		bio_put(bio);</div><div class='del'>-	}</div><div class='del'>-	/* The ioend has been freed by bio_put() */</div><div class='del'>-</div><div class='del'>-	if (unlikely(error &amp;&amp; !quiet)) {</div><div class='del'>-		printk_ratelimited(KERN_ERR</div><div class='del'>-"%s: writeback error on inode %lu, offset %lld, sector %llu",</div><div class='del'>-			inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino, offset, start);</div><div class='del'>-	}</div><div class='del'>-	return folio_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ioend completion routine for merged bios. This can only be called from task</div><div class='del'>- * contexts as merged ioends can be of unbound length. Hence we have to break up</div><div class='del'>- * the writeback completions into manageable chunks to avoid long scheduler</div><div class='del'>- * holdoffs. We aim to keep scheduler holdoffs down below 10ms so that we get</div><div class='del'>- * good batch processing throughput without creating adverse scheduler latency</div><div class='del'>- * conditions.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iomap_finish_ioends(struct iomap_ioend *ioend, int error)</div><div class='del'>-{</div><div class='del'>-	struct list_head tmp;</div><div class='del'>-	u32 completions;</div><div class='del'>-</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	list_replace_init(&amp;ioend-&gt;io_list, &amp;tmp);</div><div class='del'>-	completions = iomap_finish_ioend(ioend, error);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;tmp)) {</div><div class='del'>-		if (completions &gt; IOEND_BATCH_SIZE * 8) {</div><div class='del'>-			cond_resched();</div><div class='del'>-			completions = 0;</div><div class='del'>-		}</div><div class='del'>-		ioend = list_first_entry(&amp;tmp, struct iomap_ioend, io_list);</div><div class='del'>-		list_del_init(&amp;ioend-&gt;io_list);</div><div class='del'>-		completions += iomap_finish_ioend(ioend, error);</div><div class='add'>+		atomic_set(&amp;ifs-&gt;write_bytes_pending, folio_size(folio));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(iomap_finish_ioends);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We can merge two adjacent ioends if they have the same set of work to do.</div><div class='del'>- */</div><div class='del'>-static bool</div><div class='del'>-iomap_ioend_can_merge(struct iomap_ioend *ioend, struct iomap_ioend *next)</div><div class='del'>-{</div><div class='del'>-	if (ioend-&gt;io_bio-&gt;bi_status != next-&gt;io_bio-&gt;bi_status)</div><div class='del'>-		return false;</div><div class='del'>-	if ((ioend-&gt;io_flags &amp; IOMAP_F_SHARED) ^</div><div class='del'>-	    (next-&gt;io_flags &amp; IOMAP_F_SHARED))</div><div class='del'>-		return false;</div><div class='del'>-	if ((ioend-&gt;io_type == IOMAP_UNWRITTEN) ^</div><div class='del'>-	    (next-&gt;io_type == IOMAP_UNWRITTEN))</div><div class='del'>-		return false;</div><div class='del'>-	if (ioend-&gt;io_offset + ioend-&gt;io_size != next-&gt;io_offset)</div><div class='del'>-		return false;</div><div class='del'>-	/*</div><div class='del'>-	 * Do not merge physically discontiguous ioends. The filesystem</div><div class='del'>-	 * completion functions will have to iterate the physical</div><div class='del'>-	 * discontiguities even if we merge the ioends at a logical level, so</div><div class='del'>-	 * we don't gain anything by merging physical discontiguities here.</div><div class='del'>-	 *</div><div class='del'>-	 * We cannot use bio-&gt;bi_iter.bi_sector here as it is modified during</div><div class='del'>-	 * submission so does not point to the start sector of the bio at</div><div class='del'>-	 * completion.</div><div class='del'>-	 */</div><div class='del'>-	if (ioend-&gt;io_sector + (ioend-&gt;io_size &gt;&gt; 9) != next-&gt;io_sector)</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-iomap_ioend_try_merge(struct iomap_ioend *ioend, struct list_head *more_ioends)</div><div class='del'>-{</div><div class='del'>-	struct iomap_ioend *next;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;ioend-&gt;io_list);</div><div class='del'>-</div><div class='del'>-	while ((next = list_first_entry_or_null(more_ioends, struct iomap_ioend,</div><div class='del'>-			io_list))) {</div><div class='del'>-		if (!iomap_ioend_can_merge(ioend, next))</div><div class='del'>-			break;</div><div class='del'>-		list_move_tail(&amp;next-&gt;io_list, &amp;ioend-&gt;io_list);</div><div class='del'>-		ioend-&gt;io_size += next-&gt;io_size;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(iomap_ioend_try_merge);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iomap_ioend_compare(void *priv, const struct list_head *a,</div><div class='del'>-		const struct list_head *b)</div><div class='add'>+void iomap_finish_folio_write(struct inode *inode, struct folio *folio,</div><div class='add'>+		size_t len)</div><div class='ctx'> {</div><div class='del'>-	struct iomap_ioend *ia = container_of(a, struct iomap_ioend, io_list);</div><div class='del'>-	struct iomap_ioend *ib = container_of(b, struct iomap_ioend, io_list);</div><div class='add'>+	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (ia-&gt;io_offset &lt; ib-&gt;io_offset)</div><div class='del'>-		return -1;</div><div class='del'>-	if (ia-&gt;io_offset &gt; ib-&gt;io_offset)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	WARN_ON_ONCE(i_blocks_per_folio(inode, folio) &gt; 1 &amp;&amp; !ifs);</div><div class='add'>+	WARN_ON_ONCE(ifs &amp;&amp; atomic_read(&amp;ifs-&gt;write_bytes_pending) &lt;= 0);</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-iomap_sort_ioends(struct list_head *ioend_list)</div><div class='del'>-{</div><div class='del'>-	list_sort(NULL, ioend_list, iomap_ioend_compare);</div><div class='add'>+	if (!ifs || atomic_sub_and_test(len, &amp;ifs-&gt;write_bytes_pending))</div><div class='add'>+		folio_end_writeback(folio);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(iomap_sort_ioends);</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_finish_folio_write);</div><div class='ctx'> </div><div class='del'>-static void iomap_writepage_end_bio(struct bio *bio)</div><div class='add'>+static int iomap_writeback_range(struct iomap_writepage_ctx *wpc,</div><div class='add'>+		struct folio *folio, u64 pos, u32 rlen, u64 end_pos,</div><div class='add'>+		size_t *bytes_submitted)</div><div class='ctx'> {</div><div class='del'>-	struct iomap_ioend *ioend = bio-&gt;bi_private;</div><div class='del'>-</div><div class='del'>-	iomap_finish_ioend(ioend, blk_status_to_errno(bio-&gt;bi_status));</div><div class='del'>-}</div><div class='add'>+	do {</div><div class='add'>+		ssize_t ret;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Submit the final bio for an ioend.</div><div class='del'>- *</div><div class='del'>- * If @error is non-zero, it means that we have a situation where some part of</div><div class='del'>- * the submission process has failed after we've marked pages for writeback</div><div class='del'>- * and unlocked them.  In this situation, we need to fail the bio instead of</div><div class='del'>- * submitting it.  This typically only happens on a filesystem shutdown.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-iomap_submit_ioend(struct iomap_writepage_ctx *wpc, struct iomap_ioend *ioend,</div><div class='del'>-		int error)</div><div class='del'>-{</div><div class='del'>-	ioend-&gt;io_bio-&gt;bi_private = ioend;</div><div class='del'>-	ioend-&gt;io_bio-&gt;bi_end_io = iomap_writepage_end_bio;</div><div class='add'>+		ret = wpc-&gt;ops-&gt;writeback_range(wpc, folio, pos, rlen, end_pos);</div><div class='add'>+		if (WARN_ON_ONCE(ret == 0 || ret &gt; rlen))</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		rlen -= ret;</div><div class='add'>+		pos += ret;</div><div class='ctx'> </div><div class='del'>-	if (wpc-&gt;ops-&gt;prepare_ioend)</div><div class='del'>-		error = wpc-&gt;ops-&gt;prepare_ioend(ioend, error);</div><div class='del'>-	if (error) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * If we're failing the IO now, just mark the ioend with an</div><div class='del'>-		 * error and finish it.  This will run IO completion immediately</div><div class='del'>-		 * as there is only one reference to the ioend at this point in</div><div class='del'>-		 * time.</div><div class='add'>+		 * Holes are not written back by -&gt;writeback_range, so track</div><div class='add'>+		 * if we did handle anything that is not a hole here.</div><div class='ctx'> 		 */</div><div class='del'>-		ioend-&gt;io_bio-&gt;bi_status = errno_to_blk_status(error);</div><div class='del'>-		bio_endio(ioend-&gt;io_bio);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='add'>+		if (wpc-&gt;iomap.type != IOMAP_HOLE)</div><div class='add'>+			*bytes_submitted += ret;</div><div class='add'>+	} while (rlen);</div><div class='ctx'> </div><div class='del'>-	submit_bio(ioend-&gt;io_bio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct iomap_ioend *</div><div class='del'>-iomap_alloc_ioend(struct inode *inode, struct iomap_writepage_ctx *wpc,</div><div class='del'>-		loff_t offset, sector_t sector, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct iomap_ioend *ioend;</div><div class='del'>-	struct bio *bio;</div><div class='del'>-</div><div class='del'>-	bio = bio_alloc_bioset(wpc-&gt;iomap.bdev, BIO_MAX_VECS,</div><div class='del'>-			       REQ_OP_WRITE | wbc_to_write_flags(wbc),</div><div class='del'>-			       GFP_NOFS, &amp;iomap_ioend_bioset);</div><div class='del'>-	bio-&gt;bi_iter.bi_sector = sector;</div><div class='del'>-	wbc_init_bio(wbc, bio);</div><div class='del'>-</div><div class='del'>-	ioend = container_of(bio, struct iomap_ioend, io_inline_bio);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ioend-&gt;io_list);</div><div class='del'>-	ioend-&gt;io_type = wpc-&gt;iomap.type;</div><div class='del'>-	ioend-&gt;io_flags = wpc-&gt;iomap.flags;</div><div class='del'>-	ioend-&gt;io_inode = inode;</div><div class='del'>-	ioend-&gt;io_size = 0;</div><div class='del'>-	ioend-&gt;io_folios = 0;</div><div class='del'>-	ioend-&gt;io_offset = offset;</div><div class='del'>-	ioend-&gt;io_bio = bio;</div><div class='del'>-	ioend-&gt;io_sector = sector;</div><div class='del'>-	return ioend;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Allocate a new bio, and chain the old bio to the new one.</div><div class='add'>+ * Check interaction of the folio with the file end.</div><div class='ctx'>  *</div><div class='del'>- * Note that we have to perform the chaining in this unintuitive order</div><div class='del'>- * so that the bi_private linkage is set up in the right direction for the</div><div class='del'>- * traversal in iomap_finish_ioend().</div><div class='add'>+ * If the folio is entirely beyond i_size, return false.  If it straddles</div><div class='add'>+ * i_size, adjust end_pos and zero all data beyond i_size.</div><div class='ctx'>  */</div><div class='del'>-static struct bio *</div><div class='del'>-iomap_chain_bio(struct bio *prev)</div><div class='add'>+static bool iomap_writeback_handle_eof(struct folio *folio, struct inode *inode,</div><div class='add'>+		u64 *end_pos)</div><div class='ctx'> {</div><div class='del'>-	struct bio *new;</div><div class='del'>-</div><div class='del'>-	new = bio_alloc(prev-&gt;bi_bdev, BIO_MAX_VECS, prev-&gt;bi_opf, GFP_NOFS);</div><div class='del'>-	bio_clone_blkg_association(new, prev);</div><div class='del'>-	new-&gt;bi_iter.bi_sector = bio_end_sector(prev);</div><div class='add'>+	u64 isize = i_size_read(inode);</div><div class='ctx'> </div><div class='del'>-	bio_chain(prev, new);</div><div class='del'>-	bio_get(prev);		/* for iomap_finish_ioend */</div><div class='del'>-	submit_bio(prev);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t offset,</div><div class='del'>-		sector_t sector)</div><div class='del'>-{</div><div class='del'>-	if ((wpc-&gt;iomap.flags &amp; IOMAP_F_SHARED) !=</div><div class='del'>-	    (wpc-&gt;ioend-&gt;io_flags &amp; IOMAP_F_SHARED))</div><div class='del'>-		return false;</div><div class='del'>-	if (wpc-&gt;iomap.type != wpc-&gt;ioend-&gt;io_type)</div><div class='del'>-		return false;</div><div class='del'>-	if (offset != wpc-&gt;ioend-&gt;io_offset + wpc-&gt;ioend-&gt;io_size)</div><div class='del'>-		return false;</div><div class='del'>-	if (sector != bio_end_sector(wpc-&gt;ioend-&gt;io_bio))</div><div class='del'>-		return false;</div><div class='del'>-	/*</div><div class='del'>-	 * Limit ioend bio chain lengths to minimise IO completion latency. This</div><div class='del'>-	 * also prevents long tight loops ending page writeback on all the</div><div class='del'>-	 * folios in the ioend.</div><div class='del'>-	 */</div><div class='del'>-	if (wpc-&gt;ioend-&gt;io_folios &gt;= IOEND_BATCH_SIZE)</div><div class='del'>-		return false;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='add'>+	if (*end_pos &gt; isize) {</div><div class='add'>+		size_t poff = offset_in_folio(folio, isize);</div><div class='add'>+		pgoff_t end_index = isize &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Test to see if we have an existing ioend structure that we could append to</div><div class='del'>- * first; otherwise finish off the current ioend and start another.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio,</div><div class='del'>-		struct iomap_folio_state *ifs, struct iomap_writepage_ctx *wpc,</div><div class='del'>-		struct writeback_control *wbc, struct list_head *iolist)</div><div class='del'>-{</div><div class='del'>-	sector_t sector = iomap_sector(&amp;wpc-&gt;iomap, pos);</div><div class='del'>-	unsigned len = i_blocksize(inode);</div><div class='del'>-	size_t poff = offset_in_folio(folio, pos);</div><div class='del'>-</div><div class='del'>-	if (!wpc-&gt;ioend || !iomap_can_add_to_ioend(wpc, pos, sector)) {</div><div class='del'>-		if (wpc-&gt;ioend)</div><div class='del'>-			list_add(&amp;wpc-&gt;ioend-&gt;io_list, iolist);</div><div class='del'>-		wpc-&gt;ioend = iomap_alloc_ioend(inode, wpc, pos, sector, wbc);</div><div class='del'>-	}</div><div class='add'>+		/*</div><div class='add'>+		 * If the folio is entirely ouside of i_size, skip it.</div><div class='add'>+		 *</div><div class='add'>+		 * This can happen due to a truncate operation that is in</div><div class='add'>+		 * progress and in that case truncate will finish it off once</div><div class='add'>+		 * we've dropped the folio lock.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that the pgoff_t used for end_index is an unsigned long.</div><div class='add'>+		 * If the given offset is greater than 16TB on a 32-bit system,</div><div class='add'>+		 * then if we checked if the folio is fully outside i_size with</div><div class='add'>+		 * "if (folio-&gt;index &gt;= end_index + 1)", "end_index + 1" would</div><div class='add'>+		 * overflow and evaluate to 0.  Hence this folio would be</div><div class='add'>+		 * redirtied and written out repeatedly, which would result in</div><div class='add'>+		 * an infinite loop; the user program performing this operation</div><div class='add'>+		 * would hang.  Instead, we can detect this situation by</div><div class='add'>+		 * checking if the folio is totally beyond i_size or if its</div><div class='add'>+		 * offset is just equal to the EOF.</div><div class='add'>+		 */</div><div class='add'>+		if (folio-&gt;index &gt; end_index ||</div><div class='add'>+		    (folio-&gt;index == end_index &amp;&amp; poff == 0))</div><div class='add'>+			return false;</div><div class='ctx'> </div><div class='del'>-	if (!bio_add_folio(wpc-&gt;ioend-&gt;io_bio, folio, len, poff)) {</div><div class='del'>-		wpc-&gt;ioend-&gt;io_bio = iomap_chain_bio(wpc-&gt;ioend-&gt;io_bio);</div><div class='del'>-		bio_add_folio_nofail(wpc-&gt;ioend-&gt;io_bio, folio, len, poff);</div><div class='add'>+		/*</div><div class='add'>+		 * The folio straddles i_size.</div><div class='add'>+		 *</div><div class='add'>+		 * It must be zeroed out on each and every writepage invocation</div><div class='add'>+		 * because it may be mmapped:</div><div class='add'>+		 *</div><div class='add'>+		 *    A file is mapped in multiples of the page size.  For a</div><div class='add'>+		 *    file that is not a multiple of the page size, the</div><div class='add'>+		 *    remaining memory is zeroed when mapped, and writes to that</div><div class='add'>+		 *    region are not written out to the file.</div><div class='add'>+		 *</div><div class='add'>+		 * Also adjust the end_pos to the end of file and skip writeback</div><div class='add'>+		 * for all blocks entirely beyond i_size.</div><div class='add'>+		 */</div><div class='add'>+		folio_zero_segment(folio, poff, folio_size(folio));</div><div class='add'>+		*end_pos = isize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ifs)</div><div class='del'>-		atomic_add(len, &amp;ifs-&gt;write_bytes_pending);</div><div class='del'>-	wpc-&gt;ioend-&gt;io_size += len;</div><div class='del'>-	wbc_account_cgroup_owner(wbc, &amp;folio-&gt;page, len);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We implement an immediate ioend submission policy here to avoid needing to</div><div class='del'>- * chain multiple ioends and hence nest mempool allocations which can violate</div><div class='del'>- * the forward progress guarantees we need to provide. The current ioend we're</div><div class='del'>- * adding blocks to is cached in the writepage context, and if the new block</div><div class='del'>- * doesn't append to the cached ioend, it will create a new ioend and cache that</div><div class='del'>- * instead.</div><div class='del'>- *</div><div class='del'>- * If a new ioend is created and cached, the old ioend is returned and queued</div><div class='del'>- * locally for submission once the entire page is processed or an error has been</div><div class='del'>- * detected.  While ioends are submitted immediately after they are completed,</div><div class='del'>- * batching optimisations are provided by higher level block plugging.</div><div class='del'>- *</div><div class='del'>- * At the end of a writeback pass, there will be a cached ioend remaining on the</div><div class='del'>- * writepage context that the caller will need to submit.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-iomap_writepage_map(struct iomap_writepage_ctx *wpc,</div><div class='del'>-		struct writeback_control *wbc, struct inode *inode,</div><div class='del'>-		struct folio *folio, u64 end_pos)</div><div class='add'>+int iomap_writeback_folio(struct iomap_writepage_ctx *wpc, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_folio_state *ifs = folio-&gt;private;</div><div class='del'>-	struct iomap_ioend *ioend, *next;</div><div class='del'>-	unsigned len = i_blocksize(inode);</div><div class='del'>-	unsigned nblocks = i_blocks_per_folio(inode, folio);</div><div class='add'>+	struct inode *inode = wpc-&gt;inode;</div><div class='ctx'> 	u64 pos = folio_pos(folio);</div><div class='del'>-	int error = 0, count = 0, i;</div><div class='del'>-	LIST_HEAD(submit_list);</div><div class='add'>+	u64 end_pos = pos + folio_size(folio);</div><div class='add'>+	u64 end_aligned = 0;</div><div class='add'>+	size_t bytes_submitted = 0;</div><div class='add'>+	int error = 0;</div><div class='add'>+	u32 rlen;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!folio_test_locked(folio));</div><div class='add'>+	WARN_ON_ONCE(folio_test_dirty(folio));</div><div class='add'>+	WARN_ON_ONCE(folio_test_writeback(folio));</div><div class='ctx'> </div><div class='add'>+	trace_iomap_writeback_folio(inode, pos, folio_size(folio));</div><div class='add'>+</div><div class='add'>+	if (!iomap_writeback_handle_eof(folio, inode, &amp;end_pos))</div><div class='add'>+		return 0;</div><div class='ctx'> 	WARN_ON_ONCE(end_pos &lt;= pos);</div><div class='ctx'> </div><div class='del'>-	if (!ifs &amp;&amp; nblocks &gt; 1) {</div><div class='del'>-		ifs = ifs_alloc(inode, folio, 0);</div><div class='del'>-		iomap_set_range_dirty(folio, 0, end_pos - pos);</div><div class='del'>-	}</div><div class='add'>+	if (i_blocks_per_folio(inode, folio) &gt; 1) {</div><div class='add'>+		if (!ifs) {</div><div class='add'>+			ifs = ifs_alloc(inode, folio, 0);</div><div class='add'>+			iomap_set_range_dirty(folio, 0, end_pos - pos);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(ifs &amp;&amp; atomic_read(&amp;ifs-&gt;write_bytes_pending) != 0);</div><div class='add'>+		iomap_writeback_init(inode, folio);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Walk through the folio to find areas to write back. If we</div><div class='del'>-	 * run off the end of the current map or find the current map</div><div class='del'>-	 * invalid, grab a new one.</div><div class='add'>+	 * Set the writeback bit ASAP, as the I/O completion for the single</div><div class='add'>+	 * block per folio case happen hit as soon as we're submitting the bio.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; nblocks &amp;&amp; pos &lt; end_pos; i++, pos += len) {</div><div class='del'>-		if (ifs &amp;&amp; !ifs_block_is_dirty(folio, ifs, i))</div><div class='del'>-			continue;</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='del'>-		error = wpc-&gt;ops-&gt;map_blocks(wpc, inode, pos);</div><div class='add'>+	/*</div><div class='add'>+	 * Walk through the folio to find dirty areas to write back.</div><div class='add'>+	 */</div><div class='add'>+	end_aligned = round_up(end_pos, i_blocksize(inode));</div><div class='add'>+	while ((rlen = iomap_find_dirty_range(folio, &amp;pos, end_aligned))) {</div><div class='add'>+		error = iomap_writeback_range(wpc, folio, pos, rlen, end_pos,</div><div class='add'>+				&amp;bytes_submitted);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='del'>-		trace_iomap_writepage_map(inode, &amp;wpc-&gt;iomap);</div><div class='del'>-		if (WARN_ON_ONCE(wpc-&gt;iomap.type == IOMAP_INLINE))</div><div class='del'>-			continue;</div><div class='del'>-		if (wpc-&gt;iomap.type == IOMAP_HOLE)</div><div class='del'>-			continue;</div><div class='del'>-		iomap_add_to_ioend(inode, pos, folio, ifs, wpc, wbc,</div><div class='del'>-				 &amp;submit_list);</div><div class='del'>-		count++;</div><div class='add'>+		pos += rlen;</div><div class='ctx'> 	}</div><div class='del'>-	if (count)</div><div class='del'>-		wpc-&gt;ioend-&gt;io_folios++;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(!wpc-&gt;ioend &amp;&amp; !list_empty(&amp;submit_list));</div><div class='del'>-	WARN_ON_ONCE(!folio_test_locked(folio));</div><div class='del'>-	WARN_ON_ONCE(folio_test_writeback(folio));</div><div class='del'>-	WARN_ON_ONCE(folio_test_dirty(folio));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We cannot cancel the ioend directly here on error.  We may have</div><div class='del'>-	 * already set other pages under writeback and hence we have to run I/O</div><div class='del'>-	 * completion to mark the error state of the pages under writeback</div><div class='del'>-	 * appropriately.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(error)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Let the filesystem know what portion of the current page</div><div class='del'>-		 * failed to map. If the page hasn't been added to ioend, it</div><div class='del'>-		 * won't be affected by I/O completion and we must unlock it</div><div class='del'>-		 * now.</div><div class='del'>-		 */</div><div class='del'>-		if (wpc-&gt;ops-&gt;discard_folio)</div><div class='del'>-			wpc-&gt;ops-&gt;discard_folio(folio, pos);</div><div class='del'>-		if (!count) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (bytes_submitted)</div><div class='add'>+		wpc-&gt;nr_folios++;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can have dirty bits set past end of file in page_mkwrite path</div><div class='hunk'>@@ -1851,155 +1855,65 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,</div><div class='ctx'> 	 * all the dirty bits in the folio here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	iomap_clear_range_dirty(folio, 0, folio_size(folio));</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Preserve the original error if there was one; catch</div><div class='del'>-	 * submission errors here and propagate into subsequent ioend</div><div class='del'>-	 * submissions.</div><div class='add'>+	 * Usually the writeback bit is cleared by the I/O completion handler.</div><div class='add'>+	 * But we may end up either not actually writing any blocks, or (when</div><div class='add'>+	 * there are multiple blocks in a folio) all I/O might have finished</div><div class='add'>+	 * already at this point.  In that case we need to clear the writeback</div><div class='add'>+	 * bit ourselves right after unlocking the page.</div><div class='ctx'> 	 */</div><div class='del'>-	list_for_each_entry_safe(ioend, next, &amp;submit_list, io_list) {</div><div class='del'>-		int error2;</div><div class='add'>+	if (ifs) {</div><div class='add'>+		/*</div><div class='add'>+		 * Subtract any bytes that were initially accounted to</div><div class='add'>+		 * write_bytes_pending but skipped for writeback.</div><div class='add'>+		 */</div><div class='add'>+		size_t bytes_not_submitted = folio_size(folio) -</div><div class='add'>+				bytes_submitted;</div><div class='ctx'> </div><div class='del'>-		list_del_init(&amp;ioend-&gt;io_list);</div><div class='del'>-		error2 = iomap_submit_ioend(wpc, ioend, error);</div><div class='del'>-		if (error2 &amp;&amp; !error)</div><div class='del'>-			error = error2;</div><div class='add'>+		if (bytes_not_submitted)</div><div class='add'>+			iomap_finish_folio_write(inode, folio,</div><div class='add'>+					bytes_not_submitted);</div><div class='add'>+	} else if (!bytes_submitted) {</div><div class='add'>+		folio_end_writeback(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We can end up here with no error and nothing to write only if we race</div><div class='del'>-	 * with a partial page truncate on a sub-page block sized filesystem.</div><div class='del'>-	 */</div><div class='del'>-	if (!count)</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-done:</div><div class='ctx'> 	mapping_set_error(inode-&gt;i_mapping, error);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_writeback_folio);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Write out a dirty page.</div><div class='del'>- *</div><div class='del'>- * For delalloc space on the page, we need to allocate space and flush it.</div><div class='del'>- * For unwritten space on the page, we need to start the conversion to</div><div class='del'>- * regular allocated space.</div><div class='del'>- */</div><div class='del'>-static int iomap_do_writepage(struct folio *folio,</div><div class='del'>-		struct writeback_control *wbc, void *data)</div><div class='add'>+int</div><div class='add'>+iomap_writepages(struct iomap_writepage_ctx *wpc)</div><div class='ctx'> {</div><div class='del'>-	struct iomap_writepage_ctx *wpc = data;</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	u64 end_pos, isize;</div><div class='del'>-</div><div class='del'>-	trace_iomap_writepage(inode, folio_pos(folio), folio_size(folio));</div><div class='add'>+	struct address_space *mapping = wpc-&gt;inode-&gt;i_mapping;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Refuse to write the folio out if we're called from reclaim context.</div><div class='del'>-	 *</div><div class='del'>-	 * This avoids stack overflows when called from deeply used stacks in</div><div class='del'>-	 * random callers for direct reclaim or memcg reclaim.  We explicitly</div><div class='del'>-	 * allow reclaim from kswapd as the stack usage there is relatively low.</div><div class='del'>-	 *</div><div class='del'>-	 * This should never happen except in the case of a VM regression so</div><div class='del'>-	 * warn about it.</div><div class='add'>+	 * Writeback from reclaim context should never happen except in the case</div><div class='add'>+	 * of a VM regression so warn about it and refuse to write the data.</div><div class='ctx'> 	 */</div><div class='del'>-	if (WARN_ON_ONCE((current-&gt;flags &amp; (PF_MEMALLOC|PF_KSWAPD)) ==</div><div class='add'>+	if (WARN_ON_ONCE((current-&gt;flags &amp; (PF_MEMALLOC | PF_KSWAPD)) ==</div><div class='ctx'> 			PF_MEMALLOC))</div><div class='del'>-		goto redirty;</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	while ((folio = writeback_iter(mapping, wpc-&gt;wbc, folio, &amp;error))) {</div><div class='add'>+		error = iomap_writeback_folio(wpc, folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Is this folio beyond the end of the file?</div><div class='add'>+	 * If @error is non-zero, it means that we have a situation where some</div><div class='add'>+	 * part of the submission process has failed after we've marked pages</div><div class='add'>+	 * for writeback.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The folio index is less than the end_index, adjust the end_pos</div><div class='del'>-	 * to the highest offset that this folio should represent.</div><div class='del'>-	 * -----------------------------------------------------</div><div class='del'>-	 * |			file mapping	       | &lt;EOF&gt; |</div><div class='del'>-	 * -----------------------------------------------------</div><div class='del'>-	 * | Page ... | Page N-2 | Page N-1 |  Page N  |       |</div><div class='del'>-	 * ^--------------------------------^----------|--------</div><div class='del'>-	 * |     desired writeback range    |      see else    |</div><div class='del'>-	 * ---------------------------------^------------------|</div><div class='add'>+	 * We cannot cancel the writeback directly in that case, so always call</div><div class='add'>+	 * -&gt;writeback_submit to run the I/O completion handler to clear the</div><div class='add'>+	 * writeback bit and let the file system proess the errors.</div><div class='ctx'> 	 */</div><div class='del'>-	isize = i_size_read(inode);</div><div class='del'>-	end_pos = folio_pos(folio) + folio_size(folio);</div><div class='del'>-	if (end_pos &gt; isize) {</div><div class='del'>-		/*</div><div class='del'>-		 * Check whether the page to write out is beyond or straddles</div><div class='del'>-		 * i_size or not.</div><div class='del'>-		 * -------------------------------------------------------</div><div class='del'>-		 * |		file mapping		        | &lt;EOF&gt;  |</div><div class='del'>-		 * -------------------------------------------------------</div><div class='del'>-		 * | Page ... | Page N-2 | Page N-1 |  Page N   | Beyond |</div><div class='del'>-		 * ^--------------------------------^-----------|---------</div><div class='del'>-		 * |				    |      Straddles     |</div><div class='del'>-		 * ---------------------------------^-----------|--------|</div><div class='del'>-		 */</div><div class='del'>-		size_t poff = offset_in_folio(folio, isize);</div><div class='del'>-		pgoff_t end_index = isize &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Skip the page if it's fully outside i_size, e.g.</div><div class='del'>-		 * due to a truncate operation that's in progress.  We've</div><div class='del'>-		 * cleaned this page and truncate will finish things off for</div><div class='del'>-		 * us.</div><div class='del'>-		 *</div><div class='del'>-		 * Note that the end_index is unsigned long.  If the given</div><div class='del'>-		 * offset is greater than 16TB on a 32-bit system then if we</div><div class='del'>-		 * checked if the page is fully outside i_size with</div><div class='del'>-		 * "if (page-&gt;index &gt;= end_index + 1)", "end_index + 1" would</div><div class='del'>-		 * overflow and evaluate to 0.  Hence this page would be</div><div class='del'>-		 * redirtied and written out repeatedly, which would result in</div><div class='del'>-		 * an infinite loop; the user program performing this operation</div><div class='del'>-		 * would hang.  Instead, we can detect this situation by</div><div class='del'>-		 * checking if the page is totally beyond i_size or if its</div><div class='del'>-		 * offset is just equal to the EOF.</div><div class='del'>-		 */</div><div class='del'>-		if (folio-&gt;index &gt; end_index ||</div><div class='del'>-		    (folio-&gt;index == end_index &amp;&amp; poff == 0))</div><div class='del'>-			goto unlock;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The page straddles i_size.  It must be zeroed out on each</div><div class='del'>-		 * and every writepage invocation because it may be mmapped.</div><div class='del'>-		 * "A file is mapped in multiples of the page size.  For a file</div><div class='del'>-		 * that is not a multiple of the page size, the remaining</div><div class='del'>-		 * memory is zeroed when mapped, and writes to that region are</div><div class='del'>-		 * not written out to the file."</div><div class='del'>-		 */</div><div class='del'>-		folio_zero_segment(folio, poff, folio_size(folio));</div><div class='del'>-		end_pos = isize;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return iomap_writepage_map(wpc, wbc, inode, folio, end_pos);</div><div class='del'>-</div><div class='del'>-redirty:</div><div class='del'>-	folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-unlock:</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-iomap_writepages(struct address_space *mapping, struct writeback_control *wbc,</div><div class='del'>-		struct iomap_writepage_ctx *wpc,</div><div class='del'>-		const struct iomap_writeback_ops *ops)</div><div class='del'>-{</div><div class='del'>-	int			ret;</div><div class='del'>-</div><div class='del'>-	wpc-&gt;ops = ops;</div><div class='del'>-	ret = write_cache_pages(mapping, wbc, iomap_do_writepage, wpc);</div><div class='del'>-	if (!wpc-&gt;ioend)</div><div class='del'>-		return ret;</div><div class='del'>-	return iomap_submit_ioend(wpc, wpc-&gt;ioend, ret);</div><div class='add'>+	if (wpc-&gt;wb_ctx)</div><div class='add'>+		return wpc-&gt;ops-&gt;writeback_submit(wpc, error);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_writepages);</div><div class='del'>-</div><div class='del'>-static int __init iomap_init(void)</div><div class='del'>-{</div><div class='del'>-	return bioset_init(&amp;iomap_ioend_bioset, 4 * (PAGE_SIZE / SECTOR_SIZE),</div><div class='del'>-			   offsetof(struct iomap_ioend, io_inline_bio),</div><div class='del'>-			   BIOSET_NEED_BVECS);</div><div class='del'>-}</div><div class='del'>-fs_initcall(iomap_init);</div><div class='head'>diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c<br/>index bcd3f8cf5ea4..8e273408453a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/direct-io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/direct-io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/direct-io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/direct-io.c</a></div><div class='hunk'>@@ -1,17 +1,13 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2010 Red Hat, Inc.</div><div class='del'>- * Copyright (c) 2016-2021 Christoph Hellwig.</div><div class='add'>+ * Copyright (c) 2016-2025 Christoph Hellwig.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/fscrypt.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='ctx'> #include "../internal.h"</div><div class='hunk'>@@ -20,8 +16,8 @@</div><div class='ctx'>  * Private flags for iomap_dio, must not overlap with the public ones in</div><div class='ctx'>  * iomap.h:</div><div class='ctx'>  */</div><div class='del'>-#define IOMAP_DIO_CALLER_COMP	(1U &lt;&lt; 26)</div><div class='del'>-#define IOMAP_DIO_INLINE_COMP	(1U &lt;&lt; 27)</div><div class='add'>+#define IOMAP_DIO_NO_INVALIDATE	(1U &lt;&lt; 26)</div><div class='add'>+#define IOMAP_DIO_COMP_WORK	(1U &lt;&lt; 27)</div><div class='ctx'> #define IOMAP_DIO_WRITE_THROUGH	(1U &lt;&lt; 28)</div><div class='ctx'> #define IOMAP_DIO_NEED_SYNC	(1U &lt;&lt; 29)</div><div class='ctx'> #define IOMAP_DIO_WRITE		(1U &lt;&lt; 30)</div><div class='hunk'>@@ -74,10 +70,12 @@ static void iomap_dio_submit_bio(const struct iomap_iter *iter,</div><div class='ctx'> 		WRITE_ONCE(iocb-&gt;private, bio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dio-&gt;dops &amp;&amp; dio-&gt;dops-&gt;submit_io)</div><div class='add'>+	if (dio-&gt;dops &amp;&amp; dio-&gt;dops-&gt;submit_io) {</div><div class='ctx'> 		dio-&gt;dops-&gt;submit_io(iter, bio, pos);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(iter-&gt;iomap.flags &amp; IOMAP_F_ANON_WRITE);</div><div class='ctx'> 		submit_bio(bio);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t iomap_dio_complete(struct iomap_dio *dio)</div><div class='hunk'>@@ -110,7 +108,8 @@ ssize_t iomap_dio_complete(struct iomap_dio *dio)</div><div class='ctx'> 	 * -&gt;end_io() when necessary, otherwise a racing buffer read would cache</div><div class='ctx'> 	 * zeros from unwritten extents.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!dio-&gt;error &amp;&amp; dio-&gt;size &amp;&amp; (dio-&gt;flags &amp; IOMAP_DIO_WRITE))</div><div class='add'>+	if (!dio-&gt;error &amp;&amp; dio-&gt;size &amp;&amp; (dio-&gt;flags &amp; IOMAP_DIO_WRITE) &amp;&amp;</div><div class='add'>+	    !(dio-&gt;flags &amp; IOMAP_DIO_NO_INVALIDATE))</div><div class='ctx'> 		kiocb_invalidate_post_direct_write(iocb, dio-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	inode_dio_end(file_inode(iocb-&gt;ki_filp));</div><div class='hunk'>@@ -133,11 +132,6 @@ ssize_t iomap_dio_complete(struct iomap_dio *dio)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_dio_complete);</div><div class='ctx'> </div><div class='del'>-static ssize_t iomap_dio_deferred_complete(void *data)</div><div class='del'>-{</div><div class='del'>-	return iomap_dio_complete(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void iomap_dio_complete_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap_dio *dio = container_of(work, struct iomap_dio, aio.work);</div><div class='hunk'>@@ -156,73 +150,77 @@ static inline void iomap_dio_set_error(struct iomap_dio *dio, int ret)</div><div class='ctx'> 	cmpxchg(&amp;dio-&gt;error, 0, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iomap_dio_bio_end_io(struct bio *bio)</div><div class='add'>+/*</div><div class='add'>+ * Called when dio-&gt;ref reaches zero from an I/O completion.</div><div class='add'>+ */</div><div class='add'>+static void iomap_dio_done(struct iomap_dio *dio)</div><div class='ctx'> {</div><div class='del'>-	struct iomap_dio *dio = bio-&gt;bi_private;</div><div class='del'>-	bool should_dirty = (dio-&gt;flags &amp; IOMAP_DIO_DIRTY);</div><div class='ctx'> 	struct kiocb *iocb = dio-&gt;iocb;</div><div class='ctx'> </div><div class='del'>-	if (bio-&gt;bi_status)</div><div class='del'>-		iomap_dio_set_error(dio, blk_status_to_errno(bio-&gt;bi_status));</div><div class='del'>-	if (!atomic_dec_and_test(&amp;dio-&gt;ref))</div><div class='del'>-		goto release_bio;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Synchronous dio, task itself will handle any completion work</div><div class='del'>-	 * that needs after IO. All we need to do is wake the task.</div><div class='del'>-	 */</div><div class='ctx'> 	if (dio-&gt;wait_for_completion) {</div><div class='add'>+		/*</div><div class='add'>+		 * Synchronous I/O, task itself will handle any completion work</div><div class='add'>+		 * that needs after IO. All we need to do is wake the task.</div><div class='add'>+		 */</div><div class='ctx'> 		struct task_struct *waiter = dio-&gt;submit.waiter;</div><div class='ctx'> </div><div class='ctx'> 		WRITE_ONCE(dio-&gt;submit.waiter, NULL);</div><div class='ctx'> 		blk_wake_io_task(waiter);</div><div class='del'>-		goto release_bio;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Flagged with IOMAP_DIO_INLINE_COMP, we can complete it inline</div><div class='add'>+	 * Always run error completions in user context.  These are not</div><div class='add'>+	 * performance critical and some code relies on taking sleeping locks</div><div class='add'>+	 * for error handling.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dio-&gt;flags &amp; IOMAP_DIO_INLINE_COMP) {</div><div class='del'>-		WRITE_ONCE(iocb-&gt;private, NULL);</div><div class='del'>-		iomap_dio_complete_work(&amp;dio-&gt;aio.work);</div><div class='del'>-		goto release_bio;</div><div class='del'>-	}</div><div class='add'>+	if (dio-&gt;error)</div><div class='add'>+		dio-&gt;flags |= IOMAP_DIO_COMP_WORK;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If this dio is flagged with IOMAP_DIO_CALLER_COMP, then schedule</div><div class='del'>-	 * our completion that way to avoid an async punt to a workqueue.</div><div class='add'>+	 * Never invalidate pages from this context to avoid deadlocks with</div><div class='add'>+	 * buffered I/O completions when called from the ioend workqueue,</div><div class='add'>+	 * or avoid sleeping when called directly from -&gt;bi_end_io.</div><div class='add'>+	 * Tough luck if you hit the tiny race with someone dirtying the range</div><div class='add'>+	 * right between this check and the actual completion.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dio-&gt;flags &amp; IOMAP_DIO_CALLER_COMP) {</div><div class='del'>-		/* only polled IO cares about private cleared */</div><div class='del'>-		iocb-&gt;private = dio;</div><div class='del'>-		iocb-&gt;dio_complete = iomap_dio_deferred_complete;</div><div class='add'>+	if ((dio-&gt;flags &amp; IOMAP_DIO_WRITE) &amp;&amp;</div><div class='add'>+	    !(dio-&gt;flags &amp; IOMAP_DIO_COMP_WORK)) {</div><div class='add'>+		if (dio-&gt;iocb-&gt;ki_filp-&gt;f_mapping-&gt;nrpages)</div><div class='add'>+			dio-&gt;flags |= IOMAP_DIO_COMP_WORK;</div><div class='add'>+		else</div><div class='add'>+			dio-&gt;flags |= IOMAP_DIO_NO_INVALIDATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dio-&gt;flags &amp; IOMAP_DIO_COMP_WORK) {</div><div class='add'>+		struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Invoke -&gt;ki_complete() directly. We've assigned our</div><div class='del'>-		 * dio_complete callback handler, and since the issuer set</div><div class='del'>-		 * IOCB_DIO_CALLER_COMP, we know their ki_complete handler will</div><div class='del'>-		 * notice -&gt;dio_complete being set and will defer calling that</div><div class='del'>-		 * handler until it can be done from a safe task context.</div><div class='del'>-		 *</div><div class='del'>-		 * Note that the 'res' being passed in here is not important</div><div class='del'>-		 * for this case. The actual completion value of the request</div><div class='del'>-		 * will be gotten from dio_complete when that is run by the</div><div class='del'>-		 * issuer.</div><div class='add'>+		 * Async DIO completion that requires filesystem level</div><div class='add'>+		 * completion work gets punted to a work queue to complete as</div><div class='add'>+		 * the operation may require more IO to be issued to finalise</div><div class='add'>+		 * filesystem metadata changes or guarantee data integrity.</div><div class='ctx'> 		 */</div><div class='del'>-		iocb-&gt;ki_complete(iocb, 0);</div><div class='del'>-		goto release_bio;</div><div class='add'>+		INIT_WORK(&amp;dio-&gt;aio.work, iomap_dio_complete_work);</div><div class='add'>+		queue_work(inode-&gt;i_sb-&gt;s_dio_done_wq, &amp;dio-&gt;aio.work);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Async DIO completion that requires filesystem level completion work</div><div class='del'>-	 * gets punted to a work queue to complete as the operation may require</div><div class='del'>-	 * more IO to be issued to finalise filesystem metadata changes or</div><div class='del'>-	 * guarantee data integrity.</div><div class='del'>-	 */</div><div class='del'>-	INIT_WORK(&amp;dio-&gt;aio.work, iomap_dio_complete_work);</div><div class='del'>-	queue_work(file_inode(iocb-&gt;ki_filp)-&gt;i_sb-&gt;s_dio_done_wq,</div><div class='del'>-			&amp;dio-&gt;aio.work);</div><div class='del'>-release_bio:</div><div class='add'>+	WRITE_ONCE(iocb-&gt;private, NULL);</div><div class='add'>+	iomap_dio_complete_work(&amp;dio-&gt;aio.work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iomap_dio_bio_end_io(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct iomap_dio *dio = bio-&gt;bi_private;</div><div class='add'>+	bool should_dirty = (dio-&gt;flags &amp; IOMAP_DIO_DIRTY);</div><div class='add'>+</div><div class='add'>+	if (bio-&gt;bi_status)</div><div class='add'>+		iomap_dio_set_error(dio, blk_status_to_errno(bio-&gt;bi_status));</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;dio-&gt;ref))</div><div class='add'>+		iomap_dio_done(dio);</div><div class='add'>+</div><div class='ctx'> 	if (should_dirty) {</div><div class='ctx'> 		bio_check_pages_dirty(bio);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -232,94 +230,185 @@ release_bio:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_dio_bio_end_io);</div><div class='ctx'> </div><div class='del'>-static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio,</div><div class='add'>+u32 iomap_finish_ioend_direct(struct iomap_ioend *ioend)</div><div class='add'>+{</div><div class='add'>+	struct iomap_dio *dio = ioend-&gt;io_bio.bi_private;</div><div class='add'>+	bool should_dirty = (dio-&gt;flags &amp; IOMAP_DIO_DIRTY);</div><div class='add'>+	u32 vec_count = ioend-&gt;io_bio.bi_vcnt;</div><div class='add'>+</div><div class='add'>+	if (ioend-&gt;io_error)</div><div class='add'>+		iomap_dio_set_error(dio, ioend-&gt;io_error);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;dio-&gt;ref)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Try to avoid another context switch for the completion given</div><div class='add'>+		 * that we are already called from the ioend completion</div><div class='add'>+		 * workqueue.</div><div class='add'>+		 */</div><div class='add'>+		dio-&gt;flags &amp;= ~IOMAP_DIO_COMP_WORK;</div><div class='add'>+		iomap_dio_done(dio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (should_dirty) {</div><div class='add'>+		bio_check_pages_dirty(&amp;ioend-&gt;io_bio);</div><div class='add'>+	} else {</div><div class='add'>+		bio_release_pages(&amp;ioend-&gt;io_bio, false);</div><div class='add'>+		bio_put(&amp;ioend-&gt;io_bio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Return the number of bvecs completed as even direct I/O completions</div><div class='add'>+	 * do significant per-folio work and we'll still want to give up the</div><div class='add'>+	 * CPU after a lot of completions.</div><div class='add'>+	 */</div><div class='add'>+	return vec_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio,</div><div class='ctx'> 		loff_t pos, unsigned len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(dio-&gt;iocb-&gt;ki_filp);</div><div class='del'>-	struct page *page = ZERO_PAGE(0);</div><div class='ctx'> 	struct bio *bio;</div><div class='add'>+	struct folio *zero_folio = largest_zero_folio();</div><div class='add'>+	int nr_vecs = max(1, i_blocksize(inode) / folio_size(zero_folio));</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This limit shall never be reached as most filesystems have a</div><div class='add'>+	 * maximum blocksize of 64k.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(nr_vecs &gt; BIO_MAX_VECS))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bio = iomap_dio_alloc_bio(iter, dio, 1, REQ_OP_WRITE | REQ_SYNC | REQ_IDLE);</div><div class='add'>+	bio = iomap_dio_alloc_bio(iter, dio, nr_vecs,</div><div class='add'>+				  REQ_OP_WRITE | REQ_SYNC | REQ_IDLE);</div><div class='ctx'> 	fscrypt_set_bio_crypt_ctx(bio, inode, pos &gt;&gt; inode-&gt;i_blkbits,</div><div class='ctx'> 				  GFP_KERNEL);</div><div class='ctx'> 	bio-&gt;bi_iter.bi_sector = iomap_sector(&amp;iter-&gt;iomap, pos);</div><div class='ctx'> 	bio-&gt;bi_private = dio;</div><div class='ctx'> 	bio-&gt;bi_end_io = iomap_dio_bio_end_io;</div><div class='ctx'> </div><div class='del'>-	__bio_add_page(bio, page, len, 0);</div><div class='del'>-	iomap_dio_submit_bio(iter, dio, bio, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Figure out the bio's operation flags from the dio request, the</div><div class='del'>- * mapping, and whether or not we want FUA.  Note that we can end up</div><div class='del'>- * clearing the WRITE_THROUGH flag in the dio request.</div><div class='del'>- */</div><div class='del'>-static inline blk_opf_t iomap_dio_bio_opflags(struct iomap_dio *dio,</div><div class='del'>-		const struct iomap *iomap, bool use_fua)</div><div class='del'>-{</div><div class='del'>-	blk_opf_t opflags = REQ_SYNC | REQ_IDLE;</div><div class='del'>-</div><div class='del'>-	if (!(dio-&gt;flags &amp; IOMAP_DIO_WRITE))</div><div class='del'>-		return REQ_OP_READ;</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		unsigned int io_len = min(len, folio_size(zero_folio));</div><div class='ctx'> </div><div class='del'>-	opflags |= REQ_OP_WRITE;</div><div class='del'>-	if (use_fua)</div><div class='del'>-		opflags |= REQ_FUA;</div><div class='del'>-	else</div><div class='del'>-		dio-&gt;flags &amp;= ~IOMAP_DIO_WRITE_THROUGH;</div><div class='add'>+		bio_add_folio_nofail(bio, zero_folio, io_len, 0);</div><div class='add'>+		len -= io_len;</div><div class='add'>+	}</div><div class='add'>+	iomap_dio_submit_bio(iter, dio, bio, pos);</div><div class='ctx'> </div><div class='del'>-	return opflags;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,</div><div class='del'>-		struct iomap_dio *dio)</div><div class='add'>+static int iomap_dio_bio_iter(struct iomap_iter *iter, struct iomap_dio *dio)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *iomap = &amp;iter-&gt;iomap;</div><div class='ctx'> 	struct inode *inode = iter-&gt;inode;</div><div class='ctx'> 	unsigned int fs_block_size = i_blocksize(inode), pad;</div><div class='del'>-	loff_t length = iomap_length(iter);</div><div class='add'>+	const loff_t length = iomap_length(iter);</div><div class='ctx'> 	loff_t pos = iter-&gt;pos;</div><div class='del'>-	blk_opf_t bio_opf;</div><div class='add'>+	blk_opf_t bio_opf = REQ_SYNC | REQ_IDLE;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> 	bool need_zeroout = false;</div><div class='del'>-	bool use_fua = false;</div><div class='ctx'> 	int nr_pages, ret = 0;</div><div class='del'>-	size_t copied = 0;</div><div class='add'>+	u64 copied = 0;</div><div class='ctx'> 	size_t orig_count;</div><div class='add'>+	unsigned int alignment;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * File systems that write out of place and always allocate new blocks</div><div class='add'>+	 * need each bio to be block aligned as that's the unit of allocation.</div><div class='add'>+	 */</div><div class='add'>+	if (dio-&gt;flags &amp; IOMAP_DIO_FSBLOCK_ALIGNED)</div><div class='add'>+		alignment = fs_block_size;</div><div class='add'>+	else</div><div class='add'>+		alignment = bdev_logical_block_size(iomap-&gt;bdev);</div><div class='ctx'> </div><div class='del'>-	if ((pos | length) &amp; (bdev_logical_block_size(iomap-&gt;bdev) - 1) ||</div><div class='del'>-	    !bdev_iter_is_aligned(iomap-&gt;bdev, dio-&gt;submit.iter))</div><div class='add'>+	if ((pos | length) &amp; (alignment - 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (iomap-&gt;type == IOMAP_UNWRITTEN) {</div><div class='del'>-		dio-&gt;flags |= IOMAP_DIO_UNWRITTEN;</div><div class='del'>-		need_zeroout = true;</div><div class='del'>-	}</div><div class='add'>+	if (dio-&gt;flags &amp; IOMAP_DIO_WRITE) {</div><div class='add'>+		bool need_completion_work = true;</div><div class='add'>+</div><div class='add'>+		switch (iomap-&gt;type) {</div><div class='add'>+		case IOMAP_MAPPED:</div><div class='add'>+			/*</div><div class='add'>+			 * Directly mapped I/O does not inherently need to do</div><div class='add'>+			 * work at I/O completion time.  But there are various</div><div class='add'>+			 * cases below where this will get set again.</div><div class='add'>+			 */</div><div class='add'>+			need_completion_work = false;</div><div class='add'>+			break;</div><div class='add'>+		case IOMAP_UNWRITTEN:</div><div class='add'>+			dio-&gt;flags |= IOMAP_DIO_UNWRITTEN;</div><div class='add'>+			need_zeroout = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iomap-&gt;flags &amp; IOMAP_F_ATOMIC_BIO) {</div><div class='add'>+			/*</div><div class='add'>+			 * Ensure that the mapping covers the full write</div><div class='add'>+			 * length, otherwise it won't be submitted as a single</div><div class='add'>+			 * bio, which is required to use hardware atomics.</div><div class='add'>+			 */</div><div class='add'>+			if (length != iter-&gt;len)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			bio_opf |= REQ_ATOMIC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iomap-&gt;flags &amp; IOMAP_F_SHARED) {</div><div class='add'>+			/*</div><div class='add'>+			 * Unsharing of needs to update metadata at I/O</div><div class='add'>+			 * completion time.</div><div class='add'>+			 */</div><div class='add'>+			need_completion_work = true;</div><div class='add'>+			dio-&gt;flags |= IOMAP_DIO_COW;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (iomap-&gt;flags &amp; IOMAP_F_NEW) {</div><div class='add'>+			/*</div><div class='add'>+			 * Newly allocated blocks might need recording in</div><div class='add'>+			 * metadata at I/O completion time.</div><div class='add'>+			 */</div><div class='add'>+			need_completion_work = true;</div><div class='add'>+			need_zeroout = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (iomap-&gt;flags &amp; IOMAP_F_SHARED)</div><div class='del'>-		dio-&gt;flags |= IOMAP_DIO_COW;</div><div class='add'>+		/*</div><div class='add'>+		 * Use a FUA write if we need datasync semantics and this is a</div><div class='add'>+		 * pure overwrite that doesn't require any metadata updates.</div><div class='add'>+		 *</div><div class='add'>+		 * This allows us to avoid cache flushes on I/O completion.</div><div class='add'>+		 */</div><div class='add'>+		if (dio-&gt;flags &amp; IOMAP_DIO_WRITE_THROUGH) {</div><div class='add'>+			if (!need_completion_work &amp;&amp;</div><div class='add'>+			    !(iomap-&gt;flags &amp; IOMAP_F_DIRTY) &amp;&amp;</div><div class='add'>+			    (!bdev_write_cache(iomap-&gt;bdev) ||</div><div class='add'>+			     bdev_fua(iomap-&gt;bdev)))</div><div class='add'>+				bio_opf |= REQ_FUA;</div><div class='add'>+			else</div><div class='add'>+				dio-&gt;flags &amp;= ~IOMAP_DIO_WRITE_THROUGH;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (iomap-&gt;flags &amp; IOMAP_F_NEW) {</div><div class='del'>-		need_zeroout = true;</div><div class='del'>-	} else if (iomap-&gt;type == IOMAP_MAPPED) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Use a FUA write if we need datasync semantics, this is a pure</div><div class='del'>-		 * data IO that doesn't require any metadata updates (including</div><div class='del'>-		 * after IO completion such as unwritten extent conversion) and</div><div class='del'>-		 * the underlying device either supports FUA or doesn't have</div><div class='del'>-		 * a volatile write cache. This allows us to avoid cache flushes</div><div class='del'>-		 * on IO completion. If we can't use writethrough and need to</div><div class='del'>-		 * sync, disable in-task completions as dio completion will</div><div class='del'>-		 * need to call generic_write_sync() which will do a blocking</div><div class='del'>-		 * fsync / cache flush call.</div><div class='add'>+		 * We can only do inline completion for pure overwrites that</div><div class='add'>+		 * don't require additional I/O at completion time.</div><div class='add'>+		 *</div><div class='add'>+		 * This rules out writes that need zeroing or metdata updates to</div><div class='add'>+		 * convert unwritten or shared extents.</div><div class='add'>+		 *</div><div class='add'>+		 * Writes that extend i_size are also not supported, but this is</div><div class='add'>+		 * handled in __iomap_dio_rw().</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(iomap-&gt;flags &amp; (IOMAP_F_SHARED|IOMAP_F_DIRTY)) &amp;&amp;</div><div class='del'>-		    (dio-&gt;flags &amp; IOMAP_DIO_WRITE_THROUGH) &amp;&amp;</div><div class='del'>-		    (bdev_fua(iomap-&gt;bdev) || !bdev_write_cache(iomap-&gt;bdev)))</div><div class='del'>-			use_fua = true;</div><div class='del'>-		else if (dio-&gt;flags &amp; IOMAP_DIO_NEED_SYNC)</div><div class='del'>-			dio-&gt;flags &amp;= ~IOMAP_DIO_CALLER_COMP;</div><div class='add'>+		if (need_completion_work)</div><div class='add'>+			dio-&gt;flags |= IOMAP_DIO_COMP_WORK;</div><div class='add'>+</div><div class='add'>+		bio_opf |= REQ_OP_WRITE;</div><div class='add'>+	} else {</div><div class='add'>+		bio_opf |= REQ_OP_READ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -334,38 +423,21 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We can only do deferred completion for pure overwrites that</div><div class='del'>-	 * don't require additional IO at completion. This rules out</div><div class='del'>-	 * writes that need zeroing or extent conversion, extend</div><div class='del'>-	 * the file size, or issue journal IO or cache flushes</div><div class='del'>-	 * during completion processing.</div><div class='del'>-	 */</div><div class='del'>-	if (need_zeroout ||</div><div class='del'>-	    ((dio-&gt;flags &amp; IOMAP_DIO_NEED_SYNC) &amp;&amp; !use_fua) ||</div><div class='del'>-	    ((dio-&gt;flags &amp; IOMAP_DIO_WRITE) &amp;&amp; pos &gt;= i_size_read(inode)))</div><div class='del'>-		dio-&gt;flags &amp;= ~IOMAP_DIO_CALLER_COMP;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * The rules for polled IO completions follow the guidelines as the</div><div class='ctx'> 	 * ones we set for inline and deferred completions. If none of those</div><div class='ctx'> 	 * are available for this IO, clear the polled flag.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(dio-&gt;flags &amp; (IOMAP_DIO_INLINE_COMP|IOMAP_DIO_CALLER_COMP)))</div><div class='add'>+	if (dio-&gt;flags &amp; IOMAP_DIO_COMP_WORK)</div><div class='ctx'> 		dio-&gt;iocb-&gt;ki_flags &amp;= ~IOCB_HIPRI;</div><div class='ctx'> </div><div class='ctx'> 	if (need_zeroout) {</div><div class='ctx'> 		/* zero out from the start of the block to the write offset */</div><div class='ctx'> 		pad = pos &amp; (fs_block_size - 1);</div><div class='del'>-		if (pad)</div><div class='del'>-			iomap_dio_zero(iter, dio, pos - pad, pad);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Set the operation flags early so that bio_iov_iter_get_pages</div><div class='del'>-	 * can set up the page vector appropriately for a ZONE_APPEND</div><div class='del'>-	 * operation.</div><div class='del'>-	 */</div><div class='del'>-	bio_opf = iomap_dio_bio_opflags(dio, iomap, use_fua);</div><div class='add'>+		ret = iomap_dio_zero(iter, dio, pos - pad, pad);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nr_pages = bio_iov_vecs_to_alloc(dio-&gt;submit.iter, BIO_MAX_VECS);</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -380,11 +452,13 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,</div><div class='ctx'> 		fscrypt_set_bio_crypt_ctx(bio, inode, pos &gt;&gt; inode-&gt;i_blkbits,</div><div class='ctx'> 					  GFP_KERNEL);</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = iomap_sector(iomap, pos);</div><div class='add'>+		bio-&gt;bi_write_hint = inode-&gt;i_write_hint;</div><div class='ctx'> 		bio-&gt;bi_ioprio = dio-&gt;iocb-&gt;ki_ioprio;</div><div class='ctx'> 		bio-&gt;bi_private = dio;</div><div class='ctx'> 		bio-&gt;bi_end_io = iomap_dio_bio_end_io;</div><div class='ctx'> </div><div class='del'>-		ret = bio_iov_iter_get_pages(bio, dio-&gt;submit.iter);</div><div class='add'>+		ret = bio_iov_iter_get_pages(bio, dio-&gt;submit.iter,</div><div class='add'>+					     alignment - 1);</div><div class='ctx'> 		if (unlikely(ret)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We have to stop part way through an IO. We must fall</div><div class='hunk'>@@ -397,12 +471,21 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		n = bio-&gt;bi_iter.bi_size;</div><div class='del'>-		if (dio-&gt;flags &amp; IOMAP_DIO_WRITE) {</div><div class='del'>-			task_io_account_write(n);</div><div class='del'>-		} else {</div><div class='del'>-			if (dio-&gt;flags &amp; IOMAP_DIO_DIRTY)</div><div class='del'>-				bio_set_pages_dirty(bio);</div><div class='add'>+		if (WARN_ON_ONCE((bio_opf &amp; REQ_ATOMIC) &amp;&amp; n != length)) {</div><div class='add'>+			/*</div><div class='add'>+			 * An atomic write bio must cover the complete length,</div><div class='add'>+			 * which it doesn't, so error. We may need to zero out</div><div class='add'>+			 * the tail (complete FS block), similar to when</div><div class='add'>+			 * bio_iov_iter_get_pages() returns an error, above.</div><div class='add'>+			 */</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			bio_put(bio);</div><div class='add'>+			goto zero_tail;</div><div class='ctx'> 		}</div><div class='add'>+		if (dio-&gt;flags &amp; IOMAP_DIO_WRITE)</div><div class='add'>+			task_io_account_write(n);</div><div class='add'>+		else if (dio-&gt;flags &amp; IOMAP_DIO_DIRTY)</div><div class='add'>+			bio_set_pages_dirty(bio);</div><div class='ctx'> </div><div class='ctx'> 		dio-&gt;size += n;</div><div class='ctx'> 		copied += n;</div><div class='hunk'>@@ -430,36 +513,38 @@ zero_tail:</div><div class='ctx'> 		/* zero out from the end of the write to the end of the block */</div><div class='ctx'> 		pad = pos &amp; (fs_block_size - 1);</div><div class='ctx'> 		if (pad)</div><div class='del'>-			iomap_dio_zero(iter, dio, pos, fs_block_size - pad);</div><div class='add'>+			ret = iomap_dio_zero(iter, dio, pos,</div><div class='add'>+					     fs_block_size - pad);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	/* Undo iter limitation to current extent */</div><div class='ctx'> 	iov_iter_reexpand(dio-&gt;submit.iter, orig_count - copied);</div><div class='ctx'> 	if (copied)</div><div class='del'>-		return copied;</div><div class='add'>+		return iomap_iter_advance(iter, copied);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_dio_hole_iter(const struct iomap_iter *iter,</div><div class='del'>-		struct iomap_dio *dio)</div><div class='add'>+static int iomap_dio_hole_iter(struct iomap_iter *iter, struct iomap_dio *dio)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t length = iov_iter_zero(iomap_length(iter), dio-&gt;submit.iter);</div><div class='ctx'> </div><div class='ctx'> 	dio-&gt;size += length;</div><div class='ctx'> 	if (!length)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	return length;</div><div class='add'>+	return iomap_iter_advance(iter, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_dio_inline_iter(const struct iomap_iter *iomi,</div><div class='del'>-		struct iomap_dio *dio)</div><div class='add'>+static int iomap_dio_inline_iter(struct iomap_iter *iomi, struct iomap_dio *dio)</div><div class='ctx'> {</div><div class='ctx'> 	const struct iomap *iomap = &amp;iomi-&gt;iomap;</div><div class='ctx'> 	struct iov_iter *iter = dio-&gt;submit.iter;</div><div class='ctx'> 	void *inline_data = iomap_inline_data(iomap, iomi-&gt;pos);</div><div class='ctx'> 	loff_t length = iomap_length(iomi);</div><div class='ctx'> 	loff_t pos = iomi-&gt;pos;</div><div class='del'>-	size_t copied;</div><div class='add'>+	u64 copied;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!inline_data))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(!iomap_inline_data_valid(iomap)))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -481,11 +566,10 @@ static loff_t iomap_dio_inline_iter(const struct iomap_iter *iomi,</div><div class='ctx'> 	dio-&gt;size += copied;</div><div class='ctx'> 	if (!copied)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	return copied;</div><div class='add'>+	return iomap_iter_advance(iomi, copied);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_dio_iter(const struct iomap_iter *iter,</div><div class='del'>-		struct iomap_dio *dio)</div><div class='add'>+static int iomap_dio_iter(struct iomap_iter *iter, struct iomap_dio *dio)</div><div class='ctx'> {</div><div class='ctx'> 	switch (iter-&gt;iomap.type) {</div><div class='ctx'> 	case IOMAP_HOLE:</div><div class='hunk'>@@ -579,10 +663,10 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT)</div><div class='ctx'> 		iomi.flags |= IOMAP_NOWAIT;</div><div class='ctx'> </div><div class='del'>-	if (iov_iter_rw(iter) == READ) {</div><div class='del'>-		/* reads can always complete inline */</div><div class='del'>-		dio-&gt;flags |= IOMAP_DIO_INLINE_COMP;</div><div class='add'>+	if (dio_flags &amp; IOMAP_DIO_FSBLOCK_ALIGNED)</div><div class='add'>+		dio-&gt;flags |= IOMAP_DIO_FSBLOCK_ALIGNED;</div><div class='ctx'> </div><div class='add'>+	if (iov_iter_rw(iter) == READ) {</div><div class='ctx'> 		if (iomi.pos &gt;= dio-&gt;i_size)</div><div class='ctx'> 			goto out_free_dio;</div><div class='ctx'> </div><div class='hunk'>@@ -596,15 +680,6 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		iomi.flags |= IOMAP_WRITE;</div><div class='ctx'> 		dio-&gt;flags |= IOMAP_DIO_WRITE;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Flag as supporting deferred completions, if the issuer</div><div class='del'>-		 * groks it. This can avoid a workqueue punt for writes.</div><div class='del'>-		 * We may later clear this flag if we need to do other IO</div><div class='del'>-		 * as part of this IO completion.</div><div class='del'>-		 */</div><div class='del'>-		if (iocb-&gt;ki_flags &amp; IOCB_DIO_CALLER_COMP)</div><div class='del'>-			dio-&gt;flags |= IOMAP_DIO_CALLER_COMP;</div><div class='del'>-</div><div class='ctx'> 		if (dio_flags &amp; IOMAP_DIO_OVERWRITE_ONLY) {</div><div class='ctx'> 			ret = -EAGAIN;</div><div class='ctx'> 			if (iomi.pos &gt;= dio-&gt;i_size ||</div><div class='hunk'>@@ -613,6 +688,9 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 			iomi.flags |= IOMAP_OVERWRITE_ONLY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (iocb-&gt;ki_flags &amp; IOCB_ATOMIC)</div><div class='add'>+			iomi.flags |= IOMAP_ATOMIC;</div><div class='add'>+</div><div class='ctx'> 		/* for data sync or sync, we need sync completion processing */</div><div class='ctx'> 		if (iocb_is_dsync(iocb)) {</div><div class='ctx'> 			dio-&gt;flags |= IOMAP_DIO_NEED_SYNC;</div><div class='hunk'>@@ -631,6 +709,12 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='add'>+		 * i_size updates must to happen from process context.</div><div class='add'>+		 */</div><div class='add'>+		if (iomi.pos + iomi.len &gt; dio-&gt;i_size)</div><div class='add'>+			dio-&gt;flags |= IOMAP_DIO_COMP_WORK;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='ctx'> 		 * Try to invalidate cache pages for the range we are writing.</div><div class='ctx'> 		 * If this invalidation fails, let the caller fall back to</div><div class='ctx'> 		 * buffered I/O.</div><div class='hunk'>@@ -640,23 +724,33 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 			if (ret != -EAGAIN) {</div><div class='ctx'> 				trace_iomap_dio_invalidate_fail(inode, iomi.pos,</div><div class='ctx'> 								iomi.len);</div><div class='del'>-				ret = -ENOTBLK;</div><div class='add'>+				if (iocb-&gt;ki_flags &amp; IOCB_ATOMIC) {</div><div class='add'>+					/*</div><div class='add'>+					 * folio invalidation failed, maybe</div><div class='add'>+					 * this is transient, unlock and see if</div><div class='add'>+					 * the caller tries again.</div><div class='add'>+					 */</div><div class='add'>+					ret = -EAGAIN;</div><div class='add'>+				} else {</div><div class='add'>+					/* fall back to buffered write */</div><div class='add'>+					ret = -ENOTBLK;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			goto out_free_dio;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!wait_for_completion &amp;&amp; !inode-&gt;i_sb-&gt;s_dio_done_wq) {</div><div class='del'>-			ret = sb_init_dio_done_wq(inode-&gt;i_sb);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out_free_dio;</div><div class='del'>-		}</div><div class='add'>+	if (!wait_for_completion &amp;&amp; !inode-&gt;i_sb-&gt;s_dio_done_wq) {</div><div class='add'>+		ret = sb_init_dio_done_wq(inode-&gt;i_sb);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_free_dio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode_dio_begin(inode);</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iomi, ops)) &gt; 0) {</div><div class='del'>-		iomi.processed = iomap_dio_iter(&amp;iomi, dio);</div><div class='add'>+		iomi.status = iomap_dio_iter(&amp;iomi, dio);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can only poll for single bio I/Os.</div><div class='hunk'>@@ -692,9 +786,14 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 	 * If all the writes we issued were already written through to the</div><div class='ctx'> 	 * media, we don't need to flush the cache on IO completion. Clear the</div><div class='ctx'> 	 * sync flag for this case.</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise clear the inline completion flag if any sync work is</div><div class='add'>+	 * needed, as that needs to be performed from process context.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dio-&gt;flags &amp; IOMAP_DIO_WRITE_THROUGH)</div><div class='ctx'> 		dio-&gt;flags &amp;= ~IOMAP_DIO_NEED_SYNC;</div><div class='add'>+	else if (dio-&gt;flags &amp; IOMAP_DIO_NEED_SYNC)</div><div class='add'>+		dio-&gt;flags |= IOMAP_DIO_COMP_WORK;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are about to drop our additional submission reference, which</div><div class='head'>diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c<br/>index 610ca6f1ec9b..d11dadff8286 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/fiemap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/fiemap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/fiemap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/fiemap.c</a></div><div class='hunk'>@@ -2,9 +2,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2016-2021 Christoph Hellwig.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include &lt;linux/fiemap.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='hunk'>@@ -39,24 +36,23 @@ static int iomap_to_fiemap(struct fiemap_extent_info *fi,</div><div class='ctx'> 			iomap-&gt;length, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_fiemap_iter(const struct iomap_iter *iter,</div><div class='add'>+static int iomap_fiemap_iter(struct iomap_iter *iter,</div><div class='ctx'> 		struct fiemap_extent_info *fi, struct iomap *prev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (iter-&gt;iomap.type == IOMAP_HOLE)</div><div class='del'>-		return iomap_length(iter);</div><div class='add'>+		goto advance;</div><div class='ctx'> </div><div class='ctx'> 	ret = iomap_to_fiemap(fi, prev, 0);</div><div class='ctx'> 	*prev = iter-&gt;iomap;</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case 0:		/* success */</div><div class='del'>-		return iomap_length(iter);</div><div class='del'>-	case 1:		/* extent array full */</div><div class='del'>-		return 0;</div><div class='del'>-	default:	/* error */</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret == 1)	/* extent array full */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+advance:</div><div class='add'>+	return iomap_iter_advance_full(iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi,</div><div class='hunk'>@@ -78,7 +74,7 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_fiemap_iter(&amp;iter, fi, &amp;prev);</div><div class='add'>+		iter.status = iomap_fiemap_iter(&amp;iter, fi, &amp;prev);</div><div class='ctx'> </div><div class='ctx'> 	if (prev.type != IOMAP_HOLE) {</div><div class='ctx'> 		ret = iomap_to_fiemap(fi, &amp;prev, FIEMAP_EXTENT_LAST);</div><div class='hunk'>@@ -114,7 +110,7 @@ iomap_bmap(struct address_space *mapping, sector_t bno,</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0) {</div><div class='ctx'> 		if (iter.iomap.type == IOMAP_MAPPED)</div><div class='ctx'> 			bno = iomap_sector(&amp;iter.iomap, iter.pos) &gt;&gt; blkshift;</div><div class='del'>-		/* leave iter.processed unset to abort loop */</div><div class='add'>+		/* leave iter.status unset to abort loop */</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/fs/iomap/internal.h b/fs/iomap/internal.h<br/>new file mode 100644<br/>index 000000000000..3a4e4aad2bd1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/internal.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _IOMAP_INTERNAL_H</div><div class='add'>+#define _IOMAP_INTERNAL_H 1</div><div class='add'>+</div><div class='add'>+#define IOEND_BATCH_SIZE	4096</div><div class='add'>+</div><div class='add'>+u32 iomap_finish_ioend_direct(struct iomap_ioend *ioend);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLOCK</div><div class='add'>+int iomap_bio_read_folio_range_sync(const struct iomap_iter *iter,</div><div class='add'>+		struct folio *folio, loff_t pos, size_t len);</div><div class='add'>+#else</div><div class='add'>+static inline int iomap_bio_read_folio_range_sync(const struct iomap_iter *iter,</div><div class='add'>+		struct folio *folio, loff_t pos, size_t len)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BLOCK */</div><div class='add'>+</div><div class='add'>+#endif /* _IOMAP_INTERNAL_H */</div><div class='head'>diff --git a/fs/iomap/ioend.c b/fs/iomap/ioend.c<br/>new file mode 100644<br/>index 000000000000..86f44922ed3b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/ioend.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/ioend.c</a></div><div class='hunk'>@@ -0,0 +1,432 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2016-2025 Christoph Hellwig.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/iomap.h&gt;</div><div class='add'>+#include &lt;linux/list_sort.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/writeback.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+struct bio_set iomap_ioend_bioset;</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_ioend_bioset);</div><div class='add'>+</div><div class='add'>+struct iomap_ioend *iomap_init_ioend(struct inode *inode,</div><div class='add'>+		struct bio *bio, loff_t file_offset, u16 ioend_flags)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *ioend = iomap_ioend_from_bio(bio);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;ioend-&gt;io_remaining, 1);</div><div class='add'>+	ioend-&gt;io_error = 0;</div><div class='add'>+	ioend-&gt;io_parent = NULL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ioend-&gt;io_list);</div><div class='add'>+	ioend-&gt;io_flags = ioend_flags;</div><div class='add'>+	ioend-&gt;io_inode = inode;</div><div class='add'>+	ioend-&gt;io_offset = file_offset;</div><div class='add'>+	ioend-&gt;io_size = bio-&gt;bi_iter.bi_size;</div><div class='add'>+	ioend-&gt;io_sector = bio-&gt;bi_iter.bi_sector;</div><div class='add'>+	ioend-&gt;io_private = NULL;</div><div class='add'>+	return ioend;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_init_ioend);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We're now finished for good with this ioend structure.  Update the folio</div><div class='add'>+ * state, release holds on bios, and finally free up memory.  Do not use the</div><div class='add'>+ * ioend after this.</div><div class='add'>+ */</div><div class='add'>+static u32 iomap_finish_ioend_buffered(struct iomap_ioend *ioend)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = ioend-&gt;io_inode;</div><div class='add'>+	struct bio *bio = &amp;ioend-&gt;io_bio;</div><div class='add'>+	struct folio_iter fi;</div><div class='add'>+	u32 folio_count = 0;</div><div class='add'>+</div><div class='add'>+	if (ioend-&gt;io_error) {</div><div class='add'>+		mapping_set_error(inode-&gt;i_mapping, ioend-&gt;io_error);</div><div class='add'>+		if (!bio_flagged(bio, BIO_QUIET)) {</div><div class='add'>+			pr_err_ratelimited(</div><div class='add'>+"%s: writeback error on inode %lu, offset %lld, sector %llu",</div><div class='add'>+				inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino,</div><div class='add'>+				ioend-&gt;io_offset, ioend-&gt;io_sector);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* walk all folios in bio, ending page IO on them */</div><div class='add'>+	bio_for_each_folio_all(fi, bio) {</div><div class='add'>+		iomap_finish_folio_write(inode, fi.folio, fi.length);</div><div class='add'>+		folio_count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bio_put(bio);	/* frees the ioend */</div><div class='add'>+	return folio_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioend_writeback_end_bio(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *ioend = iomap_ioend_from_bio(bio);</div><div class='add'>+</div><div class='add'>+	ioend-&gt;io_error = blk_status_to_errno(bio-&gt;bi_status);</div><div class='add'>+	iomap_finish_ioend_buffered(ioend);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We cannot cancel the ioend directly in case of an error, so call the bio end</div><div class='add'>+ * I/O handler with the error status here to run the normal I/O completion</div><div class='add'>+ * handler.</div><div class='add'>+ */</div><div class='add'>+int iomap_ioend_writeback_submit(struct iomap_writepage_ctx *wpc, int error)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *ioend = wpc-&gt;wb_ctx;</div><div class='add'>+</div><div class='add'>+	if (!ioend-&gt;io_bio.bi_end_io)</div><div class='add'>+		ioend-&gt;io_bio.bi_end_io = ioend_writeback_end_bio;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(wpc-&gt;iomap.flags &amp; IOMAP_F_ANON_WRITE))</div><div class='add'>+		error = -EIO;</div><div class='add'>+</div><div class='add'>+	if (error) {</div><div class='add'>+		ioend-&gt;io_bio.bi_status = errno_to_blk_status(error);</div><div class='add'>+		bio_endio(&amp;ioend-&gt;io_bio);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	submit_bio(&amp;ioend-&gt;io_bio);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_ioend_writeback_submit);</div><div class='add'>+</div><div class='add'>+static struct iomap_ioend *iomap_alloc_ioend(struct iomap_writepage_ctx *wpc,</div><div class='add'>+		loff_t pos, u16 ioend_flags)</div><div class='add'>+{</div><div class='add'>+	struct bio *bio;</div><div class='add'>+</div><div class='add'>+	bio = bio_alloc_bioset(wpc-&gt;iomap.bdev, BIO_MAX_VECS,</div><div class='add'>+			       REQ_OP_WRITE | wbc_to_write_flags(wpc-&gt;wbc),</div><div class='add'>+			       GFP_NOFS, &amp;iomap_ioend_bioset);</div><div class='add'>+	bio-&gt;bi_iter.bi_sector = iomap_sector(&amp;wpc-&gt;iomap, pos);</div><div class='add'>+	bio-&gt;bi_write_hint = wpc-&gt;inode-&gt;i_write_hint;</div><div class='add'>+	wbc_init_bio(wpc-&gt;wbc, bio);</div><div class='add'>+	wpc-&gt;nr_folios = 0;</div><div class='add'>+	return iomap_init_ioend(wpc-&gt;inode, bio, pos, ioend_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t pos,</div><div class='add'>+		u16 ioend_flags)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *ioend = wpc-&gt;wb_ctx;</div><div class='add'>+</div><div class='add'>+	if (ioend_flags &amp; IOMAP_IOEND_BOUNDARY)</div><div class='add'>+		return false;</div><div class='add'>+	if ((ioend_flags &amp; IOMAP_IOEND_NOMERGE_FLAGS) !=</div><div class='add'>+	    (ioend-&gt;io_flags &amp; IOMAP_IOEND_NOMERGE_FLAGS))</div><div class='add'>+		return false;</div><div class='add'>+	if (pos != ioend-&gt;io_offset + ioend-&gt;io_size)</div><div class='add'>+		return false;</div><div class='add'>+	if (!(wpc-&gt;iomap.flags &amp; IOMAP_F_ANON_WRITE) &amp;&amp;</div><div class='add'>+	    iomap_sector(&amp;wpc-&gt;iomap, pos) != bio_end_sector(&amp;ioend-&gt;io_bio))</div><div class='add'>+		return false;</div><div class='add'>+	/*</div><div class='add'>+	 * Limit ioend bio chain lengths to minimise IO completion latency. This</div><div class='add'>+	 * also prevents long tight loops ending page writeback on all the</div><div class='add'>+	 * folios in the ioend.</div><div class='add'>+	 */</div><div class='add'>+	if (wpc-&gt;nr_folios &gt;= IOEND_BATCH_SIZE)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test to see if we have an existing ioend structure that we could append to</div><div class='add'>+ * first; otherwise finish off the current ioend and start another.</div><div class='add'>+ *</div><div class='add'>+ * If a new ioend is created and cached, the old ioend is submitted to the block</div><div class='add'>+ * layer instantly.  Batching optimisations are provided by higher level block</div><div class='add'>+ * plugging.</div><div class='add'>+ *</div><div class='add'>+ * At the end of a writeback pass, there will be a cached ioend remaining on the</div><div class='add'>+ * writepage context that the caller will need to submit.</div><div class='add'>+ */</div><div class='add'>+ssize_t iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, struct folio *folio,</div><div class='add'>+		loff_t pos, loff_t end_pos, unsigned int dirty_len)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *ioend = wpc-&gt;wb_ctx;</div><div class='add'>+	size_t poff = offset_in_folio(folio, pos);</div><div class='add'>+	unsigned int ioend_flags = 0;</div><div class='add'>+	unsigned int map_len = min_t(u64, dirty_len,</div><div class='add'>+		wpc-&gt;iomap.offset + wpc-&gt;iomap.length - pos);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	trace_iomap_add_to_ioend(wpc-&gt;inode, pos, dirty_len, &amp;wpc-&gt;iomap);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!folio-&gt;private &amp;&amp; map_len &lt; dirty_len);</div><div class='add'>+</div><div class='add'>+	switch (wpc-&gt;iomap.type) {</div><div class='add'>+	case IOMAP_INLINE:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EIO;</div><div class='add'>+	case IOMAP_HOLE:</div><div class='add'>+		return map_len;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wpc-&gt;iomap.type == IOMAP_UNWRITTEN)</div><div class='add'>+		ioend_flags |= IOMAP_IOEND_UNWRITTEN;</div><div class='add'>+	if (wpc-&gt;iomap.flags &amp; IOMAP_F_SHARED)</div><div class='add'>+		ioend_flags |= IOMAP_IOEND_SHARED;</div><div class='add'>+	if (folio_test_dropbehind(folio))</div><div class='add'>+		ioend_flags |= IOMAP_IOEND_DONTCACHE;</div><div class='add'>+	if (pos == wpc-&gt;iomap.offset &amp;&amp; (wpc-&gt;iomap.flags &amp; IOMAP_F_BOUNDARY))</div><div class='add'>+		ioend_flags |= IOMAP_IOEND_BOUNDARY;</div><div class='add'>+</div><div class='add'>+	if (!ioend || !iomap_can_add_to_ioend(wpc, pos, ioend_flags)) {</div><div class='add'>+new_ioend:</div><div class='add'>+		if (ioend) {</div><div class='add'>+			error = wpc-&gt;ops-&gt;writeback_submit(wpc, 0);</div><div class='add'>+			if (error)</div><div class='add'>+				return error;</div><div class='add'>+		}</div><div class='add'>+		wpc-&gt;wb_ctx = ioend = iomap_alloc_ioend(wpc, pos, ioend_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bio_add_folio(&amp;ioend-&gt;io_bio, folio, map_len, poff))</div><div class='add'>+		goto new_ioend;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clamp io_offset and io_size to the incore EOF so that ondisk</div><div class='add'>+	 * file size updates in the ioend completion are byte-accurate.</div><div class='add'>+	 * This avoids recovering files with zeroed tail regions when</div><div class='add'>+	 * writeback races with appending writes:</div><div class='add'>+	 *</div><div class='add'>+	 *    Thread 1:                  Thread 2:</div><div class='add'>+	 *    ------------               -----------</div><div class='add'>+	 *    write [A, A+B]</div><div class='add'>+	 *    update inode size to A+B</div><div class='add'>+	 *    submit I/O [A, A+BS]</div><div class='add'>+	 *                               write [A+B, A+B+C]</div><div class='add'>+	 *                               update inode size to A+B+C</div><div class='add'>+	 *    &lt;I/O completes, updates disk size to min(A+B+C, A+BS)&gt;</div><div class='add'>+	 *    &lt;power failure&gt;</div><div class='add'>+	 *</div><div class='add'>+	 *  After reboot:</div><div class='add'>+	 *    1) with A+B+C &lt; A+BS, the file has zero padding in range</div><div class='add'>+	 *       [A+B, A+B+C]</div><div class='add'>+	 *</div><div class='add'>+	 *    |&lt;     Block Size (BS)   &gt;|</div><div class='add'>+	 *    |DDDDDDDDDDDD0000000000000|</div><div class='add'>+	 *    ^           ^        ^</div><div class='add'>+	 *    A          A+B     A+B+C</div><div class='add'>+	 *                       (EOF)</div><div class='add'>+	 *</div><div class='add'>+	 *    2) with A+B+C &gt; A+BS, the file has zero padding in range</div><div class='add'>+	 *       [A+B, A+BS]</div><div class='add'>+	 *</div><div class='add'>+	 *    |&lt;     Block Size (BS)   &gt;|&lt;     Block Size (BS)    &gt;|</div><div class='add'>+	 *    |DDDDDDDDDDDD0000000000000|00000000000000000000000000|</div><div class='add'>+	 *    ^           ^             ^           ^</div><div class='add'>+	 *    A          A+B           A+BS       A+B+C</div><div class='add'>+	 *                             (EOF)</div><div class='add'>+	 *</div><div class='add'>+	 *    D = Valid Data</div><div class='add'>+	 *    0 = Zero Padding</div><div class='add'>+	 *</div><div class='add'>+	 * Note that this defeats the ability to chain the ioends of</div><div class='add'>+	 * appending writes.</div><div class='add'>+	 */</div><div class='add'>+	ioend-&gt;io_size += map_len;</div><div class='add'>+	if (ioend-&gt;io_offset + ioend-&gt;io_size &gt; end_pos)</div><div class='add'>+		ioend-&gt;io_size = end_pos - ioend-&gt;io_offset;</div><div class='add'>+</div><div class='add'>+	wbc_account_cgroup_owner(wpc-&gt;wbc, folio, map_len);</div><div class='add'>+	return map_len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_add_to_ioend);</div><div class='add'>+</div><div class='add'>+static u32 iomap_finish_ioend(struct iomap_ioend *ioend, int error)</div><div class='add'>+{</div><div class='add'>+	if (ioend-&gt;io_parent) {</div><div class='add'>+		struct bio *bio = &amp;ioend-&gt;io_bio;</div><div class='add'>+</div><div class='add'>+		ioend = ioend-&gt;io_parent;</div><div class='add'>+		bio_put(bio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		cmpxchg(&amp;ioend-&gt;io_error, 0, error);</div><div class='add'>+</div><div class='add'>+	if (!atomic_dec_and_test(&amp;ioend-&gt;io_remaining))</div><div class='add'>+		return 0;</div><div class='add'>+	if (ioend-&gt;io_flags &amp; IOMAP_IOEND_DIRECT)</div><div class='add'>+		return iomap_finish_ioend_direct(ioend);</div><div class='add'>+	return iomap_finish_ioend_buffered(ioend);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ioend completion routine for merged bios. This can only be called from task</div><div class='add'>+ * contexts as merged ioends can be of unbound length. Hence we have to break up</div><div class='add'>+ * the writeback completions into manageable chunks to avoid long scheduler</div><div class='add'>+ * holdoffs. We aim to keep scheduler holdoffs down below 10ms so that we get</div><div class='add'>+ * good batch processing throughput without creating adverse scheduler latency</div><div class='add'>+ * conditions.</div><div class='add'>+ */</div><div class='add'>+void iomap_finish_ioends(struct iomap_ioend *ioend, int error)</div><div class='add'>+{</div><div class='add'>+	struct list_head tmp;</div><div class='add'>+	u32 completions;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	list_replace_init(&amp;ioend-&gt;io_list, &amp;tmp);</div><div class='add'>+	completions = iomap_finish_ioend(ioend, error);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;tmp)) {</div><div class='add'>+		if (completions &gt; IOEND_BATCH_SIZE * 8) {</div><div class='add'>+			cond_resched();</div><div class='add'>+			completions = 0;</div><div class='add'>+		}</div><div class='add'>+		ioend = list_first_entry(&amp;tmp, struct iomap_ioend, io_list);</div><div class='add'>+		list_del_init(&amp;ioend-&gt;io_list);</div><div class='add'>+		completions += iomap_finish_ioend(ioend, error);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_finish_ioends);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We can merge two adjacent ioends if they have the same set of work to do.</div><div class='add'>+ */</div><div class='add'>+static bool iomap_ioend_can_merge(struct iomap_ioend *ioend,</div><div class='add'>+		struct iomap_ioend *next)</div><div class='add'>+{</div><div class='add'>+	if (ioend-&gt;io_bio.bi_status != next-&gt;io_bio.bi_status)</div><div class='add'>+		return false;</div><div class='add'>+	if (next-&gt;io_flags &amp; IOMAP_IOEND_BOUNDARY)</div><div class='add'>+		return false;</div><div class='add'>+	if ((ioend-&gt;io_flags &amp; IOMAP_IOEND_NOMERGE_FLAGS) !=</div><div class='add'>+	    (next-&gt;io_flags &amp; IOMAP_IOEND_NOMERGE_FLAGS))</div><div class='add'>+		return false;</div><div class='add'>+	if (ioend-&gt;io_offset + ioend-&gt;io_size != next-&gt;io_offset)</div><div class='add'>+		return false;</div><div class='add'>+	/*</div><div class='add'>+	 * Do not merge physically discontiguous ioends. The filesystem</div><div class='add'>+	 * completion functions will have to iterate the physical</div><div class='add'>+	 * discontiguities even if we merge the ioends at a logical level, so</div><div class='add'>+	 * we don't gain anything by merging physical discontiguities here.</div><div class='add'>+	 *</div><div class='add'>+	 * We cannot use bio-&gt;bi_iter.bi_sector here as it is modified during</div><div class='add'>+	 * submission so does not point to the start sector of the bio at</div><div class='add'>+	 * completion.</div><div class='add'>+	 */</div><div class='add'>+	if (ioend-&gt;io_sector + (ioend-&gt;io_size &gt;&gt; SECTOR_SHIFT) !=</div><div class='add'>+	    next-&gt;io_sector)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iomap_ioend_try_merge(struct iomap_ioend *ioend,</div><div class='add'>+		struct list_head *more_ioends)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *next;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ioend-&gt;io_list);</div><div class='add'>+</div><div class='add'>+	while ((next = list_first_entry_or_null(more_ioends, struct iomap_ioend,</div><div class='add'>+			io_list))) {</div><div class='add'>+		if (!iomap_ioend_can_merge(ioend, next))</div><div class='add'>+			break;</div><div class='add'>+		list_move_tail(&amp;next-&gt;io_list, &amp;ioend-&gt;io_list);</div><div class='add'>+		ioend-&gt;io_size += next-&gt;io_size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_ioend_try_merge);</div><div class='add'>+</div><div class='add'>+static int iomap_ioend_compare(void *priv, const struct list_head *a,</div><div class='add'>+		const struct list_head *b)</div><div class='add'>+{</div><div class='add'>+	struct iomap_ioend *ia = container_of(a, struct iomap_ioend, io_list);</div><div class='add'>+	struct iomap_ioend *ib = container_of(b, struct iomap_ioend, io_list);</div><div class='add'>+</div><div class='add'>+	if (ia-&gt;io_offset &lt; ib-&gt;io_offset)</div><div class='add'>+		return -1;</div><div class='add'>+	if (ia-&gt;io_offset &gt; ib-&gt;io_offset)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iomap_sort_ioends(struct list_head *ioend_list)</div><div class='add'>+{</div><div class='add'>+	list_sort(NULL, ioend_list, iomap_ioend_compare);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_sort_ioends);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Split up to the first @max_len bytes from @ioend if the ioend covers more</div><div class='add'>+ * than @max_len bytes.</div><div class='add'>+ *</div><div class='add'>+ * If @is_append is set, the split will be based on the hardware limits for</div><div class='add'>+ * REQ_OP_ZONE_APPEND commands and can be less than @max_len if the hardware</div><div class='add'>+ * limits don't allow the entire @max_len length.</div><div class='add'>+ *</div><div class='add'>+ * The bio embedded into @ioend must be a REQ_OP_WRITE because the block layer</div><div class='add'>+ * does not allow splitting REQ_OP_ZONE_APPEND bios.  The file systems has to</div><div class='add'>+ * switch the operation after this call, but before submitting the bio.</div><div class='add'>+ */</div><div class='add'>+struct iomap_ioend *iomap_split_ioend(struct iomap_ioend *ioend,</div><div class='add'>+		unsigned int max_len, bool is_append)</div><div class='add'>+{</div><div class='add'>+	struct bio *bio = &amp;ioend-&gt;io_bio;</div><div class='add'>+	struct iomap_ioend *split_ioend;</div><div class='add'>+	unsigned int nr_segs;</div><div class='add'>+	int sector_offset;</div><div class='add'>+	struct bio *split;</div><div class='add'>+</div><div class='add'>+	if (is_append) {</div><div class='add'>+		struct queue_limits *lim = bdev_limits(bio-&gt;bi_bdev);</div><div class='add'>+</div><div class='add'>+		max_len = min(max_len,</div><div class='add'>+			      lim-&gt;max_zone_append_sectors &lt;&lt; SECTOR_SHIFT);</div><div class='add'>+</div><div class='add'>+		sector_offset = bio_split_rw_at(bio, lim, &amp;nr_segs, max_len);</div><div class='add'>+		if (unlikely(sector_offset &lt; 0))</div><div class='add'>+			return ERR_PTR(sector_offset);</div><div class='add'>+		if (!sector_offset)</div><div class='add'>+			return NULL;</div><div class='add'>+	} else {</div><div class='add'>+		if (bio-&gt;bi_iter.bi_size &lt;= max_len)</div><div class='add'>+			return NULL;</div><div class='add'>+		sector_offset = max_len &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure the split ioend is still block size aligned */</div><div class='add'>+	sector_offset = ALIGN_DOWN(sector_offset &lt;&lt; SECTOR_SHIFT,</div><div class='add'>+			i_blocksize(ioend-&gt;io_inode)) &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+</div><div class='add'>+	split = bio_split(bio, sector_offset, GFP_NOFS, &amp;iomap_ioend_bioset);</div><div class='add'>+	if (IS_ERR(split))</div><div class='add'>+		return ERR_CAST(split);</div><div class='add'>+	split-&gt;bi_private = bio-&gt;bi_private;</div><div class='add'>+	split-&gt;bi_end_io = bio-&gt;bi_end_io;</div><div class='add'>+</div><div class='add'>+	split_ioend = iomap_init_ioend(ioend-&gt;io_inode, split, ioend-&gt;io_offset,</div><div class='add'>+			ioend-&gt;io_flags);</div><div class='add'>+	split_ioend-&gt;io_parent = ioend;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ioend-&gt;io_remaining);</div><div class='add'>+	ioend-&gt;io_offset += split_ioend-&gt;io_size;</div><div class='add'>+	ioend-&gt;io_size -= split_ioend-&gt;io_size;</div><div class='add'>+</div><div class='add'>+	split_ioend-&gt;io_sector = ioend-&gt;io_sector;</div><div class='add'>+	if (!is_append)</div><div class='add'>+		ioend-&gt;io_sector += (split_ioend-&gt;io_size &gt;&gt; SECTOR_SHIFT);</div><div class='add'>+	return split_ioend;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iomap_split_ioend);</div><div class='add'>+</div><div class='add'>+static int __init iomap_ioend_init(void)</div><div class='add'>+{</div><div class='add'>+	return bioset_init(&amp;iomap_ioend_bioset, 4 * (PAGE_SIZE / SECTOR_SIZE),</div><div class='add'>+			   offsetof(struct iomap_ioend, io_bio),</div><div class='add'>+			   BIOSET_NEED_BVECS);</div><div class='add'>+}</div><div class='add'>+fs_initcall(iomap_ioend_init);</div><div class='head'>diff --git a/fs/iomap/iter.c b/fs/iomap/iter.c<br/>index 79a0614eaab7..8692e5e41c6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/iter.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/iter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/iter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/iter.c</a></div><div class='hunk'>@@ -3,45 +3,30 @@</div><div class='ctx'>  * Copyright (C) 2010 Red Hat, Inc.</div><div class='ctx'>  * Copyright (c) 2016-2021 Christoph Hellwig.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Advance to the next range we need to map.</div><div class='del'>- *</div><div class='del'>- * If the iomap is marked IOMAP_F_STALE, it means the existing map was not fully</div><div class='del'>- * processed - it was aborted because the extent the iomap spanned may have been</div><div class='del'>- * changed during the operation. In this case, the iteration behaviour is to</div><div class='del'>- * remap the unprocessed range of the iter, and that means we may need to remap</div><div class='del'>- * even when we've made no progress (i.e. iter-&gt;processed = 0). Hence the</div><div class='del'>- * "finished iterating" case needs to distinguish between</div><div class='del'>- * (processed = 0) meaning we are done and (processed = 0 &amp;&amp; stale) meaning we</div><div class='del'>- * need to remap the entire remaining range.</div><div class='del'>- */</div><div class='del'>-static inline int iomap_iter_advance(struct iomap_iter *iter)</div><div class='add'>+static inline void iomap_iter_reset_iomap(struct iomap_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	bool stale = iter-&gt;iomap.flags &amp; IOMAP_F_STALE;</div><div class='del'>-</div><div class='del'>-	/* handle the previous iteration (if any) */</div><div class='del'>-	if (iter-&gt;iomap.length) {</div><div class='del'>-		if (iter-&gt;processed &lt; 0)</div><div class='del'>-			return iter-&gt;processed;</div><div class='del'>-		if (!iter-&gt;processed &amp;&amp; !stale)</div><div class='del'>-			return 0;</div><div class='del'>-		if (WARN_ON_ONCE(iter-&gt;processed &gt; iomap_length(iter)))</div><div class='del'>-			return -EIO;</div><div class='del'>-		iter-&gt;pos += iter-&gt;processed;</div><div class='del'>-		iter-&gt;len -= iter-&gt;processed;</div><div class='del'>-		if (!iter-&gt;len)</div><div class='del'>-			return 0;</div><div class='add'>+	if (iter-&gt;fbatch) {</div><div class='add'>+		folio_batch_release(iter-&gt;fbatch);</div><div class='add'>+		kfree(iter-&gt;fbatch);</div><div class='add'>+		iter-&gt;fbatch = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* clear the state for the next iteration */</div><div class='del'>-	iter-&gt;processed = 0;</div><div class='add'>+	iter-&gt;status = 0;</div><div class='ctx'> 	memset(&amp;iter-&gt;iomap, 0, sizeof(iter-&gt;iomap));</div><div class='ctx'> 	memset(&amp;iter-&gt;srcmap, 0, sizeof(iter-&gt;srcmap));</div><div class='del'>-	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Advance the current iterator position and decrement the remaining length */</div><div class='add'>+int iomap_iter_advance(struct iomap_iter *iter, u64 count)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(count &gt; iomap_length(iter)))</div><div class='add'>+		return -EIO;</div><div class='add'>+	iter-&gt;pos += count;</div><div class='add'>+	iter-&gt;len -= count;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iomap_iter_done(struct iomap_iter *iter)</div><div class='hunk'>@@ -51,6 +36,8 @@ static inline void iomap_iter_done(struct iomap_iter *iter)</div><div class='ctx'> 	WARN_ON_ONCE(iter-&gt;iomap.offset + iter-&gt;iomap.length &lt;= iter-&gt;pos);</div><div class='ctx'> 	WARN_ON_ONCE(iter-&gt;iomap.flags &amp; IOMAP_F_STALE);</div><div class='ctx'> </div><div class='add'>+	iter-&gt;iter_start_pos = iter-&gt;pos;</div><div class='add'>+</div><div class='ctx'> 	trace_iomap_iter_dstmap(iter-&gt;inode, &amp;iter-&gt;iomap);</div><div class='ctx'> 	if (iter-&gt;srcmap.type != IOMAP_HOLE)</div><div class='ctx'> 		trace_iomap_iter_srcmap(iter-&gt;inode, &amp;iter-&gt;srcmap);</div><div class='hunk'>@@ -68,26 +55,58 @@ static inline void iomap_iter_done(struct iomap_iter *iter)</div><div class='ctx'>  * function must be called in a loop that continues as long it returns a</div><div class='ctx'>  * positive value.  If 0 or a negative value is returned, the caller must not</div><div class='ctx'>  * return to the loop body.  Within a loop body, there are two ways to break out</div><div class='del'>- * of the loop body:  leave @iter.processed unchanged, or set it to a negative</div><div class='add'>+ * of the loop body:  leave @iter.status unchanged, or set it to a negative</div><div class='ctx'>  * errno.</div><div class='ctx'>  */</div><div class='ctx'> int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	bool stale = iter-&gt;iomap.flags &amp; IOMAP_F_STALE;</div><div class='add'>+	ssize_t advanced;</div><div class='add'>+	u64 olen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (iter-&gt;iomap.length &amp;&amp; ops-&gt;iomap_end) {</div><div class='del'>-		ret = ops-&gt;iomap_end(iter-&gt;inode, iter-&gt;pos, iomap_length(iter),</div><div class='del'>-				iter-&gt;processed &gt; 0 ? iter-&gt;processed : 0,</div><div class='del'>-				iter-&gt;flags, &amp;iter-&gt;iomap);</div><div class='del'>-		if (ret &lt; 0 &amp;&amp; !iter-&gt;processed)</div><div class='add'>+	trace_iomap_iter(iter, ops, _RET_IP_);</div><div class='add'>+</div><div class='add'>+	if (!iter-&gt;iomap.length)</div><div class='add'>+		goto begin;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate how far the iter was advanced and the original length bytes</div><div class='add'>+	 * for -&gt;iomap_end().</div><div class='add'>+	 */</div><div class='add'>+	advanced = iter-&gt;pos - iter-&gt;iter_start_pos;</div><div class='add'>+	olen = iter-&gt;len + advanced;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;iomap_end) {</div><div class='add'>+		ret = ops-&gt;iomap_end(iter-&gt;inode, iter-&gt;iter_start_pos,</div><div class='add'>+				iomap_length_trim(iter, iter-&gt;iter_start_pos,</div><div class='add'>+						  olen),</div><div class='add'>+				advanced, iter-&gt;flags, &amp;iter-&gt;iomap);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; !advanced)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trace_iomap_iter(iter, ops, _RET_IP_);</div><div class='del'>-	ret = iomap_iter_advance(iter);</div><div class='add'>+	/* detect old return semantics where this would advance */</div><div class='add'>+	if (WARN_ON_ONCE(iter-&gt;status &gt; 0))</div><div class='add'>+		iter-&gt;status = -EIO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use iter-&gt;len to determine whether to continue onto the next mapping.</div><div class='add'>+	 * Explicitly terminate on error status or if the current iter has not</div><div class='add'>+	 * advanced at all (i.e. no work was done for some reason) unless the</div><div class='add'>+	 * mapping has been marked stale and needs to be reprocessed.</div><div class='add'>+	 */</div><div class='add'>+	if (iter-&gt;status &lt; 0)</div><div class='add'>+		ret = iter-&gt;status;</div><div class='add'>+	else if (iter-&gt;len == 0 || (!advanced &amp;&amp; !stale))</div><div class='add'>+		ret = 0;</div><div class='add'>+	else</div><div class='add'>+		ret = 1;</div><div class='add'>+	iomap_iter_reset_iomap(iter);</div><div class='ctx'> 	if (ret &lt;= 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+begin:</div><div class='ctx'> 	ret = ops-&gt;iomap_begin(iter-&gt;inode, iter-&gt;pos, iter-&gt;len, iter-&gt;flags,</div><div class='ctx'> 			       &amp;iter-&gt;iomap, &amp;iter-&gt;srcmap);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c<br/>index a845c012b50c..6cbc587c93da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/seek.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/seek.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/seek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/seek.c</a></div><div class='hunk'>@@ -3,14 +3,10 @@</div><div class='ctx'>  * Copyright (C) 2017 Red Hat, Inc.</div><div class='ctx'>  * Copyright (c) 2018-2021 Christoph Hellwig.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/pagevec.h&gt;</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_seek_hole_iter(const struct iomap_iter *iter,</div><div class='add'>+static int iomap_seek_hole_iter(struct iomap_iter *iter,</div><div class='ctx'> 		loff_t *hole_pos)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t length = iomap_length(iter);</div><div class='hunk'>@@ -20,13 +16,13 @@ static loff_t iomap_seek_hole_iter(const struct iomap_iter *iter,</div><div class='ctx'> 		*hole_pos = mapping_seek_hole_data(iter-&gt;inode-&gt;i_mapping,</div><div class='ctx'> 				iter-&gt;pos, iter-&gt;pos + length, SEEK_HOLE);</div><div class='ctx'> 		if (*hole_pos == iter-&gt;pos + length)</div><div class='del'>-			return length;</div><div class='add'>+			return iomap_iter_advance(iter, length);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case IOMAP_HOLE:</div><div class='ctx'> 		*hole_pos = iter-&gt;pos;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='del'>-		return length;</div><div class='add'>+		return iomap_iter_advance(iter, length);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +43,7 @@ iomap_seek_hole(struct inode *inode, loff_t pos, const struct iomap_ops *ops)</div><div class='ctx'> </div><div class='ctx'> 	iter.len = size - pos;</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_seek_hole_iter(&amp;iter, &amp;pos);</div><div class='add'>+		iter.status = iomap_seek_hole_iter(&amp;iter, &amp;pos);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (iter.len) /* found hole before EOF */</div><div class='hunk'>@@ -56,19 +52,19 @@ iomap_seek_hole(struct inode *inode, loff_t pos, const struct iomap_ops *ops)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_seek_hole);</div><div class='ctx'> </div><div class='del'>-static loff_t iomap_seek_data_iter(const struct iomap_iter *iter,</div><div class='add'>+static int iomap_seek_data_iter(struct iomap_iter *iter,</div><div class='ctx'> 		loff_t *hole_pos)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t length = iomap_length(iter);</div><div class='ctx'> </div><div class='ctx'> 	switch (iter-&gt;iomap.type) {</div><div class='ctx'> 	case IOMAP_HOLE:</div><div class='del'>-		return length;</div><div class='add'>+		return iomap_iter_advance(iter, length);</div><div class='ctx'> 	case IOMAP_UNWRITTEN:</div><div class='ctx'> 		*hole_pos = mapping_seek_hole_data(iter-&gt;inode-&gt;i_mapping,</div><div class='ctx'> 				iter-&gt;pos, iter-&gt;pos + length, SEEK_DATA);</div><div class='ctx'> 		if (*hole_pos &lt; 0)</div><div class='del'>-			return length;</div><div class='add'>+			return iomap_iter_advance(iter, length);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		*hole_pos = iter-&gt;pos;</div><div class='hunk'>@@ -93,7 +89,7 @@ iomap_seek_data(struct inode *inode, loff_t pos, const struct iomap_ops *ops)</div><div class='ctx'> </div><div class='ctx'> 	iter.len = size - pos;</div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_seek_data_iter(&amp;iter, &amp;pos);</div><div class='add'>+		iter.status = iomap_seek_data_iter(&amp;iter, &amp;pos);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (iter.len) /* found data before EOF */</div><div class='head'>diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c<br/>index 5fc0ac36dee3..0db77c449467 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/swapfile.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/swapfile.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/swapfile.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/swapfile.c</a></div><div class='hunk'>@@ -3,9 +3,6 @@</div><div class='ctx'>  * Copyright (C) 2018 Oracle.  All Rights Reserved.</div><div class='ctx'>  * Author: Darrick J. Wong &lt;darrick.wong@oracle.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +91,7 @@ static int iomap_swapfile_fail(struct iomap_swapfile_info *isi, const char *str)</div><div class='ctx'>  * swap only cares about contiguous page-aligned physical extents and makes no</div><div class='ctx'>  * distinction between written and unwritten extents.</div><div class='ctx'>  */</div><div class='del'>-static loff_t iomap_swapfile_iter(const struct iomap_iter *iter,</div><div class='add'>+static int iomap_swapfile_iter(struct iomap_iter *iter,</div><div class='ctx'> 		struct iomap *iomap, struct iomap_swapfile_info *isi)</div><div class='ctx'> {</div><div class='ctx'> 	switch (iomap-&gt;type) {</div><div class='hunk'>@@ -132,7 +129,8 @@ static loff_t iomap_swapfile_iter(const struct iomap_iter *iter,</div><div class='ctx'> 			return error;</div><div class='ctx'> 		memcpy(&amp;isi-&gt;iomap, iomap, sizeof(isi-&gt;iomap));</div><div class='ctx'> 	}</div><div class='del'>-	return iomap_length(iter);</div><div class='add'>+</div><div class='add'>+	return iomap_iter_advance_full(iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -166,7 +164,7 @@ int iomap_swapfile_activate(struct swap_info_struct *sis,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	while ((ret = iomap_iter(&amp;iter, ops)) &gt; 0)</div><div class='del'>-		iter.processed = iomap_swapfile_iter(&amp;iter, &amp;iter.iomap, &amp;isi);</div><div class='add'>+		iter.status = iomap_swapfile_iter(&amp;iter, &amp;iter.iomap, &amp;isi);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +187,6 @@ int iomap_swapfile_activate(struct swap_info_struct *sis,</div><div class='ctx'> 	*pagespan = 1 + isi.highest_ppage - isi.lowest_ppage;</div><div class='ctx'> 	sis-&gt;max = isi.nr_pages;</div><div class='ctx'> 	sis-&gt;pages = isi.nr_pages - 1;</div><div class='del'>-	sis-&gt;highest_bit = isi.nr_pages - 1;</div><div class='ctx'> 	return isi.nr_extents;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iomap_swapfile_activate);</div><div class='head'>diff --git a/fs/iomap/trace.c b/fs/iomap/trace.c<br/>index 728d5443daf5..da217246b1a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/trace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/trace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/trace.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (c) 2019 Christoph Hellwig</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/iomap.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We include this last to have the helpers above available for the trace</div><div class='head'>diff --git a/fs/iomap/trace.h b/fs/iomap/trace.h<br/>index c16fd55f5595..532787277b16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/iomap/trace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/iomap/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/iomap/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/iomap/trace.h</a></div><div class='hunk'>@@ -79,11 +79,12 @@ DECLARE_EVENT_CLASS(iomap_range_class,</div><div class='ctx'> DEFINE_EVENT(iomap_range_class, name,	\</div><div class='ctx'> 	TP_PROTO(struct inode *inode, loff_t off, u64 len),\</div><div class='ctx'> 	TP_ARGS(inode, off, len))</div><div class='del'>-DEFINE_RANGE_EVENT(iomap_writepage);</div><div class='add'>+DEFINE_RANGE_EVENT(iomap_writeback_folio);</div><div class='ctx'> DEFINE_RANGE_EVENT(iomap_release_folio);</div><div class='ctx'> DEFINE_RANGE_EVENT(iomap_invalidate_folio);</div><div class='ctx'> DEFINE_RANGE_EVENT(iomap_dio_invalidate_fail);</div><div class='ctx'> DEFINE_RANGE_EVENT(iomap_dio_rw_queued);</div><div class='add'>+DEFINE_RANGE_EVENT(iomap_zero_iter);</div><div class='ctx'> </div><div class='ctx'> #define IOMAP_TYPE_STRINGS \</div><div class='ctx'> 	{ IOMAP_HOLE,		"HOLE" }, \</div><div class='hunk'>@@ -98,7 +99,12 @@ DEFINE_RANGE_EVENT(iomap_dio_rw_queued);</div><div class='ctx'> 	{ IOMAP_REPORT,		"REPORT" }, \</div><div class='ctx'> 	{ IOMAP_FAULT,		"FAULT" }, \</div><div class='ctx'> 	{ IOMAP_DIRECT,		"DIRECT" }, \</div><div class='del'>-	{ IOMAP_NOWAIT,		"NOWAIT" }</div><div class='add'>+	{ IOMAP_NOWAIT,		"NOWAIT" }, \</div><div class='add'>+	{ IOMAP_OVERWRITE_ONLY,	"OVERWRITE_ONLY" }, \</div><div class='add'>+	{ IOMAP_UNSHARE,	"UNSHARE" }, \</div><div class='add'>+	{ IOMAP_DAX,		"DAX" }, \</div><div class='add'>+	{ IOMAP_ATOMIC,		"ATOMIC" }, \</div><div class='add'>+	{ IOMAP_DONTCACHE,	"DONTCACHE" }</div><div class='ctx'> </div><div class='ctx'> #define IOMAP_F_FLAGS_STRINGS \</div><div class='ctx'> 	{ IOMAP_F_NEW,		"NEW" }, \</div><div class='hunk'>@@ -106,12 +112,20 @@ DEFINE_RANGE_EVENT(iomap_dio_rw_queued);</div><div class='ctx'> 	{ IOMAP_F_SHARED,	"SHARED" }, \</div><div class='ctx'> 	{ IOMAP_F_MERGED,	"MERGED" }, \</div><div class='ctx'> 	{ IOMAP_F_BUFFER_HEAD,	"BH" }, \</div><div class='del'>-	{ IOMAP_F_SIZE_CHANGED,	"SIZE_CHANGED" }</div><div class='add'>+	{ IOMAP_F_XATTR,	"XATTR" }, \</div><div class='add'>+	{ IOMAP_F_BOUNDARY,	"BOUNDARY" }, \</div><div class='add'>+	{ IOMAP_F_ANON_WRITE,	"ANON_WRITE" }, \</div><div class='add'>+	{ IOMAP_F_ATOMIC_BIO,	"ATOMIC_BIO" }, \</div><div class='add'>+	{ IOMAP_F_PRIVATE,	"PRIVATE" }, \</div><div class='add'>+	{ IOMAP_F_SIZE_CHANGED,	"SIZE_CHANGED" }, \</div><div class='add'>+	{ IOMAP_F_STALE,	"STALE" }</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define IOMAP_DIO_STRINGS \</div><div class='del'>-	{IOMAP_DIO_FORCE_WAIT,	"DIO_FORCE_WAIT" }, \</div><div class='del'>-	{IOMAP_DIO_OVERWRITE_ONLY, "DIO_OVERWRITE_ONLY" }, \</div><div class='del'>-	{IOMAP_DIO_PARTIAL,	"DIO_PARTIAL" }</div><div class='add'>+	{IOMAP_DIO_FORCE_WAIT,		"DIO_FORCE_WAIT" }, \</div><div class='add'>+	{IOMAP_DIO_OVERWRITE_ONLY,	"DIO_OVERWRITE_ONLY" }, \</div><div class='add'>+	{IOMAP_DIO_PARTIAL,		"DIO_PARTIAL" }, \</div><div class='add'>+	{IOMAP_DIO_FSBLOCK_ALIGNED,	"DIO_FSBLOCK_ALIGNED" }</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(iomap_class,</div><div class='ctx'> 	TP_PROTO(struct inode *inode, struct iomap *iomap),</div><div class='hunk'>@@ -137,7 +151,7 @@ DECLARE_EVENT_CLASS(iomap_class,</div><div class='ctx'> 		__entry-&gt;bdev = iomap-&gt;bdev ? iomap-&gt;bdev-&gt;bd_dev : 0;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("dev %d:%d ino 0x%llx bdev %d:%d addr 0x%llx offset 0x%llx "</div><div class='del'>-		  "length 0x%llx type %s flags %s",</div><div class='add'>+		  "length 0x%llx type %s (0x%x) flags %s (0x%x)",</div><div class='ctx'> 		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='ctx'> 		  __entry-&gt;ino,</div><div class='ctx'> 		  MAJOR(__entry-&gt;bdev), MINOR(__entry-&gt;bdev),</div><div class='hunk'>@@ -145,7 +159,9 @@ DECLARE_EVENT_CLASS(iomap_class,</div><div class='ctx'> 		  __entry-&gt;offset,</div><div class='ctx'> 		  __entry-&gt;length,</div><div class='ctx'> 		  __print_symbolic(__entry-&gt;type, IOMAP_TYPE_STRINGS),</div><div class='del'>-		  __print_flags(__entry-&gt;flags, "|", IOMAP_F_FLAGS_STRINGS))</div><div class='add'>+		  __entry-&gt;type,</div><div class='add'>+		  __print_flags(__entry-&gt;flags, "|", IOMAP_F_FLAGS_STRINGS),</div><div class='add'>+		  __entry-&gt;flags)</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_IOMAP_EVENT(name)		\</div><div class='hunk'>@@ -154,7 +170,50 @@ DEFINE_EVENT(iomap_class, name,	\</div><div class='ctx'> 	TP_ARGS(inode, iomap))</div><div class='ctx'> DEFINE_IOMAP_EVENT(iomap_iter_dstmap);</div><div class='ctx'> DEFINE_IOMAP_EVENT(iomap_iter_srcmap);</div><div class='del'>-DEFINE_IOMAP_EVENT(iomap_writepage_map);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(iomap_add_to_ioend,</div><div class='add'>+	TP_PROTO(struct inode *inode, u64 pos, unsigned int dirty_len,</div><div class='add'>+		 struct iomap *iomap),</div><div class='add'>+	TP_ARGS(inode, pos, dirty_len, iomap),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(dev_t, dev)</div><div class='add'>+		__field(u64, ino)</div><div class='add'>+		__field(u64, pos)</div><div class='add'>+		__field(u64, dirty_len)</div><div class='add'>+		__field(u64, addr)</div><div class='add'>+		__field(loff_t, offset)</div><div class='add'>+		__field(u64, length)</div><div class='add'>+		__field(u16, type)</div><div class='add'>+		__field(u16, flags)</div><div class='add'>+		__field(dev_t, bdev)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='add'>+		__entry-&gt;ino = inode-&gt;i_ino;</div><div class='add'>+		__entry-&gt;pos = pos;</div><div class='add'>+		__entry-&gt;dirty_len = dirty_len;</div><div class='add'>+		__entry-&gt;addr = iomap-&gt;addr;</div><div class='add'>+		__entry-&gt;offset = iomap-&gt;offset;</div><div class='add'>+		__entry-&gt;length = iomap-&gt;length;</div><div class='add'>+		__entry-&gt;type = iomap-&gt;type;</div><div class='add'>+		__entry-&gt;flags = iomap-&gt;flags;</div><div class='add'>+		__entry-&gt;bdev = iomap-&gt;bdev ? iomap-&gt;bdev-&gt;bd_dev : 0;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("dev %d:%d ino 0x%llx bdev %d:%d pos 0x%llx dirty len 0x%llx "</div><div class='add'>+		  "addr 0x%llx offset 0x%llx length 0x%llx type %s (0x%x) flags %s (0x%x)",</div><div class='add'>+		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='add'>+		  __entry-&gt;ino,</div><div class='add'>+		  MAJOR(__entry-&gt;bdev), MINOR(__entry-&gt;bdev),</div><div class='add'>+		  __entry-&gt;pos,</div><div class='add'>+		  __entry-&gt;dirty_len,</div><div class='add'>+		  __entry-&gt;addr,</div><div class='add'>+		  __entry-&gt;offset,</div><div class='add'>+		  __entry-&gt;length,</div><div class='add'>+		  __print_symbolic(__entry-&gt;type, IOMAP_TYPE_STRINGS),</div><div class='add'>+		  __entry-&gt;type,</div><div class='add'>+		  __print_flags(__entry-&gt;flags, "|", IOMAP_F_FLAGS_STRINGS),</div><div class='add'>+		  __entry-&gt;flags)</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iomap_iter,</div><div class='ctx'> 	TP_PROTO(struct iomap_iter *iter, const void *ops,</div><div class='hunk'>@@ -165,6 +224,7 @@ TRACE_EVENT(iomap_iter,</div><div class='ctx'> 		__field(u64, ino)</div><div class='ctx'> 		__field(loff_t, pos)</div><div class='ctx'> 		__field(u64, length)</div><div class='add'>+		__field(int, status)</div><div class='ctx'> 		__field(unsigned int, flags)</div><div class='ctx'> 		__field(const void *, ops)</div><div class='ctx'> 		__field(unsigned long, caller)</div><div class='hunk'>@@ -174,15 +234,17 @@ TRACE_EVENT(iomap_iter,</div><div class='ctx'> 		__entry-&gt;ino = iter-&gt;inode-&gt;i_ino;</div><div class='ctx'> 		__entry-&gt;pos = iter-&gt;pos;</div><div class='ctx'> 		__entry-&gt;length = iomap_length(iter);</div><div class='add'>+		__entry-&gt;status = iter-&gt;status;</div><div class='ctx'> 		__entry-&gt;flags = iter-&gt;flags;</div><div class='ctx'> 		__entry-&gt;ops = ops;</div><div class='ctx'> 		__entry-&gt;caller = caller;</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("dev %d:%d ino 0x%llx pos 0x%llx length 0x%llx flags %s (0x%x) ops %ps caller %pS",</div><div class='add'>+	TP_printk("dev %d:%d ino 0x%llx pos 0x%llx length 0x%llx status %d flags %s (0x%x) ops %ps caller %pS",</div><div class='ctx'> 		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='ctx'> 		   __entry-&gt;ino,</div><div class='ctx'> 		   __entry-&gt;pos,</div><div class='ctx'> 		   __entry-&gt;length,</div><div class='add'>+		   __entry-&gt;status,</div><div class='ctx'> 		   __print_flags(__entry-&gt;flags, "|", IOMAP_FLAGS_STRINGS),</div><div class='ctx'> 		   __entry-&gt;flags,</div><div class='ctx'> 		   __entry-&gt;ops,</div><div class='head'>diff --git a/fs/isofs/Makefile b/fs/isofs/Makefile<br/>index 6498fd2b0f60..b25bc542a22b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/Makefile</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ISO9660_FS) += isofs.o</div><div class='ctx'> </div><div class='del'>-isofs-objs-y 			:= namei.o inode.o dir.o util.o rock.o export.o</div><div class='del'>-isofs-objs-$(CONFIG_JOLIET)	+= joliet.o</div><div class='del'>-isofs-objs-$(CONFIG_ZISOFS)	+= compress.o</div><div class='del'>-isofs-objs			:= $(isofs-objs-y)</div><div class='add'>+isofs-y 		:= namei.o inode.o dir.o util.o rock.o export.o</div><div class='add'>+isofs-$(CONFIG_JOLIET)	+= joliet.o</div><div class='add'>+isofs-$(CONFIG_ZISOFS)	+= compress.o</div><div class='head'>diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c<br/>index c4da3f634b92..5f3b6da0e022 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/compress.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/compress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/compress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/compress.c</a></div><div class='hunk'>@@ -301,7 +301,6 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount,</div><div class='ctx'>  */</div><div class='ctx'> static int zisofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -311,16 +310,15 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 		PAGE_SHIFT &lt;= zisofs_block_shift ?</div><div class='ctx'> 		(1 &lt;&lt; (zisofs_block_shift - PAGE_SHIFT)) : 0;</div><div class='ctx'> 	struct page **pages;</div><div class='del'>-	pgoff_t index = page-&gt;index, end_index;</div><div class='add'>+	pgoff_t index = folio-&gt;index, end_index;</div><div class='ctx'> </div><div class='ctx'> 	end_index = (inode-&gt;i_size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	/*</div><div class='del'>-	 * If this page is wholly outside i_size we just return zero;</div><div class='add'>+	 * If this folio is wholly outside i_size we just return zero;</div><div class='ctx'> 	 * do_generic_file_read() will handle this for us</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (index &gt;= end_index) {</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_end_read(folio, true);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -338,16 +336,14 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1),</div><div class='ctx'> 					sizeof(*pages), GFP_KERNEL);</div><div class='ctx'> 	if (!pages) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	pages[full_page] = page;</div><div class='add'>+	pages[full_page] = &amp;folio-&gt;page;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pcount; i++, index++) {</div><div class='ctx'> 		if (i != full_page)</div><div class='ctx'> 			pages[i] = grab_cache_page_nowait(mapping, index);</div><div class='del'>-		if (pages[i])</div><div class='del'>-			ClearPageError(pages[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = zisofs_fill_pages(inode, full_page, pcount, pages);</div><div class='hunk'>@@ -356,8 +352,6 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	for (i = 0; i &lt; pcount; i++) {</div><div class='ctx'> 		if (pages[i]) {</div><div class='ctx'> 			flush_dcache_page(pages[i]);</div><div class='del'>-			if (i == full_page &amp;&amp; err)</div><div class='del'>-				SetPageError(pages[i]);</div><div class='ctx'> 			unlock_page(pages[i]);</div><div class='ctx'> 			if (i != full_page)</div><div class='ctx'> 				put_page(pages[i]);</div><div class='head'>diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c<br/>index eb2f8273e6f1..09df40b612fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/dir.c</a></div><div class='hunk'>@@ -147,7 +147,8 @@ static int do_isofs_readdir(struct inode *inode, struct file *file,</div><div class='ctx'> 			de = tmpde;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Basic sanity check, whether name doesn't exceed dir entry */</div><div class='del'>-		if (de_len &lt; de-&gt;name_len[0] +</div><div class='add'>+		if (de_len &lt; sizeof(struct iso_directory_record) ||</div><div class='add'>+		    de_len &lt; de-&gt;name_len[0] +</div><div class='ctx'> 					sizeof(struct iso_directory_record)) {</div><div class='ctx'> 			printk(KERN_NOTICE "iso9660: Corrupted directory entry"</div><div class='ctx'> 			       " in block %lu of inode %lu\n", block,</div><div class='head'>diff --git a/fs/isofs/export.c b/fs/isofs/export.c<br/>index 35768a63fb1d..421d247fae52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/export.c</a></div><div class='hunk'>@@ -180,7 +180,7 @@ static struct dentry *isofs_fh_to_parent(struct super_block *sb,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return isofs_export_iget(sb,</div><div class='del'>-			fh_len &gt; 2 ? ifid-&gt;parent_block : 0,</div><div class='add'>+			fh_len &gt; 3 ? ifid-&gt;parent_block : 0,</div><div class='ctx'> 			ifid-&gt;parent_offset,</div><div class='ctx'> 			fh_len &gt; 4 ? ifid-&gt;parent_generation : 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c<br/>index 3e4d53e26f94..b7cbe126faf3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/inode.c</a></div><div class='hunk'>@@ -21,11 +21,12 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/mpage.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "isofs.h"</div><div class='ctx'> #include "zisofs.h"</div><div class='hunk'>@@ -93,7 +94,7 @@ static int __init init_inodecache(void)</div><div class='ctx'> 	isofs_inode_cachep = kmem_cache_create("isofs_inode_cache",</div><div class='ctx'> 					sizeof(struct iso_inode_info),</div><div class='ctx'> 					0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-					SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+					SLAB_ACCOUNT),</div><div class='ctx'> 					init_once);</div><div class='ctx'> 	if (!isofs_inode_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -110,10 +111,10 @@ static void destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(isofs_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isofs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int isofs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	if (!(*flags &amp; SB_RDONLY))</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	if (!(fc-&gt;sb_flags &amp; SB_RDONLY))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -123,7 +124,6 @@ static const struct super_operations isofs_sops = {</div><div class='ctx'> 	.free_inode	= isofs_free_inode,</div><div class='ctx'> 	.put_super	= isofs_put_super,</div><div class='ctx'> 	.statfs		= isofs_statfs,</div><div class='del'>-	.remount_fs	= isofs_remount,</div><div class='ctx'> 	.show_options	= isofs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +145,7 @@ static const struct dentry_operations isofs_dentry_ops[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iso9660_options{</div><div class='add'>+struct isofs_options{</div><div class='ctx'> 	unsigned int rock:1;</div><div class='ctx'> 	unsigned int joliet:1;</div><div class='ctx'> 	unsigned int cruft:1;</div><div class='hunk'>@@ -289,197 +289,153 @@ isofs_dentry_cmpi_ms(const struct dentry *dentry,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_block, Opt_check_r, Opt_check_s, Opt_cruft, Opt_gid, Opt_ignore,</div><div class='del'>-	Opt_iocharset, Opt_map_a, Opt_map_n, Opt_map_o, Opt_mode, Opt_nojoliet,</div><div class='del'>-	Opt_norock, Opt_sb, Opt_session, Opt_uid, Opt_unhide, Opt_utf8, Opt_err,</div><div class='del'>-	Opt_nocompress, Opt_hide, Opt_showassoc, Opt_dmode, Opt_overriderockperm,</div><div class='add'>+	Opt_block, Opt_check, Opt_cruft, Opt_gid, Opt_ignore, Opt_iocharset,</div><div class='add'>+	Opt_map, Opt_mode, Opt_nojoliet, Opt_norock, Opt_sb, Opt_session,</div><div class='add'>+	Opt_uid, Opt_unhide, Opt_utf8, Opt_err, Opt_nocompress, Opt_hide,</div><div class='add'>+	Opt_showassoc, Opt_dmode, Opt_overriderockperm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_norock, "norock"},</div><div class='del'>-	{Opt_nojoliet, "nojoliet"},</div><div class='del'>-	{Opt_unhide, "unhide"},</div><div class='del'>-	{Opt_hide, "hide"},</div><div class='del'>-	{Opt_showassoc, "showassoc"},</div><div class='del'>-	{Opt_cruft, "cruft"},</div><div class='del'>-	{Opt_utf8, "utf8"},</div><div class='del'>-	{Opt_iocharset, "iocharset=%s"},</div><div class='del'>-	{Opt_map_a, "map=acorn"},</div><div class='del'>-	{Opt_map_a, "map=a"},</div><div class='del'>-	{Opt_map_n, "map=normal"},</div><div class='del'>-	{Opt_map_n, "map=n"},</div><div class='del'>-	{Opt_map_o, "map=off"},</div><div class='del'>-	{Opt_map_o, "map=o"},</div><div class='del'>-	{Opt_session, "session=%u"},</div><div class='del'>-	{Opt_sb, "sbsector=%u"},</div><div class='del'>-	{Opt_check_r, "check=relaxed"},</div><div class='del'>-	{Opt_check_r, "check=r"},</div><div class='del'>-	{Opt_check_s, "check=strict"},</div><div class='del'>-	{Opt_check_s, "check=s"},</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_mode, "mode=%u"},</div><div class='del'>-	{Opt_dmode, "dmode=%u"},</div><div class='del'>-	{Opt_overriderockperm, "overriderockperm"},</div><div class='del'>-	{Opt_block, "block=%u"},</div><div class='del'>-	{Opt_ignore, "conv=binary"},</div><div class='del'>-	{Opt_ignore, "conv=b"},</div><div class='del'>-	{Opt_ignore, "conv=text"},</div><div class='del'>-	{Opt_ignore, "conv=t"},</div><div class='del'>-	{Opt_ignore, "conv=mtext"},</div><div class='del'>-	{Opt_ignore, "conv=m"},</div><div class='del'>-	{Opt_ignore, "conv=auto"},</div><div class='del'>-	{Opt_ignore, "conv=a"},</div><div class='del'>-	{Opt_nocompress, "nocompress"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table isofs_param_map[] = {</div><div class='add'>+	{"acorn",	'a'},</div><div class='add'>+	{"a",		'a'},</div><div class='add'>+	{"normal",	'n'},</div><div class='add'>+	{"n",		'n'},</div><div class='add'>+	{"off",		'o'},</div><div class='add'>+	{"o",		'o'},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(char *options, struct iso9660_options *popt)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	int option;</div><div class='del'>-	unsigned int uv;</div><div class='del'>-</div><div class='del'>-	popt-&gt;map = 'n';</div><div class='del'>-	popt-&gt;rock = 1;</div><div class='del'>-	popt-&gt;joliet = 1;</div><div class='del'>-	popt-&gt;cruft = 0;</div><div class='del'>-	popt-&gt;hide = 0;</div><div class='del'>-	popt-&gt;showassoc = 0;</div><div class='del'>-	popt-&gt;check = 'u';		/* unset */</div><div class='del'>-	popt-&gt;nocompress = 0;</div><div class='del'>-	popt-&gt;blocksize = 1024;</div><div class='del'>-	popt-&gt;fmode = popt-&gt;dmode = ISOFS_INVALID_MODE;</div><div class='del'>-	popt-&gt;uid_set = 0;</div><div class='del'>-	popt-&gt;gid_set = 0;</div><div class='del'>-	popt-&gt;gid = GLOBAL_ROOT_GID;</div><div class='del'>-	popt-&gt;uid = GLOBAL_ROOT_UID;</div><div class='del'>-	popt-&gt;iocharset = NULL;</div><div class='del'>-	popt-&gt;overriderockperm = 0;</div><div class='del'>-	popt-&gt;session=-1;</div><div class='del'>-	popt-&gt;sbsector=-1;</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		substring_t args[MAX_OPT_ARGS];</div><div class='del'>-		unsigned n;</div><div class='del'>-</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='add'>+static const struct constant_table isofs_param_check[] = {</div><div class='add'>+	{"relaxed",	'r'},</div><div class='add'>+	{"r",		'r'},</div><div class='add'>+	{"strict",	's'},</div><div class='add'>+	{"s",		's'},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_norock:</div><div class='del'>-			popt-&gt;rock = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nojoliet:</div><div class='del'>-			popt-&gt;joliet = 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_hide:</div><div class='del'>-			popt-&gt;hide = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_unhide:</div><div class='del'>-		case Opt_showassoc:</div><div class='del'>-			popt-&gt;showassoc = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_cruft:</div><div class='del'>-			popt-&gt;cruft = 1;</div><div class='del'>-			break;</div><div class='add'>+static const struct fs_parameter_spec isofs_param_spec[] = {</div><div class='add'>+	fsparam_flag	("norock",		Opt_norock),</div><div class='add'>+	fsparam_flag	("nojoliet",		Opt_nojoliet),</div><div class='add'>+	fsparam_flag	("unhide",		Opt_unhide),</div><div class='add'>+	fsparam_flag	("hide",		Opt_hide),</div><div class='add'>+	fsparam_flag	("showassoc",		Opt_showassoc),</div><div class='add'>+	fsparam_flag	("cruft",		Opt_cruft),</div><div class='add'>+	fsparam_flag	("utf8",		Opt_utf8),</div><div class='add'>+	fsparam_string	("iocharset",		Opt_iocharset),</div><div class='add'>+	fsparam_enum	("map",			Opt_map, isofs_param_map),</div><div class='add'>+	fsparam_u32	("session",		Opt_session),</div><div class='add'>+	fsparam_u32	("sbsector",		Opt_sb),</div><div class='add'>+	fsparam_enum	("check",		Opt_check, isofs_param_check),</div><div class='add'>+	fsparam_uid	("uid",			Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",			Opt_gid),</div><div class='add'>+	/* Note: mode/dmode historically accepted %u not strictly %o */</div><div class='add'>+	fsparam_u32	("mode",		Opt_mode),</div><div class='add'>+	fsparam_u32	("dmode",		Opt_dmode),</div><div class='add'>+	fsparam_flag	("overriderockperm",	Opt_overriderockperm),</div><div class='add'>+	fsparam_u32	("block",		Opt_block),</div><div class='add'>+	fsparam_string	("conv",		Opt_ignore),</div><div class='add'>+	fsparam_flag	("nocompress",		Opt_nocompress),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int isofs_parse_param(struct fs_context *fc,</div><div class='add'>+			       struct fs_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct isofs_options *popt = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+	unsigned int n;</div><div class='add'>+</div><div class='add'>+	/* There are no remountable options */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, isofs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_norock:</div><div class='add'>+		popt-&gt;rock = 0;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nojoliet:</div><div class='add'>+		popt-&gt;joliet = 0;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_hide:</div><div class='add'>+		popt-&gt;hide = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_unhide:</div><div class='add'>+	case Opt_showassoc:</div><div class='add'>+		popt-&gt;showassoc = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_cruft:</div><div class='add'>+		popt-&gt;cruft = 1;</div><div class='add'>+		break;</div><div class='ctx'> #ifdef CONFIG_JOLIET</div><div class='del'>-		case Opt_utf8:</div><div class='del'>-			kfree(popt-&gt;iocharset);</div><div class='del'>-			popt-&gt;iocharset = kstrdup("utf8", GFP_KERNEL);</div><div class='del'>-			if (!popt-&gt;iocharset)</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_iocharset:</div><div class='del'>-			kfree(popt-&gt;iocharset);</div><div class='del'>-			popt-&gt;iocharset = match_strdup(&amp;args[0]);</div><div class='del'>-			if (!popt-&gt;iocharset)</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='add'>+	case Opt_utf8:</div><div class='add'>+		kfree(popt-&gt;iocharset);</div><div class='add'>+		popt-&gt;iocharset = kstrdup("utf8", GFP_KERNEL);</div><div class='add'>+		if (!popt-&gt;iocharset)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_iocharset:</div><div class='add'>+		kfree(popt-&gt;iocharset);</div><div class='add'>+		popt-&gt;iocharset = kstrdup(param-&gt;string, GFP_KERNEL);</div><div class='add'>+		if (!popt-&gt;iocharset)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_map_a:</div><div class='del'>-			popt-&gt;map = 'a';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_map_o:</div><div class='del'>-			popt-&gt;map = 'o';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_map_n:</div><div class='del'>-			popt-&gt;map = 'n';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_session:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			n = option;</div><div class='del'>-			/*</div><div class='del'>-			 * Track numbers are supposed to be in range 1-99, the</div><div class='del'>-			 * mount option starts indexing at 0.</div><div class='del'>-			 */</div><div class='del'>-			if (n &gt;= 99)</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;session = n + 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_sb:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;sbsector = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_r:</div><div class='del'>-			popt-&gt;check = 'r';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_check_s:</div><div class='del'>-			popt-&gt;check = 's';</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ignore:</div><div class='del'>-			break;</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_uint(&amp;args[0], &amp;uv))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;uid = make_kuid(current_user_ns(), uv);</div><div class='del'>-			if (!uid_valid(popt-&gt;uid))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;uid_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_uint(&amp;args[0], &amp;uv))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;gid = make_kgid(current_user_ns(), uv);</div><div class='del'>-			if (!gid_valid(popt-&gt;gid))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;gid_set = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_mode:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;fmode = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_dmode:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;dmode = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_overriderockperm:</div><div class='del'>-			popt-&gt;overriderockperm = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_block:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			n = option;</div><div class='del'>-			if (n != 512 &amp;&amp; n != 1024 &amp;&amp; n != 2048)</div><div class='del'>-				return 0;</div><div class='del'>-			popt-&gt;blocksize = n;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nocompress:</div><div class='del'>-			popt-&gt;nocompress = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	case Opt_map:</div><div class='add'>+		popt-&gt;map = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_session:</div><div class='add'>+		n = result.uint_32;</div><div class='add'>+		/*</div><div class='add'>+		 * Track numbers are supposed to be in range 1-99, the</div><div class='add'>+		 * mount option starts indexing at 0.</div><div class='add'>+		 */</div><div class='add'>+		if (n &gt;= 99)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		popt-&gt;session = n + 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_sb:</div><div class='add'>+		popt-&gt;sbsector = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_check:</div><div class='add'>+		popt-&gt;check = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ignore:</div><div class='add'>+		break;</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		popt-&gt;uid = result.uid;</div><div class='add'>+		popt-&gt;uid_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		popt-&gt;gid = result.gid;</div><div class='add'>+		popt-&gt;gid_set = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_mode:</div><div class='add'>+		popt-&gt;fmode = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dmode:</div><div class='add'>+		popt-&gt;dmode = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_overriderockperm:</div><div class='add'>+		popt-&gt;overriderockperm = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_block:</div><div class='add'>+		n = result.uint_32;</div><div class='add'>+		if (n != 512 &amp;&amp; n != 1024 &amp;&amp; n != 2048)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		popt-&gt;blocksize = n;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_nocompress:</div><div class='add'>+		popt-&gt;nocompress = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -615,7 +571,7 @@ static bool rootdir_empty(struct super_block *sb, unsigned long block)</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the superblock and read the root inode.</div><div class='ctx'>  */</div><div class='del'>-static int isofs_fill_super(struct super_block *s, void *data, int silent)</div><div class='add'>+static int isofs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh = NULL, *pri_bh = NULL;</div><div class='ctx'> 	struct hs_primary_descriptor *h_pri = NULL;</div><div class='hunk'>@@ -623,7 +579,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	struct iso_supplementary_descriptor *sec = NULL;</div><div class='ctx'> 	struct iso_directory_record *rootp;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct iso9660_options opt;</div><div class='add'>+	struct isofs_options *opt = fc-&gt;fs_private;</div><div class='ctx'> 	struct isofs_sb_info *sbi;</div><div class='ctx'> 	unsigned long first_data_zone;</div><div class='ctx'> 	int joliet_level = 0;</div><div class='hunk'>@@ -631,15 +587,13 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	int orig_zonesize;</div><div class='ctx'> 	int table, error = -EINVAL;</div><div class='ctx'> 	unsigned int vol_desc_start;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);</div><div class='ctx'> 	if (!sbi)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	s-&gt;s_fs_info = sbi;</div><div class='ctx'> </div><div class='del'>-	if (!parse_options((char *)data, &amp;opt))</div><div class='del'>-		goto out_freesbi;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First of all, get the hardware blocksize for this device.</div><div class='ctx'> 	 * If we don't know what it is, or the hardware blocksize is</div><div class='hunk'>@@ -655,14 +609,19 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 			bdev_logical_block_size(s-&gt;s_bdev));</div><div class='ctx'> 		goto out_freesbi;</div><div class='ctx'> 	}</div><div class='del'>-	opt.blocksize = sb_min_blocksize(s, opt.blocksize);</div><div class='add'>+	opt-&gt;blocksize = sb_min_blocksize(s, opt-&gt;blocksize);</div><div class='add'>+	if (!opt-&gt;blocksize) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ISOFS: unable to set blocksize\n");</div><div class='add'>+		goto out_freesbi;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;s_high_sierra = 0; /* default is iso9660 */</div><div class='del'>-	sbi-&gt;s_session = opt.session;</div><div class='del'>-	sbi-&gt;s_sbsector = opt.sbsector;</div><div class='add'>+	sbi-&gt;s_session = opt-&gt;session;</div><div class='add'>+	sbi-&gt;s_sbsector = opt-&gt;sbsector;</div><div class='ctx'> </div><div class='del'>-	vol_desc_start = (opt.sbsector != -1) ?</div><div class='del'>-		opt.sbsector : isofs_get_last_session(s,opt.session);</div><div class='add'>+	vol_desc_start = (opt-&gt;sbsector != -1) ?</div><div class='add'>+		opt-&gt;sbsector : isofs_get_last_session(s, opt-&gt;session);</div><div class='ctx'> </div><div class='ctx'> 	for (iso_blknum = vol_desc_start+16;</div><div class='ctx'> 		iso_blknum &lt; vol_desc_start+100; iso_blknum++) {</div><div class='hunk'>@@ -696,7 +655,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 			else if (isonum_711(vdp-&gt;type) == ISO_VD_SUPPLEMENTARY) {</div><div class='ctx'> 				sec = (struct iso_supplementary_descriptor *)vdp;</div><div class='ctx'> 				if (sec-&gt;escape[0] == 0x25 &amp;&amp; sec-&gt;escape[1] == 0x2f) {</div><div class='del'>-					if (opt.joliet) {</div><div class='add'>+					if (opt-&gt;joliet) {</div><div class='ctx'> 						if (sec-&gt;escape[2] == 0x40)</div><div class='ctx'> 							joliet_level = 1;</div><div class='ctx'> 						else if (sec-&gt;escape[2] == 0x43)</div><div class='hunk'>@@ -721,7 +680,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 					goto out_freebh;</div><div class='ctx'> </div><div class='ctx'> 				sbi-&gt;s_high_sierra = 1;</div><div class='del'>-				opt.rock = 0;</div><div class='add'>+				opt-&gt;rock = 0;</div><div class='ctx'> 				h_pri = (struct hs_primary_descriptor *)vdp;</div><div class='ctx'> 				goto root_found;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -749,7 +708,7 @@ root_found:</div><div class='ctx'> 		goto out_freebh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (joliet_level &amp;&amp; (!pri || !opt.rock)) {</div><div class='add'>+	if (joliet_level &amp;&amp; (!pri || !opt-&gt;rock)) {</div><div class='ctx'> 		/* This is the case of Joliet with the norock mount flag.</div><div class='ctx'> 		 * A disc with both Joliet and Rock Ridge is handled later</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -780,7 +739,7 @@ root_found:</div><div class='ctx'> 	 * blocks that were 512 bytes (which should only very rarely</div><div class='ctx'> 	 * happen.)</div><div class='ctx'> 	 */</div><div class='del'>-	if (orig_zonesize &lt; opt.blocksize)</div><div class='add'>+	if (orig_zonesize &lt; opt-&gt;blocksize)</div><div class='ctx'> 		goto out_bad_size;</div><div class='ctx'> </div><div class='ctx'> 	/* RDE: convert log zone size to bit shift */</div><div class='hunk'>@@ -865,10 +824,10 @@ root_found:</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JOLIET</div><div class='ctx'> 	if (joliet_level) {</div><div class='del'>-		char *p = opt.iocharset ? opt.iocharset : CONFIG_NLS_DEFAULT;</div><div class='add'>+		char *p = opt-&gt;iocharset ? opt-&gt;iocharset : CONFIG_NLS_DEFAULT;</div><div class='ctx'> 		if (strcmp(p, "utf8") != 0) {</div><div class='del'>-			sbi-&gt;s_nls_iocharset = opt.iocharset ?</div><div class='del'>-				load_nls(opt.iocharset) : load_nls_default();</div><div class='add'>+			sbi-&gt;s_nls_iocharset = opt-&gt;iocharset ?</div><div class='add'>+				load_nls(opt-&gt;iocharset) : load_nls_default();</div><div class='ctx'> 			if (!sbi-&gt;s_nls_iocharset)</div><div class='ctx'> 				goto out_freesbi;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -876,29 +835,29 @@ root_found:</div><div class='ctx'> #endif</div><div class='ctx'> 	s-&gt;s_op = &amp;isofs_sops;</div><div class='ctx'> 	s-&gt;s_export_op = &amp;isofs_export_ops;</div><div class='del'>-	sbi-&gt;s_mapping = opt.map;</div><div class='del'>-	sbi-&gt;s_rock = (opt.rock ? 2 : 0);</div><div class='add'>+	sbi-&gt;s_mapping = opt-&gt;map;</div><div class='add'>+	sbi-&gt;s_rock = (opt-&gt;rock ? 2 : 0);</div><div class='ctx'> 	sbi-&gt;s_rock_offset = -1; /* initial offset, will guess until SP is found*/</div><div class='del'>-	sbi-&gt;s_cruft = opt.cruft;</div><div class='del'>-	sbi-&gt;s_hide = opt.hide;</div><div class='del'>-	sbi-&gt;s_showassoc = opt.showassoc;</div><div class='del'>-	sbi-&gt;s_uid = opt.uid;</div><div class='del'>-	sbi-&gt;s_gid = opt.gid;</div><div class='del'>-	sbi-&gt;s_uid_set = opt.uid_set;</div><div class='del'>-	sbi-&gt;s_gid_set = opt.gid_set;</div><div class='del'>-	sbi-&gt;s_nocompress = opt.nocompress;</div><div class='del'>-	sbi-&gt;s_overriderockperm = opt.overriderockperm;</div><div class='add'>+	sbi-&gt;s_cruft = opt-&gt;cruft;</div><div class='add'>+	sbi-&gt;s_hide = opt-&gt;hide;</div><div class='add'>+	sbi-&gt;s_showassoc = opt-&gt;showassoc;</div><div class='add'>+	sbi-&gt;s_uid = opt-&gt;uid;</div><div class='add'>+	sbi-&gt;s_gid = opt-&gt;gid;</div><div class='add'>+	sbi-&gt;s_uid_set = opt-&gt;uid_set;</div><div class='add'>+	sbi-&gt;s_gid_set = opt-&gt;gid_set;</div><div class='add'>+	sbi-&gt;s_nocompress = opt-&gt;nocompress;</div><div class='add'>+	sbi-&gt;s_overriderockperm = opt-&gt;overriderockperm;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It would be incredibly stupid to allow people to mark every file</div><div class='ctx'> 	 * on the disk as suid, so we merely allow them to set the default</div><div class='ctx'> 	 * permissions.</div><div class='ctx'> 	 */</div><div class='del'>-	if (opt.fmode != ISOFS_INVALID_MODE)</div><div class='del'>-		sbi-&gt;s_fmode = opt.fmode &amp; 0777;</div><div class='add'>+	if (opt-&gt;fmode != ISOFS_INVALID_MODE)</div><div class='add'>+		sbi-&gt;s_fmode = opt-&gt;fmode &amp; 0777;</div><div class='ctx'> 	else</div><div class='ctx'> 		sbi-&gt;s_fmode = ISOFS_INVALID_MODE;</div><div class='del'>-	if (opt.dmode != ISOFS_INVALID_MODE)</div><div class='del'>-		sbi-&gt;s_dmode = opt.dmode &amp; 0777;</div><div class='add'>+	if (opt-&gt;dmode != ISOFS_INVALID_MODE)</div><div class='add'>+		sbi-&gt;s_dmode = opt-&gt;dmode &amp; 0777;</div><div class='ctx'> 	else</div><div class='ctx'> 		sbi-&gt;s_dmode = ISOFS_INVALID_MODE;</div><div class='ctx'> </div><div class='hunk'>@@ -908,8 +867,22 @@ root_found:</div><div class='ctx'> 	 * we then decide whether to use the Joliet descriptor.</div><div class='ctx'> 	 */</div><div class='ctx'> 	inode = isofs_iget(s, sbi-&gt;s_firstdatazone, 0);</div><div class='del'>-	if (IS_ERR(inode))</div><div class='del'>-		goto out_no_root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fix for broken CDs with a corrupt root inode but a correct Joliet</div><div class='add'>+	 * root directory.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ERR(inode)) {</div><div class='add'>+		if (joliet_level &amp;&amp; sbi-&gt;s_firstdatazone != first_data_zone) {</div><div class='add'>+			printk(KERN_NOTICE</div><div class='add'>+			       "ISOFS: root inode is unusable. "</div><div class='add'>+			       "Disabling Rock Ridge and switching to Joliet.");</div><div class='add'>+			sbi-&gt;s_rock = 0;</div><div class='add'>+			inode = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			goto out_no_root;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fix for broken CDs with Rock Ridge and empty ISO root directory but</div><div class='hunk'>@@ -946,12 +919,12 @@ root_found:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (opt.check == 'u') {</div><div class='add'>+	if (opt-&gt;check == 'u') {</div><div class='ctx'> 		/* Only Joliet is case insensitive by default */</div><div class='ctx'> 		if (joliet_level)</div><div class='del'>-			opt.check = 'r';</div><div class='add'>+			opt-&gt;check = 'r';</div><div class='ctx'> 		else</div><div class='del'>-			opt.check = 's';</div><div class='add'>+			opt-&gt;check = 's';</div><div class='ctx'> 	}</div><div class='ctx'> 	sbi-&gt;s_joliet_level = joliet_level;</div><div class='ctx'> </div><div class='hunk'>@@ -966,12 +939,12 @@ root_found:</div><div class='ctx'> 	table = 0;</div><div class='ctx'> 	if (joliet_level)</div><div class='ctx'> 		table += 2;</div><div class='del'>-	if (opt.check == 'r')</div><div class='add'>+	if (opt-&gt;check == 'r')</div><div class='ctx'> 		table++;</div><div class='del'>-	sbi-&gt;s_check = opt.check;</div><div class='add'>+	sbi-&gt;s_check = opt-&gt;check;</div><div class='ctx'> </div><div class='ctx'> 	if (table)</div><div class='del'>-		s-&gt;s_d_op = &amp;isofs_dentry_ops[table - 1];</div><div class='add'>+		set_default_d_op(s, &amp;isofs_dentry_ops[table - 1]);</div><div class='ctx'> </div><div class='ctx'> 	/* get the root dentry */</div><div class='ctx'> 	s-&gt;s_root = d_make_root(inode);</div><div class='hunk'>@@ -980,8 +953,6 @@ root_found:</div><div class='ctx'> 		goto out_no_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(opt.iocharset);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1009,7 +980,7 @@ out_bad_zone_size:</div><div class='ctx'> 	goto out_freebh;</div><div class='ctx'> out_bad_size:</div><div class='ctx'> 	printk(KERN_WARNING "ISOFS: Logical zone size(%d) &lt; hardware blocksize(%u)\n",</div><div class='del'>-		orig_zonesize, opt.blocksize);</div><div class='add'>+		orig_zonesize, opt-&gt;blocksize);</div><div class='ctx'> 	goto out_freebh;</div><div class='ctx'> out_unknown_format:</div><div class='ctx'> 	if (!silent)</div><div class='hunk'>@@ -1019,7 +990,6 @@ out_freebh:</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> 	brelse(pri_bh);</div><div class='ctx'> out_freesbi:</div><div class='del'>-	kfree(opt.iocharset);</div><div class='ctx'> 	kfree(sbi);</div><div class='ctx'> 	s-&gt;s_fs_info = NULL;</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -1310,6 +1280,7 @@ static int isofs_read_inode(struct inode *inode, int relocated)</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	struct iso_inode_info *ei = ISOFS_I(inode);</div><div class='ctx'> 	int ret = -EIO;</div><div class='add'>+	struct timespec64 ts;</div><div class='ctx'> </div><div class='ctx'> 	block = ei-&gt;i_iget5_block;</div><div class='ctx'> 	bh = sb_bread(inode-&gt;i_sb, block);</div><div class='hunk'>@@ -1422,8 +1393,10 @@ static int isofs_read_inode(struct inode *inode, int relocated)</div><div class='ctx'> 			inode-&gt;i_ino, de-&gt;flags[-high_sierra]);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	inode_set_mtime_to_ts(inode,</div><div class='del'>-			      inode_set_atime_to_ts(inode, inode_set_ctime(inode, iso_date(de-&gt;date, high_sierra), 0)));</div><div class='add'>+	ts = iso_date(de-&gt;date, high_sierra ? ISO_DATE_HIGH_SIERRA : 0);</div><div class='add'>+	inode_set_ctime_to_ts(inode, ts);</div><div class='add'>+	inode_set_atime_to_ts(inode, ts);</div><div class='add'>+	inode_set_mtime_to_ts(inode, ts);</div><div class='ctx'> </div><div class='ctx'> 	ei-&gt;i_first_extent = (isonum_733(de-&gt;extent) +</div><div class='ctx'> 			isonum_711(de-&gt;ext_attr_length));</div><div class='hunk'>@@ -1472,9 +1445,16 @@ static int isofs_read_inode(struct inode *inode, int relocated)</div><div class='ctx'> 		inode-&gt;i_op = &amp;page_symlink_inode_operations;</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 		inode-&gt;i_data.a_ops = &amp;isofs_symlink_aops;</div><div class='del'>-	} else</div><div class='add'>+	} else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode) ||</div><div class='add'>+		   S_ISFIFO(inode-&gt;i_mode) || S_ISSOCK(inode-&gt;i_mode)) {</div><div class='ctx'> 		/* XXX - parse_rock_ridge_inode() had already set i_rdev. */</div><div class='ctx'> 		init_special_inode(inode, inode-&gt;i_mode, inode-&gt;i_rdev);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_DEBUG "ISOFS: Invalid file type 0%04o for inode %lu.\n",</div><div class='add'>+			inode-&gt;i_mode, inode-&gt;i_ino);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='hunk'>@@ -1540,7 +1520,7 @@ struct inode *__isofs_iget(struct super_block *sb,</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		ret = isofs_read_inode(inode, relocated);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			iget_failed(inode);</div><div class='hunk'>@@ -1553,18 +1533,66 @@ struct inode *__isofs_iget(struct super_block *sb,</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *isofs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int isofs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, isofs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isofs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct isofs_options *opt = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	kfree(opt-&gt;iocharset);</div><div class='add'>+	kfree(opt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations isofs_context_ops = {</div><div class='add'>+	.parse_param	= isofs_parse_param,</div><div class='add'>+	.get_tree	= isofs_get_tree,</div><div class='add'>+	.reconfigure	= isofs_reconfigure,</div><div class='add'>+	.free		= isofs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int isofs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, isofs_fill_super);</div><div class='add'>+	struct isofs_options *opt;</div><div class='add'>+</div><div class='add'>+	opt = kzalloc(sizeof(*opt), GFP_KERNEL);</div><div class='add'>+	if (!opt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	opt-&gt;map = 'n';</div><div class='add'>+	opt-&gt;rock = 1;</div><div class='add'>+	opt-&gt;joliet = 1;</div><div class='add'>+	opt-&gt;cruft = 0;</div><div class='add'>+	opt-&gt;hide = 0;</div><div class='add'>+	opt-&gt;showassoc = 0;</div><div class='add'>+	opt-&gt;check = 'u';		/* unset */</div><div class='add'>+	opt-&gt;nocompress = 0;</div><div class='add'>+	opt-&gt;blocksize = 1024;</div><div class='add'>+	opt-&gt;fmode = opt-&gt;dmode = ISOFS_INVALID_MODE;</div><div class='add'>+	opt-&gt;uid_set = 0;</div><div class='add'>+	opt-&gt;gid_set = 0;</div><div class='add'>+	opt-&gt;gid = GLOBAL_ROOT_GID;</div><div class='add'>+	opt-&gt;uid = GLOBAL_ROOT_UID;</div><div class='add'>+	opt-&gt;iocharset = NULL;</div><div class='add'>+	opt-&gt;overriderockperm = 0;</div><div class='add'>+	opt-&gt;session = -1;</div><div class='add'>+	opt-&gt;sbsector = -1;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = opt;</div><div class='add'>+	fc-&gt;ops = &amp;isofs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type iso9660_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "iso9660",</div><div class='del'>-	.mount		= isofs_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = isofs_init_fs_context,</div><div class='add'>+	.parameters	= isofs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("iso9660");</div><div class='ctx'> MODULE_ALIAS("iso9660");</div><div class='hunk'>@@ -1604,4 +1632,5 @@ static void __exit exit_iso9660_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_iso9660_fs)</div><div class='ctx'> module_exit(exit_iso9660_fs)</div><div class='add'>+MODULE_DESCRIPTION("ISO 9660 CDROM file system support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h<br/>index dcdc191ed183..506555837533 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/isofs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/isofs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/isofs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/isofs.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/iso_fs.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum isofs_file_format {</div><div class='ctx'> 	isofs_file_normal = 0,</div><div class='hunk'>@@ -106,7 +106,9 @@ static inline unsigned int isonum_733(u8 *p)</div><div class='ctx'> 	/* Ignore bigendian datum due to broken mastering programs */</div><div class='ctx'> 	return get_unaligned_le32(p);</div><div class='ctx'> }</div><div class='del'>-extern int iso_date(u8 *, int);</div><div class='add'>+#define ISO_DATE_HIGH_SIERRA (1 &lt;&lt; 0)</div><div class='add'>+#define ISO_DATE_LONG_FORM (1 &lt;&lt; 1)</div><div class='add'>+struct timespec64 iso_date(u8 *p, int flags);</div><div class='ctx'> </div><div class='ctx'> struct inode;		/* To make gcc happy */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c<br/>index d6c17ad69dee..576498245b9d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/rock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/rock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/rock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/rock.c</a></div><div class='hunk'>@@ -412,7 +412,12 @@ repeat:</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-		case SIG('T', 'F'):</div><div class='add'>+		case SIG('T', 'F'): {</div><div class='add'>+			int flags, size, slen;</div><div class='add'>+</div><div class='add'>+			flags = rr-&gt;u.TF.flags &amp; TF_LONG_FORM ? ISO_DATE_LONG_FORM : 0;</div><div class='add'>+			size = rr-&gt;u.TF.flags &amp; TF_LONG_FORM ? 17 : 7;</div><div class='add'>+			slen = rr-&gt;len - 5;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Some RRIP writers incorrectly place ctime in the</div><div class='ctx'> 			 * TF_CREATE field. Try to handle this correctly for</div><div class='hunk'>@@ -420,27 +425,28 @@ repeat:</div><div class='ctx'> 			 */</div><div class='ctx'> 			/* Rock ridge never appears on a High Sierra disk */</div><div class='ctx'> 			cnt = 0;</div><div class='del'>-			if (rr-&gt;u.TF.flags &amp; TF_CREATE) {</div><div class='del'>-				inode_set_ctime(inode,</div><div class='del'>-						iso_date(rr-&gt;u.TF.times[cnt++].time, 0),</div><div class='del'>-						0);</div><div class='add'>+			if ((rr-&gt;u.TF.flags &amp; TF_CREATE) &amp;&amp; size &lt;= slen) {</div><div class='add'>+				inode_set_ctime_to_ts(inode,</div><div class='add'>+						iso_date(rr-&gt;u.TF.data + size * cnt++, flags));</div><div class='add'>+				slen -= size;</div><div class='ctx'> 			}</div><div class='del'>-			if (rr-&gt;u.TF.flags &amp; TF_MODIFY) {</div><div class='del'>-				inode_set_mtime(inode,</div><div class='del'>-						iso_date(rr-&gt;u.TF.times[cnt++].time, 0),</div><div class='del'>-						0);</div><div class='add'>+			if ((rr-&gt;u.TF.flags &amp; TF_MODIFY) &amp;&amp; size &lt;= slen) {</div><div class='add'>+				inode_set_mtime_to_ts(inode,</div><div class='add'>+						iso_date(rr-&gt;u.TF.data + size * cnt++, flags));</div><div class='add'>+				slen -= size;</div><div class='ctx'> 			}</div><div class='del'>-			if (rr-&gt;u.TF.flags &amp; TF_ACCESS) {</div><div class='del'>-				inode_set_atime(inode,</div><div class='del'>-						iso_date(rr-&gt;u.TF.times[cnt++].time, 0),</div><div class='del'>-						0);</div><div class='add'>+			if ((rr-&gt;u.TF.flags &amp; TF_ACCESS) &amp;&amp; size &lt;= slen) {</div><div class='add'>+				inode_set_atime_to_ts(inode,</div><div class='add'>+						iso_date(rr-&gt;u.TF.data + size * cnt++, flags));</div><div class='add'>+				slen -= size;</div><div class='ctx'> 			}</div><div class='del'>-			if (rr-&gt;u.TF.flags &amp; TF_ATTRIBUTES) {</div><div class='del'>-				inode_set_ctime(inode,</div><div class='del'>-						iso_date(rr-&gt;u.TF.times[cnt++].time, 0),</div><div class='del'>-						0);</div><div class='add'>+			if ((rr-&gt;u.TF.flags &amp; TF_ATTRIBUTES) &amp;&amp; size &lt;= slen) {</div><div class='add'>+				inode_set_ctime_to_ts(inode,</div><div class='add'>+						iso_date(rr-&gt;u.TF.data + size * cnt++, flags));</div><div class='add'>+				slen -= size;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 		case SIG('S', 'L'):</div><div class='ctx'> 			{</div><div class='ctx'> 				int slen;</div><div class='hunk'>@@ -688,11 +694,10 @@ int parse_rock_ridge_inode(struct iso_directory_record *de, struct inode *inode,</div><div class='ctx'>  */</div><div class='ctx'> static int rock_ridge_symlink_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct iso_inode_info *ei = ISOFS_I(inode);</div><div class='ctx'> 	struct isofs_sb_info *sbi = ISOFS_SB(inode-&gt;i_sb);</div><div class='del'>-	char *link = page_address(page);</div><div class='add'>+	char *link = folio_address(folio);</div><div class='ctx'> 	unsigned long bufsize = ISOFS_BUFFER_SIZE(inode);</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	char *rpnt = link;</div><div class='hunk'>@@ -779,9 +784,10 @@ repeat:</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> 	*rpnt = '\0';</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+end:</div><div class='add'>+	folio_end_read(folio, ret == 0);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* error exit from macro */</div><div class='ctx'> out:</div><div class='hunk'>@@ -795,9 +801,8 @@ out_bad_span:</div><div class='ctx'> fail:</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> error:</div><div class='del'>-	SetPageError(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return -EIO;</div><div class='add'>+	ret = -EIO;</div><div class='add'>+	goto end;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations isofs_symlink_aops = {</div><div class='head'>diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h<br/>index ee9660e9671c..c0856fa9bb6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/rock.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/rock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/rock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/rock.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ struct RR_PN_s {</div><div class='ctx'> struct SL_component {</div><div class='ctx'> 	__u8 flags;</div><div class='ctx'> 	__u8 len;</div><div class='del'>-	__u8 text[];</div><div class='add'>+	__u8 text[] __counted_by(len);</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> struct RR_SL_s {</div><div class='hunk'>@@ -65,13 +65,9 @@ struct RR_PL_s {</div><div class='ctx'> 	__u8 location[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct stamp {</div><div class='del'>-	__u8 time[7];		/* actually 6 unsigned, 1 signed */</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> struct RR_TF_s {</div><div class='ctx'> 	__u8 flags;</div><div class='del'>-	struct stamp times[];	/* Variable number of these beasts */</div><div class='add'>+	__u8 data[];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /* Linux-specific extension for transparent decompression */</div><div class='head'>diff --git a/fs/isofs/util.c b/fs/isofs/util.c<br/>index e88dba721661..42f479da0b28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/isofs/util.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/isofs/util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/isofs/util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/isofs/util.c</a></div><div class='hunk'>@@ -16,29 +16,44 @@</div><div class='ctx'>  * to GMT.  Thus  we should always be correct.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int iso_date(u8 *p, int flag)</div><div class='add'>+struct timespec64 iso_date(u8 *p, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int year, month, day, hour, minute, second, tz;</div><div class='del'>-	int crtime;</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ISO_DATE_LONG_FORM) {</div><div class='add'>+		year = (p[0] - '0') * 1000 +</div><div class='add'>+		       (p[1] - '0') * 100 +</div><div class='add'>+		       (p[2] - '0') * 10 +</div><div class='add'>+		       (p[3] - '0') - 1900;</div><div class='add'>+		month = ((p[4] - '0') * 10 + (p[5] - '0'));</div><div class='add'>+		day = ((p[6] - '0') * 10 + (p[7] - '0'));</div><div class='add'>+		hour = ((p[8] - '0') * 10 + (p[9] - '0'));</div><div class='add'>+		minute = ((p[10] - '0') * 10 + (p[11] - '0'));</div><div class='add'>+		second = ((p[12] - '0') * 10 + (p[13] - '0'));</div><div class='add'>+		ts.tv_nsec = ((p[14] - '0') * 10 + (p[15] - '0')) * 10000000;</div><div class='add'>+		tz = p[16];</div><div class='add'>+	} else {</div><div class='add'>+		year = p[0];</div><div class='add'>+		month = p[1];</div><div class='add'>+		day = p[2];</div><div class='add'>+		hour = p[3];</div><div class='add'>+		minute = p[4];</div><div class='add'>+		second = p[5];</div><div class='add'>+		ts.tv_nsec = 0;</div><div class='add'>+		/* High sierra has no time zone */</div><div class='add'>+		tz = flags &amp; ISO_DATE_HIGH_SIERRA ? 0 : p[6];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	year = p[0];</div><div class='del'>-	month = p[1];</div><div class='del'>-	day = p[2];</div><div class='del'>-	hour = p[3];</div><div class='del'>-	minute = p[4];</div><div class='del'>-	second = p[5];</div><div class='del'>-	if (flag == 0) tz = p[6]; /* High sierra has no time zone */</div><div class='del'>-	else tz = 0;</div><div class='del'>-	</div><div class='ctx'> 	if (year &lt; 0) {</div><div class='del'>-		crtime = 0;</div><div class='add'>+		ts.tv_sec = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		crtime = mktime64(year+1900, month, day, hour, minute, second);</div><div class='add'>+		ts.tv_sec = mktime64(year+1900, month, day, hour, minute, second);</div><div class='ctx'> </div><div class='ctx'> 		/* sign extend */</div><div class='ctx'> 		if (tz &amp; 0x80)</div><div class='ctx'> 			tz |= (-1 &lt;&lt; 8);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* </div><div class='ctx'> 		 * The timezone offset is unreliable on some disks,</div><div class='ctx'> 		 * so we make a sanity check.  In no case is it ever</div><div class='hunk'>@@ -65,7 +80,7 @@ int iso_date(u8 *p, int flag)</div><div class='ctx'> 		 * for pointing out the sign error.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (-52 &lt;= tz &amp;&amp; tz &lt;= 52)</div><div class='del'>-			crtime -= tz * 15 * 60;</div><div class='add'>+			ts.tv_sec -= tz * 15 * 60;</div><div class='ctx'> 	}</div><div class='del'>-	return crtime;</div><div class='del'>-}		</div><div class='add'>+	return ts;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/jbd2/Kconfig b/fs/jbd2/Kconfig<br/>index 4ad2c67f93f1..9c19e1512101 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/Kconfig</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> config JBD2</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select CRC32</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_CRC32C</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a generic journaling layer for block devices that support</div><div class='ctx'> 	  both 32-bit and 64-bit block numbers.  It is currently used by</div><div class='head'>diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c<br/>index 1c97e64c4784..de89c5bef607 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/checkpoint.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/checkpoint.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/checkpoint.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/checkpoint.c</a></div><div class='hunk'>@@ -79,17 +79,23 @@ __releases(&amp;journal-&gt;j_state_lock)</div><div class='ctx'> 		if (space_left &lt; nblocks) {</div><div class='ctx'> 			int chkpt = journal-&gt;j_checkpoint_transactions != NULL;</div><div class='ctx'> 			tid_t tid = 0;</div><div class='add'>+			bool has_transaction = false;</div><div class='ctx'> </div><div class='del'>-			if (journal-&gt;j_committing_transaction)</div><div class='add'>+			if (journal-&gt;j_committing_transaction) {</div><div class='ctx'> 				tid = journal-&gt;j_committing_transaction-&gt;t_tid;</div><div class='add'>+				has_transaction = true;</div><div class='add'>+			}</div><div class='ctx'> 			spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 			write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 			if (chkpt) {</div><div class='ctx'> 				jbd2_log_do_checkpoint(journal);</div><div class='del'>-			} else if (jbd2_cleanup_journal_tail(journal) == 0) {</div><div class='del'>-				/* We were able to recover space; yay! */</div><div class='add'>+			} else if (jbd2_cleanup_journal_tail(journal) &lt;= 0) {</div><div class='add'>+				/*</div><div class='add'>+				 * We were able to recover space or the</div><div class='add'>+				 * journal was aborted due to an error.</div><div class='add'>+				 */</div><div class='ctx'> 				;</div><div class='del'>-			} else if (tid) {</div><div class='add'>+			} else if (has_transaction) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * jbd2_journal_commit_transaction() may want</div><div class='ctx'> 				 * to take the checkpoint_mutex if JBD2_FLUSHED</div><div class='hunk'>@@ -107,7 +113,7 @@ __releases(&amp;journal-&gt;j_state_lock)</div><div class='ctx'> 				       "journal space in %s\n", __func__,</div><div class='ctx'> 				       journal-&gt;j_devname);</div><div class='ctx'> 				WARN_ON(1);</div><div class='del'>-				jbd2_journal_abort(journal, -EIO);</div><div class='add'>+				jbd2_journal_abort(journal, -ENOSPC);</div><div class='ctx'> 			}</div><div class='ctx'> 			write_lock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -125,7 +131,7 @@ __flush_batch(journal_t *journal, int *batch_count)</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='ctx'> 	for (i = 0; i &lt; *batch_count; i++)</div><div class='del'>-		write_dirty_buffer(journal-&gt;j_chkpt_bhs[i], REQ_SYNC);</div><div class='add'>+		write_dirty_buffer(journal-&gt;j_chkpt_bhs[i], JBD2_JOURNAL_REQ_FLAGS);</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; *batch_count; i++) {</div><div class='hunk'>@@ -279,6 +285,7 @@ restart:</div><div class='ctx'> 		retry:</div><div class='ctx'> 			if (batch_count)</div><div class='ctx'> 				__flush_batch(journal, &amp;batch_count);</div><div class='add'>+			cond_resched();</div><div class='ctx'> 			spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -337,8 +344,6 @@ int jbd2_cleanup_journal_tail(journal_t *journal)</div><div class='ctx'> </div><div class='ctx'> /* Checkpoint list management */</div><div class='ctx'> </div><div class='del'>-enum shrink_type {SHRINK_DESTROY, SHRINK_BUSY_STOP, SHRINK_BUSY_SKIP};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * journal_shrink_one_cp_list</div><div class='ctx'>  *</div><div class='hunk'>@@ -350,7 +355,7 @@ enum shrink_type {SHRINK_DESTROY, SHRINK_BUSY_STOP, SHRINK_BUSY_SKIP};</div><div class='ctx'>  * Called with j_list_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,</div><div class='del'>-						enum shrink_type type,</div><div class='add'>+						enum jbd2_shrink_type type,</div><div class='ctx'> 						bool *released)</div><div class='ctx'> {</div><div class='ctx'> 	struct journal_head *last_jh;</div><div class='hunk'>@@ -367,12 +372,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,</div><div class='ctx'> 		jh = next_jh;</div><div class='ctx'> 		next_jh = jh-&gt;b_cpnext;</div><div class='ctx'> </div><div class='del'>-		if (type == SHRINK_DESTROY) {</div><div class='add'>+		if (type == JBD2_SHRINK_DESTROY) {</div><div class='ctx'> 			ret = __jbd2_journal_remove_checkpoint(jh);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = jbd2_journal_try_remove_checkpoint(jh);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='del'>-				if (type == SHRINK_BUSY_SKIP)</div><div class='add'>+				if (type == JBD2_SHRINK_BUSY_SKIP)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -409,6 +414,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,</div><div class='ctx'> 	tid_t tid = 0;</div><div class='ctx'> 	unsigned long nr_freed = 0;</div><div class='ctx'> 	unsigned long freed;</div><div class='add'>+	bool first_set = false;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='hunk'>@@ -428,8 +434,10 @@ again:</div><div class='ctx'> 	else</div><div class='ctx'> 		transaction = journal-&gt;j_checkpoint_transactions;</div><div class='ctx'> </div><div class='del'>-	if (!first_tid)</div><div class='add'>+	if (!first_set) {</div><div class='ctx'> 		first_tid = transaction-&gt;t_tid;</div><div class='add'>+		first_set = true;</div><div class='add'>+	}</div><div class='ctx'> 	last_transaction = journal-&gt;j_checkpoint_transactions-&gt;t_cpprev;</div><div class='ctx'> 	next_transaction = transaction;</div><div class='ctx'> 	last_tid = last_transaction-&gt;t_tid;</div><div class='hunk'>@@ -439,7 +447,7 @@ again:</div><div class='ctx'> 		tid = transaction-&gt;t_tid;</div><div class='ctx'> </div><div class='ctx'> 		freed = journal_shrink_one_cp_list(transaction-&gt;t_checkpoint_list,</div><div class='del'>-						   SHRINK_BUSY_SKIP, &amp;released);</div><div class='add'>+						   JBD2_SHRINK_BUSY_SKIP, &amp;released);</div><div class='ctx'> 		nr_freed += freed;</div><div class='ctx'> 		(*nr_to_scan) -= min(*nr_to_scan, freed);</div><div class='ctx'> 		if (*nr_to_scan == 0)</div><div class='hunk'>@@ -459,7 +467,7 @@ again:</div><div class='ctx'> 	spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 	cond_resched();</div><div class='ctx'> </div><div class='del'>-	if (*nr_to_scan &amp;&amp; next_tid)</div><div class='add'>+	if (*nr_to_scan &amp;&amp; journal-&gt;j_shrink_transaction)</div><div class='ctx'> 		goto again;</div><div class='ctx'> out:</div><div class='ctx'> 	trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid,</div><div class='hunk'>@@ -472,21 +480,25 @@ out:</div><div class='ctx'>  * journal_clean_checkpoint_list</div><div class='ctx'>  *</div><div class='ctx'>  * Find all the written-back checkpoint buffers in the journal and release them.</div><div class='del'>- * If 'destroy' is set, release all buffers unconditionally.</div><div class='add'>+ * If 'type' is JBD2_SHRINK_DESTROY, release all buffers unconditionally. If</div><div class='add'>+ * 'type' is JBD2_SHRINK_BUSY_STOP, will stop release buffers if encounters a</div><div class='add'>+ * busy buffer. To avoid wasting CPU cycles scanning the buffer list in some</div><div class='add'>+ * cases, don't pass JBD2_SHRINK_BUSY_SKIP 'type' for this function.</div><div class='ctx'>  *</div><div class='ctx'>  * Called with j_list_lock held.</div><div class='ctx'>  */</div><div class='del'>-void __jbd2_journal_clean_checkpoint_list(journal_t *journal, bool destroy)</div><div class='add'>+void __jbd2_journal_clean_checkpoint_list(journal_t *journal,</div><div class='add'>+					  enum jbd2_shrink_type type)</div><div class='ctx'> {</div><div class='ctx'> 	transaction_t *transaction, *last_transaction, *next_transaction;</div><div class='del'>-	enum shrink_type type;</div><div class='ctx'> 	bool released;</div><div class='ctx'> </div><div class='add'>+	WARN_ON_ONCE(type == JBD2_SHRINK_BUSY_SKIP);</div><div class='add'>+</div><div class='ctx'> 	transaction = journal-&gt;j_checkpoint_transactions;</div><div class='ctx'> 	if (!transaction)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	type = destroy ? SHRINK_DESTROY : SHRINK_BUSY_STOP;</div><div class='ctx'> 	last_transaction = transaction-&gt;t_cpprev;</div><div class='ctx'> 	next_transaction = transaction;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -527,7 +539,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal)</div><div class='ctx'> 			spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		__jbd2_journal_clean_checkpoint_list(journal, true);</div><div class='add'>+		__jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_DESTROY);</div><div class='ctx'> 		spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c<br/>index 5e122586e06e..7203d2d2624d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/commit.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/commit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/commit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/commit.c</a></div><div class='hunk'>@@ -57,8 +57,8 @@ static void journal_end_buffer_io_sync(struct buffer_head *bh, int uptodate)</div><div class='ctx'>  * So here, we have a buffer which has just come off the forget list.  Look to</div><div class='ctx'>  * see if we can strip all buffers from the backing page.</div><div class='ctx'>  *</div><div class='del'>- * Called under lock_journal(), and possibly under journal_datalist_lock.  The</div><div class='del'>- * caller provided us with a ref against the buffer, and we drop that here.</div><div class='add'>+ * Called under j_list_lock. The caller provided us with a ref against the</div><div class='add'>+ * buffer, and we drop that here.</div><div class='ctx'>  */</div><div class='ctx'> static void release_buffer_page(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='hunk'>@@ -99,7 +99,7 @@ static void jbd2_commit_block_csum_set(journal_t *j, struct buffer_head *bh)</div><div class='ctx'> 	h-&gt;h_chksum_type = 0;</div><div class='ctx'> 	h-&gt;h_chksum_size = 0;</div><div class='ctx'> 	h-&gt;h_chksum[0] = 0;</div><div class='del'>-	csum = jbd2_chksum(j, j-&gt;j_csum_seed, bh-&gt;b_data, j-&gt;j_blocksize);</div><div class='add'>+	csum = jbd2_chksum(j-&gt;j_csum_seed, bh-&gt;b_data, j-&gt;j_blocksize);</div><div class='ctx'> 	h-&gt;h_chksum[0] = cpu_to_be32(csum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,8 +330,8 @@ static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag,</div><div class='ctx'> </div><div class='ctx'> 	seq = cpu_to_be32(sequence);</div><div class='ctx'> 	addr = kmap_local_folio(bh-&gt;b_folio, bh_offset(bh));</div><div class='del'>-	csum32 = jbd2_chksum(j, j-&gt;j_csum_seed, (__u8 *)&amp;seq, sizeof(seq));</div><div class='del'>-	csum32 = jbd2_chksum(j, csum32, addr, bh-&gt;b_size);</div><div class='add'>+	csum32 = jbd2_chksum(j-&gt;j_csum_seed, (__u8 *)&amp;seq, sizeof(seq));</div><div class='add'>+	csum32 = jbd2_chksum(csum32, addr, bh-&gt;b_size);</div><div class='ctx'> 	kunmap_local(addr);</div><div class='ctx'> </div><div class='ctx'> 	if (jbd2_has_feature_csum3(j))</div><div class='hunk'>@@ -353,7 +353,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)</div><div class='ctx'> 	struct buffer_head *descriptor;</div><div class='ctx'> 	struct buffer_head **wbuf = journal-&gt;j_wbuf;</div><div class='ctx'> 	int bufs;</div><div class='del'>-	int flags;</div><div class='add'>+	int escape;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned long long blocknr;</div><div class='ctx'> 	ktime_t start_time;</div><div class='hunk'>@@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)</div><div class='ctx'> 	 * frees some memory</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='del'>-	__jbd2_journal_clean_checkpoint_list(journal, false);</div><div class='add'>+	__jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_BUSY_STOP);</div><div class='ctx'> 	spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	jbd2_debug(3, "JBD2: commit phase 1\n");</div><div class='hunk'>@@ -571,7 +571,6 @@ void jbd2_journal_commit_transaction(journal_t *journal)</div><div class='ctx'> 	J_ASSERT(commit_transaction-&gt;t_nr_buffers &lt;=</div><div class='ctx'> 		 atomic_read(&amp;commit_transaction-&gt;t_outstanding_credits));</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='ctx'> 	bufs = 0;</div><div class='ctx'> 	descriptor = NULL;</div><div class='ctx'> 	while (commit_transaction-&gt;t_buffers) {</div><div class='hunk'>@@ -661,19 +660,15 @@ void jbd2_journal_commit_transaction(journal_t *journal)</div><div class='ctx'> 		 */</div><div class='ctx'> 		set_bit(BH_JWrite, &amp;jh2bh(jh)-&gt;b_state);</div><div class='ctx'> 		JBUFFER_TRACE(jh, "ph3: write metadata");</div><div class='del'>-		flags = jbd2_journal_write_metadata_buffer(commit_transaction,</div><div class='add'>+		escape = jbd2_journal_write_metadata_buffer(commit_transaction,</div><div class='ctx'> 						jh, &amp;wbuf[bufs], blocknr);</div><div class='del'>-		if (flags &lt; 0) {</div><div class='del'>-			jbd2_journal_abort(journal, flags);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='ctx'> 		jbd2_file_log_bh(&amp;io_bufs, wbuf[bufs]);</div><div class='ctx'> </div><div class='ctx'> 		/* Record the new block's tag in the current descriptor</div><div class='ctx'>                    buffer */</div><div class='ctx'> </div><div class='ctx'> 		tag_flag = 0;</div><div class='del'>-		if (flags &amp; 1)</div><div class='add'>+		if (escape)</div><div class='ctx'> 			tag_flag |= JBD2_FLAG_ESCAPE;</div><div class='ctx'> 		if (!first_tag)</div><div class='ctx'> 			tag_flag |= JBD2_FLAG_SAME_UUID;</div><div class='hunk'>@@ -743,10 +738,8 @@ start_journal_io:</div><div class='ctx'> 	err = journal_finish_inode_data_buffers(journal, commit_transaction);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='del'>-			"JBD2: Detected IO errors while flushing file data "</div><div class='del'>-		       "on %s\n", journal-&gt;j_devname);</div><div class='del'>-		if (journal-&gt;j_flags &amp; JBD2_ABORT_ON_SYNCDATA_ERR)</div><div class='del'>-			jbd2_journal_abort(journal, err);</div><div class='add'>+			"JBD2: Detected IO errors %d while flushing file data on %s\n",</div><div class='add'>+			err, journal-&gt;j_devname);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -767,7 +760,7 @@ start_journal_io:</div><div class='ctx'> 		if (first_block &lt; journal-&gt;j_tail)</div><div class='ctx'> 			freed += journal-&gt;j_last - journal-&gt;j_first;</div><div class='ctx'> 		/* Update tail only if we free significant amount of space */</div><div class='del'>-		if (freed &lt; jbd2_journal_get_max_txn_bufs(journal))</div><div class='add'>+		if (freed &lt; journal-&gt;j_max_transaction_buffers)</div><div class='ctx'> 			update_tail = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	J_ASSERT(commit_transaction-&gt;t_state == T_COMMIT);</div><div class='hunk'>@@ -777,9 +770,9 @@ start_journal_io:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the journal is not located on the file system device,</div><div class='ctx'> 	 * then we must flush the file system device before we issue</div><div class='del'>-	 * the commit record</div><div class='add'>+	 * the commit record and update the journal tail sequence.</div><div class='ctx'> 	 */</div><div class='del'>-	if (commit_transaction-&gt;t_need_data_flush &amp;&amp;</div><div class='add'>+	if ((commit_transaction-&gt;t_need_data_flush || update_tail) &amp;&amp;</div><div class='ctx'> 	    (journal-&gt;j_fs_dev != journal-&gt;j_dev) &amp;&amp;</div><div class='ctx'> 	    (journal-&gt;j_flags &amp; JBD2_BARRIER))</div><div class='ctx'> 		blkdev_issue_flush(journal-&gt;j_fs_dev);</div><div class='hunk'>@@ -1108,7 +1101,7 @@ restart_loop:</div><div class='ctx'> </div><div class='ctx'> 	commit_transaction-&gt;t_state = T_COMMIT_CALLBACK;</div><div class='ctx'> 	J_ASSERT(commit_transaction == journal-&gt;j_committing_transaction);</div><div class='del'>-	journal-&gt;j_commit_sequence = commit_transaction-&gt;t_tid;</div><div class='add'>+	WRITE_ONCE(journal-&gt;j_commit_sequence, commit_transaction-&gt;t_tid);</div><div class='ctx'> 	journal-&gt;j_committing_transaction = NULL;</div><div class='ctx'> 	commit_time = ktime_to_ns(ktime_sub(ktime_get(), start_time));</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c<br/>index b6c114c11b97..c973162d5b31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/journal.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/journal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/journal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/journal.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ EXPORT_SYMBOL(jbd2_log_wait_commit);</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_start_commit);</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_force_commit_nested);</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_wipe);</div><div class='del'>-EXPORT_SYMBOL(jbd2_journal_blocks_per_page);</div><div class='add'>+EXPORT_SYMBOL(jbd2_journal_blocks_per_folio);</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_invalidate_folio);</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_force_commit);</div><div class='hunk'>@@ -115,14 +115,14 @@ void __jbd2_debug(int level, const char *file, const char *func,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Checksumming functions */</div><div class='del'>-static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb)</div><div class='add'>+static __be32 jbd2_superblock_csum(journal_superblock_t *sb)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 csum;</div><div class='ctx'> 	__be32 old_csum;</div><div class='ctx'> </div><div class='ctx'> 	old_csum = sb-&gt;s_checksum;</div><div class='ctx'> 	sb-&gt;s_checksum = 0;</div><div class='del'>-	csum = jbd2_chksum(j, ~0, (char *)sb, sizeof(journal_superblock_t));</div><div class='add'>+	csum = jbd2_chksum(~0, (char *)sb, sizeof(journal_superblock_t));</div><div class='ctx'> 	sb-&gt;s_checksum = old_csum;</div><div class='ctx'> </div><div class='ctx'> 	return cpu_to_be32(csum);</div><div class='hunk'>@@ -134,7 +134,7 @@ static __be32 jbd2_superblock_csum(journal_t *j, journal_superblock_t *sb)</div><div class='ctx'> </div><div class='ctx'> static void commit_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	journal_t *journal = from_timer(journal, t, j_commit_timer);</div><div class='add'>+	journal_t *journal = timer_container_of(journal, t, j_commit_timer);</div><div class='ctx'> </div><div class='ctx'> 	wake_up_process(journal-&gt;j_task);</div><div class='ctx'> }</div><div class='hunk'>@@ -197,7 +197,7 @@ loop:</div><div class='ctx'> 	if (journal-&gt;j_commit_sequence != journal-&gt;j_commit_request) {</div><div class='ctx'> 		jbd2_debug(1, "OK, requests differ\n");</div><div class='ctx'> 		write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-		del_timer_sync(&amp;journal-&gt;j_commit_timer);</div><div class='add'>+		timer_delete_sync(&amp;journal-&gt;j_commit_timer);</div><div class='ctx'> 		jbd2_journal_commit_transaction(journal);</div><div class='ctx'> 		write_lock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 		goto loop;</div><div class='hunk'>@@ -220,19 +220,12 @@ loop:</div><div class='ctx'> 		 * so we don't sleep</div><div class='ctx'> 		 */</div><div class='ctx'> 		DEFINE_WAIT(wait);</div><div class='del'>-		int should_sleep = 1;</div><div class='ctx'> </div><div class='ctx'> 		prepare_to_wait(&amp;journal-&gt;j_wait_commit, &amp;wait,</div><div class='ctx'> 				TASK_INTERRUPTIBLE);</div><div class='del'>-		if (journal-&gt;j_commit_sequence != journal-&gt;j_commit_request)</div><div class='del'>-			should_sleep = 0;</div><div class='ctx'> 		transaction = journal-&gt;j_running_transaction;</div><div class='del'>-		if (transaction &amp;&amp; time_after_eq(jiffies,</div><div class='del'>-						transaction-&gt;t_expires))</div><div class='del'>-			should_sleep = 0;</div><div class='del'>-		if (journal-&gt;j_flags &amp; JBD2_UNMOUNT)</div><div class='del'>-			should_sleep = 0;</div><div class='del'>-		if (should_sleep) {</div><div class='add'>+		if (transaction == NULL ||</div><div class='add'>+		    time_before(jiffies, transaction-&gt;t_expires)) {</div><div class='ctx'> 			write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 			schedule();</div><div class='ctx'> 			write_lock(&amp;journal-&gt;j_state_lock);</div><div class='hunk'>@@ -253,7 +246,7 @@ loop:</div><div class='ctx'> 	goto loop;</div><div class='ctx'> </div><div class='ctx'> end_loop:</div><div class='del'>-	del_timer_sync(&amp;journal-&gt;j_commit_timer);</div><div class='add'>+	timer_delete_sync(&amp;journal-&gt;j_commit_timer);</div><div class='ctx'> 	journal-&gt;j_task = NULL;</div><div class='ctx'> 	wake_up(&amp;journal-&gt;j_wait_done_commit);</div><div class='ctx'> 	jbd2_debug(1, "Journal thread exiting.\n");</div><div class='hunk'>@@ -288,6 +281,16 @@ static void journal_kill_thread(journal_t *journal)</div><div class='ctx'> 	write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool jbd2_data_needs_escaping(char *data)</div><div class='add'>+{</div><div class='add'>+	return *((__be32 *)data) == cpu_to_be32(JBD2_MAGIC_NUMBER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jbd2_data_do_escape(char *data)</div><div class='add'>+{</div><div class='add'>+	*((unsigned int *)data) = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * jbd2_journal_write_metadata_buffer: write a metadata buffer to the journal.</div><div class='ctx'>  *</div><div class='hunk'>@@ -315,12 +318,8 @@ static void journal_kill_thread(journal_t *journal)</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * Return value:</div><div class='del'>- *  &lt;0: Error</div><div class='del'>- * &gt;=0: Finished OK</div><div class='del'>- *</div><div class='del'>- * On success:</div><div class='del'>- * Bit 0 set == escape performed on the data</div><div class='del'>- * Bit 1 set == buffer copy-out performed (kfree the data after IO)</div><div class='add'>+ *  =0: Finished OK without escape</div><div class='add'>+ *  =1: Finished OK with escape</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int jbd2_journal_write_metadata_buffer(transaction_t *transaction,</div><div class='hunk'>@@ -328,10 +327,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,</div><div class='ctx'> 				  struct buffer_head **bh_out,</div><div class='ctx'> 				  sector_t blocknr)</div><div class='ctx'> {</div><div class='del'>-	int need_copy_out = 0;</div><div class='del'>-	int done_copy_out = 0;</div><div class='ctx'> 	int do_escape = 0;</div><div class='del'>-	char *mapped_data;</div><div class='ctx'> 	struct buffer_head *new_bh;</div><div class='ctx'> 	struct folio *new_folio;</div><div class='ctx'> 	unsigned int new_offset;</div><div class='hunk'>@@ -355,83 +351,63 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,</div><div class='ctx'> 	atomic_set(&amp;new_bh-&gt;b_count, 1);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;jh_in-&gt;b_state_lock);</div><div class='del'>-repeat:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If a new transaction has already done a buffer copy-out, then</div><div class='ctx'> 	 * we use that version of the data for the commit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (jh_in-&gt;b_frozen_data) {</div><div class='del'>-		done_copy_out = 1;</div><div class='ctx'> 		new_folio = virt_to_folio(jh_in-&gt;b_frozen_data);</div><div class='ctx'> 		new_offset = offset_in_folio(new_folio, jh_in-&gt;b_frozen_data);</div><div class='add'>+		do_escape = jbd2_data_needs_escaping(jh_in-&gt;b_frozen_data);</div><div class='add'>+		if (do_escape)</div><div class='add'>+			jbd2_data_do_escape(jh_in-&gt;b_frozen_data);</div><div class='ctx'> 	} else {</div><div class='del'>-		new_folio = jh2bh(jh_in)-&gt;b_folio;</div><div class='del'>-		new_offset = offset_in_folio(new_folio, jh2bh(jh_in)-&gt;b_data);</div><div class='del'>-	}</div><div class='add'>+		char *tmp;</div><div class='add'>+		char *mapped_data;</div><div class='ctx'> </div><div class='del'>-	mapped_data = kmap_local_folio(new_folio, new_offset);</div><div class='del'>-	/*</div><div class='del'>-	 * Fire data frozen trigger if data already wasn't frozen.  Do this</div><div class='del'>-	 * before checking for escaping, as the trigger may modify the magic</div><div class='del'>-	 * offset.  If a copy-out happens afterwards, it will have the correct</div><div class='del'>-	 * data in the buffer.</div><div class='del'>-	 */</div><div class='del'>-	if (!done_copy_out)</div><div class='add'>+		new_folio = bh_in-&gt;b_folio;</div><div class='add'>+		new_offset = offset_in_folio(new_folio, bh_in-&gt;b_data);</div><div class='add'>+		mapped_data = kmap_local_folio(new_folio, new_offset);</div><div class='add'>+		/*</div><div class='add'>+		 * Fire data frozen trigger if data already wasn't frozen. Do</div><div class='add'>+		 * this before checking for escaping, as the trigger may modify</div><div class='add'>+		 * the magic offset.  If a copy-out happens afterwards, it will</div><div class='add'>+		 * have the correct data in the buffer.</div><div class='add'>+		 */</div><div class='ctx'> 		jbd2_buffer_frozen_trigger(jh_in, mapped_data,</div><div class='ctx'> 					   jh_in-&gt;b_triggers);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check for escaping</div><div class='del'>-	 */</div><div class='del'>-	if (*((__be32 *)mapped_data) == cpu_to_be32(JBD2_MAGIC_NUMBER)) {</div><div class='del'>-		need_copy_out = 1;</div><div class='del'>-		do_escape = 1;</div><div class='del'>-	}</div><div class='del'>-	kunmap_local(mapped_data);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do we need to do a data copy?</div><div class='del'>-	 */</div><div class='del'>-	if (need_copy_out &amp;&amp; !done_copy_out) {</div><div class='del'>-		char *tmp;</div><div class='add'>+		do_escape = jbd2_data_needs_escaping(mapped_data);</div><div class='add'>+		kunmap_local(mapped_data);</div><div class='add'>+		/*</div><div class='add'>+		 * Do we need to do a data copy?</div><div class='add'>+		 */</div><div class='add'>+		if (!do_escape)</div><div class='add'>+			goto escape_done;</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;jh_in-&gt;b_state_lock);</div><div class='del'>-		tmp = jbd2_alloc(bh_in-&gt;b_size, GFP_NOFS);</div><div class='del'>-		if (!tmp) {</div><div class='del'>-			brelse(new_bh);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+		tmp = jbd2_alloc(bh_in-&gt;b_size, GFP_NOFS | __GFP_NOFAIL);</div><div class='ctx'> 		spin_lock(&amp;jh_in-&gt;b_state_lock);</div><div class='ctx'> 		if (jh_in-&gt;b_frozen_data) {</div><div class='ctx'> 			jbd2_free(tmp, bh_in-&gt;b_size);</div><div class='del'>-			goto repeat;</div><div class='add'>+			goto copy_done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		jh_in-&gt;b_frozen_data = tmp;</div><div class='ctx'> 		memcpy_from_folio(tmp, new_folio, new_offset, bh_in-&gt;b_size);</div><div class='del'>-</div><div class='del'>-		new_folio = virt_to_folio(tmp);</div><div class='del'>-		new_offset = offset_in_folio(new_folio, tmp);</div><div class='del'>-		done_copy_out = 1;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This isn't strictly necessary, as we're using frozen</div><div class='ctx'> 		 * data for the escaping, but it keeps consistency with</div><div class='ctx'> 		 * b_frozen_data usage.</div><div class='ctx'> 		 */</div><div class='ctx'> 		jh_in-&gt;b_frozen_triggers = jh_in-&gt;b_triggers;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Did we need to do an escaping?  Now we've done all the</div><div class='del'>-	 * copying, we can finally do so.</div><div class='del'>-	 */</div><div class='del'>-	if (do_escape) {</div><div class='del'>-		mapped_data = kmap_local_folio(new_folio, new_offset);</div><div class='del'>-		*((unsigned int *)mapped_data) = 0;</div><div class='del'>-		kunmap_local(mapped_data);</div><div class='add'>+copy_done:</div><div class='add'>+		new_folio = virt_to_folio(jh_in-&gt;b_frozen_data);</div><div class='add'>+		new_offset = offset_in_folio(new_folio, jh_in-&gt;b_frozen_data);</div><div class='add'>+		jbd2_data_do_escape(jh_in-&gt;b_frozen_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+escape_done:</div><div class='ctx'> 	folio_set_bh(new_bh, new_folio, new_offset);</div><div class='ctx'> 	new_bh-&gt;b_size = bh_in-&gt;b_size;</div><div class='ctx'> 	new_bh-&gt;b_bdev = journal-&gt;j_dev;</div><div class='hunk'>@@ -454,7 +430,7 @@ repeat:</div><div class='ctx'> 	set_buffer_shadow(bh_in);</div><div class='ctx'> 	spin_unlock(&amp;jh_in-&gt;b_state_lock);</div><div class='ctx'> </div><div class='del'>-	return do_escape | (done_copy_out &lt;&lt; 1);</div><div class='add'>+	return do_escape;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -627,7 +603,7 @@ int jbd2_journal_start_commit(journal_t *journal, tid_t *ptid)</div><div class='ctx'> int jbd2_trans_will_send_data_barrier(journal_t *journal, tid_t tid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	transaction_t *commit_trans;</div><div class='add'>+	transaction_t *commit_trans, *running_trans;</div><div class='ctx'> </div><div class='ctx'> 	if (!(journal-&gt;j_flags &amp; JBD2_BARRIER))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -637,6 +613,16 @@ int jbd2_trans_will_send_data_barrier(journal_t *journal, tid_t tid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	commit_trans = journal-&gt;j_committing_transaction;</div><div class='ctx'> 	if (!commit_trans || commit_trans-&gt;t_tid != tid) {</div><div class='add'>+		running_trans = journal-&gt;j_running_transaction;</div><div class='add'>+		/*</div><div class='add'>+		 * The query transaction hasn't started committing,</div><div class='add'>+		 * it must still be running.</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON_ONCE(!running_trans ||</div><div class='add'>+				 running_trans-&gt;t_tid != tid))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		running_trans-&gt;t_need_data_flush = 1;</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -724,7 +710,7 @@ int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	write_lock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-	if (tid &lt;= journal-&gt;j_commit_sequence) {</div><div class='add'>+	if (tid_geq(journal-&gt;j_commit_sequence, tid)) {</div><div class='ctx'> 		write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 		return -EALREADY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -742,7 +728,6 @@ int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)</div><div class='ctx'> 	}</div><div class='ctx'> 	journal-&gt;j_flags |= JBD2_FAST_COMMIT_ONGOING;</div><div class='ctx'> 	write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-	jbd2_journal_lock_updates(journal);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -754,7 +739,6 @@ EXPORT_SYMBOL(jbd2_fc_begin_commit);</div><div class='ctx'>  */</div><div class='ctx'> static int __jbd2_fc_end_commit(journal_t *journal, tid_t tid, bool fallback)</div><div class='ctx'> {</div><div class='del'>-	jbd2_journal_unlock_updates(journal);</div><div class='ctx'> 	if (journal-&gt;j_fc_cleanup_callback)</div><div class='ctx'> 		journal-&gt;j_fc_cleanup_callback(journal, 0, tid);</div><div class='ctx'> 	write_lock(&amp;journal-&gt;j_state_lock);</div><div class='hunk'>@@ -789,17 +773,7 @@ EXPORT_SYMBOL(jbd2_fc_end_commit_fallback);</div><div class='ctx'> /* Return 1 when transaction with given tid has already committed. */</div><div class='ctx'> int jbd2_transaction_committed(journal_t *journal, tid_t tid)</div><div class='ctx'> {</div><div class='del'>-	int ret = 1;</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-	if (journal-&gt;j_running_transaction &amp;&amp;</div><div class='del'>-	    journal-&gt;j_running_transaction-&gt;t_tid == tid)</div><div class='del'>-		ret = 0;</div><div class='del'>-	if (journal-&gt;j_committing_transaction &amp;&amp;</div><div class='del'>-	    journal-&gt;j_committing_transaction-&gt;t_tid == tid)</div><div class='del'>-		ret = 0;</div><div class='del'>-	read_unlock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-	return ret;</div><div class='add'>+	return tid_geq(READ_ONCE(journal-&gt;j_commit_sequence), tid);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(jbd2_transaction_committed);</div><div class='ctx'> </div><div class='hunk'>@@ -865,17 +839,12 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out)</div><div class='ctx'> </div><div class='ctx'> 	*bh_out = NULL;</div><div class='ctx'> </div><div class='del'>-	if (journal-&gt;j_fc_off + journal-&gt;j_fc_first &lt; journal-&gt;j_fc_last) {</div><div class='del'>-		fc_off = journal-&gt;j_fc_off;</div><div class='del'>-		blocknr = journal-&gt;j_fc_first + fc_off;</div><div class='del'>-		journal-&gt;j_fc_off++;</div><div class='del'>-	} else {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (journal-&gt;j_fc_off + journal-&gt;j_fc_first &gt;= journal-&gt;j_fc_last)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	fc_off = journal-&gt;j_fc_off;</div><div class='add'>+	blocknr = journal-&gt;j_fc_first + fc_off;</div><div class='add'>+	journal-&gt;j_fc_off++;</div><div class='ctx'> 	ret = jbd2_journal_bmap(journal, blocknr, &amp;pblock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -884,7 +853,6 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out)</div><div class='ctx'> 	if (!bh)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	journal-&gt;j_fc_wbuf[fc_off] = bh;</div><div class='ctx'> </div><div class='ctx'> 	*bh_out = bh;</div><div class='hunk'>@@ -927,7 +895,7 @@ int jbd2_fc_wait_bufs(journal_t *journal, int num_blks)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(jbd2_fc_wait_bufs);</div><div class='ctx'> </div><div class='del'>-int jbd2_fc_release_bufs(journal_t *journal)</div><div class='add'>+void jbd2_fc_release_bufs(journal_t *journal)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	int i, j_fc_off;</div><div class='hunk'>@@ -941,8 +909,6 @@ int jbd2_fc_release_bufs(journal_t *journal)</div><div class='ctx'> 		put_bh(bh);</div><div class='ctx'> 		journal-&gt;j_fc_wbuf[i] = NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(jbd2_fc_release_bufs);</div><div class='ctx'> </div><div class='hunk'>@@ -971,8 +937,8 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,</div><div class='ctx'> 			printk(KERN_ALERT "%s: journal block not found "</div><div class='ctx'> 					"at offset %lu on %s\n",</div><div class='ctx'> 			       __func__, blocknr, journal-&gt;j_devname);</div><div class='add'>+			jbd2_journal_abort(journal, ret ? ret : -EFSCORRUPTED);</div><div class='ctx'> 			err = -EIO;</div><div class='del'>-			jbd2_journal_abort(journal, err);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			*retp = block;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -989,7 +955,7 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,</div><div class='ctx'>  * descriptor blocks we do need to generate bona fide buffers.</div><div class='ctx'>  *</div><div class='ctx'>  * After the caller of jbd2_journal_get_descriptor_buffer() has finished modifying</div><div class='del'>- * the buffer's contents they really should run flush_dcache_page(bh-&gt;b_page).</div><div class='add'>+ * the buffer's contents they really should run flush_dcache_folio(bh-&gt;b_folio).</div><div class='ctx'>  * But we don't bother doing that, so there will be coherency problems with</div><div class='ctx'>  * mmaps of blockdevs which hold live JBD-controlled filesystems.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1034,7 +1000,7 @@ void jbd2_descriptor_block_csum_set(journal_t *j, struct buffer_head *bh)</div><div class='ctx'> 	tail = (struct jbd2_journal_block_tail *)(bh-&gt;b_data + j-&gt;j_blocksize -</div><div class='ctx'> 			sizeof(struct jbd2_journal_block_tail));</div><div class='ctx'> 	tail-&gt;t_checksum = 0;</div><div class='del'>-	csum = jbd2_chksum(j, j-&gt;j_csum_seed, bh-&gt;b_data, j-&gt;j_blocksize);</div><div class='add'>+	csum = jbd2_chksum(j-&gt;j_csum_seed, bh-&gt;b_data, j-&gt;j_blocksize);</div><div class='ctx'> 	tail-&gt;t_checksum = cpu_to_be32(csum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1403,7 +1369,7 @@ static int journal_check_superblock(journal_t *journal)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (jbd2_journal_has_csum_v2or3_feature(journal) &amp;&amp;</div><div class='add'>+	if (jbd2_journal_has_csum_v2or3(journal) &amp;&amp;</div><div class='ctx'> 	    jbd2_has_feature_checksum(journal)) {</div><div class='ctx'> 		/* Can't have checksum v1 and v2 on at the same time! */</div><div class='ctx'> 		printk(KERN_ERR "JBD2: Can't enable checksumming v1 and v2/3 "</div><div class='hunk'>@@ -1411,22 +1377,14 @@ static int journal_check_superblock(journal_t *journal)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Load the checksum driver */</div><div class='del'>-	if (jbd2_journal_has_csum_v2or3_feature(journal)) {</div><div class='add'>+	if (jbd2_journal_has_csum_v2or3(journal)) {</div><div class='ctx'> 		if (sb-&gt;s_checksum_type != JBD2_CRC32C_CHKSUM) {</div><div class='ctx'> 			printk(KERN_ERR "JBD2: Unknown checksum type\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		journal-&gt;j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);</div><div class='del'>-		if (IS_ERR(journal-&gt;j_chksum_driver)) {</div><div class='del'>-			printk(KERN_ERR "JBD2: Cannot load crc32c driver.\n");</div><div class='del'>-			err = PTR_ERR(journal-&gt;j_chksum_driver);</div><div class='del'>-			journal-&gt;j_chksum_driver = NULL;</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='ctx'> 		/* Check superblock checksum */</div><div class='del'>-		if (sb-&gt;s_checksum != jbd2_superblock_csum(journal, sb)) {</div><div class='add'>+		if (sb-&gt;s_checksum != jbd2_superblock_csum(sb)) {</div><div class='ctx'> 			printk(KERN_ERR "JBD2: journal checksum error\n");</div><div class='ctx'> 			err = -EFSBADCRC;</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1451,6 +1409,48 @@ static int journal_revoke_records_per_block(journal_t *journal)</div><div class='ctx'> 	return space / record_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int jbd2_journal_get_max_txn_bufs(journal_t *journal)</div><div class='add'>+{</div><div class='add'>+	return (journal-&gt;j_total_len - journal-&gt;j_fc_wbufsize) / 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Base amount of descriptor blocks we reserve for each transaction.</div><div class='add'>+ */</div><div class='add'>+static int jbd2_descriptor_blocks_per_trans(journal_t *journal)</div><div class='add'>+{</div><div class='add'>+	int tag_space = journal-&gt;j_blocksize - sizeof(journal_header_t);</div><div class='add'>+	int tags_per_block;</div><div class='add'>+</div><div class='add'>+	/* Subtract UUID */</div><div class='add'>+	tag_space -= 16;</div><div class='add'>+	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='add'>+		tag_space -= sizeof(struct jbd2_journal_block_tail);</div><div class='add'>+	/* Commit code leaves a slack space of 16 bytes at the end of block */</div><div class='add'>+	tags_per_block = (tag_space - 16) / journal_tag_bytes(journal);</div><div class='add'>+	/*</div><div class='add'>+	 * Revoke descriptors are accounted separately so we need to reserve</div><div class='add'>+	 * space for commit block and normal transaction descriptor blocks.</div><div class='add'>+	 */</div><div class='add'>+	return 1 + DIV_ROUND_UP(jbd2_journal_get_max_txn_bufs(journal),</div><div class='add'>+				tags_per_block);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize number of blocks each transaction reserves for its bookkeeping</div><div class='add'>+ * and maximum number of blocks a transaction can use. This needs to be called</div><div class='add'>+ * after the journal size and the fastcommit area size are initialized.</div><div class='add'>+ */</div><div class='add'>+static void jbd2_journal_init_transaction_limits(journal_t *journal)</div><div class='add'>+{</div><div class='add'>+	journal-&gt;j_revoke_records_per_block =</div><div class='add'>+				journal_revoke_records_per_block(journal);</div><div class='add'>+	journal-&gt;j_transaction_overhead_buffers =</div><div class='add'>+				jbd2_descriptor_blocks_per_trans(journal);</div><div class='add'>+	journal-&gt;j_max_transaction_buffers =</div><div class='add'>+				jbd2_journal_get_max_txn_bufs(journal);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Load the on-disk journal superblock and read the key fields into the</div><div class='ctx'>  * journal_t.</div><div class='hunk'>@@ -1490,10 +1490,10 @@ static int journal_load_superblock(journal_t *journal)</div><div class='ctx'> 		journal-&gt;j_total_len = be32_to_cpu(sb-&gt;s_maxlen);</div><div class='ctx'> 	/* Precompute checksum seed for all metadata */</div><div class='ctx'> 	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='del'>-		journal-&gt;j_csum_seed = jbd2_chksum(journal, ~0, sb-&gt;s_uuid,</div><div class='add'>+		journal-&gt;j_csum_seed = jbd2_chksum(~0, sb-&gt;s_uuid,</div><div class='ctx'> 						   sizeof(sb-&gt;s_uuid));</div><div class='del'>-	journal-&gt;j_revoke_records_per_block =</div><div class='del'>-				journal_revoke_records_per_block(journal);</div><div class='add'>+	/* After journal features are set, we can compute transaction limits */</div><div class='add'>+	jbd2_journal_init_transaction_limits(journal);</div><div class='ctx'> </div><div class='ctx'> 	if (jbd2_has_feature_fast_commit(journal)) {</div><div class='ctx'> 		journal-&gt;j_fc_last = be32_to_cpu(sb-&gt;s_maxlen);</div><div class='hunk'>@@ -1512,15 +1512,15 @@ static int journal_load_superblock(journal_t *journal)</div><div class='ctx'>  * destroy journal_t structures, and to initialise and read existing</div><div class='ctx'>  * journal blocks from disk.  */</div><div class='ctx'> </div><div class='del'>-/* First: create and setup a journal_t object in memory.  We initialise</div><div class='del'>- * very few fields yet: that has to wait until we have created the</div><div class='del'>- * journal structures from from scratch, or loaded them from disk. */</div><div class='add'>+/* The journal_init_common() function creates and fills a journal_t object</div><div class='add'>+ * in memory. It calls journal_load_superblock() to load the on-disk journal</div><div class='add'>+ * superblock and initialize the journal_t object.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static journal_t *journal_init_common(struct block_device *bdev,</div><div class='ctx'> 			struct block_device *fs_dev,</div><div class='ctx'> 			unsigned long long start, int len, int blocksize)</div><div class='ctx'> {</div><div class='del'>-	static struct lock_class_key jbd2_trans_commit_key;</div><div class='ctx'> 	journal_t *journal;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int n;</div><div class='hunk'>@@ -1529,6 +1529,7 @@ static journal_t *journal_init_common(struct block_device *bdev,</div><div class='ctx'> 	if (!journal)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	lockdep_register_key(&amp;journal-&gt;jbd2_trans_commit_key);</div><div class='ctx'> 	journal-&gt;j_blocksize = blocksize;</div><div class='ctx'> 	journal-&gt;j_dev = bdev;</div><div class='ctx'> 	journal-&gt;j_fs_dev = fs_dev;</div><div class='hunk'>@@ -1559,7 +1560,7 @@ static journal_t *journal_init_common(struct block_device *bdev,</div><div class='ctx'> 	journal-&gt;j_max_batch_time = 15000; /* 15ms */</div><div class='ctx'> 	atomic_set(&amp;journal-&gt;j_reserved_credits, 0);</div><div class='ctx'> 	lockdep_init_map(&amp;journal-&gt;j_trans_commit_map, "jbd2_handle",</div><div class='del'>-			 &amp;jbd2_trans_commit_key, 0);</div><div class='add'>+			 &amp;journal-&gt;jbd2_trans_commit_key, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* The journal is marked for error until we succeed with recovery! */</div><div class='ctx'> 	journal-&gt;j_flags = JBD2_ABORT;</div><div class='hunk'>@@ -1599,7 +1600,6 @@ static journal_t *journal_init_common(struct block_device *bdev,</div><div class='ctx'> </div><div class='ctx'> 	journal-&gt;j_shrinker-&gt;scan_objects = jbd2_journal_shrink_scan;</div><div class='ctx'> 	journal-&gt;j_shrinker-&gt;count_objects = jbd2_journal_shrink_count;</div><div class='del'>-	journal-&gt;j_shrinker-&gt;batch = journal-&gt;j_max_transaction_buffers;</div><div class='ctx'> 	journal-&gt;j_shrinker-&gt;private_data = journal;</div><div class='ctx'> </div><div class='ctx'> 	shrinker_register(journal-&gt;j_shrinker);</div><div class='hunk'>@@ -1608,11 +1608,10 @@ static journal_t *journal_init_common(struct block_device *bdev,</div><div class='ctx'> </div><div class='ctx'> err_cleanup:</div><div class='ctx'> 	percpu_counter_destroy(&amp;journal-&gt;j_checkpoint_jh_count);</div><div class='del'>-	if (journal-&gt;j_chksum_driver)</div><div class='del'>-		crypto_free_shash(journal-&gt;j_chksum_driver);</div><div class='ctx'> 	kfree(journal-&gt;j_wbuf);</div><div class='ctx'> 	jbd2_journal_destroy_revoke(journal);</div><div class='ctx'> 	journal_fail_superblock(journal);</div><div class='add'>+	lockdep_unregister_key(&amp;journal-&gt;jbd2_trans_commit_key);</div><div class='ctx'> 	kfree(journal);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='hunk'>@@ -1743,8 +1742,6 @@ static int journal_reset(journal_t *journal)</div><div class='ctx'> 	journal-&gt;j_commit_sequence = journal-&gt;j_transaction_sequence - 1;</div><div class='ctx'> 	journal-&gt;j_commit_request = journal-&gt;j_commit_sequence;</div><div class='ctx'> </div><div class='del'>-	journal-&gt;j_max_transaction_buffers = jbd2_journal_get_max_txn_bufs(journal);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now that journal recovery is done, turn fast commits off here. This</div><div class='ctx'> 	 * way, if fast commit was enabled before the crash but if now FS has</div><div class='hunk'>@@ -1823,7 +1820,7 @@ static int jbd2_write_superblock(journal_t *journal, blk_opf_t write_flags)</div><div class='ctx'> 		set_buffer_uptodate(bh);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='del'>-		sb-&gt;s_checksum = jbd2_superblock_csum(journal, sb);</div><div class='add'>+		sb-&gt;s_checksum = jbd2_superblock_csum(sb);</div><div class='ctx'> 	get_bh(bh);</div><div class='ctx'> 	bh-&gt;b_end_io = end_buffer_write_sync;</div><div class='ctx'> 	submit_bh(REQ_OP_WRITE | write_flags, bh);</div><div class='hunk'>@@ -1862,8 +1859,9 @@ int jbd2_journal_update_sb_log_tail(journal_t *journal, tid_t tail_tid,</div><div class='ctx'> </div><div class='ctx'> 	if (is_journal_aborted(journal))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (jbd2_check_fs_dev_write_error(journal)) {</div><div class='del'>-		jbd2_journal_abort(journal, -EIO);</div><div class='add'>+	ret = jbd2_check_fs_dev_write_error(journal);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jbd2_journal_abort(journal, ret);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1881,7 +1879,6 @@ int jbd2_journal_update_sb_log_tail(journal_t *journal, tid_t tail_tid,</div><div class='ctx'> </div><div class='ctx'> 	/* Log is no longer empty */</div><div class='ctx'> 	write_lock(&amp;journal-&gt;j_state_lock);</div><div class='del'>-	WARN_ON(!sb-&gt;s_sequence);</div><div class='ctx'> 	journal-&gt;j_flags &amp;= ~JBD2_FLUSHED;</div><div class='ctx'> 	write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1929,7 +1926,7 @@ static void jbd2_mark_journal_empty(journal_t *journal, blk_opf_t write_flags)</div><div class='ctx'> 	if (had_fast_commit)</div><div class='ctx'> 		jbd2_set_feature_fast_commit(journal);</div><div class='ctx'> </div><div class='del'>-	/* Log is no longer empty */</div><div class='add'>+	/* Log is empty */</div><div class='ctx'> 	write_lock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 	journal-&gt;j_flags |= JBD2_FLUSHED;</div><div class='ctx'> 	write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='hunk'>@@ -1977,17 +1974,15 @@ static int __jbd2_journal_erase(journal_t *journal, unsigned int flags)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (block_start == ~0ULL) {</div><div class='del'>-			block_start = phys_block;</div><div class='del'>-			block_stop = block_start - 1;</div><div class='del'>-		}</div><div class='add'>+		if (block_start == ~0ULL)</div><div class='add'>+			block_stop = block_start = phys_block;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * last block not contiguous with current block,</div><div class='ctx'> 		 * process last contiguous region and return to this block on</div><div class='ctx'> 		 * next loop</div><div class='ctx'> 		 */</div><div class='del'>-		if (phys_block != block_stop + 1) {</div><div class='add'>+		if (phys_block != block_stop) {</div><div class='ctx'> 			block--;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			block_stop++;</div><div class='hunk'>@@ -2006,11 +2001,10 @@ static int __jbd2_journal_erase(journal_t *journal, unsigned int flags)</div><div class='ctx'> 		 */</div><div class='ctx'> 		byte_start = block_start * journal-&gt;j_blocksize;</div><div class='ctx'> 		byte_stop = block_stop * journal-&gt;j_blocksize;</div><div class='del'>-		byte_count = (block_stop - block_start + 1) *</div><div class='del'>-				journal-&gt;j_blocksize;</div><div class='add'>+		byte_count = (block_stop - block_start) * journal-&gt;j_blocksize;</div><div class='ctx'> </div><div class='del'>-		truncate_inode_pages_range(journal-&gt;j_dev-&gt;bd_inode-&gt;i_mapping,</div><div class='del'>-				byte_start, byte_stop);</div><div class='add'>+		truncate_inode_pages_range(journal-&gt;j_dev-&gt;bd_mapping,</div><div class='add'>+				byte_start, byte_stop - 1);</div><div class='ctx'> </div><div class='ctx'> 		if (flags &amp; JBD2_JOURNAL_FLUSH_DISCARD) {</div><div class='ctx'> 			err = blkdev_issue_discard(journal-&gt;j_dev,</div><div class='hunk'>@@ -2025,7 +2019,7 @@ static int __jbd2_journal_erase(journal_t *journal, unsigned int flags)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(err != 0)) {</div><div class='del'>-			pr_err("JBD2: (error %d) unable to wipe journal at physical blocks %llu - %llu",</div><div class='add'>+			pr_err("JBD2: (error %d) unable to wipe journal at physical blocks [%llu, %llu)",</div><div class='ctx'> 					err, block_start, block_stop);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2164,9 +2158,11 @@ int jbd2_journal_destroy(journal_t *journal)</div><div class='ctx'> 	 * failed to write back to the original location, otherwise the</div><div class='ctx'> 	 * filesystem may become inconsistent.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_journal_aborted(journal) &amp;&amp;</div><div class='del'>-	    jbd2_check_fs_dev_write_error(journal))</div><div class='del'>-		jbd2_journal_abort(journal, -EIO);</div><div class='add'>+	if (!is_journal_aborted(journal)) {</div><div class='add'>+		int ret = jbd2_check_fs_dev_write_error(journal);</div><div class='add'>+		if (ret)</div><div class='add'>+			jbd2_journal_abort(journal, ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (journal-&gt;j_sb_buffer) {</div><div class='ctx'> 		if (!is_journal_aborted(journal)) {</div><div class='hunk'>@@ -2193,10 +2189,9 @@ int jbd2_journal_destroy(journal_t *journal)</div><div class='ctx'> 	iput(journal-&gt;j_inode);</div><div class='ctx'> 	if (journal-&gt;j_revoke)</div><div class='ctx'> 		jbd2_journal_destroy_revoke(journal);</div><div class='del'>-	if (journal-&gt;j_chksum_driver)</div><div class='del'>-		crypto_free_shash(journal-&gt;j_chksum_driver);</div><div class='ctx'> 	kfree(journal-&gt;j_fc_wbuf);</div><div class='ctx'> 	kfree(journal-&gt;j_wbuf);</div><div class='add'>+	lockdep_unregister_key(&amp;journal-&gt;jbd2_trans_commit_key);</div><div class='ctx'> 	kfree(journal);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2285,8 +2280,6 @@ jbd2_journal_initialize_fast_commit(journal_t *journal)</div><div class='ctx'> 	journal-&gt;j_fc_first = journal-&gt;j_last + 1;</div><div class='ctx'> 	journal-&gt;j_fc_off = 0;</div><div class='ctx'> 	journal-&gt;j_free = journal-&gt;j_last - journal-&gt;j_first;</div><div class='del'>-	journal-&gt;j_max_transaction_buffers =</div><div class='del'>-		jbd2_journal_get_max_txn_bufs(journal);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2341,27 +2334,15 @@ int jbd2_journal_set_features(journal_t *journal, unsigned long compat,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Load the checksum driver if necessary */</div><div class='del'>-	if ((journal-&gt;j_chksum_driver == NULL) &amp;&amp;</div><div class='del'>-	    INCOMPAT_FEATURE_ON(JBD2_FEATURE_INCOMPAT_CSUM_V3)) {</div><div class='del'>-		journal-&gt;j_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);</div><div class='del'>-		if (IS_ERR(journal-&gt;j_chksum_driver)) {</div><div class='del'>-			printk(KERN_ERR "JBD2: Cannot load crc32c driver.\n");</div><div class='del'>-			journal-&gt;j_chksum_driver = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		/* Precompute checksum seed for all metadata */</div><div class='del'>-		journal-&gt;j_csum_seed = jbd2_chksum(journal, ~0, sb-&gt;s_uuid,</div><div class='del'>-						   sizeof(sb-&gt;s_uuid));</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	lock_buffer(journal-&gt;j_sb_buffer);</div><div class='ctx'> </div><div class='del'>-	/* If enabling v3 checksums, update superblock */</div><div class='add'>+	/* If enabling v3 checksums, update superblock and precompute seed */</div><div class='ctx'> 	if (INCOMPAT_FEATURE_ON(JBD2_FEATURE_INCOMPAT_CSUM_V3)) {</div><div class='ctx'> 		sb-&gt;s_checksum_type = JBD2_CRC32C_CHKSUM;</div><div class='ctx'> 		sb-&gt;s_feature_compat &amp;=</div><div class='ctx'> 			~cpu_to_be32(JBD2_FEATURE_COMPAT_CHECKSUM);</div><div class='add'>+		journal-&gt;j_csum_seed = jbd2_chksum(~0, sb-&gt;s_uuid,</div><div class='add'>+						   sizeof(sb-&gt;s_uuid));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If enabling v1 checksums, downgrade superblock */</div><div class='hunk'>@@ -2373,9 +2354,14 @@ int jbd2_journal_set_features(journal_t *journal, unsigned long compat,</div><div class='ctx'> 	sb-&gt;s_feature_compat    |= cpu_to_be32(compat);</div><div class='ctx'> 	sb-&gt;s_feature_ro_compat |= cpu_to_be32(ro);</div><div class='ctx'> 	sb-&gt;s_feature_incompat  |= cpu_to_be32(incompat);</div><div class='add'>+	/*</div><div class='add'>+	 * Update the checksum now so that it is valid even for read-only</div><div class='add'>+	 * filesystems where jbd2_write_superblock() doesn't get called.</div><div class='add'>+	 */</div><div class='add'>+	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='add'>+		sb-&gt;s_checksum = jbd2_superblock_csum(sb);</div><div class='ctx'> 	unlock_buffer(journal-&gt;j_sb_buffer);</div><div class='del'>-	journal-&gt;j_revoke_records_per_block =</div><div class='del'>-				journal_revoke_records_per_block(journal);</div><div class='add'>+	jbd2_journal_init_transaction_limits(journal);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> #undef COMPAT_FEATURE_ON</div><div class='hunk'>@@ -2403,11 +2389,18 @@ void jbd2_journal_clear_features(journal_t *journal, unsigned long compat,</div><div class='ctx'> </div><div class='ctx'> 	sb = journal-&gt;j_superblock;</div><div class='ctx'> </div><div class='add'>+	lock_buffer(journal-&gt;j_sb_buffer);</div><div class='ctx'> 	sb-&gt;s_feature_compat    &amp;= ~cpu_to_be32(compat);</div><div class='ctx'> 	sb-&gt;s_feature_ro_compat &amp;= ~cpu_to_be32(ro);</div><div class='ctx'> 	sb-&gt;s_feature_incompat  &amp;= ~cpu_to_be32(incompat);</div><div class='del'>-	journal-&gt;j_revoke_records_per_block =</div><div class='del'>-				journal_revoke_records_per_block(journal);</div><div class='add'>+	/*</div><div class='add'>+	 * Update the checksum now so that it is valid even for read-only</div><div class='add'>+	 * filesystems where jbd2_write_superblock() doesn't get called.</div><div class='add'>+	 */</div><div class='add'>+	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='add'>+		sb-&gt;s_checksum = jbd2_superblock_csum(sb);</div><div class='add'>+	unlock_buffer(journal-&gt;j_sb_buffer);</div><div class='add'>+	jbd2_journal_init_transaction_limits(journal);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(jbd2_journal_clear_features);</div><div class='ctx'> </div><div class='hunk'>@@ -2681,9 +2674,10 @@ void jbd2_journal_ack_err(journal_t *journal)</div><div class='ctx'> 	write_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jbd2_journal_blocks_per_page(struct inode *inode)</div><div class='add'>+int jbd2_journal_blocks_per_folio(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return 1 &lt;&lt; (PAGE_SHIFT - inode-&gt;i_sb-&gt;s_blocksize_bits);</div><div class='add'>+	return 1 &lt;&lt; (PAGE_SHIFT + mapping_max_folio_order(inode-&gt;i_mapping) -</div><div class='add'>+		     inode-&gt;i_sb-&gt;s_blocksize_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2855,8 +2849,7 @@ static struct journal_head *journal_alloc_journal_head(void)</div><div class='ctx'> 		ret = kmem_cache_zalloc(jbd2_journal_head_cache,</div><div class='ctx'> 				GFP_NOFS | __GFP_NOFAIL);</div><div class='ctx'> 	}</div><div class='del'>-	if (ret)</div><div class='del'>-		spin_lock_init(&amp;ret-&gt;b_state_lock);</div><div class='add'>+	spin_lock_init(&amp;ret-&gt;b_state_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3181,6 +3174,7 @@ static void __exit journal_exit(void)</div><div class='ctx'> 	jbd2_journal_destroy_caches();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Generic filesystem journal-writing module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> module_init(journal_init);</div><div class='ctx'> module_exit(journal_exit);</div><div class='head'>diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c<br/>index 1f7664984d6e..cac8c2cd4a92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/recovery.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/recovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/recovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/recovery.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -38,7 +39,7 @@ struct recovery_info</div><div class='ctx'> </div><div class='ctx'> static int do_one_pass(journal_t *journal,</div><div class='ctx'> 				struct recovery_info *info, enum passtype pass);</div><div class='del'>-static int scan_revoke_records(journal_t *, struct buffer_head *,</div><div class='add'>+static int scan_revoke_records(journal_t *, enum passtype, struct buffer_head *,</div><div class='ctx'> 				tid_t, struct recovery_info *);</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='hunk'>@@ -64,9 +65,8 @@ static void journal_brelse_array(struct buffer_head *b[], int n)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define MAXBUF 8</div><div class='del'>-static int do_readahead(journal_t *journal, unsigned int start)</div><div class='add'>+static void do_readahead(journal_t *journal, unsigned int start)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	unsigned int max, nbufs, next;</div><div class='ctx'> 	unsigned long long blocknr;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='hunk'>@@ -84,7 +84,7 @@ static int do_readahead(journal_t *journal, unsigned int start)</div><div class='ctx'> 	nbufs = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (next = start; next &lt; max; next++) {</div><div class='del'>-		err = jbd2_journal_bmap(journal, next, &amp;blocknr);</div><div class='add'>+		int err = jbd2_journal_bmap(journal, next, &amp;blocknr);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(KERN_ERR "JBD2: bad block at offset %u\n",</div><div class='hunk'>@@ -93,10 +93,8 @@ static int do_readahead(journal_t *journal, unsigned int start)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bh = __getblk(journal-&gt;j_dev, blocknr, journal-&gt;j_blocksize);</div><div class='del'>-		if (!bh) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		if (!bh)</div><div class='ctx'> 			goto failed;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if (!buffer_uptodate(bh) &amp;&amp; !buffer_locked(bh)) {</div><div class='ctx'> 			bufs[nbufs++] = bh;</div><div class='hunk'>@@ -111,12 +109,10 @@ static int do_readahead(journal_t *journal, unsigned int start)</div><div class='ctx'> </div><div class='ctx'> 	if (nbufs)</div><div class='ctx'> 		bh_readahead_batch(nbufs, bufs, 0);</div><div class='del'>-	err = 0;</div><div class='ctx'> </div><div class='ctx'> failed:</div><div class='ctx'> 	if (nbufs)</div><div class='ctx'> 		journal_brelse_array(bufs, nbufs);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='hunk'>@@ -189,7 +185,7 @@ static int jbd2_descriptor_block_csum_verify(journal_t *j, void *buf)</div><div class='ctx'> 		j-&gt;j_blocksize - sizeof(struct jbd2_journal_block_tail));</div><div class='ctx'> 	provided = tail-&gt;t_checksum;</div><div class='ctx'> 	tail-&gt;t_checksum = 0;</div><div class='del'>-	calculated = jbd2_chksum(j, j-&gt;j_csum_seed, buf, j-&gt;j_blocksize);</div><div class='add'>+	calculated = jbd2_chksum(j-&gt;j_csum_seed, buf, j-&gt;j_blocksize);</div><div class='ctx'> 	tail-&gt;t_checksum = provided;</div><div class='ctx'> </div><div class='ctx'> 	return provided == cpu_to_be32(calculated);</div><div class='hunk'>@@ -286,19 +282,20 @@ static int fc_do_one_pass(journal_t *journal,</div><div class='ctx'> int jbd2_journal_recover(journal_t *journal)</div><div class='ctx'> {</div><div class='ctx'> 	int			err, err2;</div><div class='del'>-	journal_superblock_t *	sb;</div><div class='del'>-</div><div class='ctx'> 	struct recovery_info	info;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	sb = journal-&gt;j_superblock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The journal superblock's s_start field (the current log head)</div><div class='ctx'> 	 * is always zero if, and only if, the journal was cleanly</div><div class='del'>-	 * unmounted.</div><div class='add'>+	 * unmounted. We use its in-memory version j_tail here because</div><div class='add'>+	 * jbd2_journal_wipe() could have updated it without updating journal</div><div class='add'>+	 * superblock.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!sb-&gt;s_start) {</div><div class='add'>+	if (!journal-&gt;j_tail) {</div><div class='add'>+		journal_superblock_t *sb = journal-&gt;j_superblock;</div><div class='add'>+</div><div class='ctx'> 		jbd2_debug(1, "No recovery required, last transaction %d, head block %u\n",</div><div class='ctx'> 			  be32_to_cpu(sb-&gt;s_sequence), be32_to_cpu(sb-&gt;s_head));</div><div class='ctx'> 		journal-&gt;j_transaction_sequence = be32_to_cpu(sb-&gt;s_sequence) + 1;</div><div class='hunk'>@@ -326,6 +323,12 @@ int jbd2_journal_recover(journal_t *journal)</div><div class='ctx'> 		  journal-&gt;j_transaction_sequence, journal-&gt;j_head);</div><div class='ctx'> </div><div class='ctx'> 	jbd2_journal_clear_revoke(journal);</div><div class='add'>+	/* Free revoke table allocated for replay */</div><div class='add'>+	if (journal-&gt;j_revoke != journal-&gt;j_revoke_table[0] &amp;&amp;</div><div class='add'>+	    journal-&gt;j_revoke != journal-&gt;j_revoke_table[1]) {</div><div class='add'>+		jbd2_journal_destroy_revoke_table(journal-&gt;j_revoke);</div><div class='add'>+		journal-&gt;j_revoke = journal-&gt;j_revoke_table[1];</div><div class='add'>+	}</div><div class='ctx'> 	err2 = sync_blockdev(journal-&gt;j_fs_dev);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = err2;</div><div class='hunk'>@@ -374,7 +377,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)</div><div class='ctx'> 			be32_to_cpu(journal-&gt;j_superblock-&gt;s_sequence);</div><div class='ctx'> 		jbd2_debug(1,</div><div class='ctx'> 			  "JBD2: ignoring %d transaction%s from the journal.\n",</div><div class='del'>-			  dropped, (dropped == 1) ? "" : "s");</div><div class='add'>+			  dropped, str_plural(dropped));</div><div class='ctx'> #endif</div><div class='ctx'> 		journal-&gt;j_transaction_sequence = ++info.end_transaction;</div><div class='ctx'> 		journal-&gt;j_head = info.head_block;</div><div class='hunk'>@@ -437,12 +440,33 @@ static int jbd2_commit_block_csum_verify(journal_t *j, void *buf)</div><div class='ctx'> 	h = buf;</div><div class='ctx'> 	provided = h-&gt;h_chksum[0];</div><div class='ctx'> 	h-&gt;h_chksum[0] = 0;</div><div class='del'>-	calculated = jbd2_chksum(j, j-&gt;j_csum_seed, buf, j-&gt;j_blocksize);</div><div class='add'>+	calculated = jbd2_chksum(j-&gt;j_csum_seed, buf, j-&gt;j_blocksize);</div><div class='ctx'> 	h-&gt;h_chksum[0] = provided;</div><div class='ctx'> </div><div class='ctx'> 	return provided == cpu_to_be32(calculated);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool jbd2_commit_block_csum_verify_partial(journal_t *j, void *buf)</div><div class='add'>+{</div><div class='add'>+	struct commit_header *h;</div><div class='add'>+	__be32 provided;</div><div class='add'>+	__u32 calculated;</div><div class='add'>+	void *tmpbuf;</div><div class='add'>+</div><div class='add'>+	tmpbuf = kzalloc(j-&gt;j_blocksize, GFP_KERNEL);</div><div class='add'>+	if (!tmpbuf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memcpy(tmpbuf, buf, sizeof(struct commit_header));</div><div class='add'>+	h = tmpbuf;</div><div class='add'>+	provided = h-&gt;h_chksum[0];</div><div class='add'>+	h-&gt;h_chksum[0] = 0;</div><div class='add'>+	calculated = jbd2_chksum(j-&gt;j_csum_seed, tmpbuf, j-&gt;j_blocksize);</div><div class='add'>+	kfree(tmpbuf);</div><div class='add'>+</div><div class='add'>+	return provided == cpu_to_be32(calculated);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int jbd2_block_tag_csum_verify(journal_t *j, journal_block_tag_t *tag,</div><div class='ctx'> 				      journal_block_tag3_t *tag3,</div><div class='ctx'> 				      void *buf, __u32 sequence)</div><div class='hunk'>@@ -454,8 +478,8 @@ static int jbd2_block_tag_csum_verify(journal_t *j, journal_block_tag_t *tag,</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	seq = cpu_to_be32(sequence);</div><div class='del'>-	csum32 = jbd2_chksum(j, j-&gt;j_csum_seed, (__u8 *)&amp;seq, sizeof(seq));</div><div class='del'>-	csum32 = jbd2_chksum(j, csum32, buf, j-&gt;j_blocksize);</div><div class='add'>+	csum32 = jbd2_chksum(j-&gt;j_csum_seed, (__u8 *)&amp;seq, sizeof(seq));</div><div class='add'>+	csum32 = jbd2_chksum(csum32, buf, j-&gt;j_blocksize);</div><div class='ctx'> </div><div class='ctx'> 	if (jbd2_has_feature_csum3(j))</div><div class='ctx'> 		return tag3-&gt;t_checksum == cpu_to_be32(csum32);</div><div class='hunk'>@@ -463,6 +487,104 @@ static int jbd2_block_tag_csum_verify(journal_t *j, journal_block_tag_t *tag,</div><div class='ctx'> 		return tag-&gt;t_checksum == cpu_to_be16(csum32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline int jbd2_do_replay(journal_t *journal,</div><div class='add'>+					  struct recovery_info *info,</div><div class='add'>+					  struct buffer_head *bh,</div><div class='add'>+					  unsigned long *next_log_block,</div><div class='add'>+					  unsigned int next_commit_ID)</div><div class='add'>+{</div><div class='add'>+	char *tagp;</div><div class='add'>+	int flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int tag_bytes = journal_tag_bytes(journal);</div><div class='add'>+	int descr_csum_size = 0;</div><div class='add'>+	unsigned long io_block;</div><div class='add'>+	journal_block_tag_t tag;</div><div class='add'>+	struct buffer_head *obh;</div><div class='add'>+	struct buffer_head *nbh;</div><div class='add'>+</div><div class='add'>+	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='add'>+		descr_csum_size = sizeof(struct jbd2_journal_block_tail);</div><div class='add'>+</div><div class='add'>+	tagp = &amp;bh-&gt;b_data[sizeof(journal_header_t)];</div><div class='add'>+	while (tagp - bh-&gt;b_data + tag_bytes &lt;=</div><div class='add'>+	       journal-&gt;j_blocksize - descr_csum_size) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;tag, tagp, sizeof(tag));</div><div class='add'>+		flags = be16_to_cpu(tag.t_flags);</div><div class='add'>+</div><div class='add'>+		io_block = (*next_log_block)++;</div><div class='add'>+		wrap(journal, *next_log_block);</div><div class='add'>+		err = jread(&amp;obh, journal, io_block);</div><div class='add'>+		if (err) {</div><div class='add'>+			/* Recover what we can, but report failure at the end. */</div><div class='add'>+			ret = err;</div><div class='add'>+			pr_err("JBD2: IO error %d recovering block %lu in log\n",</div><div class='add'>+			      err, io_block);</div><div class='add'>+		} else {</div><div class='add'>+			unsigned long long blocknr;</div><div class='add'>+</div><div class='add'>+			J_ASSERT(obh != NULL);</div><div class='add'>+			blocknr = read_tag_block(journal, &amp;tag);</div><div class='add'>+</div><div class='add'>+			/* If the block has been revoked, then we're all done here. */</div><div class='add'>+			if (jbd2_journal_test_revoke(journal, blocknr,</div><div class='add'>+						     next_commit_ID)) {</div><div class='add'>+				brelse(obh);</div><div class='add'>+				++info-&gt;nr_revoke_hits;</div><div class='add'>+				goto skip_write;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Look for block corruption */</div><div class='add'>+			if (!jbd2_block_tag_csum_verify(journal, &amp;tag,</div><div class='add'>+					(journal_block_tag3_t *)tagp,</div><div class='add'>+					obh-&gt;b_data, next_commit_ID)) {</div><div class='add'>+				brelse(obh);</div><div class='add'>+				ret = -EFSBADCRC;</div><div class='add'>+				pr_err("JBD2: Invalid checksum recovering data block %llu in journal block %lu\n",</div><div class='add'>+				      blocknr, io_block);</div><div class='add'>+				goto skip_write;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Find a buffer for the new data being restored */</div><div class='add'>+			nbh = __getblk(journal-&gt;j_fs_dev, blocknr,</div><div class='add'>+				       journal-&gt;j_blocksize);</div><div class='add'>+			if (nbh == NULL) {</div><div class='add'>+				pr_err("JBD2: Out of memory during recovery.\n");</div><div class='add'>+				brelse(obh);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			lock_buffer(nbh);</div><div class='add'>+			memcpy(nbh-&gt;b_data, obh-&gt;b_data, journal-&gt;j_blocksize);</div><div class='add'>+			if (flags &amp; JBD2_FLAG_ESCAPE) {</div><div class='add'>+				*((__be32 *)nbh-&gt;b_data) =</div><div class='add'>+				cpu_to_be32(JBD2_MAGIC_NUMBER);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			BUFFER_TRACE(nbh, "marking dirty");</div><div class='add'>+			set_buffer_uptodate(nbh);</div><div class='add'>+			mark_buffer_dirty(nbh);</div><div class='add'>+			BUFFER_TRACE(nbh, "marking uptodate");</div><div class='add'>+			++info-&gt;nr_replays;</div><div class='add'>+			unlock_buffer(nbh);</div><div class='add'>+			brelse(obh);</div><div class='add'>+			brelse(nbh);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+skip_write:</div><div class='add'>+		tagp += tag_bytes;</div><div class='add'>+		if (!(flags &amp; JBD2_FLAG_SAME_UUID))</div><div class='add'>+			tagp += 16;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; JBD2_FLAG_LAST_TAG)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int do_one_pass(journal_t *journal,</div><div class='ctx'> 			struct recovery_info *info, enum passtype pass)</div><div class='ctx'> {</div><div class='hunk'>@@ -471,13 +593,10 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 	int			err, success = 0;</div><div class='ctx'> 	journal_superblock_t *	sb;</div><div class='ctx'> 	journal_header_t *	tmp;</div><div class='del'>-	struct buffer_head *	bh;</div><div class='add'>+	struct buffer_head	*bh = NULL;</div><div class='ctx'> 	unsigned int		sequence;</div><div class='ctx'> 	int			blocktype;</div><div class='del'>-	int			tag_bytes = journal_tag_bytes(journal);</div><div class='ctx'> 	__u32			crc32_sum = ~0; /* Transactional Checksums */</div><div class='del'>-	int			descr_csum_size = 0;</div><div class='del'>-	int			block_error = 0;</div><div class='ctx'> 	bool			need_check_commit_time = false;</div><div class='ctx'> 	__u64			last_trans_commit_time = 0, commit_time;</div><div class='ctx'> </div><div class='hunk'>@@ -495,6 +614,31 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 	first_commit_ID = next_commit_ID;</div><div class='ctx'> 	if (pass == PASS_SCAN)</div><div class='ctx'> 		info-&gt;start_transaction = first_commit_ID;</div><div class='add'>+	else if (pass == PASS_REVOKE) {</div><div class='add'>+		/*</div><div class='add'>+		 * Would the default revoke table have too long hash chains</div><div class='add'>+		 * during replay?</div><div class='add'>+		 */</div><div class='add'>+		if (info-&gt;nr_revokes &gt; JOURNAL_REVOKE_DEFAULT_HASH * 16) {</div><div class='add'>+			unsigned int hash_size;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Aim for average chain length of 8, limit at 1M</div><div class='add'>+			 * entries to avoid problems with malicious</div><div class='add'>+			 * filesystems.</div><div class='add'>+			 */</div><div class='add'>+			hash_size = min(roundup_pow_of_two(info-&gt;nr_revokes / 8),</div><div class='add'>+					1U &lt;&lt; 20);</div><div class='add'>+			journal-&gt;j_revoke =</div><div class='add'>+				jbd2_journal_init_revoke_table(hash_size);</div><div class='add'>+			if (!journal-&gt;j_revoke) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "JBD2: failed to allocate revoke table for replay with %u entries. "</div><div class='add'>+				       "Journal replay may be slow.\n", hash_size);</div><div class='add'>+				journal-&gt;j_revoke = journal-&gt;j_revoke_table[1];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	jbd2_debug(1, "Starting recovery pass %d\n", pass);</div><div class='ctx'> </div><div class='hunk'>@@ -506,12 +650,6 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		int			flags;</div><div class='del'>-		char *			tagp;</div><div class='del'>-		journal_block_tag_t	tag;</div><div class='del'>-		struct buffer_head *	obh;</div><div class='del'>-		struct buffer_head *	nbh;</div><div class='del'>-</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> </div><div class='ctx'> 		/* If we already know where to stop the log traversal,</div><div class='hunk'>@@ -530,6 +668,8 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 		 * record. */</div><div class='ctx'> </div><div class='ctx'> 		jbd2_debug(3, "JBD2: checking block %ld\n", next_log_block);</div><div class='add'>+		brelse(bh);</div><div class='add'>+		bh = NULL;</div><div class='ctx'> 		err = jread(&amp;bh, journal, next_log_block);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto failed;</div><div class='hunk'>@@ -545,20 +685,16 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> </div><div class='ctx'> 		tmp = (journal_header_t *)bh-&gt;b_data;</div><div class='ctx'> </div><div class='del'>-		if (tmp-&gt;h_magic != cpu_to_be32(JBD2_MAGIC_NUMBER)) {</div><div class='del'>-			brelse(bh);</div><div class='add'>+		if (tmp-&gt;h_magic != cpu_to_be32(JBD2_MAGIC_NUMBER))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		blocktype = be32_to_cpu(tmp-&gt;h_blocktype);</div><div class='ctx'> 		sequence = be32_to_cpu(tmp-&gt;h_sequence);</div><div class='ctx'> 		jbd2_debug(3, "Found magic %d, sequence %d\n",</div><div class='ctx'> 			  blocktype, sequence);</div><div class='ctx'> </div><div class='del'>-		if (sequence != next_commit_ID) {</div><div class='del'>-			brelse(bh);</div><div class='add'>+		if (sequence != next_commit_ID)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* OK, we have a valid descriptor block which matches</div><div class='ctx'> 		 * all of the sequence number checks.  What are we going</div><div class='hunk'>@@ -567,11 +703,7 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 		switch(blocktype) {</div><div class='ctx'> 		case JBD2_DESCRIPTOR_BLOCK:</div><div class='ctx'> 			/* Verify checksum first */</div><div class='del'>-			if (jbd2_journal_has_csum_v2or3(journal))</div><div class='del'>-				descr_csum_size =</div><div class='del'>-					sizeof(struct jbd2_journal_block_tail);</div><div class='del'>-			if (descr_csum_size &gt; 0 &amp;&amp;</div><div class='del'>-			    !jbd2_descriptor_block_csum_verify(journal,</div><div class='add'>+			if (!jbd2_descriptor_block_csum_verify(journal,</div><div class='ctx'> 							       bh-&gt;b_data)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * PASS_SCAN can see stale blocks due to lazy</div><div class='hunk'>@@ -581,7 +713,6 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 					pr_err("JBD2: Invalid checksum recovering block %lu in log\n",</div><div class='ctx'> 					       next_log_block);</div><div class='ctx'> 					err = -EFSBADCRC;</div><div class='del'>-					brelse(bh);</div><div class='ctx'> 					goto failed;</div><div class='ctx'> 				}</div><div class='ctx'> 				need_check_commit_time = true;</div><div class='hunk'>@@ -597,125 +728,39 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 			if (pass != PASS_REPLAY) {</div><div class='ctx'> 				if (pass == PASS_SCAN &amp;&amp;</div><div class='ctx'> 				    jbd2_has_feature_checksum(journal) &amp;&amp;</div><div class='del'>-				    !need_check_commit_time &amp;&amp;</div><div class='ctx'> 				    !info-&gt;end_transaction) {</div><div class='ctx'> 					if (calc_chksums(journal, bh,</div><div class='ctx'> 							&amp;next_log_block,</div><div class='del'>-							&amp;crc32_sum)) {</div><div class='del'>-						put_bh(bh);</div><div class='add'>+							&amp;crc32_sum))</div><div class='ctx'> 						break;</div><div class='del'>-					}</div><div class='del'>-					put_bh(bh);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				next_log_block += count_tags(journal, bh);</div><div class='ctx'> 				wrap(journal, next_log_block);</div><div class='del'>-				put_bh(bh);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* A descriptor block: we can now write all of</div><div class='del'>-			 * the data blocks.  Yay, useful work is finally</div><div class='del'>-			 * getting done here! */</div><div class='del'>-</div><div class='del'>-			tagp = &amp;bh-&gt;b_data[sizeof(journal_header_t)];</div><div class='del'>-			while ((tagp - bh-&gt;b_data + tag_bytes)</div><div class='del'>-			       &lt;= journal-&gt;j_blocksize - descr_csum_size) {</div><div class='del'>-				unsigned long io_block;</div><div class='del'>-</div><div class='del'>-				memcpy(&amp;tag, tagp, sizeof(tag));</div><div class='del'>-				flags = be16_to_cpu(tag.t_flags);</div><div class='del'>-</div><div class='del'>-				io_block = next_log_block++;</div><div class='del'>-				wrap(journal, next_log_block);</div><div class='del'>-				err = jread(&amp;obh, journal, io_block);</div><div class='del'>-				if (err) {</div><div class='del'>-					/* Recover what we can, but</div><div class='del'>-					 * report failure at the end. */</div><div class='del'>-					success = err;</div><div class='del'>-					printk(KERN_ERR</div><div class='del'>-						"JBD2: IO error %d recovering "</div><div class='del'>-						"block %lu in log\n",</div><div class='del'>-						err, io_block);</div><div class='del'>-				} else {</div><div class='del'>-					unsigned long long blocknr;</div><div class='del'>-</div><div class='del'>-					J_ASSERT(obh != NULL);</div><div class='del'>-					blocknr = read_tag_block(journal,</div><div class='del'>-								 &amp;tag);</div><div class='del'>-</div><div class='del'>-					/* If the block has been</div><div class='del'>-					 * revoked, then we're all done</div><div class='del'>-					 * here. */</div><div class='del'>-					if (jbd2_journal_test_revoke</div><div class='del'>-					    (journal, blocknr,</div><div class='del'>-					     next_commit_ID)) {</div><div class='del'>-						brelse(obh);</div><div class='del'>-						++info-&gt;nr_revoke_hits;</div><div class='del'>-						goto skip_write;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					/* Look for block corruption */</div><div class='del'>-					if (!jbd2_block_tag_csum_verify(</div><div class='del'>-			journal, &amp;tag, (journal_block_tag3_t *)tagp,</div><div class='del'>-			obh-&gt;b_data, be32_to_cpu(tmp-&gt;h_sequence))) {</div><div class='del'>-						brelse(obh);</div><div class='del'>-						success = -EFSBADCRC;</div><div class='del'>-						printk(KERN_ERR "JBD2: Invalid "</div><div class='del'>-						       "checksum recovering "</div><div class='del'>-						       "data block %llu in "</div><div class='del'>-						       "journal block %lu\n",</div><div class='del'>-						       blocknr, io_block);</div><div class='del'>-						block_error = 1;</div><div class='del'>-						goto skip_write;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					/* Find a buffer for the new</div><div class='del'>-					 * data being restored */</div><div class='del'>-					nbh = __getblk(journal-&gt;j_fs_dev,</div><div class='del'>-							blocknr,</div><div class='del'>-							journal-&gt;j_blocksize);</div><div class='del'>-					if (nbh == NULL) {</div><div class='del'>-						printk(KERN_ERR</div><div class='del'>-						       "JBD2: Out of memory "</div><div class='del'>-						       "during recovery.\n");</div><div class='del'>-						err = -ENOMEM;</div><div class='del'>-						brelse(bh);</div><div class='del'>-						brelse(obh);</div><div class='del'>-						goto failed;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					lock_buffer(nbh);</div><div class='del'>-					memcpy(nbh-&gt;b_data, obh-&gt;b_data,</div><div class='del'>-							journal-&gt;j_blocksize);</div><div class='del'>-					if (flags &amp; JBD2_FLAG_ESCAPE) {</div><div class='del'>-						*((__be32 *)nbh-&gt;b_data) =</div><div class='del'>-						cpu_to_be32(JBD2_MAGIC_NUMBER);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					BUFFER_TRACE(nbh, "marking dirty");</div><div class='del'>-					set_buffer_uptodate(nbh);</div><div class='del'>-					mark_buffer_dirty(nbh);</div><div class='del'>-					BUFFER_TRACE(nbh, "marking uptodate");</div><div class='del'>-					++info-&gt;nr_replays;</div><div class='del'>-					unlock_buffer(nbh);</div><div class='del'>-					brelse(obh);</div><div class='del'>-					brelse(nbh);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-			skip_write:</div><div class='del'>-				tagp += tag_bytes;</div><div class='del'>-				if (!(flags &amp; JBD2_FLAG_SAME_UUID))</div><div class='del'>-					tagp += 16;</div><div class='del'>-</div><div class='del'>-				if (flags &amp; JBD2_FLAG_LAST_TAG)</div><div class='del'>-					break;</div><div class='add'>+			/*</div><div class='add'>+			 * A descriptor block: we can now write all of the</div><div class='add'>+			 * data blocks. Yay, useful work is finally getting</div><div class='add'>+			 * done here!</div><div class='add'>+			 */</div><div class='add'>+			err = jbd2_do_replay(journal, info, bh, &amp;next_log_block,</div><div class='add'>+					     next_commit_ID);</div><div class='add'>+			if (err) {</div><div class='add'>+				if (err == -ENOMEM)</div><div class='add'>+					goto failed;</div><div class='add'>+				success = err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			brelse(bh);</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		case JBD2_COMMIT_BLOCK:</div><div class='add'>+			if (pass != PASS_SCAN) {</div><div class='add'>+				next_commit_ID++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/*     How to differentiate between interrupted commit</div><div class='ctx'> 			 *               and journal corruption ?</div><div class='ctx'> 			 *</div><div class='hunk'>@@ -760,7 +805,6 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 					pr_err("JBD2: Invalid checksum found in transaction %u\n",</div><div class='ctx'> 					       next_commit_ID);</div><div class='ctx'> 					err = -EFSBADCRC;</div><div class='del'>-					brelse(bh);</div><div class='ctx'> 					goto failed;</div><div class='ctx'> 				}</div><div class='ctx'> 			ignore_crc_mismatch:</div><div class='hunk'>@@ -770,7 +814,6 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 				 */</div><div class='ctx'> 				jbd2_debug(1, "JBD2: Invalid checksum ignored in transaction %u, likely stale data\n",</div><div class='ctx'> 					  next_commit_ID);</div><div class='del'>-				brelse(bh);</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -780,8 +823,7 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 			 * much to do other than move on to the next sequence</div><div class='ctx'> 			 * number.</div><div class='ctx'> 			 */</div><div class='del'>-			if (pass == PASS_SCAN &amp;&amp;</div><div class='del'>-			    jbd2_has_feature_checksum(journal)) {</div><div class='add'>+			if (jbd2_has_feature_checksum(journal)) {</div><div class='ctx'> 				struct commit_header *cbh =</div><div class='ctx'> 					(struct commit_header *)bh-&gt;b_data;</div><div class='ctx'> 				unsigned found_chksum =</div><div class='hunk'>@@ -790,7 +832,6 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 				if (info-&gt;end_transaction) {</div><div class='ctx'> 					journal-&gt;j_failed_commit =</div><div class='ctx'> 						info-&gt;end_transaction;</div><div class='del'>-					brelse(bh);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -806,33 +847,45 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 					goto chksum_error;</div><div class='ctx'> </div><div class='ctx'> 				crc32_sum = ~0;</div><div class='add'>+				goto chksum_ok;</div><div class='ctx'> 			}</div><div class='del'>-			if (pass == PASS_SCAN &amp;&amp;</div><div class='del'>-			    !jbd2_commit_block_csum_verify(journal,</div><div class='del'>-							   bh-&gt;b_data)) {</div><div class='del'>-			chksum_error:</div><div class='del'>-				if (commit_time &lt; last_trans_commit_time)</div><div class='del'>-					goto ignore_crc_mismatch;</div><div class='del'>-				info-&gt;end_transaction = next_commit_ID;</div><div class='del'>-				info-&gt;head_block = head_block;</div><div class='del'>-</div><div class='del'>-				if (!jbd2_has_feature_async_commit(journal)) {</div><div class='del'>-					journal-&gt;j_failed_commit =</div><div class='del'>-						next_commit_ID;</div><div class='del'>-					brelse(bh);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+</div><div class='add'>+			if (jbd2_commit_block_csum_verify(journal, bh-&gt;b_data))</div><div class='add'>+				goto chksum_ok;</div><div class='add'>+</div><div class='add'>+			if (jbd2_commit_block_csum_verify_partial(journal,</div><div class='add'>+								  bh-&gt;b_data)) {</div><div class='add'>+				pr_notice("JBD2: Find incomplete commit block in transaction %u block %lu\n",</div><div class='add'>+					  next_commit_ID, next_log_block);</div><div class='add'>+				goto chksum_ok;</div><div class='ctx'> 			}</div><div class='del'>-			if (pass == PASS_SCAN) {</div><div class='del'>-				last_trans_commit_time = commit_time;</div><div class='del'>-				head_block = next_log_block;</div><div class='add'>+</div><div class='add'>+chksum_error:</div><div class='add'>+			if (commit_time &lt; last_trans_commit_time)</div><div class='add'>+				goto ignore_crc_mismatch;</div><div class='add'>+			info-&gt;end_transaction = next_commit_ID;</div><div class='add'>+			info-&gt;head_block = head_block;</div><div class='add'>+</div><div class='add'>+			if (!jbd2_has_feature_async_commit(journal)) {</div><div class='add'>+				journal-&gt;j_failed_commit = next_commit_ID;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-			brelse(bh);</div><div class='add'>+</div><div class='add'>+chksum_ok:</div><div class='add'>+			last_trans_commit_time = commit_time;</div><div class='add'>+			head_block = next_log_block;</div><div class='ctx'> 			next_commit_ID++;</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		case JBD2_REVOKE_BLOCK:</div><div class='ctx'> 			/*</div><div class='add'>+			 * If we aren't in the SCAN or REVOKE pass, then we can</div><div class='add'>+			 * just skip over this block.</div><div class='add'>+			 */</div><div class='add'>+			if (pass != PASS_REVOKE &amp;&amp; pass != PASS_SCAN)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='ctx'> 			 * Check revoke block crc in pass_scan, if csum verify</div><div class='ctx'> 			 * failed, check commit block time later.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -843,16 +896,9 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 					  next_log_block);</div><div class='ctx'> 				need_check_commit_time = true;</div><div class='ctx'> 			}</div><div class='del'>-			/* If we aren't in the REVOKE pass, then we can</div><div class='del'>-			 * just skip over this block. */</div><div class='del'>-			if (pass != PASS_REVOKE) {</div><div class='del'>-				brelse(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			err = scan_revoke_records(journal, bh,</div><div class='add'>+			err = scan_revoke_records(journal, pass, bh,</div><div class='ctx'> 						  next_commit_ID, info);</div><div class='del'>-			brelse(bh);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto failed;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -860,12 +906,12 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 		default:</div><div class='ctx'> 			jbd2_debug(3, "Unrecognised magic %d, end of scan.\n",</div><div class='ctx'> 				  blocktype);</div><div class='del'>-			brelse(bh);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  done:</div><div class='add'>+	brelse(bh);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We broke out of the log scan loop: either we came to the</div><div class='ctx'> 	 * known end of the log or we found an unexpected block in the</div><div class='hunk'>@@ -896,18 +942,18 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 			success = err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (block_error &amp;&amp; success == 0)</div><div class='del'>-		success = -EIO;</div><div class='ctx'> 	return success;</div><div class='ctx'> </div><div class='ctx'>  failed:</div><div class='add'>+	brelse(bh);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Scan a revoke record, marking all blocks mentioned as revoked. */</div><div class='ctx'> </div><div class='del'>-static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,</div><div class='del'>-			       tid_t sequence, struct recovery_info *info)</div><div class='add'>+static int scan_revoke_records(journal_t *journal, enum passtype pass,</div><div class='add'>+			       struct buffer_head *bh, tid_t sequence,</div><div class='add'>+			       struct recovery_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	jbd2_journal_revoke_header_t *header;</div><div class='ctx'> 	int offset, max;</div><div class='hunk'>@@ -928,6 +974,11 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,</div><div class='ctx'> 	if (jbd2_has_feature_64bit(journal))</div><div class='ctx'> 		record_len = 8;</div><div class='ctx'> </div><div class='add'>+	if (pass == PASS_SCAN) {</div><div class='add'>+		info-&gt;nr_revokes += (max - offset) / record_len;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	while (offset + record_len &lt;= max) {</div><div class='ctx'> 		unsigned long long blocknr;</div><div class='ctx'> 		int err;</div><div class='hunk'>@@ -940,7 +991,6 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh,</div><div class='ctx'> 		err = jbd2_journal_set_revoke(journal, blocknr, sequence);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		++info-&gt;nr_revokes;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c<br/>index 4556e4689024..1467f6790747 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/revoke.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/revoke.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/revoke.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/revoke.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ int __init jbd2_journal_init_revoke_table_cache(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size)</div><div class='add'>+struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size)</div><div class='ctx'> {</div><div class='ctx'> 	int shift = 0;</div><div class='ctx'> 	int tmp = hash_size;</div><div class='hunk'>@@ -231,7 +231,7 @@ static struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size)</div><div class='ctx'> 	table-&gt;hash_size = hash_size;</div><div class='ctx'> 	table-&gt;hash_shift = shift;</div><div class='ctx'> 	table-&gt;hash_table =</div><div class='del'>-		kmalloc_array(hash_size, sizeof(struct list_head), GFP_KERNEL);</div><div class='add'>+		kvmalloc_array(hash_size, sizeof(struct list_head), GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;hash_table) {</div><div class='ctx'> 		kmem_cache_free(jbd2_revoke_table_cache, table);</div><div class='ctx'> 		table = NULL;</div><div class='hunk'>@@ -245,7 +245,7 @@ out:</div><div class='ctx'> 	return table;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void jbd2_journal_destroy_revoke_table(struct jbd2_revoke_table_s *table)</div><div class='add'>+void jbd2_journal_destroy_revoke_table(struct jbd2_revoke_table_s *table)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct list_head *hash_list;</div><div class='hunk'>@@ -255,7 +255,7 @@ static void jbd2_journal_destroy_revoke_table(struct jbd2_revoke_table_s *table)</div><div class='ctx'> 		J_ASSERT(list_empty(hash_list));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(table-&gt;hash_table);</div><div class='add'>+	kvfree(table-&gt;hash_table);</div><div class='ctx'> 	kmem_cache_free(jbd2_revoke_table_cache, table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,7 +345,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,</div><div class='ctx'> 	bh = bh_in;</div><div class='ctx'> </div><div class='ctx'> 	if (!bh) {</div><div class='del'>-		bh = __find_get_block(bdev, blocknr, journal-&gt;j_blocksize);</div><div class='add'>+		bh = __find_get_block_nonatomic(bdev, blocknr,</div><div class='add'>+						journal-&gt;j_blocksize);</div><div class='ctx'> 		if (bh)</div><div class='ctx'> 			BUFFER_TRACE(bh, "found on hash");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -355,7 +356,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,</div><div class='ctx'> </div><div class='ctx'> 		/* If there is a different buffer_head lying around in</div><div class='ctx'> 		 * memory anywhere... */</div><div class='del'>-		bh2 = __find_get_block(bdev, blocknr, journal-&gt;j_blocksize);</div><div class='add'>+		bh2 = __find_get_block_nonatomic(bdev, blocknr,</div><div class='add'>+						 journal-&gt;j_blocksize);</div><div class='ctx'> 		if (bh2) {</div><div class='ctx'> 			/* ... and it has RevokeValid status... */</div><div class='ctx'> 			if (bh2 != bh &amp;&amp; buffer_revokevalid(bh2))</div><div class='hunk'>@@ -420,12 +422,11 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,</div><div class='ctx'>  * do not trust the Revoked bit on buffers unless RevokeValid is also</div><div class='ctx'>  * set.</div><div class='ctx'>  */</div><div class='del'>-int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)</div><div class='add'>+void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)</div><div class='ctx'> {</div><div class='ctx'> 	struct jbd2_revoke_record_s *record;</div><div class='ctx'> 	journal_t *journal = handle-&gt;h_transaction-&gt;t_journal;</div><div class='ctx'> 	int need_cancel;</div><div class='del'>-	int did_revoke = 0;	/* akpm: debug */</div><div class='ctx'> 	struct buffer_head *bh = jh2bh(jh);</div><div class='ctx'> </div><div class='ctx'> 	jbd2_debug(4, "journal_head %p, cancelling revoke\n", jh);</div><div class='hunk'>@@ -450,7 +451,6 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)</div><div class='ctx'> 			list_del(&amp;record-&gt;hash);</div><div class='ctx'> 			spin_unlock(&amp;journal-&gt;j_revoke_lock);</div><div class='ctx'> 			kmem_cache_free(jbd2_revoke_record_cache, record);</div><div class='del'>-			did_revoke = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -466,18 +466,18 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)</div><div class='ctx'> 	 * state machine will get very upset later on. */</div><div class='ctx'> 	if (need_cancel) {</div><div class='ctx'> 		struct buffer_head *bh2;</div><div class='del'>-		bh2 = __find_get_block(bh-&gt;b_bdev, bh-&gt;b_blocknr, bh-&gt;b_size);</div><div class='add'>+		bh2 = __find_get_block_nonatomic(bh-&gt;b_bdev, bh-&gt;b_blocknr,</div><div class='add'>+						 bh-&gt;b_size);</div><div class='ctx'> 		if (bh2) {</div><div class='ctx'> 			if (bh2 != bh)</div><div class='ctx'> 				clear_buffer_revoked(bh2);</div><div class='ctx'> 			__brelse(bh2);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return did_revoke;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * journal_clear_revoked_flag clears revoked flag of buffers in</div><div class='add'>+ * jbd2_clear_buffer_revoked_flags clears revoked flag of buffers in</div><div class='ctx'>  * revoke table to reflect there is no revoked buffers in the next</div><div class='ctx'>  * transaction which is going to be started.</div><div class='ctx'>  */</div><div class='hunk'>@@ -495,9 +495,9 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal)</div><div class='ctx'> 			struct jbd2_revoke_record_s *record;</div><div class='ctx'> 			struct buffer_head *bh;</div><div class='ctx'> 			record = (struct jbd2_revoke_record_s *)list_entry;</div><div class='del'>-			bh = __find_get_block(journal-&gt;j_fs_dev,</div><div class='del'>-					      record-&gt;blocknr,</div><div class='del'>-					      journal-&gt;j_blocksize);</div><div class='add'>+			bh = __find_get_block_nonatomic(journal-&gt;j_fs_dev,</div><div class='add'>+							record-&gt;blocknr,</div><div class='add'>+							journal-&gt;j_blocksize);</div><div class='ctx'> 			if (bh) {</div><div class='ctx'> 				clear_buffer_revoked(bh);</div><div class='ctx'> 				__brelse(bh);</div><div class='hunk'>@@ -506,9 +506,9 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* journal_switch_revoke table select j_revoke for next transaction</div><div class='del'>- * we do not want to suspend any processing until all revokes are</div><div class='del'>- * written -bzzz</div><div class='add'>+/* jbd2_journal_switch_revoke_table table select j_revoke for next</div><div class='add'>+ * transaction we do not want to suspend any processing until all</div><div class='add'>+ * revokes are written -bzzz</div><div class='ctx'>  */</div><div class='ctx'> void jbd2_journal_switch_revoke_table(journal_t *journal)</div><div class='ctx'> {</div><div class='hunk'>@@ -654,7 +654,7 @@ static void flush_descriptor(journal_t *journal,</div><div class='ctx'> 	set_buffer_jwrite(descriptor);</div><div class='ctx'> 	BUFFER_TRACE(descriptor, "write");</div><div class='ctx'> 	set_buffer_dirty(descriptor);</div><div class='del'>-	write_dirty_buffer(descriptor, REQ_SYNC);</div><div class='add'>+	write_dirty_buffer(descriptor, JBD2_JOURNAL_REQ_FLAGS);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c<br/>index cb0b8d6fc0c6..dca4b5d8aaaa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jbd2/transaction.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jbd2/transaction.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jbd2/transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jbd2/transaction.c</a></div><div class='hunk'>@@ -63,28 +63,6 @@ void jbd2_journal_free_transaction(transaction_t *transaction)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Base amount of descriptor blocks we reserve for each transaction.</div><div class='del'>- */</div><div class='del'>-static int jbd2_descriptor_blocks_per_trans(journal_t *journal)</div><div class='del'>-{</div><div class='del'>-	int tag_space = journal-&gt;j_blocksize - sizeof(journal_header_t);</div><div class='del'>-	int tags_per_block;</div><div class='del'>-</div><div class='del'>-	/* Subtract UUID */</div><div class='del'>-	tag_space -= 16;</div><div class='del'>-	if (jbd2_journal_has_csum_v2or3(journal))</div><div class='del'>-		tag_space -= sizeof(struct jbd2_journal_block_tail);</div><div class='del'>-	/* Commit code leaves a slack space of 16 bytes at the end of block */</div><div class='del'>-	tags_per_block = (tag_space - 16) / journal_tag_bytes(journal);</div><div class='del'>-	/*</div><div class='del'>-	 * Revoke descriptors are accounted separately so we need to reserve</div><div class='del'>-	 * space for commit block and normal transaction descriptor blocks.</div><div class='del'>-	 */</div><div class='del'>-	return 1 + DIV_ROUND_UP(journal-&gt;j_max_transaction_buffers,</div><div class='del'>-				tags_per_block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * jbd2_get_transaction: obtain a new transaction_t object.</div><div class='ctx'>  *</div><div class='ctx'>  * Simply initialise a new transaction. Initialize it in</div><div class='hunk'>@@ -109,12 +87,11 @@ static void jbd2_get_transaction(journal_t *journal,</div><div class='ctx'> 	transaction-&gt;t_expires = jiffies + journal-&gt;j_commit_interval;</div><div class='ctx'> 	atomic_set(&amp;transaction-&gt;t_updates, 0);</div><div class='ctx'> 	atomic_set(&amp;transaction-&gt;t_outstanding_credits,</div><div class='del'>-		   jbd2_descriptor_blocks_per_trans(journal) +</div><div class='add'>+		   journal-&gt;j_transaction_overhead_buffers +</div><div class='ctx'> 		   atomic_read(&amp;journal-&gt;j_reserved_credits));</div><div class='ctx'> 	atomic_set(&amp;transaction-&gt;t_outstanding_revokes, 0);</div><div class='ctx'> 	atomic_set(&amp;transaction-&gt;t_handle_count, 0);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;transaction-&gt;t_inode_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;transaction-&gt;t_private_list);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the commit timer for the new transaction. */</div><div class='ctx'> 	journal-&gt;j_commit_timer.expires = round_jiffies_up(transaction-&gt;t_expires);</div><div class='hunk'>@@ -136,12 +113,9 @@ static void jbd2_get_transaction(journal_t *journal,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Update transaction's maximum wait time, if debugging is enabled.</div><div class='del'>- *</div><div class='ctx'>  * t_max_wait is carefully updated here with use of atomic compare exchange.</div><div class='ctx'>  * Note that there could be multiplre threads trying to do this simultaneously</div><div class='ctx'>  * hence using cmpxchg to avoid any use of locks in this case.</div><div class='del'>- * With this t_max_wait can be updated w/o enabling jbd2_journal_enable_debug.</div><div class='ctx'>  */</div><div class='ctx'> static inline void update_t_max_wait(transaction_t *transaction,</div><div class='ctx'> 				     unsigned long ts)</div><div class='hunk'>@@ -213,6 +187,13 @@ static void sub_reserved_credits(journal_t *journal, int blocks)</div><div class='ctx'> 	wake_up(&amp;journal-&gt;j_wait_reserved);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Maximum number of blocks for user transaction payload */</div><div class='add'>+static int jbd2_max_user_trans_buffers(journal_t *journal)</div><div class='add'>+{</div><div class='add'>+	return journal-&gt;j_max_transaction_buffers -</div><div class='add'>+				journal-&gt;j_transaction_overhead_buffers;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Wait until we can add credits for handle to the running transaction.  Called</div><div class='ctx'>  * with j_state_lock held for reading. Returns 0 if handle joined the running</div><div class='hunk'>@@ -262,12 +243,12 @@ __must_hold(&amp;journal-&gt;j_state_lock)</div><div class='ctx'> 		 * big to fit this handle? Wait until reserved credits are freed.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (atomic_read(&amp;journal-&gt;j_reserved_credits) + total &gt;</div><div class='del'>-		    journal-&gt;j_max_transaction_buffers) {</div><div class='add'>+		    jbd2_max_user_trans_buffers(journal)) {</div><div class='ctx'> 			read_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 			jbd2_might_wait_for_commit(journal);</div><div class='ctx'> 			wait_event(journal-&gt;j_wait_reserved,</div><div class='ctx'> 				   atomic_read(&amp;journal-&gt;j_reserved_credits) + total &lt;=</div><div class='del'>-				   journal-&gt;j_max_transaction_buffers);</div><div class='add'>+				   jbd2_max_user_trans_buffers(journal));</div><div class='ctx'> 			__acquire(&amp;journal-&gt;j_state_lock); /* fake out sparse */</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -307,14 +288,14 @@ __must_hold(&amp;journal-&gt;j_state_lock)</div><div class='ctx'> </div><div class='ctx'> 	needed = atomic_add_return(rsv_blocks, &amp;journal-&gt;j_reserved_credits);</div><div class='ctx'> 	/* We allow at most half of a transaction to be reserved */</div><div class='del'>-	if (needed &gt; journal-&gt;j_max_transaction_buffers / 2) {</div><div class='add'>+	if (needed &gt; jbd2_max_user_trans_buffers(journal) / 2) {</div><div class='ctx'> 		sub_reserved_credits(journal, rsv_blocks);</div><div class='ctx'> 		atomic_sub(total, &amp;t-&gt;t_outstanding_credits);</div><div class='ctx'> 		read_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 		jbd2_might_wait_for_commit(journal);</div><div class='ctx'> 		wait_event(journal-&gt;j_wait_reserved,</div><div class='ctx'> 			 atomic_read(&amp;journal-&gt;j_reserved_credits) + rsv_blocks</div><div class='del'>-			 &lt;= journal-&gt;j_max_transaction_buffers / 2);</div><div class='add'>+			 &lt;= jbd2_max_user_trans_buffers(journal) / 2);</div><div class='ctx'> 		__acquire(&amp;journal-&gt;j_state_lock); /* fake out sparse */</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -344,12 +325,12 @@ static int start_this_handle(journal_t *journal, handle_t *handle,</div><div class='ctx'> 	 * size and limit the number of total credits to not exceed maximum</div><div class='ctx'> 	 * transaction size per operation.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((rsv_blocks &gt; journal-&gt;j_max_transaction_buffers / 2) ||</div><div class='del'>-	    (rsv_blocks + blocks &gt; journal-&gt;j_max_transaction_buffers)) {</div><div class='add'>+	if (rsv_blocks &gt; jbd2_max_user_trans_buffers(journal) / 2 ||</div><div class='add'>+	    rsv_blocks + blocks &gt; jbd2_max_user_trans_buffers(journal)) {</div><div class='ctx'> 		printk(KERN_ERR "JBD2: %s wants too many credits "</div><div class='ctx'> 		       "credits:%d rsv_credits:%d max:%d\n",</div><div class='ctx'> 		       current-&gt;comm, blocks, rsv_blocks,</div><div class='del'>-		       journal-&gt;j_max_transaction_buffers);</div><div class='add'>+		       jbd2_max_user_trans_buffers(journal));</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -460,7 +441,7 @@ repeat:</div><div class='ctx'> 	read_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> 	current-&gt;journal_info = handle;</div><div class='ctx'> </div><div class='del'>-	rwsem_acquire_read(&amp;journal-&gt;j_trans_commit_map, 0, 0, _THIS_IP_);</div><div class='add'>+	rwsem_acquire_read(&amp;journal-&gt;j_trans_commit_map, 0, 1, _THIS_IP_);</div><div class='ctx'> 	jbd2_journal_free_transaction(new_transaction);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that no allocations done while the transaction is open are</div><div class='hunk'>@@ -1238,7 +1219,8 @@ int jbd2_journal_get_write_access(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='ctx'> 	journal = handle-&gt;h_transaction-&gt;t_journal;</div><div class='del'>-	if (jbd2_check_fs_dev_write_error(journal)) {</div><div class='add'>+	rc = jbd2_check_fs_dev_write_error(journal);</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If the fs dev has writeback errors, it may have failed</div><div class='ctx'> 		 * to async write out metadata buffers in the background.</div><div class='hunk'>@@ -1246,7 +1228,7 @@ int jbd2_journal_get_write_access(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 		 * it out again, which may lead to on-disk filesystem</div><div class='ctx'> 		 * inconsistency. Aborting journal can avoid it happen.</div><div class='ctx'> 		 */</div><div class='del'>-		jbd2_journal_abort(journal, -EIO);</div><div class='add'>+		jbd2_journal_abort(journal, rc);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1303,14 +1285,23 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 	 * committing transaction's lists, but it HAS to be in Forget state in</div><div class='ctx'> 	 * that case: the transaction must have deleted the buffer for it to be</div><div class='ctx'> 	 * reused here.</div><div class='add'>+	 * In the case of file system data inconsistency, for example, if the</div><div class='add'>+	 * block bitmap of a referenced block is not set, it can lead to the</div><div class='add'>+	 * situation where a block being committed is allocated and used again.</div><div class='add'>+	 * As a result, the following condition will not be satisfied, so here</div><div class='add'>+	 * we directly trigger a JBD abort instead of immediately invoking</div><div class='add'>+	 * bugon.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;jh-&gt;b_state_lock);</div><div class='del'>-	J_ASSERT_JH(jh, (jh-&gt;b_transaction == transaction ||</div><div class='del'>-		jh-&gt;b_transaction == NULL ||</div><div class='del'>-		(jh-&gt;b_transaction == journal-&gt;j_committing_transaction &amp;&amp;</div><div class='del'>-			  jh-&gt;b_jlist == BJ_Forget)));</div><div class='add'>+	if (!(jh-&gt;b_transaction == transaction || jh-&gt;b_transaction == NULL ||</div><div class='add'>+	      (jh-&gt;b_transaction == journal-&gt;j_committing_transaction &amp;&amp;</div><div class='add'>+	       jh-&gt;b_jlist == BJ_Forget)) || jh-&gt;b_next_transaction != NULL) {</div><div class='add'>+		err = -EROFS;</div><div class='add'>+		spin_unlock(&amp;jh-&gt;b_state_lock);</div><div class='add'>+		jbd2_journal_abort(journal, err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	J_ASSERT_JH(jh, jh-&gt;b_next_transaction == NULL);</div><div class='ctx'> 	J_ASSERT_JH(jh, buffer_locked(jh2bh(jh)));</div><div class='ctx'> </div><div class='ctx'> 	if (jh-&gt;b_transaction == NULL) {</div><div class='hunk'>@@ -1528,7 +1519,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 				jh-&gt;b_next_transaction == transaction);</div><div class='ctx'> 		spin_unlock(&amp;jh-&gt;b_state_lock);</div><div class='ctx'> 	}</div><div class='del'>-	if (jh-&gt;b_modified == 1) {</div><div class='add'>+	if (data_race(jh-&gt;b_modified == 1)) {</div><div class='ctx'> 		/* If it's in our transaction it must be in BJ_Metadata list. */</div><div class='ctx'> 		if (data_race(jh-&gt;b_transaction == transaction &amp;&amp;</div><div class='ctx'> 		    jh-&gt;b_jlist != BJ_Metadata)) {</div><div class='hunk'>@@ -1547,7 +1538,6 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	journal = transaction-&gt;t_journal;</div><div class='ctx'> 	spin_lock(&amp;jh-&gt;b_state_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (is_handle_aborted(handle)) {</div><div class='hunk'>@@ -1562,6 +1552,8 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 		goto out_unlock_bh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	journal = transaction-&gt;t_journal;</div><div class='add'>+</div><div class='ctx'> 	if (jh-&gt;b_modified == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This buffer's got modified and becoming part</div><div class='hunk'>@@ -1677,6 +1669,7 @@ int jbd2_journal_forget(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 	int drop_reserve = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int was_modified = 0;</div><div class='add'>+	int wait_for_writeback = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (is_handle_aborted(handle))</div><div class='ctx'> 		return -EROFS;</div><div class='hunk'>@@ -1800,18 +1793,22 @@ int jbd2_journal_forget(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * The buffer is still not written to disk, we should</div><div class='del'>-		 * attach this buffer to current transaction so that the</div><div class='del'>-		 * buffer can be checkpointed only after the current</div><div class='del'>-		 * transaction commits.</div><div class='add'>+		 * The buffer has not yet been written to disk. We should</div><div class='add'>+		 * either clear the buffer or ensure that the ongoing I/O</div><div class='add'>+		 * is completed, and attach this buffer to current</div><div class='add'>+		 * transaction so that the buffer can be checkpointed only</div><div class='add'>+		 * after the current transaction commits.</div><div class='ctx'> 		 */</div><div class='ctx'> 		clear_buffer_dirty(bh);</div><div class='add'>+		wait_for_writeback = 1;</div><div class='ctx'> 		__jbd2_journal_file_buffer(jh, transaction, BJ_Forget);</div><div class='ctx'> 		spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 	}</div><div class='ctx'> drop:</div><div class='ctx'> 	__brelse(bh);</div><div class='ctx'> 	spin_unlock(&amp;jh-&gt;b_state_lock);</div><div class='add'>+	if (wait_for_writeback)</div><div class='add'>+		wait_on_buffer(bh);</div><div class='ctx'> 	jbd2_journal_put_journal_head(jh);</div><div class='ctx'> 	if (drop_reserve) {</div><div class='ctx'> 		/* no need to reserve log space for this block -bzzz */</div><div class='hunk'>@@ -2094,21 +2091,6 @@ static void __jbd2_journal_unfile_buffer(struct journal_head *jh)</div><div class='ctx'> 	jh-&gt;b_transaction = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void jbd2_journal_unfile_buffer(journal_t *journal, struct journal_head *jh)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh = jh2bh(jh);</div><div class='del'>-</div><div class='del'>-	/* Get reference so that buffer cannot be freed before we unlock it */</div><div class='del'>-	get_bh(bh);</div><div class='del'>-	spin_lock(&amp;jh-&gt;b_state_lock);</div><div class='del'>-	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='del'>-	__jbd2_journal_unfile_buffer(jh);</div><div class='del'>-	spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='del'>-	spin_unlock(&amp;jh-&gt;b_state_lock);</div><div class='del'>-	jbd2_journal_put_journal_head(jh);</div><div class='del'>-	__brelse(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * jbd2_journal_try_to_free_buffers() - try to free page buffers.</div><div class='ctx'>  * @journal: journal for operation</div><div class='hunk'>@@ -2207,7 +2189,7 @@ static int __dispose_buffer(struct journal_head *jh, transaction_t *transaction)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't want to write the buffer anymore, clear the</div><div class='ctx'> 		 * bit so that we don't confuse checks in</div><div class='del'>-		 * __journal_file_buffer</div><div class='add'>+		 * __jbd2_journal_file_buffer</div><div class='ctx'> 		 */</div><div class='ctx'> 		clear_buffer_dirty(bh);</div><div class='ctx'> 		__jbd2_journal_file_buffer(jh, transaction, BJ_Forget);</div><div class='head'>diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig<br/>index 7c96bc107218..560187d61562 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/Kconfig</a></div><div class='hunk'>@@ -151,8 +151,9 @@ config JFFS2_RUBIN</div><div class='ctx'> 	  RUBINMIPS and DYNRUBIN compressors. Say 'N' if unsure.</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='del'>-	prompt "JFFS2 default compression mode" if JFFS2_COMPRESSION_OPTIONS</div><div class='add'>+	prompt "JFFS2 default compression mode"</div><div class='ctx'> 	default JFFS2_CMODE_PRIORITY</div><div class='add'>+	depends on JFFS2_COMPRESSION_OPTIONS</div><div class='ctx'> 	depends on JFFS2_FS</div><div class='ctx'> 	help</div><div class='ctx'> 	  You can set here the default compression mode of JFFS2 from</div><div class='head'>diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c<br/>index 6da92ecaf66d..bb0ee1a59e71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/background.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/background.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/background.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/background.c</a></div><div class='hunk'>@@ -44,8 +44,8 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	tsk = kthread_run(jffs2_garbage_collect_thread, c, "jffs2_gcd_mtd%d", c-&gt;mtd-&gt;index);</div><div class='ctx'> 	if (IS_ERR(tsk)) {</div><div class='del'>-		pr_warn("fork failed for JFFS2 garbage collect thread: %ld\n",</div><div class='del'>-			-PTR_ERR(tsk));</div><div class='add'>+		pr_warn("fork failed for JFFS2 garbage collect thread: %pe\n",</div><div class='add'>+			tsk);</div><div class='ctx'> 		complete(&amp;c-&gt;gc_thread_exit);</div><div class='ctx'> 		ret = PTR_ERR(tsk);</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c<br/>index 79e771ab624f..3bd9d2f3bece 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/compr_rtime.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/compr_rtime.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/compr_rtime.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/compr_rtime.c</a></div><div class='hunk'>@@ -95,6 +95,9 @@ static int jffs2_rtime_decompress(unsigned char *data_in,</div><div class='ctx'> </div><div class='ctx'> 		positions[value]=outpos;</div><div class='ctx'> 		if (repeat) {</div><div class='add'>+			if ((outpos + repeat) &gt; destlen) {</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='ctx'> 			if (backoffs + repeat &gt;= outpos) {</div><div class='ctx'> 				while(repeat) {</div><div class='ctx'> 					cpage_out[outpos++] = cpage_out[backoffs++];</div><div class='head'>diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c<br/>index 556de100ebd5..9854253d0108 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/compr_rubin.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/compr_rubin.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/compr_rubin.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/compr_rubin.c</a></div><div class='hunk'>@@ -276,11 +276,6 @@ static int rubin_do_compress(int bit_divider, int *bits, unsigned char *data_in,</div><div class='ctx'> </div><div class='ctx'> 	end_rubin(&amp;rs);</div><div class='ctx'> </div><div class='del'>-	if (outpos &gt; pos) {</div><div class='del'>-		/* We failed */</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Tell the caller how much we managed to compress,</div><div class='ctx'> 	 * and how much space it took */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c<br/>index 2b2938970da3..dd91f725ded6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/dir.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@ static int jffs2_link (struct dentry *,struct inode *,struct dentry *);</div><div class='ctx'> static int jffs2_unlink (struct inode *,struct dentry *);</div><div class='ctx'> static int jffs2_symlink (struct mnt_idmap *, struct inode *,</div><div class='ctx'> 			  struct dentry *, const char *);</div><div class='del'>-static int jffs2_mkdir (struct mnt_idmap *, struct inode *,struct dentry *,</div><div class='del'>-			umode_t);</div><div class='add'>+static struct dentry *jffs2_mkdir (struct mnt_idmap *, struct inode *,struct dentry *,</div><div class='add'>+				   umode_t);</div><div class='ctx'> static int jffs2_rmdir (struct inode *,struct dentry *);</div><div class='ctx'> static int jffs2_mknod (struct mnt_idmap *, struct inode *,struct dentry *,</div><div class='ctx'> 			umode_t,dev_t);</div><div class='hunk'>@@ -446,8 +446,8 @@ static int jffs2_symlink (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='del'>-		        struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='add'>+				   struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_inode_info *f, *dir_f;</div><div class='ctx'> 	struct jffs2_sb_info *c;</div><div class='hunk'>@@ -464,7 +464,7 @@ static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='ctx'> </div><div class='ctx'> 	ri = jffs2_alloc_raw_inode();</div><div class='ctx'> 	if (!ri)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	c = JFFS2_SB_INFO(dir_i-&gt;i_sb);</div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +477,7 @@ static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		jffs2_free_raw_inode(ri);</div><div class='del'>-		return ret;</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode = jffs2_new_inode(dir_i, mode, ri);</div><div class='hunk'>@@ -485,7 +485,7 @@ static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='ctx'> 		jffs2_free_raw_inode(ri);</div><div class='ctx'> 		jffs2_complete_reservation(c);</div><div class='del'>-		return PTR_ERR(inode);</div><div class='add'>+		return ERR_CAST(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_op = &amp;jffs2_dir_inode_operations;</div><div class='hunk'>@@ -584,11 +584,11 @@ static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,</div><div class='ctx'> 	jffs2_complete_reservation(c);</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate_new(dentry, inode);</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> </div><div class='ctx'>  fail:</div><div class='ctx'> 	iget_failed(inode);</div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)</div><div class='head'>diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c<br/>index acd32f05b519..fda9f4d6093f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/erase.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/erase.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/erase.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/erase.c</a></div><div class='hunk'>@@ -338,10 +338,9 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl</div><div class='ctx'> 		} while(--retlen);</div><div class='ctx'> 		mtd_unpoint(c-&gt;mtd, jeb-&gt;offset, c-&gt;sector_size);</div><div class='ctx'> 		if (retlen) {</div><div class='del'>-			pr_warn("Newly-erased block contained word 0x%lx at offset 0x%08tx\n",</div><div class='del'>-				*wordebuf,</div><div class='del'>-				jeb-&gt;offset +</div><div class='del'>-				c-&gt;sector_size-retlen * sizeof(*wordebuf));</div><div class='add'>+			*bad_offset = jeb-&gt;offset + c-&gt;sector_size - retlen * sizeof(*wordebuf);</div><div class='add'>+			pr_warn("Newly-erased block contained word 0x%lx at offset 0x%08x\n",</div><div class='add'>+				*wordebuf, *bad_offset);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -426,7 +425,9 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb</div><div class='ctx'> 			.totlen =	cpu_to_je32(c-&gt;cleanmarker_size)</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='add'>+		ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto filebad;</div><div class='ctx'> </div><div class='ctx'> 		marker.hdr_crc = cpu_to_je32(crc32(0, &amp;marker, sizeof(struct jffs2_unknown_node)-4));</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c<br/>index 62ea76da7fdf..b697f3c259ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/file.c</a></div><div class='hunk'>@@ -21,12 +21,14 @@</div><div class='ctx'> #include &lt;linux/jffs2.h&gt;</div><div class='ctx'> #include "nodelist.h"</div><div class='ctx'> </div><div class='del'>-static int jffs2_write_end(struct file *filp, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *pg, void *fsdata);</div><div class='del'>-static int jffs2_write_begin(struct file *filp, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata);</div><div class='add'>+static int jffs2_write_end(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			   struct folio *folio, void *fsdata);</div><div class='add'>+static int jffs2_write_begin(const struct kiocb *iocb,</div><div class='add'>+			     struct address_space *mapping,</div><div class='add'>+			     loff_t pos, unsigned len,</div><div class='add'>+			     struct folio **foliop, void **fsdata);</div><div class='ctx'> static int jffs2_read_folio(struct file *filp, struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)</div><div class='hunk'>@@ -54,7 +56,7 @@ const struct file_operations jffs2_file_operations =</div><div class='ctx'>  	.read_iter =	generic_file_read_iter,</div><div class='ctx'>  	.write_iter =	generic_file_write_iter,</div><div class='ctx'> 	.unlocked_ioctl=jffs2_ioctl,</div><div class='del'>-	.mmap =		generic_file_readonly_mmap,</div><div class='add'>+	.mmap_prepare =	generic_file_readonly_mmap_prepare,</div><div class='ctx'> 	.fsync =	jffs2_fsync,</div><div class='ctx'> 	.splice_read =	filemap_splice_read,</div><div class='ctx'> 	.splice_write = iter_file_splice_write,</div><div class='hunk'>@@ -77,34 +79,27 @@ const struct address_space_operations jffs2_file_address_operations =</div><div class='ctx'> 	.write_end =	jffs2_write_end,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)</div><div class='add'>+static int jffs2_do_readpage_nolock(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='ctx'> 	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='del'>-	unsigned char *pg_buf;</div><div class='add'>+	unsigned char *kaddr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n",</div><div class='del'>-		  __func__, inode-&gt;i_ino, pg-&gt;index &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		  __func__, inode-&gt;i_ino, folio-&gt;index &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!PageLocked(pg));</div><div class='add'>+	BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> </div><div class='del'>-	pg_buf = kmap(pg);</div><div class='del'>-	/* FIXME: Can kmap fail? */</div><div class='del'>-</div><div class='del'>-	ret = jffs2_read_inode_range(c, f, pg_buf, pg-&gt;index &lt;&lt; PAGE_SHIFT,</div><div class='add'>+	kaddr = kmap_local_folio(folio, 0);</div><div class='add'>+	ret = jffs2_read_inode_range(c, f, kaddr, folio-&gt;index &lt;&lt; PAGE_SHIFT,</div><div class='ctx'> 				     PAGE_SIZE);</div><div class='add'>+	kunmap_local(kaddr);</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		ClearPageUptodate(pg);</div><div class='del'>-		SetPageError(pg);</div><div class='del'>-	} else {</div><div class='del'>-		SetPageUptodate(pg);</div><div class='del'>-		ClearPageError(pg);</div><div class='del'>-	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='del'>-	flush_dcache_page(pg);</div><div class='del'>-	kunmap(pg);</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg(2, "readpage finished\n");</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -112,7 +107,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)</div><div class='ctx'> </div><div class='ctx'> int __jffs2_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	int ret = jffs2_do_readpage_nolock(folio-&gt;mapping-&gt;host, &amp;folio-&gt;page);</div><div class='add'>+	int ret = jffs2_do_readpage_nolock(folio-&gt;mapping-&gt;host, folio);</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -128,11 +123,12 @@ static int jffs2_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jffs2_write_begin(struct file *filp, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int jffs2_write_begin(const struct kiocb *iocb,</div><div class='add'>+			     struct address_space *mapping,</div><div class='add'>+			     loff_t pos, unsigned len,</div><div class='add'>+			     struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct page *pg;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='ctx'> 	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='hunk'>@@ -211,29 +207,30 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,</div><div class='ctx'> 	 * page in read_cache_page(), which causes a deadlock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;c-&gt;alloc_sem);</div><div class='del'>-	pg = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!pg) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		goto release_sem;</div><div class='ctx'> 	}</div><div class='del'>-	*pagep = pg;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Read in the page if it wasn't already present. Cannot optimize away</div><div class='del'>-	 * the whole page write case until jffs2_write_end can handle the</div><div class='add'>+	 * Read in the folio if it wasn't already present. Cannot optimize away</div><div class='add'>+	 * the whole folio write case until jffs2_write_end can handle the</div><div class='ctx'> 	 * case of a short-copy.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!PageUptodate(pg)) {</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		mutex_lock(&amp;f-&gt;sem);</div><div class='del'>-		ret = jffs2_do_readpage_nolock(inode, pg);</div><div class='add'>+		ret = jffs2_do_readpage_nolock(inode, folio);</div><div class='ctx'> 		mutex_unlock(&amp;f-&gt;sem);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			unlock_page(pg);</div><div class='del'>-			put_page(pg);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			goto release_sem;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	jffs2_dbg(1, "end write_begin(). pg-&gt;flags %lx\n", pg-&gt;flags);</div><div class='add'>+	jffs2_dbg(1, "end write_begin(). folio-&gt;flags %lx\n", folio-&gt;flags.f);</div><div class='ctx'> </div><div class='ctx'> release_sem:</div><div class='ctx'> 	mutex_unlock(&amp;c-&gt;alloc_sem);</div><div class='hunk'>@@ -241,9 +238,10 @@ out_err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jffs2_write_end(struct file *filp, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *pg, void *fsdata)</div><div class='add'>+static int jffs2_write_end(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			   struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	/* Actually commit the write from the page cache page we're looking at.</div><div class='ctx'> 	 * For now, we write the full page out each time. It sucks, but it's simple</div><div class='hunk'>@@ -257,16 +255,17 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,</div><div class='ctx'> 	unsigned aligned_start = start &amp; ~3;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	uint32_t writtenlen = 0;</div><div class='add'>+	void *buf;</div><div class='ctx'> </div><div class='del'>-	jffs2_dbg(1, "%s(): ino #%lu, page at 0x%lx, range %d-%d, flags %lx\n",</div><div class='del'>-		  __func__, inode-&gt;i_ino, pg-&gt;index &lt;&lt; PAGE_SHIFT,</div><div class='del'>-		  start, end, pg-&gt;flags);</div><div class='add'>+	jffs2_dbg(1, "%s(): ino #%lu, page at 0x%llx, range %d-%d, flags %lx\n",</div><div class='add'>+		  __func__, inode-&gt;i_ino, folio_pos(folio),</div><div class='add'>+		  start, end, folio-&gt;flags.f);</div><div class='ctx'> </div><div class='ctx'> 	/* We need to avoid deadlock with page_cache_read() in</div><div class='del'>-	   jffs2_garbage_collect_pass(). So the page must be</div><div class='add'>+	   jffs2_garbage_collect_pass(). So the folio must be</div><div class='ctx'> 	   up to date to prevent page_cache_read() from trying</div><div class='ctx'> 	   to re-lock it. */</div><div class='del'>-	BUG_ON(!PageUptodate(pg));</div><div class='add'>+	BUG_ON(!folio_test_uptodate(folio));</div><div class='ctx'> </div><div class='ctx'> 	if (end == PAGE_SIZE) {</div><div class='ctx'> 		/* When writing out the end of a page, write out the</div><div class='hunk'>@@ -281,8 +280,8 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,</div><div class='ctx'> 	if (!ri) {</div><div class='ctx'> 		jffs2_dbg(1, "%s(): Allocation of raw inode failed\n",</div><div class='ctx'> 			  __func__);</div><div class='del'>-		unlock_page(pg);</div><div class='del'>-		put_page(pg);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -294,20 +293,14 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,</div><div class='ctx'> 	ri-&gt;isize = cpu_to_je32((uint32_t)inode-&gt;i_size);</div><div class='ctx'> 	ri-&gt;atime = ri-&gt;ctime = ri-&gt;mtime = cpu_to_je32(JFFS2_NOW());</div><div class='ctx'> </div><div class='del'>-	/* In 2.4, it was already kmapped by generic_file_write(). Doesn't</div><div class='del'>-	   hurt to do it again. The alternative is ifdefs, which are ugly. */</div><div class='del'>-	kmap(pg);</div><div class='del'>-</div><div class='del'>-	ret = jffs2_write_inode_range(c, f, ri, page_address(pg) + aligned_start,</div><div class='del'>-				      (pg-&gt;index &lt;&lt; PAGE_SHIFT) + aligned_start,</div><div class='add'>+	buf = kmap_local_folio(folio, aligned_start);</div><div class='add'>+	ret = jffs2_write_inode_range(c, f, ri, buf,</div><div class='add'>+				      folio_pos(folio) + aligned_start,</div><div class='ctx'> 				      end - aligned_start, &amp;writtenlen);</div><div class='add'>+	kunmap_local(buf);</div><div class='ctx'> </div><div class='del'>-	kunmap(pg);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		/* There was an error writing. */</div><div class='del'>-		SetPageError(pg);</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		mapping_set_error(mapping, ret);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust writtenlen for the padding we did, so we don't confuse our caller */</div><div class='ctx'> 	writtenlen -= min(writtenlen, (start - aligned_start));</div><div class='hunk'>@@ -330,13 +323,12 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,</div><div class='ctx'> 		   it gets reread */</div><div class='ctx'> 		jffs2_dbg(1, "%s(): Not all bytes written. Marking page !uptodate\n",</div><div class='ctx'> 			__func__);</div><div class='del'>-		SetPageError(pg);</div><div class='del'>-		ClearPageUptodate(pg);</div><div class='add'>+		folio_clear_uptodate(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg(1, "%s() returning %d\n",</div><div class='ctx'> 		  __func__, writtenlen &gt; 0 ? writtenlen : ret);</div><div class='del'>-	unlock_page(pg);</div><div class='del'>-	put_page(pg);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return writtenlen &gt; 0 ? writtenlen : ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c<br/>index d175cccb7c55..764bba8ba999 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/fs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/fs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/fs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/fs.c</a></div><div class='hunk'>@@ -265,7 +265,7 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	f = JFFS2_INODE_INFO(inode);</div><div class='hunk'>@@ -373,7 +373,7 @@ void jffs2_dirty_inode(struct inode *inode, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct iattr iattr;</div><div class='ctx'> </div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_DIRTY_DATASYNC)) {</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_DIRTY_DATASYNC)) {</div><div class='ctx'> 		jffs2_dbg(2, "%s(): not calling setattr() for ino #%lu\n",</div><div class='ctx'> 			  __func__, inode-&gt;i_ino);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c<br/>index 5c6602f3c189..1b833bbffcf5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/gc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/gc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/gc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/gc.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		nextlist = &amp;c-&gt;erasable_list;</div><div class='ctx'> 	} else if (!list_empty(&amp;c-&gt;erasable_pending_wbuf_list)) {</div><div class='del'>-		/* There are blocks are wating for the wbuf sync */</div><div class='add'>+		/* There are blocks are waiting for the wbuf sync */</div><div class='ctx'> 		jffs2_dbg(1, "Synching wbuf in order to reuse erasable_pending_wbuf_list blocks\n");</div><div class='ctx'> 		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 		jffs2_flush_wbuf_pad(c);</div><div class='hunk'>@@ -1171,7 +1171,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era</div><div class='ctx'> 	uint32_t alloclen, offset, orig_end, orig_start;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned char *comprbuf = NULL, *writebuf;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	unsigned char *pg_ptr;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ri, 0, sizeof(ri));</div><div class='hunk'>@@ -1317,25 +1317,25 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era</div><div class='ctx'> 		BUG_ON(start &gt; orig_start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The rules state that we must obtain the page lock *before* f-&gt;sem, so</div><div class='add'>+	/* The rules state that we must obtain the folio lock *before* f-&gt;sem, so</div><div class='ctx'> 	 * drop f-&gt;sem temporarily. Since we also hold c-&gt;alloc_sem, nothing's</div><div class='ctx'> 	 * actually going to *change* so we're safe; we only allow reading.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * It is important to note that jffs2_write_begin() will ensure that its</div><div class='del'>-	 * page is marked Uptodate before allocating space. That means that if we</div><div class='del'>-	 * end up here trying to GC the *same* page that jffs2_write_begin() is</div><div class='del'>-	 * trying to write out, read_cache_page() will not deadlock. */</div><div class='add'>+	 * folio is marked uptodate before allocating space. That means that if we</div><div class='add'>+	 * end up here trying to GC the *same* folio that jffs2_write_begin() is</div><div class='add'>+	 * trying to write out, read_cache_folio() will not deadlock. */</div><div class='ctx'> 	mutex_unlock(&amp;f-&gt;sem);</div><div class='del'>-	page = read_cache_page(inode-&gt;i_mapping, start &gt;&gt; PAGE_SHIFT,</div><div class='add'>+	folio = read_cache_folio(inode-&gt;i_mapping, start &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 			       __jffs2_read_folio, NULL);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		pr_warn("read_cache_page() returned error: %ld\n",</div><div class='del'>-			PTR_ERR(page));</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		pr_warn("read_cache_folio() returned error: %ld\n",</div><div class='add'>+			PTR_ERR(folio));</div><div class='ctx'> 		mutex_lock(&amp;f-&gt;sem);</div><div class='del'>-		return PTR_ERR(page);</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pg_ptr = kmap(page);</div><div class='add'>+	pg_ptr = kmap_local_folio(folio, 0);</div><div class='ctx'> 	mutex_lock(&amp;f-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> 	offset = start;</div><div class='hunk'>@@ -1400,7 +1400,6 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kunmap(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_release_kmap(folio, pg_ptr);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c<br/>index ce1189793288..411de8b361b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/malloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/malloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/malloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/malloc.c</a></div><div class='hunk'>@@ -33,27 +33,19 @@ static struct kmem_cache *xattr_ref_cache;</div><div class='ctx'> </div><div class='ctx'> int __init jffs2_create_slab_caches(void)</div><div class='ctx'> {</div><div class='del'>-	full_dnode_slab = kmem_cache_create("jffs2_full_dnode",</div><div class='del'>-					    sizeof(struct jffs2_full_dnode),</div><div class='del'>-					    0, 0, NULL);</div><div class='add'>+	full_dnode_slab = KMEM_CACHE(jffs2_full_dnode, 0);</div><div class='ctx'> 	if (!full_dnode_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",</div><div class='del'>-					    sizeof(struct jffs2_raw_dirent),</div><div class='del'>-					    0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+	raw_dirent_slab = KMEM_CACHE(jffs2_raw_dirent, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!raw_dirent_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	raw_inode_slab = kmem_cache_create("jffs2_raw_inode",</div><div class='del'>-					   sizeof(struct jffs2_raw_inode),</div><div class='del'>-					   0, SLAB_HWCACHE_ALIGN, NULL);</div><div class='add'>+	raw_inode_slab = KMEM_CACHE(jffs2_raw_inode, SLAB_HWCACHE_ALIGN);</div><div class='ctx'> 	if (!raw_inode_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",</div><div class='del'>-						sizeof(struct jffs2_tmp_dnode_info),</div><div class='del'>-						0, 0, NULL);</div><div class='add'>+	tmp_dnode_info_slab = KMEM_CACHE(jffs2_tmp_dnode_info, 0);</div><div class='ctx'> 	if (!tmp_dnode_info_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -63,28 +55,20 @@ int __init jffs2_create_slab_caches(void)</div><div class='ctx'> 	if (!raw_node_ref_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	node_frag_slab = kmem_cache_create("jffs2_node_frag",</div><div class='del'>-					   sizeof(struct jffs2_node_frag),</div><div class='del'>-					   0, 0, NULL);</div><div class='add'>+	node_frag_slab = KMEM_CACHE(jffs2_node_frag, 0);</div><div class='ctx'> 	if (!node_frag_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	inode_cache_slab = kmem_cache_create("jffs2_inode_cache",</div><div class='del'>-					     sizeof(struct jffs2_inode_cache),</div><div class='del'>-					     0, 0, NULL);</div><div class='add'>+	inode_cache_slab = KMEM_CACHE(jffs2_inode_cache, 0);</div><div class='ctx'> 	if (!inode_cache_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JFFS2_FS_XATTR</div><div class='del'>-	xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",</div><div class='del'>-					     sizeof(struct jffs2_xattr_datum),</div><div class='del'>-					     0, 0, NULL);</div><div class='add'>+	xattr_datum_cache = KMEM_CACHE(jffs2_xattr_datum, 0);</div><div class='ctx'> 	if (!xattr_datum_cache)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",</div><div class='del'>-					   sizeof(struct jffs2_xattr_ref),</div><div class='del'>-					   0, 0, NULL);</div><div class='add'>+	xattr_ref_cache = KMEM_CACHE(jffs2_xattr_ref, 0);</div><div class='ctx'> 	if (!xattr_ref_cache)</div><div class='ctx'> 		goto err;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c<br/>index a7bbe879cfc3..3fb9f9807b66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/nodemgmt.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/nodemgmt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/nodemgmt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/nodemgmt.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include "nodelist.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='hunk'>@@ -49,28 +50,31 @@ static int jffs2_rp_can_write(struct jffs2_sb_info *c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int jffs2_do_reserve_space(struct jffs2_sb_info *c,  uint32_t minsize,</div><div class='add'>+				  uint32_t *len, uint32_t sumsize);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	jffs2_reserve_space - request physical space to write nodes to flash</div><div class='ctx'>  *	@c: superblock info</div><div class='ctx'>  *	@minsize: Minimum acceptable size of allocation</div><div class='ctx'>  *	@len: Returned value of allocation length</div><div class='ctx'>  *	@prio: Allocation type - ALLOC_{NORMAL,DELETION}</div><div class='add'>+ *	@sumsize: summary size requested or JFFS2_SUMMARY_NOSUM_SIZE for no summary</div><div class='add'>+ *</div><div class='add'>+ *	Requests a block of physical space on the flash.</div><div class='ctx'>  *</div><div class='del'>- *	Requests a block of physical space on the flash. Returns zero for success</div><div class='del'>- *	and puts 'len' into the appropriate place, or returns -ENOSPC or other </div><div class='del'>- *	error if appropriate. Doesn't return len since that's </div><div class='add'>+ *	Returns: %0 for success	and puts 'len' into the appropriate place,</div><div class='add'>+ *	or returns -ENOSPC or other error if appropriate.</div><div class='add'>+ *	Doesn't return len since that's already returned in @len.</div><div class='ctx'>  *</div><div class='del'>- *	If it returns zero, jffs2_reserve_space() also downs the per-filesystem</div><div class='add'>+ *	If it returns %0, jffs2_reserve_space() also downs the per-filesystem</div><div class='ctx'>  *	allocation semaphore, to prevent more than one allocation from being</div><div class='del'>- *	active at any time. The semaphore is later released by jffs2_commit_allocation()</div><div class='add'>+ *	active at any time. The semaphore is later released by jffs2_commit_allocation().</div><div class='ctx'>  *</div><div class='ctx'>  *	jffs2_reserve_space() may trigger garbage collection in order to make room</div><div class='ctx'>  *	for the requested allocation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int jffs2_do_reserve_space(struct jffs2_sb_info *c,  uint32_t minsize,</div><div class='del'>-				  uint32_t *len, uint32_t sumsize);</div><div class='del'>-</div><div class='ctx'> int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='ctx'> 			uint32_t *len, int prio, uint32_t sumsize)</div><div class='ctx'> {</div><div class='hunk'>@@ -314,9 +318,9 @@ static int jffs2_find_nextblock(struct jffs2_sb_info *c)</div><div class='ctx'> 			   And there's no space left. At all. */</div><div class='ctx'> 			pr_crit("Argh. No free space left for GC. nr_erasing_blocks is %d. nr_free_blocks is %d. (erasableempty: %s, erasingempty: %s, erasependingempty: %s)\n",</div><div class='ctx'> 				c-&gt;nr_erasing_blocks, c-&gt;nr_free_blocks,</div><div class='del'>-				list_empty(&amp;c-&gt;erasable_list) ? "yes" : "no",</div><div class='del'>-				list_empty(&amp;c-&gt;erasing_list) ? "yes" : "no",</div><div class='del'>-				list_empty(&amp;c-&gt;erase_pending_list) ? "yes" : "no");</div><div class='add'>+				str_yes_no(list_empty(&amp;c-&gt;erasable_list)),</div><div class='add'>+				str_yes_no(list_empty(&amp;c-&gt;erasing_list)),</div><div class='add'>+				str_yes_no(list_empty(&amp;c-&gt;erase_pending_list)));</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -488,13 +492,16 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='ctx'> /**</div><div class='ctx'>  *	jffs2_add_physical_node_ref - add a physical node reference to the list</div><div class='ctx'>  *	@c: superblock info</div><div class='del'>- *	@new: new node reference to add</div><div class='add'>+ *	@ofs: offset in the block</div><div class='ctx'>  *	@len: length of this physical node</div><div class='add'>+ *	@ic: inode cache pointer</div><div class='ctx'>  *</div><div class='ctx'>  *	Should only be used to report nodes for which space has been allocated</div><div class='ctx'>  *	by jffs2_reserve_space.</div><div class='ctx'>  *</div><div class='ctx'>  *	Must be called with the alloc_sem held.</div><div class='add'>+ *</div><div class='add'>+ *	Returns: pointer to new node on success or -errno code on error</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct jffs2_raw_node_ref *jffs2_add_physical_node_ref(struct jffs2_sb_info *c,</div><div class='hunk'>@@ -624,8 +631,8 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 					  ref-&gt;flash_offset, jeb-&gt;used_size);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		})</div><div class='del'>-			jffs2_dbg(1, "Obsoleting previously unchecked node at 0x%08x of len %x\n",</div><div class='del'>-				  ref_offset(ref), freed_len);</div><div class='add'>+		jffs2_dbg(1, "Obsoleting previously unchecked node at 0x%08x of len %x\n",</div><div class='add'>+				ref_offset(ref), freed_len);</div><div class='ctx'> 		jeb-&gt;unchecked_size -= freed_len;</div><div class='ctx'> 		c-&gt;unchecked_size -= freed_len;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -635,8 +642,8 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 					  ref-&gt;flash_offset, jeb-&gt;used_size);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		})</div><div class='del'>-			jffs2_dbg(1, "Obsoleting node at 0x%08x of len %#x: ",</div><div class='del'>-				  ref_offset(ref), freed_len);</div><div class='add'>+		jffs2_dbg(1, "Obsoleting node at 0x%08x of len %#x: ",</div><div class='add'>+				ref_offset(ref), freed_len);</div><div class='ctx'> 		jeb-&gt;used_size -= freed_len;</div><div class='ctx'> 		c-&gt;used_size -= freed_len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -877,7 +884,7 @@ int jffs2_thread_should_wake(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg(1, "%s(): nr_free_blocks %d, nr_erasing_blocks %d, dirty_size 0x%x, vdirty_blocks %d: %s\n",</div><div class='ctx'> 		  __func__, c-&gt;nr_free_blocks, c-&gt;nr_erasing_blocks,</div><div class='del'>-		  c-&gt;dirty_size, nr_very_dirty, ret ? "yes" : "no");</div><div class='add'>+		  c-&gt;dirty_size, nr_very_dirty, str_yes_no(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c<br/>index 03b4f99614be..f987f78a894e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/readinode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/readinode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/readinode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/readinode.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info</div><div class='ctx'> 		if (err != -EOPNOTSUPP)</div><div class='ctx'> 			JFFS2_WARNING("MTD point failed: error code %d.\n", err);</div><div class='ctx'> 	} else</div><div class='del'>-		pointed = 1; /* succefully pointed to device */</div><div class='add'>+		pointed = 1; /* successfully pointed to device */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (!pointed) {</div><div class='head'>diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c<br/>index 29671e33a171..62879c218d4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/scan.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/scan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/scan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/scan.c</a></div><div class='hunk'>@@ -256,7 +256,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 		jffs2_dbg(1, "%s(): Skipping %d bytes in nextblock to ensure page alignment\n",</div><div class='ctx'> 			  __func__, skip);</div><div class='del'>-		jffs2_prealloc_raw_node_refs(c, c-&gt;nextblock, 1);</div><div class='add'>+		ret = jffs2_prealloc_raw_node_refs(c, c-&gt;nextblock, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='ctx'> 		jffs2_scan_dirty_space(c, c-&gt;nextblock, skip);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c<br/>index 4fe64519870f..d83372d3e1a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/summary.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/summary.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/summary.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/summary.c</a></div><div class='hunk'>@@ -858,7 +858,10 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)</div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='ctx'> 	jeb = c-&gt;nextblock;</div><div class='del'>-	jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='add'>+	ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!c-&gt;summary-&gt;sum_num || !c-&gt;summary-&gt;sum_list_head) {</div><div class='ctx'> 		JFFS2_WARNING("Empty summary info!!!\n");</div><div class='hunk'>@@ -872,6 +875,8 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)</div><div class='ctx'> 	datasize += padsize;</div><div class='ctx'> </div><div class='ctx'> 	ret = jffs2_sum_write_data(c, jeb, infosize, datasize, padsize);</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c<br/>index f99591a634b4..4545f885c41e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/super.c</a></div><div class='hunk'>@@ -58,6 +58,7 @@ static void jffs2_i_init_once(void *foo)</div><div class='ctx'> 	struct jffs2_inode_info *f = foo;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;f-&gt;sem);</div><div class='add'>+	f-&gt;target = NULL;</div><div class='ctx'> 	inode_init_once(&amp;f-&gt;vfs_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -387,7 +388,7 @@ static int __init init_jffs2_fs(void)</div><div class='ctx'> 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",</div><div class='ctx'> 					     sizeof(struct jffs2_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     jffs2_i_init_once);</div><div class='ctx'> 	if (!jffs2_inode_cachep) {</div><div class='ctx'> 		pr_err("error: Failed to initialise inode cache\n");</div><div class='head'>diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c<br/>index 4061e0ba7010..bb815a002984 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/wbuf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/wbuf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/wbuf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/wbuf.c</a></div><div class='hunk'>@@ -584,7 +584,7 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing to do if not write-buffering the flash. In particular, we shouldn't</div><div class='del'>-	   del_timer() the timer we never initialised. */</div><div class='add'>+	   call timer_delete() on the timer we never initialised. */</div><div class='ctx'> 	if (!jffs2_is_writebuffered(c))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c<br/>index 00224f3a8d6e..defb4162c3d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jffs2/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jffs2/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jffs2/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jffs2/xattr.c</a></div><div class='hunk'>@@ -1110,6 +1110,9 @@ int do_jffs2_setxattr(struct inode *inode, int xprefix, const char *xname,</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	request = PAD(sizeof(struct jffs2_raw_xattr) + strlen(xname) + 1 + size);</div><div class='add'>+	if (request &gt; c-&gt;sector_size - c-&gt;cleanmarker_size)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='ctx'> 	rc = jffs2_reserve_space(c, request, &amp;length,</div><div class='ctx'> 				 ALLOC_NORMAL, JFFS2_SUMMARY_XATTR_SIZE);</div><div class='ctx'> 	if (rc) {</div><div class='head'>diff --git a/fs/jfs/file.c b/fs/jfs/file.c<br/>index 01b6912e60f8..87ad042221e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/file.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@ int jfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_DIRTY_ALL) ||</div><div class='del'>-	    (datasync &amp;&amp; !(inode-&gt;i_state &amp; I_DIRTY_DATASYNC))) {</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_DIRTY_ALL) ||</div><div class='add'>+	    (datasync &amp;&amp; !(inode_state_read_once(inode) &amp; I_DIRTY_DATASYNC))) {</div><div class='ctx'> 		/* Make sure committed changes hit the disk */</div><div class='ctx'> 		jfs_flush_journal(JFS_SBI(inode-&gt;i_sb)-&gt;log, 1);</div><div class='ctx'> 		inode_unlock(inode);</div><div class='hunk'>@@ -44,6 +44,9 @@ static int jfs_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode) &amp;&amp; inode-&gt;i_size &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if ((rc = dquot_file_open(inode, file)))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +146,7 @@ const struct file_operations jfs_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fsync		= jfs_fsync,</div><div class='head'>diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c<br/>index 1a6b5921d17a..4709762713ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/inode.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	ret = diRead(inode);</div><div class='hunk'>@@ -59,9 +59,15 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 			 */</div><div class='ctx'> 			inode-&gt;i_link[inode-&gt;i_size] = '\0';</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='add'>+	} else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode) ||</div><div class='add'>+		   S_ISFIFO(inode-&gt;i_mode) || S_ISSOCK(inode-&gt;i_mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;jfs_file_inode_operations;</div><div class='ctx'> 		init_special_inode(inode, inode-&gt;i_mode, inode-&gt;i_rdev);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_DEBUG "JFS: Invalid file type 0%04o for inode %lu.\n",</div><div class='add'>+		       inode-&gt;i_mode, inode-&gt;i_ino);</div><div class='add'>+		iget_failed(inode);</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='ctx'> 	unlock_new_inode(inode);</div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -145,9 +151,9 @@ void jfs_evict_inode(struct inode *inode)</div><div class='ctx'> 	if (!inode-&gt;i_nlink &amp;&amp; !is_bad_inode(inode)) {</div><div class='ctx'> 		dquot_initialize(inode);</div><div class='ctx'> </div><div class='add'>+		truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> 		if (JFS_IP(inode)-&gt;fileset == FILESYSTEM_I) {</div><div class='ctx'> 			struct inode *ipimap = JFS_SBI(inode-&gt;i_sb)-&gt;ipimap;</div><div class='del'>-			truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='ctx'> </div><div class='ctx'> 			if (test_cflag(COMMIT_Freewmap, inode))</div><div class='ctx'> 				jfs_free_zero_link(inode);</div><div class='hunk'>@@ -290,26 +296,28 @@ static void jfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-				loff_t pos, unsigned len,</div><div class='del'>-				struct page **pagep, void **fsdata)</div><div class='add'>+static int jfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned len,</div><div class='add'>+			   struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = block_write_begin(mapping, pos, len, pagep, jfs_get_block);</div><div class='add'>+	ret = block_write_begin(mapping, pos, len, foliop, jfs_get_block);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		jfs_write_failed(mapping, pos + len);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jfs_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-		loff_t pos, unsigned len, unsigned copied, struct page *page,</div><div class='del'>-		void *fsdata)</div><div class='add'>+static int jfs_write_end(const struct kiocb *iocb,</div><div class='add'>+			 struct address_space *mapping,</div><div class='add'>+			 loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			 struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);</div><div class='add'>+	ret = generic_write_end(iocb, mapping, pos, len, copied, folio, fsdata);</div><div class='ctx'> 	if (ret &lt; len)</div><div class='ctx'> 		jfs_write_failed(mapping, pos + len);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -369,7 +377,7 @@ void jfs_truncate_nolock(struct inode *ip, loff_t length)</div><div class='ctx'> </div><div class='ctx'> 	ASSERT(length &gt;= 0);</div><div class='ctx'> </div><div class='del'>-	if (test_cflag(COMMIT_Nolink, ip)) {</div><div class='add'>+	if (test_cflag(COMMIT_Nolink, ip) || isReadOnly(ip)) {</div><div class='ctx'> 		xtTruncate(0, ip, length, COMMIT_WMAP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c<br/>index f7bd7e8f5be4..563f148be8af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/ioctl.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static long jfs_map_ext2(unsigned long flags, int from)</div><div class='ctx'> 	return mapped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int jfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct jfs_inode_info *jfs_inode = JFS_IP(d_inode(dentry));</div><div class='ctx'> 	unsigned int flags = jfs_inode-&gt;mode2 &amp; JFS_FL_USER_VISIBLE;</div><div class='hunk'>@@ -71,7 +71,7 @@ int jfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int jfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		     struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		     struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct jfs_inode_info *jfs_inode = JFS_IP(inode);</div><div class='head'>diff --git a/fs/jfs/jfs_discard.c b/fs/jfs/jfs_discard.c<br/>index 575cb2ba74fc..4b660296caf3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_discard.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_discard.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_discard.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_discard.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ void jfs_issue_discard(struct inode *ip, u64 blkno, u64 nblocks)</div><div class='ctx'> int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ipbmap = JFS_SBI(ip-&gt;i_sb)-&gt;ipbmap;</div><div class='del'>-	struct bmap *bmp = JFS_SBI(ip-&gt;i_sb)-&gt;bmap;</div><div class='add'>+	struct bmap *bmp;</div><div class='ctx'> 	struct super_block *sb = ipbmap-&gt;i_sb;</div><div class='ctx'> 	int agno, agno_end;</div><div class='ctx'> 	u64 start, end, minlen;</div><div class='hunk'>@@ -83,10 +83,16 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)</div><div class='ctx'> 	if (minlen == 0)</div><div class='ctx'> 		minlen = 1;</div><div class='ctx'> </div><div class='del'>-	if (minlen &gt; bmp-&gt;db_agsize ||</div><div class='add'>+	down_read(&amp;sb-&gt;s_umount);</div><div class='add'>+	bmp = JFS_SBI(ip-&gt;i_sb)-&gt;bmap;</div><div class='add'>+</div><div class='add'>+	if (bmp == NULL ||</div><div class='add'>+	    minlen &gt; bmp-&gt;db_agsize ||</div><div class='ctx'> 	    start &gt;= bmp-&gt;db_mapsize ||</div><div class='del'>-	    range-&gt;len &lt; sb-&gt;s_blocksize)</div><div class='add'>+	    range-&gt;len &lt; sb-&gt;s_blocksize) {</div><div class='add'>+		up_read(&amp;sb-&gt;s_umount);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (end &gt;= bmp-&gt;db_mapsize)</div><div class='ctx'> 		end = bmp-&gt;db_mapsize - 1;</div><div class='hunk'>@@ -100,6 +106,8 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)</div><div class='ctx'> 		trimmed += dbDiscardAG(ip, agno, minlen);</div><div class='ctx'> 		agno++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	up_read(&amp;sb-&gt;s_umount);</div><div class='ctx'> 	range-&gt;len = trimmed &lt;&lt; sb-&gt;s_blocksize_bits;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c<br/>index 8eec84c651bf..cdfa699cd7c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_dmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_dmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_dmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_dmap.c</a></div><div class='hunk'>@@ -178,41 +178,30 @@ int dbMount(struct inode *ipbmap)</div><div class='ctx'> 	dbmp_le = (struct dbmap_disk *) mp-&gt;data;</div><div class='ctx'> 	bmp-&gt;db_mapsize = le64_to_cpu(dbmp_le-&gt;dn_mapsize);</div><div class='ctx'> 	bmp-&gt;db_nfree = le64_to_cpu(dbmp_le-&gt;dn_nfree);</div><div class='del'>-</div><div class='ctx'> 	bmp-&gt;db_l2nbperpage = le32_to_cpu(dbmp_le-&gt;dn_l2nbperpage);</div><div class='del'>-	if (bmp-&gt;db_l2nbperpage &gt; L2PSIZE - L2MINBLOCKSIZE ||</div><div class='del'>-		bmp-&gt;db_l2nbperpage &lt; 0) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_release_metapage;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bmp-&gt;db_numag = le32_to_cpu(dbmp_le-&gt;dn_numag);</div><div class='del'>-	if (!bmp-&gt;db_numag) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_release_metapage;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bmp-&gt;db_maxlevel = le32_to_cpu(dbmp_le-&gt;dn_maxlevel);</div><div class='ctx'> 	bmp-&gt;db_maxag = le32_to_cpu(dbmp_le-&gt;dn_maxag);</div><div class='ctx'> 	bmp-&gt;db_agpref = le32_to_cpu(dbmp_le-&gt;dn_agpref);</div><div class='del'>-	if (bmp-&gt;db_maxag &gt;= MAXAG || bmp-&gt;db_maxag &lt; 0 ||</div><div class='del'>-		bmp-&gt;db_agpref &gt;= MAXAG || bmp-&gt;db_agpref &lt; 0) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_release_metapage;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bmp-&gt;db_aglevel = le32_to_cpu(dbmp_le-&gt;dn_aglevel);</div><div class='ctx'> 	bmp-&gt;db_agheight = le32_to_cpu(dbmp_le-&gt;dn_agheight);</div><div class='ctx'> 	bmp-&gt;db_agwidth = le32_to_cpu(dbmp_le-&gt;dn_agwidth);</div><div class='ctx'> 	bmp-&gt;db_agstart = le32_to_cpu(dbmp_le-&gt;dn_agstart);</div><div class='ctx'> 	bmp-&gt;db_agl2size = le32_to_cpu(dbmp_le-&gt;dn_agl2size);</div><div class='del'>-	if (bmp-&gt;db_agl2size &gt; L2MAXL2SIZE - L2MAXAG ||</div><div class='del'>-	    bmp-&gt;db_agl2size &lt; 0) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_release_metapage;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (((bmp-&gt;db_mapsize - 1) &gt;&gt; bmp-&gt;db_agl2size) &gt; MAXAG) {</div><div class='add'>+	if ((bmp-&gt;db_l2nbperpage &gt; L2PSIZE - L2MINBLOCKSIZE) ||</div><div class='add'>+	    (bmp-&gt;db_l2nbperpage &lt; 0) ||</div><div class='add'>+	    !bmp-&gt;db_numag || (bmp-&gt;db_numag &gt; MAXAG) ||</div><div class='add'>+	    (bmp-&gt;db_maxag &gt;= MAXAG) || (bmp-&gt;db_maxag &lt; 0) ||</div><div class='add'>+	    (bmp-&gt;db_agpref &gt;= MAXAG) || (bmp-&gt;db_agpref &lt; 0) ||</div><div class='add'>+	    (bmp-&gt;db_agheight &lt; 0) || (bmp-&gt;db_agheight &gt; (L2LPERCTL &gt;&gt; 1)) ||</div><div class='add'>+	    (bmp-&gt;db_agwidth &lt; 1) || (bmp-&gt;db_agwidth &gt; (LPERCTL / MAXAG)) ||</div><div class='add'>+	    (bmp-&gt;db_agwidth &gt; (1 &lt;&lt; (L2LPERCTL - (bmp-&gt;db_agheight &lt;&lt; 1)))) ||</div><div class='add'>+	    (bmp-&gt;db_agstart &lt; 0) ||</div><div class='add'>+	    (bmp-&gt;db_agstart &gt; (CTLTREESIZE - 1 - bmp-&gt;db_agwidth * (MAXAG - 1))) ||</div><div class='add'>+	    (bmp-&gt;db_agl2size &gt; L2MAXL2SIZE - L2MAXAG) ||</div><div class='add'>+	    (bmp-&gt;db_agl2size &lt; 0) ||</div><div class='add'>+	    ((bmp-&gt;db_mapsize - 1) &gt;&gt; bmp-&gt;db_agl2size) &gt; MAXAG) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_release_metapage;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -652,7 +641,7 @@ int dbNextAG(struct inode *ipbmap)</div><div class='ctx'> 	 * average free space.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0 ; i &lt; bmp-&gt;db_numag; i++, agpref++) {</div><div class='del'>-		if (agpref == bmp-&gt;db_numag)</div><div class='add'>+		if (agpref &gt;= bmp-&gt;db_numag)</div><div class='ctx'> 			agpref = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;bmp-&gt;db_active[agpref]))</div><div class='hunk'>@@ -1400,6 +1389,12 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)</div><div class='ctx'> 	    (1 &lt;&lt; (L2LPERCTL - (bmp-&gt;db_agheight &lt;&lt; 1))) / bmp-&gt;db_agwidth;</div><div class='ctx'> 	ti = bmp-&gt;db_agstart + bmp-&gt;db_agwidth * (agno &amp; (agperlev - 1));</div><div class='ctx'> </div><div class='add'>+	if (ti &lt; 0 || ti &gt;= le32_to_cpu(dcp-&gt;nleafs)) {</div><div class='add'>+		jfs_error(bmp-&gt;db_ipbmap-&gt;i_sb, "Corrupt dmapctl page\n");</div><div class='add'>+		release_metapage(mp);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* dmap control page trees fan-out by 4 and a single allocation</div><div class='ctx'> 	 * group may be described by 1 or 2 subtrees within the ag level</div><div class='ctx'> 	 * dmap control page, depending upon the ag size. examine the ag's</div><div class='hunk'>@@ -1626,6 +1621,8 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen)</div><div class='ctx'> 		} else if (rc == -ENOSPC) {</div><div class='ctx'> 			/* search for next smaller log2 block */</div><div class='ctx'> 			l2nb = BLKSTOL2(nblocks) - 1;</div><div class='add'>+			if (unlikely(l2nb &lt; 0))</div><div class='add'>+				break;</div><div class='ctx'> 			nblocks = 1LL &lt;&lt; l2nb;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Trim any already allocated blocks */</div><div class='hunk'>@@ -1818,6 +1815,11 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		dp = (struct dmap *) mp-&gt;data;</div><div class='ctx'> </div><div class='add'>+		if (dp-&gt;tree.budmin &lt; 0) {</div><div class='add'>+			release_metapage(mp);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* try to allocate the blocks.</div><div class='ctx'> 		 */</div><div class='ctx'> 		rc = dbAllocDmapLev(bmp, dp, (int) nblocks, l2nb, results);</div><div class='hunk'>@@ -2763,9 +2765,7 @@ static int dbBackSplit(dmtree_t *tp, int leafno, bool is_ctl)</div><div class='ctx'>  *	leafno	- the number of the leaf to be updated.</div><div class='ctx'>  *	newval	- the new value for the leaf.</div><div class='ctx'>  *</div><div class='del'>- * RETURN VALUES:</div><div class='del'>- *  0		- success</div><div class='del'>- *	-EIO	- i/o error</div><div class='add'>+ * RETURN VALUES: none</div><div class='ctx'>  */</div><div class='ctx'> static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)</div><div class='ctx'> {</div><div class='hunk'>@@ -2792,10 +2792,6 @@ static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)</div><div class='ctx'> 		 * get the buddy size (number of words covered) of</div><div class='ctx'> 		 * the new value.</div><div class='ctx'> 		 */</div><div class='del'>-</div><div class='del'>-		if ((newval - tp-&gt;dmt_budmin) &gt; BUDMIN)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='ctx'> 		budsz = BUDSIZE(newval, tp-&gt;dmt_budmin);</div><div class='ctx'> </div><div class='ctx'> 		/* try to join.</div><div class='hunk'>@@ -2892,6 +2888,9 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl)</div><div class='ctx'> 	/* bubble the new value up the tree as required.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (k = 0; k &lt; le32_to_cpu(tp-&gt;dmt_height); k++) {</div><div class='add'>+		if (lp == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		/* get the index of the first leaf of the 4 leaf</div><div class='ctx'> 		 * group containing the specified leaf (leafno).</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2948,9 +2947,10 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl)</div><div class='ctx'> static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	int ti, n = 0, k, x = 0;</div><div class='del'>-	int max_size;</div><div class='add'>+	int max_size, max_idx;</div><div class='ctx'> </div><div class='ctx'> 	max_size = is_ctl ? CTLTREESIZE : TREESIZE;</div><div class='add'>+	max_idx = is_ctl ? LPERCTL : LPERDMAP;</div><div class='ctx'> </div><div class='ctx'> 	/* first check the root of the tree to see if there is</div><div class='ctx'> 	 * sufficient free space.</div><div class='hunk'>@@ -2982,6 +2982,8 @@ static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)</div><div class='ctx'> 		 */</div><div class='ctx'> 		assert(n &lt; 4);</div><div class='ctx'> 	}</div><div class='add'>+	if (le32_to_cpu(tp-&gt;dmt_leafidx) &gt;= max_idx)</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	/* set the return to the leftmost leaf describing sufficient</div><div class='ctx'> 	 * free space.</div><div class='hunk'>@@ -3026,7 +3028,7 @@ static int dbFindBits(u32 word, int l2nb)</div><div class='ctx'> </div><div class='ctx'> 	/* scan the word for nb free bits at nb alignments.</div><div class='ctx'> 	 */</div><div class='del'>-	for (bitno = 0; mask != 0; bitno += nb, mask &gt;&gt;= nb) {</div><div class='add'>+	for (bitno = 0; mask != 0; bitno += nb, mask = (mask &gt;&gt; nb)) {</div><div class='ctx'> 		if ((mask &amp; word) == mask)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3398,7 +3400,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno,	s64 nblocks)</div><div class='ctx'> 	oldl2agsize = bmp-&gt;db_agl2size;</div><div class='ctx'> </div><div class='ctx'> 	bmp-&gt;db_agl2size = l2agsize;</div><div class='del'>-	bmp-&gt;db_agsize = 1 &lt;&lt; l2agsize;</div><div class='add'>+	bmp-&gt;db_agsize = (s64)1 &lt;&lt; l2agsize;</div><div class='ctx'> </div><div class='ctx'> 	/* compute new number of AG */</div><div class='ctx'> 	agno = bmp-&gt;db_numag;</div><div class='hunk'>@@ -3661,8 +3663,8 @@ void dbFinalizeBmap(struct inode *ipbmap)</div><div class='ctx'> 	 * system size is not a multiple of the group size).</div><div class='ctx'> 	 */</div><div class='ctx'> 	inactfree = (inactags &amp;&amp; ag_rem) ?</div><div class='del'>-	    ((inactags - 1) &lt;&lt; bmp-&gt;db_agl2size) + ag_rem</div><div class='del'>-	    : inactags &lt;&lt; bmp-&gt;db_agl2size;</div><div class='add'>+	    (((s64)inactags - 1) &lt;&lt; bmp-&gt;db_agl2size) + ag_rem</div><div class='add'>+	    : ((s64)inactags &lt;&lt; bmp-&gt;db_agl2size);</div><div class='ctx'> </div><div class='ctx'> 	/* determine how many free blocks are in the active</div><div class='ctx'> 	 * allocation groups plus the average number of free blocks</div><div class='head'>diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c<br/>index 031d8f570f58..0ab83bb7bbdf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_dtree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_dtree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_dtree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_dtree.c</a></div><div class='hunk'>@@ -117,7 +117,8 @@ do {									\</div><div class='ctx'> 	if (!(RC)) {							\</div><div class='ctx'> 		if (((P)-&gt;header.nextindex &gt;				\</div><div class='ctx'> 		     (((BN) == 0) ? DTROOTMAXSLOT : (P)-&gt;header.maxslot)) || \</div><div class='del'>-		    ((BN) &amp;&amp; ((P)-&gt;header.maxslot &gt; DTPAGEMAXSLOT))) {	\</div><div class='add'>+		    ((BN) &amp;&amp; (((P)-&gt;header.maxslot &gt; DTPAGEMAXSLOT) ||	\</div><div class='add'>+		    ((P)-&gt;header.stblindex &gt;= DTPAGEMAXSLOT)))) {	\</div><div class='ctx'> 			BT_PUTPAGE(MP);					\</div><div class='ctx'> 			jfs_error((IP)-&gt;i_sb,				\</div><div class='ctx'> 				  "DT_GETPAGE: dtree page corrupt\n");	\</div><div class='hunk'>@@ -834,6 +835,8 @@ int dtInsert(tid_t tid, struct inode *ip,</div><div class='ctx'> 	 * the full page.</div><div class='ctx'> 	 */</div><div class='ctx'> 	DT_GETSEARCH(ip, btstack-&gt;top, bn, mp, p, index);</div><div class='add'>+	if (p-&gt;header.freelist == 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	insert entry for new key</div><div class='hunk'>@@ -2610,7 +2613,7 @@ void dtInitRoot(tid_t tid, struct inode *ip, u32 idotdot)</div><div class='ctx'>  *	     fsck.jfs should really fix this, but it currently does not.</div><div class='ctx'>  *	     Called from jfs_readdir when bad index is detected.</div><div class='ctx'>  */</div><div class='del'>-static void add_missing_indices(struct inode *inode, s64 bn)</div><div class='add'>+static int add_missing_indices(struct inode *inode, s64 bn)</div><div class='ctx'> {</div><div class='ctx'> 	struct ldtentry *d;</div><div class='ctx'> 	struct dt_lock *dtlck;</div><div class='hunk'>@@ -2619,7 +2622,7 @@ static void add_missing_indices(struct inode *inode, s64 bn)</div><div class='ctx'> 	struct lv *lv;</div><div class='ctx'> 	struct metapage *mp;</div><div class='ctx'> 	dtpage_t *p;</div><div class='del'>-	int rc;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> 	s8 *stbl;</div><div class='ctx'> 	tid_t tid;</div><div class='ctx'> 	struct tlock *tlck;</div><div class='hunk'>@@ -2644,6 +2647,16 @@ static void add_missing_indices(struct inode *inode, s64 bn)</div><div class='ctx'> </div><div class='ctx'> 	stbl = DT_GETSTBL(p);</div><div class='ctx'> 	for (i = 0; i &lt; p-&gt;header.nextindex; i++) {</div><div class='add'>+		if (stbl[i] &lt; 0) {</div><div class='add'>+			jfs_err("jfs: add_missing_indices: Invalid stbl[%d] = %d for inode %ld, block = %lld",</div><div class='add'>+				i, stbl[i], (long)inode-&gt;i_ino, (long long)bn);</div><div class='add'>+			rc = -EIO;</div><div class='add'>+</div><div class='add'>+			DT_PUTPAGE(mp);</div><div class='add'>+			txAbort(tid, 0);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		d = (struct ldtentry *) &amp;p-&gt;slot[stbl[i]];</div><div class='ctx'> 		index = le32_to_cpu(d-&gt;index);</div><div class='ctx'> 		if ((index &lt; 2) || (index &gt;= JFS_IP(inode)-&gt;next_index)) {</div><div class='hunk'>@@ -2661,6 +2674,7 @@ static void add_missing_indices(struct inode *inode, s64 bn)</div><div class='ctx'> 	(void) txCommit(tid, 1, &amp;inode, 0);</div><div class='ctx'> end:</div><div class='ctx'> 	txEnd(tid);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2889,6 +2903,14 @@ int jfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		stbl = DT_GETSTBL(p);</div><div class='ctx'> </div><div class='ctx'> 		for (i = index; i &lt; p-&gt;header.nextindex; i++) {</div><div class='add'>+			if (stbl[i] &lt; 0 || stbl[i] &gt;= DTPAGEMAXSLOT) {</div><div class='add'>+				jfs_err("JFS: Invalid stbl[%d] = %d for inode %ld, block = %lld",</div><div class='add'>+					i, stbl[i], (long)ip-&gt;i_ino, (long long)bn);</div><div class='add'>+				free_page(dirent_buf);</div><div class='add'>+				DT_PUTPAGE(mp);</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			d = (struct ldtentry *) &amp; p-&gt;slot[stbl[i]];</div><div class='ctx'> </div><div class='ctx'> 			if (((long) jfs_dirent + d-&gt;namlen + 1) &gt;</div><div class='hunk'>@@ -3006,7 +3028,8 @@ skip_one:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (fix_page) {</div><div class='del'>-			add_missing_indices(ip, bn);</div><div class='add'>+			if ((rc = add_missing_indices(ip, bn)))</div><div class='add'>+				goto out;</div><div class='ctx'> 			page_fixed = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3084,6 +3107,13 @@ static int dtReadFirst(struct inode *ip, struct btstack * btstack)</div><div class='ctx'> </div><div class='ctx'> 		/* get the leftmost entry */</div><div class='ctx'> 		stbl = DT_GETSTBL(p);</div><div class='add'>+</div><div class='add'>+		if (stbl[0] &lt; 0 || stbl[0] &gt;= DTPAGEMAXSLOT) {</div><div class='add'>+			DT_PUTPAGE(mp);</div><div class='add'>+			jfs_error(ip-&gt;i_sb, "stbl[0] out of bound\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		xd = (pxd_t *) &amp; p-&gt;slot[stbl[0]];</div><div class='ctx'> </div><div class='ctx'> 		/* get the child page block address */</div><div class='head'>diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c<br/>index 63d21822d309..46529bcc8297 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_extent.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_extent.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_extent.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_extent.c</a></div><div class='hunk'>@@ -74,6 +74,11 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int xflag;</div><div class='ctx'> </div><div class='add'>+	if (isReadOnly(ip)) {</div><div class='add'>+		jfs_error(ip-&gt;i_sb, "read-only filesystem\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* This blocks if we are low on resources */</div><div class='ctx'> 	txBeginAnon(ip-&gt;i_sb);</div><div class='ctx'> </div><div class='hunk'>@@ -253,6 +258,11 @@ int extRecord(struct inode *ip, xad_t * xp)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (isReadOnly(ip)) {</div><div class='add'>+		jfs_error(ip-&gt;i_sb, "read-only filesystem\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	txBeginAnon(ip-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;JFS_IP(ip)-&gt;commit_mutex);</div><div class='head'>diff --git a/fs/jfs/jfs_filsys.h b/fs/jfs/jfs_filsys.h<br/>index 33ef13a0b110..8794281f8ffd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_filsys.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_filsys.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_filsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_filsys.h</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #define JFS_ERR_REMOUNT_RO 0x00000002	/* remount read-only */</div><div class='ctx'> #define JFS_ERR_CONTINUE   0x00000004	/* continue */</div><div class='ctx'> #define JFS_ERR_PANIC      0x00000008	/* panic */</div><div class='add'>+#define JFS_ERR_MASK	   (JFS_ERR_REMOUNT_RO|JFS_ERR_CONTINUE|JFS_ERR_PANIC)</div><div class='ctx'> </div><div class='ctx'> /* Quota support */</div><div class='ctx'> #define	JFS_USRQUOTA	0x00000010</div><div class='head'>diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c<br/>index 2ec35889ad24..ecb8e05b8b84 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_imap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_imap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_imap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_imap.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ int diMount(struct inode *ipimap)</div><div class='ctx'> 	 * allocate/initialize the in-memory inode map control structure</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* allocate the in-memory inode map control structure. */</div><div class='del'>-	imap = kmalloc(sizeof(struct inomap), GFP_KERNEL);</div><div class='add'>+	imap = kzalloc(sizeof(struct inomap), GFP_KERNEL);</div><div class='ctx'> 	if (imap == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +290,7 @@ int diSync(struct inode *ipimap)</div><div class='ctx'> int diRead(struct inode *ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct jfs_sb_info *sbi = JFS_SBI(ip-&gt;i_sb);</div><div class='del'>-	int iagno, ino, extno, rc;</div><div class='add'>+	int iagno, ino, extno, rc, agno;</div><div class='ctx'> 	struct inode *ipimap;</div><div class='ctx'> 	struct dinode *dp;</div><div class='ctx'> 	struct iag *iagp;</div><div class='hunk'>@@ -339,8 +339,11 @@ int diRead(struct inode *ip)</div><div class='ctx'> </div><div class='ctx'> 	/* get the ag for the iag */</div><div class='ctx'> 	agstart = le64_to_cpu(iagp-&gt;agstart);</div><div class='add'>+	agno = BLKTOAG(agstart, JFS_SBI(ip-&gt;i_sb));</div><div class='ctx'> </div><div class='ctx'> 	release_metapage(mp);</div><div class='add'>+	if (agno &gt;= MAXAG || agno &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	rel_inode = (ino &amp; (INOSPERPAGE - 1));</div><div class='ctx'> 	pageno = blkno &gt;&gt; sbi-&gt;l2nbperpage;</div><div class='hunk'>@@ -453,7 +456,7 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary)</div><div class='ctx'> 	dp += inum % 8;		/* 8 inodes per 4K page */</div><div class='ctx'> </div><div class='ctx'> 	/* copy on-disk inode to in-memory inode */</div><div class='del'>-	if ((copy_from_dinode(dp, ip)) != 0) {</div><div class='add'>+	if ((copy_from_dinode(dp, ip) != 0) || (ip-&gt;i_nlink == 0)) {</div><div class='ctx'> 		/* handle bad return by returning NULL for ip */</div><div class='ctx'> 		set_nlink(ip, 1);	/* Don't want iput() deleting it */</div><div class='ctx'> 		iput(ip);</div><div class='hunk'>@@ -1357,7 +1360,7 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip)</div><div class='ctx'> 	/* get the ag number of this iag */</div><div class='ctx'> 	agno = BLKTOAG(JFS_IP(pip)-&gt;agstart, JFS_SBI(pip-&gt;i_sb));</div><div class='ctx'> 	dn_numag = JFS_SBI(pip-&gt;i_sb)-&gt;bmap-&gt;db_numag;</div><div class='del'>-	if (agno &lt; 0 || agno &gt; dn_numag)</div><div class='add'>+	if (agno &lt; 0 || agno &gt; dn_numag || agno &gt;= MAXAG)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;JFS_SBI(pip-&gt;i_sb)-&gt;bmap-&gt;db_active[agno])) {</div><div class='hunk'>@@ -3026,14 +3029,23 @@ static void duplicateIXtree(struct super_block *sb, s64 blkno,</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES:</div><div class='ctx'>  *	0	- success</div><div class='del'>- *	-ENOMEM	- insufficient memory</div><div class='add'>+ *	-EINVAL	- unexpected inode type</div><div class='ctx'>  */</div><div class='ctx'> static int copy_from_dinode(struct dinode * dip, struct inode *ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct jfs_inode_info *jfs_ip = JFS_IP(ip);</div><div class='ctx'> 	struct jfs_sb_info *sbi = JFS_SBI(ip-&gt;i_sb);</div><div class='add'>+	int fileset = le32_to_cpu(dip-&gt;di_fileset);</div><div class='add'>+</div><div class='add'>+	switch (fileset) {</div><div class='add'>+	case AGGR_RESERVED_I: case AGGREGATE_I: case BMAP_I:</div><div class='add'>+	case LOG_I: case BADBLOCK_I: case FILESYSTEM_I:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	jfs_ip-&gt;fileset = le32_to_cpu(dip-&gt;di_fileset);</div><div class='add'>+	jfs_ip-&gt;fileset = fileset;</div><div class='ctx'> 	jfs_ip-&gt;mode2 = le32_to_cpu(dip-&gt;di_mode);</div><div class='ctx'> 	jfs_set_inode_flags(ip);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h<br/>index dd4264aa9bed..5aaafedb8fbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_incore.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_incore.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_incore.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_incore.h</a></div><div class='hunk'>@@ -76,14 +76,14 @@ struct jfs_inode_info {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			unchar _unused[16];	/* 16: */</div><div class='ctx'> 			dxd_t _dxd;		/* 16: */</div><div class='del'>-			/* _inline may overflow into _inline_ea when needed */</div><div class='add'>+			/* _inline_sym may overflow into _inline_ea when needed */</div><div class='ctx'> 			/* _inline_ea may overlay the last part of</div><div class='ctx'> 			 * file._xtroot if maxentry = XTROOTINITSLOT</div><div class='ctx'> 			 */</div><div class='ctx'> 			union {</div><div class='ctx'> 				struct {</div><div class='ctx'> 					/* 128: inline symlink */</div><div class='del'>-					unchar _inline[128];</div><div class='add'>+					unchar _inline_sym[128];</div><div class='ctx'> 					/* 128: inline extended attr */</div><div class='ctx'> 					unchar _inline_ea[128];</div><div class='ctx'> 				};</div><div class='hunk'>@@ -92,7 +92,7 @@ struct jfs_inode_info {</div><div class='ctx'> 		} link;</div><div class='ctx'> 	} u;</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-	struct dquot *i_dquot[MAXQUOTAS];</div><div class='add'>+	struct dquot __rcu *i_dquot[MAXQUOTAS];</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 dev;	/* will die when we get wide dev_t */</div><div class='ctx'> 	struct inode	vfs_inode;</div><div class='hunk'>@@ -101,7 +101,7 @@ struct jfs_inode_info {</div><div class='ctx'> #define i_imap u.file._imap</div><div class='ctx'> #define i_dirtable u.dir._table</div><div class='ctx'> #define i_dtroot u.dir._dtroot</div><div class='del'>-#define i_inline u.link._inline</div><div class='add'>+#define i_inline u.link._inline_sym</div><div class='ctx'> #define i_inline_ea u.link._inline_ea</div><div class='ctx'> #define i_inline_all u.link._inline_all</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h<br/>index ea80661597ac..2c6c81c8cb9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_inode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_inode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_inode.h</a></div><div class='hunk'>@@ -9,9 +9,9 @@ struct fid;</div><div class='ctx'> </div><div class='ctx'> extern struct inode *ialloc(struct inode *, umode_t);</div><div class='ctx'> extern int jfs_fsync(struct file *, loff_t, loff_t, int);</div><div class='del'>-extern int jfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+extern int jfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> extern int jfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-			    struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+			    struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> extern long jfs_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> extern struct inode *jfs_iget(struct super_block *, unsigned long);</div><div class='ctx'> extern int jfs_commit_inode(struct inode *, int);</div><div class='head'>diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c<br/>index 73389c68e251..b343c5ea1159 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_logmgr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_logmgr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_logmgr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_logmgr.c</a></div><div class='hunk'>@@ -1141,7 +1141,7 @@ journal_found:</div><div class='ctx'> 	lbmLogShutdown(log);</div><div class='ctx'> </div><div class='ctx'>       close:		/* close external log device */</div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> </div><div class='ctx'>       free:		/* free log descriptor */</div><div class='ctx'> 	mutex_unlock(&amp;jfs_log_mutex);</div><div class='hunk'>@@ -1199,7 +1199,6 @@ static int open_dummy_log(struct super_block *sb)</div><div class='ctx'> 		init_waitqueue_head(&amp;dummy_log-&gt;syncwait);</div><div class='ctx'> 		dummy_log-&gt;no_integrity = 1;</div><div class='ctx'> 		/* Make up some stuff */</div><div class='del'>-		dummy_log-&gt;base = 0;</div><div class='ctx'> 		dummy_log-&gt;size = 1024;</div><div class='ctx'> 		rc = lmLogInit(dummy_log);</div><div class='ctx'> 		if (rc) {</div><div class='hunk'>@@ -1485,7 +1484,7 @@ int lmLogClose(struct super_block *sb)</div><div class='ctx'> 	bdev_file = log-&gt;bdev_file;</div><div class='ctx'> 	rc = lmLogShutdown(log);</div><div class='ctx'> </div><div class='del'>-	fput(bdev_file);</div><div class='add'>+	bdev_fput(bdev_file);</div><div class='ctx'> </div><div class='ctx'> 	kfree(log);</div><div class='ctx'> </div><div class='hunk'>@@ -1600,7 +1599,7 @@ void jfs_flush_journal(struct jfs_log *log, int wait)</div><div class='ctx'> 					       mp, sizeof(struct metapage), 0);</div><div class='ctx'> 				print_hex_dump(KERN_ERR, "page: ",</div><div class='ctx'> 					       DUMP_PREFIX_ADDRESS, 16,</div><div class='del'>-					       sizeof(long), mp-&gt;page,</div><div class='add'>+					       sizeof(long), mp-&gt;folio,</div><div class='ctx'> 					       sizeof(struct page), 0);</div><div class='ctx'> 			} else</div><div class='ctx'> 				print_hex_dump(KERN_ERR, "tblock:",</div><div class='head'>diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c<br/>index 961569c11159..871cf4fb3636 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_metapage.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_metapage.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_metapage.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_metapage.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *   Portions Copyright (C) Christoph Hellwig, 2001-2002</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -14,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/mempool.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='add'>+#include &lt;linux/migrate.h&gt;</div><div class='ctx'> #include "jfs_incore.h"</div><div class='ctx'> #include "jfs_superblock.h"</div><div class='ctx'> #include "jfs_filsys.h"</div><div class='hunk'>@@ -46,9 +48,9 @@ static inline void __lock_metapage(struct metapage *mp)</div><div class='ctx'> 	do {</div><div class='ctx'> 		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 		if (metapage_locked(mp)) {</div><div class='del'>-			unlock_page(mp-&gt;page);</div><div class='add'>+			folio_unlock(mp-&gt;folio);</div><div class='ctx'> 			io_schedule();</div><div class='del'>-			lock_page(mp-&gt;page);</div><div class='add'>+			folio_lock(mp-&gt;folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (trylock_metapage(mp));</div><div class='ctx'> 	__set_current_state(TASK_RUNNING);</div><div class='hunk'>@@ -56,7 +58,7 @@ static inline void __lock_metapage(struct metapage *mp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Must have mp-&gt;page locked</div><div class='add'>+ * Must have mp-&gt;folio locked</div><div class='ctx'>  */</div><div class='ctx'> static inline void lock_metapage(struct metapage *mp)</div><div class='ctx'> {</div><div class='hunk'>@@ -75,36 +77,36 @@ static mempool_t *metapage_mempool;</div><div class='ctx'> struct meta_anchor {</div><div class='ctx'> 	int mp_count;</div><div class='ctx'> 	atomic_t io_count;</div><div class='add'>+	blk_status_t status;</div><div class='ctx'> 	struct metapage *mp[MPS_PER_PAGE];</div><div class='ctx'> };</div><div class='del'>-#define mp_anchor(page) ((struct meta_anchor *)page_private(page))</div><div class='ctx'> </div><div class='del'>-static inline struct metapage *page_to_mp(struct page *page, int offset)</div><div class='add'>+static inline struct metapage *folio_to_mp(struct folio *folio, int offset)</div><div class='ctx'> {</div><div class='del'>-	if (!PagePrivate(page))</div><div class='add'>+	struct meta_anchor *anchor = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (!anchor)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	return mp_anchor(page)-&gt;mp[offset &gt;&gt; L2PSIZE];</div><div class='add'>+	return anchor-&gt;mp[offset &gt;&gt; L2PSIZE];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int insert_metapage(struct page *page, struct metapage *mp)</div><div class='add'>+static inline int insert_metapage(struct folio *folio, struct metapage *mp)</div><div class='ctx'> {</div><div class='ctx'> 	struct meta_anchor *a;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int l2mp_blocks;	/* log2 blocks per metapage */</div><div class='ctx'> </div><div class='del'>-	if (PagePrivate(page))</div><div class='del'>-		a = mp_anchor(page);</div><div class='del'>-	else {</div><div class='add'>+	a = folio-&gt;private;</div><div class='add'>+	if (!a) {</div><div class='ctx'> 		a = kzalloc(sizeof(struct meta_anchor), GFP_NOFS);</div><div class='ctx'> 		if (!a)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		set_page_private(page, (unsigned long)a);</div><div class='del'>-		SetPagePrivate(page);</div><div class='del'>-		kmap(page);</div><div class='add'>+		folio_attach_private(folio, a);</div><div class='add'>+		kmap(&amp;folio-&gt;page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mp) {</div><div class='del'>-		l2mp_blocks = L2PSIZE - page-&gt;mapping-&gt;host-&gt;i_blkbits;</div><div class='add'>+		l2mp_blocks = L2PSIZE - folio-&gt;mapping-&gt;host-&gt;i_blkbits;</div><div class='ctx'> 		index = (mp-&gt;index &gt;&gt; l2mp_blocks) &amp; (MPS_PER_PAGE - 1);</div><div class='ctx'> 		a-&gt;mp_count++;</div><div class='ctx'> 		a-&gt;mp[index] = mp;</div><div class='hunk'>@@ -113,10 +115,10 @@ static inline int insert_metapage(struct page *page, struct metapage *mp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void remove_metapage(struct page *page, struct metapage *mp)</div><div class='add'>+static inline void remove_metapage(struct folio *folio, struct metapage *mp)</div><div class='ctx'> {</div><div class='del'>-	struct meta_anchor *a = mp_anchor(page);</div><div class='del'>-	int l2mp_blocks = L2PSIZE - page-&gt;mapping-&gt;host-&gt;i_blkbits;</div><div class='add'>+	struct meta_anchor *a = folio-&gt;private;</div><div class='add'>+	int l2mp_blocks = L2PSIZE - folio-&gt;mapping-&gt;host-&gt;i_blkbits;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='ctx'> 	index = (mp-&gt;index &gt;&gt; l2mp_blocks) &amp; (MPS_PER_PAGE - 1);</div><div class='hunk'>@@ -126,48 +128,134 @@ static inline void remove_metapage(struct page *page, struct metapage *mp)</div><div class='ctx'> 	a-&gt;mp[index] = NULL;</div><div class='ctx'> 	if (--a-&gt;mp_count == 0) {</div><div class='ctx'> 		kfree(a);</div><div class='del'>-		set_page_private(page, 0);</div><div class='del'>-		ClearPagePrivate(page);</div><div class='del'>-		kunmap(page);</div><div class='add'>+		folio_detach_private(folio);</div><div class='add'>+		kunmap(&amp;folio-&gt;page);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void inc_io(struct page *page)</div><div class='add'>+static inline void inc_io(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	atomic_inc(&amp;mp_anchor(page)-&gt;io_count);</div><div class='add'>+	struct meta_anchor *anchor = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;anchor-&gt;io_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void dec_io(struct page *page, void (*handler) (struct page *))</div><div class='add'>+static inline void dec_io(struct folio *folio, blk_status_t status,</div><div class='add'>+		void (*handler)(struct folio *, blk_status_t))</div><div class='ctx'> {</div><div class='del'>-	if (atomic_dec_and_test(&amp;mp_anchor(page)-&gt;io_count))</div><div class='del'>-		handler(page);</div><div class='add'>+	struct meta_anchor *anchor = folio-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (anchor-&gt;status == BLK_STS_OK)</div><div class='add'>+		anchor-&gt;status = status;</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;anchor-&gt;io_count))</div><div class='add'>+		handler(folio, anchor-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+static int __metapage_migrate_folio(struct address_space *mapping,</div><div class='add'>+				    struct folio *dst, struct folio *src,</div><div class='add'>+				    enum migrate_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct meta_anchor *src_anchor = src-&gt;private;</div><div class='add'>+	struct metapage *mps[MPS_PER_PAGE] = {0};</div><div class='add'>+	struct metapage *mp;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MPS_PER_PAGE; i++) {</div><div class='add'>+		mp = src_anchor-&gt;mp[i];</div><div class='add'>+		if (mp &amp;&amp; metapage_locked(mp))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = filemap_migrate_folio(mapping, dst, src, mode);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MPS_PER_PAGE; i++) {</div><div class='add'>+		mp = src_anchor-&gt;mp[i];</div><div class='add'>+		if (!mp)</div><div class='add'>+			continue;</div><div class='add'>+		if (unlikely(insert_metapage(dst, mp))) {</div><div class='add'>+			/* If error, roll-back previosly inserted pages */</div><div class='add'>+			for (int j = 0 ; j &lt; i; j++) {</div><div class='add'>+				if (mps[j])</div><div class='add'>+					remove_metapage(dst, mps[j]);</div><div class='add'>+			}</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+		mps[i] = mp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update the metapage and remove it from src */</div><div class='add'>+	for (i = 0; i &lt; MPS_PER_PAGE; i++) {</div><div class='add'>+		mp = mps[i];</div><div class='add'>+		if (mp) {</div><div class='add'>+			int page_offset = mp-&gt;data - folio_address(src);</div><div class='add'>+</div><div class='add'>+			mp-&gt;data = folio_address(dst) + page_offset;</div><div class='add'>+			mp-&gt;folio = dst;</div><div class='add'>+			remove_metapage(src, mp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif	/* CONFIG_MIGRATION */</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-static inline struct metapage *page_to_mp(struct page *page, int offset)</div><div class='add'>+</div><div class='add'>+static inline struct metapage *folio_to_mp(struct folio *folio, int offset)</div><div class='ctx'> {</div><div class='del'>-	return PagePrivate(page) ? (struct metapage *)page_private(page) : NULL;</div><div class='add'>+	return folio-&gt;private;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int insert_metapage(struct page *page, struct metapage *mp)</div><div class='add'>+static inline int insert_metapage(struct folio *folio, struct metapage *mp)</div><div class='ctx'> {</div><div class='ctx'> 	if (mp) {</div><div class='del'>-		set_page_private(page, (unsigned long)mp);</div><div class='del'>-		SetPagePrivate(page);</div><div class='del'>-		kmap(page);</div><div class='add'>+		folio_attach_private(folio, mp);</div><div class='add'>+		kmap(&amp;folio-&gt;page);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void remove_metapage(struct page *page, struct metapage *mp)</div><div class='add'>+static inline void remove_metapage(struct folio *folio, struct metapage *mp)</div><div class='ctx'> {</div><div class='del'>-	set_page_private(page, 0);</div><div class='del'>-	ClearPagePrivate(page);</div><div class='del'>-	kunmap(page);</div><div class='add'>+	folio_detach_private(folio);</div><div class='add'>+	kunmap(&amp;folio-&gt;page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define inc_io(page) do {} while(0)</div><div class='del'>-#define dec_io(page, handler) handler(page)</div><div class='add'>+#define inc_io(folio) do {} while(0)</div><div class='add'>+#define dec_io(folio, status, handler) handler(folio, status)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+static int __metapage_migrate_folio(struct address_space *mapping,</div><div class='add'>+				    struct folio *dst, struct folio *src,</div><div class='add'>+				    enum migrate_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct metapage *mp;</div><div class='add'>+	int page_offset;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mp = folio_to_mp(src, 0);</div><div class='add'>+	if (metapage_locked(mp))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	rc = filemap_migrate_folio(mapping, dst, src, mode);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(insert_metapage(dst, mp)))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	page_offset = mp-&gt;data - folio_address(src);</div><div class='add'>+	mp-&gt;data = folio_address(dst) + page_offset;</div><div class='add'>+	mp-&gt;folio = dst;</div><div class='add'>+	remove_metapage(src, mp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_MIGRATION */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -218,12 +306,12 @@ void metapage_exit(void)</div><div class='ctx'> 	kmem_cache_destroy(metapage_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void drop_metapage(struct page *page, struct metapage *mp)</div><div class='add'>+static inline void drop_metapage(struct folio *folio, struct metapage *mp)</div><div class='ctx'> {</div><div class='ctx'> 	if (mp-&gt;count || mp-&gt;nohomeok || test_bit(META_dirty, &amp;mp-&gt;flag) ||</div><div class='ctx'> 	    test_bit(META_io, &amp;mp-&gt;flag))</div><div class='ctx'> 		return;</div><div class='del'>-	remove_metapage(page, mp);</div><div class='add'>+	remove_metapage(folio, mp);</div><div class='ctx'> 	INCREMENT(mpStat.pagefree);</div><div class='ctx'> 	free_metapage(mp);</div><div class='ctx'> }</div><div class='hunk'>@@ -257,23 +345,20 @@ static sector_t metapage_get_blocks(struct inode *inode, sector_t lblock,</div><div class='ctx'> 	return lblock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void last_read_complete(struct page *page)</div><div class='add'>+static void last_read_complete(struct folio *folio, blk_status_t status)</div><div class='ctx'> {</div><div class='del'>-	if (!PageError(page))</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	if (status)</div><div class='add'>+		printk(KERN_ERR "Read error %d at %#llx\n", status,</div><div class='add'>+				folio_pos(folio));</div><div class='add'>+</div><div class='add'>+	folio_end_read(folio, status == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void metapage_read_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = bio-&gt;bi_private;</div><div class='add'>+	struct folio *folio = bio-&gt;bi_private;</div><div class='ctx'> </div><div class='del'>-	if (bio-&gt;bi_status) {</div><div class='del'>-		printk(KERN_ERR "metapage_read_end_io: I/O error\n");</div><div class='del'>-		SetPageError(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dec_io(page, last_read_complete);</div><div class='add'>+	dec_io(folio, bio-&gt;bi_status, last_read_complete);</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -299,13 +384,19 @@ static void remove_from_logsync(struct metapage *mp)</div><div class='ctx'> 	LOGSYNC_UNLOCK(log, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void last_write_complete(struct page *page)</div><div class='add'>+static void last_write_complete(struct folio *folio, blk_status_t status)</div><div class='ctx'> {</div><div class='ctx'> 	struct metapage *mp;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> </div><div class='add'>+	if (status) {</div><div class='add'>+		int err = blk_status_to_errno(status);</div><div class='add'>+		printk(KERN_ERR "metapage_write_end_io: I/O error\n");</div><div class='add'>+		mapping_set_error(folio-&gt;mapping, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (offset = 0; offset &lt; PAGE_SIZE; offset += PSIZE) {</div><div class='del'>-		mp = page_to_mp(page, offset);</div><div class='add'>+		mp = folio_to_mp(folio, offset);</div><div class='ctx'> 		if (mp &amp;&amp; test_bit(META_io, &amp;mp-&gt;flag)) {</div><div class='ctx'> 			if (mp-&gt;lsn)</div><div class='ctx'> 				remove_from_logsync(mp);</div><div class='hunk'>@@ -316,28 +407,25 @@ static void last_write_complete(struct page *page)</div><div class='ctx'> 		 * safe unless I have the page locked</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='del'>-	end_page_writeback(page);</div><div class='add'>+	folio_end_writeback(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void metapage_write_end_io(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = bio-&gt;bi_private;</div><div class='add'>+	struct folio *folio = bio-&gt;bi_private;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!PagePrivate(page));</div><div class='add'>+	BUG_ON(!folio-&gt;private);</div><div class='ctx'> </div><div class='del'>-	if (bio-&gt;bi_status) {</div><div class='del'>-		printk(KERN_ERR "metapage_write_end_io: I/O error\n");</div><div class='del'>-		SetPageError(page);</div><div class='del'>-	}</div><div class='del'>-	dec_io(page, last_write_complete);</div><div class='add'>+	dec_io(folio, bio-&gt;bi_status, last_write_complete);</div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int metapage_writepage(struct page *page, struct writeback_control *wbc)</div><div class='add'>+static int metapage_write_folio(struct folio *folio,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='ctx'> 	int block_offset;	/* block offset of mp within page */</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	int blocks_per_mp = JFS_SBI(inode-&gt;i_sb)-&gt;nbperpage;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	int xlen;</div><div class='hunk'>@@ -353,14 +441,13 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 	int offset;</div><div class='ctx'> 	int bad_blocks = 0;</div><div class='ctx'> </div><div class='del'>-	page_start = (sector_t)page-&gt;index &lt;&lt;</div><div class='del'>-		     (PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	BUG_ON(PageWriteback(page));</div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	page_start = folio_pos(folio) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+	BUG_ON(!folio_test_locked(folio));</div><div class='add'>+	BUG_ON(folio_test_writeback(folio));</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	for (offset = 0; offset &lt; PAGE_SIZE; offset += PSIZE) {</div><div class='del'>-		mp = page_to_mp(page, offset);</div><div class='add'>+		mp = folio_to_mp(folio, offset);</div><div class='ctx'> </div><div class='ctx'> 		if (!mp || !test_bit(META_dirty, &amp;mp-&gt;flag))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -389,22 +476,20 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Not contiguous */</div><div class='del'>-			if (bio_add_page(bio, page, bio_bytes, bio_offset) &lt;</div><div class='del'>-			    bio_bytes)</div><div class='del'>-				goto add_failed;</div><div class='add'>+			bio_add_folio_nofail(bio, folio, bio_bytes, bio_offset);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Increment counter before submitting i/o to keep</div><div class='ctx'> 			 * count from hitting zero before we're through</div><div class='ctx'> 			 */</div><div class='del'>-			inc_io(page);</div><div class='add'>+			inc_io(folio);</div><div class='ctx'> 			if (!bio-&gt;bi_iter.bi_size)</div><div class='ctx'> 				goto dump_bio;</div><div class='ctx'> 			submit_bio(bio);</div><div class='ctx'> 			nr_underway++;</div><div class='ctx'> 			bio = NULL;</div><div class='ctx'> 		} else</div><div class='del'>-			inc_io(page);</div><div class='del'>-		xlen = (PAGE_SIZE - offset) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+			inc_io(folio);</div><div class='add'>+		xlen = (folio_size(folio) - offset) &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> 		pblock = metapage_get_blocks(inode, lblock, &amp;xlen);</div><div class='ctx'> 		if (!pblock) {</div><div class='ctx'> 			printk(KERN_ERR "JFS: metapage_get_blocks failed\n");</div><div class='hunk'>@@ -420,7 +505,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 		bio = bio_alloc(inode-&gt;i_sb-&gt;s_bdev, 1, REQ_OP_WRITE, GFP_NOFS);</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = pblock &lt;&lt; (inode-&gt;i_blkbits - 9);</div><div class='ctx'> 		bio-&gt;bi_end_io = metapage_write_end_io;</div><div class='del'>-		bio-&gt;bi_private = page;</div><div class='add'>+		bio-&gt;bi_private = folio;</div><div class='ctx'> </div><div class='ctx'> 		/* Don't call bio_add_page yet, we may add to this vec */</div><div class='ctx'> 		bio_offset = offset;</div><div class='hunk'>@@ -430,8 +515,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 		next_block = lblock + len;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bio) {</div><div class='del'>-		if (bio_add_page(bio, page, bio_bytes, bio_offset) &lt; bio_bytes)</div><div class='del'>-				goto add_failed;</div><div class='add'>+		bio_add_folio_nofail(bio, folio, bio_bytes, bio_offset);</div><div class='ctx'> 		if (!bio-&gt;bi_iter.bi_size)</div><div class='ctx'> 			goto dump_bio;</div><div class='ctx'> </div><div class='hunk'>@@ -439,50 +523,58 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 		nr_underway++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (redirty)</div><div class='del'>-		redirty_page_for_writepage(wbc, page);</div><div class='add'>+		folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> </div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (bad_blocks)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	if (nr_underway == 0)</div><div class='del'>-		end_page_writeback(page);</div><div class='add'>+		folio_end_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-add_failed:</div><div class='del'>-	/* We should never reach here, since we're only adding one vec */</div><div class='del'>-	printk(KERN_ERR "JFS: bio_add_page failed unexpectedly\n");</div><div class='del'>-	goto skip;</div><div class='ctx'> dump_bio:</div><div class='ctx'> 	print_hex_dump(KERN_ERR, "JFS: dump of bio: ", DUMP_PREFIX_ADDRESS, 16,</div><div class='ctx'> 		       4, bio, sizeof(*bio), 0);</div><div class='del'>-skip:</div><div class='ctx'> 	bio_put(bio);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	dec_io(page, last_write_complete);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	dec_io(folio, BLK_STS_OK, last_write_complete);</div><div class='ctx'> err_out:</div><div class='ctx'> 	while (bad_blocks--)</div><div class='del'>-		dec_io(page, last_write_complete);</div><div class='add'>+		dec_io(folio, BLK_STS_OK, last_write_complete);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int metapage_writepages(struct address_space *mapping,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='add'>+{</div><div class='add'>+	struct blk_plug plug;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	blk_start_plug(&amp;plug);</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;err)))</div><div class='add'>+		err = metapage_write_folio(folio, wbc);</div><div class='add'>+	blk_finish_plug(&amp;plug);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int metapage_read_folio(struct file *fp, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct bio *bio = NULL;</div><div class='ctx'> 	int block_offset;</div><div class='del'>-	int blocks_per_page = i_blocks_per_page(inode, page);</div><div class='add'>+	int blocks_per_page = i_blocks_per_folio(inode, folio);</div><div class='ctx'> 	sector_t page_start;	/* address of page in fs blocks */</div><div class='ctx'> 	sector_t pblock;</div><div class='ctx'> 	int xlen;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	int offset;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	page_start = (sector_t)page-&gt;index &lt;&lt;</div><div class='del'>-		     (PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='add'>+	BUG_ON(!folio_test_locked(folio));</div><div class='add'>+	page_start = folio_pos(folio) &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='ctx'> 	block_offset = 0;</div><div class='ctx'> 	while (block_offset &lt; blocks_per_page) {</div><div class='hunk'>@@ -490,9 +582,9 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)</div><div class='ctx'> 		pblock = metapage_get_blocks(inode, page_start + block_offset,</div><div class='ctx'> 					     &amp;xlen);</div><div class='ctx'> 		if (pblock) {</div><div class='del'>-			if (!PagePrivate(page))</div><div class='del'>-				insert_metapage(page, NULL);</div><div class='del'>-			inc_io(page);</div><div class='add'>+			if (!folio-&gt;private)</div><div class='add'>+				insert_metapage(folio, NULL);</div><div class='add'>+			inc_io(folio);</div><div class='ctx'> 			if (bio)</div><div class='ctx'> 				submit_bio(bio);</div><div class='ctx'> </div><div class='hunk'>@@ -501,11 +593,10 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)</div><div class='ctx'> 			bio-&gt;bi_iter.bi_sector =</div><div class='ctx'> 				pblock &lt;&lt; (inode-&gt;i_blkbits - 9);</div><div class='ctx'> 			bio-&gt;bi_end_io = metapage_read_end_io;</div><div class='del'>-			bio-&gt;bi_private = page;</div><div class='add'>+			bio-&gt;bi_private = folio;</div><div class='ctx'> 			len = xlen &lt;&lt; inode-&gt;i_blkbits;</div><div class='ctx'> 			offset = block_offset &lt;&lt; inode-&gt;i_blkbits;</div><div class='del'>-			if (bio_add_page(bio, page, len, offset) &lt; len)</div><div class='del'>-				goto add_failed;</div><div class='add'>+			bio_add_folio_nofail(bio, folio, len, offset);</div><div class='ctx'> 			block_offset += xlen;</div><div class='ctx'> 		} else</div><div class='ctx'> 			block_offset++;</div><div class='hunk'>@@ -513,15 +604,9 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)</div><div class='ctx'> 	if (bio)</div><div class='ctx'> 		submit_bio(bio);</div><div class='ctx'> 	else</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-add_failed:</div><div class='del'>-	printk(KERN_ERR "JFS: bio_add_page failed unexpectedly\n");</div><div class='del'>-	bio_put(bio);</div><div class='del'>-	dec_io(page, last_read_complete);</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool metapage_release_folio(struct folio *folio, gfp_t gfp_mask)</div><div class='hunk'>@@ -531,7 +616,7 @@ static bool metapage_release_folio(struct folio *folio, gfp_t gfp_mask)</div><div class='ctx'> 	int offset;</div><div class='ctx'> </div><div class='ctx'> 	for (offset = 0; offset &lt; PAGE_SIZE; offset += PSIZE) {</div><div class='del'>-		mp = page_to_mp(&amp;folio-&gt;page, offset);</div><div class='add'>+		mp = folio_to_mp(folio, offset);</div><div class='ctx'> </div><div class='ctx'> 		if (!mp)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -546,13 +631,36 @@ static bool metapage_release_folio(struct folio *folio, gfp_t gfp_mask)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mp-&gt;lsn)</div><div class='ctx'> 			remove_from_logsync(mp);</div><div class='del'>-		remove_metapage(&amp;folio-&gt;page, mp);</div><div class='add'>+		remove_metapage(folio, mp);</div><div class='ctx'> 		INCREMENT(mpStat.pagefree);</div><div class='ctx'> 		free_metapage(mp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+/*</div><div class='add'>+ * metapage_migrate_folio - Migration function for JFS metapages</div><div class='add'>+ */</div><div class='add'>+static int metapage_migrate_folio(struct address_space *mapping,</div><div class='add'>+				  struct folio *dst, struct folio *src,</div><div class='add'>+				  enum migrate_mode mode)</div><div class='add'>+{</div><div class='add'>+	int expected_count;</div><div class='add'>+</div><div class='add'>+	if (!src-&gt;private)</div><div class='add'>+		return filemap_migrate_folio(mapping, dst, src, mode);</div><div class='add'>+</div><div class='add'>+	/* Check whether page does not have extra refs before we do more work */</div><div class='add'>+	expected_count = folio_expected_ref_count(src) + 1;</div><div class='add'>+	if (folio_ref_count(src) != expected_count)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	return __metapage_migrate_folio(mapping, dst, src, mode);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define metapage_migrate_folio NULL</div><div class='add'>+#endif	/* CONFIG_MIGRATION */</div><div class='add'>+</div><div class='ctx'> static void metapage_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 				    size_t length)</div><div class='ctx'> {</div><div class='hunk'>@@ -565,10 +673,11 @@ static void metapage_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations jfs_metapage_aops = {</div><div class='ctx'> 	.read_folio	= metapage_read_folio,</div><div class='del'>-	.writepage	= metapage_writepage,</div><div class='add'>+	.writepages	= metapage_writepages,</div><div class='ctx'> 	.release_folio	= metapage_release_folio,</div><div class='ctx'> 	.invalidate_folio = metapage_invalidate_folio,</div><div class='ctx'> 	.dirty_folio	= filemap_dirty_folio,</div><div class='add'>+	.migrate_folio	= metapage_migrate_folio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,</div><div class='hunk'>@@ -579,7 +688,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,</div><div class='ctx'> 	int l2bsize;</div><div class='ctx'> 	struct address_space *mapping;</div><div class='ctx'> 	struct metapage *mp = NULL;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	unsigned long page_index;</div><div class='ctx'> 	unsigned long page_offset;</div><div class='ctx'> </div><div class='hunk'>@@ -610,22 +719,22 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new &amp;&amp; (PSIZE == PAGE_SIZE)) {</div><div class='del'>-		page = grab_cache_page(mapping, page_index);</div><div class='del'>-		if (!page) {</div><div class='del'>-			jfs_err("grab_cache_page failed!");</div><div class='add'>+		folio = filemap_grab_folio(mapping, page_index);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			jfs_err("filemap_grab_folio failed!");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> 	} else {</div><div class='del'>-		page = read_mapping_page(mapping, page_index, NULL);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='add'>+		folio = read_mapping_folio(mapping, page_index, NULL);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='ctx'> 			jfs_err("read_mapping_page failed!");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		lock_page(page);</div><div class='add'>+		folio_lock(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mp = page_to_mp(page, page_offset);</div><div class='add'>+	mp = folio_to_mp(folio, page_offset);</div><div class='ctx'> 	if (mp) {</div><div class='ctx'> 		if (mp-&gt;logical_size != size) {</div><div class='ctx'> 			jfs_error(inode-&gt;i_sb,</div><div class='hunk'>@@ -651,16 +760,16 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,</div><div class='ctx'> 		mp = alloc_metapage(GFP_NOFS);</div><div class='ctx'> 		if (!mp)</div><div class='ctx'> 			goto unlock;</div><div class='del'>-		mp-&gt;page = page;</div><div class='add'>+		mp-&gt;folio = folio;</div><div class='ctx'> 		mp-&gt;sb = inode-&gt;i_sb;</div><div class='ctx'> 		mp-&gt;flag = 0;</div><div class='ctx'> 		mp-&gt;xflag = COMMIT_PAGE;</div><div class='ctx'> 		mp-&gt;count = 1;</div><div class='ctx'> 		mp-&gt;nohomeok = 0;</div><div class='ctx'> 		mp-&gt;logical_size = size;</div><div class='del'>-		mp-&gt;data = page_address(page) + page_offset;</div><div class='add'>+		mp-&gt;data = folio_address(folio) + page_offset;</div><div class='ctx'> 		mp-&gt;index = lblock;</div><div class='del'>-		if (unlikely(insert_metapage(page, mp))) {</div><div class='add'>+		if (unlikely(insert_metapage(folio, mp))) {</div><div class='ctx'> 			free_metapage(mp);</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -672,28 +781,27 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,</div><div class='ctx'> 		memset(mp-&gt;data, 0, PSIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> 	jfs_info("__get_metapage: returning = 0x%p data = 0x%p", mp, mp-&gt;data);</div><div class='ctx'> 	return mp;</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void grab_metapage(struct metapage * mp)</div><div class='ctx'> {</div><div class='ctx'> 	jfs_info("grab_metapage: mp = 0x%p", mp);</div><div class='del'>-	get_page(mp-&gt;page);</div><div class='del'>-	lock_page(mp-&gt;page);</div><div class='add'>+	folio_get(mp-&gt;folio);</div><div class='add'>+	folio_lock(mp-&gt;folio);</div><div class='ctx'> 	mp-&gt;count++;</div><div class='ctx'> 	lock_metapage(mp);</div><div class='del'>-	unlock_page(mp-&gt;page);</div><div class='add'>+	folio_unlock(mp-&gt;folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int metapage_write_one(struct page *page)</div><div class='add'>+static int metapage_write_one(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct writeback_control wbc = {</div><div class='ctx'> 		.sync_mode = WB_SYNC_ALL,</div><div class='hunk'>@@ -707,7 +815,7 @@ static int metapage_write_one(struct page *page)</div><div class='ctx'> </div><div class='ctx'> 	if (folio_clear_dirty_for_io(folio)) {</div><div class='ctx'> 		folio_get(folio);</div><div class='del'>-		ret = metapage_writepage(page, &amp;wbc);</div><div class='add'>+		ret = metapage_write_folio(folio, &amp;wbc);</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			folio_wait_writeback(folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='hunk'>@@ -722,71 +830,69 @@ static int metapage_write_one(struct page *page)</div><div class='ctx'> </div><div class='ctx'> void force_metapage(struct metapage *mp)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = mp-&gt;page;</div><div class='add'>+	struct folio *folio = mp-&gt;folio;</div><div class='ctx'> 	jfs_info("force_metapage: mp = 0x%p", mp);</div><div class='ctx'> 	set_bit(META_forcewrite, &amp;mp-&gt;flag);</div><div class='ctx'> 	clear_bit(META_sync, &amp;mp-&gt;flag);</div><div class='del'>-	get_page(page);</div><div class='del'>-	lock_page(page);</div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	if (metapage_write_one(page))</div><div class='add'>+	folio_get(folio);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	if (metapage_write_one(folio))</div><div class='ctx'> 		jfs_error(mp-&gt;sb, "metapage_write_one() failed\n");</div><div class='ctx'> 	clear_bit(META_forcewrite, &amp;mp-&gt;flag);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hold_metapage(struct metapage *mp)</div><div class='ctx'> {</div><div class='del'>-	lock_page(mp-&gt;page);</div><div class='add'>+	folio_lock(mp-&gt;folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void put_metapage(struct metapage *mp)</div><div class='ctx'> {</div><div class='ctx'> 	if (mp-&gt;count || mp-&gt;nohomeok) {</div><div class='ctx'> 		/* Someone else will release this */</div><div class='del'>-		unlock_page(mp-&gt;page);</div><div class='add'>+		folio_unlock(mp-&gt;folio);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	get_page(mp-&gt;page);</div><div class='add'>+	folio_get(mp-&gt;folio);</div><div class='ctx'> 	mp-&gt;count++;</div><div class='ctx'> 	lock_metapage(mp);</div><div class='del'>-	unlock_page(mp-&gt;page);</div><div class='add'>+	folio_unlock(mp-&gt;folio);</div><div class='ctx'> 	release_metapage(mp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void release_metapage(struct metapage * mp)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = mp-&gt;page;</div><div class='add'>+	struct folio *folio = mp-&gt;folio;</div><div class='ctx'> 	jfs_info("release_metapage: mp = 0x%p, flag = 0x%lx", mp, mp-&gt;flag);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!page);</div><div class='del'>-</div><div class='del'>-	lock_page(page);</div><div class='add'>+	folio_lock(folio);</div><div class='ctx'> 	unlock_metapage(mp);</div><div class='ctx'> </div><div class='ctx'> 	assert(mp-&gt;count);</div><div class='ctx'> 	if (--mp-&gt;count || mp-&gt;nohomeok) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(META_dirty, &amp;mp-&gt;flag)) {</div><div class='del'>-		set_page_dirty(page);</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='ctx'> 		if (test_bit(META_sync, &amp;mp-&gt;flag)) {</div><div class='ctx'> 			clear_bit(META_sync, &amp;mp-&gt;flag);</div><div class='del'>-			if (metapage_write_one(page))</div><div class='add'>+			if (metapage_write_one(folio))</div><div class='ctx'> 				jfs_error(mp-&gt;sb, "metapage_write_one() failed\n");</div><div class='del'>-			lock_page(page);</div><div class='add'>+			folio_lock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (mp-&gt;lsn)	/* discard_metapage doesn't remove it */</div><div class='ctx'> 		remove_from_logsync(mp);</div><div class='ctx'> </div><div class='ctx'> 	/* Try to keep metapages from using up too much memory */</div><div class='del'>-	drop_metapage(page, mp);</div><div class='add'>+	drop_metapage(folio, mp);</div><div class='ctx'> </div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __invalidate_metapages(struct inode *ip, s64 addr, int len)</div><div class='hunk'>@@ -798,7 +904,6 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)</div><div class='ctx'> 	struct address_space *mapping =</div><div class='ctx'> 		JFS_SBI(ip-&gt;i_sb)-&gt;direct_inode-&gt;i_mapping;</div><div class='ctx'> 	struct metapage *mp;</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -807,11 +912,12 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (lblock = addr &amp; ~(BlocksPerPage - 1); lblock &lt; addr + len;</div><div class='ctx'> 	     lblock += BlocksPerPage) {</div><div class='del'>-		page = find_lock_page(mapping, lblock &gt;&gt; l2BlocksPerPage);</div><div class='del'>-		if (!page)</div><div class='add'>+		struct folio *folio = filemap_lock_folio(mapping,</div><div class='add'>+				lblock &gt;&gt; l2BlocksPerPage);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		for (offset = 0; offset &lt; PAGE_SIZE; offset += PSIZE) {</div><div class='del'>-			mp = page_to_mp(page, offset);</div><div class='add'>+			mp = folio_to_mp(folio, offset);</div><div class='ctx'> 			if (!mp)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (mp-&gt;index &lt; addr)</div><div class='hunk'>@@ -824,8 +930,8 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)</div><div class='ctx'> 			if (mp-&gt;lsn)</div><div class='ctx'> 				remove_from_logsync(mp);</div><div class='ctx'> 		}</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h<br/>index 4179f9df4deb..2e5015c2705b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_metapage.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_metapage.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_metapage.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_metapage.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@ struct metapage {</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> </div><div class='ctx'> 	/* implementation */</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	unsigned int logical_size;</div><div class='ctx'> </div><div class='hunk'>@@ -90,14 +90,14 @@ static inline void discard_metapage(struct metapage *mp)</div><div class='ctx'> </div><div class='ctx'> static inline void metapage_nohomeok(struct metapage *mp)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = mp-&gt;page;</div><div class='del'>-	lock_page(page);</div><div class='add'>+	struct folio *folio = mp-&gt;folio;</div><div class='add'>+	folio_lock(folio);</div><div class='ctx'> 	if (!mp-&gt;nohomeok++) {</div><div class='ctx'> 		mark_metapage_dirty(mp);</div><div class='del'>-		get_page(page);</div><div class='del'>-		wait_on_page_writeback(page);</div><div class='add'>+		folio_get(folio);</div><div class='add'>+		folio_wait_writeback(folio);</div><div class='ctx'> 	}</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -107,7 +107,7 @@ static inline void metapage_nohomeok(struct metapage *mp)</div><div class='ctx'> static inline void metapage_wait_for_io(struct metapage *mp)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(META_io, &amp;mp-&gt;flag))</div><div class='del'>-		wait_on_page_writeback(mp-&gt;page);</div><div class='add'>+		folio_wait_writeback(mp-&gt;folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -116,7 +116,7 @@ static inline void metapage_wait_for_io(struct metapage *mp)</div><div class='ctx'> static inline void _metapage_homeok(struct metapage *mp)</div><div class='ctx'> {</div><div class='ctx'> 	if (!--mp-&gt;nohomeok)</div><div class='del'>-		put_page(mp-&gt;page);</div><div class='add'>+		folio_put(mp-&gt;folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void metapage_homeok(struct metapage *mp)</div><div class='head'>diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c<br/>index 98f9a432c336..52e6b58c5dbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_mount.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_mount.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_mount.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_mount.c</a></div><div class='hunk'>@@ -325,13 +325,13 @@ static int chkSuper(struct super_block *sb)</div><div class='ctx'> 	if ((j_sb-&gt;s_flag &amp; cpu_to_le32(JFS_BAD_SAIT)) !=</div><div class='ctx'> 	    cpu_to_le32(JFS_BAD_SAIT)) {</div><div class='ctx'> 		expected_AIM_bytesize = 2 * PSIZE;</div><div class='del'>-		AIM_bytesize = lengthPXD(&amp;(j_sb-&gt;s_aim2)) * bsize;</div><div class='add'>+		AIM_bytesize = lengthPXD(&amp;j_sb-&gt;s_aim2) * bsize;</div><div class='ctx'> 		expected_AIT_bytesize = 4 * PSIZE;</div><div class='del'>-		AIT_bytesize = lengthPXD(&amp;(j_sb-&gt;s_ait2)) * bsize;</div><div class='del'>-		AIM_byte_addr = addressPXD(&amp;(j_sb-&gt;s_aim2)) * bsize;</div><div class='del'>-		AIT_byte_addr = addressPXD(&amp;(j_sb-&gt;s_ait2)) * bsize;</div><div class='add'>+		AIT_bytesize = lengthPXD(&amp;j_sb-&gt;s_ait2) * bsize;</div><div class='add'>+		AIM_byte_addr = addressPXD(&amp;j_sb-&gt;s_aim2) * bsize;</div><div class='add'>+		AIT_byte_addr = addressPXD(&amp;j_sb-&gt;s_ait2) * bsize;</div><div class='ctx'> 		byte_addr_diff0 = AIT_byte_addr - AIM_byte_addr;</div><div class='del'>-		fsckwsp_addr = addressPXD(&amp;(j_sb-&gt;s_fsckpxd)) * bsize;</div><div class='add'>+		fsckwsp_addr = addressPXD(&amp;j_sb-&gt;s_fsckpxd) * bsize;</div><div class='ctx'> 		byte_addr_diff1 = fsckwsp_addr - AIT_byte_addr;</div><div class='ctx'> 		if ((AIM_bytesize != expected_AIM_bytesize) ||</div><div class='ctx'> 		    (AIT_bytesize != expected_AIT_bytesize) ||</div><div class='head'>diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c<br/>index be17e3c43582..c16578af3a77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_txnmgr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_txnmgr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_txnmgr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_txnmgr.c</a></div><div class='hunk'>@@ -272,14 +272,15 @@ int txInit(void)</div><div class='ctx'> 	if (TxBlock == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (k = 1; k &lt; nTxBlock - 1; k++) {</div><div class='del'>-		TxBlock[k].next = k + 1;</div><div class='add'>+	for (k = 0; k &lt; nTxBlock; k++) {</div><div class='ctx'> 		init_waitqueue_head(&amp;TxBlock[k].gcwait);</div><div class='ctx'> 		init_waitqueue_head(&amp;TxBlock[k].waitor);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for (k = 1; k &lt; nTxBlock - 1; k++) {</div><div class='add'>+		TxBlock[k].next = k + 1;</div><div class='add'>+	}</div><div class='ctx'> 	TxBlock[k].next = 0;</div><div class='del'>-	init_waitqueue_head(&amp;TxBlock[k].gcwait);</div><div class='del'>-	init_waitqueue_head(&amp;TxBlock[k].waitor);</div><div class='ctx'> </div><div class='ctx'> 	TxAnchor.freetid = 1;</div><div class='ctx'> 	init_waitqueue_head(&amp;TxAnchor.freewait);</div><div class='hunk'>@@ -1286,7 +1287,7 @@ int txCommit(tid_t tid,		/* transaction identifier */</div><div class='ctx'> 		 * to verify this, only a trivial s/I_LOCK/I_SYNC/ was done.</div><div class='ctx'> 		 * Joern</div><div class='ctx'> 		 */</div><div class='del'>-		if (tblk-&gt;u.ip-&gt;i_state &amp; I_SYNC)</div><div class='add'>+		if (inode_state_read_once(tblk-&gt;u.ip) &amp; I_SYNC)</div><div class='ctx'> 			tblk-&gt;xflag &amp;= ~COMMIT_LAZY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c<br/>index 5ee618d17e77..28c3cf960c6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_xtree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/jfs_xtree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/jfs_xtree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/jfs_xtree.c</a></div><div class='hunk'>@@ -49,26 +49,6 @@</div><div class='ctx'> </div><div class='ctx'> #define XT_PAGE(IP, MP) BT_PAGE(IP, MP, xtpage_t, i_xtroot)</div><div class='ctx'> </div><div class='del'>-/* get page buffer for specified block address */</div><div class='del'>-/* ToDo: Replace this ugly macro with a function */</div><div class='del'>-#define XT_GETPAGE(IP, BN, MP, SIZE, P, RC)				\</div><div class='del'>-do {									\</div><div class='del'>-	BT_GETPAGE(IP, BN, MP, xtpage_t, SIZE, P, RC, i_xtroot);	\</div><div class='del'>-	if (!(RC)) {							\</div><div class='del'>-		if ((le16_to_cpu((P)-&gt;header.nextindex) &lt; XTENTRYSTART) || \</div><div class='del'>-		    (le16_to_cpu((P)-&gt;header.nextindex) &gt;		\</div><div class='del'>-		     le16_to_cpu((P)-&gt;header.maxentry)) ||		\</div><div class='del'>-		    (le16_to_cpu((P)-&gt;header.maxentry) &gt;		\</div><div class='del'>-		     (((BN) == 0) ? XTROOTMAXSLOT : PSIZE &gt;&gt; L2XTSLOTSIZE))) { \</div><div class='del'>-			jfs_error((IP)-&gt;i_sb,				\</div><div class='del'>-				  "XT_GETPAGE: xtree page corrupt\n");	\</div><div class='del'>-			BT_PUTPAGE(MP);					\</div><div class='del'>-			MP = NULL;					\</div><div class='del'>-			RC = -EIO;					\</div><div class='del'>-		}							\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> /* for consistency */</div><div class='ctx'> #define XT_PUTPAGE(MP) BT_PUTPAGE(MP)</div><div class='ctx'> </div><div class='hunk'>@@ -115,6 +95,42 @@ static int xtSplitRoot(tid_t tid, struct inode *ip,</div><div class='ctx'> 		       struct xtsplit * split, struct metapage ** rmpp);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ *	xt_getpage()</div><div class='add'>+ *</div><div class='add'>+ * function:	get the page buffer for a specified block address.</div><div class='add'>+ *</div><div class='add'>+ * parameters:</div><div class='add'>+ *	ip      - pointer to the inode</div><div class='add'>+ *	bn      - block number (s64) of the xtree page to be retrieved;</div><div class='add'>+ *	mp      - pointer to a metapage pointer where the page buffer is returned;</div><div class='add'>+ *</div><div class='add'>+ * returns:</div><div class='add'>+ *      A pointer to the xtree page (xtpage_t) on success, -EIO on error.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline xtpage_t *xt_getpage(struct inode *ip, s64 bn, struct metapage **mp)</div><div class='add'>+{</div><div class='add'>+	xtpage_t *p;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	BT_GETPAGE(ip, bn, *mp, xtpage_t, PSIZE, p, rc, i_xtroot);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		return ERR_PTR(rc);</div><div class='add'>+	if ((le16_to_cpu(p-&gt;header.nextindex) &lt; XTENTRYSTART) ||</div><div class='add'>+		(le16_to_cpu(p-&gt;header.nextindex) &gt;</div><div class='add'>+			le16_to_cpu(p-&gt;header.maxentry)) ||</div><div class='add'>+		(le16_to_cpu(p-&gt;header.maxentry) &gt;</div><div class='add'>+			((bn == 0) ? XTROOTMAXSLOT : PSIZE &gt;&gt; L2XTSLOTSIZE))) {</div><div class='add'>+		jfs_error(ip-&gt;i_sb, "xt_getpage: xtree page corrupt\n");</div><div class='add'>+		BT_PUTPAGE(*mp);</div><div class='add'>+		*mp = NULL;</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *	xtLookup()</div><div class='ctx'>  *</div><div class='ctx'>  * function: map a single page into a physical extent;</div><div class='hunk'>@@ -216,7 +232,6 @@ static int xtSearch(struct inode *ip, s64 xoff,	s64 *nextp,</div><div class='ctx'> 		    int *cmpp, struct btstack * btstack, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct jfs_inode_info *jfs_ip = JFS_IP(ip);</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	int cmp = 1;		/* init for empty page */</div><div class='ctx'> 	s64 bn;			/* block number */</div><div class='ctx'> 	struct metapage *mp;	/* page buffer */</div><div class='hunk'>@@ -252,9 +267,9 @@ static int xtSearch(struct inode *ip, s64 xoff,	s64 *nextp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (bn = 0;;) {</div><div class='ctx'> 		/* get/pin the page to search */</div><div class='del'>-		XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+		p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 		/* try sequential access heuristics with the previous</div><div class='ctx'> 		 * access entry in target leaf page:</div><div class='hunk'>@@ -807,10 +822,10 @@ xtSplitUp(tid_t tid,</div><div class='ctx'> 		 * insert router entry in parent for new right child page &lt;rp&gt;</div><div class='ctx'> 		 */</div><div class='ctx'> 		/* get/pin the parent page &lt;sp&gt; */</div><div class='del'>-		XT_GETPAGE(ip, parent-&gt;bn, smp, PSIZE, sp, rc);</div><div class='del'>-		if (rc) {</div><div class='add'>+		sp = xt_getpage(ip, parent-&gt;bn, &amp;smp);</div><div class='add'>+		if (IS_ERR(sp)) {</div><div class='ctx'> 			XT_PUTPAGE(rcmp);</div><div class='del'>-			return rc;</div><div class='add'>+			return PTR_ERR(sp);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1062,10 +1077,10 @@ xtSplitPage(tid_t tid, struct inode *ip,</div><div class='ctx'> 	 * update previous pointer of old next/right page of &lt;sp&gt;</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (nextbn != 0) {</div><div class='del'>-		XT_GETPAGE(ip, nextbn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc) {</div><div class='add'>+		p = xt_getpage(ip, nextbn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p)) {</div><div class='ctx'> 			XT_PUTPAGE(rmp);</div><div class='del'>-			goto clean_up;</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		BT_MARK_DIRTY(mp, ip);</div><div class='hunk'>@@ -1417,9 +1432,9 @@ int xtExtend(tid_t tid,		/* transaction id */</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 		/* get back old page */</div><div class='del'>-		XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+		p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if leaf root has been split, original root has been</div><div class='ctx'> 		 * copied to new child page, i.e., original entry now</div><div class='hunk'>@@ -1433,9 +1448,9 @@ int xtExtend(tid_t tid,		/* transaction id */</div><div class='ctx'> 			XT_PUTPAGE(mp);</div><div class='ctx'> </div><div class='ctx'> 			/* get new child page */</div><div class='del'>-			XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-			if (rc)</div><div class='del'>-				return rc;</div><div class='add'>+			p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+			if (IS_ERR(p))</div><div class='add'>+				return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 			BT_MARK_DIRTY(mp, ip);</div><div class='ctx'> 			if (!test_cflag(COMMIT_Nolink, ip)) {</div><div class='hunk'>@@ -1711,9 +1726,9 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 		/* get back old page */</div><div class='del'>-		XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+		p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if leaf root has been split, original root has been</div><div class='ctx'> 		 * copied to new child page, i.e., original entry now</div><div class='hunk'>@@ -1727,9 +1742,9 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)</div><div class='ctx'> 			XT_PUTPAGE(mp);</div><div class='ctx'> </div><div class='ctx'> 			/* get new child page */</div><div class='del'>-			XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-			if (rc)</div><div class='del'>-				return rc;</div><div class='add'>+			p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+			if (IS_ERR(p))</div><div class='add'>+				return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 			BT_MARK_DIRTY(mp, ip);</div><div class='ctx'> 			if (!test_cflag(COMMIT_Nolink, ip)) {</div><div class='hunk'>@@ -1788,9 +1803,9 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)</div><div class='ctx'> 		XT_PUTPAGE(mp);</div><div class='ctx'> </div><div class='ctx'> 		/* get new right page */</div><div class='del'>-		XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+		p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 		BT_MARK_DIRTY(mp, ip);</div><div class='ctx'> 		if (!test_cflag(COMMIT_Nolink, ip)) {</div><div class='hunk'>@@ -1864,9 +1879,9 @@ printf("xtUpdate.updateLeft.split p:0x%p\n", p);</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 		/* get back old page */</div><div class='del'>-		XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+		p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * if leaf root has been split, original root has been</div><div class='hunk'>@@ -1881,9 +1896,9 @@ printf("xtUpdate.updateLeft.split p:0x%p\n", p);</div><div class='ctx'> 			XT_PUTPAGE(mp);</div><div class='ctx'> </div><div class='ctx'> 			/* get new child page */</div><div class='del'>-			XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-			if (rc)</div><div class='del'>-				return rc;</div><div class='add'>+			p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+			if (IS_ERR(p))</div><div class='add'>+				return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 			BT_MARK_DIRTY(mp, ip);</div><div class='ctx'> 			if (!test_cflag(COMMIT_Nolink, ip)) {</div><div class='hunk'>@@ -2187,7 +2202,6 @@ void xtInitRoot(tid_t tid, struct inode *ip)</div><div class='ctx'>  */</div><div class='ctx'> s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	s64 teof;</div><div class='ctx'> 	struct metapage *mp;</div><div class='ctx'> 	xtpage_t *p;</div><div class='hunk'>@@ -2268,9 +2282,9 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)</div><div class='ctx'> 	 * first access of each page:</div><div class='ctx'> 	 */</div><div class='ctx'>       getPage:</div><div class='del'>-	XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	/* process entries backward from last index */</div><div class='ctx'> 	index = le16_to_cpu(p-&gt;header.nextindex) - 1;</div><div class='hunk'>@@ -2506,9 +2520,9 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)</div><div class='ctx'> </div><div class='ctx'> 	/* get back the parent page */</div><div class='ctx'> 	bn = parent-&gt;bn;</div><div class='del'>-	XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	index = parent-&gt;index;</div><div class='ctx'> </div><div class='hunk'>@@ -2791,9 +2805,9 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)</div><div class='ctx'> 		 * first access of each page:</div><div class='ctx'> 		 */</div><div class='ctx'>       getPage:</div><div class='del'>-		XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+		p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 		/* process entries backward from last index */</div><div class='ctx'> 		index = le16_to_cpu(p-&gt;header.nextindex) - 1;</div><div class='hunk'>@@ -2836,9 +2850,9 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)</div><div class='ctx'> </div><div class='ctx'> 	/* get back the parent page */</div><div class='ctx'> 	bn = parent-&gt;bn;</div><div class='del'>-	XT_GETPAGE(ip, bn, mp, PSIZE, p, rc);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	p = xt_getpage(ip, bn, &amp;mp);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		return PTR_ERR(p);</div><div class='ctx'> </div><div class='ctx'> 	index = parent-&gt;index;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c<br/>index d68a4e6ac345..65a218eba8fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/namei.c</a></div><div class='hunk'>@@ -187,13 +187,13 @@ static int jfs_create(struct mnt_idmap *idmap, struct inode *dip,</div><div class='ctx'>  *		dentry	- dentry of child directory</div><div class='ctx'>  *		mode	- create mode (rwxrwxrwx).</div><div class='ctx'>  *</div><div class='del'>- * RETURN:	Errors from subroutines</div><div class='add'>+ * RETURN:	ERR_PTR() of errors from subroutines.</div><div class='ctx'>  *</div><div class='ctx'>  * note:</div><div class='ctx'>  * EACCES: user needs search+write permission on the parent directory</div><div class='ctx'>  */</div><div class='del'>-static int jfs_mkdir(struct mnt_idmap *idmap, struct inode *dip,</div><div class='del'>-		     struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *jfs_mkdir(struct mnt_idmap *idmap, struct inode *dip,</div><div class='add'>+				struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	tid_t tid;		/* transaction id */</div><div class='hunk'>@@ -308,7 +308,7 @@ static int jfs_mkdir(struct mnt_idmap *idmap, struct inode *dip,</div><div class='ctx'>       out1:</div><div class='ctx'> </div><div class='ctx'> 	jfs_info("jfs_mkdir: rc:%d", rc);</div><div class='del'>-	return rc;</div><div class='add'>+	return ERR_PTR(rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1576,7 +1576,8 @@ out:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jfs_ci_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int jfs_ci_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			     struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is not negative dentry. Always valid.</div><div class='head'>diff --git a/fs/jfs/super.c b/fs/jfs/super.c<br/>index 8d8e556bd610..3cfb86c5a36e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/super.c</a></div><div class='hunk'>@@ -6,11 +6,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/posix_acl.h&gt;</div><div class='hunk'>@@ -210,240 +210,195 @@ enum {</div><div class='ctx'> 	Opt_discard, Opt_nodiscard, Opt_discard_minblk</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_integrity, "integrity"},</div><div class='del'>-	{Opt_nointegrity, "nointegrity"},</div><div class='del'>-	{Opt_iocharset, "iocharset=%s"},</div><div class='del'>-	{Opt_resize, "resize=%u"},</div><div class='del'>-	{Opt_resize_nosize, "resize"},</div><div class='del'>-	{Opt_errors, "errors=%s"},</div><div class='del'>-	{Opt_ignore, "noquota"},</div><div class='del'>-	{Opt_quota, "quota"},</div><div class='del'>-	{Opt_usrquota, "usrquota"},</div><div class='del'>-	{Opt_grpquota, "grpquota"},</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_umask, "umask=%u"},</div><div class='del'>-	{Opt_discard, "discard"},</div><div class='del'>-	{Opt_nodiscard, "nodiscard"},</div><div class='del'>-	{Opt_discard_minblk, "discard=%u"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table jfs_param_errors[] = {</div><div class='add'>+	{"continue",	JFS_ERR_CONTINUE},</div><div class='add'>+	{"remount-ro",	JFS_ERR_REMOUNT_RO},</div><div class='add'>+	{"panic",	JFS_ERR_PANIC},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,</div><div class='del'>-			 int *flag)</div><div class='del'>-{</div><div class='del'>-	void *nls_map = (void *)-1;	/* -1: no change;  NULL: none */</div><div class='del'>-	char *p;</div><div class='del'>-	struct jfs_sb_info *sbi = JFS_SBI(sb);</div><div class='add'>+static const struct fs_parameter_spec jfs_param_spec[] = {</div><div class='add'>+	fsparam_flag_no	("integrity",	Opt_integrity),</div><div class='add'>+	fsparam_string	("iocharset",	Opt_iocharset),</div><div class='add'>+	fsparam_u64	("resize",	Opt_resize),</div><div class='add'>+	fsparam_flag	("resize",	Opt_resize_nosize),</div><div class='add'>+	fsparam_enum	("errors",	Opt_errors,	jfs_param_errors),</div><div class='add'>+	fsparam_flag	("quota",	Opt_quota),</div><div class='add'>+	fsparam_flag	("noquota",	Opt_ignore),</div><div class='add'>+	fsparam_flag	("usrquota",	Opt_usrquota),</div><div class='add'>+	fsparam_flag	("grpquota",	Opt_grpquota),</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct	("umask",	Opt_umask),</div><div class='add'>+	fsparam_flag	("discard",	Opt_discard),</div><div class='add'>+	fsparam_u32	("discard",	Opt_discard_minblk),</div><div class='add'>+	fsparam_flag	("nodiscard",	Opt_nodiscard),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	*newLVSize = 0;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		substring_t args[MAX_OPT_ARGS];</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_integrity:</div><div class='del'>-			*flag &amp;= ~JFS_NOINTEGRITY;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nointegrity:</div><div class='del'>-			*flag |= JFS_NOINTEGRITY;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_ignore:</div><div class='del'>-			/* Silently ignore the quota options */</div><div class='del'>-			/* Don't do anything ;-) */</div><div class='del'>-			break;</div><div class='del'>-		case Opt_iocharset:</div><div class='del'>-			if (nls_map &amp;&amp; nls_map != (void *) -1)</div><div class='del'>-				unload_nls(nls_map);</div><div class='del'>-			if (!strcmp(args[0].from, "none"))</div><div class='del'>-				nls_map = NULL;</div><div class='del'>-			else {</div><div class='del'>-				nls_map = load_nls(args[0].from);</div><div class='del'>-				if (!nls_map) {</div><div class='del'>-					pr_err("JFS: charset not found\n");</div><div class='del'>-					goto cleanup;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_resize:</div><div class='del'>-		{</div><div class='del'>-			char *resize = args[0].from;</div><div class='del'>-			int rc = kstrtoll(resize, 0, newLVSize);</div><div class='add'>+struct jfs_context {</div><div class='add'>+	int	flag;</div><div class='add'>+	kuid_t	uid;</div><div class='add'>+	kgid_t	gid;</div><div class='add'>+	uint	umask;</div><div class='add'>+	uint	minblks_trim;</div><div class='add'>+	void	*nls_map;</div><div class='add'>+	bool	resize;</div><div class='add'>+	s64	newLVSize;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-			if (rc)</div><div class='del'>-				goto cleanup;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case Opt_resize_nosize:</div><div class='del'>-		{</div><div class='del'>-			*newLVSize = sb_bdev_nr_blocks(sb);</div><div class='del'>-			if (*newLVSize == 0)</div><div class='del'>-				pr_err("JFS: Cannot determine volume size\n");</div><div class='del'>-			break;</div><div class='add'>+static int jfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct jfs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	int reconfigure = (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE);</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	struct nls_table *nls_map;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, jfs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_integrity:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx-&gt;flag |= JFS_NOINTEGRITY;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;flag &amp;= ~JFS_NOINTEGRITY;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_ignore:</div><div class='add'>+		/* Silently ignore the quota options */</div><div class='add'>+		/* Don't do anything ;-) */</div><div class='add'>+		break;</div><div class='add'>+	case Opt_iocharset:</div><div class='add'>+		if (ctx-&gt;nls_map &amp;&amp; ctx-&gt;nls_map != (void *) -1) {</div><div class='add'>+			unload_nls(ctx-&gt;nls_map);</div><div class='add'>+			ctx-&gt;nls_map = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		case Opt_errors:</div><div class='del'>-		{</div><div class='del'>-			char *errors = args[0].from;</div><div class='del'>-			if (!errors || !*errors)</div><div class='del'>-				goto cleanup;</div><div class='del'>-			if (!strcmp(errors, "continue")) {</div><div class='del'>-				*flag &amp;= ~JFS_ERR_REMOUNT_RO;</div><div class='del'>-				*flag &amp;= ~JFS_ERR_PANIC;</div><div class='del'>-				*flag |= JFS_ERR_CONTINUE;</div><div class='del'>-			} else if (!strcmp(errors, "remount-ro")) {</div><div class='del'>-				*flag &amp;= ~JFS_ERR_CONTINUE;</div><div class='del'>-				*flag &amp;= ~JFS_ERR_PANIC;</div><div class='del'>-				*flag |= JFS_ERR_REMOUNT_RO;</div><div class='del'>-			} else if (!strcmp(errors, "panic")) {</div><div class='del'>-				*flag &amp;= ~JFS_ERR_CONTINUE;</div><div class='del'>-				*flag &amp;= ~JFS_ERR_REMOUNT_RO;</div><div class='del'>-				*flag |= JFS_ERR_PANIC;</div><div class='del'>-			} else {</div><div class='del'>-				pr_err("JFS: %s is an invalid error handler\n",</div><div class='del'>-				       errors);</div><div class='del'>-				goto cleanup;</div><div class='add'>+		if (!strcmp(param-&gt;string, "none"))</div><div class='add'>+			ctx-&gt;nls_map = NULL;</div><div class='add'>+		else {</div><div class='add'>+			nls_map = load_nls(param-&gt;string);</div><div class='add'>+			if (!nls_map) {</div><div class='add'>+				pr_err("JFS: charset not found\n");</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			break;</div><div class='add'>+			ctx-&gt;nls_map = nls_map;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resize:</div><div class='add'>+		if (!reconfigure)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ctx-&gt;resize = true;</div><div class='add'>+		ctx-&gt;newLVSize = result.uint_64;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resize_nosize:</div><div class='add'>+		if (!reconfigure)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ctx-&gt;resize = true;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_errors:</div><div class='add'>+		ctx-&gt;flag &amp;= ~JFS_ERR_MASK;</div><div class='add'>+		ctx-&gt;flag |= result.uint_32;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='del'>-		case Opt_quota:</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-			*flag |= JFS_USRQUOTA;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-			*flag |= JFS_GRPQUOTA;</div><div class='del'>-			break;</div><div class='add'>+	case Opt_quota:</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+		ctx-&gt;flag |= JFS_USRQUOTA;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+		ctx-&gt;flag |= JFS_GRPQUOTA;</div><div class='add'>+		break;</div><div class='ctx'> #else</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-		case Opt_quota:</div><div class='del'>-			pr_err("JFS: quota operations not supported\n");</div><div class='del'>-			break;</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+	case Opt_quota:</div><div class='add'>+		pr_err("JFS: quota operations not supported\n");</div><div class='add'>+		break;</div><div class='ctx'> #endif</div><div class='del'>-		case Opt_uid:</div><div class='del'>-		{</div><div class='del'>-			char *uid = args[0].from;</div><div class='del'>-			uid_t val;</div><div class='del'>-			int rc = kstrtouint(uid, 0, &amp;val);</div><div class='del'>-</div><div class='del'>-			if (rc)</div><div class='del'>-				goto cleanup;</div><div class='del'>-			sbi-&gt;uid = make_kuid(current_user_ns(), val);</div><div class='del'>-			if (!uid_valid(sbi-&gt;uid))</div><div class='del'>-				goto cleanup;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case Opt_gid:</div><div class='del'>-		{</div><div class='del'>-			char *gid = args[0].from;</div><div class='del'>-			gid_t val;</div><div class='del'>-			int rc = kstrtouint(gid, 0, &amp;val);</div><div class='del'>-</div><div class='del'>-			if (rc)</div><div class='del'>-				goto cleanup;</div><div class='del'>-			sbi-&gt;gid = make_kgid(current_user_ns(), val);</div><div class='del'>-			if (!gid_valid(sbi-&gt;gid))</div><div class='del'>-				goto cleanup;</div><div class='del'>-			break;</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		ctx-&gt;uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		ctx-&gt;gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_umask:</div><div class='add'>+		if (result.uint_32 &amp; ~0777) {</div><div class='add'>+			pr_err("JFS: Invalid value of umask\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		ctx-&gt;umask = result.uint_32;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case Opt_umask:</div><div class='del'>-		{</div><div class='del'>-			char *umask = args[0].from;</div><div class='del'>-			int rc = kstrtouint(umask, 8, &amp;sbi-&gt;umask);</div><div class='del'>-</div><div class='del'>-			if (rc)</div><div class='del'>-				goto cleanup;</div><div class='del'>-			if (sbi-&gt;umask &amp; ~0777) {</div><div class='del'>-				pr_err("JFS: Invalid value of umask\n");</div><div class='del'>-				goto cleanup;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	case Opt_discard:</div><div class='add'>+		/* if set to 1, even copying files will cause</div><div class='add'>+		 * trimming :O</div><div class='add'>+		 * -&gt; user has more control over the online trimming</div><div class='add'>+		 */</div><div class='add'>+		ctx-&gt;minblks_trim = 64;</div><div class='add'>+		ctx-&gt;flag |= JFS_DISCARD;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case Opt_discard:</div><div class='del'>-			/* if set to 1, even copying files will cause</div><div class='del'>-			 * trimming :O</div><div class='del'>-			 * -&gt; user has more control over the online trimming</div><div class='del'>-			 */</div><div class='del'>-			sbi-&gt;minblks_trim = 64;</div><div class='del'>-			if (bdev_max_discard_sectors(sb-&gt;s_bdev))</div><div class='del'>-				*flag |= JFS_DISCARD;</div><div class='del'>-			else</div><div class='del'>-				pr_err("JFS: discard option not supported on device\n");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_nodiscard:</div><div class='del'>-			*flag &amp;= ~JFS_DISCARD;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case Opt_discard_minblk:</div><div class='del'>-		{</div><div class='del'>-			char *minblks_trim = args[0].from;</div><div class='del'>-			int rc;</div><div class='del'>-			if (bdev_max_discard_sectors(sb-&gt;s_bdev)) {</div><div class='del'>-				*flag |= JFS_DISCARD;</div><div class='del'>-				rc = kstrtouint(minblks_trim, 0,</div><div class='del'>-						&amp;sbi-&gt;minblks_trim);</div><div class='del'>-				if (rc)</div><div class='del'>-					goto cleanup;</div><div class='del'>-			} else</div><div class='del'>-				pr_err("JFS: discard option not supported on device\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	case Opt_nodiscard:</div><div class='add'>+		ctx-&gt;flag &amp;= ~JFS_DISCARD;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			printk("jfs: Unrecognized mount option \"%s\" or missing value\n",</div><div class='del'>-			       p);</div><div class='del'>-			goto cleanup;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	case Opt_discard_minblk:</div><div class='add'>+		ctx-&gt;minblks_trim = result.uint_32;</div><div class='add'>+		ctx-&gt;flag |= JFS_DISCARD;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	if (nls_map != (void *) -1) {</div><div class='del'>-		/* Discard old (if remount) */</div><div class='del'>-		unload_nls(sbi-&gt;nls_tab);</div><div class='del'>-		sbi-&gt;nls_tab = nls_map;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='ctx'> </div><div class='del'>-cleanup:</div><div class='del'>-	if (nls_map &amp;&amp; nls_map != (void *) -1)</div><div class='del'>-		unload_nls(nls_map);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int jfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	s64 newLVSize = 0;</div><div class='add'>+	struct jfs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	int readonly = fc-&gt;sb_flags &amp; SB_RDONLY;</div><div class='ctx'> 	int rc = 0;</div><div class='del'>-	int flag = JFS_SBI(sb)-&gt;flag;</div><div class='add'>+	int flag = ctx-&gt;flag;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	if (!parse_options(data, sb, &amp;newLVSize, &amp;flag))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (newLVSize) {</div><div class='add'>+	/* Transfer results of parsing to the sbi */</div><div class='add'>+	JFS_SBI(sb)-&gt;flag = ctx-&gt;flag;</div><div class='add'>+	JFS_SBI(sb)-&gt;uid = ctx-&gt;uid;</div><div class='add'>+	JFS_SBI(sb)-&gt;gid = ctx-&gt;gid;</div><div class='add'>+	JFS_SBI(sb)-&gt;umask = ctx-&gt;umask;</div><div class='add'>+	JFS_SBI(sb)-&gt;minblks_trim = ctx-&gt;minblks_trim;</div><div class='add'>+	if (ctx-&gt;nls_map != (void *) -1) {</div><div class='add'>+		unload_nls(JFS_SBI(sb)-&gt;nls_tab);</div><div class='add'>+		JFS_SBI(sb)-&gt;nls_tab = ctx-&gt;nls_map;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;nls_map = NULL;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;resize) {</div><div class='ctx'> 		if (sb_rdonly(sb)) {</div><div class='ctx'> 			pr_err("JFS: resize requires volume to be mounted read-write\n");</div><div class='ctx'> 			return -EROFS;</div><div class='ctx'> 		}</div><div class='del'>-		rc = jfs_extendfs(sb, newLVSize, 0);</div><div class='add'>+</div><div class='add'>+		if (!ctx-&gt;newLVSize) {</div><div class='add'>+			ctx-&gt;newLVSize = sb_bdev_nr_blocks(sb);</div><div class='add'>+			if (ctx-&gt;newLVSize == 0)</div><div class='add'>+				pr_err("JFS: Cannot determine volume size\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = jfs_extendfs(sb, ctx-&gt;newLVSize, 0);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sb_rdonly(sb) &amp;&amp; !(*flags &amp; SB_RDONLY)) {</div><div class='add'>+	if (sb_rdonly(sb) &amp;&amp; !readonly) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Invalidate any previously read metadata.  fsck may have</div><div class='ctx'> 		 * changed the on-disk data since we mounted r/o</div><div class='hunk'>@@ -459,7 +414,7 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		dquot_resume(sb, -1);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	if (!sb_rdonly(sb) &amp;&amp; (*flags &amp; SB_RDONLY)) {</div><div class='add'>+	if (!sb_rdonly(sb) &amp;&amp; readonly) {</div><div class='ctx'> 		rc = dquot_suspend(sb, -1);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='hunk'>@@ -467,7 +422,7 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 		JFS_SBI(sb)-&gt;flag = flag;</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	if ((JFS_SBI(sb)-&gt;flag &amp; JFS_NOINTEGRITY) != (flag &amp; JFS_NOINTEGRITY))</div><div class='add'>+	if ((JFS_SBI(sb)-&gt;flag &amp; JFS_NOINTEGRITY) != (flag &amp; JFS_NOINTEGRITY)) {</div><div class='ctx'> 		if (!sb_rdonly(sb)) {</div><div class='ctx'> 			rc = jfs_umount_rw(sb);</div><div class='ctx'> 			if (rc)</div><div class='hunk'>@@ -477,18 +432,20 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 			ret = jfs_mount_rw(sb, 1);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> 	JFS_SBI(sb)-&gt;flag = flag;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int jfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct jfs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> 	struct jfs_sb_info *sbi;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int rc;</div><div class='del'>-	s64 newLVSize = 0;</div><div class='del'>-	int flag, ret = -EINVAL;</div><div class='add'>+	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	jfs_info("In jfs_read_super: s_flags=0x%lx", sb-&gt;s_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -501,24 +458,34 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	sb-&gt;s_time_min = 0;</div><div class='ctx'> 	sb-&gt;s_time_max = U32_MAX;</div><div class='ctx'> 	sbi-&gt;sb = sb;</div><div class='del'>-	sbi-&gt;uid = INVALID_UID;</div><div class='del'>-	sbi-&gt;gid = INVALID_GID;</div><div class='del'>-	sbi-&gt;umask = -1;</div><div class='ctx'> </div><div class='del'>-	/* initialize the mount flag and determine the default error handler */</div><div class='del'>-	flag = JFS_ERR_REMOUNT_RO;</div><div class='del'>-</div><div class='del'>-	if (!parse_options((char *) data, sb, &amp;newLVSize, &amp;flag))</div><div class='del'>-		goto out_kfree;</div><div class='del'>-	sbi-&gt;flag = flag;</div><div class='add'>+	/* Transfer results of parsing to the sbi */</div><div class='add'>+	sbi-&gt;flag = ctx-&gt;flag;</div><div class='add'>+	sbi-&gt;uid = ctx-&gt;uid;</div><div class='add'>+	sbi-&gt;gid = ctx-&gt;gid;</div><div class='add'>+	sbi-&gt;umask = ctx-&gt;umask;</div><div class='add'>+	if (ctx-&gt;nls_map != (void *) -1) {</div><div class='add'>+		unload_nls(sbi-&gt;nls_tab);</div><div class='add'>+		sbi-&gt;nls_tab = ctx-&gt;nls_map;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;nls_map = NULL;</div><div class='add'>+</div><div class='add'>+	if (sbi-&gt;flag &amp; JFS_DISCARD) {</div><div class='add'>+		if (!bdev_max_discard_sectors(sb-&gt;s_bdev)) {</div><div class='add'>+			pr_err("JFS: discard option not supported on device\n");</div><div class='add'>+			sbi-&gt;flag &amp;= ~JFS_DISCARD;</div><div class='add'>+		} else {</div><div class='add'>+			sbi-&gt;minblks_trim = ctx-&gt;minblks_trim;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JFS_POSIX_ACL</div><div class='ctx'> 	sb-&gt;s_flags |= SB_POSIXACL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (newLVSize) {</div><div class='add'>+	if (ctx-&gt;resize) {</div><div class='ctx'> 		pr_err("resize option for remount only\n");</div><div class='del'>-		goto out_kfree;</div><div class='add'>+		goto out_unload;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -575,7 +542,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	sb-&gt;s_magic = JFS_SUPER_MAGIC;</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;mntflag &amp; JFS_OS2)</div><div class='del'>-		sb-&gt;s_d_op = &amp;jfs_ci_dentry_operations;</div><div class='add'>+		set_default_d_op(sb, &amp;jfs_ci_dentry_operations);</div><div class='ctx'> </div><div class='ctx'> 	inode = jfs_iget(sb, ROOT_I);</div><div class='ctx'> 	if (IS_ERR(inode)) {</div><div class='hunk'>@@ -608,7 +575,6 @@ out_mount_failed:</div><div class='ctx'> 	sbi-&gt;direct_inode = NULL;</div><div class='ctx'> out_unload:</div><div class='ctx'> 	unload_nls(sbi-&gt;nls_tab);</div><div class='del'>-out_kfree:</div><div class='ctx'> 	kfree(sbi);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -664,10 +630,9 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *jfs_do_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int jfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, jfs_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, jfs_fill_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int jfs_sync_fs(struct super_block *sb, int wait)</div><div class='hunk'>@@ -801,7 +766,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 		}</div><div class='ctx'> 		lock_buffer(bh);</div><div class='ctx'> 		memcpy(bh-&gt;b_data+offset, data, tocopy);</div><div class='del'>-		flush_dcache_page(bh-&gt;b_page);</div><div class='add'>+		flush_dcache_folio(bh-&gt;b_folio);</div><div class='ctx'> 		set_buffer_uptodate(bh);</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='hunk'>@@ -824,7 +789,7 @@ out:</div><div class='ctx'> 	return len - towrite;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dquot **jfs_get_dquots(struct inode *inode)</div><div class='add'>+static struct dquot __rcu **jfs_get_dquots(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return JFS_IP(inode)-&gt;i_dquot;</div><div class='ctx'> }</div><div class='hunk'>@@ -886,7 +851,6 @@ static const struct super_operations jfs_super_operations = {</div><div class='ctx'> 	.freeze_fs	= jfs_freeze,</div><div class='ctx'> 	.unfreeze_fs	= jfs_unfreeze,</div><div class='ctx'> 	.statfs		= jfs_statfs,</div><div class='del'>-	.remount_fs	= jfs_remount,</div><div class='ctx'> 	.show_options	= jfs_show_options,</div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='ctx'> 	.quota_read	= jfs_quota_read,</div><div class='hunk'>@@ -902,12 +866,71 @@ static const struct export_operations jfs_export_operations = {</div><div class='ctx'> 	.get_parent	= jfs_get_parent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void jfs_init_options(struct fs_context *fc, struct jfs_context *ctx)</div><div class='add'>+{</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+		struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+</div><div class='add'>+		/* Copy over current option values and mount flags */</div><div class='add'>+		ctx-&gt;uid = JFS_SBI(sb)-&gt;uid;</div><div class='add'>+		ctx-&gt;gid = JFS_SBI(sb)-&gt;gid;</div><div class='add'>+		ctx-&gt;umask = JFS_SBI(sb)-&gt;umask;</div><div class='add'>+		ctx-&gt;nls_map = (void *)-1;</div><div class='add'>+		ctx-&gt;minblks_trim = JFS_SBI(sb)-&gt;minblks_trim;</div><div class='add'>+		ctx-&gt;flag = JFS_SBI(sb)-&gt;flag;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Initialize the mount flag and determine the default</div><div class='add'>+		 * error handler</div><div class='add'>+		 */</div><div class='add'>+		ctx-&gt;flag = JFS_ERR_REMOUNT_RO;</div><div class='add'>+		ctx-&gt;uid = INVALID_UID;</div><div class='add'>+		ctx-&gt;gid = INVALID_GID;</div><div class='add'>+		ctx-&gt;umask = -1;</div><div class='add'>+		ctx-&gt;nls_map = (void *)-1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void jfs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct jfs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;nls_map != (void *) -1)</div><div class='add'>+		unload_nls(ctx-&gt;nls_map);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations jfs_context_ops = {</div><div class='add'>+	.parse_param	= jfs_parse_param,</div><div class='add'>+	.get_tree	= jfs_get_tree,</div><div class='add'>+	.reconfigure	= jfs_reconfigure,</div><div class='add'>+	.free		= jfs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int jfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct jfs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	jfs_init_options(fc, ctx);</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;jfs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct file_system_type jfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "jfs",</div><div class='del'>-	.mount		= jfs_do_mount,</div><div class='ctx'> 	.kill_sb	= kill_block_super,</div><div class='ctx'> 	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = jfs_init_fs_context,</div><div class='add'>+	.parameters	= jfs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("jfs");</div><div class='ctx'> </div><div class='hunk'>@@ -932,7 +955,7 @@ static int __init init_jfs_fs(void)</div><div class='ctx'> </div><div class='ctx'> 	jfs_inode_cachep =</div><div class='ctx'> 	    kmem_cache_create_usercopy("jfs_ip", sizeof(struct jfs_inode_info),</div><div class='del'>-			0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_ACCOUNT,</div><div class='add'>+			0, SLAB_RECLAIM_ACCOUNT|SLAB_ACCOUNT,</div><div class='ctx'> 			offsetof(struct jfs_inode_info, i_inline_all),</div><div class='ctx'> 			sizeof_field(struct jfs_inode_info, i_inline_all),</div><div class='ctx'> 			init_once);</div><div class='head'>diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c<br/>index 0fb7afac298e..11d7f74d207b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/jfs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/jfs/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/jfs/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/jfs/xattr.c</a></div><div class='hunk'>@@ -434,6 +434,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int quota_allocation = 0;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;ea_buf-&gt;new_ea, 0, sizeof(ea_buf-&gt;new_ea));</div><div class='add'>+</div><div class='ctx'> 	/* When fsck.jfs clears a bad ea, it doesn't clear the size */</div><div class='ctx'> 	if (ji-&gt;ea.flag == 0)</div><div class='ctx'> 		ea_size = 0;</div><div class='hunk'>@@ -557,9 +559,16 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)</div><div class='ctx'> </div><div class='ctx'>       size_check:</div><div class='ctx'> 	if (EALIST_SIZE(ea_buf-&gt;xattr) != ea_size) {</div><div class='del'>-		printk(KERN_ERR "ea_get: invalid extended attribute\n");</div><div class='del'>-		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,</div><div class='del'>-				     ea_buf-&gt;xattr, ea_size, 1);</div><div class='add'>+		if (unlikely(EALIST_SIZE(ea_buf-&gt;xattr) &gt; INT_MAX)) {</div><div class='add'>+			printk(KERN_ERR "ea_get: extended attribute size too large: %u &gt; INT_MAX\n",</div><div class='add'>+			       EALIST_SIZE(ea_buf-&gt;xattr));</div><div class='add'>+		} else {</div><div class='add'>+			int size = clamp_t(int, ea_size, 0, EALIST_SIZE(ea_buf-&gt;xattr));</div><div class='add'>+</div><div class='add'>+			printk(KERN_ERR "ea_get: invalid extended attribute\n");</div><div class='add'>+			print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,</div><div class='add'>+				       ea_buf-&gt;xattr, size, 1);</div><div class='add'>+		}</div><div class='ctx'> 		ea_release(inode, ea_buf);</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto clean_up;</div><div class='hunk'>@@ -795,7 +804,7 @@ ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data,</div><div class='ctx'> 		       size_t buf_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct jfs_ea_list *ealist;</div><div class='del'>-	struct jfs_ea *ea;</div><div class='add'>+	struct jfs_ea *ea, *ealist_end;</div><div class='ctx'> 	struct ea_buffer ea_buf;</div><div class='ctx'> 	int xattr_size;</div><div class='ctx'> 	ssize_t size;</div><div class='hunk'>@@ -815,9 +824,16 @@ ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data,</div><div class='ctx'> 		goto not_found;</div><div class='ctx'> </div><div class='ctx'> 	ealist = (struct jfs_ea_list *) ea_buf.xattr;</div><div class='add'>+	ealist_end = END_EALIST(ealist);</div><div class='ctx'> </div><div class='ctx'> 	/* Find the named attribute */</div><div class='del'>-	for (ea = FIRST_EA(ealist); ea &lt; END_EALIST(ealist); ea = NEXT_EA(ea))</div><div class='add'>+	for (ea = FIRST_EA(ealist); ea &lt; ealist_end; ea = NEXT_EA(ea)) {</div><div class='add'>+		if (unlikely(ea + 1 &gt; ealist_end) ||</div><div class='add'>+		    unlikely(NEXT_EA(ea) &gt; ealist_end)) {</div><div class='add'>+			size = -EUCLEAN;</div><div class='add'>+			goto release;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if ((namelen == ea-&gt;namelen) &amp;&amp;</div><div class='ctx'> 		    memcmp(name, ea-&gt;name, namelen) == 0) {</div><div class='ctx'> 			/* Found it */</div><div class='hunk'>@@ -832,6 +848,7 @@ ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data,</div><div class='ctx'> 			memcpy(data, value, size);</div><div class='ctx'> 			goto release;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'>       not_found:</div><div class='ctx'> 	size = -ENODATA;</div><div class='ctx'>       release:</div><div class='hunk'>@@ -859,7 +876,7 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)</div><div class='ctx'> 	ssize_t size = 0;</div><div class='ctx'> 	int xattr_size;</div><div class='ctx'> 	struct jfs_ea_list *ealist;</div><div class='del'>-	struct jfs_ea *ea;</div><div class='add'>+	struct jfs_ea *ea, *ealist_end;</div><div class='ctx'> 	struct ea_buffer ea_buf;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;JFS_IP(inode)-&gt;xattr_sem);</div><div class='hunk'>@@ -874,9 +891,16 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)</div><div class='ctx'> 		goto release;</div><div class='ctx'> </div><div class='ctx'> 	ealist = (struct jfs_ea_list *) ea_buf.xattr;</div><div class='add'>+	ealist_end = END_EALIST(ealist);</div><div class='ctx'> </div><div class='ctx'> 	/* compute required size of list */</div><div class='del'>-	for (ea = FIRST_EA(ealist); ea &lt; END_EALIST(ealist); ea = NEXT_EA(ea)) {</div><div class='add'>+	for (ea = FIRST_EA(ealist); ea &lt; ealist_end; ea = NEXT_EA(ea)) {</div><div class='add'>+		if (unlikely(ea + 1 &gt; ealist_end) ||</div><div class='add'>+		    unlikely(NEXT_EA(ea) &gt; ealist_end)) {</div><div class='add'>+			size = -EUCLEAN;</div><div class='add'>+			goto release;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (can_list(ea))</div><div class='ctx'> 			size += name_size(ea) + 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/kernel_read_file.c b/fs/kernel_read_file.c<br/>index c429c42a6867..de32c95d823d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernel_read_file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernel_read_file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernel_read_file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernel_read_file.c</a></div><div class='hunk'>@@ -175,15 +175,11 @@ ssize_t kernel_read_file_from_fd(int fd, loff_t offset, void **buf,</div><div class='ctx'> 				 size_t buf_size, size_t *file_size,</div><div class='ctx'> 				 enum kernel_read_file_id id)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='del'>-	ssize_t ret = -EBADF;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> </div><div class='del'>-	if (!f.file || !(f.file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-		goto out;</div><div class='add'>+	if (fd_empty(f) || !(fd_file(f)-&gt;f_mode &amp; FMODE_READ))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	ret = kernel_read_file(f.file, offset, buf, buf_size, file_size, id);</div><div class='del'>-out:</div><div class='del'>-	fdput(f);</div><div class='del'>-	return ret;</div><div class='add'>+	return kernel_read_file(fd_file(f), offset, buf, buf_size, file_size, id);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kernel_read_file_from_fd);</div><div class='head'>diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c<br/>index bce1d7ac95ca..5c0efd6b239f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernfs/dir.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "kernfs-internal.h"</div><div class='ctx'> </div><div class='del'>-static DEFINE_RWLOCK(kernfs_rename_lock);	/* kn-&gt;parent and -&gt;name */</div><div class='ctx'> /*</div><div class='ctx'>  * Don't use rename_lock to piggy back on pr_cont_buf. We don't want to</div><div class='ctx'>  * call pr_cont() while holding rename_lock. Because sometimes pr_cont()</div><div class='hunk'>@@ -27,7 +26,6 @@ static DEFINE_RWLOCK(kernfs_rename_lock);	/* kn-&gt;parent and -&gt;name */</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_SPINLOCK(kernfs_pr_cont_lock);</div><div class='ctx'> static char kernfs_pr_cont_buf[PATH_MAX];	/* protected by pr_cont_lock */</div><div class='del'>-static DEFINE_SPINLOCK(kernfs_idr_lock);	/* root-&gt;ino_idr */</div><div class='ctx'> </div><div class='ctx'> #define rb_to_kn(X) rb_entry((X), struct kernfs_node, rb)</div><div class='ctx'> </div><div class='hunk'>@@ -51,22 +49,14 @@ static bool kernfs_lockdep(struct kernfs_node *kn)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kernfs_name_locked(struct kernfs_node *kn, char *buf, size_t buflen)</div><div class='del'>-{</div><div class='del'>-	if (!kn)</div><div class='del'>-		return strscpy(buf, "(null)", buflen);</div><div class='del'>-</div><div class='del'>-	return strscpy(buf, kn-&gt;parent ? kn-&gt;name : "/", buflen);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* kernfs_node_depth - compute depth from @from to @to */</div><div class='ctx'> static size_t kernfs_depth(struct kernfs_node *from, struct kernfs_node *to)</div><div class='ctx'> {</div><div class='ctx'> 	size_t depth = 0;</div><div class='ctx'> </div><div class='del'>-	while (to-&gt;parent &amp;&amp; to != from) {</div><div class='add'>+	while (rcu_dereference(to-&gt;__parent) &amp;&amp; to != from) {</div><div class='ctx'> 		depth++;</div><div class='del'>-		to = to-&gt;parent;</div><div class='add'>+		to = rcu_dereference(to-&gt;__parent);</div><div class='ctx'> 	}</div><div class='ctx'> 	return depth;</div><div class='ctx'> }</div><div class='hunk'>@@ -84,18 +74,18 @@ static struct kernfs_node *kernfs_common_ancestor(struct kernfs_node *a,</div><div class='ctx'> 	db = kernfs_depth(rb-&gt;kn, b);</div><div class='ctx'> </div><div class='ctx'> 	while (da &gt; db) {</div><div class='del'>-		a = a-&gt;parent;</div><div class='add'>+		a = rcu_dereference(a-&gt;__parent);</div><div class='ctx'> 		da--;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (db &gt; da) {</div><div class='del'>-		b = b-&gt;parent;</div><div class='add'>+		b = rcu_dereference(b-&gt;__parent);</div><div class='ctx'> 		db--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* worst case b and a will be the same at root */</div><div class='ctx'> 	while (b != a) {</div><div class='del'>-		b = b-&gt;parent;</div><div class='del'>-		a = a-&gt;parent;</div><div class='add'>+		b = rcu_dereference(b-&gt;__parent);</div><div class='add'>+		a = rcu_dereference(a-&gt;__parent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return a;</div><div class='hunk'>@@ -168,10 +158,13 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate how many bytes we need for the rest */</div><div class='ctx'> 	for (i = depth_to - 1; i &gt;= 0; i--) {</div><div class='add'>+		const char *name;</div><div class='add'>+</div><div class='ctx'> 		for (kn = kn_to, j = 0; j &lt; i; j++)</div><div class='del'>-			kn = kn-&gt;parent;</div><div class='add'>+			kn = rcu_dereference(kn-&gt;__parent);</div><div class='ctx'> </div><div class='del'>-		len += scnprintf(buf + len, buflen - len, "/%s", kn-&gt;name);</div><div class='add'>+		name = rcu_dereference(kn-&gt;name);</div><div class='add'>+		len += scnprintf(buf + len, buflen - len, "/%s", name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='hunk'>@@ -195,13 +188,18 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,</div><div class='ctx'>  */</div><div class='ctx'> int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='add'>+	struct kernfs_node *kn_parent;</div><div class='ctx'> </div><div class='del'>-	read_lock_irqsave(&amp;kernfs_rename_lock, flags);</div><div class='del'>-	ret = kernfs_name_locked(kn, buf, buflen);</div><div class='del'>-	read_unlock_irqrestore(&amp;kernfs_rename_lock, flags);</div><div class='del'>-	return ret;</div><div class='add'>+	if (!kn)</div><div class='add'>+		return strscpy(buf, "(null)", buflen);</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	/*</div><div class='add'>+	 * KERNFS_ROOT_INVARIANT_PARENT is ignored here. The name is RCU freed and</div><div class='add'>+	 * the parent is either existing or not.</div><div class='add'>+	 */</div><div class='add'>+	kn_parent = rcu_dereference(kn-&gt;__parent);</div><div class='add'>+	return strscpy(buf, kn_parent ? rcu_dereference(kn-&gt;name) : "/", buflen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -223,13 +221,17 @@ int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen)</div><div class='ctx'> int kernfs_path_from_node(struct kernfs_node *to, struct kernfs_node *from,</div><div class='ctx'> 			  char *buf, size_t buflen)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='add'>+	struct kernfs_root *root;</div><div class='ctx'> </div><div class='del'>-	read_lock_irqsave(&amp;kernfs_rename_lock, flags);</div><div class='del'>-	ret = kernfs_path_from_node_locked(to, from, buf, buflen);</div><div class='del'>-	read_unlock_irqrestore(&amp;kernfs_rename_lock, flags);</div><div class='del'>-	return ret;</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	if (to) {</div><div class='add'>+		root = kernfs_root(to);</div><div class='add'>+		if (!(root-&gt;flags &amp; KERNFS_ROOT_INVARIANT_PARENT)) {</div><div class='add'>+			guard(read_lock_irqsave)(&amp;root-&gt;kernfs_rename_lock);</div><div class='add'>+			return kernfs_path_from_node_locked(to, from, buf, buflen);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return kernfs_path_from_node_locked(to, from, buf, buflen);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kernfs_path_from_node);</div><div class='ctx'> </div><div class='hunk'>@@ -292,12 +294,14 @@ out:</div><div class='ctx'> struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='ctx'> 	struct kernfs_node *parent;</div><div class='add'>+	struct kernfs_root *root;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	read_lock_irqsave(&amp;kernfs_rename_lock, flags);</div><div class='del'>-	parent = kn-&gt;parent;</div><div class='add'>+	root = kernfs_root(kn);</div><div class='add'>+	read_lock_irqsave(&amp;root-&gt;kernfs_rename_lock, flags);</div><div class='add'>+	parent = kernfs_parent(kn);</div><div class='ctx'> 	kernfs_get(parent);</div><div class='del'>-	read_unlock_irqrestore(&amp;kernfs_rename_lock, flags);</div><div class='add'>+	read_unlock_irqrestore(&amp;root-&gt;kernfs_rename_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return parent;</div><div class='ctx'> }</div><div class='hunk'>@@ -336,13 +340,13 @@ static int kernfs_name_compare(unsigned int hash, const char *name,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	if (ns &gt; kn-&gt;ns)</div><div class='ctx'> 		return 1;</div><div class='del'>-	return strcmp(name, kn-&gt;name);</div><div class='add'>+	return strcmp(name, kernfs_rcu_name(kn));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kernfs_sd_compare(const struct kernfs_node *left,</div><div class='ctx'> 			     const struct kernfs_node *right)</div><div class='ctx'> {</div><div class='del'>-	return kernfs_name_compare(left-&gt;hash, left-&gt;name, left-&gt;ns, right);</div><div class='add'>+	return kernfs_name_compare(left-&gt;hash, kernfs_rcu_name(left), left-&gt;ns, right);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -360,8 +364,12 @@ static int kernfs_sd_compare(const struct kernfs_node *left,</div><div class='ctx'>  */</div><div class='ctx'> static int kernfs_link_sibling(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='del'>-	struct rb_node **node = &amp;kn-&gt;parent-&gt;dir.children.rb_node;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='add'>+	struct kernfs_node *kn_parent;</div><div class='add'>+	struct rb_node **node;</div><div class='add'>+</div><div class='add'>+	kn_parent = kernfs_parent(kn);</div><div class='add'>+	node = &amp;kn_parent-&gt;dir.children.rb_node;</div><div class='ctx'> </div><div class='ctx'> 	while (*node) {</div><div class='ctx'> 		struct kernfs_node *pos;</div><div class='hunk'>@@ -380,13 +388,13 @@ static int kernfs_link_sibling(struct kernfs_node *kn)</div><div class='ctx'> </div><div class='ctx'> 	/* add new node and rebalance the tree */</div><div class='ctx'> 	rb_link_node(&amp;kn-&gt;rb, parent, node);</div><div class='del'>-	rb_insert_color(&amp;kn-&gt;rb, &amp;kn-&gt;parent-&gt;dir.children);</div><div class='add'>+	rb_insert_color(&amp;kn-&gt;rb, &amp;kn_parent-&gt;dir.children);</div><div class='ctx'> </div><div class='ctx'> 	/* successfully added, account subdir number */</div><div class='ctx'> 	down_write(&amp;kernfs_root(kn)-&gt;kernfs_iattr_rwsem);</div><div class='ctx'> 	if (kernfs_type(kn) == KERNFS_DIR)</div><div class='del'>-		kn-&gt;parent-&gt;dir.subdirs++;</div><div class='del'>-	kernfs_inc_rev(kn-&gt;parent);</div><div class='add'>+		kn_parent-&gt;dir.subdirs++;</div><div class='add'>+	kernfs_inc_rev(kn_parent);</div><div class='ctx'> 	up_write(&amp;kernfs_root(kn)-&gt;kernfs_iattr_rwsem);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -407,16 +415,19 @@ static int kernfs_link_sibling(struct kernfs_node *kn)</div><div class='ctx'>  */</div><div class='ctx'> static bool kernfs_unlink_sibling(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='add'>+	struct kernfs_node *kn_parent;</div><div class='add'>+</div><div class='ctx'> 	if (RB_EMPTY_NODE(&amp;kn-&gt;rb))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	kn_parent = kernfs_parent(kn);</div><div class='ctx'> 	down_write(&amp;kernfs_root(kn)-&gt;kernfs_iattr_rwsem);</div><div class='ctx'> 	if (kernfs_type(kn) == KERNFS_DIR)</div><div class='del'>-		kn-&gt;parent-&gt;dir.subdirs--;</div><div class='del'>-	kernfs_inc_rev(kn-&gt;parent);</div><div class='add'>+		kn_parent-&gt;dir.subdirs--;</div><div class='add'>+	kernfs_inc_rev(kn_parent);</div><div class='ctx'> 	up_write(&amp;kernfs_root(kn)-&gt;kernfs_iattr_rwsem);</div><div class='ctx'> </div><div class='del'>-	rb_erase(&amp;kn-&gt;rb, &amp;kn-&gt;parent-&gt;dir.children);</div><div class='add'>+	rb_erase(&amp;kn-&gt;rb, &amp;kn_parent-&gt;dir.children);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;kn-&gt;rb);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -529,6 +540,21 @@ void kernfs_get(struct kernfs_node *kn)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kernfs_get);</div><div class='ctx'> </div><div class='add'>+static void kernfs_free_rcu(struct rcu_head *rcu)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_node *kn = container_of(rcu, struct kernfs_node, rcu);</div><div class='add'>+</div><div class='add'>+	/* If the whole node goes away, then name can't be used outside */</div><div class='add'>+	kfree_const(rcu_access_pointer(kn-&gt;name));</div><div class='add'>+</div><div class='add'>+	if (kn-&gt;iattr) {</div><div class='add'>+		simple_xattrs_free(&amp;kn-&gt;iattr-&gt;xattrs, NULL);</div><div class='add'>+		kmem_cache_free(kernfs_iattrs_cache, kn-&gt;iattr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(kernfs_node_cache, kn);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kernfs_put - put a reference count on a kernfs_node</div><div class='ctx'>  * @kn: the target kernfs_node</div><div class='hunk'>@@ -548,25 +574,21 @@ void kernfs_put(struct kernfs_node *kn)</div><div class='ctx'> 	 * Moving/renaming is always done while holding reference.</div><div class='ctx'> 	 * kn-&gt;parent won't change beneath us.</div><div class='ctx'> 	 */</div><div class='del'>-	parent = kn-&gt;parent;</div><div class='add'>+	parent = kernfs_parent(kn);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ONCE(atomic_read(&amp;kn-&gt;active) != KN_DEACTIVATED_BIAS,</div><div class='ctx'> 		  "kernfs_put: %s/%s: released with incorrect active_ref %d\n",</div><div class='del'>-		  parent ? parent-&gt;name : "", kn-&gt;name, atomic_read(&amp;kn-&gt;active));</div><div class='add'>+		  parent ? rcu_dereference(parent-&gt;name) : "",</div><div class='add'>+		  rcu_dereference(kn-&gt;name), atomic_read(&amp;kn-&gt;active));</div><div class='ctx'> </div><div class='ctx'> 	if (kernfs_type(kn) == KERNFS_LINK)</div><div class='ctx'> 		kernfs_put(kn-&gt;symlink.target_kn);</div><div class='ctx'> </div><div class='del'>-	kfree_const(kn-&gt;name);</div><div class='del'>-</div><div class='del'>-	if (kn-&gt;iattr) {</div><div class='del'>-		simple_xattrs_free(&amp;kn-&gt;iattr-&gt;xattrs, NULL);</div><div class='del'>-		kmem_cache_free(kernfs_iattrs_cache, kn-&gt;iattr);</div><div class='del'>-	}</div><div class='del'>-	spin_lock(&amp;kernfs_idr_lock);</div><div class='add'>+	spin_lock(&amp;root-&gt;kernfs_idr_lock);</div><div class='ctx'> 	idr_remove(&amp;root-&gt;ino_idr, (u32)kernfs_ino(kn));</div><div class='del'>-	spin_unlock(&amp;kernfs_idr_lock);</div><div class='del'>-	kmem_cache_free(kernfs_node_cache, kn);</div><div class='add'>+	spin_unlock(&amp;root-&gt;kernfs_idr_lock);</div><div class='add'>+</div><div class='add'>+	call_rcu(&amp;kn-&gt;rcu, kernfs_free_rcu);</div><div class='ctx'> </div><div class='ctx'> 	kn = parent;</div><div class='ctx'> 	if (kn) {</div><div class='hunk'>@@ -575,7 +597,7 @@ void kernfs_put(struct kernfs_node *kn)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* just released the root kn, free @root too */</div><div class='ctx'> 		idr_destroy(&amp;root-&gt;ino_idr);</div><div class='del'>-		kfree(root);</div><div class='add'>+		kfree_rcu(root, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kernfs_put);</div><div class='hunk'>@@ -617,13 +639,13 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,</div><div class='ctx'> 		goto err_out1;</div><div class='ctx'> </div><div class='ctx'> 	idr_preload(GFP_KERNEL);</div><div class='del'>-	spin_lock(&amp;kernfs_idr_lock);</div><div class='add'>+	spin_lock(&amp;root-&gt;kernfs_idr_lock);</div><div class='ctx'> 	ret = idr_alloc_cyclic(&amp;root-&gt;ino_idr, kn, 1, 0, GFP_ATOMIC);</div><div class='ctx'> 	if (ret &gt;= 0 &amp;&amp; ret &lt; root-&gt;last_id_lowbits)</div><div class='ctx'> 		root-&gt;id_highbits++;</div><div class='ctx'> 	id_highbits = root-&gt;id_highbits;</div><div class='ctx'> 	root-&gt;last_id_lowbits = ret;</div><div class='del'>-	spin_unlock(&amp;kernfs_idr_lock);</div><div class='add'>+	spin_unlock(&amp;root-&gt;kernfs_idr_lock);</div><div class='ctx'> 	idr_preload_end();</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_out2;</div><div class='hunk'>@@ -634,7 +656,7 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,</div><div class='ctx'> 	atomic_set(&amp;kn-&gt;active, KN_DEACTIVATED_BIAS);</div><div class='ctx'> 	RB_CLEAR_NODE(&amp;kn-&gt;rb);</div><div class='ctx'> </div><div class='del'>-	kn-&gt;name = name;</div><div class='add'>+	rcu_assign_pointer(kn-&gt;name, name);</div><div class='ctx'> 	kn-&gt;mode = mode;</div><div class='ctx'> 	kn-&gt;flags = flags;</div><div class='ctx'> </div><div class='hunk'>@@ -653,15 +675,18 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,</div><div class='ctx'> 	if (parent) {</div><div class='ctx'> 		ret = security_kernfs_init_security(parent, kn);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto err_out3;</div><div class='add'>+			goto err_out4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return kn;</div><div class='ctx'> </div><div class='add'>+ err_out4:</div><div class='add'>+	simple_xattrs_free(&amp;kn-&gt;iattr-&gt;xattrs, NULL);</div><div class='add'>+	kmem_cache_free(kernfs_iattrs_cache, kn-&gt;iattr);</div><div class='ctx'>  err_out3:</div><div class='del'>-	spin_lock(&amp;kernfs_idr_lock);</div><div class='add'>+	spin_lock(&amp;root-&gt;kernfs_idr_lock);</div><div class='ctx'> 	idr_remove(&amp;root-&gt;ino_idr, (u32)kernfs_ino(kn));</div><div class='del'>-	spin_unlock(&amp;kernfs_idr_lock);</div><div class='add'>+	spin_unlock(&amp;root-&gt;kernfs_idr_lock);</div><div class='ctx'>  err_out2:</div><div class='ctx'> 	kmem_cache_free(kernfs_node_cache, kn);</div><div class='ctx'>  err_out1:</div><div class='hunk'>@@ -692,7 +717,7 @@ struct kernfs_node *kernfs_new_node(struct kernfs_node *parent,</div><div class='ctx'> 			       name, mode, uid, gid, flags);</div><div class='ctx'> 	if (kn) {</div><div class='ctx'> 		kernfs_get(parent);</div><div class='del'>-		kn-&gt;parent = parent;</div><div class='add'>+		rcu_assign_pointer(kn-&gt;__parent, parent);</div><div class='ctx'> 	}</div><div class='ctx'> 	return kn;</div><div class='ctx'> }</div><div class='hunk'>@@ -715,7 +740,7 @@ struct kernfs_node *kernfs_find_and_get_node_by_id(struct kernfs_root *root,</div><div class='ctx'> 	ino_t ino = kernfs_id_ino(id);</div><div class='ctx'> 	u32 gen = kernfs_id_gen(id);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;kernfs_idr_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	kn = idr_find(&amp;root-&gt;ino_idr, (u32)ino);</div><div class='ctx'> 	if (!kn)</div><div class='hunk'>@@ -739,10 +764,10 @@ struct kernfs_node *kernfs_find_and_get_node_by_id(struct kernfs_root *root,</div><div class='ctx'> 	if (unlikely(!__kernfs_active(kn) || !atomic_inc_not_zero(&amp;kn-&gt;count)))</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;kernfs_idr_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return kn;</div><div class='ctx'> err_unlock:</div><div class='del'>-	spin_unlock(&amp;kernfs_idr_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -760,18 +785,20 @@ err_unlock:</div><div class='ctx'>  */</div><div class='ctx'> int kernfs_add_one(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='del'>-	struct kernfs_node *parent = kn-&gt;parent;</div><div class='del'>-	struct kernfs_root *root = kernfs_root(parent);</div><div class='add'>+	struct kernfs_root *root = kernfs_root(kn);</div><div class='ctx'> 	struct kernfs_iattrs *ps_iattr;</div><div class='add'>+	struct kernfs_node *parent;</div><div class='ctx'> 	bool has_ns;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;root-&gt;kernfs_rwsem);</div><div class='add'>+	parent = kernfs_parent(kn);</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	has_ns = kernfs_ns_enabled(parent);</div><div class='ctx'> 	if (WARN(has_ns != (bool)kn-&gt;ns, KERN_WARNING "kernfs: ns %s in '%s' for '%s'\n",</div><div class='del'>-		 has_ns ? "required" : "invalid", parent-&gt;name, kn-&gt;name))</div><div class='add'>+		 has_ns ? "required" : "invalid",</div><div class='add'>+		 kernfs_rcu_name(parent), kernfs_rcu_name(kn)))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (kernfs_type(parent) != KERNFS_DIR)</div><div class='hunk'>@@ -781,7 +808,7 @@ int kernfs_add_one(struct kernfs_node *kn)</div><div class='ctx'> 	if (parent-&gt;flags &amp; (KERNFS_REMOVING | KERNFS_EMPTY_DIR))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	kn-&gt;hash = kernfs_name_hash(kn-&gt;name, kn-&gt;ns);</div><div class='add'>+	kn-&gt;hash = kernfs_name_hash(kernfs_rcu_name(kn), kn-&gt;ns);</div><div class='ctx'> </div><div class='ctx'> 	ret = kernfs_link_sibling(kn);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -837,7 +864,7 @@ static struct kernfs_node *kernfs_find_ns(struct kernfs_node *parent,</div><div class='ctx'> </div><div class='ctx'> 	if (has_ns != (bool)ns) {</div><div class='ctx'> 		WARN(1, KERN_WARNING "kernfs: ns %s in '%s' for '%s'\n",</div><div class='del'>-		     has_ns ? "required" : "invalid", parent-&gt;name, name);</div><div class='add'>+		     has_ns ? "required" : "invalid", kernfs_rcu_name(parent), name);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -940,6 +967,11 @@ struct kernfs_node *kernfs_walk_and_get_ns(struct kernfs_node *parent,</div><div class='ctx'> 	return kn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned int kernfs_root_flags(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	return kernfs_root(kn)-&gt;flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kernfs_create_root - create a new kernfs hierarchy</div><div class='ctx'>  * @scops: optional syscall operations for the hierarchy</div><div class='hunk'>@@ -960,10 +992,12 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	idr_init(&amp;root-&gt;ino_idr);</div><div class='add'>+	spin_lock_init(&amp;root-&gt;kernfs_idr_lock);</div><div class='ctx'> 	init_rwsem(&amp;root-&gt;kernfs_rwsem);</div><div class='ctx'> 	init_rwsem(&amp;root-&gt;kernfs_iattr_rwsem);</div><div class='ctx'> 	init_rwsem(&amp;root-&gt;kernfs_supers_rwsem);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;root-&gt;supers);</div><div class='add'>+	rwlock_init(&amp;root-&gt;kernfs_rename_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On 64bit ino setups, id is ino.  On 32bit, low 32bits are ino.</div><div class='hunk'>@@ -1100,9 +1134,10 @@ struct kernfs_node *kernfs_create_empty_dir(struct kernfs_node *parent,</div><div class='ctx'> 	return ERR_PTR(rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kernfs_dop_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int kernfs_dop_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct kernfs_node *kn;</div><div class='add'>+	struct kernfs_node *kn, *parent;</div><div class='ctx'> 	struct kernfs_root *root;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='hunk'>@@ -1110,8 +1145,6 @@ static int kernfs_dop_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> </div><div class='ctx'> 	/* Negative hashed dentry? */</div><div class='ctx'> 	if (d_really_is_negative(dentry)) {</div><div class='del'>-		struct kernfs_node *parent;</div><div class='del'>-</div><div class='ctx'> 		/* If the kernfs parent node has changed discard and</div><div class='ctx'> 		 * proceed to -&gt;lookup.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -1153,16 +1186,17 @@ static int kernfs_dop_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	if (!kernfs_active(kn))</div><div class='ctx'> 		goto out_bad;</div><div class='ctx'> </div><div class='add'>+	parent = kernfs_parent(kn);</div><div class='ctx'> 	/* The kernfs node has been moved? */</div><div class='del'>-	if (kernfs_dentry_node(dentry-&gt;d_parent) != kn-&gt;parent)</div><div class='add'>+	if (kernfs_dentry_node(dentry-&gt;d_parent) != parent)</div><div class='ctx'> 		goto out_bad;</div><div class='ctx'> </div><div class='ctx'> 	/* The kernfs node has been renamed */</div><div class='del'>-	if (strcmp(dentry-&gt;d_name.name, kn-&gt;name) != 0)</div><div class='add'>+	if (strcmp(dentry-&gt;d_name.name, kernfs_rcu_name(kn)) != 0)</div><div class='ctx'> 		goto out_bad;</div><div class='ctx'> </div><div class='ctx'> 	/* The kernfs node has been moved to a different namespace */</div><div class='del'>-	if (kn-&gt;parent &amp;&amp; kernfs_ns_enabled(kn-&gt;parent) &amp;&amp;</div><div class='add'>+	if (parent &amp;&amp; kernfs_ns_enabled(parent) &amp;&amp;</div><div class='ctx'> 	    kernfs_info(dentry-&gt;d_sb)-&gt;ns != kn-&gt;ns)</div><div class='ctx'> 		goto out_bad;</div><div class='ctx'> </div><div class='hunk'>@@ -1220,24 +1254,24 @@ static struct dentry *kernfs_iop_lookup(struct inode *dir,</div><div class='ctx'> 	return d_splice_alias(inode, dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kernfs_iop_mkdir(struct mnt_idmap *idmap,</div><div class='del'>-			    struct inode *dir, struct dentry *dentry,</div><div class='del'>-			    umode_t mode)</div><div class='add'>+static struct dentry *kernfs_iop_mkdir(struct mnt_idmap *idmap,</div><div class='add'>+				       struct inode *dir, struct dentry *dentry,</div><div class='add'>+				       umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct kernfs_node *parent = dir-&gt;i_private;</div><div class='ctx'> 	struct kernfs_syscall_ops *scops = kernfs_root(parent)-&gt;syscall_ops;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!scops || !scops-&gt;mkdir)</div><div class='del'>-		return -EPERM;</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='ctx'> 	if (!kernfs_get_active(parent))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='ctx'> 	ret = scops-&gt;mkdir(parent, dentry-&gt;d_name.name, mode);</div><div class='ctx'> </div><div class='ctx'> 	kernfs_put_active(parent);</div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kernfs_iop_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='hunk'>@@ -1355,7 +1389,7 @@ static struct kernfs_node *kernfs_next_descendant_post(struct kernfs_node *pos,</div><div class='ctx'> 		return kernfs_leftmost_descendant(rb_to_kn(rbn));</div><div class='ctx'> </div><div class='ctx'> 	/* no sibling left, visit parent */</div><div class='del'>-	return pos-&gt;parent;</div><div class='add'>+	return kernfs_parent(pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kernfs_activate_one(struct kernfs_node *kn)</div><div class='hunk'>@@ -1367,7 +1401,7 @@ static void kernfs_activate_one(struct kernfs_node *kn)</div><div class='ctx'> 	if (kernfs_active(kn) || (kn-&gt;flags &amp; (KERNFS_HIDDEN | KERNFS_REMOVING)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(kn-&gt;parent &amp;&amp; RB_EMPTY_NODE(&amp;kn-&gt;rb));</div><div class='add'>+	WARN_ON_ONCE(rcu_access_pointer(kn-&gt;__parent) &amp;&amp; RB_EMPTY_NODE(&amp;kn-&gt;rb));</div><div class='ctx'> 	WARN_ON_ONCE(atomic_read(&amp;kn-&gt;active) != KN_DEACTIVATED_BIAS);</div><div class='ctx'> </div><div class='ctx'> 	atomic_sub(KN_DEACTIVATED_BIAS, &amp;kn-&gt;active);</div><div class='hunk'>@@ -1437,7 +1471,7 @@ void kernfs_show(struct kernfs_node *kn, bool show)</div><div class='ctx'> </div><div class='ctx'> static void __kernfs_remove(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='del'>-	struct kernfs_node *pos;</div><div class='add'>+	struct kernfs_node *pos, *parent;</div><div class='ctx'> </div><div class='ctx'> 	/* Short-circuit if non-root @kn has already finished removal. */</div><div class='ctx'> 	if (!kn)</div><div class='hunk'>@@ -1449,10 +1483,10 @@ static void __kernfs_remove(struct kernfs_node *kn)</div><div class='ctx'> 	 * This is for kernfs_remove_self() which plays with active ref</div><div class='ctx'> 	 * after removal.</div><div class='ctx'> 	 */</div><div class='del'>-	if (kn-&gt;parent &amp;&amp; RB_EMPTY_NODE(&amp;kn-&gt;rb))</div><div class='add'>+	if (kernfs_parent(kn) &amp;&amp; RB_EMPTY_NODE(&amp;kn-&gt;rb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	pr_debug("kernfs %s: removing\n", kn-&gt;name);</div><div class='add'>+	pr_debug("kernfs %s: removing\n", kernfs_rcu_name(kn));</div><div class='ctx'> </div><div class='ctx'> 	/* prevent new usage by marking all nodes removing and deactivating */</div><div class='ctx'> 	pos = NULL;</div><div class='hunk'>@@ -1475,14 +1509,14 @@ static void __kernfs_remove(struct kernfs_node *kn)</div><div class='ctx'> 		kernfs_get(pos);</div><div class='ctx'> </div><div class='ctx'> 		kernfs_drain(pos);</div><div class='del'>-</div><div class='add'>+		parent = kernfs_parent(pos);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * kernfs_unlink_sibling() succeeds once per node.  Use it</div><div class='ctx'> 		 * to decide who's responsible for cleanups.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!pos-&gt;parent || kernfs_unlink_sibling(pos)) {</div><div class='add'>+		if (!parent || kernfs_unlink_sibling(pos)) {</div><div class='ctx'> 			struct kernfs_iattrs *ps_iattr =</div><div class='del'>-				pos-&gt;parent ? pos-&gt;parent-&gt;iattr : NULL;</div><div class='add'>+				parent ? parent-&gt;iattr : NULL;</div><div class='ctx'> </div><div class='ctx'> 			/* update timestamps on the parent */</div><div class='ctx'> 			down_write(&amp;kernfs_root(kn)-&gt;kernfs_iattr_rwsem);</div><div class='hunk'>@@ -1551,8 +1585,9 @@ void kernfs_break_active_protection(struct kernfs_node *kn)</div><div class='ctx'>  * invoked before finishing the kernfs operation.  Note that while this</div><div class='ctx'>  * function restores the active reference, it doesn't and can't actually</div><div class='ctx'>  * restore the active protection - @kn may already or be in the process of</div><div class='del'>- * being removed.  Once kernfs_break_active_protection() is invoked, that</div><div class='del'>- * protection is irreversibly gone for the kernfs operation instance.</div><div class='add'>+ * being drained and removed.  Once kernfs_break_active_protection() is</div><div class='add'>+ * invoked, that protection is irreversibly gone for the kernfs operation</div><div class='add'>+ * instance.</div><div class='ctx'>  *</div><div class='ctx'>  * While this function may be called at any point after</div><div class='ctx'>  * kernfs_break_active_protection() is invoked, its most useful location</div><div class='hunk'>@@ -1708,11 +1743,11 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,</div><div class='ctx'> {</div><div class='ctx'> 	struct kernfs_node *old_parent;</div><div class='ctx'> 	struct kernfs_root *root;</div><div class='del'>-	const char *old_name = NULL;</div><div class='add'>+	const char *old_name;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	/* can't move or rename root */</div><div class='del'>-	if (!kn-&gt;parent)</div><div class='add'>+	if (!rcu_access_pointer(kn-&gt;__parent))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	root = kernfs_root(kn);</div><div class='hunk'>@@ -1723,9 +1758,19 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,</div><div class='ctx'> 	    (new_parent-&gt;flags &amp; KERNFS_EMPTY_DIR))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	old_parent = kernfs_parent(kn);</div><div class='add'>+	if (root-&gt;flags &amp; KERNFS_ROOT_INVARIANT_PARENT) {</div><div class='add'>+		error = -EINVAL;</div><div class='add'>+		if (WARN_ON_ONCE(old_parent != new_parent))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	error = 0;</div><div class='del'>-	if ((kn-&gt;parent == new_parent) &amp;&amp; (kn-&gt;ns == new_ns) &amp;&amp;</div><div class='del'>-	    (strcmp(kn-&gt;name, new_name) == 0))</div><div class='add'>+	old_name = kernfs_rcu_name(kn);</div><div class='add'>+	if (!new_name)</div><div class='add'>+		new_name = old_name;</div><div class='add'>+	if ((old_parent == new_parent) &amp;&amp; (kn-&gt;ns == new_ns) &amp;&amp;</div><div class='add'>+	    (strcmp(old_name, new_name) == 0))</div><div class='ctx'> 		goto out;	/* nothing to rename */</div><div class='ctx'> </div><div class='ctx'> 	error = -EEXIST;</div><div class='hunk'>@@ -1733,7 +1778,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* rename kernfs_node */</div><div class='del'>-	if (strcmp(kn-&gt;name, new_name) != 0) {</div><div class='add'>+	if (strcmp(old_name, new_name) != 0) {</div><div class='ctx'> 		error = -ENOMEM;</div><div class='ctx'> 		new_name = kstrdup_const(new_name, GFP_KERNEL);</div><div class='ctx'> 		if (!new_name)</div><div class='hunk'>@@ -1746,27 +1791,32 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,</div><div class='ctx'> 	 * Move to the appropriate place in the appropriate directories rbtree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	kernfs_unlink_sibling(kn);</div><div class='del'>-	kernfs_get(new_parent);</div><div class='ctx'> </div><div class='del'>-	/* rename_lock protects -&gt;parent and -&gt;name accessors */</div><div class='del'>-	write_lock_irq(&amp;kernfs_rename_lock);</div><div class='add'>+	/* rename_lock protects -&gt;parent accessors */</div><div class='add'>+	if (old_parent != new_parent) {</div><div class='add'>+		kernfs_get(new_parent);</div><div class='add'>+		write_lock_irq(&amp;root-&gt;kernfs_rename_lock);</div><div class='ctx'> </div><div class='del'>-	old_parent = kn-&gt;parent;</div><div class='del'>-	kn-&gt;parent = new_parent;</div><div class='add'>+		rcu_assign_pointer(kn-&gt;__parent, new_parent);</div><div class='ctx'> </div><div class='del'>-	kn-&gt;ns = new_ns;</div><div class='del'>-	if (new_name) {</div><div class='del'>-		old_name = kn-&gt;name;</div><div class='del'>-		kn-&gt;name = new_name;</div><div class='del'>-	}</div><div class='add'>+		kn-&gt;ns = new_ns;</div><div class='add'>+		if (new_name)</div><div class='add'>+			rcu_assign_pointer(kn-&gt;name, new_name);</div><div class='ctx'> </div><div class='del'>-	write_unlock_irq(&amp;kernfs_rename_lock);</div><div class='add'>+		write_unlock_irq(&amp;root-&gt;kernfs_rename_lock);</div><div class='add'>+		kernfs_put(old_parent);</div><div class='add'>+	} else {</div><div class='add'>+		/* name assignment is RCU protected, parent is the same */</div><div class='add'>+		kn-&gt;ns = new_ns;</div><div class='add'>+		if (new_name)</div><div class='add'>+			rcu_assign_pointer(kn-&gt;name, new_name);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	kn-&gt;hash = kernfs_name_hash(kn-&gt;name, kn-&gt;ns);</div><div class='add'>+	kn-&gt;hash = kernfs_name_hash(new_name ?: old_name, kn-&gt;ns);</div><div class='ctx'> 	kernfs_link_sibling(kn);</div><div class='ctx'> </div><div class='del'>-	kernfs_put(old_parent);</div><div class='del'>-	kfree_const(old_name);</div><div class='add'>+	if (new_name &amp;&amp; !is_kernel_rodata((unsigned long)old_name))</div><div class='add'>+		kfree_rcu_mightsleep(old_name);</div><div class='ctx'> </div><div class='ctx'> 	error = 0;</div><div class='ctx'>  out:</div><div class='hunk'>@@ -1785,7 +1835,8 @@ static struct kernfs_node *kernfs_dir_pos(const void *ns,</div><div class='ctx'> {</div><div class='ctx'> 	if (pos) {</div><div class='ctx'> 		int valid = kernfs_active(pos) &amp;&amp;</div><div class='del'>-			pos-&gt;parent == parent &amp;&amp; hash == pos-&gt;hash;</div><div class='add'>+			rcu_access_pointer(pos-&gt;__parent) == parent &amp;&amp;</div><div class='add'>+			hash == pos-&gt;hash;</div><div class='ctx'> 		kernfs_put(pos);</div><div class='ctx'> 		if (!valid)</div><div class='ctx'> 			pos = NULL;</div><div class='hunk'>@@ -1850,7 +1901,7 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	for (pos = kernfs_dir_pos(ns, parent, ctx-&gt;pos, pos);</div><div class='ctx'> 	     pos;</div><div class='ctx'> 	     pos = kernfs_dir_next_pos(ns, parent, ctx-&gt;pos, pos)) {</div><div class='del'>-		const char *name = pos-&gt;name;</div><div class='add'>+		const char *name = kernfs_rcu_name(pos);</div><div class='ctx'> 		unsigned int type = fs_umode_to_dtype(pos-&gt;mode);</div><div class='ctx'> 		int len = strlen(name);</div><div class='ctx'> 		ino_t ino = kernfs_ino(pos);</div><div class='hunk'>@@ -1859,10 +1910,10 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		file-&gt;private_data = pos;</div><div class='ctx'> 		kernfs_get(pos);</div><div class='ctx'> </div><div class='del'>-		up_read(&amp;root-&gt;kernfs_rwsem);</div><div class='del'>-		if (!dir_emit(ctx, name, len, ino, type))</div><div class='add'>+		if (!dir_emit(ctx, name, len, ino, type)) {</div><div class='add'>+			up_read(&amp;root-&gt;kernfs_rwsem);</div><div class='ctx'> 			return 0;</div><div class='del'>-		down_read(&amp;root-&gt;kernfs_rwsem);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	up_read(&amp;root-&gt;kernfs_rwsem);</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='head'>diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c<br/>index ffa4565c275a..9adf36e6364b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernfs/file.c</a></div><div class='hunk'>@@ -70,6 +70,24 @@ static struct kernfs_open_node *of_on(struct kernfs_open_file *of)</div><div class='ctx'> 					 !list_empty(&amp;of-&gt;list));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Get active reference to kernfs node for an open file */</div><div class='add'>+static struct kernfs_open_file *kernfs_get_active_of(struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	/* Skip if file was already released */</div><div class='add'>+	if (unlikely(of-&gt;released))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return of;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kernfs_put_active_of(struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	return kernfs_put_active(of-&gt;kn);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kernfs_deref_open_node_locked - Get kernfs_open_node corresponding to @kn</div><div class='ctx'>  *</div><div class='hunk'>@@ -139,7 +157,7 @@ static void kernfs_seq_stop_active(struct seq_file *sf, void *v)</div><div class='ctx'> </div><div class='ctx'> 	if (ops-&gt;seq_stop)</div><div class='ctx'> 		ops-&gt;seq_stop(sf, v);</div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)</div><div class='hunk'>@@ -152,7 +170,7 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)</div><div class='ctx'> 	 * the ops aren't called concurrently for the same open file.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;of-&gt;mutex);</div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='ctx'> 	ops = kernfs_ops(of-&gt;kn);</div><div class='hunk'>@@ -238,7 +256,7 @@ static ssize_t kernfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	 * the ops aren't called concurrently for the same open file.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;of-&gt;mutex);</div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn)) {</div><div class='add'>+	if (!kernfs_get_active_of(of)) {</div><div class='ctx'> 		len = -ENODEV;</div><div class='ctx'> 		mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -252,7 +270,7 @@ static ssize_t kernfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	else</div><div class='ctx'> 		len = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; 0)</div><div class='hunk'>@@ -323,7 +341,7 @@ static ssize_t kernfs_fop_write_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	 * the ops aren't called concurrently for the same open file.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;of-&gt;mutex);</div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn)) {</div><div class='add'>+	if (!kernfs_get_active_of(of)) {</div><div class='ctx'> 		mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> 		len = -ENODEV;</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -335,7 +353,7 @@ static ssize_t kernfs_fop_write_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	else</div><div class='ctx'> 		len = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; 0)</div><div class='hunk'>@@ -357,13 +375,13 @@ static void kernfs_vma_open(struct vm_area_struct *vma)</div><div class='ctx'> 	if (!of-&gt;vm_ops)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (of-&gt;vm_ops-&gt;open)</div><div class='ctx'> 		of-&gt;vm_ops-&gt;open(vma);</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static vm_fault_t kernfs_vma_fault(struct vm_fault *vmf)</div><div class='hunk'>@@ -375,14 +393,14 @@ static vm_fault_t kernfs_vma_fault(struct vm_fault *vmf)</div><div class='ctx'> 	if (!of-&gt;vm_ops)</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='ctx'> 	ret = VM_FAULT_SIGBUS;</div><div class='ctx'> 	if (of-&gt;vm_ops-&gt;fault)</div><div class='ctx'> 		ret = of-&gt;vm_ops-&gt;fault(vmf);</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +413,7 @@ static vm_fault_t kernfs_vma_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	if (!of-&gt;vm_ops)</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -404,7 +422,7 @@ static vm_fault_t kernfs_vma_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	else</div><div class='ctx'> 		file_update_time(file);</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -418,14 +436,14 @@ static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 	if (!of-&gt;vm_ops)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	if (of-&gt;vm_ops-&gt;access)</div><div class='ctx'> 		ret = of-&gt;vm_ops-&gt;access(vma, addr, buf, len, write);</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -455,7 +473,7 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	mutex_lock(&amp;of-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	rc = -ENODEV;</div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	ops = kernfs_ops(of-&gt;kn);</div><div class='hunk'>@@ -483,12 +501,14 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='del'>-	of-&gt;mmapped = true;</div><div class='del'>-	of_on(of)-&gt;nr_mmapped++;</div><div class='del'>-	of-&gt;vm_ops = vma-&gt;vm_ops;</div><div class='add'>+	if (!of-&gt;mmapped) {</div><div class='add'>+		of-&gt;mmapped = true;</div><div class='add'>+		of_on(of)-&gt;nr_mmapped++;</div><div class='add'>+		of-&gt;vm_ops = vma-&gt;vm_ops;</div><div class='add'>+	}</div><div class='ctx'> 	vma-&gt;vm_ops = &amp;kernfs_vm_ops;</div><div class='ctx'> out_put:</div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -634,11 +654,18 @@ static int kernfs_fop_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	 * each file a separate locking class.  Let's differentiate on</div><div class='ctx'> 	 * whether the file has mmap or not for now.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Both paths of the branch look the same.  They're supposed to</div><div class='add'>+	 * For similar reasons, writable and readonly files are given different</div><div class='add'>+	 * lockdep key, because the writable file /sys/power/resume may call vfs</div><div class='add'>+	 * lookup helpers for arbitrary paths and readonly files can be read by</div><div class='add'>+	 * overlayfs from vfs helpers when sysfs is a lower layer of overalyfs.</div><div class='add'>+	 *</div><div class='add'>+	 * All three cases look the same.  They're supposed to</div><div class='ctx'> 	 * look that way and give @of-&gt;mutex different static lockdep keys.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (has_mmap)</div><div class='ctx'> 		mutex_init(&amp;of-&gt;mutex);</div><div class='add'>+	else if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='add'>+		mutex_init(&amp;of-&gt;mutex);</div><div class='ctx'> 	else</div><div class='ctx'> 		mutex_init(&amp;of-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -769,8 +796,9 @@ bool kernfs_should_drain_open_files(struct kernfs_node *kn)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * @kn being deactivated guarantees that @kn-&gt;attr.open can't change</div><div class='ctx'> 	 * beneath us making the lockless test below safe.</div><div class='add'>+	 * Callers post kernfs_unbreak_active_protection may be counted in</div><div class='add'>+	 * kn-&gt;active by now, do not WARN_ON because of them.</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ON_ONCE(atomic_read(&amp;kn-&gt;active) != KN_DEACTIVATED_BIAS);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	on = rcu_dereference(kn-&gt;attr.open);</div><div class='hunk'>@@ -842,7 +870,7 @@ static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> 	struct kernfs_node *kn = kernfs_dentry_node(filp-&gt;f_path.dentry);</div><div class='ctx'> 	__poll_t ret;</div><div class='ctx'> </div><div class='del'>-	if (!kernfs_get_active(kn))</div><div class='add'>+	if (!kernfs_get_active_of(of))</div><div class='ctx'> 		return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;</div><div class='ctx'> </div><div class='ctx'> 	if (kn-&gt;attr.ops-&gt;poll)</div><div class='hunk'>@@ -850,7 +878,7 @@ static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = kernfs_generic_poll(of, wait);</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -865,7 +893,7 @@ static loff_t kernfs_fop_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	 * the ops aren't called concurrently for the same open file.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mutex_lock(&amp;of-&gt;mutex);</div><div class='del'>-	if (!kernfs_get_active(of-&gt;kn)) {</div><div class='add'>+	if (!kernfs_get_active_of(of)) {</div><div class='ctx'> 		mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -876,7 +904,7 @@ static loff_t kernfs_fop_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = generic_file_llseek(file, offset, whence);</div><div class='ctx'> </div><div class='del'>-	kernfs_put_active(of-&gt;kn);</div><div class='add'>+	kernfs_put_active_of(of);</div><div class='ctx'> 	mutex_unlock(&amp;of-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -902,9 +930,11 @@ repeat:</div><div class='ctx'> 	/* kick fsnotify */</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;root-&gt;kernfs_supers_rwsem);</div><div class='add'>+	down_read(&amp;root-&gt;kernfs_rwsem);</div><div class='ctx'> 	list_for_each_entry(info, &amp;kernfs_root(kn)-&gt;supers, node) {</div><div class='ctx'> 		struct kernfs_node *parent;</div><div class='ctx'> 		struct inode *p_inode = NULL;</div><div class='add'>+		const char *kn_name;</div><div class='ctx'> 		struct inode *inode;</div><div class='ctx'> 		struct qstr name;</div><div class='ctx'> </div><div class='hunk'>@@ -918,7 +948,8 @@ repeat:</div><div class='ctx'> 		if (!inode)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		name = (struct qstr)QSTR_INIT(kn-&gt;name, strlen(kn-&gt;name));</div><div class='add'>+		kn_name = kernfs_rcu_name(kn);</div><div class='add'>+		name = QSTR(kn_name);</div><div class='ctx'> 		parent = kernfs_get_parent(kn);</div><div class='ctx'> 		if (parent) {</div><div class='ctx'> 			p_inode = ilookup(info-&gt;sb, kernfs_ino(parent));</div><div class='hunk'>@@ -938,6 +969,7 @@ repeat:</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	up_read(&amp;root-&gt;kernfs_rwsem);</div><div class='ctx'> 	up_read(&amp;root-&gt;kernfs_supers_rwsem);</div><div class='ctx'> 	kernfs_put(kn);</div><div class='ctx'> 	goto repeat;</div><div class='head'>diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c<br/>index b83054da68b3..a36aaee98dce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernfs/inode.c</a></div><div class='hunk'>@@ -24,45 +24,46 @@ static const struct inode_operations kernfs_iops = {</div><div class='ctx'> 	.listxattr	= kernfs_iop_listxattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct kernfs_iattrs *__kernfs_iattrs(struct kernfs_node *kn, int alloc)</div><div class='add'>+static struct kernfs_iattrs *__kernfs_iattrs(struct kernfs_node *kn, bool alloc)</div><div class='ctx'> {</div><div class='del'>-	static DEFINE_MUTEX(iattr_mutex);</div><div class='del'>-	struct kernfs_iattrs *ret;</div><div class='add'>+	struct kernfs_iattrs *ret __free(kfree) = NULL;</div><div class='add'>+	struct kernfs_iattrs *attr;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;iattr_mutex);</div><div class='add'>+	attr = READ_ONCE(kn-&gt;iattr);</div><div class='add'>+	if (attr || !alloc)</div><div class='add'>+		return attr;</div><div class='ctx'> </div><div class='del'>-	if (kn-&gt;iattr || !alloc)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	kn-&gt;iattr = kmem_cache_zalloc(kernfs_iattrs_cache, GFP_KERNEL);</div><div class='del'>-	if (!kn-&gt;iattr)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	ret = kmem_cache_zalloc(kernfs_iattrs_cache, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* assign default attributes */</div><div class='del'>-	kn-&gt;iattr-&gt;ia_uid = GLOBAL_ROOT_UID;</div><div class='del'>-	kn-&gt;iattr-&gt;ia_gid = GLOBAL_ROOT_GID;</div><div class='del'>-</div><div class='del'>-	ktime_get_real_ts64(&amp;kn-&gt;iattr-&gt;ia_atime);</div><div class='del'>-	kn-&gt;iattr-&gt;ia_mtime = kn-&gt;iattr-&gt;ia_atime;</div><div class='del'>-	kn-&gt;iattr-&gt;ia_ctime = kn-&gt;iattr-&gt;ia_atime;</div><div class='del'>-</div><div class='del'>-	simple_xattrs_init(&amp;kn-&gt;iattr-&gt;xattrs);</div><div class='del'>-	atomic_set(&amp;kn-&gt;iattr-&gt;nr_user_xattrs, 0);</div><div class='del'>-	atomic_set(&amp;kn-&gt;iattr-&gt;user_xattr_size, 0);</div><div class='del'>-out_unlock:</div><div class='del'>-	ret = kn-&gt;iattr;</div><div class='del'>-	mutex_unlock(&amp;iattr_mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	ret-&gt;ia_uid = GLOBAL_ROOT_UID;</div><div class='add'>+	ret-&gt;ia_gid = GLOBAL_ROOT_GID;</div><div class='add'>+</div><div class='add'>+	ktime_get_real_ts64(&amp;ret-&gt;ia_atime);</div><div class='add'>+	ret-&gt;ia_mtime = ret-&gt;ia_atime;</div><div class='add'>+	ret-&gt;ia_ctime = ret-&gt;ia_atime;</div><div class='add'>+</div><div class='add'>+	simple_xattrs_init(&amp;ret-&gt;xattrs);</div><div class='add'>+	atomic_set(&amp;ret-&gt;nr_user_xattrs, 0);</div><div class='add'>+	atomic_set(&amp;ret-&gt;user_xattr_size, 0);</div><div class='add'>+</div><div class='add'>+	/* If someone raced us, recognize it. */</div><div class='add'>+	if (!try_cmpxchg(&amp;kn-&gt;iattr, &amp;attr, ret))</div><div class='add'>+		return READ_ONCE(kn-&gt;iattr);</div><div class='add'>+</div><div class='add'>+	return no_free_ptr(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kernfs_iattrs *kernfs_iattrs(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='del'>-	return __kernfs_iattrs(kn, 1);</div><div class='add'>+	return __kernfs_iattrs(kn, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kernfs_iattrs *kernfs_iattrs_noalloc(struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='del'>-	return __kernfs_iattrs(kn, 0);</div><div class='add'>+	return __kernfs_iattrs(kn, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr)</div><div class='hunk'>@@ -166,9 +167,10 @@ static inline void set_inode_attr(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct kernfs_iattrs *attrs = kn-&gt;iattr;</div><div class='add'>+	struct kernfs_iattrs *attrs;</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = kn-&gt;mode;</div><div class='add'>+	attrs = kernfs_iattrs_noalloc(kn);</div><div class='ctx'> 	if (attrs)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * kernfs_node has non-default attributes get them from</div><div class='hunk'>@@ -249,7 +251,7 @@ struct inode *kernfs_get_inode(struct super_block *sb, struct kernfs_node *kn)</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	inode = iget_locked(sb, kernfs_ino(kn));</div><div class='del'>-	if (inode &amp;&amp; (inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (inode &amp;&amp; (inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		kernfs_init_inode(kn, inode);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -306,7 +308,9 @@ int kernfs_xattr_set(struct kernfs_node *kn, const char *name,</div><div class='ctx'> 		     const void *value, size_t size, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct simple_xattr *old_xattr;</div><div class='del'>-	struct kernfs_iattrs *attrs = kernfs_iattrs(kn);</div><div class='add'>+	struct kernfs_iattrs *attrs;</div><div class='add'>+</div><div class='add'>+	attrs = kernfs_iattrs(kn);</div><div class='ctx'> 	if (!attrs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -345,8 +349,9 @@ static int kernfs_vfs_user_xattr_add(struct kernfs_node *kn,</div><div class='ctx'> 				     struct simple_xattrs *xattrs,</div><div class='ctx'> 				     const void *value, size_t size, int flags)</div><div class='ctx'> {</div><div class='del'>-	atomic_t *sz = &amp;kn-&gt;iattr-&gt;user_xattr_size;</div><div class='del'>-	atomic_t *nr = &amp;kn-&gt;iattr-&gt;nr_user_xattrs;</div><div class='add'>+	struct kernfs_iattrs *attr = kernfs_iattrs_noalloc(kn);</div><div class='add'>+	atomic_t *sz = &amp;attr-&gt;user_xattr_size;</div><div class='add'>+	atomic_t *nr = &amp;attr-&gt;nr_user_xattrs;</div><div class='ctx'> 	struct simple_xattr *old_xattr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -384,8 +389,9 @@ static int kernfs_vfs_user_xattr_rm(struct kernfs_node *kn,</div><div class='ctx'> 				    struct simple_xattrs *xattrs,</div><div class='ctx'> 				    const void *value, size_t size, int flags)</div><div class='ctx'> {</div><div class='del'>-	atomic_t *sz = &amp;kn-&gt;iattr-&gt;user_xattr_size;</div><div class='del'>-	atomic_t *nr = &amp;kn-&gt;iattr-&gt;nr_user_xattrs;</div><div class='add'>+	struct kernfs_iattrs *attr = kernfs_iattrs_noalloc(kn);</div><div class='add'>+	atomic_t *sz = &amp;attr-&gt;user_xattr_size;</div><div class='add'>+	atomic_t *nr = &amp;attr-&gt;nr_user_xattrs;</div><div class='ctx'> 	struct simple_xattr *old_xattr;</div><div class='ctx'> </div><div class='ctx'> 	old_xattr = simple_xattr_set(xattrs, full_name, value, size, flags);</div><div class='head'>diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h<br/>index 237f2764b941..6061b6f70d2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernfs/kernfs-internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/kernfs-internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernfs/kernfs-internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernfs/kernfs-internal.h</a></div><div class='hunk'>@@ -38,6 +38,7 @@ struct kernfs_root {</div><div class='ctx'> </div><div class='ctx'> 	/* private fields, do not use outside kernfs proper */</div><div class='ctx'> 	struct idr		ino_idr;</div><div class='add'>+	spinlock_t		kernfs_idr_lock;	/* root-&gt;ino_idr */</div><div class='ctx'> 	u32			last_id_lowbits;</div><div class='ctx'> 	u32			id_highbits;</div><div class='ctx'> 	struct kernfs_syscall_ops *syscall_ops;</div><div class='hunk'>@@ -49,6 +50,11 @@ struct kernfs_root {</div><div class='ctx'> 	struct rw_semaphore	kernfs_rwsem;</div><div class='ctx'> 	struct rw_semaphore	kernfs_iattr_rwsem;</div><div class='ctx'> 	struct rw_semaphore	kernfs_supers_rwsem;</div><div class='add'>+</div><div class='add'>+	/* kn-&gt;parent and kn-&gt;name */</div><div class='add'>+	rwlock_t		kernfs_rename_lock;</div><div class='add'>+</div><div class='add'>+	struct rcu_head		rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* +1 to avoid triggering overflow warning when negating it */</div><div class='hunk'>@@ -62,11 +68,14 @@ struct kernfs_root {</div><div class='ctx'>  *</div><div class='ctx'>  * Return: the kernfs_root @kn belongs to.</div><div class='ctx'>  */</div><div class='del'>-static inline struct kernfs_root *kernfs_root(struct kernfs_node *kn)</div><div class='add'>+static inline struct kernfs_root *kernfs_root(const struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='add'>+	const struct kernfs_node *knp;</div><div class='ctx'> 	/* if parent exists, it's always a dir; otherwise, @sd is a dir */</div><div class='del'>-	if (kn-&gt;parent)</div><div class='del'>-		kn = kn-&gt;parent;</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	knp = rcu_dereference(kn-&gt;__parent);</div><div class='add'>+	if (knp)</div><div class='add'>+		kn = knp;</div><div class='ctx'> 	return kn-&gt;dir.root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +104,38 @@ struct kernfs_super_info {</div><div class='ctx'> };</div><div class='ctx'> #define kernfs_info(SB) ((struct kernfs_super_info *)(SB-&gt;s_fs_info))</div><div class='ctx'> </div><div class='add'>+static inline bool kernfs_root_is_locked(const struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	return lockdep_is_held(&amp;kernfs_root(kn)-&gt;kernfs_rwsem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool kernfs_rename_is_locked(const struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	return lockdep_is_held(&amp;kernfs_root(kn)-&gt;kernfs_rename_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *kernfs_rcu_name(const struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference_check(kn-&gt;name, kernfs_root_is_locked(kn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct kernfs_node *kernfs_parent(const struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The kernfs_node::__parent remains valid within a RCU section. The kn</div><div class='add'>+	 * can be reparented (and renamed) which changes the entry. This can be</div><div class='add'>+	 * avoided by locking kernfs_root::kernfs_rwsem or</div><div class='add'>+	 * kernfs_root::kernfs_rename_lock.</div><div class='add'>+	 * Both locks can be used to obtain a reference on __parent. Once the</div><div class='add'>+	 * reference count reaches 0 then the node is about to be freed</div><div class='add'>+	 * and can not be renamed (or become a different parent) anymore.</div><div class='add'>+	 */</div><div class='add'>+	return rcu_dereference_check(kn-&gt;__parent,</div><div class='add'>+				     kernfs_root_is_locked(kn) ||</div><div class='add'>+				     kernfs_rename_is_locked(kn) ||</div><div class='add'>+				     !atomic_read(&amp;kn-&gt;count));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct kernfs_node *kernfs_dentry_node(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	if (d_really_is_negative(dentry))</div><div class='head'>diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c<br/>index 0c93cad0f0ac..3ac52e141766 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernfs/mount.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/mount.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernfs/mount.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernfs/mount.c</a></div><div class='hunk'>@@ -57,11 +57,26 @@ static int kernfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> </div><div class='ctx'> const struct super_operations kernfs_sops = {</div><div class='ctx'> 	.statfs		= kernfs_statfs,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.evict_inode	= kernfs_evict_inode,</div><div class='ctx'> </div><div class='ctx'> 	.show_options	= kernfs_sop_show_options,</div><div class='ctx'> 	.show_path	= kernfs_sop_show_path,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * sysfs is built on top of kernfs and sysfs provides the power</div><div class='add'>+	 * management infrastructure to support suspend/hibernate by</div><div class='add'>+	 * writing to various files in /sys/power/. As filesystems may</div><div class='add'>+	 * be automatically frozen during suspend/hibernate implementing</div><div class='add'>+	 * freeze/thaw support for kernfs generically will cause</div><div class='add'>+	 * deadlocks as the suspending/hibernation initiating task will</div><div class='add'>+	 * hold a VFS lock that it will then wait upon to be released.</div><div class='add'>+	 * If freeze/thaw for kernfs is needed talk to the VFS.</div><div class='add'>+	 */</div><div class='add'>+	.freeze_fs	= NULL,</div><div class='add'>+	.unfreeze_fs	= NULL,</div><div class='add'>+	.freeze_super	= NULL,</div><div class='add'>+	.thaw_super	= NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int kernfs_encode_fh(struct inode *inode, __u32 *fh, int *max_len,</div><div class='hunk'>@@ -145,8 +160,10 @@ static struct dentry *kernfs_fh_to_parent(struct super_block *sb,</div><div class='ctx'> static struct dentry *kernfs_get_parent_dentry(struct dentry *child)</div><div class='ctx'> {</div><div class='ctx'> 	struct kernfs_node *kn = kernfs_dentry_node(child);</div><div class='add'>+	struct kernfs_root *root = kernfs_root(kn);</div><div class='ctx'> </div><div class='del'>-	return d_obtain_alias(kernfs_get_inode(child-&gt;d_sb, kn-&gt;parent));</div><div class='add'>+	guard(rwsem_read)(&amp;root-&gt;kernfs_rwsem);</div><div class='add'>+	return d_obtain_alias(kernfs_get_inode(child-&gt;d_sb, kernfs_parent(kn)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct export_operations kernfs_export_ops = {</div><div class='hunk'>@@ -186,10 +203,10 @@ static struct kernfs_node *find_next_ancestor(struct kernfs_node *child,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (child-&gt;parent != parent) {</div><div class='del'>-		if (!child-&gt;parent)</div><div class='add'>+	while (kernfs_parent(child) != parent) {</div><div class='add'>+		child = kernfs_parent(child);</div><div class='add'>+		if (!child)</div><div class='ctx'> 			return NULL;</div><div class='del'>-		child = child-&gt;parent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return child;</div><div class='hunk'>@@ -206,17 +223,28 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn,</div><div class='ctx'> 				  struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	struct kernfs_node *knparent = NULL;</div><div class='add'>+	struct kernfs_node *knparent;</div><div class='add'>+	struct kernfs_root *root;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(sb-&gt;s_op != &amp;kernfs_sops);</div><div class='ctx'> </div><div class='ctx'> 	dentry = dget(sb-&gt;s_root);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if this is the root kernfs_node */</div><div class='del'>-	if (!kn-&gt;parent)</div><div class='add'>+	if (!rcu_access_pointer(kn-&gt;__parent))</div><div class='ctx'> 		return dentry;</div><div class='ctx'> </div><div class='del'>-	knparent = find_next_ancestor(kn, NULL);</div><div class='add'>+	root = kernfs_root(kn);</div><div class='add'>+	/*</div><div class='add'>+	 * As long as kn is valid, its parent can not vanish. This is cgroup's</div><div class='add'>+	 * kn so it can't have its parent replaced. Therefore it is safe to use</div><div class='add'>+	 * the ancestor node outside of the RCU or locked section.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(!(root-&gt;flags &amp; KERNFS_ROOT_INVARIANT_PARENT)))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	scoped_guard(rcu) {</div><div class='add'>+		knparent = find_next_ancestor(kn, NULL);</div><div class='add'>+	}</div><div class='ctx'> 	if (WARN_ON(!knparent)) {</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -225,17 +253,26 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn,</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct dentry *dtmp;</div><div class='ctx'> 		struct kernfs_node *kntmp;</div><div class='add'>+		const char *name;</div><div class='ctx'> </div><div class='ctx'> 		if (kn == knparent)</div><div class='ctx'> 			return dentry;</div><div class='del'>-		kntmp = find_next_ancestor(kn, knparent);</div><div class='del'>-		if (WARN_ON(!kntmp)) {</div><div class='add'>+</div><div class='add'>+		scoped_guard(rwsem_read, &amp;root-&gt;kernfs_rwsem) {</div><div class='add'>+			kntmp = find_next_ancestor(kn, knparent);</div><div class='add'>+			if (WARN_ON(!kntmp)) {</div><div class='add'>+				dput(dentry);</div><div class='add'>+				return ERR_PTR(-EINVAL);</div><div class='add'>+			}</div><div class='add'>+			name = kstrdup(kernfs_rcu_name(kntmp), GFP_KERNEL);</div><div class='add'>+		}</div><div class='add'>+		if (!name) {</div><div class='ctx'> 			dput(dentry);</div><div class='del'>-			return ERR_PTR(-EINVAL);</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='ctx'> 		}</div><div class='del'>-		dtmp = lookup_positive_unlocked(kntmp-&gt;name, dentry,</div><div class='del'>-					       strlen(kntmp-&gt;name));</div><div class='add'>+		dtmp = lookup_noperm_positive_unlocked(&amp;QSTR(name), dentry);</div><div class='ctx'> 		dput(dentry);</div><div class='add'>+		kfree(name);</div><div class='ctx'> 		if (IS_ERR(dtmp))</div><div class='ctx'> 			return dtmp;</div><div class='ctx'> 		knparent = kntmp;</div><div class='hunk'>@@ -261,6 +298,7 @@ static int kernfs_fill_super(struct super_block *sb, struct kernfs_fs_context *k</div><div class='ctx'> 	if (info-&gt;root-&gt;flags &amp; KERNFS_ROOT_SUPPORT_EXPORTOP)</div><div class='ctx'> 		sb-&gt;s_export_op = &amp;kernfs_export_ops;</div><div class='ctx'> 	sb-&gt;s_time_gran = 1;</div><div class='add'>+	sb-&gt;s_maxbytes  = MAX_LFS_FILESIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* sysfs dentries and inodes don't require IO to create */</div><div class='ctx'> 	sb-&gt;s_shrink-&gt;seeks = 0;</div><div class='hunk'>@@ -281,7 +319,7 @@ static int kernfs_fill_super(struct super_block *sb, struct kernfs_fs_context *k</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	sb-&gt;s_root = root;</div><div class='del'>-	sb-&gt;s_d_op = &amp;kernfs_dops;</div><div class='add'>+	set_default_d_op(sb, &amp;kernfs_dops);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -358,7 +396,9 @@ int kernfs_get_tree(struct fs_context *fc)</div><div class='ctx'> 		}</div><div class='ctx'> 		sb-&gt;s_flags |= SB_ACTIVE;</div><div class='ctx'> </div><div class='del'>-		uuid_gen(&amp;sb-&gt;s_uuid);</div><div class='add'>+		uuid_t uuid;</div><div class='add'>+		uuid_gen(&amp;uuid);</div><div class='add'>+		super_set_uuid(sb, uuid.b, sizeof(uuid));</div><div class='ctx'> </div><div class='ctx'> 		down_write(&amp;root-&gt;kernfs_supers_rwsem);</div><div class='ctx'> 		list_add(&amp;info-&gt;node, &amp;info-&gt;root-&gt;supers);</div><div class='head'>diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c<br/>index 45371a70caa7..0bd8a2143723 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/kernfs/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/kernfs/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/kernfs/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/kernfs/symlink.c</a></div><div class='hunk'>@@ -62,10 +62,10 @@ static int kernfs_get_target_path(struct kernfs_node *parent,</div><div class='ctx'> </div><div class='ctx'> 	/* go up to the root, stop at the base */</div><div class='ctx'> 	base = parent;</div><div class='del'>-	while (base-&gt;parent) {</div><div class='del'>-		kn = target-&gt;parent;</div><div class='del'>-		while (kn-&gt;parent &amp;&amp; base != kn)</div><div class='del'>-			kn = kn-&gt;parent;</div><div class='add'>+	while (kernfs_parent(base)) {</div><div class='add'>+		kn = kernfs_parent(target);</div><div class='add'>+		while (kernfs_parent(kn) &amp;&amp; base != kn)</div><div class='add'>+			kn = kernfs_parent(kn);</div><div class='ctx'> </div><div class='ctx'> 		if (base == kn)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -75,14 +75,14 @@ static int kernfs_get_target_path(struct kernfs_node *parent,</div><div class='ctx'> </div><div class='ctx'> 		strcpy(s, "../");</div><div class='ctx'> 		s += 3;</div><div class='del'>-		base = base-&gt;parent;</div><div class='add'>+		base = kernfs_parent(base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* determine end of target string for reverse fillup */</div><div class='ctx'> 	kn = target;</div><div class='del'>-	while (kn-&gt;parent &amp;&amp; kn != base) {</div><div class='del'>-		len += strlen(kn-&gt;name) + 1;</div><div class='del'>-		kn = kn-&gt;parent;</div><div class='add'>+	while (kernfs_parent(kn) &amp;&amp; kn != base) {</div><div class='add'>+		len += strlen(kernfs_rcu_name(kn)) + 1;</div><div class='add'>+		kn = kernfs_parent(kn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check limits */</div><div class='hunk'>@@ -94,15 +94,16 @@ static int kernfs_get_target_path(struct kernfs_node *parent,</div><div class='ctx'> </div><div class='ctx'> 	/* reverse fillup of target string from target to base */</div><div class='ctx'> 	kn = target;</div><div class='del'>-	while (kn-&gt;parent &amp;&amp; kn != base) {</div><div class='del'>-		int slen = strlen(kn-&gt;name);</div><div class='add'>+	while (kernfs_parent(kn) &amp;&amp; kn != base) {</div><div class='add'>+		const char *name = kernfs_rcu_name(kn);</div><div class='add'>+		int slen = strlen(name);</div><div class='ctx'> </div><div class='ctx'> 		len -= slen;</div><div class='del'>-		memcpy(s + len, kn-&gt;name, slen);</div><div class='add'>+		memcpy(s + len, name, slen);</div><div class='ctx'> 		if (len)</div><div class='ctx'> 			s[--len] = '/';</div><div class='ctx'> </div><div class='del'>-		kn = kn-&gt;parent;</div><div class='add'>+		kn = kernfs_parent(kn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -111,12 +112,13 @@ static int kernfs_get_target_path(struct kernfs_node *parent,</div><div class='ctx'> static int kernfs_getlink(struct inode *inode, char *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct kernfs_node *kn = inode-&gt;i_private;</div><div class='del'>-	struct kernfs_node *parent = kn-&gt;parent;</div><div class='add'>+	struct kernfs_node *parent;</div><div class='ctx'> 	struct kernfs_node *target = kn-&gt;symlink.target_kn;</div><div class='del'>-	struct kernfs_root *root = kernfs_root(parent);</div><div class='add'>+	struct kernfs_root *root = kernfs_root(kn);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;root-&gt;kernfs_rwsem);</div><div class='add'>+	parent = kernfs_parent(kn);</div><div class='ctx'> 	error = kernfs_get_target_path(parent, target, path);</div><div class='ctx'> 	up_read(&amp;root-&gt;kernfs_rwsem);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/libfs.c b/fs/libfs.c<br/>index eec6031b0155..9264523be85c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/libfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/libfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/libfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/libfs.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/unicode.h&gt;</div><div class='ctx'> #include &lt;linux/fscrypt.h&gt;</div><div class='add'>+#include &lt;linux/pidfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -61,11 +62,6 @@ int always_delete_dentry(const struct dentry *dentry)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(always_delete_dentry);</div><div class='ctx'> </div><div class='del'>-const struct dentry_operations simple_dentry_operations = {</div><div class='del'>-	.d_delete = always_delete_dentry,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(simple_dentry_operations);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Lookup the data. This is trivial - if the dentry didn't already</div><div class='ctx'>  * exist, we know it is negative.  Set d_op to delete negative dentries.</div><div class='hunk'>@@ -74,8 +70,14 @@ struct dentry *simple_lookup(struct inode *dir, struct dentry *dentry, unsigned</div><div class='ctx'> {</div><div class='ctx'> 	if (dentry-&gt;d_name.len &gt; NAME_MAX)</div><div class='ctx'> 		return ERR_PTR(-ENAMETOOLONG);</div><div class='del'>-	if (!dentry-&gt;d_sb-&gt;s_d_op)</div><div class='del'>-		d_set_d_op(dentry, &amp;simple_dentry_operations);</div><div class='add'>+	if (!dentry-&gt;d_op &amp;&amp; !(dentry-&gt;d_flags &amp; DCACHE_DONTCACHE)) {</div><div class='add'>+		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+		dentry-&gt;d_flags |= DCACHE_DONTCACHE;</div><div class='add'>+		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	}</div><div class='add'>+	if (IS_ENABLED(CONFIG_UNICODE) &amp;&amp; IS_CASEFOLDED(dir))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	d_add(dentry, NULL);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -240,17 +242,29 @@ const struct inode_operations simple_dir_inode_operations = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(simple_dir_inode_operations);</div><div class='ctx'> </div><div class='del'>-static void offset_set(struct dentry *dentry, u32 offset)</div><div class='add'>+/* simple_offset_add() never assigns these to a dentry */</div><div class='add'>+enum {</div><div class='add'>+	DIR_OFFSET_FIRST	= 2,		/* Find first real entry */</div><div class='add'>+	DIR_OFFSET_EOD		= S32_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* simple_offset_add() allocation range */</div><div class='add'>+enum {</div><div class='add'>+	DIR_OFFSET_MIN		= DIR_OFFSET_FIRST + 1,</div><div class='add'>+	DIR_OFFSET_MAX		= DIR_OFFSET_EOD - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void offset_set(struct dentry *dentry, long offset)</div><div class='ctx'> {</div><div class='del'>-	dentry-&gt;d_fsdata = (void *)((uintptr_t)(offset));</div><div class='add'>+	dentry-&gt;d_fsdata = (void *)offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 dentry2offset(struct dentry *dentry)</div><div class='add'>+static long dentry2offset(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return (u32)((uintptr_t)(dentry-&gt;d_fsdata));</div><div class='add'>+	return (long)dentry-&gt;d_fsdata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct lock_class_key simple_offset_xa_lock;</div><div class='add'>+static struct lock_class_key simple_offset_lock_class;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * simple_offset_init - initialize an offset_ctx</div><div class='hunk'>@@ -259,11 +273,9 @@ static struct lock_class_key simple_offset_xa_lock;</div><div class='ctx'>  */</div><div class='ctx'> void simple_offset_init(struct offset_ctx *octx)</div><div class='ctx'> {</div><div class='del'>-	xa_init_flags(&amp;octx-&gt;xa, XA_FLAGS_ALLOC1);</div><div class='del'>-	lockdep_set_class(&amp;octx-&gt;xa.xa_lock, &amp;simple_offset_xa_lock);</div><div class='del'>-</div><div class='del'>-	/* 0 is '.', 1 is '..', so always start with offset 2 */</div><div class='del'>-	octx-&gt;next_offset = 2;</div><div class='add'>+	mt_init_flags(&amp;octx-&gt;mt, MT_FLAGS_ALLOC_RANGE);</div><div class='add'>+	lockdep_set_class(&amp;octx-&gt;mt.ma_lock, &amp;simple_offset_lock_class);</div><div class='add'>+	octx-&gt;next_offset = DIR_OFFSET_MIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -271,27 +283,39 @@ void simple_offset_init(struct offset_ctx *octx)</div><div class='ctx'>  * @octx: directory offset ctx to be updated</div><div class='ctx'>  * @dentry: new dentry being added</div><div class='ctx'>  *</div><div class='del'>- * Returns zero on success. @so_ctx and the dentry offset are updated.</div><div class='add'>+ * Returns zero on success. @octx and the dentry's offset are updated.</div><div class='ctx'>  * Otherwise, a negative errno value is returned.</div><div class='ctx'>  */</div><div class='ctx'> int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	static const struct xa_limit limit = XA_LIMIT(2, U32_MAX);</div><div class='del'>-	u32 offset;</div><div class='add'>+	unsigned long offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (dentry2offset(dentry) != 0)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	ret = xa_alloc_cyclic(&amp;octx-&gt;xa, &amp;offset, dentry, limit,</div><div class='del'>-			      &amp;octx-&gt;next_offset, GFP_KERNEL);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	ret = mtree_alloc_cyclic(&amp;octx-&gt;mt, &amp;offset, dentry, DIR_OFFSET_MIN,</div><div class='add'>+				 DIR_OFFSET_MAX, &amp;octx-&gt;next_offset,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		return ret == -EBUSY ? -ENOSPC : ret;</div><div class='ctx'> </div><div class='ctx'> 	offset_set(dentry, offset);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int simple_offset_replace(struct offset_ctx *octx, struct dentry *dentry,</div><div class='add'>+				 long offset)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mtree_store(&amp;octx-&gt;mt, offset, dentry, GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	offset_set(dentry, offset);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * simple_offset_remove - Remove an entry to a directory's offset map</div><div class='ctx'>  * @octx: directory offset ctx to be updated</div><div class='hunk'>@@ -300,23 +324,56 @@ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry)</div><div class='ctx'>  */</div><div class='ctx'> void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	u32 offset;</div><div class='add'>+	long offset;</div><div class='ctx'> </div><div class='ctx'> 	offset = dentry2offset(dentry);</div><div class='ctx'> 	if (offset == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	xa_erase(&amp;octx-&gt;xa, offset);</div><div class='add'>+	mtree_erase(&amp;octx-&gt;mt, offset);</div><div class='ctx'> 	offset_set(dentry, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * simple_offset_rename - handle directory offsets for rename</div><div class='add'>+ * @old_dir: parent directory of source entry</div><div class='add'>+ * @old_dentry: dentry of source entry</div><div class='add'>+ * @new_dir: parent_directory of destination entry</div><div class='add'>+ * @new_dentry: dentry of destination</div><div class='add'>+ *</div><div class='add'>+ * Caller provides appropriate serialization.</div><div class='add'>+ *</div><div class='add'>+ * User space expects the directory offset value of the replaced</div><div class='add'>+ * (new) directory entry to be unchanged after a rename.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero on success, a negative errno value on failure.</div><div class='add'>+ */</div><div class='add'>+int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='add'>+			 struct inode *new_dir, struct dentry *new_dentry)</div><div class='add'>+{</div><div class='add'>+	struct offset_ctx *old_ctx = old_dir-&gt;i_op-&gt;get_offset_ctx(old_dir);</div><div class='add'>+	struct offset_ctx *new_ctx = new_dir-&gt;i_op-&gt;get_offset_ctx(new_dir);</div><div class='add'>+	long new_offset = dentry2offset(new_dentry);</div><div class='add'>+</div><div class='add'>+	simple_offset_remove(old_ctx, old_dentry);</div><div class='add'>+</div><div class='add'>+	if (new_offset) {</div><div class='add'>+		offset_set(new_dentry, 0);</div><div class='add'>+		return simple_offset_replace(new_ctx, old_dentry, new_offset);</div><div class='add'>+	}</div><div class='add'>+	return simple_offset_add(new_ctx, old_dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * simple_offset_rename_exchange - exchange rename with directory offsets</div><div class='ctx'>  * @old_dir: parent of dentry being moved</div><div class='ctx'>  * @old_dentry: dentry being moved</div><div class='ctx'>  * @new_dir: destination parent</div><div class='ctx'>  * @new_dentry: destination dentry</div><div class='ctx'>  *</div><div class='add'>+ * This API preserves the directory offset values. Caller provides</div><div class='add'>+ * appropriate serialization.</div><div class='add'>+ *</div><div class='ctx'>  * Returns zero on success. Otherwise a negative errno is returned and the</div><div class='ctx'>  * rename is rolled back.</div><div class='ctx'>  */</div><div class='hunk'>@@ -327,18 +384,18 @@ int simple_offset_rename_exchange(struct inode *old_dir,</div><div class='ctx'> {</div><div class='ctx'> 	struct offset_ctx *old_ctx = old_dir-&gt;i_op-&gt;get_offset_ctx(old_dir);</div><div class='ctx'> 	struct offset_ctx *new_ctx = new_dir-&gt;i_op-&gt;get_offset_ctx(new_dir);</div><div class='del'>-	u32 old_index = dentry2offset(old_dentry);</div><div class='del'>-	u32 new_index = dentry2offset(new_dentry);</div><div class='add'>+	long old_index = dentry2offset(old_dentry);</div><div class='add'>+	long new_index = dentry2offset(new_dentry);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	simple_offset_remove(old_ctx, old_dentry);</div><div class='ctx'> 	simple_offset_remove(new_ctx, new_dentry);</div><div class='ctx'> </div><div class='del'>-	ret = simple_offset_add(new_ctx, old_dentry);</div><div class='add'>+	ret = simple_offset_replace(new_ctx, old_dentry, new_index);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_restore;</div><div class='ctx'> </div><div class='del'>-	ret = simple_offset_add(old_ctx, new_dentry);</div><div class='add'>+	ret = simple_offset_replace(old_ctx, new_dentry, old_index);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		simple_offset_remove(new_ctx, old_dentry);</div><div class='ctx'> 		goto out_restore;</div><div class='hunk'>@@ -353,10 +410,8 @@ int simple_offset_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_restore:</div><div class='del'>-	offset_set(old_dentry, old_index);</div><div class='del'>-	xa_store(&amp;old_ctx-&gt;xa, old_index, old_dentry, GFP_KERNEL);</div><div class='del'>-	offset_set(new_dentry, new_index);</div><div class='del'>-	xa_store(&amp;new_ctx-&gt;xa, new_index, new_dentry, GFP_KERNEL);</div><div class='add'>+	(void)simple_offset_replace(old_ctx, old_dentry, old_index);</div><div class='add'>+	(void)simple_offset_replace(new_ctx, new_dentry, new_index);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +424,7 @@ out_restore:</div><div class='ctx'>  */</div><div class='ctx'> void simple_offset_destroy(struct offset_ctx *octx)</div><div class='ctx'> {</div><div class='del'>-	xa_destroy(&amp;octx-&gt;xa);</div><div class='add'>+	mtree_destroy(&amp;octx-&gt;mt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -397,57 +452,89 @@ static loff_t offset_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* In this case, -&gt;private_data is protected by f_pos_lock */</div><div class='del'>-	file-&gt;private_data = NULL;</div><div class='del'>-	return vfs_setpos(file, offset, U32_MAX);</div><div class='add'>+	return vfs_setpos(file, offset, LONG_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *offset_find_next(struct xa_state *xas)</div><div class='add'>+static struct dentry *find_positive_dentry(struct dentry *parent,</div><div class='add'>+					   struct dentry *dentry,</div><div class='add'>+					   bool next)</div><div class='ctx'> {</div><div class='add'>+	struct dentry *found = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;parent-&gt;d_lock);</div><div class='add'>+	if (next)</div><div class='add'>+		dentry = d_next_sibling(dentry);</div><div class='add'>+	else if (!dentry)</div><div class='add'>+		dentry = d_first_child(parent);</div><div class='add'>+	hlist_for_each_entry_from(dentry, d_sib) {</div><div class='add'>+		if (!simple_positive(dentry))</div><div class='add'>+			continue;</div><div class='add'>+		spin_lock_nested(&amp;dentry-&gt;d_lock, DENTRY_D_LOCK_NESTED);</div><div class='add'>+		if (simple_positive(dentry))</div><div class='add'>+			found = dget_dlock(dentry);</div><div class='add'>+		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+		if (likely(found))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;parent-&gt;d_lock);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack struct dentry *</div><div class='add'>+offset_dir_lookup(struct dentry *parent, loff_t offset)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(parent);</div><div class='add'>+	struct offset_ctx *octx = inode-&gt;i_op-&gt;get_offset_ctx(inode);</div><div class='ctx'> 	struct dentry *child, *found = NULL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	child = xas_next_entry(xas, U32_MAX);</div><div class='del'>-	if (!child)</div><div class='del'>-		goto out;</div><div class='del'>-	spin_lock(&amp;child-&gt;d_lock);</div><div class='del'>-	if (simple_positive(child))</div><div class='del'>-		found = dget_dlock(child);</div><div class='del'>-	spin_unlock(&amp;child-&gt;d_lock);</div><div class='del'>-out:</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	MA_STATE(mas, &amp;octx-&gt;mt, offset, offset);</div><div class='add'>+</div><div class='add'>+	if (offset == DIR_OFFSET_FIRST)</div><div class='add'>+		found = find_positive_dentry(parent, NULL, false);</div><div class='add'>+	else {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		child = mas_find_rev(&amp;mas, DIR_OFFSET_MIN);</div><div class='add'>+		found = find_positive_dentry(parent, child, false);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool offset_dir_emit(struct dir_context *ctx, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	u32 offset = dentry2offset(dentry);</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='del'>-	return ctx-&gt;actor(ctx, dentry-&gt;d_name.name, dentry-&gt;d_name.len, offset,</div><div class='del'>-			  inode-&gt;i_ino, fs_umode_to_dtype(inode-&gt;i_mode));</div><div class='add'>+	return dir_emit(ctx, dentry-&gt;d_name.name, dentry-&gt;d_name.len,</div><div class='add'>+			inode-&gt;i_ino, fs_umode_to_dtype(inode-&gt;i_mode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx)</div><div class='add'>+static void offset_iterate_dir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct offset_ctx *so_ctx = inode-&gt;i_op-&gt;get_offset_ctx(inode);</div><div class='del'>-	XA_STATE(xas, &amp;so_ctx-&gt;xa, ctx-&gt;pos);</div><div class='add'>+	struct dentry *dir = file-&gt;f_path.dentry;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> </div><div class='add'>+	dentry = offset_dir_lookup(dir, ctx-&gt;pos);</div><div class='add'>+	if (!dentry)</div><div class='add'>+		goto out_eod;</div><div class='ctx'> 	while (true) {</div><div class='del'>-		dentry = offset_find_next(&amp;xas);</div><div class='del'>-		if (!dentry)</div><div class='del'>-			return ERR_PTR(-ENOENT);</div><div class='add'>+		struct dentry *next;</div><div class='ctx'> </div><div class='del'>-		if (!offset_dir_emit(ctx, dentry)) {</div><div class='del'>-			dput(dentry);</div><div class='add'>+		ctx-&gt;pos = dentry2offset(dentry);</div><div class='add'>+		if (!offset_dir_emit(ctx, dentry))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='add'>+		next = find_positive_dentry(dir, dentry, true);</div><div class='ctx'> 		dput(dentry);</div><div class='del'>-		ctx-&gt;pos = xas.xa_index + 1;</div><div class='add'>+</div><div class='add'>+		if (!next)</div><div class='add'>+			goto out_eod;</div><div class='add'>+		dentry = next;</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+	dput(dentry);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_eod:</div><div class='add'>+	ctx-&gt;pos = DIR_OFFSET_EOD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -467,6 +554,8 @@ static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx)</div><div class='ctx'>  *</div><div class='ctx'>  * On return, @ctx-&gt;pos contains an offset that will read the next entry</div><div class='ctx'>  * in this directory when offset_readdir() is called again with @ctx.</div><div class='add'>+ * Caller places this value in the d_off field of the last entry in the</div><div class='add'>+ * user's buffer.</div><div class='ctx'>  *</div><div class='ctx'>  * Return values:</div><div class='ctx'>  *   %0 - Complete</div><div class='hunk'>@@ -479,13 +568,8 @@ static int offset_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	if (!dir_emit_dots(file, ctx))</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-	/* In this case, -&gt;private_data is protected by f_pos_lock */</div><div class='del'>-	if (ctx-&gt;pos == 2)</div><div class='del'>-		file-&gt;private_data = NULL;</div><div class='del'>-	else if (file-&gt;private_data == ERR_PTR(-ENOENT))</div><div class='del'>-		return 0;</div><div class='del'>-	file-&gt;private_data = offset_iterate_dir(d_inode(dir), ctx);</div><div class='add'>+	if (ctx-&gt;pos != DIR_OFFSET_EOD)</div><div class='add'>+		offset_iterate_dir(file, ctx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,7 +580,7 @@ const struct file_operations simple_offset_dir_operations = {</div><div class='ctx'> 	.fsync		= noop_fsync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dentry *find_next_child(struct dentry *parent, struct dentry *prev)</div><div class='add'>+struct dentry *find_next_child(struct dentry *parent, struct dentry *prev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *child = NULL, *d;</div><div class='ctx'> </div><div class='hunk'>@@ -516,16 +600,18 @@ static struct dentry *find_next_child(struct dentry *parent, struct dentry *prev</div><div class='ctx'> 	dput(prev);</div><div class='ctx'> 	return child;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(find_next_child);</div><div class='ctx'> </div><div class='del'>-void simple_recursive_removal(struct dentry *dentry,</div><div class='del'>-                              void (*callback)(struct dentry *))</div><div class='add'>+static void __simple_recursive_removal(struct dentry *dentry,</div><div class='add'>+                              void (*callback)(struct dentry *),</div><div class='add'>+			      bool locked)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *this = dget(dentry);</div><div class='ctx'> 	while (true) {</div><div class='ctx'> 		struct dentry *victim = NULL, *child;</div><div class='ctx'> 		struct inode *inode = this-&gt;d_inode;</div><div class='ctx'> </div><div class='del'>-		inode_lock(inode);</div><div class='add'>+		inode_lock_nested(inode, I_MUTEX_CHILD);</div><div class='ctx'> 		if (d_is_dir(this))</div><div class='ctx'> 			inode-&gt;i_flags |= S_DEAD;</div><div class='ctx'> 		while ((child = find_next_child(this, victim)) == NULL) {</div><div class='hunk'>@@ -537,23 +623,22 @@ void simple_recursive_removal(struct dentry *dentry,</div><div class='ctx'> 			victim = this;</div><div class='ctx'> 			this = this-&gt;d_parent;</div><div class='ctx'> 			inode = this-&gt;d_inode;</div><div class='del'>-			inode_lock(inode);</div><div class='add'>+			if (!locked || victim != dentry)</div><div class='add'>+				inode_lock_nested(inode, I_MUTEX_CHILD);</div><div class='ctx'> 			if (simple_positive(victim)) {</div><div class='ctx'> 				d_invalidate(victim);	// avoid lost mounts</div><div class='del'>-				if (d_is_dir(victim))</div><div class='del'>-					fsnotify_rmdir(inode, victim);</div><div class='del'>-				else</div><div class='del'>-					fsnotify_unlink(inode, victim);</div><div class='ctx'> 				if (callback)</div><div class='ctx'> 					callback(victim);</div><div class='del'>-				dput(victim);		// unpin it</div><div class='add'>+				fsnotify_delete(inode, d_inode(victim), victim);</div><div class='add'>+				d_make_discardable(victim);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (victim == dentry) {</div><div class='ctx'> 				inode_set_mtime_to_ts(inode,</div><div class='ctx'> 						      inode_set_ctime_current(inode));</div><div class='ctx'> 				if (d_is_dir(dentry))</div><div class='ctx'> 					drop_nlink(inode);</div><div class='del'>-				inode_unlock(inode);</div><div class='add'>+				if (!locked)</div><div class='add'>+					inode_unlock(inode);</div><div class='ctx'> 				dput(dentry);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -562,8 +647,35 @@ void simple_recursive_removal(struct dentry *dentry,</div><div class='ctx'> 		this = child;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void simple_recursive_removal(struct dentry *dentry,</div><div class='add'>+                              void (*callback)(struct dentry *))</div><div class='add'>+{</div><div class='add'>+	return __simple_recursive_removal(dentry, callback, false);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(simple_recursive_removal);</div><div class='ctx'> </div><div class='add'>+void simple_remove_by_name(struct dentry *parent, const char *name,</div><div class='add'>+                           void (*callback)(struct dentry *))</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	dentry = lookup_noperm_positive_unlocked(&amp;QSTR(name), parent);</div><div class='add'>+	if (!IS_ERR(dentry)) {</div><div class='add'>+		simple_recursive_removal(dentry, callback);</div><div class='add'>+		dput(dentry);	// paired with lookup_noperm_positive_unlocked()</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(simple_remove_by_name);</div><div class='add'>+</div><div class='add'>+/* caller holds parent directory with I_MUTEX_PARENT */</div><div class='add'>+void locked_recursive_removal(struct dentry *dentry,</div><div class='add'>+                              void (*callback)(struct dentry *))</div><div class='add'>+{</div><div class='add'>+	return __simple_recursive_removal(dentry, callback, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(locked_recursive_removal);</div><div class='add'>+</div><div class='ctx'> static const struct super_operations simple_super_operations = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='ctx'> };</div><div class='hunk'>@@ -578,8 +690,10 @@ static int pseudo_fs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> 	s-&gt;s_blocksize_bits = PAGE_SHIFT;</div><div class='ctx'> 	s-&gt;s_magic = ctx-&gt;magic;</div><div class='ctx'> 	s-&gt;s_op = ctx-&gt;ops ?: &amp;simple_super_operations;</div><div class='add'>+	s-&gt;s_export_op = ctx-&gt;eops;</div><div class='ctx'> 	s-&gt;s_xattr = ctx-&gt;xattr;</div><div class='ctx'> 	s-&gt;s_time_gran = 1;</div><div class='add'>+	s-&gt;s_d_flags |= ctx-&gt;s_d_flags;</div><div class='ctx'> 	root = new_inode(s);</div><div class='ctx'> 	if (!root)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -595,7 +709,7 @@ static int pseudo_fs_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> 	s-&gt;s_root = d_make_root(root);</div><div class='ctx'> 	if (!s-&gt;s_root)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	s-&gt;s_d_op = ctx-&gt;dops;</div><div class='add'>+	set_default_d_op(s, ctx-&gt;dops);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -651,8 +765,7 @@ int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *den</div><div class='ctx'> 			      inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode)));</div><div class='ctx'> 	inc_nlink(inode);</div><div class='ctx'> 	ihold(inode);</div><div class='del'>-	dget(dentry);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(simple_link);</div><div class='hunk'>@@ -678,14 +791,28 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(simple_empty);</div><div class='ctx'> </div><div class='del'>-int simple_unlink(struct inode *dir, struct dentry *dentry)</div><div class='add'>+void __simple_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='ctx'> 	inode_set_mtime_to_ts(dir,</div><div class='ctx'> 			      inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode)));</div><div class='ctx'> 	drop_nlink(inode);</div><div class='del'>-	dput(dentry);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__simple_unlink);</div><div class='add'>+</div><div class='add'>+void __simple_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	drop_nlink(d_inode(dentry));</div><div class='add'>+	__simple_unlink(dir, dentry);</div><div class='add'>+	drop_nlink(dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__simple_rmdir);</div><div class='add'>+</div><div class='add'>+int simple_unlink(struct inode *dir, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	__simple_unlink(dir, dentry);</div><div class='add'>+	d_make_discardable(dentry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(simple_unlink);</div><div class='hunk'>@@ -695,9 +822,8 @@ int simple_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	if (!simple_empty(dentry))</div><div class='ctx'> 		return -ENOTEMPTY;</div><div class='ctx'> </div><div class='del'>-	drop_nlink(d_inode(dentry));</div><div class='del'>-	simple_unlink(dir, dentry);</div><div class='del'>-	drop_nlink(dir);</div><div class='add'>+	__simple_rmdir(dir, dentry);</div><div class='add'>+	d_make_discardable(dentry);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(simple_rmdir);</div><div class='hunk'>@@ -821,9 +947,9 @@ static int simple_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int simple_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+int simple_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='ctx'> 			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+			struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +958,7 @@ int simple_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	if (IS_ERR(folio))</div><div class='ctx'> 		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_uptodate(folio) &amp;&amp; (len != folio_size(folio))) {</div><div class='ctx'> 		size_t from = offset_in_folio(folio, pos);</div><div class='hunk'>@@ -846,18 +972,19 @@ EXPORT_SYMBOL(simple_write_begin);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * simple_write_end - .write_end helper for non-block-device FSes</div><div class='del'>- * @file: See .write_end of address_space_operations</div><div class='add'>+ * @iocb: kernel I/O control block</div><div class='ctx'>  * @mapping: 		"</div><div class='ctx'>  * @pos: 		"</div><div class='ctx'>  * @len: 		"</div><div class='ctx'>  * @copied: 		"</div><div class='del'>- * @page: 		"</div><div class='add'>+ * @folio: 		"</div><div class='ctx'>  * @fsdata: 		"</div><div class='ctx'>  *</div><div class='del'>- * simple_write_end does the minimum needed for updating a page after writing is</div><div class='del'>- * done. It has the same API signature as the .write_end of</div><div class='add'>+ * simple_write_end does the minimum needed for updating a folio after</div><div class='add'>+ * writing is done. It has the same API signature as the .write_end of</div><div class='ctx'>  * address_space_operations vector. So it can just be set onto .write_end for</div><div class='del'>- * FSes that don't need any other processing. i_mutex is assumed to be held.</div><div class='add'>+ * FSes that don't need any other processing. i_rwsem is assumed to be held</div><div class='add'>+ * exclusively.</div><div class='ctx'>  * Block based filesystems should use generic_write_end().</div><div class='ctx'>  * NOTE: Even though i_size might get updated by this function, mark_inode_dirty</div><div class='ctx'>  * is not called, so a filesystem that actually does store data in .write_inode</div><div class='hunk'>@@ -866,11 +993,11 @@ EXPORT_SYMBOL(simple_write_begin);</div><div class='ctx'>  *</div><div class='ctx'>  * Use *ONLY* with simple_read_folio()</div><div class='ctx'>  */</div><div class='del'>-static int simple_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			struct page *page, void *fsdata)</div><div class='add'>+static int simple_write_end(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='add'>+			    loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			    struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	loff_t last_pos = pos + copied;</div><div class='ctx'> </div><div class='hunk'>@@ -885,7 +1012,7 @@ static int simple_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * No need to use i_size_read() here, the i_size</div><div class='del'>-	 * cannot change under us because we hold the i_mutex.</div><div class='add'>+	 * cannot change under us because we hold the i_rwsem.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (last_pos &gt; inode-&gt;i_size)</div><div class='ctx'> 		i_size_write(inode, last_pos);</div><div class='hunk'>@@ -964,7 +1091,8 @@ int simple_fill_super(struct super_block *s, unsigned long magic,</div><div class='ctx'> 		simple_inode_init_ts(inode);</div><div class='ctx'> 		inode-&gt;i_fop = files-&gt;ops;</div><div class='ctx'> 		inode-&gt;i_ino = i;</div><div class='del'>-		d_add(dentry, inode);</div><div class='add'>+		d_make_persistent(dentry, inode);</div><div class='add'>+		dput(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1441,9 +1569,9 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end,</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	ret = sync_mapping_buffers(inode-&gt;i_mapping);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_DIRTY_ALL))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_DIRTY_ALL))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (datasync &amp;&amp; !(inode-&gt;i_state &amp; I_DIRTY_DATASYNC))</div><div class='add'>+	if (datasync &amp;&amp; !(inode_state_read_once(inode) &amp; I_DIRTY_DATASYNC))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = sync_inode_metadata(inode, 1);</div><div class='hunk'>@@ -1495,13 +1623,17 @@ EXPORT_SYMBOL(generic_file_fsync);</div><div class='ctx'> int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)</div><div class='ctx'> {</div><div class='ctx'> 	u64 last_fs_block = num_blocks - 1;</div><div class='del'>-	u64 last_fs_page =</div><div class='del'>-		last_fs_block &gt;&gt; (PAGE_SHIFT - blocksize_bits);</div><div class='add'>+	u64 last_fs_page, max_bytes;</div><div class='add'>+</div><div class='add'>+	if (check_shl_overflow(num_blocks, blocksize_bits, &amp;max_bytes))</div><div class='add'>+		return -EFBIG;</div><div class='add'>+</div><div class='add'>+	last_fs_page = (max_bytes &gt;&gt; PAGE_SHIFT) - 1;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(num_blocks == 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((blocksize_bits &lt; 9) || (blocksize_bits &gt; PAGE_SHIFT))</div><div class='add'>+	if (blocksize_bits &lt; 9)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((last_fs_block &gt; (sector_t)(~0ULL) &gt;&gt; (blocksize_bits - 9)) ||</div><div class='hunk'>@@ -1559,11 +1691,15 @@ struct inode *alloc_anon_inode(struct super_block *s)</div><div class='ctx'> 	 * list because mark_inode_dirty() will think</div><div class='ctx'> 	 * that it already _is_ on the dirty list.</div><div class='ctx'> 	 */</div><div class='del'>-	inode-&gt;i_state = I_DIRTY;</div><div class='add'>+	inode_state_assign_raw(inode, I_DIRTY);</div><div class='add'>+	/*</div><div class='add'>+	 * Historically anonymous inodes don't have a type at all and</div><div class='add'>+	 * userspace has come to rely on this.</div><div class='add'>+	 */</div><div class='ctx'> 	inode-&gt;i_mode = S_IRUSR | S_IWUSR;</div><div class='ctx'> 	inode-&gt;i_uid = current_fsuid();</div><div class='ctx'> 	inode-&gt;i_gid = current_fsgid();</div><div class='del'>-	inode-&gt;i_flags |= S_PRIVATE;</div><div class='add'>+	inode-&gt;i_flags |= S_PRIVATE | S_ANON_INODE;</div><div class='ctx'> 	simple_inode_init_ts(inode);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -1580,7 +1716,7 @@ EXPORT_SYMBOL(alloc_anon_inode);</div><div class='ctx'>  * All arguments are ignored and it just returns -EINVAL.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-simple_nosetlease(struct file *filp, int arg, struct file_lock **flp,</div><div class='add'>+simple_nosetlease(struct file *filp, int arg, struct file_lease **flp,</div><div class='ctx'> 		  void **priv)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -1621,15 +1757,6 @@ static struct dentry *empty_dir_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	return ERR_PTR(-ENOENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int empty_dir_getattr(struct mnt_idmap *idmap,</div><div class='del'>-			     const struct path *path, struct kstat *stat,</div><div class='del'>-			     u32 request_mask, unsigned int query_flags)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='del'>-	generic_fillattr(&amp;nop_mnt_idmap, request_mask, inode, stat);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int empty_dir_setattr(struct mnt_idmap *idmap,</div><div class='ctx'> 			     struct dentry *dentry, struct iattr *attr)</div><div class='ctx'> {</div><div class='hunk'>@@ -1643,9 +1770,7 @@ static ssize_t empty_dir_listxattr(struct dentry *dentry, char *list, size_t siz</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations empty_dir_inode_operations = {</div><div class='ctx'> 	.lookup		= empty_dir_lookup,</div><div class='del'>-	.permission	= generic_permission,</div><div class='ctx'> 	.setattr	= empty_dir_setattr,</div><div class='del'>-	.getattr	= empty_dir_getattr,</div><div class='ctx'> 	.listxattr	= empty_dir_listxattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1701,44 +1826,52 @@ bool is_empty_dir_inode(struct inode *inode)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if names match, 1 if mismatch, or -ERRNO</div><div class='ctx'>  */</div><div class='del'>-static int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,</div><div class='del'>-				const char *str, const struct qstr *name)</div><div class='add'>+int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,</div><div class='add'>+			 const char *str, const struct qstr *name)</div><div class='ctx'> {</div><div class='del'>-	const struct dentry *parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='del'>-	const struct inode *dir = READ_ONCE(parent-&gt;d_inode);</div><div class='del'>-	const struct super_block *sb = dentry-&gt;d_sb;</div><div class='del'>-	const struct unicode_map *um = sb-&gt;s_encoding;</div><div class='del'>-	struct qstr qstr = QSTR_INIT(str, len);</div><div class='del'>-	char strbuf[DNAME_INLINE_LEN];</div><div class='del'>-	int ret;</div><div class='add'>+	const struct dentry *parent;</div><div class='add'>+	const struct inode *dir;</div><div class='add'>+	union shortname_store strbuf;</div><div class='add'>+	struct qstr qstr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt a case-sensitive match first. It is cheaper and</div><div class='add'>+	 * should cover most lookups, including all the sane</div><div class='add'>+	 * applications that expect a case-sensitive filesystem.</div><div class='add'>+	 *</div><div class='add'>+	 * This comparison is safe under RCU because the caller</div><div class='add'>+	 * guarantees the consistency between str and len. See</div><div class='add'>+	 * __d_lookup_rcu_op_compare() for details.</div><div class='add'>+	 */</div><div class='add'>+	if (len == name-&gt;len &amp;&amp; !memcmp(str, name-&gt;name, len))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='add'>+	parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='add'>+	dir = READ_ONCE(parent-&gt;d_inode);</div><div class='ctx'> 	if (!dir || !IS_CASEFOLDED(dir))</div><div class='del'>-		goto fallback;</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	qstr.len = len;</div><div class='add'>+	qstr.name = str;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the dentry name is stored in-line, then it may be concurrently</div><div class='ctx'> 	 * modified by a rename.  If this happens, the VFS will eventually retry</div><div class='ctx'> 	 * the lookup, so it doesn't matter what -&gt;d_compare() returns.</div><div class='ctx'> 	 * However, it's unsafe to call utf8_strncasecmp() with an unstable</div><div class='ctx'> 	 * string.  Therefore, we have to copy the name into a temporary buffer.</div><div class='add'>+	 * As above, len is guaranteed to match str, so the shortname case</div><div class='add'>+	 * is exactly when str points to -&gt;d_shortname.</div><div class='ctx'> 	 */</div><div class='del'>-	if (len &lt;= DNAME_INLINE_LEN - 1) {</div><div class='del'>-		memcpy(strbuf, str, len);</div><div class='del'>-		strbuf[len] = 0;</div><div class='del'>-		qstr.name = strbuf;</div><div class='add'>+	if (qstr.name == dentry-&gt;d_shortname.string) {</div><div class='add'>+		strbuf = dentry-&gt;d_shortname; // NUL is guaranteed to be in there</div><div class='add'>+		qstr.name = strbuf.string;</div><div class='ctx'> 		/* prevent compiler from optimizing out the temporary buffer */</div><div class='ctx'> 		barrier();</div><div class='ctx'> 	}</div><div class='del'>-	ret = utf8_strncasecmp(um, name, &amp;qstr);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		return ret;</div><div class='ctx'> </div><div class='del'>-	if (sb_has_strict_encoding(sb))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-fallback:</div><div class='del'>-	if (len != name-&gt;len)</div><div class='del'>-		return 1;</div><div class='del'>-	return !!memcmp(str, name-&gt;name, len);</div><div class='add'>+	return utf8_strncasecmp(dentry-&gt;d_sb-&gt;s_encoding, name, &amp;qstr);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(generic_ci_d_compare);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * generic_ci_d_hash - generic d_hash implementation for casefolding filesystems</div><div class='hunk'>@@ -1747,12 +1880,12 @@ fallback:</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if hash was successful or unchanged, and -EINVAL on error</div><div class='ctx'>  */</div><div class='del'>-static int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)</div><div class='add'>+int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)</div><div class='ctx'> {</div><div class='ctx'> 	const struct inode *dir = READ_ONCE(dentry-&gt;d_inode);</div><div class='ctx'> 	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	const struct unicode_map *um = sb-&gt;s_encoding;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!dir || !IS_CASEFOLDED(dir))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1762,77 +1895,124 @@ static int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(generic_ci_d_hash);</div><div class='ctx'> </div><div class='ctx'> static const struct dentry_operations generic_ci_dentry_ops = {</div><div class='ctx'> 	.d_hash = generic_ci_d_hash,</div><div class='ctx'> 	.d_compare = generic_ci_d_compare,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-static const struct dentry_operations generic_encrypted_dentry_ops = {</div><div class='ctx'> 	.d_revalidate = fscrypt_d_revalidate,</div><div class='del'>-};</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_FS_ENCRYPTION) &amp;&amp; IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-static const struct dentry_operations generic_encrypted_ci_dentry_ops = {</div><div class='del'>-	.d_hash = generic_ci_d_hash,</div><div class='del'>-	.d_compare = generic_ci_d_compare,</div><div class='del'>-	.d_revalidate = fscrypt_d_revalidate,</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * generic_set_encrypted_ci_d_ops - helper for setting d_ops for given dentry</div><div class='del'>- * @dentry:	dentry to set ops on</div><div class='add'>+ * generic_ci_match() - Match a name (case-insensitively) with a dirent.</div><div class='add'>+ * This is a filesystem helper for comparison with directory entries.</div><div class='add'>+ * generic_ci_d_compare should be used in VFS' -&gt;d_compare instead.</div><div class='ctx'>  *</div><div class='del'>- * Casefolded directories need d_hash and d_compare set, so that the dentries</div><div class='del'>- * contained in them are handled case-insensitively.  Note that these operations</div><div class='del'>- * are needed on the parent directory rather than on the dentries in it, and</div><div class='del'>- * while the casefolding flag can be toggled on and off on an empty directory,</div><div class='del'>- * dentry_operations can't be changed later.  As a result, if the filesystem has</div><div class='del'>- * casefolding support enabled at all, we have to give all dentries the</div><div class='del'>- * casefolding operations even if their inode doesn't have the casefolding flag</div><div class='del'>- * currently (and thus the casefolding ops would be no-ops for now).</div><div class='add'>+ * @parent: Inode of the parent of the dirent under comparison</div><div class='add'>+ * @name: name under lookup.</div><div class='add'>+ * @folded_name: Optional pre-folded name under lookup</div><div class='add'>+ * @de_name: Dirent name.</div><div class='add'>+ * @de_name_len: dirent name length.</div><div class='ctx'>  *</div><div class='del'>- * Encryption works differently in that the only dentry operation it needs is</div><div class='del'>- * d_revalidate, which it only needs on dentries that have the no-key name flag.</div><div class='del'>- * The no-key flag can't be set "later", so we don't have to worry about that.</div><div class='add'>+ * Test whether a case-insensitive directory entry matches the filename</div><div class='add'>+ * being searched.  If @folded_name is provided, it is used instead of</div><div class='add'>+ * recalculating the casefold of @name.</div><div class='ctx'>  *</div><div class='del'>- * Finally, to maximize compatibility with overlayfs (which isn't compatible</div><div class='del'>- * with certain dentry operations) and to avoid taking an unnecessary</div><div class='del'>- * performance hit, we use custom dentry_operations for each possible</div><div class='del'>- * combination rather than always installing all operations.</div><div class='add'>+ * Return: &gt; 0 if the directory entry matches, 0 if it doesn't match, or</div><div class='add'>+ * &lt; 0 on error.</div><div class='ctx'>  */</div><div class='del'>-void generic_set_encrypted_ci_d_ops(struct dentry *dentry)</div><div class='add'>+int generic_ci_match(const struct inode *parent,</div><div class='add'>+		     const struct qstr *name,</div><div class='add'>+		     const struct qstr *folded_name,</div><div class='add'>+		     const u8 *de_name, u32 de_name_len)</div><div class='ctx'> {</div><div class='add'>+	const struct super_block *sb = parent-&gt;i_sb;</div><div class='add'>+	const struct unicode_map *um = sb-&gt;s_encoding;</div><div class='add'>+	struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len);</div><div class='add'>+	struct qstr dirent = QSTR_INIT(de_name, de_name_len);</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ENCRYPTED(parent)) {</div><div class='add'>+		const struct fscrypt_str encrypted_name =</div><div class='add'>+			FSTR_INIT((u8 *) de_name, de_name_len);</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(!fscrypt_has_encryption_key(parent)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL);</div><div class='add'>+		if (!decrypted_name.name)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		res = fscrypt_fname_disk_to_usr(parent, 0, 0, &amp;encrypted_name,</div><div class='add'>+						&amp;decrypted_name);</div><div class='add'>+		if (res &lt; 0) {</div><div class='add'>+			kfree(decrypted_name.name);</div><div class='add'>+			return res;</div><div class='add'>+		}</div><div class='add'>+		dirent.name = decrypted_name.name;</div><div class='add'>+		dirent.len = decrypted_name.len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt a case-sensitive match first. It is cheaper and</div><div class='add'>+	 * should cover most lookups, including all the sane</div><div class='add'>+	 * applications that expect a case-sensitive filesystem.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (dirent.len == name-&gt;len &amp;&amp;</div><div class='add'>+	    !memcmp(name-&gt;name, dirent.name, dirent.len))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (folded_name-&gt;name)</div><div class='add'>+		res = utf8_strncasecmp_folded(um, folded_name, &amp;dirent);</div><div class='add'>+	else</div><div class='add'>+		res = utf8_strncasecmp(um, name, &amp;dirent);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(decrypted_name.name);</div><div class='add'>+	if (res &lt; 0 &amp;&amp; sb_has_strict_encoding(sb)) {</div><div class='add'>+		pr_err_ratelimited("Directory contains filename that is invalid UTF-8");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return !res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(generic_ci_match);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-	bool needs_encrypt_ops = dentry-&gt;d_flags &amp; DCACHE_NOKEY_NAME;</div><div class='add'>+static const struct dentry_operations generic_encrypted_dentry_ops = {</div><div class='add'>+	.d_revalidate = fscrypt_d_revalidate,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * generic_set_sb_d_ops - helper for choosing the set of</div><div class='add'>+ * filesystem-wide dentry operations for the enabled features</div><div class='add'>+ * @sb: superblock to be configured</div><div class='add'>+ *</div><div class='add'>+ * Filesystems supporting casefolding and/or fscrypt can call this</div><div class='add'>+ * helper at mount-time to configure default dentry_operations to the</div><div class='add'>+ * best set of dentry operations required for the enabled features.</div><div class='add'>+ * The helper must be called after these have been configured, but</div><div class='add'>+ * before the root dentry is created.</div><div class='add'>+ */</div><div class='add'>+void generic_set_sb_d_ops(struct super_block *sb)</div><div class='add'>+{</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	bool needs_ci_ops = dentry-&gt;d_sb-&gt;s_encoding;</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_FS_ENCRYPTION) &amp;&amp; IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (needs_encrypt_ops &amp;&amp; needs_ci_ops) {</div><div class='del'>-		d_set_d_op(dentry, &amp;generic_encrypted_ci_dentry_ops);</div><div class='add'>+	if (sb-&gt;s_encoding) {</div><div class='add'>+		set_default_d_op(sb, &amp;generic_ci_dentry_ops);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-	if (needs_encrypt_ops) {</div><div class='del'>-		d_set_d_op(dentry, &amp;generic_encrypted_dentry_ops);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	if (needs_ci_ops) {</div><div class='del'>-		d_set_d_op(dentry, &amp;generic_ci_dentry_ops);</div><div class='add'>+	if (sb-&gt;s_cop) {</div><div class='add'>+		set_default_d_op(sb, &amp;generic_encrypted_dentry_ops);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(generic_set_encrypted_ci_d_ops);</div><div class='add'>+EXPORT_SYMBOL(generic_set_sb_d_ops);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * inode_maybe_inc_iversion - increments i_version</div><div class='hunk'>@@ -1860,13 +2040,19 @@ bool inode_maybe_inc_iversion(struct inode *inode, bool force)</div><div class='ctx'> 	 * information, but the legacy inode_inc_iversion code used a spinlock</div><div class='ctx'> 	 * to serialize increments.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Here, we add full memory barriers to ensure that any de-facto</div><div class='del'>-	 * ordering with other info is preserved.</div><div class='add'>+	 * We add a full memory barrier to ensure that any de facto ordering</div><div class='add'>+	 * with other state is preserved (either implicitly coming from cmpxchg</div><div class='add'>+	 * or explicitly from smp_mb if we don't know upfront if we will execute</div><div class='add'>+	 * the former).</div><div class='ctx'> 	 *</div><div class='del'>-	 * This barrier pairs with the barrier in inode_query_iversion()</div><div class='add'>+	 * These barriers pair with inode_query_iversion().</div><div class='ctx'> 	 */</div><div class='del'>-	smp_mb();</div><div class='ctx'> 	cur = inode_peek_iversion_raw(inode);</div><div class='add'>+	if (!force &amp;&amp; !(cur &amp; I_VERSION_QUERIED)) {</div><div class='add'>+		smp_mb();</div><div class='add'>+		cur = inode_peek_iversion_raw(inode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* If flag is clear then we needn't do anything */</div><div class='ctx'> 		if (!force &amp;&amp; !(cur &amp; I_VERSION_QUERIED))</div><div class='hunk'>@@ -1895,20 +2081,22 @@ EXPORT_SYMBOL(inode_maybe_inc_iversion);</div><div class='ctx'> u64 inode_query_iversion(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cur, new;</div><div class='add'>+	bool fenced = false;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Memory barriers (implicit in cmpxchg, explicit in smp_mb) pair with</div><div class='add'>+	 * inode_maybe_inc_iversion(), see that routine for more details.</div><div class='add'>+	 */</div><div class='ctx'> 	cur = inode_peek_iversion_raw(inode);</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* If flag is already set, then no need to swap */</div><div class='ctx'> 		if (cur &amp; I_VERSION_QUERIED) {</div><div class='del'>-			/*</div><div class='del'>-			 * This barrier (and the implicit barrier in the</div><div class='del'>-			 * cmpxchg below) pairs with the barrier in</div><div class='del'>-			 * inode_maybe_inc_iversion().</div><div class='del'>-			 */</div><div class='del'>-			smp_mb();</div><div class='add'>+			if (!fenced)</div><div class='add'>+				smp_mb();</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		fenced = true;</div><div class='ctx'> 		new = cur | I_VERSION_QUERIED;</div><div class='ctx'> 	} while (!atomic64_try_cmpxchg(&amp;inode-&gt;i_version, &amp;cur, new));</div><div class='ctx'> 	return cur &gt;&gt; I_VERSION_QUERIED_SHIFT;</div><div class='hunk'>@@ -1973,3 +2161,188 @@ struct timespec64 simple_inode_init_ts(struct inode *inode)</div><div class='ctx'> 	return ts;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(simple_inode_init_ts);</div><div class='add'>+</div><div class='add'>+struct dentry *stashed_dentry_get(struct dentry **stashed)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	dentry = rcu_dereference(*stashed);</div><div class='add'>+	if (!dentry)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return dentry;</div><div class='add'>+	if (!lockref_get_not_dead(&amp;dentry-&gt;d_lockref))</div><div class='add'>+		return NULL;</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *prepare_anon_dentry(struct dentry **stashed,</div><div class='add'>+					  struct super_block *sb,</div><div class='add'>+					  void *data)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	const struct stashed_operations *sops = sb-&gt;s_fs_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	inode = new_inode_pseudo(sb);</div><div class='add'>+	if (!inode) {</div><div class='add'>+		sops-&gt;put_data(data);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_flags |= S_IMMUTABLE;</div><div class='add'>+	inode-&gt;i_mode = S_IFREG;</div><div class='add'>+	simple_inode_init_ts(inode);</div><div class='add'>+</div><div class='add'>+	ret = sops-&gt;init_inode(inode, data);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		iput(inode);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Notice when this is changed. */</div><div class='add'>+	WARN_ON_ONCE(!S_ISREG(inode-&gt;i_mode));</div><div class='add'>+</div><div class='add'>+	dentry = d_alloc_anon(sb);</div><div class='add'>+	if (!dentry) {</div><div class='add'>+		iput(inode);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store address of location where dentry's supposed to be stashed. */</div><div class='add'>+	dentry-&gt;d_fsdata = stashed;</div><div class='add'>+</div><div class='add'>+	/* @data is now owned by the fs */</div><div class='add'>+	d_instantiate(dentry, inode);</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dentry *stash_dentry(struct dentry **stashed, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct dentry *old;</div><div class='add'>+</div><div class='add'>+		/* Assume any old dentry was cleared out. */</div><div class='add'>+		old = cmpxchg(stashed, NULL, dentry);</div><div class='add'>+		if (likely(!old))</div><div class='add'>+			return dentry;</div><div class='add'>+</div><div class='add'>+		/* Check if somebody else installed a reusable dentry. */</div><div class='add'>+		if (lockref_get_not_dead(&amp;old-&gt;d_lockref))</div><div class='add'>+			return old;</div><div class='add'>+</div><div class='add'>+		/* There's an old dead dentry there, try to take it over. */</div><div class='add'>+		if (likely(try_cmpxchg(stashed, &amp;old, dentry)))</div><div class='add'>+			return dentry;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * path_from_stashed - create path from stashed or new dentry</div><div class='add'>+ * @stashed:    where to retrieve or stash dentry</div><div class='add'>+ * @mnt:        mnt of the filesystems to use</div><div class='add'>+ * @data:       data to store in inode-&gt;i_private</div><div class='add'>+ * @path:       path to create</div><div class='add'>+ *</div><div class='add'>+ * The function tries to retrieve a stashed dentry from @stashed. If the dentry</div><div class='add'>+ * is still valid then it will be reused. If the dentry isn't able the function</div><div class='add'>+ * will allocate a new dentry and inode. It will then check again whether it</div><div class='add'>+ * can reuse an existing dentry in case one has been added in the meantime or</div><div class='add'>+ * update @stashed with the newly added dentry.</div><div class='add'>+ *</div><div class='add'>+ * Special-purpose helper for nsfs and pidfs.</div><div class='add'>+ *</div><div class='add'>+ * Return: On success zero and on failure a negative error is returned.</div><div class='add'>+ */</div><div class='add'>+int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,</div><div class='add'>+		      struct path *path)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry, *res;</div><div class='add'>+	const struct stashed_operations *sops = mnt-&gt;mnt_sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	/* See if dentry can be reused. */</div><div class='add'>+	res = stashed_dentry_get(stashed);</div><div class='add'>+	if (IS_ERR(res))</div><div class='add'>+		return PTR_ERR(res);</div><div class='add'>+	if (res) {</div><div class='add'>+		sops-&gt;put_data(data);</div><div class='add'>+		goto make_path;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate a new dentry. */</div><div class='add'>+	dentry = prepare_anon_dentry(stashed, mnt-&gt;mnt_sb, data);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='add'>+</div><div class='add'>+	/* Added a new dentry. @data is now owned by the filesystem. */</div><div class='add'>+	if (sops-&gt;stash_dentry)</div><div class='add'>+		res = sops-&gt;stash_dentry(stashed, dentry);</div><div class='add'>+	else</div><div class='add'>+		res = stash_dentry(stashed, dentry);</div><div class='add'>+	if (IS_ERR(res)) {</div><div class='add'>+		dput(dentry);</div><div class='add'>+		return PTR_ERR(res);</div><div class='add'>+	}</div><div class='add'>+	if (res != dentry)</div><div class='add'>+		dput(dentry);</div><div class='add'>+</div><div class='add'>+make_path:</div><div class='add'>+	path-&gt;dentry = res;</div><div class='add'>+	path-&gt;mnt = mntget(mnt);</div><div class='add'>+	VFS_WARN_ON_ONCE(path-&gt;dentry-&gt;d_fsdata != stashed);</div><div class='add'>+	VFS_WARN_ON_ONCE(d_inode(path-&gt;dentry)-&gt;i_private != data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void stashed_dentry_prune(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct dentry **stashed = dentry-&gt;d_fsdata;</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!stashed))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only replace our own @dentry as someone else might've</div><div class='add'>+	 * already cleared out @dentry and stashed their own</div><div class='add'>+	 * dentry in there.</div><div class='add'>+	 */</div><div class='add'>+	cmpxchg(stashed, dentry, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * simple_start_creating - prepare to create a given name</div><div class='add'>+ * @parent: directory in which to prepare to create the name</div><div class='add'>+ * @name:   the name to be created</div><div class='add'>+ *</div><div class='add'>+ * Required lock is taken and a lookup in performed prior to creating an</div><div class='add'>+ * object in a directory.  No permission checking is performed.</div><div class='add'>+ *</div><div class='add'>+ * Returns: a negative dentry on which vfs_create() or similar may</div><div class='add'>+ *  be attempted, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *simple_start_creating(struct dentry *parent, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct qstr qname = QSTR(name);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lookup_noperm_common(&amp;qname, parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return start_dirop(parent, &amp;qname, LOOKUP_CREATE | LOOKUP_EXCL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(simple_start_creating);</div><div class='add'>+</div><div class='add'>+/* parent must have been held exclusive since simple_start_creating() */</div><div class='add'>+void simple_done_creating(struct dentry *child)</div><div class='add'>+{</div><div class='add'>+	inode_unlock(child-&gt;d_parent-&gt;d_inode);</div><div class='add'>+	dput(child);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(simple_done_creating);</div><div class='head'>diff --git a/fs/lockd/Makefile b/fs/lockd/Makefile<br/>index ac9f9d84510e..51bbe22d21e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/Makefile</a></div><div class='hunk'>@@ -7,8 +7,7 @@ ccflags-y += -I$(src)			# needed for trace events</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LOCKD) += lockd.o</div><div class='ctx'> </div><div class='del'>-lockd-objs-y += clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \</div><div class='del'>-	        svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o</div><div class='del'>-lockd-objs-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o</div><div class='del'>-lockd-objs-$(CONFIG_PROC_FS) += procfs.o</div><div class='del'>-lockd-objs		      := $(lockd-objs-y)</div><div class='add'>+lockd-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \</div><div class='add'>+	   svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o netlink.o</div><div class='add'>+lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o</div><div class='add'>+lockd-$(CONFIG_PROC_FS) += procfs.o</div><div class='head'>diff --git a/fs/lockd/clnt4xdr.c b/fs/lockd/clnt4xdr.c<br/>index 8161667c976f..527458db4525 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/clnt4xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clnt4xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/clnt4xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/clnt4xdr.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static void encode_nlm4_holder(struct xdr_stream *xdr,</div><div class='ctx'> 	u64 l_offset, l_len;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_RDLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_RDLCK);</div><div class='ctx'> 	encode_int32(xdr, lock-&gt;svid);</div><div class='ctx'> 	encode_netobj(xdr, lock-&gt;oh.data, lock-&gt;oh.len);</div><div class='ctx'> </div><div class='hunk'>@@ -270,7 +270,7 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result)</div><div class='ctx'> 		goto out_overflow;</div><div class='ctx'> 	exclusive = be32_to_cpup(p++);</div><div class='ctx'> 	lock-&gt;svid = be32_to_cpup(p);</div><div class='del'>-	fl-&gt;fl_pid = (pid_t)lock-&gt;svid;</div><div class='add'>+	fl-&gt;c.flc_pid = (pid_t)lock-&gt;svid;</div><div class='ctx'> </div><div class='ctx'> 	error = decode_netobj(xdr, &amp;lock-&gt;oh);</div><div class='ctx'> 	if (unlikely(error))</div><div class='hunk'>@@ -280,8 +280,8 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result)</div><div class='ctx'> 	if (unlikely(p == NULL))</div><div class='ctx'> 		goto out_overflow;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_flags = FL_POSIX;</div><div class='del'>-	fl-&gt;fl_type  = exclusive != 0 ? F_WRLCK : F_RDLCK;</div><div class='add'>+	fl-&gt;c.flc_flags = FL_POSIX;</div><div class='add'>+	fl-&gt;c.flc_type  = exclusive != 0 ? F_WRLCK : F_RDLCK;</div><div class='ctx'> 	p = xdr_decode_hyper(p, &amp;l_offset);</div><div class='ctx'> 	xdr_decode_hyper(p, &amp;l_len);</div><div class='ctx'> 	nlm4svc_set_file_lock_range(fl, l_offset, l_len);</div><div class='hunk'>@@ -357,7 +357,7 @@ static void nlm4_xdr_enc_testargs(struct rpc_rqst *req,</div><div class='ctx'> 	const struct nlm_lock *lock = &amp;args-&gt;lock;</div><div class='ctx'> </div><div class='ctx'> 	encode_cookie(xdr, &amp;args-&gt;cookie);</div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_WRLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_WRLCK);</div><div class='ctx'> 	encode_nlm4_lock(xdr, lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -380,7 +380,7 @@ static void nlm4_xdr_enc_lockargs(struct rpc_rqst *req,</div><div class='ctx'> </div><div class='ctx'> 	encode_cookie(xdr, &amp;args-&gt;cookie);</div><div class='ctx'> 	encode_bool(xdr, args-&gt;block);</div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_WRLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_WRLCK);</div><div class='ctx'> 	encode_nlm4_lock(xdr, lock);</div><div class='ctx'> 	encode_bool(xdr, args-&gt;reclaim);</div><div class='ctx'> 	encode_int32(xdr, args-&gt;state);</div><div class='hunk'>@@ -403,7 +403,7 @@ static void nlm4_xdr_enc_cancargs(struct rpc_rqst *req,</div><div class='ctx'> </div><div class='ctx'> 	encode_cookie(xdr, &amp;args-&gt;cookie);</div><div class='ctx'> 	encode_bool(xdr, args-&gt;block);</div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_WRLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_WRLCK);</div><div class='ctx'> 	encode_nlm4_lock(xdr, lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c<br/>index 5d85715be763..a7e0519ec024 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/clntlock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clntlock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/clntlock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/clntlock.c</a></div><div class='hunk'>@@ -185,7 +185,7 @@ __be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!rpc_cmp_addr(nlm_addr(block-&gt;b_host), addr))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (nfs_compare_fh(NFS_FH(file_inode(fl_blocked-&gt;fl_file)), fh) != 0)</div><div class='add'>+		if (nfs_compare_fh(NFS_FH(file_inode(fl_blocked-&gt;c.flc_file)), fh) != 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/* Alright, we found a lock. Set the return status</div><div class='ctx'> 		 * and wake up the caller</div><div class='head'>diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c<br/>index fba6c7fa7474..cebcc283b7ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/clntproc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clntproc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/clntproc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/clntproc.c</a></div><div class='hunk'>@@ -133,7 +133,8 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 	char *nodename = req-&gt;a_host-&gt;h_rpcclnt-&gt;cl_nodename;</div><div class='ctx'> </div><div class='ctx'> 	nlmclnt_next_cookie(&amp;argp-&gt;cookie);</div><div class='del'>-	memcpy(&amp;lock-&gt;fh, NFS_FH(file_inode(fl-&gt;fl_file)), sizeof(struct nfs_fh));</div><div class='add'>+	memcpy(&amp;lock-&gt;fh, NFS_FH(file_inode(fl-&gt;c.flc_file)),</div><div class='add'>+	       sizeof(struct nfs_fh));</div><div class='ctx'> 	lock-&gt;caller  = nodename;</div><div class='ctx'> 	lock-&gt;oh.data = req-&gt;a_owner;</div><div class='ctx'> 	lock-&gt;oh.len  = snprintf(req-&gt;a_owner, sizeof(req-&gt;a_owner), "%u@%s",</div><div class='hunk'>@@ -142,7 +143,7 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 	lock-&gt;svid = fl-&gt;fl_u.nfs_fl.owner-&gt;pid;</div><div class='ctx'> 	lock-&gt;fl.fl_start = fl-&gt;fl_start;</div><div class='ctx'> 	lock-&gt;fl.fl_end = fl-&gt;fl_end;</div><div class='del'>-	lock-&gt;fl.fl_type = fl-&gt;fl_type;</div><div class='add'>+	lock-&gt;fl.c.flc_type = fl-&gt;c.flc_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nlmclnt_release_lockargs(struct nlm_rqst *req)</div><div class='hunk'>@@ -182,7 +183,7 @@ int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl, void *dat</div><div class='ctx'> 	call-&gt;a_callback_data = data;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_SETLK(cmd) || IS_SETLKW(cmd)) {</div><div class='del'>-		if (fl-&gt;fl_type != F_UNLCK) {</div><div class='add'>+		if (fl-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 			call-&gt;a_args.block = IS_SETLKW(cmd) ? 1 : 0;</div><div class='ctx'> 			status = nlmclnt_lock(call, fl);</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -432,13 +433,14 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	int	status;</div><div class='ctx'> </div><div class='del'>-	status = nlmclnt_call(nfs_file_cred(fl-&gt;fl_file), req, NLMPROC_TEST);</div><div class='add'>+	status = nlmclnt_call(nfs_file_cred(fl-&gt;c.flc_file), req,</div><div class='add'>+			      NLMPROC_TEST);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (req-&gt;a_res.status) {</div><div class='ctx'> 		case nlm_granted:</div><div class='del'>-			fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+			fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case nlm_lck_denied:</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -446,8 +448,8 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 			 */</div><div class='ctx'> 			fl-&gt;fl_start = req-&gt;a_res.lock.fl.fl_start;</div><div class='ctx'> 			fl-&gt;fl_end = req-&gt;a_res.lock.fl.fl_end;</div><div class='del'>-			fl-&gt;fl_type = req-&gt;a_res.lock.fl.fl_type;</div><div class='del'>-			fl-&gt;fl_pid = -req-&gt;a_res.lock.fl.fl_pid;</div><div class='add'>+			fl-&gt;c.flc_type = req-&gt;a_res.lock.fl.c.flc_type;</div><div class='add'>+			fl-&gt;c.flc_pid = -req-&gt;a_res.lock.fl.c.flc_pid;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			status = nlm_stat_to_errno(req-&gt;a_res.status);</div><div class='hunk'>@@ -485,14 +487,15 @@ static const struct file_lock_operations nlmclnt_lock_ops = {</div><div class='ctx'> static void nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	fl-&gt;fl_u.nfs_fl.state = 0;</div><div class='del'>-	fl-&gt;fl_u.nfs_fl.owner = nlmclnt_find_lockowner(host, fl-&gt;fl_owner);</div><div class='add'>+	fl-&gt;fl_u.nfs_fl.owner = nlmclnt_find_lockowner(host,</div><div class='add'>+						       fl-&gt;c.flc_owner);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fl-&gt;fl_u.nfs_fl.list);</div><div class='ctx'> 	fl-&gt;fl_ops = &amp;nlmclnt_lock_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int do_vfs_lock(struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	return locks_lock_file_wait(fl-&gt;fl_file, fl);</div><div class='add'>+	return locks_lock_file_wait(fl-&gt;c.flc_file, fl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -518,12 +521,12 @@ static int do_vfs_lock(struct file_lock *fl)</div><div class='ctx'> static int</div><div class='ctx'> nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *cred = nfs_file_cred(fl-&gt;fl_file);</div><div class='add'>+	const struct cred *cred = nfs_file_cred(fl-&gt;c.flc_file);</div><div class='ctx'> 	struct nlm_host	*host = req-&gt;a_host;</div><div class='ctx'> 	struct nlm_res	*resp = &amp;req-&gt;a_res;</div><div class='ctx'> 	struct nlm_wait block;</div><div class='del'>-	unsigned char fl_flags = fl-&gt;fl_flags;</div><div class='del'>-	unsigned char fl_type;</div><div class='add'>+	unsigned char flags = fl-&gt;c.flc_flags;</div><div class='add'>+	unsigned char type;</div><div class='ctx'> 	__be32 b_status;</div><div class='ctx'> 	int status = -ENOLCK;</div><div class='ctx'> </div><div class='hunk'>@@ -531,9 +534,9 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	req-&gt;a_args.state = nsm_local_state;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_flags |= FL_ACCESS;</div><div class='add'>+	fl-&gt;c.flc_flags |= FL_ACCESS;</div><div class='ctx'> 	status = do_vfs_lock(fl);</div><div class='del'>-	fl-&gt;fl_flags = fl_flags;</div><div class='add'>+	fl-&gt;c.flc_flags = flags;</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -591,11 +594,11 @@ again:</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Ensure the resulting lock will get added to granted list */</div><div class='del'>-		fl-&gt;fl_flags |= FL_SLEEP;</div><div class='add'>+		fl-&gt;c.flc_flags |= FL_SLEEP;</div><div class='ctx'> 		if (do_vfs_lock(fl) &lt; 0)</div><div class='ctx'> 			printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __func__);</div><div class='ctx'> 		up_read(&amp;host-&gt;h_rwsem);</div><div class='del'>-		fl-&gt;fl_flags = fl_flags;</div><div class='add'>+		fl-&gt;c.flc_flags = flags;</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -605,7 +608,7 @@ again:</div><div class='ctx'> 	 * cases NLM_LCK_DENIED is returned for a permanent error.  So</div><div class='ctx'> 	 * turn it into an ENOLCK.</div><div class='ctx'> 	 */</div><div class='del'>-	if (resp-&gt;status == nlm_lck_denied &amp;&amp; (fl_flags &amp; FL_SLEEP))</div><div class='add'>+	if (resp-&gt;status == nlm_lck_denied &amp;&amp; (flags &amp; FL_SLEEP))</div><div class='ctx'> 		status = -ENOLCK;</div><div class='ctx'> 	else</div><div class='ctx'> 		status = nlm_stat_to_errno(resp-&gt;status);</div><div class='hunk'>@@ -622,13 +625,13 @@ out_unlock:</div><div class='ctx'> 			   req-&gt;a_host-&gt;h_addrlen, req-&gt;a_res.status);</div><div class='ctx'> 	dprintk("lockd: lock attempt ended in fatal error.\n"</div><div class='ctx'> 		"       Attempting to unlock.\n");</div><div class='del'>-	fl_type = fl-&gt;fl_type;</div><div class='del'>-	fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+	type = fl-&gt;c.flc_type;</div><div class='add'>+	fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 	down_read(&amp;host-&gt;h_rwsem);</div><div class='ctx'> 	do_vfs_lock(fl);</div><div class='ctx'> 	up_read(&amp;host-&gt;h_rwsem);</div><div class='del'>-	fl-&gt;fl_type = fl_type;</div><div class='del'>-	fl-&gt;fl_flags = fl_flags;</div><div class='add'>+	fl-&gt;c.flc_type = type;</div><div class='add'>+	fl-&gt;c.flc_flags = flags;</div><div class='ctx'> 	nlmclnt_async_call(cred, req, NLMPROC_UNLOCK, &amp;nlmclnt_unlock_ops);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -651,12 +654,14 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl,</div><div class='ctx'> 	nlmclnt_setlockargs(req, fl);</div><div class='ctx'> 	req-&gt;a_args.reclaim = 1;</div><div class='ctx'> </div><div class='del'>-	status = nlmclnt_call(nfs_file_cred(fl-&gt;fl_file), req, NLMPROC_LOCK);</div><div class='add'>+	status = nlmclnt_call(nfs_file_cred(fl-&gt;c.flc_file), req,</div><div class='add'>+			      NLMPROC_LOCK);</div><div class='ctx'> 	if (status &gt;= 0 &amp;&amp; req-&gt;a_res.status == nlm_granted)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_WARNING "lockd: failed to reclaim lock for pid %d "</div><div class='del'>-				"(errno %d, status %d)\n", fl-&gt;fl_pid,</div><div class='add'>+				"(errno %d, status %d)\n",</div><div class='add'>+				fl-&gt;c.flc_pid,</div><div class='ctx'> 				status, ntohl(req-&gt;a_res.status));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -683,26 +688,26 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 	struct nlm_host	*host = req-&gt;a_host;</div><div class='ctx'> 	struct nlm_res	*resp = &amp;req-&gt;a_res;</div><div class='ctx'> 	int status;</div><div class='del'>-	unsigned char fl_flags = fl-&gt;fl_flags;</div><div class='add'>+	unsigned char flags = fl-&gt;c.flc_flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: the server is supposed to either grant us the unlock</div><div class='ctx'> 	 * request, or to deny it with NLM_LCK_DENIED_GRACE_PERIOD. In either</div><div class='ctx'> 	 * case, we want to unlock.</div><div class='ctx'> 	 */</div><div class='del'>-	fl-&gt;fl_flags |= FL_EXISTS;</div><div class='add'>+	fl-&gt;c.flc_flags |= FL_EXISTS;</div><div class='ctx'> 	down_read(&amp;host-&gt;h_rwsem);</div><div class='ctx'> 	status = do_vfs_lock(fl);</div><div class='ctx'> 	up_read(&amp;host-&gt;h_rwsem);</div><div class='del'>-	fl-&gt;fl_flags = fl_flags;</div><div class='add'>+	fl-&gt;c.flc_flags = flags;</div><div class='ctx'> 	if (status == -ENOENT) {</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	refcount_inc(&amp;req-&gt;a_count);</div><div class='del'>-	status = nlmclnt_async_call(nfs_file_cred(fl-&gt;fl_file), req,</div><div class='del'>-			NLMPROC_UNLOCK, &amp;nlmclnt_unlock_ops);</div><div class='add'>+	status = nlmclnt_async_call(nfs_file_cred(fl-&gt;c.flc_file), req,</div><div class='add'>+				    NLMPROC_UNLOCK, &amp;nlmclnt_unlock_ops);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -795,8 +800,8 @@ static int nlmclnt_cancel(struct nlm_host *host, int block, struct file_lock *fl</div><div class='ctx'> 	req-&gt;a_args.block = block;</div><div class='ctx'> </div><div class='ctx'> 	refcount_inc(&amp;req-&gt;a_count);</div><div class='del'>-	status = nlmclnt_async_call(nfs_file_cred(fl-&gt;fl_file), req,</div><div class='del'>-			NLMPROC_CANCEL, &amp;nlmclnt_cancel_ops);</div><div class='add'>+	status = nlmclnt_async_call(nfs_file_cred(fl-&gt;c.flc_file), req,</div><div class='add'>+				    NLMPROC_CANCEL, &amp;nlmclnt_cancel_ops);</div><div class='ctx'> 	if (status == 0 &amp;&amp; req-&gt;a_res.status == nlm_lck_denied)</div><div class='ctx'> 		status = -ENOLCK;</div><div class='ctx'> 	nlmclnt_release_call(req);</div><div class='head'>diff --git a/fs/lockd/clntxdr.c b/fs/lockd/clntxdr.c<br/>index 4df62f635529..6ea3448d2d31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/clntxdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/clntxdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/clntxdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/clntxdr.c</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * linux/fs/lockd/clntxdr.c</div><div class='ctx'>  *</div><div class='del'>- * XDR functions to encode/decode NLM version 3 RPC arguments and results.</div><div class='del'>- * NLM version 3 is backwards compatible with NLM versions 1 and 2.</div><div class='add'>+ * XDR functions to encode/decode NLM version 1 and 3 RPC</div><div class='add'>+ * arguments and results. NLM version 2 is not specified</div><div class='add'>+ * by a standard, thus it is not implemented.</div><div class='ctx'>  *</div><div class='ctx'>  * NLM client-side only.</div><div class='ctx'>  *</div><div class='hunk'>@@ -238,7 +239,7 @@ static void encode_nlm_holder(struct xdr_stream *xdr,</div><div class='ctx'> 	u32 l_offset, l_len;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_RDLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_RDLCK);</div><div class='ctx'> 	encode_int32(xdr, lock-&gt;svid);</div><div class='ctx'> 	encode_netobj(xdr, lock-&gt;oh.data, lock-&gt;oh.len);</div><div class='ctx'> </div><div class='hunk'>@@ -265,7 +266,7 @@ static int decode_nlm_holder(struct xdr_stream *xdr, struct nlm_res *result)</div><div class='ctx'> 		goto out_overflow;</div><div class='ctx'> 	exclusive = be32_to_cpup(p++);</div><div class='ctx'> 	lock-&gt;svid = be32_to_cpup(p);</div><div class='del'>-	fl-&gt;fl_pid = (pid_t)lock-&gt;svid;</div><div class='add'>+	fl-&gt;c.flc_pid = (pid_t)lock-&gt;svid;</div><div class='ctx'> </div><div class='ctx'> 	error = decode_netobj(xdr, &amp;lock-&gt;oh);</div><div class='ctx'> 	if (unlikely(error))</div><div class='hunk'>@@ -275,8 +276,8 @@ static int decode_nlm_holder(struct xdr_stream *xdr, struct nlm_res *result)</div><div class='ctx'> 	if (unlikely(p == NULL))</div><div class='ctx'> 		goto out_overflow;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_flags = FL_POSIX;</div><div class='del'>-	fl-&gt;fl_type  = exclusive != 0 ? F_WRLCK : F_RDLCK;</div><div class='add'>+	fl-&gt;c.flc_flags = FL_POSIX;</div><div class='add'>+	fl-&gt;c.flc_type  = exclusive != 0 ? F_WRLCK : F_RDLCK;</div><div class='ctx'> 	l_offset = be32_to_cpup(p++);</div><div class='ctx'> 	l_len = be32_to_cpup(p);</div><div class='ctx'> 	end = l_offset + l_len - 1;</div><div class='hunk'>@@ -357,7 +358,7 @@ static void nlm_xdr_enc_testargs(struct rpc_rqst *req,</div><div class='ctx'> 	const struct nlm_lock *lock = &amp;args-&gt;lock;</div><div class='ctx'> </div><div class='ctx'> 	encode_cookie(xdr, &amp;args-&gt;cookie);</div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_WRLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_WRLCK);</div><div class='ctx'> 	encode_nlm_lock(xdr, lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -380,7 +381,7 @@ static void nlm_xdr_enc_lockargs(struct rpc_rqst *req,</div><div class='ctx'> </div><div class='ctx'> 	encode_cookie(xdr, &amp;args-&gt;cookie);</div><div class='ctx'> 	encode_bool(xdr, args-&gt;block);</div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_WRLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_WRLCK);</div><div class='ctx'> 	encode_nlm_lock(xdr, lock);</div><div class='ctx'> 	encode_bool(xdr, args-&gt;reclaim);</div><div class='ctx'> 	encode_int32(xdr, args-&gt;state);</div><div class='hunk'>@@ -403,7 +404,7 @@ static void nlm_xdr_enc_cancargs(struct rpc_rqst *req,</div><div class='ctx'> </div><div class='ctx'> 	encode_cookie(xdr, &amp;args-&gt;cookie);</div><div class='ctx'> 	encode_bool(xdr, args-&gt;block);</div><div class='del'>-	encode_bool(xdr, lock-&gt;fl.fl_type == F_WRLCK);</div><div class='add'>+	encode_bool(xdr, lock-&gt;fl.c.flc_type == F_WRLCK);</div><div class='ctx'> 	encode_nlm_lock(xdr, lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/lockd/host.c b/fs/lockd/host.c<br/>index 127a728fcbc8..5e6877c37f73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/host.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/host.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/host.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/host.c</a></div><div class='hunk'>@@ -117,7 +117,6 @@ static struct nlm_host *nlm_alloc_host(struct nlm_lookup_host_info *ni,</div><div class='ctx'> 	if (nsm != NULL)</div><div class='ctx'> 		refcount_inc(&amp;nsm-&gt;sm_count);</div><div class='ctx'> 	else {</div><div class='del'>-		host = NULL;</div><div class='ctx'> 		nsm = nsm_get_handle(ni-&gt;net, ni-&gt;sap, ni-&gt;salen,</div><div class='ctx'> 					ni-&gt;hostname, ni-&gt;hostname_len);</div><div class='ctx'> 		if (unlikely(nsm == NULL)) {</div><div class='hunk'>@@ -441,7 +440,7 @@ nlm_bind_host(struct nlm_host *host)</div><div class='ctx'> 	if ((clnt = host-&gt;h_rpcclnt) != NULL) {</div><div class='ctx'> 		nlm_rebind_host(host);</div><div class='ctx'> 	} else {</div><div class='del'>-		unsigned long increment = nlmsvc_timeout;</div><div class='add'>+		unsigned long increment = nlm_timeout * HZ;</div><div class='ctx'> 		struct rpc_timeout timeparms = {</div><div class='ctx'> 			.to_initval	= increment,</div><div class='ctx'> 			.to_increment	= increment,</div><div class='head'>diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c<br/>index 87a0f207df0b..b8fc732e1c67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/mon.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/mon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/mon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/mon.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/sunrpc/svc.h&gt;</div><div class='ctx'> #include &lt;linux/lockd/lockd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "netns.h"</div><div class='ctx'> </div><div class='head'>diff --git a/fs/lockd/netlink.c b/fs/lockd/netlink.c<br/>new file mode 100644<br/>index 000000000000..880c42b4f8c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/netlink.c</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/lockd.yaml */</div><div class='add'>+/* YNL-GEN kernel source */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "netlink.h"</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/lockd_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+/* LOCKD_CMD_SERVER_SET - do */</div><div class='add'>+static const struct nla_policy lockd_server_set_nl_policy[LOCKD_A_SERVER_UDP_PORT + 1] = {</div><div class='add'>+	[LOCKD_A_SERVER_GRACETIME] = { .type = NLA_U32, },</div><div class='add'>+	[LOCKD_A_SERVER_TCP_PORT] = { .type = NLA_U16, },</div><div class='add'>+	[LOCKD_A_SERVER_UDP_PORT] = { .type = NLA_U16, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ops table for lockd */</div><div class='add'>+static const struct genl_split_ops lockd_nl_ops[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd		= LOCKD_CMD_SERVER_SET,</div><div class='add'>+		.doit		= lockd_nl_server_set_doit,</div><div class='add'>+		.policy		= lockd_server_set_nl_policy,</div><div class='add'>+		.maxattr	= LOCKD_A_SERVER_UDP_PORT,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= LOCKD_CMD_SERVER_GET,</div><div class='add'>+		.doit	= lockd_nl_server_get_doit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct genl_family lockd_nl_family __ro_after_init = {</div><div class='add'>+	.name		= LOCKD_FAMILY_NAME,</div><div class='add'>+	.version	= LOCKD_FAMILY_VERSION,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+	.parallel_ops	= true,</div><div class='add'>+	.module		= THIS_MODULE,</div><div class='add'>+	.split_ops	= lockd_nl_ops,</div><div class='add'>+	.n_split_ops	= ARRAY_SIZE(lockd_nl_ops),</div><div class='add'>+};</div><div class='head'>diff --git a/fs/lockd/netlink.h b/fs/lockd/netlink.h<br/>new file mode 100644<br/>index 000000000000..d8408f077dd8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/netlink.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */</div><div class='add'>+/* Do not edit directly, auto-generated from: */</div><div class='add'>+/*	Documentation/netlink/specs/lockd.yaml */</div><div class='add'>+/* YNL-GEN kernel header */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_LOCKD_GEN_H</div><div class='add'>+#define _LINUX_LOCKD_GEN_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/lockd_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+int lockd_nl_server_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int lockd_nl_server_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+</div><div class='add'>+extern struct genl_family lockd_nl_family;</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_LOCKD_GEN_H */</div><div class='head'>diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h<br/>index 17432c445fe6..88e8e2a97397 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/netns.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/netns.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/netns.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/netns.h</a></div><div class='hunk'>@@ -10,6 +10,9 @@ struct lockd_net {</div><div class='ctx'> 	unsigned int nlmsvc_users;</div><div class='ctx'> 	unsigned long next_gc;</div><div class='ctx'> 	unsigned long nrhosts;</div><div class='add'>+	u32 gracetime;</div><div class='add'>+	u16 tcp_port;</div><div class='add'>+	u16 udp_port;</div><div class='ctx'> </div><div class='ctx'> 	struct delayed_work grace_period_end;</div><div class='ctx'> 	struct lock_manager lockd_manager;</div><div class='head'>diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c<br/>index ce5862482097..d68afa196535 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/svc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/svc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/svc.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "netns.h"</div><div class='ctx'> #include "procfs.h"</div><div class='add'>+#include "netlink.h"</div><div class='ctx'> </div><div class='ctx'> #define NLMDBG_FACILITY		NLMDBG_SVC</div><div class='ctx'> #define LOCKD_BUFSIZE		(1024 + NLMSVC_XDRSIZE)</div><div class='hunk'>@@ -53,7 +54,6 @@ EXPORT_SYMBOL_GPL(nlmsvc_ops);</div><div class='ctx'> static DEFINE_MUTEX(nlmsvc_mutex);</div><div class='ctx'> static unsigned int		nlmsvc_users;</div><div class='ctx'> static struct svc_serv		*nlmsvc_serv;</div><div class='del'>-unsigned long			nlmsvc_timeout;</div><div class='ctx'> </div><div class='ctx'> static void nlmsvc_request_retry(struct timer_list *tl)</div><div class='ctx'> {</div><div class='hunk'>@@ -68,12 +68,9 @@ unsigned int lockd_net_id;</div><div class='ctx'>  * and also changed through the sysctl interface.  -- Jamie Lokier, Aug 2003</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long		nlm_grace_period;</div><div class='del'>-static unsigned long		nlm_timeout = LOCKD_DFLT_TIMEO;</div><div class='add'>+unsigned long			nlm_timeout = LOCKD_DFLT_TIMEO;</div><div class='ctx'> static int			nlm_udpport, nlm_tcpport;</div><div class='ctx'> </div><div class='del'>-/* RLIM_NOFILE defaults to 1024. That seems like a reasonable default here. */</div><div class='del'>-static unsigned int		nlm_max_connections = 1024;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Constants needed for the sysctl interface.</div><div class='ctx'>  */</div><div class='hunk'>@@ -87,8 +84,14 @@ static const int		nlm_port_min = 0, nlm_port_max = 65535;</div><div class='ctx'> static struct ctl_table_header * nlm_sysctl_table;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned long get_lockd_grace_period(void)</div><div class='add'>+static unsigned long get_lockd_grace_period(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct lockd_net *ln = net_generic(net, lockd_net_id);</div><div class='add'>+</div><div class='add'>+	/* Return the net-ns specific grace period, if there is one */</div><div class='add'>+	if (ln-&gt;gracetime)</div><div class='add'>+		return ln-&gt;gracetime * HZ;</div><div class='add'>+</div><div class='ctx'> 	/* Note: nlm_timeout should always be nonzero */</div><div class='ctx'> 	if (nlm_grace_period)</div><div class='ctx'> 		return roundup(nlm_grace_period, nlm_timeout) * HZ;</div><div class='hunk'>@@ -107,7 +110,7 @@ static void grace_ender(struct work_struct *grace)</div><div class='ctx'> </div><div class='ctx'> static void set_grace_period(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	unsigned long grace_period = get_lockd_grace_period();</div><div class='add'>+	unsigned long grace_period = get_lockd_grace_period(net);</div><div class='ctx'> 	struct lockd_net *ln = net_generic(net, lockd_net_id);</div><div class='ctx'> </div><div class='ctx'> 	locks_start_grace(net, &amp;ln-&gt;lockd_manager);</div><div class='hunk'>@@ -125,6 +128,8 @@ lockd(void *vrqstp)</div><div class='ctx'> 	struct net *net = &amp;init_net;</div><div class='ctx'> 	struct lockd_net *ln = net_generic(net, lockd_net_id);</div><div class='ctx'> </div><div class='add'>+	svc_thread_init_status(rqstp, 0);</div><div class='add'>+</div><div class='ctx'> 	/* try_to_freeze() is called from svc_recv() */</div><div class='ctx'> 	set_freezable();</div><div class='ctx'> </div><div class='hunk'>@@ -135,9 +140,6 @@ lockd(void *vrqstp)</div><div class='ctx'> 	 * NFS mount or NFS daemon has gone away.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (!svc_thread_should_stop(rqstp)) {</div><div class='del'>-		/* update sv_maxconn if it has changed */</div><div class='del'>-		rqstp-&gt;rq_server-&gt;sv_maxconn = nlm_max_connections;</div><div class='del'>-</div><div class='ctx'> 		nlmsvc_retry_blocked(rqstp);</div><div class='ctx'> 		svc_recv(rqstp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -171,15 +173,16 @@ static int create_lockd_listener(struct svc_serv *serv, const char *name,</div><div class='ctx'> static int create_lockd_family(struct svc_serv *serv, struct net *net,</div><div class='ctx'> 			       const int family, const struct cred *cred)</div><div class='ctx'> {</div><div class='add'>+	struct lockd_net *ln = net_generic(net, lockd_net_id);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = create_lockd_listener(serv, "udp", net, family, nlm_udpport,</div><div class='del'>-			cred);</div><div class='add'>+	err = create_lockd_listener(serv, "udp", net, family,</div><div class='add'>+				    ln-&gt;udp_port ? ln-&gt;udp_port : nlm_udpport, cred);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return create_lockd_listener(serv, "tcp", net, family, nlm_tcpport,</div><div class='del'>-			cred);</div><div class='add'>+	return create_lockd_listener(serv, "tcp", net, family,</div><div class='add'>+				     ln-&gt;tcp_port ? ln-&gt;tcp_port : nlm_tcpport, cred);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -213,8 +216,7 @@ out_err:</div><div class='ctx'> 	if (warned++ == 0)</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"lockd_up: makesock failed, error=%d\n", err);</div><div class='del'>-	svc_xprt_destroy_all(serv, net);</div><div class='del'>-	svc_rpcb_cleanup(serv, net);</div><div class='add'>+	svc_xprt_destroy_all(serv, net, true);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,8 +254,7 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net)</div><div class='ctx'> 			nlm_shutdown_hosts_net(net);</div><div class='ctx'> 			cancel_delayed_work_sync(&amp;ln-&gt;grace_period_end);</div><div class='ctx'> 			locks_end_grace(&amp;ln-&gt;lockd_manager);</div><div class='del'>-			svc_xprt_destroy_all(serv, net);</div><div class='del'>-			svc_rpcb_cleanup(serv, net);</div><div class='add'>+			svc_xprt_destroy_all(serv, net, true);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_err("%s: no users! net=%x\n",</div><div class='hunk'>@@ -333,17 +334,12 @@ static int lockd_get(void)</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"lockd_up: no pid, %d users??\n", nlmsvc_users);</div><div class='ctx'> </div><div class='del'>-	if (!nlm_timeout)</div><div class='del'>-		nlm_timeout = LOCKD_DFLT_TIMEO;</div><div class='del'>-	nlmsvc_timeout = nlm_timeout * HZ;</div><div class='del'>-</div><div class='ctx'> 	serv = svc_create(&amp;nlmsvc_program, LOCKD_BUFSIZE, lockd);</div><div class='ctx'> 	if (!serv) {</div><div class='ctx'> 		printk(KERN_WARNING "lockd_up: create service failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	serv-&gt;sv_maxconn = nlm_max_connections;</div><div class='ctx'> 	error = svc_set_num_threads(serv, NULL, 1);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		svc_destroy(&amp;serv);</div><div class='hunk'>@@ -422,7 +418,7 @@ EXPORT_SYMBOL_GPL(lockd_down);</div><div class='ctx'>  * Sysctl parameters (same as module parameters, different interface).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct ctl_table nlm_sysctls[] = {</div><div class='add'>+static const struct ctl_table nlm_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "nlm_grace_period",</div><div class='ctx'> 		.data		= &amp;nlm_grace_period,</div><div class='hunk'>@@ -469,9 +465,10 @@ static struct ctl_table nlm_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "nsm_local_state",</div><div class='ctx'> 		.data		= &amp;nsm_local_state,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='add'>+		.maxlen		= sizeof(nsm_local_state),</div><div class='ctx'> 		.mode		= 0644,</div><div class='del'>-		.proc_handler	= proc_dointvec,</div><div class='add'>+		.proc_handler	= proc_douintvec,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -545,7 +542,6 @@ module_param_call(nlm_udpport, param_set_port, param_get_int,</div><div class='ctx'> module_param_call(nlm_tcpport, param_set_port, param_get_int,</div><div class='ctx'> 		  &amp;nlm_tcpport, 0644);</div><div class='ctx'> module_param(nsm_use_hostnames, bool, 0644);</div><div class='del'>-module_param(nlm_max_connections, uint, 0644);</div><div class='ctx'> </div><div class='ctx'> static int lockd_init_net(struct net *net)</div><div class='ctx'> {</div><div class='hunk'>@@ -599,6 +595,10 @@ static int __init init_nlm(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_pernet;</div><div class='ctx'> </div><div class='add'>+	err = genl_register_family(&amp;lockd_nl_family);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_netlink;</div><div class='add'>+</div><div class='ctx'> 	err = lockd_create_procfs();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_procfs;</div><div class='hunk'>@@ -606,6 +606,8 @@ static int __init init_nlm(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_procfs:</div><div class='add'>+	genl_unregister_family(&amp;lockd_nl_family);</div><div class='add'>+err_netlink:</div><div class='ctx'> 	unregister_pernet_subsys(&amp;lockd_net_ops);</div><div class='ctx'> err_pernet:</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='hunk'>@@ -619,6 +621,7 @@ static void __exit exit_nlm(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME: delete all NLM clients */</div><div class='ctx'> 	nlm_shutdown_hosts();</div><div class='add'>+	genl_unregister_family(&amp;lockd_nl_family);</div><div class='ctx'> 	lockd_remove_procfs();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;lockd_net_ops);</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='hunk'>@@ -710,8 +713,6 @@ static const struct svc_version *nlmsvc_version[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct svc_stat		nlmsvc_stats;</div><div class='del'>-</div><div class='ctx'> #define NLM_NRVERS	ARRAY_SIZE(nlmsvc_version)</div><div class='ctx'> static struct svc_program	nlmsvc_program = {</div><div class='ctx'> 	.pg_prog		= NLM_PROGRAM,		/* program number */</div><div class='hunk'>@@ -719,8 +720,98 @@ static struct svc_program	nlmsvc_program = {</div><div class='ctx'> 	.pg_vers		= nlmsvc_version,	/* version table */</div><div class='ctx'> 	.pg_name		= "lockd",		/* service name */</div><div class='ctx'> 	.pg_class		= "nfsd",		/* share authentication with nfsd */</div><div class='del'>-	.pg_stats		= &amp;nlmsvc_stats,	/* stats table */</div><div class='ctx'> 	.pg_authenticate	= &amp;lockd_authenticate,	/* export authentication */</div><div class='ctx'> 	.pg_init_request	= svc_generic_init_request,</div><div class='ctx'> 	.pg_rpcbind_set		= svc_generic_rpcbind_set,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lockd_nl_server_set_doit - set the lockd server parameters via netlink</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * This updates the per-net values. When updating the values in the init_net</div><div class='add'>+ * namespace, also update the "legacy" global values.</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int lockd_nl_server_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	struct lockd_net *ln = net_generic(net, lockd_net_id);</div><div class='add'>+	const struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, LOCKD_A_SERVER_GRACETIME))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[LOCKD_A_SERVER_GRACETIME] ||</div><div class='add'>+	    info-&gt;attrs[LOCKD_A_SERVER_TCP_PORT] ||</div><div class='add'>+	    info-&gt;attrs[LOCKD_A_SERVER_UDP_PORT]) {</div><div class='add'>+		attr = info-&gt;attrs[LOCKD_A_SERVER_GRACETIME];</div><div class='add'>+		if (attr) {</div><div class='add'>+			u32 gracetime = nla_get_u32(attr);</div><div class='add'>+</div><div class='add'>+			if (gracetime &gt; nlm_grace_period_max)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			ln-&gt;gracetime = gracetime;</div><div class='add'>+</div><div class='add'>+			if (net == &amp;init_net)</div><div class='add'>+				nlm_grace_period = gracetime;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[LOCKD_A_SERVER_TCP_PORT];</div><div class='add'>+		if (attr) {</div><div class='add'>+			ln-&gt;tcp_port = nla_get_u16(attr);</div><div class='add'>+			if (net == &amp;init_net)</div><div class='add'>+				nlm_tcpport = ln-&gt;tcp_port;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[LOCKD_A_SERVER_UDP_PORT];</div><div class='add'>+		if (attr) {</div><div class='add'>+			ln-&gt;udp_port = nla_get_u16(attr);</div><div class='add'>+			if (net == &amp;init_net)</div><div class='add'>+				nlm_udpport = ln-&gt;udp_port;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lockd_nl_server_get_doit - get lockd server parameters via netlink</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int lockd_nl_server_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	struct lockd_net *ln = net_generic(net, lockd_net_id);</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(skb, info);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_put_u32(skb, LOCKD_A_SERVER_GRACETIME, ln-&gt;gracetime) ||</div><div class='add'>+	      nla_put_u16(skb, LOCKD_A_SERVER_TCP_PORT, ln-&gt;tcp_port) ||</div><div class='add'>+	      nla_put_u16(skb, LOCKD_A_SERVER_UDP_PORT, ln-&gt;udp_port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c<br/>index b72023a6b4c1..109e5caae8c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/svc4proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svc4proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/svc4proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/svc4proc.c</a></div><div class='hunk'>@@ -46,22 +46,23 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,</div><div class='ctx'> 	if (filp != NULL) {</div><div class='ctx'> 		int mode = lock_to_openmode(&amp;lock-&gt;fl);</div><div class='ctx'> </div><div class='add'>+		lock-&gt;fl.c.flc_flags = FL_POSIX;</div><div class='add'>+</div><div class='ctx'> 		error = nlm_lookup_file(rqstp, &amp;file, lock);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto no_locks;</div><div class='ctx'> 		*filp = file;</div><div class='ctx'> </div><div class='ctx'> 		/* Set up the missing parts of the file_lock structure */</div><div class='del'>-		lock-&gt;fl.fl_flags = FL_POSIX;</div><div class='del'>-		lock-&gt;fl.fl_file  = file-&gt;f_file[mode];</div><div class='del'>-		lock-&gt;fl.fl_pid = current-&gt;tgid;</div><div class='add'>+		lock-&gt;fl.c.flc_file = file-&gt;f_file[mode];</div><div class='add'>+		lock-&gt;fl.c.flc_pid = current-&gt;tgid;</div><div class='ctx'> 		lock-&gt;fl.fl_start = (loff_t)lock-&gt;lock_start;</div><div class='ctx'> 		lock-&gt;fl.fl_end = lock-&gt;lock_len ?</div><div class='ctx'> 				   (loff_t)(lock-&gt;lock_start + lock-&gt;lock_len - 1) :</div><div class='ctx'> 				   OFFSET_MAX;</div><div class='ctx'> 		lock-&gt;fl.fl_lmops = &amp;nlmsvc_lock_operations;</div><div class='ctx'> 		nlmsvc_locks_init_private(&amp;lock-&gt;fl, host, (pid_t)lock-&gt;svid);</div><div class='del'>-		if (!lock-&gt;fl.fl_owner) {</div><div class='add'>+		if (!lock-&gt;fl.c.flc_owner) {</div><div class='ctx'> 			/* lockowner allocation has failed */</div><div class='ctx'> 			nlmsvc_release_host(host);</div><div class='ctx'> 			return nlm_lck_denied_nolocks;</div><div class='hunk'>@@ -106,9 +107,10 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)</div><div class='ctx'> 	if ((resp-&gt;status = nlm4svc_retrieve_args(rqstp, argp, &amp;host, &amp;file)))</div><div class='ctx'> 		return resp-&gt;status == nlm_drop_reply ? rpc_drop_reply :rpc_success;</div><div class='ctx'> </div><div class='del'>-	test_owner = argp-&gt;lock.fl.fl_owner;</div><div class='add'>+	test_owner = argp-&gt;lock.fl.c.flc_owner;</div><div class='ctx'> 	/* Now check for conflicting locks */</div><div class='del'>-	resp-&gt;status = nlmsvc_testlock(rqstp, file, host, &amp;argp-&gt;lock, &amp;resp-&gt;lock, &amp;resp-&gt;cookie);</div><div class='add'>+	resp-&gt;status = nlmsvc_testlock(rqstp, file, host, &amp;argp-&gt;lock,</div><div class='add'>+				       &amp;resp-&gt;lock);</div><div class='ctx'> 	if (resp-&gt;status == nlm_drop_reply)</div><div class='ctx'> 		rc = rpc_drop_reply;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -142,18 +144,6 @@ __nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)</div><div class='ctx'> 	if ((resp-&gt;status = nlm4svc_retrieve_args(rqstp, argp, &amp;host, &amp;file)))</div><div class='ctx'> 		return resp-&gt;status == nlm_drop_reply ? rpc_drop_reply :rpc_success;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	/* If supplied state doesn't match current state, we assume it's</div><div class='del'>-	 * an old request that time-warped somehow. Any error return would</div><div class='del'>-	 * do in this case because it's irrelevant anyway.</div><div class='del'>-	 *</div><div class='del'>-	 * NB: We don't retrieve the remote host's state yet.</div><div class='del'>-	 */</div><div class='del'>-	if (host-&gt;h_nsmstate &amp;&amp; host-&gt;h_nsmstate != argp-&gt;state) {</div><div class='del'>-		resp-&gt;status = nlm_lck_denied_nolocks;</div><div class='del'>-	} else</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Now try to lock the file */</div><div class='ctx'> 	resp-&gt;status = nlmsvc_lock(rqstp, file, host, &amp;argp-&gt;lock,</div><div class='ctx'> 					argp-&gt;block, &amp;argp-&gt;cookie,</div><div class='head'>diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c<br/>index 2dc10900ad1c..3a3d05cfe09a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/svclock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svclock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/svclock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/svclock.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/sunrpc/svc_xprt.h&gt;</div><div class='ctx'> #include &lt;linux/lockd/nlm.h&gt;</div><div class='ctx'> #include &lt;linux/lockd/lockd.h&gt;</div><div class='del'>-#include &lt;linux/exportfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NLMDBG_FACILITY		NLMDBG_SVCLOCK</div><div class='ctx'> </div><div class='hunk'>@@ -150,16 +149,17 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock)</div><div class='ctx'> 	struct file_lock	*fl;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("lockd: nlmsvc_lookup_block f=%p pd=%d %Ld-%Ld ty=%d\n",</div><div class='del'>-				file, lock-&gt;fl.fl_pid,</div><div class='add'>+				file, lock-&gt;fl.c.flc_pid,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_start,</div><div class='del'>-				(long long)lock-&gt;fl.fl_end, lock-&gt;fl.fl_type);</div><div class='add'>+				(long long)lock-&gt;fl.fl_end,</div><div class='add'>+				lock-&gt;fl.c.flc_type);</div><div class='ctx'> 	spin_lock(&amp;nlm_blocked_lock);</div><div class='ctx'> 	list_for_each_entry(block, &amp;nlm_blocked, b_list) {</div><div class='ctx'> 		fl = &amp;block-&gt;b_call-&gt;a_args.lock.fl;</div><div class='ctx'> 		dprintk("lockd: check f=%p pd=%d %Ld-%Ld ty=%d cookie=%s\n",</div><div class='del'>-				block-&gt;b_file, fl-&gt;fl_pid,</div><div class='add'>+				block-&gt;b_file, fl-&gt;c.flc_pid,</div><div class='ctx'> 				(long long)fl-&gt;fl_start,</div><div class='del'>-				(long long)fl-&gt;fl_end, fl-&gt;fl_type,</div><div class='add'>+				(long long)fl-&gt;fl_end, fl-&gt;c.flc_type,</div><div class='ctx'> 				nlmdbg_cookie2a(&amp;block-&gt;b_call-&gt;a_args.cookie));</div><div class='ctx'> 		if (block-&gt;b_file == file &amp;&amp; nlm_compare_locks(fl, &amp;lock-&gt;fl)) {</div><div class='ctx'> 			kref_get(&amp;block-&gt;b_count);</div><div class='hunk'>@@ -244,7 +244,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host,</div><div class='ctx'> 		goto failed_free;</div><div class='ctx'> </div><div class='ctx'> 	/* Set notifier function for VFS, and init args */</div><div class='del'>-	call-&gt;a_args.lock.fl.fl_flags |= FL_SLEEP;</div><div class='add'>+	call-&gt;a_args.lock.fl.c.flc_flags |= FL_SLEEP;</div><div class='ctx'> 	call-&gt;a_args.lock.fl.fl_lmops = &amp;nlmsvc_lock_operations;</div><div class='ctx'> 	nlmclnt_next_cookie(&amp;call-&gt;a_args.cookie);</div><div class='ctx'> </div><div class='hunk'>@@ -402,14 +402,14 @@ static struct nlm_lockowner *nlmsvc_find_lockowner(struct nlm_host *host, pid_t</div><div class='ctx'> void</div><div class='ctx'> nlmsvc_release_lockowner(struct nlm_lock *lock)</div><div class='ctx'> {</div><div class='del'>-	if (lock-&gt;fl.fl_owner)</div><div class='del'>-		nlmsvc_put_lockowner(lock-&gt;fl.fl_owner);</div><div class='add'>+	if (lock-&gt;fl.c.flc_owner)</div><div class='add'>+		nlmsvc_put_lockowner(lock-&gt;fl.c.flc_owner);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nlmsvc_locks_init_private(struct file_lock *fl, struct nlm_host *host,</div><div class='ctx'> 						pid_t pid)</div><div class='ctx'> {</div><div class='del'>-	fl-&gt;fl_owner = nlmsvc_find_lockowner(host, pid);</div><div class='add'>+	fl-&gt;c.flc_owner = nlmsvc_find_lockowner(host, pid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -425,7 +425,7 @@ static int nlmsvc_setgrantargs(struct nlm_rqst *call, struct nlm_lock *lock)</div><div class='ctx'> </div><div class='ctx'> 	/* set default data area */</div><div class='ctx'> 	call-&gt;a_args.lock.oh.data = call-&gt;a_owner;</div><div class='del'>-	call-&gt;a_args.lock.svid = ((struct nlm_lockowner *)lock-&gt;fl.fl_owner)-&gt;pid;</div><div class='add'>+	call-&gt;a_args.lock.svid = ((struct nlm_lockowner *) lock-&gt;fl.c.flc_owner)-&gt;pid;</div><div class='ctx'> </div><div class='ctx'> 	if (lock-&gt;oh.len &gt; NLMCLNT_OHSIZE) {</div><div class='ctx'> 		void *data = kmalloc(lock-&gt;oh.len, GFP_KERNEL);</div><div class='hunk'>@@ -480,7 +480,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 	    struct nlm_host *host, struct nlm_lock *lock, int wait,</div><div class='ctx'> 	    struct nlm_cookie *cookie, int reclaim)</div><div class='ctx'> {</div><div class='del'>-	struct inode		*inode = nlmsvc_file_inode(file);</div><div class='add'>+	struct inode		*inode __maybe_unused = nlmsvc_file_inode(file);</div><div class='ctx'> 	struct nlm_block	*block = NULL;</div><div class='ctx'> 	int			error;</div><div class='ctx'> 	int			mode;</div><div class='hunk'>@@ -489,12 +489,16 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",</div><div class='ctx'> 				inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino,</div><div class='del'>-				lock-&gt;fl.fl_type, lock-&gt;fl.fl_pid,</div><div class='add'>+				lock-&gt;fl.c.flc_type,</div><div class='add'>+				lock-&gt;fl.c.flc_pid,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_start,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_end,</div><div class='ctx'> 				wait);</div><div class='ctx'> </div><div class='del'>-	if (!exportfs_lock_op_is_async(inode-&gt;i_sb-&gt;s_export_op)) {</div><div class='add'>+	if (nlmsvc_file_cannot_lock(file))</div><div class='add'>+		return nlm_lck_denied_nolocks;</div><div class='add'>+</div><div class='add'>+	if (!locks_can_async_lock(nlmsvc_file_file(file)-&gt;f_op)) {</div><div class='ctx'> 		async_block = wait;</div><div class='ctx'> 		wait = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -512,7 +516,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		lock = &amp;block-&gt;b_call-&gt;a_args.lock;</div><div class='ctx'> 	} else</div><div class='del'>-		lock-&gt;fl.fl_flags &amp;= ~FL_SLEEP;</div><div class='add'>+		lock-&gt;fl.c.flc_flags &amp;= ~FL_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	if (block-&gt;b_flags &amp; B_QUEUED) {</div><div class='ctx'> 		dprintk("lockd: nlmsvc_lock deferred block %p flags %d\n",</div><div class='hunk'>@@ -548,7 +552,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 	 * requests on the underlaying -&gt;lock() implementation but</div><div class='ctx'> 	 * only one nlm_block to being granted by lm_grant().</div><div class='ctx'> 	 */</div><div class='del'>-	if (exportfs_lock_op_is_async(inode-&gt;i_sb-&gt;s_export_op) &amp;&amp;</div><div class='add'>+	if (locks_can_async_lock(nlmsvc_file_file(file)-&gt;f_op) &amp;&amp;</div><div class='ctx'> 	    !list_empty(&amp;block-&gt;b_list)) {</div><div class='ctx'> 		spin_unlock(&amp;nlm_blocked_lock);</div><div class='ctx'> 		ret = nlm_lck_blocked;</div><div class='hunk'>@@ -560,10 +564,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 	spin_unlock(&amp;nlm_blocked_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!wait)</div><div class='del'>-		lock-&gt;fl.fl_flags &amp;= ~FL_SLEEP;</div><div class='add'>+		lock-&gt;fl.c.flc_flags &amp;= ~FL_SLEEP;</div><div class='ctx'> 	mode = lock_to_openmode(&amp;lock-&gt;fl);</div><div class='ctx'> 	error = vfs_lock_file(file-&gt;f_file[mode], F_SETLK, &amp;lock-&gt;fl, NULL);</div><div class='del'>-	lock-&gt;fl.fl_flags &amp;= ~FL_SLEEP;</div><div class='add'>+	lock-&gt;fl.c.flc_flags &amp;= ~FL_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("lockd: vfs_lock_file returned %d\n", error);</div><div class='ctx'> 	switch (error) {</div><div class='hunk'>@@ -607,7 +611,7 @@ out:</div><div class='ctx'> __be32</div><div class='ctx'> nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 		struct nlm_host *host, struct nlm_lock *lock,</div><div class='del'>-		struct nlm_lock *conflock, struct nlm_cookie *cookie)</div><div class='add'>+		struct nlm_lock *conflock)</div><div class='ctx'> {</div><div class='ctx'> 	int			error;</div><div class='ctx'> 	int			mode;</div><div class='hunk'>@@ -616,10 +620,13 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 	dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",</div><div class='ctx'> 				nlmsvc_file_inode(file)-&gt;i_sb-&gt;s_id,</div><div class='ctx'> 				nlmsvc_file_inode(file)-&gt;i_ino,</div><div class='del'>-				lock-&gt;fl.fl_type,</div><div class='add'>+				lock-&gt;fl.c.flc_type,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_start,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_end);</div><div class='ctx'> </div><div class='add'>+	if (nlmsvc_file_cannot_lock(file))</div><div class='add'>+		return nlm_lck_denied_nolocks;</div><div class='add'>+</div><div class='ctx'> 	if (locks_in_grace(SVC_NET(rqstp))) {</div><div class='ctx'> 		ret = nlm_lck_denied_grace_period;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -636,19 +643,19 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (lock-&gt;fl.fl_type == F_UNLCK) {</div><div class='add'>+	if (lock-&gt;fl.c.flc_type == F_UNLCK) {</div><div class='ctx'> 		ret = nlm_granted;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk("lockd: conflicting lock(ty=%d, %Ld-%Ld)\n",</div><div class='del'>-		lock-&gt;fl.fl_type, (long long)lock-&gt;fl.fl_start,</div><div class='add'>+		lock-&gt;fl.c.flc_type, (long long)lock-&gt;fl.fl_start,</div><div class='ctx'> 		(long long)lock-&gt;fl.fl_end);</div><div class='ctx'> 	conflock-&gt;caller = "somehost";	/* FIXME */</div><div class='ctx'> 	conflock-&gt;len = strlen(conflock-&gt;caller);</div><div class='ctx'> 	conflock-&gt;oh.len = 0;		/* don't return OH info */</div><div class='del'>-	conflock-&gt;svid = lock-&gt;fl.fl_pid;</div><div class='del'>-	conflock-&gt;fl.fl_type = lock-&gt;fl.fl_type;</div><div class='add'>+	conflock-&gt;svid = lock-&gt;fl.c.flc_pid;</div><div class='add'>+	conflock-&gt;fl.c.flc_type = lock-&gt;fl.c.flc_type;</div><div class='ctx'> 	conflock-&gt;fl.fl_start = lock-&gt;fl.fl_start;</div><div class='ctx'> 	conflock-&gt;fl.fl_end = lock-&gt;fl.fl_end;</div><div class='ctx'> 	locks_release_private(&amp;lock-&gt;fl);</div><div class='hunk'>@@ -673,21 +680,24 @@ nlmsvc_unlock(struct net *net, struct nlm_file *file, struct nlm_lock *lock)</div><div class='ctx'> 	dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",</div><div class='ctx'> 				nlmsvc_file_inode(file)-&gt;i_sb-&gt;s_id,</div><div class='ctx'> 				nlmsvc_file_inode(file)-&gt;i_ino,</div><div class='del'>-				lock-&gt;fl.fl_pid,</div><div class='add'>+				lock-&gt;fl.c.flc_pid,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_start,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_end);</div><div class='ctx'> </div><div class='add'>+	if (nlmsvc_file_cannot_lock(file))</div><div class='add'>+		return nlm_lck_denied_nolocks;</div><div class='add'>+</div><div class='ctx'> 	/* First, cancel any lock that might be there */</div><div class='ctx'> 	nlmsvc_cancel_blocked(net, file, lock);</div><div class='ctx'> </div><div class='del'>-	lock-&gt;fl.fl_type = F_UNLCK;</div><div class='del'>-	lock-&gt;fl.fl_file = file-&gt;f_file[O_RDONLY];</div><div class='del'>-	if (lock-&gt;fl.fl_file)</div><div class='del'>-		error = vfs_lock_file(lock-&gt;fl.fl_file, F_SETLK,</div><div class='add'>+	lock-&gt;fl.c.flc_type = F_UNLCK;</div><div class='add'>+	lock-&gt;fl.c.flc_file = file-&gt;f_file[O_RDONLY];</div><div class='add'>+	if (lock-&gt;fl.c.flc_file)</div><div class='add'>+		error = vfs_lock_file(lock-&gt;fl.c.flc_file, F_SETLK,</div><div class='ctx'> 					&amp;lock-&gt;fl, NULL);</div><div class='del'>-	lock-&gt;fl.fl_file = file-&gt;f_file[O_WRONLY];</div><div class='del'>-	if (lock-&gt;fl.fl_file)</div><div class='del'>-		error |= vfs_lock_file(lock-&gt;fl.fl_file, F_SETLK,</div><div class='add'>+	lock-&gt;fl.c.flc_file = file-&gt;f_file[O_WRONLY];</div><div class='add'>+	if (lock-&gt;fl.c.flc_file)</div><div class='add'>+		error |= vfs_lock_file(lock-&gt;fl.c.flc_file, F_SETLK,</div><div class='ctx'> 					&amp;lock-&gt;fl, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return (error &lt; 0)? nlm_lck_denied_nolocks : nlm_granted;</div><div class='hunk'>@@ -710,10 +720,13 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l</div><div class='ctx'> 	dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",</div><div class='ctx'> 				nlmsvc_file_inode(file)-&gt;i_sb-&gt;s_id,</div><div class='ctx'> 				nlmsvc_file_inode(file)-&gt;i_ino,</div><div class='del'>-				lock-&gt;fl.fl_pid,</div><div class='add'>+				lock-&gt;fl.c.flc_pid,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_start,</div><div class='ctx'> 				(long long)lock-&gt;fl.fl_end);</div><div class='ctx'> </div><div class='add'>+	if (nlmsvc_file_cannot_lock(file))</div><div class='add'>+		return nlm_lck_denied_nolocks;</div><div class='add'>+</div><div class='ctx'> 	if (locks_in_grace(net))</div><div class='ctx'> 		return nlm_lck_denied_grace_period;</div><div class='ctx'> </div><div class='hunk'>@@ -863,12 +876,12 @@ nlmsvc_grant_blocked(struct nlm_block *block)</div><div class='ctx'> 	/* vfs_lock_file() can mangle fl_start and fl_end, but we need</div><div class='ctx'> 	 * them unchanged for the GRANT_MSG</div><div class='ctx'> 	 */</div><div class='del'>-	lock-&gt;fl.fl_flags |= FL_SLEEP;</div><div class='add'>+	lock-&gt;fl.c.flc_flags |= FL_SLEEP;</div><div class='ctx'> 	fl_start = lock-&gt;fl.fl_start;</div><div class='ctx'> 	fl_end = lock-&gt;fl.fl_end;</div><div class='ctx'> 	mode = lock_to_openmode(&amp;lock-&gt;fl);</div><div class='ctx'> 	error = vfs_lock_file(file-&gt;f_file[mode], F_SETLK, &amp;lock-&gt;fl, NULL);</div><div class='del'>-	lock-&gt;fl.fl_flags &amp;= ~FL_SLEEP;</div><div class='add'>+	lock-&gt;fl.c.flc_flags &amp;= ~FL_SLEEP;</div><div class='ctx'> 	lock-&gt;fl.fl_start = fl_start;</div><div class='ctx'> 	lock-&gt;fl.fl_end = fl_end;</div><div class='ctx'> </div><div class='hunk'>@@ -979,7 +992,7 @@ nlmsvc_grant_reply(struct nlm_cookie *cookie, __be32 status)</div><div class='ctx'> 	struct file_lock	*fl;</div><div class='ctx'> 	int			error;</div><div class='ctx'> </div><div class='del'>-	dprintk("grant_reply: looking for cookie %x, s=%d \n",</div><div class='add'>+	dprintk("grant_reply: looking for cookie %x, s=%d\n",</div><div class='ctx'> 		*(unsigned int *)(cookie-&gt;data), status);</div><div class='ctx'> 	if (!(block = nlmsvc_find_block(cookie)))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -993,8 +1006,8 @@ nlmsvc_grant_reply(struct nlm_cookie *cookie, __be32 status)</div><div class='ctx'> 		/* Client doesn't want it, just unlock it */</div><div class='ctx'> 		nlmsvc_unlink_block(block);</div><div class='ctx'> 		fl = &amp;block-&gt;b_call-&gt;a_args.lock.fl;</div><div class='del'>-		fl-&gt;fl_type = F_UNLCK;</div><div class='del'>-		error = vfs_lock_file(fl-&gt;fl_file, F_SETLK, fl, NULL);</div><div class='add'>+		fl-&gt;c.flc_type = F_UNLCK;</div><div class='add'>+		error = vfs_lock_file(fl-&gt;c.flc_file, F_SETLK, fl, NULL);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			pr_warn("lockd: unable to unlock lock rejected by client!\n");</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c<br/>index 32784f508c81..f53d5177f267 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/svcproc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svcproc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/svcproc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/svcproc.c</a></div><div class='hunk'>@@ -77,12 +77,12 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,</div><div class='ctx'> </div><div class='ctx'> 		/* Set up the missing parts of the file_lock structure */</div><div class='ctx'> 		mode = lock_to_openmode(&amp;lock-&gt;fl);</div><div class='del'>-		lock-&gt;fl.fl_flags = FL_POSIX;</div><div class='del'>-		lock-&gt;fl.fl_file  = file-&gt;f_file[mode];</div><div class='del'>-		lock-&gt;fl.fl_pid = current-&gt;tgid;</div><div class='add'>+		lock-&gt;fl.c.flc_flags = FL_POSIX;</div><div class='add'>+		lock-&gt;fl.c.flc_file  = file-&gt;f_file[mode];</div><div class='add'>+		lock-&gt;fl.c.flc_pid = current-&gt;tgid;</div><div class='ctx'> 		lock-&gt;fl.fl_lmops = &amp;nlmsvc_lock_operations;</div><div class='ctx'> 		nlmsvc_locks_init_private(&amp;lock-&gt;fl, host, (pid_t)lock-&gt;svid);</div><div class='del'>-		if (!lock-&gt;fl.fl_owner) {</div><div class='add'>+		if (!lock-&gt;fl.c.flc_owner) {</div><div class='ctx'> 			/* lockowner allocation has failed */</div><div class='ctx'> 			nlmsvc_release_host(host);</div><div class='ctx'> 			return nlm_lck_denied_nolocks;</div><div class='hunk'>@@ -127,10 +127,11 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)</div><div class='ctx'> 	if ((resp-&gt;status = nlmsvc_retrieve_args(rqstp, argp, &amp;host, &amp;file)))</div><div class='ctx'> 		return resp-&gt;status == nlm_drop_reply ? rpc_drop_reply :rpc_success;</div><div class='ctx'> </div><div class='del'>-	test_owner = argp-&gt;lock.fl.fl_owner;</div><div class='add'>+	test_owner = argp-&gt;lock.fl.c.flc_owner;</div><div class='ctx'> </div><div class='ctx'> 	/* Now check for conflicting locks */</div><div class='del'>-	resp-&gt;status = cast_status(nlmsvc_testlock(rqstp, file, host, &amp;argp-&gt;lock, &amp;resp-&gt;lock, &amp;resp-&gt;cookie));</div><div class='add'>+	resp-&gt;status = cast_status(nlmsvc_testlock(rqstp, file, host,</div><div class='add'>+						   &amp;argp-&gt;lock, &amp;resp-&gt;lock));</div><div class='ctx'> 	if (resp-&gt;status == nlm_drop_reply)</div><div class='ctx'> 		rc = rpc_drop_reply;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -165,18 +166,6 @@ __nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)</div><div class='ctx'> 	if ((resp-&gt;status = nlmsvc_retrieve_args(rqstp, argp, &amp;host, &amp;file)))</div><div class='ctx'> 		return resp-&gt;status == nlm_drop_reply ? rpc_drop_reply :rpc_success;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	/* If supplied state doesn't match current state, we assume it's</div><div class='del'>-	 * an old request that time-warped somehow. Any error return would</div><div class='del'>-	 * do in this case because it's irrelevant anyway.</div><div class='del'>-	 *</div><div class='del'>-	 * NB: We don't retrieve the remote host's state yet.</div><div class='del'>-	 */</div><div class='del'>-	if (host-&gt;h_nsmstate &amp;&amp; host-&gt;h_nsmstate != argp-&gt;state) {</div><div class='del'>-		resp-&gt;status = nlm_lck_denied_nolocks;</div><div class='del'>-	} else</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Now try to lock the file */</div><div class='ctx'> 	resp-&gt;status = cast_status(nlmsvc_lock(rqstp, file, host, &amp;argp-&gt;lock,</div><div class='ctx'> 					       argp-&gt;block, &amp;argp-&gt;cookie,</div><div class='head'>diff --git a/fs/lockd/svcshare.c b/fs/lockd/svcshare.c<br/>index ade4931b2da2..88c81ce1148d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/svcshare.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svcshare.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/svcshare.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/svcshare.c</a></div><div class='hunk'>@@ -32,6 +32,9 @@ nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file,</div><div class='ctx'> 	struct xdr_netobj	*oh = &amp;argp-&gt;lock.oh;</div><div class='ctx'> 	u8			*ohdata;</div><div class='ctx'> </div><div class='add'>+	if (nlmsvc_file_cannot_lock(file))</div><div class='add'>+		return nlm_lck_denied_nolocks;</div><div class='add'>+</div><div class='ctx'> 	for (share = file-&gt;f_shares; share; share = share-&gt;s_next) {</div><div class='ctx'> 		if (share-&gt;s_host == host &amp;&amp; nlm_cmp_owner(share, oh))</div><div class='ctx'> 			goto update;</div><div class='hunk'>@@ -72,6 +75,9 @@ nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file,</div><div class='ctx'> 	struct nlm_share	*share, **shpp;</div><div class='ctx'> 	struct xdr_netobj	*oh = &amp;argp-&gt;lock.oh;</div><div class='ctx'> </div><div class='add'>+	if (nlmsvc_file_cannot_lock(file))</div><div class='add'>+		return nlm_lck_denied_nolocks;</div><div class='add'>+</div><div class='ctx'> 	for (shpp = &amp;file-&gt;f_shares; (share = *shpp) != NULL;</div><div class='ctx'> 					shpp = &amp;share-&gt;s_next) {</div><div class='ctx'> 		if (share-&gt;s_host == host &amp;&amp; nlm_cmp_owner(share, oh)) {</div><div class='head'>diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c<br/>index e3b6229e7ae5..9103896164f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/svcsubs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/svcsubs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/svcsubs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/svcsubs.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static inline unsigned int file_hash(struct nfs_fh *f)</div><div class='ctx'> </div><div class='ctx'> int lock_to_openmode(struct file_lock *lock)</div><div class='ctx'> {</div><div class='del'>-	return (lock-&gt;fl_type == F_WRLCK) ? O_WRONLY : O_RDONLY;</div><div class='add'>+	return lock_is_write(lock) ? O_WRONLY : O_RDONLY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -181,18 +181,18 @@ static int nlm_unlock_files(struct nlm_file *file, const struct file_lock *fl)</div><div class='ctx'> 	struct file_lock lock;</div><div class='ctx'> </div><div class='ctx'> 	locks_init_lock(&amp;lock);</div><div class='del'>-	lock.fl_type  = F_UNLCK;</div><div class='add'>+	lock.c.flc_type  = F_UNLCK;</div><div class='ctx'> 	lock.fl_start = 0;</div><div class='ctx'> 	lock.fl_end   = OFFSET_MAX;</div><div class='del'>-	lock.fl_owner = fl-&gt;fl_owner;</div><div class='del'>-	lock.fl_pid   = fl-&gt;fl_pid;</div><div class='del'>-	lock.fl_flags = FL_POSIX;</div><div class='add'>+	lock.c.flc_owner = fl-&gt;c.flc_owner;</div><div class='add'>+	lock.c.flc_pid   = fl-&gt;c.flc_pid;</div><div class='add'>+	lock.c.flc_flags = FL_POSIX;</div><div class='ctx'> </div><div class='del'>-	lock.fl_file = file-&gt;f_file[O_RDONLY];</div><div class='del'>-	if (lock.fl_file &amp;&amp; vfs_lock_file(lock.fl_file, F_SETLK, &amp;lock, NULL))</div><div class='add'>+	lock.c.flc_file = file-&gt;f_file[O_RDONLY];</div><div class='add'>+	if (lock.c.flc_file &amp;&amp; vfs_lock_file(lock.c.flc_file, F_SETLK, &amp;lock, NULL))</div><div class='ctx'> 		goto out_err;</div><div class='del'>-	lock.fl_file = file-&gt;f_file[O_WRONLY];</div><div class='del'>-	if (lock.fl_file &amp;&amp; vfs_lock_file(lock.fl_file, F_SETLK, &amp;lock, NULL))</div><div class='add'>+	lock.c.flc_file = file-&gt;f_file[O_WRONLY];</div><div class='add'>+	if (lock.c.flc_file &amp;&amp; vfs_lock_file(lock.c.flc_file, F_SETLK, &amp;lock, NULL))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_err:</div><div class='hunk'>@@ -218,14 +218,14 @@ nlm_traverse_locks(struct nlm_host *host, struct nlm_file *file,</div><div class='ctx'> again:</div><div class='ctx'> 	file-&gt;f_locks = 0;</div><div class='ctx'> 	spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry(fl, &amp;flctx-&gt;flc_posix, fl_list) {</div><div class='add'>+	for_each_file_lock(fl, &amp;flctx-&gt;flc_posix) {</div><div class='ctx'> 		if (fl-&gt;fl_lmops != &amp;nlmsvc_lock_operations)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* update current lock count */</div><div class='ctx'> 		file-&gt;f_locks++;</div><div class='ctx'> </div><div class='del'>-		lockhost = ((struct nlm_lockowner *)fl-&gt;fl_owner)-&gt;host;</div><div class='add'>+		lockhost = ((struct nlm_lockowner *) fl-&gt;c.flc_owner)-&gt;host;</div><div class='ctx'> 		if (match(lockhost, host)) {</div><div class='ctx'> </div><div class='ctx'> 			spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='hunk'>@@ -272,7 +272,7 @@ nlm_file_inuse(struct nlm_file *file)</div><div class='ctx'> </div><div class='ctx'> 	if (flctx &amp;&amp; !list_empty_careful(&amp;flctx-&gt;flc_posix)) {</div><div class='ctx'> 		spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='del'>-		list_for_each_entry(fl, &amp;flctx-&gt;flc_posix, fl_list) {</div><div class='add'>+		for_each_file_lock(fl, &amp;flctx-&gt;flc_posix) {</div><div class='ctx'> 			if (fl-&gt;fl_lmops == &amp;nlmsvc_lock_operations) {</div><div class='ctx'> 				spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> 				return 1;</div><div class='head'>diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c<br/>index 2fb5748dae0c..adfcce2bf11b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/xdr.c</a></div><div class='hunk'>@@ -88,8 +88,8 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	locks_init_lock(fl);</div><div class='del'>-	fl-&gt;fl_flags = FL_POSIX;</div><div class='del'>-	fl-&gt;fl_type  = F_RDLCK;</div><div class='add'>+	fl-&gt;c.flc_flags = FL_POSIX;</div><div class='add'>+	fl-&gt;c.flc_type  = F_RDLCK;</div><div class='ctx'> 	end = start + len - 1;</div><div class='ctx'> 	fl-&gt;fl_start = s32_to_loff_t(start);</div><div class='ctx'> 	if (len == 0 || end &lt; 0)</div><div class='hunk'>@@ -107,7 +107,7 @@ svcxdr_encode_holder(struct xdr_stream *xdr, const struct nlm_lock *lock)</div><div class='ctx'> 	s32 start, len;</div><div class='ctx'> </div><div class='ctx'> 	/* exclusive */</div><div class='del'>-	if (xdr_stream_encode_bool(xdr, fl-&gt;fl_type != F_RDLCK) &lt; 0)</div><div class='add'>+	if (xdr_stream_encode_bool(xdr, fl-&gt;c.flc_type != F_RDLCK) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (xdr_stream_encode_u32(xdr, lock-&gt;svid) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -164,7 +164,7 @@ nlmsvc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (exclusive)</div><div class='del'>-		argp-&gt;lock.fl.fl_type = F_WRLCK;</div><div class='add'>+		argp-&gt;lock.fl.c.flc_type = F_WRLCK;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -184,7 +184,7 @@ nlmsvc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (exclusive)</div><div class='del'>-		argp-&gt;lock.fl.fl_type = F_WRLCK;</div><div class='add'>+		argp-&gt;lock.fl.c.flc_type = F_WRLCK;</div><div class='ctx'> 	if (xdr_stream_decode_bool(xdr, &amp;argp-&gt;reclaim) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (xdr_stream_decode_u32(xdr, &amp;argp-&gt;state) &lt; 0)</div><div class='hunk'>@@ -209,7 +209,7 @@ nlmsvc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (exclusive)</div><div class='del'>-		argp-&gt;lock.fl.fl_type = F_WRLCK;</div><div class='add'>+		argp-&gt;lock.fl.c.flc_type = F_WRLCK;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -223,7 +223,7 @@ nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='del'>-	argp-&gt;lock.fl.fl_type = F_UNLCK;</div><div class='add'>+	argp-&gt;lock.fl.c.flc_type = F_UNLCK;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c<br/>index 5fcbf30cd275..e343c820301f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/lockd/xdr4.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/lockd/xdr4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/lockd/xdr4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/lockd/xdr4.c</a></div><div class='hunk'>@@ -89,8 +89,7 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	locks_init_lock(fl);</div><div class='del'>-	fl-&gt;fl_flags = FL_POSIX;</div><div class='del'>-	fl-&gt;fl_type  = F_RDLCK;</div><div class='add'>+	fl-&gt;c.flc_type  = F_RDLCK;</div><div class='ctx'> 	nlm4svc_set_file_lock_range(fl, lock-&gt;lock_start, lock-&gt;lock_len);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -102,7 +101,7 @@ svcxdr_encode_holder(struct xdr_stream *xdr, const struct nlm_lock *lock)</div><div class='ctx'> 	s64 start, len;</div><div class='ctx'> </div><div class='ctx'> 	/* exclusive */</div><div class='del'>-	if (xdr_stream_encode_bool(xdr, fl-&gt;fl_type != F_RDLCK) &lt; 0)</div><div class='add'>+	if (xdr_stream_encode_bool(xdr, fl-&gt;c.flc_type != F_RDLCK) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (xdr_stream_encode_u32(xdr, lock-&gt;svid) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -159,7 +158,7 @@ nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (exclusive)</div><div class='del'>-		argp-&gt;lock.fl.fl_type = F_WRLCK;</div><div class='add'>+		argp-&gt;lock.fl.c.flc_type = F_WRLCK;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -179,7 +178,7 @@ nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (exclusive)</div><div class='del'>-		argp-&gt;lock.fl.fl_type = F_WRLCK;</div><div class='add'>+		argp-&gt;lock.fl.c.flc_type = F_WRLCK;</div><div class='ctx'> 	if (xdr_stream_decode_bool(xdr, &amp;argp-&gt;reclaim) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (xdr_stream_decode_u32(xdr, &amp;argp-&gt;state) &lt; 0)</div><div class='hunk'>@@ -204,7 +203,7 @@ nlm4svc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (exclusive)</div><div class='del'>-		argp-&gt;lock.fl.fl_type = F_WRLCK;</div><div class='add'>+		argp-&gt;lock.fl.c.flc_type = F_WRLCK;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,7 +217,7 @@ nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!svcxdr_decode_lock(xdr, &amp;argp-&gt;lock))</div><div class='ctx'> 		return false;</div><div class='del'>-	argp-&gt;lock.fl.fl_type = F_UNLCK;</div><div class='add'>+	argp-&gt;lock.fl.c.flc_type = F_UNLCK;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -268,7 +267,6 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	struct nlm_args *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nlm_lock	*lock = &amp;argp-&gt;lock;</div><div class='ctx'> </div><div class='del'>-	memset(lock, 0, sizeof(*lock));</div><div class='ctx'> 	locks_init_lock(&amp;lock-&gt;fl);</div><div class='ctx'> 	lock-&gt;svid = ~(u32)0;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/locks.c b/fs/locks.c<br/>index cc7c117ee192..9f565802a88c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/locks.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/locks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/locks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/locks.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'>  * children.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fdtable.h&gt;</div><div class='hunk'>@@ -70,31 +69,35 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#define IS_POSIX(fl)	(fl-&gt;fl_flags &amp; FL_POSIX)</div><div class='del'>-#define IS_FLOCK(fl)	(fl-&gt;fl_flags &amp; FL_FLOCK)</div><div class='del'>-#define IS_LEASE(fl)	(fl-&gt;fl_flags &amp; (FL_LEASE|FL_DELEG|FL_LAYOUT))</div><div class='del'>-#define IS_OFDLCK(fl)	(fl-&gt;fl_flags &amp; FL_OFDLCK)</div><div class='del'>-#define IS_REMOTELCK(fl)	(fl-&gt;fl_pid &lt;= 0)</div><div class='add'>+static struct file_lock *file_lock(struct file_lock_core *flc)</div><div class='add'>+{</div><div class='add'>+	return container_of(flc, struct file_lock, c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_lease *file_lease(struct file_lock_core *flc)</div><div class='add'>+{</div><div class='add'>+	return container_of(flc, struct file_lease, c);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static bool lease_breaking(struct file_lock *fl)</div><div class='add'>+static bool lease_breaking(struct file_lease *fl)</div><div class='ctx'> {</div><div class='del'>-	return fl-&gt;fl_flags &amp; (FL_UNLOCK_PENDING | FL_DOWNGRADE_PENDING);</div><div class='add'>+	return fl-&gt;c.flc_flags &amp; (FL_UNLOCK_PENDING | FL_DOWNGRADE_PENDING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int target_leasetype(struct file_lock *fl)</div><div class='add'>+static int target_leasetype(struct file_lease *fl)</div><div class='ctx'> {</div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_UNLOCK_PENDING)</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_UNLOCK_PENDING)</div><div class='ctx'> 		return F_UNLCK;</div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_DOWNGRADE_PENDING)</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_DOWNGRADE_PENDING)</div><div class='ctx'> 		return F_RDLCK;</div><div class='del'>-	return fl-&gt;fl_type;</div><div class='add'>+	return fl-&gt;c.flc_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int leases_enable = 1;</div><div class='ctx'> static int lease_break_time = 45;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static struct ctl_table locks_sysctls[] = {</div><div class='add'>+static const struct ctl_table locks_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "leases-enable",</div><div class='ctx'> 		.data		= &amp;leases_enable,</div><div class='hunk'>@@ -168,6 +171,7 @@ static DEFINE_SPINLOCK(blocked_lock_lock);</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *flctx_cache __ro_after_init;</div><div class='ctx'> static struct kmem_cache *filelock_cache __ro_after_init;</div><div class='add'>+static struct kmem_cache *filelease_cache __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> static struct file_lock_context *</div><div class='ctx'> locks_get_lock_context(struct inode *inode, int type)</div><div class='hunk'>@@ -204,11 +208,12 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> locks_dump_ctx_list(struct list_head *list, char *list_type)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(fl, list, fl_list) {</div><div class='del'>-		pr_warn("%s: fl_owner=%p fl_flags=0x%x fl_type=0x%x fl_pid=%u\n", list_type, fl-&gt;fl_owner, fl-&gt;fl_flags, fl-&gt;fl_type, fl-&gt;fl_pid);</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(flc, list, flc_list)</div><div class='add'>+		pr_warn("%s: fl_owner=%p fl_flags=0x%x fl_type=0x%x fl_pid=%u\n",</div><div class='add'>+			list_type, flc-&gt;flc_owner, flc-&gt;flc_flags,</div><div class='add'>+			flc-&gt;flc_type, flc-&gt;flc_pid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -229,19 +234,19 @@ locks_check_ctx_lists(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-locks_check_ctx_file_list(struct file *filp, struct list_head *list,</div><div class='del'>-				char *list_type)</div><div class='add'>+locks_check_ctx_file_list(struct file *filp, struct list_head *list, char *list_type)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(fl, list, fl_list)</div><div class='del'>-		if (fl-&gt;fl_file == filp)</div><div class='add'>+	list_for_each_entry(flc, list, flc_list)</div><div class='add'>+		if (flc-&gt;flc_file == filp)</div><div class='ctx'> 			pr_warn("Leaked %s lock on dev=0x%x:0x%x ino=0x%lx "</div><div class='ctx'> 				" fl_owner=%p fl_flags=0x%x fl_type=0x%x fl_pid=%u\n",</div><div class='ctx'> 				list_type, MAJOR(inode-&gt;i_sb-&gt;s_dev),</div><div class='ctx'> 				MINOR(inode-&gt;i_sb-&gt;s_dev), inode-&gt;i_ino,</div><div class='del'>-				fl-&gt;fl_owner, fl-&gt;fl_flags, fl-&gt;fl_type, fl-&gt;fl_pid);</div><div class='add'>+				flc-&gt;flc_owner, flc-&gt;flc_flags,</div><div class='add'>+				flc-&gt;flc_type, flc-&gt;flc_pid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -255,13 +260,13 @@ locks_free_lock_context(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locks_init_lock_heads(struct file_lock *fl)</div><div class='add'>+static void locks_init_lock_heads(struct file_lock_core *flc)</div><div class='ctx'> {</div><div class='del'>-	INIT_HLIST_NODE(&amp;fl-&gt;fl_link);</div><div class='del'>-	INIT_LIST_HEAD(&amp;fl-&gt;fl_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;fl-&gt;fl_blocked_requests);</div><div class='del'>-	INIT_LIST_HEAD(&amp;fl-&gt;fl_blocked_member);</div><div class='del'>-	init_waitqueue_head(&amp;fl-&gt;fl_wait);</div><div class='add'>+	INIT_HLIST_NODE(&amp;flc-&gt;flc_link);</div><div class='add'>+	INIT_LIST_HEAD(&amp;flc-&gt;flc_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;flc-&gt;flc_blocked_requests);</div><div class='add'>+	INIT_LIST_HEAD(&amp;flc-&gt;flc_blocked_member);</div><div class='add'>+	init_waitqueue_head(&amp;flc-&gt;flc_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate an empty lock structure. */</div><div class='hunk'>@@ -270,19 +275,33 @@ struct file_lock *locks_alloc_lock(void)</div><div class='ctx'> 	struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (fl)</div><div class='del'>-		locks_init_lock_heads(fl);</div><div class='add'>+		locks_init_lock_heads(&amp;fl-&gt;c);</div><div class='ctx'> </div><div class='ctx'> 	return fl;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(locks_alloc_lock);</div><div class='ctx'> </div><div class='add'>+/* Allocate an empty lock structure. */</div><div class='add'>+struct file_lease *locks_alloc_lease(void)</div><div class='add'>+{</div><div class='add'>+	struct file_lease *fl = kmem_cache_zalloc(filelease_cache, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (fl)</div><div class='add'>+		locks_init_lock_heads(&amp;fl-&gt;c);</div><div class='add'>+</div><div class='add'>+	return fl;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(locks_alloc_lease);</div><div class='add'>+</div><div class='ctx'> void locks_release_private(struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(waitqueue_active(&amp;fl-&gt;fl_wait));</div><div class='del'>-	BUG_ON(!list_empty(&amp;fl-&gt;fl_list));</div><div class='del'>-	BUG_ON(!list_empty(&amp;fl-&gt;fl_blocked_requests));</div><div class='del'>-	BUG_ON(!list_empty(&amp;fl-&gt;fl_blocked_member));</div><div class='del'>-	BUG_ON(!hlist_unhashed(&amp;fl-&gt;fl_link));</div><div class='add'>+	struct file_lock_core *flc = &amp;fl-&gt;c;</div><div class='add'>+</div><div class='add'>+	BUG_ON(waitqueue_active(&amp;flc-&gt;flc_wait));</div><div class='add'>+	BUG_ON(!list_empty(&amp;flc-&gt;flc_list));</div><div class='add'>+	BUG_ON(!list_empty(&amp;flc-&gt;flc_blocked_requests));</div><div class='add'>+	BUG_ON(!list_empty(&amp;flc-&gt;flc_blocked_member));</div><div class='add'>+	BUG_ON(!hlist_unhashed(&amp;flc-&gt;flc_link));</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;fl_ops) {</div><div class='ctx'> 		if (fl-&gt;fl_ops-&gt;fl_release_private)</div><div class='hunk'>@@ -292,8 +311,8 @@ void locks_release_private(struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;fl_lmops) {</div><div class='ctx'> 		if (fl-&gt;fl_lmops-&gt;lm_put_owner) {</div><div class='del'>-			fl-&gt;fl_lmops-&gt;lm_put_owner(fl-&gt;fl_owner);</div><div class='del'>-			fl-&gt;fl_owner = NULL;</div><div class='add'>+			fl-&gt;fl_lmops-&gt;lm_put_owner(flc-&gt;flc_owner);</div><div class='add'>+			flc-&gt;flc_owner = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		fl-&gt;fl_lmops = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -309,16 +328,15 @@ EXPORT_SYMBOL_GPL(locks_release_private);</div><div class='ctx'>  *   %true: @owner has at least one blocker</div><div class='ctx'>  *   %false: @owner has no blockers</div><div class='ctx'>  */</div><div class='del'>-bool locks_owner_has_blockers(struct file_lock_context *flctx,</div><div class='del'>-		fl_owner_t owner)</div><div class='add'>+bool locks_owner_has_blockers(struct file_lock_context *flctx, fl_owner_t owner)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry(fl, &amp;flctx-&gt;flc_posix, fl_list) {</div><div class='del'>-		if (fl-&gt;fl_owner != owner)</div><div class='add'>+	list_for_each_entry(flc, &amp;flctx-&gt;flc_posix, flc_list) {</div><div class='add'>+		if (flc-&gt;flc_owner != owner)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!list_empty(&amp;fl-&gt;fl_blocked_requests)) {</div><div class='add'>+		if (!list_empty(&amp;flc-&gt;flc_blocked_requests)) {</div><div class='ctx'> 			spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -336,35 +354,52 @@ void locks_free_lock(struct file_lock *fl)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(locks_free_lock);</div><div class='ctx'> </div><div class='add'>+/* Free a lease which is not in use. */</div><div class='add'>+void locks_free_lease(struct file_lease *fl)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_free(filelease_cache, fl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(locks_free_lease);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> locks_dispose_list(struct list_head *dispose)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(dispose)) {</div><div class='del'>-		fl = list_first_entry(dispose, struct file_lock, fl_list);</div><div class='del'>-		list_del_init(&amp;fl-&gt;fl_list);</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		flc = list_first_entry(dispose, struct file_lock_core, flc_list);</div><div class='add'>+		list_del_init(&amp;flc-&gt;flc_list);</div><div class='add'>+		if (flc-&gt;flc_flags &amp; (FL_LEASE|FL_DELEG|FL_LAYOUT))</div><div class='add'>+			locks_free_lease(file_lease(flc));</div><div class='add'>+		else</div><div class='add'>+			locks_free_lock(file_lock(flc));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void locks_init_lock(struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	memset(fl, 0, sizeof(struct file_lock));</div><div class='del'>-	locks_init_lock_heads(fl);</div><div class='add'>+	locks_init_lock_heads(&amp;fl-&gt;c);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(locks_init_lock);</div><div class='ctx'> </div><div class='add'>+void locks_init_lease(struct file_lease *fl)</div><div class='add'>+{</div><div class='add'>+	memset(fl, 0, sizeof(*fl));</div><div class='add'>+	locks_init_lock_heads(&amp;fl-&gt;c);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(locks_init_lease);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize a new lock from an existing file_lock structure.</div><div class='ctx'>  */</div><div class='ctx'> void locks_copy_conflock(struct file_lock *new, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	new-&gt;fl_owner = fl-&gt;fl_owner;</div><div class='del'>-	new-&gt;fl_pid = fl-&gt;fl_pid;</div><div class='del'>-	new-&gt;fl_file = NULL;</div><div class='del'>-	new-&gt;fl_flags = fl-&gt;fl_flags;</div><div class='del'>-	new-&gt;fl_type = fl-&gt;fl_type;</div><div class='add'>+	new-&gt;c.flc_owner = fl-&gt;c.flc_owner;</div><div class='add'>+	new-&gt;c.flc_pid = fl-&gt;c.flc_pid;</div><div class='add'>+	new-&gt;c.flc_file = NULL;</div><div class='add'>+	new-&gt;c.flc_flags = fl-&gt;c.flc_flags;</div><div class='add'>+	new-&gt;c.flc_type = fl-&gt;c.flc_type;</div><div class='ctx'> 	new-&gt;fl_start = fl-&gt;fl_start;</div><div class='ctx'> 	new-&gt;fl_end = fl-&gt;fl_end;</div><div class='ctx'> 	new-&gt;fl_lmops = fl-&gt;fl_lmops;</div><div class='hunk'>@@ -372,7 +407,7 @@ void locks_copy_conflock(struct file_lock *new, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;fl_lmops) {</div><div class='ctx'> 		if (fl-&gt;fl_lmops-&gt;lm_get_owner)</div><div class='del'>-			fl-&gt;fl_lmops-&gt;lm_get_owner(fl-&gt;fl_owner);</div><div class='add'>+			fl-&gt;fl_lmops-&gt;lm_get_owner(fl-&gt;c.flc_owner);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(locks_copy_conflock);</div><div class='hunk'>@@ -384,7 +419,7 @@ void locks_copy_lock(struct file_lock *new, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	locks_copy_conflock(new, fl);</div><div class='ctx'> </div><div class='del'>-	new-&gt;fl_file = fl-&gt;fl_file;</div><div class='add'>+	new-&gt;c.flc_file = fl-&gt;c.flc_file;</div><div class='ctx'> 	new-&gt;fl_ops = fl-&gt;fl_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;fl_ops) {</div><div class='hunk'>@@ -400,15 +435,17 @@ static void locks_move_blocks(struct file_lock *new, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * As ctx-&gt;flc_lock is held, new requests cannot be added to</div><div class='del'>-	 * -&gt;fl_blocked_requests, so we don't need a lock to check if it</div><div class='add'>+	 * -&gt;flc_blocked_requests, so we don't need a lock to check if it</div><div class='ctx'> 	 * is empty.</div><div class='ctx'> 	 */</div><div class='del'>-	if (list_empty(&amp;fl-&gt;fl_blocked_requests))</div><div class='add'>+	if (list_empty(&amp;fl-&gt;c.flc_blocked_requests))</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock(&amp;blocked_lock_lock);</div><div class='del'>-	list_splice_init(&amp;fl-&gt;fl_blocked_requests, &amp;new-&gt;fl_blocked_requests);</div><div class='del'>-	list_for_each_entry(f, &amp;new-&gt;fl_blocked_requests, fl_blocked_member)</div><div class='del'>-		f-&gt;fl_blocker = new;</div><div class='add'>+	list_splice_init(&amp;fl-&gt;c.flc_blocked_requests,</div><div class='add'>+			 &amp;new-&gt;c.flc_blocked_requests);</div><div class='add'>+	list_for_each_entry(f, &amp;new-&gt;c.flc_blocked_requests,</div><div class='add'>+			    c.flc_blocked_member)</div><div class='add'>+		f-&gt;c.flc_blocker = &amp;new-&gt;c;</div><div class='ctx'> 	spin_unlock(&amp;blocked_lock_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -429,21 +466,21 @@ static void flock_make_lock(struct file *filp, struct file_lock *fl, int type)</div><div class='ctx'> {</div><div class='ctx'> 	locks_init_lock(fl);</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_file = filp;</div><div class='del'>-	fl-&gt;fl_owner = filp;</div><div class='del'>-	fl-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	fl-&gt;fl_flags = FL_FLOCK;</div><div class='del'>-	fl-&gt;fl_type = type;</div><div class='add'>+	fl-&gt;c.flc_file = filp;</div><div class='add'>+	fl-&gt;c.flc_owner = filp;</div><div class='add'>+	fl-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	fl-&gt;c.flc_flags = FL_FLOCK;</div><div class='add'>+	fl-&gt;c.flc_type = type;</div><div class='ctx'> 	fl-&gt;fl_end = OFFSET_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int assign_type(struct file_lock *fl, int type)</div><div class='add'>+static int assign_type(struct file_lock_core *flc, int type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case F_RDLCK:</div><div class='ctx'> 	case F_WRLCK:</div><div class='ctx'> 	case F_UNLCK:</div><div class='del'>-		fl-&gt;fl_type = type;</div><div class='add'>+		flc-&gt;flc_type = type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -488,14 +525,14 @@ static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,</div><div class='ctx'> 	} else</div><div class='ctx'> 		fl-&gt;fl_end = OFFSET_MAX;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_owner = current-&gt;files;</div><div class='del'>-	fl-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	fl-&gt;fl_file = filp;</div><div class='del'>-	fl-&gt;fl_flags = FL_POSIX;</div><div class='add'>+	fl-&gt;c.flc_owner = current-&gt;files;</div><div class='add'>+	fl-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	fl-&gt;c.flc_file = filp;</div><div class='add'>+	fl-&gt;c.flc_flags = FL_POSIX;</div><div class='ctx'> 	fl-&gt;fl_ops = NULL;</div><div class='ctx'> 	fl-&gt;fl_lmops = NULL;</div><div class='ctx'> </div><div class='del'>-	return assign_type(fl, l-&gt;l_type);</div><div class='add'>+	return assign_type(&amp;fl-&gt;c, l-&gt;l_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Verify a "struct flock" and copy it to a "struct file_lock" as a POSIX</div><div class='hunk'>@@ -516,16 +553,16 @@ static int flock_to_posix_lock(struct file *filp, struct file_lock *fl,</div><div class='ctx'> </div><div class='ctx'> /* default lease lock manager operations */</div><div class='ctx'> static bool</div><div class='del'>-lease_break_callback(struct file_lock *fl)</div><div class='add'>+lease_break_callback(struct file_lease *fl)</div><div class='ctx'> {</div><div class='ctx'> 	kill_fasync(&amp;fl-&gt;fl_fasync, SIGIO, POLL_MSG);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-lease_setup(struct file_lock *fl, void **priv)</div><div class='add'>+lease_setup(struct file_lease *fl, void **priv)</div><div class='ctx'> {</div><div class='del'>-	struct file *filp = fl-&gt;fl_file;</div><div class='add'>+	struct file *filp = fl-&gt;c.flc_file;</div><div class='ctx'> 	struct fasync_struct *fa = *priv;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -539,7 +576,7 @@ lease_setup(struct file_lock *fl, void **priv)</div><div class='ctx'> 	__f_setown(filp, task_pid(current), PIDTYPE_TGID, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct lock_manager_operations lease_manager_ops = {</div><div class='add'>+static const struct lease_manager_operations lease_manager_ops = {</div><div class='ctx'> 	.lm_break = lease_break_callback,</div><div class='ctx'> 	.lm_change = lease_modify,</div><div class='ctx'> 	.lm_setup = lease_setup,</div><div class='hunk'>@@ -548,35 +585,32 @@ static const struct lock_manager_operations lease_manager_ops = {</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize a lease, use the default lock manager operations</div><div class='ctx'>  */</div><div class='del'>-static int lease_init(struct file *filp, int type, struct file_lock *fl)</div><div class='add'>+static int lease_init(struct file *filp, unsigned int flags, int type, struct file_lease *fl)</div><div class='ctx'> {</div><div class='del'>-	if (assign_type(fl, type) != 0)</div><div class='add'>+	if (assign_type(&amp;fl-&gt;c, type) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_owner = filp;</div><div class='del'>-	fl-&gt;fl_pid = current-&gt;tgid;</div><div class='add'>+	fl-&gt;c.flc_owner = filp;</div><div class='add'>+	fl-&gt;c.flc_pid = current-&gt;tgid;</div><div class='ctx'> </div><div class='del'>-	fl-&gt;fl_file = filp;</div><div class='del'>-	fl-&gt;fl_flags = FL_LEASE;</div><div class='del'>-	fl-&gt;fl_start = 0;</div><div class='del'>-	fl-&gt;fl_end = OFFSET_MAX;</div><div class='del'>-	fl-&gt;fl_ops = NULL;</div><div class='add'>+	fl-&gt;c.flc_file = filp;</div><div class='add'>+	fl-&gt;c.flc_flags = flags;</div><div class='ctx'> 	fl-&gt;fl_lmops = &amp;lease_manager_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate a file_lock initialised to this type of lease */</div><div class='del'>-static struct file_lock *lease_alloc(struct file *filp, int type)</div><div class='add'>+static struct file_lease *lease_alloc(struct file *filp, unsigned int flags, int type)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl = locks_alloc_lock();</div><div class='add'>+	struct file_lease *fl = locks_alloc_lease();</div><div class='ctx'> 	int error = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (fl == NULL)</div><div class='ctx'> 		return ERR_PTR(error);</div><div class='ctx'> </div><div class='del'>-	error = lease_init(filp, type, fl);</div><div class='add'>+	error = lease_init(filp, flags, type, fl);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		locks_free_lease(fl);</div><div class='ctx'> 		return ERR_PTR(error);</div><div class='ctx'> 	}</div><div class='ctx'> 	return fl;</div><div class='hunk'>@@ -593,26 +627,26 @@ static inline int locks_overlap(struct file_lock *fl1, struct file_lock *fl2)</div><div class='ctx'> /*</div><div class='ctx'>  * Check whether two locks have the same owner.</div><div class='ctx'>  */</div><div class='del'>-static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)</div><div class='add'>+static int posix_same_owner(struct file_lock_core *fl1, struct file_lock_core *fl2)</div><div class='ctx'> {</div><div class='del'>-	return fl1-&gt;fl_owner == fl2-&gt;fl_owner;</div><div class='add'>+	return fl1-&gt;flc_owner == fl2-&gt;flc_owner;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with the flc_lock held! */</div><div class='del'>-static void locks_insert_global_locks(struct file_lock *fl)</div><div class='add'>+static void locks_insert_global_locks(struct file_lock_core *flc)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock_list_struct *fll = this_cpu_ptr(&amp;file_lock_list);</div><div class='ctx'> </div><div class='ctx'> 	percpu_rwsem_assert_held(&amp;file_rwsem);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fll-&gt;lock);</div><div class='del'>-	fl-&gt;fl_link_cpu = smp_processor_id();</div><div class='del'>-	hlist_add_head(&amp;fl-&gt;fl_link, &amp;fll-&gt;hlist);</div><div class='add'>+	flc-&gt;flc_link_cpu = smp_processor_id();</div><div class='add'>+	hlist_add_head(&amp;flc-&gt;flc_link, &amp;fll-&gt;hlist);</div><div class='ctx'> 	spin_unlock(&amp;fll-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with the flc_lock held! */</div><div class='del'>-static void locks_delete_global_locks(struct file_lock *fl)</div><div class='add'>+static void locks_delete_global_locks(struct file_lock_core *flc)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock_list_struct *fll;</div><div class='ctx'> </div><div class='hunk'>@@ -623,33 +657,33 @@ static void locks_delete_global_locks(struct file_lock *fl)</div><div class='ctx'> 	 * is done while holding the flc_lock, and new insertions into the list</div><div class='ctx'> 	 * also require that it be held.</div><div class='ctx'> 	 */</div><div class='del'>-	if (hlist_unhashed(&amp;fl-&gt;fl_link))</div><div class='add'>+	if (hlist_unhashed(&amp;flc-&gt;flc_link))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fll = per_cpu_ptr(&amp;file_lock_list, fl-&gt;fl_link_cpu);</div><div class='add'>+	fll = per_cpu_ptr(&amp;file_lock_list, flc-&gt;flc_link_cpu);</div><div class='ctx'> 	spin_lock(&amp;fll-&gt;lock);</div><div class='del'>-	hlist_del_init(&amp;fl-&gt;fl_link);</div><div class='add'>+	hlist_del_init(&amp;flc-&gt;flc_link);</div><div class='ctx'> 	spin_unlock(&amp;fll-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='del'>-posix_owner_key(struct file_lock *fl)</div><div class='add'>+posix_owner_key(struct file_lock_core *flc)</div><div class='ctx'> {</div><div class='del'>-	return (unsigned long)fl-&gt;fl_owner;</div><div class='add'>+	return (unsigned long) flc-&gt;flc_owner;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locks_insert_global_blocked(struct file_lock *waiter)</div><div class='add'>+static void locks_insert_global_blocked(struct file_lock_core *waiter)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;blocked_lock_lock);</div><div class='ctx'> </div><div class='del'>-	hash_add(blocked_hash, &amp;waiter-&gt;fl_link, posix_owner_key(waiter));</div><div class='add'>+	hash_add(blocked_hash, &amp;waiter-&gt;flc_link, posix_owner_key(waiter));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void locks_delete_global_blocked(struct file_lock *waiter)</div><div class='add'>+static void locks_delete_global_blocked(struct file_lock_core *waiter)</div><div class='ctx'> {</div><div class='ctx'> 	lockdep_assert_held(&amp;blocked_lock_lock);</div><div class='ctx'> </div><div class='del'>-	hash_del(&amp;waiter-&gt;fl_link);</div><div class='add'>+	hash_del(&amp;waiter-&gt;flc_link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove waiter from blocker's block list.</div><div class='hunk'>@@ -657,41 +691,39 @@ static void locks_delete_global_blocked(struct file_lock *waiter)</div><div class='ctx'>  *</div><div class='ctx'>  * Must be called with blocked_lock_lock held.</div><div class='ctx'>  */</div><div class='del'>-static void __locks_delete_block(struct file_lock *waiter)</div><div class='add'>+static void __locks_unlink_block(struct file_lock_core *waiter)</div><div class='ctx'> {</div><div class='ctx'> 	locks_delete_global_blocked(waiter);</div><div class='del'>-	list_del_init(&amp;waiter-&gt;fl_blocked_member);</div><div class='add'>+	list_del_init(&amp;waiter-&gt;flc_blocked_member);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __locks_wake_up_blocks(struct file_lock *blocker)</div><div class='add'>+static void __locks_wake_up_blocks(struct file_lock_core *blocker)</div><div class='ctx'> {</div><div class='del'>-	while (!list_empty(&amp;blocker-&gt;fl_blocked_requests)) {</div><div class='del'>-		struct file_lock *waiter;</div><div class='add'>+	while (!list_empty(&amp;blocker-&gt;flc_blocked_requests)) {</div><div class='add'>+		struct file_lock_core *waiter;</div><div class='add'>+		struct file_lock *fl;</div><div class='add'>+</div><div class='add'>+		waiter = list_first_entry(&amp;blocker-&gt;flc_blocked_requests,</div><div class='add'>+					  struct file_lock_core, flc_blocked_member);</div><div class='ctx'> </div><div class='del'>-		waiter = list_first_entry(&amp;blocker-&gt;fl_blocked_requests,</div><div class='del'>-					  struct file_lock, fl_blocked_member);</div><div class='del'>-		__locks_delete_block(waiter);</div><div class='del'>-		if (waiter-&gt;fl_lmops &amp;&amp; waiter-&gt;fl_lmops-&gt;lm_notify)</div><div class='del'>-			waiter-&gt;fl_lmops-&gt;lm_notify(waiter);</div><div class='add'>+		fl = file_lock(waiter);</div><div class='add'>+		__locks_unlink_block(waiter);</div><div class='add'>+		if ((waiter-&gt;flc_flags &amp; (FL_POSIX | FL_FLOCK)) &amp;&amp;</div><div class='add'>+		    fl-&gt;fl_lmops &amp;&amp; fl-&gt;fl_lmops-&gt;lm_notify)</div><div class='add'>+			fl-&gt;fl_lmops-&gt;lm_notify(fl);</div><div class='ctx'> 		else</div><div class='del'>-			wake_up(&amp;waiter-&gt;fl_wait);</div><div class='add'>+			locks_wake_up_waiter(waiter);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * The setting of fl_blocker to NULL marks the "done"</div><div class='add'>+		 * The setting of flc_blocker to NULL marks the "done"</div><div class='ctx'> 		 * point in deleting a block. Paired with acquire at the top</div><div class='ctx'> 		 * of locks_delete_block().</div><div class='ctx'> 		 */</div><div class='del'>-		smp_store_release(&amp;waiter-&gt;fl_blocker, NULL);</div><div class='add'>+		smp_store_release(&amp;waiter-&gt;flc_blocker, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	locks_delete_block - stop waiting for a file lock</div><div class='del'>- *	@waiter: the lock which was waiting</div><div class='del'>- *</div><div class='del'>- *	lockd/nfsd need to disconnect the lock while working on it.</div><div class='del'>- */</div><div class='del'>-int locks_delete_block(struct file_lock *waiter)</div><div class='add'>+static int __locks_delete_block(struct file_lock_core *waiter)</div><div class='ctx'> {</div><div class='ctx'> 	int status = -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -716,24 +748,35 @@ int locks_delete_block(struct file_lock *waiter)</div><div class='ctx'> 	 * no new locks can be inserted into its fl_blocked_requests list, and</div><div class='ctx'> 	 * can avoid doing anything further if the list is empty.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!smp_load_acquire(&amp;waiter-&gt;fl_blocker) &amp;&amp;</div><div class='del'>-	    list_empty(&amp;waiter-&gt;fl_blocked_requests))</div><div class='add'>+	if (!smp_load_acquire(&amp;waiter-&gt;flc_blocker) &amp;&amp;</div><div class='add'>+	    list_empty(&amp;waiter-&gt;flc_blocked_requests))</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;blocked_lock_lock);</div><div class='del'>-	if (waiter-&gt;fl_blocker)</div><div class='add'>+	if (waiter-&gt;flc_blocker)</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 	__locks_wake_up_blocks(waiter);</div><div class='del'>-	__locks_delete_block(waiter);</div><div class='add'>+	__locks_unlink_block(waiter);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The setting of fl_blocker to NULL marks the "done" point in deleting</div><div class='ctx'> 	 * a block. Paired with acquire at the top of this function.</div><div class='ctx'> 	 */</div><div class='del'>-	smp_store_release(&amp;waiter-&gt;fl_blocker, NULL);</div><div class='add'>+	smp_store_release(&amp;waiter-&gt;flc_blocker, NULL);</div><div class='ctx'> 	spin_unlock(&amp;blocked_lock_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	locks_delete_block - stop waiting for a file lock</div><div class='add'>+ *	@waiter: the lock which was waiting</div><div class='add'>+ *</div><div class='add'>+ *	lockd/nfsd need to disconnect the lock while working on it.</div><div class='add'>+ */</div><div class='add'>+int locks_delete_block(struct file_lock *waiter)</div><div class='add'>+{</div><div class='add'>+	return __locks_delete_block(&amp;waiter-&gt;c);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(locks_delete_block);</div><div class='ctx'> </div><div class='ctx'> /* Insert waiter into blocker's block list.</div><div class='hunk'>@@ -751,26 +794,28 @@ EXPORT_SYMBOL(locks_delete_block);</div><div class='ctx'>  * waiters, and add beneath any waiter that blocks the new waiter.</div><div class='ctx'>  * Thus wakeups don't happen until needed.</div><div class='ctx'>  */</div><div class='del'>-static void __locks_insert_block(struct file_lock *blocker,</div><div class='del'>-				 struct file_lock *waiter,</div><div class='del'>-				 bool conflict(struct file_lock *,</div><div class='del'>-					       struct file_lock *))</div><div class='add'>+static void __locks_insert_block(struct file_lock_core *blocker,</div><div class='add'>+				 struct file_lock_core *waiter,</div><div class='add'>+				 bool conflict(struct file_lock_core *,</div><div class='add'>+					       struct file_lock_core *))</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='del'>-	BUG_ON(!list_empty(&amp;waiter-&gt;fl_blocked_member));</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='add'>+	BUG_ON(!list_empty(&amp;waiter-&gt;flc_blocked_member));</div><div class='ctx'> new_blocker:</div><div class='del'>-	list_for_each_entry(fl, &amp;blocker-&gt;fl_blocked_requests, fl_blocked_member)</div><div class='del'>-		if (conflict(fl, waiter)) {</div><div class='del'>-			blocker =  fl;</div><div class='add'>+	list_for_each_entry(flc, &amp;blocker-&gt;flc_blocked_requests, flc_blocked_member)</div><div class='add'>+		if (conflict(flc, waiter)) {</div><div class='add'>+			blocker =  flc;</div><div class='ctx'> 			goto new_blocker;</div><div class='ctx'> 		}</div><div class='del'>-	waiter-&gt;fl_blocker = blocker;</div><div class='del'>-	list_add_tail(&amp;waiter-&gt;fl_blocked_member, &amp;blocker-&gt;fl_blocked_requests);</div><div class='del'>-	if (IS_POSIX(blocker) &amp;&amp; !IS_OFDLCK(blocker))</div><div class='add'>+	waiter-&gt;flc_blocker = blocker;</div><div class='add'>+	list_add_tail(&amp;waiter-&gt;flc_blocked_member,</div><div class='add'>+		      &amp;blocker-&gt;flc_blocked_requests);</div><div class='add'>+</div><div class='add'>+	if ((blocker-&gt;flc_flags &amp; (FL_POSIX|FL_OFDLCK)) == FL_POSIX)</div><div class='ctx'> 		locks_insert_global_blocked(waiter);</div><div class='ctx'> </div><div class='del'>-	/* The requests in waiter-&gt;fl_blocked are known to conflict with</div><div class='add'>+	/* The requests in waiter-&gt;flc_blocked are known to conflict with</div><div class='ctx'> 	 * waiter, but might not conflict with blocker, or the requests</div><div class='ctx'> 	 * and lock which block it.  So they all need to be woken.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -778,10 +823,10 @@ new_blocker:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with flc_lock held. */</div><div class='del'>-static void locks_insert_block(struct file_lock *blocker,</div><div class='del'>-			       struct file_lock *waiter,</div><div class='del'>-			       bool conflict(struct file_lock *,</div><div class='del'>-					     struct file_lock *))</div><div class='add'>+static void locks_insert_block(struct file_lock_core *blocker,</div><div class='add'>+			       struct file_lock_core *waiter,</div><div class='add'>+			       bool conflict(struct file_lock_core *,</div><div class='add'>+					     struct file_lock_core *))</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;blocked_lock_lock);</div><div class='ctx'> 	__locks_insert_block(blocker, waiter, conflict);</div><div class='hunk'>@@ -793,7 +838,7 @@ static void locks_insert_block(struct file_lock *blocker,</div><div class='ctx'>  *</div><div class='ctx'>  * Must be called with the inode-&gt;flc_lock held!</div><div class='ctx'>  */</div><div class='del'>-static void locks_wake_up_blocks(struct file_lock *blocker)</div><div class='add'>+static void locks_wake_up_blocks(struct file_lock_core *blocker)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Avoid taking global lock if list is empty. This is safe since new</div><div class='hunk'>@@ -802,7 +847,7 @@ static void locks_wake_up_blocks(struct file_lock *blocker)</div><div class='ctx'> 	 * fl_blocked_requests list does not require the flc_lock, so we must</div><div class='ctx'> 	 * recheck list_empty() after acquiring the blocked_lock_lock.</div><div class='ctx'> 	 */</div><div class='del'>-	if (list_empty(&amp;blocker-&gt;fl_blocked_requests))</div><div class='add'>+	if (list_empty(&amp;blocker-&gt;flc_blocked_requests))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;blocked_lock_lock);</div><div class='hunk'>@@ -811,39 +856,39 @@ static void locks_wake_up_blocks(struct file_lock *blocker)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-locks_insert_lock_ctx(struct file_lock *fl, struct list_head *before)</div><div class='add'>+locks_insert_lock_ctx(struct file_lock_core *fl, struct list_head *before)</div><div class='ctx'> {</div><div class='del'>-	list_add_tail(&amp;fl-&gt;fl_list, before);</div><div class='add'>+	list_add_tail(&amp;fl-&gt;flc_list, before);</div><div class='ctx'> 	locks_insert_global_locks(fl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-locks_unlink_lock_ctx(struct file_lock *fl)</div><div class='add'>+locks_unlink_lock_ctx(struct file_lock_core *fl)</div><div class='ctx'> {</div><div class='ctx'> 	locks_delete_global_locks(fl);</div><div class='del'>-	list_del_init(&amp;fl-&gt;fl_list);</div><div class='add'>+	list_del_init(&amp;fl-&gt;flc_list);</div><div class='ctx'> 	locks_wake_up_blocks(fl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-locks_delete_lock_ctx(struct file_lock *fl, struct list_head *dispose)</div><div class='add'>+locks_delete_lock_ctx(struct file_lock_core *fl, struct list_head *dispose)</div><div class='ctx'> {</div><div class='ctx'> 	locks_unlink_lock_ctx(fl);</div><div class='ctx'> 	if (dispose)</div><div class='del'>-		list_add(&amp;fl-&gt;fl_list, dispose);</div><div class='add'>+		list_add(&amp;fl-&gt;flc_list, dispose);</div><div class='ctx'> 	else</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		locks_free_lock(file_lock(fl));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Determine if lock sys_fl blocks lock caller_fl. Common functionality</div><div class='ctx'>  * checks for shared/exclusive status of overlapping locks.</div><div class='ctx'>  */</div><div class='del'>-static bool locks_conflict(struct file_lock *caller_fl,</div><div class='del'>-			   struct file_lock *sys_fl)</div><div class='add'>+static bool locks_conflict(struct file_lock_core *caller_flc,</div><div class='add'>+			   struct file_lock_core *sys_flc)</div><div class='ctx'> {</div><div class='del'>-	if (sys_fl-&gt;fl_type == F_WRLCK)</div><div class='add'>+	if (sys_flc-&gt;flc_type == F_WRLCK)</div><div class='ctx'> 		return true;</div><div class='del'>-	if (caller_fl-&gt;fl_type == F_WRLCK)</div><div class='add'>+	if (caller_flc-&gt;flc_type == F_WRLCK)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -851,20 +896,23 @@ static bool locks_conflict(struct file_lock *caller_fl,</div><div class='ctx'> /* Determine if lock sys_fl blocks lock caller_fl. POSIX specific</div><div class='ctx'>  * checking before calling the locks_conflict().</div><div class='ctx'>  */</div><div class='del'>-static bool posix_locks_conflict(struct file_lock *caller_fl,</div><div class='del'>-				 struct file_lock *sys_fl)</div><div class='add'>+static bool posix_locks_conflict(struct file_lock_core *caller_flc,</div><div class='add'>+				 struct file_lock_core *sys_flc)</div><div class='ctx'> {</div><div class='add'>+	struct file_lock *caller_fl = file_lock(caller_flc);</div><div class='add'>+	struct file_lock *sys_fl = file_lock(sys_flc);</div><div class='add'>+</div><div class='ctx'> 	/* POSIX locks owned by the same process do not conflict with</div><div class='ctx'> 	 * each other.</div><div class='ctx'> 	 */</div><div class='del'>-	if (posix_same_owner(caller_fl, sys_fl))</div><div class='add'>+	if (posix_same_owner(caller_flc, sys_flc))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether they overlap */</div><div class='ctx'> 	if (!locks_overlap(caller_fl, sys_fl))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return locks_conflict(caller_fl, sys_fl);</div><div class='add'>+	return locks_conflict(caller_flc, sys_flc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Determine if lock sys_fl blocks lock caller_fl. Used on xx_GETLK</div><div class='hunk'>@@ -873,28 +921,31 @@ static bool posix_locks_conflict(struct file_lock *caller_fl,</div><div class='ctx'> static bool posix_test_locks_conflict(struct file_lock *caller_fl,</div><div class='ctx'> 				      struct file_lock *sys_fl)</div><div class='ctx'> {</div><div class='add'>+	struct file_lock_core *caller = &amp;caller_fl-&gt;c;</div><div class='add'>+	struct file_lock_core *sys = &amp;sys_fl-&gt;c;</div><div class='add'>+</div><div class='ctx'> 	/* F_UNLCK checks any locks on the same fd. */</div><div class='del'>-	if (caller_fl-&gt;fl_type == F_UNLCK) {</div><div class='del'>-		if (!posix_same_owner(caller_fl, sys_fl))</div><div class='add'>+	if (lock_is_unlock(caller_fl)) {</div><div class='add'>+		if (!posix_same_owner(caller, sys))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		return locks_overlap(caller_fl, sys_fl);</div><div class='ctx'> 	}</div><div class='del'>-	return posix_locks_conflict(caller_fl, sys_fl);</div><div class='add'>+	return posix_locks_conflict(caller, sys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Determine if lock sys_fl blocks lock caller_fl. FLOCK specific</div><div class='ctx'>  * checking before calling the locks_conflict().</div><div class='ctx'>  */</div><div class='del'>-static bool flock_locks_conflict(struct file_lock *caller_fl,</div><div class='del'>-				 struct file_lock *sys_fl)</div><div class='add'>+static bool flock_locks_conflict(struct file_lock_core *caller_flc,</div><div class='add'>+				 struct file_lock_core *sys_flc)</div><div class='ctx'> {</div><div class='ctx'> 	/* FLOCK locks referring to the same filp do not conflict with</div><div class='ctx'> 	 * each other.</div><div class='ctx'> 	 */</div><div class='del'>-	if (caller_fl-&gt;fl_file == sys_fl-&gt;fl_file)</div><div class='add'>+	if (caller_flc-&gt;flc_file == sys_flc-&gt;flc_file)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return locks_conflict(caller_fl, sys_fl);</div><div class='add'>+	return locks_conflict(caller_flc, sys_flc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -908,13 +959,13 @@ posix_test_lock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	ctx = locks_inode_context(inode);</div><div class='ctx'> 	if (!ctx || list_empty_careful(&amp;ctx-&gt;flc_posix)) {</div><div class='del'>-		fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+		fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry(cfl, &amp;ctx-&gt;flc_posix, fl_list) {</div><div class='add'>+	list_for_each_entry(cfl, &amp;ctx-&gt;flc_posix, c.flc_list) {</div><div class='ctx'> 		if (!posix_test_locks_conflict(fl, cfl))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (cfl-&gt;fl_lmops &amp;&amp; cfl-&gt;fl_lmops-&gt;lm_lock_expirable</div><div class='hunk'>@@ -930,7 +981,7 @@ retry:</div><div class='ctx'> 		locks_copy_conflock(fl, cfl);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+	fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -972,25 +1023,27 @@ EXPORT_SYMBOL(posix_test_lock);</div><div class='ctx'> </div><div class='ctx'> #define MAX_DEADLK_ITERATIONS 10</div><div class='ctx'> </div><div class='del'>-/* Find a lock that the owner of the given block_fl is blocking on. */</div><div class='del'>-static struct file_lock *what_owner_is_waiting_for(struct file_lock *block_fl)</div><div class='add'>+/* Find a lock that the owner of the given @blocker is blocking on. */</div><div class='add'>+static struct file_lock_core *what_owner_is_waiting_for(struct file_lock_core *blocker)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='del'>-	hash_for_each_possible(blocked_hash, fl, fl_link, posix_owner_key(block_fl)) {</div><div class='del'>-		if (posix_same_owner(fl, block_fl)) {</div><div class='del'>-			while (fl-&gt;fl_blocker)</div><div class='del'>-				fl = fl-&gt;fl_blocker;</div><div class='del'>-			return fl;</div><div class='add'>+	hash_for_each_possible(blocked_hash, flc, flc_link, posix_owner_key(blocker)) {</div><div class='add'>+		if (posix_same_owner(flc, blocker)) {</div><div class='add'>+			while (flc-&gt;flc_blocker)</div><div class='add'>+				flc = flc-&gt;flc_blocker;</div><div class='add'>+			return flc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with the blocked_lock_lock held! */</div><div class='del'>-static int posix_locks_deadlock(struct file_lock *caller_fl,</div><div class='del'>-				struct file_lock *block_fl)</div><div class='add'>+static bool posix_locks_deadlock(struct file_lock *caller_fl,</div><div class='add'>+				 struct file_lock *block_fl)</div><div class='ctx'> {</div><div class='add'>+	struct file_lock_core *caller = &amp;caller_fl-&gt;c;</div><div class='add'>+	struct file_lock_core *blocker = &amp;block_fl-&gt;c;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;blocked_lock_lock);</div><div class='hunk'>@@ -999,16 +1052,16 @@ static int posix_locks_deadlock(struct file_lock *caller_fl,</div><div class='ctx'> 	 * This deadlock detector can't reasonably detect deadlocks with</div><div class='ctx'> 	 * FL_OFDLCK locks, since they aren't owned by a process, per-se.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_OFDLCK(caller_fl))</div><div class='del'>-		return 0;</div><div class='add'>+	if (caller-&gt;flc_flags &amp; FL_OFDLCK)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	while ((block_fl = what_owner_is_waiting_for(block_fl))) {</div><div class='add'>+	while ((blocker = what_owner_is_waiting_for(blocker))) {</div><div class='ctx'> 		if (i++ &gt; MAX_DEADLK_ITERATIONS)</div><div class='del'>-			return 0;</div><div class='del'>-		if (posix_same_owner(caller_fl, block_fl))</div><div class='del'>-			return 1;</div><div class='add'>+			return false;</div><div class='add'>+		if (posix_same_owner(caller, blocker))</div><div class='add'>+			return true;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Try to create a FLOCK lock on filp. We always insert new FLOCK locks</div><div class='hunk'>@@ -1027,14 +1080,14 @@ static int flock_lock_inode(struct inode *inode, struct file_lock *request)</div><div class='ctx'> 	bool found = false;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> </div><div class='del'>-	ctx = locks_get_lock_context(inode, request-&gt;fl_type);</div><div class='add'>+	ctx = locks_get_lock_context(inode, request-&gt;c.flc_type);</div><div class='ctx'> 	if (!ctx) {</div><div class='del'>-		if (request-&gt;fl_type != F_UNLCK)</div><div class='add'>+		if (request-&gt;c.flc_type != F_UNLCK)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		return (request-&gt;fl_flags &amp; FL_EXISTS) ? -ENOENT : 0;</div><div class='add'>+		return (request-&gt;c.flc_flags &amp; FL_EXISTS) ? -ENOENT : 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(request-&gt;fl_flags &amp; FL_ACCESS) &amp;&amp; (request-&gt;fl_type != F_UNLCK)) {</div><div class='add'>+	if (!(request-&gt;c.flc_flags &amp; FL_ACCESS) &amp;&amp; (request-&gt;c.flc_type != F_UNLCK)) {</div><div class='ctx'> 		new_fl = locks_alloc_lock();</div><div class='ctx'> 		if (!new_fl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -1042,41 +1095,41 @@ static int flock_lock_inode(struct inode *inode, struct file_lock *request)</div><div class='ctx'> </div><div class='ctx'> 	percpu_down_read(&amp;file_rwsem);</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	if (request-&gt;fl_flags &amp; FL_ACCESS)</div><div class='add'>+	if (request-&gt;c.flc_flags &amp; FL_ACCESS)</div><div class='ctx'> 		goto find_conflict;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_flock, fl_list) {</div><div class='del'>-		if (request-&gt;fl_file != fl-&gt;fl_file)</div><div class='add'>+	list_for_each_entry(fl, &amp;ctx-&gt;flc_flock, c.flc_list) {</div><div class='add'>+		if (request-&gt;c.flc_file != fl-&gt;c.flc_file)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (request-&gt;fl_type == fl-&gt;fl_type)</div><div class='add'>+		if (request-&gt;c.flc_type == fl-&gt;c.flc_type)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		found = true;</div><div class='del'>-		locks_delete_lock_ctx(fl, &amp;dispose);</div><div class='add'>+		locks_delete_lock_ctx(&amp;fl-&gt;c, &amp;dispose);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request-&gt;fl_type == F_UNLCK) {</div><div class='del'>-		if ((request-&gt;fl_flags &amp; FL_EXISTS) &amp;&amp; !found)</div><div class='add'>+	if (lock_is_unlock(request)) {</div><div class='add'>+		if ((request-&gt;c.flc_flags &amp; FL_EXISTS) &amp;&amp; !found)</div><div class='ctx'> 			error = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> find_conflict:</div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_flock, fl_list) {</div><div class='del'>-		if (!flock_locks_conflict(request, fl))</div><div class='add'>+	list_for_each_entry(fl, &amp;ctx-&gt;flc_flock, c.flc_list) {</div><div class='add'>+		if (!flock_locks_conflict(&amp;request-&gt;c, &amp;fl-&gt;c))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		error = -EAGAIN;</div><div class='del'>-		if (!(request-&gt;fl_flags &amp; FL_SLEEP))</div><div class='add'>+		if (!(request-&gt;c.flc_flags &amp; FL_SLEEP))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		error = FILE_LOCK_DEFERRED;</div><div class='del'>-		locks_insert_block(fl, request, flock_locks_conflict);</div><div class='add'>+		locks_insert_block(&amp;fl-&gt;c, &amp;request-&gt;c, flock_locks_conflict);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (request-&gt;fl_flags &amp; FL_ACCESS)</div><div class='add'>+	if (request-&gt;c.flc_flags &amp; FL_ACCESS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	locks_copy_lock(new_fl, request);</div><div class='ctx'> 	locks_move_blocks(new_fl, request);</div><div class='del'>-	locks_insert_lock_ctx(new_fl, &amp;ctx-&gt;flc_flock);</div><div class='add'>+	locks_insert_lock_ctx(&amp;new_fl-&gt;c, &amp;ctx-&gt;flc_flock);</div><div class='ctx'> 	new_fl = NULL;</div><div class='ctx'> 	error = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1105,9 +1158,9 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,</div><div class='ctx'> 	void *owner;</div><div class='ctx'> 	void (*func)(void);</div><div class='ctx'> </div><div class='del'>-	ctx = locks_get_lock_context(inode, request-&gt;fl_type);</div><div class='add'>+	ctx = locks_get_lock_context(inode, request-&gt;c.flc_type);</div><div class='ctx'> 	if (!ctx)</div><div class='del'>-		return (request-&gt;fl_type == F_UNLCK) ? 0 : -ENOMEM;</div><div class='add'>+		return lock_is_unlock(request) ? 0 : -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We may need two file_lock structures for this operation,</div><div class='hunk'>@@ -1115,8 +1168,8 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * In some cases we can be sure, that no new locks will be needed</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(request-&gt;fl_flags &amp; FL_ACCESS) &amp;&amp;</div><div class='del'>-	    (request-&gt;fl_type != F_UNLCK ||</div><div class='add'>+	if (!(request-&gt;c.flc_flags &amp; FL_ACCESS) &amp;&amp;</div><div class='add'>+	    (request-&gt;c.flc_type != F_UNLCK ||</div><div class='ctx'> 	     request-&gt;fl_start != 0 || request-&gt;fl_end != OFFSET_MAX)) {</div><div class='ctx'> 		new_fl = locks_alloc_lock();</div><div class='ctx'> 		new_fl2 = locks_alloc_lock();</div><div class='hunk'>@@ -1130,9 +1183,9 @@ retry:</div><div class='ctx'> 	 * there are any, either return error or put the request on the</div><div class='ctx'> 	 * blocker's list of waiters and the global blocked_hash.</div><div class='ctx'> 	 */</div><div class='del'>-	if (request-&gt;fl_type != F_UNLCK) {</div><div class='del'>-		list_for_each_entry(fl, &amp;ctx-&gt;flc_posix, fl_list) {</div><div class='del'>-			if (!posix_locks_conflict(request, fl))</div><div class='add'>+	if (request-&gt;c.flc_type != F_UNLCK) {</div><div class='add'>+		list_for_each_entry(fl, &amp;ctx-&gt;flc_posix, c.flc_list) {</div><div class='add'>+			if (!posix_locks_conflict(&amp;request-&gt;c, &amp;fl-&gt;c))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (fl-&gt;fl_lmops &amp;&amp; fl-&gt;fl_lmops-&gt;lm_lock_expirable</div><div class='ctx'> 				&amp;&amp; (*fl-&gt;fl_lmops-&gt;lm_lock_expirable)(fl)) {</div><div class='hunk'>@@ -1148,7 +1201,7 @@ retry:</div><div class='ctx'> 			if (conflock)</div><div class='ctx'> 				locks_copy_conflock(conflock, fl);</div><div class='ctx'> 			error = -EAGAIN;</div><div class='del'>-			if (!(request-&gt;fl_flags &amp; FL_SLEEP))</div><div class='add'>+			if (!(request-&gt;c.flc_flags &amp; FL_SLEEP))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Deadlock detection and insertion into the blocked</div><div class='hunk'>@@ -1160,10 +1213,10 @@ retry:</div><div class='ctx'> 			 * Ensure that we don't find any locks blocked on this</div><div class='ctx'> 			 * request during deadlock detection.</div><div class='ctx'> 			 */</div><div class='del'>-			__locks_wake_up_blocks(request);</div><div class='add'>+			__locks_wake_up_blocks(&amp;request-&gt;c);</div><div class='ctx'> 			if (likely(!posix_locks_deadlock(request, fl))) {</div><div class='ctx'> 				error = FILE_LOCK_DEFERRED;</div><div class='del'>-				__locks_insert_block(fl, request,</div><div class='add'>+				__locks_insert_block(&amp;fl-&gt;c, &amp;request-&gt;c,</div><div class='ctx'> 						     posix_locks_conflict);</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock(&amp;blocked_lock_lock);</div><div class='hunk'>@@ -1173,22 +1226,22 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	/* If we're just looking for a conflict, we're done. */</div><div class='ctx'> 	error = 0;</div><div class='del'>-	if (request-&gt;fl_flags &amp; FL_ACCESS)</div><div class='add'>+	if (request-&gt;c.flc_flags &amp; FL_ACCESS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Find the first old lock with the same owner as the new lock */</div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_posix, fl_list) {</div><div class='del'>-		if (posix_same_owner(request, fl))</div><div class='add'>+	list_for_each_entry(fl, &amp;ctx-&gt;flc_posix, c.flc_list) {</div><div class='add'>+		if (posix_same_owner(&amp;request-&gt;c, &amp;fl-&gt;c))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Process locks with this owner. */</div><div class='del'>-	list_for_each_entry_safe_from(fl, tmp, &amp;ctx-&gt;flc_posix, fl_list) {</div><div class='del'>-		if (!posix_same_owner(request, fl))</div><div class='add'>+	list_for_each_entry_safe_from(fl, tmp, &amp;ctx-&gt;flc_posix, c.flc_list) {</div><div class='add'>+		if (!posix_same_owner(&amp;request-&gt;c, &amp;fl-&gt;c))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* Detect adjacent or overlapping regions (if same lock type) */</div><div class='del'>-		if (request-&gt;fl_type == fl-&gt;fl_type) {</div><div class='add'>+		if (request-&gt;c.flc_type == fl-&gt;c.flc_type) {</div><div class='ctx'> 			/* In all comparisons of start vs end, use</div><div class='ctx'> 			 * "start - 1" rather than "end + 1". If end</div><div class='ctx'> 			 * is OFFSET_MAX, end + 1 will become negative.</div><div class='hunk'>@@ -1215,7 +1268,7 @@ retry:</div><div class='ctx'> 			else</div><div class='ctx'> 				request-&gt;fl_end = fl-&gt;fl_end;</div><div class='ctx'> 			if (added) {</div><div class='del'>-				locks_delete_lock_ctx(fl, &amp;dispose);</div><div class='add'>+				locks_delete_lock_ctx(&amp;fl-&gt;c, &amp;dispose);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			request = fl;</div><div class='hunk'>@@ -1228,7 +1281,7 @@ retry:</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (fl-&gt;fl_start &gt; request-&gt;fl_end)</div><div class='ctx'> 				break;</div><div class='del'>-			if (request-&gt;fl_type == F_UNLCK)</div><div class='add'>+			if (lock_is_unlock(request))</div><div class='ctx'> 				added = true;</div><div class='ctx'> 			if (fl-&gt;fl_start &lt; request-&gt;fl_start)</div><div class='ctx'> 				left = fl;</div><div class='hunk'>@@ -1244,7 +1297,7 @@ retry:</div><div class='ctx'> 				 * one (This may happen several times).</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (added) {</div><div class='del'>-					locks_delete_lock_ctx(fl, &amp;dispose);</div><div class='add'>+					locks_delete_lock_ctx(&amp;fl-&gt;c, &amp;dispose);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -1261,8 +1314,9 @@ retry:</div><div class='ctx'> 				locks_move_blocks(new_fl, request);</div><div class='ctx'> 				request = new_fl;</div><div class='ctx'> 				new_fl = NULL;</div><div class='del'>-				locks_insert_lock_ctx(request, &amp;fl-&gt;fl_list);</div><div class='del'>-				locks_delete_lock_ctx(fl, &amp;dispose);</div><div class='add'>+				locks_insert_lock_ctx(&amp;request-&gt;c,</div><div class='add'>+						      &amp;fl-&gt;c.flc_list);</div><div class='add'>+				locks_delete_lock_ctx(&amp;fl-&gt;c, &amp;dispose);</div><div class='ctx'> 				added = true;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1279,8 +1333,8 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	error = 0;</div><div class='ctx'> 	if (!added) {</div><div class='del'>-		if (request-&gt;fl_type == F_UNLCK) {</div><div class='del'>-			if (request-&gt;fl_flags &amp; FL_EXISTS)</div><div class='add'>+		if (lock_is_unlock(request)) {</div><div class='add'>+			if (request-&gt;c.flc_flags &amp; FL_EXISTS)</div><div class='ctx'> 				error = -ENOENT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1291,7 +1345,7 @@ retry:</div><div class='ctx'> 		}</div><div class='ctx'> 		locks_copy_lock(new_fl, request);</div><div class='ctx'> 		locks_move_blocks(new_fl, request);</div><div class='del'>-		locks_insert_lock_ctx(new_fl, &amp;fl-&gt;fl_list);</div><div class='add'>+		locks_insert_lock_ctx(&amp;new_fl-&gt;c, &amp;fl-&gt;c.flc_list);</div><div class='ctx'> 		fl = new_fl;</div><div class='ctx'> 		new_fl = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1303,19 +1357,19 @@ retry:</div><div class='ctx'> 			left = new_fl2;</div><div class='ctx'> 			new_fl2 = NULL;</div><div class='ctx'> 			locks_copy_lock(left, right);</div><div class='del'>-			locks_insert_lock_ctx(left, &amp;fl-&gt;fl_list);</div><div class='add'>+			locks_insert_lock_ctx(&amp;left-&gt;c, &amp;fl-&gt;c.flc_list);</div><div class='ctx'> 		}</div><div class='ctx'> 		right-&gt;fl_start = request-&gt;fl_end + 1;</div><div class='del'>-		locks_wake_up_blocks(right);</div><div class='add'>+		locks_wake_up_blocks(&amp;right-&gt;c);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (left) {</div><div class='ctx'> 		left-&gt;fl_end = request-&gt;fl_start - 1;</div><div class='del'>-		locks_wake_up_blocks(left);</div><div class='add'>+		locks_wake_up_blocks(&amp;left-&gt;c);</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='add'>+	trace_posix_lock_inode(inode, request, error);</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	percpu_up_read(&amp;file_rwsem);</div><div class='del'>-	trace_posix_lock_inode(inode, request, error);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Free any unused locks.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1364,8 +1418,8 @@ static int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl)</div><div class='ctx'> 		error = posix_lock_inode(inode, fl, NULL);</div><div class='ctx'> 		if (error != FILE_LOCK_DEFERRED)</div><div class='ctx'> 			break;</div><div class='del'>-		error = wait_event_interruptible(fl-&gt;fl_wait,</div><div class='del'>-					list_empty(&amp;fl-&gt;fl_blocked_member));</div><div class='add'>+		error = wait_event_interruptible(fl-&gt;c.flc_wait,</div><div class='add'>+						 list_empty(&amp;fl-&gt;c.flc_blocked_member));</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1373,37 +1427,37 @@ static int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lease_clear_pending(struct file_lock *fl, int arg)</div><div class='add'>+static void lease_clear_pending(struct file_lease *fl, int arg)</div><div class='ctx'> {</div><div class='ctx'> 	switch (arg) {</div><div class='ctx'> 	case F_UNLCK:</div><div class='del'>-		fl-&gt;fl_flags &amp;= ~FL_UNLOCK_PENDING;</div><div class='add'>+		fl-&gt;c.flc_flags &amp;= ~FL_UNLOCK_PENDING;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case F_RDLCK:</div><div class='del'>-		fl-&gt;fl_flags &amp;= ~FL_DOWNGRADE_PENDING;</div><div class='add'>+		fl-&gt;c.flc_flags &amp;= ~FL_DOWNGRADE_PENDING;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We already had a lease on this file; just change its type */</div><div class='del'>-int lease_modify(struct file_lock *fl, int arg, struct list_head *dispose)</div><div class='add'>+int lease_modify(struct file_lease *fl, int arg, struct list_head *dispose)</div><div class='ctx'> {</div><div class='del'>-	int error = assign_type(fl, arg);</div><div class='add'>+	int error = assign_type(&amp;fl-&gt;c, arg);</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	lease_clear_pending(fl, arg);</div><div class='del'>-	locks_wake_up_blocks(fl);</div><div class='add'>+	locks_wake_up_blocks(&amp;fl-&gt;c);</div><div class='ctx'> 	if (arg == F_UNLCK) {</div><div class='del'>-		struct file *filp = fl-&gt;fl_file;</div><div class='add'>+		struct file *filp = fl-&gt;c.flc_file;</div><div class='ctx'> </div><div class='ctx'> 		f_delown(filp);</div><div class='del'>-		filp-&gt;f_owner.signum = 0;</div><div class='del'>-		fasync_helper(0, fl-&gt;fl_file, 0, &amp;fl-&gt;fl_fasync);</div><div class='add'>+		file_f_owner(filp)-&gt;signum = 0;</div><div class='add'>+		fasync_helper(0, fl-&gt;c.flc_file, 0, &amp;fl-&gt;fl_fasync);</div><div class='ctx'> 		if (fl-&gt;fl_fasync != NULL) {</div><div class='ctx'> 			printk(KERN_ERR "locks_delete_lock: fasync == %p\n", fl-&gt;fl_fasync);</div><div class='ctx'> 			fl-&gt;fl_fasync = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		locks_delete_lock_ctx(fl, dispose);</div><div class='add'>+		locks_delete_lock_ctx(&amp;fl-&gt;c, dispose);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1420,11 +1474,11 @@ static bool past_time(unsigned long then)</div><div class='ctx'> static void time_out_leases(struct inode *inode, struct list_head *dispose)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock_context *ctx = inode-&gt;i_flctx;</div><div class='del'>-	struct file_lock *fl, *tmp;</div><div class='add'>+	struct file_lease *fl, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(fl, tmp, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='add'>+	list_for_each_entry_safe(fl, tmp, &amp;ctx-&gt;flc_lease, c.flc_list) {</div><div class='ctx'> 		trace_time_out_leases(inode, fl);</div><div class='ctx'> 		if (past_time(fl-&gt;fl_downgrade_time))</div><div class='ctx'> 			lease_modify(fl, F_RDLCK, dispose);</div><div class='hunk'>@@ -1433,38 +1487,40 @@ static void time_out_leases(struct inode *inode, struct list_head *dispose)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool leases_conflict(struct file_lock *lease, struct file_lock *breaker)</div><div class='add'>+static bool leases_conflict(struct file_lock_core *lc, struct file_lock_core *bc)</div><div class='ctx'> {</div><div class='ctx'> 	bool rc;</div><div class='add'>+	struct file_lease *lease = file_lease(lc);</div><div class='add'>+	struct file_lease *breaker = file_lease(bc);</div><div class='ctx'> </div><div class='ctx'> 	if (lease-&gt;fl_lmops-&gt;lm_breaker_owns_lease</div><div class='ctx'> 			&amp;&amp; lease-&gt;fl_lmops-&gt;lm_breaker_owns_lease(lease))</div><div class='ctx'> 		return false;</div><div class='del'>-	if ((breaker-&gt;fl_flags &amp; FL_LAYOUT) != (lease-&gt;fl_flags &amp; FL_LAYOUT)) {</div><div class='add'>+	if ((bc-&gt;flc_flags &amp; FL_LAYOUT) != (lc-&gt;flc_flags &amp; FL_LAYOUT)) {</div><div class='ctx'> 		rc = false;</div><div class='ctx'> 		goto trace;</div><div class='ctx'> 	}</div><div class='del'>-	if ((breaker-&gt;fl_flags &amp; FL_DELEG) &amp;&amp; (lease-&gt;fl_flags &amp; FL_LEASE)) {</div><div class='add'>+	if ((bc-&gt;flc_flags &amp; FL_DELEG) &amp;&amp; (lc-&gt;flc_flags &amp; FL_LEASE)) {</div><div class='ctx'> 		rc = false;</div><div class='ctx'> 		goto trace;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = locks_conflict(breaker, lease);</div><div class='add'>+	rc = locks_conflict(bc, lc);</div><div class='ctx'> trace:</div><div class='ctx'> 	trace_leases_conflict(rc, lease, breaker);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-any_leases_conflict(struct inode *inode, struct file_lock *breaker)</div><div class='add'>+any_leases_conflict(struct inode *inode, struct file_lease *breaker)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock_context *ctx = inode-&gt;i_flctx;</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='del'>-		if (leases_conflict(fl, breaker))</div><div class='add'>+	list_for_each_entry(flc, &amp;ctx-&gt;flc_lease, flc_list) {</div><div class='add'>+		if (leases_conflict(flc, &amp;breaker-&gt;c))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1473,29 +1529,35 @@ any_leases_conflict(struct inode *inode, struct file_lock *breaker)</div><div class='ctx'> /**</div><div class='ctx'>  *	__break_lease	-	revoke all outstanding leases on file</div><div class='ctx'>  *	@inode: the inode of the file to return</div><div class='del'>- *	@mode: O_RDONLY: break only write leases; O_WRONLY or O_RDWR:</div><div class='del'>- *	    break all leases</div><div class='del'>- *	@type: FL_LEASE: break leases and delegations; FL_DELEG: break</div><div class='del'>- *	    only delegations</div><div class='add'>+ *	@flags: LEASE_BREAK_* flags</div><div class='ctx'>  *</div><div class='ctx'>  *	break_lease (inlined for speed) has checked there already is at least</div><div class='ctx'>  *	some kind of lock (maybe a lease) on this file.  Leases are broken on</div><div class='del'>- *	a call to open() or truncate().  This function can sleep unless you</div><div class='del'>- *	specified %O_NONBLOCK to your open().</div><div class='add'>+ *	a call to open() or truncate().  This function can block waiting for the</div><div class='add'>+ *	lease break unless you specify LEASE_BREAK_NONBLOCK.</div><div class='ctx'>  */</div><div class='del'>-int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)</div><div class='add'>+int __break_lease(struct inode *inode, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='add'>+	struct file_lease *new_fl, *fl, *tmp;</div><div class='ctx'> 	struct file_lock_context *ctx;</div><div class='del'>-	struct file_lock *new_fl, *fl, *tmp;</div><div class='ctx'> 	unsigned long break_time;</div><div class='del'>-	int want_write = (mode &amp; O_ACCMODE) != O_RDONLY;</div><div class='add'>+	unsigned int type;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='add'>+	bool want_write = !(flags &amp; LEASE_BREAK_OPEN_RDONLY);</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='del'>-	new_fl = lease_alloc(NULL, want_write ? F_WRLCK : F_RDLCK);</div><div class='add'>+	if (flags &amp; LEASE_BREAK_LEASE)</div><div class='add'>+		type = FL_LEASE;</div><div class='add'>+	else if (flags &amp; LEASE_BREAK_DELEG)</div><div class='add'>+		type = FL_DELEG;</div><div class='add'>+	else if (flags &amp; LEASE_BREAK_LAYOUT)</div><div class='add'>+		type = FL_LAYOUT;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	new_fl = lease_alloc(NULL, type, want_write ? F_WRLCK : F_RDLCK);</div><div class='ctx'> 	if (IS_ERR(new_fl))</div><div class='ctx'> 		return PTR_ERR(new_fl);</div><div class='del'>-	new_fl-&gt;fl_flags = type;</div><div class='ctx'> </div><div class='ctx'> 	/* typically we will check that ctx is non-NULL before calling */</div><div class='ctx'> 	ctx = locks_inode_context(inode);</div><div class='hunk'>@@ -1519,54 +1581,54 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)</div><div class='ctx'> 			break_time++;	/* so that 0 means no break time */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(fl, tmp, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='del'>-		if (!leases_conflict(fl, new_fl))</div><div class='add'>+	list_for_each_entry_safe(fl, tmp, &amp;ctx-&gt;flc_lease, c.flc_list) {</div><div class='add'>+		if (!leases_conflict(&amp;fl-&gt;c, &amp;new_fl-&gt;c))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (want_write) {</div><div class='del'>-			if (fl-&gt;fl_flags &amp; FL_UNLOCK_PENDING)</div><div class='add'>+			if (fl-&gt;c.flc_flags &amp; FL_UNLOCK_PENDING)</div><div class='ctx'> 				continue;</div><div class='del'>-			fl-&gt;fl_flags |= FL_UNLOCK_PENDING;</div><div class='add'>+			fl-&gt;c.flc_flags |= FL_UNLOCK_PENDING;</div><div class='ctx'> 			fl-&gt;fl_break_time = break_time;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (lease_breaking(fl))</div><div class='ctx'> 				continue;</div><div class='del'>-			fl-&gt;fl_flags |= FL_DOWNGRADE_PENDING;</div><div class='add'>+			fl-&gt;c.flc_flags |= FL_DOWNGRADE_PENDING;</div><div class='ctx'> 			fl-&gt;fl_downgrade_time = break_time;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (fl-&gt;fl_lmops-&gt;lm_break(fl))</div><div class='del'>-			locks_delete_lock_ctx(fl, &amp;dispose);</div><div class='add'>+			locks_delete_lock_ctx(&amp;fl-&gt;c, &amp;dispose);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;ctx-&gt;flc_lease))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (mode &amp; O_NONBLOCK) {</div><div class='add'>+	if (flags &amp; LEASE_BREAK_NONBLOCK) {</div><div class='ctx'> 		trace_break_lease_noblock(inode, new_fl);</div><div class='ctx'> 		error = -EWOULDBLOCK;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> restart:</div><div class='del'>-	fl = list_first_entry(&amp;ctx-&gt;flc_lease, struct file_lock, fl_list);</div><div class='add'>+	fl = list_first_entry(&amp;ctx-&gt;flc_lease, struct file_lease, c.flc_list);</div><div class='ctx'> 	break_time = fl-&gt;fl_break_time;</div><div class='ctx'> 	if (break_time != 0)</div><div class='ctx'> 		break_time -= jiffies;</div><div class='ctx'> 	if (break_time == 0)</div><div class='ctx'> 		break_time++;</div><div class='del'>-	locks_insert_block(fl, new_fl, leases_conflict);</div><div class='add'>+	locks_insert_block(&amp;fl-&gt;c, &amp;new_fl-&gt;c, leases_conflict);</div><div class='ctx'> 	trace_break_lease_block(inode, new_fl);</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	percpu_up_read(&amp;file_rwsem);</div><div class='ctx'> </div><div class='ctx'> 	locks_dispose_list(&amp;dispose);</div><div class='del'>-	error = wait_event_interruptible_timeout(new_fl-&gt;fl_wait,</div><div class='del'>-					list_empty(&amp;new_fl-&gt;fl_blocked_member),</div><div class='del'>-					break_time);</div><div class='add'>+	error = wait_event_interruptible_timeout(new_fl-&gt;c.flc_wait,</div><div class='add'>+						 list_empty(&amp;new_fl-&gt;c.flc_blocked_member),</div><div class='add'>+						 break_time);</div><div class='ctx'> </div><div class='ctx'> 	percpu_down_read(&amp;file_rwsem);</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	trace_break_lease_unblock(inode, new_fl);</div><div class='del'>-	locks_delete_block(new_fl);</div><div class='add'>+	__locks_delete_block(&amp;new_fl-&gt;c);</div><div class='ctx'> 	if (error &gt;= 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait for the next conflicting lease that has not been</div><div class='hunk'>@@ -1583,7 +1645,7 @@ out:</div><div class='ctx'> 	percpu_up_read(&amp;file_rwsem);</div><div class='ctx'> 	locks_dispose_list(&amp;dispose);</div><div class='ctx'> free_lock:</div><div class='del'>-	locks_free_lock(new_fl);</div><div class='add'>+	locks_free_lease(new_fl);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__break_lease);</div><div class='hunk'>@@ -1601,14 +1663,14 @@ void lease_get_mtime(struct inode *inode, struct timespec64 *time)</div><div class='ctx'> {</div><div class='ctx'> 	bool has_lease = false;</div><div class='ctx'> 	struct file_lock_context *ctx;</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *flc;</div><div class='ctx'> </div><div class='ctx'> 	ctx = locks_inode_context(inode);</div><div class='ctx'> 	if (ctx &amp;&amp; !list_empty_careful(&amp;ctx-&gt;flc_lease)) {</div><div class='ctx'> 		spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-		fl = list_first_entry_or_null(&amp;ctx-&gt;flc_lease,</div><div class='del'>-					      struct file_lock, fl_list);</div><div class='del'>-		if (fl &amp;&amp; (fl-&gt;fl_type == F_WRLCK))</div><div class='add'>+		flc = list_first_entry_or_null(&amp;ctx-&gt;flc_lease,</div><div class='add'>+					       struct file_lock_core, flc_list);</div><div class='add'>+		if (flc &amp;&amp; flc-&gt;flc_type == F_WRLCK)</div><div class='ctx'> 			has_lease = true;</div><div class='ctx'> 		spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1619,8 +1681,9 @@ void lease_get_mtime(struct inode *inode, struct timespec64 *time)</div><div class='ctx'> EXPORT_SYMBOL(lease_get_mtime);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	fcntl_getlease - Enquire what lease is currently active</div><div class='add'>+ *	__fcntl_getlease - Enquire what lease is currently active</div><div class='ctx'>  *	@filp: the file</div><div class='add'>+ *	@flavor: type of lease flags to check</div><div class='ctx'>  *</div><div class='ctx'>  *	The value returned by this function will be one of</div><div class='ctx'>  *	(if no lease break is pending):</div><div class='hunk'>@@ -1641,9 +1704,9 @@ EXPORT_SYMBOL(lease_get_mtime);</div><div class='ctx'>  *	XXX: sfr &amp; willy disagree over whether F_INPROGRESS</div><div class='ctx'>  *	should be returned to userspace.</div><div class='ctx'>  */</div><div class='del'>-int fcntl_getlease(struct file *filp)</div><div class='add'>+static int __fcntl_getlease(struct file *filp, unsigned int flavor)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lease *fl;</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct file_lock_context *ctx;</div><div class='ctx'> 	int type = F_UNLCK;</div><div class='hunk'>@@ -1654,10 +1717,11 @@ int fcntl_getlease(struct file *filp)</div><div class='ctx'> 		percpu_down_read(&amp;file_rwsem);</div><div class='ctx'> 		spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 		time_out_leases(inode, &amp;dispose);</div><div class='del'>-		list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='del'>-			if (fl-&gt;fl_file != filp)</div><div class='add'>+		list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, c.flc_list) {</div><div class='add'>+			if (fl-&gt;c.flc_file != filp)</div><div class='ctx'> 				continue;</div><div class='del'>-			type = target_leasetype(fl);</div><div class='add'>+			if (fl-&gt;c.flc_flags &amp; flavor)</div><div class='add'>+				type = target_leasetype(fl);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='hunk'>@@ -1668,6 +1732,19 @@ int fcntl_getlease(struct file *filp)</div><div class='ctx'> 	return type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int fcntl_getlease(struct file *filp)</div><div class='add'>+{</div><div class='add'>+	return __fcntl_getlease(filp, FL_LEASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fcntl_getdeleg(struct file *filp, struct delegation *deleg)</div><div class='add'>+{</div><div class='add'>+	if (deleg-&gt;d_flags != 0 || deleg-&gt;__pad != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	deleg-&gt;d_type = __fcntl_getlease(filp, FL_DELEG);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * check_conflicting_open - see if the given file points to an inode that has</div><div class='ctx'>  *			    an existing open that would conflict with the</div><div class='hunk'>@@ -1715,18 +1792,22 @@ check_conflicting_open(struct file *filp, const int arg, int flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **priv)</div><div class='add'>+generic_add_lease(struct file *filp, int arg, struct file_lease **flp, void **priv)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl, *my_fl = NULL, *lease;</div><div class='add'>+	struct file_lease *fl, *my_fl = NULL, *lease;</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct file_lock_context *ctx;</div><div class='del'>-	bool is_deleg = (*flp)-&gt;fl_flags &amp; FL_DELEG;</div><div class='add'>+	bool is_deleg = (*flp)-&gt;c.flc_flags &amp; FL_DELEG;</div><div class='ctx'> 	int error;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> </div><div class='ctx'> 	lease = *flp;</div><div class='ctx'> 	trace_generic_add_lease(inode, lease);</div><div class='ctx'> </div><div class='add'>+	error = file_f_owner_allocate(filp);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	/* Note that arg is never F_UNLCK here */</div><div class='ctx'> 	ctx = locks_get_lock_context(inode, arg);</div><div class='ctx'> 	if (!ctx)</div><div class='hunk'>@@ -1734,7 +1815,7 @@ generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **pri</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In the delegation case we need mutual exclusion with</div><div class='del'>-	 * a number of operations that take the i_mutex.  We trylock</div><div class='add'>+	 * a number of operations that take the i_rwsem.  We trylock</div><div class='ctx'> 	 * because delegations are an optional optimization, and if</div><div class='ctx'> 	 * there's some chance of a conflict--we'd rather not</div><div class='ctx'> 	 * bother, maybe that's a sign this just isn't a good file to</div><div class='hunk'>@@ -1746,7 +1827,7 @@ generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **pri</div><div class='ctx'> 	percpu_down_read(&amp;file_rwsem);</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	time_out_leases(inode, &amp;dispose);</div><div class='del'>-	error = check_conflicting_open(filp, arg, lease-&gt;fl_flags);</div><div class='add'>+	error = check_conflicting_open(filp, arg, lease-&gt;c.flc_flags);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1759,9 +1840,9 @@ generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **pri</div><div class='ctx'> 	 * except for this filp.</div><div class='ctx'> 	 */</div><div class='ctx'> 	error = -EAGAIN;</div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='del'>-		if (fl-&gt;fl_file == filp &amp;&amp;</div><div class='del'>-		    fl-&gt;fl_owner == lease-&gt;fl_owner) {</div><div class='add'>+	list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, c.flc_list) {</div><div class='add'>+		if (fl-&gt;c.flc_file == filp &amp;&amp;</div><div class='add'>+		    fl-&gt;c.flc_owner == lease-&gt;c.flc_owner) {</div><div class='ctx'> 			my_fl = fl;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1776,7 +1857,7 @@ generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **pri</div><div class='ctx'> 		 * Modifying our existing lease is OK, but no getting a</div><div class='ctx'> 		 * new lease if someone else is opening for write:</div><div class='ctx'> 		 */</div><div class='del'>-		if (fl-&gt;fl_flags &amp; FL_UNLOCK_PENDING)</div><div class='add'>+		if (fl-&gt;c.flc_flags &amp; FL_UNLOCK_PENDING)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1792,7 +1873,7 @@ generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **pri</div><div class='ctx'> 	if (!leases_enable)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	locks_insert_lock_ctx(lease, &amp;ctx-&gt;flc_lease);</div><div class='add'>+	locks_insert_lock_ctx(&amp;lease-&gt;c, &amp;ctx-&gt;flc_lease);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The check in break_lease() is lockless. It's possible for another</div><div class='ctx'> 	 * open to race in after we did the earlier check for a conflicting</div><div class='hunk'>@@ -1803,9 +1884,9 @@ generic_add_lease(struct file *filp, int arg, struct file_lock **flp, void **pri</div><div class='ctx'> 	 * precedes these checks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	error = check_conflicting_open(filp, arg, lease-&gt;fl_flags);</div><div class='add'>+	error = check_conflicting_open(filp, arg, lease-&gt;c.flc_flags);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		locks_unlink_lock_ctx(lease);</div><div class='add'>+		locks_unlink_lock_ctx(&amp;lease-&gt;c);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1826,7 +1907,7 @@ out:</div><div class='ctx'> static int generic_delete_lease(struct file *filp, void *owner)</div><div class='ctx'> {</div><div class='ctx'> 	int error = -EAGAIN;</div><div class='del'>-	struct file_lock *fl, *victim = NULL;</div><div class='add'>+	struct file_lease *fl, *victim = NULL;</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct file_lock_context *ctx;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='hunk'>@@ -1839,9 +1920,9 @@ static int generic_delete_lease(struct file *filp, void *owner)</div><div class='ctx'> </div><div class='ctx'> 	percpu_down_read(&amp;file_rwsem);</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='del'>-		if (fl-&gt;fl_file == filp &amp;&amp;</div><div class='del'>-		    fl-&gt;fl_owner == owner) {</div><div class='add'>+	list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, c.flc_list) {</div><div class='add'>+		if (fl-&gt;c.flc_file == filp &amp;&amp;</div><div class='add'>+		    fl-&gt;c.flc_owner == owner) {</div><div class='ctx'> 			victim = fl;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1866,26 +1947,22 @@ static int generic_delete_lease(struct file *filp, void *owner)</div><div class='ctx'>  *	The (input) flp-&gt;fl_lmops-&gt;lm_break function is required</div><div class='ctx'>  *	by break_lease().</div><div class='ctx'>  */</div><div class='del'>-int generic_setlease(struct file *filp, int arg, struct file_lock **flp,</div><div class='add'>+int generic_setlease(struct file *filp, int arg, struct file_lease **flp,</div><div class='ctx'> 			void **priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='del'>-	vfsuid_t vfsuid = i_uid_into_vfsuid(file_mnt_idmap(filp), inode);</div><div class='del'>-	int error;</div><div class='ctx'> </div><div class='del'>-	if ((!vfsuid_eq_kuid(vfsuid, current_fsuid())) &amp;&amp; !capable(CAP_LEASE))</div><div class='del'>-		return -EACCES;</div><div class='del'>-	if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode) &amp;&amp; !S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	error = security_file_lock(filp, arg);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='ctx'> </div><div class='ctx'> 	switch (arg) {</div><div class='ctx'> 	case F_UNLCK:</div><div class='ctx'> 		return generic_delete_lease(filp, *priv);</div><div class='del'>-	case F_RDLCK:</div><div class='ctx'> 	case F_WRLCK:</div><div class='add'>+		if (S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case F_RDLCK:</div><div class='ctx'> 		if (!(*flp)-&gt;fl_lmops-&gt;lm_break) {</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 			return -ENOLCK;</div><div class='hunk'>@@ -1913,7 +1990,7 @@ lease_notifier_chain_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-setlease_notifier(int arg, struct file_lock *lease)</div><div class='add'>+setlease_notifier(int arg, struct file_lease *lease)</div><div class='ctx'> {</div><div class='ctx'> 	if (arg != F_UNLCK)</div><div class='ctx'> 		srcu_notifier_call_chain(&amp;lease_notifier_chain, arg, lease);</div><div class='hunk'>@@ -1931,6 +2008,19 @@ void lease_unregister_notifier(struct notifier_block *nb)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lease_unregister_notifier);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+kernel_setlease(struct file *filp, int arg, struct file_lease **lease, void **priv)</div><div class='add'>+{</div><div class='add'>+	if (lease)</div><div class='add'>+		setlease_notifier(arg, *lease);</div><div class='add'>+	if (filp-&gt;f_op-&gt;setlease)</div><div class='add'>+		return filp-&gt;f_op-&gt;setlease(filp, arg, lease, priv);</div><div class='add'>+	else</div><div class='add'>+		return generic_setlease(filp, arg, lease, priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kernel_setlease);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * vfs_setlease        -       sets a lease on an open file</div><div class='ctx'>  * @filp:	file pointer</div><div class='hunk'>@@ -1949,37 +2039,41 @@ EXPORT_SYMBOL_GPL(lease_unregister_notifier);</div><div class='ctx'>  * may be NULL if the lm_setup operation doesn't require it.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-vfs_setlease(struct file *filp, int arg, struct file_lock **lease, void **priv)</div><div class='add'>+vfs_setlease(struct file *filp, int arg, struct file_lease **lease, void **priv)</div><div class='ctx'> {</div><div class='del'>-	if (lease)</div><div class='del'>-		setlease_notifier(arg, *lease);</div><div class='del'>-	if (filp-&gt;f_op-&gt;setlease)</div><div class='del'>-		return filp-&gt;f_op-&gt;setlease(filp, arg, lease, priv);</div><div class='del'>-	else</div><div class='del'>-		return generic_setlease(filp, arg, lease, priv);</div><div class='add'>+	struct inode *inode = file_inode(filp);</div><div class='add'>+	vfsuid_t vfsuid = i_uid_into_vfsuid(file_mnt_idmap(filp), inode);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if ((!vfsuid_eq_kuid(vfsuid, current_fsuid())) &amp;&amp; !capable(CAP_LEASE))</div><div class='add'>+		return -EACCES;</div><div class='add'>+	error = security_file_lock(filp, arg);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	return kernel_setlease(filp, arg, lease, priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vfs_setlease);</div><div class='ctx'> </div><div class='del'>-static int do_fcntl_add_lease(unsigned int fd, struct file *filp, int arg)</div><div class='add'>+static int do_fcntl_add_lease(unsigned int fd, struct file *filp, unsigned int flavor, int arg)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lease *fl;</div><div class='ctx'> 	struct fasync_struct *new;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	fl = lease_alloc(filp, arg);</div><div class='add'>+	fl = lease_alloc(filp, flavor, arg);</div><div class='ctx'> 	if (IS_ERR(fl))</div><div class='ctx'> 		return PTR_ERR(fl);</div><div class='ctx'> </div><div class='ctx'> 	new = fasync_alloc();</div><div class='ctx'> 	if (!new) {</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		locks_free_lease(fl);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	new-&gt;fa_fd = fd;</div><div class='ctx'> </div><div class='ctx'> 	error = vfs_setlease(filp, arg, &amp;fl, (void **)&amp;new);</div><div class='ctx'> 	if (fl)</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		locks_free_lease(fl);</div><div class='ctx'> 	if (new)</div><div class='ctx'> 		fasync_free(new);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -1997,9 +2091,33 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, int arg)</div><div class='ctx'>  */</div><div class='ctx'> int fcntl_setlease(unsigned int fd, struct file *filp, int arg)</div><div class='ctx'> {</div><div class='add'>+	if (S_ISDIR(file_inode(filp)-&gt;i_mode))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (arg == F_UNLCK)</div><div class='ctx'> 		return vfs_setlease(filp, F_UNLCK, NULL, (void **)&amp;filp);</div><div class='del'>-	return do_fcntl_add_lease(fd, filp, arg);</div><div class='add'>+	return do_fcntl_add_lease(fd, filp, FL_LEASE, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	fcntl_setdeleg	-	sets a delegation on an open file</div><div class='add'>+ *	@fd: open file descriptor</div><div class='add'>+ *	@filp: file pointer</div><div class='add'>+ *	@deleg: delegation request from userland</div><div class='add'>+ *</div><div class='add'>+ *	Call this fcntl to establish a delegation on the file.</div><div class='add'>+ *	Note that you also need to call %F_SETSIG to</div><div class='add'>+ *	receive a signal when the lease is broken.</div><div class='add'>+ */</div><div class='add'>+int fcntl_setdeleg(unsigned int fd, struct file *filp, struct delegation *deleg)</div><div class='add'>+{</div><div class='add'>+	/* For now, no flags are supported */</div><div class='add'>+	if (deleg-&gt;d_flags != 0 || deleg-&gt;__pad != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (deleg-&gt;d_type == F_UNLCK)</div><div class='add'>+		return vfs_setlease(filp, F_UNLCK, NULL, (void **)&amp;filp);</div><div class='add'>+	return do_fcntl_add_lease(fd, filp, FL_DELEG, deleg-&gt;d_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2017,8 +2135,8 @@ static int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl)</div><div class='ctx'> 		error = flock_lock_inode(inode, fl);</div><div class='ctx'> 		if (error != FILE_LOCK_DEFERRED)</div><div class='ctx'> 			break;</div><div class='del'>-		error = wait_event_interruptible(fl-&gt;fl_wait,</div><div class='del'>-				list_empty(&amp;fl-&gt;fl_blocked_member));</div><div class='add'>+		error = wait_event_interruptible(fl-&gt;c.flc_wait,</div><div class='add'>+						 list_empty(&amp;fl-&gt;c.flc_blocked_member));</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2036,7 +2154,7 @@ static int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl)</div><div class='ctx'> int locks_lock_inode_wait(struct inode *inode, struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	int res = 0;</div><div class='del'>-	switch (fl-&gt;fl_flags &amp; (FL_POSIX|FL_FLOCK)) {</div><div class='add'>+	switch (fl-&gt;c.flc_flags &amp; (FL_POSIX|FL_FLOCK)) {</div><div class='ctx'> 		case FL_POSIX:</div><div class='ctx'> 			res = posix_lock_inode_wait(inode, fl);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2069,7 +2187,6 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int can_sleep, error, type;</div><div class='ctx'> 	struct file_lock fl;</div><div class='del'>-	struct fd f;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * LOCK_MAND locks were broken for a long time in that they never</div><div class='hunk'>@@ -2088,35 +2205,31 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)</div><div class='ctx'> 	if (type &lt; 0)</div><div class='ctx'> 		return type;</div><div class='ctx'> </div><div class='del'>-	error = -EBADF;</div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (!f.file)</div><div class='del'>-		return error;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (type != F_UNLCK &amp;&amp; !(f.file-&gt;f_mode &amp; (FMODE_READ | FMODE_WRITE)))</div><div class='del'>-		goto out_putf;</div><div class='add'>+	if (type != F_UNLCK &amp;&amp; !(fd_file(f)-&gt;f_mode &amp; (FMODE_READ | FMODE_WRITE)))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	flock_make_lock(f.file, &amp;fl, type);</div><div class='add'>+	flock_make_lock(fd_file(f), &amp;fl, type);</div><div class='ctx'> </div><div class='del'>-	error = security_file_lock(f.file, fl.fl_type);</div><div class='add'>+	error = security_file_lock(fd_file(f), fl.c.flc_type);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out_putf;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	can_sleep = !(cmd &amp; LOCK_NB);</div><div class='ctx'> 	if (can_sleep)</div><div class='del'>-		fl.fl_flags |= FL_SLEEP;</div><div class='add'>+		fl.c.flc_flags |= FL_SLEEP;</div><div class='ctx'> </div><div class='del'>-	if (f.file-&gt;f_op-&gt;flock)</div><div class='del'>-		error = f.file-&gt;f_op-&gt;flock(f.file,</div><div class='add'>+	if (fd_file(f)-&gt;f_op-&gt;flock)</div><div class='add'>+		error = fd_file(f)-&gt;f_op-&gt;flock(fd_file(f),</div><div class='ctx'> 					    (can_sleep) ? F_SETLKW : F_SETLK,</div><div class='ctx'> 					    &amp;fl);</div><div class='ctx'> 	else</div><div class='del'>-		error = locks_lock_file_wait(f.file, &amp;fl);</div><div class='add'>+		error = locks_lock_file_wait(fd_file(f), &amp;fl);</div><div class='ctx'> </div><div class='ctx'> 	locks_release_private(&amp;fl);</div><div class='del'>- out_putf:</div><div class='del'>-	fdput(f);</div><div class='del'>-</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2130,7 +2243,7 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)</div><div class='ctx'>  */</div><div class='ctx'> int vfs_test_lock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(filp != fl-&gt;fl_file);</div><div class='add'>+	WARN_ON_ONCE(filp != fl-&gt;c.flc_file);</div><div class='ctx'> 	if (filp-&gt;f_op-&gt;lock)</div><div class='ctx'> 		return filp-&gt;f_op-&gt;lock(filp, F_GETLK, fl);</div><div class='ctx'> 	posix_test_lock(filp, fl);</div><div class='hunk'>@@ -2145,25 +2258,28 @@ EXPORT_SYMBOL_GPL(vfs_test_lock);</div><div class='ctx'>  *</div><div class='ctx'>  * Used to translate a fl_pid into a namespace virtual pid number</div><div class='ctx'>  */</div><div class='del'>-static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns)</div><div class='add'>+static pid_t locks_translate_pid(struct file_lock_core *fl, struct pid_namespace *ns)</div><div class='ctx'> {</div><div class='ctx'> 	pid_t vnr;</div><div class='ctx'> 	struct pid *pid;</div><div class='ctx'> </div><div class='del'>-	if (IS_OFDLCK(fl))</div><div class='add'>+	if (fl-&gt;flc_flags &amp; FL_OFDLCK)</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (IS_REMOTELCK(fl))</div><div class='del'>-		return fl-&gt;fl_pid;</div><div class='add'>+</div><div class='add'>+	/* Remote locks report a negative pid value */</div><div class='add'>+	if (fl-&gt;flc_pid &lt;= 0)</div><div class='add'>+		return fl-&gt;flc_pid;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the flock owner process is dead and its pid has been already</div><div class='ctx'> 	 * freed, the translation below won't work, but we still want to show</div><div class='ctx'> 	 * flock owner pid number in init pidns.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ns == &amp;init_pid_ns)</div><div class='del'>-		return (pid_t)fl-&gt;fl_pid;</div><div class='add'>+		return (pid_t) fl-&gt;flc_pid;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	pid = find_pid_ns(fl-&gt;fl_pid, &amp;init_pid_ns);</div><div class='add'>+	pid = find_pid_ns(fl-&gt;flc_pid, &amp;init_pid_ns);</div><div class='ctx'> 	vnr = pid_nr_ns(pid, ns);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return vnr;</div><div class='hunk'>@@ -2171,7 +2287,7 @@ static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns)</div><div class='ctx'> </div><div class='ctx'> static int posix_lock_to_flock(struct flock *flock, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	flock-&gt;l_pid = locks_translate_pid(fl, task_active_pid_ns(current));</div><div class='add'>+	flock-&gt;l_pid = locks_translate_pid(&amp;fl-&gt;c, task_active_pid_ns(current));</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure we can represent the posix lock via</div><div class='hunk'>@@ -2186,19 +2302,19 @@ static int posix_lock_to_flock(struct flock *flock, struct file_lock *fl)</div><div class='ctx'> 	flock-&gt;l_len = fl-&gt;fl_end == OFFSET_MAX ? 0 :</div><div class='ctx'> 		fl-&gt;fl_end - fl-&gt;fl_start + 1;</div><div class='ctx'> 	flock-&gt;l_whence = 0;</div><div class='del'>-	flock-&gt;l_type = fl-&gt;fl_type;</div><div class='add'>+	flock-&gt;l_type = fl-&gt;c.flc_type;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='ctx'> static void posix_lock_to_flock64(struct flock64 *flock, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	flock-&gt;l_pid = locks_translate_pid(fl, task_active_pid_ns(current));</div><div class='add'>+	flock-&gt;l_pid = locks_translate_pid(&amp;fl-&gt;c, task_active_pid_ns(current));</div><div class='ctx'> 	flock-&gt;l_start = fl-&gt;fl_start;</div><div class='ctx'> 	flock-&gt;l_len = fl-&gt;fl_end == OFFSET_MAX ? 0 :</div><div class='ctx'> 		fl-&gt;fl_end - fl-&gt;fl_start + 1;</div><div class='ctx'> 	flock-&gt;l_whence = 0;</div><div class='del'>-	flock-&gt;l_type = fl-&gt;fl_type;</div><div class='add'>+	flock-&gt;l_type = fl-&gt;c.flc_type;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2227,16 +2343,16 @@ int fcntl_getlk(struct file *filp, unsigned int cmd, struct flock *flock)</div><div class='ctx'> 		if (flock-&gt;l_pid != 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		fl-&gt;fl_flags |= FL_OFDLCK;</div><div class='del'>-		fl-&gt;fl_owner = filp;</div><div class='add'>+		fl-&gt;c.flc_flags |= FL_OFDLCK;</div><div class='add'>+		fl-&gt;c.flc_owner = filp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = vfs_test_lock(filp, fl);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	flock-&gt;l_type = fl-&gt;fl_type;</div><div class='del'>-	if (fl-&gt;fl_type != F_UNLCK) {</div><div class='add'>+	flock-&gt;l_type = fl-&gt;c.flc_type;</div><div class='add'>+	if (fl-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 		error = posix_lock_to_flock(flock, fl);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -2263,8 +2379,8 @@ out:</div><div class='ctx'>  * To avoid blocking kernel daemons, such as lockd, that need to acquire POSIX</div><div class='ctx'>  * locks, the -&gt;lock() interface may return asynchronously, before the lock has</div><div class='ctx'>  * been granted or denied by the underlying filesystem, if (and only if)</div><div class='del'>- * lm_grant is set. Additionally EXPORT_OP_ASYNC_LOCK in export_operations</div><div class='del'>- * flags need to be set.</div><div class='add'>+ * lm_grant is set. Additionally FOP_ASYNC_LOCK in file_operations fop_flags</div><div class='add'>+ * need to be set.</div><div class='ctx'>  *</div><div class='ctx'>  * Callers expecting -&gt;lock() to return asynchronously will only use F_SETLK,</div><div class='ctx'>  * not F_SETLKW; they will set FL_SLEEP if (and only if) the request is for a</div><div class='hunk'>@@ -2283,7 +2399,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> int vfs_lock_file(struct file *filp, unsigned int cmd, struct file_lock *fl, struct file_lock *conf)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(filp != fl-&gt;fl_file);</div><div class='add'>+	WARN_ON_ONCE(filp != fl-&gt;c.flc_file);</div><div class='ctx'> 	if (filp-&gt;f_op-&gt;lock)</div><div class='ctx'> 		return filp-&gt;f_op-&gt;lock(filp, cmd, fl);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2296,7 +2412,7 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd,</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = security_file_lock(filp, fl-&gt;fl_type);</div><div class='add'>+	error = security_file_lock(filp, fl-&gt;c.flc_type);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -2304,8 +2420,8 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd,</div><div class='ctx'> 		error = vfs_lock_file(filp, cmd, fl, NULL);</div><div class='ctx'> 		if (error != FILE_LOCK_DEFERRED)</div><div class='ctx'> 			break;</div><div class='del'>-		error = wait_event_interruptible(fl-&gt;fl_wait,</div><div class='del'>-					list_empty(&amp;fl-&gt;fl_blocked_member));</div><div class='add'>+		error = wait_event_interruptible(fl-&gt;c.flc_wait,</div><div class='add'>+						 list_empty(&amp;fl-&gt;c.flc_blocked_member));</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2318,13 +2434,13 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd,</div><div class='ctx'> static int</div><div class='ctx'> check_fmode_for_setlk(struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	switch (fl-&gt;fl_type) {</div><div class='add'>+	switch (fl-&gt;c.flc_type) {</div><div class='ctx'> 	case F_RDLCK:</div><div class='del'>-		if (!(fl-&gt;fl_file-&gt;f_mode &amp; FMODE_READ))</div><div class='add'>+		if (!(fl-&gt;c.flc_file-&gt;f_mode &amp; FMODE_READ))</div><div class='ctx'> 			return -EBADF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_WRLCK:</div><div class='del'>-		if (!(fl-&gt;fl_file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		if (!(fl-&gt;c.flc_file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 			return -EBADF;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2363,8 +2479,8 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		cmd = F_SETLK;</div><div class='del'>-		file_lock-&gt;fl_flags |= FL_OFDLCK;</div><div class='del'>-		file_lock-&gt;fl_owner = filp;</div><div class='add'>+		file_lock-&gt;c.flc_flags |= FL_OFDLCK;</div><div class='add'>+		file_lock-&gt;c.flc_owner = filp;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_OFD_SETLKW:</div><div class='ctx'> 		error = -EINVAL;</div><div class='hunk'>@@ -2372,22 +2488,23 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		cmd = F_SETLKW;</div><div class='del'>-		file_lock-&gt;fl_flags |= FL_OFDLCK;</div><div class='del'>-		file_lock-&gt;fl_owner = filp;</div><div class='add'>+		file_lock-&gt;c.flc_flags |= FL_OFDLCK;</div><div class='add'>+		file_lock-&gt;c.flc_owner = filp;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case F_SETLKW:</div><div class='del'>-		file_lock-&gt;fl_flags |= FL_SLEEP;</div><div class='add'>+		file_lock-&gt;c.flc_flags |= FL_SLEEP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = do_lock_file_wait(filp, cmd, file_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Attempt to detect a close/fcntl race and recover by releasing the</div><div class='del'>-	 * lock that was just acquired. There is no need to do that when we're</div><div class='add'>+	 * Detect close/fcntl races and recover by zapping all POSIX locks</div><div class='add'>+	 * associated with this file and our files_struct, just like on</div><div class='add'>+	 * filp_flush(). There is no need to do that when we're</div><div class='ctx'> 	 * unlocking though, or for OFD locks.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!error &amp;&amp; file_lock-&gt;fl_type != F_UNLCK &amp;&amp;</div><div class='del'>-	    !(file_lock-&gt;fl_flags &amp; FL_OFDLCK)) {</div><div class='add'>+	if (!error &amp;&amp; file_lock-&gt;c.flc_type != F_UNLCK &amp;&amp;</div><div class='add'>+	    !(file_lock-&gt;c.flc_flags &amp; FL_OFDLCK)) {</div><div class='ctx'> 		struct files_struct *files = current-&gt;files;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need that spin_lock here - it prevents reordering between</div><div class='hunk'>@@ -2398,9 +2515,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,</div><div class='ctx'> 		f = files_lookup_fd_locked(files, fd);</div><div class='ctx'> 		spin_unlock(&amp;files-&gt;file_lock);</div><div class='ctx'> 		if (f != filp) {</div><div class='del'>-			file_lock-&gt;fl_type = F_UNLCK;</div><div class='del'>-			error = do_lock_file_wait(filp, cmd, file_lock);</div><div class='del'>-			WARN_ON_ONCE(error);</div><div class='add'>+			locks_remove_posix(filp, files);</div><div class='ctx'> 			error = -EBADF;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2437,16 +2552,16 @@ int fcntl_getlk64(struct file *filp, unsigned int cmd, struct flock64 *flock)</div><div class='ctx'> 		if (flock-&gt;l_pid != 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		fl-&gt;fl_flags |= FL_OFDLCK;</div><div class='del'>-		fl-&gt;fl_owner = filp;</div><div class='add'>+		fl-&gt;c.flc_flags |= FL_OFDLCK;</div><div class='add'>+		fl-&gt;c.flc_owner = filp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = vfs_test_lock(filp, fl);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	flock-&gt;l_type = fl-&gt;fl_type;</div><div class='del'>-	if (fl-&gt;fl_type != F_UNLCK)</div><div class='add'>+	flock-&gt;l_type = fl-&gt;c.flc_type;</div><div class='add'>+	if (fl-&gt;c.flc_type != F_UNLCK)</div><div class='ctx'> 		posix_lock_to_flock64(flock, fl);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -2486,8 +2601,8 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		cmd = F_SETLK64;</div><div class='del'>-		file_lock-&gt;fl_flags |= FL_OFDLCK;</div><div class='del'>-		file_lock-&gt;fl_owner = filp;</div><div class='add'>+		file_lock-&gt;c.flc_flags |= FL_OFDLCK;</div><div class='add'>+		file_lock-&gt;c.flc_owner = filp;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case F_OFD_SETLKW:</div><div class='ctx'> 		error = -EINVAL;</div><div class='hunk'>@@ -2495,22 +2610,23 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		cmd = F_SETLKW64;</div><div class='del'>-		file_lock-&gt;fl_flags |= FL_OFDLCK;</div><div class='del'>-		file_lock-&gt;fl_owner = filp;</div><div class='add'>+		file_lock-&gt;c.flc_flags |= FL_OFDLCK;</div><div class='add'>+		file_lock-&gt;c.flc_owner = filp;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case F_SETLKW64:</div><div class='del'>-		file_lock-&gt;fl_flags |= FL_SLEEP;</div><div class='add'>+		file_lock-&gt;c.flc_flags |= FL_SLEEP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = do_lock_file_wait(filp, cmd, file_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Attempt to detect a close/fcntl race and recover by releasing the</div><div class='del'>-	 * lock that was just acquired. There is no need to do that when we're</div><div class='add'>+	 * Detect close/fcntl races and recover by zapping all POSIX locks</div><div class='add'>+	 * associated with this file and our files_struct, just like on</div><div class='add'>+	 * filp_flush(). There is no need to do that when we're</div><div class='ctx'> 	 * unlocking though, or for OFD locks.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!error &amp;&amp; file_lock-&gt;fl_type != F_UNLCK &amp;&amp;</div><div class='del'>-	    !(file_lock-&gt;fl_flags &amp; FL_OFDLCK)) {</div><div class='add'>+	if (!error &amp;&amp; file_lock-&gt;c.flc_type != F_UNLCK &amp;&amp;</div><div class='add'>+	    !(file_lock-&gt;c.flc_flags &amp; FL_OFDLCK)) {</div><div class='ctx'> 		struct files_struct *files = current-&gt;files;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need that spin_lock here - it prevents reordering between</div><div class='hunk'>@@ -2521,9 +2637,7 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,</div><div class='ctx'> 		f = files_lookup_fd_locked(files, fd);</div><div class='ctx'> 		spin_unlock(&amp;files-&gt;file_lock);</div><div class='ctx'> 		if (f != filp) {</div><div class='del'>-			file_lock-&gt;fl_type = F_UNLCK;</div><div class='del'>-			error = do_lock_file_wait(filp, cmd, file_lock);</div><div class='del'>-			WARN_ON_ONCE(error);</div><div class='add'>+			locks_remove_posix(filp, files);</div><div class='ctx'> 			error = -EBADF;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2555,13 +2669,13 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	locks_init_lock(&amp;lock);</div><div class='del'>-	lock.fl_type = F_UNLCK;</div><div class='del'>-	lock.fl_flags = FL_POSIX | FL_CLOSE;</div><div class='add'>+	lock.c.flc_type = F_UNLCK;</div><div class='add'>+	lock.c.flc_flags = FL_POSIX | FL_CLOSE;</div><div class='ctx'> 	lock.fl_start = 0;</div><div class='ctx'> 	lock.fl_end = OFFSET_MAX;</div><div class='del'>-	lock.fl_owner = owner;</div><div class='del'>-	lock.fl_pid = current-&gt;tgid;</div><div class='del'>-	lock.fl_file = filp;</div><div class='add'>+	lock.c.flc_owner = owner;</div><div class='add'>+	lock.c.flc_pid = current-&gt;tgid;</div><div class='add'>+	lock.c.flc_file = filp;</div><div class='ctx'> 	lock.fl_ops = NULL;</div><div class='ctx'> 	lock.fl_lmops = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -2584,7 +2698,7 @@ locks_remove_flock(struct file *filp, struct file_lock_context *flctx)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	flock_make_lock(filp, &amp;fl, F_UNLCK);</div><div class='del'>-	fl.fl_flags |= FL_CLOSE;</div><div class='add'>+	fl.c.flc_flags |= FL_CLOSE;</div><div class='ctx'> </div><div class='ctx'> 	if (filp-&gt;f_op-&gt;flock)</div><div class='ctx'> 		filp-&gt;f_op-&gt;flock(filp, F_SETLKW, &amp;fl);</div><div class='hunk'>@@ -2599,7 +2713,7 @@ locks_remove_flock(struct file *filp, struct file_lock_context *flctx)</div><div class='ctx'> static void</div><div class='ctx'> locks_remove_lease(struct file *filp, struct file_lock_context *ctx)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl, *tmp;</div><div class='add'>+	struct file_lease *fl, *tmp;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;ctx-&gt;flc_lease))</div><div class='hunk'>@@ -2607,8 +2721,8 @@ locks_remove_lease(struct file *filp, struct file_lock_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	percpu_down_read(&amp;file_rwsem);</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry_safe(fl, tmp, &amp;ctx-&gt;flc_lease, fl_list)</div><div class='del'>-		if (filp == fl-&gt;fl_file)</div><div class='add'>+	list_for_each_entry_safe(fl, tmp, &amp;ctx-&gt;flc_lease, c.flc_list)</div><div class='add'>+		if (filp == fl-&gt;c.flc_file)</div><div class='ctx'> 			lease_modify(fl, F_UNLCK, &amp;dispose);</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='ctx'> 	percpu_up_read(&amp;file_rwsem);</div><div class='hunk'>@@ -2652,7 +2766,7 @@ void locks_remove_file(struct file *filp)</div><div class='ctx'>  */</div><div class='ctx'> int vfs_cancel_lock(struct file *filp, struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(filp != fl-&gt;fl_file);</div><div class='add'>+	WARN_ON_ONCE(filp != fl-&gt;c.flc_file);</div><div class='ctx'> 	if (filp-&gt;f_op-&gt;lock)</div><div class='ctx'> 		return filp-&gt;f_op-&gt;lock(filp, F_CANCELLK, fl);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2691,69 +2805,73 @@ struct locks_iterator {</div><div class='ctx'> 	loff_t	li_pos;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void lock_get_status(struct seq_file *f, struct file_lock *fl,</div><div class='add'>+static void lock_get_status(struct seq_file *f, struct file_lock_core *flc,</div><div class='ctx'> 			    loff_t id, char *pfx, int repeat)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='del'>-	unsigned int fl_pid;</div><div class='add'>+	unsigned int pid;</div><div class='ctx'> 	struct pid_namespace *proc_pidns = proc_pid_ns(file_inode(f-&gt;file)-&gt;i_sb);</div><div class='del'>-	int type;</div><div class='add'>+	int type = flc-&gt;flc_type;</div><div class='add'>+	struct file_lock *fl = file_lock(flc);</div><div class='add'>+</div><div class='add'>+	pid = locks_translate_pid(flc, proc_pidns);</div><div class='ctx'> </div><div class='del'>-	fl_pid = locks_translate_pid(fl, proc_pidns);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If lock owner is dead (and pid is freed) or not visible in current</div><div class='ctx'> 	 * pidns, zero is shown as a pid value. Check lock info from</div><div class='ctx'> 	 * init_pid_ns to get saved lock pid value.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	if (fl-&gt;fl_file != NULL)</div><div class='del'>-		inode = file_inode(fl-&gt;fl_file);</div><div class='add'>+	if (flc-&gt;flc_file != NULL)</div><div class='add'>+		inode = file_inode(flc-&gt;flc_file);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(f, "%lld: ", id);</div><div class='ctx'> </div><div class='ctx'> 	if (repeat)</div><div class='ctx'> 		seq_printf(f, "%*s", repeat - 1 + (int)strlen(pfx), pfx);</div><div class='ctx'> </div><div class='del'>-	if (IS_POSIX(fl)) {</div><div class='del'>-		if (fl-&gt;fl_flags &amp; FL_ACCESS)</div><div class='add'>+	if (flc-&gt;flc_flags &amp; FL_POSIX) {</div><div class='add'>+		if (flc-&gt;flc_flags &amp; FL_ACCESS)</div><div class='ctx'> 			seq_puts(f, "ACCESS");</div><div class='del'>-		else if (IS_OFDLCK(fl))</div><div class='add'>+		else if (flc-&gt;flc_flags &amp; FL_OFDLCK)</div><div class='ctx'> 			seq_puts(f, "OFDLCK");</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(f, "POSIX ");</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(f, " %s ",</div><div class='ctx'> 			     (inode == NULL) ? "*NOINODE*" : "ADVISORY ");</div><div class='del'>-	} else if (IS_FLOCK(fl)) {</div><div class='add'>+	} else if (flc-&gt;flc_flags &amp; FL_FLOCK) {</div><div class='ctx'> 		seq_puts(f, "FLOCK  ADVISORY  ");</div><div class='del'>-	} else if (IS_LEASE(fl)) {</div><div class='del'>-		if (fl-&gt;fl_flags &amp; FL_DELEG)</div><div class='add'>+	} else if (flc-&gt;flc_flags &amp; (FL_LEASE|FL_DELEG|FL_LAYOUT)) {</div><div class='add'>+		struct file_lease *lease = file_lease(flc);</div><div class='add'>+</div><div class='add'>+		type = target_leasetype(lease);</div><div class='add'>+</div><div class='add'>+		if (flc-&gt;flc_flags &amp; FL_DELEG)</div><div class='ctx'> 			seq_puts(f, "DELEG  ");</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(f, "LEASE  ");</div><div class='ctx'> </div><div class='del'>-		if (lease_breaking(fl))</div><div class='add'>+		if (lease_breaking(lease))</div><div class='ctx'> 			seq_puts(f, "BREAKING  ");</div><div class='del'>-		else if (fl-&gt;fl_file)</div><div class='add'>+		else if (flc-&gt;flc_file)</div><div class='ctx'> 			seq_puts(f, "ACTIVE    ");</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(f, "BREAKER   ");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		seq_puts(f, "UNKNOWN UNKNOWN  ");</div><div class='ctx'> 	}</div><div class='del'>-	type = IS_LEASE(fl) ? target_leasetype(fl) : fl-&gt;fl_type;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(f, "%s ", (type == F_WRLCK) ? "WRITE" :</div><div class='ctx'> 			     (type == F_RDLCK) ? "READ" : "UNLCK");</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		/* userspace relies on this representation of dev_t */</div><div class='del'>-		seq_printf(f, "%d %02x:%02x:%lu ", fl_pid,</div><div class='add'>+		seq_printf(f, "%d %02x:%02x:%lu ", pid,</div><div class='ctx'> 				MAJOR(inode-&gt;i_sb-&gt;s_dev),</div><div class='ctx'> 				MINOR(inode-&gt;i_sb-&gt;s_dev), inode-&gt;i_ino);</div><div class='ctx'> 	} else {</div><div class='del'>-		seq_printf(f, "%d &lt;none&gt;:0 ", fl_pid);</div><div class='add'>+		seq_printf(f, "%d &lt;none&gt;:0 ", pid);</div><div class='ctx'> 	}</div><div class='del'>-	if (IS_POSIX(fl)) {</div><div class='add'>+	if (flc-&gt;flc_flags &amp; FL_POSIX) {</div><div class='ctx'> 		if (fl-&gt;fl_end == OFFSET_MAX)</div><div class='ctx'> 			seq_printf(f, "%Ld EOF\n", fl-&gt;fl_start);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2763,17 +2881,18 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_lock *get_next_blocked_member(struct file_lock *node)</div><div class='add'>+static struct file_lock_core *get_next_blocked_member(struct file_lock_core *node)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *tmp;</div><div class='add'>+	struct file_lock_core *tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* NULL node or root node */</div><div class='del'>-	if (node == NULL || node-&gt;fl_blocker == NULL)</div><div class='add'>+	if (node == NULL || node-&gt;flc_blocker == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Next member in the linked list could be itself */</div><div class='del'>-	tmp = list_next_entry(node, fl_blocked_member);</div><div class='del'>-	if (list_entry_is_head(tmp, &amp;node-&gt;fl_blocker-&gt;fl_blocked_requests, fl_blocked_member)</div><div class='add'>+	tmp = list_next_entry(node, flc_blocked_member);</div><div class='add'>+	if (list_entry_is_head(tmp, &amp;node-&gt;flc_blocker-&gt;flc_blocked_requests,</div><div class='add'>+			       flc_blocked_member)</div><div class='ctx'> 		|| tmp == node) {</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2784,18 +2903,18 @@ static struct file_lock *get_next_blocked_member(struct file_lock *node)</div><div class='ctx'> static int locks_show(struct seq_file *f, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct locks_iterator *iter = f-&gt;private;</div><div class='del'>-	struct file_lock *cur, *tmp;</div><div class='add'>+	struct file_lock_core *cur, *tmp;</div><div class='ctx'> 	struct pid_namespace *proc_pidns = proc_pid_ns(file_inode(f-&gt;file)-&gt;i_sb);</div><div class='ctx'> 	int level = 0;</div><div class='ctx'> </div><div class='del'>-	cur = hlist_entry(v, struct file_lock, fl_link);</div><div class='add'>+	cur = hlist_entry(v, struct file_lock_core, flc_link);</div><div class='ctx'> </div><div class='ctx'> 	if (locks_translate_pid(cur, proc_pidns) == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* View this crossed linked list as a binary tree, the first member of fl_blocked_requests</div><div class='del'>-	 * is the left child of current node, the next silibing in fl_blocked_member is the</div><div class='del'>-	 * right child, we can alse get the parent of current node from fl_blocker, so this</div><div class='add'>+	/* View this crossed linked list as a binary tree, the first member of flc_blocked_requests</div><div class='add'>+	 * is the left child of current node, the next silibing in flc_blocked_member is the</div><div class='add'>+	 * right child, we can alse get the parent of current node from flc_blocker, so this</div><div class='ctx'> 	 * question becomes traversal of a binary tree</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (cur != NULL) {</div><div class='hunk'>@@ -2804,17 +2923,18 @@ static int locks_show(struct seq_file *f, void *v)</div><div class='ctx'> 		else</div><div class='ctx'> 			lock_get_status(f, cur, iter-&gt;li_pos, "", level);</div><div class='ctx'> </div><div class='del'>-		if (!list_empty(&amp;cur-&gt;fl_blocked_requests)) {</div><div class='add'>+		if (!list_empty(&amp;cur-&gt;flc_blocked_requests)) {</div><div class='ctx'> 			/* Turn left */</div><div class='del'>-			cur = list_first_entry_or_null(&amp;cur-&gt;fl_blocked_requests,</div><div class='del'>-				struct file_lock, fl_blocked_member);</div><div class='add'>+			cur = list_first_entry_or_null(&amp;cur-&gt;flc_blocked_requests,</div><div class='add'>+						       struct file_lock_core,</div><div class='add'>+						       flc_blocked_member);</div><div class='ctx'> 			level++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Turn right */</div><div class='ctx'> 			tmp = get_next_blocked_member(cur);</div><div class='ctx'> 			/* Fall back to parent node */</div><div class='del'>-			while (tmp == NULL &amp;&amp; cur-&gt;fl_blocker != NULL) {</div><div class='del'>-				cur = cur-&gt;fl_blocker;</div><div class='add'>+			while (tmp == NULL &amp;&amp; cur-&gt;flc_blocker != NULL) {</div><div class='add'>+				cur = cur-&gt;flc_blocker;</div><div class='ctx'> 				level--;</div><div class='ctx'> 				tmp = get_next_blocked_member(cur);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2829,14 +2949,13 @@ static void __show_fd_locks(struct seq_file *f,</div><div class='ctx'> 			struct list_head *head, int *id,</div><div class='ctx'> 			struct file *filp, struct files_struct *files)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lock_core *fl;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(fl, head, fl_list) {</div><div class='add'>+	list_for_each_entry(fl, head, flc_list) {</div><div class='ctx'> </div><div class='del'>-		if (filp != fl-&gt;fl_file)</div><div class='add'>+		if (filp != fl-&gt;flc_file)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (fl-&gt;fl_owner != files &amp;&amp;</div><div class='del'>-		    fl-&gt;fl_owner != filp)</div><div class='add'>+		if (fl-&gt;flc_owner != files &amp;&amp; fl-&gt;flc_owner != filp)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		(*id)++;</div><div class='hunk'>@@ -2915,6 +3034,9 @@ static int __init filelock_init(void)</div><div class='ctx'> 	filelock_cache = kmem_cache_create("file_lock_cache",</div><div class='ctx'> 			sizeof(struct file_lock), 0, SLAB_PANIC, NULL);</div><div class='ctx'> </div><div class='add'>+	filelease_cache = kmem_cache_create("file_lease_cache",</div><div class='add'>+			sizeof(struct file_lease), 0, SLAB_PANIC, NULL);</div><div class='add'>+</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		struct file_lock_list_struct *fll = per_cpu_ptr(&amp;file_lock_list, i);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/mbcache.c b/fs/mbcache.c<br/>index 82aa7a35db26..e60a840999aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/mbcache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mbcache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/mbcache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/mbcache.c</a></div><div class='hunk'>@@ -426,9 +426,7 @@ EXPORT_SYMBOL(mb_cache_destroy);</div><div class='ctx'> </div><div class='ctx'> static int __init mbcache_init(void)</div><div class='ctx'> {</div><div class='del'>-	mb_entry_cache = kmem_cache_create("mbcache",</div><div class='del'>-				sizeof(struct mb_cache_entry), 0,</div><div class='del'>-				SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);</div><div class='add'>+	mb_entry_cache = KMEM_CACHE(mb_cache_entry, SLAB_RECLAIM_ACCOUNT);</div><div class='ctx'> 	if (!mb_entry_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/minix/dir.c b/fs/minix/dir.c<br/>index a224cf222570..19052fc47e9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/minix/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/minix/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/minix/dir.c</a></div><div class='hunk'>@@ -40,18 +40,18 @@ minix_last_byte(struct inode *inode, unsigned long page_nr)</div><div class='ctx'> 	return last_byte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dir_commit_chunk(struct page *page, loff_t pos, unsigned len)</div><div class='add'>+static void dir_commit_chunk(struct folio *folio, loff_t pos, unsigned len)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct inode *dir = mapping-&gt;host;</div><div class='ctx'> </div><div class='del'>-	block_write_end(NULL, mapping, pos, len, len, page, NULL);</div><div class='add'>+	block_write_end(pos, len, len, folio);</div><div class='ctx'> </div><div class='ctx'> 	if (pos+len &gt; dir-&gt;i_size) {</div><div class='ctx'> 		i_size_write(dir, pos+len);</div><div class='ctx'> 		mark_inode_dirty(dir);</div><div class='ctx'> 	}</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int minix_handle_dirsync(struct inode *dir)</div><div class='hunk'>@@ -64,14 +64,15 @@ static int minix_handle_dirsync(struct inode *dir)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *dir_get_page(struct inode *dir, unsigned long n, struct page **p)</div><div class='add'>+static void *dir_get_folio(struct inode *dir, unsigned long n,</div><div class='add'>+		struct folio **foliop)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = dir-&gt;i_mapping;</div><div class='del'>-	struct page *page = read_mapping_page(mapping, n, NULL);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return ERR_CAST(page);</div><div class='del'>-	*p = page;</div><div class='del'>-	return kmap_local_page(page);</div><div class='add'>+	struct folio *folio = read_mapping_folio(dir-&gt;i_mapping, n, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return ERR_CAST(folio);</div><div class='add'>+	*foliop = folio;</div><div class='add'>+	return kmap_local_folio(folio, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void *minix_next_entry(void *de, struct minix_sb_info *sbi)</div><div class='hunk'>@@ -99,9 +100,9 @@ static int minix_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	for ( ; n &lt; npages; n++, offset = 0) {</div><div class='ctx'> 		char *p, *kaddr, *limit;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='del'>-		kaddr = dir_get_page(inode, n, &amp;page);</div><div class='add'>+		kaddr = dir_get_folio(inode, n, &amp;folio);</div><div class='ctx'> 		if (IS_ERR(kaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		p = kaddr+offset;</div><div class='hunk'>@@ -122,13 +123,13 @@ static int minix_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 				unsigned l = strnlen(name, sbi-&gt;s_namelen);</div><div class='ctx'> 				if (!dir_emit(ctx, name, l,</div><div class='ctx'> 					      inumber, DT_UNKNOWN)) {</div><div class='del'>-					unmap_and_put_page(page, p);</div><div class='add'>+					folio_release_kmap(folio, p);</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			ctx-&gt;pos += chunk_size;</div><div class='ctx'> 		}</div><div class='del'>-		unmap_and_put_page(page, kaddr);</div><div class='add'>+		folio_release_kmap(folio, kaddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -144,12 +145,13 @@ static inline int namecompare(int len, int maxlen,</div><div class='ctx'> /*</div><div class='ctx'>  *	minix_find_entry()</div><div class='ctx'>  *</div><div class='del'>- * finds an entry in the specified directory with the wanted name. It</div><div class='del'>- * returns the cache buffer in which the entry was found, and the entry</div><div class='del'>- * itself (as a parameter - res_dir). It does NOT read the inode of the</div><div class='add'>+ * finds an entry in the specified directory with the wanted name.</div><div class='add'>+ * It does NOT read the inode of the</div><div class='ctx'>  * entry - you'll have to do that yourself if you want to.</div><div class='add'>+ * </div><div class='add'>+ * On Success folio_release_kmap() should be called on *foliop.</div><div class='ctx'>  */</div><div class='del'>-minix_dirent *minix_find_entry(struct dentry *dentry, struct page **res_page)</div><div class='add'>+minix_dirent *minix_find_entry(struct dentry *dentry, struct folio **foliop)</div><div class='ctx'> {</div><div class='ctx'> 	const char * name = dentry-&gt;d_name.name;</div><div class='ctx'> 	int namelen = dentry-&gt;d_name.len;</div><div class='hunk'>@@ -158,17 +160,15 @@ minix_dirent *minix_find_entry(struct dentry *dentry, struct page **res_page)</div><div class='ctx'> 	struct minix_sb_info * sbi = minix_sb(sb);</div><div class='ctx'> 	unsigned long n;</div><div class='ctx'> 	unsigned long npages = dir_pages(dir);</div><div class='del'>-	struct page *page = NULL;</div><div class='ctx'> 	char *p;</div><div class='ctx'> </div><div class='ctx'> 	char *namx;</div><div class='ctx'> 	__u32 inumber;</div><div class='del'>-	*res_page = NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (n = 0; n &lt; npages; n++) {</div><div class='ctx'> 		char *kaddr, *limit;</div><div class='ctx'> </div><div class='del'>-		kaddr = dir_get_page(dir, n, &amp;page);</div><div class='add'>+		kaddr = dir_get_folio(dir, n, foliop);</div><div class='ctx'> 		if (IS_ERR(kaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -188,12 +188,11 @@ minix_dirent *minix_find_entry(struct dentry *dentry, struct page **res_page)</div><div class='ctx'> 			if (namecompare(namelen, sbi-&gt;s_namelen, name, namx))</div><div class='ctx'> 				goto found;</div><div class='ctx'> 		}</div><div class='del'>-		unmap_and_put_page(page, kaddr);</div><div class='add'>+		folio_release_kmap(*foliop, kaddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='del'>-	*res_page = page;</div><div class='ctx'> 	return (minix_dirent *)p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -204,7 +203,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> 	int namelen = dentry-&gt;d_name.len;</div><div class='ctx'> 	struct super_block * sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct minix_sb_info * sbi = minix_sb(sb);</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	unsigned long npages = dir_pages(dir);</div><div class='ctx'> 	unsigned long n;</div><div class='ctx'> 	char *kaddr, *p;</div><div class='hunk'>@@ -223,10 +222,10 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> 	for (n = 0; n &lt;= npages; n++) {</div><div class='ctx'> 		char *limit, *dir_end;</div><div class='ctx'> </div><div class='del'>-		kaddr = dir_get_page(dir, n, &amp;page);</div><div class='add'>+		kaddr = dir_get_folio(dir, n, &amp;folio);</div><div class='ctx'> 		if (IS_ERR(kaddr))</div><div class='ctx'> 			return PTR_ERR(kaddr);</div><div class='del'>-		lock_page(page);</div><div class='add'>+		folio_lock(folio);</div><div class='ctx'> 		dir_end = kaddr + minix_last_byte(dir, n);</div><div class='ctx'> 		limit = kaddr + PAGE_SIZE - sbi-&gt;s_dirsize;</div><div class='ctx'> 		for (p = kaddr; p &lt;= limit; p = minix_next_entry(p, sbi)) {</div><div class='hunk'>@@ -253,15 +252,15 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> 			if (namecompare(namelen, sbi-&gt;s_namelen, name, namx))</div><div class='ctx'> 				goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		unmap_and_put_page(page, kaddr);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_release_kmap(folio, kaddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> got_it:</div><div class='del'>-	pos = page_offset(page) + offset_in_page(p);</div><div class='del'>-	err = minix_prepare_chunk(page, pos, sbi-&gt;s_dirsize);</div><div class='add'>+	pos = folio_pos(folio) + offset_in_folio(folio, p);</div><div class='add'>+	err = minix_prepare_chunk(folio, pos, sbi-&gt;s_dirsize);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	memcpy (namx, name, namelen);</div><div class='hunk'>@@ -272,37 +271,37 @@ got_it:</div><div class='ctx'> 		memset (namx + namelen, 0, sbi-&gt;s_dirsize - namelen - 2);</div><div class='ctx'> 		de-&gt;inode = inode-&gt;i_ino;</div><div class='ctx'> 	}</div><div class='del'>-	dir_commit_chunk(page, pos, sbi-&gt;s_dirsize);</div><div class='add'>+	dir_commit_chunk(folio, pos, sbi-&gt;s_dirsize);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	mark_inode_dirty(dir);</div><div class='ctx'> 	err = minix_handle_dirsync(dir);</div><div class='ctx'> out_put:</div><div class='del'>-	unmap_and_put_page(page, kaddr);</div><div class='add'>+	folio_release_kmap(folio, kaddr);</div><div class='ctx'> 	return err;</div><div class='ctx'> out_unlock:</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> 	goto out_put;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int minix_delete_entry(struct minix_dir_entry *de, struct page *page)</div><div class='add'>+int minix_delete_entry(struct minix_dir_entry *de, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	loff_t pos = page_offset(page) + offset_in_page(de);</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	loff_t pos = folio_pos(folio) + offset_in_folio(folio, de);</div><div class='ctx'> 	struct minix_sb_info *sbi = minix_sb(inode-&gt;i_sb);</div><div class='ctx'> 	unsigned len = sbi-&gt;s_dirsize;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	err = minix_prepare_chunk(page, pos, len);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	err = minix_prepare_chunk(folio, pos, len);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sbi-&gt;s_version == MINIX_V3)</div><div class='ctx'> 		((minix3_dirent *)de)-&gt;inode = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		de-&gt;inode = 0;</div><div class='del'>-	dir_commit_chunk(page, pos, len);</div><div class='add'>+	dir_commit_chunk(folio, pos, len);</div><div class='ctx'> 	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='ctx'> 	mark_inode_dirty(inode);</div><div class='ctx'> 	return minix_handle_dirsync(inode);</div><div class='hunk'>@@ -310,21 +309,21 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)</div><div class='ctx'> </div><div class='ctx'> int minix_make_empty(struct inode *inode, struct inode *dir)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = grab_cache_page(inode-&gt;i_mapping, 0);</div><div class='add'>+	struct folio *folio = filemap_grab_folio(inode-&gt;i_mapping, 0);</div><div class='ctx'> 	struct minix_sb_info *sbi = minix_sb(inode-&gt;i_sb);</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	err = minix_prepare_chunk(page, 0, 2 * sbi-&gt;s_dirsize);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='add'>+	err = minix_prepare_chunk(folio, 0, 2 * sbi-&gt;s_dirsize);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_local_page(page);</div><div class='del'>-	memset(kaddr, 0, PAGE_SIZE);</div><div class='add'>+	kaddr = kmap_local_folio(folio, 0);</div><div class='add'>+	memset(kaddr, 0, folio_size(folio));</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;s_version == MINIX_V3) {</div><div class='ctx'> 		minix3_dirent *de3 = (minix3_dirent *)kaddr;</div><div class='hunk'>@@ -345,10 +344,10 @@ int minix_make_empty(struct inode *inode, struct inode *dir)</div><div class='ctx'> 	}</div><div class='ctx'> 	kunmap_local(kaddr);</div><div class='ctx'> </div><div class='del'>-	dir_commit_chunk(page, 0, 2 * sbi-&gt;s_dirsize);</div><div class='add'>+	dir_commit_chunk(folio, 0, 2 * sbi-&gt;s_dirsize);</div><div class='ctx'> 	err = minix_handle_dirsync(inode);</div><div class='ctx'> fail:</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -357,7 +356,7 @@ fail:</div><div class='ctx'>  */</div><div class='ctx'> int minix_empty_dir(struct inode * inode)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	unsigned long i, npages = dir_pages(inode);</div><div class='ctx'> 	struct minix_sb_info *sbi = minix_sb(inode-&gt;i_sb);</div><div class='ctx'> 	char *name, *kaddr;</div><div class='hunk'>@@ -366,7 +365,7 @@ int minix_empty_dir(struct inode * inode)</div><div class='ctx'> 	for (i = 0; i &lt; npages; i++) {</div><div class='ctx'> 		char *p, *limit;</div><div class='ctx'> </div><div class='del'>-		kaddr = dir_get_page(inode, i, &amp;page);</div><div class='add'>+		kaddr = dir_get_folio(inode, i, &amp;folio);</div><div class='ctx'> 		if (IS_ERR(kaddr))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -395,44 +394,44 @@ int minix_empty_dir(struct inode * inode)</div><div class='ctx'> 					goto not_empty;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		unmap_and_put_page(page, kaddr);</div><div class='add'>+		folio_release_kmap(folio, kaddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> not_empty:</div><div class='del'>-	unmap_and_put_page(page, kaddr);</div><div class='add'>+	folio_release_kmap(folio, kaddr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Releases the page */</div><div class='del'>-int minix_set_link(struct minix_dir_entry *de, struct page *page,</div><div class='add'>+int minix_set_link(struct minix_dir_entry *de, struct folio *folio,</div><div class='ctx'> 		struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct inode *dir = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *dir = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct minix_sb_info *sbi = minix_sb(dir-&gt;i_sb);</div><div class='del'>-	loff_t pos = page_offset(page) + offset_in_page(de);</div><div class='add'>+	loff_t pos = folio_pos(folio) + offset_in_folio(folio, de);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	lock_page(page);</div><div class='del'>-	err = minix_prepare_chunk(page, pos, sbi-&gt;s_dirsize);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	err = minix_prepare_chunk(folio, pos, sbi-&gt;s_dirsize);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sbi-&gt;s_version == MINIX_V3)</div><div class='ctx'> 		((minix3_dirent *)de)-&gt;inode = inode-&gt;i_ino;</div><div class='ctx'> 	else</div><div class='ctx'> 		de-&gt;inode = inode-&gt;i_ino;</div><div class='del'>-	dir_commit_chunk(page, pos, sbi-&gt;s_dirsize);</div><div class='add'>+	dir_commit_chunk(folio, pos, sbi-&gt;s_dirsize);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	mark_inode_dirty(dir);</div><div class='ctx'> 	return minix_handle_dirsync(dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct minix_dir_entry * minix_dotdot (struct inode *dir, struct page **p)</div><div class='add'>+struct minix_dir_entry *minix_dotdot(struct inode *dir, struct folio **foliop)</div><div class='ctx'> {</div><div class='ctx'> 	struct minix_sb_info *sbi = minix_sb(dir-&gt;i_sb);</div><div class='del'>-	struct minix_dir_entry *de = dir_get_page(dir, 0, p);</div><div class='add'>+	struct minix_dir_entry *de = dir_get_folio(dir, 0, foliop);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(de))</div><div class='ctx'> 		return minix_next_entry(de, sbi);</div><div class='hunk'>@@ -441,20 +440,19 @@ struct minix_dir_entry * minix_dotdot (struct inode *dir, struct page **p)</div><div class='ctx'> </div><div class='ctx'> ino_t minix_inode_by_name(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct minix_dir_entry *de = minix_find_entry(dentry, &amp;page);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	struct minix_dir_entry *de = minix_find_entry(dentry, &amp;folio);</div><div class='ctx'> 	ino_t res = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (de) {</div><div class='del'>-		struct address_space *mapping = page-&gt;mapping;</div><div class='del'>-		struct inode *inode = mapping-&gt;host;</div><div class='add'>+		struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 		struct minix_sb_info *sbi = minix_sb(inode-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'> 		if (sbi-&gt;s_version == MINIX_V3)</div><div class='ctx'> 			res = ((minix3_dirent *) de)-&gt;inode;</div><div class='ctx'> 		else</div><div class='ctx'> 			res = de-&gt;inode;</div><div class='del'>-		unmap_and_put_page(page, de);</div><div class='add'>+		folio_release_kmap(folio, de);</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/minix/file.c b/fs/minix/file.c<br/>index 906d192ab7f3..dca7ac71f049 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/minix/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/minix/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/minix/file.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@ const struct file_operations minix_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.fsync		= generic_file_fsync,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/minix/inode.c b/fs/minix/inode.c<br/>index 73f37f298087..51ea9bdc813f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/minix/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/minix/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/minix/inode.c</a></div><div class='hunk'>@@ -20,11 +20,27 @@</div><div class='ctx'> #include &lt;linux/mpage.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int minix_write_inode(struct inode *inode,</div><div class='ctx'> 		struct writeback_control *wbc);</div><div class='ctx'> static int minix_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='del'>-static int minix_remount (struct super_block * sb, int * flags, char * data);</div><div class='add'>+</div><div class='add'>+void __minix_error_inode(struct inode *inode, const char *function,</div><div class='add'>+			 unsigned int line, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;args;</div><div class='add'>+	printk(KERN_CRIT "minix-fs error (device %s): %s:%d: "</div><div class='add'>+	       "inode #%lu: comm %s: %pV\n",</div><div class='add'>+	       inode-&gt;i_sb-&gt;s_id, function, line, inode-&gt;i_ino,</div><div class='add'>+	       current-&gt;comm, &amp;vaf);</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void minix_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -87,7 +103,7 @@ static int __init init_inodecache(void)</div><div class='ctx'> 	minix_inode_cachep = kmem_cache_create("minix_inode_cache",</div><div class='ctx'> 					     sizeof(struct minix_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (minix_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -111,19 +127,19 @@ static const struct super_operations minix_sops = {</div><div class='ctx'> 	.evict_inode	= minix_evict_inode,</div><div class='ctx'> 	.put_super	= minix_put_super,</div><div class='ctx'> 	.statfs		= minix_statfs,</div><div class='del'>-	.remount_fs	= minix_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int minix_remount (struct super_block * sb, int * flags, char * data)</div><div class='add'>+static int minix_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct minix_sb_info * sbi = minix_sb(sb);</div><div class='ctx'> 	struct minix_super_block * ms;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	struct minix_sb_info * sbi = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> 	ms = sbi-&gt;s_ms;</div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='add'>+	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (*flags &amp; SB_RDONLY) {</div><div class='add'>+	if (fc-&gt;sb_flags &amp; SB_RDONLY) {</div><div class='ctx'> 		if (ms-&gt;s_state &amp; MINIX_VALID_FS ||</div><div class='ctx'> 		    !(sbi-&gt;s_mount_state &amp; MINIX_VALID_FS))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -170,7 +186,7 @@ static bool minix_check_superblock(struct super_block *sb)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int minix_fill_super(struct super_block *s, void *data, int silent)</div><div class='add'>+static int minix_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct buffer_head **map;</div><div class='hunk'>@@ -180,6 +196,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	struct inode *root_inode;</div><div class='ctx'> 	struct minix_sb_info *sbi;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	sbi = kzalloc(sizeof(struct minix_sb_info), GFP_KERNEL);</div><div class='ctx'> 	if (!sbi)</div><div class='hunk'>@@ -371,6 +388,23 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int minix_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	 return get_tree_bdev(fc, minix_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations minix_context_ops = {</div><div class='add'>+	.get_tree	= minix_get_tree,</div><div class='add'>+	.reconfigure	= minix_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int minix_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	fc-&gt;ops = &amp;minix_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int minix_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dentry-&gt;d_sb;</div><div class='hunk'>@@ -409,9 +443,9 @@ static int minix_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	return block_read_full_folio(folio, minix_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len)</div><div class='add'>+int minix_prepare_chunk(struct folio *folio, loff_t pos, unsigned len)</div><div class='ctx'> {</div><div class='del'>-	return __block_write_begin(page, pos, len, minix_get_block);</div><div class='add'>+	return __block_write_begin(folio, pos, len, minix_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void minix_write_failed(struct address_space *mapping, loff_t to)</div><div class='hunk'>@@ -424,13 +458,14 @@ static void minix_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int minix_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int minix_write_begin(const struct kiocb *iocb,</div><div class='add'>+			     struct address_space *mapping,</div><div class='add'>+			     loff_t pos, unsigned len,</div><div class='add'>+			     struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = block_write_begin(mapping, pos, len, pagep, minix_get_block);</div><div class='add'>+	ret = block_write_begin(mapping, pos, len, foliop, minix_get_block);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		minix_write_failed(mapping, pos + len);</div><div class='ctx'> </div><div class='hunk'>@@ -473,8 +508,14 @@ void minix_set_inode(struct inode *inode, dev_t rdev)</div><div class='ctx'> 		inode-&gt;i_op = &amp;minix_symlink_inode_operations;</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = &amp;minix_aops;</div><div class='del'>-	} else</div><div class='add'>+	} else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode) ||</div><div class='add'>+		   S_ISFIFO(inode-&gt;i_mode) || S_ISSOCK(inode-&gt;i_mode)) {</div><div class='ctx'> 		init_special_inode(inode, inode-&gt;i_mode, rdev);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_DEBUG "MINIX-fs: Invalid file type 0%04o for inode %lu.\n",</div><div class='add'>+		       inode-&gt;i_mode, inode-&gt;i_ino);</div><div class='add'>+		make_bad_inode(inode);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -564,7 +605,7 @@ struct inode *minix_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	if (INODE_VERSION(inode) == MINIX_V1)</div><div class='hunk'>@@ -680,18 +721,12 @@ void minix_truncate(struct inode * inode)</div><div class='ctx'> 		V2_minix_truncate(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *minix_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='del'>-{</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, minix_fill_super);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct file_system_type minix_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "minix",</div><div class='del'>-	.mount		= minix_mount,</div><div class='del'>-	.kill_sb	= kill_block_super,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "minix",</div><div class='add'>+	.kill_sb		= kill_block_super,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context	= minix_init_fs_context,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("minix");</div><div class='ctx'> </div><div class='hunk'>@@ -718,5 +753,6 @@ static void __exit exit_minix_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_minix_fs)</div><div class='ctx'> module_exit(exit_minix_fs)</div><div class='add'>+MODULE_DESCRIPTION("Minix file system");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/minix/minix.h b/fs/minix/minix.h<br/>index d493507c064f..2bfaf377f208 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/minix/minix.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/minix.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/minix/minix.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/minix/minix.h</a></div><div class='hunk'>@@ -42,18 +42,21 @@ struct minix_sb_info {</div><div class='ctx'> 	unsigned short s_version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct inode *minix_iget(struct super_block *, unsigned long);</div><div class='del'>-extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);</div><div class='del'>-extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);</div><div class='del'>-extern struct inode * minix_new_inode(const struct inode *, umode_t);</div><div class='del'>-extern void minix_free_inode(struct inode * inode);</div><div class='del'>-extern unsigned long minix_count_free_inodes(struct super_block *sb);</div><div class='del'>-extern int minix_new_block(struct inode * inode);</div><div class='del'>-extern void minix_free_block(struct inode *inode, unsigned long block);</div><div class='del'>-extern unsigned long minix_count_free_blocks(struct super_block *sb);</div><div class='del'>-extern int minix_getattr(struct mnt_idmap *, const struct path *,</div><div class='del'>-			 struct kstat *, u32, unsigned int);</div><div class='del'>-extern int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len);</div><div class='add'>+void __minix_error_inode(struct inode *inode, const char *function,</div><div class='add'>+			 unsigned int line, const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+struct inode *minix_iget(struct super_block *, unsigned long);</div><div class='add'>+struct minix_inode *minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);</div><div class='add'>+struct minix2_inode *minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);</div><div class='add'>+struct inode *minix_new_inode(const struct inode *, umode_t);</div><div class='add'>+void minix_free_inode(struct inode *inode);</div><div class='add'>+unsigned long minix_count_free_inodes(struct super_block *sb);</div><div class='add'>+int minix_new_block(struct inode *inode);</div><div class='add'>+void minix_free_block(struct inode *inode, unsigned long block);</div><div class='add'>+unsigned long minix_count_free_blocks(struct super_block *sb);</div><div class='add'>+int minix_getattr(struct mnt_idmap *, const struct path *,</div><div class='add'>+		struct kstat *, u32, unsigned int);</div><div class='add'>+int minix_prepare_chunk(struct folio *folio, loff_t pos, unsigned len);</div><div class='ctx'> </div><div class='ctx'> extern void V1_minix_truncate(struct inode *);</div><div class='ctx'> extern void V2_minix_truncate(struct inode *);</div><div class='hunk'>@@ -64,15 +67,15 @@ extern int V2_minix_get_block(struct inode *, long, struct buffer_head *, int);</div><div class='ctx'> extern unsigned V1_minix_blocks(loff_t, struct super_block *);</div><div class='ctx'> extern unsigned V2_minix_blocks(loff_t, struct super_block *);</div><div class='ctx'> </div><div class='del'>-extern struct minix_dir_entry *minix_find_entry(struct dentry*, struct page**);</div><div class='del'>-extern int minix_add_link(struct dentry*, struct inode*);</div><div class='del'>-extern int minix_delete_entry(struct minix_dir_entry*, struct page*);</div><div class='del'>-extern int minix_make_empty(struct inode*, struct inode*);</div><div class='del'>-extern int minix_empty_dir(struct inode*);</div><div class='del'>-int minix_set_link(struct minix_dir_entry *de, struct page *page,</div><div class='add'>+struct minix_dir_entry *minix_find_entry(struct dentry *, struct folio **);</div><div class='add'>+int minix_add_link(struct dentry*, struct inode*);</div><div class='add'>+int minix_delete_entry(struct minix_dir_entry *, struct folio *);</div><div class='add'>+int minix_make_empty(struct inode*, struct inode*);</div><div class='add'>+int minix_empty_dir(struct inode*);</div><div class='add'>+int minix_set_link(struct minix_dir_entry *de, struct folio *folio,</div><div class='ctx'> 		struct inode *inode);</div><div class='del'>-extern struct minix_dir_entry *minix_dotdot(struct inode*, struct page**);</div><div class='del'>-extern ino_t minix_inode_by_name(struct dentry*);</div><div class='add'>+struct minix_dir_entry *minix_dotdot(struct inode*, struct folio **);</div><div class='add'>+ino_t minix_inode_by_name(struct dentry*);</div><div class='ctx'> </div><div class='ctx'> extern const struct inode_operations minix_file_inode_operations;</div><div class='ctx'> extern const struct inode_operations minix_dir_inode_operations;</div><div class='hunk'>@@ -168,4 +171,10 @@ static inline int minix_test_bit(int nr, const void *vaddr)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define minix_error_inode(inode, fmt, ...)			\</div><div class='add'>+	__minix_error_inode((inode), __func__, __LINE__,	\</div><div class='add'>+			    (fmt), ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */</div><div class='add'>+</div><div class='ctx'> #endif /* FS_MINIX_H */</div><div class='head'>diff --git a/fs/minix/namei.c b/fs/minix/namei.c<br/>index d6031acc34f0..263e4ba8b1c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/minix/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/minix/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/minix/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/minix/namei.c</a></div><div class='hunk'>@@ -104,15 +104,15 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir,</div><div class='ctx'> 	return add_nondir(dentry, inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int minix_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		       struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *minix_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				  struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode * inode;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	inode = minix_new_inode(dir, S_IFDIR | mode);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='del'>-		return PTR_ERR(inode);</div><div class='add'>+		return ERR_CAST(inode);</div><div class='ctx'> </div><div class='ctx'> 	inode_inc_link_count(dir);</div><div class='ctx'> 	minix_set_inode(inode, 0);</div><div class='hunk'>@@ -128,7 +128,7 @@ static int minix_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='ctx'> out:</div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> out_fail:</div><div class='ctx'> 	inode_dec_link_count(inode);</div><div class='hunk'>@@ -141,15 +141,20 @@ out_fail:</div><div class='ctx'> static int minix_unlink(struct inode * dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode * inode = d_inode(dentry);</div><div class='del'>-	struct page * page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct minix_dir_entry * de;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	de = minix_find_entry(dentry, &amp;page);</div><div class='add'>+	if (inode-&gt;i_nlink == 0) {</div><div class='add'>+		minix_error_inode(inode, "inode has corrupted nlink");</div><div class='add'>+		return -EFSCORRUPTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	de = minix_find_entry(dentry, &amp;folio);</div><div class='ctx'> 	if (!de)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	err = minix_delete_entry(de, page);</div><div class='del'>-	unmap_and_put_page(page, de);</div><div class='add'>+	err = minix_delete_entry(de, folio);</div><div class='add'>+	folio_release_kmap(folio, de);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -161,15 +166,24 @@ static int minix_unlink(struct inode * dir, struct dentry *dentry)</div><div class='ctx'> static int minix_rmdir(struct inode * dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode * inode = d_inode(dentry);</div><div class='del'>-	int err = -ENOTEMPTY;</div><div class='add'>+	int err = -EFSCORRUPTED;</div><div class='ctx'> </div><div class='del'>-	if (minix_empty_dir(inode)) {</div><div class='del'>-		err = minix_unlink(dir, dentry);</div><div class='del'>-		if (!err) {</div><div class='del'>-			inode_dec_link_count(dir);</div><div class='del'>-			inode_dec_link_count(inode);</div><div class='del'>-		}</div><div class='add'>+	if (dir-&gt;i_nlink &lt;= 2) {</div><div class='add'>+		minix_error_inode(dir, "inode has corrupted nlink");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENOTEMPTY;</div><div class='add'>+	if (!minix_empty_dir(inode))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = minix_unlink(dir, dentry);</div><div class='add'>+	if (!err) {</div><div class='add'>+		inode_dec_link_count(dir);</div><div class='add'>+		inode_dec_link_count(inode);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -180,41 +194,51 @@ static int minix_rename(struct mnt_idmap *idmap,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode * old_inode = d_inode(old_dentry);</div><div class='ctx'> 	struct inode * new_inode = d_inode(new_dentry);</div><div class='del'>-	struct page * dir_page = NULL;</div><div class='add'>+	struct folio * dir_folio = NULL;</div><div class='ctx'> 	struct minix_dir_entry * dir_de = NULL;</div><div class='del'>-	struct page * old_page;</div><div class='add'>+	struct folio *old_folio;</div><div class='ctx'> 	struct minix_dir_entry * old_de;</div><div class='ctx'> 	int err = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; ~RENAME_NOREPLACE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	old_de = minix_find_entry(old_dentry, &amp;old_page);</div><div class='add'>+	old_de = minix_find_entry(old_dentry, &amp;old_folio);</div><div class='ctx'> 	if (!old_de)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(old_inode-&gt;i_mode)) {</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		dir_de = minix_dotdot(old_inode, &amp;dir_page);</div><div class='add'>+		dir_de = minix_dotdot(old_inode, &amp;dir_folio);</div><div class='ctx'> 		if (!dir_de)</div><div class='ctx'> 			goto out_old;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_inode) {</div><div class='del'>-		struct page * new_page;</div><div class='add'>+		struct folio *new_folio;</div><div class='ctx'> 		struct minix_dir_entry * new_de;</div><div class='ctx'> </div><div class='ctx'> 		err = -ENOTEMPTY;</div><div class='ctx'> 		if (dir_de &amp;&amp; !minix_empty_dir(new_inode))</div><div class='ctx'> 			goto out_dir;</div><div class='ctx'> </div><div class='add'>+		err = -EFSCORRUPTED;</div><div class='add'>+		if (new_inode-&gt;i_nlink == 0 || (dir_de &amp;&amp; new_inode-&gt;i_nlink != 2)) {</div><div class='add'>+			minix_error_inode(new_inode, "inode has corrupted nlink");</div><div class='add'>+			goto out_dir;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dir_de &amp;&amp; old_dir-&gt;i_nlink &lt;= 2) {</div><div class='add'>+			minix_error_inode(old_dir, "inode has corrupted nlink");</div><div class='add'>+			goto out_dir;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		err = -ENOENT;</div><div class='del'>-		new_de = minix_find_entry(new_dentry, &amp;new_page);</div><div class='add'>+		new_de = minix_find_entry(new_dentry, &amp;new_folio);</div><div class='ctx'> 		if (!new_de)</div><div class='ctx'> 			goto out_dir;</div><div class='del'>-		err = minix_set_link(new_de, new_page, old_inode);</div><div class='del'>-		kunmap(new_page);</div><div class='del'>-		put_page(new_page);</div><div class='add'>+		err = minix_set_link(new_de, new_folio, old_inode);</div><div class='add'>+		folio_release_kmap(new_folio, new_de);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_dir;</div><div class='ctx'> 		inode_set_ctime_current(new_inode);</div><div class='hunk'>@@ -229,22 +253,22 @@ static int minix_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 			inode_inc_link_count(new_dir);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = minix_delete_entry(old_de, old_page);</div><div class='add'>+	err = minix_delete_entry(old_de, old_folio);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_dir;</div><div class='ctx'> </div><div class='ctx'> 	mark_inode_dirty(old_inode);</div><div class='ctx'> </div><div class='ctx'> 	if (dir_de) {</div><div class='del'>-		err = minix_set_link(dir_de, dir_page, new_dir);</div><div class='add'>+		err = minix_set_link(dir_de, dir_folio, new_dir);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			inode_dec_link_count(old_dir);</div><div class='ctx'> 	}</div><div class='ctx'> out_dir:</div><div class='ctx'> 	if (dir_de)</div><div class='del'>-		unmap_and_put_page(dir_page, dir_de);</div><div class='add'>+		folio_release_kmap(dir_folio, dir_de);</div><div class='ctx'> out_old:</div><div class='del'>-	unmap_and_put_page(old_page, old_de);</div><div class='add'>+	folio_release_kmap(old_folio, old_de);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/mnt_idmapping.c b/fs/mnt_idmapping.c<br/>index 64c5205e2b5e..a37991fdb194 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/mnt_idmapping.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mnt_idmapping.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/mnt_idmapping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/mnt_idmapping.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/mnt_idmapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +33,15 @@ struct mnt_idmap nop_mnt_idmap = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(nop_mnt_idmap);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Carries the invalid idmapping of a full 0-4294967295 {g,u}id range.</div><div class='add'>+ * This means that all {g,u}ids are mapped to INVALID_VFS{G,U}ID.</div><div class='add'>+ */</div><div class='add'>+struct mnt_idmap invalid_mnt_idmap = {</div><div class='add'>+	.count	= REFCOUNT_INIT(1),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(invalid_mnt_idmap);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * initial_idmapping - check whether this is the initial mapping</div><div class='ctx'>  * @ns: idmapping to check</div><div class='hunk'>@@ -75,6 +85,8 @@ vfsuid_t make_vfsuid(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	if (idmap == &amp;nop_mnt_idmap)</div><div class='ctx'> 		return VFSUIDT_INIT(kuid);</div><div class='add'>+	if (idmap == &amp;invalid_mnt_idmap)</div><div class='add'>+		return INVALID_VFSUID;</div><div class='ctx'> 	if (initial_idmapping(fs_userns))</div><div class='ctx'> 		uid = __kuid_val(kuid);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -112,6 +124,8 @@ vfsgid_t make_vfsgid(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	if (idmap == &amp;nop_mnt_idmap)</div><div class='ctx'> 		return VFSGIDT_INIT(kgid);</div><div class='add'>+	if (idmap == &amp;invalid_mnt_idmap)</div><div class='add'>+		return INVALID_VFSGID;</div><div class='ctx'> 	if (initial_idmapping(fs_userns))</div><div class='ctx'> 		gid = __kgid_val(kgid);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -140,6 +154,8 @@ kuid_t from_vfsuid(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	if (idmap == &amp;nop_mnt_idmap)</div><div class='ctx'> 		return AS_KUIDT(vfsuid);</div><div class='add'>+	if (idmap == &amp;invalid_mnt_idmap)</div><div class='add'>+		return INVALID_UID;</div><div class='ctx'> 	uid = map_id_up(&amp;idmap-&gt;uid_map, __vfsuid_val(vfsuid));</div><div class='ctx'> 	if (uid == (uid_t)-1)</div><div class='ctx'> 		return INVALID_UID;</div><div class='hunk'>@@ -167,6 +183,8 @@ kgid_t from_vfsgid(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	if (idmap == &amp;nop_mnt_idmap)</div><div class='ctx'> 		return AS_KGIDT(vfsgid);</div><div class='add'>+	if (idmap == &amp;invalid_mnt_idmap)</div><div class='add'>+		return INVALID_GID;</div><div class='ctx'> 	gid = map_id_up(&amp;idmap-&gt;gid_map, __vfsgid_val(vfsgid));</div><div class='ctx'> 	if (gid == (gid_t)-1)</div><div class='ctx'> 		return INVALID_GID;</div><div class='hunk'>@@ -214,7 +232,7 @@ static int copy_mnt_idmap(struct uid_gid_map *map_from,</div><div class='ctx'> 	 * anything at all.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (nr_extents == 0)</div><div class='del'>-		return 0;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Here we know that nr_extents is greater than zero which means</div><div class='hunk'>@@ -228,15 +246,15 @@ static int copy_mnt_idmap(struct uid_gid_map *map_from,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	forward = kmemdup(map_from-&gt;forward,</div><div class='del'>-			  nr_extents * sizeof(struct uid_gid_extent),</div><div class='del'>-			  GFP_KERNEL_ACCOUNT);</div><div class='add'>+	forward = kmemdup_array(map_from-&gt;forward, nr_extents,</div><div class='add'>+				sizeof(struct uid_gid_extent),</div><div class='add'>+				GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!forward)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	reverse = kmemdup(map_from-&gt;reverse,</div><div class='del'>-			  nr_extents * sizeof(struct uid_gid_extent),</div><div class='del'>-			  GFP_KERNEL_ACCOUNT);</div><div class='add'>+	reverse = kmemdup_array(map_from-&gt;reverse, nr_extents,</div><div class='add'>+				sizeof(struct uid_gid_extent),</div><div class='add'>+				GFP_KERNEL_ACCOUNT);</div><div class='ctx'> 	if (!reverse) {</div><div class='ctx'> 		kfree(forward);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -296,7 +314,7 @@ struct mnt_idmap *alloc_mnt_idmap(struct user_namespace *mnt_userns)</div><div class='ctx'>  */</div><div class='ctx'> struct mnt_idmap *mnt_idmap_get(struct mnt_idmap *idmap)</div><div class='ctx'> {</div><div class='del'>-	if (idmap != &amp;nop_mnt_idmap)</div><div class='add'>+	if (idmap != &amp;nop_mnt_idmap &amp;&amp; idmap != &amp;invalid_mnt_idmap)</div><div class='ctx'> 		refcount_inc(&amp;idmap-&gt;count);</div><div class='ctx'> </div><div class='ctx'> 	return idmap;</div><div class='hunk'>@@ -312,7 +330,58 @@ EXPORT_SYMBOL_GPL(mnt_idmap_get);</div><div class='ctx'>  */</div><div class='ctx'> void mnt_idmap_put(struct mnt_idmap *idmap)</div><div class='ctx'> {</div><div class='del'>-	if (idmap != &amp;nop_mnt_idmap &amp;&amp; refcount_dec_and_test(&amp;idmap-&gt;count))</div><div class='add'>+	if (idmap != &amp;nop_mnt_idmap &amp;&amp; idmap != &amp;invalid_mnt_idmap &amp;&amp;</div><div class='add'>+	    refcount_dec_and_test(&amp;idmap-&gt;count))</div><div class='ctx'> 		free_mnt_idmap(idmap);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mnt_idmap_put);</div><div class='add'>+</div><div class='add'>+int statmount_mnt_idmap(struct mnt_idmap *idmap, struct seq_file *seq, bool uid_map)</div><div class='add'>+{</div><div class='add'>+	struct uid_gid_map *map, *map_up;</div><div class='add'>+	u32 idx, nr_mappings;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_mnt_idmap(idmap))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Idmappings are shown relative to the caller's idmapping.</div><div class='add'>+	 * This is both the most intuitive and most useful solution.</div><div class='add'>+	 */</div><div class='add'>+	if (uid_map) {</div><div class='add'>+		map = &amp;idmap-&gt;uid_map;</div><div class='add'>+		map_up = &amp;current_user_ns()-&gt;uid_map;</div><div class='add'>+	} else {</div><div class='add'>+		map = &amp;idmap-&gt;gid_map;</div><div class='add'>+		map_up = &amp;current_user_ns()-&gt;gid_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = 0, nr_mappings = 0; idx &lt; map-&gt;nr_extents; idx++) {</div><div class='add'>+		uid_t lower;</div><div class='add'>+		struct uid_gid_extent *extent;</div><div class='add'>+</div><div class='add'>+		if (map-&gt;nr_extents &lt;= UID_GID_MAP_MAX_BASE_EXTENTS)</div><div class='add'>+			extent = &amp;map-&gt;extent[idx];</div><div class='add'>+		else</div><div class='add'>+			extent = &amp;map-&gt;forward[idx];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Verify that the whole range of the mapping can be</div><div class='add'>+		 * resolved in the caller's idmapping. If it cannot be</div><div class='add'>+		 * resolved skip the mapping.</div><div class='add'>+		 */</div><div class='add'>+		lower = map_id_range_up(map_up, extent-&gt;lower_first, extent-&gt;count);</div><div class='add'>+		if (lower == (uid_t) -1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seq_printf(seq, "%u %u %u", extent-&gt;first, lower, extent-&gt;count);</div><div class='add'>+</div><div class='add'>+		seq-&gt;count++; /* mappings are separated by \0 */</div><div class='add'>+		if (seq_has_overflowed(seq))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		nr_mappings++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nr_mappings;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/mount.h b/fs/mount.h<br/>index 4a42fc68f4cc..2d28ef2a3aed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/mount.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mount.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/mount.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/mount.h</a></div><div class='hunk'>@@ -5,17 +5,29 @@</div><div class='ctx'> #include &lt;linux/ns_common.h&gt;</div><div class='ctx'> #include &lt;linux/fs_pin.h&gt;</div><div class='ctx'> </div><div class='add'>+extern struct list_head notify_list;</div><div class='add'>+</div><div class='ctx'> struct mnt_namespace {</div><div class='ctx'> 	struct ns_common	ns;</div><div class='ctx'> 	struct mount *	root;</div><div class='del'>-	struct rb_root		mounts; /* Protected by namespace_sem */</div><div class='add'>+	struct {</div><div class='add'>+		struct rb_root	mounts;		 /* Protected by namespace_sem */</div><div class='add'>+		struct rb_node	*mnt_last_node;	 /* last (rightmost) mount in the rbtree */</div><div class='add'>+		struct rb_node	*mnt_first_node; /* first (leftmost) mount in the rbtree */</div><div class='add'>+	};</div><div class='ctx'> 	struct user_namespace	*user_ns;</div><div class='ctx'> 	struct ucounts		*ucounts;</div><div class='del'>-	u64			seq;	/* Sequence number to prevent loops */</div><div class='del'>-	wait_queue_head_t poll;</div><div class='add'>+	wait_queue_head_t	poll;</div><div class='add'>+	u64			seq_origin; /* Sequence number of origin mount namespace */</div><div class='ctx'> 	u64 event;</div><div class='add'>+#ifdef CONFIG_FSNOTIFY</div><div class='add'>+	__u32			n_fsnotify_mask;</div><div class='add'>+	struct fsnotify_mark_connector __rcu *n_fsnotify_marks;</div><div class='add'>+#endif</div><div class='ctx'> 	unsigned int		nr_mounts; /* # of mounts in the namespace */</div><div class='ctx'> 	unsigned int		pending_mounts;</div><div class='add'>+	refcount_t		passive; /* number references not pinning @mounts */</div><div class='add'>+	bool			is_anon;</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='ctx'> struct mnt_pcp {</div><div class='hunk'>@@ -27,7 +39,6 @@ struct mountpoint {</div><div class='ctx'> 	struct hlist_node m_hash;</div><div class='ctx'> 	struct dentry *m_dentry;</div><div class='ctx'> 	struct hlist_head m_list;</div><div class='del'>-	int m_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mount {</div><div class='hunk'>@@ -36,6 +47,7 @@ struct mount {</div><div class='ctx'> 	struct dentry *mnt_mountpoint;</div><div class='ctx'> 	struct vfsmount mnt;</div><div class='ctx'> 	union {</div><div class='add'>+		struct rb_node mnt_node; /* node in the ns-&gt;mounts rbtree */</div><div class='ctx'> 		struct rcu_head mnt_rcu;</div><div class='ctx'> 		struct llist_node mnt_llist;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -47,16 +59,16 @@ struct mount {</div><div class='ctx'> #endif</div><div class='ctx'> 	struct list_head mnt_mounts;	/* list of children, anchored here */</div><div class='ctx'> 	struct list_head mnt_child;	/* and going through their mnt_child */</div><div class='del'>-	struct list_head mnt_instance;	/* mount instance on sb-&gt;s_mounts */</div><div class='add'>+	struct mount *mnt_next_for_sb;	/* the next two fields are hlist_node, */</div><div class='add'>+	struct mount * __aligned(1) *mnt_pprev_for_sb;</div><div class='add'>+					/* except that LSB of pprev is stolen */</div><div class='add'>+#define WRITE_HOLD 1			/* ... for use by mnt_hold_writers() */</div><div class='ctx'> 	const char *mnt_devname;	/* Name of device e.g. /dev/dsk/hda1 */</div><div class='del'>-	union {</div><div class='del'>-		struct rb_node mnt_node;	/* Under ns-&gt;mounts */</div><div class='del'>-		struct list_head mnt_list;</div><div class='del'>-	};</div><div class='add'>+	struct list_head mnt_list;</div><div class='ctx'> 	struct list_head mnt_expire;	/* link in fs-specific expiry list */</div><div class='ctx'> 	struct list_head mnt_share;	/* circular list of shared mounts */</div><div class='del'>-	struct list_head mnt_slave_list;/* list of slave mounts */</div><div class='del'>-	struct list_head mnt_slave;	/* slave list entry */</div><div class='add'>+	struct hlist_head mnt_slave_list;/* list of slave mounts */</div><div class='add'>+	struct hlist_node mnt_slave;	/* slave list entry */</div><div class='ctx'> 	struct mount *mnt_master;	/* slave is on master-&gt;mnt_slave_list */</div><div class='ctx'> 	struct mnt_namespace *mnt_ns;	/* containing namespace */</div><div class='ctx'> 	struct mountpoint *mnt_mp;	/* where is it mounted */</div><div class='hunk'>@@ -64,19 +76,38 @@ struct mount {</div><div class='ctx'> 		struct hlist_node mnt_mp_list;	/* list mounts with the same mountpoint */</div><div class='ctx'> 		struct hlist_node mnt_umount;</div><div class='ctx'> 	};</div><div class='del'>-	struct list_head mnt_umounting; /* list entry for umount propagation */</div><div class='ctx'> #ifdef CONFIG_FSNOTIFY</div><div class='ctx'> 	struct fsnotify_mark_connector __rcu *mnt_fsnotify_marks;</div><div class='ctx'> 	__u32 mnt_fsnotify_mask;</div><div class='add'>+	struct list_head to_notify;	/* need to queue notification */</div><div class='add'>+	struct mnt_namespace *prev_ns;	/* previous namespace (NULL if none) */</div><div class='ctx'> #endif</div><div class='add'>+	int mnt_t_flags;		/* namespace_sem-protected flags */</div><div class='ctx'> 	int mnt_id;			/* mount identifier, reused */</div><div class='ctx'> 	u64 mnt_id_unique;		/* mount ID unique until reboot */</div><div class='ctx'> 	int mnt_group_id;		/* peer group identifier */</div><div class='ctx'> 	int mnt_expiry_mark;		/* true if marked for expiry */</div><div class='ctx'> 	struct hlist_head mnt_pins;</div><div class='ctx'> 	struct hlist_head mnt_stuck_children;</div><div class='add'>+	struct mount *overmount;	/* mounted on -&gt;mnt_root */</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	T_SHARED		= 1, /* mount is shared */</div><div class='add'>+	T_UNBINDABLE		= 2, /* mount is unbindable */</div><div class='add'>+	T_MARKED		= 4, /* internal mark for propagate_... */</div><div class='add'>+	T_UMOUNT_CANDIDATE	= 8, /* for propagate_umount */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * T_SHARED_MASK is the set of flags that should be cleared when a</div><div class='add'>+	 * mount becomes shared.  Currently, this is only the flag that says a</div><div class='add'>+	 * mount cannot be bind mounted, since this is how we create a mount</div><div class='add'>+	 * that shares events with another mount.  If you add a new T_*</div><div class='add'>+	 * flag, consider how it interacts with shared mounts.</div><div class='add'>+	 */</div><div class='add'>+	T_SHARED_MASK	= T_UNBINDABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */</div><div class='ctx'> </div><div class='ctx'> static inline struct mount *real_mount(struct vfsmount *mnt)</div><div class='hunk'>@@ -84,7 +115,7 @@ static inline struct mount *real_mount(struct vfsmount *mnt)</div><div class='ctx'> 	return container_of(mnt, struct mount, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mnt_has_parent(struct mount *mnt)</div><div class='add'>+static inline int mnt_has_parent(const struct mount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	return mnt != mnt-&gt;mnt_parent;</div><div class='ctx'> }</div><div class='hunk'>@@ -116,11 +147,16 @@ static inline void detach_mounts(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> static inline void get_mnt_ns(struct mnt_namespace *ns)</div><div class='ctx'> {</div><div class='del'>-	refcount_inc(&amp;ns-&gt;ns.count);</div><div class='add'>+	ns_ref_inc(ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern seqlock_t mount_lock;</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_0(mount_writer, write_seqlock(&amp;mount_lock),</div><div class='add'>+		    write_sequnlock(&amp;mount_lock))</div><div class='add'>+DEFINE_LOCK_GUARD_0(mount_locked_reader, read_seqlock_excl(&amp;mount_lock),</div><div class='add'>+		    read_sequnlock_excl(&amp;mount_lock))</div><div class='add'>+</div><div class='ctx'> struct proc_mounts {</div><div class='ctx'> 	struct mnt_namespace *ns;</div><div class='ctx'> 	struct path root;</div><div class='hunk'>@@ -129,8 +165,8 @@ struct proc_mounts {</div><div class='ctx'> </div><div class='ctx'> extern const struct seq_operations mounts_op;</div><div class='ctx'> </div><div class='del'>-extern bool __is_local_mountpoint(struct dentry *dentry);</div><div class='del'>-static inline bool is_local_mountpoint(struct dentry *dentry)</div><div class='add'>+extern bool __is_local_mountpoint(const struct dentry *dentry);</div><div class='add'>+static inline bool is_local_mountpoint(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	if (!d_mountpoint(dentry))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -140,15 +176,90 @@ static inline bool is_local_mountpoint(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> static inline bool is_anon_ns(struct mnt_namespace *ns)</div><div class='ctx'> {</div><div class='del'>-	return ns-&gt;seq == 0;</div><div class='add'>+	return ns-&gt;is_anon;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool anon_ns_root(const struct mount *m)</div><div class='add'>+{</div><div class='add'>+	struct mnt_namespace *ns = READ_ONCE(m-&gt;mnt_ns);</div><div class='add'>+</div><div class='add'>+	return !IS_ERR_OR_NULL(ns) &amp;&amp; is_anon_ns(ns) &amp;&amp; m == ns-&gt;root;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mnt_ns_attached(const struct mount *mnt)</div><div class='add'>+{</div><div class='add'>+	return !RB_EMPTY_NODE(&amp;mnt-&gt;mnt_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mnt_ns_empty(const struct mnt_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	return RB_EMPTY_ROOT(&amp;ns-&gt;mounts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void move_from_ns(struct mount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct mnt_namespace *ns = mnt-&gt;mnt_ns;</div><div class='add'>+	WARN_ON(!mnt_ns_attached(mnt));</div><div class='add'>+	if (ns-&gt;mnt_last_node == &amp;mnt-&gt;mnt_node)</div><div class='add'>+		ns-&gt;mnt_last_node = rb_prev(&amp;mnt-&gt;mnt_node);</div><div class='add'>+	if (ns-&gt;mnt_first_node == &amp;mnt-&gt;mnt_node)</div><div class='add'>+		ns-&gt;mnt_first_node = rb_next(&amp;mnt-&gt;mnt_node);</div><div class='add'>+	rb_erase(&amp;mnt-&gt;mnt_node, &amp;ns-&gt;mounts);</div><div class='add'>+	RB_CLEAR_NODE(&amp;mnt-&gt;mnt_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool has_locked_children(struct mount *mnt, struct dentry *dentry);</div><div class='add'>+struct mnt_namespace *get_sequential_mnt_ns(struct mnt_namespace *mnt_ns,</div><div class='add'>+					    bool previous);</div><div class='add'>+</div><div class='add'>+static inline struct mnt_namespace *to_mnt_ns(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return container_of(ns, struct mnt_namespace, ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FSNOTIFY</div><div class='add'>+static inline void mnt_notify_add(struct mount *m)</div><div class='add'>+{</div><div class='add'>+	/* Optimize the case where there are no watches */</div><div class='add'>+	if ((m-&gt;mnt_ns &amp;&amp; m-&gt;mnt_ns-&gt;n_fsnotify_marks) ||</div><div class='add'>+	    (m-&gt;prev_ns &amp;&amp; m-&gt;prev_ns-&gt;n_fsnotify_marks))</div><div class='add'>+		list_add_tail(&amp;m-&gt;to_notify, &amp;notify_list);</div><div class='add'>+	else</div><div class='add'>+		m-&gt;prev_ns = m-&gt;mnt_ns;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void mnt_notify_add(struct mount *m)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline struct mount *topmost_overmount(struct mount *m)</div><div class='add'>+{</div><div class='add'>+	while (m-&gt;overmount)</div><div class='add'>+		m = m-&gt;overmount;</div><div class='add'>+	return m;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __test_write_hold(struct mount * __aligned(1) *val)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)val &amp; WRITE_HOLD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool test_write_hold(const struct mount *m)</div><div class='add'>+{</div><div class='add'>+	return __test_write_hold(m-&gt;mnt_pprev_for_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_write_hold(struct mount *m)</div><div class='add'>+{</div><div class='add'>+	m-&gt;mnt_pprev_for_sb = (void *)((unsigned long)m-&gt;mnt_pprev_for_sb</div><div class='add'>+				       | WRITE_HOLD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void move_from_ns(struct mount *mnt, struct list_head *dt_list)</div><div class='add'>+static inline void clear_write_hold(struct mount *m)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(!(mnt-&gt;mnt.mnt_flags &amp; MNT_ONRB));</div><div class='del'>-	mnt-&gt;mnt.mnt_flags &amp;= ~MNT_ONRB;</div><div class='del'>-	rb_erase(&amp;mnt-&gt;mnt_node, &amp;mnt-&gt;mnt_ns-&gt;mounts);</div><div class='del'>-	list_add_tail(&amp;mnt-&gt;mnt_list, dt_list);</div><div class='add'>+	m-&gt;mnt_pprev_for_sb = (void *)((unsigned long)m-&gt;mnt_pprev_for_sb</div><div class='add'>+				       &amp; ~WRITE_HOLD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void mnt_cursor_del(struct mnt_namespace *ns, struct mount *cursor);</div><div class='add'>+struct mnt_namespace *mnt_ns_from_dentry(struct dentry *dentry);</div><div class='head'>diff --git a/fs/mpage.c b/fs/mpage.c<br/>index 738882e0766d..7dae5afc2b9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/mpage.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/mpage.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/mpage.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/mpage.c</a></div><div class='hunk'>@@ -48,13 +48,8 @@ static void mpage_read_end_io(struct bio *bio)</div><div class='ctx'> 	struct folio_iter fi;</div><div class='ctx'> 	int err = blk_status_to_errno(bio-&gt;bi_status);</div><div class='ctx'> </div><div class='del'>-	bio_for_each_folio_all(fi, bio) {</div><div class='del'>-		if (err)</div><div class='del'>-			folio_set_error(fi.folio);</div><div class='del'>-		else</div><div class='del'>-			folio_mark_uptodate(fi.folio);</div><div class='del'>-		folio_unlock(fi.folio);</div><div class='del'>-	}</div><div class='add'>+	bio_for_each_folio_all(fi, bio)</div><div class='add'>+		folio_end_read(fi.folio, err == 0);</div><div class='ctx'> </div><div class='ctx'> 	bio_put(bio);</div><div class='ctx'> }</div><div class='hunk'>@@ -65,10 +60,8 @@ static void mpage_write_end_io(struct bio *bio)</div><div class='ctx'> 	int err = blk_status_to_errno(bio-&gt;bi_status);</div><div class='ctx'> </div><div class='ctx'> 	bio_for_each_folio_all(fi, bio) {</div><div class='del'>-		if (err) {</div><div class='del'>-			folio_set_error(fi.folio);</div><div class='add'>+		if (err)</div><div class='ctx'> 			mapping_set_error(fi.folio-&gt;mapping, err);</div><div class='del'>-		}</div><div class='ctx'> 		folio_end_writeback(fi.folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +107,7 @@ static void map_buffer_to_folio(struct folio *folio, struct buffer_head *bh,</div><div class='ctx'> 		 * don't make any buffers if there is only one buffer on</div><div class='ctx'> 		 * the folio and the folio just needs to be set up to date</div><div class='ctx'> 		 */</div><div class='del'>-		if (inode-&gt;i_blkbits == PAGE_SHIFT &amp;&amp;</div><div class='add'>+		if (inode-&gt;i_blkbits == folio_shift(folio) &amp;&amp;</div><div class='ctx'> 		    buffer_uptodate(bh)) {</div><div class='ctx'> 			folio_mark_uptodate(folio);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -155,12 +148,12 @@ struct mpage_readpage_args {</div><div class='ctx'>  * represent the validity of its disk mapping and to decide when to do the next</div><div class='ctx'>  * get_block() call.</div><div class='ctx'>  */</div><div class='del'>-static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='add'>+static void do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio = args-&gt;folio;</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	const unsigned blkbits = inode-&gt;i_blkbits;</div><div class='del'>-	const unsigned blocks_per_page = PAGE_SIZE &gt;&gt; blkbits;</div><div class='add'>+	const unsigned blocks_per_folio = folio_size(folio) &gt;&gt; blkbits;</div><div class='ctx'> 	const unsigned blocksize = 1 &lt;&lt; blkbits;</div><div class='ctx'> 	struct buffer_head *map_bh = &amp;args-&gt;map_bh;</div><div class='ctx'> 	sector_t block_in_file;</div><div class='hunk'>@@ -168,7 +161,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 	sector_t last_block_in_file;</div><div class='ctx'> 	sector_t first_block;</div><div class='ctx'> 	unsigned page_block;</div><div class='del'>-	unsigned first_hole = blocks_per_page;</div><div class='add'>+	unsigned first_hole = blocks_per_folio;</div><div class='ctx'> 	struct block_device *bdev = NULL;</div><div class='ctx'> 	int length;</div><div class='ctx'> 	int fully_mapped = 1;</div><div class='hunk'>@@ -177,9 +170,6 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 	unsigned relative_block;</div><div class='ctx'> 	gfp_t gfp = mapping_gfp_constraint(folio-&gt;mapping, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	/* MAX_BUF_PER_PAGE, for example */</div><div class='del'>-	VM_BUG_ON_FOLIO(folio_test_large(folio), folio);</div><div class='del'>-</div><div class='ctx'> 	if (args-&gt;is_readahead) {</div><div class='ctx'> 		opf |= REQ_RAHEAD;</div><div class='ctx'> 		gfp |= __GFP_NORETRY | __GFP_NOWARN;</div><div class='hunk'>@@ -188,8 +178,8 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 	if (folio_buffers(folio))</div><div class='ctx'> 		goto confused;</div><div class='ctx'> </div><div class='del'>-	block_in_file = (sector_t)folio-&gt;index &lt;&lt; (PAGE_SHIFT - blkbits);</div><div class='del'>-	last_block = block_in_file + args-&gt;nr_pages * blocks_per_page;</div><div class='add'>+	block_in_file = folio_pos(folio) &gt;&gt; blkbits;</div><div class='add'>+	last_block = block_in_file + ((args-&gt;nr_pages * PAGE_SIZE) &gt;&gt; blkbits);</div><div class='ctx'> 	last_block_in_file = (i_size_read(inode) + blocksize - 1) &gt;&gt; blkbits;</div><div class='ctx'> 	if (last_block &gt; last_block_in_file)</div><div class='ctx'> 		last_block = last_block_in_file;</div><div class='hunk'>@@ -211,7 +201,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 				clear_buffer_mapped(map_bh);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			if (page_block == blocks_per_page)</div><div class='add'>+			if (page_block == blocks_per_folio)</div><div class='ctx'> 				break;</div><div class='ctx'> 			page_block++;</div><div class='ctx'> 			block_in_file++;</div><div class='hunk'>@@ -223,7 +213,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 	 * Then do more get_blocks calls until we are done with this folio.</div><div class='ctx'> 	 */</div><div class='ctx'> 	map_bh-&gt;b_folio = folio;</div><div class='del'>-	while (page_block &lt; blocks_per_page) {</div><div class='add'>+	while (page_block &lt; blocks_per_folio) {</div><div class='ctx'> 		map_bh-&gt;b_state = 0;</div><div class='ctx'> 		map_bh-&gt;b_size = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +226,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> </div><div class='ctx'> 		if (!buffer_mapped(map_bh)) {</div><div class='ctx'> 			fully_mapped = 0;</div><div class='del'>-			if (first_hole == blocks_per_page)</div><div class='add'>+			if (first_hole == blocks_per_folio)</div><div class='ctx'> 				first_hole = page_block;</div><div class='ctx'> 			page_block++;</div><div class='ctx'> 			block_in_file++;</div><div class='hunk'>@@ -254,7 +244,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 			goto confused;</div><div class='ctx'> 		}</div><div class='ctx'> 	</div><div class='del'>-		if (first_hole != blocks_per_page)</div><div class='add'>+		if (first_hole != blocks_per_folio)</div><div class='ctx'> 			goto confused;		/* hole -&gt; non-hole */</div><div class='ctx'> </div><div class='ctx'> 		/* Contiguous blocks? */</div><div class='hunk'>@@ -267,7 +257,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 			if (relative_block == nblocks) {</div><div class='ctx'> 				clear_buffer_mapped(map_bh);</div><div class='ctx'> 				break;</div><div class='del'>-			} else if (page_block == blocks_per_page)</div><div class='add'>+			} else if (page_block == blocks_per_folio)</div><div class='ctx'> 				break;</div><div class='ctx'> 			page_block++;</div><div class='ctx'> 			block_in_file++;</div><div class='hunk'>@@ -275,8 +265,8 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)</div><div class='ctx'> 		bdev = map_bh-&gt;b_bdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (first_hole != blocks_per_page) {</div><div class='del'>-		folio_zero_segment(folio, first_hole &lt;&lt; blkbits, PAGE_SIZE);</div><div class='add'>+	if (first_hole != blocks_per_folio) {</div><div class='add'>+		folio_zero_segment(folio, first_hole &lt;&lt; blkbits, folio_size(folio));</div><div class='ctx'> 		if (first_hole == 0) {</div><div class='ctx'> 			folio_mark_uptodate(folio);</div><div class='ctx'> 			folio_unlock(folio);</div><div class='hunk'>@@ -310,12 +300,12 @@ alloc_new:</div><div class='ctx'> 	relative_block = block_in_file - args-&gt;first_logical_block;</div><div class='ctx'> 	nblocks = map_bh-&gt;b_size &gt;&gt; blkbits;</div><div class='ctx'> 	if ((buffer_boundary(map_bh) &amp;&amp; relative_block == nblocks) ||</div><div class='del'>-	    (first_hole != blocks_per_page))</div><div class='add'>+	    (first_hole != blocks_per_folio))</div><div class='ctx'> 		args-&gt;bio = mpage_bio_submit_read(args-&gt;bio);</div><div class='ctx'> 	else</div><div class='del'>-		args-&gt;last_block_in_bio = first_block + blocks_per_page - 1;</div><div class='add'>+		args-&gt;last_block_in_bio = first_block + blocks_per_folio - 1;</div><div class='ctx'> out:</div><div class='del'>-	return args-&gt;bio;</div><div class='add'>+	return;</div><div class='ctx'> </div><div class='ctx'> confused:</div><div class='ctx'> 	if (args-&gt;bio)</div><div class='hunk'>@@ -378,7 +368,13 @@ void mpage_readahead(struct readahead_control *rac, get_block_t get_block)</div><div class='ctx'> 		prefetchw(&amp;folio-&gt;flags);</div><div class='ctx'> 		args.folio = folio;</div><div class='ctx'> 		args.nr_pages = readahead_count(rac);</div><div class='del'>-		args.bio = do_mpage_readpage(&amp;args);</div><div class='add'>+		do_mpage_readpage(&amp;args);</div><div class='add'>+		/*</div><div class='add'>+		 * If read ahead failed synchronously, it may cause by removed</div><div class='add'>+		 * device, or some filesystem metadata error.</div><div class='add'>+		 */</div><div class='add'>+		if (!folio_test_locked(folio) &amp;&amp; !folio_test_uptodate(folio))</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (args.bio)</div><div class='ctx'> 		mpage_bio_submit_read(args.bio);</div><div class='hunk'>@@ -392,11 +388,11 @@ int mpage_read_folio(struct folio *folio, get_block_t get_block)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpage_readpage_args args = {</div><div class='ctx'> 		.folio = folio,</div><div class='del'>-		.nr_pages = 1,</div><div class='add'>+		.nr_pages = folio_nr_pages(folio),</div><div class='ctx'> 		.get_block = get_block,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	args.bio = do_mpage_readpage(&amp;args);</div><div class='add'>+	do_mpage_readpage(&amp;args);</div><div class='ctx'> 	if (args.bio)</div><div class='ctx'> 		mpage_bio_submit_read(args.bio);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -455,20 +451,19 @@ static void clean_buffers(struct folio *folio, unsigned first_unmapped)</div><div class='ctx'> 		try_to_free_buffers(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='del'>-		      void *data)</div><div class='add'>+static int mpage_write_folio(struct writeback_control *wbc, struct folio *folio,</div><div class='add'>+		struct mpage_data *mpd)</div><div class='ctx'> {</div><div class='del'>-	struct mpage_data *mpd = data;</div><div class='ctx'> 	struct bio *bio = mpd-&gt;bio;</div><div class='ctx'> 	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	const unsigned blkbits = inode-&gt;i_blkbits;</div><div class='del'>-	const unsigned blocks_per_page = PAGE_SIZE &gt;&gt; blkbits;</div><div class='add'>+	const unsigned blocks_per_folio = folio_size(folio) &gt;&gt; blkbits;</div><div class='ctx'> 	sector_t last_block;</div><div class='ctx'> 	sector_t block_in_file;</div><div class='ctx'> 	sector_t first_block;</div><div class='ctx'> 	unsigned page_block;</div><div class='del'>-	unsigned first_unmapped = blocks_per_page;</div><div class='add'>+	unsigned first_unmapped = blocks_per_folio;</div><div class='ctx'> 	struct block_device *bdev = NULL;</div><div class='ctx'> 	int boundary = 0;</div><div class='ctx'> 	sector_t boundary_block = 0;</div><div class='hunk'>@@ -493,12 +488,12 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (buffer_dirty(bh))</div><div class='ctx'> 					goto confused;</div><div class='del'>-				if (first_unmapped == blocks_per_page)</div><div class='add'>+				if (first_unmapped == blocks_per_folio)</div><div class='ctx'> 					first_unmapped = page_block;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (first_unmapped != blocks_per_page)</div><div class='add'>+			if (first_unmapped != blocks_per_folio)</div><div class='ctx'> 				goto confused;	/* hole -&gt; non-hole */</div><div class='ctx'> </div><div class='ctx'> 			if (!buffer_dirty(bh) || !buffer_uptodate(bh))</div><div class='hunk'>@@ -534,7 +529,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='ctx'> 	 * The page has no buffers: map it to disk</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUG_ON(!folio_test_uptodate(folio));</div><div class='del'>-	block_in_file = (sector_t)folio-&gt;index &lt;&lt; (PAGE_SHIFT - blkbits);</div><div class='add'>+	block_in_file = folio_pos(folio) &gt;&gt; blkbits;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Whole page beyond EOF? Skip allocating blocks to avoid leaking</div><div class='ctx'> 	 * space.</div><div class='hunk'>@@ -543,7 +538,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='ctx'> 		goto page_is_mapped;</div><div class='ctx'> 	last_block = (i_size - 1) &gt;&gt; blkbits;</div><div class='ctx'> 	map_bh.b_folio = folio;</div><div class='del'>-	for (page_block = 0; page_block &lt; blocks_per_page; ) {</div><div class='add'>+	for (page_block = 0; page_block &lt; blocks_per_folio; ) {</div><div class='ctx'> </div><div class='ctx'> 		map_bh.b_state = 0;</div><div class='ctx'> 		map_bh.b_size = 1 &lt;&lt; blkbits;</div><div class='hunk'>@@ -605,6 +600,7 @@ alloc_new:</div><div class='ctx'> 				GFP_NOFS);</div><div class='ctx'> 		bio-&gt;bi_iter.bi_sector = first_block &lt;&lt; (blkbits - 9);</div><div class='ctx'> 		wbc_init_bio(wbc, bio);</div><div class='add'>+		bio-&gt;bi_write_hint = inode-&gt;i_write_hint;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -612,7 +608,7 @@ alloc_new:</div><div class='ctx'> 	 * the confused fail path above (OOM) will be very confused when</div><div class='ctx'> 	 * it finds all bh marked clean (i.e. it will not write anything)</div><div class='ctx'> 	 */</div><div class='del'>-	wbc_account_cgroup_owner(wbc, &amp;folio-&gt;page, folio_size(folio));</div><div class='add'>+	wbc_account_cgroup_owner(wbc, folio, folio_size(folio));</div><div class='ctx'> 	length = first_unmapped &lt;&lt; blkbits;</div><div class='ctx'> 	if (!bio_add_folio(bio, folio, length, 0)) {</div><div class='ctx'> 		bio = mpage_bio_submit_write(bio);</div><div class='hunk'>@@ -624,14 +620,14 @@ alloc_new:</div><div class='ctx'> 	BUG_ON(folio_test_writeback(folio));</div><div class='ctx'> 	folio_start_writeback(folio);</div><div class='ctx'> 	folio_unlock(folio);</div><div class='del'>-	if (boundary || (first_unmapped != blocks_per_page)) {</div><div class='add'>+	if (boundary || (first_unmapped != blocks_per_folio)) {</div><div class='ctx'> 		bio = mpage_bio_submit_write(bio);</div><div class='ctx'> 		if (boundary_block) {</div><div class='ctx'> 			write_boundary_block(boundary_bdev,</div><div class='ctx'> 					boundary_block, 1 &lt;&lt; blkbits);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		mpd-&gt;last_block_in_bio = first_block + blocks_per_page - 1;</div><div class='add'>+		mpd-&gt;last_block_in_bio = first_block + blocks_per_folio - 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -665,14 +661,16 @@ mpage_writepages(struct address_space *mapping,</div><div class='ctx'> 	struct mpage_data mpd = {</div><div class='ctx'> 		.get_block	= get_block,</div><div class='ctx'> 	};</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	struct blk_plug plug;</div><div class='del'>-	int ret;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='del'>-	ret = write_cache_pages(mapping, wbc, __mpage_writepage, &amp;mpd);</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)))</div><div class='add'>+		error = mpage_write_folio(wbc, folio, &amp;mpd);</div><div class='ctx'> 	if (mpd.bio)</div><div class='ctx'> 		mpage_bio_submit_write(mpd.bio);</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='del'>-	return ret;</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mpage_writepages);</div><div class='head'>diff --git a/fs/namei.c b/fs/namei.c<br/>index 4e0de939fea1..bf0f66f0e9b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/namei.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/wordpart.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/ima.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='hunk'>@@ -126,8 +125,15 @@</div><div class='ctx'> </div><div class='ctx'> #define EMBEDDED_NAME_MAX	(PATH_MAX - offsetof(struct filename, iname))</div><div class='ctx'> </div><div class='add'>+static inline void initname(struct filename *name, const char __user *uptr)</div><div class='add'>+{</div><div class='add'>+	name-&gt;uptr = uptr;</div><div class='add'>+	name-&gt;aname = NULL;</div><div class='add'>+	atomic_set(&amp;name-&gt;refcnt, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct filename *</div><div class='del'>-getname_flags(const char __user *filename, int flags, int *empty)</div><div class='add'>+getname_flags(const char __user *filename, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *result;</div><div class='ctx'> 	char *kname;</div><div class='hunk'>@@ -149,9 +155,20 @@ getname_flags(const char __user *filename, int flags, int *empty)</div><div class='ctx'> 	result-&gt;name = kname;</div><div class='ctx'> </div><div class='ctx'> 	len = strncpy_from_user(kname, filename, EMBEDDED_NAME_MAX);</div><div class='del'>-	if (unlikely(len &lt; 0)) {</div><div class='del'>-		__putname(result);</div><div class='del'>-		return ERR_PTR(len);</div><div class='add'>+	/*</div><div class='add'>+	 * Handle both empty path and copy failure in one go.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(len &lt;= 0)) {</div><div class='add'>+		if (unlikely(len &lt; 0)) {</div><div class='add'>+			__putname(result);</div><div class='add'>+			return ERR_PTR(len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The empty path is special. */</div><div class='add'>+		if (!(flags &amp; LOOKUP_EMPTY)) {</div><div class='add'>+			__putname(result);</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -181,46 +198,50 @@ getname_flags(const char __user *filename, int flags, int *empty)</div><div class='ctx'> 			kfree(result);</div><div class='ctx'> 			return ERR_PTR(len);</div><div class='ctx'> 		}</div><div class='add'>+		/* The empty path is special. */</div><div class='add'>+		if (unlikely(!len) &amp;&amp; !(flags &amp; LOOKUP_EMPTY)) {</div><div class='add'>+			__putname(kname);</div><div class='add'>+			kfree(result);</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='ctx'> 		if (unlikely(len == PATH_MAX)) {</div><div class='ctx'> 			__putname(kname);</div><div class='ctx'> 			kfree(result);</div><div class='ctx'> 			return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;result-&gt;refcnt, 1);</div><div class='del'>-	/* The empty path is special. */</div><div class='del'>-	if (unlikely(!len)) {</div><div class='del'>-		if (empty)</div><div class='del'>-			*empty = 1;</div><div class='del'>-		if (!(flags &amp; LOOKUP_EMPTY)) {</div><div class='del'>-			putname(result);</div><div class='del'>-			return ERR_PTR(-ENOENT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result-&gt;uptr = filename;</div><div class='del'>-	result-&gt;aname = NULL;</div><div class='add'>+	initname(result, filename);</div><div class='ctx'> 	audit_getname(result);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct filename *</div><div class='del'>-getname_uflags(const char __user *filename, int uflags)</div><div class='add'>+struct filename *getname_uflags(const char __user *filename, int uflags)</div><div class='ctx'> {</div><div class='ctx'> 	int flags = (uflags &amp; AT_EMPTY_PATH) ? LOOKUP_EMPTY : 0;</div><div class='ctx'> </div><div class='del'>-	return getname_flags(filename, flags, NULL);</div><div class='add'>+	return getname_flags(filename, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct filename *</div><div class='del'>-getname(const char __user * filename)</div><div class='add'>+struct filename *__getname_maybe_null(const char __user *pathname)</div><div class='ctx'> {</div><div class='del'>-	return getname_flags(filename, 0, NULL);</div><div class='add'>+	struct filename *name;</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	/* try to save on allocations; loss on um, though */</div><div class='add'>+	if (get_user(c, pathname))</div><div class='add'>+		return ERR_PTR(-EFAULT);</div><div class='add'>+	if (!c)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	name = getname_flags(pathname, LOOKUP_EMPTY);</div><div class='add'>+	if (!IS_ERR(name) &amp;&amp; !(name-&gt;name[0])) {</div><div class='add'>+		putname(name);</div><div class='add'>+		name = NULL;</div><div class='add'>+	}</div><div class='add'>+	return name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct filename *</div><div class='del'>-getname_kernel(const char * filename)</div><div class='add'>+struct filename *getname_kernel(const char * filename)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *result;</div><div class='ctx'> 	int len = strlen(filename) + 1;</div><div class='hunk'>@@ -247,27 +268,29 @@ getname_kernel(const char * filename)</div><div class='ctx'> 		return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy((char *)result-&gt;name, filename, len);</div><div class='del'>-	result-&gt;uptr = NULL;</div><div class='del'>-	result-&gt;aname = NULL;</div><div class='del'>-	atomic_set(&amp;result-&gt;refcnt, 1);</div><div class='add'>+	initname(result, NULL);</div><div class='ctx'> 	audit_getname(result);</div><div class='del'>-</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(getname_kernel);</div><div class='ctx'> </div><div class='ctx'> void putname(struct filename *name)</div><div class='ctx'> {</div><div class='del'>-	if (IS_ERR(name))</div><div class='del'>-		return;</div><div class='add'>+	int refcnt;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(!atomic_read(&amp;name-&gt;refcnt)))</div><div class='add'>+	if (IS_ERR_OR_NULL(name))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!atomic_dec_and_test(&amp;name-&gt;refcnt))</div><div class='del'>-		return;</div><div class='add'>+	refcnt = atomic_read(&amp;name-&gt;refcnt);</div><div class='add'>+	if (unlikely(refcnt != 1)) {</div><div class='add'>+		if (WARN_ON_ONCE(!refcnt))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	if (name-&gt;name != name-&gt;iname) {</div><div class='add'>+		if (!atomic_dec_and_test(&amp;name-&gt;refcnt))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(name-&gt;name != name-&gt;iname)) {</div><div class='ctx'> 		__putname(name-&gt;name);</div><div class='ctx'> 		kfree(name);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -320,6 +343,25 @@ static int check_acl(struct mnt_idmap *idmap,</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Very quick optimistic "we know we have no ACL's" check.</div><div class='add'>+ *</div><div class='add'>+ * Note that this is purely for ACL_TYPE_ACCESS, and purely</div><div class='add'>+ * for the "we have cached that there are no ACLs" case.</div><div class='add'>+ *</div><div class='add'>+ * If this returns true, we know there are no ACLs. But if</div><div class='add'>+ * it returns false, we might still not have ACLs (it could</div><div class='add'>+ * be the is_uncached_acl() case).</div><div class='add'>+ */</div><div class='add'>+static inline bool no_acl_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FS_POSIX_ACL</div><div class='add'>+	return likely(!READ_ONCE(inode-&gt;i_acl));</div><div class='add'>+#else</div><div class='add'>+	return true;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * acl_permission_check - perform basic UNIX permission checking</div><div class='ctx'>  * @idmap:	idmap of the mount the inode was found from</div><div class='hunk'>@@ -342,6 +384,28 @@ static int acl_permission_check(struct mnt_idmap *idmap,</div><div class='ctx'> 	unsigned int mode = inode-&gt;i_mode;</div><div class='ctx'> 	vfsuid_t vfsuid;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Common cheap case: everybody has the requested</div><div class='add'>+	 * rights, and there are no ACLs to check. No need</div><div class='add'>+	 * to do any owner/group checks in that case.</div><div class='add'>+	 *</div><div class='add'>+	 *  - 'mask&amp;7' is the requested permission bit set</div><div class='add'>+	 *  - multiplying by 0111 spreads them out to all of ugo</div><div class='add'>+	 *  - '&amp; ~mode' looks for missing inode permission bits</div><div class='add'>+	 *  - the '!' is for "no missing permissions"</div><div class='add'>+	 *</div><div class='add'>+	 * After that, we just need to check that there are no</div><div class='add'>+	 * ACL's on the inode - do the 'IS_POSIXACL()' check last</div><div class='add'>+	 * because it will dereference the -&gt;i_sb pointer and we</div><div class='add'>+	 * want to avoid that if at all possible.</div><div class='add'>+	 */</div><div class='add'>+	if (!((mask &amp; 7) * 0111 &amp; ~mode)) {</div><div class='add'>+		if (no_acl_inode(inode))</div><div class='add'>+			return 0;</div><div class='add'>+		if (!IS_POSIXACL(inode))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Are we the owner? If so, ACL's don't matter */</div><div class='ctx'> 	vfsuid = i_uid_into_vfsuid(idmap, inode);</div><div class='ctx'> 	if (likely(vfsuid_eq_kuid(vfsuid, current_fsuid()))) {</div><div class='hunk'>@@ -476,10 +540,13 @@ static inline int do_inode_permission(struct mnt_idmap *idmap,</div><div class='ctx'>  * @mask: Right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC)</div><div class='ctx'>  *</div><div class='ctx'>  * Separate out file-system wide checks from inode-specific permission checks.</div><div class='add'>+ *</div><div class='add'>+ * Note: lookup_inode_permission_may_exec() does not call here. If you add</div><div class='add'>+ * MAY_EXEC checks, adjust it.</div><div class='ctx'>  */</div><div class='ctx'> static int sb_permission(struct super_block *sb, struct inode *inode, int mask)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(mask &amp; MAY_WRITE)) {</div><div class='add'>+	if (mask &amp; MAY_WRITE) {</div><div class='ctx'> 		umode_t mode = inode-&gt;i_mode;</div><div class='ctx'> </div><div class='ctx'> 		/* Nobody gets write access to a read-only fs. */</div><div class='hunk'>@@ -507,14 +574,14 @@ int inode_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	retval = sb_permission(inode-&gt;i_sb, inode, mask);</div><div class='del'>-	if (retval)</div><div class='add'>+	if (unlikely(retval))</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(mask &amp; MAY_WRITE)) {</div><div class='add'>+	if (mask &amp; MAY_WRITE) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Nobody gets write access to an immutable file.</div><div class='ctx'> 		 */</div><div class='del'>-		if (IS_IMMUTABLE(inode))</div><div class='add'>+		if (unlikely(IS_IMMUTABLE(inode)))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -522,22 +589,58 @@ int inode_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 		 * written back improperly if their true value is unknown</div><div class='ctx'> 		 * to the vfs.</div><div class='ctx'> 		 */</div><div class='del'>-		if (HAS_UNMAPPED_ID(idmap, inode))</div><div class='add'>+		if (unlikely(HAS_UNMAPPED_ID(idmap, inode)))</div><div class='ctx'> 			return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = do_inode_permission(idmap, inode, mask);</div><div class='del'>-	if (retval)</div><div class='add'>+	if (unlikely(retval))</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	retval = devcgroup_inode_permission(inode, mask);</div><div class='del'>-	if (retval)</div><div class='add'>+	if (unlikely(retval))</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	return security_inode_permission(inode, mask);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(inode_permission);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * lookup_inode_permission_may_exec - Check traversal right for given inode</div><div class='add'>+ *</div><div class='add'>+ * This is a special case routine for may_lookup() making assumptions specific</div><div class='add'>+ * to path traversal. Use inode_permission() if you are doing something else.</div><div class='add'>+ *</div><div class='add'>+ * Work is shaved off compared to inode_permission() as follows:</div><div class='add'>+ * - we know for a fact there is no MAY_WRITE to worry about</div><div class='add'>+ * - it is an invariant the inode is a directory</div><div class='add'>+ *</div><div class='add'>+ * Since majority of real-world traversal happens on inodes which grant it for</div><div class='add'>+ * everyone, we check it upfront and only resort to more expensive work if it</div><div class='add'>+ * fails.</div><div class='add'>+ *</div><div class='add'>+ * Filesystems which have their own -&gt;permission hook and consequently miss out</div><div class='add'>+ * on IOP_FASTPERM can still get the optimization if they set IOP_FASTPERM_MAY_EXEC</div><div class='add'>+ * on their directory inodes.</div><div class='add'>+ */</div><div class='add'>+static __always_inline int lookup_inode_permission_may_exec(struct mnt_idmap *idmap,</div><div class='add'>+	struct inode *inode, int mask)</div><div class='add'>+{</div><div class='add'>+	/* Lookup already checked this to return -ENOTDIR */</div><div class='add'>+	VFS_BUG_ON_INODE(!S_ISDIR(inode-&gt;i_mode), inode);</div><div class='add'>+	VFS_BUG_ON((mask &amp; ~MAY_NOT_BLOCK) != 0);</div><div class='add'>+</div><div class='add'>+	mask |= MAY_EXEC;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!(inode-&gt;i_opflags &amp; (IOP_FASTPERM | IOP_FASTPERM_MAY_EXEC))))</div><div class='add'>+		return inode_permission(idmap, inode, mask);</div><div class='add'>+</div><div class='add'>+	if (unlikely(((inode-&gt;i_mode &amp; 0111) != 0111) || !no_acl_inode(inode)))</div><div class='add'>+		return inode_permission(idmap, inode, mask);</div><div class='add'>+</div><div class='add'>+	return security_inode_permission(inode, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * path_get - get a reference to a path</div><div class='ctx'>  * @path: path to get the reference to</div><div class='hunk'>@@ -582,6 +685,7 @@ struct nameidata {</div><div class='ctx'> 		unsigned seq;</div><div class='ctx'> 	} *stack, internal[EMBEDDED_LEVELS];</div><div class='ctx'> 	struct filename	*name;</div><div class='add'>+	const char *pathname;</div><div class='ctx'> 	struct nameidata *saved;</div><div class='ctx'> 	unsigned	root_seq;</div><div class='ctx'> 	int		dfd;</div><div class='hunk'>@@ -600,6 +704,7 @@ static void __set_nameidata(struct nameidata *p, int dfd, struct filename *name)</div><div class='ctx'> 	p-&gt;depth = 0;</div><div class='ctx'> 	p-&gt;dfd = dfd;</div><div class='ctx'> 	p-&gt;name = name;</div><div class='add'>+	p-&gt;pathname = likely(name) ? name-&gt;name : "";</div><div class='ctx'> 	p-&gt;path.mnt = NULL;</div><div class='ctx'> 	p-&gt;path.dentry = NULL;</div><div class='ctx'> 	p-&gt;total_link_count = old ? old-&gt;total_link_count : 0;</div><div class='hunk'>@@ -680,7 +785,8 @@ static void leave_rcu(struct nameidata *nd)</div><div class='ctx'> </div><div class='ctx'> static void terminate_walk(struct nameidata *nd)</div><div class='ctx'> {</div><div class='del'>-	drop_links(nd);</div><div class='add'>+	if (unlikely(nd-&gt;depth))</div><div class='add'>+		drop_links(nd);</div><div class='ctx'> 	if (!(nd-&gt;flags &amp; LOOKUP_RCU)) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		path_put(&amp;nd-&gt;path);</div><div class='hunk'>@@ -777,7 +883,7 @@ static bool try_to_unlazy(struct nameidata *nd)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!(nd-&gt;flags &amp; LOOKUP_RCU));</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!legitimize_links(nd)))</div><div class='add'>+	if (unlikely(nd-&gt;depth &amp;&amp; !legitimize_links(nd)))</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	if (unlikely(!legitimize_path(nd, &amp;nd-&gt;path, nd-&gt;seq)))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -812,7 +918,7 @@ static bool try_to_unlazy_next(struct nameidata *nd, struct dentry *dentry)</div><div class='ctx'> 	int res;</div><div class='ctx'> 	BUG_ON(!(nd-&gt;flags &amp; LOOKUP_RCU));</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!legitimize_links(nd)))</div><div class='add'>+	if (unlikely(nd-&gt;depth &amp;&amp; !legitimize_links(nd)))</div><div class='ctx'> 		goto out2;</div><div class='ctx'> 	res = __legitimize_mnt(nd-&gt;path.mnt, nd-&gt;m_seq);</div><div class='ctx'> 	if (unlikely(res)) {</div><div class='hunk'>@@ -856,10 +962,11 @@ out_dput:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static inline int d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			       struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(dentry-&gt;d_flags &amp; DCACHE_OP_REVALIDATE))</div><div class='del'>-		return dentry-&gt;d_op-&gt;d_revalidate(dentry, flags);</div><div class='add'>+		return dentry-&gt;d_op-&gt;d_revalidate(dir, name, dentry, flags);</div><div class='ctx'> 	else</div><div class='ctx'> 		return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -884,8 +991,8 @@ static int complete_walk(struct nameidata *nd)</div><div class='ctx'> 		 * We don't want to zero nd-&gt;root for scoped-lookups or</div><div class='ctx'> 		 * externally-managed nd-&gt;root.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(nd-&gt;state &amp; ND_ROOT_PRESET))</div><div class='del'>-			if (!(nd-&gt;flags &amp; LOOKUP_IS_SCOPED))</div><div class='add'>+		if (likely(!(nd-&gt;state &amp; ND_ROOT_PRESET)))</div><div class='add'>+			if (likely(!(nd-&gt;flags &amp; LOOKUP_IS_SCOPED)))</div><div class='ctx'> 				nd-&gt;root.mnt = NULL;</div><div class='ctx'> 		nd-&gt;flags &amp;= ~LOOKUP_CACHED;</div><div class='ctx'> 		if (!try_to_unlazy(nd))</div><div class='hunk'>@@ -945,10 +1052,10 @@ static int set_root(struct nameidata *nd)</div><div class='ctx'> 		unsigned seq;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			seq = read_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+			seq = read_seqbegin(&amp;fs-&gt;seq);</div><div class='ctx'> 			nd-&gt;root = fs-&gt;root;</div><div class='ctx'> 			nd-&gt;root_seq = __read_seqcount_begin(&amp;nd-&gt;root.dentry-&gt;d_seq);</div><div class='del'>-		} while (read_seqcount_retry(&amp;fs-&gt;seq, seq));</div><div class='add'>+		} while (read_seqretry(&amp;fs-&gt;seq, seq));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		get_fs_root(fs, &amp;nd-&gt;root);</div><div class='ctx'> 		nd-&gt;state |= ND_ROOT_GRABBED;</div><div class='hunk'>@@ -967,7 +1074,7 @@ static int nd_jump_root(struct nameidata *nd)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!nd-&gt;root.mnt) {</div><div class='ctx'> 		int error = set_root(nd);</div><div class='del'>-		if (error)</div><div class='add'>+		if (unlikely(error))</div><div class='ctx'> 			return error;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='hunk'>@@ -1034,7 +1141,7 @@ static int sysctl_protected_fifos __read_mostly;</div><div class='ctx'> static int sysctl_protected_regular __read_mostly;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static struct ctl_table namei_sysctls[] = {</div><div class='add'>+static const struct ctl_table namei_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "protected_symlinks",</div><div class='ctx'> 		.data		= &amp;sysctl_protected_symlinks,</div><div class='hunk'>@@ -1234,29 +1341,48 @@ int may_linkat(struct mnt_idmap *idmap, const struct path *link)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 if the open is allowed, -ve on error.</div><div class='ctx'>  */</div><div class='del'>-static int may_create_in_sticky(struct mnt_idmap *idmap,</div><div class='del'>-				struct nameidata *nd, struct inode *const inode)</div><div class='add'>+static int may_create_in_sticky(struct mnt_idmap *idmap, struct nameidata *nd,</div><div class='add'>+				struct inode *const inode)</div><div class='ctx'> {</div><div class='ctx'> 	umode_t dir_mode = nd-&gt;dir_mode;</div><div class='del'>-	vfsuid_t dir_vfsuid = nd-&gt;dir_vfsuid;</div><div class='add'>+	vfsuid_t dir_vfsuid = nd-&gt;dir_vfsuid, i_vfsuid;</div><div class='add'>+</div><div class='add'>+	if (likely(!(dir_mode &amp; S_ISVTX)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode) &amp;&amp; !sysctl_protected_regular)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (S_ISFIFO(inode-&gt;i_mode) &amp;&amp; !sysctl_protected_fifos)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	i_vfsuid = i_uid_into_vfsuid(idmap, inode);</div><div class='add'>+</div><div class='add'>+	if (vfsuid_eq(i_vfsuid, dir_vfsuid))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((!sysctl_protected_fifos &amp;&amp; S_ISFIFO(inode-&gt;i_mode)) ||</div><div class='del'>-	    (!sysctl_protected_regular &amp;&amp; S_ISREG(inode-&gt;i_mode)) ||</div><div class='del'>-	    likely(!(dir_mode &amp; S_ISVTX)) ||</div><div class='del'>-	    vfsuid_eq(i_uid_into_vfsuid(idmap, inode), dir_vfsuid) ||</div><div class='del'>-	    vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode), current_fsuid()))</div><div class='add'>+	if (vfsuid_eq_kuid(i_vfsuid, current_fsuid()))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (likely(dir_mode &amp; 0002) ||</div><div class='del'>-	    (dir_mode &amp; 0020 &amp;&amp;</div><div class='del'>-	     ((sysctl_protected_fifos &gt;= 2 &amp;&amp; S_ISFIFO(inode-&gt;i_mode)) ||</div><div class='del'>-	      (sysctl_protected_regular &gt;= 2 &amp;&amp; S_ISREG(inode-&gt;i_mode))))) {</div><div class='del'>-		const char *operation = S_ISFIFO(inode-&gt;i_mode) ?</div><div class='del'>-					"sticky_create_fifo" :</div><div class='del'>-					"sticky_create_regular";</div><div class='del'>-		audit_log_path_denied(AUDIT_ANOM_CREAT, operation);</div><div class='add'>+	if (likely(dir_mode &amp; 0002)) {</div><div class='add'>+		audit_log_path_denied(AUDIT_ANOM_CREAT, "sticky_create");</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (dir_mode &amp; 0020) {</div><div class='add'>+		if (sysctl_protected_fifos &gt;= 2 &amp;&amp; S_ISFIFO(inode-&gt;i_mode)) {</div><div class='add'>+			audit_log_path_denied(AUDIT_ANOM_CREAT,</div><div class='add'>+					      "sticky_create_fifo");</div><div class='add'>+			return -EACCES;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sysctl_protected_regular &gt;= 2 &amp;&amp; S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+			audit_log_path_denied(AUDIT_ANOM_CREAT,</div><div class='add'>+					      "sticky_create_regular");</div><div class='add'>+			return -EACCES;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1363,6 +1489,10 @@ static int follow_automount(struct path *path, int *count, unsigned lookup_flags</div><div class='ctx'> 	    dentry-&gt;d_inode)</div><div class='ctx'> 		return -EISDIR;</div><div class='ctx'> </div><div class='add'>+	/* No need to trigger automounts if mountpoint crossing is disabled. */</div><div class='add'>+	if (lookup_flags &amp; LOOKUP_NO_XDEV)</div><div class='add'>+		return -EXDEV;</div><div class='add'>+</div><div class='ctx'> 	if (count &amp;&amp; (*count)++ &gt;= MAXSYMLINKS)</div><div class='ctx'> 		return -ELOOP;</div><div class='ctx'> </div><div class='hunk'>@@ -1383,9 +1513,13 @@ static int __traverse_mounts(struct path *path, unsigned flags, bool *jumped,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (flags &amp; DCACHE_MANAGED_DENTRY) {</div><div class='del'>-		/* Allow the filesystem to manage the transit without i_mutex</div><div class='add'>+		/* Allow the filesystem to manage the transit without i_rwsem</div><div class='ctx'> 		 * being held. */</div><div class='ctx'> 		if (flags &amp; DCACHE_MANAGE_TRANSIT) {</div><div class='add'>+			if (lookup_flags &amp; LOOKUP_NO_XDEV) {</div><div class='add'>+				ret = -EXDEV;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			ret = path-&gt;dentry-&gt;d_op-&gt;d_manage(path, false);</div><div class='ctx'> 			flags = smp_load_acquire(&amp;path-&gt;dentry-&gt;d_flags);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='hunk'>@@ -1403,6 +1537,10 @@ static int __traverse_mounts(struct path *path, unsigned flags, bool *jumped,</div><div class='ctx'> 				// here we know it's positive</div><div class='ctx'> 				flags = path-&gt;dentry-&gt;d_flags;</div><div class='ctx'> 				need_mntput = true;</div><div class='add'>+				if (unlikely(lookup_flags &amp; LOOKUP_NO_XDEV)) {</div><div class='add'>+					ret = -EXDEV;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1534,22 +1672,20 @@ static inline int handle_mounts(struct nameidata *nd, struct dentry *dentry,</div><div class='ctx'> 	path-&gt;dentry = dentry;</div><div class='ctx'> 	if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='ctx'> 		unsigned int seq = nd-&gt;next_seq;</div><div class='add'>+		if (likely(!d_managed(dentry)))</div><div class='add'>+			return 0;</div><div class='ctx'> 		if (likely(__follow_mount_rcu(nd, path)))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		// *path and nd-&gt;next_seq might've been clobbered</div><div class='ctx'> 		path-&gt;mnt = nd-&gt;path.mnt;</div><div class='ctx'> 		path-&gt;dentry = dentry;</div><div class='ctx'> 		nd-&gt;next_seq = seq;</div><div class='del'>-		if (!try_to_unlazy_next(nd, dentry))</div><div class='add'>+		if (unlikely(!try_to_unlazy_next(nd, dentry)))</div><div class='ctx'> 			return -ECHILD;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = traverse_mounts(path, &amp;jumped, &amp;nd-&gt;total_link_count, nd-&gt;flags);</div><div class='del'>-	if (jumped) {</div><div class='del'>-		if (unlikely(nd-&gt;flags &amp; LOOKUP_NO_XDEV))</div><div class='del'>-			ret = -EXDEV;</div><div class='del'>-		else</div><div class='del'>-			nd-&gt;state |= ND_JUMPED;</div><div class='del'>-	}</div><div class='add'>+	if (jumped)</div><div class='add'>+		nd-&gt;state |= ND_JUMPED;</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='ctx'> 		dput(path-&gt;dentry);</div><div class='ctx'> 		if (path-&gt;mnt != nd-&gt;path.mnt)</div><div class='hunk'>@@ -1568,7 +1704,7 @@ static struct dentry *lookup_dcache(const struct qstr *name,</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = d_lookup(dir, name);</div><div class='ctx'> 	if (dentry) {</div><div class='del'>-		int error = d_revalidate(dentry, flags);</div><div class='add'>+		int error = d_revalidate(dir-&gt;d_inode, name, dentry, flags);</div><div class='ctx'> 		if (unlikely(error &lt;= 0)) {</div><div class='ctx'> 			if (!error)</div><div class='ctx'> 				d_invalidate(dentry);</div><div class='hunk'>@@ -1585,19 +1721,22 @@ static struct dentry *lookup_dcache(const struct qstr *name,</div><div class='ctx'>  * dentries - as the matter of fact, this only gets called</div><div class='ctx'>  * when directory is guaranteed to have no in-lookup children</div><div class='ctx'>  * at all.</div><div class='add'>+ * Will return -ENOENT if name isn't found and LOOKUP_CREATE wasn't passed.</div><div class='add'>+ * Will return -EEXIST if name is found and LOOKUP_EXCL was passed.</div><div class='ctx'>  */</div><div class='ctx'> struct dentry *lookup_one_qstr_excl(const struct qstr *name,</div><div class='del'>-				    struct dentry *base,</div><div class='del'>-				    unsigned int flags)</div><div class='add'>+				    struct dentry *base, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = lookup_dcache(name, base, flags);</div><div class='add'>+	struct dentry *dentry;</div><div class='ctx'> 	struct dentry *old;</div><div class='del'>-	struct inode *dir = base-&gt;d_inode;</div><div class='add'>+	struct inode *dir;</div><div class='ctx'> </div><div class='add'>+	dentry = lookup_dcache(name, base, flags);</div><div class='ctx'> 	if (dentry)</div><div class='del'>-		return dentry;</div><div class='add'>+		goto found;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't create child dentry for a dead directory. */</div><div class='add'>+	dir = base-&gt;d_inode;</div><div class='ctx'> 	if (unlikely(IS_DEADDIR(dir)))</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='hunk'>@@ -1610,10 +1749,35 @@ struct dentry *lookup_one_qstr_excl(const struct qstr *name,</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 		dentry = old;</div><div class='ctx'> 	}</div><div class='add'>+found:</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return dentry;</div><div class='add'>+	if (d_is_negative(dentry) &amp;&amp; !(flags &amp; LOOKUP_CREATE)) {</div><div class='add'>+		dput(dentry);</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='add'>+	if (d_is_positive(dentry) &amp;&amp; (flags &amp; LOOKUP_EXCL)) {</div><div class='add'>+		dput(dentry);</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+	}</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lookup_one_qstr_excl);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lookup_fast - do fast lockless (but racy) lookup of a dentry</div><div class='add'>+ * @nd: current nameidata</div><div class='add'>+ *</div><div class='add'>+ * Do a fast, but racy lookup in the dcache for the given dentry, and</div><div class='add'>+ * revalidate it. Returns a valid dentry pointer or NULL if one wasn't</div><div class='add'>+ * found. On error, an ERR_PTR will be returned.</div><div class='add'>+ *</div><div class='add'>+ * If this function returns a valid dentry and the walk is no longer</div><div class='add'>+ * lazy, the dentry will carry a reference that must later be put. If</div><div class='add'>+ * RCU mode is still in force, then this is not the case and the dentry</div><div class='add'>+ * must be legitimized before use. If this returns NULL, then the walk</div><div class='add'>+ * will no longer be in RCU mode.</div><div class='add'>+ */</div><div class='ctx'> static struct dentry *lookup_fast(struct nameidata *nd)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry, *parent = nd-&gt;path.dentry;</div><div class='hunk'>@@ -1639,19 +1803,20 @@ static struct dentry *lookup_fast(struct nameidata *nd)</div><div class='ctx'> 		if (read_seqcount_retry(&amp;parent-&gt;d_seq, nd-&gt;seq))</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='ctx'> </div><div class='del'>-		status = d_revalidate(dentry, nd-&gt;flags);</div><div class='add'>+		status = d_revalidate(nd-&gt;inode, &amp;nd-&gt;last, dentry, nd-&gt;flags);</div><div class='ctx'> 		if (likely(status &gt; 0))</div><div class='ctx'> 			return dentry;</div><div class='ctx'> 		if (!try_to_unlazy_next(nd, dentry))</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='ctx'> 		if (status == -ECHILD)</div><div class='ctx'> 			/* we'd been told to redo it in non-rcu mode */</div><div class='del'>-			status = d_revalidate(dentry, nd-&gt;flags);</div><div class='add'>+			status = d_revalidate(nd-&gt;inode, &amp;nd-&gt;last,</div><div class='add'>+					      dentry, nd-&gt;flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dentry = __d_lookup(parent, &amp;nd-&gt;last);</div><div class='ctx'> 		if (unlikely(!dentry))</div><div class='ctx'> 			return NULL;</div><div class='del'>-		status = d_revalidate(dentry, nd-&gt;flags);</div><div class='add'>+		status = d_revalidate(nd-&gt;inode, &amp;nd-&gt;last, dentry, nd-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(status &lt;= 0)) {</div><div class='ctx'> 		if (!status)</div><div class='hunk'>@@ -1679,7 +1844,7 @@ again:</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return dentry;</div><div class='ctx'> 	if (unlikely(!d_in_lookup(dentry))) {</div><div class='del'>-		int error = d_revalidate(dentry, flags);</div><div class='add'>+		int error = d_revalidate(inode, name, dentry, flags);</div><div class='ctx'> 		if (unlikely(error &lt;= 0)) {</div><div class='ctx'> 			if (!error) {</div><div class='ctx'> 				d_invalidate(dentry);</div><div class='hunk'>@@ -1700,7 +1865,7 @@ again:</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *lookup_slow(const struct qstr *name,</div><div class='add'>+static noinline struct dentry *lookup_slow(const struct qstr *name,</div><div class='ctx'> 				  struct dentry *dir,</div><div class='ctx'> 				  unsigned int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -1712,15 +1877,42 @@ static struct dentry *lookup_slow(const struct qstr *name,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dentry *lookup_slow_killable(const struct qstr *name,</div><div class='add'>+					   struct dentry *dir,</div><div class='add'>+					   unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = dir-&gt;d_inode;</div><div class='add'>+	struct dentry *res;</div><div class='add'>+</div><div class='add'>+	if (inode_lock_shared_killable(inode))</div><div class='add'>+		return ERR_PTR(-EINTR);</div><div class='add'>+	res = __lookup_slow(name, dir, flags);</div><div class='add'>+	inode_unlock_shared(inode);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int may_lookup(struct mnt_idmap *idmap,</div><div class='del'>-			     struct nameidata *nd)</div><div class='add'>+			     struct nameidata *restrict nd)</div><div class='ctx'> {</div><div class='del'>-	if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='del'>-		int err = inode_permission(idmap, nd-&gt;inode, MAY_EXEC|MAY_NOT_BLOCK);</div><div class='del'>-		if (err != -ECHILD || !try_to_unlazy(nd))</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return inode_permission(idmap, nd-&gt;inode, MAY_EXEC);</div><div class='add'>+	int err, mask;</div><div class='add'>+</div><div class='add'>+	mask = nd-&gt;flags &amp; LOOKUP_RCU ? MAY_NOT_BLOCK : 0;</div><div class='add'>+	err = lookup_inode_permission_may_exec(idmap, nd-&gt;inode, mask);</div><div class='add'>+	if (likely(!err))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	// If we failed, and we weren't in LOOKUP_RCU, it's final</div><div class='add'>+	if (!(nd-&gt;flags &amp; LOOKUP_RCU))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Drop out of RCU mode to make sure it wasn't transient</div><div class='add'>+	if (!try_to_unlazy(nd))</div><div class='add'>+		return -ECHILD;	// redo it all non-lazy</div><div class='add'>+</div><div class='add'>+	if (err != -ECHILD)	// hard error</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return lookup_inode_permission_may_exec(idmap, nd-&gt;inode, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reserve_stack(struct nameidata *nd, struct path *link)</div><div class='hunk'>@@ -1751,13 +1943,23 @@ static int reserve_stack(struct nameidata *nd, struct path *link)</div><div class='ctx'> </div><div class='ctx'> enum {WALK_TRAILING = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4};</div><div class='ctx'> </div><div class='del'>-static const char *pick_link(struct nameidata *nd, struct path *link,</div><div class='add'>+static noinline const char *pick_link(struct nameidata *nd, struct path *link,</div><div class='ctx'> 		     struct inode *inode, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct saved *last;</div><div class='ctx'> 	const char *res;</div><div class='del'>-	int error = reserve_stack(nd, link);</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='add'>+	if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='add'>+		/* make sure that d_is_symlink from step_into_slowpath() matches the inode */</div><div class='add'>+		if (read_seqcount_retry(&amp;link-&gt;dentry-&gt;d_seq, nd-&gt;next_seq))</div><div class='add'>+			return ERR_PTR(-ECHILD);</div><div class='add'>+	} else {</div><div class='add'>+		if (link-&gt;mnt == nd-&gt;path.mnt)</div><div class='add'>+			mntget(link-&gt;mnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = reserve_stack(nd, link);</div><div class='ctx'> 	if (unlikely(error)) {</div><div class='ctx'> 		if (!(nd-&gt;flags &amp; LOOKUP_RCU))</div><div class='ctx'> 			path_put(link);</div><div class='hunk'>@@ -1778,13 +1980,13 @@ static const char *pick_link(struct nameidata *nd, struct path *link,</div><div class='ctx'> 			unlikely(link-&gt;mnt-&gt;mnt_flags &amp; MNT_NOSYMFOLLOW))</div><div class='ctx'> 		return ERR_PTR(-ELOOP);</div><div class='ctx'> </div><div class='del'>-	if (!(nd-&gt;flags &amp; LOOKUP_RCU)) {</div><div class='add'>+	if (unlikely(atime_needs_update(&amp;last-&gt;link, inode))) {</div><div class='add'>+		if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='add'>+			if (!try_to_unlazy(nd))</div><div class='add'>+				return ERR_PTR(-ECHILD);</div><div class='add'>+		}</div><div class='ctx'> 		touch_atime(&amp;last-&gt;link);</div><div class='ctx'> 		cond_resched();</div><div class='del'>-	} else if (atime_needs_update(&amp;last-&gt;link, inode)) {</div><div class='del'>-		if (!try_to_unlazy(nd))</div><div class='del'>-			return ERR_PTR(-ECHILD);</div><div class='del'>-		touch_atime(&amp;last-&gt;link);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = security_inode_follow_link(link-&gt;dentry, inode,</div><div class='hunk'>@@ -1831,14 +2033,15 @@ all_done: // pure jump</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: dentry must be what nd-&gt;next_seq had been sampled from.</div><div class='ctx'>  */</div><div class='del'>-static const char *step_into(struct nameidata *nd, int flags,</div><div class='add'>+static noinline const char *step_into_slowpath(struct nameidata *nd, int flags,</div><div class='ctx'> 		     struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	int err = handle_mounts(nd, dentry, &amp;path);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	err = handle_mounts(nd, dentry, &amp;path);</div><div class='add'>+	if (unlikely(err &lt; 0))</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	inode = path.dentry-&gt;d_inode;</div><div class='ctx'> 	if (likely(!d_is_symlink(path.dentry)) ||</div><div class='hunk'>@@ -1860,15 +2063,32 @@ static const char *step_into(struct nameidata *nd, int flags,</div><div class='ctx'> 		nd-&gt;seq = nd-&gt;next_seq;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='del'>-		/* make sure that d_is_symlink above matches inode */</div><div class='del'>-		if (read_seqcount_retry(&amp;path.dentry-&gt;d_seq, nd-&gt;next_seq))</div><div class='add'>+	return pick_link(nd, &amp;path, inode, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline const char *step_into(struct nameidata *nd, int flags,</div><div class='add'>+                    struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * In the common case we are in rcu-walk and traversing over a non-mounted on</div><div class='add'>+	 * directory (as opposed to e.g., a symlink).</div><div class='add'>+	 *</div><div class='add'>+	 * We can handle that and negative entries with the checks below.</div><div class='add'>+	 */</div><div class='add'>+	if (likely((nd-&gt;flags &amp; LOOKUP_RCU) &amp;&amp;</div><div class='add'>+	    !d_managed(dentry) &amp;&amp; !d_is_symlink(dentry))) {</div><div class='add'>+		struct inode *inode = dentry-&gt;d_inode;</div><div class='add'>+		if (read_seqcount_retry(&amp;dentry-&gt;d_seq, nd-&gt;next_seq))</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='del'>-	} else {</div><div class='del'>-		if (path.mnt == nd-&gt;path.mnt)</div><div class='del'>-			mntget(path.mnt);</div><div class='add'>+		if (unlikely(!inode))</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+		nd-&gt;path.dentry = dentry;</div><div class='add'>+		/* nd-&gt;path.mnt is retained on purpose */</div><div class='add'>+		nd-&gt;inode = inode;</div><div class='add'>+		nd-&gt;seq = nd-&gt;next_seq;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	return pick_link(nd, &amp;path, inode, flags);</div><div class='add'>+	return step_into_slowpath(nd, flags, dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *follow_dotdot_rcu(struct nameidata *nd)</div><div class='hunk'>@@ -1951,7 +2171,7 @@ static const char *handle_dots(struct nameidata *nd, int type)</div><div class='ctx'> </div><div class='ctx'> 		if (!nd-&gt;root.mnt) {</div><div class='ctx'> 			error = ERR_PTR(set_root(nd));</div><div class='del'>-			if (error)</div><div class='add'>+			if (unlikely(error))</div><div class='ctx'> 				return error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (nd-&gt;flags &amp; LOOKUP_RCU)</div><div class='hunk'>@@ -1981,7 +2201,7 @@ static const char *handle_dots(struct nameidata *nd, int type)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *walk_component(struct nameidata *nd, int flags)</div><div class='add'>+static __always_inline const char *walk_component(struct nameidata *nd, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1990,7 +2210,7 @@ static const char *walk_component(struct nameidata *nd, int flags)</div><div class='ctx'> 	 * parent relationships.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(nd-&gt;last_type != LAST_NORM)) {</div><div class='del'>-		if (!(flags &amp; WALK_MORE) &amp;&amp; nd-&gt;depth)</div><div class='add'>+		if (unlikely(nd-&gt;depth) &amp;&amp; !(flags &amp; WALK_MORE))</div><div class='ctx'> 			put_link(nd);</div><div class='ctx'> 		return handle_dots(nd, nd-&gt;last_type);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2002,7 +2222,7 @@ static const char *walk_component(struct nameidata *nd, int flags)</div><div class='ctx'> 		if (IS_ERR(dentry))</div><div class='ctx'> 			return ERR_CAST(dentry);</div><div class='ctx'> 	}</div><div class='del'>-	if (!(flags &amp; WALK_MORE) &amp;&amp; nd-&gt;depth)</div><div class='add'>+	if (unlikely(nd-&gt;depth) &amp;&amp; !(flags &amp; WALK_MORE))</div><div class='ctx'> 		put_link(nd);</div><div class='ctx'> 	return step_into(nd, flags, dentry);</div><div class='ctx'> }</div><div class='hunk'>@@ -2160,21 +2380,39 @@ EXPORT_SYMBOL(hashlen_string);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Calculate the length and hash of the path component, and</div><div class='del'>- * return the "hash_len" as the result.</div><div class='add'>+ * return the length as the result.</div><div class='ctx'>  */</div><div class='del'>-static inline u64 hash_name(const void *salt, const char *name)</div><div class='add'>+static inline const char *hash_name(struct nameidata *nd,</div><div class='add'>+				    const char *name,</div><div class='add'>+				    unsigned long *lastword)</div><div class='ctx'> {</div><div class='del'>-	unsigned long a = 0, b, x = 0, y = (unsigned long)salt;</div><div class='add'>+	unsigned long a, b, x, y = (unsigned long)nd-&gt;path.dentry;</div><div class='ctx'> 	unsigned long adata, bdata, mask, len;</div><div class='ctx'> 	const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;</div><div class='ctx'> </div><div class='del'>-	len = 0;</div><div class='del'>-	goto inside;</div><div class='add'>+	/*</div><div class='add'>+	 * The first iteration is special, because it can result in</div><div class='add'>+	 * '.' and '..' and has no mixing other than the final fold.</div><div class='add'>+	 */</div><div class='add'>+	a = load_unaligned_zeropad(name);</div><div class='add'>+	b = a ^ REPEAT_BYTE('/');</div><div class='add'>+	if (has_zero(a, &amp;adata, &amp;constants) | has_zero(b, &amp;bdata, &amp;constants)) {</div><div class='add'>+		adata = prep_zero_mask(a, adata, &amp;constants);</div><div class='add'>+		bdata = prep_zero_mask(b, bdata, &amp;constants);</div><div class='add'>+		mask = create_zero_mask(adata | bdata);</div><div class='add'>+		a &amp;= zero_bytemask(mask);</div><div class='add'>+		*lastword = a;</div><div class='add'>+		len = find_zero(mask);</div><div class='add'>+		nd-&gt;last.hash = fold_hash(a, y);</div><div class='add'>+		nd-&gt;last.len = len;</div><div class='add'>+		return name + len;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	len = 0;</div><div class='add'>+	x = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		HASH_MIX(x, y, a);</div><div class='ctx'> 		len += sizeof(unsigned long);</div><div class='del'>-inside:</div><div class='ctx'> 		a = load_unaligned_zeropad(name+len);</div><div class='ctx'> 		b = a ^ REPEAT_BYTE('/');</div><div class='ctx'> 	} while (!(has_zero(a, &amp;adata, &amp;constants) | has_zero(b, &amp;bdata, &amp;constants)));</div><div class='hunk'>@@ -2182,11 +2420,25 @@ inside:</div><div class='ctx'> 	adata = prep_zero_mask(a, adata, &amp;constants);</div><div class='ctx'> 	bdata = prep_zero_mask(b, bdata, &amp;constants);</div><div class='ctx'> 	mask = create_zero_mask(adata | bdata);</div><div class='del'>-	x ^= a &amp; zero_bytemask(mask);</div><div class='add'>+	a &amp;= zero_bytemask(mask);</div><div class='add'>+	x ^= a;</div><div class='add'>+	len += find_zero(mask);</div><div class='add'>+	*lastword = 0;		// Multi-word components cannot be DOT or DOTDOT</div><div class='ctx'> </div><div class='del'>-	return hashlen_create(fold_hash(x, y), len + find_zero(mask));</div><div class='add'>+	nd-&gt;last.hash = fold_hash(x, y);</div><div class='add'>+	nd-&gt;last.len = len;</div><div class='add'>+	return name + len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Note that the 'last' word is always zero-masked, but</div><div class='add'>+ * was loaded as a possibly big-endian word.</div><div class='add'>+ */</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+  #define LAST_WORD_IS_DOT	(0x2eul &lt;&lt; (BITS_PER_LONG-8))</div><div class='add'>+  #define LAST_WORD_IS_DOTDOT	(0x2e2eul &lt;&lt; (BITS_PER_LONG-16))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #else	/* !CONFIG_DCACHE_WORD_ACCESS: Slow, byte-at-a-time version */</div><div class='ctx'> </div><div class='ctx'> /* Return the hash of a string of known length */</div><div class='hunk'>@@ -2219,22 +2471,35 @@ EXPORT_SYMBOL(hashlen_string);</div><div class='ctx'>  * We know there's a real path component here of at least</div><div class='ctx'>  * one character.</div><div class='ctx'>  */</div><div class='del'>-static inline u64 hash_name(const void *salt, const char *name)</div><div class='add'>+static inline const char *hash_name(struct nameidata *nd, const char *name, unsigned long *lastword)</div><div class='ctx'> {</div><div class='del'>-	unsigned long hash = init_name_hash(salt);</div><div class='del'>-	unsigned long len = 0, c;</div><div class='add'>+	unsigned long hash = init_name_hash(nd-&gt;path.dentry);</div><div class='add'>+	unsigned long len = 0, c, last = 0;</div><div class='ctx'> </div><div class='ctx'> 	c = (unsigned char)*name;</div><div class='ctx'> 	do {</div><div class='add'>+		last = (last &lt;&lt; 8) + c;</div><div class='ctx'> 		len++;</div><div class='ctx'> 		hash = partial_name_hash(c, hash);</div><div class='ctx'> 		c = (unsigned char)name[len];</div><div class='ctx'> 	} while (c &amp;&amp; c != '/');</div><div class='del'>-	return hashlen_create(end_name_hash(hash), len);</div><div class='add'>+</div><div class='add'>+	// This is reliable for DOT or DOTDOT, since the component</div><div class='add'>+	// cannot contain NUL characters - top bits being zero means</div><div class='add'>+	// we cannot have had any other pathnames.</div><div class='add'>+	*lastword = last;</div><div class='add'>+	nd-&gt;last.hash = end_name_hash(hash);</div><div class='add'>+	nd-&gt;last.len = len;</div><div class='add'>+	return name + len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef LAST_WORD_IS_DOT</div><div class='add'>+  #define LAST_WORD_IS_DOT	0x2e</div><div class='add'>+  #define LAST_WORD_IS_DOTDOT	0x2e2e</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Name resolution.</div><div class='ctx'>  * This is the basic name resolution function, turning a pathname into</div><div class='hunk'>@@ -2252,9 +2517,12 @@ static int link_path_walk(const char *name, struct nameidata *nd)</div><div class='ctx'> 	nd-&gt;flags |= LOOKUP_PARENT;</div><div class='ctx'> 	if (IS_ERR(name))</div><div class='ctx'> 		return PTR_ERR(name);</div><div class='del'>-	while (*name=='/')</div><div class='del'>-		name++;</div><div class='del'>-	if (!*name) {</div><div class='add'>+	if (*name == '/') {</div><div class='add'>+		do {</div><div class='add'>+			name++;</div><div class='add'>+		} while (unlikely(*name == '/'));</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!*name)) {</div><div class='ctx'> 		nd-&gt;dir_mode = 0; // short-circuit the 'hardening' idiocy</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2263,45 +2531,38 @@ static int link_path_walk(const char *name, struct nameidata *nd)</div><div class='ctx'> 	for(;;) {</div><div class='ctx'> 		struct mnt_idmap *idmap;</div><div class='ctx'> 		const char *link;</div><div class='del'>-		u64 hash_len;</div><div class='del'>-		int type;</div><div class='add'>+		unsigned long lastword;</div><div class='ctx'> </div><div class='ctx'> 		idmap = mnt_idmap(nd-&gt;path.mnt);</div><div class='ctx'> 		err = may_lookup(idmap, nd);</div><div class='del'>-		if (err)</div><div class='add'>+		if (unlikely(err))</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		hash_len = hash_name(nd-&gt;path.dentry, name);</div><div class='add'>+		nd-&gt;last.name = name;</div><div class='add'>+		name = hash_name(nd, name, &amp;lastword);</div><div class='ctx'> </div><div class='del'>-		type = LAST_NORM;</div><div class='del'>-		if (name[0] == '.') switch (hashlen_len(hash_len)) {</div><div class='del'>-			case 2:</div><div class='del'>-				if (name[1] == '.') {</div><div class='del'>-					type = LAST_DOTDOT;</div><div class='del'>-					nd-&gt;state |= ND_JUMPED;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				type = LAST_DOT;</div><div class='del'>-		}</div><div class='del'>-		if (likely(type == LAST_NORM)) {</div><div class='del'>-			struct dentry *parent = nd-&gt;path.dentry;</div><div class='add'>+		switch(lastword) {</div><div class='add'>+		case LAST_WORD_IS_DOTDOT:</div><div class='add'>+			nd-&gt;last_type = LAST_DOTDOT;</div><div class='add'>+			nd-&gt;state |= ND_JUMPED;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case LAST_WORD_IS_DOT:</div><div class='add'>+			nd-&gt;last_type = LAST_DOT;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			nd-&gt;last_type = LAST_NORM;</div><div class='ctx'> 			nd-&gt;state &amp;= ~ND_JUMPED;</div><div class='add'>+</div><div class='add'>+			struct dentry *parent = nd-&gt;path.dentry;</div><div class='ctx'> 			if (unlikely(parent-&gt;d_flags &amp; DCACHE_OP_HASH)) {</div><div class='del'>-				struct qstr this = { { .hash_len = hash_len }, .name = name };</div><div class='del'>-				err = parent-&gt;d_op-&gt;d_hash(parent, &amp;this);</div><div class='add'>+				err = parent-&gt;d_op-&gt;d_hash(parent, &amp;nd-&gt;last);</div><div class='ctx'> 				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='del'>-				hash_len = this.hash_len;</div><div class='del'>-				name = this.name;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nd-&gt;last.hash_len = hash_len;</div><div class='del'>-		nd-&gt;last.name = name;</div><div class='del'>-		nd-&gt;last_type = type;</div><div class='del'>-</div><div class='del'>-		name += hashlen_len(hash_len);</div><div class='ctx'> 		if (!*name)</div><div class='ctx'> 			goto OK;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2314,7 +2575,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)</div><div class='ctx'> 		if (unlikely(!*name)) {</div><div class='ctx'> OK:</div><div class='ctx'> 			/* pathname or trailing symlink, done */</div><div class='del'>-			if (!depth) {</div><div class='add'>+			if (likely(!depth)) {</div><div class='ctx'> 				nd-&gt;dir_vfsuid = i_uid_into_vfsuid(idmap, nd-&gt;inode);</div><div class='ctx'> 				nd-&gt;dir_mode = nd-&gt;inode-&gt;i_mode;</div><div class='ctx'> 				nd-&gt;flags &amp;= ~LOOKUP_PARENT;</div><div class='hunk'>@@ -2349,13 +2610,13 @@ OK:</div><div class='ctx'> static const char *path_init(struct nameidata *nd, unsigned flags)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='del'>-	const char *s = nd-&gt;name-&gt;name;</div><div class='add'>+	const char *s = nd-&gt;pathname;</div><div class='ctx'> </div><div class='ctx'> 	/* LOOKUP_CACHED requires RCU, ask caller to retry */</div><div class='del'>-	if ((flags &amp; (LOOKUP_RCU | LOOKUP_CACHED)) == LOOKUP_CACHED)</div><div class='add'>+	if (unlikely((flags &amp; (LOOKUP_RCU | LOOKUP_CACHED)) == LOOKUP_CACHED))</div><div class='ctx'> 		return ERR_PTR(-EAGAIN);</div><div class='ctx'> </div><div class='del'>-	if (!*s)</div><div class='add'>+	if (unlikely(!*s))</div><div class='ctx'> 		flags &amp;= ~LOOKUP_RCU;</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		rcu_read_lock();</div><div class='hunk'>@@ -2369,7 +2630,7 @@ static const char *path_init(struct nameidata *nd, unsigned flags)</div><div class='ctx'> 	nd-&gt;r_seq = __read_seqcount_begin(&amp;rename_lock.seqcount);</div><div class='ctx'> 	smp_rmb();</div><div class='ctx'> </div><div class='del'>-	if (nd-&gt;state &amp; ND_ROOT_PRESET) {</div><div class='add'>+	if (unlikely(nd-&gt;state &amp; ND_ROOT_PRESET)) {</div><div class='ctx'> 		struct dentry *root = nd-&gt;root.dentry;</div><div class='ctx'> 		struct inode *inode = root-&gt;d_inode;</div><div class='ctx'> 		if (*s &amp;&amp; unlikely(!d_can_lookup(root)))</div><div class='hunk'>@@ -2388,7 +2649,7 @@ static const char *path_init(struct nameidata *nd, unsigned flags)</div><div class='ctx'> 	nd-&gt;root.mnt = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Absolute pathname -- fetch the root (LOOKUP_IN_ROOT uses nd-&gt;dfd). */</div><div class='del'>-	if (*s == '/' &amp;&amp; !(flags &amp; LOOKUP_IN_ROOT)) {</div><div class='add'>+	if (*s == '/' &amp;&amp; likely(!(flags &amp; LOOKUP_IN_ROOT))) {</div><div class='ctx'> 		error = nd_jump_root(nd);</div><div class='ctx'> 		if (unlikely(error))</div><div class='ctx'> 			return ERR_PTR(error);</div><div class='hunk'>@@ -2402,31 +2663,35 @@ static const char *path_init(struct nameidata *nd, unsigned flags)</div><div class='ctx'> 			unsigned seq;</div><div class='ctx'> </div><div class='ctx'> 			do {</div><div class='del'>-				seq = read_seqcount_begin(&amp;fs-&gt;seq);</div><div class='add'>+				seq = read_seqbegin(&amp;fs-&gt;seq);</div><div class='ctx'> 				nd-&gt;path = fs-&gt;pwd;</div><div class='ctx'> 				nd-&gt;inode = nd-&gt;path.dentry-&gt;d_inode;</div><div class='ctx'> 				nd-&gt;seq = __read_seqcount_begin(&amp;nd-&gt;path.dentry-&gt;d_seq);</div><div class='del'>-			} while (read_seqcount_retry(&amp;fs-&gt;seq, seq));</div><div class='add'>+			} while (read_seqretry(&amp;fs-&gt;seq, seq));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			get_fs_pwd(current-&gt;fs, &amp;nd-&gt;path);</div><div class='ctx'> 			nd-&gt;inode = nd-&gt;path.dentry-&gt;d_inode;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Caller must check execute permissions on the starting path component */</div><div class='del'>-		struct fd f = fdget_raw(nd-&gt;dfd);</div><div class='add'>+		CLASS(fd_raw, f)(nd-&gt;dfd);</div><div class='ctx'> 		struct dentry *dentry;</div><div class='ctx'> </div><div class='del'>-		if (!f.file)</div><div class='add'>+		if (fd_empty(f))</div><div class='ctx'> 			return ERR_PTR(-EBADF);</div><div class='ctx'> </div><div class='del'>-		dentry = f.file-&gt;f_path.dentry;</div><div class='add'>+		if (flags &amp; LOOKUP_LINKAT_EMPTY) {</div><div class='add'>+			if (fd_file(f)-&gt;f_cred != current_cred() &amp;&amp;</div><div class='add'>+			    !ns_capable(fd_file(f)-&gt;f_cred-&gt;user_ns, CAP_DAC_READ_SEARCH))</div><div class='add'>+				return ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (*s &amp;&amp; unlikely(!d_can_lookup(dentry))) {</div><div class='del'>-			fdput(f);</div><div class='add'>+		dentry = fd_file(f)-&gt;f_path.dentry;</div><div class='add'>+</div><div class='add'>+		if (*s &amp;&amp; unlikely(!d_can_lookup(dentry)))</div><div class='ctx'> 			return ERR_PTR(-ENOTDIR);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		nd-&gt;path = f.file-&gt;f_path;</div><div class='add'>+		nd-&gt;path = fd_file(f)-&gt;f_path;</div><div class='ctx'> 		if (flags &amp; LOOKUP_RCU) {</div><div class='ctx'> 			nd-&gt;inode = nd-&gt;path.dentry-&gt;d_inode;</div><div class='ctx'> 			nd-&gt;seq = read_seqcount_begin(&amp;nd-&gt;path.dentry-&gt;d_seq);</div><div class='hunk'>@@ -2434,11 +2699,10 @@ static const char *path_init(struct nameidata *nd, unsigned flags)</div><div class='ctx'> 			path_get(&amp;nd-&gt;path);</div><div class='ctx'> 			nd-&gt;inode = nd-&gt;path.dentry-&gt;d_inode;</div><div class='ctx'> 		}</div><div class='del'>-		fdput(f);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* For scoped-lookups we need to set the root to the dirfd as well. */</div><div class='del'>-	if (flags &amp; LOOKUP_IS_SCOPED) {</div><div class='add'>+	if (unlikely(flags &amp; LOOKUP_IS_SCOPED)) {</div><div class='ctx'> 		nd-&gt;root = nd-&gt;path;</div><div class='ctx'> 		if (flags &amp; LOOKUP_RCU) {</div><div class='ctx'> 			nd-&gt;root_seq = nd-&gt;seq;</div><div class='hunk'>@@ -2501,7 +2765,7 @@ static int path_lookupat(struct nameidata *nd, unsigned flags, struct path *path</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int filename_lookup(int dfd, struct filename *name, unsigned flags,</div><div class='del'>-		    struct path *path, struct path *root)</div><div class='add'>+		    struct path *path, const struct path *root)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct nameidata nd;</div><div class='hunk'>@@ -2571,47 +2835,151 @@ static int filename_parentat(int dfd, struct filename *name,</div><div class='ctx'> 	return __filename_parentat(dfd, name, flags, parent, last, type, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * start_dirop - begin a create or remove dirop, performing locking and lookup</div><div class='add'>+ * @parent:       the dentry of the parent in which the operation will occur</div><div class='add'>+ * @name:         a qstr holding the name within that parent</div><div class='add'>+ * @lookup_flags: intent and other lookup flags.</div><div class='add'>+ *</div><div class='add'>+ * The lookup is performed and necessary locks are taken so that, on success,</div><div class='add'>+ * the returned dentry can be operated on safely.</div><div class='add'>+ * The qstr must already have the hash value calculated.</div><div class='add'>+ *</div><div class='add'>+ * Returns: a locked dentry, or an error.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static struct dentry *__start_dirop(struct dentry *parent, struct qstr *name,</div><div class='add'>+				    unsigned int lookup_flags,</div><div class='add'>+				    unsigned int state)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct inode *dir = d_inode(parent);</div><div class='add'>+</div><div class='add'>+	if (state == TASK_KILLABLE) {</div><div class='add'>+		int ret = down_write_killable_nested(&amp;dir-&gt;i_rwsem,</div><div class='add'>+						     I_MUTEX_PARENT);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+	} else {</div><div class='add'>+		inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='add'>+	}</div><div class='add'>+	dentry = lookup_one_qstr_excl(name, parent, lookup_flags);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		inode_unlock(dir);</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dentry *start_dirop(struct dentry *parent, struct qstr *name,</div><div class='add'>+			   unsigned int lookup_flags)</div><div class='add'>+{</div><div class='add'>+	return __start_dirop(parent, name, lookup_flags, TASK_NORMAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * end_dirop - signal completion of a dirop</div><div class='add'>+ * @de: the dentry which was returned by start_dirop or similar.</div><div class='add'>+ *</div><div class='add'>+ * If the de is an error, nothing happens. Otherwise any lock taken to</div><div class='add'>+ * protect the dentry is dropped and the dentry itself is release (dput()).</div><div class='add'>+ */</div><div class='add'>+void end_dirop(struct dentry *de)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ERR(de)) {</div><div class='add'>+		inode_unlock(de-&gt;d_parent-&gt;d_inode);</div><div class='add'>+		dput(de);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(end_dirop);</div><div class='add'>+</div><div class='ctx'> /* does lookup, returns the object with parent locked */</div><div class='del'>-static struct dentry *__kern_path_locked(int dfd, struct filename *name, struct path *path)</div><div class='add'>+static struct dentry *__start_removing_path(int dfd, struct filename *name,</div><div class='add'>+					   struct path *path)</div><div class='ctx'> {</div><div class='add'>+	struct path parent_path __free(path_put) = {};</div><div class='ctx'> 	struct dentry *d;</div><div class='ctx'> 	struct qstr last;</div><div class='ctx'> 	int type, error;</div><div class='ctx'> </div><div class='del'>-	error = filename_parentat(dfd, name, 0, path, &amp;last, &amp;type);</div><div class='add'>+	error = filename_parentat(dfd, name, 0, &amp;parent_path, &amp;last, &amp;type);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return ERR_PTR(error);</div><div class='del'>-	if (unlikely(type != LAST_NORM)) {</div><div class='del'>-		path_put(path);</div><div class='add'>+	if (unlikely(type != LAST_NORM))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-	inode_lock_nested(path-&gt;dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	d = lookup_one_qstr_excl(&amp;last, path-&gt;dentry, 0);</div><div class='del'>-	if (IS_ERR(d)) {</div><div class='del'>-		inode_unlock(path-&gt;dentry-&gt;d_inode);</div><div class='del'>-		path_put(path);</div><div class='del'>-	}</div><div class='add'>+	/* don't fail immediately if it's r/o, at least try to report other errors */</div><div class='add'>+	error = mnt_want_write(parent_path.mnt);</div><div class='add'>+	d = start_dirop(parent_path.dentry, &amp;last, 0);</div><div class='add'>+	if (IS_ERR(d))</div><div class='add'>+		goto drop;</div><div class='add'>+	if (error)</div><div class='add'>+		goto fail;</div><div class='add'>+	path-&gt;dentry = no_free_ptr(parent_path.dentry);</div><div class='add'>+	path-&gt;mnt = no_free_ptr(parent_path.mnt);</div><div class='add'>+	return d;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	end_dirop(d);</div><div class='add'>+	d = ERR_PTR(error);</div><div class='add'>+drop:</div><div class='add'>+	if (!error)</div><div class='add'>+		mnt_drop_write(parent_path.mnt);</div><div class='add'>+	return d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kern_path_parent: lookup path returning parent and target</div><div class='add'>+ * @name: path name</div><div class='add'>+ * @path: path to store parent in</div><div class='add'>+ *</div><div class='add'>+ * The path @name should end with a normal component, not "." or ".." or "/".</div><div class='add'>+ * A lookup is performed and if successful the parent information</div><div class='add'>+ * is store in @parent and the dentry is returned.</div><div class='add'>+ *</div><div class='add'>+ * The dentry maybe negative, the parent will be positive.</div><div class='add'>+ *</div><div class='add'>+ * Returns:  dentry or error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *kern_path_parent(const char *name, struct path *path)</div><div class='add'>+{</div><div class='add'>+	struct path parent_path __free(path_put) = {};</div><div class='add'>+	struct filename *filename __free(putname) = getname_kernel(name);</div><div class='add'>+	struct dentry *d;</div><div class='add'>+	struct qstr last;</div><div class='add'>+	int type, error;</div><div class='add'>+</div><div class='add'>+	error = filename_parentat(AT_FDCWD, filename, 0, &amp;parent_path, &amp;last, &amp;type);</div><div class='add'>+	if (error)</div><div class='add'>+		return ERR_PTR(error);</div><div class='add'>+	if (unlikely(type != LAST_NORM))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	d = lookup_noperm_unlocked(&amp;last, parent_path.dentry);</div><div class='add'>+	if (IS_ERR(d))</div><div class='add'>+		return d;</div><div class='add'>+	path-&gt;dentry = no_free_ptr(parent_path.dentry);</div><div class='add'>+	path-&gt;mnt = no_free_ptr(parent_path.mnt);</div><div class='ctx'> 	return d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *kern_path_locked(const char *name, struct path *path)</div><div class='add'>+struct dentry *start_removing_path(const char *name, struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *filename = getname_kernel(name);</div><div class='del'>-	struct dentry *res = __kern_path_locked(AT_FDCWD, filename, path);</div><div class='add'>+	struct dentry *res = __start_removing_path(AT_FDCWD, filename, path);</div><div class='ctx'> </div><div class='ctx'> 	putname(filename);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *user_path_locked_at(int dfd, const char __user *name, struct path *path)</div><div class='add'>+struct dentry *start_removing_user_path_at(int dfd,</div><div class='add'>+					   const char __user *name,</div><div class='add'>+					   struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *filename = getname(name);</div><div class='del'>-	struct dentry *res = __kern_path_locked(dfd, filename, path);</div><div class='add'>+	struct dentry *res = __start_removing_path(dfd, filename, path);</div><div class='ctx'> </div><div class='ctx'> 	putname(filename);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(user_path_locked_at);</div><div class='add'>+EXPORT_SYMBOL(start_removing_user_path_at);</div><div class='ctx'> </div><div class='ctx'> int kern_path(const char *name, unsigned int flags, struct path *path)</div><div class='ctx'> {</div><div class='hunk'>@@ -2666,20 +3034,17 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vfs_path_lookup);</div><div class='ctx'> </div><div class='del'>-static int lookup_one_common(struct mnt_idmap *idmap,</div><div class='del'>-			     const char *name, struct dentry *base, int len,</div><div class='del'>-			     struct qstr *this)</div><div class='add'>+int lookup_noperm_common(struct qstr *qname, struct dentry *base)</div><div class='ctx'> {</div><div class='del'>-	this-&gt;name = name;</div><div class='del'>-	this-&gt;len = len;</div><div class='del'>-	this-&gt;hash = full_name_hash(base, name, len);</div><div class='add'>+	const char *name = qname-&gt;name;</div><div class='add'>+	u32 len = qname-&gt;len;</div><div class='add'>+</div><div class='add'>+	qname-&gt;hash = full_name_hash(base, name, len);</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(name[0] == '.')) {</div><div class='del'>-		if (len &lt; 2 || (len == 2 &amp;&amp; name[1] == '.'))</div><div class='del'>-			return -EACCES;</div><div class='del'>-	}</div><div class='add'>+	if (is_dot_dotdot(name, len))</div><div class='add'>+		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	while (len--) {</div><div class='ctx'> 		unsigned int c = *(const unsigned char *)name++;</div><div class='hunk'>@@ -2691,140 +3056,136 @@ static int lookup_one_common(struct mnt_idmap *idmap,</div><div class='ctx'> 	 * to use its own hash..</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (base-&gt;d_flags &amp; DCACHE_OP_HASH) {</div><div class='del'>-		int err = base-&gt;d_op-&gt;d_hash(base, this);</div><div class='add'>+		int err = base-&gt;d_op-&gt;d_hash(base, qname);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int lookup_one_common(struct mnt_idmap *idmap,</div><div class='add'>+			     struct qstr *qname, struct dentry *base)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	err = lookup_noperm_common(qname, base);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	return inode_permission(idmap, base-&gt;d_inode, MAY_EXEC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * try_lookup_one_len - filesystem helper to lookup single pathname component</div><div class='del'>- * @name:	pathname component to lookup</div><div class='add'>+ * try_lookup_noperm - filesystem helper to lookup single pathname component</div><div class='add'>+ * @name:	qstr storing pathname component to lookup</div><div class='ctx'>  * @base:	base directory to lookup from</div><div class='del'>- * @len:	maximum length @len should be interpreted to</div><div class='ctx'>  *</div><div class='ctx'>  * Look up a dentry by name in the dcache, returning NULL if it does not</div><div class='del'>- * currently exist.  The function does not try to create a dentry.</div><div class='add'>+ * currently exist.  The function does not try to create a dentry and if one</div><div class='add'>+ * is found it doesn't try to revalidate it.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that this routine is purely a helper for filesystem usage and should</div><div class='del'>- * not be called by generic code.</div><div class='add'>+ * not be called by generic code.  It does no permission checking.</div><div class='add'>+ *</div><div class='add'>+ * No locks need be held - only a counted reference to @base is needed.</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold base-&gt;i_mutex.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *try_lookup_one_len(const char *name, struct dentry *base, int len)</div><div class='add'>+struct dentry *try_lookup_noperm(struct qstr *name, struct dentry *base)</div><div class='ctx'> {</div><div class='del'>-	struct qstr this;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(!inode_is_locked(base-&gt;d_inode));</div><div class='del'>-</div><div class='del'>-	err = lookup_one_common(&amp;nop_mnt_idmap, name, base, len, &amp;this);</div><div class='add'>+	err = lookup_noperm_common(name, base);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	return lookup_dcache(&amp;this, base, 0);</div><div class='add'>+	return d_lookup(base, name);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(try_lookup_one_len);</div><div class='add'>+EXPORT_SYMBOL(try_lookup_noperm);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lookup_one_len - filesystem helper to lookup single pathname component</div><div class='del'>- * @name:	pathname component to lookup</div><div class='add'>+ * lookup_noperm - filesystem helper to lookup single pathname component</div><div class='add'>+ * @name:	qstr storing pathname component to lookup</div><div class='ctx'>  * @base:	base directory to lookup from</div><div class='del'>- * @len:	maximum length @len should be interpreted to</div><div class='ctx'>  *</div><div class='ctx'>  * Note that this routine is purely a helper for filesystem usage and should</div><div class='del'>- * not be called by generic code.</div><div class='add'>+ * not be called by generic code.  It does no permission checking.</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold base-&gt;i_mutex.</div><div class='add'>+ * The caller must hold base-&gt;i_rwsem.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)</div><div class='add'>+struct dentry *lookup_noperm(struct qstr *name, struct dentry *base)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	struct qstr this;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!inode_is_locked(base-&gt;d_inode));</div><div class='ctx'> </div><div class='del'>-	err = lookup_one_common(&amp;nop_mnt_idmap, name, base, len, &amp;this);</div><div class='add'>+	err = lookup_noperm_common(name, base);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_dcache(&amp;this, base, 0);</div><div class='del'>-	return dentry ? dentry : __lookup_slow(&amp;this, base, 0);</div><div class='add'>+	dentry = lookup_dcache(name, base, 0);</div><div class='add'>+	return dentry ? dentry : __lookup_slow(name, base, 0);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(lookup_one_len);</div><div class='add'>+EXPORT_SYMBOL(lookup_noperm);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lookup_one - filesystem helper to lookup single pathname component</div><div class='add'>+ * lookup_one - lookup single pathname component</div><div class='ctx'>  * @idmap:	idmap of the mount the lookup is performed from</div><div class='del'>- * @name:	pathname component to lookup</div><div class='add'>+ * @name:	qstr holding pathname component to lookup</div><div class='ctx'>  * @base:	base directory to lookup from</div><div class='del'>- * @len:	maximum length @len should be interpreted to</div><div class='ctx'>  *</div><div class='del'>- * Note that this routine is purely a helper for filesystem usage and should</div><div class='del'>- * not be called by generic code.</div><div class='add'>+ * This can be used for in-kernel filesystem clients such as file servers.</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold base-&gt;i_mutex.</div><div class='add'>+ * The caller must hold base-&gt;i_rwsem.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *lookup_one(struct mnt_idmap *idmap, const char *name,</div><div class='del'>-			  struct dentry *base, int len)</div><div class='add'>+struct dentry *lookup_one(struct mnt_idmap *idmap, struct qstr *name,</div><div class='add'>+			  struct dentry *base)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	struct qstr this;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!inode_is_locked(base-&gt;d_inode));</div><div class='ctx'> </div><div class='del'>-	err = lookup_one_common(idmap, name, base, len, &amp;this);</div><div class='add'>+	err = lookup_one_common(idmap, name, base);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_dcache(&amp;this, base, 0);</div><div class='del'>-	return dentry ? dentry : __lookup_slow(&amp;this, base, 0);</div><div class='add'>+	dentry = lookup_dcache(name, base, 0);</div><div class='add'>+	return dentry ? dentry : __lookup_slow(name, base, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lookup_one);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lookup_one_unlocked - filesystem helper to lookup single pathname component</div><div class='add'>+ * lookup_one_unlocked - lookup single pathname component</div><div class='ctx'>  * @idmap:	idmap of the mount the lookup is performed from</div><div class='del'>- * @name:	pathname component to lookup</div><div class='add'>+ * @name:	qstr olding pathname component to lookup</div><div class='ctx'>  * @base:	base directory to lookup from</div><div class='del'>- * @len:	maximum length @len should be interpreted to</div><div class='ctx'>  *</div><div class='del'>- * Note that this routine is purely a helper for filesystem usage and should</div><div class='del'>- * not be called by generic code.</div><div class='add'>+ * This can be used for in-kernel filesystem clients such as file servers.</div><div class='ctx'>  *</div><div class='del'>- * Unlike lookup_one_len, it should be called without the parent</div><div class='del'>- * i_mutex held, and will take the i_mutex itself if necessary.</div><div class='add'>+ * Unlike lookup_one, it should be called without the parent</div><div class='add'>+ * i_rwsem held, and will take the i_rwsem itself if necessary.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *lookup_one_unlocked(struct mnt_idmap *idmap,</div><div class='del'>-				   const char *name, struct dentry *base,</div><div class='del'>-				   int len)</div><div class='add'>+struct dentry *lookup_one_unlocked(struct mnt_idmap *idmap, struct qstr *name,</div><div class='add'>+				   struct dentry *base)</div><div class='ctx'> {</div><div class='del'>-	struct qstr this;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct dentry *ret;</div><div class='ctx'> </div><div class='del'>-	err = lookup_one_common(idmap, name, base, len, &amp;this);</div><div class='add'>+	err = lookup_one_common(idmap, name, base);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	ret = lookup_dcache(&amp;this, base, 0);</div><div class='add'>+	ret = lookup_dcache(name, base, 0);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = lookup_slow(&amp;this, base, 0);</div><div class='add'>+		ret = lookup_slow(name, base, 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lookup_one_unlocked);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lookup_one_positive_unlocked - filesystem helper to lookup single</div><div class='del'>- *				  pathname component</div><div class='add'>+ * lookup_one_positive_killable - lookup single pathname component</div><div class='ctx'>  * @idmap:	idmap of the mount the lookup is performed from</div><div class='del'>- * @name:	pathname component to lookup</div><div class='add'>+ * @name:	qstr olding pathname component to lookup</div><div class='ctx'>  * @base:	base directory to lookup from</div><div class='del'>- * @len:	maximum length @len should be interpreted to</div><div class='ctx'>  *</div><div class='ctx'>  * This helper will yield ERR_PTR(-ENOENT) on negatives. The helper returns</div><div class='ctx'>  * known positive or ERR_PTR(). This is what most of the users want.</div><div class='hunk'>@@ -2833,16 +3194,56 @@ EXPORT_SYMBOL(lookup_one_unlocked);</div><div class='ctx'>  * time, so callers of lookup_one_unlocked() need to be very careful; pinned</div><div class='ctx'>  * positives have &gt;d_inode stable, so this one avoids such problems.</div><div class='ctx'>  *</div><div class='del'>- * Note that this routine is purely a helper for filesystem usage and should</div><div class='del'>- * not be called by generic code.</div><div class='add'>+ * This can be used for in-kernel filesystem clients such as file servers.</div><div class='ctx'>  *</div><div class='del'>- * The helper should be called without i_mutex held.</div><div class='add'>+ * It should be called without the parent i_rwsem held, and will take</div><div class='add'>+ * the i_rwsem itself if necessary.  If a fatal signal is pending or</div><div class='add'>+ * delivered, it will return %-EINTR if the lock is needed.</div><div class='add'>+ */</div><div class='add'>+struct dentry *lookup_one_positive_killable(struct mnt_idmap *idmap,</div><div class='add'>+					    struct qstr *name,</div><div class='add'>+					    struct dentry *base)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+</div><div class='add'>+	err = lookup_one_common(idmap, name, base);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	ret = lookup_dcache(name, base, 0);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = lookup_slow_killable(name, base, 0);</div><div class='add'>+	if (!IS_ERR(ret) &amp;&amp; d_flags_negative(smp_load_acquire(&amp;ret-&gt;d_flags))) {</div><div class='add'>+		dput(ret);</div><div class='add'>+		ret = ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(lookup_one_positive_killable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lookup_one_positive_unlocked - lookup single pathname component</div><div class='add'>+ * @idmap:	idmap of the mount the lookup is performed from</div><div class='add'>+ * @name:	qstr holding pathname component to lookup</div><div class='add'>+ * @base:	base directory to lookup from</div><div class='add'>+ *</div><div class='add'>+ * This helper will yield ERR_PTR(-ENOENT) on negatives. The helper returns</div><div class='add'>+ * known positive or ERR_PTR(). This is what most of the users want.</div><div class='add'>+ *</div><div class='add'>+ * Note that pinned negative with unlocked parent _can_ become positive at any</div><div class='add'>+ * time, so callers of lookup_one_unlocked() need to be very careful; pinned</div><div class='add'>+ * positives have &gt;d_inode stable, so this one avoids such problems.</div><div class='add'>+ *</div><div class='add'>+ * This can be used for in-kernel filesystem clients such as file servers.</div><div class='add'>+ *</div><div class='add'>+ * The helper should be called without i_rwsem held.</div><div class='ctx'>  */</div><div class='ctx'> struct dentry *lookup_one_positive_unlocked(struct mnt_idmap *idmap,</div><div class='del'>-					    const char *name,</div><div class='del'>-					    struct dentry *base, int len)</div><div class='add'>+					    struct qstr *name,</div><div class='add'>+					    struct dentry *base)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *ret = lookup_one_unlocked(idmap, name, base, len);</div><div class='add'>+	struct dentry *ret = lookup_one_unlocked(idmap, name, base);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(ret) &amp;&amp; d_flags_negative(smp_load_acquire(&amp;ret-&gt;d_flags))) {</div><div class='ctx'> 		dput(ret);</div><div class='hunk'>@@ -2853,38 +3254,284 @@ struct dentry *lookup_one_positive_unlocked(struct mnt_idmap *idmap,</div><div class='ctx'> EXPORT_SYMBOL(lookup_one_positive_unlocked);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lookup_one_len_unlocked - filesystem helper to lookup single pathname component</div><div class='add'>+ * lookup_noperm_unlocked - filesystem helper to lookup single pathname component</div><div class='ctx'>  * @name:	pathname component to lookup</div><div class='ctx'>  * @base:	base directory to lookup from</div><div class='del'>- * @len:	maximum length @len should be interpreted to</div><div class='ctx'>  *</div><div class='ctx'>  * Note that this routine is purely a helper for filesystem usage and should</div><div class='del'>- * not be called by generic code.</div><div class='add'>+ * not be called by generic code. It does no permission checking.</div><div class='ctx'>  *</div><div class='del'>- * Unlike lookup_one_len, it should be called without the parent</div><div class='del'>- * i_mutex held, and will take the i_mutex itself if necessary.</div><div class='add'>+ * Unlike lookup_noperm(), it should be called without the parent</div><div class='add'>+ * i_rwsem held, and will take the i_rwsem itself if necessary.</div><div class='add'>+ *</div><div class='add'>+ * Unlike try_lookup_noperm() it *does* revalidate the dentry if it already</div><div class='add'>+ * existed.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *lookup_one_len_unlocked(const char *name,</div><div class='del'>-				       struct dentry *base, int len)</div><div class='add'>+struct dentry *lookup_noperm_unlocked(struct qstr *name, struct dentry *base)</div><div class='ctx'> {</div><div class='del'>-	return lookup_one_unlocked(&amp;nop_mnt_idmap, name, base, len);</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lookup_noperm_common(name, base);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	ret = lookup_dcache(name, base, 0);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = lookup_slow(name, base, 0);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(lookup_one_len_unlocked);</div><div class='add'>+EXPORT_SYMBOL(lookup_noperm_unlocked);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Like lookup_one_len_unlocked(), except that it yields ERR_PTR(-ENOENT)</div><div class='add'>+ * Like lookup_noperm_unlocked(), except that it yields ERR_PTR(-ENOENT)</div><div class='ctx'>  * on negatives.  Returns known positive or ERR_PTR(); that's what</div><div class='ctx'>  * most of the users want.  Note that pinned negative with unlocked parent</div><div class='del'>- * _can_ become positive at any time, so callers of lookup_one_len_unlocked()</div><div class='add'>+ * _can_ become positive at any time, so callers of lookup_noperm_unlocked()</div><div class='ctx'>  * need to be very careful; pinned positives have -&gt;d_inode stable, so</div><div class='ctx'>  * this one avoids such problems.</div><div class='ctx'>  */</div><div class='del'>-struct dentry *lookup_positive_unlocked(const char *name,</div><div class='del'>-				       struct dentry *base, int len)</div><div class='add'>+struct dentry *lookup_noperm_positive_unlocked(struct qstr *name,</div><div class='add'>+					       struct dentry *base)</div><div class='add'>+{</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+</div><div class='add'>+	ret = lookup_noperm_unlocked(name, base);</div><div class='add'>+	if (!IS_ERR(ret) &amp;&amp; d_flags_negative(smp_load_acquire(&amp;ret-&gt;d_flags))) {</div><div class='add'>+		dput(ret);</div><div class='add'>+		ret = ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(lookup_noperm_positive_unlocked);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_creating - prepare to create a given name with permission checking</div><div class='add'>+ * @idmap:  idmap of the mount</div><div class='add'>+ * @parent: directory in which to prepare to create the name</div><div class='add'>+ * @name:   the name to be created</div><div class='add'>+ *</div><div class='add'>+ * Locks are taken and a lookup is performed prior to creating</div><div class='add'>+ * an object in a directory.  Permission checking (MAY_EXEC) is performed</div><div class='add'>+ * against @idmap.</div><div class='add'>+ *</div><div class='add'>+ * If the name already exists, a positive dentry is returned, so</div><div class='add'>+ * behaviour is similar to O_CREAT without O_EXCL, which doesn't fail</div><div class='add'>+ * with -EEXIST.</div><div class='add'>+ *</div><div class='add'>+ * Returns: a negative or positive dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_creating(struct mnt_idmap *idmap, struct dentry *parent,</div><div class='add'>+			      struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	int err = lookup_one_common(idmap, name, parent);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return start_dirop(parent, name, LOOKUP_CREATE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_creating);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_removing - prepare to remove a given name with permission checking</div><div class='add'>+ * @idmap:  idmap of the mount</div><div class='add'>+ * @parent: directory in which to find the name</div><div class='add'>+ * @name:   the name to be removed</div><div class='add'>+ *</div><div class='add'>+ * Locks are taken and a lookup in performed prior to removing</div><div class='add'>+ * an object from a directory.  Permission checking (MAY_EXEC) is performed</div><div class='add'>+ * against @idmap.</div><div class='add'>+ *</div><div class='add'>+ * If the name doesn't exist, an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * end_removing() should be called when removal is complete, or aborted.</div><div class='add'>+ *</div><div class='add'>+ * Returns: a positive dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_removing(struct mnt_idmap *idmap, struct dentry *parent,</div><div class='add'>+			      struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	int err = lookup_one_common(idmap, name, parent);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return start_dirop(parent, name, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_removing);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_creating_killable - prepare to create a given name with permission checking</div><div class='add'>+ * @idmap:  idmap of the mount</div><div class='add'>+ * @parent: directory in which to prepare to create the name</div><div class='add'>+ * @name:   the name to be created</div><div class='add'>+ *</div><div class='add'>+ * Locks are taken and a lookup in performed prior to creating</div><div class='add'>+ * an object in a directory.  Permission checking (MAY_EXEC) is performed</div><div class='add'>+ * against @idmap.</div><div class='add'>+ *</div><div class='add'>+ * If the name already exists, a positive dentry is returned.</div><div class='add'>+ *</div><div class='add'>+ * If a signal is received or was already pending, the function aborts</div><div class='add'>+ * with -EINTR;</div><div class='add'>+ *</div><div class='add'>+ * Returns: a negative or positive dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_creating_killable(struct mnt_idmap *idmap,</div><div class='add'>+				       struct dentry *parent,</div><div class='add'>+				       struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	int err = lookup_one_common(idmap, name, parent);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return __start_dirop(parent, name, LOOKUP_CREATE, TASK_KILLABLE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_creating_killable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_removing_killable - prepare to remove a given name with permission checking</div><div class='add'>+ * @idmap:  idmap of the mount</div><div class='add'>+ * @parent: directory in which to find the name</div><div class='add'>+ * @name:   the name to be removed</div><div class='add'>+ *</div><div class='add'>+ * Locks are taken and a lookup in performed prior to removing</div><div class='add'>+ * an object from a directory.  Permission checking (MAY_EXEC) is performed</div><div class='add'>+ * against @idmap.</div><div class='add'>+ *</div><div class='add'>+ * If the name doesn't exist, an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * end_removing() should be called when removal is complete, or aborted.</div><div class='add'>+ *</div><div class='add'>+ * If a signal is received or was already pending, the function aborts</div><div class='add'>+ * with -EINTR;</div><div class='add'>+ *</div><div class='add'>+ * Returns: a positive dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_removing_killable(struct mnt_idmap *idmap,</div><div class='add'>+				       struct dentry *parent,</div><div class='add'>+				       struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	int err = lookup_one_common(idmap, name, parent);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return __start_dirop(parent, name, 0, TASK_KILLABLE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_removing_killable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_creating_noperm - prepare to create a given name without permission checking</div><div class='add'>+ * @parent: directory in which to prepare to create the name</div><div class='add'>+ * @name:   the name to be created</div><div class='add'>+ *</div><div class='add'>+ * Locks are taken and a lookup in performed prior to creating</div><div class='add'>+ * an object in a directory.</div><div class='add'>+ *</div><div class='add'>+ * If the name already exists, a positive dentry is returned.</div><div class='add'>+ *</div><div class='add'>+ * Returns: a negative or positive dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_creating_noperm(struct dentry *parent,</div><div class='add'>+				     struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	int err = lookup_noperm_common(name, parent);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return start_dirop(parent, name, LOOKUP_CREATE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_creating_noperm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_removing_noperm - prepare to remove a given name without permission checking</div><div class='add'>+ * @parent: directory in which to find the name</div><div class='add'>+ * @name:   the name to be removed</div><div class='add'>+ *</div><div class='add'>+ * Locks are taken and a lookup in performed prior to removing</div><div class='add'>+ * an object from a directory.</div><div class='add'>+ *</div><div class='add'>+ * If the name doesn't exist, an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * end_removing() should be called when removal is complete, or aborted.</div><div class='add'>+ *</div><div class='add'>+ * Returns: a positive dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_removing_noperm(struct dentry *parent,</div><div class='add'>+				     struct qstr *name)</div><div class='ctx'> {</div><div class='del'>-	return lookup_one_positive_unlocked(&amp;nop_mnt_idmap, name, base, len);</div><div class='add'>+	int err = lookup_noperm_common(name, parent);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return start_dirop(parent, name, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_removing_noperm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_creating_dentry - prepare to create a given dentry</div><div class='add'>+ * @parent: directory from which dentry should be removed</div><div class='add'>+ * @child:  the dentry to be removed</div><div class='add'>+ *</div><div class='add'>+ * A lock is taken to protect the dentry again other dirops and</div><div class='add'>+ * the validity of the dentry is checked: correct parent and still hashed.</div><div class='add'>+ *</div><div class='add'>+ * If the dentry is valid and negative a reference is taken and</div><div class='add'>+ * returned.  If not an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * end_creating() should be called when creation is complete, or aborted.</div><div class='add'>+ *</div><div class='add'>+ * Returns: the valid dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_creating_dentry(struct dentry *parent,</div><div class='add'>+				     struct dentry *child)</div><div class='add'>+{</div><div class='add'>+	inode_lock_nested(parent-&gt;d_inode, I_MUTEX_PARENT);</div><div class='add'>+	if (unlikely(IS_DEADDIR(parent-&gt;d_inode) ||</div><div class='add'>+		     child-&gt;d_parent != parent ||</div><div class='add'>+		     d_unhashed(child))) {</div><div class='add'>+		inode_unlock(parent-&gt;d_inode);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	if (d_is_positive(child)) {</div><div class='add'>+		inode_unlock(parent-&gt;d_inode);</div><div class='add'>+		return ERR_PTR(-EEXIST);</div><div class='add'>+	}</div><div class='add'>+	return dget(child);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_creating_dentry);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_removing_dentry - prepare to remove a given dentry</div><div class='add'>+ * @parent: directory from which dentry should be removed</div><div class='add'>+ * @child:  the dentry to be removed</div><div class='add'>+ *</div><div class='add'>+ * A lock is taken to protect the dentry again other dirops and</div><div class='add'>+ * the validity of the dentry is checked: correct parent and still hashed.</div><div class='add'>+ *</div><div class='add'>+ * If the dentry is valid and positive, a reference is taken and</div><div class='add'>+ * returned.  If not an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * end_removing() should be called when removal is complete, or aborted.</div><div class='add'>+ *</div><div class='add'>+ * Returns: the valid dentry, or an error.</div><div class='add'>+ */</div><div class='add'>+struct dentry *start_removing_dentry(struct dentry *parent,</div><div class='add'>+				     struct dentry *child)</div><div class='add'>+{</div><div class='add'>+	inode_lock_nested(parent-&gt;d_inode, I_MUTEX_PARENT);</div><div class='add'>+	if (unlikely(IS_DEADDIR(parent-&gt;d_inode) ||</div><div class='add'>+		     child-&gt;d_parent != parent ||</div><div class='add'>+		     d_unhashed(child))) {</div><div class='add'>+		inode_unlock(parent-&gt;d_inode);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	if (d_is_negative(child)) {</div><div class='add'>+		inode_unlock(parent-&gt;d_inode);</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+	}</div><div class='add'>+	return dget(child);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(lookup_positive_unlocked);</div><div class='add'>+EXPORT_SYMBOL(start_removing_dentry);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UNIX98_PTYS</div><div class='ctx'> int path_pts(struct path *path)</div><div class='hunk'>@@ -2913,16 +3560,16 @@ int path_pts(struct path *path)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int user_path_at_empty(int dfd, const char __user *name, unsigned flags,</div><div class='del'>-		 struct path *path, int *empty)</div><div class='add'>+int user_path_at(int dfd, const char __user *name, unsigned flags,</div><div class='add'>+		 struct path *path)</div><div class='ctx'> {</div><div class='del'>-	struct filename *filename = getname_flags(name, flags, empty);</div><div class='add'>+	struct filename *filename = getname_flags(name, flags);</div><div class='ctx'> 	int ret = filename_lookup(dfd, filename, flags, path, NULL);</div><div class='ctx'> </div><div class='ctx'> 	putname(filename);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(user_path_at_empty);</div><div class='add'>+EXPORT_SYMBOL(user_path_at);</div><div class='ctx'> </div><div class='ctx'> int __check_sticky(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		   struct inode *inode)</div><div class='hunk'>@@ -3124,6 +3771,290 @@ void unlock_rename(struct dentry *p1, struct dentry *p2)</div><div class='ctx'> EXPORT_SYMBOL(unlock_rename);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * __start_renaming - lookup and lock names for rename</div><div class='add'>+ * @rd:           rename data containing parents and flags, and</div><div class='add'>+ *                for receiving found dentries</div><div class='add'>+ * @lookup_flags: extra flags to pass to -&gt;lookup (e.g. LOOKUP_REVAL,</div><div class='add'>+ *                LOOKUP_NO_SYMLINKS etc).</div><div class='add'>+ * @old_last:     name of object in @rd.old_parent</div><div class='add'>+ * @new_last:     name of object in @rd.new_parent</div><div class='add'>+ *</div><div class='add'>+ * Look up two names and ensure locks are in place for</div><div class='add'>+ * rename.</div><div class='add'>+ *</div><div class='add'>+ * On success the found dentries are stored in @rd.old_dentry,</div><div class='add'>+ * @rd.new_dentry and an extra ref is taken on @rd.old_parent.</div><div class='add'>+ * These references and the lock are dropped by end_renaming().</div><div class='add'>+ *</div><div class='add'>+ * The passed in qstrs must have the hash calculated, and no permission</div><div class='add'>+ * checking is performed.</div><div class='add'>+ *</div><div class='add'>+ * Returns: zero or an error.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+__start_renaming(struct renamedata *rd, int lookup_flags,</div><div class='add'>+		 struct qstr *old_last, struct qstr *new_last)</div><div class='add'>+{</div><div class='add'>+	struct dentry *trap;</div><div class='add'>+	struct dentry *d1, *d2;</div><div class='add'>+	int target_flags = LOOKUP_RENAME_TARGET | LOOKUP_CREATE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (rd-&gt;flags &amp; RENAME_EXCHANGE)</div><div class='add'>+		target_flags = 0;</div><div class='add'>+	if (rd-&gt;flags &amp; RENAME_NOREPLACE)</div><div class='add'>+		target_flags |= LOOKUP_EXCL;</div><div class='add'>+</div><div class='add'>+	trap = lock_rename(rd-&gt;old_parent, rd-&gt;new_parent);</div><div class='add'>+	if (IS_ERR(trap))</div><div class='add'>+		return PTR_ERR(trap);</div><div class='add'>+</div><div class='add'>+	d1 = lookup_one_qstr_excl(old_last, rd-&gt;old_parent,</div><div class='add'>+				  lookup_flags);</div><div class='add'>+	err = PTR_ERR(d1);</div><div class='add'>+	if (IS_ERR(d1))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	d2 = lookup_one_qstr_excl(new_last, rd-&gt;new_parent,</div><div class='add'>+				  lookup_flags | target_flags);</div><div class='add'>+	err = PTR_ERR(d2);</div><div class='add'>+	if (IS_ERR(d2))</div><div class='add'>+		goto out_dput_d1;</div><div class='add'>+</div><div class='add'>+	if (d1 == trap) {</div><div class='add'>+		/* source is an ancestor of target */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_dput_d2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (d2 == trap) {</div><div class='add'>+		/* target is an ancestor of source */</div><div class='add'>+		if (rd-&gt;flags &amp; RENAME_EXCHANGE)</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			err = -ENOTEMPTY;</div><div class='add'>+		goto out_dput_d2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rd-&gt;old_dentry = d1;</div><div class='add'>+	rd-&gt;new_dentry = d2;</div><div class='add'>+	dget(rd-&gt;old_parent);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_dput_d2:</div><div class='add'>+	dput(d2);</div><div class='add'>+out_dput_d1:</div><div class='add'>+	dput(d1);</div><div class='add'>+out_unlock:</div><div class='add'>+	unlock_rename(rd-&gt;old_parent, rd-&gt;new_parent);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_renaming - lookup and lock names for rename with permission checking</div><div class='add'>+ * @rd:           rename data containing parents and flags, and</div><div class='add'>+ *                for receiving found dentries</div><div class='add'>+ * @lookup_flags: extra flags to pass to -&gt;lookup (e.g. LOOKUP_REVAL,</div><div class='add'>+ *                LOOKUP_NO_SYMLINKS etc).</div><div class='add'>+ * @old_last:     name of object in @rd.old_parent</div><div class='add'>+ * @new_last:     name of object in @rd.new_parent</div><div class='add'>+ *</div><div class='add'>+ * Look up two names and ensure locks are in place for</div><div class='add'>+ * rename.</div><div class='add'>+ *</div><div class='add'>+ * On success the found dentries are stored in @rd.old_dentry,</div><div class='add'>+ * @rd.new_dentry.  Also the refcount on @rd-&gt;old_parent is increased.</div><div class='add'>+ * These references and the lock are dropped by end_renaming().</div><div class='add'>+ *</div><div class='add'>+ * The passed in qstrs need not have the hash calculated, and basic</div><div class='add'>+ * eXecute permission checking is performed against @rd.mnt_idmap.</div><div class='add'>+ *</div><div class='add'>+ * Returns: zero or an error.</div><div class='add'>+ */</div><div class='add'>+int start_renaming(struct renamedata *rd, int lookup_flags,</div><div class='add'>+		   struct qstr *old_last, struct qstr *new_last)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lookup_one_common(rd-&gt;mnt_idmap, old_last, rd-&gt;old_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = lookup_one_common(rd-&gt;mnt_idmap, new_last, rd-&gt;new_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return __start_renaming(rd, lookup_flags, old_last, new_last);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_renaming);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__start_renaming_dentry(struct renamedata *rd, int lookup_flags,</div><div class='add'>+			struct dentry *old_dentry, struct qstr *new_last)</div><div class='add'>+{</div><div class='add'>+	struct dentry *trap;</div><div class='add'>+	struct dentry *d2;</div><div class='add'>+	int target_flags = LOOKUP_RENAME_TARGET | LOOKUP_CREATE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (rd-&gt;flags &amp; RENAME_EXCHANGE)</div><div class='add'>+		target_flags = 0;</div><div class='add'>+	if (rd-&gt;flags &amp; RENAME_NOREPLACE)</div><div class='add'>+		target_flags |= LOOKUP_EXCL;</div><div class='add'>+</div><div class='add'>+	/* Already have the dentry - need to be sure to lock the correct parent */</div><div class='add'>+	trap = lock_rename_child(old_dentry, rd-&gt;new_parent);</div><div class='add'>+	if (IS_ERR(trap))</div><div class='add'>+		return PTR_ERR(trap);</div><div class='add'>+	if (d_unhashed(old_dentry) ||</div><div class='add'>+	    (rd-&gt;old_parent &amp;&amp; rd-&gt;old_parent != old_dentry-&gt;d_parent)) {</div><div class='add'>+		/* dentry was removed, or moved and explicit parent requested */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	d2 = lookup_one_qstr_excl(new_last, rd-&gt;new_parent,</div><div class='add'>+				  lookup_flags | target_flags);</div><div class='add'>+	err = PTR_ERR(d2);</div><div class='add'>+	if (IS_ERR(d2))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (old_dentry == trap) {</div><div class='add'>+		/* source is an ancestor of target */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_dput_d2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (d2 == trap) {</div><div class='add'>+		/* target is an ancestor of source */</div><div class='add'>+		if (rd-&gt;flags &amp; RENAME_EXCHANGE)</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			err = -ENOTEMPTY;</div><div class='add'>+		goto out_dput_d2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rd-&gt;old_dentry = dget(old_dentry);</div><div class='add'>+	rd-&gt;new_dentry = d2;</div><div class='add'>+	rd-&gt;old_parent = dget(old_dentry-&gt;d_parent);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_dput_d2:</div><div class='add'>+	dput(d2);</div><div class='add'>+out_unlock:</div><div class='add'>+	unlock_rename(old_dentry-&gt;d_parent, rd-&gt;new_parent);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_renaming_dentry - lookup and lock name for rename with permission checking</div><div class='add'>+ * @rd:           rename data containing parents and flags, and</div><div class='add'>+ *                for receiving found dentries</div><div class='add'>+ * @lookup_flags: extra flags to pass to -&gt;lookup (e.g. LOOKUP_REVAL,</div><div class='add'>+ *                LOOKUP_NO_SYMLINKS etc).</div><div class='add'>+ * @old_dentry:   dentry of name to move</div><div class='add'>+ * @new_last:     name of target in @rd.new_parent</div><div class='add'>+ *</div><div class='add'>+ * Look up target name and ensure locks are in place for</div><div class='add'>+ * rename.</div><div class='add'>+ *</div><div class='add'>+ * On success the found dentry is stored in @rd.new_dentry and</div><div class='add'>+ * @rd.old_parent is confirmed to be the parent of @old_dentry.  If it</div><div class='add'>+ * was originally %NULL, it is set.  In either case a reference is taken</div><div class='add'>+ * so that end_renaming() can have a stable reference to unlock.</div><div class='add'>+ *</div><div class='add'>+ * References and the lock can be dropped with end_renaming()</div><div class='add'>+ *</div><div class='add'>+ * The passed in qstr need not have the hash calculated, and basic</div><div class='add'>+ * eXecute permission checking is performed against @rd.mnt_idmap.</div><div class='add'>+ *</div><div class='add'>+ * Returns: zero or an error.</div><div class='add'>+ */</div><div class='add'>+int start_renaming_dentry(struct renamedata *rd, int lookup_flags,</div><div class='add'>+			  struct dentry *old_dentry, struct qstr *new_last)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lookup_one_common(rd-&gt;mnt_idmap, new_last, rd-&gt;new_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return __start_renaming_dentry(rd, lookup_flags, old_dentry, new_last);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_renaming_dentry);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * start_renaming_two_dentries - Lock to dentries in given parents for rename</div><div class='add'>+ * @rd:           rename data containing parent</div><div class='add'>+ * @old_dentry:   dentry of name to move</div><div class='add'>+ * @new_dentry:   dentry to move to</div><div class='add'>+ *</div><div class='add'>+ * Ensure locks are in place for rename and check parentage is still correct.</div><div class='add'>+ *</div><div class='add'>+ * On success the two dentries are stored in @rd.old_dentry and</div><div class='add'>+ * @rd.new_dentry and @rd.old_parent and @rd.new_parent are confirmed to</div><div class='add'>+ * be the parents of the dentries.</div><div class='add'>+ *</div><div class='add'>+ * References and the lock can be dropped with end_renaming()</div><div class='add'>+ *</div><div class='add'>+ * Returns: zero or an error.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+start_renaming_two_dentries(struct renamedata *rd,</div><div class='add'>+			    struct dentry *old_dentry, struct dentry *new_dentry)</div><div class='add'>+{</div><div class='add'>+	struct dentry *trap;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Already have the dentry - need to be sure to lock the correct parent */</div><div class='add'>+	trap = lock_rename_child(old_dentry, rd-&gt;new_parent);</div><div class='add'>+	if (IS_ERR(trap))</div><div class='add'>+		return PTR_ERR(trap);</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (d_unhashed(old_dentry) ||</div><div class='add'>+	    (rd-&gt;old_parent &amp;&amp; rd-&gt;old_parent != old_dentry-&gt;d_parent))</div><div class='add'>+		/* old_dentry was removed, or moved and explicit parent requested */</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	if (d_unhashed(new_dentry) ||</div><div class='add'>+	    rd-&gt;new_parent != new_dentry-&gt;d_parent)</div><div class='add'>+		/* new_dentry was removed or moved */</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (old_dentry == trap)</div><div class='add'>+		/* source is an ancestor of target */</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (new_dentry == trap) {</div><div class='add'>+		/* target is an ancestor of source */</div><div class='add'>+		if (rd-&gt;flags &amp; RENAME_EXCHANGE)</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			err = -ENOTEMPTY;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -EEXIST;</div><div class='add'>+	if (d_is_positive(new_dentry) &amp;&amp; (rd-&gt;flags &amp; RENAME_NOREPLACE))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	rd-&gt;old_dentry = dget(old_dentry);</div><div class='add'>+	rd-&gt;new_dentry = dget(new_dentry);</div><div class='add'>+	rd-&gt;old_parent = dget(old_dentry-&gt;d_parent);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	unlock_rename(old_dentry-&gt;d_parent, rd-&gt;new_parent);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(start_renaming_two_dentries);</div><div class='add'>+</div><div class='add'>+void end_renaming(struct renamedata *rd)</div><div class='add'>+{</div><div class='add'>+	unlock_rename(rd-&gt;old_parent, rd-&gt;new_parent);</div><div class='add'>+	dput(rd-&gt;old_dentry);</div><div class='add'>+	dput(rd-&gt;new_dentry);</div><div class='add'>+	dput(rd-&gt;old_parent);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(end_renaming);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * vfs_prepare_mode - prepare the mode to be used for a new inode</div><div class='ctx'>  * @idmap:	idmap of the mount the inode was found from</div><div class='ctx'>  * @dir:	parent directory of the new inode</div><div class='hunk'>@@ -3166,10 +4097,9 @@ static inline umode_t vfs_prepare_mode(struct mnt_idmap *idmap,</div><div class='ctx'> /**</div><div class='ctx'>  * vfs_create - create new file</div><div class='ctx'>  * @idmap:	idmap of the mount the inode was found from</div><div class='del'>- * @dir:	inode of @dentry</div><div class='del'>- * @dentry:	pointer to dentry of the base directory</div><div class='del'>- * @mode:	mode of the new file</div><div class='del'>- * @want_excl:	whether the file must not yet exist</div><div class='add'>+ * @dentry:	dentry of the child file</div><div class='add'>+ * @mode:	mode of the child file</div><div class='add'>+ * @di:		returns parent inode, if the inode is delegated.</div><div class='ctx'>  *</div><div class='ctx'>  * Create a new file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -3179,9 +4109,10 @@ static inline umode_t vfs_prepare_mode(struct mnt_idmap *idmap,</div><div class='ctx'>  * On non-idmapped mounts or if permission checking is to be performed on the</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='del'>-int vfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-	       struct dentry *dentry, umode_t mode, bool want_excl)</div><div class='add'>+int vfs_create(struct mnt_idmap *idmap, struct dentry *dentry, umode_t mode,</div><div class='add'>+	       struct delegated_inode *di)</div><div class='ctx'> {</div><div class='add'>+	struct inode *dir = d_inode(dentry-&gt;d_parent);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = may_create(idmap, dir, dentry);</div><div class='hunk'>@@ -3195,7 +4126,10 @@ int vfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	error = security_inode_create(dir, dentry, mode);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	error = dir-&gt;i_op-&gt;create(idmap, dir, dentry, mode, want_excl);</div><div class='add'>+	error = try_break_deleg(dir, di);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	error = dir-&gt;i_op-&gt;create(idmap, dir, dentry, mode, true);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		fsnotify_create(dir, dentry);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -3263,6 +4197,8 @@ static int may_open(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		if ((acc_mode &amp; MAY_EXEC) &amp;&amp; path_noexec(path))</div><div class='ctx'> 			return -EACCES;</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		VFS_BUG_ON_INODE(!IS_ANON_FILE(inode), inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = inode_permission(idmap, inode, MAY_OPEN | acc_mode);</div><div class='hunk'>@@ -3354,8 +4290,8 @@ static struct dentry *atomic_open(struct nameidata *nd, struct dentry *dentry,</div><div class='ctx'> 	if (nd-&gt;flags &amp; LOOKUP_DIRECTORY)</div><div class='ctx'> 		open_flag |= O_DIRECTORY;</div><div class='ctx'> </div><div class='del'>-	file-&gt;f_path.dentry = DENTRY_NOT_SET;</div><div class='del'>-	file-&gt;f_path.mnt = nd-&gt;path.mnt;</div><div class='add'>+	file-&gt;__f_path.dentry = DENTRY_NOT_SET;</div><div class='add'>+	file-&gt;__f_path.mnt = nd-&gt;path.mnt;</div><div class='ctx'> 	error = dir-&gt;i_op-&gt;atomic_open(dir, dentry, file,</div><div class='ctx'> 				       open_to_namei_flags(open_flag), mode);</div><div class='ctx'> 	d_lookup_done(dentry);</div><div class='hunk'>@@ -3400,7 +4336,7 @@ static struct dentry *atomic_open(struct nameidata *nd, struct dentry *dentry,</div><div class='ctx'>  */</div><div class='ctx'> static struct dentry *lookup_open(struct nameidata *nd, struct file *file,</div><div class='ctx'> 				  const struct open_flags *op,</div><div class='del'>-				  bool got_write)</div><div class='add'>+				  bool got_write, struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct mnt_idmap *idmap;</div><div class='ctx'> 	struct dentry *dir = nd-&gt;path.dentry;</div><div class='hunk'>@@ -3425,7 +4361,7 @@ static struct dentry *lookup_open(struct nameidata *nd, struct file *file,</div><div class='ctx'> 		if (d_in_lookup(dentry))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		error = d_revalidate(dentry, nd-&gt;flags);</div><div class='add'>+		error = d_revalidate(dir_inode, &amp;nd-&gt;last, dentry, nd-&gt;flags);</div><div class='ctx'> 		if (likely(error &gt; 0))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (error)</div><div class='hunk'>@@ -3439,6 +4375,9 @@ static struct dentry *lookup_open(struct nameidata *nd, struct file *file,</div><div class='ctx'> 		return dentry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (open_flag &amp; O_CREAT)</div><div class='add'>+		audit_inode(nd-&gt;name, dir, AUDIT_INODE_PARENT);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Checking write permission is tricky, bacuse we don't know if we are</div><div class='ctx'> 	 * going to actually need it: O_CREAT opens should work as long as the</div><div class='hunk'>@@ -3486,6 +4425,11 @@ static struct dentry *lookup_open(struct nameidata *nd, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	/* Negative dentry, just create the file */</div><div class='ctx'> 	if (!dentry-&gt;d_inode &amp;&amp; (open_flag &amp; O_CREAT)) {</div><div class='add'>+		/* but break the directory lease first! */</div><div class='add'>+		error = try_break_deleg(dir_inode, delegated_inode);</div><div class='add'>+		if (error)</div><div class='add'>+			goto out_dput;</div><div class='add'>+</div><div class='ctx'> 		file-&gt;f_mode |= FMODE_CREATED;</div><div class='ctx'> 		audit_inode_child(dir_inode, dentry, AUDIT_TYPE_CHILD_CREATE);</div><div class='ctx'> 		if (!dir_inode-&gt;i_op-&gt;create) {</div><div class='hunk'>@@ -3509,9 +4453,46 @@ out_dput:</div><div class='ctx'> 	return ERR_PTR(error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool trailing_slashes(struct nameidata *nd)</div><div class='add'>+{</div><div class='add'>+	return (bool)nd-&gt;last.name[nd-&gt;last.len];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *lookup_fast_for_open(struct nameidata *nd, int open_flag)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	if (open_flag &amp; O_CREAT) {</div><div class='add'>+		if (trailing_slashes(nd))</div><div class='add'>+			return ERR_PTR(-EISDIR);</div><div class='add'>+</div><div class='add'>+		/* Don't bother on an O_EXCL create */</div><div class='add'>+		if (open_flag &amp; O_EXCL)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trailing_slashes(nd))</div><div class='add'>+		nd-&gt;flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY;</div><div class='add'>+</div><div class='add'>+	dentry = lookup_fast(nd);</div><div class='add'>+	if (IS_ERR_OR_NULL(dentry))</div><div class='add'>+		return dentry;</div><div class='add'>+</div><div class='add'>+	if (open_flag &amp; O_CREAT) {</div><div class='add'>+		/* Discard negative dentries. Need inode_lock to do the create */</div><div class='add'>+		if (!dentry-&gt;d_inode) {</div><div class='add'>+			if (!(nd-&gt;flags &amp; LOOKUP_RCU))</div><div class='add'>+				dput(dentry);</div><div class='add'>+			dentry = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const char *open_last_lookups(struct nameidata *nd,</div><div class='ctx'> 		   struct file *file, const struct open_flags *op)</div><div class='ctx'> {</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> 	struct dentry *dir = nd-&gt;path.dentry;</div><div class='ctx'> 	int open_flag = op-&gt;open_flag;</div><div class='ctx'> 	bool got_write = false;</div><div class='hunk'>@@ -3526,30 +4507,24 @@ static const char *open_last_lookups(struct nameidata *nd,</div><div class='ctx'> 		return handle_dots(nd, nd-&gt;last_type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(open_flag &amp; O_CREAT)) {</div><div class='del'>-		if (nd-&gt;last.name[nd-&gt;last.len])</div><div class='del'>-			nd-&gt;flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY;</div><div class='del'>-		/* we _can_ be in RCU mode here */</div><div class='del'>-		dentry = lookup_fast(nd);</div><div class='del'>-		if (IS_ERR(dentry))</div><div class='del'>-			return ERR_CAST(dentry);</div><div class='del'>-		if (likely(dentry))</div><div class='del'>-			goto finish_lookup;</div><div class='add'>+	/* We _can_ be in RCU mode here */</div><div class='add'>+	dentry = lookup_fast_for_open(nd, open_flag);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return ERR_CAST(dentry);</div><div class='ctx'> </div><div class='add'>+	if (likely(dentry))</div><div class='add'>+		goto finish_lookup;</div><div class='add'>+</div><div class='add'>+	if (!(open_flag &amp; O_CREAT)) {</div><div class='ctx'> 		if (WARN_ON_ONCE(nd-&gt;flags &amp; LOOKUP_RCU))</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* create side of things */</div><div class='ctx'> 		if (nd-&gt;flags &amp; LOOKUP_RCU) {</div><div class='ctx'> 			if (!try_to_unlazy(nd))</div><div class='ctx'> 				return ERR_PTR(-ECHILD);</div><div class='ctx'> 		}</div><div class='del'>-		audit_inode(nd-&gt;name, dir, AUDIT_INODE_PARENT);</div><div class='del'>-		/* trailing slashes? */</div><div class='del'>-		if (unlikely(nd-&gt;last.name[nd-&gt;last.len]))</div><div class='del'>-			return ERR_PTR(-EISDIR);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+retry:</div><div class='ctx'> 	if (open_flag &amp; (O_CREAT | O_TRUNC | O_WRONLY | O_RDWR)) {</div><div class='ctx'> 		got_write = !mnt_want_write(nd-&gt;path.mnt);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3562,9 +4537,13 @@ static const char *open_last_lookups(struct nameidata *nd,</div><div class='ctx'> 		inode_lock(dir-&gt;d_inode);</div><div class='ctx'> 	else</div><div class='ctx'> 		inode_lock_shared(dir-&gt;d_inode);</div><div class='del'>-	dentry = lookup_open(nd, file, op, got_write);</div><div class='del'>-	if (!IS_ERR(dentry) &amp;&amp; (file-&gt;f_mode &amp; FMODE_CREATED))</div><div class='del'>-		fsnotify_create(dir-&gt;d_inode, dentry);</div><div class='add'>+	dentry = lookup_open(nd, file, op, got_write, &amp;delegated_inode);</div><div class='add'>+	if (!IS_ERR(dentry)) {</div><div class='add'>+		if (file-&gt;f_mode &amp; FMODE_CREATED)</div><div class='add'>+			fsnotify_create(dir-&gt;d_inode, dentry);</div><div class='add'>+		if (file-&gt;f_mode &amp; FMODE_OPENED)</div><div class='add'>+			fsnotify_open(file);</div><div class='add'>+	}</div><div class='ctx'> 	if (open_flag &amp; O_CREAT)</div><div class='ctx'> 		inode_unlock(dir-&gt;d_inode);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3573,8 +4552,16 @@ static const char *open_last_lookups(struct nameidata *nd,</div><div class='ctx'> 	if (got_write)</div><div class='ctx'> 		mnt_drop_write(nd-&gt;path.mnt);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(dentry))</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='add'>+		if (is_delegated(&amp;delegated_inode)) {</div><div class='add'>+			int error = break_deleg_wait(&amp;delegated_inode);</div><div class='add'>+</div><div class='add'>+			if (!error)</div><div class='add'>+				goto retry;</div><div class='add'>+			return ERR_PTR(error);</div><div class='add'>+		}</div><div class='ctx'> 		return ERR_CAST(dentry);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (file-&gt;f_mode &amp; (FMODE_OPENED | FMODE_CREATED)) {</div><div class='ctx'> 		dput(nd-&gt;path.dentry);</div><div class='hunk'>@@ -3640,7 +4627,7 @@ static int do_open(struct nameidata *nd,</div><div class='ctx'> 	if (!error &amp;&amp; !(file-&gt;f_mode &amp; FMODE_OPENED))</div><div class='ctx'> 		error = vfs_open(&amp;nd-&gt;path, file);</div><div class='ctx'> 	if (!error)</div><div class='del'>-		error = ima_file_check(file, op-&gt;acc_mode);</div><div class='add'>+		error = security_file_post_open(file, op-&gt;acc_mode);</div><div class='ctx'> 	if (!error &amp;&amp; do_truncate)</div><div class='ctx'> 		error = handle_truncate(idmap, file);</div><div class='ctx'> 	if (unlikely(error &gt; 0)) {</div><div class='hunk'>@@ -3667,9 +4654,9 @@ static int do_open(struct nameidata *nd,</div><div class='ctx'>  * On non-idmapped mounts or if permission checking is to be performed on the</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='del'>-static int vfs_tmpfile(struct mnt_idmap *idmap,</div><div class='del'>-		       const struct path *parentpath,</div><div class='del'>-		       struct file *file, umode_t mode)</div><div class='add'>+int vfs_tmpfile(struct mnt_idmap *idmap,</div><div class='add'>+		const struct path *parentpath,</div><div class='add'>+		struct file *file, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *child;</div><div class='ctx'> 	struct inode *dir = d_inode(parentpath-&gt;dentry);</div><div class='hunk'>@@ -3686,11 +4673,13 @@ static int vfs_tmpfile(struct mnt_idmap *idmap,</div><div class='ctx'> 	child = d_alloc(parentpath-&gt;dentry, &amp;slash_name);</div><div class='ctx'> 	if (unlikely(!child))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	file-&gt;f_path.mnt = parentpath-&gt;mnt;</div><div class='del'>-	file-&gt;f_path.dentry = child;</div><div class='add'>+	file-&gt;__f_path.mnt = parentpath-&gt;mnt;</div><div class='add'>+	file-&gt;__f_path.dentry = child;</div><div class='ctx'> 	mode = vfs_prepare_mode(idmap, dir, mode, mode, mode);</div><div class='ctx'> 	error = dir-&gt;i_op-&gt;tmpfile(idmap, dir, file, mode);</div><div class='ctx'> 	dput(child);</div><div class='add'>+	if (file-&gt;f_mode &amp; FMODE_OPENED)</div><div class='add'>+		fsnotify_open(file);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	/* Don't check for other permissions, the inode was just created */</div><div class='hunk'>@@ -3700,10 +4689,10 @@ static int vfs_tmpfile(struct mnt_idmap *idmap,</div><div class='ctx'> 	inode = file_inode(file);</div><div class='ctx'> 	if (!(open_flag &amp; O_EXCL)) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		inode-&gt;i_state |= I_LINKABLE;</div><div class='add'>+		inode_state_set(inode, I_LINKABLE);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='del'>-	ima_post_create_tmpfile(idmap, inode);</div><div class='add'>+	security_inode_post_create_tmpfile(idmap, inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3804,7 +4793,7 @@ static struct file *path_openat(struct nameidata *nd,</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	fput(file);</div><div class='add'>+	fput_close(file);</div><div class='ctx'> 	if (error == -EOPENSTALE) {</div><div class='ctx'> 		if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 			error = -ECHILD;</div><div class='hunk'>@@ -3866,7 +4855,6 @@ static struct dentry *filename_create(int dfd, struct filename *name,</div><div class='ctx'> 	unsigned int reval_flag = lookup_flags &amp; LOOKUP_REVAL;</div><div class='ctx'> 	unsigned int create_flags = LOOKUP_CREATE | LOOKUP_EXCL;</div><div class='ctx'> 	int type;</div><div class='del'>-	int err2;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = filename_parentat(dfd, name, reval_flag, path, &amp;last, &amp;type);</div><div class='hunk'>@@ -3881,52 +4869,34 @@ static struct dentry *filename_create(int dfd, struct filename *name,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* don't fail immediately if it's r/o, at least try to report other errors */</div><div class='del'>-	err2 = mnt_want_write(path-&gt;mnt);</div><div class='add'>+	error = mnt_want_write(path-&gt;mnt);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do the final lookup.  Suppress 'create' if there is a trailing</div><div class='ctx'> 	 * '/', and a directory wasn't requested.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (last.name[last.len] &amp;&amp; !want_dir)</div><div class='del'>-		create_flags = 0;</div><div class='del'>-	inode_lock_nested(path-&gt;dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	dentry = lookup_one_qstr_excl(&amp;last, path-&gt;dentry,</div><div class='del'>-				      reval_flag | create_flags);</div><div class='add'>+		create_flags &amp;= ~LOOKUP_CREATE;</div><div class='add'>+	dentry = start_dirop(path-&gt;dentry, &amp;last, reval_flag | create_flags);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='del'>-		goto unlock;</div><div class='add'>+		goto out_drop_write;</div><div class='ctx'> </div><div class='del'>-	error = -EEXIST;</div><div class='del'>-	if (d_is_positive(dentry))</div><div class='add'>+	if (unlikely(error))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Special case - lookup gave negative, but... we had foo/bar/</div><div class='del'>-	 * From the vfs_mknod() POV we just have a negative dentry -</div><div class='del'>-	 * all is fine. Let's be bastards - you had / on the end, you've</div><div class='del'>-	 * been asking for (non-existent) directory. -ENOENT for you.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!create_flags)) {</div><div class='del'>-		error = -ENOENT;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(err2)) {</div><div class='del'>-		error = err2;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='ctx'> 	return dentry;</div><div class='ctx'> fail:</div><div class='del'>-	dput(dentry);</div><div class='add'>+	end_dirop(dentry);</div><div class='ctx'> 	dentry = ERR_PTR(error);</div><div class='del'>-unlock:</div><div class='del'>-	inode_unlock(path-&gt;dentry-&gt;d_inode);</div><div class='del'>-	if (!err2)</div><div class='add'>+out_drop_write:</div><div class='add'>+	if (!error)</div><div class='ctx'> 		mnt_drop_write(path-&gt;mnt);</div><div class='ctx'> out:</div><div class='ctx'> 	path_put(path);</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *kern_path_create(int dfd, const char *pathname,</div><div class='del'>-				struct path *path, unsigned int lookup_flags)</div><div class='add'>+struct dentry *start_creating_path(int dfd, const char *pathname,</div><div class='add'>+				   struct path *path, unsigned int lookup_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *filename = getname_kernel(pathname);</div><div class='ctx'> 	struct dentry *res = filename_create(dfd, filename, path, lookup_flags);</div><div class='hunk'>@@ -3934,19 +4904,30 @@ struct dentry *kern_path_create(int dfd, const char *pathname,</div><div class='ctx'> 	putname(filename);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(kern_path_create);</div><div class='add'>+EXPORT_SYMBOL(start_creating_path);</div><div class='ctx'> </div><div class='del'>-void done_path_create(struct path *path, struct dentry *dentry)</div><div class='add'>+/**</div><div class='add'>+ * end_creating_path - finish a code section started by start_creating_path()</div><div class='add'>+ * @path: the path instantiated by start_creating_path()</div><div class='add'>+ * @dentry: the dentry returned by start_creating_path()</div><div class='add'>+ *</div><div class='add'>+ * end_creating_path() will unlock and locks taken by start_creating_path()</div><div class='add'>+ * and drop an references that were taken.  It should only be called</div><div class='add'>+ * if start_creating_path() returned a non-error.</div><div class='add'>+ * If vfs_mkdir() was called and it returned an error, that error *should*</div><div class='add'>+ * be passed to end_creating_path() together with the path.</div><div class='add'>+ */</div><div class='add'>+void end_creating_path(const struct path *path, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	dput(dentry);</div><div class='del'>-	inode_unlock(path-&gt;dentry-&gt;d_inode);</div><div class='add'>+	end_creating(dentry);</div><div class='ctx'> 	mnt_drop_write(path-&gt;mnt);</div><div class='ctx'> 	path_put(path);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(done_path_create);</div><div class='add'>+EXPORT_SYMBOL(end_creating_path);</div><div class='ctx'> </div><div class='del'>-inline struct dentry *user_path_create(int dfd, const char __user *pathname,</div><div class='del'>-				struct path *path, unsigned int lookup_flags)</div><div class='add'>+inline struct dentry *start_creating_user_path(</div><div class='add'>+	int dfd, const char __user *pathname,</div><div class='add'>+	struct path *path, unsigned int lookup_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *filename = getname(pathname);</div><div class='ctx'> 	struct dentry *res = filename_create(dfd, filename, path, lookup_flags);</div><div class='hunk'>@@ -3954,15 +4935,17 @@ inline struct dentry *user_path_create(int dfd, const char __user *pathname,</div><div class='ctx'> 	putname(filename);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(user_path_create);</div><div class='add'>+EXPORT_SYMBOL(start_creating_user_path);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vfs_mknod - create device node or file</div><div class='del'>- * @idmap:	idmap of the mount the inode was found from</div><div class='del'>- * @dir:	inode of @dentry</div><div class='del'>- * @dentry:	pointer to dentry of the base directory</div><div class='del'>- * @mode:	mode of the new device node or file</div><div class='del'>- * @dev:	device number of device to create</div><div class='add'>+ * @idmap:		idmap of the mount the inode was found from</div><div class='add'>+ * @dir:		inode of the parent directory</div><div class='add'>+ * @dentry:		dentry of the child device node</div><div class='add'>+ * @mode:		mode of the child device node</div><div class='add'>+ * @dev:		device number of device to create</div><div class='add'>+ * @delegated_inode:	returns parent inode, if the inode is delegated.</div><div class='ctx'>  *</div><div class='ctx'>  * Create a device node or file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -3973,7 +4956,8 @@ EXPORT_SYMBOL(user_path_create);</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='ctx'> int vfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-	      struct dentry *dentry, umode_t mode, dev_t dev)</div><div class='add'>+	      struct dentry *dentry, umode_t mode, dev_t dev,</div><div class='add'>+	      struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	bool is_whiteout = S_ISCHR(mode) &amp;&amp; dev == WHITEOUT_DEV;</div><div class='ctx'> 	int error = may_create(idmap, dir, dentry);</div><div class='hunk'>@@ -3997,6 +4981,10 @@ int vfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='add'>+	error = try_break_deleg(dir, delegated_inode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	error = dir-&gt;i_op-&gt;mknod(idmap, dir, dentry, mode, dev);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		fsnotify_create(dir, dentry);</div><div class='hunk'>@@ -4024,6 +5012,7 @@ static int may_mknod(umode_t mode)</div><div class='ctx'> static int do_mknodat(int dfd, struct filename *name, umode_t mode,</div><div class='ctx'> 		unsigned int dev)</div><div class='ctx'> {</div><div class='add'>+	struct delegated_inode di = { };</div><div class='ctx'> 	struct mnt_idmap *idmap;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct path path;</div><div class='hunk'>@@ -4047,22 +5036,26 @@ retry:</div><div class='ctx'> 	idmap = mnt_idmap(path.mnt);</div><div class='ctx'> 	switch (mode &amp; S_IFMT) {</div><div class='ctx'> 		case 0: case S_IFREG:</div><div class='del'>-			error = vfs_create(idmap, path.dentry-&gt;d_inode,</div><div class='del'>-					   dentry, mode, true);</div><div class='add'>+			error = vfs_create(idmap, dentry, mode, &amp;di);</div><div class='ctx'> 			if (!error)</div><div class='del'>-				ima_post_path_mknod(idmap, dentry);</div><div class='add'>+				security_path_post_mknod(idmap, dentry);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case S_IFCHR: case S_IFBLK:</div><div class='ctx'> 			error = vfs_mknod(idmap, path.dentry-&gt;d_inode,</div><div class='del'>-					  dentry, mode, new_decode_dev(dev));</div><div class='add'>+					  dentry, mode, new_decode_dev(dev), &amp;di);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case S_IFIFO: case S_IFSOCK:</div><div class='ctx'> 			error = vfs_mknod(idmap, path.dentry-&gt;d_inode,</div><div class='del'>-					  dentry, mode, 0);</div><div class='add'>+					  dentry, mode, 0, &amp;di);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> out2:</div><div class='del'>-	done_path_create(&amp;path, dentry);</div><div class='add'>+	end_creating_path(&amp;path, dentry);</div><div class='add'>+	if (is_delegated(&amp;di)) {</div><div class='add'>+		error = break_deleg_wait(&amp;di);</div><div class='add'>+		if (!error)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='ctx'> 	if (retry_estale(error, lookup_flags)) {</div><div class='ctx'> 		lookup_flags |= LOOKUP_REVAL;</div><div class='ctx'> 		goto retry;</div><div class='hunk'>@@ -4084,11 +5077,12 @@ SYSCALL_DEFINE3(mknod, const char __user *, filename, umode_t, mode, unsigned, d</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vfs_mkdir - create directory</div><div class='del'>- * @idmap:	idmap of the mount the inode was found from</div><div class='del'>- * @dir:	inode of @dentry</div><div class='del'>- * @dentry:	pointer to dentry of the base directory</div><div class='del'>- * @mode:	mode of the new directory</div><div class='add'>+ * vfs_mkdir - create directory returning correct dentry if possible</div><div class='add'>+ * @idmap:		idmap of the mount the inode was found from</div><div class='add'>+ * @dir:		inode of the parent directory</div><div class='add'>+ * @dentry:		dentry of the child directory</div><div class='add'>+ * @mode:		mode of the child directory</div><div class='add'>+ * @delegated_inode:	returns parent inode, if the inode is delegated.</div><div class='ctx'>  *</div><div class='ctx'>  * Create a directory.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4097,32 +5091,56 @@ SYSCALL_DEFINE3(mknod, const char __user *, filename, umode_t, mode, unsigned, d</div><div class='ctx'>  * care to map the inode according to @idmap before checking permissions.</div><div class='ctx'>  * On non-idmapped mounts or if permission checking is to be performed on the</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='add'>+ *</div><div class='add'>+ * In the event that the filesystem does not use the *@dentry but leaves it</div><div class='add'>+ * negative or unhashes it and possibly splices a different one returning it,</div><div class='add'>+ * the original dentry is dput() and the alternate is returned.</div><div class='add'>+ *</div><div class='add'>+ * In case of an error the dentry is dput() and an ERR_PTR() is returned.</div><div class='ctx'>  */</div><div class='del'>-int vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-	      struct dentry *dentry, umode_t mode)</div><div class='add'>+struct dentry *vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+			 struct dentry *dentry, umode_t mode,</div><div class='add'>+			 struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	unsigned max_links = dir-&gt;i_sb-&gt;s_max_links;</div><div class='add'>+	struct dentry *de;</div><div class='ctx'> </div><div class='ctx'> 	error = may_create(idmap, dir, dentry);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='add'>+	error = -EPERM;</div><div class='ctx'> 	if (!dir-&gt;i_op-&gt;mkdir)</div><div class='del'>-		return -EPERM;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	mode = vfs_prepare_mode(idmap, dir, mode, S_IRWXUGO | S_ISVTX, 0);</div><div class='ctx'> 	error = security_inode_mkdir(dir, dentry, mode);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='add'>+	error = -EMLINK;</div><div class='ctx'> 	if (max_links &amp;&amp; dir-&gt;i_nlink &gt;= max_links)</div><div class='del'>-		return -EMLINK;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	error = dir-&gt;i_op-&gt;mkdir(idmap, dir, dentry, mode);</div><div class='del'>-	if (!error)</div><div class='del'>-		fsnotify_mkdir(dir, dentry);</div><div class='del'>-	return error;</div><div class='add'>+	error = try_break_deleg(dir, delegated_inode);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	de = dir-&gt;i_op-&gt;mkdir(idmap, dir, dentry, mode);</div><div class='add'>+	error = PTR_ERR(de);</div><div class='add'>+	if (IS_ERR(de))</div><div class='add'>+		goto err;</div><div class='add'>+	if (de) {</div><div class='add'>+		dput(dentry);</div><div class='add'>+		dentry = de;</div><div class='add'>+	}</div><div class='add'>+	fsnotify_mkdir(dir, dentry);</div><div class='add'>+	return dentry;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	end_creating(dentry);</div><div class='add'>+	return ERR_PTR(error);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vfs_mkdir);</div><div class='ctx'> </div><div class='hunk'>@@ -4132,6 +5150,7 @@ int do_mkdirat(int dfd, struct filename *name, umode_t mode)</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	int error;</div><div class='ctx'> 	unsigned int lookup_flags = LOOKUP_DIRECTORY;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	dentry = filename_create(dfd, name, &amp;path, lookup_flags);</div><div class='hunk'>@@ -4142,10 +5161,17 @@ retry:</div><div class='ctx'> 	error = security_path_mkdir(&amp;path, dentry,</div><div class='ctx'> 			mode_strip_umask(path.dentry-&gt;d_inode, mode));</div><div class='ctx'> 	if (!error) {</div><div class='del'>-		error = vfs_mkdir(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='del'>-				  dentry, mode);</div><div class='add'>+		dentry = vfs_mkdir(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='add'>+				   dentry, mode, &amp;delegated_inode);</div><div class='add'>+		if (IS_ERR(dentry))</div><div class='add'>+			error = PTR_ERR(dentry);</div><div class='add'>+	}</div><div class='add'>+	end_creating_path(&amp;path, dentry);</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='add'>+		error = break_deleg_wait(&amp;delegated_inode);</div><div class='add'>+		if (!error)</div><div class='add'>+			goto retry;</div><div class='ctx'> 	}</div><div class='del'>-	done_path_create(&amp;path, dentry);</div><div class='ctx'> 	if (retry_estale(error, lookup_flags)) {</div><div class='ctx'> 		lookup_flags |= LOOKUP_REVAL;</div><div class='ctx'> 		goto retry;</div><div class='hunk'>@@ -4167,9 +5193,10 @@ SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vfs_rmdir - remove directory</div><div class='del'>- * @idmap:	idmap of the mount the inode was found from</div><div class='del'>- * @dir:	inode of @dentry</div><div class='del'>- * @dentry:	pointer to dentry of the base directory</div><div class='add'>+ * @idmap:		idmap of the mount the inode was found from</div><div class='add'>+ * @dir:		inode of the parent directory</div><div class='add'>+ * @dentry:		dentry of the child directory</div><div class='add'>+ * @delegated_inode:	returns parent inode, if it's delegated.</div><div class='ctx'>  *</div><div class='ctx'>  * Remove a directory.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4180,7 +5207,7 @@ SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode)</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='ctx'> int vfs_rmdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		     struct dentry *dentry)</div><div class='add'>+	      struct dentry *dentry, struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	int error = may_delete(idmap, dir, dentry, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -4202,6 +5229,10 @@ int vfs_rmdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	error = try_break_deleg(dir, delegated_inode);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	error = dir-&gt;i_op-&gt;rmdir(dir, dentry);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4228,6 +5259,7 @@ int do_rmdir(int dfd, struct filename *name)</div><div class='ctx'> 	struct qstr last;</div><div class='ctx'> 	int type;</div><div class='ctx'> 	unsigned int lookup_flags = 0;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> retry:</div><div class='ctx'> 	error = filename_parentat(dfd, name, lookup_flags, &amp;path, &amp;last, &amp;type);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -4249,26 +5281,26 @@ retry:</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto exit2;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(path.dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	dentry = lookup_one_qstr_excl(&amp;last, path.dentry, lookup_flags);</div><div class='add'>+	dentry = start_dirop(path.dentry, &amp;last, lookup_flags);</div><div class='ctx'> 	error = PTR_ERR(dentry);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		goto exit3;</div><div class='del'>-	if (!dentry-&gt;d_inode) {</div><div class='del'>-		error = -ENOENT;</div><div class='del'>-		goto exit4;</div><div class='del'>-	}</div><div class='ctx'> 	error = security_path_rmdir(&amp;path, dentry);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto exit4;</div><div class='del'>-	error = vfs_rmdir(mnt_idmap(path.mnt), path.dentry-&gt;d_inode, dentry);</div><div class='add'>+	error = vfs_rmdir(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='add'>+			  dentry, &amp;delegated_inode);</div><div class='ctx'> exit4:</div><div class='del'>-	dput(dentry);</div><div class='add'>+	end_dirop(dentry);</div><div class='ctx'> exit3:</div><div class='del'>-	inode_unlock(path.dentry-&gt;d_inode);</div><div class='ctx'> 	mnt_drop_write(path.mnt);</div><div class='ctx'> exit2:</div><div class='ctx'> 	path_put(&amp;path);</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='add'>+		error = break_deleg_wait(&amp;delegated_inode);</div><div class='add'>+		if (!error)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='ctx'> 	if (retry_estale(error, lookup_flags)) {</div><div class='ctx'> 		lookup_flags |= LOOKUP_REVAL;</div><div class='ctx'> 		goto retry;</div><div class='hunk'>@@ -4290,13 +5322,13 @@ SYSCALL_DEFINE1(rmdir, const char __user *, pathname)</div><div class='ctx'>  * @dentry:	victim</div><div class='ctx'>  * @delegated_inode: returns victim inode, if the inode is delegated.</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold dir-&gt;i_mutex.</div><div class='add'>+ * The caller must hold dir-&gt;i_rwsem exclusively.</div><div class='ctx'>  *</div><div class='ctx'>  * If vfs_unlink discovers a delegation, it will return -EWOULDBLOCK and</div><div class='ctx'>  * return a reference to the inode in delegated_inode.  The caller</div><div class='ctx'>  * should then break the delegation on that inode and retry.  Because</div><div class='ctx'>  * breaking a delegation may take a long time, the caller should drop</div><div class='del'>- * dir-&gt;i_mutex before doing so.</div><div class='add'>+ * dir-&gt;i_rwsem before doing so.</div><div class='ctx'>  *</div><div class='ctx'>  * Alternatively, a caller may pass NULL for delegated_inode.  This may</div><div class='ctx'>  * be appropriate for callers that expect the underlying filesystem not</div><div class='hunk'>@@ -4309,7 +5341,7 @@ SYSCALL_DEFINE1(rmdir, const char __user *, pathname)</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='ctx'> int vfs_unlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-	       struct dentry *dentry, struct inode **delegated_inode)</div><div class='add'>+	       struct dentry *dentry, struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *target = dentry-&gt;d_inode;</div><div class='ctx'> 	int error = may_delete(idmap, dir, dentry, 0);</div><div class='hunk'>@@ -4328,6 +5360,9 @@ int vfs_unlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	else {</div><div class='ctx'> 		error = security_inode_unlink(dir, dentry);</div><div class='ctx'> 		if (!error) {</div><div class='add'>+			error = try_break_deleg(dir, delegated_inode);</div><div class='add'>+			if (error)</div><div class='add'>+				goto out;</div><div class='ctx'> 			error = try_break_deleg(target, delegated_inode);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -4355,7 +5390,7 @@ EXPORT_SYMBOL(vfs_unlink);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Make sure that the actual truncation of the file will occur outside its</div><div class='del'>- * directory's i_mutex.  Truncate can take a long time if there is a lot of</div><div class='add'>+ * directory's i_rwsem.  Truncate can take a long time if there is a lot of</div><div class='ctx'>  * writeout happening, and we don't want to prevent access to the directory</div><div class='ctx'>  * while waiting on the I/O.</div><div class='ctx'>  */</div><div class='hunk'>@@ -4366,69 +5401,62 @@ int do_unlinkat(int dfd, struct filename *name)</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	struct qstr last;</div><div class='ctx'> 	int type;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> 	unsigned int lookup_flags = 0;</div><div class='ctx'> retry:</div><div class='ctx'> 	error = filename_parentat(dfd, name, lookup_flags, &amp;path, &amp;last, &amp;type);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto exit1;</div><div class='add'>+		goto exit_putname;</div><div class='ctx'> </div><div class='ctx'> 	error = -EISDIR;</div><div class='ctx'> 	if (type != LAST_NORM)</div><div class='del'>-		goto exit2;</div><div class='add'>+		goto exit_path_put;</div><div class='ctx'> </div><div class='ctx'> 	error = mnt_want_write(path.mnt);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto exit2;</div><div class='add'>+		goto exit_path_put;</div><div class='ctx'> retry_deleg:</div><div class='del'>-	inode_lock_nested(path.dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	dentry = lookup_one_qstr_excl(&amp;last, path.dentry, lookup_flags);</div><div class='add'>+	dentry = start_dirop(path.dentry, &amp;last, lookup_flags);</div><div class='ctx'> 	error = PTR_ERR(dentry);</div><div class='del'>-	if (!IS_ERR(dentry)) {</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		goto exit_drop_write;</div><div class='ctx'> </div><div class='del'>-		/* Why not before? Because we want correct error value */</div><div class='del'>-		if (last.name[last.len] || d_is_negative(dentry))</div><div class='del'>-			goto slashes;</div><div class='del'>-		inode = dentry-&gt;d_inode;</div><div class='del'>-		ihold(inode);</div><div class='del'>-		error = security_path_unlink(&amp;path, dentry);</div><div class='del'>-		if (error)</div><div class='del'>-			goto exit3;</div><div class='del'>-		error = vfs_unlink(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='del'>-				   dentry, &amp;delegated_inode);</div><div class='del'>-exit3:</div><div class='del'>-		dput(dentry);</div><div class='add'>+	/* Why not before? Because we want correct error value */</div><div class='add'>+	if (unlikely(last.name[last.len])) {</div><div class='add'>+		if (d_is_dir(dentry))</div><div class='add'>+			error = -EISDIR;</div><div class='add'>+		else</div><div class='add'>+			error = -ENOTDIR;</div><div class='add'>+		end_dirop(dentry);</div><div class='add'>+		goto exit_drop_write;</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(path.dentry-&gt;d_inode);</div><div class='del'>-	if (inode)</div><div class='del'>-		iput(inode);	/* truncate the inode here */</div><div class='del'>-	inode = NULL;</div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	inode = dentry-&gt;d_inode;</div><div class='add'>+	ihold(inode);</div><div class='add'>+	error = security_path_unlink(&amp;path, dentry);</div><div class='add'>+	if (error)</div><div class='add'>+		goto exit_end_dirop;</div><div class='add'>+	error = vfs_unlink(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='add'>+			   dentry, &amp;delegated_inode);</div><div class='add'>+exit_end_dirop:</div><div class='add'>+	end_dirop(dentry);</div><div class='add'>+	iput(inode);	/* truncate the inode here */</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			goto retry_deleg;</div><div class='ctx'> 	}</div><div class='add'>+exit_drop_write:</div><div class='ctx'> 	mnt_drop_write(path.mnt);</div><div class='del'>-exit2:</div><div class='add'>+exit_path_put:</div><div class='ctx'> 	path_put(&amp;path);</div><div class='ctx'> 	if (retry_estale(error, lookup_flags)) {</div><div class='ctx'> 		lookup_flags |= LOOKUP_REVAL;</div><div class='del'>-		inode = NULL;</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='del'>-exit1:</div><div class='add'>+exit_putname:</div><div class='ctx'> 	putname(name);</div><div class='ctx'> 	return error;</div><div class='del'>-</div><div class='del'>-slashes:</div><div class='del'>-	if (d_is_negative(dentry))</div><div class='del'>-		error = -ENOENT;</div><div class='del'>-	else if (d_is_dir(dentry))</div><div class='del'>-		error = -EISDIR;</div><div class='del'>-	else</div><div class='del'>-		error = -ENOTDIR;</div><div class='del'>-	goto exit3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)</div><div class='hunk'>@@ -4449,9 +5477,10 @@ SYSCALL_DEFINE1(unlink, const char __user *, pathname)</div><div class='ctx'> /**</div><div class='ctx'>  * vfs_symlink - create symlink</div><div class='ctx'>  * @idmap:	idmap of the mount the inode was found from</div><div class='del'>- * @dir:	inode of @dentry</div><div class='del'>- * @dentry:	pointer to dentry of the base directory</div><div class='add'>+ * @dir:	inode of the parent directory</div><div class='add'>+ * @dentry:	dentry of the child symlink file</div><div class='ctx'>  * @oldname:	name of the file to link to</div><div class='add'>+ * @delegated_inode: returns victim inode, if the inode is delegated.</div><div class='ctx'>  *</div><div class='ctx'>  * Create a symlink.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4462,7 +5491,8 @@ SYSCALL_DEFINE1(unlink, const char __user *, pathname)</div><div class='ctx'>  * raw inode simply pass @nop_mnt_idmap.</div><div class='ctx'>  */</div><div class='ctx'> int vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		struct dentry *dentry, const char *oldname)</div><div class='add'>+		struct dentry *dentry, const char *oldname,</div><div class='add'>+		struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -4477,6 +5507,10 @@ int vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='add'>+	error = try_break_deleg(dir, delegated_inode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	error = dir-&gt;i_op-&gt;symlink(idmap, dir, dentry, oldname);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		fsnotify_create(dir, dentry);</div><div class='hunk'>@@ -4490,6 +5524,7 @@ int do_symlinkat(struct filename *from, int newdfd, struct filename *to)</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	unsigned int lookup_flags = 0;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(from)) {</div><div class='ctx'> 		error = PTR_ERR(from);</div><div class='hunk'>@@ -4504,8 +5539,13 @@ retry:</div><div class='ctx'> 	error = security_path_symlink(&amp;path, dentry, from-&gt;name);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = vfs_symlink(mnt_idmap(path.mnt), path.dentry-&gt;d_inode,</div><div class='del'>-				    dentry, from-&gt;name);</div><div class='del'>-	done_path_create(&amp;path, dentry);</div><div class='add'>+				    dentry, from-&gt;name, &amp;delegated_inode);</div><div class='add'>+	end_creating_path(&amp;path, dentry);</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='add'>+		error = break_deleg_wait(&amp;delegated_inode);</div><div class='add'>+		if (!error)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='ctx'> 	if (retry_estale(error, lookup_flags)) {</div><div class='ctx'> 		lookup_flags |= LOOKUP_REVAL;</div><div class='ctx'> 		goto retry;</div><div class='hunk'>@@ -4535,13 +5575,13 @@ SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newn</div><div class='ctx'>  * @new_dentry:	where to create the new link</div><div class='ctx'>  * @delegated_inode: returns inode needing a delegation break</div><div class='ctx'>  *</div><div class='del'>- * The caller must hold dir-&gt;i_mutex</div><div class='add'>+ * The caller must hold dir-&gt;i_rwsem exclusively.</div><div class='ctx'>  *</div><div class='ctx'>  * If vfs_link discovers a delegation on the to-be-linked file in need</div><div class='ctx'>  * of breaking, it will return -EWOULDBLOCK and return a reference to the</div><div class='ctx'>  * inode in delegated_inode.  The caller should then break the delegation</div><div class='ctx'>  * and retry.  Because breaking a delegation may take a long time, the</div><div class='del'>- * caller should drop the i_mutex before doing so.</div><div class='add'>+ * caller should drop the i_rwsem before doing so.</div><div class='ctx'>  *</div><div class='ctx'>  * Alternatively, a caller may pass NULL for delegated_inode.  This may</div><div class='ctx'>  * be appropriate for callers that expect the underlying filesystem not</div><div class='hunk'>@@ -4555,7 +5595,7 @@ SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newn</div><div class='ctx'>  */</div><div class='ctx'> int vfs_link(struct dentry *old_dentry, struct mnt_idmap *idmap,</div><div class='ctx'> 	     struct inode *dir, struct dentry *new_dentry,</div><div class='del'>-	     struct inode **delegated_inode)</div><div class='add'>+	     struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = old_dentry-&gt;d_inode;</div><div class='ctx'> 	unsigned max_links = dir-&gt;i_sb-&gt;s_max_links;</div><div class='hunk'>@@ -4578,7 +5618,7 @@ int vfs_link(struct dentry *old_dentry, struct mnt_idmap *idmap,</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Updating the link count will likely cause i_uid and i_gid to</div><div class='del'>-	 * be writen back improperly if their true value is unknown to</div><div class='add'>+	 * be written back improperly if their true value is unknown to</div><div class='ctx'> 	 * the vfs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (HAS_UNMAPPED_ID(idmap, inode))</div><div class='hunk'>@@ -4594,19 +5634,21 @@ int vfs_link(struct dentry *old_dentry, struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	/* Make sure we don't allow creating hardlink to an unlinked file */</div><div class='del'>-	if (inode-&gt;i_nlink == 0 &amp;&amp; !(inode-&gt;i_state &amp; I_LINKABLE))</div><div class='add'>+	if (inode-&gt;i_nlink == 0 &amp;&amp; !(inode_state_read_once(inode) &amp; I_LINKABLE))</div><div class='ctx'> 		error =  -ENOENT;</div><div class='ctx'> 	else if (max_links &amp;&amp; inode-&gt;i_nlink &gt;= max_links)</div><div class='ctx'> 		error = -EMLINK;</div><div class='ctx'> 	else {</div><div class='del'>-		error = try_break_deleg(inode, delegated_inode);</div><div class='add'>+		error = try_break_deleg(dir, delegated_inode);</div><div class='add'>+		if (!error)</div><div class='add'>+			error = try_break_deleg(inode, delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			error = dir-&gt;i_op-&gt;link(old_dentry, dir, new_dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!error &amp;&amp; (inode-&gt;i_state &amp; I_LINKABLE)) {</div><div class='add'>+	if (!error &amp;&amp; (inode_state_read_once(inode) &amp; I_LINKABLE)) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		inode-&gt;i_state &amp;= ~I_LINKABLE;</div><div class='add'>+		inode_state_clear(inode, I_LINKABLE);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode_unlock(inode);</div><div class='hunk'>@@ -4631,7 +5673,7 @@ int do_linkat(int olddfd, struct filename *old, int newdfd,</div><div class='ctx'> 	struct mnt_idmap *idmap;</div><div class='ctx'> 	struct dentry *new_dentry;</div><div class='ctx'> 	struct path old_path, new_path;</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> 	int how = 0;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -4640,14 +5682,13 @@ int do_linkat(int olddfd, struct filename *old, int newdfd,</div><div class='ctx'> 		goto out_putnames;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	 * To use null names we require CAP_DAC_READ_SEARCH</div><div class='add'>+	 * To use null names we require CAP_DAC_READ_SEARCH or</div><div class='add'>+	 * that the open-time creds of the dfd matches current.</div><div class='ctx'> 	 * This ensures that not everyone will be able to create</div><div class='del'>-	 * handlink using the passed filedescriptor.</div><div class='add'>+	 * a hardlink using the passed file descriptor.</div><div class='ctx'> 	 */</div><div class='del'>-	if (flags &amp; AT_EMPTY_PATH &amp;&amp; !capable(CAP_DAC_READ_SEARCH)) {</div><div class='del'>-		error = -ENOENT;</div><div class='del'>-		goto out_putnames;</div><div class='del'>-	}</div><div class='add'>+	if (flags &amp; AT_EMPTY_PATH)</div><div class='add'>+		how |= LOOKUP_LINKAT_EMPTY;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; AT_SYMLINK_FOLLOW)</div><div class='ctx'> 		how |= LOOKUP_FOLLOW;</div><div class='hunk'>@@ -4675,8 +5716,8 @@ retry:</div><div class='ctx'> 	error = vfs_link(old_path.dentry, idmap, new_path.dentry-&gt;d_inode,</div><div class='ctx'> 			 new_dentry, &amp;delegated_inode);</div><div class='ctx'> out_dput:</div><div class='del'>-	done_path_create(&amp;new_path, new_dentry);</div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	end_creating_path(&amp;new_path, new_dentry);</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error) {</div><div class='ctx'> 			path_put(&amp;old_path);</div><div class='hunk'>@@ -4738,7 +5779,7 @@ SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname</div><div class='ctx'>  *	c) we may have to lock up to _four_ objects - parents and victim (if it exists),</div><div class='ctx'>  *	   and source (if it's a non-directory or a subdirectory that moves to</div><div class='ctx'>  *	   different parent).</div><div class='del'>- *	   And that - after we got -&gt;i_mutex on parents (until then we don't know</div><div class='add'>+ *	   And that - after we got -&gt;i_rwsem on parents (until then we don't know</div><div class='ctx'>  *	   whether the target exists).  Solution: try to be smart with locking</div><div class='ctx'>  *	   order for inodes.  We rely on the fact that tree topology may change</div><div class='ctx'>  *	   only under -&gt;s_vfs_rename_mutex _and_ that parent of the object we</div><div class='hunk'>@@ -4750,18 +5791,19 @@ SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname</div><div class='ctx'>  *	   has no more than 1 dentry.  If "hybrid" objects will ever appear,</div><div class='ctx'>  *	   we'd better make sure that there's no link(2) for them.</div><div class='ctx'>  *	d) conversion from fhandle to dentry may come in the wrong moment - when</div><div class='del'>- *	   we are removing the target. Solution: we will have to grab -&gt;i_mutex</div><div class='add'>+ *	   we are removing the target. Solution: we will have to grab -&gt;i_rwsem</div><div class='ctx'>  *	   in the fhandle_to_dentry code. [FIXME - current nfsfh.c relies on</div><div class='del'>- *	   -&gt;i_mutex on parents, which works but leads to some truly excessive</div><div class='add'>+ *	   -&gt;i_rwsem on parents, which works but leads to some truly excessive</div><div class='ctx'>  *	   locking].</div><div class='ctx'>  */</div><div class='ctx'> int vfs_rename(struct renamedata *rd)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='del'>-	struct inode *old_dir = rd-&gt;old_dir, *new_dir = rd-&gt;new_dir;</div><div class='add'>+	struct inode *old_dir = d_inode(rd-&gt;old_parent);</div><div class='add'>+	struct inode *new_dir = d_inode(rd-&gt;new_parent);</div><div class='ctx'> 	struct dentry *old_dentry = rd-&gt;old_dentry;</div><div class='ctx'> 	struct dentry *new_dentry = rd-&gt;new_dentry;</div><div class='del'>-	struct inode **delegated_inode = rd-&gt;delegated_inode;</div><div class='add'>+	struct delegated_inode *delegated_inode = rd-&gt;delegated_inode;</div><div class='ctx'> 	unsigned int flags = rd-&gt;flags;</div><div class='ctx'> 	bool is_dir = d_is_dir(old_dentry);</div><div class='ctx'> 	struct inode *source = old_dentry-&gt;d_inode;</div><div class='hunk'>@@ -4774,20 +5816,20 @@ int vfs_rename(struct renamedata *rd)</div><div class='ctx'> 	if (source == target)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	error = may_delete(rd-&gt;old_mnt_idmap, old_dir, old_dentry, is_dir);</div><div class='add'>+	error = may_delete(rd-&gt;mnt_idmap, old_dir, old_dentry, is_dir);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (!target) {</div><div class='del'>-		error = may_create(rd-&gt;new_mnt_idmap, new_dir, new_dentry);</div><div class='add'>+		error = may_create(rd-&gt;mnt_idmap, new_dir, new_dentry);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		new_is_dir = d_is_dir(new_dentry);</div><div class='ctx'> </div><div class='ctx'> 		if (!(flags &amp; RENAME_EXCHANGE))</div><div class='del'>-			error = may_delete(rd-&gt;new_mnt_idmap, new_dir,</div><div class='add'>+			error = may_delete(rd-&gt;mnt_idmap, new_dir,</div><div class='ctx'> 					   new_dentry, is_dir);</div><div class='ctx'> 		else</div><div class='del'>-			error = may_delete(rd-&gt;new_mnt_idmap, new_dir,</div><div class='add'>+			error = may_delete(rd-&gt;mnt_idmap, new_dir,</div><div class='ctx'> 					   new_dentry, new_is_dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -4802,13 +5844,13 @@ int vfs_rename(struct renamedata *rd)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (new_dir != old_dir) {</div><div class='ctx'> 		if (is_dir) {</div><div class='del'>-			error = inode_permission(rd-&gt;old_mnt_idmap, source,</div><div class='add'>+			error = inode_permission(rd-&gt;mnt_idmap, source,</div><div class='ctx'> 						 MAY_WRITE);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				return error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((flags &amp; RENAME_EXCHANGE) &amp;&amp; new_is_dir) {</div><div class='del'>-			error = inode_permission(rd-&gt;new_mnt_idmap, target,</div><div class='add'>+			error = inode_permission(rd-&gt;mnt_idmap, target,</div><div class='ctx'> 						 MAY_WRITE);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				return error;</div><div class='hunk'>@@ -4866,6 +5908,14 @@ int vfs_rename(struct renamedata *rd)</div><div class='ctx'> 		    old_dir-&gt;i_nlink &gt;= max_links)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='add'>+	error = try_break_deleg(old_dir, delegated_inode);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out;</div><div class='add'>+	if (new_dir != old_dir) {</div><div class='add'>+		error = try_break_deleg(new_dir, delegated_inode);</div><div class='add'>+		if (error)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> 	if (!is_dir) {</div><div class='ctx'> 		error = try_break_deleg(source, delegated_inode);</div><div class='ctx'> 		if (error)</div><div class='hunk'>@@ -4876,7 +5926,7 @@ int vfs_rename(struct renamedata *rd)</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	error = old_dir-&gt;i_op-&gt;rename(rd-&gt;new_mnt_idmap, old_dir, old_dentry,</div><div class='add'>+	error = old_dir-&gt;i_op-&gt;rename(rd-&gt;mnt_idmap, old_dir, old_dentry,</div><div class='ctx'> 				      new_dir, new_dentry, flags);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4919,13 +5969,11 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd,</div><div class='ctx'> 		 struct filename *to, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct renamedata rd;</div><div class='del'>-	struct dentry *old_dentry, *new_dentry;</div><div class='del'>-	struct dentry *trap;</div><div class='ctx'> 	struct path old_path, new_path;</div><div class='ctx'> 	struct qstr old_last, new_last;</div><div class='ctx'> 	int old_type, new_type;</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='del'>-	unsigned int lookup_flags = 0, target_flags = LOOKUP_RENAME_TARGET;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='add'>+	unsigned int lookup_flags = 0;</div><div class='ctx'> 	bool should_retry = false;</div><div class='ctx'> 	int error = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -4936,9 +5984,6 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd,</div><div class='ctx'> 	    (flags &amp; RENAME_EXCHANGE))</div><div class='ctx'> 		goto put_names;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; RENAME_EXCHANGE)</div><div class='del'>-		target_flags = 0;</div><div class='del'>-</div><div class='ctx'> retry:</div><div class='ctx'> 	error = filename_parentat(olddfd, from, lookup_flags, &amp;old_path,</div><div class='ctx'> 				  &amp;old_last, &amp;old_type);</div><div class='hunk'>@@ -4968,80 +6013,42 @@ retry:</div><div class='ctx'> 		goto exit2;</div><div class='ctx'> </div><div class='ctx'> retry_deleg:</div><div class='del'>-	trap = lock_rename(new_path.dentry, old_path.dentry);</div><div class='del'>-	if (IS_ERR(trap)) {</div><div class='del'>-		error = PTR_ERR(trap);</div><div class='add'>+	rd.old_parent	   = old_path.dentry;</div><div class='add'>+	rd.mnt_idmap	   = mnt_idmap(old_path.mnt);</div><div class='add'>+	rd.new_parent	   = new_path.dentry;</div><div class='add'>+	rd.delegated_inode = &amp;delegated_inode;</div><div class='add'>+	rd.flags	   = flags;</div><div class='add'>+</div><div class='add'>+	error = __start_renaming(&amp;rd, lookup_flags, &amp;old_last, &amp;new_last);</div><div class='add'>+	if (error)</div><div class='ctx'> 		goto exit_lock_rename;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	old_dentry = lookup_one_qstr_excl(&amp;old_last, old_path.dentry,</div><div class='del'>-					  lookup_flags);</div><div class='del'>-	error = PTR_ERR(old_dentry);</div><div class='del'>-	if (IS_ERR(old_dentry))</div><div class='del'>-		goto exit3;</div><div class='del'>-	/* source must exist */</div><div class='del'>-	error = -ENOENT;</div><div class='del'>-	if (d_is_negative(old_dentry))</div><div class='del'>-		goto exit4;</div><div class='del'>-	new_dentry = lookup_one_qstr_excl(&amp;new_last, new_path.dentry,</div><div class='del'>-					  lookup_flags | target_flags);</div><div class='del'>-	error = PTR_ERR(new_dentry);</div><div class='del'>-	if (IS_ERR(new_dentry))</div><div class='del'>-		goto exit4;</div><div class='del'>-	error = -EEXIST;</div><div class='del'>-	if ((flags &amp; RENAME_NOREPLACE) &amp;&amp; d_is_positive(new_dentry))</div><div class='del'>-		goto exit5;</div><div class='ctx'> 	if (flags &amp; RENAME_EXCHANGE) {</div><div class='del'>-		error = -ENOENT;</div><div class='del'>-		if (d_is_negative(new_dentry))</div><div class='del'>-			goto exit5;</div><div class='del'>-</div><div class='del'>-		if (!d_is_dir(new_dentry)) {</div><div class='add'>+		if (!d_is_dir(rd.new_dentry)) {</div><div class='ctx'> 			error = -ENOTDIR;</div><div class='ctx'> 			if (new_last.name[new_last.len])</div><div class='del'>-				goto exit5;</div><div class='add'>+				goto exit_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* unless the source is a directory trailing slashes give -ENOTDIR */</div><div class='del'>-	if (!d_is_dir(old_dentry)) {</div><div class='add'>+	if (!d_is_dir(rd.old_dentry)) {</div><div class='ctx'> 		error = -ENOTDIR;</div><div class='ctx'> 		if (old_last.name[old_last.len])</div><div class='del'>-			goto exit5;</div><div class='add'>+			goto exit_unlock;</div><div class='ctx'> 		if (!(flags &amp; RENAME_EXCHANGE) &amp;&amp; new_last.name[new_last.len])</div><div class='del'>-			goto exit5;</div><div class='add'>+			goto exit_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	/* source should not be ancestor of target */</div><div class='del'>-	error = -EINVAL;</div><div class='del'>-	if (old_dentry == trap)</div><div class='del'>-		goto exit5;</div><div class='del'>-	/* target should not be an ancestor of source */</div><div class='del'>-	if (!(flags &amp; RENAME_EXCHANGE))</div><div class='del'>-		error = -ENOTEMPTY;</div><div class='del'>-	if (new_dentry == trap)</div><div class='del'>-		goto exit5;</div><div class='ctx'> </div><div class='del'>-	error = security_path_rename(&amp;old_path, old_dentry,</div><div class='del'>-				     &amp;new_path, new_dentry, flags);</div><div class='add'>+	error = security_path_rename(&amp;old_path, rd.old_dentry,</div><div class='add'>+				     &amp;new_path, rd.new_dentry, flags);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto exit5;</div><div class='del'>-</div><div class='del'>-	rd.old_dir	   = old_path.dentry-&gt;d_inode;</div><div class='del'>-	rd.old_dentry	   = old_dentry;</div><div class='del'>-	rd.old_mnt_idmap   = mnt_idmap(old_path.mnt);</div><div class='del'>-	rd.new_dir	   = new_path.dentry-&gt;d_inode;</div><div class='del'>-	rd.new_dentry	   = new_dentry;</div><div class='del'>-	rd.new_mnt_idmap   = mnt_idmap(new_path.mnt);</div><div class='del'>-	rd.delegated_inode = &amp;delegated_inode;</div><div class='del'>-	rd.flags	   = flags;</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='ctx'> 	error = vfs_rename(&amp;rd);</div><div class='del'>-exit5:</div><div class='del'>-	dput(new_dentry);</div><div class='del'>-exit4:</div><div class='del'>-	dput(old_dentry);</div><div class='del'>-exit3:</div><div class='del'>-	unlock_rename(new_path.dentry, old_path.dentry);</div><div class='add'>+exit_unlock:</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> exit_lock_rename:</div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			goto retry_deleg;</div><div class='hunk'>@@ -5084,19 +6091,16 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna</div><div class='ctx'> 				getname(newname), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int readlink_copy(char __user *buffer, int buflen, const char *link)</div><div class='add'>+int readlink_copy(char __user *buffer, int buflen, const char *link, int linklen)</div><div class='ctx'> {</div><div class='del'>-	int len = PTR_ERR(link);</div><div class='del'>-	if (IS_ERR(link))</div><div class='del'>-		goto out;</div><div class='add'>+	int copylen;</div><div class='ctx'> </div><div class='del'>-	len = strlen(link);</div><div class='del'>-	if (len &gt; (unsigned) buflen)</div><div class='del'>-		len = buflen;</div><div class='del'>-	if (copy_to_user(buffer, link, len))</div><div class='del'>-		len = -EFAULT;</div><div class='del'>-out:</div><div class='del'>-	return len;</div><div class='add'>+	copylen = linklen;</div><div class='add'>+	if (unlikely(copylen &gt; (unsigned) buflen))</div><div class='add'>+		copylen = buflen;</div><div class='add'>+	if (copy_to_user(buffer, link, copylen))</div><div class='add'>+		copylen = -EFAULT;</div><div class='add'>+	return copylen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -5116,6 +6120,9 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen)</div><div class='ctx'> 	const char *link;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='add'>+	if (inode-&gt;i_opflags &amp; IOP_CACHED_LINK)</div><div class='add'>+		return readlink_copy(buffer, buflen, inode-&gt;i_link, inode-&gt;i_linklen);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!(inode-&gt;i_opflags &amp; IOP_DEFAULT_READLINK))) {</div><div class='ctx'> 		if (unlikely(inode-&gt;i_op-&gt;readlink))</div><div class='ctx'> 			return inode-&gt;i_op-&gt;readlink(dentry, buffer, buflen);</div><div class='hunk'>@@ -5134,7 +6141,7 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen)</div><div class='ctx'> 		if (IS_ERR(link))</div><div class='ctx'> 			return PTR_ERR(link);</div><div class='ctx'> 	}</div><div class='del'>-	res = readlink_copy(buffer, buflen, link);</div><div class='add'>+	res = readlink_copy(buffer, buflen, link, strlen(link));</div><div class='ctx'> 	do_delayed_call(&amp;done);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -5166,47 +6173,89 @@ const char *vfs_get_link(struct dentry *dentry, struct delayed_call *done)</div><div class='ctx'> EXPORT_SYMBOL(vfs_get_link);</div><div class='ctx'> </div><div class='ctx'> /* get the link contents into pagecache */</div><div class='del'>-const char *page_get_link(struct dentry *dentry, struct inode *inode,</div><div class='del'>-			  struct delayed_call *callback)</div><div class='add'>+static char *__page_get_link(struct dentry *dentry, struct inode *inode,</div><div class='add'>+			     struct delayed_call *callback)</div><div class='ctx'> {</div><div class='del'>-	char *kaddr;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> </div><div class='ctx'> 	if (!dentry) {</div><div class='del'>-		page = find_get_page(mapping, 0);</div><div class='del'>-		if (!page)</div><div class='add'>+		folio = filemap_get_folio(mapping, 0);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (!folio_test_uptodate(folio)) {</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		page = read_mapping_page(mapping, 0, NULL);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return (char*)page;</div><div class='add'>+		folio = read_mapping_folio(mapping, 0, NULL);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return ERR_CAST(folio);</div><div class='ctx'> 	}</div><div class='del'>-	set_delayed_call(callback, page_put_link, page);</div><div class='add'>+	set_delayed_call(callback, page_put_link, folio);</div><div class='ctx'> 	BUG_ON(mapping_gfp_mask(mapping) &amp; __GFP_HIGHMEM);</div><div class='del'>-	kaddr = page_address(page);</div><div class='del'>-	nd_terminate_link(kaddr, inode-&gt;i_size, PAGE_SIZE - 1);</div><div class='del'>-	return kaddr;</div><div class='add'>+	return folio_address(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *page_get_link_raw(struct dentry *dentry, struct inode *inode,</div><div class='add'>+			      struct delayed_call *callback)</div><div class='add'>+{</div><div class='add'>+	return __page_get_link(dentry, inode, callback);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(page_get_link_raw);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * page_get_link() - An implementation of the get_link inode_operation.</div><div class='add'>+ * @dentry: The directory entry which is the symlink.</div><div class='add'>+ * @inode: The inode for the symlink.</div><div class='add'>+ * @callback: Used to drop the reference to the symlink.</div><div class='add'>+ *</div><div class='add'>+ * Filesystems which store their symlinks in the page cache should use</div><div class='add'>+ * this to implement the get_link() member of their inode_operations.</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to the NUL-terminated symlink.</div><div class='add'>+ */</div><div class='add'>+const char *page_get_link(struct dentry *dentry, struct inode *inode,</div><div class='add'>+					struct delayed_call *callback)</div><div class='add'>+{</div><div class='add'>+	char *kaddr = __page_get_link(dentry, inode, callback);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(kaddr))</div><div class='add'>+		nd_terminate_link(kaddr, inode-&gt;i_size, PAGE_SIZE - 1);</div><div class='add'>+	return kaddr;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(page_get_link);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * page_put_link() - Drop the reference to the symlink.</div><div class='add'>+ * @arg: The folio which contains the symlink.</div><div class='add'>+ *</div><div class='add'>+ * This is used internally by page_get_link().  It is exported for use</div><div class='add'>+ * by filesystems which need to implement a variant of page_get_link()</div><div class='add'>+ * themselves.  Despite the apparent symmetry, filesystems which use</div><div class='add'>+ * page_get_link() do not need to call page_put_link().</div><div class='add'>+ *</div><div class='add'>+ * The argument, while it has a void pointer type, must be a pointer to</div><div class='add'>+ * the folio which was retrieved from the page cache.  The delayed_call</div><div class='add'>+ * infrastructure is used to drop the reference count once the caller</div><div class='add'>+ * is done with the symlink.</div><div class='add'>+ */</div><div class='ctx'> void page_put_link(void *arg)</div><div class='ctx'> {</div><div class='del'>-	put_page(arg);</div><div class='add'>+	folio_put(arg);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(page_put_link);</div><div class='ctx'> </div><div class='ctx'> int page_readlink(struct dentry *dentry, char __user *buffer, int buflen)</div><div class='ctx'> {</div><div class='add'>+	const char *link;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='ctx'> 	DEFINE_DELAYED_CALL(done);</div><div class='del'>-	int res = readlink_copy(buffer, buflen,</div><div class='del'>-				page_get_link(dentry, d_inode(dentry),</div><div class='del'>-					      &amp;done));</div><div class='add'>+	link = page_get_link(dentry, d_inode(dentry), &amp;done);</div><div class='add'>+	res = PTR_ERR(link);</div><div class='add'>+	if (!IS_ERR(link))</div><div class='add'>+		res = readlink_copy(buffer, buflen, link, strlen(link));</div><div class='ctx'> 	do_delayed_call(&amp;done);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -5217,7 +6266,7 @@ int page_symlink(struct inode *inode, const char *symname, int len)</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	const struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='ctx'> 	bool nofs = !mapping_gfp_constraint(mapping, __GFP_FS);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	void *fsdata = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int flags;</div><div class='hunk'>@@ -5225,16 +6274,16 @@ int page_symlink(struct inode *inode, const char *symname, int len)</div><div class='ctx'> retry:</div><div class='ctx'> 	if (nofs)</div><div class='ctx'> 		flags = memalloc_nofs_save();</div><div class='del'>-	err = aops-&gt;write_begin(NULL, mapping, 0, len-1, &amp;page, &amp;fsdata);</div><div class='add'>+	err = aops-&gt;write_begin(NULL, mapping, 0, len-1, &amp;folio, &amp;fsdata);</div><div class='ctx'> 	if (nofs)</div><div class='ctx'> 		memalloc_nofs_restore(flags);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	memcpy(page_address(page), symname, len-1);</div><div class='add'>+	memcpy(folio_address(folio), symname, len - 1);</div><div class='ctx'> </div><div class='del'>-	err = aops-&gt;write_end(NULL, mapping, 0, len-1, len-1,</div><div class='del'>-							page, fsdata);</div><div class='add'>+	err = aops-&gt;write_end(NULL, mapping, 0, len - 1, len - 1,</div><div class='add'>+						folio, fsdata);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	if (err &lt; len-1)</div><div class='head'>diff --git a/fs/namespace.c b/fs/namespace.c<br/>index 437f60e96d40..c58674a20cad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/namespace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/namespace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/namespace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/namespace.c</a></div><div class='hunk'>@@ -32,7 +32,8 @@</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/shmem_fs.h&gt;</div><div class='ctx'> #include &lt;linux/mnt_idmapping.h&gt;</div><div class='del'>-#include &lt;linux/nospec.h&gt;</div><div class='add'>+#include &lt;linux/pidfs.h&gt;</div><div class='add'>+#include &lt;linux/nstree.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pnode.h"</div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -65,12 +66,22 @@ static int __init set_mphash_entries(char *str)</div><div class='ctx'> }</div><div class='ctx'> __setup("mphash_entries=", set_mphash_entries);</div><div class='ctx'> </div><div class='add'>+static char * __initdata initramfs_options;</div><div class='add'>+static int __init initramfs_options_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	initramfs_options = str;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("initramfs_options=", initramfs_options_setup);</div><div class='add'>+</div><div class='ctx'> static u64 event;</div><div class='del'>-static DEFINE_IDA(mnt_id_ida);</div><div class='add'>+static DEFINE_XARRAY_FLAGS(mnt_id_xa, XA_FLAGS_ALLOC);</div><div class='ctx'> static DEFINE_IDA(mnt_group_ida);</div><div class='ctx'> </div><div class='ctx'> /* Don't allow confusion with old 32bit mount ID */</div><div class='del'>-static atomic64_t mnt_id_ctr = ATOMIC64_INIT(1ULL &lt;&lt; 32);</div><div class='add'>+#define MNT_UNIQUE_ID_OFFSET (1ULL &lt;&lt; 31)</div><div class='add'>+static u64 mnt_id_ctr = MNT_UNIQUE_ID_OFFSET;</div><div class='ctx'> </div><div class='ctx'> static struct hlist_head *mount_hashtable __ro_after_init;</div><div class='ctx'> static struct hlist_head *mountpoint_hashtable __ro_after_init;</div><div class='hunk'>@@ -78,13 +89,31 @@ static struct kmem_cache *mnt_cache __ro_after_init;</div><div class='ctx'> static DECLARE_RWSEM(namespace_sem);</div><div class='ctx'> static HLIST_HEAD(unmounted);	/* protected by namespace_sem */</div><div class='ctx'> static LIST_HEAD(ex_mountpoints); /* protected by namespace_sem */</div><div class='add'>+static struct mnt_namespace *emptied_ns; /* protected by namespace_sem */</div><div class='add'>+</div><div class='add'>+static inline void namespace_lock(void);</div><div class='add'>+static void namespace_unlock(void);</div><div class='add'>+DEFINE_LOCK_GUARD_0(namespace_excl, namespace_lock(), namespace_unlock())</div><div class='add'>+DEFINE_LOCK_GUARD_0(namespace_shared, down_read(&amp;namespace_sem),</div><div class='add'>+				      up_read(&amp;namespace_sem))</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(mntput, struct vfsmount *, if (!IS_ERR(_T)) mntput(_T))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FSNOTIFY</div><div class='add'>+LIST_HEAD(notify_list); /* protected by namespace_sem */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+enum mount_kattr_flags_t {</div><div class='add'>+	MOUNT_KATTR_RECURSE		= (1 &lt;&lt; 0),</div><div class='add'>+	MOUNT_KATTR_IDMAP_REPLACE	= (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct mount_kattr {</div><div class='ctx'> 	unsigned int attr_set;</div><div class='ctx'> 	unsigned int attr_clr;</div><div class='ctx'> 	unsigned int propagation;</div><div class='ctx'> 	unsigned int lookup_flags;</div><div class='del'>-	bool recurse;</div><div class='add'>+	enum mount_kattr_flags_t kflags;</div><div class='ctx'> 	struct user_namespace *mnt_userns;</div><div class='ctx'> 	struct mnt_idmap *mnt_idmap;</div><div class='ctx'> };</div><div class='hunk'>@@ -103,6 +132,65 @@ EXPORT_SYMBOL_GPL(fs_kobj);</div><div class='ctx'>  */</div><div class='ctx'> __cacheline_aligned_in_smp DEFINE_SEQLOCK(mount_lock);</div><div class='ctx'> </div><div class='add'>+static void mnt_ns_release(struct mnt_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	/* keep alive for {list,stat}mount() */</div><div class='add'>+	if (ns &amp;&amp; refcount_dec_and_test(&amp;ns-&gt;passive)) {</div><div class='add'>+		fsnotify_mntns_delete(ns);</div><div class='add'>+		put_user_ns(ns-&gt;user_ns);</div><div class='add'>+		kfree(ns);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+DEFINE_FREE(mnt_ns_release, struct mnt_namespace *,</div><div class='add'>+	    if (!IS_ERR(_T)) mnt_ns_release(_T))</div><div class='add'>+</div><div class='add'>+static void mnt_ns_release_rcu(struct rcu_head *rcu)</div><div class='add'>+{</div><div class='add'>+	mnt_ns_release(container_of(rcu, struct mnt_namespace, ns.ns_rcu));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mnt_ns_tree_remove(struct mnt_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	/* remove from global mount namespace list */</div><div class='add'>+	if (ns_tree_active(ns))</div><div class='add'>+		ns_tree_remove(ns);</div><div class='add'>+</div><div class='add'>+	call_rcu(&amp;ns-&gt;ns.ns_rcu, mnt_ns_release_rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lookup a mount namespace by id and take a passive reference count. Taking a</div><div class='add'>+ * passive reference means the mount namespace can be emptied if e.g., the last</div><div class='add'>+ * task holding an active reference exits. To access the mounts of the</div><div class='add'>+ * namespace the @namespace_sem must first be acquired. If the namespace has</div><div class='add'>+ * already shut down before acquiring @namespace_sem, {list,stat}mount() will</div><div class='add'>+ * see that the mount rbtree of the namespace is empty.</div><div class='add'>+ *</div><div class='add'>+ * Note the lookup is lockless protected by a sequence counter. We only</div><div class='add'>+ * need to guard against false negatives as false positives aren't</div><div class='add'>+ * possible. So if we didn't find a mount namespace and the sequence</div><div class='add'>+ * counter has changed we need to retry. If the sequence counter is</div><div class='add'>+ * still the same we know the search actually failed.</div><div class='add'>+ */</div><div class='add'>+static struct mnt_namespace *lookup_mnt_ns(u64 mnt_ns_id)</div><div class='add'>+{</div><div class='add'>+	struct mnt_namespace *mnt_ns;</div><div class='add'>+	struct ns_common *ns;</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	ns = ns_tree_lookup_rcu(mnt_ns_id, CLONE_NEWNS);</div><div class='add'>+	if (!ns)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The last reference count is put with RCU delay so we can</div><div class='add'>+	 * unconditonally acquire a reference here.</div><div class='add'>+	 */</div><div class='add'>+	mnt_ns = container_of(ns, struct mnt_namespace, ns);</div><div class='add'>+	refcount_inc(&amp;mnt_ns-&gt;passive);</div><div class='add'>+	return mnt_ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void lock_mount_hash(void)</div><div class='ctx'> {</div><div class='ctx'> 	write_seqlock(&amp;mount_lock);</div><div class='hunk'>@@ -130,18 +218,19 @@ static inline struct hlist_head *mp_hash(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> static int mnt_alloc_id(struct mount *mnt)</div><div class='ctx'> {</div><div class='del'>-	int res = ida_alloc(&amp;mnt_id_ida, GFP_KERNEL);</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		return res;</div><div class='del'>-	mnt-&gt;mnt_id = res;</div><div class='del'>-	mnt-&gt;mnt_id_unique = atomic64_inc_return(&amp;mnt_id_ctr);</div><div class='del'>-	return 0;</div><div class='add'>+	xa_lock(&amp;mnt_id_xa);</div><div class='add'>+	res = __xa_alloc(&amp;mnt_id_xa, &amp;mnt-&gt;mnt_id, mnt, XA_LIMIT(1, INT_MAX), GFP_KERNEL);</div><div class='add'>+	if (!res)</div><div class='add'>+		mnt-&gt;mnt_id_unique = ++mnt_id_ctr;</div><div class='add'>+	xa_unlock(&amp;mnt_id_xa);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mnt_free_id(struct mount *mnt)</div><div class='ctx'> {</div><div class='del'>-	ida_free(&amp;mnt_id_ida, mnt-&gt;mnt_id);</div><div class='add'>+	xa_erase(&amp;mnt_id_xa, mnt-&gt;mnt_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -209,12 +298,13 @@ static struct mount *alloc_vfsmnt(const char *name)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_free_cache;</div><div class='ctx'> </div><div class='del'>-		if (name) {</div><div class='add'>+		if (name)</div><div class='ctx'> 			mnt-&gt;mnt_devname = kstrdup_const(name,</div><div class='ctx'> 							 GFP_KERNEL_ACCOUNT);</div><div class='del'>-			if (!mnt-&gt;mnt_devname)</div><div class='del'>-				goto out_free_id;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			mnt-&gt;mnt_devname = "none";</div><div class='add'>+		if (!mnt-&gt;mnt_devname)</div><div class='add'>+			goto out_free_id;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 		mnt-&gt;mnt_pcp = alloc_percpu(struct mnt_pcp);</div><div class='hunk'>@@ -233,11 +323,11 @@ static struct mount *alloc_vfsmnt(const char *name)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;mnt-&gt;mnt_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;mnt-&gt;mnt_expire);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;mnt-&gt;mnt_share);</div><div class='del'>-		INIT_LIST_HEAD(&amp;mnt-&gt;mnt_slave_list);</div><div class='del'>-		INIT_LIST_HEAD(&amp;mnt-&gt;mnt_slave);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;mnt-&gt;mnt_slave_list);</div><div class='add'>+		INIT_HLIST_NODE(&amp;mnt-&gt;mnt_slave);</div><div class='ctx'> 		INIT_HLIST_NODE(&amp;mnt-&gt;mnt_mp_list);</div><div class='del'>-		INIT_LIST_HEAD(&amp;mnt-&gt;mnt_umounting);</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;mnt-&gt;mnt_stuck_children);</div><div class='add'>+		RB_CLEAR_NODE(&amp;mnt-&gt;mnt_node);</div><div class='ctx'> 		mnt-&gt;mnt.mnt_idmap = &amp;nop_mnt_idmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	return mnt;</div><div class='hunk'>@@ -272,7 +362,7 @@ out_free_cache:</div><div class='ctx'>  * mnt_want/drop_write() will _keep_ the filesystem</div><div class='ctx'>  * r/w.</div><div class='ctx'>  */</div><div class='del'>-bool __mnt_is_readonly(struct vfsmount *mnt)</div><div class='add'>+bool __mnt_is_readonly(const struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	return (mnt-&gt;mnt_flags &amp; MNT_READONLY) || sb_rdonly(mnt-&gt;mnt_sb);</div><div class='ctx'> }</div><div class='hunk'>@@ -312,7 +402,7 @@ static unsigned int mnt_get_writers(struct mount *mnt)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mnt_is_readonly(struct vfsmount *mnt)</div><div class='add'>+static int mnt_is_readonly(const struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	if (READ_ONCE(mnt-&gt;mnt_sb-&gt;s_readonly_remount))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -353,31 +443,31 @@ int mnt_get_write_access(struct vfsmount *m)</div><div class='ctx'> 	mnt_inc_writers(mnt);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The store to mnt_inc_writers must be visible before we pass</div><div class='del'>-	 * MNT_WRITE_HOLD loop below, so that the slowpath can see our</div><div class='del'>-	 * incremented count after it has set MNT_WRITE_HOLD.</div><div class='add'>+	 * WRITE_HOLD loop below, so that the slowpath can see our</div><div class='add'>+	 * incremented count after it has set WRITE_HOLD.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> 	might_lock(&amp;mount_lock.lock);</div><div class='del'>-	while (READ_ONCE(mnt-&gt;mnt.mnt_flags) &amp; MNT_WRITE_HOLD) {</div><div class='add'>+	while (__test_write_hold(READ_ONCE(mnt-&gt;mnt_pprev_for_sb))) {</div><div class='ctx'> 		if (!IS_ENABLED(CONFIG_PREEMPT_RT)) {</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This prevents priority inversion, if the task</div><div class='del'>-			 * setting MNT_WRITE_HOLD got preempted on a remote</div><div class='add'>+			 * setting WRITE_HOLD got preempted on a remote</div><div class='ctx'> 			 * CPU, and it prevents life lock if the task setting</div><div class='del'>-			 * MNT_WRITE_HOLD has a lower priority and is bound to</div><div class='add'>+			 * WRITE_HOLD has a lower priority and is bound to</div><div class='ctx'> 			 * the same CPU as the task that is spinning here.</div><div class='ctx'> 			 */</div><div class='ctx'> 			preempt_enable();</div><div class='del'>-			lock_mount_hash();</div><div class='del'>-			unlock_mount_hash();</div><div class='add'>+			read_seqlock_excl(&amp;mount_lock);</div><div class='add'>+			read_sequnlock_excl(&amp;mount_lock);</div><div class='ctx'> 			preempt_disable();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The barrier pairs with the barrier sb_start_ro_state_change() making</div><div class='del'>-	 * sure that if we see MNT_WRITE_HOLD cleared, we will also see</div><div class='add'>+	 * sure that if we see WRITE_HOLD cleared, we will also see</div><div class='ctx'> 	 * s_readonly_remount set (or even SB_RDONLY / MNT_READONLY flags) in</div><div class='ctx'> 	 * mnt_is_readonly() and bail in case we are racing with remount</div><div class='ctx'> 	 * read-only.</div><div class='hunk'>@@ -515,16 +605,16 @@ EXPORT_SYMBOL(mnt_drop_write_file);</div><div class='ctx'>  * a call to mnt_unhold_writers() in order to stop preventing write access to</div><div class='ctx'>  * @mnt.</div><div class='ctx'>  *</div><div class='del'>- * Context: This function expects lock_mount_hash() to be held serializing</div><div class='del'>- *          setting MNT_WRITE_HOLD.</div><div class='add'>+ * Context: This function expects to be in mount_locked_reader scope serializing</div><div class='add'>+ *          setting WRITE_HOLD.</div><div class='ctx'>  * Return: On success 0 is returned.</div><div class='ctx'>  *	   On error, -EBUSY is returned.</div><div class='ctx'>  */</div><div class='ctx'> static inline int mnt_hold_writers(struct mount *mnt)</div><div class='ctx'> {</div><div class='del'>-	mnt-&gt;mnt.mnt_flags |= MNT_WRITE_HOLD;</div><div class='add'>+	set_write_hold(mnt);</div><div class='ctx'> 	/*</div><div class='del'>-	 * After storing MNT_WRITE_HOLD, we'll read the counters. This store</div><div class='add'>+	 * After storing WRITE_HOLD, we'll read the counters. This store</div><div class='ctx'> 	 * should be visible before we do.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='hunk'>@@ -540,9 +630,9 @@ static inline int mnt_hold_writers(struct mount *mnt)</div><div class='ctx'> 	 * sum up each counter, if we read a counter before it is incremented,</div><div class='ctx'> 	 * but then read another CPU's count which it has been subsequently</div><div class='ctx'> 	 * decremented from -- we would see more decrements than we should.</div><div class='del'>-	 * MNT_WRITE_HOLD protects against this scenario, because</div><div class='add'>+	 * WRITE_HOLD protects against this scenario, because</div><div class='ctx'> 	 * mnt_want_write first increments count, then smp_mb, then spins on</div><div class='del'>-	 * MNT_WRITE_HOLD, so it can't be decremented by another CPU while</div><div class='add'>+	 * WRITE_HOLD, so it can't be decremented by another CPU while</div><div class='ctx'> 	 * we're counting up here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mnt_get_writers(mnt) &gt; 0)</div><div class='hunk'>@@ -558,19 +648,42 @@ static inline int mnt_hold_writers(struct mount *mnt)</div><div class='ctx'>  * Stop preventing write access to @mnt allowing callers to gain write access</div><div class='ctx'>  * to @mnt again.</div><div class='ctx'>  *</div><div class='del'>- * This function can only be called after a successful call to</div><div class='del'>- * mnt_hold_writers().</div><div class='add'>+ * This function can only be called after a call to mnt_hold_writers().</div><div class='ctx'>  *</div><div class='del'>- * Context: This function expects lock_mount_hash() to be held.</div><div class='add'>+ * Context: This function expects to be in the same mount_locked_reader scope</div><div class='add'>+ * as the matching mnt_hold_writers().</div><div class='ctx'>  */</div><div class='ctx'> static inline void mnt_unhold_writers(struct mount *mnt)</div><div class='ctx'> {</div><div class='add'>+	if (!test_write_hold(mnt))</div><div class='add'>+		return;</div><div class='ctx'> 	/*</div><div class='del'>-	 * MNT_READONLY must become visible before ~MNT_WRITE_HOLD, so writers</div><div class='add'>+	 * MNT_READONLY must become visible before ~WRITE_HOLD, so writers</div><div class='ctx'> 	 * that become unheld will see MNT_READONLY.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_wmb();</div><div class='del'>-	mnt-&gt;mnt.mnt_flags &amp;= ~MNT_WRITE_HOLD;</div><div class='add'>+	clear_write_hold(mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mnt_del_instance(struct mount *m)</div><div class='add'>+{</div><div class='add'>+	struct mount **p = m-&gt;mnt_pprev_for_sb;</div><div class='add'>+	struct mount *next = m-&gt;mnt_next_for_sb;</div><div class='add'>+</div><div class='add'>+	if (next)</div><div class='add'>+		next-&gt;mnt_pprev_for_sb = p;</div><div class='add'>+	*p = next;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mnt_add_instance(struct mount *m, struct super_block *s)</div><div class='add'>+{</div><div class='add'>+	struct mount *first = s-&gt;s_mounts;</div><div class='add'>+</div><div class='add'>+	if (first)</div><div class='add'>+		first-&gt;mnt_pprev_for_sb = &amp;m-&gt;mnt_next_for_sb;</div><div class='add'>+	m-&gt;mnt_next_for_sb = first;</div><div class='add'>+	m-&gt;mnt_pprev_for_sb = &amp;s-&gt;s_mounts;</div><div class='add'>+	s-&gt;s_mounts = m;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mnt_make_readonly(struct mount *mnt)</div><div class='hunk'>@@ -586,17 +699,17 @@ static int mnt_make_readonly(struct mount *mnt)</div><div class='ctx'> </div><div class='ctx'> int sb_prepare_remount_readonly(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	struct mount *mnt;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	/* Racy optimization.  Recheck the counter under MNT_WRITE_HOLD */</div><div class='add'>+	/* Racy optimization.  Recheck the counter under WRITE_HOLD */</div><div class='ctx'> 	if (atomic_long_read(&amp;sb-&gt;s_remove_count))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	list_for_each_entry(mnt, &amp;sb-&gt;s_mounts, mnt_instance) {</div><div class='del'>-		if (!(mnt-&gt;mnt.mnt_flags &amp; MNT_READONLY)) {</div><div class='del'>-			err = mnt_hold_writers(mnt);</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='add'>+</div><div class='add'>+	for (struct mount *m = sb-&gt;s_mounts; m; m = m-&gt;mnt_next_for_sb) {</div><div class='add'>+		if (!(m-&gt;mnt.mnt_flags &amp; MNT_READONLY)) {</div><div class='add'>+			err = mnt_hold_writers(m);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -606,11 +719,10 @@ int sb_prepare_remount_readonly(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		sb_start_ro_state_change(sb);</div><div class='del'>-	list_for_each_entry(mnt, &amp;sb-&gt;s_mounts, mnt_instance) {</div><div class='del'>-		if (mnt-&gt;mnt.mnt_flags &amp; MNT_WRITE_HOLD)</div><div class='del'>-			mnt-&gt;mnt.mnt_flags &amp;= ~MNT_WRITE_HOLD;</div><div class='add'>+	for (struct mount *m = sb-&gt;s_mounts; m; m = m-&gt;mnt_next_for_sb) {</div><div class='add'>+		if (test_write_hold(m))</div><div class='add'>+			clear_write_hold(m);</div><div class='ctx'> 	}</div><div class='del'>-	unlock_mount_hash();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -640,15 +752,11 @@ int __legitimize_mnt(struct vfsmount *bastard, unsigned seq)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	mnt = real_mount(bastard);</div><div class='ctx'> 	mnt_add_count(mnt, 1);</div><div class='del'>-	smp_mb();			// see mntput_no_expire()</div><div class='add'>+	smp_mb();		// see mntput_no_expire() and do_umount()</div><div class='ctx'> 	if (likely(!read_seqretry(&amp;mount_lock, seq)))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (bastard-&gt;mnt_flags &amp; MNT_SYNC_UMOUNT) {</div><div class='del'>-		mnt_add_count(mnt, -1);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='ctx'> 	lock_mount_hash();</div><div class='del'>-	if (unlikely(bastard-&gt;mnt_flags &amp; MNT_DOOMED)) {</div><div class='add'>+	if (unlikely(bastard-&gt;mnt_flags &amp; (MNT_SYNC_UMOUNT | MNT_DOOMED))) {</div><div class='ctx'> 		mnt_add_count(mnt, -1);</div><div class='ctx'> 		unlock_mount_hash();</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -673,24 +781,16 @@ static bool legitimize_mnt(struct vfsmount *bastard, unsigned seq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __lookup_mnt - find first child mount</div><div class='add'>+ * __lookup_mnt - mount hash lookup</div><div class='ctx'>  * @mnt:	parent mount</div><div class='del'>- * @dentry:	mountpoint</div><div class='add'>+ * @dentry:	dentry of mountpoint</div><div class='ctx'>  *</div><div class='del'>- * If @mnt has a child mount @c mounted @dentry find and return it.</div><div class='add'>+ * If @mnt has a child mount @c mounted on @dentry find and return it.</div><div class='add'>+ * Caller must either hold the spinlock component of @mount_lock or</div><div class='add'>+ * hold rcu_read_lock(), sample the seqcount component before the call</div><div class='add'>+ * and recheck it afterwards.</div><div class='ctx'>  *</div><div class='del'>- * Note that the child mount @c need not be unique. There are cases</div><div class='del'>- * where shadow mounts are created. For example, during mount</div><div class='del'>- * propagation when a source mount @mnt whose root got overmounted by a</div><div class='del'>- * mount @o after path lookup but before @namespace_sem could be</div><div class='del'>- * acquired gets copied and propagated. So @mnt gets copied including</div><div class='del'>- * @o. When @mnt is propagated to a destination mount @d that already</div><div class='del'>- * has another mount @n mounted at the same mountpoint then the source</div><div class='del'>- * mount @mnt will be tucked beneath @n, i.e., @n will be mounted on</div><div class='del'>- * @mnt and @mnt mounted on @d. Now both @n and @o are mounted at @mnt</div><div class='del'>- * on @dentry.</div><div class='del'>- *</div><div class='del'>- * Return: The first child of @mnt mounted @dentry or NULL.</div><div class='add'>+ * Return: The child of @mnt mounted on @dentry or %NULL.</div><div class='ctx'>  */</div><div class='ctx'> struct mount *__lookup_mnt(struct vfsmount *mnt, struct dentry *dentry)</div><div class='ctx'> {</div><div class='hunk'>@@ -703,21 +803,12 @@ struct mount *__lookup_mnt(struct vfsmount *mnt, struct dentry *dentry)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * lookup_mnt - Return the first child mount mounted at path</div><div class='del'>- *</div><div class='del'>- * "First" means first mounted chronologically.  If you create the</div><div class='del'>- * following mounts:</div><div class='del'>- *</div><div class='del'>- * mount /dev/sda1 /mnt</div><div class='del'>- * mount /dev/sda2 /mnt</div><div class='del'>- * mount /dev/sda3 /mnt</div><div class='del'>- *</div><div class='del'>- * Then lookup_mnt() on the base /mnt dentry in the root mount will</div><div class='del'>- * return successively the root dentry and vfsmount of /dev/sda1, then</div><div class='del'>- * /dev/sda2, then /dev/sda3, then NULL.</div><div class='add'>+/**</div><div class='add'>+ * lookup_mnt - Return the child mount mounted at given location</div><div class='add'>+ * @path:	location in the namespace</div><div class='ctx'>  *</div><div class='del'>- * lookup_mnt takes a reference to the found vfsmount.</div><div class='add'>+ * Acquires and returns a new reference to mount at given location</div><div class='add'>+ * or %NULL if nothing is mounted there.</div><div class='ctx'>  */</div><div class='ctx'> struct vfsmount *lookup_mnt(const struct path *path)</div><div class='ctx'> {</div><div class='hunk'>@@ -750,59 +841,63 @@ struct vfsmount *lookup_mnt(const struct path *path)</div><div class='ctx'>  * namespace not just a mount that happens to have some specified</div><div class='ctx'>  * parent mount.</div><div class='ctx'>  */</div><div class='del'>-bool __is_local_mountpoint(struct dentry *dentry)</div><div class='add'>+bool __is_local_mountpoint(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct mnt_namespace *ns = current-&gt;nsproxy-&gt;mnt_ns;</div><div class='ctx'> 	struct mount *mnt, *n;</div><div class='del'>-	bool is_covered = false;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;namespace_sem);</div><div class='del'>-	rbtree_postorder_for_each_entry_safe(mnt, n, &amp;ns-&gt;mounts, mnt_node) {</div><div class='del'>-		is_covered = (mnt-&gt;mnt_mountpoint == dentry);</div><div class='del'>-		if (is_covered)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	up_read(&amp;namespace_sem);</div><div class='add'>+	guard(namespace_shared)();</div><div class='add'>+</div><div class='add'>+	rbtree_postorder_for_each_entry_safe(mnt, n, &amp;ns-&gt;mounts, mnt_node)</div><div class='add'>+		if (mnt-&gt;mnt_mountpoint == dentry)</div><div class='add'>+			return true;</div><div class='ctx'> </div><div class='del'>-	return is_covered;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mountpoint *lookup_mountpoint(struct dentry *dentry)</div><div class='add'>+struct pinned_mountpoint {</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	struct mountpoint *mp;</div><div class='add'>+	struct mount *parent;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool lookup_mountpoint(struct dentry *dentry, struct pinned_mountpoint *m)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *chain = mp_hash(dentry);</div><div class='ctx'> 	struct mountpoint *mp;</div><div class='ctx'> </div><div class='ctx'> 	hlist_for_each_entry(mp, chain, m_hash) {</div><div class='ctx'> 		if (mp-&gt;m_dentry == dentry) {</div><div class='del'>-			mp-&gt;m_count++;</div><div class='del'>-			return mp;</div><div class='add'>+			hlist_add_head(&amp;m-&gt;node, &amp;mp-&gt;m_list);</div><div class='add'>+			m-&gt;mp = mp;</div><div class='add'>+			return true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mountpoint *get_mountpoint(struct dentry *dentry)</div><div class='add'>+static int get_mountpoint(struct dentry *dentry, struct pinned_mountpoint *m)</div><div class='ctx'> {</div><div class='del'>-	struct mountpoint *mp, *new = NULL;</div><div class='add'>+	struct mountpoint *mp __free(kfree) = NULL;</div><div class='add'>+	bool found;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (d_mountpoint(dentry)) {</div><div class='ctx'> 		/* might be worth a WARN_ON() */</div><div class='ctx'> 		if (d_unlinked(dentry))</div><div class='del'>-			return ERR_PTR(-ENOENT);</div><div class='add'>+			return -ENOENT;</div><div class='ctx'> mountpoint:</div><div class='ctx'> 		read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-		mp = lookup_mountpoint(dentry);</div><div class='add'>+		found = lookup_mountpoint(dentry, m);</div><div class='ctx'> 		read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-		if (mp)</div><div class='del'>-			goto done;</div><div class='add'>+		if (found)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!new)</div><div class='del'>-		new = kmalloc(sizeof(struct mountpoint), GFP_KERNEL);</div><div class='del'>-	if (!new)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='add'>+	if (!mp)</div><div class='add'>+		mp = kmalloc(sizeof(struct mountpoint), GFP_KERNEL);</div><div class='add'>+	if (!mp)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Exactly one processes may set d_mounted */</div><div class='ctx'> 	ret = d_set_mounted(dentry);</div><div class='hunk'>@@ -812,34 +907,28 @@ mountpoint:</div><div class='ctx'> 		goto mountpoint;</div><div class='ctx'> </div><div class='ctx'> 	/* The dentry is not available as a mountpoint? */</div><div class='del'>-	mp = ERR_PTR(ret);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto done;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Add the new mountpoint to the hash table */</div><div class='ctx'> 	read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-	new-&gt;m_dentry = dget(dentry);</div><div class='del'>-	new-&gt;m_count = 1;</div><div class='del'>-	hlist_add_head(&amp;new-&gt;m_hash, mp_hash(dentry));</div><div class='del'>-	INIT_HLIST_HEAD(&amp;new-&gt;m_list);</div><div class='add'>+	mp-&gt;m_dentry = dget(dentry);</div><div class='add'>+	hlist_add_head(&amp;mp-&gt;m_hash, mp_hash(dentry));</div><div class='add'>+	INIT_HLIST_HEAD(&amp;mp-&gt;m_list);</div><div class='add'>+	hlist_add_head(&amp;m-&gt;node, &amp;mp-&gt;m_list);</div><div class='add'>+	m-&gt;mp = no_free_ptr(mp);</div><div class='ctx'> 	read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-</div><div class='del'>-	mp = new;</div><div class='del'>-	new = NULL;</div><div class='del'>-done:</div><div class='del'>-	kfree(new);</div><div class='del'>-	return mp;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * vfsmount lock must be held.  Additionally, the caller is responsible</div><div class='ctx'>  * for serializing calls for given disposal list.</div><div class='ctx'>  */</div><div class='del'>-static void __put_mountpoint(struct mountpoint *mp, struct list_head *list)</div><div class='add'>+static void maybe_free_mountpoint(struct mountpoint *mp, struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	if (!--mp-&gt;m_count) {</div><div class='add'>+	if (hlist_empty(&amp;mp-&gt;m_list)) {</div><div class='ctx'> 		struct dentry *dentry = mp-&gt;m_dentry;</div><div class='del'>-		BUG_ON(!hlist_empty(&amp;mp-&gt;m_list));</div><div class='ctx'> 		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 		dentry-&gt;d_flags &amp;= ~DCACHE_MOUNTED;</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='hunk'>@@ -849,17 +938,33 @@ static void __put_mountpoint(struct mountpoint *mp, struct list_head *list)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called with namespace_lock and vfsmount lock */</div><div class='del'>-static void put_mountpoint(struct mountpoint *mp)</div><div class='add'>+/*</div><div class='add'>+ * locks: mount_lock [read_seqlock_excl], namespace_sem [excl]</div><div class='add'>+ */</div><div class='add'>+static void unpin_mountpoint(struct pinned_mountpoint *m)</div><div class='ctx'> {</div><div class='del'>-	__put_mountpoint(mp, &amp;ex_mountpoints);</div><div class='add'>+	if (m-&gt;mp) {</div><div class='add'>+		hlist_del(&amp;m-&gt;node);</div><div class='add'>+		maybe_free_mountpoint(m-&gt;mp, &amp;ex_mountpoints);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int check_mnt(struct mount *mnt)</div><div class='add'>+static inline int check_mnt(const struct mount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	return mnt-&gt;mnt_ns == current-&gt;nsproxy-&gt;mnt_ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool check_anonymous_mnt(struct mount *mnt)</div><div class='add'>+{</div><div class='add'>+	u64 seq;</div><div class='add'>+</div><div class='add'>+	if (!is_anon_ns(mnt-&gt;mnt_ns))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	seq = mnt-&gt;mnt_ns-&gt;seq_origin;</div><div class='add'>+	return !seq || (seq == current-&gt;nsproxy-&gt;mnt_ns-&gt;ns.ns_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * vfsmount lock must be held for write</div><div class='ctx'>  */</div><div class='hunk'>@@ -883,11 +988,14 @@ static void __touch_mnt_namespace(struct mnt_namespace *ns)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vfsmount lock must be held for write</div><div class='add'>+ * locks: mount_lock[write_seqlock]</div><div class='ctx'>  */</div><div class='del'>-static struct mountpoint *unhash_mnt(struct mount *mnt)</div><div class='add'>+static void __umount_mnt(struct mount *mnt, struct list_head *shrink_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct mountpoint *mp;</div><div class='add'>+	struct mount *parent = mnt-&gt;mnt_parent;</div><div class='add'>+	if (unlikely(parent-&gt;overmount == mnt))</div><div class='add'>+		parent-&gt;overmount = NULL;</div><div class='ctx'> 	mnt-&gt;mnt_parent = mnt;</div><div class='ctx'> 	mnt-&gt;mnt_mountpoint = mnt-&gt;mnt.mnt_root;</div><div class='ctx'> 	list_del_init(&amp;mnt-&gt;mnt_child);</div><div class='hunk'>@@ -895,15 +1003,15 @@ static struct mountpoint *unhash_mnt(struct mount *mnt)</div><div class='ctx'> 	hlist_del_init(&amp;mnt-&gt;mnt_mp_list);</div><div class='ctx'> 	mp = mnt-&gt;mnt_mp;</div><div class='ctx'> 	mnt-&gt;mnt_mp = NULL;</div><div class='del'>-	return mp;</div><div class='add'>+	maybe_free_mountpoint(mp, shrink_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vfsmount lock must be held for write</div><div class='add'>+ * locks: mount_lock[write_seqlock], namespace_sem[excl] (for ex_mountpoints)</div><div class='ctx'>  */</div><div class='ctx'> static void umount_mnt(struct mount *mnt)</div><div class='ctx'> {</div><div class='del'>-	put_mountpoint(unhash_mnt(mnt));</div><div class='add'>+	__umount_mnt(mnt, &amp;ex_mountpoints);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -913,43 +1021,17 @@ void mnt_set_mountpoint(struct mount *mnt,</div><div class='ctx'> 			struct mountpoint *mp,</div><div class='ctx'> 			struct mount *child_mnt)</div><div class='ctx'> {</div><div class='del'>-	mp-&gt;m_count++;</div><div class='del'>-	mnt_add_count(mnt, 1);	/* essentially, that's mntget */</div><div class='ctx'> 	child_mnt-&gt;mnt_mountpoint = mp-&gt;m_dentry;</div><div class='ctx'> 	child_mnt-&gt;mnt_parent = mnt;</div><div class='ctx'> 	child_mnt-&gt;mnt_mp = mp;</div><div class='ctx'> 	hlist_add_head(&amp;child_mnt-&gt;mnt_mp_list, &amp;mp-&gt;m_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * mnt_set_mountpoint_beneath - mount a mount beneath another one</div><div class='del'>- *</div><div class='del'>- * @new_parent: the source mount</div><div class='del'>- * @top_mnt:    the mount beneath which @new_parent is mounted</div><div class='del'>- * @new_mp:     the new mountpoint of @top_mnt on @new_parent</div><div class='del'>- *</div><div class='del'>- * Remove @top_mnt from its current mountpoint @top_mnt-&gt;mnt_mp and</div><div class='del'>- * parent @top_mnt-&gt;mnt_parent and mount it on top of @new_parent at</div><div class='del'>- * @new_mp. And mount @new_parent on the old parent and old</div><div class='del'>- * mountpoint of @top_mnt.</div><div class='del'>- *</div><div class='del'>- * Context: This function expects namespace_lock() and lock_mount_hash()</div><div class='del'>- *          to have been acquired in that order.</div><div class='del'>- */</div><div class='del'>-static void mnt_set_mountpoint_beneath(struct mount *new_parent,</div><div class='del'>-				       struct mount *top_mnt,</div><div class='del'>-				       struct mountpoint *new_mp)</div><div class='del'>-{</div><div class='del'>-	struct mount *old_top_parent = top_mnt-&gt;mnt_parent;</div><div class='del'>-	struct mountpoint *old_top_mp = top_mnt-&gt;mnt_mp;</div><div class='del'>-</div><div class='del'>-	mnt_set_mountpoint(old_top_parent, old_top_mp, new_parent);</div><div class='del'>-	mnt_change_mountpoint(new_parent, new_mp, top_mnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __attach_mnt(struct mount *mnt, struct mount *parent)</div><div class='add'>+static void make_visible(struct mount *mnt)</div><div class='ctx'> {</div><div class='add'>+	struct mount *parent = mnt-&gt;mnt_parent;</div><div class='add'>+	if (unlikely(mnt-&gt;mnt_mountpoint == parent-&gt;mnt.mnt_root))</div><div class='add'>+		parent-&gt;overmount = mnt;</div><div class='ctx'> 	hlist_add_head_rcu(&amp;mnt-&gt;mnt_hash,</div><div class='ctx'> 			   m_hash(&amp;parent-&gt;mnt, mnt-&gt;mnt_mountpoint));</div><div class='ctx'> 	list_add_tail(&amp;mnt-&gt;mnt_child, &amp;parent-&gt;mnt_mounts);</div><div class='hunk'>@@ -961,51 +1043,34 @@ static void __attach_mnt(struct mount *mnt, struct mount *parent)</div><div class='ctx'>  * @parent:  the parent</div><div class='ctx'>  * @mnt:     the new mount</div><div class='ctx'>  * @mp:      the new mountpoint</div><div class='del'>- * @beneath: whether to mount @mnt beneath or on top of @parent</div><div class='ctx'>  *</div><div class='del'>- * If @beneath is false, mount @mnt at @mp on @parent. Then attach @mnt</div><div class='add'>+ * Mount @mnt at @mp on @parent. Then attach @mnt</div><div class='ctx'>  * to @parent's child mount list and to @mount_hashtable.</div><div class='ctx'>  *</div><div class='del'>- * If @beneath is true, remove @mnt from its current parent and</div><div class='del'>- * mountpoint and mount it on @mp on @parent, and mount @parent on the</div><div class='del'>- * old parent and old mountpoint of @mnt. Finally, attach @parent to</div><div class='del'>- * @mnt_hashtable and @parent-&gt;mnt_parent-&gt;mnt_mounts.</div><div class='del'>- *</div><div class='del'>- * Note, when __attach_mnt() is called @mnt-&gt;mnt_parent already points</div><div class='add'>+ * Note, when make_visible() is called @mnt-&gt;mnt_parent already points</div><div class='ctx'>  * to the correct parent.</div><div class='ctx'>  *</div><div class='ctx'>  * Context: This function expects namespace_lock() and lock_mount_hash()</div><div class='ctx'>  *          to have been acquired in that order.</div><div class='ctx'>  */</div><div class='ctx'> static void attach_mnt(struct mount *mnt, struct mount *parent,</div><div class='del'>-		       struct mountpoint *mp, bool beneath)</div><div class='add'>+		       struct mountpoint *mp)</div><div class='ctx'> {</div><div class='del'>-	if (beneath)</div><div class='del'>-		mnt_set_mountpoint_beneath(mnt, parent, mp);</div><div class='del'>-	else</div><div class='del'>-		mnt_set_mountpoint(parent, mp, mnt);</div><div class='del'>-	/*</div><div class='del'>-	 * Note, @mnt-&gt;mnt_parent has to be used. If @mnt was mounted</div><div class='del'>-	 * beneath @parent then @mnt will need to be attached to</div><div class='del'>-	 * @parent's old parent, not @parent. IOW, @mnt-&gt;mnt_parent</div><div class='del'>-	 * isn't the same mount as @parent.</div><div class='del'>-	 */</div><div class='del'>-	__attach_mnt(mnt, mnt-&gt;mnt_parent);</div><div class='add'>+	mnt_set_mountpoint(parent, mp, mnt);</div><div class='add'>+	make_visible(mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mnt_change_mountpoint(struct mount *parent, struct mountpoint *mp, struct mount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct mountpoint *old_mp = mnt-&gt;mnt_mp;</div><div class='del'>-	struct mount *old_parent = mnt-&gt;mnt_parent;</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;mnt-&gt;mnt_child);</div><div class='ctx'> 	hlist_del_init(&amp;mnt-&gt;mnt_mp_list);</div><div class='ctx'> 	hlist_del_init_rcu(&amp;mnt-&gt;mnt_hash);</div><div class='ctx'> </div><div class='del'>-	attach_mnt(mnt, parent, mp, false);</div><div class='add'>+	attach_mnt(mnt, parent, mp);</div><div class='ctx'> </div><div class='del'>-	put_mountpoint(old_mp);</div><div class='del'>-	mnt_add_count(old_parent, -1);</div><div class='add'>+	maybe_free_mountpoint(old_mp, &amp;ex_mountpoints);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct mount *node_to_mount(struct rb_node *node)</div><div class='hunk'>@@ -1017,45 +1082,29 @@ static void mnt_add_to_ns(struct mnt_namespace *ns, struct mount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node **link = &amp;ns-&gt;mounts.rb_node;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='add'>+	bool mnt_first_node = true, mnt_last_node = true;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(mnt-&gt;mnt.mnt_flags &amp; MNT_ONRB);</div><div class='add'>+	WARN_ON(mnt_ns_attached(mnt));</div><div class='ctx'> 	mnt-&gt;mnt_ns = ns;</div><div class='ctx'> 	while (*link) {</div><div class='ctx'> 		parent = *link;</div><div class='del'>-		if (mnt-&gt;mnt_id_unique &lt; node_to_mount(parent)-&gt;mnt_id_unique)</div><div class='add'>+		if (mnt-&gt;mnt_id_unique &lt; node_to_mount(parent)-&gt;mnt_id_unique) {</div><div class='ctx'> 			link = &amp;parent-&gt;rb_left;</div><div class='del'>-		else</div><div class='add'>+			mnt_last_node = false;</div><div class='add'>+		} else {</div><div class='ctx'> 			link = &amp;parent-&gt;rb_right;</div><div class='add'>+			mnt_first_node = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (mnt_last_node)</div><div class='add'>+		ns-&gt;mnt_last_node = &amp;mnt-&gt;mnt_node;</div><div class='add'>+	if (mnt_first_node)</div><div class='add'>+		ns-&gt;mnt_first_node = &amp;mnt-&gt;mnt_node;</div><div class='ctx'> 	rb_link_node(&amp;mnt-&gt;mnt_node, parent, link);</div><div class='ctx'> 	rb_insert_color(&amp;mnt-&gt;mnt_node, &amp;ns-&gt;mounts);</div><div class='del'>-	mnt-&gt;mnt.mnt_flags |= MNT_ONRB;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vfsmount lock must be held for write</div><div class='del'>- */</div><div class='del'>-static void commit_tree(struct mount *mnt)</div><div class='del'>-{</div><div class='del'>-	struct mount *parent = mnt-&gt;mnt_parent;</div><div class='del'>-	struct mount *m;</div><div class='del'>-	LIST_HEAD(head);</div><div class='del'>-	struct mnt_namespace *n = parent-&gt;mnt_ns;</div><div class='del'>-</div><div class='del'>-	BUG_ON(parent == mnt);</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;head, &amp;mnt-&gt;mnt_list);</div><div class='del'>-	while (!list_empty(&amp;head)) {</div><div class='del'>-		m = list_first_entry(&amp;head, typeof(*m), mnt_list);</div><div class='del'>-		list_del(&amp;m-&gt;mnt_list);</div><div class='ctx'> </div><div class='del'>-		mnt_add_to_ns(n, m);</div><div class='del'>-	}</div><div class='del'>-	n-&gt;nr_mounts += n-&gt;pending_mounts;</div><div class='del'>-	n-&gt;pending_mounts = 0;</div><div class='del'>-</div><div class='del'>-	__attach_mnt(mnt, parent);</div><div class='del'>-	touch_mnt_namespace(n);</div><div class='add'>+	mnt_notify_add(mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mount *next_mnt(struct mount *p, struct mount *root)</div><div class='hunk'>@@ -1084,6 +1133,38 @@ static struct mount *skip_mnt_tree(struct mount *p)</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * vfsmount lock must be held for write</div><div class='add'>+ */</div><div class='add'>+static void commit_tree(struct mount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct mnt_namespace *n = mnt-&gt;mnt_parent-&gt;mnt_ns;</div><div class='add'>+</div><div class='add'>+	if (!mnt_ns_attached(mnt)) {</div><div class='add'>+		for (struct mount *m = mnt; m; m = next_mnt(m, mnt))</div><div class='add'>+			mnt_add_to_ns(n, m);</div><div class='add'>+		n-&gt;nr_mounts += n-&gt;pending_mounts;</div><div class='add'>+		n-&gt;pending_mounts = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	make_visible(mnt);</div><div class='add'>+	touch_mnt_namespace(n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_mnt(struct mount *m, struct dentry *root)</div><div class='add'>+{</div><div class='add'>+	struct super_block *s = root-&gt;d_sb;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;s-&gt;s_active);</div><div class='add'>+	m-&gt;mnt.mnt_sb = s;</div><div class='add'>+	m-&gt;mnt.mnt_root = dget(root);</div><div class='add'>+	m-&gt;mnt_mountpoint = m-&gt;mnt.mnt_root;</div><div class='add'>+	m-&gt;mnt_parent = m;</div><div class='add'>+</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='add'>+	mnt_add_instance(m, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * vfs_create_mount - Create a mount for a configured superblock</div><div class='ctx'>  * @fc: The configuration context with the superblock attached</div><div class='hunk'>@@ -1100,22 +1181,15 @@ struct vfsmount *vfs_create_mount(struct fs_context *fc)</div><div class='ctx'> 	if (!fc-&gt;root)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	mnt = alloc_vfsmnt(fc-&gt;source ?: "none");</div><div class='add'>+	mnt = alloc_vfsmnt(fc-&gt;source);</div><div class='ctx'> 	if (!mnt)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	if (fc-&gt;sb_flags &amp; SB_KERNMOUNT)</div><div class='ctx'> 		mnt-&gt;mnt.mnt_flags = MNT_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;fc-&gt;root-&gt;d_sb-&gt;s_active);</div><div class='del'>-	mnt-&gt;mnt.mnt_sb		= fc-&gt;root-&gt;d_sb;</div><div class='del'>-	mnt-&gt;mnt.mnt_root	= dget(fc-&gt;root);</div><div class='del'>-	mnt-&gt;mnt_mountpoint	= mnt-&gt;mnt.mnt_root;</div><div class='del'>-	mnt-&gt;mnt_parent		= mnt;</div><div class='add'>+	setup_mnt(mnt, fc-&gt;root);</div><div class='ctx'> </div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	list_add_tail(&amp;mnt-&gt;mnt_instance, &amp;mnt-&gt;mnt.mnt_sb-&gt;s_mounts);</div><div class='del'>-	unlock_mount_hash();</div><div class='ctx'> 	return &amp;mnt-&gt;mnt;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vfs_create_mount);</div><div class='hunk'>@@ -1131,6 +1205,15 @@ struct vfsmount *fc_mount(struct fs_context *fc)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fc_mount);</div><div class='ctx'> </div><div class='add'>+struct vfsmount *fc_mount_longterm(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt = fc_mount(fc);</div><div class='add'>+	if (!IS_ERR(mnt))</div><div class='add'>+		real_mount(mnt)-&gt;mnt_ns = MNT_NS_INTERNAL;</div><div class='add'>+	return mnt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fc_mount_longterm);</div><div class='add'>+</div><div class='ctx'> struct vfsmount *vfs_kern_mount(struct file_system_type *type,</div><div class='ctx'> 				int flags, const char *name,</div><div class='ctx'> 				void *data)</div><div class='hunk'>@@ -1147,8 +1230,7 @@ struct vfsmount *vfs_kern_mount(struct file_system_type *type,</div><div class='ctx'> 		return ERR_CAST(fc);</div><div class='ctx'> </div><div class='ctx'> 	if (name)</div><div class='del'>-		ret = vfs_parse_fs_string(fc, "source",</div><div class='del'>-					  name, strlen(name));</div><div class='add'>+		ret = vfs_parse_fs_string(fc, "source", name);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = parse_monolithic_mount_data(fc, data);</div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -1161,25 +1243,9 @@ struct vfsmount *vfs_kern_mount(struct file_system_type *type,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vfs_kern_mount);</div><div class='ctx'> </div><div class='del'>-struct vfsmount *</div><div class='del'>-vfs_submount(const struct dentry *mountpoint, struct file_system_type *type,</div><div class='del'>-	     const char *name, void *data)</div><div class='del'>-{</div><div class='del'>-	/* Until it is worked out how to pass the user namespace</div><div class='del'>-	 * through from the parent mount to the submount don't support</div><div class='del'>-	 * unprivileged mounts with submounts.</div><div class='del'>-	 */</div><div class='del'>-	if (mountpoint-&gt;d_sb-&gt;s_user_ns != &amp;init_user_ns)</div><div class='del'>-		return ERR_PTR(-EPERM);</div><div class='del'>-</div><div class='del'>-	return vfs_kern_mount(type, SB_SUBMOUNT, name, data);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(vfs_submount);</div><div class='del'>-</div><div class='ctx'> static struct mount *clone_mnt(struct mount *old, struct dentry *root,</div><div class='ctx'> 					int flag)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *sb = old-&gt;mnt.mnt_sb;</div><div class='ctx'> 	struct mount *mnt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1187,7 +1253,10 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,</div><div class='ctx'> 	if (!mnt)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (flag &amp; (CL_SLAVE | CL_PRIVATE | CL_SHARED_TO_SLAVE))</div><div class='add'>+	mnt-&gt;mnt.mnt_flags = READ_ONCE(old-&gt;mnt.mnt_flags) &amp;</div><div class='add'>+			     ~MNT_INTERNAL_FLAGS;</div><div class='add'>+</div><div class='add'>+	if (flag &amp; (CL_SLAVE | CL_PRIVATE))</div><div class='ctx'> 		mnt-&gt;mnt_group_id = 0; /* not a peer of original */</div><div class='ctx'> 	else</div><div class='ctx'> 		mnt-&gt;mnt_group_id = old-&gt;mnt_group_id;</div><div class='hunk'>@@ -1198,44 +1267,26 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mnt-&gt;mnt.mnt_flags = old-&gt;mnt.mnt_flags;</div><div class='del'>-	mnt-&gt;mnt.mnt_flags &amp;= ~(MNT_WRITE_HOLD|MNT_MARKED|MNT_INTERNAL|MNT_ONRB);</div><div class='add'>+	if (mnt-&gt;mnt_group_id)</div><div class='add'>+		set_mnt_shared(mnt);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;sb-&gt;s_active);</div><div class='ctx'> 	mnt-&gt;mnt.mnt_idmap = mnt_idmap_get(mnt_idmap(&amp;old-&gt;mnt));</div><div class='ctx'> </div><div class='del'>-	mnt-&gt;mnt.mnt_sb = sb;</div><div class='del'>-	mnt-&gt;mnt.mnt_root = dget(root);</div><div class='del'>-	mnt-&gt;mnt_mountpoint = mnt-&gt;mnt.mnt_root;</div><div class='del'>-	mnt-&gt;mnt_parent = mnt;</div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	list_add_tail(&amp;mnt-&gt;mnt_instance, &amp;sb-&gt;s_mounts);</div><div class='del'>-	unlock_mount_hash();</div><div class='add'>+	setup_mnt(mnt, root);</div><div class='add'>+</div><div class='add'>+	if (flag &amp; CL_PRIVATE)	// we are done with it</div><div class='add'>+		return mnt;</div><div class='add'>+</div><div class='add'>+	if (peers(mnt, old))</div><div class='add'>+		list_add(&amp;mnt-&gt;mnt_share, &amp;old-&gt;mnt_share);</div><div class='ctx'> </div><div class='del'>-	if ((flag &amp; CL_SLAVE) ||</div><div class='del'>-	    ((flag &amp; CL_SHARED_TO_SLAVE) &amp;&amp; IS_MNT_SHARED(old))) {</div><div class='del'>-		list_add(&amp;mnt-&gt;mnt_slave, &amp;old-&gt;mnt_slave_list);</div><div class='add'>+	if ((flag &amp; CL_SLAVE) &amp;&amp; old-&gt;mnt_group_id) {</div><div class='add'>+		hlist_add_head(&amp;mnt-&gt;mnt_slave, &amp;old-&gt;mnt_slave_list);</div><div class='ctx'> 		mnt-&gt;mnt_master = old;</div><div class='del'>-		CLEAR_MNT_SHARED(mnt);</div><div class='del'>-	} else if (!(flag &amp; CL_PRIVATE)) {</div><div class='del'>-		if ((flag &amp; CL_MAKE_SHARED) || IS_MNT_SHARED(old))</div><div class='del'>-			list_add(&amp;mnt-&gt;mnt_share, &amp;old-&gt;mnt_share);</div><div class='del'>-		if (IS_MNT_SLAVE(old))</div><div class='del'>-			list_add(&amp;mnt-&gt;mnt_slave, &amp;old-&gt;mnt_slave);</div><div class='add'>+	} else if (IS_MNT_SLAVE(old)) {</div><div class='add'>+		hlist_add_behind(&amp;mnt-&gt;mnt_slave, &amp;old-&gt;mnt_slave);</div><div class='ctx'> 		mnt-&gt;mnt_master = old-&gt;mnt_master;</div><div class='del'>-	} else {</div><div class='del'>-		CLEAR_MNT_SHARED(mnt);</div><div class='ctx'> 	}</div><div class='del'>-	if (flag &amp; CL_MAKE_SHARED)</div><div class='del'>-		set_mnt_shared(mnt);</div><div class='del'>-</div><div class='del'>-	/* stick the duplicate mount on the same expiry list</div><div class='del'>-	 * as the original if that was on one */</div><div class='del'>-	if (flag &amp; CL_EXPIRE) {</div><div class='del'>-		if (!list_empty(&amp;old-&gt;mnt_expire))</div><div class='del'>-			list_add(&amp;mnt-&gt;mnt_expire, &amp;old-&gt;mnt_expire);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return mnt;</div><div class='ctx'> </div><div class='ctx'>  out_free:</div><div class='hunk'>@@ -1285,26 +1336,12 @@ static void delayed_mntput(struct work_struct *unused)</div><div class='ctx'> }</div><div class='ctx'> static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput);</div><div class='ctx'> </div><div class='del'>-static void mntput_no_expire(struct mount *mnt)</div><div class='add'>+static void noinline mntput_no_expire_slowpath(struct mount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (likely(READ_ONCE(mnt-&gt;mnt_ns))) {</div><div class='del'>-		/*</div><div class='del'>-		 * Since we don't do lock_mount_hash() here,</div><div class='del'>-		 * -&gt;mnt_ns can change under us.  However, if it's</div><div class='del'>-		 * non-NULL, then there's a reference that won't</div><div class='del'>-		 * be dropped until after an RCU delay done after</div><div class='del'>-		 * turning -&gt;mnt_ns NULL.  So if we observe it</div><div class='del'>-		 * non-NULL under rcu_read_lock(), the reference</div><div class='del'>-		 * we are dropping is not the final one.</div><div class='del'>-		 */</div><div class='del'>-		mnt_add_count(mnt, -1);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	VFS_BUG_ON(mnt-&gt;mnt_ns);</div><div class='ctx'> 	lock_mount_hash();</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * make sure that if __legitimize_mnt() has not seen us grab</div><div class='hunk'>@@ -1327,12 +1364,14 @@ static void mntput_no_expire(struct mount *mnt)</div><div class='ctx'> 	mnt-&gt;mnt.mnt_flags |= MNT_DOOMED;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;mnt-&gt;mnt_instance);</div><div class='add'>+	mnt_del_instance(mnt);</div><div class='add'>+	if (unlikely(!list_empty(&amp;mnt-&gt;mnt_expire)))</div><div class='add'>+		list_del(&amp;mnt-&gt;mnt_expire);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!list_empty(&amp;mnt-&gt;mnt_mounts))) {</div><div class='ctx'> 		struct mount *p, *tmp;</div><div class='ctx'> 		list_for_each_entry_safe(p, tmp, &amp;mnt-&gt;mnt_mounts,  mnt_child) {</div><div class='del'>-			__put_mountpoint(unhash_mnt(p), &amp;list);</div><div class='add'>+			__umount_mnt(p, &amp;list);</div><div class='ctx'> 			hlist_add_head(&amp;p-&gt;mnt_umount, &amp;mnt-&gt;mnt_stuck_children);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1353,6 +1392,26 @@ static void mntput_no_expire(struct mount *mnt)</div><div class='ctx'> 	cleanup_mnt(mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mntput_no_expire(struct mount *mnt)</div><div class='add'>+{</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (likely(READ_ONCE(mnt-&gt;mnt_ns))) {</div><div class='add'>+		/*</div><div class='add'>+		 * Since we don't do lock_mount_hash() here,</div><div class='add'>+		 * -&gt;mnt_ns can change under us.  However, if it's</div><div class='add'>+		 * non-NULL, then there's a reference that won't</div><div class='add'>+		 * be dropped until after an RCU delay done after</div><div class='add'>+		 * turning -&gt;mnt_ns NULL.  So if we observe it</div><div class='add'>+		 * non-NULL under rcu_read_lock(), the reference</div><div class='add'>+		 * we are dropping is not the final one.</div><div class='add'>+		 */</div><div class='add'>+		mnt_add_count(mnt, -1);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	mntput_no_expire_slowpath(mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mntput(struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	if (mnt) {</div><div class='hunk'>@@ -1448,6 +1507,30 @@ static struct mount *mnt_find_id_at(struct mnt_namespace *ns, u64 mnt_id)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns the mount which either has the specified mnt_id, or has the next</div><div class='add'>+ * greater id before the specified one.</div><div class='add'>+ */</div><div class='add'>+static struct mount *mnt_find_id_at_reverse(struct mnt_namespace *ns, u64 mnt_id)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node = ns-&gt;mounts.rb_node;</div><div class='add'>+	struct mount *ret = NULL;</div><div class='add'>+</div><div class='add'>+	while (node) {</div><div class='add'>+		struct mount *m = node_to_mount(node);</div><div class='add'>+</div><div class='add'>+		if (mnt_id &gt;= m-&gt;mnt_id_unique) {</div><div class='add'>+			ret = node_to_mount(node);</div><div class='add'>+			if (mnt_id == m-&gt;mnt_id_unique)</div><div class='add'>+				break;</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		} else {</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='ctx'> /* iterator; we want it to have access to namespace_sem, thus here... */</div><div class='hunk'>@@ -1505,23 +1588,19 @@ const struct seq_operations mounts_op = {</div><div class='ctx'> int may_umount_tree(struct vfsmount *m)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *mnt = real_mount(m);</div><div class='del'>-	int actual_refs = 0;</div><div class='del'>-	int minimum_refs = 0;</div><div class='del'>-	struct mount *p;</div><div class='del'>-	BUG_ON(!m);</div><div class='add'>+	bool busy = false;</div><div class='ctx'> </div><div class='ctx'> 	/* write lock needed for mnt_get_count */</div><div class='ctx'> 	lock_mount_hash();</div><div class='del'>-	for (p = mnt; p; p = next_mnt(p, mnt)) {</div><div class='del'>-		actual_refs += mnt_get_count(p);</div><div class='del'>-		minimum_refs += 2;</div><div class='add'>+	for (struct mount *p = mnt; p; p = next_mnt(p, mnt)) {</div><div class='add'>+		if (mnt_get_count(p) &gt; (p == mnt ? 2 : 1)) {</div><div class='add'>+			busy = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	unlock_mount_hash();</div><div class='ctx'> </div><div class='del'>-	if (actual_refs &gt; minimum_refs)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='add'>+	return !busy;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(may_umount_tree);</div><div class='hunk'>@@ -1553,17 +1632,80 @@ int may_umount(struct vfsmount *mnt)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(may_umount);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FSNOTIFY</div><div class='add'>+static void mnt_notify(struct mount *p)</div><div class='add'>+{</div><div class='add'>+	if (!p-&gt;prev_ns &amp;&amp; p-&gt;mnt_ns) {</div><div class='add'>+		fsnotify_mnt_attach(p-&gt;mnt_ns, &amp;p-&gt;mnt);</div><div class='add'>+	} else if (p-&gt;prev_ns &amp;&amp; !p-&gt;mnt_ns) {</div><div class='add'>+		fsnotify_mnt_detach(p-&gt;prev_ns, &amp;p-&gt;mnt);</div><div class='add'>+	} else if (p-&gt;prev_ns == p-&gt;mnt_ns) {</div><div class='add'>+		fsnotify_mnt_move(p-&gt;mnt_ns, &amp;p-&gt;mnt);</div><div class='add'>+	} else {</div><div class='add'>+		fsnotify_mnt_detach(p-&gt;prev_ns, &amp;p-&gt;mnt);</div><div class='add'>+		fsnotify_mnt_attach(p-&gt;mnt_ns, &amp;p-&gt;mnt);</div><div class='add'>+	}</div><div class='add'>+	p-&gt;prev_ns = p-&gt;mnt_ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void notify_mnt_list(void)</div><div class='add'>+{</div><div class='add'>+	struct mount *m, *tmp;</div><div class='add'>+	/*</div><div class='add'>+	 * Notify about mounts that were added/reparented/detached/remain</div><div class='add'>+	 * connected after unmount.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(m, tmp, &amp;notify_list, to_notify) {</div><div class='add'>+		mnt_notify(m);</div><div class='add'>+		list_del_init(&amp;m-&gt;to_notify);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool need_notify_mnt_list(void)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;notify_list);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void notify_mnt_list(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool need_notify_mnt_list(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void free_mnt_ns(struct mnt_namespace *);</div><div class='ctx'> static void namespace_unlock(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head head;</div><div class='ctx'> 	struct hlist_node *p;</div><div class='ctx'> 	struct mount *m;</div><div class='add'>+	struct mnt_namespace *ns = emptied_ns;</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> </div><div class='ctx'> 	hlist_move_list(&amp;unmounted, &amp;head);</div><div class='ctx'> 	list_splice_init(&amp;ex_mountpoints, &amp;list);</div><div class='add'>+	emptied_ns = NULL;</div><div class='ctx'> </div><div class='del'>-	up_write(&amp;namespace_sem);</div><div class='add'>+	if (need_notify_mnt_list()) {</div><div class='add'>+		/*</div><div class='add'>+		 * No point blocking out concurrent readers while notifications</div><div class='add'>+		 * are sent. This will also allow statmount()/listmount() to run</div><div class='add'>+		 * concurrently.</div><div class='add'>+		 */</div><div class='add'>+		downgrade_write(&amp;namespace_sem);</div><div class='add'>+		notify_mnt_list();</div><div class='add'>+		up_read(&amp;namespace_sem);</div><div class='add'>+	} else {</div><div class='add'>+		up_write(&amp;namespace_sem);</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(ns)) {</div><div class='add'>+		/* Make sure we notice when we leak mounts. */</div><div class='add'>+		VFS_WARN_ON_ONCE(!mnt_ns_empty(ns));</div><div class='add'>+		free_mnt_ns(ns);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	shrink_dentry_list(&amp;list);</div><div class='ctx'> </div><div class='hunk'>@@ -1633,10 +1775,9 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)</div><div class='ctx'> 	/* Gather the mounts to umount */</div><div class='ctx'> 	for (p = mnt; p; p = next_mnt(p, mnt)) {</div><div class='ctx'> 		p-&gt;mnt.mnt_flags |= MNT_UMOUNT;</div><div class='del'>-		if (p-&gt;mnt.mnt_flags &amp; MNT_ONRB)</div><div class='del'>-			move_from_ns(p, &amp;tmp_list);</div><div class='del'>-		else</div><div class='del'>-			list_move(&amp;p-&gt;mnt_list, &amp;tmp_list);</div><div class='add'>+		if (mnt_ns_attached(p))</div><div class='add'>+			move_from_ns(p);</div><div class='add'>+		list_add_tail(&amp;p-&gt;mnt_list, &amp;tmp_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hide the mounts from mnt_mounts */</div><div class='hunk'>@@ -1644,10 +1785,12 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)</div><div class='ctx'> 		list_del_init(&amp;p-&gt;mnt_child);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add propogated mounts to the tmp_list */</div><div class='add'>+	/* Add propagated mounts to the tmp_list */</div><div class='ctx'> 	if (how &amp; UMOUNT_PROPAGATE)</div><div class='ctx'> 		propagate_umount(&amp;tmp_list);</div><div class='ctx'> </div><div class='add'>+	bulk_make_private(&amp;tmp_list);</div><div class='add'>+</div><div class='ctx'> 	while (!list_empty(&amp;tmp_list)) {</div><div class='ctx'> 		struct mnt_namespace *ns;</div><div class='ctx'> 		bool disconnect;</div><div class='hunk'>@@ -1665,7 +1808,6 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)</div><div class='ctx'> </div><div class='ctx'> 		disconnect = disconnect_mount(p, how);</div><div class='ctx'> 		if (mnt_has_parent(p)) {</div><div class='del'>-			mnt_add_count(p-&gt;mnt_parent, -1);</div><div class='ctx'> 			if (!disconnect) {</div><div class='ctx'> 				/* Don't forget about p */</div><div class='ctx'> 				list_add_tail(&amp;p-&gt;mnt_child, &amp;p-&gt;mnt_parent-&gt;mnt_mounts);</div><div class='hunk'>@@ -1673,9 +1815,21 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)</div><div class='ctx'> 				umount_mnt(p);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		change_mnt_propagation(p, MS_PRIVATE);</div><div class='ctx'> 		if (disconnect)</div><div class='ctx'> 			hlist_add_head(&amp;p-&gt;mnt_umount, &amp;unmounted);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * At this point p-&gt;mnt_ns is NULL, notification will be queued</div><div class='add'>+		 * only if</div><div class='add'>+		 *</div><div class='add'>+		 *  - p-&gt;prev_ns is non-NULL *and*</div><div class='add'>+		 *  - p-&gt;prev_ns-&gt;n_fsnotify_marks is non-NULL</div><div class='add'>+		 *</div><div class='add'>+		 * This will preclude queuing the mount if this is a cleanup</div><div class='add'>+		 * after a failed copy_tree() or destruction of an anonymous</div><div class='add'>+		 * namespace, etc.</div><div class='add'>+		 */</div><div class='add'>+		mnt_notify_add(p);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1729,7 +1883,7 @@ static int do_umount(struct mount *mnt, int flags)</div><div class='ctx'> 		 * all race cases, but it's a slowpath.</div><div class='ctx'> 		 */</div><div class='ctx'> 		lock_mount_hash();</div><div class='del'>-		if (mnt_get_count(mnt) != 2) {</div><div class='add'>+		if (!list_empty(&amp;mnt-&gt;mnt_mounts) || mnt_get_count(mnt) != 2) {</div><div class='ctx'> 			unlock_mount_hash();</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1775,24 +1929,27 @@ static int do_umount(struct mount *mnt, int flags)</div><div class='ctx'> 	namespace_lock();</div><div class='ctx'> 	lock_mount_hash();</div><div class='ctx'> </div><div class='del'>-	/* Recheck MNT_LOCKED with the locks held */</div><div class='add'>+	/* Repeat the earlier racy checks, now that we are holding the locks */</div><div class='ctx'> 	retval = -EINVAL;</div><div class='add'>+	if (!check_mnt(mnt))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (mnt-&gt;mnt.mnt_flags &amp; MNT_LOCKED)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (!mnt_has_parent(mnt)) /* not the absolute root */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	event++;</div><div class='ctx'> 	if (flags &amp; MNT_DETACH) {</div><div class='del'>-		if (mnt-&gt;mnt.mnt_flags &amp; MNT_ONRB ||</div><div class='del'>-		    !list_empty(&amp;mnt-&gt;mnt_list))</div><div class='del'>-			umount_tree(mnt, UMOUNT_PROPAGATE);</div><div class='add'>+		umount_tree(mnt, UMOUNT_PROPAGATE);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 	} else {</div><div class='add'>+		smp_mb(); // paired with __legitimize_mnt()</div><div class='ctx'> 		shrink_submounts(mnt);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='ctx'> 		if (!propagate_mount_busy(mnt, 2)) {</div><div class='del'>-			if (mnt-&gt;mnt.mnt_flags &amp; MNT_ONRB ||</div><div class='del'>-			    !list_empty(&amp;mnt-&gt;mnt_list))</div><div class='del'>-				umount_tree(mnt, UMOUNT_PROPAGATE|UMOUNT_SYNC);</div><div class='add'>+			umount_tree(mnt, UMOUNT_PROPAGATE|UMOUNT_SYNC);</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1810,32 +1967,29 @@ out:</div><div class='ctx'>  * detach_mounts allows lazily unmounting those mounts instead of</div><div class='ctx'>  * leaking them.</div><div class='ctx'>  *</div><div class='del'>- * The caller may hold dentry-&gt;d_inode-&gt;i_mutex.</div><div class='add'>+ * The caller may hold dentry-&gt;d_inode-&gt;i_rwsem.</div><div class='ctx'>  */</div><div class='ctx'> void __detach_mounts(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct mountpoint *mp;</div><div class='add'>+	struct pinned_mountpoint mp = {};</div><div class='ctx'> 	struct mount *mnt;</div><div class='ctx'> </div><div class='del'>-	namespace_lock();</div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	mp = lookup_mountpoint(dentry);</div><div class='del'>-	if (!mp)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	guard(namespace_excl)();</div><div class='add'>+	guard(mount_writer)();</div><div class='add'>+</div><div class='add'>+	if (!lookup_mountpoint(dentry, &amp;mp))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	event++;</div><div class='del'>-	while (!hlist_empty(&amp;mp-&gt;m_list)) {</div><div class='del'>-		mnt = hlist_entry(mp-&gt;m_list.first, struct mount, mnt_mp_list);</div><div class='add'>+	while (mp.node.next) {</div><div class='add'>+		mnt = hlist_entry(mp.node.next, struct mount, mnt_mp_list);</div><div class='ctx'> 		if (mnt-&gt;mnt.mnt_flags &amp; MNT_UMOUNT) {</div><div class='ctx'> 			umount_mnt(mnt);</div><div class='ctx'> 			hlist_add_head(&amp;mnt-&gt;mnt_umount, &amp;unmounted);</div><div class='ctx'> 		}</div><div class='ctx'> 		else umount_tree(mnt, UMOUNT_CONNECTED);</div><div class='ctx'> 	}</div><div class='del'>-	put_mountpoint(mp);</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_mount_hash();</div><div class='del'>-	namespace_unlock();</div><div class='add'>+	unpin_mountpoint(&amp;mp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1846,19 +2000,6 @@ bool may_mount(void)</div><div class='ctx'> 	return ns_capable(current-&gt;nsproxy-&gt;mnt_ns-&gt;user_ns, CAP_SYS_ADMIN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * path_mounted - check whether path is mounted</div><div class='del'>- * @path: path to check</div><div class='del'>- *</div><div class='del'>- * Determine whether @path refers to the root of a mount.</div><div class='del'>- *</div><div class='del'>- * Return: true if @path is the root of a mount, false if not.</div><div class='del'>- */</div><div class='del'>-static inline bool path_mounted(const struct path *path)</div><div class='del'>-{</div><div class='del'>-	return path-&gt;mnt-&gt;mnt_root == path-&gt;dentry;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void warn_mandlock(void)</div><div class='ctx'> {</div><div class='ctx'> 	pr_warn_once("=======================================================\n"</div><div class='hunk'>@@ -1871,6 +2012,7 @@ static void warn_mandlock(void)</div><div class='ctx'> static int can_umount(const struct path *path, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *mnt = real_mount(path-&gt;mnt);</div><div class='add'>+	struct super_block *sb = path-&gt;dentry-&gt;d_sb;</div><div class='ctx'> </div><div class='ctx'> 	if (!may_mount())</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -1880,13 +2022,13 @@ static int can_umount(const struct path *path, int flags)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (mnt-&gt;mnt.mnt_flags &amp; MNT_LOCKED) /* Check optimistically */</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (flags &amp; MNT_FORCE &amp;&amp; !capable(CAP_SYS_ADMIN))</div><div class='add'>+	if (flags &amp; MNT_FORCE &amp;&amp; !ns_capable(sb-&gt;s_user_ns, CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // caller is responsible for flags being sane</div><div class='del'>-int path_umount(struct path *path, int flags)</div><div class='add'>+int path_umount(const struct path *path, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *mnt = real_mount(path-&gt;mnt);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1938,14 +2080,15 @@ SYSCALL_DEFINE1(oldumount, char __user *, name)</div><div class='ctx'> </div><div class='ctx'> static bool is_mnt_ns_file(struct dentry *dentry)</div><div class='ctx'> {</div><div class='add'>+	struct ns_common *ns;</div><div class='add'>+</div><div class='ctx'> 	/* Is this a proxy for a mount namespace? */</div><div class='del'>-	return dentry-&gt;d_op == &amp;ns_dentry_operations &amp;&amp;</div><div class='del'>-	       dentry-&gt;d_fsdata == &amp;mntns_operations;</div><div class='del'>-}</div><div class='add'>+	if (dentry-&gt;d_op != &amp;ns_dentry_operations)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-static struct mnt_namespace *to_mnt_ns(struct ns_common *ns)</div><div class='del'>-{</div><div class='del'>-	return container_of(ns, struct mnt_namespace, ns);</div><div class='add'>+	ns = d_inode(dentry)-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	return ns-&gt;ops == &amp;mntns_operations;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ns_common *from_mnt_ns(struct mnt_namespace *mnt)</div><div class='hunk'>@@ -1953,132 +2096,227 @@ struct ns_common *from_mnt_ns(struct mnt_namespace *mnt)</div><div class='ctx'> 	return &amp;mnt-&gt;ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct mnt_namespace *get_sequential_mnt_ns(struct mnt_namespace *mntns, bool previous)</div><div class='add'>+{</div><div class='add'>+	struct ns_common *ns;</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		ns = ns_tree_adjoined_rcu(mntns, previous);</div><div class='add'>+		if (IS_ERR(ns))</div><div class='add'>+			return ERR_CAST(ns);</div><div class='add'>+</div><div class='add'>+		mntns = to_mnt_ns(ns);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The last passive reference count is put with RCU</div><div class='add'>+		 * delay so accessing the mount namespace is not just</div><div class='add'>+		 * safe but all relevant members are still valid.</div><div class='add'>+		 */</div><div class='add'>+		if (!ns_capable_noaudit(mntns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need an active reference count as we're persisting</div><div class='add'>+		 * the mount namespace and it might already be on its</div><div class='add'>+		 * deathbed.</div><div class='add'>+		 */</div><div class='add'>+		if (!ns_ref_get(mntns))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return mntns;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mnt_namespace *mnt_ns_from_dentry(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	if (!is_mnt_ns_file(dentry))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return to_mnt_ns(get_proc_ns(dentry-&gt;d_inode));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool mnt_ns_loop(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	/* Could bind mounting the mount namespace inode cause a</div><div class='ctx'> 	 * mount namespace loop?</div><div class='ctx'> 	 */</div><div class='del'>-	struct mnt_namespace *mnt_ns;</div><div class='del'>-	if (!is_mnt_ns_file(dentry))</div><div class='add'>+	struct mnt_namespace *mnt_ns = mnt_ns_from_dentry(dentry);</div><div class='add'>+</div><div class='add'>+	if (!mnt_ns)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	mnt_ns = to_mnt_ns(get_proc_ns(dentry-&gt;d_inode));</div><div class='del'>-	return current-&gt;nsproxy-&gt;mnt_ns-&gt;seq &gt;= mnt_ns-&gt;seq;</div><div class='add'>+	return current-&gt;nsproxy-&gt;mnt_ns-&gt;ns.ns_id &gt;= mnt_ns-&gt;ns.ns_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mount *copy_tree(struct mount *mnt, struct dentry *dentry,</div><div class='add'>+struct mount *copy_tree(struct mount *src_root, struct dentry *dentry,</div><div class='ctx'> 					int flag)</div><div class='ctx'> {</div><div class='del'>-	struct mount *res, *p, *q, *r, *parent;</div><div class='add'>+	struct mount *res, *src_parent, *src_root_child, *src_mnt,</div><div class='add'>+		*dst_parent, *dst_mnt;</div><div class='ctx'> </div><div class='del'>-	if (!(flag &amp; CL_COPY_UNBINDABLE) &amp;&amp; IS_MNT_UNBINDABLE(mnt))</div><div class='add'>+	if (!(flag &amp; CL_COPY_UNBINDABLE) &amp;&amp; IS_MNT_UNBINDABLE(src_root))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	if (!(flag &amp; CL_COPY_MNT_NS_FILE) &amp;&amp; is_mnt_ns_file(dentry))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	res = q = clone_mnt(mnt, dentry, flag);</div><div class='del'>-	if (IS_ERR(q))</div><div class='del'>-		return q;</div><div class='add'>+	res = dst_mnt = clone_mnt(src_root, dentry, flag);</div><div class='add'>+	if (IS_ERR(dst_mnt))</div><div class='add'>+		return dst_mnt;</div><div class='ctx'> </div><div class='del'>-	q-&gt;mnt_mountpoint = mnt-&gt;mnt_mountpoint;</div><div class='add'>+	src_parent = src_root;</div><div class='ctx'> </div><div class='del'>-	p = mnt;</div><div class='del'>-	list_for_each_entry(r, &amp;mnt-&gt;mnt_mounts, mnt_child) {</div><div class='del'>-		struct mount *s;</div><div class='del'>-		if (!is_subdir(r-&gt;mnt_mountpoint, dentry))</div><div class='add'>+	list_for_each_entry(src_root_child, &amp;src_root-&gt;mnt_mounts, mnt_child) {</div><div class='add'>+		if (!is_subdir(src_root_child-&gt;mnt_mountpoint, dentry))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		for (s = r; s; s = next_mnt(s, r)) {</div><div class='add'>+		for (src_mnt = src_root_child; src_mnt;</div><div class='add'>+		    src_mnt = next_mnt(src_mnt, src_root_child)) {</div><div class='ctx'> 			if (!(flag &amp; CL_COPY_UNBINDABLE) &amp;&amp;</div><div class='del'>-			    IS_MNT_UNBINDABLE(s)) {</div><div class='del'>-				if (s-&gt;mnt.mnt_flags &amp; MNT_LOCKED) {</div><div class='add'>+			    IS_MNT_UNBINDABLE(src_mnt)) {</div><div class='add'>+				if (src_mnt-&gt;mnt.mnt_flags &amp; MNT_LOCKED) {</div><div class='ctx'> 					/* Both unbindable and locked. */</div><div class='del'>-					q = ERR_PTR(-EPERM);</div><div class='add'>+					dst_mnt = ERR_PTR(-EPERM);</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				} else {</div><div class='del'>-					s = skip_mnt_tree(s);</div><div class='add'>+					src_mnt = skip_mnt_tree(src_mnt);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!(flag &amp; CL_COPY_MNT_NS_FILE) &amp;&amp;</div><div class='del'>-			    is_mnt_ns_file(s-&gt;mnt.mnt_root)) {</div><div class='del'>-				s = skip_mnt_tree(s);</div><div class='add'>+			    is_mnt_ns_file(src_mnt-&gt;mnt.mnt_root)) {</div><div class='add'>+				src_mnt = skip_mnt_tree(src_mnt);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			while (p != s-&gt;mnt_parent) {</div><div class='del'>-				p = p-&gt;mnt_parent;</div><div class='del'>-				q = q-&gt;mnt_parent;</div><div class='add'>+			while (src_parent != src_mnt-&gt;mnt_parent) {</div><div class='add'>+				src_parent = src_parent-&gt;mnt_parent;</div><div class='add'>+				dst_mnt = dst_mnt-&gt;mnt_parent;</div><div class='ctx'> 			}</div><div class='del'>-			p = s;</div><div class='del'>-			parent = q;</div><div class='del'>-			q = clone_mnt(p, p-&gt;mnt.mnt_root, flag);</div><div class='del'>-			if (IS_ERR(q))</div><div class='add'>+</div><div class='add'>+			src_parent = src_mnt;</div><div class='add'>+			dst_parent = dst_mnt;</div><div class='add'>+			dst_mnt = clone_mnt(src_mnt, src_mnt-&gt;mnt.mnt_root, flag);</div><div class='add'>+			if (IS_ERR(dst_mnt))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			lock_mount_hash();</div><div class='del'>-			list_add_tail(&amp;q-&gt;mnt_list, &amp;res-&gt;mnt_list);</div><div class='del'>-			attach_mnt(q, parent, p-&gt;mnt_mp, false);</div><div class='add'>+			if (src_mnt-&gt;mnt.mnt_flags &amp; MNT_LOCKED)</div><div class='add'>+				dst_mnt-&gt;mnt.mnt_flags |= MNT_LOCKED;</div><div class='add'>+			if (unlikely(flag &amp; CL_EXPIRE)) {</div><div class='add'>+				/* stick the duplicate mount on the same expiry</div><div class='add'>+				 * list as the original if that was on one */</div><div class='add'>+				if (!list_empty(&amp;src_mnt-&gt;mnt_expire))</div><div class='add'>+					list_add(&amp;dst_mnt-&gt;mnt_expire,</div><div class='add'>+						 &amp;src_mnt-&gt;mnt_expire);</div><div class='add'>+			}</div><div class='add'>+			attach_mnt(dst_mnt, dst_parent, src_parent-&gt;mnt_mp);</div><div class='ctx'> 			unlock_mount_hash();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		lock_mount_hash();</div><div class='ctx'> 		umount_tree(res, UMOUNT_SYNC);</div><div class='ctx'> 		unlock_mount_hash();</div><div class='ctx'> 	}</div><div class='del'>-	return q;</div><div class='add'>+	return dst_mnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller should check returned pointer for errors */</div><div class='add'>+static inline bool extend_array(struct path **res, struct path **to_free,</div><div class='add'>+				unsigned n, unsigned *count, unsigned new_count)</div><div class='add'>+{</div><div class='add'>+	struct path *p;</div><div class='add'>+</div><div class='add'>+	if (likely(n &lt; *count))</div><div class='add'>+		return true;</div><div class='add'>+	p = kmalloc_array(new_count, sizeof(struct path), GFP_KERNEL);</div><div class='add'>+	if (p &amp;&amp; *count)</div><div class='add'>+		memcpy(p, *res, *count * sizeof(struct path));</div><div class='add'>+	*count = new_count;</div><div class='add'>+	kfree(*to_free);</div><div class='add'>+	*to_free = *res = p;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct vfsmount *collect_mounts(const struct path *path)</div><div class='add'>+const struct path *collect_paths(const struct path *path,</div><div class='add'>+			      struct path *prealloc, unsigned count)</div><div class='ctx'> {</div><div class='del'>-	struct mount *tree;</div><div class='del'>-	namespace_lock();</div><div class='del'>-	if (!check_mnt(real_mount(path-&gt;mnt)))</div><div class='del'>-		tree = ERR_PTR(-EINVAL);</div><div class='del'>-	else</div><div class='del'>-		tree = copy_tree(real_mount(path-&gt;mnt), path-&gt;dentry,</div><div class='del'>-				 CL_COPY_ALL | CL_PRIVATE);</div><div class='del'>-	namespace_unlock();</div><div class='del'>-	if (IS_ERR(tree))</div><div class='del'>-		return ERR_CAST(tree);</div><div class='del'>-	return &amp;tree-&gt;mnt;</div><div class='add'>+	struct mount *root = real_mount(path-&gt;mnt);</div><div class='add'>+	struct mount *child;</div><div class='add'>+	struct path *res = prealloc, *to_free = NULL;</div><div class='add'>+	unsigned n = 0;</div><div class='add'>+</div><div class='add'>+	guard(namespace_shared)();</div><div class='add'>+</div><div class='add'>+	if (!check_mnt(root))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (!extend_array(&amp;res, &amp;to_free, 0, &amp;count, 32))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	res[n++] = *path;</div><div class='add'>+	list_for_each_entry(child, &amp;root-&gt;mnt_mounts, mnt_child) {</div><div class='add'>+		if (!is_subdir(child-&gt;mnt_mountpoint, path-&gt;dentry))</div><div class='add'>+			continue;</div><div class='add'>+		for (struct mount *m = child; m; m = next_mnt(m, child)) {</div><div class='add'>+			if (!extend_array(&amp;res, &amp;to_free, n, &amp;count, 2 * count))</div><div class='add'>+				return ERR_PTR(-ENOMEM);</div><div class='add'>+			res[n].mnt = &amp;m-&gt;mnt;</div><div class='add'>+			res[n].dentry = m-&gt;mnt.mnt_root;</div><div class='add'>+			n++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!extend_array(&amp;res, &amp;to_free, n, &amp;count, count + 1))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	memset(res + n, 0, (count - n) * sizeof(struct path));</div><div class='add'>+	for (struct path *p = res; p-&gt;mnt; p++)</div><div class='add'>+		path_get(p);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void drop_collected_paths(const struct path *paths, const struct path *prealloc)</div><div class='add'>+{</div><div class='add'>+	for (const struct path *p = paths; p-&gt;mnt; p++)</div><div class='add'>+		path_put(p);</div><div class='add'>+	if (paths != prealloc)</div><div class='add'>+		kfree(paths);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_mnt_ns(struct mnt_namespace *);</div><div class='ctx'> static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *, bool);</div><div class='ctx'> </div><div class='ctx'> void dissolve_on_fput(struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	struct mnt_namespace *ns;</div><div class='del'>-	namespace_lock();</div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	ns = real_mount(mnt)-&gt;mnt_ns;</div><div class='del'>-	if (ns) {</div><div class='del'>-		if (is_anon_ns(ns))</div><div class='del'>-			umount_tree(real_mount(mnt), UMOUNT_CONNECTED);</div><div class='del'>-		else</div><div class='del'>-			ns = NULL;</div><div class='add'>+	struct mount *m = real_mount(mnt);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * m used to be the root of anon namespace; if it still is one,</div><div class='add'>+	 * we need to dissolve the mount tree and free that namespace.</div><div class='add'>+	 * Let's try to avoid taking namespace_sem if we can determine</div><div class='add'>+	 * that there's nothing to do without it - rcu_read_lock() is</div><div class='add'>+	 * enough to make anon_ns_root() memory-safe and once m has</div><div class='add'>+	 * left its namespace, it's no longer our concern, since it will</div><div class='add'>+	 * never become a root of anon ns again.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	scoped_guard(rcu) {</div><div class='add'>+		if (!anon_ns_root(m))</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='del'>-	unlock_mount_hash();</div><div class='del'>-	namespace_unlock();</div><div class='del'>-	if (ns)</div><div class='del'>-		free_mnt_ns(ns);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-void drop_collected_mounts(struct vfsmount *mnt)</div><div class='del'>-{</div><div class='del'>-	namespace_lock();</div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	umount_tree(real_mount(mnt), 0);</div><div class='del'>-	unlock_mount_hash();</div><div class='del'>-	namespace_unlock();</div><div class='add'>+	scoped_guard(namespace_excl) {</div><div class='add'>+		if (!anon_ns_root(m))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		emptied_ns = m-&gt;mnt_ns;</div><div class='add'>+		lock_mount_hash();</div><div class='add'>+		umount_tree(m, UMOUNT_CONNECTED);</div><div class='add'>+		unlock_mount_hash();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool has_locked_children(struct mount *mnt, struct dentry *dentry)</div><div class='add'>+/* locks: namespace_shared &amp;&amp; pinned(mnt) || mount_locked_reader */</div><div class='add'>+static bool __has_locked_children(struct mount *mnt, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *child;</div><div class='ctx'> </div><div class='hunk'>@@ -2092,6 +2330,28 @@ static bool has_locked_children(struct mount *mnt, struct dentry *dentry)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool has_locked_children(struct mount *mnt, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='add'>+	return __has_locked_children(mnt, dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that there aren't references to earlier/same mount namespaces in the</div><div class='add'>+ * specified subtree.  Such references can act as pins for mount namespaces</div><div class='add'>+ * that aren't checked by the mount-cycle checking code, thereby allowing</div><div class='add'>+ * cycles to be made.</div><div class='add'>+ *</div><div class='add'>+ * locks: mount_locked_reader || namespace_shared &amp;&amp; pinned(subtree)</div><div class='add'>+ */</div><div class='add'>+static bool check_for_nsfs_mounts(struct mount *subtree)</div><div class='add'>+{</div><div class='add'>+	for (struct mount *p = subtree; p; p = next_mnt(p, subtree))</div><div class='add'>+		if (mnt_ns_loop(p-&gt;mnt.mnt_root))</div><div class='add'>+			return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * clone_private_mount - create a private clone of a path</div><div class='ctx'>  * @path: path to clone</div><div class='hunk'>@@ -2100,6 +2360,8 @@ static bool has_locked_children(struct mount *mnt, struct dentry *dentry)</div><div class='ctx'>  * will not be attached anywhere in the namespace and will be private (i.e.</div><div class='ctx'>  * changes to the originating mount won't be propagated into this).</div><div class='ctx'>  *</div><div class='add'>+ * This assumes caller has called or done the equivalent of may_mount().</div><div class='add'>+ *</div><div class='ctx'>  * Release with mntput().</div><div class='ctx'>  */</div><div class='ctx'> struct vfsmount *clone_private_mount(const struct path *path)</div><div class='hunk'>@@ -2107,48 +2369,42 @@ struct vfsmount *clone_private_mount(const struct path *path)</div><div class='ctx'> 	struct mount *old_mnt = real_mount(path-&gt;mnt);</div><div class='ctx'> 	struct mount *new_mnt;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;namespace_sem);</div><div class='add'>+	guard(namespace_shared)();</div><div class='add'>+</div><div class='ctx'> 	if (IS_MNT_UNBINDABLE(old_mnt))</div><div class='del'>-		goto invalid;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	if (!check_mnt(old_mnt))</div><div class='del'>-		goto invalid;</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the source mount is acceptable.</div><div class='add'>+	 * Anything mounted in our mount namespace is allowed.</div><div class='add'>+	 * Otherwise, it must be the root of an anonymous mount</div><div class='add'>+	 * namespace, and we need to make sure no namespace</div><div class='add'>+	 * loops get created.</div><div class='add'>+	 */</div><div class='add'>+	if (!check_mnt(old_mnt)) {</div><div class='add'>+		if (!anon_ns_root(old_mnt))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	if (has_locked_children(old_mnt, path-&gt;dentry))</div><div class='del'>-		goto invalid;</div><div class='add'>+		if (!check_for_nsfs_mounts(old_mnt))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	new_mnt = clone_mnt(old_mnt, path-&gt;dentry, CL_PRIVATE);</div><div class='del'>-	up_read(&amp;namespace_sem);</div><div class='add'>+	if (!ns_capable(old_mnt-&gt;mnt_ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='add'>+	if (__has_locked_children(old_mnt, path-&gt;dentry))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	new_mnt = clone_mnt(old_mnt, path-&gt;dentry, CL_PRIVATE);</div><div class='ctx'> 	if (IS_ERR(new_mnt))</div><div class='del'>-		return ERR_CAST(new_mnt);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	/* Longterm mount to be removed by kern_unmount*() */</div><div class='ctx'> 	new_mnt-&gt;mnt_ns = MNT_NS_INTERNAL;</div><div class='del'>-</div><div class='ctx'> 	return &amp;new_mnt-&gt;mnt;</div><div class='del'>-</div><div class='del'>-invalid:</div><div class='del'>-	up_read(&amp;namespace_sem);</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(clone_private_mount);</div><div class='ctx'> </div><div class='del'>-int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,</div><div class='del'>-		   struct vfsmount *root)</div><div class='del'>-{</div><div class='del'>-	struct mount *mnt;</div><div class='del'>-	int res = f(root, arg);</div><div class='del'>-	if (res)</div><div class='del'>-		return res;</div><div class='del'>-	list_for_each_entry(mnt, &amp;real_mount(root)-&gt;mnt_list, mnt_list) {</div><div class='del'>-		res = f(&amp;mnt-&gt;mnt, arg);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void lock_mnt_tree(struct mount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *p;</div><div class='hunk'>@@ -2170,7 +2426,7 @@ static void lock_mnt_tree(struct mount *mnt)</div><div class='ctx'> 		if (flags &amp; MNT_NOEXEC)</div><div class='ctx'> 			flags |= MNT_LOCK_NOEXEC;</div><div class='ctx'> 		/* Don't allow unprivileged users to reveal what is under a mount */</div><div class='del'>-		if (list_empty(&amp;p-&gt;mnt_expire))</div><div class='add'>+		if (list_empty(&amp;p-&gt;mnt_expire) &amp;&amp; p != mnt)</div><div class='ctx'> 			flags |= MNT_LOCKED;</div><div class='ctx'> 		p-&gt;mnt.mnt_flags = flags;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2191,7 +2447,7 @@ static int invent_group_ids(struct mount *mnt, bool recurse)</div><div class='ctx'> 	struct mount *p;</div><div class='ctx'> </div><div class='ctx'> 	for (p = mnt; p; p = recurse ? next_mnt(p, mnt) : NULL) {</div><div class='del'>-		if (!p-&gt;mnt_group_id &amp;&amp; !IS_MNT_SHARED(p)) {</div><div class='add'>+		if (!p-&gt;mnt_group_id) {</div><div class='ctx'> 			int err = mnt_alloc_group_id(p);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				cleanup_group_ids(mnt, p);</div><div class='hunk'>@@ -2227,16 +2483,14 @@ int count_mounts(struct mnt_namespace *ns, struct mount *mnt)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum mnt_tree_flags_t {</div><div class='del'>-	MNT_TREE_MOVE = BIT(0),</div><div class='del'>-	MNT_TREE_BENEATH = BIT(1),</div><div class='add'>+	MNT_TREE_BENEATH = BIT(0),</div><div class='add'>+	MNT_TREE_PROPAGATION = BIT(1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attach_recursive_mnt - attach a source mount tree</div><div class='ctx'>  * @source_mnt: mount tree to be attached</div><div class='del'>- * @top_mnt:    mount that @source_mnt will be mounted on or mounted beneath</div><div class='del'>- * @dest_mp:    the mountpoint @source_mnt will be mounted at</div><div class='del'>- * @flags:      modify how @source_mnt is supposed to be attached</div><div class='add'>+ * @dest:	the context for mounting at the place where the tree should go</div><div class='ctx'>  *</div><div class='ctx'>  *  NOTE: in the table below explains the semantics when a source mount</div><div class='ctx'>  *  of a given type is attached to a destination mount of a given type.</div><div class='hunk'>@@ -2299,26 +2553,32 @@ enum mnt_tree_flags_t {</div><div class='ctx'>  *         Otherwise a negative error code is returned.</div><div class='ctx'>  */</div><div class='ctx'> static int attach_recursive_mnt(struct mount *source_mnt,</div><div class='del'>-				struct mount *top_mnt,</div><div class='del'>-				struct mountpoint *dest_mp,</div><div class='del'>-				enum mnt_tree_flags_t flags)</div><div class='add'>+				const struct pinned_mountpoint *dest)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_namespace *user_ns = current-&gt;nsproxy-&gt;mnt_ns-&gt;user_ns;</div><div class='add'>+	struct mount *dest_mnt = dest-&gt;parent;</div><div class='add'>+	struct mountpoint *dest_mp = dest-&gt;mp;</div><div class='ctx'> 	HLIST_HEAD(tree_list);</div><div class='del'>-	struct mnt_namespace *ns = top_mnt-&gt;mnt_ns;</div><div class='del'>-	struct mountpoint *smp;</div><div class='del'>-	struct mount *child, *dest_mnt, *p;</div><div class='add'>+	struct mnt_namespace *ns = dest_mnt-&gt;mnt_ns;</div><div class='add'>+	struct pinned_mountpoint root = {};</div><div class='add'>+	struct mountpoint *shorter = NULL;</div><div class='add'>+	struct mount *child, *p;</div><div class='add'>+	struct mount *top;</div><div class='ctx'> 	struct hlist_node *n;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	bool moving = flags &amp; MNT_TREE_MOVE, beneath = flags &amp; MNT_TREE_BENEATH;</div><div class='add'>+	bool moving = mnt_has_parent(source_mnt);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Preallocate a mountpoint in case the new mounts need to be</div><div class='ctx'> 	 * mounted beneath mounts on the same mountpoint.</div><div class='ctx'> 	 */</div><div class='del'>-	smp = get_mountpoint(source_mnt-&gt;mnt.mnt_root);</div><div class='del'>-	if (IS_ERR(smp))</div><div class='del'>-		return PTR_ERR(smp);</div><div class='add'>+	for (top = source_mnt; unlikely(top-&gt;overmount); top = top-&gt;overmount) {</div><div class='add'>+		if (!shorter &amp;&amp; is_mnt_ns_file(top-&gt;mnt.mnt_root))</div><div class='add'>+			shorter = top-&gt;mnt_mp;</div><div class='add'>+	}</div><div class='add'>+	err = get_mountpoint(top-&gt;mnt.mnt_root, &amp;root);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Is there space to add these mounts to the mount namespace? */</div><div class='ctx'> 	if (!moving) {</div><div class='hunk'>@@ -2327,11 +2587,6 @@ static int attach_recursive_mnt(struct mount *source_mnt,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (beneath)</div><div class='del'>-		dest_mnt = top_mnt-&gt;mnt_parent;</div><div class='del'>-	else</div><div class='del'>-		dest_mnt = top_mnt;</div><div class='del'>-</div><div class='ctx'> 	if (IS_MNT_SHARED(dest_mnt)) {</div><div class='ctx'> 		err = invent_group_ids(source_mnt, true);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -2348,41 +2603,49 @@ static int attach_recursive_mnt(struct mount *source_mnt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (moving) {</div><div class='del'>-		if (beneath)</div><div class='del'>-			dest_mp = smp;</div><div class='del'>-		unhash_mnt(source_mnt);</div><div class='del'>-		attach_mnt(source_mnt, top_mnt, dest_mp, beneath);</div><div class='del'>-		touch_mnt_namespace(source_mnt-&gt;mnt_ns);</div><div class='add'>+		umount_mnt(source_mnt);</div><div class='add'>+		mnt_notify_add(source_mnt);</div><div class='add'>+		/* if the mount is moved, it should no longer be expired</div><div class='add'>+		 * automatically */</div><div class='add'>+		list_del_init(&amp;source_mnt-&gt;mnt_expire);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (source_mnt-&gt;mnt_ns) {</div><div class='del'>-			LIST_HEAD(head);</div><div class='del'>-</div><div class='ctx'> 			/* move from anon - the caller will destroy */</div><div class='add'>+			emptied_ns = source_mnt-&gt;mnt_ns;</div><div class='ctx'> 			for (p = source_mnt; p; p = next_mnt(p, source_mnt))</div><div class='del'>-				move_from_ns(p, &amp;head);</div><div class='del'>-			list_del_init(&amp;head);</div><div class='add'>+				move_from_ns(p);</div><div class='ctx'> 		}</div><div class='del'>-		if (beneath)</div><div class='del'>-			mnt_set_mountpoint_beneath(source_mnt, top_mnt, smp);</div><div class='del'>-		else</div><div class='del'>-			mnt_set_mountpoint(dest_mnt, dest_mp, source_mnt);</div><div class='del'>-		commit_tree(source_mnt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mnt_set_mountpoint(dest_mnt, dest_mp, source_mnt);</div><div class='add'>+	/*</div><div class='add'>+	 * Now the original copy is in the same state as the secondaries -</div><div class='add'>+	 * its root attached to mountpoint, but not hashed and all mounts</div><div class='add'>+	 * in it are either in our namespace or in no namespace at all.</div><div class='add'>+	 * Add the original to the list of copies and deal with the</div><div class='add'>+	 * rest of work for all of them uniformly.</div><div class='add'>+	 */</div><div class='add'>+	hlist_add_head(&amp;source_mnt-&gt;mnt_hash, &amp;tree_list);</div><div class='add'>+</div><div class='ctx'> 	hlist_for_each_entry_safe(child, n, &amp;tree_list, mnt_hash) {</div><div class='ctx'> 		struct mount *q;</div><div class='ctx'> 		hlist_del_init(&amp;child-&gt;mnt_hash);</div><div class='del'>-		q = __lookup_mnt(&amp;child-&gt;mnt_parent-&gt;mnt,</div><div class='del'>-				 child-&gt;mnt_mountpoint);</div><div class='del'>-		if (q)</div><div class='del'>-			mnt_change_mountpoint(child, smp, q);</div><div class='ctx'> 		/* Notice when we are propagating across user namespaces */</div><div class='ctx'> 		if (child-&gt;mnt_parent-&gt;mnt_ns-&gt;user_ns != user_ns)</div><div class='ctx'> 			lock_mnt_tree(child);</div><div class='del'>-		child-&gt;mnt.mnt_flags &amp;= ~MNT_LOCKED;</div><div class='add'>+		q = __lookup_mnt(&amp;child-&gt;mnt_parent-&gt;mnt,</div><div class='add'>+				 child-&gt;mnt_mountpoint);</div><div class='ctx'> 		commit_tree(child);</div><div class='add'>+		if (q) {</div><div class='add'>+			struct mount *r = topmost_overmount(child);</div><div class='add'>+			struct mountpoint *mp = root.mp;</div><div class='add'>+</div><div class='add'>+			if (unlikely(shorter) &amp;&amp; child != source_mnt)</div><div class='add'>+				mp = shorter;</div><div class='add'>+			mnt_change_mountpoint(r, mp, q);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	put_mountpoint(smp);</div><div class='add'>+	unpin_mountpoint(&amp;root);</div><div class='ctx'> 	unlock_mount_hash();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2399,131 +2662,171 @@ static int attach_recursive_mnt(struct mount *source_mnt,</div><div class='ctx'> 	ns-&gt;pending_mounts = 0;</div><div class='ctx'> </div><div class='ctx'> 	read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-	put_mountpoint(smp);</div><div class='add'>+	unpin_mountpoint(&amp;root);</div><div class='ctx'> 	read_sequnlock_excl(&amp;mount_lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct mount *where_to_mount(const struct path *path,</div><div class='add'>+					   struct dentry **dentry,</div><div class='add'>+					   bool beneath)</div><div class='add'>+{</div><div class='add'>+	struct mount *m;</div><div class='add'>+</div><div class='add'>+	if (unlikely(beneath)) {</div><div class='add'>+		m = topmost_overmount(real_mount(path-&gt;mnt));</div><div class='add'>+		*dentry = m-&gt;mnt_mountpoint;</div><div class='add'>+		return m-&gt;mnt_parent;</div><div class='add'>+	}</div><div class='add'>+	m = __lookup_mnt(path-&gt;mnt, path-&gt;dentry);</div><div class='add'>+	if (unlikely(m)) {</div><div class='add'>+		m = topmost_overmount(m);</div><div class='add'>+		*dentry = m-&gt;mnt.mnt_root;</div><div class='add'>+		return m;</div><div class='add'>+	}</div><div class='add'>+	*dentry = path-&gt;dentry;</div><div class='add'>+	return real_mount(path-&gt;mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * do_lock_mount - lock mount and mountpoint</div><div class='del'>- * @path:    target path</div><div class='del'>- * @beneath: whether the intention is to mount beneath @path</div><div class='del'>- *</div><div class='del'>- * Follow the mount stack on @path until the top mount @mnt is found. If</div><div class='del'>- * the initial @path-&gt;{mnt,dentry} is a mountpoint lookup the first</div><div class='del'>- * mount stacked on top of it. Then simply follow @{mnt,mnt-&gt;mnt_root}</div><div class='del'>- * until nothing is stacked on top of it anymore.</div><div class='add'>+ * do_lock_mount - acquire environment for mounting</div><div class='add'>+ * @path:	target path</div><div class='add'>+ * @res:	context to set up</div><div class='add'>+ * @beneath:	whether the intention is to mount beneath @path</div><div class='ctx'>  *</div><div class='del'>- * Acquire the inode_lock() on the top mount's -&gt;mnt_root to protect</div><div class='del'>- * against concurrent removal of the new mountpoint from another mount</div><div class='del'>- * namespace.</div><div class='add'>+ * To mount something at given location, we need</div><div class='add'>+ *	namespace_sem locked exclusive</div><div class='add'>+ *	inode of dentry we are mounting on locked exclusive</div><div class='add'>+ *	struct mountpoint for that dentry</div><div class='add'>+ *	struct mount we are mounting on</div><div class='ctx'>  *</div><div class='del'>- * If @beneath is requested, acquire inode_lock() on @mnt's mountpoint</div><div class='del'>- * @mp on @mnt-&gt;mnt_parent must be acquired. This protects against a</div><div class='del'>- * concurrent unlink of @mp-&gt;mnt_dentry from another mount namespace</div><div class='del'>- * where @mnt doesn't have a child mount mounted @mp. A concurrent</div><div class='del'>- * removal of @mnt-&gt;mnt_root doesn't matter as nothing will be mounted</div><div class='del'>- * on top of it for @beneath.</div><div class='add'>+ * Results are stored in caller-supplied context (pinned_mountpoint);</div><div class='add'>+ * on success we have res-&gt;parent and res-&gt;mp pointing to parent and</div><div class='add'>+ * mountpoint respectively and res-&gt;node inserted into the -&gt;m_list</div><div class='add'>+ * of the mountpoint, making sure the mountpoint won't disappear.</div><div class='add'>+ * On failure we have res-&gt;parent set to ERR_PTR(-E...), res-&gt;mp</div><div class='add'>+ * left NULL, res-&gt;node - empty.</div><div class='add'>+ * In case of success do_lock_mount returns with locks acquired (in</div><div class='add'>+ * proper order - inode lock nests outside of namespace_sem).</div><div class='ctx'>  *</div><div class='del'>- * In addition, @beneath needs to make sure that @mnt hasn't been</div><div class='del'>- * unmounted or moved from its current mountpoint in between dropping</div><div class='del'>- * @mount_lock and acquiring @namespace_sem. For the !@beneath case @mnt</div><div class='del'>- * being unmounted would be detected later by e.g., calling</div><div class='del'>- * check_mnt(mnt) in the function it's called from. For the @beneath</div><div class='del'>- * case however, it's useful to detect it directly in do_lock_mount().</div><div class='del'>- * If @mnt hasn't been unmounted then @mnt-&gt;mnt_mountpoint still points</div><div class='del'>- * to @mnt-&gt;mnt_mp-&gt;m_dentry. But if @mnt has been unmounted it will</div><div class='del'>- * point to @mnt-&gt;mnt_root and @mnt-&gt;mnt_mp will be NULL.</div><div class='add'>+ * Request to mount on overmounted location is treated as "mount on</div><div class='add'>+ * top of whatever's overmounting it"; request to mount beneath</div><div class='add'>+ * a location - "mount immediately beneath the topmost mount at that</div><div class='add'>+ * place".</div><div class='ctx'>  *</div><div class='del'>- * Return: Either the target mountpoint on the top mount or the top</div><div class='del'>- *         mount's mountpoint.</div><div class='add'>+ * In all cases the location must not have been unmounted and the</div><div class='add'>+ * chosen mountpoint must be allowed to be mounted on.  For "beneath"</div><div class='add'>+ * case we also require the location to be at the root of a mount</div><div class='add'>+ * that has a parent (i.e. is not a root of some namespace).</div><div class='ctx'>  */</div><div class='del'>-static struct mountpoint *do_lock_mount(struct path *path, bool beneath)</div><div class='add'>+static void do_lock_mount(const struct path *path,</div><div class='add'>+			  struct pinned_mountpoint *res,</div><div class='add'>+			  bool beneath)</div><div class='ctx'> {</div><div class='del'>-	struct vfsmount *mnt = path-&gt;mnt;</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	struct mountpoint *mp = ERR_PTR(-ENOENT);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='del'>-		struct mount *m;</div><div class='add'>+	if (unlikely(beneath) &amp;&amp; !path_mounted(path)) {</div><div class='add'>+		res-&gt;parent = ERR_PTR(-EINVAL);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (beneath) {</div><div class='del'>-			m = real_mount(mnt);</div><div class='del'>-			read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-			dentry = dget(m-&gt;mnt_mountpoint);</div><div class='del'>-			read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-		} else {</div><div class='del'>-			dentry = path-&gt;dentry;</div><div class='add'>+	do {</div><div class='add'>+		struct dentry *dentry, *d;</div><div class='add'>+		struct mount *m, *n;</div><div class='add'>+</div><div class='add'>+		scoped_guard(mount_locked_reader) {</div><div class='add'>+			m = where_to_mount(path, &amp;dentry, beneath);</div><div class='add'>+			if (&amp;m-&gt;mnt != path-&gt;mnt) {</div><div class='add'>+				mntget(&amp;m-&gt;mnt);</div><div class='add'>+				dget(dentry);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		inode_lock(dentry-&gt;d_inode);</div><div class='del'>-		if (unlikely(cant_mount(dentry))) {</div><div class='del'>-			inode_unlock(dentry-&gt;d_inode);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		namespace_lock();</div><div class='ctx'> </div><div class='del'>-		if (beneath &amp;&amp; (!is_mounted(mnt) || m-&gt;mnt_mountpoint != dentry)) {</div><div class='add'>+		// check if the chain of mounts (if any) has changed.</div><div class='add'>+		scoped_guard(mount_locked_reader)</div><div class='add'>+			n = where_to_mount(path, &amp;d, beneath);</div><div class='add'>+</div><div class='add'>+		if (unlikely(n != m || dentry != d))</div><div class='add'>+			err = -EAGAIN;		// something moved, retry</div><div class='add'>+		else if (unlikely(cant_mount(dentry) || !is_mounted(path-&gt;mnt)))</div><div class='add'>+			err = -ENOENT;		// not to be mounted on</div><div class='add'>+		else if (beneath &amp;&amp; &amp;m-&gt;mnt == path-&gt;mnt &amp;&amp; !m-&gt;overmount)</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			err = get_mountpoint(dentry, res);</div><div class='add'>+</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			res-&gt;parent = ERR_PTR(err);</div><div class='ctx'> 			namespace_unlock();</div><div class='ctx'> 			inode_unlock(dentry-&gt;d_inode);</div><div class='del'>-			goto out;</div><div class='add'>+		} else {</div><div class='add'>+			res-&gt;parent = m;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		mnt = lookup_mnt(path);</div><div class='del'>-		if (likely(!mnt))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		namespace_unlock();</div><div class='del'>-		inode_unlock(dentry-&gt;d_inode);</div><div class='del'>-		if (beneath)</div><div class='add'>+		/*</div><div class='add'>+		 * Drop the temporary references.  This is subtle - on success</div><div class='add'>+		 * we are doing that under namespace_sem, which would normally</div><div class='add'>+		 * be forbidden.  However, in that case we are guaranteed that</div><div class='add'>+		 * refcounts won't reach zero, since we know that path-&gt;mnt</div><div class='add'>+		 * is mounted and thus all mounts reachable from it are pinned</div><div class='add'>+		 * and stable, along with their mountpoints and roots.</div><div class='add'>+		 */</div><div class='add'>+		if (&amp;m-&gt;mnt != path-&gt;mnt) {</div><div class='ctx'> 			dput(dentry);</div><div class='del'>-		path_put(path);</div><div class='del'>-		path-&gt;mnt = mnt;</div><div class='del'>-		path-&gt;dentry = dget(mnt-&gt;mnt_root);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = get_mountpoint(dentry);</div><div class='del'>-	if (IS_ERR(mp)) {</div><div class='del'>-		namespace_unlock();</div><div class='del'>-		inode_unlock(dentry-&gt;d_inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (beneath)</div><div class='del'>-		dput(dentry);</div><div class='del'>-</div><div class='del'>-	return mp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct mountpoint *lock_mount(struct path *path)</div><div class='del'>-{</div><div class='del'>-	return do_lock_mount(path, false);</div><div class='add'>+			mntput(&amp;m-&gt;mnt);</div><div class='add'>+		}</div><div class='add'>+	} while (err == -EAGAIN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void unlock_mount(struct mountpoint *where)</div><div class='add'>+static void __unlock_mount(struct pinned_mountpoint *m)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = where-&gt;m_dentry;</div><div class='del'>-</div><div class='add'>+	inode_unlock(m-&gt;mp-&gt;m_dentry-&gt;d_inode);</div><div class='ctx'> 	read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-	put_mountpoint(where);</div><div class='add'>+	unpin_mountpoint(m);</div><div class='ctx'> 	read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-</div><div class='ctx'> 	namespace_unlock();</div><div class='del'>-	inode_unlock(dentry-&gt;d_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int graft_tree(struct mount *mnt, struct mount *p, struct mountpoint *mp)</div><div class='add'>+static inline void unlock_mount(struct pinned_mountpoint *m)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ERR(m-&gt;parent))</div><div class='add'>+		__unlock_mount(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define LOCK_MOUNT_MAYBE_BENEATH(mp, path, beneath) \</div><div class='add'>+	struct pinned_mountpoint mp __cleanup(unlock_mount) = {}; \</div><div class='add'>+	do_lock_mount((path), &amp;mp, (beneath))</div><div class='add'>+#define LOCK_MOUNT(mp, path) LOCK_MOUNT_MAYBE_BENEATH(mp, (path), false)</div><div class='add'>+#define LOCK_MOUNT_EXACT(mp, path) \</div><div class='add'>+	struct pinned_mountpoint mp __cleanup(unlock_mount) = {}; \</div><div class='add'>+	lock_mount_exact((path), &amp;mp)</div><div class='add'>+</div><div class='add'>+static int graft_tree(struct mount *mnt, const struct pinned_mountpoint *mp)</div><div class='ctx'> {</div><div class='ctx'> 	if (mnt-&gt;mnt.mnt_sb-&gt;s_flags &amp; SB_NOUSER)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (d_is_dir(mp-&gt;m_dentry) !=</div><div class='add'>+	if (d_is_dir(mp-&gt;mp-&gt;m_dentry) !=</div><div class='ctx'> 	      d_is_dir(mnt-&gt;mnt.mnt_root))</div><div class='ctx'> 		return -ENOTDIR;</div><div class='ctx'> </div><div class='del'>-	return attach_recursive_mnt(mnt, p, mp, 0);</div><div class='add'>+	return attach_recursive_mnt(mnt, mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int may_change_propagation(const struct mount *m)</div><div class='add'>+{</div><div class='add'>+        struct mnt_namespace *ns = m-&gt;mnt_ns;</div><div class='add'>+</div><div class='add'>+	 // it must be mounted in some namespace</div><div class='add'>+	 if (IS_ERR_OR_NULL(ns))         // is_mounted()</div><div class='add'>+		 return -EINVAL;</div><div class='add'>+	 // and the caller must be admin in userns of that namespace</div><div class='add'>+	 if (!ns_capable(ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='add'>+		 return -EPERM;</div><div class='add'>+	 return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2546,13 +2849,13 @@ static int flags_to_propagation_type(int ms_flags)</div><div class='ctx'> /*</div><div class='ctx'>  * recursively change the type of the mountpoint.</div><div class='ctx'>  */</div><div class='del'>-static int do_change_type(struct path *path, int ms_flags)</div><div class='add'>+static int do_change_type(const struct path *path, int ms_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *m;</div><div class='ctx'> 	struct mount *mnt = real_mount(path-&gt;mnt);</div><div class='ctx'> 	int recurse = ms_flags &amp; MS_REC;</div><div class='ctx'> 	int type;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!path_mounted(path))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2561,56 +2864,116 @@ static int do_change_type(struct path *path, int ms_flags)</div><div class='ctx'> 	if (!type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	namespace_lock();</div><div class='add'>+	guard(namespace_excl)();</div><div class='add'>+</div><div class='add'>+	err = may_change_propagation(mnt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	if (type == MS_SHARED) {</div><div class='ctx'> 		err = invent_group_ids(mnt, recurse);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lock_mount_hash();</div><div class='ctx'> 	for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))</div><div class='ctx'> 		change_mnt_propagation(m, type);</div><div class='del'>-	unlock_mount_hash();</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	namespace_unlock();</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* may_copy_tree() - check if a mount tree can be copied</div><div class='add'>+ * @path: path to the mount tree to be copied</div><div class='add'>+ *</div><div class='add'>+ * This helper checks if the caller may copy the mount tree starting</div><div class='add'>+ * from @path-&gt;mnt. The caller may copy the mount tree under the</div><div class='add'>+ * following circumstances:</div><div class='add'>+ *</div><div class='add'>+ * (1) The caller is located in the mount namespace of the mount tree.</div><div class='add'>+ *     This also implies that the mount does not belong to an anonymous</div><div class='add'>+ *     mount namespace.</div><div class='add'>+ * (2) The caller tries to copy an nfs mount referring to a mount</div><div class='add'>+ *     namespace, i.e., the caller is trying to copy a mount namespace</div><div class='add'>+ *     entry from nsfs.</div><div class='add'>+ * (3) The caller tries to copy a pidfs mount referring to a pidfd.</div><div class='add'>+ * (4) The caller is trying to copy a mount tree that belongs to an</div><div class='add'>+ *     anonymous mount namespace.</div><div class='add'>+ *</div><div class='add'>+ *     For that to be safe, this helper enforces that the origin mount</div><div class='add'>+ *     namespace the anonymous mount namespace was created from is the</div><div class='add'>+ *     same as the caller's mount namespace by comparing the sequence</div><div class='add'>+ *     numbers.</div><div class='add'>+ *</div><div class='add'>+ *     This is not strictly necessary. The current semantics of the new</div><div class='add'>+ *     mount api enforce that the caller must be located in the same</div><div class='add'>+ *     mount namespace as the mount tree it interacts with. Using the</div><div class='add'>+ *     origin sequence number preserves these semantics even for</div><div class='add'>+ *     anonymous mount namespaces. However, one could envision extending</div><div class='add'>+ *     the api to directly operate across mount namespace if needed.</div><div class='add'>+ *</div><div class='add'>+ *     The ownership of a non-anonymous mount namespace such as the</div><div class='add'>+ *     caller's cannot change.</div><div class='add'>+ *     =&gt; We know that the caller's mount namespace is stable.</div><div class='add'>+ *</div><div class='add'>+ *     If the origin sequence number of the anonymous mount namespace is</div><div class='add'>+ *     the same as the sequence number of the caller's mount namespace.</div><div class='add'>+ *     =&gt; The owning namespaces are the same.</div><div class='add'>+ *</div><div class='add'>+ *     ==&gt; The earlier capability check on the owning namespace of the</div><div class='add'>+ *         caller's mount namespace ensures that the caller has the</div><div class='add'>+ *         ability to copy the mount tree.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the mount tree can be copied, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool may_copy_tree(const struct path *path)</div><div class='add'>+{</div><div class='add'>+	struct mount *mnt = real_mount(path-&gt;mnt);</div><div class='add'>+	const struct dentry_operations *d_op;</div><div class='add'>+</div><div class='add'>+	if (check_mnt(mnt))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	d_op = path-&gt;dentry-&gt;d_op;</div><div class='add'>+	if (d_op == &amp;ns_dentry_operations)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (d_op == &amp;pidfs_dentry_operations)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!is_mounted(path-&gt;mnt))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return check_anonymous_mnt(mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mount *__do_loopback(struct path *old_path, int recurse)</div><div class='add'>+</div><div class='add'>+static struct mount *__do_loopback(const struct path *old_path, int recurse)</div><div class='ctx'> {</div><div class='del'>-	struct mount *mnt = ERR_PTR(-EINVAL), *old = real_mount(old_path-&gt;mnt);</div><div class='add'>+	struct mount *old = real_mount(old_path-&gt;mnt);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_MNT_UNBINDABLE(old))</div><div class='del'>-		return mnt;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	if (!check_mnt(old) &amp;&amp; old_path-&gt;dentry-&gt;d_op != &amp;ns_dentry_operations)</div><div class='del'>-		return mnt;</div><div class='add'>+	if (!may_copy_tree(old_path))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	if (!recurse &amp;&amp; has_locked_children(old, old_path-&gt;dentry))</div><div class='del'>-		return mnt;</div><div class='add'>+	if (!recurse &amp;&amp; __has_locked_children(old, old_path-&gt;dentry))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	if (recurse)</div><div class='del'>-		mnt = copy_tree(old, old_path-&gt;dentry, CL_COPY_MNT_NS_FILE);</div><div class='add'>+		return copy_tree(old, old_path-&gt;dentry, CL_COPY_MNT_NS_FILE);</div><div class='ctx'> 	else</div><div class='del'>-		mnt = clone_mnt(old, old_path-&gt;dentry, 0);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(mnt))</div><div class='del'>-		mnt-&gt;mnt.mnt_flags &amp;= ~MNT_LOCKED;</div><div class='del'>-</div><div class='del'>-	return mnt;</div><div class='add'>+		return clone_mnt(old, old_path-&gt;dentry, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * do loopback mount.</div><div class='ctx'>  */</div><div class='del'>-static int do_loopback(struct path *path, const char *old_name,</div><div class='del'>-				int recurse)</div><div class='add'>+static int do_loopback(const struct path *path, const char *old_name,</div><div class='add'>+		       int recurse)</div><div class='ctx'> {</div><div class='del'>-	struct path old_path;</div><div class='del'>-	struct mount *mnt = NULL, *parent;</div><div class='del'>-	struct mountpoint *mp;</div><div class='add'>+	struct path old_path __free(path_put) = {};</div><div class='add'>+	struct mount *mnt = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	if (!old_name || !*old_name)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2618,69 +2981,78 @@ static int do_loopback(struct path *path, const char *old_name,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (mnt_ns_loop(old_path.dentry))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mp = lock_mount(path);</div><div class='del'>-	if (IS_ERR(mp)) {</div><div class='del'>-		err = PTR_ERR(mp);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	LOCK_MOUNT(mp, path);</div><div class='add'>+	if (IS_ERR(mp.parent))</div><div class='add'>+		return PTR_ERR(mp.parent);</div><div class='ctx'> </div><div class='del'>-	parent = real_mount(path-&gt;mnt);</div><div class='del'>-	if (!check_mnt(parent))</div><div class='del'>-		goto out2;</div><div class='add'>+	if (!check_mnt(mp.parent))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mnt = __do_loopback(&amp;old_path, recurse);</div><div class='del'>-	if (IS_ERR(mnt)) {</div><div class='del'>-		err = PTR_ERR(mnt);</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(mnt))</div><div class='add'>+		return PTR_ERR(mnt);</div><div class='ctx'> </div><div class='del'>-	err = graft_tree(mnt, parent, mp);</div><div class='add'>+	err = graft_tree(mnt, &amp;mp);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		lock_mount_hash();</div><div class='ctx'> 		umount_tree(mnt, UMOUNT_SYNC);</div><div class='ctx'> 		unlock_mount_hash();</div><div class='ctx'> 	}</div><div class='del'>-out2:</div><div class='del'>-	unlock_mount(mp);</div><div class='del'>-out:</div><div class='del'>-	path_put(&amp;old_path);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file *open_detached_copy(struct path *path, bool recursive)</div><div class='add'>+static struct mnt_namespace *get_detached_copy(const struct path *path, bool recursive)</div><div class='ctx'> {</div><div class='del'>-	struct user_namespace *user_ns = current-&gt;nsproxy-&gt;mnt_ns-&gt;user_ns;</div><div class='del'>-	struct mnt_namespace *ns = alloc_mnt_ns(user_ns, true);</div><div class='add'>+	struct mnt_namespace *ns, *mnt_ns = current-&gt;nsproxy-&gt;mnt_ns, *src_mnt_ns;</div><div class='add'>+	struct user_namespace *user_ns = mnt_ns-&gt;user_ns;</div><div class='ctx'> 	struct mount *mnt, *p;</div><div class='del'>-	struct file *file;</div><div class='ctx'> </div><div class='add'>+	ns = alloc_mnt_ns(user_ns, true);</div><div class='ctx'> 	if (IS_ERR(ns))</div><div class='del'>-		return ERR_CAST(ns);</div><div class='add'>+		return ns;</div><div class='add'>+</div><div class='add'>+	guard(namespace_excl)();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Record the sequence number of the source mount namespace.</div><div class='add'>+	 * This needs to hold namespace_sem to ensure that the mount</div><div class='add'>+	 * doesn't get attached.</div><div class='add'>+	 */</div><div class='add'>+	if (is_mounted(path-&gt;mnt)) {</div><div class='add'>+		src_mnt_ns = real_mount(path-&gt;mnt)-&gt;mnt_ns;</div><div class='add'>+		if (is_anon_ns(src_mnt_ns))</div><div class='add'>+			ns-&gt;seq_origin = src_mnt_ns-&gt;seq_origin;</div><div class='add'>+		else</div><div class='add'>+			ns-&gt;seq_origin = src_mnt_ns-&gt;ns.ns_id;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	namespace_lock();</div><div class='ctx'> 	mnt = __do_loopback(path, recursive);</div><div class='ctx'> 	if (IS_ERR(mnt)) {</div><div class='del'>-		namespace_unlock();</div><div class='del'>-		free_mnt_ns(ns);</div><div class='add'>+		emptied_ns = ns;</div><div class='ctx'> 		return ERR_CAST(mnt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lock_mount_hash();</div><div class='ctx'> 	for (p = mnt; p; p = next_mnt(p, mnt)) {</div><div class='ctx'> 		mnt_add_to_ns(ns, p);</div><div class='ctx'> 		ns-&gt;nr_mounts++;</div><div class='ctx'> 	}</div><div class='ctx'> 	ns-&gt;root = mnt;</div><div class='del'>-	mntget(&amp;mnt-&gt;mnt);</div><div class='del'>-	unlock_mount_hash();</div><div class='del'>-	namespace_unlock();</div><div class='add'>+	return ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file *open_detached_copy(struct path *path, bool recursive)</div><div class='add'>+{</div><div class='add'>+	struct mnt_namespace *ns = get_detached_copy(path, recursive);</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(ns))</div><div class='add'>+		return ERR_CAST(ns);</div><div class='ctx'> </div><div class='ctx'> 	mntput(path-&gt;mnt);</div><div class='del'>-	path-&gt;mnt = &amp;mnt-&gt;mnt;</div><div class='add'>+	path-&gt;mnt = mntget(&amp;ns-&gt;root-&gt;mnt);</div><div class='ctx'> 	file = dentry_open(path, O_PATH, current_cred());</div><div class='ctx'> 	if (IS_ERR(file))</div><div class='ctx'> 		dissolve_on_fput(path-&gt;mnt);</div><div class='hunk'>@@ -2689,24 +3061,22 @@ static struct file *open_detached_copy(struct path *path, bool recursive)</div><div class='ctx'> 	return file;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SYSCALL_DEFINE3(open_tree, int, dfd, const char __user *, filename, unsigned, flags)</div><div class='add'>+static struct file *vfs_open_tree(int dfd, const char __user *filename, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct file *file;</div><div class='del'>-	struct path path;</div><div class='add'>+	int ret;</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='ctx'> 	int lookup_flags = LOOKUP_AUTOMOUNT | LOOKUP_FOLLOW;</div><div class='ctx'> 	bool detached = flags &amp; OPEN_TREE_CLONE;</div><div class='del'>-	int error;</div><div class='del'>-	int fd;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(OPEN_TREE_CLOEXEC != O_CLOEXEC);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; ~(AT_EMPTY_PATH | AT_NO_AUTOMOUNT | AT_RECURSIVE |</div><div class='ctx'> 		      AT_SYMLINK_NOFOLLOW | OPEN_TREE_CLONE |</div><div class='ctx'> 		      OPEN_TREE_CLOEXEC))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	if ((flags &amp; (AT_RECURSIVE | OPEN_TREE_CLONE)) == AT_RECURSIVE)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; AT_NO_AUTOMOUNT)</div><div class='ctx'> 		lookup_flags &amp;= ~LOOKUP_AUTOMOUNT;</div><div class='hunk'>@@ -2716,28 +3086,21 @@ SYSCALL_DEFINE3(open_tree, int, dfd, const char __user *, filename, unsigned, fl</div><div class='ctx'> 		lookup_flags |= LOOKUP_EMPTY;</div><div class='ctx'> </div><div class='ctx'> 	if (detached &amp;&amp; !may_mount())</div><div class='del'>-		return -EPERM;</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='ctx'> </div><div class='del'>-	fd = get_unused_fd_flags(flags &amp; O_CLOEXEC);</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		return fd;</div><div class='add'>+	ret = user_path_at(dfd, filename, lookup_flags, &amp;path);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	error = user_path_at(dfd, filename, lookup_flags, &amp;path);</div><div class='del'>-	if (unlikely(error)) {</div><div class='del'>-		file = ERR_PTR(error);</div><div class='del'>-	} else {</div><div class='del'>-		if (detached)</div><div class='del'>-			file = open_detached_copy(&amp;path, flags &amp; AT_RECURSIVE);</div><div class='del'>-		else</div><div class='del'>-			file = dentry_open(&amp;path, O_PATH, current_cred());</div><div class='del'>-		path_put(&amp;path);</div><div class='del'>-	}</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		put_unused_fd(fd);</div><div class='del'>-		return PTR_ERR(file);</div><div class='del'>-	}</div><div class='del'>-	fd_install(fd, file);</div><div class='del'>-	return fd;</div><div class='add'>+	if (detached)</div><div class='add'>+		return open_detached_copy(&amp;path, flags &amp; AT_RECURSIVE);</div><div class='add'>+</div><div class='add'>+	return dentry_open(&amp;path, O_PATH, current_cred());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SYSCALL_DEFINE3(open_tree, int, dfd, const char __user *, filename, unsigned, flags)</div><div class='add'>+{</div><div class='add'>+	return FD_ADD(flags, vfs_open_tree(dfd, filename, flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2794,15 +3157,23 @@ static void set_mount_attributes(struct mount *mnt, unsigned int mnt_flags)</div><div class='ctx'> 	touch_mnt_namespace(mnt-&gt;mnt_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mnt_warn_timestamp_expiry(struct path *mountpoint, struct vfsmount *mnt)</div><div class='add'>+static void mnt_warn_timestamp_expiry(const struct path *mountpoint,</div><div class='add'>+				      struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = mnt-&gt;mnt_sb;</div><div class='ctx'> </div><div class='ctx'> 	if (!__mnt_is_readonly(mnt) &amp;&amp;</div><div class='ctx'> 	   (!(sb-&gt;s_iflags &amp; SB_I_TS_EXPIRY_WARNED)) &amp;&amp;</div><div class='ctx'> 	   (ktime_get_real_seconds() + TIME_UPTIME_SEC_MAX &gt; sb-&gt;s_time_max)) {</div><div class='del'>-		char *buf = (char *)__get_free_page(GFP_KERNEL);</div><div class='del'>-		char *mntpath = buf ? d_path(mountpoint, buf, PAGE_SIZE) : ERR_PTR(-ENOMEM);</div><div class='add'>+		char *buf, *mntpath;</div><div class='add'>+</div><div class='add'>+		buf = (char *)__get_free_page(GFP_KERNEL);</div><div class='add'>+		if (buf)</div><div class='add'>+			mntpath = d_path(mountpoint, buf, PAGE_SIZE);</div><div class='add'>+		else</div><div class='add'>+			mntpath = ERR_PTR(-ENOMEM);</div><div class='add'>+		if (IS_ERR(mntpath))</div><div class='add'>+			mntpath = "(unknown)";</div><div class='ctx'> </div><div class='ctx'> 		pr_warn("%s filesystem being %s at %s supports timestamps until %ptTd (0x%llx)\n",</div><div class='ctx'> 			sb-&gt;s_type-&gt;name,</div><div class='hunk'>@@ -2810,8 +3181,9 @@ static void mnt_warn_timestamp_expiry(struct path *mountpoint, struct vfsmount *</div><div class='ctx'> 			mntpath, &amp;sb-&gt;s_time_max,</div><div class='ctx'> 			(unsigned long long)sb-&gt;s_time_max);</div><div class='ctx'> </div><div class='del'>-		free_page((unsigned long)buf);</div><div class='ctx'> 		sb-&gt;s_iflags |= SB_I_TS_EXPIRY_WARNED;</div><div class='add'>+		if (buf)</div><div class='add'>+			free_page((unsigned long)buf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2820,7 +3192,7 @@ static void mnt_warn_timestamp_expiry(struct path *mountpoint, struct vfsmount *</div><div class='ctx'>  * superblock it refers to.  This is triggered by specifying MS_REMOUNT|MS_BIND</div><div class='ctx'>  * to mount(2).</div><div class='ctx'>  */</div><div class='del'>-static int do_reconfigure_mnt(struct path *path, unsigned int mnt_flags)</div><div class='add'>+static int do_reconfigure_mnt(const struct path *path, unsigned int mnt_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = path-&gt;mnt-&gt;mnt_sb;</div><div class='ctx'> 	struct mount *mnt = real_mount(path-&gt;mnt);</div><div class='hunk'>@@ -2857,7 +3229,7 @@ static int do_reconfigure_mnt(struct path *path, unsigned int mnt_flags)</div><div class='ctx'>  * If you've mounted a non-root directory somewhere and want to do remount</div><div class='ctx'>  * on it - tough luck.</div><div class='ctx'>  */</div><div class='del'>-static int do_remount(struct path *path, int ms_flags, int sb_flags,</div><div class='add'>+static int do_remount(const struct path *path, int sb_flags,</div><div class='ctx'> 		      int mnt_flags, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2915,98 +3287,58 @@ static inline int tree_contains_unbindable(struct mount *mnt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check that there aren't references to earlier/same mount namespaces in the</div><div class='del'>- * specified subtree.  Such references can act as pins for mount namespaces</div><div class='del'>- * that aren't checked by the mount-cycle checking code, thereby allowing</div><div class='del'>- * cycles to be made.</div><div class='del'>- */</div><div class='del'>-static bool check_for_nsfs_mounts(struct mount *subtree)</div><div class='add'>+static int do_set_group(const struct path *from_path, const struct path *to_path)</div><div class='ctx'> {</div><div class='del'>-	struct mount *p;</div><div class='del'>-	bool ret = false;</div><div class='del'>-</div><div class='del'>-	lock_mount_hash();</div><div class='del'>-	for (p = subtree; p; p = next_mnt(p, subtree))</div><div class='del'>-		if (mnt_ns_loop(p-&gt;mnt.mnt_root))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-	ret = true;</div><div class='del'>-out:</div><div class='del'>-	unlock_mount_hash();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_set_group(struct path *from_path, struct path *to_path)</div><div class='del'>-{</div><div class='del'>-	struct mount *from, *to;</div><div class='add'>+	struct mount *from = real_mount(from_path-&gt;mnt);</div><div class='add'>+	struct mount *to = real_mount(to_path-&gt;mnt);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	from = real_mount(from_path-&gt;mnt);</div><div class='del'>-	to = real_mount(to_path-&gt;mnt);</div><div class='del'>-</div><div class='del'>-	namespace_lock();</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	/* To and From must be mounted */</div><div class='del'>-	if (!is_mounted(&amp;from-&gt;mnt))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!is_mounted(&amp;to-&gt;mnt))</div><div class='del'>-		goto out;</div><div class='add'>+	guard(namespace_excl)();</div><div class='ctx'> </div><div class='del'>-	err = -EPERM;</div><div class='del'>-	/* We should be allowed to modify mount namespaces of both mounts */</div><div class='del'>-	if (!ns_capable(from-&gt;mnt_ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!ns_capable(to-&gt;mnt_ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='del'>-		goto out;</div><div class='add'>+	err = may_change_propagation(from);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = may_change_propagation(to);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	/* To and From paths should be mount roots */</div><div class='ctx'> 	if (!path_mounted(from_path))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (!path_mounted(to_path))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Setting sharing groups is only allowed across same superblock */</div><div class='ctx'> 	if (from-&gt;mnt.mnt_sb != to-&gt;mnt.mnt_sb)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* From mount root should be wider than To mount root */</div><div class='ctx'> 	if (!is_subdir(to-&gt;mnt.mnt_root, from-&gt;mnt.mnt_root))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* From mount should not have locked children in place of To's root */</div><div class='del'>-	if (has_locked_children(from, to-&gt;mnt.mnt_root))</div><div class='del'>-		goto out;</div><div class='add'>+	if (__has_locked_children(from, to-&gt;mnt.mnt_root))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Setting sharing groups is only allowed on private mounts */</div><div class='ctx'> 	if (IS_MNT_SHARED(to) || IS_MNT_SLAVE(to))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* From should not be private */</div><div class='ctx'> 	if (!IS_MNT_SHARED(from) &amp;&amp; !IS_MNT_SLAVE(from))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_MNT_SLAVE(from)) {</div><div class='del'>-		struct mount *m = from-&gt;mnt_master;</div><div class='del'>-</div><div class='del'>-		list_add(&amp;to-&gt;mnt_slave, &amp;m-&gt;mnt_slave_list);</div><div class='del'>-		to-&gt;mnt_master = m;</div><div class='add'>+		hlist_add_behind(&amp;to-&gt;mnt_slave, &amp;from-&gt;mnt_slave);</div><div class='add'>+		to-&gt;mnt_master = from-&gt;mnt_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_MNT_SHARED(from)) {</div><div class='ctx'> 		to-&gt;mnt_group_id = from-&gt;mnt_group_id;</div><div class='ctx'> 		list_add(&amp;to-&gt;mnt_share, &amp;from-&gt;mnt_share);</div><div class='del'>-		lock_mount_hash();</div><div class='ctx'> 		set_mnt_shared(to);</div><div class='del'>-		unlock_mount_hash();</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	namespace_unlock();</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3016,33 +3348,49 @@ out:</div><div class='ctx'>  * Check if path is overmounted, i.e., if there's a mount on top of</div><div class='ctx'>  * @path-&gt;mnt with @path-&gt;dentry as mountpoint.</div><div class='ctx'>  *</div><div class='del'>- * Context: This function expects namespace_lock() to be held.</div><div class='add'>+ * Context: namespace_sem must be held at least shared.</div><div class='add'>+ * MUST NOT be called under lock_mount_hash() (there one should just</div><div class='add'>+ * call __lookup_mnt() and check if it returns NULL).</div><div class='ctx'>  * Return: If path is overmounted true is returned, false if not.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool path_overmounted(const struct path *path)</div><div class='ctx'> {</div><div class='add'>+	unsigned seq = read_seqbegin(&amp;mount_lock);</div><div class='add'>+	bool no_child;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (unlikely(__lookup_mnt(path-&gt;mnt, path-&gt;dentry))) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='add'>+	no_child = !__lookup_mnt(path-&gt;mnt, path-&gt;dentry);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	return false;</div><div class='add'>+	if (need_seqretry(&amp;mount_lock, seq)) {</div><div class='add'>+		read_seqlock_excl(&amp;mount_lock);</div><div class='add'>+		no_child = !__lookup_mnt(path-&gt;mnt, path-&gt;dentry);</div><div class='add'>+		read_sequnlock_excl(&amp;mount_lock);</div><div class='add'>+	}</div><div class='add'>+	return unlikely(!no_child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if there is a possibly empty chain of descent from p1 to p2.</div><div class='add'>+ * Locks: namespace_sem (shared) or mount_lock (read_seqlock_excl).</div><div class='add'>+ */</div><div class='add'>+static bool mount_is_ancestor(const struct mount *p1, const struct mount *p2)</div><div class='add'>+{</div><div class='add'>+	while (p2 != p1 &amp;&amp; mnt_has_parent(p2))</div><div class='add'>+		p2 = p2-&gt;mnt_parent;</div><div class='add'>+	return p2 == p1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * can_move_mount_beneath - check that we can mount beneath the top mount</div><div class='del'>- * @from: mount to mount beneath</div><div class='del'>- * @to:   mount under which to mount</div><div class='del'>- * @mp:   mountpoint of @to</div><div class='add'>+ * @mnt_from: mount we are trying to move</div><div class='add'>+ * @mnt_to:   mount under which to mount</div><div class='add'>+ * @mp:   mountpoint of @mnt_to</div><div class='ctx'>  *</div><div class='del'>- * - Make sure that @to-&gt;dentry is actually the root of a mount under</div><div class='del'>- *   which we can mount another mount.</div><div class='ctx'>  * - Make sure that nothing can be mounted beneath the caller's current</div><div class='ctx'>  *   root or the rootfs of the namespace.</div><div class='ctx'>  * - Make sure that the caller can unmount the topmost mount ensuring</div><div class='ctx'>  *   that the caller could reveal the underlying mountpoint.</div><div class='del'>- * - Ensure that nothing has been mounted on top of @from before we</div><div class='add'>+ * - Ensure that nothing has been mounted on top of @mnt_from before we</div><div class='ctx'>  *   grabbed @namespace_sem to avoid creating pointless shadow mounts.</div><div class='ctx'>  * - Prevent mounting beneath a mount if the propagation relationship</div><div class='ctx'>  *   between the source mount, parent mount, and top mount would lead to</div><div class='hunk'>@@ -3051,25 +3399,17 @@ static inline bool path_overmounted(const struct path *path)</div><div class='ctx'>  * Context: This function expects namespace_lock() to be held.</div><div class='ctx'>  * Return: On success 0, and on error a negative error code is returned.</div><div class='ctx'>  */</div><div class='del'>-static int can_move_mount_beneath(const struct path *from,</div><div class='del'>-				  const struct path *to,</div><div class='add'>+static int can_move_mount_beneath(const struct mount *mnt_from,</div><div class='add'>+				  const struct mount *mnt_to,</div><div class='ctx'> 				  const struct mountpoint *mp)</div><div class='ctx'> {</div><div class='del'>-	struct mount *mnt_from = real_mount(from-&gt;mnt),</div><div class='del'>-		     *mnt_to = real_mount(to-&gt;mnt),</div><div class='del'>-		     *parent_mnt_to = mnt_to-&gt;mnt_parent;</div><div class='del'>-</div><div class='del'>-	if (!mnt_has_parent(mnt_to))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!path_mounted(to))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	struct mount *parent_mnt_to = mnt_to-&gt;mnt_parent;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_MNT_LOCKED(mnt_to))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid creating shadow mounts during mount propagation. */</div><div class='del'>-	if (path_overmounted(from))</div><div class='add'>+	if (mnt_from-&gt;overmount)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3081,9 +3421,8 @@ static int can_move_mount_beneath(const struct path *from,</div><div class='ctx'> 	if (parent_mnt_to == current-&gt;nsproxy-&gt;mnt_ns-&gt;root)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for (struct mount *p = mnt_from; mnt_has_parent(p); p = p-&gt;mnt_parent)</div><div class='del'>-		if (p == mnt_to)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (mount_is_ancestor(mnt_to, mnt_from))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the parent mount propagates to the child mount this would</div><div class='hunk'>@@ -3106,111 +3445,138 @@ static int can_move_mount_beneath(const struct path *from,</div><div class='ctx'> 	 * @mnt_from itself. This defeats the whole purpose of mounting</div><div class='ctx'> 	 * @mnt_from beneath @mnt_to.</div><div class='ctx'> 	 */</div><div class='del'>-	if (propagation_would_overmount(parent_mnt_to, mnt_from, mp))</div><div class='add'>+	if (check_mnt(mnt_from) &amp;&amp;</div><div class='add'>+	    propagation_would_overmount(parent_mnt_to, mnt_from, mp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_move_mount(struct path *old_path, struct path *new_path,</div><div class='del'>-			 bool beneath)</div><div class='add'>+/* may_use_mount() - check if a mount tree can be used</div><div class='add'>+ * @mnt: vfsmount to be used</div><div class='add'>+ *</div><div class='add'>+ * This helper checks if the caller may use the mount tree starting</div><div class='add'>+ * from @path-&gt;mnt. The caller may use the mount tree under the</div><div class='add'>+ * following circumstances:</div><div class='add'>+ *</div><div class='add'>+ * (1) The caller is located in the mount namespace of the mount tree.</div><div class='add'>+ *     This also implies that the mount does not belong to an anonymous</div><div class='add'>+ *     mount namespace.</div><div class='add'>+ * (2) The caller is trying to use a mount tree that belongs to an</div><div class='add'>+ *     anonymous mount namespace.</div><div class='add'>+ *</div><div class='add'>+ *     For that to be safe, this helper enforces that the origin mount</div><div class='add'>+ *     namespace the anonymous mount namespace was created from is the</div><div class='add'>+ *     same as the caller's mount namespace by comparing the sequence</div><div class='add'>+ *     numbers.</div><div class='add'>+ *</div><div class='add'>+ *     The ownership of a non-anonymous mount namespace such as the</div><div class='add'>+ *     caller's cannot change.</div><div class='add'>+ *     =&gt; We know that the caller's mount namespace is stable.</div><div class='add'>+ *</div><div class='add'>+ *     If the origin sequence number of the anonymous mount namespace is</div><div class='add'>+ *     the same as the sequence number of the caller's mount namespace.</div><div class='add'>+ *     =&gt; The owning namespaces are the same.</div><div class='add'>+ *</div><div class='add'>+ *     ==&gt; The earlier capability check on the owning namespace of the</div><div class='add'>+ *         caller's mount namespace ensures that the caller has the</div><div class='add'>+ *         ability to use the mount tree.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the mount tree can be used, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool may_use_mount(struct mount *mnt)</div><div class='ctx'> {</div><div class='del'>-	struct mnt_namespace *ns;</div><div class='del'>-	struct mount *p;</div><div class='del'>-	struct mount *old;</div><div class='del'>-	struct mount *parent;</div><div class='del'>-	struct mountpoint *mp, *old_mp;</div><div class='del'>-	int err;</div><div class='del'>-	bool attached;</div><div class='del'>-	enum mnt_tree_flags_t flags = 0;</div><div class='del'>-</div><div class='del'>-	mp = do_lock_mount(new_path, beneath);</div><div class='del'>-	if (IS_ERR(mp))</div><div class='del'>-		return PTR_ERR(mp);</div><div class='del'>-</div><div class='del'>-	old = real_mount(old_path-&gt;mnt);</div><div class='del'>-	p = real_mount(new_path-&gt;mnt);</div><div class='del'>-	parent = old-&gt;mnt_parent;</div><div class='del'>-	attached = mnt_has_parent(old);</div><div class='del'>-	if (attached)</div><div class='del'>-		flags |= MNT_TREE_MOVE;</div><div class='del'>-	old_mp = old-&gt;mnt_mp;</div><div class='del'>-	ns = old-&gt;mnt_ns;</div><div class='del'>-</div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	/* The mountpoint must be in our namespace. */</div><div class='del'>-	if (!check_mnt(p))</div><div class='del'>-		goto out;</div><div class='add'>+	if (check_mnt(mnt))</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='del'>-	/* The thing moved must be mounted... */</div><div class='del'>-	if (!is_mounted(&amp;old-&gt;mnt))</div><div class='del'>-		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that noone unmounted the target path or somehow</div><div class='add'>+	 * managed to get their hands on something purely kernel</div><div class='add'>+	 * internal.</div><div class='add'>+	 */</div><div class='add'>+	if (!is_mounted(&amp;mnt-&gt;mnt))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	/* ... and either ours or the root of anon namespace */</div><div class='del'>-	if (!(attached ? check_mnt(old) : is_anon_ns(ns)))</div><div class='del'>-		goto out;</div><div class='add'>+	return check_anonymous_mnt(mnt);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (old-&gt;mnt.mnt_flags &amp; MNT_LOCKED)</div><div class='del'>-		goto out;</div><div class='add'>+static int do_move_mount(const struct path *old_path,</div><div class='add'>+			 const struct path *new_path,</div><div class='add'>+			 enum mnt_tree_flags_t flags)</div><div class='add'>+{</div><div class='add'>+	struct mount *old = real_mount(old_path-&gt;mnt);</div><div class='add'>+	int err;</div><div class='add'>+	bool beneath = flags &amp; MNT_TREE_BENEATH;</div><div class='ctx'> </div><div class='ctx'> 	if (!path_mounted(old_path))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (d_is_dir(new_path-&gt;dentry) !=</div><div class='del'>-	    d_is_dir(old_path-&gt;dentry))</div><div class='del'>-		goto out;</div><div class='del'>-	/*</div><div class='del'>-	 * Don't move a mount residing in a shared parent.</div><div class='del'>-	 */</div><div class='del'>-	if (attached &amp;&amp; IS_MNT_SHARED(parent))</div><div class='del'>-		goto out;</div><div class='add'>+	if (d_is_dir(new_path-&gt;dentry) != d_is_dir(old_path-&gt;dentry))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	LOCK_MOUNT_MAYBE_BENEATH(mp, new_path, beneath);</div><div class='add'>+	if (IS_ERR(mp.parent))</div><div class='add'>+		return PTR_ERR(mp.parent);</div><div class='add'>+</div><div class='add'>+	if (check_mnt(old)) {</div><div class='add'>+		/* if the source is in our namespace... */</div><div class='add'>+		/* ... it should be detachable from parent */</div><div class='add'>+		if (!mnt_has_parent(old) || IS_MNT_LOCKED(old))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* ... which should not be shared */</div><div class='add'>+		if (IS_MNT_SHARED(old-&gt;mnt_parent))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* ... and the target should be in our namespace */</div><div class='add'>+		if (!check_mnt(mp.parent))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * otherwise the source must be the root of some anon namespace.</div><div class='add'>+		 */</div><div class='add'>+		if (!anon_ns_root(old))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/*</div><div class='add'>+		 * Bail out early if the target is within the same namespace -</div><div class='add'>+		 * subsequent checks would've rejected that, but they lose</div><div class='add'>+		 * some corner cases if we check it early.</div><div class='add'>+		 */</div><div class='add'>+		if (old-&gt;mnt_ns == mp.parent-&gt;mnt_ns)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/*</div><div class='add'>+		 * Target should be either in our namespace or in an acceptable</div><div class='add'>+		 * anon namespace, sensu check_anonymous_mnt().</div><div class='add'>+		 */</div><div class='add'>+		if (!may_use_mount(mp.parent))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (beneath) {</div><div class='del'>-		err = can_move_mount_beneath(old_path, new_path, mp);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+		struct mount *over = real_mount(new_path-&gt;mnt);</div><div class='ctx'> </div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		p = p-&gt;mnt_parent;</div><div class='del'>-		flags |= MNT_TREE_BENEATH;</div><div class='add'>+		if (mp.parent != over-&gt;mnt_parent)</div><div class='add'>+			over = mp.parent-&gt;overmount;</div><div class='add'>+		err = can_move_mount_beneath(old, over, mp.mp);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't move a mount tree containing unbindable mounts to a destination</div><div class='ctx'> 	 * mount which is shared.</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_MNT_SHARED(p) &amp;&amp; tree_contains_unbindable(old))</div><div class='del'>-		goto out;</div><div class='del'>-	err = -ELOOP;</div><div class='add'>+	if (IS_MNT_SHARED(mp.parent) &amp;&amp; tree_contains_unbindable(old))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (!check_for_nsfs_mounts(old))</div><div class='del'>-		goto out;</div><div class='del'>-	for (; mnt_has_parent(p); p = p-&gt;mnt_parent)</div><div class='del'>-		if (p == old)</div><div class='del'>-			goto out;</div><div class='add'>+		return -ELOOP;</div><div class='add'>+	if (mount_is_ancestor(old, mp.parent))</div><div class='add'>+		return -ELOOP;</div><div class='ctx'> </div><div class='del'>-	err = attach_recursive_mnt(old, real_mount(new_path-&gt;mnt), mp, flags);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* if the mount is moved, it should no longer be expire</div><div class='del'>-	 * automatically */</div><div class='del'>-	list_del_init(&amp;old-&gt;mnt_expire);</div><div class='del'>-	if (attached)</div><div class='del'>-		put_mountpoint(old_mp);</div><div class='del'>-out:</div><div class='del'>-	unlock_mount(mp);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (attached)</div><div class='del'>-			mntput_no_expire(parent);</div><div class='del'>-		else</div><div class='del'>-			free_mnt_ns(ns);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	return attach_recursive_mnt(old, &amp;mp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_move_mount_old(struct path *path, const char *old_name)</div><div class='add'>+static int do_move_mount_old(const struct path *path, const char *old_name)</div><div class='ctx'> {</div><div class='del'>-	struct path old_path;</div><div class='add'>+	struct path old_path __free(path_put) = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!old_name || !*old_name)</div><div class='hunk'>@@ -3220,18 +3586,19 @@ static int do_move_mount_old(struct path *path, const char *old_name)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = do_move_mount(&amp;old_path, path, false);</div><div class='del'>-	path_put(&amp;old_path);</div><div class='del'>-	return err;</div><div class='add'>+	return do_move_mount(&amp;old_path, path, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * add a mount into a namespace's mount tree</div><div class='ctx'>  */</div><div class='del'>-static int do_add_mount(struct mount *newmnt, struct mountpoint *mp,</div><div class='del'>-			const struct path *path, int mnt_flags)</div><div class='add'>+static int do_add_mount(struct mount *newmnt, const struct pinned_mountpoint *mp,</div><div class='add'>+			int mnt_flags)</div><div class='ctx'> {</div><div class='del'>-	struct mount *parent = real_mount(path-&gt;mnt);</div><div class='add'>+	struct mount *parent = mp-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(parent))</div><div class='add'>+		return PTR_ERR(parent);</div><div class='ctx'> </div><div class='ctx'> 	mnt_flags &amp;= ~MNT_INTERNAL_FLAGS;</div><div class='ctx'> </div><div class='hunk'>@@ -3245,14 +3612,15 @@ static int do_add_mount(struct mount *newmnt, struct mountpoint *mp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Refuse the same filesystem on the same mount point */</div><div class='del'>-	if (path-&gt;mnt-&gt;mnt_sb == newmnt-&gt;mnt.mnt_sb &amp;&amp; path_mounted(path))</div><div class='add'>+	if (parent-&gt;mnt.mnt_sb == newmnt-&gt;mnt.mnt_sb &amp;&amp;</div><div class='add'>+	    parent-&gt;mnt.mnt_root == mp-&gt;mp-&gt;m_dentry)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (d_is_symlink(newmnt-&gt;mnt.mnt_root))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	newmnt-&gt;mnt.mnt_flags = mnt_flags;</div><div class='del'>-	return graft_tree(newmnt, parent, mp);</div><div class='add'>+	return graft_tree(newmnt, mp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool mount_too_revealing(const struct super_block *sb, int *new_mnt_flags);</div><div class='hunk'>@@ -3261,40 +3629,32 @@ static bool mount_too_revealing(const struct super_block *sb, int *new_mnt_flags</div><div class='ctx'>  * Create a new mount using a superblock configuration and request it</div><div class='ctx'>  * be added to the namespace tree.</div><div class='ctx'>  */</div><div class='del'>-static int do_new_mount_fc(struct fs_context *fc, struct path *mountpoint,</div><div class='add'>+static int do_new_mount_fc(struct fs_context *fc, const struct path *mountpoint,</div><div class='ctx'> 			   unsigned int mnt_flags)</div><div class='ctx'> {</div><div class='del'>-	struct vfsmount *mnt;</div><div class='del'>-	struct mountpoint *mp;</div><div class='del'>-	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+	struct vfsmount *mnt __free(mntput) = fc_mount(fc);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = security_sb_kern_mount(sb);</div><div class='del'>-	if (!error &amp;&amp; mount_too_revealing(sb, &amp;mnt_flags))</div><div class='del'>-		error = -EPERM;</div><div class='add'>+	if (IS_ERR(mnt))</div><div class='add'>+		return PTR_ERR(mnt);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(error)) {</div><div class='del'>-		fc_drop_locked(fc);</div><div class='add'>+	sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	error = security_sb_kern_mount(sb);</div><div class='add'>+	if (unlikely(error))</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	up_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> </div><div class='del'>-	mnt = vfs_create_mount(fc);</div><div class='del'>-	if (IS_ERR(mnt))</div><div class='del'>-		return PTR_ERR(mnt);</div><div class='add'>+	if (unlikely(mount_too_revealing(sb, &amp;mnt_flags))) {</div><div class='add'>+		errorfcp(fc, "VFS", "Mount too revealing");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mnt_warn_timestamp_expiry(mountpoint, mnt);</div><div class='ctx'> </div><div class='del'>-	mp = lock_mount(mountpoint);</div><div class='del'>-	if (IS_ERR(mp)) {</div><div class='del'>-		mntput(mnt);</div><div class='del'>-		return PTR_ERR(mp);</div><div class='del'>-	}</div><div class='del'>-	error = do_add_mount(real_mount(mnt), mp, mountpoint, mnt_flags);</div><div class='del'>-	unlock_mount(mp);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		mntput(mnt);</div><div class='add'>+	LOCK_MOUNT(mp, mountpoint);</div><div class='add'>+	error = do_add_mount(real_mount(mnt), &amp;mp, mnt_flags);</div><div class='add'>+	if (!error)</div><div class='add'>+		retain_and_null_ptr(mnt); // consumed on success</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3302,8 +3662,9 @@ static int do_new_mount_fc(struct fs_context *fc, struct path *mountpoint,</div><div class='ctx'>  * create a new mount for userspace and request it to be added into the</div><div class='ctx'>  * namespace's tree</div><div class='ctx'>  */</div><div class='del'>-static int do_new_mount(struct path *path, const char *fstype, int sb_flags,</div><div class='del'>-			int mnt_flags, const char *name, void *data)</div><div class='add'>+static int do_new_mount(const struct path *path, const char *fstype,</div><div class='add'>+			int sb_flags, int mnt_flags,</div><div class='add'>+			const char *name, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_system_type *type;</div><div class='ctx'> 	struct fs_context *fc;</div><div class='hunk'>@@ -3340,27 +3701,46 @@ static int do_new_mount(struct path *path, const char *fstype, int sb_flags,</div><div class='ctx'> 	fc-&gt;oldapi = true;</div><div class='ctx'> </div><div class='ctx'> 	if (subtype)</div><div class='del'>-		err = vfs_parse_fs_string(fc, "subtype",</div><div class='del'>-					  subtype, strlen(subtype));</div><div class='add'>+		err = vfs_parse_fs_string(fc, "subtype", subtype);</div><div class='ctx'> 	if (!err &amp;&amp; name)</div><div class='del'>-		err = vfs_parse_fs_string(fc, "source", name, strlen(name));</div><div class='add'>+		err = vfs_parse_fs_string(fc, "source", name);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = parse_monolithic_mount_data(fc, data);</div><div class='ctx'> 	if (!err &amp;&amp; !mount_capable(fc))</div><div class='ctx'> 		err = -EPERM;</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = vfs_get_tree(fc);</div><div class='del'>-	if (!err)</div><div class='ctx'> 		err = do_new_mount_fc(fc, path, mnt_flags);</div><div class='ctx'> </div><div class='ctx'> 	put_fs_context(fc);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int finish_automount(struct vfsmount *m, const struct path *path)</div><div class='add'>+static void lock_mount_exact(const struct path *path,</div><div class='add'>+			     struct pinned_mountpoint *mp)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = path-&gt;dentry;</div><div class='del'>-	struct mountpoint *mp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	inode_lock(dentry-&gt;d_inode);</div><div class='add'>+	namespace_lock();</div><div class='add'>+	if (unlikely(cant_mount(dentry)))</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else if (path_overmounted(path))</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	else</div><div class='add'>+		err = get_mountpoint(dentry, mp);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		namespace_unlock();</div><div class='add'>+		inode_unlock(dentry-&gt;d_inode);</div><div class='add'>+		mp-&gt;parent = ERR_PTR(err);</div><div class='add'>+	} else {</div><div class='add'>+		mp-&gt;parent = real_mount(path-&gt;mnt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int finish_automount(struct vfsmount *__m, const struct path *path)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *m __free(mntput) = __m;</div><div class='ctx'> 	struct mount *mnt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -3370,57 +3750,22 @@ int finish_automount(struct vfsmount *m, const struct path *path)</div><div class='ctx'> 		return PTR_ERR(m);</div><div class='ctx'> </div><div class='ctx'> 	mnt = real_mount(m);</div><div class='del'>-	/* The new mount record should have at least 2 refs to prevent it being</div><div class='del'>-	 * expired before we get a chance to add it</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(mnt_get_count(mnt) &lt; 2);</div><div class='ctx'> </div><div class='del'>-	if (m-&gt;mnt_sb == path-&gt;mnt-&gt;mnt_sb &amp;&amp;</div><div class='del'>-	    m-&gt;mnt_root == dentry) {</div><div class='del'>-		err = -ELOOP;</div><div class='del'>-		goto discard;</div><div class='del'>-	}</div><div class='add'>+	if (m-&gt;mnt_root == path-&gt;dentry)</div><div class='add'>+		return -ELOOP;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * we don't want to use lock_mount() - in this case finding something</div><div class='add'>+	 * we don't want to use LOCK_MOUNT() - in this case finding something</div><div class='ctx'> 	 * that overmounts our mountpoint to be means "quitely drop what we've</div><div class='ctx'> 	 * got", not "try to mount it on top".</div><div class='ctx'> 	 */</div><div class='del'>-	inode_lock(dentry-&gt;d_inode);</div><div class='del'>-	namespace_lock();</div><div class='del'>-	if (unlikely(cant_mount(dentry))) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto discard_locked;</div><div class='del'>-	}</div><div class='del'>-	if (path_overmounted(path)) {</div><div class='del'>-		err = 0;</div><div class='del'>-		goto discard_locked;</div><div class='del'>-	}</div><div class='del'>-	mp = get_mountpoint(dentry);</div><div class='del'>-	if (IS_ERR(mp)) {</div><div class='del'>-		err = PTR_ERR(mp);</div><div class='del'>-		goto discard_locked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = do_add_mount(mnt, mp, path, path-&gt;mnt-&gt;mnt_flags | MNT_SHRINKABLE);</div><div class='del'>-	unlock_mount(mp);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto discard;</div><div class='del'>-	mntput(m);</div><div class='del'>-	return 0;</div><div class='add'>+	LOCK_MOUNT_EXACT(mp, path);</div><div class='add'>+	if (mp.parent == ERR_PTR(-EBUSY))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-discard_locked:</div><div class='del'>-	namespace_unlock();</div><div class='del'>-	inode_unlock(dentry-&gt;d_inode);</div><div class='del'>-discard:</div><div class='del'>-	/* remove m from any expiration list it may be on */</div><div class='del'>-	if (!list_empty(&amp;mnt-&gt;mnt_expire)) {</div><div class='del'>-		namespace_lock();</div><div class='del'>-		list_del_init(&amp;mnt-&gt;mnt_expire);</div><div class='del'>-		namespace_unlock();</div><div class='del'>-	}</div><div class='del'>-	mntput(m);</div><div class='del'>-	mntput(m);</div><div class='add'>+	err = do_add_mount(mnt, &amp;mp, path-&gt;mnt-&gt;mnt_flags | MNT_SHRINKABLE);</div><div class='add'>+	if (likely(!err))</div><div class='add'>+		retain_and_null_ptr(m);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3431,11 +3776,8 @@ discard:</div><div class='ctx'>  */</div><div class='ctx'> void mnt_set_expiry(struct vfsmount *mnt, struct list_head *expiry_list)</div><div class='ctx'> {</div><div class='del'>-	namespace_lock();</div><div class='del'>-</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='ctx'> 	list_add_tail(&amp;real_mount(mnt)-&gt;mnt_expire, expiry_list);</div><div class='del'>-</div><div class='del'>-	namespace_unlock();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mnt_set_expiry);</div><div class='ctx'> </div><div class='hunk'>@@ -3452,16 +3794,19 @@ void mark_mounts_for_expiry(struct list_head *mounts)</div><div class='ctx'> 	if (list_empty(mounts))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	namespace_lock();</div><div class='del'>-	lock_mount_hash();</div><div class='add'>+	guard(namespace_excl)();</div><div class='add'>+	guard(mount_writer)();</div><div class='ctx'> </div><div class='ctx'> 	/* extract from the expiration list every vfsmount that matches the</div><div class='ctx'> 	 * following criteria:</div><div class='add'>+	 * - already mounted</div><div class='ctx'> 	 * - only referenced by its parent vfsmount</div><div class='ctx'> 	 * - still marked for expiry (marked on the last call here; marks are</div><div class='ctx'> 	 *   cleared by mntput())</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry_safe(mnt, next, mounts, mnt_expire) {</div><div class='add'>+		if (!is_mounted(&amp;mnt-&gt;mnt))</div><div class='add'>+			continue;</div><div class='ctx'> 		if (!xchg(&amp;mnt-&gt;mnt_expiry_mark, 1) ||</div><div class='ctx'> 			propagate_mount_busy(mnt, 1))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -3472,8 +3817,6 @@ void mark_mounts_for_expiry(struct list_head *mounts)</div><div class='ctx'> 		touch_mnt_namespace(mnt-&gt;mnt_ns);</div><div class='ctx'> 		umount_tree(mnt, UMOUNT_PROPAGATE|UMOUNT_SYNC);</div><div class='ctx'> 	}</div><div class='del'>-	unlock_mount_hash();</div><div class='del'>-	namespace_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(mark_mounts_for_expiry);</div><div class='hunk'>@@ -3601,7 +3944,7 @@ static char *copy_mount_string(const void __user *data)</div><div class='ctx'>  * Therefore, if this magic number is present, it carries no information</div><div class='ctx'>  * and must be discarded.</div><div class='ctx'>  */</div><div class='del'>-int path_mount(const char *dev_name, struct path *path,</div><div class='add'>+int path_mount(const char *dev_name, const struct path *path,</div><div class='ctx'> 		const char *type_page, unsigned long flags, void *data_page)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mnt_flags = 0, sb_flags;</div><div class='hunk'>@@ -3668,7 +4011,7 @@ int path_mount(const char *dev_name, struct path *path,</div><div class='ctx'> 	if ((flags &amp; (MS_REMOUNT | MS_BIND)) == (MS_REMOUNT | MS_BIND))</div><div class='ctx'> 		return do_reconfigure_mnt(path, mnt_flags);</div><div class='ctx'> 	if (flags &amp; MS_REMOUNT)</div><div class='del'>-		return do_remount(path, flags, sb_flags, mnt_flags, data_page);</div><div class='add'>+		return do_remount(path, sb_flags, mnt_flags, data_page);</div><div class='ctx'> 	if (flags &amp; MS_BIND)</div><div class='ctx'> 		return do_loopback(path, dev_name, flags &amp; MS_REC);</div><div class='ctx'> 	if (flags &amp; (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))</div><div class='hunk'>@@ -3680,18 +4023,16 @@ int path_mount(const char *dev_name, struct path *path,</div><div class='ctx'> 			    data_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long do_mount(const char *dev_name, const char __user *dir_name,</div><div class='add'>+int do_mount(const char *dev_name, const char __user *dir_name,</div><div class='ctx'> 		const char *type_page, unsigned long flags, void *data_page)</div><div class='ctx'> {</div><div class='del'>-	struct path path;</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = user_path_at(AT_FDCWD, dir_name, LOOKUP_FOLLOW, &amp;path);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = path_mount(dev_name, &amp;path, type_page, flags, data_page);</div><div class='del'>-	path_put(&amp;path);</div><div class='del'>-	return ret;</div><div class='add'>+	return path_mount(dev_name, &amp;path, type_page, flags, data_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ucounts *inc_mnt_namespaces(struct user_namespace *ns)</div><div class='hunk'>@@ -3707,21 +4048,11 @@ static void dec_mnt_namespaces(struct ucounts *ucounts)</div><div class='ctx'> static void free_mnt_ns(struct mnt_namespace *ns)</div><div class='ctx'> {</div><div class='ctx'> 	if (!is_anon_ns(ns))</div><div class='del'>-		ns_free_inum(&amp;ns-&gt;ns);</div><div class='add'>+		ns_common_free(ns);</div><div class='ctx'> 	dec_mnt_namespaces(ns-&gt;ucounts);</div><div class='del'>-	put_user_ns(ns-&gt;user_ns);</div><div class='del'>-	kfree(ns);</div><div class='add'>+	mnt_ns_tree_remove(ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Assign a sequence number so we can detect when we attempt to bind</div><div class='del'>- * mount a reference to an older mount namespace into the current</div><div class='del'>- * mount namespace, preventing reference counting loops.  A 64bit</div><div class='del'>- * number incrementing at 10Ghz will take 12,427 years to wrap which</div><div class='del'>- * is effectively never, so we can ignore the possibility.</div><div class='del'>- */</div><div class='del'>-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);</div><div class='del'>-</div><div class='ctx'> static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns, bool anon)</div><div class='ctx'> {</div><div class='ctx'> 	struct mnt_namespace *new_ns;</div><div class='hunk'>@@ -3737,18 +4068,20 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns, bool a</div><div class='ctx'> 		dec_mnt_namespaces(ucounts);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='del'>-	if (!anon) {</div><div class='del'>-		ret = ns_alloc_inum(&amp;new_ns-&gt;ns);</div><div class='del'>-		if (ret) {</div><div class='del'>-			kfree(new_ns);</div><div class='del'>-			dec_mnt_namespaces(ucounts);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+	if (anon)</div><div class='add'>+		ret = ns_common_init_inum(new_ns, MNT_NS_ANON_INO);</div><div class='add'>+	else</div><div class='add'>+		ret = ns_common_init(new_ns);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(new_ns);</div><div class='add'>+		dec_mnt_namespaces(ucounts);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='del'>-	new_ns-&gt;ns.ops = &amp;mntns_operations;</div><div class='del'>-	if (!anon)</div><div class='del'>-		new_ns-&gt;seq = atomic64_add_return(1, &amp;mnt_ns_seq);</div><div class='del'>-	refcount_set(&amp;new_ns-&gt;ns.count, 1);</div><div class='add'>+	ns_tree_gen_id(new_ns);</div><div class='add'>+</div><div class='add'>+	new_ns-&gt;is_anon = anon;</div><div class='add'>+	refcount_set(&amp;new_ns-&gt;passive, 1);</div><div class='ctx'> 	new_ns-&gt;mounts = RB_ROOT;</div><div class='ctx'> 	init_waitqueue_head(&amp;new_ns-&gt;poll);</div><div class='ctx'> 	new_ns-&gt;user_ns = get_user_ns(user_ns);</div><div class='hunk'>@@ -3757,11 +4090,12 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns, bool a</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __latent_entropy</div><div class='del'>-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,</div><div class='add'>+struct mnt_namespace *copy_mnt_ns(u64 flags, struct mnt_namespace *ns,</div><div class='ctx'> 		struct user_namespace *user_ns, struct fs_struct *new_fs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mnt_namespace *new_ns;</div><div class='del'>-	struct vfsmount *rootmnt = NULL, *pwdmnt = NULL;</div><div class='add'>+	struct vfsmount *rootmnt __free(mntput) = NULL;</div><div class='add'>+	struct vfsmount *pwdmnt __free(mntput) = NULL;</div><div class='ctx'> 	struct mount *p, *q;</div><div class='ctx'> 	struct mount *old;</div><div class='ctx'> 	struct mount *new;</div><div class='hunk'>@@ -3780,21 +4114,19 @@ struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,</div><div class='ctx'> 	if (IS_ERR(new_ns))</div><div class='ctx'> 		return new_ns;</div><div class='ctx'> </div><div class='del'>-	namespace_lock();</div><div class='add'>+	guard(namespace_excl)();</div><div class='ctx'> 	/* First pass: copy the tree topology */</div><div class='ctx'> 	copy_flags = CL_COPY_UNBINDABLE | CL_EXPIRE;</div><div class='ctx'> 	if (user_ns != ns-&gt;user_ns)</div><div class='del'>-		copy_flags |= CL_SHARED_TO_SLAVE;</div><div class='add'>+		copy_flags |= CL_SLAVE;</div><div class='ctx'> 	new = copy_tree(old, old-&gt;mnt.mnt_root, copy_flags);</div><div class='ctx'> 	if (IS_ERR(new)) {</div><div class='del'>-		namespace_unlock();</div><div class='del'>-		free_mnt_ns(new_ns);</div><div class='add'>+		emptied_ns = new_ns;</div><div class='ctx'> 		return ERR_CAST(new);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (user_ns != ns-&gt;user_ns) {</div><div class='del'>-		lock_mount_hash();</div><div class='add'>+		guard(mount_writer)();</div><div class='ctx'> 		lock_mnt_tree(new);</div><div class='del'>-		unlock_mount_hash();</div><div class='ctx'> 	}</div><div class='ctx'> 	new_ns-&gt;root = new;</div><div class='ctx'> </div><div class='hunk'>@@ -3826,13 +4158,7 @@ struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,</div><div class='ctx'> 		while (p-&gt;mnt.mnt_root != q-&gt;mnt.mnt_root)</div><div class='ctx'> 			p = next_mnt(skip_mnt_tree(p), old);</div><div class='ctx'> 	}</div><div class='del'>-	namespace_unlock();</div><div class='del'>-</div><div class='del'>-	if (rootmnt)</div><div class='del'>-		mntput(rootmnt);</div><div class='del'>-	if (pwdmnt)</div><div class='del'>-		mntput(pwdmnt);</div><div class='del'>-</div><div class='add'>+	ns_tree_add_raw(new_ns);</div><div class='ctx'> 	return new_ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3943,12 +4269,11 @@ static unsigned int attr_flags_to_mnt_flags(u64 attr_flags)</div><div class='ctx'> SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,</div><div class='ctx'> 		unsigned int, attr_flags)</div><div class='ctx'> {</div><div class='add'>+	struct path new_path __free(path_put) = {};</div><div class='ctx'> 	struct mnt_namespace *ns;</div><div class='ctx'> 	struct fs_context *fc;</div><div class='del'>-	struct file *file;</div><div class='del'>-	struct path newmount;</div><div class='add'>+	struct vfsmount *new_mnt;</div><div class='ctx'> 	struct mount *mnt;</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	unsigned int mnt_flags = 0;</div><div class='ctx'> 	long ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3976,45 +4301,45 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = fdget(fs_fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	CLASS(fd, f)(fs_fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-	if (f.file-&gt;f_op != &amp;fscontext_fops)</div><div class='del'>-		goto err_fsfd;</div><div class='add'>+	if (fd_file(f)-&gt;f_op != &amp;fscontext_fops)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	fc = f.file-&gt;private_data;</div><div class='add'>+	fc = fd_file(f)-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	ret = mutex_lock_interruptible(&amp;fc-&gt;uapi_mutex);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err_fsfd;</div><div class='add'>+	ACQUIRE(mutex_intr, uapi_mutex)(&amp;fc-&gt;uapi_mutex);</div><div class='add'>+	ret = ACQUIRE_ERR(mutex_intr, &amp;uapi_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* There must be a valid superblock or we can't mount it */</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> 	if (!fc-&gt;root)</div><div class='del'>-		goto err_unlock;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EPERM;</div><div class='ctx'> 	if (mount_too_revealing(fc-&gt;root-&gt;d_sb, &amp;mnt_flags)) {</div><div class='del'>-		pr_warn("VFS: Mount too revealing\n");</div><div class='del'>-		goto err_unlock;</div><div class='add'>+		errorfcp(fc, "VFS", "Mount too revealing");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EBUSY;</div><div class='ctx'> 	if (fc-&gt;phase != FS_CONTEXT_AWAITING_MOUNT)</div><div class='del'>-		goto err_unlock;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fc-&gt;sb_flags &amp; SB_MANDLOCK)</div><div class='ctx'> 		warn_mandlock();</div><div class='ctx'> </div><div class='del'>-	newmount.mnt = vfs_create_mount(fc);</div><div class='del'>-	if (IS_ERR(newmount.mnt)) {</div><div class='del'>-		ret = PTR_ERR(newmount.mnt);</div><div class='del'>-		goto err_unlock;</div><div class='del'>-	}</div><div class='del'>-	newmount.dentry = dget(fc-&gt;root);</div><div class='del'>-	newmount.mnt-&gt;mnt_flags = mnt_flags;</div><div class='add'>+	new_mnt = vfs_create_mount(fc);</div><div class='add'>+	if (IS_ERR(new_mnt))</div><div class='add'>+		return PTR_ERR(new_mnt);</div><div class='add'>+	new_mnt-&gt;mnt_flags = mnt_flags;</div><div class='add'>+</div><div class='add'>+	new_path.dentry = dget(fc-&gt;root);</div><div class='add'>+	new_path.mnt = new_mnt;</div><div class='ctx'> </div><div class='ctx'> 	/* We've done the mount bit - now move the file context into more or</div><div class='ctx'> 	 * less the same state as if we'd done an fspick().  We don't want to</div><div class='hunk'>@@ -4024,40 +4349,43 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,</div><div class='ctx'> 	vfs_clean_context(fc);</div><div class='ctx'> </div><div class='ctx'> 	ns = alloc_mnt_ns(current-&gt;nsproxy-&gt;mnt_ns-&gt;user_ns, true);</div><div class='del'>-	if (IS_ERR(ns)) {</div><div class='del'>-		ret = PTR_ERR(ns);</div><div class='del'>-		goto err_path;</div><div class='del'>-	}</div><div class='del'>-	mnt = real_mount(newmount.mnt);</div><div class='add'>+	if (IS_ERR(ns))</div><div class='add'>+		return PTR_ERR(ns);</div><div class='add'>+	mnt = real_mount(new_path.mnt);</div><div class='ctx'> 	ns-&gt;root = mnt;</div><div class='ctx'> 	ns-&gt;nr_mounts = 1;</div><div class='ctx'> 	mnt_add_to_ns(ns, mnt);</div><div class='del'>-	mntget(newmount.mnt);</div><div class='add'>+	mntget(new_path.mnt);</div><div class='ctx'> </div><div class='del'>-	/* Attach to an apparent O_PATH fd with a note that we need to unmount</div><div class='del'>-	 * it, not just simply put it.</div><div class='del'>-	 */</div><div class='del'>-	file = dentry_open(&amp;newmount, O_PATH, fc-&gt;cred);</div><div class='del'>-	if (IS_ERR(file)) {</div><div class='del'>-		dissolve_on_fput(newmount.mnt);</div><div class='del'>-		ret = PTR_ERR(file);</div><div class='del'>-		goto err_path;</div><div class='add'>+	FD_PREPARE(fdf, (flags &amp; FSMOUNT_CLOEXEC) ? O_CLOEXEC : 0,</div><div class='add'>+		   dentry_open(&amp;new_path, O_PATH, fc-&gt;cred));</div><div class='add'>+	if (fdf.err) {</div><div class='add'>+		dissolve_on_fput(new_path.mnt);</div><div class='add'>+		return fdf.err;</div><div class='ctx'> 	}</div><div class='del'>-	file-&gt;f_mode |= FMODE_NEED_UNMOUNT;</div><div class='ctx'> </div><div class='del'>-	ret = get_unused_fd_flags((flags &amp; FSMOUNT_CLOEXEC) ? O_CLOEXEC : 0);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		fd_install(ret, file);</div><div class='del'>-	else</div><div class='del'>-		fput(file);</div><div class='del'>-</div><div class='del'>-err_path:</div><div class='del'>-	path_put(&amp;newmount);</div><div class='del'>-err_unlock:</div><div class='del'>-	mutex_unlock(&amp;fc-&gt;uapi_mutex);</div><div class='del'>-err_fsfd:</div><div class='del'>-	fdput(f);</div><div class='del'>-	return ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Attach to an apparent O_PATH fd with a note that we</div><div class='add'>+	 * need to unmount it, not just simply put it.</div><div class='add'>+	 */</div><div class='add'>+	fd_prepare_file(fdf)-&gt;f_mode |= FMODE_NEED_UNMOUNT;</div><div class='add'>+	return fd_publish(fdf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int vfs_move_mount(const struct path *from_path,</div><div class='add'>+				 const struct path *to_path,</div><div class='add'>+				 enum mnt_tree_flags_t mflags)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = security_move_mount(from_path, to_path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mflags &amp; MNT_TREE_PROPAGATION)</div><div class='add'>+		return do_set_group(from_path, to_path);</div><div class='add'>+</div><div class='add'>+	return do_move_mount(from_path, to_path, mflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4073,8 +4401,12 @@ SYSCALL_DEFINE5(move_mount,</div><div class='ctx'> 		int, to_dfd, const char __user *, to_pathname,</div><div class='ctx'> 		unsigned int, flags)</div><div class='ctx'> {</div><div class='del'>-	struct path from_path, to_path;</div><div class='del'>-	unsigned int lflags;</div><div class='add'>+	struct path to_path __free(path_put) = {};</div><div class='add'>+	struct path from_path __free(path_put) = {};</div><div class='add'>+	struct filename *to_name __free(putname) = NULL;</div><div class='add'>+	struct filename *from_name __free(putname) = NULL;</div><div class='add'>+	unsigned int lflags, uflags;</div><div class='add'>+	enum mnt_tree_flags_t mflags = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!may_mount())</div><div class='hunk'>@@ -4087,49 +4419,67 @@ SYSCALL_DEFINE5(move_mount,</div><div class='ctx'> 	    (MOVE_MOUNT_BENEATH | MOVE_MOUNT_SET_GROUP))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* If someone gives a pathname, they aren't permitted to move</div><div class='del'>-	 * from an fd that requires unmount as we can't get at the flag</div><div class='del'>-	 * to clear it afterwards.</div><div class='del'>-	 */</div><div class='del'>-	lflags = 0;</div><div class='del'>-	if (flags &amp; MOVE_MOUNT_F_SYMLINKS)	lflags |= LOOKUP_FOLLOW;</div><div class='del'>-	if (flags &amp; MOVE_MOUNT_F_AUTOMOUNTS)	lflags |= LOOKUP_AUTOMOUNT;</div><div class='del'>-	if (flags &amp; MOVE_MOUNT_F_EMPTY_PATH)	lflags |= LOOKUP_EMPTY;</div><div class='add'>+	if (flags &amp; MOVE_MOUNT_SET_GROUP)	mflags |= MNT_TREE_PROPAGATION;</div><div class='add'>+	if (flags &amp; MOVE_MOUNT_BENEATH)		mflags |= MNT_TREE_BENEATH;</div><div class='ctx'> </div><div class='del'>-	ret = user_path_at(from_dfd, from_pathname, lflags, &amp;from_path);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	uflags = 0;</div><div class='add'>+	if (flags &amp; MOVE_MOUNT_T_EMPTY_PATH)</div><div class='add'>+		uflags = AT_EMPTY_PATH;</div><div class='ctx'> </div><div class='del'>-	lflags = 0;</div><div class='del'>-	if (flags &amp; MOVE_MOUNT_T_SYMLINKS)	lflags |= LOOKUP_FOLLOW;</div><div class='del'>-	if (flags &amp; MOVE_MOUNT_T_AUTOMOUNTS)	lflags |= LOOKUP_AUTOMOUNT;</div><div class='del'>-	if (flags &amp; MOVE_MOUNT_T_EMPTY_PATH)	lflags |= LOOKUP_EMPTY;</div><div class='add'>+	to_name = getname_maybe_null(to_pathname, uflags);</div><div class='add'>+	if (IS_ERR(to_name))</div><div class='add'>+		return PTR_ERR(to_name);</div><div class='ctx'> </div><div class='del'>-	ret = user_path_at(to_dfd, to_pathname, lflags, &amp;to_path);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_from;</div><div class='add'>+	if (!to_name &amp;&amp; to_dfd &gt;= 0) {</div><div class='add'>+		CLASS(fd_raw, f_to)(to_dfd);</div><div class='add'>+		if (fd_empty(f_to))</div><div class='add'>+			return -EBADF;</div><div class='ctx'> </div><div class='del'>-	ret = security_move_mount(&amp;from_path, &amp;to_path);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_to;</div><div class='add'>+		to_path = fd_file(f_to)-&gt;f_path;</div><div class='add'>+		path_get(&amp;to_path);</div><div class='add'>+	} else {</div><div class='add'>+		lflags = 0;</div><div class='add'>+		if (flags &amp; MOVE_MOUNT_T_SYMLINKS)</div><div class='add'>+			lflags |= LOOKUP_FOLLOW;</div><div class='add'>+		if (flags &amp; MOVE_MOUNT_T_AUTOMOUNTS)</div><div class='add'>+			lflags |= LOOKUP_AUTOMOUNT;</div><div class='add'>+		ret = filename_lookup(to_dfd, to_name, lflags, &amp;to_path, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; MOVE_MOUNT_SET_GROUP)</div><div class='del'>-		ret = do_set_group(&amp;from_path, &amp;to_path);</div><div class='del'>-	else</div><div class='del'>-		ret = do_move_mount(&amp;from_path, &amp;to_path,</div><div class='del'>-				    (flags &amp; MOVE_MOUNT_BENEATH));</div><div class='add'>+	uflags = 0;</div><div class='add'>+	if (flags &amp; MOVE_MOUNT_F_EMPTY_PATH)</div><div class='add'>+		uflags = AT_EMPTY_PATH;</div><div class='ctx'> </div><div class='del'>-out_to:</div><div class='del'>-	path_put(&amp;to_path);</div><div class='del'>-out_from:</div><div class='del'>-	path_put(&amp;from_path);</div><div class='del'>-	return ret;</div><div class='add'>+	from_name = getname_maybe_null(from_pathname, uflags);</div><div class='add'>+	if (IS_ERR(from_name))</div><div class='add'>+		return PTR_ERR(from_name);</div><div class='add'>+</div><div class='add'>+	if (!from_name &amp;&amp; from_dfd &gt;= 0) {</div><div class='add'>+		CLASS(fd_raw, f_from)(from_dfd);</div><div class='add'>+		if (fd_empty(f_from))</div><div class='add'>+			return -EBADF;</div><div class='add'>+</div><div class='add'>+		return vfs_move_mount(&amp;fd_file(f_from)-&gt;f_path, &amp;to_path, mflags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lflags = 0;</div><div class='add'>+	if (flags &amp; MOVE_MOUNT_F_SYMLINKS)</div><div class='add'>+		lflags |= LOOKUP_FOLLOW;</div><div class='add'>+	if (flags &amp; MOVE_MOUNT_F_AUTOMOUNTS)</div><div class='add'>+		lflags |= LOOKUP_AUTOMOUNT;</div><div class='add'>+	ret = filename_lookup(from_dfd, from_name, lflags, &amp;from_path, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return vfs_move_mount(&amp;from_path, &amp;to_path, mflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return true if path is reachable from root</div><div class='ctx'>  *</div><div class='del'>- * namespace_sem or mount_lock is held</div><div class='add'>+ * locks: mount_locked_reader || namespace_shared &amp;&amp; is_mounted(mnt)</div><div class='ctx'>  */</div><div class='ctx'> bool is_path_reachable(struct mount *mnt, struct dentry *dentry,</div><div class='ctx'> 			 const struct path *root)</div><div class='hunk'>@@ -4143,11 +4493,8 @@ bool is_path_reachable(struct mount *mnt, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> bool path_is_under(const struct path *path1, const struct path *path2)</div><div class='ctx'> {</div><div class='del'>-	bool res;</div><div class='del'>-	read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-	res = is_path_reachable(real_mount(path1-&gt;mnt), path1-&gt;dentry, path2);</div><div class='del'>-	read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-	return res;</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='add'>+	return is_path_reachable(real_mount(path1-&gt;mnt), path1-&gt;dentry, path2);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(path_is_under);</div><div class='ctx'> </div><div class='hunk'>@@ -4179,9 +4526,10 @@ EXPORT_SYMBOL(path_is_under);</div><div class='ctx'> SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,</div><div class='ctx'> 		const char __user *, put_old)</div><div class='ctx'> {</div><div class='del'>-	struct path new, old, root;</div><div class='add'>+	struct path new __free(path_put) = {};</div><div class='add'>+	struct path old __free(path_put) = {};</div><div class='add'>+	struct path root __free(path_put) = {};</div><div class='ctx'> 	struct mount *new_mnt, *root_mnt, *old_mnt, *root_parent, *ex_parent;</div><div class='del'>-	struct mountpoint *old_mp, *root_mp;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (!may_mount())</div><div class='hunk'>@@ -4190,89 +4538,73 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,</div><div class='ctx'> 	error = user_path_at(AT_FDCWD, new_root,</div><div class='ctx'> 			     LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &amp;new);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out0;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = user_path_at(AT_FDCWD, put_old,</div><div class='ctx'> 			     LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &amp;old);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out1;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = security_sb_pivotroot(&amp;old, &amp;new);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out2;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	get_fs_root(current-&gt;fs, &amp;root);</div><div class='del'>-	old_mp = lock_mount(&amp;old);</div><div class='del'>-	error = PTR_ERR(old_mp);</div><div class='del'>-	if (IS_ERR(old_mp))</div><div class='del'>-		goto out3;</div><div class='ctx'> </div><div class='del'>-	error = -EINVAL;</div><div class='add'>+	LOCK_MOUNT(old_mp, &amp;old);</div><div class='add'>+	old_mnt = old_mp.parent;</div><div class='add'>+	if (IS_ERR(old_mnt))</div><div class='add'>+		return PTR_ERR(old_mnt);</div><div class='add'>+</div><div class='ctx'> 	new_mnt = real_mount(new.mnt);</div><div class='ctx'> 	root_mnt = real_mount(root.mnt);</div><div class='del'>-	old_mnt = real_mount(old.mnt);</div><div class='ctx'> 	ex_parent = new_mnt-&gt;mnt_parent;</div><div class='ctx'> 	root_parent = root_mnt-&gt;mnt_parent;</div><div class='ctx'> 	if (IS_MNT_SHARED(old_mnt) ||</div><div class='ctx'> 		IS_MNT_SHARED(ex_parent) ||</div><div class='ctx'> 		IS_MNT_SHARED(root_parent))</div><div class='del'>-		goto out4;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (!check_mnt(root_mnt) || !check_mnt(new_mnt))</div><div class='del'>-		goto out4;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (new_mnt-&gt;mnt.mnt_flags &amp; MNT_LOCKED)</div><div class='del'>-		goto out4;</div><div class='del'>-	error = -ENOENT;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (d_unlinked(new.dentry))</div><div class='del'>-		goto out4;</div><div class='del'>-	error = -EBUSY;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	if (new_mnt == root_mnt || old_mnt == root_mnt)</div><div class='del'>-		goto out4; /* loop, on the same file system  */</div><div class='del'>-	error = -EINVAL;</div><div class='add'>+		return -EBUSY; /* loop, on the same file system  */</div><div class='ctx'> 	if (!path_mounted(&amp;root))</div><div class='del'>-		goto out4; /* not a mountpoint */</div><div class='add'>+		return -EINVAL; /* not a mountpoint */</div><div class='ctx'> 	if (!mnt_has_parent(root_mnt))</div><div class='del'>-		goto out4; /* not attached */</div><div class='add'>+		return -EINVAL; /* absolute root */</div><div class='ctx'> 	if (!path_mounted(&amp;new))</div><div class='del'>-		goto out4; /* not a mountpoint */</div><div class='add'>+		return -EINVAL; /* not a mountpoint */</div><div class='ctx'> 	if (!mnt_has_parent(new_mnt))</div><div class='del'>-		goto out4; /* not attached */</div><div class='add'>+		return -EINVAL; /* absolute root */</div><div class='ctx'> 	/* make sure we can reach put_old from new_root */</div><div class='del'>-	if (!is_path_reachable(old_mnt, old.dentry, &amp;new))</div><div class='del'>-		goto out4;</div><div class='add'>+	if (!is_path_reachable(old_mnt, old_mp.mp-&gt;m_dentry, &amp;new))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	/* make certain new is below the root */</div><div class='ctx'> 	if (!is_path_reachable(new_mnt, new.dentry, &amp;root))</div><div class='del'>-		goto out4;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	lock_mount_hash();</div><div class='ctx'> 	umount_mnt(new_mnt);</div><div class='del'>-	root_mp = unhash_mnt(root_mnt);  /* we'll need its mountpoint */</div><div class='ctx'> 	if (root_mnt-&gt;mnt.mnt_flags &amp; MNT_LOCKED) {</div><div class='ctx'> 		new_mnt-&gt;mnt.mnt_flags |= MNT_LOCKED;</div><div class='ctx'> 		root_mnt-&gt;mnt.mnt_flags &amp;= ~MNT_LOCKED;</div><div class='ctx'> 	}</div><div class='del'>-	/* mount old root on put_old */</div><div class='del'>-	attach_mnt(root_mnt, old_mnt, old_mp, false);</div><div class='ctx'> 	/* mount new_root on / */</div><div class='del'>-	attach_mnt(new_mnt, root_parent, root_mp, false);</div><div class='del'>-	mnt_add_count(root_parent, -1);</div><div class='add'>+	attach_mnt(new_mnt, root_parent, root_mnt-&gt;mnt_mp);</div><div class='add'>+	umount_mnt(root_mnt);</div><div class='add'>+	/* mount old root on put_old */</div><div class='add'>+	attach_mnt(root_mnt, old_mnt, old_mp.mp);</div><div class='ctx'> 	touch_mnt_namespace(current-&gt;nsproxy-&gt;mnt_ns);</div><div class='ctx'> 	/* A moved mount should not expire automatically */</div><div class='ctx'> 	list_del_init(&amp;new_mnt-&gt;mnt_expire);</div><div class='del'>-	put_mountpoint(root_mp);</div><div class='ctx'> 	unlock_mount_hash();</div><div class='add'>+	mnt_notify_add(root_mnt);</div><div class='add'>+	mnt_notify_add(new_mnt);</div><div class='ctx'> 	chroot_fs_refs(&amp;root, &amp;new);</div><div class='del'>-	error = 0;</div><div class='del'>-out4:</div><div class='del'>-	unlock_mount(old_mp);</div><div class='del'>-	if (!error)</div><div class='del'>-		mntput_no_expire(ex_parent);</div><div class='del'>-out3:</div><div class='del'>-	path_put(&amp;root);</div><div class='del'>-out2:</div><div class='del'>-	path_put(&amp;old);</div><div class='del'>-out1:</div><div class='del'>-	path_put(&amp;new);</div><div class='del'>-out0:</div><div class='del'>-	return error;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int recalc_flags(struct mount_kattr *kattr, struct mount *mnt)</div><div class='hunk'>@@ -4303,17 +4635,20 @@ static int can_idmap_mount(const struct mount_kattr *kattr, struct mount *mnt)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Once a mount has been idmapped we don't allow it to change its</div><div class='del'>-	 * mapping. It makes things simpler and callers can just create</div><div class='del'>-	 * another bind-mount they can idmap if they want to.</div><div class='add'>+	 * We only allow an mount to change it's idmapping if it has</div><div class='add'>+	 * never been accessible to userspace.</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_idmapped_mnt(m))</div><div class='add'>+	if (!(kattr-&gt;kflags &amp; MOUNT_KATTR_IDMAP_REPLACE) &amp;&amp; is_idmapped_mnt(m))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/* The underlying filesystem doesn't support idmapped mounts yet. */</div><div class='ctx'> 	if (!(m-&gt;mnt_sb-&gt;s_type-&gt;fs_flags &amp; FS_ALLOW_IDMAP))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* The filesystem has turned off idmapped mounts. */</div><div class='add'>+	if (m-&gt;mnt_sb-&gt;s_iflags &amp; SB_I_NOIDMAP)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	/* We're not controlling the superblock. */</div><div class='ctx'> 	if (!ns_capable(fs_userns, CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -4359,52 +4694,36 @@ static int mount_setattr_prepare(struct mount_kattr *kattr, struct mount *mnt)</div><div class='ctx'> </div><div class='ctx'> 		if (!mnt_allow_writers(kattr, m)) {</div><div class='ctx'> 			err = mnt_hold_writers(m);</div><div class='del'>-			if (err)</div><div class='add'>+			if (err) {</div><div class='add'>+				m = next_mnt(m, mnt);</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!kattr-&gt;recurse)</div><div class='add'>+		if (!(kattr-&gt;kflags &amp; MOUNT_KATTR_RECURSE))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		struct mount *p;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If we had to call mnt_hold_writers() MNT_WRITE_HOLD will</div><div class='del'>-		 * be set in @mnt_flags. The loop unsets MNT_WRITE_HOLD for all</div><div class='del'>-		 * mounts and needs to take care to include the first mount.</div><div class='del'>-		 */</div><div class='del'>-		for (p = mnt; p; p = next_mnt(p, mnt)) {</div><div class='del'>-			/* If we had to hold writers unblock them. */</div><div class='del'>-			if (p-&gt;mnt.mnt_flags &amp; MNT_WRITE_HOLD)</div><div class='del'>-				mnt_unhold_writers(p);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * We're done once the first mount we changed got</div><div class='del'>-			 * MNT_WRITE_HOLD unset.</div><div class='del'>-			 */</div><div class='del'>-			if (p == m)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+		/* undo all mnt_hold_writers() we'd done */</div><div class='add'>+		for (struct mount *p = mnt; p != m; p = next_mnt(p, mnt))</div><div class='add'>+			mnt_unhold_writers(p);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void do_idmap_mount(const struct mount_kattr *kattr, struct mount *mnt)</div><div class='ctx'> {</div><div class='add'>+	struct mnt_idmap *old_idmap;</div><div class='add'>+</div><div class='ctx'> 	if (!kattr-&gt;mnt_idmap)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Pairs with smp_load_acquire() in mnt_idmap().</div><div class='del'>-	 *</div><div class='del'>-	 * Since we only allow a mount to change the idmapping once and</div><div class='del'>-	 * verified this in can_idmap_mount() we know that the mount has</div><div class='del'>-	 * @nop_mnt_idmap attached to it. So there's no need to drop any</div><div class='del'>-	 * references.</div><div class='del'>-	 */</div><div class='add'>+	old_idmap = mnt_idmap(&amp;mnt-&gt;mnt);</div><div class='add'>+</div><div class='add'>+	/* Pairs with smp_load_acquire() in mnt_idmap(). */</div><div class='ctx'> 	smp_store_release(&amp;mnt-&gt;mnt.mnt_idmap, mnt_idmap_get(kattr-&gt;mnt_idmap));</div><div class='add'>+	mnt_idmap_put(old_idmap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mount_setattr_commit(struct mount_kattr *kattr, struct mount *mnt)</div><div class='hunk'>@@ -4419,18 +4738,17 @@ static void mount_setattr_commit(struct mount_kattr *kattr, struct mount *mnt)</div><div class='ctx'> 		WRITE_ONCE(m-&gt;mnt.mnt_flags, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* If we had to hold writers unblock them. */</div><div class='del'>-		if (m-&gt;mnt.mnt_flags &amp; MNT_WRITE_HOLD)</div><div class='del'>-			mnt_unhold_writers(m);</div><div class='add'>+		mnt_unhold_writers(m);</div><div class='ctx'> </div><div class='ctx'> 		if (kattr-&gt;propagation)</div><div class='ctx'> 			change_mnt_propagation(m, kattr-&gt;propagation);</div><div class='del'>-		if (!kattr-&gt;recurse)</div><div class='add'>+		if (!(kattr-&gt;kflags &amp; MOUNT_KATTR_RECURSE))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	touch_mnt_namespace(mnt-&gt;mnt_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_mount_setattr(struct path *path, struct mount_kattr *kattr)</div><div class='add'>+static int do_mount_setattr(const struct path *path, struct mount_kattr *kattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mount *mnt = real_mount(path-&gt;mnt);</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -4454,7 +4772,7 @@ static int do_mount_setattr(struct path *path, struct mount_kattr *kattr)</div><div class='ctx'> 		 */</div><div class='ctx'> 		namespace_lock();</div><div class='ctx'> 		if (kattr-&gt;propagation == MS_SHARED) {</div><div class='del'>-			err = invent_group_ids(mnt, kattr-&gt;recurse);</div><div class='add'>+			err = invent_group_ids(mnt, kattr-&gt;kflags &amp; MOUNT_KATTR_RECURSE);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				namespace_unlock();</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -4465,17 +4783,7 @@ static int do_mount_setattr(struct path *path, struct mount_kattr *kattr)</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	lock_mount_hash();</div><div class='ctx'> </div><div class='del'>-	/* Ensure that this isn't anything purely vfs internal. */</div><div class='del'>-	if (!is_mounted(&amp;mnt-&gt;mnt))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If this is an attached mount make sure it's located in the callers</div><div class='del'>-	 * mount namespace. If it's not don't let the caller interact with it.</div><div class='del'>-	 * If this is a detached mount make sure it has an anonymous mount</div><div class='del'>-	 * namespace attached to it, i.e. we've created it via OPEN_TREE_CLONE.</div><div class='del'>-	 */</div><div class='del'>-	if (!(mnt_has_parent(mnt) ? check_mnt(mnt) : is_anon_ns(mnt-&gt;mnt_ns)))</div><div class='add'>+	if (!anon_ns_root(mnt) &amp;&amp; !check_mnt(mnt))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4500,41 +4808,45 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int build_mount_idmapped(const struct mount_attr *attr, size_t usize,</div><div class='del'>-				struct mount_kattr *kattr, unsigned int flags)</div><div class='add'>+				struct mount_kattr *kattr)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct ns_common *ns;</div><div class='ctx'> 	struct user_namespace *mnt_userns;</div><div class='del'>-	struct fd f;</div><div class='ctx'> </div><div class='ctx'> 	if (!((attr-&gt;attr_set | attr-&gt;attr_clr) &amp; MOUNT_ATTR_IDMAP))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We currently do not support clearing an idmapped mount. If this ever</div><div class='del'>-	 * is a use-case we can revisit this but for now let's keep it simple</div><div class='del'>-	 * and not allow it.</div><div class='del'>-	 */</div><div class='del'>-	if (attr-&gt;attr_clr &amp; MOUNT_ATTR_IDMAP)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (attr-&gt;attr_clr &amp; MOUNT_ATTR_IDMAP) {</div><div class='add'>+		/*</div><div class='add'>+		 * We can only remove an idmapping if it's never been</div><div class='add'>+		 * exposed to userspace.</div><div class='add'>+		 */</div><div class='add'>+		if (!(kattr-&gt;kflags &amp; MOUNT_KATTR_IDMAP_REPLACE))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Removal of idmappings is equivalent to setting</div><div class='add'>+		 * nop_mnt_idmap.</div><div class='add'>+		 */</div><div class='add'>+		if (!(attr-&gt;attr_set &amp; MOUNT_ATTR_IDMAP)) {</div><div class='add'>+			kattr-&gt;mnt_idmap = &amp;nop_mnt_idmap;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;userns_fd &gt; INT_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(attr-&gt;userns_fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	CLASS(fd, f)(attr-&gt;userns_fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (!proc_ns_file(f.file)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out_fput;</div><div class='del'>-	}</div><div class='add'>+	if (!proc_ns_file(fd_file(f)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ns = get_proc_ns(file_inode(f.file));</div><div class='del'>-	if (ns-&gt;ops-&gt;type != CLONE_NEWUSER) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out_fput;</div><div class='del'>-	}</div><div class='add'>+	ns = get_proc_ns(file_inode(fd_file(f)));</div><div class='add'>+	if (ns-&gt;ns_type != CLONE_NEWUSER)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The initial idmapping cannot be used to create an idmapped</div><div class='hunk'>@@ -4545,41 +4857,20 @@ static int build_mount_idmapped(const struct mount_attr *attr, size_t usize,</div><div class='ctx'> 	 * result.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mnt_userns = container_of(ns, struct user_namespace, ns);</div><div class='del'>-	if (mnt_userns == &amp;init_user_ns) {</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		goto out_fput;</div><div class='del'>-	}</div><div class='add'>+	if (mnt_userns == &amp;init_user_ns)</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/* We're not controlling the target namespace. */</div><div class='del'>-	if (!ns_capable(mnt_userns, CAP_SYS_ADMIN)) {</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		goto out_fput;</div><div class='del'>-	}</div><div class='add'>+	if (!ns_capable(mnt_userns, CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	kattr-&gt;mnt_userns = get_user_ns(mnt_userns);</div><div class='del'>-</div><div class='del'>-out_fput:</div><div class='del'>-	fdput(f);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int build_mount_kattr(const struct mount_attr *attr, size_t usize,</div><div class='del'>-			     struct mount_kattr *kattr, unsigned int flags)</div><div class='add'>+			     struct mount_kattr *kattr)</div><div class='ctx'> {</div><div class='del'>-	unsigned int lookup_flags = LOOKUP_AUTOMOUNT | LOOKUP_FOLLOW;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; AT_NO_AUTOMOUNT)</div><div class='del'>-		lookup_flags &amp;= ~LOOKUP_AUTOMOUNT;</div><div class='del'>-	if (flags &amp; AT_SYMLINK_NOFOLLOW)</div><div class='del'>-		lookup_flags &amp;= ~LOOKUP_FOLLOW;</div><div class='del'>-	if (flags &amp; AT_EMPTY_PATH)</div><div class='del'>-		lookup_flags |= LOOKUP_EMPTY;</div><div class='del'>-</div><div class='del'>-	*kattr = (struct mount_kattr) {</div><div class='del'>-		.lookup_flags	= lookup_flags,</div><div class='del'>-		.recurse	= !!(flags &amp; AT_RECURSIVE),</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	if (attr-&gt;propagation &amp; ~MOUNT_SETATTR_PROPAGATION_FLAGS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (hweight32(attr-&gt;propagation &amp; MOUNT_SETATTR_PROPAGATION_FLAGS) &gt; 1)</div><div class='hunk'>@@ -4627,35 +4918,28 @@ static int build_mount_kattr(const struct mount_attr *attr, size_t usize,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return build_mount_idmapped(attr, usize, kattr, flags);</div><div class='add'>+	return build_mount_idmapped(attr, usize, kattr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void finish_mount_kattr(struct mount_kattr *kattr)</div><div class='ctx'> {</div><div class='del'>-	put_user_ns(kattr-&gt;mnt_userns);</div><div class='del'>-	kattr-&gt;mnt_userns = NULL;</div><div class='add'>+	if (kattr-&gt;mnt_userns) {</div><div class='add'>+		put_user_ns(kattr-&gt;mnt_userns);</div><div class='add'>+		kattr-&gt;mnt_userns = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (kattr-&gt;mnt_idmap)</div><div class='ctx'> 		mnt_idmap_put(kattr-&gt;mnt_idmap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SYSCALL_DEFINE5(mount_setattr, int, dfd, const char __user *, path,</div><div class='del'>-		unsigned int, flags, struct mount_attr __user *, uattr,</div><div class='del'>-		size_t, usize)</div><div class='add'>+static int wants_mount_setattr(struct mount_attr __user *uattr, size_t usize,</div><div class='add'>+			       struct mount_kattr *kattr)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct path target;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct mount_attr attr;</div><div class='del'>-	struct mount_kattr kattr;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct mount_attr) != MOUNT_ATTR_SIZE_VER0);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ~(AT_EMPTY_PATH |</div><div class='del'>-		      AT_RECURSIVE |</div><div class='del'>-		      AT_SYMLINK_NOFOLLOW |</div><div class='del'>-		      AT_NO_AUTOMOUNT))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(usize &gt; PAGE_SIZE))</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> 	if (unlikely(usize &lt; MOUNT_ATTR_SIZE_VER0))</div><div class='hunk'>@@ -4664,18 +4948,54 @@ SYSCALL_DEFINE5(mount_setattr, int, dfd, const char __user *, path,</div><div class='ctx'> 	if (!may_mount())</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	err = copy_struct_from_user(&amp;attr, sizeof(attr), uattr, usize);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	ret = copy_struct_from_user(&amp;attr, sizeof(attr), uattr, usize);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't bother walking through the mounts if this is a nop. */</div><div class='ctx'> 	if (attr.attr_set == 0 &amp;&amp;</div><div class='ctx'> 	    attr.attr_clr == 0 &amp;&amp;</div><div class='ctx'> 	    attr.propagation == 0)</div><div class='del'>-		return 0;</div><div class='add'>+		return 0; /* Tell caller to not bother. */</div><div class='ctx'> </div><div class='del'>-	err = build_mount_kattr(&amp;attr, usize, &amp;kattr, flags);</div><div class='del'>-	if (err)</div><div class='add'>+	ret = build_mount_kattr(&amp;attr, usize, kattr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SYSCALL_DEFINE5(mount_setattr, int, dfd, const char __user *, path,</div><div class='add'>+		unsigned int, flags, struct mount_attr __user *, uattr,</div><div class='add'>+		size_t, usize)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct path target;</div><div class='add'>+	struct mount_kattr kattr;</div><div class='add'>+	unsigned int lookup_flags = LOOKUP_AUTOMOUNT | LOOKUP_FOLLOW;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ~(AT_EMPTY_PATH |</div><div class='add'>+		      AT_RECURSIVE |</div><div class='add'>+		      AT_SYMLINK_NOFOLLOW |</div><div class='add'>+		      AT_NO_AUTOMOUNT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; AT_NO_AUTOMOUNT)</div><div class='add'>+		lookup_flags &amp;= ~LOOKUP_AUTOMOUNT;</div><div class='add'>+	if (flags &amp; AT_SYMLINK_NOFOLLOW)</div><div class='add'>+		lookup_flags &amp;= ~LOOKUP_FOLLOW;</div><div class='add'>+	if (flags &amp; AT_EMPTY_PATH)</div><div class='add'>+		lookup_flags |= LOOKUP_EMPTY;</div><div class='add'>+</div><div class='add'>+	kattr = (struct mount_kattr) {</div><div class='add'>+		.lookup_flags	= lookup_flags,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (flags &amp; AT_RECURSIVE)</div><div class='add'>+		kattr.kflags |= MOUNT_KATTR_RECURSE;</div><div class='add'>+</div><div class='add'>+	err = wants_mount_setattr(uattr, usize, &amp;kattr);</div><div class='add'>+	if (err &lt;= 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = user_path_at(dfd, path, kattr.lookup_flags, &amp;target);</div><div class='hunk'>@@ -4687,6 +5007,39 @@ SYSCALL_DEFINE5(mount_setattr, int, dfd, const char __user *, path,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SYSCALL_DEFINE5(open_tree_attr, int, dfd, const char __user *, filename,</div><div class='add'>+		unsigned, flags, struct mount_attr __user *, uattr,</div><div class='add'>+		size_t, usize)</div><div class='add'>+{</div><div class='add'>+	if (!uattr &amp;&amp; usize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	FD_PREPARE(fdf, flags, vfs_open_tree(dfd, filename, flags));</div><div class='add'>+	if (fdf.err)</div><div class='add'>+		return fdf.err;</div><div class='add'>+</div><div class='add'>+	if (uattr) {</div><div class='add'>+		struct mount_kattr kattr = {};</div><div class='add'>+		struct file *file = fd_prepare_file(fdf);</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; OPEN_TREE_CLONE)</div><div class='add'>+			kattr.kflags = MOUNT_KATTR_IDMAP_REPLACE;</div><div class='add'>+		if (flags &amp; AT_RECURSIVE)</div><div class='add'>+			kattr.kflags |= MOUNT_KATTR_RECURSE;</div><div class='add'>+</div><div class='add'>+		ret = wants_mount_setattr(uattr, usize, &amp;kattr);</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			ret = do_mount_setattr(&amp;file-&gt;f_path, &amp;kattr);</div><div class='add'>+			finish_mount_kattr(&amp;kattr);</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fd_publish(fdf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int show_path(struct seq_file *m, struct dentry *root)</div><div class='ctx'> {</div><div class='ctx'> 	if (root-&gt;d_sb-&gt;s_op-&gt;show_path)</div><div class='hunk'>@@ -4710,10 +5063,13 @@ struct kstatmount {</div><div class='ctx'> 	struct statmount __user *buf;</div><div class='ctx'> 	size_t bufsize;</div><div class='ctx'> 	struct vfsmount *mnt;</div><div class='add'>+	struct mnt_idmap *idmap;</div><div class='ctx'> 	u64 mask;</div><div class='ctx'> 	struct path root;</div><div class='del'>-	struct statmount sm;</div><div class='ctx'> 	struct seq_file seq;</div><div class='add'>+</div><div class='add'>+	/* Must be last --ends in a flexible-array member. */</div><div class='add'>+	struct statmount sm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 mnt_to_attr_flags(struct vfsmount *mnt)</div><div class='hunk'>@@ -4763,6 +5119,12 @@ static u64 mnt_to_propagation_flags(struct mount *m)</div><div class='ctx'> 	return propagation;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u64 vfsmount_to_propagation_flags(struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	return mnt_to_propagation_flags(real_mount(mnt));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(vfsmount_to_propagation_flags);</div><div class='add'>+</div><div class='ctx'> static void statmount_sb_basic(struct kstatmount *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = s-&gt;mnt-&gt;mnt_sb;</div><div class='hunk'>@@ -4785,7 +5147,7 @@ static void statmount_mnt_basic(struct kstatmount *s)</div><div class='ctx'> 	s-&gt;sm.mnt_parent_id_old = m-&gt;mnt_parent-&gt;mnt_id;</div><div class='ctx'> 	s-&gt;sm.mnt_attr = mnt_to_attr_flags(&amp;m-&gt;mnt);</div><div class='ctx'> 	s-&gt;sm.mnt_propagation = mnt_to_propagation_flags(m);</div><div class='del'>-	s-&gt;sm.mnt_peer_group = IS_MNT_SHARED(m) ? m-&gt;mnt_group_id : 0;</div><div class='add'>+	s-&gt;sm.mnt_peer_group = m-&gt;mnt_group_id;</div><div class='ctx'> 	s-&gt;sm.mnt_master = IS_MNT_SLAVE(m) ? m-&gt;mnt_master-&gt;mnt_group_id : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4838,31 +5200,253 @@ static int statmount_fs_type(struct kstatmount *s, struct seq_file *seq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int statmount_string(struct kstatmount *s, u64 flag)</div><div class='add'>+static void statmount_fs_subtype(struct kstatmount *s, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = s-&gt;mnt-&gt;mnt_sb;</div><div class='add'>+</div><div class='add'>+	if (sb-&gt;s_subtype)</div><div class='add'>+		seq_puts(seq, sb-&gt;s_subtype);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int statmount_sb_source(struct kstatmount *s, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = s-&gt;mnt-&gt;mnt_sb;</div><div class='add'>+	struct mount *r = real_mount(s-&gt;mnt);</div><div class='add'>+</div><div class='add'>+	if (sb-&gt;s_op-&gt;show_devname) {</div><div class='add'>+		size_t start = seq-&gt;count;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = sb-&gt;s_op-&gt;show_devname(seq, s-&gt;mnt-&gt;mnt_root);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (unlikely(seq_has_overflowed(seq)))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		/* Unescape the result */</div><div class='add'>+		seq-&gt;buf[seq-&gt;count] = '\0';</div><div class='add'>+		seq-&gt;count = start;</div><div class='add'>+		seq_commit(seq, string_unescape_inplace(seq-&gt;buf + start, UNESCAPE_OCTAL));</div><div class='add'>+	} else {</div><div class='add'>+		seq_puts(seq, r-&gt;mnt_devname);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void statmount_mnt_ns_id(struct kstatmount *s, struct mnt_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	s-&gt;sm.mask |= STATMOUNT_MNT_NS_ID;</div><div class='add'>+	s-&gt;sm.mnt_ns_id = ns-&gt;ns.ns_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int statmount_mnt_opts(struct kstatmount *s, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt = s-&gt;mnt;</div><div class='add'>+	struct super_block *sb = mnt-&gt;mnt_sb;</div><div class='add'>+	size_t start = seq-&gt;count;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = security_sb_show_options(seq, sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (sb-&gt;s_op-&gt;show_options) {</div><div class='add'>+		err = sb-&gt;s_op-&gt;show_options(seq, mnt-&gt;mnt_root);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(seq_has_overflowed(seq)))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	if (seq-&gt;count == start)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* skip leading comma */</div><div class='add'>+	memmove(seq-&gt;buf + start, seq-&gt;buf + start + 1,</div><div class='add'>+		seq-&gt;count - start - 1);</div><div class='add'>+	seq-&gt;count--;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int statmount_opt_process(struct seq_file *seq, size_t start)</div><div class='add'>+{</div><div class='add'>+	char *buf_end, *opt_end, *src, *dst;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(seq_has_overflowed(seq)))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf_end = seq-&gt;buf + seq-&gt;count;</div><div class='add'>+	dst = seq-&gt;buf + start;</div><div class='add'>+	src = dst + 1;	/* skip initial comma */</div><div class='add'>+</div><div class='add'>+	if (src &gt;= buf_end) {</div><div class='add'>+		seq-&gt;count = start;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*buf_end = '\0';</div><div class='add'>+	for (; src &lt; buf_end; src = opt_end + 1) {</div><div class='add'>+		opt_end = strchrnul(src, ',');</div><div class='add'>+		*opt_end = '\0';</div><div class='add'>+		dst += string_unescape(src, dst, 0, UNESCAPE_OCTAL) + 1;</div><div class='add'>+		if (WARN_ON_ONCE(++count == INT_MAX))</div><div class='add'>+			return -EOVERFLOW;</div><div class='add'>+	}</div><div class='add'>+	seq-&gt;count = dst - 1 - seq-&gt;buf;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int statmount_opt_array(struct kstatmount *s, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt = s-&gt;mnt;</div><div class='add'>+	struct super_block *sb = mnt-&gt;mnt_sb;</div><div class='add'>+	size_t start = seq-&gt;count;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!sb-&gt;s_op-&gt;show_options)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = sb-&gt;s_op-&gt;show_options(seq, mnt-&gt;mnt_root);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = statmount_opt_process(seq, start);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	s-&gt;sm.opt_num = err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int statmount_opt_sec_array(struct kstatmount *s, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt = s-&gt;mnt;</div><div class='add'>+	struct super_block *sb = mnt-&gt;mnt_sb;</div><div class='add'>+	size_t start = seq-&gt;count;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = security_sb_show_options(seq, sb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = statmount_opt_process(seq, start);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	s-&gt;sm.opt_sec_num = err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int statmount_mnt_uidmap(struct kstatmount *s, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = statmount_mnt_idmap(s-&gt;idmap, seq, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	s-&gt;sm.mnt_uidmap_num = ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Always raise STATMOUNT_MNT_UIDMAP even if there are no valid</div><div class='add'>+	 * mappings. This allows userspace to distinguish between a</div><div class='add'>+	 * non-idmapped mount and an idmapped mount where none of the</div><div class='add'>+	 * individual mappings are valid in the caller's idmapping.</div><div class='add'>+	 */</div><div class='add'>+	if (is_valid_mnt_idmap(s-&gt;idmap))</div><div class='add'>+		s-&gt;sm.mask |= STATMOUNT_MNT_UIDMAP;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int statmount_mnt_gidmap(struct kstatmount *s, struct seq_file *seq)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+</div><div class='add'>+	ret = statmount_mnt_idmap(s-&gt;idmap, seq, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	s-&gt;sm.mnt_gidmap_num = ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Always raise STATMOUNT_MNT_GIDMAP even if there are no valid</div><div class='add'>+	 * mappings. This allows userspace to distinguish between a</div><div class='add'>+	 * non-idmapped mount and an idmapped mount where none of the</div><div class='add'>+	 * individual mappings are valid in the caller's idmapping.</div><div class='add'>+	 */</div><div class='add'>+	if (is_valid_mnt_idmap(s-&gt;idmap))</div><div class='add'>+		s-&gt;sm.mask |= STATMOUNT_MNT_GIDMAP;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int statmount_string(struct kstatmount *s, u64 flag)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	size_t kbufsize;</div><div class='ctx'> 	struct seq_file *seq = &amp;s-&gt;seq;</div><div class='ctx'> 	struct statmount *sm = &amp;s-&gt;sm;</div><div class='add'>+	u32 start, *offp;</div><div class='add'>+</div><div class='add'>+	/* Reserve an empty string at the beginning for any unset offsets */</div><div class='add'>+	if (!seq-&gt;count)</div><div class='add'>+		seq_putc(seq, 0);</div><div class='add'>+</div><div class='add'>+	start = seq-&gt;count;</div><div class='ctx'> </div><div class='ctx'> 	switch (flag) {</div><div class='ctx'> 	case STATMOUNT_FS_TYPE:</div><div class='del'>-		sm-&gt;fs_type = seq-&gt;count;</div><div class='add'>+		offp = &amp;sm-&gt;fs_type;</div><div class='ctx'> 		ret = statmount_fs_type(s, seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STATMOUNT_MNT_ROOT:</div><div class='del'>-		sm-&gt;mnt_root = seq-&gt;count;</div><div class='add'>+		offp = &amp;sm-&gt;mnt_root;</div><div class='ctx'> 		ret = statmount_mnt_root(s, seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STATMOUNT_MNT_POINT:</div><div class='del'>-		sm-&gt;mnt_point = seq-&gt;count;</div><div class='add'>+		offp = &amp;sm-&gt;mnt_point;</div><div class='ctx'> 		ret = statmount_mnt_point(s, seq);</div><div class='ctx'> 		break;</div><div class='add'>+	case STATMOUNT_MNT_OPTS:</div><div class='add'>+		offp = &amp;sm-&gt;mnt_opts;</div><div class='add'>+		ret = statmount_mnt_opts(s, seq);</div><div class='add'>+		break;</div><div class='add'>+	case STATMOUNT_OPT_ARRAY:</div><div class='add'>+		offp = &amp;sm-&gt;opt_array;</div><div class='add'>+		ret = statmount_opt_array(s, seq);</div><div class='add'>+		break;</div><div class='add'>+	case STATMOUNT_OPT_SEC_ARRAY:</div><div class='add'>+		offp = &amp;sm-&gt;opt_sec_array;</div><div class='add'>+		ret = statmount_opt_sec_array(s, seq);</div><div class='add'>+		break;</div><div class='add'>+	case STATMOUNT_FS_SUBTYPE:</div><div class='add'>+		offp = &amp;sm-&gt;fs_subtype;</div><div class='add'>+		statmount_fs_subtype(s, seq);</div><div class='add'>+		break;</div><div class='add'>+	case STATMOUNT_SB_SOURCE:</div><div class='add'>+		offp = &amp;sm-&gt;sb_source;</div><div class='add'>+		ret = statmount_sb_source(s, seq);</div><div class='add'>+		break;</div><div class='add'>+	case STATMOUNT_MNT_UIDMAP:</div><div class='add'>+		offp = &amp;sm-&gt;mnt_uidmap;</div><div class='add'>+		ret = statmount_mnt_uidmap(s, seq);</div><div class='add'>+		break;</div><div class='add'>+	case STATMOUNT_MNT_GIDMAP:</div><div class='add'>+		offp = &amp;sm-&gt;mnt_gidmap;</div><div class='add'>+		ret = statmount_mnt_gidmap(s, seq);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(true);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If nothing was emitted, return to avoid setting the flag</div><div class='add'>+	 * and terminating the buffer.</div><div class='add'>+	 */</div><div class='add'>+	if (seq-&gt;count == start)</div><div class='add'>+		return ret;</div><div class='ctx'> 	if (unlikely(check_add_overflow(sizeof(*sm), seq-&gt;count, &amp;kbufsize)))</div><div class='ctx'> 		return -EOVERFLOW;</div><div class='ctx'> 	if (kbufsize &gt;= s-&gt;bufsize)</div><div class='hunk'>@@ -4877,6 +5461,7 @@ static int statmount_string(struct kstatmount *s, u64 flag)</div><div class='ctx'> </div><div class='ctx'> 	seq-&gt;buf[seq-&gt;count++] = '\0';</div><div class='ctx'> 	sm-&gt;mask |= flag;</div><div class='add'>+	*offp = start;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4898,29 +5483,122 @@ static int copy_statmount_to_user(struct kstatmount *s)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_statmount(struct kstatmount *s)</div><div class='add'>+static struct mount *listmnt_next(struct mount *curr, bool reverse)</div><div class='ctx'> {</div><div class='del'>-	struct mount *m = real_mount(s-&gt;mnt);</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+</div><div class='add'>+	if (reverse)</div><div class='add'>+		node = rb_prev(&amp;curr-&gt;mnt_node);</div><div class='add'>+	else</div><div class='add'>+		node = rb_next(&amp;curr-&gt;mnt_node);</div><div class='add'>+</div><div class='add'>+	return node_to_mount(node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int grab_requested_root(struct mnt_namespace *ns, struct path *root)</div><div class='add'>+{</div><div class='add'>+	struct mount *first, *child;</div><div class='add'>+</div><div class='add'>+	rwsem_assert_held(&amp;namespace_sem);</div><div class='add'>+</div><div class='add'>+	/* We're looking at our own ns, just use get_fs_root. */</div><div class='add'>+	if (ns == current-&gt;nsproxy-&gt;mnt_ns) {</div><div class='add'>+		get_fs_root(current-&gt;fs, root);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have to find the first mount in our ns and use that, however it</div><div class='add'>+	 * may not exist, so handle that properly.</div><div class='add'>+	 */</div><div class='add'>+	if (mnt_ns_empty(ns))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	first = child = ns-&gt;root;</div><div class='add'>+	for (;;) {</div><div class='add'>+		child = listmnt_next(child, false);</div><div class='add'>+		if (!child)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		if (child-&gt;mnt_parent == first)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	root-&gt;mnt = mntget(&amp;child-&gt;mnt);</div><div class='add'>+	root-&gt;dentry = dget(root-&gt;mnt-&gt;mnt_root);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This must be updated whenever a new flag is added */</div><div class='add'>+#define STATMOUNT_SUPPORTED (STATMOUNT_SB_BASIC | \</div><div class='add'>+			     STATMOUNT_MNT_BASIC | \</div><div class='add'>+			     STATMOUNT_PROPAGATE_FROM | \</div><div class='add'>+			     STATMOUNT_MNT_ROOT | \</div><div class='add'>+			     STATMOUNT_MNT_POINT | \</div><div class='add'>+			     STATMOUNT_FS_TYPE | \</div><div class='add'>+			     STATMOUNT_MNT_NS_ID | \</div><div class='add'>+			     STATMOUNT_MNT_OPTS | \</div><div class='add'>+			     STATMOUNT_FS_SUBTYPE | \</div><div class='add'>+			     STATMOUNT_SB_SOURCE | \</div><div class='add'>+			     STATMOUNT_OPT_ARRAY | \</div><div class='add'>+			     STATMOUNT_OPT_SEC_ARRAY | \</div><div class='add'>+			     STATMOUNT_SUPPORTED_MASK | \</div><div class='add'>+			     STATMOUNT_MNT_UIDMAP | \</div><div class='add'>+			     STATMOUNT_MNT_GIDMAP)</div><div class='add'>+</div><div class='add'>+/* locks: namespace_shared */</div><div class='add'>+static int do_statmount(struct kstatmount *s, u64 mnt_id, u64 mnt_ns_id,</div><div class='add'>+			struct mnt_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	struct mount *m;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Has the namespace already been emptied? */</div><div class='add'>+	if (mnt_ns_id &amp;&amp; mnt_ns_empty(ns))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	s-&gt;mnt = lookup_mnt_in_ns(mnt_id, ns);</div><div class='add'>+	if (!s-&gt;mnt)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = grab_requested_root(ns, &amp;s-&gt;root);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't trigger audit denials. We just want to determine what</div><div class='ctx'> 	 * mounts to show users.</div><div class='ctx'> 	 */</div><div class='add'>+	m = real_mount(s-&gt;mnt);</div><div class='ctx'> 	if (!is_path_reachable(m, m-&gt;mnt.mnt_root, &amp;s-&gt;root) &amp;&amp;</div><div class='del'>-	    !ns_capable_noaudit(&amp;init_user_ns, CAP_SYS_ADMIN))</div><div class='add'>+	    !ns_capable_noaudit(ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	err = security_sb_statfs(s-&gt;mnt-&gt;mnt_root);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (s-&gt;mask &amp; STATMOUNT_SB_BASIC)</div><div class='del'>-		statmount_sb_basic(s);</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * Note that mount properties in mnt-&gt;mnt_flags, mnt-&gt;mnt_idmap</div><div class='add'>+	 * can change concurrently as we only hold the read-side of the</div><div class='add'>+	 * namespace semaphore and mount properties may change with only</div><div class='add'>+	 * the mount lock held.</div><div class='add'>+	 *</div><div class='add'>+	 * We could sample the mount lock sequence counter to detect</div><div class='add'>+	 * those changes and retry. But it's not worth it. Worst that</div><div class='add'>+	 * happens is that the mnt-&gt;mnt_idmap pointer is already changed</div><div class='add'>+	 * while mnt-&gt;mnt_flags isn't or vica versa. So what.</div><div class='add'>+	 *</div><div class='add'>+	 * Both mnt-&gt;mnt_flags and mnt-&gt;mnt_idmap are set and retrieved</div><div class='add'>+	 * via READ_ONCE()/WRITE_ONCE() and guard against theoretical</div><div class='add'>+	 * torn read/write. That's all we care about right now.</div><div class='add'>+	 */</div><div class='add'>+	s-&gt;idmap = mnt_idmap(s-&gt;mnt);</div><div class='ctx'> 	if (s-&gt;mask &amp; STATMOUNT_MNT_BASIC)</div><div class='ctx'> 		statmount_mnt_basic(s);</div><div class='ctx'> </div><div class='add'>+	if (s-&gt;mask &amp; STATMOUNT_SB_BASIC)</div><div class='add'>+		statmount_sb_basic(s);</div><div class='add'>+</div><div class='ctx'> 	if (s-&gt;mask &amp; STATMOUNT_PROPAGATE_FROM)</div><div class='ctx'> 		statmount_propagate_from(s);</div><div class='ctx'> </div><div class='hunk'>@@ -4933,9 +5611,41 @@ static int do_statmount(struct kstatmount *s)</div><div class='ctx'> 	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_MNT_POINT)</div><div class='ctx'> 		err = statmount_string(s, STATMOUNT_MNT_POINT);</div><div class='ctx'> </div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_MNT_OPTS)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_MNT_OPTS);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_OPT_ARRAY)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_OPT_ARRAY);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_OPT_SEC_ARRAY)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_OPT_SEC_ARRAY);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_FS_SUBTYPE)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_FS_SUBTYPE);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_SB_SOURCE)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_SB_SOURCE);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_MNT_UIDMAP)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_MNT_UIDMAP);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_MNT_GIDMAP)</div><div class='add'>+		err = statmount_string(s, STATMOUNT_MNT_GIDMAP);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_MNT_NS_ID)</div><div class='add'>+		statmount_mnt_ns_id(s, ns);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; s-&gt;mask &amp; STATMOUNT_SUPPORTED_MASK) {</div><div class='add'>+		s-&gt;sm.mask |= STATMOUNT_SUPPORTED_MASK;</div><div class='add'>+		s-&gt;sm.supported_mask = STATMOUNT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	/* Are there bits in the return mask not present in STATMOUNT_SUPPORTED? */</div><div class='add'>+	WARN_ON_ONCE(~STATMOUNT_SUPPORTED &amp; s-&gt;sm.mask);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4950,6 +5660,12 @@ static inline bool retry_statmount(const long ret, size_t *seq_size)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define STATMOUNT_STRING_REQ (STATMOUNT_MNT_ROOT | STATMOUNT_MNT_POINT | \</div><div class='add'>+			      STATMOUNT_FS_TYPE | STATMOUNT_MNT_OPTS | \</div><div class='add'>+			      STATMOUNT_FS_SUBTYPE | STATMOUNT_SB_SOURCE | \</div><div class='add'>+			      STATMOUNT_OPT_ARRAY | STATMOUNT_OPT_SEC_ARRAY | \</div><div class='add'>+			      STATMOUNT_MNT_UIDMAP | STATMOUNT_MNT_GIDMAP)</div><div class='add'>+</div><div class='ctx'> static int prepare_kstatmount(struct kstatmount *ks, struct mnt_id_req *kreq,</div><div class='ctx'> 			      struct statmount __user *buf, size_t bufsize,</div><div class='ctx'> 			      size_t seq_size)</div><div class='hunk'>@@ -4961,10 +5677,18 @@ static int prepare_kstatmount(struct kstatmount *ks, struct mnt_id_req *kreq,</div><div class='ctx'> 	ks-&gt;mask = kreq-&gt;param;</div><div class='ctx'> 	ks-&gt;buf = buf;</div><div class='ctx'> 	ks-&gt;bufsize = bufsize;</div><div class='del'>-	ks-&gt;seq.size = seq_size;</div><div class='del'>-	ks-&gt;seq.buf = kvmalloc(seq_size, GFP_KERNEL_ACCOUNT);</div><div class='del'>-	if (!ks-&gt;seq.buf)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (ks-&gt;mask &amp; STATMOUNT_STRING_REQ) {</div><div class='add'>+		if (bufsize == sizeof(ks-&gt;sm))</div><div class='add'>+			return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+		ks-&gt;seq.buf = kvmalloc(seq_size, GFP_KERNEL_ACCOUNT);</div><div class='add'>+		if (!ks-&gt;seq.buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		ks-&gt;seq.size = seq_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4974,7 +5698,7 @@ static int copy_mnt_id_req(const struct mnt_id_req __user *req,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t usize;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(sizeof(struct mnt_id_req) != MNT_ID_REQ_SIZE_VER0);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct mnt_id_req) != MNT_ID_REQ_SIZE_VER1);</div><div class='ctx'> </div><div class='ctx'> 	ret = get_user(usize, &amp;req-&gt;size);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -4987,18 +5711,58 @@ static int copy_mnt_id_req(const struct mnt_id_req __user *req,</div><div class='ctx'> 	ret = copy_struct_from_user(kreq, sizeof(*kreq), req, usize);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	if (kreq-&gt;spare != 0)</div><div class='add'>+	if (kreq-&gt;mnt_ns_fd != 0 &amp;&amp; kreq-&gt;mnt_ns_id)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* The first valid unique mount id is MNT_UNIQUE_ID_OFFSET + 1. */</div><div class='add'>+	if (kreq-&gt;mnt_id &lt;= MNT_UNIQUE_ID_OFFSET)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If the user requested a specific mount namespace id, look that up and return</div><div class='add'>+ * that, or if not simply grab a passive reference on our mount namespace and</div><div class='add'>+ * return that.</div><div class='add'>+ */</div><div class='add'>+static struct mnt_namespace *grab_requested_mnt_ns(const struct mnt_id_req *kreq)</div><div class='add'>+{</div><div class='add'>+	struct mnt_namespace *mnt_ns;</div><div class='add'>+</div><div class='add'>+	if (kreq-&gt;mnt_ns_id) {</div><div class='add'>+		mnt_ns = lookup_mnt_ns(kreq-&gt;mnt_ns_id);</div><div class='add'>+		if (!mnt_ns)</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+	} else if (kreq-&gt;mnt_ns_fd) {</div><div class='add'>+		struct ns_common *ns;</div><div class='add'>+</div><div class='add'>+		CLASS(fd, f)(kreq-&gt;mnt_ns_fd);</div><div class='add'>+		if (fd_empty(f))</div><div class='add'>+			return ERR_PTR(-EBADF);</div><div class='add'>+</div><div class='add'>+		if (!proc_ns_file(fd_file(f)))</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+		ns = get_proc_ns(file_inode(fd_file(f)));</div><div class='add'>+		if (ns-&gt;ns_type != CLONE_NEWNS)</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+		mnt_ns = to_mnt_ns(ns);</div><div class='add'>+		refcount_inc(&amp;mnt_ns-&gt;passive);</div><div class='add'>+	} else {</div><div class='add'>+		mnt_ns = current-&gt;nsproxy-&gt;mnt_ns;</div><div class='add'>+		refcount_inc(&amp;mnt_ns-&gt;passive);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mnt_ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SYSCALL_DEFINE4(statmount, const struct mnt_id_req __user *, req,</div><div class='ctx'> 		struct statmount __user *, buf, size_t, bufsize,</div><div class='ctx'> 		unsigned int, flags)</div><div class='ctx'> {</div><div class='del'>-	struct vfsmount *mnt;</div><div class='add'>+	struct mnt_namespace *ns __free(mnt_ns_release) = NULL;</div><div class='add'>+	struct kstatmount *ks __free(kfree) = NULL;</div><div class='ctx'> 	struct mnt_id_req kreq;</div><div class='del'>-	struct kstatmount ks;</div><div class='ctx'> 	/* We currently support retrieval of 3 strings. */</div><div class='ctx'> 	size_t seq_size = 3 * PATH_MAX;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -5010,64 +5774,101 @@ SYSCALL_DEFINE4(statmount, const struct mnt_id_req __user *, req,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ns = grab_requested_mnt_ns(&amp;kreq);</div><div class='add'>+	if (IS_ERR(ns))</div><div class='add'>+		return PTR_ERR(ns);</div><div class='add'>+</div><div class='add'>+	if (kreq.mnt_ns_id &amp;&amp; (ns != current-&gt;nsproxy-&gt;mnt_ns) &amp;&amp;</div><div class='add'>+	    !ns_capable_noaudit(ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ks = kmalloc(sizeof(*ks), GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!ks)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='del'>-	ret = prepare_kstatmount(&amp;ks, &amp;kreq, buf, bufsize, seq_size);</div><div class='add'>+	ret = prepare_kstatmount(ks, &amp;kreq, buf, bufsize, seq_size);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;namespace_sem);</div><div class='del'>-	mnt = lookup_mnt_in_ns(kreq.mnt_id, current-&gt;nsproxy-&gt;mnt_ns);</div><div class='del'>-	if (!mnt) {</div><div class='del'>-		up_read(&amp;namespace_sem);</div><div class='del'>-		kvfree(ks.seq.buf);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ks.mnt = mnt;</div><div class='del'>-	get_fs_root(current-&gt;fs, &amp;ks.root);</div><div class='del'>-	ret = do_statmount(&amp;ks);</div><div class='del'>-	path_put(&amp;ks.root);</div><div class='del'>-	up_read(&amp;namespace_sem);</div><div class='add'>+	scoped_guard(namespace_shared)</div><div class='add'>+		ret = do_statmount(ks, kreq.mnt_id, kreq.mnt_ns_id, ns);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = copy_statmount_to_user(&amp;ks);</div><div class='del'>-	kvfree(ks.seq.buf);</div><div class='add'>+		ret = copy_statmount_to_user(ks);</div><div class='add'>+	kvfree(ks-&gt;seq.buf);</div><div class='add'>+	path_put(&amp;ks-&gt;root);</div><div class='ctx'> 	if (retry_statmount(ret, &amp;seq_size))</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mount *listmnt_next(struct mount *curr)</div><div class='del'>-{</div><div class='del'>-	return node_to_mount(rb_next(&amp;curr-&gt;mnt_node));</div><div class='del'>-}</div><div class='add'>+struct klistmount {</div><div class='add'>+	u64 last_mnt_id;</div><div class='add'>+	u64 mnt_parent_id;</div><div class='add'>+	u64 *kmnt_ids;</div><div class='add'>+	u32 nr_mnt_ids;</div><div class='add'>+	struct mnt_namespace *ns;</div><div class='add'>+	struct path root;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static ssize_t do_listmount(struct mount *first, struct path *orig,</div><div class='del'>-			    u64 mnt_parent_id, u64 __user *mnt_ids,</div><div class='del'>-			    size_t nr_mnt_ids, const struct path *root)</div><div class='add'>+/* locks: namespace_shared */</div><div class='add'>+static ssize_t do_listmount(struct klistmount *kls, bool reverse)</div><div class='ctx'> {</div><div class='del'>-	struct mount *r;</div><div class='add'>+	struct mnt_namespace *ns = kls-&gt;ns;</div><div class='add'>+	u64 mnt_parent_id = kls-&gt;mnt_parent_id;</div><div class='add'>+	u64 last_mnt_id = kls-&gt;last_mnt_id;</div><div class='add'>+	u64 *mnt_ids = kls-&gt;kmnt_ids;</div><div class='add'>+	size_t nr_mnt_ids = kls-&gt;nr_mnt_ids;</div><div class='add'>+	struct path orig;</div><div class='add'>+	struct mount *r, *first;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='add'>+	rwsem_assert_held(&amp;namespace_sem);</div><div class='add'>+</div><div class='add'>+	ret = grab_requested_root(ns, &amp;kls-&gt;root);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mnt_parent_id == LSMT_ROOT) {</div><div class='add'>+		orig = kls-&gt;root;</div><div class='add'>+	} else {</div><div class='add'>+		orig.mnt = lookup_mnt_in_ns(mnt_parent_id, ns);</div><div class='add'>+		if (!orig.mnt)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		orig.dentry = orig.mnt-&gt;mnt_root;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't trigger audit denials. We just want to determine what</div><div class='ctx'> 	 * mounts to show users.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_path_reachable(real_mount(orig-&gt;mnt), orig-&gt;dentry, root) &amp;&amp;</div><div class='del'>-	    !ns_capable_noaudit(&amp;init_user_ns, CAP_SYS_ADMIN))</div><div class='add'>+	if (!is_path_reachable(real_mount(orig.mnt), orig.dentry, &amp;kls-&gt;root) &amp;&amp;</div><div class='add'>+	    !ns_capable_noaudit(ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	ret = security_sb_statfs(orig-&gt;dentry);</div><div class='add'>+	ret = security_sb_statfs(orig.dentry);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	for (ret = 0, r = first; r &amp;&amp; nr_mnt_ids; r = listmnt_next(r)) {</div><div class='add'>+	if (!last_mnt_id) {</div><div class='add'>+		if (reverse)</div><div class='add'>+			first = node_to_mount(ns-&gt;mnt_last_node);</div><div class='add'>+		else</div><div class='add'>+			first = node_to_mount(ns-&gt;mnt_first_node);</div><div class='add'>+	} else {</div><div class='add'>+		if (reverse)</div><div class='add'>+			first = mnt_find_id_at_reverse(ns, last_mnt_id - 1);</div><div class='add'>+		else</div><div class='add'>+			first = mnt_find_id_at(ns, last_mnt_id + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ret = 0, r = first; r &amp;&amp; nr_mnt_ids; r = listmnt_next(r, reverse)) {</div><div class='ctx'> 		if (r-&gt;mnt_id_unique == mnt_parent_id)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!is_path_reachable(r, r-&gt;mnt.mnt_root, orig))</div><div class='add'>+		if (!is_path_reachable(r, r-&gt;mnt.mnt_root, &amp;orig))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (put_user(r-&gt;mnt_id_unique, mnt_ids))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		*mnt_ids = r-&gt;mnt_id_unique;</div><div class='ctx'> 		mnt_ids++;</div><div class='ctx'> 		nr_mnt_ids--;</div><div class='ctx'> 		ret++;</div><div class='hunk'>@@ -5075,22 +5876,58 @@ static ssize_t do_listmount(struct mount *first, struct path *orig,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req, u64 __user *,</div><div class='del'>-		mnt_ids, size_t, nr_mnt_ids, unsigned int, flags)</div><div class='add'>+static void __free_klistmount_free(const struct klistmount *kls)</div><div class='ctx'> {</div><div class='del'>-	struct mnt_namespace *ns = current-&gt;nsproxy-&gt;mnt_ns;</div><div class='add'>+	path_put(&amp;kls-&gt;root);</div><div class='add'>+	kvfree(kls-&gt;kmnt_ids);</div><div class='add'>+	mnt_ns_release(kls-&gt;ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int prepare_klistmount(struct klistmount *kls, struct mnt_id_req *kreq,</div><div class='add'>+				     size_t nr_mnt_ids)</div><div class='add'>+{</div><div class='add'>+	u64 last_mnt_id = kreq-&gt;param;</div><div class='add'>+	struct mnt_namespace *ns;</div><div class='add'>+</div><div class='add'>+	/* The first valid unique mount id is MNT_UNIQUE_ID_OFFSET + 1. */</div><div class='add'>+	if (last_mnt_id != 0 &amp;&amp; last_mnt_id &lt;= MNT_UNIQUE_ID_OFFSET)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	kls-&gt;last_mnt_id = last_mnt_id;</div><div class='add'>+</div><div class='add'>+	kls-&gt;nr_mnt_ids = nr_mnt_ids;</div><div class='add'>+	kls-&gt;kmnt_ids = kvmalloc_array(nr_mnt_ids, sizeof(*kls-&gt;kmnt_ids),</div><div class='add'>+				       GFP_KERNEL_ACCOUNT);</div><div class='add'>+	if (!kls-&gt;kmnt_ids)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ns = grab_requested_mnt_ns(kreq);</div><div class='add'>+	if (IS_ERR(ns))</div><div class='add'>+		return PTR_ERR(ns);</div><div class='add'>+	kls-&gt;ns = ns;</div><div class='add'>+</div><div class='add'>+	kls-&gt;mnt_parent_id = kreq-&gt;mnt_id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,</div><div class='add'>+		u64 __user *, mnt_ids, size_t, nr_mnt_ids, unsigned int, flags)</div><div class='add'>+{</div><div class='add'>+	struct klistmount kls __free(klistmount_free) = {};</div><div class='add'>+	const size_t maxcount = 1000000;</div><div class='ctx'> 	struct mnt_id_req kreq;</div><div class='del'>-	struct mount *first;</div><div class='del'>-	struct path root, orig;</div><div class='del'>-	u64 mnt_parent_id, last_mnt_id;</div><div class='del'>-	const size_t maxcount = (size_t)-1 &gt;&gt; 3;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	if (flags)</div><div class='add'>+	if (flags &amp; ~LISTMOUNT_REVERSE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the mount namespace really has more than 1 million mounts the</div><div class='add'>+	 * caller must iterate over the mount namespace (and reconsider their</div><div class='add'>+	 * system design...).</div><div class='add'>+	 */</div><div class='ctx'> 	if (unlikely(nr_mnt_ids &gt; maxcount))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		return -EOVERFLOW;</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(mnt_ids, nr_mnt_ids * sizeof(*mnt_ids)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -5098,60 +5935,62 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req, u64 __user *,</div><div class='ctx'> 	ret = copy_mnt_id_req(req, &amp;kreq);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	mnt_parent_id = kreq.mnt_id;</div><div class='del'>-	last_mnt_id = kreq.param;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;namespace_sem);</div><div class='del'>-	get_fs_root(current-&gt;fs, &amp;root);</div><div class='del'>-	if (mnt_parent_id == LSMT_ROOT) {</div><div class='del'>-		orig = root;</div><div class='del'>-	} else {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		orig.mnt = lookup_mnt_in_ns(mnt_parent_id, ns);</div><div class='del'>-		if (!orig.mnt)</div><div class='del'>-			goto err;</div><div class='del'>-		orig.dentry = orig.mnt-&gt;mnt_root;</div><div class='del'>-	}</div><div class='del'>-	if (!last_mnt_id)</div><div class='del'>-		first = node_to_mount(rb_first(&amp;ns-&gt;mounts));</div><div class='del'>-	else</div><div class='del'>-		first = mnt_find_id_at(ns, last_mnt_id + 1);</div><div class='add'>+	ret = prepare_klistmount(&amp;kls, &amp;kreq, nr_mnt_ids);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (kreq.mnt_ns_id &amp;&amp; (kls.ns != current-&gt;nsproxy-&gt;mnt_ns) &amp;&amp;</div><div class='add'>+	    !ns_capable_noaudit(kls.ns-&gt;user_ns, CAP_SYS_ADMIN))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We only need to guard against mount topology changes as</div><div class='add'>+	 * listmount() doesn't care about any mount properties.</div><div class='add'>+	 */</div><div class='add'>+	scoped_guard(namespace_shared)</div><div class='add'>+		ret = do_listmount(&amp;kls, (flags &amp; LISTMOUNT_REVERSE));</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(mnt_ids, kls.kmnt_ids, ret * sizeof(*mnt_ids)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	ret = do_listmount(first, &amp;orig, mnt_parent_id, mnt_ids, nr_mnt_ids, &amp;root);</div><div class='del'>-err:</div><div class='del'>-	path_put(&amp;root);</div><div class='del'>-	up_read(&amp;namespace_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct mnt_namespace init_mnt_ns = {</div><div class='add'>+	.ns		= NS_COMMON_INIT(init_mnt_ns),</div><div class='add'>+	.user_ns	= &amp;init_user_ns,</div><div class='add'>+	.passive	= REFCOUNT_INIT(1),</div><div class='add'>+	.mounts		= RB_ROOT,</div><div class='add'>+	.poll		= __WAIT_QUEUE_HEAD_INITIALIZER(init_mnt_ns.poll),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __init init_mount_tree(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct vfsmount *mnt;</div><div class='ctx'> 	struct mount *m;</div><div class='del'>-	struct mnt_namespace *ns;</div><div class='ctx'> 	struct path root;</div><div class='ctx'> </div><div class='del'>-	mnt = vfs_kern_mount(&amp;rootfs_fs_type, 0, "rootfs", NULL);</div><div class='add'>+	mnt = vfs_kern_mount(&amp;rootfs_fs_type, 0, "rootfs", initramfs_options);</div><div class='ctx'> 	if (IS_ERR(mnt))</div><div class='ctx'> 		panic("Can't create rootfs");</div><div class='ctx'> </div><div class='del'>-	ns = alloc_mnt_ns(&amp;init_user_ns, false);</div><div class='del'>-	if (IS_ERR(ns))</div><div class='del'>-		panic("Can't allocate initial namespace");</div><div class='ctx'> 	m = real_mount(mnt);</div><div class='del'>-	ns-&gt;root = m;</div><div class='del'>-	ns-&gt;nr_mounts = 1;</div><div class='del'>-	mnt_add_to_ns(ns, m);</div><div class='del'>-	init_task.nsproxy-&gt;mnt_ns = ns;</div><div class='del'>-	get_mnt_ns(ns);</div><div class='add'>+	init_mnt_ns.root = m;</div><div class='add'>+	init_mnt_ns.nr_mounts = 1;</div><div class='add'>+	mnt_add_to_ns(&amp;init_mnt_ns, m);</div><div class='add'>+	init_task.nsproxy-&gt;mnt_ns = &amp;init_mnt_ns;</div><div class='add'>+	get_mnt_ns(&amp;init_mnt_ns);</div><div class='ctx'> </div><div class='ctx'> 	root.mnt = mnt;</div><div class='ctx'> 	root.dentry = mnt-&gt;mnt_root;</div><div class='del'>-	mnt-&gt;mnt_flags |= MNT_LOCKED;</div><div class='ctx'> </div><div class='ctx'> 	set_fs_pwd(current-&gt;fs, &amp;root);</div><div class='ctx'> 	set_fs_root(current-&gt;fs, &amp;root);</div><div class='add'>+</div><div class='add'>+	ns_tree_add(&amp;init_mnt_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init mnt_init(void)</div><div class='hunk'>@@ -5191,10 +6030,12 @@ void __init mnt_init(void)</div><div class='ctx'> </div><div class='ctx'> void put_mnt_ns(struct mnt_namespace *ns)</div><div class='ctx'> {</div><div class='del'>-	if (!refcount_dec_and_test(&amp;ns-&gt;ns.count))</div><div class='add'>+	if (!ns_ref_put(ns))</div><div class='ctx'> 		return;</div><div class='del'>-	drop_collected_mounts(&amp;ns-&gt;root-&gt;mnt);</div><div class='del'>-	free_mnt_ns(ns);</div><div class='add'>+	guard(namespace_excl)();</div><div class='add'>+	emptied_ns = ns;</div><div class='add'>+	guard(mount_writer)();</div><div class='add'>+	umount_tree(ns-&gt;root, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct vfsmount *kern_mount(struct file_system_type *type)</div><div class='hunk'>@@ -5243,25 +6084,18 @@ bool our_mnt(struct vfsmount *mnt)</div><div class='ctx'> bool current_chrooted(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Does the current process have a non-standard root */</div><div class='del'>-	struct path ns_root;</div><div class='del'>-	struct path fs_root;</div><div class='del'>-	bool chrooted;</div><div class='del'>-</div><div class='del'>-	/* Find the namespace root */</div><div class='del'>-	ns_root.mnt = &amp;current-&gt;nsproxy-&gt;mnt_ns-&gt;root-&gt;mnt;</div><div class='del'>-	ns_root.dentry = ns_root.mnt-&gt;mnt_root;</div><div class='del'>-	path_get(&amp;ns_root);</div><div class='del'>-	while (d_mountpoint(ns_root.dentry) &amp;&amp; follow_down_one(&amp;ns_root))</div><div class='del'>-		;</div><div class='add'>+	struct path fs_root __free(path_put) = {};</div><div class='add'>+	struct mount *root;</div><div class='ctx'> </div><div class='ctx'> 	get_fs_root(current-&gt;fs, &amp;fs_root);</div><div class='ctx'> </div><div class='del'>-	chrooted = !path_equal(&amp;fs_root, &amp;ns_root);</div><div class='add'>+	/* Find the namespace root */</div><div class='add'>+</div><div class='add'>+	guard(mount_locked_reader)();</div><div class='ctx'> </div><div class='del'>-	path_put(&amp;fs_root);</div><div class='del'>-	path_put(&amp;ns_root);</div><div class='add'>+	root = topmost_overmount(current-&gt;nsproxy-&gt;mnt_ns-&gt;root);</div><div class='ctx'> </div><div class='del'>-	return chrooted;</div><div class='add'>+	return fs_root.mnt != &amp;root-&gt;mnt || !path_mounted(&amp;fs_root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool mnt_already_visible(struct mnt_namespace *ns,</div><div class='hunk'>@@ -5270,9 +6104,8 @@ static bool mnt_already_visible(struct mnt_namespace *ns,</div><div class='ctx'> {</div><div class='ctx'> 	int new_flags = *new_mnt_flags;</div><div class='ctx'> 	struct mount *mnt, *n;</div><div class='del'>-	bool visible = false;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;namespace_sem);</div><div class='add'>+	guard(namespace_shared)();</div><div class='ctx'> 	rbtree_postorder_for_each_entry_safe(mnt, n, &amp;ns-&gt;mounts, mnt_node) {</div><div class='ctx'> 		struct mount *child;</div><div class='ctx'> 		int mnt_flags;</div><div class='hunk'>@@ -5312,20 +6145,17 @@ static bool mnt_already_visible(struct mnt_namespace *ns,</div><div class='ctx'> 			/* Only worry about locked mounts */</div><div class='ctx'> 			if (!(child-&gt;mnt.mnt_flags &amp; MNT_LOCKED))</div><div class='ctx'> 				continue;</div><div class='del'>-			/* Is the directory permanetly empty? */</div><div class='add'>+			/* Is the directory permanently empty? */</div><div class='ctx'> 			if (!is_empty_dir_inode(inode))</div><div class='ctx'> 				goto next;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Preserve the locked attributes */</div><div class='ctx'> 		*new_mnt_flags |= mnt_flags &amp; (MNT_LOCK_READONLY | \</div><div class='ctx'> 					       MNT_LOCK_ATIME);</div><div class='del'>-		visible = true;</div><div class='del'>-		goto found;</div><div class='add'>+		return true;</div><div class='ctx'> 	next:	;</div><div class='ctx'> 	}</div><div class='del'>-found:</div><div class='del'>-	up_read(&amp;namespace_sem);</div><div class='del'>-	return visible;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool mount_too_revealing(const struct super_block *sb, int *new_mnt_flags)</div><div class='hunk'>@@ -5436,7 +6266,6 @@ static struct user_namespace *mntns_owner(struct ns_common *ns)</div><div class='ctx'> </div><div class='ctx'> const struct proc_ns_operations mntns_operations = {</div><div class='ctx'> 	.name		= "mnt",</div><div class='del'>-	.type		= CLONE_NEWNS,</div><div class='ctx'> 	.get		= mntns_get,</div><div class='ctx'> 	.put		= mntns_put,</div><div class='ctx'> 	.install	= mntns_install,</div><div class='hunk'>@@ -5444,7 +6273,7 @@ const struct proc_ns_operations mntns_operations = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static struct ctl_table fs_namespace_sysctls[] = {</div><div class='add'>+static const struct ctl_table fs_namespace_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "mount-max",</div><div class='ctx'> 		.data		= &amp;sysctl_mount_max,</div><div class='head'>diff --git a/fs/netfs/Kconfig b/fs/netfs/Kconfig<br/>index bec805e0c44c..7701c037c328 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/Kconfig</a></div><div class='hunk'>@@ -22,6 +22,14 @@ config NETFS_STATS</div><div class='ctx'> 	  between CPUs.  On the other hand, the stats are very useful for</div><div class='ctx'> 	  debugging purposes.  Saying 'Y' here is recommended.</div><div class='ctx'> </div><div class='add'>+config NETFS_DEBUG</div><div class='add'>+	bool "Enable dynamic debugging netfslib and FS-Cache"</div><div class='add'>+	depends on NETFS_SUPPORT</div><div class='add'>+	help</div><div class='add'>+	  This permits debugging to be dynamically enabled in the local caching</div><div class='add'>+	  management module.  If this is set, the debugging output may be</div><div class='add'>+	  enabled by setting bits in /sys/module/netfs/parameters/debug.</div><div class='add'>+</div><div class='ctx'> config FSCACHE</div><div class='ctx'> 	bool "General filesystem local caching manager"</div><div class='ctx'> 	depends on NETFS_SUPPORT</div><div class='hunk'>@@ -50,13 +58,3 @@ config FSCACHE_STATS</div><div class='ctx'> 	  debugging purposes.  Saying 'Y' here is recommended.</div><div class='ctx'> </div><div class='ctx'> 	  See Documentation/filesystems/caching/fscache.rst for more information.</div><div class='del'>-</div><div class='del'>-config FSCACHE_DEBUG</div><div class='del'>-	bool "Debug FS-Cache"</div><div class='del'>-	depends on FSCACHE</div><div class='del'>-	help</div><div class='del'>-	  This permits debugging to be dynamically enabled in the local caching</div><div class='del'>-	  management module.  If this is set, the debugging output may be</div><div class='del'>-	  enabled by setting bits in /sys/modules/fscache/parameter/debug.</div><div class='del'>-</div><div class='del'>-	  See Documentation/filesystems/caching/fscache.rst for more information.</div><div class='head'>diff --git a/fs/netfs/Makefile b/fs/netfs/Makefile<br/>index d4d1d799819e..b43188d64bd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/Makefile</a></div><div class='hunk'>@@ -5,13 +5,19 @@ netfs-y := \</div><div class='ctx'> 	buffered_write.o \</div><div class='ctx'> 	direct_read.o \</div><div class='ctx'> 	direct_write.o \</div><div class='del'>-	io.o \</div><div class='ctx'> 	iterator.o \</div><div class='ctx'> 	locking.o \</div><div class='ctx'> 	main.o \</div><div class='ctx'> 	misc.o \</div><div class='ctx'> 	objects.o \</div><div class='del'>-	output.o</div><div class='add'>+	read_collect.o \</div><div class='add'>+	read_pgpriv2.o \</div><div class='add'>+	read_retry.o \</div><div class='add'>+	read_single.o \</div><div class='add'>+	rolling_buffer.o \</div><div class='add'>+	write_collect.o \</div><div class='add'>+	write_issue.o \</div><div class='add'>+	write_retry.o</div><div class='ctx'> </div><div class='ctx'> netfs-$(CONFIG_NETFS_STATS) += stats.o</div><div class='ctx'> </div><div class='head'>diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c<br/>index a59e7b2edaac..37ab6f28b5ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/buffered_read.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/buffered_read.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/buffered_read.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/buffered_read.c</a></div><div class='hunk'>@@ -9,114 +9,10 @@</div><div class='ctx'> #include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Unlock the folios in a read operation.  We need to set PG_fscache on any</div><div class='del'>- * folios we're going to write back before we unlock them.</div><div class='del'>- */</div><div class='del'>-void netfs_rreq_unlock_folios(struct netfs_io_request *rreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-	struct netfs_folio *finfo;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t start_page = rreq-&gt;start / PAGE_SIZE;</div><div class='del'>-	pgoff_t last_page = ((rreq-&gt;start + rreq-&gt;len) / PAGE_SIZE) - 1;</div><div class='del'>-	size_t account = 0;</div><div class='del'>-	bool subreq_failed = false;</div><div class='del'>-</div><div class='del'>-	XA_STATE(xas, &amp;rreq-&gt;mapping-&gt;i_pages, start_page);</div><div class='del'>-</div><div class='del'>-	if (test_bit(NETFS_RREQ_FAILED, &amp;rreq-&gt;flags)) {</div><div class='del'>-		__clear_bit(NETFS_RREQ_COPY_TO_CACHE, &amp;rreq-&gt;flags);</div><div class='del'>-		list_for_each_entry(subreq, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-			__clear_bit(NETFS_SREQ_COPY_TO_CACHE, &amp;subreq-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Walk through the pagecache and the I/O request lists simultaneously.</div><div class='del'>-	 * We may have a mixture of cached and uncached sections and we only</div><div class='del'>-	 * really want to write out the uncached sections.  This is slightly</div><div class='del'>-	 * complicated by the possibility that we might have huge pages with a</div><div class='del'>-	 * mixture inside.</div><div class='del'>-	 */</div><div class='del'>-	subreq = list_first_entry(&amp;rreq-&gt;subrequests,</div><div class='del'>-				  struct netfs_io_subrequest, rreq_link);</div><div class='del'>-	subreq_failed = (subreq-&gt;error &lt; 0);</div><div class='del'>-</div><div class='del'>-	trace_netfs_rreq(rreq, netfs_rreq_trace_unlock);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	xas_for_each(&amp;xas, folio, last_page) {</div><div class='del'>-		loff_t pg_end;</div><div class='del'>-		bool pg_failed = false;</div><div class='del'>-		bool folio_started;</div><div class='del'>-</div><div class='del'>-		if (xas_retry(&amp;xas, folio))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		pg_end = folio_pos(folio) + folio_size(folio) - 1;</div><div class='del'>-</div><div class='del'>-		folio_started = false;</div><div class='del'>-		for (;;) {</div><div class='del'>-			loff_t sreq_end;</div><div class='del'>-</div><div class='del'>-			if (!subreq) {</div><div class='del'>-				pg_failed = true;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (!folio_started &amp;&amp; test_bit(NETFS_SREQ_COPY_TO_CACHE, &amp;subreq-&gt;flags)) {</div><div class='del'>-				trace_netfs_folio(folio, netfs_folio_trace_copy_to_cache);</div><div class='del'>-				folio_start_fscache(folio);</div><div class='del'>-				folio_started = true;</div><div class='del'>-			}</div><div class='del'>-			pg_failed |= subreq_failed;</div><div class='del'>-			sreq_end = subreq-&gt;start + subreq-&gt;len - 1;</div><div class='del'>-			if (pg_end &lt; sreq_end)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			account += subreq-&gt;transferred;</div><div class='del'>-			if (!list_is_last(&amp;subreq-&gt;rreq_link, &amp;rreq-&gt;subrequests)) {</div><div class='del'>-				subreq = list_next_entry(subreq, rreq_link);</div><div class='del'>-				subreq_failed = (subreq-&gt;error &lt; 0);</div><div class='del'>-			} else {</div><div class='del'>-				subreq = NULL;</div><div class='del'>-				subreq_failed = false;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (pg_end == sreq_end)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!pg_failed) {</div><div class='del'>-			flush_dcache_folio(folio);</div><div class='del'>-			finfo = netfs_folio_info(folio);</div><div class='del'>-			if (finfo) {</div><div class='del'>-				trace_netfs_folio(folio, netfs_folio_trace_filled_gaps);</div><div class='del'>-				if (finfo-&gt;netfs_group)</div><div class='del'>-					folio_change_private(folio, finfo-&gt;netfs_group);</div><div class='del'>-				else</div><div class='del'>-					folio_detach_private(folio);</div><div class='del'>-				kfree(finfo);</div><div class='del'>-			}</div><div class='del'>-			folio_mark_uptodate(folio);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!test_bit(NETFS_RREQ_DONT_UNLOCK_FOLIOS, &amp;rreq-&gt;flags)) {</div><div class='del'>-			if (folio_index(folio) == rreq-&gt;no_unlock_folio &amp;&amp;</div><div class='del'>-			    test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &amp;rreq-&gt;flags))</div><div class='del'>-				_debug("no unlock");</div><div class='del'>-			else</div><div class='del'>-				folio_unlock(folio);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	task_io_account_read(account);</div><div class='del'>-	if (rreq-&gt;netfs_ops-&gt;done)</div><div class='del'>-		rreq-&gt;netfs_ops-&gt;done(rreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void netfs_cache_expand_readahead(struct netfs_io_request *rreq,</div><div class='del'>-					 loff_t *_start, size_t *_len, loff_t i_size)</div><div class='add'>+					 unsigned long long *_start,</div><div class='add'>+					 unsigned long long *_len,</div><div class='add'>+					 unsigned long long i_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +63,264 @@ static int netfs_begin_cache_read(struct netfs_io_request *rreq, struct netfs_in</div><div class='ctx'> 	return fscache_begin_read_operation(&amp;rreq-&gt;cache_resources, netfs_i_cookie(ctx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * netfs_prepare_read_iterator - Prepare the subreq iterator for I/O</div><div class='add'>+ * @subreq: The subrequest to be set up</div><div class='add'>+ *</div><div class='add'>+ * Prepare the I/O iterator representing the read buffer on a subrequest for</div><div class='add'>+ * the filesystem to use for I/O (it can be passed directly to a socket).  This</div><div class='add'>+ * is intended to be called from the -&gt;issue_read() method once the filesystem</div><div class='add'>+ * has trimmed the request to the size it wants.</div><div class='add'>+ *</div><div class='add'>+ * Returns the limited size if successful and -ENOMEM if insufficient memory</div><div class='add'>+ * available.</div><div class='add'>+ *</div><div class='add'>+ * [!] NOTE: This must be run in the same thread as -&gt;issue_read() was called</div><div class='add'>+ * in as we access the readahead_control struct.</div><div class='add'>+ */</div><div class='add'>+static ssize_t netfs_prepare_read_iterator(struct netfs_io_subrequest *subreq,</div><div class='add'>+					   struct readahead_control *ractl)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='add'>+	size_t rsize = subreq-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (subreq-&gt;source == NETFS_DOWNLOAD_FROM_SERVER)</div><div class='add'>+		rsize = umin(rsize, rreq-&gt;io_streams[0].sreq_max_len);</div><div class='add'>+</div><div class='add'>+	if (ractl) {</div><div class='add'>+		/* If we don't have sufficient folios in the rolling buffer,</div><div class='add'>+		 * extract a folioq's worth from the readahead region at a time</div><div class='add'>+		 * into the buffer.  Note that this acquires a ref on each page</div><div class='add'>+		 * that we will need to release later - but we don't want to do</div><div class='add'>+		 * that until after we've started the I/O.</div><div class='add'>+		 */</div><div class='add'>+		struct folio_batch put_batch;</div><div class='add'>+</div><div class='add'>+		folio_batch_init(&amp;put_batch);</div><div class='add'>+		while (rreq-&gt;submitted &lt; subreq-&gt;start + rsize) {</div><div class='add'>+			ssize_t added;</div><div class='add'>+</div><div class='add'>+			added = rolling_buffer_load_from_ra(&amp;rreq-&gt;buffer, ractl,</div><div class='add'>+							    &amp;put_batch);</div><div class='add'>+			if (added &lt; 0)</div><div class='add'>+				return added;</div><div class='add'>+			rreq-&gt;submitted += added;</div><div class='add'>+		}</div><div class='add'>+		folio_batch_release(&amp;put_batch);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	subreq-&gt;len = rsize;</div><div class='add'>+	if (unlikely(rreq-&gt;io_streams[0].sreq_max_segs)) {</div><div class='add'>+		size_t limit = netfs_limit_iter(&amp;rreq-&gt;buffer.iter, 0, rsize,</div><div class='add'>+						rreq-&gt;io_streams[0].sreq_max_segs);</div><div class='add'>+</div><div class='add'>+		if (limit &lt; rsize) {</div><div class='add'>+			subreq-&gt;len = limit;</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_limited);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	subreq-&gt;io_iter	= rreq-&gt;buffer.iter;</div><div class='add'>+</div><div class='add'>+	iov_iter_truncate(&amp;subreq-&gt;io_iter, subreq-&gt;len);</div><div class='add'>+	rolling_buffer_advance(&amp;rreq-&gt;buffer, subreq-&gt;len);</div><div class='add'>+	return subreq-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum netfs_io_source netfs_cache_prepare_read(struct netfs_io_request *rreq,</div><div class='add'>+						     struct netfs_io_subrequest *subreq,</div><div class='add'>+						     loff_t i_size)</div><div class='add'>+{</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='add'>+	enum netfs_io_source source;</div><div class='add'>+</div><div class='add'>+	if (!cres-&gt;ops)</div><div class='add'>+		return NETFS_DOWNLOAD_FROM_SERVER;</div><div class='add'>+	source = cres-&gt;ops-&gt;prepare_read(subreq, i_size);</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='add'>+	return source;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Issue a read against the cache.</div><div class='add'>+ * - Eats the caller's ref on subreq.</div><div class='add'>+ */</div><div class='add'>+static void netfs_read_cache_to_pagecache(struct netfs_io_request *rreq,</div><div class='add'>+					  struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='add'>+</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_read);</div><div class='add'>+	cres-&gt;ops-&gt;read(cres, subreq-&gt;start, &amp;subreq-&gt;io_iter, NETFS_READ_HOLE_IGNORE,</div><div class='add'>+			netfs_cache_read_terminated, subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netfs_queue_read(struct netfs_io_request *rreq,</div><div class='add'>+			     struct netfs_io_subrequest *subreq,</div><div class='add'>+			     bool last_subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+</div><div class='add'>+	__set_bit(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* We add to the end of the list whilst the collector may be walking</div><div class='add'>+	 * the list.  The collector only goes nextwards and uses the lock to</div><div class='add'>+	 * remove entries off of the front.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;rreq-&gt;lock);</div><div class='add'>+	list_add_tail(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests);</div><div class='add'>+	if (list_is_first(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests)) {</div><div class='add'>+		stream-&gt;front = subreq;</div><div class='add'>+		if (!stream-&gt;active) {</div><div class='add'>+			stream-&gt;collected_to = stream-&gt;front-&gt;start;</div><div class='add'>+			/* Store list pointers before active flag */</div><div class='add'>+			smp_store_release(&amp;stream-&gt;active, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (last_subreq) {</div><div class='add'>+		smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+		set_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;rreq-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netfs_issue_read(struct netfs_io_request *rreq,</div><div class='add'>+			     struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	switch (subreq-&gt;source) {</div><div class='add'>+	case NETFS_DOWNLOAD_FROM_SERVER:</div><div class='add'>+		rreq-&gt;netfs_ops-&gt;issue_read(subreq);</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_READ_FROM_CACHE:</div><div class='add'>+		netfs_read_cache_to_pagecache(rreq, subreq);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='add'>+		subreq-&gt;error = 0;</div><div class='add'>+		iov_iter_zero(subreq-&gt;len, &amp;subreq-&gt;io_iter);</div><div class='add'>+		subreq-&gt;transferred = subreq-&gt;len;</div><div class='add'>+		netfs_read_subreq_terminated(subreq);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform a read to the pagecache from a series of sources of different types,</div><div class='add'>+ * slicing up the region to be read according to available cache blocks and</div><div class='add'>+ * network rsize.</div><div class='add'>+ */</div><div class='add'>+static void netfs_read_to_pagecache(struct netfs_io_request *rreq,</div><div class='add'>+				    struct readahead_control *ractl)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(rreq-&gt;inode);</div><div class='add'>+	unsigned long long start = rreq-&gt;start;</div><div class='add'>+	ssize_t size = rreq-&gt;len;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct netfs_io_subrequest *subreq;</div><div class='add'>+		enum netfs_io_source source = NETFS_SOURCE_UNKNOWN;</div><div class='add'>+		ssize_t slice;</div><div class='add'>+</div><div class='add'>+		subreq = netfs_alloc_subrequest(rreq);</div><div class='add'>+		if (!subreq) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		subreq-&gt;start	= start;</div><div class='add'>+		subreq-&gt;len	= size;</div><div class='add'>+</div><div class='add'>+		source = netfs_cache_prepare_read(rreq, subreq, rreq-&gt;i_size);</div><div class='add'>+		subreq-&gt;source = source;</div><div class='add'>+		if (source == NETFS_DOWNLOAD_FROM_SERVER) {</div><div class='add'>+			unsigned long long zp = umin(ictx-&gt;zero_point, rreq-&gt;i_size);</div><div class='add'>+			size_t len = subreq-&gt;len;</div><div class='add'>+</div><div class='add'>+			if (unlikely(rreq-&gt;origin == NETFS_READ_SINGLE))</div><div class='add'>+				zp = rreq-&gt;i_size;</div><div class='add'>+			if (subreq-&gt;start &gt;= zp) {</div><div class='add'>+				subreq-&gt;source = source = NETFS_FILL_WITH_ZEROES;</div><div class='add'>+				goto fill_with_zeroes;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (len &gt; zp - subreq-&gt;start)</div><div class='add'>+				len = zp - subreq-&gt;start;</div><div class='add'>+			if (len == 0) {</div><div class='add'>+				pr_err("ZERO-LEN READ: R=%08x[%x] l=%zx/%zx s=%llx z=%llx i=%llx",</div><div class='add'>+				       rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='add'>+				       subreq-&gt;len, size,</div><div class='add'>+				       subreq-&gt;start, ictx-&gt;zero_point, rreq-&gt;i_size);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			subreq-&gt;len = len;</div><div class='add'>+</div><div class='add'>+			netfs_stat(&amp;netfs_n_rh_download);</div><div class='add'>+			if (rreq-&gt;netfs_ops-&gt;prepare_read) {</div><div class='add'>+				ret = rreq-&gt;netfs_ops-&gt;prepare_read(subreq);</div><div class='add'>+				if (ret &lt; 0) {</div><div class='add'>+					subreq-&gt;error = ret;</div><div class='add'>+					/* Not queued - release both refs. */</div><div class='add'>+					netfs_put_subrequest(subreq,</div><div class='add'>+							     netfs_sreq_trace_put_cancel);</div><div class='add'>+					netfs_put_subrequest(subreq,</div><div class='add'>+							     netfs_sreq_trace_put_cancel);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='add'>+			}</div><div class='add'>+			goto issue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	fill_with_zeroes:</div><div class='add'>+		if (source == NETFS_FILL_WITH_ZEROES) {</div><div class='add'>+			subreq-&gt;source = NETFS_FILL_WITH_ZEROES;</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='add'>+			netfs_stat(&amp;netfs_n_rh_zero);</div><div class='add'>+			goto issue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (source == NETFS_READ_FROM_CACHE) {</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='add'>+			goto issue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pr_err("Unexpected read source %u\n", source);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	issue:</div><div class='add'>+		slice = netfs_prepare_read_iterator(subreq, ractl);</div><div class='add'>+		if (slice &lt; 0) {</div><div class='add'>+			ret = slice;</div><div class='add'>+			subreq-&gt;error = ret;</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_cancel);</div><div class='add'>+			/* Not queued - release both refs. */</div><div class='add'>+			netfs_put_subrequest(subreq, netfs_sreq_trace_put_cancel);</div><div class='add'>+			netfs_put_subrequest(subreq, netfs_sreq_trace_put_cancel);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		size -= slice;</div><div class='add'>+		start += slice;</div><div class='add'>+</div><div class='add'>+		netfs_queue_read(rreq, subreq, size &lt;= 0);</div><div class='add'>+		netfs_issue_read(rreq, subreq);</div><div class='add'>+		cond_resched();</div><div class='add'>+	} while (size &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (unlikely(size &gt; 0)) {</div><div class='add'>+		smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+		set_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags);</div><div class='add'>+		netfs_wake_collector(rreq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Defer error return as we may need to wait for outstanding I/O. */</div><div class='add'>+	cmpxchg(&amp;rreq-&gt;error, 0, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netfs_readahead - Helper to manage a read request</div><div class='ctx'>  * @ractl: The description of the readahead request</div><div class='hunk'>@@ -185,22 +339,19 @@ static int netfs_begin_cache_read(struct netfs_io_request *rreq, struct netfs_in</div><div class='ctx'> void netfs_readahead(struct readahead_control *ractl)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *rreq;</div><div class='del'>-	struct netfs_inode *ctx = netfs_inode(ractl-&gt;mapping-&gt;host);</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(ractl-&gt;mapping-&gt;host);</div><div class='add'>+	unsigned long long start = readahead_pos(ractl);</div><div class='add'>+	size_t size = readahead_length(ractl);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("%lx,%x", readahead_index(ractl), readahead_count(ractl));</div><div class='del'>-</div><div class='del'>-	if (readahead_count(ractl) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rreq = netfs_alloc_request(ractl-&gt;mapping, ractl-&gt;file,</div><div class='del'>-				   readahead_pos(ractl),</div><div class='del'>-				   readahead_length(ractl),</div><div class='add'>+	rreq = netfs_alloc_request(ractl-&gt;mapping, ractl-&gt;file, start, size,</div><div class='ctx'> 				   NETFS_READAHEAD);</div><div class='ctx'> 	if (IS_ERR(rreq))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = netfs_begin_cache_read(rreq, ctx);</div><div class='add'>+	__set_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;rreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	ret = netfs_begin_cache_read(rreq, ictx);</div><div class='ctx'> 	if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)</div><div class='ctx'> 		goto cleanup_free;</div><div class='ctx'> </div><div class='hunk'>@@ -210,26 +361,123 @@ void netfs_readahead(struct readahead_control *ractl)</div><div class='ctx'> </div><div class='ctx'> 	netfs_rreq_expand(rreq, ractl);</div><div class='ctx'> </div><div class='del'>-	/* Set up the output buffer */</div><div class='del'>-	iov_iter_xarray(&amp;rreq-&gt;iter, ITER_DEST, &amp;ractl-&gt;mapping-&gt;i_pages,</div><div class='del'>-			rreq-&gt;start, rreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	/* Drop the refs on the folios here rather than in the cache or</div><div class='del'>-	 * filesystem.  The locks will be dropped in netfs_rreq_unlock().</div><div class='del'>-	 */</div><div class='del'>-	while (readahead_folio(ractl))</div><div class='del'>-		;</div><div class='add'>+	rreq-&gt;submitted = rreq-&gt;start;</div><div class='add'>+	if (rolling_buffer_init(&amp;rreq-&gt;buffer, rreq-&gt;debug_id, ITER_DEST) &lt; 0)</div><div class='add'>+		goto cleanup_free;</div><div class='add'>+	netfs_read_to_pagecache(rreq, ractl);</div><div class='ctx'> </div><div class='del'>-	netfs_begin_read(rreq, false);</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_return);</div><div class='del'>-	return;</div><div class='add'>+	return netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='ctx'> </div><div class='ctx'> cleanup_free:</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_failed);</div><div class='del'>-	return;</div><div class='add'>+	return netfs_put_failed_request(rreq);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netfs_readahead);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Create a rolling buffer with a single occupying folio.</div><div class='add'>+ */</div><div class='add'>+static int netfs_create_singular_buffer(struct netfs_io_request *rreq, struct folio *folio,</div><div class='add'>+					unsigned int rollbuf_flags)</div><div class='add'>+{</div><div class='add'>+	ssize_t added;</div><div class='add'>+</div><div class='add'>+	if (rolling_buffer_init(&amp;rreq-&gt;buffer, rreq-&gt;debug_id, ITER_DEST) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	added = rolling_buffer_append(&amp;rreq-&gt;buffer, folio, rollbuf_flags);</div><div class='add'>+	if (added &lt; 0)</div><div class='add'>+		return added;</div><div class='add'>+	rreq-&gt;submitted = rreq-&gt;start + added;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read into gaps in a folio partially filled by a streaming write.</div><div class='add'>+ */</div><div class='add'>+static int netfs_read_gaps(struct file *file, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq;</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='add'>+	struct netfs_folio *finfo = netfs_folio_info(folio);</div><div class='add'>+	struct netfs_inode *ctx = netfs_inode(mapping-&gt;host);</div><div class='add'>+	struct folio *sink = NULL;</div><div class='add'>+	struct bio_vec *bvec;</div><div class='add'>+	unsigned int from = finfo-&gt;dirty_offset;</div><div class='add'>+	unsigned int to = from + finfo-&gt;dirty_len;</div><div class='add'>+	unsigned int off = 0, i = 0;</div><div class='add'>+	size_t flen = folio_size(folio);</div><div class='add'>+	size_t nr_bvec = flen / PAGE_SIZE + 2;</div><div class='add'>+	size_t part;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	_enter("%lx", folio-&gt;index);</div><div class='add'>+</div><div class='add'>+	rreq = netfs_alloc_request(mapping, file, folio_pos(folio), flen, NETFS_READ_GAPS);</div><div class='add'>+	if (IS_ERR(rreq)) {</div><div class='add'>+		ret = PTR_ERR(rreq);</div><div class='add'>+		goto alloc_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = netfs_begin_cache_read(rreq, ctx);</div><div class='add'>+	if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)</div><div class='add'>+		goto discard;</div><div class='add'>+</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_read_folio);</div><div class='add'>+	trace_netfs_read(rreq, rreq-&gt;start, rreq-&gt;len, netfs_read_trace_read_gaps);</div><div class='add'>+</div><div class='add'>+	/* Fiddle the buffer so that a gap at the beginning and/or a gap at the</div><div class='add'>+	 * end get copied to, but the middle is discarded.</div><div class='add'>+	 */</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	bvec = kmalloc_array(nr_bvec, sizeof(*bvec), GFP_KERNEL);</div><div class='add'>+	if (!bvec)</div><div class='add'>+		goto discard;</div><div class='add'>+</div><div class='add'>+	sink = folio_alloc(GFP_KERNEL, 0);</div><div class='add'>+	if (!sink) {</div><div class='add'>+		kfree(bvec);</div><div class='add'>+		goto discard;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_folio(folio, netfs_folio_trace_read_gaps);</div><div class='add'>+</div><div class='add'>+	rreq-&gt;direct_bv = bvec;</div><div class='add'>+	rreq-&gt;direct_bv_count = nr_bvec;</div><div class='add'>+	if (from &gt; 0) {</div><div class='add'>+		bvec_set_folio(&amp;bvec[i++], folio, from, 0);</div><div class='add'>+		off = from;</div><div class='add'>+	}</div><div class='add'>+	while (off &lt; to) {</div><div class='add'>+		part = min_t(size_t, to - off, PAGE_SIZE);</div><div class='add'>+		bvec_set_folio(&amp;bvec[i++], sink, part, 0);</div><div class='add'>+		off += part;</div><div class='add'>+	}</div><div class='add'>+	if (to &lt; flen)</div><div class='add'>+		bvec_set_folio(&amp;bvec[i++], folio, flen - to, to);</div><div class='add'>+	iov_iter_bvec(&amp;rreq-&gt;buffer.iter, ITER_DEST, bvec, i, rreq-&gt;len);</div><div class='add'>+	rreq-&gt;submitted = rreq-&gt;start + flen;</div><div class='add'>+</div><div class='add'>+	netfs_read_to_pagecache(rreq, NULL);</div><div class='add'>+</div><div class='add'>+	if (sink)</div><div class='add'>+		folio_put(sink);</div><div class='add'>+</div><div class='add'>+	ret = netfs_wait_for_read(rreq);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		flush_dcache_folio(folio);</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='add'>+	}</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='add'>+</div><div class='add'>+discard:</div><div class='add'>+	netfs_put_failed_request(rreq);</div><div class='add'>+alloc_error:</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netfs_read_folio - Helper to manage a read_folio request</div><div class='ctx'>  * @file: The file to read from</div><div class='hunk'>@@ -246,16 +494,20 @@ EXPORT_SYMBOL(netfs_readahead);</div><div class='ctx'>  */</div><div class='ctx'> int netfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct netfs_io_request *rreq;</div><div class='ctx'> 	struct netfs_inode *ctx = netfs_inode(mapping-&gt;host);</div><div class='del'>-	struct folio *sink = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	_enter("%lx", folio_index(folio));</div><div class='add'>+	if (folio_test_dirty(folio)) {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_read_gaps);</div><div class='add'>+		return netfs_read_gaps(file, folio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_enter("%lx", folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	rreq = netfs_alloc_request(mapping, file,</div><div class='del'>-				   folio_file_pos(folio), folio_size(folio),</div><div class='add'>+				   folio_pos(folio), folio_size(folio),</div><div class='ctx'> 				   NETFS_READPAGE);</div><div class='ctx'> 	if (IS_ERR(rreq)) {</div><div class='ctx'> 		ret = PTR_ERR(rreq);</div><div class='hunk'>@@ -266,63 +518,21 @@ int netfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)</div><div class='ctx'> 		goto discard;</div><div class='ctx'> </div><div class='del'>-	netfs_stat(&amp;netfs_n_rh_readpage);</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_read_folio);</div><div class='ctx'> 	trace_netfs_read(rreq, rreq-&gt;start, rreq-&gt;len, netfs_read_trace_readpage);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the output buffer */</div><div class='del'>-	if (folio_test_dirty(folio)) {</div><div class='del'>-		/* Handle someone trying to read from an unflushed streaming</div><div class='del'>-		 * write.  We fiddle the buffer so that a gap at the beginning</div><div class='del'>-		 * and/or a gap at the end get copied to, but the middle is</div><div class='del'>-		 * discarded.</div><div class='del'>-		 */</div><div class='del'>-		struct netfs_folio *finfo = netfs_folio_info(folio);</div><div class='del'>-		struct bio_vec *bvec;</div><div class='del'>-		unsigned int from = finfo-&gt;dirty_offset;</div><div class='del'>-		unsigned int to = from + finfo-&gt;dirty_len;</div><div class='del'>-		unsigned int off = 0, i = 0;</div><div class='del'>-		size_t flen = folio_size(folio);</div><div class='del'>-		size_t nr_bvec = flen / PAGE_SIZE + 2;</div><div class='del'>-		size_t part;</div><div class='del'>-</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		bvec = kmalloc_array(nr_bvec, sizeof(*bvec), GFP_KERNEL);</div><div class='del'>-		if (!bvec)</div><div class='del'>-			goto discard;</div><div class='del'>-</div><div class='del'>-		sink = folio_alloc(GFP_KERNEL, 0);</div><div class='del'>-		if (!sink)</div><div class='del'>-			goto discard;</div><div class='del'>-</div><div class='del'>-		trace_netfs_folio(folio, netfs_folio_trace_read_gaps);</div><div class='del'>-</div><div class='del'>-		rreq-&gt;direct_bv = bvec;</div><div class='del'>-		rreq-&gt;direct_bv_count = nr_bvec;</div><div class='del'>-		if (from &gt; 0) {</div><div class='del'>-			bvec_set_folio(&amp;bvec[i++], folio, from, 0);</div><div class='del'>-			off = from;</div><div class='del'>-		}</div><div class='del'>-		while (off &lt; to) {</div><div class='del'>-			part = min_t(size_t, to - off, PAGE_SIZE);</div><div class='del'>-			bvec_set_folio(&amp;bvec[i++], sink, part, 0);</div><div class='del'>-			off += part;</div><div class='del'>-		}</div><div class='del'>-		if (to &lt; flen)</div><div class='del'>-			bvec_set_folio(&amp;bvec[i++], folio, flen - to, to);</div><div class='del'>-		iov_iter_bvec(&amp;rreq-&gt;iter, ITER_DEST, bvec, i, rreq-&gt;len);</div><div class='del'>-	} else {</div><div class='del'>-		iov_iter_xarray(&amp;rreq-&gt;iter, ITER_DEST, &amp;mapping-&gt;i_pages,</div><div class='del'>-				rreq-&gt;start, rreq-&gt;len);</div><div class='del'>-	}</div><div class='add'>+	ret = netfs_create_singular_buffer(rreq, folio, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto discard;</div><div class='ctx'> </div><div class='del'>-	ret = netfs_begin_read(rreq, true);</div><div class='del'>-	if (sink)</div><div class='del'>-		folio_put(sink);</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_return);</div><div class='add'>+	netfs_read_to_pagecache(rreq, NULL);</div><div class='add'>+	ret = netfs_wait_for_read(rreq);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='ctx'> 	return ret &lt; 0 ? ret : 0;</div><div class='ctx'> </div><div class='ctx'> discard:</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_discard);</div><div class='add'>+	netfs_put_failed_request(rreq);</div><div class='ctx'> alloc_error:</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -355,7 +565,7 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len,</div><div class='ctx'> 	if (unlikely(always_fill)) {</div><div class='ctx'> 		if (pos - offset + len &lt;= i_size)</div><div class='ctx'> 			return false; /* Page entirely before EOF */</div><div class='del'>-		zero_user_segment(&amp;folio-&gt;page, 0, plen);</div><div class='add'>+		folio_zero_segment(folio, 0, plen);</div><div class='ctx'> 		folio_mark_uptodate(folio);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -374,12 +584,12 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len,</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> zero_out:</div><div class='del'>-	zero_user_segments(&amp;folio-&gt;page, 0, offset, offset + len, plen);</div><div class='add'>+	folio_zero_segments(folio, 0, offset, offset + len, plen);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * netfs_write_begin - Helper to prepare for writing</div><div class='add'>+ * netfs_write_begin - Helper to prepare for writing [DEPRECATED]</div><div class='ctx'>  * @ctx: The netfs context</div><div class='ctx'>  * @file: The file to read from</div><div class='ctx'>  * @mapping: The mapping to read from</div><div class='hunk'>@@ -390,13 +600,10 @@ zero_out:</div><div class='ctx'>  *</div><div class='ctx'>  * Pre-read data for a write-begin request by drawing data from the cache if</div><div class='ctx'>  * possible, or the netfs if not.  Space beyond the EOF is zero-filled.</div><div class='del'>- * Multiple I/O requests from different sources will get munged together.  If</div><div class='del'>- * necessary, the readahead window can be expanded in either direction to a</div><div class='del'>- * more convenient alighment for RPC efficiency or to make storage in the cache</div><div class='del'>- * feasible.</div><div class='add'>+ * Multiple I/O requests from different sources will get munged together.</div><div class='ctx'>  *</div><div class='ctx'>  * The calling netfs must provide a table of operations, only one of which,</div><div class='del'>- * issue_op, is mandatory.</div><div class='add'>+ * issue_read, is mandatory.</div><div class='ctx'>  *</div><div class='ctx'>  * The check_write_begin() operation can be provided to check for and flush</div><div class='ctx'>  * conflicting writes once the folio is grabbed and locked.  It is passed a</div><div class='hunk'>@@ -410,6 +617,9 @@ zero_out:</div><div class='ctx'>  * inode before calling this.</div><div class='ctx'>  *</div><div class='ctx'>  * This is usable whether or not caching is enabled.</div><div class='add'>+ *</div><div class='add'>+ * Note that this should be considered deprecated and netfs_perform_write()</div><div class='add'>+ * used instead.</div><div class='ctx'>  */</div><div class='ctx'> int netfs_write_begin(struct netfs_inode *ctx,</div><div class='ctx'> 		      struct file *file, struct address_space *mapping,</div><div class='hunk'>@@ -421,8 +631,6 @@ int netfs_write_begin(struct netfs_inode *ctx,</div><div class='ctx'> 	pgoff_t index = pos &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	DEFINE_READAHEAD(ractl, file, NULL, mapping, index);</div><div class='del'>-</div><div class='ctx'> retry:</div><div class='ctx'> 	folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,</div><div class='ctx'> 				    mapping_gfp_mask(mapping));</div><div class='hunk'>@@ -443,7 +651,7 @@ retry:</div><div class='ctx'> 	if (folio_test_uptodate(folio))</div><div class='ctx'> 		goto have_folio;</div><div class='ctx'> </div><div class='del'>-	/* If the page is beyond the EOF, we want to clear it - unless it's</div><div class='add'>+	/* If the folio is beyond the EOF, we want to clear it - unless it's</div><div class='ctx'> 	 * within the cache granule containing the EOF, in which case we need</div><div class='ctx'> 	 * to preload the granule.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -454,13 +662,13 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rreq = netfs_alloc_request(mapping, file,</div><div class='del'>-				   folio_file_pos(folio), folio_size(folio),</div><div class='add'>+				   folio_pos(folio), folio_size(folio),</div><div class='ctx'> 				   NETFS_READ_FOR_WRITE);</div><div class='ctx'> 	if (IS_ERR(rreq)) {</div><div class='ctx'> 		ret = PTR_ERR(rreq);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	rreq-&gt;no_unlock_folio	= folio_index(folio);</div><div class='add'>+	rreq-&gt;no_unlock_folio	= folio-&gt;index;</div><div class='ctx'> 	__set_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &amp;rreq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	ret = netfs_begin_cache_read(rreq, ctx);</div><div class='hunk'>@@ -470,28 +678,19 @@ retry:</div><div class='ctx'> 	netfs_stat(&amp;netfs_n_rh_write_begin);</div><div class='ctx'> 	trace_netfs_read(rreq, pos, len, netfs_read_trace_write_begin);</div><div class='ctx'> </div><div class='del'>-	/* Expand the request to meet caching requirements and download</div><div class='del'>-	 * preferences.</div><div class='del'>-	 */</div><div class='del'>-	ractl._nr_pages = folio_nr_pages(folio);</div><div class='del'>-	netfs_rreq_expand(rreq, &amp;ractl);</div><div class='del'>-</div><div class='ctx'> 	/* Set up the output buffer */</div><div class='del'>-	iov_iter_xarray(&amp;rreq-&gt;iter, ITER_DEST, &amp;mapping-&gt;i_pages,</div><div class='del'>-			rreq-&gt;start, rreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	/* We hold the folio locks, so we can drop the references */</div><div class='del'>-	folio_get(folio);</div><div class='del'>-	while (readahead_folio(&amp;ractl))</div><div class='del'>-		;</div><div class='add'>+	ret = netfs_create_singular_buffer(rreq, folio, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_put;</div><div class='ctx'> </div><div class='del'>-	ret = netfs_begin_read(rreq, true);</div><div class='add'>+	netfs_read_to_pagecache(rreq, NULL);</div><div class='add'>+	ret = netfs_wait_for_read(rreq);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_return);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='ctx'> </div><div class='ctx'> have_folio:</div><div class='del'>-	ret = folio_wait_fscache_killable(folio);</div><div class='add'>+	ret = folio_wait_private_2_killable(folio);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> have_folio_no_wait:</div><div class='hunk'>@@ -500,7 +699,7 @@ have_folio_no_wait:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error_put:</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_failed);</div><div class='add'>+	netfs_put_failed_request(rreq);</div><div class='ctx'> error:</div><div class='ctx'> 	if (folio) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='hunk'>@@ -512,13 +711,13 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(netfs_write_begin);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Preload the data into a page we're proposing to write into.</div><div class='add'>+ * Preload the data into a folio we're proposing to write into.</div><div class='ctx'>  */</div><div class='ctx'> int netfs_prefetch_for_write(struct file *file, struct folio *folio,</div><div class='ctx'> 			     size_t offset, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *rreq;</div><div class='del'>-	struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct netfs_inode *ctx = netfs_inode(mapping-&gt;host);</div><div class='ctx'> 	unsigned long long start = folio_pos(folio);</div><div class='ctx'> 	size_t flen = folio_size(folio);</div><div class='hunk'>@@ -535,7 +734,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rreq-&gt;no_unlock_folio = folio_index(folio);</div><div class='add'>+	rreq-&gt;no_unlock_folio = folio-&gt;index;</div><div class='ctx'> 	__set_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &amp;rreq-&gt;flags);</div><div class='ctx'> 	ret = netfs_begin_cache_read(rreq, ctx);</div><div class='ctx'> 	if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)</div><div class='hunk'>@@ -545,15 +744,17 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio,</div><div class='ctx'> 	trace_netfs_read(rreq, start, flen, netfs_read_trace_prefetch_for_write);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the output buffer */</div><div class='del'>-	iov_iter_xarray(&amp;rreq-&gt;iter, ITER_DEST, &amp;mapping-&gt;i_pages,</div><div class='del'>-			rreq-&gt;start, rreq-&gt;len);</div><div class='add'>+	ret = netfs_create_singular_buffer(rreq, folio, NETFS_ROLLBUF_PAGECACHE_MARK);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_put;</div><div class='ctx'> </div><div class='del'>-	ret = netfs_begin_read(rreq, true);</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_return);</div><div class='del'>-	return ret;</div><div class='add'>+	netfs_read_to_pagecache(rreq, NULL);</div><div class='add'>+	ret = netfs_wait_for_read(rreq);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='ctx'> </div><div class='ctx'> error_put:</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_discard);</div><div class='add'>+	netfs_put_failed_request(rreq);</div><div class='ctx'> error:</div><div class='ctx'> 	_leave(" = %d", ret);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c<br/>index 93dc76f34e39..f9d62abef2ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/buffered_write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/buffered_write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/buffered_write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/buffered_write.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/* Network filesystem high-level write support.</div><div class='add'>+/* Network filesystem high-level buffered write support.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2023 Red Hat, Inc. All Rights Reserved.</div><div class='ctx'>  * Written by David Howells (dhowells@redhat.com)</div><div class='hunk'>@@ -13,104 +13,22 @@</div><div class='ctx'> #include &lt;linux/pagevec.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Determined write method.  Adjust netfs_folio_traces if this is changed.</div><div class='del'>- */</div><div class='del'>-enum netfs_how_to_modify {</div><div class='del'>-	NETFS_FOLIO_IS_UPTODATE,	/* Folio is uptodate already */</div><div class='del'>-	NETFS_JUST_PREFETCH,		/* We have to read the folio anyway */</div><div class='del'>-	NETFS_WHOLE_FOLIO_MODIFY,	/* We're going to overwrite the whole folio */</div><div class='del'>-	NETFS_MODIFY_AND_CLEAR,		/* We can assume there is no data to be downloaded. */</div><div class='del'>-	NETFS_STREAMING_WRITE,		/* Store incomplete data in non-uptodate page. */</div><div class='del'>-	NETFS_STREAMING_WRITE_CONT,	/* Continue streaming write. */</div><div class='del'>-	NETFS_FLUSH_CONTENT,		/* Flush incompatible content. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void netfs_cleanup_buffered_write(struct netfs_io_request *wreq);</div><div class='del'>-</div><div class='del'>-static void netfs_set_group(struct folio *folio, struct netfs_group *netfs_group)</div><div class='add'>+static void __netfs_set_group(struct folio *folio, struct netfs_group *netfs_group)</div><div class='ctx'> {</div><div class='del'>-	if (netfs_group &amp;&amp; !folio_get_private(folio))</div><div class='add'>+	if (netfs_group)</div><div class='ctx'> 		folio_attach_private(folio, netfs_get_group(netfs_group));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_FSCACHE)</div><div class='del'>-static void netfs_folio_start_fscache(bool caching, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	if (caching)</div><div class='del'>-		folio_start_fscache(folio);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void netfs_folio_start_fscache(bool caching, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Decide how we should modify a folio.  We might be attempting to do</div><div class='del'>- * write-streaming, in which case we don't want to a local RMW cycle if we can</div><div class='del'>- * avoid it.  If we're doing local caching or content crypto, we award that</div><div class='del'>- * priority over avoiding RMW.  If the file is open readably, then we also</div><div class='del'>- * assume that we may want to read what we wrote.</div><div class='del'>- */</div><div class='del'>-static enum netfs_how_to_modify netfs_how_to_modify(struct netfs_inode *ctx,</div><div class='del'>-						    struct file *file,</div><div class='del'>-						    struct folio *folio,</div><div class='del'>-						    void *netfs_group,</div><div class='del'>-						    size_t flen,</div><div class='del'>-						    size_t offset,</div><div class='del'>-						    size_t len,</div><div class='del'>-						    bool maybe_trouble)</div><div class='add'>+static void netfs_set_group(struct folio *folio, struct netfs_group *netfs_group)</div><div class='ctx'> {</div><div class='del'>-	struct netfs_folio *finfo = netfs_folio_info(folio);</div><div class='del'>-	loff_t pos = folio_file_pos(folio);</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='del'>-	if (netfs_folio_group(folio) != netfs_group)</div><div class='del'>-		return NETFS_FLUSH_CONTENT;</div><div class='del'>-</div><div class='del'>-	if (folio_test_uptodate(folio))</div><div class='del'>-		return NETFS_FOLIO_IS_UPTODATE;</div><div class='del'>-</div><div class='del'>-	if (pos &gt;= ctx-&gt;zero_point)</div><div class='del'>-		return NETFS_MODIFY_AND_CLEAR;</div><div class='del'>-</div><div class='del'>-	if (!maybe_trouble &amp;&amp; offset == 0 &amp;&amp; len &gt;= flen)</div><div class='del'>-		return NETFS_WHOLE_FOLIO_MODIFY;</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-		goto no_write_streaming;</div><div class='del'>-	if (test_bit(NETFS_ICTX_NO_WRITE_STREAMING, &amp;ctx-&gt;flags))</div><div class='del'>-		goto no_write_streaming;</div><div class='del'>-</div><div class='del'>-	if (netfs_is_cache_enabled(ctx)) {</div><div class='del'>-		/* We don't want to get a streaming write on a file that loses</div><div class='del'>-		 * caching service temporarily because the backing store got</div><div class='del'>-		 * culled.</div><div class='del'>-		 */</div><div class='del'>-		if (!test_bit(NETFS_ICTX_NO_WRITE_STREAMING, &amp;ctx-&gt;flags))</div><div class='del'>-			set_bit(NETFS_ICTX_NO_WRITE_STREAMING, &amp;ctx-&gt;flags);</div><div class='del'>-		goto no_write_streaming;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!finfo)</div><div class='del'>-		return NETFS_STREAMING_WRITE;</div><div class='del'>-</div><div class='del'>-	/* We can continue a streaming write only if it continues on from the</div><div class='del'>-	 * previous.  If it overlaps, we must flush lest we suffer a partial</div><div class='del'>-	 * copy and disjoint dirty regions.</div><div class='del'>-	 */</div><div class='del'>-	if (offset == finfo-&gt;dirty_offset + finfo-&gt;dirty_len)</div><div class='del'>-		return NETFS_STREAMING_WRITE_CONT;</div><div class='del'>-	return NETFS_FLUSH_CONTENT;</div><div class='add'>+	void *priv = folio_get_private(folio);</div><div class='ctx'> </div><div class='del'>-no_write_streaming:</div><div class='del'>-	if (finfo) {</div><div class='del'>-		netfs_stat(&amp;netfs_n_wh_wstream_conflict);</div><div class='del'>-		return NETFS_FLUSH_CONTENT;</div><div class='add'>+	if (unlikely(priv != netfs_group)) {</div><div class='add'>+		if (netfs_group &amp;&amp; (!priv || priv == NETFS_FOLIO_COPY_TO_CACHE))</div><div class='add'>+			folio_attach_private(folio, netfs_get_group(netfs_group));</div><div class='add'>+		else if (!netfs_group &amp;&amp; priv == NETFS_FOLIO_COPY_TO_CACHE)</div><div class='add'>+			folio_detach_private(folio);</div><div class='ctx'> 	}</div><div class='del'>-	return NETFS_JUST_PREFETCH;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -130,17 +48,58 @@ static struct folio *netfs_grab_folio_for_write(struct address_space *mapping,</div><div class='ctx'> 				   mapping_gfp_mask(mapping));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Update i_size and estimate the update to i_blocks to reflect the additional</div><div class='add'>+ * data written into the pagecache until we can find out from the server what</div><div class='add'>+ * the values actually are.</div><div class='add'>+ */</div><div class='add'>+void netfs_update_i_size(struct netfs_inode *ctx, struct inode *inode,</div><div class='add'>+			 loff_t pos, size_t copied)</div><div class='add'>+{</div><div class='add'>+	loff_t i_size, end = pos + copied;</div><div class='add'>+	blkcnt_t add;</div><div class='add'>+	size_t gap;</div><div class='add'>+</div><div class='add'>+	if (end &lt;= i_size_read(inode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ops-&gt;update_i_size) {</div><div class='add'>+		ctx-&gt;ops-&gt;update_i_size(inode, end);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='add'>+	i_size = i_size_read(inode);</div><div class='add'>+	if (end &gt; i_size) {</div><div class='add'>+		i_size_write(inode, end);</div><div class='add'>+#if IS_ENABLED(CONFIG_FSCACHE)</div><div class='add'>+		fscache_update_cookie(ctx-&gt;cache, NULL, &amp;end);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		gap = SECTOR_SIZE - (i_size &amp; (SECTOR_SIZE - 1));</div><div class='add'>+		if (copied &gt; gap) {</div><div class='add'>+			add = DIV_ROUND_UP(copied - gap, SECTOR_SIZE);</div><div class='add'>+</div><div class='add'>+			inode-&gt;i_blocks = min_t(blkcnt_t,</div><div class='add'>+						DIV_ROUND_UP(end, SECTOR_SIZE),</div><div class='add'>+						inode-&gt;i_blocks + add);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netfs_perform_write - Copy data into the pagecache.</div><div class='ctx'>  * @iocb: The operation parameters</div><div class='ctx'>  * @iter: The source buffer</div><div class='del'>- * @netfs_group: Grouping for dirty pages (eg. ceph snaps).</div><div class='add'>+ * @netfs_group: Grouping for dirty folios (eg. ceph snaps).</div><div class='ctx'>  *</div><div class='del'>- * Copy data into pagecache pages attached to the inode specified by @iocb.</div><div class='add'>+ * Copy data into pagecache folios attached to the inode specified by @iocb.</div><div class='ctx'>  * The caller must hold appropriate inode locks.</div><div class='ctx'>  *</div><div class='del'>- * Dirty pages are tagged with a netfs_folio struct if they're not up to date</div><div class='del'>- * to indicate the range modified.  Dirty pages may also be tagged with a</div><div class='add'>+ * Dirty folios are tagged with a netfs_folio struct if they're not up to date</div><div class='add'>+ * to indicate the range modified.  Dirty folios may also be tagged with a</div><div class='ctx'>  * netfs-specific grouping such that data from an old group gets flushed before</div><div class='ctx'>  * a new one is started.</div><div class='ctx'>  */</div><div class='hunk'>@@ -159,28 +118,23 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		.range_end	= iocb-&gt;ki_pos + iter-&gt;count,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct netfs_io_request *wreq = NULL;</div><div class='del'>-	struct netfs_folio *finfo;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	enum netfs_how_to_modify howto;</div><div class='del'>-	enum netfs_folio_trace trace;</div><div class='del'>-	unsigned int bdp_flags = (iocb-&gt;ki_flags &amp; IOCB_SYNC) ? 0: BDP_ASYNC;</div><div class='del'>-	ssize_t written = 0, ret;</div><div class='del'>-	loff_t i_size, pos = iocb-&gt;ki_pos, from, to;</div><div class='del'>-	size_t max_chunk = PAGE_SIZE &lt;&lt; MAX_PAGECACHE_ORDER;</div><div class='add'>+	struct folio *folio = NULL, *writethrough = NULL;</div><div class='add'>+	unsigned int bdp_flags = (iocb-&gt;ki_flags &amp; IOCB_NOWAIT) ? BDP_ASYNC : 0;</div><div class='add'>+	ssize_t written = 0, ret, ret2;</div><div class='add'>+	loff_t pos = iocb-&gt;ki_pos;</div><div class='add'>+	size_t max_chunk = mapping_max_folio_size(mapping);</div><div class='ctx'> 	bool maybe_trouble = false;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(NETFS_ICTX_WRITETHROUGH, &amp;ctx-&gt;flags) ||</div><div class='del'>-		     iocb-&gt;ki_flags &amp; (IOCB_DSYNC | IOCB_SYNC))</div><div class='add'>+	if (unlikely(iocb-&gt;ki_flags &amp; (IOCB_DSYNC | IOCB_SYNC))</div><div class='ctx'> 	    ) {</div><div class='del'>-		if (pos &lt; i_size_read(inode)) {</div><div class='del'>-			ret = filemap_write_and_wait_range(mapping, pos, pos + iter-&gt;count);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		wbc_attach_fdatawrite_inode(&amp;wbc, mapping-&gt;host);</div><div class='ctx'> </div><div class='add'>+		ret = filemap_write_and_wait_range(mapping, pos, pos + iter-&gt;count);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			wbc_detach_inode(&amp;wbc);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		wreq = netfs_begin_writethrough(iocb, iter-&gt;count);</div><div class='ctx'> 		if (IS_ERR(wreq)) {</div><div class='ctx'> 			wbc_detach_inode(&amp;wbc);</div><div class='hunk'>@@ -190,19 +144,20 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!is_sync_kiocb(iocb))</div><div class='ctx'> 			wreq-&gt;iocb = iocb;</div><div class='del'>-		wreq-&gt;cleanup = netfs_cleanup_buffered_write;</div><div class='add'>+		netfs_stat(&amp;netfs_n_wh_writethrough);</div><div class='add'>+	} else {</div><div class='add'>+		netfs_stat(&amp;netfs_n_wh_buffered_write);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='add'>+		struct netfs_folio *finfo;</div><div class='add'>+		struct netfs_group *group;</div><div class='add'>+		unsigned long long fpos;</div><div class='ctx'> 		size_t flen;</div><div class='ctx'> 		size_t offset;	/* Offset into pagecache folio */</div><div class='ctx'> 		size_t part;	/* Bytes to write to folio */</div><div class='ctx'> 		size_t copied;	/* Bytes copied from user */</div><div class='ctx'> </div><div class='del'>-		ret = balance_dirty_pages_ratelimited_flags(mapping, bdp_flags);</div><div class='del'>-		if (unlikely(ret &lt; 0))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		offset = pos &amp; (max_chunk - 1);</div><div class='ctx'> 		part = min(max_chunk - offset, iov_iter_count(iter));</div><div class='ctx'> </div><div class='hunk'>@@ -221,101 +176,132 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		if (unlikely(fault_in_iov_iter_readable(iter, part) == part))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = -ENOMEM;</div><div class='ctx'> 		folio = netfs_grab_folio_for_write(mapping, pos, part);</div><div class='del'>-		if (!folio)</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			ret = PTR_ERR(folio);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		flen = folio_size(folio);</div><div class='del'>-		offset = pos &amp; (flen - 1);</div><div class='add'>+		fpos = folio_pos(folio);</div><div class='add'>+		offset = pos - fpos;</div><div class='ctx'> 		part = min_t(size_t, flen - offset, part);</div><div class='ctx'> </div><div class='add'>+		/* Wait for writeback to complete.  The writeback engine owns</div><div class='add'>+		 * the info in folio-&gt;private and may change it until it</div><div class='add'>+		 * removes the WB mark.</div><div class='add'>+		 */</div><div class='add'>+		if (folio_get_private(folio) &amp;&amp;</div><div class='add'>+		    folio_wait_writeback_killable(folio)) {</div><div class='add'>+			ret = written ? -EINTR : -ERESTARTSYS;</div><div class='add'>+			goto error_folio_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			ret = written ? -EINTR : -ERESTARTSYS;</div><div class='ctx'> 			goto error_folio_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* See if we need to prefetch the area we're going to modify.</div><div class='del'>-		 * We need to do this before we get a lock on the folio in case</div><div class='del'>-		 * there's more than one writer competing for the same cache</div><div class='del'>-		 * block.</div><div class='add'>+		/* Decide how we should modify a folio.  We might be attempting</div><div class='add'>+		 * to do write-streaming, in which case we don't want to a</div><div class='add'>+		 * local RMW cycle if we can avoid it.  If we're doing local</div><div class='add'>+		 * caching or content crypto, we award that priority over</div><div class='add'>+		 * avoiding RMW.  If the file is open readably, then we also</div><div class='add'>+		 * assume that we may want to read what we wrote.</div><div class='ctx'> 		 */</div><div class='del'>-		howto = netfs_how_to_modify(ctx, file, folio, netfs_group,</div><div class='del'>-					    flen, offset, part, maybe_trouble);</div><div class='del'>-		_debug("howto %u", howto);</div><div class='del'>-		switch (howto) {</div><div class='del'>-		case NETFS_JUST_PREFETCH:</div><div class='del'>-			ret = netfs_prefetch_for_write(file, folio, offset, part);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				_debug("prefetch = %zd", ret);</div><div class='del'>-				goto error_folio_unlock;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_FOLIO_IS_UPTODATE:</div><div class='del'>-		case NETFS_WHOLE_FOLIO_MODIFY:</div><div class='del'>-		case NETFS_STREAMING_WRITE_CONT:</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_MODIFY_AND_CLEAR:</div><div class='del'>-			zero_user_segment(&amp;folio-&gt;page, 0, offset);</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_STREAMING_WRITE:</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			if (WARN_ON(folio_get_private(folio)))</div><div class='del'>-				goto error_folio_unlock;</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_FLUSH_CONTENT:</div><div class='del'>-			trace_netfs_folio(folio, netfs_flush_content);</div><div class='del'>-			from = folio_pos(folio);</div><div class='del'>-			to = from + folio_size(folio) - 1;</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			folio_put(folio);</div><div class='del'>-			ret = filemap_write_and_wait_range(mapping, from, to);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto error_folio_unlock;</div><div class='del'>-			continue;</div><div class='add'>+		finfo = netfs_folio_info(folio);</div><div class='add'>+		group = netfs_folio_group(folio);</div><div class='add'>+</div><div class='add'>+		if (unlikely(group != netfs_group) &amp;&amp;</div><div class='add'>+		    group != NETFS_FOLIO_COPY_TO_CACHE)</div><div class='add'>+			goto flush_content;</div><div class='add'>+</div><div class='add'>+		if (folio_test_uptodate(folio)) {</div><div class='add'>+			if (mapping_writably_mapped(mapping))</div><div class='add'>+				flush_dcache_folio(folio);</div><div class='add'>+			copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='add'>+			if (unlikely(copied == 0))</div><div class='add'>+				goto copy_failed;</div><div class='add'>+			netfs_set_group(folio, netfs_group);</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_is_uptodate);</div><div class='add'>+			goto copied;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (mapping_writably_mapped(mapping))</div><div class='del'>-			flush_dcache_folio(folio);</div><div class='del'>-</div><div class='del'>-		copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='del'>-</div><div class='del'>-		flush_dcache_folio(folio);</div><div class='del'>-</div><div class='del'>-		/* Deal with a (partially) failed copy */</div><div class='del'>-		if (copied == 0) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto error_folio_unlock;</div><div class='add'>+		/* If the page is above the zero-point then we assume that the</div><div class='add'>+		 * server would just return a block of zeros or a short read if</div><div class='add'>+		 * we try to read it.</div><div class='add'>+		 */</div><div class='add'>+		if (fpos &gt;= ctx-&gt;zero_point) {</div><div class='add'>+			folio_zero_segment(folio, 0, offset);</div><div class='add'>+			copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='add'>+			if (unlikely(copied == 0))</div><div class='add'>+				goto copy_failed;</div><div class='add'>+			folio_zero_segment(folio, offset + copied, flen);</div><div class='add'>+			__netfs_set_group(folio, netfs_group);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+			trace_netfs_folio(folio, netfs_modify_and_clear);</div><div class='add'>+			goto copied;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		trace = (enum netfs_folio_trace)howto;</div><div class='del'>-		switch (howto) {</div><div class='del'>-		case NETFS_FOLIO_IS_UPTODATE:</div><div class='del'>-		case NETFS_JUST_PREFETCH:</div><div class='del'>-			netfs_set_group(folio, netfs_group);</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_MODIFY_AND_CLEAR:</div><div class='del'>-			zero_user_segment(&amp;folio-&gt;page, offset + copied, flen);</div><div class='del'>-			netfs_set_group(folio, netfs_group);</div><div class='del'>-			folio_mark_uptodate(folio);</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_WHOLE_FOLIO_MODIFY:</div><div class='add'>+		/* See if we can write a whole folio in one go. */</div><div class='add'>+		if (!maybe_trouble &amp;&amp; offset == 0 &amp;&amp; part &gt;= flen) {</div><div class='add'>+			copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='add'>+			if (unlikely(copied == 0))</div><div class='add'>+				goto copy_failed;</div><div class='ctx'> 			if (unlikely(copied &lt; part)) {</div><div class='ctx'> 				maybe_trouble = true;</div><div class='ctx'> 				iov_iter_revert(iter, copied);</div><div class='ctx'> 				copied = 0;</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='del'>-			netfs_set_group(folio, netfs_group);</div><div class='add'>+			__netfs_set_group(folio, netfs_group);</div><div class='ctx'> 			folio_mark_uptodate(folio);</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_STREAMING_WRITE:</div><div class='add'>+			trace_netfs_folio(folio, netfs_whole_folio_modify);</div><div class='add'>+			goto copied;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We don't want to do a streaming write on a file that loses</div><div class='add'>+		 * caching service temporarily because the backing store got</div><div class='add'>+		 * culled and we don't really want to get a streaming write on</div><div class='add'>+		 * a file that's open for reading as -&gt;read_folio() then has to</div><div class='add'>+		 * be able to flush it.</div><div class='add'>+		 */</div><div class='add'>+		if ((file-&gt;f_mode &amp; FMODE_READ) ||</div><div class='add'>+		    netfs_is_cache_enabled(ctx)) {</div><div class='add'>+			if (finfo) {</div><div class='add'>+				netfs_stat(&amp;netfs_n_wh_wstream_conflict);</div><div class='add'>+				goto flush_content;</div><div class='add'>+			}</div><div class='add'>+			ret = netfs_prefetch_for_write(file, folio, offset, part);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				_debug("prefetch = %zd", ret);</div><div class='add'>+				goto error_folio_unlock;</div><div class='add'>+			}</div><div class='add'>+			/* Note that copy-to-cache may have been set. */</div><div class='add'>+</div><div class='add'>+			copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='add'>+			if (unlikely(copied == 0))</div><div class='add'>+				goto copy_failed;</div><div class='add'>+			netfs_set_group(folio, netfs_group);</div><div class='add'>+			trace_netfs_folio(folio, netfs_just_prefetch);</div><div class='add'>+			goto copied;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!finfo) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			if (WARN_ON(folio_get_private(folio)))</div><div class='add'>+				goto error_folio_unlock;</div><div class='add'>+			copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='add'>+			if (unlikely(copied == 0))</div><div class='add'>+				goto copy_failed;</div><div class='ctx'> 			if (offset == 0 &amp;&amp; copied == flen) {</div><div class='del'>-				netfs_set_group(folio, netfs_group);</div><div class='add'>+				__netfs_set_group(folio, netfs_group);</div><div class='ctx'> 				folio_mark_uptodate(folio);</div><div class='del'>-				trace = netfs_streaming_filled_page;</div><div class='del'>-				break;</div><div class='add'>+				trace_netfs_folio(folio, netfs_streaming_filled_page);</div><div class='add'>+				goto copied;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			finfo = kzalloc(sizeof(*finfo), GFP_KERNEL);</div><div class='ctx'> 			if (!finfo) {</div><div class='ctx'> 				iov_iter_revert(iter, copied);</div><div class='hunk'>@@ -327,9 +313,18 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 			finfo-&gt;dirty_len = copied;</div><div class='ctx'> 			folio_attach_private(folio, (void *)((unsigned long)finfo |</div><div class='ctx'> 							     NETFS_FOLIO_INFO));</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_STREAMING_WRITE_CONT:</div><div class='del'>-			finfo = netfs_folio_info(folio);</div><div class='add'>+			trace_netfs_folio(folio, netfs_streaming_write);</div><div class='add'>+			goto copied;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We can continue a streaming write only if it continues on</div><div class='add'>+		 * from the previous.  If it overlaps, we must flush lest we</div><div class='add'>+		 * suffer a partial copy and disjoint dirty regions.</div><div class='add'>+		 */</div><div class='add'>+		if (offset == finfo-&gt;dirty_offset + finfo-&gt;dirty_len) {</div><div class='add'>+			copied = copy_folio_from_iter_atomic(folio, offset, part, iter);</div><div class='add'>+			if (unlikely(copied == 0))</div><div class='add'>+				goto copy_failed;</div><div class='ctx'> 			finfo-&gt;dirty_len += copied;</div><div class='ctx'> 			if (finfo-&gt;dirty_offset == 0 &amp;&amp; finfo-&gt;dirty_len == flen) {</div><div class='ctx'> 				if (finfo-&gt;netfs_group)</div><div class='hunk'>@@ -338,72 +333,76 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 					folio_detach_private(folio);</div><div class='ctx'> 				folio_mark_uptodate(folio);</div><div class='ctx'> 				kfree(finfo);</div><div class='del'>-				trace = netfs_streaming_cont_filled_page;</div><div class='add'>+				trace_netfs_folio(folio, netfs_streaming_cont_filled_page);</div><div class='add'>+			} else {</div><div class='add'>+				trace_netfs_folio(folio, netfs_streaming_write_cont);</div><div class='ctx'> 			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			WARN(true, "Unexpected modify type %u ix=%lx\n",</div><div class='del'>-			     howto, folio_index(folio));</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto error_folio_unlock;</div><div class='add'>+			goto copied;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		trace_netfs_folio(folio, trace);</div><div class='add'>+		/* Incompatible write; flush the folio and try again. */</div><div class='add'>+	flush_content:</div><div class='add'>+		trace_netfs_folio(folio, netfs_flush_content);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='add'>+		ret = filemap_write_and_wait_range(mapping, fpos, fpos + flen - 1);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+	copied:</div><div class='add'>+		flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 		/* Update the inode size if we moved the EOF marker */</div><div class='del'>-		i_size = i_size_read(inode);</div><div class='add'>+		netfs_update_i_size(ctx, inode, pos, copied);</div><div class='ctx'> 		pos += copied;</div><div class='del'>-		if (pos &gt; i_size) {</div><div class='del'>-			if (ctx-&gt;ops-&gt;update_i_size) {</div><div class='del'>-				ctx-&gt;ops-&gt;update_i_size(inode, pos);</div><div class='del'>-			} else {</div><div class='del'>-				i_size_write(inode, pos);</div><div class='del'>-#if IS_ENABLED(CONFIG_FSCACHE)</div><div class='del'>-				fscache_update_cookie(ctx-&gt;cache, NULL, &amp;pos);</div><div class='del'>-#endif</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		written += copied;</div><div class='ctx'> </div><div class='ctx'> 		if (likely(!wreq)) {</div><div class='ctx'> 			folio_mark_dirty(folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (folio_test_dirty(folio))</div><div class='del'>-				/* Sigh.  mmap. */</div><div class='del'>-				folio_clear_dirty_for_io(folio);</div><div class='del'>-			/* We make multiple writes to the folio... */</div><div class='del'>-			if (!folio_test_writeback(folio)) {</div><div class='del'>-				folio_wait_fscache(folio);</div><div class='del'>-				folio_start_writeback(folio);</div><div class='del'>-				folio_start_fscache(folio);</div><div class='del'>-				if (wreq-&gt;iter.count == 0)</div><div class='del'>-					trace_netfs_folio(folio, netfs_folio_trace_wthru);</div><div class='del'>-				else</div><div class='del'>-					trace_netfs_folio(folio, netfs_folio_trace_wthru_plus);</div><div class='del'>-			}</div><div class='del'>-			netfs_advance_writethrough(wreq, copied,</div><div class='del'>-						   offset + copied == flen);</div><div class='add'>+			netfs_advance_writethrough(wreq, &amp;wbc, folio, copied,</div><div class='add'>+						   offset + copied == flen,</div><div class='add'>+						   &amp;writethrough);</div><div class='add'>+			/* Folio unlocked */</div><div class='ctx'> 		}</div><div class='ctx'> 	retry:</div><div class='del'>-		folio_unlock(folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		folio = NULL;</div><div class='ctx'> </div><div class='add'>+		ret = balance_dirty_pages_ratelimited_flags(mapping, bdp_flags);</div><div class='add'>+		if (unlikely(ret &lt; 0))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	} while (iov_iter_count(iter));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	if (likely(written)) {</div><div class='add'>+		/* Set indication that ctime and mtime got updated in case</div><div class='add'>+		 * close is deferred.</div><div class='add'>+		 */</div><div class='add'>+		set_bit(NETFS_ICTX_MODIFIED_ATTR, &amp;ctx-&gt;flags);</div><div class='add'>+		if (unlikely(ctx-&gt;ops-&gt;post_modify))</div><div class='add'>+			ctx-&gt;ops-&gt;post_modify(inode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(wreq)) {</div><div class='del'>-		ret = netfs_end_writethrough(wreq, iocb);</div><div class='add'>+		ret2 = netfs_end_writethrough(wreq, &amp;wbc, writethrough);</div><div class='ctx'> 		wbc_detach_inode(&amp;wbc);</div><div class='del'>-		if (ret == -EIOCBQUEUED)</div><div class='del'>-			return ret;</div><div class='add'>+		if (ret2 == -EIOCBQUEUED)</div><div class='add'>+			return ret2;</div><div class='add'>+		if (ret == 0 &amp;&amp; ret2 &lt; 0)</div><div class='add'>+			ret = ret2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iocb-&gt;ki_pos += written;</div><div class='ctx'> 	_leave(" = %zd [%zd]", written, ret);</div><div class='ctx'> 	return written ? written : ret;</div><div class='ctx'> </div><div class='add'>+copy_failed:</div><div class='add'>+	ret = -EFAULT;</div><div class='ctx'> error_folio_unlock:</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='hunk'>@@ -415,7 +414,7 @@ EXPORT_SYMBOL(netfs_perform_write);</div><div class='ctx'>  * netfs_buffered_write_iter_locked - write data to a file</div><div class='ctx'>  * @iocb:	IO state structure (file, offset, etc.)</div><div class='ctx'>  * @from:	iov_iter with data to write</div><div class='del'>- * @netfs_group: Grouping for dirty pages (eg. ceph snaps).</div><div class='add'>+ * @netfs_group: Grouping for dirty folios (eg. ceph snaps).</div><div class='ctx'>  *</div><div class='ctx'>  * This function does all the work needed for actually writing data to a</div><div class='ctx'>  * file. It does all basic checks, removes SUID from the file, updates</div><div class='hunk'>@@ -476,6 +475,9 @@ ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> </div><div class='ctx'> 	_enter("%llx,%zx,%llx", iocb-&gt;ki_pos, iov_iter_count(from), i_size_read(inode));</div><div class='ctx'> </div><div class='add'>+	if (!iov_iter_count(from))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if ((iocb-&gt;ki_flags &amp; IOCB_DIRECT) ||</div><div class='ctx'> 	    test_bit(NETFS_ICTX_UNBUFFERED, &amp;ictx-&gt;flags))</div><div class='ctx'> 		return netfs_unbuffered_write_iter(iocb, from);</div><div class='hunk'>@@ -496,37 +498,44 @@ EXPORT_SYMBOL(netfs_file_write_iter);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Notification that a previously read-only page is about to become writable.</div><div class='del'>- * Note that the caller indicates a single page of a multipage folio.</div><div class='add'>+ * The caller indicates the precise page that needs to be written to, but</div><div class='add'>+ * we only track group on a per-folio basis, so we block more often than</div><div class='add'>+ * we might otherwise.</div><div class='ctx'>  */</div><div class='ctx'> vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_group)</div><div class='ctx'> {</div><div class='add'>+	struct netfs_group *group;</div><div class='ctx'> 	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='ctx'> 	struct file *file = vmf-&gt;vma-&gt;vm_file;</div><div class='add'>+	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	vm_fault_t ret = VM_FAULT_RETRY;</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(inode);</div><div class='add'>+	vm_fault_t ret = VM_FAULT_NOPAGE;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	_enter("%lx", folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	sb_start_pagefault(inode-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	if (folio_wait_writeback_killable(folio))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	if (folio_lock_killable(folio) &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='add'>+	if (folio-&gt;mapping != mapping)</div><div class='add'>+		goto unlock;</div><div class='add'>+	if (folio_wait_writeback_killable(folio) &lt; 0)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Can we see a streaming write here? */</div><div class='ctx'> 	if (WARN_ON(!folio_test_uptodate(folio))) {</div><div class='del'>-		ret = VM_FAULT_SIGBUS | VM_FAULT_LOCKED;</div><div class='del'>-		goto out;</div><div class='add'>+		ret = VM_FAULT_SIGBUS;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netfs_folio_group(folio) != netfs_group) {</div><div class='add'>+	group = netfs_folio_group(folio);</div><div class='add'>+	if (group != netfs_group &amp;&amp; group != NETFS_FOLIO_COPY_TO_CACHE) {</div><div class='ctx'> 		folio_unlock(folio);</div><div class='del'>-		err = filemap_fdatawait_range(inode-&gt;i_mapping,</div><div class='del'>-					      folio_pos(folio),</div><div class='del'>-					      folio_pos(folio) + folio_size(folio));</div><div class='add'>+		err = filemap_fdatawrite_range(mapping,</div><div class='add'>+					       folio_pos(folio),</div><div class='add'>+					       folio_next_pos(folio));</div><div class='ctx'> 		switch (err) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			ret = VM_FAULT_RETRY;</div><div class='hunk'>@@ -546,708 +555,15 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr</div><div class='ctx'> 		trace_netfs_folio(folio, netfs_folio_trace_mkwrite);</div><div class='ctx'> 	netfs_set_group(folio, netfs_group);</div><div class='ctx'> 	file_update_time(file);</div><div class='add'>+	set_bit(NETFS_ICTX_MODIFIED_ATTR, &amp;ictx-&gt;flags);</div><div class='add'>+	if (ictx-&gt;ops-&gt;post_modify)</div><div class='add'>+		ictx-&gt;ops-&gt;post_modify(inode);</div><div class='ctx'> 	ret = VM_FAULT_LOCKED;</div><div class='ctx'> out:</div><div class='ctx'> 	sb_end_pagefault(inode-&gt;i_sb);</div><div class='ctx'> 	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netfs_page_mkwrite);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Kill all the pages in the given range</div><div class='del'>- */</div><div class='del'>-static void netfs_kill_pages(struct address_space *mapping,</div><div class='del'>-			     loff_t start, loff_t len)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t index = start / PAGE_SIZE;</div><div class='del'>-	pgoff_t last = (start + len - 1) / PAGE_SIZE, next;</div><div class='del'>-</div><div class='del'>-	_enter("%llx-%llx", start, start + len - 1);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		_debug("kill %lx (to %lx)", index, last);</div><div class='del'>-</div><div class='del'>-		folio = filemap_get_folio(mapping, index);</div><div class='del'>-		if (IS_ERR(folio)) {</div><div class='del'>-			next = index + 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		next = folio_next_index(folio);</div><div class='del'>-</div><div class='del'>-		trace_netfs_folio(folio, netfs_folio_trace_kill);</div><div class='del'>-		folio_clear_uptodate(folio);</div><div class='del'>-		if (folio_test_fscache(folio))</div><div class='del'>-			folio_end_fscache(folio);</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-		folio_lock(folio);</div><div class='del'>-		generic_error_remove_folio(mapping, folio);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-</div><div class='del'>-	} while (index = next, index &lt;= last);</div><div class='del'>-</div><div class='del'>-	_leave("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Redirty all the pages in a given range.</div><div class='del'>- */</div><div class='del'>-static void netfs_redirty_pages(struct address_space *mapping,</div><div class='del'>-				loff_t start, loff_t len)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t index = start / PAGE_SIZE;</div><div class='del'>-	pgoff_t last = (start + len - 1) / PAGE_SIZE, next;</div><div class='del'>-</div><div class='del'>-	_enter("%llx-%llx", start, start + len - 1);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		_debug("redirty %llx @%llx", len, start);</div><div class='del'>-</div><div class='del'>-		folio = filemap_get_folio(mapping, index);</div><div class='del'>-		if (IS_ERR(folio)) {</div><div class='del'>-			next = index + 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		next = folio_next_index(folio);</div><div class='del'>-		trace_netfs_folio(folio, netfs_folio_trace_redirty);</div><div class='del'>-		filemap_dirty_folio(mapping, folio);</div><div class='del'>-		if (folio_test_fscache(folio))</div><div class='del'>-			folio_end_fscache(folio);</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	} while (index = next, index &lt;= last);</div><div class='del'>-</div><div class='del'>-	balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-</div><div class='del'>-	_leave("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Completion of write to server</div><div class='del'>- */</div><div class='del'>-static void netfs_pages_written_back(struct netfs_io_request *wreq)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = wreq-&gt;mapping;</div><div class='del'>-	struct netfs_folio *finfo;</div><div class='del'>-	struct netfs_group *group = NULL;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t last;</div><div class='del'>-	int gcount = 0;</div><div class='del'>-</div><div class='del'>-	XA_STATE(xas, &amp;mapping-&gt;i_pages, wreq-&gt;start / PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	_enter("%llx-%llx", wreq-&gt;start, wreq-&gt;start + wreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	last = (wreq-&gt;start + wreq-&gt;len - 1) / PAGE_SIZE;</div><div class='del'>-	xas_for_each(&amp;xas, folio, last) {</div><div class='del'>-		WARN(!folio_test_writeback(folio),</div><div class='del'>-		     "bad %zx @%llx page %lx %lx\n",</div><div class='del'>-		     wreq-&gt;len, wreq-&gt;start, folio_index(folio), last);</div><div class='del'>-</div><div class='del'>-		if ((finfo = netfs_folio_info(folio))) {</div><div class='del'>-			/* Streaming writes cannot be redirtied whilst under</div><div class='del'>-			 * writeback, so discard the streaming record.</div><div class='del'>-			 */</div><div class='del'>-			folio_detach_private(folio);</div><div class='del'>-			group = finfo-&gt;netfs_group;</div><div class='del'>-			gcount++;</div><div class='del'>-			trace_netfs_folio(folio, netfs_folio_trace_clear_s);</div><div class='del'>-			kfree(finfo);</div><div class='del'>-		} else if ((group = netfs_folio_group(folio))) {</div><div class='del'>-			/* Need to detach the group pointer if the page didn't</div><div class='del'>-			 * get redirtied.  If it has been redirtied, then it</div><div class='del'>-			 * must be within the same group.</div><div class='del'>-			 */</div><div class='del'>-			if (folio_test_dirty(folio)) {</div><div class='del'>-				trace_netfs_folio(folio, netfs_folio_trace_redirtied);</div><div class='del'>-				goto end_wb;</div><div class='del'>-			}</div><div class='del'>-			if (folio_trylock(folio)) {</div><div class='del'>-				if (!folio_test_dirty(folio)) {</div><div class='del'>-					folio_detach_private(folio);</div><div class='del'>-					gcount++;</div><div class='del'>-					trace_netfs_folio(folio, netfs_folio_trace_clear_g);</div><div class='del'>-				} else {</div><div class='del'>-					trace_netfs_folio(folio, netfs_folio_trace_redirtied);</div><div class='del'>-				}</div><div class='del'>-				folio_unlock(folio);</div><div class='del'>-				goto end_wb;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			xas_pause(&amp;xas);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			folio_lock(folio);</div><div class='del'>-			if (!folio_test_dirty(folio)) {</div><div class='del'>-				folio_detach_private(folio);</div><div class='del'>-				gcount++;</div><div class='del'>-				trace_netfs_folio(folio, netfs_folio_trace_clear_g);</div><div class='del'>-			} else {</div><div class='del'>-				trace_netfs_folio(folio, netfs_folio_trace_redirtied);</div><div class='del'>-			}</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-		} else {</div><div class='del'>-			trace_netfs_folio(folio, netfs_folio_trace_clear);</div><div class='del'>-		}</div><div class='del'>-	end_wb:</div><div class='del'>-		if (folio_test_fscache(folio))</div><div class='del'>-			folio_end_fscache(folio);</div><div class='del'>-		xas_advance(&amp;xas, folio_next_index(folio) - 1);</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	netfs_put_group_many(group, gcount);</div><div class='del'>-	_leave("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Deal with the disposition of the folios that are under writeback to close</div><div class='del'>- * out the operation.</div><div class='del'>- */</div><div class='del'>-static void netfs_cleanup_buffered_write(struct netfs_io_request *wreq)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = wreq-&gt;mapping;</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='del'>-	switch (wreq-&gt;error) {</div><div class='del'>-	case 0:</div><div class='del'>-		netfs_pages_written_back(wreq);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		pr_notice("R=%08x Unexpected error %d\n", wreq-&gt;debug_id, wreq-&gt;error);</div><div class='del'>-		fallthrough;</div><div class='del'>-	case -EACCES:</div><div class='del'>-	case -EPERM:</div><div class='del'>-	case -ENOKEY:</div><div class='del'>-	case -EKEYEXPIRED:</div><div class='del'>-	case -EKEYREJECTED:</div><div class='del'>-	case -EKEYREVOKED:</div><div class='del'>-	case -ENETRESET:</div><div class='del'>-	case -EDQUOT:</div><div class='del'>-	case -ENOSPC:</div><div class='del'>-		netfs_redirty_pages(mapping, wreq-&gt;start, wreq-&gt;len);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case -EROFS:</div><div class='del'>-	case -EIO:</div><div class='del'>-	case -EREMOTEIO:</div><div class='del'>-	case -EFBIG:</div><div class='del'>-	case -ENOENT:</div><div class='del'>-	case -ENOMEDIUM:</div><div class='del'>-	case -ENXIO:</div><div class='del'>-		netfs_kill_pages(mapping, wreq-&gt;start, wreq-&gt;len);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wreq-&gt;error)</div><div class='del'>-		mapping_set_error(mapping, wreq-&gt;error);</div><div class='del'>-	if (wreq-&gt;netfs_ops-&gt;done)</div><div class='del'>-		wreq-&gt;netfs_ops-&gt;done(wreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Extend the region to be written back to include subsequent contiguously</div><div class='del'>- * dirty pages if possible, but don't sleep while doing so.</div><div class='del'>- *</div><div class='del'>- * If this page holds new content, then we can include filler zeros in the</div><div class='del'>- * writeback.</div><div class='del'>- */</div><div class='del'>-static void netfs_extend_writeback(struct address_space *mapping,</div><div class='del'>-				   struct netfs_group *group,</div><div class='del'>-				   struct xa_state *xas,</div><div class='del'>-				   long *_count,</div><div class='del'>-				   loff_t start,</div><div class='del'>-				   loff_t max_len,</div><div class='del'>-				   bool caching,</div><div class='del'>-				   size_t *_len,</div><div class='del'>-				   size_t *_top)</div><div class='del'>-{</div><div class='del'>-	struct netfs_folio *finfo;</div><div class='del'>-	struct folio_batch fbatch;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	pgoff_t index = (start + *_len) / PAGE_SIZE;</div><div class='del'>-	size_t len;</div><div class='del'>-	void *priv;</div><div class='del'>-	bool stop = true;</div><div class='del'>-</div><div class='del'>-	folio_batch_init(&amp;fbatch);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* Firstly, we gather up a batch of contiguous dirty pages</div><div class='del'>-		 * under the RCU read lock - but we can't clear the dirty flags</div><div class='del'>-		 * there if any of those pages are mapped.</div><div class='del'>-		 */</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-</div><div class='del'>-		xas_for_each(xas, folio, ULONG_MAX) {</div><div class='del'>-			stop = true;</div><div class='del'>-			if (xas_retry(xas, folio))</div><div class='del'>-				continue;</div><div class='del'>-			if (xa_is_value(folio))</div><div class='del'>-				break;</div><div class='del'>-			if (folio_index(folio) != index) {</div><div class='del'>-				xas_reset(xas);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!folio_try_get_rcu(folio)) {</div><div class='del'>-				xas_reset(xas);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Has the folio moved or been split? */</div><div class='del'>-			if (unlikely(folio != xas_reload(xas))) {</div><div class='del'>-				folio_put(folio);</div><div class='del'>-				xas_reset(xas);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!folio_trylock(folio)) {</div><div class='del'>-				folio_put(folio);</div><div class='del'>-				xas_reset(xas);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (!folio_test_dirty(folio) ||</div><div class='del'>-			    folio_test_writeback(folio) ||</div><div class='del'>-			    folio_test_fscache(folio)) {</div><div class='del'>-				folio_unlock(folio);</div><div class='del'>-				folio_put(folio);</div><div class='del'>-				xas_reset(xas);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			stop = false;</div><div class='del'>-			len = folio_size(folio);</div><div class='del'>-			priv = folio_get_private(folio);</div><div class='del'>-			if ((const struct netfs_group *)priv != group) {</div><div class='del'>-				stop = true;</div><div class='del'>-				finfo = netfs_folio_info(folio);</div><div class='del'>-				if (finfo-&gt;netfs_group != group ||</div><div class='del'>-				    finfo-&gt;dirty_offset &gt; 0) {</div><div class='del'>-					folio_unlock(folio);</div><div class='del'>-					folio_put(folio);</div><div class='del'>-					xas_reset(xas);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				len = finfo-&gt;dirty_len;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			*_top += folio_size(folio);</div><div class='del'>-			index += folio_nr_pages(folio);</div><div class='del'>-			*_count -= folio_nr_pages(folio);</div><div class='del'>-			*_len += len;</div><div class='del'>-			if (*_len &gt;= max_len || *_count &lt;= 0)</div><div class='del'>-				stop = true;</div><div class='del'>-</div><div class='del'>-			if (!folio_batch_add(&amp;fbatch, folio))</div><div class='del'>-				break;</div><div class='del'>-			if (stop)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		xas_pause(xas);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		/* Now, if we obtained any folios, we can shift them to being</div><div class='del'>-		 * writable and mark them for caching.</div><div class='del'>-		 */</div><div class='del'>-		if (!folio_batch_count(&amp;fbatch))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; folio_batch_count(&amp;fbatch); i++) {</div><div class='del'>-			folio = fbatch.folios[i];</div><div class='del'>-			trace_netfs_folio(folio, netfs_folio_trace_store_plus);</div><div class='del'>-</div><div class='del'>-			if (!folio_clear_dirty_for_io(folio))</div><div class='del'>-				BUG();</div><div class='del'>-			folio_start_writeback(folio);</div><div class='del'>-			netfs_folio_start_fscache(caching, folio);</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		folio_batch_release(&amp;fbatch);</div><div class='del'>-		cond_resched();</div><div class='del'>-	} while (!stop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Synchronously write back the locked page and any subsequent non-locked dirty</div><div class='del'>- * pages.</div><div class='del'>- */</div><div class='del'>-static ssize_t netfs_write_back_from_locked_folio(struct address_space *mapping,</div><div class='del'>-						  struct writeback_control *wbc,</div><div class='del'>-						  struct netfs_group *group,</div><div class='del'>-						  struct xa_state *xas,</div><div class='del'>-						  struct folio *folio,</div><div class='del'>-						  unsigned long long start,</div><div class='del'>-						  unsigned long long end)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *wreq;</div><div class='del'>-	struct netfs_folio *finfo;</div><div class='del'>-	struct netfs_inode *ctx = netfs_inode(mapping-&gt;host);</div><div class='del'>-	unsigned long long i_size = i_size_read(&amp;ctx-&gt;inode);</div><div class='del'>-	size_t len, max_len;</div><div class='del'>-	bool caching = netfs_is_cache_enabled(ctx);</div><div class='del'>-	long count = wbc-&gt;nr_to_write;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	_enter(",%lx,%llx-%llx,%u", folio_index(folio), start, end, caching);</div><div class='del'>-</div><div class='del'>-	wreq = netfs_alloc_request(mapping, NULL, start, folio_size(folio),</div><div class='del'>-				   NETFS_WRITEBACK);</div><div class='del'>-	if (IS_ERR(wreq)) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		return PTR_ERR(wreq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!folio_clear_dirty_for_io(folio))</div><div class='del'>-		BUG();</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-	netfs_folio_start_fscache(caching, folio);</div><div class='del'>-</div><div class='del'>-	count -= folio_nr_pages(folio);</div><div class='del'>-</div><div class='del'>-	/* Find all consecutive lockable dirty pages that have contiguous</div><div class='del'>-	 * written regions, stopping when we find a page that is not</div><div class='del'>-	 * immediately lockable, is not dirty or is missing, or we reach the</div><div class='del'>-	 * end of the range.</div><div class='del'>-	 */</div><div class='del'>-	trace_netfs_folio(folio, netfs_folio_trace_store);</div><div class='del'>-</div><div class='del'>-	len = wreq-&gt;len;</div><div class='del'>-	finfo = netfs_folio_info(folio);</div><div class='del'>-	if (finfo) {</div><div class='del'>-		start += finfo-&gt;dirty_offset;</div><div class='del'>-		if (finfo-&gt;dirty_offset + finfo-&gt;dirty_len != len) {</div><div class='del'>-			len = finfo-&gt;dirty_len;</div><div class='del'>-			goto cant_expand;</div><div class='del'>-		}</div><div class='del'>-		len = finfo-&gt;dirty_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start &lt; i_size) {</div><div class='del'>-		/* Trim the write to the EOF; the extra data is ignored.  Also</div><div class='del'>-		 * put an upper limit on the size of a single storedata op.</div><div class='del'>-		 */</div><div class='del'>-		max_len = 65536 * 4096;</div><div class='del'>-		max_len = min_t(unsigned long long, max_len, end - start + 1);</div><div class='del'>-		max_len = min_t(unsigned long long, max_len, i_size - start);</div><div class='del'>-</div><div class='del'>-		if (len &lt; max_len)</div><div class='del'>-			netfs_extend_writeback(mapping, group, xas, &amp;count, start,</div><div class='del'>-					       max_len, caching, &amp;len, &amp;wreq-&gt;upper_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-cant_expand:</div><div class='del'>-	len = min_t(unsigned long long, len, i_size - start);</div><div class='del'>-</div><div class='del'>-	/* We now have a contiguous set of dirty pages, each with writeback</div><div class='del'>-	 * set; the first page is still locked at this point, but all the rest</div><div class='del'>-	 * have been unlocked.</div><div class='del'>-	 */</div><div class='add'>+unlock:</div><div class='ctx'> 	folio_unlock(folio);</div><div class='del'>-	wreq-&gt;start = start;</div><div class='del'>-	wreq-&gt;len = len;</div><div class='del'>-</div><div class='del'>-	if (start &lt; i_size) {</div><div class='del'>-		_debug("write back %zx @%llx [%llx]", len, start, i_size);</div><div class='del'>-</div><div class='del'>-		/* Speculatively write to the cache.  We have to fix this up</div><div class='del'>-		 * later if the store fails.</div><div class='del'>-		 */</div><div class='del'>-		wreq-&gt;cleanup = netfs_cleanup_buffered_write;</div><div class='del'>-</div><div class='del'>-		iov_iter_xarray(&amp;wreq-&gt;iter, ITER_SOURCE, &amp;mapping-&gt;i_pages, start,</div><div class='del'>-				wreq-&gt;upper_len);</div><div class='del'>-		__set_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags);</div><div class='del'>-		ret = netfs_begin_write(wreq, true, netfs_write_trace_writeback);</div><div class='del'>-		if (ret == 0 || ret == -EIOCBQUEUED)</div><div class='del'>-			wbc-&gt;nr_to_write -= len / PAGE_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		_debug("write discard %zx @%llx [%llx]", len, start, i_size);</div><div class='del'>-</div><div class='del'>-		/* The dirty region was entirely beyond the EOF. */</div><div class='del'>-		fscache_clear_page_bits(mapping, start, len, caching);</div><div class='del'>-		netfs_pages_written_back(wreq);</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netfs_put_request(wreq, false, netfs_rreq_trace_put_return);</div><div class='del'>-	_leave(" = 1");</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write a region of pages back to the server</div><div class='del'>- */</div><div class='del'>-static ssize_t netfs_writepages_begin(struct address_space *mapping,</div><div class='del'>-				      struct writeback_control *wbc,</div><div class='del'>-				      struct netfs_group *group,</div><div class='del'>-				      struct xa_state *xas,</div><div class='del'>-				      unsigned long long *_start,</div><div class='del'>-				      unsigned long long end)</div><div class='del'>-{</div><div class='del'>-	const struct netfs_folio *finfo;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	unsigned long long start = *_start;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	void *priv;</div><div class='del'>-	int skips = 0;</div><div class='del'>-</div><div class='del'>-	_enter("%llx,%llx,", start, end);</div><div class='del'>-</div><div class='del'>-search_again:</div><div class='del'>-	/* Find the first dirty page in the group. */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		folio = xas_find_marked(xas, end / PAGE_SIZE, PAGECACHE_TAG_DIRTY);</div><div class='del'>-		if (xas_retry(xas, folio) || xa_is_value(folio))</div><div class='del'>-			continue;</div><div class='del'>-		if (!folio)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!folio_try_get_rcu(folio)) {</div><div class='del'>-			xas_reset(xas);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(folio != xas_reload(xas))) {</div><div class='del'>-			folio_put(folio);</div><div class='del'>-			xas_reset(xas);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Skip any dirty folio that's not in the group of interest. */</div><div class='del'>-		priv = folio_get_private(folio);</div><div class='del'>-		if ((const struct netfs_group *)priv != group) {</div><div class='del'>-			finfo = netfs_folio_info(folio);</div><div class='del'>-			if (finfo-&gt;netfs_group != group) {</div><div class='del'>-				folio_put(folio);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		xas_pause(xas);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (!folio)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	start = folio_pos(folio); /* May regress with THPs */</div><div class='del'>-</div><div class='del'>-	_debug("wback %lx", folio_index(folio));</div><div class='del'>-</div><div class='del'>-	/* At this point we hold neither the i_pages lock nor the page lock:</div><div class='del'>-	 * the page may be truncated or invalidated (changing page-&gt;mapping to</div><div class='del'>-	 * NULL), or even swizzled back from swapper_space to tmpfs file</div><div class='del'>-	 * mapping</div><div class='del'>-	 */</div><div class='del'>-lock_again:</div><div class='del'>-	if (wbc-&gt;sync_mode != WB_SYNC_NONE) {</div><div class='del'>-		ret = folio_lock_killable(folio);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	} else {</div><div class='del'>-		if (!folio_trylock(folio))</div><div class='del'>-			goto search_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (folio-&gt;mapping != mapping ||</div><div class='del'>-	    !folio_test_dirty(folio)) {</div><div class='del'>-		start += folio_size(folio);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		goto search_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (folio_test_writeback(folio) ||</div><div class='del'>-	    folio_test_fscache(folio)) {</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		if (wbc-&gt;sync_mode != WB_SYNC_NONE) {</div><div class='del'>-			folio_wait_writeback(folio);</div><div class='del'>-#ifdef CONFIG_FSCACHE</div><div class='del'>-			folio_wait_fscache(folio);</div><div class='del'>-#endif</div><div class='del'>-			goto lock_again;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		start += folio_size(folio);</div><div class='del'>-		if (wbc-&gt;sync_mode == WB_SYNC_NONE) {</div><div class='del'>-			if (skips &gt;= 5 || need_resched()) {</div><div class='del'>-				ret = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			skips++;</div><div class='del'>-		}</div><div class='del'>-		goto search_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = netfs_write_back_from_locked_folio(mapping, wbc, group, xas,</div><div class='del'>-						 folio, start, end);</div><div class='del'>-out:</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		*_start = start + ret;</div><div class='del'>-	_leave(" = %zd [%llx]", ret, *_start);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write a region of pages back to the server</div><div class='del'>- */</div><div class='del'>-static int netfs_writepages_region(struct address_space *mapping,</div><div class='del'>-				   struct writeback_control *wbc,</div><div class='del'>-				   struct netfs_group *group,</div><div class='del'>-				   unsigned long long *_start,</div><div class='del'>-				   unsigned long long end)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	XA_STATE(xas, &amp;mapping-&gt;i_pages, *_start / PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = netfs_writepages_begin(mapping, wbc, group, &amp;xas,</div><div class='del'>-					     _start, end);</div><div class='del'>-		if (ret &gt; 0 &amp;&amp; wbc-&gt;nr_to_write &gt; 0)</div><div class='del'>-			cond_resched();</div><div class='del'>-	} while (ret &gt; 0 &amp;&amp; wbc-&gt;nr_to_write &gt; 0);</div><div class='del'>-</div><div class='del'>-	return ret &gt; 0 ? 0 : ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write some of the pending data back to the server</div><div class='del'>- */</div><div class='del'>-int netfs_writepages(struct address_space *mapping,</div><div class='del'>-		     struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct netfs_group *group = NULL;</div><div class='del'>-	loff_t start, end;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	_enter("");</div><div class='del'>-</div><div class='del'>-	/* We have to be careful as we can end up racing with setattr()</div><div class='del'>-	 * truncating the pagecache since the caller doesn't take a lock here</div><div class='del'>-	 * to prevent it.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (wbc-&gt;range_cyclic &amp;&amp; mapping-&gt;writeback_index) {</div><div class='del'>-		start = mapping-&gt;writeback_index * PAGE_SIZE;</div><div class='del'>-		ret = netfs_writepages_region(mapping, wbc, group,</div><div class='del'>-					      &amp;start, LLONG_MAX);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (wbc-&gt;nr_to_write &lt;= 0) {</div><div class='del'>-			mapping-&gt;writeback_index = start / PAGE_SIZE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		start = 0;</div><div class='del'>-		end = mapping-&gt;writeback_index * PAGE_SIZE;</div><div class='del'>-		mapping-&gt;writeback_index = 0;</div><div class='del'>-		ret = netfs_writepages_region(mapping, wbc, group, &amp;start, end);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			mapping-&gt;writeback_index = start / PAGE_SIZE;</div><div class='del'>-	} else if (wbc-&gt;range_start == 0 &amp;&amp; wbc-&gt;range_end == LLONG_MAX) {</div><div class='del'>-		start = 0;</div><div class='del'>-		ret = netfs_writepages_region(mapping, wbc, group,</div><div class='del'>-					      &amp;start, LLONG_MAX);</div><div class='del'>-		if (wbc-&gt;nr_to_write &gt; 0 &amp;&amp; ret == 0)</div><div class='del'>-			mapping-&gt;writeback_index = start / PAGE_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		start = wbc-&gt;range_start;</div><div class='del'>-		ret = netfs_writepages_region(mapping, wbc, group,</div><div class='del'>-					      &amp;start, wbc-&gt;range_end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	_leave(" = %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netfs_writepages);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Deal with the disposition of a laundered folio.</div><div class='del'>- */</div><div class='del'>-static void netfs_cleanup_launder_folio(struct netfs_io_request *wreq)</div><div class='del'>-{</div><div class='del'>-	if (wreq-&gt;error) {</div><div class='del'>-		pr_notice("R=%08x Laundering error %d\n", wreq-&gt;debug_id, wreq-&gt;error);</div><div class='del'>-		mapping_set_error(wreq-&gt;mapping, wreq-&gt;error);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * netfs_launder_folio - Clean up a dirty folio that's being invalidated</div><div class='del'>- * @folio: The folio to clean</div><div class='del'>- *</div><div class='del'>- * This is called to write back a folio that's being invalidated when an inode</div><div class='del'>- * is getting torn down.  Ideally, writepages would be used instead.</div><div class='del'>- */</div><div class='del'>-int netfs_launder_folio(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *wreq;</div><div class='del'>-	struct address_space *mapping = folio-&gt;mapping;</div><div class='del'>-	struct netfs_folio *finfo = netfs_folio_info(folio);</div><div class='del'>-	struct netfs_group *group = netfs_folio_group(folio);</div><div class='del'>-	struct bio_vec bvec;</div><div class='del'>-	unsigned long long i_size = i_size_read(mapping-&gt;host);</div><div class='del'>-	unsigned long long start = folio_pos(folio);</div><div class='del'>-	size_t offset = 0, len;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (finfo) {</div><div class='del'>-		offset = finfo-&gt;dirty_offset;</div><div class='del'>-		start += offset;</div><div class='del'>-		len = finfo-&gt;dirty_len;</div><div class='del'>-	} else {</div><div class='del'>-		len = folio_size(folio);</div><div class='del'>-	}</div><div class='del'>-	len = min_t(unsigned long long, len, i_size - start);</div><div class='del'>-</div><div class='del'>-	wreq = netfs_alloc_request(mapping, NULL, start, len, NETFS_LAUNDER_WRITE);</div><div class='del'>-	if (IS_ERR(wreq)) {</div><div class='del'>-		ret = PTR_ERR(wreq);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!folio_clear_dirty_for_io(folio))</div><div class='del'>-		goto out_put;</div><div class='del'>-</div><div class='del'>-	trace_netfs_folio(folio, netfs_folio_trace_launder);</div><div class='del'>-</div><div class='del'>-	_debug("launder %llx-%llx", start, start + len - 1);</div><div class='del'>-</div><div class='del'>-	/* Speculatively write to the cache.  We have to fix this up later if</div><div class='del'>-	 * the store fails.</div><div class='del'>-	 */</div><div class='del'>-	wreq-&gt;cleanup = netfs_cleanup_launder_folio;</div><div class='del'>-</div><div class='del'>-	bvec_set_folio(&amp;bvec, folio, len, offset);</div><div class='del'>-	iov_iter_bvec(&amp;wreq-&gt;iter, ITER_SOURCE, &amp;bvec, 1, len);</div><div class='del'>-	__set_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags);</div><div class='del'>-	ret = netfs_begin_write(wreq, true, netfs_write_trace_launder);</div><div class='del'>-</div><div class='del'>-out_put:</div><div class='del'>-	folio_detach_private(folio);</div><div class='del'>-	netfs_put_group(group);</div><div class='del'>-	kfree(finfo);</div><div class='del'>-	netfs_put_request(wreq, false, netfs_rreq_trace_put_return);</div><div class='del'>-out:</div><div class='del'>-	folio_wait_fscache(folio);</div><div class='del'>-	_leave(" = %d", ret);</div><div class='del'>-	return ret;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(netfs_launder_folio);</div><div class='add'>+EXPORT_SYMBOL(netfs_page_mkwrite);</div><div class='head'>diff --git a/fs/netfs/direct_read.c b/fs/netfs/direct_read.c<br/>index ad4370b3935d..a498ee8d6674 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/direct_read.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/direct_read.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/direct_read.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/direct_read.c</a></div><div class='hunk'>@@ -16,6 +16,147 @@</div><div class='ctx'> #include &lt;linux/netfs.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+static void netfs_prepare_dio_read_iterator(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='add'>+	size_t rsize;</div><div class='add'>+</div><div class='add'>+	rsize = umin(subreq-&gt;len, rreq-&gt;io_streams[0].sreq_max_len);</div><div class='add'>+	subreq-&gt;len = rsize;</div><div class='add'>+</div><div class='add'>+	if (unlikely(rreq-&gt;io_streams[0].sreq_max_segs)) {</div><div class='add'>+		size_t limit = netfs_limit_iter(&amp;rreq-&gt;buffer.iter, 0, rsize,</div><div class='add'>+						rreq-&gt;io_streams[0].sreq_max_segs);</div><div class='add'>+</div><div class='add'>+		if (limit &lt; rsize) {</div><div class='add'>+			subreq-&gt;len = limit;</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_limited);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='add'>+</div><div class='add'>+	subreq-&gt;io_iter	= rreq-&gt;buffer.iter;</div><div class='add'>+	iov_iter_truncate(&amp;subreq-&gt;io_iter, subreq-&gt;len);</div><div class='add'>+	iov_iter_advance(&amp;rreq-&gt;buffer.iter, subreq-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform a read to a buffer from the server, slicing up the region to be read</div><div class='add'>+ * according to the network rsize.</div><div class='add'>+ */</div><div class='add'>+static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+	unsigned long long start = rreq-&gt;start;</div><div class='add'>+	ssize_t size = rreq-&gt;len;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct netfs_io_subrequest *subreq;</div><div class='add'>+		ssize_t slice;</div><div class='add'>+</div><div class='add'>+		subreq = netfs_alloc_subrequest(rreq);</div><div class='add'>+		if (!subreq) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		subreq-&gt;source	= NETFS_DOWNLOAD_FROM_SERVER;</div><div class='add'>+		subreq-&gt;start	= start;</div><div class='add'>+		subreq-&gt;len	= size;</div><div class='add'>+</div><div class='add'>+		__set_bit(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;rreq-&gt;lock);</div><div class='add'>+		list_add_tail(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests);</div><div class='add'>+		if (list_is_first(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests)) {</div><div class='add'>+			stream-&gt;front = subreq;</div><div class='add'>+			if (!stream-&gt;active) {</div><div class='add'>+				stream-&gt;collected_to = stream-&gt;front-&gt;start;</div><div class='add'>+				/* Store list pointers before active flag */</div><div class='add'>+				smp_store_release(&amp;stream-&gt;active, true);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		trace_netfs_sreq(subreq, netfs_sreq_trace_added);</div><div class='add'>+		spin_unlock(&amp;rreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+		netfs_stat(&amp;netfs_n_rh_download);</div><div class='add'>+		if (rreq-&gt;netfs_ops-&gt;prepare_read) {</div><div class='add'>+			ret = rreq-&gt;netfs_ops-&gt;prepare_read(subreq);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				netfs_put_subrequest(subreq, netfs_sreq_trace_put_cancel);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netfs_prepare_dio_read_iterator(subreq);</div><div class='add'>+		slice = subreq-&gt;len;</div><div class='add'>+		size -= slice;</div><div class='add'>+		start += slice;</div><div class='add'>+		rreq-&gt;submitted += slice;</div><div class='add'>+		if (size &lt;= 0) {</div><div class='add'>+			smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+			set_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rreq-&gt;netfs_ops-&gt;issue_read(subreq);</div><div class='add'>+</div><div class='add'>+		if (test_bit(NETFS_RREQ_PAUSE, &amp;rreq-&gt;flags))</div><div class='add'>+			netfs_wait_for_paused_read(rreq);</div><div class='add'>+		if (test_bit(NETFS_RREQ_FAILED, &amp;rreq-&gt;flags))</div><div class='add'>+			break;</div><div class='add'>+		cond_resched();</div><div class='add'>+	} while (size &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (unlikely(size &gt; 0)) {</div><div class='add'>+		smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+		set_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags);</div><div class='add'>+		netfs_wake_collector(rreq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform a read to an application buffer, bypassing the pagecache and the</div><div class='add'>+ * local disk cache.</div><div class='add'>+ */</div><div class='add'>+static ssize_t netfs_unbuffered_read(struct netfs_io_request *rreq, bool sync)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x %llx-%llx",</div><div class='add'>+	       rreq-&gt;debug_id, rreq-&gt;start, rreq-&gt;start + rreq-&gt;len - 1);</div><div class='add'>+</div><div class='add'>+	if (rreq-&gt;len == 0) {</div><div class='add'>+		pr_err("Zero-sized read [R=%x]\n", rreq-&gt;debug_id);</div><div class='add'>+		netfs_put_request(rreq, netfs_rreq_trace_put_discard);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// TODO: Use bounce buffer if requested</div><div class='add'>+</div><div class='add'>+	inode_dio_begin(rreq-&gt;inode);</div><div class='add'>+</div><div class='add'>+	ret = netfs_dispatch_unbuffered_reads(rreq);</div><div class='add'>+</div><div class='add'>+	if (!rreq-&gt;submitted) {</div><div class='add'>+		netfs_put_request(rreq, netfs_rreq_trace_put_no_submit);</div><div class='add'>+		inode_dio_end(rreq-&gt;inode);</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sync)</div><div class='add'>+		ret = netfs_wait_for_read(rreq);</div><div class='add'>+	else</div><div class='add'>+		ret = -EIOCBQUEUED;</div><div class='add'>+out:</div><div class='add'>+	_leave(" = %zd", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netfs_unbuffered_read_iter_locked - Perform an unbuffered or direct I/O read</div><div class='ctx'>  * @iocb: The I/O control descriptor describing the read</div><div class='hunk'>@@ -26,12 +167,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The caller must hold any appropriate locks.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_iter *iter)</div><div class='add'>+ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *rreq;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	size_t orig_count = iov_iter_count(iter);</div><div class='del'>-	bool async = !is_sync_kiocb(iocb);</div><div class='add'>+	bool sync = is_sync_kiocb(iocb);</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +186,8 @@ static ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_</div><div class='ctx'> </div><div class='ctx'> 	rreq = netfs_alloc_request(iocb-&gt;ki_filp-&gt;f_mapping, iocb-&gt;ki_filp,</div><div class='ctx'> 				   iocb-&gt;ki_pos, orig_count,</div><div class='del'>-				   NETFS_DIO_READ);</div><div class='add'>+				   iocb-&gt;ki_flags &amp; IOCB_DIRECT ?</div><div class='add'>+				   NETFS_DIO_READ : NETFS_UNBUFFERED_READ);</div><div class='ctx'> 	if (IS_ERR(rreq))</div><div class='ctx'> 		return PTR_ERR(rreq);</div><div class='ctx'> </div><div class='hunk'>@@ -62,15 +204,15 @@ static ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_</div><div class='ctx'> 	 * the request.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (user_backed_iter(iter)) {</div><div class='del'>-		ret = netfs_extract_user_iter(iter, rreq-&gt;len, &amp;rreq-&gt;iter, 0);</div><div class='add'>+		ret = netfs_extract_user_iter(iter, rreq-&gt;len, &amp;rreq-&gt;buffer.iter, 0);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		rreq-&gt;direct_bv = (struct bio_vec *)rreq-&gt;iter.bvec;</div><div class='add'>+			goto error_put;</div><div class='add'>+		rreq-&gt;direct_bv = (struct bio_vec *)rreq-&gt;buffer.iter.bvec;</div><div class='ctx'> 		rreq-&gt;direct_bv_count = ret;</div><div class='ctx'> 		rreq-&gt;direct_bv_unpin = iov_iter_extract_will_pin(iter);</div><div class='del'>-		rreq-&gt;len = iov_iter_count(&amp;rreq-&gt;iter);</div><div class='add'>+		rreq-&gt;len = iov_iter_count(&amp;rreq-&gt;buffer.iter);</div><div class='ctx'> 	} else {</div><div class='del'>-		rreq-&gt;iter = *iter;</div><div class='add'>+		rreq-&gt;buffer.iter = *iter;</div><div class='ctx'> 		rreq-&gt;len = orig_count;</div><div class='ctx'> 		rreq-&gt;direct_bv_unpin = false;</div><div class='ctx'> 		iov_iter_advance(iter, orig_count);</div><div class='hunk'>@@ -78,26 +220,31 @@ static ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_</div><div class='ctx'> </div><div class='ctx'> 	// TODO: Set up bounce buffer if needed</div><div class='ctx'> </div><div class='del'>-	if (async)</div><div class='add'>+	if (!sync) {</div><div class='ctx'> 		rreq-&gt;iocb = iocb;</div><div class='add'>+		__set_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;rreq-&gt;flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = netfs_begin_read(rreq, is_sync_kiocb(iocb));</div><div class='add'>+	ret = netfs_unbuffered_read(rreq, sync);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out; /* May be -EIOCBQUEUED */</div><div class='del'>-	if (!async) {</div><div class='add'>+	if (sync) {</div><div class='ctx'> 		// TODO: Copy from bounce buffer</div><div class='ctx'> 		iocb-&gt;ki_pos += rreq-&gt;transferred;</div><div class='ctx'> 		ret = rreq-&gt;transferred;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	netfs_put_request(rreq, false, netfs_rreq_trace_put_return);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		orig_count -= ret;</div><div class='del'>-	if (ret != -EIOCBQUEUED)</div><div class='del'>-		iov_iter_revert(iter, orig_count - iov_iter_count(iter));</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error_put:</div><div class='add'>+	netfs_put_failed_request(rreq);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(netfs_unbuffered_read_iter_locked);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * netfs_unbuffered_read_iter - Perform an unbuffered or direct I/O read</div><div class='head'>diff --git a/fs/netfs/direct_write.c b/fs/netfs/direct_write.c<br/>index 60a40d293c87..a9d1c3b2c084 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/direct_write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/direct_write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/direct_write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/direct_write.c</a></div><div class='hunk'>@@ -9,31 +9,18 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-static void netfs_cleanup_dio_write(struct netfs_io_request *wreq)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = wreq-&gt;inode;</div><div class='del'>-	unsigned long long end = wreq-&gt;start + wreq-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (!wreq-&gt;error &amp;&amp;</div><div class='del'>-	    i_size_read(inode) &lt; end) {</div><div class='del'>-		if (wreq-&gt;netfs_ops-&gt;update_i_size)</div><div class='del'>-			wreq-&gt;netfs_ops-&gt;update_i_size(inode, end);</div><div class='del'>-		else</div><div class='del'>-			i_size_write(inode, end);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Perform an unbuffered write where we may have to do an RMW operation on an</div><div class='ctx'>  * encrypted file.  This can also be used for direct I/O writes.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 						  struct netfs_group *netfs_group)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *wreq;</div><div class='ctx'> 	unsigned long long start = iocb-&gt;ki_pos;</div><div class='ctx'> 	unsigned long long end = start + iov_iter_count(iter);</div><div class='ctx'> 	ssize_t ret, n;</div><div class='add'>+	size_t len = iov_iter_count(iter);</div><div class='ctx'> 	bool async = !is_sync_kiocb(iocb);</div><div class='ctx'> </div><div class='ctx'> 	_enter("");</div><div class='hunk'>@@ -46,13 +33,17 @@ static ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov</div><div class='ctx'> </div><div class='ctx'> 	_debug("uw %llx-%llx", start, end);</div><div class='ctx'> </div><div class='del'>-	wreq = netfs_alloc_request(iocb-&gt;ki_filp-&gt;f_mapping, iocb-&gt;ki_filp,</div><div class='del'>-				   start, end - start,</div><div class='del'>-				   iocb-&gt;ki_flags &amp; IOCB_DIRECT ?</div><div class='del'>-				   NETFS_DIO_WRITE : NETFS_UNBUFFERED_WRITE);</div><div class='add'>+	wreq = netfs_create_write_req(iocb-&gt;ki_filp-&gt;f_mapping, iocb-&gt;ki_filp, start,</div><div class='add'>+				      iocb-&gt;ki_flags &amp; IOCB_DIRECT ?</div><div class='add'>+				      NETFS_DIO_WRITE : NETFS_UNBUFFERED_WRITE);</div><div class='ctx'> 	if (IS_ERR(wreq))</div><div class='ctx'> 		return PTR_ERR(wreq);</div><div class='ctx'> </div><div class='add'>+	wreq-&gt;io_streams[0].avail = true;</div><div class='add'>+	trace_netfs_write(wreq, (iocb-&gt;ki_flags &amp; IOCB_DIRECT ?</div><div class='add'>+				 netfs_write_trace_dio_write :</div><div class='add'>+				 netfs_write_trace_unbuffered_write));</div><div class='add'>+</div><div class='ctx'> 	{</div><div class='ctx'> 		/* If this is an async op and we're not using a bounce buffer,</div><div class='ctx'> 		 * we have to save the source buffer as the iterator is only</div><div class='hunk'>@@ -62,23 +53,29 @@ static ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov</div><div class='ctx'> 		 * allocate a sufficiently large bvec array and may shorten the</div><div class='ctx'> 		 * request.</div><div class='ctx'> 		 */</div><div class='del'>-		if (async || user_backed_iter(iter)) {</div><div class='del'>-			n = netfs_extract_user_iter(iter, wreq-&gt;len, &amp;wreq-&gt;iter, 0);</div><div class='add'>+		if (user_backed_iter(iter)) {</div><div class='add'>+			n = netfs_extract_user_iter(iter, len, &amp;wreq-&gt;buffer.iter, 0);</div><div class='ctx'> 			if (n &lt; 0) {</div><div class='ctx'> 				ret = n;</div><div class='del'>-				goto out;</div><div class='add'>+				goto error_put;</div><div class='ctx'> 			}</div><div class='del'>-			wreq-&gt;direct_bv = (struct bio_vec *)wreq-&gt;iter.bvec;</div><div class='add'>+			wreq-&gt;direct_bv = (struct bio_vec *)wreq-&gt;buffer.iter.bvec;</div><div class='ctx'> 			wreq-&gt;direct_bv_count = n;</div><div class='ctx'> 			wreq-&gt;direct_bv_unpin = iov_iter_extract_will_pin(iter);</div><div class='del'>-			wreq-&gt;len = iov_iter_count(&amp;wreq-&gt;iter);</div><div class='ctx'> 		} else {</div><div class='del'>-			wreq-&gt;iter = *iter;</div><div class='add'>+			/* If this is a kernel-generated async DIO request,</div><div class='add'>+			 * assume that any resources the iterator points to</div><div class='add'>+			 * (eg. a bio_vec array) will persist till the end of</div><div class='add'>+			 * the op.</div><div class='add'>+			 */</div><div class='add'>+			wreq-&gt;buffer.iter = *iter;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		wreq-&gt;io_iter = wreq-&gt;iter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	__set_bit(NETFS_RREQ_USE_IO_ITER, &amp;wreq-&gt;flags);</div><div class='add'>+	if (async)</div><div class='add'>+		__set_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;wreq-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	/* Copy the data into the bounce buffer and encrypt it. */</div><div class='ctx'> 	// TODO</div><div class='ctx'> </div><div class='hunk'>@@ -86,35 +83,30 @@ static ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov</div><div class='ctx'> 	__set_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags);</div><div class='ctx'> 	if (async)</div><div class='ctx'> 		wreq-&gt;iocb = iocb;</div><div class='del'>-	wreq-&gt;cleanup = netfs_cleanup_dio_write;</div><div class='del'>-	ret = netfs_begin_write(wreq, is_sync_kiocb(iocb),</div><div class='del'>-				iocb-&gt;ki_flags &amp; IOCB_DIRECT ?</div><div class='del'>-				netfs_write_trace_dio_write :</div><div class='del'>-				netfs_write_trace_unbuffered_write);</div><div class='add'>+	wreq-&gt;len = iov_iter_count(&amp;wreq-&gt;buffer.iter);</div><div class='add'>+	ret = netfs_unbuffered_write(wreq, is_sync_kiocb(iocb), wreq-&gt;len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		_debug("begin = %zd", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!async) {</div><div class='del'>-		trace_netfs_rreq(wreq, netfs_rreq_trace_wait_ip);</div><div class='del'>-		wait_on_bit(&amp;wreq-&gt;flags, NETFS_RREQ_IN_PROGRESS,</div><div class='del'>-			    TASK_UNINTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-		ret = wreq-&gt;error;</div><div class='del'>-		_debug("waited = %zd", ret);</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			ret = wreq-&gt;transferred;</div><div class='add'>+		ret = netfs_wait_for_write(wreq);</div><div class='add'>+		if (ret &gt; 0)</div><div class='ctx'> 			iocb-&gt;ki_pos += ret;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = -EIOCBQUEUED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	netfs_put_request(wreq, false, netfs_rreq_trace_put_return);</div><div class='add'>+	netfs_put_request(wreq, netfs_rreq_trace_put_return);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error_put:</div><div class='add'>+	netfs_put_failed_request(wreq);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(netfs_unbuffered_write_iter_locked);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * netfs_unbuffered_write_iter - Unbuffered write to a file</div><div class='hunk'>@@ -132,21 +124,26 @@ out:</div><div class='ctx'> ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+	struct address_space *mapping = file-&gt;f_mapping;</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct netfs_inode *ictx = netfs_inode(inode);</div><div class='del'>-	unsigned long long end;</div><div class='ctx'> 	ssize_t ret;</div><div class='add'>+	loff_t pos = iocb-&gt;ki_pos;</div><div class='add'>+	unsigned long long end = pos + iov_iter_count(from) - 1;</div><div class='add'>+</div><div class='add'>+	_enter("%llx,%zx,%llx", pos, iov_iter_count(from), i_size_read(inode));</div><div class='ctx'> </div><div class='del'>-	_enter("%llx,%zx,%llx", iocb-&gt;ki_pos, iov_iter_count(from), i_size_read(inode));</div><div class='add'>+	if (!iov_iter_count(from))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	trace_netfs_write_iter(iocb, from);</div><div class='del'>-	netfs_stat(&amp;netfs_n_rh_dio_write);</div><div class='add'>+	netfs_stat(&amp;netfs_n_wh_dio_write);</div><div class='ctx'> </div><div class='ctx'> 	ret = netfs_start_io_direct(inode);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = generic_write_checks(iocb, from);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	ret = file_remove_privs(file);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -154,7 +151,25 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	ret = file_update_time(file);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	ret = kiocb_invalidate_pages(iocb, iov_iter_count(from));</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT) {</div><div class='add'>+		/* We could block if there are any pages in the range. */</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		if (filemap_range_has_page(mapping, pos, end))</div><div class='add'>+			if (filemap_invalidate_inode(inode, true, pos, end))</div><div class='add'>+				goto out;</div><div class='add'>+	} else {</div><div class='add'>+		ret = filemap_write_and_wait_range(mapping, pos, end);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * After a write we want buffered reads to be sure to go to disk to get</div><div class='add'>+	 * the new data.  We invalidate clean cached page from the region we're</div><div class='add'>+	 * about to write.  We do this *before* the write so that we can return</div><div class='add'>+	 * without clobbering -EIOCBQUEUED from -&gt;direct_IO().</div><div class='add'>+	 */</div><div class='add'>+	ret = filemap_invalidate_inode(inode, true, pos, end);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	end = iocb-&gt;ki_pos + iov_iter_count(from);</div><div class='head'>diff --git a/fs/netfs/fscache_cache.c b/fs/netfs/fscache_cache.c<br/>index d645f8b302a2..8f70f8da064b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/fscache_cache.c</a></div><div class='hunk'>@@ -179,13 +179,14 @@ EXPORT_SYMBOL(fscache_acquire_cache);</div><div class='ctx'> void fscache_put_cache(struct fscache_cache *cache,</div><div class='ctx'> 		       enum fscache_cache_trace where)</div><div class='ctx'> {</div><div class='del'>-	unsigned int debug_id = cache-&gt;debug_id;</div><div class='add'>+	unsigned int debug_id;</div><div class='ctx'> 	bool zero;</div><div class='ctx'> 	int ref;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR_OR_NULL(cache))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	debug_id = cache-&gt;debug_id;</div><div class='ctx'> 	zero = __refcount_dec_and_test(&amp;cache-&gt;ref, &amp;ref);</div><div class='ctx'> 	trace_fscache_cache(debug_id, ref - 1, where);</div><div class='ctx'> </div><div class='hunk'>@@ -371,7 +372,7 @@ void fscache_withdraw_cache(struct fscache_cache *cache)</div><div class='ctx'> EXPORT_SYMBOL(fscache_withdraw_cache);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-static const char fscache_cache_states[NR__FSCACHE_CACHE_STATE] = "-PAEW";</div><div class='add'>+static const char fscache_cache_states[NR__FSCACHE_CACHE_STATE] __nonstring = "-PAEW";</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generate a list of caches in /proc/fs/fscache/caches</div><div class='head'>diff --git a/fs/netfs/fscache_cookie.c b/fs/netfs/fscache_cookie.c<br/>index bce2492186d0..3d56fc73435f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_cookie.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_cookie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_cookie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/fscache_cookie.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ static LIST_HEAD(fscache_cookie_lru);</div><div class='ctx'> static DEFINE_SPINLOCK(fscache_cookie_lru_lock);</div><div class='ctx'> DEFINE_TIMER(fscache_cookie_lru_timer, fscache_cookie_lru_timed_out);</div><div class='ctx'> static DECLARE_WORK(fscache_cookie_lru_work, fscache_cookie_lru_worker);</div><div class='del'>-static const char fscache_cookie_states[FSCACHE_COOKIE_STATE__NR] = "-LCAIFUWRD";</div><div class='add'>+static const char fscache_cookie_states[FSCACHE_COOKIE_STATE__NR] __nonstring = "-LCAIFUWRD";</div><div class='ctx'> static unsigned int fscache_lru_cookie_timeout = 10 * HZ;</div><div class='ctx'> </div><div class='ctx'> void fscache_print_cookie(struct fscache_cookie *cookie, char prefix)</div><div class='hunk'>@@ -741,6 +741,10 @@ again_locked:</div><div class='ctx'> 			spin_lock(&amp;cookie-&gt;lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (test_bit(FSCACHE_COOKIE_DO_LRU_DISCARD, &amp;cookie-&gt;flags)) {</div><div class='add'>+			if (atomic_read(&amp;cookie-&gt;n_accesses) != 0)</div><div class='add'>+				/* still being accessed: postpone it */</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			__fscache_set_cookie_state(cookie,</div><div class='ctx'> 						   FSCACHE_COOKIE_STATE_LRU_DISCARDING);</div><div class='ctx'> 			wake = true;</div><div class='head'>diff --git a/fs/netfs/fscache_io.c b/fs/netfs/fscache_io.c<br/>index ad572f7ee897..e4308457633c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/fscache_io.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/bvec.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -83,8 +82,10 @@ static int fscache_begin_operation(struct netfs_cache_resources *cres,</div><div class='ctx'> 	cres-&gt;debug_id		= cookie-&gt;debug_id;</div><div class='ctx'> 	cres-&gt;inval_counter	= cookie-&gt;inval_counter;</div><div class='ctx'> </div><div class='del'>-	if (!fscache_begin_cookie_access(cookie, why))</div><div class='add'>+	if (!fscache_begin_cookie_access(cookie, why)) {</div><div class='add'>+		cres-&gt;cache_priv = NULL;</div><div class='ctx'> 		return -ENOBUFS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='ctx'> 	spin_lock(&amp;cookie-&gt;lock);</div><div class='hunk'>@@ -164,6 +165,7 @@ struct fscache_write_request {</div><div class='ctx'> 	loff_t			start;</div><div class='ctx'> 	size_t			len;</div><div class='ctx'> 	bool			set_bits;</div><div class='add'>+	bool			using_pgpriv2;</div><div class='ctx'> 	netfs_io_terminated_t	term_func;</div><div class='ctx'> 	void			*term_func_priv;</div><div class='ctx'> };</div><div class='hunk'>@@ -180,7 +182,7 @@ void __fscache_clear_page_bits(struct address_space *mapping,</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		xas_for_each(&amp;xas, page, last) {</div><div class='del'>-			end_page_fscache(page);</div><div class='add'>+			folio_end_private_2(page_folio(page));</div><div class='ctx'> 		}</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -190,17 +192,16 @@ EXPORT_SYMBOL(__fscache_clear_page_bits);</div><div class='ctx'> /*</div><div class='ctx'>  * Deal with the completion of writing the data to the cache.</div><div class='ctx'>  */</div><div class='del'>-static void fscache_wreq_done(void *priv, ssize_t transferred_or_error,</div><div class='del'>-			      bool was_async)</div><div class='add'>+static void fscache_wreq_done(void *priv, ssize_t transferred_or_error)</div><div class='ctx'> {</div><div class='ctx'> 	struct fscache_write_request *wreq = priv;</div><div class='ctx'> </div><div class='del'>-	fscache_clear_page_bits(wreq-&gt;mapping, wreq-&gt;start, wreq-&gt;len,</div><div class='del'>-				wreq-&gt;set_bits);</div><div class='add'>+	if (wreq-&gt;using_pgpriv2)</div><div class='add'>+		fscache_clear_page_bits(wreq-&gt;mapping, wreq-&gt;start, wreq-&gt;len,</div><div class='add'>+					wreq-&gt;set_bits);</div><div class='ctx'> </div><div class='ctx'> 	if (wreq-&gt;term_func)</div><div class='del'>-		wreq-&gt;term_func(wreq-&gt;term_func_priv, transferred_or_error,</div><div class='del'>-				was_async);</div><div class='add'>+		wreq-&gt;term_func(wreq-&gt;term_func_priv, transferred_or_error);</div><div class='ctx'> 	fscache_end_operation(&amp;wreq-&gt;cache_resources);</div><div class='ctx'> 	kfree(wreq);</div><div class='ctx'> }</div><div class='hunk'>@@ -210,7 +211,7 @@ void __fscache_write_to_cache(struct fscache_cookie *cookie,</div><div class='ctx'> 			      loff_t start, size_t len, loff_t i_size,</div><div class='ctx'> 			      netfs_io_terminated_t term_func,</div><div class='ctx'> 			      void *term_func_priv,</div><div class='del'>-			      bool cond)</div><div class='add'>+			      bool using_pgpriv2, bool cond)</div><div class='ctx'> {</div><div class='ctx'> 	struct fscache_write_request *wreq;</div><div class='ctx'> 	struct netfs_cache_resources *cres;</div><div class='hunk'>@@ -228,6 +229,7 @@ void __fscache_write_to_cache(struct fscache_cookie *cookie,</div><div class='ctx'> 	wreq-&gt;mapping		= mapping;</div><div class='ctx'> 	wreq-&gt;start		= start;</div><div class='ctx'> 	wreq-&gt;len		= len;</div><div class='add'>+	wreq-&gt;using_pgpriv2	= using_pgpriv2;</div><div class='ctx'> 	wreq-&gt;set_bits		= cond;</div><div class='ctx'> 	wreq-&gt;term_func		= term_func;</div><div class='ctx'> 	wreq-&gt;term_func_priv	= term_func_priv;</div><div class='hunk'>@@ -251,13 +253,14 @@ void __fscache_write_to_cache(struct fscache_cookie *cookie,</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> abandon_end:</div><div class='del'>-	return fscache_wreq_done(wreq, ret, false);</div><div class='add'>+	return fscache_wreq_done(wreq, ret);</div><div class='ctx'> abandon_free:</div><div class='ctx'> 	kfree(wreq);</div><div class='ctx'> abandon:</div><div class='del'>-	fscache_clear_page_bits(mapping, start, len, cond);</div><div class='add'>+	if (using_pgpriv2)</div><div class='add'>+		fscache_clear_page_bits(mapping, start, len, cond);</div><div class='ctx'> 	if (term_func)</div><div class='del'>-		term_func(term_func_priv, ret, false);</div><div class='add'>+		term_func(term_func_priv, ret);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__fscache_write_to_cache);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/netfs/fscache_main.c b/fs/netfs/fscache_main.c<br/>index 42e98bb523e3..49849005eb7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_main.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/fscache_main.c</a></div><div class='hunk'>@@ -103,6 +103,7 @@ void __exit fscache_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	kmem_cache_destroy(fscache_cookie_jar);</div><div class='ctx'> 	fscache_proc_cleanup();</div><div class='add'>+	timer_shutdown_sync(&amp;fscache_cookie_lru_timer);</div><div class='ctx'> 	destroy_workqueue(fscache_wq);</div><div class='ctx'> 	pr_notice("FS-Cache unloaded\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/netfs/fscache_volume.c b/fs/netfs/fscache_volume.c<br/>index cdf991bdd9de..ced14ac78cc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_volume.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/fscache_volume.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/fscache_volume.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/fscache_volume.c</a></div><div class='hunk'>@@ -27,6 +27,19 @@ struct fscache_volume *fscache_get_volume(struct fscache_volume *volume,</div><div class='ctx'> 	return volume;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct fscache_volume *fscache_try_get_volume(struct fscache_volume *volume,</div><div class='add'>+					      enum fscache_volume_trace where)</div><div class='add'>+{</div><div class='add'>+	int ref;</div><div class='add'>+</div><div class='add'>+	if (!__refcount_inc_not_zero(&amp;volume-&gt;ref, &amp;ref))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	trace_fscache_volume(volume-&gt;debug_id, ref + 1, where);</div><div class='add'>+	return volume;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fscache_try_get_volume);</div><div class='add'>+</div><div class='ctx'> static void fscache_see_volume(struct fscache_volume *volume,</div><div class='ctx'> 			       enum fscache_volume_trace where)</div><div class='ctx'> {</div><div class='hunk'>@@ -309,8 +322,7 @@ maybe_wait:</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> no_wait:</div><div class='del'>-	clear_bit_unlock(FSCACHE_VOLUME_CREATING, &amp;volume-&gt;flags);</div><div class='del'>-	wake_up_bit(&amp;volume-&gt;flags, FSCACHE_VOLUME_CREATING);</div><div class='add'>+	clear_and_wake_up_bit(FSCACHE_VOLUME_CREATING, &amp;volume-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -420,6 +432,7 @@ void fscache_put_volume(struct fscache_volume *volume,</div><div class='ctx'> 			fscache_free_volume(volume);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(fscache_put_volume);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Relinquish a volume representation cookie.</div><div class='head'>diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h<br/>index ec7045d24400..4319611f5354 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/internal.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/folio_queue.h&gt;</div><div class='ctx'> #include &lt;linux/netfs.h&gt;</div><div class='ctx'> #include &lt;linux/fscache.h&gt;</div><div class='ctx'> #include &lt;linux/fscache-cache.h&gt;</div><div class='hunk'>@@ -22,14 +23,15 @@</div><div class='ctx'> /*</div><div class='ctx'>  * buffered_read.c</div><div class='ctx'>  */</div><div class='del'>-void netfs_rreq_unlock_folios(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error);</div><div class='ctx'> int netfs_prefetch_for_write(struct file *file, struct folio *folio,</div><div class='ctx'> 			     size_t offset, size_t len);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * io.c</div><div class='add'>+ * buffered_write.c</div><div class='ctx'>  */</div><div class='del'>-int netfs_begin_read(struct netfs_io_request *rreq, bool sync);</div><div class='add'>+void netfs_update_i_size(struct netfs_inode *ctx, struct inode *inode,</div><div class='add'>+			 loff_t pos, size_t copied);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * main.c</div><div class='hunk'>@@ -37,6 +39,8 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync);</div><div class='ctx'> extern unsigned int netfs_debug;</div><div class='ctx'> extern struct list_head netfs_io_requests;</div><div class='ctx'> extern spinlock_t netfs_proc_lock;</div><div class='add'>+extern mempool_t netfs_request_pool;</div><div class='add'>+extern mempool_t netfs_subrequest_pool;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> static inline void netfs_proc_add_rreq(struct netfs_io_request *rreq)</div><div class='hunk'>@@ -61,15 +65,17 @@ static inline void netfs_proc_del_rreq(struct netfs_io_request *rreq) {}</div><div class='ctx'> /*</div><div class='ctx'>  * misc.c</div><div class='ctx'>  */</div><div class='del'>-#define NETFS_FLAG_PUT_MARK		BIT(0)</div><div class='del'>-#define NETFS_FLAG_PAGECACHE_MARK	BIT(1)</div><div class='del'>-int netfs_xa_store_and_mark(struct xarray *xa, unsigned long index,</div><div class='del'>-			    struct folio *folio, unsigned int flags,</div><div class='del'>-			    gfp_t gfp_mask);</div><div class='del'>-int netfs_add_folios_to_buffer(struct xarray *buffer,</div><div class='del'>-			       struct address_space *mapping,</div><div class='del'>-			       pgoff_t index, pgoff_t to, gfp_t gfp_mask);</div><div class='del'>-void netfs_clear_buffer(struct xarray *buffer);</div><div class='add'>+struct folio_queue *netfs_buffer_make_space(struct netfs_io_request *rreq,</div><div class='add'>+					    enum netfs_folioq_trace trace);</div><div class='add'>+void netfs_reset_iter(struct netfs_io_subrequest *subreq);</div><div class='add'>+void netfs_wake_collector(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_subreq_clear_in_progress(struct netfs_io_subrequest *subreq);</div><div class='add'>+void netfs_wait_for_in_progress_stream(struct netfs_io_request *rreq,</div><div class='add'>+				       struct netfs_io_stream *stream);</div><div class='add'>+ssize_t netfs_wait_for_read(struct netfs_io_request *rreq);</div><div class='add'>+ssize_t netfs_wait_for_write(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_wait_for_paused_read(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_wait_for_paused_write(struct netfs_io_request *rreq);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * objects.c</div><div class='hunk'>@@ -79,9 +85,9 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,</div><div class='ctx'> 					     loff_t start, size_t len,</div><div class='ctx'> 					     enum netfs_io_origin origin);</div><div class='ctx'> void netfs_get_request(struct netfs_io_request *rreq, enum netfs_rreq_ref_trace what);</div><div class='del'>-void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async);</div><div class='del'>-void netfs_put_request(struct netfs_io_request *rreq, bool was_async,</div><div class='del'>-		       enum netfs_rreq_ref_trace what);</div><div class='add'>+void netfs_clear_subrequests(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_put_request(struct netfs_io_request *rreq, enum netfs_rreq_ref_trace what);</div><div class='add'>+void netfs_put_failed_request(struct netfs_io_request *rreq);</div><div class='ctx'> struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq);</div><div class='ctx'> </div><div class='ctx'> static inline void netfs_see_request(struct netfs_io_request *rreq,</div><div class='hunk'>@@ -90,23 +96,41 @@ static inline void netfs_see_request(struct netfs_io_request *rreq,</div><div class='ctx'> 	trace_netfs_rreq_ref(rreq-&gt;debug_id, refcount_read(&amp;rreq-&gt;ref), what);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void netfs_see_subrequest(struct netfs_io_subrequest *subreq,</div><div class='add'>+					enum netfs_sreq_ref_trace what)</div><div class='add'>+{</div><div class='add'>+	trace_netfs_sreq_ref(subreq-&gt;rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='add'>+			     refcount_read(&amp;subreq-&gt;ref), what);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * output.c</div><div class='add'>+ * read_collect.c</div><div class='ctx'>  */</div><div class='del'>-int netfs_begin_write(struct netfs_io_request *wreq, bool may_wait,</div><div class='del'>-		      enum netfs_write_trace what);</div><div class='del'>-struct netfs_io_request *netfs_begin_writethrough(struct kiocb *iocb, size_t len);</div><div class='del'>-int netfs_advance_writethrough(struct netfs_io_request *wreq, size_t copied, bool to_page_end);</div><div class='del'>-int netfs_end_writethrough(struct netfs_io_request *wreq, struct kiocb *iocb);</div><div class='add'>+bool netfs_read_collection(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_read_collection_worker(struct work_struct *work);</div><div class='add'>+void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * read_pgpriv2.c</div><div class='add'>+ */</div><div class='add'>+void netfs_pgpriv2_copy_to_cache(struct netfs_io_request *rreq, struct folio *folio);</div><div class='add'>+void netfs_pgpriv2_end_copy_to_cache(struct netfs_io_request *rreq);</div><div class='add'>+bool netfs_pgpriv2_unlock_copied_folios(struct netfs_io_request *wreq);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * read_retry.c</div><div class='add'>+ */</div><div class='add'>+void netfs_retry_reads(struct netfs_io_request *rreq);</div><div class='add'>+void netfs_unlock_abandoned_read_pages(struct netfs_io_request *rreq);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * stats.c</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_NETFS_STATS</div><div class='ctx'> extern atomic_t netfs_n_rh_dio_read;</div><div class='del'>-extern atomic_t netfs_n_rh_dio_write;</div><div class='ctx'> extern atomic_t netfs_n_rh_readahead;</div><div class='del'>-extern atomic_t netfs_n_rh_readpage;</div><div class='add'>+extern atomic_t netfs_n_rh_read_folio;</div><div class='add'>+extern atomic_t netfs_n_rh_read_single;</div><div class='ctx'> extern atomic_t netfs_n_rh_rreq;</div><div class='ctx'> extern atomic_t netfs_n_rh_sreq;</div><div class='ctx'> extern atomic_t netfs_n_rh_download;</div><div class='hunk'>@@ -123,6 +147,13 @@ extern atomic_t netfs_n_rh_write_begin;</div><div class='ctx'> extern atomic_t netfs_n_rh_write_done;</div><div class='ctx'> extern atomic_t netfs_n_rh_write_failed;</div><div class='ctx'> extern atomic_t netfs_n_rh_write_zskip;</div><div class='add'>+extern atomic_t netfs_n_rh_retry_read_req;</div><div class='add'>+extern atomic_t netfs_n_rh_retry_read_subreq;</div><div class='add'>+extern atomic_t netfs_n_wh_buffered_write;</div><div class='add'>+extern atomic_t netfs_n_wh_writethrough;</div><div class='add'>+extern atomic_t netfs_n_wh_dio_write;</div><div class='add'>+extern atomic_t netfs_n_wh_writepages;</div><div class='add'>+extern atomic_t netfs_n_wh_copy_to_cache;</div><div class='ctx'> extern atomic_t netfs_n_wh_wstream_conflict;</div><div class='ctx'> extern atomic_t netfs_n_wh_upload;</div><div class='ctx'> extern atomic_t netfs_n_wh_upload_done;</div><div class='hunk'>@@ -130,6 +161,11 @@ extern atomic_t netfs_n_wh_upload_failed;</div><div class='ctx'> extern atomic_t netfs_n_wh_write;</div><div class='ctx'> extern atomic_t netfs_n_wh_write_done;</div><div class='ctx'> extern atomic_t netfs_n_wh_write_failed;</div><div class='add'>+extern atomic_t netfs_n_wh_retry_write_req;</div><div class='add'>+extern atomic_t netfs_n_wh_retry_write_subreq;</div><div class='add'>+extern atomic_t netfs_n_wb_lock_skip;</div><div class='add'>+extern atomic_t netfs_n_wb_lock_wait;</div><div class='add'>+extern atomic_t netfs_n_folioq;</div><div class='ctx'> </div><div class='ctx'> int netfs_stats_show(struct seq_file *m, void *v);</div><div class='ctx'> </div><div class='hunk'>@@ -149,6 +185,41 @@ static inline void netfs_stat_d(atomic_t *stat)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * write_collect.c</div><div class='add'>+ */</div><div class='add'>+int netfs_folio_written_back(struct folio *folio);</div><div class='add'>+bool netfs_write_collection(struct netfs_io_request *wreq);</div><div class='add'>+void netfs_write_collection_worker(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * write_issue.c</div><div class='add'>+ */</div><div class='add'>+struct netfs_io_request *netfs_create_write_req(struct address_space *mapping,</div><div class='add'>+						struct file *file,</div><div class='add'>+						loff_t start,</div><div class='add'>+						enum netfs_io_origin origin);</div><div class='add'>+void netfs_reissue_write(struct netfs_io_stream *stream,</div><div class='add'>+			 struct netfs_io_subrequest *subreq,</div><div class='add'>+			 struct iov_iter *source);</div><div class='add'>+void netfs_issue_write(struct netfs_io_request *wreq,</div><div class='add'>+		       struct netfs_io_stream *stream);</div><div class='add'>+size_t netfs_advance_write(struct netfs_io_request *wreq,</div><div class='add'>+			   struct netfs_io_stream *stream,</div><div class='add'>+			   loff_t start, size_t len, bool to_eof);</div><div class='add'>+struct netfs_io_request *netfs_begin_writethrough(struct kiocb *iocb, size_t len);</div><div class='add'>+int netfs_advance_writethrough(struct netfs_io_request *wreq, struct writeback_control *wbc,</div><div class='add'>+			       struct folio *folio, size_t copied, bool to_page_end,</div><div class='add'>+			       struct folio **writethrough_cache);</div><div class='add'>+ssize_t netfs_end_writethrough(struct netfs_io_request *wreq, struct writeback_control *wbc,</div><div class='add'>+			       struct folio *writethrough_cache);</div><div class='add'>+int netfs_unbuffered_write(struct netfs_io_request *wreq, bool may_wait, size_t len);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * write_retry.c</div><div class='add'>+ */</div><div class='add'>+void netfs_retry_writes(struct netfs_io_request *wreq);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Miscellaneous functions.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool netfs_is_cache_enabled(struct netfs_inode *ctx)</div><div class='hunk'>@@ -168,7 +239,7 @@ static inline bool netfs_is_cache_enabled(struct netfs_inode *ctx)</div><div class='ctx'>  */</div><div class='ctx'> static inline struct netfs_group *netfs_get_group(struct netfs_group *netfs_group)</div><div class='ctx'> {</div><div class='del'>-	if (netfs_group)</div><div class='add'>+	if (netfs_group &amp;&amp; netfs_group != NETFS_FOLIO_COPY_TO_CACHE)</div><div class='ctx'> 		refcount_inc(&amp;netfs_group-&gt;ref);</div><div class='ctx'> 	return netfs_group;</div><div class='ctx'> }</div><div class='hunk'>@@ -178,7 +249,9 @@ static inline struct netfs_group *netfs_get_group(struct netfs_group *netfs_grou</div><div class='ctx'>  */</div><div class='ctx'> static inline void netfs_put_group(struct netfs_group *netfs_group)</div><div class='ctx'> {</div><div class='del'>-	if (netfs_group &amp;&amp; refcount_dec_and_test(&amp;netfs_group-&gt;ref))</div><div class='add'>+	if (netfs_group &amp;&amp;</div><div class='add'>+	    netfs_group != NETFS_FOLIO_COPY_TO_CACHE &amp;&amp;</div><div class='add'>+	    refcount_dec_and_test(&amp;netfs_group-&gt;ref))</div><div class='ctx'> 		netfs_group-&gt;free(netfs_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,11 +260,46 @@ static inline void netfs_put_group(struct netfs_group *netfs_group)</div><div class='ctx'>  */</div><div class='ctx'> static inline void netfs_put_group_many(struct netfs_group *netfs_group, int nr)</div><div class='ctx'> {</div><div class='del'>-	if (netfs_group &amp;&amp; refcount_sub_and_test(nr, &amp;netfs_group-&gt;ref))</div><div class='add'>+	if (netfs_group &amp;&amp;</div><div class='add'>+	    netfs_group != NETFS_FOLIO_COPY_TO_CACHE &amp;&amp;</div><div class='add'>+	    refcount_sub_and_test(nr, &amp;netfs_group-&gt;ref))</div><div class='ctx'> 		netfs_group-&gt;free(netfs_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Clear and wake up a NETFS_RREQ_* flag bit on a request.</div><div class='add'>+ */</div><div class='add'>+static inline void netfs_wake_rreq_flag(struct netfs_io_request *rreq,</div><div class='add'>+					unsigned int rreq_flag,</div><div class='add'>+					enum netfs_rreq_trace trace)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(rreq_flag, &amp;rreq-&gt;flags)) {</div><div class='add'>+		clear_bit_unlock(rreq_flag, &amp;rreq-&gt;flags);</div><div class='add'>+		smp_mb__after_atomic(); /* Set flag before task state */</div><div class='add'>+		trace_netfs_rreq(rreq, trace);</div><div class='add'>+		wake_up(&amp;rreq-&gt;waitq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test the NETFS_RREQ_IN_PROGRESS flag, inserting an appropriate barrier.</div><div class='add'>+ */</div><div class='add'>+static inline bool netfs_check_rreq_in_progress(const struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	/* Order read of flags before read of anything else, such as error. */</div><div class='add'>+	return test_bit_acquire(NETFS_RREQ_IN_PROGRESS, &amp;rreq-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test the NETFS_SREQ_IN_PROGRESS flag, inserting an appropriate barrier.</div><div class='add'>+ */</div><div class='add'>+static inline bool netfs_check_subreq_in_progress(const struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	/* Order read of flags before read of anything else, such as error. */</div><div class='add'>+	return test_bit_acquire(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * fscache-cache.c</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='hunk'>@@ -326,8 +434,6 @@ extern const struct seq_operations fscache_volumes_seq_ops;</div><div class='ctx'> </div><div class='ctx'> struct fscache_volume *fscache_get_volume(struct fscache_volume *volume,</div><div class='ctx'> 					  enum fscache_volume_trace where);</div><div class='del'>-void fscache_put_volume(struct fscache_volume *volume,</div><div class='del'>-			enum fscache_volume_trace where);</div><div class='ctx'> bool fscache_begin_volume_access(struct fscache_volume *volume,</div><div class='ctx'> 				 struct fscache_cookie *cookie,</div><div class='ctx'> 				 enum fscache_access_trace why);</div><div class='head'>diff --git a/fs/netfs/io.c b/fs/netfs/io.c<br/>deleted file mode 100644<br/>index 4309edf33862..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,785 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/* Network filesystem high-level read support.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2021 Red Hat, Inc. All Rights Reserved.</div><div class='del'>- * Written by David Howells (dhowells@redhat.com)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='del'>-#include &lt;linux/sched/mm.h&gt;</div><div class='del'>-#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='del'>-#include "internal.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clear the unread part of an I/O request.</div><div class='del'>- */</div><div class='del'>-static void netfs_clear_unread(struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	iov_iter_zero(iov_iter_count(&amp;subreq-&gt;io_iter), &amp;subreq-&gt;io_iter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error,</div><div class='del'>-					bool was_async)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq = priv;</div><div class='del'>-</div><div class='del'>-	netfs_subreq_terminated(subreq, transferred_or_error, was_async);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Issue a read against the cache.</div><div class='del'>- * - Eats the caller's ref on subreq.</div><div class='del'>- */</div><div class='del'>-static void netfs_read_from_cache(struct netfs_io_request *rreq,</div><div class='del'>-				  struct netfs_io_subrequest *subreq,</div><div class='del'>-				  enum netfs_read_from_hole read_hole)</div><div class='del'>-{</div><div class='del'>-	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='del'>-</div><div class='del'>-	netfs_stat(&amp;netfs_n_rh_read);</div><div class='del'>-	cres-&gt;ops-&gt;read(cres, subreq-&gt;start, &amp;subreq-&gt;io_iter, read_hole,</div><div class='del'>-			netfs_cache_read_terminated, subreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fill a subrequest region with zeroes.</div><div class='del'>- */</div><div class='del'>-static void netfs_fill_with_zeroes(struct netfs_io_request *rreq,</div><div class='del'>-				   struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	netfs_stat(&amp;netfs_n_rh_zero);</div><div class='del'>-	__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags);</div><div class='del'>-	netfs_subreq_terminated(subreq, 0, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ask the netfs to issue a read request to the server for us.</div><div class='del'>- *</div><div class='del'>- * The netfs is expected to read from subreq-&gt;pos + subreq-&gt;transferred to</div><div class='del'>- * subreq-&gt;pos + subreq-&gt;len - 1.  It may not backtrack and write data into the</div><div class='del'>- * buffer prior to the transferred point as it might clobber dirty data</div><div class='del'>- * obtained from the cache.</div><div class='del'>- *</div><div class='del'>- * Alternatively, the netfs is allowed to indicate one of two things:</div><div class='del'>- *</div><div class='del'>- * - NETFS_SREQ_SHORT_READ: A short read - it will get called again to try and</div><div class='del'>- *   make progress.</div><div class='del'>- *</div><div class='del'>- * - NETFS_SREQ_CLEAR_TAIL: A short read - the rest of the buffer will be</div><div class='del'>- *   cleared.</div><div class='del'>- */</div><div class='del'>-static void netfs_read_from_server(struct netfs_io_request *rreq,</div><div class='del'>-				   struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	netfs_stat(&amp;netfs_n_rh_download);</div><div class='del'>-</div><div class='del'>-	if (rreq-&gt;origin != NETFS_DIO_READ &amp;&amp;</div><div class='del'>-	    iov_iter_count(&amp;subreq-&gt;io_iter) != subreq-&gt;len - subreq-&gt;transferred)</div><div class='del'>-		pr_warn("R=%08x[%u] ITER PRE-MISMATCH %zx != %zx-%zx %lx\n",</div><div class='del'>-			rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-			iov_iter_count(&amp;subreq-&gt;io_iter), subreq-&gt;len,</div><div class='del'>-			subreq-&gt;transferred, subreq-&gt;flags);</div><div class='del'>-	rreq-&gt;netfs_ops-&gt;issue_read(subreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Release those waiting.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_completed(struct netfs_io_request *rreq, bool was_async)</div><div class='del'>-{</div><div class='del'>-	trace_netfs_rreq(rreq, netfs_rreq_trace_done);</div><div class='del'>-	netfs_clear_subrequests(rreq, was_async);</div><div class='del'>-	netfs_put_request(rreq, was_async, netfs_rreq_trace_put_complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Deal with the completion of writing the data to the cache.  We have to clear</div><div class='del'>- * the PG_fscache bits on the folios involved and release the caller's ref.</div><div class='del'>- *</div><div class='del'>- * May be called in softirq mode and we inherit a ref from the caller.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_unmark_after_write(struct netfs_io_request *rreq,</div><div class='del'>-					  bool was_async)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	pgoff_t unlocked = 0;</div><div class='del'>-	bool have_unlocked = false;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(subreq, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		XA_STATE(xas, &amp;rreq-&gt;mapping-&gt;i_pages, subreq-&gt;start / PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-		xas_for_each(&amp;xas, folio, (subreq-&gt;start + subreq-&gt;len - 1) / PAGE_SIZE) {</div><div class='del'>-			if (xas_retry(&amp;xas, folio))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* We might have multiple writes from the same huge</div><div class='del'>-			 * folio, but we mustn't unlock a folio more than once.</div><div class='del'>-			 */</div><div class='del'>-			if (have_unlocked &amp;&amp; folio_index(folio) &lt;= unlocked)</div><div class='del'>-				continue;</div><div class='del'>-			unlocked = folio_next_index(folio) - 1;</div><div class='del'>-			trace_netfs_folio(folio, netfs_folio_trace_end_copy);</div><div class='del'>-			folio_end_fscache(folio);</div><div class='del'>-			have_unlocked = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	netfs_rreq_completed(rreq, was_async);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_rreq_copy_terminated(void *priv, ssize_t transferred_or_error,</div><div class='del'>-				       bool was_async)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq = priv;</div><div class='del'>-	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_VALUE(transferred_or_error)) {</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_write_failed);</div><div class='del'>-		trace_netfs_failure(rreq, subreq, transferred_or_error,</div><div class='del'>-				    netfs_fail_copy_to_cache);</div><div class='del'>-	} else {</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_write_done);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_write_term);</div><div class='del'>-</div><div class='del'>-	/* If we decrement nr_copy_ops to 0, the ref belongs to us. */</div><div class='del'>-	if (atomic_dec_and_test(&amp;rreq-&gt;nr_copy_ops))</div><div class='del'>-		netfs_rreq_unmark_after_write(rreq, was_async);</div><div class='del'>-</div><div class='del'>-	netfs_put_subrequest(subreq, was_async, netfs_sreq_trace_put_terminated);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Perform any outstanding writes to the cache.  We inherit a ref from the</div><div class='del'>- * caller.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='del'>-	struct netfs_io_subrequest *subreq, *next, *p;</div><div class='del'>-	struct iov_iter iter;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	trace_netfs_rreq(rreq, netfs_rreq_trace_copy);</div><div class='del'>-</div><div class='del'>-	/* We don't want terminating writes trying to wake us up whilst we're</div><div class='del'>-	 * still going through the list.</div><div class='del'>-	 */</div><div class='del'>-	atomic_inc(&amp;rreq-&gt;nr_copy_ops);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(subreq, p, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		if (!test_bit(NETFS_SREQ_COPY_TO_CACHE, &amp;subreq-&gt;flags)) {</div><div class='del'>-			list_del_init(&amp;subreq-&gt;rreq_link);</div><div class='del'>-			netfs_put_subrequest(subreq, false,</div><div class='del'>-					     netfs_sreq_trace_put_no_copy);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(subreq, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		/* Amalgamate adjacent writes */</div><div class='del'>-		while (!list_is_last(&amp;subreq-&gt;rreq_link, &amp;rreq-&gt;subrequests)) {</div><div class='del'>-			next = list_next_entry(subreq, rreq_link);</div><div class='del'>-			if (next-&gt;start != subreq-&gt;start + subreq-&gt;len)</div><div class='del'>-				break;</div><div class='del'>-			subreq-&gt;len += next-&gt;len;</div><div class='del'>-			list_del_init(&amp;next-&gt;rreq_link);</div><div class='del'>-			netfs_put_subrequest(next, false,</div><div class='del'>-					     netfs_sreq_trace_put_merged);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = cres-&gt;ops-&gt;prepare_write(cres, &amp;subreq-&gt;start, &amp;subreq-&gt;len,</div><div class='del'>-					       subreq-&gt;len, rreq-&gt;i_size, true);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			trace_netfs_failure(rreq, subreq, ret, netfs_fail_prepare_write);</div><div class='del'>-			trace_netfs_sreq(subreq, netfs_sreq_trace_write_skip);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iov_iter_xarray(&amp;iter, ITER_SOURCE, &amp;rreq-&gt;mapping-&gt;i_pages,</div><div class='del'>-				subreq-&gt;start, subreq-&gt;len);</div><div class='del'>-</div><div class='del'>-		atomic_inc(&amp;rreq-&gt;nr_copy_ops);</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_write);</div><div class='del'>-		netfs_get_subrequest(subreq, netfs_sreq_trace_get_copy_to_cache);</div><div class='del'>-		trace_netfs_sreq(subreq, netfs_sreq_trace_write);</div><div class='del'>-		cres-&gt;ops-&gt;write(cres, subreq-&gt;start, &amp;iter,</div><div class='del'>-				 netfs_rreq_copy_terminated, subreq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we decrement nr_copy_ops to 0, the usage ref belongs to us. */</div><div class='del'>-	if (atomic_dec_and_test(&amp;rreq-&gt;nr_copy_ops))</div><div class='del'>-		netfs_rreq_unmark_after_write(rreq, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_rreq_write_to_cache_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *rreq =</div><div class='del'>-		container_of(work, struct netfs_io_request, work);</div><div class='del'>-</div><div class='del'>-	netfs_rreq_do_write_to_cache(rreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_rreq_write_to_cache(struct netfs_io_request *rreq)</div><div class='del'>-{</div><div class='del'>-	rreq-&gt;work.func = netfs_rreq_write_to_cache_work;</div><div class='del'>-	if (!queue_work(system_unbound_wq, &amp;rreq-&gt;work))</div><div class='del'>-		BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle a short read.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_short_read(struct netfs_io_request *rreq,</div><div class='del'>-				  struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	__clear_bit(NETFS_SREQ_SHORT_IO, &amp;subreq-&gt;flags);</div><div class='del'>-	__set_bit(NETFS_SREQ_SEEK_DATA_READ, &amp;subreq-&gt;flags);</div><div class='del'>-</div><div class='del'>-	netfs_stat(&amp;netfs_n_rh_short_read);</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_resubmit_short);</div><div class='del'>-</div><div class='del'>-	netfs_get_subrequest(subreq, netfs_sreq_trace_get_short_read);</div><div class='del'>-	atomic_inc(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-	if (subreq-&gt;source == NETFS_READ_FROM_CACHE)</div><div class='del'>-		netfs_read_from_cache(rreq, subreq, NETFS_READ_HOLE_CLEAR);</div><div class='del'>-	else</div><div class='del'>-		netfs_read_from_server(rreq, subreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reset the subrequest iterator prior to resubmission.</div><div class='del'>- */</div><div class='del'>-static void netfs_reset_subreq_iter(struct netfs_io_request *rreq,</div><div class='del'>-				    struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	size_t remaining = subreq-&gt;len - subreq-&gt;transferred;</div><div class='del'>-	size_t count = iov_iter_count(&amp;subreq-&gt;io_iter);</div><div class='del'>-</div><div class='del'>-	if (count == remaining)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	_debug("R=%08x[%u] ITER RESUB-MISMATCH %zx != %zx-%zx-%llx %x\n",</div><div class='del'>-	       rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-	       iov_iter_count(&amp;subreq-&gt;io_iter), subreq-&gt;transferred,</div><div class='del'>-	       subreq-&gt;len, rreq-&gt;i_size,</div><div class='del'>-	       subreq-&gt;io_iter.iter_type);</div><div class='del'>-</div><div class='del'>-	if (count &lt; remaining)</div><div class='del'>-		iov_iter_revert(&amp;subreq-&gt;io_iter, remaining - count);</div><div class='del'>-	else</div><div class='del'>-		iov_iter_advance(&amp;subreq-&gt;io_iter, count - remaining);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Resubmit any short or failed operations.  Returns true if we got the rreq</div><div class='del'>- * ref back.</div><div class='del'>- */</div><div class='del'>-static bool netfs_rreq_perform_resubmissions(struct netfs_io_request *rreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-</div><div class='del'>-	WARN_ON(in_interrupt());</div><div class='del'>-</div><div class='del'>-	trace_netfs_rreq(rreq, netfs_rreq_trace_resubmit);</div><div class='del'>-</div><div class='del'>-	/* We don't want terminating submissions trying to wake us up whilst</div><div class='del'>-	 * we're still going through the list.</div><div class='del'>-	 */</div><div class='del'>-	atomic_inc(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-</div><div class='del'>-	__clear_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;rreq-&gt;flags);</div><div class='del'>-	list_for_each_entry(subreq, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		if (subreq-&gt;error) {</div><div class='del'>-			if (subreq-&gt;source != NETFS_READ_FROM_CACHE)</div><div class='del'>-				break;</div><div class='del'>-			subreq-&gt;source = NETFS_DOWNLOAD_FROM_SERVER;</div><div class='del'>-			subreq-&gt;error = 0;</div><div class='del'>-			netfs_stat(&amp;netfs_n_rh_download_instead);</div><div class='del'>-			trace_netfs_sreq(subreq, netfs_sreq_trace_download_instead);</div><div class='del'>-			netfs_get_subrequest(subreq, netfs_sreq_trace_get_resubmit);</div><div class='del'>-			atomic_inc(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-			netfs_reset_subreq_iter(rreq, subreq);</div><div class='del'>-			netfs_read_from_server(rreq, subreq);</div><div class='del'>-		} else if (test_bit(NETFS_SREQ_SHORT_IO, &amp;subreq-&gt;flags)) {</div><div class='del'>-			netfs_rreq_short_read(rreq, subreq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we decrement nr_outstanding to 0, the usage ref belongs to us. */</div><div class='del'>-	if (atomic_dec_and_test(&amp;rreq-&gt;nr_outstanding))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	wake_up_var(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check to see if the data read is still valid.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_is_still_valid(struct netfs_io_request *rreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-</div><div class='del'>-	if (!rreq-&gt;netfs_ops-&gt;is_still_valid ||</div><div class='del'>-	    rreq-&gt;netfs_ops-&gt;is_still_valid(rreq))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(subreq, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		if (subreq-&gt;source == NETFS_READ_FROM_CACHE) {</div><div class='del'>-			subreq-&gt;error = -ESTALE;</div><div class='del'>-			__set_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;rreq-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Determine how much we can admit to having read from a DIO read.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_assess_dio(struct netfs_io_request *rreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	size_t transferred = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; rreq-&gt;direct_bv_count; i++)</div><div class='del'>-		flush_dcache_page(rreq-&gt;direct_bv[i].bv_page);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(subreq, &amp;rreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		if (subreq-&gt;error || subreq-&gt;transferred == 0)</div><div class='del'>-			break;</div><div class='del'>-		transferred += subreq-&gt;transferred;</div><div class='del'>-		if (subreq-&gt;transferred &lt; subreq-&gt;len)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; rreq-&gt;direct_bv_count; i++)</div><div class='del'>-		flush_dcache_page(rreq-&gt;direct_bv[i].bv_page);</div><div class='del'>-</div><div class='del'>-	rreq-&gt;transferred = transferred;</div><div class='del'>-	task_io_account_read(transferred);</div><div class='del'>-</div><div class='del'>-	if (rreq-&gt;iocb) {</div><div class='del'>-		rreq-&gt;iocb-&gt;ki_pos += transferred;</div><div class='del'>-		if (rreq-&gt;iocb-&gt;ki_complete)</div><div class='del'>-			rreq-&gt;iocb-&gt;ki_complete(</div><div class='del'>-				rreq-&gt;iocb, rreq-&gt;error ? rreq-&gt;error : transferred);</div><div class='del'>-	}</div><div class='del'>-	if (rreq-&gt;netfs_ops-&gt;done)</div><div class='del'>-		rreq-&gt;netfs_ops-&gt;done(rreq);</div><div class='del'>-	inode_dio_end(rreq-&gt;inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assess the state of a read request and decide what to do next.</div><div class='del'>- *</div><div class='del'>- * Note that we could be in an ordinary kernel thread, on a workqueue or in</div><div class='del'>- * softirq context at this point.  We inherit a ref from the caller.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async)</div><div class='del'>-{</div><div class='del'>-	trace_netfs_rreq(rreq, netfs_rreq_trace_assess);</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	netfs_rreq_is_still_valid(rreq);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(NETFS_RREQ_FAILED, &amp;rreq-&gt;flags) &amp;&amp;</div><div class='del'>-	    test_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;rreq-&gt;flags)) {</div><div class='del'>-		if (netfs_rreq_perform_resubmissions(rreq))</div><div class='del'>-			goto again;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rreq-&gt;origin != NETFS_DIO_READ)</div><div class='del'>-		netfs_rreq_unlock_folios(rreq);</div><div class='del'>-	else</div><div class='del'>-		netfs_rreq_assess_dio(rreq);</div><div class='del'>-</div><div class='del'>-	trace_netfs_rreq(rreq, netfs_rreq_trace_wake_ip);</div><div class='del'>-	clear_bit_unlock(NETFS_RREQ_IN_PROGRESS, &amp;rreq-&gt;flags);</div><div class='del'>-	wake_up_bit(&amp;rreq-&gt;flags, NETFS_RREQ_IN_PROGRESS);</div><div class='del'>-</div><div class='del'>-	if (test_bit(NETFS_RREQ_COPY_TO_CACHE, &amp;rreq-&gt;flags))</div><div class='del'>-		return netfs_rreq_write_to_cache(rreq);</div><div class='del'>-</div><div class='del'>-	netfs_rreq_completed(rreq, was_async);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_rreq_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *rreq =</div><div class='del'>-		container_of(work, struct netfs_io_request, work);</div><div class='del'>-	netfs_rreq_assess(rreq, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle the completion of all outstanding I/O operations on a read request.</div><div class='del'>- * We inherit a ref from the caller.</div><div class='del'>- */</div><div class='del'>-static void netfs_rreq_terminated(struct netfs_io_request *rreq,</div><div class='del'>-				  bool was_async)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;rreq-&gt;flags) &amp;&amp;</div><div class='del'>-	    was_async) {</div><div class='del'>-		if (!queue_work(system_unbound_wq, &amp;rreq-&gt;work))</div><div class='del'>-			BUG();</div><div class='del'>-	} else {</div><div class='del'>-		netfs_rreq_assess(rreq, was_async);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * netfs_subreq_terminated - Note the termination of an I/O operation.</div><div class='del'>- * @subreq: The I/O request that has terminated.</div><div class='del'>- * @transferred_or_error: The amount of data transferred or an error code.</div><div class='del'>- * @was_async: The termination was asynchronous</div><div class='del'>- *</div><div class='del'>- * This tells the read helper that a contributory I/O operation has terminated,</div><div class='del'>- * one way or another, and that it should integrate the results.</div><div class='del'>- *</div><div class='del'>- * The caller indicates in @transferred_or_error the outcome of the operation,</div><div class='del'>- * supplying a positive value to indicate the number of bytes transferred, 0 to</div><div class='del'>- * indicate a failure to transfer anything that should be retried or a negative</div><div class='del'>- * error code.  The helper will look after reissuing I/O operations as</div><div class='del'>- * appropriate and writing downloaded data to the cache.</div><div class='del'>- *</div><div class='del'>- * If @was_async is true, the caller might be running in softirq or interrupt</div><div class='del'>- * context and we can't sleep.</div><div class='del'>- */</div><div class='del'>-void netfs_subreq_terminated(struct netfs_io_subrequest *subreq,</div><div class='del'>-			     ssize_t transferred_or_error,</div><div class='del'>-			     bool was_async)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='del'>-	int u;</div><div class='del'>-</div><div class='del'>-	_enter("R=%x[%x]{%llx,%lx},%zd",</div><div class='del'>-	       rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-	       subreq-&gt;start, subreq-&gt;flags, transferred_or_error);</div><div class='del'>-</div><div class='del'>-	switch (subreq-&gt;source) {</div><div class='del'>-	case NETFS_READ_FROM_CACHE:</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_read_done);</div><div class='del'>-		break;</div><div class='del'>-	case NETFS_DOWNLOAD_FROM_SERVER:</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_download_done);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_VALUE(transferred_or_error)) {</div><div class='del'>-		subreq-&gt;error = transferred_or_error;</div><div class='del'>-		trace_netfs_failure(rreq, subreq, transferred_or_error,</div><div class='del'>-				    netfs_fail_read);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN(transferred_or_error &gt; subreq-&gt;len - subreq-&gt;transferred,</div><div class='del'>-		 "Subreq overread: R%x[%x] %zd &gt; %zu - %zu",</div><div class='del'>-		 rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-		 transferred_or_error, subreq-&gt;len, subreq-&gt;transferred))</div><div class='del'>-		transferred_or_error = subreq-&gt;len - subreq-&gt;transferred;</div><div class='del'>-</div><div class='del'>-	subreq-&gt;error = 0;</div><div class='del'>-	subreq-&gt;transferred += transferred_or_error;</div><div class='del'>-	if (subreq-&gt;transferred &lt; subreq-&gt;len)</div><div class='del'>-		goto incomplete;</div><div class='del'>-</div><div class='del'>-complete:</div><div class='del'>-	__clear_bit(NETFS_SREQ_NO_PROGRESS, &amp;subreq-&gt;flags);</div><div class='del'>-	if (test_bit(NETFS_SREQ_COPY_TO_CACHE, &amp;subreq-&gt;flags))</div><div class='del'>-		set_bit(NETFS_RREQ_COPY_TO_CACHE, &amp;rreq-&gt;flags);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);</div><div class='del'>-</div><div class='del'>-	/* If we decrement nr_outstanding to 0, the ref belongs to us. */</div><div class='del'>-	u = atomic_dec_return(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-	if (u == 0)</div><div class='del'>-		netfs_rreq_terminated(rreq, was_async);</div><div class='del'>-	else if (u == 1)</div><div class='del'>-		wake_up_var(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-</div><div class='del'>-	netfs_put_subrequest(subreq, was_async, netfs_sreq_trace_put_terminated);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-incomplete:</div><div class='del'>-	if (test_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags)) {</div><div class='del'>-		netfs_clear_unread(subreq);</div><div class='del'>-		subreq-&gt;transferred = subreq-&gt;len;</div><div class='del'>-		goto complete;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (transferred_or_error == 0) {</div><div class='del'>-		if (__test_and_set_bit(NETFS_SREQ_NO_PROGRESS, &amp;subreq-&gt;flags)) {</div><div class='del'>-			subreq-&gt;error = -ENODATA;</div><div class='del'>-			goto failed;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		__clear_bit(NETFS_SREQ_NO_PROGRESS, &amp;subreq-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__set_bit(NETFS_SREQ_SHORT_IO, &amp;subreq-&gt;flags);</div><div class='del'>-	set_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;rreq-&gt;flags);</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	if (subreq-&gt;source == NETFS_READ_FROM_CACHE) {</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_read_failed);</div><div class='del'>-		set_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;rreq-&gt;flags);</div><div class='del'>-	} else {</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_download_failed);</div><div class='del'>-		set_bit(NETFS_RREQ_FAILED, &amp;rreq-&gt;flags);</div><div class='del'>-		rreq-&gt;error = subreq-&gt;error;</div><div class='del'>-	}</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netfs_subreq_terminated);</div><div class='del'>-</div><div class='del'>-static enum netfs_io_source netfs_cache_prepare_read(struct netfs_io_subrequest *subreq,</div><div class='del'>-						       loff_t i_size)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='del'>-	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='del'>-</div><div class='del'>-	if (cres-&gt;ops)</div><div class='del'>-		return cres-&gt;ops-&gt;prepare_read(subreq, i_size);</div><div class='del'>-	if (subreq-&gt;start &gt;= rreq-&gt;i_size)</div><div class='del'>-		return NETFS_FILL_WITH_ZEROES;</div><div class='del'>-	return NETFS_DOWNLOAD_FROM_SERVER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Work out what sort of subrequest the next one will be.</div><div class='del'>- */</div><div class='del'>-static enum netfs_io_source</div><div class='del'>-netfs_rreq_prepare_read(struct netfs_io_request *rreq,</div><div class='del'>-			struct netfs_io_subrequest *subreq,</div><div class='del'>-			struct iov_iter *io_iter)</div><div class='del'>-{</div><div class='del'>-	enum netfs_io_source source = NETFS_DOWNLOAD_FROM_SERVER;</div><div class='del'>-	struct netfs_inode *ictx = netfs_inode(rreq-&gt;inode);</div><div class='del'>-	size_t lsize;</div><div class='del'>-</div><div class='del'>-	_enter("%llx-%llx,%llx", subreq-&gt;start, subreq-&gt;start + subreq-&gt;len, rreq-&gt;i_size);</div><div class='del'>-</div><div class='del'>-	if (rreq-&gt;origin != NETFS_DIO_READ) {</div><div class='del'>-		source = netfs_cache_prepare_read(subreq, rreq-&gt;i_size);</div><div class='del'>-		if (source == NETFS_INVALID_READ)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (source == NETFS_DOWNLOAD_FROM_SERVER) {</div><div class='del'>-		/* Call out to the netfs to let it shrink the request to fit</div><div class='del'>-		 * its own I/O sizes and boundaries.  If it shinks it here, it</div><div class='del'>-		 * will be called again to make simultaneous calls; if it wants</div><div class='del'>-		 * to make serial calls, it can indicate a short read and then</div><div class='del'>-		 * we will call it again.</div><div class='del'>-		 */</div><div class='del'>-		if (rreq-&gt;origin != NETFS_DIO_READ) {</div><div class='del'>-			if (subreq-&gt;start &gt;= ictx-&gt;zero_point) {</div><div class='del'>-				source = NETFS_FILL_WITH_ZEROES;</div><div class='del'>-				goto set;</div><div class='del'>-			}</div><div class='del'>-			if (subreq-&gt;len &gt; ictx-&gt;zero_point - subreq-&gt;start)</div><div class='del'>-				subreq-&gt;len = ictx-&gt;zero_point - subreq-&gt;start;</div><div class='del'>-		}</div><div class='del'>-		if (subreq-&gt;len &gt; rreq-&gt;i_size - subreq-&gt;start)</div><div class='del'>-			subreq-&gt;len = rreq-&gt;i_size - subreq-&gt;start;</div><div class='del'>-		if (rreq-&gt;rsize &amp;&amp; subreq-&gt;len &gt; rreq-&gt;rsize)</div><div class='del'>-			subreq-&gt;len = rreq-&gt;rsize;</div><div class='del'>-</div><div class='del'>-		if (rreq-&gt;netfs_ops-&gt;clamp_length &amp;&amp;</div><div class='del'>-		    !rreq-&gt;netfs_ops-&gt;clamp_length(subreq)) {</div><div class='del'>-			source = NETFS_INVALID_READ;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (subreq-&gt;max_nr_segs) {</div><div class='del'>-			lsize = netfs_limit_iter(io_iter, 0, subreq-&gt;len,</div><div class='del'>-						 subreq-&gt;max_nr_segs);</div><div class='del'>-			if (subreq-&gt;len &gt; lsize) {</div><div class='del'>-				subreq-&gt;len = lsize;</div><div class='del'>-				trace_netfs_sreq(subreq, netfs_sreq_trace_limited);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-set:</div><div class='del'>-	if (subreq-&gt;len &gt; rreq-&gt;len)</div><div class='del'>-		pr_warn("R=%08x[%u] SREQ&gt;RREQ %zx &gt; %zx\n",</div><div class='del'>-			rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-			subreq-&gt;len, rreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(subreq-&gt;len == 0)) {</div><div class='del'>-		source = NETFS_INVALID_READ;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	subreq-&gt;source = source;</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='del'>-</div><div class='del'>-	subreq-&gt;io_iter = *io_iter;</div><div class='del'>-	iov_iter_truncate(&amp;subreq-&gt;io_iter, subreq-&gt;len);</div><div class='del'>-	iov_iter_advance(io_iter, subreq-&gt;len);</div><div class='del'>-out:</div><div class='del'>-	subreq-&gt;source = source;</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='del'>-	return source;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Slice off a piece of a read request and submit an I/O request for it.</div><div class='del'>- */</div><div class='del'>-static bool netfs_rreq_submit_slice(struct netfs_io_request *rreq,</div><div class='del'>-				    struct iov_iter *io_iter,</div><div class='del'>-				    unsigned int *_debug_index)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-	enum netfs_io_source source;</div><div class='del'>-</div><div class='del'>-	subreq = netfs_alloc_subrequest(rreq);</div><div class='del'>-	if (!subreq)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	subreq-&gt;debug_index	= (*_debug_index)++;</div><div class='del'>-	subreq-&gt;start		= rreq-&gt;start + rreq-&gt;submitted;</div><div class='del'>-	subreq-&gt;len		= io_iter-&gt;count;</div><div class='del'>-</div><div class='del'>-	_debug("slice %llx,%zx,%zx", subreq-&gt;start, subreq-&gt;len, rreq-&gt;submitted);</div><div class='del'>-	list_add_tail(&amp;subreq-&gt;rreq_link, &amp;rreq-&gt;subrequests);</div><div class='del'>-</div><div class='del'>-	/* Call out to the cache to find out what it can do with the remaining</div><div class='del'>-	 * subset.  It tells us in subreq-&gt;flags what it decided should be done</div><div class='del'>-	 * and adjusts subreq-&gt;len down if the subset crosses a cache boundary.</div><div class='del'>-	 *</div><div class='del'>-	 * Then when we hand the subset, it can choose to take a subset of that</div><div class='del'>-	 * (the starts must coincide), in which case, we go around the loop</div><div class='del'>-	 * again and ask it to download the next piece.</div><div class='del'>-	 */</div><div class='del'>-	source = netfs_rreq_prepare_read(rreq, subreq, io_iter);</div><div class='del'>-	if (source == NETFS_INVALID_READ)</div><div class='del'>-		goto subreq_failed;</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;rreq-&gt;nr_outstanding);</div><div class='del'>-</div><div class='del'>-	rreq-&gt;submitted += subreq-&gt;len;</div><div class='del'>-</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='del'>-	switch (source) {</div><div class='del'>-	case NETFS_FILL_WITH_ZEROES:</div><div class='del'>-		netfs_fill_with_zeroes(rreq, subreq);</div><div class='del'>-		break;</div><div class='del'>-	case NETFS_DOWNLOAD_FROM_SERVER:</div><div class='del'>-		netfs_read_from_server(rreq, subreq);</div><div class='del'>-		break;</div><div class='del'>-	case NETFS_READ_FROM_CACHE:</div><div class='del'>-		netfs_read_from_cache(rreq, subreq, NETFS_READ_HOLE_IGNORE);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-</div><div class='del'>-subreq_failed:</div><div class='del'>-	rreq-&gt;error = subreq-&gt;error;</div><div class='del'>-	netfs_put_subrequest(subreq, false, netfs_sreq_trace_put_failed);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Begin the process of reading in a chunk of data, where that data may be</div><div class='del'>- * stitched together from multiple sources, including multiple servers and the</div><div class='del'>- * local cache.</div><div class='del'>- */</div><div class='del'>-int netfs_begin_read(struct netfs_io_request *rreq, bool sync)</div><div class='del'>-{</div><div class='del'>-	struct iov_iter io_iter;</div><div class='del'>-	unsigned int debug_index = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	_enter("R=%x %llx-%llx",</div><div class='del'>-	       rreq-&gt;debug_id, rreq-&gt;start, rreq-&gt;start + rreq-&gt;len - 1);</div><div class='del'>-</div><div class='del'>-	if (rreq-&gt;len == 0) {</div><div class='del'>-		pr_err("Zero-sized read [R=%x]\n", rreq-&gt;debug_id);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rreq-&gt;origin == NETFS_DIO_READ)</div><div class='del'>-		inode_dio_begin(rreq-&gt;inode);</div><div class='del'>-</div><div class='del'>-	// TODO: Use bounce buffer if requested</div><div class='del'>-	rreq-&gt;io_iter = rreq-&gt;iter;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;rreq-&gt;work, netfs_rreq_work);</div><div class='del'>-</div><div class='del'>-	/* Chop the read into slices according to what the cache and the netfs</div><div class='del'>-	 * want and submit each one.</div><div class='del'>-	 */</div><div class='del'>-	netfs_get_request(rreq, netfs_rreq_trace_get_for_outstanding);</div><div class='del'>-	atomic_set(&amp;rreq-&gt;nr_outstanding, 1);</div><div class='del'>-	io_iter = rreq-&gt;io_iter;</div><div class='del'>-	do {</div><div class='del'>-		_debug("submit %llx + %zx &gt;= %llx",</div><div class='del'>-		       rreq-&gt;start, rreq-&gt;submitted, rreq-&gt;i_size);</div><div class='del'>-		if (rreq-&gt;origin == NETFS_DIO_READ &amp;&amp;</div><div class='del'>-		    rreq-&gt;start + rreq-&gt;submitted &gt;= rreq-&gt;i_size)</div><div class='del'>-			break;</div><div class='del'>-		if (!netfs_rreq_submit_slice(rreq, &amp;io_iter, &amp;debug_index))</div><div class='del'>-			break;</div><div class='del'>-		if (test_bit(NETFS_RREQ_BLOCKED, &amp;rreq-&gt;flags) &amp;&amp;</div><div class='del'>-		    test_bit(NETFS_RREQ_NONBLOCK, &amp;rreq-&gt;flags))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	} while (rreq-&gt;submitted &lt; rreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (!rreq-&gt;submitted) {</div><div class='del'>-		netfs_put_request(rreq, false, netfs_rreq_trace_put_no_submit);</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sync) {</div><div class='del'>-		/* Keep nr_outstanding incremented so that the ref always</div><div class='del'>-		 * belongs to us, and the service code isn't punted off to a</div><div class='del'>-		 * random thread pool to process.  Note that this might start</div><div class='del'>-		 * further work, such as writing to the cache.</div><div class='del'>-		 */</div><div class='del'>-		wait_var_event(&amp;rreq-&gt;nr_outstanding,</div><div class='del'>-			       atomic_read(&amp;rreq-&gt;nr_outstanding) == 1);</div><div class='del'>-		if (atomic_dec_and_test(&amp;rreq-&gt;nr_outstanding))</div><div class='del'>-			netfs_rreq_assess(rreq, false);</div><div class='del'>-</div><div class='del'>-		trace_netfs_rreq(rreq, netfs_rreq_trace_wait_ip);</div><div class='del'>-		wait_on_bit(&amp;rreq-&gt;flags, NETFS_RREQ_IN_PROGRESS,</div><div class='del'>-			    TASK_UNINTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-		ret = rreq-&gt;error;</div><div class='del'>-		if (ret == 0 &amp;&amp; rreq-&gt;submitted &lt; rreq-&gt;len &amp;&amp;</div><div class='del'>-		    rreq-&gt;origin != NETFS_DIO_READ) {</div><div class='del'>-			trace_netfs_failure(rreq, NULL, ret, netfs_fail_short_read);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* If we decrement nr_outstanding to 0, the ref belongs to us. */</div><div class='del'>-		if (atomic_dec_and_test(&amp;rreq-&gt;nr_outstanding))</div><div class='del'>-			netfs_rreq_assess(rreq, false);</div><div class='del'>-		ret = -EIOCBQUEUED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c<br/>index b781bbbf1d8d..72a435e5fc6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/iterator.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/iterator.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/iterator.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/iterator.c</a></div><div class='hunk'>@@ -188,9 +188,59 @@ static size_t netfs_limit_xarray(const struct iov_iter *iter, size_t start_offse</div><div class='ctx'> 	return min(span, max_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Select the span of a folio queue iterator we're going to use.  Limit it by</div><div class='add'>+ * both maximum size and maximum number of segments.  Returns the size of the</div><div class='add'>+ * span in bytes.</div><div class='add'>+ */</div><div class='add'>+static size_t netfs_limit_folioq(const struct iov_iter *iter, size_t start_offset,</div><div class='add'>+				 size_t max_size, size_t max_segs)</div><div class='add'>+{</div><div class='add'>+	const struct folio_queue *folioq = iter-&gt;folioq;</div><div class='add'>+	unsigned int nsegs = 0;</div><div class='add'>+	unsigned int slot = iter-&gt;folioq_slot;</div><div class='add'>+	size_t span = 0, n = iter-&gt;count;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!iov_iter_is_folioq(iter)) ||</div><div class='add'>+	    WARN_ON(start_offset &gt; n) ||</div><div class='add'>+	    n == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	max_size = umin(max_size, n - start_offset);</div><div class='add'>+</div><div class='add'>+	if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+		folioq = folioq-&gt;next;</div><div class='add'>+		slot = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	start_offset += iter-&gt;iov_offset;</div><div class='add'>+	do {</div><div class='add'>+		size_t flen = folioq_folio_size(folioq, slot);</div><div class='add'>+</div><div class='add'>+		if (start_offset &lt; flen) {</div><div class='add'>+			span += flen - start_offset;</div><div class='add'>+			nsegs++;</div><div class='add'>+			start_offset = 0;</div><div class='add'>+		} else {</div><div class='add'>+			start_offset -= flen;</div><div class='add'>+		}</div><div class='add'>+		if (span &gt;= max_size || nsegs &gt;= max_segs)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		slot++;</div><div class='add'>+		if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+			folioq = folioq-&gt;next;</div><div class='add'>+			slot = 0;</div><div class='add'>+		}</div><div class='add'>+	} while (folioq);</div><div class='add'>+</div><div class='add'>+	return umin(span, max_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> size_t netfs_limit_iter(const struct iov_iter *iter, size_t start_offset,</div><div class='ctx'> 			size_t max_size, size_t max_segs)</div><div class='ctx'> {</div><div class='add'>+	if (iov_iter_is_folioq(iter))</div><div class='add'>+		return netfs_limit_folioq(iter, start_offset, max_size, max_segs);</div><div class='ctx'> 	if (iov_iter_is_bvec(iter))</div><div class='ctx'> 		return netfs_limit_bvec(iter, start_offset, max_size, max_segs);</div><div class='ctx'> 	if (iov_iter_is_xarray(iter))</div><div class='head'>diff --git a/fs/netfs/locking.c b/fs/netfs/locking.c<br/>index 75dc52a49b3a..2249ecd09d0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/locking.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/locking.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/locking.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/locking.c</a></div><div class='hunk'>@@ -19,25 +19,13 @@</div><div class='ctx'>  * Must be called under a lock that serializes taking new references</div><div class='ctx'>  * to i_dio_count, usually by inode-&gt;i_mutex.</div><div class='ctx'>  */</div><div class='del'>-static int inode_dio_wait_interruptible(struct inode *inode)</div><div class='add'>+static int netfs_inode_dio_wait_interruptible(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (!atomic_read(&amp;inode-&gt;i_dio_count))</div><div class='add'>+	if (inode_dio_finished(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	wait_queue_head_t *wq = bit_waitqueue(&amp;inode-&gt;i_state, __I_DIO_WAKEUP);</div><div class='del'>-	DEFINE_WAIT_BIT(q, &amp;inode-&gt;i_state, __I_DIO_WAKEUP);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		prepare_to_wait(wq, &amp;q.wq_entry, TASK_INTERRUPTIBLE);</div><div class='del'>-		if (!atomic_read(&amp;inode-&gt;i_dio_count))</div><div class='del'>-			break;</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			break;</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-	finish_wait(wq, &amp;q.wq_entry);</div><div class='del'>-</div><div class='del'>-	return atomic_read(&amp;inode-&gt;i_dio_count) ? -ERESTARTSYS : 0;</div><div class='add'>+	inode_dio_wait_interruptible(inode);</div><div class='add'>+	return !inode_dio_finished(inode) ? -ERESTARTSYS : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Call with exclusively locked inode-&gt;i_rwsem */</div><div class='hunk'>@@ -46,7 +34,7 @@ static int netfs_block_o_direct(struct netfs_inode *ictx)</div><div class='ctx'> 	if (!test_bit(NETFS_ICTX_ODIRECT, &amp;ictx-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	clear_bit(NETFS_ICTX_ODIRECT, &amp;ictx-&gt;flags);</div><div class='del'>-	return inode_dio_wait_interruptible(&amp;ictx-&gt;inode);</div><div class='add'>+	return netfs_inode_dio_wait_interruptible(&amp;ictx-&gt;inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -121,6 +109,7 @@ int netfs_start_io_write(struct inode *inode)</div><div class='ctx'> 		up_write(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> 	}</div><div class='add'>+	downgrade_write(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netfs_start_io_write);</div><div class='hunk'>@@ -135,7 +124,7 @@ EXPORT_SYMBOL(netfs_start_io_write);</div><div class='ctx'> void netfs_end_io_write(struct inode *inode)</div><div class='ctx'> 	__releases(inode-&gt;i_rwsem)</div><div class='ctx'> {</div><div class='del'>-	up_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	up_read(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netfs_end_io_write);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/netfs/main.c b/fs/netfs/main.c<br/>index 5e77618a7940..73da6c9f5777 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/main.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/main.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/mempool.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -23,6 +24,11 @@ unsigned netfs_debug;</div><div class='ctx'> module_param_named(debug, netfs_debug, uint, S_IWUSR | S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask");</div><div class='ctx'> </div><div class='add'>+static struct kmem_cache *netfs_request_slab;</div><div class='add'>+static struct kmem_cache *netfs_subrequest_slab;</div><div class='add'>+mempool_t netfs_request_pool;</div><div class='add'>+mempool_t netfs_subrequest_pool;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> LIST_HEAD(netfs_io_requests);</div><div class='ctx'> DEFINE_SPINLOCK(netfs_proc_lock);</div><div class='hunk'>@@ -30,13 +36,17 @@ DEFINE_SPINLOCK(netfs_proc_lock);</div><div class='ctx'> static const char *netfs_origins[nr__netfs_io_origin] = {</div><div class='ctx'> 	[NETFS_READAHEAD]		= "RA",</div><div class='ctx'> 	[NETFS_READPAGE]		= "RP",</div><div class='add'>+	[NETFS_READ_GAPS]		= "RG",</div><div class='add'>+	[NETFS_READ_SINGLE]		= "R1",</div><div class='ctx'> 	[NETFS_READ_FOR_WRITE]		= "RW",</div><div class='add'>+	[NETFS_UNBUFFERED_READ]		= "UR",</div><div class='add'>+	[NETFS_DIO_READ]		= "DR",</div><div class='ctx'> 	[NETFS_WRITEBACK]		= "WB",</div><div class='add'>+	[NETFS_WRITEBACK_SINGLE]	= "W1",</div><div class='ctx'> 	[NETFS_WRITETHROUGH]		= "WT",</div><div class='del'>-	[NETFS_LAUNDER_WRITE]		= "LW",</div><div class='ctx'> 	[NETFS_UNBUFFERED_WRITE]	= "UW",</div><div class='del'>-	[NETFS_DIO_READ]		= "DR",</div><div class='ctx'> 	[NETFS_DIO_WRITE]		= "DW",</div><div class='add'>+	[NETFS_PGPRIV2_COPY_TO_CACHE]	= "2C",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -48,21 +58,21 @@ static int netfs_requests_seq_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	if (v == &amp;netfs_io_requests) {</div><div class='ctx'> 		seq_puts(m,</div><div class='del'>-			 "REQUEST  OR REF FL ERR  OPS COVERAGE\n"</div><div class='del'>-			 "======== == === == ==== === =========\n"</div><div class='add'>+			 "REQUEST  OR REF FLAG ERR  OPS COVERAGE\n"</div><div class='add'>+			 "======== == === ==== ==== === =========\n"</div><div class='ctx'> 			 );</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rreq = list_entry(v, struct netfs_io_request, proc_link);</div><div class='ctx'> 	seq_printf(m,</div><div class='del'>-		   "%08x %s %3d %2lx %4d %3d @%04llx %zx/%zx",</div><div class='add'>+		   "%08x %s %3d %4lx %4ld %3d @%04llx %llx/%llx",</div><div class='ctx'> 		   rreq-&gt;debug_id,</div><div class='ctx'> 		   netfs_origins[rreq-&gt;origin],</div><div class='ctx'> 		   refcount_read(&amp;rreq-&gt;ref),</div><div class='ctx'> 		   rreq-&gt;flags,</div><div class='ctx'> 		   rreq-&gt;error,</div><div class='del'>-		   atomic_read(&amp;rreq-&gt;nr_outstanding),</div><div class='add'>+		   0,</div><div class='ctx'> 		   rreq-&gt;start, rreq-&gt;submitted, rreq-&gt;len);</div><div class='ctx'> 	seq_putc(m, '\n');</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -98,25 +108,58 @@ static int __init netfs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	netfs_request_slab = kmem_cache_create("netfs_request",</div><div class='add'>+					       sizeof(struct netfs_io_request), 0,</div><div class='add'>+					       SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT,</div><div class='add'>+					       NULL);</div><div class='add'>+	if (!netfs_request_slab)</div><div class='add'>+		goto error_req;</div><div class='add'>+</div><div class='add'>+	if (mempool_init_slab_pool(&amp;netfs_request_pool, 100, netfs_request_slab) &lt; 0)</div><div class='add'>+		goto error_reqpool;</div><div class='add'>+</div><div class='add'>+	netfs_subrequest_slab = kmem_cache_create("netfs_subrequest",</div><div class='add'>+						  sizeof(struct netfs_io_subrequest) + 16, 0,</div><div class='add'>+						  SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT,</div><div class='add'>+						  NULL);</div><div class='add'>+	if (!netfs_subrequest_slab)</div><div class='add'>+		goto error_subreq;</div><div class='add'>+</div><div class='add'>+	if (mempool_init_slab_pool(&amp;netfs_subrequest_pool, 100, netfs_subrequest_slab) &lt; 0)</div><div class='add'>+		goto error_subreqpool;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='ctx'> 	if (!proc_mkdir("fs/netfs", NULL))</div><div class='del'>-		goto error;</div><div class='add'>+		goto error_proc;</div><div class='ctx'> 	if (!proc_create_seq("fs/netfs/requests", S_IFREG | 0444, NULL,</div><div class='ctx'> 			     &amp;netfs_requests_seq_ops))</div><div class='del'>-		goto error_proc;</div><div class='add'>+		goto error_procfile;</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_FSCACHE_STATS</div><div class='ctx'> 	if (!proc_create_single("fs/netfs/stats", S_IFREG | 0444, NULL,</div><div class='ctx'> 				netfs_stats_show))</div><div class='del'>-		goto error_proc;</div><div class='add'>+		goto error_procfile;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	ret = fscache_init();</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto error_proc;</div><div class='add'>+		goto error_fscache;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+error_fscache:</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+error_procfile:</div><div class='add'>+	remove_proc_subtree("fs/netfs", NULL);</div><div class='ctx'> error_proc:</div><div class='del'>-	remove_proc_entry("fs/netfs", NULL);</div><div class='del'>-error:</div><div class='add'>+#endif</div><div class='add'>+	mempool_exit(&amp;netfs_subrequest_pool);</div><div class='add'>+error_subreqpool:</div><div class='add'>+	kmem_cache_destroy(netfs_subrequest_slab);</div><div class='add'>+error_subreq:</div><div class='add'>+	mempool_exit(&amp;netfs_request_pool);</div><div class='add'>+error_reqpool:</div><div class='add'>+	kmem_cache_destroy(netfs_request_slab);</div><div class='add'>+error_req:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> fs_initcall(netfs_init);</div><div class='hunk'>@@ -124,6 +167,10 @@ fs_initcall(netfs_init);</div><div class='ctx'> static void __exit netfs_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	fscache_exit();</div><div class='del'>-	remove_proc_entry("fs/netfs", NULL);</div><div class='add'>+	remove_proc_subtree("fs/netfs", NULL);</div><div class='add'>+	mempool_exit(&amp;netfs_subrequest_pool);</div><div class='add'>+	kmem_cache_destroy(netfs_subrequest_slab);</div><div class='add'>+	mempool_exit(&amp;netfs_request_pool);</div><div class='add'>+	kmem_cache_destroy(netfs_request_slab);</div><div class='ctx'> }</div><div class='ctx'> module_exit(netfs_exit);</div><div class='head'>diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c<br/>index 0e3af37fc924..6df89c92b10b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/misc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/misc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/misc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/misc.c</a></div><div class='hunk'>@@ -8,85 +8,118 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Attach a folio to the buffer and maybe set marks on it to say that we need</div><div class='del'>- * to put the folio later and twiddle the pagecache flags.</div><div class='add'>+/**</div><div class='add'>+ * netfs_alloc_folioq_buffer - Allocate buffer space into a folio queue</div><div class='add'>+ * @mapping: Address space to set on the folio (or NULL).</div><div class='add'>+ * @_buffer: Pointer to the folio queue to add to (may point to a NULL; updated).</div><div class='add'>+ * @_cur_size: Current size of the buffer (updated).</div><div class='add'>+ * @size: Target size of the buffer.</div><div class='add'>+ * @gfp: The allocation constraints.</div><div class='ctx'>  */</div><div class='del'>-int netfs_xa_store_and_mark(struct xarray *xa, unsigned long index,</div><div class='del'>-			    struct folio *folio, unsigned int flags,</div><div class='del'>-			    gfp_t gfp_mask)</div><div class='add'>+int netfs_alloc_folioq_buffer(struct address_space *mapping,</div><div class='add'>+			      struct folio_queue **_buffer,</div><div class='add'>+			      size_t *_cur_size, ssize_t size, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	XA_STATE_ORDER(xas, xa, index, folio_order(folio));</div><div class='add'>+	struct folio_queue *tail = *_buffer, *p;</div><div class='ctx'> </div><div class='del'>-retry:</div><div class='del'>-	xas_lock(&amp;xas);</div><div class='del'>-	for (;;) {</div><div class='del'>-		xas_store(&amp;xas, folio);</div><div class='del'>-		if (!xas_error(&amp;xas))</div><div class='del'>-			break;</div><div class='del'>-		xas_unlock(&amp;xas);</div><div class='del'>-		if (!xas_nomem(&amp;xas, gfp_mask))</div><div class='del'>-			return xas_error(&amp;xas);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='add'>+	size = round_up(size, PAGE_SIZE);</div><div class='add'>+	if (*_cur_size &gt;= size)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; NETFS_FLAG_PUT_MARK)</div><div class='del'>-		xas_set_mark(&amp;xas, NETFS_BUF_PUT_MARK);</div><div class='del'>-	if (flags &amp; NETFS_FLAG_PAGECACHE_MARK)</div><div class='del'>-		xas_set_mark(&amp;xas, NETFS_BUF_PAGECACHE_MARK);</div><div class='del'>-	xas_unlock(&amp;xas);</div><div class='del'>-	return xas_error(&amp;xas);</div><div class='del'>-}</div><div class='add'>+	if (tail)</div><div class='add'>+		while (tail-&gt;next)</div><div class='add'>+			tail = tail-&gt;next;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Create the specified range of folios in the buffer attached to the read</div><div class='del'>- * request.  The folios are marked with NETFS_BUF_PUT_MARK so that we know that</div><div class='del'>- * these need freeing later.</div><div class='del'>- */</div><div class='del'>-int netfs_add_folios_to_buffer(struct xarray *buffer,</div><div class='del'>-			       struct address_space *mapping,</div><div class='del'>-			       pgoff_t index, pgoff_t to, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	int ret;</div><div class='add'>+	do {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		int order = 0, slot;</div><div class='add'>+</div><div class='add'>+		if (!tail || folioq_full(tail)) {</div><div class='add'>+			p = netfs_folioq_alloc(0, GFP_NOFS, netfs_trace_folioq_alloc_buffer);</div><div class='add'>+			if (!p)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			if (tail) {</div><div class='add'>+				tail-&gt;next = p;</div><div class='add'>+				p-&gt;prev = tail;</div><div class='add'>+			} else {</div><div class='add'>+				*_buffer = p;</div><div class='add'>+			}</div><div class='add'>+			tail = p;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (to + 1 == index) /* Page range is inclusive */</div><div class='del'>-		return 0;</div><div class='add'>+		if (size - *_cur_size &gt; PAGE_SIZE)</div><div class='add'>+			order = umin(ilog2(size - *_cur_size) - PAGE_SHIFT,</div><div class='add'>+				     MAX_PAGECACHE_ORDER);</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		/* TODO: Figure out what order folio can be allocated here */</div><div class='del'>-		folio = filemap_alloc_folio(readahead_gfp_mask(mapping), 0);</div><div class='add'>+		folio = folio_alloc(gfp, order);</div><div class='add'>+		if (!folio &amp;&amp; order &gt; 0)</div><div class='add'>+			folio = folio_alloc(gfp, 0);</div><div class='ctx'> 		if (!folio)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		folio-&gt;index = index;</div><div class='del'>-		ret = netfs_xa_store_and_mark(buffer, index, folio,</div><div class='del'>-					      NETFS_FLAG_PUT_MARK, gfp_mask);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			folio_put(folio);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		index += folio_nr_pages(folio);</div><div class='del'>-	} while (index &lt;= to &amp;&amp; index != 0);</div><div class='add'>+		folio-&gt;mapping = mapping;</div><div class='add'>+		folio-&gt;index = *_cur_size / PAGE_SIZE;</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_alloc_buffer);</div><div class='add'>+		slot = folioq_append_mark(tail, folio);</div><div class='add'>+		*_cur_size += folioq_folio_size(tail, slot);</div><div class='add'>+	} while (*_cur_size &lt; size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(netfs_alloc_folioq_buffer);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Clear an xarray buffer, putting a ref on the folios that have</div><div class='del'>- * NETFS_BUF_PUT_MARK set.</div><div class='add'>+/**</div><div class='add'>+ * netfs_free_folioq_buffer - Free a folio queue.</div><div class='add'>+ * @fq: The start of the folio queue to free</div><div class='add'>+ *</div><div class='add'>+ * Free up a chain of folio_queues and, if marked, the marked folios they point</div><div class='add'>+ * to.</div><div class='ctx'>  */</div><div class='del'>-void netfs_clear_buffer(struct xarray *buffer)</div><div class='add'>+void netfs_free_folioq_buffer(struct folio_queue *fq)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	XA_STATE(xas, buffer, 0);</div><div class='add'>+	struct folio_queue *next;</div><div class='add'>+	struct folio_batch fbatch;</div><div class='add'>+</div><div class='add'>+	folio_batch_init(&amp;fbatch);</div><div class='add'>+</div><div class='add'>+	for (; fq; fq = next) {</div><div class='add'>+		for (int slot = 0; slot &lt; folioq_count(fq); slot++) {</div><div class='add'>+			struct folio *folio = folioq_folio(fq, slot);</div><div class='add'>+</div><div class='add'>+			if (!folio ||</div><div class='add'>+			    !folioq_is_marked(fq, slot))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	xas_for_each_marked(&amp;xas, folio, ULONG_MAX, NETFS_BUF_PUT_MARK) {</div><div class='del'>-		folio_put(folio);</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_put);</div><div class='add'>+			if (folio_batch_add(&amp;fbatch, folio))</div><div class='add'>+				folio_batch_release(&amp;fbatch);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netfs_stat_d(&amp;netfs_n_folioq);</div><div class='add'>+		next = fq-&gt;next;</div><div class='add'>+		kfree(fq);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	xa_destroy(buffer);</div><div class='add'>+</div><div class='add'>+	folio_batch_release(&amp;fbatch);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_free_folioq_buffer);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the subrequest iterator to refer just to the region remaining to be</div><div class='add'>+ * read.  The iterator may or may not have been advanced by socket ops or</div><div class='add'>+ * extraction ops to an extent that may or may not match the amount actually</div><div class='add'>+ * read.</div><div class='add'>+ */</div><div class='add'>+void netfs_reset_iter(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct iov_iter *io_iter = &amp;subreq-&gt;io_iter;</div><div class='add'>+	size_t remain = subreq-&gt;len - subreq-&gt;transferred;</div><div class='add'>+</div><div class='add'>+	if (io_iter-&gt;count &gt; remain)</div><div class='add'>+		iov_iter_advance(io_iter, io_iter-&gt;count - remain);</div><div class='add'>+	else if (io_iter-&gt;count &lt; remain)</div><div class='add'>+		iov_iter_revert(io_iter, remain - io_iter-&gt;count);</div><div class='add'>+	iov_iter_truncate(&amp;subreq-&gt;io_iter, remain);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -114,10 +147,10 @@ bool netfs_dirty_folio(struct address_space *mapping, struct folio *folio)</div><div class='ctx'> 	if (!fscache_cookie_valid(cookie))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_PINNING_NETFS_WB)) {</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_PINNING_NETFS_WB)) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (!(inode-&gt;i_state &amp; I_PINNING_NETFS_WB)) {</div><div class='del'>-			inode-&gt;i_state |= I_PINNING_NETFS_WB;</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_PINNING_NETFS_WB)) {</div><div class='add'>+			inode_state_set(inode, I_PINNING_NETFS_WB);</div><div class='ctx'> 			need_use = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -159,7 +192,7 @@ void netfs_clear_inode_writeback(struct inode *inode, const void *aux)</div><div class='ctx'> {</div><div class='ctx'> 	struct fscache_cookie *cookie = netfs_i_cookie(netfs_inode(inode));</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_PINNING_NETFS_WB) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_PINNING_NETFS_WB) {</div><div class='ctx'> 		loff_t i_size = i_size_read(inode);</div><div class='ctx'> 		fscache_unuse_cookie(cookie, aux, &amp;i_size);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -177,12 +210,22 @@ EXPORT_SYMBOL(netfs_clear_inode_writeback);</div><div class='ctx'>  */</div><div class='ctx'> void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length)</div><div class='ctx'> {</div><div class='del'>-	struct netfs_folio *finfo = NULL;</div><div class='add'>+	struct netfs_folio *finfo;</div><div class='add'>+	struct netfs_inode *ctx = netfs_inode(folio_inode(folio));</div><div class='ctx'> 	size_t flen = folio_size(folio);</div><div class='ctx'> </div><div class='del'>-	_enter("{%lx},%zx,%zx", folio_index(folio), offset, length);</div><div class='add'>+	_enter("{%lx},%zx,%zx", folio-&gt;index, offset, length);</div><div class='add'>+</div><div class='add'>+	if (offset == 0 &amp;&amp; length == flen) {</div><div class='add'>+		unsigned long long i_size = i_size_read(&amp;ctx-&gt;inode);</div><div class='add'>+		unsigned long long fpos = folio_pos(folio), end;</div><div class='add'>+</div><div class='add'>+		end = umin(fpos + flen, i_size);</div><div class='add'>+		if (fpos &lt; i_size &amp;&amp; end &gt; ctx-&gt;zero_point)</div><div class='add'>+			ctx-&gt;zero_point = end;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	folio_wait_fscache(folio);</div><div class='add'>+	folio_wait_private_2(folio); /* [DEPRECATED] */</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_private(folio))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -196,18 +239,34 @@ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length)</div><div class='ctx'> 		/* We have a partially uptodate page from a streaming write. */</div><div class='ctx'> 		unsigned int fstart = finfo-&gt;dirty_offset;</div><div class='ctx'> 		unsigned int fend = fstart + finfo-&gt;dirty_len;</div><div class='del'>-		unsigned int end = offset + length;</div><div class='add'>+		unsigned int iend = offset + length;</div><div class='ctx'> </div><div class='ctx'> 		if (offset &gt;= fend)</div><div class='ctx'> 			return;</div><div class='del'>-		if (end &lt;= fstart)</div><div class='add'>+		if (iend &lt;= fstart)</div><div class='ctx'> 			return;</div><div class='del'>-		if (offset &lt;= fstart &amp;&amp; end &gt;= fend)</div><div class='del'>-			goto erase_completely;</div><div class='del'>-		if (offset &lt;= fstart &amp;&amp; end &gt; fstart)</div><div class='del'>-			goto reduce_len;</div><div class='del'>-		if (offset &gt; fstart &amp;&amp; end &gt;= fend)</div><div class='del'>-			goto move_start;</div><div class='add'>+</div><div class='add'>+		/* The invalidation region overlaps the data.  If the region</div><div class='add'>+		 * covers the start of the data, we either move along the start</div><div class='add'>+		 * or just erase the data entirely.</div><div class='add'>+		 */</div><div class='add'>+		if (offset &lt;= fstart) {</div><div class='add'>+			if (iend &gt;= fend)</div><div class='add'>+				goto erase_completely;</div><div class='add'>+			/* Move the start of the data. */</div><div class='add'>+			finfo-&gt;dirty_len = fend - iend;</div><div class='add'>+			finfo-&gt;dirty_offset = offset;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Reduce the length of the data if the invalidation region</div><div class='add'>+		 * covers the tail part.</div><div class='add'>+		 */</div><div class='add'>+		if (iend &gt;= fend) {</div><div class='add'>+			finfo-&gt;dirty_len = offset - fstart;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* A partial write was split.  The caller has already zeroed</div><div class='ctx'> 		 * it, so just absorb the hole.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -220,12 +279,6 @@ erase_completely:</div><div class='ctx'> 	folio_clear_uptodate(folio);</div><div class='ctx'> 	kfree(finfo);</div><div class='ctx'> 	return;</div><div class='del'>-reduce_len:</div><div class='del'>-	finfo-&gt;dirty_len = offset + length - finfo-&gt;dirty_offset;</div><div class='del'>-	return;</div><div class='del'>-move_start:</div><div class='del'>-	finfo-&gt;dirty_len -= offset - finfo-&gt;dirty_offset;</div><div class='del'>-	finfo-&gt;dirty_offset = offset;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netfs_invalidate_folio);</div><div class='ctx'> </div><div class='hunk'>@@ -242,19 +295,252 @@ bool netfs_release_folio(struct folio *folio, gfp_t gfp)</div><div class='ctx'> 	struct netfs_inode *ctx = netfs_inode(folio_inode(folio));</div><div class='ctx'> 	unsigned long long end;</div><div class='ctx'> </div><div class='del'>-	end = folio_pos(folio) + folio_size(folio);</div><div class='add'>+	if (folio_test_dirty(folio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	end = umin(folio_next_pos(folio), i_size_read(&amp;ctx-&gt;inode));</div><div class='ctx'> 	if (end &gt; ctx-&gt;zero_point)</div><div class='ctx'> 		ctx-&gt;zero_point = end;</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_private(folio))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (folio_test_fscache(folio)) {</div><div class='add'>+	if (unlikely(folio_test_private_2(folio))) { /* [DEPRECATED] */</div><div class='ctx'> 		if (current_is_kswapd() || !(gfp &amp; __GFP_FS))</div><div class='ctx'> 			return false;</div><div class='del'>-		folio_wait_fscache(folio);</div><div class='add'>+		folio_wait_private_2(folio);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	fscache_note_page_release(netfs_i_cookie(ctx));</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netfs_release_folio);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wake the collection work item.</div><div class='add'>+ */</div><div class='add'>+void netfs_wake_collector(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;rreq-&gt;flags) &amp;&amp;</div><div class='add'>+	    !test_bit(NETFS_RREQ_RETRYING, &amp;rreq-&gt;flags)) {</div><div class='add'>+		queue_work(system_dfl_wq, &amp;rreq-&gt;work);</div><div class='add'>+	} else {</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_wake_queue);</div><div class='add'>+		wake_up(&amp;rreq-&gt;waitq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a subrequest as no longer being in progress and, if need be, wake the</div><div class='add'>+ * collector.</div><div class='add'>+ */</div><div class='add'>+void netfs_subreq_clear_in_progress(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[subreq-&gt;stream_nr];</div><div class='add'>+</div><div class='add'>+	clear_bit_unlock(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	smp_mb__after_atomic(); /* Clear IN_PROGRESS before task state */</div><div class='add'>+</div><div class='add'>+	/* If we are at the head of the queue, wake up the collector. */</div><div class='add'>+	if (list_is_first(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests) ||</div><div class='add'>+	    test_bit(NETFS_RREQ_RETRYING, &amp;rreq-&gt;flags))</div><div class='add'>+		netfs_wake_collector(rreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for all outstanding I/O in a stream to quiesce.</div><div class='add'>+ */</div><div class='add'>+void netfs_wait_for_in_progress_stream(struct netfs_io_request *rreq,</div><div class='add'>+				       struct netfs_io_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq;</div><div class='add'>+	DEFINE_WAIT(myself);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(subreq, &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+		if (!netfs_check_subreq_in_progress(subreq))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_wait_quiesce);</div><div class='add'>+		for (;;) {</div><div class='add'>+			prepare_to_wait(&amp;rreq-&gt;waitq, &amp;myself, TASK_UNINTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+			if (!netfs_check_subreq_in_progress(subreq))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_wait_for);</div><div class='add'>+			schedule();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_waited_quiesce);</div><div class='add'>+	finish_wait(&amp;rreq-&gt;waitq, &amp;myself);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform collection in app thread if not offloaded to workqueue.</div><div class='add'>+ */</div><div class='add'>+static int netfs_collect_in_app(struct netfs_io_request *rreq,</div><div class='add'>+				bool (*collector)(struct netfs_io_request *rreq))</div><div class='add'>+{</div><div class='add'>+	bool need_collect = false, inactive = true, done = true;</div><div class='add'>+</div><div class='add'>+	if (!netfs_check_rreq_in_progress(rreq)) {</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_recollect);</div><div class='add'>+		return 1; /* Done */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NR_IO_STREAMS; i++) {</div><div class='add'>+		struct netfs_io_subrequest *subreq;</div><div class='add'>+		struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[i];</div><div class='add'>+</div><div class='add'>+		if (!stream-&gt;active)</div><div class='add'>+			continue;</div><div class='add'>+		inactive = false;</div><div class='add'>+		trace_netfs_collect_stream(rreq, stream);</div><div class='add'>+		subreq = list_first_entry_or_null(&amp;stream-&gt;subrequests,</div><div class='add'>+						  struct netfs_io_subrequest,</div><div class='add'>+						  rreq_link);</div><div class='add'>+		if (subreq &amp;&amp;</div><div class='add'>+		    (!netfs_check_subreq_in_progress(subreq) ||</div><div class='add'>+		     test_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags))) {</div><div class='add'>+			need_collect = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (subreq || !test_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags))</div><div class='add'>+			done = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!need_collect &amp;&amp; !inactive &amp;&amp; !done)</div><div class='add'>+		return 0; /* Sleep */</div><div class='add'>+</div><div class='add'>+	__set_current_state(TASK_RUNNING);</div><div class='add'>+	if (collector(rreq)) {</div><div class='add'>+		/* Drop the ref from the NETFS_RREQ_IN_PROGRESS flag. */</div><div class='add'>+		netfs_put_request(rreq, netfs_rreq_trace_put_work_ip);</div><div class='add'>+		return 1; /* Done */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inactive) {</div><div class='add'>+		WARN(true, "Failed to collect inactive req R=%08x\n",</div><div class='add'>+		     rreq-&gt;debug_id);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	return 2; /* Again */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for a request to complete, successfully or otherwise.</div><div class='add'>+ */</div><div class='add'>+static ssize_t netfs_wait_for_in_progress(struct netfs_io_request *rreq,</div><div class='add'>+					  bool (*collector)(struct netfs_io_request *rreq))</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT(myself);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		prepare_to_wait(&amp;rreq-&gt;waitq, &amp;myself, TASK_UNINTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		if (!test_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;rreq-&gt;flags)) {</div><div class='add'>+			switch (netfs_collect_in_app(rreq, collector)) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				goto all_collected;</div><div class='add'>+			case 2:</div><div class='add'>+				if (!netfs_check_rreq_in_progress(rreq))</div><div class='add'>+					break;</div><div class='add'>+				cond_resched();</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!netfs_check_rreq_in_progress(rreq))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_wait_ip);</div><div class='add'>+		schedule();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+all_collected:</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_waited_ip);</div><div class='add'>+	finish_wait(&amp;rreq-&gt;waitq, &amp;myself);</div><div class='add'>+</div><div class='add'>+	ret = rreq-&gt;error;</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = rreq-&gt;transferred;</div><div class='add'>+		switch (rreq-&gt;origin) {</div><div class='add'>+		case NETFS_DIO_READ:</div><div class='add'>+		case NETFS_DIO_WRITE:</div><div class='add'>+		case NETFS_READ_SINGLE:</div><div class='add'>+		case NETFS_UNBUFFERED_READ:</div><div class='add'>+		case NETFS_UNBUFFERED_WRITE:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (rreq-&gt;submitted &lt; rreq-&gt;len) {</div><div class='add'>+				trace_netfs_failure(rreq, NULL, ret, netfs_fail_short_read);</div><div class='add'>+				ret = -EIO;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t netfs_wait_for_read(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	return netfs_wait_for_in_progress(rreq, netfs_read_collection);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t netfs_wait_for_write(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	return netfs_wait_for_in_progress(rreq, netfs_write_collection);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for a paused operation to unpause or complete in some manner.</div><div class='add'>+ */</div><div class='add'>+static void netfs_wait_for_pause(struct netfs_io_request *rreq,</div><div class='add'>+				 bool (*collector)(struct netfs_io_request *rreq))</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT(myself);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_wait_pause);</div><div class='add'>+		prepare_to_wait(&amp;rreq-&gt;waitq, &amp;myself, TASK_UNINTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		if (!test_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;rreq-&gt;flags)) {</div><div class='add'>+			switch (netfs_collect_in_app(rreq, collector)) {</div><div class='add'>+			case 0:</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				goto all_collected;</div><div class='add'>+			case 2:</div><div class='add'>+				if (!netfs_check_rreq_in_progress(rreq) ||</div><div class='add'>+				    !test_bit(NETFS_RREQ_PAUSE, &amp;rreq-&gt;flags))</div><div class='add'>+					break;</div><div class='add'>+				cond_resched();</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!netfs_check_rreq_in_progress(rreq) ||</div><div class='add'>+		    !test_bit(NETFS_RREQ_PAUSE, &amp;rreq-&gt;flags))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		schedule();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+all_collected:</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_waited_pause);</div><div class='add'>+	finish_wait(&amp;rreq-&gt;waitq, &amp;myself);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_wait_for_paused_read(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	return netfs_wait_for_pause(rreq, netfs_read_collection);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_wait_for_paused_write(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	return netfs_wait_for_pause(rreq, netfs_write_collection);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c<br/>index 610ceb5bd86c..b8c4918d3dcd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/objects.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/objects.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/objects.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/objects.c</a></div><div class='hunk'>@@ -6,8 +6,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mempool.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+static void netfs_free_request(struct work_struct *work);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate an I/O request and initialise it.</div><div class='ctx'>  */</div><div class='hunk'>@@ -20,44 +24,60 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,</div><div class='ctx'> 	struct inode *inode = file ? file_inode(file) : mapping-&gt;host;</div><div class='ctx'> 	struct netfs_inode *ctx = netfs_inode(inode);</div><div class='ctx'> 	struct netfs_io_request *rreq;</div><div class='del'>-	bool is_unbuffered = (origin == NETFS_UNBUFFERED_WRITE ||</div><div class='del'>-			      origin == NETFS_DIO_READ ||</div><div class='del'>-			      origin == NETFS_DIO_WRITE);</div><div class='del'>-	bool cached = !is_unbuffered &amp;&amp; netfs_is_cache_enabled(ctx);</div><div class='add'>+	mempool_t *mempool = ctx-&gt;ops-&gt;request_pool ?: &amp;netfs_request_pool;</div><div class='add'>+	struct kmem_cache *cache = mempool-&gt;pool_data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	rreq = kzalloc(ctx-&gt;ops-&gt;io_request_size ?: sizeof(struct netfs_io_request),</div><div class='del'>-		       GFP_KERNEL);</div><div class='del'>-	if (!rreq)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	for (;;) {</div><div class='add'>+		rreq = mempool_alloc(mempool, GFP_KERNEL);</div><div class='add'>+		if (rreq)</div><div class='add'>+			break;</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	memset(rreq, 0, kmem_cache_size(cache));</div><div class='add'>+	INIT_WORK(&amp;rreq-&gt;cleanup_work, netfs_free_request);</div><div class='ctx'> 	rreq-&gt;start	= start;</div><div class='ctx'> 	rreq-&gt;len	= len;</div><div class='del'>-	rreq-&gt;upper_len	= len;</div><div class='ctx'> 	rreq-&gt;origin	= origin;</div><div class='ctx'> 	rreq-&gt;netfs_ops	= ctx-&gt;ops;</div><div class='ctx'> 	rreq-&gt;mapping	= mapping;</div><div class='ctx'> 	rreq-&gt;inode	= inode;</div><div class='ctx'> 	rreq-&gt;i_size	= i_size_read(inode);</div><div class='ctx'> 	rreq-&gt;debug_id	= atomic_inc_return(&amp;debug_ids);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rreq-&gt;subrequests);</div><div class='del'>-	INIT_WORK(&amp;rreq-&gt;work, NULL);</div><div class='del'>-	refcount_set(&amp;rreq-&gt;ref, 1);</div><div class='add'>+	rreq-&gt;wsize	= INT_MAX;</div><div class='add'>+	rreq-&gt;io_streams[0].sreq_max_len = ULONG_MAX;</div><div class='add'>+	rreq-&gt;io_streams[0].sreq_max_segs = 0;</div><div class='add'>+	spin_lock_init(&amp;rreq-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rreq-&gt;io_streams[0].subrequests);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rreq-&gt;io_streams[1].subrequests);</div><div class='add'>+	init_waitqueue_head(&amp;rreq-&gt;waitq);</div><div class='add'>+	refcount_set(&amp;rreq-&gt;ref, 2);</div><div class='add'>+</div><div class='add'>+	if (origin == NETFS_READAHEAD ||</div><div class='add'>+	    origin == NETFS_READPAGE ||</div><div class='add'>+	    origin == NETFS_READ_GAPS ||</div><div class='add'>+	    origin == NETFS_READ_SINGLE ||</div><div class='add'>+	    origin == NETFS_READ_FOR_WRITE ||</div><div class='add'>+	    origin == NETFS_UNBUFFERED_READ ||</div><div class='add'>+	    origin == NETFS_DIO_READ) {</div><div class='add'>+		INIT_WORK(&amp;rreq-&gt;work, netfs_read_collection_worker);</div><div class='add'>+		rreq-&gt;io_streams[0].avail = true;</div><div class='add'>+	} else {</div><div class='add'>+		INIT_WORK(&amp;rreq-&gt;work, netfs_write_collection_worker);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(NETFS_RREQ_IN_PROGRESS, &amp;rreq-&gt;flags);</div><div class='del'>-	if (cached)</div><div class='del'>-		__set_bit(NETFS_RREQ_WRITE_TO_CACHE, &amp;rreq-&gt;flags);</div><div class='del'>-	if (file &amp;&amp; file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-		__set_bit(NETFS_RREQ_NONBLOCK, &amp;rreq-&gt;flags);</div><div class='ctx'> 	if (rreq-&gt;netfs_ops-&gt;init_request) {</div><div class='ctx'> 		ret = rreq-&gt;netfs_ops-&gt;init_request(rreq, file);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			kfree(rreq);</div><div class='add'>+			mempool_free(rreq, rreq-&gt;netfs_ops-&gt;request_pool ?: &amp;netfs_request_pool);</div><div class='ctx'> 			return ERR_PTR(ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trace_netfs_rreq_ref(rreq-&gt;debug_id, 1, netfs_rreq_trace_new);</div><div class='add'>+	atomic_inc(&amp;ctx-&gt;io_count);</div><div class='add'>+	trace_netfs_rreq_ref(rreq-&gt;debug_id, refcount_read(&amp;rreq-&gt;ref), netfs_rreq_trace_new);</div><div class='ctx'> 	netfs_proc_add_rreq(rreq);</div><div class='ctx'> 	netfs_stat(&amp;netfs_n_rh_rreq);</div><div class='ctx'> 	return rreq;</div><div class='hunk'>@@ -71,28 +91,45 @@ void netfs_get_request(struct netfs_io_request *rreq, enum netfs_rreq_ref_trace</div><div class='ctx'> 	trace_netfs_rreq_ref(rreq-&gt;debug_id, r + 1, what);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void netfs_clear_subrequests(struct netfs_io_request *rreq, bool was_async)</div><div class='add'>+void netfs_clear_subrequests(struct netfs_io_request *rreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_subrequest *subreq;</div><div class='add'>+	struct netfs_io_stream *stream;</div><div class='add'>+	int s;</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;rreq-&gt;subrequests)) {</div><div class='del'>-		subreq = list_first_entry(&amp;rreq-&gt;subrequests,</div><div class='del'>-					  struct netfs_io_subrequest, rreq_link);</div><div class='del'>-		list_del(&amp;subreq-&gt;rreq_link);</div><div class='del'>-		netfs_put_subrequest(subreq, was_async,</div><div class='del'>-				     netfs_sreq_trace_put_clear);</div><div class='add'>+	for (s = 0; s &lt; ARRAY_SIZE(rreq-&gt;io_streams); s++) {</div><div class='add'>+		stream = &amp;rreq-&gt;io_streams[s];</div><div class='add'>+		while (!list_empty(&amp;stream-&gt;subrequests)) {</div><div class='add'>+			subreq = list_first_entry(&amp;stream-&gt;subrequests,</div><div class='add'>+						  struct netfs_io_subrequest, rreq_link);</div><div class='add'>+			list_del(&amp;subreq-&gt;rreq_link);</div><div class='add'>+			netfs_put_subrequest(subreq, netfs_sreq_trace_put_clear);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void netfs_free_request(struct work_struct *work)</div><div class='add'>+static void netfs_free_request_rcu(struct rcu_head *rcu)</div><div class='ctx'> {</div><div class='del'>-	struct netfs_io_request *rreq =</div><div class='del'>-		container_of(work, struct netfs_io_request, work);</div><div class='add'>+	struct netfs_io_request *rreq = container_of(rcu, struct netfs_io_request, rcu);</div><div class='add'>+</div><div class='add'>+	mempool_free(rreq, rreq-&gt;netfs_ops-&gt;request_pool ?: &amp;netfs_request_pool);</div><div class='add'>+	netfs_stat_d(&amp;netfs_n_rh_rreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netfs_deinit_request(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(rreq-&gt;inode);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	trace_netfs_rreq(rreq, netfs_rreq_trace_free);</div><div class='add'>+</div><div class='add'>+	/* Cancel/flush the result collection worker.  That does not carry a</div><div class='add'>+	 * ref of its own, so we must wait for it somewhere.</div><div class='add'>+	 */</div><div class='add'>+	cancel_work_sync(&amp;rreq-&gt;work);</div><div class='add'>+</div><div class='ctx'> 	netfs_proc_del_rreq(rreq);</div><div class='del'>-	netfs_clear_subrequests(rreq, false);</div><div class='add'>+	netfs_clear_subrequests(rreq);</div><div class='ctx'> 	if (rreq-&gt;netfs_ops-&gt;free_request)</div><div class='ctx'> 		rreq-&gt;netfs_ops-&gt;free_request(rreq);</div><div class='ctx'> 	if (rreq-&gt;cache_resources.ops)</div><div class='hunk'>@@ -106,12 +143,22 @@ static void netfs_free_request(struct work_struct *work)</div><div class='ctx'> 		}</div><div class='ctx'> 		kvfree(rreq-&gt;direct_bv);</div><div class='ctx'> 	}</div><div class='del'>-	kfree_rcu(rreq, rcu);</div><div class='del'>-	netfs_stat_d(&amp;netfs_n_rh_rreq);</div><div class='add'>+	rolling_buffer_clear(&amp;rreq-&gt;buffer);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;ictx-&gt;io_count))</div><div class='add'>+		wake_up_var(&amp;ictx-&gt;io_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void netfs_put_request(struct netfs_io_request *rreq, bool was_async,</div><div class='del'>-		       enum netfs_rreq_ref_trace what)</div><div class='add'>+static void netfs_free_request(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq =</div><div class='add'>+		container_of(work, struct netfs_io_request, cleanup_work);</div><div class='add'>+</div><div class='add'>+	netfs_deinit_request(rreq);</div><div class='add'>+	call_rcu(&amp;rreq-&gt;rcu, netfs_free_request_rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_put_request(struct netfs_io_request *rreq, enum netfs_rreq_ref_trace what)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int debug_id;</div><div class='ctx'> 	bool dead;</div><div class='hunk'>@@ -121,37 +168,54 @@ void netfs_put_request(struct netfs_io_request *rreq, bool was_async,</div><div class='ctx'> 		debug_id = rreq-&gt;debug_id;</div><div class='ctx'> 		dead = __refcount_dec_and_test(&amp;rreq-&gt;ref, &amp;r);</div><div class='ctx'> 		trace_netfs_rreq_ref(debug_id, r - 1, what);</div><div class='del'>-		if (dead) {</div><div class='del'>-			if (was_async) {</div><div class='del'>-				rreq-&gt;work.func = netfs_free_request;</div><div class='del'>-				if (!queue_work(system_unbound_wq, &amp;rreq-&gt;work))</div><div class='del'>-					BUG();</div><div class='del'>-			} else {</div><div class='del'>-				netfs_free_request(&amp;rreq-&gt;work);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (dead)</div><div class='add'>+			WARN_ON(!queue_work(system_dfl_wq, &amp;rreq-&gt;cleanup_work));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Free a request (synchronously) that was just allocated but has</div><div class='add'>+ * failed before it could be submitted.</div><div class='add'>+ */</div><div class='add'>+void netfs_put_failed_request(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	int r = refcount_read(&amp;rreq-&gt;ref);</div><div class='add'>+</div><div class='add'>+	/* new requests have two references (see</div><div class='add'>+	 * netfs_alloc_request(), and this function is only allowed on</div><div class='add'>+	 * new request objects</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(r != 2);</div><div class='add'>+</div><div class='add'>+	trace_netfs_rreq_ref(rreq-&gt;debug_id, r, netfs_rreq_trace_put_failed);</div><div class='add'>+	netfs_free_request(&amp;rreq-&gt;cleanup_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Allocate and partially initialise an I/O request structure.</div><div class='ctx'>  */</div><div class='ctx'> struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_subrequest *subreq;</div><div class='add'>+	mempool_t *mempool = rreq-&gt;netfs_ops-&gt;subrequest_pool ?: &amp;netfs_subrequest_pool;</div><div class='add'>+	struct kmem_cache *cache = mempool-&gt;pool_data;</div><div class='ctx'> </div><div class='del'>-	subreq = kzalloc(rreq-&gt;netfs_ops-&gt;io_subrequest_size ?:</div><div class='del'>-			 sizeof(struct netfs_io_subrequest),</div><div class='del'>-			 GFP_KERNEL);</div><div class='del'>-	if (subreq) {</div><div class='del'>-		INIT_WORK(&amp;subreq-&gt;work, NULL);</div><div class='del'>-		INIT_LIST_HEAD(&amp;subreq-&gt;rreq_link);</div><div class='del'>-		refcount_set(&amp;subreq-&gt;ref, 2);</div><div class='del'>-		subreq-&gt;rreq = rreq;</div><div class='del'>-		netfs_get_request(rreq, netfs_rreq_trace_get_subreq);</div><div class='del'>-		netfs_stat(&amp;netfs_n_rh_sreq);</div><div class='add'>+	for (;;) {</div><div class='add'>+		subreq = mempool_alloc(rreq-&gt;netfs_ops-&gt;subrequest_pool ?: &amp;netfs_subrequest_pool,</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+		if (subreq)</div><div class='add'>+			break;</div><div class='add'>+		msleep(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(subreq, 0, kmem_cache_size(cache));</div><div class='add'>+	INIT_WORK(&amp;subreq-&gt;work, NULL);</div><div class='add'>+	INIT_LIST_HEAD(&amp;subreq-&gt;rreq_link);</div><div class='add'>+	refcount_set(&amp;subreq-&gt;ref, 2);</div><div class='add'>+	subreq-&gt;rreq = rreq;</div><div class='add'>+	subreq-&gt;debug_index = atomic_inc_return(&amp;rreq-&gt;subreq_counter);</div><div class='add'>+	netfs_get_request(rreq, netfs_rreq_trace_get_subreq);</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_sreq);</div><div class='ctx'> 	return subreq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -165,20 +229,19 @@ void netfs_get_subrequest(struct netfs_io_subrequest *subreq,</div><div class='ctx'> 			     what);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void netfs_free_subrequest(struct netfs_io_subrequest *subreq,</div><div class='del'>-				  bool was_async)</div><div class='add'>+static void netfs_free_subrequest(struct netfs_io_subrequest *subreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='ctx'> </div><div class='ctx'> 	trace_netfs_sreq(subreq, netfs_sreq_trace_free);</div><div class='ctx'> 	if (rreq-&gt;netfs_ops-&gt;free_subrequest)</div><div class='ctx'> 		rreq-&gt;netfs_ops-&gt;free_subrequest(subreq);</div><div class='del'>-	kfree(subreq);</div><div class='add'>+	mempool_free(subreq, rreq-&gt;netfs_ops-&gt;subrequest_pool ?: &amp;netfs_subrequest_pool);</div><div class='ctx'> 	netfs_stat_d(&amp;netfs_n_rh_sreq);</div><div class='del'>-	netfs_put_request(rreq, was_async, netfs_rreq_trace_put_subreq);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_subreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async,</div><div class='add'>+void netfs_put_subrequest(struct netfs_io_subrequest *subreq,</div><div class='ctx'> 			  enum netfs_sreq_ref_trace what)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int debug_index = subreq-&gt;debug_index;</div><div class='hunk'>@@ -189,5 +252,5 @@ void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async,</div><div class='ctx'> 	dead = __refcount_dec_and_test(&amp;subreq-&gt;ref, &amp;r);</div><div class='ctx'> 	trace_netfs_sreq_ref(debug_id, debug_index, r - 1, what);</div><div class='ctx'> 	if (dead)</div><div class='del'>-		netfs_free_subrequest(subreq, was_async);</div><div class='add'>+		netfs_free_subrequest(subreq);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/netfs/output.c b/fs/netfs/output.c<br/>deleted file mode 100644<br/>index 625eb68f3e5a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/output.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/output.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,478 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/* Network filesystem high-level write support.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2023 Red Hat, Inc. All Rights Reserved.</div><div class='del'>- * Written by David Howells (dhowells@redhat.com)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/pagevec.h&gt;</div><div class='del'>-#include "internal.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * netfs_create_write_request - Create a write operation.</div><div class='del'>- * @wreq: The write request this is storing from.</div><div class='del'>- * @dest: The destination type</div><div class='del'>- * @start: Start of the region this write will modify</div><div class='del'>- * @len: Length of the modification</div><div class='del'>- * @worker: The worker function to handle the write(s)</div><div class='del'>- *</div><div class='del'>- * Allocate a write operation, set it up and add it to the list on a write</div><div class='del'>- * request.</div><div class='del'>- */</div><div class='del'>-struct netfs_io_subrequest *netfs_create_write_request(struct netfs_io_request *wreq,</div><div class='del'>-						       enum netfs_io_source dest,</div><div class='del'>-						       loff_t start, size_t len,</div><div class='del'>-						       work_func_t worker)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-</div><div class='del'>-	subreq = netfs_alloc_subrequest(wreq);</div><div class='del'>-	if (subreq) {</div><div class='del'>-		INIT_WORK(&amp;subreq-&gt;work, worker);</div><div class='del'>-		subreq-&gt;source	= dest;</div><div class='del'>-		subreq-&gt;start	= start;</div><div class='del'>-		subreq-&gt;len	= len;</div><div class='del'>-		subreq-&gt;debug_index = wreq-&gt;subreq_counter++;</div><div class='del'>-</div><div class='del'>-		switch (subreq-&gt;source) {</div><div class='del'>-		case NETFS_UPLOAD_TO_SERVER:</div><div class='del'>-			netfs_stat(&amp;netfs_n_wh_upload);</div><div class='del'>-			break;</div><div class='del'>-		case NETFS_WRITE_TO_CACHE:</div><div class='del'>-			netfs_stat(&amp;netfs_n_wh_write);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		subreq-&gt;io_iter = wreq-&gt;io_iter;</div><div class='del'>-		iov_iter_advance(&amp;subreq-&gt;io_iter, subreq-&gt;start - wreq-&gt;start);</div><div class='del'>-		iov_iter_truncate(&amp;subreq-&gt;io_iter, subreq-&gt;len);</div><div class='del'>-</div><div class='del'>-		trace_netfs_sreq_ref(wreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-				     refcount_read(&amp;subreq-&gt;ref),</div><div class='del'>-				     netfs_sreq_trace_new);</div><div class='del'>-		atomic_inc(&amp;wreq-&gt;nr_outstanding);</div><div class='del'>-		list_add_tail(&amp;subreq-&gt;rreq_link, &amp;wreq-&gt;subrequests);</div><div class='del'>-		trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return subreq;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netfs_create_write_request);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Process a completed write request once all the component operations have</div><div class='del'>- * been completed.</div><div class='del'>- */</div><div class='del'>-static void netfs_write_terminated(struct netfs_io_request *wreq, bool was_async)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-	struct netfs_inode *ctx = netfs_inode(wreq-&gt;inode);</div><div class='del'>-	size_t transferred = 0;</div><div class='del'>-</div><div class='del'>-	_enter("R=%x[]", wreq-&gt;debug_id);</div><div class='del'>-</div><div class='del'>-	trace_netfs_rreq(wreq, netfs_rreq_trace_write_done);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(subreq, &amp;wreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		if (subreq-&gt;error || subreq-&gt;transferred == 0)</div><div class='del'>-			break;</div><div class='del'>-		transferred += subreq-&gt;transferred;</div><div class='del'>-		if (subreq-&gt;transferred &lt; subreq-&gt;len)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	wreq-&gt;transferred = transferred;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(subreq, &amp;wreq-&gt;subrequests, rreq_link) {</div><div class='del'>-		if (!subreq-&gt;error)</div><div class='del'>-			continue;</div><div class='del'>-		switch (subreq-&gt;source) {</div><div class='del'>-		case NETFS_UPLOAD_TO_SERVER:</div><div class='del'>-			/* Depending on the type of failure, this may prevent</div><div class='del'>-			 * writeback completion unless we're in disconnected</div><div class='del'>-			 * mode.</div><div class='del'>-			 */</div><div class='del'>-			if (!wreq-&gt;error)</div><div class='del'>-				wreq-&gt;error = subreq-&gt;error;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case NETFS_WRITE_TO_CACHE:</div><div class='del'>-			/* Failure doesn't prevent writeback completion unless</div><div class='del'>-			 * we're in disconnected mode.</div><div class='del'>-			 */</div><div class='del'>-			if (subreq-&gt;error != -ENOBUFS)</div><div class='del'>-				ctx-&gt;ops-&gt;invalidate_cache(wreq);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			WARN_ON_ONCE(1);</div><div class='del'>-			if (!wreq-&gt;error)</div><div class='del'>-				wreq-&gt;error = -EIO;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wreq-&gt;cleanup(wreq);</div><div class='del'>-</div><div class='del'>-	if (wreq-&gt;origin == NETFS_DIO_WRITE &amp;&amp;</div><div class='del'>-	    wreq-&gt;mapping-&gt;nrpages) {</div><div class='del'>-		pgoff_t first = wreq-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		pgoff_t last = (wreq-&gt;start + wreq-&gt;transferred - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		invalidate_inode_pages2_range(wreq-&gt;mapping, first, last);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wreq-&gt;origin == NETFS_DIO_WRITE)</div><div class='del'>-		inode_dio_end(wreq-&gt;inode);</div><div class='del'>-</div><div class='del'>-	_debug("finished");</div><div class='del'>-	trace_netfs_rreq(wreq, netfs_rreq_trace_wake_ip);</div><div class='del'>-	clear_bit_unlock(NETFS_RREQ_IN_PROGRESS, &amp;wreq-&gt;flags);</div><div class='del'>-	wake_up_bit(&amp;wreq-&gt;flags, NETFS_RREQ_IN_PROGRESS);</div><div class='del'>-</div><div class='del'>-	if (wreq-&gt;iocb) {</div><div class='del'>-		wreq-&gt;iocb-&gt;ki_pos += transferred;</div><div class='del'>-		if (wreq-&gt;iocb-&gt;ki_complete)</div><div class='del'>-			wreq-&gt;iocb-&gt;ki_complete(</div><div class='del'>-				wreq-&gt;iocb, wreq-&gt;error ? wreq-&gt;error : transferred);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netfs_clear_subrequests(wreq, was_async);</div><div class='del'>-	netfs_put_request(wreq, was_async, netfs_rreq_trace_put_complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Deal with the completion of writing the data to the cache.</div><div class='del'>- */</div><div class='del'>-void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error,</div><div class='del'>-				       bool was_async)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq = _op;</div><div class='del'>-	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='del'>-	unsigned int u;</div><div class='del'>-</div><div class='del'>-	_enter("%x[%x] %zd", wreq-&gt;debug_id, subreq-&gt;debug_index, transferred_or_error);</div><div class='del'>-</div><div class='del'>-	switch (subreq-&gt;source) {</div><div class='del'>-	case NETFS_UPLOAD_TO_SERVER:</div><div class='del'>-		netfs_stat(&amp;netfs_n_wh_upload_done);</div><div class='del'>-		break;</div><div class='del'>-	case NETFS_WRITE_TO_CACHE:</div><div class='del'>-		netfs_stat(&amp;netfs_n_wh_write_done);</div><div class='del'>-		break;</div><div class='del'>-	case NETFS_INVALID_WRITE:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (IS_ERR_VALUE(transferred_or_error)) {</div><div class='del'>-		subreq-&gt;error = transferred_or_error;</div><div class='del'>-		trace_netfs_failure(wreq, subreq, transferred_or_error,</div><div class='del'>-				    netfs_fail_write);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN(transferred_or_error &gt; subreq-&gt;len - subreq-&gt;transferred,</div><div class='del'>-		 "Subreq excess write: R%x[%x] %zd &gt; %zu - %zu",</div><div class='del'>-		 wreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-		 transferred_or_error, subreq-&gt;len, subreq-&gt;transferred))</div><div class='del'>-		transferred_or_error = subreq-&gt;len - subreq-&gt;transferred;</div><div class='del'>-</div><div class='del'>-	subreq-&gt;error = 0;</div><div class='del'>-	subreq-&gt;transferred += transferred_or_error;</div><div class='del'>-</div><div class='del'>-	if (iov_iter_count(&amp;subreq-&gt;io_iter) != subreq-&gt;len - subreq-&gt;transferred)</div><div class='del'>-		pr_warn("R=%08x[%u] ITER POST-MISMATCH %zx != %zx-%zx %x\n",</div><div class='del'>-			wreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='del'>-			iov_iter_count(&amp;subreq-&gt;io_iter), subreq-&gt;len,</div><div class='del'>-			subreq-&gt;transferred, subreq-&gt;io_iter.iter_type);</div><div class='del'>-</div><div class='del'>-	if (subreq-&gt;transferred &lt; subreq-&gt;len)</div><div class='del'>-		goto incomplete;</div><div class='del'>-</div><div class='del'>-	__clear_bit(NETFS_SREQ_NO_PROGRESS, &amp;subreq-&gt;flags);</div><div class='del'>-out:</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);</div><div class='del'>-</div><div class='del'>-	/* If we decrement nr_outstanding to 0, the ref belongs to us. */</div><div class='del'>-	u = atomic_dec_return(&amp;wreq-&gt;nr_outstanding);</div><div class='del'>-	if (u == 0)</div><div class='del'>-		netfs_write_terminated(wreq, was_async);</div><div class='del'>-	else if (u == 1)</div><div class='del'>-		wake_up_var(&amp;wreq-&gt;nr_outstanding);</div><div class='del'>-</div><div class='del'>-	netfs_put_subrequest(subreq, was_async, netfs_sreq_trace_put_terminated);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-incomplete:</div><div class='del'>-	if (transferred_or_error == 0) {</div><div class='del'>-		if (__test_and_set_bit(NETFS_SREQ_NO_PROGRESS, &amp;subreq-&gt;flags)) {</div><div class='del'>-			subreq-&gt;error = -ENODATA;</div><div class='del'>-			goto failed;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		__clear_bit(NETFS_SREQ_NO_PROGRESS, &amp;subreq-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__set_bit(NETFS_SREQ_SHORT_IO, &amp;subreq-&gt;flags);</div><div class='del'>-	set_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;wreq-&gt;flags);</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	switch (subreq-&gt;source) {</div><div class='del'>-	case NETFS_WRITE_TO_CACHE:</div><div class='del'>-		netfs_stat(&amp;netfs_n_wh_write_failed);</div><div class='del'>-		set_bit(NETFS_RREQ_INCOMPLETE_IO, &amp;wreq-&gt;flags);</div><div class='del'>-		break;</div><div class='del'>-	case NETFS_UPLOAD_TO_SERVER:</div><div class='del'>-		netfs_stat(&amp;netfs_n_wh_upload_failed);</div><div class='del'>-		set_bit(NETFS_RREQ_FAILED, &amp;wreq-&gt;flags);</div><div class='del'>-		wreq-&gt;error = subreq-&gt;error;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netfs_write_subrequest_terminated);</div><div class='del'>-</div><div class='del'>-static void netfs_write_to_cache_op(struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='del'>-	struct netfs_cache_resources *cres = &amp;wreq-&gt;cache_resources;</div><div class='del'>-</div><div class='del'>-	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='del'>-</div><div class='del'>-	cres-&gt;ops-&gt;write(cres, subreq-&gt;start, &amp;subreq-&gt;io_iter,</div><div class='del'>-			 netfs_write_subrequest_terminated, subreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_write_to_cache_op_worker(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_subrequest *subreq =</div><div class='del'>-		container_of(work, struct netfs_io_subrequest, work);</div><div class='del'>-</div><div class='del'>-	netfs_write_to_cache_op(subreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * netfs_queue_write_request - Queue a write request for attention</div><div class='del'>- * @subreq: The write request to be queued</div><div class='del'>- *</div><div class='del'>- * Queue the specified write request for processing by a worker thread.  We</div><div class='del'>- * pass the caller's ref on the request to the worker thread.</div><div class='del'>- */</div><div class='del'>-void netfs_queue_write_request(struct netfs_io_subrequest *subreq)</div><div class='del'>-{</div><div class='del'>-	if (!queue_work(system_unbound_wq, &amp;subreq-&gt;work))</div><div class='del'>-		netfs_put_subrequest(subreq, false, netfs_sreq_trace_put_wip);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(netfs_queue_write_request);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set up a op for writing to the cache.</div><div class='del'>- */</div><div class='del'>-static void netfs_set_up_write_to_cache(struct netfs_io_request *wreq)</div><div class='del'>-{</div><div class='del'>-	struct netfs_cache_resources *cres = &amp;wreq-&gt;cache_resources;</div><div class='del'>-	struct netfs_io_subrequest *subreq;</div><div class='del'>-	struct netfs_inode *ctx = netfs_inode(wreq-&gt;inode);</div><div class='del'>-	struct fscache_cookie *cookie = netfs_i_cookie(ctx);</div><div class='del'>-	loff_t start = wreq-&gt;start;</div><div class='del'>-	size_t len = wreq-&gt;len;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!fscache_cookie_enabled(cookie)) {</div><div class='del'>-		clear_bit(NETFS_RREQ_WRITE_TO_CACHE, &amp;wreq-&gt;flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	_debug("write to cache");</div><div class='del'>-	ret = fscache_begin_write_operation(cres, cookie);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = cres-&gt;ops-&gt;prepare_write(cres, &amp;start, &amp;len, wreq-&gt;upper_len,</div><div class='del'>-				       i_size_read(wreq-&gt;inode), true);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	subreq = netfs_create_write_request(wreq, NETFS_WRITE_TO_CACHE, start, len,</div><div class='del'>-					    netfs_write_to_cache_op_worker);</div><div class='del'>-	if (!subreq)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	netfs_write_to_cache_op(subreq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Begin the process of writing out a chunk of data.</div><div class='del'>- *</div><div class='del'>- * We are given a write request that holds a series of dirty regions and</div><div class='del'>- * (partially) covers a sequence of folios, all of which are present.  The</div><div class='del'>- * pages must have been marked as writeback as appropriate.</div><div class='del'>- *</div><div class='del'>- * We need to perform the following steps:</div><div class='del'>- *</div><div class='del'>- * (1) If encrypting, create an output buffer and encrypt each block of the</div><div class='del'>- *     data into it, otherwise the output buffer will point to the original</div><div class='del'>- *     folios.</div><div class='del'>- *</div><div class='del'>- * (2) If the data is to be cached, set up a write op for the entire output</div><div class='del'>- *     buffer to the cache, if the cache wants to accept it.</div><div class='del'>- *</div><div class='del'>- * (3) If the data is to be uploaded (ie. not merely cached):</div><div class='del'>- *</div><div class='del'>- *     (a) If the data is to be compressed, create a compression buffer and</div><div class='del'>- *         compress the data into it.</div><div class='del'>- *</div><div class='del'>- *     (b) For each destination we want to upload to, set up write ops to write</div><div class='del'>- *         to that destination.  We may need multiple writes if the data is not</div><div class='del'>- *         contiguous or the span exceeds wsize for a server.</div><div class='del'>- */</div><div class='del'>-int netfs_begin_write(struct netfs_io_request *wreq, bool may_wait,</div><div class='del'>-		      enum netfs_write_trace what)</div><div class='del'>-{</div><div class='del'>-	struct netfs_inode *ctx = netfs_inode(wreq-&gt;inode);</div><div class='del'>-</div><div class='del'>-	_enter("R=%x %llx-%llx f=%lx",</div><div class='del'>-	       wreq-&gt;debug_id, wreq-&gt;start, wreq-&gt;start + wreq-&gt;len - 1,</div><div class='del'>-	       wreq-&gt;flags);</div><div class='del'>-</div><div class='del'>-	trace_netfs_write(wreq, what);</div><div class='del'>-	if (wreq-&gt;len == 0 || wreq-&gt;iter.count == 0) {</div><div class='del'>-		pr_err("Zero-sized write [R=%x]\n", wreq-&gt;debug_id);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wreq-&gt;origin == NETFS_DIO_WRITE)</div><div class='del'>-		inode_dio_begin(wreq-&gt;inode);</div><div class='del'>-</div><div class='del'>-	wreq-&gt;io_iter = wreq-&gt;iter;</div><div class='del'>-</div><div class='del'>-	/* -&gt;outstanding &gt; 0 carries a ref */</div><div class='del'>-	netfs_get_request(wreq, netfs_rreq_trace_get_for_outstanding);</div><div class='del'>-	atomic_set(&amp;wreq-&gt;nr_outstanding, 1);</div><div class='del'>-</div><div class='del'>-	/* Start the encryption/compression going.  We can do that in the</div><div class='del'>-	 * background whilst we generate a list of write ops that we want to</div><div class='del'>-	 * perform.</div><div class='del'>-	 */</div><div class='del'>-	// TODO: Encrypt or compress the region as appropriate</div><div class='del'>-</div><div class='del'>-	/* We need to write all of the region to the cache */</div><div class='del'>-	if (test_bit(NETFS_RREQ_WRITE_TO_CACHE, &amp;wreq-&gt;flags))</div><div class='del'>-		netfs_set_up_write_to_cache(wreq);</div><div class='del'>-</div><div class='del'>-	/* However, we don't necessarily write all of the region to the server.</div><div class='del'>-	 * Caching of reads is being managed this way also.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags))</div><div class='del'>-		ctx-&gt;ops-&gt;create_write_requests(wreq, wreq-&gt;start, wreq-&gt;len);</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;wreq-&gt;nr_outstanding))</div><div class='del'>-		netfs_write_terminated(wreq, false);</div><div class='del'>-</div><div class='del'>-	if (!may_wait)</div><div class='del'>-		return -EIOCBQUEUED;</div><div class='del'>-</div><div class='del'>-	wait_on_bit(&amp;wreq-&gt;flags, NETFS_RREQ_IN_PROGRESS,</div><div class='del'>-		    TASK_UNINTERRUPTIBLE);</div><div class='del'>-	return wreq-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Begin a write operation for writing through the pagecache.</div><div class='del'>- */</div><div class='del'>-struct netfs_io_request *netfs_begin_writethrough(struct kiocb *iocb, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct netfs_io_request *wreq;</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-</div><div class='del'>-	wreq = netfs_alloc_request(file-&gt;f_mapping, file, iocb-&gt;ki_pos, len,</div><div class='del'>-				   NETFS_WRITETHROUGH);</div><div class='del'>-	if (IS_ERR(wreq))</div><div class='del'>-		return wreq;</div><div class='del'>-</div><div class='del'>-	trace_netfs_write(wreq, netfs_write_trace_writethrough);</div><div class='del'>-</div><div class='del'>-	__set_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags);</div><div class='del'>-	iov_iter_xarray(&amp;wreq-&gt;iter, ITER_SOURCE, &amp;wreq-&gt;mapping-&gt;i_pages, wreq-&gt;start, 0);</div><div class='del'>-	wreq-&gt;io_iter = wreq-&gt;iter;</div><div class='del'>-</div><div class='del'>-	/* -&gt;outstanding &gt; 0 carries a ref */</div><div class='del'>-	netfs_get_request(wreq, netfs_rreq_trace_get_for_outstanding);</div><div class='del'>-	atomic_set(&amp;wreq-&gt;nr_outstanding, 1);</div><div class='del'>-	return wreq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void netfs_submit_writethrough(struct netfs_io_request *wreq, bool final)</div><div class='del'>-{</div><div class='del'>-	struct netfs_inode *ictx = netfs_inode(wreq-&gt;inode);</div><div class='del'>-	unsigned long long start;</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	start = wreq-&gt;start + wreq-&gt;submitted;</div><div class='del'>-	len = wreq-&gt;iter.count - wreq-&gt;submitted;</div><div class='del'>-	if (!final) {</div><div class='del'>-		len /= wreq-&gt;wsize; /* Round to number of maximum packets */</div><div class='del'>-		len *= wreq-&gt;wsize;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ictx-&gt;ops-&gt;create_write_requests(wreq, start, len);</div><div class='del'>-	wreq-&gt;submitted += len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Advance the state of the write operation used when writing through the</div><div class='del'>- * pagecache.  Data has been copied into the pagecache that we need to append</div><div class='del'>- * to the request.  If we've added more than wsize then we need to create a new</div><div class='del'>- * subrequest.</div><div class='del'>- */</div><div class='del'>-int netfs_advance_writethrough(struct netfs_io_request *wreq, size_t copied, bool to_page_end)</div><div class='del'>-{</div><div class='del'>-	_enter("ic=%zu sb=%zu ws=%u cp=%zu tp=%u",</div><div class='del'>-	       wreq-&gt;iter.count, wreq-&gt;submitted, wreq-&gt;wsize, copied, to_page_end);</div><div class='del'>-</div><div class='del'>-	wreq-&gt;iter.count += copied;</div><div class='del'>-	wreq-&gt;io_iter.count += copied;</div><div class='del'>-	if (to_page_end &amp;&amp; wreq-&gt;io_iter.count - wreq-&gt;submitted &gt;= wreq-&gt;wsize)</div><div class='del'>-		netfs_submit_writethrough(wreq, false);</div><div class='del'>-</div><div class='del'>-	return wreq-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * End a write operation used when writing through the pagecache.</div><div class='del'>- */</div><div class='del'>-int netfs_end_writethrough(struct netfs_io_request *wreq, struct kiocb *iocb)</div><div class='del'>-{</div><div class='del'>-	int ret = -EIOCBQUEUED;</div><div class='del'>-</div><div class='del'>-	_enter("ic=%zu sb=%zu ws=%u",</div><div class='del'>-	       wreq-&gt;iter.count, wreq-&gt;submitted, wreq-&gt;wsize);</div><div class='del'>-</div><div class='del'>-	if (wreq-&gt;submitted &lt; wreq-&gt;io_iter.count)</div><div class='del'>-		netfs_submit_writethrough(wreq, true);</div><div class='del'>-</div><div class='del'>-	if (atomic_dec_and_test(&amp;wreq-&gt;nr_outstanding))</div><div class='del'>-		netfs_write_terminated(wreq, false);</div><div class='del'>-</div><div class='del'>-	if (is_sync_kiocb(iocb)) {</div><div class='del'>-		wait_on_bit(&amp;wreq-&gt;flags, NETFS_RREQ_IN_PROGRESS,</div><div class='del'>-			    TASK_UNINTERRUPTIBLE);</div><div class='del'>-		ret = wreq-&gt;error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netfs_put_request(wreq, false, netfs_rreq_trace_put_return);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/netfs/read_collect.c b/fs/netfs/read_collect.c<br/>new file mode 100644<br/>index 000000000000..a95e7aadafd0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/read_collect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/read_collect.c</a></div><div class='hunk'>@@ -0,0 +1,585 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Network filesystem read subrequest result collection, assessment and</div><div class='add'>+ * retrying.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/* Notes made in the collector */</div><div class='add'>+#define HIT_PENDING	0x01	/* A front op was still pending */</div><div class='add'>+#define MADE_PROGRESS	0x04	/* Made progress cleaning up a stream or the folio set */</div><div class='add'>+#define BUFFERED	0x08	/* The pagecache needs cleaning up */</div><div class='add'>+#define NEED_RETRY	0x10	/* A front op requests retrying */</div><div class='add'>+#define COPY_TO_CACHE	0x40	/* Need to copy subrequest to cache */</div><div class='add'>+#define ABANDON_SREQ	0x80	/* Need to abandon untransferred part of subrequest */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear the unread part of an I/O request.</div><div class='add'>+ */</div><div class='add'>+static void netfs_clear_unread(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	netfs_reset_iter(subreq);</div><div class='add'>+	WARN_ON_ONCE(subreq-&gt;len - subreq-&gt;transferred != iov_iter_count(&amp;subreq-&gt;io_iter));</div><div class='add'>+	iov_iter_zero(iov_iter_count(&amp;subreq-&gt;io_iter), &amp;subreq-&gt;io_iter);</div><div class='add'>+	if (subreq-&gt;start + subreq-&gt;transferred &gt;= subreq-&gt;rreq-&gt;i_size)</div><div class='add'>+		__set_bit(NETFS_SREQ_HIT_EOF, &amp;subreq-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flush, mark and unlock a folio that's now completely read.  If we want to</div><div class='add'>+ * cache the folio, we set the group to NETFS_FOLIO_COPY_TO_CACHE, mark it</div><div class='add'>+ * dirty and let writeback handle it.</div><div class='add'>+ */</div><div class='add'>+static void netfs_unlock_read_folio(struct netfs_io_request *rreq,</div><div class='add'>+				    struct folio_queue *folioq,</div><div class='add'>+				    int slot)</div><div class='add'>+{</div><div class='add'>+	struct netfs_folio *finfo;</div><div class='add'>+	struct folio *folio = folioq_folio(folioq, slot);</div><div class='add'>+</div><div class='add'>+	if (unlikely(folio_pos(folio) &lt; rreq-&gt;abandon_to)) {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_abandon);</div><div class='add'>+		goto just_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='add'>+	folio_mark_uptodate(folio);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(NETFS_RREQ_USE_PGPRIV2, &amp;rreq-&gt;flags)) {</div><div class='add'>+		finfo = netfs_folio_info(folio);</div><div class='add'>+		if (finfo) {</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_filled_gaps);</div><div class='add'>+			if (finfo-&gt;netfs_group)</div><div class='add'>+				folio_change_private(folio, finfo-&gt;netfs_group);</div><div class='add'>+			else</div><div class='add'>+				folio_detach_private(folio);</div><div class='add'>+			kfree(finfo);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(NETFS_RREQ_FOLIO_COPY_TO_CACHE, &amp;rreq-&gt;flags)) {</div><div class='add'>+			if (!WARN_ON_ONCE(folio_get_private(folio) != NULL)) {</div><div class='add'>+				trace_netfs_folio(folio, netfs_folio_trace_copy_to_cache);</div><div class='add'>+				folio_attach_private(folio, NETFS_FOLIO_COPY_TO_CACHE);</div><div class='add'>+				folio_mark_dirty(folio);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_read_done);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		folioq_clear(folioq, slot);</div><div class='add'>+	} else {</div><div class='add'>+		// TODO: Use of PG_private_2 is deprecated.</div><div class='add'>+		if (test_bit(NETFS_RREQ_FOLIO_COPY_TO_CACHE, &amp;rreq-&gt;flags))</div><div class='add'>+			netfs_pgpriv2_copy_to_cache(rreq, folio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+just_unlock:</div><div class='add'>+	if (folio-&gt;index == rreq-&gt;no_unlock_folio &amp;&amp;</div><div class='add'>+	    test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &amp;rreq-&gt;flags)) {</div><div class='add'>+		_debug("no unlock");</div><div class='add'>+	} else {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_read_unlock);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	folioq_clear(folioq, slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unlock any folios we've finished with.</div><div class='add'>+ */</div><div class='add'>+static void netfs_read_unlock_folios(struct netfs_io_request *rreq,</div><div class='add'>+				     unsigned int *notes)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *folioq = rreq-&gt;buffer.tail;</div><div class='add'>+	unsigned long long collected_to = rreq-&gt;collected_to;</div><div class='add'>+	unsigned int slot = rreq-&gt;buffer.first_tail_slot;</div><div class='add'>+</div><div class='add'>+	if (rreq-&gt;cleaned_to &gt;= rreq-&gt;collected_to)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	// TODO: Begin decryption</div><div class='add'>+</div><div class='add'>+	if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+		folioq = rolling_buffer_delete_spent(&amp;rreq-&gt;buffer);</div><div class='add'>+		if (!folioq) {</div><div class='add'>+			rreq-&gt;front_folio_order = 0;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		slot = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		unsigned long long fpos, fend;</div><div class='add'>+		unsigned int order;</div><div class='add'>+		size_t fsize;</div><div class='add'>+</div><div class='add'>+		if (*notes &amp; COPY_TO_CACHE)</div><div class='add'>+			set_bit(NETFS_RREQ_FOLIO_COPY_TO_CACHE, &amp;rreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+		folio = folioq_folio(folioq, slot);</div><div class='add'>+		if (WARN_ONCE(!folio_test_locked(folio),</div><div class='add'>+			      "R=%08x: folio %lx is not locked\n",</div><div class='add'>+			      rreq-&gt;debug_id, folio-&gt;index))</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_not_locked);</div><div class='add'>+</div><div class='add'>+		order = folioq_folio_order(folioq, slot);</div><div class='add'>+		rreq-&gt;front_folio_order = order;</div><div class='add'>+		fsize = PAGE_SIZE &lt;&lt; order;</div><div class='add'>+		fpos = folio_pos(folio);</div><div class='add'>+		fend = umin(fpos + fsize, rreq-&gt;i_size);</div><div class='add'>+</div><div class='add'>+		trace_netfs_collect_folio(rreq, folio, fend, collected_to);</div><div class='add'>+</div><div class='add'>+		/* Unlock any folio we've transferred all of. */</div><div class='add'>+		if (collected_to &lt; fend)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		netfs_unlock_read_folio(rreq, folioq, slot);</div><div class='add'>+		WRITE_ONCE(rreq-&gt;cleaned_to, fpos + fsize);</div><div class='add'>+		*notes |= MADE_PROGRESS;</div><div class='add'>+</div><div class='add'>+		clear_bit(NETFS_RREQ_FOLIO_COPY_TO_CACHE, &amp;rreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* Clean up the head folioq.  If we clear an entire folioq, then</div><div class='add'>+		 * we can get rid of it provided it's not also the tail folioq</div><div class='add'>+		 * being filled by the issuer.</div><div class='add'>+		 */</div><div class='add'>+		folioq_clear(folioq, slot);</div><div class='add'>+		slot++;</div><div class='add'>+		if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+			folioq = rolling_buffer_delete_spent(&amp;rreq-&gt;buffer);</div><div class='add'>+			if (!folioq)</div><div class='add'>+				goto done;</div><div class='add'>+			slot = 0;</div><div class='add'>+			trace_netfs_folioq(folioq, netfs_trace_folioq_read_progress);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (fpos + fsize &gt;= collected_to)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rreq-&gt;buffer.tail = folioq;</div><div class='add'>+done:</div><div class='add'>+	rreq-&gt;buffer.first_tail_slot = slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Collect and assess the results of various read subrequests.  We may need to</div><div class='add'>+ * retry some of the results.</div><div class='add'>+ *</div><div class='add'>+ * Note that we have a sequence of subrequests, which may be drawing on</div><div class='add'>+ * different sources and may or may not be the same size or starting position</div><div class='add'>+ * and may not even correspond in boundary alignment.</div><div class='add'>+ */</div><div class='add'>+static void netfs_collect_read_results(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *front, *remove;</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+	unsigned int notes;</div><div class='add'>+</div><div class='add'>+	_enter("%llx-%llx", rreq-&gt;start, rreq-&gt;start + rreq-&gt;len);</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_collect);</div><div class='add'>+	trace_netfs_collect(rreq);</div><div class='add'>+</div><div class='add'>+reassess:</div><div class='add'>+	if (rreq-&gt;origin == NETFS_READAHEAD ||</div><div class='add'>+	    rreq-&gt;origin == NETFS_READPAGE ||</div><div class='add'>+	    rreq-&gt;origin == NETFS_READ_FOR_WRITE)</div><div class='add'>+		notes = BUFFERED;</div><div class='add'>+	else</div><div class='add'>+		notes = 0;</div><div class='add'>+</div><div class='add'>+	/* Remove completed subrequests from the front of the stream and</div><div class='add'>+	 * advance the completion point.  We stop when we hit something that's</div><div class='add'>+	 * in progress.  The issuer thread may be adding stuff to the tail</div><div class='add'>+	 * whilst we're doing this.</div><div class='add'>+	 */</div><div class='add'>+	front = READ_ONCE(stream-&gt;front);</div><div class='add'>+	while (front) {</div><div class='add'>+		size_t transferred;</div><div class='add'>+</div><div class='add'>+		trace_netfs_collect_sreq(rreq, front);</div><div class='add'>+		_debug("sreq [%x] %llx %zx/%zx",</div><div class='add'>+		       front-&gt;debug_index, front-&gt;start, front-&gt;transferred, front-&gt;len);</div><div class='add'>+</div><div class='add'>+		if (stream-&gt;collected_to &lt; front-&gt;start) {</div><div class='add'>+			trace_netfs_collect_gap(rreq, stream, front-&gt;start, 'F');</div><div class='add'>+			stream-&gt;collected_to = front-&gt;start;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (netfs_check_subreq_in_progress(front))</div><div class='add'>+			notes |= HIT_PENDING;</div><div class='add'>+		smp_rmb(); /* Read counters after IN_PROGRESS flag. */</div><div class='add'>+		transferred = READ_ONCE(front-&gt;transferred);</div><div class='add'>+</div><div class='add'>+		/* If we can now collect the next folio, do so.  We don't want</div><div class='add'>+		 * to defer this as we have to decide whether we need to copy</div><div class='add'>+		 * to the cache or not, and that may differ between adjacent</div><div class='add'>+		 * subreqs.</div><div class='add'>+		 */</div><div class='add'>+		if (notes &amp; BUFFERED) {</div><div class='add'>+			size_t fsize = PAGE_SIZE &lt;&lt; rreq-&gt;front_folio_order;</div><div class='add'>+</div><div class='add'>+			/* Clear the tail of a short read. */</div><div class='add'>+			if (!(notes &amp; HIT_PENDING) &amp;&amp;</div><div class='add'>+			    front-&gt;error == 0 &amp;&amp;</div><div class='add'>+			    transferred &lt; front-&gt;len &amp;&amp;</div><div class='add'>+			    (test_bit(NETFS_SREQ_HIT_EOF, &amp;front-&gt;flags) ||</div><div class='add'>+			     test_bit(NETFS_SREQ_CLEAR_TAIL, &amp;front-&gt;flags))) {</div><div class='add'>+				netfs_clear_unread(front);</div><div class='add'>+				transferred = front-&gt;transferred = front-&gt;len;</div><div class='add'>+				trace_netfs_sreq(front, netfs_sreq_trace_clear);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			stream-&gt;collected_to = front-&gt;start + transferred;</div><div class='add'>+			rreq-&gt;collected_to = stream-&gt;collected_to;</div><div class='add'>+</div><div class='add'>+			if (test_bit(NETFS_SREQ_COPY_TO_CACHE, &amp;front-&gt;flags))</div><div class='add'>+				notes |= COPY_TO_CACHE;</div><div class='add'>+</div><div class='add'>+			if (test_bit(NETFS_SREQ_FAILED, &amp;front-&gt;flags)) {</div><div class='add'>+				rreq-&gt;abandon_to = front-&gt;start + front-&gt;len;</div><div class='add'>+				front-&gt;transferred = front-&gt;len;</div><div class='add'>+				transferred = front-&gt;len;</div><div class='add'>+				trace_netfs_rreq(rreq, netfs_rreq_trace_set_abandon);</div><div class='add'>+			}</div><div class='add'>+			if (front-&gt;start + transferred &gt;= rreq-&gt;cleaned_to + fsize ||</div><div class='add'>+			    test_bit(NETFS_SREQ_HIT_EOF, &amp;front-&gt;flags))</div><div class='add'>+				netfs_read_unlock_folios(rreq, &amp;notes);</div><div class='add'>+		} else {</div><div class='add'>+			stream-&gt;collected_to = front-&gt;start + transferred;</div><div class='add'>+			rreq-&gt;collected_to = stream-&gt;collected_to;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Stall if the front is still undergoing I/O. */</div><div class='add'>+		if (notes &amp; HIT_PENDING)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (test_bit(NETFS_SREQ_FAILED, &amp;front-&gt;flags)) {</div><div class='add'>+			if (!stream-&gt;failed) {</div><div class='add'>+				stream-&gt;error = front-&gt;error;</div><div class='add'>+				rreq-&gt;error = front-&gt;error;</div><div class='add'>+				set_bit(NETFS_RREQ_FAILED, &amp;rreq-&gt;flags);</div><div class='add'>+				stream-&gt;failed = true;</div><div class='add'>+			}</div><div class='add'>+			notes |= MADE_PROGRESS | ABANDON_SREQ;</div><div class='add'>+		} else if (test_bit(NETFS_SREQ_NEED_RETRY, &amp;front-&gt;flags)) {</div><div class='add'>+			stream-&gt;need_retry = true;</div><div class='add'>+			notes |= NEED_RETRY | MADE_PROGRESS;</div><div class='add'>+			break;</div><div class='add'>+		} else if (test_bit(NETFS_RREQ_SHORT_TRANSFER, &amp;rreq-&gt;flags)) {</div><div class='add'>+			notes |= MADE_PROGRESS;</div><div class='add'>+		} else {</div><div class='add'>+			if (!stream-&gt;failed) {</div><div class='add'>+				stream-&gt;transferred += transferred;</div><div class='add'>+				stream-&gt;transferred_valid = true;</div><div class='add'>+			}</div><div class='add'>+			if (front-&gt;transferred &lt; front-&gt;len)</div><div class='add'>+				set_bit(NETFS_RREQ_SHORT_TRANSFER, &amp;rreq-&gt;flags);</div><div class='add'>+			notes |= MADE_PROGRESS;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Remove if completely consumed. */</div><div class='add'>+		stream-&gt;source = front-&gt;source;</div><div class='add'>+		spin_lock(&amp;rreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+		remove = front;</div><div class='add'>+		trace_netfs_sreq(front,</div><div class='add'>+				 notes &amp; ABANDON_SREQ ?</div><div class='add'>+				 netfs_sreq_trace_abandoned : netfs_sreq_trace_consumed);</div><div class='add'>+		list_del_init(&amp;front-&gt;rreq_link);</div><div class='add'>+		front = list_first_entry_or_null(&amp;stream-&gt;subrequests,</div><div class='add'>+						 struct netfs_io_subrequest, rreq_link);</div><div class='add'>+		stream-&gt;front = front;</div><div class='add'>+		spin_unlock(&amp;rreq-&gt;lock);</div><div class='add'>+		netfs_put_subrequest(remove,</div><div class='add'>+				     notes &amp; ABANDON_SREQ ?</div><div class='add'>+				     netfs_sreq_trace_put_abandon :</div><div class='add'>+				     netfs_sreq_trace_put_done);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_collect_stream(rreq, stream);</div><div class='add'>+	trace_netfs_collect_state(rreq, rreq-&gt;collected_to, notes);</div><div class='add'>+</div><div class='add'>+	if (!(notes &amp; BUFFERED))</div><div class='add'>+		rreq-&gt;cleaned_to = rreq-&gt;collected_to;</div><div class='add'>+</div><div class='add'>+	if (notes &amp; NEED_RETRY)</div><div class='add'>+		goto need_retry;</div><div class='add'>+	if (notes &amp; MADE_PROGRESS) {</div><div class='add'>+		netfs_wake_rreq_flag(rreq, NETFS_RREQ_PAUSE, netfs_rreq_trace_unpause);</div><div class='add'>+		//cond_resched();</div><div class='add'>+		goto reassess;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	_leave(" = %x", notes);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+need_retry:</div><div class='add'>+	/* Okay...  We're going to have to retry parts of the stream.  Note</div><div class='add'>+	 * that any partially completed op will have had any wholly transferred</div><div class='add'>+	 * folios removed from it.</div><div class='add'>+	 */</div><div class='add'>+	_debug("retry");</div><div class='add'>+	netfs_retry_reads(rreq);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do page flushing and suchlike after DIO.</div><div class='add'>+ */</div><div class='add'>+static void netfs_rreq_assess_dio(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (rreq-&gt;origin == NETFS_UNBUFFERED_READ ||</div><div class='add'>+	    rreq-&gt;origin == NETFS_DIO_READ) {</div><div class='add'>+		for (i = 0; i &lt; rreq-&gt;direct_bv_count; i++) {</div><div class='add'>+			flush_dcache_page(rreq-&gt;direct_bv[i].bv_page);</div><div class='add'>+			// TODO: cifs marks pages in the destination buffer</div><div class='add'>+			// dirty under some circumstances after a read.  Do we</div><div class='add'>+			// need to do that too?</div><div class='add'>+			set_page_dirty(rreq-&gt;direct_bv[i].bv_page);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rreq-&gt;iocb) {</div><div class='add'>+		rreq-&gt;iocb-&gt;ki_pos += rreq-&gt;transferred;</div><div class='add'>+		if (rreq-&gt;iocb-&gt;ki_complete) {</div><div class='add'>+			trace_netfs_rreq(rreq, netfs_rreq_trace_ki_complete);</div><div class='add'>+			rreq-&gt;iocb-&gt;ki_complete(</div><div class='add'>+				rreq-&gt;iocb, rreq-&gt;error ? rreq-&gt;error : rreq-&gt;transferred);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (rreq-&gt;netfs_ops-&gt;done)</div><div class='add'>+		rreq-&gt;netfs_ops-&gt;done(rreq);</div><div class='add'>+	if (rreq-&gt;origin == NETFS_UNBUFFERED_READ ||</div><div class='add'>+	    rreq-&gt;origin == NETFS_DIO_READ)</div><div class='add'>+		inode_dio_end(rreq-&gt;inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do processing after reading a monolithic single object.</div><div class='add'>+ */</div><div class='add'>+static void netfs_rreq_assess_single(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+</div><div class='add'>+	if (!rreq-&gt;error &amp;&amp; stream-&gt;source == NETFS_DOWNLOAD_FROM_SERVER &amp;&amp;</div><div class='add'>+	    fscache_resources_valid(&amp;rreq-&gt;cache_resources)) {</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_dirty);</div><div class='add'>+		netfs_single_mark_inode_dirty(rreq-&gt;inode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rreq-&gt;iocb) {</div><div class='add'>+		rreq-&gt;iocb-&gt;ki_pos += rreq-&gt;transferred;</div><div class='add'>+		if (rreq-&gt;iocb-&gt;ki_complete) {</div><div class='add'>+			trace_netfs_rreq(rreq, netfs_rreq_trace_ki_complete);</div><div class='add'>+			rreq-&gt;iocb-&gt;ki_complete(</div><div class='add'>+				rreq-&gt;iocb, rreq-&gt;error ? rreq-&gt;error : rreq-&gt;transferred);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (rreq-&gt;netfs_ops-&gt;done)</div><div class='add'>+		rreq-&gt;netfs_ops-&gt;done(rreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform the collection of subrequests and folios.</div><div class='add'>+ *</div><div class='add'>+ * Note that we're in normal kernel thread context at this point, possibly</div><div class='add'>+ * running on a workqueue.</div><div class='add'>+ */</div><div class='add'>+bool netfs_read_collection(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+</div><div class='add'>+	netfs_collect_read_results(rreq);</div><div class='add'>+</div><div class='add'>+	/* We're done when the app thread has finished posting subreqs and the</div><div class='add'>+	 * queue is empty.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags))</div><div class='add'>+		return false;</div><div class='add'>+	smp_rmb(); /* Read ALL_QUEUED before subreq lists. */</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;stream-&gt;subrequests))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Okay, declare that all I/O is complete. */</div><div class='add'>+	rreq-&gt;transferred = stream-&gt;transferred;</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_complete);</div><div class='add'>+</div><div class='add'>+	//netfs_rreq_is_still_valid(rreq);</div><div class='add'>+</div><div class='add'>+	switch (rreq-&gt;origin) {</div><div class='add'>+	case NETFS_UNBUFFERED_READ:</div><div class='add'>+	case NETFS_DIO_READ:</div><div class='add'>+	case NETFS_READ_GAPS:</div><div class='add'>+		netfs_rreq_assess_dio(rreq);</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_READ_SINGLE:</div><div class='add'>+		netfs_rreq_assess_single(rreq);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	task_io_account_read(rreq-&gt;transferred);</div><div class='add'>+</div><div class='add'>+	netfs_wake_rreq_flag(rreq, NETFS_RREQ_IN_PROGRESS, netfs_rreq_trace_wake_ip);</div><div class='add'>+	/* As we cleared NETFS_RREQ_IN_PROGRESS, we acquired its ref. */</div><div class='add'>+</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_done);</div><div class='add'>+	netfs_clear_subrequests(rreq);</div><div class='add'>+	netfs_unlock_abandoned_read_pages(rreq);</div><div class='add'>+	if (unlikely(rreq-&gt;copy_to_cache))</div><div class='add'>+		netfs_pgpriv2_end_copy_to_cache(rreq);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_read_collection_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work);</div><div class='add'>+</div><div class='add'>+	netfs_see_request(rreq, netfs_rreq_trace_see_work);</div><div class='add'>+	if (netfs_check_rreq_in_progress(rreq)) {</div><div class='add'>+		if (netfs_read_collection(rreq))</div><div class='add'>+			/* Drop the ref from the IN_PROGRESS flag. */</div><div class='add'>+			netfs_put_request(rreq, netfs_rreq_trace_put_work_ip);</div><div class='add'>+		else</div><div class='add'>+			netfs_see_request(rreq, netfs_rreq_trace_see_work_complete);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_read_subreq_progress - Note progress of a read operation.</div><div class='add'>+ * @subreq: The read request that has terminated.</div><div class='add'>+ *</div><div class='add'>+ * This tells the read side of netfs lib that a contributory I/O operation has</div><div class='add'>+ * made some progress and that it may be possible to unlock some folios.</div><div class='add'>+ *</div><div class='add'>+ * Before calling, the filesystem should update subreq-&gt;transferred to track</div><div class='add'>+ * the amount of data copied into the output buffer.</div><div class='add'>+ */</div><div class='add'>+void netfs_read_subreq_progress(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+	size_t fsize = PAGE_SIZE &lt;&lt; rreq-&gt;front_folio_order;</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_progress);</div><div class='add'>+</div><div class='add'>+	/* If we are at the head of the queue, wake up the collector,</div><div class='add'>+	 * getting a ref to it if we were the ones to do so.</div><div class='add'>+	 */</div><div class='add'>+	if (subreq-&gt;start + subreq-&gt;transferred &gt; rreq-&gt;cleaned_to + fsize &amp;&amp;</div><div class='add'>+	    (rreq-&gt;origin == NETFS_READAHEAD ||</div><div class='add'>+	     rreq-&gt;origin == NETFS_READPAGE ||</div><div class='add'>+	     rreq-&gt;origin == NETFS_READ_FOR_WRITE) &amp;&amp;</div><div class='add'>+	    list_is_first(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests)</div><div class='add'>+	    ) {</div><div class='add'>+		__set_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+		netfs_wake_collector(rreq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_read_subreq_progress);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_read_subreq_terminated - Note the termination of an I/O operation.</div><div class='add'>+ * @subreq: The I/O request that has terminated.</div><div class='add'>+ *</div><div class='add'>+ * This tells the read helper that a contributory I/O operation has terminated,</div><div class='add'>+ * one way or another, and that it should integrate the results.</div><div class='add'>+ *</div><div class='add'>+ * The caller indicates the outcome of the operation through @subreq-&gt;error,</div><div class='add'>+ * supplying 0 to indicate a successful or retryable transfer (if</div><div class='add'>+ * NETFS_SREQ_NEED_RETRY is set) or a negative error code.  The helper will</div><div class='add'>+ * look after reissuing I/O operations as appropriate and writing downloaded</div><div class='add'>+ * data to the cache.</div><div class='add'>+ *</div><div class='add'>+ * Before calling, the filesystem should update subreq-&gt;transferred to track</div><div class='add'>+ * the amount of data copied into the output buffer.</div><div class='add'>+ */</div><div class='add'>+void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = subreq-&gt;rreq;</div><div class='add'>+</div><div class='add'>+	switch (subreq-&gt;source) {</div><div class='add'>+	case NETFS_READ_FROM_CACHE:</div><div class='add'>+		netfs_stat(&amp;netfs_n_rh_read_done);</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_DOWNLOAD_FROM_SERVER:</div><div class='add'>+		netfs_stat(&amp;netfs_n_rh_download_done);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Deal with retry requests, short reads and errors.  If we retry</div><div class='add'>+	 * but don't make progress, we abandon the attempt.</div><div class='add'>+	 */</div><div class='add'>+	if (!subreq-&gt;error &amp;&amp; subreq-&gt;transferred &lt; subreq-&gt;len) {</div><div class='add'>+		if (test_bit(NETFS_SREQ_HIT_EOF, &amp;subreq-&gt;flags)) {</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_hit_eof);</div><div class='add'>+		} else if (test_bit(NETFS_SREQ_CLEAR_TAIL, &amp;subreq-&gt;flags)) {</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_need_clear);</div><div class='add'>+		} else if (test_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags)) {</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_need_retry);</div><div class='add'>+		} else if (test_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags)) {</div><div class='add'>+			__set_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_partial_read);</div><div class='add'>+		} else {</div><div class='add'>+			__set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+			subreq-&gt;error = -ENODATA;</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_short);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(subreq-&gt;error &lt; 0)) {</div><div class='add'>+		trace_netfs_failure(rreq, subreq, subreq-&gt;error, netfs_fail_read);</div><div class='add'>+		if (subreq-&gt;source == NETFS_READ_FROM_CACHE) {</div><div class='add'>+			netfs_stat(&amp;netfs_n_rh_read_failed);</div><div class='add'>+			__set_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+		} else {</div><div class='add'>+			netfs_stat(&amp;netfs_n_rh_download_failed);</div><div class='add'>+			__set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+		trace_netfs_rreq(rreq, netfs_rreq_trace_set_pause);</div><div class='add'>+		set_bit(NETFS_RREQ_PAUSE, &amp;rreq-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);</div><div class='add'>+	netfs_subreq_clear_in_progress(subreq);</div><div class='add'>+	netfs_put_subrequest(subreq, netfs_sreq_trace_put_terminated);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_read_subreq_terminated);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle termination of a read from the cache.</div><div class='add'>+ */</div><div class='add'>+void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq = priv;</div><div class='add'>+</div><div class='add'>+	if (transferred_or_error &gt; 0) {</div><div class='add'>+		subreq-&gt;error = 0;</div><div class='add'>+		if (transferred_or_error &gt; 0) {</div><div class='add'>+			subreq-&gt;transferred += transferred_or_error;</div><div class='add'>+			__set_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		subreq-&gt;error = transferred_or_error;</div><div class='add'>+	}</div><div class='add'>+	netfs_read_subreq_terminated(subreq);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/netfs/read_pgpriv2.c b/fs/netfs/read_pgpriv2.c<br/>new file mode 100644<br/>index 000000000000..a1489aa29f78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/read_pgpriv2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/read_pgpriv2.c</a></div><div class='hunk'>@@ -0,0 +1,232 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Read with PG_private_2 [DEPRECATED].</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [DEPRECATED] Copy a folio to the cache with PG_private_2 set.</div><div class='add'>+ */</div><div class='add'>+static void netfs_pgpriv2_copy_folio(struct netfs_io_request *creq, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *cache = &amp;creq-&gt;io_streams[1];</div><div class='add'>+	size_t fsize = folio_size(folio), flen = fsize;</div><div class='add'>+	loff_t fpos = folio_pos(folio), i_size;</div><div class='add'>+	bool to_eof = false;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	/* netfs_perform_write() may shift i_size around the page or from out</div><div class='add'>+	 * of the page to beyond it, but cannot move i_size into or through the</div><div class='add'>+	 * page since we have it locked.</div><div class='add'>+	 */</div><div class='add'>+	i_size = i_size_read(creq-&gt;inode);</div><div class='add'>+</div><div class='add'>+	if (fpos &gt;= i_size) {</div><div class='add'>+		/* mmap beyond eof. */</div><div class='add'>+		_debug("beyond eof");</div><div class='add'>+		folio_end_private_2(folio);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fpos + fsize &gt; creq-&gt;i_size)</div><div class='add'>+		creq-&gt;i_size = i_size;</div><div class='add'>+</div><div class='add'>+	if (flen &gt; i_size - fpos) {</div><div class='add'>+		flen = i_size - fpos;</div><div class='add'>+		to_eof = true;</div><div class='add'>+	} else if (flen == i_size - fpos) {</div><div class='add'>+		to_eof = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_debug("folio %zx %zx", flen, fsize);</div><div class='add'>+</div><div class='add'>+	trace_netfs_folio(folio, netfs_folio_trace_store_copy);</div><div class='add'>+</div><div class='add'>+	/* Attach the folio to the rolling buffer. */</div><div class='add'>+	if (rolling_buffer_append(&amp;creq-&gt;buffer, folio, 0) &lt; 0) {</div><div class='add'>+		clear_bit(NETFS_RREQ_FOLIO_COPY_TO_CACHE, &amp;creq-&gt;flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cache-&gt;submit_extendable_to = fsize;</div><div class='add'>+	cache-&gt;submit_off = 0;</div><div class='add'>+	cache-&gt;submit_len = flen;</div><div class='add'>+</div><div class='add'>+	/* Attach the folio to one or more subrequests.  For a big folio, we</div><div class='add'>+	 * could end up with thousands of subrequests if the wsize is small -</div><div class='add'>+	 * but we might need to wait during the creation of subrequests for</div><div class='add'>+	 * network resources (eg. SMB credits).</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		ssize_t part;</div><div class='add'>+</div><div class='add'>+		creq-&gt;buffer.iter.iov_offset = cache-&gt;submit_off;</div><div class='add'>+</div><div class='add'>+		atomic64_set(&amp;creq-&gt;issued_to, fpos + cache-&gt;submit_off);</div><div class='add'>+		cache-&gt;submit_extendable_to = fsize - cache-&gt;submit_off;</div><div class='add'>+		part = netfs_advance_write(creq, cache, fpos + cache-&gt;submit_off,</div><div class='add'>+					   cache-&gt;submit_len, to_eof);</div><div class='add'>+		cache-&gt;submit_off += part;</div><div class='add'>+		if (part &gt; cache-&gt;submit_len)</div><div class='add'>+			cache-&gt;submit_len = 0;</div><div class='add'>+		else</div><div class='add'>+			cache-&gt;submit_len -= part;</div><div class='add'>+	} while (cache-&gt;submit_len &gt; 0);</div><div class='add'>+</div><div class='add'>+	creq-&gt;buffer.iter.iov_offset = 0;</div><div class='add'>+	rolling_buffer_advance(&amp;creq-&gt;buffer, fsize);</div><div class='add'>+	atomic64_set(&amp;creq-&gt;issued_to, fpos + fsize);</div><div class='add'>+</div><div class='add'>+	if (flen &lt; fsize)</div><div class='add'>+		netfs_issue_write(creq, cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [DEPRECATED] Set up copying to the cache.</div><div class='add'>+ */</div><div class='add'>+static struct netfs_io_request *netfs_pgpriv2_begin_copy_to_cache(</div><div class='add'>+	struct netfs_io_request *rreq, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *creq;</div><div class='add'>+</div><div class='add'>+	if (!fscache_resources_valid(&amp;rreq-&gt;cache_resources))</div><div class='add'>+		goto cancel;</div><div class='add'>+</div><div class='add'>+	creq = netfs_create_write_req(rreq-&gt;mapping, NULL, folio_pos(folio),</div><div class='add'>+				      NETFS_PGPRIV2_COPY_TO_CACHE);</div><div class='add'>+	if (IS_ERR(creq))</div><div class='add'>+		goto cancel;</div><div class='add'>+</div><div class='add'>+	if (!creq-&gt;io_streams[1].avail)</div><div class='add'>+		goto cancel_put;</div><div class='add'>+</div><div class='add'>+	__set_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;creq-&gt;flags);</div><div class='add'>+	trace_netfs_copy2cache(rreq, creq);</div><div class='add'>+	trace_netfs_write(creq, netfs_write_trace_copy_to_cache);</div><div class='add'>+	netfs_stat(&amp;netfs_n_wh_copy_to_cache);</div><div class='add'>+	rreq-&gt;copy_to_cache = creq;</div><div class='add'>+	return creq;</div><div class='add'>+</div><div class='add'>+cancel_put:</div><div class='add'>+	netfs_put_failed_request(creq);</div><div class='add'>+cancel:</div><div class='add'>+	rreq-&gt;copy_to_cache = ERR_PTR(-ENOBUFS);</div><div class='add'>+	clear_bit(NETFS_RREQ_FOLIO_COPY_TO_CACHE, &amp;rreq-&gt;flags);</div><div class='add'>+	return ERR_PTR(-ENOBUFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [DEPRECATED] Mark page as requiring copy-to-cache using PG_private_2 and add</div><div class='add'>+ * it to the copy write request.</div><div class='add'>+ */</div><div class='add'>+void netfs_pgpriv2_copy_to_cache(struct netfs_io_request *rreq, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *creq = rreq-&gt;copy_to_cache;</div><div class='add'>+</div><div class='add'>+	if (!creq)</div><div class='add'>+		creq = netfs_pgpriv2_begin_copy_to_cache(rreq, folio);</div><div class='add'>+	if (IS_ERR(creq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	trace_netfs_folio(folio, netfs_folio_trace_copy_to_cache);</div><div class='add'>+	folio_start_private_2(folio);</div><div class='add'>+	netfs_pgpriv2_copy_folio(creq, folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [DEPRECATED] End writing to the cache, flushing out any outstanding writes.</div><div class='add'>+ */</div><div class='add'>+void netfs_pgpriv2_end_copy_to_cache(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *creq = rreq-&gt;copy_to_cache;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(creq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netfs_issue_write(creq, &amp;creq-&gt;io_streams[1]);</div><div class='add'>+	smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+	set_bit(NETFS_RREQ_ALL_QUEUED, &amp;creq-&gt;flags);</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_end_copy_to_cache);</div><div class='add'>+	if (list_empty_careful(&amp;creq-&gt;io_streams[1].subrequests))</div><div class='add'>+		netfs_wake_collector(creq);</div><div class='add'>+</div><div class='add'>+	netfs_put_request(creq, netfs_rreq_trace_put_return);</div><div class='add'>+	creq-&gt;copy_to_cache = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * [DEPRECATED] Remove the PG_private_2 mark from any folios we've finished</div><div class='add'>+ * copying.</div><div class='add'>+ */</div><div class='add'>+bool netfs_pgpriv2_unlock_copied_folios(struct netfs_io_request *creq)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *folioq = creq-&gt;buffer.tail;</div><div class='add'>+	unsigned long long collected_to = creq-&gt;collected_to;</div><div class='add'>+	unsigned int slot = creq-&gt;buffer.first_tail_slot;</div><div class='add'>+	bool made_progress = false;</div><div class='add'>+</div><div class='add'>+	if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+		folioq = rolling_buffer_delete_spent(&amp;creq-&gt;buffer);</div><div class='add'>+		slot = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		unsigned long long fpos, fend;</div><div class='add'>+		size_t fsize, flen;</div><div class='add'>+</div><div class='add'>+		folio = folioq_folio(folioq, slot);</div><div class='add'>+		if (WARN_ONCE(!folio_test_private_2(folio),</div><div class='add'>+			      "R=%08x: folio %lx is not marked private_2\n",</div><div class='add'>+			      creq-&gt;debug_id, folio-&gt;index))</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_not_under_wback);</div><div class='add'>+</div><div class='add'>+		fpos = folio_pos(folio);</div><div class='add'>+		fsize = folio_size(folio);</div><div class='add'>+		flen = fsize;</div><div class='add'>+</div><div class='add'>+		fend = min_t(unsigned long long, fpos + flen, creq-&gt;i_size);</div><div class='add'>+</div><div class='add'>+		trace_netfs_collect_folio(creq, folio, fend, collected_to);</div><div class='add'>+</div><div class='add'>+		/* Unlock any folio we've transferred all of. */</div><div class='add'>+		if (collected_to &lt; fend)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_end_copy);</div><div class='add'>+		folio_end_private_2(folio);</div><div class='add'>+		creq-&gt;cleaned_to = fpos + fsize;</div><div class='add'>+		made_progress = true;</div><div class='add'>+</div><div class='add'>+		/* Clean up the head folioq.  If we clear an entire folioq, then</div><div class='add'>+		 * we can get rid of it provided it's not also the tail folioq</div><div class='add'>+		 * being filled by the issuer.</div><div class='add'>+		 */</div><div class='add'>+		folioq_clear(folioq, slot);</div><div class='add'>+		slot++;</div><div class='add'>+		if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+			folioq = rolling_buffer_delete_spent(&amp;creq-&gt;buffer);</div><div class='add'>+			if (!folioq)</div><div class='add'>+				goto done;</div><div class='add'>+			slot = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (fpos + fsize &gt;= collected_to)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	creq-&gt;buffer.tail = folioq;</div><div class='add'>+done:</div><div class='add'>+	creq-&gt;buffer.first_tail_slot = slot;</div><div class='add'>+	return made_progress;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/netfs/read_retry.c b/fs/netfs/read_retry.c<br/>new file mode 100644<br/>index 000000000000..b99e84a8170a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/read_retry.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/read_retry.c</a></div><div class='hunk'>@@ -0,0 +1,293 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Network filesystem read subrequest retrying.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+static void netfs_reissue_read(struct netfs_io_request *rreq,</div><div class='add'>+			       struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	__clear_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	__set_bit(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_retry_read_subreq);</div><div class='add'>+	subreq-&gt;rreq-&gt;netfs_ops-&gt;issue_read(subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Go through the list of failed/short reads, retrying all retryable ones.  We</div><div class='add'>+ * need to switch failed cache reads to network downloads.</div><div class='add'>+ */</div><div class='add'>+static void netfs_retry_read_subrequests(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq;</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+	struct list_head *next;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x", rreq-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;stream-&gt;subrequests))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rreq-&gt;netfs_ops-&gt;retry_request)</div><div class='add'>+		rreq-&gt;netfs_ops-&gt;retry_request(rreq, NULL);</div><div class='add'>+</div><div class='add'>+	/* If there's no renegotiation to do, just resend each retryable subreq</div><div class='add'>+	 * up to the first permanently failed one.</div><div class='add'>+	 */</div><div class='add'>+	if (!rreq-&gt;netfs_ops-&gt;prepare_read &amp;&amp;</div><div class='add'>+	    !rreq-&gt;cache_resources.ops) {</div><div class='add'>+		list_for_each_entry(subreq, &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+			if (test_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags))</div><div class='add'>+				break;</div><div class='add'>+			if (__test_and_clear_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags)) {</div><div class='add'>+				__clear_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+				subreq-&gt;retry_count++;</div><div class='add'>+				netfs_reset_iter(subreq);</div><div class='add'>+				netfs_get_subrequest(subreq, netfs_sreq_trace_get_resubmit);</div><div class='add'>+				netfs_reissue_read(rreq, subreq);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Okay, we need to renegotiate all the download requests and flip any</div><div class='add'>+	 * failed cache reads over to being download requests and negotiate</div><div class='add'>+	 * those also.  All fully successful subreqs have been removed from the</div><div class='add'>+	 * list and any spare data from those has been donated.</div><div class='add'>+	 *</div><div class='add'>+	 * What we do is decant the list and rebuild it one subreq at a time so</div><div class='add'>+	 * that we don't end up with donations jumping over a gap we're busy</div><div class='add'>+	 * populating with smaller subrequests.  In the event that the subreq</div><div class='add'>+	 * we just launched finishes before we insert the next subreq, it'll</div><div class='add'>+	 * fill in rreq-&gt;prev_donated instead.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: Alternatively, we could split the tail subrequest right before</div><div class='add'>+	 * we reissue it and fix up the donations under lock.</div><div class='add'>+	 */</div><div class='add'>+	next = stream-&gt;subrequests.next;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct netfs_io_subrequest *from, *to, *tmp;</div><div class='add'>+		struct iov_iter source;</div><div class='add'>+		unsigned long long start, len;</div><div class='add'>+		size_t part;</div><div class='add'>+		bool boundary = false, subreq_superfluous = false;</div><div class='add'>+</div><div class='add'>+		/* Go through the subreqs and find the next span of contiguous</div><div class='add'>+		 * buffer that we then rejig (cifs, for example, needs the</div><div class='add'>+		 * rsize renegotiating) and reissue.</div><div class='add'>+		 */</div><div class='add'>+		from = list_entry(next, struct netfs_io_subrequest, rreq_link);</div><div class='add'>+		to = from;</div><div class='add'>+		start = from-&gt;start + from-&gt;transferred;</div><div class='add'>+		len   = from-&gt;len   - from-&gt;transferred;</div><div class='add'>+</div><div class='add'>+		_debug("from R=%08x[%x] s=%llx ctl=%zx/%zx",</div><div class='add'>+		       rreq-&gt;debug_id, from-&gt;debug_index,</div><div class='add'>+		       from-&gt;start, from-&gt;transferred, from-&gt;len);</div><div class='add'>+</div><div class='add'>+		if (test_bit(NETFS_SREQ_FAILED, &amp;from-&gt;flags) ||</div><div class='add'>+		    !test_bit(NETFS_SREQ_NEED_RETRY, &amp;from-&gt;flags))</div><div class='add'>+			goto abandon;</div><div class='add'>+</div><div class='add'>+		list_for_each_continue(next, &amp;stream-&gt;subrequests) {</div><div class='add'>+			subreq = list_entry(next, struct netfs_io_subrequest, rreq_link);</div><div class='add'>+			if (subreq-&gt;start + subreq-&gt;transferred != start + len ||</div><div class='add'>+			    test_bit(NETFS_SREQ_BOUNDARY, &amp;subreq-&gt;flags) ||</div><div class='add'>+			    !test_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags))</div><div class='add'>+				break;</div><div class='add'>+			to = subreq;</div><div class='add'>+			len += to-&gt;len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_debug(" - range: %llx-%llx %llx", start, start + len - 1, len);</div><div class='add'>+</div><div class='add'>+		/* Determine the set of buffers we're going to use.  Each</div><div class='add'>+		 * subreq gets a subset of a single overall contiguous buffer.</div><div class='add'>+		 */</div><div class='add'>+		netfs_reset_iter(from);</div><div class='add'>+		source = from-&gt;io_iter;</div><div class='add'>+		source.count = len;</div><div class='add'>+</div><div class='add'>+		/* Work through the sublist. */</div><div class='add'>+		subreq = from;</div><div class='add'>+		list_for_each_entry_from(subreq, &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+			if (!len) {</div><div class='add'>+				subreq_superfluous = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			subreq-&gt;source	= NETFS_DOWNLOAD_FROM_SERVER;</div><div class='add'>+			subreq-&gt;start	= start - subreq-&gt;transferred;</div><div class='add'>+			subreq-&gt;len	= len   + subreq-&gt;transferred;</div><div class='add'>+			__clear_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+			__clear_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+			subreq-&gt;retry_count++;</div><div class='add'>+</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_retry);</div><div class='add'>+</div><div class='add'>+			/* Renegotiate max_len (rsize) */</div><div class='add'>+			stream-&gt;sreq_max_len = subreq-&gt;len;</div><div class='add'>+			if (rreq-&gt;netfs_ops-&gt;prepare_read &amp;&amp;</div><div class='add'>+			    rreq-&gt;netfs_ops-&gt;prepare_read(subreq) &lt; 0) {</div><div class='add'>+				trace_netfs_sreq(subreq, netfs_sreq_trace_reprep_failed);</div><div class='add'>+				__set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+				goto abandon;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			part = umin(len, stream-&gt;sreq_max_len);</div><div class='add'>+			if (unlikely(stream-&gt;sreq_max_segs))</div><div class='add'>+				part = netfs_limit_iter(&amp;source, 0, part, stream-&gt;sreq_max_segs);</div><div class='add'>+			subreq-&gt;len = subreq-&gt;transferred + part;</div><div class='add'>+			subreq-&gt;io_iter = source;</div><div class='add'>+			iov_iter_truncate(&amp;subreq-&gt;io_iter, part);</div><div class='add'>+			iov_iter_advance(&amp;source, part);</div><div class='add'>+			len -= part;</div><div class='add'>+			start += part;</div><div class='add'>+			if (!len) {</div><div class='add'>+				if (boundary)</div><div class='add'>+					__set_bit(NETFS_SREQ_BOUNDARY, &amp;subreq-&gt;flags);</div><div class='add'>+			} else {</div><div class='add'>+				__clear_bit(NETFS_SREQ_BOUNDARY, &amp;subreq-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			netfs_get_subrequest(subreq, netfs_sreq_trace_get_resubmit);</div><div class='add'>+			netfs_reissue_read(rreq, subreq);</div><div class='add'>+			if (subreq == to) {</div><div class='add'>+				subreq_superfluous = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we managed to use fewer subreqs, we can discard the</div><div class='add'>+		 * excess; if we used the same number, then we're done.</div><div class='add'>+		 */</div><div class='add'>+		if (!len) {</div><div class='add'>+			if (!subreq_superfluous)</div><div class='add'>+				continue;</div><div class='add'>+			list_for_each_entry_safe_from(subreq, tmp,</div><div class='add'>+						      &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+				trace_netfs_sreq(subreq, netfs_sreq_trace_superfluous);</div><div class='add'>+				list_del(&amp;subreq-&gt;rreq_link);</div><div class='add'>+				netfs_put_subrequest(subreq, netfs_sreq_trace_put_done);</div><div class='add'>+				if (subreq == to)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We ran out of subrequests, so we need to allocate some more</div><div class='add'>+		 * and insert them after.</div><div class='add'>+		 */</div><div class='add'>+		do {</div><div class='add'>+			subreq = netfs_alloc_subrequest(rreq);</div><div class='add'>+			if (!subreq) {</div><div class='add'>+				subreq = to;</div><div class='add'>+				goto abandon_after;</div><div class='add'>+			}</div><div class='add'>+			subreq-&gt;source		= NETFS_DOWNLOAD_FROM_SERVER;</div><div class='add'>+			subreq-&gt;start		= start;</div><div class='add'>+			subreq-&gt;len		= len;</div><div class='add'>+			subreq-&gt;stream_nr	= stream-&gt;stream_nr;</div><div class='add'>+			subreq-&gt;retry_count	= 1;</div><div class='add'>+</div><div class='add'>+			trace_netfs_sreq_ref(rreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='add'>+					     refcount_read(&amp;subreq-&gt;ref),</div><div class='add'>+					     netfs_sreq_trace_new);</div><div class='add'>+</div><div class='add'>+			list_add(&amp;subreq-&gt;rreq_link, &amp;to-&gt;rreq_link);</div><div class='add'>+			to = list_next_entry(to, rreq_link);</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_retry);</div><div class='add'>+</div><div class='add'>+			stream-&gt;sreq_max_len	= umin(len, rreq-&gt;rsize);</div><div class='add'>+			stream-&gt;sreq_max_segs	= 0;</div><div class='add'>+			if (unlikely(stream-&gt;sreq_max_segs))</div><div class='add'>+				part = netfs_limit_iter(&amp;source, 0, part, stream-&gt;sreq_max_segs);</div><div class='add'>+</div><div class='add'>+			netfs_stat(&amp;netfs_n_rh_download);</div><div class='add'>+			if (rreq-&gt;netfs_ops-&gt;prepare_read(subreq) &lt; 0) {</div><div class='add'>+				trace_netfs_sreq(subreq, netfs_sreq_trace_reprep_failed);</div><div class='add'>+				__set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+				goto abandon;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			part = umin(len, stream-&gt;sreq_max_len);</div><div class='add'>+			subreq-&gt;len = subreq-&gt;transferred + part;</div><div class='add'>+			subreq-&gt;io_iter = source;</div><div class='add'>+			iov_iter_truncate(&amp;subreq-&gt;io_iter, part);</div><div class='add'>+			iov_iter_advance(&amp;source, part);</div><div class='add'>+</div><div class='add'>+			len -= part;</div><div class='add'>+			start += part;</div><div class='add'>+			if (!len &amp;&amp; boundary) {</div><div class='add'>+				__set_bit(NETFS_SREQ_BOUNDARY, &amp;to-&gt;flags);</div><div class='add'>+				boundary = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			netfs_reissue_read(rreq, subreq);</div><div class='add'>+		} while (len);</div><div class='add'>+</div><div class='add'>+	} while (!list_is_head(next, &amp;stream-&gt;subrequests));</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+	/* If we hit an error, fail all remaining incomplete subrequests */</div><div class='add'>+abandon_after:</div><div class='add'>+	if (list_is_last(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests))</div><div class='add'>+		return;</div><div class='add'>+	subreq = list_next_entry(subreq, rreq_link);</div><div class='add'>+abandon:</div><div class='add'>+	list_for_each_entry_from(subreq, &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+		if (!subreq-&gt;error &amp;&amp;</div><div class='add'>+		    !test_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags) &amp;&amp;</div><div class='add'>+		    !test_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags))</div><div class='add'>+			continue;</div><div class='add'>+		subreq-&gt;error = -ENOMEM;</div><div class='add'>+		__set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+		__clear_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Retry reads.</div><div class='add'>+ */</div><div class='add'>+void netfs_retry_reads(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_retry_read_req);</div><div class='add'>+</div><div class='add'>+	/* Wait for all outstanding I/O to quiesce before performing retries as</div><div class='add'>+	 * we may need to renegotiate the I/O sizes.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(NETFS_RREQ_RETRYING, &amp;rreq-&gt;flags);</div><div class='add'>+	netfs_wait_for_in_progress_stream(rreq, stream);</div><div class='add'>+	clear_bit(NETFS_RREQ_RETRYING, &amp;rreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	trace_netfs_rreq(rreq, netfs_rreq_trace_resubmit);</div><div class='add'>+	netfs_retry_read_subrequests(rreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unlock any the pages that haven't been unlocked yet due to abandoned</div><div class='add'>+ * subrequests.</div><div class='add'>+ */</div><div class='add'>+void netfs_unlock_abandoned_read_pages(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *p;</div><div class='add'>+</div><div class='add'>+	for (p = rreq-&gt;buffer.tail; p; p = p-&gt;next) {</div><div class='add'>+		for (int slot = 0; slot &lt; folioq_count(p); slot++) {</div><div class='add'>+			struct folio *folio = folioq_folio(p, slot);</div><div class='add'>+</div><div class='add'>+			if (folio &amp;&amp; !folioq_is_marked2(p, slot)) {</div><div class='add'>+				trace_netfs_folio(folio, netfs_folio_trace_abandon);</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/fs/netfs/read_single.c b/fs/netfs/read_single.c<br/>new file mode 100644<br/>index 000000000000..8e6264f62a8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/read_single.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/read_single.c</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Single, monolithic object support (e.g. AFS directory).</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='add'>+#include &lt;linux/task_io_accounting_ops.h&gt;</div><div class='add'>+#include &lt;linux/netfs.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_single_mark_inode_dirty - Mark a single, monolithic object inode dirty</div><div class='add'>+ * @inode: The inode to mark</div><div class='add'>+ *</div><div class='add'>+ * Mark an inode that contains a single, monolithic object as dirty so that its</div><div class='add'>+ * writepages op will get called.  If set, the SINGLE_NO_UPLOAD flag indicates</div><div class='add'>+ * that the object will only be written to the cache and not uploaded (e.g. AFS</div><div class='add'>+ * directory contents).</div><div class='add'>+ */</div><div class='add'>+void netfs_single_mark_inode_dirty(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(inode);</div><div class='add'>+	bool cache_only = test_bit(NETFS_ICTX_SINGLE_NO_UPLOAD, &amp;ictx-&gt;flags);</div><div class='add'>+	bool caching = fscache_cookie_enabled(netfs_i_cookie(netfs_inode(inode)));</div><div class='add'>+</div><div class='add'>+	if (cache_only &amp;&amp; !caching)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mark_inode_dirty(inode);</div><div class='add'>+</div><div class='add'>+	if (caching &amp;&amp; !(inode_state_read_once(inode) &amp; I_PINNING_NETFS_WB)) {</div><div class='add'>+		bool need_use = false;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+		if (!(inode_state_read(inode) &amp; I_PINNING_NETFS_WB)) {</div><div class='add'>+			inode_state_set(inode, I_PINNING_NETFS_WB);</div><div class='add'>+			need_use = true;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='add'>+		if (need_use)</div><div class='add'>+			fscache_use_cookie(netfs_i_cookie(ictx), true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_single_mark_inode_dirty);</div><div class='add'>+</div><div class='add'>+static int netfs_single_begin_cache_read(struct netfs_io_request *rreq, struct netfs_inode *ctx)</div><div class='add'>+{</div><div class='add'>+	return fscache_begin_read_operation(&amp;rreq-&gt;cache_resources, netfs_i_cookie(ctx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netfs_single_cache_prepare_read(struct netfs_io_request *rreq,</div><div class='add'>+					    struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='add'>+</div><div class='add'>+	if (!cres-&gt;ops) {</div><div class='add'>+		subreq-&gt;source = NETFS_DOWNLOAD_FROM_SERVER;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	subreq-&gt;source = cres-&gt;ops-&gt;prepare_read(subreq, rreq-&gt;i_size);</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netfs_single_read_cache(struct netfs_io_request *rreq,</div><div class='add'>+				    struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_cache_resources *cres = &amp;rreq-&gt;cache_resources;</div><div class='add'>+</div><div class='add'>+	_enter("R=%08x[%x]", rreq-&gt;debug_id, subreq-&gt;debug_index);</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_read);</div><div class='add'>+	cres-&gt;ops-&gt;read(cres, subreq-&gt;start, &amp;subreq-&gt;io_iter, NETFS_READ_HOLE_FAIL,</div><div class='add'>+			netfs_cache_read_terminated, subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform a read to a buffer from the cache or the server.  Only a single</div><div class='add'>+ * subreq is permitted as the object must be fetched in a single transaction.</div><div class='add'>+ */</div><div class='add'>+static int netfs_single_dispatch_read(struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream = &amp;rreq-&gt;io_streams[0];</div><div class='add'>+	struct netfs_io_subrequest *subreq;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	subreq = netfs_alloc_subrequest(rreq);</div><div class='add'>+	if (!subreq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	subreq-&gt;source	= NETFS_SOURCE_UNKNOWN;</div><div class='add'>+	subreq-&gt;start	= 0;</div><div class='add'>+	subreq-&gt;len	= rreq-&gt;len;</div><div class='add'>+	subreq-&gt;io_iter	= rreq-&gt;buffer.iter;</div><div class='add'>+</div><div class='add'>+	__set_bit(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rreq-&gt;lock);</div><div class='add'>+	list_add_tail(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests);</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_added);</div><div class='add'>+	stream-&gt;front = subreq;</div><div class='add'>+	/* Store list pointers before active flag */</div><div class='add'>+	smp_store_release(&amp;stream-&gt;active, true);</div><div class='add'>+	spin_unlock(&amp;rreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netfs_single_cache_prepare_read(rreq, subreq);</div><div class='add'>+	switch (subreq-&gt;source) {</div><div class='add'>+	case NETFS_DOWNLOAD_FROM_SERVER:</div><div class='add'>+		netfs_stat(&amp;netfs_n_rh_download);</div><div class='add'>+		if (rreq-&gt;netfs_ops-&gt;prepare_read) {</div><div class='add'>+			ret = rreq-&gt;netfs_ops-&gt;prepare_read(subreq);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto cancel;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rreq-&gt;netfs_ops-&gt;issue_read(subreq);</div><div class='add'>+		rreq-&gt;submitted += subreq-&gt;len;</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_READ_FROM_CACHE:</div><div class='add'>+		trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='add'>+		netfs_single_read_cache(rreq, subreq);</div><div class='add'>+		rreq-&gt;submitted += subreq-&gt;len;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warn("Unexpected single-read source %u\n", subreq-&gt;source);</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+	set_bit(NETFS_RREQ_ALL_QUEUED, &amp;rreq-&gt;flags);</div><div class='add'>+	return ret;</div><div class='add'>+cancel:</div><div class='add'>+	netfs_put_subrequest(subreq, netfs_sreq_trace_put_cancel);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_read_single - Synchronously read a single blob of pages.</div><div class='add'>+ * @inode: The inode to read from.</div><div class='add'>+ * @file: The file we're using to read or NULL.</div><div class='add'>+ * @iter: The buffer we're reading into.</div><div class='add'>+ *</div><div class='add'>+ * Fulfil a read request for a single monolithic object by drawing data from</div><div class='add'>+ * the cache if possible, or the netfs if not.  The buffer may be larger than</div><div class='add'>+ * the file content; unused beyond the EOF will be zero-filled.  The content</div><div class='add'>+ * will be read with a single I/O request (though this may be retried).</div><div class='add'>+ *</div><div class='add'>+ * The calling netfs must initialise a netfs context contiguous to the vfs</div><div class='add'>+ * inode before calling this.</div><div class='add'>+ *</div><div class='add'>+ * This is usable whether or not caching is enabled.  If caching is enabled,</div><div class='add'>+ * the data will be stored as a single object into the cache.</div><div class='add'>+ */</div><div class='add'>+ssize_t netfs_read_single(struct inode *inode, struct file *file, struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq;</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(inode);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	rreq = netfs_alloc_request(inode-&gt;i_mapping, file, 0, iov_iter_count(iter),</div><div class='add'>+				   NETFS_READ_SINGLE);</div><div class='add'>+	if (IS_ERR(rreq))</div><div class='add'>+		return PTR_ERR(rreq);</div><div class='add'>+</div><div class='add'>+	ret = netfs_single_begin_cache_read(rreq, ictx);</div><div class='add'>+	if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)</div><div class='add'>+		goto cleanup_free;</div><div class='add'>+</div><div class='add'>+	netfs_stat(&amp;netfs_n_rh_read_single);</div><div class='add'>+	trace_netfs_read(rreq, 0, rreq-&gt;len, netfs_read_trace_read_single);</div><div class='add'>+</div><div class='add'>+	rreq-&gt;buffer.iter = *iter;</div><div class='add'>+	netfs_single_dispatch_read(rreq);</div><div class='add'>+</div><div class='add'>+	ret = netfs_wait_for_read(rreq);</div><div class='add'>+	netfs_put_request(rreq, netfs_rreq_trace_put_return);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+cleanup_free:</div><div class='add'>+	netfs_put_failed_request(rreq);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_read_single);</div><div class='head'>diff --git a/fs/netfs/rolling_buffer.c b/fs/netfs/rolling_buffer.c<br/>new file mode 100644<br/>index 000000000000..207b6a326651<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/rolling_buffer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/rolling_buffer.c</a></div><div class='hunk'>@@ -0,0 +1,222 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Rolling buffer helpers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/rolling_buffer.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+static atomic_t debug_ids;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_folioq_alloc - Allocate a folio_queue struct</div><div class='add'>+ * @rreq_id: Associated debugging ID for tracing purposes</div><div class='add'>+ * @gfp: Allocation constraints</div><div class='add'>+ * @trace: Trace tag to indicate the purpose of the allocation</div><div class='add'>+ *</div><div class='add'>+ * Allocate, initialise and account the folio_queue struct and log a trace line</div><div class='add'>+ * to mark the allocation.</div><div class='add'>+ */</div><div class='add'>+struct folio_queue *netfs_folioq_alloc(unsigned int rreq_id, gfp_t gfp,</div><div class='add'>+				       unsigned int /*enum netfs_folioq_trace*/ trace)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *fq;</div><div class='add'>+</div><div class='add'>+	fq = kmalloc(sizeof(*fq), gfp);</div><div class='add'>+	if (fq) {</div><div class='add'>+		netfs_stat(&amp;netfs_n_folioq);</div><div class='add'>+		folioq_init(fq, rreq_id);</div><div class='add'>+		fq-&gt;debug_id = atomic_inc_return(&amp;debug_ids);</div><div class='add'>+		trace_netfs_folioq(fq, trace);</div><div class='add'>+	}</div><div class='add'>+	return fq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_folioq_alloc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_folioq_free - Free a folio_queue struct</div><div class='add'>+ * @folioq: The object to free</div><div class='add'>+ * @trace: Trace tag to indicate which free</div><div class='add'>+ *</div><div class='add'>+ * Free and unaccount the folio_queue struct.</div><div class='add'>+ */</div><div class='add'>+void netfs_folioq_free(struct folio_queue *folioq,</div><div class='add'>+		       unsigned int /*enum netfs_trace_folioq*/ trace)</div><div class='add'>+{</div><div class='add'>+	trace_netfs_folioq(folioq, trace);</div><div class='add'>+	netfs_stat_d(&amp;netfs_n_folioq);</div><div class='add'>+	kfree(folioq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_folioq_free);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise a rolling buffer.  We allocate an empty folio queue struct to so</div><div class='add'>+ * that the pointers can be independently driven by the producer and the</div><div class='add'>+ * consumer.</div><div class='add'>+ */</div><div class='add'>+int rolling_buffer_init(struct rolling_buffer *roll, unsigned int rreq_id,</div><div class='add'>+			unsigned int direction)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *fq;</div><div class='add'>+</div><div class='add'>+	fq = netfs_folioq_alloc(rreq_id, GFP_NOFS, netfs_trace_folioq_rollbuf_init);</div><div class='add'>+	if (!fq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	roll-&gt;head = fq;</div><div class='add'>+	roll-&gt;tail = fq;</div><div class='add'>+	iov_iter_folio_queue(&amp;roll-&gt;iter, direction, fq, 0, 0, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add another folio_queue to a rolling buffer if there's no space left.</div><div class='add'>+ */</div><div class='add'>+int rolling_buffer_make_space(struct rolling_buffer *roll)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *fq, *head = roll-&gt;head;</div><div class='add'>+</div><div class='add'>+	if (!folioq_full(head))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fq = netfs_folioq_alloc(head-&gt;rreq_id, GFP_NOFS, netfs_trace_folioq_make_space);</div><div class='add'>+	if (!fq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	fq-&gt;prev = head;</div><div class='add'>+</div><div class='add'>+	roll-&gt;head = fq;</div><div class='add'>+	if (folioq_full(head)) {</div><div class='add'>+		/* Make sure we don't leave the master iterator pointing to a</div><div class='add'>+		 * block that might get immediately consumed.</div><div class='add'>+		 */</div><div class='add'>+		if (roll-&gt;iter.folioq == head &amp;&amp;</div><div class='add'>+		    roll-&gt;iter.folioq_slot == folioq_nr_slots(head)) {</div><div class='add'>+			roll-&gt;iter.folioq = fq;</div><div class='add'>+			roll-&gt;iter.folioq_slot = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure the initialisation is stored before the next pointer.</div><div class='add'>+	 *</div><div class='add'>+	 * [!] NOTE: After we set head-&gt;next, the consumer is at liberty to</div><div class='add'>+	 * immediately delete the old head.</div><div class='add'>+	 */</div><div class='add'>+	smp_store_release(&amp;head-&gt;next, fq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Decant the list of folios to read into a rolling buffer.</div><div class='add'>+ */</div><div class='add'>+ssize_t rolling_buffer_load_from_ra(struct rolling_buffer *roll,</div><div class='add'>+				    struct readahead_control *ractl,</div><div class='add'>+				    struct folio_batch *put_batch)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *fq;</div><div class='add'>+	struct page **vec;</div><div class='add'>+	int nr, ix, to;</div><div class='add'>+	ssize_t size = 0;</div><div class='add'>+</div><div class='add'>+	if (rolling_buffer_make_space(roll) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fq = roll-&gt;head;</div><div class='add'>+	vec = (struct page **)fq-&gt;vec.folios;</div><div class='add'>+	nr = __readahead_batch(ractl, vec + folio_batch_count(&amp;fq-&gt;vec),</div><div class='add'>+			       folio_batch_space(&amp;fq-&gt;vec));</div><div class='add'>+	ix = fq-&gt;vec.nr;</div><div class='add'>+	to = ix + nr;</div><div class='add'>+	fq-&gt;vec.nr = to;</div><div class='add'>+	for (; ix &lt; to; ix++) {</div><div class='add'>+		struct folio *folio = folioq_folio(fq, ix);</div><div class='add'>+		unsigned int order = folio_order(folio);</div><div class='add'>+</div><div class='add'>+		fq-&gt;orders[ix] = order;</div><div class='add'>+		size += PAGE_SIZE &lt;&lt; order;</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_read);</div><div class='add'>+		if (!folio_batch_add(put_batch, folio))</div><div class='add'>+			folio_batch_release(put_batch);</div><div class='add'>+	}</div><div class='add'>+	WRITE_ONCE(roll-&gt;iter.count, roll-&gt;iter.count + size);</div><div class='add'>+</div><div class='add'>+	/* Store the counter after setting the slot. */</div><div class='add'>+	smp_store_release(&amp;roll-&gt;next_head_slot, to);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Append a folio to the rolling buffer.</div><div class='add'>+ */</div><div class='add'>+ssize_t rolling_buffer_append(struct rolling_buffer *roll, struct folio *folio,</div><div class='add'>+			      unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	ssize_t size = folio_size(folio);</div><div class='add'>+	int slot;</div><div class='add'>+</div><div class='add'>+	if (rolling_buffer_make_space(roll) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	slot = folioq_append(roll-&gt;head, folio);</div><div class='add'>+	if (flags &amp; ROLLBUF_MARK_1)</div><div class='add'>+		folioq_mark(roll-&gt;head, slot);</div><div class='add'>+	if (flags &amp; ROLLBUF_MARK_2)</div><div class='add'>+		folioq_mark2(roll-&gt;head, slot);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(roll-&gt;iter.count, roll-&gt;iter.count + size);</div><div class='add'>+</div><div class='add'>+	/* Store the counter after setting the slot. */</div><div class='add'>+	smp_store_release(&amp;roll-&gt;next_head_slot, slot);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Delete a spent buffer from a rolling queue and return the next in line.  We</div><div class='add'>+ * don't return the last buffer to keep the pointers independent, but return</div><div class='add'>+ * NULL instead.</div><div class='add'>+ */</div><div class='add'>+struct folio_queue *rolling_buffer_delete_spent(struct rolling_buffer *roll)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *spent = roll-&gt;tail, *next = READ_ONCE(spent-&gt;next);</div><div class='add'>+</div><div class='add'>+	if (!next)</div><div class='add'>+		return NULL;</div><div class='add'>+	next-&gt;prev = NULL;</div><div class='add'>+	netfs_folioq_free(spent, netfs_trace_folioq_delete);</div><div class='add'>+	roll-&gt;tail = next;</div><div class='add'>+	return next;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear out a rolling queue.  Folios that have mark 1 set are put.</div><div class='add'>+ */</div><div class='add'>+void rolling_buffer_clear(struct rolling_buffer *roll)</div><div class='add'>+{</div><div class='add'>+	struct folio_batch fbatch;</div><div class='add'>+	struct folio_queue *p;</div><div class='add'>+</div><div class='add'>+	folio_batch_init(&amp;fbatch);</div><div class='add'>+</div><div class='add'>+	while ((p = roll-&gt;tail)) {</div><div class='add'>+		roll-&gt;tail = p-&gt;next;</div><div class='add'>+		for (int slot = 0; slot &lt; folioq_count(p); slot++) {</div><div class='add'>+			struct folio *folio = folioq_folio(p, slot);</div><div class='add'>+</div><div class='add'>+			if (!folio)</div><div class='add'>+				continue;</div><div class='add'>+			if (folioq_is_marked(p, slot)) {</div><div class='add'>+				trace_netfs_folio(folio, netfs_folio_trace_put);</div><div class='add'>+				if (!folio_batch_add(&amp;fbatch, folio))</div><div class='add'>+					folio_batch_release(&amp;fbatch);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netfs_folioq_free(p, netfs_trace_folioq_clear);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	folio_batch_release(&amp;fbatch);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/netfs/stats.c b/fs/netfs/stats.c<br/>index deeba9f9dcf5..ab6b916addc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/netfs/stats.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/netfs/stats.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/stats.c</a></div><div class='hunk'>@@ -10,9 +10,9 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> atomic_t netfs_n_rh_dio_read;</div><div class='del'>-atomic_t netfs_n_rh_dio_write;</div><div class='ctx'> atomic_t netfs_n_rh_readahead;</div><div class='del'>-atomic_t netfs_n_rh_readpage;</div><div class='add'>+atomic_t netfs_n_rh_read_folio;</div><div class='add'>+atomic_t netfs_n_rh_read_single;</div><div class='ctx'> atomic_t netfs_n_rh_rreq;</div><div class='ctx'> atomic_t netfs_n_rh_sreq;</div><div class='ctx'> atomic_t netfs_n_rh_download;</div><div class='hunk'>@@ -29,6 +29,13 @@ atomic_t netfs_n_rh_write_begin;</div><div class='ctx'> atomic_t netfs_n_rh_write_done;</div><div class='ctx'> atomic_t netfs_n_rh_write_failed;</div><div class='ctx'> atomic_t netfs_n_rh_write_zskip;</div><div class='add'>+atomic_t netfs_n_rh_retry_read_req;</div><div class='add'>+atomic_t netfs_n_rh_retry_read_subreq;</div><div class='add'>+atomic_t netfs_n_wh_buffered_write;</div><div class='add'>+atomic_t netfs_n_wh_writethrough;</div><div class='add'>+atomic_t netfs_n_wh_dio_write;</div><div class='add'>+atomic_t netfs_n_wh_writepages;</div><div class='add'>+atomic_t netfs_n_wh_copy_to_cache;</div><div class='ctx'> atomic_t netfs_n_wh_wstream_conflict;</div><div class='ctx'> atomic_t netfs_n_wh_upload;</div><div class='ctx'> atomic_t netfs_n_wh_upload_done;</div><div class='hunk'>@@ -36,41 +43,61 @@ atomic_t netfs_n_wh_upload_failed;</div><div class='ctx'> atomic_t netfs_n_wh_write;</div><div class='ctx'> atomic_t netfs_n_wh_write_done;</div><div class='ctx'> atomic_t netfs_n_wh_write_failed;</div><div class='add'>+atomic_t netfs_n_wh_retry_write_req;</div><div class='add'>+atomic_t netfs_n_wh_retry_write_subreq;</div><div class='add'>+atomic_t netfs_n_wb_lock_skip;</div><div class='add'>+atomic_t netfs_n_wb_lock_wait;</div><div class='add'>+atomic_t netfs_n_folioq;</div><div class='ctx'> </div><div class='ctx'> int netfs_stats_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='del'>-	seq_printf(m, "Netfs  : DR=%u DW=%u RA=%u RP=%u WB=%u WBZ=%u\n",</div><div class='add'>+	seq_printf(m, "Reads  : DR=%u RA=%u RF=%u RS=%u WB=%u WBZ=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_dio_read),</div><div class='del'>-		   atomic_read(&amp;netfs_n_rh_dio_write),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_readahead),</div><div class='del'>-		   atomic_read(&amp;netfs_n_rh_readpage),</div><div class='add'>+		   atomic_read(&amp;netfs_n_rh_read_folio),</div><div class='add'>+		   atomic_read(&amp;netfs_n_rh_read_single),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_write_begin),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_write_zskip));</div><div class='del'>-	seq_printf(m, "Netfs  : ZR=%u sh=%u sk=%u\n",</div><div class='add'>+	seq_printf(m, "Writes : BW=%u WT=%u DW=%u WP=%u 2C=%u\n",</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_buffered_write),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_writethrough),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_dio_write),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_writepages),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_copy_to_cache));</div><div class='add'>+	seq_printf(m, "ZeroOps: ZR=%u sh=%u sk=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_zero),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_short_read),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_write_zskip));</div><div class='del'>-	seq_printf(m, "Netfs  : DL=%u ds=%u df=%u di=%u\n",</div><div class='add'>+	seq_printf(m, "DownOps: DL=%u ds=%u df=%u di=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_download),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_download_done),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_download_failed),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_download_instead));</div><div class='del'>-	seq_printf(m, "Netfs  : RD=%u rs=%u rf=%u\n",</div><div class='add'>+	seq_printf(m, "CaRdOps: RD=%u rs=%u rf=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_read),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_read_done),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_read_failed));</div><div class='del'>-	seq_printf(m, "Netfs  : UL=%u us=%u uf=%u\n",</div><div class='add'>+	seq_printf(m, "UpldOps: UL=%u us=%u uf=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_upload),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_upload_done),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_upload_failed));</div><div class='del'>-	seq_printf(m, "Netfs  : WR=%u ws=%u wf=%u\n",</div><div class='add'>+	seq_printf(m, "CaWrOps: WR=%u ws=%u wf=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_write),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_write_done),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_write_failed));</div><div class='del'>-	seq_printf(m, "Netfs  : rr=%u sr=%u wsc=%u\n",</div><div class='add'>+	seq_printf(m, "Retries: rq=%u rs=%u wq=%u ws=%u\n",</div><div class='add'>+		   atomic_read(&amp;netfs_n_rh_retry_read_req),</div><div class='add'>+		   atomic_read(&amp;netfs_n_rh_retry_read_subreq),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_retry_write_req),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wh_retry_write_subreq));</div><div class='add'>+	seq_printf(m, "Objs   : rr=%u sr=%u foq=%u wsc=%u\n",</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_rreq),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_rh_sreq),</div><div class='add'>+		   atomic_read(&amp;netfs_n_folioq),</div><div class='ctx'> 		   atomic_read(&amp;netfs_n_wh_wstream_conflict));</div><div class='add'>+	seq_printf(m, "WbLock : skip=%u wait=%u\n",</div><div class='add'>+		   atomic_read(&amp;netfs_n_wb_lock_skip),</div><div class='add'>+		   atomic_read(&amp;netfs_n_wb_lock_wait));</div><div class='ctx'> 	return fscache_stats_show(m);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(netfs_stats_show);</div><div class='head'>diff --git a/fs/netfs/write_collect.c b/fs/netfs/write_collect.c<br/>new file mode 100644<br/>index 000000000000..cbf3d9194c7b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/write_collect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/write_collect.c</a></div><div class='hunk'>@@ -0,0 +1,531 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Network filesystem write subrequest result collection, assessment</div><div class='add'>+ * and retrying.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/* Notes made in the collector */</div><div class='add'>+#define HIT_PENDING		0x01	/* A front op was still pending */</div><div class='add'>+#define NEED_REASSESS		0x02	/* Need to loop round and reassess */</div><div class='add'>+#define MADE_PROGRESS		0x04	/* Made progress cleaning up a stream or the folio set */</div><div class='add'>+#define NEED_UNLOCK		0x08	/* The pagecache needs unlocking */</div><div class='add'>+#define NEED_RETRY		0x10	/* A front op requests retrying */</div><div class='add'>+#define SAW_FAILURE		0x20	/* One stream or hit a permanent failure */</div><div class='add'>+</div><div class='add'>+static void netfs_dump_request(const struct netfs_io_request *rreq)</div><div class='add'>+{</div><div class='add'>+	pr_err("Request R=%08x r=%d fl=%lx or=%x e=%ld\n",</div><div class='add'>+	       rreq-&gt;debug_id, refcount_read(&amp;rreq-&gt;ref), rreq-&gt;flags,</div><div class='add'>+	       rreq-&gt;origin, rreq-&gt;error);</div><div class='add'>+	pr_err("  st=%llx tsl=%zx/%llx/%llx\n",</div><div class='add'>+	       rreq-&gt;start, rreq-&gt;transferred, rreq-&gt;submitted, rreq-&gt;len);</div><div class='add'>+	pr_err("  cci=%llx/%llx/%llx\n",</div><div class='add'>+	       rreq-&gt;cleaned_to, rreq-&gt;collected_to, atomic64_read(&amp;rreq-&gt;issued_to));</div><div class='add'>+	pr_err("  iw=%pSR\n", rreq-&gt;netfs_ops-&gt;issue_write);</div><div class='add'>+	for (int i = 0; i &lt; NR_IO_STREAMS; i++) {</div><div class='add'>+		const struct netfs_io_subrequest *sreq;</div><div class='add'>+		const struct netfs_io_stream *s = &amp;rreq-&gt;io_streams[i];</div><div class='add'>+</div><div class='add'>+		pr_err("  str[%x] s=%x e=%d acnf=%u,%u,%u,%u\n",</div><div class='add'>+		       s-&gt;stream_nr, s-&gt;source, s-&gt;error,</div><div class='add'>+		       s-&gt;avail, s-&gt;active, s-&gt;need_retry, s-&gt;failed);</div><div class='add'>+		pr_err("  str[%x] ct=%llx t=%zx\n",</div><div class='add'>+		       s-&gt;stream_nr, s-&gt;collected_to, s-&gt;transferred);</div><div class='add'>+		list_for_each_entry(sreq, &amp;s-&gt;subrequests, rreq_link) {</div><div class='add'>+			pr_err("  sreq[%x:%x] sc=%u s=%llx t=%zx/%zx r=%d f=%lx\n",</div><div class='add'>+			       sreq-&gt;stream_nr, sreq-&gt;debug_index, sreq-&gt;source,</div><div class='add'>+			       sreq-&gt;start, sreq-&gt;transferred, sreq-&gt;len,</div><div class='add'>+			       refcount_read(&amp;sreq-&gt;ref), sreq-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Successful completion of write of a folio to the server and/or cache.  Note</div><div class='add'>+ * that we are not allowed to lock the folio here on pain of deadlocking with</div><div class='add'>+ * truncate.</div><div class='add'>+ */</div><div class='add'>+int netfs_folio_written_back(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	enum netfs_folio_trace why = netfs_folio_trace_clear;</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(folio-&gt;mapping-&gt;host);</div><div class='add'>+	struct netfs_folio *finfo;</div><div class='add'>+	struct netfs_group *group = NULL;</div><div class='add'>+	int gcount = 0;</div><div class='add'>+</div><div class='add'>+	if ((finfo = netfs_folio_info(folio))) {</div><div class='add'>+		/* Streaming writes cannot be redirtied whilst under writeback,</div><div class='add'>+		 * so discard the streaming record.</div><div class='add'>+		 */</div><div class='add'>+		unsigned long long fend;</div><div class='add'>+</div><div class='add'>+		fend = folio_pos(folio) + finfo-&gt;dirty_offset + finfo-&gt;dirty_len;</div><div class='add'>+		if (fend &gt; ictx-&gt;zero_point)</div><div class='add'>+			ictx-&gt;zero_point = fend;</div><div class='add'>+</div><div class='add'>+		folio_detach_private(folio);</div><div class='add'>+		group = finfo-&gt;netfs_group;</div><div class='add'>+		gcount++;</div><div class='add'>+		kfree(finfo);</div><div class='add'>+		why = netfs_folio_trace_clear_s;</div><div class='add'>+		goto end_wb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((group = netfs_folio_group(folio))) {</div><div class='add'>+		if (group == NETFS_FOLIO_COPY_TO_CACHE) {</div><div class='add'>+			why = netfs_folio_trace_clear_cc;</div><div class='add'>+			folio_detach_private(folio);</div><div class='add'>+			goto end_wb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Need to detach the group pointer if the page didn't get</div><div class='add'>+		 * redirtied.  If it has been redirtied, then it must be within</div><div class='add'>+		 * the same group.</div><div class='add'>+		 */</div><div class='add'>+		why = netfs_folio_trace_redirtied;</div><div class='add'>+		if (!folio_test_dirty(folio)) {</div><div class='add'>+			folio_detach_private(folio);</div><div class='add'>+			gcount++;</div><div class='add'>+			why = netfs_folio_trace_clear_g;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end_wb:</div><div class='add'>+	trace_netfs_folio(folio, why);</div><div class='add'>+	folio_end_writeback(folio);</div><div class='add'>+	return gcount;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unlock any folios we've finished with.</div><div class='add'>+ */</div><div class='add'>+static void netfs_writeback_unlock_folios(struct netfs_io_request *wreq,</div><div class='add'>+					  unsigned int *notes)</div><div class='add'>+{</div><div class='add'>+	struct folio_queue *folioq = wreq-&gt;buffer.tail;</div><div class='add'>+	unsigned long long collected_to = wreq-&gt;collected_to;</div><div class='add'>+	unsigned int slot = wreq-&gt;buffer.first_tail_slot;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!folioq)) {</div><div class='add'>+		pr_err("[!] Writeback unlock found empty rolling buffer!\n");</div><div class='add'>+		netfs_dump_request(wreq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;origin == NETFS_PGPRIV2_COPY_TO_CACHE) {</div><div class='add'>+		if (netfs_pgpriv2_unlock_copied_folios(wreq))</div><div class='add'>+			*notes |= MADE_PROGRESS;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+		folioq = rolling_buffer_delete_spent(&amp;wreq-&gt;buffer);</div><div class='add'>+		if (!folioq)</div><div class='add'>+			return;</div><div class='add'>+		slot = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		struct netfs_folio *finfo;</div><div class='add'>+		unsigned long long fpos, fend;</div><div class='add'>+		size_t fsize, flen;</div><div class='add'>+</div><div class='add'>+		folio = folioq_folio(folioq, slot);</div><div class='add'>+		if (WARN_ONCE(!folio_test_writeback(folio),</div><div class='add'>+			      "R=%08x: folio %lx is not under writeback\n",</div><div class='add'>+			      wreq-&gt;debug_id, folio-&gt;index))</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_not_under_wback);</div><div class='add'>+</div><div class='add'>+		fpos = folio_pos(folio);</div><div class='add'>+		fsize = folio_size(folio);</div><div class='add'>+		finfo = netfs_folio_info(folio);</div><div class='add'>+		flen = finfo ? finfo-&gt;dirty_offset + finfo-&gt;dirty_len : fsize;</div><div class='add'>+</div><div class='add'>+		fend = min_t(unsigned long long, fpos + flen, wreq-&gt;i_size);</div><div class='add'>+</div><div class='add'>+		trace_netfs_collect_folio(wreq, folio, fend, collected_to);</div><div class='add'>+</div><div class='add'>+		/* Unlock any folio we've transferred all of. */</div><div class='add'>+		if (collected_to &lt; fend)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wreq-&gt;nr_group_rel += netfs_folio_written_back(folio);</div><div class='add'>+		wreq-&gt;cleaned_to = fpos + fsize;</div><div class='add'>+		*notes |= MADE_PROGRESS;</div><div class='add'>+</div><div class='add'>+		/* Clean up the head folioq.  If we clear an entire folioq, then</div><div class='add'>+		 * we can get rid of it provided it's not also the tail folioq</div><div class='add'>+		 * being filled by the issuer.</div><div class='add'>+		 */</div><div class='add'>+		folioq_clear(folioq, slot);</div><div class='add'>+		slot++;</div><div class='add'>+		if (slot &gt;= folioq_nr_slots(folioq)) {</div><div class='add'>+			folioq = rolling_buffer_delete_spent(&amp;wreq-&gt;buffer);</div><div class='add'>+			if (!folioq)</div><div class='add'>+				goto done;</div><div class='add'>+			slot = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (fpos + fsize &gt;= collected_to)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wreq-&gt;buffer.tail = folioq;</div><div class='add'>+done:</div><div class='add'>+	wreq-&gt;buffer.first_tail_slot = slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Collect and assess the results of various write subrequests.  We may need to</div><div class='add'>+ * retry some of the results - or even do an RMW cycle for content crypto.</div><div class='add'>+ *</div><div class='add'>+ * Note that we have a number of parallel, overlapping lists of subrequests,</div><div class='add'>+ * one to the server and one to the local cache for example, which may not be</div><div class='add'>+ * the same size or starting position and may not even correspond in boundary</div><div class='add'>+ * alignment.</div><div class='add'>+ */</div><div class='add'>+static void netfs_collect_write_results(struct netfs_io_request *wreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *front, *remove;</div><div class='add'>+	struct netfs_io_stream *stream;</div><div class='add'>+	unsigned long long collected_to, issued_to;</div><div class='add'>+	unsigned int notes;</div><div class='add'>+	int s;</div><div class='add'>+</div><div class='add'>+	_enter("%llx-%llx", wreq-&gt;start, wreq-&gt;start + wreq-&gt;len);</div><div class='add'>+	trace_netfs_collect(wreq);</div><div class='add'>+	trace_netfs_rreq(wreq, netfs_rreq_trace_collect);</div><div class='add'>+</div><div class='add'>+reassess_streams:</div><div class='add'>+	issued_to = atomic64_read(&amp;wreq-&gt;issued_to);</div><div class='add'>+	smp_rmb();</div><div class='add'>+	collected_to = ULLONG_MAX;</div><div class='add'>+	if (wreq-&gt;origin == NETFS_WRITEBACK ||</div><div class='add'>+	    wreq-&gt;origin == NETFS_WRITETHROUGH ||</div><div class='add'>+	    wreq-&gt;origin == NETFS_PGPRIV2_COPY_TO_CACHE)</div><div class='add'>+		notes = NEED_UNLOCK;</div><div class='add'>+	else</div><div class='add'>+		notes = 0;</div><div class='add'>+</div><div class='add'>+	/* Remove completed subrequests from the front of the streams and</div><div class='add'>+	 * advance the completion point on each stream.  We stop when we hit</div><div class='add'>+	 * something that's in progress.  The issuer thread may be adding stuff</div><div class='add'>+	 * to the tail whilst we're doing this.</div><div class='add'>+	 */</div><div class='add'>+	for (s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		/* Read active flag before list pointers */</div><div class='add'>+		if (!smp_load_acquire(&amp;stream-&gt;active))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		front = stream-&gt;front;</div><div class='add'>+		while (front) {</div><div class='add'>+			trace_netfs_collect_sreq(wreq, front);</div><div class='add'>+			//_debug("sreq [%x] %llx %zx/%zx",</div><div class='add'>+			//       front-&gt;debug_index, front-&gt;start, front-&gt;transferred, front-&gt;len);</div><div class='add'>+</div><div class='add'>+			if (stream-&gt;collected_to &lt; front-&gt;start) {</div><div class='add'>+				trace_netfs_collect_gap(wreq, stream, issued_to, 'F');</div><div class='add'>+				stream-&gt;collected_to = front-&gt;start;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Stall if the front is still undergoing I/O. */</div><div class='add'>+			if (netfs_check_subreq_in_progress(front)) {</div><div class='add'>+				notes |= HIT_PENDING;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			smp_rmb(); /* Read counters after I-P flag. */</div><div class='add'>+</div><div class='add'>+			if (stream-&gt;failed) {</div><div class='add'>+				stream-&gt;collected_to = front-&gt;start + front-&gt;len;</div><div class='add'>+				notes |= MADE_PROGRESS | SAW_FAILURE;</div><div class='add'>+				goto cancel;</div><div class='add'>+			}</div><div class='add'>+			if (front-&gt;start + front-&gt;transferred &gt; stream-&gt;collected_to) {</div><div class='add'>+				stream-&gt;collected_to = front-&gt;start + front-&gt;transferred;</div><div class='add'>+				stream-&gt;transferred = stream-&gt;collected_to - wreq-&gt;start;</div><div class='add'>+				stream-&gt;transferred_valid = true;</div><div class='add'>+				notes |= MADE_PROGRESS;</div><div class='add'>+			}</div><div class='add'>+			if (test_bit(NETFS_SREQ_FAILED, &amp;front-&gt;flags)) {</div><div class='add'>+				stream-&gt;failed = true;</div><div class='add'>+				stream-&gt;error = front-&gt;error;</div><div class='add'>+				if (stream-&gt;source == NETFS_UPLOAD_TO_SERVER)</div><div class='add'>+					mapping_set_error(wreq-&gt;mapping, front-&gt;error);</div><div class='add'>+				notes |= NEED_REASSESS | SAW_FAILURE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (front-&gt;transferred &lt; front-&gt;len) {</div><div class='add'>+				stream-&gt;need_retry = true;</div><div class='add'>+				notes |= NEED_RETRY | MADE_PROGRESS;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		cancel:</div><div class='add'>+			/* Remove if completely consumed. */</div><div class='add'>+			spin_lock(&amp;wreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+			remove = front;</div><div class='add'>+			list_del_init(&amp;front-&gt;rreq_link);</div><div class='add'>+			front = list_first_entry_or_null(&amp;stream-&gt;subrequests,</div><div class='add'>+							 struct netfs_io_subrequest, rreq_link);</div><div class='add'>+			stream-&gt;front = front;</div><div class='add'>+			spin_unlock(&amp;wreq-&gt;lock);</div><div class='add'>+			netfs_put_subrequest(remove,</div><div class='add'>+					     notes &amp; SAW_FAILURE ?</div><div class='add'>+					     netfs_sreq_trace_put_cancel :</div><div class='add'>+					     netfs_sreq_trace_put_done);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we have an empty stream, we need to jump it forward</div><div class='add'>+		 * otherwise the collection point will never advance.</div><div class='add'>+		 */</div><div class='add'>+		if (!front &amp;&amp; issued_to &gt; stream-&gt;collected_to) {</div><div class='add'>+			trace_netfs_collect_gap(wreq, stream, issued_to, 'E');</div><div class='add'>+			stream-&gt;collected_to = issued_to;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (stream-&gt;collected_to &lt; collected_to)</div><div class='add'>+			collected_to = stream-&gt;collected_to;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (collected_to != ULLONG_MAX &amp;&amp; collected_to &gt; wreq-&gt;collected_to)</div><div class='add'>+		wreq-&gt;collected_to = collected_to;</div><div class='add'>+</div><div class='add'>+	for (s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		if (stream-&gt;active)</div><div class='add'>+			trace_netfs_collect_stream(wreq, stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_collect_state(wreq, wreq-&gt;collected_to, notes);</div><div class='add'>+</div><div class='add'>+	/* Unlock any folios that we have now finished with. */</div><div class='add'>+	if (notes &amp; NEED_UNLOCK) {</div><div class='add'>+		if (wreq-&gt;cleaned_to &lt; wreq-&gt;collected_to)</div><div class='add'>+			netfs_writeback_unlock_folios(wreq, &amp;notes);</div><div class='add'>+	} else {</div><div class='add'>+		wreq-&gt;cleaned_to = wreq-&gt;collected_to;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// TODO: Discard encryption buffers</div><div class='add'>+</div><div class='add'>+	if (notes &amp; NEED_RETRY)</div><div class='add'>+		goto need_retry;</div><div class='add'>+</div><div class='add'>+	if (notes &amp; MADE_PROGRESS) {</div><div class='add'>+		netfs_wake_rreq_flag(wreq, NETFS_RREQ_PAUSE, netfs_rreq_trace_unpause);</div><div class='add'>+		//cond_resched();</div><div class='add'>+		goto reassess_streams;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (notes &amp; NEED_REASSESS) {</div><div class='add'>+		//cond_resched();</div><div class='add'>+		goto reassess_streams;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	netfs_put_group_many(wreq-&gt;group, wreq-&gt;nr_group_rel);</div><div class='add'>+	wreq-&gt;nr_group_rel = 0;</div><div class='add'>+	_leave(" = %x", notes);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+need_retry:</div><div class='add'>+	/* Okay...  We're going to have to retry one or both streams.  Note</div><div class='add'>+	 * that any partially completed op will have had any wholly transferred</div><div class='add'>+	 * folios removed from it.</div><div class='add'>+	 */</div><div class='add'>+	_debug("retry");</div><div class='add'>+	netfs_retry_writes(wreq);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform the collection of subrequests, folios and encryption buffers.</div><div class='add'>+ */</div><div class='add'>+bool netfs_write_collection(struct netfs_io_request *wreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(wreq-&gt;inode);</div><div class='add'>+	size_t transferred;</div><div class='add'>+	bool transferred_valid = false;</div><div class='add'>+	int s;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x", wreq-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	netfs_collect_write_results(wreq);</div><div class='add'>+</div><div class='add'>+	/* We're done when the app thread has finished posting subreqs and all</div><div class='add'>+	 * the queues in all the streams are empty.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(NETFS_RREQ_ALL_QUEUED, &amp;wreq-&gt;flags))</div><div class='add'>+		return false;</div><div class='add'>+	smp_rmb(); /* Read ALL_QUEUED before lists. */</div><div class='add'>+</div><div class='add'>+	transferred = LONG_MAX;</div><div class='add'>+	for (s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		struct netfs_io_stream *stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		if (!stream-&gt;active)</div><div class='add'>+			continue;</div><div class='add'>+		if (!list_empty(&amp;stream-&gt;subrequests))</div><div class='add'>+			return false;</div><div class='add'>+		if (stream-&gt;transferred_valid &amp;&amp;</div><div class='add'>+		    stream-&gt;transferred &lt; transferred) {</div><div class='add'>+			transferred = stream-&gt;transferred;</div><div class='add'>+			transferred_valid = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Okay, declare that all I/O is complete. */</div><div class='add'>+	if (transferred_valid)</div><div class='add'>+		wreq-&gt;transferred = transferred;</div><div class='add'>+	trace_netfs_rreq(wreq, netfs_rreq_trace_write_done);</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;io_streams[1].active &amp;&amp;</div><div class='add'>+	    wreq-&gt;io_streams[1].failed &amp;&amp;</div><div class='add'>+	    ictx-&gt;ops-&gt;invalidate_cache) {</div><div class='add'>+		/* Cache write failure doesn't prevent writeback completion</div><div class='add'>+		 * unless we're in disconnected mode.</div><div class='add'>+		 */</div><div class='add'>+		ictx-&gt;ops-&gt;invalidate_cache(wreq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((wreq-&gt;origin == NETFS_UNBUFFERED_WRITE ||</div><div class='add'>+	     wreq-&gt;origin == NETFS_DIO_WRITE) &amp;&amp;</div><div class='add'>+	    !wreq-&gt;error)</div><div class='add'>+		netfs_update_i_size(ictx, &amp;ictx-&gt;inode, wreq-&gt;start, wreq-&gt;transferred);</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;origin == NETFS_DIO_WRITE &amp;&amp;</div><div class='add'>+	    wreq-&gt;mapping-&gt;nrpages) {</div><div class='add'>+		/* mmap may have got underfoot and we may now have folios</div><div class='add'>+		 * locally covering the region we just wrote.  Attempt to</div><div class='add'>+		 * discard the folios, but leave in place any modified locally.</div><div class='add'>+		 * -&gt;write_iter() is prevented from interfering by the DIO</div><div class='add'>+		 * counter.</div><div class='add'>+		 */</div><div class='add'>+		pgoff_t first = wreq-&gt;start &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		pgoff_t last = (wreq-&gt;start + wreq-&gt;transferred - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		invalidate_inode_pages2_range(wreq-&gt;mapping, first, last);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;origin == NETFS_DIO_WRITE)</div><div class='add'>+		inode_dio_end(wreq-&gt;inode);</div><div class='add'>+</div><div class='add'>+	_debug("finished");</div><div class='add'>+	netfs_wake_rreq_flag(wreq, NETFS_RREQ_IN_PROGRESS, netfs_rreq_trace_wake_ip);</div><div class='add'>+	/* As we cleared NETFS_RREQ_IN_PROGRESS, we acquired its ref. */</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;iocb) {</div><div class='add'>+		size_t written = min(wreq-&gt;transferred, wreq-&gt;len);</div><div class='add'>+		wreq-&gt;iocb-&gt;ki_pos += written;</div><div class='add'>+		if (wreq-&gt;iocb-&gt;ki_complete) {</div><div class='add'>+			trace_netfs_rreq(wreq, netfs_rreq_trace_ki_complete);</div><div class='add'>+			wreq-&gt;iocb-&gt;ki_complete(</div><div class='add'>+				wreq-&gt;iocb, wreq-&gt;error ? wreq-&gt;error : written);</div><div class='add'>+		}</div><div class='add'>+		wreq-&gt;iocb = VFS_PTR_POISON;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netfs_clear_subrequests(wreq);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_write_collection_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work);</div><div class='add'>+</div><div class='add'>+	netfs_see_request(rreq, netfs_rreq_trace_see_work);</div><div class='add'>+	if (netfs_check_rreq_in_progress(rreq)) {</div><div class='add'>+		if (netfs_write_collection(rreq))</div><div class='add'>+			/* Drop the ref from the IN_PROGRESS flag. */</div><div class='add'>+			netfs_put_request(rreq, netfs_rreq_trace_put_work_ip);</div><div class='add'>+		else</div><div class='add'>+			netfs_see_request(rreq, netfs_rreq_trace_see_work_complete);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_write_subrequest_terminated - Note the termination of a write operation.</div><div class='add'>+ * @_op: The I/O request that has terminated.</div><div class='add'>+ * @transferred_or_error: The amount of data transferred or an error code.</div><div class='add'>+ *</div><div class='add'>+ * This tells the library that a contributory write I/O operation has</div><div class='add'>+ * terminated, one way or another, and that it should collect the results.</div><div class='add'>+ *</div><div class='add'>+ * The caller indicates in @transferred_or_error the outcome of the operation,</div><div class='add'>+ * supplying a positive value to indicate the number of bytes transferred or a</div><div class='add'>+ * negative error code.  The library will look after reissuing I/O operations</div><div class='add'>+ * as appropriate and writing downloaded data to the cache.</div><div class='add'>+ *</div><div class='add'>+ * When this is called, ownership of the subrequest is transferred back to the</div><div class='add'>+ * library, along with a ref.</div><div class='add'>+ *</div><div class='add'>+ * Note that %_op is a void* so that the function can be passed to</div><div class='add'>+ * kiocb::term_func without the need for a casting wrapper.</div><div class='add'>+ */</div><div class='add'>+void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq = _op;</div><div class='add'>+	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='add'>+</div><div class='add'>+	_enter("%x[%x] %zd", wreq-&gt;debug_id, subreq-&gt;debug_index, transferred_or_error);</div><div class='add'>+</div><div class='add'>+	switch (subreq-&gt;source) {</div><div class='add'>+	case NETFS_UPLOAD_TO_SERVER:</div><div class='add'>+		netfs_stat(&amp;netfs_n_wh_upload_done);</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_WRITE_TO_CACHE:</div><div class='add'>+		netfs_stat(&amp;netfs_n_wh_write_done);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_VALUE(transferred_or_error)) {</div><div class='add'>+		subreq-&gt;error = transferred_or_error;</div><div class='add'>+		if (subreq-&gt;error == -EAGAIN)</div><div class='add'>+			set_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+		else</div><div class='add'>+			set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+		trace_netfs_failure(wreq, subreq, transferred_or_error, netfs_fail_write);</div><div class='add'>+</div><div class='add'>+		switch (subreq-&gt;source) {</div><div class='add'>+		case NETFS_WRITE_TO_CACHE:</div><div class='add'>+			netfs_stat(&amp;netfs_n_wh_write_failed);</div><div class='add'>+			break;</div><div class='add'>+		case NETFS_UPLOAD_TO_SERVER:</div><div class='add'>+			netfs_stat(&amp;netfs_n_wh_upload_failed);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		trace_netfs_rreq(wreq, netfs_rreq_trace_set_pause);</div><div class='add'>+		set_bit(NETFS_RREQ_PAUSE, &amp;wreq-&gt;flags);</div><div class='add'>+	} else {</div><div class='add'>+		if (WARN(transferred_or_error &gt; subreq-&gt;len - subreq-&gt;transferred,</div><div class='add'>+			 "Subreq excess write: R=%x[%x] %zd &gt; %zu - %zu",</div><div class='add'>+			 wreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='add'>+			 transferred_or_error, subreq-&gt;len, subreq-&gt;transferred))</div><div class='add'>+			transferred_or_error = subreq-&gt;len - subreq-&gt;transferred;</div><div class='add'>+</div><div class='add'>+		subreq-&gt;error = 0;</div><div class='add'>+		subreq-&gt;transferred += transferred_or_error;</div><div class='add'>+</div><div class='add'>+		if (subreq-&gt;transferred &lt; subreq-&gt;len)</div><div class='add'>+			set_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);</div><div class='add'>+	netfs_subreq_clear_in_progress(subreq);</div><div class='add'>+	netfs_put_subrequest(subreq, netfs_sreq_trace_put_terminated);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_write_subrequest_terminated);</div><div class='head'>diff --git a/fs/netfs/write_issue.c b/fs/netfs/write_issue.c<br/>new file mode 100644<br/>index 000000000000..dd8743bc8d7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/write_issue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/write_issue.c</a></div><div class='hunk'>@@ -0,0 +1,926 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Network filesystem high-level (buffered) writeback.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * To support network filesystems with local caching, we manage a situation</div><div class='add'>+ * that can be envisioned like the following:</div><div class='add'>+ *</div><div class='add'>+ *               +---+---+-----+-----+---+----------+</div><div class='add'>+ *    Folios:    |   |   |     |     |   |          |</div><div class='add'>+ *               +---+---+-----+-----+---+----------+</div><div class='add'>+ *</div><div class='add'>+ *                 +------+------+     +----+----+</div><div class='add'>+ *    Upload:      |      |      |.....|    |    |</div><div class='add'>+ *  (Stream 0)     +------+------+     +----+----+</div><div class='add'>+ *</div><div class='add'>+ *               +------+------+------+------+------+</div><div class='add'>+ *    Cache:     |      |      |      |      |      |</div><div class='add'>+ *  (Stream 1)   +------+------+------+------+------+</div><div class='add'>+ *</div><div class='add'>+ * Where we have a sequence of folios of varying sizes that we need to overlay</div><div class='add'>+ * with multiple parallel streams of I/O requests, where the I/O requests in a</div><div class='add'>+ * stream may also be of various sizes (in cifs, for example, the sizes are</div><div class='add'>+ * negotiated with the server; in something like ceph, they may represent the</div><div class='add'>+ * sizes of storage objects).</div><div class='add'>+ *</div><div class='add'>+ * The sequence in each stream may contain gaps and noncontiguous subrequests</div><div class='add'>+ * may be glued together into single vectored write RPCs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Kill all dirty folios in the event of an unrecoverable error, starting with</div><div class='add'>+ * a locked folio we've already obtained from writeback_iter().</div><div class='add'>+ */</div><div class='add'>+static void netfs_kill_dirty_pages(struct address_space *mapping,</div><div class='add'>+				   struct writeback_control *wbc,</div><div class='add'>+				   struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		enum netfs_folio_trace why = netfs_folio_trace_kill;</div><div class='add'>+		struct netfs_group *group = NULL;</div><div class='add'>+		struct netfs_folio *finfo = NULL;</div><div class='add'>+		void *priv;</div><div class='add'>+</div><div class='add'>+		priv = folio_detach_private(folio);</div><div class='add'>+		if (priv) {</div><div class='add'>+			finfo = __netfs_folio_info(priv);</div><div class='add'>+			if (finfo) {</div><div class='add'>+				/* Kill folio from streaming write. */</div><div class='add'>+				group = finfo-&gt;netfs_group;</div><div class='add'>+				why = netfs_folio_trace_kill_s;</div><div class='add'>+			} else {</div><div class='add'>+				group = priv;</div><div class='add'>+				if (group == NETFS_FOLIO_COPY_TO_CACHE) {</div><div class='add'>+					/* Kill copy-to-cache folio */</div><div class='add'>+					why = netfs_folio_trace_kill_cc;</div><div class='add'>+					group = NULL;</div><div class='add'>+				} else {</div><div class='add'>+					/* Kill folio with group */</div><div class='add'>+					why = netfs_folio_trace_kill_g;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		trace_netfs_folio(folio, why);</div><div class='add'>+</div><div class='add'>+		folio_start_writeback(folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_end_writeback(folio);</div><div class='add'>+</div><div class='add'>+		netfs_put_group(group);</div><div class='add'>+		kfree(finfo);</div><div class='add'>+</div><div class='add'>+	} while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a write request and set it up appropriately for the origin type.</div><div class='add'>+ */</div><div class='add'>+struct netfs_io_request *netfs_create_write_req(struct address_space *mapping,</div><div class='add'>+						struct file *file,</div><div class='add'>+						loff_t start,</div><div class='add'>+						enum netfs_io_origin origin)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq;</div><div class='add'>+	struct netfs_inode *ictx;</div><div class='add'>+	bool is_cacheable = (origin == NETFS_WRITEBACK ||</div><div class='add'>+			     origin == NETFS_WRITEBACK_SINGLE ||</div><div class='add'>+			     origin == NETFS_WRITETHROUGH ||</div><div class='add'>+			     origin == NETFS_PGPRIV2_COPY_TO_CACHE);</div><div class='add'>+</div><div class='add'>+	wreq = netfs_alloc_request(mapping, file, start, 0, origin);</div><div class='add'>+	if (IS_ERR(wreq))</div><div class='add'>+		return wreq;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x", wreq-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	ictx = netfs_inode(wreq-&gt;inode);</div><div class='add'>+	if (is_cacheable &amp;&amp; netfs_is_cache_enabled(ictx))</div><div class='add'>+		fscache_begin_write_operation(&amp;wreq-&gt;cache_resources, netfs_i_cookie(ictx));</div><div class='add'>+	if (rolling_buffer_init(&amp;wreq-&gt;buffer, wreq-&gt;debug_id, ITER_SOURCE) &lt; 0)</div><div class='add'>+		goto nomem;</div><div class='add'>+</div><div class='add'>+	wreq-&gt;cleaned_to = wreq-&gt;start;</div><div class='add'>+</div><div class='add'>+	wreq-&gt;io_streams[0].stream_nr		= 0;</div><div class='add'>+	wreq-&gt;io_streams[0].source		= NETFS_UPLOAD_TO_SERVER;</div><div class='add'>+	wreq-&gt;io_streams[0].prepare_write	= ictx-&gt;ops-&gt;prepare_write;</div><div class='add'>+	wreq-&gt;io_streams[0].issue_write		= ictx-&gt;ops-&gt;issue_write;</div><div class='add'>+	wreq-&gt;io_streams[0].collected_to	= start;</div><div class='add'>+	wreq-&gt;io_streams[0].transferred		= 0;</div><div class='add'>+</div><div class='add'>+	wreq-&gt;io_streams[1].stream_nr		= 1;</div><div class='add'>+	wreq-&gt;io_streams[1].source		= NETFS_WRITE_TO_CACHE;</div><div class='add'>+	wreq-&gt;io_streams[1].collected_to	= start;</div><div class='add'>+	wreq-&gt;io_streams[1].transferred		= 0;</div><div class='add'>+	if (fscache_resources_valid(&amp;wreq-&gt;cache_resources)) {</div><div class='add'>+		wreq-&gt;io_streams[1].avail	= true;</div><div class='add'>+		wreq-&gt;io_streams[1].active	= true;</div><div class='add'>+		wreq-&gt;io_streams[1].prepare_write = wreq-&gt;cache_resources.ops-&gt;prepare_write_subreq;</div><div class='add'>+		wreq-&gt;io_streams[1].issue_write = wreq-&gt;cache_resources.ops-&gt;issue_write;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return wreq;</div><div class='add'>+nomem:</div><div class='add'>+	netfs_put_failed_request(wreq);</div><div class='add'>+	return ERR_PTR(-ENOMEM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_prepare_write_failed - Note write preparation failed</div><div class='add'>+ * @subreq: The subrequest to mark</div><div class='add'>+ *</div><div class='add'>+ * Mark a subrequest to note that preparation for write failed.</div><div class='add'>+ */</div><div class='add'>+void netfs_prepare_write_failed(struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	__set_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags);</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_prep_failed);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_prepare_write_failed);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prepare a write subrequest.  We need to allocate a new subrequest</div><div class='add'>+ * if we don't have one.</div><div class='add'>+ */</div><div class='add'>+static void netfs_prepare_write(struct netfs_io_request *wreq,</div><div class='add'>+				struct netfs_io_stream *stream,</div><div class='add'>+				loff_t start)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq;</div><div class='add'>+	struct iov_iter *wreq_iter = &amp;wreq-&gt;buffer.iter;</div><div class='add'>+</div><div class='add'>+	/* Make sure we don't point the iterator at a used-up folio_queue</div><div class='add'>+	 * struct being used as a placeholder to prevent the queue from</div><div class='add'>+	 * collapsing.  In such a case, extend the queue.</div><div class='add'>+	 */</div><div class='add'>+	if (iov_iter_is_folioq(wreq_iter) &amp;&amp;</div><div class='add'>+	    wreq_iter-&gt;folioq_slot &gt;= folioq_nr_slots(wreq_iter-&gt;folioq))</div><div class='add'>+		rolling_buffer_make_space(&amp;wreq-&gt;buffer);</div><div class='add'>+</div><div class='add'>+	subreq = netfs_alloc_subrequest(wreq);</div><div class='add'>+	subreq-&gt;source		= stream-&gt;source;</div><div class='add'>+	subreq-&gt;start		= start;</div><div class='add'>+	subreq-&gt;stream_nr	= stream-&gt;stream_nr;</div><div class='add'>+	subreq-&gt;io_iter		= *wreq_iter;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x[%x]", wreq-&gt;debug_id, subreq-&gt;debug_index);</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);</div><div class='add'>+</div><div class='add'>+	stream-&gt;sreq_max_len	= UINT_MAX;</div><div class='add'>+	stream-&gt;sreq_max_segs	= INT_MAX;</div><div class='add'>+	switch (stream-&gt;source) {</div><div class='add'>+	case NETFS_UPLOAD_TO_SERVER:</div><div class='add'>+		netfs_stat(&amp;netfs_n_wh_upload);</div><div class='add'>+		stream-&gt;sreq_max_len = wreq-&gt;wsize;</div><div class='add'>+		break;</div><div class='add'>+	case NETFS_WRITE_TO_CACHE:</div><div class='add'>+		netfs_stat(&amp;netfs_n_wh_write);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;prepare_write)</div><div class='add'>+		stream-&gt;prepare_write(subreq);</div><div class='add'>+</div><div class='add'>+	__set_bit(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* We add to the end of the list whilst the collector may be walking</div><div class='add'>+	 * the list.  The collector only goes nextwards and uses the lock to</div><div class='add'>+	 * remove entries off of the front.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;wreq-&gt;lock);</div><div class='add'>+	list_add_tail(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests);</div><div class='add'>+	if (list_is_first(&amp;subreq-&gt;rreq_link, &amp;stream-&gt;subrequests)) {</div><div class='add'>+		stream-&gt;front = subreq;</div><div class='add'>+		if (!stream-&gt;active) {</div><div class='add'>+			stream-&gt;collected_to = stream-&gt;front-&gt;start;</div><div class='add'>+			/* Write list pointers before active flag */</div><div class='add'>+			smp_store_release(&amp;stream-&gt;active, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;wreq-&gt;lock);</div><div class='add'>+</div><div class='add'>+	stream-&gt;construct = subreq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the I/O iterator for the filesystem/cache to use and dispatch the I/O</div><div class='add'>+ * operation.  The operation may be asynchronous and should call</div><div class='add'>+ * netfs_write_subrequest_terminated() when complete.</div><div class='add'>+ */</div><div class='add'>+static void netfs_do_issue_write(struct netfs_io_stream *stream,</div><div class='add'>+				 struct netfs_io_subrequest *subreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq = subreq-&gt;rreq;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x[%x],%zx", wreq-&gt;debug_id, subreq-&gt;debug_index, subreq-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (test_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags))</div><div class='add'>+		return netfs_write_subrequest_terminated(subreq, subreq-&gt;error);</div><div class='add'>+</div><div class='add'>+	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);</div><div class='add'>+	stream-&gt;issue_write(subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_reissue_write(struct netfs_io_stream *stream,</div><div class='add'>+			 struct netfs_io_subrequest *subreq,</div><div class='add'>+			 struct iov_iter *source)</div><div class='add'>+{</div><div class='add'>+	size_t size = subreq-&gt;len - subreq-&gt;transferred;</div><div class='add'>+</div><div class='add'>+	// TODO: Use encrypted buffer</div><div class='add'>+	subreq-&gt;io_iter = *source;</div><div class='add'>+	iov_iter_advance(source, size);</div><div class='add'>+	iov_iter_truncate(&amp;subreq-&gt;io_iter, size);</div><div class='add'>+</div><div class='add'>+	subreq-&gt;retry_count++;</div><div class='add'>+	__clear_bit(NETFS_SREQ_MADE_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	__set_bit(NETFS_SREQ_IN_PROGRESS, &amp;subreq-&gt;flags);</div><div class='add'>+	netfs_stat(&amp;netfs_n_wh_retry_write_subreq);</div><div class='add'>+	netfs_do_issue_write(stream, subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netfs_issue_write(struct netfs_io_request *wreq,</div><div class='add'>+		       struct netfs_io_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq = stream-&gt;construct;</div><div class='add'>+</div><div class='add'>+	if (!subreq)</div><div class='add'>+		return;</div><div class='add'>+	stream-&gt;construct = NULL;</div><div class='add'>+	subreq-&gt;io_iter.count = subreq-&gt;len;</div><div class='add'>+	netfs_do_issue_write(stream, subreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add data to the write subrequest, dispatching each as we fill it up or if it</div><div class='add'>+ * is discontiguous with the previous.  We only fill one part at a time so that</div><div class='add'>+ * we can avoid overrunning the credits obtained (cifs) and try to parallelise</div><div class='add'>+ * content-crypto preparation with network writes.</div><div class='add'>+ */</div><div class='add'>+size_t netfs_advance_write(struct netfs_io_request *wreq,</div><div class='add'>+			   struct netfs_io_stream *stream,</div><div class='add'>+			   loff_t start, size_t len, bool to_eof)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_subrequest *subreq = stream-&gt;construct;</div><div class='add'>+	size_t part;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;avail) {</div><div class='add'>+		_leave("no write");</div><div class='add'>+		return len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_enter("R=%x[%x]", wreq-&gt;debug_id, subreq ? subreq-&gt;debug_index : 0);</div><div class='add'>+</div><div class='add'>+	if (subreq &amp;&amp; start != subreq-&gt;start + subreq-&gt;len) {</div><div class='add'>+		netfs_issue_write(wreq, stream);</div><div class='add'>+		subreq = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;construct)</div><div class='add'>+		netfs_prepare_write(wreq, stream, start);</div><div class='add'>+	subreq = stream-&gt;construct;</div><div class='add'>+</div><div class='add'>+	part = umin(stream-&gt;sreq_max_len - subreq-&gt;len, len);</div><div class='add'>+	_debug("part %zx/%zx %zx/%zx", subreq-&gt;len, stream-&gt;sreq_max_len, part, len);</div><div class='add'>+	subreq-&gt;len += part;</div><div class='add'>+	subreq-&gt;nr_segs++;</div><div class='add'>+	stream-&gt;submit_extendable_to -= part;</div><div class='add'>+</div><div class='add'>+	if (subreq-&gt;len &gt;= stream-&gt;sreq_max_len ||</div><div class='add'>+	    subreq-&gt;nr_segs &gt;= stream-&gt;sreq_max_segs ||</div><div class='add'>+	    to_eof) {</div><div class='add'>+		netfs_issue_write(wreq, stream);</div><div class='add'>+		subreq = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return part;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write some of a pending folio data back to the server.</div><div class='add'>+ */</div><div class='add'>+static int netfs_write_folio(struct netfs_io_request *wreq,</div><div class='add'>+			     struct writeback_control *wbc,</div><div class='add'>+			     struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *upload = &amp;wreq-&gt;io_streams[0];</div><div class='add'>+	struct netfs_io_stream *cache  = &amp;wreq-&gt;io_streams[1];</div><div class='add'>+	struct netfs_io_stream *stream;</div><div class='add'>+	struct netfs_group *fgroup; /* TODO: Use this with ceph */</div><div class='add'>+	struct netfs_folio *finfo;</div><div class='add'>+	size_t iter_off = 0;</div><div class='add'>+	size_t fsize = folio_size(folio), flen = fsize, foff = 0;</div><div class='add'>+	loff_t fpos = folio_pos(folio), i_size;</div><div class='add'>+	bool to_eof = false, streamw = false;</div><div class='add'>+	bool debug = false;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	if (rolling_buffer_make_space(&amp;wreq-&gt;buffer) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* netfs_perform_write() may shift i_size around the page or from out</div><div class='add'>+	 * of the page to beyond it, but cannot move i_size into or through the</div><div class='add'>+	 * page since we have it locked.</div><div class='add'>+	 */</div><div class='add'>+	i_size = i_size_read(wreq-&gt;inode);</div><div class='add'>+</div><div class='add'>+	if (fpos &gt;= i_size) {</div><div class='add'>+		/* mmap beyond eof. */</div><div class='add'>+		_debug("beyond eof");</div><div class='add'>+		folio_start_writeback(folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		wreq-&gt;nr_group_rel += netfs_folio_written_back(folio);</div><div class='add'>+		netfs_put_group_many(wreq-&gt;group, wreq-&gt;nr_group_rel);</div><div class='add'>+		wreq-&gt;nr_group_rel = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fpos + fsize &gt; wreq-&gt;i_size)</div><div class='add'>+		wreq-&gt;i_size = i_size;</div><div class='add'>+</div><div class='add'>+	fgroup = netfs_folio_group(folio);</div><div class='add'>+	finfo = netfs_folio_info(folio);</div><div class='add'>+	if (finfo) {</div><div class='add'>+		foff = finfo-&gt;dirty_offset;</div><div class='add'>+		flen = foff + finfo-&gt;dirty_len;</div><div class='add'>+		streamw = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;origin == NETFS_WRITETHROUGH) {</div><div class='add'>+		to_eof = false;</div><div class='add'>+		if (flen &gt; i_size - fpos)</div><div class='add'>+			flen = i_size - fpos;</div><div class='add'>+	} else if (flen &gt; i_size - fpos) {</div><div class='add'>+		flen = i_size - fpos;</div><div class='add'>+		if (!streamw)</div><div class='add'>+			folio_zero_segment(folio, flen, fsize);</div><div class='add'>+		to_eof = true;</div><div class='add'>+	} else if (flen == i_size - fpos) {</div><div class='add'>+		to_eof = true;</div><div class='add'>+	}</div><div class='add'>+	flen -= foff;</div><div class='add'>+</div><div class='add'>+	_debug("folio %zx %zx %zx", foff, flen, fsize);</div><div class='add'>+</div><div class='add'>+	/* Deal with discontinuities in the stream of dirty pages.  These can</div><div class='add'>+	 * arise from a number of sources:</div><div class='add'>+	 *</div><div class='add'>+	 * (1) Intervening non-dirty pages from random-access writes, multiple</div><div class='add'>+	 *     flushers writing back different parts simultaneously and manual</div><div class='add'>+	 *     syncing.</div><div class='add'>+	 *</div><div class='add'>+	 * (2) Partially-written pages from write-streaming.</div><div class='add'>+	 *</div><div class='add'>+	 * (3) Pages that belong to a different write-back group (eg.  Ceph</div><div class='add'>+	 *     snapshots).</div><div class='add'>+	 *</div><div class='add'>+	 * (4) Actually-clean pages that were marked for write to the cache</div><div class='add'>+	 *     when they were read.  Note that these appear as a special</div><div class='add'>+	 *     write-back group.</div><div class='add'>+	 */</div><div class='add'>+	if (fgroup == NETFS_FOLIO_COPY_TO_CACHE) {</div><div class='add'>+		netfs_issue_write(wreq, upload);</div><div class='add'>+	} else if (fgroup != wreq-&gt;group) {</div><div class='add'>+		/* We can't write this page to the server yet. */</div><div class='add'>+		kdebug("wrong group");</div><div class='add'>+		folio_redirty_for_writepage(wbc, folio);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		netfs_issue_write(wreq, upload);</div><div class='add'>+		netfs_issue_write(wreq, cache);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (foff &gt; 0)</div><div class='add'>+		netfs_issue_write(wreq, upload);</div><div class='add'>+	if (streamw)</div><div class='add'>+		netfs_issue_write(wreq, cache);</div><div class='add'>+</div><div class='add'>+	/* Flip the page to the writeback state and unlock.  If we're called</div><div class='add'>+	 * from write-through, then the page has already been put into the wb</div><div class='add'>+	 * state.</div><div class='add'>+	 */</div><div class='add'>+	if (wreq-&gt;origin == NETFS_WRITEBACK)</div><div class='add'>+		folio_start_writeback(folio);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+</div><div class='add'>+	if (fgroup == NETFS_FOLIO_COPY_TO_CACHE) {</div><div class='add'>+		if (!cache-&gt;avail) {</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_cancel_copy);</div><div class='add'>+			netfs_issue_write(wreq, upload);</div><div class='add'>+			netfs_folio_written_back(folio);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_store_copy);</div><div class='add'>+	} else if (!upload-&gt;avail &amp;&amp; !cache-&gt;avail) {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_cancel_store);</div><div class='add'>+		netfs_folio_written_back(folio);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (!upload-&gt;construct) {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_store);</div><div class='add'>+	} else {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_store_plus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attach the folio to the rolling buffer. */</div><div class='add'>+	rolling_buffer_append(&amp;wreq-&gt;buffer, folio, 0);</div><div class='add'>+</div><div class='add'>+	/* Move the submission point forward to allow for write-streaming data</div><div class='add'>+	 * not starting at the front of the page.  We don't do write-streaming</div><div class='add'>+	 * with the cache as the cache requires DIO alignment.</div><div class='add'>+	 *</div><div class='add'>+	 * Also skip uploading for data that's been read and just needs copying</div><div class='add'>+	 * to the cache.</div><div class='add'>+	 */</div><div class='add'>+	for (int s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		stream-&gt;submit_off = foff;</div><div class='add'>+		stream-&gt;submit_len = flen;</div><div class='add'>+		if (!stream-&gt;avail ||</div><div class='add'>+		    (stream-&gt;source == NETFS_WRITE_TO_CACHE &amp;&amp; streamw) ||</div><div class='add'>+		    (stream-&gt;source == NETFS_UPLOAD_TO_SERVER &amp;&amp;</div><div class='add'>+		     fgroup == NETFS_FOLIO_COPY_TO_CACHE)) {</div><div class='add'>+			stream-&gt;submit_off = UINT_MAX;</div><div class='add'>+			stream-&gt;submit_len = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attach the folio to one or more subrequests.  For a big folio, we</div><div class='add'>+	 * could end up with thousands of subrequests if the wsize is small -</div><div class='add'>+	 * but we might need to wait during the creation of subrequests for</div><div class='add'>+	 * network resources (eg. SMB credits).</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		ssize_t part;</div><div class='add'>+		size_t lowest_off = ULONG_MAX;</div><div class='add'>+		int choose_s = -1;</div><div class='add'>+</div><div class='add'>+		/* Always add to the lowest-submitted stream first. */</div><div class='add'>+		for (int s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+			stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+			if (stream-&gt;submit_len &gt; 0 &amp;&amp;</div><div class='add'>+			    stream-&gt;submit_off &lt; lowest_off) {</div><div class='add'>+				lowest_off = stream-&gt;submit_off;</div><div class='add'>+				choose_s = s;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (choose_s &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[choose_s];</div><div class='add'>+</div><div class='add'>+		/* Advance the iterator(s). */</div><div class='add'>+		if (stream-&gt;submit_off &gt; iter_off) {</div><div class='add'>+			rolling_buffer_advance(&amp;wreq-&gt;buffer, stream-&gt;submit_off - iter_off);</div><div class='add'>+			iter_off = stream-&gt;submit_off;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		atomic64_set(&amp;wreq-&gt;issued_to, fpos + stream-&gt;submit_off);</div><div class='add'>+		stream-&gt;submit_extendable_to = fsize - stream-&gt;submit_off;</div><div class='add'>+		part = netfs_advance_write(wreq, stream, fpos + stream-&gt;submit_off,</div><div class='add'>+					   stream-&gt;submit_len, to_eof);</div><div class='add'>+		stream-&gt;submit_off += part;</div><div class='add'>+		if (part &gt; stream-&gt;submit_len)</div><div class='add'>+			stream-&gt;submit_len = 0;</div><div class='add'>+		else</div><div class='add'>+			stream-&gt;submit_len -= part;</div><div class='add'>+		if (part &gt; 0)</div><div class='add'>+			debug = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fsize &gt; iter_off)</div><div class='add'>+		rolling_buffer_advance(&amp;wreq-&gt;buffer, fsize - iter_off);</div><div class='add'>+	atomic64_set(&amp;wreq-&gt;issued_to, fpos + fsize);</div><div class='add'>+</div><div class='add'>+	if (!debug)</div><div class='add'>+		kdebug("R=%x: No submit", wreq-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	if (foff + flen &lt; fsize)</div><div class='add'>+		for (int s = 0; s &lt; NR_IO_STREAMS; s++)</div><div class='add'>+			netfs_issue_write(wreq, &amp;wreq-&gt;io_streams[s]);</div><div class='add'>+</div><div class='add'>+	_leave(" = 0");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * End the issuing of writes, letting the collector know we're done.</div><div class='add'>+ */</div><div class='add'>+static void netfs_end_issue_write(struct netfs_io_request *wreq)</div><div class='add'>+{</div><div class='add'>+	bool needs_poke = true;</div><div class='add'>+</div><div class='add'>+	smp_wmb(); /* Write subreq lists before ALL_QUEUED. */</div><div class='add'>+	set_bit(NETFS_RREQ_ALL_QUEUED, &amp;wreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	for (int s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		struct netfs_io_stream *stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+</div><div class='add'>+		if (!stream-&gt;active)</div><div class='add'>+			continue;</div><div class='add'>+		if (!list_empty(&amp;stream-&gt;subrequests))</div><div class='add'>+			needs_poke = false;</div><div class='add'>+		netfs_issue_write(wreq, stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (needs_poke)</div><div class='add'>+		netfs_wake_collector(wreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write some of the pending data back to the server</div><div class='add'>+ */</div><div class='add'>+int netfs_writepages(struct address_space *mapping,</div><div class='add'>+		     struct writeback_control *wbc)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(mapping-&gt;host);</div><div class='add'>+	struct netfs_io_request *wreq = NULL;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;ictx-&gt;wb_lock)) {</div><div class='add'>+		if (wbc-&gt;sync_mode == WB_SYNC_NONE) {</div><div class='add'>+			netfs_stat(&amp;netfs_n_wb_lock_skip);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		netfs_stat(&amp;netfs_n_wb_lock_wait);</div><div class='add'>+		mutex_lock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Need the first folio to be able to set up the op. */</div><div class='add'>+	folio = writeback_iter(mapping, wbc, NULL, &amp;error);</div><div class='add'>+	if (!folio)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	wreq = netfs_create_write_req(mapping, NULL, folio_pos(folio), NETFS_WRITEBACK);</div><div class='add'>+	if (IS_ERR(wreq)) {</div><div class='add'>+		error = PTR_ERR(wreq);</div><div class='add'>+		goto couldnt_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__set_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;wreq-&gt;flags);</div><div class='add'>+	trace_netfs_write(wreq, netfs_write_trace_writeback);</div><div class='add'>+	netfs_stat(&amp;netfs_n_wh_writepages);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		_debug("wbiter %lx %llx", folio-&gt;index, atomic64_read(&amp;wreq-&gt;issued_to));</div><div class='add'>+</div><div class='add'>+		/* It appears we don't have to handle cyclic writeback wrapping. */</div><div class='add'>+		WARN_ON_ONCE(wreq &amp;&amp; folio_pos(folio) &lt; atomic64_read(&amp;wreq-&gt;issued_to));</div><div class='add'>+</div><div class='add'>+		if (netfs_folio_group(folio) != NETFS_FOLIO_COPY_TO_CACHE &amp;&amp;</div><div class='add'>+		    unlikely(!test_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags))) {</div><div class='add'>+			set_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags);</div><div class='add'>+			wreq-&gt;netfs_ops-&gt;begin_writeback(wreq);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		error = netfs_write_folio(wreq, wbc, folio);</div><div class='add'>+		if (error &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	} while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)));</div><div class='add'>+</div><div class='add'>+	netfs_end_issue_write(wreq);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+	netfs_wake_collector(wreq);</div><div class='add'>+</div><div class='add'>+	netfs_put_request(wreq, netfs_rreq_trace_put_return);</div><div class='add'>+	_leave(" = %d", error);</div><div class='add'>+	return error;</div><div class='add'>+</div><div class='add'>+couldnt_start:</div><div class='add'>+	netfs_kill_dirty_pages(mapping, wbc, folio);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+	_leave(" = %d", error);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_writepages);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Begin a write operation for writing through the pagecache.</div><div class='add'>+ */</div><div class='add'>+struct netfs_io_request *netfs_begin_writethrough(struct kiocb *iocb, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq = NULL;</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(file_inode(iocb-&gt;ki_filp));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+</div><div class='add'>+	wreq = netfs_create_write_req(iocb-&gt;ki_filp-&gt;f_mapping, iocb-&gt;ki_filp,</div><div class='add'>+				      iocb-&gt;ki_pos, NETFS_WRITETHROUGH);</div><div class='add'>+	if (IS_ERR(wreq)) {</div><div class='add'>+		mutex_unlock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+		return wreq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wreq-&gt;io_streams[0].avail = true;</div><div class='add'>+	trace_netfs_write(wreq, netfs_write_trace_writethrough);</div><div class='add'>+	return wreq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Advance the state of the write operation used when writing through the</div><div class='add'>+ * pagecache.  Data has been copied into the pagecache that we need to append</div><div class='add'>+ * to the request.  If we've added more than wsize then we need to create a new</div><div class='add'>+ * subrequest.</div><div class='add'>+ */</div><div class='add'>+int netfs_advance_writethrough(struct netfs_io_request *wreq, struct writeback_control *wbc,</div><div class='add'>+			       struct folio *folio, size_t copied, bool to_page_end,</div><div class='add'>+			       struct folio **writethrough_cache)</div><div class='add'>+{</div><div class='add'>+	_enter("R=%x ic=%zu ws=%u cp=%zu tp=%u",</div><div class='add'>+	       wreq-&gt;debug_id, wreq-&gt;buffer.iter.count, wreq-&gt;wsize, copied, to_page_end);</div><div class='add'>+</div><div class='add'>+	if (!*writethrough_cache) {</div><div class='add'>+		if (folio_test_dirty(folio))</div><div class='add'>+			/* Sigh.  mmap. */</div><div class='add'>+			folio_clear_dirty_for_io(folio);</div><div class='add'>+</div><div class='add'>+		/* We can make multiple writes to the folio... */</div><div class='add'>+		folio_start_writeback(folio);</div><div class='add'>+		if (wreq-&gt;len == 0)</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_wthru);</div><div class='add'>+		else</div><div class='add'>+			trace_netfs_folio(folio, netfs_folio_trace_wthru_plus);</div><div class='add'>+		*writethrough_cache = folio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wreq-&gt;len += copied;</div><div class='add'>+	if (!to_page_end)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*writethrough_cache = NULL;</div><div class='add'>+	return netfs_write_folio(wreq, wbc, folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * End a write operation used when writing through the pagecache.</div><div class='add'>+ */</div><div class='add'>+ssize_t netfs_end_writethrough(struct netfs_io_request *wreq, struct writeback_control *wbc,</div><div class='add'>+			       struct folio *writethrough_cache)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(wreq-&gt;inode);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x", wreq-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	if (writethrough_cache)</div><div class='add'>+		netfs_write_folio(wreq, wbc, writethrough_cache);</div><div class='add'>+</div><div class='add'>+	netfs_end_issue_write(wreq);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;iocb)</div><div class='add'>+		ret = -EIOCBQUEUED;</div><div class='add'>+	else</div><div class='add'>+		ret = netfs_wait_for_write(wreq);</div><div class='add'>+	netfs_put_request(wreq, netfs_rreq_trace_put_return);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write data to the server without going through the pagecache and without</div><div class='add'>+ * writing it to the local cache.</div><div class='add'>+ */</div><div class='add'>+int netfs_unbuffered_write(struct netfs_io_request *wreq, bool may_wait, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *upload = &amp;wreq-&gt;io_streams[0];</div><div class='add'>+	ssize_t part;</div><div class='add'>+	loff_t start = wreq-&gt;start;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	_enter("%zx", len);</div><div class='add'>+</div><div class='add'>+	if (wreq-&gt;origin == NETFS_DIO_WRITE)</div><div class='add'>+		inode_dio_begin(wreq-&gt;inode);</div><div class='add'>+</div><div class='add'>+	while (len) {</div><div class='add'>+		// TODO: Prepare content encryption</div><div class='add'>+</div><div class='add'>+		_debug("unbuffered %zx", len);</div><div class='add'>+		part = netfs_advance_write(wreq, upload, start, len, false);</div><div class='add'>+		start += part;</div><div class='add'>+		len -= part;</div><div class='add'>+		rolling_buffer_advance(&amp;wreq-&gt;buffer, part);</div><div class='add'>+		if (test_bit(NETFS_RREQ_PAUSE, &amp;wreq-&gt;flags))</div><div class='add'>+			netfs_wait_for_paused_write(wreq);</div><div class='add'>+		if (test_bit(NETFS_RREQ_FAILED, &amp;wreq-&gt;flags))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netfs_end_issue_write(wreq);</div><div class='add'>+	_leave(" = %d", error);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write some of a pending folio data back to the server and/or the cache.</div><div class='add'>+ */</div><div class='add'>+static int netfs_write_folio_single(struct netfs_io_request *wreq,</div><div class='add'>+				    struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *upload = &amp;wreq-&gt;io_streams[0];</div><div class='add'>+	struct netfs_io_stream *cache  = &amp;wreq-&gt;io_streams[1];</div><div class='add'>+	struct netfs_io_stream *stream;</div><div class='add'>+	size_t iter_off = 0;</div><div class='add'>+	size_t fsize = folio_size(folio), flen;</div><div class='add'>+	loff_t fpos = folio_pos(folio);</div><div class='add'>+	bool to_eof = false;</div><div class='add'>+	bool no_debug = false;</div><div class='add'>+</div><div class='add'>+	_enter("");</div><div class='add'>+</div><div class='add'>+	flen = folio_size(folio);</div><div class='add'>+	if (flen &gt; wreq-&gt;i_size - fpos) {</div><div class='add'>+		flen = wreq-&gt;i_size - fpos;</div><div class='add'>+		folio_zero_segment(folio, flen, fsize);</div><div class='add'>+		to_eof = true;</div><div class='add'>+	} else if (flen == wreq-&gt;i_size - fpos) {</div><div class='add'>+		to_eof = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_debug("folio %zx/%zx", flen, fsize);</div><div class='add'>+</div><div class='add'>+	if (!upload-&gt;avail &amp;&amp; !cache-&gt;avail) {</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_cancel_store);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!upload-&gt;construct)</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_store);</div><div class='add'>+	else</div><div class='add'>+		trace_netfs_folio(folio, netfs_folio_trace_store_plus);</div><div class='add'>+</div><div class='add'>+	/* Attach the folio to the rolling buffer. */</div><div class='add'>+	folio_get(folio);</div><div class='add'>+	rolling_buffer_append(&amp;wreq-&gt;buffer, folio, NETFS_ROLLBUF_PUT_MARK);</div><div class='add'>+</div><div class='add'>+	/* Move the submission point forward to allow for write-streaming data</div><div class='add'>+	 * not starting at the front of the page.  We don't do write-streaming</div><div class='add'>+	 * with the cache as the cache requires DIO alignment.</div><div class='add'>+	 *</div><div class='add'>+	 * Also skip uploading for data that's been read and just needs copying</div><div class='add'>+	 * to the cache.</div><div class='add'>+	 */</div><div class='add'>+	for (int s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		stream-&gt;submit_off = 0;</div><div class='add'>+		stream-&gt;submit_len = flen;</div><div class='add'>+		if (!stream-&gt;avail) {</div><div class='add'>+			stream-&gt;submit_off = UINT_MAX;</div><div class='add'>+			stream-&gt;submit_len = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attach the folio to one or more subrequests.  For a big folio, we</div><div class='add'>+	 * could end up with thousands of subrequests if the wsize is small -</div><div class='add'>+	 * but we might need to wait during the creation of subrequests for</div><div class='add'>+	 * network resources (eg. SMB credits).</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		ssize_t part;</div><div class='add'>+		size_t lowest_off = ULONG_MAX;</div><div class='add'>+		int choose_s = -1;</div><div class='add'>+</div><div class='add'>+		/* Always add to the lowest-submitted stream first. */</div><div class='add'>+		for (int s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+			stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+			if (stream-&gt;submit_len &gt; 0 &amp;&amp;</div><div class='add'>+			    stream-&gt;submit_off &lt; lowest_off) {</div><div class='add'>+				lowest_off = stream-&gt;submit_off;</div><div class='add'>+				choose_s = s;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (choose_s &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[choose_s];</div><div class='add'>+</div><div class='add'>+		/* Advance the iterator(s). */</div><div class='add'>+		if (stream-&gt;submit_off &gt; iter_off) {</div><div class='add'>+			rolling_buffer_advance(&amp;wreq-&gt;buffer, stream-&gt;submit_off - iter_off);</div><div class='add'>+			iter_off = stream-&gt;submit_off;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		atomic64_set(&amp;wreq-&gt;issued_to, fpos + stream-&gt;submit_off);</div><div class='add'>+		stream-&gt;submit_extendable_to = fsize - stream-&gt;submit_off;</div><div class='add'>+		part = netfs_advance_write(wreq, stream, fpos + stream-&gt;submit_off,</div><div class='add'>+					   stream-&gt;submit_len, to_eof);</div><div class='add'>+		stream-&gt;submit_off += part;</div><div class='add'>+		if (part &gt; stream-&gt;submit_len)</div><div class='add'>+			stream-&gt;submit_len = 0;</div><div class='add'>+		else</div><div class='add'>+			stream-&gt;submit_len -= part;</div><div class='add'>+		if (part &gt; 0)</div><div class='add'>+			no_debug = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wreq-&gt;buffer.iter.iov_offset = 0;</div><div class='add'>+	if (fsize &gt; iter_off)</div><div class='add'>+		rolling_buffer_advance(&amp;wreq-&gt;buffer, fsize - iter_off);</div><div class='add'>+	atomic64_set(&amp;wreq-&gt;issued_to, fpos + fsize);</div><div class='add'>+</div><div class='add'>+	if (!no_debug)</div><div class='add'>+		kdebug("R=%x: No submit", wreq-&gt;debug_id);</div><div class='add'>+	_leave(" = 0");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netfs_writeback_single - Write back a monolithic payload</div><div class='add'>+ * @mapping: The mapping to write from</div><div class='add'>+ * @wbc: Hints from the VM</div><div class='add'>+ * @iter: Data to write, must be ITER_FOLIOQ.</div><div class='add'>+ *</div><div class='add'>+ * Write a monolithic, non-pagecache object back to the server and/or</div><div class='add'>+ * the cache.</div><div class='add'>+ */</div><div class='add'>+int netfs_writeback_single(struct address_space *mapping,</div><div class='add'>+			   struct writeback_control *wbc,</div><div class='add'>+			   struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_request *wreq;</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(mapping-&gt;host);</div><div class='add'>+	struct folio_queue *fq;</div><div class='add'>+	size_t size = iov_iter_count(iter);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!iov_iter_is_folioq(iter)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;ictx-&gt;wb_lock)) {</div><div class='add'>+		if (wbc-&gt;sync_mode == WB_SYNC_NONE) {</div><div class='add'>+			netfs_stat(&amp;netfs_n_wb_lock_skip);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		netfs_stat(&amp;netfs_n_wb_lock_wait);</div><div class='add'>+		mutex_lock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wreq = netfs_create_write_req(mapping, NULL, 0, NETFS_WRITEBACK_SINGLE);</div><div class='add'>+	if (IS_ERR(wreq)) {</div><div class='add'>+		ret = PTR_ERR(wreq);</div><div class='add'>+		goto couldnt_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__set_bit(NETFS_RREQ_OFFLOAD_COLLECTION, &amp;wreq-&gt;flags);</div><div class='add'>+	trace_netfs_write(wreq, netfs_write_trace_writeback_single);</div><div class='add'>+	netfs_stat(&amp;netfs_n_wh_writepages);</div><div class='add'>+</div><div class='add'>+	if (__test_and_set_bit(NETFS_RREQ_UPLOAD_TO_SERVER, &amp;wreq-&gt;flags))</div><div class='add'>+		wreq-&gt;netfs_ops-&gt;begin_writeback(wreq);</div><div class='add'>+</div><div class='add'>+	for (fq = (struct folio_queue *)iter-&gt;folioq; fq; fq = fq-&gt;next) {</div><div class='add'>+		for (int slot = 0; slot &lt; folioq_count(fq); slot++) {</div><div class='add'>+			struct folio *folio = folioq_folio(fq, slot);</div><div class='add'>+			size_t part = umin(folioq_folio_size(fq, slot), size);</div><div class='add'>+</div><div class='add'>+			_debug("wbiter %lx %llx", folio-&gt;index, atomic64_read(&amp;wreq-&gt;issued_to));</div><div class='add'>+</div><div class='add'>+			ret = netfs_write_folio_single(wreq, folio);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto stop;</div><div class='add'>+			size -= part;</div><div class='add'>+			if (size &lt;= 0)</div><div class='add'>+				goto stop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+stop:</div><div class='add'>+	for (int s = 0; s &lt; NR_IO_STREAMS; s++)</div><div class='add'>+		netfs_issue_write(wreq, &amp;wreq-&gt;io_streams[s]);</div><div class='add'>+	smp_wmb(); /* Write lists before ALL_QUEUED. */</div><div class='add'>+	set_bit(NETFS_RREQ_ALL_QUEUED, &amp;wreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+	netfs_wake_collector(wreq);</div><div class='add'>+</div><div class='add'>+	netfs_put_request(wreq, netfs_rreq_trace_put_return);</div><div class='add'>+	_leave(" = %d", ret);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+couldnt_start:</div><div class='add'>+	mutex_unlock(&amp;ictx-&gt;wb_lock);</div><div class='add'>+	_leave(" = %d", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netfs_writeback_single);</div><div class='head'>diff --git a/fs/netfs/write_retry.c b/fs/netfs/write_retry.c<br/>new file mode 100644<br/>index 000000000000..fc9c3e0d34d8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/netfs/write_retry.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/netfs/write_retry.c</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Network filesystem write retrying.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform retries on the streams that need it.</div><div class='add'>+ */</div><div class='add'>+static void netfs_retry_write_stream(struct netfs_io_request *wreq,</div><div class='add'>+				     struct netfs_io_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct list_head *next;</div><div class='add'>+</div><div class='add'>+	_enter("R=%x[%x:]", wreq-&gt;debug_id, stream-&gt;stream_nr);</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;stream-&gt;subrequests))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;source == NETFS_UPLOAD_TO_SERVER &amp;&amp;</div><div class='add'>+	    wreq-&gt;netfs_ops-&gt;retry_request)</div><div class='add'>+		wreq-&gt;netfs_ops-&gt;retry_request(wreq, stream);</div><div class='add'>+</div><div class='add'>+	if (unlikely(stream-&gt;failed))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If there's no renegotiation to do, just resend each failed subreq. */</div><div class='add'>+	if (!stream-&gt;prepare_write) {</div><div class='add'>+		struct netfs_io_subrequest *subreq;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(subreq, &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+			if (test_bit(NETFS_SREQ_FAILED, &amp;subreq-&gt;flags))</div><div class='add'>+				break;</div><div class='add'>+			if (__test_and_clear_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags)) {</div><div class='add'>+				struct iov_iter source;</div><div class='add'>+</div><div class='add'>+				netfs_reset_iter(subreq);</div><div class='add'>+				source = subreq-&gt;io_iter;</div><div class='add'>+				netfs_get_subrequest(subreq, netfs_sreq_trace_get_resubmit);</div><div class='add'>+				netfs_reissue_write(stream, subreq, &amp;source);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	next = stream-&gt;subrequests.next;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct netfs_io_subrequest *subreq = NULL, *from, *to, *tmp;</div><div class='add'>+		struct iov_iter source;</div><div class='add'>+		unsigned long long start, len;</div><div class='add'>+		size_t part;</div><div class='add'>+		bool boundary = false;</div><div class='add'>+</div><div class='add'>+		/* Go through the stream and find the next span of contiguous</div><div class='add'>+		 * data that we then rejig (cifs, for example, needs the wsize</div><div class='add'>+		 * renegotiating) and reissue.</div><div class='add'>+		 */</div><div class='add'>+		from = list_entry(next, struct netfs_io_subrequest, rreq_link);</div><div class='add'>+		to = from;</div><div class='add'>+		start = from-&gt;start + from-&gt;transferred;</div><div class='add'>+		len   = from-&gt;len   - from-&gt;transferred;</div><div class='add'>+</div><div class='add'>+		if (test_bit(NETFS_SREQ_FAILED, &amp;from-&gt;flags) ||</div><div class='add'>+		    !test_bit(NETFS_SREQ_NEED_RETRY, &amp;from-&gt;flags))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		list_for_each_continue(next, &amp;stream-&gt;subrequests) {</div><div class='add'>+			subreq = list_entry(next, struct netfs_io_subrequest, rreq_link);</div><div class='add'>+			if (subreq-&gt;start + subreq-&gt;transferred != start + len ||</div><div class='add'>+			    test_bit(NETFS_SREQ_BOUNDARY, &amp;subreq-&gt;flags) ||</div><div class='add'>+			    !test_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags))</div><div class='add'>+				break;</div><div class='add'>+			to = subreq;</div><div class='add'>+			len += to-&gt;len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Determine the set of buffers we're going to use.  Each</div><div class='add'>+		 * subreq gets a subset of a single overall contiguous buffer.</div><div class='add'>+		 */</div><div class='add'>+		netfs_reset_iter(from);</div><div class='add'>+		source = from-&gt;io_iter;</div><div class='add'>+		source.count = len;</div><div class='add'>+</div><div class='add'>+		/* Work through the sublist. */</div><div class='add'>+		subreq = from;</div><div class='add'>+		list_for_each_entry_from(subreq, &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+			if (!len)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			subreq-&gt;start	= start;</div><div class='add'>+			subreq-&gt;len	= len;</div><div class='add'>+			__clear_bit(NETFS_SREQ_NEED_RETRY, &amp;subreq-&gt;flags);</div><div class='add'>+			subreq-&gt;retry_count++;</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_retry);</div><div class='add'>+</div><div class='add'>+			/* Renegotiate max_len (wsize) */</div><div class='add'>+			stream-&gt;sreq_max_len = len;</div><div class='add'>+			stream-&gt;prepare_write(subreq);</div><div class='add'>+</div><div class='add'>+			part = umin(len, stream-&gt;sreq_max_len);</div><div class='add'>+			if (unlikely(stream-&gt;sreq_max_segs))</div><div class='add'>+				part = netfs_limit_iter(&amp;source, 0, part, stream-&gt;sreq_max_segs);</div><div class='add'>+			subreq-&gt;len = part;</div><div class='add'>+			subreq-&gt;transferred = 0;</div><div class='add'>+			len -= part;</div><div class='add'>+			start += part;</div><div class='add'>+			if (len &amp;&amp; subreq == to &amp;&amp;</div><div class='add'>+			    __test_and_clear_bit(NETFS_SREQ_BOUNDARY, &amp;to-&gt;flags))</div><div class='add'>+				boundary = true;</div><div class='add'>+</div><div class='add'>+			netfs_get_subrequest(subreq, netfs_sreq_trace_get_resubmit);</div><div class='add'>+			netfs_reissue_write(stream, subreq, &amp;source);</div><div class='add'>+			if (subreq == to)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we managed to use fewer subreqs, we can discard the</div><div class='add'>+		 * excess; if we used the same number, then we're done.</div><div class='add'>+		 */</div><div class='add'>+		if (!len) {</div><div class='add'>+			if (subreq == to)</div><div class='add'>+				continue;</div><div class='add'>+			list_for_each_entry_safe_from(subreq, tmp,</div><div class='add'>+						      &amp;stream-&gt;subrequests, rreq_link) {</div><div class='add'>+				trace_netfs_sreq(subreq, netfs_sreq_trace_discard);</div><div class='add'>+				list_del(&amp;subreq-&gt;rreq_link);</div><div class='add'>+				netfs_put_subrequest(subreq, netfs_sreq_trace_put_done);</div><div class='add'>+				if (subreq == to)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We ran out of subrequests, so we need to allocate some more</div><div class='add'>+		 * and insert them after.</div><div class='add'>+		 */</div><div class='add'>+		do {</div><div class='add'>+			subreq = netfs_alloc_subrequest(wreq);</div><div class='add'>+			subreq-&gt;source		= to-&gt;source;</div><div class='add'>+			subreq-&gt;start		= start;</div><div class='add'>+			subreq-&gt;stream_nr	= to-&gt;stream_nr;</div><div class='add'>+			subreq-&gt;retry_count	= 1;</div><div class='add'>+</div><div class='add'>+			trace_netfs_sreq_ref(wreq-&gt;debug_id, subreq-&gt;debug_index,</div><div class='add'>+					     refcount_read(&amp;subreq-&gt;ref),</div><div class='add'>+					     netfs_sreq_trace_new);</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_split);</div><div class='add'>+</div><div class='add'>+			list_add(&amp;subreq-&gt;rreq_link, &amp;to-&gt;rreq_link);</div><div class='add'>+			to = list_next_entry(to, rreq_link);</div><div class='add'>+			trace_netfs_sreq(subreq, netfs_sreq_trace_retry);</div><div class='add'>+</div><div class='add'>+			stream-&gt;sreq_max_len	= len;</div><div class='add'>+			stream-&gt;sreq_max_segs	= INT_MAX;</div><div class='add'>+			switch (stream-&gt;source) {</div><div class='add'>+			case NETFS_UPLOAD_TO_SERVER:</div><div class='add'>+				netfs_stat(&amp;netfs_n_wh_upload);</div><div class='add'>+				stream-&gt;sreq_max_len = umin(len, wreq-&gt;wsize);</div><div class='add'>+				break;</div><div class='add'>+			case NETFS_WRITE_TO_CACHE:</div><div class='add'>+				netfs_stat(&amp;netfs_n_wh_write);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				WARN_ON_ONCE(1);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			stream-&gt;prepare_write(subreq);</div><div class='add'>+</div><div class='add'>+			part = umin(len, stream-&gt;sreq_max_len);</div><div class='add'>+			subreq-&gt;len = subreq-&gt;transferred + part;</div><div class='add'>+			len -= part;</div><div class='add'>+			start += part;</div><div class='add'>+			if (!len &amp;&amp; boundary) {</div><div class='add'>+				__set_bit(NETFS_SREQ_BOUNDARY, &amp;to-&gt;flags);</div><div class='add'>+				boundary = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			netfs_reissue_write(stream, subreq, &amp;source);</div><div class='add'>+			if (!len)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+		} while (len);</div><div class='add'>+</div><div class='add'>+	} while (!list_is_head(next, &amp;stream-&gt;subrequests));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform retries on the streams that need it.  If we're doing content</div><div class='add'>+ * encryption and the server copy changed due to a third-party write, we may</div><div class='add'>+ * need to do an RMW cycle and also rewrite the data to the cache.</div><div class='add'>+ */</div><div class='add'>+void netfs_retry_writes(struct netfs_io_request *wreq)</div><div class='add'>+{</div><div class='add'>+	struct netfs_io_stream *stream;</div><div class='add'>+	int s;</div><div class='add'>+</div><div class='add'>+	netfs_stat(&amp;netfs_n_wh_retry_write_req);</div><div class='add'>+</div><div class='add'>+	/* Wait for all outstanding I/O to quiesce before performing retries as</div><div class='add'>+	 * we may need to renegotiate the I/O sizes.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(NETFS_RREQ_RETRYING, &amp;wreq-&gt;flags);</div><div class='add'>+	for (s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		if (stream-&gt;active)</div><div class='add'>+			netfs_wait_for_in_progress_stream(wreq, stream);</div><div class='add'>+	}</div><div class='add'>+	clear_bit(NETFS_RREQ_RETRYING, &amp;wreq-&gt;flags);</div><div class='add'>+</div><div class='add'>+	// TODO: Enc: Fetch changed partial pages</div><div class='add'>+	// TODO: Enc: Reencrypt content if needed.</div><div class='add'>+	// TODO: Enc: Wind back transferred point.</div><div class='add'>+	// TODO: Enc: Mark cache pages for retry.</div><div class='add'>+</div><div class='add'>+	for (s = 0; s &lt; NR_IO_STREAMS; s++) {</div><div class='add'>+		stream = &amp;wreq-&gt;io_streams[s];</div><div class='add'>+		if (stream-&gt;need_retry) {</div><div class='add'>+			stream-&gt;need_retry = false;</div><div class='add'>+			netfs_retry_write_stream(wreq, stream);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig<br/>index f7e32d76e34d..07932ce9246c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/Kconfig</a></div><div class='hunk'>@@ -2,8 +2,10 @@</div><div class='ctx'> config NFS_FS</div><div class='ctx'> 	tristate "NFS client support"</div><div class='ctx'> 	depends on INET &amp;&amp; FILE_LOCKING &amp;&amp; MULTIUSER</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select LOCKD</div><div class='ctx'> 	select SUNRPC</div><div class='add'>+	select NFS_COMMON</div><div class='ctx'> 	select NFS_ACL_SUPPORT if NFS_V3_ACL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Choose Y here if you want to access files residing on other</div><div class='hunk'>@@ -33,12 +35,12 @@ config NFS_FS</div><div class='ctx'> config NFS_V2</div><div class='ctx'> 	tristate "NFS client support for NFS version 2"</div><div class='ctx'> 	depends on NFS_FS</div><div class='del'>-	default y</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for version 2 of the NFS protocol</div><div class='ctx'> 	  (RFC 1094) in the kernel's NFS client.</div><div class='ctx'> </div><div class='del'>-	  If unsure, say Y.</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config NFS_V3</div><div class='ctx'> 	tristate "NFS client support for NFS version 3"</div><div class='hunk'>@@ -169,7 +171,8 @@ config ROOT_NFS</div><div class='ctx'> </div><div class='ctx'> config NFS_FSCACHE</div><div class='ctx'> 	bool "Provide NFS client caching support"</div><div class='del'>-	depends on NFS_FS=m &amp;&amp; NETFS_SUPPORT || NFS_FS=y &amp;&amp; NETFS_SUPPORT=y</div><div class='add'>+	depends on NFS_FS</div><div class='add'>+	select NETFS_SUPPORT</div><div class='ctx'> 	select FSCACHE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want NFS data to be cached locally on disc through</div><div class='hunk'>@@ -194,7 +197,6 @@ config NFS_USE_KERNEL_DNS</div><div class='ctx'> config NFS_DEBUG</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on NFS_FS &amp;&amp; SUNRPC_DEBUG</div><div class='del'>-	select CRC32</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config NFS_DISABLE_UDP_SUPPORT</div><div class='head'>diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile<br/>index 5f6db37f461e..9fb2f2cac87e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/Makefile</a></div><div class='hunk'>@@ -13,6 +13,7 @@ nfs-y 			:= client.o dir.o file.o getroot.o inode.o super.o \</div><div class='ctx'> nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o</div><div class='ctx'> nfs-$(CONFIG_SYSCTL)	+= sysctl.o</div><div class='ctx'> nfs-$(CONFIG_NFS_FSCACHE) += fscache.o</div><div class='add'>+nfs-$(CONFIG_NFS_LOCALIO) += localio.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NFS_V2) += nfsv2.o</div><div class='ctx'> nfsv2-y := nfs2super.o proc.o nfs2xdr.o</div><div class='head'>diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c<br/>index 6be13e0ec170..0e4c67373e4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/blocklayout.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/blocklayout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/blocklayout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/blocklayout/blocklayout.c</a></div><div class='hunk'>@@ -149,8 +149,8 @@ do_add_page_to_bio(struct bio *bio, int npg, enum req_op op, sector_t isect,</div><div class='ctx'> </div><div class='ctx'> 	/* limit length to what the device mapping allows */</div><div class='ctx'> 	end = disk_addr + *len;</div><div class='del'>-	if (end &gt;= map-&gt;start + map-&gt;len)</div><div class='del'>-		*len = map-&gt;start + map-&gt;len - disk_addr;</div><div class='add'>+	if (end &gt;= map-&gt;disk_offset + map-&gt;len)</div><div class='add'>+		*len = map-&gt;disk_offset + map-&gt;len - disk_addr;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	if (!bio) {</div><div class='hunk'>@@ -564,25 +564,45 @@ bl_find_get_deviceid(struct nfs_server *server,</div><div class='ctx'> 		gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_deviceid_node *node;</div><div class='del'>-	unsigned long start, end;</div><div class='add'>+	int err = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='ctx'> 	node = nfs4_find_get_deviceid(server, id, cred, gfp_mask);</div><div class='ctx'> 	if (!node)</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(NFS_DEVICEID_UNAVAILABLE, &amp;node-&gt;flags) == 0)</div><div class='del'>-		return node;</div><div class='add'>+	/*</div><div class='add'>+	 * Devices that are marked unavailable are left in the cache with a</div><div class='add'>+	 * timeout to avoid sending GETDEVINFO after every LAYOUTGET, or</div><div class='add'>+	 * constantly attempting to register the device.  Once marked as</div><div class='add'>+	 * unavailable they must be deleted and never reused.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(NFS_DEVICEID_UNAVAILABLE, &amp;node-&gt;flags)) {</div><div class='add'>+		unsigned long end = jiffies;</div><div class='add'>+		unsigned long start = end - PNFS_DEVICE_RETRY_TIMEOUT;</div><div class='add'>+</div><div class='add'>+		if (!time_in_range(node-&gt;timestamp_unavailable, start, end)) {</div><div class='add'>+			/* Uncork subsequent GETDEVINFO operations for this device */</div><div class='add'>+			nfs4_delete_deviceid(node-&gt;ld, node-&gt;nfs_client, id);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		goto out_put;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	end = jiffies;</div><div class='del'>-	start = end - PNFS_DEVICE_RETRY_TIMEOUT;</div><div class='del'>-	if (!time_in_range(node-&gt;timestamp_unavailable, start, end)) {</div><div class='del'>-		nfs4_delete_deviceid(node-&gt;ld, node-&gt;nfs_client, id);</div><div class='del'>-		goto retry;</div><div class='add'>+	if (!bl_register_dev(container_of(node, struct pnfs_block_dev, node))) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we cannot register, treat this device as transient:</div><div class='add'>+		 * Make a negative cache entry for the device</div><div class='add'>+		 */</div><div class='add'>+		nfs4_mark_deviceid_unavailable(node);</div><div class='add'>+		goto out_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return node;</div><div class='add'>+</div><div class='add'>+out_put:</div><div class='ctx'> 	nfs4_put_deviceid_node(node);</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -656,7 +676,7 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr,</div><div class='ctx'> 	struct pnfs_layout_segment *lseg;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='ctx'> 	struct xdr_stream xdr;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	int status, i;</div><div class='ctx'> 	uint32_t count;</div><div class='ctx'> 	__be32 *p;</div><div class='hunk'>@@ -669,13 +689,13 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	status = -ENOMEM;</div><div class='del'>-	scratch = alloc_page(gfp_mask);</div><div class='add'>+	scratch = folio_alloc(gfp_mask, 0);</div><div class='ctx'> 	if (!scratch)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;xdr, &amp;buf,</div><div class='ctx'> 			lgr-&gt;layoutp-&gt;pages, lgr-&gt;layoutp-&gt;len);</div><div class='del'>-	xdr_set_scratch_page(&amp;xdr, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;xdr, scratch);</div><div class='ctx'> </div><div class='ctx'> 	status = -EIO;</div><div class='ctx'> 	p = xdr_inline_decode(&amp;xdr, 4);</div><div class='hunk'>@@ -724,7 +744,7 @@ process_extents:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_free_scratch:</div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> out:</div><div class='ctx'> 	dprintk("%s returns %d\n", __func__, status);</div><div class='ctx'> 	switch (status) {</div><div class='head'>diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h<br/>index f1eeb4914199..6da40ca19570 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/blocklayout.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/blocklayout.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/blocklayout.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/blocklayout/blocklayout.h</a></div><div class='hunk'>@@ -104,20 +104,26 @@ struct pnfs_block_dev {</div><div class='ctx'> 	u64				start;</div><div class='ctx'> 	u64				len;</div><div class='ctx'> </div><div class='add'>+	enum pnfs_block_volume_type	type;</div><div class='ctx'> 	u32				nr_children;</div><div class='ctx'> 	struct pnfs_block_dev		*children;</div><div class='ctx'> 	u64				chunk_size;</div><div class='ctx'> </div><div class='ctx'> 	struct file			*bdev_file;</div><div class='ctx'> 	u64				disk_offset;</div><div class='add'>+	unsigned long			flags;</div><div class='ctx'> </div><div class='ctx'> 	u64				pr_key;</div><div class='del'>-	bool				pr_registered;</div><div class='ctx'> </div><div class='ctx'> 	bool (*map)(struct pnfs_block_dev *dev, u64 offset,</div><div class='ctx'> 			struct pnfs_block_dev_map *map);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* pnfs_block_dev flag bits */</div><div class='add'>+enum {</div><div class='add'>+	PNFS_BDEV_REGISTERED = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* sector_t fields are all in 512-byte sectors */</div><div class='ctx'> struct pnfs_block_extent {</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -172,6 +178,7 @@ struct bl_msg_hdr {</div><div class='ctx'> #define BL_DEVICE_REQUEST_ERR          0x2 /* User level process fails */</div><div class='ctx'> </div><div class='ctx'> /* dev.c */</div><div class='add'>+bool bl_register_dev(struct pnfs_block_dev *d);</div><div class='ctx'> struct nfs4_deviceid_node *bl_alloc_deviceid_node(struct nfs_server *server,</div><div class='ctx'> 		struct pnfs_device *pdev, gfp_t gfp_mask);</div><div class='ctx'> void bl_free_deviceid_node(struct nfs4_deviceid_node *d);</div><div class='head'>diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c<br/>index 93ef7f864980..ab76120705e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/dev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/blocklayout/dev.c</a></div><div class='hunk'>@@ -10,12 +10,81 @@</div><div class='ctx'> #include &lt;linux/pr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blocklayout.h"</div><div class='add'>+#include "../nfs4trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PNFS_LD</div><div class='ctx'> </div><div class='add'>+static void bl_unregister_scsi(struct pnfs_block_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct block_device *bdev = file_bdev(dev-&gt;bdev_file);</div><div class='add'>+	const struct pr_ops *ops = bdev-&gt;bd_disk-&gt;fops-&gt;pr_ops;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = ops-&gt;pr_register(bdev, dev-&gt;pr_key, 0, false);</div><div class='add'>+	if (status)</div><div class='add'>+		trace_bl_pr_key_unreg_err(bdev, dev-&gt;pr_key, status);</div><div class='add'>+	else</div><div class='add'>+		trace_bl_pr_key_unreg(bdev, dev-&gt;pr_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bl_register_scsi(struct pnfs_block_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct block_device *bdev = file_bdev(dev-&gt;bdev_file);</div><div class='add'>+	const struct pr_ops *ops = bdev-&gt;bd_disk-&gt;fops-&gt;pr_ops;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(PNFS_BDEV_REGISTERED, &amp;dev-&gt;flags))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	status = ops-&gt;pr_register(bdev, 0, dev-&gt;pr_key, true);</div><div class='add'>+	if (status) {</div><div class='add'>+		trace_bl_pr_key_reg_err(bdev, dev-&gt;pr_key, status);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	trace_bl_pr_key_reg(bdev, dev-&gt;pr_key);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bl_unregister_dev(struct pnfs_block_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;nr_children) {</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;nr_children; i++)</div><div class='add'>+			bl_unregister_dev(&amp;dev-&gt;children[i]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type == PNFS_BLOCK_VOLUME_SCSI &amp;&amp;</div><div class='add'>+		test_and_clear_bit(PNFS_BDEV_REGISTERED, &amp;dev-&gt;flags))</div><div class='add'>+		bl_unregister_scsi(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bl_register_dev(struct pnfs_block_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;nr_children) {</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;nr_children; i++) {</div><div class='add'>+			if (!bl_register_dev(&amp;dev-&gt;children[i])) {</div><div class='add'>+				while (i &gt; 0)</div><div class='add'>+					bl_unregister_dev(&amp;dev-&gt;children[--i]);</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;type == PNFS_BLOCK_VOLUME_SCSI)</div><div class='add'>+		return bl_register_scsi(dev);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> bl_free_device(struct pnfs_block_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	bl_unregister_dev(dev);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;nr_children) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='hunk'>@@ -23,17 +92,6 @@ bl_free_device(struct pnfs_block_dev *dev)</div><div class='ctx'> 			bl_free_device(&amp;dev-&gt;children[i]);</div><div class='ctx'> 		kfree(dev-&gt;children);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (dev-&gt;pr_registered) {</div><div class='del'>-			const struct pr_ops *ops =</div><div class='del'>-				file_bdev(dev-&gt;bdev_file)-&gt;bd_disk-&gt;fops-&gt;pr_ops;</div><div class='del'>-			int error;</div><div class='del'>-</div><div class='del'>-			error = ops-&gt;pr_register(file_bdev(dev-&gt;bdev_file),</div><div class='del'>-				dev-&gt;pr_key, 0, false);</div><div class='del'>-			if (error)</div><div class='del'>-				pr_err("failed to unregister PR key.\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (dev-&gt;bdev_file)</div><div class='ctx'> 			fput(dev-&gt;bdev_file);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -199,10 +257,11 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset,</div><div class='ctx'> 	struct pnfs_block_dev *child;</div><div class='ctx'> 	u64 chunk;</div><div class='ctx'> 	u32 chunk_idx;</div><div class='add'>+	u64 disk_chunk;</div><div class='ctx'> 	u64 disk_offset;</div><div class='ctx'> </div><div class='ctx'> 	chunk = div_u64(offset, dev-&gt;chunk_size);</div><div class='del'>-	div_u64_rem(chunk, dev-&gt;nr_children, &amp;chunk_idx);</div><div class='add'>+	disk_chunk = div_u64_rem(chunk, dev-&gt;nr_children, &amp;chunk_idx);</div><div class='ctx'> </div><div class='ctx'> 	if (chunk_idx &gt;= dev-&gt;nr_children) {</div><div class='ctx'> 		dprintk("%s: invalid chunk idx %d (%lld/%lld)\n",</div><div class='hunk'>@@ -215,7 +274,7 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset,</div><div class='ctx'> 	offset = chunk * dev-&gt;chunk_size;</div><div class='ctx'> </div><div class='ctx'> 	/* disk offset of the stripe */</div><div class='del'>-	disk_offset = div_u64(offset, dev-&gt;nr_children);</div><div class='add'>+	disk_offset = disk_chunk * dev-&gt;chunk_size;</div><div class='ctx'> </div><div class='ctx'> 	child = &amp;dev-&gt;children[chunk_idx];</div><div class='ctx'> 	child-&gt;map(child, disk_offset, map);</div><div class='hunk'>@@ -314,7 +373,7 @@ bl_open_path(struct pnfs_block_volume *v, const char *prefix)</div><div class='ctx'> 	bdev_file = bdev_file_open_by_path(devname, BLK_OPEN_READ | BLK_OPEN_WRITE,</div><div class='ctx'> 					NULL, NULL);</div><div class='ctx'> 	if (IS_ERR(bdev_file)) {</div><div class='del'>-		pr_warn("pNFS: failed to open device %s (%ld)\n",</div><div class='add'>+		dprintk("failed to open device %s (%ld)\n",</div><div class='ctx'> 			devname, PTR_ERR(bdev_file));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -327,8 +386,9 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,</div><div class='ctx'> 		struct pnfs_block_volume *volumes, int idx, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_block_volume *v = &amp;volumes[idx];</div><div class='del'>-	struct file *bdev_file;</div><div class='add'>+	struct block_device *bdev;</div><div class='ctx'> 	const struct pr_ops *ops;</div><div class='add'>+	struct file *bdev_file;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	if (!bl_validate_designator(v))</div><div class='hunk'>@@ -344,35 +404,30 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,</div><div class='ctx'> 	if (IS_ERR(bdev_file))</div><div class='ctx'> 		bdev_file = bl_open_path(v, "wwn-0x");</div><div class='ctx'> 	if (IS_ERR(bdev_file))</div><div class='add'>+		bdev_file = bl_open_path(v, "nvme-eui.");</div><div class='add'>+	if (IS_ERR(bdev_file)) {</div><div class='add'>+		pr_warn("pNFS: no device found for volume %*phN\n",</div><div class='add'>+			v-&gt;scsi.designator_len, v-&gt;scsi.designator);</div><div class='ctx'> 		return PTR_ERR(bdev_file);</div><div class='add'>+	}</div><div class='ctx'> 	d-&gt;bdev_file = bdev_file;</div><div class='add'>+	bdev = file_bdev(bdev_file);</div><div class='ctx'> </div><div class='del'>-	d-&gt;len = bdev_nr_bytes(file_bdev(d-&gt;bdev_file));</div><div class='add'>+	d-&gt;len = bdev_nr_bytes(bdev);</div><div class='ctx'> 	d-&gt;map = bl_map_simple;</div><div class='ctx'> 	d-&gt;pr_key = v-&gt;scsi.pr_key;</div><div class='ctx'> </div><div class='ctx'> 	if (d-&gt;len == 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	pr_info("pNFS: using block device %s (reservation key 0x%llx)\n",</div><div class='del'>-		file_bdev(d-&gt;bdev_file)-&gt;bd_disk-&gt;disk_name, d-&gt;pr_key);</div><div class='del'>-</div><div class='del'>-	ops = file_bdev(d-&gt;bdev_file)-&gt;bd_disk-&gt;fops-&gt;pr_ops;</div><div class='add'>+	ops = bdev-&gt;bd_disk-&gt;fops-&gt;pr_ops;</div><div class='ctx'> 	if (!ops) {</div><div class='ctx'> 		pr_err("pNFS: block device %s does not support reservations.",</div><div class='del'>-				file_bdev(d-&gt;bdev_file)-&gt;bd_disk-&gt;disk_name);</div><div class='add'>+				bdev-&gt;bd_disk-&gt;disk_name);</div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> 		goto out_blkdev_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = ops-&gt;pr_register(file_bdev(d-&gt;bdev_file), 0, d-&gt;pr_key, true);</div><div class='del'>-	if (error) {</div><div class='del'>-		pr_err("pNFS: failed to register key for block device %s.",</div><div class='del'>-				file_bdev(d-&gt;bdev_file)-&gt;bd_disk-&gt;disk_name);</div><div class='del'>-		goto out_blkdev_put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d-&gt;pr_registered = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_blkdev_put:</div><div class='hunk'>@@ -458,7 +513,9 @@ static int</div><div class='ctx'> bl_parse_deviceid(struct nfs_server *server, struct pnfs_block_dev *d,</div><div class='ctx'> 		struct pnfs_block_volume *volumes, int idx, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	switch (volumes[idx].type) {</div><div class='add'>+	d-&gt;type = volumes[idx].type;</div><div class='add'>+</div><div class='add'>+	switch (d-&gt;type) {</div><div class='ctx'> 	case PNFS_BLOCK_VOLUME_SIMPLE:</div><div class='ctx'> 		return bl_parse_simple(server, d, volumes, idx, gfp_mask);</div><div class='ctx'> 	case PNFS_BLOCK_VOLUME_SLICE:</div><div class='hunk'>@@ -470,7 +527,7 @@ bl_parse_deviceid(struct nfs_server *server, struct pnfs_block_dev *d,</div><div class='ctx'> 	case PNFS_BLOCK_VOLUME_SCSI:</div><div class='ctx'> 		return bl_parse_scsi(server, d, volumes, idx, gfp_mask);</div><div class='ctx'> 	default:</div><div class='del'>-		dprintk("unsupported volume type: %d\n", volumes[idx].type);</div><div class='add'>+		dprintk("unsupported volume type: %d\n", d-&gt;type);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -484,16 +541,16 @@ bl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 	struct pnfs_block_dev *top;</div><div class='ctx'> 	struct xdr_stream xdr;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	int nr_volumes, ret, i;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='del'>-	scratch = alloc_page(gfp_mask);</div><div class='add'>+	scratch = folio_alloc(gfp_mask, 0);</div><div class='ctx'> 	if (!scratch)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;xdr, &amp;buf, pdev-&gt;pages, pdev-&gt;pglen);</div><div class='del'>-	xdr_set_scratch_page(&amp;xdr, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;xdr, scratch);</div><div class='ctx'> </div><div class='ctx'> 	p = xdr_inline_decode(&amp;xdr, sizeof(__be32));</div><div class='ctx'> 	if (!p)</div><div class='hunk'>@@ -525,7 +582,7 @@ bl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> out_free_volumes:</div><div class='ctx'> 	kfree(volumes);</div><div class='ctx'> out_free_scratch:</div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> out:</div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c<br/>index 8f7cff7a4293..315949a7e92d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/extent_tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/extent_tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/extent_tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/blocklayout/extent_tree.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "blocklayout.h"</div><div class='add'>+#include "../nfs4trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PNFS_LD</div><div class='ctx'> </div><div class='hunk'>@@ -520,10 +521,71 @@ static __be32 *encode_scsi_range(struct pnfs_block_extent *be, __be32 *p)</div><div class='ctx'> 	return xdr_encode_hyper(p, be-&gt;be_length &lt;&lt; SECTOR_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p,</div><div class='add'>+/**</div><div class='add'>+ * ext_tree_try_encode_commit - try to encode all extents into the buffer</div><div class='add'>+ * @bl: pointer to the layout</div><div class='add'>+ * @p: pointer to the output buffer</div><div class='add'>+ * @buffer_size: size of the output buffer</div><div class='add'>+ * @count: output pointer to the number of encoded extents</div><div class='add'>+ * @lastbyte: output pointer to the last written byte</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Success, all required extents encoded, outputs are valid</div><div class='add'>+ *   %-ENOSPC: Buffer too small, nothing encoded, outputs are invalid</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ext_tree_try_encode_commit(struct pnfs_block_layout *bl, __be32 *p,</div><div class='ctx'> 		size_t buffer_size, size_t *count, __u64 *lastbyte)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_block_extent *be;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bl-&gt;bl_ext_lock);</div><div class='add'>+	for (be = ext_tree_first(&amp;bl-&gt;bl_ext_rw); be; be = ext_tree_next(be)) {</div><div class='add'>+		if (be-&gt;be_state != PNFS_BLOCK_INVALID_DATA ||</div><div class='add'>+		    be-&gt;be_tag != EXTENT_WRITTEN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		(*count)++;</div><div class='add'>+		if (ext_tree_layoutupdate_size(bl, *count) &gt; buffer_size) {</div><div class='add'>+			spin_unlock(&amp;bl-&gt;bl_ext_lock);</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (be = ext_tree_first(&amp;bl-&gt;bl_ext_rw); be; be = ext_tree_next(be)) {</div><div class='add'>+		if (be-&gt;be_state != PNFS_BLOCK_INVALID_DATA ||</div><div class='add'>+		    be-&gt;be_tag != EXTENT_WRITTEN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (bl-&gt;bl_scsi_layout)</div><div class='add'>+			p = encode_scsi_range(be, p);</div><div class='add'>+		else</div><div class='add'>+			p = encode_block_extent(be, p);</div><div class='add'>+		be-&gt;be_tag = EXTENT_COMMITTING;</div><div class='add'>+	}</div><div class='add'>+	*lastbyte = (bl-&gt;bl_lwb != 0) ? bl-&gt;bl_lwb - 1 : U64_MAX;</div><div class='add'>+	bl-&gt;bl_lwb = 0;</div><div class='add'>+	spin_unlock(&amp;bl-&gt;bl_ext_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ext_tree_encode_commit - encode as much as possible extents into the buffer</div><div class='add'>+ * @bl: pointer to the layout</div><div class='add'>+ * @p: pointer to the output buffer</div><div class='add'>+ * @buffer_size: size of the output buffer</div><div class='add'>+ * @count: output pointer to the number of encoded extents</div><div class='add'>+ * @lastbyte: output pointer to the last written byte</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Success, all required extents encoded, outputs are valid</div><div class='add'>+ *   %-ENOSPC: Buffer too small, some extents are encoded, outputs are valid</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p,</div><div class='add'>+		size_t buffer_size, size_t *count, __u64 *lastbyte)</div><div class='add'>+{</div><div class='add'>+	struct pnfs_block_extent *be, *be_prev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;bl-&gt;bl_ext_lock);</div><div class='hunk'>@@ -534,9 +596,9 @@ static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p,</div><div class='ctx'> </div><div class='ctx'> 		(*count)++;</div><div class='ctx'> 		if (ext_tree_layoutupdate_size(bl, *count) &gt; buffer_size) {</div><div class='del'>-			/* keep counting.. */</div><div class='add'>+			(*count)--;</div><div class='ctx'> 			ret = -ENOSPC;</div><div class='del'>-			continue;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (bl-&gt;bl_scsi_layout)</div><div class='hunk'>@@ -544,14 +606,30 @@ static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p,</div><div class='ctx'> 		else</div><div class='ctx'> 			p = encode_block_extent(be, p);</div><div class='ctx'> 		be-&gt;be_tag = EXTENT_COMMITTING;</div><div class='add'>+		be_prev = be;</div><div class='add'>+	}</div><div class='add'>+	if (!ret) {</div><div class='add'>+		*lastbyte = (bl-&gt;bl_lwb != 0) ? bl-&gt;bl_lwb - 1 : U64_MAX;</div><div class='add'>+		bl-&gt;bl_lwb = 0;</div><div class='add'>+	} else {</div><div class='add'>+		*lastbyte = be_prev-&gt;be_f_offset + be_prev-&gt;be_length;</div><div class='add'>+		*lastbyte &lt;&lt;= SECTOR_SHIFT;</div><div class='add'>+		*lastbyte -= 1;</div><div class='ctx'> 	}</div><div class='del'>-	*lastbyte = bl-&gt;bl_lwb - 1;</div><div class='del'>-	bl-&gt;bl_lwb = 0;</div><div class='ctx'> 	spin_unlock(&amp;bl-&gt;bl_ext_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ext_tree_prepare_commit - encode extents that need to be committed</div><div class='add'>+ * @arg: layout commit data</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Success, all required extents are encoded</div><div class='add'>+ *   %-ENOSPC: Some extents are encoded, but not all, due to RPC size limit</div><div class='add'>+ *   %-ENOMEM: Out of memory, extents not encoded</div><div class='add'>+ */</div><div class='ctx'> int</div><div class='ctx'> ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -560,20 +638,18 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)</div><div class='ctx'> 	__be32 *start_p;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s enter\n", __func__);</div><div class='del'>-</div><div class='ctx'> 	arg-&gt;layoutupdate_page = alloc_page(GFP_NOFS);</div><div class='ctx'> 	if (!arg-&gt;layoutupdate_page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	start_p = page_address(arg-&gt;layoutupdate_page);</div><div class='ctx'> 	arg-&gt;layoutupdate_pages = &amp;arg-&gt;layoutupdate_page;</div><div class='ctx'> </div><div class='del'>-retry:</div><div class='del'>-	ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, &amp;count, &amp;arg-&gt;lastbytewritten);</div><div class='add'>+	ret = ext_tree_try_encode_commit(bl, start_p + 1, buffer_size,</div><div class='add'>+			&amp;count, &amp;arg-&gt;lastbytewritten);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='ctx'> 		ext_tree_free_commitdata(arg, buffer_size);</div><div class='ctx'> </div><div class='del'>-		buffer_size = ext_tree_layoutupdate_size(bl, count);</div><div class='add'>+		buffer_size = NFS_SERVER(arg-&gt;inode)-&gt;wsize;</div><div class='ctx'> 		count = 0;</div><div class='ctx'> </div><div class='ctx'> 		arg-&gt;layoutupdate_pages =</div><div class='hunk'>@@ -588,7 +664,8 @@ retry:</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		goto retry;</div><div class='add'>+		ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size,</div><div class='add'>+				&amp;count, &amp;arg-&gt;lastbytewritten);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*start_p = cpu_to_be32(count);</div><div class='hunk'>@@ -607,8 +684,9 @@ retry:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk("%s found %zu ranges\n", __func__, count);</div><div class='del'>-	return 0;</div><div class='add'>+	trace_bl_ext_tree_prepare_commit(ret, count,</div><div class='add'>+			arg-&gt;lastbytewritten, !!ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c<br/>index d8d50a88de04..d526f5ba7887 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/rpc_pipefs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/blocklayout/rpc_pipefs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/blocklayout/rpc_pipefs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/blocklayout/rpc_pipefs.c</a></div><div class='hunk'>@@ -141,24 +141,18 @@ static const struct rpc_pipe_ops bl_upcall_ops = {</div><div class='ctx'> 	.destroy_msg	= bl_pipe_destroy_msg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dentry *nfs4blocklayout_register_sb(struct super_block *sb,</div><div class='add'>+static int nfs4blocklayout_register_sb(struct super_block *sb,</div><div class='ctx'> 					    struct rpc_pipe *pipe)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dir, *dentry;</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	dir = rpc_d_lookup_sb(sb, NFS_PIPE_DIRNAME);</div><div class='ctx'> 	if (dir == NULL)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-	dentry = rpc_mkpipe_dentry(dir, "blocklayout", NULL, pipe);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	err = rpc_mkpipe_dentry(dir, "blocklayout", NULL, pipe);</div><div class='ctx'> 	dput(dir);</div><div class='del'>-	return dentry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfs4blocklayout_unregister_sb(struct super_block *sb,</div><div class='del'>-					  struct rpc_pipe *pipe)</div><div class='del'>-{</div><div class='del'>-	if (pipe-&gt;dentry)</div><div class='del'>-		rpc_unlink(pipe-&gt;dentry);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,</div><div class='hunk'>@@ -167,7 +161,6 @@ static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> 	struct super_block *sb = ptr;</div><div class='ctx'> 	struct net *net = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct nfs_net *nn = net_generic(net, nfs_net_id);</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!try_module_get(THIS_MODULE))</div><div class='hunk'>@@ -180,16 +173,10 @@ static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case RPC_PIPEFS_MOUNT:</div><div class='del'>-		dentry = nfs4blocklayout_register_sb(sb, nn-&gt;bl_device_pipe);</div><div class='del'>-		if (IS_ERR(dentry)) {</div><div class='del'>-			ret = PTR_ERR(dentry);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		nn-&gt;bl_device_pipe-&gt;dentry = dentry;</div><div class='add'>+		ret = nfs4blocklayout_register_sb(sb, nn-&gt;bl_device_pipe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RPC_PIPEFS_UMOUNT:</div><div class='del'>-		if (nn-&gt;bl_device_pipe-&gt;dentry)</div><div class='del'>-			nfs4blocklayout_unregister_sb(sb, nn-&gt;bl_device_pipe);</div><div class='add'>+		rpc_unlink(nn-&gt;bl_device_pipe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENOTSUPP;</div><div class='hunk'>@@ -203,18 +190,17 @@ static struct notifier_block nfs4blocklayout_block = {</div><div class='ctx'> 	.notifier_call = rpc_pipefs_event,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dentry *nfs4blocklayout_register_net(struct net *net,</div><div class='del'>-						   struct rpc_pipe *pipe)</div><div class='add'>+static int nfs4blocklayout_register_net(struct net *net, struct rpc_pipe *pipe)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *pipefs_sb;</div><div class='del'>-	struct dentry *dentry;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pipefs_sb = rpc_get_sb_net(net);</div><div class='ctx'> 	if (!pipefs_sb)</div><div class='del'>-		return NULL;</div><div class='del'>-	dentry = nfs4blocklayout_register_sb(pipefs_sb, pipe);</div><div class='add'>+		return 0;</div><div class='add'>+	ret = nfs4blocklayout_register_sb(pipefs_sb, pipe);</div><div class='ctx'> 	rpc_put_sb_net(net);</div><div class='del'>-	return dentry;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs4blocklayout_unregister_net(struct net *net,</div><div class='hunk'>@@ -224,7 +210,7 @@ static void nfs4blocklayout_unregister_net(struct net *net,</div><div class='ctx'> </div><div class='ctx'> 	pipefs_sb = rpc_get_sb_net(net);</div><div class='ctx'> 	if (pipefs_sb) {</div><div class='del'>-		nfs4blocklayout_unregister_sb(pipefs_sb, pipe);</div><div class='add'>+		rpc_unlink(pipe);</div><div class='ctx'> 		rpc_put_sb_net(net);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -232,20 +218,17 @@ static void nfs4blocklayout_unregister_net(struct net *net,</div><div class='ctx'> static int nfs4blocklayout_net_init(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_net *nn = net_generic(net, nfs_net_id);</div><div class='del'>-	struct dentry *dentry;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;nn-&gt;bl_mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;nn-&gt;bl_wq);</div><div class='ctx'> 	nn-&gt;bl_device_pipe = rpc_mkpipe_data(&amp;bl_upcall_ops, 0);</div><div class='ctx'> 	if (IS_ERR(nn-&gt;bl_device_pipe))</div><div class='ctx'> 		return PTR_ERR(nn-&gt;bl_device_pipe);</div><div class='del'>-	dentry = nfs4blocklayout_register_net(net, nn-&gt;bl_device_pipe);</div><div class='del'>-	if (IS_ERR(dentry)) {</div><div class='add'>+	err = nfs4blocklayout_register_net(net, nn-&gt;bl_device_pipe);</div><div class='add'>+	if (unlikely(err))</div><div class='ctx'> 		rpc_destroy_pipe_data(nn-&gt;bl_device_pipe);</div><div class='del'>-		return PTR_ERR(dentry);</div><div class='del'>-	}</div><div class='del'>-	nn-&gt;bl_device_pipe-&gt;dentry = dentry;</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs4blocklayout_net_exit(struct net *net)</div><div class='head'>diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c<br/>index 760d27dd7225..c8b837006bb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/callback.c</a></div><div class='hunk'>@@ -76,6 +76,8 @@ nfs4_callback_svc(void *vrqstp)</div><div class='ctx'> {</div><div class='ctx'> 	struct svc_rqst *rqstp = vrqstp;</div><div class='ctx'> </div><div class='add'>+	svc_thread_init_status(rqstp, 0);</div><div class='add'>+</div><div class='ctx'> 	set_freezable();</div><div class='ctx'> </div><div class='ctx'> 	while (!svc_thread_should_stop(rqstp))</div><div class='hunk'>@@ -134,7 +136,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS: destroy per-net callback data; net=%x\n", net-&gt;ns.inum);</div><div class='del'>-	svc_xprt_destroy_all(serv, net);</div><div class='add'>+	svc_xprt_destroy_all(serv, net, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,</div><div class='hunk'>@@ -151,7 +153,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,</div><div class='ctx'> 	ret = svc_bind(serv, net);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "NFS: bind callback service failed\n");</div><div class='del'>-		goto err_bind;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -164,13 +166,11 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "NFS: callback service start failed\n");</div><div class='del'>-		goto err_socks;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_socks:</div><div class='del'>-	svc_rpcb_cleanup(serv, net);</div><div class='del'>-err_bind:</div><div class='add'>+err:</div><div class='ctx'> 	nn-&gt;cb_users[minorversion]--;</div><div class='ctx'> 	dprintk("NFS: Couldn't create callback socket: err = %d; "</div><div class='ctx'> 			"net = %x\n", ret, net-&gt;ns.inum);</div><div class='hunk'>@@ -209,10 +209,6 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> 	cb_info-&gt;serv = serv;</div><div class='del'>-	/* As there is only one thread we need to over-ride the</div><div class='del'>-	 * default maximum of 80 connections</div><div class='del'>-	 */</div><div class='del'>-	serv-&gt;sv_maxconn = 1024;</div><div class='ctx'> 	dprintk("nfs_callback_create_svc: service created\n");</div><div class='ctx'> 	return serv;</div><div class='ctx'> }</div><div class='hunk'>@@ -356,15 +352,12 @@ static const struct svc_version *nfs4_callback_version[] = {</div><div class='ctx'> 	[4] = &amp;nfs4_callback_version4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct svc_stat nfs4_callback_stats;</div><div class='del'>-</div><div class='ctx'> static struct svc_program nfs4_callback_program = {</div><div class='ctx'> 	.pg_prog = NFS4_CALLBACK,			/* RPC service number */</div><div class='ctx'> 	.pg_nvers = ARRAY_SIZE(nfs4_callback_version),	/* Number of entries */</div><div class='ctx'> 	.pg_vers = nfs4_callback_version,		/* version table */</div><div class='ctx'> 	.pg_name = "NFSv4 callback",			/* service name */</div><div class='ctx'> 	.pg_class = "nfs",				/* authentication class */</div><div class='del'>-	.pg_stats = &amp;nfs4_callback_stats,</div><div class='ctx'> 	.pg_authenticate = nfs_callback_authenticate,</div><div class='ctx'> 	.pg_init_request = svc_generic_init_request,</div><div class='ctx'> 	.pg_rpcbind_set	= svc_generic_rpcbind_set,</div><div class='head'>diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h<br/>index 650758ee0d5f..154a6ed1299f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/callback.h</a></div><div class='hunk'>@@ -46,14 +46,15 @@ struct cb_compound_hdr_res {</div><div class='ctx'> </div><div class='ctx'> struct cb_getattrargs {</div><div class='ctx'> 	struct nfs_fh fh;</div><div class='del'>-	uint32_t bitmap[2];</div><div class='add'>+	uint32_t bitmap[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cb_getattrres {</div><div class='ctx'> 	__be32 status;</div><div class='del'>-	uint32_t bitmap[2];</div><div class='add'>+	uint32_t bitmap[3];</div><div class='ctx'> 	uint64_t size;</div><div class='ctx'> 	uint64_t change_attr;</div><div class='add'>+	struct timespec64 atime;</div><div class='ctx'> 	struct timespec64 ctime;</div><div class='ctx'> 	struct timespec64 mtime;</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c<br/>index 76cea34477ae..8397c43358bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback_proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/callback_proc.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@ __be32 nfs4_callback_getattr(void *argp, void *resp,</div><div class='ctx'> 	if (!cps-&gt;clp) /* Always set for v4.0. Set in cb_sequence for v4.1 */</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	res-&gt;bitmap[0] = res-&gt;bitmap[1] = 0;</div><div class='add'>+	memset(res-&gt;bitmap, 0, sizeof(res-&gt;bitmap));</div><div class='ctx'> 	res-&gt;status = htonl(NFS4ERR_BADHANDLE);</div><div class='ctx'> </div><div class='ctx'> 	dprintk_rcu("NFS: GETATTR callback request from %s\n",</div><div class='hunk'>@@ -59,12 +59,16 @@ __be32 nfs4_callback_getattr(void *argp, void *resp,</div><div class='ctx'> 	res-&gt;change_attr = delegation-&gt;change_attr;</div><div class='ctx'> 	if (nfs_have_writebacks(inode))</div><div class='ctx'> 		res-&gt;change_attr++;</div><div class='add'>+	res-&gt;atime = inode_get_atime(inode);</div><div class='ctx'> 	res-&gt;ctime = inode_get_ctime(inode);</div><div class='ctx'> 	res-&gt;mtime = inode_get_mtime(inode);</div><div class='del'>-	res-&gt;bitmap[0] = (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) &amp;</div><div class='del'>-		args-&gt;bitmap[0];</div><div class='del'>-	res-&gt;bitmap[1] = (FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY) &amp;</div><div class='del'>-		args-&gt;bitmap[1];</div><div class='add'>+	res-&gt;bitmap[0] = (FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE) &amp;</div><div class='add'>+			 args-&gt;bitmap[0];</div><div class='add'>+	res-&gt;bitmap[1] = (FATTR4_WORD1_TIME_ACCESS |</div><div class='add'>+			  FATTR4_WORD1_TIME_METADATA |</div><div class='add'>+			  FATTR4_WORD1_TIME_MODIFY) &amp; args-&gt;bitmap[1];</div><div class='add'>+	res-&gt;bitmap[2] = (FATTR4_WORD2_TIME_DELEG_ACCESS |</div><div class='add'>+			  FATTR4_WORD2_TIME_DELEG_MODIFY) &amp; args-&gt;bitmap[2];</div><div class='ctx'> 	res-&gt;status = 0;</div><div class='ctx'> out_iput:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -319,9 +323,10 @@ static u32 initiate_bulk_draining(struct nfs_client *clp,</div><div class='ctx'> 	int stat;</div><div class='ctx'> </div><div class='ctx'> 	if (args-&gt;cbl_recall_type == RETURN_FSID)</div><div class='del'>-		stat = pnfs_destroy_layouts_byfsid(clp, &amp;args-&gt;cbl_fsid, true);</div><div class='add'>+		stat = pnfs_layout_destroy_byfsid(clp, &amp;args-&gt;cbl_fsid,</div><div class='add'>+						  PNFS_LAYOUT_BULK_RETURN);</div><div class='ctx'> 	else</div><div class='del'>-		stat = pnfs_destroy_layouts_byclid(clp, true);</div><div class='add'>+		stat = pnfs_layout_destroy_byclid(clp, PNFS_LAYOUT_BULK_RETURN);</div><div class='ctx'> 	if (stat != 0)</div><div class='ctx'> 		return NFS4ERR_DELAY;</div><div class='ctx'> 	return NFS4ERR_NOMATCHING_LAYOUT;</div><div class='hunk'>@@ -713,7 +718,7 @@ __be32 nfs4_callback_offload(void *data, void *dummy,</div><div class='ctx'> </div><div class='ctx'> 	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_KERNEL);</div><div class='ctx'> 	if (!copy)</div><div class='del'>-		return htonl(NFS4ERR_SERVERFAULT);</div><div class='add'>+		return cpu_to_be32(NFS4ERR_DELAY);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cps-&gt;clp-&gt;cl_lock);</div><div class='ctx'> 	rcu_read_lock();</div><div class='head'>diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c<br/>index 9369488f2ed4..4254ba3ee7c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback_xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/callback_xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/callback_xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/callback_xdr.c</a></div><div class='hunk'>@@ -25,8 +25,9 @@</div><div class='ctx'> #define CB_OP_GETATTR_BITMAP_MAXSZ	(4 * 4) // bitmap length, 3 bitmaps</div><div class='ctx'> #define CB_OP_GETATTR_RES_MAXSZ		(CB_OP_HDR_RES_MAXSZ + \</div><div class='ctx'> 					 CB_OP_GETATTR_BITMAP_MAXSZ + \</div><div class='del'>-					 /* change, size, ctime, mtime */\</div><div class='del'>-					 (2 + 2 + 3 + 3) * 4)</div><div class='add'>+					 /* change, size, atime, ctime,</div><div class='add'>+					  * mtime, deleg_atime, deleg_mtime */\</div><div class='add'>+					 (2 + 2 + 3 + 3 + 3 + 3 + 3) * 4)</div><div class='ctx'> #define CB_OP_RECALL_RES_MAXSZ		(CB_OP_HDR_RES_MAXSZ)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NFS_V4_1)</div><div class='hunk'>@@ -117,7 +118,9 @@ static __be32 decode_bitmap(struct xdr_stream *xdr, uint32_t *bitmap)</div><div class='ctx'> 	if (likely(attrlen &gt; 0))</div><div class='ctx'> 		bitmap[0] = ntohl(*p++);</div><div class='ctx'> 	if (attrlen &gt; 1)</div><div class='del'>-		bitmap[1] = ntohl(*p);</div><div class='add'>+		bitmap[1] = ntohl(*p++);</div><div class='add'>+	if (attrlen &gt; 2)</div><div class='add'>+		bitmap[2] = ntohl(*p);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,6 +375,8 @@ static __be32 decode_rc_list(struct xdr_stream *xdr,</div><div class='ctx'> </div><div class='ctx'> 	rc_list-&gt;rcl_nrefcalls = ntohl(*p++);</div><div class='ctx'> 	if (rc_list-&gt;rcl_nrefcalls) {</div><div class='add'>+		if (unlikely(rc_list-&gt;rcl_nrefcalls &gt; xdr-&gt;buf-&gt;len))</div><div class='add'>+			goto out;</div><div class='ctx'> 		p = xdr_inline_decode(xdr,</div><div class='ctx'> 			     rc_list-&gt;rcl_nrefcalls * 2 * sizeof(uint32_t));</div><div class='ctx'> 		if (unlikely(p == NULL))</div><div class='hunk'>@@ -445,7 +450,7 @@ static __be32 decode_recallany_args(struct svc_rqst *rqstp,</div><div class='ctx'> 				      void *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct cb_recallanyargs *args = argp;</div><div class='del'>-	uint32_t bitmap[2];</div><div class='add'>+	uint32_t bitmap[3];</div><div class='ctx'> 	__be32 *p, status;</div><div class='ctx'> </div><div class='ctx'> 	p = xdr_inline_decode(xdr, 4);</div><div class='hunk'>@@ -635,6 +640,13 @@ static __be32 encode_attr_time(struct xdr_stream *xdr, const struct timespec64 *</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32 encode_attr_atime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec64 *time)</div><div class='add'>+{</div><div class='add'>+	if (!(bitmap[1] &amp; FATTR4_WORD1_TIME_ACCESS))</div><div class='add'>+		return 0;</div><div class='add'>+	return encode_attr_time(xdr,time);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __be32 encode_attr_ctime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec64 *time)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(bitmap[1] &amp; FATTR4_WORD1_TIME_METADATA))</div><div class='hunk'>@@ -649,6 +661,24 @@ static __be32 encode_attr_mtime(struct xdr_stream *xdr, const uint32_t *bitmap,</div><div class='ctx'> 	return encode_attr_time(xdr,time);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32 encode_attr_delegatime(struct xdr_stream *xdr,</div><div class='add'>+				     const uint32_t *bitmap,</div><div class='add'>+				     const struct timespec64 *time)</div><div class='add'>+{</div><div class='add'>+	if (!(bitmap[2] &amp; FATTR4_WORD2_TIME_DELEG_ACCESS))</div><div class='add'>+		return 0;</div><div class='add'>+	return encode_attr_time(xdr,time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32 encode_attr_delegmtime(struct xdr_stream *xdr,</div><div class='add'>+				     const uint32_t *bitmap,</div><div class='add'>+				     const struct timespec64 *time)</div><div class='add'>+{</div><div class='add'>+	if (!(bitmap[2] &amp; FATTR4_WORD2_TIME_DELEG_MODIFY))</div><div class='add'>+		return 0;</div><div class='add'>+	return encode_attr_time(xdr,time);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __be32 encode_compound_hdr_res(struct xdr_stream *xdr, struct cb_compound_hdr_res *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 status;</div><div class='hunk'>@@ -699,10 +729,19 @@ static __be32 encode_getattr_res(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 	status = encode_attr_size(xdr, res-&gt;bitmap, res-&gt;size);</div><div class='ctx'> 	if (unlikely(status != 0))</div><div class='ctx'> 		goto out;</div><div class='add'>+	status = encode_attr_atime(xdr, res-&gt;bitmap, &amp;res-&gt;atime);</div><div class='add'>+	if (unlikely(status != 0))</div><div class='add'>+		goto out;</div><div class='ctx'> 	status = encode_attr_ctime(xdr, res-&gt;bitmap, &amp;res-&gt;ctime);</div><div class='ctx'> 	if (unlikely(status != 0))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	status = encode_attr_mtime(xdr, res-&gt;bitmap, &amp;res-&gt;mtime);</div><div class='add'>+	if (unlikely(status != 0))</div><div class='add'>+		goto out;</div><div class='add'>+	status = encode_attr_delegatime(xdr, res-&gt;bitmap, &amp;res-&gt;atime);</div><div class='add'>+	if (unlikely(status != 0))</div><div class='add'>+		goto out;</div><div class='add'>+	status = encode_attr_delegmtime(xdr, res-&gt;bitmap, &amp;res-&gt;mtime);</div><div class='ctx'> 	*savep = htonl((unsigned int)((char *)xdr-&gt;p - (char *)(savep+1)));</div><div class='ctx'> out:</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -945,6 +984,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp)</div><div class='ctx'> 			nfs_put_client(cps.clp);</div><div class='ctx'> 			goto out_invalidcred;</div><div class='ctx'> 		}</div><div class='add'>+		svc_xprt_set_valid(rqstp-&gt;rq_xprt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cps.minorversion = hdr_arg.minorversion;</div><div class='head'>diff --git a/fs/nfs/client.c b/fs/nfs/client.c<br/>index 44eca51b2808..54699299d5b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/client.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/client.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;linux/sunrpc/bc_xprt.h&gt;</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "nfs4_fs.h"</div><div class='ctx'> #include "callback.h"</div><div class='hunk'>@@ -55,9 +55,13 @@</div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_CLIENT</div><div class='ctx'> </div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(nfs_client_active_wq);</div><div class='del'>-static DEFINE_SPINLOCK(nfs_version_lock);</div><div class='del'>-static DEFINE_MUTEX(nfs_version_mutex);</div><div class='del'>-static LIST_HEAD(nfs_versions);</div><div class='add'>+static DEFINE_RWLOCK(nfs_version_lock);</div><div class='add'>+</div><div class='add'>+static struct nfs_subversion *nfs_version_mods[5] = {</div><div class='add'>+	[2] = NULL,</div><div class='add'>+	[3] = NULL,</div><div class='add'>+	[4] = NULL,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RPC cruft for NFS</div><div class='hunk'>@@ -73,46 +77,41 @@ const struct rpc_program nfs_program = {</div><div class='ctx'> 	.number			= NFS_PROGRAM,</div><div class='ctx'> 	.nrvers			= ARRAY_SIZE(nfs_version),</div><div class='ctx'> 	.version		= nfs_version,</div><div class='del'>-	.stats			= &amp;nfs_rpcstat,</div><div class='ctx'> 	.pipe_dir_name		= NFS_PIPE_DIRNAME,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct rpc_stat nfs_rpcstat = {</div><div class='del'>-	.program		= &amp;nfs_program</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct nfs_subversion *find_nfs_version(unsigned int version)</div><div class='add'>+static struct nfs_subversion *__find_nfs_version(unsigned int version)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_subversion *nfs;</div><div class='del'>-	spin_lock(&amp;nfs_version_lock);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(nfs, &amp;nfs_versions, list) {</div><div class='del'>-		if (nfs-&gt;rpc_ops-&gt;version == version) {</div><div class='del'>-			spin_unlock(&amp;nfs_version_lock);</div><div class='del'>-			return nfs;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;nfs_version_lock);</div><div class='del'>-	return ERR_PTR(-EPROTONOSUPPORT);</div><div class='add'>+	read_lock(&amp;nfs_version_lock);</div><div class='add'>+	nfs = nfs_version_mods[version];</div><div class='add'>+	read_unlock(&amp;nfs_version_lock);</div><div class='add'>+	return nfs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct nfs_subversion *get_nfs_version(unsigned int version)</div><div class='add'>+struct nfs_subversion *find_nfs_version(unsigned int version)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_subversion *nfs = find_nfs_version(version);</div><div class='add'>+	struct nfs_subversion *nfs = __find_nfs_version(version);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(nfs)) {</div><div class='del'>-		mutex_lock(&amp;nfs_version_mutex);</div><div class='del'>-		request_module("nfsv%d", version);</div><div class='del'>-		nfs = find_nfs_version(version);</div><div class='del'>-		mutex_unlock(&amp;nfs_version_mutex);</div><div class='del'>-	}</div><div class='add'>+	if (!nfs &amp;&amp; request_module("nfsv%d", version) == 0)</div><div class='add'>+		nfs = __find_nfs_version(version);</div><div class='add'>+</div><div class='add'>+	if (!nfs)</div><div class='add'>+		return ERR_PTR(-EPROTONOSUPPORT);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(nfs) &amp;&amp; !try_module_get(nfs-&gt;owner))</div><div class='add'>+	if (!get_nfs_version(nfs))</div><div class='ctx'> 		return ERR_PTR(-EAGAIN);</div><div class='add'>+</div><div class='ctx'> 	return nfs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int get_nfs_version(struct nfs_subversion *nfs)</div><div class='add'>+{</div><div class='add'>+	return try_module_get(nfs-&gt;owner);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(get_nfs_version);</div><div class='add'>+</div><div class='ctx'> void put_nfs_version(struct nfs_subversion *nfs)</div><div class='ctx'> {</div><div class='ctx'> 	module_put(nfs-&gt;owner);</div><div class='hunk'>@@ -120,23 +119,23 @@ void put_nfs_version(struct nfs_subversion *nfs)</div><div class='ctx'> </div><div class='ctx'> void register_nfs_version(struct nfs_subversion *nfs)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;nfs_version_lock);</div><div class='add'>+	write_lock(&amp;nfs_version_lock);</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;nfs-&gt;list, &amp;nfs_versions);</div><div class='add'>+	nfs_version_mods[nfs-&gt;rpc_ops-&gt;version] = nfs;</div><div class='ctx'> 	nfs_version[nfs-&gt;rpc_ops-&gt;version] = nfs-&gt;rpc_vers;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;nfs_version_lock);</div><div class='add'>+	write_unlock(&amp;nfs_version_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(register_nfs_version);</div><div class='ctx'> </div><div class='ctx'> void unregister_nfs_version(struct nfs_subversion *nfs)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;nfs_version_lock);</div><div class='add'>+	write_lock(&amp;nfs_version_lock);</div><div class='ctx'> </div><div class='ctx'> 	nfs_version[nfs-&gt;rpc_ops-&gt;version] = NULL;</div><div class='del'>-	list_del(&amp;nfs-&gt;list);</div><div class='add'>+	nfs_version_mods[nfs-&gt;rpc_ops-&gt;version] = NULL;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;nfs_version_lock);</div><div class='add'>+	write_unlock(&amp;nfs_version_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(unregister_nfs_version);</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +155,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)</div><div class='ctx'> </div><div class='ctx'> 	clp-&gt;cl_minorversion = cl_init-&gt;minorversion;</div><div class='ctx'> 	clp-&gt;cl_nfs_mod = cl_init-&gt;nfs_mod;</div><div class='del'>-	if (!try_module_get(clp-&gt;cl_nfs_mod-&gt;owner))</div><div class='add'>+	if (!get_nfs_version(clp-&gt;cl_nfs_mod))</div><div class='ctx'> 		goto error_dealloc;</div><div class='ctx'> </div><div class='ctx'> 	clp-&gt;rpc_ops = clp-&gt;cl_nfs_mod-&gt;rpc_ops;</div><div class='hunk'>@@ -181,7 +180,14 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)</div><div class='ctx'> 	clp-&gt;cl_proto = cl_init-&gt;proto;</div><div class='ctx'> 	clp-&gt;cl_nconnect = cl_init-&gt;nconnect;</div><div class='ctx'> 	clp-&gt;cl_max_connect = cl_init-&gt;max_connect ? cl_init-&gt;max_connect : 1;</div><div class='del'>-	clp-&gt;cl_net = get_net(cl_init-&gt;net);</div><div class='add'>+	clp-&gt;cl_net = get_net_track(cl_init-&gt;net, &amp;clp-&gt;cl_ns_tracker, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	seqlock_init(&amp;clp-&gt;cl_boot_lock);</div><div class='add'>+	ktime_get_real_ts64(&amp;clp-&gt;cl_nfssvc_boot);</div><div class='add'>+	nfs_uuid_init(&amp;clp-&gt;cl_uuid);</div><div class='add'>+	INIT_WORK(&amp;clp-&gt;cl_local_probe_work, nfs_local_probe_async_work);</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='ctx'> </div><div class='ctx'> 	clp-&gt;cl_principal = "*";</div><div class='ctx'> 	clp-&gt;cl_xprtsec = cl_init-&gt;xprtsec;</div><div class='hunk'>@@ -238,15 +244,17 @@ static void pnfs_init_server(struct nfs_server *server)</div><div class='ctx'>  */</div><div class='ctx'> void nfs_free_client(struct nfs_client *clp)</div><div class='ctx'> {</div><div class='add'>+	nfs_localio_disable_client(clp);</div><div class='add'>+</div><div class='ctx'> 	/* -EIO all pending I/O */</div><div class='ctx'> 	if (!IS_ERR(clp-&gt;cl_rpcclient))</div><div class='ctx'> 		rpc_shutdown_client(clp-&gt;cl_rpcclient);</div><div class='ctx'> </div><div class='del'>-	put_net(clp-&gt;cl_net);</div><div class='add'>+	put_net_track(clp-&gt;cl_net, &amp;clp-&gt;cl_ns_tracker);</div><div class='ctx'> 	put_nfs_version(clp-&gt;cl_nfs_mod);</div><div class='ctx'> 	kfree(clp-&gt;cl_hostname);</div><div class='ctx'> 	kfree(clp-&gt;cl_acceptor);</div><div class='del'>-	kfree(clp);</div><div class='add'>+	kfree_rcu(clp, rcu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_free_client);</div><div class='ctx'> </div><div class='hunk'>@@ -330,6 +338,14 @@ again:</div><div class='ctx'> 		/* Match the xprt security policy */</div><div class='ctx'> 		if (clp-&gt;cl_xprtsec.policy != data-&gt;xprtsec.policy)</div><div class='ctx'> 			continue;</div><div class='add'>+		if (clp-&gt;cl_xprtsec.policy == RPC_XPRTSEC_TLS_X509) {</div><div class='add'>+			if (clp-&gt;cl_xprtsec.cert_serial !=</div><div class='add'>+			    data-&gt;xprtsec.cert_serial)</div><div class='add'>+				continue;</div><div class='add'>+			if (clp-&gt;cl_xprtsec.privkey_serial !=</div><div class='add'>+			    data-&gt;xprtsec.privkey_serial)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		refcount_inc(&amp;clp-&gt;cl_count);</div><div class='ctx'> 		return clp;</div><div class='hunk'>@@ -429,7 +445,10 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)</div><div class='ctx'> 			list_add_tail(&amp;new-&gt;cl_share_link,</div><div class='ctx'> 					&amp;nn-&gt;nfs_client_list);</div><div class='ctx'> 			spin_unlock(&amp;nn-&gt;nfs_client_lock);</div><div class='del'>-			return rpc_ops-&gt;init_client(new, cl_init);</div><div class='add'>+			new = rpc_ops-&gt;init_client(new, cl_init);</div><div class='add'>+			if (!IS_ERR(new))</div><div class='add'>+				 nfs_local_probe_async(new);</div><div class='add'>+			return new;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;nn-&gt;nfs_client_lock);</div><div class='hunk'>@@ -502,6 +521,7 @@ int nfs_create_rpc_client(struct nfs_client *clp,</div><div class='ctx'> 			  const struct nfs_client_initdata *cl_init,</div><div class='ctx'> 			  rpc_authflavor_t flavor)</div><div class='ctx'> {</div><div class='add'>+	struct nfs_net		*nn = net_generic(clp-&gt;cl_net, nfs_net_id);</div><div class='ctx'> 	struct rpc_clnt		*clnt = NULL;</div><div class='ctx'> 	struct rpc_create_args args = {</div><div class='ctx'> 		.net		= clp-&gt;cl_net,</div><div class='hunk'>@@ -513,6 +533,7 @@ int nfs_create_rpc_client(struct nfs_client *clp,</div><div class='ctx'> 		.servername	= clp-&gt;cl_hostname,</div><div class='ctx'> 		.nodename	= cl_init-&gt;nodename,</div><div class='ctx'> 		.program	= &amp;nfs_program,</div><div class='add'>+		.stats		= &amp;nn-&gt;rpcstats,</div><div class='ctx'> 		.version	= clp-&gt;rpc_ops-&gt;version,</div><div class='ctx'> 		.authflavor	= flavor,</div><div class='ctx'> 		.cred		= cl_init-&gt;cred,</div><div class='hunk'>@@ -533,6 +554,8 @@ int nfs_create_rpc_client(struct nfs_client *clp,</div><div class='ctx'> 		args.flags |= RPC_CLNT_CREATE_NOPING;</div><div class='ctx'> 	if (test_bit(NFS_CS_REUSEPORT, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		args.flags |= RPC_CLNT_CREATE_REUSEPORT;</div><div class='add'>+	if (test_bit(NFS_CS_NETUNREACH_FATAL, &amp;clp-&gt;cl_flags))</div><div class='add'>+		args.flags |= RPC_CLNT_CREATE_NETUNREACH_FATAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(clp-&gt;cl_rpcclient))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -667,6 +690,44 @@ struct nfs_client *nfs_init_client(struct nfs_client *clp,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_init_client);</div><div class='ctx'> </div><div class='add'>+static void nfs4_server_set_init_caps(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_V4)</div><div class='add'>+	/* Set the basic capabilities */</div><div class='add'>+	server-&gt;caps = server-&gt;nfs_client-&gt;cl_mvops-&gt;init_caps;</div><div class='add'>+	if (server-&gt;flags &amp; NFS_MOUNT_NORDIRPLUS)</div><div class='add'>+		server-&gt;caps &amp;= ~NFS_CAP_READDIRPLUS;</div><div class='add'>+	if (server-&gt;nfs_client-&gt;cl_proto == XPRT_TRANSPORT_RDMA)</div><div class='add'>+		server-&gt;caps &amp;= ~NFS_CAP_READ_PLUS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower</div><div class='add'>+	 * authentication.</div><div class='add'>+	 */</div><div class='add'>+	if (nfs4_disable_idmapping &amp;&amp;</div><div class='add'>+	    server-&gt;client-&gt;cl_auth-&gt;au_flavor == RPC_AUTH_UNIX)</div><div class='add'>+		server-&gt;caps |= NFS_CAP_UIDGID_NOMAP;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_server_set_init_caps(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+	switch (server-&gt;nfs_client-&gt;rpc_ops-&gt;version) {</div><div class='add'>+	case 2:</div><div class='add'>+		server-&gt;caps = NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		server-&gt;caps = NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS;</div><div class='add'>+		if (!(server-&gt;flags &amp; NFS_MOUNT_NORDIRPLUS))</div><div class='add'>+			server-&gt;caps |= NFS_CAP_READDIRPLUS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nfs4_server_set_init_caps(server);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_server_set_init_caps);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Create a version 2 or 3 client</div><div class='ctx'>  */</div><div class='hunk'>@@ -696,6 +757,9 @@ static int nfs_init_server(struct nfs_server *server,</div><div class='ctx'> 	if (ctx-&gt;flags &amp; NFS_MOUNT_NORESVPORT)</div><div class='ctx'> 		set_bit(NFS_CS_NORESVPORT, &amp;cl_init.init_flags);</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;flags &amp; NFS_MOUNT_NETUNREACH_FATAL)</div><div class='add'>+		__set_bit(NFS_CS_NETUNREACH_FATAL, &amp;cl_init.init_flags);</div><div class='add'>+</div><div class='ctx'> 	/* Allocate or find a client reference we can use */</div><div class='ctx'> 	clp = nfs_get_client(&amp;cl_init);</div><div class='ctx'> 	if (IS_ERR(clp))</div><div class='hunk'>@@ -708,7 +772,6 @@ static int nfs_init_server(struct nfs_server *server,</div><div class='ctx'> 	/* Initialise the client representation from the mount data */</div><div class='ctx'> 	server-&gt;flags = ctx-&gt;flags;</div><div class='ctx'> 	server-&gt;options = ctx-&gt;options;</div><div class='del'>-	server-&gt;caps |= NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS;</div><div class='ctx'> </div><div class='ctx'> 	switch (clp-&gt;rpc_ops-&gt;version) {</div><div class='ctx'> 	case 2:</div><div class='hunk'>@@ -744,6 +807,8 @@ static int nfs_init_server(struct nfs_server *server,</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	nfs_server_set_init_caps(server);</div><div class='add'>+</div><div class='ctx'> 	/* Preserve the values of mount_server-related mount options */</div><div class='ctx'> 	if (ctx-&gt;mount_server.addrlen) {</div><div class='ctx'> 		memcpy(&amp;server-&gt;mountd_address, &amp;ctx-&gt;mount_server.address,</div><div class='hunk'>@@ -796,7 +861,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,</div><div class='ctx'> 		server-&gt;wsize = max_rpc_payload;</div><div class='ctx'> 	if (server-&gt;wsize &gt; NFS_MAX_FILE_IO_SIZE)</div><div class='ctx'> 		server-&gt;wsize = NFS_MAX_FILE_IO_SIZE;</div><div class='del'>-	server-&gt;wpages = (server-&gt;wsize + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;wtmult = nfs_block_bits(fsinfo-&gt;wtmult, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +877,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;maxfilesize = fsinfo-&gt;maxfilesize;</div><div class='ctx'> </div><div class='del'>-	server-&gt;time_delta = fsinfo-&gt;time_delta;</div><div class='ctx'> 	server-&gt;change_attr_type = fsinfo-&gt;change_attr_type;</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;clone_blksize = fsinfo-&gt;clone_blksize;</div><div class='hunk'>@@ -833,6 +896,8 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,</div><div class='ctx'> </div><div class='ctx'> 	if (fsinfo-&gt;xattr_support)</div><div class='ctx'> 		server-&gt;caps |= NFS_CAP_XATTR;</div><div class='add'>+	else</div><div class='add'>+		server-&gt;caps &amp;= ~NFS_CAP_XATTR;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -918,7 +983,6 @@ void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *sour</div><div class='ctx'> 	target-&gt;acregmax = source-&gt;acregmax;</div><div class='ctx'> 	target-&gt;acdirmin = source-&gt;acdirmin;</div><div class='ctx'> 	target-&gt;acdirmax = source-&gt;acdirmax;</div><div class='del'>-	target-&gt;caps = source-&gt;caps;</div><div class='ctx'> 	target-&gt;options = source-&gt;options;</div><div class='ctx'> 	target-&gt;auth_info = source-&gt;auth_info;</div><div class='ctx'> 	target-&gt;port = source-&gt;port;</div><div class='hunk'>@@ -986,8 +1050,10 @@ struct nfs_server *nfs_alloc_server(void)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;server-&gt;layouts);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;server-&gt;state_owners_lru);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;server-&gt;ss_copies);</div><div class='add'>+	INIT_LIST_HEAD(&amp;server-&gt;ss_src_copies);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;server-&gt;active, 0);</div><div class='add'>+	atomic_long_set(&amp;server-&gt;nr_active_delegations, 0);</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;io_stats = nfs_alloc_iostats();</div><div class='ctx'> 	if (!server-&gt;io_stats) {</div><div class='hunk'>@@ -997,8 +1063,11 @@ struct nfs_server *nfs_alloc_server(void)</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;change_attr_type = NFS4_CHANGE_TYPE_IS_UNDEFINED;</div><div class='ctx'> </div><div class='del'>-	ida_init(&amp;server-&gt;openowner_id);</div><div class='del'>-	ida_init(&amp;server-&gt;lockowner_id);</div><div class='add'>+	init_waitqueue_head(&amp;server-&gt;write_congestion_wait);</div><div class='add'>+	atomic_long_set(&amp;server-&gt;writeback, 0);</div><div class='add'>+</div><div class='add'>+	atomic64_set(&amp;server-&gt;owner_ctr, 0);</div><div class='add'>+</div><div class='ctx'> 	pnfs_init_server(server);</div><div class='ctx'> 	rpc_init_wait_queue(&amp;server-&gt;uoc_rpcwaitq, "NFS UOC");</div><div class='ctx'> </div><div class='hunk'>@@ -1006,6 +1075,14 @@ struct nfs_server *nfs_alloc_server(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_alloc_server);</div><div class='ctx'> </div><div class='add'>+static void delayed_free(struct rcu_head *p)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = container_of(p, struct nfs_server, rcu);</div><div class='add'>+</div><div class='add'>+	nfs_free_iostats(server-&gt;io_stats);</div><div class='add'>+	kfree(server);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Free up a server record</div><div class='ctx'>  */</div><div class='hunk'>@@ -1029,12 +1106,9 @@ void nfs_free_server(struct nfs_server *server)</div><div class='ctx'> 	}</div><div class='ctx'> 	ida_free(&amp;s_sysfs_ids, server-&gt;s_sysfs_id);</div><div class='ctx'> </div><div class='del'>-	ida_destroy(&amp;server-&gt;lockowner_id);</div><div class='del'>-	ida_destroy(&amp;server-&gt;openowner_id);</div><div class='del'>-	nfs_free_iostats(server-&gt;io_stats);</div><div class='ctx'> 	put_cred(server-&gt;cred);</div><div class='del'>-	kfree(server);</div><div class='ctx'> 	nfs_release_automount_timer();</div><div class='add'>+	call_rcu(&amp;server-&gt;rcu, delayed_free);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_free_server);</div><div class='ctx'> </div><div class='hunk'>@@ -1078,6 +1152,8 @@ struct nfs_server *nfs_create_server(struct fs_context *fc)</div><div class='ctx'> 		if (server-&gt;namelen == 0 || server-&gt;namelen &gt; NFS2_MAXNAMLEN)</div><div class='ctx'> 			server-&gt;namelen = NFS2_MAXNAMLEN;</div><div class='ctx'> 	}</div><div class='add'>+	/* Linux 'subtree_check' borkenness mandates this setting */</div><div class='add'>+	server-&gt;fh_expire_type = NFS_FH_VOL_RENAME;</div><div class='ctx'> </div><div class='ctx'> 	if (!(fattr-&gt;valid &amp; NFS_ATTR_FATTR)) {</div><div class='ctx'> 		error = ctx-&gt;nfs_mod-&gt;rpc_ops-&gt;getattr(server, ctx-&gt;mntfh,</div><div class='hunk'>@@ -1141,6 +1217,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto out_free_server;</div><div class='ctx'> </div><div class='add'>+	nfs_server_set_init_caps(server);</div><div class='add'>+</div><div class='ctx'> 	/* probe the filesystem info for this server filesystem */</div><div class='ctx'> 	error = nfs_probe_server(server, fh);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='hunk'>@@ -1173,8 +1251,14 @@ void nfs_clients_init(struct net *net)</div><div class='ctx'> #if IS_ENABLED(CONFIG_NFS_V4)</div><div class='ctx'> 	idr_init(&amp;nn-&gt;cb_ident_idr);</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_V4_1)</div><div class='add'>+	INIT_LIST_HEAD(&amp;nn-&gt;nfs4_data_server_cache);</div><div class='add'>+	spin_lock_init(&amp;nn-&gt;nfs4_data_server_lock);</div><div class='add'>+#endif</div><div class='ctx'> 	spin_lock_init(&amp;nn-&gt;nfs_client_lock);</div><div class='ctx'> 	nn-&gt;boot_time = ktime_get_real();</div><div class='add'>+	memset(&amp;nn-&gt;rpcstats, 0, sizeof(nn-&gt;rpcstats));</div><div class='add'>+	nn-&gt;rpcstats.program = &amp;nfs_program;</div><div class='ctx'> </div><div class='ctx'> 	nfs_netns_sysfs_setup(nn, net);</div><div class='ctx'> }</div><div class='hunk'>@@ -1187,6 +1271,9 @@ void nfs_clients_exit(struct net *net)</div><div class='ctx'> 	nfs_cleanup_cb_ident_idr(net);</div><div class='ctx'> 	WARN_ON_ONCE(!list_empty(&amp;nn-&gt;nfs_client_list));</div><div class='ctx'> 	WARN_ON_ONCE(!list_empty(&amp;nn-&gt;nfs_volume_list));</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_V4_1)</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;nn-&gt;nfs4_data_server_cache));</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='head'>diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c<br/>index fa1a14def45c..9d3a5f29f17f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/delegation.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/delegation.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/delegation.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/delegation.c</a></div><div class='hunk'>@@ -27,8 +27,15 @@</div><div class='ctx'> </div><div class='ctx'> #define NFS_DEFAULT_DELEGATION_WATERMARK (5000U)</div><div class='ctx'> </div><div class='del'>-static atomic_long_t nfs_active_delegations;</div><div class='ctx'> static unsigned nfs_delegation_watermark = NFS_DEFAULT_DELEGATION_WATERMARK;</div><div class='add'>+module_param_named(delegation_watermark, nfs_delegation_watermark, uint, 0644);</div><div class='add'>+</div><div class='add'>+static struct hlist_head *nfs_delegation_hash(struct nfs_server *server,</div><div class='add'>+		const struct nfs_fh *fhandle)</div><div class='add'>+{</div><div class='add'>+	return server-&gt;delegation_hash_table +</div><div class='add'>+		(nfs_fhandle_hash(fhandle) &amp; server-&gt;delegation_hash_mask);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void __nfs_free_delegation(struct nfs_delegation *delegation)</div><div class='ctx'> {</div><div class='hunk'>@@ -37,11 +44,12 @@ static void __nfs_free_delegation(struct nfs_delegation *delegation)</div><div class='ctx'> 	kfree_rcu(delegation, rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_mark_delegation_revoked(struct nfs_delegation *delegation)</div><div class='add'>+static void nfs_mark_delegation_revoked(struct nfs_server *server,</div><div class='add'>+		struct nfs_delegation *delegation)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_and_set_bit(NFS_DELEGATION_REVOKED, &amp;delegation-&gt;flags)) {</div><div class='ctx'> 		delegation-&gt;stateid.type = NFS4_INVALID_STATEID_TYPE;</div><div class='del'>-		atomic_long_dec(&amp;nfs_active_delegations);</div><div class='add'>+		atomic_long_dec(&amp;server-&gt;nr_active_delegations);</div><div class='ctx'> 		if (!test_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags))</div><div class='ctx'> 			nfs_clear_verifier_delegated(delegation-&gt;inode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -59,9 +67,10 @@ static void nfs_put_delegation(struct nfs_delegation *delegation)</div><div class='ctx'> 		__nfs_free_delegation(delegation);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_free_delegation(struct nfs_delegation *delegation)</div><div class='add'>+static void nfs_free_delegation(struct nfs_server *server,</div><div class='add'>+		struct nfs_delegation *delegation)</div><div class='ctx'> {</div><div class='del'>-	nfs_mark_delegation_revoked(delegation);</div><div class='add'>+	nfs_mark_delegation_revoked(server, delegation);</div><div class='ctx'> 	nfs_put_delegation(delegation);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -79,14 +88,14 @@ static void nfs_mark_return_delegation(struct nfs_server *server,</div><div class='ctx'> 				       struct nfs_delegation *delegation)</div><div class='ctx'> {</div><div class='ctx'> 	set_bit(NFS_DELEGATION_RETURN, &amp;delegation-&gt;flags);</div><div class='add'>+	set_bit(NFS4SERV_DELEGRETURN, &amp;server-&gt;delegation_flags);</div><div class='ctx'> 	set_bit(NFS4CLNT_DELEGRETURN, &amp;server-&gt;nfs_client-&gt;cl_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='del'>-nfs4_is_valid_delegation(const struct nfs_delegation *delegation,</div><div class='del'>-		fmode_t flags)</div><div class='add'>+static bool nfs4_is_valid_delegation(const struct nfs_delegation *delegation,</div><div class='add'>+				     fmode_t type)</div><div class='ctx'> {</div><div class='del'>-	if (delegation != NULL &amp;&amp; (delegation-&gt;type &amp; flags) == flags &amp;&amp;</div><div class='add'>+	if (delegation != NULL &amp;&amp; (delegation-&gt;type &amp; type) == type &amp;&amp;</div><div class='ctx'> 	    !test_bit(NFS_DELEGATION_REVOKED, &amp;delegation-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    !test_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags))</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -103,19 +112,22 @@ struct nfs_delegation *nfs4_get_valid_delegation(const struct inode *inode)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark)</div><div class='add'>+static int nfs4_do_check_delegation(struct inode *inode, fmode_t type,</div><div class='add'>+				    int flags, bool mark)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_delegation *delegation;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	flags &amp;= FMODE_READ|FMODE_WRITE;</div><div class='add'>+	type &amp;= FMODE_READ|FMODE_WRITE;</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	delegation = rcu_dereference(NFS_I(inode)-&gt;delegation);</div><div class='del'>-	if (nfs4_is_valid_delegation(delegation, flags)) {</div><div class='add'>+	if (nfs4_is_valid_delegation(delegation, type)) {</div><div class='ctx'> 		if (mark)</div><div class='ctx'> 			nfs_mark_delegation_referenced(delegation);</div><div class='ctx'> 		ret = 1;</div><div class='add'>+		if ((flags &amp; NFS_DELEGATION_FLAG_TIME) &amp;&amp;</div><div class='add'>+		    !test_bit(NFS_DELEGATION_DELEGTIME, &amp;delegation-&gt;flags))</div><div class='add'>+			ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -124,22 +136,23 @@ nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark)</div><div class='ctx'>  * nfs4_have_delegation - check if inode has a delegation, mark it</div><div class='ctx'>  * NFS_DELEGATION_REFERENCED if there is one.</div><div class='ctx'>  * @inode: inode to check</div><div class='del'>- * @flags: delegation types to check for</div><div class='add'>+ * @type: delegation types to check for</div><div class='add'>+ * @flags: various modifiers</div><div class='ctx'>  *</div><div class='ctx'>  * Returns one if inode has the indicated delegation, otherwise zero.</div><div class='ctx'>  */</div><div class='del'>-int nfs4_have_delegation(struct inode *inode, fmode_t flags)</div><div class='add'>+int nfs4_have_delegation(struct inode *inode, fmode_t type, int flags)</div><div class='ctx'> {</div><div class='del'>-	return nfs4_do_check_delegation(inode, flags, true);</div><div class='add'>+	return nfs4_do_check_delegation(inode, type, flags, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * nfs4_check_delegation - check if inode has a delegation, do not mark</div><div class='ctx'>  * NFS_DELEGATION_REFERENCED if it has one.</div><div class='ctx'>  */</div><div class='del'>-int nfs4_check_delegation(struct inode *inode, fmode_t flags)</div><div class='add'>+int nfs4_check_delegation(struct inode *inode, fmode_t type)</div><div class='ctx'> {</div><div class='del'>-	return nfs4_do_check_delegation(inode, flags, false);</div><div class='add'>+	return nfs4_do_check_delegation(inode, type, 0, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs_delegation_claim_locks(struct nfs4_state *state, const nfs4_stateid *stateid)</div><div class='hunk'>@@ -156,8 +169,8 @@ static int nfs_delegation_claim_locks(struct nfs4_state *state, const nfs4_state</div><div class='ctx'> 	list = &amp;flctx-&gt;flc_posix;</div><div class='ctx'> 	spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> restart:</div><div class='del'>-	list_for_each_entry(fl, list, fl_list) {</div><div class='del'>-		if (nfs_file_open_context(fl-&gt;fl_file)-&gt;state != state)</div><div class='add'>+	for_each_file_lock(fl, list) {</div><div class='add'>+		if (nfs_file_open_context(fl-&gt;c.flc_file)-&gt;state != state)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> 		status = nfs4_lock_delegation_recall(fl, state, stateid);</div><div class='hunk'>@@ -181,7 +194,6 @@ static int nfs_delegation_claim_opens(struct inode *inode,</div><div class='ctx'> 	struct nfs_open_context *ctx;</div><div class='ctx'> 	struct nfs4_state_owner *sp;</div><div class='ctx'> 	struct nfs4_state *state;</div><div class='del'>-	unsigned int seq;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='hunk'>@@ -202,12 +214,9 @@ again:</div><div class='ctx'> 		sp = state-&gt;owner;</div><div class='ctx'> 		/* Block nfs4_proc_unlck */</div><div class='ctx'> 		mutex_lock(&amp;sp-&gt;so_delegreturn_mutex);</div><div class='del'>-		seq = raw_seqcount_begin(&amp;sp-&gt;so_reclaim_seqcount);</div><div class='ctx'> 		err = nfs4_open_delegation_recall(ctx, state, stateid);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = nfs_delegation_claim_locks(state, stateid);</div><div class='del'>-		if (!err &amp;&amp; read_seqcount_retry(&amp;sp-&gt;so_reclaim_seqcount, seq))</div><div class='del'>-			err = -EAGAIN;</div><div class='ctx'> 		mutex_unlock(&amp;sp-&gt;so_delegreturn_mutex);</div><div class='ctx'> 		put_nfs_open_context(ctx);</div><div class='ctx'> 		if (err != 0)</div><div class='hunk'>@@ -225,40 +234,51 @@ again:</div><div class='ctx'>  * @type: delegation type</div><div class='ctx'>  * @stateid: delegation stateid</div><div class='ctx'>  * @pagemod_limit: write delegation "space_limit"</div><div class='add'>+ * @deleg_type: raw delegation type</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,</div><div class='ctx'> 				  fmode_t type, const nfs4_stateid *stateid,</div><div class='del'>-				  unsigned long pagemod_limit)</div><div class='add'>+				  unsigned long pagemod_limit, u32 deleg_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_delegation *delegation;</div><div class='ctx'> 	const struct cred *oldcred = NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	delegation = rcu_dereference(NFS_I(inode)-&gt;delegation);</div><div class='del'>-	if (delegation != NULL) {</div><div class='del'>-		spin_lock(&amp;delegation-&gt;lock);</div><div class='del'>-		nfs4_stateid_copy(&amp;delegation-&gt;stateid, stateid);</div><div class='del'>-		delegation-&gt;type = type;</div><div class='del'>-		delegation-&gt;pagemod_limit = pagemod_limit;</div><div class='del'>-		oldcred = delegation-&gt;cred;</div><div class='del'>-		delegation-&gt;cred = get_cred(cred);</div><div class='del'>-		clear_bit(NFS_DELEGATION_NEED_RECLAIM, &amp;delegation-&gt;flags);</div><div class='del'>-		if (test_and_clear_bit(NFS_DELEGATION_REVOKED,</div><div class='del'>-				       &amp;delegation-&gt;flags))</div><div class='del'>-			atomic_long_inc(&amp;nfs_active_delegations);</div><div class='del'>-		spin_unlock(&amp;delegation-&gt;lock);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		put_cred(oldcred);</div><div class='del'>-		trace_nfs4_reclaim_delegation(inode, type);</div><div class='del'>-	} else {</div><div class='add'>+	if (!delegation) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		nfs_inode_set_delegation(inode, cred, type, stateid,</div><div class='del'>-					 pagemod_limit);</div><div class='add'>+					 pagemod_limit, deleg_type);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;delegation-&gt;lock);</div><div class='add'>+	nfs4_stateid_copy(&amp;delegation-&gt;stateid, stateid);</div><div class='add'>+	delegation-&gt;type = type;</div><div class='add'>+	delegation-&gt;pagemod_limit = pagemod_limit;</div><div class='add'>+	oldcred = delegation-&gt;cred;</div><div class='add'>+	delegation-&gt;cred = get_cred(cred);</div><div class='add'>+	switch (deleg_type) {</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='add'>+		set_bit(NFS_DELEGATION_DELEGTIME, &amp;delegation-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		clear_bit(NFS_DELEGATION_DELEGTIME, &amp;delegation-&gt;flags);</div><div class='ctx'> 	}</div><div class='add'>+	clear_bit(NFS_DELEGATION_NEED_RECLAIM, &amp;delegation-&gt;flags);</div><div class='add'>+	if (test_and_clear_bit(NFS_DELEGATION_REVOKED, &amp;delegation-&gt;flags))</div><div class='add'>+		atomic_long_inc(&amp;NFS_SERVER(inode)-&gt;nr_active_delegations);</div><div class='add'>+	spin_unlock(&amp;delegation-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	put_cred(oldcred);</div><div class='add'>+	trace_nfs4_reclaim_delegation(inode, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation *delegation, int issync)</div><div class='add'>+static int nfs_do_return_delegation(struct inode *inode,</div><div class='add'>+				    struct nfs_delegation *delegation,</div><div class='add'>+				    int issync)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cred *cred;</div><div class='ctx'> 	int res = 0;</div><div class='hunk'>@@ -267,9 +287,8 @@ static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation *</div><div class='ctx'> 		spin_lock(&amp;delegation-&gt;lock);</div><div class='ctx'> 		cred = get_cred(delegation-&gt;cred);</div><div class='ctx'> 		spin_unlock(&amp;delegation-&gt;lock);</div><div class='del'>-		res = nfs4_proc_delegreturn(inode, cred,</div><div class='del'>-				&amp;delegation-&gt;stateid,</div><div class='del'>-				issync);</div><div class='add'>+		res = nfs4_proc_delegreturn(inode, cred, &amp;delegation-&gt;stateid,</div><div class='add'>+					    delegation, issync);</div><div class='ctx'> 		put_cred(cred);</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -297,7 +316,8 @@ nfs_start_delegation_return_locked(struct nfs_inode *nfsi)</div><div class='ctx'> 	if (delegation == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	spin_lock(&amp;delegation-&gt;lock);</div><div class='del'>-	if (!test_and_set_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags)) {</div><div class='add'>+	if (delegation-&gt;inode &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags)) {</div><div class='ctx'> 		clear_bit(NFS_DELEGATION_RETURN_DELAYED, &amp;delegation-&gt;flags);</div><div class='ctx'> 		/* Refcount matched in nfs_end_delegation_return() */</div><div class='ctx'> 		ret = nfs_get_delegation(delegation);</div><div class='hunk'>@@ -321,14 +341,16 @@ nfs_start_delegation_return(struct nfs_inode *nfsi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_abort_delegation_return(struct nfs_delegation *delegation,</div><div class='del'>-					struct nfs_client *clp, int err)</div><div class='add'>+					struct nfs_server *server, int err)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;delegation-&gt;lock);</div><div class='ctx'> 	clear_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags);</div><div class='ctx'> 	if (err == -EAGAIN) {</div><div class='ctx'> 		set_bit(NFS_DELEGATION_RETURN_DELAYED, &amp;delegation-&gt;flags);</div><div class='del'>-		set_bit(NFS4CLNT_DELEGRETURN_DELAYED, &amp;clp-&gt;cl_state);</div><div class='add'>+		set_bit(NFS4SERV_DELEGRETURN_DELAYED,</div><div class='add'>+			&amp;server-&gt;delegation_flags);</div><div class='add'>+		set_bit(NFS4CLNT_DELEGRETURN_DELAYED,</div><div class='add'>+			&amp;server-&gt;nfs_client-&gt;cl_state);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;delegation-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -342,6 +364,8 @@ nfs_detach_delegation_locked(struct nfs_inode *nfsi,</div><div class='ctx'> 		rcu_dereference_protected(nfsi-&gt;delegation,</div><div class='ctx'> 				lockdep_is_held(&amp;clp-&gt;cl_lock));</div><div class='ctx'> </div><div class='add'>+	trace_nfs4_detach_delegation(&amp;nfsi-&gt;vfs_inode, delegation-&gt;type);</div><div class='add'>+</div><div class='ctx'> 	if (deleg_cur == NULL || delegation != deleg_cur)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +374,7 @@ nfs_detach_delegation_locked(struct nfs_inode *nfsi,</div><div class='ctx'> 		spin_unlock(&amp;delegation-&gt;lock);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	hlist_del_init_rcu(&amp;delegation-&gt;hash);</div><div class='ctx'> 	list_del_rcu(&amp;delegation-&gt;super_list);</div><div class='ctx'> 	delegation-&gt;inode = NULL;</div><div class='ctx'> 	rcu_assign_pointer(nfsi-&gt;delegation, NULL);</div><div class='hunk'>@@ -397,7 +422,8 @@ nfs_update_delegation_cred(struct nfs_delegation *delegation,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nfs_update_inplace_delegation(struct nfs_delegation *delegation,</div><div class='add'>+nfs_update_inplace_delegation(struct nfs_server *server,</div><div class='add'>+		struct nfs_delegation *delegation,</div><div class='ctx'> 		const struct nfs_delegation *update)</div><div class='ctx'> {</div><div class='ctx'> 	if (nfs4_stateid_is_newer(&amp;update-&gt;stateid, &amp;delegation-&gt;stateid)) {</div><div class='hunk'>@@ -410,7 +436,7 @@ nfs_update_inplace_delegation(struct nfs_delegation *delegation,</div><div class='ctx'> 			nfs_update_delegation_cred(delegation, update-&gt;cred);</div><div class='ctx'> 			/* smp_mb__before_atomic() is implicit due to xchg() */</div><div class='ctx'> 			clear_bit(NFS_DELEGATION_REVOKED, &amp;delegation-&gt;flags);</div><div class='del'>-			atomic_long_inc(&amp;nfs_active_delegations);</div><div class='add'>+			atomic_long_inc(&amp;server-&gt;nr_active_delegations);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -422,13 +448,13 @@ nfs_update_inplace_delegation(struct nfs_delegation *delegation,</div><div class='ctx'>  * @type: delegation type</div><div class='ctx'>  * @stateid: delegation stateid</div><div class='ctx'>  * @pagemod_limit: write delegation "space_limit"</div><div class='add'>+ * @deleg_type: raw delegation type</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success, or a negative errno value.</div><div class='ctx'>  */</div><div class='ctx'> int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,</div><div class='del'>-				  fmode_t type,</div><div class='del'>-				  const nfs4_stateid *stateid,</div><div class='del'>-				  unsigned long pagemod_limit)</div><div class='add'>+			     fmode_t type, const nfs4_stateid *stateid,</div><div class='add'>+			     unsigned long pagemod_limit, u32 deleg_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='ctx'> 	struct nfs_client *clp = server-&gt;nfs_client;</div><div class='hunk'>@@ -448,6 +474,11 @@ int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,</div><div class='ctx'> 	delegation-&gt;cred = get_cred(cred);</div><div class='ctx'> 	delegation-&gt;inode = inode;</div><div class='ctx'> 	delegation-&gt;flags = 1&lt;&lt;NFS_DELEGATION_REFERENCED;</div><div class='add'>+	switch (deleg_type) {</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='add'>+		delegation-&gt;flags |= BIT(NFS_DELEGATION_DELEGTIME);</div><div class='add'>+	}</div><div class='ctx'> 	delegation-&gt;test_gen = 0;</div><div class='ctx'> 	spin_lock_init(&amp;delegation-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -460,7 +491,7 @@ int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,</div><div class='ctx'> 	if (nfs4_stateid_match_other(&amp;old_delegation-&gt;stateid,</div><div class='ctx'> 				&amp;delegation-&gt;stateid)) {</div><div class='ctx'> 		spin_lock(&amp;old_delegation-&gt;lock);</div><div class='del'>-		nfs_update_inplace_delegation(old_delegation,</div><div class='add'>+		nfs_update_inplace_delegation(server, old_delegation,</div><div class='ctx'> 				delegation);</div><div class='ctx'> 		spin_unlock(&amp;old_delegation-&gt;lock);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -506,19 +537,26 @@ add_new:</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail_rcu(&amp;delegation-&gt;super_list, &amp;server-&gt;delegations);</div><div class='add'>+	hlist_add_head_rcu(&amp;delegation-&gt;hash,</div><div class='add'>+			nfs_delegation_hash(server, &amp;NFS_I(inode)-&gt;fh));</div><div class='ctx'> 	rcu_assign_pointer(nfsi-&gt;delegation, delegation);</div><div class='ctx'> 	delegation = NULL;</div><div class='ctx'> </div><div class='del'>-	atomic_long_inc(&amp;nfs_active_delegations);</div><div class='add'>+	atomic_long_inc(&amp;server-&gt;nr_active_delegations);</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs4_set_delegation(inode, type);</div><div class='add'>+</div><div class='add'>+	/* If we hold writebacks and have delegated mtime then update */</div><div class='add'>+	if (deleg_type == NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG &amp;&amp;</div><div class='add'>+	    nfs_have_writebacks(inode))</div><div class='add'>+		nfs_update_delegated_mtime(inode);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	if (delegation != NULL)</div><div class='ctx'> 		__nfs_free_delegation(delegation);</div><div class='ctx'> 	if (freeme != NULL) {</div><div class='ctx'> 		nfs_do_return_delegation(inode, freeme, 0);</div><div class='del'>-		nfs_free_delegation(freeme);</div><div class='add'>+		nfs_free_delegation(server, freeme);</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -528,7 +566,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation *delegation, int issync)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_client *clp = NFS_SERVER(inode)-&gt;nfs_client;</div><div class='add'>+	struct nfs_server *server = NFS_SERVER(inode);</div><div class='ctx'> 	unsigned int mode = O_WRONLY | O_RDWR;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -550,11 +588,11 @@ static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Guard against state recovery</div><div class='ctx'> 		 */</div><div class='del'>-		err = nfs4_wait_clnt_recover(clp);</div><div class='add'>+		err = nfs4_wait_clnt_recover(server-&gt;nfs_client);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		nfs_abort_delegation_return(delegation, clp, err);</div><div class='add'>+		nfs_abort_delegation_return(delegation, server, err);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -569,19 +607,10 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='add'>+	trace_nfs_delegation_need_return(delegation);</div><div class='add'>+</div><div class='ctx'> 	if (test_and_clear_bit(NFS_DELEGATION_RETURN, &amp;delegation-&gt;flags))</div><div class='ctx'> 		ret = true;</div><div class='del'>-	else if (test_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags)) {</div><div class='del'>-		struct inode *inode;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;delegation-&gt;lock);</div><div class='del'>-		inode = delegation-&gt;inode;</div><div class='del'>-		if (inode &amp;&amp; list_empty(&amp;NFS_I(inode)-&gt;open_files))</div><div class='del'>-			ret = true;</div><div class='del'>-		spin_unlock(&amp;delegation-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-	if (ret)</div><div class='del'>-		clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags);</div><div class='ctx'> 	if (test_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags) ||</div><div class='ctx'> 	    test_bit(NFS_DELEGATION_RETURN_DELAYED, &amp;delegation-&gt;flags) ||</div><div class='ctx'> 	    test_bit(NFS_DELEGATION_REVOKED, &amp;delegation-&gt;flags))</div><div class='hunk'>@@ -600,6 +629,9 @@ static int nfs_server_return_marked_delegations(struct nfs_server *server,</div><div class='ctx'> 	struct nfs_delegation *place_holder_deleg = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (!test_and_clear_bit(NFS4SERV_DELEGRETURN,</div><div class='add'>+				&amp;server-&gt;delegation_flags))</div><div class='add'>+		return 0;</div><div class='ctx'> restart:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * To avoid quadratic looping we hold a reference</div><div class='hunk'>@@ -628,6 +660,9 @@ restart:</div><div class='ctx'> 				prev = delegation;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+		inode = nfs_delegation_grab_inode(delegation);</div><div class='add'>+		if (inode == NULL)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (prev) {</div><div class='ctx'> 			struct inode *tmp = nfs_delegation_grab_inode(prev);</div><div class='hunk'>@@ -638,12 +673,6 @@ restart:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		inode = nfs_delegation_grab_inode(delegation);</div><div class='del'>-		if (inode == NULL) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			iput(to_put);</div><div class='del'>-			goto restart;</div><div class='del'>-		}</div><div class='ctx'> 		delegation = nfs_start_delegation_return_locked(NFS_I(inode));</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -654,6 +683,7 @@ restart:</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			goto restart;</div><div class='add'>+		set_bit(NFS4SERV_DELEGRETURN, &amp;server-&gt;delegation_flags);</div><div class='ctx'> 		set_bit(NFS4CLNT_DELEGRETURN, &amp;server-&gt;nfs_client-&gt;cl_state);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -668,6 +698,9 @@ static bool nfs_server_clear_delayed_delegations(struct nfs_server *server)</div><div class='ctx'> 	struct nfs_delegation *d;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='add'>+	if (!test_and_clear_bit(NFS4SERV_DELEGRETURN_DELAYED,</div><div class='add'>+				&amp;server-&gt;delegation_flags))</div><div class='add'>+		goto out;</div><div class='ctx'> 	list_for_each_entry_rcu (d, &amp;server-&gt;delegations, super_list) {</div><div class='ctx'> 		if (!test_bit(NFS_DELEGATION_RETURN_DELAYED, &amp;d-&gt;flags))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -675,6 +708,7 @@ static bool nfs_server_clear_delayed_delegations(struct nfs_server *server)</div><div class='ctx'> 		clear_bit(NFS_DELEGATION_RETURN_DELAYED, &amp;d-&gt;flags);</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -734,7 +768,7 @@ void nfs_inode_evict_delegation(struct inode *inode)</div><div class='ctx'> 		set_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags);</div><div class='ctx'> 		set_bit(NFS_DELEGATION_INODE_FREEING, &amp;delegation-&gt;flags);</div><div class='ctx'> 		nfs_do_return_delegation(inode, delegation, 1);</div><div class='del'>-		nfs_free_delegation(delegation);</div><div class='add'>+		nfs_free_delegation(NFS_SERVER(inode), delegation);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -765,6 +799,43 @@ int nfs4_inode_return_delegation(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nfs4_inode_set_return_delegation_on_close - asynchronously return a delegation</div><div class='add'>+ * @inode: inode to process</div><div class='add'>+ *</div><div class='add'>+ * This routine is called to request that the delegation be returned as soon</div><div class='add'>+ * as the file is closed. If the file is already closed, the delegation is</div><div class='add'>+ * immediately returned.</div><div class='add'>+ */</div><div class='add'>+void nfs4_inode_set_return_delegation_on_close(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct nfs_delegation *delegation;</div><div class='add'>+	struct nfs_delegation *ret = NULL;</div><div class='add'>+</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	delegation = nfs4_get_valid_delegation(inode);</div><div class='add'>+	if (!delegation)</div><div class='add'>+		goto out;</div><div class='add'>+	spin_lock(&amp;delegation-&gt;lock);</div><div class='add'>+	if (!delegation-&gt;inode)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	if (list_empty(&amp;NFS_I(inode)-&gt;open_files) &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags)) {</div><div class='add'>+		/* Refcount matched in nfs_end_delegation_return() */</div><div class='add'>+		ret = nfs_get_delegation(delegation);</div><div class='add'>+	} else</div><div class='add'>+		set_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags);</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;delegation-&gt;lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		nfs_clear_verifier_delegated(inode);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	nfs_end_delegation_return(inode, ret, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nfs4_inode_return_delegation_on_close - asynchronously return a delegation</div><div class='ctx'>  * @inode: inode to process</div><div class='ctx'>  *</div><div class='hunk'>@@ -783,7 +854,8 @@ void nfs4_inode_return_delegation_on_close(struct inode *inode)</div><div class='ctx'> 	if (!delegation)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (test_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags) ||</div><div class='del'>-	    atomic_long_read(&amp;nfs_active_delegations) &gt;= nfs_delegation_watermark) {</div><div class='add'>+	    atomic_long_read(&amp;NFS_SERVER(inode)-&gt;nr_active_delegations) &gt;=</div><div class='add'>+	    nfs_delegation_watermark) {</div><div class='ctx'> 		spin_lock(&amp;delegation-&gt;lock);</div><div class='ctx'> 		if (delegation-&gt;inode &amp;&amp;</div><div class='ctx'> 		    list_empty(&amp;NFS_I(inode)-&gt;open_files) &amp;&amp;</div><div class='hunk'>@@ -825,11 +897,25 @@ int nfs4_inode_make_writeable(struct inode *inode)</div><div class='ctx'> 	return nfs4_inode_return_delegation(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_mark_return_if_closed_delegation(struct nfs_server *server,</div><div class='del'>-		struct nfs_delegation *delegation)</div><div class='add'>+static void</div><div class='add'>+nfs_mark_return_if_closed_delegation(struct nfs_server *server,</div><div class='add'>+				     struct nfs_delegation *delegation)</div><div class='ctx'> {</div><div class='del'>-	set_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags);</div><div class='del'>-	set_bit(NFS4CLNT_DELEGRETURN, &amp;server-&gt;nfs_client-&gt;cl_state);</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	if (test_bit(NFS_DELEGATION_RETURN, &amp;delegation-&gt;flags) ||</div><div class='add'>+	    test_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+	spin_lock(&amp;delegation-&gt;lock);</div><div class='add'>+	inode = delegation-&gt;inode;</div><div class='add'>+	if (!inode)</div><div class='add'>+		goto out;</div><div class='add'>+	if (list_empty(&amp;NFS_I(inode)-&gt;open_files))</div><div class='add'>+		nfs_mark_return_delegation(server, delegation);</div><div class='add'>+	else</div><div class='add'>+		set_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &amp;delegation-&gt;flags);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;delegation-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool nfs_server_mark_return_all_delegations(struct nfs_server *server)</div><div class='hunk'>@@ -945,7 +1031,7 @@ static void nfs_revoke_delegation(struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;delegation-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	nfs_mark_delegation_revoked(delegation);</div><div class='add'>+	nfs_mark_delegation_revoked(NFS_SERVER(inode), delegation);</div><div class='ctx'> 	ret = true;</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -953,13 +1039,6 @@ out:</div><div class='ctx'> 		nfs_inode_find_state_and_recover(inode, stateid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void nfs_remove_bad_delegation(struct inode *inode,</div><div class='del'>-		const nfs4_stateid *stateid)</div><div class='del'>-{</div><div class='del'>-	nfs_revoke_delegation(inode, stateid);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nfs_remove_bad_delegation);</div><div class='del'>-</div><div class='ctx'> void nfs_delegation_mark_returned(struct inode *inode,</div><div class='ctx'> 		const nfs4_stateid *stateid)</div><div class='ctx'> {</div><div class='hunk'>@@ -984,7 +1063,12 @@ void nfs_delegation_mark_returned(struct inode *inode,</div><div class='ctx'> 			delegation-&gt;stateid.seqid = stateid-&gt;seqid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nfs_mark_delegation_revoked(delegation);</div><div class='add'>+	nfs_mark_delegation_revoked(NFS_SERVER(inode), delegation);</div><div class='add'>+	clear_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags);</div><div class='add'>+	spin_unlock(&amp;delegation-&gt;lock);</div><div class='add'>+	if (nfs_detach_delegation(NFS_I(inode), delegation, NFS_SERVER(inode)))</div><div class='add'>+		nfs_put_delegation(delegation);</div><div class='add'>+	goto out_rcu_unlock;</div><div class='ctx'> </div><div class='ctx'> out_clear_returning:</div><div class='ctx'> 	clear_bit(NFS_DELEGATION_RETURNING, &amp;delegation-&gt;flags);</div><div class='hunk'>@@ -997,6 +1081,24 @@ out_rcu_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nfs_remove_bad_delegation - handle delegations that are unusable</div><div class='add'>+ * @inode: inode to process</div><div class='add'>+ * @stateid: the delegation's stateid</div><div class='add'>+ *</div><div class='add'>+ * If the server ACK-ed our FREE_STATEID then clean</div><div class='add'>+ * up the delegation, else mark and keep the revoked state.</div><div class='add'>+ */</div><div class='add'>+void nfs_remove_bad_delegation(struct inode *inode,</div><div class='add'>+		const nfs4_stateid *stateid)</div><div class='add'>+{</div><div class='add'>+	if (stateid &amp;&amp; stateid-&gt;type == NFS4_FREED_STATEID_TYPE)</div><div class='add'>+		nfs_delegation_mark_returned(inode, stateid);</div><div class='add'>+	else</div><div class='add'>+		nfs_revoke_delegation(inode, stateid);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_remove_bad_delegation);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nfs_expire_unused_delegation_types</div><div class='ctx'>  * @clp: client to process</div><div class='ctx'>  * @flags: delegation types to expire</div><div class='hunk'>@@ -1074,11 +1176,12 @@ static struct inode *</div><div class='ctx'> nfs_delegation_find_inode_server(struct nfs_server *server,</div><div class='ctx'> 				 const struct nfs_fh *fhandle)</div><div class='ctx'> {</div><div class='add'>+	struct hlist_head *head = nfs_delegation_hash(server, fhandle);</div><div class='ctx'> 	struct nfs_delegation *delegation;</div><div class='ctx'> 	struct super_block *freeme = NULL;</div><div class='ctx'> 	struct inode *res = NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_rcu(delegation, &amp;server-&gt;delegations, super_list) {</div><div class='add'>+	hlist_for_each_entry_rcu(delegation, head, hash) {</div><div class='ctx'> 		spin_lock(&amp;delegation-&gt;lock);</div><div class='ctx'> 		if (delegation-&gt;inode != NULL &amp;&amp;</div><div class='ctx'> 		    !test_bit(NFS_DELEGATION_REVOKED, &amp;delegation-&gt;flags) &amp;&amp;</div><div class='hunk'>@@ -1165,7 +1268,6 @@ static int nfs_server_reap_unclaimed_delegations(struct nfs_server *server,</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> restart:</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-restart_locked:</div><div class='ctx'> 	list_for_each_entry_rcu(delegation, &amp;server-&gt;delegations, super_list) {</div><div class='ctx'> 		if (test_bit(NFS_DELEGATION_INODE_FREEING,</div><div class='ctx'> 					&amp;delegation-&gt;flags) ||</div><div class='hunk'>@@ -1176,13 +1278,13 @@ restart_locked:</div><div class='ctx'> 			continue;</div><div class='ctx'> 		inode = nfs_delegation_grab_inode(delegation);</div><div class='ctx'> 		if (inode == NULL)</div><div class='del'>-			goto restart_locked;</div><div class='add'>+			continue;</div><div class='ctx'> 		delegation = nfs_start_delegation_return_locked(NFS_I(inode));</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		if (delegation != NULL) {</div><div class='ctx'> 			if (nfs_detach_delegation(NFS_I(inode), delegation,</div><div class='ctx'> 						server) != NULL)</div><div class='del'>-				nfs_free_delegation(delegation);</div><div class='add'>+				nfs_free_delegation(server, delegation);</div><div class='ctx'> 			/* Match nfs_start_delegation_return_locked */</div><div class='ctx'> 			nfs_put_delegation(delegation);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1219,6 +1321,7 @@ static void nfs_mark_test_expired_delegation(struct nfs_server *server,</div><div class='ctx'> 		return;</div><div class='ctx'> 	clear_bit(NFS_DELEGATION_NEED_RECLAIM, &amp;delegation-&gt;flags);</div><div class='ctx'> 	set_bit(NFS_DELEGATION_TEST_EXPIRED, &amp;delegation-&gt;flags);</div><div class='add'>+	set_bit(NFS4SERV_DELEGATION_EXPIRED, &amp;server-&gt;delegation_flags);</div><div class='ctx'> 	set_bit(NFS4CLNT_DELEGATION_EXPIRED, &amp;server-&gt;nfs_client-&gt;cl_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1297,9 +1400,11 @@ static int nfs_server_reap_expired_delegations(struct nfs_server *server,</div><div class='ctx'> 	nfs4_stateid stateid;</div><div class='ctx'> 	unsigned long gen = ++server-&gt;delegation_gen;</div><div class='ctx'> </div><div class='add'>+	if (!test_and_clear_bit(NFS4SERV_DELEGATION_EXPIRED,</div><div class='add'>+				&amp;server-&gt;delegation_flags))</div><div class='add'>+		return 0;</div><div class='ctx'> restart:</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-restart_locked:</div><div class='ctx'> 	list_for_each_entry_rcu(delegation, &amp;server-&gt;delegations, super_list) {</div><div class='ctx'> 		if (test_bit(NFS_DELEGATION_INODE_FREEING,</div><div class='ctx'> 					&amp;delegation-&gt;flags) ||</div><div class='hunk'>@@ -1311,7 +1416,7 @@ restart_locked:</div><div class='ctx'> 			continue;</div><div class='ctx'> 		inode = nfs_delegation_grab_inode(delegation);</div><div class='ctx'> 		if (inode == NULL)</div><div class='del'>-			goto restart_locked;</div><div class='add'>+			continue;</div><div class='ctx'> 		spin_lock(&amp;delegation-&gt;lock);</div><div class='ctx'> 		cred = get_cred_rcu(delegation-&gt;cred);</div><div class='ctx'> 		nfs4_stateid_copy(&amp;stateid, &amp;delegation-&gt;stateid);</div><div class='hunk'>@@ -1327,6 +1432,9 @@ restart_locked:</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 		}</div><div class='ctx'> 		nfs_inode_mark_test_expired_delegation(server,inode);</div><div class='add'>+		set_bit(NFS4SERV_DELEGATION_EXPIRED, &amp;server-&gt;delegation_flags);</div><div class='add'>+		set_bit(NFS4CLNT_DELEGATION_EXPIRED,</div><div class='add'>+			&amp;server-&gt;nfs_client-&gt;cl_state);</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1481,4 +1589,17 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_param_named(delegation_watermark, nfs_delegation_watermark, uint, 0644);</div><div class='add'>+int nfs4_delegation_hash_alloc(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+	int delegation_buckets, i;</div><div class='add'>+</div><div class='add'>+	delegation_buckets = roundup_pow_of_two(nfs_delegation_watermark / 16);</div><div class='add'>+	server-&gt;delegation_hash_mask = delegation_buckets - 1;</div><div class='add'>+	server-&gt;delegation_hash_table = kmalloc_array(delegation_buckets,</div><div class='add'>+			sizeof(*server-&gt;delegation_hash_table), GFP_KERNEL);</div><div class='add'>+	if (!server-&gt;delegation_hash_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	for (i = 0; i &lt; delegation_buckets; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;server-&gt;delegation_hash_table[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h<br/>index a6f495d012cf..08ec2e9c68a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/delegation.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/delegation.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/delegation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/delegation.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * NFSv4 delegation</div><div class='ctx'>  */</div><div class='ctx'> struct nfs_delegation {</div><div class='add'>+	struct hlist_node hash;</div><div class='ctx'> 	struct list_head super_list;</div><div class='ctx'> 	const struct cred *cred;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -38,14 +39,18 @@ enum {</div><div class='ctx'> 	NFS_DELEGATION_TEST_EXPIRED,</div><div class='ctx'> 	NFS_DELEGATION_INODE_FREEING,</div><div class='ctx'> 	NFS_DELEGATION_RETURN_DELAYED,</div><div class='add'>+	NFS_DELEGATION_DELEGTIME,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,</div><div class='del'>-		fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit);</div><div class='add'>+			     fmode_t type, const nfs4_stateid *stateid,</div><div class='add'>+			     unsigned long pagemod_limit, u32 deleg_type);</div><div class='ctx'> void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,</div><div class='del'>-		fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit);</div><div class='add'>+				  fmode_t type, const nfs4_stateid *stateid,</div><div class='add'>+				  unsigned long pagemod_limit, u32 deleg_type);</div><div class='ctx'> int nfs4_inode_return_delegation(struct inode *inode);</div><div class='ctx'> void nfs4_inode_return_delegation_on_close(struct inode *inode);</div><div class='add'>+void nfs4_inode_set_return_delegation_on_close(struct inode *inode);</div><div class='ctx'> int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);</div><div class='ctx'> void nfs_inode_evict_delegation(struct inode *inode);</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +72,9 @@ void nfs_test_expired_all_delegations(struct nfs_client *clp);</div><div class='ctx'> void nfs_reap_expired_delegations(struct nfs_client *clp);</div><div class='ctx'> </div><div class='ctx'> /* NFSv4 delegation-related procedures */</div><div class='del'>-int nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred, const nfs4_stateid *stateid, int issync);</div><div class='add'>+int nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred,</div><div class='add'>+			  const nfs4_stateid *stateid,</div><div class='add'>+			  struct nfs_delegation *delegation, int issync);</div><div class='ctx'> int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid);</div><div class='ctx'> int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state, const nfs4_stateid *stateid);</div><div class='ctx'> bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags, nfs4_stateid *dst, const struct cred **cred);</div><div class='hunk'>@@ -75,8 +82,8 @@ bool nfs4_refresh_delegation_stateid(nfs4_stateid *dst, struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> struct nfs_delegation *nfs4_get_valid_delegation(const struct inode *inode);</div><div class='ctx'> void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);</div><div class='del'>-int nfs4_have_delegation(struct inode *inode, fmode_t flags);</div><div class='del'>-int nfs4_check_delegation(struct inode *inode, fmode_t flags);</div><div class='add'>+int nfs4_have_delegation(struct inode *inode, fmode_t type, int flags);</div><div class='add'>+int nfs4_check_delegation(struct inode *inode, fmode_t type);</div><div class='ctx'> bool nfs4_delegation_flush_on_close(const struct inode *inode);</div><div class='ctx'> void nfs_inode_find_delegation_state_and_recover(struct inode *inode,</div><div class='ctx'> 		const nfs4_stateid *stateid);</div><div class='hunk'>@@ -84,9 +91,39 @@ int nfs4_inode_make_writeable(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define NFS_DELEGATION_FLAG_TIME	BIT(1)</div><div class='add'>+</div><div class='add'>+void nfs_update_delegated_atime(struct inode *inode);</div><div class='add'>+void nfs_update_delegated_mtime(struct inode *inode);</div><div class='add'>+void nfs_update_delegated_mtime_locked(struct inode *inode);</div><div class='add'>+</div><div class='add'>+static inline int nfs_have_read_or_write_delegation(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int nfs_have_write_delegation(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_WRITE, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int nfs_have_delegated_attributes(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ);</div><div class='add'>+	return NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int nfs_have_delegated_atime(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ,</div><div class='add'>+						 NFS_DELEGATION_FLAG_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int nfs_have_delegated_mtime(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_WRITE,</div><div class='add'>+						 NFS_DELEGATION_FLAG_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfs4_delegation_hash_alloc(struct nfs_server *server);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c<br/>index c8ecbe999059..ea9f6ca8f30f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/dir.c</a></div><div class='hunk'>@@ -56,6 +56,8 @@ static int nfs_readdir(struct file *, struct dir_context *);</div><div class='ctx'> static int nfs_fsync_dir(struct file *, loff_t, loff_t, int);</div><div class='ctx'> static loff_t nfs_llseek_dir(struct file *, loff_t, int);</div><div class='ctx'> static void nfs_readdir_clear_array(struct folio *);</div><div class='add'>+static int nfs_do_create(struct inode *dir, struct dentry *dentry,</div><div class='add'>+			 umode_t mode, int open_flags);</div><div class='ctx'> </div><div class='ctx'> const struct file_operations nfs_dir_operations = {</div><div class='ctx'> 	.llseek		= nfs_llseek_dir,</div><div class='hunk'>@@ -149,7 +151,7 @@ struct nfs_cache_array {</div><div class='ctx'> 	unsigned char folio_full : 1,</div><div class='ctx'> 		      folio_is_eof : 1,</div><div class='ctx'> 		      cookies_are_ordered : 1;</div><div class='del'>-	struct nfs_cache_array_entry array[];</div><div class='add'>+	struct nfs_cache_array_entry array[] __counted_by(size);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs_readdir_descriptor {</div><div class='hunk'>@@ -326,7 +328,8 @@ static int nfs_readdir_folio_array_append(struct folio *folio,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cache_entry = &amp;array-&gt;array[array-&gt;size];</div><div class='add'>+	array-&gt;size++;</div><div class='add'>+	cache_entry = &amp;array-&gt;array[array-&gt;size - 1];</div><div class='ctx'> 	cache_entry-&gt;cookie = array-&gt;last_cookie;</div><div class='ctx'> 	cache_entry-&gt;ino = entry-&gt;ino;</div><div class='ctx'> 	cache_entry-&gt;d_type = entry-&gt;d_type;</div><div class='hunk'>@@ -335,7 +338,6 @@ static int nfs_readdir_folio_array_append(struct folio *folio,</div><div class='ctx'> 	array-&gt;last_cookie = entry-&gt;cookie;</div><div class='ctx'> 	if (array-&gt;last_cookie &lt;= cache_entry-&gt;cookie)</div><div class='ctx'> 		array-&gt;cookies_are_ordered = 0;</div><div class='del'>-	array-&gt;size++;</div><div class='ctx'> 	if (entry-&gt;eof != 0)</div><div class='ctx'> 		nfs_readdir_array_set_eof(array);</div><div class='ctx'> out:</div><div class='hunk'>@@ -664,6 +666,8 @@ static bool nfs_use_readdirplus(struct inode *dir, struct dir_context *ctx,</div><div class='ctx'> {</div><div class='ctx'> 	if (!nfs_server_capable(dir, NFS_CAP_READDIRPLUS))</div><div class='ctx'> 		return false;</div><div class='add'>+	if (NFS_SERVER(dir)-&gt;flags &amp; NFS_MOUNT_FORCE_RDIRPLUS)</div><div class='add'>+		return true;</div><div class='ctx'> 	if (ctx-&gt;pos == 0 ||</div><div class='ctx'> 	    cache_hits + cache_misses &gt; NFS_READDIR_CACHE_USAGE_THRESHOLD)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -825,17 +829,17 @@ static int nfs_readdir_folio_filler(struct nfs_readdir_descriptor *desc,</div><div class='ctx'> 	struct address_space *mapping = desc-&gt;file-&gt;f_mapping;</div><div class='ctx'> 	struct folio *new, *folio = *arrays;</div><div class='ctx'> 	struct xdr_stream stream;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='ctx'> 	u64 cookie;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	scratch = alloc_page(GFP_KERNEL);</div><div class='add'>+	scratch = folio_alloc(GFP_KERNEL, 0);</div><div class='ctx'> 	if (scratch == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;stream, &amp;buf, xdr_pages, buflen);</div><div class='del'>-	xdr_set_scratch_page(&amp;stream, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;stream, scratch);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		status = nfs_readdir_entry_decode(desc, entry, &amp;stream);</div><div class='hunk'>@@ -887,7 +891,7 @@ static int nfs_readdir_folio_filler(struct nfs_readdir_descriptor *desc,</div><div class='ctx'> 	if (folio != *arrays)</div><div class='ctx'> 		nfs_readdir_folio_unlock_and_put(folio);</div><div class='ctx'> </div><div class='del'>-	put_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1431,11 +1435,11 @@ static bool nfs_verifier_is_delegated(struct dentry *dentry)</div><div class='ctx'> static void nfs_set_verifier_locked(struct dentry *dentry, unsigned long verf)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct inode *dir = d_inode(dentry-&gt;d_parent);</div><div class='add'>+	struct inode *dir = d_inode_rcu(dentry-&gt;d_parent);</div><div class='ctx'> </div><div class='del'>-	if (!nfs_verify_change_attribute(dir, verf))</div><div class='add'>+	if (!dir || !nfs_verify_change_attribute(dir, verf))</div><div class='ctx'> 		return;</div><div class='del'>-	if (inode &amp;&amp; NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ))</div><div class='add'>+	if (inode &amp;&amp; NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ, 0))</div><div class='ctx'> 		nfs_set_verifier_delegated(&amp;verf);</div><div class='ctx'> 	dentry-&gt;d_time = verf;</div><div class='ctx'> }</div><div class='hunk'>@@ -1530,7 +1534,8 @@ static int nfs_is_exclusive_create(struct inode *dir, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (NFS_PROTO(dir)-&gt;version == 2)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return flags &amp; LOOKUP_EXCL;</div><div class='add'>+	return (flags &amp; (LOOKUP_CREATE | LOOKUP_EXCL)) ==</div><div class='add'>+		(LOOKUP_CREATE | LOOKUP_EXCL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1625,7 +1630,16 @@ nfs_lookup_revalidate_done(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	switch (error) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		break;</div><div class='del'>-	case 0:</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		if (inode &amp;&amp; (IS_ROOT(dentry) ||</div><div class='add'>+			      NFS_SERVER(inode)-&gt;flags &amp; NFS_MOUNT_SOFTREVAL))</div><div class='add'>+			error = 1;</div><div class='add'>+		break;</div><div class='add'>+	case -ESTALE:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+		error = 0;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can't d_drop the root of a disconnected tree:</div><div class='ctx'> 		 * its d_hash is on the s_anon list and d_drop() would hide</div><div class='hunk'>@@ -1661,7 +1675,7 @@ nfs_lookup_revalidate_delegated(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	return nfs_lookup_revalidate_done(dir, dentry, inode, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_lookup_revalidate_dentry(struct inode *dir,</div><div class='add'>+static int nfs_lookup_revalidate_dentry(struct inode *dir, const struct qstr *name,</div><div class='ctx'> 					struct dentry *dentry,</div><div class='ctx'> 					struct inode *inode, unsigned int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -1679,19 +1693,9 @@ static int nfs_lookup_revalidate_dentry(struct inode *dir,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	dir_verifier = nfs_save_change_attribute(dir);</div><div class='del'>-	ret = NFS_PROTO(dir)-&gt;lookup(dir, dentry, fhandle, fattr);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		switch (ret) {</div><div class='del'>-		case -ESTALE:</div><div class='del'>-		case -ENOENT:</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		case -ETIMEDOUT:</div><div class='del'>-			if (NFS_SERVER(inode)-&gt;flags &amp; NFS_MOUNT_SOFTREVAL)</div><div class='del'>-				ret = 1;</div><div class='del'>-		}</div><div class='add'>+	ret = NFS_PROTO(dir)-&gt;lookup(dir, dentry, name, fhandle, fattr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Request help from readdirplus */</div><div class='ctx'> 	nfs_lookup_advise_force_readdirplus(dir, flags);</div><div class='hunk'>@@ -1731,11 +1735,11 @@ out:</div><div class='ctx'>  * cached dentry and do a new lookup.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-nfs_do_lookup_revalidate(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			 unsigned int flags)</div><div class='add'>+nfs_do_lookup_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	int error;</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	nfs_inc_stats(dir, NFSIOS_DENTRYREVALIDATE);</div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='hunk'>@@ -1774,47 +1778,57 @@ nfs_do_lookup_revalidate(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	if (NFS_STALE(inode))</div><div class='ctx'> 		goto out_bad;</div><div class='ctx'> </div><div class='del'>-	return nfs_lookup_revalidate_dentry(dir, dentry, inode, flags);</div><div class='add'>+	return nfs_lookup_revalidate_dentry(dir, name, dentry, inode, flags);</div><div class='ctx'> out_valid:</div><div class='ctx'> 	return nfs_lookup_revalidate_done(dir, dentry, inode, 1);</div><div class='ctx'> out_bad:</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='del'>-	return nfs_lookup_revalidate_done(dir, dentry, inode, 0);</div><div class='add'>+	return nfs_lookup_revalidate_done(dir, dentry, inode, error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-__nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags,</div><div class='del'>-			int (*reval)(struct inode *, struct dentry *, unsigned int))</div><div class='add'>+__nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *parent;</div><div class='del'>-	struct inode *dir;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU) {</div><div class='ctx'> 		if (dentry-&gt;d_fsdata == NFS_FSDATA_BLOCKED)</div><div class='ctx'> 			return -ECHILD;</div><div class='del'>-		parent = READ_ONCE(dentry-&gt;d_parent);</div><div class='del'>-		dir = d_inode_rcu(parent);</div><div class='del'>-		if (!dir)</div><div class='del'>-			return -ECHILD;</div><div class='del'>-		ret = reval(dir, dentry, flags);</div><div class='del'>-		if (parent != READ_ONCE(dentry-&gt;d_parent))</div><div class='del'>-			return -ECHILD;</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Wait for unlink to complete */</div><div class='add'>+		/* Wait for unlink to complete - see unblock_revalidate() */</div><div class='ctx'> 		wait_var_event(&amp;dentry-&gt;d_fsdata,</div><div class='del'>-			       dentry-&gt;d_fsdata != NFS_FSDATA_BLOCKED);</div><div class='del'>-		parent = dget_parent(dentry);</div><div class='del'>-		ret = reval(d_inode(parent), dentry, flags);</div><div class='del'>-		dput(parent);</div><div class='add'>+			       smp_load_acquire(&amp;dentry-&gt;d_fsdata)</div><div class='add'>+			       != NFS_FSDATA_BLOCKED);</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_lookup_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	if (__nfs_lookup_revalidate(dentry, flags))</div><div class='add'>+		return -ECHILD;</div><div class='add'>+	return nfs_do_lookup_revalidate(dir, name, dentry, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void block_revalidate(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	/* old devname - just in case */</div><div class='add'>+	kfree(dentry-&gt;d_fsdata);</div><div class='add'>+</div><div class='add'>+	/* Any new reference that could lead to an open</div><div class='add'>+	 * will take -&gt;d_lock in lookup_open() -&gt; d_lookup().</div><div class='add'>+	 * Holding this lock ensures we cannot race with</div><div class='add'>+	 * __nfs_lookup_revalidate() and removes and need</div><div class='add'>+	 * for further barriers.</div><div class='add'>+	 */</div><div class='add'>+	lockdep_assert_held(&amp;dentry-&gt;d_lock);</div><div class='add'>+</div><div class='add'>+	dentry-&gt;d_fsdata = NFS_FSDATA_BLOCKED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static void unblock_revalidate(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return __nfs_lookup_revalidate(dentry, flags, nfs_do_lookup_revalidate);</div><div class='add'>+	store_release_wake_up(&amp;dentry-&gt;d_fsdata, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1957,7 +1971,8 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in</div><div class='ctx'> </div><div class='ctx'> 	dir_verifier = nfs_save_change_attribute(dir);</div><div class='ctx'> 	trace_nfs_lookup_enter(dir, dentry, flags);</div><div class='del'>-	error = NFS_PROTO(dir)-&gt;lookup(dir, dentry, fhandle, fattr);</div><div class='add'>+	error = NFS_PROTO(dir)-&gt;lookup(dir, dentry, &amp;dentry-&gt;d_name,</div><div class='add'>+				       fhandle, fattr);</div><div class='ctx'> 	if (error == -ENOENT) {</div><div class='ctx'> 		if (nfs_server_capable(dir, NFS_CAP_CASE_INSENSITIVE))</div><div class='ctx'> 			dir_verifier = inode_peek_iversion_raw(dir);</div><div class='hunk'>@@ -2000,7 +2015,8 @@ void nfs_d_prune_case_insensitive_aliases(struct inode *inode)</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_d_prune_case_insensitive_aliases);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_NFS_V4)</div><div class='del'>-static int nfs4_lookup_revalidate(struct dentry *, unsigned int);</div><div class='add'>+static int nfs4_lookup_revalidate(struct inode *, const struct qstr *,</div><div class='add'>+				  struct dentry *, unsigned int);</div><div class='ctx'> </div><div class='ctx'> const struct dentry_operations nfs4_dentry_operations = {</div><div class='ctx'> 	.d_revalidate	= nfs4_lookup_revalidate,</div><div class='hunk'>@@ -2182,18 +2198,19 @@ no_open:</div><div class='ctx'> 		else</div><div class='ctx'> 			dput(dentry);</div><div class='ctx'> 	}</div><div class='del'>-	if (IS_ERR(res))</div><div class='del'>-		return PTR_ERR(res);</div><div class='ctx'> 	return finish_no_open(file, res);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_atomic_open);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfs4_do_lookup_revalidate(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			  unsigned int flags)</div><div class='add'>+nfs4_lookup_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+		       struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='add'>+	if (__nfs_lookup_revalidate(dentry, flags))</div><div class='add'>+		return -ECHILD;</div><div class='add'>+</div><div class='ctx'> 	trace_nfs_lookup_revalidate_enter(dir, dentry, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!(flags &amp; LOOKUP_OPEN) || (flags &amp; LOOKUP_DIRECTORY))</div><div class='hunk'>@@ -2229,19 +2246,46 @@ nfs4_do_lookup_revalidate(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> reval_dentry:</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='del'>-	return nfs_lookup_revalidate_dentry(dir, dentry, inode, flags);</div><div class='add'>+	return nfs_lookup_revalidate_dentry(dir, name, dentry, inode, flags);</div><div class='ctx'> </div><div class='ctx'> full_reval:</div><div class='del'>-	return nfs_do_lookup_revalidate(dir, dentry, flags);</div><div class='add'>+	return nfs_do_lookup_revalidate(dir, name, dentry, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+#endif /* CONFIG_NFSV4 */</div><div class='add'>+</div><div class='add'>+int nfs_atomic_open_v23(struct inode *dir, struct dentry *dentry,</div><div class='add'>+			struct file *file, unsigned int open_flags,</div><div class='add'>+			umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	return __nfs_lookup_revalidate(dentry, flags,</div><div class='del'>-			nfs4_do_lookup_revalidate);</div><div class='del'>-}</div><div class='add'>+	struct dentry *res = NULL;</div><div class='add'>+	/* Same as look+open from lookup_open(), but with different O_TRUNC</div><div class='add'>+	 * handling.</div><div class='add'>+	 */</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_NFSV4 */</div><div class='add'>+	if (dentry-&gt;d_name.len &gt; NFS_SERVER(dir)-&gt;namelen)</div><div class='add'>+		return -ENAMETOOLONG;</div><div class='add'>+</div><div class='add'>+	if (open_flags &amp; O_CREAT) {</div><div class='add'>+		error = nfs_do_create(dir, dentry, mode, open_flags);</div><div class='add'>+		if (!error) {</div><div class='add'>+			file-&gt;f_mode |= FMODE_CREATED;</div><div class='add'>+			return finish_open(file, dentry, NULL);</div><div class='add'>+		} else if (error != -EEXIST || open_flags &amp; O_EXCL)</div><div class='add'>+			return error;</div><div class='add'>+	}</div><div class='add'>+	if (d_in_lookup(dentry)) {</div><div class='add'>+		/* The only flags nfs_lookup considers are</div><div class='add'>+		 * LOOKUP_EXCL and LOOKUP_RENAME_TARGET, and</div><div class='add'>+		 * we want those to be zero so the lookup isn't skipped.</div><div class='add'>+		 */</div><div class='add'>+		res = nfs_lookup(dir, dentry, 0);</div><div class='add'>+	}</div><div class='add'>+	return finish_no_open(file, res);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_atomic_open_v23);</div><div class='ctx'> </div><div class='ctx'> struct dentry *</div><div class='ctx'> nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle,</div><div class='hunk'>@@ -2256,7 +2300,8 @@ nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle,</div><div class='ctx'> 	d_drop(dentry);</div><div class='ctx'> </div><div class='ctx'> 	if (fhandle-&gt;size == 0) {</div><div class='del'>-		error = NFS_PROTO(dir)-&gt;lookup(dir, dentry, fhandle, fattr);</div><div class='add'>+		error = NFS_PROTO(dir)-&gt;lookup(dir, dentry, &amp;dentry-&gt;d_name,</div><div class='add'>+					       fhandle, fattr);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2303,18 +2348,23 @@ EXPORT_SYMBOL_GPL(nfs_instantiate);</div><div class='ctx'>  * that the operation succeeded on the server, but an error in the</div><div class='ctx'>  * reply path made it appear to have failed.</div><div class='ctx'>  */</div><div class='del'>-int nfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-	       struct dentry *dentry, umode_t mode, bool excl)</div><div class='add'>+static int nfs_do_create(struct inode *dir, struct dentry *dentry,</div><div class='add'>+			 umode_t mode, int open_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct iattr attr;</div><div class='del'>-	int open_flags = excl ? O_CREAT | O_EXCL : O_CREAT;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	open_flags |= O_CREAT;</div><div class='add'>+</div><div class='ctx'> 	dfprintk(VFS, "NFS: create(%s/%lu), %pd\n",</div><div class='ctx'> 			dir-&gt;i_sb-&gt;s_id, dir-&gt;i_ino, dentry);</div><div class='ctx'> </div><div class='ctx'> 	attr.ia_mode = mode;</div><div class='ctx'> 	attr.ia_valid = ATTR_MODE;</div><div class='add'>+	if (open_flags &amp; O_TRUNC) {</div><div class='add'>+		attr.ia_size = 0;</div><div class='add'>+		attr.ia_valid |= ATTR_SIZE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs_create_enter(dir, dentry, open_flags);</div><div class='ctx'> 	error = NFS_PROTO(dir)-&gt;create(dir, dentry, &amp;attr, open_flags);</div><div class='hunk'>@@ -2326,6 +2376,12 @@ out_err:</div><div class='ctx'> 	d_drop(dentry);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int nfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+	       struct dentry *dentry, umode_t mode, bool excl)</div><div class='add'>+{</div><div class='add'>+	return nfs_do_create(dir, dentry, mode, excl ? O_EXCL : 0);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_create);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2359,11 +2415,11 @@ EXPORT_SYMBOL_GPL(nfs_mknod);</div><div class='ctx'> /*</div><div class='ctx'>  * See comments for nfs_proc_create regarding failed operations.</div><div class='ctx'>  */</div><div class='del'>-int nfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-	      struct dentry *dentry, umode_t mode)</div><div class='add'>+struct dentry *nfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+			 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct iattr attr;</div><div class='del'>-	int error;</div><div class='add'>+	struct dentry *ret;</div><div class='ctx'> </div><div class='ctx'> 	dfprintk(VFS, "NFS: mkdir(%s/%lu), %pd\n",</div><div class='ctx'> 			dir-&gt;i_sb-&gt;s_id, dir-&gt;i_ino, dentry);</div><div class='hunk'>@@ -2372,14 +2428,9 @@ int nfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	attr.ia_mode = mode | S_IFDIR;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs_mkdir_enter(dir, dentry);</div><div class='del'>-	error = NFS_PROTO(dir)-&gt;mkdir(dir, dentry, &amp;attr);</div><div class='del'>-	trace_nfs_mkdir_exit(dir, dentry, error);</div><div class='del'>-	if (error != 0)</div><div class='del'>-		goto out_err;</div><div class='del'>-	return 0;</div><div class='del'>-out_err:</div><div class='del'>-	d_drop(dentry);</div><div class='del'>-	return error;</div><div class='add'>+	ret = NFS_PROTO(dir)-&gt;mkdir(dir, dentry, &amp;attr);</div><div class='add'>+	trace_nfs_mkdir_exit(dir, dentry, PTR_ERR_OR_ZERO(ret));</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_mkdir);</div><div class='ctx'> </div><div class='hunk'>@@ -2501,15 +2552,12 @@ int nfs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	/* old devname */</div><div class='del'>-	kfree(dentry-&gt;d_fsdata);</div><div class='del'>-	dentry-&gt;d_fsdata = NFS_FSDATA_BLOCKED;</div><div class='add'>+	block_revalidate(dentry);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	error = nfs_safe_remove(dentry);</div><div class='ctx'> 	nfs_dentry_remove_handle_error(dir, dentry, error);</div><div class='del'>-	dentry-&gt;d_fsdata = NULL;</div><div class='del'>-	wake_up_var(&amp;dentry-&gt;d_fsdata);</div><div class='add'>+	unblock_revalidate(dentry);</div><div class='ctx'> out:</div><div class='ctx'> 	trace_nfs_unlink_exit(dir, dentry, error);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -2616,8 +2664,19 @@ nfs_unblock_rename(struct rpc_task *task, struct nfs_renamedata *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *new_dentry = data-&gt;new_dentry;</div><div class='ctx'> </div><div class='del'>-	new_dentry-&gt;d_fsdata = NULL;</div><div class='del'>-	wake_up_var(&amp;new_dentry-&gt;d_fsdata);</div><div class='add'>+	unblock_revalidate(new_dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nfs_rename_is_unsafe_cross_dir(struct dentry *old_dentry,</div><div class='add'>+					   struct dentry *new_dentry)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SB(old_dentry-&gt;d_sb);</div><div class='add'>+</div><div class='add'>+	if (old_dentry-&gt;d_parent != new_dentry-&gt;d_parent)</div><div class='add'>+		return false;</div><div class='add'>+	if (server-&gt;fh_expire_type &amp; NFS_FH_RENAME_UNSAFE)</div><div class='add'>+		return !(server-&gt;fh_expire_type &amp; NFS_FH_NOEXPIRE_WITH_OPEN);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2679,11 +2738,6 @@ int nfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 		if (WARN_ON(new_dentry-&gt;d_flags &amp; DCACHE_NFSFS_RENAMED) ||</div><div class='ctx'> 		    WARN_ON(new_dentry-&gt;d_fsdata == NFS_FSDATA_BLOCKED))</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (new_dentry-&gt;d_fsdata) {</div><div class='del'>-			/* old devname */</div><div class='del'>-			kfree(new_dentry-&gt;d_fsdata);</div><div class='del'>-			new_dentry-&gt;d_fsdata = NULL;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;new_dentry-&gt;d_lock);</div><div class='ctx'> 		if (d_count(new_dentry) &gt; 2) {</div><div class='hunk'>@@ -2705,18 +2759,21 @@ int nfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,</div><div class='ctx'> 			new_dentry = dentry;</div><div class='ctx'> 			new_inode = NULL;</div><div class='ctx'> 		} else {</div><div class='del'>-			new_dentry-&gt;d_fsdata = NFS_FSDATA_BLOCKED;</div><div class='add'>+			block_revalidate(new_dentry);</div><div class='ctx'> 			must_unblock = true;</div><div class='ctx'> 			spin_unlock(&amp;new_dentry-&gt;d_lock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (S_ISREG(old_inode-&gt;i_mode))</div><div class='add'>+	if (S_ISREG(old_inode-&gt;i_mode) &amp;&amp;</div><div class='add'>+	    nfs_rename_is_unsafe_cross_dir(old_dentry, new_dentry))</div><div class='ctx'> 		nfs_sync_inode(old_inode);</div><div class='ctx'> 	task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry,</div><div class='ctx'> 				must_unblock ? nfs_unblock_rename : NULL);</div><div class='ctx'> 	if (IS_ERR(task)) {</div><div class='add'>+		if (must_unblock)</div><div class='add'>+			unblock_revalidate(new_dentry);</div><div class='ctx'> 		error = PTR_ERR(task);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c<br/>index c03926a1cc73..48d89716193a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/direct.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/direct.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/direct.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/direct.c</a></div><div class='hunk'>@@ -56,6 +56,7 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "delegation.h"</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "iostat.h"</div><div class='ctx'> #include "pnfs.h"</div><div class='hunk'>@@ -130,6 +131,20 @@ static void nfs_direct_truncate_request(struct nfs_direct_req *dreq,</div><div class='ctx'> 		dreq-&gt;count = req_start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nfs_direct_file_adjust_size_locked(struct inode *inode,</div><div class='add'>+					       loff_t offset, size_t count)</div><div class='add'>+{</div><div class='add'>+	loff_t newsize = offset + (loff_t)count;</div><div class='add'>+	loff_t oldsize = i_size_read(inode);</div><div class='add'>+</div><div class='add'>+	if (newsize &gt; oldsize) {</div><div class='add'>+		i_size_write(inode, newsize);</div><div class='add'>+		NFS_I(inode)-&gt;cache_validity &amp;= ~NFS_INO_INVALID_SIZE;</div><div class='add'>+		trace_nfs_size_grow(inode, newsize);</div><div class='add'>+		nfs_inc_stats(inode, NFSIOS_EXTENDWRITE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfs_swap_rw - NFS address space operation for swap I/O</div><div class='ctx'>  * @iocb: target I/O control block</div><div class='hunk'>@@ -141,8 +156,6 @@ int nfs_swap_rw(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	VM_BUG_ON(iov_iter_count(iter) != PAGE_SIZE);</div><div class='del'>-</div><div class='ctx'> 	if (iov_iter_rw(iter) == READ)</div><div class='ctx'> 		ret = nfs_file_direct_read(iocb, iter, true);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -274,6 +287,8 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	nfs_direct_count_bytes(dreq, hdr);</div><div class='ctx'> 	spin_unlock(&amp;dreq-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	nfs_update_delegated_atime(dreq-&gt;inode);</div><div class='add'>+</div><div class='ctx'> 	while (!list_empty(&amp;hdr-&gt;pages)) {</div><div class='ctx'> 		struct nfs_page *req = nfs_list_entry(hdr-&gt;pages.next);</div><div class='ctx'> 		struct page *page = req-&gt;wb_page;</div><div class='hunk'>@@ -305,6 +320,7 @@ static void nfs_read_sync_pgio_error(struct list_head *head, int error)</div><div class='ctx'> static void nfs_direct_pgio_init(struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	get_dreq(hdr-&gt;dreq);</div><div class='add'>+	set_bit(NFS_IOHDR_ODIRECT, &amp;hdr-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nfs_pgio_completion_ops nfs_direct_read_completion_ops = {</div><div class='hunk'>@@ -456,8 +472,16 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 	if (user_backed_iter(iter))</div><div class='ctx'> 		dreq-&gt;flags = NFS_ODIRECT_SHOULD_DIRTY;</div><div class='ctx'> </div><div class='del'>-	if (!swap)</div><div class='del'>-		nfs_start_io_direct(inode);</div><div class='add'>+	if (!swap) {</div><div class='add'>+		result = nfs_start_io_direct(inode);</div><div class='add'>+		if (result) {</div><div class='add'>+			/* release the reference that would usually be</div><div class='add'>+			 * consumed by nfs_direct_read_schedule_iovec()</div><div class='add'>+			 */</div><div class='add'>+			nfs_direct_req_release(dreq);</div><div class='add'>+			goto out_release;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	NFS_I(inode)-&gt;read_io += count;</div><div class='ctx'> 	requested = nfs_direct_read_schedule_iovec(dreq, iter, iocb-&gt;ki_pos);</div><div class='hunk'>@@ -606,6 +630,7 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs_direct_commit_complete(dreq);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;dreq-&gt;lock);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		/* Errors in commit are fatal */</div><div class='ctx'> 		dreq-&gt;error = status;</div><div class='hunk'>@@ -613,6 +638,7 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status = dreq-&gt;error;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;dreq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	nfs_init_cinfo_from_dreq(&amp;cinfo, dreq);</div><div class='ctx'> </div><div class='hunk'>@@ -625,7 +651,10 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)</div><div class='ctx'> 			spin_unlock(&amp;dreq-&gt;lock);</div><div class='ctx'> 			nfs_release_request(req);</div><div class='ctx'> 		} else if (!nfs_write_match_verf(verf, req)) {</div><div class='del'>-			dreq-&gt;flags = NFS_ODIRECT_RESCHED_WRITES;</div><div class='add'>+			spin_lock(&amp;dreq-&gt;lock);</div><div class='add'>+			if (dreq-&gt;flags == 0)</div><div class='add'>+				dreq-&gt;flags = NFS_ODIRECT_RESCHED_WRITES;</div><div class='add'>+			spin_unlock(&amp;dreq-&gt;lock);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Despite the reboot, the write was successful,</div><div class='ctx'> 			 * so reset wb_nio.</div><div class='hunk'>@@ -667,10 +696,17 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)</div><div class='ctx'> 	LIST_HEAD(mds_list);</div><div class='ctx'> </div><div class='ctx'> 	nfs_init_cinfo_from_dreq(&amp;cinfo, dreq);</div><div class='add'>+	nfs_commit_begin(cinfo.mds);</div><div class='ctx'> 	nfs_scan_commit(dreq-&gt;inode, &amp;mds_list, &amp;cinfo);</div><div class='ctx'> 	res = nfs_generic_commit_list(dreq-&gt;inode, &amp;mds_list, 0, &amp;cinfo);</div><div class='del'>-	if (res &lt; 0) /* res == -ENOMEM */</div><div class='del'>-		nfs_direct_write_reschedule(dreq);</div><div class='add'>+	if (res &lt; 0) { /* res == -ENOMEM */</div><div class='add'>+		spin_lock(&amp;dreq-&gt;lock);</div><div class='add'>+		if (dreq-&gt;flags == 0)</div><div class='add'>+			dreq-&gt;flags = NFS_ODIRECT_RESCHED_WRITES;</div><div class='add'>+		spin_unlock(&amp;dreq-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	if (nfs_commit_end(cinfo.mds))</div><div class='add'>+		nfs_direct_write_complete(dreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_direct_write_clear_reqs(struct nfs_direct_req *dreq)</div><div class='hunk'>@@ -721,7 +757,7 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_direct_req *dreq = hdr-&gt;dreq;</div><div class='ctx'> 	struct nfs_commit_info cinfo;</div><div class='del'>-	struct nfs_page *req = nfs_list_entry(hdr-&gt;pages.next);</div><div class='add'>+	struct inode *inode = dreq-&gt;inode;</div><div class='ctx'> 	int flags = NFS_ODIRECT_DONE;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs_direct_write_completion(dreq);</div><div class='hunk'>@@ -743,7 +779,13 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;dreq-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	nfs_direct_file_adjust_size_locked(inode, dreq-&gt;io_start, dreq-&gt;count);</div><div class='add'>+	nfs_update_delegated_mtime_locked(dreq-&gt;inode);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='ctx'> 	while (!list_empty(&amp;hdr-&gt;pages)) {</div><div class='add'>+		struct nfs_page *req;</div><div class='ctx'> </div><div class='ctx'> 		req = nfs_list_entry(hdr-&gt;pages.next);</div><div class='ctx'> 		nfs_list_remove_request(req);</div><div class='hunk'>@@ -997,7 +1039,14 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		requested = nfs_direct_write_schedule_iovec(dreq, iter, pos,</div><div class='ctx'> 							    FLUSH_STABLE);</div><div class='ctx'> 	} else {</div><div class='del'>-		nfs_start_io_direct(inode);</div><div class='add'>+		result = nfs_start_io_direct(inode);</div><div class='add'>+		if (result) {</div><div class='add'>+			/* release the reference that would usually be</div><div class='add'>+			 * consumed by nfs_direct_write_schedule_iovec()</div><div class='add'>+			 */</div><div class='add'>+			nfs_direct_req_release(dreq);</div><div class='add'>+			goto out_release;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		requested = nfs_direct_write_schedule_iovec(dreq, iter, pos,</div><div class='ctx'> 							    FLUSH_COND_STABLE);</div><div class='hunk'>@@ -1037,8 +1086,7 @@ int __init nfs_init_directcache(void)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",</div><div class='ctx'> 						sizeof(struct nfs_direct_req),</div><div class='del'>-						0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-							SLAB_MEM_SPREAD),</div><div class='add'>+						0, SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 						NULL);</div><div class='ctx'> 	if (nfs_direct_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/nfs/export.c b/fs/nfs/export.c<br/>index be686b8e0c54..a10dd5f9d078 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/export.c</a></div><div class='hunk'>@@ -66,14 +66,21 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid,</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_fattr *fattr = NULL;</div><div class='ctx'> 	struct nfs_fh *server_fh = nfs_exp_embedfh(fid-&gt;raw);</div><div class='del'>-	size_t fh_size = offsetof(struct nfs_fh, data) + server_fh-&gt;size;</div><div class='add'>+	size_t fh_size = offsetof(struct nfs_fh, data);</div><div class='ctx'> 	const struct nfs_rpc_ops *rpc_ops;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	int len = EMBED_FH_OFF + XDR_QUADLEN(fh_size);</div><div class='add'>+	int len = EMBED_FH_OFF;</div><div class='ctx'> 	u32 *p = fid-&gt;raw;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* Initial check of bounds */</div><div class='add'>+	if (fh_len &lt; len + XDR_QUADLEN(fh_size) ||</div><div class='add'>+	    fh_len &gt; XDR_QUADLEN(NFS_MAXFHSIZE))</div><div class='add'>+		return NULL;</div><div class='add'>+	/* Calculate embedded filehandle size */</div><div class='add'>+	fh_size += server_fh-&gt;size;</div><div class='add'>+	len += XDR_QUADLEN(fh_size);</div><div class='ctx'> 	/* NULL translates to ESTALE */</div><div class='ctx'> 	if (fh_len &lt; len || fh_type != len)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -154,5 +161,6 @@ const struct export_operations nfs_export_ops = {</div><div class='ctx'> 		 EXPORT_OP_CLOSE_BEFORE_UNLINK	|</div><div class='ctx'> 		 EXPORT_OP_REMOTE_FS		|</div><div class='ctx'> 		 EXPORT_OP_NOATOMIC_ATTR	|</div><div class='del'>-		 EXPORT_OP_FLUSH_ON_CLOSE,</div><div class='add'>+		 EXPORT_OP_FLUSH_ON_CLOSE	|</div><div class='add'>+		 EXPORT_OP_NOLOCKS,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfs/file.c b/fs/nfs/file.c<br/>index 8577ccf621f5..d020aab40c64 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/file.c</a></div><div class='hunk'>@@ -28,7 +28,9 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/rmap.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='add'>+#include &lt;linux/compaction.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='hunk'>@@ -159,6 +161,8 @@ nfs_file_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='ctx'> 	ssize_t result;</div><div class='ctx'> </div><div class='add'>+	trace_nfs_file_read(iocb, to);</div><div class='add'>+</div><div class='ctx'> 	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT)</div><div class='ctx'> 		return nfs_file_direct_read(iocb, to, false);</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +170,10 @@ nfs_file_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 		iocb-&gt;ki_filp,</div><div class='ctx'> 		iov_iter_count(to), (unsigned long) iocb-&gt;ki_pos);</div><div class='ctx'> </div><div class='del'>-	nfs_start_io_read(inode);</div><div class='add'>+	result = nfs_start_io_read(inode);</div><div class='add'>+	if (result)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='ctx'> 	result = nfs_revalidate_mapping(inode, iocb-&gt;ki_filp-&gt;f_mapping);</div><div class='ctx'> 	if (!result) {</div><div class='ctx'> 		result = generic_file_read_iter(iocb, to);</div><div class='hunk'>@@ -187,7 +194,10 @@ nfs_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS: splice_read(%pD2, %zu@%llu)\n", in, len, *ppos);</div><div class='ctx'> </div><div class='del'>-	nfs_start_io_read(inode);</div><div class='add'>+	result = nfs_start_io_read(inode);</div><div class='add'>+	if (result)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='ctx'> 	result = nfs_revalidate_mapping(inode, in-&gt;f_mapping);</div><div class='ctx'> 	if (!result) {</div><div class='ctx'> 		result = filemap_splice_read(in, ppos, pipe, len, flags);</div><div class='hunk'>@@ -200,24 +210,25 @@ nfs_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_file_splice_read);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+nfs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	int	status;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS: mmap(%pD2)\n", file);</div><div class='ctx'> </div><div class='del'>-	/* Note: generic_file_mmap() returns ENOSYS on nommu systems</div><div class='add'>+	/* Note: generic_file_mmap_prepare() returns ENOSYS on nommu systems</div><div class='ctx'> 	 *       so we call that before revalidating the mapping</div><div class='ctx'> 	 */</div><div class='del'>-	status = generic_file_mmap(file, vma);</div><div class='add'>+	status = generic_file_mmap_prepare(desc);</div><div class='ctx'> 	if (!status) {</div><div class='del'>-		vma-&gt;vm_ops = &amp;nfs_file_vm_ops;</div><div class='add'>+		desc-&gt;vm_ops = &amp;nfs_file_vm_ops;</div><div class='ctx'> 		status = nfs_revalidate_mapping(inode, file-&gt;f_mapping);</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nfs_file_mmap);</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_file_mmap_prepare);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flush any dirty pages for this process, and check for write errors.</div><div class='hunk'>@@ -272,6 +283,37 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_file_fsync);</div><div class='ctx'> </div><div class='add'>+void nfs_truncate_last_folio(struct address_space *mapping, loff_t from,</div><div class='add'>+			     loff_t to)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='add'>+	if (from &gt;= to)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	folio = filemap_lock_folio(mapping, from &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (folio_mkclean(folio))</div><div class='add'>+		folio_mark_dirty(folio);</div><div class='add'>+</div><div class='add'>+	if (folio_test_uptodate(folio)) {</div><div class='add'>+		loff_t fpos = folio_pos(folio);</div><div class='add'>+		size_t offset = from - fpos;</div><div class='add'>+		size_t end = folio_size(folio);</div><div class='add'>+</div><div class='add'>+		if (to - fpos &lt; end)</div><div class='add'>+			end = to - fpos;</div><div class='add'>+		folio_zero_segment(folio, offset, end);</div><div class='add'>+		trace_nfs_size_truncate_folio(mapping-&gt;host, to);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_truncate_last_folio);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Decide whether a read/modify/write cycle may be more efficient</div><div class='ctx'>  * then a modify/write/read cycle when writing to a page in the</div><div class='hunk'>@@ -321,6 +363,8 @@ static bool nfs_want_read_modify_write(struct file *file, struct folio *folio,</div><div class='ctx'> </div><div class='ctx'> 	if (pnfs_ld_read_whole_page(file_inode(file)))</div><div class='ctx'> 		return true;</div><div class='add'>+	if (folio_test_dropbehind(folio))</div><div class='add'>+		return false;</div><div class='ctx'> 	/* Open for reading too? */</div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -335,23 +379,29 @@ static bool nfs_want_read_modify_write(struct file *file, struct folio *folio,</div><div class='ctx'>  * If the writer ends up delaying the write, the writer needs to</div><div class='ctx'>  * increment the page use counts until he is done with the page.</div><div class='ctx'>  */</div><div class='del'>-static int nfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			   loff_t pos, unsigned len, struct page **pagep,</div><div class='add'>+static int nfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='add'>+			   loff_t pos, unsigned len, struct folio **foliop,</div><div class='ctx'> 			   void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio;</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	int once_thru = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	trace_nfs_write_begin(file_inode(file), pos, len);</div><div class='add'>+</div><div class='ctx'> 	dfprintk(PAGECACHE, "NFS: write_begin(%pD2(%lu), %u@%lld)\n",</div><div class='ctx'> 		file, mapping-&gt;host-&gt;i_ino, len, (long long) pos);</div><div class='add'>+	nfs_truncate_last_folio(mapping, i_size_read(mapping-&gt;host), pos);</div><div class='ctx'> </div><div class='ctx'> start:</div><div class='del'>-	folio = __filemap_get_folio(mapping, pos &gt;&gt; PAGE_SHIFT, FGP_WRITEBEGIN,</div><div class='del'>-				    mapping_gfp_mask(mapping));</div><div class='del'>-	if (IS_ERR(folio))</div><div class='del'>-		return PTR_ERR(folio);</div><div class='del'>-	*pagep = &amp;folio-&gt;page;</div><div class='add'>+	folio = write_begin_get_folio(iocb, mapping, pos &gt;&gt; PAGE_SHIFT, len);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	ret = nfs_flush_incompatible(file, folio);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -360,23 +410,28 @@ start:</div><div class='ctx'> 	} else if (!once_thru &amp;&amp;</div><div class='ctx'> 		   nfs_want_read_modify_write(file, folio, pos, len)) {</div><div class='ctx'> 		once_thru = 1;</div><div class='add'>+		folio_clear_dropbehind(folio);</div><div class='ctx'> 		ret = nfs_read_folio(file, folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			goto start;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	trace_nfs_write_begin_done(file_inode(file), pos, len, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+static int nfs_write_end(const struct kiocb *iocb,</div><div class='add'>+			 struct address_space *mapping,</div><div class='ctx'> 			 loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			 struct page *page, void *fsdata)</div><div class='add'>+			 struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct nfs_open_context *ctx = nfs_file_open_context(file);</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	unsigned offset = offset_in_folio(folio, pos);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='add'>+	trace_nfs_write_end(file_inode(file), pos, len);</div><div class='ctx'> 	dfprintk(PAGECACHE, "NFS: write_end(%pD2(%lu), %u@%lld)\n",</div><div class='ctx'> 		file, mapping-&gt;host-&gt;i_ino, len, (long long) pos);</div><div class='ctx'> </div><div class='hunk'>@@ -405,13 +460,16 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	if (status &lt; 0)</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		trace_nfs_write_end_done(file_inode(file), pos, len, status);</div><div class='ctx'> 		return status;</div><div class='add'>+	}</div><div class='ctx'> 	NFS_I(mapping-&gt;host)-&gt;write_io += copied;</div><div class='ctx'> </div><div class='ctx'> 	if (nfs_ctx_key_to_expire(ctx, mapping-&gt;host))</div><div class='ctx'> 		nfs_wb_all(mapping-&gt;host);</div><div class='ctx'> </div><div class='add'>+	trace_nfs_write_end_done(file_inode(file), pos, len, copied);</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -425,16 +483,17 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> static void nfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 				size_t length)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	dfprintk(PAGECACHE, "NFS: invalidate_folio(%lu, %zu, %zu)\n",</div><div class='ctx'> 		 folio-&gt;index, offset, length);</div><div class='ctx'> </div><div class='del'>-	if (offset != 0 || length &lt; folio_size(folio))</div><div class='del'>-		return;</div><div class='ctx'> 	/* Cancel any unstarted writes on this page */</div><div class='del'>-	nfs_wb_folio_cancel(inode, folio);</div><div class='del'>-	folio_wait_fscache(folio);</div><div class='del'>-	trace_nfs_invalidate_folio(inode, folio);</div><div class='add'>+	if (offset != 0 || length &lt; folio_size(folio))</div><div class='add'>+		nfs_wb_folio(inode, folio);</div><div class='add'>+	else</div><div class='add'>+		nfs_wb_folio_cancel(inode, folio);</div><div class='add'>+	folio_wait_private_2(folio); /* [DEPRECATED] */</div><div class='add'>+	trace_nfs_invalidate_folio(inode, folio_pos(folio) + offset, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -450,9 +509,9 @@ static bool nfs_release_folio(struct folio *folio, gfp_t gfp)</div><div class='ctx'> 	/* If the private flag is set, then the folio is not freeable */</div><div class='ctx'> 	if (folio_test_private(folio)) {</div><div class='ctx'> 		if ((current_gfp_context(gfp) &amp; GFP_KERNEL) != GFP_KERNEL ||</div><div class='del'>-		    current_is_kswapd())</div><div class='add'>+		    current_is_kswapd() || current_is_kcompactd())</div><div class='ctx'> 			return false;</div><div class='del'>-		if (nfs_wb_folio(folio_file_mapping(folio)-&gt;host, folio) &lt; 0)</div><div class='add'>+		if (nfs_wb_folio(folio-&gt;mapping-&gt;host, folio) &lt; 0)</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return nfs_fscache_release_folio(folio, gfp);</div><div class='hunk'>@@ -500,9 +559,10 @@ static int nfs_launder_folio(struct folio *folio)</div><div class='ctx'> 	dfprintk(PAGECACHE, "NFS: launder_folio(%ld, %llu)\n",</div><div class='ctx'> 		inode-&gt;i_ino, folio_pos(folio));</div><div class='ctx'> </div><div class='del'>-	folio_wait_fscache(folio);</div><div class='add'>+	folio_wait_private_2(folio); /* [DEPRECATED] */</div><div class='ctx'> 	ret = nfs_wb_folio(inode, folio);</div><div class='del'>-	trace_nfs_launder_folio_done(inode, folio, ret);</div><div class='add'>+	trace_nfs_launder_folio_done(inode, folio_pos(folio),</div><div class='add'>+			folio_size(folio), ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -588,13 +648,13 @@ static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> </div><div class='ctx'> 	dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",</div><div class='ctx'> 		 filp, filp-&gt;f_mapping-&gt;host-&gt;i_ino,</div><div class='del'>-		 (long long)folio_file_pos(folio));</div><div class='add'>+		 (long long)folio_pos(folio));</div><div class='ctx'> </div><div class='ctx'> 	sb_start_pagefault(inode-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the cache has finished storing the page */</div><div class='del'>-	if (folio_test_fscache(folio) &amp;&amp;</div><div class='del'>-	    folio_wait_fscache_killable(folio) &lt; 0) {</div><div class='add'>+	if (folio_test_private_2(folio) &amp;&amp; /* [DEPRECATED] */</div><div class='add'>+	    folio_wait_private_2_killable(folio) &lt; 0) {</div><div class='ctx'> 		ret = VM_FAULT_RETRY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -604,7 +664,7 @@ static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 			   TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);</div><div class='ctx'> </div><div class='ctx'> 	folio_lock(folio);</div><div class='del'>-	mapping = folio_file_mapping(folio);</div><div class='add'>+	mapping = folio-&gt;mapping;</div><div class='ctx'> 	if (mapping != inode-&gt;i_mapping)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='hunk'>@@ -642,6 +702,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	errseq_t since;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	trace_nfs_file_write(iocb, from);</div><div class='add'>+</div><div class='ctx'> 	result = nfs_key_timeout_notify(file, inode);</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -666,7 +728,9 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	nfs_clear_invalid_mapping(file-&gt;f_mapping);</div><div class='ctx'> </div><div class='ctx'> 	since = filemap_sample_wb_err(file-&gt;f_mapping);</div><div class='del'>-	nfs_start_io_write(inode);</div><div class='add'>+	error = nfs_start_io_write(inode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='ctx'> 	result = generic_write_checks(iocb, from);</div><div class='ctx'> 	if (result &gt; 0)</div><div class='ctx'> 		result = generic_perform_write(iocb, from);</div><div class='hunk'>@@ -720,17 +784,17 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = filp-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	int status = 0;</div><div class='del'>-	unsigned int saved_type = fl-&gt;fl_type;</div><div class='add'>+	unsigned int saved_type = fl-&gt;c.flc_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Try local locking first */</div><div class='ctx'> 	posix_test_lock(filp, fl);</div><div class='del'>-	if (fl-&gt;fl_type != F_UNLCK) {</div><div class='add'>+	if (fl-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 		/* found a conflict */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	fl-&gt;fl_type = saved_type;</div><div class='add'>+	fl-&gt;c.flc_type = saved_type;</div><div class='ctx'> </div><div class='del'>-	if (NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ))</div><div class='add'>+	if (nfs_have_read_or_write_delegation(inode))</div><div class='ctx'> 		goto out_noconflict;</div><div class='ctx'> </div><div class='ctx'> 	if (is_local)</div><div class='hunk'>@@ -740,7 +804,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)</div><div class='ctx'> out:</div><div class='ctx'> 	return status;</div><div class='ctx'> out_noconflict:</div><div class='del'>-	fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+	fl-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -765,7 +829,7 @@ do_unlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)</div><div class='ctx'> 		 * 	If we're signalled while cleaning up locks on process exit, we</div><div class='ctx'> 		 * 	still need to complete the unlock.</div><div class='ctx'> 		 */</div><div class='del'>-		if (status &lt; 0 &amp;&amp; !(fl-&gt;fl_flags &amp; FL_CLOSE))</div><div class='add'>+		if (status &lt; 0 &amp;&amp; !(fl-&gt;c.flc_flags &amp; FL_CLOSE))</div><div class='ctx'> 			return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +877,7 @@ do_setlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)</div><div class='ctx'> 	 * This makes locking act as a cache coherency point.</div><div class='ctx'> 	 */</div><div class='ctx'> 	nfs_sync_mapping(filp-&gt;f_mapping);</div><div class='del'>-	if (!NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ)) {</div><div class='add'>+	if (!nfs_have_read_or_write_delegation(inode)) {</div><div class='ctx'> 		nfs_zap_caches(inode);</div><div class='ctx'> 		if (mapping_mapped(filp-&gt;f_mapping))</div><div class='ctx'> 			nfs_revalidate_mapping(inode, filp-&gt;f_mapping);</div><div class='hunk'>@@ -832,12 +896,12 @@ int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	int is_local = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS: lock(%pD2, t=%x, fl=%x, r=%lld:%lld)\n",</div><div class='del'>-			filp, fl-&gt;fl_type, fl-&gt;fl_flags,</div><div class='add'>+			filp, fl-&gt;c.flc_type, fl-&gt;c.flc_flags,</div><div class='ctx'> 			(long long)fl-&gt;fl_start, (long long)fl-&gt;fl_end);</div><div class='ctx'> </div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_VFSLOCK);</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_RECLAIM)</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_RECLAIM)</div><div class='ctx'> 		return -ENOGRACE;</div><div class='ctx'> </div><div class='ctx'> 	if (NFS_SERVER(inode)-&gt;flags &amp; NFS_MOUNT_LOCAL_FCNTL)</div><div class='hunk'>@@ -851,7 +915,7 @@ int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_GETLK(cmd))</div><div class='ctx'> 		ret = do_getlk(filp, cmd, fl, is_local);</div><div class='del'>-	else if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	else if (lock_is_unlock(fl))</div><div class='ctx'> 		ret = do_unlk(filp, cmd, fl, is_local);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = do_setlk(filp, cmd, fl, is_local);</div><div class='hunk'>@@ -869,16 +933,16 @@ int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	int is_local = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS: flock(%pD2, t=%x, fl=%x)\n",</div><div class='del'>-			filp, fl-&gt;fl_type, fl-&gt;fl_flags);</div><div class='add'>+			filp, fl-&gt;c.flc_type, fl-&gt;c.flc_flags);</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_FLOCK))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_FLOCK))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	if (NFS_SERVER(inode)-&gt;flags &amp; NFS_MOUNT_LOCAL_FLOCK)</div><div class='ctx'> 		is_local = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* We're simulating flock() locks using posix locks on the server */</div><div class='del'>-	if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	if (lock_is_unlock(fl))</div><div class='ctx'> 		return do_unlk(filp, cmd, fl, is_local);</div><div class='ctx'> 	return do_setlk(filp, cmd, fl, is_local);</div><div class='ctx'> }</div><div class='hunk'>@@ -888,7 +952,7 @@ const struct file_operations nfs_file_operations = {</div><div class='ctx'> 	.llseek		= nfs_file_llseek,</div><div class='ctx'> 	.read_iter	= nfs_file_read,</div><div class='ctx'> 	.write_iter	= nfs_file_write,</div><div class='del'>-	.mmap		= nfs_file_mmap,</div><div class='add'>+	.mmap_prepare	= nfs_file_mmap_prepare,</div><div class='ctx'> 	.open		= nfs_file_open,</div><div class='ctx'> 	.flush		= nfs_file_flush,</div><div class='ctx'> 	.release	= nfs_file_release,</div><div class='hunk'>@@ -899,5 +963,6 @@ const struct file_operations nfs_file_operations = {</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.check_flags	= nfs_check_flags,</div><div class='ctx'> 	.setlease	= simple_nosetlease,</div><div class='add'>+	.fop_flags	= FOP_DONTCACHE,</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_file_operations);</div><div class='head'>diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c<br/>index ce8f8934bca5..5c4551117c58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/filelayout/filelayout.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/filelayout/filelayout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/filelayout/filelayout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/filelayout/filelayout.c</a></div><div class='hunk'>@@ -488,7 +488,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	/* Perform an asynchronous read to ds */</div><div class='ctx'> 	nfs_initiate_pgio(ds_clnt, hdr, hdr-&gt;cred,</div><div class='ctx'> 			  NFS_PROTO(hdr-&gt;inode), &amp;filelayout_read_call_ops,</div><div class='del'>-			  0, RPC_TASK_SOFTCONN);</div><div class='add'>+			  0, RPC_TASK_SOFTCONN, NULL);</div><div class='ctx'> 	return PNFS_ATTEMPTED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -530,7 +530,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync)</div><div class='ctx'> 	/* Perform an asynchronous write */</div><div class='ctx'> 	nfs_initiate_pgio(ds_clnt, hdr, hdr-&gt;cred,</div><div class='ctx'> 			  NFS_PROTO(hdr-&gt;inode), &amp;filelayout_write_call_ops,</div><div class='del'>-			  sync, RPC_TASK_SOFTCONN);</div><div class='add'>+			  sync, RPC_TASK_SOFTCONN, NULL);</div><div class='ctx'> 	return PNFS_ATTEMPTED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -605,14 +605,6 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("--&gt; %s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	/* FIXME: remove this check when layout segment support is added */</div><div class='del'>-	if (lgr-&gt;range.offset != 0 ||</div><div class='del'>-	    lgr-&gt;range.length != NFS4_MAX_UINT64) {</div><div class='del'>-		dprintk("%s Only whole file layouts supported. Use MDS i/o\n",</div><div class='del'>-			__func__);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (fl-&gt;pattern_offset &gt; lgr-&gt;range.offset) {</div><div class='ctx'> 		dprintk("%s pattern_offset %lld too large\n",</div><div class='ctx'> 				__func__, fl-&gt;pattern_offset);</div><div class='hunk'>@@ -654,19 +646,19 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,</div><div class='ctx'> {</div><div class='ctx'> 	struct xdr_stream stream;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	uint32_t nfl_util;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s: set_layout_map Begin\n", __func__);</div><div class='ctx'> </div><div class='del'>-	scratch = alloc_page(gfp_flags);</div><div class='add'>+	scratch = folio_alloc(gfp_flags, 0);</div><div class='ctx'> 	if (!scratch)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;stream, &amp;buf, lgr-&gt;layoutp-&gt;pages, lgr-&gt;layoutp-&gt;len);</div><div class='del'>-	xdr_set_scratch_page(&amp;stream, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;stream, scratch);</div><div class='ctx'> </div><div class='ctx'> 	/* 20 = ufl_util (4), first_stripe_index (4), pattern_offset (8),</div><div class='ctx'> 	 * num_fh (4) */</div><div class='hunk'>@@ -732,11 +724,11 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,</div><div class='ctx'> 			fl-&gt;fh_array[i]-&gt;size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -875,15 +867,15 @@ static void</div><div class='ctx'> filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 			struct nfs_page *req)</div><div class='ctx'> {</div><div class='del'>-	pnfs_generic_pg_check_layout(pgio);</div><div class='add'>+	pnfs_generic_pg_check_layout(pgio, req);</div><div class='ctx'> 	if (!pgio-&gt;pg_lseg) {</div><div class='ctx'> 		pgio-&gt;pg_lseg = fl_pnfs_update_layout(pgio-&gt;pg_inode,</div><div class='ctx'> 						      nfs_req_openctx(req),</div><div class='del'>-						      0,</div><div class='del'>-						      NFS4_MAX_UINT64,</div><div class='add'>+						      req_offset(req),</div><div class='add'>+						      req-&gt;wb_bytes,</div><div class='ctx'> 						      IOMODE_READ,</div><div class='ctx'> 						      false,</div><div class='del'>-						      GFP_KERNEL);</div><div class='add'>+						      nfs_io_gfp_mask());</div><div class='ctx'> 		if (IS_ERR(pgio-&gt;pg_lseg)) {</div><div class='ctx'> 			pgio-&gt;pg_error = PTR_ERR(pgio-&gt;pg_lseg);</div><div class='ctx'> 			pgio-&gt;pg_lseg = NULL;</div><div class='hunk'>@@ -899,15 +891,15 @@ static void</div><div class='ctx'> filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 			 struct nfs_page *req)</div><div class='ctx'> {</div><div class='del'>-	pnfs_generic_pg_check_layout(pgio);</div><div class='add'>+	pnfs_generic_pg_check_layout(pgio, req);</div><div class='ctx'> 	if (!pgio-&gt;pg_lseg) {</div><div class='ctx'> 		pgio-&gt;pg_lseg = fl_pnfs_update_layout(pgio-&gt;pg_inode,</div><div class='ctx'> 						      nfs_req_openctx(req),</div><div class='del'>-						      0,</div><div class='del'>-						      NFS4_MAX_UINT64,</div><div class='add'>+						      req_offset(req),</div><div class='add'>+						      req-&gt;wb_bytes,</div><div class='ctx'> 						      IOMODE_RW,</div><div class='ctx'> 						      false,</div><div class='del'>-						      GFP_NOFS);</div><div class='add'>+						      nfs_io_gfp_mask());</div><div class='ctx'> 		if (IS_ERR(pgio-&gt;pg_lseg)) {</div><div class='ctx'> 			pgio-&gt;pg_error = PTR_ERR(pgio-&gt;pg_lseg);</div><div class='ctx'> 			pgio-&gt;pg_lseg = NULL;</div><div class='hunk'>@@ -1019,7 +1011,7 @@ static int filelayout_initiate_commit(struct nfs_commit_data *data, int how)</div><div class='ctx'> 		data-&gt;args.fh = fh;</div><div class='ctx'> 	return nfs_initiate_commit(ds_clnt, data, NFS_PROTO(data-&gt;inode),</div><div class='ctx'> 				   &amp;filelayout_commit_call_ops, how,</div><div class='del'>-				   RPC_TASK_SOFTCONN);</div><div class='add'>+				   RPC_TASK_SOFTCONN, NULL);</div><div class='ctx'> out_err:</div><div class='ctx'> 	pnfs_generic_prepare_to_resend_writes(data);</div><div class='ctx'> 	pnfs_generic_commit_release(data);</div><div class='hunk'>@@ -1118,7 +1110,6 @@ static const struct pnfs_commit_ops filelayout_commit_ops = {</div><div class='ctx'> 	.clear_request_commit	= pnfs_generic_clear_request_commit,</div><div class='ctx'> 	.scan_commit_lists	= pnfs_generic_scan_commit_lists,</div><div class='ctx'> 	.recover_commit_reqs	= pnfs_generic_recover_commit_reqs,</div><div class='del'>-	.search_commit_reqs	= pnfs_generic_search_commit_reqs,</div><div class='ctx'> 	.commit_pagelist	= filelayout_commit_pagelist,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c<br/>index acf4b88889dc..df79aeb68db4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/filelayout/filelayoutdev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/filelayout/filelayoutdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/filelayout/filelayoutdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/filelayout/filelayoutdev.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include "../internal.h"</div><div class='ctx'> #include "../nfs4session.h"</div><div class='ctx'> #include "filelayout.h"</div><div class='add'>+#include "../nfs4trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PNFS_LD</div><div class='ctx'> </div><div class='hunk'>@@ -72,17 +73,18 @@ nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 	struct nfs4_file_layout_dsaddr *dsaddr = NULL;</div><div class='ctx'> 	struct xdr_stream stream;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	struct list_head dsaddrs;</div><div class='ctx'> 	struct nfs4_pnfs_ds_addr *da;</div><div class='add'>+	struct net *net = server-&gt;nfs_client-&gt;cl_net;</div><div class='ctx'> </div><div class='ctx'> 	/* set up xdr stream */</div><div class='del'>-	scratch = alloc_page(gfp_flags);</div><div class='add'>+	scratch = folio_alloc(gfp_flags, 0);</div><div class='ctx'> 	if (!scratch)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;stream, &amp;buf, pdev-&gt;pages, pdev-&gt;pglen);</div><div class='del'>-	xdr_set_scratch_page(&amp;stream, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;stream, scratch);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the stripe count (number of stripe index) */</div><div class='ctx'> 	p = xdr_inline_decode(&amp;stream, 4);</div><div class='hunk'>@@ -158,8 +160,7 @@ nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> </div><div class='ctx'> 		mp_count = be32_to_cpup(p); /* multipath count */</div><div class='ctx'> 		for (j = 0; j &lt; mp_count; j++) {</div><div class='del'>-			da = nfs4_decode_mp_ds_addr(server-&gt;nfs_client-&gt;cl_net,</div><div class='del'>-						    &amp;stream, gfp_flags);</div><div class='add'>+			da = nfs4_decode_mp_ds_addr(net, &amp;stream, gfp_flags);</div><div class='ctx'> 			if (da)</div><div class='ctx'> 				list_add_tail(&amp;da-&gt;da_node, &amp;dsaddrs);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -169,9 +170,10 @@ nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 			goto out_err_free_deviceid;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dsaddr-&gt;ds_list[i] = nfs4_pnfs_ds_add(&amp;dsaddrs, gfp_flags);</div><div class='add'>+		dsaddr-&gt;ds_list[i] = nfs4_pnfs_ds_add(net, &amp;dsaddrs, gfp_flags);</div><div class='ctx'> 		if (!dsaddr-&gt;ds_list[i])</div><div class='ctx'> 			goto out_err_drain_dsaddrs;</div><div class='add'>+		trace_fl_getdevinfo(server, &amp;pdev-&gt;dev_id, dsaddr-&gt;ds_list[i]-&gt;ds_remotestr);</div><div class='ctx'> </div><div class='ctx'> 		/* If DS was already in cache, free ds addrs */</div><div class='ctx'> 		while (!list_empty(&amp;dsaddrs)) {</div><div class='hunk'>@@ -184,7 +186,7 @@ nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> 	return dsaddr;</div><div class='ctx'> </div><div class='ctx'> out_err_drain_dsaddrs:</div><div class='hunk'>@@ -202,7 +204,7 @@ out_err_free_deviceid:</div><div class='ctx'> out_err_free_stripe_indices:</div><div class='ctx'> 	kfree(stripe_indices);</div><div class='ctx'> out_err_free_scratch:</div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> out_err:</div><div class='ctx'> 	dprintk("%s ERROR: returning NULL\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c<br/>index ef817a0475ff..9056f05a67dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/flexfilelayout/flexfilelayout.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/flexfilelayout/flexfilelayout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/flexfilelayout/flexfilelayout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/flexfilelayout/flexfilelayout.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/nfs_mount.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_page.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sunrpc/metrics.h&gt;</div><div class='hunk'>@@ -46,7 +47,7 @@ ff_layout_mirror_prepare_stats(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 			       int dev_limit, enum nfs4_ff_op_type type);</div><div class='ctx'> static void ff_layout_encode_ff_layoutupdate(struct xdr_stream *xdr,</div><div class='ctx'> 			      const struct nfs42_layoutstat_devinfo *devinfo,</div><div class='del'>-			      struct nfs4_ff_layout_mirror *mirror);</div><div class='add'>+			      struct nfs4_ff_layout_ds_stripe *dss_info);</div><div class='ctx'> </div><div class='ctx'> static struct pnfs_layout_hdr *</div><div class='ctx'> ff_layout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags)</div><div class='hunk'>@@ -162,18 +163,33 @@ decode_name(struct xdr_stream *xdr, u32 *id)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ff_mirror_match_fh(const struct nfs4_ff_layout_mirror *m1,</div><div class='del'>-		const struct nfs4_ff_layout_mirror *m2)</div><div class='add'>+static struct nfsd_file *</div><div class='add'>+ff_local_open_fh(struct pnfs_layout_segment *lseg, u32 ds_idx, u32 dss_id,</div><div class='add'>+		 struct nfs_client *clp, const struct cred *cred,</div><div class='add'>+		 struct nfs_fh *fh, fmode_t mode)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	struct nfs4_ff_layout_mirror *mirror = FF_LAYOUT_COMP(lseg, ds_idx);</div><div class='add'>+</div><div class='add'>+	return nfs_local_open_fh(clp, cred, fh, &amp;mirror-&gt;dss[dss_id].nfl, mode);</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ff_dss_match_fh(const struct nfs4_ff_layout_ds_stripe *dss1,</div><div class='add'>+		const struct nfs4_ff_layout_ds_stripe *dss2)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	if (m1-&gt;fh_versions_cnt != m2-&gt;fh_versions_cnt)</div><div class='add'>+	if (dss1-&gt;fh_versions_cnt != dss2-&gt;fh_versions_cnt)</div><div class='ctx'> 		return false;</div><div class='del'>-	for (i = 0; i &lt; m1-&gt;fh_versions_cnt; i++) {</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dss1-&gt;fh_versions_cnt; i++) {</div><div class='ctx'> 		bool found_fh = false;</div><div class='del'>-		for (j = 0; j &lt; m2-&gt;fh_versions_cnt; j++) {</div><div class='del'>-			if (nfs_compare_fh(&amp;m1-&gt;fh_versions[i],</div><div class='del'>-					&amp;m2-&gt;fh_versions[j]) == 0) {</div><div class='add'>+		for (j = 0; j &lt; dss2-&gt;fh_versions_cnt; j++) {</div><div class='add'>+			if (nfs_compare_fh(&amp;dss1-&gt;fh_versions[i],</div><div class='add'>+					&amp;dss2-&gt;fh_versions[j]) == 0) {</div><div class='ctx'> 				found_fh = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -184,6 +200,38 @@ static bool ff_mirror_match_fh(const struct nfs4_ff_layout_mirror *m1,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ff_mirror_match_fh(const struct nfs4_ff_layout_mirror *m1,</div><div class='add'>+		const struct nfs4_ff_layout_mirror *m2)</div><div class='add'>+{</div><div class='add'>+	u32 dss_id;</div><div class='add'>+</div><div class='add'>+	if (m1-&gt;dss_count != m2-&gt;dss_count)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (dss_id = 0; dss_id &lt; m1-&gt;dss_count; dss_id++)</div><div class='add'>+		if (!ff_dss_match_fh(&amp;m1-&gt;dss[dss_id], &amp;m2-&gt;dss[dss_id]))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ff_mirror_match_devid(const struct nfs4_ff_layout_mirror *m1,</div><div class='add'>+		const struct nfs4_ff_layout_mirror *m2)</div><div class='add'>+{</div><div class='add'>+	u32 dss_id;</div><div class='add'>+</div><div class='add'>+	if (m1-&gt;dss_count != m2-&gt;dss_count)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (dss_id = 0; dss_id &lt; m1-&gt;dss_count; dss_id++)</div><div class='add'>+		if (memcmp(&amp;m1-&gt;dss[dss_id].devid,</div><div class='add'>+			   &amp;m2-&gt;dss[dss_id].devid,</div><div class='add'>+			   sizeof(m1-&gt;dss[dss_id].devid)) != 0)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct nfs4_ff_layout_mirror *</div><div class='ctx'> ff_layout_add_mirror(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		struct nfs4_ff_layout_mirror *mirror)</div><div class='hunk'>@@ -194,7 +242,7 @@ ff_layout_add_mirror(struct pnfs_layout_hdr *lo,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	list_for_each_entry(pos, &amp;ff_layout-&gt;mirrors, mirrors) {</div><div class='del'>-		if (memcmp(&amp;mirror-&gt;devid, &amp;pos-&gt;devid, sizeof(pos-&gt;devid)) != 0)</div><div class='add'>+		if (!ff_mirror_match_devid(mirror, pos))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!ff_mirror_match_fh(mirror, pos))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -222,30 +270,52 @@ ff_layout_remove_mirror(struct nfs4_ff_layout_mirror *mirror)</div><div class='ctx'> 	mirror-&gt;layout = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nfs4_ff_layout_mirror *ff_layout_alloc_mirror(gfp_t gfp_flags)</div><div class='add'>+static struct nfs4_ff_layout_mirror *ff_layout_alloc_mirror(u32 dss_count,</div><div class='add'>+							    gfp_t gfp_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> </div><div class='ctx'> 	mirror = kzalloc(sizeof(*mirror), gfp_flags);</div><div class='del'>-	if (mirror != NULL) {</div><div class='del'>-		spin_lock_init(&amp;mirror-&gt;lock);</div><div class='del'>-		refcount_set(&amp;mirror-&gt;ref, 1);</div><div class='del'>-		INIT_LIST_HEAD(&amp;mirror-&gt;mirrors);</div><div class='add'>+	if (mirror == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;mirror-&gt;lock);</div><div class='add'>+	refcount_set(&amp;mirror-&gt;ref, 1);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mirror-&gt;mirrors);</div><div class='add'>+</div><div class='add'>+	mirror-&gt;dss_count = dss_count;</div><div class='add'>+	mirror-&gt;dss =</div><div class='add'>+		kcalloc(dss_count, sizeof(struct nfs4_ff_layout_ds_stripe),</div><div class='add'>+			gfp_flags);</div><div class='add'>+	if (mirror-&gt;dss == NULL) {</div><div class='add'>+		kfree(mirror);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for (u32 dss_id = 0; dss_id &lt; mirror-&gt;dss_count; dss_id++)</div><div class='add'>+		nfs_localio_file_init(&amp;mirror-&gt;dss[dss_id].nfl);</div><div class='add'>+</div><div class='ctx'> 	return mirror;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ff_layout_free_mirror(struct nfs4_ff_layout_mirror *mirror)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cred	*cred;</div><div class='add'>+	u32 dss_id;</div><div class='ctx'> </div><div class='ctx'> 	ff_layout_remove_mirror(mirror);</div><div class='del'>-	kfree(mirror-&gt;fh_versions);</div><div class='del'>-	cred = rcu_access_pointer(mirror-&gt;ro_cred);</div><div class='del'>-	put_cred(cred);</div><div class='del'>-	cred = rcu_access_pointer(mirror-&gt;rw_cred);</div><div class='del'>-	put_cred(cred);</div><div class='del'>-	nfs4_ff_layout_put_deviceid(mirror-&gt;mirror_ds);</div><div class='add'>+</div><div class='add'>+	for (dss_id = 0; dss_id &lt; mirror-&gt;dss_count; dss_id++) {</div><div class='add'>+		kfree(mirror-&gt;dss[dss_id].fh_versions);</div><div class='add'>+		cred = rcu_access_pointer(mirror-&gt;dss[dss_id].ro_cred);</div><div class='add'>+		put_cred(cred);</div><div class='add'>+		cred = rcu_access_pointer(mirror-&gt;dss[dss_id].rw_cred);</div><div class='add'>+		put_cred(cred);</div><div class='add'>+		nfs_close_local_fh(&amp;mirror-&gt;dss[dss_id].nfl);</div><div class='add'>+		nfs4_ff_layout_put_deviceid(mirror-&gt;dss[dss_id].mirror_ds);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(mirror-&gt;dss);</div><div class='ctx'> 	kfree(mirror);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +346,7 @@ ff_lseg_match_mirrors(struct pnfs_layout_segment *l1,</div><div class='ctx'> 		struct pnfs_layout_segment *l2)</div><div class='ctx'> {</div><div class='ctx'> 	const struct nfs4_ff_layout_segment *fl1 = FF_LAYOUT_LSEG(l1);</div><div class='del'>-	const struct nfs4_ff_layout_segment *fl2 = FF_LAYOUT_LSEG(l1);</div><div class='add'>+	const struct nfs4_ff_layout_segment *fl2 = FF_LAYOUT_LSEG(l2);</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	if (fl1-&gt;mirror_array_cnt != fl2-&gt;mirror_array_cnt)</div><div class='hunk'>@@ -349,14 +419,24 @@ ff_layout_add_lseg(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 			free_me);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 ff_mirror_efficiency_sum(const struct nfs4_ff_layout_mirror *mirror)</div><div class='add'>+{</div><div class='add'>+	u32 dss_id, sum = 0;</div><div class='add'>+</div><div class='add'>+	for (dss_id = 0; dss_id &lt; mirror-&gt;dss_count; dss_id++)</div><div class='add'>+		sum += mirror-&gt;dss[dss_id].efficiency;</div><div class='add'>+</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ff_layout_sort_mirrors(struct nfs4_ff_layout_segment *fls)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; fls-&gt;mirror_array_cnt - 1; i++) {</div><div class='ctx'> 		for (j = i + 1; j &lt; fls-&gt;mirror_array_cnt; j++)</div><div class='del'>-			if (fls-&gt;mirror_array[i]-&gt;efficiency &lt;</div><div class='del'>-			    fls-&gt;mirror_array[j]-&gt;efficiency)</div><div class='add'>+			if (ff_mirror_efficiency_sum(fls-&gt;mirror_array[i]) &lt;</div><div class='add'>+			    ff_mirror_efficiency_sum(fls-&gt;mirror_array[j]))</div><div class='ctx'> 				swap(fls-&gt;mirror_array[i],</div><div class='ctx'> 				     fls-&gt;mirror_array[j]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -371,20 +451,21 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh,</div><div class='ctx'> 	struct nfs4_ff_layout_segment *fls = NULL;</div><div class='ctx'> 	struct xdr_stream stream;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	u64 stripe_unit;</div><div class='ctx'> 	u32 mirror_array_cnt;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	int i, rc;</div><div class='add'>+	struct nfs4_ff_layout_ds_stripe *dss_info;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("--&gt; %s\n", __func__);</div><div class='del'>-	scratch = alloc_page(gfp_flags);</div><div class='add'>+	scratch = folio_alloc(gfp_flags, 0);</div><div class='ctx'> 	if (!scratch)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;stream, &amp;buf, lgr-&gt;layoutp-&gt;pages,</div><div class='ctx'> 			      lgr-&gt;layoutp-&gt;len);</div><div class='del'>-	xdr_set_scratch_page(&amp;stream, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;stream, scratch);</div><div class='ctx'> </div><div class='ctx'> 	/* stripe unit and mirror_array_cnt */</div><div class='ctx'> 	rc = -EIO;</div><div class='hunk'>@@ -410,116 +491,134 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh,</div><div class='ctx'> 	fls-&gt;mirror_array_cnt = mirror_array_cnt;</div><div class='ctx'> 	fls-&gt;stripe_unit = stripe_unit;</div><div class='ctx'> </div><div class='add'>+	u32 dss_count = 0;</div><div class='ctx'> 	for (i = 0; i &lt; fls-&gt;mirror_array_cnt; i++) {</div><div class='ctx'> 		struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 		struct cred *kcred;</div><div class='ctx'> 		const struct cred __rcu *cred;</div><div class='ctx'> 		kuid_t uid;</div><div class='ctx'> 		kgid_t gid;</div><div class='del'>-		u32 ds_count, fh_count, id;</div><div class='del'>-		int j;</div><div class='add'>+		u32 fh_count, id;</div><div class='add'>+		int j, dss_id;</div><div class='ctx'> </div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		p = xdr_inline_decode(&amp;stream, 4);</div><div class='ctx'> 		if (!p)</div><div class='ctx'> 			goto out_err_free;</div><div class='del'>-		ds_count = be32_to_cpup(p);</div><div class='ctx'> </div><div class='del'>-		/* FIXME: allow for striping? */</div><div class='del'>-		if (ds_count != 1)</div><div class='add'>+		// Ensure all mirrors have same stripe count.</div><div class='add'>+		if (dss_count == 0)</div><div class='add'>+			dss_count = be32_to_cpup(p);</div><div class='add'>+		else if (dss_count != be32_to_cpup(p))</div><div class='ctx'> 			goto out_err_free;</div><div class='ctx'> </div><div class='del'>-		fls-&gt;mirror_array[i] = ff_layout_alloc_mirror(gfp_flags);</div><div class='add'>+		if (dss_count &gt; NFS4_FLEXFILE_LAYOUT_MAX_STRIPE_CNT ||</div><div class='add'>+		    dss_count == 0)</div><div class='add'>+			goto out_err_free;</div><div class='add'>+</div><div class='add'>+		if (dss_count &gt; 1 &amp;&amp; stripe_unit == 0)</div><div class='add'>+			goto out_err_free;</div><div class='add'>+</div><div class='add'>+		fls-&gt;mirror_array[i] = ff_layout_alloc_mirror(dss_count, gfp_flags);</div><div class='ctx'> 		if (fls-&gt;mirror_array[i] == NULL) {</div><div class='ctx'> 			rc = -ENOMEM;</div><div class='ctx'> 			goto out_err_free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		fls-&gt;mirror_array[i]-&gt;ds_count = ds_count;</div><div class='add'>+		for (dss_id = 0; dss_id &lt; dss_count; dss_id++) {</div><div class='add'>+			dss_info = &amp;fls-&gt;mirror_array[i]-&gt;dss[dss_id];</div><div class='add'>+			dss_info-&gt;mirror = fls-&gt;mirror_array[i];</div><div class='ctx'> </div><div class='del'>-		/* deviceid */</div><div class='del'>-		rc = decode_deviceid(&amp;stream, &amp;fls-&gt;mirror_array[i]-&gt;devid);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out_err_free;</div><div class='add'>+			/* deviceid */</div><div class='add'>+			rc = decode_deviceid(&amp;stream, &amp;dss_info-&gt;devid);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out_err_free;</div><div class='ctx'> </div><div class='del'>-		/* efficiency */</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		p = xdr_inline_decode(&amp;stream, 4);</div><div class='del'>-		if (!p)</div><div class='del'>-			goto out_err_free;</div><div class='del'>-		fls-&gt;mirror_array[i]-&gt;efficiency = be32_to_cpup(p);</div><div class='add'>+			/* efficiency */</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			p = xdr_inline_decode(&amp;stream, 4);</div><div class='add'>+			if (!p)</div><div class='add'>+				goto out_err_free;</div><div class='add'>+			dss_info-&gt;efficiency = be32_to_cpup(p);</div><div class='ctx'> </div><div class='del'>-		/* stateid */</div><div class='del'>-		rc = decode_pnfs_stateid(&amp;stream, &amp;fls-&gt;mirror_array[i]-&gt;stateid);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out_err_free;</div><div class='add'>+			/* stateid */</div><div class='add'>+			rc = decode_pnfs_stateid(&amp;stream, &amp;dss_info-&gt;stateid);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out_err_free;</div><div class='ctx'> </div><div class='del'>-		/* fh */</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		p = xdr_inline_decode(&amp;stream, 4);</div><div class='del'>-		if (!p)</div><div class='del'>-			goto out_err_free;</div><div class='del'>-		fh_count = be32_to_cpup(p);</div><div class='add'>+			/* fh */</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			p = xdr_inline_decode(&amp;stream, 4);</div><div class='add'>+			if (!p)</div><div class='add'>+				goto out_err_free;</div><div class='add'>+			fh_count = be32_to_cpup(p);</div><div class='ctx'> </div><div class='del'>-		fls-&gt;mirror_array[i]-&gt;fh_versions =</div><div class='del'>-			kcalloc(fh_count, sizeof(struct nfs_fh),</div><div class='del'>-				gfp_flags);</div><div class='del'>-		if (fls-&gt;mirror_array[i]-&gt;fh_versions == NULL) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto out_err_free;</div><div class='del'>-		}</div><div class='add'>+			dss_info-&gt;fh_versions =</div><div class='add'>+			    kcalloc(fh_count, sizeof(struct nfs_fh),</div><div class='add'>+				    gfp_flags);</div><div class='add'>+			if (dss_info-&gt;fh_versions == NULL) {</div><div class='add'>+				rc = -ENOMEM;</div><div class='add'>+				goto out_err_free;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; fh_count; j++) {</div><div class='add'>+				rc = decode_nfs_fh(&amp;stream,</div><div class='add'>+						   &amp;dss_info-&gt;fh_versions[j]);</div><div class='add'>+				if (rc)</div><div class='add'>+					goto out_err_free;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dss_info-&gt;fh_versions_cnt = fh_count;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; fh_count; j++) {</div><div class='del'>-			rc = decode_nfs_fh(&amp;stream,</div><div class='del'>-					   &amp;fls-&gt;mirror_array[i]-&gt;fh_versions[j]);</div><div class='add'>+			/* user */</div><div class='add'>+			rc = decode_name(&amp;stream, &amp;id);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				goto out_err_free;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fls-&gt;mirror_array[i]-&gt;fh_versions_cnt = fh_count;</div><div class='ctx'> </div><div class='del'>-		/* user */</div><div class='del'>-		rc = decode_name(&amp;stream, &amp;id);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out_err_free;</div><div class='add'>+			uid = make_kuid(&amp;init_user_ns, id);</div><div class='ctx'> </div><div class='del'>-		uid = make_kuid(&amp;init_user_ns, id);</div><div class='add'>+			/* group */</div><div class='add'>+			rc = decode_name(&amp;stream, &amp;id);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out_err_free;</div><div class='ctx'> </div><div class='del'>-		/* group */</div><div class='del'>-		rc = decode_name(&amp;stream, &amp;id);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out_err_free;</div><div class='add'>+			gid = make_kgid(&amp;init_user_ns, id);</div><div class='ctx'> </div><div class='del'>-		gid = make_kgid(&amp;init_user_ns, id);</div><div class='add'>+			if (gfp_flags &amp; __GFP_FS)</div><div class='add'>+				kcred = prepare_kernel_cred(&amp;init_task);</div><div class='add'>+			else {</div><div class='add'>+				unsigned int nofs_flags = memalloc_nofs_save();</div><div class='ctx'> </div><div class='del'>-		if (gfp_flags &amp; __GFP_FS)</div><div class='del'>-			kcred = prepare_kernel_cred(&amp;init_task);</div><div class='del'>-		else {</div><div class='del'>-			unsigned int nofs_flags = memalloc_nofs_save();</div><div class='del'>-			kcred = prepare_kernel_cred(&amp;init_task);</div><div class='del'>-			memalloc_nofs_restore(nofs_flags);</div><div class='add'>+				kcred = prepare_kernel_cred(&amp;init_task);</div><div class='add'>+				memalloc_nofs_restore(nofs_flags);</div><div class='add'>+			}</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			if (!kcred)</div><div class='add'>+				goto out_err_free;</div><div class='add'>+			kcred-&gt;fsuid = uid;</div><div class='add'>+			kcred-&gt;fsgid = gid;</div><div class='add'>+			cred = RCU_INITIALIZER(kcred);</div><div class='add'>+</div><div class='add'>+			if (lgr-&gt;range.iomode == IOMODE_READ)</div><div class='add'>+				rcu_assign_pointer(dss_info-&gt;ro_cred, cred);</div><div class='add'>+			else</div><div class='add'>+				rcu_assign_pointer(dss_info-&gt;rw_cred, cred);</div><div class='ctx'> 		}</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		if (!kcred)</div><div class='del'>-			goto out_err_free;</div><div class='del'>-		kcred-&gt;fsuid = uid;</div><div class='del'>-		kcred-&gt;fsgid = gid;</div><div class='del'>-		cred = RCU_INITIALIZER(kcred);</div><div class='del'>-</div><div class='del'>-		if (lgr-&gt;range.iomode == IOMODE_READ)</div><div class='del'>-			rcu_assign_pointer(fls-&gt;mirror_array[i]-&gt;ro_cred, cred);</div><div class='del'>-		else</div><div class='del'>-			rcu_assign_pointer(fls-&gt;mirror_array[i]-&gt;rw_cred, cred);</div><div class='ctx'> </div><div class='ctx'> 		mirror = ff_layout_add_mirror(lh, fls-&gt;mirror_array[i]);</div><div class='ctx'> 		if (mirror != fls-&gt;mirror_array[i]) {</div><div class='del'>-			/* swap cred ptrs so free_mirror will clean up old */</div><div class='del'>-			if (lgr-&gt;range.iomode == IOMODE_READ) {</div><div class='del'>-				cred = xchg(&amp;mirror-&gt;ro_cred, cred);</div><div class='del'>-				rcu_assign_pointer(fls-&gt;mirror_array[i]-&gt;ro_cred, cred);</div><div class='del'>-			} else {</div><div class='del'>-				cred = xchg(&amp;mirror-&gt;rw_cred, cred);</div><div class='del'>-				rcu_assign_pointer(fls-&gt;mirror_array[i]-&gt;rw_cred, cred);</div><div class='add'>+			for (dss_id = 0; dss_id &lt; dss_count; dss_id++) {</div><div class='add'>+				dss_info = &amp;fls-&gt;mirror_array[i]-&gt;dss[dss_id];</div><div class='add'>+				/* swap cred ptrs so free_mirror will clean up old */</div><div class='add'>+				if (lgr-&gt;range.iomode == IOMODE_READ) {</div><div class='add'>+					cred = xchg(&amp;mirror-&gt;dss[dss_id].ro_cred,</div><div class='add'>+						    dss_info-&gt;ro_cred);</div><div class='add'>+					rcu_assign_pointer(dss_info-&gt;ro_cred, cred);</div><div class='add'>+				} else {</div><div class='add'>+					cred = xchg(&amp;mirror-&gt;dss[dss_id].rw_cred,</div><div class='add'>+						    dss_info-&gt;rw_cred);</div><div class='add'>+					rcu_assign_pointer(dss_info-&gt;rw_cred, cred);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			ff_layout_free_mirror(fls-&gt;mirror_array[i]);</div><div class='ctx'> 			fls-&gt;mirror_array[i] = mirror;</div><div class='hunk'>@@ -547,7 +646,7 @@ out_sort_mirrors:</div><div class='ctx'> 	ret = &amp;fls-&gt;generic_hdr;</div><div class='ctx'> 	dprintk("&lt;-- %s (success)\n", __func__);</div><div class='ctx'> out_free_page:</div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> 	return ret;</div><div class='ctx'> out_err_free:</div><div class='ctx'> 	_ff_layout_free_lseg(fls);</div><div class='hunk'>@@ -576,6 +675,26 @@ ff_layout_free_lseg(struct pnfs_layout_segment *lseg)</div><div class='ctx'> 	_ff_layout_free_lseg(fls);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 calc_commit_idx(struct pnfs_layout_segment *lseg,</div><div class='add'>+			   u32 mirror_idx, u32 dss_id)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_ff_layout_segment *flseg = FF_LAYOUT_LSEG(lseg);</div><div class='add'>+</div><div class='add'>+	return (mirror_idx * flseg-&gt;mirror_array[0]-&gt;dss_count) + dss_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 calc_mirror_idx_from_commit(struct pnfs_layout_segment *lseg,</div><div class='add'>+				       u32 commit_index)</div><div class='add'>+{</div><div class='add'>+	return commit_index / FF_LAYOUT_LSEG(lseg)-&gt;mirror_array[0]-&gt;dss_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 calc_dss_id_from_commit(struct pnfs_layout_segment *lseg,</div><div class='add'>+				   u32 commit_index)</div><div class='add'>+{</div><div class='add'>+	return commit_index % FF_LAYOUT_LSEG(lseg)-&gt;mirror_array[0]-&gt;dss_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> nfs4_ff_start_busy_timer(struct nfs4_ff_busy_timer *timer, ktime_t now)</div><div class='ctx'> {</div><div class='hunk'>@@ -600,6 +719,7 @@ nfs4_ff_end_busy_timer(struct nfs4_ff_busy_timer *timer, ktime_t now)</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='ctx'> nfs4_ff_layoutstat_start_io(struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+			    u32 dss_id,</div><div class='ctx'> 			    struct nfs4_ff_layoutstat *layoutstat,</div><div class='ctx'> 			    ktime_t now)</div><div class='ctx'> {</div><div class='hunk'>@@ -607,8 +727,8 @@ nfs4_ff_layoutstat_start_io(struct nfs4_ff_layout_mirror *mirror,</div><div class='ctx'> 	struct nfs4_flexfile_layout *ffl = FF_LAYOUT_FROM_HDR(mirror-&gt;layout);</div><div class='ctx'> </div><div class='ctx'> 	nfs4_ff_start_busy_timer(&amp;layoutstat-&gt;busy_timer, now);</div><div class='del'>-	if (!mirror-&gt;start_time)</div><div class='del'>-		mirror-&gt;start_time = now;</div><div class='add'>+	if (!mirror-&gt;dss[dss_id].start_time)</div><div class='add'>+		mirror-&gt;dss[dss_id].start_time = now;</div><div class='ctx'> 	if (mirror-&gt;report_interval != 0)</div><div class='ctx'> 		report_interval = (s64)mirror-&gt;report_interval * 1000LL;</div><div class='ctx'> 	else if (layoutstats_timer != 0)</div><div class='hunk'>@@ -658,13 +778,16 @@ nfs4_ff_layout_stat_io_update_completed(struct nfs4_ff_layoutstat *layoutstat,</div><div class='ctx'> static void</div><div class='ctx'> nfs4_ff_layout_stat_io_start_read(struct inode *inode,</div><div class='ctx'> 		struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+		u32 dss_id,</div><div class='ctx'> 		__u64 requested, ktime_t now)</div><div class='ctx'> {</div><div class='ctx'> 	bool report;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mirror-&gt;lock);</div><div class='del'>-	report = nfs4_ff_layoutstat_start_io(mirror, &amp;mirror-&gt;read_stat, now);</div><div class='del'>-	nfs4_ff_layout_stat_io_update_requested(&amp;mirror-&gt;read_stat, requested);</div><div class='add'>+	report = nfs4_ff_layoutstat_start_io(</div><div class='add'>+		mirror, dss_id, &amp;mirror-&gt;dss[dss_id].read_stat, now);</div><div class='add'>+	nfs4_ff_layout_stat_io_update_requested(</div><div class='add'>+		&amp;mirror-&gt;dss[dss_id].read_stat, requested);</div><div class='ctx'> 	set_bit(NFS4_FF_MIRROR_STAT_AVAIL, &amp;mirror-&gt;flags);</div><div class='ctx'> 	spin_unlock(&amp;mirror-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -675,11 +798,12 @@ nfs4_ff_layout_stat_io_start_read(struct inode *inode,</div><div class='ctx'> static void</div><div class='ctx'> nfs4_ff_layout_stat_io_end_read(struct rpc_task *task,</div><div class='ctx'> 		struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+		u32 dss_id,</div><div class='ctx'> 		__u64 requested,</div><div class='ctx'> 		__u64 completed)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;mirror-&gt;lock);</div><div class='del'>-	nfs4_ff_layout_stat_io_update_completed(&amp;mirror-&gt;read_stat,</div><div class='add'>+	nfs4_ff_layout_stat_io_update_completed(&amp;mirror-&gt;dss[dss_id].read_stat,</div><div class='ctx'> 			requested, completed,</div><div class='ctx'> 			ktime_get(), task-&gt;tk_start);</div><div class='ctx'> 	set_bit(NFS4_FF_MIRROR_STAT_AVAIL, &amp;mirror-&gt;flags);</div><div class='hunk'>@@ -689,13 +813,20 @@ nfs4_ff_layout_stat_io_end_read(struct rpc_task *task,</div><div class='ctx'> static void</div><div class='ctx'> nfs4_ff_layout_stat_io_start_write(struct inode *inode,</div><div class='ctx'> 		struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+		u32 dss_id,</div><div class='ctx'> 		__u64 requested, ktime_t now)</div><div class='ctx'> {</div><div class='ctx'> 	bool report;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mirror-&gt;lock);</div><div class='del'>-	report = nfs4_ff_layoutstat_start_io(mirror , &amp;mirror-&gt;write_stat, now);</div><div class='del'>-	nfs4_ff_layout_stat_io_update_requested(&amp;mirror-&gt;write_stat, requested);</div><div class='add'>+	report = nfs4_ff_layoutstat_start_io(</div><div class='add'>+		mirror,</div><div class='add'>+		dss_id,</div><div class='add'>+		&amp;mirror-&gt;dss[dss_id].write_stat,</div><div class='add'>+		now);</div><div class='add'>+	nfs4_ff_layout_stat_io_update_requested(</div><div class='add'>+		&amp;mirror-&gt;dss[dss_id].write_stat,</div><div class='add'>+		requested);</div><div class='ctx'> 	set_bit(NFS4_FF_MIRROR_STAT_AVAIL, &amp;mirror-&gt;flags);</div><div class='ctx'> 	spin_unlock(&amp;mirror-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -706,6 +837,7 @@ nfs4_ff_layout_stat_io_start_write(struct inode *inode,</div><div class='ctx'> static void</div><div class='ctx'> nfs4_ff_layout_stat_io_end_write(struct rpc_task *task,</div><div class='ctx'> 		struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+		u32 dss_id,</div><div class='ctx'> 		__u64 requested,</div><div class='ctx'> 		__u64 completed,</div><div class='ctx'> 		enum nfs3_stable_how committed)</div><div class='hunk'>@@ -714,25 +846,25 @@ nfs4_ff_layout_stat_io_end_write(struct rpc_task *task,</div><div class='ctx'> 		requested = completed = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mirror-&gt;lock);</div><div class='del'>-	nfs4_ff_layout_stat_io_update_completed(&amp;mirror-&gt;write_stat,</div><div class='add'>+	nfs4_ff_layout_stat_io_update_completed(&amp;mirror-&gt;dss[dss_id].write_stat,</div><div class='ctx'> 			requested, completed, ktime_get(), task-&gt;tk_start);</div><div class='ctx'> 	set_bit(NFS4_FF_MIRROR_STAT_AVAIL, &amp;mirror-&gt;flags);</div><div class='ctx'> 	spin_unlock(&amp;mirror-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ff_layout_mark_ds_unreachable(struct pnfs_layout_segment *lseg, u32 idx)</div><div class='add'>+ff_layout_mark_ds_unreachable(struct pnfs_layout_segment *lseg, u32 idx, u32 dss_id)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);</div><div class='add'>+	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx, dss_id);</div><div class='ctx'> </div><div class='ctx'> 	if (devid)</div><div class='ctx'> 		nfs4_mark_deviceid_unavailable(devid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, u32 idx)</div><div class='add'>+ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, u32 idx, u32 dss_id)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);</div><div class='add'>+	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx, dss_id);</div><div class='ctx'> </div><div class='ctx'> 	if (devid)</div><div class='ctx'> 		nfs4_mark_deviceid_available(devid);</div><div class='hunk'>@@ -741,69 +873,87 @@ ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, u32 idx)</div><div class='ctx'> static struct nfs4_pnfs_ds *</div><div class='ctx'> ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 			     u32 start_idx, u32 *best_idx,</div><div class='add'>+			     u32 offset, u32 *dss_id,</div><div class='ctx'> 			     bool check_device)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_segment *fls = FF_LAYOUT_LSEG(lseg);</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='del'>-	struct nfs4_pnfs_ds *ds;</div><div class='add'>+	struct nfs4_pnfs_ds *ds = ERR_PTR(-EAGAIN);</div><div class='ctx'> 	u32 idx;</div><div class='ctx'> </div><div class='ctx'> 	/* mirrors are initially sorted by efficiency */</div><div class='ctx'> 	for (idx = start_idx; idx &lt; fls-&gt;mirror_array_cnt; idx++) {</div><div class='ctx'> 		mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='del'>-		ds = nfs4_ff_layout_prepare_ds(lseg, mirror, false);</div><div class='del'>-		if (!ds)</div><div class='add'>+		*dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+			fls-&gt;stripe_unit,</div><div class='add'>+			fls-&gt;mirror_array[idx]-&gt;dss_count,</div><div class='add'>+			offset);</div><div class='add'>+		ds = nfs4_ff_layout_prepare_ds(lseg, mirror, *dss_id, false);</div><div class='add'>+		if (IS_ERR(ds))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (check_device &amp;&amp;</div><div class='del'>-		    nfs4_test_deviceid_unavailable(&amp;mirror-&gt;mirror_ds-&gt;id_node))</div><div class='add'>+		    nfs4_test_deviceid_unavailable(&amp;mirror-&gt;dss[*dss_id].mirror_ds-&gt;id_node)) {</div><div class='add'>+			// reinitialize the error state in case if this is the last iteration</div><div class='add'>+			ds = ERR_PTR(-EINVAL);</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		*best_idx = idx;</div><div class='del'>-		return ds;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return ds;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_pnfs_ds *</div><div class='ctx'> ff_layout_choose_any_ds_for_read(struct pnfs_layout_segment *lseg,</div><div class='del'>-				 u32 start_idx, u32 *best_idx)</div><div class='add'>+				 u32 start_idx, u32 *best_idx,</div><div class='add'>+				 u32 offset, u32 *dss_id)</div><div class='ctx'> {</div><div class='del'>-	return ff_layout_choose_ds_for_read(lseg, start_idx, best_idx, false);</div><div class='add'>+	return ff_layout_choose_ds_for_read(lseg, start_idx, best_idx,</div><div class='add'>+					    offset, dss_id, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_pnfs_ds *</div><div class='ctx'> ff_layout_choose_valid_ds_for_read(struct pnfs_layout_segment *lseg,</div><div class='del'>-				   u32 start_idx, u32 *best_idx)</div><div class='add'>+				   u32 start_idx, u32 *best_idx,</div><div class='add'>+				   u32 offset, u32 *dss_id)</div><div class='ctx'> {</div><div class='del'>-	return ff_layout_choose_ds_for_read(lseg, start_idx, best_idx, true);</div><div class='add'>+	return ff_layout_choose_ds_for_read(lseg, start_idx, best_idx,</div><div class='add'>+					    offset, dss_id, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_pnfs_ds *</div><div class='ctx'> ff_layout_choose_best_ds_for_read(struct pnfs_layout_segment *lseg,</div><div class='del'>-				  u32 start_idx, u32 *best_idx)</div><div class='add'>+				  u32 start_idx, u32 *best_idx,</div><div class='add'>+				  u32 offset, u32 *dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> </div><div class='del'>-	ds = ff_layout_choose_valid_ds_for_read(lseg, start_idx, best_idx);</div><div class='del'>-	if (ds)</div><div class='add'>+	ds = ff_layout_choose_valid_ds_for_read(lseg, start_idx, best_idx,</div><div class='add'>+						offset, dss_id);</div><div class='add'>+	if (!IS_ERR(ds))</div><div class='ctx'> 		return ds;</div><div class='del'>-	return ff_layout_choose_any_ds_for_read(lseg, start_idx, best_idx);</div><div class='add'>+	return ff_layout_choose_any_ds_for_read(lseg, start_idx, best_idx,</div><div class='add'>+						offset, dss_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_pnfs_ds *</div><div class='ctx'> ff_layout_get_ds_for_read(struct nfs_pageio_descriptor *pgio,</div><div class='del'>-			  u32 *best_idx)</div><div class='add'>+			  u32 *best_idx,</div><div class='add'>+			  u32 offset,</div><div class='add'>+			  u32 *dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_layout_segment *lseg = pgio-&gt;pg_lseg;</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> </div><div class='ctx'> 	ds = ff_layout_choose_best_ds_for_read(lseg, pgio-&gt;pg_mirror_idx,</div><div class='del'>-					       best_idx);</div><div class='del'>-	if (ds || !pgio-&gt;pg_mirror_idx)</div><div class='add'>+					       best_idx, offset, dss_id);</div><div class='add'>+	if (!IS_ERR(ds) || !pgio-&gt;pg_mirror_idx)</div><div class='ctx'> 		return ds;</div><div class='del'>-	return ff_layout_choose_best_ds_for_read(lseg, 0, best_idx);</div><div class='add'>+	return ff_layout_choose_best_ds_for_read(lseg, 0, best_idx,</div><div class='add'>+						 offset, dss_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -822,12 +972,54 @@ ff_layout_pg_get_read(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-ff_layout_pg_check_layout(struct nfs_pageio_descriptor *pgio,</div><div class='del'>-			  struct nfs_page *req)</div><div class='add'>+static bool</div><div class='add'>+ff_layout_lseg_is_striped(const struct nfs4_ff_layout_segment *fls)</div><div class='ctx'> {</div><div class='del'>-	pnfs_generic_pg_check_layout(pgio);</div><div class='del'>-	pnfs_generic_pg_check_range(pgio, req);</div><div class='add'>+	return fls-&gt;mirror_array[0]-&gt;dss_count &gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ff_layout_pg_test(). Called by nfs_can_coalesce_requests()</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if @req cannot be coalesced into @pgio, otherwise return the number</div><div class='add'>+ * of bytes (maximum @req-&gt;wb_bytes) that can be coalesced.</div><div class='add'>+ */</div><div class='add'>+static size_t</div><div class='add'>+ff_layout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,</div><div class='add'>+		  struct nfs_page *req)</div><div class='add'>+{</div><div class='add'>+	unsigned int size;</div><div class='add'>+	u64 p_stripe, r_stripe;</div><div class='add'>+	u32 stripe_offset;</div><div class='add'>+	u64 segment_offset = pgio-&gt;pg_lseg-&gt;pls_range.offset;</div><div class='add'>+	u32 stripe_unit = FF_LAYOUT_LSEG(pgio-&gt;pg_lseg)-&gt;stripe_unit;</div><div class='add'>+</div><div class='add'>+	/* calls nfs_generic_pg_test */</div><div class='add'>+	size = pnfs_generic_pg_test(pgio, prev, req);</div><div class='add'>+	if (!size)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (!ff_layout_lseg_is_striped(FF_LAYOUT_LSEG(pgio-&gt;pg_lseg)))</div><div class='add'>+		return size;</div><div class='add'>+</div><div class='add'>+	/* see if req and prev are in the same stripe */</div><div class='add'>+	if (prev) {</div><div class='add'>+		p_stripe = (u64)req_offset(prev) - segment_offset;</div><div class='add'>+		r_stripe = (u64)req_offset(req) - segment_offset;</div><div class='add'>+		do_div(p_stripe, stripe_unit);</div><div class='add'>+		do_div(r_stripe, stripe_unit);</div><div class='add'>+</div><div class='add'>+		if (p_stripe != r_stripe)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* calculate remaining bytes in the current stripe */</div><div class='add'>+	div_u64_rem((u64)req_offset(req) - segment_offset,</div><div class='add'>+			stripe_unit,</div><div class='add'>+			&amp;stripe_offset);</div><div class='add'>+	WARN_ON_ONCE(stripe_offset &gt; stripe_unit);</div><div class='add'>+	if (stripe_offset &gt;= stripe_unit)</div><div class='add'>+		return 0;</div><div class='add'>+	return min(stripe_unit - (unsigned int)stripe_offset, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -837,10 +1029,13 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 	struct nfs_pgio_mirror *pgm;</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='del'>-	u32 ds_idx;</div><div class='add'>+	u32 ds_idx, dss_id;</div><div class='ctx'> </div><div class='add'>+	if (NFS_SERVER(pgio-&gt;pg_inode)-&gt;flags &amp;</div><div class='add'>+			(NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))</div><div class='add'>+		pgio-&gt;pg_maxretrans = io_maxretrans;</div><div class='ctx'> retry:</div><div class='del'>-	ff_layout_pg_check_layout(pgio, req);</div><div class='add'>+	pnfs_generic_pg_check_layout(pgio, req);</div><div class='ctx'> 	/* Use full layout for now */</div><div class='ctx'> 	if (!pgio-&gt;pg_lseg) {</div><div class='ctx'> 		ff_layout_pg_get_read(pgio, req, false);</div><div class='hunk'>@@ -852,9 +1047,12 @@ retry:</div><div class='ctx'> 		if (!pgio-&gt;pg_lseg)</div><div class='ctx'> 			goto out_nolseg;</div><div class='ctx'> 	}</div><div class='add'>+	/* Reset wb_nio, since getting layout segment was successful */</div><div class='add'>+	req-&gt;wb_nio = 0;</div><div class='ctx'> </div><div class='del'>-	ds = ff_layout_get_ds_for_read(pgio, &amp;ds_idx);</div><div class='del'>-	if (!ds) {</div><div class='add'>+	ds = ff_layout_get_ds_for_read(pgio, &amp;ds_idx,</div><div class='add'>+				       req_offset(req), &amp;dss_id);</div><div class='add'>+	if (IS_ERR(ds)) {</div><div class='ctx'> 		if (!ff_layout_no_fallback_to_mds(pgio-&gt;pg_lseg))</div><div class='ctx'> 			goto out_mds;</div><div class='ctx'> 		pnfs_generic_pg_cleanup(pgio);</div><div class='hunk'>@@ -865,17 +1063,27 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	mirror = FF_LAYOUT_COMP(pgio-&gt;pg_lseg, ds_idx);</div><div class='ctx'> 	pgm = &amp;pgio-&gt;pg_mirrors[0];</div><div class='del'>-	pgm-&gt;pg_bsize = mirror-&gt;mirror_ds-&gt;ds_versions[0].rsize;</div><div class='add'>+	pgm-&gt;pg_bsize = mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].rsize;</div><div class='ctx'> </div><div class='ctx'> 	pgio-&gt;pg_mirror_idx = ds_idx;</div><div class='del'>-</div><div class='del'>-	if (NFS_SERVER(pgio-&gt;pg_inode)-&gt;flags &amp;</div><div class='del'>-			(NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))</div><div class='del'>-		pgio-&gt;pg_maxretrans = io_maxretrans;</div><div class='ctx'> 	return;</div><div class='ctx'> out_nolseg:</div><div class='del'>-	if (pgio-&gt;pg_error &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+	if (pgio-&gt;pg_error &lt; 0) {</div><div class='add'>+		if (pgio-&gt;pg_error != -EAGAIN)</div><div class='add'>+			return;</div><div class='add'>+		/* Retry getting layout segment if lower layer returned -EAGAIN */</div><div class='add'>+		if (pgio-&gt;pg_maxretrans &amp;&amp; req-&gt;wb_nio++ &gt; pgio-&gt;pg_maxretrans) {</div><div class='add'>+			if (NFS_SERVER(pgio-&gt;pg_inode)-&gt;flags &amp; NFS_MOUNT_SOFTERR)</div><div class='add'>+				pgio-&gt;pg_error = -ETIMEDOUT;</div><div class='add'>+			else</div><div class='add'>+				pgio-&gt;pg_error = -EIO;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		pgio-&gt;pg_error = 0;</div><div class='add'>+		/* Sleep for 1 second before retrying */</div><div class='add'>+		ssleep(1);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='ctx'> out_mds:</div><div class='ctx'> 	trace_pnfs_mds_fallback_pg_init_read(pgio-&gt;pg_inode,</div><div class='ctx'> 			0, NFS4_MAX_UINT64, IOMODE_READ,</div><div class='hunk'>@@ -892,10 +1100,10 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	struct nfs_pgio_mirror *pgm;</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='del'>-	u32 i;</div><div class='add'>+	u32 i, dss_id;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	ff_layout_pg_check_layout(pgio, req);</div><div class='add'>+	pnfs_generic_pg_check_layout(pgio, req);</div><div class='ctx'> 	if (!pgio-&gt;pg_lseg) {</div><div class='ctx'> 		pgio-&gt;pg_lseg =</div><div class='ctx'> 			pnfs_update_layout(pgio-&gt;pg_inode, nfs_req_openctx(req),</div><div class='hunk'>@@ -917,8 +1125,13 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pgio-&gt;pg_mirror_count; i++) {</div><div class='ctx'> 		mirror = FF_LAYOUT_COMP(pgio-&gt;pg_lseg, i);</div><div class='del'>-		ds = nfs4_ff_layout_prepare_ds(pgio-&gt;pg_lseg, mirror, true);</div><div class='del'>-		if (!ds) {</div><div class='add'>+		dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+			FF_LAYOUT_LSEG(pgio-&gt;pg_lseg)-&gt;stripe_unit,</div><div class='add'>+			mirror-&gt;dss_count,</div><div class='add'>+			req_offset(req));</div><div class='add'>+		ds = nfs4_ff_layout_prepare_ds(pgio-&gt;pg_lseg, mirror,</div><div class='add'>+					       dss_id, true);</div><div class='add'>+		if (IS_ERR(ds)) {</div><div class='ctx'> 			if (!ff_layout_no_fallback_to_mds(pgio-&gt;pg_lseg))</div><div class='ctx'> 				goto out_mds;</div><div class='ctx'> 			pnfs_generic_pg_cleanup(pgio);</div><div class='hunk'>@@ -927,7 +1140,7 @@ retry:</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		}</div><div class='ctx'> 		pgm = &amp;pgio-&gt;pg_mirrors[i];</div><div class='del'>-		pgm-&gt;pg_bsize = mirror-&gt;mirror_ds-&gt;ds_versions[0].wsize;</div><div class='add'>+		pgm-&gt;pg_bsize = mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].wsize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (NFS_SERVER(pgio-&gt;pg_inode)-&gt;flags &amp;</div><div class='hunk'>@@ -993,14 +1206,14 @@ ff_layout_pg_get_mirror_write(struct nfs_pageio_descriptor *desc, u32 idx)</div><div class='ctx'> </div><div class='ctx'> static const struct nfs_pageio_ops ff_layout_pg_read_ops = {</div><div class='ctx'> 	.pg_init = ff_layout_pg_init_read,</div><div class='del'>-	.pg_test = pnfs_generic_pg_test,</div><div class='add'>+	.pg_test = ff_layout_pg_test,</div><div class='ctx'> 	.pg_doio = pnfs_generic_pg_readpages,</div><div class='ctx'> 	.pg_cleanup = pnfs_generic_pg_cleanup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nfs_pageio_ops ff_layout_pg_write_ops = {</div><div class='ctx'> 	.pg_init = ff_layout_pg_init_write,</div><div class='del'>-	.pg_test = pnfs_generic_pg_test,</div><div class='add'>+	.pg_test = ff_layout_pg_test,</div><div class='ctx'> 	.pg_doio = pnfs_generic_pg_writepages,</div><div class='ctx'> 	.pg_get_mirror_count = ff_layout_pg_get_mirror_count_write,</div><div class='ctx'> 	.pg_cleanup = pnfs_generic_pg_cleanup,</div><div class='hunk'>@@ -1048,11 +1261,15 @@ static void ff_layout_resend_pnfs_read(struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 idx = hdr-&gt;pgio_mirror_idx + 1;</div><div class='ctx'> 	u32 new_idx = 0;</div><div class='add'>+	u32 dss_id = 0;</div><div class='add'>+	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> </div><div class='del'>-	if (ff_layout_choose_any_ds_for_read(hdr-&gt;lseg, idx, &amp;new_idx))</div><div class='del'>-		ff_layout_send_layouterror(hdr-&gt;lseg);</div><div class='del'>-	else</div><div class='add'>+	ds = ff_layout_choose_any_ds_for_read(hdr-&gt;lseg, idx, &amp;new_idx,</div><div class='add'>+					      hdr-&gt;args.offset, &amp;dss_id);</div><div class='add'>+	if (IS_ERR(ds))</div><div class='ctx'> 		pnfs_error_mark_layout_for_return(hdr-&gt;inode, hdr-&gt;lseg);</div><div class='add'>+	else</div><div class='add'>+		ff_layout_send_layouterror(hdr-&gt;lseg);</div><div class='ctx'> 	pnfs_read_resend_pnfs(hdr, new_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1081,42 +1298,53 @@ static void ff_layout_reset_read(struct nfs_pgio_header *hdr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ff_layout_async_handle_error_v4(struct rpc_task *task,</div><div class='add'>+					   u32 op_status,</div><div class='ctx'> 					   struct nfs4_state *state,</div><div class='ctx'> 					   struct nfs_client *clp,</div><div class='ctx'> 					   struct pnfs_layout_segment *lseg,</div><div class='del'>-					   u32 idx)</div><div class='add'>+					   u32 idx, u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_layout_hdr *lo = lseg-&gt;pls_layout;</div><div class='ctx'> 	struct inode *inode = lo-&gt;plh_inode;</div><div class='del'>-	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);</div><div class='add'>+	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx, dss_id);</div><div class='ctx'> 	struct nfs4_slot_table *tbl = &amp;clp-&gt;cl_session-&gt;fc_slot_table;</div><div class='ctx'> </div><div class='del'>-	switch (task-&gt;tk_status) {</div><div class='del'>-	case -NFS4ERR_BADSESSION:</div><div class='del'>-	case -NFS4ERR_BADSLOT:</div><div class='del'>-	case -NFS4ERR_BAD_HIGH_SLOT:</div><div class='del'>-	case -NFS4ERR_DEADSESSION:</div><div class='del'>-	case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:</div><div class='del'>-	case -NFS4ERR_SEQ_FALSE_RETRY:</div><div class='del'>-	case -NFS4ERR_SEQ_MISORDERED:</div><div class='add'>+	switch (op_status) {</div><div class='add'>+	case NFS4_OK:</div><div class='add'>+	case NFS4ERR_NXIO:</div><div class='add'>+		break;</div><div class='add'>+	case NFSERR_PERM:</div><div class='add'>+		if (!task-&gt;tk_xprt)</div><div class='add'>+			break;</div><div class='add'>+		xprt_force_disconnect(task-&gt;tk_xprt);</div><div class='add'>+		goto out_retry;</div><div class='add'>+	case NFS4ERR_BADSESSION:</div><div class='add'>+	case NFS4ERR_BADSLOT:</div><div class='add'>+	case NFS4ERR_BAD_HIGH_SLOT:</div><div class='add'>+	case NFS4ERR_DEADSESSION:</div><div class='add'>+	case NFS4ERR_CONN_NOT_BOUND_TO_SESSION:</div><div class='add'>+	case NFS4ERR_SEQ_FALSE_RETRY:</div><div class='add'>+	case NFS4ERR_SEQ_MISORDERED:</div><div class='ctx'> 		dprintk("%s ERROR %d, Reset session. Exchangeid "</div><div class='ctx'> 			"flags 0x%x\n", __func__, task-&gt;tk_status,</div><div class='ctx'> 			clp-&gt;cl_exchange_flags);</div><div class='ctx'> 		nfs4_schedule_session_recovery(clp-&gt;cl_session, task-&gt;tk_status);</div><div class='del'>-		break;</div><div class='del'>-	case -NFS4ERR_DELAY:</div><div class='del'>-	case -NFS4ERR_GRACE:</div><div class='add'>+		goto out_retry;</div><div class='add'>+	case NFS4ERR_DELAY:</div><div class='add'>+		nfs_inc_stats(lseg-&gt;pls_layout-&gt;plh_inode, NFSIOS_DELAY);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NFS4ERR_GRACE:</div><div class='ctx'> 		rpc_delay(task, FF_LAYOUT_POLL_RETRY_MAX);</div><div class='del'>-		break;</div><div class='del'>-	case -NFS4ERR_RETRY_UNCACHED_REP:</div><div class='del'>-		break;</div><div class='add'>+		goto out_retry;</div><div class='add'>+	case NFS4ERR_RETRY_UNCACHED_REP:</div><div class='add'>+		goto out_retry;</div><div class='ctx'> 	/* Invalidate Layout errors */</div><div class='del'>-	case -NFS4ERR_PNFS_NO_LAYOUT:</div><div class='del'>-	case -ESTALE:           /* mapped NFS4ERR_STALE */</div><div class='del'>-	case -EBADHANDLE:       /* mapped NFS4ERR_BADHANDLE */</div><div class='del'>-	case -EISDIR:           /* mapped NFS4ERR_ISDIR */</div><div class='del'>-	case -NFS4ERR_FHEXPIRED:</div><div class='del'>-	case -NFS4ERR_WRONG_TYPE:</div><div class='add'>+	case NFS4ERR_PNFS_NO_LAYOUT:</div><div class='add'>+	case NFS4ERR_STALE:</div><div class='add'>+	case NFS4ERR_BADHANDLE:</div><div class='add'>+	case NFS4ERR_ISDIR:</div><div class='add'>+	case NFS4ERR_FHEXPIRED:</div><div class='add'>+	case NFS4ERR_WRONG_TYPE:</div><div class='ctx'> 		dprintk("%s Invalid layout error %d\n", __func__,</div><div class='ctx'> 			task-&gt;tk_status);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1129,11 +1357,20 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,</div><div class='ctx'> 		pnfs_destroy_layout(NFS_I(inode));</div><div class='ctx'> 		rpc_wake_up(&amp;tbl-&gt;slot_tbl_waitq);</div><div class='ctx'> 		goto reset;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (task-&gt;tk_status) {</div><div class='ctx'> 	/* RPC connection errors */</div><div class='add'>+	case -ENETDOWN:</div><div class='add'>+	case -ENETUNREACH:</div><div class='add'>+		if (test_bit(NFS_CS_NETUNREACH_FATAL, &amp;clp-&gt;cl_flags))</div><div class='add'>+			return -NFS4ERR_FATAL_IOERROR;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case -ECONNREFUSED:</div><div class='ctx'> 	case -EHOSTDOWN:</div><div class='ctx'> 	case -EHOSTUNREACH:</div><div class='del'>-	case -ENETUNREACH:</div><div class='ctx'> 	case -EIO:</div><div class='ctx'> 	case -ETIMEDOUT:</div><div class='ctx'> 	case -EPIPE:</div><div class='hunk'>@@ -1144,25 +1381,55 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,</div><div class='ctx'> 		nfs4_delete_deviceid(devid-&gt;ld, devid-&gt;nfs_client,</div><div class='ctx'> 				&amp;devid-&gt;deviceid);</div><div class='ctx'> 		rpc_wake_up(&amp;tbl-&gt;slot_tbl_waitq);</div><div class='del'>-		fallthrough;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		if (ff_layout_avoid_mds_available_ds(lseg))</div><div class='del'>-			return -NFS4ERR_RESET_TO_PNFS;</div><div class='del'>-reset:</div><div class='del'>-		dprintk("%s Retry through MDS. Error %d\n", __func__,</div><div class='del'>-			task-&gt;tk_status);</div><div class='del'>-		return -NFS4ERR_RESET_TO_MDS;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (ff_layout_avoid_mds_available_ds(lseg))</div><div class='add'>+		return -NFS4ERR_RESET_TO_PNFS;</div><div class='add'>+reset:</div><div class='add'>+	dprintk("%s Retry through MDS. Error %d\n", __func__,</div><div class='add'>+		task-&gt;tk_status);</div><div class='add'>+	return -NFS4ERR_RESET_TO_MDS;</div><div class='add'>+</div><div class='add'>+out_retry:</div><div class='ctx'> 	task-&gt;tk_status = 0;</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Retry all errors through either pNFS or MDS except for -EJUKEBOX */</div><div class='ctx'> static int ff_layout_async_handle_error_v3(struct rpc_task *task,</div><div class='add'>+					   u32 op_status,</div><div class='add'>+					   struct nfs_client *clp,</div><div class='ctx'> 					   struct pnfs_layout_segment *lseg,</div><div class='del'>-					   u32 idx)</div><div class='add'>+					   u32 idx, u32 dss_id)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);</div><div class='add'>+	struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx, dss_id);</div><div class='add'>+</div><div class='add'>+	switch (op_status) {</div><div class='add'>+	case NFS_OK:</div><div class='add'>+	case NFSERR_NXIO:</div><div class='add'>+		break;</div><div class='add'>+	case NFSERR_PERM:</div><div class='add'>+		if (!task-&gt;tk_xprt)</div><div class='add'>+			break;</div><div class='add'>+		xprt_force_disconnect(task-&gt;tk_xprt);</div><div class='add'>+		goto out_retry;</div><div class='add'>+	case NFSERR_ACCES:</div><div class='add'>+	case NFSERR_BADHANDLE:</div><div class='add'>+	case NFSERR_FBIG:</div><div class='add'>+	case NFSERR_IO:</div><div class='add'>+	case NFSERR_NOSPC:</div><div class='add'>+	case NFSERR_ROFS:</div><div class='add'>+	case NFSERR_STALE:</div><div class='add'>+		goto out_reset_to_pnfs;</div><div class='add'>+	case NFSERR_JUKEBOX:</div><div class='add'>+		nfs_inc_stats(lseg-&gt;pls_layout-&gt;plh_inode, NFSIOS_DELAY);</div><div class='add'>+		goto out_retry;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (task-&gt;tk_status) {</div><div class='ctx'> 	/* File access problems. Don't mark the device as unavailable */</div><div class='hunk'>@@ -1176,12 +1443,18 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task,</div><div class='ctx'> 	case -EJUKEBOX:</div><div class='ctx'> 		nfs_inc_stats(lseg-&gt;pls_layout-&gt;plh_inode, NFSIOS_DELAY);</div><div class='ctx'> 		goto out_retry;</div><div class='add'>+	case -ENETDOWN:</div><div class='add'>+	case -ENETUNREACH:</div><div class='add'>+		if (test_bit(NFS_CS_NETUNREACH_FATAL, &amp;clp-&gt;cl_flags))</div><div class='add'>+			return -NFS4ERR_FATAL_IOERROR;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk("%s DS connection error %d\n", __func__,</div><div class='ctx'> 			task-&gt;tk_status);</div><div class='ctx'> 		nfs4_delete_deviceid(devid-&gt;ld, devid-&gt;nfs_client,</div><div class='ctx'> 				&amp;devid-&gt;deviceid);</div><div class='ctx'> 	}</div><div class='add'>+out_reset_to_pnfs:</div><div class='ctx'> 	/* FIXME: Need to prevent infinite looping here. */</div><div class='ctx'> 	return -NFS4ERR_RESET_TO_PNFS;</div><div class='ctx'> out_retry:</div><div class='hunk'>@@ -1192,15 +1465,16 @@ out_retry:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ff_layout_async_handle_error(struct rpc_task *task,</div><div class='add'>+					u32 op_status,</div><div class='ctx'> 					struct nfs4_state *state,</div><div class='ctx'> 					struct nfs_client *clp,</div><div class='ctx'> 					struct pnfs_layout_segment *lseg,</div><div class='del'>-					u32 idx)</div><div class='add'>+					u32 idx, u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	int vers = clp-&gt;cl_nfs_mod-&gt;rpc_vers-&gt;number;</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tk_status &gt;= 0) {</div><div class='del'>-		ff_layout_mark_ds_reachable(lseg, idx);</div><div class='add'>+		ff_layout_mark_ds_reachable(lseg, idx, dss_id);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1210,10 +1484,11 @@ static int ff_layout_async_handle_error(struct rpc_task *task,</div><div class='ctx'> </div><div class='ctx'> 	switch (vers) {</div><div class='ctx'> 	case 3:</div><div class='del'>-		return ff_layout_async_handle_error_v3(task, lseg, idx);</div><div class='add'>+		return ff_layout_async_handle_error_v3(task, op_status, clp,</div><div class='add'>+						       lseg, idx, dss_id);</div><div class='ctx'> 	case 4:</div><div class='del'>-		return ff_layout_async_handle_error_v4(task, state, clp,</div><div class='del'>-						       lseg, idx);</div><div class='add'>+		return ff_layout_async_handle_error_v4(task, op_status, state,</div><div class='add'>+						       clp, lseg, idx, dss_id);</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* should never happen */</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='hunk'>@@ -1222,7 +1497,7 @@ static int ff_layout_async_handle_error(struct rpc_task *task,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,</div><div class='del'>-					u32 idx, u64 offset, u64 length,</div><div class='add'>+					u32 idx, u32 dss_id, u64 offset, u64 length,</div><div class='ctx'> 					u32 *op_status, int opnum, int error)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='hunk'>@@ -1240,6 +1515,7 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 		case -ECONNRESET:</div><div class='ctx'> 		case -EHOSTDOWN:</div><div class='ctx'> 		case -EHOSTUNREACH:</div><div class='add'>+		case -ENETDOWN:</div><div class='ctx'> 		case -ENETUNREACH:</div><div class='ctx'> 		case -EADDRINUSE:</div><div class='ctx'> 		case -ENOBUFS:</div><div class='hunk'>@@ -1259,15 +1535,16 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,</div><div class='ctx'> </div><div class='ctx'> 	mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='ctx'> 	err = ff_layout_track_ds_error(FF_LAYOUT_FROM_HDR(lseg-&gt;pls_layout),</div><div class='del'>-				       mirror, offset, length, status, opnum,</div><div class='add'>+				       mirror, dss_id, offset, length, status, opnum,</div><div class='ctx'> 				       nfs_io_gfp_mask());</div><div class='ctx'> </div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 	case NFS4ERR_DELAY:</div><div class='ctx'> 	case NFS4ERR_GRACE:</div><div class='add'>+	case NFS4ERR_PERM:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFS4ERR_NXIO:</div><div class='del'>-		ff_layout_mark_ds_unreachable(lseg, idx);</div><div class='add'>+		ff_layout_mark_ds_unreachable(lseg, idx, dss_id);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Don't return the layout if this is a read and we still</div><div class='ctx'> 		 * have layouts to try</div><div class='hunk'>@@ -1287,19 +1564,27 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,</div><div class='ctx'> static int ff_layout_read_done_cb(struct rpc_task *task,</div><div class='ctx'> 				struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs4_ff_layout_segment *flseg = FF_LAYOUT_LSEG(hdr-&gt;lseg);</div><div class='add'>+	u32 dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		flseg-&gt;stripe_unit,</div><div class='add'>+		flseg-&gt;mirror_array[hdr-&gt;pgio_mirror_idx]-&gt;dss_count,</div><div class='add'>+		hdr-&gt;args.offset);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tk_status &lt; 0) {</div><div class='del'>-		ff_layout_io_track_ds_error(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx,</div><div class='add'>+		ff_layout_io_track_ds_error(hdr-&gt;lseg,</div><div class='add'>+					    hdr-&gt;pgio_mirror_idx, dss_id,</div><div class='ctx'> 					    hdr-&gt;args.offset, hdr-&gt;args.count,</div><div class='ctx'> 					    &amp;hdr-&gt;res.op_status, OP_READ,</div><div class='ctx'> 					    task-&gt;tk_status);</div><div class='del'>-		trace_ff_layout_read_error(hdr);</div><div class='add'>+		trace_ff_layout_read_error(hdr, task-&gt;tk_status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ff_layout_async_handle_error(task, hdr-&gt;args.context-&gt;state,</div><div class='add'>+	err = ff_layout_async_handle_error(task, hdr-&gt;res.op_status,</div><div class='add'>+					   hdr-&gt;args.context-&gt;state,</div><div class='ctx'> 					   hdr-&gt;ds_clp, hdr-&gt;lseg,</div><div class='del'>-					   hdr-&gt;pgio_mirror_idx);</div><div class='add'>+					   hdr-&gt;pgio_mirror_idx,</div><div class='add'>+					   dss_id);</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs4_pnfs_read(hdr, err);</div><div class='ctx'> 	clear_bit(NFS_IOHDR_RESEND_PNFS, &amp;hdr-&gt;flags);</div><div class='hunk'>@@ -1313,6 +1598,9 @@ static int ff_layout_read_done_cb(struct rpc_task *task,</div><div class='ctx'> 		return task-&gt;tk_status;</div><div class='ctx'> 	case -EAGAIN:</div><div class='ctx'> 		goto out_eagain;</div><div class='add'>+	case -NFS4ERR_FATAL_IOERROR:</div><div class='add'>+		task-&gt;tk_status = -EIO;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1352,23 +1640,47 @@ ff_layout_set_layoutcommit(struct inode *inode,</div><div class='ctx'> static void ff_layout_read_record_layoutstats_start(struct rpc_task *task,</div><div class='ctx'> 		struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs4_ff_layout_mirror *mirror;</div><div class='add'>+	u32 dss_id;</div><div class='add'>+</div><div class='ctx'> 	if (test_and_set_bit(NFS_IOHDR_STAT, &amp;hdr-&gt;flags))</div><div class='ctx'> 		return;</div><div class='del'>-	nfs4_ff_layout_stat_io_start_read(hdr-&gt;inode,</div><div class='del'>-			FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx),</div><div class='del'>-			hdr-&gt;args.count,</div><div class='del'>-			task-&gt;tk_start);</div><div class='add'>+</div><div class='add'>+	mirror = FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx);</div><div class='add'>+	dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		FF_LAYOUT_LSEG(hdr-&gt;lseg)-&gt;stripe_unit,</div><div class='add'>+		mirror-&gt;dss_count,</div><div class='add'>+		hdr-&gt;args.offset);</div><div class='add'>+</div><div class='add'>+	nfs4_ff_layout_stat_io_start_read(</div><div class='add'>+		hdr-&gt;inode,</div><div class='add'>+		mirror,</div><div class='add'>+		dss_id,</div><div class='add'>+		hdr-&gt;args.count,</div><div class='add'>+		task-&gt;tk_start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ff_layout_read_record_layoutstats_done(struct rpc_task *task,</div><div class='ctx'> 		struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs4_ff_layout_mirror *mirror;</div><div class='add'>+	u32 dss_id;</div><div class='add'>+</div><div class='ctx'> 	if (!test_and_clear_bit(NFS_IOHDR_STAT, &amp;hdr-&gt;flags))</div><div class='ctx'> 		return;</div><div class='del'>-	nfs4_ff_layout_stat_io_end_read(task,</div><div class='del'>-			FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx),</div><div class='del'>-			hdr-&gt;args.count,</div><div class='del'>-			hdr-&gt;res.count);</div><div class='add'>+</div><div class='add'>+	mirror = FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx);</div><div class='add'>+	dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		FF_LAYOUT_LSEG(hdr-&gt;lseg)-&gt;stripe_unit,</div><div class='add'>+		mirror-&gt;dss_count,</div><div class='add'>+		hdr-&gt;args.offset);</div><div class='add'>+</div><div class='add'>+	nfs4_ff_layout_stat_io_end_read(</div><div class='add'>+		task,</div><div class='add'>+		mirror,</div><div class='add'>+		dss_id,</div><div class='add'>+		hdr-&gt;args.count,</div><div class='add'>+		hdr-&gt;res.count);</div><div class='ctx'> 	set_bit(NFS_LSEG_LAYOUTRETURN, &amp;hdr-&gt;lseg-&gt;pls_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1456,20 +1768,28 @@ static void ff_layout_read_release(void *data)</div><div class='ctx'> static int ff_layout_write_done_cb(struct rpc_task *task,</div><div class='ctx'> 				struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs4_ff_layout_segment *flseg = FF_LAYOUT_LSEG(hdr-&gt;lseg);</div><div class='add'>+	u32 dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		flseg-&gt;stripe_unit,</div><div class='add'>+		flseg-&gt;mirror_array[hdr-&gt;pgio_mirror_idx]-&gt;dss_count,</div><div class='add'>+		hdr-&gt;args.offset);</div><div class='ctx'> 	loff_t end_offs = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tk_status &lt; 0) {</div><div class='del'>-		ff_layout_io_track_ds_error(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx,</div><div class='add'>+		ff_layout_io_track_ds_error(hdr-&gt;lseg,</div><div class='add'>+					    hdr-&gt;pgio_mirror_idx, dss_id,</div><div class='ctx'> 					    hdr-&gt;args.offset, hdr-&gt;args.count,</div><div class='ctx'> 					    &amp;hdr-&gt;res.op_status, OP_WRITE,</div><div class='ctx'> 					    task-&gt;tk_status);</div><div class='del'>-		trace_ff_layout_write_error(hdr);</div><div class='add'>+		trace_ff_layout_write_error(hdr, task-&gt;tk_status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ff_layout_async_handle_error(task, hdr-&gt;args.context-&gt;state,</div><div class='add'>+	err = ff_layout_async_handle_error(task, hdr-&gt;res.op_status,</div><div class='add'>+					   hdr-&gt;args.context-&gt;state,</div><div class='ctx'> 					   hdr-&gt;ds_clp, hdr-&gt;lseg,</div><div class='del'>-					   hdr-&gt;pgio_mirror_idx);</div><div class='add'>+					   hdr-&gt;pgio_mirror_idx,</div><div class='add'>+					   dss_id);</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs4_pnfs_write(hdr, err);</div><div class='ctx'> 	clear_bit(NFS_IOHDR_RESEND_PNFS, &amp;hdr-&gt;flags);</div><div class='hunk'>@@ -1483,6 +1803,9 @@ static int ff_layout_write_done_cb(struct rpc_task *task,</div><div class='ctx'> 		return task-&gt;tk_status;</div><div class='ctx'> 	case -EAGAIN:</div><div class='ctx'> 		return -EAGAIN;</div><div class='add'>+	case -NFS4ERR_FATAL_IOERROR:</div><div class='add'>+		task-&gt;tk_status = -EIO;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;res.verf-&gt;committed == NFS_FILE_SYNC ||</div><div class='hunk'>@@ -1504,17 +1827,20 @@ static int ff_layout_commit_done_cb(struct rpc_task *task,</div><div class='ctx'> 				     struct nfs_commit_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	u32 idx = calc_mirror_idx_from_commit(data-&gt;lseg, data-&gt;ds_commit_index);</div><div class='add'>+	u32 dss_id = calc_dss_id_from_commit(data-&gt;lseg, data-&gt;ds_commit_index);</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tk_status &lt; 0) {</div><div class='del'>-		ff_layout_io_track_ds_error(data-&gt;lseg, data-&gt;ds_commit_index,</div><div class='add'>+		ff_layout_io_track_ds_error(data-&gt;lseg, idx, dss_id,</div><div class='ctx'> 					    data-&gt;args.offset, data-&gt;args.count,</div><div class='ctx'> 					    &amp;data-&gt;res.op_status, OP_COMMIT,</div><div class='ctx'> 					    task-&gt;tk_status);</div><div class='del'>-		trace_ff_layout_commit_error(data);</div><div class='add'>+		trace_ff_layout_commit_error(data, task-&gt;tk_status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ff_layout_async_handle_error(task, NULL, data-&gt;ds_clp,</div><div class='del'>-					   data-&gt;lseg, data-&gt;ds_commit_index);</div><div class='add'>+	err = ff_layout_async_handle_error(task, data-&gt;res.op_status,</div><div class='add'>+					   NULL, data-&gt;ds_clp, data-&gt;lseg, idx,</div><div class='add'>+					   dss_id);</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs4_pnfs_commit_ds(data, err);</div><div class='ctx'> 	switch (err) {</div><div class='hunk'>@@ -1527,33 +1853,60 @@ static int ff_layout_commit_done_cb(struct rpc_task *task,</div><div class='ctx'> 	case -EAGAIN:</div><div class='ctx'> 		rpc_restart_call_prepare(task);</div><div class='ctx'> 		return -EAGAIN;</div><div class='add'>+	case -NFS4ERR_FATAL_IOERROR:</div><div class='add'>+		task-&gt;tk_status = -EIO;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ff_layout_set_layoutcommit(data-&gt;inode, data-&gt;lseg, data-&gt;lwb);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ff_layout_write_record_layoutstats_start(struct rpc_task *task,</div><div class='ctx'> 		struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs4_ff_layout_mirror *mirror;</div><div class='add'>+	u32 dss_id;</div><div class='add'>+</div><div class='ctx'> 	if (test_and_set_bit(NFS_IOHDR_STAT, &amp;hdr-&gt;flags))</div><div class='ctx'> 		return;</div><div class='del'>-	nfs4_ff_layout_stat_io_start_write(hdr-&gt;inode,</div><div class='del'>-			FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx),</div><div class='del'>-			hdr-&gt;args.count,</div><div class='del'>-			task-&gt;tk_start);</div><div class='add'>+</div><div class='add'>+	mirror = FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx);</div><div class='add'>+	dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		FF_LAYOUT_LSEG(hdr-&gt;lseg)-&gt;stripe_unit,</div><div class='add'>+		mirror-&gt;dss_count,</div><div class='add'>+		hdr-&gt;args.offset);</div><div class='add'>+</div><div class='add'>+	nfs4_ff_layout_stat_io_start_write(</div><div class='add'>+		hdr-&gt;inode,</div><div class='add'>+		mirror,</div><div class='add'>+		dss_id,</div><div class='add'>+		hdr-&gt;args.count,</div><div class='add'>+		task-&gt;tk_start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ff_layout_write_record_layoutstats_done(struct rpc_task *task,</div><div class='ctx'> 		struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs4_ff_layout_mirror *mirror;</div><div class='add'>+	u32 dss_id;</div><div class='add'>+</div><div class='ctx'> 	if (!test_and_clear_bit(NFS_IOHDR_STAT, &amp;hdr-&gt;flags))</div><div class='ctx'> 		return;</div><div class='del'>-	nfs4_ff_layout_stat_io_end_write(task,</div><div class='del'>-			FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx),</div><div class='del'>-			hdr-&gt;args.count, hdr-&gt;res.count,</div><div class='del'>-			hdr-&gt;res.verf-&gt;committed);</div><div class='add'>+</div><div class='add'>+	mirror = FF_LAYOUT_COMP(hdr-&gt;lseg, hdr-&gt;pgio_mirror_idx);</div><div class='add'>+	dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		FF_LAYOUT_LSEG(hdr-&gt;lseg)-&gt;stripe_unit,</div><div class='add'>+		mirror-&gt;dss_count,</div><div class='add'>+		hdr-&gt;args.offset);</div><div class='add'>+</div><div class='add'>+	nfs4_ff_layout_stat_io_end_write(</div><div class='add'>+		task,</div><div class='add'>+		mirror,</div><div class='add'>+		dss_id,</div><div class='add'>+		hdr-&gt;args.count,</div><div class='add'>+		hdr-&gt;res.count,</div><div class='add'>+		hdr-&gt;res.verf-&gt;committed);</div><div class='ctx'> 	set_bit(NFS_LSEG_LAYOUTRETURN, &amp;hdr-&gt;lseg-&gt;pls_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1636,10 +1989,16 @@ static void ff_layout_write_release(void *data)</div><div class='ctx'> static void ff_layout_commit_record_layoutstats_start(struct rpc_task *task,</div><div class='ctx'> 		struct nfs_commit_data *cdata)</div><div class='ctx'> {</div><div class='add'>+	u32 idx, dss_id;</div><div class='add'>+</div><div class='ctx'> 	if (test_and_set_bit(NFS_IOHDR_STAT, &amp;cdata-&gt;flags))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='add'>+	idx = calc_mirror_idx_from_commit(cdata-&gt;lseg, cdata-&gt;ds_commit_index);</div><div class='add'>+	dss_id = calc_dss_id_from_commit(cdata-&gt;lseg, cdata-&gt;ds_commit_index);</div><div class='ctx'> 	nfs4_ff_layout_stat_io_start_write(cdata-&gt;inode,</div><div class='del'>-			FF_LAYOUT_COMP(cdata-&gt;lseg, cdata-&gt;ds_commit_index),</div><div class='add'>+			FF_LAYOUT_COMP(cdata-&gt;lseg, idx),</div><div class='add'>+			dss_id,</div><div class='ctx'> 			0, task-&gt;tk_start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1648,6 +2007,7 @@ static void ff_layout_commit_record_layoutstats_done(struct rpc_task *task,</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_page *req;</div><div class='ctx'> 	__u64 count = 0;</div><div class='add'>+	u32 idx, dss_id;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_clear_bit(NFS_IOHDR_STAT, &amp;cdata-&gt;flags))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1656,8 +2016,12 @@ static void ff_layout_commit_record_layoutstats_done(struct rpc_task *task,</div><div class='ctx'> 		list_for_each_entry(req, &amp;cdata-&gt;pages, wb_list)</div><div class='ctx'> 			count += req-&gt;wb_bytes;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	idx = calc_mirror_idx_from_commit(cdata-&gt;lseg, cdata-&gt;ds_commit_index);</div><div class='add'>+	dss_id = calc_dss_id_from_commit(cdata-&gt;lseg, cdata-&gt;ds_commit_index);</div><div class='ctx'> 	nfs4_ff_layout_stat_io_end_write(task,</div><div class='del'>-			FF_LAYOUT_COMP(cdata-&gt;lseg, cdata-&gt;ds_commit_index),</div><div class='add'>+			FF_LAYOUT_COMP(cdata-&gt;lseg, idx),</div><div class='add'>+			dss_id,</div><div class='ctx'> 			count, count, NFS_FILE_SYNC);</div><div class='ctx'> 	set_bit(NFS_LSEG_LAYOUTRETURN, &amp;cdata-&gt;lseg-&gt;pls_flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -1764,32 +2128,41 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	struct pnfs_layout_segment *lseg = hdr-&gt;lseg;</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> 	struct rpc_clnt *ds_clnt;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	const struct cred *ds_cred;</div><div class='ctx'> 	loff_t offset = hdr-&gt;args.offset;</div><div class='ctx'> 	u32 idx = hdr-&gt;pgio_mirror_idx;</div><div class='ctx'> 	int vers;</div><div class='ctx'> 	struct nfs_fh *fh;</div><div class='add'>+	u32 dss_id;</div><div class='add'>+	bool ds_fatal_error = false;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("--&gt; %s ino %lu pgbase %u req %zu@%llu\n",</div><div class='ctx'> 		__func__, hdr-&gt;inode-&gt;i_ino,</div><div class='ctx'> 		hdr-&gt;args.pgbase, (size_t)hdr-&gt;args.count, offset);</div><div class='ctx'> </div><div class='ctx'> 	mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='del'>-	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, false);</div><div class='del'>-	if (!ds)</div><div class='add'>+	dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		FF_LAYOUT_LSEG(lseg)-&gt;stripe_unit,</div><div class='add'>+		mirror-&gt;dss_count,</div><div class='add'>+		offset);</div><div class='add'>+	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, dss_id, false);</div><div class='add'>+	if (IS_ERR(ds)) {</div><div class='add'>+		ds_fatal_error = nfs_error_is_fatal(PTR_ERR(ds));</div><div class='ctx'> 		goto out_failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds-&gt;ds_clp,</div><div class='del'>-						   hdr-&gt;inode);</div><div class='add'>+						   hdr-&gt;inode, dss_id);</div><div class='ctx'> 	if (IS_ERR(ds_clnt))</div><div class='ctx'> 		goto out_failed;</div><div class='ctx'> </div><div class='del'>-	ds_cred = ff_layout_get_ds_cred(mirror, &amp;lseg-&gt;pls_range, hdr-&gt;cred);</div><div class='add'>+	ds_cred = ff_layout_get_ds_cred(mirror, &amp;lseg-&gt;pls_range, hdr-&gt;cred, dss_id);</div><div class='ctx'> 	if (!ds_cred)</div><div class='ctx'> 		goto out_failed;</div><div class='ctx'> </div><div class='del'>-	vers = nfs4_ff_layout_ds_version(mirror);</div><div class='add'>+	vers = nfs4_ff_layout_ds_version(mirror, dss_id);</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s USE DS: %s cl_count %d vers %d\n", __func__,</div><div class='ctx'> 		ds-&gt;ds_remotestr, refcount_read(&amp;ds-&gt;ds_clp-&gt;cl_count), vers);</div><div class='hunk'>@@ -1797,11 +2170,11 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	hdr-&gt;pgio_done_cb = ff_layout_read_done_cb;</div><div class='ctx'> 	refcount_inc(&amp;ds-&gt;ds_clp-&gt;cl_count);</div><div class='ctx'> 	hdr-&gt;ds_clp = ds-&gt;ds_clp;</div><div class='del'>-	fh = nfs4_ff_layout_select_ds_fh(mirror);</div><div class='add'>+	fh = nfs4_ff_layout_select_ds_fh(mirror, dss_id);</div><div class='ctx'> 	if (fh)</div><div class='ctx'> 		hdr-&gt;args.fh = fh;</div><div class='ctx'> </div><div class='del'>-	nfs4_ff_layout_select_ds_stateid(mirror, &amp;hdr-&gt;args.stateid);</div><div class='add'>+	nfs4_ff_layout_select_ds_stateid(mirror, dss_id, &amp;hdr-&gt;args.stateid);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that if we ever decide to split across DSes,</div><div class='hunk'>@@ -1810,16 +2183,24 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	hdr-&gt;args.offset = offset;</div><div class='ctx'> 	hdr-&gt;mds_offset = offset;</div><div class='ctx'> </div><div class='add'>+	/* Start IO accounting for local read */</div><div class='add'>+	localio = ff_local_open_fh(lseg, idx, dss_id, ds-&gt;ds_clp, ds_cred, fh,</div><div class='add'>+				FMODE_READ);</div><div class='add'>+	if (localio) {</div><div class='add'>+		hdr-&gt;task.tk_start = ktime_get();</div><div class='add'>+		ff_layout_read_record_layoutstats_start(&amp;hdr-&gt;task, hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Perform an asynchronous read to ds */</div><div class='ctx'> 	nfs_initiate_pgio(ds_clnt, hdr, ds_cred, ds-&gt;ds_clp-&gt;rpc_ops,</div><div class='ctx'> 			  vers == 3 ? &amp;ff_layout_read_call_ops_v3 :</div><div class='ctx'> 				      &amp;ff_layout_read_call_ops_v4,</div><div class='del'>-			  0, RPC_TASK_SOFTCONN);</div><div class='add'>+			  0, RPC_TASK_SOFTCONN, localio);</div><div class='ctx'> 	put_cred(ds_cred);</div><div class='ctx'> 	return PNFS_ATTEMPTED;</div><div class='ctx'> </div><div class='ctx'> out_failed:</div><div class='del'>-	if (ff_layout_avoid_mds_available_ds(lseg))</div><div class='add'>+	if (ff_layout_avoid_mds_available_ds(lseg) &amp;&amp; !ds_fatal_error)</div><div class='ctx'> 		return PNFS_TRY_AGAIN;</div><div class='ctx'> 	trace_pnfs_mds_fallback_read_pagelist(hdr-&gt;inode,</div><div class='ctx'> 			hdr-&gt;args.offset, hdr-&gt;args.count,</div><div class='hunk'>@@ -1834,28 +2215,37 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)</div><div class='ctx'> 	struct pnfs_layout_segment *lseg = hdr-&gt;lseg;</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> 	struct rpc_clnt *ds_clnt;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	const struct cred *ds_cred;</div><div class='ctx'> 	loff_t offset = hdr-&gt;args.offset;</div><div class='ctx'> 	int vers;</div><div class='ctx'> 	struct nfs_fh *fh;</div><div class='ctx'> 	u32 idx = hdr-&gt;pgio_mirror_idx;</div><div class='add'>+	u32 dss_id;</div><div class='add'>+	bool ds_fatal_error = false;</div><div class='ctx'> </div><div class='ctx'> 	mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='del'>-	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, true);</div><div class='del'>-	if (!ds)</div><div class='add'>+	dss_id = nfs4_ff_layout_calc_dss_id(</div><div class='add'>+		FF_LAYOUT_LSEG(lseg)-&gt;stripe_unit,</div><div class='add'>+		mirror-&gt;dss_count,</div><div class='add'>+		offset);</div><div class='add'>+	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, dss_id, true);</div><div class='add'>+	if (IS_ERR(ds)) {</div><div class='add'>+		ds_fatal_error = nfs_error_is_fatal(PTR_ERR(ds));</div><div class='ctx'> 		goto out_failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds-&gt;ds_clp,</div><div class='del'>-						   hdr-&gt;inode);</div><div class='add'>+						   hdr-&gt;inode, dss_id);</div><div class='ctx'> 	if (IS_ERR(ds_clnt))</div><div class='ctx'> 		goto out_failed;</div><div class='ctx'> </div><div class='del'>-	ds_cred = ff_layout_get_ds_cred(mirror, &amp;lseg-&gt;pls_range, hdr-&gt;cred);</div><div class='add'>+	ds_cred = ff_layout_get_ds_cred(mirror, &amp;lseg-&gt;pls_range, hdr-&gt;cred, dss_id);</div><div class='ctx'> 	if (!ds_cred)</div><div class='ctx'> 		goto out_failed;</div><div class='ctx'> </div><div class='del'>-	vers = nfs4_ff_layout_ds_version(mirror);</div><div class='add'>+	vers = nfs4_ff_layout_ds_version(mirror, dss_id);</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s ino %lu sync %d req %zu@%llu DS: %s cl_count %d vers %d\n",</div><div class='ctx'> 		__func__, hdr-&gt;inode-&gt;i_ino, sync, (size_t) hdr-&gt;args.count,</div><div class='hunk'>@@ -1865,12 +2255,12 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)</div><div class='ctx'> 	hdr-&gt;pgio_done_cb = ff_layout_write_done_cb;</div><div class='ctx'> 	refcount_inc(&amp;ds-&gt;ds_clp-&gt;cl_count);</div><div class='ctx'> 	hdr-&gt;ds_clp = ds-&gt;ds_clp;</div><div class='del'>-	hdr-&gt;ds_commit_idx = idx;</div><div class='del'>-	fh = nfs4_ff_layout_select_ds_fh(mirror);</div><div class='add'>+	hdr-&gt;ds_commit_idx = calc_commit_idx(lseg, idx, dss_id);</div><div class='add'>+	fh = nfs4_ff_layout_select_ds_fh(mirror, dss_id);</div><div class='ctx'> 	if (fh)</div><div class='ctx'> 		hdr-&gt;args.fh = fh;</div><div class='ctx'> </div><div class='del'>-	nfs4_ff_layout_select_ds_stateid(mirror, &amp;hdr-&gt;args.stateid);</div><div class='add'>+	nfs4_ff_layout_select_ds_stateid(mirror, dss_id, &amp;hdr-&gt;args.stateid);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that if we ever decide to split across DSes,</div><div class='hunk'>@@ -1878,16 +2268,24 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)</div><div class='ctx'> 	 */</div><div class='ctx'> 	hdr-&gt;args.offset = offset;</div><div class='ctx'> </div><div class='add'>+	/* Start IO accounting for local write */</div><div class='add'>+	localio = ff_local_open_fh(lseg, idx, dss_id, ds-&gt;ds_clp, ds_cred, fh,</div><div class='add'>+				   FMODE_READ|FMODE_WRITE);</div><div class='add'>+	if (localio) {</div><div class='add'>+		hdr-&gt;task.tk_start = ktime_get();</div><div class='add'>+		ff_layout_write_record_layoutstats_start(&amp;hdr-&gt;task, hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Perform an asynchronous write */</div><div class='ctx'> 	nfs_initiate_pgio(ds_clnt, hdr, ds_cred, ds-&gt;ds_clp-&gt;rpc_ops,</div><div class='ctx'> 			  vers == 3 ? &amp;ff_layout_write_call_ops_v3 :</div><div class='ctx'> 				      &amp;ff_layout_write_call_ops_v4,</div><div class='del'>-			  sync, RPC_TASK_SOFTCONN);</div><div class='add'>+			  sync, RPC_TASK_SOFTCONN, localio);</div><div class='ctx'> 	put_cred(ds_cred);</div><div class='ctx'> 	return PNFS_ATTEMPTED;</div><div class='ctx'> </div><div class='ctx'> out_failed:</div><div class='del'>-	if (ff_layout_avoid_mds_available_ds(lseg))</div><div class='add'>+	if (ff_layout_avoid_mds_available_ds(lseg) &amp;&amp; !ds_fatal_error)</div><div class='ctx'> 		return PNFS_TRY_AGAIN;</div><div class='ctx'> 	trace_pnfs_mds_fallback_write_pagelist(hdr-&gt;inode,</div><div class='ctx'> 			hdr-&gt;args.offset, hdr-&gt;args.count,</div><div class='hunk'>@@ -1895,20 +2293,15 @@ out_failed:</div><div class='ctx'> 	return PNFS_NOT_ATTEMPTED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 calc_ds_index_from_commit(struct pnfs_layout_segment *lseg, u32 i)</div><div class='del'>-{</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nfs_fh *</div><div class='del'>-select_ds_fh_from_commit(struct pnfs_layout_segment *lseg, u32 i)</div><div class='add'>+select_ds_fh_from_commit(struct pnfs_layout_segment *lseg, u32 i, u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_segment *flseg = FF_LAYOUT_LSEG(lseg);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Assume that there is only one NFS version available</div><div class='ctx'> 	 * for the DS.</div><div class='ctx'> 	 */</div><div class='del'>-	return &amp;flseg-&gt;mirror_array[i]-&gt;fh_versions[0];</div><div class='add'>+	return &amp;flseg-&gt;mirror_array[i]-&gt;dss[dss_id].fh_versions[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how)</div><div class='hunk'>@@ -1916,9 +2309,10 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how)</div><div class='ctx'> 	struct pnfs_layout_segment *lseg = data-&gt;lseg;</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> 	struct rpc_clnt *ds_clnt;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	const struct cred *ds_cred;</div><div class='del'>-	u32 idx;</div><div class='add'>+	u32 idx, dss_id;</div><div class='ctx'> 	int vers, ret;</div><div class='ctx'> 	struct nfs_fh *fh;</div><div class='ctx'> </div><div class='hunk'>@@ -1926,22 +2320,23 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how)</div><div class='ctx'> 	    test_bit(NFS_LSEG_LAYOUTRETURN, &amp;lseg-&gt;pls_flags)))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	idx = calc_ds_index_from_commit(lseg, data-&gt;ds_commit_index);</div><div class='add'>+	idx = calc_mirror_idx_from_commit(lseg, data-&gt;ds_commit_index);</div><div class='ctx'> 	mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='del'>-	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, true);</div><div class='del'>-	if (!ds)</div><div class='add'>+	dss_id = calc_dss_id_from_commit(lseg, data-&gt;ds_commit_index);</div><div class='add'>+	ds = nfs4_ff_layout_prepare_ds(lseg, mirror, dss_id, true);</div><div class='add'>+	if (IS_ERR(ds))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds-&gt;ds_clp,</div><div class='del'>-						   data-&gt;inode);</div><div class='add'>+						   data-&gt;inode, dss_id);</div><div class='ctx'> 	if (IS_ERR(ds_clnt))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	ds_cred = ff_layout_get_ds_cred(mirror, &amp;lseg-&gt;pls_range, data-&gt;cred);</div><div class='add'>+	ds_cred = ff_layout_get_ds_cred(mirror, &amp;lseg-&gt;pls_range, data-&gt;cred, dss_id);</div><div class='ctx'> 	if (!ds_cred)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	vers = nfs4_ff_layout_ds_version(mirror);</div><div class='add'>+	vers = nfs4_ff_layout_ds_version(mirror, dss_id);</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s ino %lu, how %d cl_count %d vers %d\n", __func__,</div><div class='ctx'> 		data-&gt;inode-&gt;i_ino, how, refcount_read(&amp;ds-&gt;ds_clp-&gt;cl_count),</div><div class='hunk'>@@ -1950,14 +2345,22 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how)</div><div class='ctx'> 	data-&gt;cred = ds_cred;</div><div class='ctx'> 	refcount_inc(&amp;ds-&gt;ds_clp-&gt;cl_count);</div><div class='ctx'> 	data-&gt;ds_clp = ds-&gt;ds_clp;</div><div class='del'>-	fh = select_ds_fh_from_commit(lseg, data-&gt;ds_commit_index);</div><div class='add'>+	fh = select_ds_fh_from_commit(lseg, idx, dss_id);</div><div class='ctx'> 	if (fh)</div><div class='ctx'> 		data-&gt;args.fh = fh;</div><div class='ctx'> </div><div class='add'>+	/* Start IO accounting for local commit */</div><div class='add'>+	localio = ff_local_open_fh(lseg, idx, dss_id, ds-&gt;ds_clp, ds_cred, fh,</div><div class='add'>+				   FMODE_READ|FMODE_WRITE);</div><div class='add'>+	if (localio) {</div><div class='add'>+		data-&gt;task.tk_start = ktime_get();</div><div class='add'>+		ff_layout_commit_record_layoutstats_start(&amp;data-&gt;task, data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = nfs_initiate_commit(ds_clnt, data, ds-&gt;ds_clp-&gt;rpc_ops,</div><div class='ctx'> 				   vers == 3 ? &amp;ff_layout_commit_call_ops_v3 :</div><div class='ctx'> 					       &amp;ff_layout_commit_call_ops_v4,</div><div class='del'>-				   how, RPC_TASK_SOFTCONN);</div><div class='add'>+				   how, RPC_TASK_SOFTCONN, localio);</div><div class='ctx'> 	put_cred(ds_cred);</div><div class='ctx'> 	return ret;</div><div class='ctx'> out_err:</div><div class='hunk'>@@ -2011,25 +2414,28 @@ static void ff_layout_cancel_io(struct pnfs_layout_segment *lseg)</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> 	struct nfs_client *ds_clp;</div><div class='ctx'> 	struct rpc_clnt *clnt;</div><div class='del'>-	u32 idx;</div><div class='add'>+	u32 idx, dss_id;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; flseg-&gt;mirror_array_cnt; idx++) {</div><div class='ctx'> 		mirror = flseg-&gt;mirror_array[idx];</div><div class='del'>-		mirror_ds = mirror-&gt;mirror_ds;</div><div class='del'>-		if (!mirror_ds)</div><div class='del'>-			continue;</div><div class='del'>-		ds = mirror-&gt;mirror_ds-&gt;ds;</div><div class='del'>-		if (!ds)</div><div class='del'>-			continue;</div><div class='del'>-		ds_clp = ds-&gt;ds_clp;</div><div class='del'>-		if (!ds_clp)</div><div class='del'>-			continue;</div><div class='del'>-		clnt = ds_clp-&gt;cl_rpcclient;</div><div class='del'>-		if (!clnt)</div><div class='del'>-			continue;</div><div class='del'>-		if (!rpc_cancel_tasks(clnt, -EAGAIN, ff_layout_match_io, lseg))</div><div class='del'>-			continue;</div><div class='del'>-		rpc_clnt_disconnect(clnt);</div><div class='add'>+		for (dss_id = 0; dss_id &lt; mirror-&gt;dss_count; dss_id++) {</div><div class='add'>+			mirror_ds = mirror-&gt;dss[dss_id].mirror_ds;</div><div class='add'>+			if (IS_ERR_OR_NULL(mirror_ds))</div><div class='add'>+				continue;</div><div class='add'>+			ds = mirror-&gt;dss[dss_id].mirror_ds-&gt;ds;</div><div class='add'>+			if (!ds)</div><div class='add'>+				continue;</div><div class='add'>+			ds_clp = ds-&gt;ds_clp;</div><div class='add'>+			if (!ds_clp)</div><div class='add'>+				continue;</div><div class='add'>+			clnt = ds_clp-&gt;cl_rpcclient;</div><div class='add'>+			if (!clnt)</div><div class='add'>+				continue;</div><div class='add'>+			if (!rpc_cancel_tasks(clnt, -EAGAIN,</div><div class='add'>+					      ff_layout_match_io, lseg))</div><div class='add'>+				continue;</div><div class='add'>+			rpc_clnt_disconnect(clnt);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2051,8 +2457,9 @@ ff_layout_setup_ds_info(struct pnfs_ds_commit_info *fl_cinfo,</div><div class='ctx'> 	struct nfs4_ff_layout_segment *flseg = FF_LAYOUT_LSEG(lseg);</div><div class='ctx'> 	struct inode *inode = lseg-&gt;pls_layout-&gt;plh_inode;</div><div class='ctx'> 	struct pnfs_commit_array *array, *new;</div><div class='add'>+	u32 size = flseg-&gt;mirror_array_cnt * flseg-&gt;mirror_array[0]-&gt;dss_count;</div><div class='ctx'> </div><div class='del'>-	new = pnfs_alloc_commit_array(flseg-&gt;mirror_array_cnt,</div><div class='add'>+	new = pnfs_alloc_commit_array(size,</div><div class='ctx'> 				      nfs_io_gfp_mask());</div><div class='ctx'> 	if (new) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -2095,12 +2502,6 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='ctx'> ff_layout_encode_ff_iostat_head(struct xdr_stream *xdr,</div><div class='ctx'> 			    const nfs4_stateid *stateid,</div><div class='ctx'> 			    const struct nfs42_layoutstat_devinfo *devinfo)</div><div class='hunk'>@@ -2422,11 +2823,11 @@ ff_layout_encode_io_latency(struct xdr_stream *xdr,</div><div class='ctx'> static void</div><div class='ctx'> ff_layout_encode_ff_layoutupdate(struct xdr_stream *xdr,</div><div class='ctx'> 			      const struct nfs42_layoutstat_devinfo *devinfo,</div><div class='del'>-			      struct nfs4_ff_layout_mirror *mirror)</div><div class='add'>+			      struct nfs4_ff_layout_ds_stripe *dss_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_pnfs_ds_addr *da;</div><div class='del'>-	struct nfs4_pnfs_ds *ds = mirror-&gt;mirror_ds-&gt;ds;</div><div class='del'>-	struct nfs_fh *fh = &amp;mirror-&gt;fh_versions[0];</div><div class='add'>+	struct nfs4_pnfs_ds *ds = dss_info-&gt;mirror_ds-&gt;ds;</div><div class='add'>+	struct nfs_fh *fh = &amp;dss_info-&gt;fh_versions[0];</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='ctx'> 	da = list_first_entry(&amp;ds-&gt;ds_addrs, struct nfs4_pnfs_ds_addr, da_node);</div><div class='hunk'>@@ -2438,13 +2839,17 @@ ff_layout_encode_ff_layoutupdate(struct xdr_stream *xdr,</div><div class='ctx'> 	p = xdr_reserve_space(xdr, 4 + fh-&gt;size);</div><div class='ctx'> 	xdr_encode_opaque(p, fh-&gt;data, fh-&gt;size);</div><div class='ctx'> 	/* ff_io_latency4 read */</div><div class='del'>-	spin_lock(&amp;mirror-&gt;lock);</div><div class='del'>-	ff_layout_encode_io_latency(xdr, &amp;mirror-&gt;read_stat.io_stat);</div><div class='add'>+	spin_lock(&amp;dss_info-&gt;mirror-&gt;lock);</div><div class='add'>+	ff_layout_encode_io_latency(xdr,</div><div class='add'>+				    &amp;dss_info-&gt;read_stat.io_stat);</div><div class='ctx'> 	/* ff_io_latency4 write */</div><div class='del'>-	ff_layout_encode_io_latency(xdr, &amp;mirror-&gt;write_stat.io_stat);</div><div class='del'>-	spin_unlock(&amp;mirror-&gt;lock);</div><div class='add'>+	ff_layout_encode_io_latency(xdr,</div><div class='add'>+				    &amp;dss_info-&gt;write_stat.io_stat);</div><div class='add'>+	spin_unlock(&amp;dss_info-&gt;mirror-&gt;lock);</div><div class='ctx'> 	/* nfstime4 */</div><div class='del'>-	ff_layout_encode_nfstime(xdr, ktime_sub(ktime_get(), mirror-&gt;start_time));</div><div class='add'>+	ff_layout_encode_nfstime(xdr,</div><div class='add'>+				 ktime_sub(ktime_get(),</div><div class='add'>+					   dss_info-&gt;start_time));</div><div class='ctx'> 	/* bool */</div><div class='ctx'> 	p = xdr_reserve_space(xdr, 4);</div><div class='ctx'> 	*p = cpu_to_be32(false);</div><div class='hunk'>@@ -2468,7 +2873,8 @@ ff_layout_encode_layoutstats(struct xdr_stream *xdr, const void *args,</div><div class='ctx'> static void</div><div class='ctx'> ff_layout_free_layoutstats(struct nfs4_xdr_opaque_data *opaque)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_ff_layout_mirror *mirror = opaque-&gt;data;</div><div class='add'>+	struct nfs4_ff_layout_ds_stripe *dss_info = opaque-&gt;data;</div><div class='add'>+	struct nfs4_ff_layout_mirror *mirror = dss_info-&gt;mirror;</div><div class='ctx'> </div><div class='ctx'> 	ff_layout_put_mirror(mirror);</div><div class='ctx'> }</div><div class='hunk'>@@ -2485,37 +2891,47 @@ ff_layout_mirror_prepare_stats(struct pnfs_layout_hdr *lo,</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_flexfile_layout *ff_layout = FF_LAYOUT_FROM_HDR(lo);</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='add'>+	struct nfs4_ff_layout_ds_stripe *dss_info;</div><div class='ctx'> 	struct nfs4_deviceid_node *dev;</div><div class='del'>-	int i = 0;</div><div class='add'>+	int i = 0, dss_id;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(mirror, &amp;ff_layout-&gt;mirrors, mirrors) {</div><div class='del'>-		if (i &gt;= dev_limit)</div><div class='del'>-			break;</div><div class='del'>-		if (IS_ERR_OR_NULL(mirror-&gt;mirror_ds))</div><div class='del'>-			continue;</div><div class='del'>-		if (!test_and_clear_bit(NFS4_FF_MIRROR_STAT_AVAIL,</div><div class='del'>-					&amp;mirror-&gt;flags) &amp;&amp;</div><div class='del'>-		    type != NFS4_FF_OP_LAYOUTRETURN)</div><div class='del'>-			continue;</div><div class='del'>-		/* mirror refcount put in cleanup_layoutstats */</div><div class='del'>-		if (!refcount_inc_not_zero(&amp;mirror-&gt;ref))</div><div class='del'>-			continue;</div><div class='del'>-		dev = &amp;mirror-&gt;mirror_ds-&gt;id_node; </div><div class='del'>-		memcpy(&amp;devinfo-&gt;dev_id, &amp;dev-&gt;deviceid, NFS4_DEVICEID4_SIZE);</div><div class='del'>-		devinfo-&gt;offset = 0;</div><div class='del'>-		devinfo-&gt;length = NFS4_MAX_UINT64;</div><div class='del'>-		spin_lock(&amp;mirror-&gt;lock);</div><div class='del'>-		devinfo-&gt;read_count = mirror-&gt;read_stat.io_stat.ops_completed;</div><div class='del'>-		devinfo-&gt;read_bytes = mirror-&gt;read_stat.io_stat.bytes_completed;</div><div class='del'>-		devinfo-&gt;write_count = mirror-&gt;write_stat.io_stat.ops_completed;</div><div class='del'>-		devinfo-&gt;write_bytes = mirror-&gt;write_stat.io_stat.bytes_completed;</div><div class='del'>-		spin_unlock(&amp;mirror-&gt;lock);</div><div class='del'>-		devinfo-&gt;layout_type = LAYOUT_FLEX_FILES;</div><div class='del'>-		devinfo-&gt;ld_private.ops = &amp;layoutstat_ops;</div><div class='del'>-		devinfo-&gt;ld_private.data = mirror;</div><div class='del'>-</div><div class='del'>-		devinfo++;</div><div class='del'>-		i++;</div><div class='add'>+		for (dss_id = 0; dss_id &lt; mirror-&gt;dss_count; ++dss_id) {</div><div class='add'>+			dss_info = &amp;mirror-&gt;dss[dss_id];</div><div class='add'>+			if (i &gt;= dev_limit)</div><div class='add'>+				break;</div><div class='add'>+			if (IS_ERR_OR_NULL(dss_info-&gt;mirror_ds))</div><div class='add'>+				continue;</div><div class='add'>+			if (!test_and_clear_bit(NFS4_FF_MIRROR_STAT_AVAIL,</div><div class='add'>+						&amp;mirror-&gt;flags) &amp;&amp;</div><div class='add'>+			    type != NFS4_FF_OP_LAYOUTRETURN)</div><div class='add'>+				continue;</div><div class='add'>+			/* mirror refcount put in cleanup_layoutstats */</div><div class='add'>+			if (!refcount_inc_not_zero(&amp;mirror-&gt;ref))</div><div class='add'>+				continue;</div><div class='add'>+			dev = &amp;dss_info-&gt;mirror_ds-&gt;id_node;</div><div class='add'>+			memcpy(&amp;devinfo-&gt;dev_id,</div><div class='add'>+			       &amp;dev-&gt;deviceid,</div><div class='add'>+			       NFS4_DEVICEID4_SIZE);</div><div class='add'>+			devinfo-&gt;offset = 0;</div><div class='add'>+			devinfo-&gt;length = NFS4_MAX_UINT64;</div><div class='add'>+			spin_lock(&amp;mirror-&gt;lock);</div><div class='add'>+			devinfo-&gt;read_count =</div><div class='add'>+			    dss_info-&gt;read_stat.io_stat.ops_completed;</div><div class='add'>+			devinfo-&gt;read_bytes =</div><div class='add'>+			    dss_info-&gt;read_stat.io_stat.bytes_completed;</div><div class='add'>+			devinfo-&gt;write_count =</div><div class='add'>+			    dss_info-&gt;write_stat.io_stat.ops_completed;</div><div class='add'>+			devinfo-&gt;write_bytes =</div><div class='add'>+			    dss_info-&gt;write_stat.io_stat.bytes_completed;</div><div class='add'>+			spin_unlock(&amp;mirror-&gt;lock);</div><div class='add'>+			devinfo-&gt;layout_type = LAYOUT_FLEX_FILES;</div><div class='add'>+			devinfo-&gt;ld_private.ops = &amp;layoutstat_ops;</div><div class='add'>+			devinfo-&gt;ld_private.data = &amp;mirror-&gt;dss[dss_id];</div><div class='add'>+</div><div class='add'>+			devinfo++;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='hunk'>@@ -2556,7 +2972,7 @@ ff_layout_set_layoutdriver(struct nfs_server *server,</div><div class='ctx'> 		const struct nfs_fh *dummy)</div><div class='ctx'> {</div><div class='ctx'> #if IS_ENABLED(CONFIG_NFS_V4_2)</div><div class='del'>-	server-&gt;caps |= NFS_CAP_LAYOUTSTATS;</div><div class='add'>+	server-&gt;caps |= NFS_CAP_LAYOUTSTATS | NFS_CAP_REBOOT_LAYOUTRETURN;</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfs/flexfilelayout/flexfilelayout.h b/fs/nfs/flexfilelayout/flexfilelayout.h<br/>index f84b3fb0dddd..17a008c8e97c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/flexfilelayout/flexfilelayout.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/flexfilelayout/flexfilelayout.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/flexfilelayout/flexfilelayout.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/flexfilelayout/flexfilelayout.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'>  * due to network error etc. */</div><div class='ctx'> #define NFS4_FLEXFILE_LAYOUT_MAX_MIRROR_CNT 4096</div><div class='ctx'> </div><div class='add'>+#define NFS4_FLEXFILE_LAYOUT_MAX_STRIPE_CNT 4096</div><div class='add'>+</div><div class='ctx'> /* LAYOUTSTATS report interval in ms */</div><div class='ctx'> #define FF_LAYOUTSTATS_REPORT_INTERVAL (60000L)</div><div class='ctx'> #define FF_LAYOUTSTATS_MAXDEV 4</div><div class='hunk'>@@ -71,24 +73,32 @@ struct nfs4_ff_layoutstat {</div><div class='ctx'> 	struct nfs4_ff_busy_timer busy_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct nfs4_ff_layout_mirror {</div><div class='del'>-	struct pnfs_layout_hdr		*layout;</div><div class='del'>-	struct list_head		mirrors;</div><div class='del'>-	u32				ds_count;</div><div class='del'>-	u32				efficiency;</div><div class='add'>+struct nfs4_ff_layout_mirror;</div><div class='add'>+</div><div class='add'>+struct nfs4_ff_layout_ds_stripe {</div><div class='add'>+	struct nfs4_ff_layout_mirror   *mirror;</div><div class='ctx'> 	struct nfs4_deviceid		devid;</div><div class='add'>+	u32				efficiency;</div><div class='ctx'> 	struct nfs4_ff_layout_ds	*mirror_ds;</div><div class='ctx'> 	u32				fh_versions_cnt;</div><div class='ctx'> 	struct nfs_fh			*fh_versions;</div><div class='ctx'> 	nfs4_stateid			stateid;</div><div class='ctx'> 	const struct cred __rcu		*ro_cred;</div><div class='ctx'> 	const struct cred __rcu		*rw_cred;</div><div class='del'>-	refcount_t			ref;</div><div class='del'>-	spinlock_t			lock;</div><div class='del'>-	unsigned long			flags;</div><div class='add'>+	struct nfs_file_localio		nfl;</div><div class='ctx'> 	struct nfs4_ff_layoutstat	read_stat;</div><div class='ctx'> 	struct nfs4_ff_layoutstat	write_stat;</div><div class='ctx'> 	ktime_t				start_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nfs4_ff_layout_mirror {</div><div class='add'>+	struct pnfs_layout_hdr		*layout;</div><div class='add'>+	struct list_head		mirrors;</div><div class='add'>+	u32				dss_count;</div><div class='add'>+	struct nfs4_ff_layout_ds_stripe *dss;</div><div class='add'>+	refcount_t			ref;</div><div class='add'>+	spinlock_t			lock;</div><div class='add'>+	unsigned long			flags;</div><div class='ctx'> 	u32				report_interval;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -149,12 +159,12 @@ FF_LAYOUT_COMP(struct pnfs_layout_segment *lseg, u32 idx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct nfs4_deviceid_node *</div><div class='del'>-FF_LAYOUT_DEVID_NODE(struct pnfs_layout_segment *lseg, u32 idx)</div><div class='add'>+FF_LAYOUT_DEVID_NODE(struct pnfs_layout_segment *lseg, u32 idx, u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='ctx'> </div><div class='ctx'> 	if (mirror != NULL) {</div><div class='del'>-		struct nfs4_ff_layout_ds *mirror_ds = mirror-&gt;mirror_ds;</div><div class='add'>+		struct nfs4_ff_layout_ds *mirror_ds = mirror-&gt;dss[dss_id].mirror_ds;</div><div class='ctx'> </div><div class='ctx'> 		if (!IS_ERR_OR_NULL(mirror_ds))</div><div class='ctx'> 			return &amp;mirror_ds-&gt;id_node;</div><div class='hunk'>@@ -181,9 +191,22 @@ ff_layout_no_read_on_rw(struct pnfs_layout_segment *lseg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-nfs4_ff_layout_ds_version(const struct nfs4_ff_layout_mirror *mirror)</div><div class='add'>+nfs4_ff_layout_ds_version(const struct nfs4_ff_layout_mirror *mirror, u32 dss_id)</div><div class='add'>+{</div><div class='add'>+	return mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].version;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+nfs4_ff_layout_calc_dss_id(const u64 stripe_unit, const u32 dss_count, const loff_t offset)</div><div class='ctx'> {</div><div class='del'>-	return mirror-&gt;mirror_ds-&gt;ds_versions[0].version;</div><div class='add'>+	u64 tmp = offset;</div><div class='add'>+</div><div class='add'>+	if (dss_count == 1 || stripe_unit == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	do_div(tmp, stripe_unit);</div><div class='add'>+</div><div class='add'>+	return do_div(tmp, dss_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nfs4_ff_layout_ds *</div><div class='hunk'>@@ -192,9 +215,9 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> void nfs4_ff_layout_put_deviceid(struct nfs4_ff_layout_ds *mirror_ds);</div><div class='ctx'> void nfs4_ff_layout_free_deviceid(struct nfs4_ff_layout_ds *mirror_ds);</div><div class='ctx'> int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo,</div><div class='del'>-			     struct nfs4_ff_layout_mirror *mirror, u64 offset,</div><div class='del'>-			     u64 length, int status, enum nfs_opnum4 opnum,</div><div class='del'>-			     gfp_t gfp_flags);</div><div class='add'>+			     struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+			     u32 dss_id, u64 offset, u64 length, int status,</div><div class='add'>+			     enum nfs_opnum4 opnum, gfp_t gfp_flags);</div><div class='ctx'> void ff_layout_send_layouterror(struct pnfs_layout_segment *lseg);</div><div class='ctx'> int ff_layout_encode_ds_ioerr(struct xdr_stream *xdr, const struct list_head *head);</div><div class='ctx'> void ff_layout_free_ds_ioerr(struct list_head *head);</div><div class='hunk'>@@ -203,23 +226,27 @@ unsigned int ff_layout_fetch_ds_ioerr(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		struct list_head *head,</div><div class='ctx'> 		unsigned int maxnum);</div><div class='ctx'> struct nfs_fh *</div><div class='del'>-nfs4_ff_layout_select_ds_fh(struct nfs4_ff_layout_mirror *mirror);</div><div class='add'>+nfs4_ff_layout_select_ds_fh(struct nfs4_ff_layout_mirror *mirror, u32 dss_id);</div><div class='ctx'> void</div><div class='ctx'> nfs4_ff_layout_select_ds_stateid(const struct nfs4_ff_layout_mirror *mirror,</div><div class='del'>-		nfs4_stateid *stateid);</div><div class='add'>+				 u32 dss_id,</div><div class='add'>+				 nfs4_stateid *stateid);</div><div class='ctx'> </div><div class='ctx'> struct nfs4_pnfs_ds *</div><div class='ctx'> nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 			  struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+			  u32 dss_id,</div><div class='ctx'> 			  bool fail_return);</div><div class='ctx'> </div><div class='ctx'> struct rpc_clnt *</div><div class='ctx'> nfs4_ff_find_or_create_ds_client(struct nfs4_ff_layout_mirror *mirror,</div><div class='ctx'> 				 struct nfs_client *ds_clp,</div><div class='del'>-				 struct inode *inode);</div><div class='add'>+				 struct inode *inode,</div><div class='add'>+				 u32 dss_id);</div><div class='ctx'> const struct cred *ff_layout_get_ds_cred(struct nfs4_ff_layout_mirror *mirror,</div><div class='ctx'> 					 const struct pnfs_layout_range *range,</div><div class='del'>-					 const struct cred *mdscred);</div><div class='add'>+					 const struct cred *mdscred,</div><div class='add'>+					 u32 dss_id);</div><div class='ctx'> bool ff_layout_avoid_mds_available_ds(struct pnfs_layout_segment *lseg);</div><div class='ctx'> bool ff_layout_avoid_read_on_rw(struct pnfs_layout_segment *lseg);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c<br/>index e028f5a0ef5f..c55ea8fa3bfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/flexfilelayout/flexfilelayoutdev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/flexfilelayout/flexfilelayoutdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/flexfilelayout/flexfilelayoutdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/flexfilelayout/flexfilelayoutdev.c</a></div><div class='hunk'>@@ -44,18 +44,19 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct xdr_stream stream;</div><div class='ctx'> 	struct xdr_buf buf;</div><div class='del'>-	struct page *scratch;</div><div class='add'>+	struct folio *scratch;</div><div class='ctx'> 	struct list_head dsaddrs;</div><div class='ctx'> 	struct nfs4_pnfs_ds_addr *da;</div><div class='ctx'> 	struct nfs4_ff_layout_ds *new_ds = NULL;</div><div class='ctx'> 	struct nfs4_ff_ds_version *ds_versions = NULL;</div><div class='add'>+	struct net *net = server-&gt;nfs_client-&gt;cl_net;</div><div class='ctx'> 	u32 mp_count;</div><div class='ctx'> 	u32 version_count;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	int i, ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* set up xdr stream */</div><div class='del'>-	scratch = alloc_page(gfp_flags);</div><div class='add'>+	scratch = folio_alloc(gfp_flags, 0);</div><div class='ctx'> 	if (!scratch)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +70,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dsaddrs);</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode_pages(&amp;stream, &amp;buf, pdev-&gt;pages, pdev-&gt;pglen);</div><div class='del'>-	xdr_set_scratch_page(&amp;stream, scratch);</div><div class='add'>+	xdr_set_scratch_folio(&amp;stream, scratch);</div><div class='ctx'> </div><div class='ctx'> 	/* multipath count */</div><div class='ctx'> 	p = xdr_inline_decode(&amp;stream, 4);</div><div class='hunk'>@@ -80,8 +81,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mp_count; i++) {</div><div class='ctx'> 		/* multipath ds */</div><div class='del'>-		da = nfs4_decode_mp_ds_addr(server-&gt;nfs_client-&gt;cl_net,</div><div class='del'>-					    &amp;stream, gfp_flags);</div><div class='add'>+		da = nfs4_decode_mp_ds_addr(net, &amp;stream, gfp_flags);</div><div class='ctx'> 		if (da)</div><div class='ctx'> 			list_add_tail(&amp;da-&gt;da_node, &amp;dsaddrs);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -149,7 +149,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 	new_ds-&gt;ds_versions = ds_versions;</div><div class='ctx'> 	new_ds-&gt;ds_versions_cnt = version_count;</div><div class='ctx'> </div><div class='del'>-	new_ds-&gt;ds = nfs4_pnfs_ds_add(&amp;dsaddrs, gfp_flags);</div><div class='add'>+	new_ds-&gt;ds = nfs4_pnfs_ds_add(net, &amp;dsaddrs, gfp_flags);</div><div class='ctx'> 	if (!new_ds-&gt;ds)</div><div class='ctx'> 		goto out_err_drain_dsaddrs;</div><div class='ctx'> </div><div class='hunk'>@@ -163,7 +163,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,</div><div class='ctx'> 		kfree(da);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> 	return new_ds;</div><div class='ctx'> </div><div class='ctx'> out_err_drain_dsaddrs:</div><div class='hunk'>@@ -177,7 +177,7 @@ out_err_drain_dsaddrs:</div><div class='ctx'> </div><div class='ctx'> 	kfree(ds_versions);</div><div class='ctx'> out_scratch:</div><div class='del'>-	__free_page(scratch);</div><div class='add'>+	folio_put(scratch);</div><div class='ctx'> out_err:</div><div class='ctx'> 	kfree(new_ds);</div><div class='ctx'> </div><div class='hunk'>@@ -250,16 +250,16 @@ ff_layout_add_ds_error_locked(struct nfs4_flexfile_layout *flo,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo,</div><div class='del'>-			     struct nfs4_ff_layout_mirror *mirror, u64 offset,</div><div class='del'>-			     u64 length, int status, enum nfs_opnum4 opnum,</div><div class='del'>-			     gfp_t gfp_flags)</div><div class='add'>+			     struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+			     u32 dss_id, u64 offset, u64 length, int status,</div><div class='add'>+			     enum nfs_opnum4 opnum, gfp_t gfp_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_ds_err *dserr;</div><div class='ctx'> </div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_OR_NULL(mirror-&gt;mirror_ds))</div><div class='add'>+	if (IS_ERR_OR_NULL(mirror-&gt;dss[dss_id].mirror_ds))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dserr = kmalloc(sizeof(*dserr), gfp_flags);</div><div class='hunk'>@@ -271,8 +271,8 @@ int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo,</div><div class='ctx'> 	dserr-&gt;length = length;</div><div class='ctx'> 	dserr-&gt;status = status;</div><div class='ctx'> 	dserr-&gt;opnum = opnum;</div><div class='del'>-	nfs4_stateid_copy(&amp;dserr-&gt;stateid, &amp;mirror-&gt;stateid);</div><div class='del'>-	memcpy(&amp;dserr-&gt;deviceid, &amp;mirror-&gt;mirror_ds-&gt;id_node.deviceid,</div><div class='add'>+	nfs4_stateid_copy(&amp;dserr-&gt;stateid, &amp;mirror-&gt;dss[dss_id].stateid);</div><div class='add'>+	memcpy(&amp;dserr-&gt;deviceid, &amp;mirror-&gt;dss[dss_id].mirror_ds-&gt;id_node.deviceid,</div><div class='ctx'> 	       NFS4_DEVICEID4_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;flo-&gt;generic_hdr.plh_inode-&gt;i_lock);</div><div class='hunk'>@@ -282,14 +282,14 @@ int ff_layout_track_ds_error(struct nfs4_flexfile_layout *flo,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct cred *</div><div class='del'>-ff_layout_get_mirror_cred(struct nfs4_ff_layout_mirror *mirror, u32 iomode)</div><div class='add'>+ff_layout_get_mirror_cred(struct nfs4_ff_layout_mirror *mirror, u32 iomode, u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cred *cred, __rcu **pcred;</div><div class='ctx'> </div><div class='ctx'> 	if (iomode == IOMODE_READ)</div><div class='del'>-		pcred = &amp;mirror-&gt;ro_cred;</div><div class='add'>+		pcred = &amp;mirror-&gt;dss[dss_id].ro_cred;</div><div class='ctx'> 	else</div><div class='del'>-		pcred = &amp;mirror-&gt;rw_cred;</div><div class='add'>+		pcred = &amp;mirror-&gt;dss[dss_id].rw_cred;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -304,43 +304,45 @@ ff_layout_get_mirror_cred(struct nfs4_ff_layout_mirror *mirror, u32 iomode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nfs_fh *</div><div class='del'>-nfs4_ff_layout_select_ds_fh(struct nfs4_ff_layout_mirror *mirror)</div><div class='add'>+nfs4_ff_layout_select_ds_fh(struct nfs4_ff_layout_mirror *mirror, u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME: For now assume there is only 1 version available for the DS */</div><div class='del'>-	return &amp;mirror-&gt;fh_versions[0];</div><div class='add'>+	return &amp;mirror-&gt;dss[dss_id].fh_versions[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> nfs4_ff_layout_select_ds_stateid(const struct nfs4_ff_layout_mirror *mirror,</div><div class='del'>-		nfs4_stateid *stateid)</div><div class='add'>+				 u32 dss_id,</div><div class='add'>+				 nfs4_stateid *stateid)</div><div class='ctx'> {</div><div class='del'>-	if (nfs4_ff_layout_ds_version(mirror) == 4)</div><div class='del'>-		nfs4_stateid_copy(stateid, &amp;mirror-&gt;stateid);</div><div class='add'>+	if (nfs4_ff_layout_ds_version(mirror, dss_id) == 4)</div><div class='add'>+		nfs4_stateid_copy(stateid, &amp;mirror-&gt;dss[dss_id].stateid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='ctx'> ff_layout_init_mirror_ds(struct pnfs_layout_hdr *lo,</div><div class='del'>-			 struct nfs4_ff_layout_mirror *mirror)</div><div class='add'>+			 struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+			 u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	if (mirror == NULL)</div><div class='ctx'> 		goto outerr;</div><div class='del'>-	if (mirror-&gt;mirror_ds == NULL) {</div><div class='add'>+	if (mirror-&gt;dss[dss_id].mirror_ds == NULL) {</div><div class='ctx'> 		struct nfs4_deviceid_node *node;</div><div class='ctx'> 		struct nfs4_ff_layout_ds *mirror_ds = ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='ctx'> 		node = nfs4_find_get_deviceid(NFS_SERVER(lo-&gt;plh_inode),</div><div class='del'>-				&amp;mirror-&gt;devid, lo-&gt;plh_lc_cred,</div><div class='add'>+				&amp;mirror-&gt;dss[dss_id].devid, lo-&gt;plh_lc_cred,</div><div class='ctx'> 				GFP_KERNEL);</div><div class='ctx'> 		if (node)</div><div class='ctx'> 			mirror_ds = FF_LAYOUT_MIRROR_DS(node);</div><div class='ctx'> </div><div class='ctx'> 		/* check for race with another call to this function */</div><div class='del'>-		if (cmpxchg(&amp;mirror-&gt;mirror_ds, NULL, mirror_ds) &amp;&amp;</div><div class='add'>+		if (cmpxchg(&amp;mirror-&gt;dss[dss_id].mirror_ds, NULL, mirror_ds) &amp;&amp;</div><div class='ctx'> 		    mirror_ds != ERR_PTR(-ENODEV))</div><div class='ctx'> 			nfs4_put_deviceid_node(node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(mirror-&gt;mirror_ds))</div><div class='add'>+	if (IS_ERR(mirror-&gt;dss[dss_id].mirror_ds))</div><div class='ctx'> 		goto outerr;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -352,6 +354,7 @@ outerr:</div><div class='ctx'>  * nfs4_ff_layout_prepare_ds - prepare a DS connection for an RPC call</div><div class='ctx'>  * @lseg: the layout segment we're operating on</div><div class='ctx'>  * @mirror: layout mirror describing the DS to use</div><div class='add'>+ * @dss_id: DS stripe id to select stripe to use</div><div class='ctx'>  * @fail_return: return layout on connect failure?</div><div class='ctx'>  *</div><div class='ctx'>  * Try to prepare a DS connection to accept an RPC call. This involves</div><div class='hunk'>@@ -368,18 +371,19 @@ outerr:</div><div class='ctx'> struct nfs4_pnfs_ds *</div><div class='ctx'> nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 			  struct nfs4_ff_layout_mirror *mirror,</div><div class='add'>+			  u32 dss_id,</div><div class='ctx'> 			  bool fail_return)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_pnfs_ds *ds = NULL;</div><div class='add'>+	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> 	struct inode *ino = lseg-&gt;pls_layout-&gt;plh_inode;</div><div class='ctx'> 	struct nfs_server *s = NFS_SERVER(ino);</div><div class='ctx'> 	unsigned int max_payload;</div><div class='del'>-	int status;</div><div class='add'>+	int status = -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	if (!ff_layout_init_mirror_ds(lseg-&gt;pls_layout, mirror))</div><div class='add'>+	if (!ff_layout_init_mirror_ds(lseg-&gt;pls_layout, mirror, dss_id))</div><div class='ctx'> 		goto noconnect;</div><div class='ctx'> </div><div class='del'>-	ds = mirror-&gt;mirror_ds-&gt;ds;</div><div class='add'>+	ds = mirror-&gt;dss[dss_id].mirror_ds-&gt;ds;</div><div class='ctx'> 	if (READ_ONCE(ds-&gt;ds_clp))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* matching smp_wmb() in _nfs4_pnfs_v3/4_ds_connect */</div><div class='hunk'>@@ -388,31 +392,37 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 	/* FIXME: For now we assume the server sent only one version of NFS</div><div class='ctx'> 	 * to use for the DS.</div><div class='ctx'> 	 */</div><div class='del'>-	status = nfs4_pnfs_ds_connect(s, ds, &amp;mirror-&gt;mirror_ds-&gt;id_node,</div><div class='add'>+	status = nfs4_pnfs_ds_connect(s, ds, &amp;mirror-&gt;dss[dss_id].mirror_ds-&gt;id_node,</div><div class='ctx'> 			     dataserver_timeo, dataserver_retrans,</div><div class='del'>-			     mirror-&gt;mirror_ds-&gt;ds_versions[0].version,</div><div class='del'>-			     mirror-&gt;mirror_ds-&gt;ds_versions[0].minor_version);</div><div class='add'>+			     mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].version,</div><div class='add'>+			     mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].minor_version);</div><div class='ctx'> </div><div class='ctx'> 	/* connect success, check rsize/wsize limit */</div><div class='ctx'> 	if (!status) {</div><div class='add'>+		/*</div><div class='add'>+		 * ds_clp is put in destroy_ds().</div><div class='add'>+		 * keep ds_clp even if DS is local, so that if local IO cannot</div><div class='add'>+		 * proceed somehow, we can fall back to NFS whenever we want.</div><div class='add'>+		 */</div><div class='add'>+		nfs_local_probe_async(ds-&gt;ds_clp);</div><div class='ctx'> 		max_payload =</div><div class='ctx'> 			nfs_block_size(rpc_max_payload(ds-&gt;ds_clp-&gt;cl_rpcclient),</div><div class='ctx'> 				       NULL);</div><div class='del'>-		if (mirror-&gt;mirror_ds-&gt;ds_versions[0].rsize &gt; max_payload)</div><div class='del'>-			mirror-&gt;mirror_ds-&gt;ds_versions[0].rsize = max_payload;</div><div class='del'>-		if (mirror-&gt;mirror_ds-&gt;ds_versions[0].wsize &gt; max_payload)</div><div class='del'>-			mirror-&gt;mirror_ds-&gt;ds_versions[0].wsize = max_payload;</div><div class='add'>+		if (mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].rsize &gt; max_payload)</div><div class='add'>+			mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].rsize = max_payload;</div><div class='add'>+		if (mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].wsize &gt; max_payload)</div><div class='add'>+			mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].wsize = max_payload;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> noconnect:</div><div class='ctx'> 	ff_layout_track_ds_error(FF_LAYOUT_FROM_HDR(lseg-&gt;pls_layout),</div><div class='del'>-				 mirror, lseg-&gt;pls_range.offset,</div><div class='add'>+				 mirror, dss_id, lseg-&gt;pls_range.offset,</div><div class='ctx'> 				 lseg-&gt;pls_range.length, NFS4ERR_NXIO,</div><div class='ctx'> 				 OP_ILLEGAL, GFP_NOIO);</div><div class='ctx'> 	ff_layout_send_layouterror(lseg);</div><div class='ctx'> 	if (fail_return || !ff_layout_has_available_ds(lseg))</div><div class='ctx'> 		pnfs_error_mark_layout_for_return(ino, lseg);</div><div class='del'>-	ds = NULL;</div><div class='add'>+	ds = ERR_PTR(status);</div><div class='ctx'> out:</div><div class='ctx'> 	return ds;</div><div class='ctx'> }</div><div class='hunk'>@@ -420,12 +430,13 @@ out:</div><div class='ctx'> const struct cred *</div><div class='ctx'> ff_layout_get_ds_cred(struct nfs4_ff_layout_mirror *mirror,</div><div class='ctx'> 		      const struct pnfs_layout_range *range,</div><div class='del'>-		      const struct cred *mdscred)</div><div class='add'>+		      const struct cred *mdscred,</div><div class='add'>+		      u32 dss_id)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cred *cred;</div><div class='ctx'> </div><div class='del'>-	if (mirror &amp;&amp; !mirror-&gt;mirror_ds-&gt;ds_versions[0].tightly_coupled) {</div><div class='del'>-		cred = ff_layout_get_mirror_cred(mirror, range-&gt;iomode);</div><div class='add'>+	if (mirror &amp;&amp; !mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].tightly_coupled) {</div><div class='add'>+		cred = ff_layout_get_mirror_cred(mirror, range-&gt;iomode, dss_id);</div><div class='ctx'> 		if (!cred)</div><div class='ctx'> 			cred = get_cred(mdscred);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -439,15 +450,17 @@ ff_layout_get_ds_cred(struct nfs4_ff_layout_mirror *mirror,</div><div class='ctx'>  * @mirror: pointer to the mirror</div><div class='ctx'>  * @ds_clp: nfs_client for the DS</div><div class='ctx'>  * @inode: pointer to inode</div><div class='add'>+ * @dss_id: DS stripe id</div><div class='ctx'>  *</div><div class='ctx'>  * Find or create a DS rpc client with th MDS server rpc client auth flavor</div><div class='ctx'>  * in the nfs_client cl_ds_clients list.</div><div class='ctx'>  */</div><div class='ctx'> struct rpc_clnt *</div><div class='ctx'> nfs4_ff_find_or_create_ds_client(struct nfs4_ff_layout_mirror *mirror,</div><div class='del'>-				 struct nfs_client *ds_clp, struct inode *inode)</div><div class='add'>+				 struct nfs_client *ds_clp, struct inode *inode,</div><div class='add'>+				 u32 dss_id)</div><div class='ctx'> {</div><div class='del'>-	switch (mirror-&gt;mirror_ds-&gt;ds_versions[0].version) {</div><div class='add'>+	switch (mirror-&gt;dss[dss_id].mirror_ds-&gt;ds_versions[0].version) {</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		/* For NFSv3 DS, flavor is set when creating DS connections */</div><div class='ctx'> 		return ds_clp-&gt;cl_rpcclient;</div><div class='hunk'>@@ -553,16 +566,18 @@ static bool ff_read_layout_has_available_ds(struct pnfs_layout_segment *lseg)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	struct nfs4_deviceid_node *devid;</div><div class='del'>-	u32 idx;</div><div class='add'>+	u32 idx, dss_id;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; FF_LAYOUT_MIRROR_COUNT(lseg); idx++) {</div><div class='ctx'> 		mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='del'>-		if (mirror) {</div><div class='del'>-			if (!mirror-&gt;mirror_ds)</div><div class='add'>+		if (!mirror)</div><div class='add'>+			continue;</div><div class='add'>+		for (dss_id = 0; dss_id &lt; mirror-&gt;dss_count; dss_id++) {</div><div class='add'>+			if (!mirror-&gt;dss[dss_id].mirror_ds)</div><div class='ctx'> 				return true;</div><div class='del'>-			if (IS_ERR(mirror-&gt;mirror_ds))</div><div class='add'>+			if (IS_ERR(mirror-&gt;dss[dss_id].mirror_ds))</div><div class='ctx'> 				continue;</div><div class='del'>-			devid = &amp;mirror-&gt;mirror_ds-&gt;id_node;</div><div class='add'>+			devid = &amp;mirror-&gt;dss[dss_id].mirror_ds-&gt;id_node;</div><div class='ctx'> 			if (!nfs4_test_deviceid_unavailable(devid))</div><div class='ctx'> 				return true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -575,17 +590,21 @@ static bool ff_rw_layout_has_available_ds(struct pnfs_layout_segment *lseg)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ff_layout_mirror *mirror;</div><div class='ctx'> 	struct nfs4_deviceid_node *devid;</div><div class='del'>-	u32 idx;</div><div class='add'>+	u32 idx, dss_id;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; FF_LAYOUT_MIRROR_COUNT(lseg); idx++) {</div><div class='ctx'> 		mirror = FF_LAYOUT_COMP(lseg, idx);</div><div class='del'>-		if (!mirror || IS_ERR(mirror-&gt;mirror_ds))</div><div class='del'>-			return false;</div><div class='del'>-		if (!mirror-&gt;mirror_ds)</div><div class='del'>-			continue;</div><div class='del'>-		devid = &amp;mirror-&gt;mirror_ds-&gt;id_node;</div><div class='del'>-		if (nfs4_test_deviceid_unavailable(devid))</div><div class='add'>+		if (!mirror)</div><div class='ctx'> 			return false;</div><div class='add'>+		for (dss_id = 0; dss_id &lt; mirror-&gt;dss_count; dss_id++) {</div><div class='add'>+			if (IS_ERR(mirror-&gt;dss[dss_id].mirror_ds))</div><div class='add'>+				return false;</div><div class='add'>+			if (!mirror-&gt;dss[dss_id].mirror_ds)</div><div class='add'>+				continue;</div><div class='add'>+			devid = &amp;mirror-&gt;dss[dss_id].mirror_ds-&gt;id_node;</div><div class='add'>+			if (nfs4_test_deviceid_unavailable(devid))</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return FF_LAYOUT_MIRROR_COUNT(lseg) != 0;</div><div class='head'>diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c<br/>index 853e8d609bb3..b4679b7161b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/fs_context.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/fs_context.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/fs_context.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/fs_context.c</a></div><div class='hunk'>@@ -49,6 +49,8 @@ enum nfs_param {</div><div class='ctx'> 	Opt_bsize,</div><div class='ctx'> 	Opt_clientaddr,</div><div class='ctx'> 	Opt_cto,</div><div class='add'>+	Opt_alignwrite,</div><div class='add'>+	Opt_fatal_neterrors,</div><div class='ctx'> 	Opt_fg,</div><div class='ctx'> 	Opt_fscache,</div><div class='ctx'> 	Opt_fscache_flag,</div><div class='hunk'>@@ -71,6 +73,8 @@ enum nfs_param {</div><div class='ctx'> 	Opt_posix,</div><div class='ctx'> 	Opt_proto,</div><div class='ctx'> 	Opt_rdirplus,</div><div class='add'>+	Opt_rdirplus_none,</div><div class='add'>+	Opt_rdirplus_force,</div><div class='ctx'> 	Opt_rdma,</div><div class='ctx'> 	Opt_resvport,</div><div class='ctx'> 	Opt_retrans,</div><div class='hunk'>@@ -92,6 +96,22 @@ enum nfs_param {</div><div class='ctx'> 	Opt_wsize,</div><div class='ctx'> 	Opt_write,</div><div class='ctx'> 	Opt_xprtsec,</div><div class='add'>+	Opt_cert_serial,</div><div class='add'>+	Opt_privkey_serial,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	Opt_fatal_neterrors_default,</div><div class='add'>+	Opt_fatal_neterrors_enetunreach,</div><div class='add'>+	Opt_fatal_neterrors_none,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table nfs_param_enums_fatal_neterrors[] = {</div><div class='add'>+	{ "default",			Opt_fatal_neterrors_default },</div><div class='add'>+	{ "ENETDOWN:ENETUNREACH",	Opt_fatal_neterrors_enetunreach },</div><div class='add'>+	{ "ENETUNREACH:ENETDOWN",	Opt_fatal_neterrors_enetunreach },</div><div class='add'>+	{ "none",			Opt_fatal_neterrors_none },</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -149,6 +169,9 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {</div><div class='ctx'> 	fsparam_u32   ("bsize",		Opt_bsize),</div><div class='ctx'> 	fsparam_string("clientaddr",	Opt_clientaddr),</div><div class='ctx'> 	fsparam_flag_no("cto",		Opt_cto),</div><div class='add'>+	fsparam_flag_no("alignwrite",	Opt_alignwrite),</div><div class='add'>+	fsparam_enum("fatal_neterrors", Opt_fatal_neterrors,</div><div class='add'>+		     nfs_param_enums_fatal_neterrors),</div><div class='ctx'> 	fsparam_flag  ("fg",		Opt_fg),</div><div class='ctx'> 	fsparam_flag_no("fsc",		Opt_fscache_flag),</div><div class='ctx'> 	fsparam_string("fsc",		Opt_fscache),</div><div class='hunk'>@@ -172,7 +195,8 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {</div><div class='ctx'> 	fsparam_u32   ("port",		Opt_port),</div><div class='ctx'> 	fsparam_flag_no("posix",	Opt_posix),</div><div class='ctx'> 	fsparam_string("proto",		Opt_proto),</div><div class='del'>-	fsparam_flag_no("rdirplus",	Opt_rdirplus),</div><div class='add'>+	fsparam_flag_no("rdirplus", Opt_rdirplus), // rdirplus|nordirplus</div><div class='add'>+	fsparam_string("rdirplus",  Opt_rdirplus), // rdirplus=...</div><div class='ctx'> 	fsparam_flag  ("rdma",		Opt_rdma),</div><div class='ctx'> 	fsparam_flag_no("resvport",	Opt_resvport),</div><div class='ctx'> 	fsparam_u32   ("retrans",	Opt_retrans),</div><div class='hunk'>@@ -199,6 +223,8 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {</div><div class='ctx'> 	fsparam_enum  ("write",		Opt_write, nfs_param_enums_write),</div><div class='ctx'> 	fsparam_u32   ("wsize",		Opt_wsize),</div><div class='ctx'> 	fsparam_string("xprtsec",	Opt_xprtsec),</div><div class='add'>+	fsparam_s32("cert_serial",	Opt_cert_serial),</div><div class='add'>+	fsparam_s32("privkey_serial",	Opt_privkey_serial),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -286,6 +312,12 @@ static const struct constant_table nfs_xprtsec_policies[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct constant_table nfs_rdirplus_tokens[] = {</div><div class='add'>+	{ "none",	Opt_rdirplus_none },</div><div class='add'>+	{ "force",	Opt_rdirplus_force },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Sanity-check a server address provided by the mount command.</div><div class='ctx'>  *</div><div class='hunk'>@@ -523,6 +555,32 @@ static int nfs_parse_version_string(struct fs_context *fc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+static int nfs_tls_key_verify(key_serial_t key_id)</div><div class='add'>+{</div><div class='add'>+	struct key *key = key_lookup(key_id);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(key)) {</div><div class='add'>+		pr_err("key id %08x not found\n", key_id);</div><div class='add'>+		return PTR_ERR(key);</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(KEY_FLAG_REVOKED, &amp;key-&gt;flags) ||</div><div class='add'>+	    test_bit(KEY_FLAG_INVALIDATED, &amp;key-&gt;flags)) {</div><div class='add'>+		pr_err("key id %08x revoked\n", key_id);</div><div class='add'>+		error = -EKEYREVOKED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key_put(key);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int nfs_tls_key_verify(key_serial_t key_id)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_KEYS */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Parse a single mount parameter.</div><div class='ctx'>  */</div><div class='hunk'>@@ -592,6 +650,12 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,</div><div class='ctx'> 		else</div><div class='ctx'> 			ctx-&gt;flags |= NFS_MOUNT_TRUNK_DISCOVERY;</div><div class='ctx'> 		break;</div><div class='add'>+	case Opt_alignwrite:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			ctx-&gt;flags |= NFS_MOUNT_NO_ALIGNWRITE;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;flags &amp;= ~NFS_MOUNT_NO_ALIGNWRITE;</div><div class='add'>+		break;</div><div class='ctx'> 	case Opt_ac:</div><div class='ctx'> 		if (result.negated)</div><div class='ctx'> 			ctx-&gt;flags |= NFS_MOUNT_NOAC;</div><div class='hunk'>@@ -600,9 +664,11 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_lock:</div><div class='ctx'> 		if (result.negated) {</div><div class='add'>+			ctx-&gt;lock_status = NFS_LOCK_NOLOCK;</div><div class='ctx'> 			ctx-&gt;flags |= NFS_MOUNT_NONLM;</div><div class='ctx'> 			ctx-&gt;flags |= (NFS_MOUNT_LOCAL_FLOCK | NFS_MOUNT_LOCAL_FCNTL);</div><div class='ctx'> 		} else {</div><div class='add'>+			ctx-&gt;lock_status = NFS_LOCK_LOCK;</div><div class='ctx'> 			ctx-&gt;flags &amp;= ~NFS_MOUNT_NONLM;</div><div class='ctx'> 			ctx-&gt;flags &amp;= ~(NFS_MOUNT_LOCAL_FLOCK | NFS_MOUNT_LOCAL_FCNTL);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -626,10 +692,25 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,</div><div class='ctx'> 			ctx-&gt;flags &amp;= ~NFS_MOUNT_NOACL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_rdirplus:</div><div class='del'>-		if (result.negated)</div><div class='add'>+		if (result.negated) {</div><div class='add'>+			ctx-&gt;flags &amp;= ~NFS_MOUNT_FORCE_RDIRPLUS;</div><div class='ctx'> 			ctx-&gt;flags |= NFS_MOUNT_NORDIRPLUS;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;flags &amp;= ~NFS_MOUNT_NORDIRPLUS;</div><div class='add'>+		} else if (!param-&gt;string) {</div><div class='add'>+			ctx-&gt;flags &amp;= ~(NFS_MOUNT_NORDIRPLUS | NFS_MOUNT_FORCE_RDIRPLUS);</div><div class='add'>+		} else {</div><div class='add'>+			switch (lookup_constant(nfs_rdirplus_tokens, param-&gt;string, -1)) {</div><div class='add'>+			case Opt_rdirplus_none:</div><div class='add'>+				ctx-&gt;flags &amp;= ~NFS_MOUNT_FORCE_RDIRPLUS;</div><div class='add'>+				ctx-&gt;flags |= NFS_MOUNT_NORDIRPLUS;</div><div class='add'>+				break;</div><div class='add'>+			case Opt_rdirplus_force:</div><div class='add'>+				ctx-&gt;flags &amp;= ~NFS_MOUNT_NORDIRPLUS;</div><div class='add'>+				ctx-&gt;flags |= NFS_MOUNT_FORCE_RDIRPLUS;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				goto out_invalid_value;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_sharecache:</div><div class='ctx'> 		if (result.negated)</div><div class='hunk'>@@ -652,6 +733,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,</div><div class='ctx'> 		ctx-&gt;fscache_uniq = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_fscache:</div><div class='add'>+		trace_nfs_mount_assign(param-&gt;key, param-&gt;string);</div><div class='ctx'> 		ctx-&gt;options |= NFS_OPTION_FSCACHE;</div><div class='ctx'> 		kfree(ctx-&gt;fscache_uniq);</div><div class='ctx'> 		ctx-&gt;fscache_uniq = param-&gt;string;</div><div class='hunk'>@@ -755,6 +837,18 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		break;</div><div class='add'>+	case Opt_cert_serial:</div><div class='add'>+		ret = nfs_tls_key_verify(result.int_32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ctx-&gt;xprtsec.cert_serial = result.int_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_privkey_serial:</div><div class='add'>+		ret = nfs_tls_key_verify(result.int_32);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ctx-&gt;xprtsec.privkey_serial = result.int_32;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case Opt_proto:</div><div class='ctx'> 		if (!param-&gt;string)</div><div class='hunk'>@@ -861,6 +955,25 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,</div><div class='ctx'> 			goto out_of_bounds;</div><div class='ctx'> 		ctx-&gt;nfs_server.max_connect = result.uint_32;</div><div class='ctx'> 		break;</div><div class='add'>+	case Opt_fatal_neterrors:</div><div class='add'>+		trace_nfs_mount_assign(param-&gt;key, param-&gt;string);</div><div class='add'>+		switch (result.uint_32) {</div><div class='add'>+		case Opt_fatal_neterrors_default:</div><div class='add'>+			if (fc-&gt;net_ns != &amp;init_net)</div><div class='add'>+				ctx-&gt;flags |= NFS_MOUNT_NETUNREACH_FATAL;</div><div class='add'>+			else</div><div class='add'>+				ctx-&gt;flags &amp;= ~NFS_MOUNT_NETUNREACH_FATAL;</div><div class='add'>+			break;</div><div class='add'>+		case Opt_fatal_neterrors_enetunreach:</div><div class='add'>+			ctx-&gt;flags |= NFS_MOUNT_NETUNREACH_FATAL;</div><div class='add'>+			break;</div><div class='add'>+		case Opt_fatal_neterrors_none:</div><div class='add'>+			ctx-&gt;flags &amp;= ~NFS_MOUNT_NETUNREACH_FATAL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto out_invalid_value;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case Opt_lookupcache:</div><div class='ctx'> 		trace_nfs_mount_assign(param-&gt;key, param-&gt;string);</div><div class='ctx'> 		switch (result.uint_32) {</div><div class='hunk'>@@ -1111,9 +1224,12 @@ static int nfs23_parse_monolithic(struct fs_context *fc,</div><div class='ctx'> 		ctx-&gt;acdirmax	= data-&gt;acdirmax;</div><div class='ctx'> 		ctx-&gt;need_mount	= false;</div><div class='ctx'> </div><div class='del'>-		memcpy(sap, &amp;data-&gt;addr, sizeof(data-&gt;addr));</div><div class='del'>-		ctx-&gt;nfs_server.addrlen = sizeof(data-&gt;addr);</div><div class='del'>-		ctx-&gt;nfs_server.port = ntohs(data-&gt;addr.sin_port);</div><div class='add'>+		if (!is_remount_fc(fc)) {</div><div class='add'>+			memcpy(sap, &amp;data-&gt;addr, sizeof(data-&gt;addr));</div><div class='add'>+			ctx-&gt;nfs_server.addrlen = sizeof(data-&gt;addr);</div><div class='add'>+			ctx-&gt;nfs_server.port = ntohs(data-&gt;addr.sin_port);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (sap-&gt;ss_family != AF_INET ||</div><div class='ctx'> 		    !nfs_verify_server_address(sap))</div><div class='ctx'> 			goto out_no_address;</div><div class='hunk'>@@ -1153,8 +1269,7 @@ static int nfs23_parse_monolithic(struct fs_context *fc,</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='ctx'> 			data-&gt;context[NFS_MAX_CONTEXT_LEN] = '\0';</div><div class='del'>-			ret = vfs_parse_fs_string(fc, "context",</div><div class='del'>-						  data-&gt;context, strlen(data-&gt;context));</div><div class='add'>+			ret = vfs_parse_fs_string(fc, "context", data-&gt;context);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> #else</div><div class='hunk'>@@ -1453,7 +1568,7 @@ static int nfs_fs_context_validate(struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	/* Load the NFS protocol module if we haven't done so yet */</div><div class='ctx'> 	if (!ctx-&gt;nfs_mod) {</div><div class='del'>-		nfs_mod = get_nfs_version(ctx-&gt;version);</div><div class='add'>+		nfs_mod = find_nfs_version(ctx-&gt;version);</div><div class='ctx'> 		if (IS_ERR(nfs_mod)) {</div><div class='ctx'> 			ret = PTR_ERR(nfs_mod);</div><div class='ctx'> 			goto out_version_unavailable;</div><div class='hunk'>@@ -1527,7 +1642,7 @@ static int nfs_fs_context_dup(struct fs_context *fc, struct fs_context *src_fc)</div><div class='ctx'> 	}</div><div class='ctx'> 	nfs_copy_fh(ctx-&gt;mntfh, src-&gt;mntfh);</div><div class='ctx'> </div><div class='del'>-	__module_get(ctx-&gt;nfs_mod-&gt;owner);</div><div class='add'>+	get_nfs_version(ctx-&gt;nfs_mod);</div><div class='ctx'> 	ctx-&gt;client_address		= NULL;</div><div class='ctx'> 	ctx-&gt;mount_server.hostname	= NULL;</div><div class='ctx'> 	ctx-&gt;nfs_server.export_path	= NULL;</div><div class='hunk'>@@ -1619,7 +1734,7 @@ static int nfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ctx-&gt;nfs_mod = nfss-&gt;nfs_client-&gt;cl_nfs_mod;</div><div class='del'>-		__module_get(ctx-&gt;nfs_mod-&gt;owner);</div><div class='add'>+		get_nfs_version(ctx-&gt;nfs_mod);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* defaults */</div><div class='ctx'> 		ctx-&gt;timeo		= NFS_UNSPEC_TIMEO;</div><div class='hunk'>@@ -1637,6 +1752,9 @@ static int nfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 		ctx-&gt;xprtsec.cert_serial	= TLS_NO_CERT;</div><div class='ctx'> 		ctx-&gt;xprtsec.privkey_serial	= TLS_NO_PRIVKEY;</div><div class='ctx'> </div><div class='add'>+		if (fc-&gt;net_ns != &amp;init_net)</div><div class='add'>+			ctx-&gt;flags |= NFS_MOUNT_NETUNREACH_FATAL;</div><div class='add'>+</div><div class='ctx'> 		fc-&gt;s_iflags		|= SB_I_STABLE_WRITES;</div><div class='ctx'> 	}</div><div class='ctx'> 	fc-&gt;fs_private = ctx;</div><div class='head'>diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c<br/>index 2d1bfee225c3..8b0785178731 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/fscache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/fscache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/fscache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/fscache.c</a></div><div class='hunk'>@@ -263,15 +263,25 @@ int nfs_netfs_readahead(struct readahead_control *ractl)</div><div class='ctx'> static atomic_t nfs_netfs_debug_id;</div><div class='ctx'> static int nfs_netfs_init_request(struct netfs_io_request *rreq, struct file *file)</div><div class='ctx'> {</div><div class='add'>+	if (!file) {</div><div class='add'>+		if (WARN_ON_ONCE(rreq-&gt;origin != NETFS_PGPRIV2_COPY_TO_CACHE))</div><div class='add'>+			return -EIO;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rreq-&gt;netfs_priv = get_nfs_open_context(nfs_file_open_context(file));</div><div class='ctx'> 	rreq-&gt;debug_id = atomic_inc_return(&amp;nfs_netfs_debug_id);</div><div class='add'>+	/* [DEPRECATED] Use PG_private_2 to mark folio being written to the cache. */</div><div class='add'>+	__set_bit(NETFS_RREQ_USE_PGPRIV2, &amp;rreq-&gt;flags);</div><div class='add'>+	rreq-&gt;io_streams[0].sreq_max_len = NFS_SB(rreq-&gt;inode-&gt;i_sb)-&gt;rsize;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_netfs_free_request(struct netfs_io_request *rreq)</div><div class='ctx'> {</div><div class='del'>-	put_nfs_open_context(rreq-&gt;netfs_priv);</div><div class='add'>+	if (rreq-&gt;netfs_priv)</div><div class='add'>+		put_nfs_open_context(rreq-&gt;netfs_priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs_netfs_io_data *nfs_netfs_alloc(struct netfs_io_subrequest *sreq)</div><div class='hunk'>@@ -286,14 +296,6 @@ static struct nfs_netfs_io_data *nfs_netfs_alloc(struct netfs_io_subrequest *sre</div><div class='ctx'> 	return netfs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool nfs_netfs_clamp_length(struct netfs_io_subrequest *sreq)</div><div class='del'>-{</div><div class='del'>-	size_t	rsize = NFS_SB(sreq-&gt;rreq-&gt;inode-&gt;i_sb)-&gt;rsize;</div><div class='del'>-</div><div class='del'>-	sreq-&gt;len = min(sreq-&gt;len, rsize);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nfs_netfs_issue_read(struct netfs_io_subrequest *sreq)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_netfs_io_data	*netfs;</div><div class='hunk'>@@ -301,34 +303,32 @@ static void nfs_netfs_issue_read(struct netfs_io_subrequest *sreq)</div><div class='ctx'> 	struct inode *inode = sreq-&gt;rreq-&gt;inode;</div><div class='ctx'> 	struct nfs_open_context *ctx = sreq-&gt;rreq-&gt;netfs_priv;</div><div class='ctx'> 	struct page *page;</div><div class='add'>+	unsigned long idx;</div><div class='add'>+	pgoff_t start, last;</div><div class='ctx'> 	int err;</div><div class='del'>-	pgoff_t start = (sreq-&gt;start + sreq-&gt;transferred) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	pgoff_t last = ((sreq-&gt;start + sreq-&gt;len -</div><div class='del'>-			 sreq-&gt;transferred - 1) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	XA_STATE(xas, &amp;sreq-&gt;rreq-&gt;mapping-&gt;i_pages, start);</div><div class='add'>+</div><div class='add'>+	start = (sreq-&gt;start + sreq-&gt;transferred) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	last = ((sreq-&gt;start + sreq-&gt;len - sreq-&gt;transferred - 1) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	nfs_pageio_init_read(&amp;pgio, inode, false,</div><div class='ctx'> 			     &amp;nfs_async_read_completion_ops);</div><div class='ctx'> </div><div class='ctx'> 	netfs = nfs_netfs_alloc(sreq);</div><div class='del'>-	if (!netfs)</div><div class='del'>-		return netfs_subreq_terminated(sreq, -ENOMEM, false);</div><div class='add'>+	if (!netfs) {</div><div class='add'>+		sreq-&gt;error = -ENOMEM;</div><div class='add'>+		return netfs_read_subreq_terminated(sreq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pgio.pg_netfs = netfs; /* used in completion */</div><div class='ctx'> </div><div class='del'>-	xas_lock(&amp;xas);</div><div class='del'>-	xas_for_each(&amp;xas, page, last) {</div><div class='add'>+	xa_for_each_range(&amp;sreq-&gt;rreq-&gt;mapping-&gt;i_pages, idx, page, start, last) {</div><div class='ctx'> 		/* nfs_read_add_folio() may schedule() due to pNFS layout and other RPCs  */</div><div class='del'>-		xas_pause(&amp;xas);</div><div class='del'>-		xas_unlock(&amp;xas);</div><div class='ctx'> 		err = nfs_read_add_folio(&amp;pgio, ctx, page_folio(page));</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			netfs-&gt;error = err;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		xas_lock(&amp;xas);</div><div class='ctx'> 	}</div><div class='del'>-	xas_unlock(&amp;xas);</div><div class='ctx'> out:</div><div class='ctx'> 	nfs_pageio_complete_read(&amp;pgio);</div><div class='ctx'> 	nfs_netfs_put(netfs);</div><div class='hunk'>@@ -346,7 +346,7 @@ void nfs_netfs_initiate_read(struct nfs_pgio_header *hdr)</div><div class='ctx'> </div><div class='ctx'> int nfs_netfs_folio_unlock(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If fscache is enabled, netfs will unlock pages.</div><div class='hunk'>@@ -366,7 +366,9 @@ void nfs_netfs_read_completion(struct nfs_pgio_header *hdr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	sreq = netfs-&gt;sreq;</div><div class='del'>-	if (test_bit(NFS_IOHDR_EOF, &amp;hdr-&gt;flags))</div><div class='add'>+	if (test_bit(NFS_IOHDR_EOF, &amp;hdr-&gt;flags) &amp;&amp;</div><div class='add'>+	    sreq-&gt;rreq-&gt;origin != NETFS_UNBUFFERED_READ &amp;&amp;</div><div class='add'>+	    sreq-&gt;rreq-&gt;origin != NETFS_DIO_READ)</div><div class='ctx'> 		__set_bit(NETFS_SREQ_CLEAR_TAIL, &amp;sreq-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;error)</div><div class='hunk'>@@ -382,5 +384,4 @@ const struct netfs_request_ops nfs_netfs_ops = {</div><div class='ctx'> 	.init_request		= nfs_netfs_init_request,</div><div class='ctx'> 	.free_request		= nfs_netfs_free_request,</div><div class='ctx'> 	.issue_read		= nfs_netfs_issue_read,</div><div class='del'>-	.clamp_length		= nfs_netfs_clamp_length</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h<br/>index e3cb4923316b..9d86868f4998 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/fscache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/fscache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/fscache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/fscache.h</a></div><div class='hunk'>@@ -60,8 +60,6 @@ static inline void nfs_netfs_get(struct nfs_netfs_io_data *netfs)</div><div class='ctx'> </div><div class='ctx'> static inline void nfs_netfs_put(struct nfs_netfs_io_data *netfs)</div><div class='ctx'> {</div><div class='del'>-	ssize_t final_len;</div><div class='del'>-</div><div class='ctx'> 	/* Only the last RPC completion should call netfs_subreq_terminated() */</div><div class='ctx'> 	if (!refcount_dec_and_test(&amp;netfs-&gt;refcount))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -74,8 +72,10 @@ static inline void nfs_netfs_put(struct nfs_netfs_io_data *netfs)</div><div class='ctx'> 	 * Correct the final length here to be no larger than the netfs subrequest</div><div class='ctx'> 	 * length, and thus avoid netfs's "Subreq overread" warning message.</div><div class='ctx'> 	 */</div><div class='del'>-	final_len = min_t(s64, netfs-&gt;sreq-&gt;len, atomic64_read(&amp;netfs-&gt;transferred));</div><div class='del'>-	netfs_subreq_terminated(netfs-&gt;sreq, netfs-&gt;error ?: final_len, false);</div><div class='add'>+	netfs-&gt;sreq-&gt;transferred = min_t(s64, netfs-&gt;sreq-&gt;len,</div><div class='add'>+					 atomic64_read(&amp;netfs-&gt;transferred));</div><div class='add'>+	netfs-&gt;sreq-&gt;error = netfs-&gt;error;</div><div class='add'>+	netfs_read_subreq_terminated(netfs-&gt;sreq);</div><div class='ctx'> 	kfree(netfs);</div><div class='ctx'> }</div><div class='ctx'> static inline void nfs_netfs_inode_init(struct nfs_inode *nfsi)</div><div class='hunk'>@@ -101,10 +101,10 @@ extern int nfs_netfs_read_folio(struct file *file, struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> static inline bool nfs_fscache_release_folio(struct folio *folio, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	if (folio_test_fscache(folio)) {</div><div class='add'>+	if (folio_test_private_2(folio)) { /* [DEPRECATED] */</div><div class='ctx'> 		if (current_is_kswapd() || !(gfp &amp; __GFP_FS))</div><div class='ctx'> 			return false;</div><div class='del'>-		folio_wait_fscache(folio);</div><div class='add'>+		folio_wait_private_2(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	fscache_note_page_release(netfs_i_cookie(netfs_inode(folio-&gt;mapping-&gt;host)));</div><div class='ctx'> 	return true;</div><div class='head'>diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c<br/>index 11ff2b2e060f..f13d25d95b85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/getroot.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/getroot.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/getroot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/getroot.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * get an NFS2/NFS3 root dentry from the root filehandle</div><div class='add'>+ * get a root dentry from the root filehandle</div><div class='ctx'>  */</div><div class='ctx'> int nfs_get_root(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c<br/>index ebb8d60e1152..f76fe406937a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/inode.c</a></div><div class='hunk'>@@ -74,6 +74,8 @@ nfs_fattr_to_ino_t(struct nfs_fattr *fattr)</div><div class='ctx'> </div><div class='ctx'> int nfs_wait_bit_killable(struct wait_bit_key *key, int mode)</div><div class='ctx'> {</div><div class='add'>+	if (unlikely(nfs_current_task_exiting()))</div><div class='add'>+		return -EINTR;</div><div class='ctx'> 	schedule();</div><div class='ctx'> 	if (signal_pending_state(mode, current))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='hunk'>@@ -106,7 +108,7 @@ u64 nfs_compat_user_ino64(u64 fileid)</div><div class='ctx'> </div><div class='ctx'> int nfs_drop_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return NFS_STALE(inode) || generic_drop_inode(inode);</div><div class='add'>+	return NFS_STALE(inode) || inode_generic_drop(inode);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_drop_inode);</div><div class='ctx'> </div><div class='hunk'>@@ -190,12 +192,12 @@ static bool nfs_has_xattr_cache(const struct nfs_inode *nfsi)</div><div class='ctx'> void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='del'>-	bool have_delegation = NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ);</div><div class='ctx'> </div><div class='del'>-	if (have_delegation) {</div><div class='add'>+	if (nfs_have_delegated_attributes(inode)) {</div><div class='ctx'> 		if (!(flags &amp; NFS_INO_REVAL_FORCED))</div><div class='ctx'> 			flags &amp;= ~(NFS_INO_INVALID_MODE |</div><div class='ctx'> 				   NFS_INO_INVALID_OTHER |</div><div class='add'>+				   NFS_INO_INVALID_BTIME |</div><div class='ctx'> 				   NFS_INO_INVALID_XATTR);</div><div class='ctx'> 		flags &amp;= ~(NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_SIZE);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -206,12 +208,15 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)</div><div class='ctx'> 		nfs_fscache_invalidate(inode, 0);</div><div class='ctx'> 	flags &amp;= ~NFS_INO_REVAL_FORCED;</div><div class='ctx'> </div><div class='del'>-	nfsi-&gt;cache_validity |= flags;</div><div class='add'>+	flags |= nfsi-&gt;cache_validity;</div><div class='add'>+	if (inode-&gt;i_mapping-&gt;nrpages == 0)</div><div class='add'>+		flags &amp;= ~NFS_INO_INVALID_DATA;</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_mapping-&gt;nrpages == 0) {</div><div class='del'>-		nfsi-&gt;cache_validity &amp;= ~NFS_INO_INVALID_DATA;</div><div class='del'>-		nfs_ooo_clear(nfsi);</div><div class='del'>-	} else if (nfsi-&gt;cache_validity &amp; NFS_INO_INVALID_DATA) {</div><div class='add'>+	/* pairs with nfs_clear_invalid_mapping()'s smp_load_acquire() */</div><div class='add'>+	smp_store_release(&amp;nfsi-&gt;cache_validity, flags);</div><div class='add'>+</div><div class='add'>+	if (inode-&gt;i_mapping-&gt;nrpages == 0 ||</div><div class='add'>+	    nfsi-&gt;cache_validity &amp; NFS_INO_INVALID_DATA) {</div><div class='ctx'> 		nfs_ooo_clear(nfsi);</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_nfs_set_cache_invalid(inode, 0);</div><div class='hunk'>@@ -276,6 +281,8 @@ EXPORT_SYMBOL_GPL(nfs_zap_acl_cache);</div><div class='ctx'> </div><div class='ctx'> void nfs_invalidate_atime(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	if (nfs_have_delegated_atime(inode))</div><div class='add'>+		return;</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATIME);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -468,7 +475,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 		goto out_no_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> 		unsigned long now = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -491,6 +498,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 			inode-&gt;i_fop = NFS_SB(sb)-&gt;nfs_client-&gt;rpc_ops-&gt;file_ops;</div><div class='ctx'> 			inode-&gt;i_data.a_ops = &amp;nfs_file_aops;</div><div class='ctx'> 			nfs_inode_init_regular(nfsi);</div><div class='add'>+			mapping_set_large_folios(inode-&gt;i_mapping);</div><div class='ctx'> 		} else if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 			inode-&gt;i_op = NFS_SB(sb)-&gt;nfs_client-&gt;rpc_ops-&gt;dir_inode_ops;</div><div class='ctx'> 			inode-&gt;i_fop = &amp;nfs_dir_operations;</div><div class='hunk'>@@ -515,6 +523,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 		inode_set_atime(inode, 0, 0);</div><div class='ctx'> 		inode_set_mtime(inode, 0, 0);</div><div class='ctx'> 		inode_set_ctime(inode, 0, 0);</div><div class='add'>+		memset(&amp;nfsi-&gt;btime, 0, sizeof(nfsi-&gt;btime));</div><div class='ctx'> 		inode_set_iversion_raw(inode, 0);</div><div class='ctx'> 		inode-&gt;i_size = 0;</div><div class='ctx'> 		clear_nlink(inode);</div><div class='hunk'>@@ -538,6 +547,10 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 			inode_set_ctime_to_ts(inode, fattr-&gt;ctime);</div><div class='ctx'> 		else if (fattr_supported &amp; NFS_ATTR_FATTR_CTIME)</div><div class='ctx'> 			nfs_set_cache_invalid(inode, NFS_INO_INVALID_CTIME);</div><div class='add'>+		if (fattr-&gt;valid &amp; NFS_ATTR_FATTR_BTIME)</div><div class='add'>+			nfsi-&gt;btime = fattr-&gt;btime;</div><div class='add'>+		else if (fattr_supported &amp; NFS_ATTR_FATTR_BTIME)</div><div class='add'>+			nfs_set_cache_invalid(inode, NFS_INO_INVALID_BTIME);</div><div class='ctx'> 		if (fattr-&gt;valid &amp; NFS_ATTR_FATTR_CHANGE)</div><div class='ctx'> 			inode_set_iversion_raw(inode, fattr-&gt;change_attr);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -550,6 +563,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 			set_nlink(inode, fattr-&gt;nlink);</div><div class='ctx'> 		else if (fattr_supported &amp; NFS_ATTR_FATTR_NLINK)</div><div class='ctx'> 			nfs_set_cache_invalid(inode, NFS_INO_INVALID_NLINK);</div><div class='add'>+		else</div><div class='add'>+			set_nlink(inode, 1);</div><div class='ctx'> 		if (fattr-&gt;valid &amp; NFS_ATTR_FATTR_OWNER)</div><div class='ctx'> 			inode-&gt;i_uid = fattr-&gt;uid;</div><div class='ctx'> 		else if (fattr_supported &amp; NFS_ATTR_FATTR_OWNER)</div><div class='hunk'>@@ -593,7 +608,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 		inode-&gt;i_sb-&gt;s_id,</div><div class='ctx'> 		(unsigned long long)NFS_FILEID(inode),</div><div class='ctx'> 		nfs_display_fhandle_hash(fh),</div><div class='del'>-		atomic_read(&amp;inode-&gt;i_count));</div><div class='add'>+		icount_read(inode));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -604,6 +619,95 @@ out_no_inode:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_fhget);</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+nfs_fattr_fixup_delegated(struct inode *inode, struct nfs_fattr *fattr)</div><div class='add'>+{</div><div class='add'>+	unsigned long cache_validity = NFS_I(inode)-&gt;cache_validity;</div><div class='add'>+</div><div class='add'>+	if (nfs_have_delegated_mtime(inode)) {</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_CTIME))</div><div class='add'>+			fattr-&gt;valid &amp;= ~(NFS_ATTR_FATTR_PRECTIME |</div><div class='add'>+					  NFS_ATTR_FATTR_CTIME);</div><div class='add'>+</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_MTIME))</div><div class='add'>+			fattr-&gt;valid &amp;= ~(NFS_ATTR_FATTR_PREMTIME |</div><div class='add'>+					  NFS_ATTR_FATTR_MTIME);</div><div class='add'>+</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_ATIME))</div><div class='add'>+			fattr-&gt;valid &amp;= ~NFS_ATTR_FATTR_ATIME;</div><div class='add'>+	} else if (nfs_have_delegated_atime(inode)) {</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_ATIME))</div><div class='add'>+			fattr-&gt;valid &amp;= ~NFS_ATTR_FATTR_ATIME;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_set_timestamps_to_ts(struct inode *inode, struct iattr *attr)</div><div class='add'>+{</div><div class='add'>+	unsigned int cache_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;ia_valid &amp; ATTR_MTIME_SET) {</div><div class='add'>+		struct timespec64 ctime = inode_get_ctime(inode);</div><div class='add'>+		struct timespec64 mtime = inode_get_mtime(inode);</div><div class='add'>+		struct timespec64 now;</div><div class='add'>+		int updated = 0;</div><div class='add'>+</div><div class='add'>+		now = inode_set_ctime_current(inode);</div><div class='add'>+		if (!timespec64_equal(&amp;now, &amp;ctime))</div><div class='add'>+			updated |= S_CTIME;</div><div class='add'>+</div><div class='add'>+		inode_set_mtime_to_ts(inode, attr-&gt;ia_mtime);</div><div class='add'>+		if (!timespec64_equal(&amp;now, &amp;mtime))</div><div class='add'>+			updated |= S_MTIME;</div><div class='add'>+</div><div class='add'>+		inode_maybe_inc_iversion(inode, updated);</div><div class='add'>+		cache_flags |= NFS_INO_INVALID_CTIME | NFS_INO_INVALID_MTIME;</div><div class='add'>+	}</div><div class='add'>+	if (attr-&gt;ia_valid &amp; ATTR_ATIME_SET) {</div><div class='add'>+		inode_set_atime_to_ts(inode, attr-&gt;ia_atime);</div><div class='add'>+		cache_flags |= NFS_INO_INVALID_ATIME;</div><div class='add'>+	}</div><div class='add'>+	NFS_I(inode)-&gt;cache_validity &amp;= ~cache_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_update_timestamps(struct inode *inode, unsigned int ia_valid)</div><div class='add'>+{</div><div class='add'>+	enum file_time_flags time_flags = 0;</div><div class='add'>+	unsigned int cache_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (ia_valid &amp; ATTR_MTIME) {</div><div class='add'>+		time_flags |= S_MTIME | S_CTIME;</div><div class='add'>+		cache_flags |= NFS_INO_INVALID_CTIME | NFS_INO_INVALID_MTIME;</div><div class='add'>+	}</div><div class='add'>+	if (ia_valid &amp; ATTR_ATIME) {</div><div class='add'>+		time_flags |= S_ATIME;</div><div class='add'>+		cache_flags |= NFS_INO_INVALID_ATIME;</div><div class='add'>+	}</div><div class='add'>+	inode_update_timestamps(inode, time_flags);</div><div class='add'>+	NFS_I(inode)-&gt;cache_validity &amp;= ~cache_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_update_delegated_atime(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (nfs_have_delegated_atime(inode))</div><div class='add'>+		nfs_update_timestamps(inode, ATTR_ATIME);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_update_delegated_mtime_locked(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	if (nfs_have_delegated_mtime(inode))</div><div class='add'>+		nfs_update_timestamps(inode, ATTR_MTIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_update_delegated_mtime(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	nfs_update_delegated_mtime_locked(inode);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_update_delegated_mtime);</div><div class='add'>+</div><div class='ctx'> #define NFS_VALID_ATTRS (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_ATIME|ATTR_ATIME_SET|ATTR_MTIME|ATTR_MTIME_SET|ATTR_FILE|ATTR_OPEN)</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -612,7 +716,10 @@ nfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct nfs_fattr *fattr;</div><div class='add'>+	loff_t oldsize = i_size_read(inode);</div><div class='ctx'> 	int error = 0;</div><div class='add'>+	kuid_t task_uid = current_fsuid();</div><div class='add'>+	kuid_t owner_uid = inode-&gt;i_uid;</div><div class='ctx'> </div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_VFSSETATTR);</div><div class='ctx'> </div><div class='hunk'>@@ -627,10 +734,39 @@ nfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			return error;</div><div class='ctx'> </div><div class='del'>-		if (attr-&gt;ia_size == i_size_read(inode))</div><div class='add'>+		if (attr-&gt;ia_size == oldsize)</div><div class='ctx'> 			attr-&gt;ia_valid &amp;= ~ATTR_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (nfs_have_delegated_mtime(inode) &amp;&amp; attr-&gt;ia_valid &amp; ATTR_MTIME) {</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+		if (attr-&gt;ia_valid &amp; ATTR_MTIME_SET) {</div><div class='add'>+			if (uid_eq(task_uid, owner_uid)) {</div><div class='add'>+				nfs_set_timestamps_to_ts(inode, attr);</div><div class='add'>+				attr-&gt;ia_valid &amp;= ~(ATTR_MTIME|ATTR_MTIME_SET|</div><div class='add'>+						ATTR_ATIME|ATTR_ATIME_SET);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			nfs_update_timestamps(inode, attr-&gt;ia_valid);</div><div class='add'>+			attr-&gt;ia_valid &amp;= ~(ATTR_MTIME|ATTR_ATIME);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	} else if (nfs_have_delegated_atime(inode) &amp;&amp;</div><div class='add'>+		   attr-&gt;ia_valid &amp; ATTR_ATIME &amp;&amp;</div><div class='add'>+		   !(attr-&gt;ia_valid &amp; ATTR_MTIME)) {</div><div class='add'>+		if (attr-&gt;ia_valid &amp; ATTR_ATIME_SET) {</div><div class='add'>+			if (uid_eq(task_uid, owner_uid)) {</div><div class='add'>+				spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+				nfs_set_timestamps_to_ts(inode, attr);</div><div class='add'>+				spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+				attr-&gt;ia_valid &amp;= ~(ATTR_ATIME|ATTR_ATIME_SET);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			nfs_update_delegated_atime(inode);</div><div class='add'>+			attr-&gt;ia_valid &amp;= ~ATTR_ATIME;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Optimization: if the end result is no change, don't RPC */</div><div class='ctx'> 	if (((attr-&gt;ia_valid &amp; NFS_VALID_ATTRS) &amp; ~(ATTR_FILE|ATTR_OPEN)) == 0)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -638,8 +774,10 @@ nfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	trace_nfs_setattr_enter(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* Write all dirty data */</div><div class='del'>-	if (S_ISREG(inode-&gt;i_mode))</div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		nfs_file_block_o_direct(NFS_I(inode));</div><div class='ctx'> 		nfs_sync_inode(inode);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fattr = nfs_alloc_fattr_with_label(NFS_SERVER(inode));</div><div class='ctx'> 	if (fattr == NULL) {</div><div class='hunk'>@@ -648,8 +786,12 @@ nfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = NFS_PROTO(inode)-&gt;setattr(dentry, fattr, attr);</div><div class='del'>-	if (error == 0)</div><div class='add'>+	if (error == 0) {</div><div class='add'>+		if (attr-&gt;ia_valid &amp; ATTR_SIZE)</div><div class='add'>+			nfs_truncate_last_folio(inode-&gt;i_mapping, oldsize,</div><div class='add'>+						attr-&gt;ia_size);</div><div class='ctx'> 		error = nfs_refresh_inode(inode, fattr);</div><div class='add'>+	}</div><div class='ctx'> 	nfs_free_fattr(fattr);</div><div class='ctx'> out:</div><div class='ctx'> 	trace_nfs_setattr_exit(inode, error);</div><div class='hunk'>@@ -686,6 +828,7 @@ static int nfs_vmtruncate(struct inode * inode, loff_t offset)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	truncate_pagecache(inode, offset);</div><div class='add'>+	nfs_update_delegated_mtime_locked(inode);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -709,8 +852,9 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr,</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	NFS_I(inode)-&gt;attr_gencount = fattr-&gt;gencount;</div><div class='ctx'> 	if ((attr-&gt;ia_valid &amp; ATTR_SIZE) != 0) {</div><div class='del'>-		nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME |</div><div class='del'>-						     NFS_INO_INVALID_BLOCKS);</div><div class='add'>+		if (!nfs_have_delegated_mtime(inode))</div><div class='add'>+			nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME);</div><div class='add'>+		nfs_set_cache_invalid(inode, NFS_INO_INVALID_BLOCKS);</div><div class='ctx'> 		nfs_inc_stats(inode, NFSIOS_SETATTRTRUNC);</div><div class='ctx'> 		nfs_vmtruncate(inode, attr-&gt;ia_size);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -806,6 +950,7 @@ static void nfs_readdirplus_parent_cache_hit(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> static u32 nfs_get_valid_attrmask(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	u64 fattr_valid = NFS_SERVER(inode)-&gt;fattr_valid;</div><div class='ctx'> 	unsigned long cache_validity = READ_ONCE(NFS_I(inode)-&gt;cache_validity);</div><div class='ctx'> 	u32 reply_mask = STATX_INO | STATX_TYPE;</div><div class='ctx'> </div><div class='hunk'>@@ -825,6 +970,9 @@ static u32 nfs_get_valid_attrmask(struct inode *inode)</div><div class='ctx'> 		reply_mask |= STATX_UID | STATX_GID;</div><div class='ctx'> 	if (!(cache_validity &amp; NFS_INO_INVALID_BLOCKS))</div><div class='ctx'> 		reply_mask |= STATX_BLOCKS;</div><div class='add'>+	if (!(cache_validity &amp; NFS_INO_INVALID_BTIME) &amp;&amp;</div><div class='add'>+	    (fattr_valid &amp; NFS_ATTR_FATTR_BTIME))</div><div class='add'>+		reply_mask |= STATX_BTIME;</div><div class='ctx'> 	if (!(cache_validity &amp; NFS_INO_INVALID_CHANGE))</div><div class='ctx'> 		reply_mask |= STATX_CHANGE_COOKIE;</div><div class='ctx'> 	return reply_mask;</div><div class='hunk'>@@ -835,6 +983,7 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='add'>+	u64 fattr_valid = server-&gt;fattr_valid;</div><div class='ctx'> 	unsigned long cache_validity;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	bool force_sync = query_flags &amp; AT_STATX_FORCE_SYNC;</div><div class='hunk'>@@ -845,9 +994,12 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> </div><div class='ctx'> 	request_mask &amp;= STATX_TYPE | STATX_MODE | STATX_NLINK | STATX_UID |</div><div class='ctx'> 			STATX_GID | STATX_ATIME | STATX_MTIME | STATX_CTIME |</div><div class='del'>-			STATX_INO | STATX_SIZE | STATX_BLOCKS |</div><div class='add'>+			STATX_INO | STATX_SIZE | STATX_BLOCKS | STATX_BTIME |</div><div class='ctx'> 			STATX_CHANGE_COOKIE;</div><div class='ctx'> </div><div class='add'>+	if (!(fattr_valid &amp; NFS_ATTR_FATTR_BTIME))</div><div class='add'>+		request_mask &amp;= ~STATX_BTIME;</div><div class='add'>+</div><div class='ctx'> 	if ((query_flags &amp; AT_STATX_DONT_SYNC) &amp;&amp; !force_sync) {</div><div class='ctx'> 		if (readdirplus_enabled)</div><div class='ctx'> 			nfs_readdirplus_parent_cache_hit(path-&gt;dentry);</div><div class='hunk'>@@ -856,8 +1008,12 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> </div><div class='ctx'> 	/* Flush out writes to the server in order to update c/mtime/version.  */</div><div class='ctx'> 	if ((request_mask &amp; (STATX_CTIME | STATX_MTIME | STATX_CHANGE_COOKIE)) &amp;&amp;</div><div class='del'>-	    S_ISREG(inode-&gt;i_mode))</div><div class='del'>-		filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='add'>+	    S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		if (nfs_have_delegated_mtime(inode))</div><div class='add'>+			filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='add'>+		else</div><div class='add'>+			filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We may force a getattr if the user cares about atime.</div><div class='hunk'>@@ -875,7 +1031,7 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 	/* Is the user requesting attributes that might need revalidation? */</div><div class='ctx'> 	if (!(request_mask &amp; (STATX_MODE|STATX_NLINK|STATX_ATIME|STATX_CTIME|</div><div class='ctx'> 					STATX_MTIME|STATX_UID|STATX_GID|</div><div class='del'>-					STATX_SIZE|STATX_BLOCKS|</div><div class='add'>+					STATX_SIZE|STATX_BLOCKS|STATX_BTIME|</div><div class='ctx'> 					STATX_CHANGE_COOKIE)))</div><div class='ctx'> 		goto out_no_revalidate;</div><div class='ctx'> </div><div class='hunk'>@@ -899,6 +1055,8 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		do_update |= cache_validity &amp; NFS_INO_INVALID_OTHER;</div><div class='ctx'> 	if (request_mask &amp; STATX_BLOCKS)</div><div class='ctx'> 		do_update |= cache_validity &amp; NFS_INO_INVALID_BLOCKS;</div><div class='add'>+	if (request_mask &amp; STATX_BTIME)</div><div class='add'>+		do_update |= cache_validity &amp; NFS_INO_INVALID_BTIME;</div><div class='ctx'> </div><div class='ctx'> 	if (do_update) {</div><div class='ctx'> 		if (readdirplus_enabled)</div><div class='hunk'>@@ -920,6 +1078,22 @@ out_no_revalidate:</div><div class='ctx'> 		stat-&gt;attributes |= STATX_ATTR_CHANGE_MONOTONIC;</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		stat-&gt;blksize = NFS_SERVER(inode)-&gt;dtsize;</div><div class='add'>+	stat-&gt;btime = NFS_I(inode)-&gt;btime;</div><div class='add'>+</div><div class='add'>+	/* Special handling for STATX_DIOALIGN and STATX_DIO_READ_ALIGN</div><div class='add'>+	 * - NFS doesn't have DIO alignment constraints, avoid getting</div><div class='add'>+	 *   these DIO attrs from remote and just respond with most</div><div class='add'>+	 *   accommodating limits (so client will issue supported DIO).</div><div class='add'>+	 * - this is unintuitive, but the most coarse-grained</div><div class='add'>+	 *   dio_offset_align is the most accommodating.</div><div class='add'>+	 */</div><div class='add'>+	if ((request_mask &amp; (STATX_DIOALIGN | STATX_DIO_READ_ALIGN)) &amp;&amp;</div><div class='add'>+	    S_ISREG(inode-&gt;i_mode)) {</div><div class='add'>+		stat-&gt;result_mask |= STATX_DIOALIGN | STATX_DIO_READ_ALIGN;</div><div class='add'>+		stat-&gt;dio_mem_align = 4; /* 4-byte alignment */</div><div class='add'>+		stat-&gt;dio_offset_align = PAGE_SIZE;</div><div class='add'>+		stat-&gt;dio_read_offset_align = stat-&gt;dio_offset_align;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	trace_nfs_getattr_exit(inode, err);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1012,7 +1186,7 @@ void nfs_close_context(struct nfs_open_context *ctx, int is_sync)</div><div class='ctx'> 	if (!is_sync)</div><div class='ctx'> 		return;</div><div class='ctx'> 	inode = d_inode(ctx-&gt;dentry);</div><div class='del'>-	if (NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ))</div><div class='add'>+	if (nfs_have_read_or_write_delegation(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> 	nfsi = NFS_I(inode);</div><div class='ctx'> 	if (inode-&gt;i_mapping-&gt;nrpages == 0)</div><div class='hunk'>@@ -1053,6 +1227,8 @@ struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry,</div><div class='ctx'> 	ctx-&gt;lock_context.open_context = ctx;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ctx-&gt;list);</div><div class='ctx'> 	ctx-&gt;mdsthreshold = NULL;</div><div class='add'>+	nfs_localio_file_init(&amp;ctx-&gt;nfl);</div><div class='add'>+</div><div class='ctx'> 	return ctx;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(alloc_nfs_open_context);</div><div class='hunk'>@@ -1084,6 +1260,7 @@ static void __put_nfs_open_context(struct nfs_open_context *ctx, int is_sync)</div><div class='ctx'> 	nfs_sb_deactive(sb);</div><div class='ctx'> 	put_rpccred(rcu_dereference_protected(ctx-&gt;ll_cred, 1));</div><div class='ctx'> 	kfree(ctx-&gt;mdsthreshold);</div><div class='add'>+	nfs_close_local_fh(&amp;ctx-&gt;nfl);</div><div class='ctx'> 	kfree_rcu(ctx, rcu_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1340,6 +1517,13 @@ int nfs_clear_invalid_mapping(struct address_space *mapping)</div><div class='ctx'> 					 TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='add'>+		smp_rmb(); /* pairs with smp_wmb() below */</div><div class='add'>+		if (test_bit(NFS_INO_INVALIDATING, bitlock))</div><div class='add'>+			continue;</div><div class='add'>+		/* pairs with nfs_set_cache_invalid()'s smp_store_release() */</div><div class='add'>+		if (!(smp_load_acquire(&amp;nfsi-&gt;cache_validity) &amp; NFS_INO_INVALID_DATA))</div><div class='add'>+			goto out;</div><div class='add'>+		/* Slow-path that double-checks with spinlock held */</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		if (test_bit(NFS_INO_INVALIDATING, bitlock)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -1482,7 +1666,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat</div><div class='ctx'> 	unsigned long invalid = 0;</div><div class='ctx'> 	struct timespec64 ts;</div><div class='ctx'> </div><div class='del'>-	if (NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ))</div><div class='add'>+	if (nfs_have_delegated_attributes(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(fattr-&gt;valid &amp; NFS_ATTR_FATTR_FILEID)) {</div><div class='hunk'>@@ -1565,6 +1749,7 @@ void nfs_fattr_init(struct nfs_fattr *fattr)</div><div class='ctx'> 	fattr-&gt;gencount = nfs_inc_attr_generation_counter();</div><div class='ctx'> 	fattr-&gt;owner_name = NULL;</div><div class='ctx'> 	fattr-&gt;group_name = NULL;</div><div class='add'>+	fattr-&gt;mdsthreshold = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_fattr_init);</div><div class='ctx'> </div><div class='hunk'>@@ -1803,7 +1988,7 @@ static int nfs_inode_finish_partial_attr_update(const struct nfs_fattr *fattr,</div><div class='ctx'> 		NFS_INO_INVALID_ATIME | NFS_INO_INVALID_CTIME |</div><div class='ctx'> 		NFS_INO_INVALID_MTIME | NFS_INO_INVALID_SIZE |</div><div class='ctx'> 		NFS_INO_INVALID_BLOCKS | NFS_INO_INVALID_OTHER |</div><div class='del'>-		NFS_INO_INVALID_NLINK;</div><div class='add'>+		NFS_INO_INVALID_NLINK | NFS_INO_INVALID_BTIME;</div><div class='ctx'> 	unsigned long cache_validity = NFS_I(inode)-&gt;cache_validity;</div><div class='ctx'> 	enum nfs4_change_attr_type ctype = NFS_SERVER(inode)-&gt;change_attr_type;</div><div class='ctx'> </div><div class='hunk'>@@ -2069,10 +2254,10 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 	bool attr_changed = false;</div><div class='ctx'> 	bool have_delegation;</div><div class='ctx'> </div><div class='del'>-	dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",</div><div class='add'>+	dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%llx)\n",</div><div class='ctx'> 			__func__, inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino,</div><div class='ctx'> 			nfs_display_fhandle_hash(NFS_FH(inode)),</div><div class='del'>-			atomic_read(&amp;inode-&gt;i_count), fattr-&gt;valid);</div><div class='add'>+			icount_read(inode), fattr-&gt;valid);</div><div class='ctx'> </div><div class='ctx'> 	if (!(fattr-&gt;valid &amp; NFS_ATTR_FATTR_FILEID)) {</div><div class='ctx'> 		/* Only a mounted-on-fileid? Just exit */</div><div class='hunk'>@@ -2118,6 +2303,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	nfsi-&gt;read_cache_jiffies = fattr-&gt;time_start;</div><div class='ctx'> </div><div class='add'>+	/* Fix up any delegated attributes in the struct nfs_fattr */</div><div class='add'>+	nfs_fattr_fixup_delegated(inode, fattr);</div><div class='add'>+</div><div class='ctx'> 	save_cache_validity = nfsi-&gt;cache_validity;</div><div class='ctx'> 	nfsi-&gt;cache_validity &amp;= ~(NFS_INO_INVALID_ATTR</div><div class='ctx'> 			| NFS_INO_INVALID_ATIME</div><div class='hunk'>@@ -2161,7 +2349,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 					| NFS_INO_INVALID_BLOCKS</div><div class='ctx'> 					| NFS_INO_INVALID_NLINK</div><div class='ctx'> 					| NFS_INO_INVALID_MODE</div><div class='del'>-					| NFS_INO_INVALID_OTHER;</div><div class='add'>+					| NFS_INO_INVALID_OTHER</div><div class='add'>+					| NFS_INO_INVALID_BTIME;</div><div class='ctx'> 				if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 					nfs_force_lookup_revalidate(inode);</div><div class='ctx'> 				attr_changed = true;</div><div class='hunk'>@@ -2195,6 +2384,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 		nfsi-&gt;cache_validity |=</div><div class='ctx'> 			save_cache_validity &amp; NFS_INO_INVALID_CTIME;</div><div class='ctx'> </div><div class='add'>+	if (fattr-&gt;valid &amp; NFS_ATTR_FATTR_BTIME)</div><div class='add'>+		nfsi-&gt;btime = fattr-&gt;btime;</div><div class='add'>+	else if (fattr_supported &amp; NFS_ATTR_FATTR_BTIME)</div><div class='add'>+		nfsi-&gt;cache_validity |=</div><div class='add'>+			save_cache_validity &amp; NFS_INO_INVALID_BTIME;</div><div class='add'>+</div><div class='ctx'> 	/* Check if our cached file size is stale */</div><div class='ctx'> 	if (fattr-&gt;valid &amp; NFS_ATTR_FATTR_SIZE) {</div><div class='ctx'> 		new_isize = nfs_size_to_loff_t(fattr-&gt;size);</div><div class='hunk'>@@ -2372,7 +2567,7 @@ static int __init nfs_init_inodecache(void)</div><div class='ctx'> 	nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",</div><div class='ctx'> 					     sizeof(struct nfs_inode),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (nfs_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2390,35 +2585,54 @@ static void nfs_destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(nfs_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct workqueue_struct *nfslocaliod_workqueue;</div><div class='ctx'> struct workqueue_struct *nfsiod_workqueue;</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfsiod_workqueue);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * start up the nfsiod workqueue</div><div class='add'>+ * Destroy the nfsiod workqueues</div><div class='ctx'>  */</div><div class='del'>-static int nfsiod_start(void)</div><div class='add'>+static void nfsiod_stop(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct workqueue_struct *wq;</div><div class='del'>-	dprintk("RPC:       creating workqueue nfsiod\n");</div><div class='del'>-	wq = alloc_workqueue("nfsiod", WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='del'>-	if (wq == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	nfsiod_workqueue = wq;</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	wq = nfsiod_workqueue;</div><div class='add'>+	if (wq != NULL) {</div><div class='add'>+		nfsiod_workqueue = NULL;</div><div class='add'>+		destroy_workqueue(wq);</div><div class='add'>+	}</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	wq = nfslocaliod_workqueue;</div><div class='add'>+	if (wq != NULL) {</div><div class='add'>+		nfslocaliod_workqueue = NULL;</div><div class='add'>+		destroy_workqueue(wq);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Destroy the nfsiod workqueue</div><div class='add'>+ * Start the nfsiod workqueues</div><div class='ctx'>  */</div><div class='del'>-static void nfsiod_stop(void)</div><div class='add'>+static int nfsiod_start(void)</div><div class='ctx'> {</div><div class='del'>-	struct workqueue_struct *wq;</div><div class='del'>-</div><div class='del'>-	wq = nfsiod_workqueue;</div><div class='del'>-	if (wq == NULL)</div><div class='del'>-		return;</div><div class='del'>-	nfsiod_workqueue = NULL;</div><div class='del'>-	destroy_workqueue(wq);</div><div class='add'>+	dprintk("RPC:       creating workqueue nfsiod\n");</div><div class='add'>+	nfsiod_workqueue = alloc_workqueue("nfsiod", WQ_MEM_RECLAIM | WQ_UNBOUND, 0);</div><div class='add'>+	if (nfsiod_workqueue == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	/*</div><div class='add'>+	 * localio writes need to use a normal (non-memreclaim) workqueue.</div><div class='add'>+	 * When we start getting low on space, XFS goes and calls flush_work() on</div><div class='add'>+	 * a non-memreclaim work queue, which causes a priority inversion problem.</div><div class='add'>+	 */</div><div class='add'>+	dprintk("RPC:       creating workqueue nfslocaliod\n");</div><div class='add'>+	nfslocaliod_workqueue = alloc_workqueue("nfslocaliod", WQ_UNBOUND, 0);</div><div class='add'>+	if (unlikely(nfslocaliod_workqueue == NULL)) {</div><div class='add'>+		nfsiod_stop();</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int nfs_net_id;</div><div class='hunk'>@@ -2426,12 +2640,32 @@ EXPORT_SYMBOL_GPL(nfs_net_id);</div><div class='ctx'> </div><div class='ctx'> static int nfs_net_init(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	struct nfs_net *nn = net_generic(net, nfs_net_id);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	nfs_clients_init(net);</div><div class='del'>-	return nfs_fs_proc_net_init(net);</div><div class='add'>+</div><div class='add'>+	if (!rpc_proc_register(net, &amp;nn-&gt;rpcstats)) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_proc_rpc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nfs_fs_proc_net_init(net);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_proc_nfs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_proc_nfs:</div><div class='add'>+	rpc_proc_unregister(net, "nfs");</div><div class='add'>+err_proc_rpc:</div><div class='add'>+	nfs_clients_exit(net);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='add'>+	rpc_proc_unregister(net, "nfs");</div><div class='ctx'> 	nfs_fs_proc_net_exit(net);</div><div class='ctx'> 	nfs_clients_exit(net);</div><div class='ctx'> }</div><div class='hunk'>@@ -2443,6 +2677,35 @@ static struct pernet_operations nfs_net_ops = {</div><div class='ctx'> 	.size = sizeof(struct nfs_net),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+static struct key *nfs_keyring;</div><div class='add'>+</div><div class='add'>+static int __init nfs_init_keyring(void)</div><div class='add'>+{</div><div class='add'>+	nfs_keyring = keyring_alloc(".nfs",</div><div class='add'>+			     GLOBAL_ROOT_UID, GLOBAL_ROOT_GID,</div><div class='add'>+			     current_cred(),</div><div class='add'>+			     (KEY_POS_ALL &amp; ~KEY_POS_SETATTR) |</div><div class='add'>+			     (KEY_USR_ALL &amp; ~KEY_USR_SETATTR),</div><div class='add'>+			     KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);</div><div class='add'>+	return PTR_ERR_OR_ZERO(nfs_keyring);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_exit_keyring(void)</div><div class='add'>+{</div><div class='add'>+	key_put(nfs_keyring);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int nfs_init_keyring(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nfs_exit_keyring(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_KEYS */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize NFS</div><div class='ctx'>  */</div><div class='hunk'>@@ -2450,6 +2713,10 @@ static int __init init_nfs_fs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = nfs_init_keyring();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = nfs_sysfs_init();</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out10;</div><div class='hunk'>@@ -2486,15 +2753,12 @@ static int __init init_nfs_fs(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out1;</div><div class='ctx'> </div><div class='del'>-	rpc_proc_register(&amp;init_net, &amp;nfs_rpcstat);</div><div class='del'>-</div><div class='ctx'> 	err = register_nfs_fs();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out0:</div><div class='del'>-	rpc_proc_unregister(&amp;init_net, "nfs");</div><div class='ctx'> 	nfs_destroy_directcache();</div><div class='ctx'> out1:</div><div class='ctx'> 	nfs_destroy_writepagecache();</div><div class='hunk'>@@ -2513,6 +2777,7 @@ out7:</div><div class='ctx'> out9:</div><div class='ctx'> 	nfs_sysfs_exit();</div><div class='ctx'> out10:</div><div class='add'>+	nfs_exit_keyring();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2524,15 +2789,16 @@ static void __exit exit_nfs_fs(void)</div><div class='ctx'> 	nfs_destroy_inodecache();</div><div class='ctx'> 	nfs_destroy_nfspagecache();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;nfs_net_ops);</div><div class='del'>-	rpc_proc_unregister(&amp;init_net, "nfs");</div><div class='ctx'> 	unregister_nfs_fs();</div><div class='ctx'> 	nfs_fs_proc_exit();</div><div class='ctx'> 	nfsiod_stop();</div><div class='ctx'> 	nfs_sysfs_exit();</div><div class='add'>+	nfs_exit_keyring();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Not quite true; I just maintain it */</div><div class='ctx'> MODULE_AUTHOR("Olaf Kirch &lt;okir@monad.swb.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("NFS client support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> module_param(enable_ino64, bool, 0644);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h<br/>index e3722ce6722e..2ecd38e1d17a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/internal.h</a></div><div class='hunk'>@@ -6,12 +6,14 @@</div><div class='ctx'> #include "nfs4_fs.h"</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/compiler_attributes.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/addr.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_page.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='ctx'> #include &lt;linux/wait_bit.h&gt;</div><div class='ctx'> </div><div class='del'>-#define NFS_SB_MASK (SB_RDONLY|SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)</div><div class='add'>+#define NFS_SB_MASK (SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)</div><div class='ctx'> </div><div class='ctx'> extern const struct export_operations nfs_export_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -112,6 +114,7 @@ struct nfs_fs_context {</div><div class='ctx'> 	unsigned short		protofamily;</div><div class='ctx'> 	unsigned short		mountfamily;</div><div class='ctx'> 	bool			has_sec_mnt_opts;</div><div class='add'>+	int			lock_status;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='ctx'> 		union {</div><div class='hunk'>@@ -153,6 +156,12 @@ struct nfs_fs_context {</div><div class='ctx'> 	} clone_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum nfs_lock_status {</div><div class='add'>+	NFS_LOCK_NOT_SET	= 0,</div><div class='add'>+	NFS_LOCK_LOCK		= 1,</div><div class='add'>+	NFS_LOCK_NOLOCK		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define nfs_errorf(fc, fmt, ...) ((fc)-&gt;log.log ?		\</div><div class='ctx'> 	errorf(fc, fmt, ## __VA_ARGS__) :			\</div><div class='ctx'> 	({ dprintk(fmt "\n", ## __VA_ARGS__); }))</div><div class='hunk'>@@ -198,7 +207,6 @@ struct nfs_mount_request {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int nfs_mount(struct nfs_mount_request *info, int timeo, int retrans);</div><div class='del'>-extern void nfs_umount(const struct nfs_mount_request *info);</div><div class='ctx'> </div><div class='ctx'> /* client.c */</div><div class='ctx'> extern const struct rpc_program nfs_program;</div><div class='hunk'>@@ -223,7 +231,7 @@ extern struct nfs_client *</div><div class='ctx'> nfs4_find_client_sessionid(struct net *, const struct sockaddr *,</div><div class='ctx'> 				struct nfs4_sessionid *, u32);</div><div class='ctx'> extern struct nfs_server *nfs_create_server(struct fs_context *);</div><div class='del'>-extern void nfs4_server_set_init_caps(struct nfs_server *);</div><div class='add'>+extern void nfs_server_set_init_caps(struct nfs_server *);</div><div class='ctx'> extern struct nfs_server *nfs4_create_server(struct fs_context *);</div><div class='ctx'> extern struct nfs_server *nfs4_create_referral_server(struct fs_context *);</div><div class='ctx'> extern int nfs4_update_server(struct nfs_server *server, const char *hostname,</div><div class='hunk'>@@ -301,7 +309,8 @@ void nfs_pgio_header_free(struct nfs_pgio_header *);</div><div class='ctx'> int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);</div><div class='ctx'> int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,</div><div class='ctx'> 		      const struct cred *cred, const struct nfs_rpc_ops *rpc_ops,</div><div class='del'>-		      const struct rpc_call_ops *call_ops, int how, int flags);</div><div class='add'>+		      const struct rpc_call_ops *call_ops, int how, int flags,</div><div class='add'>+		      struct nfsd_file *localio);</div><div class='ctx'> void nfs_free_request(struct nfs_page *req);</div><div class='ctx'> struct nfs_pgio_mirror *</div><div class='ctx'> nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc);</div><div class='hunk'>@@ -390,8 +399,8 @@ struct dentry *nfs_lookup(struct inode *, struct dentry *, unsigned int);</div><div class='ctx'> void nfs_d_prune_case_insensitive_aliases(struct inode *inode);</div><div class='ctx'> int nfs_create(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='ctx'> 	       umode_t, bool);</div><div class='del'>-int nfs_mkdir(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='del'>-	      umode_t);</div><div class='add'>+struct dentry *nfs_mkdir(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='add'>+			 umode_t);</div><div class='ctx'> int nfs_rmdir(struct inode *, struct dentry *);</div><div class='ctx'> int nfs_unlink(struct inode *, struct dentry *);</div><div class='ctx'> int nfs_symlink(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='hunk'>@@ -422,15 +431,18 @@ loff_t nfs_file_llseek(struct file *, loff_t, int);</div><div class='ctx'> ssize_t nfs_file_read(struct kiocb *, struct iov_iter *);</div><div class='ctx'> ssize_t nfs_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe,</div><div class='ctx'> 			     size_t len, unsigned int flags);</div><div class='del'>-int nfs_file_mmap(struct file *, struct vm_area_struct *);</div><div class='add'>+int nfs_file_mmap_prepare(struct vm_area_desc *);</div><div class='ctx'> ssize_t nfs_file_write(struct kiocb *, struct iov_iter *);</div><div class='ctx'> int nfs_file_release(struct inode *, struct file *);</div><div class='ctx'> int nfs_lock(struct file *, int, struct file_lock *);</div><div class='ctx'> int nfs_flock(struct file *, int, struct file_lock *);</div><div class='ctx'> int nfs_check_flags(int);</div><div class='add'>+void nfs_truncate_last_folio(struct address_space *mapping, loff_t from,</div><div class='add'>+			     loff_t to);</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='ctx'> extern struct workqueue_struct *nfsiod_workqueue;</div><div class='add'>+extern struct workqueue_struct *nfslocaliod_workqueue;</div><div class='ctx'> extern struct inode *nfs_alloc_inode(struct super_block *sb);</div><div class='ctx'> extern void nfs_free_inode(struct inode *);</div><div class='ctx'> extern int nfs_write_inode(struct inode *, struct writeback_control *);</div><div class='hunk'>@@ -442,6 +454,63 @@ extern void nfs_set_cache_invalid(struct inode *inode, unsigned long flags);</div><div class='ctx'> extern bool nfs_check_cache_invalid(struct inode *, unsigned long);</div><div class='ctx'> extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+/* localio.c */</div><div class='add'>+struct nfs_local_dio {</div><div class='add'>+	u32 mem_align;</div><div class='add'>+	u32 offset_align;</div><div class='add'>+	loff_t middle_offset;</div><div class='add'>+	loff_t end_offset;</div><div class='add'>+	ssize_t	start_len;	/* Length for misaligned first extent */</div><div class='add'>+	ssize_t	middle_len;	/* Length for DIO-aligned middle extent */</div><div class='add'>+	ssize_t	end_len;	/* Length for misaligned last extent */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern void nfs_local_probe_async(struct nfs_client *);</div><div class='add'>+extern void nfs_local_probe_async_work(struct work_struct *);</div><div class='add'>+extern struct nfsd_file *nfs_local_open_fh(struct nfs_client *,</div><div class='add'>+					   const struct cred *,</div><div class='add'>+					   struct nfs_fh *,</div><div class='add'>+					   struct nfs_file_localio *,</div><div class='add'>+					   const fmode_t);</div><div class='add'>+extern int nfs_local_doio(struct nfs_client *,</div><div class='add'>+			  struct nfsd_file *,</div><div class='add'>+			  struct nfs_pgio_header *,</div><div class='add'>+			  const struct rpc_call_ops *);</div><div class='add'>+extern int nfs_local_commit(struct nfsd_file *,</div><div class='add'>+			    struct nfs_commit_data *,</div><div class='add'>+			    const struct rpc_call_ops *, int);</div><div class='add'>+extern bool nfs_server_is_local(const struct nfs_client *clp);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_NFS_LOCALIO */</div><div class='add'>+static inline void nfs_local_probe(struct nfs_client *clp) {}</div><div class='add'>+static inline void nfs_local_probe_async(struct nfs_client *clp) {}</div><div class='add'>+static inline struct nfsd_file *</div><div class='add'>+nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,</div><div class='add'>+		  struct nfs_fh *fh, struct nfs_file_localio *nfl,</div><div class='add'>+		  const fmode_t mode)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+static inline int nfs_local_doio(struct nfs_client *clp,</div><div class='add'>+				 struct nfsd_file *localio,</div><div class='add'>+				 struct nfs_pgio_header *hdr,</div><div class='add'>+				 const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline int nfs_local_commit(struct nfsd_file *localio,</div><div class='add'>+				struct nfs_commit_data *data,</div><div class='add'>+				const struct rpc_call_ops *call_ops, int how)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline bool nfs_server_is_local(const struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='add'>+</div><div class='ctx'> /* super.c */</div><div class='ctx'> extern const struct super_operations nfs_sops;</div><div class='ctx'> bool nfs_auth_info_match(const struct nfs_auth_info *, rpc_authflavor_t);</div><div class='hunk'>@@ -449,8 +518,6 @@ int nfs_try_get_tree(struct fs_context *);</div><div class='ctx'> int nfs_get_tree_common(struct fs_context *);</div><div class='ctx'> void nfs_kill_super(struct super_block *);</div><div class='ctx'> </div><div class='del'>-extern struct rpc_stat nfs_rpcstat;</div><div class='del'>-</div><div class='ctx'> extern int __init register_nfs_fs(void);</div><div class='ctx'> extern void __exit unregister_nfs_fs(void);</div><div class='ctx'> extern bool nfs_sb_active(struct super_block *sb);</div><div class='hunk'>@@ -463,11 +530,11 @@ extern const struct netfs_request_ops nfs_netfs_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* io.c */</div><div class='del'>-extern void nfs_start_io_read(struct inode *inode);</div><div class='add'>+extern __must_check int nfs_start_io_read(struct inode *inode);</div><div class='ctx'> extern void nfs_end_io_read(struct inode *inode);</div><div class='del'>-extern void nfs_start_io_write(struct inode *inode);</div><div class='add'>+extern  __must_check int nfs_start_io_write(struct inode *inode);</div><div class='ctx'> extern void nfs_end_io_write(struct inode *inode);</div><div class='del'>-extern void nfs_start_io_direct(struct inode *inode);</div><div class='add'>+extern __must_check int nfs_start_io_direct(struct inode *inode);</div><div class='ctx'> extern void nfs_end_io_direct(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> static inline bool nfs_file_io_is_buffered(struct nfs_inode *nfsi)</div><div class='hunk'>@@ -475,6 +542,16 @@ static inline bool nfs_file_io_is_buffered(struct nfs_inode *nfsi)</div><div class='ctx'> 	return test_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Must be called with exclusively locked inode-&gt;i_rwsem */</div><div class='add'>+static inline void nfs_file_block_o_direct(struct nfs_inode *nfsi)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags)) {</div><div class='add'>+		clear_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags);</div><div class='add'>+		inode_dio_wait(&amp;nfsi-&gt;vfs_inode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* namespace.c */</div><div class='ctx'> #define NFS_PATH_CANONICAL 1</div><div class='ctx'> extern char *nfs_path(char **p, struct dentry *dentry,</div><div class='hunk'>@@ -500,7 +577,6 @@ extern int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 			       struct nfs_open_context *ctx,</div><div class='ctx'> 			       struct folio *folio);</div><div class='ctx'> extern void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio);</div><div class='del'>-extern void nfs_read_prepare(struct rpc_task *task, void *calldata);</div><div class='ctx'> extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);</div><div class='ctx'> </div><div class='ctx'> /* super.c */</div><div class='hunk'>@@ -523,7 +599,8 @@ extern int nfs_initiate_commit(struct rpc_clnt *clnt,</div><div class='ctx'> 			       struct nfs_commit_data *data,</div><div class='ctx'> 			       const struct nfs_rpc_ops *nfs_ops,</div><div class='ctx'> 			       const struct rpc_call_ops *call_ops,</div><div class='del'>-			       int how, int flags);</div><div class='add'>+			       int how, int flags,</div><div class='add'>+			       struct nfsd_file *localio);</div><div class='ctx'> extern void nfs_init_commit(struct nfs_commit_data *data,</div><div class='ctx'> 			    struct list_head *head,</div><div class='ctx'> 			    struct pnfs_layout_segment *lseg,</div><div class='hunk'>@@ -615,9 +692,12 @@ nfs_write_match_verf(const struct nfs_writeverf *verf,</div><div class='ctx'> </div><div class='ctx'> static inline gfp_t nfs_io_gfp_mask(void)</div><div class='ctx'> {</div><div class='del'>-	if (current-&gt;flags &amp; PF_WQ_WORKER)</div><div class='del'>-		return GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN;</div><div class='del'>-	return GFP_KERNEL;</div><div class='add'>+	gfp_t ret = current_gfp_context(GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	/* For workers __GFP_NORETRY only with __GFP_IO or __GFP_FS */</div><div class='add'>+	if ((current-&gt;flags &amp; PF_WQ_WORKER) &amp;&amp; ret == GFP_KERNEL)</div><div class='add'>+		ret |= __GFP_NORETRY | __GFP_NOWARN;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -712,9 +792,9 @@ unsigned long nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)</div><div class='ctx'> 	if ((bsize &amp; (bsize - 1)) || nrbitsp) {</div><div class='ctx'> 		unsigned char	nrbits;</div><div class='ctx'> </div><div class='del'>-		for (nrbits = 31; nrbits &amp;&amp; !(bsize &amp; (1 &lt;&lt; nrbits)); nrbits--)</div><div class='add'>+		for (nrbits = 31; nrbits &amp;&amp; !(bsize &amp; (1UL &lt;&lt; nrbits)); nrbits--)</div><div class='ctx'> 			;</div><div class='del'>-		bsize = 1 &lt;&lt; nrbits;</div><div class='add'>+		bsize = 1UL &lt;&lt; nrbits;</div><div class='ctx'> 		if (nrbitsp)</div><div class='ctx'> 			*nrbitsp = nrbits;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -780,7 +860,7 @@ static inline void nfs_folio_mark_unstable(struct folio *folio,</div><div class='ctx'> 					   struct nfs_commit_info *cinfo)</div><div class='ctx'> {</div><div class='ctx'> 	if (folio &amp;&amp; !cinfo-&gt;dreq) {</div><div class='del'>-		struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+		struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 		long nr = folio_nr_pages(folio);</div><div class='ctx'> </div><div class='ctx'> 		/* This page is really still in write-back - just that the</div><div class='hunk'>@@ -795,31 +875,12 @@ static inline void nfs_folio_mark_unstable(struct folio *folio,</div><div class='ctx'> /*</div><div class='ctx'>  * Determine the number of bytes of data the page contains</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='del'>-unsigned int nfs_page_length(struct page *page)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size = i_size_read(page_file_mapping(page)-&gt;host);</div><div class='del'>-</div><div class='del'>-	if (i_size &gt; 0) {</div><div class='del'>-		pgoff_t index = page_index(page);</div><div class='del'>-		pgoff_t end_index = (i_size - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		if (index &lt; end_index)</div><div class='del'>-			return PAGE_SIZE;</div><div class='del'>-		if (index == end_index)</div><div class='del'>-			return ((i_size - 1) &amp; ~PAGE_MASK) + 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Determine the number of bytes of data the page contains</div><div class='del'>- */</div><div class='ctx'> static inline size_t nfs_folio_length(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	loff_t i_size = i_size_read(folio_file_mapping(folio)-&gt;host);</div><div class='add'>+	loff_t i_size = i_size_read(folio-&gt;mapping-&gt;host);</div><div class='ctx'> </div><div class='ctx'> 	if (i_size &gt; 0) {</div><div class='del'>-		pgoff_t index = folio_index(folio) &gt;&gt; folio_order(folio);</div><div class='add'>+		pgoff_t index = folio-&gt;index &gt;&gt; folio_order(folio);</div><div class='ctx'> 		pgoff_t end_index = (i_size - 1) &gt;&gt; folio_shift(folio);</div><div class='ctx'> 		if (index &lt; end_index)</div><div class='ctx'> 			return folio_size(folio);</div><div class='hunk'>@@ -861,18 +922,16 @@ u64 nfs_timespec_to_change_attr(const struct timespec64 *ts)</div><div class='ctx'> 	return ((u64)ts-&gt;tv_sec &lt;&lt; 30) + ts-&gt;tv_nsec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRC32</div><div class='ctx'> static inline u32 nfs_stateid_hash(const nfs4_stateid *stateid)</div><div class='ctx'> {</div><div class='ctx'> 	return ~crc32_le(0xFFFFFFFF, &amp;stateid-&gt;other[0],</div><div class='ctx'> 				NFS4_STATEID_OTHER_SIZE);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline u32 nfs_stateid_hash(nfs4_stateid *stateid)</div><div class='add'>+</div><div class='add'>+static inline bool nfs_current_task_exiting(void)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return (current-&gt;flags &amp; PF_EXITING) != 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static inline bool nfs_error_is_fatal(int err)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nfs/io.c b/fs/nfs/io.c<br/>index b5551ed8f648..d275b0a250bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/io.c</a></div><div class='hunk'>@@ -14,15 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-/* Call with exclusively locked inode-&gt;i_rwsem */</div><div class='del'>-static void nfs_block_o_direct(struct nfs_inode *nfsi, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags)) {</div><div class='del'>-		clear_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags);</div><div class='del'>-		inode_dio_wait(inode);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nfs_start_io_read - declare the file is being used for buffered reads</div><div class='ctx'>  * @inode: file inode</div><div class='hunk'>@@ -39,19 +30,28 @@ static void nfs_block_o_direct(struct nfs_inode *nfsi, struct inode *inode)</div><div class='ctx'>  * Note that buffered writes and truncates both take a write lock on</div><div class='ctx'>  * inode-&gt;i_rwsem, meaning that those are serialised w.r.t. the reads.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> nfs_start_io_read(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	/* Be an optimist! */</div><div class='del'>-	down_read(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	err = down_read_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	if (test_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags) == 0)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	up_read(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='ctx'> 	/* Slow path.... */</div><div class='del'>-	down_write(&amp;inode-&gt;i_rwsem);</div><div class='del'>-	nfs_block_o_direct(nfsi, inode);</div><div class='add'>+	err = down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	nfs_file_block_o_direct(nfsi);</div><div class='ctx'> 	downgrade_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -74,11 +74,15 @@ nfs_end_io_read(struct inode *inode)</div><div class='ctx'>  * Declare that a buffered read operation is about to start, and ensure</div><div class='ctx'>  * that we block all direct I/O.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> nfs_start_io_write(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	down_write(&amp;inode-&gt;i_rwsem);</div><div class='del'>-	nfs_block_o_direct(NFS_I(inode), inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (!err)</div><div class='add'>+		nfs_file_block_o_direct(NFS_I(inode));</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -119,19 +123,28 @@ static void nfs_block_buffered(struct nfs_inode *nfsi, struct inode *inode)</div><div class='ctx'>  * Note that buffered writes and truncates both take a write lock on</div><div class='ctx'>  * inode-&gt;i_rwsem, meaning that those are serialised w.r.t. O_DIRECT.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> nfs_start_io_direct(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	/* Be an optimist! */</div><div class='del'>-	down_read(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	err = down_read_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	if (test_bit(NFS_INO_ODIRECT, &amp;nfsi-&gt;flags) != 0)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	up_read(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='ctx'> 	/* Slow path.... */</div><div class='del'>-	down_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	err = down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	nfs_block_buffered(nfsi, inode);</div><div class='ctx'> 	downgrade_write(&amp;inode-&gt;i_rwsem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/nfs/iostat.h b/fs/nfs/iostat.h<br/>index 5aa776b5a3e7..49862c95b224 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/iostat.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/iostat.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/iostat.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/iostat.h</a></div><div class='hunk'>@@ -46,10 +46,11 @@ static inline void nfs_add_stats(const struct inode *inode,</div><div class='ctx'> 	nfs_add_server_stats(NFS_SERVER(inode), stat, addend);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct nfs_iostats __percpu *nfs_alloc_iostats(void)</div><div class='del'>-{</div><div class='del'>-	return alloc_percpu(struct nfs_iostats);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag).</div><div class='add'>+ */</div><div class='add'>+#define nfs_alloc_iostats()	alloc_percpu(struct nfs_iostats)</div><div class='ctx'> </div><div class='ctx'> static inline void nfs_free_iostats(struct nfs_iostats __percpu *stats)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c<br/>new file mode 100644<br/>index 000000000000..f33bfa7b58e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/localio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/localio.c</a></div><div class='hunk'>@@ -0,0 +1,1072 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * NFS client support for local clients to bypass network stack</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014 Weston Andros Adamson &lt;dros@primarydata.com&gt;</div><div class='add'>+ * Copyright (C) 2019 Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 Mike Snitzer &lt;snitzer@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 NeilBrown &lt;neilb@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/vfs.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/addr.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;linux/nfs_common.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='add'>+#include &lt;linux/bvec.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/nfs.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/nfs_xdr.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "pnfs.h"</div><div class='add'>+#include "nfstrace.h"</div><div class='add'>+</div><div class='add'>+#define NFSDBG_FACILITY		NFSDBG_VFS</div><div class='add'>+</div><div class='add'>+#define NFSLOCAL_MAX_IOS	3</div><div class='add'>+</div><div class='add'>+struct nfs_local_kiocb {</div><div class='add'>+	struct kiocb		kiocb;</div><div class='add'>+	struct bio_vec		*bvec;</div><div class='add'>+	struct nfs_pgio_header	*hdr;</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+	void (*aio_complete_work)(struct work_struct *);</div><div class='add'>+	struct nfsd_file	*localio;</div><div class='add'>+	/* Begin mostly DIO-specific members */</div><div class='add'>+	size_t                  end_len;</div><div class='add'>+	short int		end_iter_index;</div><div class='add'>+	atomic_t		n_iters;</div><div class='add'>+	bool			iter_is_dio_aligned[NFSLOCAL_MAX_IOS];</div><div class='add'>+	struct iov_iter		iters[NFSLOCAL_MAX_IOS] ____cacheline_aligned;</div><div class='add'>+	/* End mostly DIO-specific members */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nfs_local_fsync_ctx {</div><div class='add'>+	struct nfsd_file	*localio;</div><div class='add'>+	struct nfs_commit_data	*data;</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+	struct completion	*done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool localio_enabled __read_mostly = true;</div><div class='add'>+module_param(localio_enabled, bool, 0644);</div><div class='add'>+</div><div class='add'>+static inline bool nfs_client_is_local(const struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	return !!rcu_access_pointer(clp-&gt;cl_uuid.net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool nfs_server_is_local(const struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	return nfs_client_is_local(clp) &amp;&amp; localio_enabled;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_server_is_local);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UUID_IS_LOCAL XDR functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void localio_xdr_enc_uuidargs(struct rpc_rqst *req,</div><div class='add'>+				     struct xdr_stream *xdr,</div><div class='add'>+				     const void *data)</div><div class='add'>+{</div><div class='add'>+	const u8 *uuid = data;</div><div class='add'>+</div><div class='add'>+	encode_opaque_fixed(xdr, uuid, UUID_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int localio_xdr_dec_uuidres(struct rpc_rqst *req,</div><div class='add'>+				   struct xdr_stream *xdr,</div><div class='add'>+				   void *result)</div><div class='add'>+{</div><div class='add'>+	/* void return */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rpc_procinfo nfs_localio_procedures[] = {</div><div class='add'>+	[LOCALIOPROC_UUID_IS_LOCAL] = {</div><div class='add'>+		.p_proc = LOCALIOPROC_UUID_IS_LOCAL,</div><div class='add'>+		.p_encode = localio_xdr_enc_uuidargs,</div><div class='add'>+		.p_decode = localio_xdr_dec_uuidres,</div><div class='add'>+		.p_arglen = XDR_QUADLEN(UUID_SIZE),</div><div class='add'>+		.p_replen = 0,</div><div class='add'>+		.p_statidx = LOCALIOPROC_UUID_IS_LOCAL,</div><div class='add'>+		.p_name = "UUID_IS_LOCAL",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int nfs_localio_counts[ARRAY_SIZE(nfs_localio_procedures)];</div><div class='add'>+static const struct rpc_version nfslocalio_version1 = {</div><div class='add'>+	.number			= 1,</div><div class='add'>+	.nrprocs		= ARRAY_SIZE(nfs_localio_procedures),</div><div class='add'>+	.procs			= nfs_localio_procedures,</div><div class='add'>+	.counts			= nfs_localio_counts,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rpc_version *nfslocalio_version[] = {</div><div class='add'>+       [1]			= &amp;nfslocalio_version1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct rpc_program nfslocalio_program;</div><div class='add'>+static struct rpc_stat		nfslocalio_rpcstat = { &amp;nfslocalio_program };</div><div class='add'>+</div><div class='add'>+const struct rpc_program nfslocalio_program = {</div><div class='add'>+	.name			= "nfslocalio",</div><div class='add'>+	.number			= NFS_LOCALIO_PROGRAM,</div><div class='add'>+	.nrvers			= ARRAY_SIZE(nfslocalio_version),</div><div class='add'>+	.version		= nfslocalio_version,</div><div class='add'>+	.stats			= &amp;nfslocalio_rpcstat,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_init_localioclient - Initialise an NFS localio client connection</div><div class='add'>+ */</div><div class='add'>+static struct rpc_clnt *nfs_init_localioclient(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	struct rpc_clnt *rpcclient_localio;</div><div class='add'>+</div><div class='add'>+	rpcclient_localio = rpc_bind_new_program(clp-&gt;cl_rpcclient,</div><div class='add'>+						 &amp;nfslocalio_program, 1);</div><div class='add'>+</div><div class='add'>+	dprintk_rcu("%s: server (%s) %s NFS LOCALIO.\n",</div><div class='add'>+		__func__, rpc_peeraddr2str(clp-&gt;cl_rpcclient, RPC_DISPLAY_ADDR),</div><div class='add'>+		(IS_ERR(rpcclient_localio) ? "does not support" : "supports"));</div><div class='add'>+</div><div class='add'>+	return rpcclient_localio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nfs_server_uuid_is_local(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	u8 uuid[UUID_SIZE];</div><div class='add'>+	struct rpc_message msg = {</div><div class='add'>+		.rpc_argp = &amp;uuid,</div><div class='add'>+	};</div><div class='add'>+	struct rpc_clnt *rpcclient_localio;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	rpcclient_localio = nfs_init_localioclient(clp);</div><div class='add'>+	if (IS_ERR(rpcclient_localio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	export_uuid(uuid, &amp;clp-&gt;cl_uuid.uuid);</div><div class='add'>+</div><div class='add'>+	msg.rpc_proc = &amp;nfs_localio_procedures[LOCALIOPROC_UUID_IS_LOCAL];</div><div class='add'>+	status = rpc_call_sync(rpcclient_localio, &amp;msg, 0);</div><div class='add'>+	dprintk("%s: NFS reply UUID_IS_LOCAL: status=%d\n",</div><div class='add'>+		__func__, status);</div><div class='add'>+	rpc_shutdown_client(rpcclient_localio);</div><div class='add'>+</div><div class='add'>+	/* Server is only local if it initialized required struct members */</div><div class='add'>+	if (status || !rcu_access_pointer(clp-&gt;cl_uuid.net) || !clp-&gt;cl_uuid.dom)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_local_probe - probe local i/o support for an nfs_server and nfs_client</div><div class='add'>+ * - called after alloc_client and init_client (so cl_rpcclient exists)</div><div class='add'>+ * - this function is idempotent, it can be called for old or new clients</div><div class='add'>+ */</div><div class='add'>+static void nfs_local_probe(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	/* Disallow localio if disabled via sysfs or AUTH_SYS isn't used */</div><div class='add'>+	if (!localio_enabled ||</div><div class='add'>+	    clp-&gt;cl_rpcclient-&gt;cl_auth-&gt;au_flavor != RPC_AUTH_UNIX) {</div><div class='add'>+		nfs_localio_disable_client(clp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nfs_client_is_local(clp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!nfs_uuid_begin(&amp;clp-&gt;cl_uuid))</div><div class='add'>+		return;</div><div class='add'>+	if (nfs_server_uuid_is_local(clp))</div><div class='add'>+		nfs_localio_enable_client(clp);</div><div class='add'>+	nfs_uuid_end(&amp;clp-&gt;cl_uuid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_local_probe_async_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nfs_client *clp =</div><div class='add'>+		container_of(work, struct nfs_client, cl_local_probe_work);</div><div class='add'>+</div><div class='add'>+	if (!refcount_inc_not_zero(&amp;clp-&gt;cl_count))</div><div class='add'>+		return;</div><div class='add'>+	nfs_local_probe(clp);</div><div class='add'>+	nfs_put_client(clp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_local_probe_async(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	queue_work(nfsiod_workqueue, &amp;clp-&gt;cl_local_probe_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_local_probe_async);</div><div class='add'>+</div><div class='add'>+static inline void nfs_local_file_put(struct nfsd_file *localio)</div><div class='add'>+{</div><div class='add'>+	/* nfs_to_nfsd_file_put_local() expects an __rcu pointer</div><div class='add'>+	 * but we have a __kernel pointer.  It is always safe</div><div class='add'>+	 * to cast a __kernel pointer to an __rcu pointer</div><div class='add'>+	 * because the cast only weakens what is known about the pointer.</div><div class='add'>+	 */</div><div class='add'>+	struct nfsd_file __rcu *nf = (struct nfsd_file __rcu*) localio;</div><div class='add'>+</div><div class='add'>+	nfs_to_nfsd_file_put_local(&amp;nf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __nfs_local_open_fh - open a local filehandle in terms of nfsd_file.</div><div class='add'>+ *</div><div class='add'>+ * Returns a pointer to a struct nfsd_file or ERR_PTR.</div><div class='add'>+ * Caller must release returned nfsd_file with nfs_to_nfsd_file_put_local().</div><div class='add'>+ */</div><div class='add'>+static struct nfsd_file *</div><div class='add'>+__nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,</div><div class='add'>+		    struct nfs_fh *fh, struct nfs_file_localio *nfl,</div><div class='add'>+		    struct nfsd_file __rcu **pnf,</div><div class='add'>+		    const fmode_t mode)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='add'>+</div><div class='add'>+	localio = nfs_open_local_fh(&amp;clp-&gt;cl_uuid, clp-&gt;cl_rpcclient,</div><div class='add'>+				    cred, fh, nfl, pnf, mode);</div><div class='add'>+	if (IS_ERR(localio)) {</div><div class='add'>+		status = PTR_ERR(localio);</div><div class='add'>+		switch (status) {</div><div class='add'>+		case -ENOMEM:</div><div class='add'>+		case -ENXIO:</div><div class='add'>+		case -ENOENT:</div><div class='add'>+			/* Revalidate localio */</div><div class='add'>+			nfs_localio_disable_client(clp);</div><div class='add'>+			nfs_local_probe(clp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	trace_nfs_local_open_fh(fh, mode, status);</div><div class='add'>+	return localio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_local_open_fh - open a local filehandle in terms of nfsd_file.</div><div class='add'>+ * First checking if the open nfsd_file is already cached, otherwise</div><div class='add'>+ * must __nfs_local_open_fh and insert the nfsd_file in nfs_file_localio.</div><div class='add'>+ *</div><div class='add'>+ * Returns a pointer to a struct nfsd_file or NULL.</div><div class='add'>+ */</div><div class='add'>+struct nfsd_file *</div><div class='add'>+nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,</div><div class='add'>+		  struct nfs_fh *fh, struct nfs_file_localio *nfl,</div><div class='add'>+		  const fmode_t mode)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_file *nf, __rcu **pnf;</div><div class='add'>+</div><div class='add'>+	if (!nfs_server_is_local(clp))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (mode &amp; ~(FMODE_READ | FMODE_WRITE))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (mode &amp; FMODE_WRITE)</div><div class='add'>+		pnf = &amp;nfl-&gt;rw_file;</div><div class='add'>+	else</div><div class='add'>+		pnf = &amp;nfl-&gt;ro_file;</div><div class='add'>+</div><div class='add'>+	nf = __nfs_local_open_fh(clp, cred, fh, nfl, pnf, mode);</div><div class='add'>+	if (IS_ERR(nf))</div><div class='add'>+		return NULL;</div><div class='add'>+	return nf;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_local_open_fh);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_iocb_free(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	kfree(iocb-&gt;bvec);</div><div class='add'>+	kfree(iocb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nfs_local_kiocb *</div><div class='add'>+nfs_local_iocb_alloc(struct nfs_pgio_header *hdr,</div><div class='add'>+		     struct file *file, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb;</div><div class='add'>+</div><div class='add'>+	iocb = kzalloc(sizeof(*iocb), flags);</div><div class='add'>+	if (iocb == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	iocb-&gt;bvec = kmalloc_array(hdr-&gt;page_array.npages,</div><div class='add'>+				   sizeof(struct bio_vec), flags);</div><div class='add'>+	if (iocb-&gt;bvec == NULL) {</div><div class='add'>+		kfree(iocb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_sync_kiocb(&amp;iocb-&gt;kiocb, file);</div><div class='add'>+</div><div class='add'>+	iocb-&gt;hdr = hdr;</div><div class='add'>+	iocb-&gt;kiocb.ki_pos = hdr-&gt;args.offset;</div><div class='add'>+	iocb-&gt;kiocb.ki_flags &amp;= ~IOCB_APPEND;</div><div class='add'>+	iocb-&gt;kiocb.ki_complete = NULL;</div><div class='add'>+	iocb-&gt;aio_complete_work = NULL;</div><div class='add'>+</div><div class='add'>+	iocb-&gt;end_iter_index = -1;</div><div class='add'>+</div><div class='add'>+	return iocb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+nfs_is_local_dio_possible(struct nfs_local_kiocb *iocb, int rw,</div><div class='add'>+			  size_t len, struct nfs_local_dio *local_dio)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+	loff_t offset = hdr-&gt;args.offset;</div><div class='add'>+	u32 nf_dio_mem_align, nf_dio_offset_align, nf_dio_read_offset_align;</div><div class='add'>+	loff_t start_end, orig_end, middle_end;</div><div class='add'>+</div><div class='add'>+	nfs_to-&gt;nfsd_file_dio_alignment(iocb-&gt;localio, &amp;nf_dio_mem_align,</div><div class='add'>+			&amp;nf_dio_offset_align, &amp;nf_dio_read_offset_align);</div><div class='add'>+	if (rw == ITER_DEST)</div><div class='add'>+		nf_dio_offset_align = nf_dio_read_offset_align;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!nf_dio_mem_align || !nf_dio_offset_align))</div><div class='add'>+		return false;</div><div class='add'>+	if (unlikely(nf_dio_offset_align &gt; PAGE_SIZE))</div><div class='add'>+		return false;</div><div class='add'>+	if (unlikely(len &lt; nf_dio_offset_align))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	local_dio-&gt;mem_align = nf_dio_mem_align;</div><div class='add'>+	local_dio-&gt;offset_align = nf_dio_offset_align;</div><div class='add'>+</div><div class='add'>+	start_end = round_up(offset, nf_dio_offset_align);</div><div class='add'>+	orig_end = offset + len;</div><div class='add'>+	middle_end = round_down(orig_end, nf_dio_offset_align);</div><div class='add'>+</div><div class='add'>+	local_dio-&gt;middle_offset = start_end;</div><div class='add'>+	local_dio-&gt;end_offset = middle_end;</div><div class='add'>+</div><div class='add'>+	local_dio-&gt;start_len = start_end - offset;</div><div class='add'>+	local_dio-&gt;middle_len = middle_end - start_end;</div><div class='add'>+	local_dio-&gt;end_len = orig_end - middle_end;</div><div class='add'>+</div><div class='add'>+	if (rw == ITER_DEST)</div><div class='add'>+		trace_nfs_local_dio_read(hdr-&gt;inode, offset, len, local_dio);</div><div class='add'>+	else</div><div class='add'>+		trace_nfs_local_dio_write(hdr-&gt;inode, offset, len, local_dio);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nfs_iov_iter_aligned_bvec(const struct iov_iter *i,</div><div class='add'>+		unsigned int addr_mask, unsigned int len_mask)</div><div class='add'>+{</div><div class='add'>+	const struct bio_vec *bvec = i-&gt;bvec;</div><div class='add'>+	size_t skip = i-&gt;iov_offset;</div><div class='add'>+	size_t size = i-&gt;count;</div><div class='add'>+</div><div class='add'>+	if (size &amp; len_mask)</div><div class='add'>+		return false;</div><div class='add'>+	do {</div><div class='add'>+		size_t len = bvec-&gt;bv_len;</div><div class='add'>+</div><div class='add'>+		if (len &gt; size)</div><div class='add'>+			len = size;</div><div class='add'>+		if ((unsigned long)(bvec-&gt;bv_offset + skip) &amp; addr_mask)</div><div class='add'>+			return false;</div><div class='add'>+		bvec++;</div><div class='add'>+		size -= len;</div><div class='add'>+		skip = 0;</div><div class='add'>+	} while (size);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_iter_setup(struct iov_iter *iter, int rw, struct bio_vec *bvec,</div><div class='add'>+		     unsigned int nvecs, unsigned long total,</div><div class='add'>+		     size_t start, size_t len)</div><div class='add'>+{</div><div class='add'>+	iov_iter_bvec(iter, rw, bvec, nvecs, total);</div><div class='add'>+	if (start)</div><div class='add'>+		iov_iter_advance(iter, start);</div><div class='add'>+	iov_iter_truncate(iter, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup as many as 3 iov_iter based on extents described by @local_dio.</div><div class='add'>+ * Returns the number of iov_iter that were setup.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+nfs_local_iters_setup_dio(struct nfs_local_kiocb *iocb, int rw,</div><div class='add'>+			  unsigned int nvecs, unsigned long total,</div><div class='add'>+			  struct nfs_local_dio *local_dio)</div><div class='add'>+{</div><div class='add'>+	int n_iters = 0;</div><div class='add'>+	struct iov_iter *iters = iocb-&gt;iters;</div><div class='add'>+</div><div class='add'>+	/* Setup misaligned start? */</div><div class='add'>+	if (local_dio-&gt;start_len) {</div><div class='add'>+		nfs_local_iter_setup(&amp;iters[n_iters], rw, iocb-&gt;bvec,</div><div class='add'>+				     nvecs, total, 0, local_dio-&gt;start_len);</div><div class='add'>+		++n_iters;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup DIO-aligned middle, if there is no misaligned end (below)</div><div class='add'>+	 * then AIO completion is used, see nfs_local_call_{read,write}</div><div class='add'>+	 */</div><div class='add'>+	nfs_local_iter_setup(&amp;iters[n_iters], rw, iocb-&gt;bvec, nvecs,</div><div class='add'>+			     total, local_dio-&gt;start_len, local_dio-&gt;middle_len);</div><div class='add'>+</div><div class='add'>+	iocb-&gt;iter_is_dio_aligned[n_iters] =</div><div class='add'>+		nfs_iov_iter_aligned_bvec(&amp;iters[n_iters],</div><div class='add'>+			local_dio-&gt;mem_align-1, local_dio-&gt;offset_align-1);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!iocb-&gt;iter_is_dio_aligned[n_iters])) {</div><div class='add'>+		trace_nfs_local_dio_misaligned(iocb-&gt;hdr-&gt;inode,</div><div class='add'>+			local_dio-&gt;start_len, local_dio-&gt;middle_len, local_dio);</div><div class='add'>+		return 0; /* no DIO-aligned IO possible */</div><div class='add'>+	}</div><div class='add'>+	iocb-&gt;end_iter_index = n_iters;</div><div class='add'>+	++n_iters;</div><div class='add'>+</div><div class='add'>+	/* Setup misaligned end? */</div><div class='add'>+	if (local_dio-&gt;end_len) {</div><div class='add'>+		nfs_local_iter_setup(&amp;iters[n_iters], rw, iocb-&gt;bvec,</div><div class='add'>+				     nvecs, total, local_dio-&gt;start_len +</div><div class='add'>+				     local_dio-&gt;middle_len, local_dio-&gt;end_len);</div><div class='add'>+		iocb-&gt;end_iter_index = n_iters;</div><div class='add'>+		++n_iters;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;iocb-&gt;n_iters, n_iters);</div><div class='add'>+	return n_iters;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack void</div><div class='add'>+nfs_local_iters_init(struct nfs_local_kiocb *iocb, int rw)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+	struct page **pagevec = hdr-&gt;page_array.pagevec;</div><div class='add'>+	unsigned long v, total;</div><div class='add'>+	unsigned int base;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	v = 0;</div><div class='add'>+	total = hdr-&gt;args.count;</div><div class='add'>+	base = hdr-&gt;args.pgbase;</div><div class='add'>+	while (total &amp;&amp; v &lt; hdr-&gt;page_array.npages) {</div><div class='add'>+		len = min_t(size_t, total, PAGE_SIZE - base);</div><div class='add'>+		bvec_set_page(&amp;iocb-&gt;bvec[v], *pagevec, len, base);</div><div class='add'>+		total -= len;</div><div class='add'>+		++pagevec;</div><div class='add'>+		++v;</div><div class='add'>+		base = 0;</div><div class='add'>+	}</div><div class='add'>+	len = hdr-&gt;args.count - total;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For each iocb, iocb-&gt;n_iters is always at least 1 and we always</div><div class='add'>+	 * end io after first nfs_local_pgio_done call unless misaligned DIO.</div><div class='add'>+	 */</div><div class='add'>+	atomic_set(&amp;iocb-&gt;n_iters, 1);</div><div class='add'>+</div><div class='add'>+	if (test_bit(NFS_IOHDR_ODIRECT, &amp;hdr-&gt;flags)) {</div><div class='add'>+		struct nfs_local_dio local_dio;</div><div class='add'>+</div><div class='add'>+		if (nfs_is_local_dio_possible(iocb, rw, len, &amp;local_dio) &amp;&amp;</div><div class='add'>+		    nfs_local_iters_setup_dio(iocb, rw, v, len, &amp;local_dio) != 0) {</div><div class='add'>+			/* Ensure DIO WRITE's IO on stable storage upon completion */</div><div class='add'>+			if (rw == ITER_SOURCE)</div><div class='add'>+				iocb-&gt;kiocb.ki_flags |= IOCB_DSYNC|IOCB_SYNC;</div><div class='add'>+			return; /* is DIO-aligned */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use buffered IO */</div><div class='add'>+	iov_iter_bvec(&amp;iocb-&gt;iters[0], rw, iocb-&gt;bvec, v, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_hdr_release(struct nfs_pgio_header *hdr,</div><div class='add'>+		const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	call_ops-&gt;rpc_call_done(&amp;hdr-&gt;task, hdr);</div><div class='add'>+	call_ops-&gt;rpc_release(hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_pgio_init(struct nfs_pgio_header *hdr,</div><div class='add'>+		const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;task.tk_ops = call_ops;</div><div class='add'>+	if (!hdr-&gt;task.tk_start)</div><div class='add'>+		hdr-&gt;task.tk_start = ktime_get();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+nfs_local_pgio_done(struct nfs_local_kiocb *iocb, long status, bool force)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+</div><div class='add'>+	/* Must handle partial completions */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		hdr-&gt;res.count += status;</div><div class='add'>+		/* @hdr was initialized to 0 (zeroed during allocation) */</div><div class='add'>+		if (hdr-&gt;task.tk_status == 0)</div><div class='add'>+			hdr-&gt;res.op_status = NFS4_OK;</div><div class='add'>+	} else {</div><div class='add'>+		hdr-&gt;res.op_status = nfs_localio_errno_to_nfs4_stat(status);</div><div class='add'>+		hdr-&gt;task.tk_status = status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (force)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	BUG_ON(atomic_read(&amp;iocb-&gt;n_iters) &lt;= 0);</div><div class='add'>+	return atomic_dec_and_test(&amp;iocb-&gt;n_iters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_iocb_release(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	nfs_local_file_put(iocb-&gt;localio);</div><div class='add'>+	nfs_local_iocb_free(iocb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_pgio_release(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+</div><div class='add'>+	nfs_local_iocb_release(iocb);</div><div class='add'>+	nfs_local_hdr_release(hdr, hdr-&gt;task.tk_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Complete the I/O from iocb-&gt;kiocb.ki_complete()</div><div class='add'>+ *</div><div class='add'>+ * Note that this function can be called from a bottom half context,</div><div class='add'>+ * hence we need to queue the rpc_call_done() etc to a workqueue</div><div class='add'>+ */</div><div class='add'>+static inline void nfs_local_pgio_aio_complete(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	INIT_WORK(&amp;iocb-&gt;work, iocb-&gt;aio_complete_work);</div><div class='add'>+	queue_work(nfsiod_workqueue, &amp;iocb-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_read_done(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+	struct file *filp = iocb-&gt;kiocb.ki_filp;</div><div class='add'>+	long status = hdr-&gt;task.tk_status;</div><div class='add'>+</div><div class='add'>+	if ((iocb-&gt;kiocb.ki_flags &amp; IOCB_DIRECT) &amp;&amp; status == -EINVAL) {</div><div class='add'>+		/* Underlying FS will return -EINVAL if misaligned DIO is attempted. */</div><div class='add'>+		pr_info_ratelimited("nfs: Unexpected direct I/O read alignment failure\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Must clear replen otherwise NFSv3 data corruption will occur</div><div class='add'>+	 * if/when switching from LOCALIO back to using normal RPC.</div><div class='add'>+	 */</div><div class='add'>+	hdr-&gt;res.replen = 0;</div><div class='add'>+</div><div class='add'>+	/* nfs_readpage_result() handles short read */</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;args.offset + hdr-&gt;res.count &gt;= i_size_read(file_inode(filp)))</div><div class='add'>+		hdr-&gt;res.eof = true;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: read %ld bytes eof %d.\n", __func__,</div><div class='add'>+			status &gt; 0 ? status : 0, hdr-&gt;res.eof);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nfs_local_read_iocb_done(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	nfs_local_read_done(iocb);</div><div class='add'>+	nfs_local_pgio_release(iocb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_read_aio_complete_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb =</div><div class='add'>+		container_of(work, struct nfs_local_kiocb, work);</div><div class='add'>+</div><div class='add'>+	nfs_local_read_iocb_done(iocb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_read_aio_complete(struct kiocb *kiocb, long ret)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb =</div><div class='add'>+		container_of(kiocb, struct nfs_local_kiocb, kiocb);</div><div class='add'>+</div><div class='add'>+	/* AIO completion of DIO read should always be last to complete */</div><div class='add'>+	if (unlikely(!nfs_local_pgio_done(iocb, ret, false)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nfs_local_pgio_aio_complete(iocb); /* Calls nfs_local_read_aio_complete_work */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_call_read(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb =</div><div class='add'>+		container_of(work, struct nfs_local_kiocb, work);</div><div class='add'>+	struct file *filp = iocb-&gt;kiocb.ki_filp;</div><div class='add'>+	bool force_done = false;</div><div class='add'>+	ssize_t status;</div><div class='add'>+	int n_iters;</div><div class='add'>+</div><div class='add'>+	n_iters = atomic_read(&amp;iocb-&gt;n_iters);</div><div class='add'>+	for (int i = 0; i &lt; n_iters ; i++) {</div><div class='add'>+		if (iocb-&gt;iter_is_dio_aligned[i]) {</div><div class='add'>+			iocb-&gt;kiocb.ki_flags |= IOCB_DIRECT;</div><div class='add'>+			/* Only use AIO completion if DIO-aligned segment is last */</div><div class='add'>+			if (i == iocb-&gt;end_iter_index) {</div><div class='add'>+				iocb-&gt;kiocb.ki_complete = nfs_local_read_aio_complete;</div><div class='add'>+				iocb-&gt;aio_complete_work = nfs_local_read_aio_complete_work;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			iocb-&gt;kiocb.ki_flags &amp;= ~IOCB_DIRECT;</div><div class='add'>+</div><div class='add'>+		scoped_with_creds(filp-&gt;f_cred)</div><div class='add'>+			status = filp-&gt;f_op-&gt;read_iter(&amp;iocb-&gt;kiocb, &amp;iocb-&gt;iters[i]);</div><div class='add'>+</div><div class='add'>+		if (status != -EIOCBQUEUED) {</div><div class='add'>+			if (unlikely(status &gt;= 0 &amp;&amp; status &lt; iocb-&gt;iters[i].count))</div><div class='add'>+				force_done = true; /* Partial read */</div><div class='add'>+			if (nfs_local_pgio_done(iocb, status, force_done)) {</div><div class='add'>+				nfs_local_read_iocb_done(iocb);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfs_local_do_read(struct nfs_local_kiocb *iocb,</div><div class='add'>+		  const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: vfs_read count=%u pos=%llu\n",</div><div class='add'>+		__func__, hdr-&gt;args.count, hdr-&gt;args.offset);</div><div class='add'>+</div><div class='add'>+	nfs_local_pgio_init(hdr, call_ops);</div><div class='add'>+	hdr-&gt;res.eof = false;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;iocb-&gt;work, nfs_local_call_read);</div><div class='add'>+	queue_work(nfslocaliod_workqueue, &amp;iocb-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_copy_boot_verifier(struct nfs_write_verifier *verifier, struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct nfs_client *clp = NFS_SERVER(inode)-&gt;nfs_client;</div><div class='add'>+	u32 *verf = (u32 *)verifier-&gt;data;</div><div class='add'>+	unsigned int seq;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		seq = read_seqbegin(&amp;clp-&gt;cl_boot_lock);</div><div class='add'>+		verf[0] = (u32)clp-&gt;cl_nfssvc_boot.tv_sec;</div><div class='add'>+		verf[1] = (u32)clp-&gt;cl_nfssvc_boot.tv_nsec;</div><div class='add'>+	} while (read_seqretry(&amp;clp-&gt;cl_boot_lock, seq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_reset_boot_verifier(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct nfs_client *clp = NFS_SERVER(inode)-&gt;nfs_client;</div><div class='add'>+</div><div class='add'>+	write_seqlock(&amp;clp-&gt;cl_boot_lock);</div><div class='add'>+	ktime_get_real_ts64(&amp;clp-&gt;cl_nfssvc_boot);</div><div class='add'>+	write_sequnlock(&amp;clp-&gt;cl_boot_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_set_local_verifier(struct inode *inode,</div><div class='add'>+		struct nfs_writeverf *verf,</div><div class='add'>+		enum nfs3_stable_how how)</div><div class='add'>+{</div><div class='add'>+	nfs_copy_boot_verifier(&amp;verf-&gt;verifier, inode);</div><div class='add'>+	verf-&gt;committed = how;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Factored out from fs/nfsd/vfs.h:fh_getattr() */</div><div class='add'>+static int __vfs_getattr(const struct path *p, struct kstat *stat, int version)</div><div class='add'>+{</div><div class='add'>+	u32 request_mask = STATX_BASIC_STATS;</div><div class='add'>+</div><div class='add'>+	if (version == 4)</div><div class='add'>+		request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE);</div><div class='add'>+	return vfs_getattr(p, stat, request_mask, AT_STATX_SYNC_AS_STAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Copied from fs/nfsd/nfsfh.c:nfsd4_change_attribute() */</div><div class='add'>+static u64 __nfsd4_change_attribute(const struct kstat *stat,</div><div class='add'>+				    const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	u64 chattr;</div><div class='add'>+</div><div class='add'>+	if (stat-&gt;result_mask &amp; STATX_CHANGE_COOKIE) {</div><div class='add'>+		chattr = stat-&gt;change_cookie;</div><div class='add'>+		if (S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='add'>+		    !(stat-&gt;attributes &amp; STATX_ATTR_CHANGE_MONOTONIC)) {</div><div class='add'>+			chattr += (u64)stat-&gt;ctime.tv_sec &lt;&lt; 30;</div><div class='add'>+			chattr += stat-&gt;ctime.tv_nsec;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		chattr = time_to_chattr(&amp;stat-&gt;ctime);</div><div class='add'>+	}</div><div class='add'>+	return chattr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_vfs_getattr(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	struct kstat stat;</div><div class='add'>+	struct file *filp = iocb-&gt;kiocb.ki_filp;</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+	struct nfs_fattr *fattr = hdr-&gt;res.fattr;</div><div class='add'>+	int version = NFS_PROTO(hdr-&gt;inode)-&gt;version;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!fattr) || __vfs_getattr(&amp;filp-&gt;f_path, &amp;stat, version))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fattr-&gt;valid = (NFS_ATTR_FATTR_FILEID |</div><div class='add'>+			NFS_ATTR_FATTR_CHANGE |</div><div class='add'>+			NFS_ATTR_FATTR_SIZE |</div><div class='add'>+			NFS_ATTR_FATTR_ATIME |</div><div class='add'>+			NFS_ATTR_FATTR_MTIME |</div><div class='add'>+			NFS_ATTR_FATTR_CTIME |</div><div class='add'>+			NFS_ATTR_FATTR_SPACE_USED);</div><div class='add'>+</div><div class='add'>+	fattr-&gt;fileid = stat.ino;</div><div class='add'>+	fattr-&gt;size = stat.size;</div><div class='add'>+	fattr-&gt;atime = stat.atime;</div><div class='add'>+	fattr-&gt;mtime = stat.mtime;</div><div class='add'>+	fattr-&gt;ctime = stat.ctime;</div><div class='add'>+	if (version == 4) {</div><div class='add'>+		fattr-&gt;change_attr =</div><div class='add'>+			__nfsd4_change_attribute(&amp;stat, file_inode(filp));</div><div class='add'>+	} else</div><div class='add'>+		fattr-&gt;change_attr = nfs_timespec_to_change_attr(&amp;fattr-&gt;ctime);</div><div class='add'>+	fattr-&gt;du.nfs3.used = stat.blocks &lt;&lt; 9;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_write_done(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+	long status = hdr-&gt;task.tk_status;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: wrote %ld bytes.\n", __func__, status &gt; 0 ? status : 0);</div><div class='add'>+</div><div class='add'>+	if ((iocb-&gt;kiocb.ki_flags &amp; IOCB_DIRECT) &amp;&amp; status == -EINVAL) {</div><div class='add'>+		/* Underlying FS will return -EINVAL if misaligned DIO is attempted. */</div><div class='add'>+		pr_info_ratelimited("nfs: Unexpected direct I/O write alignment failure\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle short writes as if they are ENOSPC */</div><div class='add'>+	status = hdr-&gt;res.count;</div><div class='add'>+	if (status &gt; 0 &amp;&amp; status &lt; hdr-&gt;args.count) {</div><div class='add'>+		hdr-&gt;mds_offset += status;</div><div class='add'>+		hdr-&gt;args.offset += status;</div><div class='add'>+		hdr-&gt;args.pgbase += status;</div><div class='add'>+		hdr-&gt;args.count -= status;</div><div class='add'>+		nfs_set_pgio_error(hdr, -ENOSPC, hdr-&gt;args.offset);</div><div class='add'>+		status = -ENOSPC;</div><div class='add'>+		/* record -ENOSPC in terms of nfs_local_pgio_done */</div><div class='add'>+		(void) nfs_local_pgio_done(iocb, status, true);</div><div class='add'>+	}</div><div class='add'>+	if (hdr-&gt;task.tk_status &lt; 0)</div><div class='add'>+		nfs_reset_boot_verifier(hdr-&gt;inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nfs_local_write_iocb_done(struct nfs_local_kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	nfs_local_write_done(iocb);</div><div class='add'>+	nfs_local_vfs_getattr(iocb);</div><div class='add'>+	nfs_local_pgio_release(iocb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_write_aio_complete_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb =</div><div class='add'>+		container_of(work, struct nfs_local_kiocb, work);</div><div class='add'>+</div><div class='add'>+	nfs_local_write_iocb_done(iocb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_write_aio_complete(struct kiocb *kiocb, long ret)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb =</div><div class='add'>+		container_of(kiocb, struct nfs_local_kiocb, kiocb);</div><div class='add'>+</div><div class='add'>+	/* AIO completion of DIO write should always be last to complete */</div><div class='add'>+	if (unlikely(!nfs_local_pgio_done(iocb, ret, false)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nfs_local_pgio_aio_complete(iocb); /* Calls nfs_local_write_aio_complete_work */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_local_call_write(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb =</div><div class='add'>+		container_of(work, struct nfs_local_kiocb, work);</div><div class='add'>+	struct file *filp = iocb-&gt;kiocb.ki_filp;</div><div class='add'>+	unsigned long old_flags = current-&gt;flags;</div><div class='add'>+	bool force_done = false;</div><div class='add'>+	ssize_t status;</div><div class='add'>+	int n_iters;</div><div class='add'>+</div><div class='add'>+	current-&gt;flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO;</div><div class='add'>+</div><div class='add'>+	file_start_write(filp);</div><div class='add'>+	n_iters = atomic_read(&amp;iocb-&gt;n_iters);</div><div class='add'>+	for (int i = 0; i &lt; n_iters ; i++) {</div><div class='add'>+		if (iocb-&gt;iter_is_dio_aligned[i]) {</div><div class='add'>+			iocb-&gt;kiocb.ki_flags |= IOCB_DIRECT;</div><div class='add'>+			/* Only use AIO completion if DIO-aligned segment is last */</div><div class='add'>+			if (i == iocb-&gt;end_iter_index) {</div><div class='add'>+				iocb-&gt;kiocb.ki_complete = nfs_local_write_aio_complete;</div><div class='add'>+				iocb-&gt;aio_complete_work = nfs_local_write_aio_complete_work;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			iocb-&gt;kiocb.ki_flags &amp;= ~IOCB_DIRECT;</div><div class='add'>+</div><div class='add'>+		scoped_with_creds(filp-&gt;f_cred)</div><div class='add'>+			status = filp-&gt;f_op-&gt;write_iter(&amp;iocb-&gt;kiocb, &amp;iocb-&gt;iters[i]);</div><div class='add'>+</div><div class='add'>+		if (status != -EIOCBQUEUED) {</div><div class='add'>+			if (unlikely(status &gt;= 0 &amp;&amp; status &lt; iocb-&gt;iters[i].count))</div><div class='add'>+				force_done = true; /* Partial write */</div><div class='add'>+			if (nfs_local_pgio_done(iocb, status, force_done)) {</div><div class='add'>+				nfs_local_write_iocb_done(iocb);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	file_end_write(filp);</div><div class='add'>+</div><div class='add'>+	current-&gt;flags = old_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfs_local_do_write(struct nfs_local_kiocb *iocb,</div><div class='add'>+		   const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	struct nfs_pgio_header *hdr = iocb-&gt;hdr;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: vfs_write count=%u pos=%llu %s\n",</div><div class='add'>+		__func__, hdr-&gt;args.count, hdr-&gt;args.offset,</div><div class='add'>+		(hdr-&gt;args.stable == NFS_UNSTABLE) ?  "unstable" : "stable");</div><div class='add'>+</div><div class='add'>+	switch (hdr-&gt;args.stable) {</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	case NFS_DATA_SYNC:</div><div class='add'>+		iocb-&gt;kiocb.ki_flags |= IOCB_DSYNC;</div><div class='add'>+		break;</div><div class='add'>+	case NFS_FILE_SYNC:</div><div class='add'>+		iocb-&gt;kiocb.ki_flags |= IOCB_DSYNC|IOCB_SYNC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nfs_local_pgio_init(hdr, call_ops);</div><div class='add'>+</div><div class='add'>+	nfs_set_local_verifier(hdr-&gt;inode, hdr-&gt;res.verf, hdr-&gt;args.stable);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;iocb-&gt;work, nfs_local_call_write);</div><div class='add'>+	queue_work(nfslocaliod_workqueue, &amp;iocb-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nfs_local_kiocb *</div><div class='add'>+nfs_local_iocb_init(struct nfs_pgio_header *hdr, struct nfsd_file *localio)</div><div class='add'>+{</div><div class='add'>+	struct file *file = nfs_to-&gt;nfsd_file_file(localio);</div><div class='add'>+	struct nfs_local_kiocb *iocb;</div><div class='add'>+	gfp_t gfp_mask;</div><div class='add'>+	int rw;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;rw_mode &amp; FMODE_READ) {</div><div class='add'>+		if (!file-&gt;f_op-&gt;read_iter)</div><div class='add'>+			return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+		gfp_mask = GFP_KERNEL;</div><div class='add'>+		rw = ITER_DEST;</div><div class='add'>+	} else {</div><div class='add'>+		if (!file-&gt;f_op-&gt;write_iter)</div><div class='add'>+			return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+		gfp_mask = GFP_NOIO;</div><div class='add'>+		rw = ITER_SOURCE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iocb = nfs_local_iocb_alloc(hdr, file, gfp_mask);</div><div class='add'>+	if (iocb == NULL)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	iocb-&gt;hdr = hdr;</div><div class='add'>+	iocb-&gt;localio = localio;</div><div class='add'>+</div><div class='add'>+	nfs_local_iters_init(iocb, rw);</div><div class='add'>+</div><div class='add'>+	return iocb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfs_local_doio(struct nfs_client *clp, struct nfsd_file *localio,</div><div class='add'>+		   struct nfs_pgio_header *hdr,</div><div class='add'>+		   const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_kiocb *iocb;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	if (!hdr-&gt;args.count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	iocb = nfs_local_iocb_init(hdr, localio);</div><div class='add'>+	if (IS_ERR(iocb))</div><div class='add'>+		return PTR_ERR(iocb);</div><div class='add'>+</div><div class='add'>+	switch (hdr-&gt;rw_mode) {</div><div class='add'>+	case FMODE_READ:</div><div class='add'>+		status = nfs_local_do_read(iocb, call_ops);</div><div class='add'>+		break;</div><div class='add'>+	case FMODE_WRITE:</div><div class='add'>+		status = nfs_local_do_write(iocb, call_ops);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dprintk("%s: invalid mode: %d\n", __func__,</div><div class='add'>+			hdr-&gt;rw_mode);</div><div class='add'>+		status = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		if (status == -EAGAIN)</div><div class='add'>+			nfs_localio_disable_client(clp);</div><div class='add'>+		nfs_local_iocb_release(iocb);</div><div class='add'>+		hdr-&gt;task.tk_status = status;</div><div class='add'>+		nfs_local_hdr_release(hdr, call_ops);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_init_commit(struct nfs_commit_data *data,</div><div class='add'>+		const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	data-&gt;task.tk_ops = call_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfs_local_run_commit(struct file *filp, struct nfs_commit_data *data)</div><div class='add'>+{</div><div class='add'>+	loff_t start = data-&gt;args.offset;</div><div class='add'>+	loff_t end = LLONG_MAX;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;args.count &gt; 0) {</div><div class='add'>+		end = start + data-&gt;args.count - 1;</div><div class='add'>+		if (end &lt; start)</div><div class='add'>+			end = LLONG_MAX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk("%s: commit %llu - %llu\n", __func__, start, end);</div><div class='add'>+	return vfs_fsync_range(filp, start, end, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_commit_done(struct nfs_commit_data *data, int status)</div><div class='add'>+{</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		nfs_set_local_verifier(data-&gt;inode,</div><div class='add'>+				data-&gt;res.verf,</div><div class='add'>+				NFS_FILE_SYNC);</div><div class='add'>+		data-&gt;res.op_status = NFS4_OK;</div><div class='add'>+		data-&gt;task.tk_status = 0;</div><div class='add'>+	} else {</div><div class='add'>+		nfs_reset_boot_verifier(data-&gt;inode);</div><div class='add'>+		data-&gt;res.op_status = nfs_localio_errno_to_nfs4_stat(status);</div><div class='add'>+		data-&gt;task.tk_status = status;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_release_commit_data(struct nfsd_file *localio,</div><div class='add'>+		struct nfs_commit_data *data,</div><div class='add'>+		const struct rpc_call_ops *call_ops)</div><div class='add'>+{</div><div class='add'>+	nfs_local_file_put(localio);</div><div class='add'>+	call_ops-&gt;rpc_call_done(&amp;data-&gt;task, data);</div><div class='add'>+	call_ops-&gt;rpc_release(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_fsync_ctx_free(struct nfs_local_fsync_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	nfs_local_release_commit_data(ctx-&gt;localio, ctx-&gt;data,</div><div class='add'>+				      ctx-&gt;data-&gt;task.tk_ops);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfs_local_fsync_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_fsync_ctx *ctx;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	ctx = container_of(work, struct nfs_local_fsync_ctx, work);</div><div class='add'>+</div><div class='add'>+	status = nfs_local_run_commit(nfs_to-&gt;nfsd_file_file(ctx-&gt;localio),</div><div class='add'>+				      ctx-&gt;data);</div><div class='add'>+	nfs_local_commit_done(ctx-&gt;data, status);</div><div class='add'>+	if (ctx-&gt;done != NULL)</div><div class='add'>+		complete(ctx-&gt;done);</div><div class='add'>+	nfs_local_fsync_ctx_free(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nfs_local_fsync_ctx *</div><div class='add'>+nfs_local_fsync_ctx_alloc(struct nfs_commit_data *data,</div><div class='add'>+			  struct nfsd_file *localio, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_fsync_ctx *ctx = kmalloc(sizeof(*ctx), flags);</div><div class='add'>+</div><div class='add'>+	if (ctx != NULL) {</div><div class='add'>+		ctx-&gt;localio = localio;</div><div class='add'>+		ctx-&gt;data = data;</div><div class='add'>+		INIT_WORK(&amp;ctx-&gt;work, nfs_local_fsync_work);</div><div class='add'>+		ctx-&gt;done = NULL;</div><div class='add'>+	}</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nfs_local_commit(struct nfsd_file *localio,</div><div class='add'>+		     struct nfs_commit_data *data,</div><div class='add'>+		     const struct rpc_call_ops *call_ops, int how)</div><div class='add'>+{</div><div class='add'>+	struct nfs_local_fsync_ctx *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = nfs_local_fsync_ctx_alloc(data, localio, GFP_KERNEL);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		nfs_local_commit_done(data, -ENOMEM);</div><div class='add'>+		nfs_local_release_commit_data(localio, data, call_ops);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nfs_local_init_commit(data, call_ops);</div><div class='add'>+</div><div class='add'>+	if (how &amp; FLUSH_SYNC) {</div><div class='add'>+		DECLARE_COMPLETION_ONSTACK(done);</div><div class='add'>+		ctx-&gt;done = &amp;done;</div><div class='add'>+		queue_work(nfsiod_workqueue, &amp;ctx-&gt;work);</div><div class='add'>+		wait_for_completion(&amp;done);</div><div class='add'>+	} else</div><div class='add'>+		queue_work(nfsiod_workqueue, &amp;ctx-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c<br/>index 68e76b626371..db8dfb920394 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/mount_clnt.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/mount_clnt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/mount_clnt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/mount_clnt.c</a></div><div class='hunk'>@@ -128,11 +128,6 @@ struct mountres {</div><div class='ctx'> 	rpc_authflavor_t *auth_flavors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mnt_fhstatus {</div><div class='del'>-	u32 status;</div><div class='del'>-	struct nfs_fh *fh;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nfs_mount - Obtain an NFS file handle for the given host and path</div><div class='ctx'>  * @info: pointer to mount request arguments</div><div class='hunk'>@@ -228,74 +223,6 @@ out_mnt_err:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * nfs_umount - Notify a server that we have unmounted this export</div><div class='del'>- * @info: pointer to umount request arguments</div><div class='del'>- *</div><div class='del'>- * MOUNTPROC_UMNT is advisory, so we set a short timeout, and always</div><div class='del'>- * use UDP.</div><div class='del'>- */</div><div class='del'>-void nfs_umount(const struct nfs_mount_request *info)</div><div class='del'>-{</div><div class='del'>-	static const struct rpc_timeout nfs_umnt_timeout = {</div><div class='del'>-		.to_initval = 1 * HZ,</div><div class='del'>-		.to_maxval = 3 * HZ,</div><div class='del'>-		.to_retries = 2,</div><div class='del'>-	};</div><div class='del'>-	struct rpc_create_args args = {</div><div class='del'>-		.net		= info-&gt;net,</div><div class='del'>-		.protocol	= IPPROTO_UDP,</div><div class='del'>-		.address	= (struct sockaddr *)info-&gt;sap,</div><div class='del'>-		.addrsize	= info-&gt;salen,</div><div class='del'>-		.timeout	= &amp;nfs_umnt_timeout,</div><div class='del'>-		.servername	= info-&gt;hostname,</div><div class='del'>-		.program	= &amp;mnt_program,</div><div class='del'>-		.version	= info-&gt;version,</div><div class='del'>-		.authflavor	= RPC_AUTH_UNIX,</div><div class='del'>-		.flags		= RPC_CLNT_CREATE_NOPING,</div><div class='del'>-		.cred		= current_cred(),</div><div class='del'>-	};</div><div class='del'>-	struct rpc_message msg	= {</div><div class='del'>-		.rpc_argp	= info-&gt;dirpath,</div><div class='del'>-	};</div><div class='del'>-	struct rpc_clnt *clnt;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	if (strlen(info-&gt;dirpath) &gt; MNTPATHLEN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;noresvport)</div><div class='del'>-		args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;</div><div class='del'>-</div><div class='del'>-	clnt = rpc_create(&amp;args);</div><div class='del'>-	if (IS_ERR(clnt))</div><div class='del'>-		goto out_clnt_err;</div><div class='del'>-</div><div class='del'>-	dprintk("NFS: sending UMNT request for %s:%s\n",</div><div class='del'>-		(info-&gt;hostname ? info-&gt;hostname : "server"), info-&gt;dirpath);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;version == NFS_MNT3_VERSION)</div><div class='del'>-		msg.rpc_proc = &amp;clnt-&gt;cl_procinfo[MOUNTPROC3_UMNT];</div><div class='del'>-	else</div><div class='del'>-		msg.rpc_proc = &amp;clnt-&gt;cl_procinfo[MOUNTPROC_UMNT];</div><div class='del'>-</div><div class='del'>-	status = rpc_call_sync(clnt, &amp;msg, 0);</div><div class='del'>-	rpc_shutdown_client(clnt);</div><div class='del'>-</div><div class='del'>-	if (unlikely(status &lt; 0))</div><div class='del'>-		goto out_call_err;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-out_clnt_err:</div><div class='del'>-	dprintk("NFS: failed to create UMNT RPC client, status=%ld\n",</div><div class='del'>-			PTR_ERR(clnt));</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-out_call_err:</div><div class='del'>-	dprintk("NFS: UMNT request failed, status=%d\n", status);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * XDR encode/decode functions for MOUNT</div><div class='ctx'>  */</div><div class='head'>diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c<br/>index e7494cdd957e..5a4d193da1a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/namespace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/namespace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/namespace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/namespace.c</a></div><div class='hunk'>@@ -182,7 +182,7 @@ struct vfsmount *nfs_d_automount(struct path *path)</div><div class='ctx'> 	ctx-&gt;version		= client-&gt;rpc_ops-&gt;version;</div><div class='ctx'> 	ctx-&gt;minorversion	= client-&gt;cl_minorversion;</div><div class='ctx'> 	ctx-&gt;nfs_mod		= client-&gt;cl_nfs_mod;</div><div class='del'>-	__module_get(ctx-&gt;nfs_mod-&gt;owner);</div><div class='add'>+	get_nfs_version(ctx-&gt;nfs_mod);</div><div class='ctx'> </div><div class='ctx'> 	ret = client-&gt;rpc_ops-&gt;submount(fc, server);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -195,7 +195,6 @@ struct vfsmount *nfs_d_automount(struct path *path)</div><div class='ctx'> 	if (IS_ERR(mnt))</div><div class='ctx'> 		goto out_fc;</div><div class='ctx'> </div><div class='del'>-	mntget(mnt); /* prevent immediate expiration */</div><div class='ctx'> 	if (timeout &lt;= 0)</div><div class='ctx'> 		goto out_fc;</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +290,8 @@ int nfs_do_submount(struct fs_context *fc)</div><div class='ctx'> 		nfs_errorf(fc, "NFS: Couldn't determine submount pathname");</div><div class='ctx'> 		ret = PTR_ERR(p);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = vfs_parse_fs_string(fc, "source", p, buffer + 4096 - p);</div><div class='add'>+		ret = vfs_parse_fs_qstr(fc, "source",</div><div class='add'>+					&amp;QSTR_LEN(p, buffer + 4096 - p));</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = vfs_get_tree(fc);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -308,7 +308,7 @@ int nfs_submount(struct fs_context *fc, struct nfs_server *server)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Look it up again to get its attributes */</div><div class='del'>-	err = server-&gt;nfs_client-&gt;rpc_ops-&gt;lookup(d_inode(parent), dentry,</div><div class='add'>+	err = server-&gt;nfs_client-&gt;rpc_ops-&gt;lookup(d_inode(parent), dentry, &amp;dentry-&gt;d_name,</div><div class='ctx'> 						  ctx-&gt;mntfh, ctx-&gt;clone_data.fattr);</div><div class='ctx'> 	dput(parent);</div><div class='ctx'> 	if (err != 0)</div><div class='hunk'>@@ -336,7 +336,7 @@ static int param_set_nfs_timeout(const char *val, const struct kernel_param *kp)</div><div class='ctx'> 			num *= HZ;</div><div class='ctx'> 		*((int *)kp-&gt;arg) = num;</div><div class='ctx'> 		if (!list_empty(&amp;nfs_automount_list))</div><div class='del'>-			mod_delayed_work(system_wq, &amp;nfs_automount_task, num);</div><div class='add'>+			mod_delayed_work(system_percpu_wq, &amp;nfs_automount_task, num);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*((int *)kp-&gt;arg) = -1*HZ;</div><div class='ctx'> 		cancel_delayed_work(&amp;nfs_automount_task);</div><div class='head'>diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h<br/>index c8374f74dce1..6ba3ea39e928 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/netns.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/netns.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/netns.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/netns.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/nfs4.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/stats.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct bl_dev_msg {</div><div class='ctx'> 	int32_t status;</div><div class='hunk'>@@ -30,10 +31,15 @@ struct nfs_net {</div><div class='ctx'> 	unsigned short nfs_callback_tcpport;</div><div class='ctx'> 	unsigned short nfs_callback_tcpport6;</div><div class='ctx'> 	int cb_users[NFS4_MAX_MINOR_VERSION + 1];</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_NFS_V4 */</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_V4_1)</div><div class='add'>+	struct list_head nfs4_data_server_cache;</div><div class='add'>+	spinlock_t nfs4_data_server_lock;</div><div class='add'>+#endif /* CONFIG_NFS_V4_1 */</div><div class='ctx'> 	struct nfs_netns_client *nfs_client;</div><div class='ctx'> 	spinlock_t nfs_client_lock;</div><div class='ctx'> 	ktime_t boot_time;</div><div class='add'>+	struct rpc_stat rpcstats;</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> 	struct proc_dir_entry *proc_nfsfs;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/nfs/nfs.h b/fs/nfs/nfs.h<br/>index 0d3ce0460e35..8a5f51be013a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs.h</a></div><div class='hunk'>@@ -19,10 +19,10 @@ struct nfs_subversion {</div><div class='ctx'> 	const struct nfs_rpc_ops *rpc_ops;	/* NFS operations */</div><div class='ctx'> 	const struct super_operations *sops;	/* NFS Super operations */</div><div class='ctx'> 	const struct xattr_handler * const *xattr;	/* NFS xattr handlers */</div><div class='del'>-	struct list_head list;		/* List of NFS versions */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct nfs_subversion *get_nfs_version(unsigned int);</div><div class='add'>+struct nfs_subversion *find_nfs_version(unsigned int);</div><div class='add'>+int get_nfs_version(struct nfs_subversion *);</div><div class='ctx'> void put_nfs_version(struct nfs_subversion *);</div><div class='ctx'> void register_nfs_version(struct nfs_subversion *);</div><div class='ctx'> void unregister_nfs_version(struct nfs_subversion *);</div><div class='head'>diff --git a/fs/nfs/nfs2super.c b/fs/nfs/nfs2super.c<br/>index 467f21ee6a35..b1badc70bd71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs2super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs2super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs2super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs2super.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@ static void __exit exit_nfs_v2(void)</div><div class='ctx'> 	unregister_nfs_version(&amp;nfs_v2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NFSv2 client support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(init_nfs_v2);</div><div class='head'>diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c<br/>index c19093814296..9eff09158518 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs2xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs2xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs2xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs2xdr.c</a></div><div class='hunk'>@@ -22,14 +22,12 @@</div><div class='ctx'> #include &lt;linux/nfs.h&gt;</div><div class='ctx'> #include &lt;linux/nfs2.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='del'>-#include "nfstrace.h"</div><div class='add'>+#include &lt;linux/nfs_common.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='add'>+#include "nfstrace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_XDR</div><div class='ctx'> </div><div class='del'>-/* Mapping from NFS error code to "errno" error code. */</div><div class='del'>-#define errno_NFSERR_IO		EIO</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Declare the space requirements for NFS arguments and replies as</div><div class='ctx'>  * number of 32bit-words</div><div class='hunk'>@@ -64,8 +62,6 @@</div><div class='ctx'> #define NFS_readdirres_sz	(1+NFS_pagepad_sz)</div><div class='ctx'> #define NFS_statfsres_sz	(1+NFS_info_sz)</div><div class='ctx'> </div><div class='del'>-static int nfs_stat_to_errno(enum nfs_stat);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Encode/decode NFSv2 basic data types</div><div class='ctx'>  *</div><div class='hunk'>@@ -1054,70 +1050,6 @@ out_default:</div><div class='ctx'> 	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We need to translate between nfs status return values and</div><div class='del'>- * the local errno values which may not be the same.</div><div class='del'>- */</div><div class='del'>-static const struct {</div><div class='del'>-	int stat;</div><div class='del'>-	int errno;</div><div class='del'>-} nfs_errtbl[] = {</div><div class='del'>-	{ NFS_OK,		0		},</div><div class='del'>-	{ NFSERR_PERM,		-EPERM		},</div><div class='del'>-	{ NFSERR_NOENT,		-ENOENT		},</div><div class='del'>-	{ NFSERR_IO,		-errno_NFSERR_IO},</div><div class='del'>-	{ NFSERR_NXIO,		-ENXIO		},</div><div class='del'>-/*	{ NFSERR_EAGAIN,	-EAGAIN		}, */</div><div class='del'>-	{ NFSERR_ACCES,		-EACCES		},</div><div class='del'>-	{ NFSERR_EXIST,		-EEXIST		},</div><div class='del'>-	{ NFSERR_XDEV,		-EXDEV		},</div><div class='del'>-	{ NFSERR_NODEV,		-ENODEV		},</div><div class='del'>-	{ NFSERR_NOTDIR,	-ENOTDIR	},</div><div class='del'>-	{ NFSERR_ISDIR,		-EISDIR		},</div><div class='del'>-	{ NFSERR_INVAL,		-EINVAL		},</div><div class='del'>-	{ NFSERR_FBIG,		-EFBIG		},</div><div class='del'>-	{ NFSERR_NOSPC,		-ENOSPC		},</div><div class='del'>-	{ NFSERR_ROFS,		-EROFS		},</div><div class='del'>-	{ NFSERR_MLINK,		-EMLINK		},</div><div class='del'>-	{ NFSERR_NAMETOOLONG,	-ENAMETOOLONG	},</div><div class='del'>-	{ NFSERR_NOTEMPTY,	-ENOTEMPTY	},</div><div class='del'>-	{ NFSERR_DQUOT,		-EDQUOT		},</div><div class='del'>-	{ NFSERR_STALE,		-ESTALE		},</div><div class='del'>-	{ NFSERR_REMOTE,	-EREMOTE	},</div><div class='del'>-#ifdef EWFLUSH</div><div class='del'>-	{ NFSERR_WFLUSH,	-EWFLUSH	},</div><div class='del'>-#endif</div><div class='del'>-	{ NFSERR_BADHANDLE,	-EBADHANDLE	},</div><div class='del'>-	{ NFSERR_NOT_SYNC,	-ENOTSYNC	},</div><div class='del'>-	{ NFSERR_BAD_COOKIE,	-EBADCOOKIE	},</div><div class='del'>-	{ NFSERR_NOTSUPP,	-ENOTSUPP	},</div><div class='del'>-	{ NFSERR_TOOSMALL,	-ETOOSMALL	},</div><div class='del'>-	{ NFSERR_SERVERFAULT,	-EREMOTEIO	},</div><div class='del'>-	{ NFSERR_BADTYPE,	-EBADTYPE	},</div><div class='del'>-	{ NFSERR_JUKEBOX,	-EJUKEBOX	},</div><div class='del'>-	{ -1,			-EIO		}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nfs_stat_to_errno - convert an NFS status code to a local errno</div><div class='del'>- * @status: NFS status code to convert</div><div class='del'>- *</div><div class='del'>- * Returns a local errno value, or -EIO if the NFS status code is</div><div class='del'>- * not recognized.  This function is used jointly by NFSv2 and NFSv3.</div><div class='del'>- */</div><div class='del'>-static int nfs_stat_to_errno(enum nfs_stat status)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; nfs_errtbl[i].stat != -1; i++) {</div><div class='del'>-		if (nfs_errtbl[i].stat == (int)status)</div><div class='del'>-			return nfs_errtbl[i].errno;</div><div class='del'>-	}</div><div class='del'>-	dprintk("NFS: Unrecognized nfs status value: %u\n", status);</div><div class='del'>-	return nfs_errtbl[i].errno;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define PROC(proc, argtype, restype, timer)				\</div><div class='ctx'> [NFSPROC_##proc] = {							\</div><div class='ctx'> 	.p_proc	    =  NFSPROC_##proc,					\</div><div class='head'>diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c<br/>index 18d8f6529f61..a126eb31f62f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs3acl.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ struct posix_acl *nfs3_get_acl(struct inode *inode, int type, bool rcu)</div><div class='ctx'> </div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			status = nfs_refresh_inode(inode, res.fattr);</div><div class='add'>+			nfs_refresh_inode(inode, res.fattr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EPFNOSUPPORT:</div><div class='ctx'> 		case -EPROTONOSUPPORT:</div><div class='head'>diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c<br/>index 674c012868b1..5d97c1d38bb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3client.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs3client.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_mount.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/addr.h&gt;</div><div class='add'>+#include &lt;net/handshake.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "nfs3_fs.h"</div><div class='ctx'> #include "netns.h"</div><div class='hunk'>@@ -98,7 +99,11 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,</div><div class='ctx'> 		.net = mds_clp-&gt;cl_net,</div><div class='ctx'> 		.timeparms = &amp;ds_timeout,</div><div class='ctx'> 		.cred = mds_srv-&gt;cred,</div><div class='del'>-		.xprtsec = mds_clp-&gt;cl_xprtsec,</div><div class='add'>+		.xprtsec = {</div><div class='add'>+			.policy = RPC_XPRTSEC_NONE,</div><div class='add'>+			.cert_serial = TLS_NO_CERT,</div><div class='add'>+			.privkey_serial = TLS_NO_PRIVKEY,</div><div class='add'>+		},</div><div class='ctx'> 		.connect_timeout = connect_timeout,</div><div class='ctx'> 		.reconnect_timeout = connect_timeout,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -111,14 +116,22 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,</div><div class='ctx'> 	cl_init.hostname = buf;</div><div class='ctx'> </div><div class='ctx'> 	switch (ds_proto) {</div><div class='del'>-	case XPRT_TRANSPORT_TCP:</div><div class='ctx'> 	case XPRT_TRANSPORT_TCP_TLS:</div><div class='add'>+		if (mds_clp-&gt;cl_xprtsec.policy != RPC_XPRTSEC_NONE)</div><div class='add'>+			cl_init.xprtsec = mds_clp-&gt;cl_xprtsec;</div><div class='add'>+		else</div><div class='add'>+			ds_proto = XPRT_TRANSPORT_TCP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XPRT_TRANSPORT_RDMA:</div><div class='add'>+	case XPRT_TRANSPORT_TCP:</div><div class='ctx'> 		if (mds_clp-&gt;cl_nconnect &gt; 1)</div><div class='ctx'> 			cl_init.nconnect = mds_clp-&gt;cl_nconnect;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mds_srv-&gt;flags &amp; NFS_MOUNT_NORESVPORT)</div><div class='ctx'> 		__set_bit(NFS_CS_NORESVPORT, &amp;cl_init.init_flags);</div><div class='add'>+	if (test_bit(NFS_CS_NETUNREACH_FATAL, &amp;mds_clp-&gt;cl_flags))</div><div class='add'>+		__set_bit(NFS_CS_NETUNREACH_FATAL, &amp;cl_init.init_flags);</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(NFS_CS_DS, &amp;cl_init.init_flags);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c<br/>index 2de66e4e8280..a4cb67573aa7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs3proc.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ nfs3_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)</div><div class='ctx'> 		__set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);</div><div class='ctx'> 		schedule_timeout(NFS_JUKEBOX_RETRY_TIME);</div><div class='ctx'> 		res = -ERESTARTSYS;</div><div class='del'>-	} while (!fatal_signal_pending(current));</div><div class='add'>+	} while (!fatal_signal_pending(current) &amp;&amp; !nfs_current_task_exiting());</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +192,7 @@ __nfs3_proc_lookup(struct inode *dir, const char *name, size_t len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfs3_proc_lookup(struct inode *dir, struct dentry *dentry,</div><div class='add'>+nfs3_proc_lookup(struct inode *dir, struct dentry *dentry, const struct qstr *name,</div><div class='ctx'> 		 struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short task_flags = 0;</div><div class='hunk'>@@ -202,8 +202,7 @@ nfs3_proc_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		task_flags |= RPC_TASK_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS call  lookup %pd2\n", dentry);</div><div class='del'>-	return __nfs3_proc_lookup(dir, dentry-&gt;d_name.name,</div><div class='del'>-				  dentry-&gt;d_name.len, fhandle, fattr,</div><div class='add'>+	return __nfs3_proc_lookup(dir, name-&gt;name, name-&gt;len, fhandle, fattr,</div><div class='ctx'> 				  task_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -579,13 +578,13 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static struct dentry *</div><div class='ctx'> nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct posix_acl *default_acl, *acl;</div><div class='ctx'> 	struct nfs3_createdata *data;</div><div class='del'>-	struct dentry *d_alias;</div><div class='del'>-	int status = -ENOMEM;</div><div class='add'>+	struct dentry *ret = ERR_PTR(-ENOMEM);</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS call  mkdir %pd\n", dentry);</div><div class='ctx'> </div><div class='hunk'>@@ -593,8 +592,9 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	status = posix_acl_create(dir, &amp;sattr-&gt;ia_mode, &amp;default_acl, &amp;acl);</div><div class='del'>-	if (status)</div><div class='add'>+	ret = ERR_PTR(posix_acl_create(dir, &amp;sattr-&gt;ia_mode,</div><div class='add'>+				       &amp;default_acl, &amp;acl));</div><div class='add'>+	if (IS_ERR(ret))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;msg.rpc_proc = &amp;nfs3_procedures[NFS3PROC_MKDIR];</div><div class='hunk'>@@ -603,25 +603,27 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)</div><div class='ctx'> 	data-&gt;arg.mkdir.len = dentry-&gt;d_name.len;</div><div class='ctx'> 	data-&gt;arg.mkdir.sattr = sattr;</div><div class='ctx'> </div><div class='del'>-	d_alias = nfs3_do_create(dir, dentry, data);</div><div class='del'>-	status = PTR_ERR_OR_ZERO(d_alias);</div><div class='add'>+	ret = nfs3_do_create(dir, dentry, data);</div><div class='ctx'> </div><div class='del'>-	if (status != 0)</div><div class='add'>+	if (IS_ERR(ret))</div><div class='ctx'> 		goto out_release_acls;</div><div class='ctx'> </div><div class='del'>-	if (d_alias)</div><div class='del'>-		dentry = d_alias;</div><div class='add'>+	if (ret)</div><div class='add'>+		dentry = ret;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);</div><div class='add'>+	if (status) {</div><div class='add'>+		dput(ret);</div><div class='add'>+		ret = ERR_PTR(status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dput(d_alias);</div><div class='ctx'> out_release_acls:</div><div class='ctx'> 	posix_acl_release(acl);</div><div class='ctx'> 	posix_acl_release(default_acl);</div><div class='ctx'> out:</div><div class='ctx'> 	nfs3_free_createdata(data);</div><div class='del'>-	dprintk("NFS reply mkdir: %d\n", status);</div><div class='del'>-	return status;</div><div class='add'>+	dprintk("NFS reply mkdir: %d\n", PTR_ERR_OR_ZERO(ret));</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -844,6 +846,41 @@ nfs3_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+</div><div class='add'>+static unsigned nfs3_localio_probe_throttle __read_mostly = 0;</div><div class='add'>+module_param(nfs3_localio_probe_throttle, uint, 0644);</div><div class='add'>+MODULE_PARM_DESC(nfs3_localio_probe_throttle,</div><div class='add'>+		 "Probe for NFSv3 LOCALIO every N IO requests. Must be power-of-2, defaults to 0 (probing disabled).");</div><div class='add'>+</div><div class='add'>+static void nfs3_localio_probe(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+	struct nfs_client *clp = server-&gt;nfs_client;</div><div class='add'>+</div><div class='add'>+	/* Throttled to reduce nfs_local_probe_async() frequency */</div><div class='add'>+	if (!nfs3_localio_probe_throttle || nfs_server_is_local(clp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try (re)enabling LOCALIO if isn't enabled -- admin deems</div><div class='add'>+	 * it worthwhile to periodically check if LOCALIO possible by</div><div class='add'>+	 * setting the 'nfs3_localio_probe_throttle' module parameter.</div><div class='add'>+	 *</div><div class='add'>+	 * This is useful if LOCALIO was previously enabled, but was</div><div class='add'>+	 * disabled due to server restart, and IO has successfully</div><div class='add'>+	 * completed in terms of normal RPC.</div><div class='add'>+	 */</div><div class='add'>+	if ((clp-&gt;cl_uuid.nfs3_localio_probe_count++ &amp;</div><div class='add'>+	     (nfs3_localio_probe_throttle - 1)) == 0) {</div><div class='add'>+		if (!nfs_server_is_local(clp))</div><div class='add'>+			nfs_local_probe_async(clp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static void nfs3_localio_probe(struct nfs_server *server) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int nfs3_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = hdr-&gt;inode;</div><div class='hunk'>@@ -855,8 +892,11 @@ static int nfs3_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr)</div><div class='ctx'> 	if (nfs3_async_handle_jukebox(task, inode))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	if (task-&gt;tk_status &gt;= 0 &amp;&amp; !server-&gt;read_hdrsize)</div><div class='del'>-		cmpxchg(&amp;server-&gt;read_hdrsize, 0, hdr-&gt;res.replen);</div><div class='add'>+	if (task-&gt;tk_status &gt;= 0) {</div><div class='add'>+		if (!server-&gt;read_hdrsize)</div><div class='add'>+			cmpxchg(&amp;server-&gt;read_hdrsize, 0, hdr-&gt;res.replen);</div><div class='add'>+		nfs3_localio_probe(server);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nfs_invalidate_atime(inode);</div><div class='ctx'> 	nfs_refresh_inode(inode, &amp;hdr-&gt;fattr);</div><div class='hunk'>@@ -886,8 +926,10 @@ static int nfs3_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr)</div><div class='ctx'> </div><div class='ctx'> 	if (nfs3_async_handle_jukebox(task, inode))</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	if (task-&gt;tk_status &gt;= 0)</div><div class='add'>+	if (task-&gt;tk_status &gt;= 0) {</div><div class='ctx'> 		nfs_writeback_update_inode(hdr);</div><div class='add'>+		nfs3_localio_probe(NFS_SERVER(inode));</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -963,7 +1005,7 @@ nfs3_proc_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	struct nfs_open_context *ctx = nfs_file_open_context(filp);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_CLOSE) {</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_CLOSE) {</div><div class='ctx'> 		l_ctx = nfs_get_lock_context(ctx);</div><div class='ctx'> 		if (IS_ERR(l_ctx))</div><div class='ctx'> 			l_ctx = NULL;</div><div class='hunk'>@@ -979,13 +1021,21 @@ nfs3_proc_lock(struct file *filp, int cmd, struct file_lock *fl)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs3_have_delegation(struct inode *inode, fmode_t flags)</div><div class='add'>+static int nfs3_have_delegation(struct inode *inode, fmode_t type, int flags)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs3_return_delegation(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		nfs_wb_all(inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations nfs3_dir_inode_operations = {</div><div class='ctx'> 	.create		= nfs_create,</div><div class='add'>+	.atomic_open	= nfs_atomic_open_v23,</div><div class='ctx'> 	.lookup		= nfs_lookup,</div><div class='ctx'> 	.link		= nfs_link,</div><div class='ctx'> 	.unlink		= nfs_unlink,</div><div class='hunk'>@@ -1061,6 +1111,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = {</div><div class='ctx'> 	.clear_acl_cache = forget_all_cached_acls,</div><div class='ctx'> 	.close_context	= nfs_close_context,</div><div class='ctx'> 	.have_delegation = nfs3_have_delegation,</div><div class='add'>+	.return_delegation = nfs3_return_delegation,</div><div class='ctx'> 	.alloc_client	= nfs_alloc_client,</div><div class='ctx'> 	.init_client	= nfs_init_client,</div><div class='ctx'> 	.free_client	= nfs_free_client,</div><div class='head'>diff --git a/fs/nfs/nfs3super.c b/fs/nfs/nfs3super.c<br/>index 8a9be9e47f76..20a80478449e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs3super.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@ static void __exit exit_nfs_v3(void)</div><div class='ctx'> 	unregister_nfs_version(&amp;nfs_v3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NFSv3 client support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(init_nfs_v3);</div><div class='head'>diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c<br/>index 60f032be805a..e17d72908412 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs3xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs3xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs3xdr.c</a></div><div class='hunk'>@@ -21,14 +21,13 @@</div><div class='ctx'> #include &lt;linux/nfs3.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/nfsacl.h&gt;</div><div class='del'>-#include "nfstrace.h"</div><div class='add'>+#include &lt;linux/nfs_common.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "internal.h"</div><div class='add'>+#include "nfstrace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_XDR</div><div class='ctx'> </div><div class='del'>-/* Mapping from NFS error code to "errno" error code. */</div><div class='del'>-#define errno_NFSERR_IO		EIO</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Declare the space requirements for NFS arguments and replies as</div><div class='ctx'>  * number of 32bit-words</div><div class='hunk'>@@ -91,8 +90,6 @@</div><div class='ctx'> 				NFS3_pagepad_sz)</div><div class='ctx'> #define ACL3_setaclres_sz	(1+NFS3_post_op_attr_sz)</div><div class='ctx'> </div><div class='del'>-static int nfs3_stat_to_errno(enum nfs_stat);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Map file type to S_IFMT bits</div><div class='ctx'>  */</div><div class='hunk'>@@ -1406,7 +1403,7 @@ static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_default:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1445,7 +1442,7 @@ static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1495,7 +1492,7 @@ out_default:</div><div class='ctx'> 	error = decode_post_op_attr(xdr, result-&gt;dir_attr, userns);</div><div class='ctx'> 	if (unlikely(error))</div><div class='ctx'> 		goto out;</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1537,7 +1534,7 @@ static int nfs3_xdr_dec_access3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_default:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1578,7 +1575,7 @@ static int nfs3_xdr_dec_readlink3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_default:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1658,7 +1655,7 @@ static int nfs3_xdr_dec_read3res(struct rpc_rqst *req, struct xdr_stream *xdr,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1728,7 +1725,7 @@ static int nfs3_xdr_dec_write3res(struct rpc_rqst *req, struct xdr_stream *xdr,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1795,7 +1792,7 @@ out_default:</div><div class='ctx'> 	error = decode_wcc_data(xdr, result-&gt;dir_attr, userns);</div><div class='ctx'> 	if (unlikely(error))</div><div class='ctx'> 		goto out;</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1835,7 +1832,7 @@ static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1881,7 +1878,7 @@ static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1926,7 +1923,7 @@ static int nfs3_xdr_dec_link3res(struct rpc_rqst *req, struct xdr_stream *xdr,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2101,7 +2098,7 @@ out_default:</div><div class='ctx'> 	error = decode_post_op_attr(xdr, result-&gt;dir_attr, rpc_rqst_userns(req));</div><div class='ctx'> 	if (unlikely(error))</div><div class='ctx'> 		goto out;</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2167,7 +2164,7 @@ static int nfs3_xdr_dec_fsstat3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2243,7 +2240,7 @@ static int nfs3_xdr_dec_fsinfo3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2304,7 +2301,7 @@ static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2350,7 +2347,7 @@ static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_status:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFS_V3_ACL</div><div class='hunk'>@@ -2416,7 +2413,7 @@ static int nfs3_xdr_dec_getacl3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_default:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req,</div><div class='hunk'>@@ -2435,76 +2432,11 @@ static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req,</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='ctx'> out_default:</div><div class='del'>-	return nfs3_stat_to_errno(status);</div><div class='add'>+	return nfs_stat_to_errno(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif  /* CONFIG_NFS_V3_ACL */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We need to translate between nfs status return values and</div><div class='del'>- * the local errno values which may not be the same.</div><div class='del'>- */</div><div class='del'>-static const struct {</div><div class='del'>-	int stat;</div><div class='del'>-	int errno;</div><div class='del'>-} nfs_errtbl[] = {</div><div class='del'>-	{ NFS_OK,		0		},</div><div class='del'>-	{ NFSERR_PERM,		-EPERM		},</div><div class='del'>-	{ NFSERR_NOENT,		-ENOENT		},</div><div class='del'>-	{ NFSERR_IO,		-errno_NFSERR_IO},</div><div class='del'>-	{ NFSERR_NXIO,		-ENXIO		},</div><div class='del'>-/*	{ NFSERR_EAGAIN,	-EAGAIN		}, */</div><div class='del'>-	{ NFSERR_ACCES,		-EACCES		},</div><div class='del'>-	{ NFSERR_EXIST,		-EEXIST		},</div><div class='del'>-	{ NFSERR_XDEV,		-EXDEV		},</div><div class='del'>-	{ NFSERR_NODEV,		-ENODEV		},</div><div class='del'>-	{ NFSERR_NOTDIR,	-ENOTDIR	},</div><div class='del'>-	{ NFSERR_ISDIR,		-EISDIR		},</div><div class='del'>-	{ NFSERR_INVAL,		-EINVAL		},</div><div class='del'>-	{ NFSERR_FBIG,		-EFBIG		},</div><div class='del'>-	{ NFSERR_NOSPC,		-ENOSPC		},</div><div class='del'>-	{ NFSERR_ROFS,		-EROFS		},</div><div class='del'>-	{ NFSERR_MLINK,		-EMLINK		},</div><div class='del'>-	{ NFSERR_NAMETOOLONG,	-ENAMETOOLONG	},</div><div class='del'>-	{ NFSERR_NOTEMPTY,	-ENOTEMPTY	},</div><div class='del'>-	{ NFSERR_DQUOT,		-EDQUOT		},</div><div class='del'>-	{ NFSERR_STALE,		-ESTALE		},</div><div class='del'>-	{ NFSERR_REMOTE,	-EREMOTE	},</div><div class='del'>-#ifdef EWFLUSH</div><div class='del'>-	{ NFSERR_WFLUSH,	-EWFLUSH	},</div><div class='del'>-#endif</div><div class='del'>-	{ NFSERR_BADHANDLE,	-EBADHANDLE	},</div><div class='del'>-	{ NFSERR_NOT_SYNC,	-ENOTSYNC	},</div><div class='del'>-	{ NFSERR_BAD_COOKIE,	-EBADCOOKIE	},</div><div class='del'>-	{ NFSERR_NOTSUPP,	-ENOTSUPP	},</div><div class='del'>-	{ NFSERR_TOOSMALL,	-ETOOSMALL	},</div><div class='del'>-	{ NFSERR_SERVERFAULT,	-EREMOTEIO	},</div><div class='del'>-	{ NFSERR_BADTYPE,	-EBADTYPE	},</div><div class='del'>-	{ NFSERR_JUKEBOX,	-EJUKEBOX	},</div><div class='del'>-	{ -1,			-EIO		}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nfs3_stat_to_errno - convert an NFS status code to a local errno</div><div class='del'>- * @status: NFS status code to convert</div><div class='del'>- *</div><div class='del'>- * Returns a local errno value, or -EIO if the NFS status code is</div><div class='del'>- * not recognized.  This function is used jointly by NFSv2 and NFSv3.</div><div class='del'>- */</div><div class='del'>-static int nfs3_stat_to_errno(enum nfs_stat status)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; nfs_errtbl[i].stat != -1; i++) {</div><div class='del'>-		if (nfs_errtbl[i].stat == (int)status)</div><div class='del'>-			return nfs_errtbl[i].errno;</div><div class='del'>-	}</div><div class='del'>-	dprintk("NFS: Unrecognized nfs status value: %u\n", status);</div><div class='del'>-	return nfs_errtbl[i].errno;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #define PROC(proc, argtype, restype, timer)				\</div><div class='ctx'> [NFS3PROC_##proc] = {							\</div><div class='ctx'> 	.p_proc      = NFS3PROC_##proc,					\</div><div class='head'>diff --git a/fs/nfs/nfs42.h b/fs/nfs/nfs42.h<br/>index b59876b01a1e..aafd15a4afce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs42.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@ int nfs42_proc_allocate(struct file *, loff_t, loff_t);</div><div class='ctx'> ssize_t nfs42_proc_copy(struct file *, loff_t, struct file *, loff_t, size_t,</div><div class='ctx'> 			struct nl4_server *, nfs4_stateid *, bool);</div><div class='ctx'> int nfs42_proc_deallocate(struct file *, loff_t, loff_t);</div><div class='add'>+int nfs42_proc_zero_range(struct file *, loff_t, loff_t);</div><div class='ctx'> loff_t nfs42_proc_llseek(struct file *, loff_t, int);</div><div class='ctx'> int nfs42_proc_layoutstats_generic(struct nfs_server *,</div><div class='ctx'> 				   struct nfs42_layoutstat_data *);</div><div class='hunk'>@@ -55,11 +56,14 @@ int nfs42_proc_removexattr(struct inode *inode, const char *name);</div><div class='ctx'>  * They would be 7 bytes long in the eventual buffer ("user.x\0"), and</div><div class='ctx'>  * 8 bytes long XDR-encoded.</div><div class='ctx'>  *</div><div class='del'>- * Include the trailing eof word as well.</div><div class='add'>+ * Include the trailing eof word as well and make the result a multiple</div><div class='add'>+ * of 4 bytes.</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 nfs42_listxattr_xdrsize(u32 buflen)</div><div class='ctx'> {</div><div class='del'>-	return ((buflen / (XATTR_USER_PREFIX_LEN + 2)) * 8) + 4;</div><div class='add'>+	u32 size = 8 * buflen / (XATTR_USER_PREFIX_LEN + 2) + 4;</div><div class='add'>+</div><div class='add'>+	return (size + 3) &amp; ~3;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_NFS_V4_2 */</div><div class='ctx'> #endif /* __LINUX_FS_NFS_NFS4_2_H */</div><div class='head'>diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c<br/>index 28704f924612..d537fb0c230e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs42proc.c</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY NFSDBG_PROC</div><div class='ctx'> static int nfs42_do_offload_cancel_async(struct file *dst, nfs4_stateid *std);</div><div class='add'>+static int nfs42_proc_offload_status(struct file *file, nfs4_stateid *stateid,</div><div class='add'>+				     u64 *copied);</div><div class='ctx'> </div><div class='ctx'> static void nfs42_set_netaddr(struct file *filep, struct nfs42_netaddr *naddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -112,6 +114,7 @@ static int nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep,</div><div class='ctx'> 	exception.inode = inode;</div><div class='ctx'> 	exception.state = lock-&gt;open_context-&gt;state;</div><div class='ctx'> </div><div class='add'>+	nfs_file_block_o_direct(NFS_I(inode));</div><div class='ctx'> 	err = nfs_sync_inode(inode);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -135,6 +138,7 @@ int nfs42_proc_allocate(struct file *filep, loff_t offset, loff_t len)</div><div class='ctx'> 		.rpc_proc = &amp;nfs4_procedures[NFSPROC4_CLNT_ALLOCATE],</div><div class='ctx'> 	};</div><div class='ctx'> 	struct inode *inode = file_inode(filep);</div><div class='add'>+	loff_t oldsize = i_size_read(inode);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!nfs_server_capable(inode, NFS_CAP_ALLOCATE))</div><div class='hunk'>@@ -143,8 +147,13 @@ int nfs42_proc_allocate(struct file *filep, loff_t offset, loff_t len)</div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='ctx'> 	err = nfs42_proc_fallocate(&amp;msg, filep, offset, len);</div><div class='del'>-	if (err == -EOPNOTSUPP)</div><div class='del'>-		NFS_SERVER(inode)-&gt;caps &amp;= ~NFS_CAP_ALLOCATE;</div><div class='add'>+</div><div class='add'>+	if (err == 0)</div><div class='add'>+		nfs_truncate_last_folio(inode-&gt;i_mapping, oldsize,</div><div class='add'>+					offset + len);</div><div class='add'>+	else if (err == -EOPNOTSUPP)</div><div class='add'>+		NFS_SERVER(inode)-&gt;caps &amp;= ~(NFS_CAP_ALLOCATE |</div><div class='add'>+					     NFS_CAP_ZERO_RANGE);</div><div class='ctx'> </div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -167,12 +176,53 @@ int nfs42_proc_deallocate(struct file *filep, loff_t offset, loff_t len)</div><div class='ctx'> 	if (err == 0)</div><div class='ctx'> 		truncate_pagecache_range(inode, offset, (offset + len) -1);</div><div class='ctx'> 	if (err == -EOPNOTSUPP)</div><div class='del'>-		NFS_SERVER(inode)-&gt;caps &amp;= ~NFS_CAP_DEALLOCATE;</div><div class='add'>+		NFS_SERVER(inode)-&gt;caps &amp;= ~(NFS_CAP_DEALLOCATE |</div><div class='add'>+					     NFS_CAP_ZERO_RANGE);</div><div class='ctx'> </div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int nfs42_proc_zero_range(struct file *filep, loff_t offset, loff_t len)</div><div class='add'>+{</div><div class='add'>+	struct rpc_message msg = {</div><div class='add'>+		.rpc_proc = &amp;nfs4_procedures[NFSPROC4_CLNT_ZERO_RANGE],</div><div class='add'>+	};</div><div class='add'>+	struct inode *inode = file_inode(filep);</div><div class='add'>+	loff_t oldsize = i_size_read(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!nfs_server_capable(inode, NFS_CAP_ZERO_RANGE))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+</div><div class='add'>+	err = nfs42_proc_fallocate(&amp;msg, filep, offset, len);</div><div class='add'>+	if (err == 0) {</div><div class='add'>+		nfs_truncate_last_folio(inode-&gt;i_mapping, oldsize,</div><div class='add'>+					offset + len);</div><div class='add'>+		truncate_pagecache_range(inode, offset, (offset + len) -1);</div><div class='add'>+	} else if (err == -EOPNOTSUPP)</div><div class='add'>+		NFS_SERVER(inode)-&gt;caps &amp;= ~NFS_CAP_ZERO_RANGE;</div><div class='add'>+</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs4_copy_dequeue_callback(struct nfs_server *dst_server,</div><div class='add'>+				       struct nfs_server *src_server,</div><div class='add'>+				       struct nfs4_copy_state *copy)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;dst_server-&gt;nfs_client-&gt;cl_lock);</div><div class='add'>+	list_del_init(&amp;copy-&gt;copies);</div><div class='add'>+	spin_unlock(&amp;dst_server-&gt;nfs_client-&gt;cl_lock);</div><div class='add'>+	if (dst_server != src_server) {</div><div class='add'>+		spin_lock(&amp;src_server-&gt;nfs_client-&gt;cl_lock);</div><div class='add'>+		list_del_init(&amp;copy-&gt;src_copies);</div><div class='add'>+		spin_unlock(&amp;src_server-&gt;nfs_client-&gt;cl_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int handle_async_copy(struct nfs42_copy_res *res,</div><div class='ctx'> 			     struct nfs_server *dst_server,</div><div class='ctx'> 			     struct nfs_server *src_server,</div><div class='hunk'>@@ -182,9 +232,12 @@ static int handle_async_copy(struct nfs42_copy_res *res,</div><div class='ctx'> 			     bool *restart)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_copy_state *copy, *tmp_copy = NULL, *iter;</div><div class='del'>-	int status = NFS4_OK;</div><div class='ctx'> 	struct nfs_open_context *dst_ctx = nfs_file_open_context(dst);</div><div class='ctx'> 	struct nfs_open_context *src_ctx = nfs_file_open_context(src);</div><div class='add'>+	struct nfs_client *clp = dst_server-&gt;nfs_client;</div><div class='add'>+	unsigned long timeout = 3 * HZ;</div><div class='add'>+	int status = NFS4_OK;</div><div class='add'>+	u64 copied;</div><div class='ctx'> </div><div class='ctx'> 	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_KERNEL);</div><div class='ctx'> 	if (!copy)</div><div class='hunk'>@@ -218,19 +271,16 @@ static int handle_async_copy(struct nfs42_copy_res *res,</div><div class='ctx'> </div><div class='ctx'> 	if (dst_server != src_server) {</div><div class='ctx'> 		spin_lock(&amp;src_server-&gt;nfs_client-&gt;cl_lock);</div><div class='del'>-		list_add_tail(&amp;copy-&gt;src_copies, &amp;src_server-&gt;ss_copies);</div><div class='add'>+		list_add_tail(&amp;copy-&gt;src_copies, &amp;src_server-&gt;ss_src_copies);</div><div class='ctx'> 		spin_unlock(&amp;src_server-&gt;nfs_client-&gt;cl_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = wait_for_completion_interruptible(&amp;copy-&gt;completion);</div><div class='del'>-	spin_lock(&amp;dst_server-&gt;nfs_client-&gt;cl_lock);</div><div class='del'>-	list_del_init(&amp;copy-&gt;copies);</div><div class='del'>-	spin_unlock(&amp;dst_server-&gt;nfs_client-&gt;cl_lock);</div><div class='del'>-	if (dst_server != src_server) {</div><div class='del'>-		spin_lock(&amp;src_server-&gt;nfs_client-&gt;cl_lock);</div><div class='del'>-		list_del_init(&amp;copy-&gt;src_copies);</div><div class='del'>-		spin_unlock(&amp;src_server-&gt;nfs_client-&gt;cl_lock);</div><div class='del'>-	}</div><div class='add'>+wait:</div><div class='add'>+	status = wait_for_completion_interruptible_timeout(&amp;copy-&gt;completion,</div><div class='add'>+							   timeout);</div><div class='add'>+	if (!status)</div><div class='add'>+		goto timeout;</div><div class='add'>+	nfs4_copy_dequeue_callback(dst_server, src_server, copy);</div><div class='ctx'> 	if (status == -ERESTARTSYS) {</div><div class='ctx'> 		goto out_cancel;</div><div class='ctx'> 	} else if (copy-&gt;flags || copy-&gt;error == NFS4ERR_PARTNER_NO_AUTH) {</div><div class='hunk'>@@ -240,6 +290,7 @@ static int handle_async_copy(struct nfs42_copy_res *res,</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	res-&gt;write_res.count = copy-&gt;count;</div><div class='add'>+	/* Copy out the updated write verifier provided by CB_OFFLOAD. */</div><div class='ctx'> 	memcpy(&amp;res-&gt;write_res.verifier, &amp;copy-&gt;verf, sizeof(copy-&gt;verf));</div><div class='ctx'> 	status = -copy-&gt;error;</div><div class='ctx'> </div><div class='hunk'>@@ -251,6 +302,39 @@ out_cancel:</div><div class='ctx'> 	if (!nfs42_files_from_same_server(src, dst))</div><div class='ctx'> 		nfs42_do_offload_cancel_async(src, src_stateid);</div><div class='ctx'> 	goto out_free;</div><div class='add'>+timeout:</div><div class='add'>+	timeout &lt;&lt;= 1;</div><div class='add'>+	if (timeout &gt; (clp-&gt;cl_lease_time &gt;&gt; 1))</div><div class='add'>+		timeout = clp-&gt;cl_lease_time &gt;&gt; 1;</div><div class='add'>+	status = nfs42_proc_offload_status(dst, &amp;copy-&gt;stateid, &amp;copied);</div><div class='add'>+	if (status == -EINPROGRESS)</div><div class='add'>+		goto wait;</div><div class='add'>+	nfs4_copy_dequeue_callback(dst_server, src_server, copy);</div><div class='add'>+	switch (status) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* The server recognized the copy stateid, so it hasn't</div><div class='add'>+		 * rebooted. Don't overwrite the verifier returned in the</div><div class='add'>+		 * COPY result. */</div><div class='add'>+		res-&gt;write_res.count = copied;</div><div class='add'>+		goto out_free;</div><div class='add'>+	case -EREMOTEIO:</div><div class='add'>+		/* COPY operation failed on the server. */</div><div class='add'>+		status = -EOPNOTSUPP;</div><div class='add'>+		res-&gt;write_res.count = copied;</div><div class='add'>+		goto out_free;</div><div class='add'>+	case -EBADF:</div><div class='add'>+		/* Server did not recognize the copy stateid. It has</div><div class='add'>+		 * probably restarted and lost the plot. */</div><div class='add'>+		res-&gt;write_res.count = 0;</div><div class='add'>+		status = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	case -EOPNOTSUPP:</div><div class='add'>+		/* RFC 7862 REQUIREs server to support OFFLOAD_STATUS when</div><div class='add'>+		 * it has signed up for an async COPY, so server is not</div><div class='add'>+		 * spec-compliant. */</div><div class='add'>+		res-&gt;write_res.count = 0;</div><div class='add'>+	}</div><div class='add'>+	goto out_free;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int process_copy_commit(struct file *dst, loff_t pos_dst,</div><div class='hunk'>@@ -279,22 +363,27 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nfs42_copy_dest_done - perform inode cache updates after clone/copy offload</div><div class='del'>- * @inode: pointer to destination inode</div><div class='add'>+ * @file: pointer to destination file</div><div class='ctx'>  * @pos: destination offset</div><div class='ctx'>  * @len: copy length</div><div class='add'>+ * @oldsize: length of the file prior to clone/copy</div><div class='ctx'>  *</div><div class='ctx'>  * Punch a hole in the inode page cache, so that the NFS client will</div><div class='ctx'>  * know to retrieve new data.</div><div class='ctx'>  * Update the file size if necessary, and then mark the inode as having</div><div class='ctx'>  * invalid cached values for change attribute, ctime, mtime and space used.</div><div class='ctx'>  */</div><div class='del'>-static void nfs42_copy_dest_done(struct inode *inode, loff_t pos, loff_t len)</div><div class='add'>+static void nfs42_copy_dest_done(struct file *file, loff_t pos, loff_t len,</div><div class='add'>+				 loff_t oldsize)</div><div class='ctx'> {</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> 	loff_t newsize = pos + len;</div><div class='ctx'> 	loff_t end = newsize - 1;</div><div class='ctx'> </div><div class='del'>-	WARN_ON_ONCE(invalidate_inode_pages2_range(inode-&gt;i_mapping,</div><div class='del'>-				pos &gt;&gt; PAGE_SHIFT, end &gt;&gt; PAGE_SHIFT));</div><div class='add'>+	nfs_truncate_last_folio(mapping, oldsize, pos);</div><div class='add'>+	WARN_ON_ONCE(invalidate_inode_pages2_range(mapping, pos &gt;&gt; PAGE_SHIFT,</div><div class='add'>+						   end &gt;&gt; PAGE_SHIFT));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (newsize &gt; i_size_read(inode))</div><div class='hunk'>@@ -327,6 +416,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,</div><div class='ctx'> 	struct nfs_server *src_server = NFS_SERVER(src_inode);</div><div class='ctx'> 	loff_t pos_src = args-&gt;src_pos;</div><div class='ctx'> 	loff_t pos_dst = args-&gt;dst_pos;</div><div class='add'>+	loff_t oldsize_dst = i_size_read(dst_inode);</div><div class='ctx'> 	size_t count = args-&gt;count;</div><div class='ctx'> 	ssize_t status;</div><div class='ctx'> </div><div class='hunk'>@@ -355,6 +445,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nfs_file_block_o_direct(NFS_I(dst_inode));</div><div class='ctx'> 	status = nfs_sync_inode(dst_inode);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='hunk'>@@ -400,7 +491,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nfs42_copy_dest_done(dst_inode, pos_dst, res-&gt;write_res.count);</div><div class='add'>+	nfs42_copy_dest_done(dst, pos_dst, res-&gt;write_res.count, oldsize_dst);</div><div class='ctx'> 	nfs_invalidate_atime(src_inode);</div><div class='ctx'> 	status = res-&gt;write_res.count;</div><div class='ctx'> out:</div><div class='hunk'>@@ -498,15 +589,15 @@ out_put_src_lock:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct nfs42_offloadcancel_data {</div><div class='add'>+struct nfs42_offload_data {</div><div class='ctx'> 	struct nfs_server *seq_server;</div><div class='ctx'> 	struct nfs42_offload_status_args args;</div><div class='ctx'> 	struct nfs42_offload_status_res res;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void nfs42_offload_cancel_prepare(struct rpc_task *task, void *calldata)</div><div class='add'>+static void nfs42_offload_prepare(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='del'>-	struct nfs42_offloadcancel_data *data = calldata;</div><div class='add'>+	struct nfs42_offload_data *data = calldata;</div><div class='ctx'> </div><div class='ctx'> 	nfs4_setup_sequence(data-&gt;seq_server-&gt;nfs_client,</div><div class='ctx'> 				&amp;data-&gt;args.osa_seq_args,</div><div class='hunk'>@@ -515,7 +606,7 @@ static void nfs42_offload_cancel_prepare(struct rpc_task *task, void *calldata)</div><div class='ctx'> </div><div class='ctx'> static void nfs42_offload_cancel_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='del'>-	struct nfs42_offloadcancel_data *data = calldata;</div><div class='add'>+	struct nfs42_offload_data *data = calldata;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs4_offload_cancel(&amp;data-&gt;args, task-&gt;tk_status);</div><div class='ctx'> 	nfs41_sequence_done(task, &amp;data-&gt;res.osr_seq_res);</div><div class='hunk'>@@ -525,22 +616,22 @@ static void nfs42_offload_cancel_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		rpc_restart_call_prepare(task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs42_free_offloadcancel_data(void *data)</div><div class='add'>+static void nfs42_offload_release(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rpc_call_ops nfs42_offload_cancel_ops = {</div><div class='del'>-	.rpc_call_prepare = nfs42_offload_cancel_prepare,</div><div class='add'>+	.rpc_call_prepare = nfs42_offload_prepare,</div><div class='ctx'> 	.rpc_call_done = nfs42_offload_cancel_done,</div><div class='del'>-	.rpc_release = nfs42_free_offloadcancel_data,</div><div class='add'>+	.rpc_release = nfs42_offload_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nfs42_do_offload_cancel_async(struct file *dst,</div><div class='ctx'> 					 nfs4_stateid *stateid)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *dst_server = NFS_SERVER(file_inode(dst));</div><div class='del'>-	struct nfs42_offloadcancel_data *data = NULL;</div><div class='add'>+	struct nfs42_offload_data *data = NULL;</div><div class='ctx'> 	struct nfs_open_context *ctx = nfs_file_open_context(dst);</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> 	struct rpc_message msg = {</div><div class='hunk'>@@ -552,14 +643,14 @@ static int nfs42_do_offload_cancel_async(struct file *dst,</div><div class='ctx'> 		.rpc_message = &amp;msg,</div><div class='ctx'> 		.callback_ops = &amp;nfs42_offload_cancel_ops,</div><div class='ctx'> 		.workqueue = nfsiod_workqueue,</div><div class='del'>-		.flags = RPC_TASK_ASYNC,</div><div class='add'>+		.flags = RPC_TASK_ASYNC | RPC_TASK_MOVEABLE,</div><div class='ctx'> 	};</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (!(dst_server-&gt;caps &amp; NFS_CAP_OFFLOAD_CANCEL))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	data = kzalloc(sizeof(struct nfs42_offloadcancel_data), GFP_KERNEL);</div><div class='add'>+	data = kzalloc(sizeof(struct nfs42_offload_data), GFP_KERNEL);</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -582,6 +673,108 @@ static int nfs42_do_offload_cancel_async(struct file *dst,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+_nfs42_proc_offload_status(struct nfs_server *server, struct file *file,</div><div class='add'>+			   struct nfs42_offload_data *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs_open_context *ctx = nfs_file_open_context(file);</div><div class='add'>+	struct rpc_message msg = {</div><div class='add'>+		.rpc_proc	= &amp;nfs4_procedures[NFSPROC4_CLNT_OFFLOAD_STATUS],</div><div class='add'>+		.rpc_argp	= &amp;data-&gt;args,</div><div class='add'>+		.rpc_resp	= &amp;data-&gt;res,</div><div class='add'>+		.rpc_cred	= ctx-&gt;cred,</div><div class='add'>+	};</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = nfs4_call_sync(server-&gt;client, server, &amp;msg,</div><div class='add'>+				&amp;data-&gt;args.osa_seq_args,</div><div class='add'>+				&amp;data-&gt;res.osr_seq_res, 1);</div><div class='add'>+	trace_nfs4_offload_status(&amp;data-&gt;args, status);</div><div class='add'>+	switch (status) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -NFS4ERR_ADMIN_REVOKED:</div><div class='add'>+	case -NFS4ERR_BAD_STATEID:</div><div class='add'>+	case -NFS4ERR_OLD_STATEID:</div><div class='add'>+		/*</div><div class='add'>+		 * Server does not recognize the COPY stateid. CB_OFFLOAD</div><div class='add'>+		 * could have purged it, or server might have rebooted.</div><div class='add'>+		 * Since COPY stateids don't have an associated inode,</div><div class='add'>+		 * avoid triggering state recovery.</div><div class='add'>+		 */</div><div class='add'>+		status = -EBADF;</div><div class='add'>+		break;</div><div class='add'>+	case -NFS4ERR_NOTSUPP:</div><div class='add'>+	case -ENOTSUPP:</div><div class='add'>+	case -EOPNOTSUPP:</div><div class='add'>+		server-&gt;caps &amp;= ~NFS_CAP_OFFLOAD_STATUS;</div><div class='add'>+		status = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfs42_proc_offload_status - Poll completion status of an async copy operation</div><div class='add'>+ * @dst: handle of file being copied into</div><div class='add'>+ * @stateid: copy stateid (from async COPY result)</div><div class='add'>+ * @copied: OUT: number of bytes copied so far</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0: Server returned an NFS4_OK completion status</div><div class='add'>+ *   %-EINPROGRESS: Server returned no completion status</div><div class='add'>+ *   %-EREMOTEIO: Server returned an error completion status</div><div class='add'>+ *   %-EBADF: Server did not recognize the copy stateid</div><div class='add'>+ *   %-EOPNOTSUPP: Server does not support OFFLOAD_STATUS</div><div class='add'>+ *   %-ERESTARTSYS: Wait interrupted by signal</div><div class='add'>+ *</div><div class='add'>+ * Other negative errnos indicate the client could not complete the</div><div class='add'>+ * request.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+nfs42_proc_offload_status(struct file *dst, nfs4_stateid *stateid, u64 *copied)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(dst);</div><div class='add'>+	struct nfs_server *server = NFS_SERVER(inode);</div><div class='add'>+	struct nfs4_exception exception = {</div><div class='add'>+		.inode = inode,</div><div class='add'>+	};</div><div class='add'>+	struct nfs42_offload_data *data;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!(server-&gt;caps &amp; NFS_CAP_OFFLOAD_STATUS))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	data-&gt;seq_server = server;</div><div class='add'>+	data-&gt;args.osa_src_fh = NFS_FH(inode);</div><div class='add'>+	memcpy(&amp;data-&gt;args.osa_stateid, stateid,</div><div class='add'>+		sizeof(data-&gt;args.osa_stateid));</div><div class='add'>+	exception.stateid = &amp;data-&gt;args.osa_stateid;</div><div class='add'>+	do {</div><div class='add'>+		status = _nfs42_proc_offload_status(server, dst, data);</div><div class='add'>+		if (status == -EOPNOTSUPP)</div><div class='add'>+			goto out;</div><div class='add'>+		status = nfs4_handle_exception(server, status, &amp;exception);</div><div class='add'>+	} while (exception.retry);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	*copied = data-&gt;res.osr_count;</div><div class='add'>+	if (!data-&gt;res.complete_count)</div><div class='add'>+		status = -EINPROGRESS;</div><div class='add'>+	else if (data-&gt;res.osr_complete != NFS_OK)</div><div class='add'>+		status = -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,</div><div class='ctx'> 				   struct nfs42_copy_notify_args *args,</div><div class='ctx'> 				   struct nfs42_copy_notify_res *res)</div><div class='hunk'>@@ -861,7 +1054,7 @@ int nfs42_proc_layoutstats_generic(struct nfs_server *server,</div><div class='ctx'> 		.rpc_message = &amp;msg,</div><div class='ctx'> 		.callback_ops = &amp;nfs42_layoutstat_ops,</div><div class='ctx'> 		.callback_data = data,</div><div class='del'>-		.flags = RPC_TASK_ASYNC,</div><div class='add'>+		.flags = RPC_TASK_ASYNC | RPC_TASK_MOVEABLE,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> </div><div class='hunk'>@@ -1016,7 +1209,7 @@ int nfs42_proc_layouterror(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 	struct rpc_task_setup task_setup = {</div><div class='ctx'> 		.rpc_message = &amp;msg,</div><div class='ctx'> 		.callback_ops = &amp;nfs42_layouterror_ops,</div><div class='del'>-		.flags = RPC_TASK_ASYNC,</div><div class='add'>+		.flags = RPC_TASK_ASYNC | RPC_TASK_MOVEABLE,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1065,6 +1258,7 @@ static int _nfs42_proc_clone(struct rpc_message *msg, struct file *src_f,</div><div class='ctx'> 	struct nfs42_clone_res res = {</div><div class='ctx'> 		.server	= server,</div><div class='ctx'> 	};</div><div class='add'>+	loff_t oldsize_dst = i_size_read(dst_inode);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	msg-&gt;rpc_argp = &amp;args;</div><div class='hunk'>@@ -1099,7 +1293,7 @@ static int _nfs42_proc_clone(struct rpc_message *msg, struct file *src_f,</div><div class='ctx'> 		/* a zero-length count means clone to EOF in src */</div><div class='ctx'> 		if (count == 0 &amp;&amp; res.dst_fattr-&gt;valid &amp; NFS_ATTR_FATTR_SIZE)</div><div class='ctx'> 			count = nfs_size_to_loff_t(res.dst_fattr-&gt;size) - dst_offset;</div><div class='del'>-		nfs42_copy_dest_done(dst_inode, dst_offset, count);</div><div class='add'>+		nfs42_copy_dest_done(dst_f, dst_offset, count, oldsize_dst);</div><div class='ctx'> 		status = nfs_post_op_update_inode(dst_inode, res.dst_fattr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1320,7 +1514,7 @@ static ssize_t _nfs42_proc_listxattrs(struct inode *inode, void *buf,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='del'>-	res.scratch = alloc_page(GFP_KERNEL);</div><div class='add'>+	res.scratch = folio_alloc(GFP_KERNEL, 0);</div><div class='ctx'> 	if (!res.scratch)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1358,7 +1552,7 @@ out_free_pages:</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(pages);</div><div class='ctx'> out_free_scratch:</div><div class='del'>-	__free_page(res.scratch);</div><div class='add'>+	folio_put(res.scratch);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c<br/>index 49aaf28a6950..37d79400e5f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs42xattr.c</a></div><div class='hunk'>@@ -802,7 +802,7 @@ static struct shrinker *nfs4_xattr_large_entry_shrinker;</div><div class='ctx'> </div><div class='ctx'> static enum lru_status</div><div class='ctx'> cache_lru_isolate(struct list_head *item,</div><div class='del'>-	struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)</div><div class='add'>+	struct list_lru_one *lru, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *dispose = arg;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -867,7 +867,7 @@ nfs4_xattr_cache_count(struct shrinker *shrink, struct shrink_control *sc)</div><div class='ctx'> </div><div class='ctx'> static enum lru_status</div><div class='ctx'> entry_lru_isolate(struct list_head *item,</div><div class='del'>-	struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)</div><div class='add'>+	struct list_lru_one *lru, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *dispose = arg;</div><div class='ctx'> 	struct nfs4_xattr_bucket *bucket;</div><div class='hunk'>@@ -1017,7 +1017,7 @@ int __init nfs4_xattr_cache_init(void)</div><div class='ctx'> </div><div class='ctx'> 	nfs4_xattr_cache_cachep = kmem_cache_create("nfs4_xattr_cache_cache",</div><div class='ctx'> 	    sizeof(struct nfs4_xattr_cache), 0,</div><div class='del'>-	    (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD),</div><div class='add'>+	    (SLAB_RECLAIM_ACCOUNT),</div><div class='ctx'> 	    nfs4_xattr_cache_init_once);</div><div class='ctx'> 	if (nfs4_xattr_cache_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c<br/>index 9e3ae53e2205..e10d83ba835e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs42xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs42xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs42xdr.c</a></div><div class='hunk'>@@ -35,6 +35,11 @@</div><div class='ctx'> #define encode_offload_cancel_maxsz	(op_encode_hdr_maxsz + \</div><div class='ctx'> 					 XDR_QUADLEN(NFS4_STATEID_SIZE))</div><div class='ctx'> #define decode_offload_cancel_maxsz	(op_decode_hdr_maxsz)</div><div class='add'>+#define encode_offload_status_maxsz	(op_encode_hdr_maxsz + \</div><div class='add'>+					 XDR_QUADLEN(NFS4_STATEID_SIZE))</div><div class='add'>+#define decode_offload_status_maxsz	(op_decode_hdr_maxsz + \</div><div class='add'>+					 2 /* osr_count */ + \</div><div class='add'>+					 2 /* osr_complete */)</div><div class='ctx'> #define encode_copy_notify_maxsz	(op_encode_hdr_maxsz + \</div><div class='ctx'> 					 XDR_QUADLEN(NFS4_STATEID_SIZE) + \</div><div class='ctx'> 					 1 + /* nl4_type */ \</div><div class='hunk'>@@ -143,10 +148,20 @@</div><div class='ctx'> 					 decode_sequence_maxsz + \</div><div class='ctx'> 					 decode_putfh_maxsz + \</div><div class='ctx'> 					 decode_offload_cancel_maxsz)</div><div class='add'>+#define NFS4_enc_offload_status_sz	(compound_encode_hdr_maxsz + \</div><div class='add'>+					 encode_sequence_maxsz + \</div><div class='add'>+					 encode_putfh_maxsz + \</div><div class='add'>+					 encode_offload_status_maxsz)</div><div class='add'>+#define NFS4_dec_offload_status_sz	(compound_decode_hdr_maxsz + \</div><div class='add'>+					 decode_sequence_maxsz + \</div><div class='add'>+					 decode_putfh_maxsz + \</div><div class='add'>+					 decode_offload_status_maxsz)</div><div class='ctx'> #define NFS4_enc_copy_notify_sz		(compound_encode_hdr_maxsz + \</div><div class='add'>+					 encode_sequence_maxsz + \</div><div class='ctx'> 					 encode_putfh_maxsz + \</div><div class='ctx'> 					 encode_copy_notify_maxsz)</div><div class='ctx'> #define NFS4_dec_copy_notify_sz		(compound_decode_hdr_maxsz + \</div><div class='add'>+					 decode_sequence_maxsz + \</div><div class='ctx'> 					 decode_putfh_maxsz + \</div><div class='ctx'> 					 decode_copy_notify_maxsz)</div><div class='ctx'> #define NFS4_enc_deallocate_sz		(compound_encode_hdr_maxsz + \</div><div class='hunk'>@@ -159,6 +174,18 @@</div><div class='ctx'> 					 decode_putfh_maxsz + \</div><div class='ctx'> 					 decode_deallocate_maxsz + \</div><div class='ctx'> 					 decode_getattr_maxsz)</div><div class='add'>+#define NFS4_enc_zero_range_sz		(compound_encode_hdr_maxsz + \</div><div class='add'>+					 encode_sequence_maxsz + \</div><div class='add'>+					 encode_putfh_maxsz + \</div><div class='add'>+					 encode_deallocate_maxsz + \</div><div class='add'>+					 encode_allocate_maxsz + \</div><div class='add'>+					 encode_getattr_maxsz)</div><div class='add'>+#define NFS4_dec_zero_range_sz		(compound_decode_hdr_maxsz + \</div><div class='add'>+					 decode_sequence_maxsz + \</div><div class='add'>+					 decode_putfh_maxsz + \</div><div class='add'>+					 decode_deallocate_maxsz + \</div><div class='add'>+					 decode_allocate_maxsz + \</div><div class='add'>+					 decode_getattr_maxsz)</div><div class='ctx'> #define NFS4_enc_read_plus_sz		(compound_encode_hdr_maxsz + \</div><div class='ctx'> 					 encode_sequence_maxsz + \</div><div class='ctx'> 					 encode_putfh_maxsz + \</div><div class='hunk'>@@ -343,6 +370,14 @@ static void encode_offload_cancel(struct xdr_stream *xdr,</div><div class='ctx'> 	encode_nfs4_stateid(xdr, &amp;args-&gt;osa_stateid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void encode_offload_status(struct xdr_stream *xdr,</div><div class='add'>+				  const struct nfs42_offload_status_args *args,</div><div class='add'>+				  struct compound_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	encode_op_hdr(xdr, OP_OFFLOAD_STATUS, decode_offload_status_maxsz, hdr);</div><div class='add'>+	encode_nfs4_stateid(xdr, &amp;args-&gt;osa_stateid);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void encode_copy_notify(struct xdr_stream *xdr,</div><div class='ctx'> 			       const struct nfs42_copy_notify_args *args,</div><div class='ctx'> 			       struct compound_hdr *hdr)</div><div class='hunk'>@@ -549,7 +584,7 @@ static void nfs4_xdr_enc_copy(struct rpc_rqst *req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Encode OFFLOAD_CANEL request</div><div class='add'>+ * Encode OFFLOAD_CANCEL request</div><div class='ctx'>  */</div><div class='ctx'> static void nfs4_xdr_enc_offload_cancel(struct rpc_rqst *req,</div><div class='ctx'> 					struct xdr_stream *xdr,</div><div class='hunk'>@@ -568,6 +603,25 @@ static void nfs4_xdr_enc_offload_cancel(struct rpc_rqst *req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Encode OFFLOAD_STATUS request</div><div class='add'>+ */</div><div class='add'>+static void nfs4_xdr_enc_offload_status(struct rpc_rqst *req,</div><div class='add'>+					struct xdr_stream *xdr,</div><div class='add'>+					const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct nfs42_offload_status_args *args = data;</div><div class='add'>+	struct compound_hdr hdr = {</div><div class='add'>+		.minorversion = nfs4_xdr_minorversion(&amp;args-&gt;osa_seq_args),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	encode_compound_hdr(xdr, req, &amp;hdr);</div><div class='add'>+	encode_sequence(xdr, &amp;args-&gt;osa_seq_args, &amp;hdr);</div><div class='add'>+	encode_putfh(xdr, args-&gt;osa_src_fh, &amp;hdr);</div><div class='add'>+	encode_offload_status(xdr, args, &amp;hdr);</div><div class='add'>+	encode_nops(&amp;hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Encode COPY_NOTIFY request</div><div class='ctx'>  */</div><div class='ctx'> static void nfs4_xdr_enc_copy_notify(struct rpc_rqst *req,</div><div class='hunk'>@@ -607,6 +661,27 @@ static void nfs4_xdr_enc_deallocate(struct rpc_rqst *req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Encode ZERO_RANGE request</div><div class='add'>+ */</div><div class='add'>+static void nfs4_xdr_enc_zero_range(struct rpc_rqst *req,</div><div class='add'>+				    struct xdr_stream *xdr,</div><div class='add'>+				    const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct nfs42_falloc_args *args = data;</div><div class='add'>+	struct compound_hdr hdr = {</div><div class='add'>+		.minorversion = nfs4_xdr_minorversion(&amp;args-&gt;seq_args),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	encode_compound_hdr(xdr, req, &amp;hdr);</div><div class='add'>+	encode_sequence(xdr, &amp;args-&gt;seq_args, &amp;hdr);</div><div class='add'>+	encode_putfh(xdr, args-&gt;falloc_fh, &amp;hdr);</div><div class='add'>+	encode_deallocate(xdr, args, &amp;hdr);</div><div class='add'>+	encode_allocate(xdr, args, &amp;hdr);</div><div class='add'>+	encode_getfattr(xdr, args-&gt;falloc_bitmask, &amp;hdr);</div><div class='add'>+	encode_nops(&amp;hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Encode READ_PLUS request</div><div class='ctx'>  */</div><div class='ctx'> static void nfs4_xdr_enc_read_plus(struct rpc_rqst *req,</div><div class='hunk'>@@ -919,6 +994,26 @@ static int decode_offload_cancel(struct xdr_stream *xdr,</div><div class='ctx'> 	return decode_op_hdr(xdr, OP_OFFLOAD_CANCEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int decode_offload_status(struct xdr_stream *xdr,</div><div class='add'>+				 struct nfs42_offload_status_res *res)</div><div class='add'>+{</div><div class='add'>+	ssize_t result;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = decode_op_hdr(xdr, OP_OFFLOAD_STATUS);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	/* osr_count */</div><div class='add'>+	if (xdr_stream_decode_u64(xdr, &amp;res-&gt;osr_count) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	/* osr_complete&lt;1&gt; */</div><div class='add'>+	result = xdr_stream_decode_uint32_array(xdr, &amp;res-&gt;osr_complete, 1);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	res-&gt;complete_count = result;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int decode_copy_notify(struct xdr_stream *xdr,</div><div class='ctx'> 			      struct nfs42_copy_notify_res *res)</div><div class='ctx'> {</div><div class='hunk'>@@ -1369,6 +1464,32 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Decode OFFLOAD_STATUS response</div><div class='add'>+ */</div><div class='add'>+static int nfs4_xdr_dec_offload_status(struct rpc_rqst *rqstp,</div><div class='add'>+				       struct xdr_stream *xdr,</div><div class='add'>+				       void *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs42_offload_status_res *res = data;</div><div class='add'>+	struct compound_hdr hdr;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = decode_compound_hdr(xdr, &amp;hdr);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_sequence(xdr, &amp;res-&gt;osr_seq_res, rqstp);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_putfh(xdr);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_offload_status(xdr, res);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Decode COPY_NOTIFY response</div><div class='ctx'>  */</div><div class='ctx'> static int nfs4_xdr_dec_copy_notify(struct rpc_rqst *rqstp,</div><div class='hunk'>@@ -1423,6 +1544,37 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Decode ZERO_RANGE request</div><div class='add'>+ */</div><div class='add'>+static int nfs4_xdr_dec_zero_range(struct rpc_rqst *rqstp,</div><div class='add'>+				   struct xdr_stream *xdr,</div><div class='add'>+				   void *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs42_falloc_res *res = data;</div><div class='add'>+	struct compound_hdr hdr;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = decode_compound_hdr(xdr, &amp;hdr);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_sequence(xdr, &amp;res-&gt;seq_res, rqstp);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_putfh(xdr);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_deallocate(xdr, res);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	status = decode_allocate(xdr, res);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out;</div><div class='add'>+	decode_getfattr(xdr, res-&gt;falloc_fattr, res-&gt;falloc_server);</div><div class='add'>+out:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Decode READ_PLUS request</div><div class='ctx'>  */</div><div class='ctx'> static int nfs4_xdr_dec_read_plus(struct rpc_rqst *rqstp,</div><div class='hunk'>@@ -1629,7 +1781,7 @@ static int nfs4_xdr_dec_listxattrs(struct rpc_rqst *rqstp,</div><div class='ctx'> 	struct compound_hdr hdr;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	xdr_set_scratch_page(xdr, res-&gt;scratch);</div><div class='add'>+	xdr_set_scratch_folio(xdr, res-&gt;scratch);</div><div class='ctx'> </div><div class='ctx'> 	status = decode_compound_hdr(xdr, &amp;hdr);</div><div class='ctx'> 	if (status)</div><div class='head'>diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h<br/>index 581698f1b7b2..c34c89af9c7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4_fs.h</a></div><div class='hunk'>@@ -63,11 +63,11 @@ struct nfs4_minor_version_ops {</div><div class='ctx'> 	bool	(*match_stateid)(const nfs4_stateid *,</div><div class='ctx'> 			const nfs4_stateid *);</div><div class='ctx'> 	int	(*find_root_sec)(struct nfs_server *, struct nfs_fh *,</div><div class='del'>-			struct nfs_fsinfo *);</div><div class='add'>+				 struct nfs_fattr *);</div><div class='ctx'> 	void	(*free_lock_state)(struct nfs_server *,</div><div class='ctx'> 			struct nfs4_lock_state *);</div><div class='ctx'> 	int	(*test_and_free_expired)(struct nfs_server *,</div><div class='del'>-			nfs4_stateid *, const struct cred *);</div><div class='add'>+					 nfs4_stateid *, const struct cred *);</div><div class='ctx'> 	struct nfs_seqid *</div><div class='ctx'> 		(*alloc_seqid)(struct nfs_seqid_counter *, gfp_t);</div><div class='ctx'> 	void	(*session_trunk)(struct rpc_clnt *clnt,</div><div class='hunk'>@@ -82,7 +82,7 @@ struct nfs4_minor_version_ops {</div><div class='ctx'> #define NFS_SEQID_CONFIRMED 1</div><div class='ctx'> struct nfs_seqid_counter {</div><div class='ctx'> 	ktime_t create_time;</div><div class='del'>-	int owner_id;</div><div class='add'>+	u64 owner_id;</div><div class='ctx'> 	int flags;</div><div class='ctx'> 	u32 counter;</div><div class='ctx'> 	spinlock_t lock;		/* Protects the list */</div><div class='hunk'>@@ -120,7 +120,6 @@ struct nfs4_state_owner {</div><div class='ctx'> 	unsigned long	     so_flags;</div><div class='ctx'> 	struct list_head     so_states;</div><div class='ctx'> 	struct nfs_seqid_counter so_seqid;</div><div class='del'>-	seqcount_spinlock_t  so_reclaim_seqcount;</div><div class='ctx'> 	struct mutex	     so_delegreturn_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -297,7 +296,8 @@ extern int nfs4_call_sync(struct rpc_clnt *, struct nfs_server *,</div><div class='ctx'> extern void nfs4_init_sequence(struct nfs4_sequence_args *, struct nfs4_sequence_res *, int, int);</div><div class='ctx'> extern int nfs4_proc_setclientid(struct nfs_client *, u32, unsigned short, const struct cred *, struct nfs4_setclientid_res *);</div><div class='ctx'> extern int nfs4_proc_setclientid_confirm(struct nfs_client *, struct nfs4_setclientid_res *arg, const struct cred *);</div><div class='del'>-extern int nfs4_proc_get_rootfh(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *, bool);</div><div class='add'>+extern int nfs4_proc_get_rootfh(struct nfs_server *, struct nfs_fh *,</div><div class='add'>+				struct nfs_fattr *, bool);</div><div class='ctx'> extern int nfs4_proc_bind_conn_to_session(struct nfs_client *, const struct cred *cred);</div><div class='ctx'> extern int nfs4_proc_exchange_id(struct nfs_client *clp, const struct cred *cred);</div><div class='ctx'> extern int nfs4_destroy_clientid(struct nfs_client *clp);</div><div class='hunk'>@@ -330,7 +330,7 @@ extern int update_open_stateid(struct nfs4_state *state,</div><div class='ctx'> 				const nfs4_stateid *deleg_stateid,</div><div class='ctx'> 				fmode_t fmode);</div><div class='ctx'> extern int nfs4_proc_setlease(struct file *file, int arg,</div><div class='del'>-			      struct file_lock **lease, void **priv);</div><div class='add'>+			      struct file_lease **lease, void **priv);</div><div class='ctx'> extern int nfs4_proc_get_lease_time(struct nfs_client *clp,</div><div class='ctx'> 		struct nfs_fsinfo *fsinfo);</div><div class='ctx'> extern void nfs4_update_changeattr(struct inode *dir,</div><div class='head'>diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c<br/>index 11e3a285594c..3a4baed993c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4client.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4client.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4client.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/sunrpc/xprt.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/bc_xprt.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/rpc_pipe_fs.h&gt;</div><div class='add'>+#include &lt;net/handshake.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "callback.h"</div><div class='ctx'> #include "delegation.h"</div><div class='hunk'>@@ -222,6 +223,7 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)</div><div class='ctx'> 	clp-&gt;cl_state = 1 &lt;&lt; NFS4CLNT_LEASE_EXPIRED;</div><div class='ctx'> 	clp-&gt;cl_mvops = nfs_v4_minor_ops[cl_init-&gt;minorversion];</div><div class='ctx'> 	clp-&gt;cl_mig_gen = 1;</div><div class='add'>+	clp-&gt;cl_last_renewal = jiffies;</div><div class='ctx'> #if IS_ENABLED(CONFIG_NFS_V4_1)</div><div class='ctx'> 	init_waitqueue_head(&amp;clp-&gt;cl_lock_waitq);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -231,9 +233,10 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)</div><div class='ctx'> 		__set_bit(NFS_CS_INFINITE_SLOTS, &amp;clp-&gt;cl_flags);</div><div class='ctx'> 	__set_bit(NFS_CS_DISCRTRY, &amp;clp-&gt;cl_flags);</div><div class='ctx'> 	__set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &amp;clp-&gt;cl_flags);</div><div class='del'>-</div><div class='del'>-	if (test_bit(NFS_CS_DS, &amp;cl_init-&gt;init_flags))</div><div class='del'>-		__set_bit(NFS_CS_DS, &amp;clp-&gt;cl_flags);</div><div class='add'>+	if (test_bit(NFS_CS_PNFS, &amp;cl_init-&gt;init_flags))</div><div class='add'>+		__set_bit(NFS_CS_PNFS, &amp;clp-&gt;cl_flags);</div><div class='add'>+	if (test_bit(NFS_CS_NETUNREACH_FATAL, &amp;cl_init-&gt;init_flags))</div><div class='add'>+		__set_bit(NFS_CS_NETUNREACH_FATAL, &amp;clp-&gt;cl_flags);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set up the connection to the server before we add add to the</div><div class='ctx'> 	 * global list.</div><div class='hunk'>@@ -801,6 +804,7 @@ static void nfs4_destroy_server(struct nfs_server *server)</div><div class='ctx'> 	unset_pnfs_layoutdriver(server);</div><div class='ctx'> 	nfs4_purge_state_owners(server, &amp;freeme);</div><div class='ctx'> 	nfs4_free_state_owners(&amp;freeme);</div><div class='add'>+	kfree(server-&gt;delegation_hash_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -894,51 +898,40 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,</div><div class='ctx'>  * Set up an NFS4 client</div><div class='ctx'>  */</div><div class='ctx'> static int nfs4_set_client(struct nfs_server *server,</div><div class='del'>-		const char *hostname,</div><div class='del'>-		const struct sockaddr_storage *addr,</div><div class='del'>-		const size_t addrlen,</div><div class='del'>-		const char *ip_addr,</div><div class='del'>-		int proto, const struct rpc_timeout *timeparms,</div><div class='del'>-		u32 minorversion, unsigned int nconnect,</div><div class='del'>-		unsigned int max_connect,</div><div class='del'>-		struct net *net,</div><div class='del'>-		struct xprtsec_parms *xprtsec)</div><div class='add'>+		struct nfs_client_initdata *cl_init)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_client_initdata cl_init = {</div><div class='del'>-		.hostname = hostname,</div><div class='del'>-		.addr = addr,</div><div class='del'>-		.addrlen = addrlen,</div><div class='del'>-		.ip_addr = ip_addr,</div><div class='del'>-		.nfs_mod = &amp;nfs_v4,</div><div class='del'>-		.proto = proto,</div><div class='del'>-		.minorversion = minorversion,</div><div class='del'>-		.net = net,</div><div class='del'>-		.timeparms = timeparms,</div><div class='del'>-		.cred = server-&gt;cred,</div><div class='del'>-		.xprtsec = *xprtsec,</div><div class='del'>-	};</div><div class='ctx'> 	struct nfs_client *clp;</div><div class='ctx'> </div><div class='del'>-	if (minorversion == 0)</div><div class='del'>-		__set_bit(NFS_CS_REUSEPORT, &amp;cl_init.init_flags);</div><div class='del'>-	else</div><div class='del'>-		cl_init.max_connect = max_connect;</div><div class='del'>-	switch (proto) {</div><div class='add'>+	cl_init-&gt;nfs_mod = &amp;nfs_v4;</div><div class='add'>+	cl_init-&gt;cred = server-&gt;cred;</div><div class='add'>+</div><div class='add'>+	if (cl_init-&gt;minorversion == 0) {</div><div class='add'>+		__set_bit(NFS_CS_REUSEPORT, &amp;cl_init-&gt;init_flags);</div><div class='add'>+		cl_init-&gt;max_connect = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cl_init-&gt;proto) {</div><div class='add'>+	case XPRT_TRANSPORT_RDMA:</div><div class='ctx'> 	case XPRT_TRANSPORT_TCP:</div><div class='ctx'> 	case XPRT_TRANSPORT_TCP_TLS:</div><div class='del'>-		cl_init.nconnect = nconnect;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cl_init-&gt;nconnect = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (server-&gt;flags &amp; NFS_MOUNT_NORESVPORT)</div><div class='del'>-		__set_bit(NFS_CS_NORESVPORT, &amp;cl_init.init_flags);</div><div class='add'>+		__set_bit(NFS_CS_NORESVPORT, &amp;cl_init-&gt;init_flags);</div><div class='ctx'> 	if (server-&gt;options &amp; NFS_OPTION_MIGRATION)</div><div class='del'>-		__set_bit(NFS_CS_MIGRATION, &amp;cl_init.init_flags);</div><div class='add'>+		__set_bit(NFS_CS_MIGRATION, &amp;cl_init-&gt;init_flags);</div><div class='ctx'> 	if (test_bit(NFS_MIG_TSM_POSSIBLE, &amp;server-&gt;mig_status))</div><div class='del'>-		__set_bit(NFS_CS_TSM_POSSIBLE, &amp;cl_init.init_flags);</div><div class='del'>-	server-&gt;port = rpc_get_port((struct sockaddr *)addr);</div><div class='add'>+		__set_bit(NFS_CS_TSM_POSSIBLE, &amp;cl_init-&gt;init_flags);</div><div class='add'>+	server-&gt;port = rpc_get_port((struct sockaddr *)cl_init-&gt;addr);</div><div class='add'>+</div><div class='add'>+	if (server-&gt;flags &amp; NFS_MOUNT_NETUNREACH_FATAL)</div><div class='add'>+		__set_bit(NFS_CS_NETUNREACH_FATAL, &amp;cl_init-&gt;init_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate or find a client reference we can use */</div><div class='del'>-	clp = nfs_get_client(&amp;cl_init);</div><div class='add'>+	clp = nfs_get_client(cl_init);</div><div class='ctx'> 	if (IS_ERR(clp))</div><div class='ctx'> 		return PTR_ERR(clp);</div><div class='ctx'> </div><div class='hunk'>@@ -991,7 +984,11 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,</div><div class='ctx'> 		.net = mds_clp-&gt;cl_net,</div><div class='ctx'> 		.timeparms = &amp;ds_timeout,</div><div class='ctx'> 		.cred = mds_srv-&gt;cred,</div><div class='del'>-		.xprtsec = mds_srv-&gt;nfs_client-&gt;cl_xprtsec,</div><div class='add'>+		.xprtsec = {</div><div class='add'>+			.policy = RPC_XPRTSEC_NONE,</div><div class='add'>+			.cert_serial = TLS_NO_CERT,</div><div class='add'>+			.privkey_serial = TLS_NO_PRIVKEY,</div><div class='add'>+		},</div><div class='ctx'> 	};</div><div class='ctx'> 	char buf[INET6_ADDRSTRLEN + 1];</div><div class='ctx'> </div><div class='hunk'>@@ -1000,8 +997,14 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,</div><div class='ctx'> 	cl_init.hostname = buf;</div><div class='ctx'> </div><div class='ctx'> 	switch (ds_proto) {</div><div class='del'>-	case XPRT_TRANSPORT_TCP:</div><div class='ctx'> 	case XPRT_TRANSPORT_TCP_TLS:</div><div class='add'>+		if (mds_srv-&gt;nfs_client-&gt;cl_xprtsec.policy != RPC_XPRTSEC_NONE)</div><div class='add'>+			cl_init.xprtsec = mds_srv-&gt;nfs_client-&gt;cl_xprtsec;</div><div class='add'>+		else</div><div class='add'>+			ds_proto = XPRT_TRANSPORT_TCP;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XPRT_TRANSPORT_RDMA:</div><div class='add'>+	case XPRT_TRANSPORT_TCP:</div><div class='ctx'> 		if (mds_clp-&gt;cl_nconnect &gt; 1) {</div><div class='ctx'> 			cl_init.nconnect = mds_clp-&gt;cl_nconnect;</div><div class='ctx'> 			cl_init.max_connect = NFS_MAX_TRANSPORTS;</div><div class='hunk'>@@ -1010,8 +1013,9 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,</div><div class='ctx'> </div><div class='ctx'> 	if (mds_srv-&gt;flags &amp; NFS_MOUNT_NORESVPORT)</div><div class='ctx'> 		__set_bit(NFS_CS_NORESVPORT, &amp;cl_init.init_flags);</div><div class='add'>+	if (test_bit(NFS_CS_NETUNREACH_FATAL, &amp;mds_clp-&gt;cl_flags))</div><div class='add'>+		__set_bit(NFS_CS_NETUNREACH_FATAL, &amp;cl_init.init_flags);</div><div class='ctx'> </div><div class='del'>-	__set_bit(NFS_CS_DS, &amp;cl_init.init_flags);</div><div class='ctx'> 	__set_bit(NFS_CS_PNFS, &amp;cl_init.init_flags);</div><div class='ctx'> 	cl_init.max_connect = NFS_MAX_TRANSPORTS;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1081,29 +1085,15 @@ static void nfs4_session_limit_xasize(struct nfs_server *server)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void nfs4_server_set_init_caps(struct nfs_server *server)</div><div class='del'>-{</div><div class='del'>-	/* Set the basic capabilities */</div><div class='del'>-	server-&gt;caps |= server-&gt;nfs_client-&gt;cl_mvops-&gt;init_caps;</div><div class='del'>-	if (server-&gt;flags &amp; NFS_MOUNT_NORDIRPLUS)</div><div class='del'>-			server-&gt;caps &amp;= ~NFS_CAP_READDIRPLUS;</div><div class='del'>-	if (server-&gt;nfs_client-&gt;cl_proto == XPRT_TRANSPORT_RDMA)</div><div class='del'>-		server-&gt;caps &amp;= ~NFS_CAP_READ_PLUS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower</div><div class='del'>-	 * authentication.</div><div class='del'>-	 */</div><div class='del'>-	if (nfs4_disable_idmapping &amp;&amp;</div><div class='del'>-			server-&gt;client-&gt;cl_auth-&gt;au_flavor == RPC_AUTH_UNIX)</div><div class='del'>-		server-&gt;caps |= NFS_CAP_UIDGID_NOMAP;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nfs4_server_common_setup(struct nfs_server *server,</div><div class='ctx'> 		struct nfs_fh *mntfh, bool auth_probe)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	error = nfs4_delegation_hash_alloc(server);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	/* data servers support only a subset of NFSv4.1 */</div><div class='ctx'> 	if (is_ds_only_client(server-&gt;nfs_client))</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='hunk'>@@ -1111,14 +1101,14 @@ static int nfs4_server_common_setup(struct nfs_server *server,</div><div class='ctx'> 	/* We must ensure the session is initialised first */</div><div class='ctx'> 	error = nfs4_init_session(server-&gt;nfs_client);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	nfs4_server_set_init_caps(server);</div><div class='add'>+	nfs_server_set_init_caps(server);</div><div class='ctx'> </div><div class='ctx'> 	/* Probe the root fh to retrieve its FSID and filehandle */</div><div class='ctx'> 	error = nfs4_get_rootfh(server, mntfh, auth_probe);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("Server FSID: %llx:%llx\n",</div><div class='ctx'> 			(unsigned long long) server-&gt;fsid.major,</div><div class='hunk'>@@ -1127,7 +1117,7 @@ static int nfs4_server_common_setup(struct nfs_server *server,</div><div class='ctx'> </div><div class='ctx'> 	error = nfs_probe_server(server, mntfh);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	nfs4_session_limit_rwsize(server);</div><div class='ctx'> 	nfs4_session_limit_xasize(server);</div><div class='hunk'>@@ -1138,8 +1128,7 @@ static int nfs4_server_common_setup(struct nfs_server *server,</div><div class='ctx'> 	nfs_server_insert_lists(server);</div><div class='ctx'> 	server-&gt;mount_time = jiffies;</div><div class='ctx'> 	server-&gt;destroy = nfs4_destroy_server;</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1149,6 +1138,19 @@ static int nfs4_init_server(struct nfs_server *server, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_fs_context *ctx = nfs_fc2context(fc);</div><div class='ctx'> 	struct rpc_timeout timeparms;</div><div class='add'>+	struct nfs_client_initdata cl_init = {</div><div class='add'>+		.hostname = ctx-&gt;nfs_server.hostname,</div><div class='add'>+		.addr = &amp;ctx-&gt;nfs_server._address,</div><div class='add'>+		.addrlen = ctx-&gt;nfs_server.addrlen,</div><div class='add'>+		.ip_addr = ctx-&gt;client_address,</div><div class='add'>+		.proto = ctx-&gt;nfs_server.protocol,</div><div class='add'>+		.minorversion = ctx-&gt;minorversion,</div><div class='add'>+		.net = fc-&gt;net_ns,</div><div class='add'>+		.timeparms = &amp;timeparms,</div><div class='add'>+		.xprtsec = ctx-&gt;xprtsec,</div><div class='add'>+		.nconnect = ctx-&gt;nfs_server.nconnect,</div><div class='add'>+		.max_connect = ctx-&gt;nfs_server.max_connect,</div><div class='add'>+	};</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	nfs_init_timeout_values(&amp;timeparms, ctx-&gt;nfs_server.protocol,</div><div class='hunk'>@@ -1168,18 +1170,7 @@ static int nfs4_init_server(struct nfs_server *server, struct fs_context *fc)</div><div class='ctx'> 		ctx-&gt;selected_flavor = RPC_AUTH_UNIX;</div><div class='ctx'> </div><div class='ctx'> 	/* Get a client record */</div><div class='del'>-	error = nfs4_set_client(server,</div><div class='del'>-				ctx-&gt;nfs_server.hostname,</div><div class='del'>-				&amp;ctx-&gt;nfs_server._address,</div><div class='del'>-				ctx-&gt;nfs_server.addrlen,</div><div class='del'>-				ctx-&gt;client_address,</div><div class='del'>-				ctx-&gt;nfs_server.protocol,</div><div class='del'>-				&amp;timeparms,</div><div class='del'>-				ctx-&gt;minorversion,</div><div class='del'>-				ctx-&gt;nfs_server.nconnect,</div><div class='del'>-				ctx-&gt;nfs_server.max_connect,</div><div class='del'>-				fc-&gt;net_ns,</div><div class='del'>-				&amp;ctx-&gt;xprtsec);</div><div class='add'>+	error = nfs4_set_client(server, &amp;cl_init);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -1239,18 +1230,28 @@ error:</div><div class='ctx'> struct nfs_server *nfs4_create_referral_server(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_fs_context *ctx = nfs_fc2context(fc);</div><div class='del'>-	struct nfs_client *parent_client;</div><div class='del'>-	struct nfs_server *server, *parent_server;</div><div class='del'>-	int proto, error;</div><div class='add'>+	struct nfs_server *parent_server = NFS_SB(ctx-&gt;clone_data.sb);</div><div class='add'>+	struct nfs_client *parent_client = parent_server-&gt;nfs_client;</div><div class='add'>+	struct nfs_client_initdata cl_init = {</div><div class='add'>+		.hostname = ctx-&gt;nfs_server.hostname,</div><div class='add'>+		.addr = &amp;ctx-&gt;nfs_server._address,</div><div class='add'>+		.addrlen = ctx-&gt;nfs_server.addrlen,</div><div class='add'>+		.ip_addr = parent_client-&gt;cl_ipaddr,</div><div class='add'>+		.minorversion = parent_client-&gt;cl_mvops-&gt;minor_version,</div><div class='add'>+		.net = parent_client-&gt;cl_net,</div><div class='add'>+		.timeparms = parent_server-&gt;client-&gt;cl_timeout,</div><div class='add'>+		.xprtsec = parent_client-&gt;cl_xprtsec,</div><div class='add'>+		.nconnect = parent_client-&gt;cl_nconnect,</div><div class='add'>+		.max_connect = parent_client-&gt;cl_max_connect,</div><div class='add'>+	};</div><div class='add'>+	struct nfs_server *server;</div><div class='ctx'> 	bool auth_probe;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	server = nfs_alloc_server();</div><div class='ctx'> 	if (!server)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	parent_server = NFS_SB(ctx-&gt;clone_data.sb);</div><div class='del'>-	parent_client = parent_server-&gt;nfs_client;</div><div class='del'>-</div><div class='ctx'> 	server-&gt;cred = get_cred(parent_server-&gt;cred);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise the client representation from the parent server */</div><div class='hunk'>@@ -1259,38 +1260,17 @@ struct nfs_server *nfs4_create_referral_server(struct fs_context *fc)</div><div class='ctx'> 	/* Get a client representation */</div><div class='ctx'> #if IS_ENABLED(CONFIG_SUNRPC_XPRT_RDMA)</div><div class='ctx'> 	rpc_set_port(&amp;ctx-&gt;nfs_server.address, NFS_RDMA_PORT);</div><div class='del'>-	error = nfs4_set_client(server,</div><div class='del'>-				ctx-&gt;nfs_server.hostname,</div><div class='del'>-				&amp;ctx-&gt;nfs_server._address,</div><div class='del'>-				ctx-&gt;nfs_server.addrlen,</div><div class='del'>-				parent_client-&gt;cl_ipaddr,</div><div class='del'>-				XPRT_TRANSPORT_RDMA,</div><div class='del'>-				parent_server-&gt;client-&gt;cl_timeout,</div><div class='del'>-				parent_client-&gt;cl_mvops-&gt;minor_version,</div><div class='del'>-				parent_client-&gt;cl_nconnect,</div><div class='del'>-				parent_client-&gt;cl_max_connect,</div><div class='del'>-				parent_client-&gt;cl_net,</div><div class='del'>-				&amp;parent_client-&gt;cl_xprtsec);</div><div class='add'>+	cl_init.proto = XPRT_TRANSPORT_RDMA;</div><div class='add'>+	error = nfs4_set_client(server, &amp;cl_init);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		goto init_server;</div><div class='ctx'> #endif	/* IS_ENABLED(CONFIG_SUNRPC_XPRT_RDMA) */</div><div class='ctx'> </div><div class='del'>-	proto = XPRT_TRANSPORT_TCP;</div><div class='add'>+	cl_init.proto = XPRT_TRANSPORT_TCP;</div><div class='ctx'> 	if (parent_client-&gt;cl_xprtsec.policy != RPC_XPRTSEC_NONE)</div><div class='del'>-		proto = XPRT_TRANSPORT_TCP_TLS;</div><div class='add'>+		cl_init.proto = XPRT_TRANSPORT_TCP_TLS;</div><div class='ctx'> 	rpc_set_port(&amp;ctx-&gt;nfs_server.address, NFS_PORT);</div><div class='del'>-	error = nfs4_set_client(server,</div><div class='del'>-				ctx-&gt;nfs_server.hostname,</div><div class='del'>-				&amp;ctx-&gt;nfs_server._address,</div><div class='del'>-				ctx-&gt;nfs_server.addrlen,</div><div class='del'>-				parent_client-&gt;cl_ipaddr,</div><div class='del'>-				proto,</div><div class='del'>-				parent_server-&gt;client-&gt;cl_timeout,</div><div class='del'>-				parent_client-&gt;cl_mvops-&gt;minor_version,</div><div class='del'>-				parent_client-&gt;cl_nconnect,</div><div class='del'>-				parent_client-&gt;cl_max_connect,</div><div class='del'>-				parent_client-&gt;cl_net,</div><div class='del'>-				&amp;parent_client-&gt;cl_xprtsec);</div><div class='add'>+	error = nfs4_set_client(server, &amp;cl_init);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -1346,6 +1326,19 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname,</div><div class='ctx'> 	char buf[INET6_ADDRSTRLEN + 1];</div><div class='ctx'> 	struct sockaddr_storage address;</div><div class='ctx'> 	struct sockaddr *localaddr = (struct sockaddr *)&amp;address;</div><div class='add'>+	struct nfs_client_initdata cl_init = {</div><div class='add'>+		.hostname = hostname,</div><div class='add'>+		.addr = sap,</div><div class='add'>+		.addrlen = salen,</div><div class='add'>+		.ip_addr = buf,</div><div class='add'>+		.proto = clp-&gt;cl_proto,</div><div class='add'>+		.minorversion = clp-&gt;cl_minorversion,</div><div class='add'>+		.net = net,</div><div class='add'>+		.timeparms = clnt-&gt;cl_timeout,</div><div class='add'>+		.xprtsec = clp-&gt;cl_xprtsec,</div><div class='add'>+		.nconnect = clp-&gt;cl_nconnect,</div><div class='add'>+		.max_connect = clp-&gt;cl_max_connect,</div><div class='add'>+	};</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = rpc_switch_client_transport(clnt, &amp;xargs, clnt-&gt;cl_timeout);</div><div class='hunk'>@@ -1361,11 +1354,7 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname,</div><div class='ctx'> </div><div class='ctx'> 	nfs_server_remove_lists(server);</div><div class='ctx'> 	set_bit(NFS_MIG_TSM_POSSIBLE, &amp;server-&gt;mig_status);</div><div class='del'>-	error = nfs4_set_client(server, hostname, sap, salen, buf,</div><div class='del'>-				clp-&gt;cl_proto, clnt-&gt;cl_timeout,</div><div class='del'>-				clp-&gt;cl_minorversion,</div><div class='del'>-				clp-&gt;cl_nconnect, clp-&gt;cl_max_connect,</div><div class='del'>-				net, &amp;clp-&gt;cl_xprtsec);</div><div class='add'>+	error = nfs4_set_client(server, &amp;cl_init);</div><div class='ctx'> 	clear_bit(NFS_MIG_TSM_POSSIBLE, &amp;server-&gt;mig_status);</div><div class='ctx'> 	if (error != 0) {</div><div class='ctx'> 		nfs_server_insert_lists(server);</div><div class='head'>diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c<br/>index e238abc78a13..7317f26892c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4file.c</a></div><div class='hunk'>@@ -225,8 +225,14 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_t</div><div class='ctx'> 	if (!S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if ((mode != 0) &amp;&amp; (mode != (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE)))</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case 0:</div><div class='add'>+	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:</div><div class='add'>+	case FALLOC_FL_ZERO_RANGE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = inode_newsize_ok(inode, offset + len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -234,6 +240,8 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_t</div><div class='ctx'> </div><div class='ctx'> 	if (mode &amp; FALLOC_FL_PUNCH_HOLE)</div><div class='ctx'> 		return nfs42_proc_deallocate(filep, offset, len);</div><div class='add'>+	else if (mode &amp; FALLOC_FL_ZERO_RANGE)</div><div class='add'>+		return nfs42_proc_zero_range(filep, offset ,len);</div><div class='ctx'> 	return nfs42_proc_allocate(filep, offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -245,7 +253,6 @@ static loff_t nfs42_remap_file_range(struct file *src_file, loff_t src_off,</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(dst_inode);</div><div class='ctx'> 	struct inode *src_inode = file_inode(src_file);</div><div class='ctx'> 	unsigned int bs = server-&gt;clone_blksize;</div><div class='del'>-	bool same_inode = false;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* NFS does not support deduplication. */</div><div class='hunk'>@@ -267,25 +274,15 @@ static loff_t nfs42_remap_file_range(struct file *src_file, loff_t src_off,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (src_inode == dst_inode)</div><div class='del'>-		same_inode = true;</div><div class='del'>-</div><div class='ctx'> 	/* XXX: do we lock at all? what if server needs CB_RECALL_LAYOUT? */</div><div class='del'>-	if (same_inode) {</div><div class='del'>-		inode_lock(src_inode);</div><div class='del'>-	} else if (dst_inode &lt; src_inode) {</div><div class='del'>-		inode_lock_nested(dst_inode, I_MUTEX_PARENT);</div><div class='del'>-		inode_lock_nested(src_inode, I_MUTEX_CHILD);</div><div class='del'>-	} else {</div><div class='del'>-		inode_lock_nested(src_inode, I_MUTEX_PARENT);</div><div class='del'>-		inode_lock_nested(dst_inode, I_MUTEX_CHILD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	lock_two_nondirectories(src_inode, dst_inode);</div><div class='ctx'> 	/* flush all pending writes on both src and dst so that server</div><div class='ctx'> 	 * has the latest data */</div><div class='add'>+	nfs_file_block_o_direct(NFS_I(src_inode));</div><div class='ctx'> 	ret = nfs_sync_inode(src_inode);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	nfs_file_block_o_direct(NFS_I(dst_inode));</div><div class='ctx'> 	ret = nfs_sync_inode(dst_inode);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -298,15 +295,7 @@ static loff_t nfs42_remap_file_range(struct file *src_file, loff_t src_off,</div><div class='ctx'> 		truncate_inode_pages_range(&amp;dst_inode-&gt;i_data, dst_off, dst_off + count - 1);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	if (same_inode) {</div><div class='del'>-		inode_unlock(src_inode);</div><div class='del'>-	} else if (dst_inode &lt; src_inode) {</div><div class='del'>-		inode_unlock(src_inode);</div><div class='del'>-		inode_unlock(dst_inode);</div><div class='del'>-	} else {</div><div class='del'>-		inode_unlock(dst_inode);</div><div class='del'>-		inode_unlock(src_inode);</div><div class='del'>-	}</div><div class='add'>+	unlock_two_nondirectories(src_inode, dst_inode);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret &lt; 0 ? ret : count;</div><div class='ctx'> }</div><div class='hunk'>@@ -439,16 +428,18 @@ void nfs42_ssc_unregister_ops(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_NFS_V4_2 */</div><div class='ctx'> </div><div class='del'>-static int nfs4_setlease(struct file *file, int arg, struct file_lock **lease,</div><div class='add'>+static int nfs4_setlease(struct file *file, int arg, struct file_lease **lease,</div><div class='ctx'> 			 void **priv)</div><div class='ctx'> {</div><div class='add'>+	if (!S_ISREG(file_inode(file)-&gt;i_mode))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	return nfs4_proc_setlease(file, arg, lease, priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct file_operations nfs4_file_operations = {</div><div class='ctx'> 	.read_iter	= nfs_file_read,</div><div class='ctx'> 	.write_iter	= nfs_file_write,</div><div class='del'>-	.mmap		= nfs_file_mmap,</div><div class='add'>+	.mmap_prepare	= nfs_file_mmap_prepare,</div><div class='ctx'> 	.open		= nfs4_file_open,</div><div class='ctx'> 	.flush		= nfs4_file_flush,</div><div class='ctx'> 	.release	= nfs_file_release,</div><div class='hunk'>@@ -467,4 +458,5 @@ const struct file_operations nfs4_file_operations = {</div><div class='ctx'> #else</div><div class='ctx'> 	.llseek		= nfs_file_llseek,</div><div class='ctx'> #endif</div><div class='add'>+	.fop_flags	= FOP_DONTCACHE,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfs/nfs4getroot.c b/fs/nfs/nfs4getroot.c<br/>index 1a69479a3a59..e67ea345de69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4getroot.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4getroot.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4getroot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4getroot.c</a></div><div class='hunk'>@@ -12,30 +12,28 @@</div><div class='ctx'> </div><div class='ctx'> int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh, bool auth_probe)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_fsinfo fsinfo;</div><div class='add'>+	struct nfs_fattr *fattr = nfs_alloc_fattr();</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	fsinfo.fattr = nfs_alloc_fattr();</div><div class='del'>-	if (fsinfo.fattr == NULL)</div><div class='add'>+	if (fattr == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Start by getting the root filehandle from the server */</div><div class='del'>-	ret = nfs4_proc_get_rootfh(server, mntfh, &amp;fsinfo, auth_probe);</div><div class='add'>+	ret = nfs4_proc_get_rootfh(server, mntfh, fattr, auth_probe);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dprintk("nfs4_get_rootfh: getroot error = %d\n", -ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(fsinfo.fattr-&gt;valid &amp; NFS_ATTR_FATTR_TYPE)</div><div class='del'>-			|| !S_ISDIR(fsinfo.fattr-&gt;mode)) {</div><div class='add'>+	if (!(fattr-&gt;valid &amp; NFS_ATTR_FATTR_TYPE) || !S_ISDIR(fattr-&gt;mode)) {</div><div class='ctx'> 		printk(KERN_ERR "nfs4_get_rootfh:"</div><div class='ctx'> 		       " getroot encountered non-directory\n");</div><div class='ctx'> 		ret = -ENOTDIR;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;server-&gt;fsid, &amp;fsinfo.fattr-&gt;fsid, sizeof(server-&gt;fsid));</div><div class='add'>+	memcpy(&amp;server-&gt;fsid, &amp;fattr-&gt;fsid, sizeof(server-&gt;fsid));</div><div class='ctx'> out:</div><div class='del'>-	nfs_free_fattr(fsinfo.fattr);</div><div class='add'>+	nfs_free_fattr(fattr);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c<br/>index 25a7c771cfd8..9e1c48c5c0b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4idmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4idmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4idmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4idmap.c</a></div><div class='hunk'>@@ -306,15 +306,12 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,</div><div class='ctx'> 				 const char *type, void *data,</div><div class='ctx'> 				 size_t data_size, struct idmap *idmap)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *saved_cred;</div><div class='ctx'> 	struct key *rkey;</div><div class='ctx'> 	const struct user_key_payload *payload;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	saved_cred = override_creds(id_resolver_cache);</div><div class='del'>-	rkey = nfs_idmap_request_key(name, namelen, type, idmap);</div><div class='del'>-	revert_creds(saved_cred);</div><div class='del'>-</div><div class='add'>+	scoped_with_creds(id_resolver_cache)</div><div class='add'>+		rkey = nfs_idmap_request_key(name, namelen, type, idmap);</div><div class='ctx'> 	if (IS_ERR(rkey)) {</div><div class='ctx'> 		ret = PTR_ERR(rkey);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -424,26 +421,16 @@ static void nfs_idmap_pipe_destroy(struct dentry *dir,</div><div class='ctx'> 		struct rpc_pipe_dir_object *pdo)</div><div class='ctx'> {</div><div class='ctx'> 	struct idmap *idmap = pdo-&gt;pdo_data;</div><div class='del'>-	struct rpc_pipe *pipe = idmap-&gt;idmap_pipe;</div><div class='ctx'> </div><div class='del'>-	if (pipe-&gt;dentry) {</div><div class='del'>-		rpc_unlink(pipe-&gt;dentry);</div><div class='del'>-		pipe-&gt;dentry = NULL;</div><div class='del'>-	}</div><div class='add'>+	rpc_unlink(idmap-&gt;idmap_pipe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs_idmap_pipe_create(struct dentry *dir,</div><div class='ctx'> 		struct rpc_pipe_dir_object *pdo)</div><div class='ctx'> {</div><div class='ctx'> 	struct idmap *idmap = pdo-&gt;pdo_data;</div><div class='del'>-	struct rpc_pipe *pipe = idmap-&gt;idmap_pipe;</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> </div><div class='del'>-	dentry = rpc_mkpipe_dentry(dir, "idmap", idmap, pipe);</div><div class='del'>-	if (IS_ERR(dentry))</div><div class='del'>-		return PTR_ERR(dentry);</div><div class='del'>-	pipe-&gt;dentry = dentry;</div><div class='del'>-	return 0;</div><div class='add'>+	return rpc_mkpipe_dentry(dir, "idmap", idmap, idmap-&gt;idmap_pipe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rpc_pipe_dir_object_ops nfs_idmap_pipe_dir_object_ops = {</div><div class='head'>diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c<br/>index 23819a756508..93c6ce04332b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4proc.c</a></div><div class='hunk'>@@ -103,10 +103,10 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp,</div><div class='ctx'> 		const struct cred *cred,</div><div class='ctx'> 		struct nfs4_slot *slot,</div><div class='ctx'> 		bool is_privileged);</div><div class='del'>-static int nfs41_test_stateid(struct nfs_server *, nfs4_stateid *,</div><div class='del'>-		const struct cred *);</div><div class='del'>-static int nfs41_free_stateid(struct nfs_server *, const nfs4_stateid *,</div><div class='del'>-		const struct cred *, bool);</div><div class='add'>+static int nfs41_test_stateid(struct nfs_server *, const nfs4_stateid *,</div><div class='add'>+			      const struct cred *);</div><div class='add'>+static int nfs41_free_stateid(struct nfs_server *, nfs4_stateid *,</div><div class='add'>+			      const struct cred *, bool);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFS_V4_SECURITY_LABEL</div><div class='hunk'>@@ -114,6 +114,7 @@ static inline struct nfs4_label *</div><div class='ctx'> nfs4_label_init_security(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct iattr *sattr, struct nfs4_label *label)</div><div class='ctx'> {</div><div class='add'>+	struct lsm_context shim;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (label == NULL)</div><div class='hunk'>@@ -128,18 +129,26 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	label-&gt;label = NULL;</div><div class='ctx'> </div><div class='ctx'> 	err = security_dentry_init_security(dentry, sattr-&gt;ia_mode,</div><div class='del'>-				&amp;dentry-&gt;d_name, NULL,</div><div class='del'>-				(void **)&amp;label-&gt;label, &amp;label-&gt;len);</div><div class='del'>-	if (err == 0)</div><div class='del'>-		return label;</div><div class='add'>+				&amp;dentry-&gt;d_name, NULL, &amp;shim);</div><div class='add'>+	if (err)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	label-&gt;lsmid = shim.id;</div><div class='add'>+	label-&gt;label = shim.context;</div><div class='add'>+	label-&gt;len = shim.len;</div><div class='add'>+	return label;</div><div class='ctx'> }</div><div class='ctx'> static inline void</div><div class='ctx'> nfs4_label_release_security(struct nfs4_label *label)</div><div class='ctx'> {</div><div class='del'>-	if (label)</div><div class='del'>-		security_release_secctx(label-&gt;label, label-&gt;len);</div><div class='add'>+	struct lsm_context shim;</div><div class='add'>+</div><div class='add'>+	if (label) {</div><div class='add'>+		shim.context = label-&gt;label;</div><div class='add'>+		shim.len = label-&gt;len;</div><div class='add'>+		shim.id = label-&gt;lsmid;</div><div class='add'>+		security_release_secctx(&amp;shim);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> static inline u32 *nfs4_bitmask(struct nfs_server *server, struct nfs4_label *label)</div><div class='ctx'> {</div><div class='hunk'>@@ -186,6 +195,9 @@ static int nfs4_map_errors(int err)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	case -NFS4ERR_NOT_SAME:</div><div class='ctx'> 		return -ENOTSYNC;</div><div class='add'>+	case -ENETDOWN:</div><div class='add'>+	case -ENETUNREACH:</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk("%s could not handle NFSv4 error %d\n",</div><div class='ctx'> 				__func__, -err);</div><div class='hunk'>@@ -210,6 +222,7 @@ const u32 nfs4_fattr_bitmap[3] = {</div><div class='ctx'> 	| FATTR4_WORD1_RAWDEV</div><div class='ctx'> 	| FATTR4_WORD1_SPACE_USED</div><div class='ctx'> 	| FATTR4_WORD1_TIME_ACCESS</div><div class='add'>+	| FATTR4_WORD1_TIME_CREATE</div><div class='ctx'> 	| FATTR4_WORD1_TIME_METADATA</div><div class='ctx'> 	| FATTR4_WORD1_TIME_MODIFY</div><div class='ctx'> 	| FATTR4_WORD1_MOUNTED_ON_FILEID,</div><div class='hunk'>@@ -231,6 +244,7 @@ static const u32 nfs4_pnfs_open_bitmap[3] = {</div><div class='ctx'> 	| FATTR4_WORD1_RAWDEV</div><div class='ctx'> 	| FATTR4_WORD1_SPACE_USED</div><div class='ctx'> 	| FATTR4_WORD1_TIME_ACCESS</div><div class='add'>+	| FATTR4_WORD1_TIME_CREATE</div><div class='ctx'> 	| FATTR4_WORD1_TIME_METADATA</div><div class='ctx'> 	| FATTR4_WORD1_TIME_MODIFY,</div><div class='ctx'> 	FATTR4_WORD2_MDSTHRESHOLD</div><div class='hunk'>@@ -293,7 +307,7 @@ static void nfs4_bitmap_copy_adjust(__u32 *dst, const __u32 *src,</div><div class='ctx'> 	unsigned long cache_validity;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dst, src, NFS4_BITMASK_SZ*sizeof(*dst));</div><div class='del'>-	if (!inode || !nfs4_have_delegation(inode, FMODE_READ))</div><div class='add'>+	if (!inode || !nfs_have_read_or_write_delegation(inode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cache_validity = READ_ONCE(NFS_I(inode)-&gt;cache_validity) | flags;</div><div class='hunk'>@@ -310,6 +324,21 @@ static void nfs4_bitmap_copy_adjust(__u32 *dst, const __u32 *src,</div><div class='ctx'> 		dst[1] &amp;= ~FATTR4_WORD1_MODE;</div><div class='ctx'> 	if (!(cache_validity &amp; NFS_INO_INVALID_OTHER))</div><div class='ctx'> 		dst[1] &amp;= ~(FATTR4_WORD1_OWNER | FATTR4_WORD1_OWNER_GROUP);</div><div class='add'>+</div><div class='add'>+	if (!(cache_validity &amp; NFS_INO_INVALID_BTIME))</div><div class='add'>+		dst[1] &amp;= ~FATTR4_WORD1_TIME_CREATE;</div><div class='add'>+</div><div class='add'>+	if (nfs_have_delegated_mtime(inode)) {</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_ATIME))</div><div class='add'>+			dst[1] &amp;= ~(FATTR4_WORD1_TIME_ACCESS|FATTR4_WORD1_TIME_ACCESS_SET);</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_MTIME))</div><div class='add'>+			dst[1] &amp;= ~(FATTR4_WORD1_TIME_MODIFY|FATTR4_WORD1_TIME_MODIFY_SET);</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_CTIME))</div><div class='add'>+			dst[1] &amp;= ~(FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY_SET);</div><div class='add'>+	} else if (nfs_have_delegated_atime(inode)) {</div><div class='add'>+		if (!(cache_validity &amp; NFS_INO_INVALID_ATIME))</div><div class='add'>+			dst[1] &amp;= ~(FATTR4_WORD1_TIME_ACCESS|FATTR4_WORD1_TIME_ACCESS_SET);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dentry,</div><div class='hunk'>@@ -362,7 +391,9 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent</div><div class='ctx'> 	*p++ = htonl(attrs);                           /* bitmap */</div><div class='ctx'> 	*p++ = htonl(12);             /* attribute buffer length */</div><div class='ctx'> 	*p++ = htonl(NF4DIR);</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 	p = xdr_encode_hyper(p, NFS_FILEID(d_inode(dentry-&gt;d_parent)));</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> </div><div class='ctx'> 	readdir-&gt;pgbase = (char *)p - (char *)start;</div><div class='ctx'> 	readdir-&gt;count -= readdir-&gt;pgbase;</div><div class='hunk'>@@ -422,6 +453,8 @@ static int nfs4_delay_killable(long *timeout)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='add'>+	if (unlikely(nfs_current_task_exiting()))</div><div class='add'>+		return -EINTR;</div><div class='ctx'> 	__set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);</div><div class='ctx'> 	schedule_timeout(nfs4_update_delay(timeout));</div><div class='ctx'> 	if (!__fatal_signal_pending(current))</div><div class='hunk'>@@ -433,6 +466,8 @@ static int nfs4_delay_interruptible(long *timeout)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='add'>+	if (unlikely(nfs_current_task_exiting()))</div><div class='add'>+		return -EINTR;</div><div class='ctx'> 	__set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE_UNSAFE);</div><div class='ctx'> 	schedule_timeout(nfs4_update_delay(timeout));</div><div class='ctx'> 	if (!signal_pending(current))</div><div class='hunk'>@@ -643,6 +678,15 @@ nfs4_async_handle_exception(struct rpc_task *task, struct nfs_server *server,</div><div class='ctx'> 	struct nfs_client *clp = server-&gt;nfs_client;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if ((task-&gt;tk_rpc_status == -ENETDOWN ||</div><div class='add'>+	     task-&gt;tk_rpc_status == -ENETUNREACH) &amp;&amp;</div><div class='add'>+	    task-&gt;tk_flags &amp; RPC_TASK_NETUNREACH_FATAL) {</div><div class='add'>+		exception-&gt;delay = 0;</div><div class='add'>+		exception-&gt;recovering = 0;</div><div class='add'>+		exception-&gt;retry = 0;</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = nfs4_do_handle_exception(server, errorcode, exception);</div><div class='ctx'> 	if (exception-&gt;delay) {</div><div class='ctx'> 		int ret2 = nfs4_exception_should_retrans(server, exception);</div><div class='hunk'>@@ -1245,7 +1289,8 @@ nfs4_update_changeattr_locked(struct inode *inode,</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> 	u64 change_attr = inode_peek_iversion_raw(inode);</div><div class='ctx'> </div><div class='del'>-	cache_validity |= NFS_INO_INVALID_CTIME | NFS_INO_INVALID_MTIME;</div><div class='add'>+	if (!nfs_have_delegated_mtime(inode))</div><div class='add'>+		cache_validity |= NFS_INO_INVALID_CTIME | NFS_INO_INVALID_MTIME;</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		cache_validity |= NFS_INO_INVALID_DATA;</div><div class='ctx'> </div><div class='hunk'>@@ -1264,12 +1309,13 @@ nfs4_update_changeattr_locked(struct inode *inode,</div><div class='ctx'> 		if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 			nfs_force_lookup_revalidate(inode);</div><div class='ctx'> </div><div class='del'>-		if (!NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_READ))</div><div class='add'>+		if (!nfs_have_delegated_attributes(inode))</div><div class='ctx'> 			cache_validity |=</div><div class='ctx'> 				NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL |</div><div class='ctx'> 				NFS_INO_INVALID_SIZE | NFS_INO_INVALID_OTHER |</div><div class='ctx'> 				NFS_INO_INVALID_BLOCKS | NFS_INO_INVALID_NLINK |</div><div class='del'>-				NFS_INO_INVALID_MODE | NFS_INO_INVALID_XATTR;</div><div class='add'>+				NFS_INO_INVALID_MODE | NFS_INO_INVALID_BTIME |</div><div class='add'>+				NFS_INO_INVALID_XATTR;</div><div class='ctx'> 		nfsi-&gt;attrtimeo = NFS_MINATTRTIMEO(inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	nfsi-&gt;attrtimeo_timestamp = jiffies;</div><div class='hunk'>@@ -1320,8 +1366,7 @@ static fmode_t _nfs4_ctx_to_openmode(const struct nfs_open_context *ctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='del'>-nfs4_map_atomic_open_share(struct nfs_server *server,</div><div class='del'>-		fmode_t fmode, int openflags)</div><div class='add'>+nfs4_fmode_to_share_access(fmode_t fmode)</div><div class='ctx'> {</div><div class='ctx'> 	u32 res = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1335,11 +1380,27 @@ nfs4_map_atomic_open_share(struct nfs_server *server,</div><div class='ctx'> 	case FMODE_READ|FMODE_WRITE:</div><div class='ctx'> 		res = NFS4_SHARE_ACCESS_BOTH;</div><div class='ctx'> 	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+nfs4_map_atomic_open_share(struct nfs_server *server,</div><div class='add'>+		fmode_t fmode, int openflags)</div><div class='add'>+{</div><div class='add'>+	u32 res = nfs4_fmode_to_share_access(fmode);</div><div class='add'>+</div><div class='ctx'> 	if (!(server-&gt;caps &amp; NFS_CAP_ATOMIC_OPEN_V1))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* Want no delegation if we're using O_DIRECT */</div><div class='del'>-	if (openflags &amp; O_DIRECT)</div><div class='add'>+	if (openflags &amp; O_DIRECT) {</div><div class='ctx'> 		res |= NFS4_SHARE_WANT_NO_DELEG;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/* res |= NFS4_SHARE_WANT_NO_PREFERENCE; */</div><div class='add'>+	if (server-&gt;caps &amp; NFS_CAP_DELEGTIME)</div><div class='add'>+		res |= NFS4_SHARE_WANT_DELEG_TIMESTAMPS;</div><div class='add'>+	if (server-&gt;caps &amp; NFS_CAP_OPEN_XOR)</div><div class='add'>+		res |= NFS4_SHARE_WANT_OPEN_XOR_DELEGATION;</div><div class='ctx'> out:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1737,7 +1798,8 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state,</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> 		trace_nfs4_open_stateid_update_wait(state-&gt;inode, stateid, 0);</div><div class='ctx'> </div><div class='del'>-		if (!fatal_signal_pending(current)) {</div><div class='add'>+		if (!fatal_signal_pending(current) &amp;&amp;</div><div class='add'>+		    !nfs_current_task_exiting()) {</div><div class='ctx'> 			if (schedule_timeout(5*HZ) == 0)</div><div class='ctx'> 				status = -EAGAIN;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -1954,44 +2016,41 @@ out_return_state:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nfs4_opendata_check_deleg(struct nfs4_opendata *data, struct nfs4_state *state)</div><div class='del'>-{</div><div class='del'>-	struct nfs_client *clp = NFS_SERVER(state-&gt;inode)-&gt;nfs_client;</div><div class='del'>-	struct nfs_delegation *delegation;</div><div class='del'>-	int delegation_flags = 0;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	delegation = rcu_dereference(NFS_I(state-&gt;inode)-&gt;delegation);</div><div class='del'>-	if (delegation)</div><div class='del'>-		delegation_flags = delegation-&gt;flags;</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	switch (data-&gt;o_arg.claim) {</div><div class='del'>-	default:</div><div class='add'>+nfs4_process_delegation(struct inode *inode, const struct cred *cred,</div><div class='add'>+			enum open_claim_type4 claim,</div><div class='add'>+			const struct nfs4_open_delegation *delegation)</div><div class='add'>+{</div><div class='add'>+	switch (delegation-&gt;open_delegation_type) {</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	switch (claim) {</div><div class='ctx'> 	case NFS4_OPEN_CLAIM_DELEGATE_CUR:</div><div class='ctx'> 	case NFS4_OPEN_CLAIM_DELEG_CUR_FH:</div><div class='ctx'> 		pr_err_ratelimited("NFS: Broken NFSv4 server %s is "</div><div class='ctx'> 				   "returning a delegation for "</div><div class='ctx'> 				   "OPEN(CLAIM_DELEGATE_CUR)\n",</div><div class='del'>-				   clp-&gt;cl_hostname);</div><div class='del'>-		return;</div><div class='add'>+				   NFS_SERVER(inode)-&gt;nfs_client-&gt;cl_hostname);</div><div class='add'>+		break;</div><div class='add'>+	case NFS4_OPEN_CLAIM_PREVIOUS:</div><div class='add'>+		nfs_inode_reclaim_delegation(inode, cred, delegation-&gt;type,</div><div class='add'>+					     &amp;delegation-&gt;stateid,</div><div class='add'>+					     delegation-&gt;pagemod_limit,</div><div class='add'>+					     delegation-&gt;open_delegation_type);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nfs_inode_set_delegation(inode, cred, delegation-&gt;type,</div><div class='add'>+					 &amp;delegation-&gt;stateid,</div><div class='add'>+					 delegation-&gt;pagemod_limit,</div><div class='add'>+					 delegation-&gt;open_delegation_type);</div><div class='ctx'> 	}</div><div class='del'>-	if ((delegation_flags &amp; 1UL&lt;&lt;NFS_DELEGATION_NEED_RECLAIM) == 0)</div><div class='del'>-		nfs_inode_set_delegation(state-&gt;inode,</div><div class='del'>-				data-&gt;owner-&gt;so_cred,</div><div class='del'>-				data-&gt;o_res.delegation_type,</div><div class='del'>-				&amp;data-&gt;o_res.delegation,</div><div class='del'>-				data-&gt;o_res.pagemod_limit);</div><div class='del'>-	else</div><div class='del'>-		nfs_inode_reclaim_delegation(state-&gt;inode,</div><div class='del'>-				data-&gt;owner-&gt;so_cred,</div><div class='del'>-				data-&gt;o_res.delegation_type,</div><div class='del'>-				&amp;data-&gt;o_res.delegation,</div><div class='del'>-				data-&gt;o_res.pagemod_limit);</div><div class='del'>-</div><div class='del'>-	if (data-&gt;o_res.do_recall)</div><div class='del'>-		nfs_async_inode_return_delegation(state-&gt;inode,</div><div class='del'>-						  &amp;data-&gt;o_res.delegation);</div><div class='add'>+	if (delegation-&gt;do_recall)</div><div class='add'>+		nfs_async_inode_return_delegation(inode, &amp;delegation-&gt;stateid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2015,11 +2074,16 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;o_res.delegation_type != 0)</div><div class='del'>-		nfs4_opendata_check_deleg(data, state);</div><div class='add'>+	nfs4_process_delegation(state-&gt;inode,</div><div class='add'>+				data-&gt;owner-&gt;so_cred,</div><div class='add'>+				data-&gt;o_arg.claim,</div><div class='add'>+				&amp;data-&gt;o_res.delegation);</div><div class='ctx'> </div><div class='del'>-	if (!update_open_stateid(state, &amp;data-&gt;o_res.stateid,</div><div class='del'>-				NULL, data-&gt;o_arg.fmode))</div><div class='add'>+	if (!(data-&gt;o_res.rflags &amp; NFS4_OPEN_RESULT_NO_OPEN_STATEID)) {</div><div class='add'>+		if (!update_open_stateid(state, &amp;data-&gt;o_res.stateid,</div><div class='add'>+					 NULL, data-&gt;o_arg.fmode))</div><div class='add'>+			return ERR_PTR(-EAGAIN);</div><div class='add'>+	} else if (!update_open_stateid(state, NULL, NULL, data-&gt;o_arg.fmode))</div><div class='ctx'> 		return ERR_PTR(-EAGAIN);</div><div class='ctx'> 	refcount_inc(&amp;state-&gt;count);</div><div class='ctx'> </div><div class='hunk'>@@ -2083,10 +2147,18 @@ _nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data)</div><div class='ctx'> 	if (IS_ERR(state))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;o_res.delegation_type != 0)</div><div class='del'>-		nfs4_opendata_check_deleg(data, state);</div><div class='del'>-	if (!update_open_stateid(state, &amp;data-&gt;o_res.stateid,</div><div class='del'>-				NULL, data-&gt;o_arg.fmode)) {</div><div class='add'>+	nfs4_process_delegation(state-&gt;inode,</div><div class='add'>+				data-&gt;owner-&gt;so_cred,</div><div class='add'>+				data-&gt;o_arg.claim,</div><div class='add'>+				&amp;data-&gt;o_res.delegation);</div><div class='add'>+</div><div class='add'>+	if (!(data-&gt;o_res.rflags &amp; NFS4_OPEN_RESULT_NO_OPEN_STATEID)) {</div><div class='add'>+		if (!update_open_stateid(state, &amp;data-&gt;o_res.stateid,</div><div class='add'>+					 NULL, data-&gt;o_arg.fmode)) {</div><div class='add'>+			nfs4_put_open_state(state);</div><div class='add'>+			state = ERR_PTR(-EAGAIN);</div><div class='add'>+		}</div><div class='add'>+	} else if (!update_open_stateid(state, NULL, NULL, data-&gt;o_arg.fmode)) {</div><div class='ctx'> 		nfs4_put_open_state(state);</div><div class='ctx'> 		state = ERR_PTR(-EAGAIN);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2222,7 +2294,7 @@ static int _nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_delegation *delegation;</div><div class='ctx'> 	struct nfs4_opendata *opendata;</div><div class='del'>-	fmode_t delegation_type = 0;</div><div class='add'>+	u32 delegation_type = NFS4_OPEN_DELEGATE_NONE;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	opendata = nfs4_open_recoverdata_alloc(ctx, state,</div><div class='hunk'>@@ -2231,8 +2303,20 @@ static int _nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state</div><div class='ctx'> 		return PTR_ERR(opendata);</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	delegation = rcu_dereference(NFS_I(state-&gt;inode)-&gt;delegation);</div><div class='del'>-	if (delegation != NULL &amp;&amp; test_bit(NFS_DELEGATION_NEED_RECLAIM, &amp;delegation-&gt;flags) != 0)</div><div class='del'>-		delegation_type = delegation-&gt;type;</div><div class='add'>+	if (delegation != NULL &amp;&amp; test_bit(NFS_DELEGATION_NEED_RECLAIM, &amp;delegation-&gt;flags) != 0) {</div><div class='add'>+		switch(delegation-&gt;type) {</div><div class='add'>+		case FMODE_READ:</div><div class='add'>+			delegation_type = NFS4_OPEN_DELEGATE_READ;</div><div class='add'>+			if (test_bit(NFS_DELEGATION_DELEGTIME, &amp;delegation-&gt;flags))</div><div class='add'>+				delegation_type = NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG;</div><div class='add'>+			break;</div><div class='add'>+		case FMODE_WRITE:</div><div class='add'>+		case FMODE_READ|FMODE_WRITE:</div><div class='add'>+			delegation_type = NFS4_OPEN_DELEGATE_WRITE;</div><div class='add'>+			if (test_bit(NFS_DELEGATION_DELEGTIME, &amp;delegation-&gt;flags))</div><div class='add'>+				delegation_type = NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	opendata-&gt;o_arg.u.delegation_type = delegation_type;</div><div class='ctx'> 	status = nfs4_open_recover(opendata, state);</div><div class='hunk'>@@ -2553,12 +2637,14 @@ static void nfs4_open_release(void *calldata)</div><div class='ctx'> 	struct nfs4_opendata *data = calldata;</div><div class='ctx'> 	struct nfs4_state *state = NULL;</div><div class='ctx'> </div><div class='add'>+	/* In case of error, no cleanup! */</div><div class='add'>+	if (data-&gt;rpc_status != 0 || !data-&gt;rpc_done) {</div><div class='add'>+		nfs_release_seqid(data-&gt;o_arg.seqid);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> 	/* If this request hasn't been cancelled, do nothing */</div><div class='ctx'> 	if (!data-&gt;cancelled)</div><div class='ctx'> 		goto out_free;</div><div class='del'>-	/* In case of error, no cleanup! */</div><div class='del'>-	if (data-&gt;rpc_status != 0 || !data-&gt;rpc_done)</div><div class='del'>-		goto out_free;</div><div class='ctx'> 	/* In case we need an open_confirm, no cleanup! */</div><div class='ctx'> 	if (data-&gt;o_res.rflags &amp; NFS4_OPEN_RESULT_CONFIRM)</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -2825,16 +2911,14 @@ static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs40_test_and_free_expired_stateid(struct nfs_server *server,</div><div class='del'>-		nfs4_stateid *stateid,</div><div class='del'>-		const struct cred *cred)</div><div class='add'>+					       nfs4_stateid *stateid, const struct cred *cred)</div><div class='ctx'> {</div><div class='ctx'> 	return -NFS4ERR_BAD_STATEID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NFS_V4_1)</div><div class='ctx'> static int nfs41_test_and_free_expired_stateid(struct nfs_server *server,</div><div class='del'>-		nfs4_stateid *stateid,</div><div class='del'>-		const struct cred *cred)</div><div class='add'>+					       nfs4_stateid *stateid, const struct cred *cred)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='hunk'>@@ -2843,6 +2927,7 @@ static int nfs41_test_and_free_expired_stateid(struct nfs_server *server,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFS4_INVALID_STATEID_TYPE:</div><div class='ctx'> 	case NFS4_SPECIAL_STATEID_TYPE:</div><div class='add'>+	case NFS4_FREED_STATEID_TYPE:</div><div class='ctx'> 		return -NFS4ERR_BAD_STATEID;</div><div class='ctx'> 	case NFS4_REVOKED_STATEID_TYPE:</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -3069,10 +3154,8 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,</div><div class='ctx'> 	fmode_t acc_mode = _nfs4_ctx_to_accessmode(ctx);</div><div class='ctx'> 	struct inode *dir = d_inode(opendata-&gt;dir);</div><div class='ctx'> 	unsigned long dir_verifier;</div><div class='del'>-	unsigned int seq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	seq = raw_seqcount_begin(&amp;sp-&gt;so_reclaim_seqcount);</div><div class='ctx'> 	dir_verifier = nfs_save_change_attribute(dir);</div><div class='ctx'> </div><div class='ctx'> 	ret = _nfs4_proc_open(opendata, ctx);</div><div class='hunk'>@@ -3095,9 +3178,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,</div><div class='ctx'> 	if (d_really_is_negative(dentry)) {</div><div class='ctx'> 		struct dentry *alias;</div><div class='ctx'> 		d_drop(dentry);</div><div class='del'>-		alias = d_exact_alias(dentry, state-&gt;inode);</div><div class='del'>-		if (!alias)</div><div class='del'>-			alias = d_splice_alias(igrab(state-&gt;inode), dentry);</div><div class='add'>+		alias = d_splice_alias(igrab(state-&gt;inode), dentry);</div><div class='ctx'> 		/* d_splice_alias() can't fail here - it's a non-directory */</div><div class='ctx'> 		if (alias) {</div><div class='ctx'> 			dput(ctx-&gt;dentry);</div><div class='hunk'>@@ -3113,7 +3194,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,</div><div class='ctx'> 	case NFS4_OPEN_CLAIM_DELEGATE_PREV:</div><div class='ctx'> 		if (!opendata-&gt;rpc_done)</div><div class='ctx'> 			break;</div><div class='del'>-		if (opendata-&gt;o_res.delegation_type != 0)</div><div class='add'>+		if (opendata-&gt;o_res.delegation.type != 0)</div><div class='ctx'> 			dir_verifier = nfs_save_change_attribute(dir);</div><div class='ctx'> 		nfs_set_verifier(dentry, dir_verifier);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3125,11 +3206,8 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (d_inode(dentry) == state-&gt;inode) {</div><div class='add'>+	if (d_inode(dentry) == state-&gt;inode)</div><div class='ctx'> 		nfs_inode_attach_open_context(ctx);</div><div class='del'>-		if (read_seqcount_retry(&amp;sp-&gt;so_reclaim_seqcount, seq))</div><div class='del'>-			nfs4_schedule_stateid_recovery(server, state);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (!opendata-&gt;cancelled) {</div><div class='hunk'>@@ -3399,13 +3477,18 @@ static int nfs4_do_setattr(struct inode *inode, const struct cred *cred,</div><div class='ctx'> 		.inode = inode,</div><div class='ctx'> 		.stateid = &amp;arg.stateid,</div><div class='ctx'> 	};</div><div class='del'>-	unsigned long adjust_flags = NFS_INO_INVALID_CHANGE;</div><div class='add'>+	unsigned long adjust_flags = NFS_INO_INVALID_CHANGE |</div><div class='add'>+				     NFS_INO_INVALID_CTIME;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (sattr-&gt;ia_valid &amp; (ATTR_MODE | ATTR_KILL_SUID | ATTR_KILL_SGID))</div><div class='ctx'> 		adjust_flags |= NFS_INO_INVALID_MODE;</div><div class='ctx'> 	if (sattr-&gt;ia_valid &amp; (ATTR_UID | ATTR_GID))</div><div class='ctx'> 		adjust_flags |= NFS_INO_INVALID_OTHER;</div><div class='add'>+	if (sattr-&gt;ia_valid &amp; ATTR_ATIME)</div><div class='add'>+		adjust_flags |= NFS_INO_INVALID_ATIME;</div><div class='add'>+	if (sattr-&gt;ia_valid &amp; ATTR_MTIME)</div><div class='add'>+		adjust_flags |= NFS_INO_INVALID_MTIME;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		nfs4_bitmap_copy_adjust(bitmask, nfs4_bitmask(server, fattr-&gt;label),</div><div class='hunk'>@@ -3517,7 +3600,7 @@ static bool nfs4_refresh_open_old_stateid(nfs4_stateid *dst,</div><div class='ctx'> 		write_sequnlock(&amp;state-&gt;seqlock);</div><div class='ctx'> 		trace_nfs4_close_stateid_update_wait(state-&gt;inode, dst, 0);</div><div class='ctx'> </div><div class='del'>-		if (fatal_signal_pending(current))</div><div class='add'>+		if (fatal_signal_pending(current) || nfs_current_task_exiting())</div><div class='ctx'> 			status = -EINTR;</div><div class='ctx'> 		else</div><div class='ctx'> 			if (schedule_timeout(5*HZ) != 0)</div><div class='hunk'>@@ -3553,6 +3636,7 @@ struct nfs4_closedata {</div><div class='ctx'> 	} lr;</div><div class='ctx'> 	struct nfs_fattr fattr;</div><div class='ctx'> 	unsigned long timestamp;</div><div class='add'>+	unsigned short retrans;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nfs4_free_closedata(void *data)</div><div class='hunk'>@@ -3581,6 +3665,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)</div><div class='ctx'> 		.state = state,</div><div class='ctx'> 		.inode = calldata-&gt;inode,</div><div class='ctx'> 		.stateid = &amp;calldata-&gt;arg.stateid,</div><div class='add'>+		.retrans = calldata-&gt;retrans,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!nfs4_sequence_done(task, &amp;calldata-&gt;res.seq_res))</div><div class='hunk'>@@ -3628,6 +3713,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)</div><div class='ctx'> 		default:</div><div class='ctx'> 			task-&gt;tk_status = nfs4_async_handle_exception(task,</div><div class='ctx'> 					server, task-&gt;tk_status, &amp;exception);</div><div class='add'>+			calldata-&gt;retrans = exception.retrans;</div><div class='ctx'> 			if (exception.retry)</div><div class='ctx'> 				goto out_restart;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3705,7 +3791,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (calldata-&gt;arg.fmode == 0 || calldata-&gt;arg.fmode == FMODE_READ) {</div><div class='ctx'> 		/* Close-to-open cache consistency revalidation */</div><div class='del'>-		if (!nfs4_have_delegation(inode, FMODE_READ)) {</div><div class='add'>+		if (!nfs4_have_delegation(inode, FMODE_READ, 0)) {</div><div class='ctx'> 			nfs4_bitmask_set(calldata-&gt;arg.bitmask_store,</div><div class='ctx'> 					 server-&gt;cache_consistency_bitmask,</div><div class='ctx'> 					 inode, 0);</div><div class='hunk'>@@ -3715,8 +3801,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	calldata-&gt;arg.share_access =</div><div class='del'>-		nfs4_map_atomic_open_share(NFS_SERVER(inode),</div><div class='del'>-				calldata-&gt;arg.fmode, 0);</div><div class='add'>+		nfs4_fmode_to_share_access(calldata-&gt;arg.fmode);</div><div class='ctx'> </div><div class='ctx'> 	if (calldata-&gt;res.fattr == NULL)</div><div class='ctx'> 		calldata-&gt;arg.bitmask = NULL;</div><div class='hunk'>@@ -3847,8 +3932,11 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx,</div><div class='ctx'> </div><div class='ctx'> static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync)</div><div class='ctx'> {</div><div class='add'>+	struct dentry *dentry = ctx-&gt;dentry;</div><div class='ctx'> 	if (ctx-&gt;state == NULL)</div><div class='ctx'> 		return;</div><div class='add'>+	if (dentry-&gt;d_flags &amp; DCACHE_NFSFS_RENAMED)</div><div class='add'>+		nfs4_inode_set_return_delegation_on_close(d_inode(dentry));</div><div class='ctx'> 	if (is_sync)</div><div class='ctx'> 		nfs4_close_sync(ctx-&gt;state, _nfs4_ctx_to_openmode(ctx));</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3857,11 +3945,26 @@ static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync)</div><div class='ctx'> </div><div class='ctx'> #define FATTR4_WORD1_NFS40_MASK (2*FATTR4_WORD1_MOUNTED_ON_FILEID - 1UL)</div><div class='ctx'> #define FATTR4_WORD2_NFS41_MASK (2*FATTR4_WORD2_SUPPATTR_EXCLCREAT - 1UL)</div><div class='del'>-#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_XATTR_SUPPORT - 1UL)</div><div class='add'>+#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_OPEN_ARGUMENTS - 1UL)</div><div class='add'>+</div><div class='add'>+#define FATTR4_WORD2_NFS42_TIME_DELEG_MASK \</div><div class='add'>+	(FATTR4_WORD2_TIME_DELEG_MODIFY|FATTR4_WORD2_TIME_DELEG_ACCESS)</div><div class='add'>+static bool nfs4_server_delegtime_capable(struct nfs4_server_caps_res *res)</div><div class='add'>+{</div><div class='add'>+	u32 share_access_want = res-&gt;open_caps.oa_share_access_want[0];</div><div class='add'>+	u32 attr_bitmask = res-&gt;attr_bitmask[2];</div><div class='add'>+</div><div class='add'>+	return (share_access_want &amp; NFS4_SHARE_WANT_DELEG_TIMESTAMPS) &amp;&amp;</div><div class='add'>+	       ((attr_bitmask &amp; FATTR4_WORD2_NFS42_TIME_DELEG_MASK) ==</div><div class='add'>+					FATTR4_WORD2_NFS42_TIME_DELEG_MASK);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)</div><div class='ctx'> {</div><div class='del'>-	u32 bitmask[3] = {}, minorversion = server-&gt;nfs_client-&gt;cl_minorversion;</div><div class='add'>+	u32 minorversion = server-&gt;nfs_client-&gt;cl_minorversion;</div><div class='add'>+	u32 bitmask[3] = {</div><div class='add'>+		[0] = FATTR4_WORD0_SUPPORTED_ATTRS,</div><div class='add'>+	};</div><div class='ctx'> 	struct nfs4_server_caps_arg args = {</div><div class='ctx'> 		.fhandle = fhandle,</div><div class='ctx'> 		.bitmask = bitmask,</div><div class='hunk'>@@ -3884,9 +3987,19 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f</div><div class='ctx'> 		     FATTR4_WORD0_CASE_PRESERVING;</div><div class='ctx'> 	if (minorversion)</div><div class='ctx'> 		bitmask[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT;</div><div class='add'>+	if (minorversion &gt; 1)</div><div class='add'>+		bitmask[2] |= FATTR4_WORD2_OPEN_ARGUMENTS;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_call_sync(server-&gt;client, server, &amp;msg, &amp;args.seq_args, &amp;res.seq_res, 0);</div><div class='ctx'> 	if (status == 0) {</div><div class='add'>+		bitmask[0] = (FATTR4_WORD0_SUPPORTED_ATTRS |</div><div class='add'>+			      FATTR4_WORD0_FH_EXPIRE_TYPE |</div><div class='add'>+			      FATTR4_WORD0_LINK_SUPPORT |</div><div class='add'>+			      FATTR4_WORD0_SYMLINK_SUPPORT |</div><div class='add'>+			      FATTR4_WORD0_ACLSUPPORT |</div><div class='add'>+			      FATTR4_WORD0_CASE_INSENSITIVE |</div><div class='add'>+			      FATTR4_WORD0_CASE_PRESERVING) &amp;</div><div class='add'>+			     res.attr_bitmask[0];</div><div class='ctx'> 		/* Sanity check the server answers */</div><div class='ctx'> 		switch (minorversion) {</div><div class='ctx'> 		case 0:</div><div class='hunk'>@@ -3895,13 +4008,20 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			res.attr_bitmask[2] &amp;= FATTR4_WORD2_NFS41_MASK;</div><div class='add'>+			bitmask[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT &amp;</div><div class='add'>+				     res.attr_bitmask[2];</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			res.attr_bitmask[2] &amp;= FATTR4_WORD2_NFS42_MASK;</div><div class='add'>+			bitmask[2] = (FATTR4_WORD2_SUPPATTR_EXCLCREAT |</div><div class='add'>+				      FATTR4_WORD2_OPEN_ARGUMENTS) &amp;</div><div class='add'>+				     res.attr_bitmask[2];</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(server-&gt;attr_bitmask, res.attr_bitmask, sizeof(server-&gt;attr_bitmask));</div><div class='del'>-		server-&gt;caps &amp;= ~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS |</div><div class='del'>-				  NFS_CAP_SYMLINKS| NFS_CAP_SECURITY_LABEL);</div><div class='add'>+		server-&gt;caps &amp;=</div><div class='add'>+			~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS |</div><div class='add'>+			  NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS |</div><div class='add'>+			  NFS_CAP_OPEN_XOR | NFS_CAP_DELEGTIME);</div><div class='ctx'> 		server-&gt;fattr_valid = NFS_ATTR_FATTR_V4;</div><div class='ctx'> 		if (res.attr_bitmask[0] &amp; FATTR4_WORD0_ACL &amp;&amp;</div><div class='ctx'> 				res.acl_bitmask &amp; ACL4_SUPPORT_ALLOW_ACL)</div><div class='hunk'>@@ -3940,10 +4060,20 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f</div><div class='ctx'> 			server-&gt;fattr_valid &amp;= ~NFS_ATTR_FATTR_CTIME;</div><div class='ctx'> 		if (!(res.attr_bitmask[1] &amp; FATTR4_WORD1_TIME_MODIFY))</div><div class='ctx'> 			server-&gt;fattr_valid &amp;= ~NFS_ATTR_FATTR_MTIME;</div><div class='add'>+		if (!(res.attr_bitmask[1] &amp; FATTR4_WORD1_TIME_MODIFY))</div><div class='add'>+			server-&gt;fattr_valid &amp;= ~NFS_ATTR_FATTR_MTIME;</div><div class='add'>+		if (!(res.attr_bitmask[1] &amp; FATTR4_WORD1_TIME_CREATE))</div><div class='add'>+			server-&gt;fattr_valid &amp;= ~NFS_ATTR_FATTR_BTIME;</div><div class='ctx'> 		memcpy(server-&gt;attr_bitmask_nl, res.attr_bitmask,</div><div class='ctx'> 				sizeof(server-&gt;attr_bitmask));</div><div class='ctx'> 		server-&gt;attr_bitmask_nl[2] &amp;= ~FATTR4_WORD2_SECURITY_LABEL;</div><div class='ctx'> </div><div class='add'>+		if (res.open_caps.oa_share_access_want[0] &amp;</div><div class='add'>+		    NFS4_SHARE_WANT_OPEN_XOR_DELEGATION)</div><div class='add'>+			server-&gt;caps |= NFS_CAP_OPEN_XOR;</div><div class='add'>+		if (nfs4_server_delegtime_capable(&amp;res))</div><div class='add'>+			server-&gt;caps |= NFS_CAP_DELEGTIME;</div><div class='add'>+</div><div class='ctx'> 		memcpy(server-&gt;cache_consistency_bitmask, res.attr_bitmask, sizeof(server-&gt;cache_consistency_bitmask));</div><div class='ctx'> 		server-&gt;cache_consistency_bitmask[0] &amp;= FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE;</div><div class='ctx'> 		server-&gt;cache_consistency_bitmask[1] &amp;= FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY;</div><div class='hunk'>@@ -3969,7 +4099,6 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	nfs4_server_set_init_caps(server);</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = nfs4_handle_exception(server,</div><div class='ctx'> 				_nfs4_server_capabilities(server, fhandle),</div><div class='hunk'>@@ -4028,6 +4157,23 @@ static void test_fs_location_for_trunking(struct nfs4_fs_location *location,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool _is_same_nfs4_pathname(struct nfs4_pathname *path1,</div><div class='add'>+				   struct nfs4_pathname *path2)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (path1-&gt;ncomponents != path2-&gt;ncomponents)</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; path1-&gt;ncomponents; i++) {</div><div class='add'>+		if (path1-&gt;components[i].len != path2-&gt;components[i].len)</div><div class='add'>+			return false;</div><div class='add'>+		if (memcmp(path1-&gt;components[i].data, path2-&gt;components[i].data,</div><div class='add'>+				path1-&gt;components[i].len))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int _nfs4_discover_trunking(struct nfs_server *server,</div><div class='ctx'> 				   struct nfs_fh *fhandle)</div><div class='ctx'> {</div><div class='hunk'>@@ -4061,9 +4207,13 @@ static int _nfs4_discover_trunking(struct nfs_server *server,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out_free_3;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; locations-&gt;nlocations; i++)</div><div class='add'>+	for (i = 0; i &lt; locations-&gt;nlocations; i++) {</div><div class='add'>+		if (!_is_same_nfs4_pathname(&amp;locations-&gt;fs_path,</div><div class='add'>+					&amp;locations-&gt;locations[i].rootpath))</div><div class='add'>+			continue;</div><div class='ctx'> 		test_fs_location_for_trunking(&amp;locations-&gt;locations[i], clp,</div><div class='ctx'> 					      server);</div><div class='add'>+	}</div><div class='ctx'> out_free_3:</div><div class='ctx'> 	kfree(locations-&gt;fattr);</div><div class='ctx'> out_free_2:</div><div class='hunk'>@@ -4096,15 +4246,18 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-		struct nfs_fsinfo *info)</div><div class='add'>+			     struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='del'>-	u32 bitmask[3];</div><div class='add'>+	u32 bitmask[3] = {</div><div class='add'>+		[0] = FATTR4_WORD0_TYPE | FATTR4_WORD0_CHANGE |</div><div class='add'>+		      FATTR4_WORD0_SIZE | FATTR4_WORD0_FSID,</div><div class='add'>+	};</div><div class='ctx'> 	struct nfs4_lookup_root_arg args = {</div><div class='ctx'> 		.bitmask = bitmask,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct nfs4_lookup_res res = {</div><div class='ctx'> 		.server = server,</div><div class='del'>-		.fattr = info-&gt;fattr,</div><div class='add'>+		.fattr = fattr,</div><div class='ctx'> 		.fh = fhandle,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct rpc_message msg = {</div><div class='hunk'>@@ -4113,27 +4266,20 @@ static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 		.rpc_resp = &amp;res,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	bitmask[0] = nfs4_fattr_bitmap[0];</div><div class='del'>-	bitmask[1] = nfs4_fattr_bitmap[1];</div><div class='del'>-	/*</div><div class='del'>-	 * Process the label in the upcoming getfattr</div><div class='del'>-	 */</div><div class='del'>-	bitmask[2] = nfs4_fattr_bitmap[2] &amp; ~FATTR4_WORD2_SECURITY_LABEL;</div><div class='del'>-</div><div class='del'>-	nfs_fattr_init(info-&gt;fattr);</div><div class='add'>+	nfs_fattr_init(fattr);</div><div class='ctx'> 	return nfs4_call_sync(server-&gt;client, server, &amp;msg, &amp;args.seq_args, &amp;res.seq_res, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-		struct nfs_fsinfo *info)</div><div class='add'>+			    struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_exception exception = {</div><div class='ctx'> 		.interruptible = true,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='ctx'> 	do {</div><div class='del'>-		err = _nfs4_lookup_root(server, fhandle, info);</div><div class='del'>-		trace_nfs4_lookup_root(server, fhandle, info-&gt;fattr, err);</div><div class='add'>+		err = _nfs4_lookup_root(server, fhandle, fattr);</div><div class='add'>+		trace_nfs4_lookup_root(server, fhandle, fattr, err);</div><div class='ctx'> 		switch (err) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 		case -NFS4ERR_WRONGSEC:</div><div class='hunk'>@@ -4146,8 +4292,9 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-				struct nfs_fsinfo *info, rpc_authflavor_t flavor)</div><div class='add'>+static int nfs4_lookup_root_sec(struct nfs_server *server,</div><div class='add'>+				struct nfs_fh *fhandle, struct nfs_fattr *fattr,</div><div class='add'>+				rpc_authflavor_t flavor)</div><div class='ctx'> {</div><div class='ctx'> 	struct rpc_auth_create_args auth_args = {</div><div class='ctx'> 		.pseudoflavor = flavor,</div><div class='hunk'>@@ -4157,7 +4304,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl</div><div class='ctx'> 	auth = rpcauth_create(&amp;auth_args, server-&gt;client);</div><div class='ctx'> 	if (IS_ERR(auth))</div><div class='ctx'> 		return -EACCES;</div><div class='del'>-	return nfs4_lookup_root(server, fhandle, info);</div><div class='add'>+	return nfs4_lookup_root(server, fhandle, fattr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4170,7 +4317,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl</div><div class='ctx'>  * negative errno value.</div><div class='ctx'>  */</div><div class='ctx'> static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-			      struct nfs_fsinfo *info)</div><div class='add'>+			      struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	/* Per 3530bis 15.33.5 */</div><div class='ctx'> 	static const rpc_authflavor_t flav_array[] = {</div><div class='hunk'>@@ -4186,8 +4333,9 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	if (server-&gt;auth_info.flavor_len &gt; 0) {</div><div class='ctx'> 		/* try each flavor specified by user */</div><div class='ctx'> 		for (i = 0; i &lt; server-&gt;auth_info.flavor_len; i++) {</div><div class='del'>-			status = nfs4_lookup_root_sec(server, fhandle, info,</div><div class='del'>-						server-&gt;auth_info.flavors[i]);</div><div class='add'>+			status = nfs4_lookup_root_sec(</div><div class='add'>+				server, fhandle, fattr,</div><div class='add'>+				server-&gt;auth_info.flavors[i]);</div><div class='ctx'> 			if (status == -NFS4ERR_WRONGSEC || status == -EACCES)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4195,7 +4343,7 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* no flavors specified by user, try default list */</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(flav_array); i++) {</div><div class='del'>-			status = nfs4_lookup_root_sec(server, fhandle, info,</div><div class='add'>+			status = nfs4_lookup_root_sec(server, fhandle, fattr,</div><div class='ctx'> 						      flav_array[i]);</div><div class='ctx'> 			if (status == -NFS4ERR_WRONGSEC || status == -EACCES)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -4219,28 +4367,22 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'>  * nfs4_proc_get_rootfh - get file handle for server's pseudoroot</div><div class='ctx'>  * @server: initialized nfs_server handle</div><div class='ctx'>  * @fhandle: we fill in the pseudo-fs root file handle</div><div class='del'>- * @info: we fill in an FSINFO struct</div><div class='add'>+ * @fattr: we fill in a bare bones struct fattr</div><div class='ctx'>  * @auth_probe: probe the auth flavours</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success, or a negative errno.</div><div class='ctx'>  */</div><div class='ctx'> int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-			 struct nfs_fsinfo *info,</div><div class='del'>-			 bool auth_probe)</div><div class='add'>+			 struct nfs_fattr *fattr, bool auth_probe)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!auth_probe)</div><div class='del'>-		status = nfs4_lookup_root(server, fhandle, info);</div><div class='add'>+		status = nfs4_lookup_root(server, fhandle, fattr);</div><div class='ctx'> </div><div class='ctx'> 	if (auth_probe || status == NFS4ERR_WRONGSEC)</div><div class='del'>-		status = server-&gt;nfs_client-&gt;cl_mvops-&gt;find_root_sec(server,</div><div class='del'>-				fhandle, info);</div><div class='del'>-</div><div class='del'>-	if (status == 0)</div><div class='del'>-		status = nfs4_server_capabilities(server, fhandle);</div><div class='del'>-	if (status == 0)</div><div class='del'>-		status = nfs4_do_fsinfo(server, fhandle, info);</div><div class='add'>+		status = server-&gt;nfs_client-&gt;cl_mvops-&gt;find_root_sec(</div><div class='add'>+			server, fhandle, fattr);</div><div class='ctx'> </div><div class='ctx'> 	return nfs4_map_errors(status);</div><div class='ctx'> }</div><div class='hunk'>@@ -4429,15 +4571,15 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir,</div><div class='del'>-		struct dentry *dentry, struct nfs_fh *fhandle,</div><div class='del'>-		struct nfs_fattr *fattr)</div><div class='add'>+		struct dentry *dentry, const struct qstr *name,</div><div class='add'>+		struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(dir);</div><div class='ctx'> 	int		       status;</div><div class='ctx'> 	struct nfs4_lookup_arg args = {</div><div class='ctx'> 		.bitmask = server-&gt;attr_bitmask,</div><div class='ctx'> 		.dir_fh = NFS_FH(dir),</div><div class='del'>-		.name = &amp;dentry-&gt;d_name,</div><div class='add'>+		.name = name,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct nfs4_lookup_res res = {</div><div class='ctx'> 		.server = server,</div><div class='hunk'>@@ -4479,17 +4621,16 @@ static void nfs_fixup_secinfo_attributes(struct nfs_fattr *fattr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir,</div><div class='del'>-				   struct dentry *dentry, struct nfs_fh *fhandle,</div><div class='del'>-				   struct nfs_fattr *fattr)</div><div class='add'>+				   struct dentry *dentry, const struct qstr *name,</div><div class='add'>+				   struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_exception exception = {</div><div class='ctx'> 		.interruptible = true,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct rpc_clnt *client = *clnt;</div><div class='del'>-	const struct qstr *name = &amp;dentry-&gt;d_name;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	do {</div><div class='del'>-		err = _nfs4_proc_lookup(client, dir, dentry, fhandle, fattr);</div><div class='add'>+		err = _nfs4_proc_lookup(client, dir, dentry, name, fhandle, fattr);</div><div class='ctx'> 		trace_nfs4_lookup(dir, name, err);</div><div class='ctx'> 		switch (err) {</div><div class='ctx'> 		case -NFS4ERR_BADNAME:</div><div class='hunk'>@@ -4524,13 +4665,13 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs4_proc_lookup(struct inode *dir, struct dentry *dentry,</div><div class='add'>+static int nfs4_proc_lookup(struct inode *dir, struct dentry *dentry, const struct qstr *name,</div><div class='ctx'> 			    struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	struct rpc_clnt *client = NFS_CLIENT(dir);</div><div class='ctx'> </div><div class='del'>-	status = nfs4_proc_lookup_common(&amp;client, dir, dentry, fhandle, fattr);</div><div class='add'>+	status = nfs4_proc_lookup_common(&amp;client, dir, dentry, name, fhandle, fattr);</div><div class='ctx'> 	if (client != NFS_CLIENT(dir)) {</div><div class='ctx'> 		rpc_shutdown_client(client);</div><div class='ctx'> 		nfs_fixup_secinfo_attributes(fattr);</div><div class='hunk'>@@ -4545,7 +4686,8 @@ nfs4_proc_lookup_mountpoint(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct rpc_clnt *client = NFS_CLIENT(dir);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	status = nfs4_proc_lookup_common(&amp;client, dir, dentry, fhandle, fattr);</div><div class='add'>+	status = nfs4_proc_lookup_common(&amp;client, dir, dentry, &amp;dentry-&gt;d_name,</div><div class='add'>+					 fhandle, fattr);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return ERR_PTR(status);</div><div class='ctx'> 	return (client == NFS_CLIENT(dir)) ? rpc_clone_client(client) : client;</div><div class='hunk'>@@ -4573,16 +4715,19 @@ static int _nfs4_proc_lookupp(struct inode *inode,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned short task_flags = 0;</div><div class='ctx'> </div><div class='del'>-	if (NFS_SERVER(inode)-&gt;flags &amp; NFS_MOUNT_SOFTREVAL)</div><div class='add'>+	if (server-&gt;flags &amp; NFS_MOUNT_SOFTREVAL)</div><div class='ctx'> 		task_flags |= RPC_TASK_TIMEOUT;</div><div class='add'>+	if (server-&gt;caps &amp; NFS_CAP_MOVEABLE)</div><div class='add'>+		task_flags |= RPC_TASK_MOVEABLE;</div><div class='ctx'> </div><div class='ctx'> 	args.bitmask = nfs4_bitmask(server, fattr-&gt;label);</div><div class='ctx'> </div><div class='ctx'> 	nfs_fattr_init(fattr);</div><div class='add'>+	nfs4_init_sequence(&amp;args.seq_args, &amp;res.seq_res, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS call  lookupp ino=0x%lx\n", inode-&gt;i_ino);</div><div class='del'>-	status = nfs4_call_sync(clnt, server, &amp;msg, &amp;args.seq_args,</div><div class='del'>-				&amp;res.seq_res, task_flags);</div><div class='add'>+	status = nfs4_do_call_sync(clnt, server, &amp;msg, &amp;args.seq_args,</div><div class='add'>+				   &amp;res.seq_res, task_flags);</div><div class='ctx'> 	dprintk("NFS reply lookupp: %d\n", status);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -4622,7 +4767,7 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry</div><div class='ctx'> 	};</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	if (!nfs4_have_delegation(inode, FMODE_READ)) {</div><div class='add'>+	if (!nfs4_have_delegation(inode, FMODE_READ, 0)) {</div><div class='ctx'> 		res.fattr = nfs_alloc_fattr();</div><div class='ctx'> 		if (res.fattr == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -4940,8 +5085,9 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, const struct</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	nfs4_inode_make_writeable(inode);</div><div class='del'>-	nfs4_bitmap_copy_adjust(bitmask, nfs4_bitmask(server, res.fattr-&gt;label), inode,</div><div class='del'>-				NFS_INO_INVALID_CHANGE);</div><div class='add'>+	nfs4_bitmap_copy_adjust(bitmask, nfs4_bitmask(server, res.fattr-&gt;label),</div><div class='add'>+				inode,</div><div class='add'>+				NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_CTIME);</div><div class='ctx'> 	status = nfs4_call_sync(server-&gt;client, server, &amp;msg, &amp;arg.seq_args, &amp;res.seq_res, 1);</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		nfs4_update_changeattr(dir, &amp;res.cinfo, res.fattr-&gt;time_start,</div><div class='hunk'>@@ -5019,9 +5165,6 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_</div><div class='ctx'> 				    &amp;data-&gt;arg.seq_args, &amp;data-&gt;res.seq_res, 1);</div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		spin_lock(&amp;dir-&gt;i_lock);</div><div class='del'>-		/* Creating a directory bumps nlink in the parent */</div><div class='del'>-		if (data-&gt;arg.ftype == NF4DIR)</div><div class='del'>-			nfs4_inc_nlink_locked(dir);</div><div class='ctx'> 		nfs4_update_changeattr_locked(dir, &amp;data-&gt;res.dir_cinfo,</div><div class='ctx'> 					      data-&gt;res.fattr-&gt;time_start,</div><div class='ctx'> 					      NFS_INO_INVALID_DATA);</div><div class='hunk'>@@ -5031,6 +5174,31 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dentry *nfs4_do_mkdir(struct inode *dir, struct dentry *dentry,</div><div class='add'>+				    struct nfs4_createdata *data, int *statusp)</div><div class='add'>+{</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+</div><div class='add'>+	*statusp = nfs4_call_sync(NFS_SERVER(dir)-&gt;client, NFS_SERVER(dir), &amp;data-&gt;msg,</div><div class='add'>+				    &amp;data-&gt;arg.seq_args, &amp;data-&gt;res.seq_res, 1);</div><div class='add'>+</div><div class='add'>+	if (*statusp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dir-&gt;i_lock);</div><div class='add'>+	/* Creating a directory bumps nlink in the parent */</div><div class='add'>+	nfs4_inc_nlink_locked(dir);</div><div class='add'>+	nfs4_update_changeattr_locked(dir, &amp;data-&gt;res.dir_cinfo,</div><div class='add'>+				      data-&gt;res.fattr-&gt;time_start,</div><div class='add'>+				      NFS_INO_INVALID_DATA);</div><div class='add'>+	spin_unlock(&amp;dir-&gt;i_lock);</div><div class='add'>+	ret = nfs_add_or_obtain(dentry, data-&gt;res.fh, data-&gt;res.fattr);</div><div class='add'>+	if (!IS_ERR(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	*statusp = PTR_ERR(ret);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nfs4_free_createdata(struct nfs4_createdata *data)</div><div class='ctx'> {</div><div class='ctx'> 	nfs4_label_free(data-&gt;fattr.label);</div><div class='hunk'>@@ -5087,32 +5255,35 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,</div><div class='del'>-		struct iattr *sattr, struct nfs4_label *label)</div><div class='add'>+static struct dentry *_nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,</div><div class='add'>+				       struct iattr *sattr,</div><div class='add'>+				       struct nfs4_label *label, int *statusp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_createdata *data;</div><div class='del'>-	int status = -ENOMEM;</div><div class='add'>+	struct dentry *ret = NULL;</div><div class='ctx'> </div><div class='add'>+	*statusp = -ENOMEM;</div><div class='ctx'> 	data = nfs4_alloc_createdata(dir, &amp;dentry-&gt;d_name, sattr, NF4DIR);</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;arg.label = label;</div><div class='del'>-	status = nfs4_do_create(dir, dentry, data);</div><div class='add'>+	ret = nfs4_do_mkdir(dir, dentry, data, statusp);</div><div class='ctx'> </div><div class='ctx'> 	nfs4_free_createdata(data);</div><div class='ctx'> out:</div><div class='del'>-	return status;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,</div><div class='del'>-		struct iattr *sattr)</div><div class='add'>+static struct dentry *nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,</div><div class='add'>+				      struct iattr *sattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(dir);</div><div class='ctx'> 	struct nfs4_exception exception = {</div><div class='ctx'> 		.interruptible = true,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct nfs4_label l, *label;</div><div class='add'>+	struct dentry *alias;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	label = nfs4_label_init_security(dir, dentry, sattr, &amp;l);</div><div class='hunk'>@@ -5120,14 +5291,16 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	if (!(server-&gt;attr_bitmask[2] &amp; FATTR4_WORD2_MODE_UMASK))</div><div class='ctx'> 		sattr-&gt;ia_mode &amp;= ~current_umask();</div><div class='ctx'> 	do {</div><div class='del'>-		err = _nfs4_proc_mkdir(dir, dentry, sattr, label);</div><div class='add'>+		alias = _nfs4_proc_mkdir(dir, dentry, sattr, label, &amp;err);</div><div class='ctx'> 		trace_nfs4_mkdir(dir, &amp;dentry-&gt;d_name, err);</div><div class='del'>-		err = nfs4_handle_exception(NFS_SERVER(dir), err,</div><div class='del'>-				&amp;exception);</div><div class='add'>+		if (err)</div><div class='add'>+			alias = ERR_PTR(nfs4_handle_exception(NFS_SERVER(dir),</div><div class='add'>+							      err,</div><div class='add'>+							      &amp;exception));</div><div class='ctx'> 	} while (exception.retry);</div><div class='ctx'> 	nfs4_label_release_security(label);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return alias;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _nfs4_proc_readdir(struct nfs_readdir_arg *nr_arg,</div><div class='hunk'>@@ -5426,9 +5599,11 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_pgio_header *hdr)</div><div class='ctx'> 			.inode = hdr-&gt;inode,</div><div class='ctx'> 			.state = hdr-&gt;args.context-&gt;state,</div><div class='ctx'> 			.stateid = &amp;hdr-&gt;args.stateid,</div><div class='add'>+			.retrans = hdr-&gt;retrans,</div><div class='ctx'> 		};</div><div class='ctx'> 		task-&gt;tk_status = nfs4_async_handle_exception(task,</div><div class='ctx'> 				server, task-&gt;tk_status, &amp;exception);</div><div class='add'>+		hdr-&gt;retrans = exception.retrans;</div><div class='ctx'> 		if (exception.retry) {</div><div class='ctx'> 			rpc_restart_call_prepare(task);</div><div class='ctx'> 			return -EAGAIN;</div><div class='hunk'>@@ -5461,7 +5636,7 @@ static bool nfs4_read_plus_not_supported(struct rpc_task *task,</div><div class='ctx'> 	struct rpc_message *msg = &amp;task-&gt;tk_msg;</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;rpc_proc == &amp;nfs4_procedures[NFSPROC4_CLNT_READ_PLUS] &amp;&amp;</div><div class='del'>-	    server-&gt;caps &amp; NFS_CAP_READ_PLUS &amp;&amp; task-&gt;tk_status == -ENOTSUPP) {</div><div class='add'>+	    task-&gt;tk_status == -ENOTSUPP) {</div><div class='ctx'> 		server-&gt;caps &amp;= ~NFS_CAP_READ_PLUS;</div><div class='ctx'> 		msg-&gt;rpc_proc = &amp;nfs4_procedures[NFSPROC4_CLNT_READ];</div><div class='ctx'> 		rpc_restart_call_prepare(task);</div><div class='hunk'>@@ -5542,10 +5717,12 @@ static int nfs4_write_done_cb(struct rpc_task *task,</div><div class='ctx'> 			.inode = hdr-&gt;inode,</div><div class='ctx'> 			.state = hdr-&gt;args.context-&gt;state,</div><div class='ctx'> 			.stateid = &amp;hdr-&gt;args.stateid,</div><div class='add'>+			.retrans = hdr-&gt;retrans,</div><div class='ctx'> 		};</div><div class='ctx'> 		task-&gt;tk_status = nfs4_async_handle_exception(task,</div><div class='ctx'> 				NFS_SERVER(inode), task-&gt;tk_status,</div><div class='ctx'> 				&amp;exception);</div><div class='add'>+		hdr-&gt;retrans = exception.retrans;</div><div class='ctx'> 		if (exception.retry) {</div><div class='ctx'> 			rpc_restart_call_prepare(task);</div><div class='ctx'> 			return -EAGAIN;</div><div class='hunk'>@@ -5591,7 +5768,7 @@ bool nfs4_write_need_cache_consistency_data(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	/* Otherwise, request attributes if and only if we don't hold</div><div class='ctx'> 	 * a delegation</div><div class='ctx'> 	 */</div><div class='del'>-	return nfs4_have_delegation(hdr-&gt;inode, FMODE_READ) == 0;</div><div class='add'>+	return nfs4_have_delegation(hdr-&gt;inode, FMODE_READ, 0) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nfs4_bitmask_set(__u32 bitmask[], const __u32 src[],</div><div class='hunk'>@@ -5619,6 +5796,8 @@ void nfs4_bitmask_set(__u32 bitmask[], const __u32 src[],</div><div class='ctx'> 		bitmask[1] |= FATTR4_WORD1_TIME_MODIFY;</div><div class='ctx'> 	if (cache_validity &amp; NFS_INO_INVALID_BLOCKS)</div><div class='ctx'> 		bitmask[1] |= FATTR4_WORD1_SPACE_USED;</div><div class='add'>+	if (cache_validity &amp; NFS_INO_INVALID_BTIME)</div><div class='add'>+		bitmask[1] |= FATTR4_WORD1_TIME_CREATE;</div><div class='ctx'> </div><div class='ctx'> 	if (cache_validity &amp; NFS_INO_INVALID_SIZE)</div><div class='ctx'> 		bitmask[0] |= FATTR4_WORD0_SIZE;</div><div class='hunk'>@@ -5993,7 +6172,7 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* for decoding across pages */</div><div class='del'>-	res.acl_scratch = alloc_page(GFP_KERNEL);</div><div class='add'>+	res.acl_scratch = folio_alloc(GFP_KERNEL, 0);</div><div class='ctx'> 	if (!res.acl_scratch)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='hunk'>@@ -6029,7 +6208,7 @@ out_free:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='ctx'> 		__free_page(pages[i]);</div><div class='ctx'> 	if (res.acl_scratch)</div><div class='del'>-		__free_page(res.acl_scratch);</div><div class='add'>+		folio_put(res.acl_scratch);</div><div class='ctx'> 	kfree(pages);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -6057,6 +6236,8 @@ static ssize_t nfs4_proc_get_acl(struct inode *inode, void *buf, size_t buflen,</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(NFS_FH(inode)-&gt;size == 0))</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> 	if (!nfs4_server_supports_acls(server, type))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	ret = nfs_revalidate_inode(inode, NFS_INO_INVALID_CHANGE);</div><div class='hunk'>@@ -6131,6 +6312,9 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_exception exception = { };</div><div class='ctx'> 	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(NFS_FH(inode)-&gt;size == 0))</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = __nfs4_proc_set_acl(inode, buf, buflen, type);</div><div class='ctx'> 		trace_nfs4_set_acl(inode, err);</div><div class='hunk'>@@ -6153,7 +6337,7 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf,</div><div class='ctx'> 					size_t buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='del'>-	struct nfs4_label label = {0, 0, buflen, buf};</div><div class='add'>+	struct nfs4_label label = {0, 0, 0, buflen, buf};</div><div class='ctx'> </div><div class='ctx'> 	u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL };</div><div class='ctx'> 	struct nfs_fattr fattr = {</div><div class='hunk'>@@ -6258,7 +6442,7 @@ static int nfs4_do_set_security_label(struct inode *inode,</div><div class='ctx'> static int</div><div class='ctx'> nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_label ilabel = {0, 0, buflen, (char *)buf };</div><div class='add'>+	struct nfs4_label ilabel = {0, 0, 0, buflen, (char *)buf };</div><div class='ctx'> 	struct nfs_fattr *fattr;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='hunk'>@@ -6273,6 +6457,7 @@ nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen)</div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		nfs_setsecurity(inode, fattr);</div><div class='ctx'> </div><div class='add'>+	nfs_free_fattr(fattr);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_NFS_V4_SECURITY_LABEL */</div><div class='hunk'>@@ -6551,6 +6736,7 @@ struct nfs4_delegreturndata {</div><div class='ctx'> 	struct nfs_fh fh;</div><div class='ctx'> 	nfs4_stateid stateid;</div><div class='ctx'> 	unsigned long timestamp;</div><div class='add'>+	unsigned short retrans;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct nfs4_layoutreturn_args arg;</div><div class='ctx'> 		struct nfs4_layoutreturn_res res;</div><div class='hunk'>@@ -6558,6 +6744,7 @@ struct nfs4_delegreturndata {</div><div class='ctx'> 		u32 roc_barrier;</div><div class='ctx'> 		bool roc;</div><div class='ctx'> 	} lr;</div><div class='add'>+	struct nfs4_delegattr sattr;</div><div class='ctx'> 	struct nfs_fattr fattr;</div><div class='ctx'> 	int rpc_status;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -6570,6 +6757,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		.inode = data-&gt;inode,</div><div class='ctx'> 		.stateid = &amp;data-&gt;stateid,</div><div class='ctx'> 		.task_is_privileged = data-&gt;args.seq_args.sa_privileged,</div><div class='add'>+		.retrans = data-&gt;retrans,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!nfs4_sequence_done(task, &amp;data-&gt;res.seq_res))</div><div class='hunk'>@@ -6582,6 +6770,30 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 			  &amp;data-&gt;res.lr_ret) == -EAGAIN)</div><div class='ctx'> 		goto out_restart;</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;args.sattr_args &amp;&amp; task-&gt;tk_status != 0) {</div><div class='add'>+		switch(data-&gt;res.sattr_ret) {</div><div class='add'>+		case 0:</div><div class='add'>+			data-&gt;args.sattr_args = NULL;</div><div class='add'>+			data-&gt;res.sattr_res = false;</div><div class='add'>+			break;</div><div class='add'>+		case -NFS4ERR_ADMIN_REVOKED:</div><div class='add'>+		case -NFS4ERR_DELEG_REVOKED:</div><div class='add'>+		case -NFS4ERR_EXPIRED:</div><div class='add'>+		case -NFS4ERR_BAD_STATEID:</div><div class='add'>+			/* Let the main handler below do stateid recovery */</div><div class='add'>+			break;</div><div class='add'>+		case -NFS4ERR_OLD_STATEID:</div><div class='add'>+			if (nfs4_refresh_delegation_stateid(&amp;data-&gt;stateid,</div><div class='add'>+						data-&gt;inode))</div><div class='add'>+				goto out_restart;</div><div class='add'>+			fallthrough;</div><div class='add'>+		default:</div><div class='add'>+			data-&gt;args.sattr_args = NULL;</div><div class='add'>+			data-&gt;res.sattr_res = false;</div><div class='add'>+			goto out_restart;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (task-&gt;tk_status) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		renew_lease(data-&gt;res.server, data-&gt;timestamp);</div><div class='hunk'>@@ -6617,6 +6829,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		task-&gt;tk_status = nfs4_async_handle_exception(task,</div><div class='ctx'> 				data-&gt;res.server, task-&gt;tk_status,</div><div class='ctx'> 				&amp;exception);</div><div class='add'>+		data-&gt;retrans = exception.retrans;</div><div class='ctx'> 		if (exception.retry)</div><div class='ctx'> 			goto out_restart;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6675,7 +6888,10 @@ static const struct rpc_call_ops nfs4_delegreturn_ops = {</div><div class='ctx'> 	.rpc_release = nfs4_delegreturn_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int _nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred, const nfs4_stateid *stateid, int issync)</div><div class='add'>+static int _nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred,</div><div class='add'>+				  const nfs4_stateid *stateid,</div><div class='add'>+				  struct nfs_delegation *delegation,</div><div class='add'>+				  int issync)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_delegreturndata *data;</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='hunk'>@@ -6727,12 +6943,27 @@ static int _nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (delegation &amp;&amp;</div><div class='add'>+	    test_bit(NFS_DELEGATION_DELEGTIME, &amp;delegation-&gt;flags)) {</div><div class='add'>+		if (delegation-&gt;type &amp; FMODE_READ) {</div><div class='add'>+			data-&gt;sattr.atime = inode_get_atime(inode);</div><div class='add'>+			data-&gt;sattr.atime_set = true;</div><div class='add'>+		}</div><div class='add'>+		if (delegation-&gt;type &amp; FMODE_WRITE) {</div><div class='add'>+			data-&gt;sattr.mtime = inode_get_mtime(inode);</div><div class='add'>+			data-&gt;sattr.mtime_set = true;</div><div class='add'>+		}</div><div class='add'>+		data-&gt;args.sattr_args = &amp;data-&gt;sattr;</div><div class='add'>+		data-&gt;res.sattr_res = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!data-&gt;inode)</div><div class='ctx'> 		nfs4_init_sequence(&amp;data-&gt;args.seq_args, &amp;data-&gt;res.seq_res, 1,</div><div class='ctx'> 				   1);</div><div class='ctx'> 	else</div><div class='ctx'> 		nfs4_init_sequence(&amp;data-&gt;args.seq_args, &amp;data-&gt;res.seq_res, 1,</div><div class='ctx'> 				   0);</div><div class='add'>+</div><div class='ctx'> 	task_setup_data.callback_data = data;</div><div class='ctx'> 	msg.rpc_argp = &amp;data-&gt;args;</div><div class='ctx'> 	msg.rpc_resp = &amp;data-&gt;res;</div><div class='hunk'>@@ -6750,13 +6981,16 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred, const nfs4_stateid *stateid, int issync)</div><div class='add'>+int nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred,</div><div class='add'>+			  const nfs4_stateid *stateid,</div><div class='add'>+			  struct nfs_delegation *delegation, int issync)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='ctx'> 	struct nfs4_exception exception = { };</div><div class='ctx'> 	int err;</div><div class='ctx'> 	do {</div><div class='del'>-		err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);</div><div class='add'>+		err = _nfs4_proc_delegreturn(inode, cred, stateid,</div><div class='add'>+					     delegation, issync);</div><div class='ctx'> 		trace_nfs4_delegreturn(inode, stateid, err);</div><div class='ctx'> 		switch (err) {</div><div class='ctx'> 			case -NFS4ERR_STALE_STATEID:</div><div class='hunk'>@@ -6800,7 +7034,7 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock</div><div class='ctx'> 	status = nfs4_call_sync(server-&gt;client, server, &amp;msg, &amp;arg.seq_args, &amp;res.seq_res, 1);</div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			request-&gt;fl_type = F_UNLCK;</div><div class='add'>+			request-&gt;c.flc_type = F_UNLCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -NFS4ERR_DENIED:</div><div class='ctx'> 			status = 0;</div><div class='hunk'>@@ -6872,6 +7106,7 @@ struct nfs4_unlockdata {</div><div class='ctx'> 	struct file_lock fl;</div><div class='ctx'> 	struct nfs_server *server;</div><div class='ctx'> 	unsigned long timestamp;</div><div class='add'>+	unsigned short retrans;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl,</div><div class='hunk'>@@ -6882,10 +7117,18 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl,</div><div class='ctx'> 	struct nfs4_unlockdata *p;</div><div class='ctx'> 	struct nfs4_state *state = lsp-&gt;ls_state;</div><div class='ctx'> 	struct inode *inode = state-&gt;inode;</div><div class='add'>+	struct nfs_lock_context *l_ctx;</div><div class='ctx'> </div><div class='ctx'> 	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'> 	if (p == NULL)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	l_ctx = nfs_get_lock_context(ctx);</div><div class='add'>+	if (!IS_ERR(l_ctx)) {</div><div class='add'>+		p-&gt;l_ctx = l_ctx;</div><div class='add'>+	} else {</div><div class='add'>+		kfree(p);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> 	p-&gt;arg.fh = NFS_FH(inode);</div><div class='ctx'> 	p-&gt;arg.fl = &amp;p-&gt;fl;</div><div class='ctx'> 	p-&gt;arg.seqid = seqid;</div><div class='hunk'>@@ -6893,7 +7136,6 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl,</div><div class='ctx'> 	p-&gt;lsp = lsp;</div><div class='ctx'> 	/* Ensure we don't close file until we're done freeing locks! */</div><div class='ctx'> 	p-&gt;ctx = get_nfs_open_context(ctx);</div><div class='del'>-	p-&gt;l_ctx = nfs_get_lock_context(ctx);</div><div class='ctx'> 	locks_init_lock(&amp;p-&gt;fl);</div><div class='ctx'> 	locks_copy_lock(&amp;p-&gt;fl, fl);</div><div class='ctx'> 	p-&gt;server = NFS_SERVER(inode);</div><div class='hunk'>@@ -6919,6 +7161,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)</div><div class='ctx'> 	struct nfs4_exception exception = {</div><div class='ctx'> 		.inode = calldata-&gt;lsp-&gt;ls_state-&gt;inode,</div><div class='ctx'> 		.stateid = &amp;calldata-&gt;arg.stateid,</div><div class='add'>+		.retrans = calldata-&gt;retrans,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!nfs4_sequence_done(task, &amp;calldata-&gt;res.seq_res))</div><div class='hunk'>@@ -6952,6 +7195,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)</div><div class='ctx'> 			task-&gt;tk_status = nfs4_async_handle_exception(task,</div><div class='ctx'> 					calldata-&gt;server, task-&gt;tk_status,</div><div class='ctx'> 					&amp;exception);</div><div class='add'>+			calldata-&gt;retrans = exception.retrans;</div><div class='ctx'> 			if (exception.retry)</div><div class='ctx'> 				rpc_restart_call_prepare(task);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7018,8 +7262,8 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,</div><div class='ctx'> 	/* Ensure this is an unlock - when canceling a lock, the</div><div class='ctx'> 	 * canceled lock is passed in, and it won't be an unlock.</div><div class='ctx'> 	 */</div><div class='del'>-	fl-&gt;fl_type = F_UNLCK;</div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_CLOSE)</div><div class='add'>+	fl-&gt;c.flc_type = F_UNLCK;</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_CLOSE)</div><div class='ctx'> 		set_bit(NFS_CONTEXT_UNLOCK, &amp;ctx-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	data = nfs4_alloc_unlockdata(fl, ctx, lsp, seqid);</div><div class='hunk'>@@ -7045,11 +7289,11 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> 	struct nfs_seqid *(*alloc_seqid)(struct nfs_seqid_counter *, gfp_t);</div><div class='ctx'> 	int status = 0;</div><div class='del'>-	unsigned char fl_flags = request-&gt;fl_flags;</div><div class='add'>+	unsigned char saved_flags = request-&gt;c.flc_flags;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_set_lock_state(state, request);</div><div class='ctx'> 	/* Unlock _before_ we do the RPC call */</div><div class='del'>-	request-&gt;fl_flags |= FL_EXISTS;</div><div class='add'>+	request-&gt;c.flc_flags |= FL_EXISTS;</div><div class='ctx'> 	/* Exclude nfs_delegation_claim_locks() */</div><div class='ctx'> 	mutex_lock(&amp;sp-&gt;so_delegreturn_mutex);</div><div class='ctx'> 	/* Exclude nfs4_reclaim_open_stateid() - note nesting! */</div><div class='hunk'>@@ -7073,14 +7317,16 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *</div><div class='ctx'> 	status = -ENOMEM;</div><div class='ctx'> 	if (IS_ERR(seqid))</div><div class='ctx'> 		goto out;</div><div class='del'>-	task = nfs4_do_unlck(request, nfs_file_open_context(request-&gt;fl_file), lsp, seqid);</div><div class='add'>+	task = nfs4_do_unlck(request,</div><div class='add'>+			     nfs_file_open_context(request-&gt;c.flc_file),</div><div class='add'>+			     lsp, seqid);</div><div class='ctx'> 	status = PTR_ERR(task);</div><div class='ctx'> 	if (IS_ERR(task))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	status = rpc_wait_for_completion_task(task);</div><div class='ctx'> 	rpc_put_task(task);</div><div class='ctx'> out:</div><div class='del'>-	request-&gt;fl_flags = fl_flags;</div><div class='add'>+	request-&gt;c.flc_flags = saved_flags;</div><div class='ctx'> 	trace_nfs4_unlock(request, state, F_SETLK, status);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -7191,7 +7437,7 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		renew_lease(NFS_SERVER(d_inode(data-&gt;ctx-&gt;dentry)),</div><div class='ctx'> 				data-&gt;timestamp);</div><div class='ctx'> 		if (data-&gt;arg.new_lock &amp;&amp; !data-&gt;cancelled) {</div><div class='del'>-			data-&gt;fl.fl_flags &amp;= ~(FL_SLEEP | FL_ACCESS);</div><div class='add'>+			data-&gt;fl.c.flc_flags &amp;= ~(FL_SLEEP | FL_ACCESS);</div><div class='ctx'> 			if (locks_lock_inode_wait(lsp-&gt;ls_state-&gt;inode, &amp;data-&gt;fl) &lt; 0)</div><div class='ctx'> 				goto out_restart;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -7292,7 +7538,8 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f</div><div class='ctx'> 	if (nfs_server_capable(state-&gt;inode, NFS_CAP_MOVEABLE))</div><div class='ctx'> 		task_setup_data.flags |= RPC_TASK_MOVEABLE;</div><div class='ctx'> </div><div class='del'>-	data = nfs4_alloc_lockdata(fl, nfs_file_open_context(fl-&gt;fl_file),</div><div class='add'>+	data = nfs4_alloc_lockdata(fl,</div><div class='add'>+				   nfs_file_open_context(fl-&gt;c.flc_file),</div><div class='ctx'> 				   fl-&gt;fl_u.nfs4_fl.owner, GFP_KERNEL);</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -7398,10 +7645,10 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(state-&gt;inode);</div><div class='ctx'> 	struct nfs4_state_owner *sp = state-&gt;owner;</div><div class='del'>-	unsigned char fl_flags = request-&gt;fl_flags;</div><div class='add'>+	unsigned char flags = request-&gt;c.flc_flags;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	request-&gt;fl_flags |= FL_ACCESS;</div><div class='add'>+	request-&gt;c.flc_flags |= FL_ACCESS;</div><div class='ctx'> 	status = locks_lock_inode_wait(state-&gt;inode, request);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -7410,7 +7657,7 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock</div><div class='ctx'> 	if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags)) {</div><div class='ctx'> 		/* Yes: cache locks! */</div><div class='ctx'> 		/* ...but avoid races with delegation recall... */</div><div class='del'>-		request-&gt;fl_flags = fl_flags &amp; ~FL_SLEEP;</div><div class='add'>+		request-&gt;c.flc_flags = flags &amp; ~FL_SLEEP;</div><div class='ctx'> 		status = locks_lock_inode_wait(state-&gt;inode, request);</div><div class='ctx'> 		up_read(&amp;nfsi-&gt;rwsem);</div><div class='ctx'> 		mutex_unlock(&amp;sp-&gt;so_delegreturn_mutex);</div><div class='hunk'>@@ -7420,7 +7667,7 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock</div><div class='ctx'> 	mutex_unlock(&amp;sp-&gt;so_delegreturn_mutex);</div><div class='ctx'> 	status = _nfs4_do_setlk(state, cmd, request, NFS_LOCK_NEW);</div><div class='ctx'> out:</div><div class='del'>-	request-&gt;fl_flags = fl_flags;</div><div class='add'>+	request-&gt;c.flc_flags = flags;</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7562,7 +7809,7 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)</div><div class='ctx'> 	if (!(IS_SETLK(cmd) || IS_SETLKW(cmd)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (request-&gt;fl_type == F_UNLCK) {</div><div class='add'>+	if (lock_is_unlock(request)) {</div><div class='ctx'> 		if (state != NULL)</div><div class='ctx'> 			return nfs4_proc_unlck(state, cmd, request);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -7571,7 +7818,7 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)</div><div class='ctx'> 	if (state == NULL)</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='del'>-	if ((request-&gt;fl_flags &amp; FL_POSIX) &amp;&amp;</div><div class='add'>+	if ((request-&gt;c.flc_flags &amp; FL_POSIX) &amp;&amp;</div><div class='ctx'> 	    !test_bit(NFS_STATE_POSIX_LOCKS, &amp;state-&gt;flags))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='hunk'>@@ -7579,7 +7826,7 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)</div><div class='ctx'> 	 * Don't rely on the VFS having checked the file open mode,</div><div class='ctx'> 	 * since it won't do this for flock() locks.</div><div class='ctx'> 	 */</div><div class='del'>-	switch (request-&gt;fl_type) {</div><div class='add'>+	switch (request-&gt;c.flc_type) {</div><div class='ctx'> 	case F_RDLCK:</div><div class='ctx'> 		if (!(filp-&gt;f_mode &amp; FMODE_READ))</div><div class='ctx'> 			return -EBADF;</div><div class='hunk'>@@ -7601,7 +7848,7 @@ static int nfs4_delete_lease(struct file *file, void **priv)</div><div class='ctx'> 	return generic_setlease(file, F_UNLCK, NULL, priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs4_add_lease(struct file *file, int arg, struct file_lock **lease,</div><div class='add'>+static int nfs4_add_lease(struct file *file, int arg, struct file_lease **lease,</div><div class='ctx'> 			  void **priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='hunk'>@@ -7609,17 +7856,17 @@ static int nfs4_add_lease(struct file *file, int arg, struct file_lock **lease,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* No delegation, no lease */</div><div class='del'>-	if (!nfs4_have_delegation(inode, type))</div><div class='add'>+	if (!nfs4_have_delegation(inode, type, 0))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	ret = generic_setlease(file, arg, lease, priv);</div><div class='del'>-	if (ret || nfs4_have_delegation(inode, type))</div><div class='add'>+	if (ret || nfs4_have_delegation(inode, type, 0))</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	/* We raced with a delegation return */</div><div class='ctx'> 	nfs4_delete_lease(file, priv);</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfs4_proc_setlease(struct file *file, int arg, struct file_lock **lease,</div><div class='add'>+int nfs4_proc_setlease(struct file *file, int arg, struct file_lease **lease,</div><div class='ctx'> 		       void **priv)</div><div class='ctx'> {</div><div class='ctx'> 	switch (arg) {</div><div class='hunk'>@@ -7643,10 +7890,10 @@ int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);</div><div class='del'>-		if (err != -NFS4ERR_DELAY)</div><div class='add'>+		if (err != -NFS4ERR_DELAY &amp;&amp; err != -NFS4ERR_GRACE)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ssleep(1);</div><div class='del'>-	} while (err == -NFS4ERR_DELAY);</div><div class='add'>+	} while (err == -NFS4ERR_DELAY || err == -NFSERR_GRACE);</div><div class='ctx'> 	return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8820,7 +9067,7 @@ nfs4_run_exchange_id(struct nfs_client *clp, const struct cred *cred,</div><div class='ctx'> #ifdef CONFIG_NFS_V4_1_MIGRATION</div><div class='ctx'> 	calldata-&gt;args.flags |= EXCHGID4_FLAG_SUPP_MOVED_MIGR;</div><div class='ctx'> #endif</div><div class='del'>-	if (test_bit(NFS_CS_DS, &amp;clp-&gt;cl_flags))</div><div class='add'>+	if (test_bit(NFS_CS_PNFS, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		calldata-&gt;args.flags |= EXCHGID4_FLAG_USE_PNFS_DS;</div><div class='ctx'> 	msg.rpc_argp = &amp;calldata-&gt;args;</div><div class='ctx'> 	msg.rpc_resp = &amp;calldata-&gt;res;</div><div class='hunk'>@@ -8970,10 +9217,12 @@ try_again:</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	status = task-&gt;tk_status;</div><div class='del'>-	if (status == 0)</div><div class='add'>+	if (status == 0) {</div><div class='ctx'> 		status = nfs4_detect_session_trunking(adata-&gt;clp,</div><div class='ctx'> 				task-&gt;tk_msg.rpc_resp, xprt);</div><div class='del'>-</div><div class='add'>+		trace_nfs4_trunked_exchange_id(adata-&gt;clp,</div><div class='add'>+			xprt-&gt;address_strings[RPC_DISPLAY_ADDR], status);</div><div class='add'>+	}</div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		rpc_clnt_xprt_switch_add_xprt(clnt, xprt);</div><div class='ctx'> 	else if (status != -NFS4ERR_DELAY &amp;&amp; rpc_clnt_xprt_switch_has_addr(clnt,</div><div class='hunk'>@@ -9211,7 +9460,7 @@ static int nfs4_verify_back_channel_attrs(struct nfs41_create_session_args *args</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (rcvd-&gt;max_rqst_sz &gt; sent-&gt;max_rqst_sz)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (rcvd-&gt;max_resp_sz &lt; sent-&gt;max_resp_sz)</div><div class='add'>+	if (rcvd-&gt;max_resp_sz &gt; sent-&gt;max_resp_sz)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (rcvd-&gt;max_resp_sz_cached &gt; sent-&gt;max_resp_sz_cached)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -9405,7 +9654,7 @@ static void nfs41_sequence_call_done(struct rpc_task *task, void *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfs4_sequence(clp, task-&gt;tk_status);</div><div class='del'>-	if (task-&gt;tk_status &lt; 0 &amp;&amp; !task-&gt;tk_client-&gt;cl_shutdown) {</div><div class='add'>+	if (task-&gt;tk_status &lt; 0 &amp;&amp; clp-&gt;cl_cons_state &gt;= 0) {</div><div class='ctx'> 		dprintk("%s ERROR %d\n", __func__, task-&gt;tk_status);</div><div class='ctx'> 		if (refcount_read(&amp;clp-&gt;cl_count) == 1)</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -9832,6 +10081,11 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	if (!nfs41_sequence_process(task, &amp;lrp-&gt;res.seq_res))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (task-&gt;tk_rpc_status == -ETIMEDOUT) {</div><div class='add'>+		lrp-&gt;rpc_status = -EAGAIN;</div><div class='add'>+		lrp-&gt;res.lrs_present = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Was there an RPC level error? Assume the call succeeded,</div><div class='ctx'> 	 * and that we need to release the layout</div><div class='hunk'>@@ -9851,13 +10105,25 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		task-&gt;tk_status = 0;</div><div class='add'>+		lrp-&gt;res.lrs_present = 0;</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		break;</div><div class='add'>+	case -NFS4ERR_BADSESSION:</div><div class='add'>+	case -NFS4ERR_DEADSESSION:</div><div class='add'>+	case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:</div><div class='add'>+		nfs4_schedule_session_recovery(server-&gt;nfs_client-&gt;cl_session,</div><div class='add'>+					       task-&gt;tk_status);</div><div class='add'>+		lrp-&gt;res.lrs_present = 0;</div><div class='add'>+		lrp-&gt;rpc_status = -EAGAIN;</div><div class='add'>+		task-&gt;tk_status = 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case -NFS4ERR_DELAY:</div><div class='del'>-		if (nfs4_async_handle_error(task, server, NULL, NULL) != -EAGAIN)</div><div class='del'>-			break;</div><div class='del'>-		goto out_restart;</div><div class='add'>+		if (nfs4_async_handle_error(task, server, NULL, NULL) ==</div><div class='add'>+		    -EAGAIN)</div><div class='add'>+			goto out_restart;</div><div class='add'>+		lrp-&gt;res.lrs_present = 0;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> out_restart:</div><div class='hunk'>@@ -9871,8 +10137,13 @@ static void nfs4_layoutreturn_release(void *calldata)</div><div class='ctx'> 	struct nfs4_layoutreturn *lrp = calldata;</div><div class='ctx'> 	struct pnfs_layout_hdr *lo = lrp-&gt;args.layout;</div><div class='ctx'> </div><div class='del'>-	pnfs_layoutreturn_free_lsegs(lo, &amp;lrp-&gt;args.stateid, &amp;lrp-&gt;args.range,</div><div class='add'>+	if (lrp-&gt;rpc_status == 0 || !lrp-&gt;inode)</div><div class='add'>+		pnfs_layoutreturn_free_lsegs(</div><div class='add'>+			lo, &amp;lrp-&gt;args.stateid, &amp;lrp-&gt;args.range,</div><div class='ctx'> 			lrp-&gt;res.lrs_present ? &amp;lrp-&gt;res.stateid : NULL);</div><div class='add'>+	else</div><div class='add'>+		pnfs_layoutreturn_retry_later(lo, &amp;lrp-&gt;args.stateid,</div><div class='add'>+					      &amp;lrp-&gt;args.range);</div><div class='ctx'> 	nfs4_sequence_free_slot(&amp;lrp-&gt;res.seq_res);</div><div class='ctx'> 	if (lrp-&gt;ld_private.ops &amp;&amp; lrp-&gt;ld_private.ops-&gt;free)</div><div class='ctx'> 		lrp-&gt;ld_private.ops-&gt;free(&amp;lrp-&gt;ld_private);</div><div class='hunk'>@@ -9888,7 +10159,7 @@ static const struct rpc_call_ops nfs4_layoutreturn_call_ops = {</div><div class='ctx'> 	.rpc_release = nfs4_layoutreturn_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync)</div><div class='add'>+int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> 	struct rpc_message msg = {</div><div class='hunk'>@@ -9911,7 +10182,7 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync)</div><div class='ctx'> 			&amp;task_setup_data.rpc_client, &amp;msg);</div><div class='ctx'> </div><div class='ctx'> 	lrp-&gt;inode = nfs_igrab_and_active(lrp-&gt;args.inode);</div><div class='del'>-	if (!sync) {</div><div class='add'>+	if (flags &amp; PNFS_FL_LAYOUTRETURN_ASYNC) {</div><div class='ctx'> 		if (!lrp-&gt;inode) {</div><div class='ctx'> 			nfs4_layoutreturn_release(lrp);</div><div class='ctx'> 			return -EAGAIN;</div><div class='hunk'>@@ -9919,6 +10190,8 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync)</div><div class='ctx'> 		task_setup_data.flags |= RPC_TASK_ASYNC;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!lrp-&gt;inode)</div><div class='add'>+		flags |= PNFS_FL_LAYOUTRETURN_PRIVILEGED;</div><div class='add'>+	if (flags &amp; PNFS_FL_LAYOUTRETURN_PRIVILEGED)</div><div class='ctx'> 		nfs4_init_sequence(&amp;lrp-&gt;args.seq_args, &amp;lrp-&gt;res.seq_res, 1,</div><div class='ctx'> 				   1);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -9927,7 +10200,7 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync)</div><div class='ctx'> 	task = rpc_run_task(&amp;task_setup_data);</div><div class='ctx'> 	if (IS_ERR(task))</div><div class='ctx'> 		return PTR_ERR(task);</div><div class='del'>-	if (sync)</div><div class='add'>+	if (!(flags &amp; PNFS_FL_LAYOUTRETURN_ASYNC))</div><div class='ctx'> 		status = task-&gt;tk_status;</div><div class='ctx'> 	trace_nfs4_layoutreturn(lrp-&gt;args.inode, &amp;lrp-&gt;args.stateid, status);</div><div class='ctx'> 	dprintk("&lt;-- %s status=%d\n", __func__, status);</div><div class='hunk'>@@ -10089,10 +10362,10 @@ nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, bool sync)</div><div class='ctx'>  * Use the state managment nfs_client cl_rpcclient, which uses krb5i (if</div><div class='ctx'>  * possible) as per RFC3530bis and RFC5661 Security Considerations sections</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-_nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-		    struct nfs_fsinfo *info,</div><div class='del'>-		    struct nfs4_secinfo_flavors *flavors, bool use_integrity)</div><div class='add'>+static int _nfs41_proc_secinfo_no_name(struct nfs_server *server,</div><div class='add'>+				       struct nfs_fh *fhandle,</div><div class='add'>+				       struct nfs4_secinfo_flavors *flavors,</div><div class='add'>+				       bool use_integrity)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs41_secinfo_no_name_args args = {</div><div class='ctx'> 		.style = SECINFO_STYLE_CURRENT_FH,</div><div class='hunk'>@@ -10136,9 +10409,9 @@ _nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-			   struct nfs_fsinfo *info, struct nfs4_secinfo_flavors *flavors)</div><div class='add'>+static int nfs41_proc_secinfo_no_name(struct nfs_server *server,</div><div class='add'>+				      struct nfs_fh *fhandle,</div><div class='add'>+				      struct nfs4_secinfo_flavors *flavors)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_exception exception = {</div><div class='ctx'> 		.interruptible = true,</div><div class='hunk'>@@ -10150,7 +10423,7 @@ nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> </div><div class='ctx'> 		/* try to use integrity protection with machine cred */</div><div class='ctx'> 		if (_nfs4_is_integrity_protected(server-&gt;nfs_client))</div><div class='del'>-			err = _nfs41_proc_secinfo_no_name(server, fhandle, info,</div><div class='add'>+			err = _nfs41_proc_secinfo_no_name(server, fhandle,</div><div class='ctx'> 							  flavors, true);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -10160,7 +10433,7 @@ nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 		 * the current filesystem's rpc_client and the user cred.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (err == -NFS4ERR_WRONGSEC)</div><div class='del'>-			err = _nfs41_proc_secinfo_no_name(server, fhandle, info,</div><div class='add'>+			err = _nfs41_proc_secinfo_no_name(server, fhandle,</div><div class='ctx'> 							  flavors, false);</div><div class='ctx'> </div><div class='ctx'> 		switch (err) {</div><div class='hunk'>@@ -10176,9 +10449,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='del'>-		    struct nfs_fsinfo *info)</div><div class='add'>+static int nfs41_find_root_sec(struct nfs_server *server,</div><div class='add'>+			       struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct page *page;</div><div class='hunk'>@@ -10194,14 +10466,14 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	flavors = page_address(page);</div><div class='del'>-	err = nfs41_proc_secinfo_no_name(server, fhandle, info, flavors);</div><div class='add'>+	err = nfs41_proc_secinfo_no_name(server, fhandle, flavors);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fall back on "guess and check" method if</div><div class='ctx'> 	 * the server doesn't support SECINFO_NO_NAME</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (err == -NFS4ERR_WRONGSEC || err == -ENOTSUPP) {</div><div class='del'>-		err = nfs4_find_root_sec(server, fhandle, info);</div><div class='add'>+		err = nfs4_find_root_sec(server, fhandle, fattr);</div><div class='ctx'> 		goto out_freepage;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -10226,8 +10498,8 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 			flavor = RPC_AUTH_MAXFLAVOR;</div><div class='ctx'> </div><div class='ctx'> 		if (flavor != RPC_AUTH_MAXFLAVOR) {</div><div class='del'>-			err = nfs4_lookup_root_sec(server, fhandle,</div><div class='del'>-						   info, flavor);</div><div class='add'>+			err = nfs4_lookup_root_sec(server, fhandle, fattr,</div><div class='add'>+						   flavor);</div><div class='ctx'> 			if (!err)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -10245,12 +10517,12 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _nfs41_test_stateid(struct nfs_server *server,</div><div class='del'>-		nfs4_stateid *stateid,</div><div class='del'>-		const struct cred *cred)</div><div class='add'>+			       const nfs4_stateid *stateid,</div><div class='add'>+			       const struct cred *cred)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	struct nfs41_test_stateid_args args = {</div><div class='del'>-		.stateid = stateid,</div><div class='add'>+		.stateid = *stateid,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct nfs41_test_stateid_res res;</div><div class='ctx'> 	struct rpc_message msg = {</div><div class='hunk'>@@ -10306,8 +10578,8 @@ static void nfs4_handle_delay_or_session_error(struct nfs_server *server,</div><div class='ctx'>  * failed or the state ID is not currently valid.</div><div class='ctx'>  */</div><div class='ctx'> static int nfs41_test_stateid(struct nfs_server *server,</div><div class='del'>-		nfs4_stateid *stateid,</div><div class='del'>-		const struct cred *cred)</div><div class='add'>+			      const nfs4_stateid *stateid,</div><div class='add'>+			      const struct cred *cred)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_exception exception = {</div><div class='ctx'> 		.interruptible = true,</div><div class='hunk'>@@ -10374,7 +10646,7 @@ static const struct rpc_call_ops nfs41_free_stateid_ops = {</div><div class='ctx'>  * Note: this function is always asynchronous.</div><div class='ctx'>  */</div><div class='ctx'> static int nfs41_free_stateid(struct nfs_server *server,</div><div class='del'>-		const nfs4_stateid *stateid,</div><div class='add'>+		nfs4_stateid *stateid,</div><div class='ctx'> 		const struct cred *cred,</div><div class='ctx'> 		bool privileged)</div><div class='ctx'> {</div><div class='hunk'>@@ -10414,6 +10686,7 @@ static int nfs41_free_stateid(struct nfs_server *server,</div><div class='ctx'> 	if (IS_ERR(task))</div><div class='ctx'> 		return PTR_ERR(task);</div><div class='ctx'> 	rpc_put_task(task);</div><div class='add'>+	stateid-&gt;type = NFS4_FREED_STATEID_TYPE;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10429,6 +10702,8 @@ nfs41_free_lock_state(struct nfs_server *server, struct nfs4_lock_state *lsp)</div><div class='ctx'> static bool nfs41_match_stateid(const nfs4_stateid *s1,</div><div class='ctx'> 		const nfs4_stateid *s2)</div><div class='ctx'> {</div><div class='add'>+	trace_nfs41_match_stateid(s1, s2);</div><div class='add'>+</div><div class='ctx'> 	if (s1-&gt;type != s2-&gt;type)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -10446,6 +10721,8 @@ static bool nfs41_match_stateid(const nfs4_stateid *s1,</div><div class='ctx'> static bool nfs4_match_stateid(const nfs4_stateid *s1,</div><div class='ctx'> 		const nfs4_stateid *s2)</div><div class='ctx'> {</div><div class='add'>+	trace_nfs4_match_stateid(s1, s2);</div><div class='add'>+</div><div class='ctx'> 	return nfs4_stateid_match(s1, s2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10580,12 +10857,14 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = {</div><div class='ctx'> 		| NFS_CAP_OFFLOAD_CANCEL</div><div class='ctx'> 		| NFS_CAP_COPY_NOTIFY</div><div class='ctx'> 		| NFS_CAP_DEALLOCATE</div><div class='add'>+		| NFS_CAP_ZERO_RANGE</div><div class='ctx'> 		| NFS_CAP_SEEK</div><div class='ctx'> 		| NFS_CAP_LAYOUTSTATS</div><div class='ctx'> 		| NFS_CAP_CLONE</div><div class='ctx'> 		| NFS_CAP_LAYOUTERROR</div><div class='ctx'> 		| NFS_CAP_READ_PLUS</div><div class='del'>-		| NFS_CAP_MOVEABLE,</div><div class='add'>+		| NFS_CAP_MOVEABLE</div><div class='add'>+		| NFS_CAP_OFFLOAD_STATUS,</div><div class='ctx'> 	.init_client = nfs41_init_client,</div><div class='ctx'> 	.shutdown_client = nfs41_shutdown_client,</div><div class='ctx'> 	.match_stateid = nfs41_match_stateid,</div><div class='hunk'>@@ -10614,30 +10893,44 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {</div><div class='ctx'> </div><div class='ctx'> static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ssize_t error, error2, error3;</div><div class='add'>+	ssize_t error, error2, error3, error4 = 0;</div><div class='add'>+	size_t left = size;</div><div class='ctx'> </div><div class='del'>-	error = generic_listxattr(dentry, list, size);</div><div class='add'>+	error = generic_listxattr(dentry, list, left);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	if (list) {</div><div class='ctx'> 		list += error;</div><div class='del'>-		size -= error;</div><div class='add'>+		left -= error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error2 = nfs4_listxattr_nfs4_label(d_inode(dentry), list, size);</div><div class='add'>+	error2 = nfs4_listxattr_nfs4_label(d_inode(dentry), list, left);</div><div class='ctx'> 	if (error2 &lt; 0)</div><div class='ctx'> 		return error2;</div><div class='ctx'> </div><div class='ctx'> 	if (list) {</div><div class='ctx'> 		list += error2;</div><div class='del'>-		size -= error2;</div><div class='add'>+		left -= error2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error3 = nfs4_listxattr_nfs4_user(d_inode(dentry), list, size);</div><div class='add'>+	error3 = nfs4_listxattr_nfs4_user(d_inode(dentry), list, left);</div><div class='ctx'> 	if (error3 &lt; 0)</div><div class='ctx'> 		return error3;</div><div class='add'>+	if (list) {</div><div class='add'>+		list += error3;</div><div class='add'>+		left -= error3;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return error + error2 + error3;</div><div class='add'>+	if (!nfs_server_capable(d_inode(dentry), NFS_CAP_SECURITY_LABEL)) {</div><div class='add'>+		error4 = security_inode_listsecurity(d_inode(dentry), list, left);</div><div class='add'>+		if (error4 &lt; 0)</div><div class='add'>+			return error4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error += error2 + error3 + error4;</div><div class='add'>+	if (size &amp;&amp; error &gt; size)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs4_enable_swap(struct inode *inode)</div><div class='hunk'>@@ -10686,6 +10979,26 @@ static const struct inode_operations nfs4_file_inode_operations = {</div><div class='ctx'> 	.listxattr	= nfs4_listxattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct nfs_server *nfs4_clone_server(struct nfs_server *source,</div><div class='add'>+		struct nfs_fh *fh, struct nfs_fattr *fattr,</div><div class='add'>+		rpc_authflavor_t flavor)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	server = nfs_clone_server(source, fh, fattr, flavor);</div><div class='add'>+	if (IS_ERR(server))</div><div class='add'>+		return server;</div><div class='add'>+</div><div class='add'>+	error = nfs4_delegation_hash_alloc(server);</div><div class='add'>+	if (error) {</div><div class='add'>+		nfs_free_server(server);</div><div class='add'>+		return ERR_PTR(error);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return server;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct nfs_rpc_ops nfs_v4_clientops = {</div><div class='ctx'> 	.version	= 4,			/* protocol version */</div><div class='ctx'> 	.dentry_ops	= &amp;nfs4_dentry_operations,</div><div class='hunk'>@@ -10733,11 +11046,12 @@ const struct nfs_rpc_ops nfs_v4_clientops = {</div><div class='ctx'> 	.close_context  = nfs4_close_context,</div><div class='ctx'> 	.open_context	= nfs4_atomic_open,</div><div class='ctx'> 	.have_delegation = nfs4_have_delegation,</div><div class='add'>+	.return_delegation = nfs4_inode_return_delegation,</div><div class='ctx'> 	.alloc_client	= nfs4_alloc_client,</div><div class='ctx'> 	.init_client	= nfs4_init_client,</div><div class='ctx'> 	.free_client	= nfs4_free_client,</div><div class='ctx'> 	.create_server	= nfs4_create_server,</div><div class='del'>-	.clone_server	= nfs_clone_server,</div><div class='add'>+	.clone_server	= nfs4_clone_server,</div><div class='ctx'> 	.discover_trunking = nfs4_discover_trunking,</div><div class='ctx'> 	.enable_swap	= nfs4_enable_swap,</div><div class='ctx'> 	.disable_swap	= nfs4_disable_swap,</div><div class='head'>diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c<br/>index db3811af0796..18ae614e5a6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4renewd.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4renewd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4renewd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4renewd.c</a></div><div class='hunk'>@@ -122,7 +122,7 @@ nfs4_schedule_state_renewal(struct nfs_client *clp)</div><div class='ctx'> 		timeout = 5 * HZ;</div><div class='ctx'> 	dprintk("%s: requeueing work. Lease period = %ld\n",</div><div class='ctx'> 			__func__, (timeout + HZ - 1) / HZ);</div><div class='del'>-	mod_delayed_work(system_wq, &amp;clp-&gt;cl_renewd, timeout);</div><div class='add'>+	mod_delayed_work(system_percpu_wq, &amp;clp-&gt;cl_renewd, timeout);</div><div class='ctx'> 	set_bit(NFS_CS_RENEWD, &amp;clp-&gt;cl_res_state);</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfs/nfs4session.h b/fs/nfs/nfs4session.h<br/>index 351616c61df5..f9c291e2165c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4session.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4session.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4session.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4session.h</a></div><div class='hunk'>@@ -148,16 +148,12 @@ static inline void nfs4_copy_sessionid(struct nfs4_sessionid *dst,</div><div class='ctx'> 	memcpy(dst-&gt;data, src-&gt;data, NFS4_MAX_SESSIONID_LEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRC32</div><div class='ctx'> /*</div><div class='ctx'>  * nfs_session_id_hash - calculate the crc32 hash for the session id</div><div class='ctx'>  * @session - pointer to session</div><div class='ctx'>  */</div><div class='ctx'> #define nfs_session_id_hash(sess_id) \</div><div class='ctx'> 	(~crc32_le(0xFFFFFFFF, &amp;(sess_id)-&gt;data[0], sizeof((sess_id)-&gt;data)))</div><div class='del'>-#else</div><div class='del'>-#define nfs_session_id_hash(session) (0)</div><div class='del'>-#endif</div><div class='ctx'> #else /* defined(CONFIG_NFS_V4_1) */</div><div class='ctx'> </div><div class='ctx'> static inline int nfs4_init_session(struct nfs_client *clp)</div><div class='head'>diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c<br/>index 9a5d911a7edc..01179f7de322 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4state.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4state.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4state.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4state.c</a></div><div class='hunk'>@@ -501,11 +501,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,</div><div class='ctx'> 	sp = kzalloc(sizeof(*sp), gfp_flags);</div><div class='ctx'> 	if (!sp)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	sp-&gt;so_seqid.owner_id = ida_alloc(&amp;server-&gt;openowner_id, gfp_flags);</div><div class='del'>-	if (sp-&gt;so_seqid.owner_id &lt; 0) {</div><div class='del'>-		kfree(sp);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	sp-&gt;so_seqid.owner_id = atomic64_inc_return(&amp;server-&gt;owner_ctr);</div><div class='ctx'> 	sp-&gt;so_server = server;</div><div class='ctx'> 	sp-&gt;so_cred = get_cred(cred);</div><div class='ctx'> 	spin_lock_init(&amp;sp-&gt;so_lock);</div><div class='hunk'>@@ -513,7 +509,6 @@ nfs4_alloc_state_owner(struct nfs_server *server,</div><div class='ctx'> 	nfs4_init_seqid_counter(&amp;sp-&gt;so_seqid);</div><div class='ctx'> 	atomic_set(&amp;sp-&gt;so_count, 1);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sp-&gt;so_lru);</div><div class='del'>-	seqcount_spinlock_init(&amp;sp-&gt;so_reclaim_seqcount, &amp;sp-&gt;so_lock);</div><div class='ctx'> 	mutex_init(&amp;sp-&gt;so_delegreturn_mutex);</div><div class='ctx'> 	return sp;</div><div class='ctx'> }</div><div class='hunk'>@@ -537,7 +532,6 @@ static void nfs4_free_state_owner(struct nfs4_state_owner *sp)</div><div class='ctx'> {</div><div class='ctx'> 	nfs4_destroy_seqid_counter(&amp;sp-&gt;so_seqid);</div><div class='ctx'> 	put_cred(sp-&gt;so_cred);</div><div class='del'>-	ida_free(&amp;sp-&gt;so_server-&gt;openowner_id, sp-&gt;so_seqid.owner_id);</div><div class='ctx'> 	kfree(sp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -847,15 +841,15 @@ void nfs4_close_sync(struct nfs4_state *state, fmode_t fmode)</div><div class='ctx'>  */</div><div class='ctx'> static struct nfs4_lock_state *</div><div class='ctx'> __nfs4_find_lock_state(struct nfs4_state *state,</div><div class='del'>-		       fl_owner_t fl_owner, fl_owner_t fl_owner2)</div><div class='add'>+		       fl_owner_t owner, fl_owner_t owner2)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_lock_state *pos, *ret = NULL;</div><div class='ctx'> 	list_for_each_entry(pos, &amp;state-&gt;lock_states, ls_locks) {</div><div class='del'>-		if (pos-&gt;ls_owner == fl_owner) {</div><div class='add'>+		if (pos-&gt;ls_owner == owner) {</div><div class='ctx'> 			ret = pos;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (pos-&gt;ls_owner == fl_owner2)</div><div class='add'>+		if (pos-&gt;ls_owner == owner2)</div><div class='ctx'> 			ret = pos;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -868,7 +862,7 @@ __nfs4_find_lock_state(struct nfs4_state *state,</div><div class='ctx'>  * exists, return an uninitialized one.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, fl_owner_t fl_owner)</div><div class='add'>+static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, fl_owner_t owner)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_lock_state *lsp;</div><div class='ctx'> 	struct nfs_server *server = state-&gt;owner-&gt;so_server;</div><div class='hunk'>@@ -879,20 +873,14 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f</div><div class='ctx'> 	nfs4_init_seqid_counter(&amp;lsp-&gt;ls_seqid);</div><div class='ctx'> 	refcount_set(&amp;lsp-&gt;ls_count, 1);</div><div class='ctx'> 	lsp-&gt;ls_state = state;</div><div class='del'>-	lsp-&gt;ls_owner = fl_owner;</div><div class='del'>-	lsp-&gt;ls_seqid.owner_id = ida_alloc(&amp;server-&gt;lockowner_id, GFP_KERNEL_ACCOUNT);</div><div class='del'>-	if (lsp-&gt;ls_seqid.owner_id &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+	lsp-&gt;ls_owner = owner;</div><div class='add'>+	lsp-&gt;ls_seqid.owner_id = atomic64_inc_return(&amp;server-&gt;owner_ctr);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;lsp-&gt;ls_locks);</div><div class='ctx'> 	return lsp;</div><div class='del'>-out_free:</div><div class='del'>-	kfree(lsp);</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nfs4_free_lock_state(struct nfs_server *server, struct nfs4_lock_state *lsp)</div><div class='ctx'> {</div><div class='del'>-	ida_free(&amp;server-&gt;lockowner_id, lsp-&gt;ls_seqid.owner_id);</div><div class='ctx'> 	nfs4_destroy_seqid_counter(&amp;lsp-&gt;ls_seqid);</div><div class='ctx'> 	kfree(lsp);</div><div class='ctx'> }</div><div class='hunk'>@@ -980,7 +968,7 @@ int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;fl_ops != NULL)</div><div class='ctx'> 		return 0;</div><div class='del'>-	lsp = nfs4_get_lock_state(state, fl-&gt;fl_owner);</div><div class='add'>+	lsp = nfs4_get_lock_state(state, fl-&gt;c.flc_owner);</div><div class='ctx'> 	if (lsp == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	fl-&gt;fl_u.nfs4_fl.owner = lsp;</div><div class='hunk'>@@ -993,7 +981,7 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst,</div><div class='ctx'> 		const struct nfs_lock_context *l_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_lock_state *lsp;</div><div class='del'>-	fl_owner_t fl_owner, fl_flock_owner;</div><div class='add'>+	fl_owner_t owner, fl_flock_owner;</div><div class='ctx'> 	int ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (l_ctx == NULL)</div><div class='hunk'>@@ -1002,11 +990,11 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst,</div><div class='ctx'> 	if (test_bit(LK_STATE_IN_USE, &amp;state-&gt;flags) == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	fl_owner = l_ctx-&gt;lockowner;</div><div class='add'>+	owner = l_ctx-&gt;lockowner;</div><div class='ctx'> 	fl_flock_owner = l_ctx-&gt;open_context-&gt;flock_owner;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;state-&gt;state_lock);</div><div class='del'>-	lsp = __nfs4_find_lock_state(state, fl_owner, fl_flock_owner);</div><div class='add'>+	lsp = __nfs4_find_lock_state(state, owner, fl_flock_owner);</div><div class='ctx'> 	if (lsp &amp;&amp; test_bit(NFS_LOCK_LOST, &amp;lsp-&gt;ls_flags))</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	else if (lsp != NULL &amp;&amp; test_bit(NFS_LOCK_INITIALIZED, &amp;lsp-&gt;ls_flags) != 0) {</div><div class='hunk'>@@ -1095,14 +1083,12 @@ void nfs_release_seqid(struct nfs_seqid *seqid)</div><div class='ctx'> 		return;</div><div class='ctx'> 	sequence = seqid-&gt;sequence;</div><div class='ctx'> 	spin_lock(&amp;sequence-&gt;lock);</div><div class='del'>-	list_del_init(&amp;seqid-&gt;list);</div><div class='del'>-	if (!list_empty(&amp;sequence-&gt;list)) {</div><div class='del'>-		struct nfs_seqid *next;</div><div class='del'>-</div><div class='del'>-		next = list_first_entry(&amp;sequence-&gt;list,</div><div class='del'>-				struct nfs_seqid, list);</div><div class='add'>+	if (list_is_first(&amp;seqid-&gt;list, &amp;sequence-&gt;list) &amp;&amp;</div><div class='add'>+	    !list_is_singular(&amp;sequence-&gt;list)) {</div><div class='add'>+		struct nfs_seqid *next = list_next_entry(seqid, list);</div><div class='ctx'> 		rpc_wake_up_queued_task(&amp;sequence-&gt;wait, next-&gt;task);</div><div class='ctx'> 	}</div><div class='add'>+	list_del_init(&amp;seqid-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;sequence-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1212,7 +1198,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)</div><div class='ctx'> 	struct rpc_clnt *clnt = clp-&gt;cl_rpcclient;</div><div class='ctx'> 	bool swapon = false;</div><div class='ctx'> </div><div class='del'>-	if (clnt-&gt;cl_shutdown)</div><div class='add'>+	if (clp-&gt;cl_cons_state &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(NFS4CLNT_RUN_MANAGER, &amp;clp-&gt;cl_state);</div><div class='hunk'>@@ -1417,7 +1403,7 @@ int nfs4_schedule_stateid_recovery(const struct nfs_server *server, struct nfs4_</div><div class='ctx'> 	dprintk("%s: scheduling stateid recovery for server %s\n", __func__,</div><div class='ctx'> 			clp-&gt;cl_hostname);</div><div class='ctx'> 	nfs4_schedule_state_manager(clp);</div><div class='del'>-	return 0;</div><div class='add'>+	return clp-&gt;cl_cons_state &lt; 0 ? clp-&gt;cl_cons_state : 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs4_schedule_stateid_recovery);</div><div class='ctx'> </div><div class='hunk'>@@ -1529,8 +1515,8 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_</div><div class='ctx'> 	down_write(&amp;nfsi-&gt;rwsem);</div><div class='ctx'> 	spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> restart:</div><div class='del'>-	list_for_each_entry(fl, list, fl_list) {</div><div class='del'>-		if (nfs_file_open_context(fl-&gt;fl_file)-&gt;state != state)</div><div class='add'>+	for_each_file_lock(fl, list) {</div><div class='add'>+		if (nfs_file_open_context(fl-&gt;c.flc_file)-&gt;state != state)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> 		status = ops-&gt;recover_lock(state, fl);</div><div class='hunk'>@@ -1597,7 +1583,7 @@ static void nfs42_complete_copies(struct nfs4_state_owner *sp, struct nfs4_state</div><div class='ctx'> 			complete(&amp;copy-&gt;completion);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_entry(copy, &amp;sp-&gt;so_server-&gt;ss_copies, src_copies) {</div><div class='add'>+	list_for_each_entry(copy, &amp;sp-&gt;so_server-&gt;ss_src_copies, src_copies) {</div><div class='ctx'> 		if ((test_bit(NFS_CLNT_SRC_SSC_COPY_STATE, &amp;state-&gt;flags) &amp;&amp;</div><div class='ctx'> 				!nfs4_stateid_match_other(&amp;state-&gt;stateid,</div><div class='ctx'> 				&amp;copy-&gt;parent_src_state-&gt;stateid)))</div><div class='hunk'>@@ -1667,7 +1653,6 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp,</div><div class='ctx'> 	 * server that doesn't support a grace period.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;sp-&gt;so_lock);</div><div class='del'>-	raw_write_seqcount_begin(&amp;sp-&gt;so_reclaim_seqcount);</div><div class='ctx'> restart:</div><div class='ctx'> 	list_for_each_entry(state, &amp;sp-&gt;so_states, open_states) {</div><div class='ctx'> 		if (!test_and_clear_bit(ops-&gt;state_flag_bit, &amp;state-&gt;flags))</div><div class='hunk'>@@ -1735,7 +1720,6 @@ restart:</div><div class='ctx'> 		spin_lock(&amp;sp-&gt;so_lock);</div><div class='ctx'> 		goto restart;</div><div class='ctx'> 	}</div><div class='del'>-	raw_write_seqcount_end(&amp;sp-&gt;so_reclaim_seqcount);</div><div class='ctx'> 	spin_unlock(&amp;sp-&gt;so_lock);</div><div class='ctx'> #ifdef CONFIG_NFS_V4_2</div><div class='ctx'> 	if (found_ssc_copy_state)</div><div class='hunk'>@@ -1745,7 +1729,6 @@ restart:</div><div class='ctx'> out_err:</div><div class='ctx'> 	nfs4_put_open_state(state);</div><div class='ctx'> 	spin_lock(&amp;sp-&gt;so_lock);</div><div class='del'>-	raw_write_seqcount_end(&amp;sp-&gt;so_reclaim_seqcount);</div><div class='ctx'> 	spin_unlock(&amp;sp-&gt;so_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1867,6 +1850,7 @@ static void nfs4_state_end_reclaim_reboot(struct nfs_client *clp)</div><div class='ctx'> </div><div class='ctx'> 	if (!nfs4_state_clear_reclaim_reboot(clp))</div><div class='ctx'> 		return;</div><div class='add'>+	pnfs_destroy_all_layouts(clp);</div><div class='ctx'> 	ops = clp-&gt;cl_mvops-&gt;reboot_recovery_ops;</div><div class='ctx'> 	cred = nfs4_get_clid_cred(clp);</div><div class='ctx'> 	err = nfs4_reclaim_complete(clp, ops, cred);</div><div class='hunk'>@@ -1928,9 +1912,12 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov</div><div class='ctx'> 	struct nfs_server *server;</div><div class='ctx'> 	struct rb_node *pos;</div><div class='ctx'> 	LIST_HEAD(freeme);</div><div class='del'>-	int status = 0;</div><div class='ctx'> 	int lost_locks = 0;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='add'>+	status = nfs4_begin_drain_session(clp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='ctx'> restart:</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	list_for_each_entry_rcu(server, &amp;clp-&gt;cl_superblocks, client_link) {</div><div class='hunk'>@@ -1957,6 +1944,7 @@ restart:</div><div class='ctx'> 				set_bit(ops-&gt;owner_flag_bit, &amp;sp-&gt;so_flags);</div><div class='ctx'> 				nfs4_put_state_owner(sp);</div><div class='ctx'> 				status = nfs4_recovery_handle_error(clp, status);</div><div class='add'>+				nfs4_free_state_owners(&amp;freeme);</div><div class='ctx'> 				return (status != 0) ? status : -EAGAIN;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -1967,6 +1955,7 @@ restart:</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	nfs4_free_state_owners(&amp;freeme);</div><div class='add'>+	nfs_local_probe_async(clp);</div><div class='ctx'> 	if (lost_locks)</div><div class='ctx'> 		pr_warn("NFS: %s: lost %d locks\n",</div><div class='ctx'> 			clp-&gt;cl_hostname, lost_locks);</div><div class='hunk'>@@ -2023,6 +2012,12 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)</div><div class='ctx'> 		nfs_mark_client_ready(clp, -EPERM);</div><div class='ctx'> 		clear_bit(NFS4CLNT_LEASE_CONFIRM, &amp;clp-&gt;cl_state);</div><div class='ctx'> 		return -EPERM;</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		if (clp-&gt;cl_cons_state == NFS_CS_SESSION_INITING) {</div><div class='add'>+			nfs_mark_client_ready(clp, -EIO);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case -EACCES:</div><div class='ctx'> 	case -NFS4ERR_DELAY:</div><div class='ctx'> 	case -EAGAIN:</div><div class='hunk'>@@ -2069,7 +2064,6 @@ static int nfs4_establish_lease(struct nfs_client *clp)</div><div class='ctx'> 	put_cred(cred);</div><div class='ctx'> 	if (status != 0)</div><div class='ctx'> 		return status;</div><div class='del'>-	pnfs_destroy_all_layouts(clp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2117,6 +2111,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_client *clp = server-&gt;nfs_client;</div><div class='ctx'> 	struct nfs4_fs_locations *locations = NULL;</div><div class='add'>+	struct nfs_fattr *fattr;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	int status, result;</div><div class='hunk'>@@ -2126,19 +2121,16 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred</div><div class='ctx'> 			(unsigned long long)server-&gt;fsid.minor,</div><div class='ctx'> 			clp-&gt;cl_hostname);</div><div class='ctx'> </div><div class='del'>-	result = 0;</div><div class='ctx'> 	page = alloc_page(GFP_KERNEL);</div><div class='ctx'> 	locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL);</div><div class='del'>-	if (page == NULL || locations == NULL) {</div><div class='del'>-		dprintk("&lt;-- %s: no memory\n", __func__);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	locations-&gt;fattr = nfs_alloc_fattr();</div><div class='del'>-	if (locations-&gt;fattr == NULL) {</div><div class='add'>+	fattr = nfs_alloc_fattr();</div><div class='add'>+	if (page == NULL || locations == NULL || fattr == NULL) {</div><div class='ctx'> 		dprintk("&lt;-- %s: no memory\n", __func__);</div><div class='add'>+		result = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	locations-&gt;fattr = fattr;</div><div class='ctx'> 	inode = d_inode(server-&gt;super-&gt;s_root);</div><div class='ctx'> 	result = nfs4_proc_get_locations(server, NFS_FH(inode), locations,</div><div class='ctx'> 					 page, cred);</div><div class='hunk'>@@ -2683,6 +2675,8 @@ static void nfs4_state_manager(struct nfs_client *clp)</div><div class='ctx'> 			section = "reclaim reboot";</div><div class='ctx'> 			status = nfs4_do_reclaim(clp,</div><div class='ctx'> 				clp-&gt;cl_mvops-&gt;reboot_recovery_ops);</div><div class='add'>+			if (status == 0)</div><div class='add'>+				status = pnfs_layout_handle_reboot(clp);</div><div class='ctx'> 			if (status == -EAGAIN)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (status &lt; 0)</div><div class='hunk'>@@ -2694,6 +2688,9 @@ static void nfs4_state_manager(struct nfs_client *clp)</div><div class='ctx'> 		/* Detect expired delegations... */</div><div class='ctx'> 		if (test_and_clear_bit(NFS4CLNT_DELEGATION_EXPIRED, &amp;clp-&gt;cl_state)) {</div><div class='ctx'> 			section = "detect expired delegations";</div><div class='add'>+			status = nfs4_begin_drain_session(clp);</div><div class='add'>+			if (status &lt; 0)</div><div class='add'>+				goto out_error;</div><div class='ctx'> 			nfs_reap_expired_delegations(clp);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2742,7 +2739,18 @@ out_error:</div><div class='ctx'> 	pr_warn_ratelimited("NFS: state manager%s%s failed on NFSv4 server %s"</div><div class='ctx'> 			" with error %d\n", section_sep, section,</div><div class='ctx'> 			clp-&gt;cl_hostname, -status);</div><div class='del'>-	ssleep(1);</div><div class='add'>+	switch (status) {</div><div class='add'>+	case -ENETDOWN:</div><div class='add'>+	case -ENETUNREACH:</div><div class='add'>+		nfs_mark_client_ready(clp, -EIO);</div><div class='add'>+		break;</div><div class='add'>+	case -EINVAL:</div><div class='add'>+		nfs_mark_client_ready(clp, status);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ssleep(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> out_drain:</div><div class='ctx'> 	memalloc_nofs_restore(memflags);</div><div class='ctx'> 	nfs4_end_drain_session(clp);</div><div class='head'>diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c<br/>index d09bcfd7db89..5ec9c83f1ef0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4super.c</a></div><div class='hunk'>@@ -145,18 +145,13 @@ static int do_nfs4_mount(struct nfs_server *server,</div><div class='ctx'> 			 const char *export_path)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_fs_context *root_ctx;</div><div class='add'>+	struct nfs_fs_context *ctx;</div><div class='ctx'> 	struct fs_context *root_fc;</div><div class='ctx'> 	struct vfsmount *root_mnt;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	size_t len;</div><div class='add'>+	char *source;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	struct fs_parameter param = {</div><div class='del'>-		.key	= "source",</div><div class='del'>-		.type	= fs_value_is_string,</div><div class='del'>-		.dirfd	= -1,</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	if (IS_ERR(server))</div><div class='ctx'> 		return PTR_ERR(server);</div><div class='ctx'> </div><div class='hunk'>@@ -168,25 +163,32 @@ static int do_nfs4_mount(struct nfs_server *server,</div><div class='ctx'> 	kfree(root_fc-&gt;source);</div><div class='ctx'> 	root_fc-&gt;source = NULL;</div><div class='ctx'> </div><div class='add'>+	ctx = nfs_fc2context(fc);</div><div class='ctx'> 	root_ctx = nfs_fc2context(root_fc);</div><div class='ctx'> 	root_ctx-&gt;internal = true;</div><div class='ctx'> 	root_ctx-&gt;server = server;</div><div class='del'>-	/* We leave export_path unset as it's not used to find the root. */</div><div class='ctx'> </div><div class='del'>-	len = strlen(hostname) + 5;</div><div class='del'>-	param.string = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	if (param.string == NULL) {</div><div class='del'>-		put_fs_context(root_fc);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (ctx-&gt;fscache_uniq) {</div><div class='add'>+		ret = vfs_parse_fs_string(root_fc, "fsc", ctx-&gt;fscache_uniq);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			put_fs_context(root_fc);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	/* We leave export_path unset as it's not used to find the root. */</div><div class='ctx'> </div><div class='ctx'> 	/* Does hostname needs to be enclosed in brackets? */</div><div class='ctx'> 	if (strchr(hostname, ':'))</div><div class='del'>-		param.size = snprintf(param.string, len, "[%s]:/", hostname);</div><div class='add'>+		source = kasprintf(GFP_KERNEL, "[%s]:/", hostname);</div><div class='ctx'> 	else</div><div class='del'>-		param.size = snprintf(param.string, len, "%s:/", hostname);</div><div class='del'>-	ret = vfs_parse_fs_param(root_fc, &amp;param);</div><div class='del'>-	kfree(param.string);</div><div class='add'>+		source = kasprintf(GFP_KERNEL, "%s:/", hostname);</div><div class='add'>+</div><div class='add'>+	if (!source) {</div><div class='add'>+		put_fs_context(root_fc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	ret = vfs_parse_fs_string(root_fc, "source", source);</div><div class='add'>+	kfree(source);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		put_fs_context(root_fc);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -308,6 +310,7 @@ static void __exit exit_nfs_v4(void)</div><div class='ctx'> 	nfs_dns_resolver_destroy();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NFSv4 client support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(init_nfs_v4);</div><div class='head'>diff --git a/fs/nfs/nfs4sysctl.c b/fs/nfs/nfs4sysctl.c<br/>index 886a7c4c60b3..d1a92d8f8ba4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4sysctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4sysctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4sysctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4sysctl.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@ static const int nfs_set_port_min;</div><div class='ctx'> static const int nfs_set_port_max = 65535;</div><div class='ctx'> static struct ctl_table_header *nfs4_callback_sysctl_table;</div><div class='ctx'> </div><div class='del'>-static struct ctl_table nfs4_cb_sysctls[] = {</div><div class='add'>+static const struct ctl_table nfs4_cb_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname = "nfs_callback_tcpport",</div><div class='ctx'> 		.data = &amp;nfs_callback_set_tcpport,</div><div class='head'>diff --git a/fs/nfs/nfs4trace.c b/fs/nfs/nfs4trace.c<br/>index d9ac556bebcf..987c92d6364b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4trace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4trace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4trace.c</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2013 Trond Myklebust &lt;Trond.Myklebust@netapp.com&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;uapi/linux/pr.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> #include "nfs4_fs.h"</div><div class='ctx'> #include "internal.h"</div><div class='hunk'>@@ -24,8 +26,17 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(pnfs_mds_fallback_read_done);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(pnfs_mds_fallback_write_done);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(pnfs_mds_fallback_read_pagelist);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(pnfs_mds_fallback_write_pagelist);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(pnfs_ds_connect);</div><div class='ctx'> </div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(ff_layout_read_error);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(ff_layout_write_error);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(ff_layout_commit_error);</div><div class='add'>+</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(bl_ext_tree_prepare_commit);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_reg);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_reg_err);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_unreg);</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_unreg_err);</div><div class='add'>+</div><div class='add'>+EXPORT_TRACEPOINT_SYMBOL_GPL(fl_getdevinfo);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h<br/>index d27919d7241d..9776d220cec3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4trace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4trace.h</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;trace/misc/fs.h&gt;</div><div class='ctx'> #include &lt;trace/misc/nfs.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "delegation.h"</div><div class='add'>+</div><div class='ctx'> #define show_nfs_fattr_flags(valid) \</div><div class='ctx'> 	__print_flags((unsigned long)valid, "|", \</div><div class='ctx'> 		{ NFS_ATTR_FATTR_TYPE, "TYPE" }, \</div><div class='hunk'>@@ -30,7 +32,8 @@</div><div class='ctx'> 		{ NFS_ATTR_FATTR_CTIME, "CTIME" }, \</div><div class='ctx'> 		{ NFS_ATTR_FATTR_CHANGE, "CHANGE" }, \</div><div class='ctx'> 		{ NFS_ATTR_FATTR_OWNER_NAME, "OWNER_NAME" }, \</div><div class='del'>-		{ NFS_ATTR_FATTR_GROUP_NAME, "GROUP_NAME" })</div><div class='add'>+		{ NFS_ATTR_FATTR_GROUP_NAME, "GROUP_NAME" }, \</div><div class='add'>+		{ NFS_ATTR_FATTR_BTIME, "BTIME" })</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfs4_clientid_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='hunk'>@@ -47,7 +50,7 @@ DECLARE_EVENT_CLASS(nfs4_clientid_event,</div><div class='ctx'> </div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='del'>-			__assign_str(dstaddr, clp-&gt;cl_hostname);</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -77,6 +80,36 @@ DEFINE_NFS4_CLIENTID_EVENT(nfs4_bind_conn_to_session);</div><div class='ctx'> DEFINE_NFS4_CLIENTID_EVENT(nfs4_sequence);</div><div class='ctx'> DEFINE_NFS4_CLIENTID_EVENT(nfs4_reclaim_complete);</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(nfs4_trunked_exchange_id,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct nfs_client *clp,</div><div class='add'>+			const char *addr,</div><div class='add'>+			int error</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(clp, addr, error),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__string(main_addr, clp-&gt;cl_hostname)</div><div class='add'>+			__string(trunk_addr, addr)</div><div class='add'>+			__field(unsigned long, error)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='add'>+			__assign_str(main_addr);</div><div class='add'>+			__assign_str(trunk_addr);</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"error=%ld (%s) main_addr=%s trunk_addr=%s",</div><div class='add'>+			-__entry-&gt;error,</div><div class='add'>+			show_nfs4_status(__entry-&gt;error),</div><div class='add'>+			__get_str(main_addr),</div><div class='add'>+			__get_str(trunk_addr)</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(nfs4_sequence_done,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct nfs4_session *session,</div><div class='hunk'>@@ -243,6 +276,32 @@ TRACE_EVENT(nfs4_cb_offload,</div><div class='ctx'> 			show_nfs_stable_how(__entry-&gt;cb_how)</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(pnfs_ds_connect,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			char *ds_remotestr,</div><div class='add'>+			int status</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(ds_remotestr, status),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__string(ds_ips, ds_remotestr)</div><div class='add'>+			__field(int, status)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__assign_str(ds_ips);</div><div class='add'>+			__entry-&gt;status = status;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"ds_ips=%s, status=%d",</div><div class='add'>+			__get_str(ds_ips),</div><div class='add'>+			__entry-&gt;status</div><div class='add'>+                )</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_NFS_V4_1 */</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(nfs4_setup_sequence,</div><div class='hunk'>@@ -335,7 +394,7 @@ TRACE_EVENT(nfs4_state_mgr,</div><div class='ctx'> </div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			__entry-&gt;state = clp-&gt;cl_state;</div><div class='del'>-			__assign_str(hostname, clp-&gt;cl_hostname);</div><div class='add'>+			__assign_str(hostname);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -363,8 +422,8 @@ TRACE_EVENT(nfs4_state_mgr_failed,</div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			__entry-&gt;error = status &lt; 0 ? -status : 0;</div><div class='ctx'> 			__entry-&gt;state = clp-&gt;cl_state;</div><div class='del'>-			__assign_str(hostname, clp-&gt;cl_hostname);</div><div class='del'>-			__assign_str(section, section);</div><div class='add'>+			__assign_str(hostname);</div><div class='add'>+			__assign_str(section);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -548,7 +607,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,</div><div class='ctx'> 				__entry-&gt;fhandle = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(d_inode(ctx-&gt;dentry-&gt;d_parent));</div><div class='del'>-			__assign_str(name, ctx-&gt;dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -699,7 +758,7 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,</div><div class='ctx'> </div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='ctx'> 			__entry-&gt;cmd = cmd;</div><div class='del'>-			__entry-&gt;type = request-&gt;fl_type;</div><div class='add'>+			__entry-&gt;type = request-&gt;c.flc_type;</div><div class='ctx'> 			__entry-&gt;start = request-&gt;fl_start;</div><div class='ctx'> 			__entry-&gt;end = request-&gt;fl_end;</div><div class='ctx'> 			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='hunk'>@@ -771,7 +830,7 @@ TRACE_EVENT(nfs4_set_lock,</div><div class='ctx'> </div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='ctx'> 			__entry-&gt;cmd = cmd;</div><div class='del'>-			__entry-&gt;type = request-&gt;fl_type;</div><div class='add'>+			__entry-&gt;type = request-&gt;c.flc_type;</div><div class='ctx'> 			__entry-&gt;start = request-&gt;fl_start;</div><div class='ctx'> 			__entry-&gt;end = request-&gt;fl_end;</div><div class='ctx'> 			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='hunk'>@@ -926,6 +985,52 @@ DECLARE_EVENT_CLASS(nfs4_set_delegation_event,</div><div class='ctx'> 			TP_ARGS(inode, fmode))</div><div class='ctx'> DEFINE_NFS4_SET_DELEGATION_EVENT(nfs4_set_delegation);</div><div class='ctx'> DEFINE_NFS4_SET_DELEGATION_EVENT(nfs4_reclaim_delegation);</div><div class='add'>+DEFINE_NFS4_SET_DELEGATION_EVENT(nfs4_detach_delegation);</div><div class='add'>+</div><div class='add'>+#define show_delegation_flags(flags) \</div><div class='add'>+	__print_flags(flags, "|", \</div><div class='add'>+		{ BIT(NFS_DELEGATION_NEED_RECLAIM), "NEED_RECLAIM" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_RETURN), "RETURN" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_RETURN_IF_CLOSED), "RETURN_IF_CLOSED" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_REFERENCED), "REFERENCED" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_RETURNING), "RETURNING" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_REVOKED), "REVOKED" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_TEST_EXPIRED), "TEST_EXPIRED" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_INODE_FREEING), "INODE_FREEING" }, \</div><div class='add'>+		{ BIT(NFS_DELEGATION_RETURN_DELAYED), "RETURN_DELAYED" })</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfs4_delegation_event,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct nfs_delegation *delegation</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(delegation),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(u32, fhandle)</div><div class='add'>+			__field(unsigned int, fmode)</div><div class='add'>+			__field(unsigned long, flags)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__entry-&gt;fhandle = nfs_fhandle_hash(NFS_FH(delegation-&gt;inode));</div><div class='add'>+			__entry-&gt;fmode = delegation-&gt;type;</div><div class='add'>+			__entry-&gt;flags = delegation-&gt;flags;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"fhandle=0x%08x fmode=%s flags=%s",</div><div class='add'>+			__entry-&gt;fhandle, show_fs_fmode_flags(__entry-&gt;fmode),</div><div class='add'>+			show_delegation_flags(__entry-&gt;flags)</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+#define DEFINE_NFS4_DELEGATION_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(nfs4_delegation_event, name, \</div><div class='add'>+			TP_PROTO( \</div><div class='add'>+				const struct nfs_delegation *delegation \</div><div class='add'>+			), \</div><div class='add'>+			TP_ARGS(delegation))</div><div class='add'>+DEFINE_NFS4_DELEGATION_EVENT(nfs_delegation_need_return);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(nfs4_delegreturn_exit,</div><div class='ctx'> 		TP_PROTO(</div><div class='hunk'>@@ -1042,7 +1147,7 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event,</div><div class='ctx'> 			__entry-&gt;dev = dir-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;error = -error;</div><div class='del'>-			__assign_str(name, name-&gt;name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -1126,8 +1231,8 @@ TRACE_EVENT(nfs4_rename,</div><div class='ctx'> 			__entry-&gt;olddir = NFS_FILEID(olddir);</div><div class='ctx'> 			__entry-&gt;newdir = NFS_FILEID(newdir);</div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='del'>-			__assign_str(oldname, oldname-&gt;name);</div><div class='del'>-			__assign_str(newname, newname-&gt;name);</div><div class='add'>+			__assign_str(oldname);</div><div class='add'>+			__assign_str(newname);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -1329,7 +1434,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event,</div><div class='ctx'> 				__entry-&gt;fileid = 0;</div><div class='ctx'> 				__entry-&gt;dev = 0;</div><div class='ctx'> 			}</div><div class='del'>-			__assign_str(dstaddr, clp ? clp-&gt;cl_hostname : "unknown");</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -1386,7 +1491,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event,</div><div class='ctx'> 				__entry-&gt;fileid = 0;</div><div class='ctx'> 				__entry-&gt;dev = 0;</div><div class='ctx'> 			}</div><div class='del'>-			__assign_str(dstaddr, clp ? clp-&gt;cl_hostname : "unknown");</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 			__entry-&gt;stateid_seq =</div><div class='ctx'> 				be32_to_cpu(stateid-&gt;seqid);</div><div class='ctx'> 			__entry-&gt;stateid_hash =</div><div class='hunk'>@@ -1419,6 +1524,63 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event,</div><div class='ctx'> DEFINE_NFS4_INODE_STATEID_CALLBACK_EVENT(nfs4_cb_recall);</div><div class='ctx'> DEFINE_NFS4_INODE_STATEID_CALLBACK_EVENT(nfs4_cb_layoutrecall_file);</div><div class='ctx'> </div><div class='add'>+#define show_stateid_type(type) \</div><div class='add'>+	__print_symbolic(type, \</div><div class='add'>+		{ NFS4_INVALID_STATEID_TYPE,	"INVALID" }, \</div><div class='add'>+		{ NFS4_SPECIAL_STATEID_TYPE,	"SPECIAL" }, \</div><div class='add'>+		{ NFS4_OPEN_STATEID_TYPE,	"OPEN" }, \</div><div class='add'>+		{ NFS4_LOCK_STATEID_TYPE,	"LOCK" }, \</div><div class='add'>+		{ NFS4_DELEGATION_STATEID_TYPE,	"DELEGATION" }, \</div><div class='add'>+		{ NFS4_LAYOUT_STATEID_TYPE,	"LAYOUT" },	\</div><div class='add'>+		{ NFS4_PNFS_DS_STATEID_TYPE,	"PNFS_DS" }, \</div><div class='add'>+		{ NFS4_REVOKED_STATEID_TYPE,	"REVOKED" }, \</div><div class='add'>+		{ NFS4_FREED_STATEID_TYPE,	"FREED" })</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfs4_match_stateid_event,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const nfs4_stateid *s1,</div><div class='add'>+			const nfs4_stateid *s2</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(s1, s2),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(int, s1_seq)</div><div class='add'>+			__field(int, s2_seq)</div><div class='add'>+			__field(u32, s1_hash)</div><div class='add'>+			__field(u32, s2_hash)</div><div class='add'>+			__field(int, s1_type)</div><div class='add'>+			__field(int, s2_type)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__entry-&gt;s1_seq = s1-&gt;seqid;</div><div class='add'>+			__entry-&gt;s1_hash = nfs_stateid_hash(s1);</div><div class='add'>+			__entry-&gt;s1_type = s1-&gt;type;</div><div class='add'>+			__entry-&gt;s2_seq = s2-&gt;seqid;</div><div class='add'>+			__entry-&gt;s2_hash = nfs_stateid_hash(s2);</div><div class='add'>+			__entry-&gt;s2_type = s2-&gt;type;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"s1=%s:%x:%u s2=%s:%x:%u",</div><div class='add'>+			show_stateid_type(__entry-&gt;s1_type),</div><div class='add'>+			__entry-&gt;s1_hash, __entry-&gt;s1_seq,</div><div class='add'>+			show_stateid_type(__entry-&gt;s2_type),</div><div class='add'>+			__entry-&gt;s2_hash, __entry-&gt;s2_seq</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS4_MATCH_STATEID_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(nfs4_match_stateid_event, name, \</div><div class='add'>+			TP_PROTO( \</div><div class='add'>+				const nfs4_stateid *s1, \</div><div class='add'>+				const nfs4_stateid *s2 \</div><div class='add'>+			), \</div><div class='add'>+			TP_ARGS(s1, s2))</div><div class='add'>+DEFINE_NFS4_MATCH_STATEID_EVENT(nfs41_match_stateid);</div><div class='add'>+DEFINE_NFS4_MATCH_STATEID_EVENT(nfs4_match_stateid);</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfs4_idmap_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const char *name,</div><div class='hunk'>@@ -1930,7 +2092,7 @@ DECLARE_EVENT_CLASS(nfs4_deviceid_event,</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_fast_assign(</div><div class='del'>-			__assign_str(dstaddr, clp-&gt;cl_hostname);</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 			memcpy(__entry-&gt;deviceid, deviceid-&gt;data,</div><div class='ctx'> 			       NFS4_DEVICEID4_SIZE);</div><div class='ctx'> 		),</div><div class='hunk'>@@ -1968,7 +2130,7 @@ DECLARE_EVENT_CLASS(nfs4_deviceid_status,</div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			__entry-&gt;dev = server-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;status = status;</div><div class='del'>-			__assign_str(dstaddr, server-&gt;nfs_client-&gt;cl_hostname);</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 			memcpy(__entry-&gt;deviceid, deviceid-&gt;data,</div><div class='ctx'> 			       NFS4_DEVICEID4_SIZE);</div><div class='ctx'> 		),</div><div class='hunk'>@@ -1991,15 +2153,45 @@ DECLARE_EVENT_CLASS(nfs4_deviceid_status,</div><div class='ctx'> DEFINE_PNFS_DEVICEID_STATUS(nfs4_getdeviceinfo);</div><div class='ctx'> DEFINE_PNFS_DEVICEID_STATUS(nfs4_find_deviceid);</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(fl_getdevinfo,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct nfs_server *server,</div><div class='add'>+			const struct nfs4_deviceid *deviceid,</div><div class='add'>+			char *ds_remotestr</div><div class='add'>+		),</div><div class='add'>+		TP_ARGS(server, deviceid, ds_remotestr),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__string(mds_addr, server-&gt;nfs_client-&gt;cl_hostname)</div><div class='add'>+			__array(unsigned char, deviceid, NFS4_DEVICEID4_SIZE)</div><div class='add'>+			__string(ds_ips, ds_remotestr)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__assign_str(mds_addr);</div><div class='add'>+			__assign_str(ds_ips);</div><div class='add'>+			memcpy(__entry-&gt;deviceid, deviceid-&gt;data,</div><div class='add'>+			       NFS4_DEVICEID4_SIZE);</div><div class='add'>+		),</div><div class='add'>+		TP_printk(</div><div class='add'>+			"deviceid=%s, mds_addr=%s, ds_ips=%s",</div><div class='add'>+			__print_hex(__entry-&gt;deviceid, NFS4_DEVICEID4_SIZE),</div><div class='add'>+			__get_str(mds_addr),</div><div class='add'>+			__get_str(ds_ips)</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='del'>-			const struct nfs_pgio_header *hdr</div><div class='add'>+			const struct nfs_pgio_header *hdr,</div><div class='add'>+			int error</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='del'>-		TP_ARGS(hdr),</div><div class='add'>+		TP_ARGS(hdr, error),</div><div class='ctx'> </div><div class='ctx'> 		TP_STRUCT__entry(</div><div class='ctx'> 			__field(unsigned long, error)</div><div class='add'>+			__field(unsigned long, nfs_error)</div><div class='ctx'> 			__field(dev_t, dev)</div><div class='ctx'> 			__field(u32, fhandle)</div><div class='ctx'> 			__field(u64, fileid)</div><div class='hunk'>@@ -2015,7 +2207,8 @@ DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,</div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			const struct inode *inode = hdr-&gt;inode;</div><div class='ctx'> </div><div class='del'>-			__entry-&gt;error = hdr-&gt;res.op_status;</div><div class='add'>+			__entry-&gt;error = -error;</div><div class='add'>+			__entry-&gt;nfs_error = hdr-&gt;res.op_status;</div><div class='ctx'> 			__entry-&gt;fhandle = nfs_fhandle_hash(hdr-&gt;args.fh);</div><div class='ctx'> 			__entry-&gt;fileid = NFS_FILEID(inode);</div><div class='ctx'> 			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='hunk'>@@ -2025,14 +2218,13 @@ DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,</div><div class='ctx'> 				be32_to_cpu(hdr-&gt;args.stateid.seqid);</div><div class='ctx'> 			__entry-&gt;stateid_hash =</div><div class='ctx'> 				nfs_stateid_hash(&amp;hdr-&gt;args.stateid);</div><div class='del'>-			__assign_str(dstaddr, hdr-&gt;ds_clp ?</div><div class='del'>-				rpc_peeraddr2str(hdr-&gt;ds_clp-&gt;cl_rpcclient,</div><div class='del'>-					RPC_DISPLAY_ADDR) : "unknown");</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='ctx'> 			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "</div><div class='del'>-			"offset=%llu count=%u stateid=%d:0x%08x dstaddr=%s",</div><div class='add'>+			"offset=%llu count=%u stateid=%d:0x%08x dstaddr=%s "</div><div class='add'>+			"nfs_error=%lu (%s)",</div><div class='ctx'> 			-__entry-&gt;error,</div><div class='ctx'> 			show_nfs4_status(__entry-&gt;error),</div><div class='ctx'> 			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='hunk'>@@ -2040,28 +2232,32 @@ DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,</div><div class='ctx'> 			__entry-&gt;fhandle,</div><div class='ctx'> 			__entry-&gt;offset, __entry-&gt;count,</div><div class='ctx'> 			__entry-&gt;stateid_seq, __entry-&gt;stateid_hash,</div><div class='del'>-			__get_str(dstaddr)</div><div class='add'>+			__get_str(dstaddr), __entry-&gt;nfs_error,</div><div class='add'>+			show_nfs4_status(__entry-&gt;nfs_error)</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_NFS4_FLEXFILES_IO_EVENT(name) \</div><div class='ctx'> 	DEFINE_EVENT(nfs4_flexfiles_io_event, name, \</div><div class='ctx'> 			TP_PROTO( \</div><div class='del'>-				const struct nfs_pgio_header *hdr \</div><div class='add'>+				const struct nfs_pgio_header *hdr, \</div><div class='add'>+				int error \</div><div class='ctx'> 			), \</div><div class='del'>-			TP_ARGS(hdr))</div><div class='add'>+			TP_ARGS(hdr, error))</div><div class='ctx'> DEFINE_NFS4_FLEXFILES_IO_EVENT(ff_layout_read_error);</div><div class='ctx'> DEFINE_NFS4_FLEXFILES_IO_EVENT(ff_layout_write_error);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(ff_layout_commit_error,</div><div class='ctx'> 		TP_PROTO(</div><div class='del'>-			const struct nfs_commit_data *data</div><div class='add'>+			const struct nfs_commit_data *data,</div><div class='add'>+			int error</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='del'>-		TP_ARGS(data),</div><div class='add'>+		TP_ARGS(data, error),</div><div class='ctx'> </div><div class='ctx'> 		TP_STRUCT__entry(</div><div class='ctx'> 			__field(unsigned long, error)</div><div class='add'>+			__field(unsigned long, nfs_error)</div><div class='ctx'> 			__field(dev_t, dev)</div><div class='ctx'> 			__field(u32, fhandle)</div><div class='ctx'> 			__field(u64, fileid)</div><div class='hunk'>@@ -2075,30 +2271,152 @@ TRACE_EVENT(ff_layout_commit_error,</div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			const struct inode *inode = data-&gt;inode;</div><div class='ctx'> </div><div class='del'>-			__entry-&gt;error = data-&gt;res.op_status;</div><div class='add'>+			__entry-&gt;error = -error;</div><div class='add'>+			__entry-&gt;nfs_error = data-&gt;res.op_status;</div><div class='ctx'> 			__entry-&gt;fhandle = nfs_fhandle_hash(data-&gt;args.fh);</div><div class='ctx'> 			__entry-&gt;fileid = NFS_FILEID(inode);</div><div class='ctx'> 			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;offset = data-&gt;args.offset;</div><div class='ctx'> 			__entry-&gt;count = data-&gt;args.count;</div><div class='del'>-			__assign_str(dstaddr, data-&gt;ds_clp ?</div><div class='del'>-				rpc_peeraddr2str(data-&gt;ds_clp-&gt;cl_rpcclient,</div><div class='del'>-					RPC_DISPLAY_ADDR) : "unknown");</div><div class='add'>+			__assign_str(dstaddr);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='ctx'> 			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "</div><div class='del'>-			"offset=%llu count=%u dstaddr=%s",</div><div class='add'>+			"offset=%llu count=%u dstaddr=%s nfs_error=%lu (%s)",</div><div class='ctx'> 			-__entry-&gt;error,</div><div class='ctx'> 			show_nfs4_status(__entry-&gt;error),</div><div class='ctx'> 			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='ctx'> 			(unsigned long long)__entry-&gt;fileid,</div><div class='ctx'> 			__entry-&gt;fhandle,</div><div class='ctx'> 			__entry-&gt;offset, __entry-&gt;count,</div><div class='del'>-			__get_str(dstaddr)</div><div class='add'>+			__get_str(dstaddr), __entry-&gt;nfs_error,</div><div class='add'>+			show_nfs4_status(__entry-&gt;nfs_error)</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(bl_ext_tree_prepare_commit,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			int ret,</div><div class='add'>+			size_t count,</div><div class='add'>+			u64 lwb,</div><div class='add'>+			bool not_all_ranges</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(ret, count, lwb, not_all_ranges),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(int, ret)</div><div class='add'>+			__field(size_t, count)</div><div class='add'>+			__field(u64, lwb)</div><div class='add'>+			__field(bool, not_all_ranges)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__entry-&gt;ret = ret;</div><div class='add'>+			__entry-&gt;count = count;</div><div class='add'>+			__entry-&gt;lwb = lwb;</div><div class='add'>+			__entry-&gt;not_all_ranges = not_all_ranges;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"ret=%d, found %zu ranges, lwb=%llu%s",</div><div class='add'>+			__entry-&gt;ret,</div><div class='add'>+			__entry-&gt;count,</div><div class='add'>+			__entry-&gt;lwb,</div><div class='add'>+			__entry-&gt;not_all_ranges ? ", not all ranges encoded" :</div><div class='add'>+						  ""</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+DECLARE_EVENT_CLASS(pnfs_bl_pr_key_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct block_device *bdev,</div><div class='add'>+		u64 key</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(bdev, key),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(u64, key)</div><div class='add'>+		__field(dev_t, dev)</div><div class='add'>+		__string(device, bdev-&gt;bd_disk-&gt;disk_name)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;key = key;</div><div class='add'>+		__entry-&gt;dev = bdev-&gt;bd_dev;</div><div class='add'>+		__assign_str(device);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("dev=%d,%d (%s) key=0x%016llx",</div><div class='add'>+		MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='add'>+		__get_str(device), __entry-&gt;key</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS4_BLOCK_PRKEY_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(pnfs_bl_pr_key_class, name, \</div><div class='add'>+		TP_PROTO( \</div><div class='add'>+			const struct block_device *bdev, \</div><div class='add'>+			u64 key \</div><div class='add'>+		), \</div><div class='add'>+		TP_ARGS(bdev, key))</div><div class='add'>+DEFINE_NFS4_BLOCK_PRKEY_EVENT(bl_pr_key_reg);</div><div class='add'>+DEFINE_NFS4_BLOCK_PRKEY_EVENT(bl_pr_key_unreg);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * From uapi/linux/pr.h</div><div class='add'>+ */</div><div class='add'>+TRACE_DEFINE_ENUM(PR_STS_SUCCESS);</div><div class='add'>+TRACE_DEFINE_ENUM(PR_STS_IOERR);</div><div class='add'>+TRACE_DEFINE_ENUM(PR_STS_RESERVATION_CONFLICT);</div><div class='add'>+TRACE_DEFINE_ENUM(PR_STS_RETRY_PATH_FAILURE);</div><div class='add'>+TRACE_DEFINE_ENUM(PR_STS_PATH_FAST_FAILED);</div><div class='add'>+TRACE_DEFINE_ENUM(PR_STS_PATH_FAILED);</div><div class='add'>+</div><div class='add'>+#define show_pr_status(x) \</div><div class='add'>+	__print_symbolic(x, \</div><div class='add'>+		{ PR_STS_SUCCESS,		"SUCCESS" }, \</div><div class='add'>+		{ PR_STS_IOERR,			"IOERR" }, \</div><div class='add'>+		{ PR_STS_RESERVATION_CONFLICT,	"RESERVATION_CONFLICT" }, \</div><div class='add'>+		{ PR_STS_RETRY_PATH_FAILURE,	"RETRY_PATH_FAILURE" }, \</div><div class='add'>+		{ PR_STS_PATH_FAST_FAILED,	"PATH_FAST_FAILED" }, \</div><div class='add'>+		{ PR_STS_PATH_FAILED,		"PATH_FAILED" })</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(pnfs_bl_pr_key_err_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct block_device *bdev,</div><div class='add'>+		u64 key,</div><div class='add'>+		int status</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(bdev, key, status),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(u64, key)</div><div class='add'>+		__field(dev_t, dev)</div><div class='add'>+		__field(unsigned long, status)</div><div class='add'>+		__string(device, bdev-&gt;bd_disk-&gt;disk_name)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;key = key;</div><div class='add'>+		__entry-&gt;dev = bdev-&gt;bd_dev;</div><div class='add'>+		__entry-&gt;status = status;</div><div class='add'>+		__assign_str(device);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("dev=%d,%d (%s) key=0x%016llx status=%s",</div><div class='add'>+		MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='add'>+		__get_str(device), __entry-&gt;key,</div><div class='add'>+		show_pr_status(__entry-&gt;status)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS4_BLOCK_PRKEY_ERR_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(pnfs_bl_pr_key_err_class, name, \</div><div class='add'>+		TP_PROTO( \</div><div class='add'>+			const struct block_device *bdev, \</div><div class='add'>+			u64 key, \</div><div class='add'>+			int status \</div><div class='add'>+		), \</div><div class='add'>+		TP_ARGS(bdev, key, status))</div><div class='add'>+DEFINE_NFS4_BLOCK_PRKEY_ERR_EVENT(bl_pr_key_reg_err);</div><div class='add'>+DEFINE_NFS4_BLOCK_PRKEY_ERR_EVENT(bl_pr_key_unreg_err);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFS_V4_2</div><div class='ctx'> TRACE_DEFINE_ENUM(NFS4_CONTENT_DATA);</div><div class='ctx'> TRACE_DEFINE_ENUM(NFS4_CONTENT_HOLE);</div><div class='hunk'>@@ -2466,7 +2784,7 @@ TRACE_EVENT(nfs4_copy_notify,</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='del'>-TRACE_EVENT(nfs4_offload_cancel,</div><div class='add'>+DECLARE_EVENT_CLASS(nfs4_offload_class,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct nfs42_offload_status_args *args,</div><div class='ctx'> 			int error</div><div class='hunk'>@@ -2498,6 +2816,15 @@ TRACE_EVENT(nfs4_offload_cancel,</div><div class='ctx'> 			__entry-&gt;stateid_seq, __entry-&gt;stateid_hash</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='add'>+#define DEFINE_NFS4_OFFLOAD_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(nfs4_offload_class, name,  \</div><div class='add'>+			TP_PROTO( \</div><div class='add'>+				const struct nfs42_offload_status_args *args, \</div><div class='add'>+				int error \</div><div class='add'>+			), \</div><div class='add'>+			TP_ARGS(args, error))</div><div class='add'>+DEFINE_NFS4_OFFLOAD_EVENT(nfs4_offload_cancel);</div><div class='add'>+DEFINE_NFS4_OFFLOAD_EVENT(nfs4_offload_status);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfs4_xattr_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='hunk'>@@ -2521,7 +2848,7 @@ DECLARE_EVENT_CLASS(nfs4_xattr_event,</div><div class='ctx'> 			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;fileid = NFS_FILEID(inode);</div><div class='ctx'> 			__entry-&gt;fhandle = nfs_fhandle_hash(NFS_FH(inode));</div><div class='del'>-			__assign_str(name, name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='head'>diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c<br/>index 69406e60f391..1d0e6c10f921 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfs4xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfs4xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfs4xdr.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;linux/nfs.h&gt;</div><div class='ctx'> #include &lt;linux/nfs4.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/nfs_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "nfs4_fs.h"</div><div class='ctx'> #include "nfs4trace.h"</div><div class='hunk'>@@ -63,11 +64,7 @@</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_XDR</div><div class='ctx'> </div><div class='del'>-/* Mapping from NFS error code to "errno" error code. */</div><div class='del'>-#define errno_NFSERR_IO		EIO</div><div class='del'>-</div><div class='ctx'> struct compound_hdr;</div><div class='del'>-static int nfs4_stat_to_errno(int);</div><div class='ctx'> static void encode_layoutget(struct xdr_stream *xdr,</div><div class='ctx'> 			     const struct nfs4_layoutget_args *args,</div><div class='ctx'> 			     struct compound_hdr *hdr);</div><div class='hunk'>@@ -85,9 +82,8 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'>  * we currently use size 2 (u64) out of (NFS4_OPAQUE_LIMIT  &gt;&gt; 2)</div><div class='ctx'>  */</div><div class='ctx'> #define pagepad_maxsz		(1)</div><div class='del'>-#define open_owner_id_maxsz	(1 + 2 + 1 + 1 + 2)</div><div class='del'>-#define lock_owner_id_maxsz	(1 + 1 + 4)</div><div class='del'>-#define decode_lockowner_maxsz	(1 + XDR_QUADLEN(IDMAP_NAMESZ))</div><div class='add'>+#define open_owner_id_maxsz	(2 + 1 + 2 + 2)</div><div class='add'>+#define lock_owner_id_maxsz	(2 + 1 + 2)</div><div class='ctx'> #define compound_encode_hdr_maxsz	(3 + (NFS4_MAXTAGLEN &gt;&gt; 2))</div><div class='ctx'> #define compound_decode_hdr_maxsz	(3 + (NFS4_MAXTAGLEN &gt;&gt; 2))</div><div class='ctx'> #define op_encode_hdr_maxsz	(1)</div><div class='hunk'>@@ -188,7 +184,7 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'> #define encode_claim_null_maxsz	(1 + nfs4_name_maxsz)</div><div class='ctx'> #define encode_open_maxsz	(op_encode_hdr_maxsz + \</div><div class='ctx'> 				2 + encode_share_access_maxsz + 2 + \</div><div class='del'>-				open_owner_id_maxsz + \</div><div class='add'>+				1 + open_owner_id_maxsz + \</div><div class='ctx'> 				encode_opentype_maxsz + \</div><div class='ctx'> 				encode_claim_null_maxsz)</div><div class='ctx'> #define decode_space_limit_maxsz	(3)</div><div class='hunk'>@@ -224,6 +220,11 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'> 				 encode_attrs_maxsz)</div><div class='ctx'> #define decode_setattr_maxsz	(op_decode_hdr_maxsz + \</div><div class='ctx'> 				 nfs4_fattr_bitmap_maxsz)</div><div class='add'>+#define encode_delegattr_maxsz	(op_encode_hdr_maxsz + \</div><div class='add'>+				 encode_stateid_maxsz + \</div><div class='add'>+				nfs4_fattr_bitmap_maxsz + \</div><div class='add'>+				2*nfstime4_maxsz)</div><div class='add'>+#define decode_delegattr_maxsz	(decode_setattr_maxsz)</div><div class='ctx'> #define encode_read_maxsz	(op_encode_hdr_maxsz + \</div><div class='ctx'> 				 encode_stateid_maxsz + 3)</div><div class='ctx'> #define decode_read_maxsz	(op_decode_hdr_maxsz + 2 + pagepad_maxsz)</div><div class='hunk'>@@ -253,13 +254,14 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'> #define encode_link_maxsz	(op_encode_hdr_maxsz + \</div><div class='ctx'> 				nfs4_name_maxsz)</div><div class='ctx'> #define decode_link_maxsz	(op_decode_hdr_maxsz + decode_change_info_maxsz)</div><div class='del'>-#define encode_lockowner_maxsz	(7)</div><div class='add'>+#define encode_lockowner_maxsz	(2 + 1 + lock_owner_id_maxsz)</div><div class='add'>+</div><div class='ctx'> #define encode_lock_maxsz	(op_encode_hdr_maxsz + \</div><div class='ctx'> 				 7 + \</div><div class='ctx'> 				 1 + encode_stateid_maxsz + 1 + \</div><div class='ctx'> 				 encode_lockowner_maxsz)</div><div class='ctx'> #define decode_lock_denied_maxsz \</div><div class='del'>-				(8 + decode_lockowner_maxsz)</div><div class='add'>+				(2 + 2 + 1 + 2 + 1 + lock_owner_id_maxsz)</div><div class='ctx'> #define decode_lock_maxsz	(op_decode_hdr_maxsz + \</div><div class='ctx'> 				 decode_lock_denied_maxsz)</div><div class='ctx'> #define encode_lockt_maxsz	(op_encode_hdr_maxsz + 5 + \</div><div class='hunk'>@@ -615,7 +617,7 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'> 				 encode_lockowner_maxsz)</div><div class='ctx'> #define NFS4_dec_release_lockowner_sz \</div><div class='ctx'> 				(compound_decode_hdr_maxsz + \</div><div class='del'>-				 decode_lockowner_maxsz)</div><div class='add'>+				 decode_release_lockowner_maxsz)</div><div class='ctx'> #define NFS4_enc_access_sz	(compound_encode_hdr_maxsz + \</div><div class='ctx'> 				encode_sequence_maxsz + \</div><div class='ctx'> 				encode_putfh_maxsz + \</div><div class='hunk'>@@ -758,12 +760,14 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'> 				encode_sequence_maxsz + \</div><div class='ctx'> 				encode_putfh_maxsz + \</div><div class='ctx'> 				encode_layoutreturn_maxsz + \</div><div class='add'>+				encode_delegattr_maxsz + \</div><div class='ctx'> 				encode_delegreturn_maxsz + \</div><div class='ctx'> 				encode_getattr_maxsz)</div><div class='ctx'> #define NFS4_dec_delegreturn_sz (compound_decode_hdr_maxsz + \</div><div class='ctx'> 				decode_sequence_maxsz + \</div><div class='ctx'> 				decode_putfh_maxsz + \</div><div class='ctx'> 				decode_layoutreturn_maxsz + \</div><div class='add'>+				decode_delegattr_maxsz + \</div><div class='ctx'> 				decode_delegreturn_maxsz + \</div><div class='ctx'> 				decode_getattr_maxsz)</div><div class='ctx'> #define NFS4_enc_getacl_sz	(compound_encode_hdr_maxsz + \</div><div class='hunk'>@@ -968,11 +972,6 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes)</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(xdr_stream_encode_opaque(xdr, str, len) &lt; 0);</div><div class='hunk'>@@ -1060,9 +1059,10 @@ static void encode_nops(struct compound_hdr *hdr)</div><div class='ctx'> 	*hdr-&gt;nops_p = htonl(hdr-&gt;nops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void encode_nfs4_stateid(struct xdr_stream *xdr, const nfs4_stateid *stateid)</div><div class='add'>+static void encode_nfs4_stateid(struct xdr_stream *xdr,</div><div class='add'>+				const nfs4_stateid *stateid)</div><div class='ctx'> {</div><div class='del'>-	encode_opaque_fixed(xdr, stateid, NFS4_STATEID_SIZE);</div><div class='add'>+	encode_opaque_fixed(xdr, stateid-&gt;data, NFS4_STATEID_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf)</div><div class='hunk'>@@ -1305,7 +1305,7 @@ static void encode_link(struct xdr_stream *xdr, const struct qstr *name, struct</div><div class='ctx'> </div><div class='ctx'> static inline int nfs4_lock_type(struct file_lock *fl, int block)</div><div class='ctx'> {</div><div class='del'>-	if (fl-&gt;fl_type == F_RDLCK)</div><div class='add'>+	if (lock_is_read(fl))</div><div class='ctx'> 		return block ? NFS4_READW_LT : NFS4_READ_LT;</div><div class='ctx'> 	return block ? NFS4_WRITEW_LT : NFS4_WRITE_LT;</div><div class='ctx'> }</div><div class='hunk'>@@ -1412,16 +1412,16 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'>  /*</div><div class='ctx'>  * opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4,</div><div class='del'>- * owner 4 = 32</div><div class='add'>+ * owner 28</div><div class='ctx'>  */</div><div class='ctx'> 	encode_nfs4_seqid(xdr, arg-&gt;seqid);</div><div class='ctx'> 	encode_share_access(xdr, arg-&gt;share_access);</div><div class='del'>-	p = reserve_space(xdr, 36);</div><div class='add'>+	p = reserve_space(xdr, 40);</div><div class='ctx'> 	p = xdr_encode_hyper(p, arg-&gt;clientid);</div><div class='del'>-	*p++ = cpu_to_be32(24);</div><div class='add'>+	*p++ = cpu_to_be32(28);</div><div class='ctx'> 	p = xdr_encode_opaque_fixed(p, "open id:", 8);</div><div class='ctx'> 	*p++ = cpu_to_be32(arg-&gt;server-&gt;s_dev);</div><div class='del'>-	*p++ = cpu_to_be32(arg-&gt;id.uniquifier);</div><div class='add'>+	p = xdr_encode_hyper(p, arg-&gt;id.uniquifier);</div><div class='ctx'> 	xdr_encode_hyper(p, arg-&gt;id.create_time);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1468,20 +1468,18 @@ static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *a</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void encode_delegation_type(struct xdr_stream *xdr, fmode_t delegation_type)</div><div class='add'>+static inline void encode_delegation_type(struct xdr_stream *xdr, u32 delegation_type)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='ctx'> 	p = reserve_space(xdr, 4);</div><div class='ctx'> 	switch (delegation_type) {</div><div class='del'>-	case 0:</div><div class='del'>-		*p = cpu_to_be32(NFS4_OPEN_DELEGATE_NONE);</div><div class='del'>-		break;</div><div class='del'>-	case FMODE_READ:</div><div class='del'>-		*p = cpu_to_be32(NFS4_OPEN_DELEGATE_READ);</div><div class='del'>-		break;</div><div class='del'>-	case FMODE_WRITE|FMODE_READ:</div><div class='del'>-		*p = cpu_to_be32(NFS4_OPEN_DELEGATE_WRITE);</div><div class='add'>+	case NFS4_OPEN_DELEGATE_NONE:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='add'>+		*p = cpu_to_be32(delegation_type);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='hunk'>@@ -1497,7 +1495,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *</div><div class='ctx'> 	encode_string(xdr, name-&gt;len, name-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void encode_claim_previous(struct xdr_stream *xdr, fmode_t type)</div><div class='add'>+static inline void encode_claim_previous(struct xdr_stream *xdr, u32 type)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='hunk'>@@ -1625,6 +1623,7 @@ static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg</div><div class='ctx'> 			| FATTR4_WORD1_RAWDEV</div><div class='ctx'> 			| FATTR4_WORD1_SPACE_USED</div><div class='ctx'> 			| FATTR4_WORD1_TIME_ACCESS</div><div class='add'>+			| FATTR4_WORD1_TIME_CREATE</div><div class='ctx'> 			| FATTR4_WORD1_TIME_METADATA</div><div class='ctx'> 			| FATTR4_WORD1_TIME_MODIFY;</div><div class='ctx'> 		attrs[2] |= FATTR4_WORD2_SECURITY_LABEL;</div><div class='hunk'>@@ -1735,6 +1734,33 @@ static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs</div><div class='ctx'> 			server-&gt;attr_bitmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void encode_delegattr(struct xdr_stream *xdr,</div><div class='add'>+		const nfs4_stateid *stateid,</div><div class='add'>+		const struct nfs4_delegattr *attr,</div><div class='add'>+		struct compound_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	uint32_t bitmap[3] = { 0 };</div><div class='add'>+	uint32_t len = 0;</div><div class='add'>+	__be32 *p;</div><div class='add'>+</div><div class='add'>+	encode_op_hdr(xdr, OP_SETATTR, encode_delegattr_maxsz, hdr);</div><div class='add'>+	encode_nfs4_stateid(xdr, stateid);</div><div class='add'>+	if (attr-&gt;atime_set) {</div><div class='add'>+		bitmap[2] |= FATTR4_WORD2_TIME_DELEG_ACCESS;</div><div class='add'>+		len += (nfstime4_maxsz &lt;&lt; 2);</div><div class='add'>+	}</div><div class='add'>+	if (attr-&gt;mtime_set) {</div><div class='add'>+		bitmap[2] |= FATTR4_WORD2_TIME_DELEG_MODIFY;</div><div class='add'>+		len += (nfstime4_maxsz &lt;&lt; 2);</div><div class='add'>+	}</div><div class='add'>+	xdr_encode_bitmap4(xdr, bitmap, ARRAY_SIZE(bitmap));</div><div class='add'>+	xdr_stream_encode_opaque_inline(xdr, (void **)&amp;p, len);</div><div class='add'>+	if (bitmap[2] &amp; FATTR4_WORD2_TIME_DELEG_ACCESS)</div><div class='add'>+		p = xdr_encode_nfstime4(p, &amp;attr-&gt;atime);</div><div class='add'>+	if (bitmap[2] &amp; FATTR4_WORD2_TIME_DELEG_MODIFY)</div><div class='add'>+		p = xdr_encode_nfstime4(p, &amp;attr-&gt;mtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclientid *setclientid, struct compound_hdr *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='hunk'>@@ -2105,7 +2131,7 @@ static void encode_test_stateid(struct xdr_stream *xdr,</div><div class='ctx'> {</div><div class='ctx'> 	encode_op_hdr(xdr, OP_TEST_STATEID, decode_test_stateid_maxsz, hdr);</div><div class='ctx'> 	encode_uint32(xdr, 1);</div><div class='del'>-	encode_nfs4_stateid(xdr, args-&gt;stateid);</div><div class='add'>+	encode_nfs4_stateid(xdr, &amp;args-&gt;stateid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void encode_free_stateid(struct xdr_stream *xdr,</div><div class='hunk'>@@ -2812,6 +2838,8 @@ static void nfs4_xdr_enc_delegreturn(struct rpc_rqst *req,</div><div class='ctx'> 	encode_putfh(xdr, args-&gt;fhandle, &amp;hdr);</div><div class='ctx'> 	if (args-&gt;lr_args)</div><div class='ctx'> 		encode_layoutreturn(xdr, args-&gt;lr_args, &amp;hdr);</div><div class='add'>+	if (args-&gt;sattr_args)</div><div class='add'>+		encode_delegattr(xdr, args-&gt;stateid, args-&gt;sattr_args, &amp;hdr);</div><div class='ctx'> 	if (args-&gt;bitmask)</div><div class='ctx'> 		encode_getfattr(xdr, args-&gt;bitmask, &amp;hdr);</div><div class='ctx'> 	encode_delegreturn(xdr, args-&gt;stateid, &amp;hdr);</div><div class='hunk'>@@ -3412,7 +3440,7 @@ static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, ui</div><div class='ctx'> 		*res = be32_to_cpup(p);</div><div class='ctx'> 		bitmap[0] &amp;= ~FATTR4_WORD0_LINK_SUPPORT;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk("%s: link support=%s\n", __func__, *res == 0 ? "false" : "true");</div><div class='add'>+	dprintk("%s: link support=%s\n", __func__, str_false_true(*res == 0));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3430,7 +3458,7 @@ static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> 		*res = be32_to_cpup(p);</div><div class='ctx'> 		bitmap[0] &amp;= ~FATTR4_WORD0_SYMLINK_SUPPORT;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk("%s: symlink support=%s\n", __func__, *res == 0 ? "false" : "true");</div><div class='add'>+	dprintk("%s: symlink support=%s\n", __func__, str_false_true(*res == 0));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3572,7 +3600,7 @@ static int decode_attr_case_insensitive(struct xdr_stream *xdr, uint32_t *bitmap</div><div class='ctx'> 		*res = be32_to_cpup(p);</div><div class='ctx'> 		bitmap[0] &amp;= ~FATTR4_WORD0_CASE_INSENSITIVE;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk("%s: case_insensitive=%s\n", __func__, *res == 0 ? "false" : "true");</div><div class='add'>+	dprintk("%s: case_insensitive=%s\n", __func__, str_false_true(*res == 0));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3590,7 +3618,7 @@ static int decode_attr_case_preserving(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> 		*res = be32_to_cpup(p);</div><div class='ctx'> 		bitmap[0] &amp;= ~FATTR4_WORD0_CASE_PRESERVING;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk("%s: case_preserving=%s\n", __func__, *res == 0 ? "false" : "true");</div><div class='add'>+	dprintk("%s: case_preserving=%s\n", __func__, str_false_true(*res == 0));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4180,6 +4208,24 @@ static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, str</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int decode_attr_time_create(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	time-&gt;tv_sec = 0;</div><div class='add'>+	time-&gt;tv_nsec = 0;</div><div class='add'>+	if (unlikely(bitmap[1] &amp; (FATTR4_WORD1_TIME_CREATE - 1U)))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (likely(bitmap[1] &amp; FATTR4_WORD1_TIME_CREATE)) {</div><div class='add'>+		status = decode_attr_time(xdr, time);</div><div class='add'>+		if (status == 0)</div><div class='add'>+			status = NFS_ATTR_FATTR_BTIME;</div><div class='add'>+		bitmap[1] &amp;= ~FATTR4_WORD1_TIME_CREATE;</div><div class='add'>+	}</div><div class='add'>+	dprintk("%s: btime=%lld\n", __func__, time-&gt;tv_sec);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='hunk'>@@ -4298,8 +4344,29 @@ static int decode_attr_xattrsupport(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> 		*res = be32_to_cpup(p);</div><div class='ctx'> 		bitmap[2] &amp;= ~FATTR4_WORD2_XATTR_SUPPORT;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk("%s: XATTR support=%s\n", __func__,</div><div class='del'>-		*res == 0 ? "false" : "true");</div><div class='add'>+	dprintk("%s: XATTR support=%s\n", __func__, str_false_true(*res == 0));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_attr_open_arguments(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='add'>+		struct nfs4_open_caps *res)</div><div class='add'>+{</div><div class='add'>+	memset(res, 0, sizeof(*res));</div><div class='add'>+	if (unlikely(bitmap[2] &amp; (FATTR4_WORD2_OPEN_ARGUMENTS - 1U)))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (likely(bitmap[2] &amp; FATTR4_WORD2_OPEN_ARGUMENTS)) {</div><div class='add'>+		if (decode_bitmap4(xdr, res-&gt;oa_share_access, ARRAY_SIZE(res-&gt;oa_share_access)) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (decode_bitmap4(xdr, res-&gt;oa_share_deny, ARRAY_SIZE(res-&gt;oa_share_deny)) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (decode_bitmap4(xdr, res-&gt;oa_share_access_want, ARRAY_SIZE(res-&gt;oa_share_access_want)) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (decode_bitmap4(xdr, res-&gt;oa_open_claim, ARRAY_SIZE(res-&gt;oa_open_claim)) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		if (decode_bitmap4(xdr, res-&gt;oa_createmode, ARRAY_SIZE(res-&gt;oa_createmode)) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		bitmap[2] &amp;= ~FATTR4_WORD2_OPEN_ARGUMENTS;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4352,14 +4419,6 @@ static int decode_access(struct xdr_stream *xdr, u32 *supported, u32 *access)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decode_opaque_fixed(struct xdr_stream *xdr, void *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret = xdr_stream_decode_opaque_fixed(xdr, buf, len);</div><div class='del'>-	if (unlikely(ret &lt; 0))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)</div><div class='ctx'> {</div><div class='ctx'> 	return decode_opaque_fixed(xdr, stateid, NFS4_STATEID_SIZE);</div><div class='hunk'>@@ -4477,6 +4536,8 @@ static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_re</div><div class='ctx'> 	if ((status = decode_attr_exclcreat_supported(xdr, bitmap,</div><div class='ctx'> 				res-&gt;exclcreat_bitmask)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='add'>+	if ((status = decode_attr_open_arguments(xdr, bitmap, &amp;res-&gt;open_caps)) != 0)</div><div class='add'>+		goto xdr_error;</div><div class='ctx'> 	status = verify_attr_len(xdr, savep, attrlen);</div><div class='ctx'> xdr_error:</div><div class='ctx'> 	dprintk("%s: xdr returned %d!\n", __func__, -status);</div><div class='hunk'>@@ -4739,6 +4800,11 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> 		goto xdr_error;</div><div class='ctx'> 	fattr-&gt;valid |= status;</div><div class='ctx'> </div><div class='add'>+	status = decode_attr_time_create(xdr, bitmap, &amp;fattr-&gt;btime);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto xdr_error;</div><div class='add'>+	fattr-&gt;valid |= status;</div><div class='add'>+</div><div class='ctx'> 	status = decode_attr_time_metadata(xdr, bitmap, &amp;fattr-&gt;ctime);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='hunk'>@@ -4864,7 +4930,7 @@ static int decode_attr_pnfstype(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The prefered block size for layout directed io</div><div class='add'>+ * The preferred block size for layout directed io</div><div class='ctx'>  */</div><div class='ctx'> static int decode_attr_layout_blksize(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> 				      uint32_t *res)</div><div class='hunk'>@@ -5035,7 +5101,7 @@ static int decode_link(struct xdr_stream *xdr, struct nfs4_change_info *cinfo)</div><div class='ctx'> /*</div><div class='ctx'>  * We create the owner, so we know a proper owner.id length is 4.</div><div class='ctx'>  */</div><div class='del'>-static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl)</div><div class='add'>+static int decode_lock_denied(struct xdr_stream *xdr, struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t offset, length, clientid;</div><div class='ctx'> 	__be32 *p;</div><div class='hunk'>@@ -5052,10 +5118,10 @@ static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl)</div><div class='ctx'> 		fl-&gt;fl_end = fl-&gt;fl_start + (loff_t)length - 1;</div><div class='ctx'> 		if (length == ~(uint64_t)0)</div><div class='ctx'> 			fl-&gt;fl_end = OFFSET_MAX;</div><div class='del'>-		fl-&gt;fl_type = F_WRLCK;</div><div class='add'>+		fl-&gt;c.flc_type = F_WRLCK;</div><div class='ctx'> 		if (type &amp; 1)</div><div class='del'>-			fl-&gt;fl_type = F_RDLCK;</div><div class='del'>-		fl-&gt;fl_pid = 0;</div><div class='add'>+			fl-&gt;c.flc_type = F_RDLCK;</div><div class='add'>+		fl-&gt;c.flc_pid = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	p = xdr_decode_hyper(p, &amp;clientid); /* read 8 bytes */</div><div class='ctx'> 	namelen = be32_to_cpup(p); /* read 4 bytes */  /* have read all 32 bytes now */</div><div class='hunk'>@@ -5148,13 +5214,12 @@ static int decode_space_limit(struct xdr_stream *xdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int decode_rw_delegation(struct xdr_stream *xdr,</div><div class='del'>-		uint32_t delegation_type,</div><div class='del'>-		struct nfs_openres *res)</div><div class='add'>+		struct nfs4_open_delegation *res)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	status = decode_delegation_stateid(xdr, &amp;res-&gt;delegation);</div><div class='add'>+	status = decode_delegation_stateid(xdr, &amp;res-&gt;stateid);</div><div class='ctx'> 	if (unlikely(status))</div><div class='ctx'> 		return status;</div><div class='ctx'> 	p = xdr_inline_decode(xdr, 4);</div><div class='hunk'>@@ -5162,52 +5227,57 @@ static int decode_rw_delegation(struct xdr_stream *xdr,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	res-&gt;do_recall = be32_to_cpup(p);</div><div class='ctx'> </div><div class='del'>-	switch (delegation_type) {</div><div class='add'>+	switch (res-&gt;open_delegation_type) {</div><div class='ctx'> 	case NFS4_OPEN_DELEGATE_READ:</div><div class='del'>-		res-&gt;delegation_type = FMODE_READ;</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+		res-&gt;type = FMODE_READ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFS4_OPEN_DELEGATE_WRITE:</div><div class='del'>-		res-&gt;delegation_type = FMODE_WRITE|FMODE_READ;</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='add'>+		res-&gt;type = FMODE_WRITE|FMODE_READ;</div><div class='ctx'> 		if (decode_space_limit(xdr, &amp;res-&gt;pagemod_limit) &lt; 0)</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return decode_ace(xdr, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decode_no_delegation(struct xdr_stream *xdr, struct nfs_openres *res)</div><div class='add'>+static int decode_no_delegation(struct xdr_stream *xdr,</div><div class='add'>+		struct nfs4_open_delegation *res)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='del'>-	uint32_t why_no_delegation;</div><div class='ctx'> </div><div class='ctx'> 	p = xdr_inline_decode(xdr, 4);</div><div class='ctx'> 	if (unlikely(!p))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	why_no_delegation = be32_to_cpup(p);</div><div class='del'>-	switch (why_no_delegation) {</div><div class='add'>+	res-&gt;why_no_delegation = be32_to_cpup(p);</div><div class='add'>+	switch (res-&gt;why_no_delegation) {</div><div class='ctx'> 		case WND4_CONTENTION:</div><div class='ctx'> 		case WND4_RESOURCE:</div><div class='del'>-			xdr_inline_decode(xdr, 4);</div><div class='del'>-			/* Ignore for now */</div><div class='add'>+			p = xdr_inline_decode(xdr, 4);</div><div class='add'>+			if (unlikely(!p))</div><div class='add'>+				return -EIO;</div><div class='add'>+			res-&gt;will_notify = be32_to_cpup(p);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res)</div><div class='add'>+static int decode_delegation(struct xdr_stream *xdr,</div><div class='add'>+		struct nfs4_open_delegation *res)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='del'>-	uint32_t delegation_type;</div><div class='ctx'> </div><div class='ctx'> 	p = xdr_inline_decode(xdr, 4);</div><div class='ctx'> 	if (unlikely(!p))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	delegation_type = be32_to_cpup(p);</div><div class='del'>-	res-&gt;delegation_type = 0;</div><div class='del'>-	switch (delegation_type) {</div><div class='add'>+	res-&gt;open_delegation_type = be32_to_cpup(p);</div><div class='add'>+	switch (res-&gt;open_delegation_type) {</div><div class='ctx'> 	case NFS4_OPEN_DELEGATE_NONE:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case NFS4_OPEN_DELEGATE_READ:</div><div class='ctx'> 	case NFS4_OPEN_DELEGATE_WRITE:</div><div class='del'>-		return decode_rw_delegation(xdr, delegation_type, res);</div><div class='add'>+	case NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+	case NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='add'>+		return decode_rw_delegation(xdr, res);</div><div class='ctx'> 	case NFS4_OPEN_DELEGATE_NONE_EXT:</div><div class='ctx'> 		return decode_no_delegation(xdr, res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5248,7 +5318,7 @@ static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res)</div><div class='ctx'> 	for (; i &lt; NFS4_BITMAP_SIZE; i++)</div><div class='ctx'> 		res-&gt;attrset[i] = 0;</div><div class='ctx'> </div><div class='del'>-	return decode_delegation(xdr, res);</div><div class='add'>+	return decode_delegation(xdr, &amp;res-&gt;delegation);</div><div class='ctx'> xdr_error:</div><div class='ctx'> 	dprintk("%s: Bitmap too large! Length = %u\n", __func__, bmlen);</div><div class='ctx'> 	return -EIO;</div><div class='hunk'>@@ -5480,6 +5550,11 @@ static int decode_setattr(struct xdr_stream *xdr)</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int decode_delegattr(struct xdr_stream *xdr)</div><div class='add'>+{</div><div class='add'>+	return decode_setattr(xdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int decode_setclientid(struct xdr_stream *xdr, struct nfs4_setclientid_res *res)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='hunk'>@@ -6510,7 +6585,7 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;acl_scratch != NULL)</div><div class='del'>-		xdr_set_scratch_page(xdr, res-&gt;acl_scratch);</div><div class='add'>+		xdr_set_scratch_folio(xdr, res-&gt;acl_scratch);</div><div class='ctx'> 	status = decode_compound_hdr(xdr, &amp;hdr);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -7052,6 +7127,12 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp,</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='add'>+	if (res-&gt;sattr_res) {</div><div class='add'>+		status = decode_delegattr(xdr);</div><div class='add'>+		res-&gt;sattr_ret = status;</div><div class='add'>+		if (status)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> 	if (res-&gt;fattr) {</div><div class='ctx'> 		status = decode_getfattr(xdr, res-&gt;fattr, res-&gt;server);</div><div class='ctx'> 		if (status != 0)</div><div class='hunk'>@@ -7547,72 +7628,6 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We need to translate between nfs status return values and</div><div class='del'>- * the local errno values which may not be the same.</div><div class='del'>- */</div><div class='del'>-static struct {</div><div class='del'>-	int stat;</div><div class='del'>-	int errno;</div><div class='del'>-} nfs_errtbl[] = {</div><div class='del'>-	{ NFS4_OK,		0		},</div><div class='del'>-	{ NFS4ERR_PERM,		-EPERM		},</div><div class='del'>-	{ NFS4ERR_NOENT,	-ENOENT		},</div><div class='del'>-	{ NFS4ERR_IO,		-errno_NFSERR_IO},</div><div class='del'>-	{ NFS4ERR_NXIO,		-ENXIO		},</div><div class='del'>-	{ NFS4ERR_ACCESS,	-EACCES		},</div><div class='del'>-	{ NFS4ERR_EXIST,	-EEXIST		},</div><div class='del'>-	{ NFS4ERR_XDEV,		-EXDEV		},</div><div class='del'>-	{ NFS4ERR_NOTDIR,	-ENOTDIR	},</div><div class='del'>-	{ NFS4ERR_ISDIR,	-EISDIR		},</div><div class='del'>-	{ NFS4ERR_INVAL,	-EINVAL		},</div><div class='del'>-	{ NFS4ERR_FBIG,		-EFBIG		},</div><div class='del'>-	{ NFS4ERR_NOSPC,	-ENOSPC		},</div><div class='del'>-	{ NFS4ERR_ROFS,		-EROFS		},</div><div class='del'>-	{ NFS4ERR_MLINK,	-EMLINK		},</div><div class='del'>-	{ NFS4ERR_NAMETOOLONG,	-ENAMETOOLONG	},</div><div class='del'>-	{ NFS4ERR_NOTEMPTY,	-ENOTEMPTY	},</div><div class='del'>-	{ NFS4ERR_DQUOT,	-EDQUOT		},</div><div class='del'>-	{ NFS4ERR_STALE,	-ESTALE		},</div><div class='del'>-	{ NFS4ERR_BADHANDLE,	-EBADHANDLE	},</div><div class='del'>-	{ NFS4ERR_BAD_COOKIE,	-EBADCOOKIE	},</div><div class='del'>-	{ NFS4ERR_NOTSUPP,	-ENOTSUPP	},</div><div class='del'>-	{ NFS4ERR_TOOSMALL,	-ETOOSMALL	},</div><div class='del'>-	{ NFS4ERR_SERVERFAULT,	-EREMOTEIO	},</div><div class='del'>-	{ NFS4ERR_BADTYPE,	-EBADTYPE	},</div><div class='del'>-	{ NFS4ERR_LOCKED,	-EAGAIN		},</div><div class='del'>-	{ NFS4ERR_SYMLINK,	-ELOOP		},</div><div class='del'>-	{ NFS4ERR_OP_ILLEGAL,	-EOPNOTSUPP	},</div><div class='del'>-	{ NFS4ERR_DEADLOCK,	-EDEADLK	},</div><div class='del'>-	{ NFS4ERR_NOXATTR,	-ENODATA	},</div><div class='del'>-	{ NFS4ERR_XATTR2BIG,	-E2BIG		},</div><div class='del'>-	{ -1,			-EIO		}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert an NFS error code to a local one.</div><div class='del'>- * This one is used jointly by NFSv2 and NFSv3.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-nfs4_stat_to_errno(int stat)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; nfs_errtbl[i].stat != -1; i++) {</div><div class='del'>-		if (nfs_errtbl[i].stat == stat)</div><div class='del'>-			return nfs_errtbl[i].errno;</div><div class='del'>-	}</div><div class='del'>-	if (stat &lt;= 10000 || stat &gt; 10100) {</div><div class='del'>-		/* The server is looney tunes. */</div><div class='del'>-		return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-	/* If we cannot translate the error, the recovery routines should</div><div class='del'>-	 * handle it.</div><div class='del'>-	 * Note: remaining NFSv4 error codes have values &gt; 10000, so should</div><div class='del'>-	 * not conflict with native Linux error codes.</div><div class='del'>-	 */</div><div class='del'>-	return -stat;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NFS_V4_2</div><div class='ctx'> #include "nfs42xdr.c"</div><div class='ctx'> #endif /* CONFIG_NFS_V4_2 */</div><div class='hunk'>@@ -7711,6 +7726,7 @@ const struct rpc_procinfo nfs4_procedures[] = {</div><div class='ctx'> 	PROC42(CLONE,		enc_clone,		dec_clone),</div><div class='ctx'> 	PROC42(COPY,		enc_copy,		dec_copy),</div><div class='ctx'> 	PROC42(OFFLOAD_CANCEL,	enc_offload_cancel,	dec_offload_cancel),</div><div class='add'>+	PROC42(OFFLOAD_STATUS,	enc_offload_status,	dec_offload_status),</div><div class='ctx'> 	PROC42(COPY_NOTIFY,	enc_copy_notify,	dec_copy_notify),</div><div class='ctx'> 	PROC(LOOKUPP,		enc_lookupp,		dec_lookupp),</div><div class='ctx'> 	PROC42(LAYOUTERROR,	enc_layouterror,	dec_layouterror),</div><div class='hunk'>@@ -7719,6 +7735,7 @@ const struct rpc_procinfo nfs4_procedures[] = {</div><div class='ctx'> 	PROC42(LISTXATTRS,	enc_listxattrs,		dec_listxattrs),</div><div class='ctx'> 	PROC42(REMOVEXATTR,	enc_removexattr,	dec_removexattr),</div><div class='ctx'> 	PROC42(READ_PLUS,	enc_read_plus,		dec_read_plus),</div><div class='add'>+	PROC42(ZERO_RANGE,	enc_zero_range,		dec_zero_range),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int nfs_version4_counts[ARRAY_SIZE(nfs4_procedures)];</div><div class='head'>diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c<br/>index 7600100ba26f..432612d22437 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfsroot.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfsroot.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfsroot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfsroot.c</a></div><div class='hunk'>@@ -175,10 +175,10 @@ static int __init root_nfs_cat(char *dest, const char *src,</div><div class='ctx'> 	size_t len = strlen(dest);</div><div class='ctx'> </div><div class='ctx'> 	if (len &amp;&amp; dest[len - 1] != ',')</div><div class='del'>-		if (strlcat(dest, ",", destlen) &gt; destlen)</div><div class='add'>+		if (strlcat(dest, ",", destlen) &gt;= destlen)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='del'>-	if (strlcat(dest, src, destlen) &gt; destlen)</div><div class='add'>+	if (strlcat(dest, src, destlen) &gt;= destlen)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h<br/>index afedb449b54f..6ce55e8e6b67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfstrace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/nfstrace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/nfstrace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/nfstrace.h</a></div><div class='hunk'>@@ -32,7 +32,8 @@</div><div class='ctx'> 			{ NFS_INO_INVALID_BLOCKS, "INVALID_BLOCKS" }, \</div><div class='ctx'> 			{ NFS_INO_INVALID_XATTR, "INVALID_XATTR" }, \</div><div class='ctx'> 			{ NFS_INO_INVALID_NLINK, "INVALID_NLINK" }, \</div><div class='del'>-			{ NFS_INO_INVALID_MODE, "INVALID_MODE" })</div><div class='add'>+			{ NFS_INO_INVALID_MODE, "INVALID_MODE" }, \</div><div class='add'>+			{ NFS_INO_INVALID_BTIME, "INVALID_BTIME" })</div><div class='ctx'> </div><div class='ctx'> #define nfs_show_nfsi_flags(v) \</div><div class='ctx'> 	__print_flags(v, "|", \</div><div class='hunk'>@@ -44,6 +45,23 @@</div><div class='ctx'> 			{ BIT(NFS_INO_LAYOUTSTATS), "LAYOUTSTATS" }, \</div><div class='ctx'> 			{ BIT(NFS_INO_ODIRECT), "ODIRECT" })</div><div class='ctx'> </div><div class='add'>+#define nfs_show_wb_flags(v) \</div><div class='add'>+	__print_flags(v, "|", \</div><div class='add'>+			{ BIT(PG_BUSY), "BUSY" }, \</div><div class='add'>+			{ BIT(PG_MAPPED), "MAPPED" }, \</div><div class='add'>+			{ BIT(PG_FOLIO), "FOLIO" }, \</div><div class='add'>+			{ BIT(PG_CLEAN), "CLEAN" }, \</div><div class='add'>+			{ BIT(PG_COMMIT_TO_DS), "COMMIT_TO_DS" }, \</div><div class='add'>+			{ BIT(PG_INODE_REF), "INODE_REF" }, \</div><div class='add'>+			{ BIT(PG_HEADLOCK), "HEADLOCK" }, \</div><div class='add'>+			{ BIT(PG_TEARDOWN), "TEARDOWN" }, \</div><div class='add'>+			{ BIT(PG_UNLOCKPAGE), "UNLOCKPAGE" }, \</div><div class='add'>+			{ BIT(PG_UPTODATE), "UPTODATE" }, \</div><div class='add'>+			{ BIT(PG_WB_END), "WB_END" }, \</div><div class='add'>+			{ BIT(PG_REMOVE), "REMOVE" }, \</div><div class='add'>+			{ BIT(PG_CONTENDED1), "CONTENDED1" }, \</div><div class='add'>+			{ BIT(PG_CONTENDED2), "CONTENDED2" })</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfs_inode_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct inode *inode</div><div class='hunk'>@@ -56,6 +74,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event,</div><div class='ctx'> 			__field(u32, fhandle)</div><div class='ctx'> 			__field(u64, fileid)</div><div class='ctx'> 			__field(u64, version)</div><div class='add'>+			__field(unsigned long, cache_validity)</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_fast_assign(</div><div class='hunk'>@@ -64,14 +83,17 @@ DECLARE_EVENT_CLASS(nfs_inode_event,</div><div class='ctx'> 			__entry-&gt;fileid = nfsi-&gt;fileid;</div><div class='ctx'> 			__entry-&gt;fhandle = nfs_fhandle_hash(&amp;nfsi-&gt;fh);</div><div class='ctx'> 			__entry-&gt;version = inode_peek_iversion_raw(inode);</div><div class='add'>+			__entry-&gt;cache_validity = nfsi-&gt;cache_validity;</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='del'>-			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu ",</div><div class='add'>+			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu cache_validity=0x%lx (%s)",</div><div class='ctx'> 			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='ctx'> 			(unsigned long long)__entry-&gt;fileid,</div><div class='ctx'> 			__entry-&gt;fhandle,</div><div class='del'>-			(unsigned long long)__entry-&gt;version</div><div class='add'>+			(unsigned long long)__entry-&gt;version,</div><div class='add'>+			__entry-&gt;cache_validity,</div><div class='add'>+			nfs_show_cache_validity(__entry-&gt;cache_validity)</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='hunk'>@@ -267,6 +289,7 @@ DECLARE_EVENT_CLASS(nfs_update_size_class,</div><div class='ctx'> 			TP_ARGS(inode, new_size))</div><div class='ctx'> </div><div class='ctx'> DEFINE_NFS_UPDATE_SIZE_EVENT(truncate);</div><div class='add'>+DEFINE_NFS_UPDATE_SIZE_EVENT(truncate_folio);</div><div class='ctx'> DEFINE_NFS_UPDATE_SIZE_EVENT(wcc);</div><div class='ctx'> DEFINE_NFS_UPDATE_SIZE_EVENT(update);</div><div class='ctx'> DEFINE_NFS_UPDATE_SIZE_EVENT(grow);</div><div class='hunk'>@@ -409,7 +432,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event,</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;flags = flags;</div><div class='ctx'> 			__entry-&gt;fileid = d_is_negative(dentry) ? 0 : NFS_FILEID(d_inode(dentry));</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -457,7 +480,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,</div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='ctx'> 			__entry-&gt;flags = flags;</div><div class='ctx'> 			__entry-&gt;fileid = d_is_negative(dentry) ? 0 : NFS_FILEID(d_inode(dentry));</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -512,7 +535,7 @@ TRACE_EVENT(nfs_atomic_open_enter,</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;flags = flags;</div><div class='ctx'> 			__entry-&gt;fmode = (__force unsigned long)ctx-&gt;mode;</div><div class='del'>-			__assign_str(name, ctx-&gt;dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -551,7 +574,7 @@ TRACE_EVENT(nfs_atomic_open_exit,</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;flags = flags;</div><div class='ctx'> 			__entry-&gt;fmode = (__force unsigned long)ctx-&gt;mode;</div><div class='del'>-			__assign_str(name, ctx-&gt;dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -587,7 +610,7 @@ TRACE_EVENT(nfs_create_enter,</div><div class='ctx'> 			__entry-&gt;dev = dir-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;flags = flags;</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -623,7 +646,7 @@ TRACE_EVENT(nfs_create_exit,</div><div class='ctx'> 			__entry-&gt;dev = dir-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;flags = flags;</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -654,7 +677,7 @@ DECLARE_EVENT_CLASS(nfs_directory_event,</div><div class='ctx'> 		TP_fast_assign(</div><div class='ctx'> 			__entry-&gt;dev = dir-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -693,7 +716,7 @@ DECLARE_EVENT_CLASS(nfs_directory_event_done,</div><div class='ctx'> 			__entry-&gt;dev = dir-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -747,7 +770,7 @@ TRACE_EVENT(nfs_link_enter,</div><div class='ctx'> 			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;fileid = NFS_FILEID(inode);</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -783,7 +806,7 @@ TRACE_EVENT(nfs_link_exit,</div><div class='ctx'> 			__entry-&gt;fileid = NFS_FILEID(inode);</div><div class='ctx'> 			__entry-&gt;dir = NFS_FILEID(dir);</div><div class='ctx'> 			__entry-&gt;error = error &lt; 0 ? -error : 0;</div><div class='del'>-			__assign_str(name, dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -819,8 +842,8 @@ DECLARE_EVENT_CLASS(nfs_rename_event,</div><div class='ctx'> 			__entry-&gt;dev = old_dir-&gt;i_sb-&gt;s_dev;</div><div class='ctx'> 			__entry-&gt;old_dir = NFS_FILEID(old_dir);</div><div class='ctx'> 			__entry-&gt;new_dir = NFS_FILEID(new_dir);</div><div class='del'>-			__assign_str(old_name, old_dentry-&gt;d_name.name);</div><div class='del'>-			__assign_str(new_name, new_dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(old_name);</div><div class='add'>+			__assign_str(new_name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -868,8 +891,8 @@ DECLARE_EVENT_CLASS(nfs_rename_event_done,</div><div class='ctx'> 			__entry-&gt;error = -error;</div><div class='ctx'> 			__entry-&gt;old_dir = NFS_FILEID(old_dir);</div><div class='ctx'> 			__entry-&gt;new_dir = NFS_FILEID(new_dir);</div><div class='del'>-			__assign_str(old_name, old_dentry-&gt;d_name.name);</div><div class='del'>-			__assign_str(new_name, new_dentry-&gt;d_name.name);</div><div class='add'>+			__assign_str(old_name);</div><div class='add'>+			__assign_str(new_name);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='hunk'>@@ -939,10 +962,11 @@ TRACE_EVENT(nfs_sillyrename_unlink,</div><div class='ctx'> DECLARE_EVENT_CLASS(nfs_folio_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct inode *inode,</div><div class='del'>-			struct folio *folio</div><div class='add'>+			loff_t offset,</div><div class='add'>+			size_t count</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='del'>-		TP_ARGS(inode, folio),</div><div class='add'>+		TP_ARGS(inode, offset, count),</div><div class='ctx'> </div><div class='ctx'> 		TP_STRUCT__entry(</div><div class='ctx'> 			__field(dev_t, dev)</div><div class='hunk'>@@ -950,7 +974,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event,</div><div class='ctx'> 			__field(u64, fileid)</div><div class='ctx'> 			__field(u64, version)</div><div class='ctx'> 			__field(loff_t, offset)</div><div class='del'>-			__field(u32, count)</div><div class='add'>+			__field(size_t, count)</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_fast_assign(</div><div class='hunk'>@@ -960,13 +984,13 @@ DECLARE_EVENT_CLASS(nfs_folio_event,</div><div class='ctx'> 			__entry-&gt;fileid = nfsi-&gt;fileid;</div><div class='ctx'> 			__entry-&gt;fhandle = nfs_fhandle_hash(&amp;nfsi-&gt;fh);</div><div class='ctx'> 			__entry-&gt;version = inode_peek_iversion_raw(inode);</div><div class='del'>-			__entry-&gt;offset = folio_file_pos(folio);</div><div class='del'>-			__entry-&gt;count = nfs_folio_length(folio);</div><div class='add'>+			__entry-&gt;offset = offset;</div><div class='add'>+			__entry-&gt;count = count;</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='ctx'> 			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu "</div><div class='del'>-			"offset=%lld count=%u",</div><div class='add'>+			"offset=%lld count=%zu",</div><div class='ctx'> 			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='ctx'> 			(unsigned long long)__entry-&gt;fileid,</div><div class='ctx'> 			__entry-&gt;fhandle, __entry-&gt;version,</div><div class='hunk'>@@ -978,18 +1002,20 @@ DECLARE_EVENT_CLASS(nfs_folio_event,</div><div class='ctx'> 	DEFINE_EVENT(nfs_folio_event, name, \</div><div class='ctx'> 			TP_PROTO( \</div><div class='ctx'> 				const struct inode *inode, \</div><div class='del'>-				struct folio *folio \</div><div class='add'>+				loff_t offset, \</div><div class='add'>+				size_t count \</div><div class='ctx'> 			), \</div><div class='del'>-			TP_ARGS(inode, folio))</div><div class='add'>+			TP_ARGS(inode, offset, count))</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfs_folio_event_done,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct inode *inode,</div><div class='del'>-			struct folio *folio,</div><div class='add'>+			loff_t offset,</div><div class='add'>+			size_t count,</div><div class='ctx'> 			int ret</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='del'>-		TP_ARGS(inode, folio, ret),</div><div class='add'>+		TP_ARGS(inode, offset, count, ret),</div><div class='ctx'> </div><div class='ctx'> 		TP_STRUCT__entry(</div><div class='ctx'> 			__field(dev_t, dev)</div><div class='hunk'>@@ -998,7 +1024,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done,</div><div class='ctx'> 			__field(u64, fileid)</div><div class='ctx'> 			__field(u64, version)</div><div class='ctx'> 			__field(loff_t, offset)</div><div class='del'>-			__field(u32, count)</div><div class='add'>+			__field(size_t, count)</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_fast_assign(</div><div class='hunk'>@@ -1008,14 +1034,14 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done,</div><div class='ctx'> 			__entry-&gt;fileid = nfsi-&gt;fileid;</div><div class='ctx'> 			__entry-&gt;fhandle = nfs_fhandle_hash(&amp;nfsi-&gt;fh);</div><div class='ctx'> 			__entry-&gt;version = inode_peek_iversion_raw(inode);</div><div class='del'>-			__entry-&gt;offset = folio_file_pos(folio);</div><div class='del'>-			__entry-&gt;count = nfs_folio_length(folio);</div><div class='add'>+			__entry-&gt;offset = offset;</div><div class='add'>+			__entry-&gt;count = count;</div><div class='ctx'> 			__entry-&gt;ret = ret;</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(</div><div class='ctx'> 			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu "</div><div class='del'>-			"offset=%lld count=%u ret=%d",</div><div class='add'>+			"offset=%lld count=%zu ret=%d",</div><div class='ctx'> 			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='ctx'> 			(unsigned long long)__entry-&gt;fileid,</div><div class='ctx'> 			__entry-&gt;fhandle, __entry-&gt;version,</div><div class='hunk'>@@ -1027,10 +1053,11 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done,</div><div class='ctx'> 	DEFINE_EVENT(nfs_folio_event_done, name, \</div><div class='ctx'> 			TP_PROTO( \</div><div class='ctx'> 				const struct inode *inode, \</div><div class='del'>-				struct folio *folio, \</div><div class='add'>+				loff_t offset, \</div><div class='add'>+				size_t count, \</div><div class='ctx'> 				int ret \</div><div class='ctx'> 			), \</div><div class='del'>-			TP_ARGS(inode, folio, ret))</div><div class='add'>+			TP_ARGS(inode, offset, count, ret))</div><div class='ctx'> </div><div class='ctx'> DEFINE_NFS_FOLIO_EVENT(nfs_aop_readpage);</div><div class='ctx'> DEFINE_NFS_FOLIO_EVENT_DONE(nfs_aop_readpage_done);</div><div class='hunk'>@@ -1041,6 +1068,73 @@ DEFINE_NFS_FOLIO_EVENT_DONE(nfs_writeback_folio_done);</div><div class='ctx'> DEFINE_NFS_FOLIO_EVENT(nfs_invalidate_folio);</div><div class='ctx'> DEFINE_NFS_FOLIO_EVENT_DONE(nfs_launder_folio_done);</div><div class='ctx'> </div><div class='add'>+DEFINE_NFS_FOLIO_EVENT(nfs_try_to_update_request);</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT_DONE(nfs_try_to_update_request_done);</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT(nfs_update_folio);</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT_DONE(nfs_update_folio_done);</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT(nfs_write_begin);</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT_DONE(nfs_write_begin_done);</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT(nfs_write_end);</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT_DONE(nfs_write_end_done);</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT(nfs_writepages);</div><div class='add'>+DEFINE_NFS_FOLIO_EVENT_DONE(nfs_writepages_done);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfs_kiocb_event,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct kiocb *iocb,</div><div class='add'>+			const struct iov_iter *iter</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(iocb, iter),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(dev_t, dev)</div><div class='add'>+			__field(u32, fhandle)</div><div class='add'>+			__field(u64, fileid)</div><div class='add'>+			__field(u64, version)</div><div class='add'>+			__field(loff_t, offset)</div><div class='add'>+			__field(size_t, count)</div><div class='add'>+			__field(int, flags)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			const struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='add'>+			const struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+</div><div class='add'>+			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='add'>+			__entry-&gt;fileid = nfsi-&gt;fileid;</div><div class='add'>+			__entry-&gt;fhandle = nfs_fhandle_hash(&amp;nfsi-&gt;fh);</div><div class='add'>+			__entry-&gt;version = inode_peek_iversion_raw(inode);</div><div class='add'>+			__entry-&gt;offset = iocb-&gt;ki_pos;</div><div class='add'>+			__entry-&gt;count = iov_iter_count(iter);</div><div class='add'>+			__entry-&gt;flags = iocb-&gt;ki_flags;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu offset=%lld count=%zu ki_flags=%s",</div><div class='add'>+			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='add'>+			(unsigned long long)__entry-&gt;fileid,</div><div class='add'>+			__entry-&gt;fhandle, __entry-&gt;version,</div><div class='add'>+			__entry-&gt;offset, __entry-&gt;count,</div><div class='add'>+			__print_flags(__entry-&gt;flags, "|", TRACE_IOCB_STRINGS)</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS_KIOCB_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(nfs_kiocb_event, name, \</div><div class='add'>+			TP_PROTO( \</div><div class='add'>+				const struct kiocb *iocb, \</div><div class='add'>+				const struct iov_iter *iter \</div><div class='add'>+			), \</div><div class='add'>+			TP_ARGS(iocb, iter))</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_KIOCB_EVENT(nfs_file_read);</div><div class='add'>+DEFINE_NFS_KIOCB_EVENT(nfs_file_write);</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(nfs_aop_readahead,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct inode *inode,</div><div class='hunk'>@@ -1388,6 +1482,55 @@ TRACE_EVENT(nfs_writeback_done,</div><div class='ctx'> 		)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+DECLARE_EVENT_CLASS(nfs_page_class,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct nfs_page *req</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(req),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(dev_t, dev)</div><div class='add'>+			__field(u32, fhandle)</div><div class='add'>+			__field(u64, fileid)</div><div class='add'>+			__field(const struct nfs_page *__private, req)</div><div class='add'>+			__field(loff_t, offset)</div><div class='add'>+			__field(unsigned int, count)</div><div class='add'>+			__field(unsigned long, flags)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			const struct inode *inode = folio_inode(req-&gt;wb_folio);</div><div class='add'>+			const struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+</div><div class='add'>+			__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='add'>+			__entry-&gt;fileid = nfsi-&gt;fileid;</div><div class='add'>+			__entry-&gt;fhandle = nfs_fhandle_hash(&amp;nfsi-&gt;fh);</div><div class='add'>+			__entry-&gt;req = req;</div><div class='add'>+			__entry-&gt;offset = req_offset(req);</div><div class='add'>+			__entry-&gt;count = req-&gt;wb_bytes;</div><div class='add'>+			__entry-&gt;flags = req-&gt;wb_flags;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"fileid=%02x:%02x:%llu fhandle=0x%08x req=%p offset=%lld count=%u flags=%s",</div><div class='add'>+			MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='add'>+			(unsigned long long)__entry-&gt;fileid, __entry-&gt;fhandle,</div><div class='add'>+			__entry-&gt;req, __entry-&gt;offset, __entry-&gt;count,</div><div class='add'>+			nfs_show_wb_flags(__entry-&gt;flags)</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS_PAGE_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(nfs_page_class, name, \</div><div class='add'>+			TP_PROTO( \</div><div class='add'>+				const struct nfs_page *req \</div><div class='add'>+			), \</div><div class='add'>+			TP_ARGS(req))</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_PAGE_EVENT(nfs_writepage_setup);</div><div class='add'>+DEFINE_NFS_PAGE_EVENT(nfs_do_writepage);</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfs_page_error_class,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct inode *inode,</div><div class='hunk'>@@ -1589,6 +1732,76 @@ DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_completion);</div><div class='ctx'> DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_schedule_iovec);</div><div class='ctx'> DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_reschedule_io);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfs_local_dio_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct inode *inode,</div><div class='add'>+		loff_t offset,</div><div class='add'>+		ssize_t count,</div><div class='add'>+		const struct nfs_local_dio *local_dio</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(inode, offset, count, local_dio),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(dev_t, dev)</div><div class='add'>+		__field(u64, fileid)</div><div class='add'>+		__field(u32, fhandle)</div><div class='add'>+		__field(loff_t, offset)</div><div class='add'>+		__field(ssize_t, count)</div><div class='add'>+		__field(u32, mem_align)</div><div class='add'>+		__field(u32, offset_align)</div><div class='add'>+		__field(loff_t, start)</div><div class='add'>+		__field(ssize_t, start_len)</div><div class='add'>+		__field(loff_t, middle)</div><div class='add'>+		__field(ssize_t, middle_len)</div><div class='add'>+		__field(loff_t, end)</div><div class='add'>+		__field(ssize_t, end_len)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		const struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+		const struct nfs_fh *fh = &amp;nfsi-&gt;fh;</div><div class='add'>+</div><div class='add'>+		__entry-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='add'>+		__entry-&gt;fileid = nfsi-&gt;fileid;</div><div class='add'>+		__entry-&gt;fhandle = nfs_fhandle_hash(fh);</div><div class='add'>+		__entry-&gt;offset = offset;</div><div class='add'>+		__entry-&gt;count = count;</div><div class='add'>+		__entry-&gt;mem_align = local_dio-&gt;mem_align;</div><div class='add'>+		__entry-&gt;offset_align = local_dio-&gt;offset_align;</div><div class='add'>+		__entry-&gt;start = offset;</div><div class='add'>+		__entry-&gt;start_len = local_dio-&gt;start_len;</div><div class='add'>+		__entry-&gt;middle = local_dio-&gt;middle_offset;</div><div class='add'>+		__entry-&gt;middle_len = local_dio-&gt;middle_len;</div><div class='add'>+		__entry-&gt;end = local_dio-&gt;end_offset;</div><div class='add'>+		__entry-&gt;end_len = local_dio-&gt;end_len;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("fileid=%02x:%02x:%llu fhandle=0x%08x "</div><div class='add'>+		  "offset=%lld count=%zd "</div><div class='add'>+		  "mem_align=%u offset_align=%u "</div><div class='add'>+		  "start=%llu+%zd middle=%llu+%zd end=%llu+%zd",</div><div class='add'>+		  MAJOR(__entry-&gt;dev), MINOR(__entry-&gt;dev),</div><div class='add'>+		  (unsigned long long)__entry-&gt;fileid,</div><div class='add'>+		  __entry-&gt;fhandle, __entry-&gt;offset, __entry-&gt;count,</div><div class='add'>+		  __entry-&gt;mem_align, __entry-&gt;offset_align,</div><div class='add'>+		  __entry-&gt;start, __entry-&gt;start_len,</div><div class='add'>+		  __entry-&gt;middle, __entry-&gt;middle_len,</div><div class='add'>+		  __entry-&gt;end, __entry-&gt;end_len)</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS_LOCAL_DIO_EVENT(name)		\</div><div class='add'>+DEFINE_EVENT(nfs_local_dio_class, nfs_local_dio_##name,	\</div><div class='add'>+	TP_PROTO(const struct inode *inode,		\</div><div class='add'>+		 loff_t offset,				\</div><div class='add'>+		 ssize_t count,				\</div><div class='add'>+		 const struct nfs_local_dio *local_dio),\</div><div class='add'>+	TP_ARGS(inode, offset, count, local_dio))</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_LOCAL_DIO_EVENT(read);</div><div class='add'>+DEFINE_NFS_LOCAL_DIO_EVENT(write);</div><div class='add'>+DEFINE_NFS_LOCAL_DIO_EVENT(misaligned);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(nfs_fh_to_dentry,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct super_block *sb,</div><div class='hunk'>@@ -1636,8 +1849,8 @@ TRACE_EVENT(nfs_mount_assign,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(option, option);</div><div class='del'>-		__assign_str(value, value);</div><div class='add'>+		__assign_str(option);</div><div class='add'>+		__assign_str(value);</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_printk("option %s=%s",</div><div class='hunk'>@@ -1657,7 +1870,7 @@ TRACE_EVENT(nfs_mount_option,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(option, param-&gt;key);</div><div class='add'>+		__assign_str(option);</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_printk("option %s", __get_str(option))</div><div class='hunk'>@@ -1675,12 +1888,41 @@ TRACE_EVENT(nfs_mount_path,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(path, path);</div><div class='add'>+		__assign_str(path);</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_printk("path='%s'", __get_str(path))</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(nfs_local_open_fh,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct nfs_fh *fh,</div><div class='add'>+			fmode_t fmode,</div><div class='add'>+			int error</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(fh, fmode, error),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(int, error)</div><div class='add'>+			__field(u32, fhandle)</div><div class='add'>+			__field(unsigned int, fmode)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__entry-&gt;error = error;</div><div class='add'>+			__entry-&gt;fhandle = nfs_fhandle_hash(fh);</div><div class='add'>+			__entry-&gt;fmode = (__force unsigned int)fmode;</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"fhandle=0x%08x mode=%s result=%d",</div><div class='add'>+			__entry-&gt;fhandle,</div><div class='add'>+			show_fs_fmode_flags(__entry-&gt;fmode),</div><div class='add'>+			__entry-&gt;error</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfs_xdr_event,</div><div class='ctx'> 		TP_PROTO(</div><div class='ctx'> 			const struct xdr_stream *xdr,</div><div class='hunk'>@@ -1710,9 +1952,8 @@ DECLARE_EVENT_CLASS(nfs_xdr_event,</div><div class='ctx'> 			__entry-&gt;xid = be32_to_cpu(rqstp-&gt;rq_xid);</div><div class='ctx'> 			__entry-&gt;version = task-&gt;tk_client-&gt;cl_vers;</div><div class='ctx'> 			__entry-&gt;error = error;</div><div class='del'>-			__assign_str(program,</div><div class='del'>-				     task-&gt;tk_client-&gt;cl_program-&gt;name);</div><div class='del'>-			__assign_str(procedure, task-&gt;tk_msg.rpc_proc-&gt;p_name);</div><div class='add'>+			__assign_str(program);</div><div class='add'>+			__assign_str(procedure);</div><div class='ctx'> 		),</div><div class='ctx'> </div><div class='ctx'> 		TP_printk(SUNRPC_TRACE_TASK_SPECIFIER</div><div class='head'>diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c<br/>index 6efb5068c116..6e69ce43a13f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/pagelist.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pagelist.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/pagelist.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/pagelist.c</a></div><div class='hunk'>@@ -188,102 +188,6 @@ nfs_async_iocounter_wait(struct rpc_task *task, struct nfs_lock_context *l_ctx)</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_async_iocounter_wait);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * nfs_page_lock_head_request - page lock the head of the page group</div><div class='del'>- * @req: any member of the page group</div><div class='del'>- */</div><div class='del'>-struct nfs_page *</div><div class='del'>-nfs_page_group_lock_head(struct nfs_page *req)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *head = req-&gt;wb_head;</div><div class='del'>-</div><div class='del'>-	while (!nfs_lock_request(head)) {</div><div class='del'>-		int ret = nfs_wait_on_request(head);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-	if (head != req)</div><div class='del'>-		kref_get(&amp;head-&gt;wb_kref);</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nfs_unroll_locks -  unlock all newly locked reqs and wait on @req</div><div class='del'>- * @head: head request of page group, must be holding head lock</div><div class='del'>- * @req: request that couldn't lock and needs to wait on the req bit lock</div><div class='del'>- *</div><div class='del'>- * This is a helper function for nfs_lock_and_join_requests</div><div class='del'>- * returns 0 on success, &lt; 0 on error.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-nfs_unroll_locks(struct nfs_page *head, struct nfs_page *req)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *tmp;</div><div class='del'>-</div><div class='del'>-	/* relinquish all the locks successfully grabbed this run */</div><div class='del'>-	for (tmp = head-&gt;wb_this_page ; tmp != req; tmp = tmp-&gt;wb_this_page) {</div><div class='del'>-		if (!kref_read(&amp;tmp-&gt;wb_kref))</div><div class='del'>-			continue;</div><div class='del'>-		nfs_unlock_and_release_request(tmp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nfs_page_group_lock_subreq -  try to lock a subrequest</div><div class='del'>- * @head: head request of page group</div><div class='del'>- * @subreq: request to lock</div><div class='del'>- *</div><div class='del'>- * This is a helper function for nfs_lock_and_join_requests which</div><div class='del'>- * must be called with the head request and page group both locked.</div><div class='del'>- * On error, it returns with the page group unlocked.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-nfs_page_group_lock_subreq(struct nfs_page *head, struct nfs_page *subreq)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!kref_get_unless_zero(&amp;subreq-&gt;wb_kref))</div><div class='del'>-		return 0;</div><div class='del'>-	while (!nfs_lock_request(subreq)) {</div><div class='del'>-		nfs_page_group_unlock(head);</div><div class='del'>-		ret = nfs_wait_on_request(subreq);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = nfs_page_group_lock(head);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			nfs_unroll_locks(head, subreq);</div><div class='del'>-			nfs_release_request(subreq);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nfs_page_group_lock_subrequests -  try to lock the subrequests</div><div class='del'>- * @head: head request of page group</div><div class='del'>- *</div><div class='del'>- * This is a helper function for nfs_lock_and_join_requests which</div><div class='del'>- * must be called with the head request locked.</div><div class='del'>- */</div><div class='del'>-int nfs_page_group_lock_subrequests(struct nfs_page *head)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *subreq;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = nfs_page_group_lock(head);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	/* lock each request in the page group */</div><div class='del'>-	for (subreq = head-&gt;wb_this_page; subreq != head;</div><div class='del'>-			subreq = subreq-&gt;wb_this_page) {</div><div class='del'>-		ret = nfs_page_group_lock_subreq(head, subreq);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-	nfs_page_group_unlock(head);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * nfs_page_set_headlock - set the request PG_HEADLOCK</div><div class='ctx'>  * @req: request that is to be locked</div><div class='ctx'>  *</div><div class='hunk'>@@ -349,13 +253,14 @@ nfs_page_group_unlock(struct nfs_page *req)</div><div class='ctx'> 	nfs_page_clear_headlock(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * nfs_page_group_sync_on_bit_locked</div><div class='add'>+/**</div><div class='add'>+ * nfs_page_group_sync_on_bit_locked - Test if all requests have @bit set</div><div class='add'>+ * @req: request in page group</div><div class='add'>+ * @bit: PG_* bit that is used to sync page group</div><div class='ctx'>  *</div><div class='ctx'>  * must be called with page group lock held</div><div class='ctx'>  */</div><div class='del'>-static bool</div><div class='del'>-nfs_page_group_sync_on_bit_locked(struct nfs_page *req, unsigned int bit)</div><div class='add'>+bool nfs_page_group_sync_on_bit_locked(struct nfs_page *req, unsigned int bit)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_page *head = req-&gt;wb_head;</div><div class='ctx'> 	struct nfs_page *tmp;</div><div class='hunk'>@@ -569,7 +474,7 @@ struct nfs_page *nfs_page_create_from_folio(struct nfs_open_context *ctx,</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(l_ctx))</div><div class='ctx'> 		return ERR_CAST(l_ctx);</div><div class='del'>-	ret = nfs_page_create(l_ctx, offset, folio_index(folio), offset, count);</div><div class='add'>+	ret = nfs_page_create(l_ctx, offset, folio-&gt;index, offset, count);</div><div class='ctx'> 	if (!IS_ERR(ret)) {</div><div class='ctx'> 		nfs_page_assign_folio(ret, folio);</div><div class='ctx'> 		nfs_page_group_init(ret, NULL);</div><div class='hunk'>@@ -694,25 +599,6 @@ void nfs_release_request(struct nfs_page *req)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_release_request);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * nfs_wait_on_request - Wait for a request to complete.</div><div class='del'>- * @req: request to wait upon.</div><div class='del'>- *</div><div class='del'>- * Interruptible by fatal signals only.</div><div class='del'>- * The user is responsible for holding a count on the request.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-nfs_wait_on_request(struct nfs_page *req)</div><div class='del'>-{</div><div class='del'>-	if (!test_bit(PG_BUSY, &amp;req-&gt;wb_flags))</div><div class='del'>-		return 0;</div><div class='del'>-	set_bit(PG_CONTENDED2, &amp;req-&gt;wb_flags);</div><div class='del'>-	smp_mb__after_atomic();</div><div class='del'>-	return wait_on_bit_io(&amp;req-&gt;wb_flags, PG_BUSY,</div><div class='del'>-			      TASK_UNINTERRUPTIBLE);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(nfs_wait_on_request);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * nfs_generic_pg_test - determine if requests can be coalesced</div><div class='ctx'>  * @desc: pointer to descriptor</div><div class='hunk'>@@ -846,7 +732,8 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata)</div><div class='ctx'> </div><div class='ctx'> int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,</div><div class='ctx'> 		      const struct cred *cred, const struct nfs_rpc_ops *rpc_ops,</div><div class='del'>-		      const struct rpc_call_ops *call_ops, int how, int flags)</div><div class='add'>+		      const struct rpc_call_ops *call_ops, int how, int flags,</div><div class='add'>+		      struct nfsd_file *localio)</div><div class='ctx'> {</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> 	struct rpc_message msg = {</div><div class='hunk'>@@ -876,6 +763,10 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,</div><div class='ctx'> 		hdr-&gt;args.count,</div><div class='ctx'> 		(unsigned long long)hdr-&gt;args.offset);</div><div class='ctx'> </div><div class='add'>+	if (localio)</div><div class='add'>+		return nfs_local_doio(NFS_SERVER(hdr-&gt;inode)-&gt;nfs_client,</div><div class='add'>+				      localio, hdr, call_ops);</div><div class='add'>+</div><div class='ctx'> 	task = rpc_run_task(&amp;task_setup_data);</div><div class='ctx'> 	if (IS_ERR(task))</div><div class='ctx'> 		return PTR_ERR(task);</div><div class='hunk'>@@ -1068,6 +959,13 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)</div><div class='ctx'> 	nfs_pgheader_init(desc, hdr, nfs_pgio_header_free);</div><div class='ctx'> 	ret = nfs_generic_pgio(desc, hdr);</div><div class='ctx'> 	if (ret == 0) {</div><div class='add'>+		struct nfs_client *clp = NFS_SERVER(hdr-&gt;inode)-&gt;nfs_client;</div><div class='add'>+</div><div class='add'>+		struct nfsd_file *localio =</div><div class='add'>+			nfs_local_open_fh(clp, hdr-&gt;cred, hdr-&gt;args.fh,</div><div class='add'>+					  &amp;hdr-&gt;args.context-&gt;nfl,</div><div class='add'>+					  hdr-&gt;args.context-&gt;mode);</div><div class='add'>+</div><div class='ctx'> 		if (NFS_SERVER(hdr-&gt;inode)-&gt;nfs_client-&gt;cl_minorversion)</div><div class='ctx'> 			task_flags = RPC_TASK_MOVEABLE;</div><div class='ctx'> 		ret = nfs_initiate_pgio(NFS_CLIENT(hdr-&gt;inode),</div><div class='hunk'>@@ -1076,7 +974,8 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)</div><div class='ctx'> 					NFS_PROTO(hdr-&gt;inode),</div><div class='ctx'> 					desc-&gt;pg_rpc_callops,</div><div class='ctx'> 					desc-&gt;pg_ioflags,</div><div class='del'>-					RPC_TASK_CRED_NOREF | task_flags);</div><div class='add'>+					RPC_TASK_CRED_NOREF | task_flags,</div><div class='add'>+					localio);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1545,6 +1444,11 @@ void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *desc, pgoff_t index)</div><div class='ctx'> 					continue;</div><div class='ctx'> 			} else if (index == prev-&gt;wb_index + 1)</div><div class='ctx'> 				continue;</div><div class='add'>+			/*</div><div class='add'>+			 * We will submit more requests after these. Indicate</div><div class='add'>+			 * this to the underlying layers.</div><div class='add'>+			 */</div><div class='add'>+			desc-&gt;pg_moreio = 1;</div><div class='ctx'> 			nfs_pageio_complete(desc);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c<br/>index 0c0fed1ecd0b..f157d43d1312 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/pnfs.c</a></div><div class='hunk'>@@ -61,6 +61,7 @@ static void pnfs_free_returned_lsegs(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		u32 seq);</div><div class='ctx'> static bool pnfs_lseg_dec_and_remove_zero(struct pnfs_layout_segment *lseg,</div><div class='ctx'> 		                struct list_head *tmp_list);</div><div class='add'>+static int pnfs_layout_return_on_reboot(struct pnfs_layout_hdr *lo);</div><div class='ctx'> </div><div class='ctx'> /* Return the registered pnfs layout driver module matching given id */</div><div class='ctx'> static struct pnfs_layoutdriver_type *</div><div class='hunk'>@@ -305,7 +306,6 @@ void</div><div class='ctx'> pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	unsigned long i_state;</div><div class='ctx'> </div><div class='ctx'> 	if (!lo)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -316,12 +316,11 @@ pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo)</div><div class='ctx'> 		if (!list_empty(&amp;lo-&gt;plh_segs))</div><div class='ctx'> 			WARN_ONCE(1, "NFS: BUG unfreed layout segments.\n");</div><div class='ctx'> 		pnfs_detach_layout_hdr(lo);</div><div class='del'>-		i_state = inode-&gt;i_state;</div><div class='add'>+		/* Notify pnfs_destroy_layout_final() that we're done */</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_FREEING | I_CLEAR))</div><div class='add'>+			wake_up_var_locked(lo, &amp;inode-&gt;i_lock);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		pnfs_free_layout_hdr(lo);</div><div class='del'>-		/* Notify pnfs_destroy_layout_final() that we're done */</div><div class='del'>-		if (i_state &amp; (I_FREEING | I_CLEAR))</div><div class='del'>-			wake_up_var(lo);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -476,6 +475,18 @@ pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 	return !list_empty(&amp;lo-&gt;plh_segs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pnfs_mark_layout_stateid_return(struct pnfs_layout_hdr *lo,</div><div class='add'>+					   struct list_head *lseg_list,</div><div class='add'>+					   enum pnfs_iomode iomode, u32 seq)</div><div class='add'>+{</div><div class='add'>+	struct pnfs_layout_range range = {</div><div class='add'>+		.iomode = iomode,</div><div class='add'>+		.length = NFS4_MAX_UINT64,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return pnfs_mark_matching_lsegs_return(lo, lseg_list, &amp;range, seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> pnfs_iomode_to_fail_bit(u32 iomode)</div><div class='ctx'> {</div><div class='hunk'>@@ -732,6 +743,14 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 	return remaining;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void pnfs_reset_return_info(struct pnfs_layout_hdr *lo)</div><div class='add'>+{</div><div class='add'>+	struct pnfs_layout_segment *lseg;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(lseg, &amp;lo-&gt;plh_return_segs, pls_list)</div><div class='add'>+		pnfs_set_plh_return_info(lo, lseg-&gt;pls_range.iomode, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> pnfs_free_returned_lsegs(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		struct list_head *free_me,</div><div class='hunk'>@@ -788,23 +807,17 @@ void pnfs_destroy_layout(struct nfs_inode *nfsi)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pnfs_destroy_layout);</div><div class='ctx'> </div><div class='del'>-static bool pnfs_layout_removed(struct nfs_inode *nfsi,</div><div class='del'>-				struct pnfs_layout_hdr *lo)</div><div class='del'>-{</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;nfsi-&gt;vfs_inode.i_lock);</div><div class='del'>-	ret = nfsi-&gt;layout != lo;</div><div class='del'>-	spin_unlock(&amp;nfsi-&gt;vfs_inode.i_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void pnfs_destroy_layout_final(struct nfs_inode *nfsi)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_layout_hdr *lo = __pnfs_destroy_layout(nfsi);</div><div class='add'>+	struct inode *inode = &amp;nfsi-&gt;vfs_inode;</div><div class='ctx'> </div><div class='del'>-	if (lo)</div><div class='del'>-		wait_var_event(lo, pnfs_layout_removed(nfsi, lo));</div><div class='add'>+	if (lo) {</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+		wait_var_event_spinlock(lo, nfsi-&gt;layout != lo,</div><div class='add'>+					&amp;inode-&gt;i_lock);</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -846,8 +859,6 @@ pnfs_layout_bulk_destroy_byserver_locked(struct nfs_client *clp,</div><div class='ctx'> 			break;</div><div class='ctx'> 		inode = pnfs_grab_inode_layout_hdr(lo);</div><div class='ctx'> 		if (inode != NULL) {</div><div class='del'>-			if (test_and_clear_bit(NFS_LAYOUT_HASHED, &amp;lo-&gt;plh_flags))</div><div class='del'>-				list_del_rcu(&amp;lo-&gt;plh_layouts);</div><div class='ctx'> 			if (pnfs_layout_add_bulk_destroy_list(inode,</div><div class='ctx'> 						layout_list))</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -868,7 +879,7 @@ pnfs_layout_bulk_destroy_byserver_locked(struct nfs_client *clp,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> pnfs_layout_free_bulk_destroy_list(struct list_head *layout_list,</div><div class='del'>-		bool is_bulk_recall)</div><div class='add'>+				   enum pnfs_layout_destroy_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_layout_hdr *lo;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -886,8 +897,11 @@ pnfs_layout_free_bulk_destroy_list(struct list_head *layout_list,</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		list_del_init(&amp;lo-&gt;plh_bulk_destroy);</div><div class='del'>-		if (pnfs_mark_layout_stateid_invalid(lo, &amp;lseg_list)) {</div><div class='del'>-			if (is_bulk_recall)</div><div class='add'>+		if (mode == PNFS_LAYOUT_FILE_BULK_RETURN) {</div><div class='add'>+			pnfs_mark_layout_stateid_return(lo, &amp;lseg_list,</div><div class='add'>+							IOMODE_ANY, 0);</div><div class='add'>+		} else if (pnfs_mark_layout_stateid_invalid(lo, &amp;lseg_list)) {</div><div class='add'>+			if (mode == PNFS_LAYOUT_BULK_RETURN)</div><div class='ctx'> 				set_bit(NFS_LAYOUT_BULK_RECALL, &amp;lo-&gt;plh_flags);</div><div class='ctx'> 			ret = -EAGAIN;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -901,10 +915,8 @@ pnfs_layout_free_bulk_destroy_list(struct list_head *layout_list,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-pnfs_destroy_layouts_byfsid(struct nfs_client *clp,</div><div class='del'>-		struct nfs_fsid *fsid,</div><div class='del'>-		bool is_recall)</div><div class='add'>+int pnfs_layout_destroy_byfsid(struct nfs_client *clp, struct nfs_fsid *fsid,</div><div class='add'>+			       enum pnfs_layout_destroy_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server;</div><div class='ctx'> 	LIST_HEAD(layout_list);</div><div class='hunk'>@@ -923,33 +935,40 @@ restart:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;layout_list))</div><div class='del'>-		return 0;</div><div class='del'>-	return pnfs_layout_free_bulk_destroy_list(&amp;layout_list, is_recall);</div><div class='add'>+	return pnfs_layout_free_bulk_destroy_list(&amp;layout_list, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-pnfs_destroy_layouts_byclid(struct nfs_client *clp,</div><div class='del'>-		bool is_recall)</div><div class='add'>+static void pnfs_layout_build_destroy_list_byclient(struct nfs_client *clp,</div><div class='add'>+						    struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_server *server;</div><div class='del'>-	LIST_HEAD(layout_list);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> restart:</div><div class='ctx'> 	list_for_each_entry_rcu(server, &amp;clp-&gt;cl_superblocks, client_link) {</div><div class='del'>-		if (pnfs_layout_bulk_destroy_byserver_locked(clp,</div><div class='del'>-					server,</div><div class='del'>-					&amp;layout_list) != 0)</div><div class='add'>+		if (pnfs_layout_bulk_destroy_byserver_locked(clp, server,</div><div class='add'>+							     list) != 0)</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;layout_list))</div><div class='del'>-		return 0;</div><div class='del'>-	return pnfs_layout_free_bulk_destroy_list(&amp;layout_list, is_recall);</div><div class='add'>+static int pnfs_layout_do_destroy_byclid(struct nfs_client *clp,</div><div class='add'>+					 struct list_head *list,</div><div class='add'>+					 enum pnfs_layout_destroy_mode mode)</div><div class='add'>+{</div><div class='add'>+	pnfs_layout_build_destroy_list_byclient(clp, list);</div><div class='add'>+	return pnfs_layout_free_bulk_destroy_list(list, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pnfs_layout_destroy_byclid(struct nfs_client *clp,</div><div class='add'>+			       enum pnfs_layout_destroy_mode mode)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(layout_list);</div><div class='add'>+</div><div class='add'>+	return pnfs_layout_do_destroy_byclid(clp, &amp;layout_list, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -962,7 +981,68 @@ pnfs_destroy_all_layouts(struct nfs_client *clp)</div><div class='ctx'> 	nfs4_deviceid_mark_client_invalid(clp);</div><div class='ctx'> 	nfs4_deviceid_purge_client(clp);</div><div class='ctx'> </div><div class='del'>-	pnfs_destroy_layouts_byclid(clp, false);</div><div class='add'>+	pnfs_layout_destroy_byclid(clp, PNFS_LAYOUT_INVALIDATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnfs_layout_build_recover_list_byclient(struct nfs_client *clp,</div><div class='add'>+						    struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+restart:</div><div class='add'>+	list_for_each_entry_rcu(server, &amp;clp-&gt;cl_superblocks, client_link) {</div><div class='add'>+		if (!(server-&gt;caps &amp; NFS_CAP_REBOOT_LAYOUTRETURN))</div><div class='add'>+			continue;</div><div class='add'>+		if (pnfs_layout_bulk_destroy_byserver_locked(clp, server,</div><div class='add'>+							     list) != 0)</div><div class='add'>+			goto restart;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pnfs_layout_bulk_list_reboot(struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct pnfs_layout_hdr *lo;</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(lo, list, plh_bulk_destroy) {</div><div class='add'>+		server = NFS_SERVER(lo-&gt;plh_inode);</div><div class='add'>+		ret = pnfs_layout_return_on_reboot(lo);</div><div class='add'>+		switch (ret) {</div><div class='add'>+		case 0:</div><div class='add'>+			continue;</div><div class='add'>+		case -NFS4ERR_BAD_STATEID:</div><div class='add'>+			server-&gt;caps &amp;= ~NFS_CAP_REBOOT_LAYOUTRETURN;</div><div class='add'>+			break;</div><div class='add'>+		case -NFS4ERR_NO_GRACE:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pnfs_layout_handle_reboot(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+	int ret = 0, ret2;</div><div class='add'>+</div><div class='add'>+	pnfs_layout_build_recover_list_byclient(clp, &amp;list);</div><div class='add'>+	if (!list_empty(&amp;list))</div><div class='add'>+		ret = pnfs_layout_bulk_list_reboot(&amp;list);</div><div class='add'>+	ret2 = pnfs_layout_do_destroy_byclid(clp, &amp;list,</div><div class='add'>+					     PNFS_LAYOUT_INVALIDATE);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = ret2;</div><div class='add'>+	return (ret == 0) ?  0 : -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1163,6 +1243,33 @@ static void pnfs_clear_layoutcommit(struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+pnfs_layoutreturn_retry_later_locked(struct pnfs_layout_hdr *lo,</div><div class='add'>+				     const nfs4_stateid *arg_stateid,</div><div class='add'>+				     const struct pnfs_layout_range *range,</div><div class='add'>+				     struct list_head *freeme)</div><div class='add'>+{</div><div class='add'>+	if (pnfs_layout_is_valid(lo) &amp;&amp;</div><div class='add'>+	    nfs4_stateid_match_other(&amp;lo-&gt;plh_stateid, arg_stateid))</div><div class='add'>+		pnfs_reset_return_info(lo);</div><div class='add'>+	else</div><div class='add'>+		pnfs_mark_layout_stateid_invalid(lo, freeme);</div><div class='add'>+	pnfs_clear_layoutreturn_waitbit(lo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pnfs_layoutreturn_retry_later(struct pnfs_layout_hdr *lo,</div><div class='add'>+				   const nfs4_stateid *arg_stateid,</div><div class='add'>+				   const struct pnfs_layout_range *range)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = lo-&gt;plh_inode;</div><div class='add'>+	LIST_HEAD(freeme);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	pnfs_layoutreturn_retry_later_locked(lo, arg_stateid, range, &amp;freeme);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	pnfs_free_lseg_list(&amp;freeme);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void pnfs_layoutreturn_free_lsegs(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		const nfs4_stateid *arg_stateid,</div><div class='ctx'> 		const struct pnfs_layout_range *range,</div><div class='hunk'>@@ -1172,15 +1279,15 @@ void pnfs_layoutreturn_free_lsegs(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 	LIST_HEAD(freeme);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if (!pnfs_layout_is_valid(lo) ||</div><div class='del'>-	    !nfs4_stateid_match_other(&amp;lo-&gt;plh_stateid, arg_stateid))</div><div class='add'>+	if (!nfs4_stateid_match_other(&amp;lo-&gt;plh_stateid, arg_stateid))</div><div class='ctx'> 		goto out_unlock;</div><div class='del'>-	if (stateid) {</div><div class='add'>+	if (stateid &amp;&amp; pnfs_layout_is_valid(lo)) {</div><div class='ctx'> 		u32 seq = be32_to_cpu(arg_stateid-&gt;seqid);</div><div class='ctx'> </div><div class='ctx'> 		pnfs_mark_matching_lsegs_invalid(lo, &amp;freeme, range, seq);</div><div class='ctx'> 		pnfs_free_returned_lsegs(lo, &amp;freeme, range, seq);</div><div class='ctx'> 		pnfs_set_layout_stateid(lo, stateid, NULL, true);</div><div class='add'>+		pnfs_reset_return_info(lo);</div><div class='ctx'> 	} else</div><div class='ctx'> 		pnfs_mark_layout_stateid_invalid(lo, &amp;freeme);</div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -1197,7 +1304,7 @@ pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		enum pnfs_iomode *iomode)</div><div class='ctx'> {</div><div class='ctx'> 	/* Serialise LAYOUTGET/LAYOUTRETURN */</div><div class='del'>-	if (atomic_read(&amp;lo-&gt;plh_outstanding) != 0)</div><div class='add'>+	if (atomic_read(&amp;lo-&gt;plh_outstanding) != 0 &amp;&amp; lo-&gt;plh_return_seq == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (test_and_set_bit(NFS_LAYOUT_RETURN_LOCK, &amp;lo-&gt;plh_flags))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1239,7 +1346,7 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		       const nfs4_stateid *stateid,</div><div class='ctx'> 		       const struct cred **pcred,</div><div class='ctx'> 		       enum pnfs_iomode iomode,</div><div class='del'>-		       bool sync)</div><div class='add'>+		       unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ino = lo-&gt;plh_inode;</div><div class='ctx'> 	struct pnfs_layoutdriver_type *ld = NFS_SERVER(ino)-&gt;pnfs_curr_ld;</div><div class='hunk'>@@ -1266,33 +1373,21 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 	if (ld-&gt;prepare_layoutreturn)</div><div class='ctx'> 		ld-&gt;prepare_layoutreturn(&amp;lrp-&gt;args);</div><div class='ctx'> </div><div class='del'>-	status = nfs4_proc_layoutreturn(lrp, sync);</div><div class='add'>+	status = nfs4_proc_layoutreturn(lrp, flags);</div><div class='ctx'> out:</div><div class='ctx'> 	dprintk("&lt;-- %s status: %d\n", __func__, status);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='del'>-pnfs_layout_segments_returnable(struct pnfs_layout_hdr *lo,</div><div class='del'>-				enum pnfs_iomode iomode,</div><div class='del'>-				u32 seq)</div><div class='del'>-{</div><div class='del'>-	struct pnfs_layout_range recall_range = {</div><div class='del'>-		.length = NFS4_MAX_UINT64,</div><div class='del'>-		.iomode = iomode,</div><div class='del'>-	};</div><div class='del'>-	return pnfs_mark_matching_lsegs_return(lo, &amp;lo-&gt;plh_return_segs,</div><div class='del'>-					       &amp;recall_range, seq) != -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Return true if layoutreturn is needed */</div><div class='ctx'> static bool</div><div class='ctx'> pnfs_layout_need_return(struct pnfs_layout_hdr *lo)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(NFS_LAYOUT_RETURN_REQUESTED, &amp;lo-&gt;plh_flags))</div><div class='ctx'> 		return false;</div><div class='del'>-	return pnfs_layout_segments_returnable(lo, lo-&gt;plh_return_iomode,</div><div class='del'>-					       lo-&gt;plh_return_seq);</div><div class='add'>+	return pnfs_mark_layout_stateid_return(lo, &amp;lo-&gt;plh_return_segs,</div><div class='add'>+					       lo-&gt;plh_return_iomode,</div><div class='add'>+					       lo-&gt;plh_return_seq) != EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pnfs_layoutreturn_before_put_layout_hdr(struct pnfs_layout_hdr *lo)</div><div class='hunk'>@@ -1312,7 +1407,8 @@ static void pnfs_layoutreturn_before_put_layout_hdr(struct pnfs_layout_hdr *lo)</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		if (send) {</div><div class='ctx'> 			/* Send an async layoutreturn so we dont deadlock */</div><div class='del'>-			pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, iomode, false);</div><div class='add'>+			pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, iomode,</div><div class='add'>+					       PNFS_FL_LAYOUTRETURN_ASYNC);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -1379,7 +1475,8 @@ _pnfs_return_layout(struct inode *ino)</div><div class='ctx'> 	send = pnfs_prepare_layoutreturn(lo, &amp;stateid, &amp;cred, NULL);</div><div class='ctx'> 	spin_unlock(&amp;ino-&gt;i_lock);</div><div class='ctx'> 	if (send)</div><div class='del'>-		status = pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, IOMODE_ANY, true);</div><div class='add'>+		status = pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, IOMODE_ANY,</div><div class='add'>+						0);</div><div class='ctx'> out_wait_layoutreturn:</div><div class='ctx'> 	wait_on_bit(&amp;lo-&gt;plh_flags, NFS_LAYOUT_RETURN, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> out_put_layout_hdr:</div><div class='hunk'>@@ -1417,6 +1514,24 @@ pnfs_commit_and_return_layout(struct inode *inode)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pnfs_layout_return_on_reboot(struct pnfs_layout_hdr *lo)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = lo-&gt;plh_inode;</div><div class='add'>+	const struct cred *cred;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (!pnfs_layout_is_valid(lo)) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	cred = get_cred(lo-&gt;plh_lc_cred);</div><div class='add'>+	pnfs_get_layout_hdr(lo);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='add'>+	return pnfs_send_layoutreturn(lo, &amp;zero_stateid, &amp;cred, IOMODE_ANY,</div><div class='add'>+				      PNFS_FL_LAYOUTRETURN_PRIVILEGED);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool pnfs_roc(struct inode *ino,</div><div class='ctx'> 		struct nfs4_layoutreturn_args *args,</div><div class='ctx'> 		struct nfs4_layoutreturn_res *res,</div><div class='hunk'>@@ -1520,7 +1635,7 @@ out_noroc:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (layoutreturn)</div><div class='del'>-		pnfs_send_layoutreturn(lo, &amp;stateid, &amp;lc_cred, iomode, true);</div><div class='add'>+		pnfs_send_layoutreturn(lo, &amp;stateid, &amp;lc_cred, iomode, 0);</div><div class='ctx'> 	pnfs_put_layout_hdr(lo);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -1542,6 +1657,18 @@ int pnfs_roc_done(struct rpc_task *task, struct nfs4_layoutreturn_args **argpp,</div><div class='ctx'> 		/* Was there an RPC level error? If not, retry */</div><div class='ctx'> 		if (task-&gt;tk_rpc_status == 0)</div><div class='ctx'> 			break;</div><div class='add'>+		/*</div><div class='add'>+		 * Is there a fatal network level error?</div><div class='add'>+		 * If so release the layout, but flag the error.</div><div class='add'>+		 */</div><div class='add'>+		if ((task-&gt;tk_rpc_status == -ENETDOWN ||</div><div class='add'>+		     task-&gt;tk_rpc_status == -ENETUNREACH) &amp;&amp;</div><div class='add'>+		    task-&gt;tk_flags &amp; RPC_TASK_NETUNREACH_FATAL) {</div><div class='add'>+			*ret = 0;</div><div class='add'>+			(*respp)-&gt;lrs_present = 0;</div><div class='add'>+			retval = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		/* If the call was not sent, let caller handle it */</div><div class='ctx'> 		if (!RPC_WAS_SENT(task))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1570,22 +1697,24 @@ int pnfs_roc_done(struct rpc_task *task, struct nfs4_layoutreturn_args **argpp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pnfs_roc_release(struct nfs4_layoutreturn_args *args,</div><div class='del'>-		struct nfs4_layoutreturn_res *res,</div><div class='del'>-		int ret)</div><div class='add'>+		      struct nfs4_layoutreturn_res *res, int ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnfs_layout_hdr *lo = args-&gt;layout;</div><div class='ctx'> 	struct inode *inode = args-&gt;inode;</div><div class='ctx'> 	const nfs4_stateid *res_stateid = NULL;</div><div class='ctx'> 	struct nfs4_xdr_opaque_data *ld_private = args-&gt;ld_private;</div><div class='add'>+	LIST_HEAD(freeme);</div><div class='ctx'> </div><div class='ctx'> 	switch (ret) {</div><div class='add'>+	case -NFS4ERR_BADSESSION:</div><div class='add'>+	case -NFS4ERR_DEADSESSION:</div><div class='add'>+	case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:</div><div class='ctx'> 	case -NFS4ERR_NOMATCHING_LAYOUT:</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (pnfs_layout_is_valid(lo) &amp;&amp;</div><div class='del'>-		    nfs4_stateid_match_other(&amp;args-&gt;stateid, &amp;lo-&gt;plh_stateid))</div><div class='del'>-			pnfs_set_plh_return_info(lo, args-&gt;range.iomode, 0);</div><div class='del'>-		pnfs_clear_layoutreturn_waitbit(lo);</div><div class='add'>+		pnfs_layoutreturn_retry_later_locked(lo, &amp;args-&gt;stateid,</div><div class='add'>+						     &amp;args-&gt;range, &amp;freeme);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		pnfs_free_lseg_list(&amp;freeme);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		if (res-&gt;lrs_present)</div><div class='hunk'>@@ -1922,8 +2051,10 @@ static void nfs_layoutget_begin(struct pnfs_layout_hdr *lo)</div><div class='ctx'> static void nfs_layoutget_end(struct pnfs_layout_hdr *lo)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;lo-&gt;plh_outstanding) &amp;&amp;</div><div class='del'>-	    test_and_clear_bit(NFS_LAYOUT_DRAIN, &amp;lo-&gt;plh_flags))</div><div class='add'>+	    test_and_clear_bit(NFS_LAYOUT_DRAIN, &amp;lo-&gt;plh_flags)) {</div><div class='add'>+		smp_mb__after_atomic();</div><div class='ctx'> 		wake_up_bit(&amp;lo-&gt;plh_flags, NFS_LAYOUT_DRAIN);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool pnfs_is_first_layoutget(struct pnfs_layout_hdr *lo)</div><div class='hunk'>@@ -1999,6 +2130,14 @@ pnfs_update_layout(struct inode *ino,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> lookup_again:</div><div class='add'>+	if (!nfs4_valid_open_stateid(ctx-&gt;state)) {</div><div class='add'>+		trace_pnfs_update_layout(ino, pos, count,</div><div class='add'>+					 iomode, lo, lseg,</div><div class='add'>+					 PNFS_UPDATE_LAYOUT_INVALID_OPEN);</div><div class='add'>+		lseg = ERR_PTR(-EIO);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	lseg = ERR_PTR(nfs4_client_recover_expired_lease(clp));</div><div class='ctx'> 	if (IS_ERR(lseg))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2558,7 +2697,8 @@ pnfs_mark_layout_for_return(struct inode *inode,</div><div class='ctx'> 		return_now = pnfs_prepare_layoutreturn(lo, &amp;stateid, &amp;cred, &amp;iomode);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		if (return_now)</div><div class='del'>-			pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, iomode, false);</div><div class='add'>+			pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, iomode,</div><div class='add'>+					       PNFS_FL_LAYOUTRETURN_ASYNC);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		nfs_commit_inode(inode, 0);</div><div class='hunk'>@@ -2674,7 +2814,8 @@ restart:</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, iomode, false);</div><div class='add'>+		pnfs_send_layoutreturn(lo, &amp;stateid, &amp;cred, iomode,</div><div class='add'>+				       PNFS_FL_LAYOUTRETURN_ASYNC);</div><div class='ctx'> 		pnfs_put_layout_hdr(lo);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		goto restart;</div><div class='hunk'>@@ -2697,38 +2838,28 @@ pnfs_layout_return_unused_byclid(struct nfs_client *clp,</div><div class='ctx'> 			&amp;range);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Check if we have we have a valid layout but if there isn't an intersection</div><div class='add'>+ * between the request and the pgio-&gt;pg_lseg, put this pgio-&gt;pg_lseg away.</div><div class='add'>+ */</div><div class='ctx'> void</div><div class='del'>-pnfs_generic_pg_check_layout(struct nfs_pageio_descriptor *pgio)</div><div class='add'>+pnfs_generic_pg_check_layout(struct nfs_pageio_descriptor *pgio,</div><div class='add'>+			     struct nfs_page *req)</div><div class='ctx'> {</div><div class='ctx'> 	if (pgio-&gt;pg_lseg == NULL ||</div><div class='del'>-	    test_bit(NFS_LSEG_VALID, &amp;pgio-&gt;pg_lseg-&gt;pls_flags))</div><div class='add'>+	    (test_bit(NFS_LSEG_VALID, &amp;pgio-&gt;pg_lseg-&gt;pls_flags) &amp;&amp;</div><div class='add'>+	    pnfs_lseg_request_intersecting(pgio-&gt;pg_lseg, req)))</div><div class='ctx'> 		return;</div><div class='ctx'> 	pnfs_put_lseg(pgio-&gt;pg_lseg);</div><div class='ctx'> 	pgio-&gt;pg_lseg = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pnfs_generic_pg_check_layout);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check for any intersection between the request and the pgio-&gt;pg_lseg,</div><div class='del'>- * and if none, put this pgio-&gt;pg_lseg away.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pnfs_generic_pg_check_range(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)</div><div class='del'>-{</div><div class='del'>-	if (pgio-&gt;pg_lseg &amp;&amp; !pnfs_lseg_request_intersecting(pgio-&gt;pg_lseg, req)) {</div><div class='del'>-		pnfs_put_lseg(pgio-&gt;pg_lseg);</div><div class='del'>-		pgio-&gt;pg_lseg = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(pnfs_generic_pg_check_range);</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rd_size;</div><div class='ctx'> </div><div class='del'>-	pnfs_generic_pg_check_layout(pgio);</div><div class='del'>-	pnfs_generic_pg_check_range(pgio, req);</div><div class='add'>+	pnfs_generic_pg_check_layout(pgio, req);</div><div class='ctx'> 	if (pgio-&gt;pg_lseg == NULL) {</div><div class='ctx'> 		if (pgio-&gt;pg_dreq == NULL)</div><div class='ctx'> 			rd_size = i_size_read(pgio-&gt;pg_inode) - req_offset(req);</div><div class='hunk'>@@ -2758,8 +2889,7 @@ void</div><div class='ctx'> pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 			   struct nfs_page *req, u64 wb_size)</div><div class='ctx'> {</div><div class='del'>-	pnfs_generic_pg_check_layout(pgio);</div><div class='del'>-	pnfs_generic_pg_check_range(pgio, req);</div><div class='add'>+	pnfs_generic_pg_check_layout(pgio, req);</div><div class='ctx'> 	if (pgio-&gt;pg_lseg == NULL) {</div><div class='ctx'> 		pgio-&gt;pg_lseg =</div><div class='ctx'> 			pnfs_update_layout(pgio-&gt;pg_inode, nfs_req_openctx(req),</div><div class='hunk'>@@ -3202,6 +3332,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync)</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> 	loff_t end_pos;</div><div class='ctx'> 	int status;</div><div class='add'>+	bool mark_as_dirty = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!pnfs_layoutcommit_outstanding(inode))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -3253,19 +3384,23 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync)</div><div class='ctx'> 	if (ld-&gt;prepare_layoutcommit) {</div><div class='ctx'> 		status = ld-&gt;prepare_layoutcommit(&amp;data-&gt;args);</div><div class='ctx'> 		if (status) {</div><div class='del'>-			put_cred(data-&gt;cred);</div><div class='add'>+			if (status != -ENOSPC)</div><div class='add'>+				put_cred(data-&gt;cred);</div><div class='ctx'> 			spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			set_bit(NFS_INO_LAYOUTCOMMIT, &amp;nfsi-&gt;flags);</div><div class='ctx'> 			if (end_pos &gt; nfsi-&gt;layout-&gt;plh_lwb)</div><div class='ctx'> 				nfsi-&gt;layout-&gt;plh_lwb = end_pos;</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			if (status != -ENOSPC)</div><div class='add'>+				goto out_unlock;</div><div class='add'>+			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+			mark_as_dirty = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_proc_layoutcommit(data, sync);</div><div class='ctx'> out:</div><div class='del'>-	if (status)</div><div class='add'>+	if (status || mark_as_dirty)</div><div class='ctx'> 		mark_inode_dirty_sync(inode);</div><div class='ctx'> 	dprintk("&lt;-- %s status %d\n", __func__, status);</div><div class='ctx'> 	return status;</div><div class='head'>diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h<br/>index db57a85500ee..91ff877185c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/pnfs.h</a></div><div class='hunk'>@@ -60,6 +60,7 @@ struct nfs4_pnfs_ds {</div><div class='ctx'> 	struct list_head	ds_node;  /* nfs4_pnfs_dev_hlist dev_dslist */</div><div class='ctx'> 	char			*ds_remotestr;	/* comma sep list of addrs */</div><div class='ctx'> 	struct list_head	ds_addrs;</div><div class='add'>+	const struct net	*ds_net;</div><div class='ctx'> 	struct nfs_client	*ds_clp;</div><div class='ctx'> 	refcount_t		ds_count;</div><div class='ctx'> 	unsigned long		ds_state;</div><div class='hunk'>@@ -118,6 +119,12 @@ enum layoutdriver_policy_flags {</div><div class='ctx'> 	PNFS_LAYOUTGET_ON_OPEN		= 1 &lt;&lt; 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum pnfs_layout_destroy_mode {</div><div class='add'>+	PNFS_LAYOUT_INVALIDATE = 0,</div><div class='add'>+	PNFS_LAYOUT_BULK_RETURN,</div><div class='add'>+	PNFS_LAYOUT_FILE_BULK_RETURN,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nfs4_deviceid_node;</div><div class='ctx'> </div><div class='ctx'> /* Per-layout driver specific registration structure */</div><div class='hunk'>@@ -127,7 +134,6 @@ struct pnfs_layoutdriver_type {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	unsigned flags;</div><div class='del'>-	unsigned max_deviceinfo_size;</div><div class='ctx'> 	unsigned max_layoutget_response;</div><div class='ctx'> </div><div class='ctx'> 	int (*set_layoutdriver) (struct nfs_server *, const struct nfs_fh *);</div><div class='hunk'>@@ -193,8 +199,6 @@ struct pnfs_commit_ops {</div><div class='ctx'> 				  int max);</div><div class='ctx'> 	void (*recover_commit_reqs) (struct list_head *list,</div><div class='ctx'> 				     struct nfs_commit_info *cinfo);</div><div class='del'>-	struct nfs_page * (*search_commit_reqs)(struct nfs_commit_info *cinfo,</div><div class='del'>-						struct folio *folio);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pnfs_layout_hdr {</div><div class='hunk'>@@ -242,6 +246,9 @@ extern const struct pnfs_layoutdriver_type *pnfs_find_layoutdriver(u32 id);</div><div class='ctx'> extern void pnfs_put_layoutdriver(const struct pnfs_layoutdriver_type *ld);</div><div class='ctx'> </div><div class='ctx'> /* nfs4proc.c */</div><div class='add'>+#define PNFS_FL_LAYOUTRETURN_ASYNC (1U &lt;&lt; 0)</div><div class='add'>+#define PNFS_FL_LAYOUTRETURN_PRIVILEGED (1U &lt;&lt; 1)</div><div class='add'>+</div><div class='ctx'> extern size_t max_response_pages(struct nfs_server *server);</div><div class='ctx'> extern int nfs4_proc_getdeviceinfo(struct nfs_server *server,</div><div class='ctx'> 				   struct pnfs_device *dev,</div><div class='hunk'>@@ -249,7 +256,8 @@ extern int nfs4_proc_getdeviceinfo(struct nfs_server *server,</div><div class='ctx'> extern struct pnfs_layout_segment *</div><div class='ctx'> nfs4_proc_layoutget(struct nfs4_layoutget *lgp,</div><div class='ctx'> 		    struct nfs4_exception *exception);</div><div class='del'>-extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync);</div><div class='add'>+extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp,</div><div class='add'>+				  unsigned int flags);</div><div class='ctx'> </div><div class='ctx'> /* pnfs.c */</div><div class='ctx'> void pnfs_get_layout_hdr(struct pnfs_layout_hdr *lo);</div><div class='hunk'>@@ -257,8 +265,7 @@ void pnfs_put_lseg(struct pnfs_layout_segment *lseg);</div><div class='ctx'> </div><div class='ctx'> void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, struct nfs_fsinfo *);</div><div class='ctx'> void unset_pnfs_layoutdriver(struct nfs_server *);</div><div class='del'>-void pnfs_generic_pg_check_layout(struct nfs_pageio_descriptor *pgio);</div><div class='del'>-void pnfs_generic_pg_check_range(struct nfs_pageio_descriptor *pgio, struct nfs_page *req);</div><div class='add'>+void pnfs_generic_pg_check_layout(struct nfs_pageio_descriptor *pgio, struct nfs_page *req);</div><div class='ctx'> void pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *, struct nfs_page *);</div><div class='ctx'> int pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc);</div><div class='ctx'> void pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio,</div><div class='hunk'>@@ -274,11 +281,10 @@ void pnfs_free_lseg_list(struct list_head *tmp_list);</div><div class='ctx'> void pnfs_destroy_layout(struct nfs_inode *);</div><div class='ctx'> void pnfs_destroy_layout_final(struct nfs_inode *);</div><div class='ctx'> void pnfs_destroy_all_layouts(struct nfs_client *);</div><div class='del'>-int pnfs_destroy_layouts_byfsid(struct nfs_client *clp,</div><div class='del'>-		struct nfs_fsid *fsid,</div><div class='del'>-		bool is_recall);</div><div class='del'>-int pnfs_destroy_layouts_byclid(struct nfs_client *clp,</div><div class='del'>-		bool is_recall);</div><div class='add'>+int pnfs_layout_destroy_byfsid(struct nfs_client *clp, struct nfs_fsid *fsid,</div><div class='add'>+			       enum pnfs_layout_destroy_mode mode);</div><div class='add'>+int pnfs_layout_destroy_byclid(struct nfs_client *clp,</div><div class='add'>+			       enum pnfs_layout_destroy_mode mode);</div><div class='ctx'> bool nfs4_layout_refresh_old_stateid(nfs4_stateid *dst,</div><div class='ctx'> 		struct pnfs_layout_range *dst_range,</div><div class='ctx'> 		struct inode *inode);</div><div class='hunk'>@@ -324,6 +330,9 @@ struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino,</div><div class='ctx'> 					       enum pnfs_iomode iomode,</div><div class='ctx'> 					       bool strict_iomode,</div><div class='ctx'> 					       gfp_t gfp_flags);</div><div class='add'>+void pnfs_layoutreturn_retry_later(struct pnfs_layout_hdr *lo,</div><div class='add'>+				   const nfs4_stateid *arg_stateid,</div><div class='add'>+				   const struct pnfs_layout_range *range);</div><div class='ctx'> void pnfs_layoutreturn_free_lsegs(struct pnfs_layout_hdr *lo,</div><div class='ctx'> 		const nfs4_stateid *arg_stateid,</div><div class='ctx'> 		const struct pnfs_layout_range *range,</div><div class='hunk'>@@ -345,6 +354,7 @@ void pnfs_error_mark_layout_for_return(struct inode *inode,</div><div class='ctx'> 				       struct pnfs_layout_segment *lseg);</div><div class='ctx'> void pnfs_layout_return_unused_byclid(struct nfs_client *clp,</div><div class='ctx'> 				      enum pnfs_iomode iomode);</div><div class='add'>+int pnfs_layout_handle_reboot(struct nfs_client *clp);</div><div class='ctx'> </div><div class='ctx'> /* nfs4_deviceid_flags */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -397,8 +407,6 @@ void pnfs_generic_prepare_to_resend_writes(struct nfs_commit_data *data);</div><div class='ctx'> void pnfs_generic_rw_release(void *data);</div><div class='ctx'> void pnfs_generic_recover_commit_reqs(struct list_head *dst,</div><div class='ctx'> 				      struct nfs_commit_info *cinfo);</div><div class='del'>-struct nfs_page *pnfs_generic_search_commit_reqs(struct nfs_commit_info *cinfo,</div><div class='del'>-						 struct folio *folio);</div><div class='ctx'> int pnfs_generic_commit_pagelist(struct inode *inode,</div><div class='ctx'> 				 struct list_head *mds_pages,</div><div class='ctx'> 				 int how,</div><div class='hunk'>@@ -408,7 +416,8 @@ int pnfs_generic_commit_pagelist(struct inode *inode,</div><div class='ctx'> int pnfs_generic_scan_commit_lists(struct nfs_commit_info *cinfo, int max);</div><div class='ctx'> void pnfs_generic_write_commit_done(struct rpc_task *task, void *data);</div><div class='ctx'> void nfs4_pnfs_ds_put(struct nfs4_pnfs_ds *ds);</div><div class='del'>-struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs,</div><div class='add'>+struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(const struct net *net,</div><div class='add'>+				      struct list_head *dsaddrs,</div><div class='ctx'> 				      gfp_t gfp_flags);</div><div class='ctx'> void nfs4_pnfs_v3_ds_connect_unload(void);</div><div class='ctx'> int nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,</div><div class='hunk'>@@ -558,17 +567,6 @@ pnfs_recover_commit_reqs(struct list_head *head, struct nfs_commit_info *cinfo)</div><div class='ctx'> 		fl_cinfo-&gt;ops-&gt;recover_commit_reqs(head, cinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct nfs_page *</div><div class='del'>-pnfs_search_commit_reqs(struct inode *inode, struct nfs_commit_info *cinfo,</div><div class='del'>-			struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct pnfs_ds_commit_info *fl_cinfo = cinfo-&gt;ds;</div><div class='del'>-</div><div class='del'>-	if (!fl_cinfo-&gt;ops || !fl_cinfo-&gt;ops-&gt;search_commit_reqs)</div><div class='del'>-		return NULL;</div><div class='del'>-	return fl_cinfo-&gt;ops-&gt;search_commit_reqs(cinfo, folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Should the pNFS client commit and return the layout upon a setattr */</div><div class='ctx'> static inline bool</div><div class='ctx'> pnfs_ld_layoutret_on_setattr(struct inode *inode)</div><div class='hunk'>@@ -726,6 +724,11 @@ static inline void pnfs_destroy_layout_final(struct nfs_inode *nfsi)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int pnfs_layout_handle_reboot(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct pnfs_layout_segment *</div><div class='ctx'> pnfs_get_lseg(struct pnfs_layout_segment *lseg)</div><div class='ctx'> {</div><div class='hunk'>@@ -865,13 +868,6 @@ pnfs_recover_commit_reqs(struct list_head *head, struct nfs_commit_info *cinfo)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct nfs_page *</div><div class='del'>-pnfs_search_commit_reqs(struct inode *inode, struct nfs_commit_info *cinfo,</div><div class='del'>-			struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int pnfs_layoutcommit_inode(struct inode *inode, bool sync)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c<br/>index 178001c90156..bf0f2d67e96c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs_dev.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/pnfs_dev.c</a></div><div class='hunk'>@@ -110,9 +110,6 @@ nfs4_get_device_info(struct nfs_server *server,</div><div class='ctx'> 	 * GETDEVICEINFO's maxcount</div><div class='ctx'> 	 */</div><div class='ctx'> 	max_resp_sz = server-&gt;nfs_client-&gt;cl_session-&gt;fc_attrs.max_resp_sz;</div><div class='del'>-	if (server-&gt;pnfs_curr_ld-&gt;max_deviceinfo_size &amp;&amp;</div><div class='del'>-	    server-&gt;pnfs_curr_ld-&gt;max_deviceinfo_size &lt; max_resp_sz)</div><div class='del'>-		max_resp_sz = server-&gt;pnfs_curr_ld-&gt;max_deviceinfo_size;</div><div class='ctx'> 	max_pages = nfs_page_array_len(0, max_resp_sz);</div><div class='ctx'> 	dprintk("%s: server %p max_resp_sz %u max_pages %d\n",</div><div class='ctx'> 		__func__, server, max_resp_sz, max_pages);</div><div class='head'>diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c<br/>index afd23910f3bf..9976cc16b689 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs_nfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/pnfs_nfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/pnfs_nfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/pnfs_nfs.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #include "nfs4session.h"</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> #include "pnfs.h"</div><div class='add'>+#include "netns.h"</div><div class='add'>+#include "nfs4trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PNFS</div><div class='ctx'> </div><div class='hunk'>@@ -351,53 +353,6 @@ void pnfs_generic_recover_commit_reqs(struct list_head *dst,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pnfs_generic_recover_commit_reqs);</div><div class='ctx'> </div><div class='del'>-static struct nfs_page *</div><div class='del'>-pnfs_bucket_search_commit_reqs(struct pnfs_commit_bucket *buckets,</div><div class='del'>-			       unsigned int nbuckets, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *req;</div><div class='del'>-	struct pnfs_commit_bucket *b;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	/* Linearly search the commit lists for each bucket until a matching</div><div class='del'>-	 * request is found */</div><div class='del'>-	for (i = 0, b = buckets; i &lt; nbuckets; i++, b++) {</div><div class='del'>-		list_for_each_entry(req, &amp;b-&gt;written, wb_list) {</div><div class='del'>-			if (nfs_page_to_folio(req) == folio)</div><div class='del'>-				return req-&gt;wb_head;</div><div class='del'>-		}</div><div class='del'>-		list_for_each_entry(req, &amp;b-&gt;committing, wb_list) {</div><div class='del'>-			if (nfs_page_to_folio(req) == folio)</div><div class='del'>-				return req-&gt;wb_head;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pnfs_generic_search_commit_reqs - Search lists in @cinfo for the head request</div><div class='del'>- *				   for @folio</div><div class='del'>- * @cinfo - commit info for current inode</div><div class='del'>- * @folio - page to search for matching head request</div><div class='del'>- *</div><div class='del'>- * Return: the head request if one is found, otherwise %NULL.</div><div class='del'>- */</div><div class='del'>-struct nfs_page *pnfs_generic_search_commit_reqs(struct nfs_commit_info *cinfo,</div><div class='del'>-						 struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct pnfs_ds_commit_info *fl_cinfo = cinfo-&gt;ds;</div><div class='del'>-	struct pnfs_commit_array *array;</div><div class='del'>-	struct nfs_page *req;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(array, &amp;fl_cinfo-&gt;commits, cinfo_list) {</div><div class='del'>-		req = pnfs_bucket_search_commit_reqs(array-&gt;buckets,</div><div class='del'>-						     array-&gt;nbuckets, folio);</div><div class='del'>-		if (req)</div><div class='del'>-			return req;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(pnfs_generic_search_commit_reqs);</div><div class='del'>-</div><div class='ctx'> static struct pnfs_layout_segment *</div><div class='ctx'> pnfs_bucket_get_committing(struct list_head *head,</div><div class='ctx'> 			   struct pnfs_commit_bucket *bucket,</div><div class='hunk'>@@ -537,7 +492,7 @@ pnfs_generic_commit_pagelist(struct inode *inode, struct list_head *mds_pages,</div><div class='ctx'> 			nfs_initiate_commit(NFS_CLIENT(inode), data,</div><div class='ctx'> 					    NFS_PROTO(data-&gt;inode),</div><div class='ctx'> 					    data-&gt;mds_ops, how,</div><div class='del'>-					    RPC_TASK_CRED_NOREF);</div><div class='add'>+					    RPC_TASK_CRED_NOREF, NULL);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			nfs_init_commit(data, NULL, data-&gt;lseg, cinfo);</div><div class='ctx'> 			initiate_commit(data, how);</div><div class='hunk'>@@ -551,14 +506,14 @@ EXPORT_SYMBOL_GPL(pnfs_generic_commit_pagelist);</div><div class='ctx'> /*</div><div class='ctx'>  * Data server cache</div><div class='ctx'>  *</div><div class='del'>- * Data servers can be mapped to different device ids.</div><div class='del'>- * nfs4_pnfs_ds reference counting</div><div class='add'>+ * Data servers can be mapped to different device ids, but should</div><div class='add'>+ * never be shared between net namespaces.</div><div class='add'>+ *</div><div class='add'>+ * nfs4_pnfs_ds reference counting:</div><div class='ctx'>  *   - set to 1 on allocation</div><div class='ctx'>  *   - incremented when a device id maps a data server already in the cache.</div><div class='ctx'>  *   - decremented when deviceid is removed from the cache.</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_SPINLOCK(nfs4_ds_cache_lock);</div><div class='del'>-static LIST_HEAD(nfs4_data_server_cache);</div><div class='ctx'> </div><div class='ctx'> /* Debug routines */</div><div class='ctx'> static void</div><div class='hunk'>@@ -651,11 +606,11 @@ _same_data_server_addrs_locked(const struct list_head *dsaddrs1,</div><div class='ctx'>  * Lookup DS by addresses.  nfs4_ds_cache_lock is held</div><div class='ctx'>  */</div><div class='ctx'> static struct nfs4_pnfs_ds *</div><div class='del'>-_data_server_lookup_locked(const struct list_head *dsaddrs)</div><div class='add'>+_data_server_lookup_locked(const struct nfs_net *nn, const struct list_head *dsaddrs)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_pnfs_ds *ds;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(ds, &amp;nfs4_data_server_cache, ds_node)</div><div class='add'>+	list_for_each_entry(ds, &amp;nn-&gt;nfs4_data_server_cache, ds_node)</div><div class='ctx'> 		if (_same_data_server_addrs_locked(&amp;ds-&gt;ds_addrs, dsaddrs))</div><div class='ctx'> 			return ds;</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -700,10 +655,11 @@ static void destroy_ds(struct nfs4_pnfs_ds *ds)</div><div class='ctx'> </div><div class='ctx'> void nfs4_pnfs_ds_put(struct nfs4_pnfs_ds *ds)</div><div class='ctx'> {</div><div class='del'>-	if (refcount_dec_and_lock(&amp;ds-&gt;ds_count,</div><div class='del'>-				&amp;nfs4_ds_cache_lock)) {</div><div class='add'>+	struct nfs_net *nn = net_generic(ds-&gt;ds_net, nfs_net_id);</div><div class='add'>+</div><div class='add'>+	if (refcount_dec_and_lock(&amp;ds-&gt;ds_count, &amp;nn-&gt;nfs4_data_server_lock)) {</div><div class='ctx'> 		list_del_init(&amp;ds-&gt;ds_node);</div><div class='del'>-		spin_unlock(&amp;nfs4_ds_cache_lock);</div><div class='add'>+		spin_unlock(&amp;nn-&gt;nfs4_data_server_lock);</div><div class='ctx'> 		destroy_ds(ds);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -763,8 +719,9 @@ out_err:</div><div class='ctx'>  * uncached and return cached struct nfs4_pnfs_ds.</div><div class='ctx'>  */</div><div class='ctx'> struct nfs4_pnfs_ds *</div><div class='del'>-nfs4_pnfs_ds_add(struct list_head *dsaddrs, gfp_t gfp_flags)</div><div class='add'>+nfs4_pnfs_ds_add(const struct net *net, struct list_head *dsaddrs, gfp_t gfp_flags)</div><div class='ctx'> {</div><div class='add'>+	struct nfs_net *nn = net_generic(net, nfs_net_id);</div><div class='ctx'> 	struct nfs4_pnfs_ds *tmp_ds, *ds = NULL;</div><div class='ctx'> 	char *remotestr;</div><div class='ctx'> </div><div class='hunk'>@@ -780,16 +737,17 @@ nfs4_pnfs_ds_add(struct list_head *dsaddrs, gfp_t gfp_flags)</div><div class='ctx'> 	/* this is only used for debugging, so it's ok if its NULL */</div><div class='ctx'> 	remotestr = nfs4_pnfs_remotestr(dsaddrs, gfp_flags);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;nfs4_ds_cache_lock);</div><div class='del'>-	tmp_ds = _data_server_lookup_locked(dsaddrs);</div><div class='add'>+	spin_lock(&amp;nn-&gt;nfs4_data_server_lock);</div><div class='add'>+	tmp_ds = _data_server_lookup_locked(nn, dsaddrs);</div><div class='ctx'> 	if (tmp_ds == NULL) {</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;ds-&gt;ds_addrs);</div><div class='ctx'> 		list_splice_init(dsaddrs, &amp;ds-&gt;ds_addrs);</div><div class='ctx'> 		ds-&gt;ds_remotestr = remotestr;</div><div class='ctx'> 		refcount_set(&amp;ds-&gt;ds_count, 1);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;ds-&gt;ds_node);</div><div class='add'>+		ds-&gt;ds_net = net;</div><div class='ctx'> 		ds-&gt;ds_clp = NULL;</div><div class='del'>-		list_add(&amp;ds-&gt;ds_node, &amp;nfs4_data_server_cache);</div><div class='add'>+		list_add(&amp;ds-&gt;ds_node, &amp;nn-&gt;nfs4_data_server_cache);</div><div class='ctx'> 		dprintk("%s add new data server %s\n", __func__,</div><div class='ctx'> 			ds-&gt;ds_remotestr);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -801,7 +759,7 @@ nfs4_pnfs_ds_add(struct list_head *dsaddrs, gfp_t gfp_flags)</div><div class='ctx'> 			refcount_read(&amp;tmp_ds-&gt;ds_count));</div><div class='ctx'> 		ds = tmp_ds;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;nfs4_ds_cache_lock);</div><div class='add'>+	spin_unlock(&amp;nn-&gt;nfs4_data_server_lock);</div><div class='ctx'> out:</div><div class='ctx'> 	return ds;</div><div class='ctx'> }</div><div class='hunk'>@@ -851,8 +809,11 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 				 unsigned int retrans)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_client *clp = ERR_PTR(-EIO);</div><div class='add'>+	struct nfs_client *mds_clp = mds_srv-&gt;nfs_client;</div><div class='add'>+	enum xprtsec_policies xprtsec_policy = mds_clp-&gt;cl_xprtsec.policy;</div><div class='ctx'> 	struct nfs4_pnfs_ds_addr *da;</div><div class='ctx'> 	unsigned long connect_timeout = timeo * (retrans + 1) * HZ / 10;</div><div class='add'>+	int ds_proto;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("--&gt; %s DS %s\n", __func__, ds-&gt;ds_remotestr);</div><div class='hunk'>@@ -873,21 +834,31 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 				.servername = clp-&gt;cl_hostname,</div><div class='ctx'> 				.connect_timeout = connect_timeout,</div><div class='ctx'> 				.reconnect_timeout = connect_timeout,</div><div class='add'>+				.xprtsec = clp-&gt;cl_xprtsec,</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			if (da-&gt;da_transport != clp-&gt;cl_proto)</div><div class='add'>+			if (xprt_args.ident == XPRT_TRANSPORT_TCP &amp;&amp;</div><div class='add'>+			    clp-&gt;cl_proto == XPRT_TRANSPORT_TCP_TLS)</div><div class='add'>+				xprt_args.ident = XPRT_TRANSPORT_TCP_TLS;</div><div class='add'>+</div><div class='add'>+			if (xprt_args.ident != clp-&gt;cl_proto)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (da-&gt;da_addr.ss_family != clp-&gt;cl_addr.ss_family)</div><div class='add'>+			if (xprt_args.dstaddr-&gt;sa_family !=</div><div class='add'>+			    clp-&gt;cl_addr.ss_family)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			/* Add this address as an alias */</div><div class='ctx'> 			rpc_clnt_add_xprt(clp-&gt;cl_rpcclient, &amp;xprt_args,</div><div class='del'>-					rpc_clnt_test_and_add_xprt, NULL);</div><div class='add'>+					  rpc_clnt_test_and_add_xprt, NULL);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		clp = get_v3_ds_connect(mds_srv,</div><div class='del'>-				&amp;da-&gt;da_addr,</div><div class='del'>-				da-&gt;da_addrlen, da-&gt;da_transport,</div><div class='del'>-				timeo, retrans);</div><div class='add'>+</div><div class='add'>+		ds_proto = da-&gt;da_transport;</div><div class='add'>+		if (ds_proto == XPRT_TRANSPORT_TCP &amp;&amp;</div><div class='add'>+		    xprtsec_policy != RPC_XPRTSEC_NONE)</div><div class='add'>+			ds_proto = XPRT_TRANSPORT_TCP_TLS;</div><div class='add'>+</div><div class='add'>+		clp = get_v3_ds_connect(mds_srv, &amp;da-&gt;da_addr, da-&gt;da_addrlen,</div><div class='add'>+					ds_proto, timeo, retrans);</div><div class='ctx'> 		if (IS_ERR(clp))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		clp-&gt;cl_rpcclient-&gt;cl_softerr = 0;</div><div class='hunk'>@@ -913,12 +884,17 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 				 u32 minor_version)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_client *clp = ERR_PTR(-EIO);</div><div class='add'>+	struct nfs_client *mds_clp = mds_srv-&gt;nfs_client;</div><div class='add'>+	enum xprtsec_policies xprtsec_policy = mds_clp-&gt;cl_xprtsec.policy;</div><div class='ctx'> 	struct nfs4_pnfs_ds_addr *da;</div><div class='add'>+	int ds_proto;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("--&gt; %s DS %s\n", __func__, ds-&gt;ds_remotestr);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(da, &amp;ds-&gt;ds_addrs, da_node) {</div><div class='add'>+		char servername[48];</div><div class='add'>+</div><div class='ctx'> 		dprintk("%s: DS %s: trying address %s\n",</div><div class='ctx'> 			__func__, ds-&gt;ds_remotestr, da-&gt;da_remotestr);</div><div class='ctx'> </div><div class='hunk'>@@ -929,6 +905,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 				.dstaddr = (struct sockaddr *)&amp;da-&gt;da_addr,</div><div class='ctx'> 				.addrlen = da-&gt;da_addrlen,</div><div class='ctx'> 				.servername = clp-&gt;cl_hostname,</div><div class='add'>+				.xprtsec = clp-&gt;cl_xprtsec,</div><div class='ctx'> 			};</div><div class='ctx'> 			struct nfs4_add_xprt_data xprtdata = {</div><div class='ctx'> 				.clp = clp,</div><div class='hunk'>@@ -938,10 +915,44 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 				.data = &amp;xprtdata,</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			if (da-&gt;da_transport != clp-&gt;cl_proto)</div><div class='add'>+			if (xprt_args.ident == XPRT_TRANSPORT_TCP &amp;&amp;</div><div class='add'>+			    clp-&gt;cl_proto == XPRT_TRANSPORT_TCP_TLS) {</div><div class='add'>+				struct sockaddr *addr =</div><div class='add'>+					(struct sockaddr *)&amp;da-&gt;da_addr;</div><div class='add'>+				struct sockaddr_in *sin =</div><div class='add'>+					(struct sockaddr_in *)&amp;da-&gt;da_addr;</div><div class='add'>+				struct sockaddr_in6 *sin6 =</div><div class='add'>+					(struct sockaddr_in6 *)&amp;da-&gt;da_addr;</div><div class='add'>+</div><div class='add'>+				/* for NFS with TLS we need to supply a correct</div><div class='add'>+				 * servername of the trunked transport, not the</div><div class='add'>+				 * servername of the main transport stored in</div><div class='add'>+				 * clp-&gt;cl_hostname. And set the protocol to</div><div class='add'>+				 * indicate to use TLS</div><div class='add'>+				 */</div><div class='add'>+				servername[0] = '\0';</div><div class='add'>+				switch(addr-&gt;sa_family) {</div><div class='add'>+				case AF_INET:</div><div class='add'>+					snprintf(servername, sizeof(servername),</div><div class='add'>+						"%pI4", &amp;sin-&gt;sin_addr.s_addr);</div><div class='add'>+					break;</div><div class='add'>+				case AF_INET6:</div><div class='add'>+					snprintf(servername, sizeof(servername),</div><div class='add'>+						"%pI6", &amp;sin6-&gt;sin6_addr);</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					/* do not consider this address */</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				xprt_args.ident = XPRT_TRANSPORT_TCP_TLS;</div><div class='add'>+				xprt_args.servername = servername;</div><div class='add'>+			}</div><div class='add'>+			if (xprt_args.ident != clp-&gt;cl_proto)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (da-&gt;da_addr.ss_family != clp-&gt;cl_addr.ss_family)</div><div class='add'>+			if (xprt_args.dstaddr-&gt;sa_family !=</div><div class='add'>+			    clp-&gt;cl_addr.ss_family)</div><div class='ctx'> 				continue;</div><div class='add'>+</div><div class='ctx'> 			/**</div><div class='ctx'> 			* Test this address for session trunking and</div><div class='ctx'> 			* add as an alias</div><div class='hunk'>@@ -953,11 +964,14 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 			if (xprtdata.cred)</div><div class='ctx'> 				put_cred(xprtdata.cred);</div><div class='ctx'> 		} else {</div><div class='del'>-			clp = nfs4_set_ds_client(mds_srv,</div><div class='del'>-						&amp;da-&gt;da_addr,</div><div class='del'>-						da-&gt;da_addrlen,</div><div class='del'>-						da-&gt;da_transport, timeo,</div><div class='del'>-						retrans, minor_version);</div><div class='add'>+			ds_proto = da-&gt;da_transport;</div><div class='add'>+			if (ds_proto == XPRT_TRANSPORT_TCP &amp;&amp;</div><div class='add'>+			    xprtsec_policy != RPC_XPRTSEC_NONE)</div><div class='add'>+				ds_proto = XPRT_TRANSPORT_TCP_TLS;</div><div class='add'>+</div><div class='add'>+			clp = nfs4_set_ds_client(mds_srv, &amp;da-&gt;da_addr,</div><div class='add'>+						 da-&gt;da_addrlen, ds_proto,</div><div class='add'>+						 timeo, retrans, minor_version);</div><div class='ctx'> 			if (IS_ERR(clp))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -968,7 +982,6 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,</div><div class='ctx'> 				clp = ERR_PTR(-EIO);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -999,8 +1012,10 @@ int nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,</div><div class='ctx'> 		err = nfs4_wait_ds_connect(ds);</div><div class='ctx'> 		if (err || ds-&gt;ds_clp)</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (nfs4_test_deviceid_unavailable(devid))</div><div class='del'>-			return -ENODEV;</div><div class='add'>+		if (nfs4_test_deviceid_unavailable(devid)) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} while (test_and_set_bit(NFS4DS_CONNECTING, &amp;ds-&gt;ds_state) != 0);</div><div class='ctx'> </div><div class='ctx'> 	if (ds-&gt;ds_clp)</div><div class='hunk'>@@ -1030,11 +1045,12 @@ out:</div><div class='ctx'> 		if (!ds-&gt;ds_clp || !nfs_client_init_is_complete(ds-&gt;ds_clp)) {</div><div class='ctx'> 			WARN_ON_ONCE(ds-&gt;ds_clp ||</div><div class='ctx'> 				!nfs4_test_deviceid_unavailable(devid));</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		err = nfs_client_init_status(ds-&gt;ds_clp);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		} else</div><div class='add'>+			err = nfs_client_init_status(ds-&gt;ds_clp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	trace_pnfs_ds_connect(ds-&gt;ds_remotestr, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs4_pnfs_ds_connect);</div><div class='head'>diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c<br/>index ad3a321ae997..63e71310b9f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/proc.c</a></div><div class='hunk'>@@ -153,13 +153,13 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfs_proc_lookup(struct inode *dir, struct dentry *dentry,</div><div class='add'>+nfs_proc_lookup(struct inode *dir, struct dentry *dentry, const struct qstr *name,</div><div class='ctx'> 		struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_diropargs	arg = {</div><div class='ctx'> 		.fh		= NFS_FH(dir),</div><div class='del'>-		.name		= dentry-&gt;d_name.name,</div><div class='del'>-		.len		= dentry-&gt;d_name.len</div><div class='add'>+		.name		= name-&gt;name,</div><div class='add'>+		.len		= name-&gt;len</div><div class='ctx'> 	};</div><div class='ctx'> 	struct nfs_diropok	res = {</div><div class='ctx'> 		.fh		= fhandle,</div><div class='hunk'>@@ -446,13 +446,14 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static struct dentry *</div><div class='ctx'> nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_createdata *data;</div><div class='ctx'> 	struct rpc_message msg = {</div><div class='ctx'> 		.rpc_proc	= &amp;nfs_procedures[NFSPROC_MKDIR],</div><div class='ctx'> 	};</div><div class='add'>+	struct dentry *alias = NULL;</div><div class='ctx'> 	int status = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS call  mkdir %pd\n", dentry);</div><div class='hunk'>@@ -464,12 +465,15 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)</div><div class='ctx'> </div><div class='ctx'> 	status = rpc_call_sync(NFS_CLIENT(dir), &amp;msg, 0);</div><div class='ctx'> 	nfs_mark_for_revalidate(dir);</div><div class='del'>-	if (status == 0)</div><div class='del'>-		status = nfs_instantiate(dentry, data-&gt;res.fh, data-&gt;res.fattr);</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		alias = nfs_add_or_obtain(dentry, data-&gt;res.fh, data-&gt;res.fattr);</div><div class='add'>+		status = PTR_ERR_OR_ZERO(alias);</div><div class='add'>+	} else</div><div class='add'>+		alias = ERR_PTR(status);</div><div class='ctx'> 	nfs_free_createdata(data);</div><div class='ctx'> out:</div><div class='ctx'> 	dprintk("NFS reply mkdir: %d\n", status);</div><div class='del'>-	return status;</div><div class='add'>+	return alias;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -687,14 +691,22 @@ out_einval:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_have_delegation(struct inode *inode, fmode_t flags)</div><div class='add'>+static int nfs_have_delegation(struct inode *inode, fmode_t type, int flags)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_return_delegation(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		nfs_wb_all(inode);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations nfs_dir_inode_operations = {</div><div class='ctx'> 	.create		= nfs_create,</div><div class='ctx'> 	.lookup		= nfs_lookup,</div><div class='add'>+	.atomic_open	= nfs_atomic_open_v23,</div><div class='ctx'> 	.link		= nfs_link,</div><div class='ctx'> 	.unlink		= nfs_unlink,</div><div class='ctx'> 	.symlink	= nfs_symlink,</div><div class='hunk'>@@ -756,6 +768,7 @@ const struct nfs_rpc_ops nfs_v2_clientops = {</div><div class='ctx'> 	.lock_check_bounds = nfs_lock_check_bounds,</div><div class='ctx'> 	.close_context	= nfs_close_context,</div><div class='ctx'> 	.have_delegation = nfs_have_delegation,</div><div class='add'>+	.return_delegation = nfs_return_delegation,</div><div class='ctx'> 	.alloc_client	= nfs_alloc_client,</div><div class='ctx'> 	.init_client	= nfs_init_client,</div><div class='ctx'> 	.free_client	= nfs_free_client,</div><div class='head'>diff --git a/fs/nfs/read.c b/fs/nfs/read.c<br/>index 7dc21a48e3e7..3c1fa320b3f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/read.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/read.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/read.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/read.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include "fscache.h"</div><div class='ctx'> #include "pnfs.h"</div><div class='ctx'> #include "nfstrace.h"</div><div class='add'>+#include "delegation.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PAGECACHE</div><div class='ctx'> </div><div class='hunk'>@@ -47,8 +48,7 @@ static struct nfs_pgio_header *nfs_readhdr_alloc(void)</div><div class='ctx'> </div><div class='ctx'> static void nfs_readhdr_free(struct nfs_pgio_header *rhdr)</div><div class='ctx'> {</div><div class='del'>-	if (rhdr-&gt;res.scratch != NULL)</div><div class='del'>-		kfree(rhdr-&gt;res.scratch);</div><div class='add'>+	kfree(rhdr-&gt;res.scratch);</div><div class='ctx'> 	kmem_cache_free(nfs_rdata_cachep, rhdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -56,7 +56,8 @@ static int nfs_return_empty_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	folio_zero_segment(folio, 0, folio_size(folio));</div><div class='ctx'> 	folio_mark_uptodate(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='add'>+	if (nfs_netfs_folio_unlock(folio))</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -122,8 +123,6 @@ static void nfs_readpage_release(struct nfs_page *req, int error)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio = nfs_page_to_folio(req);</div><div class='ctx'> </div><div class='del'>-	if (nfs_error_is_fatal_on_server(error) &amp;&amp; error != -ETIMEDOUT)</div><div class='del'>-		folio_set_error(folio);</div><div class='ctx'> 	if (nfs_page_group_sync_on_bit(req, PG_UNLOCKPAGE))</div><div class='ctx'> 		if (nfs_netfs_folio_unlock(folio))</div><div class='ctx'> 			folio_unlock(folio);</div><div class='hunk'>@@ -288,7 +287,7 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 		       struct nfs_open_context *ctx,</div><div class='ctx'> 		       struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct nfs_server *server = NFS_SERVER(inode);</div><div class='ctx'> 	size_t fsize = folio_size(folio);</div><div class='ctx'> 	unsigned int rsize = server-&gt;rsize;</div><div class='hunk'>@@ -305,6 +304,8 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio,</div><div class='ctx'> 	new = nfs_page_create_from_folio(ctx, folio, 0, aligned_len);</div><div class='ctx'> 	if (IS_ERR(new)) {</div><div class='ctx'> 		error = PTR_ERR(new);</div><div class='add'>+		if (nfs_netfs_folio_unlock(folio))</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -322,21 +323,57 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Read a page over NFS.</div><div class='del'>- * We read the page synchronously in the following case:</div><div class='del'>- *  -	The error flag is set for this page. This happens only when a</div><div class='del'>- *	previous async read operation failed.</div><div class='add'>+ * Actually read a folio over the wire.</div><div class='ctx'>  */</div><div class='del'>-int nfs_read_folio(struct file *file, struct folio *folio)</div><div class='add'>+static int nfs_do_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct nfs_pageio_descriptor pgio;</div><div class='ctx'> 	struct nfs_open_context *ctx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	trace_nfs_aop_readpage(inode, folio);</div><div class='add'>+	ctx = get_nfs_open_context(nfs_file_open_context(file));</div><div class='add'>+</div><div class='add'>+	xchg(&amp;ctx-&gt;error, 0);</div><div class='add'>+	nfs_pageio_init_read(&amp;pgio, inode, false,</div><div class='add'>+			     &amp;nfs_async_read_completion_ops);</div><div class='add'>+</div><div class='add'>+	ret = nfs_read_add_folio(&amp;pgio, ctx, folio);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	nfs_pageio_complete_read(&amp;pgio);</div><div class='add'>+	nfs_update_delegated_atime(inode);</div><div class='add'>+	if (pgio.pg_error &lt; 0) {</div><div class='add'>+		ret = pgio.pg_error;</div><div class='add'>+		goto out_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = folio_wait_locked_killable(folio);</div><div class='add'>+	if (!folio_test_uptodate(folio) &amp;&amp; !ret)</div><div class='add'>+		ret = xchg(&amp;ctx-&gt;error, 0);</div><div class='add'>+</div><div class='add'>+out_put:</div><div class='add'>+	put_nfs_open_context(ctx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Synchronously read a folio.</div><div class='add'>+ *</div><div class='add'>+ * This is not heavily used as most users to try an asynchronous</div><div class='add'>+ * large read through -&gt;readahead first.</div><div class='add'>+ */</div><div class='add'>+int nfs_read_folio(struct file *file, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	loff_t pos = folio_pos(folio);</div><div class='add'>+	size_t len = folio_size(folio);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	trace_nfs_aop_readpage(inode, pos, len);</div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);</div><div class='del'>-	task_io_account_read(folio_size(folio));</div><div class='add'>+	task_io_account_read(len);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to flush any pending writes to the file..</div><div class='hunk'>@@ -356,30 +393,10 @@ int nfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	ret = nfs_netfs_read_folio(file, folio);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ctx = get_nfs_open_context(nfs_file_open_context(file));</div><div class='del'>-</div><div class='del'>-	xchg(&amp;ctx-&gt;error, 0);</div><div class='del'>-	nfs_pageio_init_read(&amp;pgio, inode, false,</div><div class='del'>-			     &amp;nfs_async_read_completion_ops);</div><div class='del'>-</div><div class='del'>-	ret = nfs_read_add_folio(&amp;pgio, ctx, folio);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_put;</div><div class='del'>-</div><div class='del'>-	nfs_pageio_complete_read(&amp;pgio);</div><div class='del'>-	ret = pgio.pg_error &lt; 0 ? pgio.pg_error : 0;</div><div class='del'>-	if (!ret) {</div><div class='del'>-		ret = folio_wait_locked_killable(folio);</div><div class='del'>-		if (!folio_test_uptodate(folio) &amp;&amp; !ret)</div><div class='del'>-			ret = xchg(&amp;ctx-&gt;error, 0);</div><div class='del'>-	}</div><div class='del'>-out_put:</div><div class='del'>-	put_nfs_open_context(ctx);</div><div class='add'>+		ret = nfs_do_read_folio(file, folio);</div><div class='ctx'> out:</div><div class='del'>-	trace_nfs_aop_readpage_done(inode, folio, ret);</div><div class='add'>+	trace_nfs_aop_readpage_done(inode, pos, len, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	folio_unlock(folio);</div><div class='hunk'>@@ -426,6 +443,7 @@ void nfs_readahead(struct readahead_control *ractl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nfs_pageio_complete_read(&amp;pgio);</div><div class='add'>+	nfs_update_delegated_atime(inode);</div><div class='ctx'> </div><div class='ctx'> 	put_nfs_open_context(ctx);</div><div class='ctx'> out:</div><div class='head'>diff --git a/fs/nfs/super.c b/fs/nfs/super.c<br/>index 075b31c93f87..72dee6f3050e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/super.c</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -72,6 +73,7 @@</div><div class='ctx'> #include "nfs.h"</div><div class='ctx'> #include "netns.h"</div><div class='ctx'> #include "sysfs.h"</div><div class='add'>+#include "nfs4idmap.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_VFS</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +230,7 @@ static int __nfs_list_for_each_server(struct list_head *head,</div><div class='ctx'> 		ret = fn(server, data);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='add'>+		cond_resched();</div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -451,8 +454,12 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,</div><div class='ctx'> 		{ NFS_MOUNT_NONLM, ",nolock", "" },</div><div class='ctx'> 		{ NFS_MOUNT_NOACL, ",noacl", "" },</div><div class='ctx'> 		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },</div><div class='add'>+		{ NFS_MOUNT_FORCE_RDIRPLUS, ",rdirplus=force", "" },</div><div class='ctx'> 		{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },</div><div class='ctx'> 		{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },</div><div class='add'>+		{ NFS_MOUNT_NETUNREACH_FATAL,</div><div class='add'>+		  ",fatal_neterrors=ENETDOWN:ENETUNREACH",</div><div class='add'>+		  ",fatal_neterrors=none" },</div><div class='ctx'> 		{ 0, NULL, NULL }</div><div class='ctx'> 	};</div><div class='ctx'> 	const struct proc_nfs_info *nfs_infop;</div><div class='hunk'>@@ -516,8 +523,16 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,</div><div class='ctx'> 	else</div><div class='ctx'> 		nfs_show_nfsv4_options(m, nfss, showdefaults);</div><div class='ctx'> </div><div class='del'>-	if (nfss-&gt;options &amp; NFS_OPTION_FSCACHE)</div><div class='add'>+	if (nfss-&gt;options &amp; NFS_OPTION_FSCACHE) {</div><div class='add'>+#ifdef CONFIG_NFS_FSCACHE</div><div class='add'>+		if (nfss-&gt;fscache_uniq)</div><div class='add'>+			seq_printf(m, ",fsc=%s", nfss-&gt;fscache_uniq);</div><div class='add'>+		else</div><div class='add'>+			seq_puts(m, ",fsc");</div><div class='add'>+#else</div><div class='ctx'> 		seq_puts(m, ",fsc");</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (nfss-&gt;options &amp; NFS_OPTION_MIGRATION)</div><div class='ctx'> 		seq_puts(m, ",migration");</div><div class='hunk'>@@ -541,6 +556,9 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,</div><div class='ctx'> 	else</div><div class='ctx'> 		seq_puts(m, ",local_lock=posix");</div><div class='ctx'> </div><div class='add'>+	if (nfss-&gt;flags &amp; NFS_MOUNT_NO_ALIGNWRITE)</div><div class='add'>+		seq_puts(m, ",noalignwrite");</div><div class='add'>+</div><div class='ctx'> 	if (nfss-&gt;flags &amp; NFS_MOUNT_WRITE_EAGER) {</div><div class='ctx'> 		if (nfss-&gt;flags &amp; NFS_MOUNT_WRITE_WAIT)</div><div class='ctx'> 			seq_puts(m, ",write=wait");</div><div class='hunk'>@@ -872,7 +890,15 @@ static int nfs_request_mount(struct fs_context *fc,</div><div class='ctx'> 	 * Now ask the mount server to map our export path</div><div class='ctx'> 	 * to a file handle.</div><div class='ctx'> 	 */</div><div class='del'>-	status = nfs_mount(&amp;request, ctx-&gt;timeo, ctx-&gt;retrans);</div><div class='add'>+	if ((request.protocol == XPRT_TRANSPORT_UDP) ==</div><div class='add'>+	    !(ctx-&gt;flags &amp; NFS_MOUNT_TCP))</div><div class='add'>+		/*</div><div class='add'>+		 * NFS protocol and mount protocol are both UDP or neither UDP</div><div class='add'>+		 * so timeouts are compatible.  Use NFS timeouts for MOUNT</div><div class='add'>+		 */</div><div class='add'>+		status = nfs_mount(&amp;request, ctx-&gt;timeo, ctx-&gt;retrans);</div><div class='add'>+	else</div><div class='add'>+		status = nfs_mount(&amp;request, NFS_UNSPEC_TIMEO, NFS_UNSPEC_RETRANS);</div><div class='ctx'> 	if (status != 0) {</div><div class='ctx'> 		dfprintk(MOUNT, "NFS: unable to mount server %s, error %d\n",</div><div class='ctx'> 				request.hostname, status);</div><div class='hunk'>@@ -893,6 +919,16 @@ static struct nfs_server *nfs_try_mount_request(struct fs_context *fc)</div><div class='ctx'> 	rpc_authflavor_t authlist[NFS_MAX_SECFLAVORS];</div><div class='ctx'> 	unsigned int authlist_len = ARRAY_SIZE(authlist);</div><div class='ctx'> </div><div class='add'>+	/* make sure 'nolock'/'lock' override the 'local_lock' mount option */</div><div class='add'>+	if (ctx-&gt;lock_status) {</div><div class='add'>+		if (ctx-&gt;lock_status == NFS_LOCK_NOLOCK) {</div><div class='add'>+			ctx-&gt;flags |= NFS_MOUNT_NONLM;</div><div class='add'>+			ctx-&gt;flags |= (NFS_MOUNT_LOCAL_FLOCK | NFS_MOUNT_LOCAL_FCNTL);</div><div class='add'>+		} else {</div><div class='add'>+			ctx-&gt;flags &amp;= ~NFS_MOUNT_NONLM;</div><div class='add'>+			ctx-&gt;flags &amp;= ~(NFS_MOUNT_LOCAL_FLOCK | NFS_MOUNT_LOCAL_FCNTL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	status = nfs_request_mount(fc, ctx-&gt;mntfh, authlist, &amp;authlist_len);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return ERR_PTR(status);</div><div class='hunk'>@@ -1016,6 +1052,16 @@ int nfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * The SB_RDONLY flag has been removed from the superblock during</div><div class='add'>+	 * mounts to prevent interference between different filesystems.</div><div class='add'>+	 * Similarly, it is also necessary to ignore the SB_RDONLY flag</div><div class='add'>+	 * during reconfiguration; otherwise, it may also result in the</div><div class='add'>+	 * creation of redundant superblocks when mounting a directory with</div><div class='add'>+	 * different rw and ro flags multiple times.</div><div class='add'>+	 */</div><div class='add'>+	fc-&gt;sb_flags_mask &amp;= ~SB_RDONLY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Userspace mount programs that send binary options generally send</div><div class='ctx'> 	 * them populated with default values. We have no way to know which</div><div class='ctx'> 	 * ones were explicitly specified. Fall back to legacy behavior and</div><div class='hunk'>@@ -1137,7 +1183,7 @@ static int nfs_set_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> 	struct nfs_server *server = fc-&gt;s_fs_info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	s-&gt;s_d_op = server-&gt;nfs_client-&gt;rpc_ops-&gt;dentry_ops;</div><div class='add'>+	set_default_d_op(s, server-&gt;nfs_client-&gt;rpc_ops-&gt;dentry_ops);</div><div class='ctx'> 	ret = set_anon_super(s, server);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		server-&gt;s_dev = s-&gt;s_dev;</div><div class='hunk'>@@ -1272,8 +1318,17 @@ int nfs_get_tree_common(struct fs_context *fc)</div><div class='ctx'> 	if (IS_ERR(server))</div><div class='ctx'> 		return PTR_ERR(server);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * When NFS_MOUNT_UNSHARED is not set, NFS forces the sharing of a</div><div class='add'>+	 * superblock among each filesystem that mounts sub-directories</div><div class='add'>+	 * belonging to a single exported root path.</div><div class='add'>+	 * To prevent interference between different filesystems, the</div><div class='add'>+	 * SB_RDONLY flag should be removed from the superblock.</div><div class='add'>+	 */</div><div class='ctx'> 	if (server-&gt;flags &amp; NFS_MOUNT_UNSHARED)</div><div class='ctx'> 		compare_super = NULL;</div><div class='add'>+	else</div><div class='add'>+		fc-&gt;sb_flags &amp;= ~SB_RDONLY;</div><div class='ctx'> </div><div class='ctx'> 	/* -o noac implies -o sync */</div><div class='ctx'> 	if (server-&gt;flags &amp; NFS_MOUNT_NOAC)</div><div class='head'>diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c<br/>index 0e27a2e4e68b..58146e935402 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/symlink.c</a></div><div class='hunk'>@@ -32,47 +32,39 @@ static int nfs_symlink_filler(struct file *file, struct folio *folio)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = NFS_PROTO(inode)-&gt;readlink(inode, &amp;folio-&gt;page, 0, PAGE_SIZE);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	folio_mark_uptodate(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	folio_set_error(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return -EIO;</div><div class='add'>+	folio_end_read(folio, error == 0);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *nfs_get_link(struct dentry *dentry,</div><div class='ctx'> 				struct inode *inode,</div><div class='ctx'> 				struct delayed_call *done)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	void *err;</div><div class='ctx'> </div><div class='ctx'> 	if (!dentry) {</div><div class='ctx'> 		err = ERR_PTR(nfs_revalidate_mapping_rcu(inode));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		page = find_get_page(inode-&gt;i_mapping, 0);</div><div class='del'>-		if (!page)</div><div class='add'>+		folio = filemap_get_folio(inode-&gt;i_mapping, 0);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='del'>-			put_page(page);</div><div class='add'>+		if (!folio_test_uptodate(folio)) {</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 			return ERR_PTR(-ECHILD);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = ERR_PTR(nfs_revalidate_mapping(inode, inode-&gt;i_mapping));</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		page = read_cache_page(&amp;inode-&gt;i_data, 0, nfs_symlink_filler,</div><div class='add'>+		folio = read_cache_folio(&amp;inode-&gt;i_data, 0, nfs_symlink_filler,</div><div class='ctx'> 				NULL);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			return ERR_CAST(page);</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return ERR_CAST(folio);</div><div class='ctx'> 	}</div><div class='del'>-	set_delayed_call(done, page_put_link, page);</div><div class='del'>-	return page_address(page);</div><div class='add'>+	set_delayed_call(done, page_put_link, folio);</div><div class='add'>+	return folio_address(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c<br/>index e645be1a3381..f579df0e8d67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/sysctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/sysctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/sysctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/sysctl.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *nfs_callback_sysctl_table;</div><div class='ctx'> </div><div class='del'>-static struct ctl_table nfs_cb_sysctls[] = {</div><div class='add'>+static const struct ctl_table nfs_cb_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "nfs_mountpoint_timeout",</div><div class='ctx'> 		.data		= &amp;nfs_mountpoint_expiry_timeout,</div><div class='head'>diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c<br/>index bf378ecd5d9f..ea6e6168092b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/sysfs.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/lockd/lockd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "internal.h"</div><div class='ctx'> #include "nfs4_fs.h"</div><div class='ctx'> #include "netns.h"</div><div class='ctx'> #include "sysfs.h"</div><div class='hunk'>@@ -188,6 +189,7 @@ static struct nfs_netns_client *nfs_netns_client_alloc(struct kobject *parent,</div><div class='ctx'> 			return p;</div><div class='ctx'> </div><div class='ctx'> 		kobject_put(&amp;p-&gt;kobject);</div><div class='add'>+		kobject_put(&amp;p-&gt;nfs_net_kobj);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -228,6 +230,25 @@ static void shutdown_client(struct rpc_clnt *clnt)</div><div class='ctx'> 	rpc_cancel_tasks(clnt, -EIO, shutdown_match_client, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Shut down the nfs_client only once all the superblocks</div><div class='add'>+ * have been shut down.</div><div class='add'>+ */</div><div class='add'>+static void shutdown_nfs_client(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(server, &amp;clp-&gt;cl_superblocks, client_link) {</div><div class='add'>+		if (!(server-&gt;flags &amp; NFS_MOUNT_SHUTDOWN)) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	nfs_mark_client_ready(clp, -EIO);</div><div class='add'>+	shutdown_client(clp-&gt;cl_rpcclient);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t</div><div class='ctx'> shutdown_show(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='hunk'>@@ -259,7 +280,6 @@ shutdown_store(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	server-&gt;flags |= NFS_MOUNT_SHUTDOWN;</div><div class='ctx'> 	shutdown_client(server-&gt;client);</div><div class='del'>-	shutdown_client(server-&gt;nfs_client-&gt;cl_rpcclient);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(server-&gt;client_acl))</div><div class='ctx'> 		shutdown_client(server-&gt;client_acl);</div><div class='hunk'>@@ -267,11 +287,44 @@ shutdown_store(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='ctx'> 	if (server-&gt;nlm_host)</div><div class='ctx'> 		shutdown_client(server-&gt;nlm_host-&gt;h_rpcclnt);</div><div class='ctx'> out:</div><div class='add'>+	shutdown_nfs_client(server-&gt;nfs_client);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kobj_attribute nfs_sysfs_attr_shutdown = __ATTR_RW(shutdown);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_V4_1)</div><div class='add'>+static ssize_t</div><div class='add'>+implid_domain_show(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = container_of(kobj, struct nfs_server, kobj);</div><div class='add'>+	struct nfs41_impl_id *impl_id = server-&gt;nfs_client-&gt;cl_implid;</div><div class='add'>+</div><div class='add'>+	if (!impl_id || strlen(impl_id-&gt;domain) == 0)</div><div class='add'>+		return 0; //sysfs_emit(buf, "");</div><div class='add'>+	return sysfs_emit(buf, "%s\n", impl_id-&gt;domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute nfs_sysfs_attr_implid_domain = __ATTR_RO(implid_domain);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+implid_name_show(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = container_of(kobj, struct nfs_server, kobj);</div><div class='add'>+	struct nfs41_impl_id *impl_id = server-&gt;nfs_client-&gt;cl_implid;</div><div class='add'>+</div><div class='add'>+	if (!impl_id || strlen(impl_id-&gt;name) == 0)</div><div class='add'>+		return 0; //sysfs_emit(buf, "");</div><div class='add'>+	return sysfs_emit(buf, "%s\n", impl_id-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute nfs_sysfs_attr_implid_name = __ATTR_RO(implid_name);</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NFS_V4_1) */</div><div class='add'>+</div><div class='ctx'> #define RPC_CLIENT_NAME_SIZE 64</div><div class='ctx'> </div><div class='ctx'> void nfs_sysfs_link_rpc_client(struct nfs_server *server,</div><div class='hunk'>@@ -280,9 +333,9 @@ void nfs_sysfs_link_rpc_client(struct nfs_server *server,</div><div class='ctx'> 	char name[RPC_CLIENT_NAME_SIZE];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	strcpy(name, clnt-&gt;cl_program-&gt;name);</div><div class='del'>-	strcat(name, uniq ? uniq : "");</div><div class='del'>-	strcat(name, "_client");</div><div class='add'>+	strscpy(name, clnt-&gt;cl_program-&gt;name, sizeof(name));</div><div class='add'>+	strncat(name, uniq ? uniq : "", sizeof(name) - strlen(name) - 1);</div><div class='add'>+	strncat(name, "_client", sizeof(name) - strlen(name) - 1);</div><div class='ctx'> </div><div class='ctx'> 	ret = sysfs_create_link_nowarn(&amp;server-&gt;kobj,</div><div class='ctx'> 						&amp;clnt-&gt;cl_sysfs-&gt;kobject, name);</div><div class='hunk'>@@ -309,6 +362,59 @@ static struct kobj_type nfs_sb_ktype = {</div><div class='ctx'> 	.child_ns_type = nfs_netns_object_child_ns_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_V4_1)</div><div class='add'>+static void nfs_sysfs_add_nfsv41_server(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!server-&gt;nfs_client-&gt;cl_implid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = sysfs_create_file_ns(&amp;server-&gt;kobj, &amp;nfs_sysfs_attr_implid_domain.attr,</div><div class='add'>+					   nfs_netns_server_namespace(&amp;server-&gt;kobj));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n",</div><div class='add'>+			server-&gt;s_sysfs_id, ret);</div><div class='add'>+</div><div class='add'>+	ret = sysfs_create_file_ns(&amp;server-&gt;kobj, &amp;nfs_sysfs_attr_implid_name.attr,</div><div class='add'>+				   nfs_netns_server_namespace(&amp;server-&gt;kobj));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n",</div><div class='add'>+			server-&gt;s_sysfs_id, ret);</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_NFS_V4_1 */</div><div class='add'>+static inline void nfs_sysfs_add_nfsv41_server(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NFS_V4_1 */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+localio_show(struct kobject *kobj, struct kobj_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = container_of(kobj, struct nfs_server, kobj);</div><div class='add'>+	bool localio = nfs_server_is_local(server-&gt;nfs_client);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", localio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_attribute nfs_sysfs_attr_localio = __ATTR_RO(localio);</div><div class='add'>+</div><div class='add'>+static void nfs_sysfs_add_nfs_localio_server(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+	int ret = sysfs_create_file_ns(&amp;server-&gt;kobj, &amp;nfs_sysfs_attr_localio.attr,</div><div class='add'>+				       nfs_netns_server_namespace(&amp;server-&gt;kobj));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n",</div><div class='add'>+			server-&gt;s_sysfs_id, ret);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void nfs_sysfs_add_nfs_localio_server(struct nfs_server *server)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NFS_LOCALIO) */</div><div class='add'>+</div><div class='ctx'> void nfs_sysfs_add_server(struct nfs_server *server)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -325,6 +431,9 @@ void nfs_sysfs_add_server(struct nfs_server *server)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n",</div><div class='ctx'> 			server-&gt;s_sysfs_id, ret);</div><div class='add'>+</div><div class='add'>+	nfs_sysfs_add_nfsv41_server(server);</div><div class='add'>+	nfs_sysfs_add_nfs_localio_server(server);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(nfs_sysfs_add_server);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c<br/>index 0110299643a2..b55467911648 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/unlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/unlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/unlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/unlink.c</a></div><div class='hunk'>@@ -232,6 +232,8 @@ nfs_complete_unlink(struct dentry *dentry, struct inode *inode)</div><div class='ctx'> 	dentry-&gt;d_fsdata = NULL;</div><div class='ctx'> 	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> </div><div class='add'>+	NFS_PROTO(inode)-&gt;return_delegation(inode);</div><div class='add'>+</div><div class='ctx'> 	if (NFS_STALE(inode) || !nfs_call_unlink(dentry, inode, data))</div><div class='ctx'> 		nfs_free_unlinkdata(data);</div><div class='ctx'> }</div><div class='hunk'>@@ -462,18 +464,17 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> 	sdentry = NULL;</div><div class='ctx'> 	do {</div><div class='del'>-		int slen;</div><div class='ctx'> 		dput(sdentry);</div><div class='ctx'> 		sillycounter++;</div><div class='del'>-		slen = scnprintf(silly, sizeof(silly),</div><div class='del'>-				SILLYNAME_PREFIX "%0*llx%0*x",</div><div class='del'>-				SILLYNAME_FILEID_LEN, fileid,</div><div class='del'>-				SILLYNAME_COUNTER_LEN, sillycounter);</div><div class='add'>+		scnprintf(silly, sizeof(silly),</div><div class='add'>+			  SILLYNAME_PREFIX "%0*llx%0*x",</div><div class='add'>+			  SILLYNAME_FILEID_LEN, fileid,</div><div class='add'>+			  SILLYNAME_COUNTER_LEN, sillycounter);</div><div class='ctx'> </div><div class='ctx'> 		dfprintk(VFS, "NFS: trying to rename %pd to %s\n",</div><div class='ctx'> 				dentry, silly);</div><div class='ctx'> </div><div class='del'>-		sdentry = lookup_one_len(silly, dentry-&gt;d_parent, slen);</div><div class='add'>+		sdentry = lookup_noperm(&amp;QSTR(silly), dentry-&gt;d_parent);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * N.B. Better to return EBUSY here ... it could be</div><div class='ctx'> 		 * dangerous to delete the file while it's in use.</div><div class='head'>diff --git a/fs/nfs/write.c b/fs/nfs/write.c<br/>index bb79d3a886ae..336c510f3750 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs/write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs/write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs/write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs/write.c</a></div><div class='hunk'>@@ -63,9 +63,6 @@ static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,</div><div class='ctx'> 				     struct nfs_page *req);</div><div class='ctx'> static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,</div><div class='ctx'> 				      struct inode *inode);</div><div class='del'>-static struct nfs_page *</div><div class='del'>-nfs_page_search_commits_for_head_request_locked(struct nfs_inode *nfsi,</div><div class='del'>-						struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *nfs_wdata_cachep;</div><div class='ctx'> static mempool_t *nfs_wdata_mempool;</div><div class='hunk'>@@ -156,44 +153,29 @@ nfs_page_set_inode_ref(struct nfs_page *req, struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nfs_cancel_remove_inode(struct nfs_page *req, struct inode *inode)</div><div class='add'>+static void nfs_cancel_remove_inode(struct nfs_page *req, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(PG_REMOVE, &amp;req-&gt;wb_flags))</div><div class='del'>-		return 0;</div><div class='del'>-	ret = nfs_page_group_lock(req);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='ctx'> 	if (test_and_clear_bit(PG_REMOVE, &amp;req-&gt;wb_flags))</div><div class='ctx'> 		nfs_page_set_inode_ref(req, inode);</div><div class='del'>-	nfs_page_group_unlock(req);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nfs_page *nfs_folio_private_request(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_get_private(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nfs_folio_find_private_request - find head request associated with a folio</div><div class='add'>+ * nfs_folio_find_head_request - find head request associated with a folio</div><div class='ctx'>  * @folio: pointer to folio</div><div class='ctx'>  *</div><div class='ctx'>  * must be called while holding the inode lock.</div><div class='ctx'>  *</div><div class='ctx'>  * returns matching head request with reference held, or NULL if not found.</div><div class='ctx'>  */</div><div class='del'>-static struct nfs_page *nfs_folio_find_private_request(struct folio *folio)</div><div class='add'>+static struct nfs_page *nfs_folio_find_head_request(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct nfs_page *req;</div><div class='ctx'> </div><div class='ctx'> 	if (!folio_test_private(folio))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-	req = nfs_folio_private_request(folio);</div><div class='add'>+	req = folio-&gt;private;</div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		WARN_ON_ONCE(req-&gt;wb_head != req);</div><div class='ctx'> 		kref_get(&amp;req-&gt;wb_kref);</div><div class='hunk'>@@ -202,86 +184,20 @@ static struct nfs_page *nfs_folio_find_private_request(struct folio *folio)</div><div class='ctx'> 	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nfs_page *nfs_folio_find_swap_request(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='del'>-	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='del'>-	struct nfs_page *req = NULL;</div><div class='del'>-	if (!folio_test_swapcache(folio))</div><div class='del'>-		return NULL;</div><div class='del'>-	mutex_lock(&amp;nfsi-&gt;commit_mutex);</div><div class='del'>-	if (folio_test_swapcache(folio)) {</div><div class='del'>-		req = nfs_page_search_commits_for_head_request_locked(nfsi,</div><div class='del'>-								      folio);</div><div class='del'>-		if (req) {</div><div class='del'>-			WARN_ON_ONCE(req-&gt;wb_head != req);</div><div class='del'>-			kref_get(&amp;req-&gt;wb_kref);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;nfsi-&gt;commit_mutex);</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nfs_folio_find_head_request - find head request associated with a folio</div><div class='del'>- * @folio: pointer to folio</div><div class='del'>- *</div><div class='del'>- * returns matching head request with reference held, or NULL if not found.</div><div class='del'>- */</div><div class='del'>-static struct nfs_page *nfs_folio_find_head_request(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *req;</div><div class='del'>-</div><div class='del'>-	req = nfs_folio_find_private_request(folio);</div><div class='del'>-	if (!req)</div><div class='del'>-		req = nfs_folio_find_swap_request(folio);</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nfs_page *nfs_folio_find_and_lock_request(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='del'>-	struct nfs_page *req, *head;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		req = nfs_folio_find_head_request(folio);</div><div class='del'>-		if (!req)</div><div class='del'>-			return req;</div><div class='del'>-		head = nfs_page_group_lock_head(req);</div><div class='del'>-		if (head != req)</div><div class='del'>-			nfs_release_request(req);</div><div class='del'>-		if (IS_ERR(head))</div><div class='del'>-			return head;</div><div class='del'>-		ret = nfs_cancel_remove_inode(head, inode);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			nfs_unlock_and_release_request(head);</div><div class='del'>-			return ERR_PTR(ret);</div><div class='del'>-		}</div><div class='del'>-		/* Ensure that nobody removed the request before we locked it */</div><div class='del'>-		if (head == nfs_folio_private_request(folio))</div><div class='del'>-			break;</div><div class='del'>-		if (folio_test_swapcache(folio))</div><div class='del'>-			break;</div><div class='del'>-		nfs_unlock_and_release_request(head);</div><div class='del'>-	}</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Adjust the file length if we're writing beyond the end */</div><div class='ctx'> static void nfs_grow_file(struct folio *folio, unsigned int offset,</div><div class='ctx'> 			  unsigned int count)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	loff_t end, i_size;</div><div class='ctx'> 	pgoff_t end_index;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	i_size = i_size_read(inode);</div><div class='ctx'> 	end_index = ((i_size - 1) &gt;&gt; folio_shift(folio)) &lt;&lt; folio_order(folio);</div><div class='del'>-	if (i_size &gt; 0 &amp;&amp; folio_index(folio) &lt; end_index)</div><div class='add'>+	if (i_size &gt; 0 &amp;&amp; folio-&gt;index &lt; end_index)</div><div class='ctx'> 		goto out;</div><div class='del'>-	end = folio_file_pos(folio) + (loff_t)offset + (loff_t)count;</div><div class='add'>+	end = folio_pos(folio) + (loff_t)offset + (loff_t)count;</div><div class='ctx'> 	if (i_size &gt;= end)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	trace_nfs_size_grow(inode, end);</div><div class='hunk'>@@ -289,6 +205,8 @@ static void nfs_grow_file(struct folio *folio, unsigned int offset,</div><div class='ctx'> 	NFS_I(inode)-&gt;cache_validity &amp;= ~NFS_INO_INVALID_SIZE;</div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_EXTENDWRITE);</div><div class='ctx'> out:</div><div class='add'>+	/* Atomically update timestamps if they are delegated to us. */</div><div class='add'>+	nfs_update_delegated_mtime_locked(inode);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	nfs_fscache_invalidate(inode, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -309,9 +227,8 @@ static void nfs_set_pageerror(struct address_space *mapping)</div><div class='ctx'> </div><div class='ctx'> static void nfs_mapping_set_error(struct folio *folio, int error)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> </div><div class='del'>-	folio_set_error(folio);</div><div class='ctx'> 	filemap_set_wb_err(mapping, error);</div><div class='ctx'> 	if (mapping-&gt;host)</div><div class='ctx'> 		errseq_set(&amp;mapping-&gt;host-&gt;i_sb-&gt;s_wb_err,</div><div class='hunk'>@@ -320,59 +237,17 @@ static void nfs_mapping_set_error(struct folio *folio, int error)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * nfs_page_group_search_locked</div><div class='del'>- * @head - head request of page group</div><div class='del'>- * @page_offset - offset into page</div><div class='del'>- *</div><div class='del'>- * Search page group with head @head to find a request that contains the</div><div class='del'>- * page offset @page_offset.</div><div class='del'>- *</div><div class='del'>- * Returns a pointer to the first matching nfs request, or NULL if no</div><div class='del'>- * match is found.</div><div class='add'>+ * nfs_page_covers_folio</div><div class='add'>+ * @req: struct nfs_page</div><div class='ctx'>  *</div><div class='del'>- * Must be called with the page group lock held</div><div class='del'>- */</div><div class='del'>-static struct nfs_page *</div><div class='del'>-nfs_page_group_search_locked(struct nfs_page *head, unsigned int page_offset)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *req;</div><div class='del'>-</div><div class='del'>-	req = head;</div><div class='del'>-	do {</div><div class='del'>-		if (page_offset &gt;= req-&gt;wb_pgbase &amp;&amp;</div><div class='del'>-		    page_offset &lt; (req-&gt;wb_pgbase + req-&gt;wb_bytes))</div><div class='del'>-			return req;</div><div class='del'>-</div><div class='del'>-		req = req-&gt;wb_this_page;</div><div class='del'>-	} while (req != head);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nfs_page_group_covers_page</div><div class='del'>- * @head - head request of page group</div><div class='del'>- *</div><div class='del'>- * Return true if the page group with head @head covers the whole page,</div><div class='del'>- * returns false otherwise</div><div class='add'>+ * Return true if the request covers the whole folio.</div><div class='add'>+ * Note that the caller should ensure all subrequests have been joined</div><div class='ctx'>  */</div><div class='ctx'> static bool nfs_page_group_covers_page(struct nfs_page *req)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len = nfs_folio_length(nfs_page_to_folio(req));</div><div class='del'>-	struct nfs_page *tmp;</div><div class='del'>-	unsigned int pos = 0;</div><div class='del'>-</div><div class='del'>-	nfs_page_group_lock(req);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		tmp = nfs_page_group_search_locked(req-&gt;wb_head, pos);</div><div class='del'>-		if (!tmp)</div><div class='del'>-			break;</div><div class='del'>-		pos = tmp-&gt;wb_pgbase + tmp-&gt;wb_bytes;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	nfs_page_group_unlock(req);</div><div class='del'>-	return pos &gt;= len;</div><div class='add'>+	return req-&gt;wb_pgbase == 0 &amp;&amp; req-&gt;wb_bytes == len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We can set the PG_uptodate flag if we see that a write request</div><div class='hunk'>@@ -410,7 +285,7 @@ int nfs_congestion_kb;</div><div class='ctx'> </div><div class='ctx'> static void nfs_folio_set_writeback(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_server *nfss = NFS_SERVER(folio_file_mapping(folio)-&gt;host);</div><div class='add'>+	struct nfs_server *nfss = NFS_SERVER(folio-&gt;mapping-&gt;host);</div><div class='ctx'> </div><div class='ctx'> 	folio_start_writeback(folio);</div><div class='ctx'> 	if (atomic_long_inc_return(&amp;nfss-&gt;writeback) &gt; NFS_CONGESTION_ON_THRESH)</div><div class='hunk'>@@ -419,12 +294,14 @@ static void nfs_folio_set_writeback(struct folio *folio)</div><div class='ctx'> </div><div class='ctx'> static void nfs_folio_end_writeback(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_server *nfss = NFS_SERVER(folio_file_mapping(folio)-&gt;host);</div><div class='add'>+	struct nfs_server *nfss = NFS_SERVER(folio-&gt;mapping-&gt;host);</div><div class='ctx'> </div><div class='del'>-	folio_end_writeback(folio);</div><div class='add'>+	folio_end_writeback_no_dropbehind(folio);</div><div class='ctx'> 	if (atomic_long_dec_return(&amp;nfss-&gt;writeback) &lt;</div><div class='del'>-	    NFS_CONGESTION_OFF_THRESH)</div><div class='add'>+	    NFS_CONGESTION_OFF_THRESH) {</div><div class='ctx'> 		nfss-&gt;write_congested = 0;</div><div class='add'>+		wake_up_all(&amp;nfss-&gt;write_congestion_wait);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_page_end_writeback(struct nfs_page *req)</div><div class='hunk'>@@ -548,6 +425,74 @@ void nfs_join_page_group(struct nfs_page *head, struct nfs_commit_info *cinfo,</div><div class='ctx'> 	nfs_destroy_unlinked_subrequests(destroy_list, head, inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nfs_wait_on_request - Wait for a request to complete.</div><div class='add'>+ * @req: request to wait upon.</div><div class='add'>+ *</div><div class='add'>+ * Interruptible by fatal signals only.</div><div class='add'>+ * The user is responsible for holding a count on the request.</div><div class='add'>+ */</div><div class='add'>+static int nfs_wait_on_request(struct nfs_page *req)</div><div class='add'>+{</div><div class='add'>+	if (!test_bit(PG_BUSY, &amp;req-&gt;wb_flags))</div><div class='add'>+		return 0;</div><div class='add'>+	set_bit(PG_CONTENDED2, &amp;req-&gt;wb_flags);</div><div class='add'>+	smp_mb__after_atomic();</div><div class='add'>+	return wait_on_bit_io(&amp;req-&gt;wb_flags, PG_BUSY,</div><div class='add'>+			      TASK_UNINTERRUPTIBLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_unroll_locks -  unlock all newly locked reqs and wait on @req</div><div class='add'>+ * @head: head request of page group, must be holding head lock</div><div class='add'>+ * @req: request that couldn't lock and needs to wait on the req bit lock</div><div class='add'>+ *</div><div class='add'>+ * This is a helper function for nfs_lock_and_join_requests</div><div class='add'>+ * returns 0 on success, &lt; 0 on error.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+nfs_unroll_locks(struct nfs_page *head, struct nfs_page *req)</div><div class='add'>+{</div><div class='add'>+	struct nfs_page *tmp;</div><div class='add'>+</div><div class='add'>+	/* relinquish all the locks successfully grabbed this run */</div><div class='add'>+	for (tmp = head-&gt;wb_this_page ; tmp != req; tmp = tmp-&gt;wb_this_page) {</div><div class='add'>+		if (!kref_read(&amp;tmp-&gt;wb_kref))</div><div class='add'>+			continue;</div><div class='add'>+		nfs_unlock_and_release_request(tmp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_page_group_lock_subreq -  try to lock a subrequest</div><div class='add'>+ * @head: head request of page group</div><div class='add'>+ * @subreq: request to lock</div><div class='add'>+ *</div><div class='add'>+ * This is a helper function for nfs_lock_and_join_requests which</div><div class='add'>+ * must be called with the head request and page group both locked.</div><div class='add'>+ * On error, it returns with the page group unlocked.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+nfs_page_group_lock_subreq(struct nfs_page *head, struct nfs_page *subreq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!kref_get_unless_zero(&amp;subreq-&gt;wb_kref))</div><div class='add'>+		return 0;</div><div class='add'>+	while (!nfs_lock_request(subreq)) {</div><div class='add'>+		nfs_page_group_unlock(head);</div><div class='add'>+		ret = nfs_wait_on_request(subreq);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = nfs_page_group_lock(head);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			nfs_unroll_locks(head, subreq);</div><div class='add'>+			nfs_release_request(subreq);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * nfs_lock_and_join_requests - join all subreqs to the head req</div><div class='ctx'>  * @folio: the folio used to lookup the "page group" of nfs_page structures</div><div class='hunk'>@@ -565,31 +510,60 @@ void nfs_join_page_group(struct nfs_page *head, struct nfs_commit_info *cinfo,</div><div class='ctx'>  */</div><div class='ctx'> static struct nfs_page *nfs_lock_and_join_requests(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='del'>-	struct nfs_page *head;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='add'>+	struct nfs_page *head, *subreq;</div><div class='ctx'> 	struct nfs_commit_info cinfo;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	nfs_init_cinfo_from_inode(&amp;cinfo, inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * A reference is taken only on the head request which acts as a</div><div class='ctx'> 	 * reference to the whole page group - the group will not be destroyed</div><div class='ctx'> 	 * until the head reference is released.</div><div class='ctx'> 	 */</div><div class='del'>-	head = nfs_folio_find_and_lock_request(folio);</div><div class='del'>-	if (IS_ERR_OR_NULL(head))</div><div class='del'>-		return head;</div><div class='add'>+retry:</div><div class='add'>+	head = nfs_folio_find_head_request(folio);</div><div class='add'>+	if (!head)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* lock each request in the page group */</div><div class='del'>-	ret = nfs_page_group_lock_subrequests(head);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	while (!nfs_lock_request(head)) {</div><div class='add'>+		ret = nfs_wait_on_request(head);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			nfs_release_request(head);</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nfs_page_group_lock(head);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* Ensure that nobody removed the request before we locked it */</div><div class='add'>+	if (head != folio-&gt;private) {</div><div class='add'>+		nfs_page_group_unlock(head);</div><div class='ctx'> 		nfs_unlock_and_release_request(head);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='add'>+		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nfs_join_page_group(head, &amp;cinfo, inode);</div><div class='add'>+	nfs_cancel_remove_inode(head, inode);</div><div class='ctx'> </div><div class='add'>+	/* lock each request in the page group */</div><div class='add'>+	for (subreq = head-&gt;wb_this_page;</div><div class='add'>+	     subreq != head;</div><div class='add'>+	     subreq = subreq-&gt;wb_this_page) {</div><div class='add'>+		ret = nfs_page_group_lock_subreq(head, subreq);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nfs_page_group_unlock(head);</div><div class='add'>+</div><div class='add'>+	nfs_init_cinfo_from_inode(&amp;cinfo, inode);</div><div class='add'>+	nfs_join_page_group(head, &amp;cinfo, inode);</div><div class='ctx'> 	return head;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	nfs_unlock_and_release_request(head);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_write_error(struct nfs_page *req, int error)</div><div class='hunk'>@@ -605,20 +579,21 @@ static void nfs_write_error(struct nfs_page *req, int error)</div><div class='ctx'>  * Find an associated nfs write request, and prepare to flush it out</div><div class='ctx'>  * May return an error if the user signalled nfs_wait_on_request().</div><div class='ctx'>  */</div><div class='del'>-static int nfs_page_async_flush(struct folio *folio,</div><div class='del'>-				struct writeback_control *wbc,</div><div class='del'>-				struct nfs_pageio_descriptor *pgio)</div><div class='add'>+static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='add'>+		struct nfs_pageio_descriptor *pgio)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_page *req;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nfs_pageio_cond_complete(pgio, folio-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	req = nfs_lock_and_join_requests(folio);</div><div class='ctx'> 	if (!req)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = PTR_ERR(req);</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='del'>-		goto out;</div><div class='add'>+		return PTR_ERR(req);</div><div class='ctx'> </div><div class='add'>+	trace_nfs_do_writepage(req);</div><div class='ctx'> 	nfs_folio_set_writeback(folio);</div><div class='ctx'> 	WARN_ON_ONCE(test_bit(PG_CLEAN, &amp;req-&gt;wb_flags));</div><div class='ctx'> </div><div class='hunk'>@@ -627,7 +602,6 @@ static int nfs_page_async_flush(struct folio *folio,</div><div class='ctx'> 	if (nfs_error_is_fatal_on_server(ret))</div><div class='ctx'> 		goto out_launder;</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='ctx'> 	if (!nfs_pageio_add_request(pgio, req)) {</div><div class='ctx'> 		ret = pgio-&gt;pg_error;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -635,28 +609,20 @@ static int nfs_page_async_flush(struct folio *folio,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (nfs_error_is_fatal_on_server(ret))</div><div class='ctx'> 			goto out_launder;</div><div class='del'>-		if (wbc-&gt;sync_mode == WB_SYNC_NONE)</div><div class='del'>-			ret = AOP_WRITEPAGE_ACTIVATE;</div><div class='ctx'> 		folio_redirty_for_writepage(wbc, folio);</div><div class='ctx'> 		nfs_redirty_request(req);</div><div class='ctx'> 		pgio-&gt;pg_error = 0;</div><div class='del'>-	} else</div><div class='del'>-		nfs_add_stats(folio_file_mapping(folio)-&gt;host,</div><div class='del'>-			      NFSIOS_WRITEPAGES, 1);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nfs_add_stats(folio-&gt;mapping-&gt;host, NFSIOS_WRITEPAGES, 1);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> out_launder:</div><div class='ctx'> 	nfs_write_error(req, ret);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc,</div><div class='del'>-			    struct nfs_pageio_descriptor *pgio)</div><div class='del'>-{</div><div class='del'>-	nfs_pageio_cond_complete(pgio, folio_index(folio));</div><div class='del'>-	return nfs_page_async_flush(folio, wbc, pgio);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Write an mmapped page to the server.</div><div class='ctx'>  */</div><div class='hunk'>@@ -664,13 +630,9 @@ static int nfs_writepage_locked(struct folio *folio,</div><div class='ctx'> 				struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_pageio_descriptor pgio;</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='del'>-	    NFS_SERVER(inode)-&gt;write_congested)</div><div class='del'>-		return AOP_WRITEPAGE_ACTIVATE;</div><div class='del'>-</div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGE);</div><div class='ctx'> 	nfs_pageio_init_write(&amp;pgio, inode, 0, false,</div><div class='ctx'> 			      &amp;nfs_async_write_completion_ops);</div><div class='hunk'>@@ -680,17 +642,6 @@ static int nfs_writepage_locked(struct folio *folio,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs_writepages_callback(struct folio *folio,</div><div class='del'>-				   struct writeback_control *wbc, void *data)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = nfs_do_writepage(folio, wbc, data);</div><div class='del'>-	if (ret != AOP_WRITEPAGE_ACTIVATE)</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nfs_io_completion_commit(void *inode)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_commit_inode(inode, 0);</div><div class='hunk'>@@ -702,17 +653,24 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)</div><div class='ctx'> 	struct nfs_pageio_descriptor pgio;</div><div class='ctx'> 	struct nfs_io_completion *ioc = NULL;</div><div class='ctx'> 	unsigned int mntflags = NFS_SERVER(inode)-&gt;flags;</div><div class='add'>+	struct nfs_server *nfss = NFS_SERVER(inode);</div><div class='ctx'> 	int priority = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp;</div><div class='del'>-	    NFS_SERVER(inode)-&gt;write_congested)</div><div class='del'>-		return 0;</div><div class='add'>+	trace_nfs_writepages(inode, wbc-&gt;range_start, wbc-&gt;range_end - wbc-&gt;range_start);</div><div class='add'>+</div><div class='add'>+	/* Wait with writeback until write congestion eases */</div><div class='add'>+	if (wbc-&gt;sync_mode == WB_SYNC_NONE &amp;&amp; nfss-&gt;write_congested) {</div><div class='add'>+		err = wait_event_killable(nfss-&gt;write_congestion_wait,</div><div class='add'>+					  nfss-&gt;write_congested == 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGES);</div><div class='ctx'> </div><div class='ctx'> 	if (!(mntflags &amp; NFS_MOUNT_WRITE_EAGER) || wbc-&gt;for_kupdate ||</div><div class='del'>-	    wbc-&gt;for_background || wbc-&gt;for_sync || wbc-&gt;for_reclaim) {</div><div class='add'>+	    wbc-&gt;for_background || wbc-&gt;for_sync) {</div><div class='ctx'> 		ioc = nfs_io_completion_alloc(GFP_KERNEL);</div><div class='ctx'> 		if (ioc)</div><div class='ctx'> 			nfs_io_completion_init(ioc, nfs_io_completion_commit,</div><div class='hunk'>@@ -721,11 +679,15 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='add'>+		struct folio *folio = NULL;</div><div class='add'>+</div><div class='ctx'> 		nfs_pageio_init_write(&amp;pgio, inode, priority, false,</div><div class='ctx'> 				      &amp;nfs_async_write_completion_ops);</div><div class='ctx'> 		pgio.pg_io_completion = ioc;</div><div class='del'>-		err = write_cache_pages(mapping, wbc, nfs_writepages_callback,</div><div class='del'>-					&amp;pgio);</div><div class='add'>+		while ((folio = writeback_iter(mapping, wbc, folio, &amp;err))) {</div><div class='add'>+			err = nfs_do_writepage(folio, wbc, &amp;pgio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+		}</div><div class='ctx'> 		pgio.pg_error = 0;</div><div class='ctx'> 		nfs_pageio_complete(&amp;pgio);</div><div class='ctx'> 		if (err == -EAGAIN &amp;&amp; mntflags &amp; NFS_MOUNT_SOFTERR)</div><div class='hunk'>@@ -733,10 +695,10 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)</div><div class='ctx'> 	} while (err &lt; 0 &amp;&amp; !nfs_error_is_fatal(err));</div><div class='ctx'> 	nfs_io_completion_put(ioc);</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='del'>-	return 0;</div><div class='add'>+	if (err &gt; 0)</div><div class='add'>+		err = 0;</div><div class='ctx'> out_err:</div><div class='add'>+	trace_nfs_writepages_done(inode, wbc-&gt;range_start, wbc-&gt;range_end - wbc-&gt;range_start, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -746,24 +708,17 @@ out_err:</div><div class='ctx'> static void nfs_inode_add_request(struct nfs_page *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio = nfs_page_to_folio(req);</div><div class='del'>-	struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(mapping-&gt;host);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(req-&gt;wb_this_page != req);</div><div class='ctx'> </div><div class='ctx'> 	/* Lock the request! */</div><div class='ctx'> 	nfs_lock_request(req);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Swap-space should not get truncated. Hence no need to plug the race</div><div class='del'>-	 * with invalidate/truncate.</div><div class='del'>-	 */</div><div class='ctx'> 	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-	if (likely(!folio_test_swapcache(folio))) {</div><div class='del'>-		set_bit(PG_MAPPED, &amp;req-&gt;wb_flags);</div><div class='del'>-		folio_set_private(folio);</div><div class='del'>-		folio-&gt;private = req;</div><div class='del'>-	}</div><div class='add'>+	set_bit(PG_MAPPED, &amp;req-&gt;wb_flags);</div><div class='add'>+	folio_set_private(folio);</div><div class='add'>+	folio-&gt;private = req;</div><div class='ctx'> 	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='ctx'> 	atomic_long_inc(&amp;nfsi-&gt;nrequests);</div><div class='ctx'> 	/* this a head request for a page group - mark it as having an</div><div class='hunk'>@@ -781,18 +736,22 @@ static void nfs_inode_remove_request(struct nfs_page *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(nfs_page_to_inode(req));</div><div class='ctx'> </div><div class='del'>-	if (nfs_page_group_sync_on_bit(req, PG_REMOVE)) {</div><div class='add'>+	nfs_page_group_lock(req);</div><div class='add'>+	if (nfs_page_group_sync_on_bit_locked(req, PG_REMOVE)) {</div><div class='ctx'> 		struct folio *folio = nfs_page_to_folio(req-&gt;wb_head);</div><div class='del'>-		struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+		struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		if (likely(folio &amp;&amp; !folio_test_swapcache(folio))) {</div><div class='add'>+		if (likely(folio)) {</div><div class='ctx'> 			folio-&gt;private = NULL;</div><div class='ctx'> 			folio_clear_private(folio);</div><div class='ctx'> 			clear_bit(PG_MAPPED, &amp;req-&gt;wb_head-&gt;wb_flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='add'>+</div><div class='add'>+		folio_end_dropbehind(folio);</div><div class='ctx'> 	}</div><div class='add'>+	nfs_page_group_unlock(req);</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_clear_bit(PG_INODE_REF, &amp;req-&gt;wb_flags)) {</div><div class='ctx'> 		atomic_long_dec(&amp;nfsi-&gt;nrequests);</div><div class='hunk'>@@ -807,38 +766,6 @@ static void nfs_mark_request_dirty(struct nfs_page *req)</div><div class='ctx'> 		filemap_dirty_folio(folio_mapping(folio), folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * nfs_page_search_commits_for_head_request_locked</div><div class='del'>- *</div><div class='del'>- * Search through commit lists on @inode for the head request for @folio.</div><div class='del'>- * Must be called while holding the inode (which is cinfo) lock.</div><div class='del'>- *</div><div class='del'>- * Returns the head request if found, or NULL if not found.</div><div class='del'>- */</div><div class='del'>-static struct nfs_page *</div><div class='del'>-nfs_page_search_commits_for_head_request_locked(struct nfs_inode *nfsi,</div><div class='del'>-						struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct nfs_page *freq, *t;</div><div class='del'>-	struct nfs_commit_info cinfo;</div><div class='del'>-	struct inode *inode = &amp;nfsi-&gt;vfs_inode;</div><div class='del'>-</div><div class='del'>-	nfs_init_cinfo_from_inode(&amp;cinfo, inode);</div><div class='del'>-</div><div class='del'>-	/* search through pnfs commit lists */</div><div class='del'>-	freq = pnfs_search_commit_reqs(inode, &amp;cinfo, folio);</div><div class='del'>-	if (freq)</div><div class='del'>-		return freq-&gt;wb_head;</div><div class='del'>-</div><div class='del'>-	/* Linearly search the commit list for the correct request */</div><div class='del'>-	list_for_each_entry_safe(freq, t, &amp;cinfo.mds-&gt;list, wb_list) {</div><div class='del'>-		if (nfs_page_to_folio(freq) == folio)</div><div class='del'>-			return freq-&gt;wb_head;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nfs_request_add_commit_list_locked - add request to a commit list</div><div class='ctx'>  * @req: pointer to a struct nfs_page</div><div class='hunk'>@@ -945,7 +872,7 @@ static void nfs_folio_clear_commit(struct folio *folio)</div><div class='ctx'> 		long nr = folio_nr_pages(folio);</div><div class='ctx'> </div><div class='ctx'> 		node_stat_mod_folio(folio, NR_WRITEBACK, -nr);</div><div class='del'>-		wb_stat_mod(&amp;inode_to_bdi(folio_file_mapping(folio)-&gt;host)-&gt;wb,</div><div class='add'>+		wb_stat_mod(&amp;inode_to_bdi(folio-&gt;mapping-&gt;host)-&gt;wb,</div><div class='ctx'> 			    WB_WRITEBACK, -nr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1004,7 +931,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)</div><div class='ctx'> 			req-&gt;wb_nio = 0;</div><div class='ctx'> 			memcpy(&amp;req-&gt;wb_verf, &amp;hdr-&gt;verf.verifier, sizeof(req-&gt;wb_verf));</div><div class='ctx'> 			nfs_mark_request_commit(req, hdr-&gt;lseg, &amp;cinfo,</div><div class='del'>-				hdr-&gt;pgio_mirror_idx);</div><div class='add'>+				hdr-&gt;ds_commit_idx);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> remove_req:</div><div class='hunk'>@@ -1095,11 +1022,12 @@ static struct nfs_page *nfs_try_to_update_request(struct folio *folio,</div><div class='ctx'> 	unsigned int end;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='add'>+	trace_nfs_try_to_update_request(folio_inode(folio), offset, bytes);</div><div class='ctx'> 	end = offset + bytes;</div><div class='ctx'> </div><div class='ctx'> 	req = nfs_lock_and_join_requests(folio);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(req))</div><div class='del'>-		return req;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	rqend = req-&gt;wb_offset + req-&gt;wb_bytes;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1121,6 +1049,9 @@ static struct nfs_page *nfs_try_to_update_request(struct folio *folio,</div><div class='ctx'> 	else</div><div class='ctx'> 		req-&gt;wb_bytes = rqend - req-&gt;wb_offset;</div><div class='ctx'> 	req-&gt;wb_nio = 0;</div><div class='add'>+out:</div><div class='add'>+	trace_nfs_try_to_update_request_done(folio_inode(folio), offset, bytes,</div><div class='add'>+					     PTR_ERR_OR_ZERO(req));</div><div class='ctx'> 	return req;</div><div class='ctx'> out_flushme:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1130,7 +1061,8 @@ out_flushme:</div><div class='ctx'> 	 */</div><div class='ctx'> 	nfs_mark_request_dirty(req);</div><div class='ctx'> 	nfs_unlock_and_release_request(req);</div><div class='del'>-	error = nfs_wb_folio(folio_file_mapping(folio)-&gt;host, folio);</div><div class='add'>+	error = nfs_wb_folio(folio-&gt;mapping-&gt;host, folio);</div><div class='add'>+	trace_nfs_try_to_update_request_done(folio_inode(folio), offset, bytes, error);</div><div class='ctx'> 	return (error &lt; 0) ? ERR_PTR(error) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1168,6 +1100,7 @@ static int nfs_writepage_setup(struct nfs_open_context *ctx,</div><div class='ctx'> 	req = nfs_setup_write_request(ctx, folio, offset, count);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='ctx'> 		return PTR_ERR(req);</div><div class='add'>+	trace_nfs_writepage_setup(req);</div><div class='ctx'> 	/* Update file length */</div><div class='ctx'> 	nfs_grow_file(folio, offset, count);</div><div class='ctx'> 	nfs_mark_uptodate(req);</div><div class='hunk'>@@ -1206,7 +1139,7 @@ int nfs_flush_incompatible(struct file *file, struct folio *folio)</div><div class='ctx'> 		nfs_release_request(req);</div><div class='ctx'> 		if (!do_flush)</div><div class='ctx'> 			return 0;</div><div class='del'>-		status = nfs_wb_folio(folio_file_mapping(folio)-&gt;host, folio);</div><div class='add'>+		status = nfs_wb_folio(folio-&gt;mapping-&gt;host, folio);</div><div class='ctx'> 	} while (status == 0);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1280,7 +1213,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static bool nfs_folio_write_uptodate(struct folio *folio, unsigned int pagelen)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio_file_mapping(folio)-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (nfs_have_delegated_attributes(inode))</div><div class='hunk'>@@ -1301,7 +1234,7 @@ static bool</div><div class='ctx'> is_whole_file_wrlock(struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	return fl-&gt;fl_start == 0 &amp;&amp; fl-&gt;fl_end == OFFSET_MAX &amp;&amp;</div><div class='del'>-			fl-&gt;fl_type == F_WRLCK;</div><div class='add'>+			lock_is_write(fl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* If we know the page is up to date, and we're not using byte range locks (or</div><div class='hunk'>@@ -1319,12 +1252,15 @@ static int nfs_can_extend_write(struct file *file, struct folio *folio,</div><div class='ctx'> 	struct file_lock_context *flctx = locks_inode_context(inode);</div><div class='ctx'> 	struct file_lock *fl;</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int mntflags = NFS_SERVER(inode)-&gt;flags;</div><div class='ctx'> </div><div class='add'>+	if (mntflags &amp; NFS_MOUNT_NO_ALIGNWRITE)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (file-&gt;f_flags &amp; O_DSYNC)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (!nfs_folio_write_uptodate(folio, pagelen))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (NFS_PROTO(inode)-&gt;have_delegation(inode, FMODE_WRITE))</div><div class='add'>+	if (nfs_have_write_delegation(inode))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (!flctx || (list_empty_careful(&amp;flctx-&gt;flc_flock) &amp;&amp;</div><div class='ctx'> 		       list_empty_careful(&amp;flctx-&gt;flc_posix)))</div><div class='hunk'>@@ -1335,13 +1271,13 @@ static int nfs_can_extend_write(struct file *file, struct folio *folio,</div><div class='ctx'> 	spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> 	if (!list_empty(&amp;flctx-&gt;flc_posix)) {</div><div class='ctx'> 		fl = list_first_entry(&amp;flctx-&gt;flc_posix, struct file_lock,</div><div class='del'>-					fl_list);</div><div class='add'>+					c.flc_list);</div><div class='ctx'> 		if (is_whole_file_wrlock(fl))</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 	} else if (!list_empty(&amp;flctx-&gt;flc_flock)) {</div><div class='ctx'> 		fl = list_first_entry(&amp;flctx-&gt;flc_flock, struct file_lock,</div><div class='del'>-					fl_list);</div><div class='del'>-		if (fl-&gt;fl_type == F_WRLCK)</div><div class='add'>+					c.flc_list);</div><div class='add'>+		if (lock_is_write(fl))</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='hunk'>@@ -1358,28 +1294,35 @@ int nfs_update_folio(struct file *file, struct folio *folio,</div><div class='ctx'> 		     unsigned int offset, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_open_context *ctx = nfs_file_open_context(file);</div><div class='del'>-	struct address_space *mapping = folio_file_mapping(folio);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	unsigned int pagelen = nfs_folio_length(folio);</div><div class='ctx'> 	int		status = 0;</div><div class='ctx'> </div><div class='ctx'> 	nfs_inc_stats(inode, NFSIOS_VFSUPDATEPAGE);</div><div class='ctx'> </div><div class='add'>+	trace_nfs_update_folio(inode, offset, count);</div><div class='add'>+</div><div class='ctx'> 	dprintk("NFS:       nfs_update_folio(%pD2 %d@%lld)\n", file, count,</div><div class='del'>-		(long long)(folio_file_pos(folio) + offset));</div><div class='add'>+		(long long)(folio_pos(folio) + offset));</div><div class='ctx'> </div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (nfs_can_extend_write(file, folio, pagelen)) {</div><div class='del'>-		count = max(count + offset, pagelen);</div><div class='del'>-		offset = 0;</div><div class='add'>+		unsigned int end = count + offset;</div><div class='add'>+</div><div class='add'>+		offset = round_down(offset, PAGE_SIZE);</div><div class='add'>+		if (end &lt; pagelen)</div><div class='add'>+			end = min(round_up(end, PAGE_SIZE), pagelen);</div><div class='add'>+		count = end - offset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = nfs_writepage_setup(ctx, folio, offset, count);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		nfs_set_pageerror(mapping);</div><div class='ctx'> out:</div><div class='add'>+	trace_nfs_update_folio_done(inode, offset, count, status);</div><div class='ctx'> 	dprintk("NFS:       nfs_update_folio returns %d (isize %lld)\n",</div><div class='ctx'> 			status, (long long)i_size_read(inode));</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -1518,6 +1461,13 @@ void nfs_writeback_update_inode(struct nfs_pgio_header *hdr)</div><div class='ctx'> 	struct nfs_fattr *fattr = &amp;hdr-&gt;fattr;</div><div class='ctx'> 	struct inode *inode = hdr-&gt;inode;</div><div class='ctx'> </div><div class='add'>+	if (nfs_have_delegated_mtime(inode)) {</div><div class='add'>+		spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+		nfs_set_cache_invalid(inode, NFS_INO_INVALID_BLOCKS);</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	nfs_writeback_check_extend(hdr, fattr);</div><div class='ctx'> 	nfs_post_op_update_inode_force_wcc_locked(inode, fattr);</div><div class='hunk'>@@ -1585,7 +1535,8 @@ static int nfs_writeback_done(struct rpc_task *task,</div><div class='ctx'> 	/* Deal with the suid/sgid bit corner case */</div><div class='ctx'> 	if (nfs_should_remove_suid(inode)) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);</div><div class='add'>+		nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE</div><div class='add'>+				| NFS_INO_REVAL_FORCED);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1650,7 +1601,7 @@ static int wait_on_commit(struct nfs_mds_commit_info *cinfo)</div><div class='ctx'> 				       !atomic_read(&amp;cinfo-&gt;rpcs_out));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_commit_begin(struct nfs_mds_commit_info *cinfo)</div><div class='add'>+void nfs_commit_begin(struct nfs_mds_commit_info *cinfo)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;cinfo-&gt;rpcs_out);</div><div class='ctx'> }</div><div class='hunk'>@@ -1674,7 +1625,8 @@ EXPORT_SYMBOL_GPL(nfs_commitdata_release);</div><div class='ctx'> int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data,</div><div class='ctx'> 			const struct nfs_rpc_ops *nfs_ops,</div><div class='ctx'> 			const struct rpc_call_ops *call_ops,</div><div class='del'>-			int how, int flags)</div><div class='add'>+			int how, int flags,</div><div class='add'>+			struct nfsd_file *localio)</div><div class='ctx'> {</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> 	int priority = flush_task_priority(how);</div><div class='hunk'>@@ -1703,6 +1655,9 @@ int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFS: initiated commit call\n");</div><div class='ctx'> </div><div class='add'>+	if (localio)</div><div class='add'>+		return nfs_local_commit(localio, data, call_ops, how);</div><div class='add'>+</div><div class='ctx'> 	task = rpc_run_task(&amp;task_setup_data);</div><div class='ctx'> 	if (IS_ERR(task))</div><div class='ctx'> 		return PTR_ERR(task);</div><div class='hunk'>@@ -1802,6 +1757,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how,</div><div class='ctx'> 		struct nfs_commit_info *cinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_commit_data	*data;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='ctx'> 	unsigned short task_flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* another commit raced with us */</div><div class='hunk'>@@ -1818,9 +1774,13 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how,</div><div class='ctx'> 	nfs_init_commit(data, head, NULL, cinfo);</div><div class='ctx'> 	if (NFS_SERVER(inode)-&gt;nfs_client-&gt;cl_minorversion)</div><div class='ctx'> 		task_flags = RPC_TASK_MOVEABLE;</div><div class='add'>+</div><div class='add'>+	localio = nfs_local_open_fh(NFS_SERVER(inode)-&gt;nfs_client, data-&gt;cred,</div><div class='add'>+				    data-&gt;args.fh, &amp;data-&gt;context-&gt;nfl,</div><div class='add'>+				    data-&gt;context-&gt;mode);</div><div class='ctx'> 	return nfs_initiate_commit(NFS_CLIENT(inode), data, NFS_PROTO(inode),</div><div class='ctx'> 				   data-&gt;mds_ops, how,</div><div class='del'>-				   RPC_TASK_CRED_NOREF | task_flags);</div><div class='add'>+				   RPC_TASK_CRED_NOREF | task_flags, localio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1841,7 +1801,6 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)</div><div class='ctx'> 	struct nfs_page	*req;</div><div class='ctx'> 	int status = data-&gt;task.tk_status;</div><div class='ctx'> 	struct nfs_commit_info cinfo;</div><div class='del'>-	struct nfs_server *nfss;</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;data-&gt;pages)) {</div><div class='hunk'>@@ -1862,7 +1821,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)</div><div class='ctx'> 				nfs_mapping_set_error(folio, status);</div><div class='ctx'> 				nfs_inode_remove_request(req);</div><div class='ctx'> 			}</div><div class='del'>-			dprintk_cont(", error = %d\n", status);</div><div class='add'>+			dprintk(", error = %d\n", status);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1872,11 +1831,11 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)</div><div class='ctx'> 			/* We have a match */</div><div class='ctx'> 			if (folio)</div><div class='ctx'> 				nfs_inode_remove_request(req);</div><div class='del'>-			dprintk_cont(" OK\n");</div><div class='add'>+			dprintk(" OK\n");</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* We have a mismatch. Write the page again */</div><div class='del'>-		dprintk_cont(" mismatch\n");</div><div class='add'>+		dprintk(" mismatch\n");</div><div class='ctx'> 		nfs_mark_request_dirty(req);</div><div class='ctx'> 		atomic_long_inc(&amp;NFS_I(data-&gt;inode)-&gt;redirtied_pages);</div><div class='ctx'> 	next:</div><div class='hunk'>@@ -1884,9 +1843,6 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)</div><div class='ctx'> 		/* Latency breaker */</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	nfss = NFS_SERVER(data-&gt;inode);</div><div class='del'>-	if (atomic_long_read(&amp;nfss-&gt;writeback) &lt; NFS_CONGESTION_OFF_THRESH)</div><div class='del'>-		nfss-&gt;write_congested = 0;</div><div class='ctx'> </div><div class='ctx'> 	nfs_init_cinfo(&amp;cinfo, data-&gt;inode, data-&gt;dreq);</div><div class='ctx'> 	nfs_commit_end(cinfo.mds);</div><div class='hunk'>@@ -2062,6 +2018,7 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio)</div><div class='ctx'> 		 * release it */</div><div class='ctx'> 		nfs_inode_remove_request(req);</div><div class='ctx'> 		nfs_unlock_and_release_request(req);</div><div class='add'>+		folio_cancel_dirty(folio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2077,17 +2034,17 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio)</div><div class='ctx'>  */</div><div class='ctx'> int nfs_wb_folio(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	loff_t range_start = folio_file_pos(folio);</div><div class='del'>-	loff_t range_end = range_start + (loff_t)folio_size(folio) - 1;</div><div class='add'>+	loff_t range_start = folio_pos(folio);</div><div class='add'>+	size_t len = folio_size(folio);</div><div class='ctx'> 	struct writeback_control wbc = {</div><div class='ctx'> 		.sync_mode = WB_SYNC_ALL,</div><div class='ctx'> 		.nr_to_write = 0,</div><div class='ctx'> 		.range_start = range_start,</div><div class='del'>-		.range_end = range_end,</div><div class='add'>+		.range_end = range_start + len - 1,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	trace_nfs_writeback_folio(inode, folio);</div><div class='add'>+	trace_nfs_writeback_folio(inode, range_start, len);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		folio_wait_writeback(folio);</div><div class='hunk'>@@ -2105,7 +2062,7 @@ int nfs_wb_folio(struct inode *inode, struct folio *folio)</div><div class='ctx'> 			goto out_error;</div><div class='ctx'> 	}</div><div class='ctx'> out_error:</div><div class='del'>-	trace_nfs_writeback_folio_done(inode, folio, ret);</div><div class='add'>+	trace_nfs_writeback_folio_done(inode, range_start, len, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2121,13 +2078,17 @@ int nfs_migrate_folio(struct address_space *mapping, struct folio *dst,</div><div class='ctx'> 	 *        that we can safely release the inode reference while holding</div><div class='ctx'> 	 *        the folio lock.</div><div class='ctx'> 	 */</div><div class='del'>-	if (folio_test_private(src))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (folio_test_private(src)) {</div><div class='add'>+		if (mode == MIGRATE_SYNC)</div><div class='add'>+			nfs_wb_folio(src-&gt;mapping-&gt;host, src);</div><div class='add'>+		if (folio_test_private(src))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (folio_test_fscache(src)) {</div><div class='add'>+	if (folio_test_private_2(src)) { /* [DEPRECATED] */</div><div class='ctx'> 		if (mode == MIGRATE_ASYNC)</div><div class='ctx'> 			return -EBUSY;</div><div class='del'>-		folio_wait_fscache(src);</div><div class='add'>+		folio_wait_private_2(src);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return migrate_folio(mapping, dst, src, mode);</div><div class='head'>diff --git a/fs/nfs_common/Makefile b/fs/nfs_common/Makefile<br/>index 119c75ab9fd0..c10ead273ff2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/Makefile</a></div><div class='hunk'>@@ -6,5 +6,11 @@</div><div class='ctx'> obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o</div><div class='ctx'> nfs_acl-objs := nfsacl.o</div><div class='ctx'> </div><div class='add'>+CFLAGS_localio_trace.o += -I$(src)</div><div class='add'>+obj-$(CONFIG_NFS_COMMON_LOCALIO_SUPPORT) += nfs_localio.o</div><div class='add'>+nfs_localio-objs := nfslocalio.o localio_trace.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_GRACE_PERIOD) += grace.o</div><div class='ctx'> obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NFS_COMMON) += common.o</div><div class='head'>diff --git a/fs/nfs_common/common.c b/fs/nfs_common/common.c<br/>new file mode 100644<br/>index 000000000000..af09aed09fd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/common.c</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/nfs_common.h&gt;</div><div class='add'>+#include &lt;linux/nfs4.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We need to translate between nfs status return values and</div><div class='add'>+ * the local errno values which may not be the same.</div><div class='add'>+ */</div><div class='add'>+static const struct {</div><div class='add'>+	int stat;</div><div class='add'>+	int errno;</div><div class='add'>+} nfs_errtbl[] = {</div><div class='add'>+	{ NFS_OK,		0		},</div><div class='add'>+	{ NFSERR_PERM,		-EPERM		},</div><div class='add'>+	{ NFSERR_NOENT,		-ENOENT		},</div><div class='add'>+	{ NFSERR_IO,		-EIO		},</div><div class='add'>+	{ NFSERR_NXIO,		-ENXIO		},</div><div class='add'>+/*	{ NFSERR_EAGAIN,	-EAGAIN		}, */</div><div class='add'>+	{ NFSERR_ACCES,		-EACCES		},</div><div class='add'>+	{ NFSERR_EXIST,		-EEXIST		},</div><div class='add'>+	{ NFSERR_XDEV,		-EXDEV		},</div><div class='add'>+	{ NFSERR_NODEV,		-ENODEV		},</div><div class='add'>+	{ NFSERR_NOTDIR,	-ENOTDIR	},</div><div class='add'>+	{ NFSERR_ISDIR,		-EISDIR		},</div><div class='add'>+	{ NFSERR_INVAL,		-EINVAL		},</div><div class='add'>+	{ NFSERR_FBIG,		-EFBIG		},</div><div class='add'>+	{ NFSERR_NOSPC,		-ENOSPC		},</div><div class='add'>+	{ NFSERR_ROFS,		-EROFS		},</div><div class='add'>+	{ NFSERR_MLINK,		-EMLINK		},</div><div class='add'>+	{ NFSERR_NAMETOOLONG,	-ENAMETOOLONG	},</div><div class='add'>+	{ NFSERR_NOTEMPTY,	-ENOTEMPTY	},</div><div class='add'>+	{ NFSERR_DQUOT,		-EDQUOT		},</div><div class='add'>+	{ NFSERR_STALE,		-ESTALE		},</div><div class='add'>+	{ NFSERR_REMOTE,	-EREMOTE	},</div><div class='add'>+#ifdef EWFLUSH</div><div class='add'>+	{ NFSERR_WFLUSH,	-EWFLUSH	},</div><div class='add'>+#endif</div><div class='add'>+	{ NFSERR_BADHANDLE,	-EBADHANDLE	},</div><div class='add'>+	{ NFSERR_NOT_SYNC,	-ENOTSYNC	},</div><div class='add'>+	{ NFSERR_BAD_COOKIE,	-EBADCOOKIE	},</div><div class='add'>+	{ NFSERR_NOTSUPP,	-ENOTSUPP	},</div><div class='add'>+	{ NFSERR_TOOSMALL,	-ETOOSMALL	},</div><div class='add'>+	{ NFSERR_SERVERFAULT,	-EREMOTEIO	},</div><div class='add'>+	{ NFSERR_BADTYPE,	-EBADTYPE	},</div><div class='add'>+	{ NFSERR_JUKEBOX,	-EJUKEBOX	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfs_stat_to_errno - convert an NFS status code to a local errno</div><div class='add'>+ * @status: NFS status code to convert</div><div class='add'>+ *</div><div class='add'>+ * Returns a local errno value, or -EIO if the NFS status code is</div><div class='add'>+ * not recognized.  This function is used jointly by NFSv2 and NFSv3.</div><div class='add'>+ */</div><div class='add'>+int nfs_stat_to_errno(enum nfs_stat status)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nfs_errtbl); i++) {</div><div class='add'>+		if (nfs_errtbl[i].stat == (int)status)</div><div class='add'>+			return nfs_errtbl[i].errno;</div><div class='add'>+	}</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_stat_to_errno);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We need to translate between nfs v4 status return values and</div><div class='add'>+ * the local errno values which may not be the same.</div><div class='add'>+ *</div><div class='add'>+ * nfs4_errtbl_common[] is used before more specialized mappings</div><div class='add'>+ * available in nfs4_errtbl[] or nfs4_errtbl_localio[].</div><div class='add'>+ */</div><div class='add'>+static const struct {</div><div class='add'>+	int stat;</div><div class='add'>+	int errno;</div><div class='add'>+} nfs4_errtbl_common[] = {</div><div class='add'>+	{ NFS4_OK,		0		},</div><div class='add'>+	{ NFS4ERR_PERM,		-EPERM		},</div><div class='add'>+	{ NFS4ERR_NOENT,	-ENOENT		},</div><div class='add'>+	{ NFS4ERR_IO,		-EIO		},</div><div class='add'>+	{ NFS4ERR_NXIO,		-ENXIO		},</div><div class='add'>+	{ NFS4ERR_ACCESS,	-EACCES		},</div><div class='add'>+	{ NFS4ERR_EXIST,	-EEXIST		},</div><div class='add'>+	{ NFS4ERR_XDEV,		-EXDEV		},</div><div class='add'>+	{ NFS4ERR_NOTDIR,	-ENOTDIR	},</div><div class='add'>+	{ NFS4ERR_ISDIR,	-EISDIR		},</div><div class='add'>+	{ NFS4ERR_INVAL,	-EINVAL		},</div><div class='add'>+	{ NFS4ERR_FBIG,		-EFBIG		},</div><div class='add'>+	{ NFS4ERR_NOSPC,	-ENOSPC		},</div><div class='add'>+	{ NFS4ERR_ROFS,		-EROFS		},</div><div class='add'>+	{ NFS4ERR_MLINK,	-EMLINK		},</div><div class='add'>+	{ NFS4ERR_NAMETOOLONG,	-ENAMETOOLONG	},</div><div class='add'>+	{ NFS4ERR_NOTEMPTY,	-ENOTEMPTY	},</div><div class='add'>+	{ NFS4ERR_DQUOT,	-EDQUOT		},</div><div class='add'>+	{ NFS4ERR_STALE,	-ESTALE		},</div><div class='add'>+	{ NFS4ERR_BADHANDLE,	-EBADHANDLE	},</div><div class='add'>+	{ NFS4ERR_BAD_COOKIE,	-EBADCOOKIE	},</div><div class='add'>+	{ NFS4ERR_NOTSUPP,	-ENOTSUPP	},</div><div class='add'>+	{ NFS4ERR_TOOSMALL,	-ETOOSMALL	},</div><div class='add'>+	{ NFS4ERR_BADTYPE,	-EBADTYPE	},</div><div class='add'>+	{ NFS4ERR_SYMLINK,	-ELOOP		},</div><div class='add'>+	{ NFS4ERR_DEADLOCK,	-EDEADLK	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	int stat;</div><div class='add'>+	int errno;</div><div class='add'>+} nfs4_errtbl[] = {</div><div class='add'>+	{ NFS4ERR_SERVERFAULT,	-EREMOTEIO	},</div><div class='add'>+	{ NFS4ERR_LOCKED,	-EAGAIN		},</div><div class='add'>+	{ NFS4ERR_OP_ILLEGAL,	-EOPNOTSUPP	},</div><div class='add'>+	{ NFS4ERR_NOXATTR,	-ENODATA	},</div><div class='add'>+	{ NFS4ERR_XATTR2BIG,	-E2BIG		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert an NFS error code to a local one.</div><div class='add'>+ * This one is used by NFSv4.</div><div class='add'>+ */</div><div class='add'>+int nfs4_stat_to_errno(int stat)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* First check nfs4_errtbl_common */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nfs4_errtbl_common); i++) {</div><div class='add'>+		if (nfs4_errtbl_common[i].stat == stat)</div><div class='add'>+			return nfs4_errtbl_common[i].errno;</div><div class='add'>+	}</div><div class='add'>+	/* Then check nfs4_errtbl */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nfs4_errtbl); i++) {</div><div class='add'>+		if (nfs4_errtbl[i].stat == stat)</div><div class='add'>+			return nfs4_errtbl[i].errno;</div><div class='add'>+	}</div><div class='add'>+	if (stat &lt;= 10000 || stat &gt; 10100) {</div><div class='add'>+		/* The server is looney tunes. */</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+	/* If we cannot translate the error, the recovery routines should</div><div class='add'>+	 * handle it.</div><div class='add'>+	 * Note: remaining NFSv4 error codes have values &gt; 10000, so should</div><div class='add'>+	 * not conflict with native Linux error codes.</div><div class='add'>+	 */</div><div class='add'>+	return -stat;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs4_stat_to_errno);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This table is useful for conversion from local errno to NFS error.</div><div class='add'>+ * It provides more logically correct mappings for use with LOCALIO</div><div class='add'>+ * (which is focused on converting from errno to NFS status).</div><div class='add'>+ */</div><div class='add'>+static const struct {</div><div class='add'>+	int stat;</div><div class='add'>+	int errno;</div><div class='add'>+} nfs4_errtbl_localio[] = {</div><div class='add'>+	/* Map errors differently than nfs4_errtbl */</div><div class='add'>+	{ NFS4ERR_IO,		-EREMOTEIO	},</div><div class='add'>+	{ NFS4ERR_DELAY,	-EAGAIN		},</div><div class='add'>+	{ NFS4ERR_FBIG,		-E2BIG		},</div><div class='add'>+	/* Map errors not handled by nfs4_errtbl */</div><div class='add'>+	{ NFS4ERR_STALE,	-EBADF		},</div><div class='add'>+	{ NFS4ERR_STALE,	-EOPENSTALE	},</div><div class='add'>+	{ NFS4ERR_DELAY,	-ETIMEDOUT	},</div><div class='add'>+	{ NFS4ERR_DELAY,	-ERESTARTSYS	},</div><div class='add'>+	{ NFS4ERR_DELAY,	-ENOMEM		},</div><div class='add'>+	{ NFS4ERR_IO,		-ETXTBSY	},</div><div class='add'>+	{ NFS4ERR_IO,		-EBUSY		},</div><div class='add'>+	{ NFS4ERR_SERVERFAULT,	-ESERVERFAULT	},</div><div class='add'>+	{ NFS4ERR_SERVERFAULT,	-ENFILE		},</div><div class='add'>+	{ NFS4ERR_IO,		-EUCLEAN	},</div><div class='add'>+	{ NFS4ERR_PERM,		-ENOKEY		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert an errno to an NFS error code for LOCALIO.</div><div class='add'>+ */</div><div class='add'>+__u32 nfs_localio_errno_to_nfs4_stat(int errno)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* First check nfs4_errtbl_common */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nfs4_errtbl_common); i++) {</div><div class='add'>+		if (nfs4_errtbl_common[i].errno == errno)</div><div class='add'>+			return nfs4_errtbl_common[i].stat;</div><div class='add'>+	}</div><div class='add'>+	/* Then check nfs4_errtbl_localio */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nfs4_errtbl_localio); i++) {</div><div class='add'>+		if (nfs4_errtbl_localio[i].errno == errno)</div><div class='add'>+			return nfs4_errtbl_localio[i].stat;</div><div class='add'>+	}</div><div class='add'>+	/* If we cannot translate the error, the recovery routines should</div><div class='add'>+	 * handle it.</div><div class='add'>+	 * Note: remaining NFSv4 error codes have values &gt; 10000, so should</div><div class='add'>+	 * not conflict with native Linux error codes.</div><div class='add'>+	 */</div><div class='add'>+	return NFS4ERR_SERVERFAULT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_localio_errno_to_nfs4_stat);</div><div class='head'>diff --git a/fs/nfs_common/grace.c b/fs/nfs_common/grace.c<br/>index 1479583fbb62..27cd0d13143b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/grace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/grace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/grace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/grace.c</a></div><div class='hunk'>@@ -139,6 +139,7 @@ exit_grace(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jeff Layton &lt;jlayton@primarydata.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("NFS client and server infrastructure");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> module_init(init_grace)</div><div class='ctx'> module_exit(exit_grace)</div><div class='head'>diff --git a/fs/nfs_common/localio_trace.c b/fs/nfs_common/localio_trace.c<br/>new file mode 100644<br/>index 000000000000..7decfe57abeb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/localio_trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/localio_trace.c</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 Mike Snitzer &lt;snitzer@hammerspace.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "localio_trace.h"</div><div class='head'>diff --git a/fs/nfs_common/localio_trace.h b/fs/nfs_common/localio_trace.h<br/>new file mode 100644<br/>index 000000000000..4055aec9ff8d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/localio_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/localio_trace.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 Mike Snitzer &lt;snitzer@hammerspace.com&gt;</div><div class='add'>+ */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM nfs_localio</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_NFS_COMMON_LOCALIO_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _TRACE_NFS_COMMON_LOCALIO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;trace/misc/fs.h&gt;</div><div class='add'>+#include &lt;trace/misc/nfs.h&gt;</div><div class='add'>+#include &lt;trace/misc/sunrpc.h&gt;</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfs_local_client_event,</div><div class='add'>+		TP_PROTO(</div><div class='add'>+			const struct nfs_client *clp</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_ARGS(clp),</div><div class='add'>+</div><div class='add'>+		TP_STRUCT__entry(</div><div class='add'>+			__field(unsigned int, protocol)</div><div class='add'>+			__string(server, clp-&gt;cl_hostname)</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_fast_assign(</div><div class='add'>+			__entry-&gt;protocol = clp-&gt;rpc_ops-&gt;version;</div><div class='add'>+			__assign_str(server);</div><div class='add'>+		),</div><div class='add'>+</div><div class='add'>+		TP_printk(</div><div class='add'>+			"server=%s NFSv%u", __get_str(server), __entry-&gt;protocol</div><div class='add'>+		)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFS_LOCAL_CLIENT_EVENT(name) \</div><div class='add'>+	DEFINE_EVENT(nfs_local_client_event, name, \</div><div class='add'>+			TP_PROTO( \</div><div class='add'>+				const struct nfs_client *clp \</div><div class='add'>+			), \</div><div class='add'>+			TP_ARGS(clp))</div><div class='add'>+</div><div class='add'>+DEFINE_NFS_LOCAL_CLIENT_EVENT(nfs_localio_enable_client);</div><div class='add'>+DEFINE_NFS_LOCAL_CLIENT_EVENT(nfs_localio_disable_client);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_NFS_COMMON_LOCALIO_H */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#define TRACE_INCLUDE_FILE localio_trace</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c<br/>index 5a5bd85d08f8..e2eaac14fd8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/nfsacl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfs_common/nfsacl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/nfsacl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/nfsacl.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/nfs3.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NFS ACL support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> struct nfsacl_encode_desc {</div><div class='hunk'>@@ -41,7 +42,7 @@ struct nfsacl_encode_desc {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfsacl_simple_acl {</div><div class='del'>-	struct posix_acl acl;</div><div class='add'>+	struct posix_acl_hdr acl;</div><div class='ctx'> 	struct posix_acl_entry ace[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -111,7 +112,8 @@ int nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode,</div><div class='ctx'> 	    xdr_encode_word(buf, base, entries))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (encode_entries &amp;&amp; acl &amp;&amp; acl-&gt;a_count == 3) {</div><div class='del'>-		struct posix_acl *acl2 = &amp;aclbuf.acl;</div><div class='add'>+		struct posix_acl *acl2 =</div><div class='add'>+			container_of(&amp;aclbuf.acl, struct posix_acl, hdr);</div><div class='ctx'> </div><div class='ctx'> 		/* Avoid the use of posix_acl_alloc().  nfsacl_encode() is</div><div class='ctx'> 		 * invoked in contexts where a memory allocation failure is</div><div class='hunk'>@@ -176,7 +178,8 @@ bool nfs_stream_encode_acl(struct xdr_stream *xdr, struct inode *inode,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (encode_entries &amp;&amp; acl &amp;&amp; acl-&gt;a_count == 3) {</div><div class='del'>-		struct posix_acl *acl2 = &amp;aclbuf.acl;</div><div class='add'>+		struct posix_acl *acl2 =</div><div class='add'>+			container_of(&amp;aclbuf.acl, struct posix_acl, hdr);</div><div class='ctx'> </div><div class='ctx'> 		/* Avoid the use of posix_acl_alloc().  nfsacl_encode() is</div><div class='ctx'> 		 * invoked in contexts where a memory allocation failure is</div><div class='head'>diff --git a/fs/nfs_common/nfslocalio.c b/fs/nfs_common/nfslocalio.c<br/>new file mode 100644<br/>index 000000000000..dd715cdb6c04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfs_common/nfslocalio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfs_common/nfslocalio.c</a></div><div class='hunk'>@@ -0,0 +1,373 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Mike Snitzer &lt;snitzer@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 NeilBrown &lt;neilb@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='add'>+#include &lt;linux/nfs3.h&gt;</div><div class='add'>+#include &lt;linux/nfs4.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;net/netns/generic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "localio_trace.h"</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("NFS localio protocol bypass support");</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(nfs_uuids_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global list of nfs_uuid_t instances</div><div class='add'>+ * that is protected by nfs_uuids_lock.</div><div class='add'>+ */</div><div class='add'>+static LIST_HEAD(nfs_uuids);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lock ordering:</div><div class='add'>+ * 1: nfs_uuid-&gt;lock</div><div class='add'>+ * 2: nfs_uuids_lock</div><div class='add'>+ * 3: nfs_uuid-&gt;list_lock (aka nn-&gt;local_clients_lock)</div><div class='add'>+ *</div><div class='add'>+ * May skip locks in select cases, but never hold multiple</div><div class='add'>+ * locks out of order.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void nfs_uuid_init(nfs_uuid_t *nfs_uuid)</div><div class='add'>+{</div><div class='add'>+	RCU_INIT_POINTER(nfs_uuid-&gt;net, NULL);</div><div class='add'>+	nfs_uuid-&gt;dom = NULL;</div><div class='add'>+	nfs_uuid-&gt;list_lock = NULL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;nfs_uuid-&gt;list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;nfs_uuid-&gt;files);</div><div class='add'>+	spin_lock_init(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	nfs_uuid-&gt;nfs3_localio_probe_count = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_uuid_init);</div><div class='add'>+</div><div class='add'>+bool nfs_uuid_begin(nfs_uuid_t *nfs_uuid)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	if (rcu_access_pointer(nfs_uuid-&gt;net)) {</div><div class='add'>+		/* This nfs_uuid is already in use */</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nfs_uuids_lock);</div><div class='add'>+	if (!list_empty(&amp;nfs_uuid-&gt;list)) {</div><div class='add'>+		/* This nfs_uuid is already in use */</div><div class='add'>+		spin_unlock(&amp;nfs_uuids_lock);</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;nfs_uuid-&gt;list, &amp;nfs_uuids);</div><div class='add'>+	spin_unlock(&amp;nfs_uuids_lock);</div><div class='add'>+</div><div class='add'>+	uuid_gen(&amp;nfs_uuid-&gt;uuid);</div><div class='add'>+	spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_uuid_begin);</div><div class='add'>+</div><div class='add'>+void nfs_uuid_end(nfs_uuid_t *nfs_uuid)</div><div class='add'>+{</div><div class='add'>+	if (!rcu_access_pointer(nfs_uuid-&gt;net)) {</div><div class='add'>+		spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		if (!rcu_access_pointer(nfs_uuid-&gt;net)) {</div><div class='add'>+			/* Not local, remove from nfs_uuids */</div><div class='add'>+			spin_lock(&amp;nfs_uuids_lock);</div><div class='add'>+			list_del_init(&amp;nfs_uuid-&gt;list);</div><div class='add'>+			spin_unlock(&amp;nfs_uuids_lock);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+        }</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_uuid_end);</div><div class='add'>+</div><div class='add'>+static nfs_uuid_t * nfs_uuid_lookup_locked(const uuid_t *uuid)</div><div class='add'>+{</div><div class='add'>+	nfs_uuid_t *nfs_uuid;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nfs_uuid, &amp;nfs_uuids, list)</div><div class='add'>+		if (uuid_equal(&amp;nfs_uuid-&gt;uuid, uuid))</div><div class='add'>+			return nfs_uuid;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct module *nfsd_mod;</div><div class='add'>+</div><div class='add'>+void nfs_uuid_is_local(const uuid_t *uuid, struct list_head *list,</div><div class='add'>+		       spinlock_t *list_lock, struct net *net,</div><div class='add'>+		       struct auth_domain *dom, struct module *mod)</div><div class='add'>+{</div><div class='add'>+	nfs_uuid_t *nfs_uuid;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nfs_uuids_lock);</div><div class='add'>+	nfs_uuid = nfs_uuid_lookup_locked(uuid);</div><div class='add'>+	if (!nfs_uuid) {</div><div class='add'>+		spin_unlock(&amp;nfs_uuids_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't hold a ref on the net, but instead put</div><div class='add'>+	 * ourselves on @list (nn-&gt;local_clients) so the net</div><div class='add'>+	 * pointer can be invalidated.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(list_lock); /* list_lock is nn-&gt;local_clients_lock */</div><div class='add'>+	list_move(&amp;nfs_uuid-&gt;list, list);</div><div class='add'>+	spin_unlock(list_lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;nfs_uuids_lock);</div><div class='add'>+	/* Once nfs_uuid is parented to @list, avoid global nfs_uuids_lock */</div><div class='add'>+	spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+</div><div class='add'>+	__module_get(mod);</div><div class='add'>+	nfsd_mod = mod;</div><div class='add'>+</div><div class='add'>+	nfs_uuid-&gt;list_lock = list_lock;</div><div class='add'>+	kref_get(&amp;dom-&gt;ref);</div><div class='add'>+	nfs_uuid-&gt;dom = dom;</div><div class='add'>+	rcu_assign_pointer(nfs_uuid-&gt;net, net);</div><div class='add'>+	spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_uuid_is_local);</div><div class='add'>+</div><div class='add'>+void nfs_localio_enable_client(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	/* nfs_uuid_is_local() does the actual enablement */</div><div class='add'>+	trace_nfs_localio_enable_client(clp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_localio_enable_client);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cleanup the nfs_uuid_t embedded in an nfs_client.</div><div class='add'>+ * This is the long-form of nfs_uuid_init().</div><div class='add'>+ */</div><div class='add'>+static bool nfs_uuid_put(nfs_uuid_t *nfs_uuid)</div><div class='add'>+{</div><div class='add'>+	struct nfs_file_localio *nfl;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	if (unlikely(!rcu_access_pointer(nfs_uuid-&gt;net))) {</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	RCU_INIT_POINTER(nfs_uuid-&gt;net, NULL);</div><div class='add'>+</div><div class='add'>+	if (nfs_uuid-&gt;dom) {</div><div class='add'>+		auth_domain_put(nfs_uuid-&gt;dom);</div><div class='add'>+		nfs_uuid-&gt;dom = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Walk list of files and ensure their last references dropped */</div><div class='add'>+</div><div class='add'>+	while ((nfl = list_first_entry_or_null(&amp;nfs_uuid-&gt;files,</div><div class='add'>+					       struct nfs_file_localio,</div><div class='add'>+					       list)) != NULL) {</div><div class='add'>+		/* If nfs_uuid is already NULL, nfs_close_local_fh is</div><div class='add'>+		 * closing and we must wait, else we unlink and close.</div><div class='add'>+		 */</div><div class='add'>+		if (rcu_access_pointer(nfl-&gt;nfs_uuid) == NULL) {</div><div class='add'>+			/* nfs_close_local_fh() is doing the</div><div class='add'>+			 * close and we must wait. until it unlinks</div><div class='add'>+			 */</div><div class='add'>+			wait_var_event_spinlock(nfs_uuid,</div><div class='add'>+						list_first_entry_or_null(</div><div class='add'>+							&amp;nfs_uuid-&gt;files,</div><div class='add'>+							struct nfs_file_localio,</div><div class='add'>+							list) != nfl,</div><div class='add'>+						&amp;nfs_uuid-&gt;lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Remove nfl from nfs_uuid-&gt;files list */</div><div class='add'>+		list_del_init(&amp;nfl-&gt;list);</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+</div><div class='add'>+		nfs_to_nfsd_file_put_local(&amp;nfl-&gt;ro_file);</div><div class='add'>+		nfs_to_nfsd_file_put_local(&amp;nfl-&gt;rw_file);</div><div class='add'>+		cond_resched();</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		/* Now we can allow racing nfs_close_local_fh() to</div><div class='add'>+		 * skip the locking.</div><div class='add'>+		 */</div><div class='add'>+		store_release_wake_up(&amp;nfl-&gt;nfs_uuid, RCU_INITIALIZER(NULL));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove client from nn-&gt;local_clients */</div><div class='add'>+	if (nfs_uuid-&gt;list_lock) {</div><div class='add'>+		spin_lock(nfs_uuid-&gt;list_lock);</div><div class='add'>+		BUG_ON(list_empty(&amp;nfs_uuid-&gt;list));</div><div class='add'>+		list_del_init(&amp;nfs_uuid-&gt;list);</div><div class='add'>+		spin_unlock(nfs_uuid-&gt;list_lock);</div><div class='add'>+		nfs_uuid-&gt;list_lock = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	module_put(nfsd_mod);</div><div class='add'>+	spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_localio_disable_client(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+	if (nfs_uuid_put(&amp;clp-&gt;cl_uuid))</div><div class='add'>+		trace_nfs_localio_disable_client(clp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_localio_disable_client);</div><div class='add'>+</div><div class='add'>+void nfs_localio_invalidate_clients(struct list_head *nn_local_clients,</div><div class='add'>+				    spinlock_t *nn_local_clients_lock)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(local_clients);</div><div class='add'>+	nfs_uuid_t *nfs_uuid, *tmp;</div><div class='add'>+	struct nfs_client *clp;</div><div class='add'>+</div><div class='add'>+	spin_lock(nn_local_clients_lock);</div><div class='add'>+	list_splice_init(nn_local_clients, &amp;local_clients);</div><div class='add'>+	spin_unlock(nn_local_clients_lock);</div><div class='add'>+	list_for_each_entry_safe(nfs_uuid, tmp, &amp;local_clients, list) {</div><div class='add'>+		if (WARN_ON(nfs_uuid-&gt;list_lock != nn_local_clients_lock))</div><div class='add'>+			break;</div><div class='add'>+		clp = container_of(nfs_uuid, struct nfs_client, cl_uuid);</div><div class='add'>+		nfs_localio_disable_client(clp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_localio_invalidate_clients);</div><div class='add'>+</div><div class='add'>+static int nfs_uuid_add_file(nfs_uuid_t *nfs_uuid, struct nfs_file_localio *nfl)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Add nfl to nfs_uuid-&gt;files if it isn't already */</div><div class='add'>+	spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	if (rcu_access_pointer(nfs_uuid-&gt;net) == NULL) {</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+	} else if (list_empty(&amp;nfl-&gt;list)) {</div><div class='add'>+		rcu_assign_pointer(nfl-&gt;nfs_uuid, nfs_uuid);</div><div class='add'>+		list_add_tail(&amp;nfl-&gt;list, &amp;nfs_uuid-&gt;files);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Caller is responsible for calling nfsd_net_put and</div><div class='add'>+ * nfsd_file_put (via nfs_to_nfsd_file_put_local).</div><div class='add'>+ */</div><div class='add'>+struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid,</div><div class='add'>+		   struct rpc_clnt *rpc_clnt, const struct cred *cred,</div><div class='add'>+		   const struct nfs_fh *nfs_fh, struct nfs_file_localio *nfl,</div><div class='add'>+		   struct nfsd_file __rcu **pnf,</div><div class='add'>+		   const fmode_t fmode)</div><div class='add'>+{</div><div class='add'>+	struct net *net;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not running in nfsd context, so must safely get reference on nfsd_serv.</div><div class='add'>+	 * But the server may already be shutting down, if so disallow new localio.</div><div class='add'>+	 * uuid-&gt;net is NOT a counted reference, but rcu_read_lock() ensures that</div><div class='add'>+	 * if uuid-&gt;net is not NULL, then calling nfsd_net_try_get() is safe</div><div class='add'>+	 * and if it succeeds we will have an implied reference to the net.</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise NFS may not have ref on NFSD and therefore cannot safely</div><div class='add'>+	 * make 'nfs_to' calls.</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	net = rcu_dereference(uuid-&gt;net);</div><div class='add'>+	if (!net || !nfs_to-&gt;nfsd_net_try_get(net)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return ERR_PTR(-ENXIO);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	/* We have an implied reference to net thanks to nfsd_net_try_get */</div><div class='add'>+	localio = nfs_to-&gt;nfsd_open_local_fh(net, uuid-&gt;dom, rpc_clnt, cred,</div><div class='add'>+					     nfs_fh, pnf, fmode);</div><div class='add'>+	if (!IS_ERR(localio) &amp;&amp; nfs_uuid_add_file(uuid, nfl) &lt; 0) {</div><div class='add'>+		/* Delete the cached file when racing with nfs_uuid_put() */</div><div class='add'>+		nfs_to_nfsd_file_put_local(pnf);</div><div class='add'>+	}</div><div class='add'>+	nfs_to_nfsd_net_put(net);</div><div class='add'>+</div><div class='add'>+	return localio;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_open_local_fh);</div><div class='add'>+</div><div class='add'>+void nfs_close_local_fh(struct nfs_file_localio *nfl)</div><div class='add'>+{</div><div class='add'>+	nfs_uuid_t *nfs_uuid;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	nfs_uuid = rcu_dereference(nfl-&gt;nfs_uuid);</div><div class='add'>+	if (!nfs_uuid) {</div><div class='add'>+		/* regular (non-LOCALIO) NFS will hammer this */</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	if (!rcu_access_pointer(nfl-&gt;nfs_uuid)) {</div><div class='add'>+		/* nfs_uuid_put has finished here */</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (list_empty(&amp;nfl-&gt;list)) {</div><div class='add'>+		/* nfs_uuid_put() has started closing files, wait for it</div><div class='add'>+		 * to finished</div><div class='add'>+		 */</div><div class='add'>+		spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		wait_var_event(&amp;nfl-&gt;nfs_uuid,</div><div class='add'>+			       rcu_access_pointer(nfl-&gt;nfs_uuid) == NULL);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* tell nfs_uuid_put() to wait for us */</div><div class='add'>+	RCU_INIT_POINTER(nfl-&gt;nfs_uuid, NULL);</div><div class='add'>+	spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	nfs_to_nfsd_file_put_local(&amp;nfl-&gt;ro_file);</div><div class='add'>+	nfs_to_nfsd_file_put_local(&amp;nfl-&gt;rw_file);</div><div class='add'>+</div><div class='add'>+	/* Remove nfl from nfs_uuid-&gt;files list and signal nfs_uuid_put()</div><div class='add'>+	 * that we are done.  The moment we drop the spinlock the</div><div class='add'>+	 * nfs_uuid could be freed.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+	list_del_init(&amp;nfl-&gt;list);</div><div class='add'>+	wake_up_var_locked(nfs_uuid, &amp;nfs_uuid-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;nfs_uuid-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_close_local_fh);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The NFS LOCALIO code needs to call into NFSD using various symbols,</div><div class='add'>+ * but cannot be statically linked, because that will make the NFS</div><div class='add'>+ * module always depend on the NFSD module.</div><div class='add'>+ *</div><div class='add'>+ * 'nfs_to' provides NFS access to NFSD functions needed for LOCALIO,</div><div class='add'>+ * its lifetime is tightly coupled to the NFSD module and will always</div><div class='add'>+ * be available to NFS LOCALIO because any successful client&lt;-&gt;server</div><div class='add'>+ * LOCALIO handshake results in a reference on the NFSD module (above),</div><div class='add'>+ * so NFS implicitly holds a reference to the NFSD module and its</div><div class='add'>+ * functions in the 'nfs_to' nfsd_localio_operations cannot disappear.</div><div class='add'>+ *</div><div class='add'>+ * If the last NFS client using LOCALIO disconnects (and its reference</div><div class='add'>+ * on NFSD dropped) then NFSD could be unloaded, resulting in 'nfs_to'</div><div class='add'>+ * functions being invalid pointers. But if NFSD isn't loaded then NFS</div><div class='add'>+ * will not be able to handshake with NFSD and will have no cause to</div><div class='add'>+ * try to call 'nfs_to' function pointers. If/when NFSD is reloaded it</div><div class='add'>+ * will reinitialize the 'nfs_to' function pointers and make LOCALIO</div><div class='add'>+ * possible.</div><div class='add'>+ */</div><div class='add'>+const struct nfsd_localio_operations *nfs_to;</div><div class='add'>+EXPORT_SYMBOL_GPL(nfs_to);</div><div class='head'>diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig<br/>index 272ab8d5c4d7..0b5c1a0bf1cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/Kconfig</a></div><div class='hunk'>@@ -4,9 +4,13 @@ config NFSD</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	depends on FILE_LOCKING</div><div class='ctx'> 	depends on FSNOTIFY</div><div class='add'>+	select CRC32</div><div class='add'>+	select CRYPTO_LIB_MD5 if NFSD_LEGACY_CLIENT_TRACKING</div><div class='add'>+	select CRYPTO_LIB_SHA256 if NFSD_V4</div><div class='ctx'> 	select LOCKD</div><div class='ctx'> 	select SUNRPC</div><div class='ctx'> 	select EXPORTFS</div><div class='add'>+	select NFS_COMMON</div><div class='ctx'> 	select NFS_ACL_SUPPORT if NFSD_V2_ACL</div><div class='ctx'> 	select NFS_ACL_SUPPORT if NFSD_V3_ACL</div><div class='ctx'> 	depends on MULTIUSER</div><div class='hunk'>@@ -74,9 +78,7 @@ config NFSD_V4</div><div class='ctx'> 	depends on NFSD &amp;&amp; PROC_FS</div><div class='ctx'> 	select FS_POSIX_ACL</div><div class='ctx'> 	select RPCSEC_GSS_KRB5</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	select CRYPTO_SHA256</div><div class='add'>+	select CRYPTO # required by RPCSEC_GSS_KRB5</div><div class='ctx'> 	select GRACE_PERIOD</div><div class='ctx'> 	select NFS_V4_2_SSC_HELPER if NFS_V4_2</div><div class='ctx'> 	help</div><div class='hunk'>@@ -171,6 +173,16 @@ config NFSD_LEGACY_CLIENT_TRACKING</div><div class='ctx'> 	  recoverydir, or spawn a process directly using a usermodehelper</div><div class='ctx'> 	  upcall.</div><div class='ctx'> </div><div class='del'>-	  These legacy client tracking methods have proven to be probelmatic</div><div class='add'>+	  These legacy client tracking methods have proven to be problematic</div><div class='ctx'> 	  and will be removed in the future. Say Y here if you need support</div><div class='ctx'> 	  for them in the interim.</div><div class='add'>+</div><div class='add'>+config NFSD_V4_DELEG_TIMESTAMPS</div><div class='add'>+	bool "Support delegated timestamps"</div><div class='add'>+	depends on NFSD_V4</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  NFSD implements delegated timestamps according to</div><div class='add'>+	  draft-ietf-nfsv4-delstid-08 "Extending the Opening of Files". This</div><div class='add'>+	  is currently an experimental feature and is therefore left disabled</div><div class='add'>+	  by default.</div><div class='head'>diff --git a/fs/nfsd/Makefile b/fs/nfsd/Makefile<br/>index b8736a82e57c..55744bb786c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/Makefile</a></div><div class='hunk'>@@ -18,8 +18,24 @@ nfsd-$(CONFIG_NFSD_V2) += nfsproc.o nfsxdr.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \</div><div class='del'>-			   nfs4acl.o nfs4callback.o nfs4recover.o</div><div class='add'>+			   nfs4acl.o nfs4callback.o nfs4recover.o nfs4xdr_gen.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_PNFS) += nfs4layouts.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_BLOCKLAYOUT) += blocklayout.o blocklayoutxdr.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_SCSILAYOUT) += blocklayout.o blocklayoutxdr.o</div><div class='ctx'> nfsd-$(CONFIG_NFSD_FLEXFILELAYOUT) += flexfilelayout.o flexfilelayoutxdr.o</div><div class='add'>+nfsd-$(CONFIG_NFS_LOCALIO) += localio.o</div><div class='add'>+nfsd-$(CONFIG_DEBUG_FS) += debugfs.o</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.PHONY: xdrgen</div><div class='add'>+</div><div class='add'>+xdrgen: ../../include/linux/sunrpc/xdrgen/nfs4_1.h nfs4xdr_gen.h nfs4xdr_gen.c</div><div class='add'>+</div><div class='add'>+../../include/linux/sunrpc/xdrgen/nfs4_1.h: ../../Documentation/sunrpc/xdr/nfs4_1.x</div><div class='add'>+	../../tools/net/sunrpc/xdrgen/xdrgen definitions $&lt; &gt; $@</div><div class='add'>+</div><div class='add'>+nfs4xdr_gen.h: ../../Documentation/sunrpc/xdr/nfs4_1.x</div><div class='add'>+	../../tools/net/sunrpc/xdrgen/xdrgen declarations $&lt; &gt; $@</div><div class='add'>+</div><div class='add'>+nfs4xdr_gen.c: ../../Documentation/sunrpc/xdr/nfs4_1.x</div><div class='add'>+	../../tools/net/sunrpc/xdrgen/xdrgen source $&lt; &gt; $@</div><div class='head'>diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c<br/>index e6beaaf4f170..4dc327e02456 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/auth.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/auth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/auth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/auth.c</a></div><div class='hunk'>@@ -5,37 +5,37 @@</div><div class='ctx'> #include "nfsd.h"</div><div class='ctx'> #include "auth.h"</div><div class='ctx'> </div><div class='del'>-int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)</div><div class='add'>+int nfsexp_flags(struct svc_cred *cred, struct svc_export *exp)</div><div class='ctx'> {</div><div class='ctx'> 	struct exp_flavor_info *f;</div><div class='ctx'> 	struct exp_flavor_info *end = exp-&gt;ex_flavors + exp-&gt;ex_nflavors;</div><div class='ctx'> </div><div class='ctx'> 	for (f = exp-&gt;ex_flavors; f &lt; end; f++) {</div><div class='del'>-		if (f-&gt;pseudoflavor == rqstp-&gt;rq_cred.cr_flavor)</div><div class='add'>+		if (f-&gt;pseudoflavor == cred-&gt;cr_flavor)</div><div class='ctx'> 			return f-&gt;flags;</div><div class='ctx'> 	}</div><div class='ctx'> 	return exp-&gt;ex_flags;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)</div><div class='add'>+int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp)</div><div class='ctx'> {</div><div class='ctx'> 	struct group_info *rqgi;</div><div class='ctx'> 	struct group_info *gi;</div><div class='ctx'> 	struct cred *new;</div><div class='ctx'> 	int i;</div><div class='del'>-	int flags = nfsexp_flags(rqstp, exp);</div><div class='add'>+	int flags = nfsexp_flags(cred, exp);</div><div class='ctx'> </div><div class='ctx'> 	/* discard any old override before preparing the new set */</div><div class='del'>-	revert_creds(get_cred(current_real_cred()));</div><div class='add'>+	put_cred(revert_creds(get_cred(current_real_cred())));</div><div class='ctx'> 	new = prepare_creds();</div><div class='ctx'> 	if (!new)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	new-&gt;fsuid = rqstp-&gt;rq_cred.cr_uid;</div><div class='del'>-	new-&gt;fsgid = rqstp-&gt;rq_cred.cr_gid;</div><div class='add'>+	new-&gt;fsuid = cred-&gt;cr_uid;</div><div class='add'>+	new-&gt;fsgid = cred-&gt;cr_gid;</div><div class='ctx'> </div><div class='del'>-	rqgi = rqstp-&gt;rq_cred.cr_group_info;</div><div class='add'>+	rqgi = cred-&gt;cr_group_info;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; NFSEXP_ALLSQUASH) {</div><div class='ctx'> 		new-&gt;fsuid = exp-&gt;ex_anon_uid;</div><div class='hunk'>@@ -80,7 +80,6 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)</div><div class='ctx'> 		new-&gt;cap_effective = cap_raise_nfsd_set(new-&gt;cap_effective,</div><div class='ctx'> 							new-&gt;cap_permitted);</div><div class='ctx'> 	put_cred(override_creds(new));</div><div class='del'>-	put_cred(new);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> oom:</div><div class='head'>diff --git a/fs/nfsd/auth.h b/fs/nfsd/auth.h<br/>index dbd66424f600..8c5031bbbcee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/auth.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/auth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/auth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/auth.h</a></div><div class='hunk'>@@ -12,6 +12,6 @@</div><div class='ctx'>  * Set the current process's fsuid/fsgid etc to those of the NFS</div><div class='ctx'>  * client user</div><div class='ctx'>  */</div><div class='del'>-int nfsd_setuser(struct svc_rqst *, struct svc_export *);</div><div class='add'>+int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp);</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_NFSD_AUTH_H */</div><div class='head'>diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c<br/>index 46fd74d91ea9..afa16d7a8013 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/blocklayout.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/blocklayout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/blocklayout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/blocklayout.c</a></div><div class='hunk'>@@ -13,67 +13,49 @@</div><div class='ctx'> #include "pnfs.h"</div><div class='ctx'> #include "filecache.h"</div><div class='ctx'> #include "vfs.h"</div><div class='add'>+#include "trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDDBG_FACILITY	NFSDDBG_PNFS</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Get an extent from the file system that starts at offset or below</div><div class='add'>+ * and may be shorter than the requested length.</div><div class='add'>+ */</div><div class='ctx'> static __be32</div><div class='del'>-nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,</div><div class='del'>-		struct nfsd4_layoutget *args)</div><div class='add'>+nfsd4_block_map_extent(struct inode *inode, const struct svc_fh *fhp,</div><div class='add'>+		u64 offset, u64 length, u32 iomode, u64 minlength,</div><div class='add'>+		struct pnfs_block_extent *bex)</div><div class='ctx'> {</div><div class='del'>-	struct nfsd4_layout_seg *seg = &amp;args-&gt;lg_seg;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	u32 block_size = i_blocksize(inode);</div><div class='del'>-	struct pnfs_block_extent *bex;</div><div class='ctx'> 	struct iomap iomap;</div><div class='ctx'> 	u32 device_generation = 0;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (seg-&gt;offset &amp; (block_size - 1)) {</div><div class='del'>-		dprintk("pnfsd: I/O misaligned\n");</div><div class='del'>-		goto out_layoutunavailable;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Some clients barf on non-zero block numbers for NONE or INVALID</div><div class='del'>-	 * layouts, so make sure to zero the whole structure.</div><div class='del'>-	 */</div><div class='del'>-	error = -ENOMEM;</div><div class='del'>-	bex = kzalloc(sizeof(*bex), GFP_KERNEL);</div><div class='del'>-	if (!bex)</div><div class='del'>-		goto out_error;</div><div class='del'>-	args-&gt;lg_content = bex;</div><div class='del'>-</div><div class='del'>-	error = sb-&gt;s_export_op-&gt;map_blocks(inode, seg-&gt;offset, seg-&gt;length,</div><div class='del'>-					    &amp;iomap, seg-&gt;iomode != IOMODE_READ,</div><div class='del'>-					    &amp;device_generation);</div><div class='add'>+	error = sb-&gt;s_export_op-&gt;map_blocks(inode, offset, length, &amp;iomap,</div><div class='add'>+			iomode != IOMODE_READ, &amp;device_generation);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		if (error == -ENXIO)</div><div class='del'>-			goto out_layoutunavailable;</div><div class='del'>-		goto out_error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (iomap.length &lt; args-&gt;lg_minlength) {</div><div class='del'>-		dprintk("pnfsd: extent smaller than minlength\n");</div><div class='del'>-		goto out_layoutunavailable;</div><div class='add'>+			return nfserr_layoutunavailable;</div><div class='add'>+		return nfserrno(error);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (iomap.type) {</div><div class='ctx'> 	case IOMAP_MAPPED:</div><div class='del'>-		if (seg-&gt;iomode == IOMODE_READ)</div><div class='add'>+		if (iomode == IOMODE_READ)</div><div class='ctx'> 			bex-&gt;es = PNFS_BLOCK_READ_DATA;</div><div class='ctx'> 		else</div><div class='ctx'> 			bex-&gt;es = PNFS_BLOCK_READWRITE_DATA;</div><div class='ctx'> 		bex-&gt;soff = iomap.addr;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IOMAP_UNWRITTEN:</div><div class='del'>-		if (seg-&gt;iomode &amp; IOMODE_RW) {</div><div class='add'>+		if (iomode &amp; IOMODE_RW) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Crack monkey special case from section 2.3.1.</div><div class='ctx'> 			 */</div><div class='del'>-			if (args-&gt;lg_minlength == 0) {</div><div class='add'>+			if (minlength == 0) {</div><div class='ctx'> 				dprintk("pnfsd: no soup for you!\n");</div><div class='del'>-				goto out_layoutunavailable;</div><div class='add'>+				return nfserr_layoutunavailable;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			bex-&gt;es = PNFS_BLOCK_INVALID_DATA;</div><div class='hunk'>@@ -82,7 +64,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,</div><div class='ctx'> 		}</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case IOMAP_HOLE:</div><div class='del'>-		if (seg-&gt;iomode == IOMODE_READ) {</div><div class='add'>+		if (iomode == IOMODE_READ) {</div><div class='ctx'> 			bex-&gt;es = PNFS_BLOCK_NONE_DATA;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -90,27 +72,107 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,</div><div class='ctx'> 	case IOMAP_DELALLOC:</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN(1, "pnfsd: filesystem returned %d extent\n", iomap.type);</div><div class='del'>-		goto out_layoutunavailable;</div><div class='add'>+		return nfserr_layoutunavailable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = nfsd4_set_deviceid(&amp;bex-&gt;vol_id, fhp, device_generation);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out_error;</div><div class='add'>+		return nfserrno(error);</div><div class='add'>+</div><div class='ctx'> 	bex-&gt;foff = iomap.offset;</div><div class='ctx'> 	bex-&gt;len = iomap.length;</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	seg-&gt;offset = iomap.offset;</div><div class='del'>-	seg-&gt;length = iomap.length;</div><div class='add'>+static __be32</div><div class='add'>+nfsd4_block_proc_layoutget(struct svc_rqst *rqstp, struct inode *inode,</div><div class='add'>+		const struct svc_fh *fhp, struct nfsd4_layoutget *args)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_layout_seg *seg = &amp;args-&gt;lg_seg;</div><div class='add'>+	struct pnfs_block_layout *bl;</div><div class='add'>+	struct pnfs_block_extent *first_bex, *last_bex;</div><div class='add'>+	u64 offset = seg-&gt;offset, length = seg-&gt;length;</div><div class='add'>+	u32 i, nr_extents_max, block_size = i_blocksize(inode);</div><div class='add'>+	__be32 nfserr;</div><div class='ctx'> </div><div class='del'>-	dprintk("GET: 0x%llx:0x%llx %d\n", bex-&gt;foff, bex-&gt;len, bex-&gt;es);</div><div class='del'>-	return 0;</div><div class='add'>+	if (locks_in_grace(SVC_NET(rqstp)))</div><div class='add'>+		return nfserr_grace;</div><div class='add'>+</div><div class='add'>+	nfserr = nfserr_layoutunavailable;</div><div class='add'>+	if (seg-&gt;offset &amp; (block_size - 1)) {</div><div class='add'>+		dprintk("pnfsd: I/O misaligned\n");</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RFC 8881, section 3.3.17:</div><div class='add'>+	 *   The layout4 data type defines a layout for a file.</div><div class='add'>+	 *</div><div class='add'>+	 * RFC 8881, section 18.43.3:</div><div class='add'>+	 *   The loga_maxcount field specifies the maximum layout size</div><div class='add'>+	 *   (in bytes) that the client can handle. If the size of the</div><div class='add'>+	 *   layout structure exceeds the size specified by maxcount,</div><div class='add'>+	 *   the metadata server will return the NFS4ERR_TOOSMALL error.</div><div class='add'>+	 */</div><div class='add'>+	nfserr = nfserr_toosmall;</div><div class='add'>+	if (args-&gt;lg_maxcount &lt; PNFS_BLOCK_LAYOUT4_SIZE +</div><div class='add'>+				PNFS_BLOCK_EXTENT_SIZE)</div><div class='add'>+		goto out_error;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Limit the maximum layout size to avoid allocating</div><div class='add'>+	 * a large buffer on the server for each layout request.</div><div class='add'>+	 */</div><div class='add'>+	nr_extents_max = (min(args-&gt;lg_maxcount, PAGE_SIZE) -</div><div class='add'>+			  PNFS_BLOCK_LAYOUT4_SIZE) / PNFS_BLOCK_EXTENT_SIZE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some clients barf on non-zero block numbers for NONE or INVALID</div><div class='add'>+	 * layouts, so make sure to zero the whole structure.</div><div class='add'>+	 */</div><div class='add'>+	nfserr = nfserrno(-ENOMEM);</div><div class='add'>+	bl = kzalloc(struct_size(bl, extents, nr_extents_max), GFP_KERNEL);</div><div class='add'>+	if (!bl)</div><div class='add'>+		goto out_error;</div><div class='add'>+	bl-&gt;nr_extents = nr_extents_max;</div><div class='add'>+	args-&gt;lg_content = bl;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bl-&gt;nr_extents; i++) {</div><div class='add'>+		struct pnfs_block_extent *bex = bl-&gt;extents + i;</div><div class='add'>+		u64 bex_length;</div><div class='add'>+</div><div class='add'>+		nfserr = nfsd4_block_map_extent(inode, fhp, offset, length,</div><div class='add'>+				seg-&gt;iomode, args-&gt;lg_minlength, bex);</div><div class='add'>+		if (nfserr != nfs_ok)</div><div class='add'>+			goto out_error;</div><div class='add'>+</div><div class='add'>+		bex_length = bex-&gt;len - (offset - bex-&gt;foff);</div><div class='add'>+		if (bex_length &gt;= length) {</div><div class='add'>+			bl-&gt;nr_extents = i + 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		offset = bex-&gt;foff + bex-&gt;len;</div><div class='add'>+		length -= bex_length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	first_bex = bl-&gt;extents;</div><div class='add'>+	last_bex = bl-&gt;extents + bl-&gt;nr_extents - 1;</div><div class='add'>+</div><div class='add'>+	nfserr = nfserr_layoutunavailable;</div><div class='add'>+	length = last_bex-&gt;foff + last_bex-&gt;len - seg-&gt;offset;</div><div class='add'>+	if (length &lt; args-&gt;lg_minlength) {</div><div class='add'>+		dprintk("pnfsd: extent smaller than minlength\n");</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seg-&gt;offset = first_bex-&gt;foff;</div><div class='add'>+	seg-&gt;length = last_bex-&gt;foff - first_bex-&gt;foff + last_bex-&gt;len;</div><div class='add'>+	return nfs_ok;</div><div class='ctx'> </div><div class='ctx'> out_error:</div><div class='ctx'> 	seg-&gt;length = 0;</div><div class='del'>-	return nfserrno(error);</div><div class='del'>-out_layoutunavailable:</div><div class='del'>-	seg-&gt;length = 0;</div><div class='del'>-	return nfserr_layoutunavailable;</div><div class='add'>+	return nfserr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='hunk'>@@ -118,7 +180,6 @@ nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit *lcp,</div><div class='ctx'> 		struct iomap *iomaps, int nr_iomaps)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec64 mtime = inode_get_mtime(inode);</div><div class='del'>-	loff_t new_size = lcp-&gt;lc_last_wr + 1;</div><div class='ctx'> 	struct iattr iattr = { .ia_valid = 0 };</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -128,9 +189,9 @@ nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit *lcp,</div><div class='ctx'> 	iattr.ia_valid |= ATTR_ATIME | ATTR_CTIME | ATTR_MTIME;</div><div class='ctx'> 	iattr.ia_atime = iattr.ia_ctime = iattr.ia_mtime = lcp-&gt;lc_mtime;</div><div class='ctx'> </div><div class='del'>-	if (new_size &gt; i_size_read(inode)) {</div><div class='add'>+	if (lcp-&gt;lc_size_chg) {</div><div class='ctx'> 		iattr.ia_valid |= ATTR_SIZE;</div><div class='del'>-		iattr.ia_size = new_size;</div><div class='add'>+		iattr.ia_size = lcp-&gt;lc_newsize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = inode-&gt;i_sb-&gt;s_export_op-&gt;commit_blocks(inode, iomaps,</div><div class='hunk'>@@ -147,8 +208,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb,</div><div class='ctx'> 	struct pnfs_block_deviceaddr *dev;</div><div class='ctx'> 	struct pnfs_block_volume *b;</div><div class='ctx'> </div><div class='del'>-	dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +</div><div class='del'>-		      sizeof(struct pnfs_block_volume), GFP_KERNEL);</div><div class='add'>+	dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	gdp-&gt;gd_device = dev;</div><div class='hunk'>@@ -174,16 +234,20 @@ nfsd4_block_proc_getdeviceinfo(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='del'>-nfsd4_block_proc_layoutcommit(struct inode *inode,</div><div class='add'>+nfsd4_block_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp,</div><div class='ctx'> 		struct nfsd4_layoutcommit *lcp)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap *iomaps;</div><div class='ctx'> 	int nr_iomaps;</div><div class='add'>+	__be32 nfserr;</div><div class='add'>+</div><div class='add'>+	rqstp-&gt;rq_arg = lcp-&gt;lc_up_layout;</div><div class='add'>+	svcxdr_init_decode(rqstp);</div><div class='ctx'> </div><div class='del'>-	nr_iomaps = nfsd4_block_decode_layoutupdate(lcp-&gt;lc_up_layout,</div><div class='del'>-			lcp-&gt;lc_up_len, &amp;iomaps, i_blocksize(inode));</div><div class='del'>-	if (nr_iomaps &lt; 0)</div><div class='del'>-		return nfserrno(nr_iomaps);</div><div class='add'>+	nfserr = nfsd4_block_decode_layoutupdate(&amp;rqstp-&gt;rq_arg_stream,</div><div class='add'>+			&amp;iomaps, &amp;nr_iomaps, i_blocksize(inode));</div><div class='add'>+	if (nfserr != nfs_ok)</div><div class='add'>+		return nfserr;</div><div class='ctx'> </div><div class='ctx'> 	return nfsd4_block_commit_blocks(inode, lcp, iomaps, nr_iomaps);</div><div class='ctx'> }</div><div class='hunk'>@@ -255,8 +319,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb,</div><div class='ctx'> 	const struct pr_ops *ops;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +</div><div class='del'>-		      sizeof(struct pnfs_block_volume), GFP_KERNEL);</div><div class='add'>+	dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	gdp-&gt;gd_device = dev;</div><div class='hunk'>@@ -313,28 +376,35 @@ nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb,</div><div class='ctx'> 	return nfserrno(nfsd4_block_get_device_info_scsi(sb, clp, gdp));</div><div class='ctx'> }</div><div class='ctx'> static __be32</div><div class='del'>-nfsd4_scsi_proc_layoutcommit(struct inode *inode,</div><div class='add'>+nfsd4_scsi_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp,</div><div class='ctx'> 		struct nfsd4_layoutcommit *lcp)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap *iomaps;</div><div class='ctx'> 	int nr_iomaps;</div><div class='add'>+	__be32 nfserr;</div><div class='add'>+</div><div class='add'>+	rqstp-&gt;rq_arg = lcp-&gt;lc_up_layout;</div><div class='add'>+	svcxdr_init_decode(rqstp);</div><div class='ctx'> </div><div class='del'>-	nr_iomaps = nfsd4_scsi_decode_layoutupdate(lcp-&gt;lc_up_layout,</div><div class='del'>-			lcp-&gt;lc_up_len, &amp;iomaps, i_blocksize(inode));</div><div class='del'>-	if (nr_iomaps &lt; 0)</div><div class='del'>-		return nfserrno(nr_iomaps);</div><div class='add'>+	nfserr = nfsd4_scsi_decode_layoutupdate(&amp;rqstp-&gt;rq_arg_stream,</div><div class='add'>+			&amp;iomaps, &amp;nr_iomaps, i_blocksize(inode));</div><div class='add'>+	if (nfserr != nfs_ok)</div><div class='add'>+		return nfserr;</div><div class='ctx'> </div><div class='ctx'> 	return nfsd4_block_commit_blocks(inode, lcp, iomaps, nr_iomaps);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nfsd4_scsi_fence_client(struct nfs4_layout_stateid *ls)</div><div class='add'>+nfsd4_scsi_fence_client(struct nfs4_layout_stateid *ls, struct nfsd_file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = ls-&gt;ls_stid.sc_client;</div><div class='del'>-	struct block_device *bdev = ls-&gt;ls_file-&gt;nf_file-&gt;f_path.mnt-&gt;mnt_sb-&gt;s_bdev;</div><div class='add'>+	struct block_device *bdev = file-&gt;nf_file-&gt;f_path.mnt-&gt;mnt_sb-&gt;s_bdev;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='del'>-	bdev-&gt;bd_disk-&gt;fops-&gt;pr_ops-&gt;pr_preempt(bdev, NFSD_MDS_PR_KEY,</div><div class='del'>-			nfsd4_scsi_pr_key(clp), 0, true);</div><div class='add'>+	status = bdev-&gt;bd_disk-&gt;fops-&gt;pr_ops-&gt;pr_preempt(bdev, NFSD_MDS_PR_KEY,</div><div class='add'>+			nfsd4_scsi_pr_key(clp),</div><div class='add'>+			PR_EXCLUSIVE_ACCESS_REG_ONLY, true);</div><div class='add'>+	trace_nfsd_pnfs_fence(clp, bdev-&gt;bd_disk-&gt;disk_name, status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct nfsd4_layout_ops scsi_layout_ops = {</div><div class='head'>diff --git a/fs/nfsd/blocklayoutxdr.c b/fs/nfsd/blocklayoutxdr.c<br/>index ce78f74715ee..196ef4245604 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/blocklayoutxdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/blocklayoutxdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/blocklayoutxdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/blocklayoutxdr.c</a></div><div class='hunk'>@@ -14,12 +14,25 @@</div><div class='ctx'> #define NFSDDBG_FACILITY	NFSDDBG_PNFS</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nfsd4_block_encode_layoutget - encode block/scsi layout extent array</div><div class='add'>+ * @xdr: stream for data encoding</div><div class='add'>+ * @lgp: layoutget content, actually an array of extents to encode</div><div class='add'>+ *</div><div class='add'>+ * Encode the opaque loc_body field in the layoutget response. Since the</div><div class='add'>+ * pnfs_block_layout4 and pnfs_scsi_layout4 structures on the wire are</div><div class='add'>+ * the same, this function is used by both layout drivers.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok: Success, all extents encoded into @xdr</div><div class='add'>+ *   %nfserr_toosmall: Not enough space in @xdr to encode all the data</div><div class='add'>+ */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd4_block_encode_layoutget(struct xdr_stream *xdr,</div><div class='ctx'> 		const struct nfsd4_layoutget *lgp)</div><div class='ctx'> {</div><div class='del'>-	const struct pnfs_block_extent *b = lgp-&gt;lg_content;</div><div class='del'>-	int len = sizeof(__be32) + 5 * sizeof(__be64) + sizeof(__be32);</div><div class='add'>+	const struct pnfs_block_layout *bl = lgp-&gt;lg_content;</div><div class='add'>+	u32 i, len = sizeof(__be32) + bl-&gt;nr_extents * PNFS_BLOCK_EXTENT_SIZE;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='ctx'> 	p = xdr_reserve_space(xdr, sizeof(__be32) + len);</div><div class='hunk'>@@ -27,15 +40,19 @@ nfsd4_block_encode_layoutget(struct xdr_stream *xdr,</div><div class='ctx'> 		return nfserr_toosmall;</div><div class='ctx'> </div><div class='ctx'> 	*p++ = cpu_to_be32(len);</div><div class='del'>-	*p++ = cpu_to_be32(1);		/* we always return a single extent */</div><div class='del'>-</div><div class='del'>-	p = xdr_encode_opaque_fixed(p, &amp;b-&gt;vol_id,</div><div class='del'>-			sizeof(struct nfsd4_deviceid));</div><div class='del'>-	p = xdr_encode_hyper(p, b-&gt;foff);</div><div class='del'>-	p = xdr_encode_hyper(p, b-&gt;len);</div><div class='del'>-	p = xdr_encode_hyper(p, b-&gt;soff);</div><div class='del'>-	*p++ = cpu_to_be32(b-&gt;es);</div><div class='del'>-	return 0;</div><div class='add'>+	*p++ = cpu_to_be32(bl-&gt;nr_extents);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bl-&gt;nr_extents; i++) {</div><div class='add'>+		const struct pnfs_block_extent *bex = bl-&gt;extents + i;</div><div class='add'>+</div><div class='add'>+		p = svcxdr_encode_deviceid4(p, &amp;bex-&gt;vol_id);</div><div class='add'>+		p = xdr_encode_hyper(p, bex-&gt;foff);</div><div class='add'>+		p = xdr_encode_hyper(p, bex-&gt;len);</div><div class='add'>+		p = xdr_encode_hyper(p, bex-&gt;soff);</div><div class='add'>+		*p++ = cpu_to_be32(bex-&gt;es);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -112,64 +129,86 @@ nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,</div><div class='del'>-		u32 block_size)</div><div class='add'>+/**</div><div class='add'>+ * nfsd4_block_decode_layoutupdate - decode the block layout extent array</div><div class='add'>+ * @xdr: subbuf set to the encoded array</div><div class='add'>+ * @iomapp: pointer to store the decoded extent array</div><div class='add'>+ * @nr_iomapsp: pointer to store the number of extents</div><div class='add'>+ * @block_size: alignment of extent offset and length</div><div class='add'>+ *</div><div class='add'>+ * This function decodes the opaque field of the layoutupdate4 structure</div><div class='add'>+ * in a layoutcommit request for the block layout driver. The field is</div><div class='add'>+ * actually an array of extents sent by the client. It also checks that</div><div class='add'>+ * the file offset, storage offset and length of each extent are aligned</div><div class='add'>+ * by @block_size.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok: Successful decoding, @iomapp and @nr_iomapsp are valid</div><div class='add'>+ *   %nfserr_bad_xdr: The encoded array in @xdr is invalid</div><div class='add'>+ *   %nfserr_inval: An unaligned extent found</div><div class='add'>+ *   %nfserr_delay: Failed to allocate memory for @iomapp</div><div class='add'>+ */</div><div class='add'>+__be32</div><div class='add'>+nfsd4_block_decode_layoutupdate(struct xdr_stream *xdr, struct iomap **iomapp,</div><div class='add'>+		int *nr_iomapsp, u32 block_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap *iomaps;</div><div class='del'>-	u32 nr_iomaps, i;</div><div class='add'>+	u32 nr_iomaps, expected, len, i;</div><div class='add'>+	__be32 nfserr;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(u32)) {</div><div class='del'>-		dprintk("%s: extent array too small: %u\n", __func__, len);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	len -= sizeof(u32);</div><div class='del'>-	if (len % PNFS_BLOCK_EXTENT_SIZE) {</div><div class='del'>-		dprintk("%s: extent array invalid: %u\n", __func__, len);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;nr_iomaps))</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='ctx'> </div><div class='del'>-	nr_iomaps = be32_to_cpup(p++);</div><div class='del'>-	if (nr_iomaps != len / PNFS_BLOCK_EXTENT_SIZE) {</div><div class='del'>-		dprintk("%s: extent array size mismatch: %u/%u\n",</div><div class='del'>-			__func__, len, nr_iomaps);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	len = sizeof(__be32) + xdr_stream_remaining(xdr);</div><div class='add'>+	expected = sizeof(__be32) + nr_iomaps * PNFS_BLOCK_EXTENT_SIZE;</div><div class='add'>+	if (len != expected)</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='ctx'> </div><div class='ctx'> 	iomaps = kcalloc(nr_iomaps, sizeof(*iomaps), GFP_KERNEL);</div><div class='del'>-	if (!iomaps) {</div><div class='del'>-		dprintk("%s: failed to allocate extent array\n", __func__);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!iomaps)</div><div class='add'>+		return nfserr_delay;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_iomaps; i++) {</div><div class='ctx'> 		struct pnfs_block_extent bex;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;bex.vol_id, p, sizeof(struct nfsd4_deviceid));</div><div class='del'>-		p += XDR_QUADLEN(sizeof(struct nfsd4_deviceid));</div><div class='add'>+		if (nfsd4_decode_deviceid4(xdr, &amp;bex.vol_id)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		p = xdr_decode_hyper(p, &amp;bex.foff);</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;bex.foff)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='ctx'> 		if (bex.foff &amp; (block_size - 1)) {</div><div class='del'>-			dprintk("%s: unaligned offset 0x%llx\n",</div><div class='del'>-				__func__, bex.foff);</div><div class='add'>+			nfserr = nfserr_inval;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;bex.len)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='del'>-		p = xdr_decode_hyper(p, &amp;bex.len);</div><div class='ctx'> 		if (bex.len &amp; (block_size - 1)) {</div><div class='del'>-			dprintk("%s: unaligned length 0x%llx\n",</div><div class='del'>-				__func__, bex.foff);</div><div class='add'>+			nfserr = nfserr_inval;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;bex.soff)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='del'>-		p = xdr_decode_hyper(p, &amp;bex.soff);</div><div class='ctx'> 		if (bex.soff &amp; (block_size - 1)) {</div><div class='del'>-			dprintk("%s: unaligned disk offset 0x%llx\n",</div><div class='del'>-				__func__, bex.soff);</div><div class='add'>+			nfserr = nfserr_inval;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (xdr_stream_decode_u32(xdr, &amp;bex.es)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='del'>-		bex.es = be32_to_cpup(p++);</div><div class='ctx'> 		if (bex.es != PNFS_BLOCK_READWRITE_DATA) {</div><div class='del'>-			dprintk("%s: incorrect extent state %d\n",</div><div class='del'>-				__func__, bex.es);</div><div class='add'>+			nfserr = nfserr_inval;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -178,59 +217,79 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*iomapp = iomaps;</div><div class='del'>-	return nr_iomaps;</div><div class='add'>+	*nr_iomapsp = nr_iomaps;</div><div class='add'>+	return nfs_ok;</div><div class='ctx'> fail:</div><div class='ctx'> 	kfree(iomaps);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return nfserr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,</div><div class='del'>-		u32 block_size)</div><div class='add'>+/**</div><div class='add'>+ * nfsd4_scsi_decode_layoutupdate - decode the scsi layout extent array</div><div class='add'>+ * @xdr: subbuf set to the encoded array</div><div class='add'>+ * @iomapp: pointer to store the decoded extent array</div><div class='add'>+ * @nr_iomapsp: pointer to store the number of extents</div><div class='add'>+ * @block_size: alignment of extent offset and length</div><div class='add'>+ *</div><div class='add'>+ * This function decodes the opaque field of the layoutupdate4 structure</div><div class='add'>+ * in a layoutcommit request for the scsi layout driver. The field is</div><div class='add'>+ * actually an array of extents sent by the client. It also checks that</div><div class='add'>+ * the offset and length of each extent are aligned by @block_size.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok: Successful decoding, @iomapp and @nr_iomapsp are valid</div><div class='add'>+ *   %nfserr_bad_xdr: The encoded array in @xdr is invalid</div><div class='add'>+ *   %nfserr_inval: An unaligned extent found</div><div class='add'>+ *   %nfserr_delay: Failed to allocate memory for @iomapp</div><div class='add'>+ */</div><div class='add'>+__be32</div><div class='add'>+nfsd4_scsi_decode_layoutupdate(struct xdr_stream *xdr, struct iomap **iomapp,</div><div class='add'>+		int *nr_iomapsp, u32 block_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct iomap *iomaps;</div><div class='del'>-	u32 nr_iomaps, expected, i;</div><div class='add'>+	u32 nr_iomaps, expected, len, i;</div><div class='add'>+	__be32 nfserr;</div><div class='ctx'> </div><div class='del'>-	if (len &lt; sizeof(u32)) {</div><div class='del'>-		dprintk("%s: extent array too small: %u\n", __func__, len);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;nr_iomaps))</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='ctx'> </div><div class='del'>-	nr_iomaps = be32_to_cpup(p++);</div><div class='add'>+	len = sizeof(__be32) + xdr_stream_remaining(xdr);</div><div class='ctx'> 	expected = sizeof(__be32) + nr_iomaps * PNFS_SCSI_RANGE_SIZE;</div><div class='del'>-	if (len != expected) {</div><div class='del'>-		dprintk("%s: extent array size mismatch: %u/%u\n",</div><div class='del'>-			__func__, len, expected);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (len != expected)</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='ctx'> </div><div class='ctx'> 	iomaps = kcalloc(nr_iomaps, sizeof(*iomaps), GFP_KERNEL);</div><div class='del'>-	if (!iomaps) {</div><div class='del'>-		dprintk("%s: failed to allocate extent array\n", __func__);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!iomaps)</div><div class='add'>+		return nfserr_delay;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_iomaps; i++) {</div><div class='ctx'> 		u64 val;</div><div class='ctx'> </div><div class='del'>-		p = xdr_decode_hyper(p, &amp;val);</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;val)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='ctx'> 		if (val &amp; (block_size - 1)) {</div><div class='del'>-			dprintk("%s: unaligned offset 0x%llx\n", __func__, val);</div><div class='add'>+			nfserr = nfserr_inval;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		iomaps[i].offset = val;</div><div class='ctx'> </div><div class='del'>-		p = xdr_decode_hyper(p, &amp;val);</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;val)) {</div><div class='add'>+			nfserr = nfserr_bad_xdr;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='ctx'> 		if (val &amp; (block_size - 1)) {</div><div class='del'>-			dprintk("%s: unaligned length 0x%llx\n", __func__, val);</div><div class='add'>+			nfserr = nfserr_inval;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		iomaps[i].length = val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*iomapp = iomaps;</div><div class='del'>-	return nr_iomaps;</div><div class='add'>+	*nr_iomapsp = nr_iomaps;</div><div class='add'>+	return nfs_ok;</div><div class='ctx'> fail:</div><div class='ctx'> 	kfree(iomaps);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return nfserr;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfsd/blocklayoutxdr.h b/fs/nfsd/blocklayoutxdr.h<br/>index b0361e8aa9a7..2e0c6c7d2b42 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/blocklayoutxdr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/blocklayoutxdr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/blocklayoutxdr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/blocklayoutxdr.h</a></div><div class='hunk'>@@ -8,6 +8,15 @@</div><div class='ctx'> struct iomap;</div><div class='ctx'> struct xdr_stream;</div><div class='ctx'> </div><div class='add'>+/* On the wire size of the layout4 struct with zero number of extents */</div><div class='add'>+#define PNFS_BLOCK_LAYOUT4_SIZE \</div><div class='add'>+	(sizeof(__be32) * 2 +	/* offset4 */ \</div><div class='add'>+	 sizeof(__be32) * 2 +	/* length4 */ \</div><div class='add'>+	 sizeof(__be32) +	/* layoutiomode4 */ \</div><div class='add'>+	 sizeof(__be32) +	/* layouttype4 */ \</div><div class='add'>+	 sizeof(__be32) +	/* number of bytes */ \</div><div class='add'>+	 sizeof(__be32))	/* number of extents */</div><div class='add'>+</div><div class='ctx'> struct pnfs_block_extent {</div><div class='ctx'> 	struct nfsd4_deviceid		vol_id;</div><div class='ctx'> 	u64				foff;</div><div class='hunk'>@@ -21,6 +30,11 @@ struct pnfs_block_range {</div><div class='ctx'> 	u64				len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct pnfs_block_layout {</div><div class='add'>+	u32				nr_extents;</div><div class='add'>+	struct pnfs_block_extent	extents[] __counted_by(nr_extents);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Random upper cap for the uuid length to avoid unbounded allocation.</div><div class='ctx'>  * Not actually limited by the protocol.</div><div class='hunk'>@@ -47,16 +61,16 @@ struct pnfs_block_volume {</div><div class='ctx'> </div><div class='ctx'> struct pnfs_block_deviceaddr {</div><div class='ctx'> 	u32				nr_volumes;</div><div class='del'>-	struct pnfs_block_volume	volumes[];</div><div class='add'>+	struct pnfs_block_volume	volumes[] __counted_by(nr_volumes);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,</div><div class='ctx'> 		const struct nfsd4_getdeviceinfo *gdp);</div><div class='ctx'> __be32 nfsd4_block_encode_layoutget(struct xdr_stream *xdr,</div><div class='ctx'> 		const struct nfsd4_layoutget *lgp);</div><div class='del'>-int nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,</div><div class='del'>-		u32 block_size);</div><div class='del'>-int nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,</div><div class='del'>-		u32 block_size);</div><div class='add'>+__be32 nfsd4_block_decode_layoutupdate(struct xdr_stream *xdr,</div><div class='add'>+		struct iomap **iomapp, int *nr_iomapsp, u32 block_size);</div><div class='add'>+__be32 nfsd4_scsi_decode_layoutupdate(struct xdr_stream *xdr,</div><div class='add'>+		struct iomap **iomapp, int *nr_iomapsp, u32 block_size);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NFSD_BLOCKLAYOUTXDR_H */</div><div class='head'>diff --git a/fs/nfsd/cache.h b/fs/nfsd/cache.h<br/>index 4cbe0434cbb8..bb7addef4a31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/cache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/cache.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #define NFSCACHE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sunrpc/svc.h&gt;</div><div class='del'>-#include "netns.h"</div><div class='add'>+#include "nfsd.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Representation of a reply cache entry.</div><div class='hunk'>@@ -80,8 +80,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> int	nfsd_drc_slab_create(void);</div><div class='ctx'> void	nfsd_drc_slab_free(void);</div><div class='del'>-int	nfsd_net_reply_cache_init(struct nfsd_net *nn);</div><div class='del'>-void	nfsd_net_reply_cache_destroy(struct nfsd_net *nn);</div><div class='ctx'> int	nfsd_reply_cache_init(struct nfsd_net *);</div><div class='ctx'> void	nfsd_reply_cache_shutdown(struct nfsd_net *);</div><div class='ctx'> int	nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,</div><div class='head'>diff --git a/fs/nfsd/debugfs.c b/fs/nfsd/debugfs.c<br/>new file mode 100644<br/>index 000000000000..7f44689e0a53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "nfsd.h"</div><div class='add'>+</div><div class='add'>+static struct dentry *nfsd_top_dir __read_mostly;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * /sys/kernel/debug/nfsd/disable-splice-read</div><div class='add'>+ *</div><div class='add'>+ * Contents:</div><div class='add'>+ *   %0: NFS READ is allowed to use page splicing</div><div class='add'>+ *   %1: NFS READ uses only iov iter read</div><div class='add'>+ *</div><div class='add'>+ * The default value of this setting is zero (page splicing is</div><div class='add'>+ * allowed). This setting takes immediate effect for all NFS</div><div class='add'>+ * versions, all exports, and in all NFSD net namespaces.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int nfsd_dsr_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	*val = nfsd_disable_splice_read ? 1 : 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfsd_dsr_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	nfsd_disable_splice_read = (val &gt; 0);</div><div class='add'>+	if (!nfsd_disable_splice_read) {</div><div class='add'>+		/*</div><div class='add'>+		 * Must use buffered I/O if splice_read is enabled.</div><div class='add'>+		 */</div><div class='add'>+		nfsd_io_cache_read = NFSD_IO_BUFFERED;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(nfsd_dsr_fops, nfsd_dsr_get, nfsd_dsr_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * /sys/kernel/debug/nfsd/io_cache_read</div><div class='add'>+ *</div><div class='add'>+ * Contents:</div><div class='add'>+ *   %0: NFS READ will use buffered IO</div><div class='add'>+ *   %1: NFS READ will use dontcache (buffered IO w/ dropbehind)</div><div class='add'>+ *   %2: NFS READ will use direct IO</div><div class='add'>+ *</div><div class='add'>+ * This setting takes immediate effect for all NFS versions,</div><div class='add'>+ * all exports, and in all NFSD net namespaces.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int nfsd_io_cache_read_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	*val = nfsd_io_cache_read;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfsd_io_cache_read_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case NFSD_IO_BUFFERED:</div><div class='add'>+		nfsd_io_cache_read = NFSD_IO_BUFFERED;</div><div class='add'>+		break;</div><div class='add'>+	case NFSD_IO_DONTCACHE:</div><div class='add'>+	case NFSD_IO_DIRECT:</div><div class='add'>+		/*</div><div class='add'>+		 * Must disable splice_read when enabling</div><div class='add'>+		 * NFSD_IO_DONTCACHE.</div><div class='add'>+		 */</div><div class='add'>+		nfsd_disable_splice_read = true;</div><div class='add'>+		nfsd_io_cache_read = val;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(nfsd_io_cache_read_fops, nfsd_io_cache_read_get,</div><div class='add'>+			 nfsd_io_cache_read_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * /sys/kernel/debug/nfsd/io_cache_write</div><div class='add'>+ *</div><div class='add'>+ * Contents:</div><div class='add'>+ *   %0: NFS WRITE will use buffered IO</div><div class='add'>+ *   %1: NFS WRITE will use dontcache (buffered IO w/ dropbehind)</div><div class='add'>+ *</div><div class='add'>+ * This setting takes immediate effect for all NFS versions,</div><div class='add'>+ * all exports, and in all NFSD net namespaces.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int nfsd_io_cache_write_get(void *data, u64 *val)</div><div class='add'>+{</div><div class='add'>+	*val = nfsd_io_cache_write;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfsd_io_cache_write_set(void *data, u64 val)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case NFSD_IO_BUFFERED:</div><div class='add'>+	case NFSD_IO_DONTCACHE:</div><div class='add'>+	case NFSD_IO_DIRECT:</div><div class='add'>+		nfsd_io_cache_write = val;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_DEBUGFS_ATTRIBUTE(nfsd_io_cache_write_fops, nfsd_io_cache_write_get,</div><div class='add'>+			 nfsd_io_cache_write_set, "%llu\n");</div><div class='add'>+</div><div class='add'>+void nfsd_debugfs_exit(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(nfsd_top_dir);</div><div class='add'>+	nfsd_top_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfsd_debugfs_init(void)</div><div class='add'>+{</div><div class='add'>+	nfsd_top_dir = debugfs_create_dir("nfsd", NULL);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("disable-splice-read", S_IWUSR | S_IRUGO,</div><div class='add'>+			    nfsd_top_dir, NULL, &amp;nfsd_dsr_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("io_cache_read", 0644, nfsd_top_dir, NULL,</div><div class='add'>+			    &amp;nfsd_io_cache_read_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("io_cache_write", 0644, nfsd_top_dir, NULL,</div><div class='add'>+			    &amp;nfsd_io_cache_write_fops);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c<br/>index 7b641095a665..9d55512d0cc9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/export.c</a></div><div class='hunk'>@@ -82,8 +82,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)</div><div class='ctx'> 	int len;</div><div class='ctx'> 	struct auth_domain *dom = NULL;</div><div class='ctx'> 	int err;</div><div class='del'>-	int fsidtype;</div><div class='del'>-	char *ep;</div><div class='add'>+	u8 fsidtype;</div><div class='ctx'> 	struct svc_expkey key;</div><div class='ctx'> 	struct svc_expkey *ek = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -109,10 +108,9 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	if (qword_get(&amp;mesg, buf, PAGE_SIZE) &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	fsidtype = simple_strtoul(buf, &amp;ep, 10);</div><div class='del'>-	if (*ep)</div><div class='add'>+	if (kstrtou8(buf, 10, &amp;fsidtype))</div><div class='ctx'> 		goto out;</div><div class='del'>-	dprintk("found fsidtype %d\n", fsidtype);</div><div class='add'>+	dprintk("found fsidtype %u\n", fsidtype);</div><div class='ctx'> 	if (key_len(fsidtype)==0) /* invalid type */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if ((len=qword_get(&amp;mesg, buf, PAGE_SIZE)) &lt;= 0)</div><div class='hunk'>@@ -334,33 +332,46 @@ static void nfsd4_fslocs_free(struct nfsd4_fs_locations *fsloc)</div><div class='ctx'> static int export_stats_init(struct export_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	stats-&gt;start_time = ktime_get_seconds();</div><div class='del'>-	return nfsd_percpu_counters_init(stats-&gt;counter, EXP_STATS_COUNTERS_NUM);</div><div class='add'>+	return percpu_counter_init_many(stats-&gt;counter, 0, GFP_KERNEL,</div><div class='add'>+					EXP_STATS_COUNTERS_NUM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void export_stats_reset(struct export_stats *stats)</div><div class='ctx'> {</div><div class='del'>-	if (stats)</div><div class='del'>-		nfsd_percpu_counters_reset(stats-&gt;counter,</div><div class='del'>-					   EXP_STATS_COUNTERS_NUM);</div><div class='add'>+	if (stats) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; EXP_STATS_COUNTERS_NUM; i++)</div><div class='add'>+			percpu_counter_set(&amp;stats-&gt;counter[i], 0);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void export_stats_destroy(struct export_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	if (stats)</div><div class='del'>-		nfsd_percpu_counters_destroy(stats-&gt;counter,</div><div class='del'>-					     EXP_STATS_COUNTERS_NUM);</div><div class='add'>+		percpu_counter_destroy_many(stats-&gt;counter,</div><div class='add'>+					    EXP_STATS_COUNTERS_NUM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void svc_export_put(struct kref *ref)</div><div class='add'>+static void svc_export_release(struct rcu_head *rcu_head)</div><div class='ctx'> {</div><div class='del'>-	struct svc_export *exp = container_of(ref, struct svc_export, h.ref);</div><div class='del'>-	path_put(&amp;exp-&gt;ex_path);</div><div class='del'>-	auth_domain_put(exp-&gt;ex_client);</div><div class='add'>+	struct svc_export *exp = container_of(rcu_head, struct svc_export,</div><div class='add'>+			ex_rcu);</div><div class='add'>+</div><div class='ctx'> 	nfsd4_fslocs_free(&amp;exp-&gt;ex_fslocs);</div><div class='ctx'> 	export_stats_destroy(exp-&gt;ex_stats);</div><div class='ctx'> 	kfree(exp-&gt;ex_stats);</div><div class='ctx'> 	kfree(exp-&gt;ex_uuid);</div><div class='del'>-	kfree_rcu(exp, ex_rcu);</div><div class='add'>+	kfree(exp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void svc_export_put(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct svc_export *exp = container_of(ref, struct svc_export, h.ref);</div><div class='add'>+</div><div class='add'>+	path_put(&amp;exp-&gt;ex_path);</div><div class='add'>+	auth_domain_put(exp-&gt;ex_client);</div><div class='add'>+	call_rcu(&amp;exp-&gt;ex_rcu, svc_export_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)</div><div class='hunk'>@@ -391,7 +402,7 @@ static struct svc_export *svc_export_update(struct svc_export *new,</div><div class='ctx'> 					    struct svc_export *old);</div><div class='ctx'> static struct svc_export *svc_export_lookup(struct svc_export *);</div><div class='ctx'> </div><div class='del'>-static int check_export(struct path *path, int *flags, unsigned char *uuid)</div><div class='add'>+static int check_export(const struct path *path, int *flags, unsigned char *uuid)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='ctx'> </div><div class='hunk'>@@ -1070,41 +1081,76 @@ static struct svc_export *exp_find(struct cache_detail *cd,</div><div class='ctx'> 	return exp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp)</div><div class='add'>+/**</div><div class='add'>+ * check_xprtsec_policy - check if access to export is allowed by the</div><div class='add'>+ *			  xprtsec policy</div><div class='add'>+ * @exp: svc_export that is being accessed.</div><div class='add'>+ * @rqstp: svc_rqst attempting to access @exp.</div><div class='add'>+ *</div><div class='add'>+ * Helper function for check_nfsd_access().  Note that callers should be</div><div class='add'>+ * using check_nfsd_access() instead of calling this function directly.  The</div><div class='add'>+ * one exception is __fh_verify() since it has logic that may result in one</div><div class='add'>+ * or both of the helpers being skipped.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok if access is granted, or</div><div class='add'>+ *   %nfserr_wrongsec if access is denied</div><div class='add'>+ */</div><div class='add'>+__be32 check_xprtsec_policy(struct svc_export *exp, struct svc_rqst *rqstp)</div><div class='ctx'> {</div><div class='del'>-	struct exp_flavor_info *f, *end = exp-&gt;ex_flavors + exp-&gt;ex_nflavors;</div><div class='ctx'> 	struct svc_xprt *xprt = rqstp-&gt;rq_xprt;</div><div class='ctx'> </div><div class='ctx'> 	if (exp-&gt;ex_xprtsec_modes &amp; NFSEXP_XPRTSEC_NONE) {</div><div class='ctx'> 		if (!test_bit(XPT_TLS_SESSION, &amp;xprt-&gt;xpt_flags))</div><div class='del'>-			goto ok;</div><div class='add'>+			return nfs_ok;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (exp-&gt;ex_xprtsec_modes &amp; NFSEXP_XPRTSEC_TLS) {</div><div class='ctx'> 		if (test_bit(XPT_TLS_SESSION, &amp;xprt-&gt;xpt_flags) &amp;&amp;</div><div class='ctx'> 		    !test_bit(XPT_PEER_AUTH, &amp;xprt-&gt;xpt_flags))</div><div class='del'>-			goto ok;</div><div class='add'>+			return nfs_ok;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (exp-&gt;ex_xprtsec_modes &amp; NFSEXP_XPRTSEC_MTLS) {</div><div class='ctx'> 		if (test_bit(XPT_TLS_SESSION, &amp;xprt-&gt;xpt_flags) &amp;&amp;</div><div class='ctx'> 		    test_bit(XPT_PEER_AUTH, &amp;xprt-&gt;xpt_flags))</div><div class='del'>-			goto ok;</div><div class='add'>+			return nfs_ok;</div><div class='ctx'> 	}</div><div class='del'>-	goto denied;</div><div class='add'>+	return nfserr_wrongsec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * check_security_flavor - check if access to export is allowed by the</div><div class='add'>+ *			   security flavor</div><div class='add'>+ * @exp: svc_export that is being accessed.</div><div class='add'>+ * @rqstp: svc_rqst attempting to access @exp.</div><div class='add'>+ * @may_bypass_gss: reduce strictness of authorization check</div><div class='add'>+ *</div><div class='add'>+ * Helper function for check_nfsd_access().  Note that callers should be</div><div class='add'>+ * using check_nfsd_access() instead of calling this function directly.  The</div><div class='add'>+ * one exception is __fh_verify() since it has logic that may result in one</div><div class='add'>+ * or both of the helpers being skipped.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok if access is granted, or</div><div class='add'>+ *   %nfserr_wrongsec if access is denied</div><div class='add'>+ */</div><div class='add'>+__be32 check_security_flavor(struct svc_export *exp, struct svc_rqst *rqstp,</div><div class='add'>+			     bool may_bypass_gss)</div><div class='add'>+{</div><div class='add'>+	struct exp_flavor_info *f, *end = exp-&gt;ex_flavors + exp-&gt;ex_nflavors;</div><div class='ctx'> </div><div class='del'>-ok:</div><div class='ctx'> 	/* legacy gss-only clients are always OK: */</div><div class='ctx'> 	if (exp-&gt;ex_client == rqstp-&gt;rq_gssclient)</div><div class='del'>-		return 0;</div><div class='add'>+		return nfs_ok;</div><div class='ctx'> 	/* ip-address based client; check sec= export option: */</div><div class='ctx'> 	for (f = exp-&gt;ex_flavors; f &lt; end; f++) {</div><div class='ctx'> 		if (f-&gt;pseudoflavor == rqstp-&gt;rq_cred.cr_flavor)</div><div class='del'>-			return 0;</div><div class='add'>+			return nfs_ok;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* defaults in absence of sec= options: */</div><div class='ctx'> 	if (exp-&gt;ex_nflavors == 0) {</div><div class='ctx'> 		if (rqstp-&gt;rq_cred.cr_flavor == RPC_AUTH_NULL ||</div><div class='ctx'> 		    rqstp-&gt;rq_cred.cr_flavor == RPC_AUTH_UNIX)</div><div class='del'>-			return 0;</div><div class='add'>+			return nfs_ok;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If the compound op contains a spo_must_allowed op,</div><div class='hunk'>@@ -1114,10 +1160,47 @@ ok:</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (nfsd4_spo_must_allow(rqstp))</div><div class='del'>-		return 0;</div><div class='add'>+		return nfs_ok;</div><div class='add'>+</div><div class='add'>+	/* Some calls may be processed without authentication</div><div class='add'>+	 * on GSS exports. For example NFS2/3 calls on root</div><div class='add'>+	 * directory, see section 2.3.2 of rfc 2623.</div><div class='add'>+	 * For "may_bypass_gss" check that export has really</div><div class='add'>+	 * enabled some flavor with authentication (GSS or any</div><div class='add'>+	 * other) and also check that the used auth flavor is</div><div class='add'>+	 * without authentication (none or sys).</div><div class='add'>+	 */</div><div class='add'>+	if (may_bypass_gss &amp;&amp; (</div><div class='add'>+	     rqstp-&gt;rq_cred.cr_flavor == RPC_AUTH_NULL ||</div><div class='add'>+	     rqstp-&gt;rq_cred.cr_flavor == RPC_AUTH_UNIX)) {</div><div class='add'>+		for (f = exp-&gt;ex_flavors; f &lt; end; f++) {</div><div class='add'>+			if (f-&gt;pseudoflavor &gt;= RPC_AUTH_DES)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nfserr_wrongsec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * check_nfsd_access - check if access to export is allowed.</div><div class='add'>+ * @exp: svc_export that is being accessed.</div><div class='add'>+ * @rqstp: svc_rqst attempting to access @exp.</div><div class='add'>+ * @may_bypass_gss: reduce strictness of authorization check</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok if access is granted, or</div><div class='add'>+ *   %nfserr_wrongsec if access is denied</div><div class='add'>+ */</div><div class='add'>+__be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp,</div><div class='add'>+			 bool may_bypass_gss)</div><div class='add'>+{</div><div class='add'>+	__be32 status;</div><div class='ctx'> </div><div class='del'>-denied:</div><div class='del'>-	return rqstp-&gt;rq_vers &lt; 4 ? nfserr_acces : nfserr_wrongsec;</div><div class='add'>+	status = check_xprtsec_policy(exp, rqstp);</div><div class='add'>+	if (status != nfs_ok)</div><div class='add'>+		return status;</div><div class='add'>+	return check_security_flavor(exp, rqstp, may_bypass_gss);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1130,7 +1213,7 @@ denied:</div><div class='ctx'>  * use exp_get_by_name() or exp_find().</div><div class='ctx'>  */</div><div class='ctx'> struct svc_export *</div><div class='del'>-rqst_exp_get_by_name(struct svc_rqst *rqstp, struct path *path)</div><div class='add'>+rqst_exp_get_by_name(struct svc_rqst *rqstp, const struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='hunk'>@@ -1160,19 +1243,35 @@ gss:</div><div class='ctx'> 	return gssexp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * rqst_exp_find - Find an svc_export in the context of a rqst or similar</div><div class='add'>+ * @reqp:	The handle to be used to suspend the request if a cache-upcall is needed</div><div class='add'>+ *		If NULL, missing in-cache information will result in failure.</div><div class='add'>+ * @net:	The network namespace in which the request exists</div><div class='add'>+ * @cl:		default auth_domain to use for looking up the export</div><div class='add'>+ * @gsscl:	an alternate auth_domain defined using deprecated gss/krb5 format.</div><div class='add'>+ * @fsid_type:	The type of fsid to look for</div><div class='add'>+ * @fsidv:	The actual fsid to look up in the context of either client.</div><div class='add'>+ *</div><div class='add'>+ * Perform a lookup for @cl/@fsidv in the given @net for an export.  If</div><div class='add'>+ * none found and @gsscl specified, repeat the lookup.</div><div class='add'>+ *</div><div class='add'>+ * Returns an export, or an error pointer.</div><div class='add'>+ */</div><div class='ctx'> struct svc_export *</div><div class='del'>-rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)</div><div class='add'>+rqst_exp_find(struct cache_req *reqp, struct net *net,</div><div class='add'>+	      struct auth_domain *cl, struct auth_domain *gsscl,</div><div class='add'>+	      int fsid_type, u32 *fsidv)</div><div class='ctx'> {</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);</div><div class='del'>-	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> 	struct cache_detail *cd = nn-&gt;svc_export_cache;</div><div class='ctx'> </div><div class='del'>-	if (rqstp-&gt;rq_client == NULL)</div><div class='add'>+	if (!cl)</div><div class='ctx'> 		goto gss;</div><div class='ctx'> </div><div class='ctx'> 	/* First try the auth_unix client: */</div><div class='del'>-	exp = exp_find(cd, rqstp-&gt;rq_client, fsid_type,</div><div class='del'>-		       fsidv, &amp;rqstp-&gt;rq_chandle);</div><div class='add'>+	exp = exp_find(cd, cl, fsid_type, fsidv, reqp);</div><div class='ctx'> 	if (PTR_ERR(exp) == -ENOENT)</div><div class='ctx'> 		goto gss;</div><div class='ctx'> 	if (IS_ERR(exp))</div><div class='hunk'>@@ -1182,10 +1281,9 @@ rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)</div><div class='ctx'> 		return exp;</div><div class='ctx'> gss:</div><div class='ctx'> 	/* Otherwise, try falling back on gss client */</div><div class='del'>-	if (rqstp-&gt;rq_gssclient == NULL)</div><div class='add'>+	if (!gsscl)</div><div class='ctx'> 		return exp;</div><div class='del'>-	gssexp = exp_find(cd, rqstp-&gt;rq_gssclient, fsid_type, fsidv,</div><div class='del'>-						&amp;rqstp-&gt;rq_chandle);</div><div class='add'>+	gssexp = exp_find(cd, gsscl, fsid_type, fsidv, reqp);</div><div class='ctx'> 	if (PTR_ERR(gssexp) == -ENOENT)</div><div class='ctx'> 		return exp;</div><div class='ctx'> 	if (!IS_ERR(exp))</div><div class='hunk'>@@ -1216,7 +1314,9 @@ struct svc_export *rqst_find_fsidzero_export(struct svc_rqst *rqstp)</div><div class='ctx'> </div><div class='ctx'> 	mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);</div><div class='ctx'> </div><div class='del'>-	return rqst_exp_find(rqstp, FSID_NUM, fsidv);</div><div class='add'>+	return rqst_exp_find(&amp;rqstp-&gt;rq_chandle, SVC_NET(rqstp),</div><div class='add'>+			     rqstp-&gt;rq_client, rqstp-&gt;rq_gssclient,</div><div class='add'>+			     FSID_NUM, fsidv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1365,10 +1465,9 @@ static int e_show(struct seq_file *m, void *p)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	exp_get(exp);</div><div class='del'>-	if (cache_check(cd, &amp;exp-&gt;h, NULL))</div><div class='add'>+	if (cache_check_rcu(cd, &amp;exp-&gt;h, NULL))</div><div class='ctx'> 		return 0;</div><div class='del'>-	exp_put(exp);</div><div class='add'>+</div><div class='ctx'> 	return svc_export_show(m, cd, cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfsd/export.h b/fs/nfsd/export.h<br/>index ca9dc230ae3d..d2b09cd76145 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/export.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/export.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/export.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/export.h</a></div><div class='hunk'>@@ -88,7 +88,7 @@ struct svc_expkey {</div><div class='ctx'> 	struct cache_head	h;</div><div class='ctx'> </div><div class='ctx'> 	struct auth_domain *	ek_client;</div><div class='del'>-	int			ek_fsidtype;</div><div class='add'>+	u8			ek_fsidtype;</div><div class='ctx'> 	u32			ek_fsid[6];</div><div class='ctx'> </div><div class='ctx'> 	struct path		ek_path;</div><div class='hunk'>@@ -99,8 +99,13 @@ struct svc_expkey {</div><div class='ctx'> #define EX_NOHIDE(exp)		((exp)-&gt;ex_flags &amp; NFSEXP_NOHIDE)</div><div class='ctx'> #define EX_WGATHER(exp)		((exp)-&gt;ex_flags &amp; NFSEXP_GATHERED_WRITES)</div><div class='ctx'> </div><div class='del'>-int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp);</div><div class='del'>-__be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);</div><div class='add'>+struct svc_cred;</div><div class='add'>+int nfsexp_flags(struct svc_cred *cred, struct svc_export *exp);</div><div class='add'>+__be32 check_xprtsec_policy(struct svc_export *exp, struct svc_rqst *rqstp);</div><div class='add'>+__be32 check_security_flavor(struct svc_export *exp, struct svc_rqst *rqstp,</div><div class='add'>+			     bool may_bypass_gss);</div><div class='add'>+__be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp,</div><div class='add'>+			 bool may_bypass_gss);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function declarations</div><div class='hunk'>@@ -109,7 +114,7 @@ int			nfsd_export_init(struct net *);</div><div class='ctx'> void			nfsd_export_shutdown(struct net *);</div><div class='ctx'> void			nfsd_export_flush(struct net *);</div><div class='ctx'> struct svc_export *	rqst_exp_get_by_name(struct svc_rqst *,</div><div class='del'>-					     struct path *);</div><div class='add'>+					     const struct path *);</div><div class='ctx'> struct svc_export *	rqst_exp_parent(struct svc_rqst *,</div><div class='ctx'> 					struct path *);</div><div class='ctx'> struct svc_export *	rqst_find_fsidzero_export(struct svc_rqst *);</div><div class='hunk'>@@ -127,6 +132,8 @@ static inline struct svc_export *exp_get(struct svc_export *exp)</div><div class='ctx'> 	cache_get(&amp;exp-&gt;h);</div><div class='ctx'> 	return exp;</div><div class='ctx'> }</div><div class='del'>-struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *);</div><div class='add'>+struct svc_export *rqst_exp_find(struct cache_req *reqp, struct net *net,</div><div class='add'>+				 struct auth_domain *cl, struct auth_domain *gsscl,</div><div class='add'>+				 int fsid_type, u32 *fsidv);</div><div class='ctx'> </div><div class='ctx'> #endif /* NFSD_EXPORT_H */</div><div class='head'>diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c<br/>index 9cb7f0c33df5..93798575b807 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/filecache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/filecache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/filecache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/filecache.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vfs.h"</div><div class='ctx'> #include "nfsd.h"</div><div class='hunk'>@@ -52,22 +53,20 @@</div><div class='ctx'> #define NFSD_FILE_CACHE_UP		     (0)</div><div class='ctx'> </div><div class='ctx'> /* We only care about NFSD_MAY_READ/WRITE for this cache */</div><div class='del'>-#define NFSD_FILE_MAY_MASK	(NFSD_MAY_READ|NFSD_MAY_WRITE)</div><div class='add'>+#define NFSD_FILE_MAY_MASK	(NFSD_MAY_READ|NFSD_MAY_WRITE|NFSD_MAY_LOCALIO)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, nfsd_file_cache_hits);</div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, nfsd_file_acquisitions);</div><div class='add'>+static DEFINE_PER_CPU(unsigned long, nfsd_file_allocations);</div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, nfsd_file_releases);</div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, nfsd_file_total_age);</div><div class='ctx'> static DEFINE_PER_CPU(unsigned long, nfsd_file_evictions);</div><div class='ctx'> </div><div class='ctx'> struct nfsd_fcache_disposal {</div><div class='del'>-	struct work_struct work;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct list_head freeme;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct workqueue_struct *nfsd_filecache_wq __read_mostly;</div><div class='del'>-</div><div class='ctx'> static struct kmem_cache		*nfsd_file_slab;</div><div class='ctx'> static struct kmem_cache		*nfsd_file_mark_slab;</div><div class='ctx'> static struct list_lru			nfsd_file_lru;</div><div class='hunk'>@@ -114,7 +113,7 @@ static void</div><div class='ctx'> nfsd_file_schedule_laundrette(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(NFSD_FILE_CACHE_UP, &amp;nfsd_file_flags))</div><div class='del'>-		queue_delayed_work(system_wq, &amp;nfsd_filecache_laundrette,</div><div class='add'>+		queue_delayed_work(system_dfl_wq, &amp;nfsd_filecache_laundrette,</div><div class='ctx'> 				   NFSD_LAUNDRETTE_DELAY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -154,7 +153,7 @@ nfsd_file_mark_put(struct nfsd_file_mark *nfm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfsd_file_mark *</div><div class='del'>-nfsd_file_mark_find_or_create(struct nfsd_file *nf, struct inode *inode)</div><div class='add'>+nfsd_file_mark_find_or_create(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int			err;</div><div class='ctx'> 	struct fsnotify_mark	*mark;</div><div class='hunk'>@@ -162,8 +161,8 @@ nfsd_file_mark_find_or_create(struct nfsd_file *nf, struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		fsnotify_group_lock(nfsd_file_fsnotify_group);</div><div class='del'>-		mark = fsnotify_find_mark(&amp;inode-&gt;i_fsnotify_marks,</div><div class='del'>-					  nfsd_file_fsnotify_group);</div><div class='add'>+		mark = fsnotify_find_inode_mark(inode,</div><div class='add'>+						nfsd_file_fsnotify_group);</div><div class='ctx'> 		if (mark) {</div><div class='ctx'> 			nfm = nfsd_file_mark_get(container_of(mark,</div><div class='ctx'> 						 struct nfsd_file_mark,</div><div class='hunk'>@@ -218,7 +217,9 @@ nfsd_file_alloc(struct net *net, struct inode *inode, unsigned char need,</div><div class='ctx'> 	if (unlikely(!nf))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	this_cpu_inc(nfsd_file_allocations);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;nf-&gt;nf_lru);</div><div class='add'>+	INIT_LIST_HEAD(&amp;nf-&gt;nf_gc);</div><div class='ctx'> 	nf-&gt;nf_birthtime = ktime_get();</div><div class='ctx'> 	nf-&gt;nf_file = NULL;</div><div class='ctx'> 	nf-&gt;nf_cred = get_current_cred();</div><div class='hunk'>@@ -230,6 +231,9 @@ nfsd_file_alloc(struct net *net, struct inode *inode, unsigned char need,</div><div class='ctx'> 	refcount_set(&amp;nf-&gt;nf_ref, 1);</div><div class='ctx'> 	nf-&gt;nf_may = need;</div><div class='ctx'> 	nf-&gt;nf_mark = NULL;</div><div class='add'>+	nf-&gt;nf_dio_mem_align = 0;</div><div class='add'>+	nf-&gt;nf_dio_offset_align = 0;</div><div class='add'>+	nf-&gt;nf_dio_read_offset_align = 0;</div><div class='ctx'> 	return nf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +287,7 @@ nfsd_file_free(struct nfsd_file *nf)</div><div class='ctx'> 		nfsd_file_mark_put(nf-&gt;nf_mark);</div><div class='ctx'> 	if (nf-&gt;nf_file) {</div><div class='ctx'> 		nfsd_file_check_write_error(nf);</div><div class='del'>-		filp_close(nf-&gt;nf_file, NULL);</div><div class='add'>+		nfsd_filp_close(nf-&gt;nf_file);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -318,15 +322,14 @@ nfsd_file_check_writeback(struct nfsd_file *nf)</div><div class='ctx'> 		mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static bool nfsd_file_lru_add(struct nfsd_file *nf)</div><div class='add'>+static void nfsd_file_lru_add(struct nfsd_file *nf)</div><div class='ctx'> {</div><div class='del'>-	set_bit(NFSD_FILE_REFERENCED, &amp;nf-&gt;nf_flags);</div><div class='del'>-	if (list_lru_add_obj(&amp;nfsd_file_lru, &amp;nf-&gt;nf_lru)) {</div><div class='add'>+	refcount_inc(&amp;nf-&gt;nf_ref);</div><div class='add'>+	if (list_lru_add_obj(&amp;nfsd_file_lru, &amp;nf-&gt;nf_lru))</div><div class='ctx'> 		trace_nfsd_file_lru_add(nf);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	return false;</div><div class='add'>+	else</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	nfsd_file_schedule_laundrette();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool nfsd_file_lru_remove(struct nfsd_file *nf)</div><div class='hunk'>@@ -362,42 +365,55 @@ nfsd_file_put(struct nfsd_file *nf)</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(NFSD_FILE_GC, &amp;nf-&gt;nf_flags) &amp;&amp;</div><div class='ctx'> 	    test_bit(NFSD_FILE_HASHED, &amp;nf-&gt;nf_flags)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If this is the last reference (nf_ref == 1), then try to</div><div class='del'>-		 * transfer it to the LRU.</div><div class='del'>-		 */</div><div class='del'>-		if (refcount_dec_not_one(&amp;nf-&gt;nf_ref))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* Try to add it to the LRU.  If that fails, decrement. */</div><div class='del'>-		if (nfsd_file_lru_add(nf)) {</div><div class='del'>-			/* If it's still hashed, we're done */</div><div class='del'>-			if (test_bit(NFSD_FILE_HASHED, &amp;nf-&gt;nf_flags)) {</div><div class='del'>-				nfsd_file_schedule_laundrette();</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * We're racing with unhashing, so try to remove it from</div><div class='del'>-			 * the LRU. If removal fails, then someone else already</div><div class='del'>-			 * has our reference.</div><div class='del'>-			 */</div><div class='del'>-			if (!nfsd_file_lru_remove(nf))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='add'>+		set_bit(NFSD_FILE_REFERENCED, &amp;nf-&gt;nf_flags);</div><div class='add'>+		set_bit(NFSD_FILE_RECENT, &amp;nf-&gt;nf_flags);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;nf-&gt;nf_ref))</div><div class='ctx'> 		nfsd_file_free(nf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nfsd_file_put_local - put nfsd_file reference and arm nfsd_net_put in caller</div><div class='add'>+ * @pnf: nfsd_file of which to put the reference</div><div class='add'>+ *</div><div class='add'>+ * First save the associated net to return to caller, then put</div><div class='add'>+ * the reference of the nfsd_file.</div><div class='add'>+ */</div><div class='add'>+struct net *</div><div class='add'>+nfsd_file_put_local(struct nfsd_file __rcu **pnf)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_file *nf;</div><div class='add'>+	struct net *net = NULL;</div><div class='add'>+</div><div class='add'>+	nf = unrcu_pointer(xchg(pnf, NULL));</div><div class='add'>+	if (nf) {</div><div class='add'>+		net = nf-&gt;nf_net;</div><div class='add'>+		nfsd_file_put(nf);</div><div class='add'>+	}</div><div class='add'>+	return net;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_file_file - get the backing file of an nfsd_file</div><div class='add'>+ * @nf: nfsd_file of which to access the backing file.</div><div class='add'>+ *</div><div class='add'>+ * Return backing file for @nf.</div><div class='add'>+ */</div><div class='add'>+struct file *</div><div class='add'>+nfsd_file_file(struct nfsd_file *nf)</div><div class='add'>+{</div><div class='add'>+	return nf-&gt;nf_file;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> nfsd_file_dispose_list(struct list_head *dispose)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd_file *nf;</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(dispose)) {</div><div class='del'>-		nf = list_first_entry(dispose, struct nfsd_file, nf_lru);</div><div class='del'>-		list_del_init(&amp;nf-&gt;nf_lru);</div><div class='add'>+		nf = list_first_entry(dispose, struct nfsd_file, nf_gc);</div><div class='add'>+		list_del_init(&amp;nf-&gt;nf_gc);</div><div class='ctx'> 		nfsd_file_free(nf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -414,14 +430,53 @@ nfsd_file_dispose_list_delayed(struct list_head *dispose)</div><div class='ctx'> {</div><div class='ctx'> 	while(!list_empty(dispose)) {</div><div class='ctx'> 		struct nfsd_file *nf = list_first_entry(dispose,</div><div class='del'>-						struct nfsd_file, nf_lru);</div><div class='add'>+						struct nfsd_file, nf_gc);</div><div class='ctx'> 		struct nfsd_net *nn = net_generic(nf-&gt;nf_net, nfsd_net_id);</div><div class='ctx'> 		struct nfsd_fcache_disposal *l = nn-&gt;fcache_disposal;</div><div class='add'>+		struct svc_serv *serv;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;l-&gt;lock);</div><div class='del'>-		list_move_tail(&amp;nf-&gt;nf_lru, &amp;l-&gt;freeme);</div><div class='add'>+		list_move_tail(&amp;nf-&gt;nf_gc, &amp;l-&gt;freeme);</div><div class='ctx'> 		spin_unlock(&amp;l-&gt;lock);</div><div class='del'>-		queue_work(nfsd_filecache_wq, &amp;l-&gt;work);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The filecache laundrette is shut down after the</div><div class='add'>+		 * nn-&gt;nfsd_serv pointer is cleared, but before the</div><div class='add'>+		 * svc_serv is freed.</div><div class='add'>+		 */</div><div class='add'>+		serv = nn-&gt;nfsd_serv;</div><div class='add'>+		if (serv)</div><div class='add'>+			svc_wake_up(serv);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_file_net_dispose - deal with nfsd_files waiting to be disposed.</div><div class='add'>+ * @nn: nfsd_net in which to find files to be disposed.</div><div class='add'>+ *</div><div class='add'>+ * When files held open for nfsv3 are removed from the filecache, whether</div><div class='add'>+ * due to memory pressure or garbage collection, they are queued to</div><div class='add'>+ * a per-net-ns queue.  This function completes the disposal, either</div><div class='add'>+ * directly or by waking another nfsd thread to help with the work.</div><div class='add'>+ */</div><div class='add'>+void nfsd_file_net_dispose(struct nfsd_net *nn)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_fcache_disposal *l = nn-&gt;fcache_disposal;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;l-&gt;freeme)) {</div><div class='add'>+		LIST_HEAD(dispose);</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;l-&gt;lock);</div><div class='add'>+		for (i = 0; i &lt; 8 &amp;&amp; !list_empty(&amp;l-&gt;freeme); i++)</div><div class='add'>+			list_move(l-&gt;freeme.next, &amp;dispose);</div><div class='add'>+		spin_unlock(&amp;l-&gt;lock);</div><div class='add'>+		if (!list_empty(&amp;l-&gt;freeme))</div><div class='add'>+			/* Wake up another thread to share the work</div><div class='add'>+			 * *before* doing any actual disposing.</div><div class='add'>+			 */</div><div class='add'>+			svc_wake_up(nn-&gt;nfsd_serv);</div><div class='add'>+		nfsd_file_dispose_list(&amp;dispose);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +484,6 @@ nfsd_file_dispose_list_delayed(struct list_head *dispose)</div><div class='ctx'>  * nfsd_file_lru_cb - Examine an entry on the LRU list</div><div class='ctx'>  * @item: LRU entry to examine</div><div class='ctx'>  * @lru: controlling LRU</div><div class='del'>- * @lock: LRU list lock (unused)</div><div class='ctx'>  * @arg: dispose list</div><div class='ctx'>  *</div><div class='ctx'>  * Return values:</div><div class='hunk'>@@ -439,9 +493,7 @@ nfsd_file_dispose_list_delayed(struct list_head *dispose)</div><div class='ctx'>  */</div><div class='ctx'> static enum lru_status</div><div class='ctx'> nfsd_file_lru_cb(struct list_head *item, struct list_lru_one *lru,</div><div class='del'>-		 spinlock_t *lock, void *arg)</div><div class='del'>-	__releases(lock)</div><div class='del'>-	__acquires(lock)</div><div class='add'>+		 void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *head = arg;</div><div class='ctx'> 	struct nfsd_file *nf = list_entry(item, struct nfsd_file, nf_lru);</div><div class='hunk'>@@ -465,31 +517,71 @@ nfsd_file_lru_cb(struct list_head *item, struct list_lru_one *lru,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Put the reference held on behalf of the LRU. If it wasn't the last</div><div class='del'>-	 * one, then just remove it from the LRU and ignore it.</div><div class='add'>+	 * Put the reference held on behalf of the LRU if it is the last</div><div class='add'>+	 * reference, else rotate.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!refcount_dec_and_test(&amp;nf-&gt;nf_ref)) {</div><div class='add'>+	if (!refcount_dec_if_one(&amp;nf-&gt;nf_ref)) {</div><div class='ctx'> 		trace_nfsd_file_gc_in_use(nf);</div><div class='del'>-		list_lru_isolate(lru, &amp;nf-&gt;nf_lru);</div><div class='del'>-		return LRU_REMOVED;</div><div class='add'>+		return LRU_ROTATE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Refcount went to zero. Unhash it and queue it to the dispose list */</div><div class='ctx'> 	nfsd_file_unhash(nf);</div><div class='del'>-	list_lru_isolate_move(lru, &amp;nf-&gt;nf_lru, head);</div><div class='add'>+	list_lru_isolate(lru, &amp;nf-&gt;nf_lru);</div><div class='add'>+	list_add(&amp;nf-&gt;nf_gc, head);</div><div class='ctx'> 	this_cpu_inc(nfsd_file_evictions);</div><div class='ctx'> 	trace_nfsd_file_gc_disposed(nf);</div><div class='ctx'> 	return LRU_REMOVED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static enum lru_status</div><div class='add'>+nfsd_file_gc_cb(struct list_head *item, struct list_lru_one *lru,</div><div class='add'>+		 void *arg)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_file *nf = list_entry(item, struct nfsd_file, nf_lru);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(NFSD_FILE_RECENT, &amp;nf-&gt;nf_flags)) {</div><div class='add'>+		/*</div><div class='add'>+		 * "REFERENCED" really means "should be at the end of the</div><div class='add'>+		 * LRU. As we are putting it there we can clear the flag.</div><div class='add'>+		 */</div><div class='add'>+		clear_bit(NFSD_FILE_REFERENCED, &amp;nf-&gt;nf_flags);</div><div class='add'>+		trace_nfsd_file_gc_aged(nf);</div><div class='add'>+		return LRU_ROTATE;</div><div class='add'>+	}</div><div class='add'>+	return nfsd_file_lru_cb(item, lru, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If the shrinker runs between calls to list_lru_walk_node() in</div><div class='add'>+ * nfsd_file_gc(), the "remaining" count will be wrong.  This could</div><div class='add'>+ * result in premature freeing of some files.  This may not matter much</div><div class='add'>+ * but is easy to fix with this spinlock which temporarily disables</div><div class='add'>+ * the shrinker.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_SPINLOCK(nfsd_gc_lock);</div><div class='ctx'> static void</div><div class='ctx'> nfsd_file_gc(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long ret = 0;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='del'>-	unsigned long ret;</div><div class='add'>+	int nid;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nfsd_gc_lock);</div><div class='add'>+	for_each_node_state(nid, N_NORMAL_MEMORY) {</div><div class='add'>+		unsigned long remaining = list_lru_count_node(&amp;nfsd_file_lru, nid);</div><div class='ctx'> </div><div class='del'>-	ret = list_lru_walk(&amp;nfsd_file_lru, nfsd_file_lru_cb,</div><div class='del'>-			    &amp;dispose, list_lru_count(&amp;nfsd_file_lru));</div><div class='add'>+		while (remaining &gt; 0) {</div><div class='add'>+			unsigned long nr = min(remaining, NFSD_FILE_GC_BATCH);</div><div class='add'>+</div><div class='add'>+			remaining -= nr;</div><div class='add'>+			ret += list_lru_walk_node(&amp;nfsd_file_lru, nid, nfsd_file_gc_cb,</div><div class='add'>+						  &amp;dispose, &amp;nr);</div><div class='add'>+			if (nr)</div><div class='add'>+				/* walk aborted early */</div><div class='add'>+				remaining = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nfsd_gc_lock);</div><div class='ctx'> 	trace_nfsd_file_gc_removed(ret, list_lru_count(&amp;nfsd_file_lru));</div><div class='ctx'> 	nfsd_file_dispose_list_delayed(&amp;dispose);</div><div class='ctx'> }</div><div class='hunk'>@@ -497,9 +589,9 @@ nfsd_file_gc(void)</div><div class='ctx'> static void</div><div class='ctx'> nfsd_file_gc_worker(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	nfsd_file_gc();</div><div class='ctx'> 	if (list_lru_count(&amp;nfsd_file_lru))</div><div class='del'>-		nfsd_file_schedule_laundrette();</div><div class='add'>+		nfsd_file_gc();</div><div class='add'>+	nfsd_file_schedule_laundrette();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long</div><div class='hunk'>@@ -514,8 +606,12 @@ nfsd_file_lru_scan(struct shrinker *s, struct shrink_control *sc)</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> </div><div class='add'>+	if (!spin_trylock(&amp;nfsd_gc_lock))</div><div class='add'>+		return SHRINK_STOP;</div><div class='add'>+</div><div class='ctx'> 	ret = list_lru_shrink_walk(&amp;nfsd_file_lru, sc,</div><div class='ctx'> 				   nfsd_file_lru_cb, &amp;dispose);</div><div class='add'>+	spin_unlock(&amp;nfsd_gc_lock);</div><div class='ctx'> 	trace_nfsd_file_shrinker_removed(ret, list_lru_count(&amp;nfsd_file_lru));</div><div class='ctx'> 	nfsd_file_dispose_list_delayed(&amp;dispose);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -551,7 +647,7 @@ nfsd_file_cond_queue(struct nfsd_file *nf, struct list_head *dispose)</div><div class='ctx'> </div><div class='ctx'> 	/* If refcount goes to 0, then put on the dispose list */</div><div class='ctx'> 	if (refcount_sub_and_test(decrement, &amp;nf-&gt;nf_ref)) {</div><div class='del'>-		list_add(&amp;nf-&gt;nf_lru, dispose);</div><div class='add'>+		list_add(&amp;nf-&gt;nf_gc, dispose);</div><div class='ctx'> 		trace_nfsd_file_closing(nf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -620,50 +716,23 @@ nfsd_file_close_inode(struct inode *inode)</div><div class='ctx'> void</div><div class='ctx'> nfsd_file_close_inode_sync(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct nfsd_file *nf;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_file_close(inode);</div><div class='ctx'> </div><div class='ctx'> 	nfsd_file_queue_for_close(inode, &amp;dispose);</div><div class='del'>-	while (!list_empty(&amp;dispose)) {</div><div class='del'>-		nf = list_first_entry(&amp;dispose, struct nfsd_file, nf_lru);</div><div class='del'>-		list_del_init(&amp;nf-&gt;nf_lru);</div><div class='del'>-		nfsd_file_free(nf);</div><div class='del'>-	}</div><div class='del'>-	flush_delayed_fput();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nfsd_file_delayed_close - close unused nfsd_files</div><div class='del'>- * @work: dummy</div><div class='del'>- *</div><div class='del'>- * Scrape the freeme list for this nfsd_net, and then dispose of them</div><div class='del'>- * all.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-nfsd_file_delayed_close(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	LIST_HEAD(head);</div><div class='del'>-	struct nfsd_fcache_disposal *l = container_of(work,</div><div class='del'>-			struct nfsd_fcache_disposal, work);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;l-&gt;lock);</div><div class='del'>-	list_splice_init(&amp;l-&gt;freeme, &amp;head);</div><div class='del'>-	spin_unlock(&amp;l-&gt;lock);</div><div class='del'>-</div><div class='del'>-	nfsd_file_dispose_list(&amp;head);</div><div class='add'>+	nfsd_file_dispose_list(&amp;dispose);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg,</div><div class='ctx'> 			    void *data)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl = data;</div><div class='add'>+	struct file_lease *fl = data;</div><div class='ctx'> </div><div class='ctx'> 	/* Only close files for F_SETLEASE leases */</div><div class='del'>-	if (fl-&gt;fl_flags &amp; FL_LEASE)</div><div class='del'>-		nfsd_file_close_inode(file_inode(fl-&gt;fl_file));</div><div class='add'>+	if (fl-&gt;c.flc_flags &amp; FL_LEASE)</div><div class='add'>+		nfsd_file_close_inode(file_inode(fl-&gt;c.flc_file));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -714,28 +783,21 @@ nfsd_file_cache_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ret = rhltable_init(&amp;nfsd_file_rhltable, &amp;nfsd_file_rhash_params);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	nfsd_filecache_wq = alloc_workqueue("nfsd_filecache", WQ_UNBOUND, 0);</div><div class='del'>-	if (!nfsd_filecache_wq)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	nfsd_file_slab = kmem_cache_create("nfsd_file",</div><div class='del'>-				sizeof(struct nfsd_file), 0, 0, NULL);</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	nfsd_file_slab = KMEM_CACHE(nfsd_file, 0);</div><div class='ctx'> 	if (!nfsd_file_slab) {</div><div class='ctx'> 		pr_err("nfsd: unable to create nfsd_file_slab\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nfsd_file_mark_slab = kmem_cache_create("nfsd_file_mark",</div><div class='del'>-					sizeof(struct nfsd_file_mark), 0, 0, NULL);</div><div class='add'>+	nfsd_file_mark_slab = KMEM_CACHE(nfsd_file_mark, 0);</div><div class='ctx'> 	if (!nfsd_file_mark_slab) {</div><div class='ctx'> 		pr_err("nfsd: unable to create nfsd_file_mark_slab\n");</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	ret = list_lru_init(&amp;nfsd_file_lru);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("nfsd: failed to init nfsd_file_lru: %d\n", ret);</div><div class='hunk'>@@ -762,7 +824,7 @@ nfsd_file_cache_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nfsd_file_fsnotify_group = fsnotify_alloc_group(&amp;nfsd_file_fsnotify_ops,</div><div class='del'>-							FSNOTIFY_GROUP_NOFS);</div><div class='add'>+							0);</div><div class='ctx'> 	if (IS_ERR(nfsd_file_fsnotify_group)) {</div><div class='ctx'> 		pr_err("nfsd: unable to create fsnotify group: %ld\n",</div><div class='ctx'> 			PTR_ERR(nfsd_file_fsnotify_group));</div><div class='hunk'>@@ -773,6 +835,8 @@ nfsd_file_cache_init(void)</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;nfsd_filecache_laundrette, nfsd_file_gc_worker);</div><div class='ctx'> out:</div><div class='add'>+	if (ret)</div><div class='add'>+		clear_bit(NFSD_FILE_CACHE_UP, &amp;nfsd_file_flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> out_notifier:</div><div class='ctx'> 	lease_unregister_notifier(&amp;nfsd_file_lease_notifier);</div><div class='hunk'>@@ -785,8 +849,6 @@ out_err:</div><div class='ctx'> 	nfsd_file_slab = NULL;</div><div class='ctx'> 	kmem_cache_destroy(nfsd_file_mark_slab);</div><div class='ctx'> 	nfsd_file_mark_slab = NULL;</div><div class='del'>-	destroy_workqueue(nfsd_filecache_wq);</div><div class='del'>-	nfsd_filecache_wq = NULL;</div><div class='ctx'> 	rhltable_destroy(&amp;nfsd_file_rhltable);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='hunk'>@@ -806,6 +868,14 @@ __nfsd_file_cache_purge(struct net *net)</div><div class='ctx'> 	struct nfsd_file *nf;</div><div class='ctx'> 	LIST_HEAD(dispose);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	if (net) {</div><div class='add'>+		struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+		nfs_localio_invalidate_clients(&amp;nn-&gt;local_clients,</div><div class='add'>+					       &amp;nn-&gt;local_clients_lock);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	rhltable_walk_enter(&amp;nfsd_file_rhltable, &amp;iter);</div><div class='ctx'> 	do {</div><div class='ctx'> 		rhashtable_walk_start(&amp;iter);</div><div class='hunk'>@@ -832,7 +902,6 @@ nfsd_alloc_fcache_disposal(void)</div><div class='ctx'> 	l = kmalloc(sizeof(*l), GFP_KERNEL);</div><div class='ctx'> 	if (!l)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	INIT_WORK(&amp;l-&gt;work, nfsd_file_delayed_close);</div><div class='ctx'> 	spin_lock_init(&amp;l-&gt;lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;l-&gt;freeme);</div><div class='ctx'> 	return l;</div><div class='hunk'>@@ -841,7 +910,6 @@ nfsd_alloc_fcache_disposal(void)</div><div class='ctx'> static void</div><div class='ctx'> nfsd_free_fcache_disposal(struct nfsd_fcache_disposal *l)</div><div class='ctx'> {</div><div class='del'>-	cancel_work_sync(&amp;l-&gt;work);</div><div class='ctx'> 	nfsd_file_dispose_list(&amp;l-&gt;freeme);</div><div class='ctx'> 	kfree(l);</div><div class='ctx'> }</div><div class='hunk'>@@ -910,13 +978,12 @@ nfsd_file_cache_shutdown(void)</div><div class='ctx'> 	fsnotify_wait_marks_destroyed();</div><div class='ctx'> 	kmem_cache_destroy(nfsd_file_mark_slab);</div><div class='ctx'> 	nfsd_file_mark_slab = NULL;</div><div class='del'>-	destroy_workqueue(nfsd_filecache_wq);</div><div class='del'>-	nfsd_filecache_wq = NULL;</div><div class='ctx'> 	rhltable_destroy(&amp;nfsd_file_rhltable);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		per_cpu(nfsd_file_cache_hits, i) = 0;</div><div class='ctx'> 		per_cpu(nfsd_file_acquisitions, i) = 0;</div><div class='add'>+		per_cpu(nfsd_file_allocations, i) = 0;</div><div class='ctx'> 		per_cpu(nfsd_file_releases, i) = 0;</div><div class='ctx'> 		per_cpu(nfsd_file_total_age, i) = 0;</div><div class='ctx'> 		per_cpu(nfsd_file_evictions, i) = 0;</div><div class='hunk'>@@ -985,12 +1052,43 @@ nfsd_file_is_cached(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='del'>-nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+nfsd_file_get_dio_attrs(const struct svc_fh *fhp, struct nfsd_file *nf)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(nf-&gt;nf_file);</div><div class='add'>+	struct kstat stat;</div><div class='add'>+	__be32 status;</div><div class='add'>+</div><div class='add'>+	/* Currently only need to get DIO alignment info for regular files */</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		return nfs_ok;</div><div class='add'>+</div><div class='add'>+	status = fh_getattr(fhp, &amp;stat);</div><div class='add'>+	if (status != nfs_ok)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	trace_nfsd_file_get_dio_attrs(inode, &amp;stat);</div><div class='add'>+</div><div class='add'>+	if (stat.result_mask &amp; STATX_DIOALIGN) {</div><div class='add'>+		nf-&gt;nf_dio_mem_align = stat.dio_mem_align;</div><div class='add'>+		nf-&gt;nf_dio_offset_align = stat.dio_offset_align;</div><div class='add'>+	}</div><div class='add'>+	if (stat.result_mask &amp; STATX_DIO_READ_ALIGN)</div><div class='add'>+		nf-&gt;nf_dio_read_offset_align = stat.dio_read_offset_align;</div><div class='add'>+	else</div><div class='add'>+		nf-&gt;nf_dio_read_offset_align = nf-&gt;nf_dio_offset_align;</div><div class='add'>+</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32</div><div class='add'>+nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net,</div><div class='add'>+		     struct svc_cred *cred,</div><div class='add'>+		     struct auth_domain *client,</div><div class='add'>+		     struct svc_fh *fhp,</div><div class='ctx'> 		     unsigned int may_flags, struct file *file,</div><div class='del'>-		     struct nfsd_file **pnf, bool want_gc)</div><div class='add'>+		     umode_t type, bool want_gc, struct nfsd_file **pnf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char need = may_flags &amp; NFSD_FILE_MAY_MASK;</div><div class='del'>-	struct net *net = SVC_NET(rqstp);</div><div class='ctx'> 	struct nfsd_file *new, *nf;</div><div class='ctx'> 	bool stale_retry = true;</div><div class='ctx'> 	bool open_retry = true;</div><div class='hunk'>@@ -999,8 +1097,13 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	status = fh_verify(rqstp, fhp, S_IFREG,</div><div class='del'>-				may_flags|NFSD_MAY_OWNER_OVERRIDE);</div><div class='add'>+	if (rqstp)</div><div class='add'>+		status = fh_verify(rqstp, fhp, type,</div><div class='add'>+				   may_flags|NFSD_MAY_OWNER_OVERRIDE);</div><div class='add'>+	else</div><div class='add'>+		status = fh_verify_local(net, cred, client, fhp, type,</div><div class='add'>+					 may_flags|NFSD_MAY_OWNER_OVERRIDE);</div><div class='add'>+</div><div class='ctx'> 	if (status != nfs_ok)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	inode = d_inode(fhp-&gt;fh_dentry);</div><div class='hunk'>@@ -1009,16 +1112,8 @@ retry:</div><div class='ctx'> 	nf = nfsd_file_lookup_locked(net, current_cred(), inode, need, want_gc);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	if (nf) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the nf is on the LRU then it holds an extra reference</div><div class='del'>-		 * that must be put if it's removed. It had better not be</div><div class='del'>-		 * the last one however, since we should hold another.</div><div class='del'>-		 */</div><div class='del'>-		if (nfsd_file_lru_remove(nf))</div><div class='del'>-			WARN_ON_ONCE(refcount_dec_and_test(&amp;nf-&gt;nf_ref));</div><div class='add'>+	if (nf)</div><div class='ctx'> 		goto wait_for_construction;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	new = nfsd_file_alloc(net, inode, need, want_gc);</div><div class='ctx'> 	if (!new) {</div><div class='hunk'>@@ -1032,7 +1127,7 @@ retry:</div><div class='ctx'> 	if (unlikely(nf)) {</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='del'>-		nfsd_file_slab_free(&amp;new-&gt;nf_rcu);</div><div class='add'>+		nfsd_file_free(new);</div><div class='ctx'> 		goto wait_for_construction;</div><div class='ctx'> 	}</div><div class='ctx'> 	nf = new;</div><div class='hunk'>@@ -1043,8 +1138,6 @@ retry:</div><div class='ctx'> 	if (likely(ret == 0))</div><div class='ctx'> 		goto open_file;</div><div class='ctx'> </div><div class='del'>-	if (ret == -EEXIST)</div><div class='del'>-		goto retry;</div><div class='ctx'> 	trace_nfsd_file_insert_err(rqstp, inode, may_flags, ret);</div><div class='ctx'> 	status = nfserr_jukebox;</div><div class='ctx'> 	goto construction_err;</div><div class='hunk'>@@ -1059,6 +1152,7 @@ wait_for_construction:</div><div class='ctx'> 			status = nfserr_jukebox;</div><div class='ctx'> 			goto construction_err;</div><div class='ctx'> 		}</div><div class='add'>+		nfsd_file_put(nf);</div><div class='ctx'> 		open_retry = false;</div><div class='ctx'> 		fh_put(fhp);</div><div class='ctx'> 		goto retry;</div><div class='hunk'>@@ -1082,16 +1176,18 @@ out:</div><div class='ctx'> </div><div class='ctx'> open_file:</div><div class='ctx'> 	trace_nfsd_file_alloc(nf);</div><div class='del'>-	nf-&gt;nf_mark = nfsd_file_mark_find_or_create(nf, inode);</div><div class='del'>-	if (nf-&gt;nf_mark) {</div><div class='add'>+</div><div class='add'>+	if (type == S_IFREG)</div><div class='add'>+		nf-&gt;nf_mark = nfsd_file_mark_find_or_create(inode);</div><div class='add'>+</div><div class='add'>+	if (type != S_IFREG || nf-&gt;nf_mark) {</div><div class='ctx'> 		if (file) {</div><div class='ctx'> 			get_file(file);</div><div class='ctx'> 			nf-&gt;nf_file = file;</div><div class='ctx'> 			status = nfs_ok;</div><div class='ctx'> 			trace_nfsd_file_opened(nf, status);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = nfsd_open_verified(rqstp, fhp, may_flags,</div><div class='del'>-						 &amp;nf-&gt;nf_file);</div><div class='add'>+			ret = nfsd_open_verified(fhp, type, may_flags, &amp;nf-&gt;nf_file);</div><div class='ctx'> 			if (ret == -EOPENSTALE &amp;&amp; stale_retry) {</div><div class='ctx'> 				stale_retry = false;</div><div class='ctx'> 				nfsd_file_unhash(nf);</div><div class='hunk'>@@ -1105,6 +1201,8 @@ open_file:</div><div class='ctx'> 			}</div><div class='ctx'> 			status = nfserrno(ret);</div><div class='ctx'> 			trace_nfsd_file_open(nf, status);</div><div class='add'>+			if (status == nfs_ok)</div><div class='add'>+				status = nfsd_file_get_dio_attrs(fhp, nf);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		status = nfserr_jukebox;</div><div class='hunk'>@@ -1114,6 +1212,9 @@ open_file:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (status != nfs_ok || inode-&gt;i_nlink == 0)</div><div class='ctx'> 		nfsd_file_unhash(nf);</div><div class='add'>+	else if (want_gc)</div><div class='add'>+		nfsd_file_lru_add(nf);</div><div class='add'>+</div><div class='ctx'> 	clear_and_wake_up_bit(NFSD_FILE_PENDING, &amp;nf-&gt;nf_flags);</div><div class='ctx'> 	if (status == nfs_ok)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1147,7 +1248,8 @@ __be32</div><div class='ctx'> nfsd_file_acquire_gc(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 		     unsigned int may_flags, struct nfsd_file **pnf)</div><div class='ctx'> {</div><div class='del'>-	return nfsd_file_do_acquire(rqstp, fhp, may_flags, NULL, pnf, true);</div><div class='add'>+	return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL,</div><div class='add'>+				    fhp, may_flags, NULL, S_IFREG, true, pnf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1171,7 +1273,54 @@ __be32</div><div class='ctx'> nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 		  unsigned int may_flags, struct nfsd_file **pnf)</div><div class='ctx'> {</div><div class='del'>-	return nfsd_file_do_acquire(rqstp, fhp, may_flags, NULL, pnf, false);</div><div class='add'>+	return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL,</div><div class='add'>+				    fhp, may_flags, NULL, S_IFREG, false, pnf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_file_acquire_local - Get a struct nfsd_file with an open file for localio</div><div class='add'>+ * @net: The network namespace in which to perform a lookup</div><div class='add'>+ * @cred: the user credential with which to validate access</div><div class='add'>+ * @client: the auth_domain for LOCALIO lookup</div><div class='add'>+ * @fhp: the NFS filehandle of the file to be opened</div><div class='add'>+ * @may_flags: NFSD_MAY_ settings for the file</div><div class='add'>+ * @pnf: OUT: new or found "struct nfsd_file" object</div><div class='add'>+ *</div><div class='add'>+ * This file lookup interface provide access to a file given the</div><div class='add'>+ * filehandle and credential.  No connection-based authorisation</div><div class='add'>+ * is performed and in that way it is quite different to other</div><div class='add'>+ * file access mediated by nfsd.  It allows a kernel module such as the NFS</div><div class='add'>+ * client to reach across network and filesystem namespaces to access</div><div class='add'>+ * a file.  The security implications of this should be carefully</div><div class='add'>+ * considered before use.</div><div class='add'>+ *</div><div class='add'>+ * The nfsd_file_object returned by this API is reference-counted</div><div class='add'>+ * but not garbage-collected. The object is unhashed after the</div><div class='add'>+ * final nfsd_file_put().</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok - @pnf points to an nfsd_file with its reference</div><div class='add'>+ *   count boosted.</div><div class='add'>+ *</div><div class='add'>+ * On error, an nfsstat value in network byte order is returned.</div><div class='add'>+ */</div><div class='add'>+__be32</div><div class='add'>+nfsd_file_acquire_local(struct net *net, struct svc_cred *cred,</div><div class='add'>+			struct auth_domain *client, struct svc_fh *fhp,</div><div class='add'>+			unsigned int may_flags, struct nfsd_file **pnf)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Save creds before calling nfsd_file_do_acquire() (which calls</div><div class='add'>+	 * nfsd_setuser). Important because caller (LOCALIO) is from</div><div class='add'>+	 * client context.</div><div class='add'>+	 */</div><div class='add'>+	const struct cred *save_cred = get_current_cred();</div><div class='add'>+	__be32 beres;</div><div class='add'>+</div><div class='add'>+	beres = nfsd_file_do_acquire(NULL, net, cred, client, fhp, may_flags,</div><div class='add'>+				     NULL, S_IFREG, false, pnf);</div><div class='add'>+	put_cred(revert_creds(save_cred));</div><div class='add'>+	return beres;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1197,7 +1346,34 @@ nfsd_file_acquire_opened(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 			 unsigned int may_flags, struct file *file,</div><div class='ctx'> 			 struct nfsd_file **pnf)</div><div class='ctx'> {</div><div class='del'>-	return nfsd_file_do_acquire(rqstp, fhp, may_flags, file, pnf, false);</div><div class='add'>+	return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL,</div><div class='add'>+				    fhp, may_flags, file, S_IFREG, false, pnf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_file_acquire_dir - Get a struct nfsd_file with an open directory</div><div class='add'>+ * @rqstp: the RPC transaction being executed</div><div class='add'>+ * @fhp: the NFS filehandle of the file to be opened</div><div class='add'>+ * @pnf: OUT: new or found "struct nfsd_file" object</div><div class='add'>+ *</div><div class='add'>+ * The nfsd_file_object returned by this API is reference-counted</div><div class='add'>+ * but not garbage-collected. The object is unhashed after the</div><div class='add'>+ * final nfsd_file_put(). This opens directories only, and only</div><div class='add'>+ * in O_RDONLY mode.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %nfs_ok - @pnf points to an nfsd_file with its reference</div><div class='add'>+ *   count boosted.</div><div class='add'>+ *</div><div class='add'>+ * On error, an nfsstat value in network byte order is returned.</div><div class='add'>+ */</div><div class='add'>+__be32</div><div class='add'>+nfsd_file_acquire_dir(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+		      struct nfsd_file **pnf)</div><div class='add'>+{</div><div class='add'>+	return nfsd_file_do_acquire(rqstp, SVC_NET(rqstp), NULL, NULL, fhp,</div><div class='add'>+				    NFSD_MAY_READ|NFSD_MAY_64BIT_COOKIE,</div><div class='add'>+				    NULL, S_IFDIR, false, pnf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1207,7 +1383,7 @@ nfsd_file_acquire_opened(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'>  */</div><div class='ctx'> int nfsd_file_cache_stats_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='del'>-	unsigned long releases = 0, evictions = 0;</div><div class='add'>+	unsigned long allocations = 0, releases = 0, evictions = 0;</div><div class='ctx'> 	unsigned long hits = 0, acquisitions = 0;</div><div class='ctx'> 	unsigned int i, count = 0, buckets = 0;</div><div class='ctx'> 	unsigned long lru = 0, total_age = 0;</div><div class='hunk'>@@ -1232,6 +1408,7 @@ int nfsd_file_cache_stats_show(struct seq_file *m, void *v)</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		hits += per_cpu(nfsd_file_cache_hits, i);</div><div class='ctx'> 		acquisitions += per_cpu(nfsd_file_acquisitions, i);</div><div class='add'>+		allocations += per_cpu(nfsd_file_allocations, i);</div><div class='ctx'> 		releases += per_cpu(nfsd_file_releases, i);</div><div class='ctx'> 		total_age += per_cpu(nfsd_file_total_age, i);</div><div class='ctx'> 		evictions += per_cpu(nfsd_file_evictions, i);</div><div class='hunk'>@@ -1242,6 +1419,7 @@ int nfsd_file_cache_stats_show(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, "lru entries:   %lu\n", lru);</div><div class='ctx'> 	seq_printf(m, "cache hits:    %lu\n", hits);</div><div class='ctx'> 	seq_printf(m, "acquisitions:  %lu\n", acquisitions);</div><div class='add'>+	seq_printf(m, "allocations:   %lu\n", allocations);</div><div class='ctx'> 	seq_printf(m, "releases:      %lu\n", releases);</div><div class='ctx'> 	seq_printf(m, "evictions:     %lu\n", evictions);</div><div class='ctx'> 	if (releases)</div><div class='head'>diff --git a/fs/nfsd/filecache.h b/fs/nfsd/filecache.h<br/>index e54165a3224f..b383dbc5b921 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/filecache.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/filecache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/filecache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/filecache.h</a></div><div class='hunk'>@@ -4,6 +4,12 @@</div><div class='ctx'> #include &lt;linux/fsnotify_backend.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Limit the time that the list_lru_one lock is held during</div><div class='add'>+ * an LRU scan.</div><div class='add'>+ */</div><div class='add'>+#define NFSD_FILE_GC_BATCH     (16UL)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This is the fsnotify_mark container that nfsd attaches to the files that it</div><div class='ctx'>  * is holding open. Note that we have a separate refcount here aside from the</div><div class='ctx'>  * one in the fsnotify_mark. We only want a single fsnotify_mark attached to</div><div class='hunk'>@@ -38,14 +44,20 @@ struct nfsd_file {</div><div class='ctx'> #define NFSD_FILE_PENDING	(1)</div><div class='ctx'> #define NFSD_FILE_REFERENCED	(2)</div><div class='ctx'> #define NFSD_FILE_GC		(3)</div><div class='add'>+#define NFSD_FILE_RECENT	(4)</div><div class='ctx'> 	unsigned long		nf_flags;</div><div class='ctx'> 	refcount_t		nf_ref;</div><div class='ctx'> 	unsigned char		nf_may;</div><div class='ctx'> </div><div class='ctx'> 	struct nfsd_file_mark	*nf_mark;</div><div class='ctx'> 	struct list_head	nf_lru;</div><div class='add'>+	struct list_head	nf_gc;</div><div class='ctx'> 	struct rcu_head		nf_rcu;</div><div class='ctx'> 	ktime_t			nf_birthtime;</div><div class='add'>+</div><div class='add'>+	u32			nf_dio_mem_align;</div><div class='add'>+	u32			nf_dio_offset_align;</div><div class='add'>+	u32			nf_dio_read_offset_align;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int nfsd_file_cache_init(void);</div><div class='hunk'>@@ -54,8 +66,11 @@ void nfsd_file_cache_shutdown(void);</div><div class='ctx'> int nfsd_file_cache_start_net(struct net *net);</div><div class='ctx'> void nfsd_file_cache_shutdown_net(struct net *net);</div><div class='ctx'> void nfsd_file_put(struct nfsd_file *nf);</div><div class='add'>+struct net *nfsd_file_put_local(struct nfsd_file __rcu **nf);</div><div class='ctx'> struct nfsd_file *nfsd_file_get(struct nfsd_file *nf);</div><div class='add'>+struct file *nfsd_file_file(struct nfsd_file *nf);</div><div class='ctx'> void nfsd_file_close_inode_sync(struct inode *inode);</div><div class='add'>+void nfsd_file_net_dispose(struct nfsd_net *nn);</div><div class='ctx'> bool nfsd_file_is_cached(struct inode *inode);</div><div class='ctx'> __be32 nfsd_file_acquire_gc(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 		  unsigned int may_flags, struct nfsd_file **nfp);</div><div class='hunk'>@@ -64,5 +79,10 @@ __be32 nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> __be32 nfsd_file_acquire_opened(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 		  unsigned int may_flags, struct file *file,</div><div class='ctx'> 		  struct nfsd_file **nfp);</div><div class='add'>+__be32 nfsd_file_acquire_local(struct net *net, struct svc_cred *cred,</div><div class='add'>+			       struct auth_domain *client, struct svc_fh *fhp,</div><div class='add'>+			       unsigned int may_flags, struct nfsd_file **pnf);</div><div class='add'>+__be32 nfsd_file_acquire_dir(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+		  struct nfsd_file **pnf);</div><div class='ctx'> int nfsd_file_cache_stats_show(struct seq_file *m, void *v);</div><div class='ctx'> #endif /* _FS_NFSD_FILECACHE_H */</div><div class='head'>diff --git a/fs/nfsd/flexfilelayout.c b/fs/nfsd/flexfilelayout.c<br/>index 3ca5304440ff..0f1a35400cd5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/flexfilelayout.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/flexfilelayout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/flexfilelayout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/flexfilelayout.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> #define NFSDDBG_FACILITY	NFSDDBG_PNFS</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='del'>-nfsd4_ff_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,</div><div class='del'>-		struct nfsd4_layoutget *args)</div><div class='add'>+nfsd4_ff_proc_layoutget(struct svc_rqst *rqstp, struct inode *inode,</div><div class='add'>+		const struct svc_fh *fhp, struct nfsd4_layoutget *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_layout_seg *seg = &amp;args-&gt;lg_seg;</div><div class='ctx'> 	u32 device_generation = 0;</div><div class='hunk'>@@ -125,6 +125,13 @@ nfsd4_ff_proc_getdeviceinfo(struct super_block *sb, struct svc_rqst *rqstp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32</div><div class='add'>+nfsd4_ff_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp,</div><div class='add'>+		struct nfsd4_layoutcommit *lcp)</div><div class='add'>+{</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct nfsd4_layout_ops ff_layout_ops = {</div><div class='ctx'> 	.notify_types		=</div><div class='ctx'> 			NOTIFY_DEVICEID4_DELETE | NOTIFY_DEVICEID4_CHANGE,</div><div class='hunk'>@@ -133,4 +140,5 @@ const struct nfsd4_layout_ops ff_layout_ops = {</div><div class='ctx'> 	.encode_getdeviceinfo	= nfsd4_ff_encode_getdeviceinfo,</div><div class='ctx'> 	.proc_layoutget		= nfsd4_ff_proc_layoutget,</div><div class='ctx'> 	.encode_layoutget	= nfsd4_ff_encode_layoutget,</div><div class='add'>+	.proc_layoutcommit	= nfsd4_ff_proc_layoutcommit,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfsd/flexfilelayoutxdr.c b/fs/nfsd/flexfilelayoutxdr.c<br/>index aeb71c10ff1b..f9f7e38cba13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/flexfilelayoutxdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/flexfilelayoutxdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/flexfilelayoutxdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/flexfilelayoutxdr.c</a></div><div class='hunk'>@@ -54,8 +54,7 @@ nfsd4_ff_encode_layoutget(struct xdr_stream *xdr,</div><div class='ctx'> 	*p++ = cpu_to_be32(1);			/* single mirror */</div><div class='ctx'> 	*p++ = cpu_to_be32(1);			/* single data server */</div><div class='ctx'> </div><div class='del'>-	p = xdr_encode_opaque_fixed(p, &amp;fl-&gt;deviceid,</div><div class='del'>-			sizeof(struct nfsd4_deviceid));</div><div class='add'>+	p = svcxdr_encode_deviceid4(p, &amp;fl-&gt;deviceid);</div><div class='ctx'> </div><div class='ctx'> 	*p++ = cpu_to_be32(1);			/* efficiency */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfsd/localio.c b/fs/nfsd/localio.c<br/>new file mode 100644<br/>index 000000000000..be710d809a3b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/localio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/localio.c</a></div><div class='hunk'>@@ -0,0 +1,217 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * NFS server support for local clients to bypass network stack</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014 Weston Andros Adamson &lt;dros@primarydata.com&gt;</div><div class='add'>+ * Copyright (C) 2019 Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 Mike Snitzer &lt;snitzer@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 NeilBrown &lt;neilb@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/exportfs.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/svcauth.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='add'>+#include &lt;linux/nfs.h&gt;</div><div class='add'>+#include &lt;linux/nfs_common.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/nfs_xdr.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "nfsd.h"</div><div class='add'>+#include "vfs.h"</div><div class='add'>+#include "netns.h"</div><div class='add'>+#include "filecache.h"</div><div class='add'>+#include "cache.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_open_local_fh - lookup a local filehandle @nfs_fh and map to nfsd_file</div><div class='add'>+ *</div><div class='add'>+ * @net: 'struct net' to get the proper nfsd_net required for LOCALIO access</div><div class='add'>+ * @dom: 'struct auth_domain' required for LOCALIO access</div><div class='add'>+ * @rpc_clnt: rpc_clnt that the client established</div><div class='add'>+ * @cred: cred that the client established</div><div class='add'>+ * @nfs_fh: filehandle to lookup</div><div class='add'>+ * @pnf: place to find the nfsd_file, or store it if it was non-NULL</div><div class='add'>+ * @fmode: fmode_t to use for open</div><div class='add'>+ *</div><div class='add'>+ * This function maps a local fh to a path on a local filesystem.</div><div class='add'>+ * This is useful when the nfs client has the local server mounted - it can</div><div class='add'>+ * avoid all the NFS overhead with reads, writes and commits.</div><div class='add'>+ *</div><div class='add'>+ * On successful return, returned nfsd_file will have its nf_net member</div><div class='add'>+ * set. Caller (NFS client) is responsible for calling nfsd_net_put and</div><div class='add'>+ * nfsd_file_put (via nfs_to_nfsd_file_put_local).</div><div class='add'>+ */</div><div class='add'>+static struct nfsd_file *</div><div class='add'>+nfsd_open_local_fh(struct net *net, struct auth_domain *dom,</div><div class='add'>+		   struct rpc_clnt *rpc_clnt, const struct cred *cred,</div><div class='add'>+		   const struct nfs_fh *nfs_fh, struct nfsd_file __rcu **pnf,</div><div class='add'>+		   const fmode_t fmode)</div><div class='add'>+{</div><div class='add'>+	int mayflags = NFSD_MAY_LOCALIO;</div><div class='add'>+	struct svc_cred rq_cred;</div><div class='add'>+	struct svc_fh fh;</div><div class='add'>+	struct nfsd_file *localio;</div><div class='add'>+	__be32 beres;</div><div class='add'>+</div><div class='add'>+	if (nfs_fh-&gt;size &gt; NFS4_FHSIZE)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (!nfsd_net_try_get(net))</div><div class='add'>+		return ERR_PTR(-ENXIO);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	localio = nfsd_file_get(rcu_dereference(*pnf));</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (localio)</div><div class='add'>+		return localio;</div><div class='add'>+</div><div class='add'>+	/* nfs_fh -&gt; svc_fh */</div><div class='add'>+	fh_init(&amp;fh, NFS4_FHSIZE);</div><div class='add'>+	fh.fh_handle.fh_size = nfs_fh-&gt;size;</div><div class='add'>+	memcpy(fh.fh_handle.fh_raw, nfs_fh-&gt;data, nfs_fh-&gt;size);</div><div class='add'>+</div><div class='add'>+	if (fmode &amp; FMODE_READ)</div><div class='add'>+		mayflags |= NFSD_MAY_READ;</div><div class='add'>+	if (fmode &amp; FMODE_WRITE)</div><div class='add'>+		mayflags |= NFSD_MAY_WRITE;</div><div class='add'>+</div><div class='add'>+	svcauth_map_clnt_to_svc_cred_local(rpc_clnt, cred, &amp;rq_cred);</div><div class='add'>+</div><div class='add'>+	beres = nfsd_file_acquire_local(net, &amp;rq_cred, dom,</div><div class='add'>+					&amp;fh, mayflags, &amp;localio);</div><div class='add'>+	if (beres)</div><div class='add'>+		localio = ERR_PTR(nfs_stat_to_errno(be32_to_cpu(beres)));</div><div class='add'>+</div><div class='add'>+	fh_put(&amp;fh);</div><div class='add'>+	if (rq_cred.cr_group_info)</div><div class='add'>+		put_group_info(rq_cred.cr_group_info);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(localio)) {</div><div class='add'>+		struct nfsd_file *new;</div><div class='add'>+		if (!nfsd_net_try_get(net)) {</div><div class='add'>+			nfsd_file_put(localio);</div><div class='add'>+			nfsd_net_put(net);</div><div class='add'>+			return ERR_PTR(-ENXIO);</div><div class='add'>+		}</div><div class='add'>+		nfsd_file_get(localio);</div><div class='add'>+	again:</div><div class='add'>+		new = unrcu_pointer(cmpxchg(pnf, NULL, RCU_INITIALIZER(localio)));</div><div class='add'>+		if (new) {</div><div class='add'>+			/* Some other thread installed an nfsd_file */</div><div class='add'>+			if (nfsd_file_get(new) == NULL)</div><div class='add'>+				goto again;</div><div class='add'>+			/*</div><div class='add'>+			 * Drop the ref we were going to install (both file and</div><div class='add'>+			 * net) and the one we were going to return (only file).</div><div class='add'>+			 */</div><div class='add'>+			nfsd_file_put(localio);</div><div class='add'>+			nfsd_net_put(net);</div><div class='add'>+			nfsd_file_put(localio);</div><div class='add'>+			localio = new;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		nfsd_net_put(net);</div><div class='add'>+</div><div class='add'>+	return localio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfsd_file_dio_alignment(struct nfsd_file *nf,</div><div class='add'>+				    u32 *nf_dio_mem_align,</div><div class='add'>+				    u32 *nf_dio_offset_align,</div><div class='add'>+				    u32 *nf_dio_read_offset_align)</div><div class='add'>+{</div><div class='add'>+	*nf_dio_mem_align = nf-&gt;nf_dio_mem_align;</div><div class='add'>+	*nf_dio_offset_align = nf-&gt;nf_dio_offset_align;</div><div class='add'>+	*nf_dio_read_offset_align = nf-&gt;nf_dio_read_offset_align;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nfsd_localio_operations nfsd_localio_ops = {</div><div class='add'>+	.nfsd_net_try_get  = nfsd_net_try_get,</div><div class='add'>+	.nfsd_net_put  = nfsd_net_put,</div><div class='add'>+	.nfsd_open_local_fh = nfsd_open_local_fh,</div><div class='add'>+	.nfsd_file_put_local = nfsd_file_put_local,</div><div class='add'>+	.nfsd_file_file = nfsd_file_file,</div><div class='add'>+	.nfsd_file_dio_alignment = nfsd_file_dio_alignment,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void nfsd_localio_ops_init(void)</div><div class='add'>+{</div><div class='add'>+	nfs_to = &amp;nfsd_localio_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UUID_IS_LOCAL XDR functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static __be32 localio_proc_null(struct svc_rqst *rqstp)</div><div class='add'>+{</div><div class='add'>+	return rpc_success;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct localio_uuidarg {</div><div class='add'>+	uuid_t			uuid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __be32 localio_proc_uuid_is_local(struct svc_rqst *rqstp)</div><div class='add'>+{</div><div class='add'>+	struct localio_uuidarg *argp = rqstp-&gt;rq_argp;</div><div class='add'>+	struct net *net = SVC_NET(rqstp);</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	nfs_uuid_is_local(&amp;argp-&gt;uuid, &amp;nn-&gt;local_clients,</div><div class='add'>+			  &amp;nn-&gt;local_clients_lock,</div><div class='add'>+			  net, rqstp-&gt;rq_client, THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	return rpc_success;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool localio_decode_uuidarg(struct svc_rqst *rqstp,</div><div class='add'>+				   struct xdr_stream *xdr)</div><div class='add'>+{</div><div class='add'>+	struct localio_uuidarg *argp = rqstp-&gt;rq_argp;</div><div class='add'>+	u8 uuid[UUID_SIZE];</div><div class='add'>+</div><div class='add'>+	if (decode_opaque_fixed(xdr, uuid, UUID_SIZE))</div><div class='add'>+		return false;</div><div class='add'>+	import_uuid(&amp;argp-&gt;uuid, uuid);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct svc_procedure localio_procedures1[] = {</div><div class='add'>+	[LOCALIOPROC_NULL] = {</div><div class='add'>+		.pc_func = localio_proc_null,</div><div class='add'>+		.pc_decode = nfssvc_decode_voidarg,</div><div class='add'>+		.pc_encode = nfssvc_encode_voidres,</div><div class='add'>+		.pc_argsize = sizeof(struct nfsd_voidargs),</div><div class='add'>+		.pc_ressize = sizeof(struct nfsd_voidres),</div><div class='add'>+		.pc_cachetype = RC_NOCACHE,</div><div class='add'>+		.pc_xdrressize = 0,</div><div class='add'>+		.pc_name = "NULL",</div><div class='add'>+	},</div><div class='add'>+	[LOCALIOPROC_UUID_IS_LOCAL] = {</div><div class='add'>+		.pc_func = localio_proc_uuid_is_local,</div><div class='add'>+		.pc_decode = localio_decode_uuidarg,</div><div class='add'>+		.pc_encode = nfssvc_encode_voidres,</div><div class='add'>+		.pc_argsize = sizeof(struct localio_uuidarg),</div><div class='add'>+		.pc_argzero = sizeof(struct localio_uuidarg),</div><div class='add'>+		.pc_ressize = sizeof(struct nfsd_voidres),</div><div class='add'>+		.pc_cachetype = RC_NOCACHE,</div><div class='add'>+		.pc_name = "UUID_IS_LOCAL",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LOCALIO_NR_PROCEDURES ARRAY_SIZE(localio_procedures1)</div><div class='add'>+static DEFINE_PER_CPU_ALIGNED(unsigned long,</div><div class='add'>+			      localio_count[LOCALIO_NR_PROCEDURES]);</div><div class='add'>+const struct svc_version localio_version1 = {</div><div class='add'>+	.vs_vers	= 1,</div><div class='add'>+	.vs_nproc	= LOCALIO_NR_PROCEDURES,</div><div class='add'>+	.vs_proc	= localio_procedures1,</div><div class='add'>+	.vs_dispatch	= nfsd_dispatch,</div><div class='add'>+	.vs_count	= localio_count,</div><div class='add'>+	.vs_xdrsize	= XDR_QUADLEN(UUID_SIZE),</div><div class='add'>+	.vs_hidden	= true,</div><div class='add'>+};</div><div class='head'>diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c<br/>index 46a7f9b813e5..c774ce9aa296 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/lockd.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/lockd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/lockd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/lockd.c</a></div><div class='hunk'>@@ -38,17 +38,39 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp,</div><div class='ctx'> 	memcpy(&amp;fh.fh_handle.fh_raw, f-&gt;data, f-&gt;size);</div><div class='ctx'> 	fh.fh_export = NULL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Allow BYPASS_GSS as some client implementations use AUTH_SYS</div><div class='add'>+	 * for NLM even when GSS is used for NFS.</div><div class='add'>+	 * Allow OWNER_OVERRIDE as permission might have been changed</div><div class='add'>+	 * after the file was opened.</div><div class='add'>+	 * Pass MAY_NLM so that authentication can be completely bypassed</div><div class='add'>+	 * if NFSEXP_NOAUTHNLM is set.  Some older clients use AUTH_NULL</div><div class='add'>+	 * for NLM requests.</div><div class='add'>+	 */</div><div class='ctx'> 	access = (mode == O_WRONLY) ? NFSD_MAY_WRITE : NFSD_MAY_READ;</div><div class='del'>-	access |= NFSD_MAY_LOCK;</div><div class='add'>+	access |= NFSD_MAY_NLM | NFSD_MAY_OWNER_OVERRIDE | NFSD_MAY_BYPASS_GSS;</div><div class='ctx'> 	nfserr = nfsd_open(rqstp, &amp;fh, S_IFREG, access, filp);</div><div class='ctx'> 	fh_put(&amp;fh);</div><div class='del'>- 	/* We return nlm error codes as nlm doesn't know</div><div class='add'>+	/* We return nlm error codes as nlm doesn't know</div><div class='ctx'> 	 * about nfsd, but nfsd does know about nlm..</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (nfserr) {</div><div class='ctx'> 	case nfs_ok:</div><div class='ctx'> 		return 0;</div><div class='del'>-	case nfserr_dropit:</div><div class='add'>+	case nfserr_jukebox:</div><div class='add'>+		/* this error can indicate a presence of a conflicting</div><div class='add'>+		 * delegation to an NLM lock request. Options are:</div><div class='add'>+		 * (1) For now, drop this request and make the client</div><div class='add'>+		 * retry. When delegation is returned, client's lock retry</div><div class='add'>+		 * will complete.</div><div class='add'>+		 * (2) NLM4_DENIED as per "spec" signals to the client</div><div class='add'>+		 * that the lock is unavailable now but client can retry.</div><div class='add'>+		 * Linux client implementation does not. It treats</div><div class='add'>+		 * NLM4_DENIED same as NLM4_FAILED and errors the request.</div><div class='add'>+		 * (3) For the future, treat this as blocked lock and try</div><div class='add'>+		 * to callback when the delegation is returned but might</div><div class='add'>+		 * not have a proper lock request to block on.</div><div class='add'>+		 */</div><div class='ctx'> 		return nlm_drop_reply;</div><div class='ctx'> 	case nfserr_stale:</div><div class='ctx'> 		return nlm_stale_fh;</div><div class='head'>diff --git a/fs/nfsd/netlink.c b/fs/nfsd/netlink.c<br/>index 0e1d635ec5f9..ac51a44e1065 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/netlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/netlink.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Do not edit directly, auto-generated from: */</div><div class='ctx'> /*	Documentation/netlink/specs/nfsd.yaml */</div><div class='ctx'> /* YNL-GEN kernel source */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='hunk'>@@ -10,15 +11,96 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/nfsd_netlink.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Common nested types */</div><div class='add'>+const struct nla_policy nfsd_sock_nl_policy[NFSD_A_SOCK_TRANSPORT_NAME + 1] = {</div><div class='add'>+	[NFSD_A_SOCK_ADDR] = { .type = NLA_BINARY, },</div><div class='add'>+	[NFSD_A_SOCK_TRANSPORT_NAME] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct nla_policy nfsd_version_nl_policy[NFSD_A_VERSION_ENABLED + 1] = {</div><div class='add'>+	[NFSD_A_VERSION_MAJOR] = { .type = NLA_U32, },</div><div class='add'>+	[NFSD_A_VERSION_MINOR] = { .type = NLA_U32, },</div><div class='add'>+	[NFSD_A_VERSION_ENABLED] = { .type = NLA_FLAG, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NFSD_CMD_THREADS_SET - do */</div><div class='add'>+static const struct nla_policy nfsd_threads_set_nl_policy[NFSD_A_SERVER_SCOPE + 1] = {</div><div class='add'>+	[NFSD_A_SERVER_THREADS] = { .type = NLA_U32, },</div><div class='add'>+	[NFSD_A_SERVER_GRACETIME] = { .type = NLA_U32, },</div><div class='add'>+	[NFSD_A_SERVER_LEASETIME] = { .type = NLA_U32, },</div><div class='add'>+	[NFSD_A_SERVER_SCOPE] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NFSD_CMD_VERSION_SET - do */</div><div class='add'>+static const struct nla_policy nfsd_version_set_nl_policy[NFSD_A_SERVER_PROTO_VERSION + 1] = {</div><div class='add'>+	[NFSD_A_SERVER_PROTO_VERSION] = NLA_POLICY_NESTED(nfsd_version_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NFSD_CMD_LISTENER_SET - do */</div><div class='add'>+static const struct nla_policy nfsd_listener_set_nl_policy[NFSD_A_SERVER_SOCK_ADDR + 1] = {</div><div class='add'>+	[NFSD_A_SERVER_SOCK_ADDR] = NLA_POLICY_NESTED(nfsd_sock_nl_policy),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NFSD_CMD_POOL_MODE_SET - do */</div><div class='add'>+static const struct nla_policy nfsd_pool_mode_set_nl_policy[NFSD_A_POOL_MODE_MODE + 1] = {</div><div class='add'>+	[NFSD_A_POOL_MODE_MODE] = { .type = NLA_NUL_STRING, },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Ops table for nfsd */</div><div class='ctx'> static const struct genl_split_ops nfsd_nl_ops[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.cmd	= NFSD_CMD_RPC_STATUS_GET,</div><div class='del'>-		.start	= nfsd_nl_rpc_status_get_start,</div><div class='ctx'> 		.dumpit	= nfsd_nl_rpc_status_get_dumpit,</div><div class='del'>-		.done	= nfsd_nl_rpc_status_get_done,</div><div class='ctx'> 		.flags	= GENL_CMD_CAP_DUMP,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NFSD_CMD_THREADS_SET,</div><div class='add'>+		.doit		= nfsd_nl_threads_set_doit,</div><div class='add'>+		.policy		= nfsd_threads_set_nl_policy,</div><div class='add'>+		.maxattr	= NFSD_A_SERVER_SCOPE,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NFSD_CMD_THREADS_GET,</div><div class='add'>+		.doit	= nfsd_nl_threads_get_doit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NFSD_CMD_VERSION_SET,</div><div class='add'>+		.doit		= nfsd_nl_version_set_doit,</div><div class='add'>+		.policy		= nfsd_version_set_nl_policy,</div><div class='add'>+		.maxattr	= NFSD_A_SERVER_PROTO_VERSION,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NFSD_CMD_VERSION_GET,</div><div class='add'>+		.doit	= nfsd_nl_version_get_doit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NFSD_CMD_LISTENER_SET,</div><div class='add'>+		.doit		= nfsd_nl_listener_set_doit,</div><div class='add'>+		.policy		= nfsd_listener_set_nl_policy,</div><div class='add'>+		.maxattr	= NFSD_A_SERVER_SOCK_ADDR,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NFSD_CMD_LISTENER_GET,</div><div class='add'>+		.doit	= nfsd_nl_listener_get_doit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd		= NFSD_CMD_POOL_MODE_SET,</div><div class='add'>+		.doit		= nfsd_nl_pool_mode_set_doit,</div><div class='add'>+		.policy		= nfsd_pool_mode_set_nl_policy,</div><div class='add'>+		.maxattr	= NFSD_A_POOL_MODE_MODE,</div><div class='add'>+		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd	= NFSD_CMD_POOL_MODE_GET,</div><div class='add'>+		.doit	= nfsd_nl_pool_mode_get_doit,</div><div class='add'>+		.flags	= GENL_CMD_CAP_DO,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct genl_family nfsd_nl_family __ro_after_init = {</div><div class='head'>diff --git a/fs/nfsd/netlink.h b/fs/nfsd/netlink.h<br/>index d83dd6bdee92..478117ff6b8c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/netlink.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/netlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/netlink.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Do not edit directly, auto-generated from: */</div><div class='ctx'> /*	Documentation/netlink/specs/nfsd.yaml */</div><div class='ctx'> /* YNL-GEN kernel header */</div><div class='add'>+/* To regenerate run: tools/net/ynl/ynl-regen.sh */</div><div class='ctx'> </div><div class='ctx'> #ifndef _LINUX_NFSD_GEN_H</div><div class='ctx'> #define _LINUX_NFSD_GEN_H</div><div class='hunk'>@@ -11,11 +12,20 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/nfsd_netlink.h&gt;</div><div class='ctx'> </div><div class='del'>-int nfsd_nl_rpc_status_get_start(struct netlink_callback *cb);</div><div class='del'>-int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb);</div><div class='add'>+/* Common nested types */</div><div class='add'>+extern const struct nla_policy nfsd_sock_nl_policy[NFSD_A_SOCK_TRANSPORT_NAME + 1];</div><div class='add'>+extern const struct nla_policy nfsd_version_nl_policy[NFSD_A_VERSION_ENABLED + 1];</div><div class='ctx'> </div><div class='ctx'> int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb,</div><div class='ctx'> 				  struct netlink_callback *cb);</div><div class='add'>+int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_version_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_listener_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_pool_mode_set_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='add'>+int nfsd_nl_pool_mode_get_doit(struct sk_buff *skb, struct genl_info *info);</div><div class='ctx'> </div><div class='ctx'> extern struct genl_family nfsd_nl_family;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h<br/>index 74b4360779a1..3e2d0fde80a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/netns.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/netns.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/netns.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/netns.h</a></div><div class='hunk'>@@ -11,8 +11,11 @@</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='add'>+#include &lt;linux/nfs4.h&gt;</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='add'>+#include &lt;linux/percpu-refcount.h&gt;</div><div class='ctx'> #include &lt;linux/siphash.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/stats.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Hash tables for nfs4_clientid state */</div><div class='ctx'> #define CLIENT_HASH_BITS                 4</div><div class='hunk'>@@ -26,10 +29,22 @@ struct nfsd4_client_tracking_ops;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	/* cache misses due only to checksum comparison failures */</div><div class='del'>-	NFSD_NET_PAYLOAD_MISSES,</div><div class='add'>+	NFSD_STATS_PAYLOAD_MISSES,</div><div class='ctx'> 	/* amount of memory (in bytes) currently consumed by the DRC */</div><div class='del'>-	NFSD_NET_DRC_MEM_USAGE,</div><div class='del'>-	NFSD_NET_COUNTERS_NUM</div><div class='add'>+	NFSD_STATS_DRC_MEM_USAGE,</div><div class='add'>+	NFSD_STATS_RC_HITS,		/* repcache hits */</div><div class='add'>+	NFSD_STATS_RC_MISSES,		/* repcache misses */</div><div class='add'>+	NFSD_STATS_RC_NOCACHE,		/* uncached reqs */</div><div class='add'>+	NFSD_STATS_FH_STALE,		/* FH stale error */</div><div class='add'>+	NFSD_STATS_IO_READ,		/* bytes returned to read requests */</div><div class='add'>+	NFSD_STATS_IO_WRITE,		/* bytes passed in write requests */</div><div class='add'>+#ifdef CONFIG_NFSD_V4</div><div class='add'>+	NFSD_STATS_FIRST_NFS4_OP,	/* count of individual nfsv4 operations */</div><div class='add'>+	NFSD_STATS_LAST_NFS4_OP = NFSD_STATS_FIRST_NFS4_OP + LAST_NFS4_OP,</div><div class='add'>+#define NFSD_STATS_NFS4_OP(op)	(NFSD_STATS_FIRST_NFS4_OP + (op))</div><div class='add'>+	NFSD_STATS_WDELEG_GETATTR,	/* count of getattr conflict with wdeleg */</div><div class='add'>+#endif</div><div class='add'>+	NFSD_STATS_COUNTERS_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -113,12 +128,6 @@ struct nfsd_net {</div><div class='ctx'> 	seqlock_t writeverf_lock;</div><div class='ctx'> 	unsigned char writeverf[8];</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Max number of connections this nfsd container will allow. Defaults</div><div class='del'>-	 * to '0' which is means that it bases this on the number of threads.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int max_connections;</div><div class='del'>-</div><div class='ctx'> 	u32 clientid_base;</div><div class='ctx'> 	u32 clientid_counter;</div><div class='ctx'> 	u32 clverifier_counter;</div><div class='hunk'>@@ -126,6 +135,9 @@ struct nfsd_net {</div><div class='ctx'> 	struct svc_info nfsd_info;</div><div class='ctx'> #define nfsd_serv nfsd_info.serv</div><div class='ctx'> </div><div class='add'>+	struct percpu_ref nfsd_net_ref;</div><div class='add'>+	struct completion nfsd_net_confirm_done;</div><div class='add'>+	struct completion nfsd_net_free_done;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * clientid and stateid data for construction of net unique COPY</div><div class='hunk'>@@ -134,12 +146,13 @@ struct nfsd_net {</div><div class='ctx'> 	u32		s2s_cp_cl_id;</div><div class='ctx'> 	struct idr	s2s_cp_stateids;</div><div class='ctx'> 	spinlock_t	s2s_cp_lock;</div><div class='add'>+	atomic_t	pending_async_copies;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Version information</div><div class='ctx'> 	 */</div><div class='del'>-	bool *nfsd_versions;</div><div class='del'>-	bool *nfsd4_minorversions;</div><div class='add'>+	bool nfsd_versions[NFSD_MAXVERS + 1];</div><div class='add'>+	bool nfsd4_minorversions[NFSD_SUPPORTED_MINOR_VERSION + 1];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Duplicate reply cache</div><div class='hunk'>@@ -164,7 +177,10 @@ struct nfsd_net {</div><div class='ctx'> 	atomic_t                 num_drc_entries;</div><div class='ctx'> </div><div class='ctx'> 	/* Per-netns stats counters */</div><div class='del'>-	struct percpu_counter    counter[NFSD_NET_COUNTERS_NUM];</div><div class='add'>+	struct percpu_counter    counter[NFSD_STATS_COUNTERS_NUM];</div><div class='add'>+</div><div class='add'>+	/* sunrpc svc stats */</div><div class='add'>+	struct svc_stat          nfsd_svcstats;</div><div class='ctx'> </div><div class='ctx'> 	/* longest hash chain seen */</div><div class='ctx'> 	unsigned int             longest_chain;</div><div class='hunk'>@@ -192,15 +208,26 @@ struct nfsd_net {</div><div class='ctx'> 	atomic_t		nfsd_courtesy_clients;</div><div class='ctx'> 	struct shrinker		*nfsd_client_shrinker;</div><div class='ctx'> 	struct work_struct	nfsd_shrinker_work;</div><div class='add'>+</div><div class='add'>+	/* last time an admin-revoke happened for NFSv4.0 */</div><div class='add'>+	time64_t		nfs40_last_revoke;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	/* Local clients to be invalidated when net is shut down */</div><div class='add'>+	spinlock_t              local_clients_lock;</div><div class='add'>+	struct list_head	local_clients;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Simple check to find out if a given net was properly initialized */</div><div class='ctx'> #define nfsd_netns_ready(nn) ((nn)-&gt;sessionid_hashtbl)</div><div class='ctx'> </div><div class='del'>-extern void nfsd_netns_free_versions(struct nfsd_net *nn);</div><div class='del'>-</div><div class='add'>+extern bool nfsd_support_version(int vers);</div><div class='ctx'> extern unsigned int nfsd_net_id;</div><div class='ctx'> </div><div class='add'>+bool nfsd_net_try_get(struct net *net);</div><div class='add'>+void nfsd_net_put(struct net *net);</div><div class='add'>+</div><div class='ctx'> void nfsd_copy_write_verifier(__be32 verf[2], struct nfsd_net *nn);</div><div class='ctx'> void nfsd_reset_write_verifier(struct nfsd_net *nn);</div><div class='ctx'> #endif /* __NFSD_NETNS_H__ */</div><div class='head'>diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c<br/>index 12b2b9bc07bf..5fb202acb0fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs2acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs2acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs2acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs2acl.c</a></div><div class='hunk'>@@ -84,6 +84,8 @@ out:</div><div class='ctx'> fail:</div><div class='ctx'> 	posix_acl_release(resp-&gt;acl_access);</div><div class='ctx'> 	posix_acl_release(resp-&gt;acl_default);</div><div class='add'>+	resp-&gt;acl_access = NULL;</div><div class='add'>+	resp-&gt;acl_default = NULL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -308,8 +310,6 @@ static void nfsaclsvc_release_access(struct svc_rqst *rqstp)</div><div class='ctx'> 	fh_put(&amp;resp-&gt;fh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct nfsd3_voidargs { int dummy; };</div><div class='del'>-</div><div class='ctx'> #define ST 1		/* status*/</div><div class='ctx'> #define AT 21		/* attributes */</div><div class='ctx'> #define pAT (1+AT)	/* post attributes - conditional */</div><div class='head'>diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c<br/>index 73adca47d373..7b5433bd3019 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs3acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs3acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs3acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs3acl.c</a></div><div class='hunk'>@@ -76,6 +76,8 @@ out:</div><div class='ctx'> fail:</div><div class='ctx'> 	posix_acl_release(resp-&gt;acl_access);</div><div class='ctx'> 	posix_acl_release(resp-&gt;acl_default);</div><div class='add'>+	resp-&gt;acl_access = NULL;</div><div class='add'>+	resp-&gt;acl_default = NULL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -221,8 +223,6 @@ static void nfs3svc_release_getacl(struct svc_rqst *rqstp)</div><div class='ctx'> 	posix_acl_release(resp-&gt;acl_default);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct nfsd3_voidargs { int dummy; };</div><div class='del'>-</div><div class='ctx'> #define ST 1		/* status*/</div><div class='ctx'> #define AT 21		/* attributes */</div><div class='ctx'> #define pAT (1+AT)	/* post attributes - conditional */</div><div class='head'>diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c<br/>index b78eceebd945..42adc5461db0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs3proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs3proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs3proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs3proc.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include "xdr3.h"</div><div class='ctx'> #include "vfs.h"</div><div class='ctx'> #include "filecache.h"</div><div class='add'>+#include "trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDDBG_FACILITY		NFSDDBG_PROC</div><div class='ctx'> </div><div class='hunk'>@@ -28,6 +29,29 @@ static int	nfs3_ftypes[] = {</div><div class='ctx'> 	S_IFIFO,		/* NF3FIFO */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __be32 nfsd3_map_status(__be32 status)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case nfs_ok:</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_nofilehandle:</div><div class='add'>+		status = nfserr_badhandle;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_wrongsec:</div><div class='add'>+	case nfserr_file_open:</div><div class='add'>+		status = nfserr_acces;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_symlink_not_dir:</div><div class='add'>+		status = nfserr_notdir;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_symlink:</div><div class='add'>+	case nfserr_wrong_type:</div><div class='add'>+		status = nfserr_inval;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * NULL call.</div><div class='ctx'>  */</div><div class='hunk'>@@ -46,8 +70,7 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_fhandle *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_attrstat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: GETATTR(3)  %s\n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;fh));</div><div class='add'>+	trace_nfsd_vfs_getattr(rqstp, &amp;argp-&gt;fh);</div><div class='ctx'> </div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;status = fh_verify(rqstp, &amp;resp-&gt;fh, 0,</div><div class='hunk'>@@ -57,6 +80,7 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp)</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -71,13 +95,16 @@ nfsd3_proc_setattr(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_attrs attrs = {</div><div class='ctx'> 		.na_iattr	= &amp;argp-&gt;attrs,</div><div class='ctx'> 	};</div><div class='add'>+	const struct timespec64 *guardtime = NULL;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("nfsd: SETATTR(3)  %s\n",</div><div class='ctx'> 				SVCFH_fmt(&amp;argp-&gt;fh));</div><div class='ctx'> </div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='del'>-	resp-&gt;status = nfsd_setattr(rqstp, &amp;resp-&gt;fh, &amp;attrs,</div><div class='del'>-				    argp-&gt;check_guard, argp-&gt;guardtime);</div><div class='add'>+	if (argp-&gt;check_guard)</div><div class='add'>+		guardtime = &amp;argp-&gt;guardtime;</div><div class='add'>+	resp-&gt;status = nfsd_setattr(rqstp, &amp;resp-&gt;fh, &amp;attrs, guardtime);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +128,7 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp)</div><div class='ctx'> 	resp-&gt;status = nfsd_lookup(rqstp, &amp;resp-&gt;dirfh,</div><div class='ctx'> 				   argp-&gt;name, argp-&gt;len,</div><div class='ctx'> 				   &amp;resp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -120,6 +148,7 @@ nfsd3_proc_access(struct svc_rqst *rqstp)</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;access = argp-&gt;access;</div><div class='ctx'> 	resp-&gt;status = nfsd_access(rqstp, &amp;resp-&gt;fh, &amp;resp-&gt;access, NULL);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -140,6 +169,7 @@ nfsd3_proc_readlink(struct svc_rqst *rqstp)</div><div class='ctx'> 	resp-&gt;pages = rqstp-&gt;rq_next_page++;</div><div class='ctx'> 	resp-&gt;status = nfsd_readlink(rqstp, &amp;resp-&gt;fh,</div><div class='ctx'> 				     page_address(*resp-&gt;pages), &amp;resp-&gt;len);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -177,6 +207,7 @@ nfsd3_proc_read(struct svc_rqst *rqstp)</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;status = nfsd_read(rqstp, &amp;resp-&gt;fh, argp-&gt;offset,</div><div class='ctx'> 				 &amp;resp-&gt;count, &amp;resp-&gt;eof);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +220,6 @@ nfsd3_proc_write(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_writeargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_writeres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	unsigned long cnt = argp-&gt;len;</div><div class='del'>-	unsigned int nvecs;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("nfsd: WRITE(3)    %s %d bytes at %Lu%s\n",</div><div class='ctx'> 				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='hunk'>@@ -204,12 +234,11 @@ nfsd3_proc_write(struct svc_rqst *rqstp)</div><div class='ctx'> </div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;committed = argp-&gt;stable;</div><div class='del'>-	nvecs = svc_fill_write_vector(rqstp, &amp;argp-&gt;payload);</div><div class='del'>-</div><div class='ctx'> 	resp-&gt;status = nfsd_write(rqstp, &amp;resp-&gt;fh, argp-&gt;offset,</div><div class='del'>-				  rqstp-&gt;rq_vec, nvecs, &amp;cnt,</div><div class='add'>+				  &amp;argp-&gt;payload, &amp;cnt,</div><div class='ctx'> 				  resp-&gt;committed, resp-&gt;verf);</div><div class='ctx'> 	resp-&gt;count = cnt;</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -234,6 +263,8 @@ nfsd3_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	__be32 status;</div><div class='ctx'> 	int host_err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_create(rqstp, fhp, S_IFREG, argp-&gt;name, argp-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	if (isdotent(argp-&gt;name, argp-&gt;len))</div><div class='ctx'> 		return nfserr_exist;</div><div class='ctx'> 	if (!(iap-&gt;ia_valid &amp; ATTR_MODE))</div><div class='hunk'>@@ -250,12 +281,11 @@ nfsd3_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	if (host_err)</div><div class='ctx'> 		return nfserrno(host_err);</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(inode, I_MUTEX_PARENT);</div><div class='del'>-</div><div class='del'>-	child = lookup_one_len(argp-&gt;name, parent, argp-&gt;len);</div><div class='add'>+	child = start_creating(&amp;nop_mnt_idmap, parent,</div><div class='add'>+			       &amp;QSTR_LEN(argp-&gt;name, argp-&gt;len));</div><div class='ctx'> 	if (IS_ERR(child)) {</div><div class='ctx'> 		status = nfserrno(PTR_ERR(child));</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (d_really_is_negative(child)) {</div><div class='hunk'>@@ -311,7 +341,7 @@ nfsd3_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	status = fh_fill_pre_attrs(fhp);</div><div class='ctx'> 	if (status != nfs_ok)</div><div class='ctx'> 		goto out;</div><div class='del'>-	host_err = vfs_create(&amp;nop_mnt_idmap, inode, child, iap-&gt;ia_mode, true);</div><div class='add'>+	host_err = vfs_create(&amp;nop_mnt_idmap, child, iap-&gt;ia_mode, NULL);</div><div class='ctx'> 	if (host_err &lt; 0) {</div><div class='ctx'> 		status = nfserrno(host_err);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -334,9 +364,8 @@ set_attr:</div><div class='ctx'> 	status = nfsd_create_setattr(rqstp, fhp, resfhp, &amp;attrs);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-	if (child &amp;&amp; !IS_ERR(child))</div><div class='del'>-		dput(child);</div><div class='add'>+	end_creating(child);</div><div class='add'>+out_write:</div><div class='ctx'> 	fh_drop_write(fhp);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -348,15 +377,11 @@ nfsd3_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_diropres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	svc_fh *dirfhp, *newfhp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: CREATE(3)   %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;len,</div><div class='del'>-				argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	dirfhp = fh_copy(&amp;resp-&gt;dirfh, &amp;argp-&gt;fh);</div><div class='ctx'> 	newfhp = fh_init(&amp;resp-&gt;fh, NFS3_FHSIZE);</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;status = nfsd3_create_file(rqstp, dirfhp, newfhp, argp);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,16 +397,12 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp)</div><div class='ctx'> 		.na_iattr	= &amp;argp-&gt;attrs,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: MKDIR(3)    %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;len,</div><div class='del'>-				argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	argp-&gt;attrs.ia_valid &amp;= ~ATTR_SIZE;</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;dirfh, &amp;argp-&gt;fh);</div><div class='ctx'> 	fh_init(&amp;resp-&gt;fh, NFS3_FHSIZE);</div><div class='ctx'> 	resp-&gt;status = nfsd_create(rqstp, &amp;resp-&gt;dirfh, argp-&gt;name, argp-&gt;len,</div><div class='ctx'> 				   &amp;attrs, S_IFDIR, 0, &amp;resp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,17 +432,13 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: SYMLINK(3)  %s %.*s -&gt; %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;ffh),</div><div class='del'>-				argp-&gt;flen, argp-&gt;fname,</div><div class='del'>-				argp-&gt;tlen, argp-&gt;tname);</div><div class='del'>-</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;dirfh, &amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_init(&amp;resp-&gt;fh, NFS3_FHSIZE);</div><div class='ctx'> 	resp-&gt;status = nfsd_symlink(rqstp, &amp;resp-&gt;dirfh, argp-&gt;fname,</div><div class='ctx'> 				    argp-&gt;flen, argp-&gt;tname, &amp;attrs, &amp;resp-&gt;fh);</div><div class='ctx'> 	kfree(argp-&gt;tname);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -439,11 +456,6 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp)</div><div class='ctx'> 	int type;</div><div class='ctx'> 	dev_t	rdev = 0;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: MKNOD(3)    %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;len,</div><div class='del'>-				argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;dirfh, &amp;argp-&gt;fh);</div><div class='ctx'> 	fh_init(&amp;resp-&gt;fh, NFS3_FHSIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -463,6 +475,7 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp)</div><div class='ctx'> 	resp-&gt;status = nfsd_create(rqstp, &amp;resp-&gt;dirfh, argp-&gt;name, argp-&gt;len,</div><div class='ctx'> 				   &amp;attrs, type, rdev, &amp;resp-&gt;fh);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,15 +488,11 @@ nfsd3_proc_remove(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_diropargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_attrstat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: REMOVE(3)   %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;len,</div><div class='del'>-				argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	/* Unlink. -S_IFDIR means file must not be a directory */</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;status = nfsd_unlink(rqstp, &amp;resp-&gt;fh, -S_IFDIR,</div><div class='ctx'> 				   argp-&gt;name, argp-&gt;len);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,14 +505,10 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_diropargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_attrstat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: RMDIR(3)    %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;len,</div><div class='del'>-				argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;status = nfsd_unlink(rqstp, &amp;resp-&gt;fh, S_IFDIR,</div><div class='ctx'> 				   argp-&gt;name, argp-&gt;len);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -513,19 +518,11 @@ nfsd3_proc_rename(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_renameargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_renameres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: RENAME(3)   %s %.*s -&gt;\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;ffh),</div><div class='del'>-				argp-&gt;flen,</div><div class='del'>-				argp-&gt;fname);</div><div class='del'>-	dprintk("nfsd: -&gt; %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;tfh),</div><div class='del'>-				argp-&gt;tlen,</div><div class='del'>-				argp-&gt;tname);</div><div class='del'>-</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;ffh, &amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;tfh, &amp;argp-&gt;tfh);</div><div class='ctx'> 	resp-&gt;status = nfsd_rename(rqstp, &amp;resp-&gt;ffh, argp-&gt;fname, argp-&gt;flen,</div><div class='ctx'> 				   &amp;resp-&gt;tfh, argp-&gt;tname, argp-&gt;tlen);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -535,17 +532,11 @@ nfsd3_proc_link(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_linkargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_linkres  *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: LINK(3)     %s -&gt;\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;ffh));</div><div class='del'>-	dprintk("nfsd:   -&gt; %s %.*s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;tfh),</div><div class='del'>-				argp-&gt;tlen,</div><div class='del'>-				argp-&gt;tname);</div><div class='del'>-</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh,  &amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_copy(&amp;resp-&gt;tfh, &amp;argp-&gt;tfh);</div><div class='ctx'> 	resp-&gt;status = nfsd_link(rqstp, &amp;resp-&gt;tfh, argp-&gt;tname, argp-&gt;tlen,</div><div class='ctx'> 				 &amp;resp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +557,7 @@ static void nfsd3_init_dirlist_pages(struct svc_rqst *rqstp,</div><div class='ctx'> 	buf-&gt;pages = rqstp-&gt;rq_next_page;</div><div class='ctx'> 	rqstp-&gt;rq_next_page += (buf-&gt;buflen + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	xdr_init_encode_pages(xdr, buf, buf-&gt;pages,  NULL);</div><div class='add'>+	xdr_init_encode_pages(xdr, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -579,9 +570,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_readdirres  *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	loff_t		offset;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: READDIR(3)  %s %d bytes at %d\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;count, (u32) argp-&gt;cookie);</div><div class='add'>+	trace_nfsd_vfs_readdir(rqstp, &amp;argp-&gt;fh, argp-&gt;count, argp-&gt;cookie);</div><div class='ctx'> </div><div class='ctx'> 	nfsd3_init_dirlist_pages(rqstp, resp, argp-&gt;count);</div><div class='ctx'> </div><div class='hunk'>@@ -598,6 +587,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp)</div><div class='ctx'> 	/* Recycle only pages that were part of the reply */</div><div class='ctx'> 	rqstp-&gt;rq_next_page = resp-&gt;xdr.page_ptr + 1;</div><div class='ctx'> </div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -612,9 +602,7 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd3_readdirres  *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	loff_t	offset;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: READDIR+(3) %s %d bytes at %d\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-				argp-&gt;count, (u32) argp-&gt;cookie);</div><div class='add'>+	trace_nfsd_vfs_readdir(rqstp, &amp;argp-&gt;fh, argp-&gt;count, argp-&gt;cookie);</div><div class='ctx'> </div><div class='ctx'> 	nfsd3_init_dirlist_pages(rqstp, resp, argp-&gt;count);</div><div class='ctx'> </div><div class='hunk'>@@ -642,6 +630,7 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp)</div><div class='ctx'> 	rqstp-&gt;rq_next_page = resp-&gt;xdr.page_ptr + 1;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -654,11 +643,9 @@ nfsd3_proc_fsstat(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_fhandle *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd3_fsstatres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: FSSTAT(3)   %s\n",</div><div class='del'>-				SVCFH_fmt(&amp;argp-&gt;fh));</div><div class='del'>-</div><div class='ctx'> 	resp-&gt;status = nfsd_statfs(rqstp, &amp;argp-&gt;fh, &amp;resp-&gt;stats, 0);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -702,6 +689,7 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -744,6 +732,7 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -771,6 +760,7 @@ nfsd3_proc_commit(struct svc_rqst *rqstp)</div><div class='ctx'> 				   argp-&gt;count, resp-&gt;verf);</div><div class='ctx'> 	nfsd_file_put(nf);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd3_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c<br/>index f32128955ec8..ef4971d71ac4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs3xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs3xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs3xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs3xdr.c</a></div><div class='hunk'>@@ -295,17 +295,14 @@ svcxdr_decode_sattr3(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> static bool</div><div class='ctx'> svcxdr_decode_sattrguard3(struct xdr_stream *xdr, struct nfsd3_sattrargs *args)</div><div class='ctx'> {</div><div class='del'>-	__be32 *p;</div><div class='ctx'> 	u32 check;</div><div class='ctx'> </div><div class='ctx'> 	if (xdr_stream_decode_bool(xdr, &amp;check) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (check) {</div><div class='del'>-		p = xdr_inline_decode(xdr, XDR_UNIT * 2);</div><div class='del'>-		if (!p)</div><div class='add'>+		if (!svcxdr_decode_nfstime3(xdr, &amp;args-&gt;guardtime))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		args-&gt;check_guard = 1;</div><div class='del'>-		args-&gt;guardtime = be32_to_cpup(p);</div><div class='ctx'> 	} else</div><div class='ctx'> 		args-&gt;check_guard = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1004,7 +1001,9 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,</div><div class='ctx'> 		} else</div><div class='ctx'> 			dchild = dget(dparent);</div><div class='ctx'> 	} else</div><div class='del'>-		dchild = lookup_positive_unlocked(name, dparent, namlen);</div><div class='add'>+		dchild = lookup_one_positive_unlocked(&amp;nop_mnt_idmap,</div><div class='add'>+						      &amp;QSTR_LEN(name, namlen),</div><div class='add'>+						      dparent);</div><div class='ctx'> 	if (IS_ERR(dchild))</div><div class='ctx'> 		return rv;</div><div class='ctx'> 	if (d_mountpoint(dchild))</div><div class='head'>diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c<br/>index 96e786b5e544..936ea1ad9586 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4acl.c</a></div><div class='hunk'>@@ -198,8 +198,6 @@ summarize_posix_acl(struct posix_acl *acl, struct posix_acl_summary *pas)</div><div class='ctx'> 	memset(pas, 0, sizeof(*pas));</div><div class='ctx'> 	pas-&gt;mask = 07;</div><div class='ctx'> </div><div class='del'>-	pe = acl-&gt;a_entries + acl-&gt;a_count;</div><div class='del'>-</div><div class='ctx'> 	FOREACH_ACL_ENTRY(pa, acl, pe) {</div><div class='ctx'> 		switch (pa-&gt;e_tag) {</div><div class='ctx'> 			case ACL_USER_OBJ:</div><div class='head'>diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c<br/>index 926c29879c6a..e00b2aea8da2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4callback.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4callback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4callback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4callback.c</a></div><div class='hunk'>@@ -42,11 +42,10 @@</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> #include "xdr4cb.h"</div><div class='ctx'> #include "xdr4.h"</div><div class='add'>+#include "nfs4xdr_gen.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDDBG_FACILITY                NFSDDBG_PROC</div><div class='ctx'> </div><div class='del'>-static void nfsd4_mark_cb_fault(struct nfs4_client *, int reason);</div><div class='del'>-</div><div class='ctx'> #define NFSPROC4_CB_NULL 0</div><div class='ctx'> #define NFSPROC4_CB_COMPOUND 1</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +84,44 @@ static void encode_uint32(struct xdr_stream *xdr, u32 n)</div><div class='ctx'> static void encode_bitmap4(struct xdr_stream *xdr, const __u32 *bitmap,</div><div class='ctx'> 			   size_t len)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(xdr_stream_encode_uint32_array(xdr, bitmap, len) &lt; 0);</div><div class='add'>+	xdr_stream_encode_uint32_array(xdr, bitmap, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_cb_fattr4(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='add'>+				struct nfs4_cb_fattr *fattr)</div><div class='add'>+{</div><div class='add'>+	fattr-&gt;ncf_cb_change = 0;</div><div class='add'>+	fattr-&gt;ncf_cb_fsize = 0;</div><div class='add'>+	fattr-&gt;ncf_cb_atime.tv_sec = 0;</div><div class='add'>+	fattr-&gt;ncf_cb_atime.tv_nsec = 0;</div><div class='add'>+	fattr-&gt;ncf_cb_mtime.tv_sec = 0;</div><div class='add'>+	fattr-&gt;ncf_cb_mtime.tv_nsec = 0;</div><div class='add'>+</div><div class='add'>+	if (bitmap[0] &amp; FATTR4_WORD0_CHANGE)</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;fattr-&gt;ncf_cb_change) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+	if (bitmap[0] &amp; FATTR4_WORD0_SIZE)</div><div class='add'>+		if (xdr_stream_decode_u64(xdr, &amp;fattr-&gt;ncf_cb_fsize) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+	if (bitmap[2] &amp; FATTR4_WORD2_TIME_DELEG_ACCESS) {</div><div class='add'>+		fattr4_time_deleg_access access;</div><div class='add'>+</div><div class='add'>+		if (!xdrgen_decode_fattr4_time_deleg_access(xdr, &amp;access))</div><div class='add'>+			return -EIO;</div><div class='add'>+		fattr-&gt;ncf_cb_atime.tv_sec = access.seconds;</div><div class='add'>+		fattr-&gt;ncf_cb_atime.tv_nsec = access.nseconds;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (bitmap[2] &amp; FATTR4_WORD2_TIME_DELEG_MODIFY) {</div><div class='add'>+		fattr4_time_deleg_modify modify;</div><div class='add'>+</div><div class='add'>+		if (!xdrgen_decode_fattr4_time_deleg_modify(xdr, &amp;modify))</div><div class='add'>+			return -EIO;</div><div class='add'>+		fattr-&gt;ncf_cb_mtime.tv_sec = modify.seconds;</div><div class='add'>+		fattr-&gt;ncf_cb_mtime.tv_nsec = modify.nseconds;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void encode_nfs_cb_opnum4(struct xdr_stream *xdr, enum nfs_cb_opnum4 op)</div><div class='hunk'>@@ -273,17 +309,17 @@ static int decode_cb_compound4res(struct xdr_stream *xdr,</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='del'>-	p = xdr_inline_decode(xdr, 4 + 4);</div><div class='add'>+	p = xdr_inline_decode(xdr, XDR_UNIT);</div><div class='ctx'> 	if (unlikely(p == NULL))</div><div class='ctx'> 		goto out_overflow;</div><div class='del'>-	hdr-&gt;status = be32_to_cpup(p++);</div><div class='add'>+	hdr-&gt;status = be32_to_cpup(p);</div><div class='ctx'> 	/* Ignore the tag */</div><div class='del'>-	length = be32_to_cpup(p++);</div><div class='del'>-	p = xdr_inline_decode(xdr, length + 4);</div><div class='del'>-	if (unlikely(p == NULL))</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;length) &lt; 0)</div><div class='add'>+		goto out_overflow;</div><div class='add'>+	if (xdr_inline_decode(xdr, length) == NULL)</div><div class='add'>+		goto out_overflow;</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;hdr-&gt;nops) &lt; 0)</div><div class='ctx'> 		goto out_overflow;</div><div class='del'>-	p += XDR_QUADLEN(length);</div><div class='del'>-	hdr-&gt;nops = be32_to_cpup(p);</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_overflow:</div><div class='ctx'> 	return -EIO;</div><div class='hunk'>@@ -334,6 +370,77 @@ encode_cb_recallany4args(struct xdr_stream *xdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * CB_GETATTR4args</div><div class='add'>+ *	struct CB_GETATTR4args {</div><div class='add'>+ *	   nfs_fh4 fh;</div><div class='add'>+ *	   bitmap4 attr_request;</div><div class='add'>+ *	};</div><div class='add'>+ *</div><div class='add'>+ * The size and change attributes are the only one</div><div class='add'>+ * guaranteed to be serviced by the client.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+encode_cb_getattr4args(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr,</div><div class='add'>+			struct nfs4_cb_fattr *fattr)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_delegation *dp = container_of(fattr, struct nfs4_delegation, dl_cb_fattr);</div><div class='add'>+	struct knfsd_fh *fh = &amp;dp-&gt;dl_stid.sc_file-&gt;fi_fhandle;</div><div class='add'>+	struct nfs4_cb_fattr *ncf = &amp;dp-&gt;dl_cb_fattr;</div><div class='add'>+	u32 bmap_size = 1;</div><div class='add'>+	u32 bmap[3];</div><div class='add'>+</div><div class='add'>+	bmap[0] = FATTR4_WORD0_SIZE;</div><div class='add'>+	if (!ncf-&gt;ncf_file_modified)</div><div class='add'>+		bmap[0] |= FATTR4_WORD0_CHANGE;</div><div class='add'>+</div><div class='add'>+	if (deleg_attrs_deleg(dp-&gt;dl_type)) {</div><div class='add'>+		bmap[1] = 0;</div><div class='add'>+		bmap[2] = FATTR4_WORD2_TIME_DELEG_ACCESS | FATTR4_WORD2_TIME_DELEG_MODIFY;</div><div class='add'>+		bmap_size = 3;</div><div class='add'>+	}</div><div class='add'>+	encode_nfs_cb_opnum4(xdr, OP_CB_GETATTR);</div><div class='add'>+	encode_nfs_fh4(xdr, fh);</div><div class='add'>+	encode_bitmap4(xdr, bmap, bmap_size);</div><div class='add'>+	hdr-&gt;nops++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 highest_slotid(struct nfsd4_session *ses)</div><div class='add'>+{</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ses-&gt;se_lock);</div><div class='add'>+	idx = fls(~ses-&gt;se_cb_slot_avail);</div><div class='add'>+	if (idx &gt; 0)</div><div class='add'>+		--idx;</div><div class='add'>+	idx = max(idx, ses-&gt;se_cb_highest_slot);</div><div class='add'>+	spin_unlock(&amp;ses-&gt;se_lock);</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+encode_referring_call4(struct xdr_stream *xdr,</div><div class='add'>+		       const struct nfsd4_referring_call *rc)</div><div class='add'>+{</div><div class='add'>+	encode_uint32(xdr, rc-&gt;rc_sequenceid);</div><div class='add'>+	encode_uint32(xdr, rc-&gt;rc_slotid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+encode_referring_call_list4(struct xdr_stream *xdr,</div><div class='add'>+			    const struct nfsd4_referring_call_list *rcl)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_referring_call *rc;</div><div class='add'>+	__be32 *p;</div><div class='add'>+</div><div class='add'>+	p = xdr_reserve_space(xdr, NFS4_MAX_SESSIONID_LEN);</div><div class='add'>+	xdr_encode_opaque_fixed(p, rcl-&gt;rcl_sessionid.data,</div><div class='add'>+					NFS4_MAX_SESSIONID_LEN);</div><div class='add'>+	encode_uint32(xdr, rcl-&gt;__nr_referring_calls);</div><div class='add'>+	list_for_each_entry(rc, &amp;rcl-&gt;rcl_referring_calls, __list)</div><div class='add'>+		encode_referring_call4(xdr, rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * CB_SEQUENCE4args</div><div class='ctx'>  *</div><div class='ctx'>  *	struct CB_SEQUENCE4args {</div><div class='hunk'>@@ -350,6 +457,7 @@ static void encode_cb_sequence4args(struct xdr_stream *xdr,</div><div class='ctx'> 				    struct nfs4_cb_compound_hdr *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_session *session = cb-&gt;cb_clp-&gt;cl_cb_session;</div><div class='add'>+	struct nfsd4_referring_call_list *rcl;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='ctx'> 	if (hdr-&gt;minorversion == 0)</div><div class='hunk'>@@ -358,16 +466,45 @@ static void encode_cb_sequence4args(struct xdr_stream *xdr,</div><div class='ctx'> 	encode_nfs_cb_opnum4(xdr, OP_CB_SEQUENCE);</div><div class='ctx'> 	encode_sessionid4(xdr, session);</div><div class='ctx'> </div><div class='del'>-	p = xdr_reserve_space(xdr, 4 + 4 + 4 + 4 + 4);</div><div class='del'>-	*p++ = cpu_to_be32(session-&gt;se_cb_seq_nr);	/* csa_sequenceid */</div><div class='del'>-	*p++ = xdr_zero;			/* csa_slotid */</div><div class='del'>-	*p++ = xdr_zero;			/* csa_highest_slotid */</div><div class='add'>+	p = xdr_reserve_space(xdr, XDR_UNIT * 4);</div><div class='add'>+	*p++ = cpu_to_be32(session-&gt;se_cb_seq_nr[cb-&gt;cb_held_slot]);	/* csa_sequenceid */</div><div class='add'>+	*p++ = cpu_to_be32(cb-&gt;cb_held_slot);		/* csa_slotid */</div><div class='add'>+	*p++ = cpu_to_be32(highest_slotid(session)); /* csa_highest_slotid */</div><div class='ctx'> 	*p++ = xdr_zero;			/* csa_cachethis */</div><div class='del'>-	xdr_encode_empty_array(p);		/* csa_referring_call_lists */</div><div class='add'>+</div><div class='add'>+	/* csa_referring_call_lists */</div><div class='add'>+	encode_uint32(xdr, cb-&gt;cb_nr_referring_call_list);</div><div class='add'>+	list_for_each_entry(rcl, &amp;cb-&gt;cb_referring_call_list, __list)</div><div class='add'>+		encode_referring_call_list4(xdr, rcl);</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;nops++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void update_cb_slot_table(struct nfsd4_session *ses, u32 target)</div><div class='add'>+{</div><div class='add'>+	/* No need to do anything if nothing changed */</div><div class='add'>+	if (likely(target == READ_ONCE(ses-&gt;se_cb_highest_slot)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ses-&gt;se_lock);</div><div class='add'>+	if (target &gt; ses-&gt;se_cb_highest_slot) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		target = min(target, NFSD_BC_SLOT_TABLE_SIZE - 1);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Growing the slot table. Reset any new sequences to 1.</div><div class='add'>+		 *</div><div class='add'>+		 * NB: There is some debate about whether the RFC requires this,</div><div class='add'>+		 *     but the Linux client expects it.</div><div class='add'>+		 */</div><div class='add'>+		for (i = ses-&gt;se_cb_highest_slot + 1; i &lt;= target; ++i)</div><div class='add'>+			ses-&gt;se_cb_seq_nr[i] = 1;</div><div class='add'>+	}</div><div class='add'>+	ses-&gt;se_cb_highest_slot = target;</div><div class='add'>+	spin_unlock(&amp;ses-&gt;se_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * CB_SEQUENCE4resok</div><div class='ctx'>  *</div><div class='hunk'>@@ -395,7 +532,7 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,</div><div class='ctx'> 	struct nfsd4_session *session = cb-&gt;cb_clp-&gt;cl_cb_session;</div><div class='ctx'> 	int status = -ESERVERFAULT;</div><div class='ctx'> 	__be32 *p;</div><div class='del'>-	u32 dummy;</div><div class='add'>+	u32 seqid, slotid, target;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the server returns different values for sessionID, slotID or</div><div class='hunk'>@@ -411,21 +548,22 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,</div><div class='ctx'> 	}</div><div class='ctx'> 	p += XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN);</div><div class='ctx'> </div><div class='del'>-	dummy = be32_to_cpup(p++);</div><div class='del'>-	if (dummy != session-&gt;se_cb_seq_nr) {</div><div class='add'>+	seqid = be32_to_cpup(p++);</div><div class='add'>+	if (seqid != session-&gt;se_cb_seq_nr[cb-&gt;cb_held_slot]) {</div><div class='ctx'> 		dprintk("NFS: %s Invalid sequence number\n", __func__);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dummy = be32_to_cpup(p++);</div><div class='del'>-	if (dummy != 0) {</div><div class='add'>+	slotid = be32_to_cpup(p++);</div><div class='add'>+	if (slotid != cb-&gt;cb_held_slot) {</div><div class='ctx'> 		dprintk("NFS: %s Invalid slotid\n", __func__);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: process highest slotid and target highest slotid</div><div class='del'>-	 */</div><div class='add'>+	p++; // ignore current highest slot value</div><div class='add'>+</div><div class='add'>+	target = be32_to_cpup(p++);</div><div class='add'>+	update_cb_slot_table(session, target);</div><div class='ctx'> 	status = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	cb-&gt;cb_seq_status = status;</div><div class='hunk'>@@ -469,6 +607,26 @@ static void nfs4_xdr_enc_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * 20.1.  Operation 3: CB_GETATTR - Get Attributes</div><div class='add'>+ */</div><div class='add'>+static void nfs4_xdr_enc_cb_getattr(struct rpc_rqst *req,</div><div class='add'>+		struct xdr_stream *xdr, const void *data)</div><div class='add'>+{</div><div class='add'>+	const struct nfsd4_callback *cb = data;</div><div class='add'>+	struct nfs4_cb_fattr *ncf =</div><div class='add'>+		container_of(cb, struct nfs4_cb_fattr, ncf_getattr);</div><div class='add'>+	struct nfs4_cb_compound_hdr hdr = {</div><div class='add'>+		.ident = cb-&gt;cb_clp-&gt;cl_cb_ident,</div><div class='add'>+		.minorversion = cb-&gt;cb_clp-&gt;cl_minorversion,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	encode_cb_compound4args(xdr, &amp;hdr);</div><div class='add'>+	encode_cb_sequence4args(xdr, cb, &amp;hdr);</div><div class='add'>+	encode_cb_getattr4args(xdr, &amp;hdr, ncf);</div><div class='add'>+	encode_cb_nops(&amp;hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * 20.2. Operation 4: CB_RECALL - Recall a Delegation</div><div class='ctx'>  */</div><div class='ctx'> static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,</div><div class='hunk'>@@ -524,6 +682,46 @@ static int nfs4_xdr_dec_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * 20.1.  Operation 3: CB_GETATTR - Get Attributes</div><div class='add'>+ */</div><div class='add'>+static int nfs4_xdr_dec_cb_getattr(struct rpc_rqst *rqstp,</div><div class='add'>+				  struct xdr_stream *xdr,</div><div class='add'>+				  void *data)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_callback *cb = data;</div><div class='add'>+	struct nfs4_cb_compound_hdr hdr;</div><div class='add'>+	int status;</div><div class='add'>+	u32 bitmap[3] = {0};</div><div class='add'>+	u32 attrlen, maxlen;</div><div class='add'>+	struct nfs4_cb_fattr *ncf =</div><div class='add'>+		container_of(cb, struct nfs4_cb_fattr, ncf_getattr);</div><div class='add'>+</div><div class='add'>+	status = decode_cb_compound4res(xdr, &amp;hdr);</div><div class='add'>+	if (unlikely(status))</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = decode_cb_sequence4res(xdr, cb);</div><div class='add'>+	if (unlikely(status || cb-&gt;cb_seq_status))</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = decode_cb_op_status(xdr, OP_CB_GETATTR, &amp;cb-&gt;cb_status);</div><div class='add'>+	if (unlikely(status || cb-&gt;cb_status))</div><div class='add'>+		return status;</div><div class='add'>+	if (xdr_stream_decode_uint32_array(xdr, bitmap, 3) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;attrlen) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	maxlen = sizeof(ncf-&gt;ncf_cb_change) + sizeof(ncf-&gt;ncf_cb_fsize);</div><div class='add'>+	if (bitmap[2] != 0)</div><div class='add'>+		maxlen += (sizeof(ncf-&gt;ncf_cb_mtime.tv_sec) +</div><div class='add'>+			   sizeof(ncf-&gt;ncf_cb_mtime.tv_nsec)) * 2;</div><div class='add'>+	if (attrlen &gt; maxlen)</div><div class='add'>+		return -EIO;</div><div class='add'>+	status = decode_cb_fattr4(xdr, bitmap, ncf);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * 20.2. Operation 4: CB_RECALL - Recall a Delegation</div><div class='ctx'>  */</div><div class='ctx'> static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp,</div><div class='hunk'>@@ -674,7 +872,7 @@ static void nfs4_xdr_enc_cb_notify_lock(struct rpc_rqst *req,</div><div class='ctx'> 	const struct nfsd4_callback *cb = data;</div><div class='ctx'> 	const struct nfsd4_blocked_lock *nbl =</div><div class='ctx'> 		container_of(cb, struct nfsd4_blocked_lock, nbl_cb);</div><div class='del'>-	struct nfs4_lockowner *lo = (struct nfs4_lockowner *)nbl-&gt;nbl_lock.fl_owner;</div><div class='add'>+	struct nfs4_lockowner *lo = (struct nfs4_lockowner *)nbl-&gt;nbl_lock.c.flc_owner;</div><div class='ctx'> 	struct nfs4_cb_compound_hdr hdr = {</div><div class='ctx'> 		.ident = 0,</div><div class='ctx'> 		.minorversion = cb-&gt;cb_clp-&gt;cl_minorversion,</div><div class='hunk'>@@ -831,6 +1029,7 @@ static const struct rpc_procinfo nfs4_cb_procedures[] = {</div><div class='ctx'> 	PROC(CB_NOTIFY_LOCK,	COMPOUND,	cb_notify_lock,	cb_notify_lock),</div><div class='ctx'> 	PROC(CB_OFFLOAD,	COMPOUND,	cb_offload,	cb_offload),</div><div class='ctx'> 	PROC(CB_RECALL_ANY,	COMPOUND,	cb_recall_any,	cb_recall_any),</div><div class='add'>+	PROC(CB_GETATTR,	COMPOUND,	cb_getattr,	cb_getattr),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int nfs4_cb_counts[ARRAY_SIZE(nfs4_cb_procedures)];</div><div class='hunk'>@@ -883,11 +1082,23 @@ static int max_cb_time(struct net *net)</div><div class='ctx'> 	return max(((u32)nn-&gt;nfsd4_lease)/10, 1u) * HZ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct workqueue_struct *callback_wq;</div><div class='del'>-</div><div class='ctx'> static bool nfsd4_queue_cb(struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	return queue_work(callback_wq, &amp;cb-&gt;cb_work);</div><div class='add'>+	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='add'>+</div><div class='add'>+	trace_nfsd_cb_queue(clp, cb);</div><div class='add'>+	return queue_work(clp-&gt;cl_callback_wq, &amp;cb-&gt;cb_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfsd4_requeue_cb(struct rpc_task *task, struct nfsd4_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(NFSD4_CLIENT_CB_KILL, &amp;clp-&gt;cl_flags)) {</div><div class='add'>+		trace_nfsd_cb_restart(clp, cb);</div><div class='add'>+		task-&gt;tk_status = 0;</div><div class='add'>+		set_bit(NFSD4_CALLBACK_REQUEUE, &amp;cb-&gt;cb_flags);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfsd41_cb_inflight_begin(struct nfs4_client *clp)</div><div class='hunk'>@@ -898,8 +1109,7 @@ static void nfsd41_cb_inflight_begin(struct nfs4_client *clp)</div><div class='ctx'> static void nfsd41_cb_inflight_end(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_and_test(&amp;clp-&gt;cl_cb_inflight))</div><div class='del'>-		wake_up_var(&amp;clp-&gt;cl_cb_inflight);</div><div class='add'>+	atomic_dec_and_wake_up(&amp;clp-&gt;cl_cb_inflight);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfsd41_cb_inflight_wait_complete(struct nfs4_client *clp)</div><div class='hunk'>@@ -962,7 +1172,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c</div><div class='ctx'> 		args.authflavor = clp-&gt;cl_cred.cr_flavor;</div><div class='ctx'> 		clp-&gt;cl_cb_ident = conn-&gt;cb_ident;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!conn-&gt;cb_xprt)</div><div class='add'>+		if (!conn-&gt;cb_xprt || !ses)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		clp-&gt;cl_cb_session = ses;</div><div class='ctx'> 		args.bc_xprt = conn-&gt;cb_xprt;</div><div class='hunk'>@@ -999,18 +1209,18 @@ static void nfsd4_mark_cb_state(struct nfs4_client *clp, int newstate)</div><div class='ctx'> {</div><div class='ctx'> 	if (clp-&gt;cl_cb_state != newstate) {</div><div class='ctx'> 		clp-&gt;cl_cb_state = newstate;</div><div class='del'>-		trace_nfsd_cb_state(clp);</div><div class='add'>+		trace_nfsd_cb_new_state(clp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfsd4_mark_cb_down(struct nfs4_client *clp, int reason)</div><div class='add'>+static void nfsd4_mark_cb_down(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(NFSD4_CLIENT_CB_UPDATE, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> 	nfsd4_mark_cb_state(clp, NFSD4_CB_DOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfsd4_mark_cb_fault(struct nfs4_client *clp, int reason)</div><div class='add'>+static void nfsd4_mark_cb_fault(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	if (test_bit(NFSD4_CLIENT_CB_UPDATE, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1022,7 +1232,7 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null);</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;tk_status)</div><div class='del'>-		nfsd4_mark_cb_down(clp, task-&gt;tk_status);</div><div class='add'>+		nfsd4_mark_cb_down(clp);</div><div class='ctx'> 	else</div><div class='ctx'> 		nfsd4_mark_cb_state(clp, NFSD4_CB_UP);</div><div class='ctx'> }</div><div class='hunk'>@@ -1057,7 +1267,7 @@ void nfsd4_probe_callback(struct nfs4_client *clp)</div><div class='ctx'> void nfsd4_probe_callback_sync(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	nfsd4_probe_callback(clp);</div><div class='del'>-	flush_workqueue(callback_wq);</div><div class='add'>+	flush_workqueue(clp-&gt;cl_callback_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *conn)</div><div class='hunk'>@@ -1068,6 +1278,22 @@ void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *conn)</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int grab_slot(struct nfsd4_session *ses)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ses-&gt;se_lock);</div><div class='add'>+	idx = ffs(ses-&gt;se_cb_slot_avail) - 1;</div><div class='add'>+	if (idx &lt; 0 || idx &gt; ses-&gt;se_cb_highest_slot) {</div><div class='add'>+		spin_unlock(&amp;ses-&gt;se_lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	/* clear the bit for the slot */</div><div class='add'>+	ses-&gt;se_cb_slot_avail &amp;= ~BIT(idx);</div><div class='add'>+	spin_unlock(&amp;ses-&gt;se_lock);</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * There's currently a single callback channel slot.</div><div class='ctx'>  * If the slot is available, then mark it busy.  Otherwise, set the</div><div class='hunk'>@@ -1076,28 +1302,32 @@ void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *conn)</div><div class='ctx'> static bool nfsd41_cb_get_slot(struct nfsd4_callback *cb, struct rpc_task *task)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='add'>+	struct nfsd4_session *ses = clp-&gt;cl_cb_session;</div><div class='ctx'> </div><div class='del'>-	if (!cb-&gt;cb_holds_slot &amp;&amp;</div><div class='del'>-	    test_and_set_bit(0, &amp;clp-&gt;cl_cb_slot_busy) != 0) {</div><div class='add'>+	if (cb-&gt;cb_held_slot &gt;= 0)</div><div class='add'>+		return true;</div><div class='add'>+	cb-&gt;cb_held_slot = grab_slot(ses);</div><div class='add'>+	if (cb-&gt;cb_held_slot &lt; 0) {</div><div class='ctx'> 		rpc_sleep_on(&amp;clp-&gt;cl_cb_waitq, task, NULL);</div><div class='ctx'> 		/* Race breaker */</div><div class='del'>-		if (test_and_set_bit(0, &amp;clp-&gt;cl_cb_slot_busy) != 0) {</div><div class='del'>-			dprintk("%s slot is busy\n", __func__);</div><div class='add'>+		cb-&gt;cb_held_slot = grab_slot(ses);</div><div class='add'>+		if (cb-&gt;cb_held_slot &lt; 0)</div><div class='ctx'> 			return false;</div><div class='del'>-		}</div><div class='ctx'> 		rpc_wake_up_queued_task(&amp;clp-&gt;cl_cb_waitq, task);</div><div class='ctx'> 	}</div><div class='del'>-	cb-&gt;cb_holds_slot = true;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfsd41_cb_release_slot(struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='add'>+	struct nfsd4_session *ses = clp-&gt;cl_cb_session;</div><div class='ctx'> </div><div class='del'>-	if (cb-&gt;cb_holds_slot) {</div><div class='del'>-		cb-&gt;cb_holds_slot = false;</div><div class='del'>-		clear_bit(0, &amp;clp-&gt;cl_cb_slot_busy);</div><div class='add'>+	if (cb-&gt;cb_held_slot &gt;= 0) {</div><div class='add'>+		spin_lock(&amp;ses-&gt;se_lock);</div><div class='add'>+		ses-&gt;se_cb_slot_avail |= BIT(cb-&gt;cb_held_slot);</div><div class='add'>+		spin_unlock(&amp;ses-&gt;se_lock);</div><div class='add'>+		cb-&gt;cb_held_slot = -1;</div><div class='ctx'> 		rpc_wake_up_next(&amp;clp-&gt;cl_cb_waitq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1106,16 +1336,115 @@ static void nfsd41_destroy_cb(struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_cb_destroy(clp, cb);</div><div class='ctx'> 	nfsd41_cb_release_slot(cb);</div><div class='add'>+	if (test_bit(NFSD4_CALLBACK_WAKE, &amp;cb-&gt;cb_flags))</div><div class='add'>+		clear_and_wake_up_bit(NFSD4_CALLBACK_RUNNING, &amp;cb-&gt;cb_flags);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(NFSD4_CALLBACK_RUNNING, &amp;cb-&gt;cb_flags);</div><div class='add'>+</div><div class='ctx'> 	if (cb-&gt;cb_ops &amp;&amp; cb-&gt;cb_ops-&gt;release)</div><div class='ctx'> 		cb-&gt;cb_ops-&gt;release(cb);</div><div class='ctx'> 	nfsd41_cb_inflight_end(clp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TODO: cb_sequence should support referring call lists, cachethis, multiple</div><div class='del'>- * slots, and mark callback channel down on communication errors.</div><div class='add'>+/**</div><div class='add'>+ * nfsd41_cb_referring_call - add a referring call to a callback operation</div><div class='add'>+ * @cb: context of callback to add the rc to</div><div class='add'>+ * @sessionid: referring call's session ID</div><div class='add'>+ * @slotid: referring call's session slot index</div><div class='add'>+ * @seqno: referring call's slot sequence number</div><div class='add'>+ *</div><div class='add'>+ * Caller serializes access to @cb.</div><div class='add'>+ *</div><div class='add'>+ * NB: If memory allocation fails, the referring call is not added.</div><div class='add'>+ */</div><div class='add'>+void nfsd41_cb_referring_call(struct nfsd4_callback *cb,</div><div class='add'>+			      struct nfs4_sessionid *sessionid,</div><div class='add'>+			      u32 slotid, u32 seqno)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_referring_call_list *rcl;</div><div class='add'>+	struct nfsd4_referring_call *rc;</div><div class='add'>+	bool found;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	found = false;</div><div class='add'>+	list_for_each_entry(rcl, &amp;cb-&gt;cb_referring_call_list, __list) {</div><div class='add'>+		if (!memcmp(rcl-&gt;rcl_sessionid.data, sessionid-&gt;data,</div><div class='add'>+			   NFS4_MAX_SESSIONID_LEN)) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!found) {</div><div class='add'>+		rcl = kmalloc(sizeof(*rcl), GFP_KERNEL);</div><div class='add'>+		if (!rcl)</div><div class='add'>+			return;</div><div class='add'>+		memcpy(rcl-&gt;rcl_sessionid.data, sessionid-&gt;data,</div><div class='add'>+		       NFS4_MAX_SESSIONID_LEN);</div><div class='add'>+		rcl-&gt;__nr_referring_calls = 0;</div><div class='add'>+		INIT_LIST_HEAD(&amp;rcl-&gt;rcl_referring_calls);</div><div class='add'>+		list_add(&amp;rcl-&gt;__list, &amp;cb-&gt;cb_referring_call_list);</div><div class='add'>+		cb-&gt;cb_nr_referring_call_list++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	found = false;</div><div class='add'>+	list_for_each_entry(rc, &amp;rcl-&gt;rcl_referring_calls, __list) {</div><div class='add'>+		if (rc-&gt;rc_sequenceid == seqno &amp;&amp; rc-&gt;rc_slotid == slotid) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!found) {</div><div class='add'>+		rc = kmalloc(sizeof(*rc), GFP_KERNEL);</div><div class='add'>+		if (!rc)</div><div class='add'>+			goto out;</div><div class='add'>+		rc-&gt;rc_sequenceid = seqno;</div><div class='add'>+		rc-&gt;rc_slotid = slotid;</div><div class='add'>+		rcl-&gt;__nr_referring_calls++;</div><div class='add'>+		list_add(&amp;rc-&gt;__list, &amp;rcl-&gt;rcl_referring_calls);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (!rcl-&gt;__nr_referring_calls) {</div><div class='add'>+		cb-&gt;cb_nr_referring_call_list--;</div><div class='add'>+		list_del(&amp;rcl-&gt;__list);</div><div class='add'>+		kfree(rcl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd41_cb_destroy_referring_call_list - release referring call info</div><div class='add'>+ * @cb: context of a callback that has completed</div><div class='add'>+ *</div><div class='add'>+ * Callers who allocate referring calls using nfsd41_cb_referring_call() must</div><div class='add'>+ * release those resources by calling nfsd41_cb_destroy_referring_call_list.</div><div class='add'>+ *</div><div class='add'>+ * Caller serializes access to @cb.</div><div class='ctx'>  */</div><div class='add'>+void nfsd41_cb_destroy_referring_call_list(struct nfsd4_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_referring_call_list *rcl;</div><div class='add'>+	struct nfsd4_referring_call *rc;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;cb-&gt;cb_referring_call_list)) {</div><div class='add'>+		rcl = list_first_entry(&amp;cb-&gt;cb_referring_call_list,</div><div class='add'>+				       struct nfsd4_referring_call_list,</div><div class='add'>+				       __list);</div><div class='add'>+</div><div class='add'>+		while (!list_empty(&amp;rcl-&gt;rcl_referring_calls)) {</div><div class='add'>+			rc = list_first_entry(&amp;rcl-&gt;rcl_referring_calls,</div><div class='add'>+					      struct nfsd4_referring_call,</div><div class='add'>+					      __list);</div><div class='add'>+			list_del(&amp;rc-&gt;__list);</div><div class='add'>+			kfree(rc);</div><div class='add'>+		}</div><div class='add'>+		list_del(&amp;rcl-&gt;__list);</div><div class='add'>+		kfree(rcl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_callback *cb = calldata;</div><div class='hunk'>@@ -1126,6 +1455,7 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	 * cb_seq_status is only set in decode_cb_sequence4res,</div><div class='ctx'> 	 * and so will remain 1 if an rpc level failure occurs.</div><div class='ctx'> 	 */</div><div class='add'>+	trace_nfsd_cb_rpc_prepare(clp);</div><div class='ctx'> 	cb-&gt;cb_seq_status = 1;</div><div class='ctx'> 	cb-&gt;cb_status = 0;</div><div class='ctx'> 	if (minorversion &amp;&amp; !nfsd41_cb_get_slot(cb, task))</div><div class='hunk'>@@ -1133,31 +1463,17 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	rpc_call_start(task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Returns true if CB_COMPOUND processing should continue */</div><div class='ctx'> static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='del'>-	struct nfsd4_session *session = clp-&gt;cl_cb_session;</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	if (!clp-&gt;cl_minorversion) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the backchannel connection was shut down while this</div><div class='del'>-		 * task was queued, we need to resubmit it after setting up</div><div class='del'>-		 * a new backchannel connection.</div><div class='del'>-		 *</div><div class='del'>-		 * Note that if we lost our callback connection permanently</div><div class='del'>-		 * the submission code will error out, so we don't need to</div><div class='del'>-		 * handle that case here.</div><div class='del'>-		 */</div><div class='del'>-		if (RPC_SIGNALLED(task))</div><div class='del'>-			goto need_restart;</div><div class='del'>-</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='add'>+	struct nfsd4_session *session = cb-&gt;cb_clp-&gt;cl_cb_session;</div><div class='add'>+	bool ret = false;</div><div class='ctx'> </div><div class='del'>-	if (!cb-&gt;cb_holds_slot)</div><div class='del'>-		goto need_restart;</div><div class='add'>+	if (cb-&gt;cb_held_slot &lt; 0)</div><div class='add'>+		goto requeue;</div><div class='ctx'> </div><div class='add'>+	/* This is the operation status code for CB_SEQUENCE */</div><div class='add'>+	trace_nfsd_cb_seq_status(task, cb);</div><div class='ctx'> 	switch (cb-&gt;cb_seq_status) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1167,53 +1483,64 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback</div><div class='ctx'> 		 * If CB_SEQUENCE returns an error, then the state of the slot</div><div class='ctx'> 		 * (sequence ID, cached reply) MUST NOT change.</div><div class='ctx'> 		 */</div><div class='del'>-		++session-&gt;se_cb_seq_nr;</div><div class='add'>+		++session-&gt;se_cb_seq_nr[cb-&gt;cb_held_slot];</div><div class='add'>+		ret = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ESERVERFAULT:</div><div class='del'>-		++session-&gt;se_cb_seq_nr;</div><div class='del'>-		fallthrough;</div><div class='add'>+		/*</div><div class='add'>+		 * Call succeeded, but the session, slot index, or slot</div><div class='add'>+		 * sequence number in the response do not match the same</div><div class='add'>+		 * in the server's call. The sequence information is thus</div><div class='add'>+		 * untrustworthy.</div><div class='add'>+		 */</div><div class='add'>+		nfsd4_mark_cb_fault(cb-&gt;cb_clp);</div><div class='add'>+		break;</div><div class='ctx'> 	case 1:</div><div class='add'>+		/*</div><div class='add'>+		 * cb_seq_status remains 1 if an RPC Reply was never</div><div class='add'>+		 * received. NFSD can't know if the client processed</div><div class='add'>+		 * the CB_SEQUENCE operation. Ask the client to send a</div><div class='add'>+		 * DESTROY_SESSION to recover.</div><div class='add'>+		 */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case -NFS4ERR_BADSESSION:</div><div class='del'>-		nfsd4_mark_cb_fault(cb-&gt;cb_clp, cb-&gt;cb_seq_status);</div><div class='del'>-		ret = false;</div><div class='del'>-		break;</div><div class='add'>+		nfsd4_mark_cb_fault(cb-&gt;cb_clp);</div><div class='add'>+		goto requeue;</div><div class='ctx'> 	case -NFS4ERR_DELAY:</div><div class='del'>-		if (!rpc_restart_call(task))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='add'>+		cb-&gt;cb_seq_status = 1;</div><div class='add'>+		if (RPC_SIGNALLED(task) || !rpc_restart_call(task))</div><div class='add'>+			goto requeue;</div><div class='ctx'> 		rpc_delay(task, 2 * HZ);</div><div class='ctx'> 		return false;</div><div class='add'>+	case -NFS4ERR_SEQ_MISORDERED:</div><div class='ctx'> 	case -NFS4ERR_BADSLOT:</div><div class='add'>+		/*</div><div class='add'>+		 * A SEQ_MISORDERED or BADSLOT error means that the client and</div><div class='add'>+		 * server are out of sync as to the backchannel parameters. Mark</div><div class='add'>+		 * the backchannel faulty and restart the RPC, but leak the slot</div><div class='add'>+		 * so that it's no longer used.</div><div class='add'>+		 */</div><div class='add'>+		nfsd4_mark_cb_fault(cb-&gt;cb_clp);</div><div class='add'>+		cb-&gt;cb_held_slot = -1;</div><div class='ctx'> 		goto retry_nowait;</div><div class='del'>-	case -NFS4ERR_SEQ_MISORDERED:</div><div class='del'>-		if (session-&gt;se_cb_seq_nr != 1) {</div><div class='del'>-			session-&gt;se_cb_seq_nr = 1;</div><div class='del'>-			goto retry_nowait;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='del'>-		nfsd4_mark_cb_fault(cb-&gt;cb_clp, cb-&gt;cb_seq_status);</div><div class='del'>-		dprintk("%s: unprocessed error %d\n", __func__,</div><div class='del'>-			cb-&gt;cb_seq_status);</div><div class='add'>+		nfsd4_mark_cb_fault(cb-&gt;cb_clp);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	trace_nfsd_cb_free_slot(task, cb);</div><div class='ctx'> 	nfsd41_cb_release_slot(cb);</div><div class='del'>-	dprintk("%s: freed slot, new seqid=%d\n", __func__,</div><div class='del'>-		clp-&gt;cl_cb_session-&gt;se_cb_seq_nr);</div><div class='del'>-</div><div class='del'>-	if (RPC_SIGNALLED(task))</div><div class='del'>-		goto need_restart;</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> retry_nowait:</div><div class='del'>-	if (rpc_restart_call_prepare(task))</div><div class='del'>-		ret = false;</div><div class='del'>-	goto out;</div><div class='del'>-need_restart:</div><div class='del'>-	if (!test_bit(NFSD4_CLIENT_CB_KILL, &amp;clp-&gt;cl_flags)) {</div><div class='del'>-		task-&gt;tk_status = 0;</div><div class='del'>-		cb-&gt;cb_need_restart = true;</div><div class='add'>+	/*</div><div class='add'>+	 * RPC_SIGNALLED() means that the rpc_client is being torn down and</div><div class='add'>+	 * (possibly) recreated. Requeue the call in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!RPC_SIGNALLED(task)) {</div><div class='add'>+		if (rpc_restart_call_prepare(task))</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='add'>+requeue:</div><div class='add'>+	nfsd41_cb_release_slot(cb);</div><div class='add'>+	nfsd4_requeue_cb(task, cb);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1222,11 +1549,28 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	struct nfsd4_callback *cb = calldata;</div><div class='ctx'> 	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='ctx'> </div><div class='del'>-	if (!nfsd4_cb_sequence_done(task, cb))</div><div class='add'>+	trace_nfsd_cb_rpc_done(clp);</div><div class='add'>+</div><div class='add'>+	if (!clp-&gt;cl_minorversion) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the backchannel connection was shut down while this</div><div class='add'>+		 * task was queued, we need to resubmit it after setting up</div><div class='add'>+		 * a new backchannel connection.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that if we lost our callback connection permanently</div><div class='add'>+		 * the submission code will error out, so we don't need to</div><div class='add'>+		 * handle that case here.</div><div class='add'>+		 */</div><div class='add'>+		if (RPC_SIGNALLED(task))</div><div class='add'>+			nfsd4_requeue_cb(task, cb);</div><div class='add'>+	} else if (!nfsd4_cb_sequence_done(task, cb)) {</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cb-&gt;cb_status) {</div><div class='del'>-		WARN_ON_ONCE(task-&gt;tk_status);</div><div class='add'>+		WARN_ONCE(task-&gt;tk_status,</div><div class='add'>+			  "cb_status=%d tk_status=%d cb_opcode=%d",</div><div class='add'>+			  cb-&gt;cb_status, task-&gt;tk_status, cb-&gt;cb_ops-&gt;opcode);</div><div class='ctx'> 		task-&gt;tk_status = cb-&gt;cb_status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1240,7 +1584,7 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		case -EIO:</div><div class='ctx'> 		case -ETIMEDOUT:</div><div class='ctx'> 		case -EACCES:</div><div class='del'>-			nfsd4_mark_cb_down(clp, task-&gt;tk_status);</div><div class='add'>+			nfsd4_mark_cb_down(clp);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1252,7 +1596,9 @@ static void nfsd4_cb_release(void *calldata)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_callback *cb = calldata;</div><div class='ctx'> </div><div class='del'>-	if (cb-&gt;cb_need_restart)</div><div class='add'>+	trace_nfsd_cb_rpc_release(cb-&gt;cb_clp);</div><div class='add'>+</div><div class='add'>+	if (test_bit(NFSD4_CALLBACK_REQUEUE, &amp;cb-&gt;cb_flags))</div><div class='ctx'> 		nfsd4_queue_cb(cb);</div><div class='ctx'> 	else</div><div class='ctx'> 		nfsd41_destroy_cb(cb);</div><div class='hunk'>@@ -1265,19 +1611,6 @@ static const struct rpc_call_ops nfsd4_cb_ops = {</div><div class='ctx'> 	.rpc_release = nfsd4_cb_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nfsd4_create_callback_queue(void)</div><div class='del'>-{</div><div class='del'>-	callback_wq = alloc_ordered_workqueue("nfsd4_callbacks", 0);</div><div class='del'>-	if (!callback_wq)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nfsd4_destroy_callback_queue(void)</div><div class='del'>-{</div><div class='del'>-	destroy_workqueue(callback_wq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* must be called under the state lock */</div><div class='ctx'> void nfsd4_shutdown_callback(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1291,16 +1624,17 @@ void nfsd4_shutdown_callback(struct nfs4_client *clp)</div><div class='ctx'> 	 * client, destroy the rpc client, and stop:</div><div class='ctx'> 	 */</div><div class='ctx'> 	nfsd4_run_cb(&amp;clp-&gt;cl_cb_null);</div><div class='del'>-	flush_workqueue(callback_wq);</div><div class='add'>+	flush_workqueue(clp-&gt;cl_callback_wq);</div><div class='ctx'> 	nfsd41_cb_inflight_wait_complete(clp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* requires cl_lock: */</div><div class='ctx'> static struct nfsd4_conn * __nfsd4_find_backchannel(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_session *s;</div><div class='ctx'> 	struct nfsd4_conn *c;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;clp-&gt;cl_lock);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(s, &amp;clp-&gt;cl_sessions, se_perclnt) {</div><div class='ctx'> 		list_for_each_entry(c, &amp;s-&gt;se_conns, cn_persession) {</div><div class='ctx'> 			if (c-&gt;cn_flags &amp; NFS4_CDFC4_BACK)</div><div class='hunk'>@@ -1312,9 +1646,9 @@ static struct nfsd4_conn * __nfsd4_find_backchannel(struct nfs4_client *clp)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Note there isn't a lot of locking in this code; instead we depend on</div><div class='del'>- * the fact that it is run from the callback_wq, which won't run two</div><div class='del'>- * work items at once.  So, for example, callback_wq handles all access</div><div class='del'>- * of cl_cb_client and all calls to rpc_create or rpc_shutdown_client.</div><div class='add'>+ * the fact that it is run from clp-&gt;cl_callback_wq, which won't run two</div><div class='add'>+ * work items at once.  So, for example, clp-&gt;cl_callback_wq handles all</div><div class='add'>+ * access of cl_cb_client and all calls to rpc_create or rpc_shutdown_client.</div><div class='ctx'>  */</div><div class='ctx'> static void nfsd4_process_cb_update(struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1324,11 +1658,14 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)</div><div class='ctx'> 	struct nfsd4_conn *c;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_cb_bc_update(clp, cb);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is either an update, or the client dying; in either case,</div><div class='ctx'> 	 * kill the old client:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (clp-&gt;cl_cb_client) {</div><div class='add'>+		trace_nfsd_cb_bc_shutdown(clp, cb);</div><div class='ctx'> 		rpc_shutdown_client(clp-&gt;cl_cb_client);</div><div class='ctx'> 		clp-&gt;cl_cb_client = NULL;</div><div class='ctx'> 		put_cred(clp-&gt;cl_cb_cred);</div><div class='hunk'>@@ -1340,13 +1677,15 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (test_bit(NFSD4_CLIENT_CB_KILL, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only serialized callback code is allowed to clear these</div><div class='ctx'> 	 * flags; main nfsd code can only set them:</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(!(clp-&gt;cl_flags &amp; NFSD4_CLIENT_CB_FLAG_MASK));</div><div class='add'>+	WARN_ON(!(clp-&gt;cl_flags &amp; NFSD4_CLIENT_CB_FLAG_MASK));</div><div class='ctx'> 	clear_bit(NFSD4_CLIENT_CB_UPDATE, &amp;clp-&gt;cl_flags);</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;conn, &amp;cb-&gt;cb_clp-&gt;cl_cb_conn, sizeof(struct nfs4_cb_conn));</div><div class='ctx'> 	c = __nfsd4_find_backchannel(clp);</div><div class='ctx'> 	if (c) {</div><div class='hunk'>@@ -1358,7 +1697,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)</div><div class='ctx'> </div><div class='ctx'> 	err = setup_callback_client(clp, &amp;conn, ses);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		nfsd4_mark_cb_down(clp, err);</div><div class='add'>+		nfsd4_mark_cb_down(clp);</div><div class='ctx'> 		if (c)</div><div class='ctx'> 			svc_xprt_put(c-&gt;cn_xprt);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1372,21 +1711,19 @@ nfsd4_run_cb_work(struct work_struct *work)</div><div class='ctx'> 		container_of(work, struct nfsd4_callback, cb_work);</div><div class='ctx'> 	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='ctx'> 	struct rpc_clnt *clnt;</div><div class='del'>-	int flags;</div><div class='add'>+	int flags, ret;</div><div class='ctx'> </div><div class='del'>-	if (cb-&gt;cb_need_restart) {</div><div class='del'>-		cb-&gt;cb_need_restart = false;</div><div class='del'>-	} else {</div><div class='del'>-		if (cb-&gt;cb_ops &amp;&amp; cb-&gt;cb_ops-&gt;prepare)</div><div class='del'>-			cb-&gt;cb_ops-&gt;prepare(cb);</div><div class='del'>-	}</div><div class='add'>+	trace_nfsd_cb_start(clp);</div><div class='ctx'> </div><div class='ctx'> 	if (clp-&gt;cl_flags &amp; NFSD4_CLIENT_CB_FLAG_MASK)</div><div class='ctx'> 		nfsd4_process_cb_update(cb);</div><div class='ctx'> </div><div class='ctx'> 	clnt = clp-&gt;cl_cb_client;</div><div class='del'>-	if (!clnt) {</div><div class='del'>-		/* Callback channel broken, or client killed; give up: */</div><div class='add'>+	if (!clnt || clp-&gt;cl_state == NFSD4_COURTESY) {</div><div class='add'>+		/*</div><div class='add'>+		 * Callback channel broken, client killed or</div><div class='add'>+		 * nfs4_client in courtesy state; give up.</div><div class='add'>+		 */</div><div class='ctx'> 		nfsd41_destroy_cb(cb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1400,10 +1737,19 @@ nfsd4_run_cb_work(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!test_and_clear_bit(NFSD4_CALLBACK_REQUEUE, &amp;cb-&gt;cb_flags)) {</div><div class='add'>+		if (cb-&gt;cb_ops &amp;&amp; cb-&gt;cb_ops-&gt;prepare)</div><div class='add'>+			cb-&gt;cb_ops-&gt;prepare(cb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cb-&gt;cb_msg.rpc_cred = clp-&gt;cl_cb_cred;</div><div class='ctx'> 	flags = clp-&gt;cl_minorversion ? RPC_TASK_NOCONNECT : RPC_TASK_SOFTCONN;</div><div class='del'>-	rpc_call_async(clnt, &amp;cb-&gt;cb_msg, RPC_TASK_SOFT | flags,</div><div class='del'>-			cb-&gt;cb_ops ? &amp;nfsd4_cb_ops : &amp;nfsd4_cb_probe_ops, cb);</div><div class='add'>+	ret = rpc_call_async(clnt, &amp;cb-&gt;cb_msg, RPC_TASK_SOFT | flags,</div><div class='add'>+			     cb-&gt;cb_ops ? &amp;nfsd4_cb_ops : &amp;nfsd4_cb_probe_ops, cb);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		set_bit(NFSD4_CALLBACK_REQUEUE, &amp;cb-&gt;cb_flags);</div><div class='add'>+		nfsd4_queue_cb(cb);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,</div><div class='hunk'>@@ -1413,12 +1759,13 @@ void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,</div><div class='ctx'> 	cb-&gt;cb_msg.rpc_proc = &amp;nfs4_cb_procedures[op];</div><div class='ctx'> 	cb-&gt;cb_msg.rpc_argp = cb;</div><div class='ctx'> 	cb-&gt;cb_msg.rpc_resp = cb;</div><div class='add'>+	cb-&gt;cb_flags = 0;</div><div class='ctx'> 	cb-&gt;cb_ops = ops;</div><div class='ctx'> 	INIT_WORK(&amp;cb-&gt;cb_work, nfsd4_run_cb_work);</div><div class='del'>-	cb-&gt;cb_seq_status = 1;</div><div class='ctx'> 	cb-&gt;cb_status = 0;</div><div class='del'>-	cb-&gt;cb_need_restart = false;</div><div class='del'>-	cb-&gt;cb_holds_slot = false;</div><div class='add'>+	cb-&gt;cb_held_slot = -1;</div><div class='add'>+	cb-&gt;cb_nr_referring_call_list = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;cb-&gt;cb_referring_call_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c<br/>index 7a806ac13e31..8cca1329f348 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4idmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4idmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4idmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4idmap.c</a></div><div class='hunk'>@@ -581,6 +581,7 @@ static __be32 idmap_id_to_name(struct xdr_stream *xdr,</div><div class='ctx'> 		.id = id,</div><div class='ctx'> 		.type = type,</div><div class='ctx'> 	};</div><div class='add'>+	__be32 status = nfs_ok;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='hunk'>@@ -593,12 +594,16 @@ static __be32 idmap_id_to_name(struct xdr_stream *xdr,</div><div class='ctx'> 		return nfserrno(ret);</div><div class='ctx'> 	ret = strlen(item-&gt;name);</div><div class='ctx'> 	WARN_ON_ONCE(ret &gt; IDMAP_NAMESZ);</div><div class='add'>+</div><div class='ctx'> 	p = xdr_reserve_space(xdr, ret + 4);</div><div class='del'>-	if (!p)</div><div class='del'>-		return nfserr_resource;</div><div class='del'>-	p = xdr_encode_opaque(p, item-&gt;name, ret);</div><div class='add'>+	if (unlikely(!p)) {</div><div class='add'>+		status = nfserr_resource;</div><div class='add'>+		goto out_put;</div><div class='add'>+	}</div><div class='add'>+	xdr_encode_opaque(p, item-&gt;name, ret);</div><div class='add'>+out_put:</div><div class='ctx'> 	cache_put(&amp;item-&gt;h, nn-&gt;idtoname_cache);</div><div class='del'>-	return 0;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='head'>diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c<br/>index 5e8096bc5eaa..683bd1130afe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4layouts.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4layouts.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4layouts.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4layouts.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ static struct kmem_cache *nfs4_layout_cache;</div><div class='ctx'> static struct kmem_cache *nfs4_layout_stateid_cache;</div><div class='ctx'> </div><div class='ctx'> static const struct nfsd4_callback_ops nfsd4_cb_layout_ops;</div><div class='del'>-static const struct lock_manager_operations nfsd4_layouts_lm_ops;</div><div class='add'>+static const struct lease_manager_operations nfsd4_layouts_lm_ops;</div><div class='ctx'> </div><div class='ctx'> const struct nfsd4_layout_ops *nfsd4_layout_ops[LAYOUT_TYPE_MAX] =  {</div><div class='ctx'> #ifdef CONFIG_NFSD_FLEXFILELAYOUT</div><div class='hunk'>@@ -65,7 +65,7 @@ nfsd4_alloc_devid_map(const struct svc_fh *fhp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	map-&gt;fsid_type = fh-&gt;fh_fsid_type;</div><div class='del'>-	memcpy(&amp;map-&gt;fsid, fh-&gt;fh_fsid, fsid_len);</div><div class='add'>+	memcpy(&amp;map-&gt;fsid, fh_fsid(fh), fsid_len);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;nfsd_devid_lock);</div><div class='ctx'> 	if (fhp-&gt;fh_export-&gt;ex_devid_map)</div><div class='hunk'>@@ -75,7 +75,7 @@ nfsd4_alloc_devid_map(const struct svc_fh *fhp)</div><div class='ctx'> 		list_for_each_entry(old, &amp;nfsd_devid_hash[i], hash) {</div><div class='ctx'> 			if (old-&gt;fsid_type != fh-&gt;fh_fsid_type)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (memcmp(old-&gt;fsid, fh-&gt;fh_fsid,</div><div class='add'>+			if (memcmp(old-&gt;fsid, fh_fsid(fh),</div><div class='ctx'> 					key_len(old-&gt;fsid_type)))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +120,6 @@ nfsd4_set_deviceid(struct nfsd4_deviceid *id, const struct svc_fh *fhp,</div><div class='ctx'> </div><div class='ctx'> 	id-&gt;fsid_idx = fhp-&gt;fh_export-&gt;ex_devid_map-&gt;idx;</div><div class='ctx'> 	id-&gt;generation = device_generation;</div><div class='del'>-	id-&gt;pad = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,6 +151,23 @@ void nfsd4_setup_layout_type(struct svc_export *exp)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void nfsd4_close_layout(struct nfs4_layout_stateid *ls)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_file *fl;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lock);</div><div class='add'>+	fl = ls-&gt;ls_file;</div><div class='add'>+	ls-&gt;ls_file = NULL;</div><div class='add'>+	spin_unlock(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lock);</div><div class='add'>+</div><div class='add'>+	if (fl) {</div><div class='add'>+		if (!nfsd4_layout_ops[ls-&gt;ls_layout_type]-&gt;disable_recalls)</div><div class='add'>+			kernel_setlease(fl-&gt;nf_file, F_UNLCK, NULL,</div><div class='add'>+					(void **)&amp;ls);</div><div class='add'>+		nfsd_file_put(fl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> nfsd4_free_layout_stateid(struct nfs4_stid *stid)</div><div class='ctx'> {</div><div class='hunk'>@@ -169,9 +185,7 @@ nfsd4_free_layout_stateid(struct nfs4_stid *stid)</div><div class='ctx'> 	list_del_init(&amp;ls-&gt;ls_perfile);</div><div class='ctx'> 	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> </div><div class='del'>-	if (!nfsd4_layout_ops[ls-&gt;ls_layout_type]-&gt;disable_recalls)</div><div class='del'>-		vfs_setlease(ls-&gt;ls_file-&gt;nf_file, F_UNLCK, NULL, (void **)&amp;ls);</div><div class='del'>-	nfsd_file_put(ls-&gt;ls_file);</div><div class='add'>+	nfsd4_close_layout(ls);</div><div class='ctx'> </div><div class='ctx'> 	if (ls-&gt;ls_recalled)</div><div class='ctx'> 		atomic_dec(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lo_recalls);</div><div class='hunk'>@@ -182,27 +196,26 @@ nfsd4_free_layout_stateid(struct nfs4_stid *stid)</div><div class='ctx'> static int</div><div class='ctx'> nfsd4_layout_setlease(struct nfs4_layout_stateid *ls)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lease *fl;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (nfsd4_layout_ops[ls-&gt;ls_layout_type]-&gt;disable_recalls)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fl = locks_alloc_lock();</div><div class='add'>+	fl = locks_alloc_lease();</div><div class='ctx'> 	if (!fl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	locks_init_lock(fl);</div><div class='add'>+	locks_init_lease(fl);</div><div class='ctx'> 	fl-&gt;fl_lmops = &amp;nfsd4_layouts_lm_ops;</div><div class='del'>-	fl-&gt;fl_flags = FL_LAYOUT;</div><div class='del'>-	fl-&gt;fl_type = F_RDLCK;</div><div class='del'>-	fl-&gt;fl_end = OFFSET_MAX;</div><div class='del'>-	fl-&gt;fl_owner = ls;</div><div class='del'>-	fl-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	fl-&gt;fl_file = ls-&gt;ls_file-&gt;nf_file;</div><div class='del'>-</div><div class='del'>-	status = vfs_setlease(fl-&gt;fl_file, fl-&gt;fl_type, &amp;fl, NULL);</div><div class='add'>+	fl-&gt;c.flc_flags = FL_LAYOUT;</div><div class='add'>+	fl-&gt;c.flc_type = F_RDLCK;</div><div class='add'>+	fl-&gt;c.flc_owner = ls;</div><div class='add'>+	fl-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	fl-&gt;c.flc_file = ls-&gt;ls_file-&gt;nf_file;</div><div class='add'>+</div><div class='add'>+	status = kernel_setlease(fl-&gt;c.flc_file, fl-&gt;c.flc_type, &amp;fl, NULL);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		locks_free_lease(fl);</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(fl != NULL);</div><div class='hunk'>@@ -236,7 +249,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	nfsd4_init_cb(&amp;ls-&gt;ls_recall, clp, &amp;nfsd4_cb_layout_ops,</div><div class='ctx'> 			NFSPROC4_CLNT_CB_LAYOUT);</div><div class='ctx'> </div><div class='del'>-	if (parent-&gt;sc_type == NFS4_DELEG_STID)</div><div class='add'>+	if (parent-&gt;sc_type == SC_TYPE_DELEG)</div><div class='ctx'> 		ls-&gt;ls_file = nfsd_file_get(fp-&gt;fi_deleg_file);</div><div class='ctx'> 	else</div><div class='ctx'> 		ls-&gt;ls_file = find_any_file(fp);</div><div class='hunk'>@@ -250,7 +263,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='del'>-	stp-&gt;sc_type = NFS4_LAYOUT_STID;</div><div class='add'>+	stp-&gt;sc_type = SC_TYPE_LAYOUT;</div><div class='ctx'> 	list_add(&amp;ls-&gt;ls_perclnt, &amp;clp-&gt;cl_lo_states);</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -269,13 +282,13 @@ nfsd4_preprocess_layout_stateid(struct svc_rqst *rqstp,</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_layout_stateid *ls;</div><div class='ctx'> 	struct nfs4_stid *stid;</div><div class='del'>-	unsigned char typemask = NFS4_LAYOUT_STID;</div><div class='add'>+	unsigned short typemask = SC_TYPE_LAYOUT;</div><div class='ctx'> 	__be32 status;</div><div class='ctx'> </div><div class='ctx'> 	if (create)</div><div class='del'>-		typemask |= (NFS4_OPEN_STID | NFS4_LOCK_STID | NFS4_DELEG_STID);</div><div class='add'>+		typemask |= (SC_TYPE_OPEN | SC_TYPE_LOCK | SC_TYPE_DELEG);</div><div class='ctx'> </div><div class='del'>-	status = nfsd4_lookup_stateid(cstate, stateid, typemask, &amp;stid,</div><div class='add'>+	status = nfsd4_lookup_stateid(cstate, stateid, typemask, 0, &amp;stid,</div><div class='ctx'> 			net_generic(SVC_NET(rqstp), nfsd_net_id));</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -286,7 +299,7 @@ nfsd4_preprocess_layout_stateid(struct svc_rqst *rqstp,</div><div class='ctx'> 		goto out_put_stid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (stid-&gt;sc_type != NFS4_LAYOUT_STID) {</div><div class='add'>+	if (stid-&gt;sc_type != SC_TYPE_LAYOUT) {</div><div class='ctx'> 		ls = nfsd4_alloc_layout_stateid(cstate, stid, layout_type);</div><div class='ctx'> 		nfs4_put_stid(stid);</div><div class='ctx'> </div><div class='hunk'>@@ -330,9 +343,10 @@ nfsd4_recall_file_layout(struct nfs4_layout_stateid *ls)</div><div class='ctx'> 	atomic_inc(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lo_recalls);</div><div class='ctx'> 	trace_nfsd_layout_recall(&amp;ls-&gt;ls_stid.sc_stateid);</div><div class='ctx'> </div><div class='del'>-	refcount_inc(&amp;ls-&gt;ls_stid.sc_count);</div><div class='del'>-	nfsd4_run_cb(&amp;ls-&gt;ls_recall);</div><div class='del'>-</div><div class='add'>+	if (!test_and_set_bit(NFSD4_CALLBACK_RUNNING, &amp;ls-&gt;ls_recall.cb_flags)) {</div><div class='add'>+		refcount_inc(&amp;ls-&gt;ls_stid.sc_count);</div><div class='add'>+		nfsd4_run_cb(&amp;ls-&gt;ls_recall);</div><div class='add'>+	}</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;ls-&gt;ls_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -518,7 +532,7 @@ nfsd4_return_file_layouts(struct svc_rqst *rqstp,</div><div class='ctx'> 		lrp-&gt;lrs_present = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		trace_nfsd_layoutstate_unhash(&amp;ls-&gt;ls_stid.sc_stateid);</div><div class='del'>-		nfs4_unhash_stid(&amp;ls-&gt;ls_stid);</div><div class='add'>+		ls-&gt;ls_stid.sc_status |= SC_STATUS_CLOSED;</div><div class='ctx'> 		lrp-&gt;lrs_present = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ls-&gt;ls_lock);</div><div class='hunk'>@@ -605,7 +619,7 @@ nfsd4_return_all_file_layouts(struct nfs4_client *clp, struct nfs4_file *fp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)</div><div class='add'>+nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls, struct nfsd_file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = ls-&gt;ls_stid.sc_client;</div><div class='ctx'> 	char addr_str[INET6_ADDRSTRLEN];</div><div class='hunk'>@@ -627,7 +641,7 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)</div><div class='ctx'> </div><div class='ctx'> 	argv[0] = (char *)nfsd_recall_failed;</div><div class='ctx'> 	argv[1] = addr_str;</div><div class='del'>-	argv[2] = ls-&gt;ls_file-&gt;nf_file-&gt;f_path.mnt-&gt;mnt_sb-&gt;s_id;</div><div class='add'>+	argv[2] = file-&gt;nf_file-&gt;f_path.mnt-&gt;mnt_sb-&gt;s_id;</div><div class='ctx'> 	argv[3] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	error = call_usermodehelper(nfsd_recall_failed, argv, envp,</div><div class='hunk'>@@ -657,6 +671,7 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task)</div><div class='ctx'> 	struct nfsd_net *nn;</div><div class='ctx'> 	ktime_t now, cutoff;</div><div class='ctx'> 	const struct nfsd4_layout_ops *ops;</div><div class='add'>+	struct nfsd_file *fl;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_cb_layout_done(&amp;ls-&gt;ls_stid.sc_stateid, task);</div><div class='ctx'> 	switch (task-&gt;tk_status) {</div><div class='hunk'>@@ -688,12 +703,17 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task)</div><div class='ctx'> 		 * Unknown error or non-responding client, we'll need to fence.</div><div class='ctx'> 		 */</div><div class='ctx'> 		trace_nfsd_layout_recall_fail(&amp;ls-&gt;ls_stid.sc_stateid);</div><div class='del'>-</div><div class='del'>-		ops = nfsd4_layout_ops[ls-&gt;ls_layout_type];</div><div class='del'>-		if (ops-&gt;fence_client)</div><div class='del'>-			ops-&gt;fence_client(ls);</div><div class='del'>-		else</div><div class='del'>-			nfsd4_cb_layout_fail(ls);</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		fl = nfsd_file_get(ls-&gt;ls_file);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		if (fl) {</div><div class='add'>+			ops = nfsd4_layout_ops[ls-&gt;ls_layout_type];</div><div class='add'>+			if (ops-&gt;fence_client)</div><div class='add'>+				ops-&gt;fence_client(ls, fl);</div><div class='add'>+			else</div><div class='add'>+				nfsd4_cb_layout_fail(ls, fl);</div><div class='add'>+			nfsd_file_put(fl);</div><div class='add'>+		}</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	case -NFS4ERR_NOMATCHING_LAYOUT:</div><div class='ctx'> 		trace_nfsd_layout_recall_done(&amp;ls-&gt;ls_stid.sc_stateid);</div><div class='hunk'>@@ -720,10 +740,11 @@ static const struct nfsd4_callback_ops nfsd4_cb_layout_ops = {</div><div class='ctx'> 	.prepare	= nfsd4_cb_layout_prepare,</div><div class='ctx'> 	.done		= nfsd4_cb_layout_done,</div><div class='ctx'> 	.release	= nfsd4_cb_layout_release,</div><div class='add'>+	.opcode		= OP_CB_LAYOUTRECALL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-nfsd4_layout_lm_break(struct file_lock *fl)</div><div class='add'>+nfsd4_layout_lm_break(struct file_lease *fl)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't want the locks code to timeout the lease for us;</div><div class='hunk'>@@ -731,19 +752,19 @@ nfsd4_layout_lm_break(struct file_lock *fl)</div><div class='ctx'> 	 * in time:</div><div class='ctx'> 	 */</div><div class='ctx'> 	fl-&gt;fl_break_time = 0;</div><div class='del'>-	nfsd4_recall_file_layout(fl-&gt;fl_owner);</div><div class='add'>+	nfsd4_recall_file_layout(fl-&gt;c.flc_owner);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfsd4_layout_lm_change(struct file_lock *onlist, int arg,</div><div class='add'>+nfsd4_layout_lm_change(struct file_lease *onlist, int arg,</div><div class='ctx'> 		struct list_head *dispose)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!(arg &amp; F_UNLCK));</div><div class='ctx'> 	return lease_modify(onlist, arg, dispose);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct lock_manager_operations nfsd4_layouts_lm_ops = {</div><div class='add'>+static const struct lease_manager_operations nfsd4_layouts_lm_ops = {</div><div class='ctx'> 	.lm_break	= nfsd4_layout_lm_break,</div><div class='ctx'> 	.lm_change	= nfsd4_layout_lm_change,</div><div class='ctx'> };</div><div class='hunk'>@@ -756,13 +777,11 @@ nfsd4_init_pnfs(void)</div><div class='ctx'> 	for (i = 0; i &lt; DEVID_HASH_SIZE; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;nfsd_devid_hash[i]);</div><div class='ctx'> </div><div class='del'>-	nfs4_layout_cache = kmem_cache_create("nfs4_layout",</div><div class='del'>-			sizeof(struct nfs4_layout), 0, 0, NULL);</div><div class='add'>+	nfs4_layout_cache = KMEM_CACHE(nfs4_layout, 0);</div><div class='ctx'> 	if (!nfs4_layout_cache)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	nfs4_layout_stateid_cache = kmem_cache_create("nfs4_layout_stateid",</div><div class='del'>-			sizeof(struct nfs4_layout_stateid), 0, 0, NULL);</div><div class='add'>+	nfs4_layout_stateid_cache = KMEM_CACHE(nfs4_layout_stateid, 0);</div><div class='ctx'> 	if (!nfs4_layout_stateid_cache) {</div><div class='ctx'> 		kmem_cache_destroy(nfs4_layout_cache);</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c<br/>index 14712fa08f76..b74800917583 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4proc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4proc.c</a></div><div class='hunk'>@@ -57,6 +57,8 @@ module_param(inter_copy_offload_enable, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(inter_copy_offload_enable,</div><div class='ctx'> 		 "Enable inter server to server copy offload. Default: false");</div><div class='ctx'> </div><div class='add'>+static void cleanup_async_copy(struct nfsd4_copy *copy);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFSD_V4_2_INTER_SSC</div><div class='ctx'> static int nfsd4_ssc_umount_timeout = 900000;		/* default to 15 mins */</div><div class='ctx'> module_param(nfsd4_ssc_umount_timeout, int, 0644);</div><div class='hunk'>@@ -158,7 +160,7 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs</div><div class='ctx'> 	return fh_verify(rqstp, current_fh, S_IFREG, accmode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __be32 nfsd_check_obj_isreg(struct svc_fh *fh)</div><div class='add'>+static __be32 nfsd_check_obj_isreg(struct svc_fh *fh, u32 minor_version)</div><div class='ctx'> {</div><div class='ctx'> 	umode_t mode = d_inode(fh-&gt;fh_dentry)-&gt;i_mode;</div><div class='ctx'> </div><div class='hunk'>@@ -166,14 +168,15 @@ static __be32 nfsd_check_obj_isreg(struct svc_fh *fh)</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> 	if (S_ISDIR(mode))</div><div class='ctx'> 		return nfserr_isdir;</div><div class='del'>-	/*</div><div class='del'>-	 * Using err_symlink as our catch-all case may look odd; but</div><div class='del'>-	 * there's no other obvious error for this case in 4.0, and we</div><div class='del'>-	 * happen to know that it will cause the linux v4 client to do</div><div class='del'>-	 * the right thing on attempts to open something other than a</div><div class='del'>-	 * regular file.</div><div class='del'>-	 */</div><div class='del'>-	return nfserr_symlink;</div><div class='add'>+	if (S_ISLNK(mode))</div><div class='add'>+		return nfserr_symlink;</div><div class='add'>+</div><div class='add'>+	/* RFC 7530 - 16.16.6 */</div><div class='add'>+	if (minor_version == 0)</div><div class='add'>+		return nfserr_symlink;</div><div class='add'>+	else</div><div class='add'>+		return nfserr_wrong_type;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfsd4_set_open_owner_reply_cache(struct nfsd4_compound_state *cstate, struct nfsd4_open *open, struct svc_fh *resfh)</div><div class='hunk'>@@ -261,12 +264,11 @@ nfsd4_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	if (is_create_with_attrs(open))</div><div class='ctx'> 		nfsd4_acl_to_attr(NF4REG, open-&gt;op_acl, &amp;attrs);</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(inode, I_MUTEX_PARENT);</div><div class='del'>-</div><div class='del'>-	child = lookup_one_len(open-&gt;op_fname, parent, open-&gt;op_fnamelen);</div><div class='add'>+	child = start_creating(&amp;nop_mnt_idmap, parent,</div><div class='add'>+			       &amp;QSTR_LEN(open-&gt;op_fname, open-&gt;op_fnamelen));</div><div class='ctx'> 	if (IS_ERR(child)) {</div><div class='ctx'> 		status = nfserrno(PTR_ERR(child));</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (d_really_is_negative(child)) {</div><div class='hunk'>@@ -374,10 +376,9 @@ set_attr:</div><div class='ctx'> 	if (attrs.na_aclerr)</div><div class='ctx'> 		open-&gt;op_bmval[0] &amp;= ~FATTR4_WORD0_ACL;</div><div class='ctx'> out:</div><div class='del'>-	inode_unlock(inode);</div><div class='add'>+	end_creating(child);</div><div class='ctx'> 	nfsd_attrs_free(&amp;attrs);</div><div class='del'>-	if (child &amp;&amp; !IS_ERR(child))</div><div class='del'>-		dput(child);</div><div class='add'>+out_write:</div><div class='ctx'> 	fh_drop_write(fhp);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -466,7 +467,7 @@ do_open_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, stru</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='del'>-	status = nfsd_check_obj_isreg(*resfh);</div><div class='add'>+	status = nfsd_check_obj_isreg(*resfh, cstate-&gt;minorversion);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -751,15 +752,6 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 			   &amp;access-&gt;ac_supported);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gen_boot_verifier(nfs4_verifier *verifier, struct net *net)</div><div class='del'>-{</div><div class='del'>-	__be32 *verf = (__be32 *)verifier-&gt;data;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(2*sizeof(*verf) != sizeof(verifier-&gt;data));</div><div class='del'>-</div><div class='del'>-	nfsd_copy_write_verifier(verf, net_generic(net, nfsd_net_id));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	     union nfsd4_op_u *u)</div><div class='hunk'>@@ -882,6 +874,8 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	struct nfsd4_getattr *getattr = &amp;u-&gt;getattr;</div><div class='ctx'> 	__be32 status;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_getattr(rqstp, &amp;cstate-&gt;current_fh);</div><div class='add'>+</div><div class='ctx'> 	status = fh_verify(rqstp, &amp;cstate-&gt;current_fh, 0, NFSD_MAY_NOP);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='hunk'>@@ -990,10 +984,11 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> static void</div><div class='ctx'> nfsd4_read_release(union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='del'>-	if (u-&gt;read.rd_nf)</div><div class='add'>+	if (u-&gt;read.rd_nf) {</div><div class='add'>+		trace_nfsd_read_done(u-&gt;read.rd_rqstp, u-&gt;read.rd_fhp,</div><div class='add'>+				     u-&gt;read.rd_offset, u-&gt;read.rd_length);</div><div class='ctx'> 		nfsd_file_put(u-&gt;read.rd_nf);</div><div class='del'>-	trace_nfsd_read_done(u-&gt;read.rd_rqstp, u-&gt;read.rd_fhp,</div><div class='del'>-			     u-&gt;read.rd_offset, u-&gt;read.rd_length);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='hunk'>@@ -1004,6 +999,9 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	u64 cookie = readdir-&gt;rd_cookie;</div><div class='ctx'> 	static const nfs4_verifier zeroverf;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_readdir(rqstp, &amp;cstate-&gt;current_fh,</div><div class='add'>+			       readdir-&gt;rd_maxcount, readdir-&gt;rd_cookie);</div><div class='add'>+</div><div class='ctx'> 	/* no need to check permission - this will be done in nfsd_readdir() */</div><div class='ctx'> </div><div class='ctx'> 	if (readdir-&gt;rd_bmval[1] &amp; NFSD_WRITEONLY_ATTRS_WORD1)</div><div class='hunk'>@@ -1132,6 +1130,35 @@ nfsd4_secinfo_no_name_release(union nfsd4_op_u *u)</div><div class='ctx'> 		exp_put(u-&gt;secinfo_no_name.sin_exp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Validate that the requested timestamps are within the acceptable range. If</div><div class='add'>+ * timestamp appears to be in the future, then it will be clamped to</div><div class='add'>+ * current_time().</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+vet_deleg_attrs(struct nfsd4_setattr *setattr, struct nfs4_delegation *dp)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 now = current_time(dp-&gt;dl_stid.sc_file-&gt;fi_inode);</div><div class='add'>+	struct iattr *iattr = &amp;setattr-&gt;sa_iattr;</div><div class='add'>+</div><div class='add'>+	if ((setattr-&gt;sa_bmval[2] &amp; FATTR4_WORD2_TIME_DELEG_ACCESS) &amp;&amp;</div><div class='add'>+	    !nfsd4_vet_deleg_time(&amp;iattr-&gt;ia_atime, &amp;dp-&gt;dl_atime, &amp;now))</div><div class='add'>+		iattr-&gt;ia_valid &amp;= ~(ATTR_ATIME | ATTR_ATIME_SET);</div><div class='add'>+</div><div class='add'>+	if (setattr-&gt;sa_bmval[2] &amp; FATTR4_WORD2_TIME_DELEG_MODIFY) {</div><div class='add'>+		if (nfsd4_vet_deleg_time(&amp;iattr-&gt;ia_mtime, &amp;dp-&gt;dl_mtime, &amp;now)) {</div><div class='add'>+			iattr-&gt;ia_ctime = iattr-&gt;ia_mtime;</div><div class='add'>+			if (nfsd4_vet_deleg_time(&amp;iattr-&gt;ia_ctime, &amp;dp-&gt;dl_ctime, &amp;now))</div><div class='add'>+				dp-&gt;dl_setattr = true;</div><div class='add'>+			else</div><div class='add'>+				iattr-&gt;ia_valid &amp;= ~(ATTR_CTIME | ATTR_CTIME_SET);</div><div class='add'>+		} else {</div><div class='add'>+			iattr-&gt;ia_valid &amp;= ~(ATTR_CTIME | ATTR_CTIME_SET |</div><div class='add'>+					     ATTR_MTIME | ATTR_MTIME_SET);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	      union nfsd4_op_u *u)</div><div class='hunk'>@@ -1141,17 +1168,45 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		.na_iattr	= &amp;setattr-&gt;sa_iattr,</div><div class='ctx'> 		.na_seclabel	= &amp;setattr-&gt;sa_label,</div><div class='ctx'> 	};</div><div class='add'>+	bool save_no_wcc, deleg_attrs;</div><div class='add'>+	struct nfs4_stid *st = NULL;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	__be32 status = nfs_ok;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (setattr-&gt;sa_iattr.ia_valid &amp; ATTR_SIZE) {</div><div class='add'>+	deleg_attrs = setattr-&gt;sa_bmval[2] &amp; (FATTR4_WORD2_TIME_DELEG_ACCESS |</div><div class='add'>+					      FATTR4_WORD2_TIME_DELEG_MODIFY);</div><div class='add'>+</div><div class='add'>+	if (deleg_attrs || (setattr-&gt;sa_iattr.ia_valid &amp; ATTR_SIZE)) {</div><div class='add'>+		int flags = WR_STATE;</div><div class='add'>+</div><div class='add'>+		if (setattr-&gt;sa_bmval[2] &amp; FATTR4_WORD2_TIME_DELEG_ACCESS)</div><div class='add'>+			flags |= RD_STATE;</div><div class='add'>+</div><div class='ctx'> 		status = nfs4_preprocess_stateid_op(rqstp, cstate,</div><div class='ctx'> 				&amp;cstate-&gt;current_fh, &amp;setattr-&gt;sa_stateid,</div><div class='del'>-				WR_STATE, NULL, NULL);</div><div class='add'>+				flags, NULL, &amp;st);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			return status;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (deleg_attrs) {</div><div class='add'>+		status = nfserr_bad_stateid;</div><div class='add'>+		if (st-&gt;sc_type &amp; SC_TYPE_DELEG) {</div><div class='add'>+			struct nfs4_delegation *dp = delegstateid(st);</div><div class='add'>+</div><div class='add'>+			/* Only for *_ATTRS_DELEG flavors */</div><div class='add'>+			if (deleg_attrs_deleg(dp-&gt;dl_type)) {</div><div class='add'>+				vet_deleg_attrs(setattr, dp);</div><div class='add'>+				status = nfs_ok;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (st)</div><div class='add'>+		nfs4_put_stid(st);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='ctx'> 	err = fh_want_write(&amp;cstate-&gt;current_fh);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return nfserrno(err);</div><div class='hunk'>@@ -1168,8 +1223,10 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='del'>-	status = nfsd_setattr(rqstp, &amp;cstate-&gt;current_fh, &amp;attrs,</div><div class='del'>-				0, (time64_t)0);</div><div class='add'>+	save_no_wcc = cstate-&gt;current_fh.fh_no_wcc;</div><div class='add'>+	cstate-&gt;current_fh.fh_no_wcc = true;</div><div class='add'>+	status = nfsd_setattr(rqstp, &amp;cstate-&gt;current_fh, &amp;attrs, NULL);</div><div class='add'>+	cstate-&gt;current_fh.fh_no_wcc = save_no_wcc;</div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		status = nfserrno(attrs.na_labelerr);</div><div class='ctx'> 	if (!status)</div><div class='hunk'>@@ -1180,16 +1237,29 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nfsd4_file_mark_deleg_written(struct nfs4_file *fi)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;fi-&gt;fi_lock);</div><div class='add'>+	if (!list_empty(&amp;fi-&gt;fi_delegations)) {</div><div class='add'>+		struct nfs4_delegation *dp = list_first_entry(&amp;fi-&gt;fi_delegations,</div><div class='add'>+							      struct nfs4_delegation, dl_perfile);</div><div class='add'>+</div><div class='add'>+		if (dp-&gt;dl_type == OPEN_DELEGATE_WRITE_ATTRS_DELEG)</div><div class='add'>+			dp-&gt;dl_written = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fi-&gt;fi_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	    union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_write *write = &amp;u-&gt;write;</div><div class='ctx'> 	stateid_t *stateid = &amp;write-&gt;wr_stateid;</div><div class='add'>+	struct nfs4_stid *stid = NULL;</div><div class='ctx'> 	struct nfsd_file *nf = NULL;</div><div class='ctx'> 	__be32 status = nfs_ok;</div><div class='ctx'> 	unsigned long cnt;</div><div class='del'>-	int nvecs;</div><div class='ctx'> </div><div class='ctx'> 	if (write-&gt;wr_offset &gt; (u64)OFFSET_MAX ||</div><div class='ctx'> 	    write-&gt;wr_offset + write-&gt;wr_buflen &gt; (u64)OFFSET_MAX)</div><div class='hunk'>@@ -1199,18 +1269,19 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	trace_nfsd_write_start(rqstp, &amp;cstate-&gt;current_fh,</div><div class='ctx'> 			       write-&gt;wr_offset, cnt);</div><div class='ctx'> 	status = nfs4_preprocess_stateid_op(rqstp, cstate, &amp;cstate-&gt;current_fh,</div><div class='del'>-						stateid, WR_STATE, &amp;nf, NULL);</div><div class='add'>+						stateid, WR_STATE, &amp;nf, &amp;stid);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	write-&gt;wr_how_written = write-&gt;wr_stable_how;</div><div class='del'>-</div><div class='del'>-	nvecs = svc_fill_write_vector(rqstp, &amp;write-&gt;wr_payload);</div><div class='del'>-	WARN_ON_ONCE(nvecs &gt; ARRAY_SIZE(rqstp-&gt;rq_vec));</div><div class='add'>+	if (stid) {</div><div class='add'>+		nfsd4_file_mark_deleg_written(stid-&gt;sc_file);</div><div class='add'>+		nfs4_put_stid(stid);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	write-&gt;wr_how_written = write-&gt;wr_stable_how;</div><div class='ctx'> 	status = nfsd_vfs_write(rqstp, &amp;cstate-&gt;current_fh, nf,</div><div class='del'>-				write-&gt;wr_offset, rqstp-&gt;rq_vec, nvecs, &amp;cnt,</div><div class='del'>-				write-&gt;wr_how_written,</div><div class='add'>+				write-&gt;wr_offset, &amp;write-&gt;wr_payload,</div><div class='add'>+				&amp;cnt, write-&gt;wr_how_written,</div><div class='ctx'> 				(__be32 *)write-&gt;wr_verifier.data);</div><div class='ctx'> 	nfsd_file_put(nf);</div><div class='ctx'> </div><div class='hunk'>@@ -1281,6 +1352,71 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nfsd4_has_active_async_copies - Check for ongoing copy operations</div><div class='add'>+ * @clp: Client to be checked</div><div class='add'>+ *</div><div class='add'>+ * NFSD maintains state for async COPY operations after they complete,</div><div class='add'>+ * and this state remains in the nfs4_client's async_copies list.</div><div class='add'>+ * Ongoing copies should block the destruction of the nfs4_client, but</div><div class='add'>+ * completed copies should not.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %true: At least one active async COPY is ongoing</div><div class='add'>+ *   %false: No active async COPY operations were found</div><div class='add'>+ */</div><div class='add'>+bool nfsd4_has_active_async_copies(struct nfs4_client *clp)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_copy *copy;</div><div class='add'>+	bool result = false;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;clp-&gt;async_lock);</div><div class='add'>+	list_for_each_entry(copy, &amp;clp-&gt;async_copies, copies) {</div><div class='add'>+		if (!test_bit(NFSD4_COPY_F_COMPLETED, &amp;copy-&gt;cp_flags) &amp;&amp;</div><div class='add'>+		    !test_bit(NFSD4_COPY_F_STOPPED, &amp;copy-&gt;cp_flags)) {</div><div class='add'>+			result = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;clp-&gt;async_lock);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd4_async_copy_reaper - Purge completed copies</div><div class='add'>+ * @nn: Network namespace with possible active copy information</div><div class='add'>+ */</div><div class='add'>+void nfsd4_async_copy_reaper(struct nfsd_net *nn)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_client *clp;</div><div class='add'>+	struct nfsd4_copy *copy;</div><div class='add'>+	LIST_HEAD(reaplist);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nn-&gt;client_lock);</div><div class='add'>+	list_for_each_entry(clp, &amp;nn-&gt;client_lru, cl_lru) {</div><div class='add'>+		struct list_head *pos, *next;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;clp-&gt;async_lock);</div><div class='add'>+		list_for_each_safe(pos, next, &amp;clp-&gt;async_copies) {</div><div class='add'>+			copy = list_entry(pos, struct nfsd4_copy, copies);</div><div class='add'>+			if (test_bit(NFSD4_COPY_F_OFFLOAD_DONE, &amp;copy-&gt;cp_flags)) {</div><div class='add'>+				if (--copy-&gt;cp_ttl) {</div><div class='add'>+					list_del_init(&amp;copy-&gt;copies);</div><div class='add'>+					list_add(&amp;copy-&gt;copies, &amp;reaplist);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;clp-&gt;async_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;reaplist)) {</div><div class='add'>+		copy = list_first_entry(&amp;reaplist, struct nfsd4_copy, copies);</div><div class='add'>+		list_del_init(&amp;copy-&gt;copies);</div><div class='add'>+		cleanup_async_copy(copy);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nfs4_put_copy(struct nfsd4_copy *copy)</div><div class='ctx'> {</div><div class='ctx'> 	if (!refcount_dec_and_test(&amp;copy-&gt;refcount))</div><div class='hunk'>@@ -1291,12 +1427,16 @@ static void nfs4_put_copy(struct nfsd4_copy *copy)</div><div class='ctx'> </div><div class='ctx'> static void nfsd4_stop_copy(struct nfsd4_copy *copy)</div><div class='ctx'> {</div><div class='del'>-	if (!test_and_set_bit(NFSD4_COPY_F_STOPPED, &amp;copy-&gt;cp_flags))</div><div class='add'>+	trace_nfsd_copy_async_cancel(copy);</div><div class='add'>+	if (!test_and_set_bit(NFSD4_COPY_F_STOPPED, &amp;copy-&gt;cp_flags)) {</div><div class='ctx'> 		kthread_stop(copy-&gt;copy_task);</div><div class='add'>+		copy-&gt;nfserr = nfs_ok;</div><div class='add'>+		set_bit(NFSD4_COPY_F_COMPLETED, &amp;copy-&gt;cp_flags);</div><div class='add'>+	}</div><div class='ctx'> 	nfs4_put_copy(copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nfsd4_copy *nfsd4_get_copy(struct nfs4_client *clp)</div><div class='add'>+static struct nfsd4_copy *nfsd4_unhash_copy(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_copy *copy = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1305,6 +1445,9 @@ static struct nfsd4_copy *nfsd4_get_copy(struct nfs4_client *clp)</div><div class='ctx'> 		copy = list_first_entry(&amp;clp-&gt;async_copies, struct nfsd4_copy,</div><div class='ctx'> 					copies);</div><div class='ctx'> 		refcount_inc(&amp;copy-&gt;refcount);</div><div class='add'>+		copy-&gt;cp_clp = NULL;</div><div class='add'>+		if (!list_empty(&amp;copy-&gt;copies))</div><div class='add'>+			list_del_init(&amp;copy-&gt;copies);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;async_lock);</div><div class='ctx'> 	return copy;</div><div class='hunk'>@@ -1314,7 +1457,7 @@ void nfsd4_shutdown_copy(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_copy *copy;</div><div class='ctx'> </div><div class='del'>-	while ((copy = nfsd4_get_copy(clp)) != NULL)</div><div class='add'>+	while ((copy = nfsd4_unhash_copy(clp)) != NULL)</div><div class='ctx'> 		nfsd4_stop_copy(copy);</div><div class='ctx'> }</div><div class='ctx'> #ifdef CONFIG_NFSD_V4_2_INTER_SSC</div><div class='hunk'>@@ -1373,7 +1516,7 @@ try_again:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (work) {</div><div class='del'>-		strscpy(work-&gt;nsui_ipaddr, ipaddr, sizeof(work-&gt;nsui_ipaddr) - 1);</div><div class='add'>+		strscpy(work-&gt;nsui_ipaddr, ipaddr, sizeof(work-&gt;nsui_ipaddr));</div><div class='ctx'> 		refcount_set(&amp;work-&gt;nsui_refcnt, 2);</div><div class='ctx'> 		work-&gt;nsui_busy = true;</div><div class='ctx'> 		list_add_tail(&amp;work-&gt;nsui_list, &amp;nn-&gt;nfsd_ssc_mount_list);</div><div class='hunk'>@@ -1602,8 +1745,10 @@ static void nfsd4_cb_offload_release(struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_cb_offload *cbo =</div><div class='ctx'> 		container_of(cb, struct nfsd4_cb_offload, co_cb);</div><div class='add'>+	struct nfsd4_copy *copy =</div><div class='add'>+		container_of(cbo, struct nfsd4_copy, cp_cb_offload);</div><div class='ctx'> </div><div class='del'>-	kfree(cbo);</div><div class='add'>+	set_bit(NFSD4_COPY_F_OFFLOAD_DONE, &amp;copy-&gt;cp_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfsd4_cb_offload_done(struct nfsd4_callback *cb,</div><div class='hunk'>@@ -1613,12 +1758,21 @@ static int nfsd4_cb_offload_done(struct nfsd4_callback *cb,</div><div class='ctx'> 		container_of(cb, struct nfsd4_cb_offload, co_cb);</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_cb_offload_done(&amp;cbo-&gt;co_res.cb_stateid, task);</div><div class='add'>+	switch (task-&gt;tk_status) {</div><div class='add'>+	case -NFS4ERR_DELAY:</div><div class='add'>+		if (cbo-&gt;co_retries--) {</div><div class='add'>+			rpc_delay(task, HZ / 5);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	nfsd41_cb_destroy_referring_call_list(cb);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nfsd4_callback_ops nfsd4_cb_offload_ops = {</div><div class='ctx'> 	.release = nfsd4_cb_offload_release,</div><div class='del'>-	.done = nfsd4_cb_offload_done</div><div class='add'>+	.done = nfsd4_cb_offload_done,</div><div class='add'>+	.opcode = OP_CB_OFFLOAD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nfsd4_init_copy_res(struct nfsd4_copy *copy, bool sync)</div><div class='hunk'>@@ -1627,7 +1781,6 @@ static void nfsd4_init_copy_res(struct nfsd4_copy *copy, bool sync)</div><div class='ctx'> 		test_bit(NFSD4_COPY_F_COMMITTED, &amp;copy-&gt;cp_flags) ?</div><div class='ctx'> 			NFS_FILE_SYNC : NFS_UNSTABLE;</div><div class='ctx'> 	nfsd4_copy_set_sync(copy, sync);</div><div class='del'>-	gen_boot_verifier(&amp;copy-&gt;cp_res.wr_verifier, copy-&gt;cp_clp-&gt;net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t _nfsd_copy_file_range(struct nfsd4_copy *copy,</div><div class='hunk'>@@ -1734,23 +1887,23 @@ static void cleanup_async_copy(struct nfsd4_copy *copy)</div><div class='ctx'> 	nfs4_put_copy(copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfsd4_send_cb_offload(struct nfsd4_copy *copy, __be32 nfserr)</div><div class='add'>+static void nfsd4_send_cb_offload(struct nfsd4_copy *copy)</div><div class='ctx'> {</div><div class='del'>-	struct nfsd4_cb_offload *cbo;</div><div class='del'>-</div><div class='del'>-	cbo = kzalloc(sizeof(*cbo), GFP_KERNEL);</div><div class='del'>-	if (!cbo)</div><div class='del'>-		return;</div><div class='add'>+	struct nfsd4_cb_offload *cbo = &amp;copy-&gt;cp_cb_offload;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;cbo-&gt;co_res, &amp;copy-&gt;cp_res, sizeof(copy-&gt;cp_res));</div><div class='ctx'> 	memcpy(&amp;cbo-&gt;co_fh, &amp;copy-&gt;fh, sizeof(copy-&gt;fh));</div><div class='del'>-	cbo-&gt;co_nfserr = nfserr;</div><div class='add'>+	cbo-&gt;co_nfserr = copy-&gt;nfserr;</div><div class='add'>+	cbo-&gt;co_retries = 5;</div><div class='ctx'> </div><div class='ctx'> 	nfsd4_init_cb(&amp;cbo-&gt;co_cb, copy-&gt;cp_clp, &amp;nfsd4_cb_offload_ops,</div><div class='ctx'> 		      NFSPROC4_CLNT_CB_OFFLOAD);</div><div class='add'>+	nfsd41_cb_referring_call(&amp;cbo-&gt;co_cb, &amp;cbo-&gt;co_referring_sessionid,</div><div class='add'>+				 cbo-&gt;co_referring_slotid,</div><div class='add'>+				 cbo-&gt;co_referring_seqno);</div><div class='ctx'> 	trace_nfsd_cb_offload(copy-&gt;cp_clp, &amp;cbo-&gt;co_res.cb_stateid,</div><div class='del'>-			      &amp;cbo-&gt;co_fh, copy-&gt;cp_count, nfserr);</div><div class='del'>-	nfsd4_run_cb(&amp;cbo-&gt;co_cb);</div><div class='add'>+			      &amp;cbo-&gt;co_fh, copy-&gt;cp_count, copy-&gt;nfserr);</div><div class='add'>+	nfsd4_try_run_cb(&amp;cbo-&gt;co_cb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1763,9 +1916,8 @@ static void nfsd4_send_cb_offload(struct nfsd4_copy *copy, __be32 nfserr)</div><div class='ctx'> static int nfsd4_do_async_copy(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_copy *copy = (struct nfsd4_copy *)data;</div><div class='del'>-	__be32 nfserr;</div><div class='ctx'> </div><div class='del'>-	trace_nfsd_copy_do_async(copy);</div><div class='add'>+	trace_nfsd_copy_async(copy);</div><div class='ctx'> 	if (nfsd4_ssc_is_inter(copy)) {</div><div class='ctx'> 		struct file *filp;</div><div class='ctx'> </div><div class='hunk'>@@ -1774,25 +1926,31 @@ static int nfsd4_do_async_copy(void *data)</div><div class='ctx'> 		if (IS_ERR(filp)) {</div><div class='ctx'> 			switch (PTR_ERR(filp)) {</div><div class='ctx'> 			case -EBADF:</div><div class='del'>-				nfserr = nfserr_wrong_type;</div><div class='add'>+				copy-&gt;nfserr = nfserr_wrong_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				nfserr = nfserr_offload_denied;</div><div class='add'>+				copy-&gt;nfserr = nfserr_offload_denied;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* ss_mnt will be unmounted by the laundromat */</div><div class='ctx'> 			goto do_callback;</div><div class='ctx'> 		}</div><div class='del'>-		nfserr = nfsd4_do_copy(copy, filp, copy-&gt;nf_dst-&gt;nf_file,</div><div class='del'>-				       false);</div><div class='add'>+		copy-&gt;nfserr = nfsd4_do_copy(copy, filp, copy-&gt;nf_dst-&gt;nf_file,</div><div class='add'>+					     false);</div><div class='ctx'> 		nfsd4_cleanup_inter_ssc(copy-&gt;ss_nsui, filp, copy-&gt;nf_dst);</div><div class='ctx'> 	} else {</div><div class='del'>-		nfserr = nfsd4_do_copy(copy, copy-&gt;nf_src-&gt;nf_file,</div><div class='del'>-				       copy-&gt;nf_dst-&gt;nf_file, false);</div><div class='add'>+		copy-&gt;nfserr = nfsd4_do_copy(copy, copy-&gt;nf_src-&gt;nf_file,</div><div class='add'>+					     copy-&gt;nf_dst-&gt;nf_file, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> do_callback:</div><div class='del'>-	nfsd4_send_cb_offload(copy, nfserr);</div><div class='del'>-	cleanup_async_copy(copy);</div><div class='add'>+	/* The kthread exits forthwith. Ensure that a subsequent</div><div class='add'>+	 * OFFLOAD_CANCEL won't try to kill it again. */</div><div class='add'>+	set_bit(NFSD4_COPY_F_STOPPED, &amp;copy-&gt;cp_flags);</div><div class='add'>+</div><div class='add'>+	set_bit(NFSD4_COPY_F_COMPLETED, &amp;copy-&gt;cp_flags);</div><div class='add'>+	trace_nfsd_copy_async_done(copy);</div><div class='add'>+	nfsd4_send_cb_offload(copy);</div><div class='add'>+	atomic_dec(&amp;copy-&gt;cp_nn-&gt;pending_async_copies);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1800,9 +1958,14 @@ static __be32</div><div class='ctx'> nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='add'>+	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='add'>+	struct nfsd4_copy *async_copy = NULL;</div><div class='ctx'> 	struct nfsd4_copy *copy = &amp;u-&gt;copy;</div><div class='add'>+	struct nfsd42_write_res *result;</div><div class='ctx'> 	__be32 status;</div><div class='del'>-	struct nfsd4_copy *async_copy = NULL;</div><div class='add'>+</div><div class='add'>+	result = &amp;copy-&gt;cp_res;</div><div class='add'>+	nfsd_copy_write_verifier((__be32 *)&amp;result-&gt;wr_verifier.data, nn);</div><div class='ctx'> </div><div class='ctx'> 	copy-&gt;cp_clp = cstate-&gt;clp;</div><div class='ctx'> 	if (nfsd4_ssc_is_inter(copy)) {</div><div class='hunk'>@@ -1828,26 +1991,34 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	memcpy(&amp;copy-&gt;fh, &amp;cstate-&gt;current_fh.fh_handle,</div><div class='ctx'> 		sizeof(struct knfsd_fh));</div><div class='ctx'> 	if (nfsd4_copy_is_async(copy)) {</div><div class='del'>-		struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='del'>-</div><div class='del'>-		status = nfserrno(-ENOMEM);</div><div class='ctx'> 		async_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL);</div><div class='ctx'> 		if (!async_copy)</div><div class='ctx'> 			goto out_err;</div><div class='add'>+		async_copy-&gt;cp_nn = nn;</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;async_copy-&gt;copies);</div><div class='ctx'> 		refcount_set(&amp;async_copy-&gt;refcount, 1);</div><div class='add'>+		async_copy-&gt;cp_ttl = NFSD_COPY_INITIAL_TTL;</div><div class='add'>+		/* Arbitrary cap on number of pending async copy operations */</div><div class='add'>+		if (atomic_inc_return(&amp;nn-&gt;pending_async_copies) &gt;</div><div class='add'>+				(int)rqstp-&gt;rq_pool-&gt;sp_nrthreads)</div><div class='add'>+			goto out_dec_async_copy_err;</div><div class='ctx'> 		async_copy-&gt;cp_src = kmalloc(sizeof(*async_copy-&gt;cp_src), GFP_KERNEL);</div><div class='ctx'> 		if (!async_copy-&gt;cp_src)</div><div class='del'>-			goto out_err;</div><div class='add'>+			goto out_dec_async_copy_err;</div><div class='ctx'> 		if (!nfs4_init_copy_state(nn, copy))</div><div class='del'>-			goto out_err;</div><div class='del'>-		memcpy(&amp;copy-&gt;cp_res.cb_stateid, &amp;copy-&gt;cp_stateid.cs_stid,</div><div class='del'>-			sizeof(copy-&gt;cp_res.cb_stateid));</div><div class='add'>+			goto out_dec_async_copy_err;</div><div class='add'>+		memcpy(&amp;result-&gt;cb_stateid, &amp;copy-&gt;cp_stateid.cs_stid,</div><div class='add'>+			sizeof(result-&gt;cb_stateid));</div><div class='ctx'> 		dup_copy_fields(copy, async_copy);</div><div class='add'>+		memcpy(async_copy-&gt;cp_cb_offload.co_referring_sessionid.data,</div><div class='add'>+		       cstate-&gt;session-&gt;se_sessionid.data,</div><div class='add'>+		       NFS4_MAX_SESSIONID_LEN);</div><div class='add'>+		async_copy-&gt;cp_cb_offload.co_referring_slotid = cstate-&gt;slot-&gt;sl_index;</div><div class='add'>+		async_copy-&gt;cp_cb_offload.co_referring_seqno = cstate-&gt;slot-&gt;sl_seqid;</div><div class='ctx'> 		async_copy-&gt;copy_task = kthread_create(nfsd4_do_async_copy,</div><div class='ctx'> 				async_copy, "%s", "copy thread");</div><div class='ctx'> 		if (IS_ERR(async_copy-&gt;copy_task))</div><div class='del'>-			goto out_err;</div><div class='add'>+			goto out_dec_async_copy_err;</div><div class='ctx'> 		spin_lock(&amp;async_copy-&gt;cp_clp-&gt;async_lock);</div><div class='ctx'> 		list_add(&amp;async_copy-&gt;copies,</div><div class='ctx'> 				&amp;async_copy-&gt;cp_clp-&gt;async_copies);</div><div class='hunk'>@@ -1862,6 +2033,9 @@ out:</div><div class='ctx'> 	trace_nfsd_copy_done(copy, status);</div><div class='ctx'> 	release_copy_files(copy);</div><div class='ctx'> 	return status;</div><div class='add'>+out_dec_async_copy_err:</div><div class='add'>+	if (async_copy)</div><div class='add'>+		atomic_dec(&amp;nn-&gt;pending_async_copies);</div><div class='ctx'> out_err:</div><div class='ctx'> 	if (nfsd4_ssc_is_inter(copy)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1873,7 +2047,7 @@ out_err:</div><div class='ctx'> 	}</div><div class='ctx'> 	if (async_copy)</div><div class='ctx'> 		cleanup_async_copy(async_copy);</div><div class='del'>-	status = nfserrno(-ENOMEM);</div><div class='add'>+	status = nfserr_jukebox;</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1932,7 +2106,7 @@ nfsd4_copy_notify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	struct nfsd4_copy_notify *cn = &amp;u-&gt;copy_notify;</div><div class='ctx'> 	__be32 status;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='del'>-	struct nfs4_stid *stid;</div><div class='add'>+	struct nfs4_stid *stid = NULL;</div><div class='ctx'> 	struct nfs4_cpntf_state *cps;</div><div class='ctx'> 	struct nfs4_client *clp = cstate-&gt;clp;</div><div class='ctx'> </div><div class='hunk'>@@ -1941,6 +2115,8 @@ nfsd4_copy_notify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 					&amp;stid);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='add'>+	if (!stid)</div><div class='add'>+		return nfserr_bad_stateid;</div><div class='ctx'> </div><div class='ctx'> 	cn-&gt;cpn_lease_time.tv_sec = nn-&gt;nfsd4_lease;</div><div class='ctx'> 	cn-&gt;cpn_lease_time.tv_nsec = 0;</div><div class='hunk'>@@ -2000,11 +2176,16 @@ nfsd4_offload_status(struct svc_rqst *rqstp,</div><div class='ctx'> 	struct nfsd4_copy *copy;</div><div class='ctx'> 	struct nfs4_client *clp = cstate-&gt;clp;</div><div class='ctx'> </div><div class='add'>+	os-&gt;completed = false;</div><div class='ctx'> 	spin_lock(&amp;clp-&gt;async_lock);</div><div class='ctx'> 	copy = find_async_copy_locked(clp, &amp;os-&gt;stateid);</div><div class='del'>-	if (copy)</div><div class='add'>+	if (copy) {</div><div class='ctx'> 		os-&gt;count = copy-&gt;cp_res.wr_bytes_written;</div><div class='del'>-	else</div><div class='add'>+		if (test_bit(NFSD4_COPY_F_COMPLETED, &amp;copy-&gt;cp_flags)) {</div><div class='add'>+			os-&gt;completed = true;</div><div class='add'>+			os-&gt;status = copy-&gt;nfserr;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='ctx'> 		status = nfserr_bad_stateid;</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;async_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2151,6 +2332,49 @@ nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	return status == nfserr_same ? nfs_ok : status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32</div><div class='add'>+nfsd4_get_dir_delegation(struct svc_rqst *rqstp,</div><div class='add'>+			 struct nfsd4_compound_state *cstate,</div><div class='add'>+			 union nfsd4_op_u *u)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_get_dir_delegation *gdd = &amp;u-&gt;get_dir_delegation;</div><div class='add'>+	struct nfs4_delegation *dd;</div><div class='add'>+	struct nfsd_file *nf;</div><div class='add'>+	__be32 status;</div><div class='add'>+</div><div class='add'>+	status = nfsd_file_acquire_dir(rqstp, &amp;cstate-&gt;current_fh, &amp;nf);</div><div class='add'>+	if (status != nfs_ok)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RFC 8881, section 18.39.3 says:</div><div class='add'>+	 *</div><div class='add'>+	 * "The server may refuse to grant the delegation. In that case, the</div><div class='add'>+	 *  server will return NFS4ERR_DIRDELEG_UNAVAIL."</div><div class='add'>+	 *</div><div class='add'>+	 * This is sub-optimal, since it means that the server would need to</div><div class='add'>+	 * abort compound processing just because the delegation wasn't</div><div class='add'>+	 * available. RFC8881bis should change this to allow the server to</div><div class='add'>+	 * return NFS4_OK with a non-fatal status of GDD4_UNAVAIL in this</div><div class='add'>+	 * situation.</div><div class='add'>+	 */</div><div class='add'>+	dd = nfsd_get_dir_deleg(cstate, gdd, nf);</div><div class='add'>+	nfsd_file_put(nf);</div><div class='add'>+	if (IS_ERR(dd)) {</div><div class='add'>+		int err = PTR_ERR(dd);</div><div class='add'>+</div><div class='add'>+		if (err != -EAGAIN)</div><div class='add'>+			return nfserrno(err);</div><div class='add'>+		gdd-&gt;gddrnf_status = GDD4_UNAVAIL;</div><div class='add'>+		return nfs_ok;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gdd-&gt;gddrnf_status = GDD4_OK;</div><div class='add'>+	memcpy(&amp;gdd-&gt;gddr_stateid, &amp;dd-&gt;dl_stid.sc_stateid, sizeof(gdd-&gt;gddr_stateid));</div><div class='add'>+	nfs4_put_stid(&amp;dd-&gt;dl_stid);</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> static const struct nfsd4_layout_ops *</div><div class='ctx'> nfsd4_layout_verify(struct svc_export *exp, unsigned int layout_type)</div><div class='hunk'>@@ -2193,7 +2417,9 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp,</div><div class='ctx'> 		return nfserr_noent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	exp = rqst_exp_find(rqstp, map-&gt;fsid_type, map-&gt;fsid);</div><div class='add'>+	exp = rqst_exp_find(&amp;rqstp-&gt;rq_chandle, SVC_NET(rqstp),</div><div class='add'>+			    rqstp-&gt;rq_client, rqstp-&gt;rq_gssclient,</div><div class='add'>+			    map-&gt;fsid_type, map-&gt;fsid);</div><div class='ctx'> 	if (IS_ERR(exp)) {</div><div class='ctx'> 		dprintk("%s: could not find device id\n", __func__);</div><div class='ctx'> 		return nfserr_noent;</div><div class='hunk'>@@ -2231,7 +2457,7 @@ nfsd4_layoutget(struct svc_rqst *rqstp,</div><div class='ctx'> 	const struct nfsd4_layout_ops *ops;</div><div class='ctx'> 	struct nfs4_layout_stateid *ls;</div><div class='ctx'> 	__be32 nfserr;</div><div class='del'>-	int accmode = NFSD_MAY_READ_IF_EXEC;</div><div class='add'>+	int accmode = NFSD_MAY_READ_IF_EXEC | NFSD_MAY_OWNER_OVERRIDE;</div><div class='ctx'> </div><div class='ctx'> 	switch (lgp-&gt;lg_seg.iomode) {</div><div class='ctx'> 	case IOMODE_READ:</div><div class='hunk'>@@ -2288,7 +2514,7 @@ nfsd4_layoutget(struct svc_rqst *rqstp,</div><div class='ctx'> 	if (atomic_read(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lo_recalls))</div><div class='ctx'> 		goto out_put_stid;</div><div class='ctx'> </div><div class='del'>-	nfserr = ops-&gt;proc_layoutget(d_inode(current_fh-&gt;fh_dentry),</div><div class='add'>+	nfserr = ops-&gt;proc_layoutget(rqstp, d_inode(current_fh-&gt;fh_dentry),</div><div class='ctx'> 				     current_fh, lgp);</div><div class='ctx'> 	if (nfserr)</div><div class='ctx'> 		goto out_put_stid;</div><div class='hunk'>@@ -2312,16 +2538,17 @@ static __be32</div><div class='ctx'> nfsd4_layoutcommit(struct svc_rqst *rqstp,</div><div class='ctx'> 		struct nfsd4_compound_state *cstate, union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = SVC_NET(rqstp);</div><div class='ctx'> 	struct nfsd4_layoutcommit *lcp = &amp;u-&gt;layoutcommit;</div><div class='ctx'> 	const struct nfsd4_layout_seg *seg = &amp;lcp-&gt;lc_seg;</div><div class='ctx'> 	struct svc_fh *current_fh = &amp;cstate-&gt;current_fh;</div><div class='ctx'> 	const struct nfsd4_layout_ops *ops;</div><div class='del'>-	loff_t new_size = lcp-&gt;lc_last_wr + 1;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct nfs4_layout_stateid *ls;</div><div class='ctx'> 	__be32 nfserr;</div><div class='ctx'> </div><div class='del'>-	nfserr = fh_verify(rqstp, current_fh, 0, NFSD_MAY_WRITE);</div><div class='add'>+	nfserr = fh_verify(rqstp, current_fh, 0,</div><div class='add'>+			   NFSD_MAY_WRITE | NFSD_MAY_OWNER_OVERRIDE);</div><div class='ctx'> 	if (nfserr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2331,43 +2558,50 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	inode = d_inode(current_fh-&gt;fh_dentry);</div><div class='ctx'> </div><div class='del'>-	nfserr = nfserr_inval;</div><div class='del'>-	if (new_size &lt;= seg-&gt;offset) {</div><div class='del'>-		dprintk("pnfsd: last write before layout segment\n");</div><div class='del'>-		goto out;</div><div class='add'>+	lcp-&gt;lc_size_chg = false;</div><div class='add'>+	if (lcp-&gt;lc_newoffset) {</div><div class='add'>+		loff_t new_size = lcp-&gt;lc_last_wr + 1;</div><div class='add'>+</div><div class='add'>+		nfserr = nfserr_inval;</div><div class='add'>+		if (new_size &lt;= seg-&gt;offset)</div><div class='add'>+			goto out;</div><div class='add'>+		if (new_size &gt; seg-&gt;offset + seg-&gt;length)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (new_size &gt; i_size_read(inode)) {</div><div class='add'>+			lcp-&gt;lc_size_chg = true;</div><div class='add'>+			lcp-&gt;lc_newsize = new_size;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (new_size &gt; seg-&gt;offset + seg-&gt;length) {</div><div class='del'>-		dprintk("pnfsd: last write beyond layout segment\n");</div><div class='add'>+</div><div class='add'>+	nfserr = nfserr_grace;</div><div class='add'>+	if (locks_in_grace(net) &amp;&amp; !lcp-&gt;lc_reclaim)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (!lcp-&gt;lc_newoffset &amp;&amp; new_size &gt; i_size_read(inode)) {</div><div class='del'>-		dprintk("pnfsd: layoutcommit beyond EOF\n");</div><div class='add'>+	nfserr = nfserr_no_grace;</div><div class='add'>+	if (!locks_in_grace(net) &amp;&amp; lcp-&gt;lc_reclaim)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	nfserr = nfsd4_preprocess_layout_stateid(rqstp, cstate, &amp;lcp-&gt;lc_sid,</div><div class='del'>-						false, lcp-&gt;lc_layout_type,</div><div class='del'>-						&amp;ls);</div><div class='del'>-	if (nfserr) {</div><div class='del'>-		trace_nfsd_layout_commit_lookup_fail(&amp;lcp-&gt;lc_sid);</div><div class='del'>-		/* fixup error code as per RFC5661 */</div><div class='del'>-		if (nfserr == nfserr_bad_stateid)</div><div class='del'>-			nfserr = nfserr_badlayout;</div><div class='del'>-		goto out;</div><div class='add'>+	if (!lcp-&gt;lc_reclaim) {</div><div class='add'>+		nfserr = nfsd4_preprocess_layout_stateid(rqstp, cstate,</div><div class='add'>+				&amp;lcp-&gt;lc_sid, false, lcp-&gt;lc_layout_type, &amp;ls);</div><div class='add'>+		if (nfserr) {</div><div class='add'>+			trace_nfsd_layout_commit_lookup_fail(&amp;lcp-&gt;lc_sid);</div><div class='add'>+			/* fixup error code as per RFC5661 */</div><div class='add'>+			if (nfserr == nfserr_bad_stateid)</div><div class='add'>+				nfserr = nfserr_badlayout;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* LAYOUTCOMMIT does not require any serialization */</div><div class='add'>+		mutex_unlock(&amp;ls-&gt;ls_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* LAYOUTCOMMIT does not require any serialization */</div><div class='del'>-	mutex_unlock(&amp;ls-&gt;ls_mutex);</div><div class='add'>+	nfserr = ops-&gt;proc_layoutcommit(inode, rqstp, lcp);</div><div class='ctx'> </div><div class='del'>-	if (new_size &gt; i_size_read(inode)) {</div><div class='del'>-		lcp-&gt;lc_size_chg = true;</div><div class='del'>-		lcp-&gt;lc_newsize = new_size;</div><div class='del'>-	} else {</div><div class='del'>-		lcp-&gt;lc_size_chg = false;</div><div class='add'>+	if (!lcp-&gt;lc_reclaim) {</div><div class='add'>+		nfsd4_file_mark_deleg_written(ls-&gt;ls_stid.sc_file);</div><div class='add'>+		nfs4_put_stid(&amp;ls-&gt;ls_stid);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	nfserr = ops-&gt;proc_layoutcommit(inode, lcp);</div><div class='del'>-	nfs4_put_stid(&amp;ls-&gt;ls_stid);</div><div class='ctx'> out:</div><div class='ctx'> 	return nfserr;</div><div class='ctx'> }</div><div class='hunk'>@@ -2490,10 +2724,10 @@ nfsd4_proc_null(struct svc_rqst *rqstp)</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nfsd4_increment_op_stats(u32 opnum)</div><div class='add'>+static inline void nfsd4_increment_op_stats(struct nfsd_net *nn, u32 opnum)</div><div class='ctx'> {</div><div class='ctx'> 	if (opnum &gt;= FIRST_NFS4_OP &amp;&amp; opnum &lt;= LAST_NFS4_OP)</div><div class='del'>-		percpu_counter_inc(&amp;nfsdstats.counter[NFSD_STATS_NFS4_OP(opnum)]);</div><div class='add'>+		percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_NFS4_OP(opnum)]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nfsd4_operation nfsd4_ops[];</div><div class='hunk'>@@ -2736,6 +2970,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)</div><div class='ctx'> 		if (op-&gt;opdesc-&gt;op_get_currentstateid)</div><div class='ctx'> 			op-&gt;opdesc-&gt;op_get_currentstateid(cstate, &amp;op-&gt;u);</div><div class='ctx'> 		op-&gt;status = op-&gt;opdesc-&gt;op_func(rqstp, cstate, &amp;op-&gt;u);</div><div class='add'>+		trace_nfsd_compound_op_err(rqstp, op-&gt;opnum, op-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 		/* Only from SEQUENCE */</div><div class='ctx'> 		if (cstate-&gt;status == nfserr_replay_cache) {</div><div class='hunk'>@@ -2752,7 +2987,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)</div><div class='ctx'> </div><div class='ctx'> 			if (current_fh-&gt;fh_export &amp;&amp;</div><div class='ctx'> 					need_wrongsec_check(rqstp))</div><div class='del'>-				op-&gt;status = check_nfsd_access(current_fh-&gt;fh_export, rqstp);</div><div class='add'>+				op-&gt;status = check_nfsd_access(current_fh-&gt;fh_export, rqstp, false);</div><div class='ctx'> 		}</div><div class='ctx'> encode_op:</div><div class='ctx'> 		if (op-&gt;status == nfserr_replay_me) {</div><div class='hunk'>@@ -2768,7 +3003,7 @@ encode_op:</div><div class='ctx'> 					   status, nfsd4_op_name(op-&gt;opnum));</div><div class='ctx'> </div><div class='ctx'> 		nfsd4_cstate_clear_replay(cstate);</div><div class='del'>-		nfsd4_increment_op_stats(op-&gt;opnum);</div><div class='add'>+		nfsd4_increment_op_stats(nn, op-&gt;opnum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fh_put(current_fh);</div><div class='hunk'>@@ -3079,6 +3314,18 @@ static u32 nfsd4_copy_notify_rsize(const struct svc_rqst *rqstp,</div><div class='ctx'> 		* sizeof(__be32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 nfsd4_get_dir_delegation_rsize(const struct svc_rqst *rqstp,</div><div class='add'>+					  const struct nfsd4_op *op)</div><div class='add'>+{</div><div class='add'>+	return (op_encode_hdr_size +</div><div class='add'>+		1 /* gddr_status */ +</div><div class='add'>+		op_encode_verifier_maxsz +</div><div class='add'>+		op_encode_stateid_maxsz +</div><div class='add'>+		2 /* gddr_notification */ +</div><div class='add'>+		2 /* gddr_child_attributes */ +</div><div class='add'>+		2 /* gddr_dir_attributes */);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> static u32 nfsd4_getdeviceinfo_rsize(const struct svc_rqst *rqstp,</div><div class='ctx'> 				     const struct nfsd4_op *op)</div><div class='hunk'>@@ -3396,6 +3643,7 @@ static const struct nfsd4_operation nfsd4_ops[] = {</div><div class='ctx'> 	/* NFSv4.1 operations */</div><div class='ctx'> 	[OP_EXCHANGE_ID] = {</div><div class='ctx'> 		.op_func = nfsd4_exchange_id,</div><div class='add'>+		.op_release = nfsd4_exchange_id_release,</div><div class='ctx'> 		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP</div><div class='ctx'> 				| OP_MODIFIES_SOMETHING,</div><div class='ctx'> 		.op_name = "OP_EXCHANGE_ID",</div><div class='hunk'>@@ -3467,6 +3715,12 @@ static const struct nfsd4_operation nfsd4_ops[] = {</div><div class='ctx'> 		.op_get_currentstateid = nfsd4_get_freestateid,</div><div class='ctx'> 		.op_rsize_bop = nfsd4_only_status_rsize,</div><div class='ctx'> 	},</div><div class='add'>+	[OP_GET_DIR_DELEGATION] = {</div><div class='add'>+		.op_func = nfsd4_get_dir_delegation,</div><div class='add'>+		.op_flags = OP_MODIFIES_SOMETHING,</div><div class='add'>+		.op_name = "OP_GET_DIR_DELEGATION",</div><div class='add'>+		.op_rsize_bop = nfsd4_get_dir_delegation_rsize,</div><div class='add'>+	},</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> 	[OP_GETDEVICEINFO] = {</div><div class='ctx'> 		.op_func = nfsd4_getdeviceinfo,</div><div class='hunk'>@@ -3593,7 +3847,8 @@ bool nfsd4_spo_must_allow(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfs4_op_map *allow = &amp;cstate-&gt;clp-&gt;cl_spo_must_allow;</div><div class='ctx'> 	u32 opiter;</div><div class='ctx'> </div><div class='del'>-	if (!cstate-&gt;minorversion)</div><div class='add'>+	if (rqstp-&gt;rq_procinfo != &amp;nfsd_version4.vs_proc[NFSPROC4_COMPOUND] ||</div><div class='add'>+	    cstate-&gt;minorversion == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (cstate-&gt;spo_must_allowed)</div><div class='hunk'>@@ -3659,7 +3914,7 @@ static const struct svc_procedure nfsd_procedures4[2] = {</div><div class='ctx'> 		.pc_ressize = sizeof(struct nfsd4_compoundres),</div><div class='ctx'> 		.pc_release = nfsd4_release_compoundargs,</div><div class='ctx'> 		.pc_cachetype = RC_NOCACHE,</div><div class='del'>-		.pc_xdrressize = NFSD_BUFSIZE/4,</div><div class='add'>+		.pc_xdrressize = 3+NFSSVC_MAXBLKSIZE/4,</div><div class='ctx'> 		.pc_name = "COMPOUND",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c<br/>index 2c060e0b1604..441dfbfe2d2b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4recover.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4recover.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4recover.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4recover.c</a></div><div class='hunk'>@@ -32,7 +32,8 @@</div><div class='ctx'> *</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='hunk'>@@ -82,110 +83,38 @@ nfs4_save_creds(const struct cred **original_creds)</div><div class='ctx'> 	new-&gt;fsuid = GLOBAL_ROOT_UID;</div><div class='ctx'> 	new-&gt;fsgid = GLOBAL_ROOT_GID;</div><div class='ctx'> 	*original_creds = override_creds(new);</div><div class='del'>-	put_cred(new);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> nfs4_reset_creds(const struct cred *original)</div><div class='ctx'> {</div><div class='del'>-	revert_creds(original);</div><div class='add'>+	put_cred(revert_creds(original));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-md5_to_hex(char *out, char *md5)</div><div class='add'>+nfs4_make_rec_clidname(char dname[HEXDIR_LEN], const struct xdr_netobj *clname)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;16; i++) {</div><div class='del'>-		unsigned char c = md5[i];</div><div class='del'>-</div><div class='del'>-		*out++ = '0' + ((c&amp;0xf0)&gt;&gt;4) + (c&gt;=0xa0)*('a'-'9'-1);</div><div class='del'>-		*out++ = '0' + (c&amp;0x0f) + ((c&amp;0x0f)&gt;=0x0a)*('a'-'9'-1);</div><div class='del'>-	}</div><div class='del'>-	*out = '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-nfs4_make_rec_clidname(char *dname, const struct xdr_netobj *clname)</div><div class='del'>-{</div><div class='del'>-	struct xdr_netobj cksum;</div><div class='del'>-	struct crypto_shash *tfm;</div><div class='del'>-	int status;</div><div class='add'>+	u8 digest[MD5_DIGEST_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",</div><div class='ctx'> 			clname-&gt;len, clname-&gt;data);</div><div class='del'>-	tfm = crypto_alloc_shash("md5", 0, 0);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		status = PTR_ERR(tfm);</div><div class='del'>-		goto out_no_tfm;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cksum.len = crypto_shash_digestsize(tfm);</div><div class='del'>-	cksum.data = kmalloc(cksum.len, GFP_KERNEL);</div><div class='del'>-	if (cksum.data == NULL) {</div><div class='del'>-		status = -ENOMEM;</div><div class='del'>- 		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = crypto_shash_tfm_digest(tfm, clname-&gt;data, clname-&gt;len,</div><div class='del'>-					 cksum.data);</div><div class='del'>-	if (status)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	md5_to_hex(dname, cksum.data);</div><div class='ctx'> </div><div class='del'>-	status = 0;</div><div class='del'>-out:</div><div class='del'>-	kfree(cksum.data);</div><div class='del'>-	crypto_free_shash(tfm);</div><div class='del'>-out_no_tfm:</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If we had an error generating the recdir name for the legacy tracker</div><div class='del'>- * then warn the admin. If the error doesn't appear to be transient,</div><div class='del'>- * then disable recovery tracking.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-legacy_recdir_name_error(struct nfs4_client *clp, int error)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_ERR "NFSD: unable to generate recoverydir "</div><div class='del'>-			"name (%d).\n", error);</div><div class='add'>+	md5(clname-&gt;data, clname-&gt;len, digest);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * if the algorithm just doesn't exist, then disable the recovery</div><div class='del'>-	 * tracker altogether. The crypto libs will generally return this if</div><div class='del'>-	 * FIPS is enabled as well.</div><div class='del'>-	 */</div><div class='del'>-	if (error == -ENOENT) {</div><div class='del'>-		printk(KERN_ERR "NFSD: disabling legacy clientid tracking. "</div><div class='del'>-			"Reboot recovery will not function correctly!\n");</div><div class='del'>-		nfsd4_client_tracking_exit(clp-&gt;net);</div><div class='del'>-	}</div><div class='add'>+	static_assert(HEXDIR_LEN == 2 * MD5_DIGEST_SIZE + 1);</div><div class='add'>+	sprintf(dname, "%*phN", MD5_DIGEST_SIZE, digest);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> __nfsd4_create_reclaim_record_grace(struct nfs4_client *clp,</div><div class='del'>-		const char *dname, int len, struct nfsd_net *nn)</div><div class='add'>+				    char *dname, struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	struct xdr_netobj name;</div><div class='add'>+	struct xdr_netobj name = { .len = strlen(dname), .data = dname };</div><div class='ctx'> 	struct xdr_netobj princhash = { .len = 0, .data = NULL };</div><div class='ctx'> 	struct nfs4_client_reclaim *crp;</div><div class='ctx'> </div><div class='del'>-	name.data = kmemdup(dname, len, GFP_KERNEL);</div><div class='del'>-	if (!name.data) {</div><div class='del'>-		dprintk("%s: failed to allocate memory for name.data!\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	name.len = len;</div><div class='ctx'> 	crp = nfs4_client_to_reclaim(name, princhash, nn);</div><div class='del'>-	if (!crp) {</div><div class='del'>-		kfree(name.data);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	crp-&gt;cr_clp = clp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,9 +132,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)</div><div class='ctx'> 	if (!nn-&gt;rec_file)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	status = nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='del'>-	if (status)</div><div class='del'>-		return legacy_recdir_name_error(clp, status);</div><div class='add'>+	nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_save_creds(&amp;original_cred);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -216,13 +143,11 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)</div><div class='ctx'> 		goto out_creds;</div><div class='ctx'> </div><div class='ctx'> 	dir = nn-&gt;rec_file-&gt;f_path.dentry;</div><div class='del'>-	/* lock the parent */</div><div class='del'>-	inode_lock(d_inode(dir));</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_one_len(dname, dir, HEXDIR_LEN-1);</div><div class='add'>+	dentry = start_creating(&amp;nop_mnt_idmap, dir, &amp;QSTR(dname));</div><div class='ctx'> 	if (IS_ERR(dentry)) {</div><div class='ctx'> 		status = PTR_ERR(dentry);</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (d_really_is_positive(dentry))</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -233,16 +158,16 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)</div><div class='ctx'> 		 * In the 4.0 case, we should never get here; but we may</div><div class='ctx'> 		 * as well be forgiving and just succeed silently.</div><div class='ctx'> 		 */</div><div class='del'>-		goto out_put;</div><div class='del'>-	status = vfs_mkdir(&amp;nop_mnt_idmap, d_inode(dir), dentry, S_IRWXU);</div><div class='del'>-out_put:</div><div class='del'>-	dput(dentry);</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='add'>+		goto out_end;</div><div class='add'>+	dentry = vfs_mkdir(&amp;nop_mnt_idmap, d_inode(dir), dentry, 0700, NULL);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		status = PTR_ERR(dentry);</div><div class='add'>+out_end:</div><div class='add'>+	end_creating(dentry);</div><div class='add'>+out:</div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		if (nn-&gt;in_grace)</div><div class='del'>-			__nfsd4_create_reclaim_record_grace(clp, dname,</div><div class='del'>-					HEXDIR_LEN, nn);</div><div class='add'>+			__nfsd4_create_reclaim_record_grace(clp, dname, nn);</div><div class='ctx'> 		vfs_fsync(nn-&gt;rec_file, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_ERR "NFSD: failed to write recovery record"</div><div class='hunk'>@@ -255,7 +180,7 @@ out_creds:</div><div class='ctx'> 	nfs4_reset_creds(original_cred);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-typedef int (recdir_func)(struct dentry *, struct dentry *, struct nfsd_net *);</div><div class='add'>+typedef int (recdir_func)(struct dentry *, char *, struct nfsd_net *);</div><div class='ctx'> </div><div class='ctx'> struct name_list {</div><div class='ctx'> 	char name[HEXDIR_LEN];</div><div class='hunk'>@@ -309,23 +234,14 @@ nfsd4_list_rec_dir(recdir_func *f, struct nfsd_net *nn)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = iterate_dir(nn-&gt;rec_file, &amp;ctx.ctx);</div><div class='del'>-	inode_lock_nested(d_inode(dir), I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(entry, tmp, &amp;ctx.names, list) {</div><div class='del'>-		if (!status) {</div><div class='del'>-			struct dentry *dentry;</div><div class='del'>-			dentry = lookup_one_len(entry-&gt;name, dir, HEXDIR_LEN-1);</div><div class='del'>-			if (IS_ERR(dentry)) {</div><div class='del'>-				status = PTR_ERR(dentry);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			status = f(dir, dentry, nn);</div><div class='del'>-			dput(dentry);</div><div class='del'>-		}</div><div class='add'>+		if (!status)</div><div class='add'>+			status = f(dir, entry-&gt;name, nn);</div><div class='add'>+</div><div class='ctx'> 		list_del(&amp;entry-&gt;list);</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='ctx'> 	nfs4_reset_creds(original_cred);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(entry, tmp, &amp;ctx.names, list) {</div><div class='hunk'>@@ -337,28 +253,20 @@ nfsd4_list_rec_dir(recdir_func *f, struct nfsd_net *nn)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfsd4_unlink_clid_dir(char *name, int namlen, struct nfsd_net *nn)</div><div class='add'>+nfsd4_unlink_clid_dir(char *name, struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dir, *dentry;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	dprintk("NFSD: nfsd4_unlink_clid_dir. name %.*s\n", namlen, name);</div><div class='add'>+	dprintk("NFSD: nfsd4_unlink_clid_dir. name %s\n", name);</div><div class='ctx'> </div><div class='ctx'> 	dir = nn-&gt;rec_file-&gt;f_path.dentry;</div><div class='del'>-	inode_lock_nested(d_inode(dir), I_MUTEX_PARENT);</div><div class='del'>-	dentry = lookup_one_len(name, dir, namlen);</div><div class='del'>-	if (IS_ERR(dentry)) {</div><div class='del'>-		status = PTR_ERR(dentry);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-	status = -ENOENT;</div><div class='del'>-	if (d_really_is_negative(dentry))</div><div class='del'>-		goto out;</div><div class='del'>-	status = vfs_rmdir(&amp;nop_mnt_idmap, d_inode(dir), dentry);</div><div class='del'>-out:</div><div class='del'>-	dput(dentry);</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='add'>+	dentry = start_removing(&amp;nop_mnt_idmap, dir, &amp;QSTR(name));</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='add'>+</div><div class='add'>+	status = vfs_rmdir(&amp;nop_mnt_idmap, d_inode(dir), dentry, NULL);</div><div class='add'>+	end_removing(dentry);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,9 +301,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)</div><div class='ctx'> 	if (!nn-&gt;rec_file || !test_bit(NFSD4_CLIENT_STABLE, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	status = nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='del'>-	if (status)</div><div class='del'>-		return legacy_recdir_name_error(clp, status);</div><div class='add'>+	nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='ctx'> </div><div class='ctx'> 	status = mnt_want_write_file(nn-&gt;rec_file);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -406,7 +312,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out_drop_write;</div><div class='ctx'> </div><div class='del'>-	status = nfsd4_unlink_clid_dir(dname, HEXDIR_LEN-1, nn);</div><div class='add'>+	status = nfsd4_unlink_clid_dir(dname, nn);</div><div class='ctx'> 	nfs4_reset_creds(original_cred);</div><div class='ctx'> 	if (status == 0) {</div><div class='ctx'> 		vfs_fsync(nn-&gt;rec_file, 0);</div><div class='hunk'>@@ -423,18 +329,19 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-purge_old(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)</div><div class='add'>+purge_old(struct dentry *parent, char *cname, struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='add'>+	struct dentry *child;</div><div class='ctx'> 	struct xdr_netobj name;</div><div class='ctx'> </div><div class='del'>-	if (child-&gt;d_name.len != HEXDIR_LEN - 1) {</div><div class='del'>-		printk("%s: illegal name %pd in recovery directory\n",</div><div class='del'>-				__func__, child);</div><div class='add'>+	if (strlen(cname) != HEXDIR_LEN - 1) {</div><div class='add'>+		printk("%s: illegal name %s in recovery directory\n",</div><div class='add'>+				__func__, cname);</div><div class='ctx'> 		/* Keep trying; maybe the others are OK: */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	name.data = kmemdup_nul(child-&gt;d_name.name, child-&gt;d_name.len, GFP_KERNEL);</div><div class='add'>+	name.data = kstrdup(cname, GFP_KERNEL);</div><div class='ctx'> 	if (!name.data) {</div><div class='ctx'> 		dprintk("%s: failed to allocate memory for name.data!\n",</div><div class='ctx'> 			__func__);</div><div class='hunk'>@@ -444,10 +351,17 @@ purge_old(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)</div><div class='ctx'> 	if (nfs4_has_reclaimed_state(name, nn))</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	status = vfs_rmdir(&amp;nop_mnt_idmap, d_inode(parent), child);</div><div class='del'>-	if (status)</div><div class='del'>-		printk("failed to remove client recovery directory %pd\n",</div><div class='del'>-				child);</div><div class='add'>+	inode_lock_nested(d_inode(parent), I_MUTEX_PARENT);</div><div class='add'>+	child = lookup_one(&amp;nop_mnt_idmap, &amp;QSTR(cname), parent);</div><div class='add'>+	if (!IS_ERR(child)) {</div><div class='add'>+		status = vfs_rmdir(&amp;nop_mnt_idmap, d_inode(parent), child, NULL);</div><div class='add'>+		if (status)</div><div class='add'>+			printk("failed to remove client recovery directory %pd\n",</div><div class='add'>+			       child);</div><div class='add'>+		dput(child);</div><div class='add'>+	}</div><div class='add'>+	inode_unlock(d_inode(parent));</div><div class='add'>+</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(name.data);</div><div class='ctx'> out:</div><div class='hunk'>@@ -478,27 +392,18 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-load_recdir(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)</div><div class='add'>+load_recdir(struct dentry *parent, char *cname, struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	struct xdr_netobj name;</div><div class='add'>+	struct xdr_netobj name = { .len = HEXDIR_LEN, .data = cname };</div><div class='ctx'> 	struct xdr_netobj princhash = { .len = 0, .data = NULL };</div><div class='ctx'> </div><div class='del'>-	if (child-&gt;d_name.len != HEXDIR_LEN - 1) {</div><div class='del'>-		printk("%s: illegal name %pd in recovery directory\n",</div><div class='del'>-				__func__, child);</div><div class='add'>+	if (strlen(cname) != HEXDIR_LEN - 1) {</div><div class='add'>+		printk("%s: illegal name %s in recovery directory\n",</div><div class='add'>+				__func__, cname);</div><div class='ctx'> 		/* Keep trying; maybe the others are OK: */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	name.data = kmemdup_nul(child-&gt;d_name.name, child-&gt;d_name.len, GFP_KERNEL);</div><div class='del'>-	if (!name.data) {</div><div class='del'>-		dprintk("%s: failed to allocate memory for name.data!\n",</div><div class='del'>-			__func__);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	name.len = HEXDIR_LEN;</div><div class='del'>-	if (!nfs4_client_to_reclaim(name, princhash, nn))</div><div class='del'>-		kfree(name.data);</div><div class='del'>-out:</div><div class='add'>+	nfs4_client_to_reclaim(name, princhash, nn);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -659,7 +564,8 @@ nfs4_reset_recoverydir(char *recdir)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	status = -ENOTDIR;</div><div class='ctx'> 	if (d_is_dir(path.dentry)) {</div><div class='del'>-		strcpy(user_recovery_dirname, recdir);</div><div class='add'>+		strscpy(user_recovery_dirname, recdir,</div><div class='add'>+			sizeof(user_recovery_dirname));</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	path_put(&amp;path);</div><div class='hunk'>@@ -675,7 +581,6 @@ nfs4_recoverydir(void)</div><div class='ctx'> static int</div><div class='ctx'> nfsd4_check_legacy_client(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='del'>-	int status;</div><div class='ctx'> 	char dname[HEXDIR_LEN];</div><div class='ctx'> 	struct nfs4_client_reclaim *crp;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(clp-&gt;net, nfsd_net_id);</div><div class='hunk'>@@ -685,11 +590,7 @@ nfsd4_check_legacy_client(struct nfs4_client *clp)</div><div class='ctx'> 	if (test_bit(NFSD4_CLIENT_STABLE, &amp;clp-&gt;cl_flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	status = nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='del'>-	if (status) {</div><div class='del'>-		legacy_recdir_name_error(clp, status);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='add'>+	nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='ctx'> </div><div class='ctx'> 	/* look for it in the reclaim hashtable otherwise */</div><div class='ctx'> 	name.data = kmemdup(dname, HEXDIR_LEN, GFP_KERNEL);</div><div class='hunk'>@@ -733,7 +634,6 @@ struct cld_net {</div><div class='ctx'> 	spinlock_t		 cn_lock;</div><div class='ctx'> 	struct list_head	 cn_list;</div><div class='ctx'> 	unsigned int		 cn_xid;</div><div class='del'>-	struct crypto_shash	*cn_tfm;</div><div class='ctx'> #ifdef CONFIG_NFSD_LEGACY_CLIENT_TRACKING</div><div class='ctx'> 	bool			 cn_has_legacy;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -796,6 +696,8 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,</div><div class='ctx'> {</div><div class='ctx'> 	uint8_t cmd, princhashlen;</div><div class='ctx'> 	struct xdr_netobj name, princhash = { .len = 0, .data = NULL };</div><div class='add'>+	char *namecopy __free(kfree) = NULL;</div><div class='add'>+	char *princhashcopy __free(kfree) = NULL;</div><div class='ctx'> 	uint16_t namelen;</div><div class='ctx'> </div><div class='ctx'> 	if (get_user(cmd, &amp;cmsg-&gt;cm_cmd)) {</div><div class='hunk'>@@ -809,19 +711,23 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,</div><div class='ctx'> 			ci = &amp;cmsg-&gt;cm_u.cm_clntinfo;</div><div class='ctx'> 			if (get_user(namelen, &amp;ci-&gt;cc_name.cn_len))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			name.data = memdup_user(&amp;ci-&gt;cc_name.cn_id, namelen);</div><div class='del'>-			if (IS_ERR(name.data))</div><div class='del'>-				return PTR_ERR(name.data);</div><div class='add'>+			if (namelen == 0 || namelen &gt; NFS4_OPAQUE_LIMIT) {</div><div class='add'>+				dprintk("%s: invalid namelen (%u)", __func__, namelen);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			namecopy = memdup_user(&amp;ci-&gt;cc_name.cn_id, namelen);</div><div class='add'>+			if (IS_ERR(namecopy))</div><div class='add'>+				return PTR_ERR(namecopy);</div><div class='add'>+			name.data = namecopy;</div><div class='ctx'> 			name.len = namelen;</div><div class='ctx'> 			get_user(princhashlen, &amp;ci-&gt;cc_princhash.cp_len);</div><div class='ctx'> 			if (princhashlen &gt; 0) {</div><div class='del'>-				princhash.data = memdup_user(</div><div class='del'>-						&amp;ci-&gt;cc_princhash.cp_data,</div><div class='del'>-						princhashlen);</div><div class='del'>-				if (IS_ERR(princhash.data)) {</div><div class='del'>-					kfree(name.data);</div><div class='del'>-					return PTR_ERR(princhash.data);</div><div class='del'>-				}</div><div class='add'>+				princhashcopy = memdup_user(</div><div class='add'>+					&amp;ci-&gt;cc_princhash.cp_data,</div><div class='add'>+					princhashlen);</div><div class='add'>+				if (IS_ERR(princhashcopy))</div><div class='add'>+					return PTR_ERR(princhashcopy);</div><div class='add'>+				princhash.data = princhashcopy;</div><div class='ctx'> 				princhash.len = princhashlen;</div><div class='ctx'> 			} else</div><div class='ctx'> 				princhash.len = 0;</div><div class='hunk'>@@ -831,9 +737,14 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,</div><div class='ctx'> 			cnm = &amp;cmsg-&gt;cm_u.cm_name;</div><div class='ctx'> 			if (get_user(namelen, &amp;cnm-&gt;cn_len))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			name.data = memdup_user(&amp;cnm-&gt;cn_id, namelen);</div><div class='del'>-			if (IS_ERR(name.data))</div><div class='del'>-				return PTR_ERR(name.data);</div><div class='add'>+			if (namelen == 0 || namelen &gt; NFS4_OPAQUE_LIMIT) {</div><div class='add'>+				dprintk("%s: invalid namelen (%u)", __func__, namelen);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			namecopy = memdup_user(&amp;cnm-&gt;cn_id, namelen);</div><div class='add'>+			if (IS_ERR(namecopy))</div><div class='add'>+				return PTR_ERR(namecopy);</div><div class='add'>+			name.data = namecopy;</div><div class='ctx'> 			name.len = namelen;</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef CONFIG_NFSD_LEGACY_CLIENT_TRACKING</div><div class='hunk'>@@ -841,15 +752,12 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,</div><div class='ctx'> 			struct cld_net *cn = nn-&gt;cld_net;</div><div class='ctx'> </div><div class='ctx'> 			name.len = name.len - 5;</div><div class='del'>-			memmove(name.data, name.data + 5, name.len);</div><div class='add'>+			name.data = name.data + 5;</div><div class='ctx'> 			cn-&gt;cn_has_legacy = true;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		if (!nfs4_client_to_reclaim(name, princhash, nn)) {</div><div class='del'>-			kfree(name.data);</div><div class='del'>-			kfree(princhash.data);</div><div class='add'>+		if (!nfs4_client_to_reclaim(name, princhash, nn))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		}</div><div class='ctx'> 		return nn-&gt;client_tracking_ops-&gt;msglen;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EFAULT;</div><div class='hunk'>@@ -938,38 +846,32 @@ static const struct rpc_pipe_ops cld_upcall_ops = {</div><div class='ctx'> 	.destroy_msg	= cld_pipe_destroy_msg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dentry *</div><div class='add'>+static int</div><div class='ctx'> nfsd4_cld_register_sb(struct super_block *sb, struct rpc_pipe *pipe)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dir, *dentry;</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	dir = rpc_d_lookup_sb(sb, NFSD_PIPE_DIR);</div><div class='ctx'> 	if (dir == NULL)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-	dentry = rpc_mkpipe_dentry(dir, NFSD_CLD_PIPE, NULL, pipe);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	err = rpc_mkpipe_dentry(dir, NFSD_CLD_PIPE, NULL, pipe);</div><div class='ctx'> 	dput(dir);</div><div class='del'>-	return dentry;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nfsd4_cld_unregister_sb(struct rpc_pipe *pipe)</div><div class='del'>-{</div><div class='del'>-	if (pipe-&gt;dentry)</div><div class='del'>-		rpc_unlink(pipe-&gt;dentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *</div><div class='add'>+static int</div><div class='ctx'> nfsd4_cld_register_net(struct net *net, struct rpc_pipe *pipe)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb;</div><div class='del'>-	struct dentry *dentry;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	sb = rpc_get_sb_net(net);</div><div class='ctx'> 	if (!sb)</div><div class='del'>-		return NULL;</div><div class='del'>-	dentry = nfsd4_cld_register_sb(sb, pipe);</div><div class='add'>+		return 0;</div><div class='add'>+	err = nfsd4_cld_register_sb(sb, pipe);</div><div class='ctx'> 	rpc_put_sb_net(net);</div><div class='del'>-	return dentry;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -979,7 +881,7 @@ nfsd4_cld_unregister_net(struct net *net, struct rpc_pipe *pipe)</div><div class='ctx'> </div><div class='ctx'> 	sb = rpc_get_sb_net(net);</div><div class='ctx'> 	if (sb) {</div><div class='del'>-		nfsd4_cld_unregister_sb(pipe);</div><div class='add'>+		rpc_unlink(pipe);</div><div class='ctx'> 		rpc_put_sb_net(net);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -989,7 +891,6 @@ static int</div><div class='ctx'> __nfsd4_init_cld_pipe(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct cld_net *cn;</div><div class='ctx'> </div><div class='hunk'>@@ -1010,13 +911,10 @@ __nfsd4_init_cld_pipe(struct net *net)</div><div class='ctx'> 	spin_lock_init(&amp;cn-&gt;cn_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cn-&gt;cn_list);</div><div class='ctx'> </div><div class='del'>-	dentry = nfsd4_cld_register_net(net, cn-&gt;cn_pipe);</div><div class='del'>-	if (IS_ERR(dentry)) {</div><div class='del'>-		ret = PTR_ERR(dentry);</div><div class='add'>+	ret = nfsd4_cld_register_net(net, cn-&gt;cn_pipe);</div><div class='add'>+	if (unlikely(ret))</div><div class='ctx'> 		goto err_destroy_data;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cn-&gt;cn_pipe-&gt;dentry = dentry;</div><div class='ctx'> #ifdef CONFIG_NFSD_LEGACY_CLIENT_TRACKING</div><div class='ctx'> 	cn-&gt;cn_has_legacy = false;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1051,8 +949,6 @@ nfsd4_remove_cld_pipe(struct net *net)</div><div class='ctx'> </div><div class='ctx'> 	nfsd4_cld_unregister_net(net, cn-&gt;cn_pipe);</div><div class='ctx'> 	rpc_destroy_pipe_data(cn-&gt;cn_pipe);</div><div class='del'>-	if (cn-&gt;cn_tfm)</div><div class='del'>-		crypto_free_shash(cn-&gt;cn_tfm);</div><div class='ctx'> 	kfree(nn-&gt;cld_net);</div><div class='ctx'> 	nn-&gt;cld_net = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1146,8 +1042,6 @@ nfsd4_cld_create_v2(struct nfs4_client *clp)</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(clp-&gt;net, nfsd_net_id);</div><div class='ctx'> 	struct cld_net *cn = nn-&gt;cld_net;</div><div class='ctx'> 	struct cld_msg_v2 *cmsg;</div><div class='del'>-	struct crypto_shash *tfm = cn-&gt;cn_tfm;</div><div class='del'>-	struct xdr_netobj cksum;</div><div class='ctx'> 	char *principal = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't upcall if it's already stored */</div><div class='hunk'>@@ -1170,22 +1064,9 @@ nfsd4_cld_create_v2(struct nfs4_client *clp)</div><div class='ctx'> 	else if (clp-&gt;cl_cred.cr_principal)</div><div class='ctx'> 		principal = clp-&gt;cl_cred.cr_principal;</div><div class='ctx'> 	if (principal) {</div><div class='del'>-		cksum.len = crypto_shash_digestsize(tfm);</div><div class='del'>-		cksum.data = kmalloc(cksum.len, GFP_KERNEL);</div><div class='del'>-		if (cksum.data == NULL) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		ret = crypto_shash_tfm_digest(tfm, principal, strlen(principal),</div><div class='del'>-					      cksum.data);</div><div class='del'>-		if (ret) {</div><div class='del'>-			kfree(cksum.data);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		cmsg-&gt;cm_u.cm_clntinfo.cc_princhash.cp_len = cksum.len;</div><div class='del'>-		memcpy(cmsg-&gt;cm_u.cm_clntinfo.cc_princhash.cp_data,</div><div class='del'>-		       cksum.data, cksum.len);</div><div class='del'>-		kfree(cksum.data);</div><div class='add'>+		sha256(principal, strlen(principal),</div><div class='add'>+		       cmsg-&gt;cm_u.cm_clntinfo.cc_princhash.cp_data);</div><div class='add'>+		cmsg-&gt;cm_u.cm_clntinfo.cc_princhash.cp_len = SHA256_DIGEST_SIZE;</div><div class='ctx'> 	} else</div><div class='ctx'> 		cmsg-&gt;cm_u.cm_clntinfo.cc_princhash.cp_len = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1195,7 +1076,6 @@ nfsd4_cld_create_v2(struct nfs4_client *clp)</div><div class='ctx'> 		set_bit(NFSD4_CLIENT_STABLE, &amp;clp-&gt;cl_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	free_cld_upcall(cup);</div><div class='ctx'> out_err:</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1303,13 +1183,10 @@ nfsd4_cld_check(struct nfs4_client *clp)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_LEGACY_CLIENT_TRACKING</div><div class='ctx'> 	if (nn-&gt;cld_net-&gt;cn_has_legacy) {</div><div class='del'>-		int status;</div><div class='ctx'> 		char dname[HEXDIR_LEN];</div><div class='ctx'> 		struct xdr_netobj name;</div><div class='ctx'> </div><div class='del'>-		status = nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='del'>-		if (status)</div><div class='del'>-			return -ENOENT;</div><div class='add'>+		nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='ctx'> </div><div class='ctx'> 		name.data = kmemdup(dname, HEXDIR_LEN, GFP_KERNEL);</div><div class='ctx'> 		if (!name.data) {</div><div class='hunk'>@@ -1334,12 +1211,11 @@ found:</div><div class='ctx'> static int</div><div class='ctx'> nfsd4_cld_check_v2(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_client_reclaim *crp;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(clp-&gt;net, nfsd_net_id);</div><div class='add'>+#ifdef CONFIG_NFSD_LEGACY_CLIENT_TRACKING</div><div class='ctx'> 	struct cld_net *cn = nn-&gt;cld_net;</div><div class='del'>-	int status;</div><div class='del'>-	struct crypto_shash *tfm = cn-&gt;cn_tfm;</div><div class='del'>-	struct xdr_netobj cksum;</div><div class='add'>+#endif</div><div class='add'>+	struct nfs4_client_reclaim *crp;</div><div class='ctx'> 	char *principal = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* did we already find that this client is stable? */</div><div class='hunk'>@@ -1356,9 +1232,7 @@ nfsd4_cld_check_v2(struct nfs4_client *clp)</div><div class='ctx'> 		struct xdr_netobj name;</div><div class='ctx'> 		char dname[HEXDIR_LEN];</div><div class='ctx'> </div><div class='del'>-		status = nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='del'>-		if (status)</div><div class='del'>-			return -ENOENT;</div><div class='add'>+		nfs4_make_rec_clidname(dname, &amp;clp-&gt;cl_name);</div><div class='ctx'> </div><div class='ctx'> 		name.data = kmemdup(dname, HEXDIR_LEN, GFP_KERNEL);</div><div class='ctx'> 		if (!name.data) {</div><div class='hunk'>@@ -1377,28 +1251,18 @@ nfsd4_cld_check_v2(struct nfs4_client *clp)</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> found:</div><div class='ctx'> 	if (crp-&gt;cr_princhash.len) {</div><div class='add'>+		u8 digest[SHA256_DIGEST_SIZE];</div><div class='add'>+</div><div class='ctx'> 		if (clp-&gt;cl_cred.cr_raw_principal)</div><div class='ctx'> 			principal = clp-&gt;cl_cred.cr_raw_principal;</div><div class='ctx'> 		else if (clp-&gt;cl_cred.cr_principal)</div><div class='ctx'> 			principal = clp-&gt;cl_cred.cr_principal;</div><div class='ctx'> 		if (principal == NULL)</div><div class='ctx'> 			return -ENOENT;</div><div class='del'>-		cksum.len = crypto_shash_digestsize(tfm);</div><div class='del'>-		cksum.data = kmalloc(cksum.len, GFP_KERNEL);</div><div class='del'>-		if (cksum.data == NULL)</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		status = crypto_shash_tfm_digest(tfm, principal,</div><div class='del'>-						 strlen(principal), cksum.data);</div><div class='del'>-		if (status) {</div><div class='del'>-			kfree(cksum.data);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-		if (memcmp(crp-&gt;cr_princhash.data, cksum.data,</div><div class='del'>-				crp-&gt;cr_princhash.len)) {</div><div class='del'>-			kfree(cksum.data);</div><div class='add'>+		sha256(principal, strlen(principal), digest);</div><div class='add'>+		if (memcmp(crp-&gt;cr_princhash.data, digest,</div><div class='add'>+				crp-&gt;cr_princhash.len))</div><div class='ctx'> 			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-		kfree(cksum.data);</div><div class='ctx'> 	}</div><div class='ctx'> 	crp-&gt;cr_clp = clp;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1578,7 +1442,6 @@ nfsd4_cld_tracking_init(struct net *net)</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	bool running;</div><div class='ctx'> 	int retries = 10;</div><div class='del'>-	struct crypto_shash *tfm;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_cld_state_init(net);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -1603,12 +1466,6 @@ nfsd4_cld_tracking_init(struct net *net)</div><div class='ctx'> 		status = -ETIMEDOUT;</div><div class='ctx'> 		goto err_remove;</div><div class='ctx'> 	}</div><div class='del'>-	tfm = crypto_alloc_shash("sha256", 0, 0);</div><div class='del'>-	if (IS_ERR(tfm)) {</div><div class='del'>-		status = PTR_ERR(tfm);</div><div class='del'>-		goto err_remove;</div><div class='del'>-	}</div><div class='del'>-	nn-&gt;cld_net-&gt;cn_tfm = tfm;</div><div class='ctx'> </div><div class='ctx'> 	status = nfsd4_cld_get_version(nn);</div><div class='ctx'> 	if (status == -EOPNOTSUPP)</div><div class='hunk'>@@ -1748,11 +1605,7 @@ nfsd4_cltrack_legacy_recdir(const struct xdr_netobj *name)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	copied = nfs4_make_rec_clidname(result + copied, name);</div><div class='del'>-	if (copied) {</div><div class='del'>-		kfree(result);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	nfs4_make_rec_clidname(result + copied, name);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -1895,10 +1748,7 @@ nfsd4_cltrack_upcall_lock(struct nfs4_client *clp)</div><div class='ctx'> static void</div><div class='ctx'> nfsd4_cltrack_upcall_unlock(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='del'>-	smp_mb__before_atomic();</div><div class='del'>-	clear_bit(NFSD4_CLIENT_UPCALL_LOCK, &amp;clp-&gt;cl_flags);</div><div class='del'>-	smp_mb__after_atomic();</div><div class='del'>-	wake_up_bit(&amp;clp-&gt;cl_flags, NFSD4_CLIENT_UPCALL_LOCK);</div><div class='add'>+	clear_and_wake_up_bit(NFSD4_CLIENT_UPCALL_LOCK, &amp;clp-&gt;cl_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2046,7 +1896,6 @@ static inline int check_for_legacy_methods(int status, struct net *net)</div><div class='ctx'> 		path_put(&amp;path);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			return -ENOTDIR;</div><div class='del'>-		status = nn-&gt;client_tracking_ops-&gt;init(net);</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -2086,8 +1935,8 @@ do_init:</div><div class='ctx'> 	status = nn-&gt;client_tracking_ops-&gt;init(net);</div><div class='ctx'> out:</div><div class='ctx'> 	if (status) {</div><div class='del'>-		printk(KERN_WARNING "NFSD: Unable to initialize client "</div><div class='del'>-				    "recovery tracking! (%d)\n", status);</div><div class='add'>+		pr_warn("NFSD: Unable to initialize client recovery tracking! (%d)\n", status);</div><div class='add'>+		pr_warn("NFSD: Is nfsdcld running? If not, enable CONFIG_NFSD_LEGACY_CLIENT_TRACKING.\n");</div><div class='ctx'> 		nn-&gt;client_tracking_ops = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -2148,7 +1997,6 @@ rpc_pipefs_event(struct notifier_block *nb, unsigned long event, void *ptr)</div><div class='ctx'> 	struct net *net = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct cld_net *cn = nn-&gt;cld_net;</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!try_module_get(THIS_MODULE))</div><div class='hunk'>@@ -2161,16 +2009,10 @@ rpc_pipefs_event(struct notifier_block *nb, unsigned long event, void *ptr)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case RPC_PIPEFS_MOUNT:</div><div class='del'>-		dentry = nfsd4_cld_register_sb(sb, cn-&gt;cn_pipe);</div><div class='del'>-		if (IS_ERR(dentry)) {</div><div class='del'>-			ret = PTR_ERR(dentry);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cn-&gt;cn_pipe-&gt;dentry = dentry;</div><div class='add'>+		ret = nfsd4_cld_register_sb(sb, cn-&gt;cn_pipe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case RPC_PIPEFS_UMOUNT:</div><div class='del'>-		if (cn-&gt;cn_pipe-&gt;dentry)</div><div class='del'>-			nfsd4_cld_unregister_sb(cn-&gt;cn_pipe);</div><div class='add'>+		rpc_unlink(cn-&gt;cn_pipe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENOTSUPP;</div><div class='head'>diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c<br/>index 2fa54cfd4882..808c24fb5c9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4state.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4state.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4state.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4state.c</a></div><div class='hunk'>@@ -87,6 +87,7 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid);</div><div class='ctx'> void nfsd4_end_grace(struct nfsd_net *nn);</div><div class='ctx'> static void _free_cpntf_state_locked(struct nfsd_net *nn, struct nfs4_cpntf_state *cps);</div><div class='ctx'> static void nfsd4_file_hash_remove(struct nfs4_file *fi);</div><div class='add'>+static void deleg_reaper(struct nfsd_net *nn);</div><div class='ctx'> </div><div class='ctx'> /* Locking: */</div><div class='ctx'> </div><div class='hunk'>@@ -127,6 +128,7 @@ static void free_session(struct nfsd4_session *);</div><div class='ctx'> </div><div class='ctx'> static const struct nfsd4_callback_ops nfsd4_cb_recall_ops;</div><div class='ctx'> static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops;</div><div class='add'>+static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops;</div><div class='ctx'> </div><div class='ctx'> static struct workqueue_struct *laundry_wq;</div><div class='ctx'> </div><div class='hunk'>@@ -147,14 +149,14 @@ void nfsd4_destroy_laundry_wq(void)</div><div class='ctx'> </div><div class='ctx'> static bool is_session_dead(struct nfsd4_session *ses)</div><div class='ctx'> {</div><div class='del'>-	return ses-&gt;se_flags &amp; NFS4_SESSION_DEAD;</div><div class='add'>+	return ses-&gt;se_dead;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 mark_session_dead_locked(struct nfsd4_session *ses, int ref_held_by_me)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_read(&amp;ses-&gt;se_ref) &gt; ref_held_by_me)</div><div class='ctx'> 		return nfserr_jukebox;</div><div class='del'>-	ses-&gt;se_flags |= NFS4_SESSION_DEAD;</div><div class='add'>+	ses-&gt;se_dead = true;</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -318,6 +320,7 @@ free_nbl(struct kref *kref)</div><div class='ctx'> 	struct nfsd4_blocked_lock *nbl;</div><div class='ctx'> </div><div class='ctx'> 	nbl = container_of(kref, struct nfsd4_blocked_lock, nbl_kref);</div><div class='add'>+	locks_release_private(&amp;nbl-&gt;nbl_lock);</div><div class='ctx'> 	kfree(nbl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -325,7 +328,6 @@ static void</div><div class='ctx'> free_blocked_lock(struct nfsd4_blocked_lock *nbl)</div><div class='ctx'> {</div><div class='ctx'> 	locks_delete_block(&amp;nbl-&gt;nbl_lock);</div><div class='del'>-	locks_release_private(&amp;nbl-&gt;nbl_lock);</div><div class='ctx'> 	kref_put(&amp;nbl-&gt;nbl_kref, free_nbl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -398,6 +400,7 @@ static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops = {</div><div class='ctx'> 	.prepare	= nfsd4_cb_notify_lock_prepare,</div><div class='ctx'> 	.done		= nfsd4_cb_notify_lock_done,</div><div class='ctx'> 	.release	= nfsd4_cb_notify_lock_release,</div><div class='add'>+	.opcode		= OP_CB_NOTIFY_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -539,7 +542,7 @@ same_owner_str(struct nfs4_stateowner *sop, struct xdr_netobj *owner)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_openowner *</div><div class='del'>-find_openstateowner_str_locked(unsigned int hashval, struct nfsd4_open *open,</div><div class='add'>+find_openstateowner_str(unsigned int hashval, struct nfsd4_open *open,</div><div class='ctx'> 			struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_stateowner *so;</div><div class='hunk'>@@ -556,18 +559,6 @@ find_openstateowner_str_locked(unsigned int hashval, struct nfsd4_open *open,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nfs4_openowner *</div><div class='del'>-find_openstateowner_str(unsigned int hashval, struct nfsd4_open *open,</div><div class='del'>-			struct nfs4_client *clp)</div><div class='del'>-{</div><div class='del'>-	struct nfs4_openowner *oo;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='del'>-	oo = find_openstateowner_str_locked(hashval, open, clp);</div><div class='del'>-	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='del'>-	return oo;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline u32</div><div class='ctx'> opaque_hashval(const void *ptr, int nbytes)</div><div class='ctx'> {</div><div class='hunk'>@@ -581,13 +572,6 @@ opaque_hashval(const void *ptr, int nbytes)</div><div class='ctx'> 	return x;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfsd4_free_file_rcu(struct rcu_head *rcu)</div><div class='del'>-{</div><div class='del'>-	struct nfs4_file *fp = container_of(rcu, struct nfs4_file, fi_rcu);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(file_slab, fp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> put_nfs4_file(struct nfs4_file *fi)</div><div class='ctx'> {</div><div class='hunk'>@@ -595,7 +579,7 @@ put_nfs4_file(struct nfs4_file *fi)</div><div class='ctx'> 		nfsd4_file_hash_remove(fi);</div><div class='ctx'> 		WARN_ON_ONCE(!list_empty(&amp;fi-&gt;fi_clnt_odstate));</div><div class='ctx'> 		WARN_ON_ONCE(!list_empty(&amp;fi-&gt;fi_delegations));</div><div class='del'>-		call_rcu(&amp;fi-&gt;fi_rcu, nfsd4_free_file_rcu);</div><div class='add'>+		kfree_rcu(fi, fi_rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -649,18 +633,6 @@ find_readable_file(struct nfs4_file *f)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nfsd_file *</div><div class='del'>-find_rw_file(struct nfs4_file *f)</div><div class='del'>-{</div><div class='del'>-	struct nfsd_file *ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;f-&gt;fi_lock);</div><div class='del'>-	ret = nfsd_file_get(f-&gt;fi_fds[O_RDWR]);</div><div class='del'>-	spin_unlock(&amp;f-&gt;fi_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct nfsd_file *</div><div class='ctx'> find_any_file(struct nfs4_file *f)</div><div class='ctx'> {</div><div class='hunk'>@@ -962,15 +934,6 @@ struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, struct kmem_cache *sla</div><div class='ctx'> 	spin_lock_init(&amp;stid-&gt;sc_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;stid-&gt;sc_cp_list);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * It shouldn't be a problem to reuse an opaque stateid value.</div><div class='del'>-	 * I don't think it is for 4.1.  But with 4.0 I worry that, for</div><div class='del'>-	 * example, a stray write retransmission could be accepted by</div><div class='del'>-	 * the server when it should have been rejected.  Therefore,</div><div class='del'>-	 * adopt a trick from the sctp code to attempt to maximize the</div><div class='del'>-	 * amount of time until an id is reused, by ensuring they always</div><div class='del'>-	 * "increase" (mod INT_MAX):</div><div class='del'>-	 */</div><div class='ctx'> 	return stid;</div><div class='ctx'> out_free:</div><div class='ctx'> 	kmem_cache_free(slab, stid);</div><div class='hunk'>@@ -1066,6 +1029,12 @@ static struct nfs4_ol_stateid * nfs4_alloc_open_stateid(struct nfs4_client *clp)</div><div class='ctx'> 	return openlockstateid(stid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * As the sc_free callback of deleg, this may be called by nfs4_put_stid</div><div class='add'>+ * in nfsd_break_one_deleg.</div><div class='add'>+ * Considering nfsd_break_one_deleg is called with the flc-&gt;flc_lock held,</div><div class='add'>+ * this function mustn't ever sleep.</div><div class='add'>+ */</div><div class='ctx'> static void nfs4_free_deleg(struct nfs4_stid *stid)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_delegation *dp = delegstateid(stid);</div><div class='hunk'>@@ -1087,7 +1056,8 @@ static void nfs4_free_deleg(struct nfs4_stid *stid)</div><div class='ctx'>  * When a delegation is recalled, the filehandle is stored in the "new"</div><div class='ctx'>  * filter.</div><div class='ctx'>  * Every 30 seconds we swap the filters and clear the "new" one,</div><div class='del'>- * unless both are empty of course.</div><div class='add'>+ * unless both are empty of course.  This results in delegations for a</div><div class='add'>+ * given filehandle being blocked for between 30 and 60 seconds.</div><div class='ctx'>  *</div><div class='ctx'>  * Each filter is 256 bits.  We hash the filehandle to 32bit and use the</div><div class='ctx'>  * low 3 bytes as hash-table indices.</div><div class='hunk'>@@ -1116,9 +1086,9 @@ static int delegation_blocked(struct knfsd_fh *fh)</div><div class='ctx'> 		if (ktime_get_seconds() - bd-&gt;swap_time &gt; 30) {</div><div class='ctx'> 			bd-&gt;entries -= bd-&gt;old_entries;</div><div class='ctx'> 			bd-&gt;old_entries = bd-&gt;entries;</div><div class='add'>+			bd-&gt;new = 1-bd-&gt;new;</div><div class='ctx'> 			memset(bd-&gt;set[bd-&gt;new], 0,</div><div class='ctx'> 			       sizeof(bd-&gt;set[0]));</div><div class='del'>-			bd-&gt;new = 1-bd-&gt;new;</div><div class='ctx'> 			bd-&gt;swap_time = ktime_get_seconds();</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;blocked_delegations_lock);</div><div class='hunk'>@@ -1189,6 +1159,9 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp,</div><div class='ctx'> 	dp-&gt;dl_recalled = false;</div><div class='ctx'> 	nfsd4_init_cb(&amp;dp-&gt;dl_recall, dp-&gt;dl_stid.sc_client,</div><div class='ctx'> 		      &amp;nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL);</div><div class='add'>+	nfsd4_init_cb(&amp;dp-&gt;dl_cb_fattr.ncf_getattr, dp-&gt;dl_stid.sc_client,</div><div class='add'>+			&amp;nfsd4_cb_getattr_ops, NFSPROC4_CLNT_CB_GETATTR);</div><div class='add'>+	dp-&gt;dl_cb_fattr.ncf_file_modified = false;</div><div class='ctx'> 	get_nfs4_file(fp);</div><div class='ctx'> 	dp-&gt;dl_stid.sc_file = fp;</div><div class='ctx'> 	return dp;</div><div class='hunk'>@@ -1210,6 +1183,8 @@ nfs4_put_stid(struct nfs4_stid *s)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	idr_remove(&amp;clp-&gt;cl_stateids, s-&gt;sc_stateid.si_opaque.so_id);</div><div class='add'>+	if (s-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		atomic_dec(&amp;s-&gt;sc_client-&gt;cl_admin_revoked);</div><div class='ctx'> 	nfs4_free_cpntf_statelist(clp-&gt;net, s);</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	s-&gt;sc_free(s);</div><div class='hunk'>@@ -1231,15 +1206,56 @@ nfs4_inc_and_copy_stateid(stateid_t *dst, struct nfs4_stid *stid)</div><div class='ctx'> </div><div class='ctx'> static void put_deleg_file(struct nfs4_file *fp)</div><div class='ctx'> {</div><div class='add'>+	struct nfsd_file *rnf = NULL;</div><div class='ctx'> 	struct nfsd_file *nf = NULL;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='del'>-	if (--fp-&gt;fi_delegees == 0)</div><div class='add'>+	if (--fp-&gt;fi_delegees == 0) {</div><div class='ctx'> 		swap(nf, fp-&gt;fi_deleg_file);</div><div class='add'>+		swap(rnf, fp-&gt;fi_rdeleg_file);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (nf)</div><div class='ctx'> 		nfsd_file_put(nf);</div><div class='add'>+	if (rnf)</div><div class='add'>+		nfs4_file_put_access(fp, NFS4_SHARE_ACCESS_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfsd4_finalize_deleg_timestamps(struct nfs4_delegation *dp, struct file *f)</div><div class='add'>+{</div><div class='add'>+	struct iattr ia = { .ia_valid = ATTR_ATIME | ATTR_CTIME | ATTR_MTIME };</div><div class='add'>+	struct inode *inode = file_inode(f);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* don't do anything if FMODE_NOCMTIME isn't set */</div><div class='add'>+	if ((READ_ONCE(f-&gt;f_mode) &amp; FMODE_NOCMTIME) == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;f-&gt;f_lock);</div><div class='add'>+	f-&gt;f_mode &amp;= ~FMODE_NOCMTIME;</div><div class='add'>+	spin_unlock(&amp;f-&gt;f_lock);</div><div class='add'>+</div><div class='add'>+	/* was it never written? */</div><div class='add'>+	if (!dp-&gt;dl_written)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* did it get a setattr for the timestamps at some point? */</div><div class='add'>+	if (dp-&gt;dl_setattr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Stamp everything to "now" */</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	ret = notify_change(&amp;nop_mnt_idmap, f-&gt;f_path.dentry, &amp;ia, NULL);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		struct inode *inode = file_inode(f);</div><div class='add'>+</div><div class='add'>+		pr_notice_ratelimited("Unable to update timestamps on inode %02x:%02x:%lu: %d\n",</div><div class='add'>+					MAJOR(inode-&gt;i_sb-&gt;s_dev),</div><div class='add'>+					MINOR(inode-&gt;i_sb-&gt;s_dev),</div><div class='add'>+					inode-&gt;i_ino, ret);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp)</div><div class='hunk'>@@ -1249,7 +1265,8 @@ static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!fp-&gt;fi_delegees);</div><div class='ctx'> </div><div class='del'>-	vfs_setlease(nf-&gt;nf_file, F_UNLCK, NULL, (void **)&amp;dp);</div><div class='add'>+	nfsd4_finalize_deleg_timestamps(dp, nf-&gt;nf_file);</div><div class='add'>+	kernel_setlease(nf-&gt;nf_file, F_UNLCK, NULL, (void **)&amp;dp);</div><div class='ctx'> 	put_deleg_file(fp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1260,11 +1277,6 @@ static void destroy_unhashed_deleg(struct nfs4_delegation *dp)</div><div class='ctx'> 	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void nfs4_unhash_stid(struct nfs4_stid *s)</div><div class='del'>-{</div><div class='del'>-	s-&gt;sc_type = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nfs4_delegation_exists - Discover if this delegation already exists</div><div class='ctx'>  * @clp:     a pointer to the nfs4_client we're granting a delegation to</div><div class='hunk'>@@ -1312,11 +1324,12 @@ hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(&amp;state_lock);</div><div class='ctx'> 	lockdep_assert_held(&amp;fp-&gt;fi_lock);</div><div class='add'>+	lockdep_assert_held(&amp;clp-&gt;cl_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (nfs4_delegation_exists(clp, fp))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	refcount_inc(&amp;dp-&gt;dl_stid.sc_count);</div><div class='del'>-	dp-&gt;dl_stid.sc_type = NFS4_DELEG_STID;</div><div class='add'>+	dp-&gt;dl_stid.sc_type = SC_TYPE_DELEG;</div><div class='ctx'> 	list_add(&amp;dp-&gt;dl_perfile, &amp;fp-&gt;fi_delegations);</div><div class='ctx'> 	list_add(&amp;dp-&gt;dl_perclnt, &amp;clp-&gt;cl_delegations);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1328,7 +1341,7 @@ static bool delegation_hashed(struct nfs4_delegation *dp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-unhash_delegation_locked(struct nfs4_delegation *dp)</div><div class='add'>+unhash_delegation_locked(struct nfs4_delegation *dp, unsigned short statusmask)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_file *fp = dp-&gt;dl_stid.sc_file;</div><div class='ctx'> </div><div class='hunk'>@@ -1337,7 +1350,13 @@ unhash_delegation_locked(struct nfs4_delegation *dp)</div><div class='ctx'> 	if (!delegation_hashed(dp))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	dp-&gt;dl_stid.sc_type = NFS4_CLOSED_DELEG_STID;</div><div class='add'>+	if (statusmask == SC_STATUS_REVOKED &amp;&amp;</div><div class='add'>+	    dp-&gt;dl_stid.sc_client-&gt;cl_minorversion == 0)</div><div class='add'>+		statusmask = SC_STATUS_CLOSED;</div><div class='add'>+	dp-&gt;dl_stid.sc_status |= statusmask;</div><div class='add'>+	if (statusmask &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		atomic_inc(&amp;dp-&gt;dl_stid.sc_client-&gt;cl_admin_revoked);</div><div class='add'>+</div><div class='ctx'> 	/* Ensure that deleg break won't try to requeue it */</div><div class='ctx'> 	++dp-&gt;dl_time;</div><div class='ctx'> 	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='hunk'>@@ -1353,32 +1372,59 @@ static void destroy_delegation(struct nfs4_delegation *dp)</div><div class='ctx'> 	bool unhashed;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;state_lock);</div><div class='del'>-	unhashed = unhash_delegation_locked(dp);</div><div class='add'>+	unhashed = unhash_delegation_locked(dp, SC_STATUS_CLOSED);</div><div class='ctx'> 	spin_unlock(&amp;state_lock);</div><div class='ctx'> 	if (unhashed)</div><div class='ctx'> 		destroy_unhashed_deleg(dp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * revoke_delegation - perform nfs4 delegation structure cleanup</div><div class='add'>+ * @dp: pointer to the delegation</div><div class='add'>+ *</div><div class='add'>+ * This function assumes that it's called either from the administrative</div><div class='add'>+ * interface (nfsd4_revoke_states()) that's revoking a specific delegation</div><div class='add'>+ * stateid or it's called from a laundromat thread (nfsd4_landromat()) that</div><div class='add'>+ * determined that this specific state has expired and needs to be revoked</div><div class='add'>+ * (both mark state with the appropriate stid sc_status mode). It is also</div><div class='add'>+ * assumed that a reference was taken on the @dp state.</div><div class='add'>+ *</div><div class='add'>+ * If this function finds that the @dp state is SC_STATUS_FREED it means</div><div class='add'>+ * that a FREE_STATEID operation for this stateid has been processed and</div><div class='add'>+ * we can proceed to removing it from recalled list. However, if @dp state</div><div class='add'>+ * isn't marked SC_STATUS_FREED, it means we need place it on the cl_revoked</div><div class='add'>+ * list and wait for the FREE_STATEID to arrive from the client. At the same</div><div class='add'>+ * time, we need to mark it as SC_STATUS_FREEABLE to indicate to the</div><div class='add'>+ * nfsd4_free_stateid() function that this stateid has already been added</div><div class='add'>+ * to the cl_revoked list and that nfsd4_free_stateid() is now responsible</div><div class='add'>+ * for removing it from the list. Inspection of where the delegation state</div><div class='add'>+ * in the revocation process is protected by the clp-&gt;cl_lock.</div><div class='add'>+ */</div><div class='ctx'> static void revoke_delegation(struct nfs4_delegation *dp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = dp-&gt;dl_stid.sc_client;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!list_empty(&amp;dp-&gt;dl_recall_lru));</div><div class='add'>+	WARN_ON_ONCE(dp-&gt;dl_stid.sc_client-&gt;cl_minorversion &gt; 0 &amp;&amp;</div><div class='add'>+		     !(dp-&gt;dl_stid.sc_status &amp;</div><div class='add'>+		     (SC_STATUS_REVOKED | SC_STATUS_ADMIN_REVOKED)));</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_stid_revoke(&amp;dp-&gt;dl_stid);</div><div class='ctx'> </div><div class='del'>-	if (clp-&gt;cl_minorversion) {</div><div class='del'>-		spin_lock(&amp;clp-&gt;cl_lock);</div><div class='del'>-		dp-&gt;dl_stid.sc_type = NFS4_REVOKED_DELEG_STID;</div><div class='del'>-		refcount_inc(&amp;dp-&gt;dl_stid.sc_count);</div><div class='del'>-		list_add(&amp;dp-&gt;dl_recall_lru, &amp;clp-&gt;cl_revoked);</div><div class='del'>-		spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	if (dp-&gt;dl_stid.sc_status &amp; SC_STATUS_FREED) {</div><div class='add'>+		list_del_init(&amp;dp-&gt;dl_recall_lru);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	list_add(&amp;dp-&gt;dl_recall_lru, &amp;clp-&gt;cl_revoked);</div><div class='add'>+	dp-&gt;dl_stid.sc_status |= SC_STATUS_FREEABLE;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	destroy_unhashed_deleg(dp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * SETCLIENTID state </div><div class='add'>+/*</div><div class='add'>+ * SETCLIENTID state</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static unsigned int clientid_hashval(u32 id)</div><div class='hunk'>@@ -1399,11 +1445,16 @@ static void</div><div class='ctx'> recalculate_deny_mode(struct nfs4_file *fp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ol_stateid *stp;</div><div class='add'>+	u32 old_deny;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	old_deny = fp-&gt;fi_share_deny;</div><div class='ctx'> 	fp-&gt;fi_share_deny = 0;</div><div class='del'>-	list_for_each_entry(stp, &amp;fp-&gt;fi_stateids, st_perfile)</div><div class='add'>+	list_for_each_entry(stp, &amp;fp-&gt;fi_stateids, st_perfile) {</div><div class='ctx'> 		fp-&gt;fi_share_deny |= bmap_to_share_mode(stp-&gt;st_deny_bmap);</div><div class='add'>+		if (fp-&gt;fi_share_deny == old_deny)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1491,7 +1542,8 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid)</div><div class='ctx'> 	release_all_access(stp);</div><div class='ctx'> 	if (stp-&gt;st_stateowner)</div><div class='ctx'> 		nfs4_put_stateowner(stp-&gt;st_stateowner);</div><div class='del'>-	WARN_ON(!list_empty(&amp;stid-&gt;sc_cp_list));</div><div class='add'>+	if (!list_empty(&amp;stid-&gt;sc_cp_list))</div><div class='add'>+		nfs4_free_cpntf_statelist(stid-&gt;sc_client-&gt;net, stid);</div><div class='ctx'> 	kmem_cache_free(stateid_slab, stid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1531,6 +1583,8 @@ static void put_ol_stateid_locked(struct nfs4_ol_stateid *stp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	idr_remove(&amp;clp-&gt;cl_stateids, s-&gt;sc_stateid.si_opaque.so_id);</div><div class='add'>+	if (s-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		atomic_dec(&amp;s-&gt;sc_client-&gt;cl_admin_revoked);</div><div class='ctx'> 	list_add(&amp;stp-&gt;st_locks, reaplist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1541,7 +1595,7 @@ static bool unhash_lock_stateid(struct nfs4_ol_stateid *stp)</div><div class='ctx'> 	if (!unhash_ol_stateid(stp))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	list_del_init(&amp;stp-&gt;st_locks);</div><div class='del'>-	nfs4_unhash_stid(&amp;stp-&gt;st_stid);</div><div class='add'>+	stp-&gt;st_stid.sc_status |= SC_STATUS_CLOSED;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1599,7 +1653,7 @@ static void release_open_stateid_locks(struct nfs4_ol_stateid *open_stp,</div><div class='ctx'> 	while (!list_empty(&amp;open_stp-&gt;st_locks)) {</div><div class='ctx'> 		stp = list_entry(open_stp-&gt;st_locks.next,</div><div class='ctx'> 				struct nfs4_ol_stateid, st_locks);</div><div class='del'>-		WARN_ON(!unhash_lock_stateid(stp));</div><div class='add'>+		unhash_lock_stateid(stp);</div><div class='ctx'> 		put_ol_stateid_locked(stp, reaplist);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1620,12 +1674,21 @@ static void release_open_stateid(struct nfs4_ol_stateid *stp)</div><div class='ctx'> 	LIST_HEAD(reaplist);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;stp-&gt;st_stid.sc_client-&gt;cl_lock);</div><div class='add'>+	stp-&gt;st_stid.sc_status |= SC_STATUS_CLOSED;</div><div class='ctx'> 	if (unhash_open_stateid(stp, &amp;reaplist))</div><div class='ctx'> 		put_ol_stateid_locked(stp, &amp;reaplist);</div><div class='ctx'> 	spin_unlock(&amp;stp-&gt;st_stid.sc_client-&gt;cl_lock);</div><div class='ctx'> 	free_ol_stateid_reaplist(&amp;reaplist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool nfs4_openowner_unhashed(struct nfs4_openowner *oo)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;oo-&gt;oo_owner.so_client-&gt;cl_lock);</div><div class='add'>+</div><div class='add'>+	return list_empty(&amp;oo-&gt;oo_owner.so_strhash) &amp;&amp;</div><div class='add'>+		list_empty(&amp;oo-&gt;oo_perclient);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void unhash_openowner_locked(struct nfs4_openowner *oo)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = oo-&gt;oo_owner.so_client;</div><div class='hunk'>@@ -1657,9 +1720,7 @@ static void release_openowner(struct nfs4_openowner *oo)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_ol_stateid *stp;</div><div class='ctx'> 	struct nfs4_client *clp = oo-&gt;oo_owner.so_client;</div><div class='del'>-	struct list_head reaplist;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;reaplist);</div><div class='add'>+	LIST_HEAD(reaplist);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	unhash_openowner_locked(oo);</div><div class='hunk'>@@ -1675,6 +1736,137 @@ static void release_openowner(struct nfs4_openowner *oo)</div><div class='ctx'> 	nfs4_put_stateowner(&amp;oo-&gt;oo_owner);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct nfs4_stid *find_one_sb_stid(struct nfs4_client *clp,</div><div class='add'>+					  struct super_block *sb,</div><div class='add'>+					  unsigned int sc_types)</div><div class='add'>+{</div><div class='add'>+	unsigned long id, tmp;</div><div class='add'>+	struct nfs4_stid *stid;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	idr_for_each_entry_ul(&amp;clp-&gt;cl_stateids, stid, tmp, id)</div><div class='add'>+		if ((stid-&gt;sc_type &amp; sc_types) &amp;&amp;</div><div class='add'>+		    stid-&gt;sc_status == 0 &amp;&amp;</div><div class='add'>+		    stid-&gt;sc_file-&gt;fi_inode-&gt;i_sb == sb) {</div><div class='add'>+			refcount_inc(&amp;stid-&gt;sc_count);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	return stid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd4_revoke_states - revoke all nfsv4 states associated with given filesystem</div><div class='add'>+ * @net:  used to identify instance of nfsd (there is one per net namespace)</div><div class='add'>+ * @sb:   super_block used to identify target filesystem</div><div class='add'>+ *</div><div class='add'>+ * All nfs4 states (open, lock, delegation, layout) held by the server instance</div><div class='add'>+ * and associated with a file on the given filesystem will be revoked resulting</div><div class='add'>+ * in any files being closed and so all references from nfsd to the filesystem</div><div class='add'>+ * being released.  Thus nfsd will no longer prevent the filesystem from being</div><div class='add'>+ * unmounted.</div><div class='add'>+ *</div><div class='add'>+ * The clients which own the states will subsequently being notified that the</div><div class='add'>+ * states have been "admin-revoked".</div><div class='add'>+ */</div><div class='add'>+void nfsd4_revoke_states(struct net *net, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+	unsigned int idhashval;</div><div class='add'>+	unsigned int sc_types;</div><div class='add'>+</div><div class='add'>+	sc_types = SC_TYPE_OPEN | SC_TYPE_LOCK | SC_TYPE_DELEG | SC_TYPE_LAYOUT;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nn-&gt;client_lock);</div><div class='add'>+	for (idhashval = 0; idhashval &lt; CLIENT_HASH_MASK; idhashval++) {</div><div class='add'>+		struct list_head *head = &amp;nn-&gt;conf_id_hashtbl[idhashval];</div><div class='add'>+		struct nfs4_client *clp;</div><div class='add'>+	retry:</div><div class='add'>+		list_for_each_entry(clp, head, cl_idhash) {</div><div class='add'>+			struct nfs4_stid *stid = find_one_sb_stid(clp, sb,</div><div class='add'>+								  sc_types);</div><div class='add'>+			if (stid) {</div><div class='add'>+				struct nfs4_ol_stateid *stp;</div><div class='add'>+				struct nfs4_delegation *dp;</div><div class='add'>+				struct nfs4_layout_stateid *ls;</div><div class='add'>+</div><div class='add'>+				spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+				switch (stid-&gt;sc_type) {</div><div class='add'>+				case SC_TYPE_OPEN:</div><div class='add'>+					stp = openlockstateid(stid);</div><div class='add'>+					mutex_lock_nested(&amp;stp-&gt;st_mutex,</div><div class='add'>+							  OPEN_STATEID_MUTEX);</div><div class='add'>+</div><div class='add'>+					spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+					if (stid-&gt;sc_status == 0) {</div><div class='add'>+						stid-&gt;sc_status |=</div><div class='add'>+							SC_STATUS_ADMIN_REVOKED;</div><div class='add'>+						atomic_inc(&amp;clp-&gt;cl_admin_revoked);</div><div class='add'>+						spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+						release_all_access(stp);</div><div class='add'>+					} else</div><div class='add'>+						spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+					mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='add'>+					break;</div><div class='add'>+				case SC_TYPE_LOCK:</div><div class='add'>+					stp = openlockstateid(stid);</div><div class='add'>+					mutex_lock_nested(&amp;stp-&gt;st_mutex,</div><div class='add'>+							  LOCK_STATEID_MUTEX);</div><div class='add'>+					spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+					if (stid-&gt;sc_status == 0) {</div><div class='add'>+						struct nfs4_lockowner *lo =</div><div class='add'>+							lockowner(stp-&gt;st_stateowner);</div><div class='add'>+						struct nfsd_file *nf;</div><div class='add'>+</div><div class='add'>+						stid-&gt;sc_status |=</div><div class='add'>+							SC_STATUS_ADMIN_REVOKED;</div><div class='add'>+						atomic_inc(&amp;clp-&gt;cl_admin_revoked);</div><div class='add'>+						spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+						nf = find_any_file(stp-&gt;st_stid.sc_file);</div><div class='add'>+						if (nf) {</div><div class='add'>+							get_file(nf-&gt;nf_file);</div><div class='add'>+							filp_close(nf-&gt;nf_file,</div><div class='add'>+								   (fl_owner_t)lo);</div><div class='add'>+							nfsd_file_put(nf);</div><div class='add'>+						}</div><div class='add'>+						release_all_access(stp);</div><div class='add'>+					} else</div><div class='add'>+						spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+					mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='add'>+					break;</div><div class='add'>+				case SC_TYPE_DELEG:</div><div class='add'>+					refcount_inc(&amp;stid-&gt;sc_count);</div><div class='add'>+					dp = delegstateid(stid);</div><div class='add'>+					spin_lock(&amp;state_lock);</div><div class='add'>+					if (!unhash_delegation_locked(</div><div class='add'>+						    dp, SC_STATUS_ADMIN_REVOKED))</div><div class='add'>+						dp = NULL;</div><div class='add'>+					spin_unlock(&amp;state_lock);</div><div class='add'>+					if (dp)</div><div class='add'>+						revoke_delegation(dp);</div><div class='add'>+					break;</div><div class='add'>+				case SC_TYPE_LAYOUT:</div><div class='add'>+					ls = layoutstateid(stid);</div><div class='add'>+					nfsd4_close_layout(ls);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				nfs4_put_stid(stid);</div><div class='add'>+				spin_lock(&amp;nn-&gt;client_lock);</div><div class='add'>+				if (clp-&gt;cl_minorversion == 0)</div><div class='add'>+					/* Allow cleanup after a lease period.</div><div class='add'>+					 * store_release ensures cleanup will</div><div class='add'>+					 * see any newly revoked states if it</div><div class='add'>+					 * sees the time updated.</div><div class='add'>+					 */</div><div class='add'>+					nn-&gt;nfs40_last_revoke =</div><div class='add'>+						ktime_get_boottime_seconds();</div><div class='add'>+				goto retry;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> hash_sessionid(struct nfs4_sessionid *sessionid)</div><div class='ctx'> {</div><div class='hunk'>@@ -1746,113 +1938,145 @@ gen_sessionid(struct nfsd4_session *ses)</div><div class='ctx'>  */</div><div class='ctx'> #define NFSD_MIN_HDR_SEQ_SZ  (24 + 12 + 44)</div><div class='ctx'> </div><div class='add'>+static struct shrinker *nfsd_slot_shrinker;</div><div class='add'>+static DEFINE_SPINLOCK(nfsd_session_list_lock);</div><div class='add'>+static LIST_HEAD(nfsd_session_list);</div><div class='add'>+/* The sum of "target_slots-1" on every session.  The shrinker can push this</div><div class='add'>+ * down, though it can take a little while for the memory to actually</div><div class='add'>+ * be freed.  The "-1" is because we can never free slot 0 while the</div><div class='add'>+ * session is active.</div><div class='add'>+ */</div><div class='add'>+static atomic_t nfsd_total_target_slots = ATOMIC_INIT(0);</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-free_session_slots(struct nfsd4_session *ses)</div><div class='add'>+free_session_slots(struct nfsd4_session *ses, int from)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ses-&gt;se_fchannel.maxreqs; i++) {</div><div class='del'>-		free_svc_cred(&amp;ses-&gt;se_slots[i]-&gt;sl_cred);</div><div class='del'>-		kfree(ses-&gt;se_slots[i]);</div><div class='add'>+	if (from &gt;= ses-&gt;se_fchannel.maxreqs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = from; i &lt; ses-&gt;se_fchannel.maxreqs; i++) {</div><div class='add'>+		struct nfsd4_slot *slot = xa_load(&amp;ses-&gt;se_slots, i);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Save the seqid in case we reactivate this slot.</div><div class='add'>+		 * This will never require a memory allocation so GFP</div><div class='add'>+		 * flag is irrelevant</div><div class='add'>+		 */</div><div class='add'>+		xa_store(&amp;ses-&gt;se_slots, i, xa_mk_value(slot-&gt;sl_seqid), 0);</div><div class='add'>+		free_svc_cred(&amp;slot-&gt;sl_cred);</div><div class='add'>+		kfree(slot);</div><div class='add'>+	}</div><div class='add'>+	ses-&gt;se_fchannel.maxreqs = from;</div><div class='add'>+	if (ses-&gt;se_target_maxslots &gt; from) {</div><div class='add'>+		int new_target = from ?: 1;</div><div class='add'>+		atomic_sub(ses-&gt;se_target_maxslots - new_target, &amp;nfsd_total_target_slots);</div><div class='add'>+		ses-&gt;se_target_maxslots = new_target;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We don't actually need to cache the rpc and session headers, so we</div><div class='del'>- * can allocate a little less for each slot:</div><div class='add'>+/**</div><div class='add'>+ * reduce_session_slots - reduce the target max-slots of a session if possible</div><div class='add'>+ * @ses:  The session to affect</div><div class='add'>+ * @dec:  how much to decrease the target by</div><div class='add'>+ *</div><div class='add'>+ * This interface can be used by a shrinker to reduce the target max-slots</div><div class='add'>+ * for a session so that some slots can eventually be freed.</div><div class='add'>+ * It uses spin_trylock() as it may be called in a context where another</div><div class='add'>+ * spinlock is held that has a dependency on client_lock.  As shrinkers are</div><div class='add'>+ * best-effort, skiping a session is client_lock is already held has no</div><div class='add'>+ * great coast</div><div class='add'>+ *</div><div class='add'>+ * Return value:</div><div class='add'>+ *   The number of slots that the target was reduced by.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 slot_bytes(struct nfsd4_channel_attrs *ca)</div><div class='add'>+static int</div><div class='add'>+reduce_session_slots(struct nfsd4_session *ses, int dec)</div><div class='ctx'> {</div><div class='del'>-	u32 size;</div><div class='add'>+	struct nfsd_net *nn = net_generic(ses-&gt;se_client-&gt;net,</div><div class='add'>+					  nfsd_net_id);</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (ca-&gt;maxresp_cached &lt; NFSD_MIN_HDR_SEQ_SZ)</div><div class='del'>-		size = 0;</div><div class='del'>-	else</div><div class='del'>-		size = ca-&gt;maxresp_cached - NFSD_MIN_HDR_SEQ_SZ;</div><div class='del'>-	return size + sizeof(struct nfsd4_slot);</div><div class='add'>+	if (ses-&gt;se_target_maxslots &lt;= 1)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!spin_trylock(&amp;nn-&gt;client_lock))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = min(dec, ses-&gt;se_target_maxslots-1);</div><div class='add'>+	ses-&gt;se_target_maxslots -= ret;</div><div class='add'>+	atomic_sub(ret, &amp;nfsd_total_target_slots);</div><div class='add'>+	ses-&gt;se_slot_gen += 1;</div><div class='add'>+	if (ses-&gt;se_slot_gen == 0) {</div><div class='add'>+		int i;</div><div class='add'>+		ses-&gt;se_slot_gen = 1;</div><div class='add'>+		for (i = 0; i &lt; ses-&gt;se_fchannel.maxreqs; i++) {</div><div class='add'>+			struct nfsd4_slot *slot = xa_load(&amp;ses-&gt;se_slots, i);</div><div class='add'>+			slot-&gt;sl_generation = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * XXX: If we run out of reserved DRC memory we could (up to a point)</div><div class='del'>- * re-negotiate active sessions and reduce their slot usage to make</div><div class='del'>- * room for new connections. For now we just fail the create session.</div><div class='del'>- */</div><div class='del'>-static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca, struct nfsd_net *nn)</div><div class='add'>+static struct nfsd4_slot *nfsd4_alloc_slot(struct nfsd4_channel_attrs *fattrs,</div><div class='add'>+					   int index, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	u32 slotsize = slot_bytes(ca);</div><div class='del'>-	u32 num = ca-&gt;maxreqs;</div><div class='del'>-	unsigned long avail, total_avail;</div><div class='del'>-	unsigned int scale_factor;</div><div class='add'>+	struct nfsd4_slot *slot;</div><div class='add'>+	size_t size;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;nfsd_drc_lock);</div><div class='del'>-	if (nfsd_drc_max_mem &gt; nfsd_drc_mem_used)</div><div class='del'>-		total_avail = nfsd_drc_max_mem - nfsd_drc_mem_used;</div><div class='del'>-	else</div><div class='del'>-		/* We have handed out more space than we chose in</div><div class='del'>-		 * set_max_drc() to allow.  That isn't really a</div><div class='del'>-		 * problem as long as that doesn't make us think we</div><div class='del'>-		 * have lots more due to integer overflow.</div><div class='del'>-		 */</div><div class='del'>-		total_avail = 0;</div><div class='del'>-	avail = min((unsigned long)NFSD_MAX_MEM_PER_SESSION, total_avail);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Never use more than a fraction of the remaining memory,</div><div class='del'>-	 * unless it's the only way to give this client a slot.</div><div class='del'>-	 * The chosen fraction is either 1/8 or 1/number of threads,</div><div class='del'>-	 * whichever is smaller.  This ensures there are adequate</div><div class='del'>-	 * slots to support multiple clients per thread.</div><div class='del'>-	 * Give the client one slot even if that would require</div><div class='del'>-	 * over-allocation--it is better than failure.</div><div class='add'>+	 * The RPC and NFS session headers are never saved in</div><div class='add'>+	 * the slot reply cache buffer.</div><div class='ctx'> 	 */</div><div class='del'>-	scale_factor = max_t(unsigned int, 8, nn-&gt;nfsd_serv-&gt;sv_nrthreads);</div><div class='add'>+	size = fattrs-&gt;maxresp_cached &lt; NFSD_MIN_HDR_SEQ_SZ ?</div><div class='add'>+		0 : fattrs-&gt;maxresp_cached - NFSD_MIN_HDR_SEQ_SZ;</div><div class='ctx'> </div><div class='del'>-	avail = clamp_t(unsigned long, avail, slotsize,</div><div class='del'>-			total_avail/scale_factor);</div><div class='del'>-	num = min_t(int, num, avail / slotsize);</div><div class='del'>-	num = max_t(int, num, 1);</div><div class='del'>-	nfsd_drc_mem_used += num * slotsize;</div><div class='del'>-	spin_unlock(&amp;nfsd_drc_lock);</div><div class='del'>-</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfsd4_put_drc_mem(struct nfsd4_channel_attrs *ca)</div><div class='del'>-{</div><div class='del'>-	int slotsize = slot_bytes(ca);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;nfsd_drc_lock);</div><div class='del'>-	nfsd_drc_mem_used -= slotsize * ca-&gt;maxreqs;</div><div class='del'>-	spin_unlock(&amp;nfsd_drc_lock);</div><div class='add'>+	slot = kzalloc(struct_size(slot, sl_data, size), gfp);</div><div class='add'>+	if (!slot)</div><div class='add'>+		return NULL;</div><div class='add'>+	slot-&gt;sl_index = index;</div><div class='add'>+	return slot;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs,</div><div class='ctx'> 					   struct nfsd4_channel_attrs *battrs)</div><div class='ctx'> {</div><div class='ctx'> 	int numslots = fattrs-&gt;maxreqs;</div><div class='del'>-	int slotsize = slot_bytes(fattrs);</div><div class='ctx'> 	struct nfsd4_session *new;</div><div class='add'>+	struct nfsd4_slot *slot;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(struct_size(new, se_slots, NFSD_MAX_SLOTS_PER_SESSION)</div><div class='del'>-		     &gt; PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	new = kzalloc(struct_size(new, se_slots, numslots), GFP_KERNEL);</div><div class='add'>+	new = kzalloc(sizeof(*new), GFP_KERNEL);</div><div class='ctx'> 	if (!new)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	/* allocate each struct nfsd4_slot and data cache in one piece */</div><div class='del'>-	for (i = 0; i &lt; numslots; i++) {</div><div class='del'>-		new-&gt;se_slots[i] = kzalloc(slotsize, GFP_KERNEL);</div><div class='del'>-		if (!new-&gt;se_slots[i])</div><div class='del'>-			goto out_free;</div><div class='del'>-	}</div><div class='add'>+	xa_init(&amp;new-&gt;se_slots);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;new-&gt;se_fchannel, fattrs, sizeof(struct nfsd4_channel_attrs));</div><div class='del'>-	memcpy(&amp;new-&gt;se_bchannel, battrs, sizeof(struct nfsd4_channel_attrs));</div><div class='add'>+	slot = nfsd4_alloc_slot(fattrs, 0, GFP_KERNEL);</div><div class='add'>+	if (!slot || xa_is_err(xa_store(&amp;new-&gt;se_slots, 0, slot, GFP_KERNEL)))</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='add'>+	for (i = 1; i &lt; numslots; i++) {</div><div class='add'>+		const gfp_t gfp = GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN;</div><div class='add'>+		slot = nfsd4_alloc_slot(fattrs, i, gfp);</div><div class='add'>+		if (!slot)</div><div class='add'>+			break;</div><div class='add'>+		if (xa_is_err(xa_store(&amp;new-&gt;se_slots, i, slot, gfp))) {</div><div class='add'>+			kfree(slot);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	fattrs-&gt;maxreqs = i;</div><div class='add'>+	memcpy(&amp;new-&gt;se_fchannel, fattrs, sizeof(struct nfsd4_channel_attrs));</div><div class='add'>+	new-&gt;se_target_maxslots = i;</div><div class='add'>+	atomic_add(i - 1, &amp;nfsd_total_target_slots);</div><div class='add'>+	new-&gt;se_cb_slot_avail = ~0U;</div><div class='add'>+	new-&gt;se_cb_highest_slot = min(battrs-&gt;maxreqs - 1,</div><div class='add'>+				      NFSD_BC_SLOT_TABLE_SIZE - 1);</div><div class='add'>+	spin_lock_init(&amp;new-&gt;se_lock);</div><div class='ctx'> 	return new;</div><div class='ctx'> out_free:</div><div class='del'>-	while (i--)</div><div class='del'>-		kfree(new-&gt;se_slots[i]);</div><div class='add'>+	kfree(slot);</div><div class='add'>+	xa_destroy(&amp;new-&gt;se_slots);</div><div class='ctx'> 	kfree(new);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1958,17 +2182,47 @@ static void nfsd4_del_conns(struct nfsd4_session *s)</div><div class='ctx'> </div><div class='ctx'> static void __free_session(struct nfsd4_session *ses)</div><div class='ctx'> {</div><div class='del'>-	free_session_slots(ses);</div><div class='add'>+	free_session_slots(ses, 0);</div><div class='add'>+	xa_destroy(&amp;ses-&gt;se_slots);</div><div class='ctx'> 	kfree(ses);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_session(struct nfsd4_session *ses)</div><div class='ctx'> {</div><div class='ctx'> 	nfsd4_del_conns(ses);</div><div class='del'>-	nfsd4_put_drc_mem(&amp;ses-&gt;se_fchannel);</div><div class='ctx'> 	__free_session(ses);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long</div><div class='add'>+nfsd_slot_count(struct shrinker *s, struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	unsigned long cnt = atomic_read(&amp;nfsd_total_target_slots);</div><div class='add'>+</div><div class='add'>+	return cnt ? cnt : SHRINK_EMPTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+nfsd_slot_scan(struct shrinker *s, struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_session *ses;</div><div class='add'>+	unsigned long scanned = 0;</div><div class='add'>+	unsigned long freed = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nfsd_session_list_lock);</div><div class='add'>+	list_for_each_entry(ses, &amp;nfsd_session_list, se_all_sessions) {</div><div class='add'>+		freed += reduce_session_slots(ses, 1);</div><div class='add'>+		scanned += 1;</div><div class='add'>+		if (scanned &gt;= sc-&gt;nr_to_scan) {</div><div class='add'>+			/* Move starting point for next scan */</div><div class='add'>+			list_move(&amp;nfsd_session_list, &amp;ses-&gt;se_all_sessions);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nfsd_session_list_lock);</div><div class='add'>+	sc-&gt;nr_scanned = scanned;</div><div class='add'>+	return freed;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void init_session(struct svc_rqst *rqstp, struct nfsd4_session *new, struct nfs4_client *clp, struct nfsd4_create_session *cses)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='hunk'>@@ -1979,17 +2233,24 @@ static void init_session(struct svc_rqst *rqstp, struct nfsd4_session *new, stru</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;new-&gt;se_conns);</div><div class='ctx'> </div><div class='del'>-	new-&gt;se_cb_seq_nr = 1;</div><div class='del'>-	new-&gt;se_flags = cses-&gt;flags;</div><div class='add'>+	atomic_set(&amp;new-&gt;se_ref, 0);</div><div class='add'>+	new-&gt;se_dead = false;</div><div class='ctx'> 	new-&gt;se_cb_prog = cses-&gt;callback_prog;</div><div class='ctx'> 	new-&gt;se_cb_sec = cses-&gt;cb_sec;</div><div class='del'>-	atomic_set(&amp;new-&gt;se_ref, 0);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; NFSD_BC_SLOT_TABLE_SIZE; ++idx)</div><div class='add'>+		new-&gt;se_cb_seq_nr[idx] = 1;</div><div class='add'>+</div><div class='ctx'> 	idx = hash_sessionid(&amp;new-&gt;se_sessionid);</div><div class='ctx'> 	list_add(&amp;new-&gt;se_hash, &amp;nn-&gt;sessionid_hashtbl[idx]);</div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	list_add(&amp;new-&gt;se_perclnt, &amp;clp-&gt;cl_sessions);</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;nfsd_session_list_lock);</div><div class='add'>+	list_add_tail(&amp;new-&gt;se_all_sessions, &amp;nfsd_session_list);</div><div class='add'>+	spin_unlock(&amp;nfsd_session_list_lock);</div><div class='add'>+</div><div class='ctx'> 	{</div><div class='ctx'> 		struct sockaddr *sa = svc_addr(rqstp);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2059,6 +2320,9 @@ unhash_session(struct nfsd4_session *ses)</div><div class='ctx'> 	spin_lock(&amp;ses-&gt;se_client-&gt;cl_lock);</div><div class='ctx'> 	list_del(&amp;ses-&gt;se_perclnt);</div><div class='ctx'> 	spin_unlock(&amp;ses-&gt;se_client-&gt;cl_lock);</div><div class='add'>+	spin_lock(&amp;nfsd_session_list_lock);</div><div class='add'>+	list_del(&amp;ses-&gt;se_all_sessions);</div><div class='add'>+	spin_unlock(&amp;nfsd_session_list_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* SETCLIENTID and SETCLIENTID_CONFIRM Helper functions */</div><div class='hunk'>@@ -2076,21 +2340,16 @@ STALE_CLIENTID(clientid_t *clid, struct nfsd_net *nn)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * XXX Should we use a slab cache ?</div><div class='del'>- * This type of memory management is somewhat inefficient, but we use it</div><div class='del'>- * anyway since SETCLIENTID is not a common operation.</div><div class='del'>- */</div><div class='ctx'> static struct nfs4_client *alloc_client(struct xdr_netobj name,</div><div class='ctx'> 				struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;nn-&gt;nfs4_client_count) &gt;= nn-&gt;nfs4_max_clients) {</div><div class='add'>+	if (atomic_read(&amp;nn-&gt;nfs4_client_count) &gt;= nn-&gt;nfs4_max_clients &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;nn-&gt;nfsd_courtesy_clients) &gt; 0)</div><div class='ctx'> 		mod_delayed_work(laundry_wq, &amp;nn-&gt;laundromat_work, 0);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	clp = kmem_cache_zalloc(client_slab, GFP_KERNEL);</div><div class='ctx'> 	if (clp == NULL)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -2102,6 +2361,10 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name,</div><div class='ctx'> 						 GFP_KERNEL);</div><div class='ctx'> 	if (!clp-&gt;cl_ownerstr_hashtbl)</div><div class='ctx'> 		goto err_no_hashtbl;</div><div class='add'>+	clp-&gt;cl_callback_wq = alloc_ordered_workqueue("nfsd4_callbacks", 0);</div><div class='add'>+	if (!clp-&gt;cl_callback_wq)</div><div class='add'>+		goto err_no_callback_wq;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; OWNER_HASH_SIZE; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;clp-&gt;cl_ownerstr_hashtbl[i]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;clp-&gt;cl_sessions);</div><div class='hunk'>@@ -2124,6 +2387,8 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name,</div><div class='ctx'> 	spin_lock_init(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	rpc_init_wait_queue(&amp;clp-&gt;cl_cb_waitq, "Backchannel slot table");</div><div class='ctx'> 	return clp;</div><div class='add'>+err_no_callback_wq:</div><div class='add'>+	kfree(clp-&gt;cl_ownerstr_hashtbl);</div><div class='ctx'> err_no_hashtbl:</div><div class='ctx'> 	kfree(clp-&gt;cl_name.data);</div><div class='ctx'> err_no_name:</div><div class='hunk'>@@ -2137,6 +2402,7 @@ static void __free_client(struct kref *k)</div><div class='ctx'> 	struct nfs4_client *clp = container_of(c, struct nfs4_client, cl_nfsdfs);</div><div class='ctx'> </div><div class='ctx'> 	free_svc_cred(&amp;clp-&gt;cl_cred);</div><div class='add'>+	destroy_workqueue(clp-&gt;cl_callback_wq);</div><div class='ctx'> 	kfree(clp-&gt;cl_ownerstr_hashtbl);</div><div class='ctx'> 	kfree(clp-&gt;cl_name.data);</div><div class='ctx'> 	kfree(clp-&gt;cl_nii_domain.data);</div><div class='hunk'>@@ -2192,8 +2458,12 @@ unhash_client_locked(struct nfs4_client *clp)</div><div class='ctx'> 	}</div><div class='ctx'> 	list_del_init(&amp;clp-&gt;cl_lru);</div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='del'>-	list_for_each_entry(ses, &amp;clp-&gt;cl_sessions, se_perclnt)</div><div class='add'>+	spin_lock(&amp;nfsd_session_list_lock);</div><div class='add'>+	list_for_each_entry(ses, &amp;clp-&gt;cl_sessions, se_perclnt) {</div><div class='ctx'> 		list_del_init(&amp;ses-&gt;se_hash);</div><div class='add'>+		list_del_init(&amp;ses-&gt;se_all_sessions);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nfsd_session_list_lock);</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2209,7 +2479,11 @@ unhash_client(struct nfs4_client *clp)</div><div class='ctx'> </div><div class='ctx'> static __be32 mark_client_expired_locked(struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_read(&amp;clp-&gt;cl_rpc_users))</div><div class='add'>+	int users = atomic_read(&amp;clp-&gt;cl_rpc_users);</div><div class='add'>+</div><div class='add'>+	trace_nfsd_mark_client_expired(clp, users);</div><div class='add'>+</div><div class='add'>+	if (users)</div><div class='ctx'> 		return nfserr_jukebox;</div><div class='ctx'> 	unhash_client_locked(clp);</div><div class='ctx'> 	return nfs_ok;</div><div class='hunk'>@@ -2222,13 +2496,12 @@ __destroy_client(struct nfs4_client *clp)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct nfs4_openowner *oo;</div><div class='ctx'> 	struct nfs4_delegation *dp;</div><div class='del'>-	struct list_head reaplist;</div><div class='add'>+	LIST_HEAD(reaplist);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;reaplist);</div><div class='ctx'> 	spin_lock(&amp;state_lock);</div><div class='ctx'> 	while (!list_empty(&amp;clp-&gt;cl_delegations)) {</div><div class='ctx'> 		dp = list_entry(clp-&gt;cl_delegations.next, struct nfs4_delegation, dl_perclnt);</div><div class='del'>-		WARN_ON(!unhash_delegation_locked(dp));</div><div class='add'>+		unhash_delegation_locked(dp, SC_STATUS_CLOSED);</div><div class='ctx'> 		list_add(&amp;dp-&gt;dl_recall_lru, &amp;reaplist);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;state_lock);</div><div class='hunk'>@@ -2460,14 +2733,16 @@ find_stateid_locked(struct nfs4_client *cl, stateid_t *t)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_stid *</div><div class='del'>-find_stateid_by_type(struct nfs4_client *cl, stateid_t *t, char typemask)</div><div class='add'>+find_stateid_by_type(struct nfs4_client *cl, stateid_t *t,</div><div class='add'>+		     unsigned short typemask, unsigned short ok_states)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_stid *s;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cl-&gt;cl_lock);</div><div class='ctx'> 	s = find_stateid_locked(cl, t);</div><div class='ctx'> 	if (s != NULL) {</div><div class='del'>-		if (typemask &amp; s-&gt;sc_type)</div><div class='add'>+		if ((s-&gt;sc_status &amp; ~ok_states) == 0 &amp;&amp;</div><div class='add'>+		    (typemask &amp; s-&gt;sc_type))</div><div class='ctx'> 			refcount_inc(&amp;s-&gt;sc_count);</div><div class='ctx'> 		else</div><div class='ctx'> 			s = NULL;</div><div class='hunk'>@@ -2487,9 +2762,9 @@ static struct nfs4_client *get_nfsdfs_clp(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> static void seq_quote_mem(struct seq_file *m, char *data, int len)</div><div class='ctx'> {</div><div class='del'>-	seq_printf(m, "\"");</div><div class='add'>+	seq_puts(m, "\"");</div><div class='ctx'> 	seq_escape_mem(m, data, len, ESCAPE_HEX | ESCAPE_NAP | ESCAPE_APPEND, "\"\\");</div><div class='del'>-	seq_printf(m, "\"");</div><div class='add'>+	seq_puts(m, "\"");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *cb_state2str(int state)</div><div class='hunk'>@@ -2510,6 +2785,7 @@ static const char *cb_state2str(int state)</div><div class='ctx'> static int client_info_show(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(m-&gt;file);</div><div class='add'>+	struct nfsd4_session *ses;</div><div class='ctx'> 	struct nfs4_client *clp;</div><div class='ctx'> 	u64 clid;</div><div class='ctx'> </div><div class='hunk'>@@ -2530,20 +2806,32 @@ static int client_info_show(struct seq_file *m, void *v)</div><div class='ctx'> 		seq_puts(m, "status: unconfirmed\n");</div><div class='ctx'> 	seq_printf(m, "seconds from last renew: %lld\n",</div><div class='ctx'> 		ktime_get_boottime_seconds() - clp-&gt;cl_time);</div><div class='del'>-	seq_printf(m, "name: ");</div><div class='add'>+	seq_puts(m, "name: ");</div><div class='ctx'> 	seq_quote_mem(m, clp-&gt;cl_name.data, clp-&gt;cl_name.len);</div><div class='ctx'> 	seq_printf(m, "\nminor version: %d\n", clp-&gt;cl_minorversion);</div><div class='ctx'> 	if (clp-&gt;cl_nii_domain.data) {</div><div class='del'>-		seq_printf(m, "Implementation domain: ");</div><div class='add'>+		seq_puts(m, "Implementation domain: ");</div><div class='ctx'> 		seq_quote_mem(m, clp-&gt;cl_nii_domain.data,</div><div class='ctx'> 					clp-&gt;cl_nii_domain.len);</div><div class='del'>-		seq_printf(m, "\nImplementation name: ");</div><div class='add'>+		seq_puts(m, "\nImplementation name: ");</div><div class='ctx'> 		seq_quote_mem(m, clp-&gt;cl_nii_name.data, clp-&gt;cl_nii_name.len);</div><div class='ctx'> 		seq_printf(m, "\nImplementation time: [%lld, %ld]\n",</div><div class='ctx'> 			clp-&gt;cl_nii_time.tv_sec, clp-&gt;cl_nii_time.tv_nsec);</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_printf(m, "callback state: %s\n", cb_state2str(clp-&gt;cl_cb_state));</div><div class='del'>-	seq_printf(m, "callback address: %pISpc\n", &amp;clp-&gt;cl_cb_conn.cb_addr);</div><div class='add'>+	seq_printf(m, "callback address: \"%pISpc\"\n", &amp;clp-&gt;cl_cb_conn.cb_addr);</div><div class='add'>+	seq_printf(m, "admin-revoked states: %d\n",</div><div class='add'>+		   atomic_read(&amp;clp-&gt;cl_admin_revoked));</div><div class='add'>+	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	seq_printf(m, "session slots:");</div><div class='add'>+	list_for_each_entry(ses, &amp;clp-&gt;cl_sessions, se_perclnt)</div><div class='add'>+		seq_printf(m, " %u", ses-&gt;se_fchannel.maxreqs);</div><div class='add'>+	seq_printf(m, "\nsession target slots:");</div><div class='add'>+	list_for_each_entry(ses, &amp;clp-&gt;cl_sessions, se_perclnt)</div><div class='add'>+		seq_printf(m, " %u", ses-&gt;se_target_maxslots);</div><div class='add'>+	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+</div><div class='ctx'> 	drop_client(clp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2602,7 +2890,7 @@ static void nfs4_show_superblock(struct seq_file *s, struct nfsd_file *f)</div><div class='ctx'> </div><div class='ctx'> static void nfs4_show_owner(struct seq_file *s, struct nfs4_stateowner *oo)</div><div class='ctx'> {</div><div class='del'>-	seq_printf(s, "owner: ");</div><div class='add'>+	seq_puts(s, "owner: ");</div><div class='ctx'> 	seq_quote_mem(s, oo-&gt;so_owner.data, oo-&gt;so_owner.len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2620,20 +2908,13 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)</div><div class='ctx'> 	struct nfs4_stateowner *oo;</div><div class='ctx'> 	unsigned int access, deny;</div><div class='ctx'> </div><div class='del'>-	if (st-&gt;sc_type != NFS4_OPEN_STID &amp;&amp; st-&gt;sc_type != NFS4_LOCK_STID)</div><div class='del'>-		return 0; /* XXX: or SEQ_SKIP? */</div><div class='ctx'> 	ols = openlockstateid(st);</div><div class='ctx'> 	oo = ols-&gt;st_stateowner;</div><div class='ctx'> 	nf = st-&gt;sc_file;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;nf-&gt;fi_lock);</div><div class='del'>-	file = find_any_file_locked(nf);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	seq_printf(s, "- ");</div><div class='add'>+	seq_puts(s, "- ");</div><div class='ctx'> 	nfs4_show_stateid(s, &amp;st-&gt;sc_stateid);</div><div class='del'>-	seq_printf(s, ": { type: open, ");</div><div class='add'>+	seq_puts(s, ": { type: open, ");</div><div class='ctx'> </div><div class='ctx'> 	access = bmap_to_share_mode(ols-&gt;st_access_bmap);</div><div class='ctx'> 	deny   = bmap_to_share_mode(ols-&gt;st_deny_bmap);</div><div class='hunk'>@@ -2645,14 +2926,22 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)</div><div class='ctx'> 		deny &amp; NFS4_SHARE_ACCESS_READ ? "r" : "-",</div><div class='ctx'> 		deny &amp; NFS4_SHARE_ACCESS_WRITE ? "w" : "-");</div><div class='ctx'> </div><div class='del'>-	nfs4_show_superblock(s, file);</div><div class='del'>-	seq_printf(s, ", ");</div><div class='del'>-	nfs4_show_fname(s, file);</div><div class='del'>-	seq_printf(s, ", ");</div><div class='add'>+	if (nf) {</div><div class='add'>+		spin_lock(&amp;nf-&gt;fi_lock);</div><div class='add'>+		file = find_any_file_locked(nf);</div><div class='add'>+		if (file) {</div><div class='add'>+			nfs4_show_superblock(s, file);</div><div class='add'>+			seq_puts(s, ", ");</div><div class='add'>+			nfs4_show_fname(s, file);</div><div class='add'>+			seq_puts(s, ", ");</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;nf-&gt;fi_lock);</div><div class='add'>+	} else</div><div class='add'>+		seq_puts(s, "closed, ");</div><div class='ctx'> 	nfs4_show_owner(s, oo);</div><div class='del'>-	seq_printf(s, " }\n");</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;nf-&gt;fi_lock);</div><div class='add'>+	if (st-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		seq_puts(s, ", admin-revoked");</div><div class='add'>+	seq_puts(s, " }\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2666,34 +2955,50 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st)</div><div class='ctx'> 	ols = openlockstateid(st);</div><div class='ctx'> 	oo = ols-&gt;st_stateowner;</div><div class='ctx'> 	nf = st-&gt;sc_file;</div><div class='del'>-	spin_lock(&amp;nf-&gt;fi_lock);</div><div class='del'>-	file = find_any_file_locked(nf);</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "- ");</div><div class='add'>+	seq_puts(s, "- ");</div><div class='ctx'> 	nfs4_show_stateid(s, &amp;st-&gt;sc_stateid);</div><div class='del'>-	seq_printf(s, ": { type: lock, ");</div><div class='add'>+	seq_puts(s, ": { type: lock, ");</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Note: a lock stateid isn't really the same thing as a lock,</div><div class='del'>-	 * it's the locking state held by one owner on a file, and there</div><div class='del'>-	 * may be multiple (or no) lock ranges associated with it.</div><div class='del'>-	 * (Same for the matter is true of open stateids.)</div><div class='del'>-	 */</div><div class='add'>+	spin_lock(&amp;nf-&gt;fi_lock);</div><div class='add'>+	file = find_any_file_locked(nf);</div><div class='add'>+	if (file) {</div><div class='add'>+		/*</div><div class='add'>+		 * Note: a lock stateid isn't really the same thing as a lock,</div><div class='add'>+		 * it's the locking state held by one owner on a file, and there</div><div class='add'>+		 * may be multiple (or no) lock ranges associated with it.</div><div class='add'>+		 * (Same for the matter is true of open stateids.)</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='del'>-	nfs4_show_superblock(s, file);</div><div class='del'>-	/* XXX: open stateid? */</div><div class='del'>-	seq_printf(s, ", ");</div><div class='del'>-	nfs4_show_fname(s, file);</div><div class='del'>-	seq_printf(s, ", ");</div><div class='add'>+		nfs4_show_superblock(s, file);</div><div class='add'>+		/* XXX: open stateid? */</div><div class='add'>+		seq_puts(s, ", ");</div><div class='add'>+		nfs4_show_fname(s, file);</div><div class='add'>+		seq_puts(s, ", ");</div><div class='add'>+	}</div><div class='ctx'> 	nfs4_show_owner(s, oo);</div><div class='del'>-	seq_printf(s, " }\n");</div><div class='del'>-out:</div><div class='add'>+	if (st-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		seq_puts(s, ", admin-revoked");</div><div class='add'>+	seq_puts(s, " }\n");</div><div class='ctx'> 	spin_unlock(&amp;nf-&gt;fi_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static char *nfs4_show_deleg_type(u32 dl_type)</div><div class='add'>+{</div><div class='add'>+	switch (dl_type) {</div><div class='add'>+	case OPEN_DELEGATE_READ:</div><div class='add'>+		return "r";</div><div class='add'>+	case OPEN_DELEGATE_WRITE:</div><div class='add'>+		return "w";</div><div class='add'>+	case OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='add'>+		return "ra";</div><div class='add'>+	case OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='add'>+		return "wa";</div><div class='add'>+	}</div><div class='add'>+	return "?";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_delegation *ds;</div><div class='hunk'>@@ -2702,27 +3007,27 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)</div><div class='ctx'> </div><div class='ctx'> 	ds = delegstateid(st);</div><div class='ctx'> 	nf = st-&gt;sc_file;</div><div class='del'>-	spin_lock(&amp;nf-&gt;fi_lock);</div><div class='del'>-	file = nf-&gt;fi_deleg_file;</div><div class='del'>-	if (!file)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "- ");</div><div class='add'>+	seq_puts(s, "- ");</div><div class='ctx'> 	nfs4_show_stateid(s, &amp;st-&gt;sc_stateid);</div><div class='del'>-	seq_printf(s, ": { type: deleg, ");</div><div class='add'>+	seq_puts(s, ": { type: deleg, ");</div><div class='ctx'> </div><div class='del'>-	/* Kinda dead code as long as we only support read delegs: */</div><div class='del'>-	seq_printf(s, "access: %s, ",</div><div class='del'>-		ds-&gt;dl_type == NFS4_OPEN_DELEGATE_READ ? "r" : "w");</div><div class='add'>+	seq_printf(s, "access: %s", nfs4_show_deleg_type(ds-&gt;dl_type));</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: lease time, whether it's being recalled. */</div><div class='ctx'> </div><div class='del'>-	nfs4_show_superblock(s, file);</div><div class='del'>-	seq_printf(s, ", ");</div><div class='del'>-	nfs4_show_fname(s, file);</div><div class='del'>-	seq_printf(s, " }\n");</div><div class='del'>-out:</div><div class='add'>+	spin_lock(&amp;nf-&gt;fi_lock);</div><div class='add'>+	file = nf-&gt;fi_deleg_file;</div><div class='add'>+	if (file) {</div><div class='add'>+		seq_puts(s, ", ");</div><div class='add'>+		nfs4_show_superblock(s, file);</div><div class='add'>+		seq_puts(s, ", ");</div><div class='add'>+		nfs4_show_fname(s, file);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;nf-&gt;fi_lock);</div><div class='add'>+	if (st-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		seq_puts(s, ", admin-revoked");</div><div class='add'>+	seq_puts(s, " }\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2732,18 +3037,25 @@ static int nfs4_show_layout(struct seq_file *s, struct nfs4_stid *st)</div><div class='ctx'> 	struct nfsd_file *file;</div><div class='ctx'> </div><div class='ctx'> 	ls = container_of(st, struct nfs4_layout_stateid, ls_stid);</div><div class='del'>-	file = ls-&gt;ls_file;</div><div class='ctx'> </div><div class='del'>-	seq_printf(s, "- ");</div><div class='add'>+	seq_puts(s, "- ");</div><div class='ctx'> 	nfs4_show_stateid(s, &amp;st-&gt;sc_stateid);</div><div class='del'>-	seq_printf(s, ": { type: layout, ");</div><div class='add'>+	seq_puts(s, ": { type: layout");</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: What else would be useful? */</div><div class='ctx'> </div><div class='del'>-	nfs4_show_superblock(s, file);</div><div class='del'>-	seq_printf(s, ", ");</div><div class='del'>-	nfs4_show_fname(s, file);</div><div class='del'>-	seq_printf(s, " }\n");</div><div class='add'>+	spin_lock(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lock);</div><div class='add'>+	file = ls-&gt;ls_file;</div><div class='add'>+	if (file) {</div><div class='add'>+		seq_puts(s, ", ");</div><div class='add'>+		nfs4_show_superblock(s, file);</div><div class='add'>+		seq_puts(s, ", ");</div><div class='add'>+		nfs4_show_fname(s, file);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ls-&gt;ls_stid.sc_file-&gt;fi_lock);</div><div class='add'>+	if (st-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		seq_puts(s, ", admin-revoked");</div><div class='add'>+	seq_puts(s, " }\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2753,13 +3065,13 @@ static int states_show(struct seq_file *s, void *v)</div><div class='ctx'> 	struct nfs4_stid *st = v;</div><div class='ctx'> </div><div class='ctx'> 	switch (st-&gt;sc_type) {</div><div class='del'>-	case NFS4_OPEN_STID:</div><div class='add'>+	case SC_TYPE_OPEN:</div><div class='ctx'> 		return nfs4_show_open(s, st);</div><div class='del'>-	case NFS4_LOCK_STID:</div><div class='add'>+	case SC_TYPE_LOCK:</div><div class='ctx'> 		return nfs4_show_lock(s, st);</div><div class='del'>-	case NFS4_DELEG_STID:</div><div class='add'>+	case SC_TYPE_DELEG:</div><div class='ctx'> 		return nfs4_show_deleg(s, st);</div><div class='del'>-	case NFS4_LAYOUT_STID:</div><div class='add'>+	case SC_TYPE_LAYOUT:</div><div class='ctx'> 		return nfs4_show_layout(s, st);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0; /* XXX: or SEQ_SKIP? */</div><div class='hunk'>@@ -2888,19 +3200,70 @@ static void</div><div class='ctx'> nfsd4_cb_recall_any_release(struct nfsd4_callback *cb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='del'>-	struct nfsd_net *nn = net_generic(clp-&gt;net, nfsd_net_id);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;nn-&gt;client_lock);</div><div class='del'>-	clear_bit(NFSD4_CLIENT_CB_RECALL_ANY, &amp;clp-&gt;cl_flags);</div><div class='del'>-	put_client_renew_locked(clp);</div><div class='del'>-	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+	drop_client(clp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nfsd4_cb_getattr_done(struct nfsd4_callback *cb, struct rpc_task *task)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_cb_fattr *ncf =</div><div class='add'>+			container_of(cb, struct nfs4_cb_fattr, ncf_getattr);</div><div class='add'>+	struct nfs4_delegation *dp =</div><div class='add'>+			container_of(ncf, struct nfs4_delegation, dl_cb_fattr);</div><div class='add'>+</div><div class='add'>+	trace_nfsd_cb_getattr_done(&amp;dp-&gt;dl_stid.sc_stateid, task);</div><div class='add'>+	ncf-&gt;ncf_cb_status = task-&gt;tk_status;</div><div class='add'>+	switch (task-&gt;tk_status) {</div><div class='add'>+	case -NFS4ERR_DELAY:</div><div class='add'>+		rpc_delay(task, 2 * HZ);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfsd4_cb_getattr_release(struct nfsd4_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_cb_fattr *ncf =</div><div class='add'>+			container_of(cb, struct nfs4_cb_fattr, ncf_getattr);</div><div class='add'>+	struct nfs4_delegation *dp =</div><div class='add'>+			container_of(ncf, struct nfs4_delegation, dl_cb_fattr);</div><div class='add'>+</div><div class='add'>+	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct nfsd4_callback_ops nfsd4_cb_recall_any_ops = {</div><div class='ctx'> 	.done		= nfsd4_cb_recall_any_done,</div><div class='ctx'> 	.release	= nfsd4_cb_recall_any_release,</div><div class='add'>+	.opcode		= OP_CB_RECALL_ANY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops = {</div><div class='add'>+	.done		= nfsd4_cb_getattr_done,</div><div class='add'>+	.release	= nfsd4_cb_getattr_release,</div><div class='add'>+	.opcode		= OP_CB_GETATTR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void nfs4_cb_getattr(struct nfs4_cb_fattr *ncf)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_delegation *dp =</div><div class='add'>+			container_of(ncf, struct nfs4_delegation, dl_cb_fattr);</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &amp;ncf-&gt;ncf_getattr.cb_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* set to proper status when nfsd4_cb_getattr_done runs */</div><div class='add'>+	ncf-&gt;ncf_cb_status = NFS4ERR_IO;</div><div class='add'>+</div><div class='add'>+	/* ensure that wake_bit is done when RUNNING is cleared */</div><div class='add'>+	set_bit(NFSD4_CALLBACK_WAKE, &amp;ncf-&gt;ncf_getattr.cb_flags);</div><div class='add'>+</div><div class='add'>+	refcount_inc(&amp;dp-&gt;dl_stid.sc_count);</div><div class='add'>+	nfsd4_run_cb(&amp;ncf-&gt;ncf_getattr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct nfs4_client *create_client(struct xdr_netobj name,</div><div class='ctx'> 		struct svc_rqst *rqstp, nfs4_verifier *verf)</div><div class='ctx'> {</div><div class='hunk'>@@ -2924,7 +3287,6 @@ static struct nfs4_client *create_client(struct xdr_netobj name,</div><div class='ctx'> 	kref_init(&amp;clp-&gt;cl_nfsdfs.cl_ref);</div><div class='ctx'> 	nfsd4_init_cb(&amp;clp-&gt;cl_cb_null, clp, NULL, NFSPROC4_CLNT_CB_NULL);</div><div class='ctx'> 	clp-&gt;cl_time = ktime_get_boottime_seconds();</div><div class='del'>-	clear_bit(0, &amp;clp-&gt;cl_cb_slot_busy);</div><div class='ctx'> 	copy_verf(clp, verf);</div><div class='ctx'> 	memcpy(&amp;clp-&gt;cl_addr, sa, sizeof(struct sockaddr_storage));</div><div class='ctx'> 	clp-&gt;cl_cb_session = NULL;</div><div class='hunk'>@@ -3125,7 +3487,20 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)</div><div class='ctx'> 	struct nfsd4_slot *slot = resp-&gt;cstate.slot;</div><div class='ctx'> 	unsigned int base;</div><div class='ctx'> </div><div class='del'>-	dprintk("--&gt; %s slot %p\n", __func__, slot);</div><div class='add'>+	/*</div><div class='add'>+	 * RFC 5661 Section 2.10.6.1.2:</div><div class='add'>+	 *</div><div class='add'>+	 * Any time SEQUENCE ... returns an error ... [t]he replier MUST NOT</div><div class='add'>+	 * modify the reply cache entry for the slot whenever an error is</div><div class='add'>+	 * returned from SEQUENCE ...</div><div class='add'>+	 *</div><div class='add'>+	 * Because nfsd4_store_cache_entry is called only by</div><div class='add'>+	 * nfsd4_sequence_done(), nfsd4_store_cache_entry() is called only</div><div class='add'>+	 * when a SEQUENCE operation was part of the COMPOUND.</div><div class='add'>+	 * nfs41_check_op_ordering() ensures SEQUENCE is the first op.</div><div class='add'>+	 */</div><div class='add'>+	if (resp-&gt;opcnt == 1 &amp;&amp; resp-&gt;cstate.status != nfs_ok)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	slot-&gt;sl_flags |= NFSD4_SLOT_INITIALIZED;</div><div class='ctx'> 	slot-&gt;sl_opcnt = resp-&gt;opcnt;</div><div class='hunk'>@@ -3133,7 +3508,7 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)</div><div class='ctx'> 	free_svc_cred(&amp;slot-&gt;sl_cred);</div><div class='ctx'> 	copy_cred(&amp;slot-&gt;sl_cred, &amp;resp-&gt;rqstp-&gt;rq_cred);</div><div class='ctx'> </div><div class='del'>-	if (!nfsd4_cache_this(resp)) {</div><div class='add'>+	if (!(resp-&gt;cstate.slot-&gt;sl_flags &amp; NFSD4_SLOT_CACHETHIS)) {</div><div class='ctx'> 		slot-&gt;sl_flags &amp;= ~NFSD4_SLOT_CACHED;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3148,41 +3523,6 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Encode the replay sequence operation from the slot values.</div><div class='del'>- * If cachethis is FALSE encode the uncached rep error on the next</div><div class='del'>- * operation which sets resp-&gt;p and increments resp-&gt;opcnt for</div><div class='del'>- * nfs4svc_encode_compoundres.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static __be32</div><div class='del'>-nfsd4_enc_sequence_replay(struct nfsd4_compoundargs *args,</div><div class='del'>-			  struct nfsd4_compoundres *resp)</div><div class='del'>-{</div><div class='del'>-	struct nfsd4_op *op;</div><div class='del'>-	struct nfsd4_slot *slot = resp-&gt;cstate.slot;</div><div class='del'>-</div><div class='del'>-	/* Encode the replayed sequence operation */</div><div class='del'>-	op = &amp;args-&gt;ops[resp-&gt;opcnt - 1];</div><div class='del'>-	nfsd4_encode_operation(resp, op);</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;sl_flags &amp; NFSD4_SLOT_CACHED)</div><div class='del'>-		return op-&gt;status;</div><div class='del'>-	if (args-&gt;opcnt == 1) {</div><div class='del'>-		/*</div><div class='del'>-		 * The original operation wasn't a solo sequence--we</div><div class='del'>-		 * always cache those--so this retry must not match the</div><div class='del'>-		 * original:</div><div class='del'>-		 */</div><div class='del'>-		op-&gt;status = nfserr_seq_false_retry;</div><div class='del'>-	} else {</div><div class='del'>-		op = &amp;args-&gt;ops[resp-&gt;opcnt++];</div><div class='del'>-		op-&gt;status = nfserr_retry_uncached_rep;</div><div class='del'>-		nfsd4_encode_operation(resp, op);</div><div class='del'>-	}</div><div class='del'>-	return op-&gt;status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * The sequence operation is not cached because we can use the slot and</div><div class='ctx'>  * session values.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3190,17 +3530,30 @@ static __be32</div><div class='ctx'> nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,</div><div class='ctx'> 			 struct nfsd4_sequence *seq)</div><div class='ctx'> {</div><div class='add'>+	struct nfsd4_compoundargs *args = resp-&gt;rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd4_slot *slot = resp-&gt;cstate.slot;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='ctx'> 	__be32 *p;</div><div class='del'>-	__be32 status;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("--&gt; %s slot %p\n", __func__, slot);</div><div class='ctx'> </div><div class='del'>-	status = nfsd4_enc_sequence_replay(resp-&gt;rqstp-&gt;rq_argp, resp);</div><div class='del'>-	if (status)</div><div class='del'>-		return status;</div><div class='add'>+	/* Always encode the SEQUENCE response. */</div><div class='add'>+	nfsd4_encode_operation(resp, &amp;args-&gt;ops[0]);</div><div class='add'>+	if (args-&gt;opcnt == 1)</div><div class='add'>+		/* A solo SEQUENCE - nothing was cached */</div><div class='add'>+		return args-&gt;ops[0].status;</div><div class='add'>+</div><div class='add'>+	if (!(slot-&gt;sl_flags &amp; NFSD4_SLOT_CACHED)) {</div><div class='add'>+		/* We weren't asked to cache this. */</div><div class='add'>+		struct nfsd4_op *op;</div><div class='ctx'> </div><div class='add'>+		op = &amp;args-&gt;ops[resp-&gt;opcnt++];</div><div class='add'>+		op-&gt;status = nfserr_retry_uncached_rep;</div><div class='add'>+		nfsd4_encode_operation(resp, op);</div><div class='add'>+		return op-&gt;status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* return reply from cache */</div><div class='ctx'> 	p = xdr_reserve_space(xdr, slot-&gt;sl_datalen);</div><div class='ctx'> 	if (!p) {</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='hunk'>@@ -3251,7 +3604,7 @@ static bool client_has_state(struct nfs4_client *clp)</div><div class='ctx'> #endif</div><div class='ctx'> 		|| !list_empty(&amp;clp-&gt;cl_delegations)</div><div class='ctx'> 		|| !list_empty(&amp;clp-&gt;cl_sessions)</div><div class='del'>-		|| !list_empty(&amp;clp-&gt;async_copies);</div><div class='add'>+		|| nfsd4_has_active_async_copies(clp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 copy_impl_id(struct nfs4_client *clp,</div><div class='hunk'>@@ -3289,6 +3642,12 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		__func__, rqstp, exid, exid-&gt;clname.len, exid-&gt;clname.data,</div><div class='ctx'> 		addr_str, exid-&gt;flags, exid-&gt;spa_how);</div><div class='ctx'> </div><div class='add'>+	exid-&gt;server_impl_name = kasprintf(GFP_KERNEL, "%s %s %s %s",</div><div class='add'>+					   utsname()-&gt;sysname, utsname()-&gt;release,</div><div class='add'>+					   utsname()-&gt;version, utsname()-&gt;machine);</div><div class='add'>+	if (!exid-&gt;server_impl_name)</div><div class='add'>+		return nfserr_jukebox;</div><div class='add'>+</div><div class='ctx'> 	if (exid-&gt;flags &amp; ~EXCHGID4_FLAG_MASK_A)</div><div class='ctx'> 		return nfserr_inval;</div><div class='ctx'> </div><div class='hunk'>@@ -3414,6 +3773,9 @@ out_new:</div><div class='ctx'> 	new-&gt;cl_spo_must_allow.u.words[0] = exid-&gt;spo_must_allow[0];</div><div class='ctx'> 	new-&gt;cl_spo_must_allow.u.words[1] = exid-&gt;spo_must_allow[1];</div><div class='ctx'> </div><div class='add'>+	/* Contrived initial CREATE_SESSION response */</div><div class='add'>+	new-&gt;cl_cs_slot.sl_status = nfserr_seq_misordered;</div><div class='add'>+</div><div class='ctx'> 	add_to_unconfirmed(new);</div><div class='ctx'> 	swap(new, conf);</div><div class='ctx'> out_copy:</div><div class='hunk'>@@ -3423,6 +3785,23 @@ out_copy:</div><div class='ctx'> 	exid-&gt;seqid = conf-&gt;cl_cs_slot.sl_seqid + 1;</div><div class='ctx'> 	nfsd4_set_ex_flags(conf, exid);</div><div class='ctx'> </div><div class='add'>+	exid-&gt;nii_domain.len = sizeof("kernel.org") - 1;</div><div class='add'>+	exid-&gt;nii_domain.data = "kernel.org";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note that RFC 8881 places no length limit on</div><div class='add'>+	 * nii_name, but this implementation permits no</div><div class='add'>+	 * more than NFS4_OPAQUE_LIMIT bytes.</div><div class='add'>+	 */</div><div class='add'>+	exid-&gt;nii_name.len = strlen(exid-&gt;server_impl_name);</div><div class='add'>+	if (exid-&gt;nii_name.len &gt; NFS4_OPAQUE_LIMIT)</div><div class='add'>+		exid-&gt;nii_name.len = NFS4_OPAQUE_LIMIT;</div><div class='add'>+	exid-&gt;nii_name.data = exid-&gt;server_impl_name;</div><div class='add'>+</div><div class='add'>+	/* just send zeros - the date is in nii_name */</div><div class='add'>+	exid-&gt;nii_time.tv_sec = 0;</div><div class='add'>+	exid-&gt;nii_time.tv_nsec = 0;</div><div class='add'>+</div><div class='ctx'> 	dprintk("nfsd4_exchange_id seqid %d flags %x\n",</div><div class='ctx'> 		conf-&gt;cl_cs_slot.sl_seqid, conf-&gt;cl_exchange_flags);</div><div class='ctx'> 	status = nfs_ok;</div><div class='hunk'>@@ -3439,14 +3818,18 @@ out_nolock:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __be32</div><div class='del'>-check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse)</div><div class='add'>+void</div><div class='add'>+nfsd4_exchange_id_release(union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='del'>-	dprintk("%s enter. seqid %d slot_seqid %d\n", __func__, seqid,</div><div class='del'>-		slot_seqid);</div><div class='add'>+	struct nfsd4_exchange_id *exid = &amp;u-&gt;exchange_id;</div><div class='add'>+</div><div class='add'>+	kfree(exid-&gt;server_impl_name);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static __be32 check_slot_seqid(u32 seqid, u32 slot_seqid, u8 flags)</div><div class='add'>+{</div><div class='ctx'> 	/* The slot is in use, and no response has been sent. */</div><div class='del'>-	if (slot_inuse) {</div><div class='add'>+	if (flags &amp; NFSD4_SLOT_INUSE) {</div><div class='ctx'> 		if (seqid == slot_seqid)</div><div class='ctx'> 			return nfserr_jukebox;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3455,6 +3838,8 @@ check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse)</div><div class='ctx'> 	/* Note unsigned 32-bit arithmetic handles wraparound: */</div><div class='ctx'> 	if (likely(seqid == slot_seqid + 1))</div><div class='ctx'> 		return nfs_ok;</div><div class='add'>+	if ((flags &amp; NFSD4_SLOT_REUSED) &amp;&amp; seqid == 1)</div><div class='add'>+		return nfs_ok;</div><div class='ctx'> 	if (seqid == slot_seqid)</div><div class='ctx'> 		return nfserr_replay_cache;</div><div class='ctx'> 	return nfserr_seq_misordered;</div><div class='hunk'>@@ -3513,17 +3898,6 @@ static __be32 check_forechannel_attrs(struct nfsd4_channel_attrs *ca, struct nfs</div><div class='ctx'> 	ca-&gt;maxresp_cached = min_t(u32, ca-&gt;maxresp_cached,</div><div class='ctx'> 			NFSD_SLOT_CACHE_SIZE + NFSD_MIN_HDR_SEQ_SZ);</div><div class='ctx'> 	ca-&gt;maxreqs = min_t(u32, ca-&gt;maxreqs, NFSD_MAX_SLOTS_PER_SESSION);</div><div class='del'>-	/*</div><div class='del'>-	 * Note decreasing slot size below client's request may make it</div><div class='del'>-	 * difficult for client to function correctly, whereas</div><div class='del'>-	 * decreasing the number of slots will (just?) affect</div><div class='del'>-	 * performance.  When short on memory we therefore prefer to</div><div class='del'>-	 * decrease number of slots instead of their size.  Clients that</div><div class='del'>-	 * request larger slots than they need will get poor results:</div><div class='del'>-	 * Note that we always allow at least one slot, because our</div><div class='del'>-	 * accounting is soft and provides no guarantees either way.</div><div class='del'>-	 */</div><div class='del'>-	ca-&gt;maxreqs = nfsd4_get_drc_mem(ca, nn);</div><div class='ctx'> </div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='hunk'>@@ -3584,10 +3958,10 @@ nfsd4_create_session(struct svc_rqst *rqstp,</div><div class='ctx'> 	struct nfsd4_create_session *cr_ses = &amp;u-&gt;create_session;</div><div class='ctx'> 	struct sockaddr *sa = svc_addr(rqstp);</div><div class='ctx'> 	struct nfs4_client *conf, *unconf;</div><div class='add'>+	struct nfsd4_clid_slot *cs_slot;</div><div class='ctx'> 	struct nfs4_client *old = NULL;</div><div class='ctx'> 	struct nfsd4_session *new;</div><div class='ctx'> 	struct nfsd4_conn *conn;</div><div class='del'>-	struct nfsd4_clid_slot *cs_slot = NULL;</div><div class='ctx'> 	__be32 status = 0;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> </div><div class='hunk'>@@ -3601,76 +3975,89 @@ nfsd4_create_session(struct svc_rqst *rqstp,</div><div class='ctx'> 		return status;</div><div class='ctx'> 	status = check_backchannel_attrs(&amp;cr_ses-&gt;back_channel);</div><div class='ctx'> 	if (status)</div><div class='del'>-		goto out_release_drc_mem;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	status = nfserr_jukebox;</div><div class='ctx'> 	new = alloc_session(&amp;cr_ses-&gt;fore_channel, &amp;cr_ses-&gt;back_channel);</div><div class='ctx'> 	if (!new)</div><div class='del'>-		goto out_release_drc_mem;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	conn = alloc_conn_from_crses(rqstp, cr_ses);</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		goto out_free_session;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;nn-&gt;client_lock);</div><div class='add'>+</div><div class='add'>+	/* RFC 8881 Section 18.36.4 Phase 1: Client record look-up. */</div><div class='ctx'> 	unconf = find_unconfirmed_client(&amp;cr_ses-&gt;clientid, true, nn);</div><div class='ctx'> 	conf = find_confirmed_client(&amp;cr_ses-&gt;clientid, true, nn);</div><div class='del'>-	WARN_ON_ONCE(conf &amp;&amp; unconf);</div><div class='add'>+	if (!conf &amp;&amp; !unconf) {</div><div class='add'>+		status = nfserr_stale_clientid;</div><div class='add'>+		goto out_free_conn;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* RFC 8881 Section 18.36.4 Phase 2: Sequence ID processing. */</div><div class='add'>+	if (conf) {</div><div class='add'>+		cs_slot = &amp;conf-&gt;cl_cs_slot;</div><div class='add'>+		trace_nfsd_slot_seqid_conf(conf, cr_ses);</div><div class='add'>+	} else {</div><div class='add'>+		cs_slot = &amp;unconf-&gt;cl_cs_slot;</div><div class='add'>+		trace_nfsd_slot_seqid_unconf(unconf, cr_ses);</div><div class='add'>+	}</div><div class='add'>+	status = check_slot_seqid(cr_ses-&gt;seqid, cs_slot-&gt;sl_seqid, 0);</div><div class='add'>+	switch (status) {</div><div class='add'>+	case nfs_ok:</div><div class='add'>+		cs_slot-&gt;sl_seqid++;</div><div class='add'>+		cr_ses-&gt;seqid = cs_slot-&gt;sl_seqid;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_replay_cache:</div><div class='add'>+		status = nfsd4_replay_create_session(cr_ses, cs_slot);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case nfserr_jukebox:</div><div class='add'>+		/* The server MUST NOT cache NFS4ERR_DELAY */</div><div class='add'>+		goto out_free_conn;</div><div class='add'>+	default:</div><div class='add'>+		goto out_cache_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RFC 8881 Section 18.36.4 Phase 3: Client ID confirmation. */</div><div class='ctx'> 	if (conf) {</div><div class='ctx'> 		status = nfserr_wrong_cred;</div><div class='ctx'> 		if (!nfsd4_mach_creds_match(conf, rqstp))</div><div class='del'>-			goto out_free_conn;</div><div class='del'>-		cs_slot = &amp;conf-&gt;cl_cs_slot;</div><div class='del'>-		status = check_slot_seqid(cr_ses-&gt;seqid, cs_slot-&gt;sl_seqid, 0);</div><div class='del'>-		if (status) {</div><div class='del'>-			if (status == nfserr_replay_cache)</div><div class='del'>-				status = nfsd4_replay_create_session(cr_ses, cs_slot);</div><div class='del'>-			goto out_free_conn;</div><div class='del'>-		}</div><div class='del'>-	} else if (unconf) {</div><div class='add'>+			goto out_cache_error;</div><div class='add'>+	} else {</div><div class='ctx'> 		status = nfserr_clid_inuse;</div><div class='ctx'> 		if (!same_creds(&amp;unconf-&gt;cl_cred, &amp;rqstp-&gt;rq_cred) ||</div><div class='ctx'> 		    !rpc_cmp_addr(sa, (struct sockaddr *) &amp;unconf-&gt;cl_addr)) {</div><div class='ctx'> 			trace_nfsd_clid_cred_mismatch(unconf, rqstp);</div><div class='del'>-			goto out_free_conn;</div><div class='add'>+			goto out_cache_error;</div><div class='ctx'> 		}</div><div class='ctx'> 		status = nfserr_wrong_cred;</div><div class='ctx'> 		if (!nfsd4_mach_creds_match(unconf, rqstp))</div><div class='del'>-			goto out_free_conn;</div><div class='del'>-		cs_slot = &amp;unconf-&gt;cl_cs_slot;</div><div class='del'>-		status = check_slot_seqid(cr_ses-&gt;seqid, cs_slot-&gt;sl_seqid, 0);</div><div class='del'>-		if (status) {</div><div class='del'>-			/* an unconfirmed replay returns misordered */</div><div class='del'>-			status = nfserr_seq_misordered;</div><div class='del'>-			goto out_free_conn;</div><div class='del'>-		}</div><div class='add'>+			goto out_cache_error;</div><div class='ctx'> 		old = find_confirmed_client_by_name(&amp;unconf-&gt;cl_name, nn);</div><div class='ctx'> 		if (old) {</div><div class='ctx'> 			status = mark_client_expired_locked(old);</div><div class='del'>-			if (status) {</div><div class='del'>-				old = NULL;</div><div class='del'>-				goto out_free_conn;</div><div class='del'>-			}</div><div class='add'>+			if (status)</div><div class='add'>+				goto out_expired_error;</div><div class='ctx'> 			trace_nfsd_clid_replaced(&amp;old-&gt;cl_clientid);</div><div class='ctx'> 		}</div><div class='ctx'> 		move_to_confirmed(unconf);</div><div class='ctx'> 		conf = unconf;</div><div class='del'>-	} else {</div><div class='del'>-		status = nfserr_stale_clientid;</div><div class='del'>-		goto out_free_conn;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* RFC 8881 Section 18.36.4 Phase 4: Session creation. */</div><div class='ctx'> 	status = nfs_ok;</div><div class='ctx'> 	/* Persistent sessions are not supported */</div><div class='ctx'> 	cr_ses-&gt;flags &amp;= ~SESSION4_PERSIST;</div><div class='ctx'> 	/* Upshifting from TCP to RDMA is not supported */</div><div class='ctx'> 	cr_ses-&gt;flags &amp;= ~SESSION4_RDMA;</div><div class='add'>+	/* Report the correct number of backchannel slots */</div><div class='add'>+	cr_ses-&gt;back_channel.maxreqs = new-&gt;se_cb_highest_slot + 1;</div><div class='ctx'> </div><div class='ctx'> 	init_session(rqstp, new, conf, cr_ses);</div><div class='ctx'> 	nfsd4_get_session_locked(new);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(cr_ses-&gt;sessionid.data, new-&gt;se_sessionid.data,</div><div class='ctx'> 	       NFS4_MAX_SESSIONID_LEN);</div><div class='del'>-	cs_slot-&gt;sl_seqid++;</div><div class='del'>-	cr_ses-&gt;seqid = cs_slot-&gt;sl_seqid;</div><div class='ctx'> </div><div class='ctx'> 	/* cache solo and embedded create sessions under the client_lock */</div><div class='ctx'> 	nfsd4_cache_create_session(cr_ses, cs_slot, status);</div><div class='hunk'>@@ -3683,15 +4070,25 @@ nfsd4_create_session(struct svc_rqst *rqstp,</div><div class='ctx'> 	if (old)</div><div class='ctx'> 		expire_client(old);</div><div class='ctx'> 	return status;</div><div class='add'>+</div><div class='add'>+out_expired_error:</div><div class='add'>+	/*</div><div class='add'>+	 * Revert the slot seq_nr change so the server will process</div><div class='add'>+	 * the client's resend instead of returning a cached response.</div><div class='add'>+	 */</div><div class='add'>+	if (status == nfserr_jukebox) {</div><div class='add'>+		cs_slot-&gt;sl_seqid--;</div><div class='add'>+		cr_ses-&gt;seqid = cs_slot-&gt;sl_seqid;</div><div class='add'>+		goto out_free_conn;</div><div class='add'>+	}</div><div class='add'>+out_cache_error:</div><div class='add'>+	nfsd4_cache_create_session(cr_ses, cs_slot, status);</div><div class='ctx'> out_free_conn:</div><div class='ctx'> 	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='ctx'> 	free_conn(conn);</div><div class='del'>-	if (old)</div><div class='del'>-		expire_client(old);</div><div class='ctx'> out_free_session:</div><div class='ctx'> 	__free_session(new);</div><div class='del'>-out_release_drc_mem:</div><div class='del'>-	nfsd4_put_drc_mem(&amp;cr_ses-&gt;fore_channel);</div><div class='add'>+out_err:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3944,6 +4341,36 @@ static bool replay_matches_cache(struct svc_rqst *rqstp,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Note that the response is constructed here both for the case</div><div class='add'>+ * of a new SEQUENCE request and for a replayed SEQUENCE request.</div><div class='add'>+ * We do not cache SEQUENCE responses as SEQUENCE is idempotent.</div><div class='add'>+ */</div><div class='add'>+static void nfsd4_construct_sequence_response(struct nfsd4_session *session,</div><div class='add'>+					      struct nfsd4_sequence *seq)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_client *clp = session-&gt;se_client;</div><div class='add'>+</div><div class='add'>+	seq-&gt;maxslots_response = max(session-&gt;se_target_maxslots,</div><div class='add'>+				     seq-&gt;maxslots);</div><div class='add'>+	seq-&gt;target_maxslots = session-&gt;se_target_maxslots;</div><div class='add'>+</div><div class='add'>+	switch (clp-&gt;cl_cb_state) {</div><div class='add'>+	case NFSD4_CB_DOWN:</div><div class='add'>+		seq-&gt;status_flags = SEQ4_STATUS_CB_PATH_DOWN;</div><div class='add'>+		break;</div><div class='add'>+	case NFSD4_CB_FAULT:</div><div class='add'>+		seq-&gt;status_flags = SEQ4_STATUS_BACKCHANNEL_FAULT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		seq-&gt;status_flags = 0;</div><div class='add'>+	}</div><div class='add'>+	if (!list_empty(&amp;clp-&gt;cl_revoked))</div><div class='add'>+		seq-&gt;status_flags |= SEQ4_STATUS_RECALLABLE_STATE_REVOKED;</div><div class='add'>+	if (atomic_read(&amp;clp-&gt;cl_admin_revoked))</div><div class='add'>+		seq-&gt;status_flags |= SEQ4_STATUS_ADMIN_STATE_REVOKED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __be32</div><div class='ctx'> nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		union nfsd4_op_u *u)</div><div class='hunk'>@@ -3989,16 +4416,14 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	if (seq-&gt;slotid &gt;= session-&gt;se_fchannel.maxreqs)</div><div class='ctx'> 		goto out_put_session;</div><div class='ctx'> </div><div class='del'>-	slot = session-&gt;se_slots[seq-&gt;slotid];</div><div class='add'>+	slot = xa_load(&amp;session-&gt;se_slots, seq-&gt;slotid);</div><div class='ctx'> 	dprintk("%s: slotid %d\n", __func__, seq-&gt;slotid);</div><div class='ctx'> </div><div class='del'>-	/* We do not negotiate the number of slots yet, so set the</div><div class='del'>-	 * maxslots to the session maxreqs which is used to encode</div><div class='del'>-	 * sr_highest_slotid and the sr_target_slot id to maxslots */</div><div class='del'>-	seq-&gt;maxslots = session-&gt;se_fchannel.maxreqs;</div><div class='add'>+	trace_nfsd_slot_seqid_sequence(clp, seq, slot);</div><div class='add'>+</div><div class='add'>+	nfsd4_construct_sequence_response(session, seq);</div><div class='ctx'> </div><div class='del'>-	status = check_slot_seqid(seq-&gt;seqid, slot-&gt;sl_seqid,</div><div class='del'>-					slot-&gt;sl_flags &amp; NFSD4_SLOT_INUSE);</div><div class='add'>+	status = check_slot_seqid(seq-&gt;seqid, slot-&gt;sl_seqid, slot-&gt;sl_flags);</div><div class='ctx'> 	if (status == nfserr_replay_cache) {</div><div class='ctx'> 		status = nfserr_seq_misordered;</div><div class='ctx'> 		if (!(slot-&gt;sl_flags &amp; NFSD4_SLOT_INITIALIZED))</div><div class='hunk'>@@ -4023,6 +4448,12 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out_put_session;</div><div class='ctx'> </div><div class='add'>+	if (session-&gt;se_target_maxslots &lt; session-&gt;se_fchannel.maxreqs &amp;&amp;</div><div class='add'>+	    slot-&gt;sl_generation == session-&gt;se_slot_gen &amp;&amp;</div><div class='add'>+	    seq-&gt;maxslots &lt;= session-&gt;se_target_maxslots)</div><div class='add'>+		/* Client acknowledged our reduce maxreqs */</div><div class='add'>+		free_session_slots(session, session-&gt;se_target_maxslots);</div><div class='add'>+</div><div class='ctx'> 	buflen = (seq-&gt;cachethis) ?</div><div class='ctx'> 			session-&gt;se_fchannel.maxresp_cached :</div><div class='ctx'> 			session-&gt;se_fchannel.maxresp_sz;</div><div class='hunk'>@@ -4030,12 +4461,14 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 				    nfserr_rep_too_big;</div><div class='ctx'> 	if (xdr_restrict_buflen(xdr, buflen - rqstp-&gt;rq_auth_slack))</div><div class='ctx'> 		goto out_put_session;</div><div class='del'>-	svc_reserve(rqstp, buflen);</div><div class='add'>+	svc_reserve_auth(rqstp, buflen);</div><div class='ctx'> </div><div class='ctx'> 	status = nfs_ok;</div><div class='del'>-	/* Success! bump slot seqid */</div><div class='add'>+	/* Success! accept new slot seqid */</div><div class='ctx'> 	slot-&gt;sl_seqid = seq-&gt;seqid;</div><div class='add'>+	slot-&gt;sl_flags &amp;= ~NFSD4_SLOT_REUSED;</div><div class='ctx'> 	slot-&gt;sl_flags |= NFSD4_SLOT_INUSE;</div><div class='add'>+	slot-&gt;sl_generation = session-&gt;se_slot_gen;</div><div class='ctx'> 	if (seq-&gt;cachethis)</div><div class='ctx'> 		slot-&gt;sl_flags |= NFSD4_SLOT_CACHETHIS;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -4045,19 +4478,49 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	cstate-&gt;session = session;</div><div class='ctx'> 	cstate-&gt;clp = clp;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	switch (clp-&gt;cl_cb_state) {</div><div class='del'>-	case NFSD4_CB_DOWN:</div><div class='del'>-		seq-&gt;status_flags = SEQ4_STATUS_CB_PATH_DOWN;</div><div class='del'>-		break;</div><div class='del'>-	case NFSD4_CB_FAULT:</div><div class='del'>-		seq-&gt;status_flags = SEQ4_STATUS_BACKCHANNEL_FAULT;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		seq-&gt;status_flags = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * If the client ever uses the highest available slot,</div><div class='add'>+	 * gently try to allocate another 20%.  This allows</div><div class='add'>+	 * fairly quick growth without grossly over-shooting what</div><div class='add'>+	 * the client might use.</div><div class='add'>+	 */</div><div class='add'>+	if (seq-&gt;slotid == session-&gt;se_fchannel.maxreqs - 1 &amp;&amp;</div><div class='add'>+	    session-&gt;se_target_maxslots &gt;= session-&gt;se_fchannel.maxreqs &amp;&amp;</div><div class='add'>+	    session-&gt;se_fchannel.maxreqs &lt; NFSD_MAX_SLOTS_PER_SESSION) {</div><div class='add'>+		int s = session-&gt;se_fchannel.maxreqs;</div><div class='add'>+		int cnt = DIV_ROUND_UP(s, 5);</div><div class='add'>+		void *prev_slot;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			/*</div><div class='add'>+			 * GFP_NOWAIT both allows allocation under a</div><div class='add'>+			 * spinlock, and only succeeds if there is</div><div class='add'>+			 * plenty of memory.</div><div class='add'>+			 */</div><div class='add'>+			slot = nfsd4_alloc_slot(&amp;session-&gt;se_fchannel, s,</div><div class='add'>+						GFP_NOWAIT);</div><div class='add'>+			prev_slot = xa_load(&amp;session-&gt;se_slots, s);</div><div class='add'>+			if (xa_is_value(prev_slot) &amp;&amp; slot) {</div><div class='add'>+				slot-&gt;sl_seqid = xa_to_value(prev_slot);</div><div class='add'>+				slot-&gt;sl_flags |= NFSD4_SLOT_REUSED;</div><div class='add'>+			}</div><div class='add'>+			if (slot &amp;&amp;</div><div class='add'>+			    !xa_is_err(xa_store(&amp;session-&gt;se_slots, s, slot,</div><div class='add'>+						GFP_NOWAIT))) {</div><div class='add'>+				s += 1;</div><div class='add'>+				session-&gt;se_fchannel.maxreqs = s;</div><div class='add'>+				atomic_add(s - session-&gt;se_target_maxslots,</div><div class='add'>+					   &amp;nfsd_total_target_slots);</div><div class='add'>+				session-&gt;se_target_maxslots = s;</div><div class='add'>+			} else {</div><div class='add'>+				kfree(slot);</div><div class='add'>+				slot = NULL;</div><div class='add'>+			}</div><div class='add'>+		} while (slot &amp;&amp; --cnt &gt; 0);</div><div class='ctx'> 	}</div><div class='del'>-	if (!list_empty(&amp;clp-&gt;cl_revoked))</div><div class='del'>-		seq-&gt;status_flags |= SEQ4_STATUS_RECALLABLE_STATE_REVOKED;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	trace_nfsd_seq4_status(rqstp, seq);</div><div class='ctx'> out_no_session:</div><div class='ctx'> 	if (conn)</div><div class='ctx'> 		free_conn(conn);</div><div class='hunk'>@@ -4272,10 +4735,16 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,</div><div class='ctx'> 	}</div><div class='ctx'> 	status = nfs_ok;</div><div class='ctx'> 	if (conf) {</div><div class='del'>-		old = unconf;</div><div class='del'>-		unhash_client_locked(old);</div><div class='del'>-		nfsd4_change_callback(conf, &amp;unconf-&gt;cl_cb_conn);</div><div class='del'>-	} else {</div><div class='add'>+		if (get_client_locked(conf) == nfs_ok) {</div><div class='add'>+			old = unconf;</div><div class='add'>+			unhash_client_locked(old);</div><div class='add'>+			nfsd4_change_callback(conf, &amp;unconf-&gt;cl_cb_conn);</div><div class='add'>+		} else {</div><div class='add'>+			conf = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!conf) {</div><div class='ctx'> 		old = find_confirmed_client_by_name(&amp;unconf-&gt;cl_name, nn);</div><div class='ctx'> 		if (old) {</div><div class='ctx'> 			status = nfserr_clid_inuse;</div><div class='hunk'>@@ -4292,10 +4761,14 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,</div><div class='ctx'> 			}</div><div class='ctx'> 			trace_nfsd_clid_replaced(&amp;old-&gt;cl_clientid);</div><div class='ctx'> 		}</div><div class='add'>+		status = get_client_locked(unconf);</div><div class='add'>+		if (status != nfs_ok) {</div><div class='add'>+			old = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		move_to_confirmed(unconf);</div><div class='ctx'> 		conf = unconf;</div><div class='ctx'> 	}</div><div class='del'>-	get_client_locked(conf);</div><div class='ctx'> 	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='ctx'> 	if (conf == unconf)</div><div class='ctx'> 		fsnotify_dentry(conf-&gt;cl_nfsd_info_dentry, FS_MODIFY);</div><div class='hunk'>@@ -4325,6 +4798,7 @@ static void nfsd4_file_init(const struct svc_fh *fh, struct nfs4_file *fp)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;fp-&gt;fi_clnt_odstate);</div><div class='ctx'> 	fh_copy_shallow(&amp;fp-&gt;fi_fhandle, &amp;fh-&gt;fh_handle);</div><div class='ctx'> 	fp-&gt;fi_deleg_file = NULL;</div><div class='add'>+	fp-&gt;fi_rdeleg_file = NULL;</div><div class='ctx'> 	fp-&gt;fi_had_conflict = false;</div><div class='ctx'> 	fp-&gt;fi_share_deny = 0;</div><div class='ctx'> 	memset(fp-&gt;fi_fds, 0, sizeof(fp-&gt;fi_fds));</div><div class='hunk'>@@ -4352,32 +4826,25 @@ nfsd4_free_slabs(void)</div><div class='ctx'> int</div><div class='ctx'> nfsd4_init_slabs(void)</div><div class='ctx'> {</div><div class='del'>-	client_slab = kmem_cache_create("nfsd4_clients",</div><div class='del'>-			sizeof(struct nfs4_client), 0, 0, NULL);</div><div class='add'>+	client_slab = KMEM_CACHE(nfs4_client, 0);</div><div class='ctx'> 	if (client_slab == NULL)</div><div class='ctx'> 		goto out;</div><div class='del'>-	openowner_slab = kmem_cache_create("nfsd4_openowners",</div><div class='del'>-			sizeof(struct nfs4_openowner), 0, 0, NULL);</div><div class='add'>+	openowner_slab = KMEM_CACHE(nfs4_openowner, 0);</div><div class='ctx'> 	if (openowner_slab == NULL)</div><div class='ctx'> 		goto out_free_client_slab;</div><div class='del'>-	lockowner_slab = kmem_cache_create("nfsd4_lockowners",</div><div class='del'>-			sizeof(struct nfs4_lockowner), 0, 0, NULL);</div><div class='add'>+	lockowner_slab = KMEM_CACHE(nfs4_lockowner, 0);</div><div class='ctx'> 	if (lockowner_slab == NULL)</div><div class='ctx'> 		goto out_free_openowner_slab;</div><div class='del'>-	file_slab = kmem_cache_create("nfsd4_files",</div><div class='del'>-			sizeof(struct nfs4_file), 0, 0, NULL);</div><div class='add'>+	file_slab = KMEM_CACHE(nfs4_file, 0);</div><div class='ctx'> 	if (file_slab == NULL)</div><div class='ctx'> 		goto out_free_lockowner_slab;</div><div class='del'>-	stateid_slab = kmem_cache_create("nfsd4_stateids",</div><div class='del'>-			sizeof(struct nfs4_ol_stateid), 0, 0, NULL);</div><div class='add'>+	stateid_slab = KMEM_CACHE(nfs4_ol_stateid, 0);</div><div class='ctx'> 	if (stateid_slab == NULL)</div><div class='ctx'> 		goto out_free_file_slab;</div><div class='del'>-	deleg_slab = kmem_cache_create("nfsd4_delegations",</div><div class='del'>-			sizeof(struct nfs4_delegation), 0, 0, NULL);</div><div class='add'>+	deleg_slab = KMEM_CACHE(nfs4_delegation, 0);</div><div class='ctx'> 	if (deleg_slab == NULL)</div><div class='ctx'> 		goto out_free_stateid_slab;</div><div class='del'>-	odstate_slab = kmem_cache_create("nfsd4_odstate",</div><div class='del'>-			sizeof(struct nfs4_clnt_odstate), 0, 0, NULL);</div><div class='add'>+	odstate_slab = KMEM_CACHE(nfs4_clnt_odstate, 0);</div><div class='ctx'> 	if (odstate_slab == NULL)</div><div class='ctx'> 		goto out_free_deleg_slab;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4401,8 +4868,8 @@ out:</div><div class='ctx'> static unsigned long</div><div class='ctx'> nfsd4_state_shrinker_count(struct shrinker *shrink, struct shrink_control *sc)</div><div class='ctx'> {</div><div class='del'>-	int count;</div><div class='ctx'> 	struct nfsd_net *nn = shrink-&gt;private_data;</div><div class='add'>+	long count;</div><div class='ctx'> </div><div class='ctx'> 	count = atomic_read(&amp;nn-&gt;nfsd_courtesy_clients);</div><div class='ctx'> 	if (!count)</div><div class='hunk'>@@ -4442,21 +4909,32 @@ nfsd4_init_leases_net(struct nfsd_net *nn)</div><div class='ctx'> 	atomic_set(&amp;nn-&gt;nfsd_courtesy_clients, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum rp_lock {</div><div class='add'>+	RP_UNLOCKED,</div><div class='add'>+	RP_LOCKED,</div><div class='add'>+	RP_UNHASHED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void init_nfs4_replay(struct nfs4_replay *rp)</div><div class='ctx'> {</div><div class='ctx'> 	rp-&gt;rp_status = nfserr_serverfault;</div><div class='ctx'> 	rp-&gt;rp_buflen = 0;</div><div class='ctx'> 	rp-&gt;rp_buf = rp-&gt;rp_ibuf;</div><div class='del'>-	mutex_init(&amp;rp-&gt;rp_mutex);</div><div class='add'>+	rp-&gt;rp_locked = RP_UNLOCKED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfsd4_cstate_assign_replay(struct nfsd4_compound_state *cstate,</div><div class='del'>-		struct nfs4_stateowner *so)</div><div class='add'>+static int nfsd4_cstate_assign_replay(struct nfsd4_compound_state *cstate,</div><div class='add'>+				      struct nfs4_stateowner *so)</div><div class='ctx'> {</div><div class='ctx'> 	if (!nfsd4_has_session(cstate)) {</div><div class='del'>-		mutex_lock(&amp;so-&gt;so_replay.rp_mutex);</div><div class='add'>+		wait_var_event(&amp;so-&gt;so_replay.rp_locked,</div><div class='add'>+			       cmpxchg(&amp;so-&gt;so_replay.rp_locked,</div><div class='add'>+				       RP_UNLOCKED, RP_LOCKED) != RP_LOCKED);</div><div class='add'>+		if (so-&gt;so_replay.rp_locked == RP_UNHASHED)</div><div class='add'>+			return -EAGAIN;</div><div class='ctx'> 		cstate-&gt;replay_owner = nfs4_get_stateowner(so);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate)</div><div class='hunk'>@@ -4465,7 +4943,7 @@ void nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate)</div><div class='ctx'> </div><div class='ctx'> 	if (so != NULL) {</div><div class='ctx'> 		cstate-&gt;replay_owner = NULL;</div><div class='del'>-		mutex_unlock(&amp;so-&gt;so_replay.rp_mutex);</div><div class='add'>+		store_release_wake_up(&amp;so-&gt;so_replay.rp_locked, RP_UNLOCKED);</div><div class='ctx'> 		nfs4_put_stateowner(so);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4531,7 +5009,8 @@ nfsd4_find_existing_open(struct nfs4_file *fp, struct nfsd4_open *open)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (local-&gt;st_stateowner != &amp;oo-&gt;oo_owner)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (local-&gt;st_stid.sc_type == NFS4_OPEN_STID) {</div><div class='add'>+		if (local-&gt;st_stid.sc_type == SC_TYPE_OPEN &amp;&amp;</div><div class='add'>+		    !local-&gt;st_stid.sc_status) {</div><div class='ctx'> 			ret = local;</div><div class='ctx'> 			refcount_inc(&amp;ret-&gt;st_stid.sc_count);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4540,22 +5019,75 @@ nfsd4_find_existing_open(struct nfs4_file *fp, struct nfsd4_open *open)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __be32</div><div class='del'>-nfsd4_verify_open_stid(struct nfs4_stid *s)</div><div class='add'>+static void nfsd4_drop_revoked_stid(struct nfs4_stid *s)</div><div class='add'>+	__releases(&amp;s-&gt;sc_client-&gt;cl_lock)</div><div class='ctx'> {</div><div class='del'>-	__be32 ret = nfs_ok;</div><div class='add'>+	struct nfs4_client *cl = s-&gt;sc_client;</div><div class='add'>+	LIST_HEAD(reaplist);</div><div class='add'>+	struct nfs4_ol_stateid *stp;</div><div class='add'>+	struct nfs4_delegation *dp;</div><div class='add'>+	bool unhashed;</div><div class='ctx'> </div><div class='ctx'> 	switch (s-&gt;sc_type) {</div><div class='del'>-	default:</div><div class='add'>+	case SC_TYPE_OPEN:</div><div class='add'>+		stp = openlockstateid(s);</div><div class='add'>+		if (unhash_open_stateid(stp, &amp;reaplist))</div><div class='add'>+			put_ol_stateid_locked(stp, &amp;reaplist);</div><div class='add'>+		spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='add'>+		free_ol_stateid_reaplist(&amp;reaplist);</div><div class='ctx'> 		break;</div><div class='del'>-	case 0:</div><div class='del'>-	case NFS4_CLOSED_STID:</div><div class='del'>-	case NFS4_CLOSED_DELEG_STID:</div><div class='del'>-		ret = nfserr_bad_stateid;</div><div class='add'>+	case SC_TYPE_LOCK:</div><div class='add'>+		stp = openlockstateid(s);</div><div class='add'>+		unhashed = unhash_lock_stateid(stp);</div><div class='add'>+		spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='add'>+		if (unhashed)</div><div class='add'>+			nfs4_put_stid(s);</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_REVOKED_DELEG_STID:</div><div class='del'>-		ret = nfserr_deleg_revoked;</div><div class='add'>+	case SC_TYPE_DELEG:</div><div class='add'>+		dp = delegstateid(s);</div><div class='add'>+		list_del_init(&amp;dp-&gt;dl_recall_lru);</div><div class='add'>+		spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='add'>+		nfs4_put_stid(s);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfsd40_drop_revoked_stid(struct nfs4_client *cl,</div><div class='add'>+				    stateid_t *stid)</div><div class='add'>+{</div><div class='add'>+	/* NFSv4.0 has no way for the client to tell the server</div><div class='add'>+	 * that it can forget an admin-revoked stateid.</div><div class='add'>+	 * So we keep it around until the first time that the</div><div class='add'>+	 * client uses it, and drop it the first time</div><div class='add'>+	 * nfserr_admin_revoked is returned.</div><div class='add'>+	 * For v4.1 and later we wait until explicitly told</div><div class='add'>+	 * to free the stateid.</div><div class='add'>+	 */</div><div class='add'>+	if (cl-&gt;cl_minorversion == 0) {</div><div class='add'>+		struct nfs4_stid *st;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;cl-&gt;cl_lock);</div><div class='add'>+		st = find_stateid_locked(cl, stid);</div><div class='add'>+		if (st)</div><div class='add'>+			nfsd4_drop_revoked_stid(st);</div><div class='add'>+		else</div><div class='add'>+			spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32</div><div class='add'>+nfsd4_verify_open_stid(struct nfs4_stid *s)</div><div class='add'>+{</div><div class='add'>+	__be32 ret = nfs_ok;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED)</div><div class='add'>+		ret = nfserr_admin_revoked;</div><div class='add'>+	else if (s-&gt;sc_status &amp; SC_STATUS_REVOKED)</div><div class='add'>+		ret = nfserr_deleg_revoked;</div><div class='add'>+	else if (s-&gt;sc_status &amp; SC_STATUS_CLOSED)</div><div class='add'>+		ret = nfserr_bad_stateid;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4567,6 +5099,10 @@ nfsd4_lock_ol_stateid(struct nfs4_ol_stateid *stp)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock_nested(&amp;stp-&gt;st_mutex, LOCK_STATEID_MUTEX);</div><div class='ctx'> 	ret = nfsd4_verify_open_stid(&amp;stp-&gt;st_stid);</div><div class='add'>+	if (ret == nfserr_admin_revoked)</div><div class='add'>+		nfsd40_drop_revoked_stid(stp-&gt;st_stid.sc_client,</div><div class='add'>+					&amp;stp-&gt;st_stid.sc_stateid);</div><div class='add'>+</div><div class='ctx'> 	if (ret != nfs_ok)</div><div class='ctx'> 		mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -4588,34 +5124,46 @@ nfsd4_find_and_lock_existing_open(struct nfs4_file *fp, struct nfsd4_open *open)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_openowner *</div><div class='del'>-alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open,</div><div class='del'>-			   struct nfsd4_compound_state *cstate)</div><div class='add'>+find_or_alloc_open_stateowner(unsigned int strhashval, struct nfsd4_open *open,</div><div class='add'>+			      struct nfsd4_compound_state *cstate)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = cstate-&gt;clp;</div><div class='del'>-	struct nfs4_openowner *oo, *ret;</div><div class='add'>+	struct nfs4_openowner *oo, *new = NULL;</div><div class='ctx'> </div><div class='del'>-	oo = alloc_stateowner(openowner_slab, &amp;open-&gt;op_owner, clp);</div><div class='del'>-	if (!oo)</div><div class='del'>-		return NULL;</div><div class='del'>-	oo-&gt;oo_owner.so_ops = &amp;openowner_ops;</div><div class='del'>-	oo-&gt;oo_owner.so_is_open_owner = 1;</div><div class='del'>-	oo-&gt;oo_owner.so_seqid = open-&gt;op_seqid;</div><div class='del'>-	oo-&gt;oo_flags = 0;</div><div class='del'>-	if (nfsd4_has_session(cstate))</div><div class='del'>-		oo-&gt;oo_flags |= NFS4_OO_CONFIRMED;</div><div class='del'>-	oo-&gt;oo_time = 0;</div><div class='del'>-	oo-&gt;oo_last_closed_stid = NULL;</div><div class='del'>-	INIT_LIST_HEAD(&amp;oo-&gt;oo_close_lru);</div><div class='add'>+retry:</div><div class='ctx'> 	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='del'>-	ret = find_openstateowner_str_locked(strhashval, open, clp);</div><div class='del'>-	if (ret == NULL) {</div><div class='del'>-		hash_openowner(oo, clp, strhashval);</div><div class='del'>-		ret = oo;</div><div class='del'>-	} else</div><div class='del'>-		nfs4_free_stateowner(&amp;oo-&gt;oo_owner);</div><div class='del'>-</div><div class='add'>+	oo = find_openstateowner_str(strhashval, open, clp);</div><div class='add'>+	if (!oo &amp;&amp; new) {</div><div class='add'>+		hash_openowner(new, clp, strhashval);</div><div class='add'>+		spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+		return new;</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	if (oo &amp;&amp; !(oo-&gt;oo_flags &amp; NFS4_OO_CONFIRMED)) {</div><div class='add'>+		/* Replace unconfirmed owners without checking for replay. */</div><div class='add'>+		release_openowner(oo);</div><div class='add'>+		oo = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (oo) {</div><div class='add'>+		if (new)</div><div class='add'>+			nfs4_free_stateowner(&amp;new-&gt;oo_owner);</div><div class='add'>+		return oo;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new = alloc_stateowner(openowner_slab, &amp;open-&gt;op_owner, clp);</div><div class='add'>+	if (!new)</div><div class='add'>+		return NULL;</div><div class='add'>+	new-&gt;oo_owner.so_ops = &amp;openowner_ops;</div><div class='add'>+	new-&gt;oo_owner.so_is_open_owner = 1;</div><div class='add'>+	new-&gt;oo_owner.so_seqid = open-&gt;op_seqid;</div><div class='add'>+	new-&gt;oo_flags = 0;</div><div class='add'>+	if (nfsd4_has_session(cstate))</div><div class='add'>+		new-&gt;oo_flags |= NFS4_OO_CONFIRMED;</div><div class='add'>+	new-&gt;oo_time = 0;</div><div class='add'>+	new-&gt;oo_last_closed_stid = NULL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;new-&gt;oo_close_lru);</div><div class='add'>+	goto retry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nfs4_ol_stateid *</div><div class='hunk'>@@ -4635,13 +5183,19 @@ retry:</div><div class='ctx'> 	spin_lock(&amp;oo-&gt;oo_owner.so_client-&gt;cl_lock);</div><div class='ctx'> 	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> </div><div class='add'>+	if (nfs4_openowner_unhashed(oo)) {</div><div class='add'>+		mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='add'>+		stp = NULL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	retstp = nfsd4_find_existing_open(fp, open);</div><div class='ctx'> 	if (retstp)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	open-&gt;op_stp = NULL;</div><div class='ctx'> 	refcount_inc(&amp;stp-&gt;st_stid.sc_count);</div><div class='del'>-	stp-&gt;st_stid.sc_type = NFS4_OPEN_STID;</div><div class='add'>+	stp-&gt;st_stid.sc_type = SC_TYPE_OPEN;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;stp-&gt;st_locks);</div><div class='ctx'> 	stp-&gt;st_stateowner = nfs4_get_stateowner(&amp;oo-&gt;oo_owner);</div><div class='ctx'> 	get_nfs4_file(fp);</div><div class='hunk'>@@ -4691,7 +5245,10 @@ move_to_close_lru(struct nfs4_ol_stateid *s, struct net *net)</div><div class='ctx'> 	 * Wait for the refcount to drop to 2. Since it has been unhashed,</div><div class='ctx'> 	 * there should be no danger of the refcount going back up again at</div><div class='ctx'> 	 * this point.</div><div class='add'>+	 * Some threads with a reference might be waiting for rp_locked,</div><div class='add'>+	 * so tell them to stop waiting.</div><div class='ctx'> 	 */</div><div class='add'>+	store_release_wake_up(&amp;oo-&gt;oo_owner.so_replay.rp_locked, RP_UNHASHED);</div><div class='ctx'> 	wait_event(close_wq, refcount_read(&amp;s-&gt;st_stid.sc_count) == 2);</div><div class='ctx'> </div><div class='ctx'> 	release_all_access(s);</div><div class='hunk'>@@ -4868,9 +5425,9 @@ static int nfsd4_cb_recall_done(struct nfsd4_callback *cb,</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_cb_recall_done(&amp;dp-&gt;dl_stid.sc_stateid, task);</div><div class='ctx'> </div><div class='del'>-	if (dp-&gt;dl_stid.sc_type == NFS4_CLOSED_DELEG_STID ||</div><div class='del'>-	    dp-&gt;dl_stid.sc_type == NFS4_REVOKED_DELEG_STID)</div><div class='del'>-	        return 1;</div><div class='add'>+	if (dp-&gt;dl_stid.sc_status)</div><div class='add'>+		/* CLOSED or REVOKED */</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	switch (task-&gt;tk_status) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -4905,10 +5462,16 @@ static const struct nfsd4_callback_ops nfsd4_cb_recall_ops = {</div><div class='ctx'> 	.prepare	= nfsd4_cb_recall_prepare,</div><div class='ctx'> 	.done		= nfsd4_cb_recall_done,</div><div class='ctx'> 	.release	= nfsd4_cb_recall_release,</div><div class='add'>+	.opcode		= OP_CB_RECALL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nfsd_break_one_deleg(struct nfs4_delegation *dp)</div><div class='ctx'> {</div><div class='add'>+	bool queued;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &amp;dp-&gt;dl_recall.cb_flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're assuming the state code never drops its reference</div><div class='ctx'> 	 * without first removing the lease.  Since we're in this lease</div><div class='hunk'>@@ -4917,14 +5480,17 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp)</div><div class='ctx'> 	 * we know it's safe to take a reference.</div><div class='ctx'> 	 */</div><div class='ctx'> 	refcount_inc(&amp;dp-&gt;dl_stid.sc_count);</div><div class='del'>-	WARN_ON_ONCE(!nfsd4_run_cb(&amp;dp-&gt;dl_recall));</div><div class='add'>+	queued = nfsd4_run_cb(&amp;dp-&gt;dl_recall);</div><div class='add'>+	WARN_ON_ONCE(!queued);</div><div class='add'>+	if (!queued)</div><div class='add'>+		refcount_dec(&amp;dp-&gt;dl_stid.sc_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called from break_lease() with flc_lock held. */</div><div class='ctx'> static bool</div><div class='del'>-nfsd_break_deleg_cb(struct file_lock *fl)</div><div class='add'>+nfsd_break_deleg_cb(struct file_lease *fl)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_delegation *dp = (struct nfs4_delegation *)fl-&gt;fl_owner;</div><div class='add'>+	struct nfs4_delegation *dp = (struct nfs4_delegation *) fl-&gt;c.flc_owner;</div><div class='ctx'> 	struct nfs4_file *fp = dp-&gt;dl_stid.sc_file;</div><div class='ctx'> 	struct nfs4_client *clp = dp-&gt;dl_stid.sc_client;</div><div class='ctx'> 	struct nfsd_net *nn;</div><div class='hunk'>@@ -4945,10 +5511,8 @@ nfsd_break_deleg_cb(struct file_lock *fl)</div><div class='ctx'> 	 */</div><div class='ctx'> 	fl-&gt;fl_break_time = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> 	fp-&gt;fi_had_conflict = true;</div><div class='ctx'> 	nfsd_break_one_deleg(dp);</div><div class='del'>-	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4960,27 +5524,24 @@ nfsd_break_deleg_cb(struct file_lock *fl)</div><div class='ctx'>  *   %true: Lease conflict was resolved</div><div class='ctx'>  *   %false: Lease conflict was not resolved.</div><div class='ctx'>  */</div><div class='del'>-static bool nfsd_breaker_owns_lease(struct file_lock *fl)</div><div class='add'>+static bool nfsd_breaker_owns_lease(struct file_lease *fl)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_delegation *dl = fl-&gt;fl_owner;</div><div class='add'>+	struct nfs4_delegation *dl = fl-&gt;c.flc_owner;</div><div class='ctx'> 	struct svc_rqst *rqst;</div><div class='ctx'> 	struct nfs4_client *clp;</div><div class='ctx'> </div><div class='del'>-	if (!i_am_nfsd())</div><div class='del'>-		return false;</div><div class='del'>-	rqst = kthread_data(current);</div><div class='del'>-	/* Note rq_prog == NFS_ACL_PROGRAM is also possible: */</div><div class='del'>-	if (rqst-&gt;rq_prog != NFS_PROGRAM || rqst-&gt;rq_vers &lt; 4)</div><div class='add'>+	rqst = nfsd_current_rqst();</div><div class='add'>+	if (!nfsd_v4client(rqst))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	clp = *(rqst-&gt;rq_lease_breaker);</div><div class='ctx'> 	return dl-&gt;dl_stid.sc_client == clp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nfsd_change_deleg_cb(struct file_lock *onlist, int arg,</div><div class='add'>+nfsd_change_deleg_cb(struct file_lease *onlist, int arg,</div><div class='ctx'> 		     struct list_head *dispose)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_delegation *dp = (struct nfs4_delegation *)onlist-&gt;fl_owner;</div><div class='add'>+	struct nfs4_delegation *dp = (struct nfs4_delegation *) onlist-&gt;c.flc_owner;</div><div class='ctx'> 	struct nfs4_client *clp = dp-&gt;dl_stid.sc_client;</div><div class='ctx'> </div><div class='ctx'> 	if (arg &amp; F_UNLCK) {</div><div class='hunk'>@@ -4991,7 +5552,7 @@ nfsd_change_deleg_cb(struct file_lock *onlist, int arg,</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct lock_manager_operations nfsd_lease_mng_ops = {</div><div class='add'>+static const struct lease_manager_operations nfsd_lease_mng_ops = {</div><div class='ctx'> 	.lm_breaker_owns_lease = nfsd_breaker_owns_lease,</div><div class='ctx'> 	.lm_break = nfsd_break_deleg_cb,</div><div class='ctx'> 	.lm_change = nfsd_change_deleg_cb,</div><div class='hunk'>@@ -5066,27 +5627,19 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	clp = cstate-&gt;clp;</div><div class='ctx'> </div><div class='ctx'> 	strhashval = ownerstr_hashval(&amp;open-&gt;op_owner);</div><div class='del'>-	oo = find_openstateowner_str(strhashval, open, clp);</div><div class='add'>+retry:</div><div class='add'>+	oo = find_or_alloc_open_stateowner(strhashval, open, cstate);</div><div class='ctx'> 	open-&gt;op_openowner = oo;</div><div class='del'>-	if (!oo) {</div><div class='del'>-		goto new_owner;</div><div class='del'>-	}</div><div class='del'>-	if (!(oo-&gt;oo_flags &amp; NFS4_OO_CONFIRMED)) {</div><div class='del'>-		/* Replace unconfirmed owners without checking for replay. */</div><div class='del'>-		release_openowner(oo);</div><div class='del'>-		open-&gt;op_openowner = NULL;</div><div class='del'>-		goto new_owner;</div><div class='add'>+	if (!oo)</div><div class='add'>+		return nfserr_jukebox;</div><div class='add'>+	if (nfsd4_cstate_assign_replay(cstate, &amp;oo-&gt;oo_owner) == -EAGAIN) {</div><div class='add'>+		nfs4_put_stateowner(&amp;oo-&gt;oo_owner);</div><div class='add'>+		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> 	status = nfsd4_check_seqid(cstate, &amp;oo-&gt;oo_owner, open-&gt;op_seqid);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='del'>-	goto alloc_stateid;</div><div class='del'>-new_owner:</div><div class='del'>-	oo = alloc_init_open_stateowner(strhashval, open, cstate);</div><div class='del'>-	if (oo == NULL)</div><div class='del'>-		return nfserr_jukebox;</div><div class='del'>-	open-&gt;op_openowner = oo;</div><div class='del'>-alloc_stateid:</div><div class='add'>+</div><div class='ctx'> 	open-&gt;op_stp = nfs4_alloc_open_stateid(clp);</div><div class='ctx'> 	if (!open-&gt;op_stp)</div><div class='ctx'> 		return nfserr_jukebox;</div><div class='hunk'>@@ -5104,7 +5657,7 @@ alloc_stateid:</div><div class='ctx'> static inline __be32</div><div class='ctx'> nfs4_check_delegmode(struct nfs4_delegation *dp, int flags)</div><div class='ctx'> {</div><div class='del'>-	if ((flags &amp; WR_STATE) &amp;&amp; (dp-&gt;dl_type == NFS4_OPEN_DELEGATE_READ))</div><div class='add'>+	if (!(flags &amp; RD_STATE) &amp;&amp; deleg_is_read(dp-&gt;dl_type))</div><div class='ctx'> 		return nfserr_openmode;</div><div class='ctx'> 	else</div><div class='ctx'> 		return nfs_ok;</div><div class='hunk'>@@ -5115,12 +5668,12 @@ static int share_access_to_flags(u32 share_access)</div><div class='ctx'> 	return share_access == NFS4_SHARE_ACCESS_READ ? RD_STATE : WR_STATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nfs4_delegation *find_deleg_stateid(struct nfs4_client *cl, stateid_t *s)</div><div class='add'>+static struct nfs4_delegation *find_deleg_stateid(struct nfs4_client *cl,</div><div class='add'>+						  stateid_t *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_stid *ret;</div><div class='ctx'> </div><div class='del'>-	ret = find_stateid_by_type(cl, s,</div><div class='del'>-				NFS4_DELEG_STID|NFS4_REVOKED_DELEG_STID);</div><div class='add'>+	ret = find_stateid_by_type(cl, s, SC_TYPE_DELEG, SC_STATUS_REVOKED);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return delegstateid(ret);</div><div class='hunk'>@@ -5143,10 +5696,15 @@ nfs4_check_deleg(struct nfs4_client *cl, struct nfsd4_open *open,</div><div class='ctx'> 	deleg = find_deleg_stateid(cl, &amp;open-&gt;op_delegate_stateid);</div><div class='ctx'> 	if (deleg == NULL)</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (deleg-&gt;dl_stid.sc_type == NFS4_REVOKED_DELEG_STID) {</div><div class='add'>+	if (deleg-&gt;dl_stid.sc_status &amp; SC_STATUS_ADMIN_REVOKED) {</div><div class='add'>+		nfs4_put_stid(&amp;deleg-&gt;dl_stid);</div><div class='add'>+		status = nfserr_admin_revoked;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (deleg-&gt;dl_stid.sc_status &amp; SC_STATUS_REVOKED) {</div><div class='ctx'> 		nfs4_put_stid(&amp;deleg-&gt;dl_stid);</div><div class='del'>-		if (cl-&gt;cl_minorversion)</div><div class='del'>-			status = nfserr_deleg_revoked;</div><div class='add'>+		nfsd40_drop_revoked_stid(cl, &amp;open-&gt;op_delegate_stateid);</div><div class='add'>+		status = nfserr_deleg_revoked;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	flags = share_access_to_flags(open-&gt;op_share_access);</div><div class='hunk'>@@ -5191,7 +5749,7 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (!(open-&gt;op_share_access &amp; NFS4_SHARE_ACCESS_WRITE))</div><div class='ctx'> 		return nfserr_inval;</div><div class='del'>-	return nfsd_setattr(rqstp, fh, &amp;attrs, 0, (time64_t)0);</div><div class='add'>+	return nfsd_setattr(rqstp, fh, &amp;attrs, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,</div><div class='hunk'>@@ -5331,21 +5889,19 @@ static bool nfsd4_cb_channel_good(struct nfs4_client *clp)</div><div class='ctx'> 	return clp-&gt;cl_minorversion &amp;&amp; clp-&gt;cl_cb_state == NFSD4_CB_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp,</div><div class='del'>-						int flag)</div><div class='add'>+static struct file_lease *nfs4_alloc_init_lease(struct nfs4_delegation *dp)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lease *fl;</div><div class='ctx'> </div><div class='del'>-	fl = locks_alloc_lock();</div><div class='add'>+	fl = locks_alloc_lease();</div><div class='ctx'> 	if (!fl)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	fl-&gt;fl_lmops = &amp;nfsd_lease_mng_ops;</div><div class='del'>-	fl-&gt;fl_flags = FL_DELEG;</div><div class='del'>-	fl-&gt;fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK;</div><div class='del'>-	fl-&gt;fl_end = OFFSET_MAX;</div><div class='del'>-	fl-&gt;fl_owner = (fl_owner_t)dp;</div><div class='del'>-	fl-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	fl-&gt;fl_file = dp-&gt;dl_stid.sc_file-&gt;fi_deleg_file-&gt;nf_file;</div><div class='add'>+	fl-&gt;c.flc_flags = FL_DELEG;</div><div class='add'>+	fl-&gt;c.flc_type = deleg_is_read(dp-&gt;dl_type) ? F_RDLCK : F_WRLCK;</div><div class='add'>+	fl-&gt;c.flc_owner = (fl_owner_t)dp;</div><div class='add'>+	fl-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	fl-&gt;c.flc_file = dp-&gt;dl_stid.sc_file-&gt;fi_deleg_file-&gt;nf_file;</div><div class='ctx'> 	return fl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5453,17 +6009,30 @@ nfsd4_verify_setuid_write(struct nfsd4_open *open, struct nfsd_file *nf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NFSD_V4_DELEG_TIMESTAMPS</div><div class='add'>+static bool nfsd4_want_deleg_timestamps(const struct nfsd4_open *open)</div><div class='add'>+{</div><div class='add'>+	return open-&gt;op_deleg_want &amp; OPEN4_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS;</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_NFSD_V4_DELEG_TIMESTAMPS */</div><div class='add'>+static bool nfsd4_want_deleg_timestamps(const struct nfsd4_open *open)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG NFSD_V4_DELEG_TIMESTAMPS */</div><div class='add'>+</div><div class='ctx'> static struct nfs4_delegation *</div><div class='ctx'> nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> 		    struct svc_fh *parent)</div><div class='ctx'> {</div><div class='del'>-	int status = 0;</div><div class='add'>+	bool deleg_ts = nfsd4_want_deleg_timestamps(open);</div><div class='ctx'> 	struct nfs4_client *clp = stp-&gt;st_stid.sc_client;</div><div class='ctx'> 	struct nfs4_file *fp = stp-&gt;st_stid.sc_file;</div><div class='ctx'> 	struct nfs4_clnt_odstate *odstate = stp-&gt;st_clnt_odstate;</div><div class='ctx'> 	struct nfs4_delegation *dp;</div><div class='ctx'> 	struct nfsd_file *nf = NULL;</div><div class='del'>-	struct file_lock *fl;</div><div class='add'>+	struct file_lease *fl;</div><div class='add'>+	int status = 0;</div><div class='ctx'> 	u32 dl_type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5480,15 +6049,20 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> 	 *  "An OPEN_DELEGATE_WRITE delegation allows the client to handle,</div><div class='ctx'> 	 *   on its own, all opens."</div><div class='ctx'> 	 *</div><div class='del'>-	 * Furthermore the client can use a write delegation for most READ</div><div class='del'>-	 * operations as well, so we require a O_RDWR file here.</div><div class='add'>+	 * Furthermore, section 9.1.2 says:</div><div class='ctx'> 	 *</div><div class='del'>-	 * Offer a write delegation in the case of a BOTH open, and ensure</div><div class='del'>-	 * we get the O_RDWR descriptor.</div><div class='add'>+	 *  "In the case of READ, the server may perform the corresponding</div><div class='add'>+	 *  check on the access mode, or it may choose to allow READ for</div><div class='add'>+	 *  OPEN4_SHARE_ACCESS_WRITE, to accommodate clients whose WRITE</div><div class='add'>+	 *  implementation may unavoidably do reads (e.g., due to buffer</div><div class='add'>+	 *  cache constraints)."</div><div class='add'>+	 *</div><div class='add'>+	 *  We choose to offer a write delegation for OPEN with the</div><div class='add'>+	 *  OPEN4_SHARE_ACCESS_WRITE access mode to accommodate such clients.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((open-&gt;op_share_access &amp; NFS4_SHARE_ACCESS_BOTH) == NFS4_SHARE_ACCESS_BOTH) {</div><div class='del'>-		nf = find_rw_file(fp);</div><div class='del'>-		dl_type = NFS4_OPEN_DELEGATE_WRITE;</div><div class='add'>+	if (open-&gt;op_share_access &amp; NFS4_SHARE_ACCESS_WRITE) {</div><div class='add'>+		nf = find_writeable_file(fp);</div><div class='add'>+		dl_type = deleg_ts ? OPEN_DELEGATE_WRITE_ATTRS_DELEG : OPEN_DELEGATE_WRITE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -5497,12 +6071,21 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!nf &amp;&amp; (open-&gt;op_share_access &amp; NFS4_SHARE_ACCESS_READ)) {</div><div class='ctx'> 		nf = find_readable_file(fp);</div><div class='del'>-		dl_type = NFS4_OPEN_DELEGATE_READ;</div><div class='add'>+		dl_type = deleg_ts ? OPEN_DELEGATE_READ_ATTRS_DELEG : OPEN_DELEGATE_READ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!nf)</div><div class='ctx'> 		return ERR_PTR(-EAGAIN);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * File delegations and associated locks cannot be recovered if the</div><div class='add'>+	 * export is from an NFS proxy server.</div><div class='add'>+	 */</div><div class='add'>+	if (exportfs_cannot_lock(nf-&gt;nf_file-&gt;f_path.mnt-&gt;mnt_sb-&gt;s_export_op)) {</div><div class='add'>+		nfsd_file_put(nf);</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;state_lock);</div><div class='ctx'> 	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> 	if (nfs4_delegation_exists(clp, fp))</div><div class='hunk'>@@ -5529,13 +6112,14 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> 	if (!dp)</div><div class='ctx'> 		goto out_delegees;</div><div class='ctx'> </div><div class='del'>-	fl = nfs4_alloc_init_lease(dp, dl_type);</div><div class='add'>+	fl = nfs4_alloc_init_lease(dp);</div><div class='ctx'> 	if (!fl)</div><div class='ctx'> 		goto out_clnt_odstate;</div><div class='ctx'> </div><div class='del'>-	status = vfs_setlease(fp-&gt;fi_deleg_file-&gt;nf_file, fl-&gt;fl_type, &amp;fl, NULL);</div><div class='add'>+	status = kernel_setlease(fp-&gt;fi_deleg_file-&gt;nf_file,</div><div class='add'>+				      fl-&gt;c.flc_type, &amp;fl, NULL);</div><div class='ctx'> 	if (fl)</div><div class='del'>-		locks_free_lock(fl);</div><div class='add'>+		locks_free_lease(fl);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out_clnt_odstate;</div><div class='ctx'> </div><div class='hunk'>@@ -5551,19 +6135,22 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now that the deleg is set, check again to ensure that nothing</div><div class='del'>-	 * raced in and changed the mode while we weren't lookng.</div><div class='add'>+	 * raced in and changed the mode while we weren't looking.</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = nfsd4_verify_setuid_write(open, fp-&gt;fi_deleg_file);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	status = -EAGAIN;</div><div class='add'>+	if (fp-&gt;fi_had_conflict)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;state_lock);</div><div class='add'>+	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='del'>-	if (fp-&gt;fi_had_conflict)</div><div class='del'>-		status = -EAGAIN;</div><div class='del'>-	else</div><div class='del'>-		status = hash_delegation_locked(dp, fp);</div><div class='add'>+	status = hash_delegation_locked(dp, fp);</div><div class='ctx'> 	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 	spin_unlock(&amp;state_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -5571,7 +6158,7 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> </div><div class='ctx'> 	return dp;</div><div class='ctx'> out_unlock:</div><div class='del'>-	vfs_setlease(fp-&gt;fi_deleg_file-&gt;nf_file, F_UNLCK, NULL, (void **)&amp;dp);</div><div class='add'>+	kernel_setlease(fp-&gt;fi_deleg_file-&gt;nf_file, F_UNLCK, NULL, (void **)&amp;dp);</div><div class='ctx'> out_clnt_odstate:</div><div class='ctx'> 	put_clnt_odstate(dp-&gt;dl_clnt_odstate);</div><div class='ctx'> 	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='hunk'>@@ -5582,25 +6169,76 @@ out_delegees:</div><div class='ctx'> </div><div class='ctx'> static void nfsd4_open_deleg_none_ext(struct nfsd4_open *open, int status)</div><div class='ctx'> {</div><div class='del'>-	open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_NONE_EXT;</div><div class='add'>+	open-&gt;op_delegate_type = OPEN_DELEGATE_NONE_EXT;</div><div class='ctx'> 	if (status == -EAGAIN)</div><div class='ctx'> 		open-&gt;op_why_no_deleg = WND4_CONTENTION;</div><div class='ctx'> 	else {</div><div class='ctx'> 		open-&gt;op_why_no_deleg = WND4_RESOURCE;</div><div class='ctx'> 		switch (open-&gt;op_deleg_want) {</div><div class='del'>-		case NFS4_SHARE_WANT_READ_DELEG:</div><div class='del'>-		case NFS4_SHARE_WANT_WRITE_DELEG:</div><div class='del'>-		case NFS4_SHARE_WANT_ANY_DELEG:</div><div class='add'>+		case OPEN4_SHARE_ACCESS_WANT_READ_DELEG:</div><div class='add'>+		case OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG:</div><div class='add'>+		case OPEN4_SHARE_ACCESS_WANT_ANY_DELEG:</div><div class='ctx'> 			break;</div><div class='del'>-		case NFS4_SHARE_WANT_CANCEL:</div><div class='add'>+		case OPEN4_SHARE_ACCESS_WANT_CANCEL:</div><div class='ctx'> 			open-&gt;op_why_no_deleg = WND4_CANCELLED;</div><div class='ctx'> 			break;</div><div class='del'>-		case NFS4_SHARE_WANT_NO_DELEG:</div><div class='add'>+		case OPEN4_SHARE_ACCESS_WANT_NO_DELEG:</div><div class='ctx'> 			WARN_ON_ONCE(1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool</div><div class='add'>+nfs4_delegation_stat(struct nfs4_delegation *dp, struct svc_fh *currentfh,</div><div class='add'>+		     struct kstat *stat)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_file *nf = find_writeable_file(dp-&gt;dl_stid.sc_file);</div><div class='add'>+	struct path path;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!nf)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	path.mnt = currentfh-&gt;fh_export-&gt;ex_path.mnt;</div><div class='add'>+	path.dentry = file_dentry(nf-&gt;nf_file);</div><div class='add'>+</div><div class='add'>+	rc = vfs_getattr(&amp;path, stat,</div><div class='add'>+			 STATX_MODE | STATX_SIZE | STATX_ATIME |</div><div class='add'>+			 STATX_MTIME | STATX_CTIME | STATX_CHANGE_COOKIE,</div><div class='add'>+			 AT_STATX_SYNC_AS_STAT);</div><div class='add'>+</div><div class='add'>+	nfsd_file_put(nf);</div><div class='add'>+	return rc == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add NFS4_SHARE_ACCESS_READ to the write delegation granted on OPEN</div><div class='add'>+ * with NFS4_SHARE_ACCESS_WRITE by allocating separate nfsd_file and</div><div class='add'>+ * struct file to be used for read with delegation stateid.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+nfsd4_add_rdaccess_to_wrdeleg(struct svc_rqst *rqstp, struct nfsd4_open *open,</div><div class='add'>+			      struct svc_fh *fh, struct nfs4_ol_stateid *stp)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_file *fp;</div><div class='add'>+	struct nfsd_file *nf = NULL;</div><div class='add'>+</div><div class='add'>+	if ((open-&gt;op_share_access &amp; NFS4_SHARE_ACCESS_BOTH) ==</div><div class='add'>+			NFS4_SHARE_ACCESS_WRITE) {</div><div class='add'>+		if (nfsd_file_acquire_opened(rqstp, fh, NFSD_MAY_READ, NULL, &amp;nf))</div><div class='add'>+			return (false);</div><div class='add'>+		fp = stp-&gt;st_stid.sc_file;</div><div class='add'>+		spin_lock(&amp;fp-&gt;fi_lock);</div><div class='add'>+		__nfs4_file_get_access(fp, NFS4_SHARE_ACCESS_READ);</div><div class='add'>+		fp = stp-&gt;st_stid.sc_file;</div><div class='add'>+		fp-&gt;fi_fds[O_RDONLY] = nf;</div><div class='add'>+		fp-&gt;fi_rdeleg_file = nf;</div><div class='add'>+		spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The Linux NFS server does not offer write delegations to NFSv4.0</div><div class='ctx'>  * clients in order to avoid conflicts between write delegations and</div><div class='hunk'>@@ -5626,15 +6264,18 @@ static void nfsd4_open_deleg_none_ext(struct nfsd4_open *open, int status)</div><div class='ctx'>  * open or lock state.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='del'>-		     struct svc_fh *currentfh)</div><div class='add'>+nfs4_open_delegation(struct svc_rqst *rqstp, struct nfsd4_open *open,</div><div class='add'>+		     struct nfs4_ol_stateid *stp, struct svc_fh *currentfh,</div><div class='add'>+		     struct svc_fh *fh)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_delegation *dp;</div><div class='ctx'> 	struct nfs4_openowner *oo = openowner(stp-&gt;st_stateowner);</div><div class='add'>+	bool deleg_ts = nfsd4_want_deleg_timestamps(open);</div><div class='ctx'> 	struct nfs4_client *clp = stp-&gt;st_stid.sc_client;</div><div class='ctx'> 	struct svc_fh *parent = NULL;</div><div class='del'>-	int cb_up;</div><div class='add'>+	struct nfs4_delegation *dp;</div><div class='add'>+	struct kstat stat;</div><div class='ctx'> 	int status = 0;</div><div class='add'>+	int cb_up;</div><div class='ctx'> </div><div class='ctx'> 	cb_up = nfsd4_cb_channel_good(oo-&gt;oo_owner.so_client);</div><div class='ctx'> 	open-&gt;op_recall = false;</div><div class='hunk'>@@ -5670,21 +6311,35 @@ nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,</div><div class='ctx'> 	memcpy(&amp;open-&gt;op_delegate_stateid, &amp;dp-&gt;dl_stid.sc_stateid, sizeof(dp-&gt;dl_stid.sc_stateid));</div><div class='ctx'> </div><div class='ctx'> 	if (open-&gt;op_share_access &amp; NFS4_SHARE_ACCESS_WRITE) {</div><div class='del'>-		open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_WRITE;</div><div class='add'>+		struct file *f = dp-&gt;dl_stid.sc_file-&gt;fi_deleg_file-&gt;nf_file;</div><div class='add'>+</div><div class='add'>+		if (!nfsd4_add_rdaccess_to_wrdeleg(rqstp, open, fh, stp) ||</div><div class='add'>+				!nfs4_delegation_stat(dp, currentfh, &amp;stat)) {</div><div class='add'>+			nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='add'>+			destroy_delegation(dp);</div><div class='add'>+			goto out_no_deleg;</div><div class='add'>+		}</div><div class='add'>+		open-&gt;op_delegate_type = deleg_ts ? OPEN_DELEGATE_WRITE_ATTRS_DELEG :</div><div class='add'>+						    OPEN_DELEGATE_WRITE;</div><div class='add'>+		dp-&gt;dl_cb_fattr.ncf_cur_fsize = stat.size;</div><div class='add'>+		dp-&gt;dl_cb_fattr.ncf_initial_cinfo = nfsd4_change_attribute(&amp;stat);</div><div class='add'>+		dp-&gt;dl_atime = stat.atime;</div><div class='add'>+		dp-&gt;dl_ctime = stat.ctime;</div><div class='add'>+		dp-&gt;dl_mtime = stat.mtime;</div><div class='add'>+		spin_lock(&amp;f-&gt;f_lock);</div><div class='add'>+		f-&gt;f_mode |= FMODE_NOCMTIME;</div><div class='add'>+		spin_unlock(&amp;f-&gt;f_lock);</div><div class='ctx'> 		trace_nfsd_deleg_write(&amp;dp-&gt;dl_stid.sc_stateid);</div><div class='ctx'> 	} else {</div><div class='del'>-		open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_READ;</div><div class='add'>+		open-&gt;op_delegate_type = deleg_ts &amp;&amp; nfs4_delegation_stat(dp, currentfh, &amp;stat) ?</div><div class='add'>+					 OPEN_DELEGATE_READ_ATTRS_DELEG : OPEN_DELEGATE_READ;</div><div class='add'>+		dp-&gt;dl_atime = stat.atime;</div><div class='ctx'> 		trace_nfsd_deleg_read(&amp;dp-&gt;dl_stid.sc_stateid);</div><div class='ctx'> 	}</div><div class='ctx'> 	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='ctx'> 	return;</div><div class='ctx'> out_no_deleg:</div><div class='del'>-	open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_NONE;</div><div class='del'>-	if (open-&gt;op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS &amp;&amp;</div><div class='del'>-	    open-&gt;op_delegate_type != NFS4_OPEN_DELEGATE_NONE) {</div><div class='del'>-		dprintk("NFSD: WARNING: refusing delegation reclaim\n");</div><div class='del'>-		open-&gt;op_recall = true;</div><div class='del'>-	}</div><div class='add'>+	open-&gt;op_delegate_type = OPEN_DELEGATE_NONE;</div><div class='ctx'> </div><div class='ctx'> 	/* 4.1 client asking for a delegation? */</div><div class='ctx'> 	if (open-&gt;op_deleg_want)</div><div class='hunk'>@@ -5695,21 +6350,32 @@ out_no_deleg:</div><div class='ctx'> static void nfsd4_deleg_xgrade_none_ext(struct nfsd4_open *open,</div><div class='ctx'> 					struct nfs4_delegation *dp)</div><div class='ctx'> {</div><div class='del'>-	if (open-&gt;op_deleg_want == NFS4_SHARE_WANT_READ_DELEG &amp;&amp;</div><div class='del'>-	    dp-&gt;dl_type == NFS4_OPEN_DELEGATE_WRITE) {</div><div class='del'>-		open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_NONE_EXT;</div><div class='del'>-		open-&gt;op_why_no_deleg = WND4_NOT_SUPP_DOWNGRADE;</div><div class='del'>-	} else if (open-&gt;op_deleg_want == NFS4_SHARE_WANT_WRITE_DELEG &amp;&amp;</div><div class='del'>-		   dp-&gt;dl_type == NFS4_OPEN_DELEGATE_WRITE) {</div><div class='del'>-		open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_NONE_EXT;</div><div class='del'>-		open-&gt;op_why_no_deleg = WND4_NOT_SUPP_UPGRADE;</div><div class='add'>+	if (deleg_is_write(dp-&gt;dl_type)) {</div><div class='add'>+		if (open-&gt;op_deleg_want &amp; OPEN4_SHARE_ACCESS_WANT_READ_DELEG) {</div><div class='add'>+			open-&gt;op_delegate_type = OPEN_DELEGATE_NONE_EXT;</div><div class='add'>+			open-&gt;op_why_no_deleg = WND4_NOT_SUPP_DOWNGRADE;</div><div class='add'>+		} else if (open-&gt;op_deleg_want &amp; OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG) {</div><div class='add'>+			open-&gt;op_delegate_type = OPEN_DELEGATE_NONE_EXT;</div><div class='add'>+			open-&gt;op_why_no_deleg = WND4_NOT_SUPP_UPGRADE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Otherwise the client must be confused wanting a delegation</div><div class='ctx'> 	 * it already has, therefore we don't return</div><div class='del'>-	 * NFS4_OPEN_DELEGATE_NONE_EXT and reason.</div><div class='add'>+	 * OPEN_DELEGATE_NONE_EXT and reason.</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Are we returning only a delegation stateid? */</div><div class='add'>+static bool open_xor_delegation(struct nfsd4_open *open)</div><div class='add'>+{</div><div class='add'>+	if (!(open-&gt;op_deleg_want &amp; OPEN4_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION))</div><div class='add'>+		return false;</div><div class='add'>+	/* Did we actually get a delegation? */</div><div class='add'>+	if (!deleg_is_read(open-&gt;op_delegate_type) &amp;&amp; !deleg_is_write(open-&gt;op_delegate_type))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfsd4_process_open2 - finish open processing</div><div class='ctx'>  * @rqstp: the RPC transaction being executed</div><div class='hunk'>@@ -5745,6 +6411,20 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf</div><div class='ctx'> 		status = nfs4_check_deleg(cl, open, &amp;dp);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='add'>+		if (dp &amp;&amp; nfsd4_is_deleg_cur(open) &amp;&amp;</div><div class='add'>+				(dp-&gt;dl_stid.sc_file != fp)) {</div><div class='add'>+			/*</div><div class='add'>+			 * RFC8881 section 8.2.4 mandates the server to return</div><div class='add'>+			 * NFS4ERR_BAD_STATEID if the selected table entry does</div><div class='add'>+			 * not match the current filehandle. However returning</div><div class='add'>+			 * NFS4ERR_BAD_STATEID in the OPEN can cause the client</div><div class='add'>+			 * to repeatedly retry the operation with the same</div><div class='add'>+			 * stateid, since the stateid itself is valid. To avoid</div><div class='add'>+			 * this situation NFSD returns NFS4ERR_INVAL instead.</div><div class='add'>+			 */</div><div class='add'>+			status = nfserr_inval;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		stp = nfsd4_find_and_lock_existing_open(fp, open);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		open-&gt;op_file = NULL;</div><div class='hunk'>@@ -5755,6 +6435,11 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf</div><div class='ctx'> </div><div class='ctx'> 	if (!stp) {</div><div class='ctx'> 		stp = init_open_stateid(fp, open);</div><div class='add'>+		if (!stp) {</div><div class='add'>+			status = nfserr_jukebox;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!open-&gt;op_stp)</div><div class='ctx'> 			new_stp = true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5775,7 +6460,6 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status = nfs4_get_vfs_file(rqstp, fp, current_fh, stp, open, true);</div><div class='ctx'> 		if (status) {</div><div class='del'>-			stp-&gt;st_stid.sc_type = NFS4_CLOSED_STID;</div><div class='ctx'> 			release_open_stateid(stp);</div><div class='ctx'> 			mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -5791,8 +6475,8 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf</div><div class='ctx'> 	mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (nfsd4_has_session(&amp;resp-&gt;cstate)) {</div><div class='del'>-		if (open-&gt;op_deleg_want &amp; NFS4_SHARE_WANT_NO_DELEG) {</div><div class='del'>-			open-&gt;op_delegate_type = NFS4_OPEN_DELEGATE_NONE_EXT;</div><div class='add'>+		if (open-&gt;op_deleg_want &amp; OPEN4_SHARE_ACCESS_WANT_NO_DELEG) {</div><div class='add'>+			open-&gt;op_delegate_type = OPEN_DELEGATE_NONE_EXT;</div><div class='ctx'> 			open-&gt;op_why_no_deleg = WND4_NOT_WANTED;</div><div class='ctx'> 			goto nodeleg;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5802,13 +6486,25 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf</div><div class='ctx'> 	* Attempt to hand out a delegation. No error return, because the</div><div class='ctx'> 	* OPEN succeeds even if we fail.</div><div class='ctx'> 	*/</div><div class='del'>-	nfs4_open_delegation(open, stp, &amp;resp-&gt;cstate.current_fh);</div><div class='add'>+	nfs4_open_delegation(rqstp, open, stp,</div><div class='add'>+		&amp;resp-&gt;cstate.current_fh, current_fh);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there is an existing open stateid, it must be updated and</div><div class='add'>+	 * returned. Only respect WANT_OPEN_XOR_DELEGATION when a new</div><div class='add'>+	 * open stateid would have to be created.</div><div class='add'>+	 */</div><div class='add'>+	if (new_stp &amp;&amp; open_xor_delegation(open)) {</div><div class='add'>+		memcpy(&amp;open-&gt;op_stateid, &amp;zero_stateid, sizeof(open-&gt;op_stateid));</div><div class='add'>+		open-&gt;op_rflags |= OPEN4_RESULT_NO_OPEN_STATEID;</div><div class='add'>+		release_open_stateid(stp);</div><div class='add'>+	}</div><div class='ctx'> nodeleg:</div><div class='ctx'> 	status = nfs_ok;</div><div class='ctx'> 	trace_nfsd_open(&amp;stp-&gt;st_stid.sc_stateid);</div><div class='ctx'> out:</div><div class='ctx'> 	/* 4.1 client trying to upgrade/downgrade delegation? */</div><div class='del'>-	if (open-&gt;op_delegate_type == NFS4_OPEN_DELEGATE_NONE &amp;&amp; dp &amp;&amp;</div><div class='add'>+	if (open-&gt;op_delegate_type == OPEN_DELEGATE_NONE &amp;&amp; dp &amp;&amp;</div><div class='ctx'> 	    open-&gt;op_deleg_want)</div><div class='ctx'> 		nfsd4_deleg_xgrade_none_ext(open, dp);</div><div class='ctx'> </div><div class='hunk'>@@ -5819,7 +6515,7 @@ out:</div><div class='ctx'> 	/*</div><div class='ctx'> 	* To finish the open response, we just need to set the rflags.</div><div class='ctx'> 	*/</div><div class='del'>-	open-&gt;op_rflags = NFS4_OPEN_RESULT_LOCKTYPE_POSIX;</div><div class='add'>+	open-&gt;op_rflags |= NFS4_OPEN_RESULT_LOCKTYPE_POSIX;</div><div class='ctx'> 	if (nfsd4_has_session(&amp;resp-&gt;cstate))</div><div class='ctx'> 		open-&gt;op_rflags |= NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK;</div><div class='ctx'> 	else if (!(open-&gt;op_openowner-&gt;oo_flags &amp; NFS4_OO_CONFIRMED))</div><div class='hunk'>@@ -5836,12 +6532,8 @@ out:</div><div class='ctx'> void nfsd4_cleanup_open_state(struct nfsd4_compound_state *cstate,</div><div class='ctx'> 			      struct nfsd4_open *open)</div><div class='ctx'> {</div><div class='del'>-	if (open-&gt;op_openowner) {</div><div class='del'>-		struct nfs4_stateowner *so = &amp;open-&gt;op_openowner-&gt;oo_owner;</div><div class='del'>-</div><div class='del'>-		nfsd4_cstate_assign_replay(cstate, so);</div><div class='del'>-		nfs4_put_stateowner(so);</div><div class='del'>-	}</div><div class='add'>+	if (open-&gt;op_openowner)</div><div class='add'>+		nfs4_put_stateowner(&amp;open-&gt;op_openowner-&gt;oo_owner);</div><div class='ctx'> 	if (open-&gt;op_file)</div><div class='ctx'> 		kmem_cache_free(file_slab, open-&gt;op_file);</div><div class='ctx'> 	if (open-&gt;op_stp)</div><div class='hunk'>@@ -5951,7 +6643,6 @@ void nfsd4_ssc_init_umount_work(struct nfsd_net *nn)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;nn-&gt;nfsd_ssc_mount_list);</div><div class='ctx'> 	init_waitqueue_head(&amp;nn-&gt;nfsd_ssc_waitq);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(nfsd4_ssc_init_umount_work);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is called when nfsd is being shutdown, after all inter_ssc</div><div class='hunk'>@@ -6129,6 +6820,43 @@ nfs4_process_client_reaplist(struct list_head *reaplist)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nfs40_clean_admin_revoked(struct nfsd_net *nn,</div><div class='add'>+				      struct laundry_time *lt)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_client *clp;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;nn-&gt;client_lock);</div><div class='add'>+	if (nn-&gt;nfs40_last_revoke == 0 ||</div><div class='add'>+	    nn-&gt;nfs40_last_revoke &gt; lt-&gt;cutoff) {</div><div class='add'>+		spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	nn-&gt;nfs40_last_revoke = 0;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	list_for_each_entry(clp, &amp;nn-&gt;client_lru, cl_lru) {</div><div class='add'>+		unsigned long id, tmp;</div><div class='add'>+		struct nfs4_stid *stid;</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;clp-&gt;cl_admin_revoked) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+		idr_for_each_entry_ul(&amp;clp-&gt;cl_stateids, stid, tmp, id)</div><div class='add'>+			if (stid-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED) {</div><div class='add'>+				refcount_inc(&amp;stid-&gt;sc_count);</div><div class='add'>+				spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+				/* this function drops -&gt;cl_lock */</div><div class='add'>+				nfsd4_drop_revoked_stid(stid);</div><div class='add'>+				nfs4_put_stid(stid);</div><div class='add'>+				spin_lock(&amp;nn-&gt;client_lock);</div><div class='add'>+				goto retry;</div><div class='add'>+			}</div><div class='add'>+		spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static time64_t</div><div class='ctx'> nfs4_laundromat(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='hunk'>@@ -6159,15 +6887,19 @@ nfs4_laundromat(struct nfsd_net *nn)</div><div class='ctx'> 			_free_cpntf_state_locked(nn, cps);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;nn-&gt;s2s_cp_lock);</div><div class='add'>+	nfsd4_async_copy_reaper(nn);</div><div class='ctx'> 	nfs4_get_client_reaplist(nn, &amp;reaplist, &amp;lt);</div><div class='ctx'> 	nfs4_process_client_reaplist(&amp;reaplist);</div><div class='ctx'> </div><div class='add'>+	nfs40_clean_admin_revoked(nn, &amp;lt);</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;state_lock);</div><div class='ctx'> 	list_for_each_safe(pos, next, &amp;nn-&gt;del_recall_lru) {</div><div class='ctx'> 		dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);</div><div class='ctx'> 		if (!state_expired(&amp;lt, dp-&gt;dl_time))</div><div class='ctx'> 			break;</div><div class='del'>-		WARN_ON(!unhash_delegation_locked(dp));</div><div class='add'>+		refcount_inc(&amp;dp-&gt;dl_stid.sc_count);</div><div class='add'>+		unhash_delegation_locked(dp, SC_STATUS_REVOKED);</div><div class='ctx'> 		list_add(&amp;dp-&gt;dl_recall_lru, &amp;reaplist);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;state_lock);</div><div class='hunk'>@@ -6226,6 +6958,8 @@ nfs4_laundromat(struct nfsd_net *nn)</div><div class='ctx'> 	/* service the server-to-server copy delayed unmount list */</div><div class='ctx'> 	nfsd4_ssc_expire_umount(nn);</div><div class='ctx'> #endif</div><div class='add'>+	if (atomic_long_read(&amp;num_delegations) &gt;= max_delegations)</div><div class='add'>+		deleg_reaper(nn);</div><div class='ctx'> out:</div><div class='ctx'> 	return max_t(time64_t, lt.new_timeo, NFSD_LAUNDROMAT_MINTIMEOUT);</div><div class='ctx'> }</div><div class='hunk'>@@ -6258,38 +6992,34 @@ deleg_reaper(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *pos, *next;</div><div class='ctx'> 	struct nfs4_client *clp;</div><div class='del'>-	struct list_head cblist;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;cblist);</div><div class='ctx'> 	spin_lock(&amp;nn-&gt;client_lock);</div><div class='ctx'> 	list_for_each_safe(pos, next, &amp;nn-&gt;client_lru) {</div><div class='ctx'> 		clp = list_entry(pos, struct nfs4_client, cl_lru);</div><div class='del'>-		if (clp-&gt;cl_state != NFSD4_ACTIVE ||</div><div class='del'>-			list_empty(&amp;clp-&gt;cl_delegations) ||</div><div class='del'>-			atomic_read(&amp;clp-&gt;cl_delegs_in_recall) ||</div><div class='del'>-			test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &amp;clp-&gt;cl_flags) ||</div><div class='del'>-			(ktime_get_boottime_seconds() -</div><div class='del'>-				clp-&gt;cl_ra_time &lt; 5)) {</div><div class='add'>+</div><div class='add'>+		if (clp-&gt;cl_state != NFSD4_ACTIVE)</div><div class='add'>+			continue;</div><div class='add'>+		if (list_empty(&amp;clp-&gt;cl_delegations))</div><div class='add'>+			continue;</div><div class='add'>+		if (atomic_read(&amp;clp-&gt;cl_delegs_in_recall))</div><div class='add'>+			continue;</div><div class='add'>+		if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &amp;clp-&gt;cl_ra-&gt;ra_cb.cb_flags))</div><div class='add'>+			continue;</div><div class='add'>+		if (ktime_get_boottime_seconds() - clp-&gt;cl_ra_time &lt; 5)</div><div class='add'>+			continue;</div><div class='add'>+		if (clp-&gt;cl_cb_state != NFSD4_CB_UP)</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='del'>-		list_add(&amp;clp-&gt;cl_ra_cblist, &amp;cblist);</div><div class='ctx'> </div><div class='ctx'> 		/* release in nfsd4_cb_recall_any_release */</div><div class='del'>-		atomic_inc(&amp;clp-&gt;cl_rpc_users);</div><div class='del'>-		set_bit(NFSD4_CLIENT_CB_RECALL_ANY, &amp;clp-&gt;cl_flags);</div><div class='add'>+		kref_get(&amp;clp-&gt;cl_nfsdfs.cl_ref);</div><div class='ctx'> 		clp-&gt;cl_ra_time = ktime_get_boottime_seconds();</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;cblist)) {</div><div class='del'>-		clp = list_first_entry(&amp;cblist, struct nfs4_client,</div><div class='del'>-					cl_ra_cblist);</div><div class='del'>-		list_del_init(&amp;clp-&gt;cl_ra_cblist);</div><div class='ctx'> 		clp-&gt;cl_ra-&gt;ra_keep = 0;</div><div class='del'>-		clp-&gt;cl_ra-&gt;ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG);</div><div class='add'>+		clp-&gt;cl_ra-&gt;ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) |</div><div class='add'>+						BIT(RCA4_TYPE_MASK_WDATA_DLG);</div><div class='ctx'> 		trace_nfsd_cb_recall_any(clp-&gt;cl_ra);</div><div class='ctx'> 		nfsd4_run_cb(&amp;clp-&gt;cl_ra-&gt;ra_cb);</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;nn-&gt;client_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -6380,6 +7110,9 @@ static __be32 nfsd4_stid_check_stateid_generation(stateid_t *in, struct nfs4_sti</div><div class='ctx'> 	if (ret == nfs_ok)</div><div class='ctx'> 		ret = check_stateid_generation(in, &amp;s-&gt;sc_stateid, has_session);</div><div class='ctx'> 	spin_unlock(&amp;s-&gt;sc_lock);</div><div class='add'>+	if (ret == nfserr_admin_revoked)</div><div class='add'>+		nfsd40_drop_revoked_stid(s-&gt;sc_client,</div><div class='add'>+					&amp;s-&gt;sc_stateid);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6406,32 +7139,33 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid)</div><div class='ctx'> 	status = nfsd4_stid_check_stateid_generation(stateid, s, 1);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	status = nfsd4_verify_open_stid(s);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='ctx'> 	switch (s-&gt;sc_type) {</div><div class='del'>-	case NFS4_DELEG_STID:</div><div class='add'>+	case SC_TYPE_DELEG:</div><div class='ctx'> 		status = nfs_ok;</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_REVOKED_DELEG_STID:</div><div class='del'>-		status = nfserr_deleg_revoked;</div><div class='del'>-		break;</div><div class='del'>-	case NFS4_OPEN_STID:</div><div class='del'>-	case NFS4_LOCK_STID:</div><div class='add'>+	case SC_TYPE_OPEN:</div><div class='add'>+	case SC_TYPE_LOCK:</div><div class='ctx'> 		status = nfsd4_check_openowner_confirmed(openlockstateid(s));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("unknown stateid type %x\n", s-&gt;sc_type);</div><div class='del'>-		fallthrough;</div><div class='del'>-	case NFS4_CLOSED_STID:</div><div class='del'>-	case NFS4_CLOSED_DELEG_STID:</div><div class='ctx'> 		status = nfserr_bad_stateid;</div><div class='ctx'> 	}</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='add'>+	if (status == nfserr_admin_revoked)</div><div class='add'>+		nfsd40_drop_revoked_stid(cl, stateid);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __be32</div><div class='ctx'> nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,</div><div class='del'>-		     stateid_t *stateid, unsigned char typemask,</div><div class='add'>+		     stateid_t *stateid,</div><div class='add'>+		     unsigned short typemask, unsigned short statusmask,</div><div class='ctx'> 		     struct nfs4_stid **s, struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 status;</div><div class='hunk'>@@ -6442,10 +7176,15 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	 *  only return revoked delegations if explicitly asked.</div><div class='ctx'> 	 *  otherwise we report revoked or bad_stateid status.</div><div class='ctx'> 	 */</div><div class='del'>-	if (typemask &amp; NFS4_REVOKED_DELEG_STID)</div><div class='add'>+	if (statusmask &amp; SC_STATUS_REVOKED)</div><div class='ctx'> 		return_revoked = true;</div><div class='del'>-	else if (typemask &amp; NFS4_DELEG_STID)</div><div class='del'>-		typemask |= NFS4_REVOKED_DELEG_STID;</div><div class='add'>+	if (typemask &amp; SC_TYPE_DELEG)</div><div class='add'>+		/* Always allow REVOKED for DELEG so we can</div><div class='add'>+		 * return the appropriate error.</div><div class='add'>+		 */</div><div class='add'>+		statusmask |= SC_STATUS_REVOKED;</div><div class='add'>+</div><div class='add'>+	statusmask |= SC_STATUS_ADMIN_REVOKED | SC_STATUS_FREEABLE;</div><div class='ctx'> </div><div class='ctx'> 	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||</div><div class='ctx'> 		CLOSE_STATEID(stateid))</div><div class='hunk'>@@ -6458,14 +7197,17 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='del'>-	stid = find_stateid_by_type(cstate-&gt;clp, stateid, typemask);</div><div class='add'>+	stid = find_stateid_by_type(cstate-&gt;clp, stateid, typemask, statusmask);</div><div class='ctx'> 	if (!stid)</div><div class='ctx'> 		return nfserr_bad_stateid;</div><div class='del'>-	if ((stid-&gt;sc_type == NFS4_REVOKED_DELEG_STID) &amp;&amp; !return_revoked) {</div><div class='add'>+	if ((stid-&gt;sc_status &amp; SC_STATUS_REVOKED) &amp;&amp; !return_revoked) {</div><div class='ctx'> 		nfs4_put_stid(stid);</div><div class='del'>-		if (cstate-&gt;minorversion)</div><div class='del'>-			return nfserr_deleg_revoked;</div><div class='del'>-		return nfserr_bad_stateid;</div><div class='add'>+		return nfserr_deleg_revoked;</div><div class='add'>+	}</div><div class='add'>+	if (stid-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED) {</div><div class='add'>+		nfsd40_drop_revoked_stid(cstate-&gt;clp, stateid);</div><div class='add'>+		nfs4_put_stid(stid);</div><div class='add'>+		return nfserr_admin_revoked;</div><div class='ctx'> 	}</div><div class='ctx'> 	*s = stid;</div><div class='ctx'> 	return nfs_ok;</div><div class='hunk'>@@ -6476,17 +7218,13 @@ nfs4_find_file(struct nfs4_stid *s, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd_file *ret = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!s)</div><div class='add'>+	if (!s || s-&gt;sc_status)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (s-&gt;sc_type) {</div><div class='del'>-	case NFS4_DELEG_STID:</div><div class='del'>-		spin_lock(&amp;s-&gt;sc_file-&gt;fi_lock);</div><div class='del'>-		ret = nfsd_file_get(s-&gt;sc_file-&gt;fi_deleg_file);</div><div class='del'>-		spin_unlock(&amp;s-&gt;sc_file-&gt;fi_lock);</div><div class='del'>-		break;</div><div class='del'>-	case NFS4_OPEN_STID:</div><div class='del'>-	case NFS4_LOCK_STID:</div><div class='add'>+	case SC_TYPE_DELEG:</div><div class='add'>+	case SC_TYPE_OPEN:</div><div class='add'>+	case SC_TYPE_LOCK:</div><div class='ctx'> 		if (flags &amp; RD_STATE)</div><div class='ctx'> 			ret = find_readable_file(s-&gt;sc_file);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -6517,7 +7255,8 @@ nfs4_check_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfs4_stid *s,</div><div class='ctx'> </div><div class='ctx'> 	nf = nfs4_find_file(s, flags);</div><div class='ctx'> 	if (nf) {</div><div class='del'>-		status = nfsd_permission(rqstp, fhp-&gt;fh_export, fhp-&gt;fh_dentry,</div><div class='add'>+		status = nfsd_permission(&amp;rqstp-&gt;rq_cred,</div><div class='add'>+					 fhp-&gt;fh_export, fhp-&gt;fh_dentry,</div><div class='ctx'> 				acc | NFSD_MAY_OWNER_OVERRIDE);</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			nfsd_file_put(nf);</div><div class='hunk'>@@ -6599,7 +7338,8 @@ static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	*stid = find_stateid_by_type(found, &amp;cps-&gt;cp_p_stateid,</div><div class='del'>-			NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID);</div><div class='add'>+				     SC_TYPE_DELEG|SC_TYPE_OPEN|SC_TYPE_LOCK,</div><div class='add'>+				     0);</div><div class='ctx'> 	if (*stid)</div><div class='ctx'> 		status = nfs_ok;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -6647,17 +7387,13 @@ nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,</div><div class='ctx'> 		*nfp = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) {</div><div class='del'>-		if (cstid)</div><div class='del'>-			status = nfserr_bad_stateid;</div><div class='del'>-		else</div><div class='del'>-			status = check_special_stateids(net, fhp, stateid,</div><div class='del'>-									flags);</div><div class='add'>+		status = check_special_stateids(net, fhp, stateid, flags);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = nfsd4_lookup_stateid(cstate, stateid,</div><div class='del'>-				NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID,</div><div class='del'>-				&amp;s, nn);</div><div class='add'>+				SC_TYPE_DELEG|SC_TYPE_OPEN|SC_TYPE_LOCK,</div><div class='add'>+				0, &amp;s, nn);</div><div class='ctx'> 	if (status == nfserr_bad_stateid)</div><div class='ctx'> 		status = find_cpntf_state(nn, stateid, &amp;s);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -6668,16 +7404,13 @@ nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (s-&gt;sc_type) {</div><div class='del'>-	case NFS4_DELEG_STID:</div><div class='add'>+	case SC_TYPE_DELEG:</div><div class='ctx'> 		status = nfs4_check_delegmode(delegstateid(s), flags);</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_OPEN_STID:</div><div class='del'>-	case NFS4_LOCK_STID:</div><div class='add'>+	case SC_TYPE_OPEN:</div><div class='add'>+	case SC_TYPE_LOCK:</div><div class='ctx'> 		status = nfs4_check_olstateid(openlockstateid(s), flags);</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		status = nfserr_bad_stateid;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -6756,34 +7489,42 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cl-&gt;cl_lock);</div><div class='ctx'> 	s = find_stateid_locked(cl, stateid);</div><div class='del'>-	if (!s)</div><div class='add'>+	if (!s || s-&gt;sc_status &amp; SC_STATUS_CLOSED)</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	if (s-&gt;sc_status &amp; SC_STATUS_ADMIN_REVOKED) {</div><div class='add'>+		nfsd4_drop_revoked_stid(s);</div><div class='add'>+		ret = nfs_ok;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	spin_lock(&amp;s-&gt;sc_lock);</div><div class='ctx'> 	switch (s-&gt;sc_type) {</div><div class='del'>-	case NFS4_DELEG_STID:</div><div class='add'>+	case SC_TYPE_DELEG:</div><div class='add'>+		if (s-&gt;sc_status &amp; SC_STATUS_REVOKED) {</div><div class='add'>+			s-&gt;sc_status |= SC_STATUS_CLOSED;</div><div class='add'>+			spin_unlock(&amp;s-&gt;sc_lock);</div><div class='add'>+			dp = delegstateid(s);</div><div class='add'>+			if (s-&gt;sc_status &amp; SC_STATUS_FREEABLE)</div><div class='add'>+				list_del_init(&amp;dp-&gt;dl_recall_lru);</div><div class='add'>+			s-&gt;sc_status |= SC_STATUS_FREED;</div><div class='add'>+			spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='add'>+			nfs4_put_stid(s);</div><div class='add'>+			ret = nfs_ok;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		ret = nfserr_locks_held;</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_OPEN_STID:</div><div class='add'>+	case SC_TYPE_OPEN:</div><div class='ctx'> 		ret = check_stateid_generation(stateid, &amp;s-&gt;sc_stateid, 1);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 		ret = nfserr_locks_held;</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_LOCK_STID:</div><div class='add'>+	case SC_TYPE_LOCK:</div><div class='ctx'> 		spin_unlock(&amp;s-&gt;sc_lock);</div><div class='ctx'> 		refcount_inc(&amp;s-&gt;sc_count);</div><div class='ctx'> 		spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='ctx'> 		ret = nfsd4_free_lock_stateid(stateid, s);</div><div class='ctx'> 		goto out;</div><div class='del'>-	case NFS4_REVOKED_DELEG_STID:</div><div class='del'>-		spin_unlock(&amp;s-&gt;sc_lock);</div><div class='del'>-		dp = delegstateid(s);</div><div class='del'>-		list_del_init(&amp;dp-&gt;dl_recall_lru);</div><div class='del'>-		spin_unlock(&amp;cl-&gt;cl_lock);</div><div class='del'>-		nfs4_put_stid(s);</div><div class='del'>-		ret = nfs_ok;</div><div class='del'>-		goto out;</div><div class='del'>-	/* Default falls through and returns nfserr_bad_stateid */</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;s-&gt;sc_lock);</div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -6825,6 +7566,7 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_</div><div class='ctx'>  * @seqid: seqid (provided by client)</div><div class='ctx'>  * @stateid: stateid (provided by client)</div><div class='ctx'>  * @typemask: mask of allowable types for this operation</div><div class='add'>+ * @statusmask: mask of allowed states: 0 or STID_CLOSED</div><div class='ctx'>  * @stpp: return pointer for the stateid found</div><div class='ctx'>  * @nn: net namespace for request</div><div class='ctx'>  *</div><div class='hunk'>@@ -6834,7 +7576,8 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_</div><div class='ctx'>  */</div><div class='ctx'> static __be32</div><div class='ctx'> nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,</div><div class='del'>-			 stateid_t *stateid, char typemask,</div><div class='add'>+			 stateid_t *stateid,</div><div class='add'>+			 unsigned short typemask, unsigned short statusmask,</div><div class='ctx'> 			 struct nfs4_ol_stateid **stpp,</div><div class='ctx'> 			 struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='hunk'>@@ -6845,11 +7588,16 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,</div><div class='ctx'> 	trace_nfsd_preprocess(seqid, stateid);</div><div class='ctx'> </div><div class='ctx'> 	*stpp = NULL;</div><div class='del'>-	status = nfsd4_lookup_stateid(cstate, stateid, typemask, &amp;s, nn);</div><div class='add'>+retry:</div><div class='add'>+	status = nfsd4_lookup_stateid(cstate, stateid,</div><div class='add'>+				      typemask, statusmask, &amp;s, nn);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	stp = openlockstateid(s);</div><div class='del'>-	nfsd4_cstate_assign_replay(cstate, stp-&gt;st_stateowner);</div><div class='add'>+	if (nfsd4_cstate_assign_replay(cstate, stp-&gt;st_stateowner) == -EAGAIN) {</div><div class='add'>+		nfs4_put_stateowner(stp-&gt;st_stateowner);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_seqid_op_checks(cstate, stateid, seqid, stp);</div><div class='ctx'> 	if (!status)</div><div class='hunk'>@@ -6867,7 +7615,7 @@ static __be32 nfs4_preprocess_confirmed_seqid_op(struct nfsd4_compound_state *cs</div><div class='ctx'> 	struct nfs4_ol_stateid *stp;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_preprocess_seqid_op(cstate, seqid, stateid,</div><div class='del'>-						NFS4_OPEN_STID, &amp;stp, nn);</div><div class='add'>+					  SC_TYPE_OPEN, 0, &amp;stp, nn);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	oo = openowner(stp-&gt;st_stateowner);</div><div class='hunk'>@@ -6898,8 +7646,8 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_preprocess_seqid_op(cstate,</div><div class='del'>-					oc-&gt;oc_seqid, &amp;oc-&gt;oc_req_stateid,</div><div class='del'>-					NFS4_OPEN_STID, &amp;stp, nn);</div><div class='add'>+					  oc-&gt;oc_seqid, &amp;oc-&gt;oc_req_stateid,</div><div class='add'>+					  SC_TYPE_OPEN, 0, &amp;stp, nn);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	oo = openowner(stp-&gt;st_stateowner);</div><div class='hunk'>@@ -6991,7 +7739,7 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s)</div><div class='add'>+static bool nfsd4_close_open_stateid(struct nfs4_ol_stateid *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = s-&gt;st_stid.sc_client;</div><div class='ctx'> 	bool unhashed;</div><div class='hunk'>@@ -7008,11 +7756,11 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s)</div><div class='ctx'> 		list_for_each_entry(stp, &amp;reaplist, st_locks)</div><div class='ctx'> 			nfs4_free_cpntf_statelist(clp-&gt;net, &amp;stp-&gt;st_stid);</div><div class='ctx'> 		free_ol_stateid_reaplist(&amp;reaplist);</div><div class='add'>+		return false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 		free_ol_stateid_reaplist(&amp;reaplist);</div><div class='del'>-		if (unhashed)</div><div class='del'>-			move_to_close_lru(s, clp-&gt;net);</div><div class='add'>+		return unhashed;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7028,19 +7776,22 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	struct nfs4_ol_stateid *stp;</div><div class='ctx'> 	struct net *net = SVC_NET(rqstp);</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+	bool need_move_to_close_list;</div><div class='ctx'> </div><div class='del'>-	dprintk("NFSD: nfsd4_close on file %pd\n", </div><div class='add'>+	dprintk("NFSD: nfsd4_close on file %pd\n",</div><div class='ctx'> 			cstate-&gt;current_fh.fh_dentry);</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_preprocess_seqid_op(cstate, close-&gt;cl_seqid,</div><div class='del'>-					&amp;close-&gt;cl_stateid,</div><div class='del'>-					NFS4_OPEN_STID|NFS4_CLOSED_STID,</div><div class='del'>-					&amp;stp, nn);</div><div class='add'>+					  &amp;close-&gt;cl_stateid,</div><div class='add'>+					  SC_TYPE_OPEN, SC_STATUS_CLOSED,</div><div class='add'>+					  &amp;stp, nn);</div><div class='ctx'> 	nfsd4_bump_seqid(cstate, status);</div><div class='ctx'> 	if (status)</div><div class='del'>-		goto out; </div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	stp-&gt;st_stid.sc_type = NFS4_CLOSED_STID;</div><div class='add'>+	spin_lock(&amp;stp-&gt;st_stid.sc_client-&gt;cl_lock);</div><div class='add'>+	stp-&gt;st_stid.sc_status |= SC_STATUS_CLOSED;</div><div class='add'>+	spin_unlock(&amp;stp-&gt;st_stid.sc_client-&gt;cl_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Technically we don't _really_ have to increment or copy it, since</div><div class='hunk'>@@ -7050,8 +7801,10 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	 */</div><div class='ctx'> 	nfs4_inc_and_copy_stateid(&amp;close-&gt;cl_stateid, &amp;stp-&gt;st_stid);</div><div class='ctx'> </div><div class='del'>-	nfsd4_close_open_stateid(stp);</div><div class='add'>+	need_move_to_close_list = nfsd4_close_open_stateid(stp);</div><div class='ctx'> 	mutex_unlock(&amp;stp-&gt;st_mutex);</div><div class='add'>+	if (need_move_to_close_list)</div><div class='add'>+		move_to_close_lru(stp, net);</div><div class='ctx'> </div><div class='ctx'> 	/* v4.1+ suggests that we send a special stateid in here, since the</div><div class='ctx'> 	 * clients should just ignore this anyway. Since this is not useful</div><div class='hunk'>@@ -7079,10 +7832,11 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	__be32 status;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> </div><div class='del'>-	if ((status = fh_verify(rqstp, &amp;cstate-&gt;current_fh, S_IFREG, 0)))</div><div class='add'>+	status = fh_verify(rqstp, &amp;cstate-&gt;current_fh, 0, 0);</div><div class='add'>+	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID, &amp;s, nn);</div><div class='add'>+	status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG, SC_STATUS_REVOKED, &amp;s, nn);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	dp = delegstateid(s);</div><div class='hunk'>@@ -7091,8 +7845,9 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		goto put_stateid;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_deleg_return(stateid);</div><div class='del'>-	wake_up_var(d_inode(cstate-&gt;current_fh.fh_dentry));</div><div class='ctx'> 	destroy_delegation(dp);</div><div class='add'>+	smp_mb__after_atomic();</div><div class='add'>+	wake_up_var(d_inode(cstate-&gt;current_fh.fh_dentry));</div><div class='ctx'> put_stateid:</div><div class='ctx'> 	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='ctx'> out:</div><div class='hunk'>@@ -7149,7 +7904,7 @@ nfsd4_lm_put_owner(fl_owner_t owner)</div><div class='ctx'> static bool</div><div class='ctx'> nfsd4_lm_lock_expirable(struct file_lock *cfl)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_lockowner *lo = (struct nfs4_lockowner *)cfl-&gt;fl_owner;</div><div class='add'>+	struct nfs4_lockowner *lo = (struct nfs4_lockowner *) cfl-&gt;c.flc_owner;</div><div class='ctx'> 	struct nfs4_client *clp = lo-&gt;lo_owner.so_client;</div><div class='ctx'> 	struct nfsd_net *nn;</div><div class='ctx'> </div><div class='hunk'>@@ -7171,7 +7926,7 @@ nfsd4_lm_expire_lock(void)</div><div class='ctx'> static void</div><div class='ctx'> nfsd4_lm_notify(struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	struct nfs4_lockowner		*lo = (struct nfs4_lockowner *)fl-&gt;fl_owner;</div><div class='add'>+	struct nfs4_lockowner		*lo = (struct nfs4_lockowner *) fl-&gt;c.flc_owner;</div><div class='ctx'> 	struct net			*net = lo-&gt;lo_owner.so_client-&gt;net;</div><div class='ctx'> 	struct nfsd_net			*nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct nfsd4_blocked_lock	*nbl = container_of(fl,</div><div class='hunk'>@@ -7189,7 +7944,7 @@ nfsd4_lm_notify(struct file_lock *fl)</div><div class='ctx'> </div><div class='ctx'> 	if (queue) {</div><div class='ctx'> 		trace_nfsd_cb_notify_lock(lo, nbl);</div><div class='del'>-		nfsd4_run_cb(&amp;nbl-&gt;nbl_cb);</div><div class='add'>+		nfsd4_try_run_cb(&amp;nbl-&gt;nbl_cb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7208,7 +7963,7 @@ nfs4_set_lock_denied(struct file_lock *fl, struct nfsd4_lock_denied *deny)</div><div class='ctx'> 	struct nfs4_lockowner *lo;</div><div class='ctx'> </div><div class='ctx'> 	if (fl-&gt;fl_lmops == &amp;nfsd_posix_mng_ops) {</div><div class='del'>-		lo = (struct nfs4_lockowner *) fl-&gt;fl_owner;</div><div class='add'>+		lo = (struct nfs4_lockowner *) fl-&gt;c.flc_owner;</div><div class='ctx'> 		xdr_netobj_dup(&amp;deny-&gt;ld_owner, &amp;lo-&gt;lo_owner.so_owner,</div><div class='ctx'> 						GFP_KERNEL);</div><div class='ctx'> 		if (!deny-&gt;ld_owner.data)</div><div class='hunk'>@@ -7227,7 +7982,7 @@ nevermind:</div><div class='ctx'> 	if (fl-&gt;fl_end != NFS4_MAX_UINT64)</div><div class='ctx'> 		deny-&gt;ld_length = fl-&gt;fl_end - fl-&gt;fl_start + 1;        </div><div class='ctx'> 	deny-&gt;ld_type = NFS4_READ_LT;</div><div class='del'>-	if (fl-&gt;fl_type != F_RDLCK)</div><div class='add'>+	if (fl-&gt;c.flc_type != F_RDLCK)</div><div class='ctx'> 		deny-&gt;ld_type = NFS4_WRITE_LT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7349,7 +8104,7 @@ retry:</div><div class='ctx'> 	if (retstp)</div><div class='ctx'> 		goto out_found;</div><div class='ctx'> 	refcount_inc(&amp;stp-&gt;st_stid.sc_count);</div><div class='del'>-	stp-&gt;st_stid.sc_type = NFS4_LOCK_STID;</div><div class='add'>+	stp-&gt;st_stid.sc_type = SC_TYPE_LOCK;</div><div class='ctx'> 	stp-&gt;st_stateowner = nfs4_get_stateowner(&amp;lo-&gt;lo_owner);</div><div class='ctx'> 	get_nfs4_file(fp);</div><div class='ctx'> 	stp-&gt;st_stid.sc_file = fp;</div><div class='hunk'>@@ -7488,13 +8243,12 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	struct nfsd4_blocked_lock *nbl = NULL;</div><div class='ctx'> 	struct file_lock *file_lock = NULL;</div><div class='ctx'> 	struct file_lock *conflock = NULL;</div><div class='del'>-	struct super_block *sb;</div><div class='ctx'> 	__be32 status = 0;</div><div class='ctx'> 	int lkflg;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool new = false;</div><div class='del'>-	unsigned char fl_type;</div><div class='del'>-	unsigned int fl_flags = FL_POSIX;</div><div class='add'>+	unsigned char type;</div><div class='add'>+	unsigned int flags = FL_POSIX;</div><div class='ctx'> 	struct net *net = SVC_NET(rqstp);</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> </div><div class='hunk'>@@ -7505,12 +8259,13 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	if (check_lock_length(lock-&gt;lk_offset, lock-&gt;lk_length))</div><div class='ctx'> 		 return nfserr_inval;</div><div class='ctx'> </div><div class='del'>-	if ((status = fh_verify(rqstp, &amp;cstate-&gt;current_fh,</div><div class='del'>-				S_IFREG, NFSD_MAY_LOCK))) {</div><div class='del'>-		dprintk("NFSD: nfsd4_lock: permission denied!\n");</div><div class='add'>+	status = fh_verify(rqstp, &amp;cstate-&gt;current_fh, S_IFREG, 0);</div><div class='add'>+	if (status != nfs_ok)</div><div class='ctx'> 		return status;</div><div class='add'>+	if (exportfs_cannot_lock(cstate-&gt;current_fh.fh_dentry-&gt;d_sb-&gt;s_export_op)) {</div><div class='add'>+		status = nfserr_notsupp;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	sb = cstate-&gt;current_fh.fh_dentry-&gt;d_sb;</div><div class='ctx'> </div><div class='ctx'> 	if (lock-&gt;lk_is_new) {</div><div class='ctx'> 		if (nfsd4_has_session(cstate))</div><div class='hunk'>@@ -7536,9 +8291,10 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 							&amp;lock_stp, &amp;new);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status = nfs4_preprocess_seqid_op(cstate,</div><div class='del'>-				       lock-&gt;lk_old_lock_seqid,</div><div class='del'>-				       &amp;lock-&gt;lk_old_lock_stateid,</div><div class='del'>-				       NFS4_LOCK_STID, &amp;lock_stp, nn);</div><div class='add'>+						  lock-&gt;lk_old_lock_seqid,</div><div class='add'>+						  &amp;lock-&gt;lk_old_lock_stateid,</div><div class='add'>+						  SC_TYPE_LOCK, 0, &amp;lock_stp,</div><div class='add'>+						  nn);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -7557,14 +8313,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (lock-&gt;lk_reclaim)</div><div class='del'>-		fl_flags |= FL_RECLAIM;</div><div class='add'>+		flags |= FL_RECLAIM;</div><div class='ctx'> </div><div class='ctx'> 	fp = lock_stp-&gt;st_stid.sc_file;</div><div class='ctx'> 	switch (lock-&gt;lk_type) {</div><div class='ctx'> 		case NFS4_READW_LT:</div><div class='del'>-			if (nfsd4_has_session(cstate) ||</div><div class='del'>-			    exportfs_lock_op_is_async(sb-&gt;s_export_op))</div><div class='del'>-				fl_flags |= FL_SLEEP;</div><div class='ctx'> 			fallthrough;</div><div class='ctx'> 		case NFS4_READ_LT:</div><div class='ctx'> 			spin_lock(&amp;fp-&gt;fi_lock);</div><div class='hunk'>@@ -7572,12 +8325,9 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 			if (nf)</div><div class='ctx'> 				get_lock_access(lock_stp, NFS4_SHARE_ACCESS_READ);</div><div class='ctx'> 			spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='del'>-			fl_type = F_RDLCK;</div><div class='add'>+			type = F_RDLCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NFS4_WRITEW_LT:</div><div class='del'>-			if (nfsd4_has_session(cstate) ||</div><div class='del'>-			    exportfs_lock_op_is_async(sb-&gt;s_export_op))</div><div class='del'>-				fl_flags |= FL_SLEEP;</div><div class='ctx'> 			fallthrough;</div><div class='ctx'> 		case NFS4_WRITE_LT:</div><div class='ctx'> 			spin_lock(&amp;fp-&gt;fi_lock);</div><div class='hunk'>@@ -7585,7 +8335,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 			if (nf)</div><div class='ctx'> 				get_lock_access(lock_stp, NFS4_SHARE_ACCESS_WRITE);</div><div class='ctx'> 			spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='del'>-			fl_type = F_WRLCK;</div><div class='add'>+			type = F_WRLCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			status = nfserr_inval;</div><div class='hunk'>@@ -7597,15 +8347,10 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Most filesystems with their own -&gt;lock operations will block</div><div class='del'>-	 * the nfsd thread waiting to acquire the lock.  That leads to</div><div class='del'>-	 * deadlocks (we don't want every nfsd thread tied up waiting</div><div class='del'>-	 * for file locks), so don't attempt blocking lock notifications</div><div class='del'>-	 * on those filesystems:</div><div class='del'>-	 */</div><div class='del'>-	if (!exportfs_lock_op_is_async(sb-&gt;s_export_op))</div><div class='del'>-		fl_flags &amp;= ~FL_SLEEP;</div><div class='add'>+	if (lock-&gt;lk_type &amp; (NFS4_READW_LT | NFS4_WRITEW_LT) &amp;&amp;</div><div class='add'>+		nfsd4_has_session(cstate) &amp;&amp;</div><div class='add'>+		locks_can_async_lock(nf-&gt;nf_file-&gt;f_op))</div><div class='add'>+			flags |= FL_SLEEP;</div><div class='ctx'> </div><div class='ctx'> 	nbl = find_or_allocate_block(lock_sop, &amp;fp-&gt;fi_fhandle, nn);</div><div class='ctx'> 	if (!nbl) {</div><div class='hunk'>@@ -7615,11 +8360,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	file_lock = &amp;nbl-&gt;nbl_lock;</div><div class='del'>-	file_lock-&gt;fl_type = fl_type;</div><div class='del'>-	file_lock-&gt;fl_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(&amp;lock_sop-&gt;lo_owner));</div><div class='del'>-	file_lock-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	file_lock-&gt;fl_file = nf-&gt;nf_file;</div><div class='del'>-	file_lock-&gt;fl_flags = fl_flags;</div><div class='add'>+	file_lock-&gt;c.flc_type = type;</div><div class='add'>+	file_lock-&gt;c.flc_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(&amp;lock_sop-&gt;lo_owner));</div><div class='add'>+	file_lock-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	file_lock-&gt;c.flc_file = nf-&gt;nf_file;</div><div class='add'>+	file_lock-&gt;c.flc_flags = flags;</div><div class='ctx'> 	file_lock-&gt;fl_lmops = &amp;nfsd_posix_mng_ops;</div><div class='ctx'> 	file_lock-&gt;fl_start = lock-&gt;lk_offset;</div><div class='ctx'> 	file_lock-&gt;fl_end = last_byte_offset(lock-&gt;lk_offset, lock-&gt;lk_length);</div><div class='hunk'>@@ -7632,7 +8377,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fl_flags &amp; FL_SLEEP) {</div><div class='add'>+	if (flags &amp; FL_SLEEP) {</div><div class='ctx'> 		nbl-&gt;nbl_time = ktime_get_boottime_seconds();</div><div class='ctx'> 		spin_lock(&amp;nn-&gt;blocked_locks_lock);</div><div class='ctx'> 		list_add_tail(&amp;nbl-&gt;nbl_list, &amp;lock_sop-&gt;lo_blocked);</div><div class='hunk'>@@ -7669,7 +8414,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> out:</div><div class='ctx'> 	if (nbl) {</div><div class='ctx'> 		/* dequeue it if we queued it before */</div><div class='del'>-		if (fl_flags &amp; FL_SLEEP) {</div><div class='add'>+		if (flags &amp; FL_SLEEP) {</div><div class='ctx'> 			spin_lock(&amp;nn-&gt;blocked_locks_lock);</div><div class='ctx'> 			if (!list_empty(&amp;nbl-&gt;nbl_list) &amp;&amp;</div><div class='ctx'> 			    !list_empty(&amp;nbl-&gt;nbl_lru)) {</div><div class='hunk'>@@ -7737,9 +8482,9 @@ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct</div><div class='ctx'> 	err = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='del'>-	lock-&gt;fl_file = nf-&gt;nf_file;</div><div class='add'>+	lock-&gt;c.flc_file = nf-&gt;nf_file;</div><div class='ctx'> 	err = nfserrno(vfs_test_lock(nf-&gt;nf_file, lock));</div><div class='del'>-	lock-&gt;fl_file = NULL;</div><div class='add'>+	lock-&gt;c.flc_file = NULL;</div><div class='ctx'> out:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> 	nfsd_file_put(nf);</div><div class='hunk'>@@ -7784,11 +8529,11 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	switch (lockt-&gt;lt_type) {</div><div class='ctx'> 		case NFS4_READ_LT:</div><div class='ctx'> 		case NFS4_READW_LT:</div><div class='del'>-			file_lock-&gt;fl_type = F_RDLCK;</div><div class='add'>+			file_lock-&gt;c.flc_type = F_RDLCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NFS4_WRITE_LT:</div><div class='ctx'> 		case NFS4_WRITEW_LT:</div><div class='del'>-			file_lock-&gt;fl_type = F_WRLCK;</div><div class='add'>+			file_lock-&gt;c.flc_type = F_WRLCK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dprintk("NFSD: nfs4_lockt: bad lock type!\n");</div><div class='hunk'>@@ -7798,9 +8543,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> </div><div class='ctx'> 	lo = find_lockowner_str(cstate-&gt;clp, &amp;lockt-&gt;lt_owner);</div><div class='ctx'> 	if (lo)</div><div class='del'>-		file_lock-&gt;fl_owner = (fl_owner_t)lo;</div><div class='del'>-	file_lock-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	file_lock-&gt;fl_flags = FL_POSIX;</div><div class='add'>+		file_lock-&gt;c.flc_owner = (fl_owner_t)lo;</div><div class='add'>+	file_lock-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	file_lock-&gt;c.flc_flags = FL_POSIX;</div><div class='ctx'> </div><div class='ctx'> 	file_lock-&gt;fl_start = lockt-&gt;lt_offset;</div><div class='ctx'> 	file_lock-&gt;fl_end = last_byte_offset(lockt-&gt;lt_offset, lockt-&gt;lt_length);</div><div class='hunk'>@@ -7811,7 +8556,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (file_lock-&gt;fl_type != F_UNLCK) {</div><div class='add'>+	if (file_lock-&gt;c.flc_type != F_UNLCK) {</div><div class='ctx'> 		status = nfserr_denied;</div><div class='ctx'> 		nfs4_set_lock_denied(file_lock, &amp;lockt-&gt;lt_denied);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7851,8 +8596,8 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		 return nfserr_inval;</div><div class='ctx'> </div><div class='ctx'> 	status = nfs4_preprocess_seqid_op(cstate, locku-&gt;lu_seqid,</div><div class='del'>-					&amp;locku-&gt;lu_stateid, NFS4_LOCK_STID,</div><div class='del'>-					&amp;stp, nn);</div><div class='add'>+					  &amp;locku-&gt;lu_stateid, SC_TYPE_LOCK, 0,</div><div class='add'>+					  &amp;stp, nn);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	nf = find_any_file(stp-&gt;st_stid.sc_file);</div><div class='hunk'>@@ -7860,6 +8605,11 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		status = nfserr_lock_range;</div><div class='ctx'> 		goto put_stateid;</div><div class='ctx'> 	}</div><div class='add'>+	if (exportfs_cannot_lock(nf-&gt;nf_file-&gt;f_path.mnt-&gt;mnt_sb-&gt;s_export_op)) {</div><div class='add'>+		status = nfserr_notsupp;</div><div class='add'>+		goto put_file;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	file_lock = locks_alloc_lock();</div><div class='ctx'> 	if (!file_lock) {</div><div class='ctx'> 		dprintk("NFSD: %s: unable to allocate lock!\n", __func__);</div><div class='hunk'>@@ -7867,11 +8617,11 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,</div><div class='ctx'> 		goto put_file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	file_lock-&gt;fl_type = F_UNLCK;</div><div class='del'>-	file_lock-&gt;fl_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(stp-&gt;st_stateowner));</div><div class='del'>-	file_lock-&gt;fl_pid = current-&gt;tgid;</div><div class='del'>-	file_lock-&gt;fl_file = nf-&gt;nf_file;</div><div class='del'>-	file_lock-&gt;fl_flags = FL_POSIX;</div><div class='add'>+	file_lock-&gt;c.flc_type = F_UNLCK;</div><div class='add'>+	file_lock-&gt;c.flc_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(stp-&gt;st_stateowner));</div><div class='add'>+	file_lock-&gt;c.flc_pid = current-&gt;tgid;</div><div class='add'>+	file_lock-&gt;c.flc_file = nf-&gt;nf_file;</div><div class='add'>+	file_lock-&gt;c.flc_flags = FL_POSIX;</div><div class='ctx'> 	file_lock-&gt;fl_lmops = &amp;nfsd_posix_mng_ops;</div><div class='ctx'> 	file_lock-&gt;fl_start = locku-&gt;lu_offset;</div><div class='ctx'> </div><div class='hunk'>@@ -7911,14 +8661,16 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock *fl;</div><div class='ctx'> 	int status = false;</div><div class='del'>-	struct nfsd_file *nf = find_any_file(fp);</div><div class='add'>+	struct nfsd_file *nf;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct file_lock_context *flctx;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	nf = find_any_file_locked(fp);</div><div class='ctx'> 	if (!nf) {</div><div class='ctx'> 		/* Any valid lock stateid should have some sort of access */</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='del'>-		return status;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode = file_inode(nf-&gt;nf_file);</div><div class='hunk'>@@ -7926,15 +8678,16 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)</div><div class='ctx'> </div><div class='ctx'> 	if (flctx &amp;&amp; !list_empty_careful(&amp;flctx-&gt;flc_posix)) {</div><div class='ctx'> 		spin_lock(&amp;flctx-&gt;flc_lock);</div><div class='del'>-		list_for_each_entry(fl, &amp;flctx-&gt;flc_posix, fl_list) {</div><div class='del'>-			if (fl-&gt;fl_owner == (fl_owner_t)lowner) {</div><div class='add'>+		for_each_file_lock(fl, &amp;flctx-&gt;flc_posix) {</div><div class='add'>+			if (fl-&gt;c.flc_owner == (fl_owner_t)lowner) {</div><div class='ctx'> 				status = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;flctx-&gt;flc_lock);</div><div class='ctx'> 	}</div><div class='del'>-	nfsd_file_put(nf);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7944,10 +8697,8 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)</div><div class='ctx'>  * @cstate: NFSv4 COMPOUND state</div><div class='ctx'>  * @u: RELEASE_LOCKOWNER arguments</div><div class='ctx'>  *</div><div class='del'>- * The lockowner's so_count is bumped when a lock record is added</div><div class='del'>- * or when copying a conflicting lock. The latter case is brief,</div><div class='del'>- * but can lead to fleeting false positives when looking for</div><div class='del'>- * locks-in-use.</div><div class='add'>+ * Check if there are any locks still held and if not, free the lockowner</div><div class='add'>+ * and any lock state that is owned.</div><div class='ctx'>  *</div><div class='ctx'>  * Return values:</div><div class='ctx'>  *   %nfs_ok: lockowner released or not found</div><div class='hunk'>@@ -7983,17 +8734,20 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,</div><div class='ctx'> 		spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> 	}</div><div class='del'>-	if (atomic_read(&amp;lo-&gt;lo_owner.so_count) != 2) {</div><div class='del'>-		spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='del'>-		nfs4_put_stateowner(&amp;lo-&gt;lo_owner);</div><div class='del'>-		return nfserr_locks_held;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(stp, &amp;lo-&gt;lo_owner.so_stateids, st_perstateowner) {</div><div class='add'>+		if (check_for_locks(stp-&gt;st_stid.sc_file, lo)) {</div><div class='add'>+			spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+			nfs4_put_stateowner(&amp;lo-&gt;lo_owner);</div><div class='add'>+			return nfserr_locks_held;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	unhash_lockowner_locked(lo);</div><div class='ctx'> 	while (!list_empty(&amp;lo-&gt;lo_owner.so_stateids)) {</div><div class='ctx'> 		stp = list_first_entry(&amp;lo-&gt;lo_owner.so_stateids,</div><div class='ctx'> 				       struct nfs4_ol_stateid,</div><div class='ctx'> 				       st_perstateowner);</div><div class='del'>-		WARN_ON(!unhash_lock_stateid(stp));</div><div class='add'>+		unhash_lock_stateid(stp);</div><div class='ctx'> 		put_ol_stateid_locked(stp, &amp;reaplist);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='hunk'>@@ -8021,9 +8775,6 @@ nfs4_has_reclaimed_state(struct xdr_netobj name, struct nfsd_net *nn)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * failure =&gt; all reset bets are off, nfserr_no_grace...</div><div class='del'>- *</div><div class='del'>- * The caller is responsible for freeing name.data if NULL is returned (it</div><div class='del'>- * will be freed in nfs4_remove_reclaim_record in the normal case).</div><div class='ctx'>  */</div><div class='ctx'> struct nfs4_client_reclaim *</div><div class='ctx'> nfs4_client_to_reclaim(struct xdr_netobj name, struct xdr_netobj princhash,</div><div class='hunk'>@@ -8032,6 +8783,22 @@ nfs4_client_to_reclaim(struct xdr_netobj name, struct xdr_netobj princhash,</div><div class='ctx'> 	unsigned int strhashval;</div><div class='ctx'> 	struct nfs4_client_reclaim *crp;</div><div class='ctx'> </div><div class='add'>+	name.data = kmemdup(name.data, name.len, GFP_KERNEL);</div><div class='add'>+	if (!name.data) {</div><div class='add'>+		dprintk("%s: failed to allocate memory for name.data!\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (princhash.len) {</div><div class='add'>+		princhash.data = kmemdup(princhash.data, princhash.len, GFP_KERNEL);</div><div class='add'>+		if (!princhash.data) {</div><div class='add'>+			dprintk("%s: failed to allocate memory for princhash.data!\n",</div><div class='add'>+				__func__);</div><div class='add'>+			kfree(name.data);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		princhash.data = NULL;</div><div class='ctx'> 	crp = alloc_reclaim();</div><div class='ctx'> 	if (crp) {</div><div class='ctx'> 		strhashval = clientstr_hashval(name);</div><div class='hunk'>@@ -8043,6 +8810,9 @@ nfs4_client_to_reclaim(struct xdr_netobj name, struct xdr_netobj princhash,</div><div class='ctx'> 		crp-&gt;cr_princhash.len = princhash.len;</div><div class='ctx'> 		crp-&gt;cr_clp = NULL;</div><div class='ctx'> 		nn-&gt;reclaim_str_hashtbl_size++;</div><div class='add'>+	} else {</div><div class='add'>+		kfree(name.data);</div><div class='add'>+		kfree(princhash.data);</div><div class='ctx'> 	}</div><div class='ctx'> 	return crp;</div><div class='ctx'> }</div><div class='hunk'>@@ -8162,6 +8932,7 @@ static int nfs4_state_create_net(struct net *net)</div><div class='ctx'> 	spin_lock_init(&amp;nn-&gt;client_lock);</div><div class='ctx'> 	spin_lock_init(&amp;nn-&gt;s2s_cp_lock);</div><div class='ctx'> 	idr_init(&amp;nn-&gt;s2s_cp_stateids);</div><div class='add'>+	atomic_set(&amp;nn-&gt;pending_async_copies, 0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;nn-&gt;blocked_locks_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;nn-&gt;blocked_locks_lru);</div><div class='hunk'>@@ -8250,7 +9021,6 @@ skip_grace:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialization to perform when the nfsd service is started: */</div><div class='del'>-</div><div class='ctx'> int</div><div class='ctx'> nfs4_state_start(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -8260,11 +9030,14 @@ nfs4_state_start(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = nfsd4_create_callback_queue();</div><div class='del'>-	if (ret) {</div><div class='add'>+	nfsd_slot_shrinker = shrinker_alloc(0, "nfsd-DRC-slot");</div><div class='add'>+	if (!nfsd_slot_shrinker) {</div><div class='ctx'> 		rhltable_destroy(&amp;nfs4_file_rhltable);</div><div class='del'>-		return ret;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	nfsd_slot_shrinker-&gt;count_objects = nfsd_slot_count;</div><div class='add'>+	nfsd_slot_shrinker-&gt;scan_objects = nfsd_slot_scan;</div><div class='add'>+	shrinker_register(nfsd_slot_shrinker);</div><div class='ctx'> </div><div class='ctx'> 	set_max_delegations();</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -8278,7 +9051,7 @@ nfs4_state_shutdown_net(struct net *net)</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> </div><div class='ctx'> 	shrinker_free(nn-&gt;nfsd_client_shrinker);</div><div class='del'>-	cancel_work(&amp;nn-&gt;nfsd_shrinker_work);</div><div class='add'>+	cancel_work_sync(&amp;nn-&gt;nfsd_shrinker_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;nn-&gt;laundromat_work);</div><div class='ctx'> 	locks_end_grace(&amp;nn-&gt;nfsd4_manager);</div><div class='ctx'> </div><div class='hunk'>@@ -8286,7 +9059,7 @@ nfs4_state_shutdown_net(struct net *net)</div><div class='ctx'> 	spin_lock(&amp;state_lock);</div><div class='ctx'> 	list_for_each_safe(pos, next, &amp;nn-&gt;del_recall_lru) {</div><div class='ctx'> 		dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);</div><div class='del'>-		WARN_ON(!unhash_delegation_locked(dp));</div><div class='add'>+		unhash_delegation_locked(dp, SC_STATUS_CLOSED);</div><div class='ctx'> 		list_add(&amp;dp-&gt;dl_recall_lru, &amp;reaplist);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;state_lock);</div><div class='hunk'>@@ -8306,8 +9079,8 @@ nfs4_state_shutdown_net(struct net *net)</div><div class='ctx'> void</div><div class='ctx'> nfs4_state_shutdown(void)</div><div class='ctx'> {</div><div class='del'>-	nfsd4_destroy_callback_queue();</div><div class='ctx'> 	rhltable_destroy(&amp;nfs4_file_rhltable);</div><div class='add'>+	shrinker_free(nfsd_slot_shrinker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -8425,9 +9198,79 @@ nfsd4_get_writestateid(struct nfsd4_compound_state *cstate,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nfsd4_vet_deleg_time - vet and set the timespec for a delegated timestamp update</div><div class='add'>+ * @req: timestamp from the client</div><div class='add'>+ * @orig: original timestamp in the inode</div><div class='add'>+ * @now: current time</div><div class='add'>+ *</div><div class='add'>+ * Given a timestamp from the client response, check it against the</div><div class='add'>+ * current timestamp in the inode and the current time. Returns true</div><div class='add'>+ * if the inode's timestamp needs to be updated, and false otherwise.</div><div class='add'>+ * @req may also be changed if the timestamp needs to be clamped.</div><div class='add'>+ */</div><div class='add'>+bool nfsd4_vet_deleg_time(struct timespec64 *req, const struct timespec64 *orig,</div><div class='add'>+			  const struct timespec64 *now)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * "When the time presented is before the original time, then the</div><div class='add'>+	 *  update is ignored." Also no need to update if there is no change.</div><div class='add'>+	 */</div><div class='add'>+	if (timespec64_compare(req, orig) &lt;= 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * "When the time presented is in the future, the server can either</div><div class='add'>+	 *  clamp the new time to the current time, or it may</div><div class='add'>+	 *  return NFS4ERR_DELAY to the client, allowing it to retry."</div><div class='add'>+	 */</div><div class='add'>+	if (timespec64_compare(req, now) &gt; 0)</div><div class='add'>+		*req = *now;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cb_getattr_update_times(struct dentry *dentry, struct nfs4_delegation *dp)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	struct nfs4_cb_fattr *ncf = &amp;dp-&gt;dl_cb_fattr;</div><div class='add'>+	struct iattr attrs = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (deleg_attrs_deleg(dp-&gt;dl_type)) {</div><div class='add'>+		struct timespec64 now = current_time(inode);</div><div class='add'>+</div><div class='add'>+		attrs.ia_atime = ncf-&gt;ncf_cb_atime;</div><div class='add'>+		attrs.ia_mtime = ncf-&gt;ncf_cb_mtime;</div><div class='add'>+</div><div class='add'>+		if (nfsd4_vet_deleg_time(&amp;attrs.ia_atime, &amp;dp-&gt;dl_atime, &amp;now))</div><div class='add'>+			attrs.ia_valid |= ATTR_ATIME | ATTR_ATIME_SET;</div><div class='add'>+</div><div class='add'>+		if (nfsd4_vet_deleg_time(&amp;attrs.ia_mtime, &amp;dp-&gt;dl_mtime, &amp;now)) {</div><div class='add'>+			attrs.ia_valid |= ATTR_MTIME | ATTR_MTIME_SET;</div><div class='add'>+			attrs.ia_ctime = attrs.ia_mtime;</div><div class='add'>+			if (nfsd4_vet_deleg_time(&amp;attrs.ia_ctime, &amp;dp-&gt;dl_ctime, &amp;now))</div><div class='add'>+				attrs.ia_valid |= ATTR_CTIME | ATTR_CTIME_SET;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		attrs.ia_valid |= ATTR_MTIME | ATTR_CTIME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!attrs.ia_valid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	attrs.ia_valid |= ATTR_DELEG;</div><div class='add'>+	inode_lock(inode);</div><div class='add'>+	ret = notify_change(&amp;nop_mnt_idmap, dentry, &amp;attrs, NULL);</div><div class='add'>+	inode_unlock(inode);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nfsd4_deleg_getattr_conflict - Recall if GETATTR causes conflict</div><div class='ctx'>  * @rqstp: RPC transaction context</div><div class='del'>- * @inode: file to be checked for a conflict</div><div class='add'>+ * @dentry: dentry of inode to be checked for a conflict</div><div class='add'>+ * @pdp: returned WRITE delegation, if one was found</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called when there is a conflict between a write</div><div class='ctx'>  * delegation and a change/size GETATTR from another client. The server</div><div class='hunk'>@@ -8436,55 +9279,191 @@ nfsd4_get_writestateid(struct nfsd4_compound_state *cstate,</div><div class='ctx'>  * delegation before replying to the GETATTR. See RFC 8881 section</div><div class='ctx'>  * 18.7.4.</div><div class='ctx'>  *</div><div class='del'>- * The current implementation does not support CB_GETATTR yet. However</div><div class='del'>- * this can avoid recalling the delegation could be added in follow up</div><div class='del'>- * work.</div><div class='del'>- *</div><div class='ctx'>  * Returns 0 if there is no conflict; otherwise an nfs_stat</div><div class='del'>- * code is returned.</div><div class='add'>+ * code is returned. If @pdp is set to a non-NULL value, then the</div><div class='add'>+ * caller must put the reference.</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='del'>-nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode)</div><div class='add'>+nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct dentry *dentry,</div><div class='add'>+			     struct nfs4_delegation **pdp)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 status;</div><div class='add'>+	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> 	struct file_lock_context *ctx;</div><div class='del'>-	struct file_lock *fl;</div><div class='del'>-	struct nfs4_delegation *dp;</div><div class='add'>+	struct nfs4_delegation *dp = NULL;</div><div class='add'>+	struct file_lease *fl;</div><div class='add'>+	struct nfs4_cb_fattr *ncf;</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='ctx'> 	ctx = locks_inode_context(inode);</div><div class='ctx'> 	if (!ctx)</div><div class='del'>-		return 0;</div><div class='add'>+		return nfs_ok;</div><div class='add'>+</div><div class='add'>+#define NON_NFSD_LEASE ((void *)1)</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	list_for_each_entry(fl, &amp;ctx-&gt;flc_lease, fl_list) {</div><div class='del'>-		if (fl-&gt;fl_flags == FL_LAYOUT)</div><div class='add'>+	for_each_file_lock(fl, &amp;ctx-&gt;flc_lease) {</div><div class='add'>+		if (fl-&gt;c.flc_flags == FL_LAYOUT)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (fl-&gt;fl_lmops != &amp;nfsd_lease_mng_ops) {</div><div class='del'>-			/*</div><div class='del'>-			 * non-nfs lease, if it's a lease with F_RDLCK then</div><div class='del'>-			 * we are done; there isn't any write delegation</div><div class='del'>-			 * on this inode</div><div class='del'>-			 */</div><div class='del'>-			if (fl-&gt;fl_type == F_RDLCK)</div><div class='del'>-				break;</div><div class='del'>-			goto break_lease;</div><div class='add'>+		if (fl-&gt;c.flc_type == F_WRLCK) {</div><div class='add'>+			if (fl-&gt;fl_lmops == &amp;nfsd_lease_mng_ops)</div><div class='add'>+				dp = fl-&gt;c.flc_owner;</div><div class='add'>+			else</div><div class='add'>+				dp = NON_NFSD_LEASE;</div><div class='ctx'> 		}</div><div class='del'>-		if (fl-&gt;fl_type == F_WRLCK) {</div><div class='del'>-			dp = fl-&gt;fl_owner;</div><div class='del'>-			if (dp-&gt;dl_recall.cb_clp == *(rqstp-&gt;rq_lease_breaker)) {</div><div class='del'>-				spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-break_lease:</div><div class='del'>-			spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-			nfsd_stats_wdeleg_getattr_inc();</div><div class='del'>-			status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (dp == NULL || dp == NON_NFSD_LEASE ||</div><div class='add'>+	    dp-&gt;dl_recall.cb_clp == *(rqstp-&gt;rq_lease_breaker)) {</div><div class='add'>+		spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='add'>+		if (dp == NON_NFSD_LEASE) {</div><div class='add'>+			status = nfserrno(nfsd_open_break_lease(inode,</div><div class='add'>+								NFSD_MAY_READ));</div><div class='ctx'> 			if (status != nfserr_jukebox ||</div><div class='del'>-					!nfsd_wait_for_delegreturn(rqstp, inode))</div><div class='add'>+			    !nfsd_wait_for_delegreturn(rqstp, inode))</div><div class='ctx'> 				return status;</div><div class='del'>-			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	nfsd_stats_wdeleg_getattr_inc(nn);</div><div class='add'>+	refcount_inc(&amp;dp-&gt;dl_stid.sc_count);</div><div class='add'>+	ncf = &amp;dp-&gt;dl_cb_fattr;</div><div class='add'>+	nfs4_cb_getattr(&amp;dp-&gt;dl_cb_fattr);</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;flc_lock);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	wait_on_bit_timeout(&amp;ncf-&gt;ncf_getattr.cb_flags, NFSD4_CALLBACK_RUNNING,</div><div class='add'>+			    TASK_UNINTERRUPTIBLE, NFSD_CB_GETATTR_TIMEOUT);</div><div class='add'>+	if (ncf-&gt;ncf_cb_status) {</div><div class='add'>+		/* Recall delegation only if client didn't respond */</div><div class='add'>+		status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));</div><div class='add'>+		if (status != nfserr_jukebox ||</div><div class='add'>+		    !nfsd_wait_for_delegreturn(rqstp, inode))</div><div class='add'>+			goto out_status;</div><div class='add'>+	}</div><div class='add'>+	if (!ncf-&gt;ncf_file_modified &amp;&amp;</div><div class='add'>+	    (ncf-&gt;ncf_initial_cinfo != ncf-&gt;ncf_cb_change ||</div><div class='add'>+	     ncf-&gt;ncf_cur_fsize != ncf-&gt;ncf_cb_fsize))</div><div class='add'>+		ncf-&gt;ncf_file_modified = true;</div><div class='add'>+	if (ncf-&gt;ncf_file_modified) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Per section 10.4.3 of RFC 8881, the server would</div><div class='add'>+		 * not update the file's metadata with the client's</div><div class='add'>+		 * modified size</div><div class='add'>+		 */</div><div class='add'>+		err = cb_getattr_update_times(dentry, dp);</div><div class='add'>+		if (err) {</div><div class='add'>+			status = nfserrno(err);</div><div class='add'>+			goto out_status;</div><div class='add'>+		}</div><div class='add'>+		ncf-&gt;ncf_cur_fsize = ncf-&gt;ncf_cb_fsize;</div><div class='add'>+		*pdp = dp;</div><div class='add'>+		return nfs_ok;</div><div class='add'>+	}</div><div class='add'>+	status = nfs_ok;</div><div class='add'>+out_status:</div><div class='add'>+	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_get_dir_deleg - attempt to get a directory delegation</div><div class='add'>+ * @cstate: compound state</div><div class='add'>+ * @gdd: GET_DIR_DELEGATION arg/resp structure</div><div class='add'>+ * @nf: nfsd_file opened on the directory</div><div class='add'>+ *</div><div class='add'>+ * Given a GET_DIR_DELEGATION request @gdd, attempt to acquire a delegation</div><div class='add'>+ * on the directory to which @nf refers. Note that this does not set up any</div><div class='add'>+ * sort of async notifications for the delegation.</div><div class='add'>+ */</div><div class='add'>+struct nfs4_delegation *</div><div class='add'>+nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate,</div><div class='add'>+		   struct nfsd4_get_dir_delegation *gdd,</div><div class='add'>+		   struct nfsd_file *nf)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_client *clp = cstate-&gt;clp;</div><div class='add'>+	struct nfs4_delegation *dp;</div><div class='add'>+	struct file_lease *fl;</div><div class='add'>+	struct nfs4_file *fp, *rfp;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	fp = nfsd4_alloc_file();</div><div class='add'>+	if (!fp)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	nfsd4_file_init(&amp;cstate-&gt;current_fh, fp);</div><div class='add'>+</div><div class='add'>+	rfp = nfsd4_file_hash_insert(fp, &amp;cstate-&gt;current_fh);</div><div class='add'>+	if (unlikely(!rfp)) {</div><div class='add'>+		put_nfs4_file(fp);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rfp != fp) {</div><div class='add'>+		put_nfs4_file(fp);</div><div class='add'>+		fp = rfp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if this client already has one, return that it's unavailable */</div><div class='add'>+	spin_lock(&amp;state_lock);</div><div class='add'>+	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	/* existing delegation? */</div><div class='add'>+	if (nfs4_delegation_exists(clp, fp)) {</div><div class='add'>+		status = -EAGAIN;</div><div class='add'>+	} else if (!fp-&gt;fi_deleg_file) {</div><div class='add'>+		fp-&gt;fi_deleg_file = nfsd_file_get(nf);</div><div class='add'>+		fp-&gt;fi_delegees = 1;</div><div class='add'>+	} else {</div><div class='add'>+		++fp-&gt;fi_delegees;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	spin_unlock(&amp;state_lock);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		put_nfs4_file(fp);</div><div class='add'>+		return ERR_PTR(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try to set up the lease */</div><div class='add'>+	status = -ENOMEM;</div><div class='add'>+	dp = alloc_init_deleg(clp, fp, NULL, NFS4_OPEN_DELEGATE_READ);</div><div class='add'>+	if (!dp)</div><div class='add'>+		goto out_delegees;</div><div class='add'>+</div><div class='add'>+	fl = nfs4_alloc_init_lease(dp);</div><div class='add'>+	if (!fl)</div><div class='add'>+		goto out_put_stid;</div><div class='add'>+</div><div class='add'>+	status = kernel_setlease(nf-&gt;nf_file,</div><div class='add'>+				 fl-&gt;c.flc_type, &amp;fl, NULL);</div><div class='add'>+	if (fl)</div><div class='add'>+		locks_free_lease(fl);</div><div class='add'>+	if (status)</div><div class='add'>+		goto out_put_stid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now, try to hash it. This can fail if we race another nfsd task</div><div class='add'>+	 * trying to set a delegation on the same file. If that happens,</div><div class='add'>+	 * then just say UNAVAIL.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;state_lock);</div><div class='add'>+	spin_lock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	spin_lock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	status = hash_delegation_locked(dp, fp);</div><div class='add'>+	spin_unlock(&amp;fp-&gt;fi_lock);</div><div class='add'>+	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='add'>+	spin_unlock(&amp;state_lock);</div><div class='add'>+</div><div class='add'>+	if (!status)</div><div class='add'>+		return dp;</div><div class='add'>+</div><div class='add'>+	/* Something failed. Drop the lease and clean up the stid */</div><div class='add'>+	kernel_setlease(fp-&gt;fi_deleg_file-&gt;nf_file, F_UNLCK, NULL, (void **)&amp;dp);</div><div class='add'>+out_put_stid:</div><div class='add'>+	nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='add'>+out_delegees:</div><div class='add'>+	put_deleg_file(fp);</div><div class='add'>+	return ERR_PTR(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c<br/>index c719c475a068..30ce5851fe4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4xdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfs4xdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4xdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4xdr.c</a></div><div class='hunk'>@@ -55,6 +55,7 @@</div><div class='ctx'> #include "netns.h"</div><div class='ctx'> #include "pnfs.h"</div><div class='ctx'> #include "filecache.h"</div><div class='add'>+#include "nfs4xdr_gen.h"</div><div class='ctx'> </div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='hunk'>@@ -118,11 +119,11 @@ static int zero_clientid(clientid_t *clid)</div><div class='ctx'>  * operation described in @argp finishes.</div><div class='ctx'>  */</div><div class='ctx'> static void *</div><div class='del'>-svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, u32 len)</div><div class='add'>+svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct svcxdr_tmpbuf *tb;</div><div class='ctx'> </div><div class='del'>-	tb = kmalloc(sizeof(*tb) + len, GFP_KERNEL);</div><div class='add'>+	tb = kmalloc(struct_size(tb, buf, len), GFP_KERNEL);</div><div class='ctx'> 	if (!tb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	tb-&gt;next = argp-&gt;to_free;</div><div class='hunk'>@@ -138,9 +139,9 @@ svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, u32 len)</div><div class='ctx'>  * buffer might end on a page boundary.</div><div class='ctx'>  */</div><div class='ctx'> static char *</div><div class='del'>-svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, u32 len)</div><div class='add'>+svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, size_t len)</div><div class='ctx'> {</div><div class='del'>-	char *p = svcxdr_tmpalloc(argp, len + 1);</div><div class='add'>+	char *p = svcxdr_tmpalloc(argp, size_add(len, 1));</div><div class='ctx'> </div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -150,7 +151,7 @@ svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, u32 len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='del'>-svcxdr_savemem(struct nfsd4_compoundargs *argp, __be32 *p, u32 len)</div><div class='add'>+svcxdr_savemem(struct nfsd4_compoundargs *argp, __be32 *p, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -520,6 +521,27 @@ nfsd4_decode_fattr4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen,</div><div class='ctx'> 		*umask = mask &amp; S_IRWXUGO;</div><div class='ctx'> 		iattr-&gt;ia_valid |= ATTR_MODE;</div><div class='ctx'> 	}</div><div class='add'>+	if (bmval[2] &amp; FATTR4_WORD2_TIME_DELEG_ACCESS) {</div><div class='add'>+		fattr4_time_deleg_access access;</div><div class='add'>+</div><div class='add'>+		if (!xdrgen_decode_fattr4_time_deleg_access(argp-&gt;xdr, &amp;access))</div><div class='add'>+			return nfserr_bad_xdr;</div><div class='add'>+		iattr-&gt;ia_atime.tv_sec = access.seconds;</div><div class='add'>+		iattr-&gt;ia_atime.tv_nsec = access.nseconds;</div><div class='add'>+		iattr-&gt;ia_valid |= ATTR_ATIME | ATTR_ATIME_SET | ATTR_DELEG;</div><div class='add'>+	}</div><div class='add'>+	if (bmval[2] &amp; FATTR4_WORD2_TIME_DELEG_MODIFY) {</div><div class='add'>+		fattr4_time_deleg_modify modify;</div><div class='add'>+</div><div class='add'>+		if (!xdrgen_decode_fattr4_time_deleg_modify(argp-&gt;xdr, &amp;modify))</div><div class='add'>+			return nfserr_bad_xdr;</div><div class='add'>+		iattr-&gt;ia_mtime.tv_sec = modify.seconds;</div><div class='add'>+		iattr-&gt;ia_mtime.tv_nsec = modify.nseconds;</div><div class='add'>+		iattr-&gt;ia_ctime.tv_sec = modify.seconds;</div><div class='add'>+		iattr-&gt;ia_ctime.tv_nsec = modify.nseconds;</div><div class='add'>+		iattr-&gt;ia_valid |= ATTR_CTIME | ATTR_CTIME_SET |</div><div class='add'>+				   ATTR_MTIME | ATTR_MTIME_SET | ATTR_DELEG;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* request sanity: did attrlist4 contain the expected number of words? */</div><div class='ctx'> 	if (attrlist4_count != xdr_stream_pos(argp-&gt;xdr) - starting_pos)</div><div class='hunk'>@@ -566,23 +588,13 @@ nfsd4_decode_state_owner4(struct nfsd4_compoundargs *argp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='del'>-static __be32</div><div class='del'>-nfsd4_decode_deviceid4(struct nfsd4_compoundargs *argp,</div><div class='del'>-		       struct nfsd4_deviceid *devid)</div><div class='del'>-{</div><div class='del'>-	__be32 *p;</div><div class='del'>-</div><div class='del'>-	p = xdr_inline_decode(argp-&gt;xdr, NFS4_DEVICEID4_SIZE);</div><div class='del'>-	if (!p)</div><div class='del'>-		return nfserr_bad_xdr;</div><div class='del'>-	memcpy(devid, p, sizeof(*devid));</div><div class='del'>-	return nfs_ok;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp,</div><div class='ctx'> 			   struct nfsd4_layoutcommit *lcp)</div><div class='ctx'> {</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='ctx'> 	if (xdr_stream_decode_u32(argp-&gt;xdr, &amp;lcp-&gt;lc_layout_type) &lt; 0)</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='ctx'> 	if (lcp-&gt;lc_layout_type &lt; LAYOUT_NFSV4_1_FILES)</div><div class='hunk'>@@ -590,13 +602,10 @@ nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp,</div><div class='ctx'> 	if (lcp-&gt;lc_layout_type &gt;= LAYOUT_TYPE_MAX)</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='ctx'> </div><div class='del'>-	if (xdr_stream_decode_u32(argp-&gt;xdr, &amp;lcp-&gt;lc_up_len) &lt; 0)</div><div class='add'>+	if (xdr_stream_decode_u32(argp-&gt;xdr, &amp;len) &lt; 0)</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='add'>+	if (!xdr_stream_subsegment(argp-&gt;xdr, &amp;lcp-&gt;lc_up_layout, len))</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='del'>-	if (lcp-&gt;lc_up_len &gt; 0) {</div><div class='del'>-		lcp-&gt;lc_up_layout = xdr_inline_decode(argp-&gt;xdr, lcp-&gt;lc_up_len);</div><div class='del'>-		if (!lcp-&gt;lc_up_layout)</div><div class='del'>-			return nfserr_bad_xdr;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='hunk'>@@ -1066,13 +1075,13 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *sh</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> 	if (!argp-&gt;minorversion)</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='del'>-	switch (w &amp; NFS4_SHARE_WANT_MASK) {</div><div class='del'>-	case NFS4_SHARE_WANT_NO_PREFERENCE:</div><div class='del'>-	case NFS4_SHARE_WANT_READ_DELEG:</div><div class='del'>-	case NFS4_SHARE_WANT_WRITE_DELEG:</div><div class='del'>-	case NFS4_SHARE_WANT_ANY_DELEG:</div><div class='del'>-	case NFS4_SHARE_WANT_NO_DELEG:</div><div class='del'>-	case NFS4_SHARE_WANT_CANCEL:</div><div class='add'>+	switch (w &amp; NFS4_SHARE_WANT_TYPE_MASK) {</div><div class='add'>+	case OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE:</div><div class='add'>+	case OPEN4_SHARE_ACCESS_WANT_READ_DELEG:</div><div class='add'>+	case OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG:</div><div class='add'>+	case OPEN4_SHARE_ACCESS_WANT_ANY_DELEG:</div><div class='add'>+	case OPEN4_SHARE_ACCESS_WANT_NO_DELEG:</div><div class='add'>+	case OPEN4_SHARE_ACCESS_WANT_CANCEL:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='hunk'>@@ -1246,14 +1255,6 @@ nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='del'>-nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p)</div><div class='del'>-{</div><div class='del'>-	if (argp-&gt;minorversion == 0)</div><div class='del'>-		return nfs_ok;</div><div class='del'>-	return nfserr_notsupp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __be32</div><div class='ctx'> nfsd4_decode_read(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_read *read = &amp;u-&gt;read;</div><div class='hunk'>@@ -1732,6 +1733,35 @@ nfsd4_decode_free_stateid(struct nfsd4_compoundargs *argp,</div><div class='ctx'> 	return nfsd4_decode_stateid4(argp, &amp;free_stateid-&gt;fr_stateid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32</div><div class='add'>+nfsd4_decode_get_dir_delegation(struct nfsd4_compoundargs *argp,</div><div class='add'>+		union nfsd4_op_u *u)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_get_dir_delegation *gdd = &amp;u-&gt;get_dir_delegation;</div><div class='add'>+	__be32 status;</div><div class='add'>+</div><div class='add'>+	memset(gdd, 0, sizeof(*gdd));</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_bool(argp-&gt;xdr, &amp;gdd-&gt;gdda_signal_deleg_avail) &lt; 0)</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='add'>+	status = nfsd4_decode_bitmap4(argp, gdd-&gt;gdda_notification_types,</div><div class='add'>+				      ARRAY_SIZE(gdd-&gt;gdda_notification_types));</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	status = nfsd4_decode_nfstime4(argp, &amp;gdd-&gt;gdda_child_attr_delay);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	status = nfsd4_decode_nfstime4(argp, &amp;gdd-&gt;gdda_dir_attr_delay);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	status = nfsd4_decode_bitmap4(argp, gdd-&gt;gdda_child_attributes,</div><div class='add'>+					ARRAY_SIZE(gdd-&gt;gdda_child_attributes));</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+	return nfsd4_decode_bitmap4(argp, gdd-&gt;gdda_dir_attributes,</div><div class='add'>+					ARRAY_SIZE(gdd-&gt;gdda_dir_attributes));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_decode_getdeviceinfo(struct nfsd4_compoundargs *argp,</div><div class='hunk'>@@ -1741,7 +1771,7 @@ nfsd4_decode_getdeviceinfo(struct nfsd4_compoundargs *argp,</div><div class='ctx'> 	__be32 status;</div><div class='ctx'> </div><div class='ctx'> 	memset(gdev, 0, sizeof(*gdev));</div><div class='del'>-	status = nfsd4_decode_deviceid4(argp, &amp;gdev-&gt;gd_devid);</div><div class='add'>+	status = nfsd4_decode_deviceid4(argp-&gt;xdr, &amp;gdev-&gt;gd_devid);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	if (xdr_stream_decode_u32(argp-&gt;xdr, &amp;gdev-&gt;gd_layout_type) &lt; 0)</div><div class='hunk'>@@ -1772,7 +1802,7 @@ nfsd4_decode_layoutcommit(struct nfsd4_compoundargs *argp,</div><div class='ctx'> 	status = nfsd4_decode_stateid4(argp, &amp;lcp-&gt;lc_sid);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='del'>-	if (xdr_stream_decode_u32(argp-&gt;xdr, &amp;lcp-&gt;lc_newoffset) &lt; 0)</div><div class='add'>+	if (xdr_stream_decode_bool(argp-&gt;xdr, &amp;lcp-&gt;lc_newoffset) &lt; 0)</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='ctx'> 	if (lcp-&gt;lc_newoffset) {</div><div class='ctx'> 		if (xdr_stream_decode_u64(argp-&gt;xdr, &amp;lcp-&gt;lc_last_wr) &lt; 0)</div><div class='hunk'>@@ -1863,7 +1893,8 @@ nfsd4_decode_sequence(struct nfsd4_compoundargs *argp,</div><div class='ctx'> 		return nfserr_bad_xdr;</div><div class='ctx'> 	seq-&gt;seqid = be32_to_cpup(p++);</div><div class='ctx'> 	seq-&gt;slotid = be32_to_cpup(p++);</div><div class='del'>-	seq-&gt;maxslots = be32_to_cpup(p++);</div><div class='add'>+	/* sa_highest_slotid counts from 0 but maxslots  counts from 1 ... */</div><div class='add'>+	seq-&gt;maxslots = be32_to_cpup(p++) + 1;</div><div class='ctx'> 	seq-&gt;cachethis = be32_to_cpup(p);</div><div class='ctx'> </div><div class='ctx'> 	seq-&gt;status_flags = 0;</div><div class='hunk'>@@ -2117,7 +2148,7 @@ nfsd4_decode_clone(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)</div><div class='ctx'>  */</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_vbuf_from_vector(struct nfsd4_compoundargs *argp, struct xdr_buf *xdr,</div><div class='del'>-		       char **bufp, u32 buflen)</div><div class='add'>+		       char **bufp, size_t buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct page **pages = xdr-&gt;pages;</div><div class='ctx'> 	struct kvec *head = xdr-&gt;head;</div><div class='hunk'>@@ -2345,7 +2376,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = {</div><div class='ctx'> 	[OP_OPEN_CONFIRM]	= nfsd4_decode_open_confirm,</div><div class='ctx'> 	[OP_OPEN_DOWNGRADE]	= nfsd4_decode_open_downgrade,</div><div class='ctx'> 	[OP_PUTFH]		= nfsd4_decode_putfh,</div><div class='del'>-	[OP_PUTPUBFH]		= nfsd4_decode_putpubfh,</div><div class='add'>+	[OP_PUTPUBFH]		= nfsd4_decode_noop,</div><div class='ctx'> 	[OP_PUTROOTFH]		= nfsd4_decode_noop,</div><div class='ctx'> 	[OP_READ]		= nfsd4_decode_read,</div><div class='ctx'> 	[OP_READDIR]		= nfsd4_decode_readdir,</div><div class='hunk'>@@ -2370,7 +2401,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = {</div><div class='ctx'> 	[OP_CREATE_SESSION]	= nfsd4_decode_create_session,</div><div class='ctx'> 	[OP_DESTROY_SESSION]	= nfsd4_decode_destroy_session,</div><div class='ctx'> 	[OP_FREE_STATEID]	= nfsd4_decode_free_stateid,</div><div class='del'>-	[OP_GET_DIR_DELEGATION]	= nfsd4_decode_notsupp,</div><div class='add'>+	[OP_GET_DIR_DELEGATION]	= nfsd4_decode_get_dir_delegation,</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> 	[OP_GETDEVICEINFO]	= nfsd4_decode_getdeviceinfo,</div><div class='ctx'> 	[OP_GETDEVICELIST]	= nfsd4_decode_notsupp,</div><div class='hunk'>@@ -2521,7 +2552,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)</div><div class='ctx'> 	/* Sessions make the DRC unnecessary: */</div><div class='ctx'> 	if (argp-&gt;minorversion)</div><div class='ctx'> 		cachethis = false;</div><div class='del'>-	svc_reserve(argp-&gt;rqstp, max_reply + readbytes);</div><div class='add'>+	svc_reserve_auth(argp-&gt;rqstp, max_reply + readbytes);</div><div class='ctx'> 	argp-&gt;rqstp-&gt;rq_cachetype = cachethis ? RC_REPLBUFF : RC_NOCACHE;</div><div class='ctx'> </div><div class='ctx'> 	argp-&gt;splice_ok = nfsd_read_splice_ok(argp-&gt;rqstp);</div><div class='hunk'>@@ -2599,10 +2630,8 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	__be32 pathlen;</div><div class='ctx'> 	int pathlen_offset;</div><div class='del'>-	int strlen, count=0;</div><div class='ctx'> 	char *str, *end, *next;</div><div class='del'>-</div><div class='del'>-	dprintk("nfsd4_encode_components(%s)\n", components);</div><div class='add'>+	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	pathlen_offset = xdr-&gt;buf-&gt;len;</div><div class='ctx'> 	p = xdr_reserve_space(xdr, 4);</div><div class='hunk'>@@ -2629,15 +2658,11 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,</div><div class='ctx'> 			for (; *end &amp;&amp; (*end != sep); end++)</div><div class='ctx'> 				/* find sep or end of string */;</div><div class='ctx'> </div><div class='del'>-		strlen = end - str;</div><div class='del'>-		if (strlen) {</div><div class='del'>-			p = xdr_reserve_space(xdr, strlen + 4);</div><div class='del'>-			if (!p)</div><div class='add'>+		if (end &gt; str) {</div><div class='add'>+			if (xdr_stream_encode_opaque(xdr, str, end - str) &lt; 0)</div><div class='ctx'> 				return nfserr_resource;</div><div class='del'>-			p = xdr_encode_opaque(p, str, strlen);</div><div class='ctx'> 			count++;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='add'>+		} else</div><div class='ctx'> 			end++;</div><div class='ctx'> 		if (found_esc)</div><div class='ctx'> 			end = next;</div><div class='hunk'>@@ -2678,7 +2703,6 @@ static __be32 nfsd4_encode_pathname4(struct xdr_stream *xdr,</div><div class='ctx'> 				     const struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	struct path cur = *path;</div><div class='del'>-	__be32 *p;</div><div class='ctx'> 	struct dentry **components = NULL;</div><div class='ctx'> 	unsigned int ncomponents = 0;</div><div class='ctx'> 	__be32 err = nfserr_jukebox;</div><div class='hunk'>@@ -2709,24 +2733,19 @@ static __be32 nfsd4_encode_pathname4(struct xdr_stream *xdr,</div><div class='ctx'> 		components[ncomponents++] = cur.dentry;</div><div class='ctx'> 		cur.dentry = dget_parent(cur.dentry);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	err = nfserr_resource;</div><div class='del'>-	p = xdr_reserve_space(xdr, 4);</div><div class='del'>-	if (!p)</div><div class='add'>+	if (xdr_stream_encode_u32(xdr, ncomponents) != XDR_UNIT)</div><div class='ctx'> 		goto out_free;</div><div class='del'>-	*p++ = cpu_to_be32(ncomponents);</div><div class='del'>-</div><div class='ctx'> 	while (ncomponents) {</div><div class='ctx'> 		struct dentry *dentry = components[ncomponents - 1];</div><div class='del'>-		unsigned int len;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		len = dentry-&gt;d_name.len;</div><div class='del'>-		p = xdr_reserve_space(xdr, len + 4);</div><div class='del'>-		if (!p) {</div><div class='add'>+		if (xdr_stream_encode_opaque(xdr, dentry-&gt;d_name.name,</div><div class='add'>+					     dentry-&gt;d_name.len) &lt; 0) {</div><div class='ctx'> 			spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='del'>-		p = xdr_encode_opaque(p, dentry-&gt;d_name.name, len);</div><div class='ctx'> 		dprintk("/%pd", dentry);</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 		dput(dentry);</div><div class='hunk'>@@ -2806,11 +2825,11 @@ static __be32 nfsd4_encode_nfsace4(struct xdr_stream *xdr, struct svc_rqst *rqst</div><div class='ctx'> #ifdef CONFIG_NFSD_V4_SECURITY_LABEL</div><div class='ctx'> static inline __be32</div><div class='ctx'> nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,</div><div class='del'>-			    void *context, int len)</div><div class='add'>+			    const struct lsm_context *context)</div><div class='ctx'> {</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> </div><div class='del'>-	p = xdr_reserve_space(xdr, len + 4 + 4 + 4);</div><div class='add'>+	p = xdr_reserve_space(xdr, context-&gt;len + 4 + 4 + 4);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return nfserr_resource;</div><div class='ctx'> </div><div class='hunk'>@@ -2820,13 +2839,13 @@ nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	*p++ = cpu_to_be32(0); /* lfs */</div><div class='ctx'> 	*p++ = cpu_to_be32(0); /* pi */</div><div class='del'>-	p = xdr_encode_opaque(p, context, len);</div><div class='add'>+	p = xdr_encode_opaque(p, context-&gt;context, context-&gt;len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline __be32</div><div class='ctx'> nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,</div><div class='del'>-			    void *context, int len)</div><div class='add'>+			    struct lsm_context *context)</div><div class='ctx'> { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2907,10 +2926,9 @@ struct nfsd4_fattr_args {</div><div class='ctx'> 	struct kstat		stat;</div><div class='ctx'> 	struct kstatfs		statfs;</div><div class='ctx'> 	struct nfs4_acl		*acl;</div><div class='del'>-	u64			size;</div><div class='add'>+	u64			change_attr;</div><div class='ctx'> #ifdef CONFIG_NFSD_V4_SECURITY_LABEL</div><div class='del'>-	void			*context;</div><div class='del'>-	int			contextlen;</div><div class='add'>+	struct lsm_context	context;</div><div class='ctx'> #endif</div><div class='ctx'> 	u32			rdattr_err;</div><div class='ctx'> 	bool			contextsupport;</div><div class='hunk'>@@ -2920,6 +2938,12 @@ struct nfsd4_fattr_args {</div><div class='ctx'> typedef __be32(*nfsd4_enc_attr)(struct xdr_stream *xdr,</div><div class='ctx'> 				const struct nfsd4_fattr_args *args);</div><div class='ctx'> </div><div class='add'>+static __be32 nfsd4_encode_fattr4__inval(struct xdr_stream *xdr,</div><div class='add'>+					 const struct nfsd4_fattr_args *args)</div><div class='add'>+{</div><div class='add'>+	return nfserr_inval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __be32 nfsd4_encode_fattr4__noop(struct xdr_stream *xdr,</div><div class='ctx'> 					const struct nfsd4_fattr_args *args)</div><div class='ctx'> {</div><div class='hunk'>@@ -3007,7 +3031,6 @@ static __be32 nfsd4_encode_fattr4_change(struct xdr_stream *xdr,</div><div class='ctx'> 					 const struct nfsd4_fattr_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	const struct svc_export *exp = args-&gt;exp;</div><div class='del'>-	u64 c;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(exp-&gt;ex_flags &amp; NFSEXP_V4ROOT)) {</div><div class='ctx'> 		u32 flush_time = convert_to_wallclock(exp-&gt;cd-&gt;flush_time);</div><div class='hunk'>@@ -3018,15 +3041,13 @@ static __be32 nfsd4_encode_fattr4_change(struct xdr_stream *xdr,</div><div class='ctx'> 			return nfserr_resource;</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	c = nfsd4_change_attribute(&amp;args-&gt;stat, d_inode(args-&gt;dentry));</div><div class='del'>-	return nfsd4_encode_changeid4(xdr, c);</div><div class='add'>+	return nfsd4_encode_changeid4(xdr, args-&gt;change_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 nfsd4_encode_fattr4_size(struct xdr_stream *xdr,</div><div class='ctx'> 				       const struct nfsd4_fattr_args *args)</div><div class='ctx'> {</div><div class='del'>-	return nfsd4_encode_uint64_t(xdr, args-&gt;size);</div><div class='add'>+	return nfsd4_encode_uint64_t(xdr, args-&gt;stat.size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 nfsd4_encode_fattr4_fsid(struct xdr_stream *xdr,</div><div class='hunk'>@@ -3361,12 +3382,28 @@ static __be32 nfsd4_encode_fattr4_suppattr_exclcreat(struct xdr_stream *xdr,</div><div class='ctx'> 	return nfsd4_encode_bitmap4(xdr, supp[0], supp[1], supp[2]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Copied from generic_remap_checks/generic_remap_file_range_prep.</div><div class='add'>+ *</div><div class='add'>+ * These generic functions use the file system's s_blocksize, but</div><div class='add'>+ * individual file systems aren't required to use</div><div class='add'>+ * generic_remap_file_range_prep. Until there is a mechanism for</div><div class='add'>+ * determining a particular file system's (or file's) clone block</div><div class='add'>+ * size, this is the best NFSD can do.</div><div class='add'>+ */</div><div class='add'>+static __be32 nfsd4_encode_fattr4_clone_blksize(struct xdr_stream *xdr,</div><div class='add'>+						const struct nfsd4_fattr_args *args)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(args-&gt;dentry);</div><div class='add'>+</div><div class='add'>+	return nfsd4_encode_uint32_t(xdr, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFSD_V4_SECURITY_LABEL</div><div class='ctx'> static __be32 nfsd4_encode_fattr4_sec_label(struct xdr_stream *xdr,</div><div class='ctx'> 					    const struct nfsd4_fattr_args *args)</div><div class='ctx'> {</div><div class='del'>-	return nfsd4_encode_security_label(xdr, args-&gt;rqstp,</div><div class='del'>-					   args-&gt;context, args-&gt;contextlen);</div><div class='add'>+	return nfsd4_encode_security_label(xdr, args-&gt;rqstp, &amp;args-&gt;context);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -3378,6 +3415,56 @@ static __be32 nfsd4_encode_fattr4_xattr_support(struct xdr_stream *xdr,</div><div class='ctx'> 	return nfsd4_encode_bool(xdr, err == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define NFSD_OA_SHARE_ACCESS	(BIT(OPEN_ARGS_SHARE_ACCESS_READ)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_SHARE_ACCESS_WRITE)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_SHARE_ACCESS_BOTH))</div><div class='add'>+</div><div class='add'>+#define NFSD_OA_SHARE_DENY	(BIT(OPEN_ARGS_SHARE_DENY_NONE)		| \</div><div class='add'>+				 BIT(OPEN_ARGS_SHARE_DENY_READ)		| \</div><div class='add'>+				 BIT(OPEN_ARGS_SHARE_DENY_WRITE)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_SHARE_DENY_BOTH))</div><div class='add'>+</div><div class='add'>+#define NFSD_OA_SHARE_ACCESS_WANT	(BIT(OPEN_ARGS_SHARE_ACCESS_WANT_ANY_DELEG)		| \</div><div class='add'>+					 BIT(OPEN_ARGS_SHARE_ACCESS_WANT_NO_DELEG)		| \</div><div class='add'>+					 BIT(OPEN_ARGS_SHARE_ACCESS_WANT_CANCEL)		| \</div><div class='add'>+					 BIT(OPEN_ARGS_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS)	| \</div><div class='add'>+					 BIT(OPEN_ARGS_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION))</div><div class='add'>+</div><div class='add'>+#define NFSD_OA_OPEN_CLAIM	(BIT(OPEN_ARGS_OPEN_CLAIM_NULL)		| \</div><div class='add'>+				 BIT(OPEN_ARGS_OPEN_CLAIM_PREVIOUS)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_OPEN_CLAIM_DELEGATE_CUR)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_OPEN_CLAIM_DELEGATE_PREV)| \</div><div class='add'>+				 BIT(OPEN_ARGS_OPEN_CLAIM_FH)		| \</div><div class='add'>+				 BIT(OPEN_ARGS_OPEN_CLAIM_DELEG_CUR_FH)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_OPEN_CLAIM_DELEG_PREV_FH))</div><div class='add'>+</div><div class='add'>+#define NFSD_OA_CREATE_MODE	(BIT(OPEN_ARGS_CREATEMODE_UNCHECKED4)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_CREATE_MODE_GUARDED)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_CREATEMODE_EXCLUSIVE4)	| \</div><div class='add'>+				 BIT(OPEN_ARGS_CREATE_MODE_EXCLUSIVE4_1))</div><div class='add'>+</div><div class='add'>+static uint32_t oa_share_access = NFSD_OA_SHARE_ACCESS;</div><div class='add'>+static uint32_t oa_share_deny = NFSD_OA_SHARE_DENY;</div><div class='add'>+static uint32_t oa_share_access_want = NFSD_OA_SHARE_ACCESS_WANT;</div><div class='add'>+static uint32_t oa_open_claim = NFSD_OA_OPEN_CLAIM;</div><div class='add'>+static uint32_t oa_create_mode = NFSD_OA_CREATE_MODE;</div><div class='add'>+</div><div class='add'>+static const struct open_arguments4 nfsd_open_arguments = {</div><div class='add'>+	.oa_share_access = { .count = 1, .element = &amp;oa_share_access },</div><div class='add'>+	.oa_share_deny = { .count = 1, .element = &amp;oa_share_deny },</div><div class='add'>+	.oa_share_access_want = { .count = 1, .element = &amp;oa_share_access_want },</div><div class='add'>+	.oa_open_claim = { .count = 1, .element = &amp;oa_open_claim },</div><div class='add'>+	.oa_create_mode = { .count = 1, .element = &amp;oa_create_mode },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __be32 nfsd4_encode_fattr4_open_arguments(struct xdr_stream *xdr,</div><div class='add'>+						 const struct nfsd4_fattr_args *args)</div><div class='add'>+{</div><div class='add'>+	if (!xdrgen_encode_fattr4_open_arguments(xdr, &amp;nfsd_open_arguments))</div><div class='add'>+		return nfserr_resource;</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const nfsd4_enc_attr nfsd4_enc_fattr4_encode_ops[] = {</div><div class='ctx'> 	[FATTR4_SUPPORTED_ATTRS]	= nfsd4_encode_fattr4_supported_attrs,</div><div class='ctx'> 	[FATTR4_TYPE]			= nfsd4_encode_fattr4_type,</div><div class='hunk'>@@ -3466,7 +3553,7 @@ static const nfsd4_enc_attr nfsd4_enc_fattr4_encode_ops[] = {</div><div class='ctx'> 	[FATTR4_MODE_SET_MASKED]	= nfsd4_encode_fattr4__noop,</div><div class='ctx'> 	[FATTR4_SUPPATTR_EXCLCREAT]	= nfsd4_encode_fattr4_suppattr_exclcreat,</div><div class='ctx'> 	[FATTR4_FS_CHARSET_CAP]		= nfsd4_encode_fattr4__noop,</div><div class='del'>-	[FATTR4_CLONE_BLKSIZE]		= nfsd4_encode_fattr4__noop,</div><div class='add'>+	[FATTR4_CLONE_BLKSIZE]		= nfsd4_encode_fattr4_clone_blksize,</div><div class='ctx'> 	[FATTR4_SPACE_FREED]		= nfsd4_encode_fattr4__noop,</div><div class='ctx'> 	[FATTR4_CHANGE_ATTR_TYPE]	= nfsd4_encode_fattr4__noop,</div><div class='ctx'> </div><div class='hunk'>@@ -3478,6 +3565,9 @@ static const nfsd4_enc_attr nfsd4_enc_fattr4_encode_ops[] = {</div><div class='ctx'> </div><div class='ctx'> 	[FATTR4_MODE_UMASK]		= nfsd4_encode_fattr4__noop,</div><div class='ctx'> 	[FATTR4_XATTR_SUPPORT]		= nfsd4_encode_fattr4_xattr_support,</div><div class='add'>+	[FATTR4_TIME_DELEG_ACCESS]	= nfsd4_encode_fattr4__inval,</div><div class='add'>+	[FATTR4_TIME_DELEG_MODIFY]	= nfsd4_encode_fattr4__inval,</div><div class='add'>+	[FATTR4_OPEN_ARGUMENTS]		= nfsd4_encode_fattr4_open_arguments,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3490,11 +3580,14 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 		    struct dentry *dentry, const u32 *bmval,</div><div class='ctx'> 		    int ignore_crossmnt)</div><div class='ctx'> {</div><div class='add'>+	DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops));</div><div class='add'>+	struct nfs4_delegation *dp = NULL;</div><div class='ctx'> 	struct nfsd4_fattr_args args;</div><div class='ctx'> 	struct svc_fh *tempfh = NULL;</div><div class='ctx'> 	int starting_len = xdr-&gt;buf-&gt;len;</div><div class='del'>-	__be32 *attrlen_p, status;</div><div class='del'>-	int attrlen_offset;</div><div class='add'>+	unsigned int attrlen_offset;</div><div class='add'>+	__be32 attrlen, status;</div><div class='add'>+	u32 attrmask[3];</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct nfsd4_compoundres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	u32 minorversion = resp-&gt;cstate.minorversion;</div><div class='hunk'>@@ -3502,10 +3595,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 		.mnt	= exp-&gt;ex_path.mnt,</div><div class='ctx'> 		.dentry	= dentry,</div><div class='ctx'> 	};</div><div class='del'>-	union {</div><div class='del'>-		u32		attrmask[3];</div><div class='del'>-		unsigned long	mask[2];</div><div class='del'>-	} u;</div><div class='ctx'> 	unsigned long bit;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(bmval[1] &amp; NFSD_WRITEONLY_ATTRS_WORD1);</div><div class='hunk'>@@ -3515,25 +3604,31 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 	args.exp = exp;</div><div class='ctx'> 	args.dentry = dentry;</div><div class='ctx'> 	args.ignore_crossmnt = (ignore_crossmnt != 0);</div><div class='add'>+	args.acl = NULL;</div><div class='add'>+#ifdef CONFIG_NFSD_V4_SECURITY_LABEL</div><div class='add'>+	args.context.context = NULL;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make a local copy of the attribute bitmap that can be modified.</div><div class='ctx'> 	 */</div><div class='del'>-	memset(&amp;u, 0, sizeof(u));</div><div class='del'>-	u.attrmask[0] = bmval[0];</div><div class='del'>-	u.attrmask[1] = bmval[1];</div><div class='del'>-	u.attrmask[2] = bmval[2];</div><div class='add'>+	attrmask[0] = bmval[0];</div><div class='add'>+	attrmask[1] = bmval[1];</div><div class='add'>+	attrmask[2] = bmval[2];</div><div class='ctx'> </div><div class='ctx'> 	args.rdattr_err = 0;</div><div class='ctx'> 	if (exp-&gt;ex_fslocs.migrated) {</div><div class='del'>-		status = fattr_handle_absent_fs(&amp;u.attrmask[0], &amp;u.attrmask[1],</div><div class='del'>-						&amp;u.attrmask[2], &amp;args.rdattr_err);</div><div class='add'>+		status = fattr_handle_absent_fs(&amp;attrmask[0], &amp;attrmask[1],</div><div class='add'>+						&amp;attrmask[2], &amp;args.rdattr_err);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	args.size = 0;</div><div class='del'>-	if (u.attrmask[0] &amp; (FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE)) {</div><div class='del'>-		status = nfsd4_deleg_getattr_conflict(rqstp, d_inode(dentry));</div><div class='add'>+	if ((attrmask[0] &amp; (FATTR4_WORD0_CHANGE |</div><div class='add'>+			    FATTR4_WORD0_SIZE)) ||</div><div class='add'>+	    (attrmask[1] &amp; (FATTR4_WORD1_TIME_ACCESS |</div><div class='add'>+			    FATTR4_WORD1_TIME_MODIFY |</div><div class='add'>+			    FATTR4_WORD1_TIME_METADATA))) {</div><div class='add'>+		status = nfsd4_deleg_getattr_conflict(rqstp, dentry, &amp;dp);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3541,22 +3636,40 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 	err = vfs_getattr(&amp;path, &amp;args.stat,</div><div class='ctx'> 			  STATX_BASIC_STATS | STATX_BTIME | STATX_CHANGE_COOKIE,</div><div class='ctx'> 			  AT_STATX_SYNC_AS_STAT);</div><div class='add'>+	if (dp) {</div><div class='add'>+		struct nfs4_cb_fattr *ncf = &amp;dp-&gt;dl_cb_fattr;</div><div class='add'>+</div><div class='add'>+		if (ncf-&gt;ncf_file_modified) {</div><div class='add'>+			++ncf-&gt;ncf_initial_cinfo;</div><div class='add'>+			args.stat.size = ncf-&gt;ncf_cur_fsize;</div><div class='add'>+			if (!timespec64_is_epoch(&amp;ncf-&gt;ncf_cb_mtime))</div><div class='add'>+				args.stat.mtime = ncf-&gt;ncf_cb_mtime;</div><div class='add'>+		}</div><div class='add'>+		args.change_attr = ncf-&gt;ncf_initial_cinfo;</div><div class='add'>+</div><div class='add'>+		if (!timespec64_is_epoch(&amp;ncf-&gt;ncf_cb_atime))</div><div class='add'>+			args.stat.atime = ncf-&gt;ncf_cb_atime;</div><div class='add'>+</div><div class='add'>+		nfs4_put_stid(&amp;dp-&gt;dl_stid);</div><div class='add'>+	} else {</div><div class='add'>+		args.change_attr = nfsd4_change_attribute(&amp;args.stat);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_nfserr;</div><div class='del'>-	args.size = args.stat.size;</div><div class='ctx'> </div><div class='ctx'> 	if (!(args.stat.result_mask &amp; STATX_BTIME))</div><div class='ctx'> 		/* underlying FS does not offer btime so we can't share it */</div><div class='del'>-		u.attrmask[1] &amp;= ~FATTR4_WORD1_TIME_CREATE;</div><div class='del'>-	if ((u.attrmask[0] &amp; (FATTR4_WORD0_FILES_AVAIL | FATTR4_WORD0_FILES_FREE |</div><div class='add'>+		attrmask[1] &amp;= ~FATTR4_WORD1_TIME_CREATE;</div><div class='add'>+	if ((attrmask[0] &amp; (FATTR4_WORD0_FILES_AVAIL | FATTR4_WORD0_FILES_FREE |</div><div class='ctx'> 			FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_MAXNAME)) ||</div><div class='del'>-	    (u.attrmask[1] &amp; (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE |</div><div class='add'>+	    (attrmask[1] &amp; (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE |</div><div class='ctx'> 		       FATTR4_WORD1_SPACE_TOTAL))) {</div><div class='ctx'> 		err = vfs_statfs(&amp;path, &amp;args.statfs);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_nfserr;</div><div class='ctx'> 	}</div><div class='del'>-	if ((u.attrmask[0] &amp; (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) &amp;&amp;</div><div class='add'>+	if ((attrmask[0] &amp; (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) &amp;&amp;</div><div class='ctx'> 	    !fhp) {</div><div class='ctx'> 		tempfh = kmalloc(sizeof(struct svc_fh), GFP_KERNEL);</div><div class='ctx'> 		status = nfserr_jukebox;</div><div class='hunk'>@@ -3570,11 +3683,10 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 	} else</div><div class='ctx'> 		args.fhp = fhp;</div><div class='ctx'> </div><div class='del'>-	args.acl = NULL;</div><div class='del'>-	if (u.attrmask[0] &amp; FATTR4_WORD0_ACL) {</div><div class='add'>+	if (attrmask[0] &amp; FATTR4_WORD0_ACL) {</div><div class='ctx'> 		err = nfsd4_get_nfs4_acl(rqstp, dentry, &amp;args.acl);</div><div class='ctx'> 		if (err == -EOPNOTSUPP)</div><div class='del'>-			u.attrmask[0] &amp;= ~FATTR4_WORD0_ACL;</div><div class='add'>+			attrmask[0] &amp;= ~FATTR4_WORD0_ACL;</div><div class='ctx'> 		else if (err == -EINVAL) {</div><div class='ctx'> 			status = nfserr_attrnotsupp;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3585,18 +3697,17 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> 	args.contextsupport = false;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_V4_SECURITY_LABEL</div><div class='del'>-	args.context = NULL;</div><div class='del'>-	if ((u.attrmask[2] &amp; FATTR4_WORD2_SECURITY_LABEL) ||</div><div class='del'>-	     u.attrmask[0] &amp; FATTR4_WORD0_SUPPORTED_ATTRS) {</div><div class='add'>+	if ((attrmask[2] &amp; FATTR4_WORD2_SECURITY_LABEL) ||</div><div class='add'>+	     attrmask[0] &amp; FATTR4_WORD0_SUPPORTED_ATTRS) {</div><div class='ctx'> 		if (exp-&gt;ex_flags &amp; NFSEXP_SECURITY_LABEL)</div><div class='ctx'> 			err = security_inode_getsecctx(d_inode(dentry),</div><div class='del'>-						&amp;args.context, &amp;args.contextlen);</div><div class='add'>+						&amp;args.context);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EOPNOTSUPP;</div><div class='ctx'> 		args.contextsupport = (err == 0);</div><div class='del'>-		if (u.attrmask[2] &amp; FATTR4_WORD2_SECURITY_LABEL) {</div><div class='add'>+		if (attrmask[2] &amp; FATTR4_WORD2_SECURITY_LABEL) {</div><div class='ctx'> 			if (err == -EOPNOTSUPP)</div><div class='del'>-				u.attrmask[2] &amp;= ~FATTR4_WORD2_SECURITY_LABEL;</div><div class='add'>+				attrmask[2] &amp;= ~FATTR4_WORD2_SECURITY_LABEL;</div><div class='ctx'> 			else if (err)</div><div class='ctx'> 				goto out_nfserr;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3604,29 +3715,31 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */</div><div class='ctx'> </div><div class='ctx'> 	/* attrmask */</div><div class='del'>-	status = nfsd4_encode_bitmap4(xdr, u.attrmask[0],</div><div class='del'>-				      u.attrmask[1], u.attrmask[2]);</div><div class='add'>+	status = nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1],</div><div class='add'>+				      attrmask[2]);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* attr_vals */</div><div class='ctx'> 	attrlen_offset = xdr-&gt;buf-&gt;len;</div><div class='del'>-	attrlen_p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='del'>-	if (!attrlen_p)</div><div class='add'>+	if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT)))</div><div class='ctx'> 		goto out_resource;</div><div class='del'>-	for_each_set_bit(bit, (const unsigned long *)&amp;u.mask,</div><div class='add'>+	bitmap_from_arr32(attr_bitmap, attrmask,</div><div class='add'>+			  ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops));</div><div class='add'>+	for_each_set_bit(bit, attr_bitmap,</div><div class='ctx'> 			 ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)) {</div><div class='ctx'> 		status = nfsd4_enc_fattr4_encode_ops[bit](xdr, &amp;args);</div><div class='ctx'> 		if (status != nfs_ok)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	*attrlen_p = cpu_to_be32(xdr-&gt;buf-&gt;len - attrlen_offset - XDR_UNIT);</div><div class='add'>+	attrlen = cpu_to_be32(xdr-&gt;buf-&gt;len - attrlen_offset - XDR_UNIT);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, attrlen_offset, &amp;attrlen, XDR_UNIT);</div><div class='ctx'> 	status = nfs_ok;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> #ifdef CONFIG_NFSD_V4_SECURITY_LABEL</div><div class='del'>-	if (args.context)</div><div class='del'>-		security_release_secctx(args.context, args.contextlen);</div><div class='add'>+	if (args.context.context)</div><div class='add'>+		security_release_secctx(&amp;args.context);</div><div class='ctx'> #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */</div><div class='ctx'> 	kfree(args.acl);</div><div class='ctx'> 	if (tempfh) {</div><div class='hunk'>@@ -3709,7 +3822,9 @@ nfsd4_encode_entry4_fattr(struct nfsd4_readdir *cd, const char *name,</div><div class='ctx'> 	__be32 nfserr;</div><div class='ctx'> 	int ignore_crossmnt = 0;</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_positive_unlocked(name, cd-&gt;rd_fhp-&gt;fh_dentry, namlen);</div><div class='add'>+	dentry = lookup_one_positive_unlocked(&amp;nop_mnt_idmap,</div><div class='add'>+					      &amp;QSTR_LEN(name, namlen),</div><div class='add'>+					      cd-&gt;rd_fhp-&gt;fh_dentry);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return nfserrno(PTR_ERR(dentry));</div><div class='ctx'> </div><div class='hunk'>@@ -3739,7 +3854,7 @@ nfsd4_encode_entry4_fattr(struct nfsd4_readdir *cd, const char *name,</div><div class='ctx'> 			nfserr = nfserrno(err);</div><div class='ctx'> 			goto out_put;</div><div class='ctx'> 		}</div><div class='del'>-		nfserr = check_nfsd_access(exp, cd-&gt;rd_rqstp);</div><div class='add'>+		nfserr = check_nfsd_access(exp, cd-&gt;rd_rqstp, false);</div><div class='ctx'> 		if (nfserr)</div><div class='ctx'> 			goto out_put;</div><div class='ctx'> </div><div class='hunk'>@@ -4210,18 +4325,20 @@ nfsd4_encode_open_delegation4(struct xdr_stream *xdr, struct nfsd4_open *open)</div><div class='ctx'> 	if (xdr_stream_encode_u32(xdr, open-&gt;op_delegate_type) != XDR_UNIT)</div><div class='ctx'> 		return nfserr_resource;</div><div class='ctx'> 	switch (open-&gt;op_delegate_type) {</div><div class='del'>-	case NFS4_OPEN_DELEGATE_NONE:</div><div class='add'>+	case OPEN_DELEGATE_NONE:</div><div class='ctx'> 		status = nfs_ok;</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_OPEN_DELEGATE_READ:</div><div class='add'>+	case OPEN_DELEGATE_READ:</div><div class='add'>+	case OPEN_DELEGATE_READ_ATTRS_DELEG:</div><div class='ctx'> 		/* read */</div><div class='ctx'> 		status = nfsd4_encode_open_read_delegation4(xdr, open);</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_OPEN_DELEGATE_WRITE:</div><div class='add'>+	case OPEN_DELEGATE_WRITE:</div><div class='add'>+	case OPEN_DELEGATE_WRITE_ATTRS_DELEG:</div><div class='ctx'> 		/* write */</div><div class='ctx'> 		status = nfsd4_encode_open_write_delegation4(xdr, open);</div><div class='ctx'> 		break;</div><div class='del'>-	case NFS4_OPEN_DELEGATE_NONE_EXT:</div><div class='add'>+	case OPEN_DELEGATE_NONE_EXT:</div><div class='ctx'> 		/* od_whynone */</div><div class='ctx'> 		status = nfsd4_encode_open_none_delegation4(xdr, open);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -4298,6 +4415,15 @@ static __be32 nfsd4_encode_splice_read(</div><div class='ctx'> 	__be32 nfserr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Splice read doesn't work if encoding has already wandered</div><div class='add'>+	 * into the XDR buf's page array.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(xdr-&gt;buf-&gt;page_len)) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return nfserr_serverfault;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Make sure there is room at the end of buf-&gt;head for</div><div class='ctx'> 	 * svcxdr_encode_opaque_pages() to create a tail buffer</div><div class='ctx'> 	 * to XDR-pad the payload.</div><div class='hunk'>@@ -4346,7 +4472,7 @@ out_err:</div><div class='ctx'> </div><div class='ctx'> static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,</div><div class='ctx'> 				 struct nfsd4_read *read,</div><div class='del'>-				 struct file *file, unsigned long maxcount)</div><div class='add'>+				 unsigned long maxcount)</div><div class='ctx'> {</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='ctx'> 	unsigned int base = xdr-&gt;buf-&gt;page_len &amp; ~PAGE_MASK;</div><div class='hunk'>@@ -4354,18 +4480,30 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,</div><div class='ctx'> 	__be32 zero = xdr_zero;</div><div class='ctx'> 	__be32 nfserr;</div><div class='ctx'> </div><div class='del'>-	if (xdr_reserve_space_vec(xdr, maxcount) &lt; 0)</div><div class='del'>-		return nfserr_resource;</div><div class='del'>-</div><div class='del'>-	nfserr = nfsd_iter_read(resp-&gt;rqstp, read-&gt;rd_fhp, file,</div><div class='add'>+	nfserr = nfsd_iter_read(resp-&gt;rqstp, read-&gt;rd_fhp, read-&gt;rd_nf,</div><div class='ctx'> 				read-&gt;rd_offset, &amp;maxcount, base,</div><div class='ctx'> 				&amp;read-&gt;rd_eof);</div><div class='ctx'> 	read-&gt;rd_length = maxcount;</div><div class='ctx'> 	if (nfserr)</div><div class='ctx'> 		return nfserr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * svcxdr_encode_opaque_pages() is not used here because</div><div class='add'>+	 * we don't want to encode subsequent results in this</div><div class='add'>+	 * COMPOUND into the xdr-&gt;buf's tail, but rather those</div><div class='add'>+	 * results should follow the NFS READ payload in the</div><div class='add'>+	 * buf's pages.</div><div class='add'>+	 */</div><div class='add'>+	if (xdr_reserve_space_vec(xdr, maxcount) &lt; 0)</div><div class='add'>+		return nfserr_resource;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Mark the buffer location of the NFS READ payload so that</div><div class='add'>+	 * direct placement-capable transports send only the</div><div class='add'>+	 * payload bytes out-of-band.</div><div class='add'>+	 */</div><div class='ctx'> 	if (svc_encode_result_payload(resp-&gt;rqstp, starting_len, maxcount))</div><div class='ctx'> 		return nfserr_io;</div><div class='del'>-	xdr_truncate_encode(xdr, starting_len + xdr_align_size(maxcount));</div><div class='ctx'> </div><div class='ctx'> 	write_bytes_to_xdr_buf(xdr-&gt;buf, starting_len + maxcount, &amp;zero,</div><div class='ctx'> 			       xdr_pad_size(maxcount));</div><div class='hunk'>@@ -4379,25 +4517,23 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	struct nfsd4_compoundargs *argp = resp-&gt;rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd4_read *read = &amp;u-&gt;read;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='del'>-	int starting_len = xdr-&gt;buf-&gt;len;</div><div class='ctx'> 	bool splice_ok = argp-&gt;splice_ok;</div><div class='add'>+	unsigned int eof_offset;</div><div class='ctx'> 	unsigned long maxcount;</div><div class='add'>+	__be32 wire_data[2];</div><div class='ctx'> 	struct file *file;</div><div class='del'>-	__be32 *p;</div><div class='ctx'> </div><div class='ctx'> 	if (nfserr)</div><div class='ctx'> 		return nfserr;</div><div class='add'>+</div><div class='add'>+	eof_offset = xdr-&gt;buf-&gt;len;</div><div class='ctx'> 	file = read-&gt;rd_nf-&gt;nf_file;</div><div class='ctx'> </div><div class='del'>-	p = xdr_reserve_space(xdr, 8); /* eof flag and byte count */</div><div class='del'>-	if (!p) {</div><div class='add'>+	/* Reserve space for the eof flag and byte count */</div><div class='add'>+	if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT * 2))) {</div><div class='ctx'> 		WARN_ON_ONCE(splice_ok);</div><div class='ctx'> 		return nfserr_resource;</div><div class='ctx'> 	}</div><div class='del'>-	if (resp-&gt;xdr-&gt;buf-&gt;page_len &amp;&amp; splice_ok) {</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		return nfserr_serverfault;</div><div class='del'>-	}</div><div class='ctx'> 	xdr_commit_encode(xdr);</div><div class='ctx'> </div><div class='ctx'> 	maxcount = min_t(unsigned long, read-&gt;rd_length,</div><div class='hunk'>@@ -4406,14 +4542,15 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	if (file-&gt;f_op-&gt;splice_read &amp;&amp; splice_ok)</div><div class='ctx'> 		nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount);</div><div class='ctx'> 	else</div><div class='del'>-		nfserr = nfsd4_encode_readv(resp, read, file, maxcount);</div><div class='add'>+		nfserr = nfsd4_encode_readv(resp, read, maxcount);</div><div class='ctx'> 	if (nfserr) {</div><div class='del'>-		xdr_truncate_encode(xdr, starting_len);</div><div class='add'>+		xdr_truncate_encode(xdr, eof_offset);</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p = xdr_encode_bool(p, read-&gt;rd_eof);</div><div class='del'>-	*p = cpu_to_be32(read-&gt;rd_length);</div><div class='add'>+	wire_data[0] = read-&gt;rd_eof ? xdr_one : xdr_zero;</div><div class='add'>+	wire_data[1] = cpu_to_be32(read-&gt;rd_length);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, eof_offset, &amp;wire_data, XDR_UNIT * 2);</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4422,25 +4559,21 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 		      union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_readlink *readlink = &amp;u-&gt;readlink;</div><div class='del'>-	__be32 *p, *maxcount_p, zero = xdr_zero;</div><div class='add'>+	__be32 *p, wire_count, zero = xdr_zero;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='del'>-	int length_offset = xdr-&gt;buf-&gt;len;</div><div class='add'>+	unsigned int length_offset;</div><div class='ctx'> 	int maxcount, status;</div><div class='ctx'> </div><div class='del'>-	maxcount_p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='del'>-	if (!maxcount_p)</div><div class='add'>+	/* linktext4.count */</div><div class='add'>+	length_offset = xdr-&gt;buf-&gt;len;</div><div class='add'>+	if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT)))</div><div class='ctx'> 		return nfserr_resource;</div><div class='del'>-	maxcount = PAGE_SIZE;</div><div class='ctx'> </div><div class='add'>+	/* linktext4.data */</div><div class='add'>+	maxcount = PAGE_SIZE;</div><div class='ctx'> 	p = xdr_reserve_space(xdr, maxcount);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return nfserr_resource;</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: By default, vfs_readlink() will truncate symlinks if they</div><div class='del'>-	 * would overflow the buffer.  Is this kosher in NFSv4?  If not, one</div><div class='del'>-	 * easy fix is: if vfs_readlink() precisely fills the buffer, assume</div><div class='del'>-	 * that truncation occurred, and return NFS4ERR_RESOURCE.</div><div class='del'>-	 */</div><div class='ctx'> 	nfserr = nfsd_readlink(readlink-&gt;rl_rqstp, readlink-&gt;rl_fhp,</div><div class='ctx'> 						(char *)p, &amp;maxcount);</div><div class='ctx'> 	if (nfserr == nfserr_isdir)</div><div class='hunk'>@@ -4453,7 +4586,9 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 		nfserr = nfserrno(status);</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='del'>-	*maxcount_p = cpu_to_be32(maxcount);</div><div class='add'>+</div><div class='add'>+	wire_count = cpu_to_be32(maxcount);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, length_offset, &amp;wire_count, XDR_UNIT);</div><div class='ctx'> 	xdr_truncate_encode(xdr, length_offset + 4 + xdr_align_size(maxcount));</div><div class='ctx'> 	write_bytes_to_xdr_buf(xdr-&gt;buf, length_offset + 4 + maxcount, &amp;zero,</div><div class='ctx'> 			       xdr_pad_size(maxcount));</div><div class='hunk'>@@ -4588,14 +4723,42 @@ nfsd4_encode_rpcsec_gss_info(struct xdr_stream *xdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='del'>-nfsd4_do_encode_secinfo(struct xdr_stream *xdr, struct svc_export *exp)</div><div class='add'>+nfsd4_encode_secinfo4(struct xdr_stream *xdr, rpc_authflavor_t pf,</div><div class='add'>+		      u32 *supported)</div><div class='add'>+{</div><div class='add'>+	struct rpcsec_gss_info info;</div><div class='add'>+	__be32 status;</div><div class='add'>+</div><div class='add'>+	if (rpcauth_get_gssinfo(pf, &amp;info) == 0) {</div><div class='add'>+		(*supported)++;</div><div class='add'>+</div><div class='add'>+		/* flavor */</div><div class='add'>+		status = nfsd4_encode_uint32_t(xdr, RPC_AUTH_GSS);</div><div class='add'>+		if (status != nfs_ok)</div><div class='add'>+			return status;</div><div class='add'>+		/* flavor_info */</div><div class='add'>+		status = nfsd4_encode_rpcsec_gss_info(xdr, &amp;info);</div><div class='add'>+		if (status != nfs_ok)</div><div class='add'>+			return status;</div><div class='add'>+	} else if (pf &lt; RPC_AUTH_MAXFLAVOR) {</div><div class='add'>+		(*supported)++;</div><div class='add'>+</div><div class='add'>+		/* flavor */</div><div class='add'>+		status = nfsd4_encode_uint32_t(xdr, pf);</div><div class='add'>+		if (status != nfs_ok)</div><div class='add'>+			return status;</div><div class='add'>+	}</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32</div><div class='add'>+nfsd4_encode_SECINFO4resok(struct xdr_stream *xdr, struct svc_export *exp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i, nflavs, supported;</div><div class='ctx'> 	struct exp_flavor_info *flavs;</div><div class='ctx'> 	struct exp_flavor_info def_flavs[2];</div><div class='del'>-	static bool report = true;</div><div class='del'>-	__be32 *flavorsp;</div><div class='del'>-	__be32 status;</div><div class='add'>+	unsigned int count_offset;</div><div class='add'>+	__be32 status, wire_count;</div><div class='ctx'> </div><div class='ctx'> 	if (exp-&gt;ex_nflavors) {</div><div class='ctx'> 		flavs = exp-&gt;ex_flavors;</div><div class='hunk'>@@ -4617,43 +4780,20 @@ nfsd4_do_encode_secinfo(struct xdr_stream *xdr, struct svc_export *exp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	supported = 0;</div><div class='del'>-	flavorsp = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='del'>-	if (!flavorsp)</div><div class='add'>+	count_offset = xdr-&gt;buf-&gt;len;</div><div class='add'>+	if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT)))</div><div class='ctx'> 		return nfserr_resource;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nflavs; i++) {</div><div class='del'>-		rpc_authflavor_t pf = flavs[i].pseudoflavor;</div><div class='del'>-		struct rpcsec_gss_info info;</div><div class='del'>-</div><div class='del'>-		if (rpcauth_get_gssinfo(pf, &amp;info) == 0) {</div><div class='del'>-			supported++;</div><div class='del'>-</div><div class='del'>-			/* flavor */</div><div class='del'>-			status = nfsd4_encode_uint32_t(xdr, RPC_AUTH_GSS);</div><div class='del'>-			if (status != nfs_ok)</div><div class='del'>-				return status;</div><div class='del'>-			/* flavor_info */</div><div class='del'>-			status = nfsd4_encode_rpcsec_gss_info(xdr, &amp;info);</div><div class='del'>-			if (status != nfs_ok)</div><div class='del'>-				return status;</div><div class='del'>-		} else if (pf &lt; RPC_AUTH_MAXFLAVOR) {</div><div class='del'>-			supported++;</div><div class='del'>-</div><div class='del'>-			/* flavor */</div><div class='del'>-			status = nfsd4_encode_uint32_t(xdr, pf);</div><div class='del'>-			if (status != nfs_ok)</div><div class='del'>-				return status;</div><div class='del'>-		} else {</div><div class='del'>-			if (report)</div><div class='del'>-				pr_warn("NFS: SECINFO: security flavor %u "</div><div class='del'>-					"is not supported\n", pf);</div><div class='del'>-		}</div><div class='add'>+	for (i = 0, supported = 0; i &lt; nflavs; i++) {</div><div class='add'>+		status = nfsd4_encode_secinfo4(xdr, flavs[i].pseudoflavor,</div><div class='add'>+					       &amp;supported);</div><div class='add'>+		if (status != nfs_ok)</div><div class='add'>+			return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nflavs != supported)</div><div class='del'>-		report = false;</div><div class='del'>-	*flavorsp = cpu_to_be32(supported);</div><div class='add'>+	wire_count = cpu_to_be32(supported);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, count_offset, &amp;wire_count,</div><div class='add'>+			       XDR_UNIT);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4664,7 +4804,7 @@ nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	struct nfsd4_secinfo *secinfo = &amp;u-&gt;secinfo;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='ctx'> </div><div class='del'>-	return nfsd4_do_encode_secinfo(xdr, secinfo-&gt;si_exp);</div><div class='add'>+	return nfsd4_encode_SECINFO4resok(xdr, secinfo-&gt;si_exp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='hunk'>@@ -4674,7 +4814,7 @@ nfsd4_encode_secinfo_no_name(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	struct nfsd4_secinfo_no_name *secinfo = &amp;u-&gt;secinfo_no_name;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='ctx'> </div><div class='del'>-	return nfsd4_do_encode_secinfo(xdr, secinfo-&gt;sin_exp);</div><div class='add'>+	return nfsd4_encode_SECINFO4resok(xdr, secinfo-&gt;sin_exp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='hunk'>@@ -4798,6 +4938,25 @@ nfsd4_encode_server_owner4(struct xdr_stream *xdr, struct svc_rqst *rqstp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32</div><div class='add'>+nfsd4_encode_nfs_impl_id4(struct xdr_stream *xdr, struct nfsd4_exchange_id *exid)</div><div class='add'>+{</div><div class='add'>+	__be32 status;</div><div class='add'>+</div><div class='add'>+	/* nii_domain */</div><div class='add'>+	status = nfsd4_encode_opaque(xdr, exid-&gt;nii_domain.data,</div><div class='add'>+				     exid-&gt;nii_domain.len);</div><div class='add'>+	if (status != nfs_ok)</div><div class='add'>+		return status;</div><div class='add'>+	/* nii_name */</div><div class='add'>+	status = nfsd4_encode_opaque(xdr, exid-&gt;nii_name.data,</div><div class='add'>+				     exid-&gt;nii_name.len);</div><div class='add'>+	if (status != nfs_ok)</div><div class='add'>+		return status;</div><div class='add'>+	/* nii_time */</div><div class='add'>+	return nfsd4_encode_nfstime4(xdr, &amp;exid-&gt;nii_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32</div><div class='ctx'> nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 			 union nfsd4_op_u *u)</div><div class='ctx'> {</div><div class='hunk'>@@ -4831,8 +4990,11 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	if (nfserr != nfs_ok)</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	/* eir_server_impl_id&lt;1&gt; */</div><div class='del'>-	if (xdr_stream_encode_u32(xdr, 0) != XDR_UNIT)</div><div class='add'>+	if (xdr_stream_encode_u32(xdr, 1) != XDR_UNIT)</div><div class='ctx'> 		return nfserr_resource;</div><div class='add'>+	nfserr = nfsd4_encode_nfs_impl_id4(xdr, exid);</div><div class='add'>+	if (nfserr != nfs_ok)</div><div class='add'>+		return nfserr;</div><div class='ctx'> </div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='hunk'>@@ -4923,11 +5085,11 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	/* Note slotid's are numbered from zero: */</div><div class='ctx'> 	/* sr_highest_slotid */</div><div class='del'>-	nfserr = nfsd4_encode_slotid4(xdr, seq-&gt;maxslots - 1);</div><div class='add'>+	nfserr = nfsd4_encode_slotid4(xdr, seq-&gt;maxslots_response - 1);</div><div class='ctx'> 	if (nfserr != nfs_ok)</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	/* sr_target_highest_slotid */</div><div class='del'>-	nfserr = nfsd4_encode_slotid4(xdr, seq-&gt;maxslots - 1);</div><div class='add'>+	nfserr = nfsd4_encode_slotid4(xdr, seq-&gt;target_maxslots - 1);</div><div class='ctx'> 	if (nfserr != nfs_ok)</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	/* sr_status_flags */</div><div class='hunk'>@@ -4958,6 +5120,49 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32</div><div class='add'>+nfsd4_encode_get_dir_delegation(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='add'>+				union nfsd4_op_u *u)</div><div class='add'>+{</div><div class='add'>+	struct nfsd4_get_dir_delegation *gdd = &amp;u-&gt;get_dir_delegation;</div><div class='add'>+	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='add'>+	__be32 status = nfserr_resource;</div><div class='add'>+</div><div class='add'>+	switch(gdd-&gt;gddrnf_status) {</div><div class='add'>+	case GDD4_OK:</div><div class='add'>+		if (xdr_stream_encode_u32(xdr, GDD4_OK) != XDR_UNIT)</div><div class='add'>+			break;</div><div class='add'>+		status = nfsd4_encode_verifier4(xdr, &amp;gdd-&gt;gddr_cookieverf);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+		status = nfsd4_encode_stateid4(xdr, &amp;gdd-&gt;gddr_stateid);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+		status = nfsd4_encode_bitmap4(xdr, gdd-&gt;gddr_notification[0], 0, 0);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+		status = nfsd4_encode_bitmap4(xdr, gdd-&gt;gddr_child_attributes[0],</div><div class='add'>+						   gdd-&gt;gddr_child_attributes[1],</div><div class='add'>+						   gdd-&gt;gddr_child_attributes[2]);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+		status = nfsd4_encode_bitmap4(xdr, gdd-&gt;gddr_dir_attributes[0],</div><div class='add'>+						   gdd-&gt;gddr_dir_attributes[1],</div><div class='add'>+						   gdd-&gt;gddr_dir_attributes[2]);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warn("nfsd: bad gddrnf_status (%u)\n", gdd-&gt;gddrnf_status);</div><div class='add'>+		gdd-&gt;gddrnf_will_signal_deleg_avail = 0;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case GDD4_UNAVAIL:</div><div class='add'>+		if (xdr_stream_encode_u32(xdr, GDD4_UNAVAIL) != XDR_UNIT)</div><div class='add'>+			break;</div><div class='add'>+		status = nfsd4_encode_bool(xdr, gdd-&gt;gddrnf_will_signal_deleg_avail);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd4_encode_device_addr4(struct xdr_stream *xdr,</div><div class='hunk'>@@ -5194,7 +5399,12 @@ nfsd4_encode_offload_status(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	if (nfserr != nfs_ok)</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	/* osr_complete&lt;1&gt; */</div><div class='del'>-	if (xdr_stream_encode_u32(xdr, 0) != XDR_UNIT)</div><div class='add'>+	if (os-&gt;completed) {</div><div class='add'>+		if (xdr_stream_encode_u32(xdr, 1) != XDR_UNIT)</div><div class='add'>+			return nfserr_resource;</div><div class='add'>+		if (xdr_stream_encode_be32(xdr, os-&gt;status) != XDR_UNIT)</div><div class='add'>+			return nfserr_resource;</div><div class='add'>+	} else if (xdr_stream_encode_u32(xdr, 0) != XDR_UNIT)</div><div class='ctx'> 		return nfserr_resource;</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='hunk'>@@ -5207,17 +5417,20 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp,</div><div class='ctx'> 	struct file *file = read-&gt;rd_nf-&gt;nf_file;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='ctx'> 	bool splice_ok = argp-&gt;splice_ok;</div><div class='add'>+	unsigned int offset_offset;</div><div class='add'>+	__be32 nfserr, wire_count;</div><div class='ctx'> 	unsigned long maxcount;</div><div class='del'>-	__be32 nfserr, *p;</div><div class='add'>+	__be64 wire_offset;</div><div class='ctx'> </div><div class='del'>-	/* Content type, offset, byte count */</div><div class='del'>-	p = xdr_reserve_space(xdr, 4 + 8 + 4);</div><div class='del'>-	if (!p)</div><div class='add'>+	if (xdr_stream_encode_u32(xdr, NFS4_CONTENT_DATA) != XDR_UNIT)</div><div class='ctx'> 		return nfserr_io;</div><div class='del'>-	if (resp-&gt;xdr-&gt;buf-&gt;page_len &amp;&amp; splice_ok) {</div><div class='del'>-		WARN_ON_ONCE(splice_ok);</div><div class='del'>-		return nfserr_serverfault;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	offset_offset = xdr-&gt;buf-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* Reserve space for the byte offset and count */</div><div class='add'>+	if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT * 3)))</div><div class='add'>+		return nfserr_io;</div><div class='add'>+	xdr_commit_encode(xdr);</div><div class='ctx'> </div><div class='ctx'> 	maxcount = min_t(unsigned long, read-&gt;rd_length,</div><div class='ctx'> 			 (xdr-&gt;buf-&gt;buflen - xdr-&gt;buf-&gt;len));</div><div class='hunk'>@@ -5225,14 +5438,16 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp,</div><div class='ctx'> 	if (file-&gt;f_op-&gt;splice_read &amp;&amp; splice_ok)</div><div class='ctx'> 		nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount);</div><div class='ctx'> 	else</div><div class='del'>-		nfserr = nfsd4_encode_readv(resp, read, file, maxcount);</div><div class='add'>+		nfserr = nfsd4_encode_readv(resp, read, maxcount);</div><div class='ctx'> 	if (nfserr)</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> </div><div class='del'>-	*p++ = cpu_to_be32(NFS4_CONTENT_DATA);</div><div class='del'>-	p = xdr_encode_hyper(p, read-&gt;rd_offset);</div><div class='del'>-	*p = cpu_to_be32(read-&gt;rd_length);</div><div class='del'>-</div><div class='add'>+	wire_offset = cpu_to_be64(read-&gt;rd_offset);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, offset_offset, &amp;wire_offset,</div><div class='add'>+			       XDR_UNIT * 2);</div><div class='add'>+	wire_count = cpu_to_be32(read-&gt;rd_length);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, offset_offset + XDR_UNIT * 2,</div><div class='add'>+			       &amp;wire_count, XDR_UNIT);</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5243,16 +5458,17 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	struct nfsd4_read *read = &amp;u-&gt;read;</div><div class='ctx'> 	struct file *file = read-&gt;rd_nf-&gt;nf_file;</div><div class='ctx'> 	struct xdr_stream *xdr = resp-&gt;xdr;</div><div class='del'>-	int starting_len = xdr-&gt;buf-&gt;len;</div><div class='add'>+	unsigned int eof_offset;</div><div class='add'>+	__be32 wire_data[2];</div><div class='ctx'> 	u32 segments = 0;</div><div class='del'>-	__be32 *p;</div><div class='ctx'> </div><div class='ctx'> 	if (nfserr)</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> </div><div class='del'>-	/* eof flag, segment count */</div><div class='del'>-	p = xdr_reserve_space(xdr, 4 + 4);</div><div class='del'>-	if (!p)</div><div class='add'>+	eof_offset = xdr-&gt;buf-&gt;len;</div><div class='add'>+</div><div class='add'>+	/* Reserve space for the eof flag and segment count */</div><div class='add'>+	if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT * 2)))</div><div class='ctx'> 		return nfserr_io;</div><div class='ctx'> 	xdr_commit_encode(xdr);</div><div class='ctx'> </div><div class='hunk'>@@ -5262,15 +5478,16 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> </div><div class='ctx'> 	nfserr = nfsd4_encode_read_plus_data(resp, read);</div><div class='ctx'> 	if (nfserr) {</div><div class='del'>-		xdr_truncate_encode(xdr, starting_len);</div><div class='add'>+		xdr_truncate_encode(xdr, eof_offset);</div><div class='ctx'> 		return nfserr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	segments++;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	p = xdr_encode_bool(p, read-&gt;rd_eof);</div><div class='del'>-	*p = cpu_to_be32(segments);</div><div class='add'>+	wire_data[0] = read-&gt;rd_eof ? xdr_one : xdr_zero;</div><div class='add'>+	wire_data[1] = cpu_to_be32(segments);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, eof_offset, &amp;wire_data, XDR_UNIT * 2);</div><div class='ctx'> 	return nfserr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5386,16 +5603,11 @@ nfsd4_listxattr_validate_cookie(struct nfsd4_listxattrs *listxattrs,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the cookie is larger than the maximum number we can fit</div><div class='del'>-	 * in either the buffer we just got back from vfs_listxattr, or,</div><div class='del'>-	 * XDR-encoded, in the return buffer, it's invalid.</div><div class='add'>+	 * in the buffer we just got back from vfs_listxattr, it's invalid.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cookie &gt; (listxattrs-&gt;lsxa_len) / (XATTR_USER_PREFIX_LEN + 2))</div><div class='ctx'> 		return nfserr_badcookie;</div><div class='ctx'> </div><div class='del'>-	if (cookie &gt; (listxattrs-&gt;lsxa_maxcount /</div><div class='del'>-		      (XDR_QUADLEN(XATTR_USER_PREFIX_LEN + 2) + 4)))</div><div class='del'>-		return nfserr_badcookie;</div><div class='del'>-</div><div class='ctx'> 	*offsetp = (u32)cookie;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5412,6 +5624,7 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	u64 cookie;</div><div class='ctx'> 	char *sp;</div><div class='ctx'> 	__be32 status, tmp;</div><div class='add'>+	__be64 wire_cookie;</div><div class='ctx'> 	__be32 *p;</div><div class='ctx'> 	u32 nuser;</div><div class='ctx'> </div><div class='hunk'>@@ -5427,7 +5640,7 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	cookie_offset = xdr-&gt;buf-&gt;len;</div><div class='ctx'> 	count_offset = cookie_offset + 8;</div><div class='del'>-	p = xdr_reserve_space(xdr, 12);</div><div class='add'>+	p = xdr_reserve_space(xdr, XDR_UNIT * 3);</div><div class='ctx'> 	if (!p) {</div><div class='ctx'> 		status = nfserr_resource;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -5438,7 +5651,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> 	sp = listxattrs-&gt;lsxa_buf;</div><div class='ctx'> 	nuser = 0;</div><div class='ctx'> </div><div class='del'>-	xdrleft = listxattrs-&gt;lsxa_maxcount;</div><div class='add'>+	/* Bytes left is maxcount - 8 (cookie) - 4 (array count) */</div><div class='add'>+	xdrleft = listxattrs-&gt;lsxa_maxcount - XDR_UNIT * 3;</div><div class='ctx'> </div><div class='ctx'> 	while (left &gt; 0 &amp;&amp; xdrleft &gt; 0) {</div><div class='ctx'> 		slen = strlen(sp);</div><div class='hunk'>@@ -5451,7 +5665,8 @@ nfsd4_encode_listxattrs(struct nfsd4_compoundres *resp, __be32 nfserr,</div><div class='ctx'> </div><div class='ctx'> 		slen -= XATTR_USER_PREFIX_LEN;</div><div class='ctx'> 		xdrlen = 4 + ((slen + 3) &amp; ~3);</div><div class='del'>-		if (xdrlen &gt; xdrleft) {</div><div class='add'>+		/* Check if both entry and eof can fit in the XDR buffer */</div><div class='add'>+		if (xdrlen + XDR_UNIT &gt; xdrleft) {</div><div class='ctx'> 			if (count == 0) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Can't even fit the first attribute name.</div><div class='hunk'>@@ -5503,7 +5718,8 @@ wreof:</div><div class='ctx'> </div><div class='ctx'> 	cookie = offset + count;</div><div class='ctx'> </div><div class='del'>-	write_bytes_to_xdr_buf(xdr-&gt;buf, cookie_offset, &amp;cookie, 8);</div><div class='add'>+	wire_cookie = cpu_to_be64(cookie);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, cookie_offset, &amp;wire_cookie, 8);</div><div class='ctx'> 	tmp = cpu_to_be32(count);</div><div class='ctx'> 	write_bytes_to_xdr_buf(xdr-&gt;buf, count_offset, &amp;tmp, 4);</div><div class='ctx'> out:</div><div class='hunk'>@@ -5575,7 +5791,7 @@ static const nfsd4_enc nfsd4_enc_ops[] = {</div><div class='ctx'> 	[OP_CREATE_SESSION]	= nfsd4_encode_create_session,</div><div class='ctx'> 	[OP_DESTROY_SESSION]	= nfsd4_encode_noop,</div><div class='ctx'> 	[OP_FREE_STATEID]	= nfsd4_encode_noop,</div><div class='del'>-	[OP_GET_DIR_DELEGATION]	= nfsd4_encode_noop,</div><div class='add'>+	[OP_GET_DIR_DELEGATION]	= nfsd4_encode_get_dir_delegation,</div><div class='ctx'> #ifdef CONFIG_NFSD_PNFS</div><div class='ctx'> 	[OP_GETDEVICEINFO]	= nfsd4_encode_getdeviceinfo,</div><div class='ctx'> 	[OP_GETDEVICELIST]	= nfsd4_encode_noop,</div><div class='hunk'>@@ -5648,6 +5864,23 @@ __be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 respsize)</div><div class='ctx'> 	return nfserr_rep_too_big;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __be32 nfsd4_map_status(__be32 status, u32 minor)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case nfs_ok:</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_wrong_type:</div><div class='add'>+		/* RFC 8881 - 15.1.2.9 */</div><div class='add'>+		if (minor == 0)</div><div class='add'>+			status = nfserr_inval;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_symlink_not_dir:</div><div class='add'>+		status = nfserr_symlink;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)</div><div class='ctx'> {</div><div class='hunk'>@@ -5655,15 +5888,14 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)</div><div class='ctx'> 	struct nfs4_stateowner *so = resp-&gt;cstate.replay_owner;</div><div class='ctx'> 	struct svc_rqst *rqstp = resp-&gt;rqstp;</div><div class='ctx'> 	const struct nfsd4_operation *opdesc = op-&gt;opdesc;</div><div class='del'>-	int post_err_offset;</div><div class='add'>+	unsigned int op_status_offset;</div><div class='ctx'> 	nfsd4_enc encoder;</div><div class='del'>-	__be32 *p;</div><div class='ctx'> </div><div class='del'>-	p = xdr_reserve_space(xdr, 8);</div><div class='del'>-	if (!p)</div><div class='add'>+	if (xdr_stream_encode_u32(xdr, op-&gt;opnum) != XDR_UNIT)</div><div class='add'>+		goto release;</div><div class='add'>+	op_status_offset = xdr-&gt;buf-&gt;len;</div><div class='add'>+	if (!xdr_reserve_space(xdr, XDR_UNIT))</div><div class='ctx'> 		goto release;</div><div class='del'>-	*p++ = cpu_to_be32(op-&gt;opnum);</div><div class='del'>-	post_err_offset = xdr-&gt;buf-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;opnum == OP_ILLEGAL)</div><div class='ctx'> 		goto status;</div><div class='hunk'>@@ -5704,18 +5936,20 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)</div><div class='ctx'> 		 * bug if we had to do this on a non-idempotent op:</div><div class='ctx'> 		 */</div><div class='ctx'> 		warn_on_nonidempotent_op(op);</div><div class='del'>-		xdr_truncate_encode(xdr, post_err_offset);</div><div class='del'>-	}</div><div class='del'>-	if (so) {</div><div class='del'>-		int len = xdr-&gt;buf-&gt;len - post_err_offset;</div><div class='add'>+		xdr_truncate_encode(xdr, op_status_offset + XDR_UNIT);</div><div class='add'>+	} else if (so) {</div><div class='add'>+		int len = xdr-&gt;buf-&gt;len - (op_status_offset + XDR_UNIT);</div><div class='ctx'> </div><div class='ctx'> 		so-&gt;so_replay.rp_status = op-&gt;status;</div><div class='ctx'> 		so-&gt;so_replay.rp_buflen = len;</div><div class='del'>-		read_bytes_from_xdr_buf(xdr-&gt;buf, post_err_offset,</div><div class='add'>+		read_bytes_from_xdr_buf(xdr-&gt;buf, op_status_offset + XDR_UNIT,</div><div class='ctx'> 						so-&gt;so_replay.rp_buf, len);</div><div class='ctx'> 	}</div><div class='ctx'> status:</div><div class='del'>-	*p = op-&gt;status;</div><div class='add'>+	op-&gt;status = nfsd4_map_status(op-&gt;status,</div><div class='add'>+				      resp-&gt;cstate.minorversion);</div><div class='add'>+	write_bytes_to_xdr_buf(xdr-&gt;buf, op_status_offset,</div><div class='add'>+			       &amp;op-&gt;status, XDR_UNIT);</div><div class='ctx'> release:</div><div class='ctx'> 	if (opdesc &amp;&amp; opdesc-&gt;op_release)</div><div class='ctx'> 		opdesc-&gt;op_release(&amp;op-&gt;u);</div><div class='hunk'>@@ -5727,27 +5961,24 @@ release:</div><div class='ctx'> 	rqstp-&gt;rq_next_page = xdr-&gt;page_ptr + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Encode the reply stored in the stateowner reply cache </div><div class='del'>- * </div><div class='del'>- * XDR note: do not encode rp-&gt;rp_buflen: the buffer contains the</div><div class='del'>- * previously sent already encoded operation.</div><div class='add'>+/**</div><div class='add'>+ * nfsd4_encode_replay - encode a result stored in the stateowner reply cache</div><div class='add'>+ * @xdr: send buffer's XDR stream</div><div class='add'>+ * @op: operation being replayed</div><div class='add'>+ *</div><div class='add'>+ * @op-&gt;replay-&gt;rp_buf contains the previously-sent already-encoded result.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='del'>-nfsd4_encode_replay(struct xdr_stream *xdr, struct nfsd4_op *op)</div><div class='add'>+void nfsd4_encode_replay(struct xdr_stream *xdr, struct nfsd4_op *op)</div><div class='ctx'> {</div><div class='del'>-	__be32 *p;</div><div class='ctx'> 	struct nfs4_replay *rp = op-&gt;replay;</div><div class='ctx'> </div><div class='del'>-	p = xdr_reserve_space(xdr, 8 + rp-&gt;rp_buflen);</div><div class='del'>-	if (!p) {</div><div class='del'>-		WARN_ON_ONCE(1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	*p++ = cpu_to_be32(op-&gt;opnum);</div><div class='del'>-	*p++ = rp-&gt;rp_status;  /* already xdr'ed */</div><div class='add'>+	trace_nfsd_stateowner_replay(op-&gt;opnum, rp);</div><div class='ctx'> </div><div class='del'>-	p = xdr_encode_opaque_fixed(p, rp-&gt;rp_buf, rp-&gt;rp_buflen);</div><div class='add'>+	if (xdr_stream_encode_u32(xdr, op-&gt;opnum) != XDR_UNIT)</div><div class='add'>+		return;</div><div class='add'>+	if (xdr_stream_encode_be32(xdr, rp-&gt;rp_status) != XDR_UNIT)</div><div class='add'>+		return;</div><div class='add'>+	xdr_stream_encode_opaque_fixed(xdr, rp-&gt;rp_buf, rp-&gt;rp_buflen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nfsd4_release_compoundargs(struct svc_rqst *rqstp)</div><div class='head'>diff --git a/fs/nfsd/nfs4xdr_gen.c b/fs/nfsd/nfs4xdr_gen.c<br/>new file mode 100644<br/>index 000000000000..a17b5d8e60b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4xdr_gen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4xdr_gen.c</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Generated by xdrgen. Manual edits will be lost.</div><div class='add'>+// XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x</div><div class='add'>+// XDR specification modification time: Mon Oct 14 09:10:13 2024</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sunrpc/svc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "nfs4xdr_gen.h"</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_int64_t(struct xdr_stream *xdr, int64_t *ptr)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_decode_hyper(xdr, ptr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_uint32_t(struct xdr_stream *xdr, uint32_t *ptr)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_decode_unsigned_int(xdr, ptr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_bitmap4(struct xdr_stream *xdr, bitmap4 *ptr)</div><div class='add'>+{</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;ptr-&gt;count) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	for (u32 i = 0; i &lt; ptr-&gt;count; i++)</div><div class='add'>+		if (!xdrgen_decode_uint32_t(xdr, &amp;ptr-&gt;element[i]))</div><div class='add'>+			return false;</div><div class='add'>+	return true;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_nfstime4(struct xdr_stream *xdr, struct nfstime4 *ptr)</div><div class='add'>+{</div><div class='add'>+	if (!xdrgen_decode_int64_t(xdr, &amp;ptr-&gt;seconds))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_decode_uint32_t(xdr, &amp;ptr-&gt;nseconds))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_fattr4_offline(struct xdr_stream *xdr, fattr4_offline *ptr)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_decode_bool(xdr, ptr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_arguments4(struct xdr_stream *xdr, struct open_arguments4 *ptr)</div><div class='add'>+{</div><div class='add'>+	if (!xdrgen_decode_bitmap4(xdr, &amp;ptr-&gt;oa_share_access))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_decode_bitmap4(xdr, &amp;ptr-&gt;oa_share_deny))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_decode_bitmap4(xdr, &amp;ptr-&gt;oa_share_access_want))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_decode_bitmap4(xdr, &amp;ptr-&gt;oa_open_claim))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_decode_bitmap4(xdr, &amp;ptr-&gt;oa_create_mode))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_args_share_access4(struct xdr_stream *xdr, open_args_share_access4 *ptr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;val) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_args_share_deny4(struct xdr_stream *xdr, open_args_share_deny4 *ptr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;val) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_args_share_access_want4(struct xdr_stream *xdr, open_args_share_access_want4 *ptr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;val) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_args_open_claim4(struct xdr_stream *xdr, open_args_open_claim4 *ptr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;val) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_args_createmode4(struct xdr_stream *xdr, open_args_createmode4 *ptr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;val) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+xdrgen_decode_fattr4_open_arguments(struct xdr_stream *xdr, fattr4_open_arguments *ptr)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_decode_open_arguments4(xdr, ptr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+xdrgen_decode_fattr4_time_deleg_access(struct xdr_stream *xdr, fattr4_time_deleg_access *ptr)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_decode_nfstime4(xdr, ptr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+xdrgen_decode_fattr4_time_deleg_modify(struct xdr_stream *xdr, fattr4_time_deleg_modify *ptr)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_decode_nfstime4(xdr, ptr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_decode_open_delegation_type4(struct xdr_stream *xdr, open_delegation_type4 *ptr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (xdr_stream_decode_u32(xdr, &amp;val) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_int64_t(struct xdr_stream *xdr, const int64_t value)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_encode_hyper(xdr, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_uint32_t(struct xdr_stream *xdr, const uint32_t value)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_encode_unsigned_int(xdr, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_bitmap4(struct xdr_stream *xdr, const bitmap4 value)</div><div class='add'>+{</div><div class='add'>+	if (xdr_stream_encode_u32(xdr, value.count) != XDR_UNIT)</div><div class='add'>+		return false;</div><div class='add'>+	for (u32 i = 0; i &lt; value.count; i++)</div><div class='add'>+		if (!xdrgen_encode_uint32_t(xdr, value.element[i]))</div><div class='add'>+			return false;</div><div class='add'>+	return true;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_nfstime4(struct xdr_stream *xdr, const struct nfstime4 *value)</div><div class='add'>+{</div><div class='add'>+	if (!xdrgen_encode_int64_t(xdr, value-&gt;seconds))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_encode_uint32_t(xdr, value-&gt;nseconds))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_fattr4_offline(struct xdr_stream *xdr, const fattr4_offline value)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_encode_bool(xdr, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_arguments4(struct xdr_stream *xdr, const struct open_arguments4 *value)</div><div class='add'>+{</div><div class='add'>+	if (!xdrgen_encode_bitmap4(xdr, value-&gt;oa_share_access))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_encode_bitmap4(xdr, value-&gt;oa_share_deny))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_encode_bitmap4(xdr, value-&gt;oa_share_access_want))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_encode_bitmap4(xdr, value-&gt;oa_open_claim))</div><div class='add'>+		return false;</div><div class='add'>+	if (!xdrgen_encode_bitmap4(xdr, value-&gt;oa_create_mode))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_args_share_access4(struct xdr_stream *xdr, open_args_share_access4 value)</div><div class='add'>+{</div><div class='add'>+	return xdr_stream_encode_u32(xdr, value) == XDR_UNIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_args_share_deny4(struct xdr_stream *xdr, open_args_share_deny4 value)</div><div class='add'>+{</div><div class='add'>+	return xdr_stream_encode_u32(xdr, value) == XDR_UNIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_args_share_access_want4(struct xdr_stream *xdr, open_args_share_access_want4 value)</div><div class='add'>+{</div><div class='add'>+	return xdr_stream_encode_u32(xdr, value) == XDR_UNIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_args_open_claim4(struct xdr_stream *xdr, open_args_open_claim4 value)</div><div class='add'>+{</div><div class='add'>+	return xdr_stream_encode_u32(xdr, value) == XDR_UNIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_args_createmode4(struct xdr_stream *xdr, open_args_createmode4 value)</div><div class='add'>+{</div><div class='add'>+	return xdr_stream_encode_u32(xdr, value) == XDR_UNIT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+xdrgen_encode_fattr4_open_arguments(struct xdr_stream *xdr, const fattr4_open_arguments *value)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_encode_open_arguments4(xdr, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+xdrgen_encode_fattr4_time_deleg_access(struct xdr_stream *xdr, const fattr4_time_deleg_access *value)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_encode_nfstime4(xdr, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+xdrgen_encode_fattr4_time_deleg_modify(struct xdr_stream *xdr, const fattr4_time_deleg_modify *value)</div><div class='add'>+{</div><div class='add'>+	return xdrgen_encode_nfstime4(xdr, value);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool __maybe_unused</div><div class='add'>+xdrgen_encode_open_delegation_type4(struct xdr_stream *xdr, open_delegation_type4 value)</div><div class='add'>+{</div><div class='add'>+	return xdr_stream_encode_u32(xdr, value) == XDR_UNIT;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfsd/nfs4xdr_gen.h b/fs/nfsd/nfs4xdr_gen.h<br/>new file mode 100644<br/>index 000000000000..41a0033b7256<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfs4xdr_gen.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfs4xdr_gen.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Generated by xdrgen. Manual edits will be lost. */</div><div class='add'>+/* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */</div><div class='add'>+/* XDR specification modification time: Mon Oct 14 09:10:13 2024 */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_XDRGEN_NFS4_1_DECL_H</div><div class='add'>+#define _LINUX_XDRGEN_NFS4_1_DECL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sunrpc/xdr.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/xdrgen/_defs.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/xdrgen/_builtins.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/xdrgen/nfs4_1.h&gt;</div><div class='add'>+</div><div class='add'>+bool xdrgen_decode_fattr4_open_arguments(struct xdr_stream *xdr, fattr4_open_arguments *ptr);</div><div class='add'>+bool xdrgen_encode_fattr4_open_arguments(struct xdr_stream *xdr, const fattr4_open_arguments *value);</div><div class='add'>+</div><div class='add'>+bool xdrgen_decode_fattr4_time_deleg_access(struct xdr_stream *xdr, fattr4_time_deleg_access *ptr);</div><div class='add'>+bool xdrgen_encode_fattr4_time_deleg_access(struct xdr_stream *xdr, const fattr4_time_deleg_access *value);</div><div class='add'>+</div><div class='add'>+bool xdrgen_decode_fattr4_time_deleg_modify(struct xdr_stream *xdr, fattr4_time_deleg_modify *ptr);</div><div class='add'>+bool xdrgen_encode_fattr4_time_deleg_modify(struct xdr_stream *xdr, const fattr4_time_deleg_modify *value);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_XDRGEN_NFS4_1_DECL_H */</div><div class='head'>diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c<br/>index 5c1a4a0aa605..ab13ee9c7fd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfscache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfscache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfscache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfscache.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  * cache size, the idea being that when the cache is at its maximum number</div><div class='ctx'>  * of entries, then this should be the average number of entries per bucket.</div><div class='ctx'>  */</div><div class='del'>-#define TARGET_BUCKET_SIZE	64</div><div class='add'>+#define TARGET_BUCKET_SIZE	8</div><div class='ctx'> </div><div class='ctx'> struct nfsd_drc_bucket {</div><div class='ctx'> 	struct rb_root rb_head;</div><div class='hunk'>@@ -166,8 +166,7 @@ nfsd_reply_cache_free(struct nfsd_drc_bucket *b, struct nfsd_cacherep *rp,</div><div class='ctx'> </div><div class='ctx'> int nfsd_drc_slab_create(void)</div><div class='ctx'> {</div><div class='del'>-	drc_slab = kmem_cache_create("nfsd_drc",</div><div class='del'>-				sizeof(struct nfsd_cacherep), 0, 0, NULL);</div><div class='add'>+	drc_slab = KMEM_CACHE(nfsd_cacherep, 0);</div><div class='ctx'> 	return drc_slab ? 0: -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -176,27 +175,6 @@ void nfsd_drc_slab_free(void)</div><div class='ctx'> 	kmem_cache_destroy(drc_slab);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * nfsd_net_reply_cache_init - per net namespace reply cache set-up</div><div class='del'>- * @nn: nfsd_net being initialized</div><div class='del'>- *</div><div class='del'>- * Returns zero on succes; otherwise a negative errno is returned.</div><div class='del'>- */</div><div class='del'>-int nfsd_net_reply_cache_init(struct nfsd_net *nn)</div><div class='del'>-{</div><div class='del'>-	return nfsd_percpu_counters_init(nn-&gt;counter, NFSD_NET_COUNTERS_NUM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nfsd_net_reply_cache_destroy - per net namespace reply cache tear-down</div><div class='del'>- * @nn: nfsd_net being freed</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void nfsd_net_reply_cache_destroy(struct nfsd_net *nn)</div><div class='del'>-{</div><div class='del'>-	nfsd_percpu_counters_destroy(nn-&gt;counter, NFSD_NET_COUNTERS_NUM);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int nfsd_reply_cache_init(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int hashsize;</div><div class='hunk'>@@ -259,10 +237,6 @@ void nfsd_reply_cache_shutdown(struct nfsd_net *nn)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Move cache entry to end of LRU list, and queue the cleaner to run if it's</div><div class='del'>- * not already scheduled.</div><div class='del'>- */</div><div class='ctx'> static void</div><div class='ctx'> lru_put_end(struct nfsd_drc_bucket *b, struct nfsd_cacherep *rp)</div><div class='ctx'> {</div><div class='hunk'>@@ -294,13 +268,6 @@ nfsd_prune_bucket_locked(struct nfsd_net *nn, struct nfsd_drc_bucket *b,</div><div class='ctx'> </div><div class='ctx'> 	/* The bucket LRU is ordered oldest-first. */</div><div class='ctx'> 	list_for_each_entry_safe(rp, tmp, &amp;b-&gt;lru_head, c_lru) {</div><div class='del'>-		/*</div><div class='del'>-		 * Don't free entries attached to calls that are still</div><div class='del'>-		 * in-progress, but do keep scanning the list.</div><div class='del'>-		 */</div><div class='del'>-		if (rp-&gt;c_state == RC_INPROG)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='ctx'> 		if (atomic_read(&amp;nn-&gt;num_drc_entries) &lt;= nn-&gt;max_drc_entries &amp;&amp;</div><div class='ctx'> 		    time_before(expiry, rp-&gt;c_timestamp))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -475,8 +442,6 @@ out:</div><div class='ctx'> 				nn-&gt;longest_chain_cachesize,</div><div class='ctx'> 				atomic_read(&amp;nn-&gt;num_drc_entries));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	lru_put_end(b, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -501,7 +466,7 @@ out:</div><div class='ctx'> int nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,</div><div class='ctx'> 		      unsigned int len, struct nfsd_cacherep **cacherep)</div><div class='ctx'> {</div><div class='del'>-	struct nfsd_net		*nn;</div><div class='add'>+	struct nfsd_net		*nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> 	struct nfsd_cacherep	*rp, *found;</div><div class='ctx'> 	__wsum			csum;</div><div class='ctx'> 	struct nfsd_drc_bucket	*b;</div><div class='hunk'>@@ -510,7 +475,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,</div><div class='ctx'> 	int rtn = RC_DOIT;</div><div class='ctx'> </div><div class='ctx'> 	if (type == RC_NOCACHE) {</div><div class='del'>-		nfsd_stats_rc_nocache_inc();</div><div class='add'>+		nfsd_stats_rc_nocache_inc(nn);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +485,6 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,</div><div class='ctx'> 	 * Since the common case is a cache miss followed by an insert,</div><div class='ctx'> 	 * preallocate an entry.</div><div class='ctx'> 	 */</div><div class='del'>-	nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> 	rp = nfsd_cacherep_alloc(rqstp, csum, nn);</div><div class='ctx'> 	if (!rp)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -537,7 +501,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,</div><div class='ctx'> </div><div class='ctx'> 	nfsd_cacherep_dispose(&amp;dispose);</div><div class='ctx'> </div><div class='del'>-	nfsd_stats_rc_misses_inc();</div><div class='add'>+	nfsd_stats_rc_misses_inc(nn);</div><div class='ctx'> 	atomic_inc(&amp;nn-&gt;num_drc_entries);</div><div class='ctx'> 	nfsd_stats_drc_mem_usage_add(nn, sizeof(*rp));</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -545,7 +509,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,</div><div class='ctx'> found_entry:</div><div class='ctx'> 	/* We found a matching entry which is either in progress or done. */</div><div class='ctx'> 	nfsd_reply_cache_free_locked(NULL, rp, nn);</div><div class='del'>-	nfsd_stats_rc_hits_inc();</div><div class='add'>+	nfsd_stats_rc_hits_inc(nn);</div><div class='ctx'> 	rtn = RC_DROPIT;</div><div class='ctx'> 	rp = found;</div><div class='ctx'> </div><div class='hunk'>@@ -687,15 +651,15 @@ int nfsd_reply_cache_stats_show(struct seq_file *m, void *v)</div><div class='ctx'> 		   atomic_read(&amp;nn-&gt;num_drc_entries));</div><div class='ctx'> 	seq_printf(m, "hash buckets:          %u\n", 1 &lt;&lt; nn-&gt;maskbits);</div><div class='ctx'> 	seq_printf(m, "mem usage:             %lld\n",</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_NET_DRC_MEM_USAGE]));</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_DRC_MEM_USAGE]));</div><div class='ctx'> 	seq_printf(m, "cache hits:            %lld\n",</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_RC_HITS]));</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_RC_HITS]));</div><div class='ctx'> 	seq_printf(m, "cache misses:          %lld\n",</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_RC_MISSES]));</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_RC_MISSES]));</div><div class='ctx'> 	seq_printf(m, "not cached:            %lld\n",</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_RC_NOCACHE]));</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_RC_NOCACHE]));</div><div class='ctx'> 	seq_printf(m, "payload misses:        %lld\n",</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_NET_PAYLOAD_MISSES]));</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_PAYLOAD_MISSES]));</div><div class='ctx'> 	seq_printf(m, "longest chain len:     %u\n", nn-&gt;longest_chain);</div><div class='ctx'> 	seq_printf(m, "cachesize at longest:  %u\n", nn-&gt;longest_chain_cachesize);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c<br/>index f206ca32e7f5..5ce9a49e76ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfsctl.c</a></div><div class='hunk'>@@ -15,8 +15,10 @@</div><div class='ctx'> #include &lt;linux/sunrpc/addr.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/gss_api.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/rpc_pipe_fs.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/svc.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "idmap.h"</div><div class='ctx'> #include "nfsd.h"</div><div class='hunk'>@@ -46,14 +48,11 @@ enum {</div><div class='ctx'> 	NFSD_Versions,</div><div class='ctx'> 	NFSD_Ports,</div><div class='ctx'> 	NFSD_MaxBlkSize,</div><div class='del'>-	NFSD_MaxConnections,</div><div class='ctx'> 	NFSD_Filecache,</div><div class='del'>-#ifdef CONFIG_NFSD_V4</div><div class='ctx'> 	NFSD_Leasetime,</div><div class='ctx'> 	NFSD_Gracetime,</div><div class='ctx'> 	NFSD_RecoveryDir,</div><div class='ctx'> 	NFSD_V4EndGrace,</div><div class='del'>-#endif</div><div class='ctx'> 	NFSD_MaxReserved</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -68,7 +67,6 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size);</div><div class='ctx'> static ssize_t write_versions(struct file *file, char *buf, size_t size);</div><div class='ctx'> static ssize_t write_ports(struct file *file, char *buf, size_t size);</div><div class='ctx'> static ssize_t write_maxblksize(struct file *file, char *buf, size_t size);</div><div class='del'>-static ssize_t write_maxconn(struct file *file, char *buf, size_t size);</div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='ctx'> static ssize_t write_leasetime(struct file *file, char *buf, size_t size);</div><div class='ctx'> static ssize_t write_gracetime(struct file *file, char *buf, size_t size);</div><div class='hunk'>@@ -87,7 +85,6 @@ static ssize_t (*const write_op[])(struct file *, char *, size_t) = {</div><div class='ctx'> 	[NFSD_Versions] = write_versions,</div><div class='ctx'> 	[NFSD_Ports] = write_ports,</div><div class='ctx'> 	[NFSD_MaxBlkSize] = write_maxblksize,</div><div class='del'>-	[NFSD_MaxConnections] = write_maxconn,</div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='ctx'> 	[NFSD_Leasetime] = write_leasetime,</div><div class='ctx'> 	[NFSD_Gracetime] = write_gracetime,</div><div class='hunk'>@@ -175,6 +172,13 @@ static int export_features_show(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(export_features);</div><div class='ctx'> </div><div class='add'>+static int nfsd_pool_stats_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = net_generic(inode-&gt;i_sb-&gt;s_fs_info, nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	return svc_pool_stats_open(&amp;nn-&gt;nfsd_info, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations pool_stats_operations = {</div><div class='ctx'> 	.open		= nfsd_pool_stats_open,</div><div class='ctx'> 	.read		= seq_read,</div><div class='hunk'>@@ -281,6 +285,7 @@ static ssize_t write_unlock_fs(struct file *file, char *buf, size_t size)</div><div class='ctx'> 	 * 3.  Is that directory the root of an exported file system?</div><div class='ctx'> 	 */</div><div class='ctx'> 	error = nlmsvc_unlock_all_by_sb(path.dentry-&gt;d_sb);</div><div class='add'>+	nfsd4_revoke_states(netns(file), path.dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	path_put(&amp;path);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -405,7 +410,9 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)</div><div class='ctx'> 		if (newthreads &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		trace_nfsd_ctl_threads(net, newthreads);</div><div class='del'>-		rv = nfsd_svc(newthreads, net, file-&gt;f_cred);</div><div class='add'>+		mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+		rv = nfsd_svc(1, &amp;newthreads, net, file-&gt;f_cred, NULL);</div><div class='add'>+		mutex_unlock(&amp;nfsd_mutex);</div><div class='ctx'> 		if (rv &lt; 0)</div><div class='ctx'> 			return rv;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -479,6 +486,14 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)</div><div class='ctx'> 				goto out_free;</div><div class='ctx'> 			trace_nfsd_ctl_pool_threads(net, i, nthreads[i]);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * There must always be a thread in pool 0; the admin</div><div class='add'>+		 * can't shut down NFS completely using pool_threads.</div><div class='add'>+		 */</div><div class='add'>+		if (nthreads[0] == 0)</div><div class='add'>+			nthreads[0] = 1;</div><div class='add'>+</div><div class='ctx'> 		rv = nfsd_set_nrthreads(i, nthreads, net);</div><div class='ctx'> 		if (rv)</div><div class='ctx'> 			goto out_free;</div><div class='hunk'>@@ -884,44 +899,6 @@ static ssize_t write_maxblksize(struct file *file, char *buf, size_t size)</div><div class='ctx'> 							nfsd_max_blksize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * write_maxconn - Set or report the current max number of connections</div><div class='del'>- *</div><div class='del'>- * Input:</div><div class='del'>- *			buf:		ignored</div><div class='del'>- *			size:		zero</div><div class='del'>- * OR</div><div class='del'>- *</div><div class='del'>- * Input:</div><div class='del'>- *			buf:		C string containing an unsigned</div><div class='del'>- *					integer value representing the new</div><div class='del'>- *					number of max connections</div><div class='del'>- *			size:		non-zero length of C string in @buf</div><div class='del'>- * Output:</div><div class='del'>- *	On success:	passed-in buffer filled with '\n'-terminated C string</div><div class='del'>- *			containing numeric value of max_connections setting</div><div class='del'>- *			for this net namespace;</div><div class='del'>- *			return code is the size in bytes of the string</div><div class='del'>- *	On error:	return code is zero or a negative errno value</div><div class='del'>- */</div><div class='del'>-static ssize_t write_maxconn(struct file *file, char *buf, size_t size)</div><div class='del'>-{</div><div class='del'>-	char *mesg = buf;</div><div class='del'>-	struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);</div><div class='del'>-	unsigned int maxconn = nn-&gt;max_connections;</div><div class='del'>-</div><div class='del'>-	if (size &gt; 0) {</div><div class='del'>-		int rv = get_uint(&amp;mesg, &amp;maxconn);</div><div class='del'>-</div><div class='del'>-		if (rv)</div><div class='del'>-			return rv;</div><div class='del'>-		trace_nfsd_ctl_maxconn(netns(file), maxconn);</div><div class='del'>-		nn-&gt;max_connections = maxconn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%u\n", maxconn);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='ctx'> static ssize_t __nfsd4_write_time(struct file *file, char *buf, size_t size,</div><div class='ctx'> 				  time64_t *time, struct nfsd_net *nn)</div><div class='hunk'>@@ -1126,89 +1103,48 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)</div><div class='ctx'>  *	populating the filesystem.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Basically copying rpc_get_inode. */</div><div class='ctx'> static struct inode *nfsd_get_inode(struct super_block *sb, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = new_inode(sb);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return NULL;</div><div class='del'>-	/* Following advice from simple_fill_super documentation: */</div><div class='del'>-	inode-&gt;i_ino = iunique(sb, NFSD_MaxReserved);</div><div class='del'>-	inode-&gt;i_mode = mode;</div><div class='del'>-	simple_inode_init_ts(inode);</div><div class='del'>-	switch (mode &amp; S_IFMT) {</div><div class='del'>-	case S_IFDIR:</div><div class='del'>-		inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='del'>-		inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='del'>-		inc_nlink(inode);</div><div class='del'>-		break;</div><div class='del'>-	case S_IFLNK:</div><div class='del'>-		inode-&gt;i_op = &amp;simple_symlink_inode_operations;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	if (inode) {</div><div class='add'>+		/* Following advice from simple_fill_super documentation: */</div><div class='add'>+		inode-&gt;i_ino = iunique(sb, NFSD_MaxReserved);</div><div class='add'>+		inode-&gt;i_mode = mode;</div><div class='add'>+		simple_inode_init_ts(inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode, struct nfsdfs_client *ncl)</div><div class='add'>+static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *ncl, char *name)</div><div class='ctx'> {</div><div class='add'>+	struct inode *dir = parent-&gt;d_inode;</div><div class='add'>+	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	inode = nfsd_get_inode(dir-&gt;i_sb, mode);</div><div class='add'>+	inode = nfsd_get_inode(parent-&gt;d_sb, S_IFDIR | 0600);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	dentry = simple_start_creating(parent, name);</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='add'>+		iput(inode);</div><div class='add'>+		return dentry;</div><div class='add'>+	}</div><div class='add'>+	inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='add'>+	inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='add'>+	inc_nlink(inode);</div><div class='ctx'> 	if (ncl) {</div><div class='ctx'> 		inode-&gt;i_private = ncl;</div><div class='ctx'> 		kref_get(&amp;ncl-&gt;cl_ref);</div><div class='ctx'> 	}</div><div class='del'>-	d_add(dentry, inode);</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> 	inc_nlink(dir);</div><div class='ctx'> 	fsnotify_mkdir(dir, dentry);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *ncl, char *name)</div><div class='del'>-{</div><div class='del'>-	struct inode *dir = parent-&gt;d_inode;</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	int ret = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	inode_lock(dir);</div><div class='del'>-	dentry = d_alloc_name(parent, name);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		goto out_err;</div><div class='del'>-	ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600, ncl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_err;</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(dir);</div><div class='del'>-	return dentry;</div><div class='del'>-out_err:</div><div class='del'>-	dput(dentry);</div><div class='del'>-	dentry = ERR_PTR(ret);</div><div class='del'>-	goto out;</div><div class='add'>+	simple_done_creating(dentry);</div><div class='add'>+	return dentry;	// borrowed</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_SUNRPC_GSS)</div><div class='del'>-static int __nfsd_symlink(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			  umode_t mode, const char *content)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	inode = nfsd_get_inode(dir-&gt;i_sb, mode);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_link = (char *)content;</div><div class='del'>-	inode-&gt;i_size = strlen(content);</div><div class='del'>-</div><div class='del'>-	d_add(dentry, inode);</div><div class='del'>-	inc_nlink(dir);</div><div class='del'>-	fsnotify_create(dir, dentry);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * @content is assumed to be a NUL-terminated string that lives</div><div class='ctx'>  * longer than the symlink itself.</div><div class='hunk'>@@ -1217,18 +1153,26 @@ static void _nfsd_symlink(struct dentry *parent, const char *name,</div><div class='ctx'> 			  const char *content)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *dir = parent-&gt;d_inode;</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	inode_lock(dir);</div><div class='del'>-	dentry = d_alloc_name(parent, name);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		goto out;</div><div class='del'>-	ret = __nfsd_symlink(d_inode(parent), dentry, S_IFLNK | 0777, content);</div><div class='del'>-	if (ret)</div><div class='del'>-		dput(dentry);</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(dir);</div><div class='add'>+	inode = nfsd_get_inode(dir-&gt;i_sb, S_IFLNK | 0777);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dentry = simple_start_creating(parent, name);</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='add'>+		iput(inode);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_op = &amp;simple_symlink_inode_operations;</div><div class='add'>+	inode-&gt;i_link = (char *)content;</div><div class='add'>+	inode-&gt;i_size = strlen(content);</div><div class='add'>+</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='add'>+	fsnotify_create(dir, dentry);</div><div class='add'>+	simple_done_creating(dentry);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void _nfsd_symlink(struct dentry *parent, const char *name,</div><div class='hunk'>@@ -1263,40 +1207,34 @@ struct nfsdfs_client *get_nfsdfs_client(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> /* XXX: cut'n'paste from simple_fill_super; figure out if we could share</div><div class='ctx'>  * code instead. */</div><div class='del'>-static  int nfsdfs_create_files(struct dentry *root,</div><div class='add'>+static int nfsdfs_create_files(struct dentry *root,</div><div class='ctx'> 				const struct tree_descr *files,</div><div class='ctx'> 				struct nfsdfs_client *ncl,</div><div class='ctx'> 				struct dentry **fdentries)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *dir = d_inode(root);</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	inode_lock(dir);</div><div class='del'>-	for (i = 0; files-&gt;name &amp;&amp; files-&gt;name[0]; i++, files++) {</div><div class='del'>-		dentry = d_alloc_name(root, files-&gt;name);</div><div class='del'>-		if (!dentry)</div><div class='del'>-			goto out;</div><div class='del'>-		inode = nfsd_get_inode(d_inode(root)-&gt;i_sb,</div><div class='del'>-					S_IFREG | files-&gt;mode);</div><div class='del'>-		if (!inode) {</div><div class='del'>-			dput(dentry);</div><div class='del'>-			goto out;</div><div class='add'>+	for (int i = 0; files-&gt;name &amp;&amp; files-&gt;name[0]; i++, files++) {</div><div class='add'>+		struct inode *inode = nfsd_get_inode(root-&gt;d_sb,</div><div class='add'>+						     S_IFREG | files-&gt;mode);</div><div class='add'>+		if (!inode)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		dentry = simple_start_creating(root, files-&gt;name);</div><div class='add'>+		if (IS_ERR(dentry)) {</div><div class='add'>+			iput(inode);</div><div class='add'>+			return PTR_ERR(dentry);</div><div class='ctx'> 		}</div><div class='ctx'> 		kref_get(&amp;ncl-&gt;cl_ref);</div><div class='ctx'> 		inode-&gt;i_fop = files-&gt;ops;</div><div class='ctx'> 		inode-&gt;i_private = ncl;</div><div class='del'>-		d_add(dentry, inode);</div><div class='add'>+		d_make_persistent(dentry, inode);</div><div class='ctx'> 		fsnotify_create(dir, dentry);</div><div class='ctx'> 		if (fdentries)</div><div class='del'>-			fdentries[i] = dentry;</div><div class='add'>+			fdentries[i] = dentry; // borrowed</div><div class='add'>+		simple_done_creating(dentry);</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(dir);</div><div class='ctx'> 	return 0;</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(dir);</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* on success, returns positive number unique to that client. */</div><div class='hunk'>@@ -1354,12 +1292,13 @@ static int nfsd_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		[NFSD_Versions] = {"versions", &amp;transaction_ops, S_IWUSR|S_IRUSR},</div><div class='ctx'> 		[NFSD_Ports] = {"portlist", &amp;transaction_ops, S_IWUSR|S_IRUGO},</div><div class='ctx'> 		[NFSD_MaxBlkSize] = {"max_block_size", &amp;transaction_ops, S_IWUSR|S_IRUGO},</div><div class='del'>-		[NFSD_MaxConnections] = {"max_connections", &amp;transaction_ops, S_IWUSR|S_IRUGO},</div><div class='ctx'> 		[NFSD_Filecache] = {"filecache", &amp;nfsd_file_cache_stats_fops, S_IRUGO},</div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='ctx'> 		[NFSD_Leasetime] = {"nfsv4leasetime", &amp;transaction_ops, S_IWUSR|S_IRUSR},</div><div class='ctx'> 		[NFSD_Gracetime] = {"nfsv4gracetime", &amp;transaction_ops, S_IWUSR|S_IRUSR},</div><div class='add'>+#ifdef CONFIG_NFSD_LEGACY_CLIENT_TRACKING</div><div class='ctx'> 		[NFSD_RecoveryDir] = {"nfsv4recoverydir", &amp;transaction_ops, S_IWUSR|S_IRUSR},</div><div class='add'>+#endif</div><div class='ctx'> 		[NFSD_V4EndGrace] = {"v4_end_grace", &amp;transaction_ops, S_IWUSR|S_IRUGO},</div><div class='ctx'> #endif</div><div class='ctx'> 		/* last one */ {""}</div><div class='hunk'>@@ -1407,7 +1346,7 @@ static void nfsd_umount(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> 	nfsd_shutdown_threads(net);</div><div class='ctx'> </div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> 	put_net(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1456,31 +1395,9 @@ static int create_proc_exports_entry(void)</div><div class='ctx'> </div><div class='ctx'> unsigned int nfsd_net_id;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * nfsd_nl_rpc_status_get_start - Prepare rpc_status_get dumpit</div><div class='del'>- * @cb: netlink metadata and command arguments</div><div class='del'>- *</div><div class='del'>- * Return values:</div><div class='del'>- *   %0: The rpc_status_get command may proceed</div><div class='del'>- *   %-ENODEV: There is no NFSD running in this namespace</div><div class='del'>- */</div><div class='del'>-int nfsd_nl_rpc_status_get_start(struct netlink_callback *cb)</div><div class='del'>-{</div><div class='del'>-	struct nfsd_net *nn = net_generic(sock_net(cb-&gt;skb-&gt;sk), nfsd_net_id);</div><div class='del'>-	int ret = -ENODEV;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;nfsd_mutex);</div><div class='del'>-	if (nn-&gt;nfsd_serv)</div><div class='del'>-		ret = 0;</div><div class='del'>-	else</div><div class='del'>-		mutex_unlock(&amp;nfsd_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,</div><div class='ctx'> 					    struct netlink_callback *cb,</div><div class='del'>-					    struct nfsd_genl_rqstp *rqstp)</div><div class='add'>+					    struct nfsd_genl_rqstp *genl_rqstp)</div><div class='ctx'> {</div><div class='ctx'> 	void *hdr;</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -1490,22 +1407,22 @@ static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_be32(skb, NFSD_A_RPC_STATUS_XID, rqstp-&gt;rq_xid) ||</div><div class='del'>-	    nla_put_u32(skb, NFSD_A_RPC_STATUS_FLAGS, rqstp-&gt;rq_flags) ||</div><div class='del'>-	    nla_put_u32(skb, NFSD_A_RPC_STATUS_PROG, rqstp-&gt;rq_prog) ||</div><div class='del'>-	    nla_put_u32(skb, NFSD_A_RPC_STATUS_PROC, rqstp-&gt;rq_proc) ||</div><div class='del'>-	    nla_put_u8(skb, NFSD_A_RPC_STATUS_VERSION, rqstp-&gt;rq_vers) ||</div><div class='add'>+	if (nla_put_be32(skb, NFSD_A_RPC_STATUS_XID, genl_rqstp-&gt;rq_xid) ||</div><div class='add'>+	    nla_put_u32(skb, NFSD_A_RPC_STATUS_FLAGS, genl_rqstp-&gt;rq_flags) ||</div><div class='add'>+	    nla_put_u32(skb, NFSD_A_RPC_STATUS_PROG, genl_rqstp-&gt;rq_prog) ||</div><div class='add'>+	    nla_put_u32(skb, NFSD_A_RPC_STATUS_PROC, genl_rqstp-&gt;rq_proc) ||</div><div class='add'>+	    nla_put_u8(skb, NFSD_A_RPC_STATUS_VERSION, genl_rqstp-&gt;rq_vers) ||</div><div class='ctx'> 	    nla_put_s64(skb, NFSD_A_RPC_STATUS_SERVICE_TIME,</div><div class='del'>-			ktime_to_us(rqstp-&gt;rq_stime),</div><div class='add'>+			ktime_to_us(genl_rqstp-&gt;rq_stime),</div><div class='ctx'> 			NFSD_A_RPC_STATUS_PAD))</div><div class='ctx'> 		return -ENOBUFS;</div><div class='ctx'> </div><div class='del'>-	switch (rqstp-&gt;rq_saddr.sa_family) {</div><div class='add'>+	switch (genl_rqstp-&gt;rq_saddr.sa_family) {</div><div class='ctx'> 	case AF_INET: {</div><div class='ctx'> 		const struct sockaddr_in *s_in, *d_in;</div><div class='ctx'> </div><div class='del'>-		s_in = (const struct sockaddr_in *)&amp;rqstp-&gt;rq_saddr;</div><div class='del'>-		d_in = (const struct sockaddr_in *)&amp;rqstp-&gt;rq_daddr;</div><div class='add'>+		s_in = (const struct sockaddr_in *)&amp;genl_rqstp-&gt;rq_saddr;</div><div class='add'>+		d_in = (const struct sockaddr_in *)&amp;genl_rqstp-&gt;rq_daddr;</div><div class='ctx'> 		if (nla_put_in_addr(skb, NFSD_A_RPC_STATUS_SADDR4,</div><div class='ctx'> 				    s_in-&gt;sin_addr.s_addr) ||</div><div class='ctx'> 		    nla_put_in_addr(skb, NFSD_A_RPC_STATUS_DADDR4,</div><div class='hunk'>@@ -1520,8 +1437,8 @@ static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,</div><div class='ctx'> 	case AF_INET6: {</div><div class='ctx'> 		const struct sockaddr_in6 *s_in, *d_in;</div><div class='ctx'> </div><div class='del'>-		s_in = (const struct sockaddr_in6 *)&amp;rqstp-&gt;rq_saddr;</div><div class='del'>-		d_in = (const struct sockaddr_in6 *)&amp;rqstp-&gt;rq_daddr;</div><div class='add'>+		s_in = (const struct sockaddr_in6 *)&amp;genl_rqstp-&gt;rq_saddr;</div><div class='add'>+		d_in = (const struct sockaddr_in6 *)&amp;genl_rqstp-&gt;rq_daddr;</div><div class='ctx'> 		if (nla_put_in6_addr(skb, NFSD_A_RPC_STATUS_SADDR6,</div><div class='ctx'> 				     &amp;s_in-&gt;sin6_addr) ||</div><div class='ctx'> 		    nla_put_in6_addr(skb, NFSD_A_RPC_STATUS_DADDR6,</div><div class='hunk'>@@ -1535,9 +1452,9 @@ static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; rqstp-&gt;rq_opcnt; i++)</div><div class='add'>+	for (i = 0; i &lt; genl_rqstp-&gt;rq_opcnt; i++)</div><div class='ctx'> 		if (nla_put_u32(skb, NFSD_A_RPC_STATUS_COMPOUND_OPS,</div><div class='del'>-				rqstp-&gt;rq_opnum[i]))</div><div class='add'>+				genl_rqstp-&gt;rq_opnum[i]))</div><div class='ctx'> 			return -ENOBUFS;</div><div class='ctx'> </div><div class='ctx'> 	genlmsg_end(skb, hdr);</div><div class='hunk'>@@ -1554,8 +1471,16 @@ static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,</div><div class='ctx'> int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb,</div><div class='ctx'> 				  struct netlink_callback *cb)</div><div class='ctx'> {</div><div class='del'>-	struct nfsd_net *nn = net_generic(sock_net(skb-&gt;sk), nfsd_net_id);</div><div class='ctx'> 	int i, ret, rqstp_index = 0;</div><div class='add'>+	struct nfsd_net *nn;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	nn = net_generic(sock_net(skb-&gt;sk), nfsd_net_id);</div><div class='add'>+	if (!nn-&gt;nfsd_serv) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='hunk'>@@ -1605,7 +1530,8 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb,</div><div class='ctx'> 				int j;</div><div class='ctx'> </div><div class='ctx'> 				args = rqstp-&gt;rq_argp;</div><div class='del'>-				genl_rqstp.rq_opcnt = args-&gt;opcnt;</div><div class='add'>+				genl_rqstp.rq_opcnt = min_t(u32, args-&gt;opcnt,</div><div class='add'>+							    ARRAY_SIZE(genl_rqstp.rq_opnum));</div><div class='ctx'> 				for (j = 0; j &lt; genl_rqstp.rq_opcnt; j++)</div><div class='ctx'> 					genl_rqstp.rq_opnum[j] =</div><div class='ctx'> 						args-&gt;ops[j].opnum;</div><div class='hunk'>@@ -1632,25 +1558,578 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb,</div><div class='ctx'> 	ret = skb-&gt;len;</div><div class='ctx'> out:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nfsd_nl_rpc_status_get_done - rpc_status_get dumpit post-processing</div><div class='del'>- * @cb: netlink metadata and command arguments</div><div class='add'>+ * nfsd_nl_threads_set_doit - set the number of running threads</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='ctx'>  *</div><div class='del'>- * Return values:</div><div class='del'>- *   %0: Success</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='ctx'>  */</div><div class='del'>-int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb)</div><div class='add'>+int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='ctx'> {</div><div class='add'>+	int *nthreads, nrpools = 0, i, ret = -EOPNOTSUPP, rem;</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+	const struct nlattr *attr;</div><div class='add'>+	const char *scope = NULL;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NFSD_A_SERVER_THREADS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* count number of SERVER_THREADS values */</div><div class='add'>+	nlmsg_for_each_attr_type(attr, NFSD_A_SERVER_THREADS, info-&gt;nlhdr,</div><div class='add'>+				 GENL_HDRLEN, rem)</div><div class='add'>+		nrpools++;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	nthreads = kcalloc(nrpools, sizeof(int), GFP_KERNEL);</div><div class='add'>+	if (!nthreads) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	nlmsg_for_each_attr_type(attr, NFSD_A_SERVER_THREADS, info-&gt;nlhdr,</div><div class='add'>+				 GENL_HDRLEN, rem) {</div><div class='add'>+		nthreads[i++] = nla_get_u32(attr);</div><div class='add'>+		if (i &gt;= nrpools)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;attrs[NFSD_A_SERVER_GRACETIME] ||</div><div class='add'>+	    info-&gt;attrs[NFSD_A_SERVER_LEASETIME] ||</div><div class='add'>+	    info-&gt;attrs[NFSD_A_SERVER_SCOPE]) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		if (nn-&gt;nfsd_serv &amp;&amp; nn-&gt;nfsd_serv-&gt;sv_nrthreads)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		attr = info-&gt;attrs[NFSD_A_SERVER_GRACETIME];</div><div class='add'>+		if (attr) {</div><div class='add'>+			u32 gracetime = nla_get_u32(attr);</div><div class='add'>+</div><div class='add'>+			if (gracetime &lt; 10 || gracetime &gt; 3600)</div><div class='add'>+				goto out_unlock;</div><div class='add'>+</div><div class='add'>+			nn-&gt;nfsd4_grace = gracetime;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[NFSD_A_SERVER_LEASETIME];</div><div class='add'>+		if (attr) {</div><div class='add'>+			u32 leasetime = nla_get_u32(attr);</div><div class='add'>+</div><div class='add'>+			if (leasetime &lt; 10 || leasetime &gt; 3600)</div><div class='add'>+				goto out_unlock;</div><div class='add'>+</div><div class='add'>+			nn-&gt;nfsd4_lease = leasetime;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		attr = info-&gt;attrs[NFSD_A_SERVER_SCOPE];</div><div class='add'>+		if (attr)</div><div class='add'>+			scope = nla_data(attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nfsd_svc(nrpools, nthreads, net, get_current_cred(), scope);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		ret = 0;</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+	kfree(nthreads);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_nl_threads_get_doit - get the number of running threads</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(skb, info);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	err = nla_put_u32(skb, NFSD_A_SERVER_GRACETIME,</div><div class='add'>+			  nn-&gt;nfsd4_grace) ||</div><div class='add'>+	      nla_put_u32(skb, NFSD_A_SERVER_LEASETIME,</div><div class='add'>+			  nn-&gt;nfsd4_lease) ||</div><div class='add'>+	      nla_put_string(skb, NFSD_A_SERVER_SCOPE,</div><div class='add'>+			  nn-&gt;nfsd_name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unlock;</div><div class='add'>+</div><div class='add'>+	if (nn-&gt;nfsd_serv) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nfsd_nrpools(net); ++i) {</div><div class='add'>+			struct svc_pool *sp = &amp;nn-&gt;nfsd_serv-&gt;sv_pools[i];</div><div class='add'>+</div><div class='add'>+			err = nla_put_u32(skb, NFSD_A_SERVER_THREADS,</div><div class='add'>+					  sp-&gt;sp_nrthreads);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = nla_put_u32(skb, NFSD_A_SERVER_THREADS, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+err_unlock:</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_nl_version_set_doit - set the nfs enabled versions</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_version_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct nlattr *attr;</div><div class='add'>+	struct nfsd_net *nn;</div><div class='add'>+	int i, rem;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NFSD_A_SERVER_PROTO_VERSION))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	nn = net_generic(genl_info_net(info), nfsd_net_id);</div><div class='add'>+	if (nn-&gt;nfsd_serv) {</div><div class='add'>+		mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear current supported versions. */</div><div class='add'>+	nfsd_vers(nn, 2, NFSD_CLEAR);</div><div class='add'>+	nfsd_vers(nn, 3, NFSD_CLEAR);</div><div class='add'>+	for (i = 0; i &lt;= NFSD_SUPPORTED_MINOR_VERSION; i++)</div><div class='add'>+		nfsd_minorversion(nn, i, NFSD_CLEAR);</div><div class='add'>+</div><div class='add'>+	nlmsg_for_each_attr_type(attr, NFSD_A_SERVER_PROTO_VERSION, info-&gt;nlhdr,</div><div class='add'>+				 GENL_HDRLEN, rem) {</div><div class='add'>+		struct nlattr *tb[NFSD_A_VERSION_MAX + 1];</div><div class='add'>+		u32 major, minor = 0;</div><div class='add'>+		bool enabled;</div><div class='add'>+</div><div class='add'>+		if (nla_parse_nested(tb, NFSD_A_VERSION_MAX, attr,</div><div class='add'>+				     nfsd_version_nl_policy, info-&gt;extack) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!tb[NFSD_A_VERSION_MAJOR])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		major = nla_get_u32(tb[NFSD_A_VERSION_MAJOR]);</div><div class='add'>+		if (tb[NFSD_A_VERSION_MINOR])</div><div class='add'>+			minor = nla_get_u32(tb[NFSD_A_VERSION_MINOR]);</div><div class='add'>+</div><div class='add'>+		enabled = nla_get_flag(tb[NFSD_A_VERSION_ENABLED]);</div><div class='add'>+</div><div class='add'>+		switch (major) {</div><div class='add'>+		case 4:</div><div class='add'>+			nfsd_minorversion(nn, minor, enabled ? NFSD_SET : NFSD_CLEAR);</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+		case 2:</div><div class='add'>+			if (!minor)</div><div class='add'>+				nfsd_vers(nn, major, enabled ? NFSD_SET : NFSD_CLEAR);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;nfsd_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nfsd_nl_version_get_doit - get the enabled status for all supported nfs versions</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn;</div><div class='add'>+	int i, err;</div><div class='add'>+	void *hdr;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(skb, info);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+	nn = net_generic(genl_info_net(info), nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	for (i = 2; i &lt;= 4; i++) {</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt;= NFSD_SUPPORTED_MINOR_VERSION; j++) {</div><div class='add'>+			struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+			/* Don't record any versions the kernel doesn't have</div><div class='add'>+			 * compiled in</div><div class='add'>+			 */</div><div class='add'>+			if (!nfsd_support_version(i))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* NFSv{2,3} does not support minor numbers */</div><div class='add'>+			if (i &lt; 4 &amp;&amp; j)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			attr = nla_nest_start(skb,</div><div class='add'>+					      NFSD_A_SERVER_PROTO_VERSION);</div><div class='add'>+			if (!attr) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_nfsd_unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (nla_put_u32(skb, NFSD_A_VERSION_MAJOR, i) ||</div><div class='add'>+			    nla_put_u32(skb, NFSD_A_VERSION_MINOR, j)) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_nfsd_unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Set the enabled flag if the version is enabled */</div><div class='add'>+			if (nfsd_vers(nn, i, NFSD_TEST) &amp;&amp;</div><div class='add'>+			    (i &lt; 4 || nfsd_minorversion(nn, j, NFSD_TEST)) &amp;&amp;</div><div class='add'>+			    nla_put_flag(skb, NFSD_A_VERSION_ENABLED)) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_nfsd_unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			nla_nest_end(skb, attr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+err_nfsd_unlock:</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_nl_listener_set_doit - set the nfs running sockets</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	struct svc_xprt *xprt, *tmp;</div><div class='add'>+	const struct nlattr *attr;</div><div class='add'>+	struct svc_serv *serv;</div><div class='add'>+	LIST_HEAD(permsocks);</div><div class='add'>+	struct nfsd_net *nn;</div><div class='add'>+	bool delete = false;</div><div class='add'>+	int err, rem;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	err = nfsd_create_serv(net);</div><div class='add'>+	if (err) {</div><div class='add'>+		mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nn = net_generic(net, nfsd_net_id);</div><div class='add'>+	serv = nn-&gt;nfsd_serv;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;serv-&gt;sv_lock);</div><div class='add'>+</div><div class='add'>+	/* Move all of the old listener sockets to a temp list */</div><div class='add'>+	list_splice_init(&amp;serv-&gt;sv_permsocks, &amp;permsocks);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Walk the list of server_socks from userland and move any that match</div><div class='add'>+	 * back to sv_permsocks</div><div class='add'>+	 */</div><div class='add'>+	nlmsg_for_each_attr_type(attr, NFSD_A_SERVER_SOCK_ADDR, info-&gt;nlhdr,</div><div class='add'>+				 GENL_HDRLEN, rem) {</div><div class='add'>+		struct nlattr *tb[NFSD_A_SOCK_MAX + 1];</div><div class='add'>+		const char *xcl_name;</div><div class='add'>+		struct sockaddr *sa;</div><div class='add'>+</div><div class='add'>+		if (nla_parse_nested(tb, NFSD_A_SOCK_MAX, attr,</div><div class='add'>+				     nfsd_sock_nl_policy, info-&gt;extack) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!tb[NFSD_A_SOCK_ADDR] || !tb[NFSD_A_SOCK_TRANSPORT_NAME])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (nla_len(tb[NFSD_A_SOCK_ADDR]) &lt; sizeof(*sa))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		xcl_name = nla_data(tb[NFSD_A_SOCK_TRANSPORT_NAME]);</div><div class='add'>+		sa = nla_data(tb[NFSD_A_SOCK_ADDR]);</div><div class='add'>+</div><div class='add'>+		/* Put back any matching sockets */</div><div class='add'>+		list_for_each_entry_safe(xprt, tmp, &amp;permsocks, xpt_list) {</div><div class='add'>+			/* This shouldn't be possible */</div><div class='add'>+			if (WARN_ON_ONCE(xprt-&gt;xpt_net != net)) {</div><div class='add'>+				list_move(&amp;xprt-&gt;xpt_list, &amp;serv-&gt;sv_permsocks);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* If everything matches, put it back */</div><div class='add'>+			if (!strcmp(xprt-&gt;xpt_class-&gt;xcl_name, xcl_name) &amp;&amp;</div><div class='add'>+			    rpc_cmp_addr_port(sa, (struct sockaddr *)&amp;xprt-&gt;xpt_local)) {</div><div class='add'>+				list_move(&amp;xprt-&gt;xpt_list, &amp;serv-&gt;sv_permsocks);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there are listener transports remaining on the permsocks list,</div><div class='add'>+	 * it means we were asked to remove a listener.</div><div class='add'>+	 */</div><div class='add'>+	if (!list_empty(&amp;permsocks)) {</div><div class='add'>+		list_splice_init(&amp;permsocks, &amp;serv-&gt;sv_permsocks);</div><div class='add'>+		delete = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;serv-&gt;sv_lock);</div><div class='add'>+</div><div class='add'>+	/* Do not remove listeners while there are active threads. */</div><div class='add'>+	if (serv-&gt;sv_nrthreads) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out_unlock_mtx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since we can't delete an arbitrary llist entry, destroy the</div><div class='add'>+	 * remaining listeners and recreate the list.</div><div class='add'>+	 */</div><div class='add'>+	if (delete)</div><div class='add'>+		svc_xprt_destroy_all(serv, net, false);</div><div class='add'>+</div><div class='add'>+	/* walk list of addrs again, open any that still don't exist */</div><div class='add'>+	nlmsg_for_each_attr_type(attr, NFSD_A_SERVER_SOCK_ADDR, info-&gt;nlhdr,</div><div class='add'>+				 GENL_HDRLEN, rem) {</div><div class='add'>+		struct nlattr *tb[NFSD_A_SOCK_MAX + 1];</div><div class='add'>+		const char *xcl_name;</div><div class='add'>+		struct sockaddr *sa;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		if (nla_parse_nested(tb, NFSD_A_SOCK_MAX, attr,</div><div class='add'>+				     nfsd_sock_nl_policy, info-&gt;extack) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!tb[NFSD_A_SOCK_ADDR] || !tb[NFSD_A_SOCK_TRANSPORT_NAME])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (nla_len(tb[NFSD_A_SOCK_ADDR]) &lt; sizeof(*sa))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		xcl_name = nla_data(tb[NFSD_A_SOCK_TRANSPORT_NAME]);</div><div class='add'>+		sa = nla_data(tb[NFSD_A_SOCK_ADDR]);</div><div class='add'>+</div><div class='add'>+		xprt = svc_find_listener(serv, xcl_name, net, sa);</div><div class='add'>+		if (xprt) {</div><div class='add'>+			if (delete)</div><div class='add'>+				WARN_ONCE(1, "Transport type=%s already exists\n",</div><div class='add'>+					  xcl_name);</div><div class='add'>+			svc_xprt_put(xprt);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa, 0,</div><div class='add'>+					      get_current_cred());</div><div class='add'>+		/* always save the latest error */</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			err = ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!serv-&gt;sv_nrthreads &amp;&amp; list_empty(&amp;nn-&gt;nfsd_serv-&gt;sv_permsocks))</div><div class='add'>+		nfsd_destroy_serv(net);</div><div class='add'>+</div><div class='add'>+out_unlock_mtx:</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_nl_listener_get_doit - get the nfs running listeners</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_listener_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct svc_xprt *xprt;</div><div class='add'>+	struct svc_serv *serv;</div><div class='add'>+	struct nfsd_net *nn;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_iput(skb, info);</div><div class='add'>+	if (!hdr) {</div><div class='add'>+		err = -EMSGSIZE;</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nfsd_mutex);</div><div class='add'>+	nn = net_generic(genl_info_net(info), nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	/* no nfs server? Just send empty socket list */</div><div class='add'>+	if (!nn-&gt;nfsd_serv)</div><div class='add'>+		goto out_unlock_mtx;</div><div class='add'>+</div><div class='add'>+	serv = nn-&gt;nfsd_serv;</div><div class='add'>+	spin_lock_bh(&amp;serv-&gt;sv_lock);</div><div class='add'>+	list_for_each_entry(xprt, &amp;serv-&gt;sv_permsocks, xpt_list) {</div><div class='add'>+		struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+		attr = nla_nest_start(skb, NFSD_A_SERVER_SOCK_ADDR);</div><div class='add'>+		if (!attr) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_serv_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (nla_put_string(skb, NFSD_A_SOCK_TRANSPORT_NAME,</div><div class='add'>+				   xprt-&gt;xpt_class-&gt;xcl_name) ||</div><div class='add'>+		    nla_put(skb, NFSD_A_SOCK_ADDR,</div><div class='add'>+			    sizeof(struct sockaddr_storage),</div><div class='add'>+			    &amp;xprt-&gt;xpt_local)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_serv_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nla_nest_end(skb, attr);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;serv-&gt;sv_lock);</div><div class='add'>+out_unlock_mtx:</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+err_serv_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;serv-&gt;sv_lock);</div><div class='add'>+	mutex_unlock(&amp;nfsd_mutex);</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_nl_pool_mode_set_doit - set the number of running threads</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_pool_mode_set_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	const struct nlattr *attr;</div><div class='add'>+</div><div class='add'>+	if (GENL_REQ_ATTR_CHECK(info, NFSD_A_POOL_MODE_MODE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	attr = info-&gt;attrs[NFSD_A_POOL_MODE_MODE];</div><div class='add'>+	return sunrpc_set_pool_mode(nla_data(attr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_nl_pool_mode_get_doit - get info about pool_mode</div><div class='add'>+ * @skb: reply buffer</div><div class='add'>+ * @info: netlink metadata and command arguments</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success or a negative errno.</div><div class='add'>+ */</div><div class='add'>+int nfsd_nl_pool_mode_get_doit(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	char buf[16];</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (sunrpc_get_pool_mode(buf, ARRAY_SIZE(buf)) &gt;= ARRAY_SIZE(buf))</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = -EMSGSIZE;</div><div class='add'>+	hdr = genlmsg_iput(skb, info);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+</div><div class='add'>+	err = nla_put_string(skb, NFSD_A_POOL_MODE_MODE, buf) |</div><div class='add'>+	      nla_put_u32(skb, NFSD_A_POOL_MODE_NPOOLS, nfsd_nrpools(net));</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_msg;</div><div class='add'>+</div><div class='add'>+	genlmsg_end(skb, hdr);</div><div class='add'>+	return genlmsg_reply(skb, info);</div><div class='add'>+</div><div class='add'>+err_free_msg:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nfsd_net_init - Prepare the nfsd_net portion of a new net namespace</div><div class='ctx'>  * @net: a freshly-created network namespace</div><div class='ctx'>  *</div><div class='hunk'>@@ -1662,8 +2141,9 @@ int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb)</div><div class='ctx'>  */</div><div class='ctx'> static __net_init int nfsd_net_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+	int retval;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	retval = nfsd_export_init(net);</div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -1671,17 +2151,35 @@ static __net_init int nfsd_net_init(struct net *net)</div><div class='ctx'> 	retval = nfsd_idmap_init(net);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out_idmap_error;</div><div class='del'>-	retval = nfsd_net_reply_cache_init(nn);</div><div class='add'>+	retval = percpu_counter_init_many(nn-&gt;counter, 0, GFP_KERNEL,</div><div class='add'>+					  NFSD_STATS_COUNTERS_NUM);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out_repcache_error;</div><div class='del'>-	nn-&gt;nfsd_versions = NULL;</div><div class='del'>-	nn-&gt;nfsd4_minorversions = NULL;</div><div class='add'>+</div><div class='add'>+	memset(&amp;nn-&gt;nfsd_svcstats, 0, sizeof(nn-&gt;nfsd_svcstats));</div><div class='add'>+	nn-&gt;nfsd_svcstats.program = &amp;nfsd_programs[0];</div><div class='add'>+	if (!nfsd_proc_stat_init(net)) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto out_proc_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(nn-&gt;nfsd_versions); i++)</div><div class='add'>+		nn-&gt;nfsd_versions[i] = nfsd_support_version(i);</div><div class='add'>+	for (i = 0; i &lt; sizeof(nn-&gt;nfsd4_minorversions); i++)</div><div class='add'>+		nn-&gt;nfsd4_minorversions[i] = nfsd_support_version(4);</div><div class='add'>+	nn-&gt;nfsd_info.mutex = &amp;nfsd_mutex;</div><div class='add'>+	nn-&gt;nfsd_serv = NULL;</div><div class='ctx'> 	nfsd4_init_leases_net(nn);</div><div class='ctx'> 	get_random_bytes(&amp;nn-&gt;siphash_key, sizeof(nn-&gt;siphash_key));</div><div class='ctx'> 	seqlock_init(&amp;nn-&gt;writeverf_lock);</div><div class='del'>-</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	spin_lock_init(&amp;nn-&gt;local_clients_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;nn-&gt;local_clients);</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_proc_error:</div><div class='add'>+	percpu_counter_destroy_many(nn-&gt;counter, NFSD_STATS_COUNTERS_NUM);</div><div class='ctx'> out_repcache_error:</div><div class='ctx'> 	nfsd_idmap_shutdown(net);</div><div class='ctx'> out_idmap_error:</div><div class='hunk'>@@ -1690,6 +2188,23 @@ out_export_error:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+/**</div><div class='add'>+ * nfsd_net_pre_exit - Disconnect localio clients from net namespace</div><div class='add'>+ * @net: a network namespace that is about to be destroyed</div><div class='add'>+ *</div><div class='add'>+ * This invalidates -&gt;net pointers held by localio clients</div><div class='add'>+ * while they can still safely access nn-&gt;counter.</div><div class='add'>+ */</div><div class='add'>+static __net_exit void nfsd_net_pre_exit(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	nfs_localio_invalidate_clients(&amp;nn-&gt;local_clients,</div><div class='add'>+				       &amp;nn-&gt;local_clients_lock);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfsd_net_exit - Release the nfsd_net portion of a net namespace</div><div class='ctx'>  * @net: a network namespace that is about to be destroyed</div><div class='hunk'>@@ -1699,14 +2214,17 @@ static __net_exit void nfsd_net_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> </div><div class='del'>-	nfsd_net_reply_cache_destroy(nn);</div><div class='add'>+	nfsd_proc_stat_shutdown(net);</div><div class='add'>+	percpu_counter_destroy_many(nn-&gt;counter, NFSD_STATS_COUNTERS_NUM);</div><div class='ctx'> 	nfsd_idmap_shutdown(net);</div><div class='ctx'> 	nfsd_export_shutdown(net);</div><div class='del'>-	nfsd_netns_free_versions(nn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations nfsd_net_ops = {</div><div class='ctx'> 	.init = nfsd_net_init,</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	.pre_exit = nfsd_net_pre_exit,</div><div class='add'>+#endif</div><div class='ctx'> 	.exit = nfsd_net_exit,</div><div class='ctx'> 	.id   = &amp;nfsd_net_id,</div><div class='ctx'> 	.size = sizeof(struct nfsd_net),</div><div class='hunk'>@@ -1716,25 +2234,21 @@ static int __init init_nfsd(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='add'>+	nfsd_debugfs_init();</div><div class='add'>+</div><div class='ctx'> 	retval = nfsd4_init_slabs();</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	retval = nfsd4_init_pnfs();</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out_free_slabs;</div><div class='del'>-	retval = nfsd_stat_init();	/* Statistics */</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out_free_pnfs;</div><div class='ctx'> 	retval = nfsd_drc_slab_create();</div><div class='ctx'> 	if (retval)</div><div class='del'>-		goto out_free_stat;</div><div class='add'>+		goto out_free_pnfs;</div><div class='ctx'> 	nfsd_lockd_init();	/* lockd-&gt;nfsd callbacks */</div><div class='del'>-	retval = create_proc_exports_entry();</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out_free_lockd;</div><div class='ctx'> 	retval = register_pernet_subsys(&amp;nfsd_net_ops);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='del'>-		goto out_free_exports;</div><div class='add'>+		goto out_free_lockd;</div><div class='ctx'> 	retval = register_cld_notifier();</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out_free_subsys;</div><div class='hunk'>@@ -1743,47 +2257,51 @@ static int __init init_nfsd(void)</div><div class='ctx'> 		goto out_free_cld;</div><div class='ctx'> 	retval = register_filesystem(&amp;nfsd_fs_type);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		goto out_free_all;</div><div class='add'>+		goto out_free_nfsd4;</div><div class='ctx'> 	retval = genl_register_family(&amp;nfsd_nl_family);</div><div class='ctx'> 	if (retval)</div><div class='add'>+		goto out_free_filesystem;</div><div class='add'>+	retval = create_proc_exports_entry();</div><div class='add'>+	if (retval)</div><div class='ctx'> 		goto out_free_all;</div><div class='add'>+	nfsd_localio_ops_init();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_free_all:</div><div class='add'>+	genl_unregister_family(&amp;nfsd_nl_family);</div><div class='add'>+out_free_filesystem:</div><div class='add'>+	unregister_filesystem(&amp;nfsd_fs_type);</div><div class='add'>+out_free_nfsd4:</div><div class='ctx'> 	nfsd4_destroy_laundry_wq();</div><div class='ctx'> out_free_cld:</div><div class='ctx'> 	unregister_cld_notifier();</div><div class='ctx'> out_free_subsys:</div><div class='ctx'> 	unregister_pernet_subsys(&amp;nfsd_net_ops);</div><div class='del'>-out_free_exports:</div><div class='del'>-	remove_proc_entry("fs/nfs/exports", NULL);</div><div class='del'>-	remove_proc_entry("fs/nfs", NULL);</div><div class='ctx'> out_free_lockd:</div><div class='ctx'> 	nfsd_lockd_shutdown();</div><div class='ctx'> 	nfsd_drc_slab_free();</div><div class='del'>-out_free_stat:</div><div class='del'>-	nfsd_stat_shutdown();</div><div class='ctx'> out_free_pnfs:</div><div class='ctx'> 	nfsd4_exit_pnfs();</div><div class='ctx'> out_free_slabs:</div><div class='ctx'> 	nfsd4_free_slabs();</div><div class='add'>+	nfsd_debugfs_exit();</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_nfsd(void)</div><div class='ctx'> {</div><div class='add'>+	remove_proc_entry("fs/nfs/exports", NULL);</div><div class='add'>+	remove_proc_entry("fs/nfs", NULL);</div><div class='ctx'> 	genl_unregister_family(&amp;nfsd_nl_family);</div><div class='ctx'> 	unregister_filesystem(&amp;nfsd_fs_type);</div><div class='ctx'> 	nfsd4_destroy_laundry_wq();</div><div class='ctx'> 	unregister_cld_notifier();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;nfsd_net_ops);</div><div class='ctx'> 	nfsd_drc_slab_free();</div><div class='del'>-	remove_proc_entry("fs/nfs/exports", NULL);</div><div class='del'>-	remove_proc_entry("fs/nfs", NULL);</div><div class='del'>-	nfsd_stat_shutdown();</div><div class='ctx'> 	nfsd_lockd_shutdown();</div><div class='ctx'> 	nfsd4_free_slabs();</div><div class='ctx'> 	nfsd4_exit_pnfs();</div><div class='add'>+	nfsd_debugfs_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Olaf Kirch &lt;okir@monad.swb.de&gt;");</div><div class='head'>diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h<br/>index 304e9728b929..e4263326ca4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsd.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfsd.h</a></div><div class='hunk'>@@ -23,9 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/nfsd/debug.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "netns.h"</div><div class='ctx'> #include "export.h"</div><div class='del'>-#include "stats.h"</div><div class='ctx'> </div><div class='ctx'> #undef ifdebug</div><div class='ctx'> #ifdef CONFIG_SUNRPC_DEBUG</div><div class='hunk'>@@ -37,33 +35,30 @@</div><div class='ctx'> /*</div><div class='ctx'>  * nfsd version</div><div class='ctx'>  */</div><div class='add'>+#define NFSD_MINVERS			2</div><div class='add'>+#define	NFSD_MAXVERS			4</div><div class='ctx'> #define NFSD_SUPPORTED_MINOR_VERSION	2</div><div class='del'>-/*</div><div class='del'>- * Maximum blocksizes supported by daemon under various circumstances.</div><div class='del'>- */</div><div class='del'>-#define NFSSVC_MAXBLKSIZE       RPCSVC_MAXPAYLOAD</div><div class='del'>-/* NFSv2 is limited by the protocol specification, see RFC 1094 */</div><div class='del'>-#define NFSSVC_MAXBLKSIZE_V2    (8*1024)</div><div class='add'>+bool nfsd_support_version(int vers);</div><div class='ctx'> </div><div class='add'>+#include "netns.h"</div><div class='add'>+#include "stats.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Largest number of bytes we need to allocate for an NFS</div><div class='del'>- * call or reply.  Used to control buffer sizes.  We use</div><div class='del'>- * the length of v3 WRITE, READDIR and READDIR replies</div><div class='del'>- * which are an RPC header, up to 26 XDR units of reply</div><div class='del'>- * data, and some page data.</div><div class='del'>- *</div><div class='del'>- * Note that accuracy here doesn't matter too much as the</div><div class='del'>- * size is rounded up to a page size when allocating space.</div><div class='add'>+ * Default and maximum payload size (NFS READ or WRITE), in bytes.</div><div class='add'>+ * The default is historical, and the maximum is an implementation</div><div class='add'>+ * limit.</div><div class='ctx'>  */</div><div class='del'>-#define NFSD_BUFSIZE            ((RPC_MAX_HEADER_WITH_AUTH+26)*XDR_UNIT + NFSSVC_MAXBLKSIZE)</div><div class='add'>+enum {</div><div class='add'>+	NFSSVC_DEFBLKSIZE       = 1 * 1024 * 1024,</div><div class='add'>+	NFSSVC_MAXBLKSIZE       = RPCSVC_MAXPAYLOAD,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct readdir_cd {</div><div class='ctx'> 	__be32			err;	/* 0, nfserr, or nfserr_eof */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Maximum number of operations per session compound */</div><div class='del'>-#define NFSD_MAX_OPS_PER_COMPOUND	50</div><div class='add'>+#define NFSD_MAX_OPS_PER_COMPOUND	200</div><div class='ctx'> </div><div class='ctx'> struct nfsd_genl_rqstp {</div><div class='ctx'> 	struct sockaddr		rq_daddr;</div><div class='hunk'>@@ -77,15 +72,13 @@ struct nfsd_genl_rqstp {</div><div class='ctx'> </div><div class='ctx'> 	/* NFSv4 compound */</div><div class='ctx'> 	u32			rq_opcnt;</div><div class='del'>-	u32			rq_opnum[NFSD_MAX_OPS_PER_COMPOUND];</div><div class='add'>+	u32			rq_opnum[16];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct svc_program	nfsd_program;</div><div class='add'>+extern struct svc_program	nfsd_programs[];</div><div class='ctx'> extern const struct svc_version	nfsd_version2, nfsd_version3, nfsd_version4;</div><div class='ctx'> extern struct mutex		nfsd_mutex;</div><div class='del'>-extern spinlock_t		nfsd_drc_lock;</div><div class='del'>-extern unsigned long		nfsd_drc_max_mem;</div><div class='del'>-extern unsigned long		nfsd_drc_mem_used;</div><div class='add'>+extern atomic_t			nfsd_th_cnt;		/* number of available threads */</div><div class='ctx'> </div><div class='ctx'> extern const struct seq_operations nfs_exports_op;</div><div class='ctx'> </div><div class='hunk'>@@ -102,18 +95,17 @@ bool		nfssvc_encode_voidres(struct svc_rqst *rqstp,</div><div class='ctx'> /*</div><div class='ctx'>  * Function prototypes.</div><div class='ctx'>  */</div><div class='del'>-int		nfsd_svc(int nrservs, struct net *net, const struct cred *cred);</div><div class='add'>+int		nfsd_svc(int n, int *nservers, struct net *net,</div><div class='add'>+			 const struct cred *cred, const char *scope);</div><div class='ctx'> int		nfsd_dispatch(struct svc_rqst *rqstp);</div><div class='ctx'> </div><div class='ctx'> int		nfsd_nrthreads(struct net *);</div><div class='ctx'> int		nfsd_nrpools(struct net *);</div><div class='ctx'> int		nfsd_get_nrthreads(int n, int *, struct net *);</div><div class='ctx'> int		nfsd_set_nrthreads(int n, int *, struct net *);</div><div class='del'>-int		nfsd_pool_stats_open(struct inode *, struct file *);</div><div class='del'>-int		nfsd_pool_stats_release(struct inode *, struct file *);</div><div class='ctx'> void		nfsd_shutdown_threads(struct net *net);</div><div class='ctx'> </div><div class='del'>-bool		i_am_nfsd(void);</div><div class='add'>+struct svc_rqst *nfsd_current_rqst(void);</div><div class='ctx'> </div><div class='ctx'> struct nfsdfs_client {</div><div class='ctx'> 	struct kref cl_ref;</div><div class='hunk'>@@ -141,6 +133,10 @@ extern const struct svc_version nfsd_acl_version3;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+extern const struct svc_version localio_version1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct nfsd_net;</div><div class='ctx'> </div><div class='ctx'> enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };</div><div class='hunk'>@@ -150,11 +146,31 @@ void nfsd_reset_versions(struct nfsd_net *nn);</div><div class='ctx'> int nfsd_create_serv(struct net *net);</div><div class='ctx'> void nfsd_destroy_serv(struct net *net);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+void nfsd_debugfs_init(void);</div><div class='add'>+void nfsd_debugfs_exit(void);</div><div class='add'>+#else</div><div class='add'>+static inline void nfsd_debugfs_init(void) {}</div><div class='add'>+static inline void nfsd_debugfs_exit(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern bool nfsd_disable_splice_read __read_mostly;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/* Any new NFSD_IO enum value must be added at the end */</div><div class='add'>+	NFSD_IO_BUFFERED,</div><div class='add'>+	NFSD_IO_DONTCACHE,</div><div class='add'>+	NFSD_IO_DIRECT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern u64 nfsd_io_cache_read __read_mostly;</div><div class='add'>+extern u64 nfsd_io_cache_write __read_mostly;</div><div class='add'>+</div><div class='ctx'> extern int nfsd_max_blksize;</div><div class='ctx'> </div><div class='ctx'> static inline int nfsd_v4client(struct svc_rqst *rq)</div><div class='ctx'> {</div><div class='del'>-	return rq-&gt;rq_prog == NFS_PROGRAM &amp;&amp; rq-&gt;rq_vers == 4;</div><div class='add'>+	return rq &amp;&amp; rq-&gt;rq_prog == NFS_PROGRAM &amp;&amp; rq-&gt;rq_vers == 4;</div><div class='ctx'> }</div><div class='ctx'> static inline struct user_namespace *</div><div class='ctx'> nfsd_user_namespace(const struct svc_rqst *rqstp)</div><div class='hunk'>@@ -229,7 +245,6 @@ void		nfsd_lockd_shutdown(void);</div><div class='ctx'> #define	nfserr_nospc		cpu_to_be32(NFSERR_NOSPC)</div><div class='ctx'> #define	nfserr_rofs		cpu_to_be32(NFSERR_ROFS)</div><div class='ctx'> #define	nfserr_mlink		cpu_to_be32(NFSERR_MLINK)</div><div class='del'>-#define	nfserr_opnotsupp	cpu_to_be32(NFSERR_OPNOTSUPP)</div><div class='ctx'> #define	nfserr_nametoolong	cpu_to_be32(NFSERR_NAMETOOLONG)</div><div class='ctx'> #define	nfserr_notempty		cpu_to_be32(NFSERR_NOTEMPTY)</div><div class='ctx'> #define	nfserr_dquot		cpu_to_be32(NFSERR_DQUOT)</div><div class='hunk'>@@ -274,9 +289,11 @@ void		nfsd_lockd_shutdown(void);</div><div class='ctx'> #define	nfserr_no_grace		cpu_to_be32(NFSERR_NO_GRACE)</div><div class='ctx'> #define	nfserr_reclaim_bad	cpu_to_be32(NFSERR_RECLAIM_BAD)</div><div class='ctx'> #define	nfserr_badname		cpu_to_be32(NFSERR_BADNAME)</div><div class='add'>+#define	nfserr_admin_revoked	cpu_to_be32(NFS4ERR_ADMIN_REVOKED)</div><div class='ctx'> #define	nfserr_cb_path_down	cpu_to_be32(NFSERR_CB_PATH_DOWN)</div><div class='ctx'> #define	nfserr_locked		cpu_to_be32(NFSERR_LOCKED)</div><div class='ctx'> #define	nfserr_wrongsec		cpu_to_be32(NFSERR_WRONGSEC)</div><div class='add'>+#define nfserr_delay			cpu_to_be32(NFS4ERR_DELAY)</div><div class='ctx'> #define nfserr_badiomode		cpu_to_be32(NFS4ERR_BADIOMODE)</div><div class='ctx'> #define nfserr_badlayout		cpu_to_be32(NFS4ERR_BADLAYOUT)</div><div class='ctx'> #define nfserr_bad_session_digest	cpu_to_be32(NFS4ERR_BAD_SESSION_DIGEST)</div><div class='hunk'>@@ -325,17 +342,30 @@ void		nfsd_lockd_shutdown(void);</div><div class='ctx'> #define nfserr_xattr2big		cpu_to_be32(NFS4ERR_XATTR2BIG)</div><div class='ctx'> #define nfserr_noxattr			cpu_to_be32(NFS4ERR_NOXATTR)</div><div class='ctx'> </div><div class='del'>-/* error codes for internal use */</div><div class='del'>-/* if a request fails due to kmalloc failure, it gets dropped.</div><div class='del'>- *  Client should resend eventually</div><div class='add'>+/*</div><div class='add'>+ * Error codes for internal use.  We use enum to choose numbers that are</div><div class='add'>+ * not already assigned, then covert to be32 resulting in a number that</div><div class='add'>+ * cannot conflict with any existing be32 nfserr value.</div><div class='ctx'>  */</div><div class='del'>-#define	nfserr_dropit		cpu_to_be32(30000)</div><div class='add'>+enum {</div><div class='ctx'> /* end-of-file indicator in readdir */</div><div class='del'>-#define	nfserr_eof		cpu_to_be32(30001)</div><div class='add'>+	NFSERR_EOF = NFS4ERR_FIRST_FREE,</div><div class='add'>+#define	nfserr_eof		cpu_to_be32(NFSERR_EOF)</div><div class='add'>+</div><div class='ctx'> /* replay detected */</div><div class='del'>-#define	nfserr_replay_me	cpu_to_be32(11001)</div><div class='add'>+	NFSERR_REPLAY_ME,</div><div class='add'>+#define	nfserr_replay_me	cpu_to_be32(NFSERR_REPLAY_ME)</div><div class='add'>+</div><div class='ctx'> /* nfs41 replay detected */</div><div class='del'>-#define	nfserr_replay_cache	cpu_to_be32(11002)</div><div class='add'>+	NFSERR_REPLAY_CACHE,</div><div class='add'>+#define	nfserr_replay_cache	cpu_to_be32(NFSERR_REPLAY_CACHE)</div><div class='add'>+</div><div class='add'>+/* symlink found where dir expected - handled differently to</div><div class='add'>+ * other symlink found errors by NFSv3.</div><div class='add'>+ */</div><div class='add'>+	NFSERR_SYMLINK_NOT_DIR,</div><div class='add'>+#define	nfserr_symlink_not_dir	cpu_to_be32(NFSERR_SYMLINK_NOT_DIR)</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Check for dir entries '.' and '..' */</div><div class='ctx'> #define isdotent(n, l)	(l &lt; 3 &amp;&amp; n[0] == '.' &amp;&amp; (l == 1 || n[1] == '.'))</div><div class='hunk'>@@ -365,16 +395,16 @@ void		nfsd_lockd_shutdown(void);</div><div class='ctx'> #define	NFSD_CLIENT_MAX_TRIM_PER_RUN	128</div><div class='ctx'> #define	NFS4_CLIENTS_PER_GB		1024</div><div class='ctx'> #define NFSD_DELEGRETURN_TIMEOUT	(HZ / 34)	/* 30ms */</div><div class='add'>+#define	NFSD_CB_GETATTR_TIMEOUT		NFSD_DELEGRETURN_TIMEOUT</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The following attributes are currently not supported by the NFSv4 server:</div><div class='add'>+ * The following attributes are not implemented by NFSD:</div><div class='ctx'>  *    ARCHIVE       (deprecated anyway)</div><div class='ctx'>  *    HIDDEN        (unlikely to be supported any time soon)</div><div class='ctx'>  *    MIMETYPE      (unlikely to be supported any time soon)</div><div class='ctx'>  *    QUOTA_*       (will be supported in a forthcoming patch)</div><div class='ctx'>  *    SYSTEM        (unlikely to be supported any time soon)</div><div class='ctx'>  *    TIME_BACKUP   (unlikely to be supported any time soon)</div><div class='del'>- *    TIME_CREATE   (unlikely to be supported any time soon)</div><div class='ctx'>  */</div><div class='ctx'> #define NFSD4_SUPPORTED_ATTRS_WORD0                                                         \</div><div class='ctx'> (FATTR4_WORD0_SUPPORTED_ATTRS   | FATTR4_WORD0_TYPE         | FATTR4_WORD0_FH_EXPIRE_TYPE   \</div><div class='hunk'>@@ -428,8 +458,12 @@ void		nfsd_lockd_shutdown(void);</div><div class='ctx'> #define NFSD4_2_SUPPORTED_ATTRS_WORD2 \</div><div class='ctx'> 	(NFSD4_1_SUPPORTED_ATTRS_WORD2 | \</div><div class='ctx'> 	FATTR4_WORD2_MODE_UMASK | \</div><div class='add'>+	FATTR4_WORD2_CLONE_BLKSIZE | \</div><div class='ctx'> 	NFSD4_2_SECURITY_ATTRS | \</div><div class='del'>-	FATTR4_WORD2_XATTR_SUPPORT)</div><div class='add'>+	FATTR4_WORD2_XATTR_SUPPORT | \</div><div class='add'>+	FATTR4_WORD2_TIME_DELEG_ACCESS | \</div><div class='add'>+	FATTR4_WORD2_TIME_DELEG_MODIFY | \</div><div class='add'>+	FATTR4_WORD2_OPEN_ARGUMENTS)</div><div class='ctx'> </div><div class='ctx'> extern const u32 nfsd_suppattrs[3][3];</div><div class='ctx'> </div><div class='hunk'>@@ -499,7 +533,10 @@ static inline bool nfsd_attrs_supported(u32 minorversion, const u32 *bmval)</div><div class='ctx'> #endif</div><div class='ctx'> #define NFSD_WRITEABLE_ATTRS_WORD2 \</div><div class='ctx'> 	(FATTR4_WORD2_MODE_UMASK \</div><div class='del'>-	| MAYBE_FATTR4_WORD2_SECURITY_LABEL)</div><div class='add'>+	| MAYBE_FATTR4_WORD2_SECURITY_LABEL \</div><div class='add'>+	| FATTR4_WORD2_TIME_DELEG_ACCESS \</div><div class='add'>+	| FATTR4_WORD2_TIME_DELEG_MODIFY \</div><div class='add'>+	)</div><div class='ctx'> </div><div class='ctx'> #define NFSD_SUPPATTR_EXCLCREAT_WORD0 \</div><div class='ctx'> 	NFSD_WRITEABLE_ATTRS_WORD0</div><div class='head'>diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c<br/>index dbfa0ac13564..ed85dd43da18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsfh.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsfh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsfh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfsfh.c</a></div><div class='hunk'>@@ -62,8 +62,7 @@ static int nfsd_acceptable(void *expv, struct dentry *dentry)</div><div class='ctx'>  * the write call).</div><div class='ctx'>  */</div><div class='ctx'> static inline __be32</div><div class='del'>-nfsd_mode_check(struct svc_rqst *rqstp, struct dentry *dentry,</div><div class='del'>-		umode_t requested)</div><div class='add'>+nfsd_mode_check(struct dentry *dentry, umode_t requested)</div><div class='ctx'> {</div><div class='ctx'> 	umode_t mode = d_inode(dentry)-&gt;i_mode &amp; S_IFMT;</div><div class='ctx'> </div><div class='hunk'>@@ -76,36 +75,36 @@ nfsd_mode_check(struct svc_rqst *rqstp, struct dentry *dentry,</div><div class='ctx'> 		}</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * v4 has an error more specific than err_notdir which we should</div><div class='del'>-	 * return in preference to err_notdir:</div><div class='del'>-	 */</div><div class='del'>-	if (rqstp-&gt;rq_vers == 4 &amp;&amp; mode == S_IFLNK)</div><div class='add'>+	if (mode == S_IFLNK) {</div><div class='add'>+		if (requested == S_IFDIR)</div><div class='add'>+			return nfserr_symlink_not_dir;</div><div class='ctx'> 		return nfserr_symlink;</div><div class='add'>+	}</div><div class='ctx'> 	if (requested == S_IFDIR)</div><div class='ctx'> 		return nfserr_notdir;</div><div class='ctx'> 	if (mode == S_IFDIR)</div><div class='ctx'> 		return nfserr_isdir;</div><div class='del'>-	return nfserr_inval;</div><div class='add'>+	return nfserr_wrong_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool nfsd_originating_port_ok(struct svc_rqst *rqstp, int flags)</div><div class='add'>+static bool nfsd_originating_port_ok(struct svc_rqst *rqstp,</div><div class='add'>+				     struct svc_cred *cred,</div><div class='add'>+				     struct svc_export *exp)</div><div class='ctx'> {</div><div class='del'>-	if (flags &amp; NFSEXP_INSECURE_PORT)</div><div class='add'>+	if (nfsexp_flags(cred, exp) &amp; NFSEXP_INSECURE_PORT)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	/* We don't require gss requests to use low ports: */</div><div class='del'>-	if (rqstp-&gt;rq_cred.cr_flavor &gt;= RPC_AUTH_GSS)</div><div class='add'>+	if (cred-&gt;cr_flavor &gt;= RPC_AUTH_GSS)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return test_bit(RQ_SECURE, &amp;rqstp-&gt;rq_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp,</div><div class='add'>+					  struct svc_cred *cred,</div><div class='ctx'> 					  struct svc_export *exp)</div><div class='ctx'> {</div><div class='del'>-	int flags = nfsexp_flags(rqstp, exp);</div><div class='del'>-</div><div class='ctx'> 	/* Check if the request originated from a secure port. */</div><div class='del'>-	if (!nfsd_originating_port_ok(rqstp, flags)) {</div><div class='add'>+	if (rqstp &amp;&amp; !nfsd_originating_port_ok(rqstp, cred, exp)) {</div><div class='ctx'> 		RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);</div><div class='ctx'> 		dprintk("nfsd: request from insecure port %s!\n",</div><div class='ctx'> 		        svc_print_addr(rqstp, buf, sizeof(buf)));</div><div class='hunk'>@@ -113,23 +112,15 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set user creds for this exportpoint */</div><div class='del'>-	return nfserrno(nfsd_setuser(rqstp, exp));</div><div class='add'>+	return nfserrno(nfsd_setuser(cred, exp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,</div><div class='del'>-	struct dentry *dentry, struct svc_export *exp)</div><div class='add'>+static inline __be32 check_pseudo_root(struct dentry *dentry,</div><div class='add'>+				       struct svc_export *exp)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(exp-&gt;ex_flags &amp; NFSEXP_V4ROOT))</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> 	/*</div><div class='del'>-	 * v2/v3 clients have no need for the V4ROOT export--they use</div><div class='del'>-	 * the mount protocl instead; also, further V4ROOT checks may be</div><div class='del'>-	 * in v4-specific code, in which case v2/v3 clients could bypass</div><div class='del'>-	 * them.</div><div class='del'>-	 */</div><div class='del'>-	if (!nfsd_v4client(rqstp))</div><div class='del'>-		return nfserr_stale;</div><div class='del'>-	/*</div><div class='ctx'> 	 * We're exposing only the directories and symlinks that have to be</div><div class='ctx'> 	 * traversed on the way to real exports:</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -151,7 +142,11 @@ static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,</div><div class='ctx'>  * dentry.  On success, the results are used to set fh_export and</div><div class='ctx'>  * fh_dentry.</div><div class='ctx'>  */</div><div class='del'>-static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='add'>+static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct net *net,</div><div class='add'>+				 struct svc_cred *cred,</div><div class='add'>+				 struct auth_domain *client,</div><div class='add'>+				 struct auth_domain *gssclient,</div><div class='add'>+				 struct svc_fh *fhp)</div><div class='ctx'> {</div><div class='ctx'> 	struct knfsd_fh	*fh = &amp;fhp-&gt;fh_handle;</div><div class='ctx'> 	struct fid *fid = NULL;</div><div class='hunk'>@@ -162,10 +157,8 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 	int len;</div><div class='ctx'> 	__be32 error;</div><div class='ctx'> </div><div class='del'>-	error = nfserr_stale;</div><div class='del'>-	if (rqstp-&gt;rq_vers &gt; 2)</div><div class='del'>-		error = nfserr_badhandle;</div><div class='del'>-	if (rqstp-&gt;rq_vers == 4 &amp;&amp; fh-&gt;fh_size == 0)</div><div class='add'>+	error = nfserr_badhandle;</div><div class='add'>+	if (fh-&gt;fh_size == 0)</div><div class='ctx'> 		return nfserr_nofilehandle;</div><div class='ctx'> </div><div class='ctx'> 	if (fh-&gt;fh_version != 1)</div><div class='hunk'>@@ -179,6 +172,8 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	if (fh-&gt;fh_fsid_type == FSID_MAJOR_MINOR) {</div><div class='add'>+		u32 *fsid = fh_fsid(fh);</div><div class='add'>+</div><div class='ctx'> 		/* deprecated, convert to type 3 */</div><div class='ctx'> 		len = key_len(FSID_ENCODE_DEV)/4;</div><div class='ctx'> 		fh-&gt;fh_fsid_type = FSID_ENCODE_DEV;</div><div class='hunk'>@@ -188,15 +183,17 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 		 * confuses sparse, so we must use __force here to</div><div class='ctx'> 		 * keep it from complaining.</div><div class='ctx'> 		 */</div><div class='del'>-		fh-&gt;fh_fsid[0] = new_encode_dev(MKDEV(ntohl((__force __be32)fh-&gt;fh_fsid[0]),</div><div class='del'>-						      ntohl((__force __be32)fh-&gt;fh_fsid[1])));</div><div class='del'>-		fh-&gt;fh_fsid[1] = fh-&gt;fh_fsid[2];</div><div class='add'>+		fsid[0] = new_encode_dev(MKDEV(ntohl((__force __be32)fsid[0]),</div><div class='add'>+					       ntohl((__force __be32)fsid[1])));</div><div class='add'>+		fsid[1] = fsid[2];</div><div class='ctx'> 	}</div><div class='ctx'> 	data_left -= len;</div><div class='ctx'> 	if (data_left &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	exp = rqst_exp_find(rqstp, fh-&gt;fh_fsid_type, fh-&gt;fh_fsid);</div><div class='del'>-	fid = (struct fid *)(fh-&gt;fh_fsid + len);</div><div class='add'>+	exp = rqst_exp_find(rqstp ? &amp;rqstp-&gt;rq_chandle : NULL,</div><div class='add'>+			    net, client, gssclient,</div><div class='add'>+			    fh-&gt;fh_fsid_type, fh_fsid(fh));</div><div class='add'>+	fid = (struct fid *)(fh_fsid(fh) + len);</div><div class='ctx'> </div><div class='ctx'> 	error = nfserr_stale;</div><div class='ctx'> 	if (IS_ERR(exp)) {</div><div class='hunk'>@@ -227,9 +224,8 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 			cap_raise_nfsd_set(new-&gt;cap_effective,</div><div class='ctx'> 					   new-&gt;cap_permitted);</div><div class='ctx'> 		put_cred(override_creds(new));</div><div class='del'>-		put_cred(new);</div><div class='ctx'> 	} else {</div><div class='del'>-		error = nfsd_setuser_and_check_port(rqstp, exp);</div><div class='add'>+		error = nfsd_setuser_and_check_port(rqstp, cred, exp);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -237,9 +233,7 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Look up the dentry using the NFS file handle.</div><div class='ctx'> 	 */</div><div class='del'>-	error = nfserr_stale;</div><div class='del'>-	if (rqstp-&gt;rq_vers &gt; 2)</div><div class='del'>-		error = nfserr_badhandle;</div><div class='add'>+	error = nfserr_badhandle;</div><div class='ctx'> </div><div class='ctx'> 	fileid_type = fh-&gt;fh_fileid_type;</div><div class='ctx'> </div><div class='hunk'>@@ -247,7 +241,7 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 		dentry = dget(exp-&gt;ex_path.dentry);</div><div class='ctx'> 	else {</div><div class='ctx'> 		dentry = exportfs_decode_fh_raw(exp-&gt;ex_path.mnt, fid,</div><div class='del'>-						data_left, fileid_type,</div><div class='add'>+						data_left, fileid_type, 0,</div><div class='ctx'> 						nfsd_acceptable, exp);</div><div class='ctx'> 		if (IS_ERR_OR_NULL(dentry)) {</div><div class='ctx'> 			trace_nfsd_set_fh_dentry_badhandle(rqstp, fhp,</div><div class='hunk'>@@ -275,22 +269,30 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)</div><div class='ctx'> 				dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fhp-&gt;fh_dentry = dentry;</div><div class='del'>-	fhp-&gt;fh_export = exp;</div><div class='del'>-</div><div class='del'>-	switch (rqstp-&gt;rq_vers) {</div><div class='del'>-	case 4:</div><div class='add'>+	switch (fhp-&gt;fh_maxsize) {</div><div class='add'>+	case NFS4_FHSIZE:</div><div class='ctx'> 		if (dentry-&gt;d_sb-&gt;s_export_op-&gt;flags &amp; EXPORT_OP_NOATOMIC_ATTR)</div><div class='ctx'> 			fhp-&gt;fh_no_atomic_attr = true;</div><div class='add'>+		fhp-&gt;fh_64bit_cookies = true;</div><div class='ctx'> 		break;</div><div class='del'>-	case 3:</div><div class='add'>+	case NFS3_FHSIZE:</div><div class='ctx'> 		if (dentry-&gt;d_sb-&gt;s_export_op-&gt;flags &amp; EXPORT_OP_NOWCC)</div><div class='ctx'> 			fhp-&gt;fh_no_wcc = true;</div><div class='add'>+		fhp-&gt;fh_64bit_cookies = true;</div><div class='add'>+		if (exp-&gt;ex_flags &amp; NFSEXP_V4ROOT)</div><div class='add'>+			goto out;</div><div class='ctx'> 		break;</div><div class='del'>-	case 2:</div><div class='add'>+	case NFS_FHSIZE:</div><div class='ctx'> 		fhp-&gt;fh_no_wcc = true;</div><div class='add'>+		if (EX_WGATHER(exp))</div><div class='add'>+			fhp-&gt;fh_use_wgather = true;</div><div class='add'>+		if (exp-&gt;ex_flags &amp; NFSEXP_V4ROOT)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fhp-&gt;fh_dentry = dentry;</div><div class='add'>+	fhp-&gt;fh_export = exp;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='ctx'> 	exp_put(exp);</div><div class='hunk'>@@ -298,41 +300,34 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fh_verify - filehandle lookup and access checking</div><div class='del'>- * @rqstp: pointer to current rpc request</div><div class='add'>+ * __fh_verify - filehandle lookup and access checking</div><div class='add'>+ * @rqstp: RPC transaction context, or NULL</div><div class='add'>+ * @net: net namespace in which to perform the export lookup</div><div class='add'>+ * @cred: RPC user credential</div><div class='add'>+ * @client: RPC auth domain</div><div class='add'>+ * @gssclient: RPC GSS auth domain, or NULL</div><div class='ctx'>  * @fhp: filehandle to be verified</div><div class='ctx'>  * @type: expected type of object pointed to by filehandle</div><div class='ctx'>  * @access: type of access needed to object</div><div class='ctx'>  *</div><div class='del'>- * Look up a dentry from the on-the-wire filehandle, check the client's</div><div class='del'>- * access to the export, and set the current task's credentials.</div><div class='del'>- *</div><div class='del'>- * Regardless of success or failure of fh_verify(), fh_put() should be</div><div class='del'>- * called on @fhp when the caller is finished with the filehandle.</div><div class='del'>- *</div><div class='del'>- * fh_verify() may be called multiple times on a given filehandle, for</div><div class='del'>- * example, when processing an NFSv4 compound.  The first call will look</div><div class='del'>- * up a dentry using the on-the-wire filehandle.  Subsequent calls will</div><div class='del'>- * skip the lookup and just perform the other checks and possibly change</div><div class='del'>- * the current task's credentials.</div><div class='del'>- *</div><div class='del'>- * @type specifies the type of object expected using one of the S_IF*</div><div class='del'>- * constants defined in include/linux/stat.h.  The caller may use zero</div><div class='del'>- * to indicate that it doesn't care, or a negative integer to indicate</div><div class='del'>- * that it expects something not of the given type.</div><div class='del'>- *</div><div class='del'>- * @access is formed from the NFSD_MAY_* constants defined in</div><div class='del'>- * fs/nfsd/vfs.h.</div><div class='add'>+ * See fh_verify() for further descriptions of @fhp, @type, and @access.</div><div class='ctx'>  */</div><div class='del'>-__be32</div><div class='del'>-fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)</div><div class='add'>+static __be32</div><div class='add'>+__fh_verify(struct svc_rqst *rqstp,</div><div class='add'>+	    struct net *net, struct svc_cred *cred,</div><div class='add'>+	    struct auth_domain *client,</div><div class='add'>+	    struct auth_domain *gssclient,</div><div class='add'>+	    struct svc_fh *fhp, umode_t type, int access)</div><div class='ctx'> {</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct svc_export *exp = NULL;</div><div class='add'>+	bool may_bypass_gss = false;</div><div class='ctx'> 	struct dentry	*dentry;</div><div class='ctx'> 	__be32		error;</div><div class='ctx'> </div><div class='ctx'> 	if (!fhp-&gt;fh_dentry) {</div><div class='del'>-		error = nfsd_set_fh_dentry(rqstp, fhp);</div><div class='add'>+		error = nfsd_set_fh_dentry(rqstp, net, cred, client,</div><div class='add'>+					   gssclient, fhp);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -357,25 +352,44 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)</div><div class='ctx'> 	 *	  (for example, if different id-squashing options are in</div><div class='ctx'> 	 *	  effect on the new filesystem).</div><div class='ctx'> 	 */</div><div class='del'>-	error = check_pseudo_root(rqstp, dentry, exp);</div><div class='add'>+	error = check_pseudo_root(dentry, exp);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	error = nfsd_setuser_and_check_port(rqstp, exp);</div><div class='add'>+	error = nfsd_setuser_and_check_port(rqstp, cred, exp);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	error = nfsd_mode_check(rqstp, dentry, type);</div><div class='add'>+	error = nfsd_mode_check(dentry, type);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * pseudoflavor restrictions are not enforced on NLM,</div><div class='del'>-	 * which clients virtually always use auth_sys for,</div><div class='del'>-	 * even while using RPCSEC_GSS for NFS.</div><div class='add'>+	 * If rqstp is NULL, this is a LOCALIO request which will only</div><div class='add'>+	 * ever use a filehandle/credential pair for which access has</div><div class='add'>+	 * been affirmed (by ACCESS or OPEN NFS requests) over the</div><div class='add'>+	 * wire.  Skip both the xprtsec policy and the security flavor</div><div class='add'>+	 * checks.</div><div class='ctx'> 	 */</div><div class='del'>-	if (access &amp; NFSD_MAY_LOCK || access &amp; NFSD_MAY_BYPASS_GSS)</div><div class='del'>-		goto skip_pseudoflavor_check;</div><div class='add'>+	if (!rqstp)</div><div class='add'>+		goto check_permissions;</div><div class='add'>+</div><div class='add'>+	if ((access &amp; NFSD_MAY_NLM) &amp;&amp; (exp-&gt;ex_flags &amp; NFSEXP_NOAUTHNLM))</div><div class='add'>+		/* NLM is allowed to fully bypass authentication */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NLM is allowed to bypass the xprtsec policy check because lockd</div><div class='add'>+	 * doesn't support xprtsec.</div><div class='add'>+	 */</div><div class='add'>+	if (!(access &amp; NFSD_MAY_NLM)) {</div><div class='add'>+		error = check_xprtsec_policy(exp, rqstp);</div><div class='add'>+		if (error)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (access &amp; NFSD_MAY_BYPASS_GSS)</div><div class='add'>+		may_bypass_gss = true;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clients may expect to be able to use auth_sys during mount,</div><div class='ctx'> 	 * even if they use gss for everything else; see section 2.3.2</div><div class='hunk'>@@ -383,22 +397,81 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (access &amp; NFSD_MAY_BYPASS_GSS_ON_ROOT</div><div class='ctx'> 			&amp;&amp; exp-&gt;ex_path.dentry == dentry)</div><div class='del'>-		goto skip_pseudoflavor_check;</div><div class='add'>+		may_bypass_gss = true;</div><div class='ctx'> </div><div class='del'>-	error = check_nfsd_access(exp, rqstp);</div><div class='add'>+	error = check_security_flavor(exp, rqstp, may_bypass_gss);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-skip_pseudoflavor_check:</div><div class='add'>+	svc_xprt_set_valid(rqstp-&gt;rq_xprt);</div><div class='add'>+</div><div class='add'>+check_permissions:</div><div class='ctx'> 	/* Finally, check access permissions. */</div><div class='del'>-	error = nfsd_permission(rqstp, exp, dentry, access);</div><div class='add'>+	error = nfsd_permission(cred, exp, dentry, access);</div><div class='ctx'> out:</div><div class='ctx'> 	trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);</div><div class='ctx'> 	if (error == nfserr_stale)</div><div class='del'>-		nfsd_stats_fh_stale_inc(exp);</div><div class='add'>+		nfsd_stats_fh_stale_inc(nn, exp);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * fh_verify_local - filehandle lookup and access checking</div><div class='add'>+ * @net: net namespace in which to perform the export lookup</div><div class='add'>+ * @cred: RPC user credential</div><div class='add'>+ * @client: RPC auth domain</div><div class='add'>+ * @fhp: filehandle to be verified</div><div class='add'>+ * @type: expected type of object pointed to by filehandle</div><div class='add'>+ * @access: type of access needed to object</div><div class='add'>+ *</div><div class='add'>+ * This API can be used by callers who do not have an RPC</div><div class='add'>+ * transaction context (ie are not running in an nfsd thread).</div><div class='add'>+ *</div><div class='add'>+ * See fh_verify() for further descriptions of @fhp, @type, and @access.</div><div class='add'>+ */</div><div class='add'>+__be32</div><div class='add'>+fh_verify_local(struct net *net, struct svc_cred *cred,</div><div class='add'>+		struct auth_domain *client, struct svc_fh *fhp,</div><div class='add'>+		umode_t type, int access)</div><div class='add'>+{</div><div class='add'>+	return __fh_verify(NULL, net, cred, client, NULL,</div><div class='add'>+			   fhp, type, access);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fh_verify - filehandle lookup and access checking</div><div class='add'>+ * @rqstp: pointer to current rpc request</div><div class='add'>+ * @fhp: filehandle to be verified</div><div class='add'>+ * @type: expected type of object pointed to by filehandle</div><div class='add'>+ * @access: type of access needed to object</div><div class='add'>+ *</div><div class='add'>+ * Look up a dentry from the on-the-wire filehandle, check the client's</div><div class='add'>+ * access to the export, and set the current task's credentials.</div><div class='add'>+ *</div><div class='add'>+ * Regardless of success or failure of fh_verify(), fh_put() should be</div><div class='add'>+ * called on @fhp when the caller is finished with the filehandle.</div><div class='add'>+ *</div><div class='add'>+ * fh_verify() may be called multiple times on a given filehandle, for</div><div class='add'>+ * example, when processing an NFSv4 compound.  The first call will look</div><div class='add'>+ * up a dentry using the on-the-wire filehandle.  Subsequent calls will</div><div class='add'>+ * skip the lookup and just perform the other checks and possibly change</div><div class='add'>+ * the current task's credentials.</div><div class='add'>+ *</div><div class='add'>+ * @type specifies the type of object expected using one of the S_IF*</div><div class='add'>+ * constants defined in include/linux/stat.h.  The caller may use zero</div><div class='add'>+ * to indicate that it doesn't care, or a negative integer to indicate</div><div class='add'>+ * that it expects something not of the given type.</div><div class='add'>+ *</div><div class='add'>+ * @access is formed from the NFSD_MAY_* constants defined in</div><div class='add'>+ * fs/nfsd/vfs.h.</div><div class='add'>+ */</div><div class='add'>+__be32</div><div class='add'>+fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access)</div><div class='add'>+{</div><div class='add'>+	return __fh_verify(rqstp, SVC_NET(rqstp), &amp;rqstp-&gt;rq_cred,</div><div class='add'>+			   rqstp-&gt;rq_client, rqstp-&gt;rq_gssclient,</div><div class='add'>+			   fhp, type, access);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Compose a file handle for an NFS reply.</div><div class='hunk'>@@ -412,7 +485,7 @@ static void _fh_update(struct svc_fh *fhp, struct svc_export *exp,</div><div class='ctx'> {</div><div class='ctx'> 	if (dentry != exp-&gt;ex_path.dentry) {</div><div class='ctx'> 		struct fid *fid = (struct fid *)</div><div class='del'>-			(fhp-&gt;fh_handle.fh_fsid + fhp-&gt;fh_handle.fh_size/4 - 1);</div><div class='add'>+			(fh_fsid(&amp;fhp-&gt;fh_handle) + fhp-&gt;fh_handle.fh_size/4 - 1);</div><div class='ctx'> 		int maxsize = (fhp-&gt;fh_maxsize - fhp-&gt;fh_handle.fh_size)/4;</div><div class='ctx'> 		int fh_flags = (exp-&gt;ex_flags &amp; NFSEXP_NOSUBTREECHECK) ? 0 :</div><div class='ctx'> 				EXPORT_FH_CONNECTABLE;</div><div class='hunk'>@@ -563,7 +636,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,</div><div class='ctx'> 	fhp-&gt;fh_handle.fh_auth_type = 0;</div><div class='ctx'> </div><div class='ctx'> 	mk_fsid(fhp-&gt;fh_handle.fh_fsid_type,</div><div class='del'>-		fhp-&gt;fh_handle.fh_fsid,</div><div class='add'>+		fh_fsid(&amp;fhp-&gt;fh_handle),</div><div class='ctx'> 		ex_dev,</div><div class='ctx'> 		d_inode(exp-&gt;ex_path.dentry)-&gt;i_ino,</div><div class='ctx'> 		exp-&gt;ex_fsid, exp-&gt;ex_uuid);</div><div class='hunk'>@@ -572,7 +645,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,</div><div class='ctx'> 		_fh_update(fhp, exp, dentry);</div><div class='ctx'> 	if (fhp-&gt;fh_handle.fh_fileid_type == FILEID_INVALID) {</div><div class='ctx'> 		fh_put(fhp);</div><div class='del'>-		return nfserr_opnotsupp;</div><div class='add'>+		return nfserr_stale;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -598,7 +671,7 @@ fh_update(struct svc_fh *fhp)</div><div class='ctx'> </div><div class='ctx'> 	_fh_update(fhp, fhp-&gt;fh_export, dentry);</div><div class='ctx'> 	if (fhp-&gt;fh_handle.fh_fileid_type == FILEID_INVALID)</div><div class='del'>-		return nfserr_opnotsupp;</div><div class='add'>+		return nfserr_stale;</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_bad:</div><div class='ctx'> 	printk(KERN_ERR "fh_update: fh not verified!\n");</div><div class='hunk'>@@ -610,6 +683,33 @@ out_negative:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * fh_getattr - Retrieve attributes on a local file</div><div class='add'>+ * @fhp: File handle of target file</div><div class='add'>+ * @stat: Caller-supplied kstat buffer to be filled in</div><div class='add'>+ *</div><div class='add'>+ * Returns nfs_ok on success, otherwise an NFS status code is</div><div class='add'>+ * returned.</div><div class='add'>+ */</div><div class='add'>+__be32 fh_getattr(const struct svc_fh *fhp, struct kstat *stat)</div><div class='add'>+{</div><div class='add'>+	struct path p = {</div><div class='add'>+		.mnt		= fhp-&gt;fh_export-&gt;ex_path.mnt,</div><div class='add'>+		.dentry		= fhp-&gt;fh_dentry,</div><div class='add'>+	};</div><div class='add'>+	struct inode *inode = d_inode(p.dentry);</div><div class='add'>+	u32 request_mask = STATX_BASIC_STATS;</div><div class='add'>+</div><div class='add'>+	if (S_ISREG(inode-&gt;i_mode))</div><div class='add'>+		request_mask |= (STATX_DIOALIGN | STATX_DIO_READ_ALIGN);</div><div class='add'>+</div><div class='add'>+	if (fhp-&gt;fh_maxsize == NFS4_FHSIZE)</div><div class='add'>+		request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE);</div><div class='add'>+</div><div class='add'>+	return nfserrno(vfs_getattr(&amp;p, stat, request_mask,</div><div class='add'>+				    AT_STATX_SYNC_AS_STAT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * fh_fill_pre_attrs - Fill in pre-op attributes</div><div class='ctx'>  * @fhp: file handle to be updated</div><div class='ctx'>  *</div><div class='hunk'>@@ -617,20 +717,18 @@ out_negative:</div><div class='ctx'> __be32 __must_check fh_fill_pre_attrs(struct svc_fh *fhp)</div><div class='ctx'> {</div><div class='ctx'> 	bool v4 = (fhp-&gt;fh_maxsize == NFS4_FHSIZE);</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	struct kstat stat;</div><div class='ctx'> 	__be32 err;</div><div class='ctx'> </div><div class='ctx'> 	if (fhp-&gt;fh_no_wcc || fhp-&gt;fh_pre_saved)</div><div class='ctx'> 		return nfs_ok;</div><div class='ctx'> </div><div class='del'>-	inode = d_inode(fhp-&gt;fh_dentry);</div><div class='ctx'> 	err = fh_getattr(fhp, &amp;stat);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (v4)</div><div class='del'>-		fhp-&gt;fh_pre_change = nfsd4_change_attribute(&amp;stat, inode);</div><div class='add'>+		fhp-&gt;fh_pre_change = nfsd4_change_attribute(&amp;stat);</div><div class='ctx'> </div><div class='ctx'> 	fhp-&gt;fh_pre_mtime = stat.mtime;</div><div class='ctx'> 	fhp-&gt;fh_pre_ctime = stat.ctime;</div><div class='hunk'>@@ -647,7 +745,6 @@ __be32 __must_check fh_fill_pre_attrs(struct svc_fh *fhp)</div><div class='ctx'> __be32 fh_fill_post_attrs(struct svc_fh *fhp)</div><div class='ctx'> {</div><div class='ctx'> 	bool v4 = (fhp-&gt;fh_maxsize == NFS4_FHSIZE);</div><div class='del'>-	struct inode *inode = d_inode(fhp-&gt;fh_dentry);</div><div class='ctx'> 	__be32 err;</div><div class='ctx'> </div><div class='ctx'> 	if (fhp-&gt;fh_no_wcc)</div><div class='hunk'>@@ -663,7 +760,7 @@ __be32 fh_fill_post_attrs(struct svc_fh *fhp)</div><div class='ctx'> 	fhp-&gt;fh_post_saved = true;</div><div class='ctx'> 	if (v4)</div><div class='ctx'> 		fhp-&gt;fh_post_change =</div><div class='del'>-			nfsd4_change_attribute(&amp;fhp-&gt;fh_post_attr, inode);</div><div class='add'>+			nfsd4_change_attribute(&amp;fhp-&gt;fh_post_attr);</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -720,7 +817,7 @@ char * SVCFH_fmt(struct svc_fh *fhp)</div><div class='ctx'> 	struct knfsd_fh *fh = &amp;fhp-&gt;fh_handle;</div><div class='ctx'> 	static char buf[2+1+1+64*3+1];</div><div class='ctx'> </div><div class='del'>-	if (fh-&gt;fh_size &lt; 0 || fh-&gt;fh_size&gt; 64)</div><div class='add'>+	if (fh-&gt;fh_size &gt; 64)</div><div class='ctx'> 		return "bad-fh";</div><div class='ctx'> 	sprintf(buf, "%d: %*ph", fh-&gt;fh_size, fh-&gt;fh_size, fh-&gt;fh_raw);</div><div class='ctx'> 	return buf;</div><div class='hunk'>@@ -754,7 +851,14 @@ enum fsid_source fsid_source(const struct svc_fh *fhp)</div><div class='ctx'> 	return FSIDSOURCE_DEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * nfsd4_change_attribute - Generate an NFSv4 change_attribute value</div><div class='add'>+ * @stat: inode attributes</div><div class='add'>+ *</div><div class='add'>+ * Caller must fill in @stat before calling, typically by invoking</div><div class='add'>+ * vfs_getattr() with STATX_MODE, STATX_CTIME, and STATX_CHANGE_COOKIE.</div><div class='add'>+ * Returns an unsigned 64-bit changeid4 value (RFC 8881 Section 3.2).</div><div class='add'>+ *</div><div class='ctx'>  * We could use i_version alone as the change attribute.  However, i_version</div><div class='ctx'>  * can go backwards on a regular file after an unclean shutdown.  On its own</div><div class='ctx'>  * that doesn't necessarily cause a problem, but if i_version goes backwards</div><div class='hunk'>@@ -771,13 +875,13 @@ enum fsid_source fsid_source(const struct svc_fh *fhp)</div><div class='ctx'>  * assume that the new change attr is always logged to stable storage in some</div><div class='ctx'>  * fashion before the results can be seen.</div><div class='ctx'>  */</div><div class='del'>-u64 nfsd4_change_attribute(const struct kstat *stat, const struct inode *inode)</div><div class='add'>+u64 nfsd4_change_attribute(const struct kstat *stat)</div><div class='ctx'> {</div><div class='ctx'> 	u64 chattr;</div><div class='ctx'> </div><div class='ctx'> 	if (stat-&gt;result_mask &amp; STATX_CHANGE_COOKIE) {</div><div class='ctx'> 		chattr = stat-&gt;change_cookie;</div><div class='del'>-		if (S_ISREG(inode-&gt;i_mode) &amp;&amp;</div><div class='add'>+		if (S_ISREG(stat-&gt;mode) &amp;&amp;</div><div class='ctx'> 		    !(stat-&gt;attributes &amp; STATX_ATTR_CHANGE_MONOTONIC)) {</div><div class='ctx'> 			chattr += (u64)stat-&gt;ctime.tv_sec &lt;&lt; 30;</div><div class='ctx'> 			chattr += stat-&gt;ctime.tv_nsec;</div><div class='head'>diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h<br/>index 6ebdf7ea27bf..5ef7191f8ad8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsfh.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsfh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsfh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfsfh.h</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/nfs4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "export.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The file handle starts with a sequence of four-byte words.</div><div class='ctx'>  * The first word contains a version number (1) and three descriptor bytes</div><div class='hunk'>@@ -49,18 +51,19 @@ struct knfsd_fh {</div><div class='ctx'> 					 * Points to the current size while</div><div class='ctx'> 					 * building a new file handle.</div><div class='ctx'> 					 */</div><div class='del'>-	union {</div><div class='del'>-		char			fh_raw[NFS4_FHSIZE];</div><div class='del'>-		struct {</div><div class='del'>-			u8		fh_version;	/* == 1 */</div><div class='del'>-			u8		fh_auth_type;	/* deprecated */</div><div class='del'>-			u8		fh_fsid_type;</div><div class='del'>-			u8		fh_fileid_type;</div><div class='del'>-			u32		fh_fsid[]; /* flexible-array member */</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='add'>+	u8		fh_raw[NFS4_FHSIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define fh_version		fh_raw[0]</div><div class='add'>+#define fh_auth_type		fh_raw[1]</div><div class='add'>+#define fh_fsid_type		fh_raw[2]</div><div class='add'>+#define fh_fileid_type		fh_raw[3]</div><div class='add'>+</div><div class='add'>+static inline u32 *fh_fsid(const struct knfsd_fh *fh)</div><div class='add'>+{</div><div class='add'>+	return (u32 *)&amp;fh-&gt;fh_raw[4];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline __u32 ino_t_to_u32(ino_t ino)</div><div class='ctx'> {</div><div class='ctx'> 	return (__u32) ino;</div><div class='hunk'>@@ -88,6 +91,8 @@ typedef struct svc_fh {</div><div class='ctx'> 						 * wcc data is not atomic with</div><div class='ctx'> 						 * operation</div><div class='ctx'> 						 */</div><div class='add'>+	bool			fh_use_wgather;	/* NFSv2 wgather option */</div><div class='add'>+	bool			fh_64bit_cookies;/* readdir cookie size */</div><div class='ctx'> 	int			fh_flags;	/* FH flags */</div><div class='ctx'> 	bool			fh_post_saved;	/* post-op attrs saved */</div><div class='ctx'> 	bool			fh_pre_saved;	/* pre-op attrs saved */</div><div class='hunk'>@@ -215,6 +220,9 @@ extern char * SVCFH_fmt(struct svc_fh *fhp);</div><div class='ctx'>  * Function prototypes</div><div class='ctx'>  */</div><div class='ctx'> __be32	fh_verify(struct svc_rqst *, struct svc_fh *, umode_t, int);</div><div class='add'>+__be32	fh_verify_local(struct net *, struct svc_cred *, struct auth_domain *,</div><div class='add'>+			struct svc_fh *, umode_t, int);</div><div class='add'>+__be32	fh_getattr(const struct svc_fh *fhp, struct kstat *stat);</div><div class='ctx'> __be32	fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);</div><div class='ctx'> __be32	fh_update(struct svc_fh *);</div><div class='ctx'> void	fh_put(struct svc_fh *);</div><div class='hunk'>@@ -256,14 +264,51 @@ static inline bool fh_match(const struct knfsd_fh *fh1,</div><div class='ctx'> static inline bool fh_fsid_match(const struct knfsd_fh *fh1,</div><div class='ctx'> 				 const struct knfsd_fh *fh2)</div><div class='ctx'> {</div><div class='add'>+	u32 *fsid1 = fh_fsid(fh1);</div><div class='add'>+	u32 *fsid2 = fh_fsid(fh2);</div><div class='add'>+</div><div class='ctx'> 	if (fh1-&gt;fh_fsid_type != fh2-&gt;fh_fsid_type)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (memcmp(fh1-&gt;fh_fsid, fh2-&gt;fh_fsid, key_len(fh1-&gt;fh_fsid_type)) != 0)</div><div class='add'>+	if (memcmp(fsid1, fsid2, key_len(fh1-&gt;fh_fsid_type)) != 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRC32</div><div class='add'>+/**</div><div class='add'>+ * fh_want_write - Get write access to an export</div><div class='add'>+ * @fhp: File handle of file to be written</div><div class='add'>+ *</div><div class='add'>+ * Caller must invoke fh_drop_write() when its write operation</div><div class='add'>+ * is complete.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if the file handle's export can be written to. Otherwise</div><div class='add'>+ * the export is not prepared for updates, and the returned negative</div><div class='add'>+ * errno value reflects the reason for the failure.</div><div class='add'>+ */</div><div class='add'>+static inline int fh_want_write(struct svc_fh *fhp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fhp-&gt;fh_want_write)</div><div class='add'>+		return 0;</div><div class='add'>+	ret = mnt_want_write(fhp-&gt;fh_export-&gt;ex_path.mnt);</div><div class='add'>+	if (!ret)</div><div class='add'>+		fhp-&gt;fh_want_write = true;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fh_drop_write - Release write access on an export</div><div class='add'>+ * @fhp: File handle of file on which fh_want_write() was previously called</div><div class='add'>+ */</div><div class='add'>+static inline void fh_drop_write(struct svc_fh *fhp)</div><div class='add'>+{</div><div class='add'>+	if (fhp-&gt;fh_want_write) {</div><div class='add'>+		fhp-&gt;fh_want_write = false;</div><div class='add'>+		mnt_drop_write(fhp-&gt;fh_export-&gt;ex_path.mnt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * knfsd_fh_hash - calculate the crc32 hash for the filehandle</div><div class='ctx'>  * @fh - pointer to filehandle</div><div class='hunk'>@@ -275,12 +320,6 @@ static inline u32 knfsd_fh_hash(const struct knfsd_fh *fh)</div><div class='ctx'> {</div><div class='ctx'> 	return ~crc32_le(0xFFFFFFFF, fh-&gt;fh_raw, fh-&gt;fh_size);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline u32 knfsd_fh_hash(const struct knfsd_fh *fh)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fh_clear_pre_post_attrs - Reset pre/post attributes</div><div class='hunk'>@@ -293,8 +332,7 @@ static inline void fh_clear_pre_post_attrs(struct svc_fh *fhp)</div><div class='ctx'> 	fhp-&gt;fh_pre_saved = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 nfsd4_change_attribute(const struct kstat *stat,</div><div class='del'>-			   const struct inode *inode);</div><div class='add'>+u64 nfsd4_change_attribute(const struct kstat *stat);</div><div class='ctx'> __be32 __must_check fh_fill_pre_attrs(struct svc_fh *fhp);</div><div class='ctx'> __be32 fh_fill_post_attrs(struct svc_fh *fhp);</div><div class='ctx'> __be32 __must_check fh_fill_both_attrs(struct svc_fh *fhp);</div><div class='head'>diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c<br/>index a7315928a760..481e789a7697 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsproc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsproc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsproc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfsproc.c</a></div><div class='hunk'>@@ -10,9 +10,35 @@</div><div class='ctx'> #include "cache.h"</div><div class='ctx'> #include "xdr.h"</div><div class='ctx'> #include "vfs.h"</div><div class='add'>+#include "trace.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDDBG_FACILITY		NFSDDBG_PROC</div><div class='ctx'> </div><div class='add'>+static __be32 nfsd_map_status(__be32 status)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case nfs_ok:</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_nofilehandle:</div><div class='add'>+	case nfserr_badhandle:</div><div class='add'>+		status = nfserr_stale;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_wrongsec:</div><div class='add'>+	case nfserr_xdev:</div><div class='add'>+	case nfserr_file_open:</div><div class='add'>+		status = nfserr_acces;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_symlink_not_dir:</div><div class='add'>+		status = nfserr_notdir;</div><div class='add'>+		break;</div><div class='add'>+	case nfserr_symlink:</div><div class='add'>+	case nfserr_wrong_type:</div><div class='add'>+		status = nfserr_inval;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __be32</div><div class='ctx'> nfsd_proc_null(struct svc_rqst *rqstp)</div><div class='ctx'> {</div><div class='hunk'>@@ -29,7 +55,7 @@ nfsd_proc_getattr(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_fhandle *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_attrstat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: GETATTR  %s\n", SVCFH_fmt(&amp;argp-&gt;fh));</div><div class='add'>+	trace_nfsd_vfs_getattr(rqstp, &amp;argp-&gt;fh);</div><div class='ctx'> </div><div class='ctx'> 	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='ctx'> 	resp-&gt;status = fh_verify(rqstp, &amp;resp-&gt;fh, 0,</div><div class='hunk'>@@ -38,6 +64,7 @@ nfsd_proc_getattr(struct svc_rqst *rqstp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -103,12 +130,13 @@ nfsd_proc_setattr(struct svc_rqst *rqstp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	resp-&gt;status = nfsd_setattr(rqstp, fhp, &amp;attrs, 0, (time64_t)0);</div><div class='add'>+	resp-&gt;status = nfsd_setattr(rqstp, fhp, &amp;attrs, NULL);</div><div class='ctx'> 	if (resp-&gt;status != nfs_ok)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -143,6 +171,7 @@ nfsd_proc_lookup(struct svc_rqst *rqstp)</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -164,6 +193,7 @@ nfsd_proc_readlink(struct svc_rqst *rqstp)</div><div class='ctx'> 				     page_address(resp-&gt;page), &amp;resp-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +212,7 @@ nfsd_proc_read(struct svc_rqst *rqstp)</div><div class='ctx'> 		SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='ctx'> 		argp-&gt;count, argp-&gt;offset);</div><div class='ctx'> </div><div class='del'>-	argp-&gt;count = min_t(u32, argp-&gt;count, NFSSVC_MAXBLKSIZE_V2);</div><div class='add'>+	argp-&gt;count = min_t(u32, argp-&gt;count, NFS_MAXDATA);</div><div class='ctx'> 	argp-&gt;count = min_t(u32, argp-&gt;count, rqstp-&gt;rq_res.buflen);</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;pages = rqstp-&gt;rq_next_page;</div><div class='hunk'>@@ -200,6 +230,7 @@ nfsd_proc_read(struct svc_rqst *rqstp)</div><div class='ctx'> 		resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> 	else if (resp-&gt;status == nfserr_jukebox)</div><div class='ctx'> 		set_bit(RQ_DROPME, &amp;rqstp-&gt;rq_flags);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,21 +251,19 @@ nfsd_proc_write(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_writeargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_attrstat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	unsigned long cnt = argp-&gt;len;</div><div class='del'>-	unsigned int nvecs;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("nfsd: WRITE    %s %u bytes at %d\n",</div><div class='ctx'> 		SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='ctx'> 		argp-&gt;len, argp-&gt;offset);</div><div class='ctx'> </div><div class='del'>-	nvecs = svc_fill_write_vector(rqstp, &amp;argp-&gt;payload);</div><div class='del'>-</div><div class='del'>-	resp-&gt;status = nfsd_write(rqstp, fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh),</div><div class='del'>-				  argp-&gt;offset, rqstp-&gt;rq_vec, nvecs,</div><div class='del'>-				  &amp;cnt, NFS_DATA_SYNC, NULL);</div><div class='add'>+	fh_copy(&amp;resp-&gt;fh, &amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd_write(rqstp, &amp;resp-&gt;fh, argp-&gt;offset,</div><div class='add'>+				  &amp;argp-&gt;payload, &amp;cnt, NFS_DATA_SYNC, NULL);</div><div class='ctx'> 	if (resp-&gt;status == nfs_ok)</div><div class='ctx'> 		resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> 	else if (resp-&gt;status == nfserr_jukebox)</div><div class='ctx'> 		set_bit(RQ_DROPME, &amp;rqstp-&gt;rq_flags);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -261,9 +290,6 @@ nfsd_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 	int		hosterr;</div><div class='ctx'> 	dev_t		rdev = 0, wanted = new_decode_dev(attr-&gt;ia_size);</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: CREATE   %s %.*s\n",</div><div class='del'>-		SVCFH_fmt(dirfhp), argp-&gt;len, argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	/* First verify the parent file handle */</div><div class='ctx'> 	resp-&gt;status = fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_EXEC);</div><div class='ctx'> 	if (resp-&gt;status != nfs_ok)</div><div class='hunk'>@@ -280,17 +306,16 @@ nfsd_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dirfhp-&gt;fh_dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	dchild = lookup_one_len(argp-&gt;name, dirfhp-&gt;fh_dentry, argp-&gt;len);</div><div class='add'>+	dchild = start_creating(&amp;nop_mnt_idmap, dirfhp-&gt;fh_dentry,</div><div class='add'>+				&amp;QSTR_LEN(argp-&gt;name, argp-&gt;len));</div><div class='ctx'> 	if (IS_ERR(dchild)) {</div><div class='ctx'> 		resp-&gt;status = nfserrno(PTR_ERR(dchild));</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out_write;</div><div class='ctx'> 	}</div><div class='ctx'> 	fh_init(newfhp, NFS_FHSIZE);</div><div class='ctx'> 	resp-&gt;status = fh_compose(newfhp, dirfhp-&gt;fh_export, dchild, dirfhp);</div><div class='ctx'> 	if (!resp-&gt;status &amp;&amp; d_really_is_negative(dchild))</div><div class='ctx'> 		resp-&gt;status = nfserr_noent;</div><div class='del'>-	dput(dchild);</div><div class='ctx'> 	if (resp-&gt;status) {</div><div class='ctx'> 		if (resp-&gt;status != nfserr_noent)</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -300,7 +325,7 @@ nfsd_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 		 */</div><div class='ctx'> 		resp-&gt;status = nfserr_acces;</div><div class='ctx'> 		if (!newfhp-&gt;fh_dentry) {</div><div class='del'>-			printk(KERN_WARNING </div><div class='add'>+			printk(KERN_WARNING</div><div class='ctx'> 				"nfsd_proc_create: file handle not verified\n");</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -331,10 +356,11 @@ nfsd_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 					 *   echo thing &gt; device-special-file-or-pipe</div><div class='ctx'> 					 * by doing a CREATE with type==0</div><div class='ctx'> 					 */</div><div class='del'>-					resp-&gt;status = nfsd_permission(rqstp,</div><div class='del'>-								 newfhp-&gt;fh_export,</div><div class='del'>-								 newfhp-&gt;fh_dentry,</div><div class='del'>-								 NFSD_MAY_WRITE|NFSD_MAY_LOCAL_ACCESS);</div><div class='add'>+					resp-&gt;status = nfsd_permission(</div><div class='add'>+						&amp;rqstp-&gt;rq_cred,</div><div class='add'>+						newfhp-&gt;fh_export,</div><div class='add'>+						newfhp-&gt;fh_dentry,</div><div class='add'>+						NFSD_MAY_WRITE|NFSD_MAY_LOCAL_ACCESS);</div><div class='ctx'> 					if (resp-&gt;status &amp;&amp; resp-&gt;status != nfserr_rofs)</div><div class='ctx'> 						goto out_unlock;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -381,6 +407,9 @@ nfsd_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 		/* File doesn't exist. Create it and set attrs */</div><div class='ctx'> 		resp-&gt;status = nfsd_create_locked(rqstp, dirfhp, &amp;attrs, type,</div><div class='ctx'> 						  rdev, newfhp);</div><div class='add'>+		/* nfsd_create_locked() unlocked the parent */</div><div class='add'>+		dput(dchild);</div><div class='add'>+		goto out_write;</div><div class='ctx'> 	} else if (type == S_IFREG) {</div><div class='ctx'> 		dprintk("nfsd:   existing %s, valid=%x, size=%ld\n",</div><div class='ctx'> 			argp-&gt;name, attr-&gt;ia_valid, (long) attr-&gt;ia_size);</div><div class='hunk'>@@ -390,12 +419,13 @@ nfsd_proc_create(struct svc_rqst *rqstp)</div><div class='ctx'> 		 */</div><div class='ctx'> 		attr-&gt;ia_valid &amp;= ATTR_SIZE;</div><div class='ctx'> 		if (attr-&gt;ia_valid)</div><div class='del'>-			resp-&gt;status = nfsd_setattr(rqstp, newfhp, &amp;attrs, 0,</div><div class='del'>-						    (time64_t)0);</div><div class='add'>+			resp-&gt;status = nfsd_setattr(rqstp, newfhp, &amp;attrs,</div><div class='add'>+						    NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	inode_unlock(dirfhp-&gt;fh_dentry-&gt;d_inode);</div><div class='add'>+	end_creating(dchild);</div><div class='add'>+out_write:</div><div class='ctx'> 	fh_drop_write(dirfhp);</div><div class='ctx'> done:</div><div class='ctx'> 	fh_put(dirfhp);</div><div class='hunk'>@@ -403,6 +433,7 @@ done:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -412,13 +443,11 @@ nfsd_proc_remove(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_diropargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_stat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: REMOVE   %s %.*s\n", SVCFH_fmt(&amp;argp-&gt;fh),</div><div class='del'>-		argp-&gt;len, argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	/* Unlink. -SIFDIR means file must not be a directory */</div><div class='ctx'> 	resp-&gt;status = nfsd_unlink(rqstp, &amp;argp-&gt;fh, -S_IFDIR,</div><div class='ctx'> 				   argp-&gt;name, argp-&gt;len);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -428,15 +457,11 @@ nfsd_proc_rename(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_renameargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_stat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: RENAME   %s %.*s -&gt; \n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;ffh), argp-&gt;flen, argp-&gt;fname);</div><div class='del'>-	dprintk("nfsd:        -&gt;  %s %.*s\n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;tfh), argp-&gt;tlen, argp-&gt;tname);</div><div class='del'>-</div><div class='ctx'> 	resp-&gt;status = nfsd_rename(rqstp, &amp;argp-&gt;ffh, argp-&gt;fname, argp-&gt;flen,</div><div class='ctx'> 				   &amp;argp-&gt;tfh, argp-&gt;tname, argp-&gt;tlen);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;tfh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -446,17 +471,11 @@ nfsd_proc_link(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_linkargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_stat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: LINK     %s -&gt;\n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;ffh));</div><div class='del'>-	dprintk("nfsd:    %s %.*s\n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;tfh),</div><div class='del'>-		argp-&gt;tlen,</div><div class='del'>-		argp-&gt;tname);</div><div class='del'>-</div><div class='ctx'> 	resp-&gt;status = nfsd_link(rqstp, &amp;argp-&gt;tfh, argp-&gt;tname, argp-&gt;tlen,</div><div class='ctx'> 				 &amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;tfh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,10 +502,6 @@ nfsd_proc_symlink(struct svc_rqst *rqstp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: SYMLINK  %s %.*s -&gt; %.*s\n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;ffh), argp-&gt;flen, argp-&gt;fname,</div><div class='del'>-		argp-&gt;tlen, argp-&gt;tname);</div><div class='del'>-</div><div class='ctx'> 	fh_init(&amp;newfh, NFS_FHSIZE);</div><div class='ctx'> 	resp-&gt;status = nfsd_symlink(rqstp, &amp;argp-&gt;ffh, argp-&gt;fname, argp-&gt;flen,</div><div class='ctx'> 				    argp-&gt;tname, &amp;attrs, &amp;newfh);</div><div class='hunk'>@@ -495,6 +510,7 @@ nfsd_proc_symlink(struct svc_rqst *rqstp)</div><div class='ctx'> 	fh_put(&amp;argp-&gt;ffh);</div><div class='ctx'> 	fh_put(&amp;newfh);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -511,8 +527,6 @@ nfsd_proc_mkdir(struct svc_rqst *rqstp)</div><div class='ctx'> 		.na_iattr	= &amp;argp-&gt;attrs,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: MKDIR    %s %.*s\n", SVCFH_fmt(&amp;argp-&gt;fh), argp-&gt;len, argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	if (resp-&gt;fh.fh_dentry) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"nfsd_proc_mkdir: response already verified??\n");</div><div class='hunk'>@@ -528,6 +542,7 @@ nfsd_proc_mkdir(struct svc_rqst *rqstp)</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;status = fh_getattr(&amp;resp-&gt;fh, &amp;resp-&gt;stat);</div><div class='ctx'> out:</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -540,11 +555,10 @@ nfsd_proc_rmdir(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_diropargs *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_stat *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: RMDIR    %s %.*s\n", SVCFH_fmt(&amp;argp-&gt;fh), argp-&gt;len, argp-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	resp-&gt;status = nfsd_unlink(rqstp, &amp;argp-&gt;fh, S_IFDIR,</div><div class='ctx'> 				   argp-&gt;name, argp-&gt;len);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +577,7 @@ static void nfsd_init_dirlist_pages(struct svc_rqst *rqstp,</div><div class='ctx'> 	buf-&gt;pages = rqstp-&gt;rq_next_page;</div><div class='ctx'> 	rqstp-&gt;rq_next_page++;</div><div class='ctx'> </div><div class='del'>-	xdr_init_encode_pages(xdr, buf, buf-&gt;pages,  NULL);</div><div class='add'>+	xdr_init_encode_pages(xdr, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -576,9 +590,7 @@ nfsd_proc_readdir(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_readdirres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> 	loff_t		offset;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: READDIR  %s %d bytes at %d\n",</div><div class='del'>-		SVCFH_fmt(&amp;argp-&gt;fh),		</div><div class='del'>-		argp-&gt;count, argp-&gt;cookie);</div><div class='add'>+	trace_nfsd_vfs_readdir(rqstp, &amp;argp-&gt;fh, argp-&gt;count, argp-&gt;cookie);</div><div class='ctx'> </div><div class='ctx'> 	nfsd_init_dirlist_pages(rqstp, resp, argp-&gt;count);</div><div class='ctx'> </div><div class='hunk'>@@ -590,6 +602,7 @@ nfsd_proc_readdir(struct svc_rqst *rqstp)</div><div class='ctx'> 	nfssvc_encode_nfscookie(resp, offset);</div><div class='ctx'> </div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -602,11 +615,10 @@ nfsd_proc_statfs(struct svc_rqst *rqstp)</div><div class='ctx'> 	struct nfsd_fhandle *argp = rqstp-&gt;rq_argp;</div><div class='ctx'> 	struct nfsd_statfsres *resp = rqstp-&gt;rq_resp;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: STATFS   %s\n", SVCFH_fmt(&amp;argp-&gt;fh));</div><div class='del'>-</div><div class='ctx'> 	resp-&gt;status = nfsd_statfs(rqstp, &amp;argp-&gt;fh, &amp;resp-&gt;stats,</div><div class='ctx'> 				   NFSD_MAY_BYPASS_GSS_ON_ROOT);</div><div class='ctx'> 	fh_put(&amp;argp-&gt;fh);</div><div class='add'>+	resp-&gt;status = nfsd_map_status(resp-&gt;status);</div><div class='ctx'> 	return rpc_success;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -698,7 +710,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {</div><div class='ctx'> 		.pc_argzero = sizeof(struct nfsd_readargs),</div><div class='ctx'> 		.pc_ressize = sizeof(struct nfsd_readres),</div><div class='ctx'> 		.pc_cachetype = RC_NOCACHE,</div><div class='del'>-		.pc_xdrressize = ST+AT+1+NFSSVC_MAXBLKSIZE_V2/4,</div><div class='add'>+		.pc_xdrressize = ST+AT+1+NFS_MAXDATA/4,</div><div class='ctx'> 		.pc_name = "READ",</div><div class='ctx'> 	},</div><div class='ctx'> 	[NFSPROC_WRITECACHE] = {</div><div class='head'>diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c<br/>index a667802e08e7..b08ae85d53ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfssvc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfssvc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfssvc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfssvc.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/sunrpc/svc_xprt.h&gt;</div><div class='ctx'> #include &lt;linux/lockd/bind.h&gt;</div><div class='ctx'> #include &lt;linux/nfsacl.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;net/addrconf.h&gt;</div><div class='hunk'>@@ -34,7 +35,7 @@</div><div class='ctx'> </div><div class='ctx'> #define NFSDDBG_FACILITY	NFSDDBG_SVC</div><div class='ctx'> </div><div class='del'>-extern struct svc_program	nfsd_program;</div><div class='add'>+atomic_t			nfsd_th_cnt = ATOMIC_INIT(0);</div><div class='ctx'> static int			nfsd(void *vrqstp);</div><div class='ctx'> #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)</div><div class='ctx'> static int			nfsd_acl_rpcbind_set(struct net *,</div><div class='hunk'>@@ -69,18 +70,16 @@ static __be32			nfsd_init_request(struct svc_rqst *,</div><div class='ctx'>  */</div><div class='ctx'> DEFINE_MUTEX(nfsd_mutex);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * nfsd_drc_lock protects nfsd_drc_max_pages and nfsd_drc_pages_used.</div><div class='del'>- * nfsd_drc_max_pages limits the total amount of memory available for</div><div class='del'>- * version 4.1 DRC caches.</div><div class='del'>- * nfsd_drc_pages_used tracks the current version 4.1 DRC memory usage.</div><div class='del'>- */</div><div class='del'>-DEFINE_SPINLOCK(nfsd_drc_lock);</div><div class='del'>-unsigned long	nfsd_drc_max_mem;</div><div class='del'>-unsigned long	nfsd_drc_mem_used;</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+static const struct svc_version *localio_versions[] = {</div><div class='add'>+	[1] = &amp;localio_version1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NFSD_LOCALIO_NRVERS		ARRAY_SIZE(localio_versions)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)</div><div class='del'>-static struct svc_stat	nfsd_acl_svcstats;</div><div class='ctx'> static const struct svc_version *nfsd_acl_version[] = {</div><div class='ctx'> # if defined(CONFIG_NFSD_V2_ACL)</div><div class='ctx'> 	[2] = &amp;nfsd_acl_version2,</div><div class='hunk'>@@ -90,27 +89,12 @@ static const struct svc_version *nfsd_acl_version[] = {</div><div class='ctx'> # endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NFSD_ACL_MINVERS            2</div><div class='add'>+#define NFSD_ACL_MINVERS	2</div><div class='ctx'> #define NFSD_ACL_NRVERS		ARRAY_SIZE(nfsd_acl_version)</div><div class='ctx'> </div><div class='del'>-static struct svc_program	nfsd_acl_program = {</div><div class='del'>-	.pg_prog		= NFS_ACL_PROGRAM,</div><div class='del'>-	.pg_nvers		= NFSD_ACL_NRVERS,</div><div class='del'>-	.pg_vers		= nfsd_acl_version,</div><div class='del'>-	.pg_name		= "nfsacl",</div><div class='del'>-	.pg_class		= "nfsd",</div><div class='del'>-	.pg_stats		= &amp;nfsd_acl_svcstats,</div><div class='del'>-	.pg_authenticate	= &amp;svc_set_client,</div><div class='del'>-	.pg_init_request	= nfsd_acl_init_request,</div><div class='del'>-	.pg_rpcbind_set		= nfsd_acl_rpcbind_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct svc_stat	nfsd_acl_svcstats = {</div><div class='del'>-	.program	= &amp;nfsd_acl_program,</div><div class='del'>-};</div><div class='ctx'> #endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */</div><div class='ctx'> </div><div class='del'>-static const struct svc_version *nfsd_version[] = {</div><div class='add'>+static const struct svc_version *nfsd_version[NFSD_MAXVERS+1] = {</div><div class='ctx'> #if defined(CONFIG_NFSD_V2)</div><div class='ctx'> 	[2] = &amp;nfsd_version2,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -120,99 +104,63 @@ static const struct svc_version *nfsd_version[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NFSD_MINVERS    	2</div><div class='del'>-#define NFSD_NRVERS		ARRAY_SIZE(nfsd_version)</div><div class='del'>-</div><div class='del'>-struct svc_program		nfsd_program = {</div><div class='del'>-#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)</div><div class='del'>-	.pg_next		= &amp;nfsd_acl_program,</div><div class='del'>-#endif</div><div class='add'>+struct svc_program		nfsd_programs[] = {</div><div class='add'>+	{</div><div class='ctx'> 	.pg_prog		= NFS_PROGRAM,		/* program number */</div><div class='del'>-	.pg_nvers		= NFSD_NRVERS,		/* nr of entries in nfsd_version */</div><div class='add'>+	.pg_nvers		= NFSD_MAXVERS+1,	/* nr of entries in nfsd_version */</div><div class='ctx'> 	.pg_vers		= nfsd_version,		/* version table */</div><div class='ctx'> 	.pg_name		= "nfsd",		/* program name */</div><div class='ctx'> 	.pg_class		= "nfsd",		/* authentication class */</div><div class='del'>-	.pg_stats		= &amp;nfsd_svcstats,	/* version table */</div><div class='del'>-	.pg_authenticate	= &amp;svc_set_client,	/* export authentication */</div><div class='add'>+	.pg_authenticate	= svc_set_client,	/* export authentication */</div><div class='ctx'> 	.pg_init_request	= nfsd_init_request,</div><div class='ctx'> 	.pg_rpcbind_set		= nfsd_rpcbind_set,</div><div class='add'>+	},</div><div class='add'>+#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)</div><div class='add'>+	{</div><div class='add'>+	.pg_prog		= NFS_ACL_PROGRAM,</div><div class='add'>+	.pg_nvers		= NFSD_ACL_NRVERS,</div><div class='add'>+	.pg_vers		= nfsd_acl_version,</div><div class='add'>+	.pg_name		= "nfsacl",</div><div class='add'>+	.pg_class		= "nfsd",</div><div class='add'>+	.pg_authenticate	= svc_set_client,</div><div class='add'>+	.pg_init_request	= nfsd_acl_init_request,</div><div class='add'>+	.pg_rpcbind_set		= nfsd_acl_rpcbind_set,</div><div class='add'>+	},</div><div class='add'>+#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	{</div><div class='add'>+	.pg_prog		= NFS_LOCALIO_PROGRAM,</div><div class='add'>+	.pg_nvers		= NFSD_LOCALIO_NRVERS,</div><div class='add'>+	.pg_vers		= localio_versions,</div><div class='add'>+	.pg_name		= "nfslocalio",</div><div class='add'>+	.pg_class		= "nfsd",</div><div class='add'>+	.pg_authenticate	= svc_set_client,</div><div class='add'>+	.pg_init_request	= svc_generic_init_request,</div><div class='add'>+	.pg_rpcbind_set		= svc_generic_rpcbind_set,</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='del'>-nfsd_support_version(int vers)</div><div class='add'>+bool nfsd_support_version(int vers)</div><div class='ctx'> {</div><div class='del'>-	if (vers &gt;= NFSD_MINVERS &amp;&amp; vers &lt; NFSD_NRVERS)</div><div class='add'>+	if (vers &gt;= NFSD_MINVERS &amp;&amp; vers &lt;= NFSD_MAXVERS)</div><div class='ctx'> 		return nfsd_version[vers] != NULL;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool *</div><div class='del'>-nfsd_alloc_versions(void)</div><div class='del'>-{</div><div class='del'>-	bool *vers = kmalloc_array(NFSD_NRVERS, sizeof(bool), GFP_KERNEL);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (vers) {</div><div class='del'>-		/* All compiled versions are enabled by default */</div><div class='del'>-		for (i = 0; i &lt; NFSD_NRVERS; i++)</div><div class='del'>-			vers[i] = nfsd_support_version(i);</div><div class='del'>-	}</div><div class='del'>-	return vers;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool *</div><div class='del'>-nfsd_alloc_minorversions(void)</div><div class='del'>-{</div><div class='del'>-	bool *vers = kmalloc_array(NFSD_SUPPORTED_MINOR_VERSION + 1,</div><div class='del'>-			sizeof(bool), GFP_KERNEL);</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (vers) {</div><div class='del'>-		/* All minor versions are enabled by default */</div><div class='del'>-		for (i = 0; i &lt;= NFSD_SUPPORTED_MINOR_VERSION; i++)</div><div class='del'>-			vers[i] = nfsd_support_version(4);</div><div class='del'>-	}</div><div class='del'>-	return vers;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-nfsd_netns_free_versions(struct nfsd_net *nn)</div><div class='del'>-{</div><div class='del'>-	kfree(nn-&gt;nfsd_versions);</div><div class='del'>-	kfree(nn-&gt;nfsd4_minorversions);</div><div class='del'>-	nn-&gt;nfsd_versions = NULL;</div><div class='del'>-	nn-&gt;nfsd4_minorversions = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nfsd_netns_init_versions(struct nfsd_net *nn)</div><div class='del'>-{</div><div class='del'>-	if (!nn-&gt;nfsd_versions) {</div><div class='del'>-		nn-&gt;nfsd_versions = nfsd_alloc_versions();</div><div class='del'>-		nn-&gt;nfsd4_minorversions = nfsd_alloc_minorversions();</div><div class='del'>-		if (!nn-&gt;nfsd_versions || !nn-&gt;nfsd4_minorversions)</div><div class='del'>-			nfsd_netns_free_versions(nn);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change)</div><div class='ctx'> {</div><div class='del'>-	if (vers &lt; NFSD_MINVERS || vers &gt;= NFSD_NRVERS)</div><div class='add'>+	if (vers &lt; NFSD_MINVERS || vers &gt; NFSD_MAXVERS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	switch(change) {</div><div class='ctx'> 	case NFSD_SET:</div><div class='del'>-		if (nn-&gt;nfsd_versions)</div><div class='del'>-			nn-&gt;nfsd_versions[vers] = nfsd_support_version(vers);</div><div class='add'>+		nn-&gt;nfsd_versions[vers] = nfsd_support_version(vers);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFSD_CLEAR:</div><div class='del'>-		nfsd_netns_init_versions(nn);</div><div class='del'>-		if (nn-&gt;nfsd_versions)</div><div class='del'>-			nn-&gt;nfsd_versions[vers] = false;</div><div class='add'>+		nn-&gt;nfsd_versions[vers] = false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFSD_TEST:</div><div class='del'>-		if (nn-&gt;nfsd_versions)</div><div class='del'>-			return nn-&gt;nfsd_versions[vers];</div><div class='del'>-		fallthrough;</div><div class='add'>+		return nn-&gt;nfsd_versions[vers];</div><div class='ctx'> 	case NFSD_AVAIL:</div><div class='ctx'> 		return nfsd_support_version(vers);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -239,23 +187,16 @@ int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change</div><div class='ctx'> </div><div class='ctx'> 	switch(change) {</div><div class='ctx'> 	case NFSD_SET:</div><div class='del'>-		if (nn-&gt;nfsd4_minorversions) {</div><div class='del'>-			nfsd_vers(nn, 4, NFSD_SET);</div><div class='del'>-			nn-&gt;nfsd4_minorversions[minorversion] =</div><div class='del'>-				nfsd_vers(nn, 4, NFSD_TEST);</div><div class='del'>-		}</div><div class='add'>+		nfsd_vers(nn, 4, NFSD_SET);</div><div class='add'>+		nn-&gt;nfsd4_minorversions[minorversion] =</div><div class='add'>+			nfsd_vers(nn, 4, NFSD_TEST);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFSD_CLEAR:</div><div class='del'>-		nfsd_netns_init_versions(nn);</div><div class='del'>-		if (nn-&gt;nfsd4_minorversions) {</div><div class='del'>-			nn-&gt;nfsd4_minorversions[minorversion] = false;</div><div class='del'>-			nfsd_adjust_nfsd_versions4(nn);</div><div class='del'>-		}</div><div class='add'>+		nn-&gt;nfsd4_minorversions[minorversion] = false;</div><div class='add'>+		nfsd_adjust_nfsd_versions4(nn);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NFSD_TEST:</div><div class='del'>-		if (nn-&gt;nfsd4_minorversions)</div><div class='del'>-			return nn-&gt;nfsd4_minorversions[minorversion];</div><div class='del'>-		return nfsd_vers(nn, 4, NFSD_TEST);</div><div class='add'>+		return nn-&gt;nfsd4_minorversions[minorversion];</div><div class='ctx'> 	case NFSD_AVAIL:</div><div class='ctx'> 		return minorversion &lt;= NFSD_SUPPORTED_MINOR_VERSION &amp;&amp;</div><div class='ctx'> 			nfsd_vers(nn, 4, NFSD_AVAIL);</div><div class='hunk'>@@ -263,6 +204,34 @@ int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool nfsd_net_try_get(struct net *net) __must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	return (nn &amp;&amp; percpu_ref_tryget_live(&amp;nn-&gt;nfsd_net_ref));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfsd_net_put(struct net *net) __must_hold(rcu)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='add'>+</div><div class='add'>+	percpu_ref_put(&amp;nn-&gt;nfsd_net_ref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfsd_net_done(struct percpu_ref *ref)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = container_of(ref, struct nfsd_net, nfsd_net_ref);</div><div class='add'>+</div><div class='add'>+	complete(&amp;nn-&gt;nfsd_net_confirm_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfsd_net_free(struct percpu_ref *ref)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_net *nn = container_of(ref, struct nfsd_net, nfsd_net_ref);</div><div class='add'>+</div><div class='add'>+	complete(&amp;nn-&gt;nfsd_net_free_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Maximum number of nfsd processes</div><div class='ctx'>  */</div><div class='hunk'>@@ -280,27 +249,6 @@ int nfsd_nrthreads(struct net *net)</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfsd_init_socks(struct net *net, const struct cred *cred)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;nn-&gt;nfsd_serv-&gt;sv_permsocks))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	error = svc_xprt_create(nn-&gt;nfsd_serv, "udp", net, PF_INET, NFS_PORT,</div><div class='del'>-				SVC_SOCK_DEFAULTS, cred);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	error = svc_xprt_create(nn-&gt;nfsd_serv, "tcp", net, PF_INET, NFS_PORT,</div><div class='del'>-				SVC_SOCK_DEFAULTS, cred);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nfsd_users = 0;</div><div class='ctx'> </div><div class='ctx'> static int nfsd_startup_generic(void)</div><div class='hunk'>@@ -408,9 +356,12 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred)</div><div class='ctx'> 	ret = nfsd_startup_generic();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = nfsd_init_socks(net, cred);</div><div class='del'>-	if (ret)</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;nn-&gt;nfsd_serv-&gt;sv_permsocks)) {</div><div class='add'>+		pr_warn("NFSD: Failed to start, no listeners configured.\n");</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto out_socks;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (nfsd_needs_lockd(nn) &amp;&amp; !nn-&gt;lockd_up) {</div><div class='ctx'> 		ret = lockd_up(net, cred);</div><div class='hunk'>@@ -427,13 +378,13 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_filecache;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NFSD_V4_2_INTER_SSC</div><div class='add'>+	nfsd4_ssc_init_umount_work(nn);</div><div class='add'>+#endif</div><div class='ctx'> 	ret = nfs4_state_start_net(net);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_reply_cache;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NFSD_V4_2_INTER_SSC</div><div class='del'>-	nfsd4_ssc_init_umount_work(nn);</div><div class='del'>-#endif</div><div class='ctx'> 	nn-&gt;nfsd_net_up = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -455,6 +406,13 @@ static void nfsd_shutdown_net(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> </div><div class='add'>+	if (!nn-&gt;nfsd_net_up)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	percpu_ref_kill_and_confirm(&amp;nn-&gt;nfsd_net_ref, nfsd_net_done);</div><div class='add'>+	wait_for_completion(&amp;nn-&gt;nfsd_net_confirm_done);</div><div class='add'>+</div><div class='add'>+	nfsd_export_flush(net);</div><div class='ctx'> 	nfs4_state_shutdown_net(net);</div><div class='ctx'> 	nfsd_reply_cache_shutdown(nn);</div><div class='ctx'> 	nfsd_file_cache_shutdown_net(net);</div><div class='hunk'>@@ -462,6 +420,10 @@ static void nfsd_shutdown_net(struct net *net)</div><div class='ctx'> 		lockd_down(net);</div><div class='ctx'> 		nn-&gt;lockd_up = false;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;nn-&gt;nfsd_net_free_done);</div><div class='add'>+	percpu_ref_exit(&amp;nn-&gt;nfsd_net_ref);</div><div class='add'>+</div><div class='ctx'> 	nn-&gt;nfsd_net_up = false;</div><div class='ctx'> 	nfsd_shutdown_generic();</div><div class='ctx'> }</div><div class='hunk'>@@ -541,6 +503,8 @@ void nfsd_destroy_serv(struct net *net)</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct svc_serv *serv = nn-&gt;nfsd_serv;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;nfsd_mutex);</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;nfsd_notifier_lock);</div><div class='ctx'> 	nn-&gt;nfsd_serv = NULL;</div><div class='ctx'> 	spin_unlock(&amp;nfsd_notifier_lock);</div><div class='hunk'>@@ -553,20 +517,14 @@ void nfsd_destroy_serv(struct net *net)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	svc_xprt_destroy_all(serv, net);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * write_ports can create the server without actually starting</div><div class='del'>-	 * any threads--if we get shut down before any threads are</div><div class='add'>+	 * any threads.  If we get shut down before any threads are</div><div class='ctx'> 	 * started, then nfsd_destroy_serv will be run before any of this</div><div class='ctx'> 	 * other initialization has been done except the rpcb information.</div><div class='ctx'> 	 */</div><div class='del'>-	svc_rpcb_cleanup(serv, net);</div><div class='del'>-	if (!nn-&gt;nfsd_net_up)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='add'>+	svc_xprt_destroy_all(serv, net, true);</div><div class='ctx'> 	nfsd_shutdown_net(net);</div><div class='del'>-	nfsd_export_flush(net);</div><div class='ctx'> 	svc_destroy(&amp;serv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -574,11 +532,11 @@ void nfsd_reset_versions(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NFSD_NRVERS; i++)</div><div class='add'>+	for (i = 0; i &lt;= NFSD_MAXVERS; i++)</div><div class='ctx'> 		if (nfsd_vers(nn, i, NFSD_TEST))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NFSD_NRVERS; i++)</div><div class='add'>+	for (i = 0; i &lt;= NFSD_MAXVERS; i++)</div><div class='ctx'> 		if (i != 4)</div><div class='ctx'> 			nfsd_vers(nn, i, NFSD_SET);</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -588,27 +546,6 @@ void nfsd_reset_versions(struct nfsd_net *nn)</div><div class='ctx'> 		}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Each session guarantees a negotiated per slot memory cache for replies</div><div class='del'>- * which in turn consumes memory beyond the v2/v3/v4.0 server. A dedicated</div><div class='del'>- * NFSv4.1 server might want to use more memory for a DRC than a machine</div><div class='del'>- * with mutiple services.</div><div class='del'>- *</div><div class='del'>- * Impose a hard limit on the number of pages for the DRC which varies</div><div class='del'>- * according to the machines free pages. This is of course only a default.</div><div class='del'>- *</div><div class='del'>- * For now this is a #defined shift which could be under admin control</div><div class='del'>- * in the future.</div><div class='del'>- */</div><div class='del'>-static void set_max_drc(void)</div><div class='del'>-{</div><div class='del'>-	#define NFSD_DRC_SIZE_SHIFT	7</div><div class='del'>-	nfsd_drc_max_mem = (nr_free_buffer_pages()</div><div class='del'>-					&gt;&gt; NFSD_DRC_SIZE_SHIFT) * PAGE_SIZE;</div><div class='del'>-	nfsd_drc_mem_used = 0;</div><div class='del'>-	dprintk("%s nfsd_drc_max_mem %lu \n", __func__, nfsd_drc_max_mem);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nfsd_get_default_max_blksize(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sysinfo i;</div><div class='hunk'>@@ -624,7 +561,7 @@ static int nfsd_get_default_max_blksize(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	target &gt;&gt;= 12;</div><div class='ctx'> </div><div class='del'>-	ret = NFSSVC_MAXBLKSIZE;</div><div class='add'>+	ret = NFSSVC_DEFBLKSIZE;</div><div class='ctx'> 	while (ret &gt; target &amp;&amp; ret &gt;= 8*1024*2)</div><div class='ctx'> 		ret /= 2;</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -648,9 +585,11 @@ void nfsd_shutdown_threads(struct net *net)</div><div class='ctx'> 	mutex_unlock(&amp;nfsd_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool i_am_nfsd(void)</div><div class='add'>+struct svc_rqst *nfsd_current_rqst(void)</div><div class='ctx'> {</div><div class='del'>-	return kthread_func(current) == nfsd;</div><div class='add'>+	if (kthread_func(current) == nfsd)</div><div class='add'>+		return kthread_data(current);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nfsd_create_serv(struct net *net)</div><div class='hunk'>@@ -663,25 +602,31 @@ int nfsd_create_serv(struct net *net)</div><div class='ctx'> 	if (nn-&gt;nfsd_serv)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	error = percpu_ref_init(&amp;nn-&gt;nfsd_net_ref, nfsd_net_free,</div><div class='add'>+				0, GFP_KERNEL);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	init_completion(&amp;nn-&gt;nfsd_net_free_done);</div><div class='add'>+	init_completion(&amp;nn-&gt;nfsd_net_confirm_done);</div><div class='add'>+</div><div class='ctx'> 	if (nfsd_max_blksize == 0)</div><div class='ctx'> 		nfsd_max_blksize = nfsd_get_default_max_blksize();</div><div class='ctx'> 	nfsd_reset_versions(nn);</div><div class='del'>-	serv = svc_create_pooled(&amp;nfsd_program, nfsd_max_blksize, nfsd);</div><div class='add'>+	serv = svc_create_pooled(nfsd_programs, ARRAY_SIZE(nfsd_programs),</div><div class='add'>+				 &amp;nn-&gt;nfsd_svcstats,</div><div class='add'>+				 nfsd_max_blksize, nfsd);</div><div class='ctx'> 	if (serv == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	serv-&gt;sv_maxconn = nn-&gt;max_connections;</div><div class='ctx'> 	error = svc_bind(serv, net);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		svc_destroy(&amp;serv);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock(&amp;nfsd_notifier_lock);</div><div class='del'>-	nn-&gt;nfsd_info.mutex = &amp;nfsd_mutex;</div><div class='ctx'> 	nn-&gt;nfsd_serv = serv;</div><div class='ctx'> 	spin_unlock(&amp;nfsd_notifier_lock);</div><div class='ctx'> </div><div class='del'>-	set_max_drc();</div><div class='ctx'> 	/* check if the notifier is already set */</div><div class='ctx'> 	if (atomic_inc_return(&amp;nfsd_notifier_refcount) == 1) {</div><div class='ctx'> 		register_inetaddr_notifier(&amp;nfsd_inetaddr_notifier);</div><div class='hunk'>@@ -711,10 +656,23 @@ int nfsd_get_nrthreads(int n, int *nthreads, struct net *net)</div><div class='ctx'> </div><div class='ctx'> 	if (serv)</div><div class='ctx'> 		for (i = 0; i &lt; serv-&gt;sv_nrpools &amp;&amp; i &lt; n; i++)</div><div class='del'>-			nthreads[i] = atomic_read(&amp;serv-&gt;sv_pools[i].sp_nrthreads);</div><div class='add'>+			nthreads[i] = serv-&gt;sv_pools[i].sp_nrthreads;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nfsd_set_nrthreads - set the number of running threads in the net's service</div><div class='add'>+ * @n: number of array members in @nthreads</div><div class='add'>+ * @nthreads: array of thread counts for each pool</div><div class='add'>+ * @net: network namespace to operate within</div><div class='add'>+ *</div><div class='add'>+ * This function alters the number of running threads for the given network</div><div class='add'>+ * namespace in each pool. If passed an array longer then the number of pools</div><div class='add'>+ * the extra pool settings are ignored. If passed an array shorter than the</div><div class='add'>+ * number of pools, the missing values are interpreted as 0's.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or a negative errno on error.</div><div class='add'>+ */</div><div class='ctx'> int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -722,11 +680,18 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!mutex_is_locked(&amp;nfsd_mutex));</div><div class='add'>+	lockdep_assert_held(&amp;nfsd_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (nn-&gt;nfsd_serv == NULL || n &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Special case: When n == 1, pass in NULL for the pool, so that the</div><div class='add'>+	 * change is distributed equally among them.</div><div class='add'>+	 */</div><div class='add'>+	if (n == 1)</div><div class='add'>+		return svc_set_num_threads(nn-&gt;nfsd_serv, NULL, nthreads[0]);</div><div class='add'>+</div><div class='ctx'> 	if (n &gt; nn-&gt;nfsd_serv-&gt;sv_nrpools)</div><div class='ctx'> 		n = nn-&gt;nfsd_serv-&gt;sv_nrpools;</div><div class='ctx'> </div><div class='hunk'>@@ -749,47 +714,50 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * There must always be a thread in pool 0; the admin</div><div class='del'>-	 * can't shut down NFS completely using pool_threads.</div><div class='del'>-	 */</div><div class='del'>-	if (nthreads[0] == 0)</div><div class='del'>-		nthreads[0] = 1;</div><div class='del'>-</div><div class='ctx'> 	/* apply the new numbers */</div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='ctx'> 		err = svc_set_num_threads(nn-&gt;nfsd_serv,</div><div class='ctx'> 					  &amp;nn-&gt;nfsd_serv-&gt;sv_pools[i],</div><div class='ctx'> 					  nthreads[i]);</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Anything undefined in array is considered to be 0 */</div><div class='add'>+	for (i = n; i &lt; nn-&gt;nfsd_serv-&gt;sv_nrpools; ++i) {</div><div class='add'>+		err = svc_set_num_threads(nn-&gt;nfsd_serv,</div><div class='add'>+					  &amp;nn-&gt;nfsd_serv-&gt;sv_pools[i],</div><div class='add'>+					  0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Adjust the number of threads and return the new number of threads.</div><div class='del'>- * This is also the function that starts the server if necessary, if</div><div class='del'>- * this is the first time nrservs is nonzero.</div><div class='add'>+/**</div><div class='add'>+ * nfsd_svc: start up or shut down the nfsd server</div><div class='add'>+ * @n: number of array members in @nthreads</div><div class='add'>+ * @nthreads: array of thread counts for each pool</div><div class='add'>+ * @net: network namespace to operate within</div><div class='add'>+ * @cred: credentials to use for xprt creation</div><div class='add'>+ * @scope: server scope value (defaults to nodename)</div><div class='add'>+ *</div><div class='add'>+ * Adjust the number of threads in each pool and return the new</div><div class='add'>+ * total number of threads in the service.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-nfsd_svc(int nrservs, struct net *net, const struct cred *cred)</div><div class='add'>+nfsd_svc(int n, int *nthreads, struct net *net, const struct cred *cred, const char *scope)</div><div class='ctx'> {</div><div class='ctx'> 	int	error;</div><div class='ctx'> 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	struct svc_serv *serv;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;nfsd_mutex);</div><div class='del'>-	dprintk("nfsd: creating service\n");</div><div class='add'>+	lockdep_assert_held(&amp;nfsd_mutex);</div><div class='ctx'> </div><div class='del'>-	nrservs = max(nrservs, 0);</div><div class='del'>-	nrservs = min(nrservs, NFSD_MAXSERVS);</div><div class='del'>-	error = 0;</div><div class='del'>-</div><div class='del'>-	if (nrservs == 0 &amp;&amp; nn-&gt;nfsd_serv == NULL)</div><div class='del'>-		goto out;</div><div class='add'>+	dprintk("nfsd: creating service\n");</div><div class='ctx'> </div><div class='del'>-	strscpy(nn-&gt;nfsd_name, utsname()-&gt;nodename,</div><div class='add'>+	strscpy(nn-&gt;nfsd_name, scope ? scope : utsname()-&gt;nodename,</div><div class='ctx'> 		sizeof(nn-&gt;nfsd_name));</div><div class='ctx'> </div><div class='ctx'> 	error = nfsd_create_serv(net);</div><div class='hunk'>@@ -800,7 +768,7 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)</div><div class='ctx'> 	error = nfsd_startup_net(net, cred);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_put;</div><div class='del'>-	error = svc_set_num_threads(serv, NULL, nrservs);</div><div class='add'>+	error = nfsd_set_nrthreads(n, nthreads, net);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> 	error = serv-&gt;sv_nrthreads;</div><div class='hunk'>@@ -808,7 +776,6 @@ out_put:</div><div class='ctx'> 	if (serv-&gt;sv_nrthreads == 0)</div><div class='ctx'> 		nfsd_destroy_serv(net);</div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;nfsd_mutex);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -889,17 +856,17 @@ nfsd_init_request(struct svc_rqst *rqstp,</div><div class='ctx'> 	if (likely(nfsd_vers(nn, rqstp-&gt;rq_vers, NFSD_TEST)))</div><div class='ctx'> 		return svc_generic_init_request(rqstp, progp, ret);</div><div class='ctx'> </div><div class='del'>-	ret-&gt;mismatch.lovers = NFSD_NRVERS;</div><div class='del'>-	for (i = NFSD_MINVERS; i &lt; NFSD_NRVERS; i++) {</div><div class='add'>+	ret-&gt;mismatch.lovers = NFSD_MAXVERS + 1;</div><div class='add'>+	for (i = NFSD_MINVERS; i &lt;= NFSD_MAXVERS; i++) {</div><div class='ctx'> 		if (nfsd_vers(nn, i, NFSD_TEST)) {</div><div class='ctx'> 			ret-&gt;mismatch.lovers = i;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (ret-&gt;mismatch.lovers == NFSD_NRVERS)</div><div class='add'>+	if (ret-&gt;mismatch.lovers &gt; NFSD_MAXVERS)</div><div class='ctx'> 		return rpc_prog_unavail;</div><div class='ctx'> 	ret-&gt;mismatch.hivers = NFSD_MINVERS;</div><div class='del'>-	for (i = NFSD_NRVERS - 1; i &gt;= NFSD_MINVERS; i--) {</div><div class='add'>+	for (i = NFSD_MAXVERS; i &gt;= NFSD_MINVERS; i--) {</div><div class='ctx'> 		if (nfsd_vers(nn, i, NFSD_TEST)) {</div><div class='ctx'> 			ret-&gt;mismatch.hivers = i;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -921,15 +888,13 @@ nfsd(void *vrqstp)</div><div class='ctx'> </div><div class='ctx'> 	/* At this point, the thread shares current-&gt;fs</div><div class='ctx'> 	 * with the init process. We need to create files with the</div><div class='del'>-	 * umask as defined by the client instead of init's umask. */</div><div class='del'>-	if (unshare_fs_struct() &lt; 0) {</div><div class='del'>-		printk("Unable to start nfsd thread: out of memory\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	 * umask as defined by the client instead of init's umask.</div><div class='add'>+	 */</div><div class='add'>+	svc_thread_init_status(rqstp, unshare_fs_struct());</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;fs-&gt;umask = 0;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;nfsdstats.th_cnt);</div><div class='add'>+	atomic_inc(&amp;nfsd_th_cnt);</div><div class='ctx'> </div><div class='ctx'> 	set_freezable();</div><div class='ctx'> </div><div class='hunk'>@@ -937,22 +902,19 @@ nfsd(void *vrqstp)</div><div class='ctx'> 	 * The main request loop</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (!svc_thread_should_stop(rqstp)) {</div><div class='del'>-		/* Update sv_maxconn if it has changed */</div><div class='del'>-		rqstp-&gt;rq_server-&gt;sv_maxconn = nn-&gt;max_connections;</div><div class='del'>-</div><div class='ctx'> 		svc_recv(rqstp);</div><div class='add'>+		nfsd_file_net_dispose(nn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	atomic_dec(&amp;nfsdstats.th_cnt);</div><div class='add'>+	atomic_dec(&amp;nfsd_th_cnt);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	/* Release the thread */</div><div class='ctx'> 	svc_exit_thread(rqstp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nfsd_dispatch - Process an NFS or NFSACL Request</div><div class='add'>+ * nfsd_dispatch - Process an NFS or NFSACL or LOCALIO Request</div><div class='ctx'>  * @rqstp: incoming request</div><div class='ctx'>  *</div><div class='ctx'>  * This RPC dispatcher integrates the NFS server's duplicate reply cache.</div><div class='hunk'>@@ -1066,10 +1028,3 @@ bool nfssvc_encode_voidres(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-int nfsd_pool_stats_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct nfsd_net *nn = net_generic(inode-&gt;i_sb-&gt;s_fs_info, nfsd_net_id);</div><div class='del'>-</div><div class='del'>-	return svc_pool_stats_open(&amp;nn-&gt;nfsd_info, file);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c<br/>index 5777f40c7353..fc262ceafca9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsxdr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/nfsxdr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/nfsxdr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/nfsxdr.c</a></div><div class='hunk'>@@ -336,7 +336,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 	/* opaque data */</div><div class='ctx'> 	if (xdr_stream_decode_u32(xdr, &amp;args-&gt;len) &lt; 0)</div><div class='ctx'> 		return false;</div><div class='del'>-	if (args-&gt;len &gt; NFSSVC_MAXBLKSIZE_V2)</div><div class='add'>+	if (args-&gt;len &gt; NFS_MAXDATA)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return xdr_stream_subsegment(xdr, &amp;args-&gt;payload, args-&gt;len);</div><div class='hunk'>@@ -540,7 +540,7 @@ nfssvc_encode_statfsres(struct svc_rqst *rqstp, struct xdr_stream *xdr)</div><div class='ctx'> 		p = xdr_reserve_space(xdr, XDR_UNIT * 5);</div><div class='ctx'> 		if (!p)</div><div class='ctx'> 			return false;</div><div class='del'>-		*p++ = cpu_to_be32(NFSSVC_MAXBLKSIZE_V2);</div><div class='add'>+		*p++ = cpu_to_be32(NFS_MAXDATA);</div><div class='ctx'> 		*p++ = cpu_to_be32(stat-&gt;f_bsize);</div><div class='ctx'> 		*p++ = cpu_to_be32(stat-&gt;f_blocks);</div><div class='ctx'> 		*p++ = cpu_to_be32(stat-&gt;f_bfree);</div><div class='head'>diff --git a/fs/nfsd/pnfs.h b/fs/nfsd/pnfs.h<br/>index de1e0dfed06a..db9af780438b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/pnfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/pnfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/pnfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/pnfs.h</a></div><div class='hunk'>@@ -29,15 +29,17 @@ struct nfsd4_layout_ops {</div><div class='ctx'> 	__be32 (*encode_getdeviceinfo)(struct xdr_stream *xdr,</div><div class='ctx'> 			const struct nfsd4_getdeviceinfo *gdevp);</div><div class='ctx'> </div><div class='del'>-	__be32 (*proc_layoutget)(struct inode *, const struct svc_fh *fhp,</div><div class='del'>-			struct nfsd4_layoutget *lgp);</div><div class='add'>+	__be32 (*proc_layoutget)(struct svc_rqst *rqstp, struct inode *inode,</div><div class='add'>+			const struct svc_fh *fhp, struct nfsd4_layoutget *lgp);</div><div class='ctx'> 	__be32 (*encode_layoutget)(struct xdr_stream *xdr,</div><div class='ctx'> 			const struct nfsd4_layoutget *lgp);</div><div class='ctx'> </div><div class='ctx'> 	__be32 (*proc_layoutcommit)(struct inode *inode,</div><div class='add'>+			struct svc_rqst *rqstp,</div><div class='ctx'> 			struct nfsd4_layoutcommit *lcp);</div><div class='ctx'> </div><div class='del'>-	void (*fence_client)(struct nfs4_layout_stateid *ls);</div><div class='add'>+	void (*fence_client)(struct nfs4_layout_stateid *ls,</div><div class='add'>+			     struct nfsd_file *file);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct nfsd4_layout_ops *nfsd4_layout_ops[];</div><div class='hunk'>@@ -72,11 +74,13 @@ void nfsd4_setup_layout_type(struct svc_export *exp);</div><div class='ctx'> void nfsd4_return_all_client_layouts(struct nfs4_client *);</div><div class='ctx'> void nfsd4_return_all_file_layouts(struct nfs4_client *clp,</div><div class='ctx'> 		struct nfs4_file *fp);</div><div class='add'>+void nfsd4_close_layout(struct nfs4_layout_stateid *ls);</div><div class='ctx'> int nfsd4_init_pnfs(void);</div><div class='ctx'> void nfsd4_exit_pnfs(void);</div><div class='ctx'> #else</div><div class='ctx'> struct nfs4_client;</div><div class='ctx'> struct nfs4_file;</div><div class='add'>+struct nfs4_layout_stateid;</div><div class='ctx'> </div><div class='ctx'> static inline void nfsd4_setup_layout_type(struct svc_export *exp)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,6 +93,9 @@ static inline void nfsd4_return_all_file_layouts(struct nfs4_client *clp,</div><div class='ctx'> 		struct nfs4_file *fp)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline void nfsd4_close_layout(struct nfs4_layout_stateid *ls)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline void nfsd4_exit_pnfs(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h<br/>index 41bdc913fa71..b052c1effdc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/state.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/state.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/state.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/state.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #ifndef _NFSD4_STATE_H</div><div class='ctx'> #define _NFSD4_STATE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/svc_xprt.h&gt;</div><div class='hunk'>@@ -64,21 +65,43 @@ typedef struct {</div><div class='ctx'> 	refcount_t		cs_count;</div><div class='ctx'> } copy_stateid_t;</div><div class='ctx'> </div><div class='add'>+struct nfsd4_referring_call {</div><div class='add'>+	struct list_head	__list;</div><div class='add'>+</div><div class='add'>+	u32			rc_sequenceid;</div><div class='add'>+	u32			rc_slotid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nfsd4_referring_call_list {</div><div class='add'>+	struct list_head	__list;</div><div class='add'>+</div><div class='add'>+	struct nfs4_sessionid	rcl_sessionid;</div><div class='add'>+	int			__nr_referring_calls;</div><div class='add'>+	struct list_head	rcl_referring_calls;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nfsd4_callback {</div><div class='ctx'> 	struct nfs4_client *cb_clp;</div><div class='ctx'> 	struct rpc_message cb_msg;</div><div class='add'>+#define NFSD4_CALLBACK_RUNNING		(0)</div><div class='add'>+#define NFSD4_CALLBACK_WAKE		(1)</div><div class='add'>+#define NFSD4_CALLBACK_REQUEUE		(2)</div><div class='add'>+	unsigned long cb_flags;</div><div class='ctx'> 	const struct nfsd4_callback_ops *cb_ops;</div><div class='ctx'> 	struct work_struct cb_work;</div><div class='ctx'> 	int cb_seq_status;</div><div class='ctx'> 	int cb_status;</div><div class='del'>-	bool cb_need_restart;</div><div class='del'>-	bool cb_holds_slot;</div><div class='add'>+	int cb_held_slot;</div><div class='add'>+</div><div class='add'>+	int cb_nr_referring_call_list;</div><div class='add'>+	struct list_head cb_referring_call_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfsd4_callback_ops {</div><div class='ctx'> 	void (*prepare)(struct nfsd4_callback *);</div><div class='ctx'> 	int (*done)(struct nfsd4_callback *, struct rpc_task *);</div><div class='ctx'> 	void (*release)(struct nfsd4_callback *);</div><div class='add'>+	uint32_t opcode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -88,17 +111,36 @@ struct nfsd4_callback_ops {</div><div class='ctx'>  */</div><div class='ctx'> struct nfs4_stid {</div><div class='ctx'> 	refcount_t		sc_count;</div><div class='del'>-#define NFS4_OPEN_STID 1</div><div class='del'>-#define NFS4_LOCK_STID 2</div><div class='del'>-#define NFS4_DELEG_STID 4</div><div class='del'>-/* For an open stateid kept around *only* to process close replays: */</div><div class='del'>-#define NFS4_CLOSED_STID 8</div><div class='add'>+</div><div class='add'>+	/* A new stateid is added to the cl_stateids idr early before it</div><div class='add'>+	 * is fully initialised.  Its sc_type is then zero.  After</div><div class='add'>+	 * initialisation the sc_type it set under cl_lock, and then</div><div class='add'>+	 * never changes.</div><div class='add'>+	 */</div><div class='add'>+#define SC_TYPE_OPEN		BIT(0)</div><div class='add'>+#define SC_TYPE_LOCK		BIT(1)</div><div class='add'>+#define SC_TYPE_DELEG		BIT(2)</div><div class='add'>+#define SC_TYPE_LAYOUT		BIT(3)</div><div class='add'>+	unsigned short		sc_type;</div><div class='add'>+</div><div class='add'>+/* state_lock protects sc_status for delegation stateids.</div><div class='add'>+ * -&gt;cl_lock protects sc_status for open and lock stateids.</div><div class='add'>+ * -&gt;st_mutex also protect sc_status for open stateids.</div><div class='add'>+ * -&gt;ls_lock protects sc_status for layout stateids.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * For an open stateid kept around *only* to process close replays.</div><div class='add'>+ * For deleg stateid, kept in idr until last reference is dropped.</div><div class='add'>+ */</div><div class='add'>+#define SC_STATUS_CLOSED	BIT(0)</div><div class='ctx'> /* For a deleg stateid kept around only to process free_stateid's: */</div><div class='del'>-#define NFS4_REVOKED_DELEG_STID 16</div><div class='del'>-#define NFS4_CLOSED_DELEG_STID 32</div><div class='del'>-#define NFS4_LAYOUT_STID 64</div><div class='add'>+#define SC_STATUS_REVOKED	BIT(1)</div><div class='add'>+#define SC_STATUS_ADMIN_REVOKED	BIT(2)</div><div class='add'>+#define SC_STATUS_FREEABLE	BIT(3)</div><div class='add'>+#define SC_STATUS_FREED		BIT(4)</div><div class='add'>+	unsigned short		sc_status;</div><div class='add'>+</div><div class='ctx'> 	struct list_head	sc_cp_list;</div><div class='del'>-	unsigned char		sc_type;</div><div class='ctx'> 	stateid_t		sc_stateid;</div><div class='ctx'> 	spinlock_t		sc_lock;</div><div class='ctx'> 	struct nfs4_client	*sc_client;</div><div class='hunk'>@@ -118,6 +160,36 @@ struct nfs4_cpntf_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * RFC 7862 Section 4.8 states:</div><div class='add'>+ *</div><div class='add'>+ * | A copy offload stateid will be valid until either (A) the client</div><div class='add'>+ * | or server restarts or (B) the client returns the resource by</div><div class='add'>+ * | issuing an OFFLOAD_CANCEL operation or the client replies to a</div><div class='add'>+ * | CB_OFFLOAD operation.</div><div class='add'>+ *</div><div class='add'>+ * Because a client might not reply to a CB_OFFLOAD, or a reply</div><div class='add'>+ * might get lost due to connection loss, NFSD purges async copy</div><div class='add'>+ * state after a short period to prevent it from accumulating</div><div class='add'>+ * over time.</div><div class='add'>+ */</div><div class='add'>+#define NFSD_COPY_INITIAL_TTL 10</div><div class='add'>+</div><div class='add'>+struct nfs4_cb_fattr {</div><div class='add'>+	struct nfsd4_callback ncf_getattr;</div><div class='add'>+	u32 ncf_cb_status;</div><div class='add'>+</div><div class='add'>+	/* from CB_GETATTR reply */</div><div class='add'>+	u64 ncf_cb_change;</div><div class='add'>+	u64 ncf_cb_fsize;</div><div class='add'>+	struct timespec64 ncf_cb_mtime;</div><div class='add'>+	struct timespec64 ncf_cb_atime;</div><div class='add'>+</div><div class='add'>+	bool ncf_file_modified;</div><div class='add'>+	u64 ncf_initial_cinfo;</div><div class='add'>+	u64 ncf_cur_fsize;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Represents a delegation stateid. The nfs4_client holds references to these</div><div class='ctx'>  * and they are put when it is being destroyed or when the delegation is</div><div class='ctx'>  * returned by the client:</div><div class='hunk'>@@ -144,14 +216,43 @@ struct nfs4_delegation {</div><div class='ctx'> 	struct list_head	dl_perclnt;</div><div class='ctx'> 	struct list_head	dl_recall_lru;  /* delegation recalled */</div><div class='ctx'> 	struct nfs4_clnt_odstate *dl_clnt_odstate;</div><div class='del'>-	u32			dl_type;</div><div class='ctx'> 	time64_t		dl_time;</div><div class='del'>-/* For recall: */</div><div class='add'>+	u32			dl_type;</div><div class='add'>+	/* For recall: */</div><div class='ctx'> 	int			dl_retries;</div><div class='ctx'> 	struct nfsd4_callback	dl_recall;</div><div class='ctx'> 	bool			dl_recalled;</div><div class='add'>+	bool			dl_written;</div><div class='add'>+	bool			dl_setattr;</div><div class='add'>+</div><div class='add'>+	/* for CB_GETATTR */</div><div class='add'>+	struct nfs4_cb_fattr    dl_cb_fattr;</div><div class='add'>+</div><div class='add'>+	/* For delegated timestamps */</div><div class='add'>+	struct timespec64	dl_atime;</div><div class='add'>+	struct timespec64	dl_mtime;</div><div class='add'>+	struct timespec64	dl_ctime;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool deleg_is_read(u32 dl_type)</div><div class='add'>+{</div><div class='add'>+	return (dl_type == OPEN_DELEGATE_READ || dl_type == OPEN_DELEGATE_READ_ATTRS_DELEG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool deleg_is_write(u32 dl_type)</div><div class='add'>+{</div><div class='add'>+	return (dl_type == OPEN_DELEGATE_WRITE || dl_type == OPEN_DELEGATE_WRITE_ATTRS_DELEG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool deleg_attrs_deleg(u32 dl_type)</div><div class='add'>+{</div><div class='add'>+	return dl_type == OPEN_DELEGATE_READ_ATTRS_DELEG ||</div><div class='add'>+	       dl_type == OPEN_DELEGATE_WRITE_ATTRS_DELEG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool nfsd4_vet_deleg_time(struct timespec64 *cb, const struct timespec64 *orig,</div><div class='add'>+			  const struct timespec64 *now);</div><div class='add'>+</div><div class='ctx'> #define cb_to_delegation(cb) \</div><div class='ctx'> 	container_of(cb, struct nfs4_delegation, dl_recall)</div><div class='ctx'> </div><div class='hunk'>@@ -172,8 +273,11 @@ static inline struct nfs4_delegation *delegstateid(struct nfs4_stid *s)</div><div class='ctx'> 	return container_of(s, struct nfs4_delegation, dl_stid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Maximum number of slots per session. 160 is useful for long haul TCP */</div><div class='del'>-#define NFSD_MAX_SLOTS_PER_SESSION     160</div><div class='add'>+/* Maximum number of slots per session.  This is for sanity-check only.</div><div class='add'>+ * It could be increased if we had a mechanism to shutdown misbehaving clients.</div><div class='add'>+ * A large number can be needed to get good throughput on high-latency servers.</div><div class='add'>+ */</div><div class='add'>+#define NFSD_MAX_SLOTS_PER_SESSION	2048</div><div class='ctx'> /* Maximum  session per slot cache size */</div><div class='ctx'> #define NFSD_SLOT_CACHE_SIZE		2048</div><div class='ctx'> /* Maximum number of NFSD_SLOT_CACHE_SIZE slots per session */</div><div class='hunk'>@@ -185,12 +289,15 @@ struct nfsd4_slot {</div><div class='ctx'> 	u32	sl_seqid;</div><div class='ctx'> 	__be32	sl_status;</div><div class='ctx'> 	struct svc_cred sl_cred;</div><div class='add'>+	u32	sl_index;</div><div class='ctx'> 	u32	sl_datalen;</div><div class='ctx'> 	u16	sl_opcnt;</div><div class='add'>+	u16	sl_generation;</div><div class='ctx'> #define NFSD4_SLOT_INUSE	(1 &lt;&lt; 0)</div><div class='ctx'> #define NFSD4_SLOT_CACHETHIS	(1 &lt;&lt; 1)</div><div class='ctx'> #define NFSD4_SLOT_INITIALIZED	(1 &lt;&lt; 2)</div><div class='ctx'> #define NFSD4_SLOT_CACHED	(1 &lt;&lt; 3)</div><div class='add'>+#define NFSD4_SLOT_REUSED	(1 &lt;&lt; 4)</div><div class='ctx'> 	u8	sl_flags;</div><div class='ctx'> 	char	sl_data[];</div><div class='ctx'> };</div><div class='hunk'>@@ -249,6 +356,9 @@ struct nfsd4_conn {</div><div class='ctx'> 	unsigned char cn_flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Maximum number of slots that nfsd will use in the backchannel */</div><div class='add'>+#define NFSD_BC_SLOT_TABLE_SIZE		(sizeof(u32) * 8)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Representation of a v4.1+ session. These are refcounted in a similar fashion</div><div class='ctx'>  * to the nfs4_client. References are only taken when the server is actively</div><div class='hunk'>@@ -256,20 +366,23 @@ struct nfsd4_conn {</div><div class='ctx'>  */</div><div class='ctx'> struct nfsd4_session {</div><div class='ctx'> 	atomic_t		se_ref;</div><div class='add'>+	spinlock_t		se_lock;</div><div class='add'>+	u32			se_cb_slot_avail; /* bitmap of available slots */</div><div class='add'>+	u32			se_cb_highest_slot;	/* highest slot client wants */</div><div class='add'>+	u32			se_cb_prog;</div><div class='ctx'> 	struct list_head	se_hash;	/* hash by sessionid */</div><div class='ctx'> 	struct list_head	se_perclnt;</div><div class='del'>-/* See SESSION4_PERSIST, etc. for standard flags; this is internal-only: */</div><div class='del'>-#define NFS4_SESSION_DEAD	0x010</div><div class='del'>-	u32			se_flags;</div><div class='add'>+	struct list_head	se_all_sessions;/* global list of sessions */</div><div class='ctx'> 	struct nfs4_client	*se_client;</div><div class='ctx'> 	struct nfs4_sessionid	se_sessionid;</div><div class='ctx'> 	struct nfsd4_channel_attrs se_fchannel;</div><div class='del'>-	struct nfsd4_channel_attrs se_bchannel;</div><div class='ctx'> 	struct nfsd4_cb_sec	se_cb_sec;</div><div class='ctx'> 	struct list_head	se_conns;</div><div class='del'>-	u32			se_cb_prog;</div><div class='del'>-	u32			se_cb_seq_nr;</div><div class='del'>-	struct nfsd4_slot	*se_slots[];	/* forward channel slots */</div><div class='add'>+	u32			se_cb_seq_nr[NFSD_BC_SLOT_TABLE_SIZE];</div><div class='add'>+	struct xarray		se_slots;	/* forward channel slots */</div><div class='add'>+	u16			se_slot_gen;</div><div class='add'>+	bool			se_dead;</div><div class='add'>+	u32			se_target_maxslots;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* formatted contents of nfs4_sessionid */</div><div class='hunk'>@@ -279,7 +392,8 @@ struct nfsd4_sessionid {</div><div class='ctx'> 	u32		reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define HEXDIR_LEN     33 /* hex version of 16 byte md5 of cl_name plus '\0' */</div><div class='add'>+/* Length of MD5 digest as hex, plus terminating '\0' */</div><div class='add'>+#define HEXDIR_LEN	(2 * MD5_DIGEST_SIZE + 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *       State                Meaning                  Where set</div><div class='hunk'>@@ -317,8 +431,9 @@ enum {</div><div class='ctx'>  * 0. If they are not renewed within a lease period, they become eligible for</div><div class='ctx'>  * destruction by the laundromat.</div><div class='ctx'>  *</div><div class='del'>- * These objects can also be destroyed prematurely by the fault injection code,</div><div class='del'>- * or if the client sends certain forms of SETCLIENTID or EXCHANGE_ID updates.</div><div class='add'>+ * These objects can also be destroyed if the client sends certain forms of</div><div class='add'>+ * SETCLIENTID or EXCHANGE_ID operations.</div><div class='add'>+ *</div><div class='ctx'>  * Care is taken *not* to do this however when the objects have an elevated</div><div class='ctx'>  * refcount.</div><div class='ctx'>  *</div><div class='hunk'>@@ -326,7 +441,7 @@ enum {</div><div class='ctx'>  *</div><div class='ctx'>  * o Each nfs4_clients is also hashed by name (the opaque quantity initially</div><div class='ctx'>  *   sent by the client to identify itself).</div><div class='del'>- * 	  </div><div class='add'>+ *</div><div class='ctx'>  * o cl_perclient list is used to ensure no dangling stateowner references</div><div class='ctx'>  *   when we expire the nfs4_client</div><div class='ctx'>  */</div><div class='hunk'>@@ -351,6 +466,7 @@ struct nfs4_client {</div><div class='ctx'> 	clientid_t		cl_clientid;	/* generated by server */</div><div class='ctx'> 	nfs4_verifier		cl_confirm;	/* generated by server */</div><div class='ctx'> 	u32			cl_minorversion;</div><div class='add'>+	atomic_t		cl_admin_revoked; /* count of admin-revoked states */</div><div class='ctx'> 	/* NFSv4.1 client implementation id: */</div><div class='ctx'> 	struct xdr_netobj	cl_nii_domain;</div><div class='ctx'> 	struct xdr_netobj	cl_nii_name;</div><div class='hunk'>@@ -366,8 +482,9 @@ struct nfs4_client {</div><div class='ctx'> #define NFSD4_CLIENT_UPCALL_LOCK	(5)	/* upcall serialization */</div><div class='ctx'> #define NFSD4_CLIENT_CB_FLAG_MASK	(1 &lt;&lt; NFSD4_CLIENT_CB_UPDATE | \</div><div class='ctx'> 					 1 &lt;&lt; NFSD4_CLIENT_CB_KILL)</div><div class='del'>-#define NFSD4_CLIENT_CB_RECALL_ANY	(6)</div><div class='ctx'> 	unsigned long		cl_flags;</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct *cl_callback_wq;</div><div class='ctx'> 	const struct cred	*cl_cb_cred;</div><div class='ctx'> 	struct rpc_clnt		*cl_cb_client;</div><div class='ctx'> 	u32			cl_cb_ident;</div><div class='hunk'>@@ -398,9 +515,6 @@ struct nfs4_client {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct dentry		*cl_nfsd_info_dentry;</div><div class='ctx'> </div><div class='del'>-	/* for nfs41 callbacks */</div><div class='del'>-	/* We currently support a single back channel with a single slot */</div><div class='del'>-	unsigned long		cl_cb_slot_busy;</div><div class='ctx'> 	struct rpc_wait_queue	cl_cb_waitq;	/* backchannel callers may */</div><div class='ctx'> 						/* wait here for slots */</div><div class='ctx'> 	struct net		*net;</div><div class='hunk'>@@ -413,7 +527,6 @@ struct nfs4_client {</div><div class='ctx'> </div><div class='ctx'> 	struct nfsd4_cb_recall_any	*cl_ra;</div><div class='ctx'> 	time64_t		cl_ra_time;</div><div class='del'>-	struct list_head	cl_ra_cblist;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* struct nfs4_client_reset</div><div class='hunk'>@@ -446,7 +559,7 @@ struct nfs4_replay {</div><div class='ctx'> 	unsigned int		rp_buflen;</div><div class='ctx'> 	char			*rp_buf;</div><div class='ctx'> 	struct knfsd_fh		rp_openfh;</div><div class='del'>-	struct mutex		rp_mutex;</div><div class='add'>+	int			rp_locked;</div><div class='ctx'> 	char			rp_ibuf[NFSD4_REPLAY_ISIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -564,6 +677,7 @@ struct nfs4_file {</div><div class='ctx'> 	atomic_t		fi_access[2];</div><div class='ctx'> 	u32			fi_share_deny;</div><div class='ctx'> 	struct nfsd_file	*fi_deleg_file;</div><div class='add'>+	struct nfsd_file	*fi_rdeleg_file;</div><div class='ctx'> 	int			fi_delegees;</div><div class='ctx'> 	struct knfsd_fh		fi_fhandle;</div><div class='ctx'> 	bool			fi_had_conflict;</div><div class='hunk'>@@ -640,6 +754,7 @@ enum nfsd4_cb_op {</div><div class='ctx'> 	NFSPROC4_CLNT_CB_SEQUENCE,</div><div class='ctx'> 	NFSPROC4_CLNT_CB_NOTIFY_LOCK,</div><div class='ctx'> 	NFSPROC4_CLNT_CB_RECALL_ANY,</div><div class='add'>+	NFSPROC4_CLNT_CB_GETATTR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Returns true iff a is later than b: */</div><div class='hunk'>@@ -672,15 +787,15 @@ extern __be32 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,</div><div class='ctx'> 		stateid_t *stateid, int flags, struct nfsd_file **filp,</div><div class='ctx'> 		struct nfs4_stid **cstid);</div><div class='ctx'> __be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,</div><div class='del'>-		     stateid_t *stateid, unsigned char typemask,</div><div class='del'>-		     struct nfs4_stid **s, struct nfsd_net *nn);</div><div class='add'>+			    stateid_t *stateid, unsigned short typemask,</div><div class='add'>+			    unsigned short statusmask,</div><div class='add'>+			    struct nfs4_stid **s, struct nfsd_net *nn);</div><div class='ctx'> struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, struct kmem_cache *slab,</div><div class='ctx'> 				  void (*sc_free)(struct nfs4_stid *));</div><div class='ctx'> int nfs4_init_copy_state(struct nfsd_net *nn, struct nfsd4_copy *copy);</div><div class='ctx'> void nfs4_free_copy_state(struct nfsd4_copy *copy);</div><div class='ctx'> struct nfs4_cpntf_state *nfs4_alloc_init_cpntf_state(struct nfsd_net *nn,</div><div class='ctx'> 			struct nfs4_stid *p_stid);</div><div class='del'>-void nfs4_unhash_stid(struct nfs4_stid *s);</div><div class='ctx'> void nfs4_put_stid(struct nfs4_stid *s);</div><div class='ctx'> void nfs4_inc_and_copy_stateid(stateid_t *dst, struct nfs4_stid *stid);</div><div class='ctx'> void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *);</div><div class='hunk'>@@ -691,13 +806,24 @@ extern __be32 nfs4_check_open_reclaim(struct nfs4_client *);</div><div class='ctx'> extern void nfsd4_probe_callback(struct nfs4_client *clp);</div><div class='ctx'> extern void nfsd4_probe_callback_sync(struct nfs4_client *clp);</div><div class='ctx'> extern void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *);</div><div class='add'>+extern void nfsd41_cb_referring_call(struct nfsd4_callback *cb,</div><div class='add'>+				     struct nfs4_sessionid *sessionid,</div><div class='add'>+				     u32 slotid, u32 seqno);</div><div class='add'>+extern void nfsd41_cb_destroy_referring_call_list(struct nfsd4_callback *cb);</div><div class='ctx'> extern void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,</div><div class='ctx'> 		const struct nfsd4_callback_ops *ops, enum nfsd4_cb_op op);</div><div class='ctx'> extern bool nfsd4_run_cb(struct nfsd4_callback *cb);</div><div class='del'>-extern int nfsd4_create_callback_queue(void);</div><div class='del'>-extern void nfsd4_destroy_callback_queue(void);</div><div class='add'>+</div><div class='add'>+static inline void nfsd4_try_run_cb(struct nfsd4_callback *cb)</div><div class='add'>+{</div><div class='add'>+	if (!test_and_set_bit(NFSD4_CALLBACK_RUNNING, &amp;cb-&gt;cb_flags))</div><div class='add'>+		WARN_ON_ONCE(!nfsd4_run_cb(cb));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void nfsd4_shutdown_callback(struct nfs4_client *);</div><div class='ctx'> extern void nfsd4_shutdown_copy(struct nfs4_client *clp);</div><div class='add'>+void nfsd4_async_copy_reaper(struct nfsd_net *nn);</div><div class='add'>+bool nfsd4_has_active_async_copies(struct nfs4_client *clp);</div><div class='ctx'> extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(struct xdr_netobj name,</div><div class='ctx'> 				struct xdr_netobj princhash, struct nfsd_net *nn);</div><div class='ctx'> extern bool nfs4_has_reclaimed_state(struct xdr_netobj name, struct nfsd_net *nn);</div><div class='hunk'>@@ -714,6 +840,14 @@ static inline void get_nfs4_file(struct nfs4_file *fi)</div><div class='ctx'> }</div><div class='ctx'> struct nfsd_file *find_any_file(struct nfs4_file *f);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NFSD_V4</div><div class='add'>+void nfsd4_revoke_states(struct net *net, struct super_block *sb);</div><div class='add'>+#else</div><div class='add'>+static inline void nfsd4_revoke_states(struct net *net, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* grace period management */</div><div class='ctx'> void nfsd4_end_grace(struct nfsd_net *nn);</div><div class='ctx'> </div><div class='hunk'>@@ -732,5 +866,10 @@ static inline bool try_to_expire_client(struct nfs4_client *clp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern __be32 nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp,</div><div class='del'>-				struct inode *inode);</div><div class='add'>+		struct dentry *dentry, struct nfs4_delegation **pdp);</div><div class='add'>+</div><div class='add'>+struct nfsd4_get_dir_delegation;</div><div class='add'>+struct nfs4_delegation *nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate,</div><div class='add'>+						struct nfsd4_get_dir_delegation *gdd,</div><div class='add'>+						struct nfsd_file *nf);</div><div class='ctx'> #endif   /* NFSD4_STATE_H */</div><div class='head'>diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c<br/>index 12d79f5d4eb1..f7eaf95e20fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/stats.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/stats.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/stats.c</a></div><div class='hunk'>@@ -27,25 +27,22 @@</div><div class='ctx'> </div><div class='ctx'> #include "nfsd.h"</div><div class='ctx'> </div><div class='del'>-struct nfsd_stats	nfsdstats;</div><div class='del'>-struct svc_stat		nfsd_svcstats = {</div><div class='del'>-	.program	= &amp;nfsd_program,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int nfsd_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='add'>+	struct net *net = pde_data(file_inode(seq-&gt;file));</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "rc %lld %lld %lld\nfh %lld 0 0 0 0\nio %lld %lld\n",</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_RC_HITS]),</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_RC_MISSES]),</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_RC_NOCACHE]),</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_FH_STALE]),</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_IO_READ]),</div><div class='del'>-		   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_IO_WRITE]));</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_RC_HITS]),</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_RC_MISSES]),</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_RC_NOCACHE]),</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_FH_STALE]),</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_IO_READ]),</div><div class='add'>+		   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_IO_WRITE]));</div><div class='ctx'> </div><div class='ctx'> 	/* thread usage: */</div><div class='del'>-	seq_printf(seq, "th %u 0", atomic_read(&amp;nfsdstats.th_cnt));</div><div class='add'>+	seq_printf(seq, "th %u 0", atomic_read(&amp;nfsd_th_cnt));</div><div class='ctx'> </div><div class='ctx'> 	/* deprecated thread usage histogram stats */</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++)</div><div class='hunk'>@@ -55,7 +52,7 @@ static int nfsd_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_puts(seq, "\nra 0 0 0 0 0 0 0 0 0 0 0 0\n");</div><div class='ctx'> </div><div class='ctx'> 	/* show my rpc info */</div><div class='del'>-	svc_seq_show(seq, &amp;nfsd_svcstats);</div><div class='add'>+	svc_seq_show(seq, &amp;nn-&gt;nfsd_svcstats);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='ctx'> 	/* Show count for individual nfsv4 operations */</div><div class='hunk'>@@ -63,10 +60,10 @@ static int nfsd_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "proc4ops %u", LAST_NFS4_OP + 1);</div><div class='ctx'> 	for (i = 0; i &lt;= LAST_NFS4_OP; i++) {</div><div class='ctx'> 		seq_printf(seq, " %lld",</div><div class='del'>-			   percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_NFS4_OP(i)]));</div><div class='add'>+			   percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_NFS4_OP(i)]));</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_printf(seq, "\nwdeleg_getattr %lld",</div><div class='del'>-		percpu_counter_sum_positive(&amp;nfsdstats.counter[NFSD_STATS_WDELEG_GETATTR]));</div><div class='add'>+		percpu_counter_sum_positive(&amp;nn-&gt;counter[NFSD_STATS_WDELEG_GETATTR]));</div><div class='ctx'> </div><div class='ctx'> 	seq_putc(seq, '\n');</div><div class='ctx'> #endif</div><div class='hunk'>@@ -76,63 +73,14 @@ static int nfsd_show(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> DEFINE_PROC_SHOW_ATTRIBUTE(nfsd);</div><div class='ctx'> </div><div class='del'>-int nfsd_percpu_counters_init(struct percpu_counter *counters, int num)</div><div class='del'>-{</div><div class='del'>-	int i, err = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; !err &amp;&amp; i &lt; num; i++)</div><div class='del'>-		err = percpu_counter_init(&amp;counters[i], 0, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (; i &gt; 0; i--)</div><div class='del'>-		percpu_counter_destroy(&amp;counters[i-1]);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nfsd_percpu_counters_reset(struct percpu_counter counters[], int num)</div><div class='add'>+struct proc_dir_entry *nfsd_proc_stat_init(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i++)</div><div class='del'>-		percpu_counter_set(&amp;counters[i], 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nfsd_percpu_counters_destroy(struct percpu_counter counters[], int num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='add'>+	struct nfsd_net *nn = net_generic(net, nfsd_net_id);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num; i++)</div><div class='del'>-		percpu_counter_destroy(&amp;counters[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nfsd_stat_counters_init(void)</div><div class='del'>-{</div><div class='del'>-	return nfsd_percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfsd_stat_counters_destroy(void)</div><div class='del'>-{</div><div class='del'>-	nfsd_percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int nfsd_stat_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nfsd_stat_counters_init();</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	svc_proc_register(&amp;init_net, &amp;nfsd_svcstats, &amp;nfsd_proc_ops);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return svc_proc_register(net, &amp;nn-&gt;nfsd_svcstats, &amp;nfsd_proc_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void nfsd_stat_shutdown(void)</div><div class='add'>+void nfsd_proc_stat_shutdown(struct net *net)</div><div class='ctx'> {</div><div class='del'>-	nfsd_stat_counters_destroy();</div><div class='del'>-	svc_proc_unregister(&amp;init_net, "nfsd");</div><div class='add'>+	svc_proc_unregister(net, "nfsd");</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/nfsd/stats.h b/fs/nfsd/stats.h<br/>index 14f50c660b61..e4efb0e4e56d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/stats.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/stats.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/stats.h</a></div><div class='hunk'>@@ -10,94 +10,67 @@</div><div class='ctx'> #include &lt;uapi/linux/nfsd/stats.h&gt;</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='ctx'> </div><div class='add'>+struct proc_dir_entry *nfsd_proc_stat_init(struct net *net);</div><div class='add'>+void nfsd_proc_stat_shutdown(struct net *net);</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	NFSD_STATS_RC_HITS,		/* repcache hits */</div><div class='del'>-	NFSD_STATS_RC_MISSES,		/* repcache misses */</div><div class='del'>-	NFSD_STATS_RC_NOCACHE,		/* uncached reqs */</div><div class='del'>-	NFSD_STATS_FH_STALE,		/* FH stale error */</div><div class='del'>-	NFSD_STATS_IO_READ,		/* bytes returned to read requests */</div><div class='del'>-	NFSD_STATS_IO_WRITE,		/* bytes passed in write requests */</div><div class='del'>-#ifdef CONFIG_NFSD_V4</div><div class='del'>-	NFSD_STATS_FIRST_NFS4_OP,	/* count of individual nfsv4 operations */</div><div class='del'>-	NFSD_STATS_LAST_NFS4_OP = NFSD_STATS_FIRST_NFS4_OP + LAST_NFS4_OP,</div><div class='del'>-#define NFSD_STATS_NFS4_OP(op)	(NFSD_STATS_FIRST_NFS4_OP + (op))</div><div class='del'>-	NFSD_STATS_WDELEG_GETATTR,	/* count of getattr conflict with wdeleg */</div><div class='del'>-#endif</div><div class='del'>-	NFSD_STATS_COUNTERS_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct nfsd_stats {</div><div class='del'>-	struct percpu_counter	counter[NFSD_STATS_COUNTERS_NUM];</div><div class='del'>-</div><div class='del'>-	atomic_t	th_cnt;		/* number of available threads */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct nfsd_stats	nfsdstats;</div><div class='del'>-</div><div class='del'>-extern struct svc_stat		nfsd_svcstats;</div><div class='del'>-</div><div class='del'>-int nfsd_percpu_counters_init(struct percpu_counter *counters, int num);</div><div class='del'>-void nfsd_percpu_counters_reset(struct percpu_counter *counters, int num);</div><div class='del'>-void nfsd_percpu_counters_destroy(struct percpu_counter *counters, int num);</div><div class='del'>-int nfsd_stat_init(void);</div><div class='del'>-void nfsd_stat_shutdown(void);</div><div class='del'>-</div><div class='del'>-static inline void nfsd_stats_rc_hits_inc(void)</div><div class='add'>+static inline void nfsd_stats_rc_hits_inc(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_inc(&amp;nfsdstats.counter[NFSD_STATS_RC_HITS]);</div><div class='add'>+	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_RC_HITS]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nfsd_stats_rc_misses_inc(void)</div><div class='add'>+static inline void nfsd_stats_rc_misses_inc(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_inc(&amp;nfsdstats.counter[NFSD_STATS_RC_MISSES]);</div><div class='add'>+	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_RC_MISSES]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nfsd_stats_rc_nocache_inc(void)</div><div class='add'>+static inline void nfsd_stats_rc_nocache_inc(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_inc(&amp;nfsdstats.counter[NFSD_STATS_RC_NOCACHE]);</div><div class='add'>+	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_RC_NOCACHE]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nfsd_stats_fh_stale_inc(struct svc_export *exp)</div><div class='add'>+static inline void nfsd_stats_fh_stale_inc(struct nfsd_net *nn,</div><div class='add'>+					   struct svc_export *exp)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_inc(&amp;nfsdstats.counter[NFSD_STATS_FH_STALE]);</div><div class='add'>+	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_FH_STALE]);</div><div class='ctx'> 	if (exp &amp;&amp; exp-&gt;ex_stats)</div><div class='ctx'> 		percpu_counter_inc(&amp;exp-&gt;ex_stats-&gt;counter[EXP_STATS_FH_STALE]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nfsd_stats_io_read_add(struct svc_export *exp, s64 amount)</div><div class='add'>+static inline void nfsd_stats_io_read_add(struct nfsd_net *nn,</div><div class='add'>+					  struct svc_export *exp, s64 amount)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_add(&amp;nfsdstats.counter[NFSD_STATS_IO_READ], amount);</div><div class='add'>+	percpu_counter_add(&amp;nn-&gt;counter[NFSD_STATS_IO_READ], amount);</div><div class='ctx'> 	if (exp &amp;&amp; exp-&gt;ex_stats)</div><div class='ctx'> 		percpu_counter_add(&amp;exp-&gt;ex_stats-&gt;counter[EXP_STATS_IO_READ], amount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nfsd_stats_io_write_add(struct svc_export *exp, s64 amount)</div><div class='add'>+static inline void nfsd_stats_io_write_add(struct nfsd_net *nn,</div><div class='add'>+					   struct svc_export *exp, s64 amount)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_add(&amp;nfsdstats.counter[NFSD_STATS_IO_WRITE], amount);</div><div class='add'>+	percpu_counter_add(&amp;nn-&gt;counter[NFSD_STATS_IO_WRITE], amount);</div><div class='ctx'> 	if (exp &amp;&amp; exp-&gt;ex_stats)</div><div class='ctx'> 		percpu_counter_add(&amp;exp-&gt;ex_stats-&gt;counter[EXP_STATS_IO_WRITE], amount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void nfsd_stats_payload_misses_inc(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_NET_PAYLOAD_MISSES]);</div><div class='add'>+	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_PAYLOAD_MISSES]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void nfsd_stats_drc_mem_usage_add(struct nfsd_net *nn, s64 amount)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_add(&amp;nn-&gt;counter[NFSD_NET_DRC_MEM_USAGE], amount);</div><div class='add'>+	percpu_counter_add(&amp;nn-&gt;counter[NFSD_STATS_DRC_MEM_USAGE], amount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void nfsd_stats_drc_mem_usage_sub(struct nfsd_net *nn, s64 amount)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_sub(&amp;nn-&gt;counter[NFSD_NET_DRC_MEM_USAGE], amount);</div><div class='add'>+	percpu_counter_sub(&amp;nn-&gt;counter[NFSD_STATS_DRC_MEM_USAGE], amount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='del'>-static inline void nfsd_stats_wdeleg_getattr_inc(void)</div><div class='add'>+static inline void nfsd_stats_wdeleg_getattr_inc(struct nfsd_net *nn)</div><div class='ctx'> {</div><div class='del'>-	percpu_counter_inc(&amp;nfsdstats.counter[NFSD_STATS_WDELEG_GETATTR]);</div><div class='add'>+	percpu_counter_inc(&amp;nn-&gt;counter[NFSD_STATS_WDELEG_GETATTR]);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* _NFSD_STATS_H */</div><div class='head'>diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h<br/>index d1e8cf079b0f..5ae2a611e57f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/trace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/trace.h</a></div><div class='hunk'>@@ -9,29 +9,50 @@</div><div class='ctx'> #define _NFSD_TRACE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/xprt.h&gt;</div><div class='add'>+#include &lt;trace/misc/fs.h&gt;</div><div class='ctx'> #include &lt;trace/misc/nfs.h&gt;</div><div class='add'>+#include &lt;trace/misc/sunrpc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "export.h"</div><div class='ctx'> #include "nfsfh.h"</div><div class='ctx'> #include "xdr4.h"</div><div class='ctx'> </div><div class='del'>-#define NFSD_TRACE_PROC_RES_FIELDS \</div><div class='add'>+#define NFSD_TRACE_PROC_CALL_FIELDS(r) \</div><div class='add'>+		__field(unsigned int, netns_ino) \</div><div class='add'>+		__field(u32, xid) \</div><div class='add'>+		__sockaddr(server, (r)-&gt;rq_xprt-&gt;xpt_locallen) \</div><div class='add'>+		__sockaddr(client, (r)-&gt;rq_xprt-&gt;xpt_remotelen)</div><div class='add'>+</div><div class='add'>+#define NFSD_TRACE_PROC_CALL_ASSIGNMENTS(r) \</div><div class='add'>+		do { \</div><div class='add'>+			struct svc_xprt *xprt = (r)-&gt;rq_xprt; \</div><div class='add'>+			__entry-&gt;netns_ino = SVC_NET(r)-&gt;ns.inum; \</div><div class='add'>+			__entry-&gt;xid = be32_to_cpu((r)-&gt;rq_xid); \</div><div class='add'>+			__assign_sockaddr(server, &amp;xprt-&gt;xpt_local, \</div><div class='add'>+					  xprt-&gt;xpt_locallen); \</div><div class='add'>+			__assign_sockaddr(client, &amp;xprt-&gt;xpt_remote, \</div><div class='add'>+					  xprt-&gt;xpt_remotelen); \</div><div class='add'>+		} while (0)</div><div class='add'>+</div><div class='add'>+#define NFSD_TRACE_PROC_RES_FIELDS(r) \</div><div class='ctx'> 		__field(unsigned int, netns_ino) \</div><div class='ctx'> 		__field(u32, xid) \</div><div class='ctx'> 		__field(unsigned long, status) \</div><div class='del'>-		__array(unsigned char, server, sizeof(struct sockaddr_in6)) \</div><div class='del'>-		__array(unsigned char, client, sizeof(struct sockaddr_in6))</div><div class='add'>+		__sockaddr(server, (r)-&gt;rq_xprt-&gt;xpt_locallen) \</div><div class='add'>+		__sockaddr(client, (r)-&gt;rq_xprt-&gt;xpt_remotelen)</div><div class='ctx'> </div><div class='del'>-#define NFSD_TRACE_PROC_RES_ASSIGNMENTS(error) \</div><div class='add'>+#define NFSD_TRACE_PROC_RES_ASSIGNMENTS(r, error) \</div><div class='ctx'> 		do { \</div><div class='del'>-			__entry-&gt;netns_ino = SVC_NET(rqstp)-&gt;ns.inum; \</div><div class='del'>-			__entry-&gt;xid = be32_to_cpu(rqstp-&gt;rq_xid); \</div><div class='add'>+			struct svc_xprt *xprt = (r)-&gt;rq_xprt; \</div><div class='add'>+			__entry-&gt;netns_ino = SVC_NET(r)-&gt;ns.inum; \</div><div class='add'>+			__entry-&gt;xid = be32_to_cpu((r)-&gt;rq_xid); \</div><div class='ctx'> 			__entry-&gt;status = be32_to_cpu(error); \</div><div class='del'>-			memcpy(__entry-&gt;server, &amp;rqstp-&gt;rq_xprt-&gt;xpt_local, \</div><div class='del'>-			       rqstp-&gt;rq_xprt-&gt;xpt_locallen); \</div><div class='del'>-			memcpy(__entry-&gt;client, &amp;rqstp-&gt;rq_xprt-&gt;xpt_remote, \</div><div class='del'>-			       rqstp-&gt;rq_xprt-&gt;xpt_remotelen); \</div><div class='add'>+			__assign_sockaddr(server, &amp;xprt-&gt;xpt_local, \</div><div class='add'>+					  xprt-&gt;xpt_locallen); \</div><div class='add'>+			__assign_sockaddr(client, &amp;xprt-&gt;xpt_remote, \</div><div class='add'>+					  xprt-&gt;xpt_remotelen); \</div><div class='ctx'> 		} while (0);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_xdr_err_class,</div><div class='hunk'>@@ -77,14 +98,15 @@ DEFINE_NFSD_XDR_ERR_EVENT(cant_encode);</div><div class='ctx'> 		{ NFSD_MAY_READ,		"READ" },		\</div><div class='ctx'> 		{ NFSD_MAY_SATTR,		"SATTR" },		\</div><div class='ctx'> 		{ NFSD_MAY_TRUNC,		"TRUNC" },		\</div><div class='del'>-		{ NFSD_MAY_LOCK,		"LOCK" },		\</div><div class='add'>+		{ NFSD_MAY_NLM,			"NLM" },		\</div><div class='ctx'> 		{ NFSD_MAY_OWNER_OVERRIDE,	"OWNER_OVERRIDE" },	\</div><div class='ctx'> 		{ NFSD_MAY_LOCAL_ACCESS,	"LOCAL_ACCESS" },	\</div><div class='ctx'> 		{ NFSD_MAY_BYPASS_GSS_ON_ROOT,	"BYPASS_GSS_ON_ROOT" },	\</div><div class='ctx'> 		{ NFSD_MAY_NOT_BREAK_LEASE,	"NOT_BREAK_LEASE" },	\</div><div class='ctx'> 		{ NFSD_MAY_BYPASS_GSS,		"BYPASS_GSS" },		\</div><div class='ctx'> 		{ NFSD_MAY_READ_IF_EXEC,	"READ_IF_EXEC" },	\</div><div class='del'>-		{ NFSD_MAY_64BIT_COOKIE,	"64BIT_COOKIE" })</div><div class='add'>+		{ NFSD_MAY_64BIT_COOKIE,	"64BIT_COOKIE" },	\</div><div class='add'>+		{ NFSD_MAY_LOCALIO,		"LOCALIO" })</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(nfsd_compound,</div><div class='ctx'> 	TP_PROTO(</div><div class='hunk'>@@ -102,7 +124,7 @@ TRACE_EVENT(nfsd_compound,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;xid = be32_to_cpu(rqst-&gt;rq_xid);</div><div class='ctx'> 		__entry-&gt;opcnt = opcnt;</div><div class='del'>-		__assign_str_len(tag, tag, taglen);</div><div class='add'>+		__assign_str(tag);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("xid=0x%08x opcnt=%u tag=%s",</div><div class='ctx'> 		__entry-&gt;xid, __entry-&gt;opcnt, __get_str(tag)</div><div class='hunk'>@@ -125,7 +147,7 @@ TRACE_EVENT(nfsd_compound_status,</div><div class='ctx'> 		__entry-&gt;args_opcnt = args_opcnt;</div><div class='ctx'> 		__entry-&gt;resp_opcnt = resp_opcnt;</div><div class='ctx'> 		__entry-&gt;status = be32_to_cpu(status);</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("op=%u/%u %s status=%d",</div><div class='ctx'> 		__entry-&gt;resp_opcnt, __entry-&gt;args_opcnt,</div><div class='hunk'>@@ -142,14 +164,14 @@ TRACE_EVENT(nfsd_compound_decode_err,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_ARGS(rqstp, args_opcnt, resp_opcnt, opnum, status),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		NFSD_TRACE_PROC_RES_FIELDS</div><div class='add'>+		NFSD_TRACE_PROC_RES_FIELDS(rqstp)</div><div class='ctx'> </div><div class='ctx'> 		__field(u32, args_opcnt)</div><div class='ctx'> 		__field(u32, resp_opcnt)</div><div class='ctx'> 		__field(u32, opnum)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		NFSD_TRACE_PROC_RES_ASSIGNMENTS(status)</div><div class='add'>+		NFSD_TRACE_PROC_RES_ASSIGNMENTS(rqstp, status)</div><div class='ctx'> </div><div class='ctx'> 		__entry-&gt;args_opcnt = args_opcnt;</div><div class='ctx'> 		__entry-&gt;resp_opcnt = resp_opcnt;</div><div class='hunk'>@@ -160,7 +182,7 @@ TRACE_EVENT(nfsd_compound_decode_err,</div><div class='ctx'> 		__entry-&gt;opnum, __entry-&gt;status)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='del'>-TRACE_EVENT(nfsd_compound_encode_err,</div><div class='add'>+DECLARE_EVENT_CLASS(nfsd_compound_err_class,</div><div class='ctx'> 	TP_PROTO(</div><div class='ctx'> 		const struct svc_rqst *rqstp,</div><div class='ctx'> 		u32 opnum,</div><div class='hunk'>@@ -168,12 +190,12 @@ TRACE_EVENT(nfsd_compound_encode_err,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_ARGS(rqstp, opnum, status),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		NFSD_TRACE_PROC_RES_FIELDS</div><div class='add'>+		NFSD_TRACE_PROC_RES_FIELDS(rqstp)</div><div class='ctx'> </div><div class='ctx'> 		__field(u32, opnum)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		NFSD_TRACE_PROC_RES_ASSIGNMENTS(status)</div><div class='add'>+		NFSD_TRACE_PROC_RES_ASSIGNMENTS(rqstp, status)</div><div class='ctx'> </div><div class='ctx'> 		__entry-&gt;opnum = opnum;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -181,6 +203,18 @@ TRACE_EVENT(nfsd_compound_encode_err,</div><div class='ctx'> 		__entry-&gt;opnum, __entry-&gt;status)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+#define DEFINE_NFSD_COMPOUND_ERR_EVENT(name)				\</div><div class='add'>+DEFINE_EVENT(nfsd_compound_err_class, nfsd_compound_##name##_err,	\</div><div class='add'>+	TP_PROTO(							\</div><div class='add'>+		const struct svc_rqst *rqstp,				\</div><div class='add'>+		u32 opnum,						\</div><div class='add'>+		__be32 status						\</div><div class='add'>+	),								\</div><div class='add'>+	TP_ARGS(rqstp, opnum, status))</div><div class='add'>+</div><div class='add'>+DEFINE_NFSD_COMPOUND_ERR_EVENT(op);</div><div class='add'>+DEFINE_NFSD_COMPOUND_ERR_EVENT(encode);</div><div class='add'>+</div><div class='ctx'> #define show_fs_file_type(x) \</div><div class='ctx'> 	__print_symbolic(x, \</div><div class='ctx'> 		{ S_IFLNK,		"LNK" }, \</div><div class='hunk'>@@ -191,7 +225,7 @@ TRACE_EVENT(nfsd_compound_encode_err,</div><div class='ctx'> 		{ S_IFIFO,		"FIFO" }, \</div><div class='ctx'> 		{ S_IFSOCK,		"SOCK" })</div><div class='ctx'> </div><div class='del'>-TRACE_EVENT(nfsd_fh_verify,</div><div class='add'>+TRACE_EVENT_CONDITION(nfsd_fh_verify,</div><div class='ctx'> 	TP_PROTO(</div><div class='ctx'> 		const struct svc_rqst *rqstp,</div><div class='ctx'> 		const struct svc_fh *fhp,</div><div class='hunk'>@@ -199,6 +233,7 @@ TRACE_EVENT(nfsd_fh_verify,</div><div class='ctx'> 		int access</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_ARGS(rqstp, fhp, type, access),</div><div class='add'>+	TP_CONDITION(rqstp != NULL),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(unsigned int, netns_ino)</div><div class='ctx'> 		__sockaddr(server, rqstp-&gt;rq_xprt-&gt;xpt_remotelen)</div><div class='hunk'>@@ -237,7 +272,7 @@ TRACE_EVENT_CONDITION(nfsd_fh_verify_err,</div><div class='ctx'> 		__be32 error</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_ARGS(rqstp, fhp, type, access, error),</div><div class='del'>-	TP_CONDITION(error),</div><div class='add'>+	TP_CONDITION(rqstp != NULL &amp;&amp; error),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(unsigned int, netns_ino)</div><div class='ctx'> 		__sockaddr(server, rqstp-&gt;rq_xprt-&gt;xpt_remotelen)</div><div class='hunk'>@@ -293,12 +328,13 @@ DECLARE_EVENT_CLASS(nfsd_fh_err_class,</div><div class='ctx'> 		  __entry-&gt;status)</div><div class='ctx'> )</div><div class='ctx'> </div><div class='del'>-#define DEFINE_NFSD_FH_ERR_EVENT(name)		\</div><div class='del'>-DEFINE_EVENT(nfsd_fh_err_class, nfsd_##name,	\</div><div class='del'>-	TP_PROTO(struct svc_rqst *rqstp,	\</div><div class='del'>-		 struct svc_fh	*fhp,		\</div><div class='del'>-		 int		status),	\</div><div class='del'>-	TP_ARGS(rqstp, fhp, status))</div><div class='add'>+#define DEFINE_NFSD_FH_ERR_EVENT(name)			\</div><div class='add'>+DEFINE_EVENT_CONDITION(nfsd_fh_err_class, nfsd_##name,	\</div><div class='add'>+	TP_PROTO(struct svc_rqst *rqstp,		\</div><div class='add'>+		 struct svc_fh	*fhp,			\</div><div class='add'>+		 int		status),		\</div><div class='add'>+	TP_ARGS(rqstp, fhp, status),			\</div><div class='add'>+	TP_CONDITION(rqstp != NULL))</div><div class='ctx'> </div><div class='ctx'> DEFINE_NFSD_FH_ERR_EVENT(set_fh_dentry_badexport);</div><div class='ctx'> DEFINE_NFSD_FH_ERR_EVENT(set_fh_dentry_badhandle);</div><div class='hunk'>@@ -308,7 +344,7 @@ TRACE_EVENT(nfsd_exp_find_key,</div><div class='ctx'> 		 int status),</div><div class='ctx'> 	TP_ARGS(key, status),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__field(int, fsidtype)</div><div class='add'>+		__field(u8, fsidtype)</div><div class='ctx'> 		__array(u32, fsid, 6)</div><div class='ctx'> 		__string(auth_domain, key-&gt;ek_client-&gt;name)</div><div class='ctx'> 		__field(int, status)</div><div class='hunk'>@@ -316,7 +352,7 @@ TRACE_EVENT(nfsd_exp_find_key,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;fsidtype = key-&gt;ek_fsidtype;</div><div class='ctx'> 		memcpy(__entry-&gt;fsid, key-&gt;ek_fsid, 4*6);</div><div class='del'>-		__assign_str(auth_domain, key-&gt;ek_client-&gt;name);</div><div class='add'>+		__assign_str(auth_domain);</div><div class='ctx'> 		__entry-&gt;status = status;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("fsid=%x::%s domain=%s status=%d",</div><div class='hunk'>@@ -331,7 +367,7 @@ TRACE_EVENT(nfsd_expkey_update,</div><div class='ctx'> 	TP_PROTO(const struct svc_expkey *key, const char *exp_path),</div><div class='ctx'> 	TP_ARGS(key, exp_path),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='del'>-		__field(int, fsidtype)</div><div class='add'>+		__field(u8, fsidtype)</div><div class='ctx'> 		__array(u32, fsid, 6)</div><div class='ctx'> 		__string(auth_domain, key-&gt;ek_client-&gt;name)</div><div class='ctx'> 		__string(path, exp_path)</div><div class='hunk'>@@ -340,8 +376,8 @@ TRACE_EVENT(nfsd_expkey_update,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;fsidtype = key-&gt;ek_fsidtype;</div><div class='ctx'> 		memcpy(__entry-&gt;fsid, key-&gt;ek_fsid, 4*6);</div><div class='del'>-		__assign_str(auth_domain, key-&gt;ek_client-&gt;name);</div><div class='del'>-		__assign_str(path, exp_path);</div><div class='add'>+		__assign_str(auth_domain);</div><div class='add'>+		__assign_str(path);</div><div class='ctx'> 		__entry-&gt;cache = !test_bit(CACHE_NEGATIVE, &amp;key-&gt;h.flags);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("fsid=%x::%s domain=%s path=%s cache=%s",</div><div class='hunk'>@@ -363,8 +399,8 @@ TRACE_EVENT(nfsd_exp_get_by_name,</div><div class='ctx'> 		__field(int, status)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(path, key-&gt;ex_path.dentry-&gt;d_name.name);</div><div class='del'>-		__assign_str(auth_domain, key-&gt;ex_client-&gt;name);</div><div class='add'>+		__assign_str(path);</div><div class='add'>+		__assign_str(auth_domain);</div><div class='ctx'> 		__entry-&gt;status = status;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("path=%s domain=%s status=%d",</div><div class='hunk'>@@ -383,8 +419,8 @@ TRACE_EVENT(nfsd_export_update,</div><div class='ctx'> 		__field(bool, cache)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(path, key-&gt;ex_path.dentry-&gt;d_name.name);</div><div class='del'>-		__assign_str(auth_domain, key-&gt;ex_client-&gt;name);</div><div class='add'>+		__assign_str(path);</div><div class='add'>+		__assign_str(auth_domain);</div><div class='ctx'> 		__entry-&gt;cache = !test_bit(CACHE_NEGATIVE, &amp;key-&gt;h.flags);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("path=%s domain=%s cache=%s",</div><div class='hunk'>@@ -428,12 +464,17 @@ DEFINE_EVENT(nfsd_io_class, nfsd_##name,	\</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(read_start);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(read_splice);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(read_vector);</div><div class='add'>+DEFINE_NFSD_IO_EVENT(read_direct);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(read_io_done);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(read_done);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(write_start);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(write_opened);</div><div class='add'>+DEFINE_NFSD_IO_EVENT(write_direct);</div><div class='add'>+DEFINE_NFSD_IO_EVENT(write_vector);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(write_io_done);</div><div class='ctx'> DEFINE_NFSD_IO_EVENT(write_done);</div><div class='add'>+DEFINE_NFSD_IO_EVENT(commit_start);</div><div class='add'>+DEFINE_NFSD_IO_EVENT(commit_done);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_err_class,</div><div class='ctx'> 	TP_PROTO(struct svc_rqst *rqstp,</div><div class='hunk'>@@ -483,7 +524,7 @@ TRACE_EVENT(nfsd_dirent,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;fh_hash = fhp ? knfsd_fh_hash(&amp;fhp-&gt;fh_handle) : 0;</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='del'>-		__assign_str_len(name, name, namlen)</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("fh_hash=0x%08x ino=%llu name=%s",</div><div class='ctx'> 		__entry-&gt;fh_hash, __entry-&gt;ino, __get_str(name)</div><div class='hunk'>@@ -609,7 +650,6 @@ DEFINE_STATEID_EVENT(open);</div><div class='ctx'> DEFINE_STATEID_EVENT(deleg_read);</div><div class='ctx'> DEFINE_STATEID_EVENT(deleg_write);</div><div class='ctx'> DEFINE_STATEID_EVENT(deleg_return);</div><div class='del'>-DEFINE_STATEID_EVENT(deleg_recall);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_stateseqid_class,</div><div class='ctx'> 	TP_PROTO(u32 seqid, const stateid_t *stp),</div><div class='hunk'>@@ -641,23 +681,18 @@ DEFINE_EVENT(nfsd_stateseqid_class, nfsd_##name, \</div><div class='ctx'> DEFINE_STATESEQID_EVENT(preprocess);</div><div class='ctx'> DEFINE_STATESEQID_EVENT(open_confirm);</div><div class='ctx'> </div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_OPEN_STID);</div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_LOCK_STID);</div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_DELEG_STID);</div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_CLOSED_STID);</div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_REVOKED_DELEG_STID);</div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_CLOSED_DELEG_STID);</div><div class='del'>-TRACE_DEFINE_ENUM(NFS4_LAYOUT_STID);</div><div class='del'>-</div><div class='ctx'> #define show_stid_type(x)						\</div><div class='ctx'> 	__print_flags(x, "|",						\</div><div class='del'>-		{ NFS4_OPEN_STID,		"OPEN" },		\</div><div class='del'>-		{ NFS4_LOCK_STID,		"LOCK" },		\</div><div class='del'>-		{ NFS4_DELEG_STID,		"DELEG" },		\</div><div class='del'>-		{ NFS4_CLOSED_STID,		"CLOSED" },		\</div><div class='del'>-		{ NFS4_REVOKED_DELEG_STID,	"REVOKED" },		\</div><div class='del'>-		{ NFS4_CLOSED_DELEG_STID,	"CLOSED_DELEG" },	\</div><div class='del'>-		{ NFS4_LAYOUT_STID,		"LAYOUT" })</div><div class='add'>+		{ SC_TYPE_OPEN,		"OPEN" },		\</div><div class='add'>+		{ SC_TYPE_LOCK,		"LOCK" },		\</div><div class='add'>+		{ SC_TYPE_DELEG,		"DELEG" },		\</div><div class='add'>+		{ SC_TYPE_LAYOUT,		"LAYOUT" })</div><div class='add'>+</div><div class='add'>+#define show_stid_status(x)						\</div><div class='add'>+	__print_flags(x, "|",						\</div><div class='add'>+		{ SC_STATUS_CLOSED,		"CLOSED" },		\</div><div class='add'>+		{ SC_STATUS_REVOKED,		"REVOKED" },		\</div><div class='add'>+		{ SC_STATUS_ADMIN_REVOKED,	"ADMIN_REVOKED" })</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_stid_class,</div><div class='ctx'> 	TP_PROTO(</div><div class='hunk'>@@ -666,6 +701,7 @@ DECLARE_EVENT_CLASS(nfsd_stid_class,</div><div class='ctx'> 	TP_ARGS(stid),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(unsigned long, sc_type)</div><div class='add'>+		__field(unsigned long, sc_status)</div><div class='ctx'> 		__field(int, sc_count)</div><div class='ctx'> 		__field(u32, cl_boot)</div><div class='ctx'> 		__field(u32, cl_id)</div><div class='hunk'>@@ -676,16 +712,18 @@ DECLARE_EVENT_CLASS(nfsd_stid_class,</div><div class='ctx'> 		const stateid_t *stp = &amp;stid-&gt;sc_stateid;</div><div class='ctx'> </div><div class='ctx'> 		__entry-&gt;sc_type = stid-&gt;sc_type;</div><div class='add'>+		__entry-&gt;sc_status = stid-&gt;sc_status;</div><div class='ctx'> 		__entry-&gt;sc_count = refcount_read(&amp;stid-&gt;sc_count);</div><div class='ctx'> 		__entry-&gt;cl_boot = stp-&gt;si_opaque.so_clid.cl_boot;</div><div class='ctx'> 		__entry-&gt;cl_id = stp-&gt;si_opaque.so_clid.cl_id;</div><div class='ctx'> 		__entry-&gt;si_id = stp-&gt;si_opaque.so_id;</div><div class='ctx'> 		__entry-&gt;si_generation = stp-&gt;si_generation;</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("client %08x:%08x stateid %08x:%08x ref=%d type=%s",</div><div class='add'>+	TP_printk("client %08x:%08x stateid %08x:%08x ref=%d type=%s state=%s",</div><div class='ctx'> 		__entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='ctx'> 		__entry-&gt;si_id, __entry-&gt;si_generation,</div><div class='del'>-		__entry-&gt;sc_count, show_stid_type(__entry-&gt;sc_type)</div><div class='add'>+		__entry-&gt;sc_count, show_stid_type(__entry-&gt;sc_type),</div><div class='add'>+		show_stid_status(__entry-&gt;sc_status)</div><div class='ctx'> 	)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='hunk'>@@ -696,6 +734,140 @@ DEFINE_EVENT(nfsd_stid_class, nfsd_stid_##name,			\</div><div class='ctx'> </div><div class='ctx'> DEFINE_STID_EVENT(revoke);</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(nfsd_stateowner_replay,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		u32 opnum,</div><div class='add'>+		const struct nfs4_replay *rp</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(opnum, rp),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(unsigned long, status)</div><div class='add'>+		__field(u32, opnum)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;status = be32_to_cpu(rp-&gt;rp_status);</div><div class='add'>+		__entry-&gt;opnum = opnum;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("opnum=%u status=%lu",</div><div class='add'>+		__entry-&gt;opnum, __entry-&gt;status)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT_CONDITION(nfsd_seq4_status,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct nfsd4_sequence *sequence</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, sequence),</div><div class='add'>+	TP_CONDITION(sequence-&gt;status_flags),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(unsigned int, netns_ino)</div><div class='add'>+		__field(u32, xid)</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__field(u32, seqno)</div><div class='add'>+		__field(u32, reserved)</div><div class='add'>+		__field(unsigned long, status_flags)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		const struct nfsd4_sessionid *sid =</div><div class='add'>+			(struct nfsd4_sessionid *)&amp;sequence-&gt;sessionid;</div><div class='add'>+</div><div class='add'>+		__entry-&gt;netns_ino = SVC_NET(rqstp)-&gt;ns.inum;</div><div class='add'>+		__entry-&gt;xid = be32_to_cpu(rqstp-&gt;rq_xid);</div><div class='add'>+		__entry-&gt;cl_boot = sid-&gt;clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = sid-&gt;clientid.cl_id;</div><div class='add'>+		__entry-&gt;seqno = sid-&gt;sequence;</div><div class='add'>+		__entry-&gt;reserved = sid-&gt;reserved;</div><div class='add'>+		__entry-&gt;status_flags = sequence-&gt;status_flags;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x sessionid=%08x:%08x:%08x:%08x status_flags=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='add'>+		__entry-&gt;seqno, __entry-&gt;reserved,</div><div class='add'>+		show_nfs4_seq4_status(__entry-&gt;status_flags)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfsd_cs_slot_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct nfs4_client *clp,</div><div class='add'>+		const struct nfsd4_create_session *cs</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(clp, cs),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(u32, seqid)</div><div class='add'>+		__field(u32, slot_seqid)</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__sockaddr(addr, clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		const struct nfsd4_clid_slot *slot = &amp;clp-&gt;cl_cs_slot;</div><div class='add'>+</div><div class='add'>+		__entry-&gt;cl_boot = clp-&gt;cl_clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = clp-&gt;cl_clientid.cl_id;</div><div class='add'>+		__assign_sockaddr(addr, &amp;clp-&gt;cl_cb_conn.cb_addr,</div><div class='add'>+				  clp-&gt;cl_cb_conn.cb_addrlen);</div><div class='add'>+		__entry-&gt;seqid = cs-&gt;seqid;</div><div class='add'>+		__entry-&gt;slot_seqid = slot-&gt;sl_seqid;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("addr=%pISpc client %08x:%08x seqid=%u slot_seqid=%u",</div><div class='add'>+		__get_sockaddr(addr), __entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='add'>+		__entry-&gt;seqid, __entry-&gt;slot_seqid</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_CS_SLOT_EVENT(name) \</div><div class='add'>+DEFINE_EVENT(nfsd_cs_slot_class, nfsd_##name, \</div><div class='add'>+	TP_PROTO( \</div><div class='add'>+		const struct nfs4_client *clp, \</div><div class='add'>+		const struct nfsd4_create_session *cs \</div><div class='add'>+	), \</div><div class='add'>+	TP_ARGS(clp, cs))</div><div class='add'>+</div><div class='add'>+DEFINE_CS_SLOT_EVENT(slot_seqid_conf);</div><div class='add'>+DEFINE_CS_SLOT_EVENT(slot_seqid_unconf);</div><div class='add'>+</div><div class='add'>+#define show_nfs_slot_flags(val)					\</div><div class='add'>+	__print_flags(val, "|",						\</div><div class='add'>+		{ NFSD4_SLOT_INUSE,		"INUSE" },		\</div><div class='add'>+		{ NFSD4_SLOT_CACHETHIS,		"CACHETHIS" },		\</div><div class='add'>+		{ NFSD4_SLOT_INITIALIZED,	"INITIALIZED" },	\</div><div class='add'>+		{ NFSD4_SLOT_CACHED,		"CACHED" },		\</div><div class='add'>+		{ NFSD4_SLOT_REUSED,		"REUSED" })</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_slot_seqid_sequence,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct nfs4_client *clp,</div><div class='add'>+		const struct nfsd4_sequence *seq,</div><div class='add'>+		const struct nfsd4_slot *slot</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(clp, seq, slot),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(u32, seqid)</div><div class='add'>+		__field(u32, slot_seqid)</div><div class='add'>+		__field(u32, slot_index)</div><div class='add'>+		__field(unsigned long, slot_flags)</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__sockaddr(addr, clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;cl_boot = clp-&gt;cl_clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = clp-&gt;cl_clientid.cl_id;</div><div class='add'>+		__assign_sockaddr(addr, &amp;clp-&gt;cl_cb_conn.cb_addr,</div><div class='add'>+				  clp-&gt;cl_cb_conn.cb_addrlen);</div><div class='add'>+		__entry-&gt;seqid = seq-&gt;seqid;</div><div class='add'>+		__entry-&gt;slot_seqid = slot-&gt;sl_seqid;</div><div class='add'>+		__entry-&gt;slot_index = seq-&gt;slotid;</div><div class='add'>+		__entry-&gt;slot_flags = slot-&gt;sl_flags;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("addr=%pISpc client %08x:%08x idx=%u seqid=%u slot_seqid=%u flags=%s",</div><div class='add'>+		__get_sockaddr(addr), __entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='add'>+		__entry-&gt;slot_index, __entry-&gt;seqid, __entry-&gt;slot_seqid,</div><div class='add'>+		show_nfs_slot_flags(__entry-&gt;slot_flags)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_clientid_class,</div><div class='ctx'> 	TP_PROTO(const clientid_t *clid),</div><div class='ctx'> 	TP_ARGS(clid),</div><div class='hunk'>@@ -725,6 +897,30 @@ DEFINE_CLIENTID_EVENT(purged);</div><div class='ctx'> DEFINE_CLIENTID_EVENT(renew);</div><div class='ctx'> DEFINE_CLIENTID_EVENT(stale);</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(nfsd_mark_client_expired,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct nfs4_client *clp,</div><div class='add'>+		int cl_rpc_users</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(clp, cl_rpc_users),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, cl_rpc_users)</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__sockaddr(addr, clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;cl_rpc_users = cl_rpc_users;</div><div class='add'>+		__entry-&gt;cl_boot = clp-&gt;cl_clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = clp-&gt;cl_clientid.cl_id;</div><div class='add'>+		__assign_sockaddr(addr, &amp;clp-&gt;cl_cb_conn.cb_addr,</div><div class='add'>+				  clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='add'>+	),</div><div class='add'>+	TP_printk("addr=%pISpc client %08x:%08x cl_rpc_users=%d",</div><div class='add'>+		__get_sockaddr(addr), __entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='add'>+		__entry-&gt;cl_rpc_users)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_net_class,</div><div class='ctx'> 	TP_PROTO(const struct nfsd_net *nn),</div><div class='ctx'> 	TP_ARGS(nn),</div><div class='hunk'>@@ -843,7 +1039,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class,</div><div class='ctx'> 		__array(unsigned char, addr, sizeof(struct sockaddr_in6))</div><div class='ctx'> 		__field(unsigned long, flavor)</div><div class='ctx'> 		__array(unsigned char, verifier, NFS4_VERIFIER_SIZE)</div><div class='del'>-		__string_len(name, name, clp-&gt;cl_name.len)</div><div class='add'>+		__string_len(name, clp-&gt;cl_name.data, clp-&gt;cl_name.len)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;cl_boot = clp-&gt;cl_clientid.cl_boot;</div><div class='hunk'>@@ -853,7 +1049,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class,</div><div class='ctx'> 		__entry-&gt;flavor = clp-&gt;cl_cred.cr_flavor;</div><div class='ctx'> 		memcpy(__entry-&gt;verifier, (void *)&amp;clp-&gt;cl_verifier,</div><div class='ctx'> 		       NFS4_VERIFIER_SIZE);</div><div class='del'>-		__assign_str_len(name, clp-&gt;cl_name.data, clp-&gt;cl_name.len);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("addr=%pISpc name='%s' verifier=0x%s flavor=%s client=%08x:%08x",</div><div class='ctx'> 		__entry-&gt;addr, __get_str(name),</div><div class='hunk'>@@ -878,6 +1074,7 @@ DEFINE_CLID_EVENT(confirmed_r);</div><div class='ctx'> 		{ 1 &lt;&lt; NFSD_FILE_HASHED,	"HASHED" },		\</div><div class='ctx'> 		{ 1 &lt;&lt; NFSD_FILE_PENDING,	"PENDING" },		\</div><div class='ctx'> 		{ 1 &lt;&lt; NFSD_FILE_REFERENCED,	"REFERENCED" },		\</div><div class='add'>+		{ 1 &lt;&lt; NFSD_FILE_RECENT,	"RECENT" },		\</div><div class='ctx'> 		{ 1 &lt;&lt; NFSD_FILE_GC,		"GC" })</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_file_class,</div><div class='hunk'>@@ -914,7 +1111,6 @@ DEFINE_NFSD_FILE_EVENT(nfsd_file_free);</div><div class='ctx'> DEFINE_NFSD_FILE_EVENT(nfsd_file_unhash);</div><div class='ctx'> DEFINE_NFSD_FILE_EVENT(nfsd_file_put);</div><div class='ctx'> DEFINE_NFSD_FILE_EVENT(nfsd_file_closing);</div><div class='del'>-DEFINE_NFSD_FILE_EVENT(nfsd_file_unhash_and_queue);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(nfsd_file_alloc,</div><div class='ctx'> 	TP_PROTO(</div><div class='hunk'>@@ -940,6 +1136,33 @@ TRACE_EVENT(nfsd_file_alloc,</div><div class='ctx'> 	)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(nfsd_file_get_dio_attrs,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct inode *inode,</div><div class='add'>+		const struct kstat *stat</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(inode, stat),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(const void *, inode)</div><div class='add'>+		__field(unsigned long, mask)</div><div class='add'>+		__field(u32, mem_align)</div><div class='add'>+		__field(u32, offset_align)</div><div class='add'>+		__field(u32, read_offset_align)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;inode = inode;</div><div class='add'>+		__entry-&gt;mask = stat-&gt;result_mask;</div><div class='add'>+		__entry-&gt;mem_align = stat-&gt;dio_mem_align;</div><div class='add'>+		__entry-&gt;offset_align = stat-&gt;dio_offset_align;</div><div class='add'>+		__entry-&gt;read_offset_align = stat-&gt;dio_read_offset_align;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("inode=%p flags=%s mem_align=%u offset_align=%u read_offset_align=%u",</div><div class='add'>+		__entry-&gt;inode, show_statx_mask(__entry-&gt;mask),</div><div class='add'>+		__entry-&gt;mem_align, __entry-&gt;offset_align,</div><div class='add'>+		__entry-&gt;read_offset_align</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT(nfsd_file_acquire,</div><div class='ctx'> 	TP_PROTO(</div><div class='ctx'> 		const struct svc_rqst *rqstp,</div><div class='hunk'>@@ -963,7 +1186,7 @@ TRACE_EVENT(nfsd_file_acquire,</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__entry-&gt;xid = be32_to_cpu(rqstp-&gt;rq_xid);</div><div class='add'>+		__entry-&gt;xid = rqstp ? be32_to_cpu(rqstp-&gt;rq_xid) : 0;</div><div class='ctx'> 		__entry-&gt;inode = inode;</div><div class='ctx'> 		__entry-&gt;may_flags = may_flags;</div><div class='ctx'> 		__entry-&gt;nf_ref = nf ? refcount_read(&amp;nf-&gt;nf_ref) : 0;</div><div class='hunk'>@@ -997,7 +1220,7 @@ TRACE_EVENT(nfsd_file_insert_err,</div><div class='ctx'> 		__field(long, error)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__entry-&gt;xid = be32_to_cpu(rqstp-&gt;rq_xid);</div><div class='add'>+		__entry-&gt;xid = rqstp ? be32_to_cpu(rqstp-&gt;rq_xid) : 0;</div><div class='ctx'> 		__entry-&gt;inode = inode;</div><div class='ctx'> 		__entry-&gt;may_flags = may_flags;</div><div class='ctx'> 		__entry-&gt;error = error;</div><div class='hunk'>@@ -1027,7 +1250,7 @@ TRACE_EVENT(nfsd_file_cons_err,</div><div class='ctx'> 		__field(const void *, nf_file)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__entry-&gt;xid = be32_to_cpu(rqstp-&gt;rq_xid);</div><div class='add'>+		__entry-&gt;xid = rqstp ? be32_to_cpu(rqstp-&gt;rq_xid) : 0;</div><div class='ctx'> 		__entry-&gt;inode = inode;</div><div class='ctx'> 		__entry-&gt;may_flags = may_flags;</div><div class='ctx'> 		__entry-&gt;nf_ref = refcount_read(&amp;nf-&gt;nf_ref);</div><div class='hunk'>@@ -1150,12 +1373,11 @@ DEFINE_EVENT(nfsd_file_gc_class, name,					\</div><div class='ctx'> 	TP_ARGS(nf))</div><div class='ctx'> </div><div class='ctx'> DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_lru_add);</div><div class='del'>-DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_lru_add_disposed);</div><div class='ctx'> DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_lru_del);</div><div class='del'>-DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_lru_del_disposed);</div><div class='ctx'> DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_gc_in_use);</div><div class='ctx'> DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_gc_writeback);</div><div class='ctx'> DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_gc_referenced);</div><div class='add'>+DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_gc_aged);</div><div class='ctx'> DEFINE_NFSD_FILE_GC_EVENT(nfsd_file_gc_disposed);</div><div class='ctx'> </div><div class='ctx'> DECLARE_EVENT_CLASS(nfsd_file_lruwalk_class,</div><div class='hunk'>@@ -1334,10 +1556,14 @@ DEFINE_EVENT(nfsd_cb_class, nfsd_cb_##name,		\</div><div class='ctx'> 	TP_PROTO(const struct nfs4_client *clp),	\</div><div class='ctx'> 	TP_ARGS(clp))</div><div class='ctx'> </div><div class='del'>-DEFINE_NFSD_CB_EVENT(state);</div><div class='add'>+DEFINE_NFSD_CB_EVENT(start);</div><div class='add'>+DEFINE_NFSD_CB_EVENT(new_state);</div><div class='ctx'> DEFINE_NFSD_CB_EVENT(probe);</div><div class='ctx'> DEFINE_NFSD_CB_EVENT(lost);</div><div class='ctx'> DEFINE_NFSD_CB_EVENT(shutdown);</div><div class='add'>+DEFINE_NFSD_CB_EVENT(rpc_prepare);</div><div class='add'>+DEFINE_NFSD_CB_EVENT(rpc_done);</div><div class='add'>+DEFINE_NFSD_CB_EVENT(rpc_release);</div><div class='ctx'> </div><div class='ctx'> TRACE_DEFINE_ENUM(RPC_AUTH_NULL);</div><div class='ctx'> TRACE_DEFINE_ENUM(RPC_AUTH_UNIX);</div><div class='hunk'>@@ -1371,7 +1597,7 @@ TRACE_EVENT(nfsd_cb_setup,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;cl_boot = clp-&gt;cl_clientid.cl_boot;</div><div class='ctx'> 		__entry-&gt;cl_id = clp-&gt;cl_clientid.cl_id;</div><div class='del'>-		__assign_str(netid, netid);</div><div class='add'>+		__assign_str(netid);</div><div class='ctx'> 		__entry-&gt;authflavor = authflavor;</div><div class='ctx'> 		__assign_sockaddr(addr, &amp;clp-&gt;cl_cb_conn.cb_addr,</div><div class='ctx'> 				  clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='hunk'>@@ -1405,6 +1631,143 @@ TRACE_EVENT(nfsd_cb_setup_err,</div><div class='ctx'> 		__entry-&gt;error)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+/* Not a real opcode, but there is no 0 operation. */</div><div class='add'>+#define _CB_NULL	0</div><div class='add'>+</div><div class='add'>+#define show_nfsd_cb_opcode(val)					\</div><div class='add'>+	__print_symbolic(val,						\</div><div class='add'>+		{ _CB_NULL,			"CB_NULL" },		\</div><div class='add'>+		{ OP_CB_GETATTR,		"CB_GETATTR" },		\</div><div class='add'>+		{ OP_CB_RECALL,			"CB_RECALL" },		\</div><div class='add'>+		{ OP_CB_LAYOUTRECALL,		"CB_LAYOUTRECALL" },	\</div><div class='add'>+		{ OP_CB_RECALL_ANY,		"CB_RECALL_ANY" },	\</div><div class='add'>+		{ OP_CB_NOTIFY_LOCK,		"CB_NOTIFY_LOCK" },	\</div><div class='add'>+		{ OP_CB_OFFLOAD,		"CB_OFFLOAD" })</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfsd_cb_lifetime_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct nfs4_client *clp,</div><div class='add'>+		const struct nfsd4_callback *cb</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(clp, cb),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__field(const void *, cb)</div><div class='add'>+		__field(unsigned long, opcode)</div><div class='add'>+		__field(bool, need_restart)</div><div class='add'>+		__sockaddr(addr, clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;cl_boot = clp-&gt;cl_clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = clp-&gt;cl_clientid.cl_id;</div><div class='add'>+		__entry-&gt;cb = cb;</div><div class='add'>+		__entry-&gt;opcode = cb-&gt;cb_ops ? cb-&gt;cb_ops-&gt;opcode : _CB_NULL;</div><div class='add'>+		__entry-&gt;need_restart = test_bit(NFSD4_CALLBACK_REQUEUE, &amp;cb-&gt;cb_flags);</div><div class='add'>+		__assign_sockaddr(addr, &amp;clp-&gt;cl_cb_conn.cb_addr,</div><div class='add'>+				  clp-&gt;cl_cb_conn.cb_addrlen)</div><div class='add'>+	),</div><div class='add'>+	TP_printk("addr=%pISpc client %08x:%08x cb=%p%s opcode=%s",</div><div class='add'>+		__get_sockaddr(addr), __entry-&gt;cl_boot, __entry-&gt;cl_id, __entry-&gt;cb,</div><div class='add'>+		__entry-&gt;need_restart ?  " (need restart)" : " (first try)",</div><div class='add'>+		show_nfsd_cb_opcode(__entry-&gt;opcode)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFSD_CB_LIFETIME_EVENT(name)		\</div><div class='add'>+DEFINE_EVENT(nfsd_cb_lifetime_class, nfsd_cb_##name,	\</div><div class='add'>+	TP_PROTO(					\</div><div class='add'>+		const struct nfs4_client *clp,		\</div><div class='add'>+		const struct nfsd4_callback *cb		\</div><div class='add'>+	),						\</div><div class='add'>+	TP_ARGS(clp, cb))</div><div class='add'>+</div><div class='add'>+DEFINE_NFSD_CB_LIFETIME_EVENT(queue);</div><div class='add'>+DEFINE_NFSD_CB_LIFETIME_EVENT(destroy);</div><div class='add'>+DEFINE_NFSD_CB_LIFETIME_EVENT(restart);</div><div class='add'>+DEFINE_NFSD_CB_LIFETIME_EVENT(bc_update);</div><div class='add'>+DEFINE_NFSD_CB_LIFETIME_EVENT(bc_shutdown);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_cb_seq_status,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct rpc_task *task,</div><div class='add'>+		const struct nfsd4_callback *cb</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(task, cb),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(unsigned int, task_id)</div><div class='add'>+		__field(unsigned int, client_id)</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__field(u32, seqno)</div><div class='add'>+		__field(u32, reserved)</div><div class='add'>+		__field(int, tk_status)</div><div class='add'>+		__field(int, seq_status)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		const struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='add'>+		const struct nfsd4_session *session = clp-&gt;cl_cb_session;</div><div class='add'>+		const struct nfsd4_sessionid *sid =</div><div class='add'>+			(struct nfsd4_sessionid *)&amp;session-&gt;se_sessionid;</div><div class='add'>+</div><div class='add'>+		__entry-&gt;task_id = task-&gt;tk_pid;</div><div class='add'>+		__entry-&gt;client_id = task-&gt;tk_client ?</div><div class='add'>+				     task-&gt;tk_client-&gt;cl_clid : -1;</div><div class='add'>+		__entry-&gt;cl_boot = sid-&gt;clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = sid-&gt;clientid.cl_id;</div><div class='add'>+		__entry-&gt;seqno = sid-&gt;sequence;</div><div class='add'>+		__entry-&gt;reserved = sid-&gt;reserved;</div><div class='add'>+		__entry-&gt;tk_status = task-&gt;tk_status;</div><div class='add'>+		__entry-&gt;seq_status = cb-&gt;cb_seq_status;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(SUNRPC_TRACE_TASK_SPECIFIER</div><div class='add'>+		" sessionid=%08x:%08x:%08x:%08x tk_status=%d seq_status=%d",</div><div class='add'>+		__entry-&gt;task_id, __entry-&gt;client_id,</div><div class='add'>+		__entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='add'>+		__entry-&gt;seqno, __entry-&gt;reserved,</div><div class='add'>+		__entry-&gt;tk_status, __entry-&gt;seq_status</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_cb_free_slot,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct rpc_task *task,</div><div class='add'>+		const struct nfsd4_callback *cb</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(task, cb),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(unsigned int, task_id)</div><div class='add'>+		__field(unsigned int, client_id)</div><div class='add'>+		__field(u32, cl_boot)</div><div class='add'>+		__field(u32, cl_id)</div><div class='add'>+		__field(u32, seqno)</div><div class='add'>+		__field(u32, reserved)</div><div class='add'>+		__field(u32, slot_seqno)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		const struct nfs4_client *clp = cb-&gt;cb_clp;</div><div class='add'>+		const struct nfsd4_session *session = clp-&gt;cl_cb_session;</div><div class='add'>+		const struct nfsd4_sessionid *sid =</div><div class='add'>+			(struct nfsd4_sessionid *)&amp;session-&gt;se_sessionid;</div><div class='add'>+</div><div class='add'>+		__entry-&gt;task_id = task-&gt;tk_pid;</div><div class='add'>+		__entry-&gt;client_id = task-&gt;tk_client ?</div><div class='add'>+				     task-&gt;tk_client-&gt;cl_clid : -1;</div><div class='add'>+		__entry-&gt;cl_boot = sid-&gt;clientid.cl_boot;</div><div class='add'>+		__entry-&gt;cl_id = sid-&gt;clientid.cl_id;</div><div class='add'>+		__entry-&gt;seqno = sid-&gt;sequence;</div><div class='add'>+		__entry-&gt;reserved = sid-&gt;reserved;</div><div class='add'>+		__entry-&gt;slot_seqno = session-&gt;se_cb_seq_nr[cb-&gt;cb_held_slot];</div><div class='add'>+	),</div><div class='add'>+	TP_printk(SUNRPC_TRACE_TASK_SPECIFIER</div><div class='add'>+		" sessionid=%08x:%08x:%08x:%08x new slot seqno=%u",</div><div class='add'>+		__entry-&gt;task_id, __entry-&gt;client_id,</div><div class='add'>+		__entry-&gt;cl_boot, __entry-&gt;cl_id,</div><div class='add'>+		__entry-&gt;seqno, __entry-&gt;reserved,</div><div class='add'>+		__entry-&gt;slot_seqno</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> TRACE_EVENT_CONDITION(nfsd_cb_recall,</div><div class='ctx'> 	TP_PROTO(</div><div class='ctx'> 		const struct nfs4_stid *stid</div><div class='hunk'>@@ -1560,6 +1923,7 @@ DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_recall_done);</div><div class='ctx'> DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_notify_lock_done);</div><div class='ctx'> DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_layout_done);</div><div class='ctx'> DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_offload_done);</div><div class='add'>+DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_getattr_done);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(nfsd_cb_recall_any_done,</div><div class='ctx'> 	TP_PROTO(</div><div class='hunk'>@@ -1594,7 +1958,7 @@ TRACE_EVENT(nfsd_ctl_unlock_ip,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='del'>-		__assign_str(address, address);</div><div class='add'>+		__assign_str(address);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("address=%s",</div><div class='ctx'> 		__get_str(address)</div><div class='hunk'>@@ -1613,7 +1977,7 @@ TRACE_EVENT(nfsd_ctl_unlock_fs,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='del'>-		__assign_str(path, path);</div><div class='add'>+		__assign_str(path);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("path=%s",</div><div class='ctx'> 		__get_str(path)</div><div class='hunk'>@@ -1637,8 +2001,8 @@ TRACE_EVENT(nfsd_ctl_filehandle,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='ctx'> 		__entry-&gt;maxsize = maxsize;</div><div class='del'>-		__assign_str(domain, domain);</div><div class='del'>-		__assign_str(path, path);</div><div class='add'>+		__assign_str(domain);</div><div class='add'>+		__assign_str(path);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("domain=%s path=%s maxsize=%d",</div><div class='ctx'> 		__get_str(domain), __get_str(path), __entry-&gt;maxsize</div><div class='hunk'>@@ -1698,7 +2062,7 @@ TRACE_EVENT(nfsd_ctl_version,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='del'>-		__assign_str(mesg, mesg);</div><div class='add'>+		__assign_str(mesg);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s",</div><div class='ctx'> 		__get_str(mesg)</div><div class='hunk'>@@ -1739,7 +2103,7 @@ TRACE_EVENT(nfsd_ctl_ports_addxprt,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='ctx'> 		__entry-&gt;port = port;</div><div class='del'>-		__assign_str(transport, transport);</div><div class='add'>+		__assign_str(transport);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("transport=%s port=%d",</div><div class='ctx'> 		__get_str(transport), __entry-&gt;port</div><div class='hunk'>@@ -1765,25 +2129,6 @@ TRACE_EVENT(nfsd_ctl_maxblksize,</div><div class='ctx'> 	)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='del'>-TRACE_EVENT(nfsd_ctl_maxconn,</div><div class='del'>-	TP_PROTO(</div><div class='del'>-		const struct net *net,</div><div class='del'>-		int maxconn</div><div class='del'>-	),</div><div class='del'>-	TP_ARGS(net, maxconn),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(unsigned int, netns_ino)</div><div class='del'>-		__field(int, maxconn)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='del'>-		__entry-&gt;maxconn = maxconn;</div><div class='del'>-	),</div><div class='del'>-	TP_printk("maxconn=%d",</div><div class='del'>-		__entry-&gt;maxconn</div><div class='del'>-	)</div><div class='del'>-);</div><div class='del'>-</div><div class='ctx'> TRACE_EVENT(nfsd_ctl_time,</div><div class='ctx'> 	TP_PROTO(</div><div class='ctx'> 		const struct net *net,</div><div class='hunk'>@@ -1800,9 +2145,9 @@ TRACE_EVENT(nfsd_ctl_time,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='ctx'> 		__entry-&gt;time = time;</div><div class='del'>-		__assign_str_len(name, name, namelen);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("file=%s time=%d\n",</div><div class='add'>+	TP_printk("file=%s time=%d",</div><div class='ctx'> 		__get_str(name), __entry-&gt;time</div><div class='ctx'> 	)</div><div class='ctx'> );</div><div class='hunk'>@@ -1819,7 +2164,7 @@ TRACE_EVENT(nfsd_ctl_recoverydir,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;netns_ino = net-&gt;ns.inum;</div><div class='del'>-		__assign_str(recdir, recdir);</div><div class='add'>+		__assign_str(recdir);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("recdir=%s",</div><div class='ctx'> 		__get_str(recdir)</div><div class='hunk'>@@ -1857,6 +2202,10 @@ DECLARE_EVENT_CLASS(nfsd_copy_class,</div><div class='ctx'> 		__field(u32, dst_cl_id)</div><div class='ctx'> 		__field(u32, dst_so_id)</div><div class='ctx'> 		__field(u32, dst_si_generation)</div><div class='add'>+		__field(u32, cb_cl_boot)</div><div class='add'>+		__field(u32, cb_cl_id)</div><div class='add'>+		__field(u32, cb_so_id)</div><div class='add'>+		__field(u32, cb_si_generation)</div><div class='ctx'> 		__field(u64, src_cp_pos)</div><div class='ctx'> 		__field(u64, dst_cp_pos)</div><div class='ctx'> 		__field(u64, cp_count)</div><div class='hunk'>@@ -1865,6 +2214,7 @@ DECLARE_EVENT_CLASS(nfsd_copy_class,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		const stateid_t *src_stp = &amp;copy-&gt;cp_src_stateid;</div><div class='ctx'> 		const stateid_t *dst_stp = &amp;copy-&gt;cp_dst_stateid;</div><div class='add'>+		const stateid_t *cb_stp = &amp;copy-&gt;cp_res.cb_stateid;</div><div class='ctx'> </div><div class='ctx'> 		__entry-&gt;intra = test_bit(NFSD4_COPY_F_INTRA, &amp;copy-&gt;cp_flags);</div><div class='ctx'> 		__entry-&gt;async = !test_bit(NFSD4_COPY_F_SYNCHRONOUS, &amp;copy-&gt;cp_flags);</div><div class='hunk'>@@ -1876,6 +2226,10 @@ DECLARE_EVENT_CLASS(nfsd_copy_class,</div><div class='ctx'> 		__entry-&gt;dst_cl_id = dst_stp-&gt;si_opaque.so_clid.cl_id;</div><div class='ctx'> 		__entry-&gt;dst_so_id = dst_stp-&gt;si_opaque.so_id;</div><div class='ctx'> 		__entry-&gt;dst_si_generation = dst_stp-&gt;si_generation;</div><div class='add'>+		__entry-&gt;cb_cl_boot = cb_stp-&gt;si_opaque.so_clid.cl_boot;</div><div class='add'>+		__entry-&gt;cb_cl_id = cb_stp-&gt;si_opaque.so_clid.cl_id;</div><div class='add'>+		__entry-&gt;cb_so_id = cb_stp-&gt;si_opaque.so_id;</div><div class='add'>+		__entry-&gt;cb_si_generation = cb_stp-&gt;si_generation;</div><div class='ctx'> 		__entry-&gt;src_cp_pos = copy-&gt;cp_src_pos;</div><div class='ctx'> 		__entry-&gt;dst_cp_pos = copy-&gt;cp_dst_pos;</div><div class='ctx'> 		__entry-&gt;cp_count = copy-&gt;cp_count;</div><div class='hunk'>@@ -1883,14 +2237,17 @@ DECLARE_EVENT_CLASS(nfsd_copy_class,</div><div class='ctx'> 				sizeof(struct sockaddr_in6));</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("client=%pISpc intra=%d async=%d "</div><div class='del'>-		"src_stateid[si_generation:0x%x cl_boot:0x%x cl_id:0x%x so_id:0x%x] "</div><div class='del'>-		"dst_stateid[si_generation:0x%x cl_boot:0x%x cl_id:0x%x so_id:0x%x] "</div><div class='add'>+		"src_client %08x:%08x src_stateid %08x:%08x "</div><div class='add'>+		"dst_client %08x:%08x dst_stateid %08x:%08x "</div><div class='add'>+		"cb_client %08x:%08x cb_stateid %08x:%08x "</div><div class='ctx'> 		"cp_src_pos=%llu cp_dst_pos=%llu cp_count=%llu",</div><div class='ctx'> 		__get_sockaddr(addr), __entry-&gt;intra, __entry-&gt;async,</div><div class='del'>-		__entry-&gt;src_si_generation, __entry-&gt;src_cl_boot,</div><div class='del'>-		__entry-&gt;src_cl_id, __entry-&gt;src_so_id,</div><div class='del'>-		__entry-&gt;dst_si_generation, __entry-&gt;dst_cl_boot,</div><div class='del'>-		__entry-&gt;dst_cl_id, __entry-&gt;dst_so_id,</div><div class='add'>+		__entry-&gt;src_cl_boot, __entry-&gt;src_cl_id,</div><div class='add'>+		__entry-&gt;src_so_id, __entry-&gt;src_si_generation,</div><div class='add'>+		__entry-&gt;dst_cl_boot, __entry-&gt;dst_cl_id,</div><div class='add'>+		__entry-&gt;dst_so_id, __entry-&gt;dst_si_generation,</div><div class='add'>+		__entry-&gt;cb_cl_boot, __entry-&gt;cb_cl_id,</div><div class='add'>+		__entry-&gt;cb_so_id, __entry-&gt;cb_si_generation,</div><div class='ctx'> 		__entry-&gt;src_cp_pos, __entry-&gt;dst_cp_pos, __entry-&gt;cp_count</div><div class='ctx'> 	)</div><div class='ctx'> );</div><div class='hunk'>@@ -1902,7 +2259,7 @@ DEFINE_EVENT(nfsd_copy_class, nfsd_copy_##name,	\</div><div class='ctx'> </div><div class='ctx'> DEFINE_COPY_EVENT(inter);</div><div class='ctx'> DEFINE_COPY_EVENT(intra);</div><div class='del'>-DEFINE_COPY_EVENT(do_async);</div><div class='add'>+DEFINE_COPY_EVENT(async);</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(nfsd_copy_done,</div><div class='ctx'> 	TP_PROTO(</div><div class='hunk'>@@ -1923,11 +2280,380 @@ TRACE_EVENT(nfsd_copy_done,</div><div class='ctx'> 		__assign_sockaddr(addr, &amp;copy-&gt;cp_clp-&gt;cl_addr,</div><div class='ctx'> 				sizeof(struct sockaddr_in6));</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("addr=%pISpc status=%d intra=%d async=%d ",</div><div class='add'>+	TP_printk("addr=%pISpc status=%d intra=%d async=%d",</div><div class='ctx'> 		__get_sockaddr(addr), __entry-&gt;status, __entry-&gt;intra, __entry-&gt;async</div><div class='ctx'> 	)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+DECLARE_EVENT_CLASS(nfsd_copy_async_done_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct nfsd4_copy *copy</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(copy),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, status)</div><div class='add'>+		__field(bool, intra)</div><div class='add'>+		__field(bool, async)</div><div class='add'>+		__field(u32, src_cl_boot)</div><div class='add'>+		__field(u32, src_cl_id)</div><div class='add'>+		__field(u32, src_so_id)</div><div class='add'>+		__field(u32, src_si_generation)</div><div class='add'>+		__field(u32, dst_cl_boot)</div><div class='add'>+		__field(u32, dst_cl_id)</div><div class='add'>+		__field(u32, dst_so_id)</div><div class='add'>+		__field(u32, dst_si_generation)</div><div class='add'>+		__field(u32, cb_cl_boot)</div><div class='add'>+		__field(u32, cb_cl_id)</div><div class='add'>+		__field(u32, cb_so_id)</div><div class='add'>+		__field(u32, cb_si_generation)</div><div class='add'>+		__field(u64, src_cp_pos)</div><div class='add'>+		__field(u64, dst_cp_pos)</div><div class='add'>+		__field(u64, cp_count)</div><div class='add'>+		__sockaddr(addr, sizeof(struct sockaddr_in6))</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		const stateid_t *src_stp = &amp;copy-&gt;cp_src_stateid;</div><div class='add'>+		const stateid_t *dst_stp = &amp;copy-&gt;cp_dst_stateid;</div><div class='add'>+		const stateid_t *cb_stp = &amp;copy-&gt;cp_res.cb_stateid;</div><div class='add'>+</div><div class='add'>+		__entry-&gt;status = be32_to_cpu(copy-&gt;nfserr);</div><div class='add'>+		__entry-&gt;intra = test_bit(NFSD4_COPY_F_INTRA, &amp;copy-&gt;cp_flags);</div><div class='add'>+		__entry-&gt;async = !test_bit(NFSD4_COPY_F_SYNCHRONOUS, &amp;copy-&gt;cp_flags);</div><div class='add'>+		__entry-&gt;src_cl_boot = src_stp-&gt;si_opaque.so_clid.cl_boot;</div><div class='add'>+		__entry-&gt;src_cl_id = src_stp-&gt;si_opaque.so_clid.cl_id;</div><div class='add'>+		__entry-&gt;src_so_id = src_stp-&gt;si_opaque.so_id;</div><div class='add'>+		__entry-&gt;src_si_generation = src_stp-&gt;si_generation;</div><div class='add'>+		__entry-&gt;dst_cl_boot = dst_stp-&gt;si_opaque.so_clid.cl_boot;</div><div class='add'>+		__entry-&gt;dst_cl_id = dst_stp-&gt;si_opaque.so_clid.cl_id;</div><div class='add'>+		__entry-&gt;dst_so_id = dst_stp-&gt;si_opaque.so_id;</div><div class='add'>+		__entry-&gt;dst_si_generation = dst_stp-&gt;si_generation;</div><div class='add'>+		__entry-&gt;cb_cl_boot = cb_stp-&gt;si_opaque.so_clid.cl_boot;</div><div class='add'>+		__entry-&gt;cb_cl_id = cb_stp-&gt;si_opaque.so_clid.cl_id;</div><div class='add'>+		__entry-&gt;cb_so_id = cb_stp-&gt;si_opaque.so_id;</div><div class='add'>+		__entry-&gt;cb_si_generation = cb_stp-&gt;si_generation;</div><div class='add'>+		__entry-&gt;src_cp_pos = copy-&gt;cp_src_pos;</div><div class='add'>+		__entry-&gt;dst_cp_pos = copy-&gt;cp_dst_pos;</div><div class='add'>+		__entry-&gt;cp_count = copy-&gt;cp_count;</div><div class='add'>+		__assign_sockaddr(addr, &amp;copy-&gt;cp_clp-&gt;cl_addr,</div><div class='add'>+				sizeof(struct sockaddr_in6));</div><div class='add'>+	),</div><div class='add'>+	TP_printk("client=%pISpc status=%d intra=%d async=%d "</div><div class='add'>+		"src_client %08x:%08x src_stateid %08x:%08x "</div><div class='add'>+		"dst_client %08x:%08x dst_stateid %08x:%08x "</div><div class='add'>+		"cb_client %08x:%08x cb_stateid %08x:%08x "</div><div class='add'>+		"cp_src_pos=%llu cp_dst_pos=%llu cp_count=%llu",</div><div class='add'>+		__get_sockaddr(addr),</div><div class='add'>+		__entry-&gt;status, __entry-&gt;intra, __entry-&gt;async,</div><div class='add'>+		__entry-&gt;src_cl_boot, __entry-&gt;src_cl_id,</div><div class='add'>+		__entry-&gt;src_so_id, __entry-&gt;src_si_generation,</div><div class='add'>+		__entry-&gt;dst_cl_boot, __entry-&gt;dst_cl_id,</div><div class='add'>+		__entry-&gt;dst_so_id, __entry-&gt;dst_si_generation,</div><div class='add'>+		__entry-&gt;cb_cl_boot, __entry-&gt;cb_cl_id,</div><div class='add'>+		__entry-&gt;cb_so_id, __entry-&gt;cb_si_generation,</div><div class='add'>+		__entry-&gt;src_cp_pos, __entry-&gt;dst_cp_pos, __entry-&gt;cp_count</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_COPY_ASYNC_DONE_EVENT(name)		\</div><div class='add'>+DEFINE_EVENT(nfsd_copy_async_done_class,		\</div><div class='add'>+	nfsd_copy_async_##name,				\</div><div class='add'>+	TP_PROTO(const struct nfsd4_copy *copy),	\</div><div class='add'>+	TP_ARGS(copy))</div><div class='add'>+</div><div class='add'>+DEFINE_COPY_ASYNC_DONE_EVENT(done);</div><div class='add'>+DEFINE_COPY_ASYNC_DONE_EVENT(cancel);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_setattr,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp,</div><div class='add'>+		const struct iattr *iap,</div><div class='add'>+		const struct timespec64 *guardtime</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp, iap, guardtime),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+		__field(s64, gtime_tv_sec)</div><div class='add'>+		__field(u32, gtime_tv_nsec)</div><div class='add'>+		__field(unsigned int, ia_valid)</div><div class='add'>+		__field(loff_t, ia_size)</div><div class='add'>+		__field(uid_t, ia_uid)</div><div class='add'>+		__field(gid_t, ia_gid)</div><div class='add'>+		__field(umode_t, ia_mode)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+		__entry-&gt;gtime_tv_sec = guardtime ? guardtime-&gt;tv_sec : 0;</div><div class='add'>+		__entry-&gt;gtime_tv_nsec = guardtime ? guardtime-&gt;tv_nsec : 0;</div><div class='add'>+		__entry-&gt;ia_valid = iap-&gt;ia_valid;</div><div class='add'>+		__entry-&gt;ia_size = iap-&gt;ia_size;</div><div class='add'>+		__entry-&gt;ia_uid = __kuid_val(iap-&gt;ia_uid);</div><div class='add'>+		__entry-&gt;ia_gid = __kgid_val(iap-&gt;ia_gid);</div><div class='add'>+		__entry-&gt;ia_mode = iap-&gt;ia_mode;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(</div><div class='add'>+		"xid=0x%08x fh_hash=0x%08x ia_valid=%s ia_size=%llu ia_mode=0%o ia_uid=%u ia_gid=%u guard_time=%lld.%u",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash, show_ia_valid_flags(__entry-&gt;ia_valid),</div><div class='add'>+		__entry-&gt;ia_size, __entry-&gt;ia_mode, __entry-&gt;ia_uid, __entry-&gt;ia_gid,</div><div class='add'>+		__entry-&gt;gtime_tv_sec, __entry-&gt;gtime_tv_nsec</div><div class='add'>+	)</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_lookup,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp,</div><div class='add'>+		const char *name,</div><div class='add'>+		unsigned int len</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp, name, len),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+		__string_len(name, name, len)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+		__assign_str(name);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x fh_hash=0x%08x name=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash, __get_str(name)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_create,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp,</div><div class='add'>+		umode_t type,</div><div class='add'>+		const char *name,</div><div class='add'>+		unsigned int len</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp, type, name, len),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+		__field(umode_t, type)</div><div class='add'>+		__string_len(name, name, len)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+		__entry-&gt;type = type;</div><div class='add'>+		__assign_str(name);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x fh_hash=0x%08x type=%s name=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash,</div><div class='add'>+		show_fs_file_type(__entry-&gt;type), __get_str(name)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_symlink,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp,</div><div class='add'>+		const char *name,</div><div class='add'>+		unsigned int namelen,</div><div class='add'>+		const char *target</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp, name, namelen, target),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+		__string_len(name, name, namelen)</div><div class='add'>+		__string(target, target)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+		__assign_str(name);</div><div class='add'>+		__assign_str(target);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x fh_hash=0x%08x name=%s target=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash,</div><div class='add'>+		__get_str(name), __get_str(target)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_link,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *sfhp,</div><div class='add'>+		const struct svc_fh *tfhp,</div><div class='add'>+		const char *name,</div><div class='add'>+		unsigned int namelen</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, sfhp, tfhp, name, namelen),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, sfh_hash)</div><div class='add'>+		__field(u32, tfh_hash)</div><div class='add'>+		__string_len(name, name, namelen)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;sfh_hash = knfsd_fh_hash(&amp;sfhp-&gt;fh_handle);</div><div class='add'>+		__entry-&gt;tfh_hash = knfsd_fh_hash(&amp;tfhp-&gt;fh_handle);</div><div class='add'>+		__assign_str(name);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x src_fh=0x%08x tgt_fh=0x%08x name=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;sfh_hash, __entry-&gt;tfh_hash,</div><div class='add'>+		__get_str(name)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_unlink,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp,</div><div class='add'>+		const char *name,</div><div class='add'>+		unsigned int len</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp, name, len),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+		__string_len(name, name, len)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+		__assign_str(name);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x fh_hash=0x%08x name=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash,</div><div class='add'>+		__get_str(name)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_rename,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *sfhp,</div><div class='add'>+		const struct svc_fh *tfhp,</div><div class='add'>+		const char *source,</div><div class='add'>+		unsigned int sourcelen,</div><div class='add'>+		const char *target,</div><div class='add'>+		unsigned int targetlen</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, sfhp, tfhp, source, sourcelen, target, targetlen),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, sfh_hash)</div><div class='add'>+		__field(u32, tfh_hash)</div><div class='add'>+		__string_len(source, source, sourcelen)</div><div class='add'>+		__string_len(target, target, targetlen)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;sfh_hash = knfsd_fh_hash(&amp;sfhp-&gt;fh_handle);</div><div class='add'>+		__entry-&gt;tfh_hash = knfsd_fh_hash(&amp;tfhp-&gt;fh_handle);</div><div class='add'>+		__assign_str(source);</div><div class='add'>+		__assign_str(target);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x sfh_hash=0x%08x tfh_hash=0x%08x source=%s target=%s",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;sfh_hash, __entry-&gt;tfh_hash,</div><div class='add'>+		__get_str(source), __get_str(target)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(nfsd_vfs_readdir,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp,</div><div class='add'>+		u32 count,</div><div class='add'>+		u64 offset</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp, count, offset),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+		__field(u32, count)</div><div class='add'>+		__field(u64, offset)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+		__entry-&gt;count = count;</div><div class='add'>+		__entry-&gt;offset = offset;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x fh_hash=0x%08x offset=%llu count=%u",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash,</div><div class='add'>+		__entry-&gt;offset, __entry-&gt;count</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfsd_vfs_getattr_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct svc_rqst *rqstp,</div><div class='add'>+		const struct svc_fh *fhp</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(rqstp, fhp),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_FIELDS(rqstp)</div><div class='add'>+		__field(u32, fh_hash)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp);</div><div class='add'>+		__entry-&gt;fh_hash = knfsd_fh_hash(&amp;fhp-&gt;fh_handle);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("xid=0x%08x fh_hash=0x%08x",</div><div class='add'>+		__entry-&gt;xid, __entry-&gt;fh_hash</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFSD_VFS_GETATTR_EVENT(__name)		\</div><div class='add'>+DEFINE_EVENT(nfsd_vfs_getattr_class, __name,		\</div><div class='add'>+	TP_PROTO(					\</div><div class='add'>+		const struct svc_rqst *rqstp,		\</div><div class='add'>+		const struct svc_fh *fhp		\</div><div class='add'>+	),						\</div><div class='add'>+	TP_ARGS(rqstp, fhp))</div><div class='add'>+</div><div class='add'>+DEFINE_NFSD_VFS_GETATTR_EVENT(nfsd_vfs_getattr);</div><div class='add'>+DEFINE_NFSD_VFS_GETATTR_EVENT(nfsd_vfs_statfs);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(nfsd_pnfs_class,</div><div class='add'>+	TP_PROTO(</div><div class='add'>+		const struct nfs4_client *clp,</div><div class='add'>+		const char *dev,</div><div class='add'>+		int error</div><div class='add'>+	),</div><div class='add'>+	TP_ARGS(clp, dev, error),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__sockaddr(addr, sizeof(struct sockaddr_in6))</div><div class='add'>+		__field(unsigned int, netns_ino)</div><div class='add'>+		__string(dev, dev)</div><div class='add'>+		__field(int, error)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_sockaddr(addr, &amp;clp-&gt;cl_addr,</div><div class='add'>+				sizeof(struct sockaddr_in6));</div><div class='add'>+		__entry-&gt;netns_ino = clp-&gt;net-&gt;ns.inum;</div><div class='add'>+		__assign_str(dev);</div><div class='add'>+		__entry-&gt;error = error;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("client=%pISpc nn=%d dev=%s error=%d",</div><div class='add'>+		__get_sockaddr(addr),</div><div class='add'>+		__entry-&gt;netns_ino,</div><div class='add'>+		__get_str(dev),</div><div class='add'>+		__entry-&gt;error</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#define DEFINE_NFSD_PNFS_ERR_EVENT(name)		\</div><div class='add'>+DEFINE_EVENT(nfsd_pnfs_class, nfsd_pnfs_##name,	\</div><div class='add'>+	TP_PROTO(					\</div><div class='add'>+		const struct nfs4_client *clp,		\</div><div class='add'>+		const char *dev,				\</div><div class='add'>+		int error				\</div><div class='add'>+	),						\</div><div class='add'>+	TP_ARGS(clp, dev, error))</div><div class='add'>+</div><div class='add'>+DEFINE_NFSD_PNFS_ERR_EVENT(fence);</div><div class='ctx'> #endif /* _NFSD_TRACE_H */</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_INCLUDE_PATH</div><div class='head'>diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c<br/>index b7c7a9273ea0..964cf922ad83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/vfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/vfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/vfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/vfs.c</a></div><div class='hunk'>@@ -25,18 +25,17 @@</div><div class='ctx'> #include &lt;linux/posix_acl_xattr.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='del'>-#include &lt;linux/ima.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/xdr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "xdr3.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='del'>-#include "../internal.h"</div><div class='ctx'> #include "acl.h"</div><div class='ctx'> #include "idmap.h"</div><div class='ctx'> #include "xdr4.h"</div><div class='hunk'>@@ -49,6 +48,10 @@</div><div class='ctx'> </div><div class='ctx'> #define NFSDDBG_FACILITY		NFSDDBG_FILEOP</div><div class='ctx'> </div><div class='add'>+bool nfsd_disable_splice_read __read_mostly;</div><div class='add'>+u64 nfsd_io_cache_read __read_mostly = NFSD_IO_BUFFERED;</div><div class='add'>+u64 nfsd_io_cache_write __read_mostly = NFSD_IO_BUFFERED;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfserrno - Map Linux errnos to NFS errnos</div><div class='ctx'>  * @errno: POSIX(-ish) error code to be mapped</div><div class='hunk'>@@ -73,7 +76,6 @@ nfserrno (int errno)</div><div class='ctx'> 		{ nfserr_acces, -EACCES },</div><div class='ctx'> 		{ nfserr_exist, -EEXIST },</div><div class='ctx'> 		{ nfserr_xdev, -EXDEV },</div><div class='del'>-		{ nfserr_mlink, -EMLINK },</div><div class='ctx'> 		{ nfserr_nodev, -ENODEV },</div><div class='ctx'> 		{ nfserr_notdir, -ENOTDIR },</div><div class='ctx'> 		{ nfserr_isdir, -EISDIR },</div><div class='hunk'>@@ -101,6 +103,7 @@ nfserrno (int errno)</div><div class='ctx'> 		{ nfserr_io, -EUCLEAN },</div><div class='ctx'> 		{ nfserr_perm, -ENOKEY },</div><div class='ctx'> 		{ nfserr_no_grace, -ENOGRACE},</div><div class='add'>+		{ nfserr_io, -EBADMSG },</div><div class='ctx'> 	};</div><div class='ctx'> 	int	i;</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +249,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	struct dentry		*dentry;</div><div class='ctx'> 	int			host_err;</div><div class='ctx'> </div><div class='del'>-	dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name);</div><div class='add'>+	trace_nfsd_vfs_lookup(rqstp, fhp, name, len);</div><div class='ctx'> </div><div class='ctx'> 	dparent = fhp-&gt;fh_dentry;</div><div class='ctx'> 	exp = exp_get(fhp-&gt;fh_export);</div><div class='hunk'>@@ -266,7 +269,8 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 				goto out_nfserr;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		dentry = lookup_one_len_unlocked(name, dparent, len);</div><div class='add'>+		dentry = lookup_one_unlocked(&amp;nop_mnt_idmap,</div><div class='add'>+					     &amp;QSTR_LEN(name, len), dparent);</div><div class='ctx'> 		host_err = PTR_ERR(dentry);</div><div class='ctx'> 		if (IS_ERR(dentry))</div><div class='ctx'> 			goto out_nfserr;</div><div class='hunk'>@@ -321,7 +325,7 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name,</div><div class='ctx'> 	err = nfsd_lookup_dentry(rqstp, fhp, name, len, &amp;exp, &amp;dentry);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	err = check_nfsd_access(exp, rqstp);</div><div class='add'>+	err = check_nfsd_access(exp, rqstp, false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -422,8 +426,9 @@ nfsd_get_write_access(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	if (iap-&gt;ia_size &lt; inode-&gt;i_size) {</div><div class='ctx'> 		__be32 err;</div><div class='ctx'> </div><div class='del'>-		err = nfsd_permission(rqstp, fhp-&gt;fh_export, fhp-&gt;fh_dentry,</div><div class='del'>-				NFSD_MAY_TRUNC | NFSD_MAY_OWNER_OVERRIDE);</div><div class='add'>+		err = nfsd_permission(&amp;rqstp-&gt;rq_cred,</div><div class='add'>+				      fhp-&gt;fh_export, fhp-&gt;fh_dentry,</div><div class='add'>+				      NFSD_MAY_TRUNC | NFSD_MAY_OWNER_OVERRIDE);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -464,10 +469,18 @@ static int __nfsd_setattr(struct dentry *dentry, struct iattr *iap)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!iap-&gt;ia_valid)</div><div class='add'>+	if ((iap-&gt;ia_valid &amp; ~ATTR_DELEG) == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	iap-&gt;ia_valid |= ATTR_CTIME;</div><div class='add'>+	/*</div><div class='add'>+	 * If ATTR_DELEG is set, then this is an update from a client that</div><div class='add'>+	 * holds a delegation. If this is an update for only the atime, the</div><div class='add'>+	 * ctime should not be changed. If the update contains the mtime</div><div class='add'>+	 * too, then ATTR_CTIME should already be set.</div><div class='add'>+	 */</div><div class='add'>+	if (!(iap-&gt;ia_valid &amp; ATTR_DELEG))</div><div class='add'>+		iap-&gt;ia_valid |= ATTR_CTIME;</div><div class='add'>+</div><div class='ctx'> 	return notify_change(&amp;nop_mnt_idmap, dentry, iap, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -476,7 +489,6 @@ static int __nfsd_setattr(struct dentry *dentry, struct iattr *iap)</div><div class='ctx'>  * @rqstp: controlling RPC transaction</div><div class='ctx'>  * @fhp: filehandle of target</div><div class='ctx'>  * @attr: attributes to set</div><div class='del'>- * @check_guard: set to 1 if guardtime is a valid timestamp</div><div class='ctx'>  * @guardtime: do not act if ctime.tv_sec does not match this timestamp</div><div class='ctx'>  *</div><div class='ctx'>  * This call may adjust the contents of @attr (in particular, this</div><div class='hunk'>@@ -488,8 +500,7 @@ static int __nfsd_setattr(struct dentry *dentry, struct iattr *iap)</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='del'>-	     struct nfsd_attrs *attr,</div><div class='del'>-	     int check_guard, time64_t guardtime)</div><div class='add'>+	     struct nfsd_attrs *attr, const struct timespec64 *guardtime)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry	*dentry;</div><div class='ctx'> 	struct inode	*inode;</div><div class='hunk'>@@ -497,11 +508,13 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	int		accmode = NFSD_MAY_SATTR;</div><div class='ctx'> 	umode_t		ftype = 0;</div><div class='ctx'> 	__be32		err;</div><div class='del'>-	int		host_err;</div><div class='add'>+	int		host_err = 0;</div><div class='ctx'> 	bool		get_write_count;</div><div class='ctx'> 	bool		size_change = (iap-&gt;ia_valid &amp; ATTR_SIZE);</div><div class='ctx'> 	int		retries;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_setattr(rqstp, fhp, iap, guardtime);</div><div class='add'>+</div><div class='ctx'> 	if (iap-&gt;ia_valid &amp; ATTR_SIZE) {</div><div class='ctx'> 		accmode |= NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE;</div><div class='ctx'> 		ftype = S_IFREG;</div><div class='hunk'>@@ -538,9 +551,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> </div><div class='ctx'> 	nfsd_sanitize_attrs(inode, iap);</div><div class='ctx'> </div><div class='del'>-	if (check_guard &amp;&amp; guardtime != inode_get_ctime_sec(inode))</div><div class='del'>-		return nfserr_notsync;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The size case is special, it changes the file in addition to the</div><div class='ctx'> 	 * attributes, and file systems don't expect it to be mixed with</div><div class='hunk'>@@ -555,6 +565,19 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='add'>+	err = fh_fill_pre_attrs(fhp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (guardtime) {</div><div class='add'>+		struct timespec64 ctime = inode_get_ctime(inode);</div><div class='add'>+		if ((u32)guardtime-&gt;tv_sec != (u32)ctime.tv_sec ||</div><div class='add'>+		    guardtime-&gt;tv_nsec != ctime.tv_nsec) {</div><div class='add'>+			err = nfserr_notsync;</div><div class='add'>+			goto out_fill_attrs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (retries = 1;;) {</div><div class='ctx'> 		struct iattr attrs;</div><div class='ctx'> </div><div class='hunk'>@@ -582,13 +605,23 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 		attr-&gt;na_aclerr = set_posix_acl(&amp;nop_mnt_idmap,</div><div class='ctx'> 						dentry, ACL_TYPE_DEFAULT,</div><div class='ctx'> 						attr-&gt;na_dpacl);</div><div class='add'>+out_fill_attrs:</div><div class='add'>+	/*</div><div class='add'>+	 * RFC 1813 Section 3.3.2 does not mandate that an NFS server</div><div class='add'>+	 * returns wcc_data for SETATTR. Some client implementations</div><div class='add'>+	 * depend on receiving wcc_data, however, to sort out partial</div><div class='add'>+	 * updates (eg., the client requested that size and mode be</div><div class='add'>+	 * modified, but the server changed only the file mode).</div><div class='add'>+	 */</div><div class='add'>+	fh_fill_post_attrs(fhp);</div><div class='add'>+out_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> 	if (size_change)</div><div class='ctx'> 		put_write_access(inode);</div><div class='ctx'> out:</div><div class='ctx'> 	if (!host_err)</div><div class='ctx'> 		host_err = commit_metadata(fhp);</div><div class='del'>-	return nfserrno(host_err);</div><div class='add'>+	return err != 0 ? err : nfserrno(host_err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NFSD_V4)</div><div class='hunk'>@@ -797,7 +830,8 @@ nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *suppor</div><div class='ctx'> </div><div class='ctx'> 			sresult |= map-&gt;access;</div><div class='ctx'> </div><div class='del'>-			err2 = nfsd_permission(rqstp, export, dentry, map-&gt;how);</div><div class='add'>+			err2 = nfsd_permission(&amp;rqstp-&gt;rq_cred, export,</div><div class='add'>+					       dentry, map-&gt;how);</div><div class='ctx'> 			switch (err2) {</div><div class='ctx'> 			case nfs_ok:</div><div class='ctx'> 				result |= map-&gt;access;</div><div class='hunk'>@@ -841,8 +875,7 @@ int nfsd_open_break_lease(struct inode *inode, int access)</div><div class='ctx'>  * N.B. After this call fhp needs an fh_put</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-__nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,</div><div class='del'>-			int may_flags, struct file **filp)</div><div class='add'>+__nfsd_open(struct svc_fh *fhp, umode_t type, int may_flags, struct file **filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct path	path;</div><div class='ctx'> 	struct inode	*inode;</div><div class='hunk'>@@ -877,17 +910,12 @@ __nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	host_err = ima_file_check(file, may_flags);</div><div class='add'>+	host_err = security_file_post_open(file, may_flags);</div><div class='ctx'> 	if (host_err) {</div><div class='ctx'> 		fput(file);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (may_flags &amp; NFSD_MAY_64BIT_COOKIE)</div><div class='del'>-		file-&gt;f_mode |= FMODE_64BITHASH;</div><div class='del'>-	else</div><div class='del'>-		file-&gt;f_mode |= FMODE_32BITHASH;</div><div class='del'>-</div><div class='ctx'> 	*filp = file;</div><div class='ctx'> out:</div><div class='ctx'> 	return host_err;</div><div class='hunk'>@@ -910,14 +938,14 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,</div><div class='ctx'> 	 * directories, but we never have and it doesn't seem to have</div><div class='ctx'> 	 * caused anyone a problem.  If we were to change this, note</div><div class='ctx'> 	 * also that our filldir callbacks would need a variant of</div><div class='del'>-	 * lookup_one_len that doesn't check permissions.</div><div class='add'>+	 * lookup_one_positive_unlocked() that doesn't check permissions.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (type == S_IFREG)</div><div class='ctx'> 		may_flags |= NFSD_MAY_OWNER_OVERRIDE;</div><div class='ctx'> retry:</div><div class='ctx'> 	err = fh_verify(rqstp, fhp, type, may_flags);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		host_err = __nfsd_open(rqstp, fhp, type, may_flags, filp);</div><div class='add'>+		host_err = __nfsd_open(fhp, type, may_flags, filp);</div><div class='ctx'> 		if (host_err == -EOPENSTALE &amp;&amp; !retried) {</div><div class='ctx'> 			retried = true;</div><div class='ctx'> 			fh_put(fhp);</div><div class='hunk'>@@ -930,18 +958,17 @@ retry:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nfsd_open_verified - Open a regular file for the filecache</div><div class='del'>- * @rqstp: RPC request</div><div class='ctx'>  * @fhp: NFS filehandle of the file to open</div><div class='add'>+ * @type: S_IFMT inode type allowed (0 means any type is allowed)</div><div class='ctx'>  * @may_flags: internal permission flags</div><div class='ctx'>  * @filp: OUT: open "struct file *"</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success, or a negative errno value.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-nfsd_open_verified(struct svc_rqst *rqstp, struct svc_fh *fhp, int may_flags,</div><div class='del'>-		   struct file **filp)</div><div class='add'>+nfsd_open_verified(struct svc_fh *fhp, umode_t type, int may_flags, struct file **filp)</div><div class='ctx'> {</div><div class='del'>-	return __nfsd_open(rqstp, fhp, S_IFREG, may_flags, filp);</div><div class='add'>+	return __nfsd_open(fhp, type, may_flags, filp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1002,7 +1029,9 @@ static __be32 nfsd_finish_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 			       unsigned long *count, u32 *eof, ssize_t host_err)</div><div class='ctx'> {</div><div class='ctx'> 	if (host_err &gt;= 0) {</div><div class='del'>-		nfsd_stats_io_read_add(fhp-&gt;fh_export, host_err);</div><div class='add'>+		struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='add'>+</div><div class='add'>+		nfsd_stats_io_read_add(nn, fhp-&gt;fh_export, host_err);</div><div class='ctx'> 		*eof = nfsd_eof_on_read(file, offset, host_err, *count);</div><div class='ctx'> 		*count = host_err;</div><div class='ctx'> 		fsnotify_access(file);</div><div class='hunk'>@@ -1046,11 +1075,88 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	return nfsd_finish_read(rqstp, fhp, file, offset, count, eof, host_err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The byte range of the client's READ request is expanded on both ends</div><div class='add'>+ * until it meets the underlying file system's direct I/O alignment</div><div class='add'>+ * requirements. After the internal read is complete, the byte range of</div><div class='add'>+ * the NFS READ payload is reduced to the byte range that was originally</div><div class='add'>+ * requested.</div><div class='add'>+ *</div><div class='add'>+ * Note that a direct read can be done only when the xdr_buf containing</div><div class='add'>+ * the NFS READ reply does not already have contents in its .pages array.</div><div class='add'>+ * This is due to potentially restrictive alignment requirements on the</div><div class='add'>+ * read buffer. When .page_len and @base are zero, the .pages array is</div><div class='add'>+ * guaranteed to be page-aligned.</div><div class='add'>+ */</div><div class='add'>+static noinline_for_stack __be32</div><div class='add'>+nfsd_direct_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+		 struct nfsd_file *nf, loff_t offset, unsigned long *count,</div><div class='add'>+		 u32 *eof)</div><div class='add'>+{</div><div class='add'>+	u64 dio_start, dio_end;</div><div class='add'>+	unsigned long v, total;</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	struct kiocb kiocb;</div><div class='add'>+	ssize_t host_err;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	init_sync_kiocb(&amp;kiocb, nf-&gt;nf_file);</div><div class='add'>+	kiocb.ki_flags |= IOCB_DIRECT;</div><div class='add'>+</div><div class='add'>+	/* Read a properly-aligned region of bytes into rq_bvec */</div><div class='add'>+	dio_start = round_down(offset, nf-&gt;nf_dio_read_offset_align);</div><div class='add'>+	dio_end = round_up((u64)offset + *count, nf-&gt;nf_dio_read_offset_align);</div><div class='add'>+</div><div class='add'>+	kiocb.ki_pos = dio_start;</div><div class='add'>+</div><div class='add'>+	v = 0;</div><div class='add'>+	total = dio_end - dio_start;</div><div class='add'>+	while (total &amp;&amp; v &lt; rqstp-&gt;rq_maxpages &amp;&amp;</div><div class='add'>+	       rqstp-&gt;rq_next_page &lt; rqstp-&gt;rq_page_end) {</div><div class='add'>+		len = min_t(size_t, total, PAGE_SIZE);</div><div class='add'>+		bvec_set_page(&amp;rqstp-&gt;rq_bvec[v], *rqstp-&gt;rq_next_page,</div><div class='add'>+			      len, 0);</div><div class='add'>+</div><div class='add'>+		total -= len;</div><div class='add'>+		++rqstp-&gt;rq_next_page;</div><div class='add'>+		++v;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_nfsd_read_direct(rqstp, fhp, offset, *count - total);</div><div class='add'>+	iov_iter_bvec(&amp;iter, ITER_DEST, rqstp-&gt;rq_bvec, v,</div><div class='add'>+		      dio_end - dio_start - total);</div><div class='add'>+</div><div class='add'>+	host_err = vfs_iocb_iter_read(nf-&gt;nf_file, &amp;kiocb, &amp;iter);</div><div class='add'>+	if (host_err &gt;= 0) {</div><div class='add'>+		unsigned int pad = offset - dio_start;</div><div class='add'>+</div><div class='add'>+		/* The returned payload starts after the pad */</div><div class='add'>+		rqstp-&gt;rq_res.page_base = pad;</div><div class='add'>+</div><div class='add'>+		/* Compute the count of bytes to be returned */</div><div class='add'>+		if (host_err &gt; pad + *count)</div><div class='add'>+			host_err = *count;</div><div class='add'>+		else if (host_err &gt; pad)</div><div class='add'>+			host_err -= pad;</div><div class='add'>+		else</div><div class='add'>+			host_err = 0;</div><div class='add'>+	} else if (unlikely(host_err == -EINVAL)) {</div><div class='add'>+		struct inode *inode = d_inode(fhp-&gt;fh_dentry);</div><div class='add'>+</div><div class='add'>+		pr_info_ratelimited("nfsd: Direct I/O alignment failure on %s/%ld\n",</div><div class='add'>+				    inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino);</div><div class='add'>+		host_err = -ESERVERFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nfsd_finish_read(rqstp, fhp, nf-&gt;nf_file, offset, count,</div><div class='add'>+				eof, host_err);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nfsd_iter_read - Perform a VFS read using an iterator</div><div class='ctx'>  * @rqstp: RPC transaction context</div><div class='ctx'>  * @fhp: file handle of file to be read</div><div class='del'>- * @file: opened struct file of file to be read</div><div class='add'>+ * @nf: opened struct nfsd_file of file to be read</div><div class='ctx'>  * @offset: starting byte offset</div><div class='ctx'>  * @count: IN: requested number of bytes; OUT: number of bytes read</div><div class='ctx'>  * @base: offset in first page of read buffer</div><div class='hunk'>@@ -1063,30 +1169,52 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'>  * returned.</div><div class='ctx'>  */</div><div class='ctx'> __be32 nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='del'>-		      struct file *file, loff_t offset, unsigned long *count,</div><div class='add'>+		      struct nfsd_file *nf, loff_t offset, unsigned long *count,</div><div class='ctx'> 		      unsigned int base, u32 *eof)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = nf-&gt;nf_file;</div><div class='ctx'> 	unsigned long v, total;</div><div class='ctx'> 	struct iov_iter iter;</div><div class='del'>-	loff_t ppos = offset;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct kiocb kiocb;</div><div class='ctx'> 	ssize_t host_err;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	init_sync_kiocb(&amp;kiocb, file);</div><div class='add'>+</div><div class='add'>+	switch (nfsd_io_cache_read) {</div><div class='add'>+	case NFSD_IO_BUFFERED:</div><div class='add'>+		break;</div><div class='add'>+	case NFSD_IO_DIRECT:</div><div class='add'>+		/* When dio_read_offset_align is zero, dio is not supported */</div><div class='add'>+		if (nf-&gt;nf_dio_read_offset_align &amp;&amp; !rqstp-&gt;rq_res.page_len)</div><div class='add'>+			return nfsd_direct_read(rqstp, fhp, nf, offset,</div><div class='add'>+						count, eof);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NFSD_IO_DONTCACHE:</div><div class='add'>+		if (file-&gt;f_op-&gt;fop_flags &amp; FOP_DONTCACHE)</div><div class='add'>+			kiocb.ki_flags = IOCB_DONTCACHE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kiocb.ki_pos = offset;</div><div class='ctx'> </div><div class='ctx'> 	v = 0;</div><div class='ctx'> 	total = *count;</div><div class='del'>-	while (total) {</div><div class='del'>-		page = *(rqstp-&gt;rq_next_page++);</div><div class='del'>-		rqstp-&gt;rq_vec[v].iov_base = page_address(page) + base;</div><div class='del'>-		rqstp-&gt;rq_vec[v].iov_len = min_t(size_t, total, PAGE_SIZE - base);</div><div class='del'>-		total -= rqstp-&gt;rq_vec[v].iov_len;</div><div class='add'>+	while (total &amp;&amp; v &lt; rqstp-&gt;rq_maxpages &amp;&amp;</div><div class='add'>+	       rqstp-&gt;rq_next_page &lt; rqstp-&gt;rq_page_end) {</div><div class='add'>+		len = min_t(size_t, total, PAGE_SIZE - base);</div><div class='add'>+		bvec_set_page(&amp;rqstp-&gt;rq_bvec[v], *rqstp-&gt;rq_next_page,</div><div class='add'>+			      len, base);</div><div class='add'>+</div><div class='add'>+		total -= len;</div><div class='add'>+		++rqstp-&gt;rq_next_page;</div><div class='ctx'> 		++v;</div><div class='ctx'> 		base = 0;</div><div class='ctx'> 	}</div><div class='del'>-	WARN_ON_ONCE(v &gt; ARRAY_SIZE(rqstp-&gt;rq_vec));</div><div class='ctx'> </div><div class='del'>-	trace_nfsd_read_vector(rqstp, fhp, offset, *count);</div><div class='del'>-	iov_iter_kvec(&amp;iter, ITER_DEST, rqstp-&gt;rq_vec, v, *count);</div><div class='del'>-	host_err = vfs_iter_read(file, &amp;iter, &amp;ppos, 0);</div><div class='add'>+	trace_nfsd_read_vector(rqstp, fhp, offset, *count - total);</div><div class='add'>+	iov_iter_bvec(&amp;iter, ITER_DEST, rqstp-&gt;rq_bvec, v, *count - total);</div><div class='add'>+	host_err = vfs_iocb_iter_read(file, &amp;kiocb, &amp;iter);</div><div class='ctx'> 	return nfsd_finish_read(rqstp, fhp, file, offset, count, eof, host_err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1118,7 +1246,7 @@ static int wait_for_concurrent_writes(struct file *file)</div><div class='ctx'> 		dprintk("nfsd: write resume %d\n", task_pid_nr(current));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_DIRTY) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_DIRTY) {</div><div class='ctx'> 		dprintk("nfsd: write sync %d\n", task_pid_nr(current));</div><div class='ctx'> 		err = vfs_fsync(file, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1127,26 +1255,171 @@ static int wait_for_concurrent_writes(struct file *file)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct nfsd_write_dio_seg {</div><div class='add'>+	struct iov_iter			iter;</div><div class='add'>+	int				flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+iov_iter_bvec_offset(const struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)(iter-&gt;bvec-&gt;bv_offset + iter-&gt;iov_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nfsd_write_dio_seg_init(struct nfsd_write_dio_seg *segment,</div><div class='add'>+			struct bio_vec *bvec, unsigned int nvecs,</div><div class='add'>+			unsigned long total, size_t start, size_t len,</div><div class='add'>+			struct kiocb *iocb)</div><div class='add'>+{</div><div class='add'>+	iov_iter_bvec(&amp;segment-&gt;iter, ITER_SOURCE, bvec, nvecs, total);</div><div class='add'>+	if (start)</div><div class='add'>+		iov_iter_advance(&amp;segment-&gt;iter, start);</div><div class='add'>+	iov_iter_truncate(&amp;segment-&gt;iter, len);</div><div class='add'>+	segment-&gt;flags = iocb-&gt;ki_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+nfsd_write_dio_iters_init(struct nfsd_file *nf, struct bio_vec *bvec,</div><div class='add'>+			  unsigned int nvecs, struct kiocb *iocb,</div><div class='add'>+			  unsigned long total,</div><div class='add'>+			  struct nfsd_write_dio_seg segments[3])</div><div class='add'>+{</div><div class='add'>+	u32 offset_align = nf-&gt;nf_dio_offset_align;</div><div class='add'>+	loff_t prefix_end, orig_end, middle_end;</div><div class='add'>+	u32 mem_align = nf-&gt;nf_dio_mem_align;</div><div class='add'>+	size_t prefix, middle, suffix;</div><div class='add'>+	loff_t offset = iocb-&gt;ki_pos;</div><div class='add'>+	unsigned int nsegs = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if direct I/O is feasible for this write request.</div><div class='add'>+	 * If alignments are not available, the write is too small,</div><div class='add'>+	 * or no alignment can be found, fall back to buffered I/O.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!mem_align || !offset_align) ||</div><div class='add'>+	    unlikely(total &lt; max(offset_align, mem_align)))</div><div class='add'>+		goto no_dio;</div><div class='add'>+</div><div class='add'>+	prefix_end = round_up(offset, offset_align);</div><div class='add'>+	orig_end = offset + total;</div><div class='add'>+	middle_end = round_down(orig_end, offset_align);</div><div class='add'>+</div><div class='add'>+	prefix = prefix_end - offset;</div><div class='add'>+	middle = middle_end - prefix_end;</div><div class='add'>+	suffix = orig_end - middle_end;</div><div class='add'>+</div><div class='add'>+	if (!middle)</div><div class='add'>+		goto no_dio;</div><div class='add'>+</div><div class='add'>+	if (prefix)</div><div class='add'>+		nfsd_write_dio_seg_init(&amp;segments[nsegs++], bvec,</div><div class='add'>+					nvecs, total, 0, prefix, iocb);</div><div class='add'>+</div><div class='add'>+	nfsd_write_dio_seg_init(&amp;segments[nsegs], bvec, nvecs,</div><div class='add'>+				total, prefix, middle, iocb);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the bvec iterator is aligned for direct I/O.</div><div class='add'>+	 *</div><div class='add'>+	 * bvecs generated from RPC receive buffers are contiguous: After</div><div class='add'>+	 * the first bvec, all subsequent bvecs start at bv_offset zero</div><div class='add'>+	 * (page-aligned). Therefore, only the first bvec is checked.</div><div class='add'>+	 */</div><div class='add'>+	if (iov_iter_bvec_offset(&amp;segments[nsegs].iter) &amp; (mem_align - 1))</div><div class='add'>+		goto no_dio;</div><div class='add'>+	segments[nsegs].flags |= IOCB_DIRECT;</div><div class='add'>+	nsegs++;</div><div class='add'>+</div><div class='add'>+	if (suffix)</div><div class='add'>+		nfsd_write_dio_seg_init(&amp;segments[nsegs++], bvec, nvecs, total,</div><div class='add'>+					prefix + middle, suffix, iocb);</div><div class='add'>+</div><div class='add'>+	return nsegs;</div><div class='add'>+</div><div class='add'>+no_dio:</div><div class='add'>+	/* No DIO alignment possible - pack into single non-DIO segment. */</div><div class='add'>+	nfsd_write_dio_seg_init(&amp;segments[0], bvec, nvecs, total, 0,</div><div class='add'>+				total, iocb);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline_for_stack int</div><div class='add'>+nfsd_direct_write(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+		  struct nfsd_file *nf, unsigned int nvecs,</div><div class='add'>+		  unsigned long *cnt, struct kiocb *kiocb)</div><div class='add'>+{</div><div class='add'>+	struct nfsd_write_dio_seg segments[3];</div><div class='add'>+	struct file *file = nf-&gt;nf_file;</div><div class='add'>+	unsigned int nsegs, i;</div><div class='add'>+	ssize_t host_err;</div><div class='add'>+</div><div class='add'>+	nsegs = nfsd_write_dio_iters_init(nf, rqstp-&gt;rq_bvec, nvecs,</div><div class='add'>+					  kiocb, *cnt, segments);</div><div class='add'>+</div><div class='add'>+	*cnt = 0;</div><div class='add'>+	for (i = 0; i &lt; nsegs; i++) {</div><div class='add'>+		kiocb-&gt;ki_flags = segments[i].flags;</div><div class='add'>+		if (kiocb-&gt;ki_flags &amp; IOCB_DIRECT)</div><div class='add'>+			trace_nfsd_write_direct(rqstp, fhp, kiocb-&gt;ki_pos,</div><div class='add'>+						segments[i].iter.count);</div><div class='add'>+		else {</div><div class='add'>+			trace_nfsd_write_vector(rqstp, fhp, kiocb-&gt;ki_pos,</div><div class='add'>+						segments[i].iter.count);</div><div class='add'>+			/*</div><div class='add'>+			 * Mark the I/O buffer as evict-able to reduce</div><div class='add'>+			 * memory contention.</div><div class='add'>+			 */</div><div class='add'>+			if (nf-&gt;nf_file-&gt;f_op-&gt;fop_flags &amp; FOP_DONTCACHE)</div><div class='add'>+				kiocb-&gt;ki_flags |= IOCB_DONTCACHE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		host_err = vfs_iocb_iter_write(file, kiocb, &amp;segments[i].iter);</div><div class='add'>+		if (host_err &lt; 0)</div><div class='add'>+			return host_err;</div><div class='add'>+		*cnt += host_err;</div><div class='add'>+		if (host_err &lt; segments[i].iter.count)</div><div class='add'>+			break;	/* partial write */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfsd_vfs_write - write data to an already-open file</div><div class='add'>+ * @rqstp: RPC execution context</div><div class='add'>+ * @fhp: File handle of file to write into</div><div class='add'>+ * @nf: An open file matching @fhp</div><div class='add'>+ * @offset: Byte offset of start</div><div class='add'>+ * @payload: xdr_buf containing the write payload</div><div class='add'>+ * @cnt: IN: number of bytes to write, OUT: number of bytes actually written</div><div class='add'>+ * @stable: An NFS stable_how value</div><div class='add'>+ * @verf: NFS WRITE verifier</div><div class='add'>+ *</div><div class='add'>+ * Upon return, caller must invoke fh_put on @fhp.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   An nfsstat value in network byte order.</div><div class='add'>+ */</div><div class='ctx'> __be32</div><div class='del'>-nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,</div><div class='del'>-				loff_t offset, struct kvec *vec, int vlen,</div><div class='del'>-				unsigned long *cnt, int stable,</div><div class='del'>-				__be32 *verf)</div><div class='add'>+nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+	       struct nfsd_file *nf, loff_t offset,</div><div class='add'>+	       const struct xdr_buf *payload, unsigned long *cnt,</div><div class='add'>+	       int stable, __be32 *verf)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd_net		*nn = net_generic(SVC_NET(rqstp), nfsd_net_id);</div><div class='ctx'> 	struct file		*file = nf-&gt;nf_file;</div><div class='ctx'> 	struct super_block	*sb = file_inode(file)-&gt;i_sb;</div><div class='add'>+	struct kiocb		kiocb;</div><div class='ctx'> 	struct svc_export	*exp;</div><div class='ctx'> 	struct iov_iter		iter;</div><div class='ctx'> 	errseq_t		since;</div><div class='ctx'> 	__be32			nfserr;</div><div class='ctx'> 	int			host_err;</div><div class='del'>-	int			use_wgather;</div><div class='del'>-	loff_t			pos = offset;</div><div class='ctx'> 	unsigned long		exp_op_flags = 0;</div><div class='ctx'> 	unsigned int		pflags = current-&gt;flags;</div><div class='del'>-	rwf_t			flags = 0;</div><div class='ctx'> 	bool			restore_flags = false;</div><div class='add'>+	unsigned int		nvecs;</div><div class='ctx'> </div><div class='ctx'> 	trace_nfsd_write_opened(rqstp, fhp, offset, *cnt);</div><div class='ctx'> </div><div class='hunk'>@@ -1167,31 +1440,58 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	exp = fhp-&gt;fh_export;</div><div class='del'>-	use_wgather = (rqstp-&gt;rq_vers == 2) &amp;&amp; EX_WGATHER(exp);</div><div class='ctx'> </div><div class='ctx'> 	if (!EX_ISSYNC(exp))</div><div class='ctx'> 		stable = NFS_UNSTABLE;</div><div class='add'>+	init_sync_kiocb(&amp;kiocb, file);</div><div class='add'>+	kiocb.ki_pos = offset;</div><div class='add'>+	if (likely(!fhp-&gt;fh_use_wgather)) {</div><div class='add'>+		switch (stable) {</div><div class='add'>+		case NFS_FILE_SYNC:</div><div class='add'>+			/* persist data and timestamps */</div><div class='add'>+			kiocb.ki_flags |= IOCB_DSYNC | IOCB_SYNC;</div><div class='add'>+			break;</div><div class='add'>+		case NFS_DATA_SYNC:</div><div class='add'>+			/* persist data only */</div><div class='add'>+			kiocb.ki_flags |= IOCB_DSYNC;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (stable &amp;&amp; !use_wgather)</div><div class='del'>-		flags |= RWF_SYNC;</div><div class='add'>+	nvecs = xdr_buf_to_bvec(rqstp-&gt;rq_bvec, rqstp-&gt;rq_maxpages, payload);</div><div class='ctx'> </div><div class='del'>-	iov_iter_kvec(&amp;iter, ITER_SOURCE, vec, vlen, *cnt);</div><div class='ctx'> 	since = READ_ONCE(file-&gt;f_wb_err);</div><div class='ctx'> 	if (verf)</div><div class='ctx'> 		nfsd_copy_write_verifier(verf, nn);</div><div class='del'>-	host_err = vfs_iter_write(file, &amp;iter, &amp;pos, flags);</div><div class='add'>+</div><div class='add'>+	switch (nfsd_io_cache_write) {</div><div class='add'>+	case NFSD_IO_DIRECT:</div><div class='add'>+		host_err = nfsd_direct_write(rqstp, fhp, nf, nvecs,</div><div class='add'>+					     cnt, &amp;kiocb);</div><div class='add'>+		break;</div><div class='add'>+	case NFSD_IO_DONTCACHE:</div><div class='add'>+		if (file-&gt;f_op-&gt;fop_flags &amp; FOP_DONTCACHE)</div><div class='add'>+			kiocb.ki_flags |= IOCB_DONTCACHE;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NFSD_IO_BUFFERED:</div><div class='add'>+		iov_iter_bvec(&amp;iter, ITER_SOURCE, rqstp-&gt;rq_bvec, nvecs, *cnt);</div><div class='add'>+		host_err = vfs_iocb_iter_write(file, &amp;kiocb, &amp;iter);</div><div class='add'>+		if (host_err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		*cnt = host_err;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	if (host_err &lt; 0) {</div><div class='ctx'> 		commit_reset_write_verifier(nn, rqstp, host_err);</div><div class='ctx'> 		goto out_nfserr;</div><div class='ctx'> 	}</div><div class='del'>-	*cnt = host_err;</div><div class='del'>-	nfsd_stats_io_write_add(exp, *cnt);</div><div class='add'>+	nfsd_stats_io_write_add(nn, exp, *cnt);</div><div class='ctx'> 	fsnotify_modify(file);</div><div class='ctx'> 	host_err = filemap_check_wb_err(file-&gt;f_mapping, since);</div><div class='ctx'> 	if (host_err &lt; 0)</div><div class='ctx'> 		goto out_nfserr;</div><div class='ctx'> </div><div class='del'>-	if (stable &amp;&amp; use_wgather) {</div><div class='add'>+	if (stable &amp;&amp; fhp-&gt;fh_use_wgather) {</div><div class='ctx'> 		host_err = wait_for_concurrent_writes(file);</div><div class='ctx'> 		if (host_err &lt; 0)</div><div class='ctx'> 			commit_reset_write_verifier(nn, rqstp, host_err);</div><div class='hunk'>@@ -1226,6 +1526,8 @@ out_nfserr:</div><div class='ctx'>  */</div><div class='ctx'> bool nfsd_read_splice_ok(struct svc_rqst *rqstp)</div><div class='ctx'> {</div><div class='add'>+	if (nfsd_disable_splice_read)</div><div class='add'>+		return false;</div><div class='ctx'> 	switch (svc_auth_flavor(rqstp)) {</div><div class='ctx'> 	case RPC_AUTH_GSS_KRB5I:</div><div class='ctx'> 	case RPC_AUTH_GSS_KRB5P:</div><div class='hunk'>@@ -1266,21 +1568,31 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	if (file-&gt;f_op-&gt;splice_read &amp;&amp; nfsd_read_splice_ok(rqstp))</div><div class='ctx'> 		err = nfsd_splice_read(rqstp, fhp, file, offset, count, eof);</div><div class='ctx'> 	else</div><div class='del'>-		err = nfsd_iter_read(rqstp, fhp, file, offset, count, 0, eof);</div><div class='add'>+		err = nfsd_iter_read(rqstp, fhp, nf, offset, count, 0, eof);</div><div class='ctx'> </div><div class='ctx'> 	nfsd_file_put(nf);</div><div class='ctx'> 	trace_nfsd_read_done(rqstp, fhp, offset, *count);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Write data to a file.</div><div class='del'>- * The stable flag requests synchronous writes.</div><div class='del'>- * N.B. After this call fhp needs an fh_put</div><div class='add'>+/**</div><div class='add'>+ * nfsd_write - open a file and write data to it</div><div class='add'>+ * @rqstp: RPC execution context</div><div class='add'>+ * @fhp: File handle of file to write into; nfsd_write() may modify it</div><div class='add'>+ * @offset: Byte offset of start</div><div class='add'>+ * @payload: xdr_buf containing the write payload</div><div class='add'>+ * @cnt: IN: number of bytes to write, OUT: number of bytes actually written</div><div class='add'>+ * @stable: An NFS stable_how value</div><div class='add'>+ * @verf: NFS WRITE verifier</div><div class='add'>+ *</div><div class='add'>+ * Upon return, caller must invoke fh_put on @fhp.</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   An nfsstat value in network byte order.</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,</div><div class='del'>-	   struct kvec *vec, int vlen, unsigned long *cnt, int stable,</div><div class='add'>+	   const struct xdr_buf *payload, unsigned long *cnt, int stable,</div><div class='ctx'> 	   __be32 *verf)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd_file *nf;</div><div class='hunk'>@@ -1292,8 +1604,8 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = nfsd_vfs_write(rqstp, fhp, nf, offset, vec,</div><div class='del'>-			vlen, cnt, stable, verf);</div><div class='add'>+	err = nfsd_vfs_write(rqstp, fhp, nf, offset, payload, cnt,</div><div class='add'>+			     stable, verf);</div><div class='ctx'> 	nfsd_file_put(nf);</div><div class='ctx'> out:</div><div class='ctx'> 	trace_nfsd_write_done(rqstp, fhp, offset, *cnt);</div><div class='hunk'>@@ -1329,6 +1641,8 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,</div><div class='ctx'> 	loff_t			start, end;</div><div class='ctx'> 	struct nfsd_net		*nn;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_commit_start(rqstp, fhp, offset, count);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Convert the client-provided (offset, count) range to a</div><div class='ctx'> 	 * (start, end) range. If the client-provided range falls</div><div class='hunk'>@@ -1367,6 +1681,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,</div><div class='ctx'> 	} else</div><div class='ctx'> 		nfsd_copy_write_verifier(verf, nn);</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_commit_done(rqstp, fhp, offset, count);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1403,8 +1718,8 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	 * Callers expect new file metadata to be committed even</div><div class='ctx'> 	 * if the attributes have not changed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (iap-&gt;ia_valid)</div><div class='del'>-		status = nfsd_setattr(rqstp, resfhp, attrs, 0, (time64_t)0);</div><div class='add'>+	if (nfsd_attrs_valid(attrs))</div><div class='add'>+		status = nfsd_setattr(rqstp, resfhp, attrs, NULL);</div><div class='ctx'> 	else</div><div class='ctx'> 		status = nfserrno(commit_metadata(resfhp));</div><div class='ctx'> </div><div class='hunk'>@@ -1440,7 +1755,7 @@ nfsd_check_ignore_resizing(struct iattr *iap)</div><div class='ctx'> 		iap-&gt;ia_valid &amp;= ~ATTR_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The parent directory should already be locked: */</div><div class='add'>+/* The parent directory should already be locked - we will unlock */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 		   struct nfsd_attrs *attrs,</div><div class='hunk'>@@ -1450,13 +1765,14 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	struct inode	*dirp;</div><div class='ctx'> 	struct iattr	*iap = attrs-&gt;na_iattr;</div><div class='ctx'> 	__be32		err;</div><div class='del'>-	int		host_err;</div><div class='add'>+	int		host_err = 0;</div><div class='ctx'> </div><div class='ctx'> 	dentry = fhp-&gt;fh_dentry;</div><div class='ctx'> 	dirp = d_inode(dentry);</div><div class='ctx'> </div><div class='ctx'> 	dchild = dget(resfhp-&gt;fh_dentry);</div><div class='del'>-	err = nfsd_permission(rqstp, fhp-&gt;fh_export, dentry, NFSD_MAY_CREATE);</div><div class='add'>+	err = nfsd_permission(&amp;rqstp-&gt;rq_cred, fhp-&gt;fh_export, dentry,</div><div class='add'>+			      NFSD_MAY_CREATE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1470,34 +1786,20 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case S_IFREG:</div><div class='del'>-		host_err = vfs_create(&amp;nop_mnt_idmap, dirp, dchild,</div><div class='del'>-				      iap-&gt;ia_mode, true);</div><div class='add'>+		host_err = vfs_create(&amp;nop_mnt_idmap, dchild, iap-&gt;ia_mode, NULL);</div><div class='ctx'> 		if (!host_err)</div><div class='ctx'> 			nfsd_check_ignore_resizing(iap);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFDIR:</div><div class='del'>-		host_err = vfs_mkdir(&amp;nop_mnt_idmap, dirp, dchild, iap-&gt;ia_mode);</div><div class='del'>-		if (!host_err &amp;&amp; unlikely(d_unhashed(dchild))) {</div><div class='del'>-			struct dentry *d;</div><div class='del'>-			d = lookup_one_len(dchild-&gt;d_name.name,</div><div class='del'>-					   dchild-&gt;d_parent,</div><div class='del'>-					   dchild-&gt;d_name.len);</div><div class='del'>-			if (IS_ERR(d)) {</div><div class='del'>-				host_err = PTR_ERR(d);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (unlikely(d_is_negative(d))) {</div><div class='del'>-				dput(d);</div><div class='del'>-				err = nfserr_serverfault;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+		dchild = vfs_mkdir(&amp;nop_mnt_idmap, dirp, dchild, iap-&gt;ia_mode, NULL);</div><div class='add'>+		if (IS_ERR(dchild)) {</div><div class='add'>+			host_err = PTR_ERR(dchild);</div><div class='add'>+		} else if (d_is_negative(dchild)) {</div><div class='add'>+			err = nfserr_serverfault;</div><div class='add'>+			goto out;</div><div class='add'>+		} else if (unlikely(dchild != resfhp-&gt;fh_dentry)) {</div><div class='ctx'> 			dput(resfhp-&gt;fh_dentry);</div><div class='del'>-			resfhp-&gt;fh_dentry = dget(d);</div><div class='del'>-			err = fh_update(resfhp);</div><div class='del'>-			dput(dchild);</div><div class='del'>-			dchild = d;</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+			resfhp-&gt;fh_dentry = dget(dchild);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S_IFCHR:</div><div class='hunk'>@@ -1505,7 +1807,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	case S_IFIFO:</div><div class='ctx'> 	case S_IFSOCK:</div><div class='ctx'> 		host_err = vfs_mknod(&amp;nop_mnt_idmap, dirp, dchild,</div><div class='del'>-				     iap-&gt;ia_mode, rdev);</div><div class='add'>+				     iap-&gt;ia_mode, rdev, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n",</div><div class='hunk'>@@ -1518,7 +1820,9 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	err = nfsd_create_setattr(rqstp, fhp, resfhp, attrs);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	dput(dchild);</div><div class='add'>+	if (!err)</div><div class='add'>+		fh_fill_post_attrs(fhp);</div><div class='add'>+	end_creating(dchild);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> out_nfserr:</div><div class='hunk'>@@ -1541,6 +1845,8 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	__be32		err;</div><div class='ctx'> 	int		host_err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_create(rqstp, fhp, type, fname, flen);</div><div class='add'>+</div><div class='ctx'> 	if (isdotent(fname, flen))</div><div class='ctx'> 		return nfserr_exist;</div><div class='ctx'> </div><div class='hunk'>@@ -1554,28 +1860,24 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	if (host_err)</div><div class='ctx'> 		return nfserrno(host_err);</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	dchild = lookup_one_len(fname, dentry, flen);</div><div class='add'>+	dchild = start_creating(&amp;nop_mnt_idmap, dentry, &amp;QSTR_LEN(fname, flen));</div><div class='ctx'> 	host_err = PTR_ERR(dchild);</div><div class='del'>-	if (IS_ERR(dchild)) {</div><div class='del'>-		err = nfserrno(host_err);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(dchild))</div><div class='add'>+		return nfserrno(host_err);</div><div class='add'>+</div><div class='ctx'> 	err = fh_compose(resfhp, fhp-&gt;fh_export, dchild, fhp);</div><div class='del'>-	/*</div><div class='del'>-	 * We unconditionally drop our ref to dchild as fh_compose will have</div><div class='del'>-	 * already grabbed its own ref for it.</div><div class='del'>-	 */</div><div class='del'>-	dput(dchild);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	err = fh_fill_pre_attrs(fhp);</div><div class='ctx'> 	if (err != nfs_ok)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	err = nfsd_create_locked(rqstp, fhp, attrs, type, rdev, resfhp);</div><div class='del'>-	fh_fill_post_attrs(fhp);</div><div class='add'>+	/* nfsd_create_locked() unlocked the parent */</div><div class='add'>+	dput(dchild);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='ctx'> out_unlock:</div><div class='del'>-	inode_unlock(dentry-&gt;d_inode);</div><div class='add'>+	end_creating(dchild);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1641,6 +1943,8 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	__be32		err, cerr;</div><div class='ctx'> 	int		host_err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_symlink(rqstp, fhp, fname, flen, path);</div><div class='add'>+</div><div class='ctx'> 	err = nfserr_noent;</div><div class='ctx'> 	if (!flen || path[0] == '\0')</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1659,37 +1963,43 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dentry = fhp-&gt;fh_dentry;</div><div class='del'>-	inode_lock_nested(dentry-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	dnew = lookup_one_len(fname, dentry, flen);</div><div class='add'>+	dnew = start_creating(&amp;nop_mnt_idmap, dentry, &amp;QSTR_LEN(fname, flen));</div><div class='ctx'> 	if (IS_ERR(dnew)) {</div><div class='ctx'> 		err = nfserrno(PTR_ERR(dnew));</div><div class='del'>-		inode_unlock(dentry-&gt;d_inode);</div><div class='ctx'> 		goto out_drop_write;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = fh_fill_pre_attrs(fhp);</div><div class='ctx'> 	if (err != nfs_ok)</div><div class='ctx'> 		goto out_unlock;</div><div class='del'>-	host_err = vfs_symlink(&amp;nop_mnt_idmap, d_inode(dentry), dnew, path);</div><div class='add'>+	host_err = vfs_symlink(&amp;nop_mnt_idmap, d_inode(dentry), dnew, path, NULL);</div><div class='ctx'> 	err = nfserrno(host_err);</div><div class='ctx'> 	cerr = fh_compose(resfhp, fhp-&gt;fh_export, dnew, fhp);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		nfsd_create_setattr(rqstp, fhp, resfhp, attrs);</div><div class='ctx'> 	fh_fill_post_attrs(fhp);</div><div class='ctx'> out_unlock:</div><div class='del'>-	inode_unlock(dentry-&gt;d_inode);</div><div class='add'>+	end_creating(dnew);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = nfserrno(commit_metadata(fhp));</div><div class='del'>-	dput(dnew);</div><div class='del'>-	if (err==0) err = cerr;</div><div class='add'>+	if (!err)</div><div class='add'>+		err = cerr;</div><div class='ctx'> out_drop_write:</div><div class='ctx'> 	fh_drop_write(fhp);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Create a hardlink</div><div class='del'>- * N.B. After this call _both_ ffhp and tfhp need an fh_put</div><div class='add'>+/**</div><div class='add'>+ * nfsd_link - create a link</div><div class='add'>+ * @rqstp: RPC transaction context</div><div class='add'>+ * @ffhp: the file handle of the directory where the new link is to be created</div><div class='add'>+ * @name: the filename of the new link</div><div class='add'>+ * @len: the length of @name in octets</div><div class='add'>+ * @tfhp: the file handle of an existing file object</div><div class='add'>+ *</div><div class='add'>+ * After this call _both_ ffhp and tfhp need an fh_put.</div><div class='add'>+ *</div><div class='add'>+ * Returns a generic NFS status code in network byte-order.</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,</div><div class='hunk'>@@ -1697,9 +2007,12 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry	*ddir, *dnew, *dold;</div><div class='ctx'> 	struct inode	*dirp;</div><div class='add'>+	int		type;</div><div class='ctx'> 	__be32		err;</div><div class='ctx'> 	int		host_err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_link(rqstp, ffhp, tfhp, name, len);</div><div class='add'>+</div><div class='ctx'> 	err = fh_verify(rqstp, ffhp, S_IFDIR, NFSD_MAY_CREATE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1716,54 +2029,53 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,</div><div class='ctx'> 	if (isdotent(name, len))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	err = nfs_ok;</div><div class='add'>+	type = d_inode(tfhp-&gt;fh_dentry)-&gt;i_mode &amp; S_IFMT;</div><div class='ctx'> 	host_err = fh_want_write(tfhp);</div><div class='del'>-	if (host_err) {</div><div class='del'>-		err = nfserrno(host_err);</div><div class='add'>+	if (host_err)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ddir = ffhp-&gt;fh_dentry;</div><div class='ctx'> 	dirp = d_inode(ddir);</div><div class='del'>-	inode_lock_nested(dirp, I_MUTEX_PARENT);</div><div class='add'>+	dnew = start_creating(&amp;nop_mnt_idmap, ddir, &amp;QSTR_LEN(name, len));</div><div class='ctx'> </div><div class='del'>-	dnew = lookup_one_len(name, ddir, len);</div><div class='ctx'> 	if (IS_ERR(dnew)) {</div><div class='del'>-		err = nfserrno(PTR_ERR(dnew));</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		host_err = PTR_ERR(dnew);</div><div class='add'>+		goto out_drop_write;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dold = tfhp-&gt;fh_dentry;</div><div class='ctx'> </div><div class='ctx'> 	err = nfserr_noent;</div><div class='ctx'> 	if (d_really_is_negative(dold))</div><div class='del'>-		goto out_dput;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	err = fh_fill_pre_attrs(ffhp);</div><div class='ctx'> 	if (err != nfs_ok)</div><div class='del'>-		goto out_dput;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	host_err = vfs_link(dold, &amp;nop_mnt_idmap, dirp, dnew, NULL);</div><div class='ctx'> 	fh_fill_post_attrs(ffhp);</div><div class='del'>-	inode_unlock(dirp);</div><div class='add'>+out_unlock:</div><div class='add'>+	end_creating(dnew);</div><div class='ctx'> 	if (!host_err) {</div><div class='del'>-		err = nfserrno(commit_metadata(ffhp));</div><div class='del'>-		if (!err)</div><div class='del'>-			err = nfserrno(commit_metadata(tfhp));</div><div class='del'>-	} else {</div><div class='del'>-		if (host_err == -EXDEV &amp;&amp; rqstp-&gt;rq_vers == 2)</div><div class='del'>-			err = nfserr_acces;</div><div class='del'>-		else</div><div class='del'>-			err = nfserrno(host_err);</div><div class='add'>+		host_err = commit_metadata(ffhp);</div><div class='add'>+		if (!host_err)</div><div class='add'>+			host_err = commit_metadata(tfhp);</div><div class='ctx'> 	}</div><div class='del'>-	dput(dnew);</div><div class='add'>+</div><div class='ctx'> out_drop_write:</div><div class='ctx'> 	fh_drop_write(tfhp);</div><div class='add'>+	if (host_err == -EBUSY) {</div><div class='add'>+		/*</div><div class='add'>+		 * See RFC 8881 Section 18.9.4 para 1-2: NFSv4 LINK</div><div class='add'>+		 * wants a status unique to the object type.</div><div class='add'>+		 */</div><div class='add'>+		if (type != S_IFDIR)</div><div class='add'>+			err = nfserr_file_open;</div><div class='add'>+		else</div><div class='add'>+			err = nfserr_acces;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-out_dput:</div><div class='del'>-	dput(dnew);</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(dirp);</div><div class='del'>-	goto out_drop_write;</div><div class='add'>+	return err != nfs_ok ? err : nfserrno(host_err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1786,19 +2098,32 @@ nfsd_has_cached_files(struct dentry *dentry)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Rename a file</div><div class='del'>- * N.B. After this call _both_ ffhp and tfhp need an fh_put</div><div class='add'>+/**</div><div class='add'>+ * nfsd_rename - rename a directory entry</div><div class='add'>+ * @rqstp: RPC transaction context</div><div class='add'>+ * @ffhp: the file handle of parent directory containing the entry to be renamed</div><div class='add'>+ * @fname: the filename of directory entry to be renamed</div><div class='add'>+ * @flen: the length of @fname in octets</div><div class='add'>+ * @tfhp: the file handle of parent directory to contain the renamed entry</div><div class='add'>+ * @tname: the filename of the new entry</div><div class='add'>+ * @tlen: the length of @tlen in octets</div><div class='add'>+ *</div><div class='add'>+ * After this call _both_ ffhp and tfhp need an fh_put.</div><div class='add'>+ *</div><div class='add'>+ * Returns a generic NFS status code in network byte-order.</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,</div><div class='ctx'> 			    struct svc_fh *tfhp, char *tname, int tlen)</div><div class='ctx'> {</div><div class='del'>-	struct dentry	*fdentry, *tdentry, *odentry, *ndentry, *trap;</div><div class='del'>-	struct inode	*fdir, *tdir;</div><div class='add'>+	struct dentry	*fdentry, *tdentry;</div><div class='add'>+	int		type = S_IFDIR;</div><div class='add'>+	struct renamedata rd = {};</div><div class='ctx'> 	__be32		err;</div><div class='ctx'> 	int		host_err;</div><div class='del'>-	bool		close_cached = false;</div><div class='add'>+	struct dentry	*close_cached;</div><div class='add'>+</div><div class='add'>+	trace_nfsd_vfs_rename(rqstp, ffhp, tfhp, fname, flen, tname, tlen);</div><div class='ctx'> </div><div class='ctx'> 	err = fh_verify(rqstp, ffhp, S_IFDIR, NFSD_MAY_REMOVE);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1808,32 +2133,37 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	fdentry = ffhp-&gt;fh_dentry;</div><div class='del'>-	fdir = d_inode(fdentry);</div><div class='ctx'> </div><div class='ctx'> 	tdentry = tfhp-&gt;fh_dentry;</div><div class='del'>-	tdir = d_inode(tdentry);</div><div class='ctx'> </div><div class='ctx'> 	err = nfserr_perm;</div><div class='ctx'> 	if (!flen || isdotent(fname, flen) || !tlen || isdotent(tname, tlen))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = (rqstp-&gt;rq_vers == 2) ? nfserr_acces : nfserr_xdev;</div><div class='add'>+	err = nfserr_xdev;</div><div class='ctx'> 	if (ffhp-&gt;fh_export-&gt;ex_path.mnt != tfhp-&gt;fh_export-&gt;ex_path.mnt)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (ffhp-&gt;fh_export-&gt;ex_path.dentry != tfhp-&gt;fh_export-&gt;ex_path.dentry)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='add'>+	close_cached = NULL;</div><div class='ctx'> 	host_err = fh_want_write(ffhp);</div><div class='ctx'> 	if (host_err) {</div><div class='ctx'> 		err = nfserrno(host_err);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trap = lock_rename(tdentry, fdentry);</div><div class='del'>-	if (IS_ERR(trap)) {</div><div class='del'>-		err = (rqstp-&gt;rq_vers == 2) ? nfserr_acces : nfserr_xdev;</div><div class='del'>-		goto out;</div><div class='add'>+	rd.mnt_idmap	= &amp;nop_mnt_idmap;</div><div class='add'>+	rd.old_parent	= fdentry;</div><div class='add'>+	rd.new_parent	= tdentry;</div><div class='add'>+</div><div class='add'>+	host_err = start_renaming(&amp;rd, 0, &amp;QSTR_LEN(fname, flen),</div><div class='add'>+				  &amp;QSTR_LEN(tname, tlen));</div><div class='add'>+</div><div class='add'>+	if (host_err) {</div><div class='add'>+		err = nfserrno(host_err);</div><div class='add'>+		goto out_want_write;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = fh_fill_pre_attrs(ffhp);</div><div class='ctx'> 	if (err != nfs_ok)</div><div class='hunk'>@@ -1842,46 +2172,23 @@ retry:</div><div class='ctx'> 	if (err != nfs_ok)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	odentry = lookup_one_len(fname, fdentry, flen);</div><div class='del'>-	host_err = PTR_ERR(odentry);</div><div class='del'>-	if (IS_ERR(odentry))</div><div class='del'>-		goto out_nfserr;</div><div class='add'>+	type = d_inode(rd.old_dentry)-&gt;i_mode &amp; S_IFMT;</div><div class='add'>+</div><div class='add'>+	if (d_inode(rd.new_dentry))</div><div class='add'>+		type = d_inode(rd.new_dentry)-&gt;i_mode &amp; S_IFMT;</div><div class='ctx'> </div><div class='del'>-	host_err = -ENOENT;</div><div class='del'>-	if (d_really_is_negative(odentry))</div><div class='del'>-		goto out_dput_old;</div><div class='del'>-	host_err = -EINVAL;</div><div class='del'>-	if (odentry == trap)</div><div class='del'>-		goto out_dput_old;</div><div class='del'>-</div><div class='del'>-	ndentry = lookup_one_len(tname, tdentry, tlen);</div><div class='del'>-	host_err = PTR_ERR(ndentry);</div><div class='del'>-	if (IS_ERR(ndentry))</div><div class='del'>-		goto out_dput_old;</div><div class='del'>-	host_err = -ENOTEMPTY;</div><div class='del'>-	if (ndentry == trap)</div><div class='del'>-		goto out_dput_new;</div><div class='del'>-</div><div class='del'>-	if ((ndentry-&gt;d_sb-&gt;s_export_op-&gt;flags &amp; EXPORT_OP_CLOSE_BEFORE_UNLINK) &amp;&amp;</div><div class='del'>-	    nfsd_has_cached_files(ndentry)) {</div><div class='del'>-		close_cached = true;</div><div class='del'>-		goto out_dput_old;</div><div class='add'>+	if ((rd.new_dentry-&gt;d_sb-&gt;s_export_op-&gt;flags &amp; EXPORT_OP_CLOSE_BEFORE_UNLINK) &amp;&amp;</div><div class='add'>+	    nfsd_has_cached_files(rd.new_dentry)) {</div><div class='add'>+		close_cached = dget(rd.new_dentry);</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	} else {</div><div class='del'>-		struct renamedata rd = {</div><div class='del'>-			.old_mnt_idmap	= &amp;nop_mnt_idmap,</div><div class='del'>-			.old_dir	= fdir,</div><div class='del'>-			.old_dentry	= odentry,</div><div class='del'>-			.new_mnt_idmap	= &amp;nop_mnt_idmap,</div><div class='del'>-			.new_dir	= tdir,</div><div class='del'>-			.new_dentry	= ndentry,</div><div class='del'>-		};</div><div class='ctx'> 		int retries;</div><div class='ctx'> </div><div class='ctx'> 		for (retries = 1;;) {</div><div class='ctx'> 			host_err = vfs_rename(&amp;rd);</div><div class='ctx'> 			if (host_err != -EAGAIN || !retries--)</div><div class='ctx'> 				break;</div><div class='del'>-			if (!nfsd_wait_for_delegreturn(rqstp, d_inode(odentry)))</div><div class='add'>+			if (!nfsd_wait_for_delegreturn(rqstp, d_inode(rd.old_dentry)))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!host_err) {</div><div class='hunk'>@@ -1890,40 +2197,54 @@ retry:</div><div class='ctx'> 				host_err = commit_metadata(ffhp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>- out_dput_new:</div><div class='del'>-	dput(ndentry);</div><div class='del'>- out_dput_old:</div><div class='del'>-	dput(odentry);</div><div class='del'>- out_nfserr:</div><div class='del'>-	err = nfserrno(host_err);</div><div class='add'>+	if (host_err == -EBUSY) {</div><div class='add'>+		/*</div><div class='add'>+		 * See RFC 8881 Section 18.26.4 para 1-3: NFSv4 RENAME</div><div class='add'>+		 * wants a status unique to the object type.</div><div class='add'>+		 */</div><div class='add'>+		if (type != S_IFDIR)</div><div class='add'>+			err = nfserr_file_open;</div><div class='add'>+		else</div><div class='add'>+			err = nfserr_acces;</div><div class='add'>+	} else {</div><div class='add'>+		err = nfserrno(host_err);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!close_cached) {</div><div class='ctx'> 		fh_fill_post_attrs(ffhp);</div><div class='ctx'> 		fh_fill_post_attrs(tfhp);</div><div class='ctx'> 	}</div><div class='ctx'> out_unlock:</div><div class='del'>-	unlock_rename(tdentry, fdentry);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='add'>+out_want_write:</div><div class='ctx'> 	fh_drop_write(ffhp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If the target dentry has cached open files, then we need to try to</div><div class='del'>-	 * close them prior to doing the rename. Flushing delayed fput</div><div class='del'>-	 * shouldn't be done with locks held however, so we delay it until this</div><div class='del'>-	 * point and then reattempt the whole shebang.</div><div class='add'>+	 * If the target dentry has cached open files, then we need to</div><div class='add'>+	 * try to close them prior to doing the rename.  Final fput</div><div class='add'>+	 * shouldn't be done with locks held however, so we delay it</div><div class='add'>+	 * until this point and then reattempt the whole shebang.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (close_cached) {</div><div class='del'>-		close_cached = false;</div><div class='del'>-		nfsd_close_cached_files(ndentry);</div><div class='del'>-		dput(ndentry);</div><div class='add'>+		nfsd_close_cached_files(close_cached);</div><div class='add'>+		dput(close_cached);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Unlink a file or directory</div><div class='del'>- * N.B. After this call fhp needs an fh_put</div><div class='add'>+/**</div><div class='add'>+ * nfsd_unlink - remove a directory entry</div><div class='add'>+ * @rqstp: RPC transaction context</div><div class='add'>+ * @fhp: the file handle of the parent directory to be modified</div><div class='add'>+ * @type: enforced file type of the object to be removed</div><div class='add'>+ * @fname: the name of directory entry to be removed</div><div class='add'>+ * @flen: length of @fname in octets</div><div class='add'>+ *</div><div class='add'>+ * After this call fhp needs an fh_put.</div><div class='add'>+ *</div><div class='add'>+ * Returns a generic NFS status code in network byte-order.</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='ctx'> nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,</div><div class='hunk'>@@ -1931,10 +2252,12 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry	*dentry, *rdentry;</div><div class='ctx'> 	struct inode	*dirp;</div><div class='del'>-	struct inode	*rinode;</div><div class='add'>+	struct inode	*rinode = NULL;</div><div class='ctx'> 	__be32		err;</div><div class='ctx'> 	int		host_err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_unlink(rqstp, fhp, fname, flen);</div><div class='add'>+</div><div class='ctx'> 	err = nfserr_acces;</div><div class='ctx'> 	if (!flen || isdotent(fname, flen))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1948,24 +2271,21 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,</div><div class='ctx'> </div><div class='ctx'> 	dentry = fhp-&gt;fh_dentry;</div><div class='ctx'> 	dirp = d_inode(dentry);</div><div class='del'>-	inode_lock_nested(dirp, I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='del'>-	rdentry = lookup_one_len(fname, dentry, flen);</div><div class='add'>+	rdentry = start_removing(&amp;nop_mnt_idmap, dentry, &amp;QSTR_LEN(fname, flen));</div><div class='add'>+</div><div class='ctx'> 	host_err = PTR_ERR(rdentry);</div><div class='ctx'> 	if (IS_ERR(rdentry))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out_drop_write;</div><div class='ctx'> </div><div class='del'>-	if (d_really_is_negative(rdentry)) {</div><div class='del'>-		dput(rdentry);</div><div class='del'>-		host_err = -ENOENT;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-	rinode = d_inode(rdentry);</div><div class='ctx'> 	err = fh_fill_pre_attrs(fhp);</div><div class='ctx'> 	if (err != nfs_ok)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	rinode = d_inode(rdentry);</div><div class='add'>+	/* Prevent truncation until after locks dropped */</div><div class='ctx'> 	ihold(rinode);</div><div class='add'>+</div><div class='ctx'> 	if (!type)</div><div class='ctx'> 		type = d_inode(rdentry)-&gt;i_mode &amp; S_IFMT;</div><div class='ctx'> </div><div class='hunk'>@@ -1983,35 +2303,31 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		host_err = vfs_rmdir(&amp;nop_mnt_idmap, dirp, rdentry);</div><div class='add'>+		host_err = vfs_rmdir(&amp;nop_mnt_idmap, dirp, rdentry, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	fh_fill_post_attrs(fhp);</div><div class='ctx'> </div><div class='del'>-	inode_unlock(dirp);</div><div class='del'>-	if (!host_err)</div><div class='add'>+out_unlock:</div><div class='add'>+	end_removing(rdentry);</div><div class='add'>+	if (!err &amp;&amp; !host_err)</div><div class='ctx'> 		host_err = commit_metadata(fhp);</div><div class='del'>-	dput(rdentry);</div><div class='ctx'> 	iput(rinode);    /* truncate the inode here */</div><div class='ctx'> </div><div class='ctx'> out_drop_write:</div><div class='ctx'> 	fh_drop_write(fhp);</div><div class='ctx'> out_nfserr:</div><div class='ctx'> 	if (host_err == -EBUSY) {</div><div class='del'>-		/* name is mounted-on. There is no perfect</div><div class='del'>-		 * error status.</div><div class='add'>+		/*</div><div class='add'>+		 * See RFC 8881 Section 18.25.4 para 4: NFSv4 REMOVE</div><div class='add'>+		 * wants a status unique to the object type.</div><div class='ctx'> 		 */</div><div class='del'>-		if (nfsd_v4client(rqstp))</div><div class='add'>+		if (type != S_IFDIR)</div><div class='ctx'> 			err = nfserr_file_open;</div><div class='ctx'> 		else</div><div class='ctx'> 			err = nfserr_acces;</div><div class='del'>-	} else {</div><div class='del'>-		err = nfserrno(host_err);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	return err;</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(dirp);</div><div class='del'>-	goto out_drop_write;</div><div class='add'>+	return err != nfs_ok ? err : nfserrno(host_err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2158,14 +2474,15 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,</div><div class='ctx'> 	loff_t		offset = *offsetp;</div><div class='ctx'> 	int             may_flags = NFSD_MAY_READ;</div><div class='ctx'> </div><div class='del'>-	/* NFSv2 only supports 32 bit cookies */</div><div class='del'>-	if (rqstp-&gt;rq_vers &gt; 2)</div><div class='del'>-		may_flags |= NFSD_MAY_64BIT_COOKIE;</div><div class='del'>-</div><div class='ctx'> 	err = nfsd_open(rqstp, fhp, S_IFDIR, may_flags, &amp;file);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (fhp-&gt;fh_64bit_cookies)</div><div class='add'>+		file-&gt;f_mode |= FMODE_64BITHASH;</div><div class='add'>+	else</div><div class='add'>+		file-&gt;f_mode |= FMODE_32BITHASH;</div><div class='add'>+</div><div class='ctx'> 	offset = vfs_llseek(file, offset, SEEK_SET);</div><div class='ctx'> 	if (offset &lt; 0) {</div><div class='ctx'> 		err = nfserrno((int)offset);</div><div class='hunk'>@@ -2177,11 +2494,43 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,</div><div class='ctx'> 	if (err == nfserr_eof || err == nfserr_toosmall)</div><div class='ctx'> 		err = nfs_ok; /* can still be found in -&gt;err */</div><div class='ctx'> out_close:</div><div class='del'>-	fput(file);</div><div class='add'>+	nfsd_filp_close(file);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nfsd_filp_close: close a file synchronously</div><div class='add'>+ * @fp: the file to close</div><div class='add'>+ *</div><div class='add'>+ * nfsd_filp_close() is similar in behaviour to filp_close().</div><div class='add'>+ * The difference is that if this is the final close on the</div><div class='add'>+ * file, the that finalisation happens immediately, rather then</div><div class='add'>+ * being handed over to a work_queue, as it the case for</div><div class='add'>+ * filp_close().</div><div class='add'>+ * When a user-space process closes a file (even when using</div><div class='add'>+ * filp_close() the finalisation happens before returning to</div><div class='add'>+ * userspace, so it is effectively synchronous.  When a kernel thread</div><div class='add'>+ * uses file_close(), on the other hand, the handling is completely</div><div class='add'>+ * asynchronous.  This means that any cost imposed by that finalisation</div><div class='add'>+ * is not imposed on the nfsd thread, and nfsd could potentually</div><div class='add'>+ * close files more quickly than the work queue finalises the close,</div><div class='add'>+ * which would lead to unbounded growth in the queue.</div><div class='add'>+ *</div><div class='add'>+ * In some contexts is it not safe to synchronously wait for</div><div class='add'>+ * close finalisation (see comment for __fput_sync()), but nfsd</div><div class='add'>+ * does not match those contexts.  In partcilarly it does not, at the</div><div class='add'>+ * time that this function is called, hold and locks and no finalisation</div><div class='add'>+ * of any file, socket, or device driver would have any cause to wait</div><div class='add'>+ * for nfsd to make progress.</div><div class='add'>+ */</div><div class='add'>+void nfsd_filp_close(struct file *fp)</div><div class='add'>+{</div><div class='add'>+	get_file(fp);</div><div class='add'>+	filp_close(fp, NULL);</div><div class='add'>+	__fput_sync(fp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get file system stats</div><div class='ctx'>  * N.B. After this call fhp needs an fh_put</div><div class='hunk'>@@ -2191,6 +2540,8 @@ nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat, in</div><div class='ctx'> {</div><div class='ctx'> 	__be32 err;</div><div class='ctx'> </div><div class='add'>+	trace_nfsd_vfs_statfs(rqstp, fhp);</div><div class='add'>+</div><div class='ctx'> 	err = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP | access);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		struct path path = {</div><div class='hunk'>@@ -2203,9 +2554,9 @@ nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat, in</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exp_rdonly(struct svc_rqst *rqstp, struct svc_export *exp)</div><div class='add'>+static int exp_rdonly(struct svc_cred *cred, struct svc_export *exp)</div><div class='ctx'> {</div><div class='del'>-	return nfsexp_flags(rqstp, exp) &amp; NFSEXP_READONLY;</div><div class='add'>+	return nfsexp_flags(cred, exp) &amp; NFSEXP_READONLY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='hunk'>@@ -2449,8 +2800,8 @@ out_unlock:</div><div class='ctx'>  * Check for a user's access permissions to this inode.</div><div class='ctx'>  */</div><div class='ctx'> __be32</div><div class='del'>-nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,</div><div class='del'>-					struct dentry *dentry, int acc)</div><div class='add'>+nfsd_permission(struct svc_cred *cred, struct svc_export *exp,</div><div class='add'>+		struct dentry *dentry, int acc)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode	*inode = d_inode(dentry);</div><div class='ctx'> 	int		err;</div><div class='hunk'>@@ -2465,7 +2816,7 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,</div><div class='ctx'> 		(acc &amp; NFSD_MAY_EXEC)?	" exec"  : "",</div><div class='ctx'> 		(acc &amp; NFSD_MAY_SATTR)?	" sattr" : "",</div><div class='ctx'> 		(acc &amp; NFSD_MAY_TRUNC)?	" trunc" : "",</div><div class='del'>-		(acc &amp; NFSD_MAY_LOCK)?	" lock"  : "",</div><div class='add'>+		(acc &amp; NFSD_MAY_NLM)?	" nlm"  : "",</div><div class='ctx'> 		(acc &amp; NFSD_MAY_OWNER_OVERRIDE)? " owneroverride" : "",</div><div class='ctx'> 		inode-&gt;i_mode,</div><div class='ctx'> 		IS_IMMUTABLE(inode)?	" immut" : "",</div><div class='hunk'>@@ -2481,7 +2832,7 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(acc &amp; NFSD_MAY_LOCAL_ACCESS))</div><div class='ctx'> 		if (acc &amp; (NFSD_MAY_WRITE | NFSD_MAY_SATTR | NFSD_MAY_TRUNC)) {</div><div class='del'>-			if (exp_rdonly(rqstp, exp) ||</div><div class='add'>+			if (exp_rdonly(cred, exp) ||</div><div class='ctx'> 			    __mnt_is_readonly(exp-&gt;ex_path.mnt))</div><div class='ctx'> 				return nfserr_rofs;</div><div class='ctx'> 			if (/* (acc &amp; NFSD_MAY_WRITE) &amp;&amp; */ IS_IMMUTABLE(inode))</div><div class='hunk'>@@ -2490,16 +2841,6 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,</div><div class='ctx'> 	if ((acc &amp; NFSD_MAY_TRUNC) &amp;&amp; IS_APPEND(inode))</div><div class='ctx'> 		return nfserr_perm;</div><div class='ctx'> </div><div class='del'>-	if (acc &amp; NFSD_MAY_LOCK) {</div><div class='del'>-		/* If we cannot rely on authentication in NLM requests,</div><div class='del'>-		 * just allow locks, otherwise require read permission, or</div><div class='del'>-		 * ownership</div><div class='del'>-		 */</div><div class='del'>-		if (exp-&gt;ex_flags &amp; NFSEXP_NOAUTHNLM)</div><div class='del'>-			return 0;</div><div class='del'>-		else</div><div class='del'>-			acc = NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE;</div><div class='del'>-	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The file owner always gets access permission for accesses that</div><div class='ctx'> 	 * would normally be checked at open time. This is to make</div><div class='head'>diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h<br/>index 702fbc4483bf..ded2900d423f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/vfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/vfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/vfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/vfs.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #define NFSD_MAY_READ			0x004 /* == MAY_READ */</div><div class='ctx'> #define NFSD_MAY_SATTR			0x008</div><div class='ctx'> #define NFSD_MAY_TRUNC			0x010</div><div class='del'>-#define NFSD_MAY_LOCK			0x020</div><div class='add'>+#define NFSD_MAY_NLM			0x020 /* request is from lockd */</div><div class='ctx'> #define NFSD_MAY_MASK			0x03f</div><div class='ctx'> </div><div class='ctx'> /* extra hints to permission and open routines: */</div><div class='hunk'>@@ -33,6 +33,8 @@</div><div class='ctx'> </div><div class='ctx'> #define NFSD_MAY_64BIT_COOKIE		0x1000 /* 64 bit readdir cookies for &gt;= NFSv3 */</div><div class='ctx'> </div><div class='add'>+#define NFSD_MAY_LOCALIO		0x2000 /* for tracing, reflects when localio used */</div><div class='add'>+</div><div class='ctx'> #define NFSD_MAY_CREATE		(NFSD_MAY_EXEC|NFSD_MAY_WRITE)</div><div class='ctx'> #define NFSD_MAY_REMOVE		(NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +62,14 @@ static inline void nfsd_attrs_free(struct nfsd_attrs *attrs)</div><div class='ctx'> 	posix_acl_release(attrs-&gt;na_dpacl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool nfsd_attrs_valid(struct nfsd_attrs *attrs)</div><div class='add'>+{</div><div class='add'>+	struct iattr *iap = attrs-&gt;na_iattr;</div><div class='add'>+</div><div class='add'>+	return (iap-&gt;ia_valid || (attrs-&gt;na_seclabel &amp;&amp;</div><div class='add'>+		attrs-&gt;na_seclabel-&gt;len));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __be32		nfserrno (int errno);</div><div class='ctx'> int		nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,</div><div class='ctx'> 		                struct svc_export **expp);</div><div class='hunk'>@@ -69,7 +79,7 @@ __be32		 nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,</div><div class='ctx'> 				const char *, unsigned int,</div><div class='ctx'> 				struct svc_export **, struct dentry **);</div><div class='ctx'> __be32		nfsd_setattr(struct svc_rqst *, struct svc_fh *,</div><div class='del'>-				struct nfsd_attrs *, int, time64_t);</div><div class='add'>+			     struct nfsd_attrs *, const struct timespec64 *);</div><div class='ctx'> int nfsd_mountpoint(struct dentry *, struct svc_export *);</div><div class='ctx'> #ifdef CONFIG_NFSD_V4</div><div class='ctx'> __be32		nfsd4_vfs_fallocate(struct svc_rqst *, struct svc_fh *,</div><div class='hunk'>@@ -104,27 +114,27 @@ __be32		nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> int 		nfsd_open_break_lease(struct inode *, int);</div><div class='ctx'> __be32		nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t,</div><div class='ctx'> 				int, struct file **);</div><div class='del'>-int		nfsd_open_verified(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='del'>-				   int may_flags, struct file **filp);</div><div class='add'>+int		nfsd_open_verified(struct svc_fh *fhp, umode_t type, int may_flags,</div><div class='add'>+				struct file **filp);</div><div class='ctx'> __be32		nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 				struct file *file, loff_t offset,</div><div class='ctx'> 				unsigned long *count,</div><div class='ctx'> 				u32 *eof);</div><div class='ctx'> __be32		nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='del'>-				struct file *file, loff_t offset,</div><div class='add'>+				struct nfsd_file *nf, loff_t offset,</div><div class='ctx'> 				unsigned long *count, unsigned int base,</div><div class='ctx'> 				u32 *eof);</div><div class='ctx'> bool		nfsd_read_splice_ok(struct svc_rqst *rqstp);</div><div class='ctx'> __be32		nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 				loff_t offset, unsigned long *count,</div><div class='ctx'> 				u32 *eof);</div><div class='del'>-__be32 		nfsd_write(struct svc_rqst *, struct svc_fh *, loff_t,</div><div class='del'>-				struct kvec *, int, unsigned long *,</div><div class='del'>-				int stable, __be32 *verf);</div><div class='add'>+__be32		nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='add'>+				loff_t offset, const struct xdr_buf *payload,</div><div class='add'>+				unsigned long *cnt, int stable, __be32 *verf);</div><div class='ctx'> __be32		nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,</div><div class='ctx'> 				struct nfsd_file *nf, loff_t offset,</div><div class='del'>-				struct kvec *vec, int vlen, unsigned long *cnt,</div><div class='del'>-				int stable, __be32 *verf);</div><div class='add'>+				const struct xdr_buf *payload,</div><div class='add'>+				unsigned long *cnt, int stable, __be32 *verf);</div><div class='ctx'> __be32		nfsd_readlink(struct svc_rqst *, struct svc_fh *,</div><div class='ctx'> 				char *, int *);</div><div class='ctx'> __be32		nfsd_symlink(struct svc_rqst *, struct svc_fh *,</div><div class='hunk'>@@ -145,40 +155,9 @@ __be32		nfsd_readdir(struct svc_rqst *, struct svc_fh *,</div><div class='ctx'> __be32		nfsd_statfs(struct svc_rqst *, struct svc_fh *,</div><div class='ctx'> 				struct kstatfs *, int access);</div><div class='ctx'> </div><div class='del'>-__be32		nfsd_permission(struct svc_rqst *, struct svc_export *,</div><div class='del'>-				struct dentry *, int);</div><div class='add'>+__be32		nfsd_permission(struct svc_cred *cred, struct svc_export *exp,</div><div class='add'>+				struct dentry *dentry, int acc);</div><div class='ctx'> </div><div class='del'>-static inline int fh_want_write(struct svc_fh *fh)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;fh_want_write)</div><div class='del'>-		return 0;</div><div class='del'>-	ret = mnt_want_write(fh-&gt;fh_export-&gt;ex_path.mnt);</div><div class='del'>-	if (!ret)</div><div class='del'>-		fh-&gt;fh_want_write = true;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void fh_drop_write(struct svc_fh *fh)</div><div class='del'>-{</div><div class='del'>-	if (fh-&gt;fh_want_write) {</div><div class='del'>-		fh-&gt;fh_want_write = false;</div><div class='del'>-		mnt_drop_write(fh-&gt;fh_export-&gt;ex_path.mnt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __be32 fh_getattr(const struct svc_fh *fh, struct kstat *stat)</div><div class='del'>-{</div><div class='del'>-	u32 request_mask = STATX_BASIC_STATS;</div><div class='del'>-	struct path p = {.mnt = fh-&gt;fh_export-&gt;ex_path.mnt,</div><div class='del'>-			 .dentry = fh-&gt;fh_dentry};</div><div class='del'>-</div><div class='del'>-	if (fh-&gt;fh_maxsize == NFS4_FHSIZE)</div><div class='del'>-		request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE);</div><div class='del'>-</div><div class='del'>-	return nfserrno(vfs_getattr(&amp;p, stat, request_mask,</div><div class='del'>-				    AT_STATX_SYNC_AS_STAT));</div><div class='del'>-}</div><div class='add'>+void		nfsd_filp_close(struct file *fp);</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_NFSD_VFS_H */</div><div class='head'>diff --git a/fs/nfsd/xdr3.h b/fs/nfsd/xdr3.h<br/>index 03fe4e21306c..522067b7fd75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/xdr3.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/xdr3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/xdr3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/xdr3.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@ struct nfsd3_sattrargs {</div><div class='ctx'> 	struct svc_fh		fh;</div><div class='ctx'> 	struct iattr		attrs;</div><div class='ctx'> 	int			check_guard;</div><div class='del'>-	time64_t		guardtime;</div><div class='add'>+	struct timespec64	guardtime;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfsd3_diropargs {</div><div class='head'>diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h<br/>index 415516c1b27e..ae75846b3cd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/xdr4.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/xdr4.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/xdr4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/xdr4.h</a></div><div class='hunk'>@@ -518,6 +518,24 @@ struct nfsd4_free_stateid {</div><div class='ctx'> 	stateid_t	fr_stateid;         /* request */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nfsd4_get_dir_delegation {</div><div class='add'>+	/* request */</div><div class='add'>+	u32			gdda_signal_deleg_avail;</div><div class='add'>+	u32			gdda_notification_types[1];</div><div class='add'>+	struct timespec64	gdda_child_attr_delay;</div><div class='add'>+	struct timespec64	gdda_dir_attr_delay;</div><div class='add'>+	u32			gdda_child_attributes[3];</div><div class='add'>+	u32			gdda_dir_attributes[3];</div><div class='add'>+	/* response */</div><div class='add'>+	u32			gddrnf_status;</div><div class='add'>+	nfs4_verifier		gddr_cookieverf;</div><div class='add'>+	stateid_t		gddr_stateid;</div><div class='add'>+	u32			gddr_notification[1];</div><div class='add'>+	u32			gddr_child_attributes[3];</div><div class='add'>+	u32			gddr_dir_attributes[3];</div><div class='add'>+	bool			gddrnf_will_signal_deleg_avail;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* also used for NVERIFY */</div><div class='ctx'> struct nfsd4_verify {</div><div class='ctx'> 	u32		ve_bmval[3];        /* request */</div><div class='hunk'>@@ -549,17 +567,17 @@ struct nfsd4_exchange_id {</div><div class='ctx'> 	struct xdr_netobj nii_domain;</div><div class='ctx'> 	struct xdr_netobj nii_name;</div><div class='ctx'> 	struct timespec64 nii_time;</div><div class='add'>+	char		*server_impl_name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfsd4_sequence {</div><div class='ctx'> 	struct nfs4_sessionid	sessionid;		/* request/response */</div><div class='ctx'> 	u32			seqid;			/* request/response */</div><div class='ctx'> 	u32			slotid;			/* request/response */</div><div class='del'>-	u32			maxslots;		/* request/response */</div><div class='add'>+	u32			maxslots;		/* request */</div><div class='ctx'> 	u32			cachethis;		/* request */</div><div class='del'>-#if 0</div><div class='add'>+	u32			maxslots_response;	/* response */</div><div class='ctx'> 	u32			target_maxslots;	/* response */</div><div class='del'>-#endif /* not yet */</div><div class='ctx'> 	u32			status_flags;		/* response */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -578,9 +596,43 @@ struct nfsd4_reclaim_complete {</div><div class='ctx'> struct nfsd4_deviceid {</div><div class='ctx'> 	u64			fsid_idx;</div><div class='ctx'> 	u32			generation;</div><div class='del'>-	u32			pad;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline __be32 *</div><div class='add'>+svcxdr_encode_deviceid4(__be32 *p, const struct nfsd4_deviceid *devid)</div><div class='add'>+{</div><div class='add'>+	__be64 *q = (__be64 *)p;</div><div class='add'>+</div><div class='add'>+	*q = (__force __be64)devid-&gt;fsid_idx;</div><div class='add'>+	p += 2;</div><div class='add'>+	*p++ = (__force __be32)devid-&gt;generation;</div><div class='add'>+	*p++ = xdr_zero;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __be32 *</div><div class='add'>+svcxdr_decode_deviceid4(__be32 *p, struct nfsd4_deviceid *devid)</div><div class='add'>+{</div><div class='add'>+	__be64 *q = (__be64 *)p;</div><div class='add'>+</div><div class='add'>+	devid-&gt;fsid_idx = (__force u64)(*q);</div><div class='add'>+	p += 2;</div><div class='add'>+	devid-&gt;generation = (__force u32)(*p++);</div><div class='add'>+	p++; /* NFSD does not use the remaining octets */</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __be32</div><div class='add'>+nfsd4_decode_deviceid4(struct xdr_stream *xdr, struct nfsd4_deviceid *devid)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, NFS4_DEVICEID4_SIZE);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return nfserr_bad_xdr;</div><div class='add'>+	svcxdr_decode_deviceid4(p, devid);</div><div class='add'>+	return nfs_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct nfsd4_layout_seg {</div><div class='ctx'> 	u32			iomode;</div><div class='ctx'> 	u64			offset;</div><div class='hunk'>@@ -613,8 +665,7 @@ struct nfsd4_layoutcommit {</div><div class='ctx'> 	u64			lc_last_wr;	/* request */</div><div class='ctx'> 	struct timespec64	lc_mtime;	/* request */</div><div class='ctx'> 	u32			lc_layout_type;	/* request */</div><div class='del'>-	u32			lc_up_len;	/* layout length */</div><div class='del'>-	void			*lc_up_layout;	/* decoded by callback */</div><div class='add'>+	struct xdr_buf		lc_up_layout;	/* decoded by callback */</div><div class='ctx'> 	bool			lc_size_chg;	/* response */</div><div class='ctx'> 	u64			lc_newsize;	/* response */</div><div class='ctx'> };</div><div class='hunk'>@@ -657,7 +708,12 @@ struct nfsd4_cb_offload {</div><div class='ctx'> 	struct nfsd4_callback	co_cb;</div><div class='ctx'> 	struct nfsd42_write_res	co_res;</div><div class='ctx'> 	__be32			co_nfserr;</div><div class='add'>+	unsigned int		co_retries;</div><div class='ctx'> 	struct knfsd_fh		co_fh;</div><div class='add'>+</div><div class='add'>+	struct nfs4_sessionid	co_referring_sessionid;</div><div class='add'>+	u32			co_referring_slotid;</div><div class='add'>+	u32			co_referring_seqno;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfsd4_copy {</div><div class='hunk'>@@ -674,11 +730,17 @@ struct nfsd4_copy {</div><div class='ctx'> #define NFSD4_COPY_F_INTRA		(1)</div><div class='ctx'> #define NFSD4_COPY_F_SYNCHRONOUS	(2)</div><div class='ctx'> #define NFSD4_COPY_F_COMMITTED		(3)</div><div class='add'>+#define NFSD4_COPY_F_COMPLETED		(4)</div><div class='add'>+#define NFSD4_COPY_F_OFFLOAD_DONE	(5)</div><div class='ctx'> </div><div class='ctx'> 	/* response */</div><div class='add'>+	__be32			nfserr;</div><div class='ctx'> 	struct nfsd42_write_res	cp_res;</div><div class='ctx'> 	struct knfsd_fh		fh;</div><div class='ctx'> </div><div class='add'>+	/* offload callback */</div><div class='add'>+	struct nfsd4_cb_offload	cp_cb_offload;</div><div class='add'>+</div><div class='ctx'> 	struct nfs4_client      *cp_clp;</div><div class='ctx'> </div><div class='ctx'> 	struct nfsd_file        *nf_src;</div><div class='hunk'>@@ -689,10 +751,12 @@ struct nfsd4_copy {</div><div class='ctx'> 	struct list_head	copies;</div><div class='ctx'> 	struct task_struct	*copy_task;</div><div class='ctx'> 	refcount_t		refcount;</div><div class='add'>+	unsigned int		cp_ttl;</div><div class='ctx'> </div><div class='ctx'> 	struct nfsd4_ssc_umount_item *ss_nsui;</div><div class='ctx'> 	struct nfs_fh		c_fh;</div><div class='ctx'> 	nfs4_stateid		stateid;</div><div class='add'>+	struct nfsd_net		*cp_nn;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void nfsd4_copy_set_sync(struct nfsd4_copy *copy, bool sync)</div><div class='hunk'>@@ -735,7 +799,8 @@ struct nfsd4_offload_status {</div><div class='ctx'> </div><div class='ctx'> 	/* response */</div><div class='ctx'> 	u64		count;</div><div class='del'>-	u32		status;</div><div class='add'>+	__be32		status;</div><div class='add'>+	bool		completed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfsd4_copy_notify {</div><div class='hunk'>@@ -797,6 +862,7 @@ struct nfsd4_op {</div><div class='ctx'> 		struct nfsd4_reclaim_complete	reclaim_complete;</div><div class='ctx'> 		struct nfsd4_test_stateid	test_stateid;</div><div class='ctx'> 		struct nfsd4_free_stateid	free_stateid;</div><div class='add'>+		struct nfsd4_get_dir_delegation	get_dir_delegation;</div><div class='ctx'> 		struct nfsd4_getdeviceinfo	getdeviceinfo;</div><div class='ctx'> 		struct nfsd4_layoutget		layoutget;</div><div class='ctx'> 		struct nfsd4_layoutcommit	layoutcommit;</div><div class='hunk'>@@ -858,27 +924,6 @@ struct nfsd4_compoundres {</div><div class='ctx'> 	struct nfsd4_compound_state	cstate;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)</div><div class='del'>-{</div><div class='del'>-	struct nfsd4_compoundargs *args = resp-&gt;rqstp-&gt;rq_argp;</div><div class='del'>-	return resp-&gt;opcnt == 1 &amp;&amp; args-&gt;ops[0].opnum == OP_SEQUENCE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The session reply cache only needs to cache replies that the client</div><div class='del'>- * actually asked us to.  But it's almost free for us to cache compounds</div><div class='del'>- * consisting of only a SEQUENCE op, so we may as well cache those too.</div><div class='del'>- * Also, the protocol doesn't give us a convenient response in the case</div><div class='del'>- * of a replay of a solo SEQUENCE op that wasn't cached</div><div class='del'>- * (RETRY_UNCACHED_REP can only be returned in the second op of a</div><div class='del'>- * compound).</div><div class='del'>- */</div><div class='del'>-static inline bool nfsd4_cache_this(struct nfsd4_compoundres *resp)</div><div class='del'>-{</div><div class='del'>-	return (resp-&gt;cstate.slot-&gt;sl_flags &amp; NFSD4_SLOT_CACHETHIS)</div><div class='del'>-		|| nfsd4_is_solo_sequence(resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool nfsd4_last_compound_op(struct svc_rqst *rqstp)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfsd4_compoundres *resp = rqstp-&gt;rq_resp;</div><div class='hunk'>@@ -907,6 +952,7 @@ extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,</div><div class='ctx'> 		struct nfsd4_compound_state *, union nfsd4_op_u *u);</div><div class='ctx'> extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,</div><div class='ctx'> 		struct nfsd4_compound_state *, union nfsd4_op_u *u);</div><div class='add'>+void nfsd4_exchange_id_release(union nfsd4_op_u *u);</div><div class='ctx'> extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,</div><div class='ctx'> 		struct nfsd4_compound_state *, union nfsd4_op_u *u);</div><div class='ctx'> extern __be32 nfsd4_backchannel_ctl(struct svc_rqst *,</div><div class='head'>diff --git a/fs/nfsd/xdr4cb.h b/fs/nfsd/xdr4cb.h<br/>index 0d39af1b00a0..f4e29c0c701c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nfsd/xdr4cb.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nfsd/xdr4cb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nfsd/xdr4cb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nfsd/xdr4cb.h</a></div><div class='hunk'>@@ -6,8 +6,11 @@</div><div class='ctx'> #define cb_compound_enc_hdr_sz		4</div><div class='ctx'> #define cb_compound_dec_hdr_sz		(3 + (NFS4_MAXTAGLEN &gt;&gt; 2))</div><div class='ctx'> #define sessionid_sz			(NFS4_MAX_SESSIONID_LEN &gt;&gt; 2)</div><div class='add'>+#define enc_referring_call4_sz		(1 + 1)</div><div class='add'>+#define enc_referring_call_list4_sz	(sessionid_sz + 1 + \</div><div class='add'>+					enc_referring_call4_sz)</div><div class='ctx'> #define cb_sequence_enc_sz		(sessionid_sz + 4 +             \</div><div class='del'>-					1 /* no referring calls list yet */)</div><div class='add'>+					enc_referring_call_list4_sz)</div><div class='ctx'> #define cb_sequence_dec_sz		(op_dec_sz + sessionid_sz + 4)</div><div class='ctx'> </div><div class='ctx'> #define op_enc_sz			1</div><div class='hunk'>@@ -54,3 +57,25 @@</div><div class='ctx'> #define NFS4_dec_cb_recall_any_sz	(cb_compound_dec_hdr_sz  +      \</div><div class='ctx'> 					cb_sequence_dec_sz +            \</div><div class='ctx'> 					op_dec_sz)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 1: CB_GETATTR opcode (32-bit)</div><div class='add'>+ * N: file_handle</div><div class='add'>+ * 1: number of entry in attribute array (32-bit)</div><div class='add'>+ * 3: entry 0-2 in attribute array (32-bit * 3)</div><div class='add'>+ */</div><div class='add'>+#define NFS4_enc_cb_getattr_sz		(cb_compound_enc_hdr_sz +       \</div><div class='add'>+					cb_sequence_enc_sz +            \</div><div class='add'>+					1 + enc_nfs4_fh_sz + 1 + 3)</div><div class='add'>+/*</div><div class='add'>+ * 4: fattr_bitmap_maxsz</div><div class='add'>+ * 1: attribute array len</div><div class='add'>+ * 2: change attr (64-bit)</div><div class='add'>+ * 2: size (64-bit)</div><div class='add'>+ * 2: atime.seconds (64-bit)</div><div class='add'>+ * 1: atime.nanoseconds (32-bit)</div><div class='add'>+ * 2: mtime.seconds (64-bit)</div><div class='add'>+ * 1: mtime.nanoseconds (32-bit)</div><div class='add'>+ */</div><div class='add'>+#define NFS4_dec_cb_getattr_sz		(cb_compound_dec_hdr_sz  +      \</div><div class='add'>+			cb_sequence_dec_sz + 4 + 1 + 2 + 2 + 2 + 1 + 2 + 1 + op_dec_sz)</div><div class='head'>diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c<br/>index 7342de296ec3..6b506995818d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/alloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/alloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/alloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/alloc.c</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'>  * nilfs_palloc_groups_per_desc_block - get the number of groups that a group</div><div class='ctx'>  *					descriptor block can maintain</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of groups that a group descriptor block can maintain.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long</div><div class='ctx'> nilfs_palloc_groups_per_desc_block(const struct inode *inode)</div><div class='hunk'>@@ -32,6 +34,8 @@ nilfs_palloc_groups_per_desc_block(const struct inode *inode)</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_palloc_groups_count - get maximum number of groups</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='add'>+ *</div><div class='add'>+ * Return: Maximum number of groups.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long</div><div class='ctx'> nilfs_palloc_groups_count(const struct inode *inode)</div><div class='hunk'>@@ -43,6 +47,8 @@ nilfs_palloc_groups_count(const struct inode *inode)</div><div class='ctx'>  * nilfs_palloc_init_blockgroup - initialize private variables for allocator</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @entry_size: size of the persistent object</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned int entry_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,6 +84,9 @@ int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned int entry_size)</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @nr: serial number of the entry (e.g. inode number)</div><div class='ctx'>  * @offset: pointer to store offset number in the group</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of the group that contains the entry with the index</div><div class='add'>+ * specified by @nr.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long nilfs_palloc_group(const struct inode *inode, __u64 nr,</div><div class='ctx'> 					unsigned long *offset)</div><div class='hunk'>@@ -93,8 +102,8 @@ static unsigned long nilfs_palloc_group(const struct inode *inode, __u64 nr,</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @group: group number</div><div class='ctx'>  *</div><div class='del'>- * nilfs_palloc_desc_blkoff() returns block offset of the descriptor</div><div class='del'>- * block which contains a descriptor of the specified group.</div><div class='add'>+ * Return: Index number in the metadata file of the descriptor block of</div><div class='add'>+ * the group specified by @group.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long</div><div class='ctx'> nilfs_palloc_desc_blkoff(const struct inode *inode, unsigned long group)</div><div class='hunk'>@@ -111,6 +120,9 @@ nilfs_palloc_desc_blkoff(const struct inode *inode, unsigned long group)</div><div class='ctx'>  *</div><div class='ctx'>  * nilfs_palloc_bitmap_blkoff() returns block offset of the bitmap</div><div class='ctx'>  * block used to allocate/deallocate entries in the specified group.</div><div class='add'>+ *</div><div class='add'>+ * Return: Index number in the metadata file of the bitmap block of</div><div class='add'>+ * the group specified by @group.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long</div><div class='ctx'> nilfs_palloc_bitmap_blkoff(const struct inode *inode, unsigned long group)</div><div class='hunk'>@@ -125,6 +137,8 @@ nilfs_palloc_bitmap_blkoff(const struct inode *inode, unsigned long group)</div><div class='ctx'>  * nilfs_palloc_group_desc_nfrees - get the number of free entries in a group</div><div class='ctx'>  * @desc: pointer to descriptor structure for the group</div><div class='ctx'>  * @lock: spin lock protecting @desc</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of free entries written in the group descriptor @desc.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long</div><div class='ctx'> nilfs_palloc_group_desc_nfrees(const struct nilfs_palloc_group_desc *desc,</div><div class='hunk'>@@ -143,6 +157,9 @@ nilfs_palloc_group_desc_nfrees(const struct nilfs_palloc_group_desc *desc,</div><div class='ctx'>  * @desc: pointer to descriptor structure for the group</div><div class='ctx'>  * @lock: spin lock protecting @desc</div><div class='ctx'>  * @n: delta to be added</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of free entries after adjusting the group descriptor</div><div class='add'>+ * @desc.</div><div class='ctx'>  */</div><div class='ctx'> static u32</div><div class='ctx'> nilfs_palloc_group_desc_add_entries(struct nilfs_palloc_group_desc *desc,</div><div class='hunk'>@@ -161,6 +178,9 @@ nilfs_palloc_group_desc_add_entries(struct nilfs_palloc_group_desc *desc,</div><div class='ctx'>  * nilfs_palloc_entry_blkoff - get block offset of an entry block</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @nr: serial number of the entry (e.g. inode number)</div><div class='add'>+ *</div><div class='add'>+ * Return: Index number in the metadata file of the block containing</div><div class='add'>+ * the entry specified by @nr.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long</div><div class='ctx'> nilfs_palloc_entry_blkoff(const struct inode *inode, __u64 nr)</div><div class='hunk'>@@ -177,12 +197,14 @@ nilfs_palloc_entry_blkoff(const struct inode *inode, __u64 nr)</div><div class='ctx'>  * nilfs_palloc_desc_block_init - initialize buffer of a group descriptor block</div><div class='ctx'>  * @inode: inode of metadata file</div><div class='ctx'>  * @bh: buffer head of the buffer to be initialized</div><div class='del'>- * @kaddr: kernel address mapped for the page including the buffer</div><div class='add'>+ * @from: kernel address mapped for a chunk of the block</div><div class='add'>+ *</div><div class='add'>+ * This function does not yet support the case where block size &gt; PAGE_SIZE.</div><div class='ctx'>  */</div><div class='ctx'> static void nilfs_palloc_desc_block_init(struct inode *inode,</div><div class='del'>-					 struct buffer_head *bh, void *kaddr)</div><div class='add'>+					 struct buffer_head *bh, void *from)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_palloc_group_desc *desc = kaddr + bh_offset(bh);</div><div class='add'>+	struct nilfs_palloc_group_desc *desc = from;</div><div class='ctx'> 	unsigned long n = nilfs_palloc_groups_per_desc_block(inode);</div><div class='ctx'> 	__le32 nfrees;</div><div class='ctx'> </div><div class='hunk'>@@ -236,6 +258,12 @@ static int nilfs_palloc_get_block(struct inode *inode, unsigned long blkoff,</div><div class='ctx'>  * @blkoff: block offset</div><div class='ctx'>  * @prev: nilfs_bh_assoc struct of the last used buffer</div><div class='ctx'>  * @lock: spin lock protecting @prev</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- Non-existent block.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_delete_block(struct inode *inode, unsigned long blkoff,</div><div class='ctx'> 				     struct nilfs_bh_assoc *prev,</div><div class='hunk'>@@ -256,6 +284,8 @@ static int nilfs_palloc_delete_block(struct inode *inode, unsigned long blkoff,</div><div class='ctx'>  * @group: group number</div><div class='ctx'>  * @create: create flag</div><div class='ctx'>  * @bhp: pointer to store the resultant buffer head</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_get_desc_block(struct inode *inode,</div><div class='ctx'> 				       unsigned long group,</div><div class='hunk'>@@ -275,6 +305,8 @@ static int nilfs_palloc_get_desc_block(struct inode *inode,</div><div class='ctx'>  * @group: group number</div><div class='ctx'>  * @create: create flag</div><div class='ctx'>  * @bhp: pointer to store the resultant buffer head</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_get_bitmap_block(struct inode *inode,</div><div class='ctx'> 					 unsigned long group,</div><div class='hunk'>@@ -292,6 +324,8 @@ static int nilfs_palloc_get_bitmap_block(struct inode *inode,</div><div class='ctx'>  * nilfs_palloc_delete_bitmap_block - delete a bitmap block</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @group: group number</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_delete_bitmap_block(struct inode *inode,</div><div class='ctx'> 					    unsigned long group)</div><div class='hunk'>@@ -310,6 +344,8 @@ static int nilfs_palloc_delete_bitmap_block(struct inode *inode,</div><div class='ctx'>  * @nr: serial number of the entry (e.g. inode number)</div><div class='ctx'>  * @create: create flag</div><div class='ctx'>  * @bhp: pointer to store the resultant buffer head</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_palloc_get_entry_block(struct inode *inode, __u64 nr,</div><div class='ctx'> 				 int create, struct buffer_head **bhp)</div><div class='hunk'>@@ -326,6 +362,8 @@ int nilfs_palloc_get_entry_block(struct inode *inode, __u64 nr,</div><div class='ctx'>  * nilfs_palloc_delete_entry_block - delete an entry block</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @nr: serial number of the entry</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_delete_entry_block(struct inode *inode, __u64 nr)</div><div class='ctx'> {</div><div class='hunk'>@@ -337,38 +375,55 @@ static int nilfs_palloc_delete_entry_block(struct inode *inode, __u64 nr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_palloc_block_get_group_desc - get kernel address of a group descriptor</div><div class='add'>+ * nilfs_palloc_group_desc_offset - calculate the byte offset of a group</div><div class='add'>+ *                                  descriptor in the folio containing it</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @group: group number</div><div class='del'>- * @bh: buffer head of the buffer storing the group descriptor block</div><div class='del'>- * @kaddr: kernel address mapped for the page including the buffer</div><div class='add'>+ * @bh:    buffer head of the group descriptor block</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the group descriptor for @group.</div><div class='ctx'>  */</div><div class='del'>-static struct nilfs_palloc_group_desc *</div><div class='del'>-nilfs_palloc_block_get_group_desc(const struct inode *inode,</div><div class='del'>-				  unsigned long group,</div><div class='del'>-				  const struct buffer_head *bh, void *kaddr)</div><div class='add'>+static size_t nilfs_palloc_group_desc_offset(const struct inode *inode,</div><div class='add'>+					     unsigned long group,</div><div class='add'>+					     const struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	return (struct nilfs_palloc_group_desc *)(kaddr + bh_offset(bh)) +</div><div class='del'>-		group % nilfs_palloc_groups_per_desc_block(inode);</div><div class='add'>+	return offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data) +</div><div class='add'>+		sizeof(struct nilfs_palloc_group_desc) *</div><div class='add'>+		(group % nilfs_palloc_groups_per_desc_block(inode));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nilfs_palloc_bitmap_offset - calculate the byte offset of a bitmap block</div><div class='add'>+ *                              in the folio containing it</div><div class='add'>+ * @bh: buffer head of the bitmap block</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the bitmap block for @bh.</div><div class='add'>+ */</div><div class='add'>+static size_t nilfs_palloc_bitmap_offset(const struct buffer_head *bh)</div><div class='add'>+{</div><div class='add'>+	return offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_palloc_block_get_entry - get kernel address of an entry</div><div class='add'>+ * nilfs_palloc_entry_offset - calculate the byte offset of an entry in the</div><div class='add'>+ *                             folio containing it</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='del'>- * @nr: serial number of the entry (e.g. inode number)</div><div class='del'>- * @bh: buffer head of the buffer storing the entry block</div><div class='del'>- * @kaddr: kernel address mapped for the page including the buffer</div><div class='add'>+ * @nr:    serial number of the entry (e.g. inode number)</div><div class='add'>+ * @bh:    buffer head of the entry block</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the entry @nr.</div><div class='ctx'>  */</div><div class='del'>-void *nilfs_palloc_block_get_entry(const struct inode *inode, __u64 nr,</div><div class='del'>-				   const struct buffer_head *bh, void *kaddr)</div><div class='add'>+size_t nilfs_palloc_entry_offset(const struct inode *inode, __u64 nr,</div><div class='add'>+				 const struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	unsigned long entry_offset, group_offset;</div><div class='add'>+	unsigned long entry_index_in_group, entry_index_in_block;</div><div class='ctx'> </div><div class='del'>-	nilfs_palloc_group(inode, nr, &amp;group_offset);</div><div class='del'>-	entry_offset = group_offset % NILFS_MDT(inode)-&gt;mi_entries_per_block;</div><div class='add'>+	nilfs_palloc_group(inode, nr, &amp;entry_index_in_group);</div><div class='add'>+	entry_index_in_block = entry_index_in_group %</div><div class='add'>+		NILFS_MDT(inode)-&gt;mi_entries_per_block;</div><div class='ctx'> </div><div class='del'>-	return kaddr + bh_offset(bh) +</div><div class='del'>-		entry_offset * NILFS_MDT(inode)-&gt;mi_entry_size;</div><div class='add'>+	return offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data) +</div><div class='add'>+		entry_index_in_block * NILFS_MDT(inode)-&gt;mi_entry_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -377,11 +432,15 @@ void *nilfs_palloc_block_get_entry(const struct inode *inode, __u64 nr,</div><div class='ctx'>  * @target: offset number of an entry in the group (start point)</div><div class='ctx'>  * @bsize: size in bits</div><div class='ctx'>  * @lock: spin lock protecting @bitmap</div><div class='add'>+ * @wrap: whether to wrap around</div><div class='add'>+ *</div><div class='add'>+ * Return: Offset number within the group of the found free entry, or</div><div class='add'>+ * %-ENOSPC if not found.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_find_available_slot(unsigned char *bitmap,</div><div class='ctx'> 					    unsigned long target,</div><div class='ctx'> 					    unsigned int bsize,</div><div class='del'>-					    spinlock_t *lock)</div><div class='add'>+					    spinlock_t *lock, bool wrap)</div><div class='ctx'> {</div><div class='ctx'> 	int pos, end = bsize;</div><div class='ctx'> </div><div class='hunk'>@@ -397,6 +456,8 @@ static int nilfs_palloc_find_available_slot(unsigned char *bitmap,</div><div class='ctx'> </div><div class='ctx'> 		end = target;</div><div class='ctx'> 	}</div><div class='add'>+	if (!wrap)</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	/* wrap around */</div><div class='ctx'> 	for (pos = 0; pos &lt; end; pos++) {</div><div class='hunk'>@@ -416,6 +477,9 @@ static int nilfs_palloc_find_available_slot(unsigned char *bitmap,</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @curr: current group number</div><div class='ctx'>  * @max: maximum number of groups</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of remaining descriptors (= groups) managed by the descriptor</div><div class='add'>+ * block.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long</div><div class='ctx'> nilfs_palloc_rest_groups_in_desc_block(const struct inode *inode,</div><div class='hunk'>@@ -431,6 +495,8 @@ nilfs_palloc_rest_groups_in_desc_block(const struct inode *inode,</div><div class='ctx'>  * nilfs_palloc_count_desc_blocks - count descriptor blocks number</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @desc_blocks: descriptor blocks number [out]</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_palloc_count_desc_blocks(struct inode *inode,</div><div class='ctx'> 					    unsigned long *desc_blocks)</div><div class='hunk'>@@ -451,6 +517,8 @@ static int nilfs_palloc_count_desc_blocks(struct inode *inode,</div><div class='ctx'>  *					MDT file growing</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @desc_blocks: known current descriptor blocks count</div><div class='add'>+ *</div><div class='add'>+ * Return: true if a group can be added in the metadata file, false if not.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool nilfs_palloc_mdt_file_can_grow(struct inode *inode,</div><div class='ctx'> 						    unsigned long desc_blocks)</div><div class='hunk'>@@ -465,6 +533,12 @@ static inline bool nilfs_palloc_mdt_file_can_grow(struct inode *inode,</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @nused: current number of used entries</div><div class='ctx'>  * @nmaxp: max number of entries [out]</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-ERANGE	- Number of entries in use is out of range.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_palloc_count_max_entries(struct inode *inode, u64 nused, u64 *nmaxp)</div><div class='ctx'> {</div><div class='hunk'>@@ -495,14 +569,22 @@ int nilfs_palloc_count_max_entries(struct inode *inode, u64 nused, u64 *nmaxp)</div><div class='ctx'>  * nilfs_palloc_prepare_alloc_entry - prepare to allocate a persistent object</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @req: nilfs_palloc_req structure exchanged for the allocation</div><div class='add'>+ * @wrap: whether to wrap around</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC	- Entries exhausted (No entries available for allocation).</div><div class='add'>+ * * %-EROFS	- Read only filesystem</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_palloc_prepare_alloc_entry(struct inode *inode,</div><div class='del'>-				     struct nilfs_palloc_req *req)</div><div class='add'>+				     struct nilfs_palloc_req *req, bool wrap)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *desc_bh, *bitmap_bh;</div><div class='ctx'> 	struct nilfs_palloc_group_desc *desc;</div><div class='ctx'> 	unsigned char *bitmap;</div><div class='del'>-	void *desc_kaddr, *bitmap_kaddr;</div><div class='add'>+	size_t doff, boff;</div><div class='ctx'> 	unsigned long group, maxgroup, ngroups;</div><div class='ctx'> 	unsigned long group_offset, maxgroup_offset;</div><div class='ctx'> 	unsigned long n, entries_per_group;</div><div class='hunk'>@@ -516,7 +598,7 @@ int nilfs_palloc_prepare_alloc_entry(struct inode *inode,</div><div class='ctx'> 	entries_per_group = nilfs_palloc_entries_per_group(inode);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ngroups; i += n) {</div><div class='del'>-		if (group &gt;= ngroups) {</div><div class='add'>+		if (group &gt;= ngroups &amp;&amp; wrap) {</div><div class='ctx'> 			/* wrap around */</div><div class='ctx'> 			group = 0;</div><div class='ctx'> 			maxgroup = nilfs_palloc_group(inode, req-&gt;pr_entry_nr,</div><div class='hunk'>@@ -525,54 +607,64 @@ int nilfs_palloc_prepare_alloc_entry(struct inode *inode,</div><div class='ctx'> 		ret = nilfs_palloc_get_desc_block(inode, group, 1, &amp;desc_bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		desc_kaddr = kmap(desc_bh-&gt;b_page);</div><div class='del'>-		desc = nilfs_palloc_block_get_group_desc(</div><div class='del'>-			inode, group, desc_bh, desc_kaddr);</div><div class='add'>+</div><div class='add'>+		doff = nilfs_palloc_group_desc_offset(inode, group, desc_bh);</div><div class='add'>+		desc = kmap_local_folio(desc_bh-&gt;b_folio, doff);</div><div class='ctx'> 		n = nilfs_palloc_rest_groups_in_desc_block(inode, group,</div><div class='ctx'> 							   maxgroup);</div><div class='del'>-		for (j = 0; j &lt; n; j++, desc++, group++) {</div><div class='add'>+		for (j = 0; j &lt; n; j++, group++, group_offset = 0) {</div><div class='ctx'> 			lock = nilfs_mdt_bgl_lock(inode, group);</div><div class='del'>-			if (nilfs_palloc_group_desc_nfrees(desc, lock) &gt; 0) {</div><div class='del'>-				ret = nilfs_palloc_get_bitmap_block(</div><div class='del'>-					inode, group, 1, &amp;bitmap_bh);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					goto out_desc;</div><div class='del'>-				bitmap_kaddr = kmap(bitmap_bh-&gt;b_page);</div><div class='del'>-				bitmap = bitmap_kaddr + bh_offset(bitmap_bh);</div><div class='del'>-				pos = nilfs_palloc_find_available_slot(</div><div class='del'>-					bitmap, group_offset,</div><div class='del'>-					entries_per_group, lock);</div><div class='del'>-				if (pos &gt;= 0) {</div><div class='del'>-					/* found a free entry */</div><div class='del'>-					nilfs_palloc_group_desc_add_entries(</div><div class='del'>-						desc, lock, -1);</div><div class='del'>-					req-&gt;pr_entry_nr =</div><div class='del'>-						entries_per_group * group + pos;</div><div class='del'>-					kunmap(desc_bh-&gt;b_page);</div><div class='del'>-					kunmap(bitmap_bh-&gt;b_page);</div><div class='del'>-</div><div class='del'>-					req-&gt;pr_desc_bh = desc_bh;</div><div class='del'>-					req-&gt;pr_bitmap_bh = bitmap_bh;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				kunmap(bitmap_bh-&gt;b_page);</div><div class='del'>-				brelse(bitmap_bh);</div><div class='add'>+			if (nilfs_palloc_group_desc_nfrees(&amp;desc[j], lock) == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			kunmap_local(desc);</div><div class='add'>+			ret = nilfs_palloc_get_bitmap_block(inode, group, 1,</div><div class='add'>+							    &amp;bitmap_bh);</div><div class='add'>+			if (unlikely(ret &lt; 0)) {</div><div class='add'>+				brelse(desc_bh);</div><div class='add'>+				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			group_offset = 0;</div><div class='add'>+			/*</div><div class='add'>+			 * Re-kmap the folio containing the first (and</div><div class='add'>+			 * subsequent) group descriptors.</div><div class='add'>+			 */</div><div class='add'>+			desc = kmap_local_folio(desc_bh-&gt;b_folio, doff);</div><div class='add'>+</div><div class='add'>+			boff = nilfs_palloc_bitmap_offset(bitmap_bh);</div><div class='add'>+			bitmap = kmap_local_folio(bitmap_bh-&gt;b_folio, boff);</div><div class='add'>+			pos = nilfs_palloc_find_available_slot(</div><div class='add'>+				bitmap, group_offset, entries_per_group, lock,</div><div class='add'>+				wrap);</div><div class='add'>+			/*</div><div class='add'>+			 * Since the search for a free slot in the second and</div><div class='add'>+			 * subsequent bitmap blocks always starts from the</div><div class='add'>+			 * beginning, the wrap flag only has an effect on the</div><div class='add'>+			 * first search.</div><div class='add'>+			 */</div><div class='add'>+			kunmap_local(bitmap);</div><div class='add'>+			if (pos &gt;= 0)</div><div class='add'>+				goto found;</div><div class='add'>+</div><div class='add'>+			brelse(bitmap_bh);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kunmap(desc_bh-&gt;b_page);</div><div class='add'>+		kunmap_local(desc);</div><div class='ctx'> 		brelse(desc_bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* no entries left */</div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> </div><div class='del'>- out_desc:</div><div class='del'>-	kunmap(desc_bh-&gt;b_page);</div><div class='del'>-	brelse(desc_bh);</div><div class='del'>-	return ret;</div><div class='add'>+found:</div><div class='add'>+	/* found a free entry */</div><div class='add'>+	nilfs_palloc_group_desc_add_entries(&amp;desc[j], lock, -1);</div><div class='add'>+	req-&gt;pr_entry_nr = entries_per_group * group + pos;</div><div class='add'>+	kunmap_local(desc);</div><div class='add'>+</div><div class='add'>+	req-&gt;pr_desc_bh = desc_bh;</div><div class='add'>+	req-&gt;pr_bitmap_bh = bitmap_bh;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -599,18 +691,18 @@ void nilfs_palloc_commit_alloc_entry(struct inode *inode,</div><div class='ctx'> void nilfs_palloc_commit_free_entry(struct inode *inode,</div><div class='ctx'> 				    struct nilfs_palloc_req *req)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_palloc_group_desc *desc;</div><div class='ctx'> 	unsigned long group, group_offset;</div><div class='add'>+	size_t doff, boff;</div><div class='add'>+	struct nilfs_palloc_group_desc *desc;</div><div class='ctx'> 	unsigned char *bitmap;</div><div class='del'>-	void *desc_kaddr, *bitmap_kaddr;</div><div class='ctx'> 	spinlock_t *lock;</div><div class='ctx'> </div><div class='ctx'> 	group = nilfs_palloc_group(inode, req-&gt;pr_entry_nr, &amp;group_offset);</div><div class='del'>-	desc_kaddr = kmap(req-&gt;pr_desc_bh-&gt;b_page);</div><div class='del'>-	desc = nilfs_palloc_block_get_group_desc(inode, group,</div><div class='del'>-						 req-&gt;pr_desc_bh, desc_kaddr);</div><div class='del'>-	bitmap_kaddr = kmap(req-&gt;pr_bitmap_bh-&gt;b_page);</div><div class='del'>-	bitmap = bitmap_kaddr + bh_offset(req-&gt;pr_bitmap_bh);</div><div class='add'>+	doff = nilfs_palloc_group_desc_offset(inode, group, req-&gt;pr_desc_bh);</div><div class='add'>+	desc = kmap_local_folio(req-&gt;pr_desc_bh-&gt;b_folio, doff);</div><div class='add'>+</div><div class='add'>+	boff = nilfs_palloc_bitmap_offset(req-&gt;pr_bitmap_bh);</div><div class='add'>+	bitmap = kmap_local_folio(req-&gt;pr_bitmap_bh-&gt;b_folio, boff);</div><div class='ctx'> 	lock = nilfs_mdt_bgl_lock(inode, group);</div><div class='ctx'> </div><div class='ctx'> 	if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))</div><div class='hunk'>@@ -621,8 +713,8 @@ void nilfs_palloc_commit_free_entry(struct inode *inode,</div><div class='ctx'> 	else</div><div class='ctx'> 		nilfs_palloc_group_desc_add_entries(desc, lock, 1);</div><div class='ctx'> </div><div class='del'>-	kunmap(req-&gt;pr_bitmap_bh-&gt;b_page);</div><div class='del'>-	kunmap(req-&gt;pr_desc_bh-&gt;b_page);</div><div class='add'>+	kunmap_local(bitmap);</div><div class='add'>+	kunmap_local(desc);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(req-&gt;pr_desc_bh);</div><div class='ctx'> 	mark_buffer_dirty(req-&gt;pr_bitmap_bh);</div><div class='hunk'>@@ -641,17 +733,17 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,</div><div class='ctx'> 				    struct nilfs_palloc_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_palloc_group_desc *desc;</div><div class='del'>-	void *desc_kaddr, *bitmap_kaddr;</div><div class='add'>+	size_t doff, boff;</div><div class='ctx'> 	unsigned char *bitmap;</div><div class='ctx'> 	unsigned long group, group_offset;</div><div class='ctx'> 	spinlock_t *lock;</div><div class='ctx'> </div><div class='ctx'> 	group = nilfs_palloc_group(inode, req-&gt;pr_entry_nr, &amp;group_offset);</div><div class='del'>-	desc_kaddr = kmap(req-&gt;pr_desc_bh-&gt;b_page);</div><div class='del'>-	desc = nilfs_palloc_block_get_group_desc(inode, group,</div><div class='del'>-						 req-&gt;pr_desc_bh, desc_kaddr);</div><div class='del'>-	bitmap_kaddr = kmap(req-&gt;pr_bitmap_bh-&gt;b_page);</div><div class='del'>-	bitmap = bitmap_kaddr + bh_offset(req-&gt;pr_bitmap_bh);</div><div class='add'>+	doff = nilfs_palloc_group_desc_offset(inode, group, req-&gt;pr_desc_bh);</div><div class='add'>+	desc = kmap_local_folio(req-&gt;pr_desc_bh-&gt;b_folio, doff);</div><div class='add'>+</div><div class='add'>+	boff = nilfs_palloc_bitmap_offset(req-&gt;pr_bitmap_bh);</div><div class='add'>+	bitmap = kmap_local_folio(req-&gt;pr_bitmap_bh-&gt;b_folio, boff);</div><div class='ctx'> 	lock = nilfs_mdt_bgl_lock(inode, group);</div><div class='ctx'> </div><div class='ctx'> 	if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))</div><div class='hunk'>@@ -662,8 +754,8 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,</div><div class='ctx'> 	else</div><div class='ctx'> 		nilfs_palloc_group_desc_add_entries(desc, lock, 1);</div><div class='ctx'> </div><div class='del'>-	kunmap(req-&gt;pr_bitmap_bh-&gt;b_page);</div><div class='del'>-	kunmap(req-&gt;pr_desc_bh-&gt;b_page);</div><div class='add'>+	kunmap_local(bitmap);</div><div class='add'>+	kunmap_local(desc);</div><div class='ctx'> </div><div class='ctx'> 	brelse(req-&gt;pr_bitmap_bh);</div><div class='ctx'> 	brelse(req-&gt;pr_desc_bh);</div><div class='hunk'>@@ -677,6 +769,8 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,</div><div class='ctx'>  * nilfs_palloc_prepare_free_entry - prepare to deallocate a persistent object</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @req: nilfs_palloc_req structure exchanged for the removal</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_palloc_prepare_free_entry(struct inode *inode,</div><div class='ctx'> 				    struct nilfs_palloc_req *req)</div><div class='hunk'>@@ -721,13 +815,15 @@ void nilfs_palloc_abort_free_entry(struct inode *inode,</div><div class='ctx'>  * @inode: inode of metadata file using this allocator</div><div class='ctx'>  * @entry_nrs: array of entry numbers to be deallocated</div><div class='ctx'>  * @nitems: number of entries stored in @entry_nrs</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *desc_bh, *bitmap_bh;</div><div class='ctx'> 	struct nilfs_palloc_group_desc *desc;</div><div class='ctx'> 	unsigned char *bitmap;</div><div class='del'>-	void *desc_kaddr, *bitmap_kaddr;</div><div class='add'>+	size_t doff, boff;</div><div class='ctx'> 	unsigned long group, group_offset;</div><div class='ctx'> 	__u64 group_min_nr, last_nrs[8];</div><div class='ctx'> 	const unsigned long epg = nilfs_palloc_entries_per_group(inode);</div><div class='hunk'>@@ -755,8 +851,8 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)</div><div class='ctx'> 		/* Get the first entry number of the group */</div><div class='ctx'> 		group_min_nr = (__u64)group * epg;</div><div class='ctx'> </div><div class='del'>-		bitmap_kaddr = kmap(bitmap_bh-&gt;b_page);</div><div class='del'>-		bitmap = bitmap_kaddr + bh_offset(bitmap_bh);</div><div class='add'>+		boff = nilfs_palloc_bitmap_offset(bitmap_bh);</div><div class='add'>+		bitmap = kmap_local_folio(bitmap_bh-&gt;b_folio, boff);</div><div class='ctx'> 		lock = nilfs_mdt_bgl_lock(inode, group);</div><div class='ctx'> </div><div class='ctx'> 		j = i;</div><div class='hunk'>@@ -801,7 +897,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)</div><div class='ctx'> 			entry_start = rounddown(group_offset, epb);</div><div class='ctx'> 		} while (true);</div><div class='ctx'> </div><div class='del'>-		kunmap(bitmap_bh-&gt;b_page);</div><div class='add'>+		kunmap_local(bitmap);</div><div class='ctx'> 		mark_buffer_dirty(bitmap_bh);</div><div class='ctx'> 		brelse(bitmap_bh);</div><div class='ctx'> </div><div class='hunk'>@@ -815,11 +911,10 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)</div><div class='ctx'> 					   inode-&gt;i_ino);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		desc_kaddr = kmap_atomic(desc_bh-&gt;b_page);</div><div class='del'>-		desc = nilfs_palloc_block_get_group_desc(</div><div class='del'>-			inode, group, desc_bh, desc_kaddr);</div><div class='add'>+		doff = nilfs_palloc_group_desc_offset(inode, group, desc_bh);</div><div class='add'>+		desc = kmap_local_folio(desc_bh-&gt;b_folio, doff);</div><div class='ctx'> 		nfree = nilfs_palloc_group_desc_add_entries(desc, lock, n);</div><div class='del'>-		kunmap_atomic(desc_kaddr);</div><div class='add'>+		kunmap_local(desc);</div><div class='ctx'> 		mark_buffer_dirty(desc_bh);</div><div class='ctx'> 		nilfs_mdt_mark_dirty(inode);</div><div class='ctx'> 		brelse(desc_bh);</div><div class='head'>diff --git a/fs/nilfs2/alloc.h b/fs/nilfs2/alloc.h<br/>index b667e869ac07..046d876ea3e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/alloc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/alloc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/alloc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/alloc.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The number of entries per group is defined by the number of bits</div><div class='ctx'>  * that a bitmap block can maintain.</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of entries per group.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long</div><div class='ctx'> nilfs_palloc_entries_per_group(const struct inode *inode)</div><div class='hunk'>@@ -31,13 +33,13 @@ nilfs_palloc_entries_per_group(const struct inode *inode)</div><div class='ctx'> int nilfs_palloc_init_blockgroup(struct inode *, unsigned int);</div><div class='ctx'> int nilfs_palloc_get_entry_block(struct inode *, __u64, int,</div><div class='ctx'> 				 struct buffer_head **);</div><div class='del'>-void *nilfs_palloc_block_get_entry(const struct inode *, __u64,</div><div class='del'>-				   const struct buffer_head *, void *);</div><div class='add'>+size_t nilfs_palloc_entry_offset(const struct inode *inode, __u64 nr,</div><div class='add'>+				 const struct buffer_head *bh);</div><div class='ctx'> </div><div class='ctx'> int nilfs_palloc_count_max_entries(struct inode *, u64, u64 *);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_palloc_req - persistent allocator request and reply</div><div class='add'>+ * struct nilfs_palloc_req - persistent allocator request and reply</div><div class='ctx'>  * @pr_entry_nr: entry number (vblocknr or inode number)</div><div class='ctx'>  * @pr_desc_bh: buffer head of the buffer containing block group descriptors</div><div class='ctx'>  * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap</div><div class='hunk'>@@ -50,8 +52,8 @@ struct nilfs_palloc_req {</div><div class='ctx'> 	struct buffer_head *pr_entry_bh;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nilfs_palloc_prepare_alloc_entry(struct inode *,</div><div class='del'>-				     struct nilfs_palloc_req *);</div><div class='add'>+int nilfs_palloc_prepare_alloc_entry(struct inode *inode,</div><div class='add'>+				     struct nilfs_palloc_req *req, bool wrap);</div><div class='ctx'> void nilfs_palloc_commit_alloc_entry(struct inode *,</div><div class='ctx'> 				     struct nilfs_palloc_req *);</div><div class='ctx'> void nilfs_palloc_abort_alloc_entry(struct inode *, struct nilfs_palloc_req *);</div><div class='head'>diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c<br/>index 7a8f166f2c8d..ccc1a7aa52d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/bmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/bmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/bmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/bmap.c</a></div><div class='hunk'>@@ -47,17 +47,14 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap,</div><div class='ctx'>  * @ptrp: place to store the value associated to @key</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_bmap_lookup_at_level() finds a record whose key</div><div class='del'>- * matches @key in the block at @level of the bmap.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and the record associated with @key</div><div class='del'>- * is stored in the place pointed by @ptrp. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - A record associated with @key does not exist.</div><div class='add'>+ * matches @key in the block at @level of the bmap.  The record associated</div><div class='add'>+ * with @key is stored in the place pointed to by @ptrp.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- A record associated with @key does not exist.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_lookup_at_level(struct nilfs_bmap *bmap, __u64 key, int level,</div><div class='ctx'> 			       __u64 *ptrp)</div><div class='hunk'>@@ -138,14 +135,11 @@ static int nilfs_bmap_do_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)</div><div class='ctx'>  * Description: nilfs_bmap_insert() inserts the new key-record pair specified</div><div class='ctx'>  * by @key and @rec into @bmap.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EEXIST - A record associated with @key already exist.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EEXIST	- A record associated with @key already exists.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec)</div><div class='ctx'> {</div><div class='hunk'>@@ -193,14 +187,11 @@ static int nilfs_bmap_do_delete(struct nilfs_bmap *bmap, __u64 key)</div><div class='ctx'>  * Description: nilfs_bmap_seek_key() seeks a valid key on @bmap</div><div class='ctx'>  * starting from @start, and stores it to @keyp if found.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - No valid entry was found</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- No valid entry was found.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_seek_key(struct nilfs_bmap *bmap, __u64 start, __u64 *keyp)</div><div class='ctx'> {</div><div class='hunk'>@@ -236,14 +227,11 @@ int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp)</div><div class='ctx'>  * Description: nilfs_bmap_delete() deletes the key-record pair specified by</div><div class='ctx'>  * @key from @bmap.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - A record associated with @key does not exist.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- A record associated with @key does not exist.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key)</div><div class='ctx'> {</div><div class='hunk'>@@ -290,12 +278,10 @@ static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, __u64 key)</div><div class='ctx'>  * Description: nilfs_bmap_truncate() removes key-record pairs whose keys are</div><div class='ctx'>  * greater than or equal to @key from @bmap.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key)</div><div class='ctx'> {</div><div class='hunk'>@@ -330,12 +316,10 @@ void nilfs_bmap_clear(struct nilfs_bmap *bmap)</div><div class='ctx'>  * Description: nilfs_bmap_propagate() marks the buffers that directly or</div><div class='ctx'>  * indirectly refer to the block specified by @bh dirty.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_propagate(struct nilfs_bmap *bmap, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='hunk'>@@ -349,7 +333,7 @@ int nilfs_bmap_propagate(struct nilfs_bmap *bmap, struct buffer_head *bh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_bmap_lookup_dirty_buffers -</div><div class='add'>+ * nilfs_bmap_lookup_dirty_buffers - collect dirty block buffers</div><div class='ctx'>  * @bmap: bmap</div><div class='ctx'>  * @listp: pointer to buffer head list</div><div class='ctx'>  */</div><div class='hunk'>@@ -362,22 +346,22 @@ void nilfs_bmap_lookup_dirty_buffers(struct nilfs_bmap *bmap,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_bmap_assign - assign a new block number to a block</div><div class='del'>- * @bmap: bmap</div><div class='del'>- * @bh: pointer to buffer head</div><div class='add'>+ * @bmap:    bmap</div><div class='add'>+ * @bh:      place to store a pointer to the buffer head to which a block</div><div class='add'>+ *           address is assigned (in/out)</div><div class='ctx'>  * @blocknr: block number</div><div class='del'>- * @binfo: block information</div><div class='add'>+ * @binfo:   block information</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_bmap_assign() assigns the block number @blocknr to the</div><div class='del'>- * buffer specified by @bh.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and the buffer head of a newly</div><div class='del'>- * create buffer and the block information associated with the buffer are</div><div class='del'>- * stored in the place pointed by @bh and @binfo, respectively. On error, one</div><div class='del'>- * of the following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * buffer specified by @bh.  The block information is stored in the memory</div><div class='add'>+ * pointed to by @binfo, and the buffer head may be replaced as a block</div><div class='add'>+ * address is assigned, in which case a pointer to the new buffer head is</div><div class='add'>+ * stored in the memory pointed to by @bh.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_assign(struct nilfs_bmap *bmap,</div><div class='ctx'> 		      struct buffer_head **bh,</div><div class='hunk'>@@ -402,12 +386,10 @@ int nilfs_bmap_assign(struct nilfs_bmap *bmap,</div><div class='ctx'>  * Description: nilfs_bmap_mark() marks the block specified by @key and @level</div><div class='ctx'>  * as dirty.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_mark(struct nilfs_bmap *bmap, __u64 key, int level)</div><div class='ctx'> {</div><div class='hunk'>@@ -430,7 +412,7 @@ int nilfs_bmap_mark(struct nilfs_bmap *bmap, __u64 key, int level)</div><div class='ctx'>  * Description: nilfs_test_and_clear() is the atomic operation to test and</div><div class='ctx'>  * clear the dirty state of @bmap.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: 1 is returned if @bmap is dirty, or 0 if clear.</div><div class='add'>+ * Return: 1 if @bmap is dirty, or 0 if clear.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *bmap)</div><div class='ctx'> {</div><div class='hunk'>@@ -450,15 +432,9 @@ int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *bmap)</div><div class='ctx'> __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,</div><div class='ctx'> 			      const struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	struct buffer_head *pbh;</div><div class='del'>-	__u64 key;</div><div class='add'>+	loff_t pos = folio_pos(bh-&gt;b_folio) + bh_offset(bh);</div><div class='ctx'> </div><div class='del'>-	key = page_index(bh-&gt;b_page) &lt;&lt; (PAGE_SHIFT -</div><div class='del'>-					 bmap-&gt;b_inode-&gt;i_blkbits);</div><div class='del'>-	for (pbh = page_buffers(bh-&gt;b_page); pbh != bh; pbh = pbh-&gt;b_this_page)</div><div class='del'>-		key++;</div><div class='del'>-</div><div class='del'>-	return key;</div><div class='add'>+	return pos &gt;&gt; bmap-&gt;b_inode-&gt;i_blkbits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __u64 nilfs_bmap_find_target_seq(const struct nilfs_bmap *bmap, __u64 key)</div><div class='hunk'>@@ -496,10 +472,10 @@ static struct lock_class_key nilfs_bmap_mdt_lock_key;</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_bmap_read() initializes the bmap @bmap.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, the following negative</div><div class='del'>- * error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (corrupted bmap).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_bmap_read(struct nilfs_bmap *bmap, struct nilfs_inode *raw_inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -548,13 +524,10 @@ int nilfs_bmap_read(struct nilfs_bmap *bmap, struct nilfs_inode *raw_inode)</div><div class='ctx'>  */</div><div class='ctx'> void nilfs_bmap_write(struct nilfs_bmap *bmap, struct nilfs_inode *raw_inode)</div><div class='ctx'> {</div><div class='del'>-	down_write(&amp;bmap-&gt;b_sem);</div><div class='ctx'> 	memcpy(raw_inode-&gt;i_bmap, bmap-&gt;b_u.u_data,</div><div class='ctx'> 	       NILFS_INODE_BMAP_SIZE * sizeof(__le64));</div><div class='ctx'> 	if (bmap-&gt;b_inode-&gt;i_ino == NILFS_DAT_INO)</div><div class='ctx'> 		bmap-&gt;b_last_allocated_ptr = NILFS_BMAP_NEW_PTR_INIT;</div><div class='del'>-</div><div class='del'>-	up_write(&amp;bmap-&gt;b_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nilfs_bmap_init_gc(struct nilfs_bmap *bmap)</div><div class='head'>diff --git a/fs/nilfs2/bmap.h b/fs/nilfs2/bmap.h<br/>index 608168a5cb88..4656df392722 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/bmap.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/bmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/bmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/bmap.h</a></div><div class='hunk'>@@ -44,6 +44,19 @@ struct nilfs_bmap_stats {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct nilfs_bmap_operations - bmap operation table</div><div class='add'>+ * @bop_lookup:               single block search operation</div><div class='add'>+ * @bop_lookup_contig:        consecutive block search operation</div><div class='add'>+ * @bop_insert:               block insertion operation</div><div class='add'>+ * @bop_delete:               block delete operation</div><div class='add'>+ * @bop_clear:                block mapping resource release operation</div><div class='add'>+ * @bop_propagate:            operation to propagate dirty state towards the</div><div class='add'>+ *                            mapping root</div><div class='add'>+ * @bop_lookup_dirty_buffers: operation to collect dirty block buffers</div><div class='add'>+ * @bop_assign:               disk block address assignment operation</div><div class='add'>+ * @bop_mark:                 operation to mark in-use blocks as dirty for</div><div class='add'>+ *                            relocation by GC</div><div class='add'>+ * @bop_seek_key:             find valid block key operation</div><div class='add'>+ * @bop_last_key:             find last valid block key operation</div><div class='ctx'>  */</div><div class='ctx'> struct nilfs_bmap_operations {</div><div class='ctx'> 	int (*bop_lookup)(const struct nilfs_bmap *, __u64, int, __u64 *);</div><div class='hunk'>@@ -66,7 +79,7 @@ struct nilfs_bmap_operations {</div><div class='ctx'> 	int (*bop_seek_key)(const struct nilfs_bmap *, __u64, __u64 *);</div><div class='ctx'> 	int (*bop_last_key)(const struct nilfs_bmap *, __u64 *);</div><div class='ctx'> </div><div class='del'>-	/* The following functions are internal use only. */</div><div class='add'>+	/* private: internal use only */</div><div class='ctx'> 	int (*bop_check_insert)(const struct nilfs_bmap *, __u64);</div><div class='ctx'> 	int (*bop_check_delete)(struct nilfs_bmap *, __u64);</div><div class='ctx'> 	int (*bop_gather_data)(struct nilfs_bmap *, __u64 *, __u64 *, int);</div><div class='hunk'>@@ -74,9 +87,8 @@ struct nilfs_bmap_operations {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define NILFS_BMAP_SIZE		(NILFS_INODE_BMAP_SIZE * sizeof(__le64))</div><div class='del'>-#define NILFS_BMAP_KEY_BIT	(sizeof(unsigned long) * 8 /* CHAR_BIT */)</div><div class='del'>-#define NILFS_BMAP_NEW_PTR_INIT	\</div><div class='del'>-	(1UL &lt;&lt; (sizeof(unsigned long) * 8 /* CHAR_BIT */ - 1))</div><div class='add'>+#define NILFS_BMAP_KEY_BIT	BITS_PER_LONG</div><div class='add'>+#define NILFS_BMAP_NEW_PTR_INIT	(1UL &lt;&lt; (BITS_PER_LONG - 1))</div><div class='ctx'> </div><div class='ctx'> static inline int nilfs_bmap_is_new_ptr(unsigned long ptr)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c<br/>index 0131d83b912d..568367129092 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/btnode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/btnode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/btnode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/btnode.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@ void nilfs_init_btnc_inode(struct inode *btnc_inode)</div><div class='ctx'> 	ii-&gt;i_flags = 0;</div><div class='ctx'> 	memset(&amp;ii-&gt;i_bmap_data, 0, sizeof(struct nilfs_bmap));</div><div class='ctx'> 	mapping_set_gfp_mask(btnc_inode-&gt;i_mapping, GFP_NOFS);</div><div class='add'>+	btnc_inode-&gt;i_mapping-&gt;a_ops = &amp;nilfs_buffer_cache_aops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nilfs_btnode_cache_clear(struct address_space *btnc)</div><div class='hunk'>@@ -51,15 +52,23 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)</div><div class='ctx'> </div><div class='ctx'> 	bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));</div><div class='ctx'> 	if (unlikely(!bh))</div><div class='del'>-		return NULL;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||</div><div class='ctx'> 		     buffer_dirty(bh))) {</div><div class='del'>-		brelse(bh);</div><div class='del'>-		BUG();</div><div class='add'>+		/*</div><div class='add'>+		 * The block buffer at the specified new address was already</div><div class='add'>+		 * in use.  This can happen if it is a virtual block number</div><div class='add'>+		 * and has been reallocated due to corruption of the bitmap</div><div class='add'>+		 * used to manage its allocation state (if not, the buffer</div><div class='add'>+		 * clearing of an abandoned b-tree node is missing somewhere).</div><div class='add'>+		 */</div><div class='add'>+		nilfs_error(inode-&gt;i_sb,</div><div class='add'>+			    "state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%lu)",</div><div class='add'>+			    (unsigned long long)blocknr, inode-&gt;i_ino);</div><div class='add'>+		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(bh-&gt;b_data, 0, i_blocksize(inode));</div><div class='del'>-	bh-&gt;b_bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='ctx'> 	bh-&gt;b_blocknr = blocknr;</div><div class='ctx'> 	set_buffer_mapped(bh);</div><div class='ctx'> 	set_buffer_uptodate(bh);</div><div class='hunk'>@@ -67,6 +76,12 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)</div><div class='ctx'> 	folio_unlock(bh-&gt;b_folio);</div><div class='ctx'> 	folio_put(bh-&gt;b_folio);</div><div class='ctx'> 	return bh;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	folio_unlock(bh-&gt;b_folio);</div><div class='add'>+	folio_put(bh-&gt;b_folio);</div><div class='add'>+	brelse(bh);</div><div class='add'>+	return ERR_PTR(-EIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,</div><div class='hunk'>@@ -118,7 +133,6 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,</div><div class='ctx'> 		goto found;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_buffer_mapped(bh);</div><div class='del'>-	bh-&gt;b_bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='ctx'> 	bh-&gt;b_blocknr = pblocknr; /* set block address for read */</div><div class='ctx'> 	bh-&gt;b_end_io = end_buffer_read_sync;</div><div class='ctx'> 	get_bh(bh);</div><div class='hunk'>@@ -164,11 +178,33 @@ void nilfs_btnode_delete(struct buffer_head *bh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_btnode_prepare_change_key</div><div class='del'>- *  prepare to move contents of the block for old key to one of new key.</div><div class='del'>- *  the old buffer will not be removed, but might be reused for new buffer.</div><div class='del'>- *  it might return -ENOMEM because of memory allocation errors,</div><div class='del'>- *  and might return -EIO because of disk read errors.</div><div class='add'>+ * nilfs_btnode_prepare_change_key - prepare to change the search key of a</div><div class='add'>+ *                                   b-tree node block</div><div class='add'>+ * @btnc: page cache in which the b-tree node block is buffered</div><div class='add'>+ * @ctxt: structure for exchanging context information for key change</div><div class='add'>+ *</div><div class='add'>+ * nilfs_btnode_prepare_change_key() prepares to move the contents of the</div><div class='add'>+ * b-tree node block of the old key given in the "oldkey" member of @ctxt to</div><div class='add'>+ * the position of the new key given in the "newkey" member of @ctxt in the</div><div class='add'>+ * page cache @btnc.  Here, the key of the block is an index in units of</div><div class='add'>+ * blocks, and if the page and block sizes match, it matches the page index</div><div class='add'>+ * in the page cache.</div><div class='add'>+ *</div><div class='add'>+ * If the page size and block size match, this function attempts to move the</div><div class='add'>+ * entire folio, and in preparation for this, inserts the original folio into</div><div class='add'>+ * the new index of the cache.  If this insertion fails or if the page size</div><div class='add'>+ * and block size are different, it falls back to a copy preparation using</div><div class='add'>+ * nilfs_btnode_create_block(), inserts a new block at the position</div><div class='add'>+ * corresponding to "newkey", and stores the buffer head pointer in the</div><div class='add'>+ * "newbh" member of @ctxt.</div><div class='add'>+ *</div><div class='add'>+ * Note that the current implementation does not support folio sizes larger</div><div class='add'>+ * than the page size.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_btnode_prepare_change_key(struct address_space *btnc,</div><div class='ctx'> 				    struct nilfs_btnode_chkey_ctxt *ctxt)</div><div class='hunk'>@@ -217,8 +253,8 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nbh = nilfs_btnode_create_block(btnc, newkey);</div><div class='del'>-	if (!nbh)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (IS_ERR(nbh))</div><div class='add'>+		return PTR_ERR(nbh);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(nbh == obh);</div><div class='ctx'> 	ctxt-&gt;newbh = nbh;</div><div class='hunk'>@@ -230,8 +266,21 @@ retry:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_btnode_commit_change_key</div><div class='del'>- *  commit the change_key operation prepared by prepare_change_key().</div><div class='add'>+ * nilfs_btnode_commit_change_key - commit the change of the search key of</div><div class='add'>+ *                                  a b-tree node block</div><div class='add'>+ * @btnc: page cache in which the b-tree node block is buffered</div><div class='add'>+ * @ctxt: structure for exchanging context information for key change</div><div class='add'>+ *</div><div class='add'>+ * nilfs_btnode_commit_change_key() executes the key change based on the</div><div class='add'>+ * context @ctxt prepared by nilfs_btnode_prepare_change_key().  If no valid</div><div class='add'>+ * block buffer is prepared in "newbh" of @ctxt (i.e., a full folio move),</div><div class='add'>+ * this function removes the folio from the old index and completes the move.</div><div class='add'>+ * Otherwise, it copies the block data and inherited flag states of "oldbh"</div><div class='add'>+ * to "newbh" and clears the "oldbh" from the cache.  In either case, the</div><div class='add'>+ * relocated buffer is marked as dirty.</div><div class='add'>+ *</div><div class='add'>+ * As with nilfs_btnode_prepare_change_key(), the current implementation does</div><div class='add'>+ * not support folio sizes larger than the page size.</div><div class='ctx'>  */</div><div class='ctx'> void nilfs_btnode_commit_change_key(struct address_space *btnc,</div><div class='ctx'> 				    struct nilfs_btnode_chkey_ctxt *ctxt)</div><div class='hunk'>@@ -270,8 +319,19 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_btnode_abort_change_key</div><div class='del'>- *  abort the change_key operation prepared by prepare_change_key().</div><div class='add'>+ * nilfs_btnode_abort_change_key - abort the change of the search key of a</div><div class='add'>+ *                                 b-tree node block</div><div class='add'>+ * @btnc: page cache in which the b-tree node block is buffered</div><div class='add'>+ * @ctxt: structure for exchanging context information for key change</div><div class='add'>+ *</div><div class='add'>+ * nilfs_btnode_abort_change_key() cancels the key change associated with the</div><div class='add'>+ * context @ctxt prepared via nilfs_btnode_prepare_change_key() and performs</div><div class='add'>+ * any necessary cleanup.  If no valid block buffer is prepared in "newbh" of</div><div class='add'>+ * @ctxt, this function removes the folio from the destination index and aborts</div><div class='add'>+ * the move.  Otherwise, it clears "newbh" from the cache.</div><div class='add'>+ *</div><div class='add'>+ * As with nilfs_btnode_prepare_change_key(), the current implementation does</div><div class='add'>+ * not support folio sizes larger than the page size.</div><div class='ctx'>  */</div><div class='ctx'> void nilfs_btnode_abort_change_key(struct address_space *btnc,</div><div class='ctx'> 				   struct nilfs_btnode_chkey_ctxt *ctxt)</div><div class='head'>diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c<br/>index 13592e82eaf6..dd0c8e560ef6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/btree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/btree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/btree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/btree.c</a></div><div class='hunk'>@@ -63,8 +63,8 @@ static int nilfs_btree_get_new_block(const struct nilfs_bmap *btree,</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	bh = nilfs_btnode_create_block(btnc, ptr);</div><div class='del'>-	if (!bh)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (IS_ERR(bh))</div><div class='add'>+		return PTR_ERR(bh);</div><div class='ctx'> </div><div class='ctx'> 	set_buffer_nilfs_volatile(bh);</div><div class='ctx'> 	*bhp = bh;</div><div class='hunk'>@@ -334,7 +334,7 @@ static int nilfs_btree_node_lookup(const struct nilfs_btree_node *node,</div><div class='ctx'>  * @inode: host inode of btree</div><div class='ctx'>  * @blocknr: block number</div><div class='ctx'>  *</div><div class='del'>- * Return Value: If node is broken, 1 is returned. Otherwise, 0 is returned.</div><div class='add'>+ * Return: 0 if normal, 1 if the node is broken.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_btree_node_broken(const struct nilfs_btree_node *node,</div><div class='ctx'> 				   size_t size, struct inode *inode,</div><div class='hunk'>@@ -350,7 +350,7 @@ static int nilfs_btree_node_broken(const struct nilfs_btree_node *node,</div><div class='ctx'> 	if (unlikely(level &lt; NILFS_BTREE_LEVEL_NODE_MIN ||</div><div class='ctx'> 		     level &gt;= NILFS_BTREE_LEVEL_MAX ||</div><div class='ctx'> 		     (flags &amp; NILFS_BTREE_NODE_ROOT) ||</div><div class='del'>-		     nchildren &lt; 0 ||</div><div class='add'>+		     nchildren &lt;= 0 ||</div><div class='ctx'> 		     nchildren &gt; NILFS_BTREE_NODE_NCHILDREN_MAX(size))) {</div><div class='ctx'> 		nilfs_crit(inode-&gt;i_sb,</div><div class='ctx'> 			   "bad btree node (ino=%lu, blocknr=%llu): level = %d, flags = 0x%x, nchildren = %d",</div><div class='hunk'>@@ -366,7 +366,7 @@ static int nilfs_btree_node_broken(const struct nilfs_btree_node *node,</div><div class='ctx'>  * @node: btree root node to be examined</div><div class='ctx'>  * @inode: host inode of btree</div><div class='ctx'>  *</div><div class='del'>- * Return Value: If node is broken, 1 is returned. Otherwise, 0 is returned.</div><div class='add'>+ * Return: 0 if normal, 1 if the root node is broken.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_btree_root_broken(const struct nilfs_btree_node *node,</div><div class='ctx'> 				   struct inode *inode)</div><div class='hunk'>@@ -381,7 +381,8 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node,</div><div class='ctx'> 	if (unlikely(level &lt; NILFS_BTREE_LEVEL_NODE_MIN ||</div><div class='ctx'> 		     level &gt;= NILFS_BTREE_LEVEL_MAX ||</div><div class='ctx'> 		     nchildren &lt; 0 ||</div><div class='del'>-		     nchildren &gt; NILFS_BTREE_ROOT_NCHILDREN_MAX)) {</div><div class='add'>+		     nchildren &gt; NILFS_BTREE_ROOT_NCHILDREN_MAX ||</div><div class='add'>+		     (nchildren == 0 &amp;&amp; level &gt; NILFS_BTREE_LEVEL_NODE_MIN))) {</div><div class='ctx'> 		nilfs_crit(inode-&gt;i_sb,</div><div class='ctx'> 			   "bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d",</div><div class='ctx'> 			   inode-&gt;i_ino, level, flags, nchildren);</div><div class='hunk'>@@ -651,8 +652,7 @@ static int nilfs_btree_do_lookup_last(const struct nilfs_bmap *btree,</div><div class='ctx'>  * @minlevel: start level</div><div class='ctx'>  * @nextkey: place to store the next valid key</div><div class='ctx'>  *</div><div class='del'>- * Return Value: If a next key was found, 0 is returned. Otherwise,</div><div class='del'>- * -ENOENT is returned.</div><div class='add'>+ * Return: 0 if the next key was found, %-ENOENT if not found.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_btree_get_next_key(const struct nilfs_bmap *btree,</div><div class='ctx'> 				    const struct nilfs_btree_path *path,</div><div class='hunk'>@@ -724,7 +724,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,</div><div class='ctx'> 		dat = nilfs_bmap_get_dat(btree);</div><div class='ctx'> 		ret = nilfs_dat_translate(dat, ptr, &amp;blocknr);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			goto dat_error;</div><div class='ctx'> 		ptr = blocknr;</div><div class='ctx'> 	}</div><div class='ctx'> 	cnt = 1;</div><div class='hunk'>@@ -743,7 +743,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,</div><div class='ctx'> 			if (dat) {</div><div class='ctx'> 				ret = nilfs_dat_translate(dat, ptr2, &amp;blocknr);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='del'>-					goto out;</div><div class='add'>+					goto dat_error;</div><div class='ctx'> 				ptr2 = blocknr;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (ptr2 != ptr + cnt || ++cnt == maxblocks)</div><div class='hunk'>@@ -781,6 +781,11 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,</div><div class='ctx'>  out:</div><div class='ctx'> 	nilfs_btree_free_path(path);</div><div class='ctx'> 	return ret;</div><div class='add'>+</div><div class='add'>+ dat_error:</div><div class='add'>+	if (ret == -ENOENT)</div><div class='add'>+		ret = -EINVAL;  /* Notify bmap layer of metadata corruption */</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nilfs_btree_promote_key(struct nilfs_bmap *btree,</div><div class='hunk'>@@ -1653,13 +1658,16 @@ static int nilfs_btree_check_delete(struct nilfs_bmap *btree, __u64 key)</div><div class='ctx'> 	int nchildren, ret;</div><div class='ctx'> </div><div class='ctx'> 	root = nilfs_btree_get_root(btree);</div><div class='add'>+	nchildren = nilfs_btree_node_get_nchildren(root);</div><div class='add'>+	if (unlikely(nchildren == 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	switch (nilfs_btree_height(btree)) {</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		bh = NULL;</div><div class='ctx'> 		node = root;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		nchildren = nilfs_btree_node_get_nchildren(root);</div><div class='ctx'> 		if (nchildren &gt; 1)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		ptr = nilfs_btree_node_get_ptr(root, nchildren - 1,</div><div class='hunk'>@@ -1668,12 +1676,12 @@ static int nilfs_btree_check_delete(struct nilfs_bmap *btree, __u64 key)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		node = (struct nilfs_btree_node *)bh-&gt;b_data;</div><div class='add'>+		nchildren = nilfs_btree_node_get_nchildren(node);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nchildren = nilfs_btree_node_get_nchildren(node);</div><div class='ctx'> 	maxkey = nilfs_btree_node_get_key(node, nchildren - 1);</div><div class='ctx'> 	nextmaxkey = (nchildren &gt; 1) ?</div><div class='ctx'> 		nilfs_btree_node_get_key(node, nchildren - 2) : 0;</div><div class='hunk'>@@ -1852,13 +1860,22 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *btree,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_btree_convert_and_insert -</div><div class='del'>- * @bmap:</div><div class='del'>- * @key:</div><div class='del'>- * @ptr:</div><div class='del'>- * @keys:</div><div class='del'>- * @ptrs:</div><div class='del'>- * @n:</div><div class='add'>+ * nilfs_btree_convert_and_insert - Convert and insert entries into a B-tree</div><div class='add'>+ * @btree: NILFS B-tree structure</div><div class='add'>+ * @key: Key of the new entry to be inserted</div><div class='add'>+ * @ptr: Pointer (block number) associated with the key to be inserted</div><div class='add'>+ * @keys: Array of keys to be inserted in addition to @key</div><div class='add'>+ * @ptrs: Array of pointers associated with @keys</div><div class='add'>+ * @n: Number of keys and pointers in @keys and @ptrs</div><div class='add'>+ *</div><div class='add'>+ * This function is used to insert a new entry specified by @key and @ptr,</div><div class='add'>+ * along with additional entries specified by @keys and @ptrs arrays, into a</div><div class='add'>+ * NILFS B-tree.</div><div class='add'>+ * It prepares the necessary changes by allocating the required blocks and any</div><div class='add'>+ * necessary intermediate nodes. It converts configurations from other forms of</div><div class='add'>+ * block mapping (the one that currently exists is direct mapping) to a B-tree.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_btree_convert_and_insert(struct nilfs_bmap *btree,</div><div class='ctx'> 				   __u64 key, __u64 ptr,</div><div class='hunk'>@@ -2085,11 +2102,13 @@ static int nilfs_btree_propagate(struct nilfs_bmap *btree,</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_btree_do_lookup(btree, path, key, NULL, level + 1, 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		if (unlikely(ret == -ENOENT))</div><div class='add'>+		if (unlikely(ret == -ENOENT)) {</div><div class='ctx'> 			nilfs_crit(btree-&gt;b_inode-&gt;i_sb,</div><div class='ctx'> 				   "writing node/leaf block does not appear in b-tree (ino=%lu) at key=%llu, level=%d",</div><div class='ctx'> 				   btree-&gt;b_inode-&gt;i_ino,</div><div class='ctx'> 				   (unsigned long long)key, level);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nilfs2/btree.h b/fs/nilfs2/btree.h<br/>index 92868e1a48ca..2a220f716c91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/btree.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/btree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/btree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/btree.h</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'>  * @bp_index: index of child node</div><div class='ctx'>  * @bp_oldreq: ptr end request for old ptr</div><div class='ctx'>  * @bp_newreq: ptr alloc request for new ptr</div><div class='add'>+ * @bp_ctxt: context information for changing the key of a b-tree node block</div><div class='ctx'>  * @bp_op: rebalance operation</div><div class='ctx'>  */</div><div class='ctx'> struct nilfs_btree_path {</div><div class='head'>diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c<br/>index 39136637f715..4bbdc832d7f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/cpfile.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/cpfile.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/cpfile.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/cpfile.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ nilfs_cpfile_get_blkoff(const struct inode *cpfile, __u64 cno)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 tcno = cno + NILFS_MDT(cpfile)-&gt;mi_first_entry_offset - 1;</div><div class='ctx'> </div><div class='del'>-	do_div(tcno, nilfs_cpfile_checkpoints_per_block(cpfile));</div><div class='add'>+	tcno = div64_ul(tcno, nilfs_cpfile_checkpoints_per_block(cpfile));</div><div class='ctx'> 	return (unsigned long)tcno;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -68,54 +68,41 @@ static inline int nilfs_cpfile_is_in_first(const struct inode *cpfile,</div><div class='ctx'> static unsigned int</div><div class='ctx'> nilfs_cpfile_block_add_valid_checkpoints(const struct inode *cpfile,</div><div class='ctx'> 					 struct buffer_head *bh,</div><div class='del'>-					 void *kaddr,</div><div class='ctx'> 					 unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_checkpoint *cp = kaddr + bh_offset(bh);</div><div class='add'>+	struct nilfs_checkpoint *cp;</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> </div><div class='add'>+	cp = kmap_local_folio(bh-&gt;b_folio,</div><div class='add'>+			      offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data));</div><div class='ctx'> 	count = le32_to_cpu(cp-&gt;cp_checkpoints_count) + n;</div><div class='ctx'> 	cp-&gt;cp_checkpoints_count = cpu_to_le32(count);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int</div><div class='ctx'> nilfs_cpfile_block_sub_valid_checkpoints(const struct inode *cpfile,</div><div class='ctx'> 					 struct buffer_head *bh,</div><div class='del'>-					 void *kaddr,</div><div class='ctx'> 					 unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_checkpoint *cp = kaddr + bh_offset(bh);</div><div class='add'>+	struct nilfs_checkpoint *cp;</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> </div><div class='add'>+	cp = kmap_local_folio(bh-&gt;b_folio,</div><div class='add'>+			      offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data));</div><div class='ctx'> 	WARN_ON(le32_to_cpu(cp-&gt;cp_checkpoints_count) &lt; n);</div><div class='ctx'> 	count = le32_to_cpu(cp-&gt;cp_checkpoints_count) - n;</div><div class='ctx'> 	cp-&gt;cp_checkpoints_count = cpu_to_le32(count);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct nilfs_cpfile_header *</div><div class='del'>-nilfs_cpfile_block_get_header(const struct inode *cpfile,</div><div class='del'>-			      struct buffer_head *bh,</div><div class='del'>-			      void *kaddr)</div><div class='del'>-{</div><div class='del'>-	return kaddr + bh_offset(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct nilfs_checkpoint *</div><div class='del'>-nilfs_cpfile_block_get_checkpoint(const struct inode *cpfile, __u64 cno,</div><div class='del'>-				  struct buffer_head *bh,</div><div class='del'>-				  void *kaddr)</div><div class='del'>-{</div><div class='del'>-	return kaddr + bh_offset(bh) + nilfs_cpfile_get_offset(cpfile, cno) *</div><div class='del'>-		NILFS_MDT(cpfile)-&gt;mi_entry_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nilfs_cpfile_block_init(struct inode *cpfile,</div><div class='ctx'> 				    struct buffer_head *bh,</div><div class='del'>-				    void *kaddr)</div><div class='add'>+				    void *from)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_checkpoint *cp = kaddr + bh_offset(bh);</div><div class='add'>+	struct nilfs_checkpoint *cp = from;</div><div class='ctx'> 	size_t cpsz = NILFS_MDT(cpfile)-&gt;mi_entry_size;</div><div class='ctx'> 	int n = nilfs_cpfile_checkpoints_per_block(cpfile);</div><div class='ctx'> </div><div class='hunk'>@@ -125,10 +112,65 @@ static void nilfs_cpfile_block_init(struct inode *cpfile,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nilfs_cpfile_get_header_block(struct inode *cpfile,</div><div class='del'>-						struct buffer_head **bhp)</div><div class='add'>+/**</div><div class='add'>+ * nilfs_cpfile_checkpoint_offset - calculate the byte offset of a checkpoint</div><div class='add'>+ *                                  entry in the folio containing it</div><div class='add'>+ * @cpfile: checkpoint file inode</div><div class='add'>+ * @cno:    checkpoint number</div><div class='add'>+ * @bh:     buffer head of block containing checkpoint indexed by @cno</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the checkpoint specified by @cno.</div><div class='add'>+ */</div><div class='add'>+static size_t nilfs_cpfile_checkpoint_offset(const struct inode *cpfile,</div><div class='add'>+					     __u64 cno,</div><div class='add'>+					     struct buffer_head *bh)</div><div class='add'>+{</div><div class='add'>+	return offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data) +</div><div class='add'>+		nilfs_cpfile_get_offset(cpfile, cno) *</div><div class='add'>+		NILFS_MDT(cpfile)-&gt;mi_entry_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nilfs_cpfile_cp_snapshot_list_offset - calculate the byte offset of a</div><div class='add'>+ *                                        checkpoint snapshot list in the folio</div><div class='add'>+ *                                        containing it</div><div class='add'>+ * @cpfile: checkpoint file inode</div><div class='add'>+ * @cno:    checkpoint number</div><div class='add'>+ * @bh:     buffer head of block containing checkpoint indexed by @cno</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the checkpoint snapshot list specified</div><div class='add'>+ *         by @cno.</div><div class='add'>+ */</div><div class='add'>+static size_t nilfs_cpfile_cp_snapshot_list_offset(const struct inode *cpfile,</div><div class='add'>+						   __u64 cno,</div><div class='add'>+						   struct buffer_head *bh)</div><div class='add'>+{</div><div class='add'>+	return nilfs_cpfile_checkpoint_offset(cpfile, cno, bh) +</div><div class='add'>+		offsetof(struct nilfs_checkpoint, cp_snapshot_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nilfs_cpfile_ch_snapshot_list_offset - calculate the byte offset of the</div><div class='add'>+ *                                        snapshot list in the header</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the checkpoint snapshot list</div><div class='add'>+ */</div><div class='add'>+static size_t nilfs_cpfile_ch_snapshot_list_offset(void)</div><div class='ctx'> {</div><div class='del'>-	return nilfs_mdt_get_block(cpfile, 0, 0, NULL, bhp);</div><div class='add'>+	return offsetof(struct nilfs_cpfile_header, ch_snapshot_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nilfs_cpfile_get_header_block(struct inode *cpfile,</div><div class='add'>+					 struct buffer_head **bhp)</div><div class='add'>+{</div><div class='add'>+	int err = nilfs_mdt_get_block(cpfile, 0, 0, NULL, bhp);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err == -ENOENT)) {</div><div class='add'>+		nilfs_error(cpfile-&gt;i_sb,</div><div class='add'>+			    "missing header block in checkpoint metadata");</div><div class='add'>+		err = -EIO;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int nilfs_cpfile_get_checkpoint_block(struct inode *cpfile,</div><div class='hunk'>@@ -149,14 +191,11 @@ static inline int nilfs_cpfile_get_checkpoint_block(struct inode *cpfile,</div><div class='ctx'>  * @cnop: place to store the next checkpoint number</div><div class='ctx'>  * @bhp: place to store a pointer to buffer_head struct</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, it returns 0. On error, the following negative</div><div class='del'>- * error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - no block exists in the range.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- no block exists in the range.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_cpfile_find_checkpoint_block(struct inode *cpfile,</div><div class='ctx'> 					      __u64 start_cno, __u64 end_cno,</div><div class='hunk'>@@ -187,106 +226,215 @@ static inline int nilfs_cpfile_delete_checkpoint_block(struct inode *cpfile,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_cpfile_get_checkpoint - get a checkpoint</div><div class='del'>- * @cpfile: inode of checkpoint file</div><div class='del'>- * @cno: checkpoint number</div><div class='del'>- * @create: create flag</div><div class='del'>- * @cpp: pointer to a checkpoint</div><div class='del'>- * @bhp: pointer to a buffer head</div><div class='del'>- *</div><div class='del'>- * Description: nilfs_cpfile_get_checkpoint() acquires the checkpoint</div><div class='del'>- * specified by @cno. A new checkpoint will be created if @cno is the current</div><div class='del'>- * checkpoint number and @create is nonzero.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned, and the checkpoint and the</div><div class='del'>- * buffer head of the buffer on which the checkpoint is located are stored in</div><div class='del'>- * the place pointed by @cpp and @bhp, respectively. On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='add'>+ * nilfs_cpfile_read_checkpoint - read a checkpoint entry in cpfile</div><div class='add'>+ * @cpfile: checkpoint file inode</div><div class='add'>+ * @cno:    number of checkpoint entry to read</div><div class='add'>+ * @root:   nilfs root object</div><div class='add'>+ * @ifile:  ifile's inode to read and attach to @root</div><div class='ctx'>  *</div><div class='del'>- * %-EIO - I/O error.</div><div class='add'>+ * This function imports checkpoint information from the checkpoint file and</div><div class='add'>+ * stores it to the inode file given by @ifile and the nilfs root object</div><div class='add'>+ * given by @root.</div><div class='ctx'>  *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid checkpoint.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ */</div><div class='add'>+int nilfs_cpfile_read_checkpoint(struct inode *cpfile, __u64 cno,</div><div class='add'>+				 struct nilfs_root *root, struct inode *ifile)</div><div class='add'>+{</div><div class='add'>+	struct buffer_head *cp_bh;</div><div class='add'>+	struct nilfs_checkpoint *cp;</div><div class='add'>+	size_t offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cno &lt; 1 || cno &gt; nilfs_mdt_cno(cpfile))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='add'>+	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &amp;cp_bh);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		goto out_sem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='add'>+	if (nilfs_checkpoint_invalid(cp)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto put_cp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nilfs_read_inode_common(ifile, &amp;cp-&gt;cp_ifile_inode);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Since this inode is on a checkpoint entry, treat errors</div><div class='add'>+		 * as metadata corruption.</div><div class='add'>+		 */</div><div class='add'>+		nilfs_err(cpfile-&gt;i_sb,</div><div class='add'>+			  "ifile inode (checkpoint number=%llu) corrupted",</div><div class='add'>+			  (unsigned long long)cno);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto put_cp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure the nilfs root object */</div><div class='add'>+	atomic64_set(&amp;root-&gt;inodes_count, le64_to_cpu(cp-&gt;cp_inodes_count));</div><div class='add'>+	atomic64_set(&amp;root-&gt;blocks_count, le64_to_cpu(cp-&gt;cp_blocks_count));</div><div class='add'>+	root-&gt;ifile = ifile;</div><div class='add'>+</div><div class='add'>+put_cp:</div><div class='add'>+	kunmap_local(cp);</div><div class='add'>+	brelse(cp_bh);</div><div class='add'>+out_sem:</div><div class='add'>+	up_read(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nilfs_cpfile_create_checkpoint - create a checkpoint entry on cpfile</div><div class='add'>+ * @cpfile: checkpoint file inode</div><div class='add'>+ * @cno:    number of checkpoint to set up</div><div class='ctx'>  *</div><div class='del'>- * %-ENOENT - No such checkpoint.</div><div class='add'>+ * This function creates a checkpoint with the number specified by @cno on</div><div class='add'>+ * cpfile.  If the specified checkpoint entry already exists due to a past</div><div class='add'>+ * failure, it will be reused without returning an error.</div><div class='add'>+ * In either case, the buffer of the block containing the checkpoint entry</div><div class='add'>+ * and the cpfile inode are made dirty for inclusion in the write log.</div><div class='ctx'>  *</div><div class='del'>- * %-EINVAL - invalid checkpoint.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-EROFS	- Read only filesystem</div><div class='ctx'>  */</div><div class='del'>-int nilfs_cpfile_get_checkpoint(struct inode *cpfile,</div><div class='del'>-				__u64 cno,</div><div class='del'>-				int create,</div><div class='del'>-				struct nilfs_checkpoint **cpp,</div><div class='del'>-				struct buffer_head **bhp)</div><div class='add'>+int nilfs_cpfile_create_checkpoint(struct inode *cpfile, __u64 cno)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *header_bh, *cp_bh;</div><div class='ctx'> 	struct nilfs_cpfile_header *header;</div><div class='ctx'> 	struct nilfs_checkpoint *cp;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(cno &lt; 1 || cno &gt; nilfs_mdt_cno(cpfile) ||</div><div class='del'>-		     (cno &lt; nilfs_mdt_cno(cpfile) &amp;&amp; create)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (WARN_ON_ONCE(cno &lt; 1))</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='del'>-</div><div class='ctx'> 	ret = nilfs_cpfile_get_header_block(cpfile, &amp;header_bh);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		goto out_sem;</div><div class='del'>-	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, create, &amp;cp_bh);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+</div><div class='add'>+	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 1, &amp;cp_bh);</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='ctx'> 		goto out_header;</div><div class='del'>-	kaddr = kmap(cp_bh-&gt;b_page);</div><div class='del'>-	cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, cp_bh, kaddr);</div><div class='add'>+</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (nilfs_checkpoint_invalid(cp)) {</div><div class='del'>-		if (!create) {</div><div class='del'>-			kunmap(cp_bh-&gt;b_page);</div><div class='del'>-			brelse(cp_bh);</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-			goto out_header;</div><div class='del'>-		}</div><div class='ctx'> 		/* a newly-created checkpoint */</div><div class='ctx'> 		nilfs_checkpoint_clear_invalid(cp);</div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 		if (!nilfs_cpfile_is_in_first(cpfile, cno))</div><div class='ctx'> 			nilfs_cpfile_block_add_valid_checkpoints(cpfile, cp_bh,</div><div class='del'>-								 kaddr, 1);</div><div class='del'>-		mark_buffer_dirty(cp_bh);</div><div class='add'>+								 1);</div><div class='ctx'> </div><div class='del'>-		kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-		header = nilfs_cpfile_block_get_header(cpfile, header_bh,</div><div class='del'>-						       kaddr);</div><div class='add'>+		header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 		le64_add_cpu(&amp;header-&gt;ch_ncheckpoints, 1);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(header);</div><div class='ctx'> 		mark_buffer_dirty(header_bh);</div><div class='del'>-		nilfs_mdt_mark_dirty(cpfile);</div><div class='add'>+	} else {</div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpp != NULL)</div><div class='del'>-		*cpp = cp;</div><div class='del'>-	*bhp = cp_bh;</div><div class='add'>+	/* Force the buffer and the inode to become dirty */</div><div class='add'>+	mark_buffer_dirty(cp_bh);</div><div class='add'>+	brelse(cp_bh);</div><div class='add'>+	nilfs_mdt_mark_dirty(cpfile);</div><div class='ctx'> </div><div class='del'>- out_header:</div><div class='add'>+out_header:</div><div class='ctx'> 	brelse(header_bh);</div><div class='ctx'> </div><div class='del'>- out_sem:</div><div class='add'>+out_sem:</div><div class='ctx'> 	up_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_cpfile_put_checkpoint - put a checkpoint</div><div class='del'>- * @cpfile: inode of checkpoint file</div><div class='del'>- * @cno: checkpoint number</div><div class='del'>- * @bh: buffer head</div><div class='add'>+ * nilfs_cpfile_finalize_checkpoint - fill in a checkpoint entry in cpfile</div><div class='add'>+ * @cpfile: checkpoint file inode</div><div class='add'>+ * @cno:    checkpoint number</div><div class='add'>+ * @root:   nilfs root object</div><div class='add'>+ * @blkinc: number of blocks added by this checkpoint</div><div class='add'>+ * @ctime:  checkpoint creation time</div><div class='add'>+ * @minor:  minor checkpoint flag</div><div class='ctx'>  *</div><div class='del'>- * Description: nilfs_cpfile_put_checkpoint() releases the checkpoint</div><div class='del'>- * specified by @cno. @bh must be the buffer head which has been returned by</div><div class='del'>- * a previous call to nilfs_cpfile_get_checkpoint() with @cno.</div><div class='add'>+ * This function completes the checkpoint entry numbered by @cno in the</div><div class='add'>+ * cpfile with the data given by the arguments @root, @blkinc, @ctime, and</div><div class='add'>+ * @minor.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='ctx'>  */</div><div class='del'>-void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,</div><div class='del'>-				 struct buffer_head *bh)</div><div class='add'>+int nilfs_cpfile_finalize_checkpoint(struct inode *cpfile, __u64 cno,</div><div class='add'>+				     struct nilfs_root *root, __u64 blkinc,</div><div class='add'>+				     time64_t ctime, bool minor)</div><div class='ctx'> {</div><div class='del'>-	kunmap(bh-&gt;b_page);</div><div class='del'>-	brelse(bh);</div><div class='add'>+	struct buffer_head *cp_bh;</div><div class='add'>+	struct nilfs_checkpoint *cp;</div><div class='add'>+	size_t offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(cno &lt; 1))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='add'>+	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &amp;cp_bh);</div><div class='add'>+	if (unlikely(ret &lt; 0)) {</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			goto error;</div><div class='add'>+		goto out_sem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='add'>+	if (unlikely(nilfs_checkpoint_invalid(cp))) {</div><div class='add'>+		kunmap_local(cp);</div><div class='add'>+		brelse(cp_bh);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cp-&gt;cp_snapshot_list.ssl_next = 0;</div><div class='add'>+	cp-&gt;cp_snapshot_list.ssl_prev = 0;</div><div class='add'>+	cp-&gt;cp_inodes_count = cpu_to_le64(atomic64_read(&amp;root-&gt;inodes_count));</div><div class='add'>+	cp-&gt;cp_blocks_count = cpu_to_le64(atomic64_read(&amp;root-&gt;blocks_count));</div><div class='add'>+	cp-&gt;cp_nblk_inc = cpu_to_le64(blkinc);</div><div class='add'>+	cp-&gt;cp_create = cpu_to_le64(ctime);</div><div class='add'>+	cp-&gt;cp_cno = cpu_to_le64(cno);</div><div class='add'>+</div><div class='add'>+	if (minor)</div><div class='add'>+		nilfs_checkpoint_set_minor(cp);</div><div class='add'>+	else</div><div class='add'>+		nilfs_checkpoint_clear_minor(cp);</div><div class='add'>+</div><div class='add'>+	nilfs_write_inode_common(root-&gt;ifile, &amp;cp-&gt;cp_ifile_inode);</div><div class='add'>+	nilfs_bmap_write(NILFS_I(root-&gt;ifile)-&gt;i_bmap, &amp;cp-&gt;cp_ifile_inode);</div><div class='add'>+</div><div class='add'>+	kunmap_local(cp);</div><div class='add'>+	brelse(cp_bh);</div><div class='add'>+out_sem:</div><div class='add'>+	up_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	nilfs_error(cpfile-&gt;i_sb,</div><div class='add'>+		    "checkpoint finalization failed due to metadata corruption.");</div><div class='add'>+	ret = -EIO;</div><div class='add'>+	goto out_sem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -299,14 +447,11 @@ void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,</div><div class='ctx'>  * the period from @start to @end, excluding @end itself. The checkpoints</div><div class='ctx'>  * which have been already deleted are ignored.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - invalid checkpoints.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid checkpoints.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,</div><div class='ctx'> 				    __u64 start,</div><div class='hunk'>@@ -317,6 +462,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,</div><div class='ctx'> 	struct nilfs_checkpoint *cp;</div><div class='ctx'> 	size_t cpsz = NILFS_MDT(cpfile)-&gt;mi_entry_size;</div><div class='ctx'> 	__u64 cno;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	unsigned long tnicps;</div><div class='ctx'> 	int ret, ncps, nicps, nss, count, i;</div><div class='hunk'>@@ -347,9 +493,8 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kaddr = kmap_atomic(cp_bh-&gt;b_page);</div><div class='del'>-		cp = nilfs_cpfile_block_get_checkpoint(</div><div class='del'>-			cpfile, cno, cp_bh, kaddr);</div><div class='add'>+		offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+		cp = kaddr = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='ctx'> 		nicps = 0;</div><div class='ctx'> 		for (i = 0; i &lt; ncps; i++, cp = (void *)cp + cpsz) {</div><div class='ctx'> 			if (nilfs_checkpoint_snapshot(cp)) {</div><div class='hunk'>@@ -359,43 +504,42 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,</div><div class='ctx'> 				nicps++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (nicps &gt; 0) {</div><div class='del'>-			tnicps += nicps;</div><div class='del'>-			mark_buffer_dirty(cp_bh);</div><div class='del'>-			nilfs_mdt_mark_dirty(cpfile);</div><div class='del'>-			if (!nilfs_cpfile_is_in_first(cpfile, cno)) {</div><div class='del'>-				count =</div><div class='del'>-				  nilfs_cpfile_block_sub_valid_checkpoints(</div><div class='del'>-						cpfile, cp_bh, kaddr, nicps);</div><div class='del'>-				if (count == 0) {</div><div class='del'>-					/* make hole */</div><div class='del'>-					kunmap_atomic(kaddr);</div><div class='del'>-					brelse(cp_bh);</div><div class='del'>-					ret =</div><div class='del'>-					  nilfs_cpfile_delete_checkpoint_block(</div><div class='del'>-								   cpfile, cno);</div><div class='del'>-					if (ret == 0)</div><div class='del'>-						continue;</div><div class='del'>-					nilfs_err(cpfile-&gt;i_sb,</div><div class='del'>-						  "error %d deleting checkpoint block",</div><div class='del'>-						  ret);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+		kunmap_local(kaddr);</div><div class='add'>+</div><div class='add'>+		if (nicps &lt;= 0) {</div><div class='add'>+			brelse(cp_bh);</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		tnicps += nicps;</div><div class='add'>+		mark_buffer_dirty(cp_bh);</div><div class='add'>+		nilfs_mdt_mark_dirty(cpfile);</div><div class='add'>+		if (nilfs_cpfile_is_in_first(cpfile, cno)) {</div><div class='add'>+			brelse(cp_bh);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		count = nilfs_cpfile_block_sub_valid_checkpoints(cpfile, cp_bh,</div><div class='add'>+								 nicps);</div><div class='ctx'> 		brelse(cp_bh);</div><div class='add'>+		if (count)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Delete the block if there are no more valid checkpoints */</div><div class='add'>+		ret = nilfs_cpfile_delete_checkpoint_block(cpfile, cno);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			nilfs_err(cpfile-&gt;i_sb,</div><div class='add'>+				  "error %d deleting checkpoint block", ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tnicps &gt; 0) {</div><div class='del'>-		kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-		header = nilfs_cpfile_block_get_header(cpfile, header_bh,</div><div class='del'>-						       kaddr);</div><div class='add'>+		header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 		le64_add_cpu(&amp;header-&gt;ch_ncheckpoints, -(u64)tnicps);</div><div class='ctx'> 		mark_buffer_dirty(header_bh);</div><div class='ctx'> 		nilfs_mdt_mark_dirty(cpfile);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(header);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	brelse(header_bh);</div><div class='hunk'>@@ -429,6 +573,7 @@ static ssize_t nilfs_cpfile_do_get_cpinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	size_t cpsz = NILFS_MDT(cpfile)-&gt;mi_entry_size;</div><div class='ctx'> 	__u64 cur_cno = nilfs_mdt_cno(cpfile), cno = *cnop;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	int n, ret;</div><div class='ctx'> 	int ncps, i;</div><div class='hunk'>@@ -447,8 +592,8 @@ static ssize_t nilfs_cpfile_do_get_cpinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 		}</div><div class='ctx'> 		ncps = nilfs_cpfile_checkpoints_in_block(cpfile, cno, cur_cno);</div><div class='ctx'> </div><div class='del'>-		kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-		cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, bh, kaddr);</div><div class='add'>+		offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, bh);</div><div class='add'>+		cp = kaddr = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> 		for (i = 0; i &lt; ncps &amp;&amp; n &lt; nci; i++, cp = (void *)cp + cpsz) {</div><div class='ctx'> 			if (!nilfs_checkpoint_invalid(cp)) {</div><div class='ctx'> 				nilfs_cpfile_checkpoint_to_cpinfo(cpfile, cp,</div><div class='hunk'>@@ -457,7 +602,7 @@ static ssize_t nilfs_cpfile_do_get_cpinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 				n++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -482,7 +627,7 @@ static ssize_t nilfs_cpfile_do_get_ssinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 	struct nilfs_cpinfo *ci = buf;</div><div class='ctx'> 	__u64 curr = *cnop, next;</div><div class='ctx'> 	unsigned long curr_blkoff, next_blkoff;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int n = 0, ret;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='hunk'>@@ -491,10 +636,9 @@ static ssize_t nilfs_cpfile_do_get_ssinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 		ret = nilfs_cpfile_get_header_block(cpfile, &amp;bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-		header = nilfs_cpfile_block_get_header(cpfile, bh, kaddr);</div><div class='add'>+		header = kmap_local_folio(bh-&gt;b_folio, 0);</div><div class='ctx'> 		curr = le64_to_cpu(header-&gt;ch_snapshot_list.ssl_next);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(header);</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		if (curr == 0) {</div><div class='ctx'> 			ret = 0;</div><div class='hunk'>@@ -512,9 +656,9 @@ static ssize_t nilfs_cpfile_do_get_ssinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 			ret = 0; /* No snapshots (started from a hole block) */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, curr, bh);</div><div class='add'>+	cp = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> 	while (n &lt; nci) {</div><div class='del'>-		cp = nilfs_cpfile_block_get_checkpoint(cpfile, curr, bh, kaddr);</div><div class='ctx'> 		curr = ~(__u64)0; /* Terminator */</div><div class='ctx'> 		if (unlikely(nilfs_checkpoint_invalid(cp) ||</div><div class='ctx'> 			     !nilfs_checkpoint_snapshot(cp)))</div><div class='hunk'>@@ -526,9 +670,9 @@ static ssize_t nilfs_cpfile_do_get_ssinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 		if (next == 0)</div><div class='ctx'> 			break; /* reach end of the snapshot list */</div><div class='ctx'> </div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 		next_blkoff = nilfs_cpfile_get_blkoff(cpfile, next);</div><div class='ctx'> 		if (curr_blkoff != next_blkoff) {</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			ret = nilfs_cpfile_get_checkpoint_block(cpfile, next,</div><div class='ctx'> 								0, &amp;bh);</div><div class='hunk'>@@ -536,12 +680,13 @@ static ssize_t nilfs_cpfile_do_get_ssinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'> 				WARN_ON(ret == -ENOENT);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='ctx'> 		}</div><div class='add'>+		offset = nilfs_cpfile_checkpoint_offset(cpfile, next, bh);</div><div class='add'>+		cp = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> 		curr = next;</div><div class='ctx'> 		curr_blkoff = next_blkoff;</div><div class='ctx'> 	}</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> 	*cnop = curr;</div><div class='ctx'> 	ret = n;</div><div class='hunk'>@@ -570,7 +715,7 @@ static ssize_t nilfs_cpfile_do_get_ssinfo(struct inode *cpfile, __u64 *cnop,</div><div class='ctx'>  * number to continue searching.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Count of checkpoint info items stored in the output buffer on</div><div class='del'>- * success, or the following negative error code on failure.</div><div class='add'>+ * success, or one of the following negative error codes on failure:</div><div class='ctx'>  * * %-EINVAL	- Invalid checkpoint mode.</div><div class='ctx'>  * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  * * %-EIO	- I/O error (including metadata corruption).</div><div class='hunk'>@@ -591,9 +736,16 @@ ssize_t nilfs_cpfile_get_cpinfo(struct inode *cpfile, __u64 *cnop, int mode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_cpfile_delete_checkpoint -</div><div class='del'>- * @cpfile:</div><div class='del'>- * @cno:</div><div class='add'>+ * nilfs_cpfile_delete_checkpoint - delete a checkpoint</div><div class='add'>+ * @cpfile: checkpoint file inode</div><div class='add'>+ * @cno:    checkpoint number to delete</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EBUSY	- Checkpoint in use (snapshot specified).</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- No valid checkpoint found.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cpfile_delete_checkpoint(struct inode *cpfile, __u64 cno)</div><div class='ctx'> {</div><div class='hunk'>@@ -612,26 +764,6 @@ int nilfs_cpfile_delete_checkpoint(struct inode *cpfile, __u64 cno)</div><div class='ctx'> 	return nilfs_cpfile_delete_checkpoints(cpfile, cno, cno + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nilfs_snapshot_list *</div><div class='del'>-nilfs_cpfile_block_get_snapshot_list(const struct inode *cpfile,</div><div class='del'>-				     __u64 cno,</div><div class='del'>-				     struct buffer_head *bh,</div><div class='del'>-				     void *kaddr)</div><div class='del'>-{</div><div class='del'>-	struct nilfs_cpfile_header *header;</div><div class='del'>-	struct nilfs_checkpoint *cp;</div><div class='del'>-	struct nilfs_snapshot_list *list;</div><div class='del'>-</div><div class='del'>-	if (cno != 0) {</div><div class='del'>-		cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, bh, kaddr);</div><div class='del'>-		list = &amp;cp-&gt;cp_snapshot_list;</div><div class='del'>-	} else {</div><div class='del'>-		header = nilfs_cpfile_block_get_header(cpfile, bh, kaddr);</div><div class='del'>-		list = &amp;header-&gt;ch_snapshot_list;</div><div class='del'>-	}</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nilfs_cpfile_set_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *header_bh, *curr_bh, *prev_bh, *cp_bh;</div><div class='hunk'>@@ -640,94 +772,103 @@ static int nilfs_cpfile_set_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'> 	struct nilfs_snapshot_list *list;</div><div class='ctx'> 	__u64 curr, prev;</div><div class='ctx'> 	unsigned long curr_blkoff, prev_blkoff;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset, curr_list_offset, prev_list_offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (cno == 0)</div><div class='ctx'> 		return -ENOENT; /* checkpoint number 0 is invalid */</div><div class='ctx'> 	down_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='ctx'> </div><div class='add'>+	ret = nilfs_cpfile_get_header_block(cpfile, &amp;header_bh);</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		goto out_sem;</div><div class='add'>+</div><div class='ctx'> 	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &amp;cp_bh);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out_sem;</div><div class='del'>-	kaddr = kmap_atomic(cp_bh-&gt;b_page);</div><div class='del'>-	cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, cp_bh, kaddr);</div><div class='add'>+		goto out_header;</div><div class='add'>+</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (nilfs_checkpoint_invalid(cp)) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 		goto out_cp;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (nilfs_checkpoint_snapshot(cp)) {</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 		goto out_cp;</div><div class='ctx'> 	}</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> </div><div class='del'>-	ret = nilfs_cpfile_get_header_block(cpfile, &amp;header_bh);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_cp;</div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = nilfs_cpfile_block_get_header(cpfile, header_bh, kaddr);</div><div class='add'>+	/*</div><div class='add'>+	 * Find the last snapshot before the checkpoint being changed to</div><div class='add'>+	 * snapshot mode by going backwards through the snapshot list.</div><div class='add'>+	 * Set "prev" to its checkpoint number, or 0 if not found.</div><div class='add'>+	 */</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	list = &amp;header-&gt;ch_snapshot_list;</div><div class='ctx'> 	curr_bh = header_bh;</div><div class='ctx'> 	get_bh(curr_bh);</div><div class='ctx'> 	curr = 0;</div><div class='ctx'> 	curr_blkoff = 0;</div><div class='add'>+	curr_list_offset = nilfs_cpfile_ch_snapshot_list_offset();</div><div class='ctx'> 	prev = le64_to_cpu(list-&gt;ssl_prev);</div><div class='ctx'> 	while (prev &gt; cno) {</div><div class='ctx'> 		prev_blkoff = nilfs_cpfile_get_blkoff(cpfile, prev);</div><div class='ctx'> 		curr = prev;</div><div class='add'>+		kunmap_local(list);</div><div class='ctx'> 		if (curr_blkoff != prev_blkoff) {</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='ctx'> 			brelse(curr_bh);</div><div class='ctx'> 			ret = nilfs_cpfile_get_checkpoint_block(cpfile, curr,</div><div class='ctx'> 								0, &amp;curr_bh);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out_header;</div><div class='del'>-			kaddr = kmap_atomic(curr_bh-&gt;b_page);</div><div class='add'>+			if (unlikely(ret &lt; 0))</div><div class='add'>+				goto out_cp;</div><div class='ctx'> 		}</div><div class='add'>+		curr_list_offset = nilfs_cpfile_cp_snapshot_list_offset(</div><div class='add'>+			cpfile, curr, curr_bh);</div><div class='add'>+		list = kmap_local_folio(curr_bh-&gt;b_folio, curr_list_offset);</div><div class='ctx'> 		curr_blkoff = prev_blkoff;</div><div class='del'>-		cp = nilfs_cpfile_block_get_checkpoint(</div><div class='del'>-			cpfile, curr, curr_bh, kaddr);</div><div class='del'>-		list = &amp;cp-&gt;cp_snapshot_list;</div><div class='ctx'> 		prev = le64_to_cpu(list-&gt;ssl_prev);</div><div class='ctx'> 	}</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(list);</div><div class='ctx'> </div><div class='ctx'> 	if (prev != 0) {</div><div class='ctx'> 		ret = nilfs_cpfile_get_checkpoint_block(cpfile, prev, 0,</div><div class='ctx'> 							&amp;prev_bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_curr;</div><div class='add'>+</div><div class='add'>+		prev_list_offset = nilfs_cpfile_cp_snapshot_list_offset(</div><div class='add'>+			cpfile, prev, prev_bh);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		prev_bh = header_bh;</div><div class='ctx'> 		get_bh(prev_bh);</div><div class='add'>+		prev_list_offset = nilfs_cpfile_ch_snapshot_list_offset();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(curr_bh-&gt;b_page);</div><div class='del'>-	list = nilfs_cpfile_block_get_snapshot_list(</div><div class='del'>-		cpfile, curr, curr_bh, kaddr);</div><div class='add'>+	/* Update the list entry for the next snapshot */</div><div class='add'>+	list = kmap_local_folio(curr_bh-&gt;b_folio, curr_list_offset);</div><div class='ctx'> 	list-&gt;ssl_prev = cpu_to_le64(cno);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(list);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(cp_bh-&gt;b_page);</div><div class='del'>-	cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, cp_bh, kaddr);</div><div class='add'>+	/* Update the checkpoint being changed to a snapshot */</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='ctx'> 	cp-&gt;cp_snapshot_list.ssl_next = cpu_to_le64(curr);</div><div class='ctx'> 	cp-&gt;cp_snapshot_list.ssl_prev = cpu_to_le64(prev);</div><div class='ctx'> 	nilfs_checkpoint_set_snapshot(cp);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(prev_bh-&gt;b_page);</div><div class='del'>-	list = nilfs_cpfile_block_get_snapshot_list(</div><div class='del'>-		cpfile, prev, prev_bh, kaddr);</div><div class='add'>+	/* Update the list entry for the previous snapshot */</div><div class='add'>+	list = kmap_local_folio(prev_bh-&gt;b_folio, prev_list_offset);</div><div class='ctx'> 	list-&gt;ssl_next = cpu_to_le64(cno);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(list);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = nilfs_cpfile_block_get_header(cpfile, header_bh, kaddr);</div><div class='add'>+	/* Update the statistics in the header */</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	le64_add_cpu(&amp;header-&gt;ch_nsnapshots, 1);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(prev_bh);</div><div class='ctx'> 	mark_buffer_dirty(curr_bh);</div><div class='hunk'>@@ -740,12 +881,12 @@ static int nilfs_cpfile_set_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'>  out_curr:</div><div class='ctx'> 	brelse(curr_bh);</div><div class='ctx'> </div><div class='del'>- out_header:</div><div class='del'>-	brelse(header_bh);</div><div class='del'>-</div><div class='ctx'>  out_cp:</div><div class='ctx'> 	brelse(cp_bh);</div><div class='ctx'> </div><div class='add'>+ out_header:</div><div class='add'>+	brelse(header_bh);</div><div class='add'>+</div><div class='ctx'>  out_sem:</div><div class='ctx'> 	up_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -758,79 +899,87 @@ static int nilfs_cpfile_clear_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'> 	struct nilfs_checkpoint *cp;</div><div class='ctx'> 	struct nilfs_snapshot_list *list;</div><div class='ctx'> 	__u64 next, prev;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset, next_list_offset, prev_list_offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (cno == 0)</div><div class='ctx'> 		return -ENOENT; /* checkpoint number 0 is invalid */</div><div class='ctx'> 	down_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='ctx'> </div><div class='add'>+	ret = nilfs_cpfile_get_header_block(cpfile, &amp;header_bh);</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		goto out_sem;</div><div class='add'>+</div><div class='ctx'> 	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &amp;cp_bh);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out_sem;</div><div class='del'>-	kaddr = kmap_atomic(cp_bh-&gt;b_page);</div><div class='del'>-	cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, cp_bh, kaddr);</div><div class='add'>+		goto out_header;</div><div class='add'>+</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, cp_bh);</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (nilfs_checkpoint_invalid(cp)) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 		goto out_cp;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!nilfs_checkpoint_snapshot(cp)) {</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(cp);</div><div class='ctx'> 		goto out_cp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list = &amp;cp-&gt;cp_snapshot_list;</div><div class='ctx'> 	next = le64_to_cpu(list-&gt;ssl_next);</div><div class='ctx'> 	prev = le64_to_cpu(list-&gt;ssl_prev);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> </div><div class='del'>-	ret = nilfs_cpfile_get_header_block(cpfile, &amp;header_bh);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_cp;</div><div class='ctx'> 	if (next != 0) {</div><div class='ctx'> 		ret = nilfs_cpfile_get_checkpoint_block(cpfile, next, 0,</div><div class='ctx'> 							&amp;next_bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out_header;</div><div class='add'>+			goto out_cp;</div><div class='add'>+</div><div class='add'>+		next_list_offset = nilfs_cpfile_cp_snapshot_list_offset(</div><div class='add'>+			cpfile, next, next_bh);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		next_bh = header_bh;</div><div class='ctx'> 		get_bh(next_bh);</div><div class='add'>+		next_list_offset = nilfs_cpfile_ch_snapshot_list_offset();</div><div class='ctx'> 	}</div><div class='ctx'> 	if (prev != 0) {</div><div class='ctx'> 		ret = nilfs_cpfile_get_checkpoint_block(cpfile, prev, 0,</div><div class='ctx'> 							&amp;prev_bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_next;</div><div class='add'>+</div><div class='add'>+		prev_list_offset = nilfs_cpfile_cp_snapshot_list_offset(</div><div class='add'>+			cpfile, prev, prev_bh);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		prev_bh = header_bh;</div><div class='ctx'> 		get_bh(prev_bh);</div><div class='add'>+		prev_list_offset = nilfs_cpfile_ch_snapshot_list_offset();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(next_bh-&gt;b_page);</div><div class='del'>-	list = nilfs_cpfile_block_get_snapshot_list(</div><div class='del'>-		cpfile, next, next_bh, kaddr);</div><div class='add'>+	/* Update the list entry for the next snapshot */</div><div class='add'>+	list = kmap_local_folio(next_bh-&gt;b_folio, next_list_offset);</div><div class='ctx'> 	list-&gt;ssl_prev = cpu_to_le64(prev);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(list);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(prev_bh-&gt;b_page);</div><div class='del'>-	list = nilfs_cpfile_block_get_snapshot_list(</div><div class='del'>-		cpfile, prev, prev_bh, kaddr);</div><div class='add'>+	/* Update the list entry for the previous snapshot */</div><div class='add'>+	list = kmap_local_folio(prev_bh-&gt;b_folio, prev_list_offset);</div><div class='ctx'> 	list-&gt;ssl_next = cpu_to_le64(next);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(list);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(cp_bh-&gt;b_page);</div><div class='del'>-	cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, cp_bh, kaddr);</div><div class='add'>+	/* Update the snapshot being changed back to a plain checkpoint */</div><div class='add'>+	cp = kmap_local_folio(cp_bh-&gt;b_folio, offset);</div><div class='ctx'> 	cp-&gt;cp_snapshot_list.ssl_next = cpu_to_le64(0);</div><div class='ctx'> 	cp-&gt;cp_snapshot_list.ssl_prev = cpu_to_le64(0);</div><div class='ctx'> 	nilfs_checkpoint_clear_snapshot(cp);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = nilfs_cpfile_block_get_header(cpfile, header_bh, kaddr);</div><div class='add'>+	/* Update the statistics in the header */</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	le64_add_cpu(&amp;header-&gt;ch_nsnapshots, -1);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(next_bh);</div><div class='ctx'> 	mark_buffer_dirty(prev_bh);</div><div class='hunk'>@@ -843,39 +992,33 @@ static int nilfs_cpfile_clear_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'>  out_next:</div><div class='ctx'> 	brelse(next_bh);</div><div class='ctx'> </div><div class='del'>- out_header:</div><div class='del'>-	brelse(header_bh);</div><div class='del'>-</div><div class='ctx'>  out_cp:</div><div class='ctx'> 	brelse(cp_bh);</div><div class='ctx'> </div><div class='add'>+ out_header:</div><div class='add'>+	brelse(header_bh);</div><div class='add'>+</div><div class='ctx'>  out_sem:</div><div class='ctx'> 	up_write(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_cpfile_is_snapshot -</div><div class='add'>+ * nilfs_cpfile_is_snapshot - determine if checkpoint is a snapshot</div><div class='ctx'>  * @cpfile: inode of checkpoint file</div><div class='del'>- * @cno: checkpoint number</div><div class='add'>+ * @cno:    checkpoint number</div><div class='ctx'>  *</div><div class='del'>- * Description:</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 1 is returned if the checkpoint specified by</div><div class='del'>- * @cno is a snapshot, or 0 if not. On error, one of the following negative</div><div class='del'>- * error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - No such checkpoint.</div><div class='add'>+ * Return: 1 if the checkpoint specified by @cno is a snapshot, 0 if not, or</div><div class='add'>+ * one of the following negative error codes on failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- No such checkpoint.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cpfile_is_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct nilfs_checkpoint *cp;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -889,13 +1032,14 @@ int nilfs_cpfile_is_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'> 	ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &amp;bh);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-	cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, bh, kaddr);</div><div class='add'>+</div><div class='add'>+	offset = nilfs_cpfile_checkpoint_offset(cpfile, cno, bh);</div><div class='add'>+	cp = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (nilfs_checkpoint_invalid(cp))</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = nilfs_checkpoint_snapshot(cp);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(cp);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -912,14 +1056,11 @@ int nilfs_cpfile_is_snapshot(struct inode *cpfile, __u64 cno)</div><div class='ctx'>  * Description: nilfs_change_cpmode() changes the mode of the checkpoint</div><div class='ctx'>  * specified by @cno. The mode @mode is NILFS_CHECKPOINT or NILFS_SNAPSHOT.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - No such checkpoint.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- No such checkpoint.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cpfile_change_cpmode(struct inode *cpfile, __u64 cno, int mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -951,20 +1092,17 @@ int nilfs_cpfile_change_cpmode(struct inode *cpfile, __u64 cno, int mode)</div><div class='ctx'>  * @cpstat: pointer to a structure of checkpoint statistics</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_cpfile_get_stat() returns information about checkpoints.</div><div class='add'>+ * The checkpoint statistics are stored in the location pointed to by @cpstat.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned, and checkpoints information is</div><div class='del'>- * stored in the place pointed by @cpstat. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cpfile_get_stat(struct inode *cpfile, struct nilfs_cpstat *cpstat)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct nilfs_cpfile_header *header;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;NILFS_MDT(cpfile)-&gt;mi_sem);</div><div class='hunk'>@@ -972,12 +1110,11 @@ int nilfs_cpfile_get_stat(struct inode *cpfile, struct nilfs_cpstat *cpstat)</div><div class='ctx'> 	ret = nilfs_cpfile_get_header_block(cpfile, &amp;bh);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sem;</div><div class='del'>-	kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-	header = nilfs_cpfile_block_get_header(cpfile, bh, kaddr);</div><div class='add'>+	header = kmap_local_folio(bh-&gt;b_folio, 0);</div><div class='ctx'> 	cpstat-&gt;cs_cno = nilfs_mdt_cno(cpfile);</div><div class='ctx'> 	cpstat-&gt;cs_ncps = le64_to_cpu(header-&gt;ch_ncheckpoints);</div><div class='ctx'> 	cpstat-&gt;cs_nsss = le64_to_cpu(header-&gt;ch_nsnapshots);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='ctx'>  out_sem:</div><div class='hunk'>@@ -991,6 +1128,8 @@ int nilfs_cpfile_get_stat(struct inode *cpfile, struct nilfs_cpstat *cpstat)</div><div class='ctx'>  * @cpsize: size of a checkpoint entry</div><div class='ctx'>  * @raw_inode: on-disk cpfile inode</div><div class='ctx'>  * @inodep: buffer to store the inode</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,</div><div class='ctx'> 		      struct nilfs_inode *raw_inode, struct inode **inodep)</div><div class='hunk'>@@ -1009,7 +1148,7 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,</div><div class='ctx'> 	cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO);</div><div class='ctx'> 	if (unlikely(!cpfile))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!(cpfile-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(cpfile) &amp; I_NEW))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_mdt_init(cpfile, NILFS_MDT_GFP, 0);</div><div class='head'>diff --git a/fs/nilfs2/cpfile.h b/fs/nilfs2/cpfile.h<br/>index edabb2dc5756..f5b1d59289eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/cpfile.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/cpfile.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/cpfile.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/cpfile.h</a></div><div class='hunk'>@@ -16,10 +16,12 @@</div><div class='ctx'> #include &lt;linux/nilfs2_ondisk.h&gt;	/* nilfs_inode, nilfs_checkpoint */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int nilfs_cpfile_get_checkpoint(struct inode *, __u64, int,</div><div class='del'>-				struct nilfs_checkpoint **,</div><div class='del'>-				struct buffer_head **);</div><div class='del'>-void nilfs_cpfile_put_checkpoint(struct inode *, __u64, struct buffer_head *);</div><div class='add'>+int nilfs_cpfile_read_checkpoint(struct inode *cpfile, __u64 cno,</div><div class='add'>+				 struct nilfs_root *root, struct inode *ifile);</div><div class='add'>+int nilfs_cpfile_create_checkpoint(struct inode *cpfile, __u64 cno);</div><div class='add'>+int nilfs_cpfile_finalize_checkpoint(struct inode *cpfile, __u64 cno,</div><div class='add'>+				     struct nilfs_root *root, __u64 blkinc,</div><div class='add'>+				     time64_t ctime, bool minor);</div><div class='ctx'> int nilfs_cpfile_delete_checkpoints(struct inode *, __u64, __u64);</div><div class='ctx'> int nilfs_cpfile_delete_checkpoint(struct inode *, __u64);</div><div class='ctx'> int nilfs_cpfile_change_cpmode(struct inode *, __u64, int);</div><div class='head'>diff --git a/fs/nilfs2/dat.c b/fs/nilfs2/dat.c<br/>index 9cf6ba58f585..674380837ab9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/dat.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/dat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/dat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/dat.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ int nilfs_dat_prepare_alloc(struct inode *dat, struct nilfs_palloc_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = nilfs_palloc_prepare_alloc_entry(dat, req);</div><div class='add'>+	ret = nilfs_palloc_prepare_alloc_entry(dat, req, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -89,15 +89,15 @@ int nilfs_dat_prepare_alloc(struct inode *dat, struct nilfs_palloc_req *req)</div><div class='ctx'> void nilfs_dat_commit_alloc(struct inode *dat, struct nilfs_palloc_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req-&gt;pr_entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, req-&gt;pr_entry_nr,</div><div class='del'>-					     req-&gt;pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, req-&gt;pr_entry_nr,</div><div class='add'>+					   req-&gt;pr_entry_bh);</div><div class='add'>+	entry = kmap_local_folio(req-&gt;pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	entry-&gt;de_start = cpu_to_le64(NILFS_CNO_MIN);</div><div class='ctx'> 	entry-&gt;de_end = cpu_to_le64(NILFS_CNO_MAX);</div><div class='ctx'> 	entry-&gt;de_blocknr = cpu_to_le64(0);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_palloc_commit_alloc_entry(dat, req);</div><div class='ctx'> 	nilfs_dat_commit_entry(dat, req);</div><div class='hunk'>@@ -113,15 +113,15 @@ static void nilfs_dat_commit_free(struct inode *dat,</div><div class='ctx'> 				  struct nilfs_palloc_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req-&gt;pr_entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, req-&gt;pr_entry_nr,</div><div class='del'>-					     req-&gt;pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, req-&gt;pr_entry_nr,</div><div class='add'>+					   req-&gt;pr_entry_bh);</div><div class='add'>+	entry = kmap_local_folio(req-&gt;pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	entry-&gt;de_start = cpu_to_le64(NILFS_CNO_MIN);</div><div class='ctx'> 	entry-&gt;de_end = cpu_to_le64(NILFS_CNO_MIN);</div><div class='ctx'> 	entry-&gt;de_blocknr = cpu_to_le64(0);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_dat_commit_entry(dat, req);</div><div class='ctx'> </div><div class='hunk'>@@ -143,14 +143,14 @@ void nilfs_dat_commit_start(struct inode *dat, struct nilfs_palloc_req *req,</div><div class='ctx'> 			    sector_t blocknr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req-&gt;pr_entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, req-&gt;pr_entry_nr,</div><div class='del'>-					     req-&gt;pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, req-&gt;pr_entry_nr,</div><div class='add'>+					   req-&gt;pr_entry_bh);</div><div class='add'>+	entry = kmap_local_folio(req-&gt;pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	entry-&gt;de_start = cpu_to_le64(nilfs_mdt_cno(dat));</div><div class='ctx'> 	entry-&gt;de_blocknr = cpu_to_le64(blocknr);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_dat_commit_entry(dat, req);</div><div class='ctx'> }</div><div class='hunk'>@@ -160,19 +160,19 @@ int nilfs_dat_prepare_end(struct inode *dat, struct nilfs_palloc_req *req)</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='ctx'> 	__u64 start;</div><div class='ctx'> 	sector_t blocknr;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_dat_prepare_entry(dat, req, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req-&gt;pr_entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, req-&gt;pr_entry_nr,</div><div class='del'>-					     req-&gt;pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, req-&gt;pr_entry_nr,</div><div class='add'>+					   req-&gt;pr_entry_bh);</div><div class='add'>+	entry = kmap_local_folio(req-&gt;pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	start = le64_to_cpu(entry-&gt;de_start);</div><div class='ctx'> 	blocknr = le64_to_cpu(entry-&gt;de_blocknr);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	if (blocknr == 0) {</div><div class='ctx'> 		ret = nilfs_palloc_prepare_free_entry(dat, req);</div><div class='hunk'>@@ -200,11 +200,11 @@ void nilfs_dat_commit_end(struct inode *dat, struct nilfs_palloc_req *req,</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='ctx'> 	__u64 start, end;</div><div class='ctx'> 	sector_t blocknr;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req-&gt;pr_entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, req-&gt;pr_entry_nr,</div><div class='del'>-					     req-&gt;pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, req-&gt;pr_entry_nr,</div><div class='add'>+					   req-&gt;pr_entry_bh);</div><div class='add'>+	entry = kmap_local_folio(req-&gt;pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	end = start = le64_to_cpu(entry-&gt;de_start);</div><div class='ctx'> 	if (!dead) {</div><div class='ctx'> 		end = nilfs_mdt_cno(dat);</div><div class='hunk'>@@ -212,7 +212,7 @@ void nilfs_dat_commit_end(struct inode *dat, struct nilfs_palloc_req *req,</div><div class='ctx'> 	}</div><div class='ctx'> 	entry-&gt;de_end = cpu_to_le64(end);</div><div class='ctx'> 	blocknr = le64_to_cpu(entry-&gt;de_blocknr);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	if (blocknr == 0)</div><div class='ctx'> 		nilfs_dat_commit_free(dat, req);</div><div class='hunk'>@@ -225,14 +225,14 @@ void nilfs_dat_abort_end(struct inode *dat, struct nilfs_palloc_req *req)</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='ctx'> 	__u64 start;</div><div class='ctx'> 	sector_t blocknr;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req-&gt;pr_entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, req-&gt;pr_entry_nr,</div><div class='del'>-					     req-&gt;pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, req-&gt;pr_entry_nr,</div><div class='add'>+					   req-&gt;pr_entry_bh);</div><div class='add'>+	entry = kmap_local_folio(req-&gt;pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	start = le64_to_cpu(entry-&gt;de_start);</div><div class='ctx'> 	blocknr = le64_to_cpu(entry-&gt;de_blocknr);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	if (start == nilfs_mdt_cno(dat) &amp;&amp; blocknr == 0)</div><div class='ctx'> 		nilfs_palloc_abort_free_entry(dat, req);</div><div class='hunk'>@@ -271,18 +271,16 @@ void nilfs_dat_abort_update(struct inode *dat,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_dat_mark_dirty -</div><div class='del'>- * @dat: DAT file inode</div><div class='add'>+ * nilfs_dat_mark_dirty - mark the DAT block buffer containing the specified</div><div class='add'>+ *                        virtual block address entry as dirty</div><div class='add'>+ * @dat:      DAT file inode</div><div class='ctx'>  * @vblocknr: virtual block number</div><div class='ctx'>  *</div><div class='del'>- * Description:</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid DAT entry (internal code).</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_dat_mark_dirty(struct inode *dat, __u64 vblocknr)</div><div class='ctx'> {</div><div class='hunk'>@@ -305,14 +303,11 @@ int nilfs_dat_mark_dirty(struct inode *dat, __u64 vblocknr)</div><div class='ctx'>  * Description: nilfs_dat_freev() frees the virtual block numbers specified by</div><div class='ctx'>  * @vblocknrs and @nitems.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - The virtual block number have not been allocated.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- The virtual block number have not been allocated.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_dat_freev(struct inode *dat, __u64 *vblocknrs, size_t nitems)</div><div class='ctx'> {</div><div class='hunk'>@@ -328,18 +323,16 @@ int nilfs_dat_freev(struct inode *dat, __u64 *vblocknrs, size_t nitems)</div><div class='ctx'>  * Description: nilfs_dat_move() changes the block number associated with</div><div class='ctx'>  * @vblocknr to @blocknr.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *entry_bh;</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_palloc_get_entry_block(dat, vblocknr, 0, &amp;entry_bh);</div><div class='hunk'>@@ -362,21 +355,21 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, vblocknr, entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, vblocknr, entry_bh);</div><div class='add'>+	entry = kmap_local_folio(entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (unlikely(entry-&gt;de_blocknr == cpu_to_le64(0))) {</div><div class='ctx'> 		nilfs_crit(dat-&gt;i_sb,</div><div class='ctx'> 			   "%s: invalid vblocknr = %llu, [%llu, %llu)",</div><div class='ctx'> 			   __func__, (unsigned long long)vblocknr,</div><div class='ctx'> 			   (unsigned long long)le64_to_cpu(entry-&gt;de_start),</div><div class='ctx'> 			   (unsigned long long)le64_to_cpu(entry-&gt;de_end));</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(entry);</div><div class='ctx'> 		brelse(entry_bh);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	WARN_ON(blocknr == 0);</div><div class='ctx'> 	entry-&gt;de_blocknr = cpu_to_le64(blocknr);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(entry_bh);</div><div class='ctx'> 	nilfs_mdt_mark_dirty(dat);</div><div class='hunk'>@@ -393,24 +386,21 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr)</div><div class='ctx'>  * @blocknrp: pointer to a block number</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_dat_translate() maps the virtual block number @vblocknr</div><div class='del'>- * to the corresponding block number.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and the block number associated</div><div class='del'>- * with @vblocknr is stored in the place pointed by @blocknrp. On error, one</div><div class='del'>- * of the following negative error codes is returned.</div><div class='add'>+ * to the corresponding block number.  The block number associated with</div><div class='add'>+ * @vblocknr is stored in the place pointed to by @blocknrp.</div><div class='ctx'>  *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - A block number associated with @vblocknr does not exist.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- A block number associated with @vblocknr does not exist.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_dat_translate(struct inode *dat, __u64 vblocknr, sector_t *blocknrp)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *entry_bh, *bh;</div><div class='ctx'> 	struct nilfs_dat_entry *entry;</div><div class='ctx'> 	sector_t blocknr;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_palloc_get_entry_block(dat, vblocknr, 0, &amp;entry_bh);</div><div class='hunk'>@@ -426,8 +416,8 @@ int nilfs_dat_translate(struct inode *dat, __u64 vblocknr, sector_t *blocknrp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(entry_bh-&gt;b_page);</div><div class='del'>-	entry = nilfs_palloc_block_get_entry(dat, vblocknr, entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(dat, vblocknr, entry_bh);</div><div class='add'>+	entry = kmap_local_folio(entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	blocknr = le64_to_cpu(entry-&gt;de_blocknr);</div><div class='ctx'> 	if (blocknr == 0) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='hunk'>@@ -436,7 +426,7 @@ int nilfs_dat_translate(struct inode *dat, __u64 vblocknr, sector_t *blocknrp)</div><div class='ctx'> 	*blocknrp = blocknr;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(entry);</div><div class='ctx'> 	brelse(entry_bh);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -445,11 +435,12 @@ ssize_t nilfs_dat_get_vinfo(struct inode *dat, void *buf, unsigned int visz,</div><div class='ctx'> 			    size_t nvi)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *entry_bh;</div><div class='del'>-	struct nilfs_dat_entry *entry;</div><div class='add'>+	struct nilfs_dat_entry *entry, *first_entry;</div><div class='ctx'> 	struct nilfs_vinfo *vinfo = buf;</div><div class='ctx'> 	__u64 first, last;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	unsigned long entries_per_block = NILFS_MDT(dat)-&gt;mi_entries_per_block;</div><div class='add'>+	unsigned int entry_size = NILFS_MDT(dat)-&gt;mi_entry_size;</div><div class='ctx'> 	int i, j, n, ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nvi; i += n) {</div><div class='hunk'>@@ -457,23 +448,28 @@ ssize_t nilfs_dat_get_vinfo(struct inode *dat, void *buf, unsigned int visz,</div><div class='ctx'> 						   0, &amp;entry_bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		kaddr = kmap_atomic(entry_bh-&gt;b_page);</div><div class='del'>-		/* last virtual block number in this block */</div><div class='add'>+</div><div class='ctx'> 		first = vinfo-&gt;vi_vblocknr;</div><div class='del'>-		do_div(first, entries_per_block);</div><div class='add'>+		first = div64_ul(first, entries_per_block);</div><div class='ctx'> 		first *= entries_per_block;</div><div class='add'>+		/* first virtual block number in this block */</div><div class='add'>+</div><div class='ctx'> 		last = first + entries_per_block - 1;</div><div class='add'>+		/* last virtual block number in this block */</div><div class='add'>+</div><div class='add'>+		offset = nilfs_palloc_entry_offset(dat, first, entry_bh);</div><div class='add'>+		first_entry = kmap_local_folio(entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 		for (j = i, n = 0;</div><div class='ctx'> 		     j &lt; nvi &amp;&amp; vinfo-&gt;vi_vblocknr &gt;= first &amp;&amp;</div><div class='ctx'> 			     vinfo-&gt;vi_vblocknr &lt;= last;</div><div class='ctx'> 		     j++, n++, vinfo = (void *)vinfo + visz) {</div><div class='del'>-			entry = nilfs_palloc_block_get_entry(</div><div class='del'>-				dat, vinfo-&gt;vi_vblocknr, entry_bh, kaddr);</div><div class='add'>+			entry = (void *)first_entry +</div><div class='add'>+				(vinfo-&gt;vi_vblocknr - first) * entry_size;</div><div class='ctx'> 			vinfo-&gt;vi_start = le64_to_cpu(entry-&gt;de_start);</div><div class='ctx'> 			vinfo-&gt;vi_end = le64_to_cpu(entry-&gt;de_end);</div><div class='ctx'> 			vinfo-&gt;vi_blocknr = le64_to_cpu(entry-&gt;de_blocknr);</div><div class='ctx'> 		}</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(first_entry);</div><div class='ctx'> 		brelse(entry_bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -486,6 +482,8 @@ ssize_t nilfs_dat_get_vinfo(struct inode *dat, void *buf, unsigned int visz,</div><div class='ctx'>  * @entry_size: size of a dat entry</div><div class='ctx'>  * @raw_inode: on-disk dat inode</div><div class='ctx'>  * @inodep: buffer to store the inode</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_dat_read(struct super_block *sb, size_t entry_size,</div><div class='ctx'> 		   struct nilfs_inode *raw_inode, struct inode **inodep)</div><div class='hunk'>@@ -508,7 +506,7 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size,</div><div class='ctx'> 	dat = nilfs_iget_locked(sb, NULL, NILFS_DAT_INO);</div><div class='ctx'> 	if (unlikely(!dat))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!(dat-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(dat) &amp; I_NEW))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_mdt_init(dat, NILFS_MDT_GFP, sizeof(*di));</div><div class='head'>diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c<br/>index bc846b904b68..6ca3d74be1e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/dir.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ static inline unsigned int nilfs_chunk_size(struct inode *inode)</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int nilfs_last_byte(struct inode *inode, unsigned long page_nr)</div><div class='ctx'> {</div><div class='del'>-	unsigned int last_byte = inode-&gt;i_size;</div><div class='add'>+	u64 last_byte = inode-&gt;i_size;</div><div class='ctx'> </div><div class='ctx'> 	last_byte -= page_nr &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	if (last_byte &gt; PAGE_SIZE)</div><div class='hunk'>@@ -83,7 +83,7 @@ static int nilfs_prepare_chunk(struct folio *folio, unsigned int from,</div><div class='ctx'> {</div><div class='ctx'> 	loff_t pos = folio_pos(folio) + from;</div><div class='ctx'> </div><div class='del'>-	return __block_write_begin(&amp;folio-&gt;page, pos, to - from, nilfs_get_block);</div><div class='add'>+	return __block_write_begin(folio, pos, to - from, nilfs_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nilfs_commit_chunk(struct folio *folio,</div><div class='hunk'>@@ -95,8 +95,8 @@ static void nilfs_commit_chunk(struct folio *folio,</div><div class='ctx'> 	unsigned int nr_dirty;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	nr_dirty = nilfs_page_count_clean_buffers(&amp;folio-&gt;page, from, to);</div><div class='del'>-	copied = block_write_end(NULL, mapping, pos, len, len, &amp;folio-&gt;page, NULL);</div><div class='add'>+	nr_dirty = nilfs_page_count_clean_buffers(folio, from, to);</div><div class='add'>+	copied = block_write_end(pos, len, len, folio);</div><div class='ctx'> 	if (pos + copied &gt; dir-&gt;i_size)</div><div class='ctx'> 		i_size_write(dir, pos + copied);</div><div class='ctx'> 	if (IS_DIRSYNC(dir))</div><div class='hunk'>@@ -135,6 +135,9 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr)</div><div class='ctx'> 			goto Enamelen;</div><div class='ctx'> 		if (((offs + rec_len - 1) ^ offs) &amp; ~(chunk_size-1))</div><div class='ctx'> 			goto Espan;</div><div class='add'>+		if (unlikely(p-&gt;inode &amp;&amp;</div><div class='add'>+			     NILFS_PRIVATE_INODE(le64_to_cpu(p-&gt;inode))))</div><div class='add'>+			goto Einumber;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (offs != limit)</div><div class='ctx'> 		goto Eend;</div><div class='hunk'>@@ -160,6 +163,9 @@ Enamelen:</div><div class='ctx'> 	goto bad_entry;</div><div class='ctx'> Espan:</div><div class='ctx'> 	error = "directory entry across blocks";</div><div class='add'>+	goto bad_entry;</div><div class='add'>+Einumber:</div><div class='add'>+	error = "disallowed inode number";</div><div class='ctx'> bad_entry:</div><div class='ctx'> 	nilfs_error(sb,</div><div class='ctx'> 		    "bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%zd, name_len=%d",</div><div class='hunk'>@@ -174,7 +180,6 @@ Eend:</div><div class='ctx'> 		    dir-&gt;i_ino, (folio-&gt;index &lt;&lt; PAGE_SHIFT) + offs,</div><div class='ctx'> 		    (unsigned long)le64_to_cpu(p-&gt;inode));</div><div class='ctx'> fail:</div><div class='del'>-	folio_set_error(folio);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -226,37 +231,6 @@ static struct nilfs_dir_entry *nilfs_next_entry(struct nilfs_dir_entry *p)</div><div class='ctx'> 					  nilfs_rec_len_from_disk(p-&gt;rec_len));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char</div><div class='del'>-nilfs_filetype_table[NILFS_FT_MAX] = {</div><div class='del'>-	[NILFS_FT_UNKNOWN]	= DT_UNKNOWN,</div><div class='del'>-	[NILFS_FT_REG_FILE]	= DT_REG,</div><div class='del'>-	[NILFS_FT_DIR]		= DT_DIR,</div><div class='del'>-	[NILFS_FT_CHRDEV]	= DT_CHR,</div><div class='del'>-	[NILFS_FT_BLKDEV]	= DT_BLK,</div><div class='del'>-	[NILFS_FT_FIFO]		= DT_FIFO,</div><div class='del'>-	[NILFS_FT_SOCK]		= DT_SOCK,</div><div class='del'>-	[NILFS_FT_SYMLINK]	= DT_LNK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define S_SHIFT 12</div><div class='del'>-static unsigned char</div><div class='del'>-nilfs_type_by_mode[S_IFMT &gt;&gt; S_SHIFT] = {</div><div class='del'>-	[S_IFREG &gt;&gt; S_SHIFT]	= NILFS_FT_REG_FILE,</div><div class='del'>-	[S_IFDIR &gt;&gt; S_SHIFT]	= NILFS_FT_DIR,</div><div class='del'>-	[S_IFCHR &gt;&gt; S_SHIFT]	= NILFS_FT_CHRDEV,</div><div class='del'>-	[S_IFBLK &gt;&gt; S_SHIFT]	= NILFS_FT_BLKDEV,</div><div class='del'>-	[S_IFIFO &gt;&gt; S_SHIFT]	= NILFS_FT_FIFO,</div><div class='del'>-	[S_IFSOCK &gt;&gt; S_SHIFT]	= NILFS_FT_SOCK,</div><div class='del'>-	[S_IFLNK &gt;&gt; S_SHIFT]	= NILFS_FT_SYMLINK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void nilfs_set_de_type(struct nilfs_dir_entry *de, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	umode_t mode = inode-&gt;i_mode;</div><div class='del'>-</div><div class='del'>-	de-&gt;file_type = nilfs_type_by_mode[(mode &amp; S_IFMT)&gt;&gt;S_SHIFT];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int nilfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t pos = ctx-&gt;pos;</div><div class='hunk'>@@ -292,10 +266,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			if (de-&gt;inode) {</div><div class='ctx'> 				unsigned char t;</div><div class='ctx'> </div><div class='del'>-				if (de-&gt;file_type &lt; NILFS_FT_MAX)</div><div class='del'>-					t = nilfs_filetype_table[de-&gt;file_type];</div><div class='del'>-				else</div><div class='del'>-					t = DT_UNKNOWN;</div><div class='add'>+				t = fs_ftype_to_dtype(de-&gt;file_type);</div><div class='ctx'> </div><div class='ctx'> 				if (!dir_emit(ctx, de-&gt;name, de-&gt;name_len,</div><div class='ctx'> 						le64_to_cpu(de-&gt;inode), t)) {</div><div class='hunk'>@@ -318,7 +289,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'>  * The folio is mapped and unlocked.  When the caller is finished with</div><div class='ctx'>  * the entry, it should call folio_release_kmap().</div><div class='ctx'>  *</div><div class='del'>- * On failure, returns NULL and the caller should ignore foliop.</div><div class='add'>+ * On failure, returns an error pointer and the caller should ignore foliop.</div><div class='ctx'>  */</div><div class='ctx'> struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,</div><div class='ctx'> 		const struct qstr *qstr, struct folio **foliop)</div><div class='hunk'>@@ -341,22 +312,24 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,</div><div class='ctx'> 	do {</div><div class='ctx'> 		char *kaddr = nilfs_get_folio(dir, n, foliop);</div><div class='ctx'> </div><div class='del'>-		if (!IS_ERR(kaddr)) {</div><div class='del'>-			de = (struct nilfs_dir_entry *)kaddr;</div><div class='del'>-			kaddr += nilfs_last_byte(dir, n) - reclen;</div><div class='del'>-			while ((char *) de &lt;= kaddr) {</div><div class='del'>-				if (de-&gt;rec_len == 0) {</div><div class='del'>-					nilfs_error(dir-&gt;i_sb,</div><div class='del'>-						"zero-length directory entry");</div><div class='del'>-					folio_release_kmap(*foliop, kaddr);</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				if (nilfs_match(namelen, name, de))</div><div class='del'>-					goto found;</div><div class='del'>-				de = nilfs_next_entry(de);</div><div class='add'>+		if (IS_ERR(kaddr))</div><div class='add'>+			return ERR_CAST(kaddr);</div><div class='add'>+</div><div class='add'>+		de = (struct nilfs_dir_entry *)kaddr;</div><div class='add'>+		kaddr += nilfs_last_byte(dir, n) - reclen;</div><div class='add'>+		while ((char *)de &lt;= kaddr) {</div><div class='add'>+			if (de-&gt;rec_len == 0) {</div><div class='add'>+				nilfs_error(dir-&gt;i_sb,</div><div class='add'>+					    "zero-length directory entry");</div><div class='add'>+				folio_release_kmap(*foliop, kaddr);</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			folio_release_kmap(*foliop, kaddr);</div><div class='add'>+			if (nilfs_match(namelen, name, de))</div><div class='add'>+				goto found;</div><div class='add'>+			de = nilfs_next_entry(de);</div><div class='ctx'> 		}</div><div class='add'>+		folio_release_kmap(*foliop, kaddr);</div><div class='add'>+</div><div class='ctx'> 		if (++n &gt;= npages)</div><div class='ctx'> 			n = 0;</div><div class='ctx'> 		/* next folio is past the blocks we've got */</div><div class='hunk'>@@ -369,7 +342,7 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (n != start);</div><div class='ctx'> out:</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='ctx'> 	ei-&gt;i_dir_start_lookup = n;</div><div class='hunk'>@@ -378,28 +351,56 @@ found:</div><div class='ctx'> </div><div class='ctx'> struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct folio **foliop)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_dir_entry *de = nilfs_get_folio(dir, 0, foliop);</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	struct nilfs_dir_entry *de, *next_de;</div><div class='add'>+	size_t limit;</div><div class='add'>+	char *msg;</div><div class='ctx'> </div><div class='add'>+	de = nilfs_get_folio(dir, 0, &amp;folio);</div><div class='ctx'> 	if (IS_ERR(de))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	return nilfs_next_entry(de);</div><div class='add'>+</div><div class='add'>+	limit = nilfs_last_byte(dir, 0);  /* is a multiple of chunk size */</div><div class='add'>+	if (unlikely(!limit || le64_to_cpu(de-&gt;inode) != dir-&gt;i_ino ||</div><div class='add'>+		     !nilfs_match(1, ".", de))) {</div><div class='add'>+		msg = "missing '.'";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	next_de = nilfs_next_entry(de);</div><div class='add'>+	/*</div><div class='add'>+	 * If "next_de" has not reached the end of the chunk, there is</div><div class='add'>+	 * at least one more record.  Check whether it matches "..".</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((char *)next_de == (char *)de + nilfs_chunk_size(dir) ||</div><div class='add'>+		     !nilfs_match(2, "..", next_de))) {</div><div class='add'>+		msg = "missing '..'";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	*foliop = folio;</div><div class='add'>+	return next_de;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	nilfs_error(dir-&gt;i_sb, "directory #%lu %s", dir-&gt;i_ino, msg);</div><div class='add'>+	folio_release_kmap(folio, de);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)</div><div class='add'>+int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)</div><div class='ctx'> {</div><div class='del'>-	ino_t res = 0;</div><div class='ctx'> 	struct nilfs_dir_entry *de;</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	de = nilfs_find_entry(dir, qstr, &amp;folio);</div><div class='del'>-	if (de) {</div><div class='del'>-		res = le64_to_cpu(de-&gt;inode);</div><div class='del'>-		folio_release_kmap(folio, de);</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='add'>+	if (IS_ERR(de))</div><div class='add'>+		return PTR_ERR(de);</div><div class='add'>+</div><div class='add'>+	*ino = le64_to_cpu(de-&gt;inode);</div><div class='add'>+	folio_release_kmap(folio, de);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,</div><div class='add'>+int nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,</div><div class='ctx'> 		    struct folio *folio, struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	size_t from = offset_in_folio(folio, de);</div><div class='hunk'>@@ -409,11 +410,15 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,</div><div class='ctx'> </div><div class='ctx'> 	folio_lock(folio);</div><div class='ctx'> 	err = nilfs_prepare_chunk(folio, from, to);</div><div class='del'>-	BUG_ON(err);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> 	de-&gt;inode = cpu_to_le64(inode-&gt;i_ino);</div><div class='del'>-	nilfs_set_de_type(de, inode);</div><div class='add'>+	de-&gt;file_type = fs_umode_to_ftype(inode-&gt;i_mode);</div><div class='ctx'> 	nilfs_commit_chunk(folio, mapping, from, to);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -498,7 +503,7 @@ got_it:</div><div class='ctx'> 	de-&gt;name_len = namelen;</div><div class='ctx'> 	memcpy(de-&gt;name, name, namelen);</div><div class='ctx'> 	de-&gt;inode = cpu_to_le64(inode-&gt;i_ino);</div><div class='del'>-	nilfs_set_de_type(de, inode);</div><div class='add'>+	de-&gt;file_type = fs_umode_to_ftype(inode-&gt;i_mode);</div><div class='ctx'> 	nilfs_commit_chunk(folio, folio-&gt;mapping, from, to);</div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	nilfs_mark_inode_dirty(dir);</div><div class='hunk'>@@ -542,7 +547,10 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct folio *folio)</div><div class='ctx'> 		from = (char *)pde - kaddr;</div><div class='ctx'> 	folio_lock(folio);</div><div class='ctx'> 	err = nilfs_prepare_chunk(folio, from, to);</div><div class='del'>-	BUG_ON(err);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	if (pde)</div><div class='ctx'> 		pde-&gt;rec_len = nilfs_rec_len_to_disk(to - from);</div><div class='ctx'> 	dir-&gt;inode = 0;</div><div class='hunk'>@@ -579,14 +587,14 @@ int nilfs_make_empty(struct inode *inode, struct inode *parent)</div><div class='ctx'> 	de-&gt;rec_len = nilfs_rec_len_to_disk(NILFS_DIR_REC_LEN(1));</div><div class='ctx'> 	memcpy(de-&gt;name, ".\0\0", 4);</div><div class='ctx'> 	de-&gt;inode = cpu_to_le64(inode-&gt;i_ino);</div><div class='del'>-	nilfs_set_de_type(de, inode);</div><div class='add'>+	de-&gt;file_type = fs_umode_to_ftype(inode-&gt;i_mode);</div><div class='ctx'> </div><div class='ctx'> 	de = (struct nilfs_dir_entry *)(kaddr + NILFS_DIR_REC_LEN(1));</div><div class='ctx'> 	de-&gt;name_len = 2;</div><div class='ctx'> 	de-&gt;rec_len = nilfs_rec_len_to_disk(chunk_size - NILFS_DIR_REC_LEN(1));</div><div class='ctx'> 	de-&gt;inode = cpu_to_le64(parent-&gt;i_ino);</div><div class='ctx'> 	memcpy(de-&gt;name, "..\0", 4);</div><div class='del'>-	nilfs_set_de_type(de, inode);</div><div class='add'>+	de-&gt;file_type = fs_umode_to_ftype(inode-&gt;i_mode);</div><div class='ctx'> 	kunmap_local(kaddr);</div><div class='ctx'> 	nilfs_commit_chunk(folio, mapping, 0, chunk_size);</div><div class='ctx'> fail:</div><div class='hunk'>@@ -608,7 +616,7 @@ int nilfs_empty_dir(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 		kaddr = nilfs_get_folio(inode, i, &amp;folio);</div><div class='ctx'> 		if (IS_ERR(kaddr))</div><div class='del'>-			continue;</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 		de = (struct nilfs_dir_entry *)kaddr;</div><div class='ctx'> 		kaddr += nilfs_last_byte(inode, i) - NILFS_DIR_REC_LEN(1);</div><div class='head'>diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c<br/>index 4c85914f2abc..2d8dc6b35b54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/direct.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/direct.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/direct.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/direct.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct,</div><div class='ctx'> 		dat = nilfs_bmap_get_dat(direct);</div><div class='ctx'> 		ret = nilfs_dat_translate(dat, ptr, &amp;blocknr);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+			goto dat_error;</div><div class='ctx'> 		ptr = blocknr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +79,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct,</div><div class='ctx'> 		if (dat) {</div><div class='ctx'> 			ret = nilfs_dat_translate(dat, ptr2, &amp;blocknr);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='add'>+				goto dat_error;</div><div class='ctx'> 			ptr2 = blocknr;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ptr2 != ptr + cnt)</div><div class='hunk'>@@ -87,6 +87,11 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct,</div><div class='ctx'> 	}</div><div class='ctx'> 	*ptrp = ptr;</div><div class='ctx'> 	return cnt;</div><div class='add'>+</div><div class='add'>+ dat_error:</div><div class='add'>+	if (ret == -ENOENT)</div><div class='add'>+		ret = -EINVAL;  /* Notify bmap layer of metadata corruption */</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __u64</div><div class='hunk'>@@ -268,6 +273,9 @@ static int nilfs_direct_propagate(struct nilfs_bmap *bmap,</div><div class='ctx'> 	dat = nilfs_bmap_get_dat(bmap);</div><div class='ctx'> 	key = nilfs_bmap_data_get_key(bmap, bh);</div><div class='ctx'> 	ptr = nilfs_direct_get_ptr(bmap, key);</div><div class='add'>+	if (ptr == NILFS_BMAP_INVALID_PTR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (!buffer_nilfs_volatile(bh)) {</div><div class='ctx'> 		oldreq.pr_entry_nr = ptr;</div><div class='ctx'> 		newreq.pr_entry_nr = ptr;</div><div class='head'>diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c<br/>index bec33b89a075..1b8d754db44d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/file.c</a></div><div class='hunk'>@@ -107,7 +107,13 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	nilfs_transaction_commit(inode-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'>  mapped:</div><div class='del'>-	folio_wait_stable(folio);</div><div class='add'>+	/*</div><div class='add'>+	 * Since checksumming including data blocks is performed to determine</div><div class='add'>+	 * the validity of the log to be written and used for recovery, it is</div><div class='add'>+	 * necessary to wait for writeback to finish here, regardless of the</div><div class='add'>+	 * stable write requirement of the backing device.</div><div class='add'>+	 */</div><div class='add'>+	folio_wait_writeback(folio);</div><div class='ctx'>  out:</div><div class='ctx'> 	sb_end_pagefault(inode-&gt;i_sb);</div><div class='ctx'> 	return vmf_fs_error(ret);</div><div class='hunk'>@@ -119,10 +125,10 @@ static const struct vm_operations_struct nilfs_file_vm_ops = {</div><div class='ctx'> 	.page_mkwrite	= nilfs_page_mkwrite,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int nilfs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	file_accessed(file);</div><div class='del'>-	vma-&gt;vm_ops = &amp;nilfs_file_vm_ops;</div><div class='add'>+	file_accessed(desc-&gt;file);</div><div class='add'>+	desc-&gt;vm_ops = &amp;nilfs_file_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +144,7 @@ const struct file_operations nilfs_file_operations = {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> 	.compat_ioctl	= nilfs_compat_ioctl,</div><div class='ctx'> #endif	/* CONFIG_COMPAT */</div><div class='del'>-	.mmap		= nilfs_file_mmap,</div><div class='add'>+	.mmap_prepare	= nilfs_file_mmap_prepare,</div><div class='ctx'> 	.open		= generic_file_open,</div><div class='ctx'> 	/* .release	= nilfs_release_file, */</div><div class='ctx'> 	.fsync		= nilfs_sync_file,</div><div class='head'>diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c<br/>index bf9a11d58817..561c220799c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/gcinode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/gcinode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/gcinode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/gcinode.c</a></div><div class='hunk'>@@ -46,14 +46,11 @@</div><div class='ctx'>  * specified by @pbn to the GC pagecache with the key @blkoff.</div><div class='ctx'>  * This function sets @vbn (@pbn if @vbn is zero) in b_blocknr of the buffer.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On Error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - The block specified with @pbn does not exist.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- The block specified with @pbn does not exist.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff,</div><div class='ctx'> 				   sector_t pbn, __u64 vbn,</div><div class='hunk'>@@ -83,10 +80,8 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!buffer_mapped(bh)) {</div><div class='del'>-		bh-&gt;b_bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='add'>+	if (!buffer_mapped(bh))</div><div class='ctx'> 		set_buffer_mapped(bh);</div><div class='del'>-	}</div><div class='ctx'> 	bh-&gt;b_blocknr = pbn;</div><div class='ctx'> 	bh-&gt;b_end_io = end_buffer_read_sync;</div><div class='ctx'> 	get_bh(bh);</div><div class='hunk'>@@ -116,12 +111,11 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff,</div><div class='ctx'>  * specified by @vbn to the GC pagecache.  @pbn can be supplied by the</div><div class='ctx'>  * caller to avoid translation of the disk block address.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On Error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- Invalid virtual block address.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_gccache_submit_read_node(struct inode *inode, sector_t pbn,</div><div class='ctx'> 				   __u64 vbn, struct buffer_head **out_bh)</div><div class='hunk'>@@ -165,7 +159,7 @@ int nilfs_init_gcinode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = S_IFREG;</div><div class='ctx'> 	mapping_set_gfp_mask(inode-&gt;i_mapping, GFP_NOFS);</div><div class='del'>-	inode-&gt;i_mapping-&gt;a_ops = &amp;empty_aops;</div><div class='add'>+	inode-&gt;i_mapping-&gt;a_ops = &amp;nilfs_buffer_cache_aops;</div><div class='ctx'> </div><div class='ctx'> 	ii-&gt;i_flags = 0;</div><div class='ctx'> 	nilfs_bmap_init_gc(ii-&gt;i_bmap);</div><div class='hunk'>@@ -175,6 +169,7 @@ int nilfs_init_gcinode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_remove_all_gcinodes() - remove all unprocessed gc inodes</div><div class='add'>+ * @nilfs: NILFS filesystem instance</div><div class='ctx'>  */</div><div class='ctx'> void nilfs_remove_all_gcinodes(struct the_nilfs *nilfs)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nilfs2/ifile.c b/fs/nilfs2/ifile.c<br/>index a8a4bc8490b4..99eb8a59009e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/ifile.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/ifile.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/ifile.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/ifile.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include "mdt.h"</div><div class='ctx'> #include "alloc.h"</div><div class='ctx'> #include "ifile.h"</div><div class='add'>+#include "cpfile.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct nilfs_ifile_info - on-memory private data of ifile</div><div class='hunk'>@@ -37,17 +38,16 @@ static inline struct nilfs_ifile_info *NILFS_IFILE_I(struct inode *ifile)</div><div class='ctx'>  * @out_ino: pointer to a variable to store inode number</div><div class='ctx'>  * @out_bh: buffer_head contains newly allocated disk inode</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned and the newly allocated inode</div><div class='del'>- * number is stored in the place pointed by @ino, and buffer_head pointer</div><div class='del'>- * that contains newly allocated disk inode structure is stored in the</div><div class='del'>- * place pointed by @out_bh</div><div class='del'>- * On error, one of the following negative error codes is returned.</div><div class='add'>+ * nilfs_ifile_create_inode() allocates a new inode in the ifile metadata</div><div class='add'>+ * file and stores the inode number in the variable pointed to by @out_ino,</div><div class='add'>+ * as well as storing the ifile's buffer with the disk inode in the location</div><div class='add'>+ * pointed to by @out_bh.</div><div class='ctx'>  *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No inode left.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC	- No inode left.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_ifile_create_inode(struct inode *ifile, ino_t *out_ino,</div><div class='ctx'> 			     struct buffer_head **out_bh)</div><div class='hunk'>@@ -55,13 +55,10 @@ int nilfs_ifile_create_inode(struct inode *ifile, ino_t *out_ino,</div><div class='ctx'> 	struct nilfs_palloc_req req;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	req.pr_entry_nr = 0;  /*</div><div class='del'>-			       * 0 says find free inode from beginning</div><div class='del'>-			       * of a group. dull code!!</div><div class='del'>-			       */</div><div class='add'>+	req.pr_entry_nr = NILFS_FIRST_INO(ifile-&gt;i_sb);</div><div class='ctx'> 	req.pr_entry_bh = NULL;</div><div class='ctx'> </div><div class='del'>-	ret = nilfs_palloc_prepare_alloc_entry(ifile, &amp;req);</div><div class='add'>+	ret = nilfs_palloc_prepare_alloc_entry(ifile, &amp;req, false);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		ret = nilfs_palloc_get_entry_block(ifile, req.pr_entry_nr, 1,</div><div class='ctx'> 						   &amp;req.pr_entry_bh);</div><div class='hunk'>@@ -85,14 +82,11 @@ int nilfs_ifile_create_inode(struct inode *ifile, ino_t *out_ino,</div><div class='ctx'>  * @ifile: ifile inode</div><div class='ctx'>  * @ino: inode number</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - The inode number @ino have not been allocated.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- Inode number unallocated.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_ifile_delete_inode(struct inode *ifile, ino_t ino)</div><div class='ctx'> {</div><div class='hunk'>@@ -100,7 +94,7 @@ int nilfs_ifile_delete_inode(struct inode *ifile, ino_t ino)</div><div class='ctx'> 		.pr_entry_nr = ino, .pr_entry_bh = NULL</div><div class='ctx'> 	};</div><div class='ctx'> 	struct nilfs_inode *raw_inode;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_palloc_prepare_free_entry(ifile, &amp;req);</div><div class='hunk'>@@ -115,11 +109,11 @@ int nilfs_ifile_delete_inode(struct inode *ifile, ino_t ino)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(req.pr_entry_bh-&gt;b_page);</div><div class='del'>-	raw_inode = nilfs_palloc_block_get_entry(ifile, req.pr_entry_nr,</div><div class='del'>-						 req.pr_entry_bh, kaddr);</div><div class='add'>+	offset = nilfs_palloc_entry_offset(ifile, req.pr_entry_nr,</div><div class='add'>+					   req.pr_entry_bh);</div><div class='add'>+	raw_inode = kmap_local_folio(req.pr_entry_bh-&gt;b_folio, offset);</div><div class='ctx'> 	raw_inode-&gt;i_flags = 0;</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(raw_inode);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(req.pr_entry_bh);</div><div class='ctx'> 	brelse(req.pr_entry_bh);</div><div class='hunk'>@@ -152,6 +146,8 @@ int nilfs_ifile_get_inode_block(struct inode *ifile, ino_t ino,</div><div class='ctx'>  * @ifile: ifile inode</div><div class='ctx'>  * @nmaxinodes: current maximum of available inodes count [out]</div><div class='ctx'>  * @nfreeinodes: free inodes count [out]</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_ifile_count_free_inodes(struct inode *ifile,</div><div class='ctx'> 				    u64 *nmaxinodes, u64 *nfreeinodes)</div><div class='hunk'>@@ -173,21 +169,26 @@ int nilfs_ifile_count_free_inodes(struct inode *ifile,</div><div class='ctx'>  * nilfs_ifile_read - read or get ifile inode</div><div class='ctx'>  * @sb: super block instance</div><div class='ctx'>  * @root: root object</div><div class='add'>+ * @cno: number of checkpoint entry to read</div><div class='ctx'>  * @inode_size: size of an inode</div><div class='del'>- * @raw_inode: on-disk ifile inode</div><div class='del'>- * @inodep: buffer to store the inode</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid checkpoint.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_ifile_read(struct super_block *sb, struct nilfs_root *root,</div><div class='del'>-		     size_t inode_size, struct nilfs_inode *raw_inode,</div><div class='del'>-		     struct inode **inodep)</div><div class='add'>+		     __u64 cno, size_t inode_size)</div><div class='ctx'> {</div><div class='add'>+	struct the_nilfs *nilfs;</div><div class='ctx'> 	struct inode *ifile;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ifile = nilfs_iget_locked(sb, root, NILFS_IFILE_INO);</div><div class='ctx'> 	if (unlikely(!ifile))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!(ifile-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(ifile) &amp; I_NEW))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_mdt_init(ifile, NILFS_MDT_GFP,</div><div class='hunk'>@@ -201,13 +202,13 @@ int nilfs_ifile_read(struct super_block *sb, struct nilfs_root *root,</div><div class='ctx'> </div><div class='ctx'> 	nilfs_palloc_setup_cache(ifile, &amp;NILFS_IFILE_I(ifile)-&gt;palloc_cache);</div><div class='ctx'> </div><div class='del'>-	err = nilfs_read_inode_common(ifile, raw_inode);</div><div class='add'>+	nilfs = sb-&gt;s_fs_info;</div><div class='add'>+	err = nilfs_cpfile_read_checkpoint(nilfs-&gt;ns_cpfile, cno, root, ifile);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	unlock_new_inode(ifile);</div><div class='ctx'>  out:</div><div class='del'>-	*inodep = ifile;</div><div class='ctx'> 	return 0;</div><div class='ctx'>  failed:</div><div class='ctx'> 	iget_failed(ifile);</div><div class='head'>diff --git a/fs/nilfs2/ifile.h b/fs/nilfs2/ifile.h<br/>index 35c5273f4821..5d116a566d9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/ifile.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/ifile.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/ifile.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/ifile.h</a></div><div class='hunk'>@@ -21,15 +21,14 @@</div><div class='ctx'> static inline struct nilfs_inode *</div><div class='ctx'> nilfs_ifile_map_inode(struct inode *ifile, ino_t ino, struct buffer_head *ibh)</div><div class='ctx'> {</div><div class='del'>-	void *kaddr = kmap(ibh-&gt;b_page);</div><div class='add'>+	size_t __offset_in_folio = nilfs_palloc_entry_offset(ifile, ino, ibh);</div><div class='ctx'> </div><div class='del'>-	return nilfs_palloc_block_get_entry(ifile, ino, ibh, kaddr);</div><div class='add'>+	return kmap_local_folio(ibh-&gt;b_folio, __offset_in_folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nilfs_ifile_unmap_inode(struct inode *ifile, ino_t ino,</div><div class='del'>-					   struct buffer_head *ibh)</div><div class='add'>+static inline void nilfs_ifile_unmap_inode(struct nilfs_inode *raw_inode)</div><div class='ctx'> {</div><div class='del'>-	kunmap(ibh-&gt;b_page);</div><div class='add'>+	kunmap_local(raw_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nilfs_ifile_create_inode(struct inode *, ino_t *, struct buffer_head **);</div><div class='hunk'>@@ -39,7 +38,6 @@ int nilfs_ifile_get_inode_block(struct inode *, ino_t, struct buffer_head **);</div><div class='ctx'> int nilfs_ifile_count_free_inodes(struct inode *, u64 *, u64 *);</div><div class='ctx'> </div><div class='ctx'> int nilfs_ifile_read(struct super_block *sb, struct nilfs_root *root,</div><div class='del'>-		     size_t inode_size, struct nilfs_inode *raw_inode,</div><div class='del'>-		     struct inode **inodep);</div><div class='add'>+		     __u64 cno, size_t inode_size);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _NILFS_IFILE_H */</div><div class='head'>diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c<br/>index 9c334c722fc1..51bde45d5865 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/inode.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/fiemap.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> #include "nilfs.h"</div><div class='ctx'> #include "btnode.h"</div><div class='ctx'> #include "segment.h"</div><div class='hunk'>@@ -28,17 +29,13 @@</div><div class='ctx'>  * @ino: inode number</div><div class='ctx'>  * @cno: checkpoint number</div><div class='ctx'>  * @root: pointer on NILFS root object (mounted checkpoint)</div><div class='del'>- * @for_gc: inode for GC flag</div><div class='del'>- * @for_btnc: inode for B-tree node cache flag</div><div class='del'>- * @for_shadow: inode for shadowed page cache flag</div><div class='add'>+ * @type: inode type</div><div class='ctx'>  */</div><div class='ctx'> struct nilfs_iget_args {</div><div class='ctx'> 	u64 ino;</div><div class='ctx'> 	__u64 cno;</div><div class='ctx'> 	struct nilfs_root *root;</div><div class='del'>-	bool for_gc;</div><div class='del'>-	bool for_btnc;</div><div class='del'>-	bool for_shadow;</div><div class='add'>+	unsigned int type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nilfs_iget_test(struct inode *inode, void *opaque);</div><div class='hunk'>@@ -71,6 +68,8 @@ void nilfs_inode_sub_blocks(struct inode *inode, int n)</div><div class='ctx'>  *</div><div class='ctx'>  * This function does not issue actual read request of the specified data</div><div class='ctx'>  * block. It is done by VFS.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_get_block(struct inode *inode, sector_t blkoff,</div><div class='ctx'> 		    struct buffer_head *bh_result, int create)</div><div class='hunk'>@@ -112,7 +111,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,</div><div class='ctx'> 					   "%s (ino=%lu): a race condition while inserting a data block at offset=%llu",</div><div class='ctx'> 					   __func__, inode-&gt;i_ino,</div><div class='ctx'> 					   (unsigned long long)blkoff);</div><div class='del'>-				err = 0;</div><div class='add'>+				err = -EAGAIN;</div><div class='ctx'> 			}</div><div class='ctx'> 			nilfs_transaction_abort(inode-&gt;i_sb);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -144,6 +143,8 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,</div><div class='ctx'>  * address_space_operations.</div><div class='ctx'>  * @file: file struct of the file to be read</div><div class='ctx'>  * @folio: the folio to be read</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='hunk'>@@ -162,7 +163,7 @@ static int nilfs_writepages(struct address_space *mapping,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sb_rdonly(inode-&gt;i_sb)) {</div><div class='del'>-		nilfs_clear_dirty_pages(mapping, false);</div><div class='add'>+		nilfs_clear_dirty_pages(mapping);</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -173,37 +174,6 @@ static int nilfs_writepages(struct address_space *mapping,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (sb_rdonly(inode-&gt;i_sb)) {</div><div class='del'>-		/*</div><div class='del'>-		 * It means that filesystem was remounted in read-only</div><div class='del'>-		 * mode because of error or metadata corruption. But we</div><div class='del'>-		 * have dirty pages that try to be flushed in background.</div><div class='del'>-		 * So, here we simply discard this dirty page.</div><div class='del'>-		 */</div><div class='del'>-		nilfs_clear_folio_dirty(folio, false);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		return -EROFS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL) {</div><div class='del'>-		err = nilfs_construct_segment(inode-&gt;i_sb);</div><div class='del'>-		if (unlikely(err))</div><div class='del'>-			return err;</div><div class='del'>-	} else if (wbc-&gt;for_reclaim)</div><div class='del'>-		nilfs_flush_segment(inode-&gt;i_sb, inode-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool nilfs_dirty_folio(struct address_space *mapping,</div><div class='ctx'> 		struct folio *folio)</div><div class='ctx'> {</div><div class='hunk'>@@ -248,9 +218,10 @@ void nilfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+static int nilfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			     struct address_space *mapping,</div><div class='ctx'> 			     loff_t pos, unsigned len,</div><div class='del'>-			     struct page **pagep, void **fsdata)</div><div class='add'>+			     struct folio **foliop, void **fsdata)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='hunk'>@@ -259,7 +230,7 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = block_write_begin(mapping, pos, len, pagep, nilfs_get_block);</div><div class='add'>+	err = block_write_begin(mapping, pos, len, foliop, nilfs_get_block);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='ctx'> 		nilfs_write_failed(mapping, pos + len);</div><div class='ctx'> 		nilfs_transaction_abort(inode-&gt;i_sb);</div><div class='hunk'>@@ -267,18 +238,19 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+static int nilfs_write_end(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='ctx'> 			   loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			   struct page *page, void *fsdata)</div><div class='add'>+			   struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	unsigned int start = pos &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	unsigned int nr_dirty;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	nr_dirty = nilfs_page_count_clean_buffers(page, start,</div><div class='add'>+	nr_dirty = nilfs_page_count_clean_buffers(folio, start,</div><div class='ctx'> 						  start + copied);</div><div class='del'>-	copied = generic_write_end(file, mapping, pos, len, copied, page,</div><div class='add'>+	copied = generic_write_end(iocb, mapping, pos, len, copied, folio,</div><div class='ctx'> 				   fsdata);</div><div class='ctx'> 	nilfs_set_file_dirty(inode, nr_dirty);</div><div class='ctx'> 	err = nilfs_transaction_commit(inode-&gt;i_sb);</div><div class='hunk'>@@ -298,7 +270,6 @@ nilfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations nilfs_aops = {</div><div class='del'>-	.writepage		= nilfs_writepage,</div><div class='ctx'> 	.read_folio		= nilfs_read_folio,</div><div class='ctx'> 	.writepages		= nilfs_writepages,</div><div class='ctx'> 	.dirty_folio		= nilfs_dirty_folio,</div><div class='hunk'>@@ -307,16 +278,20 @@ const struct address_space_operations nilfs_aops = {</div><div class='ctx'> 	.write_end		= nilfs_write_end,</div><div class='ctx'> 	.invalidate_folio	= block_invalidate_folio,</div><div class='ctx'> 	.direct_IO		= nilfs_direct_IO,</div><div class='add'>+	.migrate_folio		= buffer_migrate_folio_norefs,</div><div class='ctx'> 	.is_partially_uptodate  = block_is_partially_uptodate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const struct address_space_operations nilfs_buffer_cache_aops = {</div><div class='add'>+	.invalidate_folio	= block_invalidate_folio,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int nilfs_insert_inode_locked(struct inode *inode,</div><div class='ctx'> 				     struct nilfs_root *root,</div><div class='ctx'> 				     unsigned long ino)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_iget_args args = {</div><div class='del'>-		.ino = ino, .root = root, .cno = 0, .for_gc = false,</div><div class='del'>-		.for_btnc = false, .for_shadow = false</div><div class='add'>+		.ino = ino, .root = root, .cno = 0, .type = NILFS_I_TYPE_NORMAL</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return insert_inode_locked4(inode, ino, nilfs_iget_test, &amp;args);</div><div class='hunk'>@@ -325,7 +300,6 @@ static int nilfs_insert_inode_locked(struct inode *inode,</div><div class='ctx'> struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='del'>-	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct nilfs_inode_info *ii;</div><div class='ctx'> 	struct nilfs_root *root;</div><div class='hunk'>@@ -343,25 +317,13 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)</div><div class='ctx'> 	root = NILFS_I(dir)-&gt;i_root;</div><div class='ctx'> 	ii = NILFS_I(inode);</div><div class='ctx'> 	ii-&gt;i_state = BIT(NILFS_I_NEW);</div><div class='add'>+	ii-&gt;i_type = NILFS_I_TYPE_NORMAL;</div><div class='ctx'> 	ii-&gt;i_root = root;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_ifile_create_inode(root-&gt;ifile, &amp;ino, &amp;bh);</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		goto failed_ifile_create_inode;</div><div class='ctx'> 	/* reference count of i_bh inherits from nilfs_mdt_read_block() */</div><div class='del'>-</div><div class='del'>-	if (unlikely(ino &lt; NILFS_USER_INO)) {</div><div class='del'>-		nilfs_warn(sb,</div><div class='del'>-			   "inode bitmap is inconsistent for reserved inodes");</div><div class='del'>-		do {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			err = nilfs_ifile_create_inode(root-&gt;ifile, &amp;ino, &amp;bh);</div><div class='del'>-			if (unlikely(err))</div><div class='del'>-				goto failed_ifile_create_inode;</div><div class='del'>-		} while (ino &lt; NILFS_USER_INO);</div><div class='del'>-</div><div class='del'>-		nilfs_info(sb, "repaired inode bitmap for reserved inodes");</div><div class='del'>-	}</div><div class='ctx'> 	ii-&gt;i_bh = bh;</div><div class='ctx'> </div><div class='ctx'> 	atomic64_inc(&amp;root-&gt;inodes_count);</div><div class='hunk'>@@ -385,9 +347,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)</div><div class='ctx'> 	/* ii-&gt;i_dir_acl = 0; */</div><div class='ctx'> 	ii-&gt;i_dir_start_lookup = 0;</div><div class='ctx'> 	nilfs_set_inode_flags(inode);</div><div class='del'>-	spin_lock(&amp;nilfs-&gt;ns_next_gen_lock);</div><div class='del'>-	inode-&gt;i_generation = nilfs-&gt;ns_next_generation++;</div><div class='del'>-	spin_unlock(&amp;nilfs-&gt;ns_next_gen_lock);</div><div class='add'>+	inode-&gt;i_generation = get_random_u32();</div><div class='ctx'> 	if (nilfs_insert_inode_locked(inode, root, ino) &lt; 0) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto failed_after_creation;</div><div class='hunk'>@@ -405,7 +365,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)</div><div class='ctx'> </div><div class='ctx'>  failed_after_creation:</div><div class='ctx'> 	clear_nlink(inode);</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW)</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW)</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> 	iput(inode);  /*</div><div class='ctx'> 		       * raw_inode will be deleted through</div><div class='hunk'>@@ -514,13 +474,20 @@ static int __nilfs_read_inode(struct super_block *sb,</div><div class='ctx'> 		inode-&gt;i_op = &amp;nilfs_symlink_inode_operations;</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = &amp;nilfs_aops;</div><div class='del'>-	} else {</div><div class='add'>+	} else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode) ||</div><div class='add'>+		   S_ISFIFO(inode-&gt;i_mode) || S_ISSOCK(inode-&gt;i_mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;nilfs_special_inode_operations;</div><div class='ctx'> 		init_special_inode(</div><div class='ctx'> 			inode, inode-&gt;i_mode,</div><div class='ctx'> 			huge_decode_dev(le64_to_cpu(raw_inode-&gt;i_device_code)));</div><div class='add'>+	} else {</div><div class='add'>+		nilfs_error(sb,</div><div class='add'>+			    "invalid file type bits in mode 0%o for inode %lu",</div><div class='add'>+			    inode-&gt;i_mode, ino);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto failed_unmap;</div><div class='ctx'> 	}</div><div class='del'>-	nilfs_ifile_unmap_inode(root-&gt;ifile, ino, bh);</div><div class='add'>+	nilfs_ifile_unmap_inode(raw_inode);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> 	up_read(&amp;NILFS_MDT(nilfs-&gt;ns_dat)-&gt;mi_sem);</div><div class='ctx'> 	nilfs_set_inode_flags(inode);</div><div class='hunk'>@@ -529,7 +496,7 @@ static int __nilfs_read_inode(struct super_block *sb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  failed_unmap:</div><div class='del'>-	nilfs_ifile_unmap_inode(root-&gt;ifile, ino, bh);</div><div class='add'>+	nilfs_ifile_unmap_inode(raw_inode);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='ctx'>  bad_inode:</div><div class='hunk'>@@ -546,23 +513,10 @@ static int nilfs_iget_test(struct inode *inode, void *opaque)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ii = NILFS_I(inode);</div><div class='del'>-	if (test_bit(NILFS_I_BTNC, &amp;ii-&gt;i_state)) {</div><div class='del'>-		if (!args-&gt;for_btnc)</div><div class='del'>-			return 0;</div><div class='del'>-	} else if (args-&gt;for_btnc) {</div><div class='add'>+	if (ii-&gt;i_type != args-&gt;type)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (test_bit(NILFS_I_SHADOW, &amp;ii-&gt;i_state)) {</div><div class='del'>-		if (!args-&gt;for_shadow)</div><div class='del'>-			return 0;</div><div class='del'>-	} else if (args-&gt;for_shadow) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_bit(NILFS_I_GCINODE, &amp;ii-&gt;i_state))</div><div class='del'>-		return !args-&gt;for_gc;</div><div class='ctx'> </div><div class='del'>-	return args-&gt;for_gc &amp;&amp; args-&gt;cno == ii-&gt;i_cno;</div><div class='add'>+	return !(args-&gt;type &amp; NILFS_I_TYPE_GC) || args-&gt;cno == ii-&gt;i_cno;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nilfs_iget_set(struct inode *inode, void *opaque)</div><div class='hunk'>@@ -572,15 +526,9 @@ static int nilfs_iget_set(struct inode *inode, void *opaque)</div><div class='ctx'> 	inode-&gt;i_ino = args-&gt;ino;</div><div class='ctx'> 	NILFS_I(inode)-&gt;i_cno = args-&gt;cno;</div><div class='ctx'> 	NILFS_I(inode)-&gt;i_root = args-&gt;root;</div><div class='add'>+	NILFS_I(inode)-&gt;i_type = args-&gt;type;</div><div class='ctx'> 	if (args-&gt;root &amp;&amp; args-&gt;ino == NILFS_ROOT_INO)</div><div class='ctx'> 		nilfs_get_root(args-&gt;root);</div><div class='del'>-</div><div class='del'>-	if (args-&gt;for_gc)</div><div class='del'>-		NILFS_I(inode)-&gt;i_state = BIT(NILFS_I_GCINODE);</div><div class='del'>-	if (args-&gt;for_btnc)</div><div class='del'>-		NILFS_I(inode)-&gt;i_state |= BIT(NILFS_I_BTNC);</div><div class='del'>-	if (args-&gt;for_shadow)</div><div class='del'>-		NILFS_I(inode)-&gt;i_state |= BIT(NILFS_I_SHADOW);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -588,8 +536,7 @@ struct inode *nilfs_ilookup(struct super_block *sb, struct nilfs_root *root,</div><div class='ctx'> 			    unsigned long ino)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_iget_args args = {</div><div class='del'>-		.ino = ino, .root = root, .cno = 0, .for_gc = false,</div><div class='del'>-		.for_btnc = false, .for_shadow = false</div><div class='add'>+		.ino = ino, .root = root, .cno = 0, .type = NILFS_I_TYPE_NORMAL</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return ilookup5(sb, ino, nilfs_iget_test, &amp;args);</div><div class='hunk'>@@ -599,8 +546,7 @@ struct inode *nilfs_iget_locked(struct super_block *sb, struct nilfs_root *root,</div><div class='ctx'> 				unsigned long ino)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_iget_args args = {</div><div class='del'>-		.ino = ino, .root = root, .cno = 0, .for_gc = false,</div><div class='del'>-		.for_btnc = false, .for_shadow = false</div><div class='add'>+		.ino = ino, .root = root, .cno = 0, .type = NILFS_I_TYPE_NORMAL</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return iget5_locked(sb, ino, nilfs_iget_test, nilfs_iget_set, &amp;args);</div><div class='hunk'>@@ -615,8 +561,14 @@ struct inode *nilfs_iget(struct super_block *sb, struct nilfs_root *root,</div><div class='ctx'> 	inode = nilfs_iget_locked(sb, root, ino);</div><div class='ctx'> 	if (unlikely(!inode))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW)) {</div><div class='add'>+		if (!inode-&gt;i_nlink) {</div><div class='add'>+			iput(inode);</div><div class='add'>+			return ERR_PTR(-ESTALE);</div><div class='add'>+		}</div><div class='ctx'> 		return inode;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = __nilfs_read_inode(sb, root, ino, inode);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='hunk'>@@ -631,8 +583,7 @@ struct inode *nilfs_iget_for_gc(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 				__u64 cno)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_iget_args args = {</div><div class='del'>-		.ino = ino, .root = NULL, .cno = cno, .for_gc = true,</div><div class='del'>-		.for_btnc = false, .for_shadow = false</div><div class='add'>+		.ino = ino, .root = NULL, .cno = cno, .type = NILFS_I_TYPE_GC</div><div class='ctx'> 	};</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -640,7 +591,7 @@ struct inode *nilfs_iget_for_gc(struct super_block *sb, unsigned long ino,</div><div class='ctx'> 	inode = iget5_locked(sb, ino, nilfs_iget_test, nilfs_iget_set, &amp;args);</div><div class='ctx'> 	if (unlikely(!inode))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_init_gcinode(inode);</div><div class='hunk'>@@ -660,10 +611,7 @@ struct inode *nilfs_iget_for_gc(struct super_block *sb, unsigned long ino,</div><div class='ctx'>  * or does nothing if the inode already has it.  This function allocates</div><div class='ctx'>  * an additional inode to maintain page cache of B-tree nodes one-on-one.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On errors, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: 0 on success, or %-ENOMEM if memory is insufficient.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_attach_btree_node_cache(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -677,15 +625,13 @@ int nilfs_attach_btree_node_cache(struct inode *inode)</div><div class='ctx'> 	args.ino = inode-&gt;i_ino;</div><div class='ctx'> 	args.root = ii-&gt;i_root;</div><div class='ctx'> 	args.cno = ii-&gt;i_cno;</div><div class='del'>-	args.for_gc = test_bit(NILFS_I_GCINODE, &amp;ii-&gt;i_state) != 0;</div><div class='del'>-	args.for_btnc = true;</div><div class='del'>-	args.for_shadow = test_bit(NILFS_I_SHADOW, &amp;ii-&gt;i_state) != 0;</div><div class='add'>+	args.type = ii-&gt;i_type | NILFS_I_TYPE_BTNC;</div><div class='ctx'> </div><div class='ctx'> 	btnc_inode = iget5_locked(inode-&gt;i_sb, inode-&gt;i_ino, nilfs_iget_test,</div><div class='ctx'> 				  nilfs_iget_set, &amp;args);</div><div class='ctx'> 	if (unlikely(!btnc_inode))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (btnc_inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(btnc_inode) &amp; I_NEW) {</div><div class='ctx'> 		nilfs_init_btnc_inode(btnc_inode);</div><div class='ctx'> 		unlock_new_inode(btnc_inode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -724,17 +670,14 @@ void nilfs_detach_btree_node_cache(struct inode *inode)</div><div class='ctx'>  * in one inode and the one for b-tree node pages is set up in the</div><div class='ctx'>  * other inode, which is attached to the former inode.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, a pointer to the inode for data pages is</div><div class='del'>- * returned. On errors, one of the following negative error code is returned</div><div class='del'>- * in a pointer type.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: a pointer to the inode for data pages on success, or %-ENOMEM</div><div class='add'>+ * if memory is insufficient.</div><div class='ctx'>  */</div><div class='ctx'> struct inode *nilfs_iget_for_shadow(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_iget_args args = {</div><div class='del'>-		.ino = inode-&gt;i_ino, .root = NULL, .cno = 0, .for_gc = false,</div><div class='del'>-		.for_btnc = false, .for_shadow = true</div><div class='add'>+		.ino = inode-&gt;i_ino, .root = NULL, .cno = 0,</div><div class='add'>+		.type = NILFS_I_TYPE_SHADOW</div><div class='ctx'> 	};</div><div class='ctx'> 	struct inode *s_inode;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -743,12 +686,13 @@ struct inode *nilfs_iget_for_shadow(struct inode *inode)</div><div class='ctx'> 			       nilfs_iget_set, &amp;args);</div><div class='ctx'> 	if (unlikely(!s_inode))</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(s_inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(s_inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	NILFS_I(s_inode)-&gt;i_flags = 0;</div><div class='ctx'> 	memset(NILFS_I(s_inode)-&gt;i_bmap, 0, sizeof(struct nilfs_bmap));</div><div class='ctx'> 	mapping_set_gfp_mask(s_inode-&gt;i_mapping, GFP_NOFS);</div><div class='add'>+	s_inode-&gt;i_mapping-&gt;a_ops = &amp;nilfs_buffer_cache_aops;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_attach_btree_node_cache(s_inode);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='hunk'>@@ -759,8 +703,18 @@ struct inode *nilfs_iget_for_shadow(struct inode *inode)</div><div class='ctx'> 	return s_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nilfs_write_inode_common - export common inode information to on-disk inode</div><div class='add'>+ * @inode:     inode object</div><div class='add'>+ * @raw_inode: on-disk inode</div><div class='add'>+ *</div><div class='add'>+ * This function writes standard information from the on-memory inode @inode</div><div class='add'>+ * to @raw_inode on ifile, cpfile or a super root block.  Since inode bmap</div><div class='add'>+ * data is not exported, nilfs_bmap_write() must be called separately during</div><div class='add'>+ * log writing.</div><div class='add'>+ */</div><div class='ctx'> void nilfs_write_inode_common(struct inode *inode,</div><div class='del'>-			      struct nilfs_inode *raw_inode, int has_bmap)</div><div class='add'>+			      struct nilfs_inode *raw_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_inode_info *ii = NILFS_I(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -778,21 +732,6 @@ void nilfs_write_inode_common(struct inode *inode,</div><div class='ctx'> 	raw_inode-&gt;i_flags = cpu_to_le32(ii-&gt;i_flags);</div><div class='ctx'> 	raw_inode-&gt;i_generation = cpu_to_le32(inode-&gt;i_generation);</div><div class='ctx'> </div><div class='del'>-	if (NILFS_ROOT_METADATA_FILE(inode-&gt;i_ino)) {</div><div class='del'>-		struct the_nilfs *nilfs = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-		/* zero-fill unused portion in the case of super root block */</div><div class='del'>-		raw_inode-&gt;i_xattr = 0;</div><div class='del'>-		raw_inode-&gt;i_pad = 0;</div><div class='del'>-		memset((void *)raw_inode + sizeof(*raw_inode), 0,</div><div class='del'>-		       nilfs-&gt;ns_inode_size - sizeof(*raw_inode));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (has_bmap)</div><div class='del'>-		nilfs_bmap_write(ii-&gt;i_bmap, raw_inode);</div><div class='del'>-	else if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode))</div><div class='del'>-		raw_inode-&gt;i_device_code =</div><div class='del'>-			cpu_to_le64(huge_encode_dev(inode-&gt;i_rdev));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When extending inode, nilfs-&gt;ns_inode_size should be checked</div><div class='ctx'> 	 * for substitutions of appended fields.</div><div class='hunk'>@@ -813,14 +752,13 @@ void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh, int flags)</div><div class='ctx'> 	if (flags &amp; I_DIRTY_DATASYNC)</div><div class='ctx'> 		set_bit(NILFS_I_INODE_SYNC, &amp;ii-&gt;i_state);</div><div class='ctx'> </div><div class='del'>-	nilfs_write_inode_common(inode, raw_inode, 0);</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: call with has_bmap = 0 is a workaround to avoid</div><div class='del'>-		 * deadlock of bmap.  This delays update of i_bmap to just</div><div class='del'>-		 * before writing.</div><div class='del'>-		 */</div><div class='add'>+	nilfs_write_inode_common(inode, raw_inode);</div><div class='add'>+</div><div class='add'>+	if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode))</div><div class='add'>+		raw_inode-&gt;i_device_code =</div><div class='add'>+			cpu_to_le64(huge_encode_dev(inode-&gt;i_rdev));</div><div class='ctx'> </div><div class='del'>-	nilfs_ifile_unmap_inode(ifile, ino, ibh);</div><div class='add'>+	nilfs_ifile_unmap_inode(raw_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define NILFS_MAX_TRUNCATE_BLOCKS	16384  /* 64MB for 4KB block */</div><div class='hunk'>@@ -906,7 +844,7 @@ static void nilfs_clear_inode(struct inode *inode)</div><div class='ctx'> 	if (test_bit(NILFS_I_BMAP, &amp;ii-&gt;i_state))</div><div class='ctx'> 		nilfs_bmap_clear(ii-&gt;i_bmap);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(NILFS_I_BTNC, &amp;ii-&gt;i_state))</div><div class='add'>+	if (!(ii-&gt;i_type &amp; NILFS_I_TYPE_BTNC))</div><div class='ctx'> 		nilfs_detach_btree_node_cache(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (ii-&gt;i_root &amp;&amp; inode-&gt;i_ino == NILFS_ROOT_INO)</div><div class='hunk'>@@ -1257,7 +1195,7 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 			if (size) {</div><div class='ctx'> 				if (phys &amp;&amp; blkphy &lt;&lt; blkbits == phys + size) {</div><div class='ctx'> 					/* The current extent goes on */</div><div class='del'>-					size += n &lt;&lt; blkbits;</div><div class='add'>+					size += (u64)n &lt;&lt; blkbits;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					/* Terminate the current extent */</div><div class='ctx'> 					ret = fiemap_fill_next_extent(</div><div class='hunk'>@@ -1270,14 +1208,14 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 					flags = FIEMAP_EXTENT_MERGED;</div><div class='ctx'> 					logical = blkoff &lt;&lt; blkbits;</div><div class='ctx'> 					phys = blkphy &lt;&lt; blkbits;</div><div class='del'>-					size = n &lt;&lt; blkbits;</div><div class='add'>+					size = (u64)n &lt;&lt; blkbits;</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Start a new extent */</div><div class='ctx'> 				flags = FIEMAP_EXTENT_MERGED;</div><div class='ctx'> 				logical = blkoff &lt;&lt; blkbits;</div><div class='ctx'> 				phys = blkphy &lt;&lt; blkbits;</div><div class='del'>-				size = n &lt;&lt; blkbits;</div><div class='add'>+				size = (u64)n &lt;&lt; blkbits;</div><div class='ctx'> 			}</div><div class='ctx'> 			blkoff += n;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c<br/>index cfb6aca5ec38..e17b8da66491 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/ioctl.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/mount.h&gt;	/* mnt_want_write_file(), mnt_drop_write_file() */</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/fileattr.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include "nilfs.h"</div><div class='ctx'> #include "segment.h"</div><div class='ctx'> #include "bmap.h"</div><div class='hunk'>@@ -32,17 +33,14 @@</div><div class='ctx'>  * @dofunc: concrete function of get/set metadata info</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_ioctl_wrap_copy() gets/sets metadata info by means of</div><div class='del'>- * calling dofunc() function on the basis of @argv argument.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and requested metadata info</div><div class='del'>- * is copied into userspace. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid arguments from userspace.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during execution of requested operation.</div><div class='add'>+ * calling dofunc() function on the basis of @argv argument.  If successful,</div><div class='add'>+ * the requested metadata information is copied to userspace memory.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT	- Failure during execution of requested operation.</div><div class='add'>+ * * %-EINVAL	- Invalid arguments from userspace.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,</div><div class='ctx'> 				 struct nilfs_argv *argv, int dir,</div><div class='hunk'>@@ -51,7 +49,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,</div><div class='ctx'> 						   void *, size_t, size_t))</div><div class='ctx'> {</div><div class='ctx'> 	void *buf;</div><div class='del'>-	void __user *base = (void __user *)(unsigned long)argv-&gt;v_base;</div><div class='add'>+	void __user *base = u64_to_user_ptr(argv-&gt;v_base);</div><div class='ctx'> 	size_t maxmembs, total, n;</div><div class='ctx'> 	ssize_t nr;</div><div class='ctx'> 	int ret, i;</div><div class='hunk'>@@ -60,7 +58,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,</div><div class='ctx'> 	if (argv-&gt;v_nmembs == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (argv-&gt;v_size &gt; PAGE_SIZE)</div><div class='add'>+	if ((size_t)argv-&gt;v_size &gt; PAGE_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -114,9 +112,13 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_fileattr_get - ioctl to support lsattr</div><div class='add'>+ * nilfs_fileattr_get - retrieve miscellaneous file attributes</div><div class='add'>+ * @dentry: the object to retrieve from</div><div class='add'>+ * @fa:     fileattr pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: always 0 as success.</div><div class='ctx'>  */</div><div class='del'>-int nilfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int nilfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='hunk'>@@ -126,10 +128,15 @@ int nilfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_fileattr_set - ioctl to support chattr</div><div class='add'>+ * nilfs_fileattr_set - change miscellaneous file attributes</div><div class='add'>+ * @idmap:  idmap of the mount</div><div class='add'>+ * @dentry: the object to change</div><div class='add'>+ * @fa:     fileattr pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		       struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		       struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct nilfs_transaction_info ti;</div><div class='hunk'>@@ -159,6 +166,10 @@ int nilfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_ioctl_getversion - get info about a file's version (generation number)</div><div class='add'>+ * @inode: inode object</div><div class='add'>+ * @argp:  userspace memory where the generation number of @inode is stored</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or %-EFAULT on error.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_getversion(struct inode *inode, void __user *argp)</div><div class='ctx'> {</div><div class='hunk'>@@ -176,13 +187,10 @@ static int nilfs_ioctl_getversion(struct inode *inode, void __user *argp)</div><div class='ctx'>  * given checkpoint between checkpoint and snapshot state. This ioctl</div><div class='ctx'>  * is used in chcp and mkcp utilities.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned and mode of a checkpoint is</div><div class='del'>- * changed. On error, one of the following negative error codes</div><div class='del'>- * is returned.</div><div class='del'>- *</div><div class='del'>- * %-EPERM - Operation not permitted.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during checkpoint mode changing.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * %-EFAULT	- Failure during checkpoint mode changing.</div><div class='add'>+ * %-EPERM	- Operation not permitted.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_change_cpmode(struct inode *inode, struct file *filp,</div><div class='ctx'> 				     unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -230,13 +238,10 @@ out:</div><div class='ctx'>  * checkpoint from NILFS2 file system. This ioctl is used in rmcp</div><div class='ctx'>  * utility.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned and a checkpoint is</div><div class='del'>- * removed. On error, one of the following negative error codes</div><div class='del'>- * is returned.</div><div class='del'>- *</div><div class='del'>- * %-EPERM - Operation not permitted.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during checkpoint removing.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * %-EFAULT	- Failure during checkpoint removing.</div><div class='add'>+ * %-EPERM	- Operation not permitted.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> nilfs_ioctl_delete_checkpoint(struct inode *inode, struct file *filp,</div><div class='hunk'>@@ -282,7 +287,7 @@ out:</div><div class='ctx'>  * requested checkpoints. The NILFS_IOCTL_GET_CPINFO ioctl is used in</div><div class='ctx'>  * lscp utility and by nilfs_cleanerd daemon.</div><div class='ctx'>  *</div><div class='del'>- * Return value: count of nilfs_cpinfo structures in output buffer.</div><div class='add'>+ * Return: Count of nilfs_cpinfo structures in output buffer.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='ctx'> nilfs_ioctl_do_get_cpinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='hunk'>@@ -306,17 +311,14 @@ nilfs_ioctl_do_get_cpinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_ioctl_get_cpstat() returns information about checkpoints.</div><div class='ctx'>  * The NILFS_IOCTL_GET_CPSTAT ioctl is used by lscp, rmcp utilities</div><div class='del'>- * and by nilfs_cleanerd daemon.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned, and checkpoints information is</div><div class='del'>- * copied into userspace pointer @argp. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during getting checkpoints statistics.</div><div class='add'>+ * and by nilfs_cleanerd daemon.  The checkpoint statistics are copied to</div><div class='add'>+ * the userspace memory pointed to by @argp.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT	- Failure during getting checkpoints statistics.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_get_cpstat(struct inode *inode, struct file *filp,</div><div class='ctx'> 				  unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -349,7 +351,8 @@ static int nilfs_ioctl_get_cpstat(struct inode *inode, struct file *filp,</div><div class='ctx'>  * info about requested segments. The NILFS_IOCTL_GET_SUINFO ioctl is used</div><div class='ctx'>  * in lssu, nilfs_resize utilities and by nilfs_cleanerd daemon.</div><div class='ctx'>  *</div><div class='del'>- * Return value: count of nilfs_suinfo structures in output buffer.</div><div class='add'>+ * Return: Count of nilfs_suinfo structures in output buffer on success,</div><div class='add'>+ * or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='ctx'> nilfs_ioctl_do_get_suinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='hunk'>@@ -373,17 +376,14 @@ nilfs_ioctl_do_get_suinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_ioctl_get_sustat() returns segment usage statistics.</div><div class='ctx'>  * The NILFS_IOCTL_GET_SUSTAT ioctl is used in lssu, nilfs_resize utilities</div><div class='del'>- * and by nilfs_cleanerd daemon.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned, and segment usage information is</div><div class='del'>- * copied into userspace pointer @argp. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during getting segment usage statistics.</div><div class='add'>+ * and by nilfs_cleanerd daemon.  The requested segment usage information is</div><div class='add'>+ * copied to the userspace memory pointed to by @argp.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT	- Failure during getting segment usage statistics.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_get_sustat(struct inode *inode, struct file *filp,</div><div class='ctx'> 				  unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -416,7 +416,8 @@ static int nilfs_ioctl_get_sustat(struct inode *inode, struct file *filp,</div><div class='ctx'>  * on virtual block addresses. The NILFS_IOCTL_GET_VINFO ioctl is used</div><div class='ctx'>  * by nilfs_cleanerd daemon.</div><div class='ctx'>  *</div><div class='del'>- * Return value: count of nilfs_vinfo structures in output buffer.</div><div class='add'>+ * Return: Count of nilfs_vinfo structures in output buffer on success, or</div><div class='add'>+ * a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='ctx'> nilfs_ioctl_do_get_vinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='hunk'>@@ -443,7 +444,8 @@ nilfs_ioctl_do_get_vinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='ctx'>  * about descriptors of disk block numbers. The NILFS_IOCTL_GET_BDESCS ioctl</div><div class='ctx'>  * is used by nilfs_cleanerd daemon.</div><div class='ctx'>  *</div><div class='del'>- * Return value: count of nilfs_bdescs structures in output buffer.</div><div class='add'>+ * Return: Count of nilfs_bdescs structures in output buffer on success, or</div><div class='add'>+ * a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='ctx'> nilfs_ioctl_do_get_bdescs(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='hunk'>@@ -480,19 +482,15 @@ nilfs_ioctl_do_get_bdescs(struct the_nilfs *nilfs, __u64 *posp, int flags,</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_ioctl_do_get_bdescs() function returns information</div><div class='ctx'>  * about descriptors of disk block numbers. The NILFS_IOCTL_GET_BDESCS ioctl</div><div class='del'>- * is used by nilfs_cleanerd daemon.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned, and disk block descriptors are</div><div class='del'>- * copied into userspace pointer @argp. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid arguments from userspace.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during getting disk block descriptors.</div><div class='add'>+ * is used by nilfs_cleanerd daemon.  If successful, disk block descriptors</div><div class='add'>+ * are copied to userspace pointer @argp.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT	- Failure during getting disk block descriptors.</div><div class='add'>+ * * %-EINVAL	- Invalid arguments from userspace.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_get_bdescs(struct inode *inode, struct file *filp,</div><div class='ctx'> 				  unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -526,16 +524,12 @@ static int nilfs_ioctl_get_bdescs(struct inode *inode, struct file *filp,</div><div class='ctx'>  * Description: nilfs_ioctl_move_inode_block() function registers data/node</div><div class='ctx'>  * buffer in the GC pagecache and submit read request.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - Requested block doesn't exist.</div><div class='del'>- *</div><div class='del'>- * %-EEXIST - Blocks conflict is detected.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EEXIST	- Block conflict detected.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOENT	- Requested block doesn't exist.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_move_inode_block(struct inode *inode,</div><div class='ctx'> 					struct nilfs_vdesc *vdesc,</div><div class='hunk'>@@ -590,8 +584,8 @@ static int nilfs_ioctl_move_inode_block(struct inode *inode,</div><div class='ctx'>  * blocks that garbage collector specified with the array of nilfs_vdesc</div><div class='ctx'>  * structures and stores them into page caches of GC inodes.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: Number of processed nilfs_vdesc structures or</div><div class='del'>- * error code, otherwise.</div><div class='add'>+ * Return: Number of processed nilfs_vdesc structures on success, or</div><div class='add'>+ * a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_move_blocks(struct super_block *sb,</div><div class='ctx'> 				   struct nilfs_argv *argv, void *buf)</div><div class='hunk'>@@ -668,14 +662,11 @@ static int nilfs_ioctl_move_blocks(struct super_block *sb,</div><div class='ctx'>  * in the period from p_start to p_end, excluding p_end itself. The checkpoints</div><div class='ctx'>  * which have been already deleted are ignored.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: Number of processed nilfs_period structures or</div><div class='del'>- * error code, otherwise.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - invalid checkpoints.</div><div class='add'>+ * Return: Number of processed nilfs_period structures on success, or one of</div><div class='add'>+ * the following negative error codes on failure:</div><div class='add'>+ * * %-EINVAL	- invalid checkpoints.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_delete_checkpoints(struct the_nilfs *nilfs,</div><div class='ctx'> 					  struct nilfs_argv *argv, void *buf)</div><div class='hunk'>@@ -703,14 +694,11 @@ static int nilfs_ioctl_delete_checkpoints(struct the_nilfs *nilfs,</div><div class='ctx'>  * Description: nilfs_ioctl_free_vblocknrs() function frees</div><div class='ctx'>  * the virtual block numbers specified by @buf and @argv-&gt;v_nmembs.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: Number of processed virtual block numbers or</div><div class='del'>- * error code, otherwise.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - The virtual block number have not been allocated.</div><div class='add'>+ * Return: Number of processed virtual block numbers on success, or one of the</div><div class='add'>+ * following negative error codes on failure:</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOENT	- Unallocated virtual block number.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_free_vblocknrs(struct the_nilfs *nilfs,</div><div class='ctx'> 				      struct nilfs_argv *argv, void *buf)</div><div class='hunk'>@@ -732,14 +720,11 @@ static int nilfs_ioctl_free_vblocknrs(struct the_nilfs *nilfs,</div><div class='ctx'>  * Description: nilfs_ioctl_mark_blocks_dirty() function marks</div><div class='ctx'>  * metadata file or data blocks as dirty.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: Number of processed block descriptors or</div><div class='del'>- * error code, otherwise.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - the specified block does not exist (hole block)</div><div class='add'>+ * Return: Number of processed block descriptors on success, or one of the</div><div class='add'>+ * following negative error codes on failure:</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOENT	- Non-existent block (hole block).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs,</div><div class='ctx'> 					 struct nilfs_argv *argv, void *buf)</div><div class='hunk'>@@ -838,7 +823,7 @@ int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *nilfs,</div><div class='ctx'>  * from userspace. The NILFS_IOCTL_CLEAN_SEGMENTS ioctl is used by</div><div class='ctx'>  * nilfs_cleanerd daemon.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned or error code, otherwise.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,</div><div class='ctx'> 				      unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -851,7 +836,6 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,</div><div class='ctx'> 		sizeof(struct nilfs_bdesc),</div><div class='ctx'> 		sizeof(__u64),</div><div class='ctx'> 	};</div><div class='del'>-	void __user *base;</div><div class='ctx'> 	void *kbufs[5];</div><div class='ctx'> 	struct the_nilfs *nilfs;</div><div class='ctx'> 	size_t len, nsegs;</div><div class='hunk'>@@ -878,7 +862,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,</div><div class='ctx'> 	 * use kmalloc() for its buffer because the memory used for the</div><div class='ctx'> 	 * segment numbers is small enough.</div><div class='ctx'> 	 */</div><div class='del'>-	kbufs[4] = memdup_array_user((void __user *)(unsigned long)argv[4].v_base,</div><div class='add'>+	kbufs[4] = memdup_array_user(u64_to_user_ptr(argv[4].v_base),</div><div class='ctx'> 				     nsegs, sizeof(__u64));</div><div class='ctx'> 	if (IS_ERR(kbufs[4])) {</div><div class='ctx'> 		ret = PTR_ERR(kbufs[4]);</div><div class='hunk'>@@ -898,20 +882,14 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> </div><div class='ctx'> 		len = argv[n].v_size * argv[n].v_nmembs;</div><div class='del'>-		base = (void __user *)(unsigned long)argv[n].v_base;</div><div class='ctx'> 		if (len == 0) {</div><div class='ctx'> 			kbufs[n] = NULL;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kbufs[n] = vmalloc(len);</div><div class='del'>-		if (!kbufs[n]) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto out_free;</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user(kbufs[n], base, len)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			vfree(kbufs[n]);</div><div class='add'>+		kbufs[n] = vmemdup_user(u64_to_user_ptr(argv[n].v_base), len);</div><div class='add'>+		if (IS_ERR(kbufs[n])) {</div><div class='add'>+			ret = PTR_ERR(kbufs[n]);</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -943,7 +921,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	while (--n &gt;= 0)</div><div class='del'>-		vfree(kbufs[n]);</div><div class='add'>+		kvfree(kbufs[n]);</div><div class='ctx'> 	kfree(kbufs[4]);</div><div class='ctx'> out:</div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='hunk'>@@ -962,20 +940,14 @@ out:</div><div class='ctx'>  * and metadata are written out to the device when it successfully</div><div class='ctx'>  * returned.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is retured. On errors, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EROFS - Read only filesystem.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No space left on device (only in a panic state).</div><div class='del'>- *</div><div class='del'>- * %-ERESTARTSYS - Interrupted.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during execution of requested operation.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT		- Failure during execution of requested operation.</div><div class='add'>+ * * %-EIO		- I/O error.</div><div class='add'>+ * * %-ENOMEM		- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC		- No space left on device (only in a panic state).</div><div class='add'>+ * * %-ERESTARTSYS	- Interrupted.</div><div class='add'>+ * * %-EROFS		- Read only filesystem.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_sync(struct inode *inode, struct file *filp,</div><div class='ctx'> 			    unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -1009,7 +981,7 @@ static int nilfs_ioctl_sync(struct inode *inode, struct file *filp,</div><div class='ctx'>  * @filp: file object</div><div class='ctx'>  * @argp: pointer on argument from userspace</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned or error code, otherwise.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,</div><div class='ctx'> 			      void __user *argp)</div><div class='hunk'>@@ -1045,7 +1017,7 @@ out:</div><div class='ctx'>  * checks the arguments from userspace and calls nilfs_sufile_trim_fs, which</div><div class='ctx'>  * performs the actual trim operation.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned or negative error code, otherwise.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1087,7 +1059,7 @@ static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)</div><div class='ctx'>  * of segments in bytes and upper limit of segments in bytes.</div><div class='ctx'>  * The NILFS_IOCTL_SET_ALLOC_RANGE is used by nilfs_resize utility.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned or error code, otherwise.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_set_alloc_range(struct inode *inode, void __user *argp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1111,7 +1083,7 @@ static int nilfs_ioctl_set_alloc_range(struct inode *inode, void __user *argp)</div><div class='ctx'> 	segbytes = nilfs-&gt;ns_blocks_per_segment * nilfs-&gt;ns_blocksize;</div><div class='ctx'> </div><div class='ctx'> 	minseg = range[0] + segbytes - 1;</div><div class='del'>-	do_div(minseg, segbytes);</div><div class='add'>+	minseg = div64_ul(minseg, segbytes);</div><div class='ctx'> </div><div class='ctx'> 	if (range[1] &lt; 4096)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1120,7 +1092,7 @@ static int nilfs_ioctl_set_alloc_range(struct inode *inode, void __user *argp)</div><div class='ctx'> 	if (maxseg &lt; segbytes)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	do_div(maxseg, segbytes);</div><div class='add'>+	maxseg = div64_ul(maxseg, segbytes);</div><div class='ctx'> 	maxseg--;</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_sufile_set_alloc_range(nilfs-&gt;ns_sufile, minseg, maxseg);</div><div class='hunk'>@@ -1138,17 +1110,15 @@ out:</div><div class='ctx'>  * @dofunc: concrete function of getting metadata info</div><div class='ctx'>  *</div><div class='ctx'>  * Description: nilfs_ioctl_get_info() gets metadata info by means of</div><div class='del'>- * calling dofunc() function.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and requested metadata info</div><div class='del'>- * is copied into userspace. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid arguments from userspace.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Failure during execution of requested operation.</div><div class='add'>+ * calling dofunc() function.  The requested metadata information is copied</div><div class='add'>+ * to userspace memory @argp.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT	- Failure during execution of requested operation.</div><div class='add'>+ * * %-EINVAL	- Invalid arguments from userspace.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_get_info(struct inode *inode, struct file *filp,</div><div class='ctx'> 				unsigned int cmd, void __user *argp,</div><div class='hunk'>@@ -1188,18 +1158,14 @@ static int nilfs_ioctl_get_info(struct inode *inode, struct file *filp,</div><div class='ctx'>  * encapsulated in nilfs_argv and updates the segment usage info</div><div class='ctx'>  * according to the flags in nilfs_suinfo_update.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EPERM - Not enough permissions</div><div class='del'>- *</div><div class='del'>- * %-EFAULT - Error copying input data</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid values in input (segment number, flags or nblocks)</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EEXIST	- Block conflict detected.</div><div class='add'>+ * * %-EFAULT	- Error copying input data.</div><div class='add'>+ * * %-EINVAL	- Invalid values in input (segment number, flags or nblocks).</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EPERM	- Not enough permissions.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_ioctl_set_suinfo(struct inode *inode, struct file *filp,</div><div class='ctx'> 				unsigned int cmd, void __user *argp)</div><div class='hunk'>@@ -1208,7 +1174,6 @@ static int nilfs_ioctl_set_suinfo(struct inode *inode, struct file *filp,</div><div class='ctx'> 	struct nilfs_transaction_info ti;</div><div class='ctx'> 	struct nilfs_argv argv;</div><div class='ctx'> 	size_t len;</div><div class='del'>-	void __user *base;</div><div class='ctx'> 	void *kbuf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1239,18 +1204,12 @@ static int nilfs_ioctl_set_suinfo(struct inode *inode, struct file *filp,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	base = (void __user *)(unsigned long)argv.v_base;</div><div class='del'>-	kbuf = vmalloc(len);</div><div class='del'>-	if (!kbuf) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	kbuf = vmemdup_user(u64_to_user_ptr(argv.v_base), len);</div><div class='add'>+	if (IS_ERR(kbuf)) {</div><div class='add'>+		ret = PTR_ERR(kbuf);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(kbuf, base, len)) {</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	nilfs_transaction_begin(inode-&gt;i_sb, &amp;ti, 0);</div><div class='ctx'> 	ret = nilfs_sufile_set_suinfo(nilfs-&gt;ns_sufile, kbuf, argv.v_size,</div><div class='ctx'> 			argv.v_nmembs);</div><div class='hunk'>@@ -1259,13 +1218,98 @@ static int nilfs_ioctl_set_suinfo(struct inode *inode, struct file *filp,</div><div class='ctx'> 	else</div><div class='ctx'> 		nilfs_transaction_commit(inode-&gt;i_sb); /* never fails */</div><div class='ctx'> </div><div class='del'>-out_free:</div><div class='del'>-	vfree(kbuf);</div><div class='add'>+	kvfree(kbuf);</div><div class='ctx'> out:</div><div class='ctx'> 	mnt_drop_write_file(filp);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nilfs_ioctl_get_fslabel - get the volume name of the file system</div><div class='add'>+ * @sb:   super block instance</div><div class='add'>+ * @argp: pointer to userspace memory where the volume name should be stored</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, %-EFAULT if copying to userspace memory fails.</div><div class='add'>+ */</div><div class='add'>+static int nilfs_ioctl_get_fslabel(struct super_block *sb, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='add'>+	char label[NILFS_MAX_VOLUME_NAME + 1];</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(NILFS_MAX_VOLUME_NAME &gt;= FSLABEL_MAX);</div><div class='add'>+</div><div class='add'>+	down_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+	memtostr_pad(label, nilfs-&gt;ns_sbp[0]-&gt;s_volume_name);</div><div class='add'>+	up_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(argp, label, sizeof(label)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nilfs_ioctl_set_fslabel - set the volume name of the file system</div><div class='add'>+ * @sb:   super block instance</div><div class='add'>+ * @filp: file object</div><div class='add'>+ * @argp: pointer to userspace memory that contains the volume name</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EFAULT	- Error copying input data.</div><div class='add'>+ * * %-EINVAL	- Label length exceeds record size in superblock.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-EPERM	- Operation not permitted (insufficient permissions).</div><div class='add'>+ * * %-EROFS	- Read only file system.</div><div class='add'>+ */</div><div class='add'>+static int nilfs_ioctl_set_fslabel(struct super_block *sb, struct file *filp,</div><div class='add'>+				   void __user *argp)</div><div class='add'>+{</div><div class='add'>+	char label[NILFS_MAX_VOLUME_NAME + 1];</div><div class='add'>+	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='add'>+	struct nilfs_super_block **sbp;</div><div class='add'>+	size_t len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ret = mnt_want_write_file(filp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(label, argp, NILFS_MAX_VOLUME_NAME + 1)) {</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out_drop_write;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = strnlen(label, NILFS_MAX_VOLUME_NAME + 1);</div><div class='add'>+	if (len &gt; NILFS_MAX_VOLUME_NAME) {</div><div class='add'>+		nilfs_err(sb, "unable to set label with more than %zu bytes",</div><div class='add'>+			  NILFS_MAX_VOLUME_NAME);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_drop_write;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down_write(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+	sbp = nilfs_prepare_super(sb, false);</div><div class='add'>+	if (unlikely(!sbp)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strtomem_pad(sbp[0]-&gt;s_volume_name, label, 0);</div><div class='add'>+	if (sbp[1])</div><div class='add'>+		strtomem_pad(sbp[1]-&gt;s_volume_name, label, 0);</div><div class='add'>+</div><div class='add'>+	ret = nilfs_commit_super(sb, NILFS_SB_COMMIT_ALL);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	up_write(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+out_drop_write:</div><div class='add'>+	mnt_drop_write_file(filp);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> long nilfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='hunk'>@@ -1308,6 +1352,10 @@ long nilfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		return nilfs_ioctl_set_alloc_range(inode, argp);</div><div class='ctx'> 	case FITRIM:</div><div class='ctx'> 		return nilfs_ioctl_trim_fs(inode, argp);</div><div class='add'>+	case FS_IOC_GETFSLABEL:</div><div class='add'>+		return nilfs_ioctl_get_fslabel(inode-&gt;i_sb, argp);</div><div class='add'>+	case FS_IOC_SETFSLABEL:</div><div class='add'>+		return nilfs_ioctl_set_fslabel(inode-&gt;i_sb, filp, argp);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1334,6 +1382,8 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case NILFS_IOCTL_RESIZE:</div><div class='ctx'> 	case NILFS_IOCTL_SET_ALLOC_RANGE:</div><div class='ctx'> 	case FITRIM:</div><div class='add'>+	case FS_IOC_GETFSLABEL:</div><div class='add'>+	case FS_IOC_SETFSLABEL:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='head'>diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c<br/>index e45c01a559c0..946b0d3534a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/mdt.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/mdt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/mdt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/mdt.c</a></div><div class='hunk'>@@ -33,7 +33,8 @@ nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,</div><div class='ctx'> 					      struct buffer_head *, void *))</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_inode_info *ii = NILFS_I(inode);</div><div class='del'>-	void *kaddr;</div><div class='add'>+	struct folio *folio = bh-&gt;b_folio;</div><div class='add'>+	void *from;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Caller exclude read accesses using page lock */</div><div class='hunk'>@@ -47,12 +48,14 @@ nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,</div><div class='ctx'> </div><div class='ctx'> 	set_buffer_mapped(bh);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-	memset(kaddr + bh_offset(bh), 0, i_blocksize(inode));</div><div class='add'>+	/* Initialize block (block size &gt; PAGE_SIZE not yet supported) */</div><div class='add'>+	from = kmap_local_folio(folio, offset_in_folio(folio, bh-&gt;b_data));</div><div class='add'>+	memset(from, 0, bh-&gt;b_size);</div><div class='ctx'> 	if (init_block)</div><div class='del'>-		init_block(inode, bh, kaddr);</div><div class='del'>-	flush_dcache_page(bh-&gt;b_page);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+		init_block(inode, bh, from);</div><div class='add'>+	kunmap_local(from);</div><div class='add'>+</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 	set_buffer_uptodate(bh);</div><div class='ctx'> 	mark_buffer_dirty(bh);</div><div class='hunk'>@@ -89,7 +92,6 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block,</div><div class='ctx'> 	if (buffer_uptodate(bh))</div><div class='ctx'> 		goto failed_bh;</div><div class='ctx'> </div><div class='del'>-	bh-&gt;b_bdev = sb-&gt;s_bdev;</div><div class='ctx'> 	err = nilfs_mdt_insert_new_block(inode, block, bh, init_block);</div><div class='ctx'> 	if (likely(!err)) {</div><div class='ctx'> 		get_bh(bh);</div><div class='hunk'>@@ -224,20 +226,21 @@ static int nilfs_mdt_read_block(struct inode *inode, unsigned long block,</div><div class='ctx'>  * @out_bh: output of a pointer to the buffer_head</div><div class='ctx'>  *</div><div class='ctx'>  * nilfs_mdt_get_block() looks up the specified buffer and tries to create</div><div class='del'>- * a new buffer if @create is not zero.  On success, the returned buffer is</div><div class='del'>- * assured to be either existing or formatted using a buffer lock on success.</div><div class='del'>- * @out_bh is substituted only when zero is returned.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, it returns 0. On error, the following negative</div><div class='del'>- * error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * a new buffer if @create is not zero.  If (and only if) this function</div><div class='add'>+ * succeeds, it stores a pointer to the retrieved buffer head in the location</div><div class='add'>+ * pointed to by @out_bh.</div><div class='ctx'>  *</div><div class='del'>- * %-EIO - I/O error</div><div class='add'>+ * The retrieved buffer may be either an existing one or a newly allocated one.</div><div class='add'>+ * For a newly created buffer, if the callback function argument @init_block</div><div class='add'>+ * is non-NULL, the callback will be called with the buffer locked to format</div><div class='add'>+ * the block.</div><div class='ctx'>  *</div><div class='del'>- * %-ENOENT - the specified block does not exist (hole block)</div><div class='del'>- *</div><div class='del'>- * %-EROFS - Read only filesystem (for create mode)</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- The specified block does not exist (hole block).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EROFS	- Read only filesystem (for create mode).</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_mdt_get_block(struct inode *inode, unsigned long blkoff, int create,</div><div class='ctx'> 			void (*init_block)(struct inode *,</div><div class='hunk'>@@ -273,14 +276,11 @@ int nilfs_mdt_get_block(struct inode *inode, unsigned long blkoff, int create,</div><div class='ctx'>  * @out_bh, and block offset to @blkoff, respectively.  @out_bh and</div><div class='ctx'>  * @blkoff are substituted only when zero is returned.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, it returns 0. On error, the following negative</div><div class='del'>- * error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - no block was found in the range</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- No block was found in the range.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_mdt_find_block(struct inode *inode, unsigned long start,</div><div class='ctx'> 			 unsigned long end, unsigned long *blkoff,</div><div class='hunk'>@@ -319,12 +319,11 @@ out:</div><div class='ctx'>  * @inode: inode of the meta data file</div><div class='ctx'>  * @block: block offset</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, zero is returned.</div><div class='del'>- * On error, one of the following negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- Non-existent block.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_mdt_delete_block(struct inode *inode, unsigned long block)</div><div class='ctx'> {</div><div class='hunk'>@@ -347,12 +346,10 @@ int nilfs_mdt_delete_block(struct inode *inode, unsigned long block)</div><div class='ctx'>  * nilfs_mdt_forget_block() clears a dirty flag of the specified buffer, and</div><div class='ctx'>  * tries to release the page including the buffer from a page cache.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EBUSY - page has an active buffer.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - page cache has no page addressed by the offset.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EBUSY	- Page has an active buffer.</div><div class='add'>+ * * %-ENOENT	- Page cache has no page addressed by the offset.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_mdt_forget_block(struct inode *inode, unsigned long block)</div><div class='ctx'> {</div><div class='hunk'>@@ -396,10 +393,9 @@ int nilfs_mdt_fetch_dirty(struct inode *inode)</div><div class='ctx'> 	return test_bit(NILFS_I_DIRTY, &amp;ii-&gt;i_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)</div><div class='add'>+static int nilfs_mdt_write_folio(struct folio *folio,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -411,7 +407,7 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> 		 * have dirty folios that try to be flushed in background.</div><div class='ctx'> 		 * So, here we simply discard this dirty folio.</div><div class='ctx'> 		 */</div><div class='del'>-		nilfs_clear_folio_dirty(folio, false);</div><div class='add'>+		nilfs_clear_folio_dirty(folio);</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -426,17 +422,27 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)</div><div class='ctx'> </div><div class='ctx'> 	if (wbc-&gt;sync_mode == WB_SYNC_ALL)</div><div class='ctx'> 		err = nilfs_construct_segment(sb);</div><div class='del'>-	else if (wbc-&gt;for_reclaim)</div><div class='del'>-		nilfs_flush_segment(sb, inode-&gt;i_ino);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nilfs_mdt_writeback(struct address_space *mapping,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)))</div><div class='add'>+		error = nilfs_mdt_write_folio(folio, wbc);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static const struct address_space_operations def_mdt_aops = {</div><div class='ctx'> 	.dirty_folio		= block_dirty_folio,</div><div class='ctx'> 	.invalidate_folio	= block_invalidate_folio,</div><div class='del'>-	.writepage		= nilfs_mdt_write_page,</div><div class='add'>+	.writepages		= nilfs_mdt_writeback,</div><div class='add'>+	.migrate_folio		= buffer_migrate_folio_norefs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations def_mdt_iops;</div><div class='hunk'>@@ -511,6 +517,8 @@ void nilfs_mdt_set_entry_size(struct inode *inode, unsigned int entry_size,</div><div class='ctx'>  * nilfs_mdt_setup_shadow_map - setup shadow map and bind it to metadata file</div><div class='ctx'>  * @inode: inode of the metadata file</div><div class='ctx'>  * @shadow: shadow mapping</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_mdt_setup_shadow_map(struct inode *inode,</div><div class='ctx'> 			       struct nilfs_shadow_map *shadow)</div><div class='hunk'>@@ -532,6 +540,8 @@ int nilfs_mdt_setup_shadow_map(struct inode *inode,</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_mdt_save_to_shadow_map - copy bmap and dirty pages to shadow map</div><div class='ctx'>  * @inode: inode of the metadata file</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_mdt_save_to_shadow_map(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -571,7 +581,8 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)</div><div class='ctx'> 	if (!bh_frozen)</div><div class='ctx'> 		bh_frozen = create_empty_buffers(folio, 1 &lt;&lt; blkbits, 0);</div><div class='ctx'> </div><div class='del'>-	bh_frozen = get_nth_bh(bh_frozen, bh_offset(bh) &gt;&gt; blkbits);</div><div class='add'>+	bh_frozen = get_nth_bh(bh_frozen,</div><div class='add'>+			       offset_in_folio(folio, bh-&gt;b_data) &gt;&gt; blkbits);</div><div class='ctx'> </div><div class='ctx'> 	if (!buffer_uptodate(bh_frozen))</div><div class='ctx'> 		nilfs_copy_buffer(bh_frozen, bh);</div><div class='hunk'>@@ -601,7 +612,8 @@ nilfs_mdt_get_frozen_buffer(struct inode *inode, struct buffer_head *bh)</div><div class='ctx'> 	if (!IS_ERR(folio)) {</div><div class='ctx'> 		bh_frozen = folio_buffers(folio);</div><div class='ctx'> 		if (bh_frozen) {</div><div class='del'>-			n = bh_offset(bh) &gt;&gt; inode-&gt;i_blkbits;</div><div class='add'>+			n = offset_in_folio(folio, bh-&gt;b_data) &gt;&gt;</div><div class='add'>+				inode-&gt;i_blkbits;</div><div class='ctx'> 			bh_frozen = get_nth_bh(bh_frozen, n);</div><div class='ctx'> 		}</div><div class='ctx'> 		folio_unlock(folio);</div><div class='hunk'>@@ -638,10 +650,10 @@ void nilfs_mdt_restore_from_shadow_map(struct inode *inode)</div><div class='ctx'> 	if (mi-&gt;mi_palloc_cache)</div><div class='ctx'> 		nilfs_palloc_clear_cache(inode);</div><div class='ctx'> </div><div class='del'>-	nilfs_clear_dirty_pages(inode-&gt;i_mapping, true);</div><div class='add'>+	nilfs_clear_dirty_pages(inode-&gt;i_mapping);</div><div class='ctx'> 	nilfs_copy_back_pages(inode-&gt;i_mapping, shadow-&gt;inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='del'>-	nilfs_clear_dirty_pages(ii-&gt;i_assoc_inode-&gt;i_mapping, true);</div><div class='add'>+	nilfs_clear_dirty_pages(ii-&gt;i_assoc_inode-&gt;i_mapping);</div><div class='ctx'> 	nilfs_copy_back_pages(ii-&gt;i_assoc_inode-&gt;i_mapping,</div><div class='ctx'> 			      NILFS_I(shadow-&gt;inode)-&gt;i_assoc_inode-&gt;i_mapping);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c<br/>index c950139db6ef..40f4b1a28705 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/namei.c</a></div><div class='hunk'>@@ -55,12 +55,25 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	ino_t ino;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (dentry-&gt;d_name.len &gt; NILFS_NAME_LEN)</div><div class='ctx'> 		return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> </div><div class='del'>-	ino = nilfs_inode_by_name(dir, &amp;dentry-&gt;d_name);</div><div class='del'>-	inode = ino ? nilfs_iget(dir-&gt;i_sb, NILFS_I(dir)-&gt;i_root, ino) : NULL;</div><div class='add'>+	res = nilfs_inode_by_name(dir, &amp;dentry-&gt;d_name, &amp;ino);</div><div class='add'>+	if (res) {</div><div class='add'>+		if (res != -ENOENT)</div><div class='add'>+			return ERR_PTR(res);</div><div class='add'>+		inode = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		inode = nilfs_iget(dir-&gt;i_sb, NILFS_I(dir)-&gt;i_root, ino);</div><div class='add'>+		if (inode == ERR_PTR(-ESTALE)) {</div><div class='add'>+			nilfs_error(dir-&gt;i_sb,</div><div class='add'>+					"deleted inode referenced: %lu", ino);</div><div class='add'>+			return ERR_PTR(-EIO);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return d_splice_alias(inode, dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,6 +162,9 @@ static int nilfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	/* slow symlink */</div><div class='ctx'> 	inode-&gt;i_op = &amp;nilfs_symlink_inode_operations;</div><div class='ctx'> 	inode_nohighmem(inode);</div><div class='add'>+	mapping_set_gfp_mask(inode-&gt;i_mapping,</div><div class='add'>+			     mapping_gfp_constraint(inode-&gt;i_mapping,</div><div class='add'>+						    ~__GFP_FS));</div><div class='ctx'> 	inode-&gt;i_mapping-&gt;a_ops = &amp;nilfs_aops;</div><div class='ctx'> 	err = page_symlink(inode, symname, l);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -202,8 +218,8 @@ static int nilfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		       struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *nilfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				  struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct nilfs_transaction_info ti;</div><div class='hunk'>@@ -211,7 +227,7 @@ static int nilfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_transaction_begin(dir-&gt;i_sb, &amp;ti, 1);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> 	inc_nlink(dir);</div><div class='ctx'> </div><div class='hunk'>@@ -242,7 +258,7 @@ out:</div><div class='ctx'> 	else</div><div class='ctx'> 		nilfs_transaction_abort(dir-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> </div><div class='ctx'> out_fail:</div><div class='ctx'> 	drop_nlink(inode);</div><div class='hunk'>@@ -263,10 +279,11 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -ENOENT;</div><div class='ctx'> 	de = nilfs_find_entry(dir, &amp;dentry-&gt;d_name, &amp;folio);</div><div class='del'>-	if (!de)</div><div class='add'>+	if (IS_ERR(de)) {</div><div class='add'>+		err = PTR_ERR(de);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='ctx'> 	err = -EIO;</div><div class='hunk'>@@ -353,6 +370,7 @@ static int nilfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	struct folio *old_folio;</div><div class='ctx'> 	struct nilfs_dir_entry *old_de;</div><div class='ctx'> 	struct nilfs_transaction_info ti;</div><div class='add'>+	bool old_is_dir = S_ISDIR(old_inode-&gt;i_mode);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; ~RENAME_NOREPLACE)</div><div class='hunk'>@@ -362,12 +380,13 @@ static int nilfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = -ENOENT;</div><div class='ctx'> 	old_de = nilfs_find_entry(old_dir, &amp;old_dentry-&gt;d_name, &amp;old_folio);</div><div class='del'>-	if (!old_de)</div><div class='add'>+	if (IS_ERR(old_de)) {</div><div class='add'>+		err = PTR_ERR(old_de);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (S_ISDIR(old_inode-&gt;i_mode)) {</div><div class='add'>+	if (old_is_dir &amp;&amp; old_dir != new_dir) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		dir_de = nilfs_dotdot(old_inode, &amp;dir_folio);</div><div class='ctx'> 		if (!dir_de)</div><div class='hunk'>@@ -379,18 +398,22 @@ static int nilfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 		struct nilfs_dir_entry *new_de;</div><div class='ctx'> </div><div class='ctx'> 		err = -ENOTEMPTY;</div><div class='del'>-		if (dir_de &amp;&amp; !nilfs_empty_dir(new_inode))</div><div class='add'>+		if (old_is_dir &amp;&amp; !nilfs_empty_dir(new_inode))</div><div class='ctx'> 			goto out_dir;</div><div class='ctx'> </div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		new_de = nilfs_find_entry(new_dir, &amp;new_dentry-&gt;d_name, &amp;new_folio);</div><div class='del'>-		if (!new_de)</div><div class='add'>+		new_de = nilfs_find_entry(new_dir, &amp;new_dentry-&gt;d_name,</div><div class='add'>+					  &amp;new_folio);</div><div class='add'>+		if (IS_ERR(new_de)) {</div><div class='add'>+			err = PTR_ERR(new_de);</div><div class='ctx'> 			goto out_dir;</div><div class='del'>-		nilfs_set_link(new_dir, new_de, new_folio, old_inode);</div><div class='add'>+		}</div><div class='add'>+		err = nilfs_set_link(new_dir, new_de, new_folio, old_inode);</div><div class='ctx'> 		folio_release_kmap(new_folio, new_de);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto out_dir;</div><div class='ctx'> 		nilfs_mark_inode_dirty(new_dir);</div><div class='ctx'> 		inode_set_ctime_current(new_inode);</div><div class='del'>-		if (dir_de)</div><div class='add'>+		if (old_is_dir)</div><div class='ctx'> 			drop_nlink(new_inode);</div><div class='ctx'> 		drop_nlink(new_inode);</div><div class='ctx'> 		nilfs_mark_inode_dirty(new_inode);</div><div class='hunk'>@@ -398,7 +421,7 @@ static int nilfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 		err = nilfs_add_link(new_dentry, old_inode);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_dir;</div><div class='del'>-		if (dir_de) {</div><div class='add'>+		if (old_is_dir) {</div><div class='ctx'> 			inc_nlink(new_dir);</div><div class='ctx'> 			nilfs_mark_inode_dirty(new_dir);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -410,28 +433,28 @@ static int nilfs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	 */</div><div class='ctx'> 	inode_set_ctime_current(old_inode);</div><div class='ctx'> </div><div class='del'>-	nilfs_delete_entry(old_de, old_folio);</div><div class='del'>-</div><div class='del'>-	if (dir_de) {</div><div class='del'>-		nilfs_set_link(old_inode, dir_de, dir_folio, new_dir);</div><div class='del'>-		folio_release_kmap(dir_folio, dir_de);</div><div class='del'>-		drop_nlink(old_dir);</div><div class='add'>+	err = nilfs_delete_entry(old_de, old_folio);</div><div class='add'>+	if (likely(!err)) {</div><div class='add'>+		if (old_is_dir) {</div><div class='add'>+			if (old_dir != new_dir)</div><div class='add'>+				err = nilfs_set_link(old_inode, dir_de,</div><div class='add'>+						     dir_folio, new_dir);</div><div class='add'>+			drop_nlink(old_dir);</div><div class='add'>+		}</div><div class='add'>+		nilfs_mark_inode_dirty(old_dir);</div><div class='ctx'> 	}</div><div class='del'>-	folio_release_kmap(old_folio, old_de);</div><div class='del'>-</div><div class='del'>-	nilfs_mark_inode_dirty(old_dir);</div><div class='ctx'> 	nilfs_mark_inode_dirty(old_inode);</div><div class='ctx'> </div><div class='del'>-	err = nilfs_transaction_commit(old_dir-&gt;i_sb);</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='ctx'> out_dir:</div><div class='ctx'> 	if (dir_de)</div><div class='ctx'> 		folio_release_kmap(dir_folio, dir_de);</div><div class='ctx'> out_old:</div><div class='ctx'> 	folio_release_kmap(old_folio, old_de);</div><div class='ctx'> out:</div><div class='del'>-	nilfs_transaction_abort(old_dir-&gt;i_sb);</div><div class='add'>+	if (likely(!err))</div><div class='add'>+		err = nilfs_transaction_commit(old_dir-&gt;i_sb);</div><div class='add'>+	else</div><div class='add'>+		nilfs_transaction_abort(old_dir-&gt;i_sb);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -440,12 +463,13 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static struct dentry *nilfs_get_parent(struct dentry *child)</div><div class='ctx'> {</div><div class='del'>-	unsigned long ino;</div><div class='add'>+	ino_t ino;</div><div class='add'>+	int res;</div><div class='ctx'> 	struct nilfs_root *root;</div><div class='ctx'> </div><div class='del'>-	ino = nilfs_inode_by_name(d_inode(child), &amp;dotdot_name);</div><div class='del'>-	if (!ino)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='add'>+	res = nilfs_inode_by_name(d_inode(child), &amp;dotdot_name, &amp;ino);</div><div class='add'>+	if (res)</div><div class='add'>+		return ERR_PTR(res);</div><div class='ctx'> </div><div class='ctx'> 	root = NILFS_I(d_inode(child))-&gt;i_root;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h<br/>index 98cffaf0ac12..b7e3d91b6243 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/nilfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/nilfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/nilfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/nilfs.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;linux/nilfs2_api.h&gt;</div><div class='ctx'> #include &lt;linux/nilfs2_ondisk.h&gt;</div><div class='ctx'> #include "the_nilfs.h"</div><div class='hunk'>@@ -22,6 +23,7 @@</div><div class='ctx'> /**</div><div class='ctx'>  * struct nilfs_inode_info - nilfs inode data in memory</div><div class='ctx'>  * @i_flags: inode flags</div><div class='add'>+ * @i_type: inode type (combination of flags that inidicate usage)</div><div class='ctx'>  * @i_state: dynamic state flags</div><div class='ctx'>  * @i_bmap: pointer on i_bmap_data</div><div class='ctx'>  * @i_bmap_data: raw block mapping</div><div class='hunk'>@@ -37,6 +39,7 @@</div><div class='ctx'>  */</div><div class='ctx'> struct nilfs_inode_info {</div><div class='ctx'> 	__u32 i_flags;</div><div class='add'>+	unsigned int i_type;</div><div class='ctx'> 	unsigned long  i_state;		/* Dynamic state flags */</div><div class='ctx'> 	struct nilfs_bmap *i_bmap;</div><div class='ctx'> 	struct nilfs_bmap i_bmap_data;</div><div class='hunk'>@@ -90,9 +93,16 @@ enum {</div><div class='ctx'> 	NILFS_I_UPDATED,		/* The file has been written back */</div><div class='ctx'> 	NILFS_I_INODE_SYNC,		/* dsync is not allowed for inode */</div><div class='ctx'> 	NILFS_I_BMAP,			/* has bmap and btnode_cache */</div><div class='del'>-	NILFS_I_GCINODE,		/* inode for GC, on memory only */</div><div class='del'>-	NILFS_I_BTNC,			/* inode for btree node cache */</div><div class='del'>-	NILFS_I_SHADOW,			/* inode for shadowed page cache */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags to identify the usage of on-memory inodes (i_type)</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	NILFS_I_TYPE_NORMAL =	0,</div><div class='add'>+	NILFS_I_TYPE_GC =	0x0001,	/* For data caching during GC */</div><div class='add'>+	NILFS_I_TYPE_BTNC =	0x0002,	/* For btree node cache */</div><div class='add'>+	NILFS_I_TYPE_SHADOW =	0x0004,	/* For shadowed page cache */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -103,6 +113,18 @@ enum {</div><div class='ctx'> 	NILFS_SB_COMMIT_ALL	/* Commit both super blocks */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * define NILFS_MAX_VOLUME_NAME - maximum number of characters (bytes) in a</div><div class='add'>+ *                                file system volume name</div><div class='add'>+ *</div><div class='add'>+ * Defined by the size of the volume name field in the on-disk superblocks.</div><div class='add'>+ * This volume name does not include the terminating NULL byte if the string</div><div class='add'>+ * length matches the field size, so use (NILFS_MAX_VOLUME_NAME + 1) for the</div><div class='add'>+ * size of the buffer that requires a NULL byte termination.</div><div class='add'>+ */</div><div class='add'>+#define NILFS_MAX_VOLUME_NAME  \</div><div class='add'>+	sizeof_field(struct nilfs_super_block, s_volume_name)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Macros to check inode numbers</div><div class='ctx'>  */</div><div class='hunk'>@@ -116,9 +138,15 @@ enum {</div><div class='ctx'> #define NILFS_FIRST_INO(sb) (((struct the_nilfs *)sb-&gt;s_fs_info)-&gt;ns_first_ino)</div><div class='ctx'> </div><div class='ctx'> #define NILFS_MDT_INODE(sb, ino) \</div><div class='del'>-	((ino) &lt; NILFS_FIRST_INO(sb) &amp;&amp; (NILFS_MDT_INO_BITS &amp; BIT(ino)))</div><div class='add'>+	((ino) &lt; NILFS_USER_INO &amp;&amp; (NILFS_MDT_INO_BITS &amp; BIT(ino)))</div><div class='ctx'> #define NILFS_VALID_INODE(sb, ino) \</div><div class='del'>-	((ino) &gt;= NILFS_FIRST_INO(sb) || (NILFS_SYS_INO_BITS &amp; BIT(ino)))</div><div class='add'>+	((ino) &gt;= NILFS_FIRST_INO(sb) ||				\</div><div class='add'>+	 ((ino) &lt; NILFS_USER_INO &amp;&amp; (NILFS_SYS_INO_BITS &amp; BIT(ino))))</div><div class='add'>+</div><div class='add'>+#define NILFS_PRIVATE_INODE(ino) ({					\</div><div class='add'>+	ino_t __ino = (ino);						\</div><div class='add'>+	((__ino) &lt; NILFS_USER_INO &amp;&amp; (__ino) != NILFS_ROOT_INO &amp;&amp;	\</div><div class='add'>+	 (__ino) != NILFS_SKETCH_INO); })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct nilfs_transaction_info: context information for synchronization</div><div class='hunk'>@@ -227,23 +255,23 @@ static inline __u32 nilfs_mask_flags(umode_t mode, __u32 flags)</div><div class='ctx'> </div><div class='ctx'> /* dir.c */</div><div class='ctx'> int nilfs_add_link(struct dentry *, struct inode *);</div><div class='del'>-ino_t nilfs_inode_by_name(struct inode *, const struct qstr *);</div><div class='add'>+int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino);</div><div class='ctx'> int nilfs_make_empty(struct inode *, struct inode *);</div><div class='ctx'> struct nilfs_dir_entry *nilfs_find_entry(struct inode *, const struct qstr *,</div><div class='ctx'> 		struct folio **);</div><div class='ctx'> int nilfs_delete_entry(struct nilfs_dir_entry *, struct folio *);</div><div class='ctx'> int nilfs_empty_dir(struct inode *);</div><div class='ctx'> struct nilfs_dir_entry *nilfs_dotdot(struct inode *, struct folio **);</div><div class='del'>-void nilfs_set_link(struct inode *, struct nilfs_dir_entry *,</div><div class='del'>-			   struct folio *, struct inode *);</div><div class='add'>+int nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,</div><div class='add'>+		   struct folio *folio, struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> /* file.c */</div><div class='ctx'> extern int nilfs_sync_file(struct file *, loff_t, loff_t, int);</div><div class='ctx'> </div><div class='ctx'> /* ioctl.c */</div><div class='del'>-int nilfs_fileattr_get(struct dentry *dentry, struct fileattr *m);</div><div class='add'>+int nilfs_fileattr_get(struct dentry *dentry, struct file_kattr *m);</div><div class='ctx'> int nilfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		       struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		       struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> long nilfs_ioctl(struct file *, unsigned int, unsigned long);</div><div class='ctx'> long nilfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='ctx'> int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, struct nilfs_argv *,</div><div class='hunk'>@@ -256,7 +284,8 @@ extern struct inode *nilfs_new_inode(struct inode *, umode_t);</div><div class='ctx'> extern int nilfs_get_block(struct inode *, sector_t, struct buffer_head *, int);</div><div class='ctx'> extern void nilfs_set_inode_flags(struct inode *);</div><div class='ctx'> extern int nilfs_read_inode_common(struct inode *, struct nilfs_inode *);</div><div class='del'>-extern void nilfs_write_inode_common(struct inode *, struct nilfs_inode *, int);</div><div class='add'>+void nilfs_write_inode_common(struct inode *inode,</div><div class='add'>+			      struct nilfs_inode *raw_inode);</div><div class='ctx'> struct inode *nilfs_ilookup(struct super_block *sb, struct nilfs_root *root,</div><div class='ctx'> 			    unsigned long ino);</div><div class='ctx'> struct inode *nilfs_iget_locked(struct super_block *sb, struct nilfs_root *root,</div><div class='hunk'>@@ -334,8 +363,8 @@ void __nilfs_error(struct super_block *sb, const char *function,</div><div class='ctx'> </div><div class='ctx'> extern struct nilfs_super_block *</div><div class='ctx'> nilfs_read_super_block(struct super_block *, u64, int, struct buffer_head **);</div><div class='del'>-extern int nilfs_store_magic_and_option(struct super_block *,</div><div class='del'>-					struct nilfs_super_block *, char *);</div><div class='add'>+extern int nilfs_store_magic(struct super_block *sb,</div><div class='add'>+			     struct nilfs_super_block *sbp);</div><div class='ctx'> extern int nilfs_check_feature_compatibility(struct super_block *,</div><div class='ctx'> 					     struct nilfs_super_block *);</div><div class='ctx'> extern void nilfs_set_log_cursor(struct nilfs_super_block *,</div><div class='hunk'>@@ -373,6 +402,7 @@ extern const struct file_operations nilfs_dir_operations;</div><div class='ctx'> extern const struct inode_operations nilfs_file_inode_operations;</div><div class='ctx'> extern const struct file_operations nilfs_file_operations;</div><div class='ctx'> extern const struct address_space_operations nilfs_aops;</div><div class='add'>+extern const struct address_space_operations nilfs_buffer_cache_aops;</div><div class='ctx'> extern const struct inode_operations nilfs_dir_inode_operations;</div><div class='ctx'> extern const struct inode_operations nilfs_special_inode_operations;</div><div class='ctx'> extern const struct inode_operations nilfs_symlink_inode_operations;</div><div class='head'>diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c<br/>index 5c2eba1987bd..56c4da417b6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/page.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/page.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/page.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/page.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@ static struct buffer_head *__nilfs_get_folio_block(struct folio *folio,</div><div class='ctx'> 	first_block = (unsigned long)index &lt;&lt; (PAGE_SHIFT - blkbits);</div><div class='ctx'> 	bh = get_nth_bh(bh, block - first_block);</div><div class='ctx'> </div><div class='del'>-	touch_buffer(bh);</div><div class='ctx'> 	wait_on_buffer(bh);</div><div class='ctx'> 	return bh;</div><div class='ctx'> }</div><div class='hunk'>@@ -64,6 +63,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode,</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	bh-&gt;b_bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='ctx'> 	return bh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +77,8 @@ void nilfs_forget_buffer(struct buffer_head *bh)</div><div class='ctx'> 	const unsigned long clear_bits =</div><div class='ctx'> 		(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |</div><div class='ctx'> 		 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |</div><div class='del'>-		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));</div><div class='add'>+		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |</div><div class='add'>+		 BIT(BH_Delay));</div><div class='ctx'> </div><div class='ctx'> 	lock_buffer(bh);</div><div class='ctx'> 	set_mask_bits(&amp;bh-&gt;b_state, clear_bits, 0);</div><div class='hunk'>@@ -98,16 +99,16 @@ void nilfs_forget_buffer(struct buffer_head *bh)</div><div class='ctx'>  */</div><div class='ctx'> void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh)</div><div class='ctx'> {</div><div class='del'>-	void *kaddr0, *kaddr1;</div><div class='add'>+	void *saddr, *daddr;</div><div class='ctx'> 	unsigned long bits;</div><div class='del'>-	struct page *spage = sbh-&gt;b_page, *dpage = dbh-&gt;b_page;</div><div class='add'>+	struct folio *sfolio = sbh-&gt;b_folio, *dfolio = dbh-&gt;b_folio;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-	kaddr0 = kmap_atomic(spage);</div><div class='del'>-	kaddr1 = kmap_atomic(dpage);</div><div class='del'>-	memcpy(kaddr1 + bh_offset(dbh), kaddr0 + bh_offset(sbh), sbh-&gt;b_size);</div><div class='del'>-	kunmap_atomic(kaddr1);</div><div class='del'>-	kunmap_atomic(kaddr0);</div><div class='add'>+	saddr = kmap_local_folio(sfolio, bh_offset(sbh));</div><div class='add'>+	daddr = kmap_local_folio(dfolio, bh_offset(dbh));</div><div class='add'>+	memcpy(daddr, saddr, sbh-&gt;b_size);</div><div class='add'>+	kunmap_local(daddr);</div><div class='add'>+	kunmap_local(saddr);</div><div class='ctx'> </div><div class='ctx'> 	dbh-&gt;b_state = sbh-&gt;b_state &amp; NILFS_BUFFER_INHERENT_BITS;</div><div class='ctx'> 	dbh-&gt;b_blocknr = sbh-&gt;b_blocknr;</div><div class='hunk'>@@ -121,21 +122,20 @@ void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh)</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bits &amp; BIT(BH_Uptodate))</div><div class='del'>-		SetPageUptodate(dpage);</div><div class='add'>+		folio_mark_uptodate(dfolio);</div><div class='ctx'> 	else</div><div class='del'>-		ClearPageUptodate(dpage);</div><div class='add'>+		folio_clear_uptodate(dfolio);</div><div class='ctx'> 	if (bits &amp; BIT(BH_Mapped))</div><div class='del'>-		SetPageMappedToDisk(dpage);</div><div class='add'>+		folio_set_mappedtodisk(dfolio);</div><div class='ctx'> 	else</div><div class='del'>-		ClearPageMappedToDisk(dpage);</div><div class='add'>+		folio_clear_mappedtodisk(dfolio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_folio_buffers_clean - Check if a folio has dirty buffers or not.</div><div class='ctx'>  * @folio: Folio to be checked.</div><div class='ctx'>  *</div><div class='del'>- * nilfs_folio_buffers_clean() returns false if the folio has dirty buffers.</div><div class='del'>- * Otherwise, it returns true.</div><div class='add'>+ * Return: false if the folio has dirty buffers, true otherwise.</div><div class='ctx'>  */</div><div class='ctx'> bool nilfs_folio_buffers_clean(struct folio *folio)</div><div class='ctx'> {</div><div class='hunk'>@@ -167,7 +167,7 @@ void nilfs_folio_bug(struct folio *folio)</div><div class='ctx'> 	printk(KERN_CRIT "NILFS_FOLIO_BUG(%p): cnt=%d index#=%llu flags=0x%lx "</div><div class='ctx'> 	       "mapping=%p ino=%lu\n",</div><div class='ctx'> 	       folio, folio_ref_count(folio),</div><div class='del'>-	       (unsigned long long)folio-&gt;index, folio-&gt;flags, m, ino);</div><div class='add'>+	       (unsigned long long)folio-&gt;index, folio-&gt;flags.f, m, ino);</div><div class='ctx'> </div><div class='ctx'> 	head = folio_buffers(folio);</div><div class='ctx'> 	if (head) {</div><div class='hunk'>@@ -262,7 +262,7 @@ repeat:</div><div class='ctx'> 			NILFS_FOLIO_BUG(folio, "inconsistent dirty state");</div><div class='ctx'> </div><div class='ctx'> 		dfolio = filemap_grab_folio(dmap, folio-&gt;index);</div><div class='del'>-		if (unlikely(IS_ERR(dfolio))) {</div><div class='add'>+		if (IS_ERR(dfolio)) {</div><div class='ctx'> 			/* No empty page is added to the page cache */</div><div class='ctx'> 			folio_unlock(folio);</div><div class='ctx'> 			err = PTR_ERR(dfolio);</div><div class='hunk'>@@ -357,9 +357,8 @@ repeat:</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_clear_dirty_pages - discard dirty pages in address space</div><div class='ctx'>  * @mapping: address space with dirty pages for discarding</div><div class='del'>- * @silent: suppress [true] or print [false] warning messages</div><div class='ctx'>  */</div><div class='del'>-void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)</div><div class='add'>+void nilfs_clear_dirty_pages(struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio_batch fbatch;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -380,7 +379,7 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)</div><div class='ctx'> 			 * was acquired.  Skip processing in that case.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (likely(folio-&gt;mapping == mapping))</div><div class='del'>-				nilfs_clear_folio_dirty(folio, silent);</div><div class='add'>+				nilfs_clear_folio_dirty(folio);</div><div class='ctx'> </div><div class='ctx'> 			folio_unlock(folio);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -392,54 +391,67 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_clear_folio_dirty - discard dirty folio</div><div class='ctx'>  * @folio: dirty folio that will be discarded</div><div class='del'>- * @silent: suppress [true] or print [false] warning messages</div><div class='add'>+ *</div><div class='add'>+ * nilfs_clear_folio_dirty() clears working states including dirty state for</div><div class='add'>+ * the folio and its buffers.  If the folio has buffers, clear only if it is</div><div class='add'>+ * confirmed that none of the buffer heads are busy (none have valid</div><div class='add'>+ * references and none are locked).</div><div class='ctx'>  */</div><div class='del'>-void nilfs_clear_folio_dirty(struct folio *folio, bool silent)</div><div class='add'>+void nilfs_clear_folio_dirty(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct buffer_head *bh, *head;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> </div><div class='del'>-	if (!silent)</div><div class='del'>-		nilfs_warn(sb, "discard dirty page: offset=%lld, ino=%lu",</div><div class='del'>-			   folio_pos(folio), inode-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	folio_clear_uptodate(folio);</div><div class='del'>-	folio_clear_mappedtodisk(folio);</div><div class='del'>-</div><div class='ctx'> 	head = folio_buffers(folio);</div><div class='ctx'> 	if (head) {</div><div class='ctx'> 		const unsigned long clear_bits =</div><div class='ctx'> 			(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |</div><div class='ctx'> 			 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |</div><div class='del'>-			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));</div><div class='add'>+			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |</div><div class='add'>+			 BIT(BH_Delay));</div><div class='add'>+		bool busy, invalidated = false;</div><div class='ctx'> </div><div class='add'>+recheck_buffers:</div><div class='add'>+		busy = false;</div><div class='ctx'> 		bh = head;</div><div class='ctx'> 		do {</div><div class='del'>-			lock_buffer(bh);</div><div class='del'>-			if (!silent)</div><div class='del'>-				nilfs_warn(sb,</div><div class='del'>-					   "discard dirty block: blocknr=%llu, size=%zu",</div><div class='del'>-					   (u64)bh-&gt;b_blocknr, bh-&gt;b_size);</div><div class='add'>+			if (atomic_read(&amp;bh-&gt;b_count) | buffer_locked(bh)) {</div><div class='add'>+				busy = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} while (bh = bh-&gt;b_this_page, bh != head);</div><div class='ctx'> </div><div class='add'>+		if (busy) {</div><div class='add'>+			if (invalidated)</div><div class='add'>+				return;</div><div class='add'>+			invalidate_bh_lrus();</div><div class='add'>+			invalidated = true;</div><div class='add'>+			goto recheck_buffers;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bh = head;</div><div class='add'>+		do {</div><div class='add'>+			lock_buffer(bh);</div><div class='ctx'> 			set_mask_bits(&amp;bh-&gt;b_state, clear_bits, 0);</div><div class='ctx'> 			unlock_buffer(bh);</div><div class='ctx'> 		} while (bh = bh-&gt;b_this_page, bh != head);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	folio_clear_uptodate(folio);</div><div class='add'>+	folio_clear_mappedtodisk(folio);</div><div class='add'>+	folio_clear_checked(folio);</div><div class='ctx'> 	__nilfs_clear_folio_dirty(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int nilfs_page_count_clean_buffers(struct page *page,</div><div class='add'>+unsigned int nilfs_page_count_clean_buffers(struct folio *folio,</div><div class='ctx'> 					    unsigned int from, unsigned int to)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int block_start, block_end;</div><div class='ctx'> 	struct buffer_head *bh, *head;</div><div class='ctx'> 	unsigned int nc = 0;</div><div class='ctx'> </div><div class='del'>-	for (bh = head = page_buffers(page), block_start = 0;</div><div class='add'>+	for (bh = head = folio_buffers(folio), block_start = 0;</div><div class='ctx'> 	     bh != head || !block_start;</div><div class='ctx'> 	     block_start = block_end, bh = bh-&gt;b_this_page) {</div><div class='ctx'> 		block_end = block_start + bh-&gt;b_size;</div><div class='hunk'>@@ -487,8 +499,9 @@ void __nilfs_clear_folio_dirty(struct folio *folio)</div><div class='ctx'>  * This function searches an extent of buffers marked "delayed" which</div><div class='ctx'>  * starts from a block offset equal to or larger than @start_blk.  If</div><div class='ctx'>  * such an extent was found, this will store the start offset in</div><div class='del'>- * @blkoff and return its length in blocks.  Otherwise, zero is</div><div class='del'>- * returned.</div><div class='add'>+ * @blkoff and return its length in blocks.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length in blocks of found extent, 0 otherwise.</div><div class='ctx'>  */</div><div class='ctx'> unsigned long nilfs_find_uncommitted_extent(struct inode *inode,</div><div class='ctx'> 					    sector_t start_blk,</div><div class='head'>diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h<br/>index 7e1a2c455a10..136cd1c143c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/page.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/page.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/page.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/page.h</a></div><div class='hunk'>@@ -41,10 +41,10 @@ void nilfs_folio_bug(struct folio *);</div><div class='ctx'> </div><div class='ctx'> int nilfs_copy_dirty_pages(struct address_space *, struct address_space *);</div><div class='ctx'> void nilfs_copy_back_pages(struct address_space *, struct address_space *);</div><div class='del'>-void nilfs_clear_folio_dirty(struct folio *, bool);</div><div class='del'>-void nilfs_clear_dirty_pages(struct address_space *, bool);</div><div class='del'>-unsigned int nilfs_page_count_clean_buffers(struct page *, unsigned int,</div><div class='del'>-					    unsigned int);</div><div class='add'>+void nilfs_clear_folio_dirty(struct folio *folio);</div><div class='add'>+void nilfs_clear_dirty_pages(struct address_space *mapping);</div><div class='add'>+unsigned int nilfs_page_count_clean_buffers(struct folio *folio,</div><div class='add'>+		unsigned int from, unsigned int to);</div><div class='ctx'> unsigned long nilfs_find_uncommitted_extent(struct inode *inode,</div><div class='ctx'> 					    sector_t start_blk,</div><div class='ctx'> 					    sector_t *blkoff);</div><div class='head'>diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c<br/>index 0955b657938f..a9c61d0492cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/recovery.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/recovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/recovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/recovery.c</a></div><div class='hunk'>@@ -88,6 +88,8 @@ static int nilfs_warn_segment_error(struct super_block *sb, int err)</div><div class='ctx'>  * @check_bytes: number of bytes to be checked</div><div class='ctx'>  * @start: DBN of start block</div><div class='ctx'>  * @nblock: number of blocks to be checked</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or %-EIO if an I/O error occurs.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_compute_checksum(struct the_nilfs *nilfs,</div><div class='ctx'> 				  struct buffer_head *bhs, u32 *sum,</div><div class='hunk'>@@ -126,6 +128,11 @@ static int nilfs_compute_checksum(struct the_nilfs *nilfs,</div><div class='ctx'>  * @sr_block: disk block number of the super root block</div><div class='ctx'>  * @pbh: address of a buffer_head pointer to return super root buffer</div><div class='ctx'>  * @check: CRC check flag</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Super root block corrupted.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_read_super_root_block(struct the_nilfs *nilfs, sector_t sr_block,</div><div class='ctx'> 				struct buffer_head **pbh, int check)</div><div class='hunk'>@@ -176,6 +183,8 @@ int nilfs_read_super_root_block(struct the_nilfs *nilfs, sector_t sr_block,</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='ctx'>  * @start_blocknr: start block number of the log</div><div class='ctx'>  * @sum: pointer to return segment summary structure</div><div class='add'>+ *</div><div class='add'>+ * Return: Buffer head pointer, or NULL if an I/O error occurs.</div><div class='ctx'>  */</div><div class='ctx'> static struct buffer_head *</div><div class='ctx'> nilfs_read_log_header(struct the_nilfs *nilfs, sector_t start_blocknr,</div><div class='hunk'>@@ -195,6 +204,13 @@ nilfs_read_log_header(struct the_nilfs *nilfs, sector_t start_blocknr,</div><div class='ctx'>  * @seg_seq: sequence number of segment</div><div class='ctx'>  * @bh_sum: buffer head of summary block</div><div class='ctx'>  * @sum: segment summary struct</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following internal codes on failure:</div><div class='add'>+ * * %NILFS_SEG_FAIL_MAGIC	    - Magic number mismatch.</div><div class='add'>+ * * %NILFS_SEG_FAIL_SEQ	    - Sequence number mismatch.</div><div class='add'>+ * * %NIFLS_SEG_FAIL_CONSISTENCY    - Block count out of range.</div><div class='add'>+ * * %NILFS_SEG_FAIL_IO		    - I/O error.</div><div class='add'>+ * * %NILFS_SEG_FAIL_CHECKSUM_FULL  - Full log checksum verification failed.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_validate_log(struct the_nilfs *nilfs, u64 seg_seq,</div><div class='ctx'> 			      struct buffer_head *bh_sum,</div><div class='hunk'>@@ -238,6 +254,9 @@ out:</div><div class='ctx'>  * @pbh: the current buffer head on summary blocks [in, out]</div><div class='ctx'>  * @offset: the current byte offset on summary blocks [in, out]</div><div class='ctx'>  * @bytes: byte size of the item to be read</div><div class='add'>+ *</div><div class='add'>+ * Return: Kernel space address of current segment summary entry, or</div><div class='add'>+ * NULL if an I/O error occurs.</div><div class='ctx'>  */</div><div class='ctx'> static void *nilfs_read_summary_info(struct the_nilfs *nilfs,</div><div class='ctx'> 				     struct buffer_head **pbh,</div><div class='hunk'>@@ -300,6 +319,11 @@ static void nilfs_skip_summary_info(struct the_nilfs *nilfs,</div><div class='ctx'>  * @start_blocknr: start block number of the log</div><div class='ctx'>  * @sum: log summary information</div><div class='ctx'>  * @head: list head to add nilfs_recovery_block struct</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_scan_dsync_log(struct the_nilfs *nilfs, sector_t start_blocknr,</div><div class='ctx'> 				struct nilfs_segment_summary *sum,</div><div class='hunk'>@@ -433,8 +457,17 @@ static int nilfs_prepare_segment_for_recovery(struct the_nilfs *nilfs,</div><div class='ctx'> 	 * The next segment is invalidated by this recovery.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = nilfs_sufile_free(sufile, segnum[1]);</div><div class='del'>-	if (unlikely(err))</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		if (err == -ENOENT) {</div><div class='add'>+			nilfs_err(sb,</div><div class='add'>+				  "checkpoint log inconsistency at block %llu (segment %llu): next segment %llu is unallocated",</div><div class='add'>+				  (unsigned long long)nilfs-&gt;ns_last_pseg,</div><div class='add'>+				  (unsigned long long)nilfs-&gt;ns_segnum,</div><div class='add'>+				  (unsigned long long)segnum[1]);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		goto failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; 4; i++) {</div><div class='ctx'> 		err = nilfs_segment_list_add(head, segnum[i]);</div><div class='hunk'>@@ -472,18 +505,16 @@ static int nilfs_prepare_segment_for_recovery(struct the_nilfs *nilfs,</div><div class='ctx'> </div><div class='ctx'> static int nilfs_recovery_copy_block(struct the_nilfs *nilfs,</div><div class='ctx'> 				     struct nilfs_recovery_block *rb,</div><div class='del'>-				     struct page *page)</div><div class='add'>+				     loff_t pos, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh_org;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t from = offset_in_folio(folio, pos);</div><div class='ctx'> </div><div class='ctx'> 	bh_org = __bread(nilfs-&gt;ns_bdev, rb-&gt;blocknr, nilfs-&gt;ns_blocksize);</div><div class='ctx'> 	if (unlikely(!bh_org))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(page);</div><div class='del'>-	memcpy(kaddr + bh_offset(bh_org), bh_org-&gt;b_data, bh_org-&gt;b_size);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	memcpy_to_folio(folio, from, bh_org-&gt;b_data, bh_org-&gt;b_size);</div><div class='ctx'> 	brelse(bh_org);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -497,7 +528,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct nilfs_recovery_block *rb, *n;</div><div class='ctx'> 	unsigned int blocksize = nilfs-&gt;ns_blocksize;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	loff_t pos;</div><div class='ctx'> 	int err = 0, err2 = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +542,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,</div><div class='ctx'> </div><div class='ctx'> 		pos = rb-&gt;blkoff &lt;&lt; inode-&gt;i_blkbits;</div><div class='ctx'> 		err = block_write_begin(inode-&gt;i_mapping, pos, blocksize,</div><div class='del'>-					&amp;page, nilfs_get_block);</div><div class='add'>+					&amp;folio, nilfs_get_block);</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='ctx'> 			loff_t isize = inode-&gt;i_size;</div><div class='ctx'> </div><div class='hunk'>@@ -521,26 +552,25 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,</div><div class='ctx'> 			goto failed_inode;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = nilfs_recovery_copy_block(nilfs, rb, page);</div><div class='add'>+		err = nilfs_recovery_copy_block(nilfs, rb, pos, folio);</div><div class='ctx'> 		if (unlikely(err))</div><div class='del'>-			goto failed_page;</div><div class='add'>+			goto failed_folio;</div><div class='ctx'> </div><div class='ctx'> 		err = nilfs_set_file_dirty(inode, 1);</div><div class='ctx'> 		if (unlikely(err))</div><div class='del'>-			goto failed_page;</div><div class='add'>+			goto failed_folio;</div><div class='ctx'> </div><div class='del'>-		block_write_end(NULL, inode-&gt;i_mapping, pos, blocksize,</div><div class='del'>-				blocksize, page, NULL);</div><div class='add'>+		block_write_end(pos, blocksize, blocksize, folio);</div><div class='ctx'> </div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 		(*nr_salvaged_blocks)++;</div><div class='ctx'> 		goto next;</div><div class='ctx'> </div><div class='del'>- failed_page:</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+ failed_folio:</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> </div><div class='ctx'>  failed_inode:</div><div class='ctx'> 		nilfs_warn(sb,</div><div class='hunk'>@@ -562,7 +592,14 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,</div><div class='ctx'>  * checkpoint</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='ctx'>  * @sb: super block instance</div><div class='add'>+ * @root: NILFS root instance</div><div class='ctx'>  * @ri: pointer to a nilfs_recovery_info</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Log format error.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_do_roll_forward(struct the_nilfs *nilfs,</div><div class='ctx'> 				 struct super_block *sb,</div><div class='hunk'>@@ -697,9 +734,15 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	bh = __getblk(nilfs-&gt;ns_bdev, ri-&gt;ri_lsegs_start, nilfs-&gt;ns_blocksize);</div><div class='del'>-	BUG_ON(!bh);</div><div class='add'>+	if (WARN_ON(!bh))</div><div class='add'>+		return;  /* should never happen */</div><div class='add'>+</div><div class='add'>+	lock_buffer(bh);</div><div class='ctx'> 	memset(bh-&gt;b_data, 0, bh-&gt;b_size);</div><div class='add'>+	set_buffer_uptodate(bh);</div><div class='ctx'> 	set_buffer_dirty(bh);</div><div class='add'>+	unlock_buffer(bh);</div><div class='add'>+</div><div class='ctx'> 	err = sync_dirty_buffer(bh);</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		nilfs_warn(nilfs-&gt;ns_sb,</div><div class='hunk'>@@ -708,23 +751,45 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nilfs_abort_roll_forward - cleaning up after a failed rollforward recovery</div><div class='add'>+ * @nilfs: nilfs object</div><div class='add'>+ */</div><div class='add'>+static void nilfs_abort_roll_forward(struct the_nilfs *nilfs)</div><div class='add'>+{</div><div class='add'>+	struct nilfs_inode_info *ii, *n;</div><div class='add'>+	LIST_HEAD(head);</div><div class='add'>+</div><div class='add'>+	/* Abandon inodes that have read recovery data */</div><div class='add'>+	spin_lock(&amp;nilfs-&gt;ns_inode_lock);</div><div class='add'>+	list_splice_init(&amp;nilfs-&gt;ns_dirty_files, &amp;head);</div><div class='add'>+	spin_unlock(&amp;nilfs-&gt;ns_inode_lock);</div><div class='add'>+	if (list_empty(&amp;head))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	set_nilfs_purging(nilfs);</div><div class='add'>+	list_for_each_entry_safe(ii, n, &amp;head, i_dirty) {</div><div class='add'>+		spin_lock(&amp;nilfs-&gt;ns_inode_lock);</div><div class='add'>+		list_del_init(&amp;ii-&gt;i_dirty);</div><div class='add'>+		spin_unlock(&amp;nilfs-&gt;ns_inode_lock);</div><div class='add'>+</div><div class='add'>+		iput(&amp;ii-&gt;vfs_inode);</div><div class='add'>+	}</div><div class='add'>+	clear_nilfs_purging(nilfs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nilfs_salvage_orphan_logs - salvage logs written after the latest checkpoint</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='ctx'>  * @sb: super block instance</div><div class='ctx'>  * @ri: pointer to a nilfs_recovery_info struct to store search results.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned.  On error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Inconsistent filesystem state.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No space left on device (only in a panic state).</div><div class='del'>- *</div><div class='del'>- * %-ERESTARTSYS - Interrupted.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL		- Inconsistent filesystem state.</div><div class='add'>+ * * %-EIO		- I/O error.</div><div class='add'>+ * * %-ENOMEM		- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC		- No space left on device (only in a panic state).</div><div class='add'>+ * * %-ERESTARTSYS	- Interrupted.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs,</div><div class='ctx'> 			      struct super_block *sb,</div><div class='hunk'>@@ -765,15 +830,19 @@ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs,</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='ctx'> 			nilfs_err(sb, "error %d writing segment for recovery",</div><div class='ctx'> 				  err);</div><div class='del'>-			goto failed;</div><div class='add'>+			goto put_root;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		nilfs_finish_roll_forward(nilfs, ri);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- failed:</div><div class='add'>+put_root:</div><div class='ctx'> 	nilfs_put_root(root);</div><div class='ctx'> 	return err;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	nilfs_abort_roll_forward(nilfs);</div><div class='add'>+	goto put_root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -785,14 +854,11 @@ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs,</div><div class='ctx'>  * segment pointed by the superblock.  It sets up struct the_nilfs through</div><div class='ctx'>  * this search. It fills nilfs_recovery_info (ri) required for recovery.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned.  On error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - No valid segment found</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- No valid segment found.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_search_super_root(struct the_nilfs *nilfs,</div><div class='ctx'> 			    struct nilfs_recovery_info *ri)</div><div class='head'>diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c<br/>index 6e59dc19a732..a8bdf3d318ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/segbuf.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/segbuf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/segbuf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/segbuf.c</a></div><div class='hunk'>@@ -205,7 +205,6 @@ static void nilfs_segbuf_fill_in_data_crc(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct nilfs_segment_summary *raw_sum;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	u32 crc;</div><div class='ctx'> </div><div class='ctx'> 	bh = list_entry(segbuf-&gt;sb_segsum_buffers.next, struct buffer_head,</div><div class='hunk'>@@ -220,9 +219,13 @@ static void nilfs_segbuf_fill_in_data_crc(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'> 		crc = crc32_le(crc, bh-&gt;b_data, bh-&gt;b_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_for_each_entry(bh, &amp;segbuf-&gt;sb_payload_buffers, b_assoc_buffers) {</div><div class='del'>-		kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-		crc = crc32_le(crc, kaddr + bh_offset(bh), bh-&gt;b_size);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		size_t offset = offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data);</div><div class='add'>+		unsigned char *from;</div><div class='add'>+</div><div class='add'>+		/* Do not support block sizes larger than PAGE_SIZE */</div><div class='add'>+		from = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='add'>+		crc = crc32_le(crc, from, bh-&gt;b_size);</div><div class='add'>+		kunmap_local(from);</div><div class='ctx'> 	}</div><div class='ctx'> 	raw_sum-&gt;ss_datasum = cpu_to_le32(crc);</div><div class='ctx'> }</div><div class='hunk'>@@ -374,7 +377,7 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'> 				  struct nilfs_write_info *wi,</div><div class='ctx'> 				  struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	int len, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(wi-&gt;nr_vecs &lt;= 0);</div><div class='ctx'>  repeat:</div><div class='hunk'>@@ -385,8 +388,8 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'> 			(wi-&gt;nilfs-&gt;ns_blocksize_bits - 9);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len = bio_add_page(wi-&gt;bio, bh-&gt;b_page, bh-&gt;b_size, bh_offset(bh));</div><div class='del'>-	if (len == bh-&gt;b_size) {</div><div class='add'>+	if (bio_add_folio(wi-&gt;bio, bh-&gt;b_folio, bh-&gt;b_size,</div><div class='add'>+			  offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data))) {</div><div class='ctx'> 		wi-&gt;end++;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -403,12 +406,7 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'>  * @segbuf: buffer storing a log to be written</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On Success, 0 is returned. On Error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: Always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'> 			      struct the_nilfs *nilfs)</div><div class='hunk'>@@ -449,10 +447,7 @@ static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,</div><div class='ctx'>  * nilfs_segbuf_wait - wait for completion of requested BIOs</div><div class='ctx'>  * @segbuf: segment buffer</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On Success, 0 is returned. On Error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='add'>+ * Return: 0 on success, or %-EIO if I/O error is detected.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c<br/>index 2590a0860eab..deee16bc9d4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/segment.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/segment.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/segment.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/segment.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ static void nilfs_dispose_list(struct the_nilfs *, struct list_head *, int);</div><div class='ctx'> </div><div class='ctx'> #define nilfs_cnt32_ge(a, b)   \</div><div class='ctx'> 	(typecheck(__u32, a) &amp;&amp; typecheck(__u32, b) &amp;&amp; \</div><div class='del'>-	 ((__s32)(a) - (__s32)(b) &gt;= 0))</div><div class='add'>+	 ((__s32)((a) - (b)) &gt;= 0))</div><div class='ctx'> </div><div class='ctx'> static int nilfs_prepare_segment_lock(struct super_block *sb,</div><div class='ctx'> 				      struct nilfs_transaction_info *ti)</div><div class='hunk'>@@ -191,12 +191,10 @@ static int nilfs_prepare_segment_lock(struct super_block *sb,</div><div class='ctx'>  * When @vacancy_check flag is set, this function will check the amount of</div><div class='ctx'>  * free space, and will wait for the GC to reclaim disk space if low capacity.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No space left on device</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC	- No space left on device (if checking free space).</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_transaction_begin(struct super_block *sb,</div><div class='ctx'> 			    struct nilfs_transaction_info *ti,</div><div class='hunk'>@@ -252,6 +250,8 @@ int nilfs_transaction_begin(struct super_block *sb,</div><div class='ctx'>  * nilfs_transaction_commit() sets a timer to start the segment</div><div class='ctx'>  * constructor.  If a sync flag is set, it starts construction</div><div class='ctx'>  * directly.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_transaction_commit(struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -407,6 +407,8 @@ static void *nilfs_segctor_map_segsum_entry(struct nilfs_sc_info *sci,</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_segctor_reset_segment_buffer - reset the current segment buffer</div><div class='ctx'>  * @sci: nilfs_sc_info</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_segctor_reset_segment_buffer(struct nilfs_sc_info *sci)</div><div class='ctx'> {</div><div class='hunk'>@@ -519,7 +521,7 @@ static void nilfs_segctor_end_finfo(struct nilfs_sc_info *sci,</div><div class='ctx'> </div><div class='ctx'> 	ii = NILFS_I(inode);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(NILFS_I_GCINODE, &amp;ii-&gt;i_state))</div><div class='add'>+	if (ii-&gt;i_type &amp; NILFS_I_TYPE_GC)</div><div class='ctx'> 		cno = ii-&gt;i_cno;</div><div class='ctx'> 	else if (NILFS_ROOT_METADATA_FILE(inode-&gt;i_ino))</div><div class='ctx'> 		cno = 0;</div><div class='hunk'>@@ -734,7 +736,6 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,</div><div class='ctx'> 		if (!head)</div><div class='ctx'> 			head = create_empty_buffers(folio,</div><div class='ctx'> 					i_blocksize(inode), 0);</div><div class='del'>-		folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 		bh = head;</div><div class='ctx'> 		do {</div><div class='hunk'>@@ -744,11 +745,14 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,</div><div class='ctx'> 			list_add_tail(&amp;bh-&gt;b_assoc_buffers, listp);</div><div class='ctx'> 			ndirties++;</div><div class='ctx'> 			if (unlikely(ndirties &gt;= nlimit)) {</div><div class='add'>+				folio_unlock(folio);</div><div class='ctx'> 				folio_batch_release(&amp;fbatch);</div><div class='ctx'> 				cond_resched();</div><div class='ctx'> 				return ndirties;</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (bh = bh-&gt;b_this_page, bh != head);</div><div class='add'>+</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	folio_batch_release(&amp;fbatch);</div><div class='ctx'> 	cond_resched();</div><div class='hunk'>@@ -880,76 +884,6 @@ static void nilfs_segctor_clear_metadata_dirty(struct nilfs_sc_info *sci)</div><div class='ctx'> 	nilfs_mdt_clear_dirty(nilfs-&gt;ns_dat);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_segctor_create_checkpoint(struct nilfs_sc_info *sci)</div><div class='del'>-{</div><div class='del'>-	struct the_nilfs *nilfs = sci-&gt;sc_super-&gt;s_fs_info;</div><div class='del'>-	struct buffer_head *bh_cp;</div><div class='del'>-	struct nilfs_checkpoint *raw_cp;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* XXX: this interface will be changed */</div><div class='del'>-	err = nilfs_cpfile_get_checkpoint(nilfs-&gt;ns_cpfile, nilfs-&gt;ns_cno, 1,</div><div class='del'>-					  &amp;raw_cp, &amp;bh_cp);</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		/*</div><div class='del'>-		 * The following code is duplicated with cpfile.  But, it is</div><div class='del'>-		 * needed to collect the checkpoint even if it was not newly</div><div class='del'>-		 * created.</div><div class='del'>-		 */</div><div class='del'>-		mark_buffer_dirty(bh_cp);</div><div class='del'>-		nilfs_mdt_mark_dirty(nilfs-&gt;ns_cpfile);</div><div class='del'>-		nilfs_cpfile_put_checkpoint(</div><div class='del'>-			nilfs-&gt;ns_cpfile, nilfs-&gt;ns_cno, bh_cp);</div><div class='del'>-	} else if (err == -EINVAL || err == -ENOENT) {</div><div class='del'>-		nilfs_error(sci-&gt;sc_super,</div><div class='del'>-			    "checkpoint creation failed due to metadata corruption.");</div><div class='del'>-		err = -EIO;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nilfs_segctor_fill_in_checkpoint(struct nilfs_sc_info *sci)</div><div class='del'>-{</div><div class='del'>-	struct the_nilfs *nilfs = sci-&gt;sc_super-&gt;s_fs_info;</div><div class='del'>-	struct buffer_head *bh_cp;</div><div class='del'>-	struct nilfs_checkpoint *raw_cp;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nilfs_cpfile_get_checkpoint(nilfs-&gt;ns_cpfile, nilfs-&gt;ns_cno, 0,</div><div class='del'>-					  &amp;raw_cp, &amp;bh_cp);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -EINVAL || err == -ENOENT) {</div><div class='del'>-			nilfs_error(sci-&gt;sc_super,</div><div class='del'>-				    "checkpoint finalization failed due to metadata corruption.");</div><div class='del'>-			err = -EIO;</div><div class='del'>-		}</div><div class='del'>-		goto failed_ibh;</div><div class='del'>-	}</div><div class='del'>-	raw_cp-&gt;cp_snapshot_list.ssl_next = 0;</div><div class='del'>-	raw_cp-&gt;cp_snapshot_list.ssl_prev = 0;</div><div class='del'>-	raw_cp-&gt;cp_inodes_count =</div><div class='del'>-		cpu_to_le64(atomic64_read(&amp;sci-&gt;sc_root-&gt;inodes_count));</div><div class='del'>-	raw_cp-&gt;cp_blocks_count =</div><div class='del'>-		cpu_to_le64(atomic64_read(&amp;sci-&gt;sc_root-&gt;blocks_count));</div><div class='del'>-	raw_cp-&gt;cp_nblk_inc =</div><div class='del'>-		cpu_to_le64(sci-&gt;sc_nblk_inc + sci-&gt;sc_nblk_this_inc);</div><div class='del'>-	raw_cp-&gt;cp_create = cpu_to_le64(sci-&gt;sc_seg_ctime);</div><div class='del'>-	raw_cp-&gt;cp_cno = cpu_to_le64(nilfs-&gt;ns_cno);</div><div class='del'>-</div><div class='del'>-	if (test_bit(NILFS_SC_HAVE_DELTA, &amp;sci-&gt;sc_flags))</div><div class='del'>-		nilfs_checkpoint_clear_minor(raw_cp);</div><div class='del'>-	else</div><div class='del'>-		nilfs_checkpoint_set_minor(raw_cp);</div><div class='del'>-</div><div class='del'>-	nilfs_write_inode_common(sci-&gt;sc_root-&gt;ifile,</div><div class='del'>-				 &amp;raw_cp-&gt;cp_ifile_inode, 1);</div><div class='del'>-	nilfs_cpfile_put_checkpoint(nilfs-&gt;ns_cpfile, nilfs-&gt;ns_cno, bh_cp);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- failed_ibh:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nilfs_fill_in_file_bmap(struct inode *ifile,</div><div class='ctx'> 				    struct nilfs_inode_info *ii)</div><div class='ctx'> </div><div class='hunk'>@@ -963,7 +897,7 @@ static void nilfs_fill_in_file_bmap(struct inode *ifile,</div><div class='ctx'> 		raw_inode = nilfs_ifile_map_inode(ifile, ii-&gt;vfs_inode.i_ino,</div><div class='ctx'> 						  ibh);</div><div class='ctx'> 		nilfs_bmap_write(ii-&gt;i_bmap, raw_inode);</div><div class='del'>-		nilfs_ifile_unmap_inode(ifile, ii-&gt;vfs_inode.i_ino, ibh);</div><div class='add'>+		nilfs_ifile_unmap_inode(raw_inode);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -977,6 +911,33 @@ static void nilfs_segctor_fill_in_file_bmap(struct nilfs_sc_info *sci)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nilfs_write_root_mdt_inode - export root metadata inode information to</div><div class='add'>+ *                              the on-disk inode</div><div class='add'>+ * @inode:     inode object of the root metadata file</div><div class='add'>+ * @raw_inode: on-disk inode</div><div class='add'>+ *</div><div class='add'>+ * nilfs_write_root_mdt_inode() writes inode information and bmap data of</div><div class='add'>+ * @inode to the inode area of the metadata file allocated on the super root</div><div class='add'>+ * block created to finalize the log.  Since super root blocks are configured</div><div class='add'>+ * each time, this function zero-fills the unused area of @raw_inode.</div><div class='add'>+ */</div><div class='add'>+static void nilfs_write_root_mdt_inode(struct inode *inode,</div><div class='add'>+				       struct nilfs_inode *raw_inode)</div><div class='add'>+{</div><div class='add'>+	struct the_nilfs *nilfs = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	nilfs_write_inode_common(inode, raw_inode);</div><div class='add'>+</div><div class='add'>+	/* zero-fill unused portion of raw_inode */</div><div class='add'>+	raw_inode-&gt;i_xattr = 0;</div><div class='add'>+	raw_inode-&gt;i_pad = 0;</div><div class='add'>+	memset((void *)raw_inode + sizeof(*raw_inode), 0,</div><div class='add'>+	       nilfs-&gt;ns_inode_size - sizeof(*raw_inode));</div><div class='add'>+</div><div class='add'>+	nilfs_bmap_write(NILFS_I(inode)-&gt;i_bmap, raw_inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nilfs_segctor_fill_in_super_root(struct nilfs_sc_info *sci,</div><div class='ctx'> 					     struct the_nilfs *nilfs)</div><div class='ctx'> {</div><div class='hunk'>@@ -998,12 +959,13 @@ static void nilfs_segctor_fill_in_super_root(struct nilfs_sc_info *sci,</div><div class='ctx'> 			      nilfs-&gt;ns_nongc_ctime : sci-&gt;sc_seg_ctime);</div><div class='ctx'> 	raw_sr-&gt;sr_flags = 0;</div><div class='ctx'> </div><div class='del'>-	nilfs_write_inode_common(nilfs-&gt;ns_dat, (void *)raw_sr +</div><div class='del'>-				 NILFS_SR_DAT_OFFSET(isz), 1);</div><div class='del'>-	nilfs_write_inode_common(nilfs-&gt;ns_cpfile, (void *)raw_sr +</div><div class='del'>-				 NILFS_SR_CPFILE_OFFSET(isz), 1);</div><div class='del'>-	nilfs_write_inode_common(nilfs-&gt;ns_sufile, (void *)raw_sr +</div><div class='del'>-				 NILFS_SR_SUFILE_OFFSET(isz), 1);</div><div class='add'>+	nilfs_write_root_mdt_inode(nilfs-&gt;ns_dat, (void *)raw_sr +</div><div class='add'>+				   NILFS_SR_DAT_OFFSET(isz));</div><div class='add'>+	nilfs_write_root_mdt_inode(nilfs-&gt;ns_cpfile, (void *)raw_sr +</div><div class='add'>+				   NILFS_SR_CPFILE_OFFSET(isz));</div><div class='add'>+	nilfs_write_root_mdt_inode(nilfs-&gt;ns_sufile, (void *)raw_sr +</div><div class='add'>+				   NILFS_SR_SUFILE_OFFSET(isz));</div><div class='add'>+</div><div class='ctx'> 	memset((void *)raw_sr + srsz, 0, nilfs-&gt;ns_blocksize - srsz);</div><div class='ctx'> 	set_buffer_uptodate(bh_sr);</div><div class='ctx'> 	unlock_buffer(bh_sr);</div><div class='hunk'>@@ -1144,12 +1106,65 @@ static int nilfs_segctor_scan_file_dsync(struct nilfs_sc_info *sci,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nilfs_free_segments - free the segments given by an array of segment numbers</div><div class='add'>+ * @nilfs:   nilfs object</div><div class='add'>+ * @segnumv: array of segment numbers to be freed</div><div class='add'>+ * @nsegs:   number of segments to be freed in @segnumv</div><div class='add'>+ *</div><div class='add'>+ * nilfs_free_segments() wraps nilfs_sufile_freev() and</div><div class='add'>+ * nilfs_sufile_cancel_freev(), and edits the segment usage metadata file</div><div class='add'>+ * (sufile) to free all segments given by @segnumv and @nsegs at once.  If</div><div class='add'>+ * it fails midway, it cancels the changes so that none of the segments are</div><div class='add'>+ * freed.  If @nsegs is 0, this function does nothing.</div><div class='add'>+ *</div><div class='add'>+ * The freeing of segments is not finalized until the writing of a log with</div><div class='add'>+ * a super root block containing this sufile change is complete, and it can</div><div class='add'>+ * be canceled with nilfs_sufile_cancel_freev() until then.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid segment number.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ */</div><div class='add'>+static int nilfs_free_segments(struct the_nilfs *nilfs, __u64 *segnumv,</div><div class='add'>+			       size_t nsegs)</div><div class='add'>+{</div><div class='add'>+	size_t ndone;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!nsegs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = nilfs_sufile_freev(nilfs-&gt;ns_sufile, segnumv, nsegs, &amp;ndone);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		nilfs_sufile_cancel_freev(nilfs-&gt;ns_sufile, segnumv, ndone,</div><div class='add'>+					  NULL);</div><div class='add'>+		/*</div><div class='add'>+		 * If a segment usage of the segments to be freed is in a</div><div class='add'>+		 * hole block, nilfs_sufile_freev() will return -ENOENT.</div><div class='add'>+		 * In this case, -EINVAL should be returned to the caller</div><div class='add'>+		 * since there is something wrong with the given segment</div><div class='add'>+		 * number array.  This error can only occur during GC, so</div><div class='add'>+		 * there is no need to worry about it propagating to other</div><div class='add'>+		 * callers (such as fsync).</div><div class='add'>+		 */</div><div class='add'>+		if (ret == -ENOENT) {</div><div class='add'>+			nilfs_err(nilfs-&gt;ns_sb,</div><div class='add'>+				  "The segment usage entry %llu to be freed is invalid (in a hole)",</div><div class='add'>+				  (unsigned long long)segnumv[ndone]);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int nilfs_segctor_collect_blocks(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct the_nilfs *nilfs = sci-&gt;sc_super-&gt;s_fs_info;</div><div class='ctx'> 	struct list_head *head;</div><div class='ctx'> 	struct nilfs_inode_info *ii;</div><div class='del'>-	size_t ndone;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (nilfs_sc_cstage_get(sci)) {</div><div class='hunk'>@@ -1230,7 +1245,8 @@ static int nilfs_segctor_collect_blocks(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> 			break;</div><div class='ctx'> 		nilfs_sc_cstage_inc(sci);</div><div class='ctx'> 		/* Creating a checkpoint */</div><div class='del'>-		err = nilfs_segctor_create_checkpoint(sci);</div><div class='add'>+		err = nilfs_cpfile_create_checkpoint(nilfs-&gt;ns_cpfile,</div><div class='add'>+						     nilfs-&gt;ns_cno);</div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			break;</div><div class='ctx'> 		fallthrough;</div><div class='hunk'>@@ -1242,14 +1258,10 @@ static int nilfs_segctor_collect_blocks(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> 		nilfs_sc_cstage_inc(sci);</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case NILFS_ST_SUFILE:</div><div class='del'>-		err = nilfs_sufile_freev(nilfs-&gt;ns_sufile, sci-&gt;sc_freesegs,</div><div class='del'>-					 sci-&gt;sc_nfreesegs, &amp;ndone);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			nilfs_sufile_cancel_freev(nilfs-&gt;ns_sufile,</div><div class='del'>-						  sci-&gt;sc_freesegs, ndone,</div><div class='del'>-						  NULL);</div><div class='add'>+		err = nilfs_free_segments(nilfs, sci-&gt;sc_freesegs,</div><div class='add'>+					  sci-&gt;sc_nfreesegs);</div><div class='add'>+		if (unlikely(err))</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		sci-&gt;sc_stage.flags |= NILFS_CF_SUFREED;</div><div class='ctx'> </div><div class='ctx'> 		err = nilfs_segctor_scan_file(sci, nilfs-&gt;ns_sufile,</div><div class='hunk'>@@ -1308,6 +1320,8 @@ static int nilfs_segctor_collect_blocks(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'>  * nilfs_segctor_begin_construction - setup segment buffer to make a new log</div><div class='ctx'>  * @sci: nilfs_sc_info</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_segctor_begin_construction(struct nilfs_sc_info *sci,</div><div class='ctx'> 					    struct the_nilfs *nilfs)</div><div class='hunk'>@@ -1680,53 +1694,80 @@ static void nilfs_begin_folio_io(struct folio *folio)</div><div class='ctx'> 	folio_unlock(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci)</div><div class='add'>+/**</div><div class='add'>+ * nilfs_prepare_write_logs - prepare to write logs</div><div class='add'>+ * @logs: logs to prepare for writing</div><div class='add'>+ * @seed: checksum seed value</div><div class='add'>+ *</div><div class='add'>+ * nilfs_prepare_write_logs() adds checksums and prepares the block</div><div class='add'>+ * buffers/folios for writing logs.  In order to stabilize folios of</div><div class='add'>+ * memory-mapped file blocks by putting them in writeback state before</div><div class='add'>+ * calculating the checksums, first prepare to write payload blocks other</div><div class='add'>+ * than segment summary and super root blocks in which the checksums will</div><div class='add'>+ * be embedded.</div><div class='add'>+ */</div><div class='add'>+static void nilfs_prepare_write_logs(struct list_head *logs, u32 seed)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_segment_buffer *segbuf;</div><div class='ctx'> 	struct folio *bd_folio = NULL, *fs_folio = NULL;</div><div class='add'>+	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(segbuf, &amp;sci-&gt;sc_segbufs, sb_list) {</div><div class='del'>-		struct buffer_head *bh;</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(bh, &amp;segbuf-&gt;sb_segsum_buffers,</div><div class='del'>-				    b_assoc_buffers) {</div><div class='del'>-			if (bh-&gt;b_folio != bd_folio) {</div><div class='del'>-				if (bd_folio) {</div><div class='del'>-					folio_lock(bd_folio);</div><div class='del'>-					folio_clear_dirty_for_io(bd_folio);</div><div class='del'>-					folio_start_writeback(bd_folio);</div><div class='del'>-					folio_unlock(bd_folio);</div><div class='del'>-				}</div><div class='del'>-				bd_folio = bh-&gt;b_folio;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+	/* Prepare to write payload blocks */</div><div class='add'>+	list_for_each_entry(segbuf, logs, sb_list) {</div><div class='ctx'> 		list_for_each_entry(bh, &amp;segbuf-&gt;sb_payload_buffers,</div><div class='ctx'> 				    b_assoc_buffers) {</div><div class='del'>-			set_buffer_async_write(bh);</div><div class='del'>-			if (bh == segbuf-&gt;sb_super_root) {</div><div class='del'>-				if (bh-&gt;b_folio != bd_folio) {</div><div class='del'>-					folio_lock(bd_folio);</div><div class='del'>-					folio_clear_dirty_for_io(bd_folio);</div><div class='del'>-					folio_start_writeback(bd_folio);</div><div class='del'>-					folio_unlock(bd_folio);</div><div class='del'>-					bd_folio = bh-&gt;b_folio;</div><div class='del'>-				}</div><div class='add'>+			if (bh == segbuf-&gt;sb_super_root)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='add'>+			set_buffer_async_write(bh);</div><div class='ctx'> 			if (bh-&gt;b_folio != fs_folio) {</div><div class='ctx'> 				nilfs_begin_folio_io(fs_folio);</div><div class='ctx'> 				fs_folio = bh-&gt;b_folio;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	nilfs_begin_folio_io(fs_folio);</div><div class='add'>+</div><div class='add'>+	nilfs_add_checksums_on_logs(logs, seed);</div><div class='add'>+</div><div class='add'>+	/* Prepare to write segment summary blocks */</div><div class='add'>+	list_for_each_entry(segbuf, logs, sb_list) {</div><div class='add'>+		list_for_each_entry(bh, &amp;segbuf-&gt;sb_segsum_buffers,</div><div class='add'>+				    b_assoc_buffers) {</div><div class='add'>+			mark_buffer_dirty(bh);</div><div class='add'>+			if (bh-&gt;b_folio == bd_folio)</div><div class='add'>+				continue;</div><div class='add'>+			if (bd_folio) {</div><div class='add'>+				folio_lock(bd_folio);</div><div class='add'>+				folio_wait_writeback(bd_folio);</div><div class='add'>+				folio_clear_dirty_for_io(bd_folio);</div><div class='add'>+				folio_start_writeback(bd_folio);</div><div class='add'>+				folio_unlock(bd_folio);</div><div class='add'>+			}</div><div class='add'>+			bd_folio = bh-&gt;b_folio;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare to write super root block */</div><div class='add'>+	bh = NILFS_LAST_SEGBUF(logs)-&gt;sb_super_root;</div><div class='add'>+	if (bh) {</div><div class='add'>+		mark_buffer_dirty(bh);</div><div class='add'>+		if (bh-&gt;b_folio != bd_folio) {</div><div class='add'>+			folio_lock(bd_folio);</div><div class='add'>+			folio_wait_writeback(bd_folio);</div><div class='add'>+			folio_clear_dirty_for_io(bd_folio);</div><div class='add'>+			folio_start_writeback(bd_folio);</div><div class='add'>+			folio_unlock(bd_folio);</div><div class='add'>+			bd_folio = bh-&gt;b_folio;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (bd_folio) {</div><div class='ctx'> 		folio_lock(bd_folio);</div><div class='add'>+		folio_wait_writeback(bd_folio);</div><div class='ctx'> 		folio_clear_dirty_for_io(bd_folio);</div><div class='ctx'> 		folio_start_writeback(bd_folio);</div><div class='ctx'> 		folio_unlock(bd_folio);</div><div class='ctx'> 	}</div><div class='del'>-	nilfs_begin_folio_io(fs_folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nilfs_segctor_write(struct nilfs_sc_info *sci,</div><div class='hunk'>@@ -1766,14 +1807,8 @@ static void nilfs_end_folio_io(struct folio *folio, int err)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!err) {</div><div class='del'>-		if (!nilfs_folio_buffers_clean(folio))</div><div class='del'>-			filemap_dirty_folio(folio-&gt;mapping, folio);</div><div class='del'>-		folio_clear_error(folio);</div><div class='del'>-	} else {</div><div class='add'>+	if (err || !nilfs_folio_buffers_clean(folio))</div><div class='ctx'> 		filemap_dirty_folio(folio-&gt;mapping, folio);</div><div class='del'>-		folio_set_error(folio);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	folio_end_writeback(folio);</div><div class='ctx'> }</div><div class='hunk'>@@ -1800,7 +1835,6 @@ static void nilfs_abort_logs(struct list_head *logs, int err)</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_entry(bh, &amp;segbuf-&gt;sb_payload_buffers,</div><div class='ctx'> 				    b_assoc_buffers) {</div><div class='del'>-			clear_buffer_async_write(bh);</div><div class='ctx'> 			if (bh == segbuf-&gt;sb_super_root) {</div><div class='ctx'> 				clear_buffer_uptodate(bh);</div><div class='ctx'> 				if (bh-&gt;b_folio != bd_folio) {</div><div class='hunk'>@@ -1809,6 +1843,7 @@ static void nilfs_abort_logs(struct list_head *logs, int err)</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			clear_buffer_async_write(bh);</div><div class='ctx'> 			if (bh-&gt;b_folio != fs_folio) {</div><div class='ctx'> 				nilfs_end_folio_io(fs_folio, err);</div><div class='ctx'> 				fs_folio = bh-&gt;b_folio;</div><div class='hunk'>@@ -1832,6 +1867,9 @@ static void nilfs_segctor_abort_construction(struct nilfs_sc_info *sci,</div><div class='ctx'> 	nilfs_abort_logs(&amp;logs, ret ? : err);</div><div class='ctx'> </div><div class='ctx'> 	list_splice_tail_init(&amp;sci-&gt;sc_segbufs, &amp;logs);</div><div class='add'>+	if (list_empty(&amp;logs))</div><div class='add'>+		return; /* if the first segment buffer preparation failed */</div><div class='add'>+</div><div class='ctx'> 	nilfs_cancel_segusage(&amp;logs, nilfs-&gt;ns_sufile);</div><div class='ctx'> 	nilfs_free_incomplete_logs(&amp;logs, nilfs);</div><div class='ctx'> </div><div class='hunk'>@@ -1896,8 +1934,9 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)</div><div class='ctx'> 				 BIT(BH_Delay) | BIT(BH_NILFS_Volatile) |</div><div class='ctx'> 				 BIT(BH_NILFS_Redirected));</div><div class='ctx'> </div><div class='del'>-			set_mask_bits(&amp;bh-&gt;b_state, clear_bits, set_bits);</div><div class='ctx'> 			if (bh == segbuf-&gt;sb_super_root) {</div><div class='add'>+				set_buffer_uptodate(bh);</div><div class='add'>+				clear_buffer_dirty(bh);</div><div class='ctx'> 				if (bh-&gt;b_folio != bd_folio) {</div><div class='ctx'> 					folio_end_writeback(bd_folio);</div><div class='ctx'> 					bd_folio = bh-&gt;b_folio;</div><div class='hunk'>@@ -1905,6 +1944,7 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)</div><div class='ctx'> 				update_sr = true;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			set_mask_bits(&amp;bh-&gt;b_state, clear_bits, set_bits);</div><div class='ctx'> 			if (bh-&gt;b_folio != fs_folio) {</div><div class='ctx'> 				nilfs_end_folio_io(fs_folio, 0);</div><div class='ctx'> 				fs_folio = bh-&gt;b_folio;</div><div class='hunk'>@@ -2074,7 +2114,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> </div><div class='ctx'> 		err = nilfs_segctor_begin_construction(sci, nilfs);</div><div class='ctx'> 		if (unlikely(err))</div><div class='del'>-			goto out;</div><div class='add'>+			goto failed;</div><div class='ctx'> </div><div class='ctx'> 		/* Update time stamp */</div><div class='ctx'> 		sci-&gt;sc_seg_ctime = ktime_get_real_seconds();</div><div class='hunk'>@@ -2099,7 +2139,11 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> </div><div class='ctx'> 		if (mode == SC_LSEG_SR &amp;&amp;</div><div class='ctx'> 		    nilfs_sc_cstage_get(sci) &gt;= NILFS_ST_CPFILE) {</div><div class='del'>-			err = nilfs_segctor_fill_in_checkpoint(sci);</div><div class='add'>+			err = nilfs_cpfile_finalize_checkpoint(</div><div class='add'>+				nilfs-&gt;ns_cpfile, nilfs-&gt;ns_cno, sci-&gt;sc_root,</div><div class='add'>+				sci-&gt;sc_nblk_inc + sci-&gt;sc_nblk_this_inc,</div><div class='add'>+				sci-&gt;sc_seg_ctime,</div><div class='add'>+				!test_bit(NILFS_SC_HAVE_DELTA, &amp;sci-&gt;sc_flags));</div><div class='ctx'> 			if (unlikely(err))</div><div class='ctx'> 				goto failed_to_write;</div><div class='ctx'> </div><div class='hunk'>@@ -2108,10 +2152,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> 		nilfs_segctor_update_segusage(sci, nilfs-&gt;ns_sufile);</div><div class='ctx'> </div><div class='ctx'> 		/* Write partial segments */</div><div class='del'>-		nilfs_segctor_prepare_write(sci);</div><div class='del'>-</div><div class='del'>-		nilfs_add_checksums_on_logs(&amp;sci-&gt;sc_segbufs,</div><div class='del'>-					    nilfs-&gt;ns_crc_seed);</div><div class='add'>+		nilfs_prepare_write_logs(&amp;sci-&gt;sc_segbufs, nilfs-&gt;ns_crc_seed);</div><div class='ctx'> </div><div class='ctx'> 		err = nilfs_segctor_write(sci, nilfs);</div><div class='ctx'> 		if (unlikely(err))</div><div class='hunk'>@@ -2137,10 +2178,9 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'>  failed_to_write:</div><div class='del'>-	if (sci-&gt;sc_stage.flags &amp; NILFS_CF_IFILE_STARTED)</div><div class='del'>-		nilfs_redirty_inodes(&amp;sci-&gt;sc_dirty_files);</div><div class='del'>-</div><div class='ctx'>  failed:</div><div class='add'>+	if (mode == SC_LSEG_SR &amp;&amp; nilfs_sc_cstage_get(sci) &gt;= NILFS_ST_IFILE)</div><div class='add'>+		nilfs_redirty_inodes(&amp;sci-&gt;sc_dirty_files);</div><div class='ctx'> 	if (nilfs_doing_gc())</div><div class='ctx'> 		nilfs_redirty_inodes(&amp;sci-&gt;sc_gc_inodes);</div><div class='ctx'> 	nilfs_segctor_abort_construction(sci, nilfs, err);</div><div class='hunk'>@@ -2159,8 +2199,10 @@ static void nilfs_segctor_start_timer(struct nilfs_sc_info *sci)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	if (!(sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT)) {</div><div class='del'>-		sci-&gt;sc_timer.expires = jiffies + sci-&gt;sc_interval;</div><div class='del'>-		add_timer(&amp;sci-&gt;sc_timer);</div><div class='add'>+		if (sci-&gt;sc_task) {</div><div class='add'>+			sci-&gt;sc_timer.expires = jiffies + sci-&gt;sc_interval;</div><div class='add'>+			add_timer(&amp;sci-&gt;sc_timer);</div><div class='add'>+		}</div><div class='ctx'> 		sci-&gt;sc_state |= NILFS_SEGCTOR_COMMIT;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='hunk'>@@ -2179,22 +2221,6 @@ static void nilfs_segctor_do_flush(struct nilfs_sc_info *sci, int bn)</div><div class='ctx'> 	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * nilfs_flush_segment - trigger a segment construction for resource control</div><div class='del'>- * @sb: super block</div><div class='del'>- * @ino: inode number of the file to be flushed out.</div><div class='del'>- */</div><div class='del'>-void nilfs_flush_segment(struct super_block *sb, ino_t ino)</div><div class='del'>-{</div><div class='del'>-	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='del'>-	struct nilfs_sc_info *sci = nilfs-&gt;ns_writer;</div><div class='del'>-</div><div class='del'>-	if (!sci || nilfs_doing_construction())</div><div class='del'>-		return;</div><div class='del'>-	nilfs_segctor_do_flush(sci, NILFS_MDT_INODE(sb, ino) ? ino : 0);</div><div class='del'>-					/* assign bit 0 to data files */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct nilfs_segctor_wait_request {</div><div class='ctx'> 	wait_queue_entry_t	wq;</div><div class='ctx'> 	__u32		seq;</div><div class='hunk'>@@ -2207,19 +2233,36 @@ static int nilfs_segctor_sync(struct nilfs_sc_info *sci)</div><div class='ctx'> 	struct nilfs_segctor_wait_request wait_req;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	init_wait(&amp;wait_req.wq);</div><div class='ctx'> 	wait_req.err = 0;</div><div class='ctx'> 	atomic_set(&amp;wait_req.done, 0);</div><div class='add'>+	init_waitqueue_entry(&amp;wait_req.wq, current);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To prevent a race issue where completion notifications from the</div><div class='add'>+	 * log writer thread are missed, increment the request sequence count</div><div class='add'>+	 * "sc_seq_request" and insert a wait queue entry using the current</div><div class='add'>+	 * sequence number into the "sc_wait_request" queue at the same time</div><div class='add'>+	 * within the lock section of "sc_state_lock".</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	wait_req.seq = ++sci-&gt;sc_seq_request;</div><div class='add'>+	add_wait_queue(&amp;sci-&gt;sc_wait_request, &amp;wait_req.wq);</div><div class='ctx'> 	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> </div><div class='del'>-	init_waitqueue_entry(&amp;wait_req.wq, current);</div><div class='del'>-	add_wait_queue(&amp;sci-&gt;sc_wait_request, &amp;wait_req.wq);</div><div class='del'>-	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	wake_up(&amp;sci-&gt;sc_wait_daemon);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='add'>+		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Synchronize only while the log writer thread is alive.</div><div class='add'>+		 * Leave flushing out after the log writer thread exits to</div><div class='add'>+		 * the cleanup work in nilfs_segctor_destroy().</div><div class='add'>+		 */</div><div class='add'>+		if (!sci-&gt;sc_task)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		if (atomic_read(&amp;wait_req.done)) {</div><div class='ctx'> 			err = wait_req.err;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2235,7 +2278,7 @@ static int nilfs_segctor_sync(struct nilfs_sc_info *sci)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err)</div><div class='add'>+static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err, bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_segctor_wait_request *wrq, *n;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -2243,7 +2286,7 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err)</div><div class='ctx'> 	spin_lock_irqsave(&amp;sci-&gt;sc_wait_request.lock, flags);</div><div class='ctx'> 	list_for_each_entry_safe(wrq, n, &amp;sci-&gt;sc_wait_request.head, wq.entry) {</div><div class='ctx'> 		if (!atomic_read(&amp;wrq-&gt;done) &amp;&amp;</div><div class='del'>-		    nilfs_cnt32_ge(sci-&gt;sc_seq_done, wrq-&gt;seq)) {</div><div class='add'>+		    (force || nilfs_cnt32_ge(sci-&gt;sc_seq_done, wrq-&gt;seq))) {</div><div class='ctx'> 			wrq-&gt;err = err;</div><div class='ctx'> 			atomic_set(&amp;wrq-&gt;done, 1);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2260,18 +2303,13 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err)</div><div class='ctx'>  * nilfs_construct_segment - construct a logical segment</div><div class='ctx'>  * @sb: super block</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On errors, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EROFS - Read only filesystem.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No space left on device (only in a panic state).</div><div class='del'>- *</div><div class='del'>- * %-ERESTARTSYS - Interrupted.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO		- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM		- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC		- No space left on device (only in a panic state).</div><div class='add'>+ * * %-ERESTARTSYS	- Interrupted.</div><div class='add'>+ * * %-EROFS		- Read only filesystem.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_construct_segment(struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -2295,18 +2333,13 @@ int nilfs_construct_segment(struct super_block *sb)</div><div class='ctx'>  * @start: start byte offset</div><div class='ctx'>  * @end: end byte offset (inclusive)</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On errors, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-EROFS - Read only filesystem.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No space left on device (only in a panic state).</div><div class='del'>- *</div><div class='del'>- * %-ERESTARTSYS - Interrupted.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO		- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM		- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC		- No space left on device (only in a panic state).</div><div class='add'>+ * * %-ERESTARTSYS	- Interrupted.</div><div class='add'>+ * * %-EROFS		- Read only filesystem.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_construct_dsync_segment(struct super_block *sb, struct inode *inode,</div><div class='ctx'> 				  loff_t start, loff_t end)</div><div class='hunk'>@@ -2361,10 +2394,21 @@ int nilfs_construct_dsync_segment(struct super_block *sb, struct inode *inode,</div><div class='ctx'>  */</div><div class='ctx'> static void nilfs_segctor_accept(struct nilfs_sc_info *sci)</div><div class='ctx'> {</div><div class='add'>+	bool thread_is_alive;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	sci-&gt;sc_seq_accepted = sci-&gt;sc_seq_request;</div><div class='add'>+	thread_is_alive = (bool)sci-&gt;sc_task;</div><div class='ctx'> 	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-	del_timer_sync(&amp;sci-&gt;sc_timer);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This function does not race with the log writer thread's</div><div class='add'>+	 * termination.  Therefore, deleting sc_timer, which should not be</div><div class='add'>+	 * done after the log writer thread exits, can be done safely outside</div><div class='add'>+	 * the area protected by sc_state_lock.</div><div class='add'>+	 */</div><div class='add'>+	if (thread_is_alive)</div><div class='add'>+		timer_delete_sync(&amp;sci-&gt;sc_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2381,7 +2425,7 @@ static void nilfs_segctor_notify(struct nilfs_sc_info *sci, int mode, int err)</div><div class='ctx'> 	if (mode == SC_LSEG_SR) {</div><div class='ctx'> 		sci-&gt;sc_state &amp;= ~NILFS_SEGCTOR_COMMIT;</div><div class='ctx'> 		sci-&gt;sc_seq_done = sci-&gt;sc_seq_accepted;</div><div class='del'>-		nilfs_segctor_wakeup(sci, err);</div><div class='add'>+		nilfs_segctor_wakeup(sci, err, false);</div><div class='ctx'> 		sci-&gt;sc_flush_request = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (mode == SC_FLUSH_FILE)</div><div class='hunk'>@@ -2390,7 +2434,7 @@ static void nilfs_segctor_notify(struct nilfs_sc_info *sci, int mode, int err)</div><div class='ctx'> 			sci-&gt;sc_flush_request &amp;= ~FLUSH_DAT_BIT;</div><div class='ctx'> </div><div class='ctx'> 		/* re-enable timer if checkpoint creation was not done */</div><div class='del'>-		if ((sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT) &amp;&amp;</div><div class='add'>+		if ((sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT) &amp;&amp; sci-&gt;sc_task &amp;&amp;</div><div class='ctx'> 		    time_before(jiffies, sci-&gt;sc_timer.expires))</div><div class='ctx'> 			add_timer(&amp;sci-&gt;sc_timer);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2401,6 +2445,8 @@ static void nilfs_segctor_notify(struct nilfs_sc_info *sci, int mode, int err)</div><div class='ctx'>  * nilfs_segctor_construct - form logs and write them to disk</div><div class='ctx'>  * @sci: segment constructor object</div><div class='ctx'>  * @mode: mode of log forming</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_segctor_construct(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -2439,9 +2485,9 @@ static int nilfs_segctor_construct(struct nilfs_sc_info *sci, int mode)</div><div class='ctx'> </div><div class='ctx'> static void nilfs_construction_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_sc_info *sci = from_timer(sci, t, sc_timer);</div><div class='add'>+	struct nilfs_sc_info *sci = timer_container_of(sci, t, sc_timer);</div><div class='ctx'> </div><div class='del'>-	wake_up_process(sci-&gt;sc_timer_task);</div><div class='add'>+	wake_up_process(sci-&gt;sc_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2567,121 +2613,85 @@ static int nilfs_segctor_flush_mode(struct nilfs_sc_info *sci)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_segctor_thread - main loop of the segment constructor thread.</div><div class='add'>+ * nilfs_log_write_required - determine whether log writing is required</div><div class='add'>+ * @sci:   nilfs_sc_info struct</div><div class='add'>+ * @modep: location for storing log writing mode</div><div class='add'>+ *</div><div class='add'>+ * Return: true if log writing is required, false otherwise.  If log writing</div><div class='add'>+ * is required, the mode is stored in the location pointed to by @modep.</div><div class='add'>+ */</div><div class='add'>+static bool nilfs_log_write_required(struct nilfs_sc_info *sci, int *modep)</div><div class='add'>+{</div><div class='add'>+	bool timedout, ret = true;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='add'>+	timedout = ((sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT) &amp;&amp;</div><div class='add'>+		   time_after_eq(jiffies, sci-&gt;sc_timer.expires));</div><div class='add'>+	if (timedout || sci-&gt;sc_seq_request != sci-&gt;sc_seq_done)</div><div class='add'>+		*modep = SC_LSEG_SR;</div><div class='add'>+	else if (sci-&gt;sc_flush_request)</div><div class='add'>+		*modep = nilfs_segctor_flush_mode(sci);</div><div class='add'>+	else</div><div class='add'>+		ret = false;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nilfs_segctor_thread - main loop of the log writer thread</div><div class='ctx'>  * @arg: pointer to a struct nilfs_sc_info.</div><div class='ctx'>  *</div><div class='del'>- * nilfs_segctor_thread() initializes a timer and serves as a daemon</div><div class='del'>- * to execute segment constructions.</div><div class='add'>+ * nilfs_segctor_thread() is the main loop function of the log writer kernel</div><div class='add'>+ * thread, which determines whether log writing is necessary, and if so,</div><div class='add'>+ * performs the log write in the background, or waits if not.  It is also</div><div class='add'>+ * used to decide the background writeback of the superblock.</div><div class='add'>+ *</div><div class='add'>+ * Return: Always 0.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_segctor_thread(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_sc_info *sci = (struct nilfs_sc_info *)arg;</div><div class='ctx'> 	struct the_nilfs *nilfs = sci-&gt;sc_super-&gt;s_fs_info;</div><div class='del'>-	int timeout = 0;</div><div class='ctx'> </div><div class='del'>-	sci-&gt;sc_timer_task = current;</div><div class='del'>-</div><div class='del'>-	/* start sync. */</div><div class='del'>-	sci-&gt;sc_task = current;</div><div class='del'>-	wake_up(&amp;sci-&gt;sc_wait_task); /* for nilfs_segctor_start_thread() */</div><div class='ctx'> 	nilfs_info(sci-&gt;sc_super,</div><div class='ctx'> 		   "segctord starting. Construction interval = %lu seconds, CP frequency &lt; %lu seconds",</div><div class='ctx'> 		   sci-&gt;sc_interval / HZ, sci-&gt;sc_mjcp_freq / HZ);</div><div class='ctx'> </div><div class='ctx'> 	set_freezable();</div><div class='del'>-	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>- loop:</div><div class='del'>-	for (;;) {</div><div class='del'>-		int mode;</div><div class='del'>-</div><div class='del'>-		if (sci-&gt;sc_state &amp; NILFS_SEGCTOR_QUIT)</div><div class='del'>-			goto end_thread;</div><div class='del'>-</div><div class='del'>-		if (timeout || sci-&gt;sc_seq_request != sci-&gt;sc_seq_done)</div><div class='del'>-			mode = SC_LSEG_SR;</div><div class='del'>-		else if (sci-&gt;sc_flush_request)</div><div class='del'>-			mode = nilfs_segctor_flush_mode(sci);</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-		nilfs_segctor_thread_construct(sci, mode);</div><div class='del'>-		spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-		timeout = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> </div><div class='del'>-	if (freezing(current)) {</div><div class='del'>-		spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-		try_to_freeze();</div><div class='del'>-		spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-	} else {</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='ctx'> 		DEFINE_WAIT(wait);</div><div class='del'>-		int should_sleep = 1;</div><div class='add'>+		bool should_write;</div><div class='add'>+		int mode;</div><div class='add'>+</div><div class='add'>+		if (freezing(current)) {</div><div class='add'>+			try_to_freeze();</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		prepare_to_wait(&amp;sci-&gt;sc_wait_daemon, &amp;wait,</div><div class='ctx'> 				TASK_INTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-		if (sci-&gt;sc_seq_request != sci-&gt;sc_seq_done)</div><div class='del'>-			should_sleep = 0;</div><div class='del'>-		else if (sci-&gt;sc_flush_request)</div><div class='del'>-			should_sleep = 0;</div><div class='del'>-		else if (sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT)</div><div class='del'>-			should_sleep = time_before(jiffies,</div><div class='del'>-					sci-&gt;sc_timer.expires);</div><div class='del'>-</div><div class='del'>-		if (should_sleep) {</div><div class='del'>-			spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='add'>+		should_write = nilfs_log_write_required(sci, &amp;mode);</div><div class='add'>+		if (!should_write)</div><div class='ctx'> 			schedule();</div><div class='del'>-			spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-		}</div><div class='ctx'> 		finish_wait(&amp;sci-&gt;sc_wait_daemon, &amp;wait);</div><div class='del'>-		timeout = ((sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT) &amp;&amp;</div><div class='del'>-			   time_after_eq(jiffies, sci-&gt;sc_timer.expires));</div><div class='ctx'> </div><div class='ctx'> 		if (nilfs_sb_dirty(nilfs) &amp;&amp; nilfs_sb_need_update(nilfs))</div><div class='ctx'> 			set_nilfs_discontinued(nilfs);</div><div class='add'>+</div><div class='add'>+		if (should_write)</div><div class='add'>+			nilfs_segctor_thread_construct(sci, mode);</div><div class='ctx'> 	}</div><div class='del'>-	goto loop;</div><div class='ctx'> </div><div class='del'>- end_thread:</div><div class='ctx'> 	/* end sync. */</div><div class='add'>+	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	sci-&gt;sc_task = NULL;</div><div class='del'>-	wake_up(&amp;sci-&gt;sc_wait_task); /* for nilfs_segctor_kill_thread() */</div><div class='add'>+	timer_shutdown_sync(&amp;sci-&gt;sc_timer);</div><div class='ctx'> 	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_segctor_start_thread(struct nilfs_sc_info *sci)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *t;</div><div class='del'>-</div><div class='del'>-	t = kthread_run(nilfs_segctor_thread, sci, "segctord");</div><div class='del'>-	if (IS_ERR(t)) {</div><div class='del'>-		int err = PTR_ERR(t);</div><div class='del'>-</div><div class='del'>-		nilfs_err(sci-&gt;sc_super, "error %d creating segctord thread",</div><div class='del'>-			  err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	wait_event(sci-&gt;sc_wait_task, sci-&gt;sc_task != NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nilfs_segctor_kill_thread(struct nilfs_sc_info *sci)</div><div class='del'>-	__acquires(&amp;sci-&gt;sc_state_lock)</div><div class='del'>-	__releases(&amp;sci-&gt;sc_state_lock)</div><div class='del'>-{</div><div class='del'>-	sci-&gt;sc_state |= NILFS_SEGCTOR_QUIT;</div><div class='del'>-</div><div class='del'>-	while (sci-&gt;sc_task) {</div><div class='del'>-		wake_up(&amp;sci-&gt;sc_wait_daemon);</div><div class='del'>-		spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-		wait_event(sci-&gt;sc_wait_task, sci-&gt;sc_task == NULL);</div><div class='del'>-		spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Setup &amp; clean-up functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -2702,7 +2712,6 @@ static struct nilfs_sc_info *nilfs_segctor_new(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;sci-&gt;sc_wait_request);</div><div class='ctx'> 	init_waitqueue_head(&amp;sci-&gt;sc_wait_daemon);</div><div class='del'>-	init_waitqueue_head(&amp;sci-&gt;sc_wait_task);</div><div class='ctx'> 	spin_lock_init(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sci-&gt;sc_dirty_files);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sci-&gt;sc_segbufs);</div><div class='hunk'>@@ -2710,7 +2719,6 @@ static struct nilfs_sc_info *nilfs_segctor_new(struct super_block *sb,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sci-&gt;sc_gc_inodes);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sci-&gt;sc_iput_queue);</div><div class='ctx'> 	INIT_WORK(&amp;sci-&gt;sc_iput_work, nilfs_iput_work_func);</div><div class='del'>-	timer_setup(&amp;sci-&gt;sc_timer, nilfs_construction_timeout, 0);</div><div class='ctx'> </div><div class='ctx'> 	sci-&gt;sc_interval = HZ * NILFS_SC_DEFAULT_TIMEOUT;</div><div class='ctx'> 	sci-&gt;sc_mjcp_freq = HZ * NILFS_SC_DEFAULT_SR_FREQ;</div><div class='hunk'>@@ -2758,12 +2766,28 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;nilfs-&gt;ns_segctor_sem);</div><div class='ctx'> </div><div class='add'>+	if (sci-&gt;sc_task) {</div><div class='add'>+		wake_up(&amp;sci-&gt;sc_wait_daemon);</div><div class='add'>+		if (kthread_stop(sci-&gt;sc_task)) {</div><div class='add'>+			spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='add'>+			sci-&gt;sc_task = NULL;</div><div class='add'>+			timer_shutdown_sync(&amp;sci-&gt;sc_timer);</div><div class='add'>+			spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;sci-&gt;sc_state_lock);</div><div class='del'>-	nilfs_segctor_kill_thread(sci);</div><div class='ctx'> 	flag = ((sci-&gt;sc_state &amp; NILFS_SEGCTOR_COMMIT) || sci-&gt;sc_flush_request</div><div class='ctx'> 		|| sci-&gt;sc_seq_request != sci-&gt;sc_seq_done);</div><div class='ctx'> 	spin_unlock(&amp;sci-&gt;sc_state_lock);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Forcibly wake up tasks waiting in nilfs_segctor_sync(), which can</div><div class='add'>+	 * be called from delayed iput() via nilfs_evict_inode() and can race</div><div class='add'>+	 * with the above log writer thread termination.</div><div class='add'>+	 */</div><div class='add'>+	nilfs_segctor_wakeup(sci, 0, true);</div><div class='add'>+</div><div class='ctx'> 	if (flush_work(&amp;sci-&gt;sc_iput_work))</div><div class='ctx'> 		flag = true;</div><div class='ctx'> </div><div class='hunk'>@@ -2789,7 +2813,6 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;nilfs-&gt;ns_segctor_sem);</div><div class='ctx'> </div><div class='del'>-	timer_shutdown_sync(&amp;sci-&gt;sc_timer);</div><div class='ctx'> 	kfree(sci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2801,14 +2824,16 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)</div><div class='ctx'>  * This allocates a log writer object, initializes it, and starts the</div><div class='ctx'>  * log writer.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error code is returned.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINTR	- Log writer thread creation failed due to interruption.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_attach_log_writer(struct super_block *sb, struct nilfs_root *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='add'>+	struct nilfs_sc_info *sci;</div><div class='add'>+	struct task_struct *t;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (nilfs-&gt;ns_writer) {</div><div class='hunk'>@@ -2821,17 +2846,23 @@ int nilfs_attach_log_writer(struct super_block *sb, struct nilfs_root *root)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nilfs-&gt;ns_writer = nilfs_segctor_new(sb, root);</div><div class='del'>-	if (!nilfs-&gt;ns_writer)</div><div class='add'>+	sci = nilfs_segctor_new(sb, root);</div><div class='add'>+	if (unlikely(!sci))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	inode_attach_wb(nilfs-&gt;ns_bdev-&gt;bd_inode, NULL);</div><div class='del'>-</div><div class='del'>-	err = nilfs_segctor_start_thread(nilfs-&gt;ns_writer);</div><div class='del'>-	if (unlikely(err))</div><div class='add'>+	nilfs-&gt;ns_writer = sci;</div><div class='add'>+	t = kthread_create(nilfs_segctor_thread, sci, "segctord");</div><div class='add'>+	if (IS_ERR(t)) {</div><div class='add'>+		err = PTR_ERR(t);</div><div class='add'>+		nilfs_err(sb, "error %d creating segctord thread", err);</div><div class='ctx'> 		nilfs_detach_log_writer(sb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	sci-&gt;sc_task = t;</div><div class='add'>+	timer_setup(&amp;sci-&gt;sc_timer, nilfs_construction_timeout, 0);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	wake_up_process(sci-&gt;sc_task);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h<br/>index 1060f72ebf5a..4b39ed43ae72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/segment.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/segment.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/segment.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/segment.h</a></div><div class='hunk'>@@ -22,10 +22,10 @@ struct nilfs_root;</div><div class='ctx'>  * struct nilfs_recovery_info - Recovery information</div><div class='ctx'>  * @ri_need_recovery: Recovery status</div><div class='ctx'>  * @ri_super_root: Block number of the last super root</div><div class='del'>- * @ri_ri_cno: Number of the last checkpoint</div><div class='add'>+ * @ri_cno: Number of the last checkpoint</div><div class='ctx'>  * @ri_lsegs_start: Region for roll-forwarding (start block number)</div><div class='ctx'>  * @ri_lsegs_end: Region for roll-forwarding (end block number)</div><div class='del'>- * @ri_lseg_start_seq: Sequence value of the segment at ri_lsegs_start</div><div class='add'>+ * @ri_lsegs_start_seq: Sequence value of the segment at ri_lsegs_start</div><div class='ctx'>  * @ri_used_segments: List of segments to be mark active</div><div class='ctx'>  * @ri_pseg_start: Block number of the last partial segment</div><div class='ctx'>  * @ri_seq: Sequence number on the last partial segment</div><div class='hunk'>@@ -105,9 +105,8 @@ struct nilfs_segsum_pointer {</div><div class='ctx'>  * @sc_flush_request: inode bitmap of metadata files to be flushed</div><div class='ctx'>  * @sc_wait_request: Client request queue</div><div class='ctx'>  * @sc_wait_daemon: Daemon wait queue</div><div class='del'>- * @sc_wait_task: Start/end wait queue to control segctord task</div><div class='ctx'>  * @sc_seq_request: Request counter</div><div class='del'>- * @sc_seq_accept: Accepted request count</div><div class='add'>+ * @sc_seq_accepted: Accepted request count</div><div class='ctx'>  * @sc_seq_done: Completion counter</div><div class='ctx'>  * @sc_sync: Request of explicit sync operation</div><div class='ctx'>  * @sc_interval: Timeout value of background construction</div><div class='hunk'>@@ -158,7 +157,6 @@ struct nilfs_sc_info {</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t	sc_wait_request;</div><div class='ctx'> 	wait_queue_head_t	sc_wait_daemon;</div><div class='del'>-	wait_queue_head_t	sc_wait_task;</div><div class='ctx'> </div><div class='ctx'> 	__u32			sc_seq_request;</div><div class='ctx'> 	__u32			sc_seq_accepted;</div><div class='hunk'>@@ -171,7 +169,6 @@ struct nilfs_sc_info {</div><div class='ctx'> 	unsigned long		sc_watermark;</div><div class='ctx'> </div><div class='ctx'> 	struct timer_list	sc_timer;</div><div class='del'>-	struct task_struct     *sc_timer_task;</div><div class='ctx'> 	struct task_struct     *sc_task;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +189,6 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* sc_state */</div><div class='del'>-#define NILFS_SEGCTOR_QUIT	    0x0001  /* segctord is being destroyed */</div><div class='ctx'> #define NILFS_SEGCTOR_COMMIT	    0x0004  /* committed transaction exists */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -230,7 +226,6 @@ extern void nilfs_relax_pressure_in_lock(struct super_block *);</div><div class='ctx'> extern int nilfs_construct_segment(struct super_block *);</div><div class='ctx'> extern int nilfs_construct_dsync_segment(struct super_block *, struct inode *,</div><div class='ctx'> 					 loff_t, loff_t);</div><div class='del'>-extern void nilfs_flush_segment(struct super_block *, ino_t);</div><div class='ctx'> extern int nilfs_clean_segments(struct super_block *, struct nilfs_argv *,</div><div class='ctx'> 				void **);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c<br/>index 0a8119456c21..83f93337c01b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sufile.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sufile.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sufile.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/sufile.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ nilfs_sufile_get_blkoff(const struct inode *sufile, __u64 segnum)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 t = segnum + NILFS_MDT(sufile)-&gt;mi_first_entry_offset;</div><div class='ctx'> </div><div class='del'>-	do_div(t, nilfs_sufile_segment_usages_per_block(sufile));</div><div class='add'>+	t = div64_ul(t, nilfs_sufile_segment_usages_per_block(sufile));</div><div class='ctx'> 	return (unsigned long)t;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,19 +70,35 @@ nilfs_sufile_segment_usages_in_block(const struct inode *sufile, __u64 curr,</div><div class='ctx'> 		     max - curr + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct nilfs_segment_usage *</div><div class='del'>-nilfs_sufile_block_get_segment_usage(const struct inode *sufile, __u64 segnum,</div><div class='del'>-				     struct buffer_head *bh, void *kaddr)</div><div class='add'>+/**</div><div class='add'>+ * nilfs_sufile_segment_usage_offset - calculate the byte offset of a segment</div><div class='add'>+ *                                     usage entry in the folio containing it</div><div class='add'>+ * @sufile: segment usage file inode</div><div class='add'>+ * @segnum: number of segment usage</div><div class='add'>+ * @bh:     buffer head of block containing segment usage indexed by @segnum</div><div class='add'>+ *</div><div class='add'>+ * Return: Byte offset in the folio of the segment usage entry.</div><div class='add'>+ */</div><div class='add'>+static size_t nilfs_sufile_segment_usage_offset(const struct inode *sufile,</div><div class='add'>+						__u64 segnum,</div><div class='add'>+						struct buffer_head *bh)</div><div class='ctx'> {</div><div class='del'>-	return kaddr + bh_offset(bh) +</div><div class='add'>+	return offset_in_folio(bh-&gt;b_folio, bh-&gt;b_data) +</div><div class='ctx'> 		nilfs_sufile_get_offset(sufile, segnum) *</div><div class='ctx'> 		NILFS_MDT(sufile)-&gt;mi_entry_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nilfs_sufile_get_header_block(struct inode *sufile,</div><div class='del'>-						struct buffer_head **bhp)</div><div class='add'>+static int nilfs_sufile_get_header_block(struct inode *sufile,</div><div class='add'>+					 struct buffer_head **bhp)</div><div class='ctx'> {</div><div class='del'>-	return nilfs_mdt_get_block(sufile, 0, 0, NULL, bhp);</div><div class='add'>+	int err = nilfs_mdt_get_block(sufile, 0, 0, NULL, bhp);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err == -ENOENT)) {</div><div class='add'>+		nilfs_error(sufile-&gt;i_sb,</div><div class='add'>+			    "missing header block in segment usage metadata");</div><div class='add'>+		err = -EIO;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -105,13 +121,11 @@ static void nilfs_sufile_mod_counter(struct buffer_head *header_bh,</div><div class='ctx'> 				     u64 ncleanadd, u64 ndirtyadd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_sufile_header *header;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = kaddr + bh_offset(header_bh);</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	le64_add_cpu(&amp;header-&gt;sh_ncleansegs, ncleanadd);</div><div class='ctx'> 	le64_add_cpu(&amp;header-&gt;sh_ndirtysegs, ndirtyadd);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(header_bh);</div><div class='ctx'> }</div><div class='hunk'>@@ -119,6 +133,8 @@ static void nilfs_sufile_mod_counter(struct buffer_head *header_bh,</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_sufile_get_ncleansegs - return the number of clean segments</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of clean segments.</div><div class='ctx'>  */</div><div class='ctx'> unsigned long nilfs_sufile_get_ncleansegs(struct inode *sufile)</div><div class='ctx'> {</div><div class='hunk'>@@ -141,17 +157,13 @@ unsigned long nilfs_sufile_get_ncleansegs(struct inode *sufile)</div><div class='ctx'>  * of successfully modified segments from the head is stored in the</div><div class='ctx'>  * place @ndone points to.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, zero is returned.  On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOENT - Given segment usage is in hole block (may be returned if</div><div class='del'>- *            @create is zero)</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid segment usage number</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid segment usage number</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOENT	- Given segment usage is in hole block (may be returned if</div><div class='add'>+ *		  @create is zero)</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_updatev(struct inode *sufile, __u64 *segnumv, size_t nsegs,</div><div class='ctx'> 			 int create, size_t *ndone,</div><div class='hunk'>@@ -258,10 +270,7 @@ int nilfs_sufile_update(struct inode *sufile, __u64 segnum, int create,</div><div class='ctx'>  * @start: minimum segment number of allocatable region (inclusive)</div><div class='ctx'>  * @end: maximum segment number of allocatable region (inclusive)</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned.  On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-ERANGE - invalid segment region</div><div class='add'>+ * Return: 0 on success, or %-ERANGE if segment range is invalid.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_set_alloc_range(struct inode *sufile, __u64 start, __u64 end)</div><div class='ctx'> {</div><div class='hunk'>@@ -286,17 +295,14 @@ int nilfs_sufile_set_alloc_range(struct inode *sufile, __u64 start, __u64 end)</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @segnump: pointer to segment number</div><div class='ctx'>  *</div><div class='del'>- * Description: nilfs_sufile_alloc() allocates a clean segment.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and the segment number of the</div><div class='del'>- * allocated segment is stored in the place pointed by @segnump. On error, one</div><div class='del'>- * of the following negative error codes is returned.</div><div class='add'>+ * Description: nilfs_sufile_alloc() allocates a clean segment, and stores</div><div class='add'>+ * its segment number in the place pointed to by @segnump.</div><div class='ctx'>  *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - No clean segment left.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC	- No clean segment left.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)</div><div class='ctx'> {</div><div class='hunk'>@@ -306,6 +312,7 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)</div><div class='ctx'> 	struct nilfs_sufile_info *sui = NILFS_SUI(sufile);</div><div class='ctx'> 	size_t susz = NILFS_MDT(sufile)-&gt;mi_entry_size;</div><div class='ctx'> 	__u64 segnum, maxsegnum, last_alloc;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	unsigned long nsegments, nsus, cnt;</div><div class='ctx'> 	int ret, j;</div><div class='hunk'>@@ -315,10 +322,9 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)</div><div class='ctx'> 	ret = nilfs_sufile_get_header_block(sufile, &amp;header_bh);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sem;</div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = kaddr + bh_offset(header_bh);</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	last_alloc = le64_to_cpu(header-&gt;sh_last_alloc);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> </div><div class='ctx'> 	nsegments = nilfs_sufile_get_nsegments(sufile);</div><div class='ctx'> 	maxsegnum = sui-&gt;allocmax;</div><div class='hunk'>@@ -352,9 +358,10 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)</div><div class='ctx'> 							   &amp;su_bh);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_header;</div><div class='del'>-		kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-		su = nilfs_sufile_block_get_segment_usage(</div><div class='del'>-			sufile, segnum, su_bh, kaddr);</div><div class='add'>+</div><div class='add'>+		offset = nilfs_sufile_segment_usage_offset(sufile, segnum,</div><div class='add'>+							   su_bh);</div><div class='add'>+		su = kaddr = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> </div><div class='ctx'> 		nsus = nilfs_sufile_segment_usages_in_block(</div><div class='ctx'> 			sufile, segnum, maxsegnum);</div><div class='hunk'>@@ -363,14 +370,13 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			/* found a clean segment */</div><div class='ctx'> 			nilfs_segment_usage_set_dirty(su);</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='add'>+			kunmap_local(kaddr);</div><div class='ctx'> </div><div class='del'>-			kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-			header = kaddr + bh_offset(header_bh);</div><div class='add'>+			header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 			le64_add_cpu(&amp;header-&gt;sh_ncleansegs, -1);</div><div class='ctx'> 			le64_add_cpu(&amp;header-&gt;sh_ndirtysegs, 1);</div><div class='ctx'> 			header-&gt;sh_last_alloc = cpu_to_le64(segnum);</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='add'>+			kunmap_local(header);</div><div class='ctx'> </div><div class='ctx'> 			sui-&gt;ncleansegs--;</div><div class='ctx'> 			mark_buffer_dirty(header_bh);</div><div class='hunk'>@@ -384,7 +390,7 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)</div><div class='ctx'> 			goto out_header;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='ctx'> 		brelse(su_bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -404,18 +410,18 @@ void nilfs_sufile_do_cancel_free(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 				 struct buffer_head *su_bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-	su = nilfs_sufile_block_get_segment_usage(sufile, segnum, su_bh, kaddr);</div><div class='add'>+	offset = nilfs_sufile_segment_usage_offset(sufile, segnum, su_bh);</div><div class='add'>+	su = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (unlikely(!nilfs_segment_usage_clean(su))) {</div><div class='ctx'> 		nilfs_warn(sufile-&gt;i_sb, "%s: segment %llu must be clean",</div><div class='ctx'> 			   __func__, (unsigned long long)segnum);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	nilfs_segment_usage_set_dirty(su);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(su);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_sufile_mod_counter(header_bh, -1, 1);</div><div class='ctx'> 	NILFS_SUI(sufile)-&gt;ncleansegs--;</div><div class='hunk'>@@ -429,14 +435,14 @@ void nilfs_sufile_do_scrap(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 			   struct buffer_head *su_bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int clean, dirty;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-	su = nilfs_sufile_block_get_segment_usage(sufile, segnum, su_bh, kaddr);</div><div class='add'>+	offset = nilfs_sufile_segment_usage_offset(sufile, segnum, su_bh);</div><div class='add'>+	su = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (su-&gt;su_flags == cpu_to_le32(BIT(NILFS_SEGMENT_USAGE_DIRTY)) &amp;&amp;</div><div class='ctx'> 	    su-&gt;su_nblocks == cpu_to_le32(0)) {</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	clean = nilfs_segment_usage_clean(su);</div><div class='hunk'>@@ -446,7 +452,7 @@ void nilfs_sufile_do_scrap(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 	su-&gt;su_lastmod = cpu_to_le64(0);</div><div class='ctx'> 	su-&gt;su_nblocks = cpu_to_le32(0);</div><div class='ctx'> 	su-&gt;su_flags = cpu_to_le32(BIT(NILFS_SEGMENT_USAGE_DIRTY));</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(su);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_sufile_mod_counter(header_bh, clean ? (u64)-1 : 0, dirty ? 0 : 1);</div><div class='ctx'> 	NILFS_SUI(sufile)-&gt;ncleansegs -= clean;</div><div class='hunk'>@@ -460,15 +466,15 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 			  struct buffer_head *su_bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int sudirty;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-	su = nilfs_sufile_block_get_segment_usage(sufile, segnum, su_bh, kaddr);</div><div class='add'>+	offset = nilfs_sufile_segment_usage_offset(sufile, segnum, su_bh);</div><div class='add'>+	su = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (nilfs_segment_usage_clean(su)) {</div><div class='ctx'> 		nilfs_warn(sufile-&gt;i_sb, "%s: segment %llu is already clean",</div><div class='ctx'> 			   __func__, (unsigned long long)segnum);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(nilfs_segment_usage_error(su)))</div><div class='hunk'>@@ -481,7 +487,7 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 			   (unsigned long long)segnum);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_segment_usage_set_clean(su);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(su);</div><div class='ctx'> 	mark_buffer_dirty(su_bh);</div><div class='ctx'> </div><div class='ctx'> 	nilfs_sufile_mod_counter(header_bh, 1, sudirty ? (u64)-1 : 0);</div><div class='hunk'>@@ -496,25 +502,34 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum,</div><div class='ctx'>  * nilfs_sufile_mark_dirty - mark the buffer having a segment usage dirty</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @segnum: segment number</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_mark_dirty(struct inode *sufile, __u64 segnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;NILFS_MDT(sufile)-&gt;mi_sem);</div><div class='ctx'> 	ret = nilfs_sufile_get_segment_usage_block(sufile, segnum, 0, &amp;bh);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		if (ret == -ENOENT) {</div><div class='add'>+			nilfs_error(sufile-&gt;i_sb,</div><div class='add'>+				    "segment usage for segment %llu is unreadable due to a hole block",</div><div class='add'>+				    (unsigned long long)segnum);</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		}</div><div class='ctx'> 		goto out_sem;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-	su = nilfs_sufile_block_get_segment_usage(sufile, segnum, bh, kaddr);</div><div class='add'>+	offset = nilfs_sufile_segment_usage_offset(sufile, segnum, bh);</div><div class='add'>+	su = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (unlikely(nilfs_segment_usage_error(su))) {</div><div class='ctx'> 		struct the_nilfs *nilfs = sufile-&gt;i_sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> 		brelse(bh);</div><div class='ctx'> 		if (nilfs_segment_is_active(nilfs, segnum)) {</div><div class='ctx'> 			nilfs_error(sufile-&gt;i_sb,</div><div class='hunk'>@@ -532,7 +547,7 @@ int nilfs_sufile_mark_dirty(struct inode *sufile, __u64 segnum)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		nilfs_segment_usage_set_dirty(su);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='ctx'> 		nilfs_mdt_mark_dirty(sufile);</div><div class='ctx'> 		brelse(bh);</div><div class='hunk'>@@ -548,13 +563,15 @@ out_sem:</div><div class='ctx'>  * @segnum: segment number</div><div class='ctx'>  * @nblocks: number of live blocks in the segment</div><div class='ctx'>  * @modtime: modification time (option)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_set_segment_usage(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 				   unsigned long nblocks, time64_t modtime)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;NILFS_MDT(sufile)-&gt;mi_sem);</div><div class='hunk'>@@ -562,8 +579,8 @@ int nilfs_sufile_set_segment_usage(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sem;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-	su = nilfs_sufile_block_get_segment_usage(sufile, segnum, bh, kaddr);</div><div class='add'>+	offset = nilfs_sufile_segment_usage_offset(sufile, segnum, bh);</div><div class='add'>+	su = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (modtime) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check segusage error and set su_lastmod only when updating</div><div class='hunk'>@@ -573,7 +590,7 @@ int nilfs_sufile_set_segment_usage(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 		su-&gt;su_lastmod = cpu_to_le64(modtime);</div><div class='ctx'> 	}</div><div class='ctx'> 	su-&gt;su_nblocks = cpu_to_le32(nblocks);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(su);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(bh);</div><div class='ctx'> 	nilfs_mdt_mark_dirty(sufile);</div><div class='hunk'>@@ -589,23 +606,19 @@ int nilfs_sufile_set_segment_usage(struct inode *sufile, __u64 segnum,</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @sustat: pointer to a structure of segment usage statistics</div><div class='ctx'>  *</div><div class='del'>- * Description: nilfs_sufile_get_stat() returns information about segment</div><div class='del'>- * usage.</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned, and segment usage information is</div><div class='del'>- * stored in the place pointed by @sustat. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='add'>+ * Description: nilfs_sufile_get_stat() retrieves segment usage statistics</div><div class='add'>+ * and stores them in the location pointed to by @sustat.</div><div class='ctx'>  *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_get_stat(struct inode *sufile, struct nilfs_sustat *sustat)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *header_bh;</div><div class='ctx'> 	struct nilfs_sufile_header *header;</div><div class='ctx'> 	struct the_nilfs *nilfs = sufile-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;NILFS_MDT(sufile)-&gt;mi_sem);</div><div class='hunk'>@@ -614,8 +627,7 @@ int nilfs_sufile_get_stat(struct inode *sufile, struct nilfs_sustat *sustat)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sem;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = kaddr + bh_offset(header_bh);</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	sustat-&gt;ss_nsegs = nilfs_sufile_get_nsegments(sufile);</div><div class='ctx'> 	sustat-&gt;ss_ncleansegs = le64_to_cpu(header-&gt;sh_ncleansegs);</div><div class='ctx'> 	sustat-&gt;ss_ndirtysegs = le64_to_cpu(header-&gt;sh_ndirtysegs);</div><div class='hunk'>@@ -624,7 +636,7 @@ int nilfs_sufile_get_stat(struct inode *sufile, struct nilfs_sustat *sustat)</div><div class='ctx'> 	spin_lock(&amp;nilfs-&gt;ns_last_segment_lock);</div><div class='ctx'> 	sustat-&gt;ss_prot_seq = nilfs-&gt;ns_prot_seq;</div><div class='ctx'> 	spin_unlock(&amp;nilfs-&gt;ns_last_segment_lock);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> 	brelse(header_bh);</div><div class='ctx'> </div><div class='ctx'>  out_sem:</div><div class='hunk'>@@ -637,18 +649,18 @@ void nilfs_sufile_do_set_error(struct inode *sufile, __u64 segnum,</div><div class='ctx'> 			       struct buffer_head *su_bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	int suclean;</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-	su = nilfs_sufile_block_get_segment_usage(sufile, segnum, su_bh, kaddr);</div><div class='add'>+	offset = nilfs_sufile_segment_usage_offset(sufile, segnum, su_bh);</div><div class='add'>+	su = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 	if (nilfs_segment_usage_error(su)) {</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	suclean = nilfs_segment_usage_clean(su);</div><div class='ctx'> 	nilfs_segment_usage_set_error(su);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(su);</div><div class='ctx'> </div><div class='ctx'> 	if (suclean) {</div><div class='ctx'> 		nilfs_sufile_mod_counter(header_bh, -1, 0);</div><div class='hunk'>@@ -664,16 +676,12 @@ void nilfs_sufile_do_set_error(struct inode *sufile, __u64 segnum,</div><div class='ctx'>  * @start: start segment number (inclusive)</div><div class='ctx'>  * @end: end segment number (inclusive)</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned.  On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid number of segments specified</div><div class='del'>- *</div><div class='del'>- * %-EBUSY - Dirty or active segments are present in the range</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EBUSY	- Dirty or active segments are present in the range.</div><div class='add'>+ * * %-EINVAL	- Invalid number of segments specified.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_sufile_truncate_range(struct inode *sufile,</div><div class='ctx'> 				       __u64 start, __u64 end)</div><div class='hunk'>@@ -686,7 +694,7 @@ static int nilfs_sufile_truncate_range(struct inode *sufile,</div><div class='ctx'> 	unsigned long segusages_per_block;</div><div class='ctx'> 	unsigned long nsegs, ncleaned;</div><div class='ctx'> 	__u64 segnum;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	ssize_t n, nc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int j;</div><div class='hunk'>@@ -717,16 +725,16 @@ static int nilfs_sufile_truncate_range(struct inode *sufile,</div><div class='ctx'> 			/* hole */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-		su = nilfs_sufile_block_get_segment_usage(</div><div class='del'>-			sufile, segnum, su_bh, kaddr);</div><div class='add'>+		offset = nilfs_sufile_segment_usage_offset(sufile, segnum,</div><div class='add'>+							   su_bh);</div><div class='add'>+		su = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 		su2 = su;</div><div class='ctx'> 		for (j = 0; j &lt; n; j++, su = (void *)su + susz) {</div><div class='ctx'> 			if ((le32_to_cpu(su-&gt;su_flags) &amp;</div><div class='ctx'> 			     ~BIT(NILFS_SEGMENT_USAGE_ERROR)) ||</div><div class='ctx'> 			    nilfs_segment_is_active(nilfs, segnum + j)) {</div><div class='ctx'> 				ret = -EBUSY;</div><div class='del'>-				kunmap_atomic(kaddr);</div><div class='add'>+				kunmap_local(su2);</div><div class='ctx'> 				brelse(su_bh);</div><div class='ctx'> 				goto out_header;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -738,7 +746,7 @@ static int nilfs_sufile_truncate_range(struct inode *sufile,</div><div class='ctx'> 				nc++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su2);</div><div class='ctx'> 		if (nc &gt; 0) {</div><div class='ctx'> 			mark_buffer_dirty(su_bh);</div><div class='ctx'> 			ncleaned += nc;</div><div class='hunk'>@@ -768,16 +776,12 @@ out:</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @newnsegs: new number of segments</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned.  On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-ENOSPC - Enough free space is not left for shrinking</div><div class='del'>- *</div><div class='del'>- * %-EBUSY - Dirty or active segments exist in the region to be truncated</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EBUSY	- Dirty or active segments exist in the region to be truncated.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-ENOSPC	- Enough free space is not left for shrinking.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_resize(struct inode *sufile, __u64 newnsegs)</div><div class='ctx'> {</div><div class='hunk'>@@ -785,7 +789,6 @@ int nilfs_sufile_resize(struct inode *sufile, __u64 newnsegs)</div><div class='ctx'> 	struct buffer_head *header_bh;</div><div class='ctx'> 	struct nilfs_sufile_header *header;</div><div class='ctx'> 	struct nilfs_sufile_info *sui = NILFS_SUI(sufile);</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	unsigned long nsegs, nrsvsegs;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -823,10 +826,9 @@ int nilfs_sufile_resize(struct inode *sufile, __u64 newnsegs)</div><div class='ctx'> 		sui-&gt;allocmin = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = kaddr + bh_offset(header_bh);</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	header-&gt;sh_ncleansegs = cpu_to_le64(sui-&gt;ncleansegs);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> </div><div class='ctx'> 	mark_buffer_dirty(header_bh);</div><div class='ctx'> 	nilfs_mdt_mark_dirty(sufile);</div><div class='hunk'>@@ -840,21 +842,17 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nilfs_sufile_get_suinfo -</div><div class='add'>+ * nilfs_sufile_get_suinfo - get segment usage information</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @segnum: segment number to start looking</div><div class='del'>- * @buf: array of suinfo</div><div class='del'>- * @sisz: byte size of suinfo</div><div class='del'>- * @nsi: size of suinfo array</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *</div><div class='del'>- * Return Value: On success, 0 is returned and .... On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='add'>+ * @buf:    array of suinfo</div><div class='add'>+ * @sisz:   byte size of suinfo</div><div class='add'>+ * @nsi:    size of suinfo array</div><div class='ctx'>  *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='add'>+ * Return: Count of segment usage info items stored in the output buffer on</div><div class='add'>+ * success, or one of the following negative error codes on failure:</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, void *buf,</div><div class='ctx'> 				unsigned int sisz, size_t nsi)</div><div class='hunk'>@@ -864,6 +862,7 @@ ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, void *buf,</div><div class='ctx'> 	struct nilfs_suinfo *si = buf;</div><div class='ctx'> 	size_t susz = NILFS_MDT(sufile)-&gt;mi_entry_size;</div><div class='ctx'> 	struct the_nilfs *nilfs = sufile-&gt;i_sb-&gt;s_fs_info;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	unsigned long nsegs, segusages_per_block;</div><div class='ctx'> 	ssize_t n;</div><div class='hunk'>@@ -891,9 +890,9 @@ ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, void *buf,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-		su = nilfs_sufile_block_get_segment_usage(</div><div class='del'>-			sufile, segnum, su_bh, kaddr);</div><div class='add'>+		offset = nilfs_sufile_segment_usage_offset(sufile, segnum,</div><div class='add'>+							   su_bh);</div><div class='add'>+		su = kaddr = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 		for (j = 0; j &lt; n;</div><div class='ctx'> 		     j++, su = (void *)su + susz, si = (void *)si + sisz) {</div><div class='ctx'> 			si-&gt;sui_lastmod = le64_to_cpu(su-&gt;su_lastmod);</div><div class='hunk'>@@ -904,7 +903,7 @@ ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, void *buf,</div><div class='ctx'> 				si-&gt;sui_flags |=</div><div class='ctx'> 					BIT(NILFS_SEGMENT_USAGE_ACTIVE);</div><div class='ctx'> 		}</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='ctx'> 		brelse(su_bh);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = nsegs;</div><div class='hunk'>@@ -925,14 +924,11 @@ ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, void *buf,</div><div class='ctx'>  * segment usage accordingly. Only the fields indicated by the sup_flags</div><div class='ctx'>  * are updated.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the</div><div class='del'>- * following negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid values in input (segment number, flags or nblocks)</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid values in input (segment number, flags or nblocks).</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> ssize_t nilfs_sufile_set_suinfo(struct inode *sufile, void *buf,</div><div class='ctx'> 				unsigned int supsz, size_t nsup)</div><div class='hunk'>@@ -941,7 +937,7 @@ ssize_t nilfs_sufile_set_suinfo(struct inode *sufile, void *buf,</div><div class='ctx'> 	struct buffer_head *header_bh, *bh;</div><div class='ctx'> 	struct nilfs_suinfo_update *sup, *supend = buf + supsz * nsup;</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='del'>-	void *kaddr;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	unsigned long blkoff, prev_blkoff;</div><div class='ctx'> 	int cleansi, cleansu, dirtysi, dirtysu;</div><div class='ctx'> 	long ncleaned = 0, ndirtied = 0;</div><div class='hunk'>@@ -973,9 +969,9 @@ ssize_t nilfs_sufile_set_suinfo(struct inode *sufile, void *buf,</div><div class='ctx'> 		goto out_header;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		kaddr = kmap_atomic(bh-&gt;b_page);</div><div class='del'>-		su = nilfs_sufile_block_get_segment_usage(</div><div class='del'>-			sufile, sup-&gt;sup_segnum, bh, kaddr);</div><div class='add'>+		offset = nilfs_sufile_segment_usage_offset(</div><div class='add'>+			sufile, sup-&gt;sup_segnum, bh);</div><div class='add'>+		su = kmap_local_folio(bh-&gt;b_folio, offset);</div><div class='ctx'> </div><div class='ctx'> 		if (nilfs_suinfo_update_lastmod(sup))</div><div class='ctx'> 			su-&gt;su_lastmod = cpu_to_le64(sup-&gt;sup_sui.sui_lastmod);</div><div class='hunk'>@@ -1010,7 +1006,7 @@ ssize_t nilfs_sufile_set_suinfo(struct inode *sufile, void *buf,</div><div class='ctx'> 			su-&gt;su_flags = cpu_to_le32(sup-&gt;sup_sui.sui_flags);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(su);</div><div class='ctx'> </div><div class='ctx'> 		sup = (void *)sup + supsz;</div><div class='ctx'> 		if (sup &gt;= supend)</div><div class='hunk'>@@ -1059,13 +1055,14 @@ ssize_t nilfs_sufile_set_suinfo(struct inode *sufile, void *buf,</div><div class='ctx'>  * and start+len is rounded down. For each clean segment blkdev_issue_discard</div><div class='ctx'>  * function is invoked.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned or negative error code, otherwise.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_trim_fs(struct inode *sufile, struct fstrim_range *range)</div><div class='ctx'> {</div><div class='ctx'> 	struct the_nilfs *nilfs = sufile-&gt;i_sb-&gt;s_fs_info;</div><div class='ctx'> 	struct buffer_head *su_bh;</div><div class='ctx'> 	struct nilfs_segment_usage *su;</div><div class='add'>+	size_t offset;</div><div class='ctx'> 	void *kaddr;</div><div class='ctx'> 	size_t n, i, susz = NILFS_MDT(sufile)-&gt;mi_entry_size;</div><div class='ctx'> 	sector_t seg_start, seg_end, start_block, end_block;</div><div class='hunk'>@@ -1115,9 +1112,9 @@ int nilfs_sufile_trim_fs(struct inode *sufile, struct fstrim_range *range)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-		su = nilfs_sufile_block_get_segment_usage(sufile, segnum,</div><div class='del'>-				su_bh, kaddr);</div><div class='add'>+		offset = nilfs_sufile_segment_usage_offset(sufile, segnum,</div><div class='add'>+							   su_bh);</div><div class='add'>+		su = kaddr = kmap_local_folio(su_bh-&gt;b_folio, offset);</div><div class='ctx'> 		for (i = 0; i &lt; n; ++i, ++segnum, su = (void *)su + susz) {</div><div class='ctx'> 			if (!nilfs_segment_usage_clean(su))</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1145,7 +1142,7 @@ int nilfs_sufile_trim_fs(struct inode *sufile, struct fstrim_range *range)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (nblocks &gt;= minlen) {</div><div class='del'>-				kunmap_atomic(kaddr);</div><div class='add'>+				kunmap_local(kaddr);</div><div class='ctx'> </div><div class='ctx'> 				ret = blkdev_issue_discard(nilfs-&gt;ns_bdev,</div><div class='ctx'> 						start * sects_per_block,</div><div class='hunk'>@@ -1157,16 +1154,17 @@ int nilfs_sufile_trim_fs(struct inode *sufile, struct fstrim_range *range)</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				ndiscarded += nblocks;</div><div class='del'>-				kaddr = kmap_atomic(su_bh-&gt;b_page);</div><div class='del'>-				su = nilfs_sufile_block_get_segment_usage(</div><div class='del'>-					sufile, segnum, su_bh, kaddr);</div><div class='add'>+				offset = nilfs_sufile_segment_usage_offset(</div><div class='add'>+					sufile, segnum, su_bh);</div><div class='add'>+				su = kaddr = kmap_local_folio(su_bh-&gt;b_folio,</div><div class='add'>+							      offset);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* start new extent */</div><div class='ctx'> 			start = seg_start;</div><div class='ctx'> 			nblocks = seg_end - seg_start + 1;</div><div class='ctx'> 		}</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		kunmap_local(kaddr);</div><div class='ctx'> 		put_bh(su_bh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1203,6 +1201,8 @@ out_sem:</div><div class='ctx'>  * @susize: size of a segment usage entry</div><div class='ctx'>  * @raw_inode: on-disk sufile inode</div><div class='ctx'>  * @inodep: buffer to store the inode</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_sufile_read(struct super_block *sb, size_t susize,</div><div class='ctx'> 		      struct nilfs_inode *raw_inode, struct inode **inodep)</div><div class='hunk'>@@ -1211,7 +1211,6 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,</div><div class='ctx'> 	struct nilfs_sufile_info *sui;</div><div class='ctx'> 	struct buffer_head *header_bh;</div><div class='ctx'> 	struct nilfs_sufile_header *header;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (susize &gt; sb-&gt;s_blocksize) {</div><div class='hunk'>@@ -1227,7 +1226,7 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,</div><div class='ctx'> 	sufile = nilfs_iget_locked(sb, NULL, NILFS_SUFILE_INO);</div><div class='ctx'> 	if (unlikely(!sufile))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!(sufile-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(sufile) &amp; I_NEW))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = nilfs_mdt_init(sufile, NILFS_MDT_GFP, sizeof(*sui));</div><div class='hunk'>@@ -1241,15 +1240,20 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='del'>-	err = nilfs_sufile_get_header_block(sufile, &amp;header_bh);</div><div class='del'>-	if (err)</div><div class='add'>+	err = nilfs_mdt_get_block(sufile, 0, 0, NULL, &amp;header_bh);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		if (err == -ENOENT) {</div><div class='add'>+			nilfs_err(sb,</div><div class='add'>+				  "missing header block in segment usage metadata");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		goto failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sui = NILFS_SUI(sufile);</div><div class='del'>-	kaddr = kmap_atomic(header_bh-&gt;b_page);</div><div class='del'>-	header = kaddr + bh_offset(header_bh);</div><div class='add'>+	header = kmap_local_folio(header_bh-&gt;b_folio, 0);</div><div class='ctx'> 	sui-&gt;ncleansegs = le64_to_cpu(header-&gt;sh_ncleansegs);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(header);</div><div class='ctx'> 	brelse(header_bh);</div><div class='ctx'> </div><div class='ctx'> 	sui-&gt;allocmax = nilfs_sufile_get_nsegments(sufile) - 1;</div><div class='head'>diff --git a/fs/nilfs2/sufile.h b/fs/nilfs2/sufile.h<br/>index 8e8a1a5a0402..cd6f28ab3521 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sufile.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sufile.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sufile.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/sufile.h</a></div><div class='hunk'>@@ -58,6 +58,8 @@ int nilfs_sufile_trim_fs(struct inode *sufile, struct fstrim_range *range);</div><div class='ctx'>  * nilfs_sufile_scrap - make a segment garbage</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @segnum: segment number to be freed</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static inline int nilfs_sufile_scrap(struct inode *sufile, __u64 segnum)</div><div class='ctx'> {</div><div class='hunk'>@@ -68,6 +70,8 @@ static inline int nilfs_sufile_scrap(struct inode *sufile, __u64 segnum)</div><div class='ctx'>  * nilfs_sufile_free - free segment</div><div class='ctx'>  * @sufile: inode of segment usage file</div><div class='ctx'>  * @segnum: segment number to be freed</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static inline int nilfs_sufile_free(struct inode *sufile, __u64 segnum)</div><div class='ctx'> {</div><div class='hunk'>@@ -80,6 +84,8 @@ static inline int nilfs_sufile_free(struct inode *sufile, __u64 segnum)</div><div class='ctx'>  * @segnumv: array of segment numbers</div><div class='ctx'>  * @nsegs: size of @segnumv array</div><div class='ctx'>  * @ndone: place to store the number of freed segments</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static inline int nilfs_sufile_freev(struct inode *sufile, __u64 *segnumv,</div><div class='ctx'> 				     size_t nsegs, size_t *ndone)</div><div class='hunk'>@@ -95,8 +101,7 @@ static inline int nilfs_sufile_freev(struct inode *sufile, __u64 *segnumv,</div><div class='ctx'>  * @nsegs: size of @segnumv array</div><div class='ctx'>  * @ndone: place to store the number of cancelled segments</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, a negative error codes</div><div class='del'>- * is returned.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static inline int nilfs_sufile_cancel_freev(struct inode *sufile,</div><div class='ctx'> 					    __u64 *segnumv, size_t nsegs,</div><div class='hunk'>@@ -114,14 +119,11 @@ static inline int nilfs_sufile_cancel_freev(struct inode *sufile,</div><div class='ctx'>  * Description: nilfs_sufile_set_error() marks the segment specified by</div><div class='ctx'>  * @segnum as erroneous. The error segment will never be used again.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, one of the following</div><div class='del'>- * negative error codes is returned.</div><div class='del'>- *</div><div class='del'>- * %-EIO - I/O error.</div><div class='del'>- *</div><div class='del'>- * %-ENOMEM - Insufficient amount of memory available.</div><div class='del'>- *</div><div class='del'>- * %-EINVAL - Invalid segment usage number.</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- Invalid segment usage number.</div><div class='add'>+ * * %-EIO	- I/O error (including metadata corruption).</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='ctx'>  */</div><div class='ctx'> static inline int nilfs_sufile_set_error(struct inode *sufile, __u64 segnum)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c<br/>index df8674173b22..badc2cbc895e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/super.c</a></div><div class='hunk'>@@ -29,13 +29,13 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include "nilfs.h"</div><div class='ctx'> #include "export.h"</div><div class='ctx'> #include "mdt.h"</div><div class='hunk'>@@ -61,7 +61,6 @@ struct kmem_cache *nilfs_segbuf_cachep;</div><div class='ctx'> struct kmem_cache *nilfs_btree_path_cache;</div><div class='ctx'> </div><div class='ctx'> static int nilfs_setup_super(struct super_block *sb, int is_mount);</div><div class='del'>-static int nilfs_remount(struct super_block *sb, int *flags, char *data);</div><div class='ctx'> </div><div class='ctx'> void __nilfs_msg(struct super_block *sb, const char *fmt, ...)</div><div class='ctx'> {</div><div class='hunk'>@@ -106,6 +105,10 @@ static void nilfs_set_error(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __nilfs_error() - report failure condition on a filesystem</div><div class='add'>+ * @sb:       super block instance</div><div class='add'>+ * @function: name of calling function</div><div class='add'>+ * @fmt:      format string for message to be output</div><div class='add'>+ * @...:      optional arguments to @fmt</div><div class='ctx'>  *</div><div class='ctx'>  * __nilfs_error() sets an ERROR_FS flag on the superblock as well as</div><div class='ctx'>  * reporting an error message.  This function should be called when</div><div class='hunk'>@@ -157,6 +160,7 @@ struct inode *nilfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	ii-&gt;i_bh = NULL;</div><div class='ctx'> 	ii-&gt;i_state = 0;</div><div class='add'>+	ii-&gt;i_type = 0;</div><div class='ctx'> 	ii-&gt;i_cno = 0;</div><div class='ctx'> 	ii-&gt;i_assoc_inode = NULL;</div><div class='ctx'> 	ii-&gt;i_bmap = &amp;ii-&gt;i_bmap_data;</div><div class='hunk'>@@ -305,6 +309,8 @@ int nilfs_commit_super(struct super_block *sb, int flag)</div><div class='ctx'>  * This function restores state flags in the on-disk super block.</div><div class='ctx'>  * This will set "clean" flag (i.e. NILFS_VALID_FS) unless the</div><div class='ctx'>  * filesystem was not clean previously.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, %-EIO if I/O error or superblock is corrupted.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_cleanup_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -335,6 +341,8 @@ int nilfs_cleanup_super(struct super_block *sb)</div><div class='ctx'>  * nilfs_move_2nd_super - relocate secondary super block</div><div class='ctx'>  * @sb: super block instance</div><div class='ctx'>  * @sb2off: new offset of the secondary super block (in bytes)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_move_2nd_super(struct super_block *sb, loff_t sb2off)</div><div class='ctx'> {</div><div class='hunk'>@@ -416,6 +424,8 @@ out:</div><div class='ctx'>  * nilfs_resize_fs - resize the filesystem</div><div class='ctx'>  * @sb: super block instance</div><div class='ctx'>  * @newsize: new size of the filesystem (in bytes)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int nilfs_resize_fs(struct super_block *sb, __u64 newsize)</div><div class='ctx'> {</div><div class='hunk'>@@ -448,7 +458,7 @@ int nilfs_resize_fs(struct super_block *sb, __u64 newsize)</div><div class='ctx'> </div><div class='ctx'> 	sb2off = NILFS_SB2_OFFSET_BYTES(newsize);</div><div class='ctx'> 	newnsegs = sb2off &gt;&gt; nilfs-&gt;ns_blocksize_bits;</div><div class='del'>-	do_div(newnsegs, nilfs-&gt;ns_blocks_per_segment);</div><div class='add'>+	newnsegs = div64_ul(newnsegs, nilfs-&gt;ns_blocks_per_segment);</div><div class='ctx'> </div><div class='ctx'> 	ret = nilfs_sufile_resize(nilfs-&gt;ns_sufile, newnsegs);</div><div class='ctx'> 	up_write(&amp;nilfs-&gt;ns_segctor_sem);</div><div class='hunk'>@@ -544,8 +554,6 @@ int nilfs_attach_checkpoint(struct super_block *sb, __u64 cno, int curr_mnt,</div><div class='ctx'> {</div><div class='ctx'> 	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct nilfs_root *root;</div><div class='del'>-	struct nilfs_checkpoint *raw_cp;</div><div class='del'>-	struct buffer_head *bh_cp;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	root = nilfs_find_or_create_root(</div><div class='hunk'>@@ -557,38 +565,19 @@ int nilfs_attach_checkpoint(struct super_block *sb, __u64 cno, int curr_mnt,</div><div class='ctx'> 		goto reuse; /* already attached checkpoint */</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;nilfs-&gt;ns_segctor_sem);</div><div class='del'>-	err = nilfs_cpfile_get_checkpoint(nilfs-&gt;ns_cpfile, cno, 0, &amp;raw_cp,</div><div class='del'>-					  &amp;bh_cp);</div><div class='add'>+	err = nilfs_ifile_read(sb, root, cno, nilfs-&gt;ns_inode_size);</div><div class='ctx'> 	up_read(&amp;nilfs-&gt;ns_segctor_sem);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT || err == -EINVAL) {</div><div class='del'>-			nilfs_err(sb,</div><div class='del'>-				  "Invalid checkpoint (checkpoint number=%llu)",</div><div class='del'>-				  (unsigned long long)cno);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	if (unlikely(err))</div><div class='ctx'> 		goto failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = nilfs_ifile_read(sb, root, nilfs-&gt;ns_inode_size,</div><div class='del'>-			       &amp;raw_cp-&gt;cp_ifile_inode, &amp;root-&gt;ifile);</div><div class='del'>-	if (err)</div><div class='del'>-		goto failed_bh;</div><div class='del'>-</div><div class='del'>-	atomic64_set(&amp;root-&gt;inodes_count,</div><div class='del'>-			le64_to_cpu(raw_cp-&gt;cp_inodes_count));</div><div class='del'>-	atomic64_set(&amp;root-&gt;blocks_count,</div><div class='del'>-			le64_to_cpu(raw_cp-&gt;cp_blocks_count));</div><div class='del'>-</div><div class='del'>-	nilfs_cpfile_put_checkpoint(nilfs-&gt;ns_cpfile, cno, bh_cp);</div><div class='ctx'> </div><div class='ctx'>  reuse:</div><div class='ctx'> 	*rootp = root;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- failed_bh:</div><div class='del'>-	nilfs_cpfile_put_checkpoint(nilfs-&gt;ns_cpfile, cno, bh_cp);</div><div class='ctx'>  failed:</div><div class='add'>+	if (err == -EINVAL)</div><div class='add'>+		nilfs_err(sb, "Invalid checkpoint (checkpoint number=%llu)",</div><div class='add'>+			  (unsigned long long)cno);</div><div class='ctx'> 	nilfs_put_root(root);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -723,105 +712,98 @@ static const struct super_operations nilfs_sops = {</div><div class='ctx'> 	.freeze_fs	= nilfs_freeze,</div><div class='ctx'> 	.unfreeze_fs	= nilfs_unfreeze,</div><div class='ctx'> 	.statfs         = nilfs_statfs,</div><div class='del'>-	.remount_fs     = nilfs_remount,</div><div class='ctx'> 	.show_options = nilfs_show_options</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_err_cont, Opt_err_panic, Opt_err_ro,</div><div class='del'>-	Opt_barrier, Opt_nobarrier, Opt_snapshot, Opt_order, Opt_norecovery,</div><div class='del'>-	Opt_discard, Opt_nodiscard, Opt_err,</div><div class='add'>+	Opt_err, Opt_barrier, Opt_snapshot, Opt_order, Opt_norecovery,</div><div class='add'>+	Opt_discard,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static match_table_t tokens = {</div><div class='del'>-	{Opt_err_cont, "errors=continue"},</div><div class='del'>-	{Opt_err_panic, "errors=panic"},</div><div class='del'>-	{Opt_err_ro, "errors=remount-ro"},</div><div class='del'>-	{Opt_barrier, "barrier"},</div><div class='del'>-	{Opt_nobarrier, "nobarrier"},</div><div class='del'>-	{Opt_snapshot, "cp=%u"},</div><div class='del'>-	{Opt_order, "order=%s"},</div><div class='del'>-	{Opt_norecovery, "norecovery"},</div><div class='del'>-	{Opt_discard, "discard"},</div><div class='del'>-	{Opt_nodiscard, "nodiscard"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table nilfs_param_err[] = {</div><div class='add'>+	{"continue",	NILFS_MOUNT_ERRORS_CONT},</div><div class='add'>+	{"panic",	NILFS_MOUNT_ERRORS_PANIC},</div><div class='add'>+	{"remount-ro",	NILFS_MOUNT_ERRORS_RO},</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(char *options, struct super_block *sb, int is_remount)</div><div class='del'>-{</div><div class='del'>-	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='add'>+static const struct fs_parameter_spec nilfs_param_spec[] = {</div><div class='add'>+	fsparam_enum	("errors", Opt_err, nilfs_param_err),</div><div class='add'>+	fsparam_flag_no	("barrier", Opt_barrier),</div><div class='add'>+	fsparam_u64	("cp", Opt_snapshot),</div><div class='add'>+	fsparam_string	("order", Opt_order),</div><div class='add'>+	fsparam_flag	("norecovery", Opt_norecovery),</div><div class='add'>+	fsparam_flag_no	("discard", Opt_discard),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='add'>+struct nilfs_fs_context {</div><div class='add'>+	unsigned long ns_mount_opt;</div><div class='add'>+	__u64 cno;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_barrier:</div><div class='del'>-			nilfs_set_opt(nilfs, BARRIER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nobarrier:</div><div class='add'>+static int nilfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct nilfs_fs_context *nilfs = fc-&gt;fs_private;</div><div class='add'>+	int is_remount = fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, nilfs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_barrier:</div><div class='add'>+		if (result.negated)</div><div class='ctx'> 			nilfs_clear_opt(nilfs, BARRIER);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_order:</div><div class='del'>-			if (strcmp(args[0].from, "relaxed") == 0)</div><div class='del'>-				/* Ordered data semantics */</div><div class='del'>-				nilfs_clear_opt(nilfs, STRICT_ORDER);</div><div class='del'>-			else if (strcmp(args[0].from, "strict") == 0)</div><div class='del'>-				/* Strict in-order semantics */</div><div class='del'>-				nilfs_set_opt(nilfs, STRICT_ORDER);</div><div class='del'>-			else</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_panic:</div><div class='del'>-			nilfs_write_opt(nilfs, ERROR_MODE, ERRORS_PANIC);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_ro:</div><div class='del'>-			nilfs_write_opt(nilfs, ERROR_MODE, ERRORS_RO);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_cont:</div><div class='del'>-			nilfs_write_opt(nilfs, ERROR_MODE, ERRORS_CONT);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_snapshot:</div><div class='del'>-			if (is_remount) {</div><div class='del'>-				nilfs_err(sb,</div><div class='del'>-					  "\"%s\" option is invalid for remount",</div><div class='del'>-					  p);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case Opt_norecovery:</div><div class='del'>-			nilfs_set_opt(nilfs, NORECOVERY);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_discard:</div><div class='del'>-			nilfs_set_opt(nilfs, DISCARD);</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nodiscard:</div><div class='del'>-			nilfs_clear_opt(nilfs, DISCARD);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			nilfs_err(sb, "unrecognized mount option \"%s\"", p);</div><div class='del'>-			return 0;</div><div class='add'>+		else</div><div class='add'>+			nilfs_set_opt(nilfs, BARRIER);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_order:</div><div class='add'>+		if (strcmp(param-&gt;string, "relaxed") == 0)</div><div class='add'>+			/* Ordered data semantics */</div><div class='add'>+			nilfs_clear_opt(nilfs, STRICT_ORDER);</div><div class='add'>+		else if (strcmp(param-&gt;string, "strict") == 0)</div><div class='add'>+			/* Strict in-order semantics */</div><div class='add'>+			nilfs_set_opt(nilfs, STRICT_ORDER);</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_err:</div><div class='add'>+		nilfs-&gt;ns_mount_opt &amp;= ~NILFS_MOUNT_ERROR_MODE;</div><div class='add'>+		nilfs-&gt;ns_mount_opt |= result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_snapshot:</div><div class='add'>+		if (is_remount) {</div><div class='add'>+			struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+</div><div class='add'>+			nilfs_err(sb,</div><div class='add'>+				  "\"%s\" option is invalid for remount",</div><div class='add'>+				  param-&gt;key);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+		if (result.uint_64 == 0) {</div><div class='add'>+			nilfs_err(NULL,</div><div class='add'>+				  "invalid option \"cp=0\": invalid checkpoint number 0");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		nilfs-&gt;cno = result.uint_64;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_norecovery:</div><div class='add'>+		nilfs_set_opt(nilfs, NORECOVERY);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_discard:</div><div class='add'>+		if (result.negated)</div><div class='add'>+			nilfs_clear_opt(nilfs, DISCARD);</div><div class='add'>+		else</div><div class='add'>+			nilfs_set_opt(nilfs, DISCARD);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-nilfs_set_default_options(struct super_block *sb,</div><div class='del'>-			  struct nilfs_super_block *sbp)</div><div class='del'>-{</div><div class='del'>-	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	nilfs-&gt;ns_mount_opt =</div><div class='del'>-		NILFS_MOUNT_ERRORS_RO | NILFS_MOUNT_BARRIER;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nilfs_setup_super(struct super_block *sb, int is_mount)</div><div class='hunk'>@@ -878,9 +860,8 @@ struct nilfs_super_block *nilfs_read_super_block(struct super_block *sb,</div><div class='ctx'> 	return (struct nilfs_super_block *)((char *)(*pbh)-&gt;b_data + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nilfs_store_magic_and_option(struct super_block *sb,</div><div class='del'>-				 struct nilfs_super_block *sbp,</div><div class='del'>-				 char *data)</div><div class='add'>+int nilfs_store_magic(struct super_block *sb,</div><div class='add'>+		      struct nilfs_super_block *sbp)</div><div class='ctx'> {</div><div class='ctx'> 	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='hunk'>@@ -891,14 +872,12 @@ int nilfs_store_magic_and_option(struct super_block *sb,</div><div class='ctx'> 	sb-&gt;s_flags |= SB_NOATIME;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	nilfs_set_default_options(sb, sbp);</div><div class='del'>-</div><div class='ctx'> 	nilfs-&gt;ns_resuid = le16_to_cpu(sbp-&gt;s_def_resuid);</div><div class='ctx'> 	nilfs-&gt;ns_resgid = le16_to_cpu(sbp-&gt;s_def_resgid);</div><div class='ctx'> 	nilfs-&gt;ns_interval = le32_to_cpu(sbp-&gt;s_c_interval);</div><div class='ctx'> 	nilfs-&gt;ns_watermark = le32_to_cpu(sbp-&gt;s_c_block_max);</div><div class='ctx'> </div><div class='del'>-	return !parse_options(data, sb, 0) ? -EINVAL : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int nilfs_check_feature_compatibility(struct super_block *sb,</div><div class='hunk'>@@ -1014,7 +993,7 @@ static int nilfs_attach_snapshot(struct super_block *s, __u64 cno,</div><div class='ctx'>  * nilfs_tree_is_busy() - try to shrink dentries of a checkpoint</div><div class='ctx'>  * @root_dentry: root dentry of the tree to be shrunk</div><div class='ctx'>  *</div><div class='del'>- * This function returns true if the tree was in-use.</div><div class='add'>+ * Return: true if the tree was in-use, false otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static bool nilfs_tree_is_busy(struct dentry *root_dentry)</div><div class='ctx'> {</div><div class='hunk'>@@ -1056,17 +1035,19 @@ int nilfs_checkpoint_is_mounted(struct super_block *sb, __u64 cno)</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_fill_super() - initialize a super block instance</div><div class='ctx'>  * @sb: super_block</div><div class='del'>- * @data: mount options</div><div class='del'>- * @silent: silent mode flag</div><div class='add'>+ * @fc: filesystem context</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called exclusively by nilfs-&gt;ns_mount_mutex.</div><div class='ctx'>  * So, the recovery process is protected from other simultaneous mounts.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-nilfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+nilfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct the_nilfs *nilfs;</div><div class='ctx'> 	struct nilfs_root *fsroot;</div><div class='add'>+	struct nilfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	__u64 cno;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1076,10 +1057,13 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_fs_info = nilfs;</div><div class='ctx'> </div><div class='del'>-	err = init_nilfs(nilfs, sb, (char *)data);</div><div class='add'>+	err = init_nilfs(nilfs, sb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_nilfs;</div><div class='ctx'> </div><div class='add'>+	/* Copy in parsed mount options */</div><div class='add'>+	nilfs-&gt;ns_mount_opt = ctx-&gt;ns_mount_opt;</div><div class='add'>+</div><div class='ctx'> 	sb-&gt;s_op = &amp;nilfs_sops;</div><div class='ctx'> 	sb-&gt;s_export_op = &amp;nilfs_export_ops;</div><div class='ctx'> 	sb-&gt;s_root = NULL;</div><div class='hunk'>@@ -1092,6 +1076,10 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_nilfs;</div><div class='ctx'> </div><div class='add'>+	super_set_uuid(sb, nilfs-&gt;ns_sbp[0]-&gt;s_uuid,</div><div class='add'>+		       sizeof(nilfs-&gt;ns_sbp[0]-&gt;s_uuid));</div><div class='add'>+	super_set_sysfs_name_bdev(sb);</div><div class='add'>+</div><div class='ctx'> 	cno = nilfs_last_cno(nilfs);</div><div class='ctx'> 	err = nilfs_attach_checkpoint(sb, cno, true, &amp;fsroot);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1138,34 +1126,25 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nilfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int nilfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct nilfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct the_nilfs *nilfs = sb-&gt;s_fs_info;</div><div class='del'>-	unsigned long old_sb_flags;</div><div class='del'>-	unsigned long old_mount_opt;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	old_sb_flags = sb-&gt;s_flags;</div><div class='del'>-	old_mount_opt = nilfs-&gt;ns_mount_opt;</div><div class='del'>-</div><div class='del'>-	if (!parse_options(data, sb, 1)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto restore_opts;</div><div class='del'>-	}</div><div class='del'>-	sb-&gt;s_flags = (sb-&gt;s_flags &amp; ~SB_POSIXACL);</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!nilfs_valid_fs(nilfs)) {</div><div class='ctx'> 		nilfs_warn(sb,</div><div class='ctx'> 			   "couldn't remount because the filesystem is in an incomplete recovery state");</div><div class='del'>-		goto restore_opts;</div><div class='add'>+		goto ignore_opts;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='add'>+	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) == sb_rdonly(sb))</div><div class='ctx'> 		goto out;</div><div class='del'>-	if (*flags &amp; SB_RDONLY) {</div><div class='add'>+	if (fc-&gt;sb_flags &amp; SB_RDONLY) {</div><div class='ctx'> 		sb-&gt;s_flags |= SB_RDONLY;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1193,138 +1172,67 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 				   "couldn't remount RDWR because of unsupported optional features (%llx)",</div><div class='ctx'> 				   (unsigned long long)features);</div><div class='ctx'> 			err = -EROFS;</div><div class='del'>-			goto restore_opts;</div><div class='add'>+			goto ignore_opts;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sb-&gt;s_flags &amp;= ~SB_RDONLY;</div><div class='ctx'> </div><div class='ctx'> 		root = NILFS_I(d_inode(sb-&gt;s_root))-&gt;i_root;</div><div class='ctx'> 		err = nilfs_attach_log_writer(sb, root);</div><div class='del'>-		if (err)</div><div class='del'>-			goto restore_opts;</div><div class='add'>+		if (err) {</div><div class='add'>+			sb-&gt;s_flags |= SB_RDONLY;</div><div class='add'>+			goto ignore_opts;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		down_write(&amp;nilfs-&gt;ns_sem);</div><div class='ctx'> 		nilfs_setup_super(sb, true);</div><div class='ctx'> 		up_write(&amp;nilfs-&gt;ns_sem);</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- restore_opts:</div><div class='del'>-	sb-&gt;s_flags = old_sb_flags;</div><div class='del'>-	nilfs-&gt;ns_mount_opt = old_mount_opt;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct nilfs_super_data {</div><div class='del'>-	__u64 cno;</div><div class='del'>-	int flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int nilfs_parse_snapshot_option(const char *option,</div><div class='del'>-				       const substring_t *arg,</div><div class='del'>-				       struct nilfs_super_data *sd)</div><div class='del'>-{</div><div class='del'>-	unsigned long long val;</div><div class='del'>-	const char *msg = NULL;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!(sd-&gt;flags &amp; SB_RDONLY)) {</div><div class='del'>-		msg = "read-only option is not specified";</div><div class='del'>-		goto parse_error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = kstrtoull(arg-&gt;from, 0, &amp;val);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err == -ERANGE)</div><div class='del'>-			msg = "too large checkpoint number";</div><div class='del'>-		else</div><div class='del'>-			msg = "malformed argument";</div><div class='del'>-		goto parse_error;</div><div class='del'>-	} else if (val == 0) {</div><div class='del'>-		msg = "invalid checkpoint number 0";</div><div class='del'>-		goto parse_error;</div><div class='del'>-	}</div><div class='del'>-	sd-&gt;cno = val;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-parse_error:</div><div class='del'>-	nilfs_err(NULL, "invalid option \"%s\": %s", option, msg);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nilfs_identify - pre-read mount options needed to identify mount instance</div><div class='del'>- * @data: mount options</div><div class='del'>- * @sd: nilfs_super_data</div><div class='del'>- */</div><div class='del'>-static int nilfs_identify(char *data, struct nilfs_super_data *sd)</div><div class='del'>-{</div><div class='del'>-	char *p, *options = data;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int token;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		p = strsep(&amp;options, ",");</div><div class='del'>-		if (p != NULL &amp;&amp; *p) {</div><div class='del'>-			token = match_token(p, tokens, args);</div><div class='del'>-			if (token == Opt_snapshot)</div><div class='del'>-				ret = nilfs_parse_snapshot_option(p, &amp;args[0],</div><div class='del'>-								  sd);</div><div class='del'>-		}</div><div class='del'>-		if (!options)</div><div class='del'>-			break;</div><div class='del'>-		BUG_ON(options == data);</div><div class='del'>-		*(options - 1) = ',';</div><div class='del'>-	} while (!ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	sb-&gt;s_flags = (sb-&gt;s_flags &amp; ~SB_POSIXACL);</div><div class='add'>+	/* Copy over parsed remount options */</div><div class='add'>+	nilfs-&gt;ns_mount_opt = ctx-&gt;ns_mount_opt;</div><div class='ctx'> </div><div class='del'>-static int nilfs_set_bdev_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	s-&gt;s_dev = *(dev_t *)data;</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int nilfs_test_bdev_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	return !(s-&gt;s_iflags &amp; SB_I_RETIRED) &amp;&amp; s-&gt;s_dev == *(dev_t *)data;</div><div class='add'>+ ignore_opts:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *</div><div class='del'>-nilfs_mount(struct file_system_type *fs_type, int flags,</div><div class='del'>-	     const char *dev_name, void *data)</div><div class='add'>+static int</div><div class='add'>+nilfs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_super_data sd = { .flags = flags };</div><div class='add'>+	struct nilfs_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct super_block *s;</div><div class='ctx'> 	dev_t dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (nilfs_identify(data, &amp;sd))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (ctx-&gt;cno &amp;&amp; !(fc-&gt;sb_flags &amp; SB_RDONLY)) {</div><div class='add'>+		nilfs_err(NULL,</div><div class='add'>+			  "invalid option \"cp=%llu\": read-only option is not specified",</div><div class='add'>+			  ctx-&gt;cno);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = lookup_bdev(dev_name, &amp;dev);</div><div class='add'>+	err = lookup_bdev(fc-&gt;source, &amp;dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	s = sget(fs_type, nilfs_test_bdev_super, nilfs_set_bdev_super, flags,</div><div class='del'>-		 &amp;dev);</div><div class='add'>+	s = sget_dev(fc, dev);</div><div class='ctx'> 	if (IS_ERR(s))</div><div class='del'>-		return ERR_CAST(s);</div><div class='add'>+		return PTR_ERR(s);</div><div class='ctx'> </div><div class='ctx'> 	if (!s-&gt;s_root) {</div><div class='del'>-		err = setup_bdev_super(s, flags, NULL);</div><div class='add'>+		err = setup_bdev_super(s, fc-&gt;sb_flags, fc);</div><div class='ctx'> 		if (!err)</div><div class='del'>-			err = nilfs_fill_super(s, data,</div><div class='del'>-					       flags &amp; SB_SILENT ? 1 : 0);</div><div class='add'>+			err = nilfs_fill_super(s, fc);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto failed_super;</div><div class='ctx'> </div><div class='ctx'> 		s-&gt;s_flags |= SB_ACTIVE;</div><div class='del'>-	} else if (!sd.cno) {</div><div class='add'>+	} else if (!ctx-&gt;cno) {</div><div class='ctx'> 		if (nilfs_tree_is_busy(s-&gt;s_root)) {</div><div class='del'>-			if ((flags ^ s-&gt;s_flags) &amp; SB_RDONLY) {</div><div class='add'>+			if ((fc-&gt;sb_flags ^ s-&gt;s_flags) &amp; SB_RDONLY) {</div><div class='ctx'> 				nilfs_err(s,</div><div class='ctx'> 					  "the device already has a %s mount.",</div><div class='ctx'> 					  sb_rdonly(s) ? "read-only" : "read/write");</div><div class='hunk'>@@ -1333,37 +1241,75 @@ nilfs_mount(struct file_system_type *fs_type, int flags,</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='del'>-			 * Try remount to setup mount states if the current</div><div class='add'>+			 * Try reconfigure to setup mount states if the current</div><div class='ctx'> 			 * tree is not mounted and only snapshots use this sb.</div><div class='add'>+			 *</div><div class='add'>+			 * Since nilfs_reconfigure() requires fc-&gt;root to be</div><div class='add'>+			 * set, set it first and release it on failure.</div><div class='ctx'> 			 */</div><div class='del'>-			err = nilfs_remount(s, &amp;flags, data);</div><div class='del'>-			if (err)</div><div class='add'>+			fc-&gt;root = dget(s-&gt;s_root);</div><div class='add'>+			err = nilfs_reconfigure(fc);</div><div class='add'>+			if (err) {</div><div class='add'>+				dput(fc-&gt;root);</div><div class='add'>+				fc-&gt;root = NULL;  /* prevent double release */</div><div class='ctx'> 				goto failed_super;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sd.cno) {</div><div class='add'>+	if (ctx-&gt;cno) {</div><div class='ctx'> 		struct dentry *root_dentry;</div><div class='ctx'> </div><div class='del'>-		err = nilfs_attach_snapshot(s, sd.cno, &amp;root_dentry);</div><div class='add'>+		err = nilfs_attach_snapshot(s, ctx-&gt;cno, &amp;root_dentry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto failed_super;</div><div class='del'>-		return root_dentry;</div><div class='add'>+		fc-&gt;root = root_dentry;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return dget(s-&gt;s_root);</div><div class='add'>+	fc-&gt;root = dget(s-&gt;s_root);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>  failed_super:</div><div class='ctx'> 	deactivate_locked_super(s);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nilfs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations nilfs_context_ops = {</div><div class='add'>+	.parse_param	= nilfs_parse_param,</div><div class='add'>+	.get_tree	= nilfs_get_tree,</div><div class='add'>+	.reconfigure	= nilfs_reconfigure,</div><div class='add'>+	.free		= nilfs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nilfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct nilfs_fs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ns_mount_opt = NILFS_MOUNT_ERRORS_RO | NILFS_MOUNT_BARRIER;</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;nilfs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file_system_type nilfs_fs_type = {</div><div class='ctx'> 	.owner    = THIS_MODULE,</div><div class='ctx'> 	.name     = "nilfs2",</div><div class='del'>-	.mount    = nilfs_mount,</div><div class='ctx'> 	.kill_sb  = kill_block_super,</div><div class='ctx'> 	.fs_flags = FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = nilfs_init_fs_context,</div><div class='add'>+	.parameters = nilfs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("nilfs2");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c<br/>index 379d22e28ed6..bc52afbfc5c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/sysfs.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static void nilfs_##name##_attr_release(struct kobject *kobj) \</div><div class='ctx'> 						sg_##name##_kobj); \</div><div class='ctx'> 	complete(&amp;subgroups-&gt;sg_##name##_kobj_unregister); \</div><div class='ctx'> } \</div><div class='del'>-static struct kobj_type nilfs_##name##_ktype = { \</div><div class='add'>+static const struct kobj_type nilfs_##name##_ktype = { \</div><div class='ctx'> 	.default_groups	= nilfs_##name##_groups, \</div><div class='ctx'> 	.sysfs_ops	= &amp;nilfs_##name##_attr_ops, \</div><div class='ctx'> 	.release	= nilfs_##name##_attr_release, \</div><div class='hunk'>@@ -166,7 +166,7 @@ static const struct sysfs_ops nilfs_snapshot_attr_ops = {</div><div class='ctx'> 	.store	= nilfs_snapshot_attr_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct kobj_type nilfs_snapshot_ktype = {</div><div class='add'>+static const struct kobj_type nilfs_snapshot_ktype = {</div><div class='ctx'> 	.default_groups	= nilfs_snapshot_groups,</div><div class='ctx'> 	.sysfs_ops	= &amp;nilfs_snapshot_attr_ops,</div><div class='ctx'> 	.release	= nilfs_snapshot_attr_release,</div><div class='hunk'>@@ -836,9 +836,15 @@ ssize_t nilfs_dev_revision_show(struct nilfs_dev_attr *attr,</div><div class='ctx'> 				struct the_nilfs *nilfs,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_super_block **sbp = nilfs-&gt;ns_sbp;</div><div class='del'>-	u32 major = le32_to_cpu(sbp[0]-&gt;s_rev_level);</div><div class='del'>-	u16 minor = le16_to_cpu(sbp[0]-&gt;s_minor_rev_level);</div><div class='add'>+	struct nilfs_super_block *raw_sb;</div><div class='add'>+	u32 major;</div><div class='add'>+	u16 minor;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+	raw_sb = nilfs-&gt;ns_sbp[0];</div><div class='add'>+	major = le32_to_cpu(raw_sb-&gt;s_rev_level);</div><div class='add'>+	minor = le16_to_cpu(raw_sb-&gt;s_minor_rev_level);</div><div class='add'>+	up_read(&amp;nilfs-&gt;ns_sem);</div><div class='ctx'> </div><div class='ctx'> 	return sysfs_emit(buf, "%d.%d\n", major, minor);</div><div class='ctx'> }</div><div class='hunk'>@@ -856,8 +862,13 @@ ssize_t nilfs_dev_device_size_show(struct nilfs_dev_attr *attr,</div><div class='ctx'> 				    struct the_nilfs *nilfs,</div><div class='ctx'> 				    char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_super_block **sbp = nilfs-&gt;ns_sbp;</div><div class='del'>-	u64 dev_size = le64_to_cpu(sbp[0]-&gt;s_dev_size);</div><div class='add'>+	struct nilfs_super_block *raw_sb;</div><div class='add'>+	u64 dev_size;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+	raw_sb = nilfs-&gt;ns_sbp[0];</div><div class='add'>+	dev_size = le64_to_cpu(raw_sb-&gt;s_dev_size);</div><div class='add'>+	up_read(&amp;nilfs-&gt;ns_sem);</div><div class='ctx'> </div><div class='ctx'> 	return sysfs_emit(buf, "%llu\n", dev_size);</div><div class='ctx'> }</div><div class='hunk'>@@ -879,9 +890,15 @@ ssize_t nilfs_dev_uuid_show(struct nilfs_dev_attr *attr,</div><div class='ctx'> 			    struct the_nilfs *nilfs,</div><div class='ctx'> 			    char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_super_block **sbp = nilfs-&gt;ns_sbp;</div><div class='add'>+	struct nilfs_super_block *raw_sb;</div><div class='add'>+	ssize_t len;</div><div class='ctx'> </div><div class='del'>-	return sysfs_emit(buf, "%pUb\n", sbp[0]-&gt;s_uuid);</div><div class='add'>+	down_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+	raw_sb = nilfs-&gt;ns_sbp[0];</div><div class='add'>+	len = sysfs_emit(buf, "%pUb\n", raw_sb-&gt;s_uuid);</div><div class='add'>+	up_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='hunk'>@@ -889,10 +906,16 @@ ssize_t nilfs_dev_volume_name_show(struct nilfs_dev_attr *attr,</div><div class='ctx'> 				    struct the_nilfs *nilfs,</div><div class='ctx'> 				    char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct nilfs_super_block **sbp = nilfs-&gt;ns_sbp;</div><div class='add'>+	struct nilfs_super_block *raw_sb;</div><div class='add'>+	ssize_t len;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;nilfs-&gt;ns_sem);</div><div class='add'>+	raw_sb = nilfs-&gt;ns_sbp[0];</div><div class='add'>+	len = scnprintf(buf, sizeof(raw_sb-&gt;s_volume_name), "%s\n",</div><div class='add'>+			raw_sb-&gt;s_volume_name);</div><div class='add'>+	up_read(&amp;nilfs-&gt;ns_sem);</div><div class='ctx'> </div><div class='del'>-	return scnprintf(buf, sizeof(sbp[0]-&gt;s_volume_name), "%s\n",</div><div class='del'>-			 sbp[0]-&gt;s_volume_name);</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char dev_readme_str[] =</div><div class='hunk'>@@ -967,7 +990,7 @@ static const struct sysfs_ops nilfs_dev_attr_ops = {</div><div class='ctx'> 	.store	= nilfs_dev_attr_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct kobj_type nilfs_dev_ktype = {</div><div class='add'>+static const struct kobj_type nilfs_dev_ktype = {</div><div class='ctx'> 	.default_groups	= nilfs_dev_groups,</div><div class='ctx'> 	.sysfs_ops	= &amp;nilfs_dev_attr_ops,</div><div class='ctx'> 	.release	= nilfs_dev_attr_release,</div><div class='hunk'>@@ -1052,7 +1075,7 @@ void nilfs_sysfs_delete_device_group(struct the_nilfs *nilfs)</div><div class='ctx'>  ************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static ssize_t nilfs_feature_revision_show(struct kobject *kobj,</div><div class='del'>-					    struct attribute *attr, char *buf)</div><div class='add'>+					    struct kobj_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sysfs_emit(buf, "%d.%d\n",</div><div class='ctx'> 			NILFS_CURRENT_REV, NILFS_MINOR_REV);</div><div class='hunk'>@@ -1064,7 +1087,7 @@ static const char features_readme_str[] =</div><div class='ctx'> 	"(1) revision\n\tshow current revision of NILFS file system driver.\n";</div><div class='ctx'> </div><div class='ctx'> static ssize_t nilfs_feature_README_show(struct kobject *kobj,</div><div class='del'>-					 struct attribute *attr,</div><div class='add'>+					 struct kobj_attribute *attr,</div><div class='ctx'> 					 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sysfs_emit(buf, features_readme_str);</div><div class='head'>diff --git a/fs/nilfs2/sysfs.h b/fs/nilfs2/sysfs.h<br/>index 78a87a016928..d370cd5cce3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sysfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/sysfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/sysfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/sysfs.h</a></div><div class='hunk'>@@ -50,16 +50,16 @@ struct nilfs_sysfs_dev_subgroups {</div><div class='ctx'> 	struct completion sg_segments_kobj_unregister;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NILFS_COMMON_ATTR_STRUCT(name) \</div><div class='add'>+#define NILFS_KOBJ_ATTR_STRUCT(name) \</div><div class='ctx'> struct nilfs_##name##_attr { \</div><div class='ctx'> 	struct attribute attr; \</div><div class='del'>-	ssize_t (*show)(struct kobject *, struct attribute *, \</div><div class='add'>+	ssize_t (*show)(struct kobject *, struct kobj_attribute *, \</div><div class='ctx'> 			char *); \</div><div class='del'>-	ssize_t (*store)(struct kobject *, struct attribute *, \</div><div class='add'>+	ssize_t (*store)(struct kobject *, struct kobj_attribute *, \</div><div class='ctx'> 			 const char *, size_t); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-NILFS_COMMON_ATTR_STRUCT(feature);</div><div class='add'>+NILFS_KOBJ_ATTR_STRUCT(feature);</div><div class='ctx'> </div><div class='ctx'> #define NILFS_DEV_ATTR_STRUCT(name) \</div><div class='ctx'> struct nilfs_##name##_attr { \</div><div class='head'>diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c<br/>index 71400496ed36..d0bcf744c553 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/the_nilfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/the_nilfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/the_nilfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/the_nilfs.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include "nilfs.h"</div><div class='hunk'>@@ -50,8 +49,8 @@ void nilfs_set_last_segment(struct the_nilfs *nilfs,</div><div class='ctx'>  * alloc_nilfs - allocate a nilfs object</div><div class='ctx'>  * @sb: super block instance</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, pointer to the_nilfs is returned.</div><div class='del'>- * On error, NULL is returned.</div><div class='add'>+ * Return: a pointer to the allocated nilfs object on success, or NULL on</div><div class='add'>+ * failure.</div><div class='ctx'>  */</div><div class='ctx'> struct the_nilfs *alloc_nilfs(struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -69,7 +68,6 @@ struct the_nilfs *alloc_nilfs(struct super_block *sb)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;nilfs-&gt;ns_dirty_files);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;nilfs-&gt;ns_gc_inodes);</div><div class='ctx'> 	spin_lock_init(&amp;nilfs-&gt;ns_inode_lock);</div><div class='del'>-	spin_lock_init(&amp;nilfs-&gt;ns_next_gen_lock);</div><div class='ctx'> 	spin_lock_init(&amp;nilfs-&gt;ns_last_segment_lock);</div><div class='ctx'> 	nilfs-&gt;ns_cptree = RB_ROOT;</div><div class='ctx'> 	spin_lock_init(&amp;nilfs-&gt;ns_cptree_lock);</div><div class='hunk'>@@ -167,6 +165,9 @@ static void nilfs_clear_recovery_info(struct nilfs_recovery_info *ri)</div><div class='ctx'>  * containing a super root from a given super block, and initializes</div><div class='ctx'>  * relevant information on the nilfs object preparatory for log</div><div class='ctx'>  * scanning and recovery.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or %-EINVAL if current segment number is out</div><div class='add'>+ * of range.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_store_log_cursor(struct the_nilfs *nilfs,</div><div class='ctx'> 				  struct nilfs_super_block *sbp)</div><div class='hunk'>@@ -202,8 +203,7 @@ static int nilfs_store_log_cursor(struct the_nilfs *nilfs,</div><div class='ctx'>  * exponent information written in @sbp and stores it in @blocksize,</div><div class='ctx'>  * or aborts with an error message if it's too large.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. If the block size is too</div><div class='del'>- * large, -EINVAL is returned.</div><div class='add'>+ * Return: 0 on success, or %-EINVAL if the block size is too large.</div><div class='ctx'>  */</div><div class='ctx'> static int nilfs_get_blocksize(struct super_block *sb,</div><div class='ctx'> 			       struct nilfs_super_block *sbp, int *blocksize)</div><div class='hunk'>@@ -228,6 +228,13 @@ static int nilfs_get_blocksize(struct super_block *sb,</div><div class='ctx'>  * load_nilfs() searches and load the latest super root,</div><div class='ctx'>  * attaches the last segment, and does recovery if needed.</div><div class='ctx'>  * The caller must call this exclusively for simultaneous mounts.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or one of the following negative error codes on</div><div class='add'>+ * failure:</div><div class='add'>+ * * %-EINVAL	- No valid segment found.</div><div class='add'>+ * * %-EIO	- I/O error.</div><div class='add'>+ * * %-ENOMEM	- Insufficient memory available.</div><div class='add'>+ * * %-EROFS	- Read only device or RO compat mode (if recovery is required)</div><div class='ctx'>  */</div><div class='ctx'> int load_nilfs(struct the_nilfs *nilfs, struct super_block *sb)</div><div class='ctx'> {</div><div class='hunk'>@@ -397,6 +404,8 @@ static unsigned long long nilfs_max_size(unsigned int blkbits)</div><div class='ctx'>  * nilfs_nrsvsegs - calculate the number of reserved segments</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='ctx'>  * @nsegs: total number of segments</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of reserved segments.</div><div class='ctx'>  */</div><div class='ctx'> unsigned long nilfs_nrsvsegs(struct the_nilfs *nilfs, unsigned long nsegs)</div><div class='ctx'> {</div><div class='hunk'>@@ -408,12 +417,14 @@ unsigned long nilfs_nrsvsegs(struct the_nilfs *nilfs, unsigned long nsegs)</div><div class='ctx'> /**</div><div class='ctx'>  * nilfs_max_segment_count - calculate the maximum number of segments</div><div class='ctx'>  * @nilfs: nilfs object</div><div class='add'>+ *</div><div class='add'>+ * Return: Maximum number of segments</div><div class='ctx'>  */</div><div class='ctx'> static u64 nilfs_max_segment_count(struct the_nilfs *nilfs)</div><div class='ctx'> {</div><div class='ctx'> 	u64 max_count = U64_MAX;</div><div class='ctx'> </div><div class='del'>-	do_div(max_count, nilfs-&gt;ns_blocks_per_segment);</div><div class='add'>+	max_count = div64_ul(max_count, nilfs-&gt;ns_blocks_per_segment);</div><div class='ctx'> 	return min_t(u64, max_count, ULONG_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -452,6 +463,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nilfs-&gt;ns_first_ino = le32_to_cpu(sbp-&gt;s_first_ino);</div><div class='add'>+	if (nilfs-&gt;ns_first_ino &lt; NILFS_USER_INO) {</div><div class='add'>+		nilfs_err(nilfs-&gt;ns_sb,</div><div class='add'>+			  "too small lower limit for non-reserved inode numbers: %u",</div><div class='add'>+			  nilfs-&gt;ns_first_ino);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nilfs-&gt;ns_blocks_per_segment = le32_to_cpu(sbp-&gt;s_blocks_per_segment);</div><div class='ctx'> 	if (nilfs-&gt;ns_blocks_per_segment &lt; NILFS_SEG_MIN_BLOCKS) {</div><div class='hunk'>@@ -534,7 +551,7 @@ static int nilfs_valid_sb(struct nilfs_super_block *sbp)</div><div class='ctx'>  * area, or if the parameters themselves are not normal, it is</div><div class='ctx'>  * determined to be invalid.</div><div class='ctx'>  *</div><div class='del'>- * Return Value: true if invalid, false if valid.</div><div class='add'>+ * Return: true if invalid, false if valid.</div><div class='ctx'>  */</div><div class='ctx'> static bool nilfs_sb2_bad_offset(struct nilfs_super_block *sbp, u64 offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -592,7 +609,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,</div><div class='ctx'> 	struct nilfs_super_block **sbp = nilfs-&gt;ns_sbp;</div><div class='ctx'> 	struct buffer_head **sbh = nilfs-&gt;ns_sbh;</div><div class='ctx'> 	u64 sb2off, devsize = bdev_nr_bytes(nilfs-&gt;ns_bdev);</div><div class='del'>-	int valid[2], swp = 0;</div><div class='add'>+	int valid[2], swp = 0, older;</div><div class='ctx'> </div><div class='ctx'> 	if (devsize &lt; NILFS_SEG_MIN_BLOCKS * NILFS_MIN_BLOCK_SIZE + 4096) {</div><div class='ctx'> 		nilfs_err(sb, "device size too small");</div><div class='hunk'>@@ -648,9 +665,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,</div><div class='ctx'> 	if (swp)</div><div class='ctx'> 		nilfs_swap_super_block(nilfs);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Calculate the array index of the older superblock data.</div><div class='add'>+	 * If one has been dropped, set index 0 pointing to the remaining one,</div><div class='add'>+	 * otherwise set index 1 pointing to the old one (including if both</div><div class='add'>+	 * are the same).</div><div class='add'>+	 *</div><div class='add'>+	 *  Divided case             valid[0]  valid[1]  swp  -&gt;  older</div><div class='add'>+	 *  -------------------------------------------------------------</div><div class='add'>+	 *  Both SBs are invalid        0         0       N/A (Error)</div><div class='add'>+	 *  SB1 is invalid              0         1       1         0</div><div class='add'>+	 *  SB2 is invalid              1         0       0         0</div><div class='add'>+	 *  SB2 is newer                1         1       1         0</div><div class='add'>+	 *  SB2 is older or the same    1         1       0         1</div><div class='add'>+	 */</div><div class='add'>+	older = valid[1] ^ swp;</div><div class='add'>+</div><div class='ctx'> 	nilfs-&gt;ns_sbwcount = 0;</div><div class='ctx'> 	nilfs-&gt;ns_sbwtime = le64_to_cpu(sbp[0]-&gt;s_wtime);</div><div class='del'>-	nilfs-&gt;ns_prot_seq = le64_to_cpu(sbp[valid[1] &amp; !swp]-&gt;s_last_seq);</div><div class='add'>+	nilfs-&gt;ns_prot_seq = le64_to_cpu(sbp[older]-&gt;s_last_seq);</div><div class='ctx'> 	*sbpp = sbp[0];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -659,23 +692,19 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,</div><div class='ctx'>  * init_nilfs - initialize a NILFS instance.</div><div class='ctx'>  * @nilfs: the_nilfs structure</div><div class='ctx'>  * @sb: super block</div><div class='del'>- * @data: mount options</div><div class='ctx'>  *</div><div class='ctx'>  * init_nilfs() performs common initialization per block device (e.g.</div><div class='ctx'>  * reading the super block, getting disk layout information, initializing</div><div class='ctx'>  * shared fields in the_nilfs).</div><div class='ctx'>  *</div><div class='del'>- * Return Value: On success, 0 is returned. On error, a negative error</div><div class='del'>- * code is returned.</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data)</div><div class='add'>+int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nilfs_super_block *sbp;</div><div class='ctx'> 	int blocksize;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;nilfs-&gt;ns_sem);</div><div class='del'>-</div><div class='ctx'> 	blocksize = sb_min_blocksize(sb, NILFS_MIN_BLOCK_SIZE);</div><div class='ctx'> 	if (!blocksize) {</div><div class='ctx'> 		nilfs_err(sb, "unable to set blocksize");</div><div class='hunk'>@@ -686,7 +715,7 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = nilfs_store_magic_and_option(sb, sbp, data);</div><div class='add'>+	err = nilfs_store_magic(sb, sbp);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_sbh;</div><div class='ctx'> </div><div class='hunk'>@@ -733,9 +762,6 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data)</div><div class='ctx'> 	nilfs-&gt;ns_blocksize_bits = sb-&gt;s_blocksize_bits;</div><div class='ctx'> 	nilfs-&gt;ns_blocksize = blocksize;</div><div class='ctx'> </div><div class='del'>-	get_random_bytes(&amp;nilfs-&gt;ns_next_generation,</div><div class='del'>-			 sizeof(nilfs-&gt;ns_next_generation));</div><div class='del'>-</div><div class='ctx'> 	err = nilfs_store_disk_layout(nilfs, sbp);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failed_sbh;</div><div class='hunk'>@@ -751,7 +777,6 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data)</div><div class='ctx'> 	set_nilfs_init(nilfs);</div><div class='ctx'> 	err = 0;</div><div class='ctx'>  out:</div><div class='del'>-	up_write(&amp;nilfs-&gt;ns_sem);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'>  failed_sbh:</div><div class='head'>diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h<br/>index cd4ae1b8ae16..4776a70f01ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/the_nilfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nilfs2/the_nilfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nilfs2/the_nilfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nilfs2/the_nilfs.h</a></div><div class='hunk'>@@ -71,8 +71,6 @@ enum {</div><div class='ctx'>  * @ns_dirty_files: list of dirty files</div><div class='ctx'>  * @ns_inode_lock: lock protecting @ns_dirty_files</div><div class='ctx'>  * @ns_gc_inodes: dummy inodes to keep live blocks</div><div class='del'>- * @ns_next_generation: next generation number for inodes</div><div class='del'>- * @ns_next_gen_lock: lock protecting @ns_next_generation</div><div class='ctx'>  * @ns_mount_opt: mount options</div><div class='ctx'>  * @ns_resuid: uid for reserved blocks</div><div class='ctx'>  * @ns_resgid: gid for reserved blocks</div><div class='hunk'>@@ -161,10 +159,6 @@ struct the_nilfs {</div><div class='ctx'> 	/* GC inode list */</div><div class='ctx'> 	struct list_head	ns_gc_inodes;</div><div class='ctx'> </div><div class='del'>-	/* Inode allocator */</div><div class='del'>-	u32			ns_next_generation;</div><div class='del'>-	spinlock_t		ns_next_gen_lock;</div><div class='del'>-</div><div class='ctx'> 	/* Mount options */</div><div class='ctx'> 	unsigned long		ns_mount_opt;</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +176,7 @@ struct the_nilfs {</div><div class='ctx'> 	unsigned long		ns_nrsvsegs;</div><div class='ctx'> 	unsigned long		ns_first_data_block;</div><div class='ctx'> 	int			ns_inode_size;</div><div class='del'>-	int			ns_first_ino;</div><div class='add'>+	unsigned int		ns_first_ino;</div><div class='ctx'> 	u32			ns_crc_seed;</div><div class='ctx'> </div><div class='ctx'> 	/* /sys/fs/&lt;nilfs&gt;/&lt;device&gt; */</div><div class='hunk'>@@ -219,10 +213,6 @@ THE_NILFS_FNS(PURGING, purging)</div><div class='ctx'> #define nilfs_set_opt(nilfs, opt)  \</div><div class='ctx'> 	((nilfs)-&gt;ns_mount_opt |= NILFS_MOUNT_##opt)</div><div class='ctx'> #define nilfs_test_opt(nilfs, opt) ((nilfs)-&gt;ns_mount_opt &amp; NILFS_MOUNT_##opt)</div><div class='del'>-#define nilfs_write_opt(nilfs, mask, opt)				\</div><div class='del'>-	((nilfs)-&gt;ns_mount_opt =					\</div><div class='del'>-		(((nilfs)-&gt;ns_mount_opt &amp; ~NILFS_MOUNT_##mask) |	\</div><div class='del'>-		 NILFS_MOUNT_##opt))					\</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct nilfs_root - nilfs root object</div><div class='hunk'>@@ -276,7 +266,7 @@ static inline int nilfs_sb_will_flip(struct the_nilfs *nilfs)</div><div class='ctx'> void nilfs_set_last_segment(struct the_nilfs *, sector_t, u64, __u64);</div><div class='ctx'> struct the_nilfs *alloc_nilfs(struct super_block *sb);</div><div class='ctx'> void destroy_nilfs(struct the_nilfs *nilfs);</div><div class='del'>-int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data);</div><div class='add'>+int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb);</div><div class='ctx'> int load_nilfs(struct the_nilfs *nilfs, struct super_block *sb);</div><div class='ctx'> unsigned long nilfs_nrsvsegs(struct the_nilfs *nilfs, unsigned long nsegs);</div><div class='ctx'> void nilfs_set_nsegments(struct the_nilfs *nilfs, unsigned long nsegs);</div><div class='head'>diff --git a/fs/nls/mac-celtic.c b/fs/nls/mac-celtic.c<br/>index 266c2d7d50bd..2963f3299d7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-celtic.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-celtic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-celtic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-celtic.c</a></div><div class='hunk'>@@ -598,4 +598,5 @@ static void __exit exit_nls_macceltic(void)</div><div class='ctx'> module_init(init_nls_macceltic)</div><div class='ctx'> module_exit(exit_nls_macceltic)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macceltic");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-centeuro.c b/fs/nls/mac-centeuro.c<br/>index 9789c6057551..43b20f4bdb67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-centeuro.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-centeuro.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-centeuro.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-centeuro.c</a></div><div class='hunk'>@@ -528,4 +528,5 @@ static void __exit exit_nls_maccenteuro(void)</div><div class='ctx'> module_init(init_nls_maccenteuro)</div><div class='ctx'> module_exit(exit_nls_maccenteuro)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage maccenteuro");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-croatian.c b/fs/nls/mac-croatian.c<br/>index bb19e7a07d43..62730d6a64e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-croatian.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-croatian.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-croatian.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-croatian.c</a></div><div class='hunk'>@@ -598,4 +598,5 @@ static void __exit exit_nls_maccroatian(void)</div><div class='ctx'> module_init(init_nls_maccroatian)</div><div class='ctx'> module_exit(exit_nls_maccroatian)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage maccroatian");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-cyrillic.c b/fs/nls/mac-cyrillic.c<br/>index 2a7dea36acba..7a5c4d16aac8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-cyrillic.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-cyrillic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-cyrillic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-cyrillic.c</a></div><div class='hunk'>@@ -493,4 +493,5 @@ static void __exit exit_nls_maccyrillic(void)</div><div class='ctx'> module_init(init_nls_maccyrillic)</div><div class='ctx'> module_exit(exit_nls_maccyrillic)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage maccyrillic");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-gaelic.c b/fs/nls/mac-gaelic.c<br/>index 77b001653588..3d22f03a90b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-gaelic.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-gaelic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-gaelic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-gaelic.c</a></div><div class='hunk'>@@ -563,4 +563,5 @@ static void __exit exit_nls_macgaelic(void)</div><div class='ctx'> module_init(init_nls_macgaelic)</div><div class='ctx'> module_exit(exit_nls_macgaelic)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macgaelic");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-greek.c b/fs/nls/mac-greek.c<br/>index 1eccf499e2eb..de3aa9ddb5b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-greek.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-greek.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-greek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-greek.c</a></div><div class='hunk'>@@ -493,4 +493,5 @@ static void __exit exit_nls_macgreek(void)</div><div class='ctx'> module_init(init_nls_macgreek)</div><div class='ctx'> module_exit(exit_nls_macgreek)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macgreek");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-iceland.c b/fs/nls/mac-iceland.c<br/>index cbd0875c6d69..0bba83f9d415 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-iceland.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-iceland.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-iceland.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-iceland.c</a></div><div class='hunk'>@@ -598,4 +598,5 @@ static void __exit exit_nls_maciceland(void)</div><div class='ctx'> module_init(init_nls_maciceland)</div><div class='ctx'> module_exit(exit_nls_maciceland)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage maciceland");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-inuit.c b/fs/nls/mac-inuit.c<br/>index fba8357aaf03..493386832dfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-inuit.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-inuit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-inuit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-inuit.c</a></div><div class='hunk'>@@ -528,4 +528,5 @@ static void __exit exit_nls_macinuit(void)</div><div class='ctx'> module_init(init_nls_macinuit)</div><div class='ctx'> module_exit(exit_nls_macinuit)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macinuit");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-roman.c b/fs/nls/mac-roman.c<br/>index b6a98a5208cd..d3c082173c20 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-roman.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-roman.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-roman.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-roman.c</a></div><div class='hunk'>@@ -633,4 +633,5 @@ static void __exit exit_nls_macroman(void)</div><div class='ctx'> module_init(init_nls_macroman)</div><div class='ctx'> module_exit(exit_nls_macroman)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macroman");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-romanian.c b/fs/nls/mac-romanian.c<br/>index 25547f023638..a7735852f2d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-romanian.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-romanian.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-romanian.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-romanian.c</a></div><div class='hunk'>@@ -598,4 +598,5 @@ static void __exit exit_nls_macromanian(void)</div><div class='ctx'> module_init(init_nls_macromanian)</div><div class='ctx'> module_exit(exit_nls_macromanian)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macromanian");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/mac-turkish.c b/fs/nls/mac-turkish.c<br/>index b5454bc7b7fa..d77e9b6b7d7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-turkish.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/mac-turkish.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/mac-turkish.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/mac-turkish.c</a></div><div class='hunk'>@@ -598,4 +598,5 @@ static void __exit exit_nls_macturkish(void)</div><div class='ctx'> module_init(init_nls_macturkish)</div><div class='ctx'> module_exit(exit_nls_macturkish)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage macturkish");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_ascii.c b/fs/nls/nls_ascii.c<br/>index a2620650d5e4..068143d71284 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_ascii.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_ascii.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_ascii.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_ascii.c</a></div><div class='hunk'>@@ -163,4 +163,5 @@ static void __exit exit_nls_ascii(void)</div><div class='ctx'> module_init(init_nls_ascii)</div><div class='ctx'> module_exit(exit_nls_ascii)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ASCII (United States)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c<br/>index a026dbd3593f..a5c3a9f1b8dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_base.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_base.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_base.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_base.c</a></div><div class='hunk'>@@ -67,19 +67,22 @@ int utf8_to_utf32(const u8 *s, int inlen, unicode_t *pu)</div><div class='ctx'> 			l &amp;= t-&gt;lmask;</div><div class='ctx'> 			if (l &lt; t-&gt;lval || l &gt; UNICODE_MAX ||</div><div class='ctx'> 					(l &amp; SURROGATE_MASK) == SURROGATE_PAIR)</div><div class='del'>-				return -1;</div><div class='add'>+				return -EILSEQ;</div><div class='add'>+</div><div class='ctx'> 			*pu = (unicode_t) l;</div><div class='ctx'> 			return nc;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (inlen &lt;= nc)</div><div class='del'>-			return -1;</div><div class='add'>+			return -EOVERFLOW;</div><div class='add'>+</div><div class='ctx'> 		s++;</div><div class='ctx'> 		c = (*s ^ 0x80) &amp; 0xFF;</div><div class='ctx'> 		if (c &amp; 0xC0)</div><div class='del'>-			return -1;</div><div class='add'>+			return -EILSEQ;</div><div class='add'>+</div><div class='ctx'> 		l = (l &lt;&lt; 6) | c;</div><div class='ctx'> 	}</div><div class='del'>-	return -1;</div><div class='add'>+	return -EILSEQ;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(utf8_to_utf32);</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +97,7 @@ int utf32_to_utf8(unicode_t u, u8 *s, int maxout)</div><div class='ctx'> </div><div class='ctx'> 	l = u;</div><div class='ctx'> 	if (l &gt; UNICODE_MAX || (l &amp; SURROGATE_MASK) == SURROGATE_PAIR)</div><div class='del'>-		return -1;</div><div class='add'>+		return -EILSEQ;</div><div class='ctx'> </div><div class='ctx'> 	nc = 0;</div><div class='ctx'> 	for (t = utf8_table; t-&gt;cmask &amp;&amp; maxout; t++, maxout--) {</div><div class='hunk'>@@ -110,7 +113,7 @@ int utf32_to_utf8(unicode_t u, u8 *s, int maxout)</div><div class='ctx'> 			return nc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return -1;</div><div class='add'>+	return -EOVERFLOW;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(utf32_to_utf8);</div><div class='ctx'> </div><div class='hunk'>@@ -217,8 +220,16 @@ int utf16s_to_utf8s(const wchar_t *pwcs, int inlen, enum utf16_endian endian,</div><div class='ctx'> 				inlen--;</div><div class='ctx'> 			}</div><div class='ctx'> 			size = utf32_to_utf8(u, op, maxout);</div><div class='del'>-			if (size == -1) {</div><div class='del'>-				/* Ignore character and move on */</div><div class='add'>+			if (size &lt; 0) {</div><div class='add'>+				if (size == -EILSEQ) {</div><div class='add'>+					/* Ignore character and move on */</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				/*</div><div class='add'>+				 * Stop filling the buffer with data once a character</div><div class='add'>+				 * does not fit anymore.</div><div class='add'>+				 */</div><div class='add'>+				break;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				op += size;</div><div class='ctx'> 				maxout -= size;</div><div class='hunk'>@@ -545,4 +556,5 @@ EXPORT_SYMBOL(unload_nls);</div><div class='ctx'> EXPORT_SYMBOL(load_nls);</div><div class='ctx'> EXPORT_SYMBOL(load_nls_default);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Base file system native language support");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp1250.c b/fs/nls/nls_cp1250.c<br/>index ace3e19d3407..e22a57a4b828 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp1250.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp1250.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp1250.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp1250.c</a></div><div class='hunk'>@@ -343,4 +343,5 @@ static void __exit exit_nls_cp1250(void)</div><div class='ctx'> module_init(init_nls_cp1250)</div><div class='ctx'> module_exit(exit_nls_cp1250)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Windows CP1250 (Slavic/Central European Languages)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp1251.c b/fs/nls/nls_cp1251.c<br/>index 9273ddfd08a1..6f46d339f23c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp1251.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp1251.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp1251.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp1251.c</a></div><div class='hunk'>@@ -298,4 +298,5 @@ static void __exit exit_nls_cp1251(void)</div><div class='ctx'> module_init(init_nls_cp1251)</div><div class='ctx'> module_exit(exit_nls_cp1251)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Windows CP1251 (Bulgarian, Belarusian)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp1255.c b/fs/nls/nls_cp1255.c<br/>index 1caf5dfed85b..299e089d4301 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp1255.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp1255.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp1255.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp1255.c</a></div><div class='hunk'>@@ -380,5 +380,6 @@ static void __exit exit_nls_cp1255(void)</div><div class='ctx'> module_init(init_nls_cp1255)</div><div class='ctx'> module_exit(exit_nls_cp1255)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Hebrew charsets (ISO-8859-8, CP1255)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_ALIAS_NLS(iso8859-8);</div><div class='head'>diff --git a/fs/nls/nls_cp437.c b/fs/nls/nls_cp437.c<br/>index 7ddb830da3fd..ab880499ea32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp437.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp437.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp437.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp437.c</a></div><div class='hunk'>@@ -384,4 +384,5 @@ static void __exit exit_nls_cp437(void)</div><div class='ctx'> module_init(init_nls_cp437)</div><div class='ctx'> module_exit(exit_nls_cp437)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 437 (United States, Canada)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp737.c b/fs/nls/nls_cp737.c<br/>index c593f683a0cd..5c37618296e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp737.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp737.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp737.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp737.c</a></div><div class='hunk'>@@ -347,4 +347,5 @@ static void __exit exit_nls_cp737(void)</div><div class='ctx'> module_init(init_nls_cp737)</div><div class='ctx'> module_exit(exit_nls_cp737)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 737 (Greek)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp775.c b/fs/nls/nls_cp775.c<br/>index 554c863745f2..51ccc908901f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp775.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp775.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp775.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp775.c</a></div><div class='hunk'>@@ -316,4 +316,5 @@ static void __exit exit_nls_cp775(void)</div><div class='ctx'> module_init(init_nls_cp775)</div><div class='ctx'> module_exit(exit_nls_cp775)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 775 (Baltic Rim)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp850.c b/fs/nls/nls_cp850.c<br/>index 56cccd14b40b..5f9b9507a8b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp850.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp850.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp850.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp850.c</a></div><div class='hunk'>@@ -312,4 +312,5 @@ static void __exit exit_nls_cp850(void)</div><div class='ctx'> module_init(init_nls_cp850)</div><div class='ctx'> module_exit(exit_nls_cp850)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 850 (Europe)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp852.c b/fs/nls/nls_cp852.c<br/>index 7cdc05ac1d40..fc513a5e8358 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp852.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp852.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp852.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp852.c</a></div><div class='hunk'>@@ -334,4 +334,5 @@ static void __exit exit_nls_cp852(void)</div><div class='ctx'> module_init(init_nls_cp852)</div><div class='ctx'> module_exit(exit_nls_cp852)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 852 (Central/Eastern Europe)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp855.c b/fs/nls/nls_cp855.c<br/>index 7426eea05663..a43be58adb36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp855.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp855.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp855.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp855.c</a></div><div class='hunk'>@@ -296,4 +296,5 @@ static void __exit exit_nls_cp855(void)</div><div class='ctx'> module_init(init_nls_cp855)</div><div class='ctx'> module_exit(exit_nls_cp855)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 855 (Cyrillic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp857.c b/fs/nls/nls_cp857.c<br/>index 098309733ebd..772cd4195bad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp857.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp857.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp857.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp857.c</a></div><div class='hunk'>@@ -298,4 +298,5 @@ static void __exit exit_nls_cp857(void)</div><div class='ctx'> module_init(init_nls_cp857)</div><div class='ctx'> module_exit(exit_nls_cp857)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 857 (Turkish)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp860.c b/fs/nls/nls_cp860.c<br/>index 84224478e731..36cf4ca11966 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp860.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp860.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp860.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp860.c</a></div><div class='hunk'>@@ -361,4 +361,5 @@ static void __exit exit_nls_cp860(void)</div><div class='ctx'> module_init(init_nls_cp860)</div><div class='ctx'> module_exit(exit_nls_cp860)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 860 (Portuguese)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp861.c b/fs/nls/nls_cp861.c<br/>index dc873e4be092..b7397d079f8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp861.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp861.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp861.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp861.c</a></div><div class='hunk'>@@ -384,4 +384,5 @@ static void __exit exit_nls_cp861(void)</div><div class='ctx'> module_init(init_nls_cp861)</div><div class='ctx'> module_exit(exit_nls_cp861)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 861 (Icelandic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp862.c b/fs/nls/nls_cp862.c<br/>index d5263e3c5566..fd3b95d1e95d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp862.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp862.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp862.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp862.c</a></div><div class='hunk'>@@ -418,4 +418,5 @@ static void __exit exit_nls_cp862(void)</div><div class='ctx'> module_init(init_nls_cp862)</div><div class='ctx'> module_exit(exit_nls_cp862)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 862 (Hebrew)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp863.c b/fs/nls/nls_cp863.c<br/>index 051c9832e36a..813ae7944249 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp863.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp863.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp863.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp863.c</a></div><div class='hunk'>@@ -378,4 +378,5 @@ static void __exit exit_nls_cp863(void)</div><div class='ctx'> module_init(init_nls_cp863)</div><div class='ctx'> module_exit(exit_nls_cp863)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 863 (Canadian French)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp864.c b/fs/nls/nls_cp864.c<br/>index 97eb1273b2f7..d9eb6d5cd47a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp864.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp864.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp864.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp864.c</a></div><div class='hunk'>@@ -404,4 +404,5 @@ static void __exit exit_nls_cp864(void)</div><div class='ctx'> module_init(init_nls_cp864)</div><div class='ctx'> module_exit(exit_nls_cp864)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 864 (Arabic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp865.c b/fs/nls/nls_cp865.c<br/>index 111214228525..2678ffd98bb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp865.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp865.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp865.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp865.c</a></div><div class='hunk'>@@ -384,4 +384,5 @@ static void __exit exit_nls_cp865(void)</div><div class='ctx'> module_init(init_nls_cp865)</div><div class='ctx'> module_exit(exit_nls_cp865)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 865 (Norwegian, Danish)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp866.c b/fs/nls/nls_cp866.c<br/>index ffdcbc3fc38d..7e93d0a3802a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp866.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp866.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp866.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp866.c</a></div><div class='hunk'>@@ -302,4 +302,5 @@ static void __exit exit_nls_cp866(void)</div><div class='ctx'> module_init(init_nls_cp866)</div><div class='ctx'> module_exit(exit_nls_cp866)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 866 (Cyrillic/Russian)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp869.c b/fs/nls/nls_cp869.c<br/>index 3b5a34589354..4491737dd5cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp869.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp869.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp869.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp869.c</a></div><div class='hunk'>@@ -312,4 +312,5 @@ static void __exit exit_nls_cp869(void)</div><div class='ctx'> module_init(init_nls_cp869)</div><div class='ctx'> module_exit(exit_nls_cp869)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Codepage 869 (Greek)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_cp874.c b/fs/nls/nls_cp874.c<br/>index 8dfaa10710fa..4fcfbf8ca72c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp874.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp874.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp874.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp874.c</a></div><div class='hunk'>@@ -271,5 +271,6 @@ static void __exit exit_nls_cp874(void)</div><div class='ctx'> module_init(init_nls_cp874)</div><div class='ctx'> module_exit(exit_nls_cp874)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Thai charset (CP874, TIS-620)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_ALIAS_NLS(tis-620);</div><div class='head'>diff --git a/fs/nls/nls_cp932.c b/fs/nls/nls_cp932.c<br/>index 67b7398e8483..e5e6270fcca6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp932.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp932.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp932.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp932.c</a></div><div class='hunk'>@@ -7929,5 +7929,6 @@ static void __exit exit_nls_cp932(void)</div><div class='ctx'> module_init(init_nls_cp932)</div><div class='ctx'> module_exit(exit_nls_cp932)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Japanese charset (Shift-JIS)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_ALIAS_NLS(sjis);</div><div class='head'>diff --git a/fs/nls/nls_cp936.c b/fs/nls/nls_cp936.c<br/>index c96546cfec9f..91d0a15fd7f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp936.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp936.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp936.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp936.c</a></div><div class='hunk'>@@ -11107,5 +11107,6 @@ static void __exit exit_nls_cp936(void)</div><div class='ctx'> module_init(init_nls_cp936)</div><div class='ctx'> module_exit(exit_nls_cp936)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Simplified Chinese charset (CP936, GB2312)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_ALIAS_NLS(gb2312);</div><div class='head'>diff --git a/fs/nls/nls_cp949.c b/fs/nls/nls_cp949.c<br/>index 199171e97aa4..3ae03c76d59c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp949.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp949.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp949.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp949.c</a></div><div class='hunk'>@@ -13942,5 +13942,6 @@ static void __exit exit_nls_cp949(void)</div><div class='ctx'> module_init(init_nls_cp949)</div><div class='ctx'> module_exit(exit_nls_cp949)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Korean charset (CP949, EUC-KR)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_ALIAS_NLS(euc-kr);</div><div class='head'>diff --git a/fs/nls/nls_cp950.c b/fs/nls/nls_cp950.c<br/>index 8e1418708209..e968aa80198d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp950.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_cp950.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_cp950.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_cp950.c</a></div><div class='hunk'>@@ -9478,5 +9478,6 @@ static void __exit exit_nls_cp950(void)</div><div class='ctx'> module_init(init_nls_cp950)</div><div class='ctx'> module_exit(exit_nls_cp950)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Traditional Chinese charset (Big5)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_ALIAS_NLS(big5);</div><div class='head'>diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c<br/>index 162b3f160353..0191cc9d955e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_euc-jp.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_euc-jp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_euc-jp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_euc-jp.c</a></div><div class='hunk'>@@ -577,4 +577,5 @@ static void __exit exit_nls_euc_jp(void)</div><div class='ctx'> module_init(init_nls_euc_jp)</div><div class='ctx'> module_exit(exit_nls_euc_jp)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS Japanese charset (EUC-JP)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-1.c b/fs/nls/nls_iso8859-1.c<br/>index 69ac020d43b1..a181be488f7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-1.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-1.c</a></div><div class='hunk'>@@ -254,4 +254,5 @@ static void __exit exit_nls_iso8859_1(void)</div><div class='ctx'> module_init(init_nls_iso8859_1)</div><div class='ctx'> module_exit(exit_nls_iso8859_1)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-1 (Latin 1; Western European Languages)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-13.c b/fs/nls/nls_iso8859-13.c<br/>index afb3f8f275f0..8e2be5bfeaf1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-13.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-13.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-13.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-13.c</a></div><div class='hunk'>@@ -282,4 +282,5 @@ static void __exit exit_nls_iso8859_13(void)</div><div class='ctx'> module_init(init_nls_iso8859_13)</div><div class='ctx'> module_exit(exit_nls_iso8859_13)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-13 (Latin 7; Baltic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-14.c b/fs/nls/nls_iso8859-14.c<br/>index 046370f0b6f0..c789eccb8a69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-14.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-14.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-14.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-14.c</a></div><div class='hunk'>@@ -338,4 +338,5 @@ static void __exit exit_nls_iso8859_14(void)</div><div class='ctx'> module_init(init_nls_iso8859_14)</div><div class='ctx'> module_exit(exit_nls_iso8859_14)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-14 (Latin 8; Celtic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-15.c b/fs/nls/nls_iso8859-15.c<br/>index 7e34a841a056..ffec649176fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-15.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-15.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-15.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-15.c</a></div><div class='hunk'>@@ -304,4 +304,5 @@ static void __exit exit_nls_iso8859_15(void)</div><div class='ctx'> module_init(init_nls_iso8859_15)</div><div class='ctx'> module_exit(exit_nls_iso8859_15)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-2.c b/fs/nls/nls_iso8859-2.c<br/>index 7dd571181741..d352334d0314 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-2.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-2.c</a></div><div class='hunk'>@@ -305,4 +305,5 @@ static void __exit exit_nls_iso8859_2(void)</div><div class='ctx'> module_init(init_nls_iso8859_2)</div><div class='ctx'> module_exit(exit_nls_iso8859_2)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-2 (Latin 2; Slavic/Central European Languages)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-3.c b/fs/nls/nls_iso8859-3.c<br/>index 740b75ec4493..09990e6634d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-3.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-3.c</a></div><div class='hunk'>@@ -305,4 +305,5 @@ static void __exit exit_nls_iso8859_3(void)</div><div class='ctx'> module_init(init_nls_iso8859_3)</div><div class='ctx'> module_exit(exit_nls_iso8859_3)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-3 (Latin 3; Esperanto, Galician, Maltese, Turkish)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-4.c b/fs/nls/nls_iso8859-4.c<br/>index 8826021e32f5..92795224912e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-4.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-4.c</a></div><div class='hunk'>@@ -305,4 +305,5 @@ static void __exit exit_nls_iso8859_4(void)</div><div class='ctx'> module_init(init_nls_iso8859_4)</div><div class='ctx'> module_exit(exit_nls_iso8859_4)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-4 (Latin 4; old Baltic charset)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-5.c b/fs/nls/nls_iso8859-5.c<br/>index 7c04057a1ad8..32309315307a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-5.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-5.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-5.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-5.c</a></div><div class='hunk'>@@ -269,4 +269,5 @@ static void __exit exit_nls_iso8859_5(void)</div><div class='ctx'> module_init(init_nls_iso8859_5)</div><div class='ctx'> module_exit(exit_nls_iso8859_5)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-5 (Cyrillic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-6.c b/fs/nls/nls_iso8859-6.c<br/>index d4a881400d74..c18183469d2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-6.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-6.c</a></div><div class='hunk'>@@ -260,4 +260,5 @@ static void __exit exit_nls_iso8859_6(void)</div><div class='ctx'> module_init(init_nls_iso8859_6)</div><div class='ctx'> module_exit(exit_nls_iso8859_6)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-6 (Arabic)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-7.c b/fs/nls/nls_iso8859-7.c<br/>index 37b75d825a75..3652d6832864 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-7.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-7.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-7.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-7.c</a></div><div class='hunk'>@@ -314,4 +314,5 @@ static void __exit exit_nls_iso8859_7(void)</div><div class='ctx'> module_init(init_nls_iso8859_7)</div><div class='ctx'> module_exit(exit_nls_iso8859_7)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-7 (Modern Greek)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_iso8859-9.c b/fs/nls/nls_iso8859-9.c<br/>index 557b98250d37..11a67834b855 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-9.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_iso8859-9.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_iso8859-9.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_iso8859-9.c</a></div><div class='hunk'>@@ -269,4 +269,5 @@ static void __exit exit_nls_iso8859_9(void)</div><div class='ctx'> module_init(init_nls_iso8859_9)</div><div class='ctx'> module_exit(exit_nls_iso8859_9)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS ISO 8859-9 (Latin 5; Turkish)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_koi8-r.c b/fs/nls/nls_koi8-r.c<br/>index 811f232fccfb..e3dca27a3803 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_koi8-r.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_koi8-r.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_koi8-r.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_koi8-r.c</a></div><div class='hunk'>@@ -320,4 +320,5 @@ static void __exit exit_nls_koi8_r(void)</div><div class='ctx'> module_init(init_nls_koi8_r)</div><div class='ctx'> module_exit(exit_nls_koi8_r)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS KOI8-R (Russian)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c<br/>index a80a741a8676..07afcd9e58c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_koi8-ru.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_koi8-ru.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_koi8-ru.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_koi8-ru.c</a></div><div class='hunk'>@@ -79,4 +79,5 @@ static void __exit exit_nls_koi8_ru(void)</div><div class='ctx'> module_init(init_nls_koi8_ru)</div><div class='ctx'> module_exit(exit_nls_koi8_ru)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS KOI8-RU (Belarusian)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_koi8-u.c b/fs/nls/nls_koi8-u.c<br/>index 7e029e4c188a..f60645758c1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_koi8-u.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_koi8-u.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_koi8-u.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_koi8-u.c</a></div><div class='hunk'>@@ -327,4 +327,5 @@ static void __exit exit_nls_koi8_u(void)</div><div class='ctx'> module_init(init_nls_koi8_u)</div><div class='ctx'> module_exit(exit_nls_koi8_u)</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS KOI8-U (Ukrainian)");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/nls/nls_ucs2_utils.c b/fs/nls/nls_ucs2_utils.c<br/>index a69781c54dd8..b81c298e4966 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_ucs2_utils.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_ucs2_utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_ucs2_utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_ucs2_utils.c</a></div><div class='hunk'>@@ -13,9 +13,10 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include "nls_ucs2_utils.h"</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("NLS UCS-2");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/nls/nls_utf8.c b/fs/nls/nls_utf8.c<br/>index afcfbc4a14db..a0fa0610eaac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_utf8.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nls/nls_utf8.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nls/nls_utf8.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nls/nls_utf8.c</a></div><div class='hunk'>@@ -64,4 +64,5 @@ static void __exit exit_nls_utf8(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_nls_utf8)</div><div class='ctx'> module_exit(exit_nls_utf8)</div><div class='add'>+MODULE_DESCRIPTION("NLS UTF-8");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c<br/>index 3464fa7e8538..9fb73bafd41d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/dnotify/dnotify.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/dnotify/dnotify.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/dnotify/dnotify.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/dnotify/dnotify.c</a></div><div class='hunk'>@@ -16,12 +16,11 @@</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify_backend.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int dir_notify_enable __read_mostly = 1;</div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static struct ctl_table dnotify_sysctls[] = {</div><div class='add'>+static const struct ctl_table dnotify_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "dir-notify-enable",</div><div class='ctx'> 		.data		= &amp;dir_notify_enable,</div><div class='hunk'>@@ -110,7 +109,7 @@ static int dnotify_handle_event(struct fsnotify_mark *inode_mark, u32 mask,</div><div class='ctx'> 			prev = &amp;dn-&gt;dn_next;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		fown = &amp;dn-&gt;dn_filp-&gt;f_owner;</div><div class='add'>+		fown = file_f_owner(dn-&gt;dn_filp);</div><div class='ctx'> 		send_sigio(fown, dn-&gt;dn_fd, POLL_MSG);</div><div class='ctx'> 		if (dn-&gt;dn_mask &amp; FS_DN_MULTISHOT)</div><div class='ctx'> 			prev = &amp;dn-&gt;dn_next;</div><div class='hunk'>@@ -162,7 +161,7 @@ void dnotify_flush(struct file *filp, fl_owner_t id)</div><div class='ctx'> 	if (!S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fsn_mark = fsnotify_find_mark(&amp;inode-&gt;i_fsnotify_marks, dnotify_group);</div><div class='add'>+	fsn_mark = fsnotify_find_inode_mark(inode, dnotify_group);</div><div class='ctx'> 	if (!fsn_mark)</div><div class='ctx'> 		return;</div><div class='ctx'> 	dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);</div><div class='hunk'>@@ -309,6 +308,10 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned int arg)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	error = file_f_owner_allocate(filp);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='ctx'> 	/* new fsnotify mark, we expect most fcntl calls to add a new mark */</div><div class='ctx'> 	new_dn_mark = kmem_cache_alloc(dnotify_mark_cache, GFP_KERNEL);</div><div class='ctx'> 	if (!new_dn_mark) {</div><div class='hunk'>@@ -326,7 +329,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned int arg)</div><div class='ctx'> 	fsnotify_group_lock(dnotify_group);</div><div class='ctx'> </div><div class='ctx'> 	/* add the new_fsn_mark or find an old one. */</div><div class='del'>-	fsn_mark = fsnotify_find_mark(&amp;inode-&gt;i_fsnotify_marks, dnotify_group);</div><div class='add'>+	fsn_mark = fsnotify_find_inode_mark(inode, dnotify_group);</div><div class='ctx'> 	if (fsn_mark) {</div><div class='ctx'> 		dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);</div><div class='ctx'> 		spin_lock(&amp;fsn_mark-&gt;lock);</div><div class='hunk'>@@ -343,9 +346,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned int arg)</div><div class='ctx'> 		new_fsn_mark = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	f = lookup_fdget_rcu(fd);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	f = fget_raw(fd);</div><div class='ctx'> </div><div class='ctx'> 	/* if (f != filp) means that we lost a race and another task/thread</div><div class='ctx'> 	 * actually closed the fd we are still playing with before we grabbed</div><div class='hunk'>@@ -402,8 +403,7 @@ static int __init dnotify_init(void)</div><div class='ctx'> 					  SLAB_PANIC|SLAB_ACCOUNT);</div><div class='ctx'> 	dnotify_mark_cache = KMEM_CACHE(dnotify_mark, SLAB_PANIC|SLAB_ACCOUNT);</div><div class='ctx'> </div><div class='del'>-	dnotify_group = fsnotify_alloc_group(&amp;dnotify_fsnotify_ops,</div><div class='del'>-					     FSNOTIFY_GROUP_NOFS);</div><div class='add'>+	dnotify_group = fsnotify_alloc_group(&amp;dnotify_fsnotify_ops, 0);</div><div class='ctx'> 	if (IS_ERR(dnotify_group))</div><div class='ctx'> 		panic("unable to allocate fsnotify group for dnotify\n");</div><div class='ctx'> 	dnotify_sysctl_init();</div><div class='head'>diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig<br/>index a511f9d8677b..0e36aaf379b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fanotify/Kconfig</a></div><div class='hunk'>@@ -15,7 +15,6 @@ config FANOTIFY</div><div class='ctx'> config FANOTIFY_ACCESS_PERMISSIONS</div><div class='ctx'> 	bool "fanotify permissions checking"</div><div class='ctx'> 	depends on FANOTIFY</div><div class='del'>-	depends on SECURITY</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	   Say Y here is you want fanotify listeners to be able to make permissions</div><div class='head'>diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c<br/>index 1e4def21811e..bfe884d624e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/fanotify.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/fanotify.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/fanotify.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fanotify/fanotify.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/fanotify.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify_backend.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -167,6 +166,8 @@ static bool fanotify_should_merge(struct fanotify_event *old,</div><div class='ctx'> 	case FANOTIFY_EVENT_TYPE_FS_ERROR:</div><div class='ctx'> 		return fanotify_error_event_equal(FANOTIFY_EE(old),</div><div class='ctx'> 						  FANOTIFY_EE(new));</div><div class='add'>+	case FANOTIFY_EVENT_TYPE_MNT:</div><div class='add'>+		return false;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -224,12 +225,14 @@ static int fanotify_get_response(struct fsnotify_group *group,</div><div class='ctx'> 				 struct fanotify_perm_event *event,</div><div class='ctx'> 				 struct fsnotify_iter_info *iter_info)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, errno;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: group=%p event=%p\n", __func__, group, event);</div><div class='ctx'> </div><div class='del'>-	ret = wait_event_killable(group-&gt;fanotify_data.access_waitq,</div><div class='del'>-				  event-&gt;state == FAN_EVENT_ANSWERED);</div><div class='add'>+	ret = wait_event_state(group-&gt;fanotify_data.access_waitq,</div><div class='add'>+				  event-&gt;state == FAN_EVENT_ANSWERED,</div><div class='add'>+				  (TASK_KILLABLE|TASK_FREEZABLE));</div><div class='add'>+</div><div class='ctx'> 	/* Signal pending? */</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		spin_lock(&amp;group-&gt;notification_lock);</div><div class='hunk'>@@ -261,14 +264,23 @@ static int fanotify_get_response(struct fsnotify_group *group,</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FAN_DENY:</div><div class='add'>+		/* Check custom errno from pre-content events */</div><div class='add'>+		errno = fanotify_get_response_errno(event-&gt;response);</div><div class='add'>+		if (errno) {</div><div class='add'>+			ret = -errno;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the response should be audited */</div><div class='del'>-	if (event-&gt;response &amp; FAN_AUDIT)</div><div class='del'>-		audit_fanotify(event-&gt;response &amp; ~FAN_AUDIT,</div><div class='del'>-			       &amp;event-&gt;audit_rule);</div><div class='add'>+	if (event-&gt;response &amp; FAN_AUDIT) {</div><div class='add'>+		u32 response = event-&gt;response &amp;</div><div class='add'>+			(FANOTIFY_RESPONSE_ACCESS | FANOTIFY_RESPONSE_FLAGS);</div><div class='add'>+		audit_fanotify(response &amp; ~FAN_AUDIT, &amp;event-&gt;audit_rule);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: group=%p event=%p about to return ret=%d\n", __func__,</div><div class='ctx'> 		 group, event, ret);</div><div class='hunk'>@@ -302,7 +314,10 @@ static u32 fanotify_group_event_mask(struct fsnotify_group *group,</div><div class='ctx'> 	pr_debug("%s: report_mask=%x mask=%x data=%p data_type=%d\n",</div><div class='ctx'> 		 __func__, iter_info-&gt;report_mask, event_mask, data, data_type);</div><div class='ctx'> </div><div class='del'>-	if (!fid_mode) {</div><div class='add'>+	if (FAN_GROUP_FLAG(group, FAN_REPORT_MNT)) {</div><div class='add'>+		if (data_type != FSNOTIFY_EVENT_MNT)</div><div class='add'>+			return 0;</div><div class='add'>+	} else if (!fid_mode) {</div><div class='ctx'> 		/* Do we have path to open a file descriptor? */</div><div class='ctx'> 		if (!path)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -400,7 +415,7 @@ static int fanotify_encode_fh(struct fanotify_fh *fh, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	int dwords, type = 0;</div><div class='ctx'> 	char *ext_buf = NULL;</div><div class='del'>-	void *buf = fh-&gt;buf;</div><div class='add'>+	void *buf = fh + 1;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	fh-&gt;type = FILEID_ROOT;</div><div class='hunk'>@@ -439,7 +454,13 @@ static int fanotify_encode_fh(struct fanotify_fh *fh, struct inode *inode,</div><div class='ctx'> 	dwords = fh_len &gt;&gt; 2;</div><div class='ctx'> 	type = exportfs_encode_fid(inode, buf, &amp;dwords);</div><div class='ctx'> 	err = -EINVAL;</div><div class='del'>-	if (type &lt;= 0 || type == FILEID_INVALID || fh_len != dwords &lt;&lt; 2)</div><div class='add'>+	/*</div><div class='add'>+	 * Unlike file_handle, type and len of struct fanotify_fh are u8.</div><div class='add'>+	 * Traditionally, filesystem return handle_type &lt; 0xff, but there</div><div class='add'>+	 * is no enforecement for that in vfs.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(MAX_HANDLE_SZ &gt; 0xff || FILEID_INVALID &gt; 0xff);</div><div class='add'>+	if (type &lt;= 0 || type &gt;= FILEID_INVALID || fh_len != dwords &lt;&lt; 2)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	fh-&gt;type = type;</div><div class='hunk'>@@ -547,9 +568,27 @@ static struct fanotify_event *fanotify_alloc_path_event(const struct path *path,</div><div class='ctx'> 	return &amp;pevent-&gt;fae;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fanotify_event *fanotify_alloc_perm_event(const struct path *path,</div><div class='add'>+static struct fanotify_event *fanotify_alloc_mnt_event(u64 mnt_id, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct fanotify_mnt_event *pevent;</div><div class='add'>+</div><div class='add'>+	pevent = kmem_cache_alloc(fanotify_mnt_event_cachep, gfp);</div><div class='add'>+	if (!pevent)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pevent-&gt;fae.type = FANOTIFY_EVENT_TYPE_MNT;</div><div class='add'>+	pevent-&gt;mnt_id = mnt_id;</div><div class='add'>+</div><div class='add'>+	return &amp;pevent-&gt;fae;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fanotify_event *fanotify_alloc_perm_event(const void *data,</div><div class='add'>+							int data_type,</div><div class='ctx'> 							gfp_t gfp)</div><div class='ctx'> {</div><div class='add'>+	const struct path *path = fsnotify_data_path(data, data_type);</div><div class='add'>+	const struct file_range *range =</div><div class='add'>+			    fsnotify_data_file_range(data, data_type);</div><div class='ctx'> 	struct fanotify_perm_event *pevent;</div><div class='ctx'> </div><div class='ctx'> 	pevent = kmem_cache_alloc(fanotify_perm_event_cachep, gfp);</div><div class='hunk'>@@ -563,6 +602,9 @@ static struct fanotify_event *fanotify_alloc_perm_event(const struct path *path,</div><div class='ctx'> 	pevent-&gt;hdr.len = 0;</div><div class='ctx'> 	pevent-&gt;state = FAN_EVENT_INIT;</div><div class='ctx'> 	pevent-&gt;path = *path;</div><div class='add'>+	/* NULL ppos means no range info */</div><div class='add'>+	pevent-&gt;ppos = range ? &amp;range-&gt;pos : NULL;</div><div class='add'>+	pevent-&gt;count = range ? range-&gt;count : 0;</div><div class='ctx'> 	path_get(path);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;pevent-&gt;fae;</div><div class='hunk'>@@ -714,6 +756,7 @@ static struct fanotify_event *fanotify_alloc_event(</div><div class='ctx'> 					      fid_mode);</div><div class='ctx'> 	struct inode *dirid = fanotify_dfid_inode(mask, data, data_type, dir);</div><div class='ctx'> 	const struct path *path = fsnotify_data_path(data, data_type);</div><div class='add'>+	u64 mnt_id = fsnotify_data_mnt_id(data, data_type);</div><div class='ctx'> 	struct mem_cgroup *old_memcg;</div><div class='ctx'> 	struct dentry *moved = NULL;</div><div class='ctx'> 	struct inode *child = NULL;</div><div class='hunk'>@@ -800,7 +843,7 @@ static struct fanotify_event *fanotify_alloc_event(</div><div class='ctx'> 	old_memcg = set_active_memcg(group-&gt;memcg);</div><div class='ctx'> </div><div class='ctx'> 	if (fanotify_is_perm_event(mask)) {</div><div class='del'>-		event = fanotify_alloc_perm_event(path, gfp);</div><div class='add'>+		event = fanotify_alloc_perm_event(data, data_type, gfp);</div><div class='ctx'> 	} else if (fanotify_is_error_event(mask)) {</div><div class='ctx'> 		event = fanotify_alloc_error_event(group, fsid, data,</div><div class='ctx'> 						   data_type, &amp;hash);</div><div class='hunk'>@@ -809,8 +852,12 @@ static struct fanotify_event *fanotify_alloc_event(</div><div class='ctx'> 						  moved, &amp;hash, gfp);</div><div class='ctx'> 	} else if (fid_mode) {</div><div class='ctx'> 		event = fanotify_alloc_fid_event(id, fsid, &amp;hash, gfp);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (path) {</div><div class='ctx'> 		event = fanotify_alloc_path_event(path, &amp;hash, gfp);</div><div class='add'>+	} else if (mnt_id) {</div><div class='add'>+		event = fanotify_alloc_mnt_event(mnt_id, gfp);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!event)</div><div class='hunk'>@@ -908,8 +955,9 @@ static int fanotify_handle_event(struct fsnotify_group *group, u32 mask,</div><div class='ctx'> 	BUILD_BUG_ON(FAN_OPEN_EXEC_PERM != FS_OPEN_EXEC_PERM);</div><div class='ctx'> 	BUILD_BUG_ON(FAN_FS_ERROR != FS_ERROR);</div><div class='ctx'> 	BUILD_BUG_ON(FAN_RENAME != FS_RENAME);</div><div class='add'>+	BUILD_BUG_ON(FAN_PRE_ACCESS != FS_PRE_ACCESS);</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 21);</div><div class='add'>+	BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 24);</div><div class='ctx'> </div><div class='ctx'> 	mask = fanotify_group_event_mask(group, iter_info, &amp;match_mask,</div><div class='ctx'> 					 mask, data, data_type, dir);</div><div class='hunk'>@@ -967,6 +1015,7 @@ finish:</div><div class='ctx'> </div><div class='ctx'> static void fanotify_free_group_priv(struct fsnotify_group *group)</div><div class='ctx'> {</div><div class='add'>+	put_user_ns(group-&gt;user_ns);</div><div class='ctx'> 	kfree(group-&gt;fanotify_data.merge_hash);</div><div class='ctx'> 	if (group-&gt;fanotify_data.ucounts)</div><div class='ctx'> 		dec_ucount(group-&gt;fanotify_data.ucounts,</div><div class='hunk'>@@ -1010,6 +1059,11 @@ static void fanotify_free_error_event(struct fsnotify_group *group,</div><div class='ctx'> 	mempool_free(fee, &amp;group-&gt;fanotify_data.error_events_pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fanotify_free_mnt_event(struct fanotify_event *event)</div><div class='add'>+{</div><div class='add'>+	kmem_cache_free(fanotify_mnt_event_cachep, FANOTIFY_ME(event));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fanotify_free_event(struct fsnotify_group *group,</div><div class='ctx'> 				struct fsnotify_event *fsn_event)</div><div class='ctx'> {</div><div class='hunk'>@@ -1036,6 +1090,9 @@ static void fanotify_free_event(struct fsnotify_group *group,</div><div class='ctx'> 	case FANOTIFY_EVENT_TYPE_FS_ERROR:</div><div class='ctx'> 		fanotify_free_error_event(group, event);</div><div class='ctx'> 		break;</div><div class='add'>+	case FANOTIFY_EVENT_TYPE_MNT:</div><div class='add'>+		fanotify_free_mnt_event(event);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h<br/>index e5ab33cae6a7..39e60218df7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/fanotify.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/fanotify.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/fanotify.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fanotify/fanotify.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@ extern struct kmem_cache *fanotify_mark_cache;</div><div class='ctx'> extern struct kmem_cache *fanotify_fid_event_cachep;</div><div class='ctx'> extern struct kmem_cache *fanotify_path_event_cachep;</div><div class='ctx'> extern struct kmem_cache *fanotify_perm_event_cachep;</div><div class='add'>+extern struct kmem_cache *fanotify_mnt_event_cachep;</div><div class='ctx'> </div><div class='ctx'> /* Possible states of the permission event */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -24,7 +25,7 @@ enum {</div><div class='ctx'>  * stored in either the first or last 2 dwords.</div><div class='ctx'>  */</div><div class='ctx'> #define FANOTIFY_INLINE_FH_LEN	(3 &lt;&lt; 2)</div><div class='del'>-#define FANOTIFY_FH_HDR_LEN	offsetof(struct fanotify_fh, buf)</div><div class='add'>+#define FANOTIFY_FH_HDR_LEN	sizeof(struct fanotify_fh)</div><div class='ctx'> </div><div class='ctx'> /* Fixed size struct for file handle */</div><div class='ctx'> struct fanotify_fh {</div><div class='hunk'>@@ -33,7 +34,6 @@ struct fanotify_fh {</div><div class='ctx'> #define FANOTIFY_FH_FLAG_EXT_BUF 1</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 pad;</div><div class='del'>-	unsigned char buf[];</div><div class='ctx'> } __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* Variable size struct for dir file handle + child file handle + name */</div><div class='hunk'>@@ -91,7 +91,7 @@ static inline char **fanotify_fh_ext_buf_ptr(struct fanotify_fh *fh)</div><div class='ctx'> 	BUILD_BUG_ON(FANOTIFY_FH_HDR_LEN % 4);</div><div class='ctx'> 	BUILD_BUG_ON(__alignof__(char *) - 4 + sizeof(char *) &gt;</div><div class='ctx'> 		     FANOTIFY_INLINE_FH_LEN);</div><div class='del'>-	return (char **)ALIGN((unsigned long)(fh-&gt;buf), __alignof__(char *));</div><div class='add'>+	return (char **)ALIGN((unsigned long)(fh + 1), __alignof__(char *));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void *fanotify_fh_ext_buf(struct fanotify_fh *fh)</div><div class='hunk'>@@ -101,7 +101,7 @@ static inline void *fanotify_fh_ext_buf(struct fanotify_fh *fh)</div><div class='ctx'> </div><div class='ctx'> static inline void *fanotify_fh_buf(struct fanotify_fh *fh)</div><div class='ctx'> {</div><div class='del'>-	return fanotify_fh_has_ext_buf(fh) ? fanotify_fh_ext_buf(fh) : fh-&gt;buf;</div><div class='add'>+	return fanotify_fh_has_ext_buf(fh) ? fanotify_fh_ext_buf(fh) : fh + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int fanotify_info_dir_fh_len(struct fanotify_info *info)</div><div class='hunk'>@@ -244,6 +244,7 @@ enum fanotify_event_type {</div><div class='ctx'> 	FANOTIFY_EVENT_TYPE_PATH_PERM,</div><div class='ctx'> 	FANOTIFY_EVENT_TYPE_OVERFLOW, /* struct fanotify_event */</div><div class='ctx'> 	FANOTIFY_EVENT_TYPE_FS_ERROR, /* struct fanotify_error_event */</div><div class='add'>+	FANOTIFY_EVENT_TYPE_MNT,</div><div class='ctx'> 	__FANOTIFY_EVENT_TYPE_NUM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +277,7 @@ static inline void fanotify_init_event(struct fanotify_event *event,</div><div class='ctx'> #define FANOTIFY_INLINE_FH(name, size)					\</div><div class='ctx'> struct {								\</div><div class='ctx'> 	struct fanotify_fh name;					\</div><div class='del'>-	/* Space for object_fh.buf[] - access with fanotify_fh_buf() */	\</div><div class='add'>+	/* Space for filehandle - access with fanotify_fh_buf() */	\</div><div class='ctx'> 	unsigned char _inline_fh_buf[size];				\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -409,12 +410,23 @@ struct fanotify_path_event {</div><div class='ctx'> 	struct path path;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct fanotify_mnt_event {</div><div class='add'>+	struct fanotify_event fae;</div><div class='add'>+	u64 mnt_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline struct fanotify_path_event *</div><div class='ctx'> FANOTIFY_PE(struct fanotify_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(event, struct fanotify_path_event, fae);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct fanotify_mnt_event *</div><div class='add'>+FANOTIFY_ME(struct fanotify_event *event)</div><div class='add'>+{</div><div class='add'>+	return container_of(event, struct fanotify_mnt_event, fae);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Structure for permission fanotify events. It gets allocated and freed in</div><div class='ctx'>  * fanotify_handle_event() since we wait there for user response. When the</div><div class='hunk'>@@ -425,9 +437,13 @@ FANOTIFY_PE(struct fanotify_event *event)</div><div class='ctx'> struct fanotify_perm_event {</div><div class='ctx'> 	struct fanotify_event fae;</div><div class='ctx'> 	struct path path;</div><div class='add'>+	const loff_t *ppos;		/* optional file range info */</div><div class='add'>+	size_t count;</div><div class='ctx'> 	u32 response;			/* userspace answer to the event */</div><div class='ctx'> 	unsigned short state;		/* state of the event */</div><div class='add'>+	unsigned short watchdog_cnt;	/* already scanned by watchdog? */</div><div class='ctx'> 	int fd;		/* fd we passed to userspace for this event */</div><div class='add'>+	pid_t recv_pid;	/* pid of task receiving the event */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct fanotify_response_info_header hdr;</div><div class='ctx'> 		struct fanotify_response_info_audit_rule audit_rule;</div><div class='hunk'>@@ -446,6 +462,14 @@ static inline bool fanotify_is_perm_event(u32 mask)</div><div class='ctx'> 		mask &amp; FANOTIFY_PERM_EVENTS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool fanotify_event_has_access_range(struct fanotify_event *event)</div><div class='add'>+{</div><div class='add'>+	if (!(event-&gt;mask &amp; FANOTIFY_PRE_CONTENT_EVENTS))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return FANOTIFY_PERM(event)-&gt;ppos;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct fanotify_event *FANOTIFY_E(struct fsnotify_event *fse)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(fse, struct fanotify_event, fse);</div><div class='hunk'>@@ -456,6 +480,11 @@ static inline bool fanotify_is_error_event(u32 mask)</div><div class='ctx'> 	return mask &amp; FAN_FS_ERROR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool fanotify_is_mnt_event(u32 mask)</div><div class='add'>+{</div><div class='add'>+	return mask &amp; (FAN_MNT_ATTACH | FAN_MNT_DETACH);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline const struct path *fanotify_event_path(struct fanotify_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	if (event-&gt;type == FANOTIFY_EVENT_TYPE_PATH)</div><div class='hunk'>@@ -518,3 +547,8 @@ static inline unsigned int fanotify_mark_user_flags(struct fsnotify_mark *mark)</div><div class='ctx'> </div><div class='ctx'> 	return mflags;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline u32 fanotify_get_response_errno(int res)</div><div class='add'>+{</div><div class='add'>+	return (res &gt;&gt; FAN_ERRNO_SHIFT) &amp; FAN_ERRNO_MASK;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c<br/>index fbdc63cc10d9..d0b9b984002f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/fanotify_user.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fanotify/fanotify_user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fanotify/fanotify_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fanotify/fanotify_user.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/fanotify.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/anon_inodes.h&gt;</div><div class='hunk'>@@ -51,6 +50,7 @@</div><div class='ctx'> </div><div class='ctx'> /* configurable via /proc/sys/fs/fanotify/ */</div><div class='ctx'> static int fanotify_max_queued_events __read_mostly;</div><div class='add'>+static int perm_group_timeout __read_mostly;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +59,7 @@ static int fanotify_max_queued_events __read_mostly;</div><div class='ctx'> static long ft_zero = 0;</div><div class='ctx'> static long ft_int_max = INT_MAX;</div><div class='ctx'> </div><div class='del'>-static struct ctl_table fanotify_table[] = {</div><div class='add'>+static const struct ctl_table fanotify_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "max_user_groups",</div><div class='ctx'> 		.data	= &amp;init_user_ns.ucount_max[UCOUNT_FANOTIFY_GROUPS],</div><div class='hunk'>@@ -86,6 +86,14 @@ static struct ctl_table fanotify_table[] = {</div><div class='ctx'> 		.proc_handler	= proc_dointvec_minmax,</div><div class='ctx'> 		.extra1		= SYSCTL_ZERO</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.procname	= "watchdog_timeout",</div><div class='add'>+		.data		= &amp;perm_group_timeout,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= proc_dointvec_minmax,</div><div class='add'>+		.extra1		= SYSCTL_ZERO,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init fanotify_sysctls_init(void)</div><div class='hunk'>@@ -96,13 +104,97 @@ static void __init fanotify_sysctls_init(void)</div><div class='ctx'> #define fanotify_sysctls_init() do { } while (0)</div><div class='ctx'> #endif /* CONFIG_SYSCTL */</div><div class='ctx'> </div><div class='add'>+static LIST_HEAD(perm_group_list);</div><div class='add'>+static DEFINE_SPINLOCK(perm_group_lock);</div><div class='add'>+static void perm_group_watchdog(struct work_struct *work);</div><div class='add'>+static DECLARE_DELAYED_WORK(perm_group_work, perm_group_watchdog);</div><div class='add'>+</div><div class='add'>+static void perm_group_watchdog_schedule(void)</div><div class='add'>+{</div><div class='add'>+	schedule_delayed_work(&amp;perm_group_work, secs_to_jiffies(perm_group_timeout));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void perm_group_watchdog(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct fsnotify_group *group;</div><div class='add'>+	struct fanotify_perm_event *event;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	pid_t failed_pid = 0;</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;perm_group_lock);</div><div class='add'>+	if (list_empty(&amp;perm_group_list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(group, &amp;perm_group_list,</div><div class='add'>+			    fanotify_data.perm_grp_list) {</div><div class='add'>+		/*</div><div class='add'>+		 * Ok to test without lock, racing with an addition is</div><div class='add'>+		 * fine, will deal with it next round</div><div class='add'>+		 */</div><div class='add'>+		if (list_empty(&amp;group-&gt;fanotify_data.access_list))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;group-&gt;notification_lock);</div><div class='add'>+		list_for_each_entry(event, &amp;group-&gt;fanotify_data.access_list,</div><div class='add'>+				    fae.fse.list) {</div><div class='add'>+			if (likely(event-&gt;watchdog_cnt == 0)) {</div><div class='add'>+				event-&gt;watchdog_cnt = 1;</div><div class='add'>+			} else if (event-&gt;watchdog_cnt == 1) {</div><div class='add'>+				/* Report on event only once */</div><div class='add'>+				event-&gt;watchdog_cnt = 2;</div><div class='add'>+</div><div class='add'>+				/* Do not report same pid repeatedly */</div><div class='add'>+				if (event-&gt;recv_pid == failed_pid)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				failed_pid = event-&gt;recv_pid;</div><div class='add'>+				rcu_read_lock();</div><div class='add'>+				task = find_task_by_pid_ns(event-&gt;recv_pid,</div><div class='add'>+							   &amp;init_pid_ns);</div><div class='add'>+				pr_warn_ratelimited(</div><div class='add'>+					"PID %u (%s) failed to respond to fanotify queue for more than %d seconds\n",</div><div class='add'>+					event-&gt;recv_pid,</div><div class='add'>+					task ? task-&gt;comm : NULL,</div><div class='add'>+					perm_group_timeout);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;group-&gt;notification_lock);</div><div class='add'>+	}</div><div class='add'>+	perm_group_watchdog_schedule();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fanotify_perm_watchdog_group_remove(struct fsnotify_group *group)</div><div class='add'>+{</div><div class='add'>+	if (!list_empty(&amp;group-&gt;fanotify_data.perm_grp_list)) {</div><div class='add'>+		/* Perm event watchdog can no longer scan this group. */</div><div class='add'>+		spin_lock(&amp;perm_group_lock);</div><div class='add'>+		list_del_init(&amp;group-&gt;fanotify_data.perm_grp_list);</div><div class='add'>+		spin_unlock(&amp;perm_group_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fanotify_perm_watchdog_group_add(struct fsnotify_group *group)</div><div class='add'>+{</div><div class='add'>+	if (!perm_group_timeout)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;perm_group_lock);</div><div class='add'>+	if (list_empty(&amp;group-&gt;fanotify_data.perm_grp_list)) {</div><div class='add'>+		/* Add to perm_group_list for monitoring by watchdog. */</div><div class='add'>+		if (list_empty(&amp;perm_group_list))</div><div class='add'>+			perm_group_watchdog_schedule();</div><div class='add'>+		list_add_tail(&amp;group-&gt;fanotify_data.perm_grp_list, &amp;perm_group_list);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;perm_group_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * All flags that may be specified in parameter event_f_flags of fanotify_init.</div><div class='ctx'>  *</div><div class='ctx'>  * Internal and external open flags are stored together in field f_flags of</div><div class='ctx'>  * struct file. Only external open flags shall be allowed in event_f_flags.</div><div class='del'>- * Internal flags like FMODE_NONOTIFY, FMODE_EXEC, FMODE_NOCMTIME shall be</div><div class='del'>- * excluded.</div><div class='add'>+ * Internal flags like FMODE_EXEC shall be excluded.</div><div class='ctx'>  */</div><div class='ctx'> #define	FANOTIFY_INIT_ALL_EVENT_F_BITS				( \</div><div class='ctx'> 		O_ACCMODE	| O_APPEND	| O_NONBLOCK	| \</div><div class='hunk'>@@ -115,14 +207,19 @@ struct kmem_cache *fanotify_mark_cache __ro_after_init;</div><div class='ctx'> struct kmem_cache *fanotify_fid_event_cachep __ro_after_init;</div><div class='ctx'> struct kmem_cache *fanotify_path_event_cachep __ro_after_init;</div><div class='ctx'> struct kmem_cache *fanotify_perm_event_cachep __ro_after_init;</div><div class='add'>+struct kmem_cache *fanotify_mnt_event_cachep __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> #define FANOTIFY_EVENT_ALIGN 4</div><div class='ctx'> #define FANOTIFY_FID_INFO_HDR_LEN \</div><div class='ctx'> 	(sizeof(struct fanotify_event_info_fid) + sizeof(struct file_handle))</div><div class='del'>-#define FANOTIFY_PIDFD_INFO_HDR_LEN \</div><div class='add'>+#define FANOTIFY_PIDFD_INFO_LEN \</div><div class='ctx'> 	sizeof(struct fanotify_event_info_pidfd)</div><div class='ctx'> #define FANOTIFY_ERROR_INFO_LEN \</div><div class='ctx'> 	(sizeof(struct fanotify_event_info_error))</div><div class='add'>+#define FANOTIFY_RANGE_INFO_LEN \</div><div class='add'>+	(sizeof(struct fanotify_event_info_range))</div><div class='add'>+#define FANOTIFY_MNT_INFO_LEN \</div><div class='add'>+	(sizeof(struct fanotify_event_info_mnt))</div><div class='ctx'> </div><div class='ctx'> static int fanotify_fid_info_len(int fh_len, int name_len)</div><div class='ctx'> {</div><div class='hunk'>@@ -160,9 +257,6 @@ static size_t fanotify_event_len(unsigned int info_mode,</div><div class='ctx'> 	int fh_len;</div><div class='ctx'> 	int dot_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (!info_mode)</div><div class='del'>-		return event_len;</div><div class='del'>-</div><div class='ctx'> 	if (fanotify_is_error_event(event-&gt;mask))</div><div class='ctx'> 		event_len += FANOTIFY_ERROR_INFO_LEN;</div><div class='ctx'> </div><div class='hunk'>@@ -177,13 +271,18 @@ static size_t fanotify_event_len(unsigned int info_mode,</div><div class='ctx'> 		dot_len = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info_mode &amp; FAN_REPORT_PIDFD)</div><div class='del'>-		event_len += FANOTIFY_PIDFD_INFO_HDR_LEN;</div><div class='del'>-</div><div class='ctx'> 	if (fanotify_event_has_object_fh(event)) {</div><div class='ctx'> 		fh_len = fanotify_event_object_fh_len(event);</div><div class='ctx'> 		event_len += fanotify_fid_info_len(fh_len, dot_len);</div><div class='ctx'> 	}</div><div class='add'>+	if (fanotify_is_mnt_event(event-&gt;mask))</div><div class='add'>+		event_len += FANOTIFY_MNT_INFO_LEN;</div><div class='add'>+</div><div class='add'>+	if (info_mode &amp; FAN_REPORT_PIDFD)</div><div class='add'>+		event_len += FANOTIFY_PIDFD_INFO_LEN;</div><div class='add'>+</div><div class='add'>+	if (fanotify_event_has_access_range(event))</div><div class='add'>+		event_len += FANOTIFY_RANGE_INFO_LEN;</div><div class='ctx'> </div><div class='ctx'> 	return event_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -259,20 +358,12 @@ static int create_fd(struct fsnotify_group *group, const struct path *path,</div><div class='ctx'> 		return client_fd;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * we need a new file handle for the userspace program so it can read even if it was</div><div class='del'>-	 * originally opened O_WRONLY.</div><div class='add'>+	 * We provide an fd for the userspace program, so it could access the</div><div class='add'>+	 * file without generating fanotify events itself.</div><div class='ctx'> 	 */</div><div class='del'>-	new_file = dentry_open(path,</div><div class='del'>-			       group-&gt;fanotify_data.f_flags | __FMODE_NONOTIFY,</div><div class='del'>-			       current_cred());</div><div class='add'>+	new_file = dentry_open_nonotify(path, group-&gt;fanotify_data.f_flags,</div><div class='add'>+					current_cred());</div><div class='ctx'> 	if (IS_ERR(new_file)) {</div><div class='del'>-		/*</div><div class='del'>-		 * we still send an event even if we can't open the file.  this</div><div class='del'>-		 * can happen when say tasks are gone and we try to open their</div><div class='del'>-		 * /proc files or we try to open a WRONLY file like in sysfs</div><div class='del'>-		 * we just send the errno to userspace since there isn't much</div><div class='del'>-		 * else we can do.</div><div class='del'>-		 */</div><div class='ctx'> 		put_unused_fd(client_fd);</div><div class='ctx'> 		client_fd = PTR_ERR(new_file);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -335,11 +426,12 @@ static int process_access_response(struct fsnotify_group *group,</div><div class='ctx'> 	struct fanotify_perm_event *event;</div><div class='ctx'> 	int fd = response_struct-&gt;fd;</div><div class='ctx'> 	u32 response = response_struct-&gt;response;</div><div class='add'>+	int errno = fanotify_get_response_errno(response);</div><div class='ctx'> 	int ret = info_len;</div><div class='ctx'> 	struct fanotify_response_info_audit_rule friar;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s: group=%p fd=%d response=%u buf=%p size=%zu\n", __func__,</div><div class='del'>-		 group, fd, response, info, info_len);</div><div class='add'>+	pr_debug("%s: group=%p fd=%d response=%x errno=%d buf=%p size=%zu\n",</div><div class='add'>+		 __func__, group, fd, response, errno, info, info_len);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * make sure the response is valid, if invalid we do nothing and either</div><div class='ctx'> 	 * userspace can send a valid response or we will clean it up after the</div><div class='hunk'>@@ -350,7 +442,31 @@ static int process_access_response(struct fsnotify_group *group,</div><div class='ctx'> </div><div class='ctx'> 	switch (response &amp; FANOTIFY_RESPONSE_ACCESS) {</div><div class='ctx'> 	case FAN_ALLOW:</div><div class='add'>+		if (errno)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	case FAN_DENY:</div><div class='add'>+		/* Custom errno is supported only for pre-content groups */</div><div class='add'>+		if (errno &amp;&amp; group-&gt;priority != FSNOTIFY_PRIO_PRE_CONTENT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Limit errno to values expected on open(2)/read(2)/write(2)</div><div class='add'>+		 * of regular files.</div><div class='add'>+		 */</div><div class='add'>+		switch (errno) {</div><div class='add'>+		case 0:</div><div class='add'>+		case EIO:</div><div class='add'>+		case EPERM:</div><div class='add'>+		case EBUSY:</div><div class='add'>+		case ETXTBSY:</div><div class='add'>+		case EAGAIN:</div><div class='add'>+		case ENOSPC:</div><div class='add'>+		case EDQUOT:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -388,6 +504,25 @@ static int process_access_response(struct fsnotify_group *group,</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t copy_mnt_info_to_user(struct fanotify_event *event,</div><div class='add'>+				    char __user *buf, int count)</div><div class='add'>+{</div><div class='add'>+	struct fanotify_event_info_mnt info = { };</div><div class='add'>+</div><div class='add'>+	info.hdr.info_type = FAN_EVENT_INFO_TYPE_MNT;</div><div class='add'>+	info.hdr.len = FANOTIFY_MNT_INFO_LEN;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(count &lt; info.hdr.len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	info.mnt_id = FANOTIFY_ME(event)-&gt;mnt_id;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return info.hdr.len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t copy_error_info_to_user(struct fanotify_event *event,</div><div class='ctx'> 				      char __user *buf, int count)</div><div class='ctx'> {</div><div class='hunk'>@@ -514,7 +649,7 @@ static int copy_pidfd_info_to_user(int pidfd,</div><div class='ctx'> 				   size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct fanotify_event_info_pidfd info = { };</div><div class='del'>-	size_t info_len = FANOTIFY_PIDFD_INFO_HDR_LEN;</div><div class='add'>+	size_t info_len = FANOTIFY_PIDFD_INFO_LEN;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON_ONCE(info_len &gt; count))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -529,6 +664,30 @@ static int copy_pidfd_info_to_user(int pidfd,</div><div class='ctx'> 	return info_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t copy_range_info_to_user(struct fanotify_event *event,</div><div class='add'>+				      char __user *buf, int count)</div><div class='add'>+{</div><div class='add'>+	struct fanotify_perm_event *pevent = FANOTIFY_PERM(event);</div><div class='add'>+	struct fanotify_event_info_range info = { };</div><div class='add'>+	size_t info_len = FANOTIFY_RANGE_INFO_LEN;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(info_len &gt; count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!pevent-&gt;ppos))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	info.hdr.info_type = FAN_EVENT_INFO_TYPE_RANGE;</div><div class='add'>+	info.hdr.len = info_len;</div><div class='add'>+	info.offset = *(pevent-&gt;ppos);</div><div class='add'>+	info.count = pevent-&gt;count;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;info, info_len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return info_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int copy_info_records_to_user(struct fanotify_event *event,</div><div class='ctx'> 				     struct fanotify_info *info,</div><div class='ctx'> 				     unsigned int info_mode, int pidfd,</div><div class='hunk'>@@ -650,6 +809,24 @@ static int copy_info_records_to_user(struct fanotify_event *event,</div><div class='ctx'> 		total_bytes += ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (fanotify_event_has_access_range(event)) {</div><div class='add'>+		ret = copy_range_info_to_user(event, buf, count);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		buf += ret;</div><div class='add'>+		count -= ret;</div><div class='add'>+		total_bytes += ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fanotify_is_mnt_event(event-&gt;mask)) {</div><div class='add'>+		ret = copy_mnt_info_to_user(event, buf, count);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		buf += ret;</div><div class='add'>+		count -= ret;</div><div class='add'>+		total_bytes += ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return total_bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -663,7 +840,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,</div><div class='ctx'> 	unsigned int info_mode = FAN_GROUP_FLAG(group, FANOTIFY_INFO_MODES);</div><div class='ctx'> 	unsigned int pidfd_mode = info_mode &amp; FAN_REPORT_PIDFD;</div><div class='ctx'> 	struct file *f = NULL, *pidfd_file = NULL;</div><div class='del'>-	int ret, pidfd = FAN_NOPIDFD, fd = FAN_NOFD;</div><div class='add'>+	int ret, pidfd = -ESRCH, fd = -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: group=%p event=%p\n", __func__, group, event);</div><div class='ctx'> </div><div class='hunk'>@@ -691,10 +868,39 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,</div><div class='ctx'> 	if (!FAN_GROUP_FLAG(group, FANOTIFY_UNPRIV) &amp;&amp;</div><div class='ctx'> 	    path &amp;&amp; path-&gt;mnt &amp;&amp; path-&gt;dentry) {</div><div class='ctx'> 		fd = create_fd(group, path, &amp;f);</div><div class='del'>-		if (fd &lt; 0)</div><div class='del'>-			return fd;</div><div class='add'>+		/*</div><div class='add'>+		 * Opening an fd from dentry can fail for several reasons.</div><div class='add'>+		 * For example, when tasks are gone and we try to open their</div><div class='add'>+		 * /proc files or we try to open a WRONLY file like in sysfs</div><div class='add'>+		 * or when trying to open a file that was deleted on the</div><div class='add'>+		 * remote network server.</div><div class='add'>+		 *</div><div class='add'>+		 * For a group with FAN_REPORT_FD_ERROR, we will send the</div><div class='add'>+		 * event with the error instead of the open fd, otherwise</div><div class='add'>+		 * Userspace may not get the error at all.</div><div class='add'>+		 * In any case, userspace will not know which file failed to</div><div class='add'>+		 * open, so add a debug print for further investigation.</div><div class='add'>+		 */</div><div class='add'>+		if (fd &lt; 0) {</div><div class='add'>+			pr_debug("fanotify: create_fd(%pd2) failed err=%d\n",</div><div class='add'>+				 path-&gt;dentry, fd);</div><div class='add'>+			if (!FAN_GROUP_FLAG(group, FAN_REPORT_FD_ERROR)) {</div><div class='add'>+				/*</div><div class='add'>+				 * Historically, we've handled EOPENSTALE in a</div><div class='add'>+				 * special way and silently dropped such</div><div class='add'>+				 * events. Now we have to keep it to maintain</div><div class='add'>+				 * backward compatibility...</div><div class='add'>+				 */</div><div class='add'>+				if (fd == -EOPENSTALE)</div><div class='add'>+					fd = 0;</div><div class='add'>+				return fd;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	metadata.fd = fd;</div><div class='add'>+	if (FAN_GROUP_FLAG(group, FAN_REPORT_FD_ERROR))</div><div class='add'>+		metadata.fd = fd;</div><div class='add'>+	else</div><div class='add'>+		metadata.fd = fd &gt;= 0 ? fd : FAN_NOFD;</div><div class='ctx'> </div><div class='ctx'> 	if (pidfd_mode) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -709,18 +915,16 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,</div><div class='ctx'> 		 * The PIDTYPE_TGID check for an event-&gt;pid is performed</div><div class='ctx'> 		 * preemptively in an attempt to catch out cases where the event</div><div class='ctx'> 		 * listener reads events after the event generating process has</div><div class='del'>-		 * already terminated. Report FAN_NOPIDFD to the event listener</div><div class='del'>-		 * in those cases, with all other pidfd creation errors being</div><div class='del'>-		 * reported as FAN_EPIDFD.</div><div class='add'>+		 * already terminated.  Depending on flag FAN_REPORT_FD_ERROR,</div><div class='add'>+		 * report either -ESRCH or FAN_NOPIDFD to the event listener in</div><div class='add'>+		 * those cases with all other pidfd creation errors reported as</div><div class='add'>+		 * the error code itself or as FAN_EPIDFD.</div><div class='ctx'> 		 */</div><div class='del'>-		if (metadata.pid == 0 ||</div><div class='del'>-		    !pid_has_task(event-&gt;pid, PIDTYPE_TGID)) {</div><div class='del'>-			pidfd = FAN_NOPIDFD;</div><div class='del'>-		} else {</div><div class='add'>+		if (metadata.pid &amp;&amp; pid_has_task(event-&gt;pid, PIDTYPE_TGID))</div><div class='ctx'> 			pidfd = pidfd_prepare(event-&gt;pid, 0, &amp;pidfd_file);</div><div class='del'>-			if (pidfd &lt; 0)</div><div class='del'>-				pidfd = FAN_EPIDFD;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		if (!FAN_GROUP_FLAG(group, FAN_REPORT_FD_ERROR) &amp;&amp; pidfd &lt; 0)</div><div class='add'>+			pidfd = pidfd == -ESRCH ? FAN_NOPIDFD : FAN_EPIDFD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -EFAULT;</div><div class='hunk'>@@ -737,15 +941,10 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,</div><div class='ctx'> 	buf += FAN_EVENT_METADATA_LEN;</div><div class='ctx'> 	count -= FAN_EVENT_METADATA_LEN;</div><div class='ctx'> </div><div class='del'>-	if (fanotify_is_perm_event(event-&gt;mask))</div><div class='del'>-		FANOTIFY_PERM(event)-&gt;fd = fd;</div><div class='del'>-</div><div class='del'>-	if (info_mode) {</div><div class='del'>-		ret = copy_info_records_to_user(event, info, info_mode, pidfd,</div><div class='del'>-						buf, count);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_close_fd;</div><div class='del'>-	}</div><div class='add'>+	ret = copy_info_records_to_user(event, info, info_mode, pidfd,</div><div class='add'>+					buf, count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_close_fd;</div><div class='ctx'> </div><div class='ctx'> 	if (f)</div><div class='ctx'> 		fd_install(fd, f);</div><div class='hunk'>@@ -753,15 +952,18 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,</div><div class='ctx'> 	if (pidfd_file)</div><div class='ctx'> 		fd_install(pidfd, pidfd_file);</div><div class='ctx'> </div><div class='add'>+	if (fanotify_is_perm_event(event-&gt;mask))</div><div class='add'>+		FANOTIFY_PERM(event)-&gt;fd = fd;</div><div class='add'>+</div><div class='ctx'> 	return metadata.event_len;</div><div class='ctx'> </div><div class='ctx'> out_close_fd:</div><div class='del'>-	if (fd != FAN_NOFD) {</div><div class='add'>+	if (f) {</div><div class='ctx'> 		put_unused_fd(fd);</div><div class='ctx'> 		fput(f);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pidfd &gt;= 0) {</div><div class='add'>+	if (pidfd_file) {</div><div class='ctx'> 		put_unused_fd(pidfd);</div><div class='ctx'> 		fput(pidfd_file);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -828,15 +1030,6 @@ static ssize_t fanotify_read(struct file *file, char __user *buf,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = copy_event_to_user(group, event, buf, count);</div><div class='del'>-		if (unlikely(ret == -EOPENSTALE)) {</div><div class='del'>-			/*</div><div class='del'>-			 * We cannot report events with stale fd so drop it.</div><div class='del'>-			 * Setting ret to 0 will continue the event loop and</div><div class='del'>-			 * do the right thing if there are no more events to</div><div class='del'>-			 * read (i.e. return bytes read, -EAGAIN or wait).</div><div class='del'>-			 */</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Permission events get queued to wait for response.  Other</div><div class='hunk'>@@ -845,7 +1038,7 @@ static ssize_t fanotify_read(struct file *file, char __user *buf,</div><div class='ctx'> 		if (!fanotify_is_perm_event(event-&gt;mask)) {</div><div class='ctx'> 			fsnotify_destroy_event(group, &amp;event-&gt;fse);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (ret &lt;= 0) {</div><div class='add'>+			if (ret &lt;= 0 || FANOTIFY_PERM(event)-&gt;fd &lt; 0) {</div><div class='ctx'> 				spin_lock(&amp;group-&gt;notification_lock);</div><div class='ctx'> 				finish_permission_event(group,</div><div class='ctx'> 					FANOTIFY_PERM(event), FAN_DENY, NULL);</div><div class='hunk'>@@ -854,6 +1047,7 @@ static ssize_t fanotify_read(struct file *file, char __user *buf,</div><div class='ctx'> 				spin_lock(&amp;group-&gt;notification_lock);</div><div class='ctx'> 				list_add_tail(&amp;event-&gt;fse.list,</div><div class='ctx'> 					&amp;group-&gt;fanotify_data.access_list);</div><div class='add'>+				FANOTIFY_PERM(event)-&gt;recv_pid = current-&gt;pid;</div><div class='ctx'> 				spin_unlock(&amp;group-&gt;notification_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -913,6 +1107,8 @@ static int fanotify_release(struct inode *ignored, struct file *file)</div><div class='ctx'> 	 */</div><div class='ctx'> 	fsnotify_group_stop_queueing(group);</div><div class='ctx'> </div><div class='add'>+	fanotify_perm_watchdog_group_remove(group);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Process all permission events on access_list and notification queue</div><div class='ctx'> 	 * and simulate reply from userspace.</div><div class='hunk'>@@ -1003,22 +1199,17 @@ static int fanotify_find_path(int dfd, const char __user *filename,</div><div class='ctx'> 		 dfd, filename, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (filename == NULL) {</div><div class='del'>-		struct fd f = fdget(dfd);</div><div class='add'>+		CLASS(fd, f)(dfd);</div><div class='ctx'> </div><div class='del'>-		ret = -EBADF;</div><div class='del'>-		if (!f.file)</div><div class='del'>-			goto out;</div><div class='add'>+		if (fd_empty(f))</div><div class='add'>+			return -EBADF;</div><div class='ctx'> </div><div class='del'>-		ret = -ENOTDIR;</div><div class='ctx'> 		if ((flags &amp; FAN_MARK_ONLYDIR) &amp;&amp;</div><div class='del'>-		    !(S_ISDIR(file_inode(f.file)-&gt;i_mode))) {</div><div class='del'>-			fdput(f);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		    !(S_ISDIR(file_inode(fd_file(f))-&gt;i_mode)))</div><div class='add'>+			return -ENOTDIR;</div><div class='ctx'> </div><div class='del'>-		*path = f.file-&gt;f_path;</div><div class='add'>+		*path = fd_file(f)-&gt;f_path;</div><div class='ctx'> 		path_get(path);</div><div class='del'>-		fdput(f);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned int lookup_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1076,7 +1267,7 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fanotify_remove_mark(struct fsnotify_group *group,</div><div class='del'>-				fsnotify_connp_t *connp, __u32 mask,</div><div class='add'>+				void *obj, unsigned int obj_type, __u32 mask,</div><div class='ctx'> 				unsigned int flags, __u32 umask)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsnotify_mark *fsn_mark = NULL;</div><div class='hunk'>@@ -1084,7 +1275,7 @@ static int fanotify_remove_mark(struct fsnotify_group *group,</div><div class='ctx'> 	int destroy_mark;</div><div class='ctx'> </div><div class='ctx'> 	fsnotify_group_lock(group);</div><div class='del'>-	fsn_mark = fsnotify_find_mark(connp, group);</div><div class='add'>+	fsn_mark = fsnotify_find_mark(obj, obj_type, group);</div><div class='ctx'> 	if (!fsn_mark) {</div><div class='ctx'> 		fsnotify_group_unlock(group);</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -1105,30 +1296,6 @@ static int fanotify_remove_mark(struct fsnotify_group *group,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group,</div><div class='del'>-					 struct vfsmount *mnt, __u32 mask,</div><div class='del'>-					 unsigned int flags, __u32 umask)</div><div class='del'>-{</div><div class='del'>-	return fanotify_remove_mark(group, &amp;real_mount(mnt)-&gt;mnt_fsnotify_marks,</div><div class='del'>-				    mask, flags, umask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fanotify_remove_sb_mark(struct fsnotify_group *group,</div><div class='del'>-				   struct super_block *sb, __u32 mask,</div><div class='del'>-				   unsigned int flags, __u32 umask)</div><div class='del'>-{</div><div class='del'>-	return fanotify_remove_mark(group, &amp;sb-&gt;s_fsnotify_marks, mask,</div><div class='del'>-				    flags, umask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fanotify_remove_inode_mark(struct fsnotify_group *group,</div><div class='del'>-				      struct inode *inode, __u32 mask,</div><div class='del'>-				      unsigned int flags, __u32 umask)</div><div class='del'>-{</div><div class='del'>-	return fanotify_remove_mark(group, &amp;inode-&gt;i_fsnotify_marks, mask,</div><div class='del'>-				    flags, umask);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool fanotify_mark_update_flags(struct fsnotify_mark *fsn_mark,</div><div class='ctx'> 				       unsigned int fan_flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -1249,7 +1416,7 @@ static int fanotify_set_mark_fsid(struct fsnotify_group *group,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group,</div><div class='del'>-						   fsnotify_connp_t *connp,</div><div class='add'>+						   void *obj,</div><div class='ctx'> 						   unsigned int obj_type,</div><div class='ctx'> 						   unsigned int fan_flags,</div><div class='ctx'> 						   struct fan_fsid *fsid)</div><div class='hunk'>@@ -1264,6 +1431,7 @@ static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group,</div><div class='ctx'> 	 * A group with FAN_UNLIMITED_MARKS does not contribute to mark count</div><div class='ctx'> 	 * in the limited groups account.</div><div class='ctx'> 	 */</div><div class='add'>+	BUILD_BUG_ON(!(FANOTIFY_ADMIN_INIT_FLAGS &amp; FAN_UNLIMITED_MARKS));</div><div class='ctx'> 	if (!FAN_GROUP_FLAG(group, FAN_UNLIMITED_MARKS) &amp;&amp;</div><div class='ctx'> 	    !inc_ucount(ucounts-&gt;ns, ucounts-&gt;uid, UCOUNT_FANOTIFY_MARKS))</div><div class='ctx'> 		return ERR_PTR(-ENOSPC);</div><div class='hunk'>@@ -1288,7 +1456,7 @@ static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group,</div><div class='ctx'> 		fan_mark-&gt;fsid.val[0] = fan_mark-&gt;fsid.val[1] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = fsnotify_add_mark_locked(mark, connp, obj_type, 0);</div><div class='add'>+	ret = fsnotify_add_mark_locked(mark, obj, obj_type, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_put_mark;</div><div class='ctx'> </div><div class='hunk'>@@ -1313,7 +1481,7 @@ static int fanotify_group_init_error_pool(struct fsnotify_group *group)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fanotify_may_update_existing_mark(struct fsnotify_mark *fsn_mark,</div><div class='del'>-					      unsigned int fan_flags)</div><div class='add'>+					     __u32 mask, unsigned int fan_flags)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Non evictable mark cannot be downgraded to evictable mark.</div><div class='hunk'>@@ -1340,11 +1508,16 @@ static int fanotify_may_update_existing_mark(struct fsnotify_mark *fsn_mark,</div><div class='ctx'> 	    fsn_mark-&gt;flags &amp; FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> </div><div class='add'>+	/* For now pre-content events are not generated for directories */</div><div class='add'>+	mask |= fsn_mark-&gt;mask;</div><div class='add'>+	if (mask &amp; FANOTIFY_PRE_CONTENT_EVENTS &amp;&amp; mask &amp; FAN_ONDIR)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fanotify_add_mark(struct fsnotify_group *group,</div><div class='del'>-			     fsnotify_connp_t *connp, unsigned int obj_type,</div><div class='add'>+			     void *obj, unsigned int obj_type,</div><div class='ctx'> 			     __u32 mask, unsigned int fan_flags,</div><div class='ctx'> 			     struct fan_fsid *fsid)</div><div class='ctx'> {</div><div class='hunk'>@@ -1353,9 +1526,9 @@ static int fanotify_add_mark(struct fsnotify_group *group,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	fsnotify_group_lock(group);</div><div class='del'>-	fsn_mark = fsnotify_find_mark(connp, group);</div><div class='add'>+	fsn_mark = fsnotify_find_mark(obj, obj_type, group);</div><div class='ctx'> 	if (!fsn_mark) {</div><div class='del'>-		fsn_mark = fanotify_add_new_mark(group, connp, obj_type,</div><div class='add'>+		fsn_mark = fanotify_add_new_mark(group, obj, obj_type,</div><div class='ctx'> 						 fan_flags, fsid);</div><div class='ctx'> 		if (IS_ERR(fsn_mark)) {</div><div class='ctx'> 			fsnotify_group_unlock(group);</div><div class='hunk'>@@ -1366,7 +1539,7 @@ static int fanotify_add_mark(struct fsnotify_group *group,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if requested mark flags conflict with an existing mark flags.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = fanotify_may_update_existing_mark(fsn_mark, fan_flags);</div><div class='add'>+	ret = fanotify_may_update_existing_mark(fsn_mark, mask, fan_flags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1389,43 +1562,11 @@ out:</div><div class='ctx'> 	fsnotify_group_unlock(group);</div><div class='ctx'> </div><div class='ctx'> 	fsnotify_put_mark(fsn_mark);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int fanotify_add_vfsmount_mark(struct fsnotify_group *group,</div><div class='del'>-				      struct vfsmount *mnt, __u32 mask,</div><div class='del'>-				      unsigned int flags, struct fan_fsid *fsid)</div><div class='del'>-{</div><div class='del'>-	return fanotify_add_mark(group, &amp;real_mount(mnt)-&gt;mnt_fsnotify_marks,</div><div class='del'>-				 FSNOTIFY_OBJ_TYPE_VFSMOUNT, mask, flags, fsid);</div><div class='del'>-}</div><div class='add'>+	if (!ret &amp;&amp; (mask &amp; FANOTIFY_PERM_EVENTS))</div><div class='add'>+		fanotify_perm_watchdog_group_add(group);</div><div class='ctx'> </div><div class='del'>-static int fanotify_add_sb_mark(struct fsnotify_group *group,</div><div class='del'>-				struct super_block *sb, __u32 mask,</div><div class='del'>-				unsigned int flags, struct fan_fsid *fsid)</div><div class='del'>-{</div><div class='del'>-	return fanotify_add_mark(group, &amp;sb-&gt;s_fsnotify_marks,</div><div class='del'>-				 FSNOTIFY_OBJ_TYPE_SB, mask, flags, fsid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fanotify_add_inode_mark(struct fsnotify_group *group,</div><div class='del'>-				   struct inode *inode, __u32 mask,</div><div class='del'>-				   unsigned int flags, struct fan_fsid *fsid)</div><div class='del'>-{</div><div class='del'>-	pr_debug("%s: group=%p inode=%p\n", __func__, group, inode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If some other task has this inode open for write we should not add</div><div class='del'>-	 * an ignore mask, unless that ignore mask is supposed to survive</div><div class='del'>-	 * modification changes anyway.</div><div class='del'>-	 */</div><div class='del'>-	if ((flags &amp; FANOTIFY_MARK_IGNORE_BITS) &amp;&amp;</div><div class='del'>-	    !(flags &amp; FAN_MARK_IGNORED_SURV_MODIFY) &amp;&amp;</div><div class='del'>-	    inode_is_open_for_write(inode))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return fanotify_add_mark(group, &amp;inode-&gt;i_fsnotify_marks,</div><div class='del'>-				 FSNOTIFY_OBJ_TYPE_INODE, mask, flags, fsid);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fsnotify_event *fanotify_alloc_overflow_event(void)</div><div class='hunk'>@@ -1456,10 +1597,16 @@ static struct hlist_head *fanotify_alloc_merge_hash(void)</div><div class='ctx'> 	return hash;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_CLASS(fsnotify_group,</div><div class='add'>+	     struct fsnotify_group *,</div><div class='add'>+	     if (!IS_ERR_OR_NULL(_T)) fsnotify_destroy_group(_T),</div><div class='add'>+	     fsnotify_alloc_group(ops, flags),</div><div class='add'>+	     const struct fsnotify_ops *ops, int flags)</div><div class='add'>+</div><div class='ctx'> /* fanotify syscalls */</div><div class='ctx'> SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)</div><div class='ctx'> {</div><div class='del'>-	struct fsnotify_group *group;</div><div class='add'>+	struct user_namespace *user_ns = current_user_ns();</div><div class='ctx'> 	int f_flags, fd;</div><div class='ctx'> 	unsigned int fid_mode = flags &amp; FANOTIFY_FID_BITS;</div><div class='ctx'> 	unsigned int class = flags &amp; FANOTIFY_CLASS_BITS;</div><div class='hunk'>@@ -1472,10 +1619,11 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * An unprivileged user can setup an fanotify group with</div><div class='ctx'> 		 * limited functionality - an unprivileged group is limited to</div><div class='del'>-		 * notification events with file handles and it cannot use</div><div class='del'>-		 * unlimited queue/marks.</div><div class='add'>+		 * notification events with file handles or mount ids and it</div><div class='add'>+		 * cannot use unlimited queue/marks.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((flags &amp; FANOTIFY_ADMIN_INIT_FLAGS) || !fid_mode)</div><div class='add'>+		if ((flags &amp; FANOTIFY_ADMIN_INIT_FLAGS) ||</div><div class='add'>+		    !(flags &amp; (FANOTIFY_FID_BITS | FAN_REPORT_MNT)))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1501,6 +1649,14 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)</div><div class='ctx'> 	if ((flags &amp; FAN_REPORT_PIDFD) &amp;&amp; (flags &amp; FAN_REPORT_TID))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* Don't allow mixing mnt events with inode events for now */</div><div class='add'>+	if (flags &amp; FAN_REPORT_MNT) {</div><div class='add'>+		if (class != FAN_CLASS_NOTIF)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (flags &amp; (FANOTIFY_FID_BITS | FAN_REPORT_FD_ERROR))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (event_f_flags &amp; ~FANOTIFY_INIT_ALL_EVENT_F_BITS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1532,92 +1688,73 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)</div><div class='ctx'> 	    (!(fid_mode &amp; FAN_REPORT_NAME) || !(fid_mode &amp; FAN_REPORT_FID)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f_flags = O_RDWR | __FMODE_NONOTIFY;</div><div class='add'>+	f_flags = O_RDWR;</div><div class='ctx'> 	if (flags &amp; FAN_CLOEXEC)</div><div class='ctx'> 		f_flags |= O_CLOEXEC;</div><div class='ctx'> 	if (flags &amp; FAN_NONBLOCK)</div><div class='ctx'> 		f_flags |= O_NONBLOCK;</div><div class='ctx'> </div><div class='add'>+	CLASS(fsnotify_group, group)(&amp;fanotify_fsnotify_ops,</div><div class='add'>+				     FSNOTIFY_GROUP_USER);</div><div class='ctx'> 	/* fsnotify_alloc_group takes a ref.  Dropped in fanotify_release */</div><div class='del'>-	group = fsnotify_alloc_group(&amp;fanotify_fsnotify_ops,</div><div class='del'>-				     FSNOTIFY_GROUP_USER | FSNOTIFY_GROUP_NOFS);</div><div class='del'>-	if (IS_ERR(group)) {</div><div class='add'>+	if (IS_ERR(group))</div><div class='ctx'> 		return PTR_ERR(group);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enforce groups limits per user in all containing user ns */</div><div class='del'>-	group-&gt;fanotify_data.ucounts = inc_ucount(current_user_ns(),</div><div class='del'>-						  current_euid(),</div><div class='add'>+	group-&gt;fanotify_data.ucounts = inc_ucount(user_ns, current_euid(),</div><div class='ctx'> 						  UCOUNT_FANOTIFY_GROUPS);</div><div class='del'>-	if (!group-&gt;fanotify_data.ucounts) {</div><div class='del'>-		fd = -EMFILE;</div><div class='del'>-		goto out_destroy_group;</div><div class='del'>-	}</div><div class='add'>+	if (!group-&gt;fanotify_data.ucounts)</div><div class='add'>+		return -EMFILE;</div><div class='ctx'> </div><div class='ctx'> 	group-&gt;fanotify_data.flags = flags | internal_flags;</div><div class='ctx'> 	group-&gt;memcg = get_mem_cgroup_from_mm(current-&gt;mm);</div><div class='add'>+	group-&gt;user_ns = get_user_ns(user_ns);</div><div class='ctx'> </div><div class='ctx'> 	group-&gt;fanotify_data.merge_hash = fanotify_alloc_merge_hash();</div><div class='del'>-	if (!group-&gt;fanotify_data.merge_hash) {</div><div class='del'>-		fd = -ENOMEM;</div><div class='del'>-		goto out_destroy_group;</div><div class='del'>-	}</div><div class='add'>+	if (!group-&gt;fanotify_data.merge_hash)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	group-&gt;overflow_event = fanotify_alloc_overflow_event();</div><div class='del'>-	if (unlikely(!group-&gt;overflow_event)) {</div><div class='del'>-		fd = -ENOMEM;</div><div class='del'>-		goto out_destroy_group;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(!group-&gt;overflow_event))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (force_o_largefile())</div><div class='ctx'> 		event_f_flags |= O_LARGEFILE;</div><div class='ctx'> 	group-&gt;fanotify_data.f_flags = event_f_flags;</div><div class='ctx'> 	init_waitqueue_head(&amp;group-&gt;fanotify_data.access_waitq);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;group-&gt;fanotify_data.access_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;group-&gt;fanotify_data.perm_grp_list);</div><div class='ctx'> 	switch (class) {</div><div class='ctx'> 	case FAN_CLASS_NOTIF:</div><div class='del'>-		group-&gt;priority = FS_PRIO_0;</div><div class='add'>+		group-&gt;priority = FSNOTIFY_PRIO_NORMAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FAN_CLASS_CONTENT:</div><div class='del'>-		group-&gt;priority = FS_PRIO_1;</div><div class='add'>+		group-&gt;priority = FSNOTIFY_PRIO_CONTENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FAN_CLASS_PRE_CONTENT:</div><div class='del'>-		group-&gt;priority = FS_PRIO_2;</div><div class='add'>+		group-&gt;priority = FSNOTIFY_PRIO_PRE_CONTENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		fd = -EINVAL;</div><div class='del'>-		goto out_destroy_group;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(!(FANOTIFY_ADMIN_INIT_FLAGS &amp; FAN_UNLIMITED_QUEUE));</div><div class='ctx'> 	if (flags &amp; FAN_UNLIMITED_QUEUE) {</div><div class='del'>-		fd = -EPERM;</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-			goto out_destroy_group;</div><div class='ctx'> 		group-&gt;max_events = UINT_MAX;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		group-&gt;max_events = fanotify_max_queued_events;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; FAN_UNLIMITED_MARKS) {</div><div class='del'>-		fd = -EPERM;</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-			goto out_destroy_group;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (flags &amp; FAN_ENABLE_AUDIT) {</div><div class='del'>-		fd = -EPERM;</div><div class='ctx'> 		if (!capable(CAP_AUDIT_WRITE))</div><div class='del'>-			goto out_destroy_group;</div><div class='add'>+			return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fd = anon_inode_getfd("[fanotify]", &amp;fanotify_fops, group, f_flags);</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		goto out_destroy_group;</div><div class='del'>-</div><div class='del'>-	return fd;</div><div class='del'>-</div><div class='del'>-out_destroy_group:</div><div class='del'>-	fsnotify_destroy_group(group);</div><div class='add'>+	fd = FD_ADD(f_flags,</div><div class='add'>+		    anon_inode_getfile_fmode("[fanotify]", &amp;fanotify_fops,</div><div class='add'>+					     group, f_flags, FMODE_NONOTIFY));</div><div class='add'>+	if (fd &gt;= 0)</div><div class='add'>+		retain_and_null_ptr(group);</div><div class='ctx'> 	return fd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1693,12 +1830,24 @@ static int fanotify_events_supported(struct fsnotify_group *group,</div><div class='ctx'> 				     unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mark_type = flags &amp; FANOTIFY_MARK_TYPE_BITS;</div><div class='add'>+	bool is_dir = d_is_dir(path-&gt;dentry);</div><div class='ctx'> 	/* Strict validation of events in non-dir inode mask with v5.17+ APIs */</div><div class='ctx'> 	bool strict_dir_events = FAN_GROUP_FLAG(group, FAN_REPORT_TARGET_FID) ||</div><div class='ctx'> 				 (mask &amp; FAN_RENAME) ||</div><div class='ctx'> 				 (flags &amp; FAN_MARK_IGNORE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Filesystems need to opt-into pre-content evnets (a.k.a HSM)</div><div class='add'>+	 * and they are only supported on regular files and directories.</div><div class='add'>+	 */</div><div class='add'>+	if (mask &amp; FANOTIFY_PRE_CONTENT_EVENTS) {</div><div class='add'>+		if (!(path-&gt;mnt-&gt;mnt_sb-&gt;s_iflags &amp; SB_I_ALLOW_HSM))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (!is_dir &amp;&amp; !d_is_reg(path-&gt;dentry))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Some filesystems such as 'proc' acquire unusual locks when opening</div><div class='ctx'> 	 * files. For them fanotify permission events have high chances of</div><div class='ctx'> 	 * deadlocking the system - open done when reporting fanotify event</div><div class='hunk'>@@ -1730,7 +1879,7 @@ static int fanotify_events_supported(struct fsnotify_group *group,</div><div class='ctx'> 	 * but because we always allowed it, error only when using new APIs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (strict_dir_events &amp;&amp; mark_type == FAN_MARK_INODE &amp;&amp;</div><div class='del'>-	    !d_is_dir(path-&gt;dentry) &amp;&amp; (mask &amp; FANOTIFY_DIRONLY_EVENT_BITS))</div><div class='add'>+	    !is_dir &amp;&amp; (mask &amp; FANOTIFY_DIRONLY_EVENT_BITS))</div><div class='ctx'> 		return -ENOTDIR;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1740,16 +1889,17 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 			    int dfd, const char  __user *pathname)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='del'>-	struct vfsmount *mnt = NULL;</div><div class='ctx'> 	struct fsnotify_group *group;</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	struct fan_fsid __fsid, *fsid = NULL;</div><div class='add'>+	struct user_namespace *user_ns = NULL;</div><div class='add'>+	struct mnt_namespace *mntns;</div><div class='ctx'> 	u32 valid_mask = FANOTIFY_EVENTS | FANOTIFY_EVENT_FLAGS;</div><div class='ctx'> 	unsigned int mark_type = flags &amp; FANOTIFY_MARK_TYPE_BITS;</div><div class='ctx'> 	unsigned int mark_cmd = flags &amp; FANOTIFY_MARK_CMD_BITS;</div><div class='ctx'> 	unsigned int ignore = flags &amp; FANOTIFY_MARK_IGNORE_BITS;</div><div class='ctx'> 	unsigned int obj_type, fid_mode;</div><div class='add'>+	void *obj = NULL;</div><div class='ctx'> 	u32 umask = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1773,6 +1923,9 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 	case FAN_MARK_FILESYSTEM:</div><div class='ctx'> 		obj_type = FSNOTIFY_OBJ_TYPE_SB;</div><div class='ctx'> 		break;</div><div class='add'>+	case FAN_MARK_MNTNS:</div><div class='add'>+		obj_type = FSNOTIFY_OBJ_TYPE_MNTNS;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1811,39 +1964,50 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 		umask = FANOTIFY_EVENT_FLAGS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = fdget(fanotify_fd);</div><div class='del'>-	if (unlikely(!f.file))</div><div class='add'>+	CLASS(fd, f)(fanotify_fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	/* verify that this is indeed an fanotify instance */</div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-	if (unlikely(f.file-&gt;f_op != &amp;fanotify_fops))</div><div class='del'>-		goto fput_and_out;</div><div class='del'>-	group = f.file-&gt;private_data;</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_op != &amp;fanotify_fops))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	group = fd_file(f)-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* Only report mount events on mnt namespace */</div><div class='add'>+	if (FAN_GROUP_FLAG(group, FAN_REPORT_MNT)) {</div><div class='add'>+		if (mask &amp; ~FANOTIFY_MOUNT_EVENTS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (mark_type != FAN_MARK_MNTNS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (mask &amp; FANOTIFY_MOUNT_EVENTS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (mark_type == FAN_MARK_MNTNS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * An unprivileged user is not allowed to setup mount nor filesystem</div><div class='del'>-	 * marks.  This also includes setting up such marks by a group that</div><div class='del'>-	 * was initialized by an unprivileged user.</div><div class='add'>+	 * A user is allowed to setup sb/mount/mntns marks only if it is</div><div class='add'>+	 * capable in the user ns where the group was created.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = -EPERM;</div><div class='del'>-	if ((!capable(CAP_SYS_ADMIN) ||</div><div class='del'>-	     FAN_GROUP_FLAG(group, FANOTIFY_UNPRIV)) &amp;&amp;</div><div class='add'>+	if (!ns_capable(group-&gt;user_ns, CAP_SYS_ADMIN) &amp;&amp;</div><div class='ctx'> 	    mark_type != FAN_MARK_INODE)</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * group-&gt;priority == FS_PRIO_0 == FAN_CLASS_NOTIF.  These are not</div><div class='del'>-	 * allowed to set permissions events.</div><div class='add'>+	 * Permission events are not allowed for FAN_CLASS_NOTIF.</div><div class='add'>+	 * Pre-content permission events are not allowed for FAN_CLASS_CONTENT.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = -EINVAL;</div><div class='ctx'> 	if (mask &amp; FANOTIFY_PERM_EVENTS &amp;&amp;</div><div class='del'>-	    group-&gt;priority == FS_PRIO_0)</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+	    group-&gt;priority == FSNOTIFY_PRIO_NORMAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (mask &amp; FANOTIFY_PRE_CONTENT_EVENTS &amp;&amp;</div><div class='add'>+		 group-&gt;priority == FSNOTIFY_PRIO_CONTENT)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; FAN_FS_ERROR &amp;&amp;</div><div class='ctx'> 	    mark_type != FAN_MARK_FILESYSTEM)</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Evictable is only relevant for inode marks, because only inode object</div><div class='hunk'>@@ -1851,7 +2015,7 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (flags &amp; FAN_MARK_EVICTABLE &amp;&amp;</div><div class='ctx'> 	     mark_type != FAN_MARK_INODE)</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Events that do not carry enough information to report</div><div class='hunk'>@@ -1861,9 +2025,9 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 	 * point.</div><div class='ctx'> 	 */</div><div class='ctx'> 	fid_mode = FAN_GROUP_FLAG(group, FANOTIFY_FID_BITS);</div><div class='del'>-	if (mask &amp; ~(FANOTIFY_FD_EVENTS|FANOTIFY_EVENT_FLAGS) &amp;&amp;</div><div class='add'>+	if (mask &amp; ~(FANOTIFY_FD_EVENTS|FANOTIFY_MOUNT_EVENTS|FANOTIFY_EVENT_FLAGS) &amp;&amp;</div><div class='ctx'> 	    (!fid_mode || mark_type == FAN_MARK_MOUNT))</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FAN_RENAME uses special info type records to report the old and</div><div class='hunk'>@@ -1871,23 +2035,21 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 	 * useful and was not implemented.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (mask &amp; FAN_RENAME &amp;&amp; !(fid_mode &amp; FAN_REPORT_NAME))</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Pre-content events are not currently generated for directories. */</div><div class='add'>+	if (mask &amp; FANOTIFY_PRE_CONTENT_EVENTS &amp;&amp; mask &amp; FAN_ONDIR)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (mark_cmd == FAN_MARK_FLUSH) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		if (mark_type == FAN_MARK_MOUNT)</div><div class='del'>-			fsnotify_clear_vfsmount_marks_by_group(group);</div><div class='del'>-		else if (mark_type == FAN_MARK_FILESYSTEM)</div><div class='del'>-			fsnotify_clear_sb_marks_by_group(group);</div><div class='del'>-		else</div><div class='del'>-			fsnotify_clear_inode_marks_by_group(group);</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		fsnotify_clear_marks_by_group(group, obj_type);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fanotify_find_path(dfd, pathname, &amp;path, flags,</div><div class='ctx'> 			(mask &amp; ALL_FSNOTIFY_EVENTS), obj_type);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mark_cmd == FAN_MARK_ADD) {</div><div class='ctx'> 		ret = fanotify_events_supported(group, &amp;path, mask, flags);</div><div class='hunk'>@@ -1907,21 +2069,58 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 		fsid = &amp;__fsid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* inode held in place by reference to path; group by fget on fd */</div><div class='del'>-	if (mark_type == FAN_MARK_INODE)</div><div class='add'>+	/*</div><div class='add'>+	 * In addition to being capable in the user ns where group was created,</div><div class='add'>+	 * the user also needs to be capable in the user ns associated with</div><div class='add'>+	 * the filesystem or in the user ns associated with the mntns</div><div class='add'>+	 * (when marking mntns).</div><div class='add'>+	 */</div><div class='add'>+	if (obj_type == FSNOTIFY_OBJ_TYPE_INODE) {</div><div class='ctx'> 		inode = path.dentry-&gt;d_inode;</div><div class='del'>-	else</div><div class='del'>-		mnt = path.mnt;</div><div class='add'>+		obj = inode;</div><div class='add'>+	} else if (obj_type == FSNOTIFY_OBJ_TYPE_VFSMOUNT) {</div><div class='add'>+		user_ns = path.mnt-&gt;mnt_sb-&gt;s_user_ns;</div><div class='add'>+		obj = path.mnt;</div><div class='add'>+	} else if (obj_type == FSNOTIFY_OBJ_TYPE_SB) {</div><div class='add'>+		user_ns = path.mnt-&gt;mnt_sb-&gt;s_user_ns;</div><div class='add'>+		obj = path.mnt-&gt;mnt_sb;</div><div class='add'>+	} else if (obj_type == FSNOTIFY_OBJ_TYPE_MNTNS) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		mntns = mnt_ns_from_dentry(path.dentry);</div><div class='add'>+		if (!mntns)</div><div class='add'>+			goto path_put_and_out;</div><div class='add'>+		user_ns = mntns-&gt;user_ns;</div><div class='add'>+		obj = mntns;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = mnt ? -EINVAL : -EISDIR;</div><div class='del'>-	/* FAN_MARK_IGNORE requires SURV_MODIFY for sb/mount/dir marks */</div><div class='del'>-	if (mark_cmd == FAN_MARK_ADD &amp;&amp; ignore == FAN_MARK_IGNORE &amp;&amp;</div><div class='del'>-	    (mnt || S_ISDIR(inode-&gt;i_mode)) &amp;&amp;</div><div class='del'>-	    !(flags &amp; FAN_MARK_IGNORED_SURV_MODIFY))</div><div class='add'>+	ret = -EPERM;</div><div class='add'>+	if (user_ns &amp;&amp; !ns_capable(user_ns, CAP_SYS_ADMIN))</div><div class='ctx'> 		goto path_put_and_out;</div><div class='ctx'> </div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (!obj)</div><div class='add'>+		goto path_put_and_out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If some other task has this inode open for write we should not add</div><div class='add'>+	 * an ignore mask, unless that ignore mask is supposed to survive</div><div class='add'>+	 * modification changes anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (mark_cmd == FAN_MARK_ADD &amp;&amp; (flags &amp; FANOTIFY_MARK_IGNORE_BITS) &amp;&amp;</div><div class='add'>+	    !(flags &amp; FAN_MARK_IGNORED_SURV_MODIFY)) {</div><div class='add'>+		ret = !inode ? -EINVAL : -EISDIR;</div><div class='add'>+		/* FAN_MARK_IGNORE requires SURV_MODIFY for sb/mount/dir marks */</div><div class='add'>+		if (ignore == FAN_MARK_IGNORE &amp;&amp;</div><div class='add'>+		    (!inode || S_ISDIR(inode-&gt;i_mode)))</div><div class='add'>+			goto path_put_and_out;</div><div class='add'>+</div><div class='add'>+		ret = 0;</div><div class='add'>+		if (inode &amp;&amp; inode_is_open_for_write(inode))</div><div class='add'>+			goto path_put_and_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Mask out FAN_EVENT_ON_CHILD flag for sb/mount/non-dir marks */</div><div class='del'>-	if (mnt || !S_ISDIR(inode-&gt;i_mode)) {</div><div class='add'>+	if (!inode || !S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 		mask &amp;= ~FAN_EVENT_ON_CHILD;</div><div class='ctx'> 		umask = FAN_EVENT_ON_CHILD;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1936,26 +2135,12 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> 	/* create/update an inode mark */</div><div class='ctx'> 	switch (mark_cmd) {</div><div class='ctx'> 	case FAN_MARK_ADD:</div><div class='del'>-		if (mark_type == FAN_MARK_MOUNT)</div><div class='del'>-			ret = fanotify_add_vfsmount_mark(group, mnt, mask,</div><div class='del'>-							 flags, fsid);</div><div class='del'>-		else if (mark_type == FAN_MARK_FILESYSTEM)</div><div class='del'>-			ret = fanotify_add_sb_mark(group, mnt-&gt;mnt_sb, mask,</div><div class='del'>-						   flags, fsid);</div><div class='del'>-		else</div><div class='del'>-			ret = fanotify_add_inode_mark(group, inode, mask,</div><div class='del'>-						      flags, fsid);</div><div class='add'>+		ret = fanotify_add_mark(group, obj, obj_type, mask, flags,</div><div class='add'>+					fsid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FAN_MARK_REMOVE:</div><div class='del'>-		if (mark_type == FAN_MARK_MOUNT)</div><div class='del'>-			ret = fanotify_remove_vfsmount_mark(group, mnt, mask,</div><div class='del'>-							    flags, umask);</div><div class='del'>-		else if (mark_type == FAN_MARK_FILESYSTEM)</div><div class='del'>-			ret = fanotify_remove_sb_mark(group, mnt-&gt;mnt_sb, mask,</div><div class='del'>-						      flags, umask);</div><div class='del'>-		else</div><div class='del'>-			ret = fanotify_remove_inode_mark(group, inode, mask,</div><div class='del'>-							 flags, umask);</div><div class='add'>+		ret = fanotify_remove_mark(group, obj, obj_type, mask, flags,</div><div class='add'>+					   umask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -1963,8 +2148,6 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,</div><div class='ctx'> </div><div class='ctx'> path_put_and_out:</div><div class='ctx'> 	path_put(&amp;path);</div><div class='del'>-fput_and_out:</div><div class='del'>-	fdput(f);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2011,7 +2194,7 @@ static int __init fanotify_user_setup(void)</div><div class='ctx'> 				     FANOTIFY_DEFAULT_MAX_USER_MARKS);</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(FANOTIFY_INIT_FLAGS &amp; FANOTIFY_INTERNAL_GROUP_FLAGS);</div><div class='del'>-	BUILD_BUG_ON(HWEIGHT32(FANOTIFY_INIT_FLAGS) != 12);</div><div class='add'>+	BUILD_BUG_ON(HWEIGHT32(FANOTIFY_INIT_FLAGS) != 14);</div><div class='ctx'> 	BUILD_BUG_ON(HWEIGHT32(FANOTIFY_MARK_FLAGS) != 11);</div><div class='ctx'> </div><div class='ctx'> 	fanotify_mark_cache = KMEM_CACHE(fanotify_mark,</div><div class='hunk'>@@ -2024,6 +2207,7 @@ static int __init fanotify_user_setup(void)</div><div class='ctx'> 		fanotify_perm_event_cachep =</div><div class='ctx'> 			KMEM_CACHE(fanotify_perm_event, SLAB_PANIC);</div><div class='ctx'> 	}</div><div class='add'>+	fanotify_mnt_event_cachep = KMEM_CACHE(fanotify_mnt_event, SLAB_PANIC);</div><div class='ctx'> </div><div class='ctx'> 	fanotify_max_queued_events = FANOTIFY_DEFAULT_MAX_EVENTS;</div><div class='ctx'> 	init_user_ns.ucount_max[UCOUNT_FANOTIFY_GROUPS] =</div><div class='head'>diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c<br/>index 5c430736ec12..9cc7eb863643 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fdinfo.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fdinfo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fdinfo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fdinfo.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include "fanotify/fanotify.h"</div><div class='ctx'> #include "fdinfo.h"</div><div class='ctx'> #include "fsnotify.h"</div><div class='add'>+#include "../internal.h"</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PROC_FS)</div><div class='ctx'> </div><div class='hunk'>@@ -41,29 +42,28 @@ static void show_fdinfo(struct seq_file *m, struct file *f,</div><div class='ctx'> #if defined(CONFIG_EXPORTFS)</div><div class='ctx'> static void show_mark_fhandle(struct seq_file *m, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		struct file_handle handle;</div><div class='del'>-		u8 pad[MAX_HANDLE_SZ];</div><div class='del'>-	} f;</div><div class='add'>+	DEFINE_FLEX(struct file_handle, f, f_handle, handle_bytes, MAX_HANDLE_SZ);</div><div class='ctx'> 	int size, ret, i;</div><div class='ctx'> </div><div class='del'>-	f.handle.handle_bytes = sizeof(f.pad);</div><div class='del'>-	size = f.handle.handle_bytes &gt;&gt; 2;</div><div class='add'>+	size = f-&gt;handle_bytes &gt;&gt; 2;</div><div class='ctx'> </div><div class='del'>-	ret = exportfs_encode_fid(inode, (struct fid *)f.handle.f_handle, &amp;size);</div><div class='del'>-	if ((ret == FILEID_INVALID) || (ret &lt; 0)) {</div><div class='del'>-		WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret);</div><div class='add'>+	if (!super_trylock_shared(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	f.handle.handle_type = ret;</div><div class='del'>-	f.handle.handle_bytes = size * sizeof(u32);</div><div class='add'>+	ret = exportfs_encode_fid(inode, (struct fid *)f-&gt;f_handle, &amp;size);</div><div class='add'>+	up_read(&amp;inode-&gt;i_sb-&gt;s_umount);</div><div class='add'>+</div><div class='add'>+	if ((ret == FILEID_INVALID) || (ret &lt; 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	f-&gt;handle_type = ret;</div><div class='add'>+	f-&gt;handle_bytes = size * sizeof(u32);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "fhandle-bytes:%x fhandle-type:%x f_handle:",</div><div class='del'>-		   f.handle.handle_bytes, f.handle.handle_type);</div><div class='add'>+		   f-&gt;handle_bytes, f-&gt;handle_type);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; f.handle.handle_bytes; i++)</div><div class='del'>-		seq_printf(m, "%02x", (int)f.handle.f_handle[i]);</div><div class='add'>+	for (i = 0; i &lt; f-&gt;handle_bytes; i++)</div><div class='add'>+		seq_printf(m, "%02x", (int)f-&gt;f_handle[i]);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static void show_mark_fhandle(struct seq_file *m, struct inode *inode)</div><div class='hunk'>@@ -127,6 +127,11 @@ static void fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark)</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(m, "fanotify sdev:%x mflags:%x mask:%x ignored_mask:%x\n",</div><div class='ctx'> 			   sb-&gt;s_dev, mflags, mark-&gt;mask, mark-&gt;ignore_mask);</div><div class='add'>+	} else if (mark-&gt;connector-&gt;type == FSNOTIFY_OBJ_TYPE_MNTNS) {</div><div class='add'>+		struct mnt_namespace *mnt_ns = fsnotify_conn_mntns(mark-&gt;connector);</div><div class='add'>+</div><div class='add'>+		seq_printf(m, "fanotify mnt_ns:%u mflags:%x mask:%x ignored_mask:%x\n",</div><div class='add'>+			   mnt_ns-&gt;ns.inum, mflags, mark-&gt;mask, mark-&gt;ignore_mask);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c<br/>index 8bfd690e9f10..d27ff5e5f165 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fsnotify.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fsnotify.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fsnotify.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fsnotify.c</a></div><div class='hunk'>@@ -28,6 +28,11 @@ void __fsnotify_vfsmount_delete(struct vfsmount *mnt)</div><div class='ctx'> 	fsnotify_clear_marks_by_mount(mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __fsnotify_mntns_delete(struct mnt_namespace *mntns)</div><div class='add'>+{</div><div class='add'>+	fsnotify_clear_marks_by_mntns(mntns);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * fsnotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.</div><div class='ctx'>  * @sb: superblock being unmounted.</div><div class='hunk'>@@ -47,7 +52,7 @@ static void fsnotify_unmount_inodes(struct super_block *sb)</div><div class='ctx'> 		 * the inode cannot have any associated watches.</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if (inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE|I_NEW)) {</div><div class='add'>+		if (inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -61,7 +66,7 @@ static void fsnotify_unmount_inodes(struct super_block *sb)</div><div class='ctx'> 		 * removed all zero refcount inodes, in any case.  Test to</div><div class='ctx'> 		 * be sure.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!atomic_read(&amp;inode-&gt;i_count)) {</div><div class='add'>+		if (!icount_read(inode)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -89,11 +94,25 @@ static void fsnotify_unmount_inodes(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> void fsnotify_sb_delete(struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+	struct fsnotify_sb_info *sbinfo = fsnotify_sb_info(sb);</div><div class='add'>+</div><div class='add'>+	/* Were any marks ever added to any object on this sb? */</div><div class='add'>+	if (!sbinfo)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	fsnotify_unmount_inodes(sb);</div><div class='ctx'> 	fsnotify_clear_marks_by_sb(sb);</div><div class='ctx'> 	/* Wait for outstanding object references from connectors */</div><div class='del'>-	wait_var_event(&amp;sb-&gt;s_fsnotify_connectors,</div><div class='del'>-		       !atomic_long_read(&amp;sb-&gt;s_fsnotify_connectors));</div><div class='add'>+	wait_var_event(fsnotify_sb_watched_objects(sb),</div><div class='add'>+		       !atomic_long_read(fsnotify_sb_watched_objects(sb)));</div><div class='add'>+	WARN_ON(fsnotify_sb_has_priority_watchers(sb, FSNOTIFY_PRIO_CONTENT));</div><div class='add'>+	WARN_ON(fsnotify_sb_has_priority_watchers(sb,</div><div class='add'>+						  FSNOTIFY_PRIO_PRE_CONTENT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fsnotify_sb_free(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	kfree(sb-&gt;s_fsnotify_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -103,17 +122,13 @@ void fsnotify_sb_delete(struct super_block *sb)</div><div class='ctx'>  * parent cares.  Thus when an event happens on a child it can quickly tell</div><div class='ctx'>  * if there is a need to find a parent and send the event to the parent.</div><div class='ctx'>  */</div><div class='del'>-void __fsnotify_update_child_dentry_flags(struct inode *inode)</div><div class='add'>+void fsnotify_set_children_dentry_flags(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *alias;</div><div class='del'>-	int watched;</div><div class='ctx'> </div><div class='ctx'> 	if (!S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* determine if the children should tell inode about their events */</div><div class='del'>-	watched = fsnotify_inode_watches_children(inode);</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	/* run all of the dentries associated with this inode.  Since this is a</div><div class='ctx'> 	 * directory, there damn well better only be one item on this list */</div><div class='hunk'>@@ -129,10 +144,7 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			spin_lock_nested(&amp;child-&gt;d_lock, DENTRY_D_LOCK_NESTED);</div><div class='del'>-			if (watched)</div><div class='del'>-				child-&gt;d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED;</div><div class='del'>-			else</div><div class='del'>-				child-&gt;d_flags &amp;= ~DCACHE_FSNOTIFY_PARENT_WATCHED;</div><div class='add'>+			child-&gt;d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED;</div><div class='ctx'> 			spin_unlock(&amp;child-&gt;d_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;alias-&gt;d_lock);</div><div class='hunk'>@@ -140,8 +152,26 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode)</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Lazily clear false positive PARENT_WATCHED flag for child whose parent had</div><div class='add'>+ * stopped watching children.</div><div class='add'>+ */</div><div class='add'>+static void fsnotify_clear_child_dentry_flag(struct inode *pinode,</div><div class='add'>+					     struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * d_lock is a sufficient barrier to prevent observing a non-watched</div><div class='add'>+	 * parent state from before the fsnotify_set_children_dentry_flags()</div><div class='add'>+	 * or fsnotify_update_flags() call that had set PARENT_WATCHED.</div><div class='add'>+	 */</div><div class='add'>+	if (!fsnotify_inode_watches_children(pinode))</div><div class='add'>+		dentry-&gt;d_flags &amp;= ~DCACHE_FSNOTIFY_PARENT_WATCHED;</div><div class='add'>+	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Are inode/sb/mount interested in parent and name info with this event? */</div><div class='del'>-static bool fsnotify_event_needs_parent(struct inode *inode, struct mount *mnt,</div><div class='add'>+static bool fsnotify_event_needs_parent(struct inode *inode, __u32 mnt_mask,</div><div class='ctx'> 					__u32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 marks_mask = 0;</div><div class='hunk'>@@ -158,15 +188,44 @@ static bool fsnotify_event_needs_parent(struct inode *inode, struct mount *mnt,</div><div class='ctx'> 	BUILD_BUG_ON(FS_EVENTS_POSS_ON_CHILD &amp; ~FS_EVENTS_POSS_TO_PARENT);</div><div class='ctx'> </div><div class='ctx'> 	/* Did either inode/sb/mount subscribe for events with parent/name? */</div><div class='del'>-	marks_mask |= fsnotify_parent_needed_mask(inode-&gt;i_fsnotify_mask);</div><div class='del'>-	marks_mask |= fsnotify_parent_needed_mask(inode-&gt;i_sb-&gt;s_fsnotify_mask);</div><div class='del'>-	if (mnt)</div><div class='del'>-		marks_mask |= fsnotify_parent_needed_mask(mnt-&gt;mnt_fsnotify_mask);</div><div class='add'>+	marks_mask |= fsnotify_parent_needed_mask(</div><div class='add'>+				READ_ONCE(inode-&gt;i_fsnotify_mask));</div><div class='add'>+	marks_mask |= fsnotify_parent_needed_mask(</div><div class='add'>+				READ_ONCE(inode-&gt;i_sb-&gt;s_fsnotify_mask));</div><div class='add'>+	marks_mask |= fsnotify_parent_needed_mask(mnt_mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Did they subscribe for this event with parent/name info? */</div><div class='ctx'> 	return mask &amp; marks_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Are there any inode/mount/sb objects that watch for these events? */</div><div class='add'>+static inline __u32 fsnotify_object_watched(struct inode *inode, __u32 mnt_mask,</div><div class='add'>+					    __u32 mask)</div><div class='add'>+{</div><div class='add'>+	__u32 marks_mask = READ_ONCE(inode-&gt;i_fsnotify_mask) | mnt_mask |</div><div class='add'>+			   READ_ONCE(inode-&gt;i_sb-&gt;s_fsnotify_mask);</div><div class='add'>+</div><div class='add'>+	return mask &amp; marks_mask &amp; ALL_FSNOTIFY_EVENTS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Report pre-content event with optional range info */</div><div class='add'>+int fsnotify_pre_content(const struct path *path, const loff_t *ppos,</div><div class='add'>+			 size_t count)</div><div class='add'>+{</div><div class='add'>+	struct file_range range;</div><div class='add'>+</div><div class='add'>+	/* Report page aligned range only when pos is known */</div><div class='add'>+	if (!ppos)</div><div class='add'>+		return fsnotify_path(path, FS_PRE_ACCESS);</div><div class='add'>+</div><div class='add'>+	range.path = path;</div><div class='add'>+	range.pos = PAGE_ALIGN_DOWN(*ppos);</div><div class='add'>+	range.count = PAGE_ALIGN(*ppos + count) - range.pos;</div><div class='add'>+</div><div class='add'>+	return fsnotify_parent(path-&gt;dentry, FS_PRE_ACCESS, &amp;range,</div><div class='add'>+			       FSNOTIFY_EVENT_FILE_RANGE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Notify this dentry's parent about a child's events with child name info</div><div class='ctx'>  * if parent is watching or if inode/sb/mount are interested in events with</div><div class='hunk'>@@ -179,7 +238,8 @@ int __fsnotify_parent(struct dentry *dentry, __u32 mask, const void *data,</div><div class='ctx'> 		      int data_type)</div><div class='ctx'> {</div><div class='ctx'> 	const struct path *path = fsnotify_data_path(data, data_type);</div><div class='del'>-	struct mount *mnt = path ? real_mount(path-&gt;mnt) : NULL;</div><div class='add'>+	__u32 mnt_mask = path ?</div><div class='add'>+		READ_ONCE(real_mount(path-&gt;mnt)-&gt;mnt_fsnotify_mask) : 0;</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct dentry *parent;</div><div class='ctx'> 	bool parent_watched = dentry-&gt;d_flags &amp; DCACHE_FSNOTIFY_PARENT_WATCHED;</div><div class='hunk'>@@ -190,16 +250,13 @@ int __fsnotify_parent(struct dentry *dentry, __u32 mask, const void *data,</div><div class='ctx'> 	struct qstr *file_name = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Do inode/sb/mount care about parent and name info on non-dir?</div><div class='del'>-	 * Do they care about any event at all?</div><div class='del'>-	 */</div><div class='del'>-	if (!inode-&gt;i_fsnotify_marks &amp;&amp; !inode-&gt;i_sb-&gt;s_fsnotify_marks &amp;&amp;</div><div class='del'>-	    (!mnt || !mnt-&gt;mnt_fsnotify_marks) &amp;&amp; !parent_watched)</div><div class='add'>+	/* Optimize the likely case of nobody watching this path */</div><div class='add'>+	if (likely(!parent_watched &amp;&amp;</div><div class='add'>+		   !fsnotify_object_watched(inode, mnt_mask, mask)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	parent = NULL;</div><div class='del'>-	parent_needed = fsnotify_event_needs_parent(inode, mnt, mask);</div><div class='add'>+	parent_needed = fsnotify_event_needs_parent(inode, mnt_mask, mask);</div><div class='ctx'> 	if (!parent_watched &amp;&amp; !parent_needed)</div><div class='ctx'> 		goto notify;</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +265,7 @@ int __fsnotify_parent(struct dentry *dentry, __u32 mask, const void *data,</div><div class='ctx'> 	p_inode = parent-&gt;d_inode;</div><div class='ctx'> 	p_mask = fsnotify_inode_watches_children(p_inode);</div><div class='ctx'> 	if (unlikely(parent_watched &amp;&amp; !p_mask))</div><div class='del'>-		__fsnotify_update_child_dentry_flags(p_inode);</div><div class='add'>+		fsnotify_clear_child_dentry_flag(p_inode, dentry);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Include parent/name in notification either if some notification</div><div class='hunk'>@@ -299,16 +356,19 @@ static int fsnotify_handle_event(struct fsnotify_group *group, __u32 mask,</div><div class='ctx'> 	if (!inode_mark)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (mask &amp; FS_EVENT_ON_CHILD) {</div><div class='del'>-		/*</div><div class='del'>-		 * Some events can be sent on both parent dir and child marks</div><div class='del'>-		 * (e.g. FS_ATTRIB).  If both parent dir and child are</div><div class='del'>-		 * watching, report the event once to parent dir with name (if</div><div class='del'>-		 * interested) and once to child without name (if interested).</div><div class='del'>-		 * The child watcher is expecting an event without a file name</div><div class='del'>-		 * and without the FS_EVENT_ON_CHILD flag.</div><div class='del'>-		 */</div><div class='del'>-		mask &amp;= ~FS_EVENT_ON_CHILD;</div><div class='add'>+	/*</div><div class='add'>+	 * Some events can be sent on both parent dir and child marks (e.g.</div><div class='add'>+	 * FS_ATTRIB).  If both parent dir and child are watching, report the</div><div class='add'>+	 * event once to parent dir with name (if interested) and once to child</div><div class='add'>+	 * without name (if interested).</div><div class='add'>+	 *</div><div class='add'>+	 * In any case regardless whether the parent is watching or not, the</div><div class='add'>+	 * child watcher is expecting an event without the FS_EVENT_ON_CHILD</div><div class='add'>+	 * flag. The file name is expected if and only if this is a directory</div><div class='add'>+	 * event.</div><div class='add'>+	 */</div><div class='add'>+	mask &amp;= ~FS_EVENT_ON_CHILD;</div><div class='add'>+	if (!(mask &amp; ALL_FSNOTIFY_DIRENT_EVENTS)) {</div><div class='ctx'> 		dir = NULL;</div><div class='ctx'> 		name = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -365,7 +425,7 @@ static int send_to_group(__u32 mask, const void *data, int data_type,</div><div class='ctx'> 				     file_name, cookie, iter_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fsnotify_mark *fsnotify_first_mark(struct fsnotify_mark_connector **connp)</div><div class='add'>+static struct fsnotify_mark *fsnotify_first_mark(struct fsnotify_mark_connector *const *connp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsnotify_mark_connector *conn;</div><div class='ctx'> 	struct hlist_node *node = NULL;</div><div class='hunk'>@@ -483,13 +543,15 @@ int fsnotify(__u32 mask, const void *data, int data_type, struct inode *dir,</div><div class='ctx'> {</div><div class='ctx'> 	const struct path *path = fsnotify_data_path(data, data_type);</div><div class='ctx'> 	struct super_block *sb = fsnotify_data_sb(data, data_type);</div><div class='add'>+	const struct fsnotify_mnt *mnt_data = fsnotify_data_mnt(data, data_type);</div><div class='add'>+	struct fsnotify_sb_info *sbinfo = sb ? fsnotify_sb_info(sb) : NULL;</div><div class='ctx'> 	struct fsnotify_iter_info iter_info = {};</div><div class='ctx'> 	struct mount *mnt = NULL;</div><div class='ctx'> 	struct inode *inode2 = NULL;</div><div class='ctx'> 	struct dentry *moved;</div><div class='ctx'> 	int inode2_type;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	__u32 test_mask, marks_mask;</div><div class='add'>+	__u32 test_mask, marks_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (path)</div><div class='ctx'> 		mnt = real_mount(path-&gt;mnt);</div><div class='hunk'>@@ -519,20 +581,23 @@ int fsnotify(__u32 mask, const void *data, int data_type, struct inode *dir,</div><div class='ctx'> 	 * SRCU because we have no references to any objects and do not</div><div class='ctx'> 	 * need SRCU to keep them "alive".</div><div class='ctx'> 	 */</div><div class='del'>-	if (!sb-&gt;s_fsnotify_marks &amp;&amp;</div><div class='add'>+	if ((!sbinfo || !sbinfo-&gt;sb_marks) &amp;&amp;</div><div class='ctx'> 	    (!mnt || !mnt-&gt;mnt_fsnotify_marks) &amp;&amp;</div><div class='ctx'> 	    (!inode || !inode-&gt;i_fsnotify_marks) &amp;&amp;</div><div class='del'>-	    (!inode2 || !inode2-&gt;i_fsnotify_marks))</div><div class='add'>+	    (!inode2 || !inode2-&gt;i_fsnotify_marks) &amp;&amp;</div><div class='add'>+	    (!mnt_data || !mnt_data-&gt;ns-&gt;n_fsnotify_marks))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	marks_mask = sb-&gt;s_fsnotify_mask;</div><div class='add'>+	if (sb)</div><div class='add'>+		marks_mask |= READ_ONCE(sb-&gt;s_fsnotify_mask);</div><div class='ctx'> 	if (mnt)</div><div class='del'>-		marks_mask |= mnt-&gt;mnt_fsnotify_mask;</div><div class='add'>+		marks_mask |= READ_ONCE(mnt-&gt;mnt_fsnotify_mask);</div><div class='ctx'> 	if (inode)</div><div class='del'>-		marks_mask |= inode-&gt;i_fsnotify_mask;</div><div class='add'>+		marks_mask |= READ_ONCE(inode-&gt;i_fsnotify_mask);</div><div class='ctx'> 	if (inode2)</div><div class='del'>-		marks_mask |= inode2-&gt;i_fsnotify_mask;</div><div class='del'>-</div><div class='add'>+		marks_mask |= READ_ONCE(inode2-&gt;i_fsnotify_mask);</div><div class='add'>+	if (mnt_data)</div><div class='add'>+		marks_mask |= READ_ONCE(mnt_data-&gt;ns-&gt;n_fsnotify_mask);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If this is a modify event we may need to clear some ignore masks.</div><div class='hunk'>@@ -546,8 +611,10 @@ int fsnotify(__u32 mask, const void *data, int data_type, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	iter_info.srcu_idx = srcu_read_lock(&amp;fsnotify_mark_srcu);</div><div class='ctx'> </div><div class='del'>-	iter_info.marks[FSNOTIFY_ITER_TYPE_SB] =</div><div class='del'>-		fsnotify_first_mark(&amp;sb-&gt;s_fsnotify_marks);</div><div class='add'>+	if (sbinfo) {</div><div class='add'>+		iter_info.marks[FSNOTIFY_ITER_TYPE_SB] =</div><div class='add'>+			fsnotify_first_mark(&amp;sbinfo-&gt;sb_marks);</div><div class='add'>+	}</div><div class='ctx'> 	if (mnt) {</div><div class='ctx'> 		iter_info.marks[FSNOTIFY_ITER_TYPE_VFSMOUNT] =</div><div class='ctx'> 			fsnotify_first_mark(&amp;mnt-&gt;mnt_fsnotify_marks);</div><div class='hunk'>@@ -560,6 +627,10 @@ int fsnotify(__u32 mask, const void *data, int data_type, struct inode *dir,</div><div class='ctx'> 		iter_info.marks[inode2_type] =</div><div class='ctx'> 			fsnotify_first_mark(&amp;inode2-&gt;i_fsnotify_marks);</div><div class='ctx'> 	}</div><div class='add'>+	if (mnt_data) {</div><div class='add'>+		iter_info.marks[FSNOTIFY_ITER_TYPE_MNTNS] =</div><div class='add'>+			fsnotify_first_mark(&amp;mnt_data-&gt;ns-&gt;n_fsnotify_marks);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We need to merge inode/vfsmount/sb mark lists so that e.g. inode mark</div><div class='hunk'>@@ -583,11 +654,117 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fsnotify);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS</div><div class='add'>+/*</div><div class='add'>+ * At open time we check fsnotify_sb_has_priority_watchers(), call the open perm</div><div class='add'>+ * hook and set the FMODE_NONOTIFY_ mode bits accordignly.</div><div class='add'>+ * Later, fsnotify permission hooks do not check if there are permission event</div><div class='add'>+ * watches, but that there were permission event watches at open time.</div><div class='add'>+ */</div><div class='add'>+int fsnotify_open_perm_and_set_mode(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry = file-&gt;f_path.dentry, *parent;</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='add'>+	__u32 mnt_mask, p_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* Is it a file opened by fanotify? */</div><div class='add'>+	if (FMODE_FSNOTIFY_NONE(file-&gt;f_mode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Permission events is a super set of pre-content events, so if there</div><div class='add'>+	 * are no permission event watchers, there are also no pre-content event</div><div class='add'>+	 * watchers and this is implied from the single FMODE_NONOTIFY_PERM bit.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(!fsnotify_sb_has_priority_watchers(sb,</div><div class='add'>+						FSNOTIFY_PRIO_CONTENT))) {</div><div class='add'>+		file_set_fsnotify_mode(file, FMODE_NONOTIFY_PERM);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OK, there are some permission event watchers. Check if anybody is</div><div class='add'>+	 * watching for permission events on *this* file.</div><div class='add'>+	 */</div><div class='add'>+	mnt_mask = READ_ONCE(real_mount(file-&gt;f_path.mnt)-&gt;mnt_fsnotify_mask);</div><div class='add'>+	p_mask = fsnotify_object_watched(d_inode(dentry), mnt_mask,</div><div class='add'>+					 ALL_FSNOTIFY_PERM_EVENTS);</div><div class='add'>+	if (dentry-&gt;d_flags &amp; DCACHE_FSNOTIFY_PARENT_WATCHED) {</div><div class='add'>+		parent = dget_parent(dentry);</div><div class='add'>+		p_mask |= fsnotify_inode_watches_children(d_inode(parent));</div><div class='add'>+		dput(parent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Legacy FAN_ACCESS_PERM events have very high performance overhead,</div><div class='add'>+	 * so unlikely to be used in the wild. If they are used there will be</div><div class='add'>+	 * no optimizations at all.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(p_mask &amp; FS_ACCESS_PERM)) {</div><div class='add'>+		/* Enable all permission and pre-content events */</div><div class='add'>+		file_set_fsnotify_mode(file, 0);</div><div class='add'>+		goto open_perm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Pre-content events are only supported on regular files.</div><div class='add'>+	 * If there are pre-content event watchers and no permission access</div><div class='add'>+	 * watchers, set FMODE_NONOTIFY | FMODE_NONOTIFY_PERM to indicate that.</div><div class='add'>+	 * That is the common case with HSM service.</div><div class='add'>+	 */</div><div class='add'>+	if (d_is_reg(dentry) &amp;&amp; (p_mask &amp; FSNOTIFY_PRE_CONTENT_EVENTS)) {</div><div class='add'>+		file_set_fsnotify_mode(file, FMODE_NONOTIFY |</div><div class='add'>+					     FMODE_NONOTIFY_PERM);</div><div class='add'>+		goto open_perm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Nobody watching permission and pre-content events on this file */</div><div class='add'>+	file_set_fsnotify_mode(file, FMODE_NONOTIFY_PERM);</div><div class='add'>+</div><div class='add'>+open_perm:</div><div class='add'>+	/*</div><div class='add'>+	 * Send open perm events depending on object masks and regardless of</div><div class='add'>+	 * FMODE_NONOTIFY_PERM.</div><div class='add'>+	 */</div><div class='add'>+	if (file-&gt;f_flags &amp; __FMODE_EXEC &amp;&amp; p_mask &amp; FS_OPEN_EXEC_PERM) {</div><div class='add'>+		int ret = fsnotify_path(&amp;file-&gt;f_path, FS_OPEN_EXEC_PERM);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p_mask &amp; FS_OPEN_PERM)</div><div class='add'>+		return fsnotify_path(&amp;file-&gt;f_path, FS_OPEN_PERM);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void fsnotify_mnt(__u32 mask, struct mnt_namespace *ns, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct fsnotify_mnt data = {</div><div class='add'>+		.ns = ns,</div><div class='add'>+		.mnt_id = real_mount(mnt)-&gt;mnt_id_unique,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!ns))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is an optimization as well as making sure fsnotify_init() has</div><div class='add'>+	 * been called.</div><div class='add'>+	 */</div><div class='add'>+	if (!ns-&gt;n_fsnotify_marks)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fsnotify(mask, &amp;data, FSNOTIFY_EVENT_MNT, NULL, NULL, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __init int fsnotify_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(HWEIGHT32(ALL_FSNOTIFY_BITS) != 23);</div><div class='add'>+	BUILD_BUG_ON(HWEIGHT32(ALL_FSNOTIFY_BITS) != 26);</div><div class='ctx'> </div><div class='ctx'> 	ret = init_srcu_struct(&amp;fsnotify_mark_srcu);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/fs/notify/fsnotify.h b/fs/notify/fsnotify.h<br/>index fde74eb333cc..5950c7a67f41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/fsnotify.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/fsnotify.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/fsnotify.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/fsnotify.h</a></div><div class='hunk'>@@ -9,39 +9,64 @@</div><div class='ctx'> </div><div class='ctx'> #include "../mount.h"</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * fsnotify_connp_t is what we embed in objects which connector can be attached</div><div class='add'>+ * to.</div><div class='add'>+ */</div><div class='add'>+typedef struct fsnotify_mark_connector __rcu *fsnotify_connp_t;</div><div class='add'>+</div><div class='ctx'> static inline struct inode *fsnotify_conn_inode(</div><div class='ctx'> 				struct fsnotify_mark_connector *conn)</div><div class='ctx'> {</div><div class='del'>-	return container_of(conn-&gt;obj, struct inode, i_fsnotify_marks);</div><div class='add'>+	return conn-&gt;obj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct mount *fsnotify_conn_mount(</div><div class='ctx'> 				struct fsnotify_mark_connector *conn)</div><div class='ctx'> {</div><div class='del'>-	return container_of(conn-&gt;obj, struct mount, mnt_fsnotify_marks);</div><div class='add'>+	return real_mount(conn-&gt;obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct super_block *fsnotify_conn_sb(</div><div class='ctx'> 				struct fsnotify_mark_connector *conn)</div><div class='ctx'> {</div><div class='del'>-	return container_of(conn-&gt;obj, struct super_block, s_fsnotify_marks);</div><div class='add'>+	return conn-&gt;obj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct super_block *fsnotify_connector_sb(</div><div class='add'>+static inline struct mnt_namespace *fsnotify_conn_mntns(</div><div class='ctx'> 				struct fsnotify_mark_connector *conn)</div><div class='ctx'> {</div><div class='del'>-	switch (conn-&gt;type) {</div><div class='add'>+	return conn-&gt;obj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct super_block *fsnotify_object_sb(void *obj,</div><div class='add'>+			enum fsnotify_obj_type obj_type)</div><div class='add'>+{</div><div class='add'>+	switch (obj_type) {</div><div class='ctx'> 	case FSNOTIFY_OBJ_TYPE_INODE:</div><div class='del'>-		return fsnotify_conn_inode(conn)-&gt;i_sb;</div><div class='add'>+		return ((struct inode *)obj)-&gt;i_sb;</div><div class='ctx'> 	case FSNOTIFY_OBJ_TYPE_VFSMOUNT:</div><div class='del'>-		return fsnotify_conn_mount(conn)-&gt;mnt.mnt_sb;</div><div class='add'>+		return ((struct vfsmount *)obj)-&gt;mnt_sb;</div><div class='ctx'> 	case FSNOTIFY_OBJ_TYPE_SB:</div><div class='del'>-		return fsnotify_conn_sb(conn);</div><div class='add'>+		return (struct super_block *)obj;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct super_block *fsnotify_connector_sb(</div><div class='add'>+				struct fsnotify_mark_connector *conn)</div><div class='add'>+{</div><div class='add'>+	return fsnotify_object_sb(conn-&gt;obj, conn-&gt;type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline fsnotify_connp_t *fsnotify_sb_marks(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct fsnotify_sb_info *sbinfo = fsnotify_sb_info(sb);</div><div class='add'>+</div><div class='add'>+	return sbinfo ? &amp;sbinfo-&gt;sb_marks : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* destroy all events sitting in this groups notification queue */</div><div class='ctx'> extern void fsnotify_flush_notify(struct fsnotify_group *group);</div><div class='ctx'> </div><div class='hunk'>@@ -67,14 +92,19 @@ static inline void fsnotify_clear_marks_by_mount(struct vfsmount *mnt)</div><div class='ctx'> /* run the list of all marks associated with sb and destroy them */</div><div class='ctx'> static inline void fsnotify_clear_marks_by_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	fsnotify_destroy_marks(&amp;sb-&gt;s_fsnotify_marks);</div><div class='add'>+	fsnotify_destroy_marks(fsnotify_sb_marks(sb));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fsnotify_clear_marks_by_mntns(struct mnt_namespace *mntns)</div><div class='add'>+{</div><div class='add'>+	fsnotify_destroy_marks(&amp;mntns-&gt;n_fsnotify_marks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * update the dentry-&gt;d_flags of all of inode's children to indicate if inode cares</div><div class='ctx'>  * about events that happen to its children.</div><div class='ctx'>  */</div><div class='del'>-extern void __fsnotify_update_child_dentry_flags(struct inode *inode);</div><div class='add'>+extern void fsnotify_set_children_dentry_flags(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *fsnotify_mark_connector_cachep;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/notify/group.c b/fs/notify/group.c<br/>index 1de6631a3925..18446b7b0d49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/group.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/group.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/group.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/group.c</a></div><div class='hunk'>@@ -115,7 +115,6 @@ static struct fsnotify_group *__fsnotify_alloc_group(</div><div class='ctx'> 				const struct fsnotify_ops *ops,</div><div class='ctx'> 				int flags, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	static struct lock_class_key nofs_marks_lock;</div><div class='ctx'> 	struct fsnotify_group *group;</div><div class='ctx'> </div><div class='ctx'> 	group = kzalloc(sizeof(struct fsnotify_group), gfp);</div><div class='hunk'>@@ -136,16 +135,6 @@ static struct fsnotify_group *__fsnotify_alloc_group(</div><div class='ctx'> </div><div class='ctx'> 	group-&gt;ops = ops;</div><div class='ctx'> 	group-&gt;flags = flags;</div><div class='del'>-	/*</div><div class='del'>-	 * For most backends, eviction of inode with a mark is not expected,</div><div class='del'>-	 * because marks hold a refcount on the inode against eviction.</div><div class='del'>-	 *</div><div class='del'>-	 * Use a different lockdep class for groups that support evictable</div><div class='del'>-	 * inode marks, because with evictable marks, mark_mutex is NOT</div><div class='del'>-	 * fs-reclaim safe - the mutex is taken when evicting inodes.</div><div class='del'>-	 */</div><div class='del'>-	if (flags &amp; FSNOTIFY_GROUP_NOFS)</div><div class='del'>-		lockdep_set_class(&amp;group-&gt;mark_mutex, &amp;nofs_marks_lock);</div><div class='ctx'> </div><div class='ctx'> 	return group;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c<br/>index 993375f0db67..7c326ec2e8a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/inotify/inotify_fsnotify.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/inotify/inotify_fsnotify.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/inotify/inotify_fsnotify.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/inotify/inotify_fsnotify.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * Copyright 2006 Hewlett-Packard Development Company, L.P.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009 Eric Paris &lt;Red Hat Inc&gt;</div><div class='del'>- * inotify was largely rewriten to make use of the fsnotify infrastructure</div><div class='add'>+ * inotify was largely rewritten to make use of the fsnotify infrastructure</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dcache.h&gt; /* d_unlinked */</div><div class='hunk'>@@ -121,7 +121,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,</div><div class='ctx'> 	event-&gt;sync_cookie = cookie;</div><div class='ctx'> 	event-&gt;name_len = len;</div><div class='ctx'> 	if (len)</div><div class='del'>-		strcpy(event-&gt;name, name-&gt;name);</div><div class='add'>+		strscpy(event-&gt;name, name-&gt;name, event-&gt;name_len + 1);</div><div class='ctx'> </div><div class='ctx'> 	ret = fsnotify_add_event(group, fsn_event, inotify_merge);</div><div class='ctx'> 	if (ret) {</div><div class='head'>diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c<br/>index 85d8fdd55329..b372fb2c56bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/inotify/inotify_user.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/inotify/inotify_user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/inotify/inotify_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/inotify/inotify_user.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ struct kmem_cache *inotify_inode_mark_cachep __ro_after_init;</div><div class='ctx'> static long it_zero = 0;</div><div class='ctx'> static long it_int_max = INT_MAX;</div><div class='ctx'> </div><div class='del'>-static struct ctl_table inotify_table[] = {</div><div class='add'>+static const struct ctl_table inotify_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "max_user_instances",</div><div class='ctx'> 		.data		= &amp;init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES],</div><div class='hunk'>@@ -544,7 +544,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,</div><div class='ctx'> 	int create = (arg &amp; IN_MASK_CREATE);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	fsn_mark = fsnotify_find_mark(&amp;inode-&gt;i_fsnotify_marks, group);</div><div class='add'>+	fsn_mark = fsnotify_find_inode_mark(inode, group);</div><div class='ctx'> 	if (!fsn_mark)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	else if (create) {</div><div class='hunk'>@@ -569,7 +569,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,</div><div class='ctx'> 		/* more bits in old than in new? */</div><div class='ctx'> 		int dropped = (old_mask &amp; ~new_mask);</div><div class='ctx'> 		/* more bits in this fsn_mark than the inode's mask? */</div><div class='del'>-		int do_inode = (new_mask &amp; ~inode-&gt;i_fsnotify_mask);</div><div class='add'>+		int do_inode = (new_mask &amp; ~READ_ONCE(inode-&gt;i_fsnotify_mask));</div><div class='ctx'> </div><div class='ctx'> 		/* update the inode with this new fsn_mark */</div><div class='ctx'> 		if (dropped || do_inode)</div><div class='hunk'>@@ -732,7 +732,6 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,</div><div class='ctx'> 	struct fsnotify_group *group;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct path path;</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -752,21 +751,17 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,</div><div class='ctx'> 	if (unlikely(!(mask &amp; ALL_INOTIFY_BITS)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (unlikely(!f.file))</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	/* IN_MASK_ADD and IN_MASK_CREATE don't make sense together */</div><div class='del'>-	if (unlikely((mask &amp; IN_MASK_ADD) &amp;&amp; (mask &amp; IN_MASK_CREATE))) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto fput_and_out;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely((mask &amp; IN_MASK_ADD) &amp;&amp; (mask &amp; IN_MASK_CREATE)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* verify that this is indeed an inotify instance */</div><div class='del'>-	if (unlikely(f.file-&gt;f_op != &amp;inotify_fops)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto fput_and_out;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_op != &amp;inotify_fops))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!(mask &amp; IN_DONT_FOLLOW))</div><div class='ctx'> 		flags |= LOOKUP_FOLLOW;</div><div class='hunk'>@@ -776,17 +771,15 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,</div><div class='ctx'> 	ret = inotify_find_inode(pathname, &amp;path, flags,</div><div class='ctx'> 			(mask &amp; IN_ALL_EVENTS));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* inode held in place by reference to path; group by fget on fd */</div><div class='ctx'> 	inode = path.dentry-&gt;d_inode;</div><div class='del'>-	group = f.file-&gt;private_data;</div><div class='add'>+	group = fd_file(f)-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* create/update an inode mark */</div><div class='ctx'> 	ret = inotify_update_watch(group, inode, mask);</div><div class='ctx'> 	path_put(&amp;path);</div><div class='del'>-fput_and_out:</div><div class='del'>-	fdput(f);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -794,33 +787,26 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsnotify_group *group;</div><div class='ctx'> 	struct inotify_inode_mark *i_mark;</div><div class='del'>-	struct fd f;</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (unlikely(!f.file))</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	/* verify that this is indeed an inotify instance */</div><div class='del'>-	if (unlikely(f.file-&gt;f_op != &amp;inotify_fops))</div><div class='del'>-		goto out;</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_op != &amp;inotify_fops))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	group = f.file-&gt;private_data;</div><div class='add'>+	group = fd_file(f)-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	i_mark = inotify_idr_find(group, wd);</div><div class='ctx'> 	if (unlikely(!i_mark))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fsnotify_destroy_mark(&amp;i_mark-&gt;fsn_mark, group);</div><div class='ctx'> </div><div class='ctx'> 	/* match ref taken by inotify_idr_find */</div><div class='ctx'> 	fsnotify_put_mark(&amp;i_mark-&gt;fsn_mark);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	fdput(f);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/notify/mark.c b/fs/notify/mark.c<br/>index d6944ff86ffa..55a03bb05aa1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/notify/mark.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/notify/mark.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/notify/mark.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/notify/mark.c</a></div><div class='hunk'>@@ -97,6 +97,23 @@ void fsnotify_get_mark(struct fsnotify_mark *mark)</div><div class='ctx'> 	refcount_inc(&amp;mark-&gt;refcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static fsnotify_connp_t *fsnotify_object_connp(void *obj,</div><div class='add'>+				enum fsnotify_obj_type obj_type)</div><div class='add'>+{</div><div class='add'>+	switch (obj_type) {</div><div class='add'>+	case FSNOTIFY_OBJ_TYPE_INODE:</div><div class='add'>+		return &amp;((struct inode *)obj)-&gt;i_fsnotify_marks;</div><div class='add'>+	case FSNOTIFY_OBJ_TYPE_VFSMOUNT:</div><div class='add'>+		return &amp;real_mount(obj)-&gt;mnt_fsnotify_marks;</div><div class='add'>+	case FSNOTIFY_OBJ_TYPE_SB:</div><div class='add'>+		return fsnotify_sb_marks(obj);</div><div class='add'>+	case FSNOTIFY_OBJ_TYPE_MNTNS:</div><div class='add'>+		return &amp;((struct mnt_namespace *)obj)-&gt;n_fsnotify_marks;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __u32 *fsnotify_conn_mask_p(struct fsnotify_mark_connector *conn)</div><div class='ctx'> {</div><div class='ctx'> 	if (conn-&gt;type == FSNOTIFY_OBJ_TYPE_INODE)</div><div class='hunk'>@@ -105,6 +122,8 @@ static __u32 *fsnotify_conn_mask_p(struct fsnotify_mark_connector *conn)</div><div class='ctx'> 		return &amp;fsnotify_conn_mount(conn)-&gt;mnt_fsnotify_mask;</div><div class='ctx'> 	else if (conn-&gt;type == FSNOTIFY_OBJ_TYPE_SB)</div><div class='ctx'> 		return &amp;fsnotify_conn_sb(conn)-&gt;s_fsnotify_mask;</div><div class='add'>+	else if (conn-&gt;type == FSNOTIFY_OBJ_TYPE_MNTNS)</div><div class='add'>+		return &amp;fsnotify_conn_mntns(conn)-&gt;n_fsnotify_mask;</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,13 +132,78 @@ __u32 fsnotify_conn_mask(struct fsnotify_mark_connector *conn)</div><div class='ctx'> 	if (WARN_ON(!fsnotify_valid_obj_type(conn-&gt;type)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return *fsnotify_conn_mask_p(conn);</div><div class='add'>+	return READ_ONCE(*fsnotify_conn_mask_p(conn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsnotify_get_sb_watched_objects(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	atomic_long_inc(fsnotify_sb_watched_objects(sb));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsnotify_put_sb_watched_objects(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	atomic_long_t *watched_objects = fsnotify_sb_watched_objects(sb);</div><div class='add'>+</div><div class='add'>+	/* the superblock can go away after this decrement */</div><div class='add'>+	if (atomic_long_dec_and_test(watched_objects))</div><div class='add'>+		wake_up_var(watched_objects);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fsnotify_get_inode_ref(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	ihold(inode);</div><div class='del'>-	atomic_long_inc(&amp;inode-&gt;i_sb-&gt;s_fsnotify_connectors);</div><div class='add'>+	fsnotify_get_sb_watched_objects(inode-&gt;i_sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsnotify_put_inode_ref(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	/* read -&gt;i_sb before the inode can go away */</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+</div><div class='add'>+	iput(inode);</div><div class='add'>+	fsnotify_put_sb_watched_objects(sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Grab or drop watched objects reference depending on whether the connector</div><div class='add'>+ * is attached and has any marks attached.</div><div class='add'>+ */</div><div class='add'>+static void fsnotify_update_sb_watchers(struct super_block *sb,</div><div class='add'>+					struct fsnotify_mark_connector *conn)</div><div class='add'>+{</div><div class='add'>+	struct fsnotify_sb_info *sbinfo = fsnotify_sb_info(sb);</div><div class='add'>+	bool is_watched = conn-&gt;flags &amp; FSNOTIFY_CONN_FLAG_IS_WATCHED;</div><div class='add'>+	struct fsnotify_mark *first_mark = NULL;</div><div class='add'>+	unsigned int highest_prio = 0;</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;obj)</div><div class='add'>+		first_mark = hlist_entry_safe(conn-&gt;list.first,</div><div class='add'>+					      struct fsnotify_mark, obj_list);</div><div class='add'>+	if (first_mark)</div><div class='add'>+		highest_prio = first_mark-&gt;group-&gt;priority;</div><div class='add'>+	if (WARN_ON(highest_prio &gt;= __FSNOTIFY_PRIO_NUM))</div><div class='add'>+		highest_prio = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the highest priority of group watching this object is prio,</div><div class='add'>+	 * then watched object has a reference on counters [0..prio].</div><div class='add'>+	 * Update priority &gt;= 1 watched objects counters.</div><div class='add'>+	 */</div><div class='add'>+	for (unsigned int p = conn-&gt;prio + 1; p &lt;= highest_prio; p++)</div><div class='add'>+		atomic_long_inc(&amp;sbinfo-&gt;watched_objects[p]);</div><div class='add'>+	for (unsigned int p = conn-&gt;prio; p &gt; highest_prio; p--)</div><div class='add'>+		atomic_long_dec(&amp;sbinfo-&gt;watched_objects[p]);</div><div class='add'>+	conn-&gt;prio = highest_prio;</div><div class='add'>+</div><div class='add'>+	/* Update priority &gt;= 0 (a.k.a total) watched objects counter */</div><div class='add'>+	BUILD_BUG_ON(FSNOTIFY_PRIO_NORMAL != 0);</div><div class='add'>+	if (first_mark &amp;&amp; !is_watched) {</div><div class='add'>+		conn-&gt;flags |= FSNOTIFY_CONN_FLAG_IS_WATCHED;</div><div class='add'>+		fsnotify_get_sb_watched_objects(sb);</div><div class='add'>+	} else if (!first_mark &amp;&amp; is_watched) {</div><div class='add'>+		conn-&gt;flags &amp;= ~FSNOTIFY_CONN_FLAG_IS_WATCHED;</div><div class='add'>+		fsnotify_put_sb_watched_objects(sb);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -171,11 +255,33 @@ static void *__fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)</div><div class='ctx'> 		    !(mark-&gt;flags &amp; FSNOTIFY_MARK_FLAG_NO_IREF))</div><div class='ctx'> 			want_iref = true;</div><div class='ctx'> 	}</div><div class='del'>-	*fsnotify_conn_mask_p(conn) = new_mask;</div><div class='add'>+	/*</div><div class='add'>+	 * We use WRITE_ONCE() to prevent silly compiler optimizations from</div><div class='add'>+	 * confusing readers not holding conn-&gt;lock with partial updates.</div><div class='add'>+	 */</div><div class='add'>+	WRITE_ONCE(*fsnotify_conn_mask_p(conn), new_mask);</div><div class='ctx'> </div><div class='ctx'> 	return fsnotify_update_iref(conn, want_iref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool fsnotify_conn_watches_children(</div><div class='add'>+					struct fsnotify_mark_connector *conn)</div><div class='add'>+{</div><div class='add'>+	if (conn-&gt;type != FSNOTIFY_OBJ_TYPE_INODE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return fsnotify_inode_watches_children(fsnotify_conn_inode(conn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fsnotify_conn_set_children_dentry_flags(</div><div class='add'>+					struct fsnotify_mark_connector *conn)</div><div class='add'>+{</div><div class='add'>+	if (conn-&gt;type != FSNOTIFY_OBJ_TYPE_INODE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fsnotify_set_children_dentry_flags(fsnotify_conn_inode(conn));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Calculate mask of events for a list of marks. The caller must make sure</div><div class='ctx'>  * connector and connector-&gt;obj cannot disappear under us.  Callers achieve</div><div class='hunk'>@@ -184,15 +290,23 @@ static void *__fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)</div><div class='ctx'>  */</div><div class='ctx'> void fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)</div><div class='ctx'> {</div><div class='add'>+	bool update_children;</div><div class='add'>+</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;conn-&gt;lock);</div><div class='add'>+	update_children = !fsnotify_conn_watches_children(conn);</div><div class='ctx'> 	__fsnotify_recalc_mask(conn);</div><div class='add'>+	update_children &amp;= fsnotify_conn_watches_children(conn);</div><div class='ctx'> 	spin_unlock(&amp;conn-&gt;lock);</div><div class='del'>-	if (conn-&gt;type == FSNOTIFY_OBJ_TYPE_INODE)</div><div class='del'>-		__fsnotify_update_child_dentry_flags(</div><div class='del'>-					fsnotify_conn_inode(conn));</div><div class='add'>+	/*</div><div class='add'>+	 * Set children's PARENT_WATCHED flags only if parent started watching.</div><div class='add'>+	 * When parent stops watching, we clear false positive PARENT_WATCHED</div><div class='add'>+	 * flags lazily in __fsnotify_parent().</div><div class='add'>+	 */</div><div class='add'>+	if (update_children)</div><div class='add'>+		fsnotify_conn_set_children_dentry_flags(conn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Free all connectors queued for freeing once SRCU period ends */</div><div class='hunk'>@@ -213,35 +327,12 @@ static void fsnotify_connector_destroy_workfn(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fsnotify_put_inode_ref(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-</div><div class='del'>-	iput(inode);</div><div class='del'>-	if (atomic_long_dec_and_test(&amp;sb-&gt;s_fsnotify_connectors))</div><div class='del'>-		wake_up_var(&amp;sb-&gt;s_fsnotify_connectors);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fsnotify_get_sb_connectors(struct fsnotify_mark_connector *conn)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = fsnotify_connector_sb(conn);</div><div class='del'>-</div><div class='del'>-	if (sb)</div><div class='del'>-		atomic_long_inc(&amp;sb-&gt;s_fsnotify_connectors);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fsnotify_put_sb_connectors(struct fsnotify_mark_connector *conn)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = fsnotify_connector_sb(conn);</div><div class='del'>-</div><div class='del'>-	if (sb &amp;&amp; atomic_long_dec_and_test(&amp;sb-&gt;s_fsnotify_connectors))</div><div class='del'>-		wake_up_var(&amp;sb-&gt;s_fsnotify_connectors);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void *fsnotify_detach_connector_from_object(</div><div class='ctx'> 					struct fsnotify_mark_connector *conn,</div><div class='ctx'> 					unsigned int *type)</div><div class='ctx'> {</div><div class='add'>+	fsnotify_connp_t *connp = fsnotify_object_connp(conn-&gt;obj, conn-&gt;type);</div><div class='add'>+	struct super_block *sb = fsnotify_connector_sb(conn);</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> </div><div class='ctx'> 	*type = conn-&gt;type;</div><div class='hunk'>@@ -259,12 +350,15 @@ static void *fsnotify_detach_connector_from_object(</div><div class='ctx'> 		fsnotify_conn_mount(conn)-&gt;mnt_fsnotify_mask = 0;</div><div class='ctx'> 	} else if (conn-&gt;type == FSNOTIFY_OBJ_TYPE_SB) {</div><div class='ctx'> 		fsnotify_conn_sb(conn)-&gt;s_fsnotify_mask = 0;</div><div class='add'>+	} else if (conn-&gt;type == FSNOTIFY_OBJ_TYPE_MNTNS) {</div><div class='add'>+		fsnotify_conn_mntns(conn)-&gt;n_fsnotify_mask = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fsnotify_put_sb_connectors(conn);</div><div class='del'>-	rcu_assign_pointer(*(conn-&gt;obj), NULL);</div><div class='add'>+	rcu_assign_pointer(*connp, NULL);</div><div class='ctx'> 	conn-&gt;obj = NULL;</div><div class='ctx'> 	conn-&gt;type = FSNOTIFY_OBJ_TYPE_DETACHED;</div><div class='add'>+	if (sb)</div><div class='add'>+		fsnotify_update_sb_watchers(sb, conn);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -316,6 +410,11 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)</div><div class='ctx'> 		objp = fsnotify_detach_connector_from_object(conn, &amp;type);</div><div class='ctx'> 		free_conn = true;</div><div class='ctx'> 	} else {</div><div class='add'>+		struct super_block *sb = fsnotify_connector_sb(conn);</div><div class='add'>+</div><div class='add'>+		/* Update watched objects after detaching mark */</div><div class='add'>+		if (sb)</div><div class='add'>+			fsnotify_update_sb_watchers(sb, conn);</div><div class='ctx'> 		objp = __fsnotify_recalc_mask(conn);</div><div class='ctx'> 		type = conn-&gt;type;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -329,7 +428,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)</div><div class='ctx'> 		conn-&gt;destroy_next = connector_destroy_list;</div><div class='ctx'> 		connector_destroy_list = conn;</div><div class='ctx'> 		spin_unlock(&amp;destroy_lock);</div><div class='del'>-		queue_work(system_unbound_wq, &amp;connector_reaper_work);</div><div class='add'>+		queue_work(system_dfl_wq, &amp;connector_reaper_work);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that we didn't update flags telling whether inode cares about</div><div class='hunk'>@@ -340,7 +439,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)</div><div class='ctx'> 	spin_lock(&amp;destroy_lock);</div><div class='ctx'> 	list_add(&amp;mark-&gt;g_list, &amp;destroy_list);</div><div class='ctx'> 	spin_unlock(&amp;destroy_lock);</div><div class='del'>-	queue_delayed_work(system_unbound_wq, &amp;reaper_work,</div><div class='add'>+	queue_delayed_work(system_dfl_wq, &amp;reaper_work,</div><div class='ctx'> 			   FSNOTIFY_REAPER_DELAY);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(fsnotify_put_mark);</div><div class='hunk'>@@ -536,8 +635,28 @@ int fsnotify_compare_groups(struct fsnotify_group *a, struct fsnotify_group *b)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fsnotify_attach_info_to_sb(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct fsnotify_sb_info *sbinfo;</div><div class='add'>+</div><div class='add'>+	/* sb info is freed on fsnotify_sb_delete() */</div><div class='add'>+	sbinfo = kzalloc(sizeof(*sbinfo), GFP_KERNEL);</div><div class='add'>+	if (!sbinfo)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * cmpxchg() provides the barrier so that callers of fsnotify_sb_info()</div><div class='add'>+	 * will observe an initialized structure</div><div class='add'>+	 */</div><div class='add'>+	if (cmpxchg(&amp;sb-&gt;s_fsnotify_info, NULL, sbinfo)) {</div><div class='add'>+		/* Someone else created sbinfo for us */</div><div class='add'>+		kfree(sbinfo);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp,</div><div class='del'>-					       unsigned int obj_type)</div><div class='add'>+					       void *obj, unsigned int obj_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsnotify_mark_connector *conn;</div><div class='ctx'> </div><div class='hunk'>@@ -547,10 +666,9 @@ static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp,</div><div class='ctx'> 	spin_lock_init(&amp;conn-&gt;lock);</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;conn-&gt;list);</div><div class='ctx'> 	conn-&gt;flags = 0;</div><div class='add'>+	conn-&gt;prio = 0;</div><div class='ctx'> 	conn-&gt;type = obj_type;</div><div class='del'>-	conn-&gt;obj = connp;</div><div class='del'>-	conn-&gt;flags = 0;</div><div class='del'>-	fsnotify_get_sb_connectors(conn);</div><div class='add'>+	conn-&gt;obj = obj;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * cmpxchg() provides the barrier so that readers of *connp can see</div><div class='hunk'>@@ -558,10 +676,8 @@ static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cmpxchg(connp, NULL, conn)) {</div><div class='ctx'> 		/* Someone else created list structure for us */</div><div class='del'>-		fsnotify_put_sb_connectors(conn);</div><div class='ctx'> 		kmem_cache_free(fsnotify_mark_connector_cachep, conn);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -598,24 +714,36 @@ out:</div><div class='ctx'>  * to which group and for which inodes. These marks are ordered according to</div><div class='ctx'>  * priority, highest number first, and then by the group's location in memory.</div><div class='ctx'>  */</div><div class='del'>-static int fsnotify_add_mark_list(struct fsnotify_mark *mark,</div><div class='del'>-				  fsnotify_connp_t *connp,</div><div class='add'>+static int fsnotify_add_mark_list(struct fsnotify_mark *mark, void *obj,</div><div class='ctx'> 				  unsigned int obj_type, int add_flags)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = fsnotify_object_sb(obj, obj_type);</div><div class='ctx'> 	struct fsnotify_mark *lmark, *last = NULL;</div><div class='ctx'> 	struct fsnotify_mark_connector *conn;</div><div class='add'>+	fsnotify_connp_t *connp;</div><div class='ctx'> 	int cmp;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!fsnotify_valid_obj_type(obj_type)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Attach the sb info before attaching a connector to any object on sb.</div><div class='add'>+	 * The sb info will remain attached as long as sb lives.</div><div class='add'>+	 */</div><div class='add'>+	if (sb &amp;&amp; !fsnotify_sb_info(sb)) {</div><div class='add'>+		err = fsnotify_attach_info_to_sb(sb);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	connp = fsnotify_object_connp(obj, obj_type);</div><div class='ctx'> restart:</div><div class='ctx'> 	spin_lock(&amp;mark-&gt;lock);</div><div class='ctx'> 	conn = fsnotify_grab_connector(connp);</div><div class='ctx'> 	if (!conn) {</div><div class='ctx'> 		spin_unlock(&amp;mark-&gt;lock);</div><div class='del'>-		err = fsnotify_attach_connector_to_object(connp, obj_type);</div><div class='add'>+		err = fsnotify_attach_connector_to_object(connp, obj, obj_type);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		goto restart;</div><div class='hunk'>@@ -649,6 +777,8 @@ restart:</div><div class='ctx'> 	/* mark should be the last entry.  last is the current last entry */</div><div class='ctx'> 	hlist_add_behind_rcu(&amp;mark-&gt;obj_list, &amp;last-&gt;obj_list);</div><div class='ctx'> added:</div><div class='add'>+	if (sb)</div><div class='add'>+		fsnotify_update_sb_watchers(sb, conn);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since connector is attached to object using cmpxchg() we are</div><div class='ctx'> 	 * guaranteed that connector initialization is fully visible by anyone</div><div class='hunk'>@@ -667,7 +797,7 @@ out_err:</div><div class='ctx'>  * event types should be delivered to which group.</div><div class='ctx'>  */</div><div class='ctx'> int fsnotify_add_mark_locked(struct fsnotify_mark *mark,</div><div class='del'>-			     fsnotify_connp_t *connp, unsigned int obj_type,</div><div class='add'>+			     void *obj, unsigned int obj_type,</div><div class='ctx'> 			     int add_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsnotify_group *group = mark-&gt;group;</div><div class='hunk'>@@ -688,7 +818,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark,</div><div class='ctx'> 	fsnotify_get_mark(mark); /* for g_list */</div><div class='ctx'> 	spin_unlock(&amp;mark-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	ret = fsnotify_add_mark_list(mark, connp, obj_type, add_flags);</div><div class='add'>+	ret = fsnotify_add_mark_list(mark, obj, obj_type, add_flags);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -706,14 +836,14 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,</div><div class='add'>+int fsnotify_add_mark(struct fsnotify_mark *mark, void *obj,</div><div class='ctx'> 		      unsigned int obj_type, int add_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct fsnotify_group *group = mark-&gt;group;</div><div class='ctx'> </div><div class='ctx'> 	fsnotify_group_lock(group);</div><div class='del'>-	ret = fsnotify_add_mark_locked(mark, connp, obj_type, add_flags);</div><div class='add'>+	ret = fsnotify_add_mark_locked(mark, obj, obj_type, add_flags);</div><div class='ctx'> 	fsnotify_group_unlock(group);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -723,12 +853,16 @@ EXPORT_SYMBOL_GPL(fsnotify_add_mark);</div><div class='ctx'>  * Given a list of marks, find the mark associated with given group. If found</div><div class='ctx'>  * take a reference to that mark and return it, else return NULL.</div><div class='ctx'>  */</div><div class='del'>-struct fsnotify_mark *fsnotify_find_mark(fsnotify_connp_t *connp,</div><div class='add'>+struct fsnotify_mark *fsnotify_find_mark(void *obj, unsigned int obj_type,</div><div class='ctx'> 					 struct fsnotify_group *group)</div><div class='ctx'> {</div><div class='add'>+	fsnotify_connp_t *connp = fsnotify_object_connp(obj, obj_type);</div><div class='ctx'> 	struct fsnotify_mark_connector *conn;</div><div class='ctx'> 	struct fsnotify_mark *mark;</div><div class='ctx'> </div><div class='add'>+	if (!connp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	conn = fsnotify_grab_connector(connp);</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return NULL;</div><div class='head'>diff --git a/fs/nsfs.c b/fs/nsfs.c<br/>index 34e1e3e36733..bf27d5da91f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/nsfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/nsfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/nsfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/nsfs.c</a></div><div class='hunk'>@@ -8,18 +8,34 @@</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/pid_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/nsfs.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/mnt_namespace.h&gt;</div><div class='add'>+#include &lt;linux/ipc_namespace.h&gt;</div><div class='add'>+#include &lt;linux/time_namespace.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/exportfs.h&gt;</div><div class='add'>+#include &lt;linux/nstree.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mount.h"</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> static struct vfsmount *nsfs_mnt;</div><div class='ctx'> </div><div class='add'>+static struct path nsfs_root_path = {};</div><div class='add'>+</div><div class='add'>+void nsfs_get_root(struct path *path)</div><div class='add'>+{</div><div class='add'>+	*path = nsfs_root_path;</div><div class='add'>+	path_get(path);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static long ns_ioctl(struct file *filp, unsigned int ioctl,</div><div class='ctx'> 			unsigned long arg);</div><div class='ctx'> static const struct file_operations ns_file_operations = {</div><div class='del'>-	.llseek		= no_llseek,</div><div class='ctx'> 	.unlocked_ioctl = ns_ioctl,</div><div class='ctx'> 	.compat_ioctl   = compat_ptr_ioctl,</div><div class='ctx'> };</div><div class='hunk'>@@ -27,96 +43,37 @@ static const struct file_operations ns_file_operations = {</div><div class='ctx'> static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='del'>-	const struct proc_ns_operations *ns_ops = dentry-&gt;d_fsdata;</div><div class='add'>+	struct ns_common *ns = inode-&gt;i_private;</div><div class='add'>+	const struct proc_ns_operations *ns_ops = ns-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	return dynamic_dname(buffer, buflen, "%s:[%lu]",</div><div class='ctx'> 		ns_ops-&gt;name, inode-&gt;i_ino);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ns_prune_dentry(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	if (inode) {</div><div class='del'>-		struct ns_common *ns = inode-&gt;i_private;</div><div class='del'>-		atomic_long_set(&amp;ns-&gt;stashed, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct dentry_operations ns_dentry_operations =</div><div class='del'>-{</div><div class='del'>-	.d_prune	= ns_prune_dentry,</div><div class='del'>-	.d_delete	= always_delete_dentry,</div><div class='add'>+const struct dentry_operations ns_dentry_operations = {</div><div class='ctx'> 	.d_dname	= ns_dname,</div><div class='add'>+	.d_prune	= stashed_dentry_prune,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nsfs_evict(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ns_common *ns = inode-&gt;i_private;</div><div class='del'>-	clear_inode(inode);</div><div class='del'>-	ns-&gt;ops-&gt;put(ns);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int __ns_get_path(struct path *path, struct ns_common *ns)</div><div class='del'>-{</div><div class='del'>-	struct vfsmount *mnt = nsfs_mnt;</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	unsigned long d;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	d = atomic_long_read(&amp;ns-&gt;stashed);</div><div class='del'>-	if (!d)</div><div class='del'>-		goto slow;</div><div class='del'>-	dentry = (struct dentry *)d;</div><div class='del'>-	if (!lockref_get_not_dead(&amp;dentry-&gt;d_lockref))</div><div class='del'>-		goto slow;</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	__ns_ref_active_put(ns);</div><div class='add'>+	clear_inode(inode);</div><div class='ctx'> 	ns-&gt;ops-&gt;put(ns);</div><div class='del'>-got_it:</div><div class='del'>-	path-&gt;mnt = mntget(mnt);</div><div class='del'>-	path-&gt;dentry = dentry;</div><div class='del'>-	return 0;</div><div class='del'>-slow:</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	inode = new_inode_pseudo(mnt-&gt;mnt_sb);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		ns-&gt;ops-&gt;put(ns);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	inode-&gt;i_ino = ns-&gt;inum;</div><div class='del'>-	simple_inode_init_ts(inode);</div><div class='del'>-	inode-&gt;i_flags |= S_IMMUTABLE;</div><div class='del'>-	inode-&gt;i_mode = S_IFREG | S_IRUGO;</div><div class='del'>-	inode-&gt;i_fop = &amp;ns_file_operations;</div><div class='del'>-	inode-&gt;i_private = ns;</div><div class='del'>-</div><div class='del'>-	dentry = d_make_root(inode);	/* not the normal use, but... */</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	dentry-&gt;d_fsdata = (void *)ns-&gt;ops;</div><div class='del'>-	d = atomic_long_cmpxchg(&amp;ns-&gt;stashed, 0, (unsigned long)dentry);</div><div class='del'>-	if (d) {</div><div class='del'>-		d_delete(dentry);	/* make sure -&gt;d_prune() does nothing */</div><div class='del'>-		dput(dentry);</div><div class='del'>-		cpu_relax();</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	goto got_it;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ns_get_path_cb(struct path *path, ns_get_path_helper_t *ns_get_cb,</div><div class='ctx'> 		     void *private_data)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct ns_common *ns;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		struct ns_common *ns = ns_get_cb(private_data);</div><div class='del'>-		if (!ns)</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		ret = __ns_get_path(path, ns);</div><div class='del'>-	} while (ret == -EAGAIN);</div><div class='add'>+	ns = ns_get_cb(private_data);</div><div class='add'>+	if (!ns)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return path_from_stashed(&amp;ns-&gt;stashed, nsfs_mnt, ns, path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ns_get_path_task_args {</div><div class='hunk'>@@ -142,55 +99,110 @@ int ns_get_path(struct path *path, struct task_struct *task,</div><div class='ctx'> 	return ns_get_path_cb(path, ns_get_path_task, &amp;args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * open_namespace - open a namespace</div><div class='add'>+ * @ns: the namespace to open</div><div class='add'>+ *</div><div class='add'>+ * This will consume a reference to @ns indendent of success or failure.</div><div class='add'>+ *</div><div class='add'>+ * Return: A file descriptor on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int open_namespace(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* call first to consume reference */</div><div class='add'>+	err = path_from_stashed(&amp;ns-&gt;stashed, nsfs_mnt, ns, &amp;path);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return FD_ADD(O_CLOEXEC, dentry_open(&amp;path, O_RDONLY, current_cred()));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int open_related_ns(struct ns_common *ns,</div><div class='ctx'> 		   struct ns_common *(*get_ns)(struct ns_common *ns))</div><div class='ctx'> {</div><div class='del'>-	struct path path = {};</div><div class='del'>-	struct file *f;</div><div class='del'>-	int err;</div><div class='del'>-	int fd;</div><div class='add'>+	struct ns_common *relative;</div><div class='ctx'> </div><div class='del'>-	fd = get_unused_fd_flags(O_CLOEXEC);</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		return fd;</div><div class='add'>+	relative = get_ns(ns);</div><div class='add'>+	if (IS_ERR(relative))</div><div class='add'>+		return PTR_ERR(relative);</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		struct ns_common *relative;</div><div class='add'>+	return open_namespace(relative);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(open_related_ns);</div><div class='ctx'> </div><div class='del'>-		relative = get_ns(ns);</div><div class='del'>-		if (IS_ERR(relative)) {</div><div class='del'>-			put_unused_fd(fd);</div><div class='del'>-			return PTR_ERR(relative);</div><div class='del'>-		}</div><div class='add'>+static int copy_ns_info_to_user(const struct mnt_namespace *mnt_ns,</div><div class='add'>+				struct mnt_ns_info __user *uinfo, size_t usize,</div><div class='add'>+				struct mnt_ns_info *kinfo)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If userspace and the kernel have the same struct size it can just</div><div class='add'>+	 * be copied. If userspace provides an older struct, only the bits that</div><div class='add'>+	 * userspace knows about will be copied. If userspace provides a new</div><div class='add'>+	 * struct, only the bits that the kernel knows aobut will be copied and</div><div class='add'>+	 * the size value will be set to the size the kernel knows about.</div><div class='add'>+	 */</div><div class='add'>+	kinfo-&gt;size		= min(usize, sizeof(*kinfo));</div><div class='add'>+	kinfo-&gt;mnt_ns_id	= mnt_ns-&gt;ns.ns_id;</div><div class='add'>+	kinfo-&gt;nr_mounts	= READ_ONCE(mnt_ns-&gt;nr_mounts);</div><div class='add'>+	/* Subtract the root mount of the mount namespace. */</div><div class='add'>+	if (kinfo-&gt;nr_mounts)</div><div class='add'>+		kinfo-&gt;nr_mounts--;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(uinfo, kinfo, kinfo-&gt;size))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		err = __ns_get_path(&amp;path, relative);</div><div class='del'>-	} while (err == -EAGAIN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='del'>-		put_unused_fd(fd);</div><div class='del'>-		return err;</div><div class='add'>+static bool nsfs_ioctl_valid(unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case NS_GET_USERNS:</div><div class='add'>+	case NS_GET_PARENT:</div><div class='add'>+	case NS_GET_NSTYPE:</div><div class='add'>+	case NS_GET_OWNER_UID:</div><div class='add'>+	case NS_GET_MNTNS_ID:</div><div class='add'>+	case NS_GET_PID_FROM_PIDNS:</div><div class='add'>+	case NS_GET_TGID_FROM_PIDNS:</div><div class='add'>+	case NS_GET_PID_IN_PIDNS:</div><div class='add'>+	case NS_GET_TGID_IN_PIDNS:</div><div class='add'>+	case NS_GET_ID:</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f = dentry_open(&amp;path, O_RDONLY, current_cred());</div><div class='del'>-	path_put(&amp;path);</div><div class='del'>-	if (IS_ERR(f)) {</div><div class='del'>-		put_unused_fd(fd);</div><div class='del'>-		fd = PTR_ERR(f);</div><div class='del'>-	} else</div><div class='del'>-		fd_install(fd, f);</div><div class='add'>+	/* Extensible ioctls require some extra handling. */</div><div class='add'>+	switch (_IOC_NR(cmd)) {</div><div class='add'>+	case _IOC_NR(NS_MNT_GET_INFO):</div><div class='add'>+		return extensible_ioctl_valid(cmd, NS_MNT_GET_INFO, MNT_NS_INFO_SIZE_VER0);</div><div class='add'>+	case _IOC_NR(NS_MNT_GET_NEXT):</div><div class='add'>+		return extensible_ioctl_valid(cmd, NS_MNT_GET_NEXT, MNT_NS_INFO_SIZE_VER0);</div><div class='add'>+	case _IOC_NR(NS_MNT_GET_PREV):</div><div class='add'>+		return extensible_ioctl_valid(cmd, NS_MNT_GET_PREV, MNT_NS_INFO_SIZE_VER0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return fd;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(open_related_ns);</div><div class='ctx'> </div><div class='ctx'> static long ns_ioctl(struct file *filp, unsigned int ioctl,</div><div class='ctx'> 			unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_namespace *user_ns;</div><div class='del'>-	struct ns_common *ns = get_proc_ns(file_inode(filp));</div><div class='add'>+	struct pid_namespace *pid_ns;</div><div class='add'>+	struct task_struct *tsk;</div><div class='add'>+	struct ns_common *ns;</div><div class='add'>+	struct mnt_namespace *mnt_ns;</div><div class='add'>+	bool previous = false;</div><div class='ctx'> 	uid_t __user *argp;</div><div class='ctx'> 	uid_t uid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!nsfs_ioctl_valid(ioctl))</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='ctx'> </div><div class='add'>+	ns = get_proc_ns(file_inode(filp));</div><div class='ctx'> 	switch (ioctl) {</div><div class='ctx'> 	case NS_GET_USERNS:</div><div class='ctx'> 		return open_related_ns(ns, ns_get_owner);</div><div class='hunk'>@@ -199,17 +211,134 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		return open_related_ns(ns, ns-&gt;ops-&gt;get_parent);</div><div class='ctx'> 	case NS_GET_NSTYPE:</div><div class='del'>-		return ns-&gt;ops-&gt;type;</div><div class='add'>+		return ns-&gt;ns_type;</div><div class='ctx'> 	case NS_GET_OWNER_UID:</div><div class='del'>-		if (ns-&gt;ops-&gt;type != CLONE_NEWUSER)</div><div class='add'>+		if (ns-&gt;ns_type != CLONE_NEWUSER)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		user_ns = container_of(ns, struct user_namespace, ns);</div><div class='ctx'> 		argp = (uid_t __user *) arg;</div><div class='ctx'> 		uid = from_kuid_munged(current_user_ns(), user_ns-&gt;owner);</div><div class='ctx'> 		return put_user(uid, argp);</div><div class='add'>+	case NS_GET_PID_FROM_PIDNS:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NS_GET_TGID_FROM_PIDNS:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NS_GET_PID_IN_PIDNS:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NS_GET_TGID_IN_PIDNS: {</div><div class='add'>+		if (ns-&gt;ns_type != CLONE_NEWPID)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ret = -ESRCH;</div><div class='add'>+		pid_ns = container_of(ns, struct pid_namespace, ns);</div><div class='add'>+</div><div class='add'>+		guard(rcu)();</div><div class='add'>+</div><div class='add'>+		if (ioctl == NS_GET_PID_IN_PIDNS ||</div><div class='add'>+		    ioctl == NS_GET_TGID_IN_PIDNS)</div><div class='add'>+			tsk = find_task_by_vpid(arg);</div><div class='add'>+		else</div><div class='add'>+			tsk = find_task_by_pid_ns(arg, pid_ns);</div><div class='add'>+		if (!tsk)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		switch (ioctl) {</div><div class='add'>+		case NS_GET_PID_FROM_PIDNS:</div><div class='add'>+			ret = task_pid_vnr(tsk);</div><div class='add'>+			break;</div><div class='add'>+		case NS_GET_TGID_FROM_PIDNS:</div><div class='add'>+			ret = task_tgid_vnr(tsk);</div><div class='add'>+			break;</div><div class='add'>+		case NS_GET_PID_IN_PIDNS:</div><div class='add'>+			ret = task_pid_nr_ns(tsk, pid_ns);</div><div class='add'>+			break;</div><div class='add'>+		case NS_GET_TGID_IN_PIDNS:</div><div class='add'>+			ret = task_tgid_nr_ns(tsk, pid_ns);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = -ESRCH;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	case NS_GET_MNTNS_ID:</div><div class='add'>+		if (ns-&gt;ns_type != CLONE_NEWNS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NS_GET_ID: {</div><div class='add'>+		__u64 __user *idp;</div><div class='add'>+		__u64 id;</div><div class='add'>+</div><div class='add'>+		idp = (__u64 __user *)arg;</div><div class='add'>+		id = ns-&gt;ns_id;</div><div class='add'>+		return put_user(id, idp);</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* extensible ioctls */</div><div class='add'>+	switch (_IOC_NR(ioctl)) {</div><div class='add'>+	case _IOC_NR(NS_MNT_GET_INFO): {</div><div class='add'>+		struct mnt_ns_info kinfo = {};</div><div class='add'>+		struct mnt_ns_info __user *uinfo = (struct mnt_ns_info __user *)arg;</div><div class='add'>+		size_t usize = _IOC_SIZE(ioctl);</div><div class='add'>+</div><div class='add'>+		if (ns-&gt;ns_type != CLONE_NEWNS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (!uinfo)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (usize &lt; MNT_NS_INFO_SIZE_VER0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		return copy_ns_info_to_user(to_mnt_ns(ns), uinfo, usize, &amp;kinfo);</div><div class='add'>+	}</div><div class='add'>+	case _IOC_NR(NS_MNT_GET_PREV):</div><div class='add'>+		previous = true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case _IOC_NR(NS_MNT_GET_NEXT): {</div><div class='add'>+		struct mnt_ns_info kinfo = {};</div><div class='add'>+		struct mnt_ns_info __user *uinfo = (struct mnt_ns_info __user *)arg;</div><div class='add'>+		struct path path __free(path_put) = {};</div><div class='add'>+		size_t usize = _IOC_SIZE(ioctl);</div><div class='add'>+</div><div class='add'>+		if (ns-&gt;ns_type != CLONE_NEWNS)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (usize &lt; MNT_NS_INFO_SIZE_VER0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mnt_ns = get_sequential_mnt_ns(to_mnt_ns(ns), previous);</div><div class='add'>+		if (IS_ERR(mnt_ns))</div><div class='add'>+			return PTR_ERR(mnt_ns);</div><div class='add'>+</div><div class='add'>+		ns = to_ns_common(mnt_ns);</div><div class='add'>+		/* Transfer ownership of @mnt_ns reference to @path. */</div><div class='add'>+		ret = path_from_stashed(&amp;ns-&gt;stashed, nsfs_mnt, ns, &amp;path);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		FD_PREPARE(fdf, O_CLOEXEC, dentry_open(&amp;path, O_RDONLY, current_cred()));</div><div class='add'>+		if (fdf.err)</div><div class='add'>+			return fdf.err;</div><div class='add'>+		/*</div><div class='add'>+		 * If @uinfo is passed return all information about the</div><div class='add'>+		 * mount namespace as well.</div><div class='add'>+		 */</div><div class='add'>+		ret = copy_ns_info_to_user(to_mnt_ns(ns), uinfo, usize, &amp;kinfo);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = fd_publish(fdf);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='del'>-		return -ENOTTY;</div><div class='add'>+		ret = -ENOTTY;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ns_get_name(char *buf, size_t size, struct task_struct *task,</div><div class='hunk'>@@ -249,7 +378,8 @@ bool ns_match(const struct ns_common *ns, dev_t dev, ino_t ino)</div><div class='ctx'> static int nsfs_show_path(struct seq_file *seq, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='del'>-	const struct proc_ns_operations *ns_ops = dentry-&gt;d_fsdata;</div><div class='add'>+	const struct ns_common *ns = inode-&gt;i_private;</div><div class='add'>+	const struct proc_ns_operations *ns_ops = ns-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "%s:[%lu]", ns_ops-&gt;name, inode-&gt;i_ino);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -259,6 +389,248 @@ static const struct super_operations nsfs_ops = {</div><div class='ctx'> 	.statfs = simple_statfs,</div><div class='ctx'> 	.evict_inode = nsfs_evict,</div><div class='ctx'> 	.show_path = nsfs_show_path,</div><div class='add'>+	.drop_inode = inode_just_drop,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nsfs_init_inode(struct inode *inode, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ns_common *ns = data;</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_private = data;</div><div class='add'>+	inode-&gt;i_mode |= S_IRUGO;</div><div class='add'>+	inode-&gt;i_fop = &amp;ns_file_operations;</div><div class='add'>+	inode-&gt;i_ino = ns-&gt;inum;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Bring the namespace subtree back to life if we have to. This</div><div class='add'>+	 * can happen when e.g., all processes using a network namespace</div><div class='add'>+	 * and all namespace files or namespace file bind-mounts have</div><div class='add'>+	 * died but there are still sockets pinning it. The SIOCGSKNS</div><div class='add'>+	 * ioctl on such a socket will resurrect the relevant namespace</div><div class='add'>+	 * subtree.</div><div class='add'>+	 */</div><div class='add'>+	__ns_ref_active_get(ns);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nsfs_put_data(void *data)</div><div class='add'>+{</div><div class='add'>+	struct ns_common *ns = data;</div><div class='add'>+	ns-&gt;ops-&gt;put(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct stashed_operations nsfs_stashed_ops = {</div><div class='add'>+	.init_inode = nsfs_init_inode,</div><div class='add'>+	.put_data = nsfs_put_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NSFS_FID_SIZE_U32_VER0 (NSFS_FILE_HANDLE_SIZE_VER0 / sizeof(u32))</div><div class='add'>+#define NSFS_FID_SIZE_U32_LATEST (NSFS_FILE_HANDLE_SIZE_LATEST / sizeof(u32))</div><div class='add'>+</div><div class='add'>+static int nsfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,</div><div class='add'>+			  struct inode *parent)</div><div class='add'>+{</div><div class='add'>+	struct nsfs_file_handle *fid = (struct nsfs_file_handle *)fh;</div><div class='add'>+	struct ns_common *ns = inode-&gt;i_private;</div><div class='add'>+	int len = *max_len;</div><div class='add'>+</div><div class='add'>+	if (parent)</div><div class='add'>+		return FILEID_INVALID;</div><div class='add'>+</div><div class='add'>+	if (len &lt; NSFS_FID_SIZE_U32_VER0) {</div><div class='add'>+		*max_len = NSFS_FID_SIZE_U32_LATEST;</div><div class='add'>+		return FILEID_INVALID;</div><div class='add'>+	} else if (len &gt; NSFS_FID_SIZE_U32_LATEST) {</div><div class='add'>+		*max_len = NSFS_FID_SIZE_U32_LATEST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fid-&gt;ns_id	= ns-&gt;ns_id;</div><div class='add'>+	fid-&gt;ns_type	= ns-&gt;ns_type;</div><div class='add'>+	fid-&gt;ns_inum	= inode-&gt;i_ino;</div><div class='add'>+	return FILEID_NSFS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool is_current_namespace(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	switch (ns-&gt;ns_type) {</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+	case CLONE_NEWCGROUP:</div><div class='add'>+		return current_in_namespace(to_cg_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IPC_NS</div><div class='add'>+	case CLONE_NEWIPC:</div><div class='add'>+		return current_in_namespace(to_ipc_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+	case CLONE_NEWNS:</div><div class='add'>+		return current_in_namespace(to_mnt_ns(ns));</div><div class='add'>+#ifdef CONFIG_NET_NS</div><div class='add'>+	case CLONE_NEWNET:</div><div class='add'>+		return current_in_namespace(to_net_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PID_NS</div><div class='add'>+	case CLONE_NEWPID:</div><div class='add'>+		return current_in_namespace(to_pid_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TIME_NS</div><div class='add'>+	case CLONE_NEWTIME:</div><div class='add'>+		return current_in_namespace(to_time_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_USER_NS</div><div class='add'>+	case CLONE_NEWUSER:</div><div class='add'>+		return current_in_namespace(to_user_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_UTS_NS</div><div class='add'>+	case CLONE_NEWUTS:</div><div class='add'>+		return current_in_namespace(to_uts_ns(ns));</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		VFS_WARN_ON_ONCE(true);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *nsfs_fh_to_dentry(struct super_block *sb, struct fid *fh,</div><div class='add'>+					int fh_len, int fh_type)</div><div class='add'>+{</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='add'>+	struct nsfs_file_handle *fid = (struct nsfs_file_handle *)fh;</div><div class='add'>+	struct user_namespace *owning_ns = NULL;</div><div class='add'>+	struct ns_common *ns;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fh_len &lt; NSFS_FID_SIZE_U32_VER0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Check that any trailing bytes are zero. */</div><div class='add'>+	if ((fh_len &gt; NSFS_FID_SIZE_U32_LATEST) &amp;&amp;</div><div class='add'>+	    memchr_inv((void *)fid + NSFS_FID_SIZE_U32_LATEST, 0,</div><div class='add'>+		       fh_len - NSFS_FID_SIZE_U32_LATEST))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	switch (fh_type) {</div><div class='add'>+	case FILEID_NSFS:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!fid-&gt;ns_id)</div><div class='add'>+		return NULL;</div><div class='add'>+	/* Either both are set or both are unset. */</div><div class='add'>+	if (!fid-&gt;ns_inum != !fid-&gt;ns_type)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	scoped_guard(rcu) {</div><div class='add'>+		ns = ns_tree_lookup_rcu(fid-&gt;ns_id, fid-&gt;ns_type);</div><div class='add'>+		if (!ns)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		VFS_WARN_ON_ONCE(ns-&gt;ns_id != fid-&gt;ns_id);</div><div class='add'>+</div><div class='add'>+		if (fid-&gt;ns_inum &amp;&amp; (fid-&gt;ns_inum != ns-&gt;inum))</div><div class='add'>+			return NULL;</div><div class='add'>+		if (fid-&gt;ns_type &amp;&amp; (fid-&gt;ns_type != ns-&gt;ns_type))</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This is racy because we're not actually taking an</div><div class='add'>+		 * active reference. IOW, it could happen that the</div><div class='add'>+		 * namespace becomes inactive after this check.</div><div class='add'>+		 * We don't care because nsfs_init_inode() will just</div><div class='add'>+		 * resurrect the relevant namespace tree for us. If it</div><div class='add'>+		 * has been active here we just allow it's resurrection.</div><div class='add'>+		 * We could try to take an active reference here and</div><div class='add'>+		 * then drop it again. But really, why bother.</div><div class='add'>+		 */</div><div class='add'>+		if (!ns_get_unless_inactive(ns))</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ns-&gt;ns_type) {</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+	case CLONE_NEWCGROUP:</div><div class='add'>+		if (!current_in_namespace(to_cg_ns(ns)))</div><div class='add'>+			owning_ns = to_cg_ns(ns)-&gt;user_ns;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IPC_NS</div><div class='add'>+	case CLONE_NEWIPC:</div><div class='add'>+		if (!current_in_namespace(to_ipc_ns(ns)))</div><div class='add'>+			owning_ns = to_ipc_ns(ns)-&gt;user_ns;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	case CLONE_NEWNS:</div><div class='add'>+		if (!current_in_namespace(to_mnt_ns(ns)))</div><div class='add'>+			owning_ns = to_mnt_ns(ns)-&gt;user_ns;</div><div class='add'>+		break;</div><div class='add'>+#ifdef CONFIG_NET_NS</div><div class='add'>+	case CLONE_NEWNET:</div><div class='add'>+		if (!current_in_namespace(to_net_ns(ns)))</div><div class='add'>+			owning_ns = to_net_ns(ns)-&gt;user_ns;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PID_NS</div><div class='add'>+	case CLONE_NEWPID:</div><div class='add'>+		if (!current_in_namespace(to_pid_ns(ns))) {</div><div class='add'>+			owning_ns = to_pid_ns(ns)-&gt;user_ns;</div><div class='add'>+		} else if (!READ_ONCE(to_pid_ns(ns)-&gt;child_reaper)) {</div><div class='add'>+			ns-&gt;ops-&gt;put(ns);</div><div class='add'>+			return ERR_PTR(-EPERM);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_TIME_NS</div><div class='add'>+	case CLONE_NEWTIME:</div><div class='add'>+		if (!current_in_namespace(to_time_ns(ns)))</div><div class='add'>+			owning_ns = to_time_ns(ns)-&gt;user_ns;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_USER_NS</div><div class='add'>+	case CLONE_NEWUSER:</div><div class='add'>+		if (!current_in_namespace(to_user_ns(ns)))</div><div class='add'>+			owning_ns = to_user_ns(ns);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_UTS_NS</div><div class='add'>+	case CLONE_NEWUTS:</div><div class='add'>+		if (!current_in_namespace(to_uts_ns(ns)))</div><div class='add'>+			owning_ns = to_uts_ns(ns)-&gt;user_ns;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (owning_ns &amp;&amp; !ns_capable(owning_ns, CAP_SYS_ADMIN)) {</div><div class='add'>+		ns-&gt;ops-&gt;put(ns);</div><div class='add'>+		return ERR_PTR(-EPERM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* path_from_stashed() unconditionally consumes the reference. */</div><div class='add'>+	ret = path_from_stashed(&amp;ns-&gt;stashed, nsfs_mnt, ns, &amp;path);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	return no_free_ptr(path.dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nsfs_export_permission(struct handle_to_path_ctx *ctx,</div><div class='add'>+				   unsigned int oflags)</div><div class='add'>+{</div><div class='add'>+	/* nsfs_fh_to_dentry() performs all permission checks. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file *nsfs_export_open(const struct path *path, unsigned int oflags)</div><div class='add'>+{</div><div class='add'>+	return file_open_root(path, "", oflags, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct export_operations nsfs_export_operations = {</div><div class='add'>+	.encode_fh	= nsfs_encode_fh,</div><div class='add'>+	.fh_to_dentry	= nsfs_fh_to_dentry,</div><div class='add'>+	.open		= nsfs_export_open,</div><div class='add'>+	.permission	= nsfs_export_permission,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nsfs_init_fs_context(struct fs_context *fc)</div><div class='hunk'>@@ -266,8 +638,12 @@ static int nsfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	struct pseudo_fs_context *ctx = init_pseudo(fc, NSFS_MAGIC);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	fc-&gt;s_iflags |= SB_I_NOEXEC | SB_I_NODEV;</div><div class='add'>+	ctx-&gt;s_d_flags |= DCACHE_DONTCACHE;</div><div class='ctx'> 	ctx-&gt;ops = &amp;nsfs_ops;</div><div class='add'>+	ctx-&gt;eops = &amp;nsfs_export_operations;</div><div class='ctx'> 	ctx-&gt;dops = &amp;ns_dentry_operations;</div><div class='add'>+	fc-&gt;s_fs_info = (void *)&amp;nsfs_stashed_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,4 +659,30 @@ void __init nsfs_init(void)</div><div class='ctx'> 	if (IS_ERR(nsfs_mnt))</div><div class='ctx'> 		panic("can't set nsfs up\n");</div><div class='ctx'> 	nsfs_mnt-&gt;mnt_sb-&gt;s_flags &amp;= ~SB_NOUSER;</div><div class='add'>+	nsfs_root_path.mnt = nsfs_mnt;</div><div class='add'>+	nsfs_root_path.dentry = nsfs_mnt-&gt;mnt_root;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsproxy_ns_active_get(struct nsproxy *ns)</div><div class='add'>+{</div><div class='add'>+	ns_ref_active_get(ns-&gt;mnt_ns);</div><div class='add'>+	ns_ref_active_get(ns-&gt;uts_ns);</div><div class='add'>+	ns_ref_active_get(ns-&gt;ipc_ns);</div><div class='add'>+	ns_ref_active_get(ns-&gt;pid_ns_for_children);</div><div class='add'>+	ns_ref_active_get(ns-&gt;cgroup_ns);</div><div class='add'>+	ns_ref_active_get(ns-&gt;net_ns);</div><div class='add'>+	ns_ref_active_get(ns-&gt;time_ns);</div><div class='add'>+	ns_ref_active_get(ns-&gt;time_ns_for_children);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nsproxy_ns_active_put(struct nsproxy *ns)</div><div class='add'>+{</div><div class='add'>+	ns_ref_active_put(ns-&gt;mnt_ns);</div><div class='add'>+	ns_ref_active_put(ns-&gt;uts_ns);</div><div class='add'>+	ns_ref_active_put(ns-&gt;ipc_ns);</div><div class='add'>+	ns_ref_active_put(ns-&gt;pid_ns_for_children);</div><div class='add'>+	ns_ref_active_put(ns-&gt;cgroup_ns);</div><div class='add'>+	ns_ref_active_put(ns-&gt;net_ns);</div><div class='add'>+	ns_ref_active_put(ns-&gt;time_ns);</div><div class='add'>+	ns_ref_active_put(ns-&gt;time_ns_for_children);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ntfs/Kconfig b/fs/ntfs/Kconfig<br/>deleted file mode 100644<br/>index 7b2509741735..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config NTFS_FS</div><div class='del'>-	tristate "NTFS file system support"</div><div class='del'>-	select BUFFER_HEAD</div><div class='del'>-	select NLS</div><div class='del'>-	help</div><div class='del'>-	  NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.</div><div class='del'>-</div><div class='del'>-	  Saying Y or M here enables read support.  There is partial, but</div><div class='del'>-	  safe, write support available.  For write support you must also</div><div class='del'>-	  say Y to "NTFS write support" below.</div><div class='del'>-</div><div class='del'>-	  There are also a number of user-space tools available, called</div><div class='del'>-	  ntfsprogs.  These include ntfsundelete and ntfsresize, that work</div><div class='del'>-	  without NTFS support enabled in the kernel.</div><div class='del'>-</div><div class='del'>-	  This is a rewrite from scratch of Linux NTFS support and replaced</div><div class='del'>-	  the old NTFS code starting with Linux 2.5.11.  A backport to</div><div class='del'>-	  the Linux 2.4 kernel series is separately available as a patch</div><div class='del'>-	  from the project web site.</div><div class='del'>-</div><div class='del'>-	  For more information see &lt;file:Documentation/filesystems/ntfs.rst&gt;</div><div class='del'>-	  and &lt;http://www.linux-ntfs.org/&gt;.</div><div class='del'>-</div><div class='del'>-	  To compile this file system support as a module, choose M here: the</div><div class='del'>-	  module will be called ntfs.</div><div class='del'>-</div><div class='del'>-	  If you are not using Windows NT, 2000, XP or 2003 in addition to</div><div class='del'>-	  Linux on your computer it is safe to say N.</div><div class='del'>-</div><div class='del'>-config NTFS_DEBUG</div><div class='del'>-	bool "NTFS debugging support"</div><div class='del'>-	depends on NTFS_FS</div><div class='del'>-	help</div><div class='del'>-	  If you are experiencing any problems with the NTFS file system, say</div><div class='del'>-	  Y here.  This will result in additional consistency checks to be</div><div class='del'>-	  performed by the driver as well as additional debugging messages to</div><div class='del'>-	  be written to the system log.  Note that debugging messages are</div><div class='del'>-	  disabled by default.  To enable them, supply the option debug_msgs=1</div><div class='del'>-	  at the kernel command line when booting the kernel or as an option</div><div class='del'>-	  to insmod when loading the ntfs module.  Once the driver is active,</div><div class='del'>-	  you can enable debugging messages by doing (as root):</div><div class='del'>-	  echo 1 &gt; /proc/sys/fs/ntfs-debug</div><div class='del'>-	  Replacing the "1" with "0" would disable debug messages.</div><div class='del'>-</div><div class='del'>-	  If you leave debugging messages disabled, this results in little</div><div class='del'>-	  overhead, but enabling debug messages results in very significant</div><div class='del'>-	  slowdown of the system.</div><div class='del'>-</div><div class='del'>-	  When reporting bugs, please try to have available a full dump of</div><div class='del'>-	  debugging messages while the misbehaviour was occurring.</div><div class='del'>-</div><div class='del'>-config NTFS_RW</div><div class='del'>-	bool "NTFS write support"</div><div class='del'>-	depends on NTFS_FS</div><div class='del'>-	depends on PAGE_SIZE_LESS_THAN_64KB</div><div class='del'>-	help</div><div class='del'>-	  This enables the partial, but safe, write support in the NTFS driver.</div><div class='del'>-</div><div class='del'>-	  The only supported operation is overwriting existing files, without</div><div class='del'>-	  changing the file length.  No file or directory creation, deletion or</div><div class='del'>-	  renaming is possible.  Note only non-resident files can be written to</div><div class='del'>-	  so you may find that some very small files (&lt;500 bytes or so) cannot</div><div class='del'>-	  be written to.</div><div class='del'>-</div><div class='del'>-	  While we cannot guarantee that it will not damage any data, we have</div><div class='del'>-	  so far not received a single report where the driver would have</div><div class='del'>-	  damaged someones data so we assume it is perfectly safe to use.</div><div class='del'>-</div><div class='del'>-	  Note:  While write support is safe in this version (a rewrite from</div><div class='del'>-	  scratch of the NTFS support), it should be noted that the old NTFS</div><div class='del'>-	  write support, included in Linux 2.5.10 and before (since 1997),</div><div class='del'>-	  is not safe.</div><div class='del'>-</div><div class='del'>-	  This is currently useful with TopologiLinux.  TopologiLinux is run</div><div class='del'>-	  on top of any DOS/Microsoft Windows system without partitioning your</div><div class='del'>-	  hard disk.  Unlike other Linux distributions TopologiLinux does not</div><div class='del'>-	  need its own partition.  For more information see</div><div class='del'>-	  &lt;http://topologi-linux.sourceforge.net/&gt;</div><div class='del'>-</div><div class='del'>-	  It is perfectly safe to say N here.</div><div class='head'>diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile<br/>deleted file mode 100644<br/>index 3e736572ed00..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Rules for making the NTFS driver.</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_NTFS_FS) += ntfs.o</div><div class='del'>-</div><div class='del'>-ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \</div><div class='del'>-	  index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \</div><div class='del'>-	  unistr.o upcase.o</div><div class='del'>-</div><div class='del'>-ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o</div><div class='del'>-</div><div class='del'>-ccflags-y := -DNTFS_VERSION=\"2.1.32\"</div><div class='del'>-ccflags-$(CONFIG_NTFS_DEBUG)	+= -DDEBUG</div><div class='del'>-ccflags-$(CONFIG_NTFS_RW)	+= -DNTFS_RW</div><div class='del'>-</div><div class='head'>diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c<br/>deleted file mode 100644<br/>index 2d01517a2d59..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/aops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/aops.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1744 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * aops.c - NTFS kernel address space operations and page cache handling.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/bit_spinlock.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "runlist.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_end_buffer_async_read - async io completion for reading attributes</div><div class='del'>- * @bh:		buffer head on which io is completed</div><div class='del'>- * @uptodate:	whether @bh is now uptodate or not</div><div class='del'>- *</div><div class='del'>- * Asynchronous I/O completion handler for reading pages belonging to the</div><div class='del'>- * attribute address space of an inode.  The inodes can either be files or</div><div class='del'>- * directories or they can be fake inodes describing some attribute.</div><div class='del'>- *</div><div class='del'>- * If NInoMstProtected(), perform the post read mst fixups when all IO on the</div><div class='del'>- * page has been completed and mark the page uptodate or set the error bit on</div><div class='del'>- * the page.  To determine the size of the records that need fixing up, we</div><div class='del'>- * cheat a little bit by setting the index_block_size in ntfs_inode to the ntfs</div><div class='del'>- * record size, and index_block_size_bits, to the log(base 2) of the ntfs</div><div class='del'>- * record size.</div><div class='del'>- */</div><div class='del'>-static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct buffer_head *first, *tmp;</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-	int page_uptodate = 1;</div><div class='del'>-</div><div class='del'>-	page = bh-&gt;b_page;</div><div class='del'>-	vi = page-&gt;mapping-&gt;host;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-</div><div class='del'>-	if (likely(uptodate)) {</div><div class='del'>-		loff_t i_size;</div><div class='del'>-		s64 file_ofs, init_size;</div><div class='del'>-</div><div class='del'>-		set_buffer_uptodate(bh);</div><div class='del'>-</div><div class='del'>-		file_ofs = ((s64)page-&gt;index &lt;&lt; PAGE_SHIFT) +</div><div class='del'>-				bh_offset(bh);</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		init_size = ni-&gt;initialized_size;</div><div class='del'>-		i_size = i_size_read(vi);</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (unlikely(init_size &gt; i_size)) {</div><div class='del'>-			/* Race with shrinking truncate. */</div><div class='del'>-			init_size = i_size;</div><div class='del'>-		}</div><div class='del'>-		/* Check for the current buffer head overflowing. */</div><div class='del'>-		if (unlikely(file_ofs + bh-&gt;b_size &gt; init_size)) {</div><div class='del'>-			int ofs;</div><div class='del'>-			void *kaddr;</div><div class='del'>-</div><div class='del'>-			ofs = 0;</div><div class='del'>-			if (file_ofs &lt; init_size)</div><div class='del'>-				ofs = init_size - file_ofs;</div><div class='del'>-			kaddr = kmap_atomic(page);</div><div class='del'>-			memset(kaddr + bh_offset(bh) + ofs, 0,</div><div class='del'>-					bh-&gt;b_size - ofs);</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		clear_buffer_uptodate(bh);</div><div class='del'>-		SetPageError(page);</div><div class='del'>-		ntfs_error(ni-&gt;vol-&gt;sb, "Buffer I/O error, logical block "</div><div class='del'>-				"0x%llx.", (unsigned long long)bh-&gt;b_blocknr);</div><div class='del'>-	}</div><div class='del'>-	first = page_buffers(page);</div><div class='del'>-	spin_lock_irqsave(&amp;first-&gt;b_uptodate_lock, flags);</div><div class='del'>-	clear_buffer_async_read(bh);</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-	tmp = bh;</div><div class='del'>-	do {</div><div class='del'>-		if (!buffer_uptodate(tmp))</div><div class='del'>-			page_uptodate = 0;</div><div class='del'>-		if (buffer_async_read(tmp)) {</div><div class='del'>-			if (likely(buffer_locked(tmp)))</div><div class='del'>-				goto still_busy;</div><div class='del'>-			/* Async buffers must be locked. */</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-		tmp = tmp-&gt;b_this_page;</div><div class='del'>-	} while (tmp != bh);</div><div class='del'>-	spin_unlock_irqrestore(&amp;first-&gt;b_uptodate_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * If none of the buffers had errors then we can set the page uptodate,</div><div class='del'>-	 * but we first have to perform the post read mst fixups, if the</div><div class='del'>-	 * attribute is mst protected, i.e. if NInoMstProteced(ni) is true.</div><div class='del'>-	 * Note we ignore fixup errors as those are detected when</div><div class='del'>-	 * map_mft_record() is called which gives us per record granularity</div><div class='del'>-	 * rather than per page granularity.</div><div class='del'>-	 */</div><div class='del'>-	if (!NInoMstProtected(ni)) {</div><div class='del'>-		if (likely(page_uptodate &amp;&amp; !PageError(page)))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-	} else {</div><div class='del'>-		u8 *kaddr;</div><div class='del'>-		unsigned int i, recs;</div><div class='del'>-		u32 rec_size;</div><div class='del'>-</div><div class='del'>-		rec_size = ni-&gt;itype.index.block_size;</div><div class='del'>-		recs = PAGE_SIZE / rec_size;</div><div class='del'>-		/* Should have been verified before we got here... */</div><div class='del'>-		BUG_ON(!recs);</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		for (i = 0; i &lt; recs; i++)</div><div class='del'>-			post_read_mst_fixup((NTFS_RECORD*)(kaddr +</div><div class='del'>-					i * rec_size), rec_size);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		if (likely(page_uptodate &amp;&amp; !PageError(page)))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-	}</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return;</div><div class='del'>-still_busy:</div><div class='del'>-	spin_unlock_irqrestore(&amp;first-&gt;b_uptodate_lock, flags);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_block - fill a @folio of an address space with data</div><div class='del'>- * @folio:	page cache folio to fill with data</div><div class='del'>- *</div><div class='del'>- * We read each buffer asynchronously and when all buffers are read in, our io</div><div class='del'>- * completion handler ntfs_end_buffer_read_async(), if required, automatically</div><div class='del'>- * applies the mst fixups to the folio before finally marking it uptodate and</div><div class='del'>- * unlocking it.</div><div class='del'>- *</div><div class='del'>- * We only enforce allocated_size limit because i_size is checked for in</div><div class='del'>- * generic_file_read().</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Contains an adapted version of fs/buffer.c::block_read_full_folio().</div><div class='del'>- */</div><div class='del'>-static int ntfs_read_block(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	VCN vcn;</div><div class='del'>-	LCN lcn;</div><div class='del'>-	s64 init_size;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-	ntfs_volume *vol;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];</div><div class='del'>-	sector_t iblock, lblock, zblock;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int blocksize, vcn_ofs;</div><div class='del'>-	int i, nr;</div><div class='del'>-	unsigned char blocksize_bits;</div><div class='del'>-</div><div class='del'>-	vi = folio-&gt;mapping-&gt;host;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	vol = ni-&gt;vol;</div><div class='del'>-</div><div class='del'>-	/* $MFT/$DATA must have its complete runlist in memory at all times. */</div><div class='del'>-	BUG_ON(!ni-&gt;runlist.rl &amp;&amp; !ni-&gt;mft_no &amp;&amp; !NInoAttr(ni));</div><div class='del'>-</div><div class='del'>-	blocksize = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	blocksize_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-</div><div class='del'>-	head = folio_buffers(folio);</div><div class='del'>-	if (!head)</div><div class='del'>-		head = create_empty_buffers(folio, blocksize, 0);</div><div class='del'>-	bh = head;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We may be racing with truncate.  To avoid some of the problems we</div><div class='del'>-	 * now take a snapshot of the various sizes and use those for the whole</div><div class='del'>-	 * of the function.  In case of an extending truncate it just means we</div><div class='del'>-	 * may leave some buffers unmapped which are now allocated.  This is</div><div class='del'>-	 * not a problem since these buffers will just get mapped when a write</div><div class='del'>-	 * occurs.  In case of a shrinking truncate, we will detect this later</div><div class='del'>-	 * on due to the runlist being incomplete and if the folio is being</div><div class='del'>-	 * fully truncated, truncate will throw it away as soon as we unlock</div><div class='del'>-	 * it so no need to worry what we do with it.</div><div class='del'>-	 */</div><div class='del'>-	iblock = (s64)folio-&gt;index &lt;&lt; (PAGE_SHIFT - blocksize_bits);</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	lblock = (ni-&gt;allocated_size + blocksize - 1) &gt;&gt; blocksize_bits;</div><div class='del'>-	init_size = ni-&gt;initialized_size;</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (unlikely(init_size &gt; i_size)) {</div><div class='del'>-		/* Race with shrinking truncate. */</div><div class='del'>-		init_size = i_size;</div><div class='del'>-	}</div><div class='del'>-	zblock = (init_size + blocksize - 1) &gt;&gt; blocksize_bits;</div><div class='del'>-</div><div class='del'>-	/* Loop through all the buffers in the folio. */</div><div class='del'>-	rl = NULL;</div><div class='del'>-	nr = i = 0;</div><div class='del'>-	do {</div><div class='del'>-		int err = 0;</div><div class='del'>-</div><div class='del'>-		if (unlikely(buffer_uptodate(bh)))</div><div class='del'>-			continue;</div><div class='del'>-		if (unlikely(buffer_mapped(bh))) {</div><div class='del'>-			arr[nr++] = bh;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		bh-&gt;b_bdev = vol-&gt;sb-&gt;s_bdev;</div><div class='del'>-		/* Is the block within the allowed limits? */</div><div class='del'>-		if (iblock &lt; lblock) {</div><div class='del'>-			bool is_retry = false;</div><div class='del'>-</div><div class='del'>-			/* Convert iblock into corresponding vcn and offset. */</div><div class='del'>-			vcn = (VCN)iblock &lt;&lt; blocksize_bits &gt;&gt;</div><div class='del'>-					vol-&gt;cluster_size_bits;</div><div class='del'>-			vcn_ofs = ((VCN)iblock &lt;&lt; blocksize_bits) &amp;</div><div class='del'>-					vol-&gt;cluster_size_mask;</div><div class='del'>-			if (!rl) {</div><div class='del'>-lock_retry_remap:</div><div class='del'>-				down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				rl = ni-&gt;runlist.rl;</div><div class='del'>-			}</div><div class='del'>-			if (likely(rl != NULL)) {</div><div class='del'>-				/* Seek to element containing target vcn. */</div><div class='del'>-				while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= vcn)</div><div class='del'>-					rl++;</div><div class='del'>-				lcn = ntfs_rl_vcn_to_lcn(rl, vcn);</div><div class='del'>-			} else</div><div class='del'>-				lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-			/* Successful remap. */</div><div class='del'>-			if (lcn &gt;= 0) {</div><div class='del'>-				/* Setup buffer head to correct block. */</div><div class='del'>-				bh-&gt;b_blocknr = ((lcn &lt;&lt; vol-&gt;cluster_size_bits)</div><div class='del'>-						+ vcn_ofs) &gt;&gt; blocksize_bits;</div><div class='del'>-				set_buffer_mapped(bh);</div><div class='del'>-				/* Only read initialized data blocks. */</div><div class='del'>-				if (iblock &lt; zblock) {</div><div class='del'>-					arr[nr++] = bh;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				/* Fully non-initialized data block, zero it. */</div><div class='del'>-				goto handle_zblock;</div><div class='del'>-			}</div><div class='del'>-			/* It is a hole, need to zero it. */</div><div class='del'>-			if (lcn == LCN_HOLE)</div><div class='del'>-				goto handle_hole;</div><div class='del'>-			/* If first try and runlist unmapped, map and retry. */</div><div class='del'>-			if (!is_retry &amp;&amp; lcn == LCN_RL_NOT_MAPPED) {</div><div class='del'>-				is_retry = true;</div><div class='del'>-				/*</div><div class='del'>-				 * Attempt to map runlist, dropping lock for</div><div class='del'>-				 * the duration.</div><div class='del'>-				 */</div><div class='del'>-				up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				err = ntfs_map_runlist(ni, vcn);</div><div class='del'>-				if (likely(!err))</div><div class='del'>-					goto lock_retry_remap;</div><div class='del'>-				rl = NULL;</div><div class='del'>-			} else if (!rl)</div><div class='del'>-				up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			/*</div><div class='del'>-			 * If buffer is outside the runlist, treat it as a</div><div class='del'>-			 * hole.  This can happen due to concurrent truncate</div><div class='del'>-			 * for example.</div><div class='del'>-			 */</div><div class='del'>-			if (err == -ENOENT || lcn == LCN_ENOENT) {</div><div class='del'>-				err = 0;</div><div class='del'>-				goto handle_hole;</div><div class='del'>-			}</div><div class='del'>-			/* Hard error, zero out region. */</div><div class='del'>-			if (!err)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			bh-&gt;b_blocknr = -1;</div><div class='del'>-			folio_set_error(folio);</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to read from inode 0x%lx, "</div><div class='del'>-					"attribute type 0x%x, vcn 0x%llx, "</div><div class='del'>-					"offset 0x%x because its location on "</div><div class='del'>-					"disk could not be determined%s "</div><div class='del'>-					"(error code %i).", ni-&gt;mft_no,</div><div class='del'>-					ni-&gt;type, (unsigned long long)vcn,</div><div class='del'>-					vcn_ofs, is_retry ? " even after "</div><div class='del'>-					"retrying" : "", err);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Either iblock was outside lblock limits or</div><div class='del'>-		 * ntfs_rl_vcn_to_lcn() returned error.  Just zero that portion</div><div class='del'>-		 * of the folio and set the buffer uptodate.</div><div class='del'>-		 */</div><div class='del'>-handle_hole:</div><div class='del'>-		bh-&gt;b_blocknr = -1UL;</div><div class='del'>-		clear_buffer_mapped(bh);</div><div class='del'>-handle_zblock:</div><div class='del'>-		folio_zero_range(folio, i * blocksize, blocksize);</div><div class='del'>-		if (likely(!err))</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-	} while (i++, iblock++, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-</div><div class='del'>-	/* Release the lock if we took it. */</div><div class='del'>-	if (rl)</div><div class='del'>-		up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-</div><div class='del'>-	/* Check we have at least one buffer ready for i/o. */</div><div class='del'>-	if (nr) {</div><div class='del'>-		struct buffer_head *tbh;</div><div class='del'>-</div><div class='del'>-		/* Lock the buffers. */</div><div class='del'>-		for (i = 0; i &lt; nr; i++) {</div><div class='del'>-			tbh = arr[i];</div><div class='del'>-			lock_buffer(tbh);</div><div class='del'>-			tbh-&gt;b_end_io = ntfs_end_buffer_async_read;</div><div class='del'>-			set_buffer_async_read(tbh);</div><div class='del'>-		}</div><div class='del'>-		/* Finally, start i/o on the buffers. */</div><div class='del'>-		for (i = 0; i &lt; nr; i++) {</div><div class='del'>-			tbh = arr[i];</div><div class='del'>-			if (likely(!buffer_uptodate(tbh)))</div><div class='del'>-				submit_bh(REQ_OP_READ, tbh);</div><div class='del'>-			else</div><div class='del'>-				ntfs_end_buffer_async_read(tbh, 1);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* No i/o was scheduled on any of the buffers. */</div><div class='del'>-	if (likely(!folio_test_error(folio)))</div><div class='del'>-		folio_mark_uptodate(folio);</div><div class='del'>-	else /* Signal synchronous i/o error. */</div><div class='del'>-		nr = -EIO;</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	return nr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_folio - fill a @folio of a @file with data from the device</div><div class='del'>- * @file:	open file to which the folio @folio belongs or NULL</div><div class='del'>- * @folio:	page cache folio to fill with data</div><div class='del'>- *</div><div class='del'>- * For non-resident attributes, ntfs_read_folio() fills the @folio of the open</div><div class='del'>- * file @file by calling the ntfs version of the generic block_read_full_folio()</div><div class='del'>- * function, ntfs_read_block(), which in turn creates and reads in the buffers</div><div class='del'>- * associated with the folio asynchronously.</div><div class='del'>- *</div><div class='del'>- * For resident attributes, OTOH, ntfs_read_folio() fills @folio by copying the</div><div class='del'>- * data from the mft record (which at this stage is most likely in memory) and</div><div class='del'>- * fills the remainder with zeroes. Thus, in this case, I/O is synchronous, as</div><div class='del'>- * even if the mft record is not cached at this point in time, we need to wait</div><div class='del'>- * for it to be read in before we can do the copy.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_read_folio(struct file *file, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni, *base_ni;</div><div class='del'>-	u8 *addr;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *mrec;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 attr_len;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-retry_readpage:</div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	vi = page-&gt;mapping-&gt;host;</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	/* Is the page fully outside i_size? (truncate in progress) */</div><div class='del'>-	if (unlikely(page-&gt;index &gt;= (i_size + PAGE_SIZE - 1) &gt;&gt;</div><div class='del'>-			PAGE_SHIFT)) {</div><div class='del'>-		zero_user(page, 0, PAGE_SIZE);</div><div class='del'>-		ntfs_debug("Read outside i_size - truncated?");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * This can potentially happen because we clear PageUptodate() during</div><div class='del'>-	 * ntfs_writepage() of MstProtected() attributes.</div><div class='del'>-	 */</div><div class='del'>-	if (PageUptodate(page)) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	/*</div><div class='del'>-	 * Only $DATA attributes can be encrypted and only unnamed $DATA</div><div class='del'>-	 * attributes can be compressed.  Index root can have the flags set but</div><div class='del'>-	 * this means to create compressed/encrypted files, not that the</div><div class='del'>-	 * attribute is compressed/encrypted.  Note we need to check for</div><div class='del'>-	 * AT_INDEX_ALLOCATION since this is the type of both directory and</div><div class='del'>-	 * index inodes.</div><div class='del'>-	 */</div><div class='del'>-	if (ni-&gt;type != AT_INDEX_ALLOCATION) {</div><div class='del'>-		/* If attribute is encrypted, deny access, just like NT4. */</div><div class='del'>-		if (NInoEncrypted(ni)) {</div><div class='del'>-			BUG_ON(ni-&gt;type != AT_DATA);</div><div class='del'>-			err = -EACCES;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		/* Compressed data streams are handled in compress.c. */</div><div class='del'>-		if (NInoNonResident(ni) &amp;&amp; NInoCompressed(ni)) {</div><div class='del'>-			BUG_ON(ni-&gt;type != AT_DATA);</div><div class='del'>-			BUG_ON(ni-&gt;name_len);</div><div class='del'>-			return ntfs_read_compressed_block(page);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* NInoNonResident() == NInoIndexAllocPresent() */</div><div class='del'>-	if (NInoNonResident(ni)) {</div><div class='del'>-		/* Normal, non-resident data stream. */</div><div class='del'>-		return ntfs_read_block(folio);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Attribute is resident, implying it is not compressed or encrypted.</div><div class='del'>-	 * This also means the attribute is smaller than an mft record and</div><div class='del'>-	 * hence smaller than a page, so can simply zero out any pages with</div><div class='del'>-	 * index above 0.  Note the attribute can actually be marked compressed</div><div class='del'>-	 * but if it is resident the actual data is not compressed so we are</div><div class='del'>-	 * ok to ignore the compressed flag here.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(page-&gt;index &gt; 0)) {</div><div class='del'>-		zero_user(page, 0, PAGE_SIZE);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	/* Map, pin, and lock the mft record. */</div><div class='del'>-	mrec = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(mrec)) {</div><div class='del'>-		err = PTR_ERR(mrec);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If a parallel write made the attribute non-resident, drop the mft</div><div class='del'>-	 * record and retry the read_folio.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(NInoNonResident(ni))) {</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-		goto retry_readpage;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, mrec);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto put_unm_err_out;</div><div class='del'>-	attr_len = le32_to_cpu(ctx-&gt;attr-&gt;data.resident.value_length);</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (unlikely(attr_len &gt; ni-&gt;initialized_size))</div><div class='del'>-		attr_len = ni-&gt;initialized_size;</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (unlikely(attr_len &gt; i_size)) {</div><div class='del'>-		/* Race with shrinking truncate. */</div><div class='del'>-		attr_len = i_size;</div><div class='del'>-	}</div><div class='del'>-	addr = kmap_atomic(page);</div><div class='del'>-	/* Copy the data to the page. */</div><div class='del'>-	memcpy(addr, (u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset),</div><div class='del'>-			attr_len);</div><div class='del'>-	/* Zero the remainder of the page. */</div><div class='del'>-	memset(addr + attr_len, 0, PAGE_SIZE - attr_len);</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	kunmap_atomic(addr);</div><div class='del'>-put_unm_err_out:</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-unm_err_out:</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-done:</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-err_out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_write_block - write a @folio to the backing store</div><div class='del'>- * @folio:	page cache folio to write out</div><div class='del'>- * @wbc:	writeback control structure</div><div class='del'>- *</div><div class='del'>- * This function is for writing folios belonging to non-resident, non-mst</div><div class='del'>- * protected attributes to their backing store.</div><div class='del'>- *</div><div class='del'>- * For a folio with buffers, map and write the dirty buffers asynchronously</div><div class='del'>- * under folio writeback. For a folio without buffers, create buffers for the</div><div class='del'>- * folio, then proceed as above.</div><div class='del'>- *</div><div class='del'>- * If a folio doesn't have buffers the folio dirty state is definitive. If</div><div class='del'>- * a folio does have buffers, the folio dirty state is just a hint,</div><div class='del'>- * and the buffer dirty state is definitive. (A hint which has rules:</div><div class='del'>- * dirty buffers against a clean folio is illegal. Other combinations are</div><div class='del'>- * legal and need to be handled. In particular a dirty folio containing</div><div class='del'>- * clean buffers for example.)</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Based on ntfs_read_block() and __block_write_full_folio().</div><div class='del'>- */</div><div class='del'>-static int ntfs_write_block(struct folio *folio, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	VCN vcn;</div><div class='del'>-	LCN lcn;</div><div class='del'>-	s64 initialized_size;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	sector_t block, dblock, iblock;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-	ntfs_volume *vol;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	struct buffer_head *bh, *head;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int blocksize, vcn_ofs;</div><div class='del'>-	int err;</div><div class='del'>-	bool need_end_writeback;</div><div class='del'>-	unsigned char blocksize_bits;</div><div class='del'>-</div><div class='del'>-	vi = folio-&gt;mapping-&gt;host;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	vol = ni-&gt;vol;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, page index "</div><div class='del'>-			"0x%lx.", ni-&gt;mft_no, ni-&gt;type, folio-&gt;index);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	BUG_ON(NInoMstProtected(ni));</div><div class='del'>-	blocksize = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	blocksize_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-	head = folio_buffers(folio);</div><div class='del'>-	if (!head) {</div><div class='del'>-		BUG_ON(!folio_test_uptodate(folio));</div><div class='del'>-		head = create_empty_buffers(folio, blocksize,</div><div class='del'>-				(1 &lt;&lt; BH_Uptodate) | (1 &lt;&lt; BH_Dirty));</div><div class='del'>-	}</div><div class='del'>-	bh = head;</div><div class='del'>-</div><div class='del'>-	/* NOTE: Different naming scheme to ntfs_read_block()! */</div><div class='del'>-</div><div class='del'>-	/* The first block in the folio. */</div><div class='del'>-	block = (s64)folio-&gt;index &lt;&lt; (PAGE_SHIFT - blocksize_bits);</div><div class='del'>-</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	initialized_size = ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* The first out of bounds block for the data size. */</div><div class='del'>-	dblock = (i_size + blocksize - 1) &gt;&gt; blocksize_bits;</div><div class='del'>-</div><div class='del'>-	/* The last (fully or partially) initialized block. */</div><div class='del'>-	iblock = initialized_size &gt;&gt; blocksize_bits;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Be very careful.  We have no exclusion from block_dirty_folio</div><div class='del'>-	 * here, and the (potentially unmapped) buffers may become dirty at</div><div class='del'>-	 * any time.  If a buffer becomes dirty here after we've inspected it</div><div class='del'>-	 * then we just miss that fact, and the folio stays dirty.</div><div class='del'>-	 *</div><div class='del'>-	 * Buffers outside i_size may be dirtied by block_dirty_folio;</div><div class='del'>-	 * handle that here by just cleaning them.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Loop through all the buffers in the folio, mapping all the dirty</div><div class='del'>-	 * buffers to disk addresses and handling any aliases from the</div><div class='del'>-	 * underlying block device's mapping.</div><div class='del'>-	 */</div><div class='del'>-	rl = NULL;</div><div class='del'>-	err = 0;</div><div class='del'>-	do {</div><div class='del'>-		bool is_retry = false;</div><div class='del'>-</div><div class='del'>-		if (unlikely(block &gt;= dblock)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Mapped buffers outside i_size will occur, because</div><div class='del'>-			 * this folio can be outside i_size when there is a</div><div class='del'>-			 * truncate in progress. The contents of such buffers</div><div class='del'>-			 * were zeroed by ntfs_writepage().</div><div class='del'>-			 *</div><div class='del'>-			 * FIXME: What about the small race window where</div><div class='del'>-			 * ntfs_writepage() has not done any clearing because</div><div class='del'>-			 * the folio was within i_size but before we get here,</div><div class='del'>-			 * vmtruncate() modifies i_size?</div><div class='del'>-			 */</div><div class='del'>-			clear_buffer_dirty(bh);</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Clean buffers are not written out, so no need to map them. */</div><div class='del'>-		if (!buffer_dirty(bh))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Make sure we have enough initialized size. */</div><div class='del'>-		if (unlikely((block &gt;= iblock) &amp;&amp;</div><div class='del'>-				(initialized_size &lt; i_size))) {</div><div class='del'>-			/*</div><div class='del'>-			 * If this folio is fully outside initialized</div><div class='del'>-			 * size, zero out all folios between the current</div><div class='del'>-			 * initialized size and the current folio. Just</div><div class='del'>-			 * use ntfs_read_folio() to do the zeroing</div><div class='del'>-			 * transparently.</div><div class='del'>-			 */</div><div class='del'>-			if (block &gt; iblock) {</div><div class='del'>-				// TODO:</div><div class='del'>-				// For each folio do:</div><div class='del'>-				// - read_cache_folio()</div><div class='del'>-				// Again for each folio do:</div><div class='del'>-				// - wait_on_folio_locked()</div><div class='del'>-				// - Check (folio_test_uptodate(folio) &amp;&amp;</div><div class='del'>-				//		!folio_test_error(folio))</div><div class='del'>-				// Update initialized size in the attribute and</div><div class='del'>-				// in the inode.</div><div class='del'>-				// Again, for each folio do:</div><div class='del'>-				//	block_dirty_folio();</div><div class='del'>-				// folio_put()</div><div class='del'>-				// We don't need to wait on the writes.</div><div class='del'>-				// Update iblock.</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * The current folio straddles initialized size. Zero</div><div class='del'>-			 * all non-uptodate buffers and set them uptodate (and</div><div class='del'>-			 * dirty?). Note, there aren't any non-uptodate buffers</div><div class='del'>-			 * if the folio is uptodate.</div><div class='del'>-			 * FIXME: For an uptodate folio, the buffers may need to</div><div class='del'>-			 * be written out because they were not initialized on</div><div class='del'>-			 * disk before.</div><div class='del'>-			 */</div><div class='del'>-			if (!folio_test_uptodate(folio)) {</div><div class='del'>-				// TODO:</div><div class='del'>-				// Zero any non-uptodate buffers up to i_size.</div><div class='del'>-				// Set them uptodate and dirty.</div><div class='del'>-			}</div><div class='del'>-			// TODO:</div><div class='del'>-			// Update initialized size in the attribute and in the</div><div class='del'>-			// inode (up to i_size).</div><div class='del'>-			// Update iblock.</div><div class='del'>-			// FIXME: This is inefficient. Try to batch the two</div><div class='del'>-			// size changes to happen in one go.</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Writing beyond initialized size "</div><div class='del'>-					"is not supported yet. Sorry.");</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			break;</div><div class='del'>-			// Do NOT set_buffer_new() BUT DO clear buffer range</div><div class='del'>-			// outside write request range.</div><div class='del'>-			// set_buffer_uptodate() on complete buffers as well as</div><div class='del'>-			// set_buffer_dirty().</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* No need to map buffers that are already mapped. */</div><div class='del'>-		if (buffer_mapped(bh))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Unmapped, dirty buffer. Need to map it. */</div><div class='del'>-		bh-&gt;b_bdev = vol-&gt;sb-&gt;s_bdev;</div><div class='del'>-</div><div class='del'>-		/* Convert block into corresponding vcn and offset. */</div><div class='del'>-		vcn = (VCN)block &lt;&lt; blocksize_bits;</div><div class='del'>-		vcn_ofs = vcn &amp; vol-&gt;cluster_size_mask;</div><div class='del'>-		vcn &gt;&gt;= vol-&gt;cluster_size_bits;</div><div class='del'>-		if (!rl) {</div><div class='del'>-lock_retry_remap:</div><div class='del'>-			down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			rl = ni-&gt;runlist.rl;</div><div class='del'>-		}</div><div class='del'>-		if (likely(rl != NULL)) {</div><div class='del'>-			/* Seek to element containing target vcn. */</div><div class='del'>-			while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= vcn)</div><div class='del'>-				rl++;</div><div class='del'>-			lcn = ntfs_rl_vcn_to_lcn(rl, vcn);</div><div class='del'>-		} else</div><div class='del'>-			lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-		/* Successful remap. */</div><div class='del'>-		if (lcn &gt;= 0) {</div><div class='del'>-			/* Setup buffer head to point to correct block. */</div><div class='del'>-			bh-&gt;b_blocknr = ((lcn &lt;&lt; vol-&gt;cluster_size_bits) +</div><div class='del'>-					vcn_ofs) &gt;&gt; blocksize_bits;</div><div class='del'>-			set_buffer_mapped(bh);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/* It is a hole, need to instantiate it. */</div><div class='del'>-		if (lcn == LCN_HOLE) {</div><div class='del'>-			u8 *kaddr;</div><div class='del'>-			unsigned long *bpos, *bend;</div><div class='del'>-</div><div class='del'>-			/* Check if the buffer is zero. */</div><div class='del'>-			kaddr = kmap_local_folio(folio, bh_offset(bh));</div><div class='del'>-			bpos = (unsigned long *)kaddr;</div><div class='del'>-			bend = (unsigned long *)(kaddr + blocksize);</div><div class='del'>-			do {</div><div class='del'>-				if (unlikely(*bpos))</div><div class='del'>-					break;</div><div class='del'>-			} while (likely(++bpos &lt; bend));</div><div class='del'>-			kunmap_local(kaddr);</div><div class='del'>-			if (bpos == bend) {</div><div class='del'>-				/*</div><div class='del'>-				 * Buffer is zero and sparse, no need to write</div><div class='del'>-				 * it.</div><div class='del'>-				 */</div><div class='del'>-				bh-&gt;b_blocknr = -1;</div><div class='del'>-				clear_buffer_dirty(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			// TODO: Instantiate the hole.</div><div class='del'>-			// clear_buffer_new(bh);</div><div class='del'>-			// clean_bdev_bh_alias(bh);</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Writing into sparse regions is "</div><div class='del'>-					"not supported yet. Sorry.");</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* If first try and runlist unmapped, map and retry. */</div><div class='del'>-		if (!is_retry &amp;&amp; lcn == LCN_RL_NOT_MAPPED) {</div><div class='del'>-			is_retry = true;</div><div class='del'>-			/*</div><div class='del'>-			 * Attempt to map runlist, dropping lock for</div><div class='del'>-			 * the duration.</div><div class='del'>-			 */</div><div class='del'>-			up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			err = ntfs_map_runlist(ni, vcn);</div><div class='del'>-			if (likely(!err))</div><div class='del'>-				goto lock_retry_remap;</div><div class='del'>-			rl = NULL;</div><div class='del'>-		} else if (!rl)</div><div class='del'>-			up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-		/*</div><div class='del'>-		 * If buffer is outside the runlist, truncate has cut it out</div><div class='del'>-		 * of the runlist.  Just clean and clear the buffer and set it</div><div class='del'>-		 * uptodate so it can get discarded by the VM.</div><div class='del'>-		 */</div><div class='del'>-		if (err == -ENOENT || lcn == LCN_ENOENT) {</div><div class='del'>-			bh-&gt;b_blocknr = -1;</div><div class='del'>-			clear_buffer_dirty(bh);</div><div class='del'>-			folio_zero_range(folio, bh_offset(bh), blocksize);</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-			err = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/* Failed to map the buffer, even after retrying. */</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		bh-&gt;b_blocknr = -1;</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to write to inode 0x%lx, "</div><div class='del'>-				"attribute type 0x%x, vcn 0x%llx, offset 0x%x "</div><div class='del'>-				"because its location on disk could not be "</div><div class='del'>-				"determined%s (error code %i).", ni-&gt;mft_no,</div><div class='del'>-				ni-&gt;type, (unsigned long long)vcn,</div><div class='del'>-				vcn_ofs, is_retry ? " even after "</div><div class='del'>-				"retrying" : "", err);</div><div class='del'>-		break;</div><div class='del'>-	} while (block++, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-</div><div class='del'>-	/* Release the lock if we took it. */</div><div class='del'>-	if (rl)</div><div class='del'>-		up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-</div><div class='del'>-	/* For the error case, need to reset bh to the beginning. */</div><div class='del'>-	bh = head;</div><div class='del'>-</div><div class='del'>-	/* Just an optimization, so -&gt;read_folio() is not called later. */</div><div class='del'>-	if (unlikely(!folio_test_uptodate(folio))) {</div><div class='del'>-		int uptodate = 1;</div><div class='del'>-		do {</div><div class='del'>-			if (!buffer_uptodate(bh)) {</div><div class='del'>-				uptodate = 0;</div><div class='del'>-				bh = head;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-		if (uptodate)</div><div class='del'>-			folio_mark_uptodate(folio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup all mapped, dirty buffers for async write i/o. */</div><div class='del'>-	do {</div><div class='del'>-		if (buffer_mapped(bh) &amp;&amp; buffer_dirty(bh)) {</div><div class='del'>-			lock_buffer(bh);</div><div class='del'>-			if (test_clear_buffer_dirty(bh)) {</div><div class='del'>-				BUG_ON(!buffer_uptodate(bh));</div><div class='del'>-				mark_buffer_async_write(bh);</div><div class='del'>-			} else</div><div class='del'>-				unlock_buffer(bh);</div><div class='del'>-		} else if (unlikely(err)) {</div><div class='del'>-			/*</div><div class='del'>-			 * For the error case. The buffer may have been set</div><div class='del'>-			 * dirty during attachment to a dirty folio.</div><div class='del'>-			 */</div><div class='del'>-			if (err != -ENOMEM)</div><div class='del'>-				clear_buffer_dirty(bh);</div><div class='del'>-		}</div><div class='del'>-	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		// TODO: Remove the -EOPNOTSUPP check later on...</div><div class='del'>-		if (unlikely(err == -EOPNOTSUPP))</div><div class='del'>-			err = 0;</div><div class='del'>-		else if (err == -ENOMEM) {</div><div class='del'>-			ntfs_warning(vol-&gt;sb, "Error allocating memory. "</div><div class='del'>-					"Redirtying folio so we try again "</div><div class='del'>-					"later.");</div><div class='del'>-			/*</div><div class='del'>-			 * Put the folio back on mapping-&gt;dirty_pages, but</div><div class='del'>-			 * leave its buffer's dirty state as-is.</div><div class='del'>-			 */</div><div class='del'>-			folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-			err = 0;</div><div class='del'>-		} else</div><div class='del'>-			folio_set_error(folio);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(folio_test_writeback(folio));</div><div class='del'>-	folio_start_writeback(folio);	/* Keeps try_to_free_buffers() away. */</div><div class='del'>-</div><div class='del'>-	/* Submit the prepared buffers for i/o. */</div><div class='del'>-	need_end_writeback = true;</div><div class='del'>-	do {</div><div class='del'>-		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='del'>-		if (buffer_async_write(bh)) {</div><div class='del'>-			submit_bh(REQ_OP_WRITE, bh);</div><div class='del'>-			need_end_writeback = false;</div><div class='del'>-		}</div><div class='del'>-		bh = next;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-</div><div class='del'>-	/* If no i/o was started, need to end writeback here. */</div><div class='del'>-	if (unlikely(need_end_writeback))</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_write_mst_block - write a @page to the backing store</div><div class='del'>- * @page:	page cache page to write out</div><div class='del'>- * @wbc:	writeback control structure</div><div class='del'>- *</div><div class='del'>- * This function is for writing pages belonging to non-resident, mst protected</div><div class='del'>- * attributes to their backing store.  The only supported attributes are index</div><div class='del'>- * allocation and $MFT/$DATA.  Both directory inodes and index inodes are</div><div class='del'>- * supported for the index allocation case.</div><div class='del'>- *</div><div class='del'>- * The page must remain locked for the duration of the write because we apply</div><div class='del'>- * the mst fixups, write, and then undo the fixups, so if we were to unlock the</div><div class='del'>- * page before undoing the fixups, any other user of the page will see the</div><div class='del'>- * page contents as corrupt.</div><div class='del'>- *</div><div class='del'>- * We clear the page uptodate flag for the duration of the function to ensure</div><div class='del'>- * exclusion for the $MFT/$DATA case against someone mapping an mft record we</div><div class='del'>- * are about to apply the mst fixups to.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Based on ntfs_write_block(), ntfs_mft_writepage(), and</div><div class='del'>- * write_mft_record_nolock().</div><div class='del'>- */</div><div class='del'>-static int ntfs_write_mst_block(struct page *page,</div><div class='del'>-		struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	sector_t block, dblock, rec_block;</div><div class='del'>-	struct inode *vi = page-&gt;mapping-&gt;host;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	u8 *kaddr;</div><div class='del'>-	unsigned int rec_size = ni-&gt;itype.index.block_size;</div><div class='del'>-	ntfs_inode *locked_nis[PAGE_SIZE / NTFS_BLOCK_SIZE];</div><div class='del'>-	struct buffer_head *bh, *head, *tbh, *rec_start_bh;</div><div class='del'>-	struct buffer_head *bhs[MAX_BUF_PER_PAGE];</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	int i, nr_locked_nis, nr_recs, nr_bhs, max_bhs, bhs_per_rec, err, err2;</div><div class='del'>-	unsigned bh_size, rec_size_bits;</div><div class='del'>-	bool sync, is_mft, page_is_dirty, rec_is_dirty;</div><div class='del'>-	unsigned char bh_size_bits;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(rec_size &lt; NTFS_BLOCK_SIZE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, page index "</div><div class='del'>-			"0x%lx.", vi-&gt;i_ino, ni-&gt;type, page-&gt;index);</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	BUG_ON(!NInoMstProtected(ni));</div><div class='del'>-	is_mft = (S_ISREG(vi-&gt;i_mode) &amp;&amp; !vi-&gt;i_ino);</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: ntfs_write_mst_block() would be called for $MFTMirr if a page</div><div class='del'>-	 * in its page cache were to be marked dirty.  However this should</div><div class='del'>-	 * never happen with the current driver and considering we do not</div><div class='del'>-	 * handle this case here we do want to BUG(), at least for now.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(!(is_mft || S_ISDIR(vi-&gt;i_mode) ||</div><div class='del'>-			(NInoAttr(ni) &amp;&amp; ni-&gt;type == AT_INDEX_ALLOCATION)));</div><div class='del'>-	bh_size = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	bh_size_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-	max_bhs = PAGE_SIZE / bh_size;</div><div class='del'>-	BUG_ON(!max_bhs);</div><div class='del'>-	BUG_ON(max_bhs &gt; MAX_BUF_PER_PAGE);</div><div class='del'>-</div><div class='del'>-	/* Were we called for sync purposes? */</div><div class='del'>-	sync = (wbc-&gt;sync_mode == WB_SYNC_ALL);</div><div class='del'>-</div><div class='del'>-	/* Make sure we have mapped buffers. */</div><div class='del'>-	bh = head = page_buffers(page);</div><div class='del'>-	BUG_ON(!bh);</div><div class='del'>-</div><div class='del'>-	rec_size_bits = ni-&gt;itype.index.block_size_bits;</div><div class='del'>-	BUG_ON(!(PAGE_SIZE &gt;&gt; rec_size_bits));</div><div class='del'>-	bhs_per_rec = rec_size &gt;&gt; bh_size_bits;</div><div class='del'>-	BUG_ON(!bhs_per_rec);</div><div class='del'>-</div><div class='del'>-	/* The first block in the page. */</div><div class='del'>-	rec_block = block = (sector_t)page-&gt;index &lt;&lt;</div><div class='del'>-			(PAGE_SHIFT - bh_size_bits);</div><div class='del'>-</div><div class='del'>-	/* The first out of bounds block for the data size. */</div><div class='del'>-	dblock = (i_size_read(vi) + bh_size - 1) &gt;&gt; bh_size_bits;</div><div class='del'>-</div><div class='del'>-	rl = NULL;</div><div class='del'>-	err = err2 = nr_bhs = nr_recs = nr_locked_nis = 0;</div><div class='del'>-	page_is_dirty = rec_is_dirty = false;</div><div class='del'>-	rec_start_bh = NULL;</div><div class='del'>-	do {</div><div class='del'>-		bool is_retry = false;</div><div class='del'>-</div><div class='del'>-		if (likely(block &lt; rec_block)) {</div><div class='del'>-			if (unlikely(block &gt;= dblock)) {</div><div class='del'>-				clear_buffer_dirty(bh);</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * This block is not the first one in the record.  We</div><div class='del'>-			 * ignore the buffer's dirty state because we could</div><div class='del'>-			 * have raced with a parallel mark_ntfs_record_dirty().</div><div class='del'>-			 */</div><div class='del'>-			if (!rec_is_dirty)</div><div class='del'>-				continue;</div><div class='del'>-			if (unlikely(err2)) {</div><div class='del'>-				if (err2 != -ENOMEM)</div><div class='del'>-					clear_buffer_dirty(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		} else /* if (block == rec_block) */ {</div><div class='del'>-			BUG_ON(block &gt; rec_block);</div><div class='del'>-			/* This block is the first one in the record. */</div><div class='del'>-			rec_block += bhs_per_rec;</div><div class='del'>-			err2 = 0;</div><div class='del'>-			if (unlikely(block &gt;= dblock)) {</div><div class='del'>-				clear_buffer_dirty(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (!buffer_dirty(bh)) {</div><div class='del'>-				/* Clean records are not written out. */</div><div class='del'>-				rec_is_dirty = false;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			rec_is_dirty = true;</div><div class='del'>-			rec_start_bh = bh;</div><div class='del'>-		}</div><div class='del'>-		/* Need to map the buffer if it is not mapped already. */</div><div class='del'>-		if (unlikely(!buffer_mapped(bh))) {</div><div class='del'>-			VCN vcn;</div><div class='del'>-			LCN lcn;</div><div class='del'>-			unsigned int vcn_ofs;</div><div class='del'>-</div><div class='del'>-			bh-&gt;b_bdev = vol-&gt;sb-&gt;s_bdev;</div><div class='del'>-			/* Obtain the vcn and offset of the current block. */</div><div class='del'>-			vcn = (VCN)block &lt;&lt; bh_size_bits;</div><div class='del'>-			vcn_ofs = vcn &amp; vol-&gt;cluster_size_mask;</div><div class='del'>-			vcn &gt;&gt;= vol-&gt;cluster_size_bits;</div><div class='del'>-			if (!rl) {</div><div class='del'>-lock_retry_remap:</div><div class='del'>-				down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				rl = ni-&gt;runlist.rl;</div><div class='del'>-			}</div><div class='del'>-			if (likely(rl != NULL)) {</div><div class='del'>-				/* Seek to element containing target vcn. */</div><div class='del'>-				while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= vcn)</div><div class='del'>-					rl++;</div><div class='del'>-				lcn = ntfs_rl_vcn_to_lcn(rl, vcn);</div><div class='del'>-			} else</div><div class='del'>-				lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-			/* Successful remap. */</div><div class='del'>-			if (likely(lcn &gt;= 0)) {</div><div class='del'>-				/* Setup buffer head to correct block. */</div><div class='del'>-				bh-&gt;b_blocknr = ((lcn &lt;&lt;</div><div class='del'>-						vol-&gt;cluster_size_bits) +</div><div class='del'>-						vcn_ofs) &gt;&gt; bh_size_bits;</div><div class='del'>-				set_buffer_mapped(bh);</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * Remap failed.  Retry to map the runlist once</div><div class='del'>-				 * unless we are working on $MFT which always</div><div class='del'>-				 * has the whole of its runlist in memory.</div><div class='del'>-				 */</div><div class='del'>-				if (!is_mft &amp;&amp; !is_retry &amp;&amp;</div><div class='del'>-						lcn == LCN_RL_NOT_MAPPED) {</div><div class='del'>-					is_retry = true;</div><div class='del'>-					/*</div><div class='del'>-					 * Attempt to map runlist, dropping</div><div class='del'>-					 * lock for the duration.</div><div class='del'>-					 */</div><div class='del'>-					up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-					err2 = ntfs_map_runlist(ni, vcn);</div><div class='del'>-					if (likely(!err2))</div><div class='del'>-						goto lock_retry_remap;</div><div class='del'>-					if (err2 == -ENOMEM)</div><div class='del'>-						page_is_dirty = true;</div><div class='del'>-					lcn = err2;</div><div class='del'>-				} else {</div><div class='del'>-					err2 = -EIO;</div><div class='del'>-					if (!rl)</div><div class='del'>-						up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				}</div><div class='del'>-				/* Hard error.  Abort writing this record. */</div><div class='del'>-				if (!err || err == -ENOMEM)</div><div class='del'>-					err = err2;</div><div class='del'>-				bh-&gt;b_blocknr = -1;</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Cannot write ntfs record "</div><div class='del'>-						"0x%llx (inode 0x%lx, "</div><div class='del'>-						"attribute type 0x%x) because "</div><div class='del'>-						"its location on disk could "</div><div class='del'>-						"not be determined (error "</div><div class='del'>-						"code %lli).",</div><div class='del'>-						(long long)block &lt;&lt;</div><div class='del'>-						bh_size_bits &gt;&gt;</div><div class='del'>-						vol-&gt;mft_record_size_bits,</div><div class='del'>-						ni-&gt;mft_no, ni-&gt;type,</div><div class='del'>-						(long long)lcn);</div><div class='del'>-				/*</div><div class='del'>-				 * If this is not the first buffer, remove the</div><div class='del'>-				 * buffers in this record from the list of</div><div class='del'>-				 * buffers to write and clear their dirty bit</div><div class='del'>-				 * if not error -ENOMEM.</div><div class='del'>-				 */</div><div class='del'>-				if (rec_start_bh != bh) {</div><div class='del'>-					while (bhs[--nr_bhs] != rec_start_bh)</div><div class='del'>-						;</div><div class='del'>-					if (err2 != -ENOMEM) {</div><div class='del'>-						do {</div><div class='del'>-							clear_buffer_dirty(</div><div class='del'>-								rec_start_bh);</div><div class='del'>-						} while ((rec_start_bh =</div><div class='del'>-								rec_start_bh-&gt;</div><div class='del'>-								b_this_page) !=</div><div class='del'>-								bh);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(!buffer_uptodate(bh));</div><div class='del'>-		BUG_ON(nr_bhs &gt;= max_bhs);</div><div class='del'>-		bhs[nr_bhs++] = bh;</div><div class='del'>-	} while (block++, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	if (unlikely(rl))</div><div class='del'>-		up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	/* If there were no dirty buffers, we are done. */</div><div class='del'>-	if (!nr_bhs)</div><div class='del'>-		goto done;</div><div class='del'>-	/* Map the page so we can access its contents. */</div><div class='del'>-	kaddr = kmap(page);</div><div class='del'>-	/* Clear the page uptodate flag whilst the mst fixups are applied. */</div><div class='del'>-	BUG_ON(!PageUptodate(page));</div><div class='del'>-	ClearPageUptodate(page);</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		unsigned int ofs;</div><div class='del'>-</div><div class='del'>-		/* Skip buffers which are not at the beginning of records. */</div><div class='del'>-		if (i % bhs_per_rec)</div><div class='del'>-			continue;</div><div class='del'>-		tbh = bhs[i];</div><div class='del'>-		ofs = bh_offset(tbh);</div><div class='del'>-		if (is_mft) {</div><div class='del'>-			ntfs_inode *tni;</div><div class='del'>-			unsigned long mft_no;</div><div class='del'>-</div><div class='del'>-			/* Get the mft record number. */</div><div class='del'>-			mft_no = (((s64)page-&gt;index &lt;&lt; PAGE_SHIFT) + ofs)</div><div class='del'>-					&gt;&gt; rec_size_bits;</div><div class='del'>-			/* Check whether to write this mft record. */</div><div class='del'>-			tni = NULL;</div><div class='del'>-			if (!ntfs_may_write_mft_record(vol, mft_no,</div><div class='del'>-					(MFT_RECORD*)(kaddr + ofs), &amp;tni)) {</div><div class='del'>-				/*</div><div class='del'>-				 * The record should not be written.  This</div><div class='del'>-				 * means we need to redirty the page before</div><div class='del'>-				 * returning.</div><div class='del'>-				 */</div><div class='del'>-				page_is_dirty = true;</div><div class='del'>-				/*</div><div class='del'>-				 * Remove the buffers in this mft record from</div><div class='del'>-				 * the list of buffers to write.</div><div class='del'>-				 */</div><div class='del'>-				do {</div><div class='del'>-					bhs[i] = NULL;</div><div class='del'>-				} while (++i % bhs_per_rec);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * The record should be written.  If a locked ntfs</div><div class='del'>-			 * inode was returned, add it to the array of locked</div><div class='del'>-			 * ntfs inodes.</div><div class='del'>-			 */</div><div class='del'>-			if (tni)</div><div class='del'>-				locked_nis[nr_locked_nis++] = tni;</div><div class='del'>-		}</div><div class='del'>-		/* Apply the mst protection fixups. */</div><div class='del'>-		err2 = pre_write_mst_fixup((NTFS_RECORD*)(kaddr + ofs),</div><div class='del'>-				rec_size);</div><div class='del'>-		if (unlikely(err2)) {</div><div class='del'>-			if (!err || err == -ENOMEM)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to apply mst fixups "</div><div class='del'>-					"(inode 0x%lx, attribute type 0x%x, "</div><div class='del'>-					"page index 0x%lx, page offset 0x%x)!"</div><div class='del'>-					"  Unmount and run chkdsk.", vi-&gt;i_ino,</div><div class='del'>-					ni-&gt;type, page-&gt;index, ofs);</div><div class='del'>-			/*</div><div class='del'>-			 * Mark all the buffers in this record clean as we do</div><div class='del'>-			 * not want to write corrupt data to disk.</div><div class='del'>-			 */</div><div class='del'>-			do {</div><div class='del'>-				clear_buffer_dirty(bhs[i]);</div><div class='del'>-				bhs[i] = NULL;</div><div class='del'>-			} while (++i % bhs_per_rec);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		nr_recs++;</div><div class='del'>-	}</div><div class='del'>-	/* If no records are to be written out, we are done. */</div><div class='del'>-	if (!nr_recs)</div><div class='del'>-		goto unm_done;</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	/* Lock buffers and start synchronous write i/o on them. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		tbh = bhs[i];</div><div class='del'>-		if (!tbh)</div><div class='del'>-			continue;</div><div class='del'>-		if (!trylock_buffer(tbh))</div><div class='del'>-			BUG();</div><div class='del'>-		/* The buffer dirty state is now irrelevant, just clean it. */</div><div class='del'>-		clear_buffer_dirty(tbh);</div><div class='del'>-		BUG_ON(!buffer_uptodate(tbh));</div><div class='del'>-		BUG_ON(!buffer_mapped(tbh));</div><div class='del'>-		get_bh(tbh);</div><div class='del'>-		tbh-&gt;b_end_io = end_buffer_write_sync;</div><div class='del'>-		submit_bh(REQ_OP_WRITE, tbh);</div><div class='del'>-	}</div><div class='del'>-	/* Synchronize the mft mirror now if not @sync. */</div><div class='del'>-	if (is_mft &amp;&amp; !sync)</div><div class='del'>-		goto do_mirror;</div><div class='del'>-do_wait:</div><div class='del'>-	/* Wait on i/o completion of buffers. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		tbh = bhs[i];</div><div class='del'>-		if (!tbh)</div><div class='del'>-			continue;</div><div class='del'>-		wait_on_buffer(tbh);</div><div class='del'>-		if (unlikely(!buffer_uptodate(tbh))) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "I/O error while writing ntfs "</div><div class='del'>-					"record buffer (inode 0x%lx, "</div><div class='del'>-					"attribute type 0x%x, page index "</div><div class='del'>-					"0x%lx, page offset 0x%lx)!  Unmount "</div><div class='del'>-					"and run chkdsk.", vi-&gt;i_ino, ni-&gt;type,</div><div class='del'>-					page-&gt;index, bh_offset(tbh));</div><div class='del'>-			if (!err || err == -ENOMEM)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			/*</div><div class='del'>-			 * Set the buffer uptodate so the page and buffer</div><div class='del'>-			 * states do not become out of sync.</div><div class='del'>-			 */</div><div class='del'>-			set_buffer_uptodate(tbh);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* If @sync, now synchronize the mft mirror. */</div><div class='del'>-	if (is_mft &amp;&amp; sync) {</div><div class='del'>-do_mirror:</div><div class='del'>-		for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-			unsigned long mft_no;</div><div class='del'>-			unsigned int ofs;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Skip buffers which are not at the beginning of</div><div class='del'>-			 * records.</div><div class='del'>-			 */</div><div class='del'>-			if (i % bhs_per_rec)</div><div class='del'>-				continue;</div><div class='del'>-			tbh = bhs[i];</div><div class='del'>-			/* Skip removed buffers (and hence records). */</div><div class='del'>-			if (!tbh)</div><div class='del'>-				continue;</div><div class='del'>-			ofs = bh_offset(tbh);</div><div class='del'>-			/* Get the mft record number. */</div><div class='del'>-			mft_no = (((s64)page-&gt;index &lt;&lt; PAGE_SHIFT) + ofs)</div><div class='del'>-					&gt;&gt; rec_size_bits;</div><div class='del'>-			if (mft_no &lt; vol-&gt;mftmirr_size)</div><div class='del'>-				ntfs_sync_mft_mirror(vol, mft_no,</div><div class='del'>-						(MFT_RECORD*)(kaddr + ofs),</div><div class='del'>-						sync);</div><div class='del'>-		}</div><div class='del'>-		if (!sync)</div><div class='del'>-			goto do_wait;</div><div class='del'>-	}</div><div class='del'>-	/* Remove the mst protection fixups again. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		if (!(i % bhs_per_rec)) {</div><div class='del'>-			tbh = bhs[i];</div><div class='del'>-			if (!tbh)</div><div class='del'>-				continue;</div><div class='del'>-			post_write_mst_fixup((NTFS_RECORD*)(kaddr +</div><div class='del'>-					bh_offset(tbh)));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-unm_done:</div><div class='del'>-	/* Unlock any locked inodes. */</div><div class='del'>-	while (nr_locked_nis-- &gt; 0) {</div><div class='del'>-		ntfs_inode *tni, *base_tni;</div><div class='del'>-		</div><div class='del'>-		tni = locked_nis[nr_locked_nis];</div><div class='del'>-		/* Get the base inode. */</div><div class='del'>-		mutex_lock(&amp;tni-&gt;extent_lock);</div><div class='del'>-		if (tni-&gt;nr_extents &gt;= 0)</div><div class='del'>-			base_tni = tni;</div><div class='del'>-		else {</div><div class='del'>-			base_tni = tni-&gt;ext.base_ntfs_ino;</div><div class='del'>-			BUG_ON(!base_tni);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;tni-&gt;extent_lock);</div><div class='del'>-		ntfs_debug("Unlocking %s inode 0x%lx.",</div><div class='del'>-				tni == base_tni ? "base" : "extent",</div><div class='del'>-				tni-&gt;mft_no);</div><div class='del'>-		mutex_unlock(&amp;tni-&gt;mrec_lock);</div><div class='del'>-		atomic_dec(&amp;tni-&gt;count);</div><div class='del'>-		iput(VFS_I(base_tni));</div><div class='del'>-	}</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	kunmap(page);</div><div class='del'>-done:</div><div class='del'>-	if (unlikely(err &amp;&amp; err != -ENOMEM)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Set page error if there is only one ntfs record in the page.</div><div class='del'>-		 * Otherwise we would loose per-record granularity.</div><div class='del'>-		 */</div><div class='del'>-		if (ni-&gt;itype.index.block_size == PAGE_SIZE)</div><div class='del'>-			SetPageError(page);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	if (page_is_dirty) {</div><div class='del'>-		ntfs_debug("Page still contains one or more dirty ntfs "</div><div class='del'>-				"records.  Redirtying the page starting at "</div><div class='del'>-				"record 0x%lx.", page-&gt;index &lt;&lt;</div><div class='del'>-				(PAGE_SHIFT - rec_size_bits));</div><div class='del'>-		redirty_page_for_writepage(wbc, page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Keep the VM happy.  This must be done otherwise the</div><div class='del'>-		 * radix-tree tag PAGECACHE_TAG_DIRTY remains set even though</div><div class='del'>-		 * the page is clean.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(PageWriteback(page));</div><div class='del'>-		set_page_writeback(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		end_page_writeback(page);</div><div class='del'>-	}</div><div class='del'>-	if (likely(!err))</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_writepage - write a @page to the backing store</div><div class='del'>- * @page:	page cache page to write out</div><div class='del'>- * @wbc:	writeback control structure</div><div class='del'>- *</div><div class='del'>- * This is called from the VM when it wants to have a dirty ntfs page cache</div><div class='del'>- * page cleaned.  The VM has already locked the page and marked it clean.</div><div class='del'>- *</div><div class='del'>- * For non-resident attributes, ntfs_writepage() writes the @page by calling</div><div class='del'>- * the ntfs version of the generic block_write_full_folio() function,</div><div class='del'>- * ntfs_write_block(), which in turn if necessary creates and writes the</div><div class='del'>- * buffers associated with the page asynchronously.</div><div class='del'>- *</div><div class='del'>- * For resident attributes, OTOH, ntfs_writepage() writes the @page by copying</div><div class='del'>- * the data to the mft record (which at this stage is most likely in memory).</div><div class='del'>- * The mft record is then marked dirty and written out asynchronously via the</div><div class='del'>- * vfs inode dirty code path for the inode the mft record belongs to or via the</div><div class='del'>- * vm page dirty code path for the page the mft record is in.</div><div class='del'>- *</div><div class='del'>- * Based on ntfs_read_folio() and fs/buffer.c::block_write_full_folio().</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct inode *vi = folio-&gt;mapping-&gt;host;</div><div class='del'>-	ntfs_inode *base_ni = NULL, *ni = NTFS_I(vi);</div><div class='del'>-	char *addr;</div><div class='del'>-	ntfs_attr_search_ctx *ctx = NULL;</div><div class='del'>-	MFT_RECORD *m = NULL;</div><div class='del'>-	u32 attr_len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-retry_writepage:</div><div class='del'>-	BUG_ON(!folio_test_locked(folio));</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	/* Is the folio fully outside i_size? (truncate in progress) */</div><div class='del'>-	if (unlikely(folio-&gt;index &gt;= (i_size + PAGE_SIZE - 1) &gt;&gt;</div><div class='del'>-			PAGE_SHIFT)) {</div><div class='del'>-		/*</div><div class='del'>-		 * The folio may have dirty, unmapped buffers.  Make them</div><div class='del'>-		 * freeable here, so the page does not leak.</div><div class='del'>-		 */</div><div class='del'>-		block_invalidate_folio(folio, 0, folio_size(folio));</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		ntfs_debug("Write outside i_size - truncated?");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Only $DATA attributes can be encrypted and only unnamed $DATA</div><div class='del'>-	 * attributes can be compressed.  Index root can have the flags set but</div><div class='del'>-	 * this means to create compressed/encrypted files, not that the</div><div class='del'>-	 * attribute is compressed/encrypted.  Note we need to check for</div><div class='del'>-	 * AT_INDEX_ALLOCATION since this is the type of both directory and</div><div class='del'>-	 * index inodes.</div><div class='del'>-	 */</div><div class='del'>-	if (ni-&gt;type != AT_INDEX_ALLOCATION) {</div><div class='del'>-		/* If file is encrypted, deny access, just like NT4. */</div><div class='del'>-		if (NInoEncrypted(ni)) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			BUG_ON(ni-&gt;type != AT_DATA);</div><div class='del'>-			ntfs_debug("Denying write access to encrypted file.");</div><div class='del'>-			return -EACCES;</div><div class='del'>-		}</div><div class='del'>-		/* Compressed data streams are handled in compress.c. */</div><div class='del'>-		if (NInoNonResident(ni) &amp;&amp; NInoCompressed(ni)) {</div><div class='del'>-			BUG_ON(ni-&gt;type != AT_DATA);</div><div class='del'>-			BUG_ON(ni-&gt;name_len);</div><div class='del'>-			// TODO: Implement and replace this with</div><div class='del'>-			// return ntfs_write_compressed_block(page);</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Writing to compressed files is "</div><div class='del'>-					"not supported yet.  Sorry.");</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-		// TODO: Implement and remove this check.</div><div class='del'>-		if (NInoNonResident(ni) &amp;&amp; NInoSparse(ni)) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Writing to sparse files is not "</div><div class='del'>-					"supported yet.  Sorry.");</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* NInoNonResident() == NInoIndexAllocPresent() */</div><div class='del'>-	if (NInoNonResident(ni)) {</div><div class='del'>-		/* We have to zero every time due to mmap-at-end-of-file. */</div><div class='del'>-		if (folio-&gt;index &gt;= (i_size &gt;&gt; PAGE_SHIFT)) {</div><div class='del'>-			/* The folio straddles i_size. */</div><div class='del'>-			unsigned int ofs = i_size &amp; (folio_size(folio) - 1);</div><div class='del'>-			folio_zero_segment(folio, ofs, folio_size(folio));</div><div class='del'>-		}</div><div class='del'>-		/* Handle mst protected attributes. */</div><div class='del'>-		if (NInoMstProtected(ni))</div><div class='del'>-			return ntfs_write_mst_block(page, wbc);</div><div class='del'>-		/* Normal, non-resident data stream. */</div><div class='del'>-		return ntfs_write_block(folio, wbc);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Attribute is resident, implying it is not compressed, encrypted, or</div><div class='del'>-	 * mst protected.  This also means the attribute is smaller than an mft</div><div class='del'>-	 * record and hence smaller than a folio, so can simply return error on</div><div class='del'>-	 * any folios with index above 0.  Note the attribute can actually be</div><div class='del'>-	 * marked compressed but if it is resident the actual data is not</div><div class='del'>-	 * compressed so we are ok to ignore the compressed flag here.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(folio_buffers(folio));</div><div class='del'>-	BUG_ON(!folio_test_uptodate(folio));</div><div class='del'>-	if (unlikely(folio-&gt;index &gt; 0)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "BUG()! folio-&gt;index (0x%lx) &gt; 0.  "</div><div class='del'>-				"Aborting write.", folio-&gt;index);</div><div class='del'>-		BUG_ON(folio_test_writeback(folio));</div><div class='del'>-		folio_start_writeback(folio);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	/* Map, pin, and lock the mft record. */</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If a parallel write made the attribute non-resident, drop the mft</div><div class='del'>-	 * record and retry the writepage.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(NInoNonResident(ni))) {</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-		goto retry_writepage;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto err_out;</div><div class='del'>-	/*</div><div class='del'>-	 * Keep the VM happy.  This must be done otherwise</div><div class='del'>-	 * PAGECACHE_TAG_DIRTY remains set even though the folio is clean.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(folio_test_writeback(folio));</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	attr_len = le32_to_cpu(ctx-&gt;attr-&gt;data.resident.value_length);</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	if (unlikely(attr_len &gt; i_size)) {</div><div class='del'>-		/* Race with shrinking truncate or a failed truncate. */</div><div class='del'>-		attr_len = i_size;</div><div class='del'>-		/*</div><div class='del'>-		 * If the truncate failed, fix it up now.  If a concurrent</div><div class='del'>-		 * truncate, we do its job, so it does not have to do anything.</div><div class='del'>-		 */</div><div class='del'>-		err = ntfs_resident_attr_value_resize(ctx-&gt;mrec, ctx-&gt;attr,</div><div class='del'>-				attr_len);</div><div class='del'>-		/* Shrinking cannot fail. */</div><div class='del'>-		BUG_ON(err);</div><div class='del'>-	}</div><div class='del'>-	addr = kmap_local_folio(folio, 0);</div><div class='del'>-	/* Copy the data from the folio to the mft record. */</div><div class='del'>-	memcpy((u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset),</div><div class='del'>-			addr, attr_len);</div><div class='del'>-	/* Zero out of bounds area in the page cache folio. */</div><div class='del'>-	memset(addr + attr_len, 0, folio_size(folio) - attr_len);</div><div class='del'>-	kunmap_local(addr);</div><div class='del'>-	flush_dcache_folio(folio);</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	/* We are done with the folio. */</div><div class='del'>-	folio_end_writeback(folio);</div><div class='del'>-	/* Finally, mark the mft record dirty, so it gets written back. */</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	return 0;</div><div class='del'>-err_out:</div><div class='del'>-	if (err == -ENOMEM) {</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Error allocating memory. Redirtying "</div><div class='del'>-				"page so we try again later.");</div><div class='del'>-		/*</div><div class='del'>-		 * Put the folio back on mapping-&gt;dirty_pages, but leave its</div><div class='del'>-		 * buffers' dirty state as-is.</div><div class='del'>-		 */</div><div class='del'>-		folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-		err = 0;</div><div class='del'>-	} else {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Resident attribute write failed with "</div><div class='del'>-				"error %i.", err);</div><div class='del'>-		folio_set_error(folio);</div><div class='del'>-		NVolSetErrors(ni-&gt;vol);</div><div class='del'>-	}</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif	/* NTFS_RW */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_bmap - map logical file block to physical device block</div><div class='del'>- * @mapping:	address space mapping to which the block to be mapped belongs</div><div class='del'>- * @block:	logical block to map to its physical device block</div><div class='del'>- *</div><div class='del'>- * For regular, non-resident files (i.e. not compressed and not encrypted), map</div><div class='del'>- * the logical @block belonging to the file described by the address space</div><div class='del'>- * mapping @mapping to its physical device block.</div><div class='del'>- *</div><div class='del'>- * The size of the block is equal to the @s_blocksize field of the super block</div><div class='del'>- * of the mounted file system which is guaranteed to be smaller than or equal</div><div class='del'>- * to the cluster size thus the block is guaranteed to fit entirely inside the</div><div class='del'>- * cluster which means we do not need to care how many contiguous bytes are</div><div class='del'>- * available after the beginning of the block.</div><div class='del'>- *</div><div class='del'>- * Return the physical device block if the mapping succeeded or 0 if the block</div><div class='del'>- * is sparse or there was an error.</div><div class='del'>- *</div><div class='del'>- * Note: This is a problem if someone tries to run bmap() on $Boot system file</div><div class='del'>- * as that really is in block zero but there is nothing we can do.  bmap() is</div><div class='del'>- * just broken in that respect (just like it cannot distinguish sparse from</div><div class='del'>- * not available or error).</div><div class='del'>- */</div><div class='del'>-static sector_t ntfs_bmap(struct address_space *mapping, sector_t block)</div><div class='del'>-{</div><div class='del'>-	s64 ofs, size;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	LCN lcn;</div><div class='del'>-	unsigned long blocksize, flags;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(mapping-&gt;host);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	unsigned delta;</div><div class='del'>-	unsigned char blocksize_bits, cluster_size_shift;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for mft_no 0x%lx, logical block 0x%llx.",</div><div class='del'>-			ni-&gt;mft_no, (unsigned long long)block);</div><div class='del'>-	if (ni-&gt;type != AT_DATA || !NInoNonResident(ni) || NInoEncrypted(ni)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "BMAP does not make sense for %s "</div><div class='del'>-				"attributes, returning 0.",</div><div class='del'>-				(ni-&gt;type != AT_DATA) ? "non-data" :</div><div class='del'>-				(!NInoNonResident(ni) ? "resident" :</div><div class='del'>-				"encrypted"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* None of these can happen. */</div><div class='del'>-	BUG_ON(NInoCompressed(ni));</div><div class='del'>-	BUG_ON(NInoMstProtected(ni));</div><div class='del'>-	blocksize = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	blocksize_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-	ofs = (s64)block &lt;&lt; blocksize_bits;</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	size = ni-&gt;initialized_size;</div><div class='del'>-	i_size = i_size_read(VFS_I(ni));</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * If the offset is outside the initialized size or the block straddles</div><div class='del'>-	 * the initialized size then pretend it is a hole unless the</div><div class='del'>-	 * initialized size equals the file size.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(ofs &gt;= size || (ofs + blocksize &gt; size &amp;&amp; size &lt; i_size)))</div><div class='del'>-		goto hole;</div><div class='del'>-	cluster_size_shift = vol-&gt;cluster_size_bits;</div><div class='del'>-	down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	lcn = ntfs_attr_vcn_to_lcn_nolock(ni, ofs &gt;&gt; cluster_size_shift, false);</div><div class='del'>-	up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	if (unlikely(lcn &lt; LCN_HOLE)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Step down to an integer to avoid gcc doing a long long</div><div class='del'>-		 * comparision in the switch when we know @lcn is between</div><div class='del'>-		 * LCN_HOLE and LCN_EIO (i.e. -1 to -5).</div><div class='del'>-		 *</div><div class='del'>-		 * Otherwise older gcc (at least on some architectures) will</div><div class='del'>-		 * try to use __cmpdi2() which is of course not available in</div><div class='del'>-		 * the kernel.</div><div class='del'>-		 */</div><div class='del'>-		switch ((int)lcn) {</div><div class='del'>-		case LCN_ENOENT:</div><div class='del'>-			/*</div><div class='del'>-			 * If the offset is out of bounds then pretend it is a</div><div class='del'>-			 * hole.</div><div class='del'>-			 */</div><div class='del'>-			goto hole;</div><div class='del'>-		case LCN_ENOMEM:</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Not enough memory to complete "</div><div class='del'>-					"mapping for inode 0x%lx.  "</div><div class='del'>-					"Returning 0.", ni-&gt;mft_no);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to complete mapping for "</div><div class='del'>-					"inode 0x%lx.  Run chkdsk.  "</div><div class='del'>-					"Returning 0.", ni-&gt;mft_no);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (lcn &lt; 0) {</div><div class='del'>-		/* It is a hole. */</div><div class='del'>-hole:</div><div class='del'>-		ntfs_debug("Done (returning hole).");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The block is really allocated and fullfils all our criteria.</div><div class='del'>-	 * Convert the cluster to units of block size and return the result.</div><div class='del'>-	 */</div><div class='del'>-	delta = ofs &amp; vol-&gt;cluster_size_mask;</div><div class='del'>-	if (unlikely(sizeof(block) &lt; sizeof(lcn))) {</div><div class='del'>-		block = lcn = ((lcn &lt;&lt; cluster_size_shift) + delta) &gt;&gt;</div><div class='del'>-				blocksize_bits;</div><div class='del'>-		/* If the block number was truncated return 0. */</div><div class='del'>-		if (unlikely(block != lcn)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Physical block 0x%llx is too "</div><div class='del'>-					"large to be returned, returning 0.",</div><div class='del'>-					(long long)lcn);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		block = ((lcn &lt;&lt; cluster_size_shift) + delta) &gt;&gt;</div><div class='del'>-				blocksize_bits;</div><div class='del'>-	ntfs_debug("Done (returning block 0x%llx).", (unsigned long long)lcn);</div><div class='del'>-	return block;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_normal_aops - address space operations for normal inodes and attributes</div><div class='del'>- *</div><div class='del'>- * Note these are not used for compressed or mst protected inodes and</div><div class='del'>- * attributes.</div><div class='del'>- */</div><div class='del'>-const struct address_space_operations ntfs_normal_aops = {</div><div class='del'>-	.read_folio	= ntfs_read_folio,</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.writepage	= ntfs_writepage,</div><div class='del'>-	.dirty_folio	= block_dirty_folio,</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	.bmap		= ntfs_bmap,</div><div class='del'>-	.migrate_folio	= buffer_migrate_folio,</div><div class='del'>-	.is_partially_uptodate = block_is_partially_uptodate,</div><div class='del'>-	.error_remove_folio = generic_error_remove_folio,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_compressed_aops - address space operations for compressed inodes</div><div class='del'>- */</div><div class='del'>-const struct address_space_operations ntfs_compressed_aops = {</div><div class='del'>-	.read_folio	= ntfs_read_folio,</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.writepage	= ntfs_writepage,</div><div class='del'>-	.dirty_folio	= block_dirty_folio,</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	.migrate_folio	= buffer_migrate_folio,</div><div class='del'>-	.is_partially_uptodate = block_is_partially_uptodate,</div><div class='del'>-	.error_remove_folio = generic_error_remove_folio,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_mst_aops - general address space operations for mst protecteed inodes</div><div class='del'>- *			  and attributes</div><div class='del'>- */</div><div class='del'>-const struct address_space_operations ntfs_mst_aops = {</div><div class='del'>-	.read_folio	= ntfs_read_folio,	/* Fill page with data. */</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.writepage	= ntfs_writepage,	/* Write dirty page to disk. */</div><div class='del'>-	.dirty_folio	= filemap_dirty_folio,</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	.migrate_folio	= buffer_migrate_folio,</div><div class='del'>-	.is_partially_uptodate	= block_is_partially_uptodate,</div><div class='del'>-	.error_remove_folio = generic_error_remove_folio,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mark_ntfs_record_dirty - mark an ntfs record dirty</div><div class='del'>- * @page:	page containing the ntfs record to mark dirty</div><div class='del'>- * @ofs:	byte offset within @page at which the ntfs record begins</div><div class='del'>- *</div><div class='del'>- * Set the buffers and the page in which the ntfs record is located dirty.</div><div class='del'>- *</div><div class='del'>- * The latter also marks the vfs inode the ntfs record belongs to dirty</div><div class='del'>- * (I_DIRTY_PAGES only).</div><div class='del'>- *</div><div class='del'>- * If the page does not have buffers, we create them and set them uptodate.</div><div class='del'>- * The page may not be locked which is why we need to handle the buffers under</div><div class='del'>- * the mapping-&gt;i_private_lock.  Once the buffers are marked dirty we no longer</div><div class='del'>- * need the lock since try_to_free_buffers() does not free dirty buffers.</div><div class='del'>- */</div><div class='del'>-void mark_ntfs_record_dirty(struct page *page, const unsigned int ofs) {</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(mapping-&gt;host);</div><div class='del'>-	struct buffer_head *bh, *head, *buffers_to_free = NULL;</div><div class='del'>-	unsigned int end, bh_size, bh_ofs;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!PageUptodate(page));</div><div class='del'>-	end = ofs + ni-&gt;itype.index.block_size;</div><div class='del'>-	bh_size = VFS_I(ni)-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-	if (unlikely(!page_has_buffers(page))) {</div><div class='del'>-		spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		bh = head = alloc_page_buffers(page, bh_size, true);</div><div class='del'>-		spin_lock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-		if (likely(!page_has_buffers(page))) {</div><div class='del'>-			struct buffer_head *tail;</div><div class='del'>-</div><div class='del'>-			do {</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-				tail = bh;</div><div class='del'>-				bh = bh-&gt;b_this_page;</div><div class='del'>-			} while (bh);</div><div class='del'>-			tail-&gt;b_this_page = head;</div><div class='del'>-			attach_page_private(page, head);</div><div class='del'>-		} else</div><div class='del'>-			buffers_to_free = bh;</div><div class='del'>-	}</div><div class='del'>-	bh = head = page_buffers(page);</div><div class='del'>-	BUG_ON(!bh);</div><div class='del'>-	do {</div><div class='del'>-		bh_ofs = bh_offset(bh);</div><div class='del'>-		if (bh_ofs + bh_size &lt;= ofs)</div><div class='del'>-			continue;</div><div class='del'>-		if (unlikely(bh_ofs &gt;= end))</div><div class='del'>-			break;</div><div class='del'>-		set_buffer_dirty(bh);</div><div class='del'>-	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	spin_unlock(&amp;mapping-&gt;i_private_lock);</div><div class='del'>-	filemap_dirty_folio(mapping, page_folio(page));</div><div class='del'>-	if (unlikely(buffers_to_free)) {</div><div class='del'>-		do {</div><div class='del'>-			bh = buffers_to_free-&gt;b_this_page;</div><div class='del'>-			free_buffer_head(buffers_to_free);</div><div class='del'>-			buffers_to_free = bh;</div><div class='del'>-		} while (buffers_to_free);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/aops.h b/fs/ntfs/aops.h<br/>deleted file mode 100644<br/>index 8d0958a149cb..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/aops.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/aops.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * aops.h - Defines for NTFS kernel address space operations and page cache</div><div class='del'>- *	    handling.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_AOPS_H</div><div class='del'>-#define _LINUX_NTFS_AOPS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "inode.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_unmap_page - release a page that was mapped using ntfs_map_page()</div><div class='del'>- * @page:	the page to release</div><div class='del'>- *</div><div class='del'>- * Unpin, unmap and release a page that was obtained from ntfs_map_page().</div><div class='del'>- */</div><div class='del'>-static inline void ntfs_unmap_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	kunmap(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_map_page - map a page into accessible memory, reading it if necessary</div><div class='del'>- * @mapping:	address space for which to obtain the page</div><div class='del'>- * @index:	index into the page cache for @mapping of the page to map</div><div class='del'>- *</div><div class='del'>- * Read a page from the page cache of the address space @mapping at position</div><div class='del'>- * @index, where @index is in units of PAGE_SIZE, and not in bytes.</div><div class='del'>- *</div><div class='del'>- * If the page is not in memory it is loaded from disk first using the</div><div class='del'>- * read_folio method defined in the address space operations of @mapping</div><div class='del'>- * and the page is added to the page cache of @mapping in the process.</div><div class='del'>- *</div><div class='del'>- * If the page belongs to an mst protected attribute and it is marked as such</div><div class='del'>- * in its ntfs inode (NInoMstProtected()) the mst fixups are applied but no</div><div class='del'>- * error checking is performed.  This means the caller has to verify whether</div><div class='del'>- * the ntfs record(s) contained in the page are valid or not using one of the</div><div class='del'>- * ntfs_is_XXXX_record{,p}() macros, where XXXX is the record type you are</div><div class='del'>- * expecting to see.  (For details of the macros, see fs/ntfs/layout.h.)</div><div class='del'>- *</div><div class='del'>- * If the page is in high memory it is mapped into memory directly addressible</div><div class='del'>- * by the kernel.</div><div class='del'>- *</div><div class='del'>- * Finally the page count is incremented, thus pinning the page into place.</div><div class='del'>- *</div><div class='del'>- * The above means that page_address(page) can be used on all pages obtained</div><div class='del'>- * with ntfs_map_page() to get the kernel virtual address of the page.</div><div class='del'>- *</div><div class='del'>- * When finished with the page, the caller has to call ntfs_unmap_page() to</div><div class='del'>- * unpin, unmap and release the page.</div><div class='del'>- *</div><div class='del'>- * Note this does not grant exclusive access. If such is desired, the caller</div><div class='del'>- * must provide it independently of the ntfs_{un}map_page() calls by using</div><div class='del'>- * a {rw_}semaphore or other means of serialization. A spin lock cannot be</div><div class='del'>- * used as ntfs_map_page() can block.</div><div class='del'>- *</div><div class='del'>- * The unlocked and uptodate page is returned on success or an encoded error</div><div class='del'>- * on failure. Caller has to test for error using the IS_ERR() macro on the</div><div class='del'>- * return value. If that evaluates to 'true', the negative error code can be</div><div class='del'>- * obtained using PTR_ERR() on the return value of ntfs_map_page().</div><div class='del'>- */</div><div class='del'>-static inline struct page *ntfs_map_page(struct address_space *mapping,</div><div class='del'>-		unsigned long index)</div><div class='del'>-{</div><div class='del'>-	struct page *page = read_mapping_page(mapping, index, NULL);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(page))</div><div class='del'>-		kmap(page);</div><div class='del'>-	return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-extern void mark_ntfs_record_dirty(struct page *page, const unsigned int ofs);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_AOPS_H */</div><div class='head'>diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c<br/>deleted file mode 100644<br/>index f79408f9127a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/attrib.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/attrib.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2624 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * attrib.c - NTFS attribute operations.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2012 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "lcnalloc.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_map_runlist_nolock - map (a part of) a runlist of an ntfs inode</div><div class='del'>- * @ni:		ntfs inode for which to map (part of) a runlist</div><div class='del'>- * @vcn:	map runlist part containing this vcn</div><div class='del'>- * @ctx:	active attribute search context if present or NULL if not</div><div class='del'>- *</div><div class='del'>- * Map the part of a runlist containing the @vcn of the ntfs inode @ni.</div><div class='del'>- *</div><div class='del'>- * If @ctx is specified, it is an active search context of @ni and its base mft</div><div class='del'>- * record.  This is needed when ntfs_map_runlist_nolock() encounters unmapped</div><div class='del'>- * runlist fragments and allows their mapping.  If you do not have the mft</div><div class='del'>- * record mapped, you can specify @ctx as NULL and ntfs_map_runlist_nolock()</div><div class='del'>- * will perform the necessary mapping and unmapping.</div><div class='del'>- *</div><div class='del'>- * Note, ntfs_map_runlist_nolock() saves the state of @ctx on entry and</div><div class='del'>- * restores it before returning.  Thus, @ctx will be left pointing to the same</div><div class='del'>- * attribute on return as on entry.  However, the actual pointers in @ctx may</div><div class='del'>- * point to different memory locations on return, so you must remember to reset</div><div class='del'>- * any cached pointers from the @ctx, i.e. after the call to</div><div class='del'>- * ntfs_map_runlist_nolock(), you will probably want to do:</div><div class='del'>- *	m = ctx-&gt;mrec;</div><div class='del'>- *	a = ctx-&gt;attr;</div><div class='del'>- * Assuming you cache ctx-&gt;attr in a variable @a of type ATTR_RECORD * and that</div><div class='del'>- * you cache ctx-&gt;mrec in a variable @m of type MFT_RECORD *.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  There is one special error code</div><div class='del'>- * which is not an error as such.  This is -ENOENT.  It means that @vcn is out</div><div class='del'>- * of bounds of the runlist.</div><div class='del'>- *</div><div class='del'>- * Note the runlist can be NULL after this function returns if @vcn is zero and</div><div class='del'>- * the attribute has zero allocated size, i.e. there simply is no runlist.</div><div class='del'>- *</div><div class='del'>- * WARNING: If @ctx is supplied, regardless of whether success or failure is</div><div class='del'>- *	    returned, you need to check IS_ERR(@ctx-&gt;mrec) and if 'true' the @ctx</div><div class='del'>- *	    is no longer valid, i.e. you need to either call</div><div class='del'>- *	    ntfs_attr_reinit_search_ctx() or ntfs_attr_put_search_ctx() on it.</div><div class='del'>- *	    In that case PTR_ERR(@ctx-&gt;mrec) will give you the error code for</div><div class='del'>- *	    why the mapping of the old inode failed.</div><div class='del'>- *</div><div class='del'>- * Locking: - The runlist described by @ni must be locked for writing on entry</div><div class='del'>- *	      and is locked on return.  Note the runlist will be modified.</div><div class='del'>- *	    - If @ctx is NULL, the base mft record of @ni must not be mapped on</div><div class='del'>- *	      entry and it will be left unmapped on return.</div><div class='del'>- *	    - If @ctx is not NULL, the base mft record must be mapped on entry</div><div class='del'>- *	      and it will be left mapped on return.</div><div class='del'>- */</div><div class='del'>-int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN vcn, ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	VCN end_vcn;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	struct page *put_this_page = NULL;</div><div class='del'>-	int err = 0;</div><div class='del'>-	bool ctx_is_temporary, ctx_needs_reset;</div><div class='del'>-	ntfs_attr_search_ctx old_ctx = { NULL, };</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Mapping runlist part containing vcn 0x%llx.",</div><div class='del'>-			(unsigned long long)vcn);</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		ctx_is_temporary = ctx_needs_reset = true;</div><div class='del'>-		m = map_mft_record(base_ni);</div><div class='del'>-		if (IS_ERR(m))</div><div class='del'>-			return PTR_ERR(m);</div><div class='del'>-		ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-		if (unlikely(!ctx)) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		VCN allocated_size_vcn;</div><div class='del'>-</div><div class='del'>-		BUG_ON(IS_ERR(ctx-&gt;mrec));</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		BUG_ON(!a-&gt;non_resident);</div><div class='del'>-		ctx_is_temporary = false;</div><div class='del'>-		end_vcn = sle64_to_cpu(a-&gt;data.non_resident.highest_vcn);</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		allocated_size_vcn = ni-&gt;allocated_size &gt;&gt;</div><div class='del'>-				ni-&gt;vol-&gt;cluster_size_bits;</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (!a-&gt;data.non_resident.lowest_vcn &amp;&amp; end_vcn &lt;= 0)</div><div class='del'>-			end_vcn = allocated_size_vcn - 1;</div><div class='del'>-		/*</div><div class='del'>-		 * If we already have the attribute extent containing @vcn in</div><div class='del'>-		 * @ctx, no need to look it up again.  We slightly cheat in</div><div class='del'>-		 * that if vcn exceeds the allocated size, we will refuse to</div><div class='del'>-		 * map the runlist below, so there is definitely no need to get</div><div class='del'>-		 * the right attribute extent.</div><div class='del'>-		 */</div><div class='del'>-		if (vcn &gt;= allocated_size_vcn || (a-&gt;type == ni-&gt;type &amp;&amp;</div><div class='del'>-				a-&gt;name_length == ni-&gt;name_len &amp;&amp;</div><div class='del'>-				!memcmp((u8*)a + le16_to_cpu(a-&gt;name_offset),</div><div class='del'>-				ni-&gt;name, ni-&gt;name_len) &amp;&amp;</div><div class='del'>-				sle64_to_cpu(a-&gt;data.non_resident.lowest_vcn)</div><div class='del'>-				&lt;= vcn &amp;&amp; end_vcn &gt;= vcn))</div><div class='del'>-			ctx_needs_reset = false;</div><div class='del'>-		else {</div><div class='del'>-			/* Save the old search context. */</div><div class='del'>-			old_ctx = *ctx;</div><div class='del'>-			/*</div><div class='del'>-			 * If the currently mapped (extent) inode is not the</div><div class='del'>-			 * base inode we will unmap it when we reinitialize the</div><div class='del'>-			 * search context which means we need to get a</div><div class='del'>-			 * reference to the page containing the mapped mft</div><div class='del'>-			 * record so we do not accidentally drop changes to the</div><div class='del'>-			 * mft record when it has not been marked dirty yet.</div><div class='del'>-			 */</div><div class='del'>-			if (old_ctx.base_ntfs_ino &amp;&amp; old_ctx.ntfs_ino !=</div><div class='del'>-					old_ctx.base_ntfs_ino) {</div><div class='del'>-				put_this_page = old_ctx.ntfs_ino-&gt;page;</div><div class='del'>-				get_page(put_this_page);</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * Reinitialize the search context so we can lookup the</div><div class='del'>-			 * needed attribute extent.</div><div class='del'>-			 */</div><div class='del'>-			ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-			ctx_needs_reset = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ctx_needs_reset) {</div><div class='del'>-		err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-				CASE_SENSITIVE, vcn, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (err == -ENOENT)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(!ctx-&gt;attr-&gt;non_resident);</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	/*</div><div class='del'>-	 * Only decompress the mapping pairs if @vcn is inside it.  Otherwise</div><div class='del'>-	 * we get into problems when we try to map an out of bounds vcn because</div><div class='del'>-	 * we then try to map the already mapped runlist fragment and</div><div class='del'>-	 * ntfs_mapping_pairs_decompress() fails.</div><div class='del'>-	 */</div><div class='del'>-	end_vcn = sle64_to_cpu(a-&gt;data.non_resident.highest_vcn) + 1;</div><div class='del'>-	if (unlikely(vcn &amp;&amp; vcn &gt;= end_vcn)) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	rl = ntfs_mapping_pairs_decompress(ni-&gt;vol, a, ni-&gt;runlist.rl);</div><div class='del'>-	if (IS_ERR(rl))</div><div class='del'>-		err = PTR_ERR(rl);</div><div class='del'>-	else</div><div class='del'>-		ni-&gt;runlist.rl = rl;</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx_is_temporary) {</div><div class='del'>-		if (likely(ctx))</div><div class='del'>-			ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	} else if (ctx_needs_reset) {</div><div class='del'>-		/*</div><div class='del'>-		 * If there is no attribute list, restoring the search context</div><div class='del'>-		 * is accomplished simply by copying the saved context back over</div><div class='del'>-		 * the caller supplied context.  If there is an attribute list,</div><div class='del'>-		 * things are more complicated as we need to deal with mapping</div><div class='del'>-		 * of mft records and resulting potential changes in pointers.</div><div class='del'>-		 */</div><div class='del'>-		if (NInoAttrList(base_ni)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If the currently mapped (extent) inode is not the</div><div class='del'>-			 * one we had before, we need to unmap it and map the</div><div class='del'>-			 * old one.</div><div class='del'>-			 */</div><div class='del'>-			if (ctx-&gt;ntfs_ino != old_ctx.ntfs_ino) {</div><div class='del'>-				/*</div><div class='del'>-				 * If the currently mapped inode is not the</div><div class='del'>-				 * base inode, unmap it.</div><div class='del'>-				 */</div><div class='del'>-				if (ctx-&gt;base_ntfs_ino &amp;&amp; ctx-&gt;ntfs_ino !=</div><div class='del'>-						ctx-&gt;base_ntfs_ino) {</div><div class='del'>-					unmap_extent_mft_record(ctx-&gt;ntfs_ino);</div><div class='del'>-					ctx-&gt;mrec = ctx-&gt;base_mrec;</div><div class='del'>-					BUG_ON(!ctx-&gt;mrec);</div><div class='del'>-				}</div><div class='del'>-				/*</div><div class='del'>-				 * If the old mapped inode is not the base</div><div class='del'>-				 * inode, map it.</div><div class='del'>-				 */</div><div class='del'>-				if (old_ctx.base_ntfs_ino &amp;&amp;</div><div class='del'>-						old_ctx.ntfs_ino !=</div><div class='del'>-						old_ctx.base_ntfs_ino) {</div><div class='del'>-retry_map:</div><div class='del'>-					ctx-&gt;mrec = map_mft_record(</div><div class='del'>-							old_ctx.ntfs_ino);</div><div class='del'>-					/*</div><div class='del'>-					 * Something bad has happened.  If out</div><div class='del'>-					 * of memory retry till it succeeds.</div><div class='del'>-					 * Any other errors are fatal and we</div><div class='del'>-					 * return the error code in ctx-&gt;mrec.</div><div class='del'>-					 * Let the caller deal with it...  We</div><div class='del'>-					 * just need to fudge things so the</div><div class='del'>-					 * caller can reinit and/or put the</div><div class='del'>-					 * search context safely.</div><div class='del'>-					 */</div><div class='del'>-					if (IS_ERR(ctx-&gt;mrec)) {</div><div class='del'>-						if (PTR_ERR(ctx-&gt;mrec) ==</div><div class='del'>-								-ENOMEM) {</div><div class='del'>-							schedule();</div><div class='del'>-							goto retry_map;</div><div class='del'>-						} else</div><div class='del'>-							old_ctx.ntfs_ino =</div><div class='del'>-								old_ctx.</div><div class='del'>-								base_ntfs_ino;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			/* Update the changed pointers in the saved context. */</div><div class='del'>-			if (ctx-&gt;mrec != old_ctx.mrec) {</div><div class='del'>-				if (!IS_ERR(ctx-&gt;mrec))</div><div class='del'>-					old_ctx.attr = (ATTR_RECORD*)(</div><div class='del'>-							(u8*)ctx-&gt;mrec +</div><div class='del'>-							((u8*)old_ctx.attr -</div><div class='del'>-							(u8*)old_ctx.mrec));</div><div class='del'>-				old_ctx.mrec = ctx-&gt;mrec;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Restore the search context to the saved one. */</div><div class='del'>-		*ctx = old_ctx;</div><div class='del'>-		/*</div><div class='del'>-		 * We drop the reference on the page we took earlier.  In the</div><div class='del'>-		 * case that IS_ERR(ctx-&gt;mrec) is true this means we might lose</div><div class='del'>-		 * some changes to the mft record that had been made between</div><div class='del'>-		 * the last time it was marked dirty/written out and now.  This</div><div class='del'>-		 * at this stage is not a problem as the mapping error is fatal</div><div class='del'>-		 * enough that the mft record cannot be written out anyway and</div><div class='del'>-		 * the caller is very likely to shutdown the whole inode</div><div class='del'>-		 * immediately and mark the volume dirty for chkdsk to pick up</div><div class='del'>-		 * the pieces anyway.</div><div class='del'>-		 */</div><div class='del'>-		if (put_this_page)</div><div class='del'>-			put_page(put_this_page);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_map_runlist - map (a part of) a runlist of an ntfs inode</div><div class='del'>- * @ni:		ntfs inode for which to map (part of) a runlist</div><div class='del'>- * @vcn:	map runlist part containing this vcn</div><div class='del'>- *</div><div class='del'>- * Map the part of a runlist containing the @vcn of the ntfs inode @ni.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  There is one special error code</div><div class='del'>- * which is not an error as such.  This is -ENOENT.  It means that @vcn is out</div><div class='del'>- * of bounds of the runlist.</div><div class='del'>- *</div><div class='del'>- * Locking: - The runlist must be unlocked on entry and is unlocked on return.</div><div class='del'>- *	    - This function takes the runlist lock for writing and may modify</div><div class='del'>- *	      the runlist.</div><div class='del'>- */</div><div class='del'>-int ntfs_map_runlist(ntfs_inode *ni, VCN vcn)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	/* Make sure someone else didn't do the work while we were sleeping. */</div><div class='del'>-	if (likely(ntfs_rl_vcn_to_lcn(ni-&gt;runlist.rl, vcn) &lt;=</div><div class='del'>-			LCN_RL_NOT_MAPPED))</div><div class='del'>-		err = ntfs_map_runlist_nolock(ni, vcn, NULL);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_vcn_to_lcn_nolock - convert a vcn into a lcn given an ntfs inode</div><div class='del'>- * @ni:			ntfs inode of the attribute whose runlist to search</div><div class='del'>- * @vcn:		vcn to convert</div><div class='del'>- * @write_locked:	true if the runlist is locked for writing</div><div class='del'>- *</div><div class='del'>- * Find the virtual cluster number @vcn in the runlist of the ntfs attribute</div><div class='del'>- * described by the ntfs inode @ni and return the corresponding logical cluster</div><div class='del'>- * number (lcn).</div><div class='del'>- *</div><div class='del'>- * If the @vcn is not mapped yet, the attempt is made to map the attribute</div><div class='del'>- * extent containing the @vcn and the vcn to lcn conversion is retried.</div><div class='del'>- *</div><div class='del'>- * If @write_locked is true the caller has locked the runlist for writing and</div><div class='del'>- * if false for reading.</div><div class='del'>- *</div><div class='del'>- * Since lcns must be &gt;= 0, we use negative return codes with special meaning:</div><div class='del'>- *</div><div class='del'>- * Return code	Meaning / Description</div><div class='del'>- * ==========================================</div><div class='del'>- *  LCN_HOLE	Hole / not allocated on disk.</div><div class='del'>- *  LCN_ENOENT	There is no such vcn in the runlist, i.e. @vcn is out of bounds.</div><div class='del'>- *  LCN_ENOMEM	Not enough memory to map runlist.</div><div class='del'>- *  LCN_EIO	Critical error (runlist/file is corrupt, i/o error, etc).</div><div class='del'>- *</div><div class='del'>- * Locking: - The runlist must be locked on entry and is left locked on return.</div><div class='del'>- *	    - If @write_locked is 'false', i.e. the runlist is locked for reading,</div><div class='del'>- *	      the lock may be dropped inside the function so you cannot rely on</div><div class='del'>- *	      the runlist still being the same when this function returns.</div><div class='del'>- */</div><div class='del'>-LCN ntfs_attr_vcn_to_lcn_nolock(ntfs_inode *ni, const VCN vcn,</div><div class='del'>-		const bool write_locked)</div><div class='del'>-{</div><div class='del'>-	LCN lcn;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	bool is_retry = false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ni);</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, vcn 0x%llx, %s_locked.",</div><div class='del'>-			ni-&gt;mft_no, (unsigned long long)vcn,</div><div class='del'>-			write_locked ? "write" : "read");</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	BUG_ON(vcn &lt; 0);</div><div class='del'>-	if (!ni-&gt;runlist.rl) {</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (!ni-&gt;allocated_size) {</div><div class='del'>-			read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			return LCN_ENOENT;</div><div class='del'>-		}</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	}</div><div class='del'>-retry_remap:</div><div class='del'>-	/* Convert vcn to lcn.  If that fails map the runlist and retry once. */</div><div class='del'>-	lcn = ntfs_rl_vcn_to_lcn(ni-&gt;runlist.rl, vcn);</div><div class='del'>-	if (likely(lcn &gt;= LCN_HOLE)) {</div><div class='del'>-		ntfs_debug("Done, lcn 0x%llx.", (long long)lcn);</div><div class='del'>-		return lcn;</div><div class='del'>-	}</div><div class='del'>-	if (lcn != LCN_RL_NOT_MAPPED) {</div><div class='del'>-		if (lcn != LCN_ENOENT)</div><div class='del'>-			lcn = LCN_EIO;</div><div class='del'>-	} else if (!is_retry) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		if (!write_locked) {</div><div class='del'>-			up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			if (unlikely(ntfs_rl_vcn_to_lcn(ni-&gt;runlist.rl, vcn) !=</div><div class='del'>-					LCN_RL_NOT_MAPPED)) {</div><div class='del'>-				up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				goto retry_remap;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		err = ntfs_map_runlist_nolock(ni, vcn, NULL);</div><div class='del'>-		if (!write_locked) {</div><div class='del'>-			up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-		}</div><div class='del'>-		if (likely(!err)) {</div><div class='del'>-			is_retry = true;</div><div class='del'>-			goto retry_remap;</div><div class='del'>-		}</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			lcn = LCN_ENOENT;</div><div class='del'>-		else if (err == -ENOMEM)</div><div class='del'>-			lcn = LCN_ENOMEM;</div><div class='del'>-		else</div><div class='del'>-			lcn = LCN_EIO;</div><div class='del'>-	}</div><div class='del'>-	if (lcn != LCN_ENOENT)</div><div class='del'>-		ntfs_error(ni-&gt;vol-&gt;sb, "Failed with error code %lli.",</div><div class='del'>-				(long long)lcn);</div><div class='del'>-	return lcn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_find_vcn_nolock - find a vcn in the runlist of an ntfs inode</div><div class='del'>- * @ni:		ntfs inode describing the runlist to search</div><div class='del'>- * @vcn:	vcn to find</div><div class='del'>- * @ctx:	active attribute search context if present or NULL if not</div><div class='del'>- *</div><div class='del'>- * Find the virtual cluster number @vcn in the runlist described by the ntfs</div><div class='del'>- * inode @ni and return the address of the runlist element containing the @vcn.</div><div class='del'>- *</div><div class='del'>- * If the @vcn is not mapped yet, the attempt is made to map the attribute</div><div class='del'>- * extent containing the @vcn and the vcn to lcn conversion is retried.</div><div class='del'>- *</div><div class='del'>- * If @ctx is specified, it is an active search context of @ni and its base mft</div><div class='del'>- * record.  This is needed when ntfs_attr_find_vcn_nolock() encounters unmapped</div><div class='del'>- * runlist fragments and allows their mapping.  If you do not have the mft</div><div class='del'>- * record mapped, you can specify @ctx as NULL and ntfs_attr_find_vcn_nolock()</div><div class='del'>- * will perform the necessary mapping and unmapping.</div><div class='del'>- *</div><div class='del'>- * Note, ntfs_attr_find_vcn_nolock() saves the state of @ctx on entry and</div><div class='del'>- * restores it before returning.  Thus, @ctx will be left pointing to the same</div><div class='del'>- * attribute on return as on entry.  However, the actual pointers in @ctx may</div><div class='del'>- * point to different memory locations on return, so you must remember to reset</div><div class='del'>- * any cached pointers from the @ctx, i.e. after the call to</div><div class='del'>- * ntfs_attr_find_vcn_nolock(), you will probably want to do:</div><div class='del'>- *	m = ctx-&gt;mrec;</div><div class='del'>- *	a = ctx-&gt;attr;</div><div class='del'>- * Assuming you cache ctx-&gt;attr in a variable @a of type ATTR_RECORD * and that</div><div class='del'>- * you cache ctx-&gt;mrec in a variable @m of type MFT_RECORD *.</div><div class='del'>- * Note you need to distinguish between the lcn of the returned runlist element</div><div class='del'>- * being &gt;= 0 and LCN_HOLE.  In the later case you have to return zeroes on</div><div class='del'>- * read and allocate clusters on write.</div><div class='del'>- *</div><div class='del'>- * Return the runlist element containing the @vcn on success and</div><div class='del'>- * ERR_PTR(-errno) on error.  You need to test the return value with IS_ERR()</div><div class='del'>- * to decide if the return is success or failure and PTR_ERR() to get to the</div><div class='del'>- * error code if IS_ERR() is true.</div><div class='del'>- *</div><div class='del'>- * The possible error return codes are:</div><div class='del'>- *	-ENOENT - No such vcn in the runlist, i.e. @vcn is out of bounds.</div><div class='del'>- *	-ENOMEM - Not enough memory to map runlist.</div><div class='del'>- *	-EIO	- Critical error (runlist/file is corrupt, i/o error, etc).</div><div class='del'>- *</div><div class='del'>- * WARNING: If @ctx is supplied, regardless of whether success or failure is</div><div class='del'>- *	    returned, you need to check IS_ERR(@ctx-&gt;mrec) and if 'true' the @ctx</div><div class='del'>- *	    is no longer valid, i.e. you need to either call</div><div class='del'>- *	    ntfs_attr_reinit_search_ctx() or ntfs_attr_put_search_ctx() on it.</div><div class='del'>- *	    In that case PTR_ERR(@ctx-&gt;mrec) will give you the error code for</div><div class='del'>- *	    why the mapping of the old inode failed.</div><div class='del'>- *</div><div class='del'>- * Locking: - The runlist described by @ni must be locked for writing on entry</div><div class='del'>- *	      and is locked on return.  Note the runlist may be modified when</div><div class='del'>- *	      needed runlist fragments need to be mapped.</div><div class='del'>- *	    - If @ctx is NULL, the base mft record of @ni must not be mapped on</div><div class='del'>- *	      entry and it will be left unmapped on return.</div><div class='del'>- *	    - If @ctx is not NULL, the base mft record must be mapped on entry</div><div class='del'>- *	      and it will be left mapped on return.</div><div class='del'>- */</div><div class='del'>-runlist_element *ntfs_attr_find_vcn_nolock(ntfs_inode *ni, const VCN vcn,</div><div class='del'>-		ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	int err = 0;</div><div class='del'>-	bool is_retry = false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ni);</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, vcn 0x%llx, with%s ctx.",</div><div class='del'>-			ni-&gt;mft_no, (unsigned long long)vcn, ctx ? "" : "out");</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	BUG_ON(vcn &lt; 0);</div><div class='del'>-	if (!ni-&gt;runlist.rl) {</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (!ni-&gt;allocated_size) {</div><div class='del'>-			read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			return ERR_PTR(-ENOENT);</div><div class='del'>-		}</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	}</div><div class='del'>-retry_remap:</div><div class='del'>-	rl = ni-&gt;runlist.rl;</div><div class='del'>-	if (likely(rl &amp;&amp; vcn &gt;= rl[0].vcn)) {</div><div class='del'>-		while (likely(rl-&gt;length)) {</div><div class='del'>-			if (unlikely(vcn &lt; rl[1].vcn)) {</div><div class='del'>-				if (likely(rl-&gt;lcn &gt;= LCN_HOLE)) {</div><div class='del'>-					ntfs_debug("Done.");</div><div class='del'>-					return rl;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			rl++;</div><div class='del'>-		}</div><div class='del'>-		if (likely(rl-&gt;lcn != LCN_RL_NOT_MAPPED)) {</div><div class='del'>-			if (likely(rl-&gt;lcn == LCN_ENOENT))</div><div class='del'>-				err = -ENOENT;</div><div class='del'>-			else</div><div class='del'>-				err = -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!err &amp;&amp; !is_retry) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the search context is invalid we cannot map the unmapped</div><div class='del'>-		 * region.</div><div class='del'>-		 */</div><div class='del'>-		if (IS_ERR(ctx-&gt;mrec))</div><div class='del'>-			err = PTR_ERR(ctx-&gt;mrec);</div><div class='del'>-		else {</div><div class='del'>-			/*</div><div class='del'>-			 * The @vcn is in an unmapped region, map the runlist</div><div class='del'>-			 * and retry.</div><div class='del'>-			 */</div><div class='del'>-			err = ntfs_map_runlist_nolock(ni, vcn, ctx);</div><div class='del'>-			if (likely(!err)) {</div><div class='del'>-				is_retry = true;</div><div class='del'>-				goto retry_remap;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (err == -EINVAL)</div><div class='del'>-			err = -EIO;</div><div class='del'>-	} else if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (err != -ENOENT)</div><div class='del'>-		ntfs_error(ni-&gt;vol-&gt;sb, "Failed with error code %i.", err);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_find - find (next) attribute in mft record</div><div class='del'>- * @type:	attribute type to find</div><div class='del'>- * @name:	attribute name to find (optional, i.e. NULL means don't care)</div><div class='del'>- * @name_len:	attribute name length (only needed if @name present)</div><div class='del'>- * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)</div><div class='del'>- * @val:	attribute value to find (optional, resident attributes only)</div><div class='del'>- * @val_len:	attribute value length</div><div class='del'>- * @ctx:	search context with mft record and attribute to search from</div><div class='del'>- *</div><div class='del'>- * You should not need to call this function directly.  Use ntfs_attr_lookup()</div><div class='del'>- * instead.</div><div class='del'>- *</div><div class='del'>- * ntfs_attr_find() takes a search context @ctx as parameter and searches the</div><div class='del'>- * mft record specified by @ctx-&gt;mrec, beginning at @ctx-&gt;attr, for an</div><div class='del'>- * attribute of @type, optionally @name and @val.</div><div class='del'>- *</div><div class='del'>- * If the attribute is found, ntfs_attr_find() returns 0 and @ctx-&gt;attr will</div><div class='del'>- * point to the found attribute.</div><div class='del'>- *</div><div class='del'>- * If the attribute is not found, ntfs_attr_find() returns -ENOENT and</div><div class='del'>- * @ctx-&gt;attr will point to the attribute before which the attribute being</div><div class='del'>- * searched for would need to be inserted if such an action were to be desired.</div><div class='del'>- *</div><div class='del'>- * On actual error, ntfs_attr_find() returns -EIO.  In this case @ctx-&gt;attr is</div><div class='del'>- * undefined and in particular do not rely on it not changing.</div><div class='del'>- *</div><div class='del'>- * If @ctx-&gt;is_first is 'true', the search begins with @ctx-&gt;attr itself.  If it</div><div class='del'>- * is 'false', the search begins after @ctx-&gt;attr.</div><div class='del'>- *</div><div class='del'>- * If @ic is IGNORE_CASE, the @name comparisson is not case sensitive and</div><div class='del'>- * @ctx-&gt;ntfs_ino must be set to the ntfs inode to which the mft record</div><div class='del'>- * @ctx-&gt;mrec belongs.  This is so we can get at the ntfs volume and hence at</div><div class='del'>- * the upcase table.  If @ic is CASE_SENSITIVE, the comparison is case</div><div class='del'>- * sensitive.  When @name is present, @name_len is the @name length in Unicode</div><div class='del'>- * characters.</div><div class='del'>- *</div><div class='del'>- * If @name is not present (NULL), we assume that the unnamed attribute is</div><div class='del'>- * being searched for.</div><div class='del'>- *</div><div class='del'>- * Finally, the resident attribute value @val is looked for, if present.  If</div><div class='del'>- * @val is not present (NULL), @val_len is ignored.</div><div class='del'>- *</div><div class='del'>- * ntfs_attr_find() only searches the specified mft record and it ignores the</div><div class='del'>- * presence of an attribute list attribute (unless it is the one being searched</div><div class='del'>- * for, obviously).  If you need to take attribute lists into consideration,</div><div class='del'>- * use ntfs_attr_lookup() instead (see below).  This also means that you cannot</div><div class='del'>- * use ntfs_attr_find() to search for extent records of non-resident</div><div class='del'>- * attributes, as extents with lowest_vcn != 0 are usually described by the</div><div class='del'>- * attribute list attribute only. - Note that it is possible that the first</div><div class='del'>- * extent is only in the attribute list while the last extent is in the base</div><div class='del'>- * mft record, so do not rely on being able to find the first extent in the</div><div class='del'>- * base mft record.</div><div class='del'>- *</div><div class='del'>- * Warning: Never use @val when looking for attribute types which can be</div><div class='del'>- *	    non-resident as this most likely will result in a crash!</div><div class='del'>- */</div><div class='del'>-static int ntfs_attr_find(const ATTR_TYPE type, const ntfschar *name,</div><div class='del'>-		const u32 name_len, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const u8 *val, const u32 val_len, ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_volume *vol = ctx-&gt;ntfs_ino-&gt;vol;</div><div class='del'>-	ntfschar *upcase = vol-&gt;upcase;</div><div class='del'>-	u32 upcase_len = vol-&gt;upcase_len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate over attributes in mft record starting at @ctx-&gt;attr, or the</div><div class='del'>-	 * attribute following that, if @ctx-&gt;is_first is 'true'.</div><div class='del'>-	 */</div><div class='del'>-	if (ctx-&gt;is_first) {</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		ctx-&gt;is_first = false;</div><div class='del'>-	} else</div><div class='del'>-		a = (ATTR_RECORD*)((u8*)ctx-&gt;attr +</div><div class='del'>-				le32_to_cpu(ctx-&gt;attr-&gt;length));</div><div class='del'>-	for (;;	a = (ATTR_RECORD*)((u8*)a + le32_to_cpu(a-&gt;length))) {</div><div class='del'>-		u8 *mrec_end = (u8 *)ctx-&gt;mrec +</div><div class='del'>-		               le32_to_cpu(ctx-&gt;mrec-&gt;bytes_allocated);</div><div class='del'>-		u8 *name_end;</div><div class='del'>-</div><div class='del'>-		/* check whether ATTR_RECORD wrap */</div><div class='del'>-		if ((u8 *)a &lt; (u8 *)ctx-&gt;mrec)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* check whether Attribute Record Header is within bounds */</div><div class='del'>-		if ((u8 *)a &gt; mrec_end ||</div><div class='del'>-		    (u8 *)a + sizeof(ATTR_RECORD) &gt; mrec_end)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* check whether ATTR_RECORD's name is within bounds */</div><div class='del'>-		name_end = (u8 *)a + le16_to_cpu(a-&gt;name_offset) +</div><div class='del'>-			   a-&gt;name_length * sizeof(ntfschar);</div><div class='del'>-		if (name_end &gt; mrec_end)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ctx-&gt;attr = a;</div><div class='del'>-		if (unlikely(le32_to_cpu(a-&gt;type) &gt; le32_to_cpu(type) ||</div><div class='del'>-				a-&gt;type == AT_END))</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		if (unlikely(!a-&gt;length))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* check whether ATTR_RECORD's length wrap */</div><div class='del'>-		if ((u8 *)a + le32_to_cpu(a-&gt;length) &lt; (u8 *)a)</div><div class='del'>-			break;</div><div class='del'>-		/* check whether ATTR_RECORD's length is within bounds */</div><div class='del'>-		if ((u8 *)a + le32_to_cpu(a-&gt;length) &gt; mrec_end)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (a-&gt;type != type)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * If @name is present, compare the two names.  If @name is</div><div class='del'>-		 * missing, assume we want an unnamed attribute.</div><div class='del'>-		 */</div><div class='del'>-		if (!name) {</div><div class='del'>-			/* The search failed if the found attribute is named. */</div><div class='del'>-			if (a-&gt;name_length)</div><div class='del'>-				return -ENOENT;</div><div class='del'>-		} else if (!ntfs_are_names_equal(name, name_len,</div><div class='del'>-			    (ntfschar*)((u8*)a + le16_to_cpu(a-&gt;name_offset)),</div><div class='del'>-			    a-&gt;name_length, ic, upcase, upcase_len)) {</div><div class='del'>-			register int rc;</div><div class='del'>-</div><div class='del'>-			rc = ntfs_collate_names(name, name_len,</div><div class='del'>-					(ntfschar*)((u8*)a +</div><div class='del'>-					le16_to_cpu(a-&gt;name_offset)),</div><div class='del'>-					a-&gt;name_length, 1, IGNORE_CASE,</div><div class='del'>-					upcase, upcase_len);</div><div class='del'>-			/*</div><div class='del'>-			 * If @name collates before a-&gt;name, there is no</div><div class='del'>-			 * matching attribute.</div><div class='del'>-			 */</div><div class='del'>-			if (rc == -1)</div><div class='del'>-				return -ENOENT;</div><div class='del'>-			/* If the strings are not equal, continue search. */</div><div class='del'>-			if (rc)</div><div class='del'>-				continue;</div><div class='del'>-			rc = ntfs_collate_names(name, name_len,</div><div class='del'>-					(ntfschar*)((u8*)a +</div><div class='del'>-					le16_to_cpu(a-&gt;name_offset)),</div><div class='del'>-					a-&gt;name_length, 1, CASE_SENSITIVE,</div><div class='del'>-					upcase, upcase_len);</div><div class='del'>-			if (rc == -1)</div><div class='del'>-				return -ENOENT;</div><div class='del'>-			if (rc)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The names match or @name not present and attribute is</div><div class='del'>-		 * unnamed.  If no @val specified, we have found the attribute</div><div class='del'>-		 * and are done.</div><div class='del'>-		 */</div><div class='del'>-		if (!val)</div><div class='del'>-			return 0;</div><div class='del'>-		/* @val is present; compare values. */</div><div class='del'>-		else {</div><div class='del'>-			register int rc;</div><div class='del'>-</div><div class='del'>-			rc = memcmp(val, (u8*)a + le16_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_offset),</div><div class='del'>-					min_t(u32, val_len, le32_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_length)));</div><div class='del'>-			/*</div><div class='del'>-			 * If @val collates before the current attribute's</div><div class='del'>-			 * value, there is no matching attribute.</div><div class='del'>-			 */</div><div class='del'>-			if (!rc) {</div><div class='del'>-				register u32 avl;</div><div class='del'>-</div><div class='del'>-				avl = le32_to_cpu(</div><div class='del'>-						a-&gt;data.resident.value_length);</div><div class='del'>-				if (val_len == avl)</div><div class='del'>-					return 0;</div><div class='del'>-				if (val_len &lt; avl)</div><div class='del'>-					return -ENOENT;</div><div class='del'>-			} else if (rc &lt; 0)</div><div class='del'>-				return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Inode is corrupt.  Run chkdsk.");</div><div class='del'>-	NVolSetErrors(vol);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_attribute_list - load an attribute list into memory</div><div class='del'>- * @vol:		ntfs volume from which to read</div><div class='del'>- * @runlist:		runlist of the attribute list</div><div class='del'>- * @al_start:		destination buffer</div><div class='del'>- * @size:		size of the destination buffer in bytes</div><div class='del'>- * @initialized_size:	initialized size of the attribute list</div><div class='del'>- *</div><div class='del'>- * Walk the runlist @runlist and load all clusters from it copying them into</div><div class='del'>- * the linear buffer @al. The maximum number of bytes copied to @al is @size</div><div class='del'>- * bytes. Note, @size does not need to be a multiple of the cluster size. If</div><div class='del'>- * @initialized_size is less than @size, the region in @al between</div><div class='del'>- * @initialized_size and @size will be zeroed and not read from disk.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success or -errno on error.</div><div class='del'>- */</div><div class='del'>-int load_attribute_list(ntfs_volume *vol, runlist *runlist, u8 *al_start,</div><div class='del'>-		const s64 size, const s64 initialized_size)</div><div class='del'>-{</div><div class='del'>-	LCN lcn;</div><div class='del'>-	u8 *al = al_start;</div><div class='del'>-	u8 *al_end = al + initialized_size;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct super_block *sb;</div><div class='del'>-	unsigned long block_size;</div><div class='del'>-	unsigned long block, max_block;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned char block_size_bits;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	if (!vol || !runlist || !al || size &lt;= 0 || initialized_size &lt; 0 ||</div><div class='del'>-			initialized_size &gt; size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!initialized_size) {</div><div class='del'>-		memset(al, 0, size);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	sb = vol-&gt;sb;</div><div class='del'>-	block_size = sb-&gt;s_blocksize;</div><div class='del'>-	block_size_bits = sb-&gt;s_blocksize_bits;</div><div class='del'>-	down_read(&amp;runlist-&gt;lock);</div><div class='del'>-	rl = runlist-&gt;rl;</div><div class='del'>-	if (!rl) {</div><div class='del'>-		ntfs_error(sb, "Cannot read attribute list since runlist is "</div><div class='del'>-				"missing.");</div><div class='del'>-		goto err_out;	</div><div class='del'>-	}</div><div class='del'>-	/* Read all clusters specified by the runlist one run at a time. */</div><div class='del'>-	while (rl-&gt;length) {</div><div class='del'>-		lcn = ntfs_rl_vcn_to_lcn(rl, rl-&gt;vcn);</div><div class='del'>-		ntfs_debug("Reading vcn = 0x%llx, lcn = 0x%llx.",</div><div class='del'>-				(unsigned long long)rl-&gt;vcn,</div><div class='del'>-				(unsigned long long)lcn);</div><div class='del'>-		/* The attribute list cannot be sparse. */</div><div class='del'>-		if (lcn &lt; 0) {</div><div class='del'>-			ntfs_error(sb, "ntfs_rl_vcn_to_lcn() failed.  Cannot "</div><div class='del'>-					"read attribute list.");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		block = lcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt; block_size_bits;</div><div class='del'>-		/* Read the run from device in chunks of block_size bytes. */</div><div class='del'>-		max_block = block + (rl-&gt;length &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-				block_size_bits);</div><div class='del'>-		ntfs_debug("max_block = 0x%lx.", max_block);</div><div class='del'>-		do {</div><div class='del'>-			ntfs_debug("Reading block = 0x%lx.", block);</div><div class='del'>-			bh = sb_bread(sb, block);</div><div class='del'>-			if (!bh) {</div><div class='del'>-				ntfs_error(sb, "sb_bread() failed. Cannot "</div><div class='del'>-						"read attribute list.");</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			if (al + block_size &gt;= al_end)</div><div class='del'>-				goto do_final;</div><div class='del'>-			memcpy(al, bh-&gt;b_data, block_size);</div><div class='del'>-			brelse(bh);</div><div class='del'>-			al += block_size;</div><div class='del'>-		} while (++block &lt; max_block);</div><div class='del'>-		rl++;</div><div class='del'>-	}</div><div class='del'>-	if (initialized_size &lt; size) {</div><div class='del'>-initialize:</div><div class='del'>-		memset(al_start + initialized_size, 0, size - initialized_size);</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	up_read(&amp;runlist-&gt;lock);</div><div class='del'>-	return err;</div><div class='del'>-do_final:</div><div class='del'>-	if (al &lt; al_end) {</div><div class='del'>-		/*</div><div class='del'>-		 * Partial block.</div><div class='del'>-		 *</div><div class='del'>-		 * Note: The attribute list can be smaller than its allocation</div><div class='del'>-		 * by multiple clusters.  This has been encountered by at least</div><div class='del'>-		 * two people running Windows XP, thus we cannot do any</div><div class='del'>-		 * truncation sanity checking here. (AIA)</div><div class='del'>-		 */</div><div class='del'>-		memcpy(al, bh-&gt;b_data, al_end - al);</div><div class='del'>-		brelse(bh);</div><div class='del'>-		if (initialized_size &lt; size)</div><div class='del'>-			goto initialize;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	brelse(bh);</div><div class='del'>-	/* Real overflow! */</div><div class='del'>-	ntfs_error(sb, "Attribute list buffer overflow. Read attribute list "</div><div class='del'>-			"is truncated.");</div><div class='del'>-err_out:</div><div class='del'>-	err = -EIO;</div><div class='del'>-	goto done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_external_attr_find - find an attribute in the attribute list of an inode</div><div class='del'>- * @type:	attribute type to find</div><div class='del'>- * @name:	attribute name to find (optional, i.e. NULL means don't care)</div><div class='del'>- * @name_len:	attribute name length (only needed if @name present)</div><div class='del'>- * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)</div><div class='del'>- * @lowest_vcn:	lowest vcn to find (optional, non-resident attributes only)</div><div class='del'>- * @val:	attribute value to find (optional, resident attributes only)</div><div class='del'>- * @val_len:	attribute value length</div><div class='del'>- * @ctx:	search context with mft record and attribute to search from</div><div class='del'>- *</div><div class='del'>- * You should not need to call this function directly.  Use ntfs_attr_lookup()</div><div class='del'>- * instead.</div><div class='del'>- *</div><div class='del'>- * Find an attribute by searching the attribute list for the corresponding</div><div class='del'>- * attribute list entry.  Having found the entry, map the mft record if the</div><div class='del'>- * attribute is in a different mft record/inode, ntfs_attr_find() the attribute</div><div class='del'>- * in there and return it.</div><div class='del'>- *</div><div class='del'>- * On first search @ctx-&gt;ntfs_ino must be the base mft record and @ctx must</div><div class='del'>- * have been obtained from a call to ntfs_attr_get_search_ctx().  On subsequent</div><div class='del'>- * calls @ctx-&gt;ntfs_ino can be any extent inode, too (@ctx-&gt;base_ntfs_ino is</div><div class='del'>- * then the base inode).</div><div class='del'>- *</div><div class='del'>- * After finishing with the attribute/mft record you need to call</div><div class='del'>- * ntfs_attr_put_search_ctx() to cleanup the search context (unmapping any</div><div class='del'>- * mapped inodes, etc).</div><div class='del'>- *</div><div class='del'>- * If the attribute is found, ntfs_external_attr_find() returns 0 and</div><div class='del'>- * @ctx-&gt;attr will point to the found attribute.  @ctx-&gt;mrec will point to the</div><div class='del'>- * mft record in which @ctx-&gt;attr is located and @ctx-&gt;al_entry will point to</div><div class='del'>- * the attribute list entry for the attribute.</div><div class='del'>- *</div><div class='del'>- * If the attribute is not found, ntfs_external_attr_find() returns -ENOENT and</div><div class='del'>- * @ctx-&gt;attr will point to the attribute in the base mft record before which</div><div class='del'>- * the attribute being searched for would need to be inserted if such an action</div><div class='del'>- * were to be desired.  @ctx-&gt;mrec will point to the mft record in which</div><div class='del'>- * @ctx-&gt;attr is located and @ctx-&gt;al_entry will point to the attribute list</div><div class='del'>- * entry of the attribute before which the attribute being searched for would</div><div class='del'>- * need to be inserted if such an action were to be desired.</div><div class='del'>- *</div><div class='del'>- * Thus to insert the not found attribute, one wants to add the attribute to</div><div class='del'>- * @ctx-&gt;mrec (the base mft record) and if there is not enough space, the</div><div class='del'>- * attribute should be placed in a newly allocated extent mft record.  The</div><div class='del'>- * attribute list entry for the inserted attribute should be inserted in the</div><div class='del'>- * attribute list attribute at @ctx-&gt;al_entry.</div><div class='del'>- *</div><div class='del'>- * On actual error, ntfs_external_attr_find() returns -EIO.  In this case</div><div class='del'>- * @ctx-&gt;attr is undefined and in particular do not rely on it not changing.</div><div class='del'>- */</div><div class='del'>-static int ntfs_external_attr_find(const ATTR_TYPE type,</div><div class='del'>-		const ntfschar *name, const u32 name_len,</div><div class='del'>-		const IGNORE_CASE_BOOL ic, const VCN lowest_vcn,</div><div class='del'>-		const u8 *val, const u32 val_len, ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *base_ni, *ni;</div><div class='del'>-	ntfs_volume *vol;</div><div class='del'>-	ATTR_LIST_ENTRY *al_entry, *next_al_entry;</div><div class='del'>-	u8 *al_start, *al_end;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfschar *al_name;</div><div class='del'>-	u32 al_name_len;</div><div class='del'>-	int err = 0;</div><div class='del'>-	static const char *es = " Unmount and run chkdsk.";</div><div class='del'>-</div><div class='del'>-	ni = ctx-&gt;ntfs_ino;</div><div class='del'>-	base_ni = ctx-&gt;base_ntfs_ino;</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx, type 0x%x.", ni-&gt;mft_no, type);</div><div class='del'>-	if (!base_ni) {</div><div class='del'>-		/* First call happens with the base mft record. */</div><div class='del'>-		base_ni = ctx-&gt;base_ntfs_ino = ctx-&gt;ntfs_ino;</div><div class='del'>-		ctx-&gt;base_mrec = ctx-&gt;mrec;</div><div class='del'>-	}</div><div class='del'>-	if (ni == base_ni)</div><div class='del'>-		ctx-&gt;base_attr = ctx-&gt;attr;</div><div class='del'>-	if (type == AT_END)</div><div class='del'>-		goto not_found;</div><div class='del'>-	vol = base_ni-&gt;vol;</div><div class='del'>-	al_start = base_ni-&gt;attr_list;</div><div class='del'>-	al_end = al_start + base_ni-&gt;attr_list_size;</div><div class='del'>-	if (!ctx-&gt;al_entry)</div><div class='del'>-		ctx-&gt;al_entry = (ATTR_LIST_ENTRY*)al_start;</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate over entries in attribute list starting at @ctx-&gt;al_entry,</div><div class='del'>-	 * or the entry following that, if @ctx-&gt;is_first is 'true'.</div><div class='del'>-	 */</div><div class='del'>-	if (ctx-&gt;is_first) {</div><div class='del'>-		al_entry = ctx-&gt;al_entry;</div><div class='del'>-		ctx-&gt;is_first = false;</div><div class='del'>-	} else</div><div class='del'>-		al_entry = (ATTR_LIST_ENTRY*)((u8*)ctx-&gt;al_entry +</div><div class='del'>-				le16_to_cpu(ctx-&gt;al_entry-&gt;length));</div><div class='del'>-	for (;; al_entry = next_al_entry) {</div><div class='del'>-		/* Out of bounds check. */</div><div class='del'>-		if ((u8*)al_entry &lt; base_ni-&gt;attr_list ||</div><div class='del'>-				(u8*)al_entry &gt; al_end)</div><div class='del'>-			break;	/* Inode is corrupt. */</div><div class='del'>-		ctx-&gt;al_entry = al_entry;</div><div class='del'>-		/* Catch the end of the attribute list. */</div><div class='del'>-		if ((u8*)al_entry == al_end)</div><div class='del'>-			goto not_found;</div><div class='del'>-		if (!al_entry-&gt;length)</div><div class='del'>-			break;</div><div class='del'>-		if ((u8*)al_entry + 6 &gt; al_end || (u8*)al_entry +</div><div class='del'>-				le16_to_cpu(al_entry-&gt;length) &gt; al_end)</div><div class='del'>-			break;</div><div class='del'>-		next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry +</div><div class='del'>-				le16_to_cpu(al_entry-&gt;length));</div><div class='del'>-		if (le32_to_cpu(al_entry-&gt;type) &gt; le32_to_cpu(type))</div><div class='del'>-			goto not_found;</div><div class='del'>-		if (type != al_entry-&gt;type)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * If @name is present, compare the two names.  If @name is</div><div class='del'>-		 * missing, assume we want an unnamed attribute.</div><div class='del'>-		 */</div><div class='del'>-		al_name_len = al_entry-&gt;name_length;</div><div class='del'>-		al_name = (ntfschar*)((u8*)al_entry + al_entry-&gt;name_offset);</div><div class='del'>-		if (!name) {</div><div class='del'>-			if (al_name_len)</div><div class='del'>-				goto not_found;</div><div class='del'>-		} else if (!ntfs_are_names_equal(al_name, al_name_len, name,</div><div class='del'>-				name_len, ic, vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-			register int rc;</div><div class='del'>-</div><div class='del'>-			rc = ntfs_collate_names(name, name_len, al_name,</div><div class='del'>-					al_name_len, 1, IGNORE_CASE,</div><div class='del'>-					vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-			/*</div><div class='del'>-			 * If @name collates before al_name, there is no</div><div class='del'>-			 * matching attribute.</div><div class='del'>-			 */</div><div class='del'>-			if (rc == -1)</div><div class='del'>-				goto not_found;</div><div class='del'>-			/* If the strings are not equal, continue search. */</div><div class='del'>-			if (rc)</div><div class='del'>-				continue;</div><div class='del'>-			/*</div><div class='del'>-			 * FIXME: Reverse engineering showed 0, IGNORE_CASE but</div><div class='del'>-			 * that is inconsistent with ntfs_attr_find().  The</div><div class='del'>-			 * subsequent rc checks were also different.  Perhaps I</div><div class='del'>-			 * made a mistake in one of the two.  Need to recheck</div><div class='del'>-			 * which is correct or at least see what is going on...</div><div class='del'>-			 * (AIA)</div><div class='del'>-			 */</div><div class='del'>-			rc = ntfs_collate_names(name, name_len, al_name,</div><div class='del'>-					al_name_len, 1, CASE_SENSITIVE,</div><div class='del'>-					vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-			if (rc == -1)</div><div class='del'>-				goto not_found;</div><div class='del'>-			if (rc)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The names match or @name not present and attribute is</div><div class='del'>-		 * unnamed.  Now check @lowest_vcn.  Continue search if the</div><div class='del'>-		 * next attribute list entry still fits @lowest_vcn.  Otherwise</div><div class='del'>-		 * we have reached the right one or the search has failed.</div><div class='del'>-		 */</div><div class='del'>-		if (lowest_vcn &amp;&amp; (u8*)next_al_entry &gt;= al_start	    &amp;&amp;</div><div class='del'>-				(u8*)next_al_entry + 6 &lt; al_end		    &amp;&amp;</div><div class='del'>-				(u8*)next_al_entry + le16_to_cpu(</div><div class='del'>-					next_al_entry-&gt;length) &lt;= al_end    &amp;&amp;</div><div class='del'>-				sle64_to_cpu(next_al_entry-&gt;lowest_vcn) &lt;=</div><div class='del'>-					lowest_vcn			    &amp;&amp;</div><div class='del'>-				next_al_entry-&gt;type == al_entry-&gt;type	    &amp;&amp;</div><div class='del'>-				next_al_entry-&gt;name_length == al_name_len   &amp;&amp;</div><div class='del'>-				ntfs_are_names_equal((ntfschar*)((u8*)</div><div class='del'>-					next_al_entry +</div><div class='del'>-					next_al_entry-&gt;name_offset),</div><div class='del'>-					next_al_entry-&gt;name_length,</div><div class='del'>-					al_name, al_name_len, CASE_SENSITIVE,</div><div class='del'>-					vol-&gt;upcase, vol-&gt;upcase_len))</div><div class='del'>-			continue;</div><div class='del'>-		if (MREF_LE(al_entry-&gt;mft_reference) == ni-&gt;mft_no) {</div><div class='del'>-			if (MSEQNO_LE(al_entry-&gt;mft_reference) != ni-&gt;seq_no) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Found stale mft "</div><div class='del'>-						"reference in attribute list "</div><div class='del'>-						"of base inode 0x%lx.%s",</div><div class='del'>-						base_ni-&gt;mft_no, es);</div><div class='del'>-				err = -EIO;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else { /* Mft references do not match. */</div><div class='del'>-			/* If there is a mapped record unmap it first. */</div><div class='del'>-			if (ni != base_ni)</div><div class='del'>-				unmap_extent_mft_record(ni);</div><div class='del'>-			/* Do we want the base record back? */</div><div class='del'>-			if (MREF_LE(al_entry-&gt;mft_reference) ==</div><div class='del'>-					base_ni-&gt;mft_no) {</div><div class='del'>-				ni = ctx-&gt;ntfs_ino = base_ni;</div><div class='del'>-				ctx-&gt;mrec = ctx-&gt;base_mrec;</div><div class='del'>-			} else {</div><div class='del'>-				/* We want an extent record. */</div><div class='del'>-				ctx-&gt;mrec = map_extent_mft_record(base_ni,</div><div class='del'>-						le64_to_cpu(</div><div class='del'>-						al_entry-&gt;mft_reference), &amp;ni);</div><div class='del'>-				if (IS_ERR(ctx-&gt;mrec)) {</div><div class='del'>-					ntfs_error(vol-&gt;sb, "Failed to map "</div><div class='del'>-							"extent mft record "</div><div class='del'>-							"0x%lx of base inode "</div><div class='del'>-							"0x%lx.%s",</div><div class='del'>-							MREF_LE(al_entry-&gt;</div><div class='del'>-							mft_reference),</div><div class='del'>-							base_ni-&gt;mft_no, es);</div><div class='del'>-					err = PTR_ERR(ctx-&gt;mrec);</div><div class='del'>-					if (err == -ENOENT)</div><div class='del'>-						err = -EIO;</div><div class='del'>-					/* Cause @ctx to be sanitized below. */</div><div class='del'>-					ni = NULL;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				ctx-&gt;ntfs_ino = ni;</div><div class='del'>-			}</div><div class='del'>-			ctx-&gt;attr = (ATTR_RECORD*)((u8*)ctx-&gt;mrec +</div><div class='del'>-					le16_to_cpu(ctx-&gt;mrec-&gt;attrs_offset));</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * ctx-&gt;vfs_ino, ctx-&gt;mrec, and ctx-&gt;attr now point to the</div><div class='del'>-		 * mft record containing the attribute represented by the</div><div class='del'>-		 * current al_entry.</div><div class='del'>-		 */</div><div class='del'>-		/*</div><div class='del'>-		 * We could call into ntfs_attr_find() to find the right</div><div class='del'>-		 * attribute in this mft record but this would be less</div><div class='del'>-		 * efficient and not quite accurate as ntfs_attr_find() ignores</div><div class='del'>-		 * the attribute instance numbers for example which become</div><div class='del'>-		 * important when one plays with attribute lists.  Also,</div><div class='del'>-		 * because a proper match has been found in the attribute list</div><div class='del'>-		 * entry above, the comparison can now be optimized.  So it is</div><div class='del'>-		 * worth re-implementing a simplified ntfs_attr_find() here.</div><div class='del'>-		 */</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		/*</div><div class='del'>-		 * Use a manual loop so we can still use break and continue</div><div class='del'>-		 * with the same meanings as above.</div><div class='del'>-		 */</div><div class='del'>-do_next_attr_loop:</div><div class='del'>-		if ((u8*)a &lt; (u8*)ctx-&gt;mrec || (u8*)a &gt; (u8*)ctx-&gt;mrec +</div><div class='del'>-				le32_to_cpu(ctx-&gt;mrec-&gt;bytes_allocated))</div><div class='del'>-			break;</div><div class='del'>-		if (a-&gt;type == AT_END)</div><div class='del'>-			break;</div><div class='del'>-		if (!a-&gt;length)</div><div class='del'>-			break;</div><div class='del'>-		if (al_entry-&gt;instance != a-&gt;instance)</div><div class='del'>-			goto do_next_attr;</div><div class='del'>-		/*</div><div class='del'>-		 * If the type and/or the name are mismatched between the</div><div class='del'>-		 * attribute list entry and the attribute record, there is</div><div class='del'>-		 * corruption so we break and return error EIO.</div><div class='del'>-		 */</div><div class='del'>-		if (al_entry-&gt;type != a-&gt;type)</div><div class='del'>-			break;</div><div class='del'>-		if (!ntfs_are_names_equal((ntfschar*)((u8*)a +</div><div class='del'>-				le16_to_cpu(a-&gt;name_offset)), a-&gt;name_length,</div><div class='del'>-				al_name, al_name_len, CASE_SENSITIVE,</div><div class='del'>-				vol-&gt;upcase, vol-&gt;upcase_len))</div><div class='del'>-			break;</div><div class='del'>-		ctx-&gt;attr = a;</div><div class='del'>-		/*</div><div class='del'>-		 * If no @val specified or @val specified and it matches, we</div><div class='del'>-		 * have found it!</div><div class='del'>-		 */</div><div class='del'>-		if (!val || (!a-&gt;non_resident &amp;&amp; le32_to_cpu(</div><div class='del'>-				a-&gt;data.resident.value_length) == val_len &amp;&amp;</div><div class='del'>-				!memcmp((u8*)a +</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset),</div><div class='del'>-				val, val_len))) {</div><div class='del'>-			ntfs_debug("Done, found.");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-do_next_attr:</div><div class='del'>-		/* Proceed to the next attribute in the current mft record. */</div><div class='del'>-		a = (ATTR_RECORD*)((u8*)a + le32_to_cpu(a-&gt;length));</div><div class='del'>-		goto do_next_attr_loop;</div><div class='del'>-	}</div><div class='del'>-	if (!err) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Base inode 0x%lx contains corrupt "</div><div class='del'>-				"attribute list attribute.%s", base_ni-&gt;mft_no,</div><div class='del'>-				es);</div><div class='del'>-		err = -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (ni != base_ni) {</div><div class='del'>-		if (ni)</div><div class='del'>-			unmap_extent_mft_record(ni);</div><div class='del'>-		ctx-&gt;ntfs_ino = base_ni;</div><div class='del'>-		ctx-&gt;mrec = ctx-&gt;base_mrec;</div><div class='del'>-		ctx-&gt;attr = ctx-&gt;base_attr;</div><div class='del'>-	}</div><div class='del'>-	if (err != -ENOMEM)</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	return err;</div><div class='del'>-not_found:</div><div class='del'>-	/*</div><div class='del'>-	 * If we were looking for AT_END, we reset the search context @ctx and</div><div class='del'>-	 * use ntfs_attr_find() to seek to the end of the base mft record.</div><div class='del'>-	 */</div><div class='del'>-	if (type == AT_END) {</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		return ntfs_attr_find(AT_END, name, name_len, ic, val, val_len,</div><div class='del'>-				ctx);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The attribute was not found.  Before we return, we want to ensure</div><div class='del'>-	 * @ctx-&gt;mrec and @ctx-&gt;attr indicate the position at which the</div><div class='del'>-	 * attribute should be inserted in the base mft record.  Since we also</div><div class='del'>-	 * want to preserve @ctx-&gt;al_entry we cannot reinitialize the search</div><div class='del'>-	 * context using ntfs_attr_reinit_search_ctx() as this would set</div><div class='del'>-	 * @ctx-&gt;al_entry to NULL.  Thus we do the necessary bits manually (see</div><div class='del'>-	 * ntfs_attr_init_search_ctx() below).  Note, we _only_ preserve</div><div class='del'>-	 * @ctx-&gt;al_entry as the remaining fields (base_*) are identical to</div><div class='del'>-	 * their non base_ counterparts and we cannot set @ctx-&gt;base_attr</div><div class='del'>-	 * correctly yet as we do not know what @ctx-&gt;attr will be set to by</div><div class='del'>-	 * the call to ntfs_attr_find() below.</div><div class='del'>-	 */</div><div class='del'>-	if (ni != base_ni)</div><div class='del'>-		unmap_extent_mft_record(ni);</div><div class='del'>-	ctx-&gt;mrec = ctx-&gt;base_mrec;</div><div class='del'>-	ctx-&gt;attr = (ATTR_RECORD*)((u8*)ctx-&gt;mrec +</div><div class='del'>-			le16_to_cpu(ctx-&gt;mrec-&gt;attrs_offset));</div><div class='del'>-	ctx-&gt;is_first = true;</div><div class='del'>-	ctx-&gt;ntfs_ino = base_ni;</div><div class='del'>-	ctx-&gt;base_ntfs_ino = NULL;</div><div class='del'>-	ctx-&gt;base_mrec = NULL;</div><div class='del'>-	ctx-&gt;base_attr = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * In case there are multiple matches in the base mft record, need to</div><div class='del'>-	 * keep enumerating until we get an attribute not found response (or</div><div class='del'>-	 * another error), otherwise we would keep returning the same attribute</div><div class='del'>-	 * over and over again and all programs using us for enumeration would</div><div class='del'>-	 * lock up in a tight loop.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		err = ntfs_attr_find(type, name, name_len, ic, val, val_len,</div><div class='del'>-				ctx);</div><div class='del'>-	} while (!err);</div><div class='del'>-	ntfs_debug("Done, not found.");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_lookup - find an attribute in an ntfs inode</div><div class='del'>- * @type:	attribute type to find</div><div class='del'>- * @name:	attribute name to find (optional, i.e. NULL means don't care)</div><div class='del'>- * @name_len:	attribute name length (only needed if @name present)</div><div class='del'>- * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)</div><div class='del'>- * @lowest_vcn:	lowest vcn to find (optional, non-resident attributes only)</div><div class='del'>- * @val:	attribute value to find (optional, resident attributes only)</div><div class='del'>- * @val_len:	attribute value length</div><div class='del'>- * @ctx:	search context with mft record and attribute to search from</div><div class='del'>- *</div><div class='del'>- * Find an attribute in an ntfs inode.  On first search @ctx-&gt;ntfs_ino must</div><div class='del'>- * be the base mft record and @ctx must have been obtained from a call to</div><div class='del'>- * ntfs_attr_get_search_ctx().</div><div class='del'>- *</div><div class='del'>- * This function transparently handles attribute lists and @ctx is used to</div><div class='del'>- * continue searches where they were left off at.</div><div class='del'>- *</div><div class='del'>- * After finishing with the attribute/mft record you need to call</div><div class='del'>- * ntfs_attr_put_search_ctx() to cleanup the search context (unmapping any</div><div class='del'>- * mapped inodes, etc).</div><div class='del'>- *</div><div class='del'>- * Return 0 if the search was successful and -errno if not.</div><div class='del'>- *</div><div class='del'>- * When 0, @ctx-&gt;attr is the found attribute and it is in mft record</div><div class='del'>- * @ctx-&gt;mrec.  If an attribute list attribute is present, @ctx-&gt;al_entry is</div><div class='del'>- * the attribute list entry of the found attribute.</div><div class='del'>- *</div><div class='del'>- * When -ENOENT, @ctx-&gt;attr is the attribute which collates just after the</div><div class='del'>- * attribute being searched for, i.e. if one wants to add the attribute to the</div><div class='del'>- * mft record this is the correct place to insert it into.  If an attribute</div><div class='del'>- * list attribute is present, @ctx-&gt;al_entry is the attribute list entry which</div><div class='del'>- * collates just after the attribute list entry of the attribute being searched</div><div class='del'>- * for, i.e. if one wants to add the attribute to the mft record this is the</div><div class='del'>- * correct place to insert its attribute list entry into.</div><div class='del'>- *</div><div class='del'>- * When -errno != -ENOENT, an error occurred during the lookup.  @ctx-&gt;attr is</div><div class='del'>- * then undefined and in particular you should not rely on it not changing.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_lookup(const ATTR_TYPE type, const ntfschar *name,</div><div class='del'>-		const u32 name_len, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const VCN lowest_vcn, const u8 *val, const u32 val_len,</div><div class='del'>-		ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	BUG_ON(IS_ERR(ctx-&gt;mrec));</div><div class='del'>-	if (ctx-&gt;base_ntfs_ino)</div><div class='del'>-		base_ni = ctx-&gt;base_ntfs_ino;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ctx-&gt;ntfs_ino;</div><div class='del'>-	/* Sanity check, just for debugging really. */</div><div class='del'>-	BUG_ON(!base_ni);</div><div class='del'>-	if (!NInoAttrList(base_ni) || type == AT_ATTRIBUTE_LIST)</div><div class='del'>-		return ntfs_attr_find(type, name, name_len, ic, val, val_len,</div><div class='del'>-				ctx);</div><div class='del'>-	return ntfs_external_attr_find(type, name, name_len, ic, lowest_vcn,</div><div class='del'>-			val, val_len, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_init_search_ctx - initialize an attribute search context</div><div class='del'>- * @ctx:	attribute search context to initialize</div><div class='del'>- * @ni:		ntfs inode with which to initialize the search context</div><div class='del'>- * @mrec:	mft record with which to initialize the search context</div><div class='del'>- *</div><div class='del'>- * Initialize the attribute search context @ctx with @ni and @mrec.</div><div class='del'>- */</div><div class='del'>-static inline void ntfs_attr_init_search_ctx(ntfs_attr_search_ctx *ctx,</div><div class='del'>-		ntfs_inode *ni, MFT_RECORD *mrec)</div><div class='del'>-{</div><div class='del'>-	*ctx = (ntfs_attr_search_ctx) {</div><div class='del'>-		.mrec = mrec,</div><div class='del'>-		/* Sanity checks are performed elsewhere. */</div><div class='del'>-		.attr = (ATTR_RECORD*)((u8*)mrec +</div><div class='del'>-				le16_to_cpu(mrec-&gt;attrs_offset)),</div><div class='del'>-		.is_first = true,</div><div class='del'>-		.ntfs_ino = ni,</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_reinit_search_ctx - reinitialize an attribute search context</div><div class='del'>- * @ctx:	attribute search context to reinitialize</div><div class='del'>- *</div><div class='del'>- * Reinitialize the attribute search context @ctx, unmapping an associated</div><div class='del'>- * extent mft record if present, and initialize the search context again.</div><div class='del'>- *</div><div class='del'>- * This is used when a search for a new attribute is being started to reset</div><div class='del'>- * the search context to the beginning.</div><div class='del'>- */</div><div class='del'>-void ntfs_attr_reinit_search_ctx(ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	if (likely(!ctx-&gt;base_ntfs_ino)) {</div><div class='del'>-		/* No attribute list. */</div><div class='del'>-		ctx-&gt;is_first = true;</div><div class='del'>-		/* Sanity checks are performed elsewhere. */</div><div class='del'>-		ctx-&gt;attr = (ATTR_RECORD*)((u8*)ctx-&gt;mrec +</div><div class='del'>-				le16_to_cpu(ctx-&gt;mrec-&gt;attrs_offset));</div><div class='del'>-		/*</div><div class='del'>-		 * This needs resetting due to ntfs_external_attr_find() which</div><div class='del'>-		 * can leave it set despite having zeroed ctx-&gt;base_ntfs_ino.</div><div class='del'>-		 */</div><div class='del'>-		ctx-&gt;al_entry = NULL;</div><div class='del'>-		return;</div><div class='del'>-	} /* Attribute list. */</div><div class='del'>-	if (ctx-&gt;ntfs_ino != ctx-&gt;base_ntfs_ino)</div><div class='del'>-		unmap_extent_mft_record(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_init_search_ctx(ctx, ctx-&gt;base_ntfs_ino, ctx-&gt;base_mrec);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_get_search_ctx - allocate/initialize a new attribute search context</div><div class='del'>- * @ni:		ntfs inode with which to initialize the search context</div><div class='del'>- * @mrec:	mft record with which to initialize the search context</div><div class='del'>- *</div><div class='del'>- * Allocate a new attribute search context, initialize it with @ni and @mrec,</div><div class='del'>- * and return it. Return NULL if allocation failed.</div><div class='del'>- */</div><div class='del'>-ntfs_attr_search_ctx *ntfs_attr_get_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)</div><div class='del'>-{</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-</div><div class='del'>-	ctx = kmem_cache_alloc(ntfs_attr_ctx_cache, GFP_NOFS);</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_init_search_ctx(ctx, ni, mrec);</div><div class='del'>-	return ctx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_put_search_ctx - release an attribute search context</div><div class='del'>- * @ctx:	attribute search context to free</div><div class='del'>- *</div><div class='del'>- * Release the attribute search context @ctx, unmapping an associated extent</div><div class='del'>- * mft record if present.</div><div class='del'>- */</div><div class='del'>-void ntfs_attr_put_search_ctx(ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	if (ctx-&gt;base_ntfs_ino &amp;&amp; ctx-&gt;ntfs_ino != ctx-&gt;base_ntfs_ino)</div><div class='del'>-		unmap_extent_mft_record(ctx-&gt;ntfs_ino);</div><div class='del'>-	kmem_cache_free(ntfs_attr_ctx_cache, ctx);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_find_in_attrdef - find an attribute in the $AttrDef system file</div><div class='del'>- * @vol:	ntfs volume to which the attribute belongs</div><div class='del'>- * @type:	attribute type which to find</div><div class='del'>- *</div><div class='del'>- * Search for the attribute definition record corresponding to the attribute</div><div class='del'>- * @type in the $AttrDef system file.</div><div class='del'>- *</div><div class='del'>- * Return the attribute type definition record if found and NULL if not found.</div><div class='del'>- */</div><div class='del'>-static ATTR_DEF *ntfs_attr_find_in_attrdef(const ntfs_volume *vol,</div><div class='del'>-		const ATTR_TYPE type)</div><div class='del'>-{</div><div class='del'>-	ATTR_DEF *ad;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!vol-&gt;attrdef);</div><div class='del'>-	BUG_ON(!type);</div><div class='del'>-	for (ad = vol-&gt;attrdef; (u8*)ad - (u8*)vol-&gt;attrdef &lt;</div><div class='del'>-			vol-&gt;attrdef_size &amp;&amp; ad-&gt;type; ++ad) {</div><div class='del'>-		/* We have not found it yet, carry on searching. */</div><div class='del'>-		if (likely(le32_to_cpu(ad-&gt;type) &lt; le32_to_cpu(type)))</div><div class='del'>-			continue;</div><div class='del'>-		/* We found the attribute; return it. */</div><div class='del'>-		if (likely(ad-&gt;type == type))</div><div class='del'>-			return ad;</div><div class='del'>-		/* We have gone too far already.  No point in continuing. */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* Attribute not found. */</div><div class='del'>-	ntfs_debug("Attribute type 0x%x not found in $AttrDef.",</div><div class='del'>-			le32_to_cpu(type));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_size_bounds_check - check a size of an attribute type for validity</div><div class='del'>- * @vol:	ntfs volume to which the attribute belongs</div><div class='del'>- * @type:	attribute type which to check</div><div class='del'>- * @size:	size which to check</div><div class='del'>- *</div><div class='del'>- * Check whether the @size in bytes is valid for an attribute of @type on the</div><div class='del'>- * ntfs volume @vol.  This information is obtained from $AttrDef system file.</div><div class='del'>- *</div><div class='del'>- * Return 0 if valid, -ERANGE if not valid, or -ENOENT if the attribute is not</div><div class='del'>- * listed in $AttrDef.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_size_bounds_check(const ntfs_volume *vol, const ATTR_TYPE type,</div><div class='del'>-		const s64 size)</div><div class='del'>-{</div><div class='del'>-	ATTR_DEF *ad;</div><div class='del'>-</div><div class='del'>-	BUG_ON(size &lt; 0);</div><div class='del'>-	/*</div><div class='del'>-	 * $ATTRIBUTE_LIST has a maximum size of 256kiB, but this is not</div><div class='del'>-	 * listed in $AttrDef.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(type == AT_ATTRIBUTE_LIST &amp;&amp; size &gt; 256 * 1024))</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	/* Get the $AttrDef entry for the attribute @type. */</div><div class='del'>-	ad = ntfs_attr_find_in_attrdef(vol, type);</div><div class='del'>-	if (unlikely(!ad))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	/* Do the bounds check. */</div><div class='del'>-	if (((sle64_to_cpu(ad-&gt;min_size) &gt; 0) &amp;&amp;</div><div class='del'>-			size &lt; sle64_to_cpu(ad-&gt;min_size)) ||</div><div class='del'>-			((sle64_to_cpu(ad-&gt;max_size) &gt; 0) &amp;&amp; size &gt;</div><div class='del'>-			sle64_to_cpu(ad-&gt;max_size)))</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_can_be_non_resident - check if an attribute can be non-resident</div><div class='del'>- * @vol:	ntfs volume to which the attribute belongs</div><div class='del'>- * @type:	attribute type which to check</div><div class='del'>- *</div><div class='del'>- * Check whether the attribute of @type on the ntfs volume @vol is allowed to</div><div class='del'>- * be non-resident.  This information is obtained from $AttrDef system file.</div><div class='del'>- *</div><div class='del'>- * Return 0 if the attribute is allowed to be non-resident, -EPERM if not, and</div><div class='del'>- * -ENOENT if the attribute is not listed in $AttrDef.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_can_be_non_resident(const ntfs_volume *vol, const ATTR_TYPE type)</div><div class='del'>-{</div><div class='del'>-	ATTR_DEF *ad;</div><div class='del'>-</div><div class='del'>-	/* Find the attribute definition record in $AttrDef. */</div><div class='del'>-	ad = ntfs_attr_find_in_attrdef(vol, type);</div><div class='del'>-	if (unlikely(!ad))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	/* Check the flags and return the result. */</div><div class='del'>-	if (ad-&gt;flags &amp; ATTR_DEF_RESIDENT)</div><div class='del'>-		return -EPERM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_can_be_resident - check if an attribute can be resident</div><div class='del'>- * @vol:	ntfs volume to which the attribute belongs</div><div class='del'>- * @type:	attribute type which to check</div><div class='del'>- *</div><div class='del'>- * Check whether the attribute of @type on the ntfs volume @vol is allowed to</div><div class='del'>- * be resident.  This information is derived from our ntfs knowledge and may</div><div class='del'>- * not be completely accurate, especially when user defined attributes are</div><div class='del'>- * present.  Basically we allow everything to be resident except for index</div><div class='del'>- * allocation and $EA attributes.</div><div class='del'>- *</div><div class='del'>- * Return 0 if the attribute is allowed to be non-resident and -EPERM if not.</div><div class='del'>- *</div><div class='del'>- * Warning: In the system file $MFT the attribute $Bitmap must be non-resident</div><div class='del'>- *	    otherwise windows will not boot (blue screen of death)!  We cannot</div><div class='del'>- *	    check for this here as we do not know which inode's $Bitmap is</div><div class='del'>- *	    being asked about so the caller needs to special case this.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_can_be_resident(const ntfs_volume *vol, const ATTR_TYPE type)</div><div class='del'>-{</div><div class='del'>-	if (type == AT_INDEX_ALLOCATION)</div><div class='del'>-		return -EPERM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_record_resize - resize an attribute record</div><div class='del'>- * @m:		mft record containing attribute record</div><div class='del'>- * @a:		attribute record to resize</div><div class='del'>- * @new_size:	new size in bytes to which to resize the attribute record @a</div><div class='del'>- *</div><div class='del'>- * Resize the attribute record @a, i.e. the resident part of the attribute, in</div><div class='del'>- * the mft record @m to @new_size bytes.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  The following error codes are</div><div class='del'>- * defined:</div><div class='del'>- *	-ENOSPC	- Not enough space in the mft record @m to perform the resize.</div><div class='del'>- *</div><div class='del'>- * Note: On error, no modifications have been performed whatsoever.</div><div class='del'>- *</div><div class='del'>- * Warning: If you make a record smaller without having copied all the data you</div><div class='del'>- *	    are interested in the data may be overwritten.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_record_resize(MFT_RECORD *m, ATTR_RECORD *a, u32 new_size)</div><div class='del'>-{</div><div class='del'>-	ntfs_debug("Entering for new_size %u.", new_size);</div><div class='del'>-	/* Align to 8 bytes if it is not already done. */</div><div class='del'>-	if (new_size &amp; 7)</div><div class='del'>-		new_size = (new_size + 7) &amp; ~7;</div><div class='del'>-	/* If the actual attribute length has changed, move things around. */</div><div class='del'>-	if (new_size != le32_to_cpu(a-&gt;length)) {</div><div class='del'>-		u32 new_muse = le32_to_cpu(m-&gt;bytes_in_use) -</div><div class='del'>-				le32_to_cpu(a-&gt;length) + new_size;</div><div class='del'>-		/* Not enough space in this mft record. */</div><div class='del'>-		if (new_muse &gt; le32_to_cpu(m-&gt;bytes_allocated))</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-		/* Move attributes following @a to their new location. */</div><div class='del'>-		memmove((u8*)a + new_size, (u8*)a + le32_to_cpu(a-&gt;length),</div><div class='del'>-				le32_to_cpu(m-&gt;bytes_in_use) - ((u8*)a -</div><div class='del'>-				(u8*)m) - le32_to_cpu(a-&gt;length));</div><div class='del'>-		/* Adjust @m to reflect the change in used space. */</div><div class='del'>-		m-&gt;bytes_in_use = cpu_to_le32(new_muse);</div><div class='del'>-		/* Adjust @a to reflect the new size. */</div><div class='del'>-		if (new_size &gt;= offsetof(ATTR_REC, length) + sizeof(a-&gt;length))</div><div class='del'>-			a-&gt;length = cpu_to_le32(new_size);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_resident_attr_value_resize - resize the value of a resident attribute</div><div class='del'>- * @m:		mft record containing attribute record</div><div class='del'>- * @a:		attribute record whose value to resize</div><div class='del'>- * @new_size:	new size in bytes to which to resize the attribute value of @a</div><div class='del'>- *</div><div class='del'>- * Resize the value of the attribute @a in the mft record @m to @new_size bytes.</div><div class='del'>- * If the value is made bigger, the newly allocated space is cleared.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  The following error codes are</div><div class='del'>- * defined:</div><div class='del'>- *	-ENOSPC	- Not enough space in the mft record @m to perform the resize.</div><div class='del'>- *</div><div class='del'>- * Note: On error, no modifications have been performed whatsoever.</div><div class='del'>- *</div><div class='del'>- * Warning: If you make a record smaller without having copied all the data you</div><div class='del'>- *	    are interested in the data may be overwritten.</div><div class='del'>- */</div><div class='del'>-int ntfs_resident_attr_value_resize(MFT_RECORD *m, ATTR_RECORD *a,</div><div class='del'>-		const u32 new_size)</div><div class='del'>-{</div><div class='del'>-	u32 old_size;</div><div class='del'>-</div><div class='del'>-	/* Resize the resident part of the attribute record. */</div><div class='del'>-	if (ntfs_attr_record_resize(m, a,</div><div class='del'>-			le16_to_cpu(a-&gt;data.resident.value_offset) + new_size))</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	/*</div><div class='del'>-	 * The resize succeeded!  If we made the attribute value bigger, clear</div><div class='del'>-	 * the area between the old size and @new_size.</div><div class='del'>-	 */</div><div class='del'>-	old_size = le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	if (new_size &gt; old_size)</div><div class='del'>-		memset((u8*)a + le16_to_cpu(a-&gt;data.resident.value_offset) +</div><div class='del'>-				old_size, 0, new_size - old_size);</div><div class='del'>-	/* Finally update the length of the attribute value. */</div><div class='del'>-	a-&gt;data.resident.value_length = cpu_to_le32(new_size);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_make_non_resident - convert a resident to a non-resident attribute</div><div class='del'>- * @ni:		ntfs inode describing the attribute to convert</div><div class='del'>- * @data_size:	size of the resident data to copy to the non-resident attribute</div><div class='del'>- *</div><div class='del'>- * Convert the resident ntfs attribute described by the ntfs inode @ni to a</div><div class='del'>- * non-resident one.</div><div class='del'>- *</div><div class='del'>- * @data_size must be equal to the attribute value size.  This is needed since</div><div class='del'>- * we need to know the size before we can map the mft record and our callers</div><div class='del'>- * always know it.  The reason we cannot simply read the size from the vfs</div><div class='del'>- * inode i_size is that this is not necessarily uptodate.  This happens when</div><div class='del'>- * ntfs_attr_make_non_resident() is called in the -&gt;truncate call path(s).</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  The following error return codes</div><div class='del'>- * are defined:</div><div class='del'>- *	-EPERM	- The attribute is not allowed to be non-resident.</div><div class='del'>- *	-ENOMEM	- Not enough memory.</div><div class='del'>- *	-ENOSPC	- Not enough disk space.</div><div class='del'>- *	-EINVAL	- Attribute not defined on the volume.</div><div class='del'>- *	-EIO	- I/o error or other error.</div><div class='del'>- * Note that -ENOSPC is also returned in the case that there is not enough</div><div class='del'>- * space in the mft record to do the conversion.  This can happen when the mft</div><div class='del'>- * record is already very full.  The caller is responsible for trying to make</div><div class='del'>- * space in the mft record and trying again.  FIXME: Do we need a separate</div><div class='del'>- * error return code for this kind of -ENOSPC or is it always worth trying</div><div class='del'>- * again in case the attribute may then fit in a resident state so no need to</div><div class='del'>- * make it non-resident at all?  Ho-hum...  (AIA)</div><div class='del'>- *</div><div class='del'>- * NOTE to self: No changes in the attribute list are required to move from</div><div class='del'>- *		 a resident to a non-resident attribute.</div><div class='del'>- *</div><div class='del'>- * Locking: - The caller must hold i_mutex on the inode.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)</div><div class='del'>-{</div><div class='del'>-	s64 new_size;</div><div class='del'>-	struct inode *vi = VFS_I(ni);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	struct page *page;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	u8 *kaddr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int mp_size, mp_ofs, name_ofs, arec_size, err, err2;</div><div class='del'>-	u32 attr_size;</div><div class='del'>-	u8 old_res_attr_flags;</div><div class='del'>-</div><div class='del'>-	/* Check that the attribute is allowed to be non-resident. */</div><div class='del'>-	err = ntfs_attr_can_be_non_resident(vol, ni-&gt;type);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -EPERM)</div><div class='del'>-			ntfs_debug("Attribute is not allowed to be "</div><div class='del'>-					"non-resident.");</div><div class='del'>-		else</div><div class='del'>-			ntfs_debug("Attribute not defined on the NTFS "</div><div class='del'>-					"volume!");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Compressed and encrypted attributes are not supported when</div><div class='del'>-	 * writing and we should never have gotten here for them.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(NInoCompressed(ni));</div><div class='del'>-	BUG_ON(NInoEncrypted(ni));</div><div class='del'>-	/*</div><div class='del'>-	 * The size needs to be aligned to a cluster boundary for allocation</div><div class='del'>-	 * purposes.</div><div class='del'>-	 */</div><div class='del'>-	new_size = (data_size + vol-&gt;cluster_size - 1) &amp;</div><div class='del'>-			~(vol-&gt;cluster_size - 1);</div><div class='del'>-	if (new_size &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Will need the page later and since the page lock nests</div><div class='del'>-		 * outside all ntfs locks, we need to get the page now.</div><div class='del'>-		 */</div><div class='del'>-		page = find_or_create_page(vi-&gt;i_mapping, 0,</div><div class='del'>-				mapping_gfp_mask(vi-&gt;i_mapping));</div><div class='del'>-		if (unlikely(!page))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		/* Start by allocating clusters to hold the attribute value. */</div><div class='del'>-		rl = ntfs_cluster_alloc(vol, 0, new_size &gt;&gt;</div><div class='del'>-				vol-&gt;cluster_size_bits, -1, DATA_ZONE, true);</div><div class='del'>-		if (IS_ERR(rl)) {</div><div class='del'>-			err = PTR_ERR(rl);</div><div class='del'>-			ntfs_debug("Failed to allocate cluster%s, error code "</div><div class='del'>-					"%i.", (new_size &gt;&gt;</div><div class='del'>-					vol-&gt;cluster_size_bits) &gt; 1 ? "s" : "",</div><div class='del'>-					err);</div><div class='del'>-			goto page_err_out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		rl = NULL;</div><div class='del'>-		page = NULL;</div><div class='del'>-	}</div><div class='del'>-	/* Determine the size of the mapping pairs array. */</div><div class='del'>-	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl, 0, -1);</div><div class='del'>-	if (unlikely(mp_size &lt; 0)) {</div><div class='del'>-		err = mp_size;</div><div class='del'>-		ntfs_debug("Failed to get size for mapping pairs array, error "</div><div class='del'>-				"code %i.", err);</div><div class='del'>-		goto rl_err_out;</div><div class='del'>-	}</div><div class='del'>-	down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	BUG_ON(NInoNonResident(ni));</div><div class='del'>-	BUG_ON(a-&gt;non_resident);</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate new offsets for the name and the mapping pairs array.</div><div class='del'>-	 */</div><div class='del'>-	if (NInoSparse(ni) || NInoCompressed(ni))</div><div class='del'>-		name_ofs = (offsetof(ATTR_REC,</div><div class='del'>-				data.non_resident.compressed_size) +</div><div class='del'>-				sizeof(a-&gt;data.non_resident.compressed_size) +</div><div class='del'>-				7) &amp; ~7;</div><div class='del'>-	else</div><div class='del'>-		name_ofs = (offsetof(ATTR_REC,</div><div class='del'>-				data.non_resident.compressed_size) + 7) &amp; ~7;</div><div class='del'>-	mp_ofs = (name_ofs + a-&gt;name_length * sizeof(ntfschar) + 7) &amp; ~7;</div><div class='del'>-	/*</div><div class='del'>-	 * Determine the size of the resident part of the now non-resident</div><div class='del'>-	 * attribute record.</div><div class='del'>-	 */</div><div class='del'>-	arec_size = (mp_ofs + mp_size + 7) &amp; ~7;</div><div class='del'>-	/*</div><div class='del'>-	 * If the page is not uptodate bring it uptodate by copying from the</div><div class='del'>-	 * attribute value.</div><div class='del'>-	 */</div><div class='del'>-	attr_size = le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	BUG_ON(attr_size != data_size);</div><div class='del'>-	if (page &amp;&amp; !PageUptodate(page)) {</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		memcpy(kaddr, (u8*)a +</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset),</div><div class='del'>-				attr_size);</div><div class='del'>-		memset(kaddr + attr_size, 0, PAGE_SIZE - attr_size);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	}</div><div class='del'>-	/* Backup the attribute flag. */</div><div class='del'>-	old_res_attr_flags = a-&gt;data.resident.flags;</div><div class='del'>-	/* Resize the resident part of the attribute record. */</div><div class='del'>-	err = ntfs_attr_record_resize(m, a, arec_size);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto err_out;</div><div class='del'>-	/*</div><div class='del'>-	 * Convert the resident part of the attribute record to describe a</div><div class='del'>-	 * non-resident attribute.</div><div class='del'>-	 */</div><div class='del'>-	a-&gt;non_resident = 1;</div><div class='del'>-	/* Move the attribute name if it exists and update the offset. */</div><div class='del'>-	if (a-&gt;name_length)</div><div class='del'>-		memmove((u8*)a + name_ofs, (u8*)a + le16_to_cpu(a-&gt;name_offset),</div><div class='del'>-				a-&gt;name_length * sizeof(ntfschar));</div><div class='del'>-	a-&gt;name_offset = cpu_to_le16(name_ofs);</div><div class='del'>-	/* Setup the fields specific to non-resident attributes. */</div><div class='del'>-	a-&gt;data.non_resident.lowest_vcn = 0;</div><div class='del'>-	a-&gt;data.non_resident.highest_vcn = cpu_to_sle64((new_size - 1) &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits);</div><div class='del'>-	a-&gt;data.non_resident.mapping_pairs_offset = cpu_to_le16(mp_ofs);</div><div class='del'>-	memset(&amp;a-&gt;data.non_resident.reserved, 0,</div><div class='del'>-			sizeof(a-&gt;data.non_resident.reserved));</div><div class='del'>-	a-&gt;data.non_resident.allocated_size = cpu_to_sle64(new_size);</div><div class='del'>-	a-&gt;data.non_resident.data_size =</div><div class='del'>-			a-&gt;data.non_resident.initialized_size =</div><div class='del'>-			cpu_to_sle64(attr_size);</div><div class='del'>-	if (NInoSparse(ni) || NInoCompressed(ni)) {</div><div class='del'>-		a-&gt;data.non_resident.compression_unit = 0;</div><div class='del'>-		if (NInoCompressed(ni) || vol-&gt;major_ver &lt; 3)</div><div class='del'>-			a-&gt;data.non_resident.compression_unit = 4;</div><div class='del'>-		a-&gt;data.non_resident.compressed_size =</div><div class='del'>-				a-&gt;data.non_resident.allocated_size;</div><div class='del'>-	} else</div><div class='del'>-		a-&gt;data.non_resident.compression_unit = 0;</div><div class='del'>-	/* Generate the mapping pairs array into the attribute record. */</div><div class='del'>-	err = ntfs_mapping_pairs_build(vol, (u8*)a + mp_ofs,</div><div class='del'>-			arec_size - mp_ofs, rl, 0, -1, NULL);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_debug("Failed to build mapping pairs, error code %i.",</div><div class='del'>-				err);</div><div class='del'>-		goto undo_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Setup the in-memory attribute structure to be non-resident. */</div><div class='del'>-	ni-&gt;runlist.rl = rl;</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ni-&gt;allocated_size = new_size;</div><div class='del'>-	if (NInoSparse(ni) || NInoCompressed(ni)) {</div><div class='del'>-		ni-&gt;itype.compressed.size = ni-&gt;allocated_size;</div><div class='del'>-		if (a-&gt;data.non_resident.compression_unit) {</div><div class='del'>-			ni-&gt;itype.compressed.block_size = 1U &lt;&lt; (a-&gt;data.</div><div class='del'>-					non_resident.compression_unit +</div><div class='del'>-					vol-&gt;cluster_size_bits);</div><div class='del'>-			ni-&gt;itype.compressed.block_size_bits =</div><div class='del'>-					ffs(ni-&gt;itype.compressed.block_size) -</div><div class='del'>-					1;</div><div class='del'>-			ni-&gt;itype.compressed.block_clusters = 1U &lt;&lt;</div><div class='del'>-					a-&gt;data.non_resident.compression_unit;</div><div class='del'>-		} else {</div><div class='del'>-			ni-&gt;itype.compressed.block_size = 0;</div><div class='del'>-			ni-&gt;itype.compressed.block_size_bits = 0;</div><div class='del'>-			ni-&gt;itype.compressed.block_clusters = 0;</div><div class='del'>-		}</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;itype.compressed.size &gt;&gt; 9;</div><div class='del'>-	} else</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;allocated_size &gt;&gt; 9;</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * This needs to be last since the address space operations -&gt;read_folio</div><div class='del'>-	 * and -&gt;writepage can run concurrently with us as they are not</div><div class='del'>-	 * serialized on i_mutex.  Note, we are not allowed to fail once we flip</div><div class='del'>-	 * this switch, which is another reason to do this last.</div><div class='del'>-	 */</div><div class='del'>-	NInoSetNonResident(ni);</div><div class='del'>-	/* Mark the mft record dirty, so it gets written back. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	if (page) {</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-undo_err_out:</div><div class='del'>-	/* Convert the attribute back into a resident attribute. */</div><div class='del'>-	a-&gt;non_resident = 0;</div><div class='del'>-	/* Move the attribute name if it exists and update the offset. */</div><div class='del'>-	name_ofs = (offsetof(ATTR_RECORD, data.resident.reserved) +</div><div class='del'>-			sizeof(a-&gt;data.resident.reserved) + 7) &amp; ~7;</div><div class='del'>-	if (a-&gt;name_length)</div><div class='del'>-		memmove((u8*)a + name_ofs, (u8*)a + le16_to_cpu(a-&gt;name_offset),</div><div class='del'>-				a-&gt;name_length * sizeof(ntfschar));</div><div class='del'>-	mp_ofs = (name_ofs + a-&gt;name_length * sizeof(ntfschar) + 7) &amp; ~7;</div><div class='del'>-	a-&gt;name_offset = cpu_to_le16(name_ofs);</div><div class='del'>-	arec_size = (mp_ofs + attr_size + 7) &amp; ~7;</div><div class='del'>-	/* Resize the resident part of the attribute record. */</div><div class='del'>-	err2 = ntfs_attr_record_resize(m, a, arec_size);</div><div class='del'>-	if (unlikely(err2)) {</div><div class='del'>-		/*</div><div class='del'>-		 * This cannot happen (well if memory corruption is at work it</div><div class='del'>-		 * could happen in theory), but deal with it as well as we can.</div><div class='del'>-		 * If the old size is too small, truncate the attribute,</div><div class='del'>-		 * otherwise simply give it a larger allocated size.</div><div class='del'>-		 * FIXME: Should check whether chkdsk complains when the</div><div class='del'>-		 * allocated size is much bigger than the resident value size.</div><div class='del'>-		 */</div><div class='del'>-		arec_size = le32_to_cpu(a-&gt;length);</div><div class='del'>-		if ((mp_ofs + attr_size) &gt; arec_size) {</div><div class='del'>-			err2 = attr_size;</div><div class='del'>-			attr_size = arec_size - mp_ofs;</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to undo partial resident "</div><div class='del'>-					"to non-resident attribute "</div><div class='del'>-					"conversion.  Truncating inode 0x%lx, "</div><div class='del'>-					"attribute type 0x%x from %i bytes to "</div><div class='del'>-					"%i bytes to maintain metadata "</div><div class='del'>-					"consistency.  THIS MEANS YOU ARE "</div><div class='del'>-					"LOSING %i BYTES DATA FROM THIS %s.",</div><div class='del'>-					vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-					err2, attr_size, err2 - attr_size,</div><div class='del'>-					((ni-&gt;type == AT_DATA) &amp;&amp;</div><div class='del'>-					!ni-&gt;name_len) ? "FILE": "ATTRIBUTE");</div><div class='del'>-			write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			ni-&gt;initialized_size = attr_size;</div><div class='del'>-			i_size_write(vi, attr_size);</div><div class='del'>-			write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* Setup the fields specific to resident attributes. */</div><div class='del'>-	a-&gt;data.resident.value_length = cpu_to_le32(attr_size);</div><div class='del'>-	a-&gt;data.resident.value_offset = cpu_to_le16(mp_ofs);</div><div class='del'>-	a-&gt;data.resident.flags = old_res_attr_flags;</div><div class='del'>-	memset(&amp;a-&gt;data.resident.reserved, 0,</div><div class='del'>-			sizeof(a-&gt;data.resident.reserved));</div><div class='del'>-	/* Copy the data from the page back to the attribute value. */</div><div class='del'>-	if (page) {</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		memcpy((u8*)a + mp_ofs, kaddr, attr_size);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-	}</div><div class='del'>-	/* Setup the allocated size in the ntfs inode in case it changed. */</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ni-&gt;allocated_size = arec_size - mp_ofs;</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/* Mark the mft record dirty, so it gets written back. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	ni-&gt;runlist.rl = NULL;</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-rl_err_out:</div><div class='del'>-	if (rl) {</div><div class='del'>-		if (ntfs_cluster_free_from_rl(vol, rl) &lt; 0) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to release allocated "</div><div class='del'>-					"cluster(s) in error code path.  Run "</div><div class='del'>-					"chkdsk to recover the lost "</div><div class='del'>-					"cluster(s).");</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		ntfs_free(rl);</div><div class='del'>-page_err_out:</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-	if (err == -EINVAL)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_extend_allocation - extend the allocated space of an attribute</div><div class='del'>- * @ni:			ntfs inode of the attribute whose allocation to extend</div><div class='del'>- * @new_alloc_size:	new size in bytes to which to extend the allocation to</div><div class='del'>- * @new_data_size:	new size in bytes to which to extend the data to</div><div class='del'>- * @data_start:		beginning of region which is required to be non-sparse</div><div class='del'>- *</div><div class='del'>- * Extend the allocated space of an attribute described by the ntfs inode @ni</div><div class='del'>- * to @new_alloc_size bytes.  If @data_start is -1, the whole extension may be</div><div class='del'>- * implemented as a hole in the file (as long as both the volume and the ntfs</div><div class='del'>- * inode @ni have sparse support enabled).  If @data_start is &gt;= 0, then the</div><div class='del'>- * region between the old allocated size and @data_start - 1 may be made sparse</div><div class='del'>- * but the regions between @data_start and @new_alloc_size must be backed by</div><div class='del'>- * actual clusters.</div><div class='del'>- *</div><div class='del'>- * If @new_data_size is -1, it is ignored.  If it is &gt;= 0, then the data size</div><div class='del'>- * of the attribute is extended to @new_data_size.  Note that the i_size of the</div><div class='del'>- * vfs inode is not updated.  Only the data size in the base attribute record</div><div class='del'>- * is updated.  The caller has to update i_size separately if this is required.</div><div class='del'>- * WARNING: It is a BUG() for @new_data_size to be smaller than the old data</div><div class='del'>- * size as well as for @new_data_size to be greater than @new_alloc_size.</div><div class='del'>- *</div><div class='del'>- * For resident attributes this involves resizing the attribute record and if</div><div class='del'>- * necessary moving it and/or other attributes into extent mft records and/or</div><div class='del'>- * converting the attribute to a non-resident attribute which in turn involves</div><div class='del'>- * extending the allocation of a non-resident attribute as described below.</div><div class='del'>- *</div><div class='del'>- * For non-resident attributes this involves allocating clusters in the data</div><div class='del'>- * zone on the volume (except for regions that are being made sparse) and</div><div class='del'>- * extending the run list to describe the allocated clusters as well as</div><div class='del'>- * updating the mapping pairs array of the attribute.  This in turn involves</div><div class='del'>- * resizing the attribute record and if necessary moving it and/or other</div><div class='del'>- * attributes into extent mft records and/or splitting the attribute record</div><div class='del'>- * into multiple extent attribute records.</div><div class='del'>- *</div><div class='del'>- * Also, the attribute list attribute is updated if present and in some of the</div><div class='del'>- * above cases (the ones where extent mft records/attributes come into play),</div><div class='del'>- * an attribute list attribute is created if not already present.</div><div class='del'>- *</div><div class='del'>- * Return the new allocated size on success and -errno on error.  In the case</div><div class='del'>- * that an error is encountered but a partial extension at least up to</div><div class='del'>- * @data_start (if present) is possible, the allocation is partially extended</div><div class='del'>- * and this is returned.  This means the caller must check the returned size to</div><div class='del'>- * determine if the extension was partial.  If @data_start is -1 then partial</div><div class='del'>- * allocations are not performed.</div><div class='del'>- *</div><div class='del'>- * WARNING: Do not call ntfs_attr_extend_allocation() for $MFT/$DATA.</div><div class='del'>- *</div><div class='del'>- * Locking: This function takes the runlist lock of @ni for writing as well as</div><div class='del'>- * locking the mft record of the base ntfs inode.  These locks are maintained</div><div class='del'>- * throughout execution of the function.  These locks are required so that the</div><div class='del'>- * attribute can be resized safely and so that it can for example be converted</div><div class='del'>- * from resident to non-resident safely.</div><div class='del'>- *</div><div class='del'>- * TODO: At present attribute list attribute handling is not implemented.</div><div class='del'>- *</div><div class='del'>- * TODO: At present it is not safe to call this function for anything other</div><div class='del'>- * than the $DATA attribute(s) of an uncompressed and unencrypted file.</div><div class='del'>- */</div><div class='del'>-s64 ntfs_attr_extend_allocation(ntfs_inode *ni, s64 new_alloc_size,</div><div class='del'>-		const s64 new_data_size, const s64 data_start)</div><div class='del'>-{</div><div class='del'>-	VCN vcn;</div><div class='del'>-	s64 ll, allocated_size, start = data_start;</div><div class='del'>-	struct inode *vi = VFS_I(ni);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	runlist_element *rl, *rl2;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err, mp_size;</div><div class='del'>-	u32 attr_len = 0; /* Silence stupid gcc warning. */</div><div class='del'>-	bool mp_rebuilt;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	allocated_size = ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, "</div><div class='del'>-			"old_allocated_size 0x%llx, "</div><div class='del'>-			"new_allocated_size 0x%llx, new_data_size 0x%llx, "</div><div class='del'>-			"data_start 0x%llx.", vi-&gt;i_ino,</div><div class='del'>-			(unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-			(unsigned long long)allocated_size,</div><div class='del'>-			(unsigned long long)new_alloc_size,</div><div class='del'>-			(unsigned long long)new_data_size,</div><div class='del'>-			(unsigned long long)start);</div><div class='del'>-#endif</div><div class='del'>-retry_extend:</div><div class='del'>-	/*</div><div class='del'>-	 * For non-resident attributes, @start and @new_size need to be aligned</div><div class='del'>-	 * to cluster boundaries for allocation purposes.</div><div class='del'>-	 */</div><div class='del'>-	if (NInoNonResident(ni)) {</div><div class='del'>-		if (start &gt; 0)</div><div class='del'>-			start &amp;= ~(s64)vol-&gt;cluster_size_mask;</div><div class='del'>-		new_alloc_size = (new_alloc_size + vol-&gt;cluster_size - 1) &amp;</div><div class='del'>-				~(s64)vol-&gt;cluster_size_mask;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(new_data_size &gt;= 0 &amp;&amp; new_data_size &gt; new_alloc_size);</div><div class='del'>-	/* Check if new size is allowed in $AttrDef. */</div><div class='del'>-	err = ntfs_attr_size_bounds_check(vol, ni-&gt;type, new_alloc_size);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		/* Only emit errors when the write will fail completely. */</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		allocated_size = ni-&gt;allocated_size;</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size) {</div><div class='del'>-			if (err == -ERANGE) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Cannot extend allocation "</div><div class='del'>-						"of inode 0x%lx, attribute "</div><div class='del'>-						"type 0x%x, because the new "</div><div class='del'>-						"allocation would exceed the "</div><div class='del'>-						"maximum allowed size for "</div><div class='del'>-						"this attribute type.",</div><div class='del'>-						vi-&gt;i_ino, (unsigned)</div><div class='del'>-						le32_to_cpu(ni-&gt;type));</div><div class='del'>-			} else {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Cannot extend allocation "</div><div class='del'>-						"of inode 0x%lx, attribute "</div><div class='del'>-						"type 0x%x, because this "</div><div class='del'>-						"attribute type is not "</div><div class='del'>-						"defined on the NTFS volume.  "</div><div class='del'>-						"Possible corruption!  You "</div><div class='del'>-						"should run chkdsk!",</div><div class='del'>-						vi-&gt;i_ino, (unsigned)</div><div class='del'>-						le32_to_cpu(ni-&gt;type));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Translate error code to be POSIX conformant for write(2). */</div><div class='del'>-		if (err == -ERANGE)</div><div class='del'>-			err = -EFBIG;</div><div class='del'>-		else</div><div class='del'>-			err = -EIO;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	/*</div><div class='del'>-	 * We will be modifying both the runlist (if non-resident) and the mft</div><div class='del'>-	 * record so lock them both down.</div><div class='del'>-	 */</div><div class='del'>-	down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	allocated_size = ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * If non-resident, seek to the last extent.  If resident, there is</div><div class='del'>-	 * only one extent, so seek to that.</div><div class='del'>-	 */</div><div class='del'>-	vcn = NInoNonResident(ni) ? allocated_size &gt;&gt; vol-&gt;cluster_size_bits :</div><div class='del'>-			0;</div><div class='del'>-	/*</div><div class='del'>-	 * Abort if someone did the work whilst we waited for the locks.  If we</div><div class='del'>-	 * just converted the attribute from resident to non-resident it is</div><div class='del'>-	 * likely that exactly this has happened already.  We cannot quite</div><div class='del'>-	 * abort if we need to update the data size.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(new_alloc_size &lt;= allocated_size)) {</div><div class='del'>-		ntfs_debug("Allocated size already exceeds requested size.");</div><div class='del'>-		new_alloc_size = allocated_size;</div><div class='del'>-		if (new_data_size &lt; 0)</div><div class='del'>-			goto done;</div><div class='del'>-		/*</div><div class='del'>-		 * We want the first attribute extent so that we can update the</div><div class='del'>-		 * data size.</div><div class='del'>-		 */</div><div class='del'>-		vcn = 0;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, vcn, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	/* Use goto to reduce indentation. */</div><div class='del'>-	if (a-&gt;non_resident)</div><div class='del'>-		goto do_non_resident_extend;</div><div class='del'>-	BUG_ON(NInoNonResident(ni));</div><div class='del'>-	/* The total length of the attribute value. */</div><div class='del'>-	attr_len = le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	/*</div><div class='del'>-	 * Extend the attribute record to be able to store the new attribute</div><div class='del'>-	 * size.  ntfs_attr_record_resize() will not do anything if the size is</div><div class='del'>-	 * not changing.</div><div class='del'>-	 */</div><div class='del'>-	if (new_alloc_size &lt; vol-&gt;mft_record_size &amp;&amp;</div><div class='del'>-			!ntfs_attr_record_resize(m, a,</div><div class='del'>-			le16_to_cpu(a-&gt;data.resident.value_offset) +</div><div class='del'>-			new_alloc_size)) {</div><div class='del'>-		/* The resize succeeded! */</div><div class='del'>-		write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		ni-&gt;allocated_size = le32_to_cpu(a-&gt;length) -</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset);</div><div class='del'>-		write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (new_data_size &gt;= 0) {</div><div class='del'>-			BUG_ON(new_data_size &lt; attr_len);</div><div class='del'>-			a-&gt;data.resident.value_length =</div><div class='del'>-					cpu_to_le32((u32)new_data_size);</div><div class='del'>-		}</div><div class='del'>-		goto flush_done;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have to drop all the locks so we can call</div><div class='del'>-	 * ntfs_attr_make_non_resident().  This could be optimised by try-</div><div class='del'>-	 * locking the first page cache page and only if that fails dropping</div><div class='del'>-	 * the locks, locking the page, and redoing all the locking and</div><div class='del'>-	 * lookups.  While this would be a huge optimisation, it is not worth</div><div class='del'>-	 * it as this is definitely a slow code path.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Not enough space in the mft record, try to make the attribute</div><div class='del'>-	 * non-resident and if successful restart the extension process.</div><div class='del'>-	 */</div><div class='del'>-	err = ntfs_attr_make_non_resident(ni, attr_len);</div><div class='del'>-	if (likely(!err))</div><div class='del'>-		goto retry_extend;</div><div class='del'>-	/*</div><div class='del'>-	 * Could not make non-resident.  If this is due to this not being</div><div class='del'>-	 * permitted for this attribute type or there not being enough space,</div><div class='del'>-	 * try to make other attributes non-resident.  Otherwise fail.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(err != -EPERM &amp;&amp; err != -ENOSPC)) {</div><div class='del'>-		/* Only emit errors when the write will fail completely. */</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		allocated_size = ni-&gt;allocated_size;</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot extend allocation of "</div><div class='del'>-					"inode 0x%lx, attribute type 0x%x, "</div><div class='del'>-					"because the conversion from resident "</div><div class='del'>-					"to non-resident attribute failed "</div><div class='del'>-					"with error code %i.", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-		if (err != -ENOMEM)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto conv_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* TODO: Not implemented from here, abort. */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	allocated_size = ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (start &lt; 0 || start &gt;= allocated_size) {</div><div class='del'>-		if (err == -ENOSPC)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Not enough space in the mft "</div><div class='del'>-					"record/on disk for the non-resident "</div><div class='del'>-					"attribute value.  This case is not "</div><div class='del'>-					"implemented yet.");</div><div class='del'>-		else /* if (err == -EPERM) */</div><div class='del'>-			ntfs_error(vol-&gt;sb, "This attribute type may not be "</div><div class='del'>-					"non-resident.  This case is not "</div><div class='del'>-					"implemented yet.");</div><div class='del'>-	}</div><div class='del'>-	err = -EOPNOTSUPP;</div><div class='del'>-	goto conv_err_out;</div><div class='del'>-#if 0</div><div class='del'>-	// TODO: Attempt to make other attributes non-resident.</div><div class='del'>-	if (!err)</div><div class='del'>-		goto do_resident_extend;</div><div class='del'>-	/*</div><div class='del'>-	 * Both the attribute list attribute and the standard information</div><div class='del'>-	 * attribute must remain in the base inode.  Thus, if this is one of</div><div class='del'>-	 * these attributes, we have to try to move other attributes out into</div><div class='del'>-	 * extent mft records instead.</div><div class='del'>-	 */</div><div class='del'>-	if (ni-&gt;type == AT_ATTRIBUTE_LIST ||</div><div class='del'>-			ni-&gt;type == AT_STANDARD_INFORMATION) {</div><div class='del'>-		// TODO: Attempt to move other attributes into extent mft</div><div class='del'>-		// records.</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		if (!err)</div><div class='del'>-			goto do_resident_extend;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	// TODO: Attempt to move this attribute to an extent mft record, but</div><div class='del'>-	// only if it is not already the only attribute in an mft record in</div><div class='del'>-	// which case there would be nothing to gain.</div><div class='del'>-	err = -EOPNOTSUPP;</div><div class='del'>-	if (!err)</div><div class='del'>-		goto do_resident_extend;</div><div class='del'>-	/* There is nothing we can do to make enough space. )-: */</div><div class='del'>-	goto err_out;</div><div class='del'>-#endif</div><div class='del'>-do_non_resident_extend:</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	if (new_alloc_size == allocated_size) {</div><div class='del'>-		BUG_ON(vcn);</div><div class='del'>-		goto alloc_done;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the data starts after the end of the old allocation, this is a</div><div class='del'>-	 * $DATA attribute and sparse attributes are enabled on the volume and</div><div class='del'>-	 * for this inode, then create a sparse region between the old</div><div class='del'>-	 * allocated size and the start of the data.  Otherwise simply proceed</div><div class='del'>-	 * with filling the whole space between the old allocated size and the</div><div class='del'>-	 * new allocated size with clusters.</div><div class='del'>-	 */</div><div class='del'>-	if ((start &gt;= 0 &amp;&amp; start &lt;= allocated_size) || ni-&gt;type != AT_DATA ||</div><div class='del'>-			!NVolSparseEnabled(vol) || NInoSparseDisabled(ni))</div><div class='del'>-		goto skip_sparse;</div><div class='del'>-	// TODO: This is not implemented yet.  We just fill in with real</div><div class='del'>-	// clusters for now...</div><div class='del'>-	ntfs_debug("Inserting holes is not-implemented yet.  Falling back to "</div><div class='del'>-			"allocating real clusters instead.");</div><div class='del'>-skip_sparse:</div><div class='del'>-	rl = ni-&gt;runlist.rl;</div><div class='del'>-	if (likely(rl)) {</div><div class='del'>-		/* Seek to the end of the runlist. */</div><div class='del'>-		while (rl-&gt;length)</div><div class='del'>-			rl++;</div><div class='del'>-	}</div><div class='del'>-	/* If this attribute extent is not mapped, map it now. */</div><div class='del'>-	if (unlikely(!rl || rl-&gt;lcn == LCN_RL_NOT_MAPPED ||</div><div class='del'>-			(rl-&gt;lcn == LCN_ENOENT &amp;&amp; rl &gt; ni-&gt;runlist.rl &amp;&amp;</div><div class='del'>-			(rl-1)-&gt;lcn == LCN_RL_NOT_MAPPED))) {</div><div class='del'>-		if (!rl &amp;&amp; !allocated_size)</div><div class='del'>-			goto first_alloc;</div><div class='del'>-		rl = ntfs_mapping_pairs_decompress(vol, a, ni-&gt;runlist.rl);</div><div class='del'>-		if (IS_ERR(rl)) {</div><div class='del'>-			err = PTR_ERR(rl);</div><div class='del'>-			if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Cannot extend allocation "</div><div class='del'>-						"of inode 0x%lx, attribute "</div><div class='del'>-						"type 0x%x, because the "</div><div class='del'>-						"mapping of a runlist "</div><div class='del'>-						"fragment failed with error "</div><div class='del'>-						"code %i.", vi-&gt;i_ino,</div><div class='del'>-						(unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-						err);</div><div class='del'>-			if (err != -ENOMEM)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		ni-&gt;runlist.rl = rl;</div><div class='del'>-		/* Seek to the end of the runlist. */</div><div class='del'>-		while (rl-&gt;length)</div><div class='del'>-			rl++;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We now know the runlist of the last extent is mapped and @rl is at</div><div class='del'>-	 * the end of the runlist.  We want to begin allocating clusters</div><div class='del'>-	 * starting at the last allocated cluster to reduce fragmentation.  If</div><div class='del'>-	 * there are no valid LCNs in the attribute we let the cluster</div><div class='del'>-	 * allocator choose the starting cluster.</div><div class='del'>-	 */</div><div class='del'>-	/* If the last LCN is a hole or simillar seek back to last real LCN. */</div><div class='del'>-	while (rl-&gt;lcn &lt; 0 &amp;&amp; rl &gt; ni-&gt;runlist.rl)</div><div class='del'>-		rl--;</div><div class='del'>-first_alloc:</div><div class='del'>-	// FIXME: Need to implement partial allocations so at least part of the</div><div class='del'>-	// write can be performed when start &gt;= 0.  (Needed for POSIX write(2)</div><div class='del'>-	// conformance.)</div><div class='del'>-	rl2 = ntfs_cluster_alloc(vol, allocated_size &gt;&gt; vol-&gt;cluster_size_bits,</div><div class='del'>-			(new_alloc_size - allocated_size) &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits, (rl &amp;&amp; (rl-&gt;lcn &gt;= 0)) ?</div><div class='del'>-			rl-&gt;lcn + rl-&gt;length : -1, DATA_ZONE, true);</div><div class='del'>-	if (IS_ERR(rl2)) {</div><div class='del'>-		err = PTR_ERR(rl2);</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot extend allocation of "</div><div class='del'>-					"inode 0x%lx, attribute type 0x%x, "</div><div class='del'>-					"because the allocation of clusters "</div><div class='del'>-					"failed with error code %i.", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-		if (err != -ENOMEM &amp;&amp; err != -ENOSPC)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	rl = ntfs_runlists_merge(ni-&gt;runlist.rl, rl2);</div><div class='del'>-	if (IS_ERR(rl)) {</div><div class='del'>-		err = PTR_ERR(rl);</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot extend allocation of "</div><div class='del'>-					"inode 0x%lx, attribute type 0x%x, "</div><div class='del'>-					"because the runlist merge failed "</div><div class='del'>-					"with error code %i.", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-		if (err != -ENOMEM)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		if (ntfs_cluster_free_from_rl(vol, rl2)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to release allocated "</div><div class='del'>-					"cluster(s) in error code path.  Run "</div><div class='del'>-					"chkdsk to recover the lost "</div><div class='del'>-					"cluster(s).");</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		ntfs_free(rl2);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ni-&gt;runlist.rl = rl;</div><div class='del'>-	ntfs_debug("Allocated 0x%llx clusters.", (long long)(new_alloc_size -</div><div class='del'>-			allocated_size) &gt;&gt; vol-&gt;cluster_size_bits);</div><div class='del'>-	/* Find the runlist element with which the attribute extent starts. */</div><div class='del'>-	ll = sle64_to_cpu(a-&gt;data.non_resident.lowest_vcn);</div><div class='del'>-	rl2 = ntfs_rl_find_vcn_nolock(rl, ll);</div><div class='del'>-	BUG_ON(!rl2);</div><div class='del'>-	BUG_ON(!rl2-&gt;length);</div><div class='del'>-	BUG_ON(rl2-&gt;lcn &lt; LCN_HOLE);</div><div class='del'>-	mp_rebuilt = false;</div><div class='del'>-	/* Get the size for the new mapping pairs array for this extent. */</div><div class='del'>-	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl2, ll, -1);</div><div class='del'>-	if (unlikely(mp_size &lt;= 0)) {</div><div class='del'>-		err = mp_size;</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot extend allocation of "</div><div class='del'>-					"inode 0x%lx, attribute type 0x%x, "</div><div class='del'>-					"because determining the size for the "</div><div class='del'>-					"mapping pairs failed with error code "</div><div class='del'>-					"%i.", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	/* Extend the attribute record to fit the bigger mapping pairs array. */</div><div class='del'>-	attr_len = le32_to_cpu(a-&gt;length);</div><div class='del'>-	err = ntfs_attr_record_resize(m, a, mp_size +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset));</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		BUG_ON(err != -ENOSPC);</div><div class='del'>-		// TODO: Deal with this by moving this extent to a new mft</div><div class='del'>-		// record or by starting a new extent in a new mft record,</div><div class='del'>-		// possibly by extending this extent partially and filling it</div><div class='del'>-		// and creating a new extent for the remainder, or by making</div><div class='del'>-		// other attributes non-resident and/or by moving other</div><div class='del'>-		// attributes out of this mft record.</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Not enough space in the mft "</div><div class='del'>-					"record for the extended attribute "</div><div class='del'>-					"record.  This case is not "</div><div class='del'>-					"implemented yet.");</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	mp_rebuilt = true;</div><div class='del'>-	/* Generate the mapping pairs array directly into the attr record. */</div><div class='del'>-	err = ntfs_mapping_pairs_build(vol, (u8*)a +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-			mp_size, rl2, ll, -1, NULL);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot extend allocation of "</div><div class='del'>-					"inode 0x%lx, attribute type 0x%x, "</div><div class='del'>-					"because building the mapping pairs "</div><div class='del'>-					"failed with error code %i.", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	/* Update the highest_vcn. */</div><div class='del'>-	a-&gt;data.non_resident.highest_vcn = cpu_to_sle64((new_alloc_size &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits) - 1);</div><div class='del'>-	/*</div><div class='del'>-	 * We now have extended the allocated size of the attribute.  Reflect</div><div class='del'>-	 * this in the ntfs_inode structure and the attribute record.</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-		/*</div><div class='del'>-		 * We are not in the first attribute extent, switch to it, but</div><div class='del'>-		 * first ensure the changes will make it to disk later.</div><div class='del'>-		 */</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-				CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err))</div><div class='del'>-			goto restore_undo_alloc;</div><div class='del'>-		/* @m is not used any more so no need to set it. */</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-	}</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ni-&gt;allocated_size = new_alloc_size;</div><div class='del'>-	a-&gt;data.non_resident.allocated_size = cpu_to_sle64(new_alloc_size);</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: This would fail if @ni is a directory, $MFT, or an index,</div><div class='del'>-	 * since those can have sparse/compressed set.  For example can be</div><div class='del'>-	 * set compressed even though it is not compressed itself and in that</div><div class='del'>-	 * case the bit means that files are to be created compressed in the</div><div class='del'>-	 * directory...  At present this is ok as this code is only called for</div><div class='del'>-	 * regular files, and only for their $DATA attribute(s).</div><div class='del'>-	 * FIXME: The calculation is wrong if we created a hole above.  For now</div><div class='del'>-	 * it does not matter as we never create holes.</div><div class='del'>-	 */</div><div class='del'>-	if (NInoSparse(ni) || NInoCompressed(ni)) {</div><div class='del'>-		ni-&gt;itype.compressed.size += new_alloc_size - allocated_size;</div><div class='del'>-		a-&gt;data.non_resident.compressed_size =</div><div class='del'>-				cpu_to_sle64(ni-&gt;itype.compressed.size);</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;itype.compressed.size &gt;&gt; 9;</div><div class='del'>-	} else</div><div class='del'>-		vi-&gt;i_blocks = new_alloc_size &gt;&gt; 9;</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-alloc_done:</div><div class='del'>-	if (new_data_size &gt;= 0) {</div><div class='del'>-		BUG_ON(new_data_size &lt;</div><div class='del'>-				sle64_to_cpu(a-&gt;data.non_resident.data_size));</div><div class='del'>-		a-&gt;data.non_resident.data_size = cpu_to_sle64(new_data_size);</div><div class='del'>-	}</div><div class='del'>-flush_done:</div><div class='del'>-	/* Ensure the changes make it to disk. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-done:</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_debug("Done, new_allocated_size 0x%llx.",</div><div class='del'>-			(unsigned long long)new_alloc_size);</div><div class='del'>-	return new_alloc_size;</div><div class='del'>-restore_undo_alloc:</div><div class='del'>-	if (start &lt; 0 || start &gt;= allocated_size)</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Cannot complete extension of allocation "</div><div class='del'>-				"of inode 0x%lx, attribute type 0x%x, because "</div><div class='del'>-				"lookup of first attribute extent failed with "</div><div class='del'>-				"error code %i.", vi-&gt;i_ino,</div><div class='del'>-				(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-	if (err == -ENOENT)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-	if (ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len, CASE_SENSITIVE,</div><div class='del'>-			allocated_size &gt;&gt; vol-&gt;cluster_size_bits, NULL, 0,</div><div class='del'>-			ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find last attribute extent of "</div><div class='del'>-				"attribute in error code path.  Run chkdsk to "</div><div class='del'>-				"recover.");</div><div class='del'>-		write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		ni-&gt;allocated_size = new_alloc_size;</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: This would fail if @ni is a directory...  See above.</div><div class='del'>-		 * FIXME: The calculation is wrong if we created a hole above.</div><div class='del'>-		 * For now it does not matter as we never create holes.</div><div class='del'>-		 */</div><div class='del'>-		if (NInoSparse(ni) || NInoCompressed(ni)) {</div><div class='del'>-			ni-&gt;itype.compressed.size += new_alloc_size -</div><div class='del'>-					allocated_size;</div><div class='del'>-			vi-&gt;i_blocks = ni-&gt;itype.compressed.size &gt;&gt; 9;</div><div class='del'>-		} else</div><div class='del'>-			vi-&gt;i_blocks = new_alloc_size &gt;&gt; 9;</div><div class='del'>-		write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-		up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-		/*</div><div class='del'>-		 * The only thing that is now wrong is the allocated size of the</div><div class='del'>-		 * base attribute extent which chkdsk should be able to fix.</div><div class='del'>-		 */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;attr-&gt;data.non_resident.highest_vcn = cpu_to_sle64(</div><div class='del'>-			(allocated_size &gt;&gt; vol-&gt;cluster_size_bits) - 1);</div><div class='del'>-undo_alloc:</div><div class='del'>-	ll = allocated_size &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-	if (ntfs_cluster_free(ni, ll, -1, ctx) &lt; 0) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to release allocated cluster(s) "</div><div class='del'>-				"in error code path.  Run chkdsk to recover "</div><div class='del'>-				"the lost cluster(s).");</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	/*</div><div class='del'>-	 * If the runlist truncation fails and/or the search context is no</div><div class='del'>-	 * longer valid, we cannot resize the attribute record or build the</div><div class='del'>-	 * mapping pairs array thus we mark the inode bad so that no access to</div><div class='del'>-	 * the freed clusters can happen.</div><div class='del'>-	 */</div><div class='del'>-	if (ntfs_rl_truncate_nolock(vol, &amp;ni-&gt;runlist, ll) || IS_ERR(m)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to %s in error code path.  Run "</div><div class='del'>-				"chkdsk to recover.", IS_ERR(m) ?</div><div class='del'>-				"restore attribute search context" :</div><div class='del'>-				"truncate attribute runlist");</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	} else if (mp_rebuilt) {</div><div class='del'>-		if (ntfs_attr_record_resize(m, a, attr_len)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to restore attribute "</div><div class='del'>-					"record in error code path.  Run "</div><div class='del'>-					"chkdsk to recover.");</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		} else /* if (success) */ {</div><div class='del'>-			if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.</div><div class='del'>-					mapping_pairs_offset), attr_len -</div><div class='del'>-					le16_to_cpu(a-&gt;data.non_resident.</div><div class='del'>-					mapping_pairs_offset), rl2, ll, -1,</div><div class='del'>-					NULL)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to restore "</div><div class='del'>-						"mapping pairs array in error "</div><div class='del'>-						"code path.  Run chkdsk to "</div><div class='del'>-						"recover.");</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-			mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-conv_err_out:</div><div class='del'>-	ntfs_debug("Failed.  Returning error code %i.", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_set - fill (a part of) an attribute with a byte</div><div class='del'>- * @ni:		ntfs inode describing the attribute to fill</div><div class='del'>- * @ofs:	offset inside the attribute at which to start to fill</div><div class='del'>- * @cnt:	number of bytes to fill</div><div class='del'>- * @val:	the unsigned 8-bit value with which to fill the attribute</div><div class='del'>- *</div><div class='del'>- * Fill @cnt bytes of the attribute described by the ntfs inode @ni starting at</div><div class='del'>- * byte offset @ofs inside the attribute with the constant byte @val.</div><div class='del'>- *</div><div class='del'>- * This function is effectively like memset() applied to an ntfs attribute.</div><div class='del'>- * Note this function actually only operates on the page cache pages belonging</div><div class='del'>- * to the ntfs attribute and it marks them dirty after doing the memset().</div><div class='del'>- * Thus it relies on the vm dirty page write code paths to cause the modified</div><div class='del'>- * pages to be written to the mft record/disk.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  An error code of -ESPIPE means</div><div class='del'>- * that @ofs + @cnt were outside the end of the attribute and no write was</div><div class='del'>- * performed.</div><div class='del'>- */</div><div class='del'>-int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	struct address_space *mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u8 *kaddr;</div><div class='del'>-	pgoff_t idx, end;</div><div class='del'>-	unsigned start_ofs, end_ofs, size;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for ofs 0x%llx, cnt 0x%llx, val 0x%hx.",</div><div class='del'>-			(long long)ofs, (long long)cnt, val);</div><div class='del'>-	BUG_ON(ofs &lt; 0);</div><div class='del'>-	BUG_ON(cnt &lt; 0);</div><div class='del'>-	if (!cnt)</div><div class='del'>-		goto done;</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Compressed and encrypted attributes are not supported when</div><div class='del'>-	 * writing and we should never have gotten here for them.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(NInoCompressed(ni));</div><div class='del'>-	BUG_ON(NInoEncrypted(ni));</div><div class='del'>-	mapping = VFS_I(ni)-&gt;i_mapping;</div><div class='del'>-	/* Work out the starting index and page offset. */</div><div class='del'>-	idx = ofs &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	start_ofs = ofs &amp; ~PAGE_MASK;</div><div class='del'>-	/* Work out the ending index and page offset. */</div><div class='del'>-	end = ofs + cnt;</div><div class='del'>-	end_ofs = end &amp; ~PAGE_MASK;</div><div class='del'>-	/* If the end is outside the inode size return -ESPIPE. */</div><div class='del'>-	if (unlikely(end &gt; i_size_read(VFS_I(ni)))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Request exceeds end of attribute.");</div><div class='del'>-		return -ESPIPE;</div><div class='del'>-	}</div><div class='del'>-	end &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-	/* If there is a first partial page, need to do it the slow way. */</div><div class='del'>-	if (start_ofs) {</div><div class='del'>-		page = read_mapping_page(mapping, idx, NULL);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to read first partial "</div><div class='del'>-					"page (error, index 0x%lx).", idx);</div><div class='del'>-			return PTR_ERR(page);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * If the last page is the same as the first page, need to</div><div class='del'>-		 * limit the write to the end offset.</div><div class='del'>-		 */</div><div class='del'>-		size = PAGE_SIZE;</div><div class='del'>-		if (idx == end)</div><div class='del'>-			size = end_ofs;</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		memset(kaddr + start_ofs, val, size - start_ofs);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-		cond_resched();</div><div class='del'>-		if (idx == end)</div><div class='del'>-			goto done;</div><div class='del'>-		idx++;</div><div class='del'>-	}</div><div class='del'>-	/* Do the whole pages the fast way. */</div><div class='del'>-	for (; idx &lt; end; idx++) {</div><div class='del'>-		/* Find or create the current page.  (The page is locked.) */</div><div class='del'>-		page = grab_cache_page(mapping, idx);</div><div class='del'>-		if (unlikely(!page)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Insufficient memory to grab "</div><div class='del'>-					"page (index 0x%lx).", idx);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		memset(kaddr, val, PAGE_SIZE);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		/*</div><div class='del'>-		 * If the page has buffers, mark them uptodate since buffer</div><div class='del'>-		 * state and not page state is definitive in 2.6 kernels.</div><div class='del'>-		 */</div><div class='del'>-		if (page_has_buffers(page)) {</div><div class='del'>-			struct buffer_head *bh, *head;</div><div class='del'>-</div><div class='del'>-			bh = head = page_buffers(page);</div><div class='del'>-			do {</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-			} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-		}</div><div class='del'>-		/* Now that buffers are uptodate, set the page uptodate, too. */</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-		/*</div><div class='del'>-		 * Set the page and all its buffers dirty and mark the inode</div><div class='del'>-		 * dirty, too.  The VM will write the page later on.</div><div class='del'>-		 */</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		/* Finally unlock and release the page. */</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-	/* If there is a last partial page, need to do it the slow way. */</div><div class='del'>-	if (end_ofs) {</div><div class='del'>-		page = read_mapping_page(mapping, idx, NULL);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to read last partial page "</div><div class='del'>-					"(error, index 0x%lx).", idx);</div><div class='del'>-			return PTR_ERR(page);</div><div class='del'>-		}</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		memset(kaddr, val, end_ofs);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/attrib.h b/fs/ntfs/attrib.h<br/>deleted file mode 100644<br/>index fe0890d3d072..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/attrib.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/attrib.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * attrib.h - Defines for attribute handling in NTFS Linux kernel driver.</div><div class='del'>- *	      Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2005 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_ATTRIB_H</div><div class='del'>-#define _LINUX_NTFS_ATTRIB_H</div><div class='del'>-</div><div class='del'>-#include "endian.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "runlist.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_search_ctx - used in attribute search functions</div><div class='del'>- * @mrec:	buffer containing mft record to search</div><div class='del'>- * @attr:	attribute record in @mrec where to begin/continue search</div><div class='del'>- * @is_first:	if true ntfs_attr_lookup() begins search with @attr, else after</div><div class='del'>- *</div><div class='del'>- * Structure must be initialized to zero before the first call to one of the</div><div class='del'>- * attribute search functions. Initialize @mrec to point to the mft record to</div><div class='del'>- * search, and @attr to point to the first attribute within @mrec (not necessary</div><div class='del'>- * if calling the _first() functions), and set @is_first to 'true' (not necessary</div><div class='del'>- * if calling the _first() functions).</div><div class='del'>- *</div><div class='del'>- * If @is_first is 'true', the search begins with @attr. If @is_first is 'false',</div><div class='del'>- * the search begins after @attr. This is so that, after the first call to one</div><div class='del'>- * of the search attribute functions, we can call the function again, without</div><div class='del'>- * any modification of the search context, to automagically get the next</div><div class='del'>- * matching attribute.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	MFT_RECORD *mrec;</div><div class='del'>-	ATTR_RECORD *attr;</div><div class='del'>-	bool is_first;</div><div class='del'>-	ntfs_inode *ntfs_ino;</div><div class='del'>-	ATTR_LIST_ENTRY *al_entry;</div><div class='del'>-	ntfs_inode *base_ntfs_ino;</div><div class='del'>-	MFT_RECORD *base_mrec;</div><div class='del'>-	ATTR_RECORD *base_attr;</div><div class='del'>-} ntfs_attr_search_ctx;</div><div class='del'>-</div><div class='del'>-extern int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN vcn,</div><div class='del'>-		ntfs_attr_search_ctx *ctx);</div><div class='del'>-extern int ntfs_map_runlist(ntfs_inode *ni, VCN vcn);</div><div class='del'>-</div><div class='del'>-extern LCN ntfs_attr_vcn_to_lcn_nolock(ntfs_inode *ni, const VCN vcn,</div><div class='del'>-		const bool write_locked);</div><div class='del'>-</div><div class='del'>-extern runlist_element *ntfs_attr_find_vcn_nolock(ntfs_inode *ni,</div><div class='del'>-		const VCN vcn, ntfs_attr_search_ctx *ctx);</div><div class='del'>-</div><div class='del'>-int ntfs_attr_lookup(const ATTR_TYPE type, const ntfschar *name,</div><div class='del'>-		const u32 name_len, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const VCN lowest_vcn, const u8 *val, const u32 val_len,</div><div class='del'>-		ntfs_attr_search_ctx *ctx);</div><div class='del'>-</div><div class='del'>-extern int load_attribute_list(ntfs_volume *vol, runlist *rl, u8 *al_start,</div><div class='del'>-		const s64 size, const s64 initialized_size);</div><div class='del'>-</div><div class='del'>-static inline s64 ntfs_attr_size(const ATTR_RECORD *a)</div><div class='del'>-{</div><div class='del'>-	if (!a-&gt;non_resident)</div><div class='del'>-		return (s64)le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	return sle64_to_cpu(a-&gt;data.non_resident.data_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void ntfs_attr_reinit_search_ctx(ntfs_attr_search_ctx *ctx);</div><div class='del'>-extern ntfs_attr_search_ctx *ntfs_attr_get_search_ctx(ntfs_inode *ni,</div><div class='del'>-		MFT_RECORD *mrec);</div><div class='del'>-extern void ntfs_attr_put_search_ctx(ntfs_attr_search_ctx *ctx);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-extern int ntfs_attr_size_bounds_check(const ntfs_volume *vol,</div><div class='del'>-		const ATTR_TYPE type, const s64 size);</div><div class='del'>-extern int ntfs_attr_can_be_non_resident(const ntfs_volume *vol,</div><div class='del'>-		const ATTR_TYPE type);</div><div class='del'>-extern int ntfs_attr_can_be_resident(const ntfs_volume *vol,</div><div class='del'>-		const ATTR_TYPE type);</div><div class='del'>-</div><div class='del'>-extern int ntfs_attr_record_resize(MFT_RECORD *m, ATTR_RECORD *a, u32 new_size);</div><div class='del'>-extern int ntfs_resident_attr_value_resize(MFT_RECORD *m, ATTR_RECORD *a,</div><div class='del'>-		const u32 new_size);</div><div class='del'>-</div><div class='del'>-extern int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size);</div><div class='del'>-</div><div class='del'>-extern s64 ntfs_attr_extend_allocation(ntfs_inode *ni, s64 new_alloc_size,</div><div class='del'>-		const s64 new_data_size, const s64 data_start);</div><div class='del'>-</div><div class='del'>-extern int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt,</div><div class='del'>-		const u8 val);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_ATTRIB_H */</div><div class='head'>diff --git a/fs/ntfs/bitmap.c b/fs/ntfs/bitmap.c<br/>deleted file mode 100644<br/>index 0675b2400873..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/bitmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/bitmap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * bitmap.c - NTFS kernel bitmap handling.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bitmap.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_bitmap_set_bits_in_run - set a run of bits in a bitmap to a value</div><div class='del'>- * @vi:			vfs inode describing the bitmap</div><div class='del'>- * @start_bit:		first bit to set</div><div class='del'>- * @count:		number of bits to set</div><div class='del'>- * @value:		value to set the bits to (i.e. 0 or 1)</div><div class='del'>- * @is_rollback:	if 'true' this is a rollback operation</div><div class='del'>- *</div><div class='del'>- * Set @count bits starting at bit @start_bit in the bitmap described by the</div><div class='del'>- * vfs inode @vi to @value, where @value is either 0 or 1.</div><div class='del'>- *</div><div class='del'>- * @is_rollback should always be 'false', it is for internal use to rollback</div><div class='del'>- * errors.  You probably want to use ntfs_bitmap_set_bits_in_run() instead.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,</div><div class='del'>-		const s64 count, const u8 value, const bool is_rollback)</div><div class='del'>-{</div><div class='del'>-	s64 cnt = count;</div><div class='del'>-	pgoff_t index, end_index;</div><div class='del'>-	struct address_space *mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u8 *kaddr;</div><div class='del'>-	int pos, len;</div><div class='del'>-	u8 bit;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!vi);</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, start_bit 0x%llx, count 0x%llx, "</div><div class='del'>-			"value %u.%s", vi-&gt;i_ino, (unsigned long long)start_bit,</div><div class='del'>-			(unsigned long long)cnt, (unsigned int)value,</div><div class='del'>-			is_rollback ? " (rollback)" : "");</div><div class='del'>-	BUG_ON(start_bit &lt; 0);</div><div class='del'>-	BUG_ON(cnt &lt; 0);</div><div class='del'>-	BUG_ON(value &gt; 1);</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate the indices for the pages containing the first and last</div><div class='del'>-	 * bits, i.e. @start_bit and @start_bit + @cnt - 1, respectively.</div><div class='del'>-	 */</div><div class='del'>-	index = start_bit &gt;&gt; (3 + PAGE_SHIFT);</div><div class='del'>-	end_index = (start_bit + cnt - 1) &gt;&gt; (3 + PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-	/* Get the page containing the first bit (@start_bit). */</div><div class='del'>-	mapping = vi-&gt;i_mapping;</div><div class='del'>-	page = ntfs_map_page(mapping, index);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		if (!is_rollback)</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Failed to map first page (error "</div><div class='del'>-					"%li), aborting.", PTR_ERR(page));</div><div class='del'>-		return PTR_ERR(page);</div><div class='del'>-	}</div><div class='del'>-	kaddr = page_address(page);</div><div class='del'>-</div><div class='del'>-	/* Set @pos to the position of the byte containing @start_bit. */</div><div class='del'>-	pos = (start_bit &gt;&gt; 3) &amp; ~PAGE_MASK;</div><div class='del'>-</div><div class='del'>-	/* Calculate the position of @start_bit in the first byte. */</div><div class='del'>-	bit = start_bit &amp; 7;</div><div class='del'>-</div><div class='del'>-	/* If the first byte is partial, modify the appropriate bits in it. */</div><div class='del'>-	if (bit) {</div><div class='del'>-		u8 *byte = kaddr + pos;</div><div class='del'>-		while ((bit &amp; 7) &amp;&amp; cnt) {</div><div class='del'>-			cnt--;</div><div class='del'>-			if (value)</div><div class='del'>-				*byte |= 1 &lt;&lt; bit++;</div><div class='del'>-			else</div><div class='del'>-				*byte &amp;= ~(1 &lt;&lt; bit++);</div><div class='del'>-		}</div><div class='del'>-		/* If we are done, unmap the page and return success. */</div><div class='del'>-		if (!cnt)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		/* Update @pos to the new position. */</div><div class='del'>-		pos++;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Depending on @value, modify all remaining whole bytes in the page up</div><div class='del'>-	 * to @cnt.</div><div class='del'>-	 */</div><div class='del'>-	len = min_t(s64, cnt &gt;&gt; 3, PAGE_SIZE - pos);</div><div class='del'>-	memset(kaddr + pos, value ? 0xff : 0, len);</div><div class='del'>-	cnt -= len &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	/* Update @len to point to the first not-done byte in the page. */</div><div class='del'>-	if (cnt &lt; 8)</div><div class='del'>-		len += pos;</div><div class='del'>-</div><div class='del'>-	/* If we are not in the last page, deal with all subsequent pages. */</div><div class='del'>-	while (index &lt; end_index) {</div><div class='del'>-		BUG_ON(cnt &lt;= 0);</div><div class='del'>-</div><div class='del'>-		/* Update @index and get the next page. */</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		page = ntfs_map_page(mapping, ++index);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			goto rollback;</div><div class='del'>-		kaddr = page_address(page);</div><div class='del'>-		/*</div><div class='del'>-		 * Depending on @value, modify all remaining whole bytes in the</div><div class='del'>-		 * page up to @cnt.</div><div class='del'>-		 */</div><div class='del'>-		len = min_t(s64, cnt &gt;&gt; 3, PAGE_SIZE);</div><div class='del'>-		memset(kaddr, value ? 0xff : 0, len);</div><div class='del'>-		cnt -= len &lt;&lt; 3;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The currently mapped page is the last one.  If the last byte is</div><div class='del'>-	 * partial, modify the appropriate bits in it.  Note, @len is the</div><div class='del'>-	 * position of the last byte inside the page.</div><div class='del'>-	 */</div><div class='del'>-	if (cnt) {</div><div class='del'>-		u8 *byte;</div><div class='del'>-</div><div class='del'>-		BUG_ON(cnt &gt; 7);</div><div class='del'>-</div><div class='del'>-		bit = cnt;</div><div class='del'>-		byte = kaddr + len;</div><div class='del'>-		while (bit--) {</div><div class='del'>-			if (value)</div><div class='del'>-				*byte |= 1 &lt;&lt; bit;</div><div class='del'>-			else</div><div class='del'>-				*byte &amp;= ~(1 &lt;&lt; bit);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	/* We are done.  Unmap the page and return success. */</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-rollback:</div><div class='del'>-	/*</div><div class='del'>-	 * Current state:</div><div class='del'>-	 *	- no pages are mapped</div><div class='del'>-	 *	- @count - @cnt is the number of bits that have been modified</div><div class='del'>-	 */</div><div class='del'>-	if (is_rollback)</div><div class='del'>-		return PTR_ERR(page);</div><div class='del'>-	if (count != cnt)</div><div class='del'>-		pos = __ntfs_bitmap_set_bits_in_run(vi, start_bit, count - cnt,</div><div class='del'>-				value ? 0 : 1, true);</div><div class='del'>-	else</div><div class='del'>-		pos = 0;</div><div class='del'>-	if (!pos) {</div><div class='del'>-		/* Rollback was successful. */</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed to map subsequent page (error "</div><div class='del'>-				"%li), aborting.", PTR_ERR(page));</div><div class='del'>-	} else {</div><div class='del'>-		/* Rollback failed. */</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed to map subsequent page (error "</div><div class='del'>-				"%li) and rollback failed (error %i).  "</div><div class='del'>-				"Aborting and leaving inconsistent metadata.  "</div><div class='del'>-				"Unmount and run chkdsk.", PTR_ERR(page), pos);</div><div class='del'>-		NVolSetErrors(NTFS_SB(vi-&gt;i_sb));</div><div class='del'>-	}</div><div class='del'>-	return PTR_ERR(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/bitmap.h b/fs/ntfs/bitmap.h<br/>deleted file mode 100644<br/>index 9dd2224ca9c4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/bitmap.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/bitmap.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * bitmap.h - Defines for NTFS kernel bitmap handling.  Part of the Linux-NTFS</div><div class='del'>- *	      project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_BITMAP_H</div><div class='del'>-#define _LINUX_NTFS_BITMAP_H</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-</div><div class='del'>-extern int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,</div><div class='del'>-		const s64 count, const u8 value, const bool is_rollback);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_bitmap_set_bits_in_run - set a run of bits in a bitmap to a value</div><div class='del'>- * @vi:			vfs inode describing the bitmap</div><div class='del'>- * @start_bit:		first bit to set</div><div class='del'>- * @count:		number of bits to set</div><div class='del'>- * @value:		value to set the bits to (i.e. 0 or 1)</div><div class='del'>- *</div><div class='del'>- * Set @count bits starting at bit @start_bit in the bitmap described by the</div><div class='del'>- * vfs inode @vi to @value, where @value is either 0 or 1.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_bitmap_set_bits_in_run(struct inode *vi,</div><div class='del'>-		const s64 start_bit, const s64 count, const u8 value)</div><div class='del'>-{</div><div class='del'>-	return __ntfs_bitmap_set_bits_in_run(vi, start_bit, count, value,</div><div class='del'>-			false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_bitmap_set_run - set a run of bits in a bitmap</div><div class='del'>- * @vi:		vfs inode describing the bitmap</div><div class='del'>- * @start_bit:	first bit to set</div><div class='del'>- * @count:	number of bits to set</div><div class='del'>- *</div><div class='del'>- * Set @count bits starting at bit @start_bit in the bitmap described by the</div><div class='del'>- * vfs inode @vi.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_bitmap_set_run(struct inode *vi, const s64 start_bit,</div><div class='del'>-		const s64 count)</div><div class='del'>-{</div><div class='del'>-	return ntfs_bitmap_set_bits_in_run(vi, start_bit, count, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_bitmap_clear_run - clear a run of bits in a bitmap</div><div class='del'>- * @vi:		vfs inode describing the bitmap</div><div class='del'>- * @start_bit:	first bit to clear</div><div class='del'>- * @count:	number of bits to clear</div><div class='del'>- *</div><div class='del'>- * Clear @count bits starting at bit @start_bit in the bitmap described by the</div><div class='del'>- * vfs inode @vi.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_bitmap_clear_run(struct inode *vi, const s64 start_bit,</div><div class='del'>-		const s64 count)</div><div class='del'>-{</div><div class='del'>-	return ntfs_bitmap_set_bits_in_run(vi, start_bit, count, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_bitmap_set_bit - set a bit in a bitmap</div><div class='del'>- * @vi:		vfs inode describing the bitmap</div><div class='del'>- * @bit:	bit to set</div><div class='del'>- *</div><div class='del'>- * Set bit @bit in the bitmap described by the vfs inode @vi.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_bitmap_set_bit(struct inode *vi, const s64 bit)</div><div class='del'>-{</div><div class='del'>-	return ntfs_bitmap_set_run(vi, bit, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_bitmap_clear_bit - clear a bit in a bitmap</div><div class='del'>- * @vi:		vfs inode describing the bitmap</div><div class='del'>- * @bit:	bit to clear</div><div class='del'>- *</div><div class='del'>- * Clear bit @bit in the bitmap described by the vfs inode @vi.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_bitmap_clear_bit(struct inode *vi, const s64 bit)</div><div class='del'>-{</div><div class='del'>-	return ntfs_bitmap_clear_run(vi, bit, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* defined _LINUX_NTFS_BITMAP_H */</div><div class='head'>diff --git a/fs/ntfs/collate.c b/fs/ntfs/collate.c<br/>deleted file mode 100644<br/>index 3ab6ec96abfe..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/collate.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/collate.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * collate.c - NTFS kernel collation handling.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "collate.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-static int ntfs_collate_binary(ntfs_volume *vol,</div><div class='del'>-		const void *data1, const int data1_len,</div><div class='del'>-		const void *data2, const int data2_len)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	rc = memcmp(data1, data2, min(data1_len, data2_len));</div><div class='del'>-	if (!rc &amp;&amp; (data1_len != data2_len)) {</div><div class='del'>-		if (data1_len &lt; data2_len)</div><div class='del'>-			rc = -1;</div><div class='del'>-		else</div><div class='del'>-			rc = 1;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done, returning %i", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ntfs_collate_ntofs_ulong(ntfs_volume *vol,</div><div class='del'>-		const void *data1, const int data1_len,</div><div class='del'>-		const void *data2, const int data2_len)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	u32 d1, d2;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	// FIXME:  We don't really want to bug here.</div><div class='del'>-	BUG_ON(data1_len != data2_len);</div><div class='del'>-	BUG_ON(data1_len != 4);</div><div class='del'>-	d1 = le32_to_cpup(data1);</div><div class='del'>-	d2 = le32_to_cpup(data2);</div><div class='del'>-	if (d1 &lt; d2)</div><div class='del'>-		rc = -1;</div><div class='del'>-	else {</div><div class='del'>-		if (d1 == d2)</div><div class='del'>-			rc = 0;</div><div class='del'>-		else</div><div class='del'>-			rc = 1;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done, returning %i", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*ntfs_collate_func_t)(ntfs_volume *, const void *, const int,</div><div class='del'>-		const void *, const int);</div><div class='del'>-</div><div class='del'>-static ntfs_collate_func_t ntfs_do_collate0x0[3] = {</div><div class='del'>-	ntfs_collate_binary,</div><div class='del'>-	NULL/*ntfs_collate_file_name*/,</div><div class='del'>-	NULL/*ntfs_collate_unicode_string*/,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ntfs_collate_func_t ntfs_do_collate0x1[4] = {</div><div class='del'>-	ntfs_collate_ntofs_ulong,</div><div class='del'>-	NULL/*ntfs_collate_ntofs_sid*/,</div><div class='del'>-	NULL/*ntfs_collate_ntofs_security_hash*/,</div><div class='del'>-	NULL/*ntfs_collate_ntofs_ulongs*/,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_collate - collate two data items using a specified collation rule</div><div class='del'>- * @vol:	ntfs volume to which the data items belong</div><div class='del'>- * @cr:		collation rule to use when comparing the items</div><div class='del'>- * @data1:	first data item to collate</div><div class='del'>- * @data1_len:	length in bytes of @data1</div><div class='del'>- * @data2:	second data item to collate</div><div class='del'>- * @data2_len:	length in bytes of @data2</div><div class='del'>- *</div><div class='del'>- * Collate the two data items @data1 and @data2 using the collation rule @cr</div><div class='del'>- * and return -1, 0, ir 1 if @data1 is found, respectively, to collate before,</div><div class='del'>- * to match, or to collate after @data2.</div><div class='del'>- *</div><div class='del'>- * For speed we use the collation rule @cr as an index into two tables of</div><div class='del'>- * function pointers to call the appropriate collation function.</div><div class='del'>- */</div><div class='del'>-int ntfs_collate(ntfs_volume *vol, COLLATION_RULE cr,</div><div class='del'>-		const void *data1, const int data1_len,</div><div class='del'>-		const void *data2, const int data2_len) {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME:  At the moment we only support COLLATION_BINARY and</div><div class='del'>-	 * COLLATION_NTOFS_ULONG, so we BUG() for everything else for now.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(cr != COLLATION_BINARY &amp;&amp; cr != COLLATION_NTOFS_ULONG);</div><div class='del'>-	i = le32_to_cpu(cr);</div><div class='del'>-	BUG_ON(i &lt; 0);</div><div class='del'>-	if (i &lt;= 0x02)</div><div class='del'>-		return ntfs_do_collate0x0[i](vol, data1, data1_len,</div><div class='del'>-				data2, data2_len);</div><div class='del'>-	BUG_ON(i &lt; 0x10);</div><div class='del'>-	i -= 0x10;</div><div class='del'>-	if (likely(i &lt;= 3))</div><div class='del'>-		return ntfs_do_collate0x1[i](vol, data1, data1_len,</div><div class='del'>-				data2, data2_len);</div><div class='del'>-	BUG();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/ntfs/collate.h b/fs/ntfs/collate.h<br/>deleted file mode 100644<br/>index f2255619b4f4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/collate.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/collate.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * collate.h - Defines for NTFS kernel collation handling.  Part of the</div><div class='del'>- *	       Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_COLLATE_H</div><div class='del'>-#define _LINUX_NTFS_COLLATE_H</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-static inline bool ntfs_is_collation_rule_supported(COLLATION_RULE cr) {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME:  At the moment we only support COLLATION_BINARY and</div><div class='del'>-	 * COLLATION_NTOFS_ULONG, so we return false for everything else for</div><div class='del'>-	 * now.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(cr != COLLATION_BINARY &amp;&amp; cr != COLLATION_NTOFS_ULONG))</div><div class='del'>-		return false;</div><div class='del'>-	i = le32_to_cpu(cr);</div><div class='del'>-	if (likely(((i &gt;= 0) &amp;&amp; (i &lt;= 0x02)) ||</div><div class='del'>-			((i &gt;= 0x10) &amp;&amp; (i &lt;= 0x13))))</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int ntfs_collate(ntfs_volume *vol, COLLATION_RULE cr,</div><div class='del'>-		const void *data1, const int data1_len,</div><div class='del'>-		const void *data2, const int data2_len);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_COLLATE_H */</div><div class='head'>diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c<br/>deleted file mode 100644<br/>index 761aaa0195d6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/compress.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/compress.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,950 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * compress.c - NTFS kernel compressed attributes handling.</div><div class='del'>- *		Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_compression_constants - enum of constants used in the compression code</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	/* Token types and access mask. */</div><div class='del'>-	NTFS_SYMBOL_TOKEN	=	0,</div><div class='del'>-	NTFS_PHRASE_TOKEN	=	1,</div><div class='del'>-	NTFS_TOKEN_MASK		=	1,</div><div class='del'>-</div><div class='del'>-	/* Compression sub-block constants. */</div><div class='del'>-	NTFS_SB_SIZE_MASK	=	0x0fff,</div><div class='del'>-	NTFS_SB_SIZE		=	0x1000,</div><div class='del'>-	NTFS_SB_IS_COMPRESSED	=	0x8000,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The maximum compression block size is by definition 16 * the cluster</div><div class='del'>-	 * size, with the maximum supported cluster size being 4kiB. Thus the</div><div class='del'>-	 * maximum compression buffer size is 64kiB, so we use this when</div><div class='del'>-	 * initializing the compression buffer.</div><div class='del'>-	 */</div><div class='del'>-	NTFS_MAX_CB_SIZE	= 64 * 1024,</div><div class='del'>-} ntfs_compression_constants;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_compression_buffer - one buffer for the decompression engine</div><div class='del'>- */</div><div class='del'>-static u8 *ntfs_compression_buffer;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_cb_lock - spinlock which protects ntfs_compression_buffer</div><div class='del'>- */</div><div class='del'>-static DEFINE_SPINLOCK(ntfs_cb_lock);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * allocate_compression_buffers - allocate the decompression buffers</div><div class='del'>- *</div><div class='del'>- * Caller has to hold the ntfs_lock mutex.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success or -ENOMEM if the allocations failed.</div><div class='del'>- */</div><div class='del'>-int allocate_compression_buffers(void)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(ntfs_compression_buffer);</div><div class='del'>-</div><div class='del'>-	ntfs_compression_buffer = vmalloc(NTFS_MAX_CB_SIZE);</div><div class='del'>-	if (!ntfs_compression_buffer)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * free_compression_buffers - free the decompression buffers</div><div class='del'>- *</div><div class='del'>- * Caller has to hold the ntfs_lock mutex.</div><div class='del'>- */</div><div class='del'>-void free_compression_buffers(void)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!ntfs_compression_buffer);</div><div class='del'>-	vfree(ntfs_compression_buffer);</div><div class='del'>-	ntfs_compression_buffer = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * zero_partial_compressed_page - zero out of bounds compressed page region</div><div class='del'>- */</div><div class='del'>-static void zero_partial_compressed_page(struct page *page,</div><div class='del'>-		const s64 initialized_size)</div><div class='del'>-{</div><div class='del'>-	u8 *kp = page_address(page);</div><div class='del'>-	unsigned int kp_ofs;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Zeroing page region outside initialized size.");</div><div class='del'>-	if (((s64)page-&gt;index &lt;&lt; PAGE_SHIFT) &gt;= initialized_size) {</div><div class='del'>-		clear_page(kp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	kp_ofs = initialized_size &amp; ~PAGE_MASK;</div><div class='del'>-	memset(kp + kp_ofs, 0, PAGE_SIZE - kp_ofs);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * handle_bounds_compressed_page - test for&amp;handle out of bounds compressed page</div><div class='del'>- */</div><div class='del'>-static inline void handle_bounds_compressed_page(struct page *page,</div><div class='del'>-		const loff_t i_size, const s64 initialized_size)</div><div class='del'>-{</div><div class='del'>-	if ((page-&gt;index &gt;= (initialized_size &gt;&gt; PAGE_SHIFT)) &amp;&amp;</div><div class='del'>-			(initialized_size &lt; i_size))</div><div class='del'>-		zero_partial_compressed_page(page, initialized_size);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_decompress - decompress a compression block into an array of pages</div><div class='del'>- * @dest_pages:		destination array of pages</div><div class='del'>- * @completed_pages:	scratch space to track completed pages</div><div class='del'>- * @dest_index:		current index into @dest_pages (IN/OUT)</div><div class='del'>- * @dest_ofs:		current offset within @dest_pages[@dest_index] (IN/OUT)</div><div class='del'>- * @dest_max_index:	maximum index into @dest_pages (IN)</div><div class='del'>- * @dest_max_ofs:	maximum offset within @dest_pages[@dest_max_index] (IN)</div><div class='del'>- * @xpage:		the target page (-1 if none) (IN)</div><div class='del'>- * @xpage_done:		set to 1 if xpage was completed successfully (IN/OUT)</div><div class='del'>- * @cb_start:		compression block to decompress (IN)</div><div class='del'>- * @cb_size:		size of compression block @cb_start in bytes (IN)</div><div class='del'>- * @i_size:		file size when we started the read (IN)</div><div class='del'>- * @initialized_size:	initialized file size when we started the read (IN)</div><div class='del'>- *</div><div class='del'>- * The caller must have disabled preemption. ntfs_decompress() reenables it when</div><div class='del'>- * the critical section is finished.</div><div class='del'>- *</div><div class='del'>- * This decompresses the compression block @cb_start into the array of</div><div class='del'>- * destination pages @dest_pages starting at index @dest_index into @dest_pages</div><div class='del'>- * and at offset @dest_pos into the page @dest_pages[@dest_index].</div><div class='del'>- *</div><div class='del'>- * When the page @dest_pages[@xpage] is completed, @xpage_done is set to 1.</div><div class='del'>- * If xpage is -1 or @xpage has not been completed, @xpage_done is not modified.</div><div class='del'>- *</div><div class='del'>- * @cb_start is a pointer to the compression block which needs decompressing</div><div class='del'>- * and @cb_size is the size of @cb_start in bytes (8-64kiB).</div><div class='del'>- *</div><div class='del'>- * Return 0 if success or -EOVERFLOW on error in the compressed stream.</div><div class='del'>- * @xpage_done indicates whether the target page (@dest_pages[@xpage]) was</div><div class='del'>- * completed during the decompression of the compression block (@cb_start).</div><div class='del'>- *</div><div class='del'>- * Warning: This function *REQUIRES* PAGE_SIZE &gt;= 4096 or it will blow up</div><div class='del'>- * unpredicatbly! You have been warned!</div><div class='del'>- *</div><div class='del'>- * Note to hackers: This function may not sleep until it has finished accessing</div><div class='del'>- * the compression block @cb_start as it is a per-CPU buffer.</div><div class='del'>- */</div><div class='del'>-static int ntfs_decompress(struct page *dest_pages[], int completed_pages[],</div><div class='del'>-		int *dest_index, int *dest_ofs, const int dest_max_index,</div><div class='del'>-		const int dest_max_ofs, const int xpage, char *xpage_done,</div><div class='del'>-		u8 *const cb_start, const u32 cb_size, const loff_t i_size,</div><div class='del'>-		const s64 initialized_size)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Pointers into the compressed data, i.e. the compression block (cb),</div><div class='del'>-	 * and the therein contained sub-blocks (sb).</div><div class='del'>-	 */</div><div class='del'>-	u8 *cb_end = cb_start + cb_size; /* End of cb. */</div><div class='del'>-	u8 *cb = cb_start;	/* Current position in cb. */</div><div class='del'>-	u8 *cb_sb_start;	/* Beginning of the current sb in the cb. */</div><div class='del'>-	u8 *cb_sb_end;		/* End of current sb / beginning of next sb. */</div><div class='del'>-</div><div class='del'>-	/* Variables for uncompressed data / destination. */</div><div class='del'>-	struct page *dp;	/* Current destination page being worked on. */</div><div class='del'>-	u8 *dp_addr;		/* Current pointer into dp. */</div><div class='del'>-	u8 *dp_sb_start;	/* Start of current sub-block in dp. */</div><div class='del'>-	u8 *dp_sb_end;		/* End of current sb in dp (dp_sb_start +</div><div class='del'>-				   NTFS_SB_SIZE). */</div><div class='del'>-	u16 do_sb_start;	/* @dest_ofs when starting this sub-block. */</div><div class='del'>-	u16 do_sb_end;		/* @dest_ofs of end of this sb (do_sb_start +</div><div class='del'>-				   NTFS_SB_SIZE). */</div><div class='del'>-</div><div class='del'>-	/* Variables for tag and token parsing. */</div><div class='del'>-	u8 tag;			/* Current tag. */</div><div class='del'>-	int token;		/* Loop counter for the eight tokens in tag. */</div><div class='del'>-	int nr_completed_pages = 0;</div><div class='del'>-</div><div class='del'>-	/* Default error code. */</div><div class='del'>-	int err = -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering, cb_size = 0x%x.", cb_size);</div><div class='del'>-do_next_sb:</div><div class='del'>-	ntfs_debug("Beginning sub-block at offset = 0x%zx in the cb.",</div><div class='del'>-			cb - cb_start);</div><div class='del'>-	/*</div><div class='del'>-	 * Have we reached the end of the compression block or the end of the</div><div class='del'>-	 * decompressed data?  The latter can happen for example if the current</div><div class='del'>-	 * position in the compression block is one byte before its end so the</div><div class='del'>-	 * first two checks do not detect it.</div><div class='del'>-	 */</div><div class='del'>-	if (cb == cb_end || !le16_to_cpup((le16*)cb) ||</div><div class='del'>-			(*dest_index == dest_max_index &amp;&amp;</div><div class='del'>-			*dest_ofs == dest_max_ofs)) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Completed. Returning success (0).");</div><div class='del'>-		err = 0;</div><div class='del'>-return_error:</div><div class='del'>-		/* We can sleep from now on, so we drop lock. */</div><div class='del'>-		spin_unlock(&amp;ntfs_cb_lock);</div><div class='del'>-		/* Second stage: finalize completed pages. */</div><div class='del'>-		if (nr_completed_pages &gt; 0) {</div><div class='del'>-			for (i = 0; i &lt; nr_completed_pages; i++) {</div><div class='del'>-				int di = completed_pages[i];</div><div class='del'>-</div><div class='del'>-				dp = dest_pages[di];</div><div class='del'>-				/*</div><div class='del'>-				 * If we are outside the initialized size, zero</div><div class='del'>-				 * the out of bounds page range.</div><div class='del'>-				 */</div><div class='del'>-				handle_bounds_compressed_page(dp, i_size,</div><div class='del'>-						initialized_size);</div><div class='del'>-				flush_dcache_page(dp);</div><div class='del'>-				kunmap(dp);</div><div class='del'>-				SetPageUptodate(dp);</div><div class='del'>-				unlock_page(dp);</div><div class='del'>-				if (di == xpage)</div><div class='del'>-					*xpage_done = 1;</div><div class='del'>-				else</div><div class='del'>-					put_page(dp);</div><div class='del'>-				dest_pages[di] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup offsets for the current sub-block destination. */</div><div class='del'>-	do_sb_start = *dest_ofs;</div><div class='del'>-	do_sb_end = do_sb_start + NTFS_SB_SIZE;</div><div class='del'>-</div><div class='del'>-	/* Check that we are still within allowed boundaries. */</div><div class='del'>-	if (*dest_index == dest_max_index &amp;&amp; do_sb_end &gt; dest_max_ofs)</div><div class='del'>-		goto return_overflow;</div><div class='del'>-</div><div class='del'>-	/* Does the minimum size of a compressed sb overflow valid range? */</div><div class='del'>-	if (cb + 6 &gt; cb_end)</div><div class='del'>-		goto return_overflow;</div><div class='del'>-</div><div class='del'>-	/* Setup the current sub-block source pointers and validate range. */</div><div class='del'>-	cb_sb_start = cb;</div><div class='del'>-	cb_sb_end = cb_sb_start + (le16_to_cpup((le16*)cb) &amp; NTFS_SB_SIZE_MASK)</div><div class='del'>-			+ 3;</div><div class='del'>-	if (cb_sb_end &gt; cb_end)</div><div class='del'>-		goto return_overflow;</div><div class='del'>-</div><div class='del'>-	/* Get the current destination page. */</div><div class='del'>-	dp = dest_pages[*dest_index];</div><div class='del'>-	if (!dp) {</div><div class='del'>-		/* No page present. Skip decompression of this sub-block. */</div><div class='del'>-		cb = cb_sb_end;</div><div class='del'>-</div><div class='del'>-		/* Advance destination position to next sub-block. */</div><div class='del'>-		*dest_ofs = (*dest_ofs + NTFS_SB_SIZE) &amp; ~PAGE_MASK;</div><div class='del'>-		if (!*dest_ofs &amp;&amp; (++*dest_index &gt; dest_max_index))</div><div class='del'>-			goto return_overflow;</div><div class='del'>-		goto do_next_sb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We have a valid destination page. Setup the destination pointers. */</div><div class='del'>-	dp_addr = (u8*)page_address(dp) + do_sb_start;</div><div class='del'>-</div><div class='del'>-	/* Now, we are ready to process the current sub-block (sb). */</div><div class='del'>-	if (!(le16_to_cpup((le16*)cb) &amp; NTFS_SB_IS_COMPRESSED)) {</div><div class='del'>-		ntfs_debug("Found uncompressed sub-block.");</div><div class='del'>-		/* This sb is not compressed, just copy it into destination. */</div><div class='del'>-</div><div class='del'>-		/* Advance source position to first data byte. */</div><div class='del'>-		cb += 2;</div><div class='del'>-</div><div class='del'>-		/* An uncompressed sb must be full size. */</div><div class='del'>-		if (cb_sb_end - cb != NTFS_SB_SIZE)</div><div class='del'>-			goto return_overflow;</div><div class='del'>-</div><div class='del'>-		/* Copy the block and advance the source position. */</div><div class='del'>-		memcpy(dp_addr, cb, NTFS_SB_SIZE);</div><div class='del'>-		cb += NTFS_SB_SIZE;</div><div class='del'>-</div><div class='del'>-		/* Advance destination position to next sub-block. */</div><div class='del'>-		*dest_ofs += NTFS_SB_SIZE;</div><div class='del'>-		if (!(*dest_ofs &amp;= ~PAGE_MASK)) {</div><div class='del'>-finalize_page:</div><div class='del'>-			/*</div><div class='del'>-			 * First stage: add current page index to array of</div><div class='del'>-			 * completed pages.</div><div class='del'>-			 */</div><div class='del'>-			completed_pages[nr_completed_pages++] = *dest_index;</div><div class='del'>-			if (++*dest_index &gt; dest_max_index)</div><div class='del'>-				goto return_overflow;</div><div class='del'>-		}</div><div class='del'>-		goto do_next_sb;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Found compressed sub-block.");</div><div class='del'>-	/* This sb is compressed, decompress it into destination. */</div><div class='del'>-</div><div class='del'>-	/* Setup destination pointers. */</div><div class='del'>-	dp_sb_start = dp_addr;</div><div class='del'>-	dp_sb_end = dp_sb_start + NTFS_SB_SIZE;</div><div class='del'>-</div><div class='del'>-	/* Forward to the first tag in the sub-block. */</div><div class='del'>-	cb += 2;</div><div class='del'>-do_next_tag:</div><div class='del'>-	if (cb == cb_sb_end) {</div><div class='del'>-		/* Check if the decompressed sub-block was not full-length. */</div><div class='del'>-		if (dp_addr &lt; dp_sb_end) {</div><div class='del'>-			int nr_bytes = do_sb_end - *dest_ofs;</div><div class='del'>-</div><div class='del'>-			ntfs_debug("Filling incomplete sub-block with "</div><div class='del'>-					"zeroes.");</div><div class='del'>-			/* Zero remainder and update destination position. */</div><div class='del'>-			memset(dp_addr, 0, nr_bytes);</div><div class='del'>-			*dest_ofs += nr_bytes;</div><div class='del'>-		}</div><div class='del'>-		/* We have finished the current sub-block. */</div><div class='del'>-		if (!(*dest_ofs &amp;= ~PAGE_MASK))</div><div class='del'>-			goto finalize_page;</div><div class='del'>-		goto do_next_sb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check we are still in range. */</div><div class='del'>-	if (cb &gt; cb_sb_end || dp_addr &gt; dp_sb_end)</div><div class='del'>-		goto return_overflow;</div><div class='del'>-</div><div class='del'>-	/* Get the next tag and advance to first token. */</div><div class='del'>-	tag = *cb++;</div><div class='del'>-</div><div class='del'>-	/* Parse the eight tokens described by the tag. */</div><div class='del'>-	for (token = 0; token &lt; 8; token++, tag &gt;&gt;= 1) {</div><div class='del'>-		u16 lg, pt, length, max_non_overlap;</div><div class='del'>-		register u16 i;</div><div class='del'>-		u8 *dp_back_addr;</div><div class='del'>-</div><div class='del'>-		/* Check if we are done / still in range. */</div><div class='del'>-		if (cb &gt;= cb_sb_end || dp_addr &gt; dp_sb_end)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Determine token type and parse appropriately.*/</div><div class='del'>-		if ((tag &amp; NTFS_TOKEN_MASK) == NTFS_SYMBOL_TOKEN) {</div><div class='del'>-			/*</div><div class='del'>-			 * We have a symbol token, copy the symbol across, and</div><div class='del'>-			 * advance the source and destination positions.</div><div class='del'>-			 */</div><div class='del'>-			*dp_addr++ = *cb++;</div><div class='del'>-			++*dest_ofs;</div><div class='del'>-</div><div class='del'>-			/* Continue with the next token. */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We have a phrase token. Make sure it is not the first tag in</div><div class='del'>-		 * the sb as this is illegal and would confuse the code below.</div><div class='del'>-		 */</div><div class='del'>-		if (dp_addr == dp_sb_start)</div><div class='del'>-			goto return_overflow;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Determine the number of bytes to go back (p) and the number</div><div class='del'>-		 * of bytes to copy (l). We use an optimized algorithm in which</div><div class='del'>-		 * we first calculate log2(current destination position in sb),</div><div class='del'>-		 * which allows determination of l and p in O(1) rather than</div><div class='del'>-		 * O(n). We just need an arch-optimized log2() function now.</div><div class='del'>-		 */</div><div class='del'>-		lg = 0;</div><div class='del'>-		for (i = *dest_ofs - do_sb_start - 1; i &gt;= 0x10; i &gt;&gt;= 1)</div><div class='del'>-			lg++;</div><div class='del'>-</div><div class='del'>-		/* Get the phrase token into i. */</div><div class='del'>-		pt = le16_to_cpup((le16*)cb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate starting position of the byte sequence in</div><div class='del'>-		 * the destination using the fact that p = (pt &gt;&gt; (12 - lg)) + 1</div><div class='del'>-		 * and make sure we don't go too far back.</div><div class='del'>-		 */</div><div class='del'>-		dp_back_addr = dp_addr - (pt &gt;&gt; (12 - lg)) - 1;</div><div class='del'>-		if (dp_back_addr &lt; dp_sb_start)</div><div class='del'>-			goto return_overflow;</div><div class='del'>-</div><div class='del'>-		/* Now calculate the length of the byte sequence. */</div><div class='del'>-		length = (pt &amp; (0xfff &gt;&gt; lg)) + 3;</div><div class='del'>-</div><div class='del'>-		/* Advance destination position and verify it is in range. */</div><div class='del'>-		*dest_ofs += length;</div><div class='del'>-		if (*dest_ofs &gt; do_sb_end)</div><div class='del'>-			goto return_overflow;</div><div class='del'>-</div><div class='del'>-		/* The number of non-overlapping bytes. */</div><div class='del'>-		max_non_overlap = dp_addr - dp_back_addr;</div><div class='del'>-</div><div class='del'>-		if (length &lt;= max_non_overlap) {</div><div class='del'>-			/* The byte sequence doesn't overlap, just copy it. */</div><div class='del'>-			memcpy(dp_addr, dp_back_addr, length);</div><div class='del'>-</div><div class='del'>-			/* Advance destination pointer. */</div><div class='del'>-			dp_addr += length;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * The byte sequence does overlap, copy non-overlapping</div><div class='del'>-			 * part and then do a slow byte by byte copy for the</div><div class='del'>-			 * overlapping part. Also, advance the destination</div><div class='del'>-			 * pointer.</div><div class='del'>-			 */</div><div class='del'>-			memcpy(dp_addr, dp_back_addr, max_non_overlap);</div><div class='del'>-			dp_addr += max_non_overlap;</div><div class='del'>-			dp_back_addr += max_non_overlap;</div><div class='del'>-			length -= max_non_overlap;</div><div class='del'>-			while (length--)</div><div class='del'>-				*dp_addr++ = *dp_back_addr++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Advance source position and continue with the next token. */</div><div class='del'>-		cb += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No tokens left in the current tag. Continue with the next tag. */</div><div class='del'>-	goto do_next_tag;</div><div class='del'>-</div><div class='del'>-return_overflow:</div><div class='del'>-	ntfs_error(NULL, "Failed. Returning -EOVERFLOW.");</div><div class='del'>-	goto return_error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_compressed_block - read a compressed block into the page cache</div><div class='del'>- * @page:	locked page in the compression block(s) we need to read</div><div class='del'>- *</div><div class='del'>- * When we are called the page has already been verified to be locked and the</div><div class='del'>- * attribute is known to be non-resident, not encrypted, but compressed.</div><div class='del'>- *</div><div class='del'>- * 1. Determine which compression block(s) @page is in.</div><div class='del'>- * 2. Get hold of all pages corresponding to this/these compression block(s).</div><div class='del'>- * 3. Read the (first) compression block.</div><div class='del'>- * 4. Decompress it into the corresponding pages.</div><div class='del'>- * 5. Throw the compressed data away and proceed to 3. for the next compression</div><div class='del'>- *    block or return success if no more compression blocks left.</div><div class='del'>- *</div><div class='del'>- * Warning: We have to be careful what we do about existing pages. They might</div><div class='del'>- * have been written to so that we would lose data if we were to just overwrite</div><div class='del'>- * them with the out-of-date uncompressed data.</div><div class='del'>- *</div><div class='del'>- * FIXME: For PAGE_SIZE &gt; cb_size we are not doing the Right Thing(TM) at</div><div class='del'>- * the end of the file I think. We need to detect this case and zero the out</div><div class='del'>- * of bounds remainder of the page in question and mark it as handled. At the</div><div class='del'>- * moment we would just return -EIO on such a page. This bug will only become</div><div class='del'>- * apparent if pages are above 8kiB and the NTFS volume only uses 512 byte</div><div class='del'>- * clusters so is probably not going to be seen by anyone. Still this should</div><div class='del'>- * be fixed. (AIA)</div><div class='del'>- *</div><div class='del'>- * FIXME: Again for PAGE_SIZE &gt; cb_size we are screwing up both in</div><div class='del'>- * handling sparse and compressed cbs. (AIA)</div><div class='del'>- *</div><div class='del'>- * FIXME: At the moment we don't do any zeroing out in the case that</div><div class='del'>- * initialized_size is less than data_size. This should be safe because of the</div><div class='del'>- * nature of the compression algorithm used. Just in case we check and output</div><div class='del'>- * an error message in read inode if the two sizes are not equal for a</div><div class='del'>- * compressed file. (AIA)</div><div class='del'>- */</div><div class='del'>-int ntfs_read_compressed_block(struct page *page)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	s64 initialized_size;</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(mapping-&gt;host);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	unsigned long flags, block_size = sb-&gt;s_blocksize;</div><div class='del'>-	unsigned char block_size_bits = sb-&gt;s_blocksize_bits;</div><div class='del'>-	u8 *cb, *cb_pos, *cb_end;</div><div class='del'>-	struct buffer_head **bhs;</div><div class='del'>-	unsigned long offset, index = page-&gt;index;</div><div class='del'>-	u32 cb_size = ni-&gt;itype.compressed.block_size;</div><div class='del'>-	u64 cb_size_mask = cb_size - 1UL;</div><div class='del'>-	VCN vcn;</div><div class='del'>-	LCN lcn;</div><div class='del'>-	/* The first wanted vcn (minimum alignment is PAGE_SIZE). */</div><div class='del'>-	VCN start_vcn = (((s64)index &lt;&lt; PAGE_SHIFT) &amp; ~cb_size_mask) &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits;</div><div class='del'>-	/*</div><div class='del'>-	 * The first vcn after the last wanted vcn (minimum alignment is again</div><div class='del'>-	 * PAGE_SIZE.</div><div class='del'>-	 */</div><div class='del'>-	VCN end_vcn = ((((s64)(index + 1UL) &lt;&lt; PAGE_SHIFT) + cb_size - 1)</div><div class='del'>-			&amp; ~cb_size_mask) &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-	/* Number of compression blocks (cbs) in the wanted vcn range. */</div><div class='del'>-	unsigned int nr_cbs = (end_vcn - start_vcn) &lt;&lt; vol-&gt;cluster_size_bits</div><div class='del'>-			&gt;&gt; ni-&gt;itype.compressed.block_size_bits;</div><div class='del'>-	/*</div><div class='del'>-	 * Number of pages required to store the uncompressed data from all</div><div class='del'>-	 * compression blocks (cbs) overlapping @page. Due to alignment</div><div class='del'>-	 * guarantees of start_vcn and end_vcn, no need to round up here.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int nr_pages = (end_vcn - start_vcn) &lt;&lt;</div><div class='del'>-			vol-&gt;cluster_size_bits &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned int xpage, max_page, cur_page, cur_ofs, i;</div><div class='del'>-	unsigned int cb_clusters, cb_max_ofs;</div><div class='del'>-	int block, max_block, cb_max_page, bhs_size, nr_bhs, err = 0;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	int *completed_pages;</div><div class='del'>-	unsigned char xpage_done = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering, page-&gt;index = 0x%lx, cb_size = 0x%x, nr_pages = "</div><div class='del'>-			"%i.", index, cb_size, nr_pages);</div><div class='del'>-	/*</div><div class='del'>-	 * Bad things happen if we get here for anything that is not an</div><div class='del'>-	 * unnamed $DATA attribute.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(ni-&gt;type != AT_DATA);</div><div class='del'>-	BUG_ON(ni-&gt;name_len);</div><div class='del'>-</div><div class='del'>-	pages = kmalloc_array(nr_pages, sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	completed_pages = kmalloc_array(nr_pages + 1, sizeof(int), GFP_NOFS);</div><div class='del'>-</div><div class='del'>-	/* Allocate memory to store the buffer heads we need. */</div><div class='del'>-	bhs_size = cb_size / block_size * sizeof(struct buffer_head *);</div><div class='del'>-	bhs = kmalloc(bhs_size, GFP_NOFS);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!pages || !bhs || !completed_pages)) {</div><div class='del'>-		kfree(bhs);</div><div class='del'>-		kfree(pages);</div><div class='del'>-		kfree(completed_pages);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to allocate internal buffers.");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have already been given one page, this is the one we must do.</div><div class='del'>-	 * Once again, the alignment guarantees keep it simple.</div><div class='del'>-	 */</div><div class='del'>-	offset = start_vcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	xpage = index - offset;</div><div class='del'>-	pages[xpage] = page;</div><div class='del'>-	/*</div><div class='del'>-	 * The remaining pages need to be allocated and inserted into the page</div><div class='del'>-	 * cache, alignment guarantees keep all the below much simpler. (-8</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	i_size = i_size_read(VFS_I(ni));</div><div class='del'>-	initialized_size = ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	max_page = ((i_size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT) -</div><div class='del'>-			offset;</div><div class='del'>-	/* Is the page fully outside i_size? (truncate in progress) */</div><div class='del'>-	if (xpage &gt;= max_page) {</div><div class='del'>-		kfree(bhs);</div><div class='del'>-		kfree(pages);</div><div class='del'>-		kfree(completed_pages);</div><div class='del'>-		zero_user(page, 0, PAGE_SIZE);</div><div class='del'>-		ntfs_debug("Compressed read outside i_size - truncated?");</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (nr_pages &lt; max_page)</div><div class='del'>-		max_page = nr_pages;</div><div class='del'>-	for (i = 0; i &lt; max_page; i++, offset++) {</div><div class='del'>-		if (i != xpage)</div><div class='del'>-			pages[i] = grab_cache_page_nowait(mapping, offset);</div><div class='del'>-		page = pages[i];</div><div class='del'>-		if (page) {</div><div class='del'>-			/*</div><div class='del'>-			 * We only (re)read the page if it isn't already read</div><div class='del'>-			 * in and/or dirty or we would be losing data or at</div><div class='del'>-			 * least wasting our time.</div><div class='del'>-			 */</div><div class='del'>-			if (!PageDirty(page) &amp;&amp; (!PageUptodate(page) ||</div><div class='del'>-					PageError(page))) {</div><div class='del'>-				ClearPageError(page);</div><div class='del'>-				kmap(page);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='del'>-			pages[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have the runlist, and all the destination pages we need to fill.</div><div class='del'>-	 * Now read the first compression block.</div><div class='del'>-	 */</div><div class='del'>-	cur_page = 0;</div><div class='del'>-	cur_ofs = 0;</div><div class='del'>-	cb_clusters = ni-&gt;itype.compressed.block_clusters;</div><div class='del'>-do_next_cb:</div><div class='del'>-	nr_cbs--;</div><div class='del'>-	nr_bhs = 0;</div><div class='del'>-</div><div class='del'>-	/* Read all cb buffer heads one cluster at a time. */</div><div class='del'>-	rl = NULL;</div><div class='del'>-	for (vcn = start_vcn, start_vcn += cb_clusters; vcn &lt; start_vcn;</div><div class='del'>-			vcn++) {</div><div class='del'>-		bool is_retry = false;</div><div class='del'>-</div><div class='del'>-		if (!rl) {</div><div class='del'>-lock_retry_remap:</div><div class='del'>-			down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			rl = ni-&gt;runlist.rl;</div><div class='del'>-		}</div><div class='del'>-		if (likely(rl != NULL)) {</div><div class='del'>-			/* Seek to element containing target vcn. */</div><div class='del'>-			while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= vcn)</div><div class='del'>-				rl++;</div><div class='del'>-			lcn = ntfs_rl_vcn_to_lcn(rl, vcn);</div><div class='del'>-		} else</div><div class='del'>-			lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-		ntfs_debug("Reading vcn = 0x%llx, lcn = 0x%llx.",</div><div class='del'>-				(unsigned long long)vcn,</div><div class='del'>-				(unsigned long long)lcn);</div><div class='del'>-		if (lcn &lt; 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * When we reach the first sparse cluster we have</div><div class='del'>-			 * finished with the cb.</div><div class='del'>-			 */</div><div class='del'>-			if (lcn == LCN_HOLE)</div><div class='del'>-				break;</div><div class='del'>-			if (is_retry || lcn != LCN_RL_NOT_MAPPED)</div><div class='del'>-				goto rl_err;</div><div class='del'>-			is_retry = true;</div><div class='del'>-			/*</div><div class='del'>-			 * Attempt to map runlist, dropping lock for the</div><div class='del'>-			 * duration.</div><div class='del'>-			 */</div><div class='del'>-			up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			if (!ntfs_map_runlist(ni, vcn))</div><div class='del'>-				goto lock_retry_remap;</div><div class='del'>-			goto map_rl_err;</div><div class='del'>-		}</div><div class='del'>-		block = lcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt; block_size_bits;</div><div class='del'>-		/* Read the lcn from device in chunks of block_size bytes. */</div><div class='del'>-		max_block = block + (vol-&gt;cluster_size &gt;&gt; block_size_bits);</div><div class='del'>-		do {</div><div class='del'>-			ntfs_debug("block = 0x%x.", block);</div><div class='del'>-			if (unlikely(!(bhs[nr_bhs] = sb_getblk(sb, block))))</div><div class='del'>-				goto getblk_err;</div><div class='del'>-			nr_bhs++;</div><div class='del'>-		} while (++block &lt; max_block);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Release the lock if we took it. */</div><div class='del'>-	if (rl)</div><div class='del'>-		up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-</div><div class='del'>-	/* Setup and initiate io on all buffer heads. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		struct buffer_head *tbh = bhs[i];</div><div class='del'>-</div><div class='del'>-		if (!trylock_buffer(tbh))</div><div class='del'>-			continue;</div><div class='del'>-		if (unlikely(buffer_uptodate(tbh))) {</div><div class='del'>-			unlock_buffer(tbh);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		get_bh(tbh);</div><div class='del'>-		tbh-&gt;b_end_io = end_buffer_read_sync;</div><div class='del'>-		submit_bh(REQ_OP_READ, tbh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Wait for io completion on all buffer heads. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		struct buffer_head *tbh = bhs[i];</div><div class='del'>-</div><div class='del'>-		if (buffer_uptodate(tbh))</div><div class='del'>-			continue;</div><div class='del'>-		wait_on_buffer(tbh);</div><div class='del'>-		/*</div><div class='del'>-		 * We need an optimization barrier here, otherwise we start</div><div class='del'>-		 * hitting the below fixup code when accessing a loopback</div><div class='del'>-		 * mounted ntfs partition. This indicates either there is a</div><div class='del'>-		 * race condition in the loop driver or, more likely, gcc</div><div class='del'>-		 * overoptimises the code without the barrier and it doesn't</div><div class='del'>-		 * do the Right Thing(TM).</div><div class='del'>-		 */</div><div class='del'>-		barrier();</div><div class='del'>-		if (unlikely(!buffer_uptodate(tbh))) {</div><div class='del'>-			ntfs_warning(vol-&gt;sb, "Buffer is unlocked but not "</div><div class='del'>-					"uptodate! Unplugging the disk queue "</div><div class='del'>-					"and rescheduling.");</div><div class='del'>-			get_bh(tbh);</div><div class='del'>-			io_schedule();</div><div class='del'>-			put_bh(tbh);</div><div class='del'>-			if (unlikely(!buffer_uptodate(tbh)))</div><div class='del'>-				goto read_err;</div><div class='del'>-			ntfs_warning(vol-&gt;sb, "Buffer is now uptodate. Good.");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get the compression buffer. We must not sleep any more</div><div class='del'>-	 * until we are finished with it.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;ntfs_cb_lock);</div><div class='del'>-	cb = ntfs_compression_buffer;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!cb);</div><div class='del'>-</div><div class='del'>-	cb_pos = cb;</div><div class='del'>-	cb_end = cb + cb_size;</div><div class='del'>-</div><div class='del'>-	/* Copy the buffer heads into the contiguous buffer. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++) {</div><div class='del'>-		memcpy(cb_pos, bhs[i]-&gt;b_data, block_size);</div><div class='del'>-		cb_pos += block_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Just a precaution. */</div><div class='del'>-	if (cb_pos + 2 &lt;= cb + cb_size)</div><div class='del'>-		*(u16*)cb_pos = 0;</div><div class='del'>-</div><div class='del'>-	/* Reset cb_pos back to the beginning. */</div><div class='del'>-	cb_pos = cb;</div><div class='del'>-</div><div class='del'>-	/* We now have both source (if present) and destination. */</div><div class='del'>-	ntfs_debug("Successfully read the compression block.");</div><div class='del'>-</div><div class='del'>-	/* The last page and maximum offset within it for the current cb. */</div><div class='del'>-	cb_max_page = (cur_page &lt;&lt; PAGE_SHIFT) + cur_ofs + cb_size;</div><div class='del'>-	cb_max_ofs = cb_max_page &amp; ~PAGE_MASK;</div><div class='del'>-	cb_max_page &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	/* Catch end of file inside a compression block. */</div><div class='del'>-	if (cb_max_page &gt; max_page)</div><div class='del'>-		cb_max_page = max_page;</div><div class='del'>-</div><div class='del'>-	if (vcn == start_vcn - cb_clusters) {</div><div class='del'>-		/* Sparse cb, zero out page range overlapping the cb. */</div><div class='del'>-		ntfs_debug("Found sparse compression block.");</div><div class='del'>-		/* We can sleep from now on, so we drop lock. */</div><div class='del'>-		spin_unlock(&amp;ntfs_cb_lock);</div><div class='del'>-		if (cb_max_ofs)</div><div class='del'>-			cb_max_page--;</div><div class='del'>-		for (; cur_page &lt; cb_max_page; cur_page++) {</div><div class='del'>-			page = pages[cur_page];</div><div class='del'>-			if (page) {</div><div class='del'>-				if (likely(!cur_ofs))</div><div class='del'>-					clear_page(page_address(page));</div><div class='del'>-				else</div><div class='del'>-					memset(page_address(page) + cur_ofs, 0,</div><div class='del'>-							PAGE_SIZE -</div><div class='del'>-							cur_ofs);</div><div class='del'>-				flush_dcache_page(page);</div><div class='del'>-				kunmap(page);</div><div class='del'>-				SetPageUptodate(page);</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				if (cur_page == xpage)</div><div class='del'>-					xpage_done = 1;</div><div class='del'>-				else</div><div class='del'>-					put_page(page);</div><div class='del'>-				pages[cur_page] = NULL;</div><div class='del'>-			}</div><div class='del'>-			cb_pos += PAGE_SIZE - cur_ofs;</div><div class='del'>-			cur_ofs = 0;</div><div class='del'>-			if (cb_pos &gt;= cb_end)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		/* If we have a partial final page, deal with it now. */</div><div class='del'>-		if (cb_max_ofs &amp;&amp; cb_pos &lt; cb_end) {</div><div class='del'>-			page = pages[cur_page];</div><div class='del'>-			if (page)</div><div class='del'>-				memset(page_address(page) + cur_ofs, 0,</div><div class='del'>-						cb_max_ofs - cur_ofs);</div><div class='del'>-			/*</div><div class='del'>-			 * No need to update cb_pos at this stage:</div><div class='del'>-			 *	cb_pos += cb_max_ofs - cur_ofs;</div><div class='del'>-			 */</div><div class='del'>-			cur_ofs = cb_max_ofs;</div><div class='del'>-		}</div><div class='del'>-	} else if (vcn == start_vcn) {</div><div class='del'>-		/* We can't sleep so we need two stages. */</div><div class='del'>-		unsigned int cur2_page = cur_page;</div><div class='del'>-		unsigned int cur_ofs2 = cur_ofs;</div><div class='del'>-		u8 *cb_pos2 = cb_pos;</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Found uncompressed compression block.");</div><div class='del'>-		/* Uncompressed cb, copy it to the destination pages. */</div><div class='del'>-		/*</div><div class='del'>-		 * TODO: As a big optimization, we could detect this case</div><div class='del'>-		 * before we read all the pages and use block_read_full_folio()</div><div class='del'>-		 * on all full pages instead (we still have to treat partial</div><div class='del'>-		 * pages especially but at least we are getting rid of the</div><div class='del'>-		 * synchronous io for the majority of pages.</div><div class='del'>-		 * Or if we choose not to do the read-ahead/-behind stuff, we</div><div class='del'>-		 * could just return block_read_full_folio(pages[xpage]) as long</div><div class='del'>-		 * as PAGE_SIZE &lt;= cb_size.</div><div class='del'>-		 */</div><div class='del'>-		if (cb_max_ofs)</div><div class='del'>-			cb_max_page--;</div><div class='del'>-		/* First stage: copy data into destination pages. */</div><div class='del'>-		for (; cur_page &lt; cb_max_page; cur_page++) {</div><div class='del'>-			page = pages[cur_page];</div><div class='del'>-			if (page)</div><div class='del'>-				memcpy(page_address(page) + cur_ofs, cb_pos,</div><div class='del'>-						PAGE_SIZE - cur_ofs);</div><div class='del'>-			cb_pos += PAGE_SIZE - cur_ofs;</div><div class='del'>-			cur_ofs = 0;</div><div class='del'>-			if (cb_pos &gt;= cb_end)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		/* If we have a partial final page, deal with it now. */</div><div class='del'>-		if (cb_max_ofs &amp;&amp; cb_pos &lt; cb_end) {</div><div class='del'>-			page = pages[cur_page];</div><div class='del'>-			if (page)</div><div class='del'>-				memcpy(page_address(page) + cur_ofs, cb_pos,</div><div class='del'>-						cb_max_ofs - cur_ofs);</div><div class='del'>-			cb_pos += cb_max_ofs - cur_ofs;</div><div class='del'>-			cur_ofs = cb_max_ofs;</div><div class='del'>-		}</div><div class='del'>-		/* We can sleep from now on, so drop lock. */</div><div class='del'>-		spin_unlock(&amp;ntfs_cb_lock);</div><div class='del'>-		/* Second stage: finalize pages. */</div><div class='del'>-		for (; cur2_page &lt; cb_max_page; cur2_page++) {</div><div class='del'>-			page = pages[cur2_page];</div><div class='del'>-			if (page) {</div><div class='del'>-				/*</div><div class='del'>-				 * If we are outside the initialized size, zero</div><div class='del'>-				 * the out of bounds page range.</div><div class='del'>-				 */</div><div class='del'>-				handle_bounds_compressed_page(page, i_size,</div><div class='del'>-						initialized_size);</div><div class='del'>-				flush_dcache_page(page);</div><div class='del'>-				kunmap(page);</div><div class='del'>-				SetPageUptodate(page);</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				if (cur2_page == xpage)</div><div class='del'>-					xpage_done = 1;</div><div class='del'>-				else</div><div class='del'>-					put_page(page);</div><div class='del'>-				pages[cur2_page] = NULL;</div><div class='del'>-			}</div><div class='del'>-			cb_pos2 += PAGE_SIZE - cur_ofs2;</div><div class='del'>-			cur_ofs2 = 0;</div><div class='del'>-			if (cb_pos2 &gt;= cb_end)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Compressed cb, decompress it into the destination page(s). */</div><div class='del'>-		unsigned int prev_cur_page = cur_page;</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Found compressed compression block.");</div><div class='del'>-		err = ntfs_decompress(pages, completed_pages, &amp;cur_page,</div><div class='del'>-				&amp;cur_ofs, cb_max_page, cb_max_ofs, xpage,</div><div class='del'>-				&amp;xpage_done, cb_pos, cb_size - (cb_pos - cb),</div><div class='del'>-				i_size, initialized_size);</div><div class='del'>-		/*</div><div class='del'>-		 * We can sleep from now on, lock already dropped by</div><div class='del'>-		 * ntfs_decompress().</div><div class='del'>-		 */</div><div class='del'>-		if (err) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "ntfs_decompress() failed in inode "</div><div class='del'>-					"0x%lx with error code %i. Skipping "</div><div class='del'>-					"this compression block.",</div><div class='del'>-					ni-&gt;mft_no, -err);</div><div class='del'>-			/* Release the unfinished pages. */</div><div class='del'>-			for (; prev_cur_page &lt; cur_page; prev_cur_page++) {</div><div class='del'>-				page = pages[prev_cur_page];</div><div class='del'>-				if (page) {</div><div class='del'>-					flush_dcache_page(page);</div><div class='del'>-					kunmap(page);</div><div class='del'>-					unlock_page(page);</div><div class='del'>-					if (prev_cur_page != xpage)</div><div class='del'>-						put_page(page);</div><div class='del'>-					pages[prev_cur_page] = NULL;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Release the buffer heads. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++)</div><div class='del'>-		brelse(bhs[i]);</div><div class='del'>-</div><div class='del'>-	/* Do we have more work to do? */</div><div class='del'>-	if (nr_cbs)</div><div class='del'>-		goto do_next_cb;</div><div class='del'>-</div><div class='del'>-	/* We no longer need the list of buffer heads. */</div><div class='del'>-	kfree(bhs);</div><div class='del'>-</div><div class='del'>-	/* Clean up if we have any pages left. Should never happen. */</div><div class='del'>-	for (cur_page = 0; cur_page &lt; max_page; cur_page++) {</div><div class='del'>-		page = pages[cur_page];</div><div class='del'>-		if (page) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Still have pages left! "</div><div class='del'>-					"Terminating them with extreme "</div><div class='del'>-					"prejudice.  Inode 0x%lx, page index "</div><div class='del'>-					"0x%lx.", ni-&gt;mft_no, page-&gt;index);</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			kunmap(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			if (cur_page != xpage)</div><div class='del'>-				put_page(page);</div><div class='del'>-			pages[cur_page] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We no longer need the list of pages. */</div><div class='del'>-	kfree(pages);</div><div class='del'>-	kfree(completed_pages);</div><div class='del'>-</div><div class='del'>-	/* If we have completed the requested page, we return success. */</div><div class='del'>-	if (likely(xpage_done))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ?</div><div class='del'>-			"EOVERFLOW" : (!err ? "EIO" : "unknown error"));</div><div class='del'>-	return err &lt; 0 ? err : -EIO;</div><div class='del'>-</div><div class='del'>-read_err:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "IO error while reading compressed data.");</div><div class='del'>-	/* Release the buffer heads. */</div><div class='del'>-	for (i = 0; i &lt; nr_bhs; i++)</div><div class='del'>-		brelse(bhs[i]);</div><div class='del'>-	goto err_out;</div><div class='del'>-</div><div class='del'>-map_rl_err:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "ntfs_map_runlist() failed. Cannot read "</div><div class='del'>-			"compression block.");</div><div class='del'>-	goto err_out;</div><div class='del'>-</div><div class='del'>-rl_err:</div><div class='del'>-	up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "ntfs_rl_vcn_to_lcn() failed. Cannot read "</div><div class='del'>-			"compression block.");</div><div class='del'>-	goto err_out;</div><div class='del'>-</div><div class='del'>-getblk_err:</div><div class='del'>-	up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "getblk() failed. Cannot read compression block.");</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	kfree(bhs);</div><div class='del'>-	for (i = cur_page; i &lt; max_page; i++) {</div><div class='del'>-		page = pages[i];</div><div class='del'>-		if (page) {</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			kunmap(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			if (i != xpage)</div><div class='del'>-				put_page(page);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kfree(pages);</div><div class='del'>-	kfree(completed_pages);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/ntfs/debug.c b/fs/ntfs/debug.c<br/>deleted file mode 100644<br/>index a3c1c5656f8f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/debug.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/debug.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * debug.c - NTFS kernel debug support. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-#include "debug.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_warning - output a warning to the syslog</div><div class='del'>- * @function:	name of function outputting the warning</div><div class='del'>- * @sb:		super block of mounted ntfs filesystem</div><div class='del'>- * @fmt:	warning string containing format specifications</div><div class='del'>- * @...:	a variable number of arguments specified in @fmt</div><div class='del'>- *</div><div class='del'>- * Outputs a warning to the syslog for the mounted ntfs filesystem described</div><div class='del'>- * by @sb.</div><div class='del'>- *</div><div class='del'>- * @fmt and the corresponding @... is printf style format string containing</div><div class='del'>- * the warning string and the corresponding format arguments, respectively.</div><div class='del'>- *</div><div class='del'>- * @function is the name of the function from which __ntfs_warning is being</div><div class='del'>- * called.</div><div class='del'>- *</div><div class='del'>- * Note, you should be using debug.h::ntfs_warning(@sb, @fmt, @...) instead</div><div class='del'>- * as this provides the @function parameter automatically.</div><div class='del'>- */</div><div class='del'>-void __ntfs_warning(const char *function, const struct super_block *sb,</div><div class='del'>-		const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct va_format vaf;</div><div class='del'>-	va_list args;</div><div class='del'>-	int flen = 0;</div><div class='del'>-</div><div class='del'>-#ifndef DEBUG</div><div class='del'>-	if (!printk_ratelimit())</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-	if (function)</div><div class='del'>-		flen = strlen(function);</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	vaf.fmt = fmt;</div><div class='del'>-	vaf.va = &amp;args;</div><div class='del'>-	if (sb)</div><div class='del'>-		pr_warn("(device %s): %s(): %pV\n",</div><div class='del'>-			sb-&gt;s_id, flen ? function : "", &amp;vaf);</div><div class='del'>-	else</div><div class='del'>-		pr_warn("%s(): %pV\n", flen ? function : "", &amp;vaf);</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_error - output an error to the syslog</div><div class='del'>- * @function:	name of function outputting the error</div><div class='del'>- * @sb:		super block of mounted ntfs filesystem</div><div class='del'>- * @fmt:	error string containing format specifications</div><div class='del'>- * @...:	a variable number of arguments specified in @fmt</div><div class='del'>- *</div><div class='del'>- * Outputs an error to the syslog for the mounted ntfs filesystem described</div><div class='del'>- * by @sb.</div><div class='del'>- *</div><div class='del'>- * @fmt and the corresponding @... is printf style format string containing</div><div class='del'>- * the error string and the corresponding format arguments, respectively.</div><div class='del'>- *</div><div class='del'>- * @function is the name of the function from which __ntfs_error is being</div><div class='del'>- * called.</div><div class='del'>- *</div><div class='del'>- * Note, you should be using debug.h::ntfs_error(@sb, @fmt, @...) instead</div><div class='del'>- * as this provides the @function parameter automatically.</div><div class='del'>- */</div><div class='del'>-void __ntfs_error(const char *function, const struct super_block *sb,</div><div class='del'>-		const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct va_format vaf;</div><div class='del'>-	va_list args;</div><div class='del'>-	int flen = 0;</div><div class='del'>-</div><div class='del'>-#ifndef DEBUG</div><div class='del'>-	if (!printk_ratelimit())</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-	if (function)</div><div class='del'>-		flen = strlen(function);</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	vaf.fmt = fmt;</div><div class='del'>-	vaf.va = &amp;args;</div><div class='del'>-	if (sb)</div><div class='del'>-		pr_err("(device %s): %s(): %pV\n",</div><div class='del'>-		       sb-&gt;s_id, flen ? function : "", &amp;vaf);</div><div class='del'>-	else</div><div class='del'>-		pr_err("%s(): %pV\n", flen ? function : "", &amp;vaf);</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-</div><div class='del'>-/* If 1, output debug messages, and if 0, don't. */</div><div class='del'>-int debug_msgs = 0;</div><div class='del'>-</div><div class='del'>-void __ntfs_debug(const char *file, int line, const char *function,</div><div class='del'>-		const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct va_format vaf;</div><div class='del'>-	va_list args;</div><div class='del'>-	int flen = 0;</div><div class='del'>-</div><div class='del'>-	if (!debug_msgs)</div><div class='del'>-		return;</div><div class='del'>-	if (function)</div><div class='del'>-		flen = strlen(function);</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	vaf.fmt = fmt;</div><div class='del'>-	vaf.va = &amp;args;</div><div class='del'>-	pr_debug("(%s, %d): %s(): %pV", file, line, flen ? function : "", &amp;vaf);</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Dump a runlist. Caller has to provide synchronisation for @rl. */</div><div class='del'>-void ntfs_debug_dump_runlist(const runlist_element *rl)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	const char *lcn_str[5] = { "LCN_HOLE         ", "LCN_RL_NOT_MAPPED",</div><div class='del'>-				   "LCN_ENOENT       ", "LCN_unknown      " };</div><div class='del'>-</div><div class='del'>-	if (!debug_msgs)</div><div class='del'>-		return;</div><div class='del'>-	pr_debug("Dumping runlist (values in hex):\n");</div><div class='del'>-	if (!rl) {</div><div class='del'>-		pr_debug("Run list not present.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	pr_debug("VCN              LCN               Run length\n");</div><div class='del'>-	for (i = 0; ; i++) {</div><div class='del'>-		LCN lcn = (rl + i)-&gt;lcn;</div><div class='del'>-</div><div class='del'>-		if (lcn &lt; (LCN)0) {</div><div class='del'>-			int index = -lcn - 1;</div><div class='del'>-</div><div class='del'>-			if (index &gt; -LCN_ENOENT - 1)</div><div class='del'>-				index = 3;</div><div class='del'>-			pr_debug("%-16Lx %s %-16Lx%s\n",</div><div class='del'>-					(long long)(rl + i)-&gt;vcn, lcn_str[index],</div><div class='del'>-					(long long)(rl + i)-&gt;length,</div><div class='del'>-					(rl + i)-&gt;length ? "" :</div><div class='del'>-						" (runlist end)");</div><div class='del'>-		} else</div><div class='del'>-			pr_debug("%-16Lx %-16Lx  %-16Lx%s\n",</div><div class='del'>-					(long long)(rl + i)-&gt;vcn,</div><div class='del'>-					(long long)(rl + i)-&gt;lcn,</div><div class='del'>-					(long long)(rl + i)-&gt;length,</div><div class='del'>-					(rl + i)-&gt;length ? "" :</div><div class='del'>-						" (runlist end)");</div><div class='del'>-		if (!(rl + i)-&gt;length)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h<br/>deleted file mode 100644<br/>index 6fdef388f129..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/debug.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/debug.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * debug.h - NTFS kernel debug support. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_DEBUG_H</div><div class='del'>-#define _LINUX_NTFS_DEBUG_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "runlist.h"</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-</div><div class='del'>-extern int debug_msgs;</div><div class='del'>-</div><div class='del'>-extern __printf(4, 5)</div><div class='del'>-void __ntfs_debug(const char *file, int line, const char *function,</div><div class='del'>-		  const char *format, ...);</div><div class='del'>-/**</div><div class='del'>- * ntfs_debug - write a debug level message to syslog</div><div class='del'>- * @f:		a printf format string containing the message</div><div class='del'>- * @...:	the variables to substitute into @f</div><div class='del'>- *</div><div class='del'>- * ntfs_debug() writes a DEBUG level message to the syslog but only if the</div><div class='del'>- * driver was compiled with -DDEBUG. Otherwise, the call turns into a NOP.</div><div class='del'>- */</div><div class='del'>-#define ntfs_debug(f, a...)						\</div><div class='del'>-	__ntfs_debug(__FILE__, __LINE__, __func__, f, ##a)</div><div class='del'>-</div><div class='del'>-extern void ntfs_debug_dump_runlist(const runlist_element *rl);</div><div class='del'>-</div><div class='del'>-#else	/* !DEBUG */</div><div class='del'>-</div><div class='del'>-#define ntfs_debug(fmt, ...)						\</div><div class='del'>-do {									\</div><div class='del'>-	if (0)								\</div><div class='del'>-		no_printk(fmt, ##__VA_ARGS__);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define ntfs_debug_dump_runlist(rl)	do {} while (0)</div><div class='del'>-</div><div class='del'>-#endif	/* !DEBUG */</div><div class='del'>-</div><div class='del'>-extern  __printf(3, 4)</div><div class='del'>-void __ntfs_warning(const char *function, const struct super_block *sb,</div><div class='del'>-		    const char *fmt, ...);</div><div class='del'>-#define ntfs_warning(sb, f, a...)	__ntfs_warning(__func__, sb, f, ##a)</div><div class='del'>-</div><div class='del'>-extern  __printf(3, 4)</div><div class='del'>-void __ntfs_error(const char *function, const struct super_block *sb,</div><div class='del'>-		  const char *fmt, ...);</div><div class='del'>-#define ntfs_error(sb, f, a...)		__ntfs_error(__func__, sb, f, ##a)</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_DEBUG_H */</div><div class='head'>diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c<br/>deleted file mode 100644<br/>index 629723a8d712..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/dir.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1540 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * dir.c - NTFS kernel directory operations. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2007 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dir.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The little endian Unicode string $I30 as a global constant.</div><div class='del'>- */</div><div class='del'>-ntfschar I30[5] = { cpu_to_le16('$'), cpu_to_le16('I'),</div><div class='del'>-		cpu_to_le16('3'),	cpu_to_le16('0'), 0 };</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_lookup_inode_by_name - find an inode in a directory given its name</div><div class='del'>- * @dir_ni:	ntfs inode of the directory in which to search for the name</div><div class='del'>- * @uname:	Unicode name for which to search in the directory</div><div class='del'>- * @uname_len:	length of the name @uname in Unicode characters</div><div class='del'>- * @res:	return the found file name if necessary (see below)</div><div class='del'>- *</div><div class='del'>- * Look for an inode with name @uname in the directory with inode @dir_ni.</div><div class='del'>- * ntfs_lookup_inode_by_name() walks the contents of the directory looking for</div><div class='del'>- * the Unicode name. If the name is found in the directory, the corresponding</div><div class='del'>- * inode number (&gt;= 0) is returned as a mft reference in cpu format, i.e. it</div><div class='del'>- * is a 64-bit number containing the sequence number.</div><div class='del'>- *</div><div class='del'>- * On error, a negative value is returned corresponding to the error code. In</div><div class='del'>- * particular if the inode is not found -ENOENT is returned. Note that you</div><div class='del'>- * can't just check the return value for being negative, you have to check the</div><div class='del'>- * inode number for being negative which you can extract using MREC(return</div><div class='del'>- * value).</div><div class='del'>- *</div><div class='del'>- * Note, @uname_len does not include the (optional) terminating NULL character.</div><div class='del'>- *</div><div class='del'>- * Note, we look for a case sensitive match first but we also look for a case</div><div class='del'>- * insensitive match at the same time. If we find a case insensitive match, we</div><div class='del'>- * save that for the case that we don't find an exact match, where we return</div><div class='del'>- * the case insensitive match and setup @res (which we allocate!) with the mft</div><div class='del'>- * reference, the file name type, length and with a copy of the little endian</div><div class='del'>- * Unicode file name itself. If we match a file name which is in the DOS name</div><div class='del'>- * space, we only return the mft reference and file name type in @res.</div><div class='del'>- * ntfs_lookup() then uses this to find the long file name in the inode itself.</div><div class='del'>- * This is to avoid polluting the dcache with short file names. We want them to</div><div class='del'>- * work but we don't care for how quickly one can access them. This also fixes</div><div class='del'>- * the dcache aliasing issues.</div><div class='del'>- *</div><div class='del'>- * Locking:  - Caller must hold i_mutex on the directory.</div><div class='del'>- *	     - Each page cache page in the index allocation mapping must be</div><div class='del'>- *	       locked whilst being accessed otherwise we may find a corrupt</div><div class='del'>- *	       page due to it being under -&gt;writepage at the moment which</div><div class='del'>- *	       applies the mst protection fixups before writing out and then</div><div class='del'>- *	       removes them again after the write is complete after which it </div><div class='del'>- *	       unlocks the page.</div><div class='del'>- */</div><div class='del'>-MFT_REF ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const ntfschar *uname,</div><div class='del'>-		const int uname_len, ntfs_name **res)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = dir_ni-&gt;vol;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	INDEX_ROOT *ir;</div><div class='del'>-	INDEX_ENTRY *ie;</div><div class='del'>-	INDEX_ALLOCATION *ia;</div><div class='del'>-	u8 *index_end;</div><div class='del'>-	u64 mref;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	int err, rc;</div><div class='del'>-	VCN vcn, old_vcn;</div><div class='del'>-	struct address_space *ia_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u8 *kaddr;</div><div class='del'>-	ntfs_name *name = NULL;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!S_ISDIR(VFS_I(dir_ni)-&gt;i_mode));</div><div class='del'>-	BUG_ON(NInoAttr(dir_ni));</div><div class='del'>-	/* Get hold of the mft record for the directory. */</div><div class='del'>-	m = map_mft_record(dir_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		ntfs_error(sb, "map_mft_record() failed with error code %ld.",</div><div class='del'>-				-PTR_ERR(m));</div><div class='del'>-		return ERR_MREF(PTR_ERR(m));</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(dir_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Find the index root attribute in the mft record. */</div><div class='del'>-	err = ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,</div><div class='del'>-			0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT) {</div><div class='del'>-			ntfs_error(sb, "Index root attribute missing in "</div><div class='del'>-					"directory inode 0x%lx.",</div><div class='del'>-					dir_ni-&gt;mft_no);</div><div class='del'>-			err = -EIO;</div><div class='del'>-		}</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get to the index root value (it's been verified in read_inode). */</div><div class='del'>-	ir = (INDEX_ROOT*)((u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-	index_end = (u8*)&amp;ir-&gt;index + le32_to_cpu(ir-&gt;index.index_length);</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ir-&gt;index +</div><div class='del'>-			le32_to_cpu(ir-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry.</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		/* Bounds checks. */</div><div class='del'>-		if ((u8*)ie &lt; (u8*)ctx-&gt;mrec || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				index_end)</div><div class='del'>-			goto dir_err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * The last entry cannot contain a name. It can however contain</div><div class='del'>-		 * a pointer to a child node in the B+tree so we just break out.</div><div class='del'>-		 */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * We perform a case sensitive comparison and if that matches</div><div class='del'>-		 * we are done and return the mft reference of the inode (i.e.</div><div class='del'>-		 * the inode number together with the sequence number for</div><div class='del'>-		 * consistency checking). We convert it to cpu format before</div><div class='del'>-		 * returning.</div><div class='del'>-		 */</div><div class='del'>-		if (ntfs_are_names_equal(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length,</div><div class='del'>-				CASE_SENSITIVE, vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-found_it:</div><div class='del'>-			/*</div><div class='del'>-			 * We have a perfect match, so we don't need to care</div><div class='del'>-			 * about having matched imperfectly before, so we can</div><div class='del'>-			 * free name and set *res to NULL.</div><div class='del'>-			 * However, if the perfect match is a short file name,</div><div class='del'>-			 * we need to signal this through *res, so that</div><div class='del'>-			 * ntfs_lookup() can fix dcache aliasing issues.</div><div class='del'>-			 * As an optimization we just reuse an existing</div><div class='del'>-			 * allocation of *res.</div><div class='del'>-			 */</div><div class='del'>-			if (ie-&gt;key.file_name.file_name_type == FILE_NAME_DOS) {</div><div class='del'>-				if (!name) {</div><div class='del'>-					name = kmalloc(sizeof(ntfs_name),</div><div class='del'>-							GFP_NOFS);</div><div class='del'>-					if (!name) {</div><div class='del'>-						err = -ENOMEM;</div><div class='del'>-						goto err_out;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				name-&gt;mref = le64_to_cpu(</div><div class='del'>-						ie-&gt;data.dir.indexed_file);</div><div class='del'>-				name-&gt;type = FILE_NAME_DOS;</div><div class='del'>-				name-&gt;len = 0;</div><div class='del'>-				*res = name;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				*res = NULL;</div><div class='del'>-			}</div><div class='del'>-			mref = le64_to_cpu(ie-&gt;data.dir.indexed_file);</div><div class='del'>-			ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-			unmap_mft_record(dir_ni);</div><div class='del'>-			return mref;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * For a case insensitive mount, we also perform a case</div><div class='del'>-		 * insensitive comparison (provided the file name is not in the</div><div class='del'>-		 * POSIX namespace). If the comparison matches, and the name is</div><div class='del'>-		 * in the WIN32 namespace, we cache the filename in *res so</div><div class='del'>-		 * that the caller, ntfs_lookup(), can work on it. If the</div><div class='del'>-		 * comparison matches, and the name is in the DOS namespace, we</div><div class='del'>-		 * only cache the mft reference and the file name type (we set</div><div class='del'>-		 * the name length to zero for simplicity).</div><div class='del'>-		 */</div><div class='del'>-		if (!NVolCaseSensitive(vol) &amp;&amp;</div><div class='del'>-				ie-&gt;key.file_name.file_name_type &amp;&amp;</div><div class='del'>-				ntfs_are_names_equal(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length,</div><div class='del'>-				IGNORE_CASE, vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-			int name_size = sizeof(ntfs_name);</div><div class='del'>-			u8 type = ie-&gt;key.file_name.file_name_type;</div><div class='del'>-			u8 len = ie-&gt;key.file_name.file_name_length;</div><div class='del'>-</div><div class='del'>-			/* Only one case insensitive matching name allowed. */</div><div class='del'>-			if (name) {</div><div class='del'>-				ntfs_error(sb, "Found already allocated name "</div><div class='del'>-						"in phase 1. Please run chkdsk "</div><div class='del'>-						"and if that doesn't find any "</div><div class='del'>-						"errors please report you saw "</div><div class='del'>-						"this message to "</div><div class='del'>-						"linux-ntfs-dev@lists."</div><div class='del'>-						"sourceforge.net.");</div><div class='del'>-				goto dir_err_out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (type != FILE_NAME_DOS)</div><div class='del'>-				name_size += len * sizeof(ntfschar);</div><div class='del'>-			name = kmalloc(name_size, GFP_NOFS);</div><div class='del'>-			if (!name) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			name-&gt;mref = le64_to_cpu(ie-&gt;data.dir.indexed_file);</div><div class='del'>-			name-&gt;type = type;</div><div class='del'>-			if (type != FILE_NAME_DOS) {</div><div class='del'>-				name-&gt;len = len;</div><div class='del'>-				memcpy(name-&gt;name, ie-&gt;key.file_name.file_name,</div><div class='del'>-						len * sizeof(ntfschar));</div><div class='del'>-			} else</div><div class='del'>-				name-&gt;len = 0;</div><div class='del'>-			*res = name;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not a perfect match, need to do full blown collation so we</div><div class='del'>-		 * know which way in the B+tree we have to go.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				IGNORE_CASE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		/*</div><div class='del'>-		 * If uname collates before the name of the current entry, there</div><div class='del'>-		 * is definitely no such name in this index but we might need to</div><div class='del'>-		 * descend into the B+tree so we just break out of the loop.</div><div class='del'>-		 */</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		/* The names are not equal, continue the search. */</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Names match with case insensitive comparison, now try the</div><div class='del'>-		 * case sensitive comparison, which is required for proper</div><div class='del'>-		 * collation.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				CASE_SENSITIVE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Perfect match, this will never happen as the</div><div class='del'>-		 * ntfs_are_names_equal() call will have gotten a match but we</div><div class='del'>-		 * still treat it correctly.</div><div class='del'>-		 */</div><div class='del'>-		goto found_it;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have finished with this index without success. Check for the</div><div class='del'>-	 * presence of a child node and if not present return -ENOENT, unless</div><div class='del'>-	 * we have got a matching name cached in name in which case return the</div><div class='del'>-	 * mft reference associated with it.</div><div class='del'>-	 */</div><div class='del'>-	if (!(ie-&gt;flags &amp; INDEX_ENTRY_NODE)) {</div><div class='del'>-		if (name) {</div><div class='del'>-			ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-			unmap_mft_record(dir_ni);</div><div class='del'>-			return name-&gt;mref;</div><div class='del'>-		}</div><div class='del'>-		ntfs_debug("Entry not found.");</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto err_out;</div><div class='del'>-	} /* Child node present, descend into it. */</div><div class='del'>-	/* Consistency check: Verify that an index allocation exists. */</div><div class='del'>-	if (!NInoIndexAllocPresent(dir_ni)) {</div><div class='del'>-		ntfs_error(sb, "No index allocation attribute but index entry "</div><div class='del'>-				"requires one. Directory inode 0x%lx is "</div><div class='del'>-				"corrupt or driver bug.", dir_ni-&gt;mft_no);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the starting vcn of the index_block holding the child node. */</div><div class='del'>-	vcn = sle64_to_cpup((sle64*)((u8*)ie + le16_to_cpu(ie-&gt;length) - 8));</div><div class='del'>-	ia_mapping = VFS_I(dir_ni)-&gt;i_mapping;</div><div class='del'>-	/*</div><div class='del'>-	 * We are done with the index root and the mft record. Release them,</div><div class='del'>-	 * otherwise we deadlock with ntfs_map_page().</div><div class='del'>-	 */</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(dir_ni);</div><div class='del'>-	m = NULL;</div><div class='del'>-	ctx = NULL;</div><div class='del'>-descend_into_child_node:</div><div class='del'>-	/*</div><div class='del'>-	 * Convert vcn to index into the index allocation attribute in units</div><div class='del'>-	 * of PAGE_SIZE and map the page cache page, reading it from</div><div class='del'>-	 * disk if necessary.</div><div class='del'>-	 */</div><div class='del'>-	page = ntfs_map_page(ia_mapping, vcn &lt;&lt;</div><div class='del'>-			dir_ni-&gt;itype.index.vcn_size_bits &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(sb, "Failed to map directory index page, error %ld.",</div><div class='del'>-				-PTR_ERR(page));</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	kaddr = (u8*)page_address(page);</div><div class='del'>-fast_descend_into_child_node:</div><div class='del'>-	/* Get to the index allocation block. */</div><div class='del'>-	ia = (INDEX_ALLOCATION*)(kaddr + ((vcn &lt;&lt;</div><div class='del'>-			dir_ni-&gt;itype.index.vcn_size_bits) &amp; ~PAGE_MASK));</div><div class='del'>-	/* Bounds checks. */</div><div class='del'>-	if ((u8*)ia &lt; kaddr || (u8*)ia &gt; kaddr + PAGE_SIZE) {</div><div class='del'>-		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "</div><div class='del'>-				"inode 0x%lx or driver bug.", dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Catch multi sector transfer fixup errors. */</div><div class='del'>-	if (unlikely(!ntfs_is_indx_record(ia-&gt;magic))) {</div><div class='del'>-		ntfs_error(sb, "Directory index record with vcn 0x%llx is "</div><div class='del'>-				"corrupt.  Corrupt inode 0x%lx.  Run chkdsk.",</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (sle64_to_cpu(ia-&gt;index_block_vcn) != vcn) {</div><div class='del'>-		ntfs_error(sb, "Actual VCN (0x%llx) of index buffer is "</div><div class='del'>-				"different from expected VCN (0x%llx). "</div><div class='del'>-				"Directory inode 0x%lx is corrupt or driver "</div><div class='del'>-				"bug.", (unsigned long long)</div><div class='del'>-				sle64_to_cpu(ia-&gt;index_block_vcn),</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (le32_to_cpu(ia-&gt;index.allocated_size) + 0x18 !=</div><div class='del'>-			dir_ni-&gt;itype.index.block_size) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode "</div><div class='del'>-				"0x%lx has a size (%u) differing from the "</div><div class='del'>-				"directory specified size (%u). Directory "</div><div class='del'>-				"inode is corrupt or driver bug.",</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no,</div><div class='del'>-				le32_to_cpu(ia-&gt;index.allocated_size) + 0x18,</div><div class='del'>-				dir_ni-&gt;itype.index.block_size);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)ia + dir_ni-&gt;itype.index.block_size;</div><div class='del'>-	if (index_end &gt; kaddr + PAGE_SIZE) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode "</div><div class='del'>-				"0x%lx crosses page boundary. Impossible! "</div><div class='del'>-				"Cannot access! This is probably a bug in the "</div><div class='del'>-				"driver.", (unsigned long long)vcn,</div><div class='del'>-				dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)&amp;ia-&gt;index + le32_to_cpu(ia-&gt;index.index_length);</div><div class='del'>-	if (index_end &gt; (u8*)ia + dir_ni-&gt;itype.index.block_size) {</div><div class='del'>-		ntfs_error(sb, "Size of index buffer (VCN 0x%llx) of directory "</div><div class='del'>-				"inode 0x%lx exceeds maximum size.",</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ia-&gt;index +</div><div class='del'>-			le32_to_cpu(ia-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate similar to above big loop but applied to index buffer, thus</div><div class='del'>-	 * loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry.</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		/* Bounds check. */</div><div class='del'>-		if ((u8*)ie &lt; (u8*)ia || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				index_end) {</div><div class='del'>-			ntfs_error(sb, "Index entry out of bounds in "</div><div class='del'>-					"directory inode 0x%lx.",</div><div class='del'>-					dir_ni-&gt;mft_no);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The last entry cannot contain a name. It can however contain</div><div class='del'>-		 * a pointer to a child node in the B+tree so we just break out.</div><div class='del'>-		 */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * We perform a case sensitive comparison and if that matches</div><div class='del'>-		 * we are done and return the mft reference of the inode (i.e.</div><div class='del'>-		 * the inode number together with the sequence number for</div><div class='del'>-		 * consistency checking). We convert it to cpu format before</div><div class='del'>-		 * returning.</div><div class='del'>-		 */</div><div class='del'>-		if (ntfs_are_names_equal(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length,</div><div class='del'>-				CASE_SENSITIVE, vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-found_it2:</div><div class='del'>-			/*</div><div class='del'>-			 * We have a perfect match, so we don't need to care</div><div class='del'>-			 * about having matched imperfectly before, so we can</div><div class='del'>-			 * free name and set *res to NULL.</div><div class='del'>-			 * However, if the perfect match is a short file name,</div><div class='del'>-			 * we need to signal this through *res, so that</div><div class='del'>-			 * ntfs_lookup() can fix dcache aliasing issues.</div><div class='del'>-			 * As an optimization we just reuse an existing</div><div class='del'>-			 * allocation of *res.</div><div class='del'>-			 */</div><div class='del'>-			if (ie-&gt;key.file_name.file_name_type == FILE_NAME_DOS) {</div><div class='del'>-				if (!name) {</div><div class='del'>-					name = kmalloc(sizeof(ntfs_name),</div><div class='del'>-							GFP_NOFS);</div><div class='del'>-					if (!name) {</div><div class='del'>-						err = -ENOMEM;</div><div class='del'>-						goto unm_err_out;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				name-&gt;mref = le64_to_cpu(</div><div class='del'>-						ie-&gt;data.dir.indexed_file);</div><div class='del'>-				name-&gt;type = FILE_NAME_DOS;</div><div class='del'>-				name-&gt;len = 0;</div><div class='del'>-				*res = name;</div><div class='del'>-			} else {</div><div class='del'>-				kfree(name);</div><div class='del'>-				*res = NULL;</div><div class='del'>-			}</div><div class='del'>-			mref = le64_to_cpu(ie-&gt;data.dir.indexed_file);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			return mref;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * For a case insensitive mount, we also perform a case</div><div class='del'>-		 * insensitive comparison (provided the file name is not in the</div><div class='del'>-		 * POSIX namespace). If the comparison matches, and the name is</div><div class='del'>-		 * in the WIN32 namespace, we cache the filename in *res so</div><div class='del'>-		 * that the caller, ntfs_lookup(), can work on it. If the</div><div class='del'>-		 * comparison matches, and the name is in the DOS namespace, we</div><div class='del'>-		 * only cache the mft reference and the file name type (we set</div><div class='del'>-		 * the name length to zero for simplicity).</div><div class='del'>-		 */</div><div class='del'>-		if (!NVolCaseSensitive(vol) &amp;&amp;</div><div class='del'>-				ie-&gt;key.file_name.file_name_type &amp;&amp;</div><div class='del'>-				ntfs_are_names_equal(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length,</div><div class='del'>-				IGNORE_CASE, vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-			int name_size = sizeof(ntfs_name);</div><div class='del'>-			u8 type = ie-&gt;key.file_name.file_name_type;</div><div class='del'>-			u8 len = ie-&gt;key.file_name.file_name_length;</div><div class='del'>-</div><div class='del'>-			/* Only one case insensitive matching name allowed. */</div><div class='del'>-			if (name) {</div><div class='del'>-				ntfs_error(sb, "Found already allocated name "</div><div class='del'>-						"in phase 2. Please run chkdsk "</div><div class='del'>-						"and if that doesn't find any "</div><div class='del'>-						"errors please report you saw "</div><div class='del'>-						"this message to "</div><div class='del'>-						"linux-ntfs-dev@lists."</div><div class='del'>-						"sourceforge.net.");</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				ntfs_unmap_page(page);</div><div class='del'>-				goto dir_err_out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (type != FILE_NAME_DOS)</div><div class='del'>-				name_size += len * sizeof(ntfschar);</div><div class='del'>-			name = kmalloc(name_size, GFP_NOFS);</div><div class='del'>-			if (!name) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			name-&gt;mref = le64_to_cpu(ie-&gt;data.dir.indexed_file);</div><div class='del'>-			name-&gt;type = type;</div><div class='del'>-			if (type != FILE_NAME_DOS) {</div><div class='del'>-				name-&gt;len = len;</div><div class='del'>-				memcpy(name-&gt;name, ie-&gt;key.file_name.file_name,</div><div class='del'>-						len * sizeof(ntfschar));</div><div class='del'>-			} else</div><div class='del'>-				name-&gt;len = 0;</div><div class='del'>-			*res = name;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not a perfect match, need to do full blown collation so we</div><div class='del'>-		 * know which way in the B+tree we have to go.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				IGNORE_CASE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		/*</div><div class='del'>-		 * If uname collates before the name of the current entry, there</div><div class='del'>-		 * is definitely no such name in this index but we might need to</div><div class='del'>-		 * descend into the B+tree so we just break out of the loop.</div><div class='del'>-		 */</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		/* The names are not equal, continue the search. */</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Names match with case insensitive comparison, now try the</div><div class='del'>-		 * case sensitive comparison, which is required for proper</div><div class='del'>-		 * collation.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				CASE_SENSITIVE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Perfect match, this will never happen as the</div><div class='del'>-		 * ntfs_are_names_equal() call will have gotten a match but we</div><div class='del'>-		 * still treat it correctly.</div><div class='del'>-		 */</div><div class='del'>-		goto found_it2;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have finished with this index buffer without success. Check for</div><div class='del'>-	 * the presence of a child node.</div><div class='del'>-	 */</div><div class='del'>-	if (ie-&gt;flags &amp; INDEX_ENTRY_NODE) {</div><div class='del'>-		if ((ia-&gt;index.flags &amp; NODE_MASK) == LEAF_NODE) {</div><div class='del'>-			ntfs_error(sb, "Index entry with child node found in "</div><div class='del'>-					"a leaf node in directory inode 0x%lx.",</div><div class='del'>-					dir_ni-&gt;mft_no);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* Child node present, descend into it. */</div><div class='del'>-		old_vcn = vcn;</div><div class='del'>-		vcn = sle64_to_cpup((sle64*)((u8*)ie +</div><div class='del'>-				le16_to_cpu(ie-&gt;length) - 8));</div><div class='del'>-		if (vcn &gt;= 0) {</div><div class='del'>-			/* If vcn is in the same page cache page as old_vcn we</div><div class='del'>-			 * recycle the mapped page. */</div><div class='del'>-			if (old_vcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-					PAGE_SHIFT == vcn &lt;&lt;</div><div class='del'>-					vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-					PAGE_SHIFT)</div><div class='del'>-				goto fast_descend_into_child_node;</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			goto descend_into_child_node;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "Negative child node vcn in directory inode "</div><div class='del'>-				"0x%lx.", dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * No child node present, return -ENOENT, unless we have got a matching</div><div class='del'>-	 * name cached in name in which case return the mft reference</div><div class='del'>-	 * associated with it.</div><div class='del'>-	 */</div><div class='del'>-	if (name) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		return name-&gt;mref;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Entry not found.");</div><div class='del'>-	err = -ENOENT;</div><div class='del'>-unm_err_out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-err_out:</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(dir_ni);</div><div class='del'>-	if (name) {</div><div class='del'>-		kfree(name);</div><div class='del'>-		*res = NULL;</div><div class='del'>-	}</div><div class='del'>-	return ERR_MREF(err);</div><div class='del'>-dir_err_out:</div><div class='del'>-	ntfs_error(sb, "Corrupt directory.  Aborting lookup.");</div><div class='del'>-	goto err_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-// TODO: (AIA)</div><div class='del'>-// The algorithm embedded in this code will be required for the time when we</div><div class='del'>-// want to support adding of entries to directories, where we require correct</div><div class='del'>-// collation of file names in order not to cause corruption of the filesystem.</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_lookup_inode_by_name - find an inode in a directory given its name</div><div class='del'>- * @dir_ni:	ntfs inode of the directory in which to search for the name</div><div class='del'>- * @uname:	Unicode name for which to search in the directory</div><div class='del'>- * @uname_len:	length of the name @uname in Unicode characters</div><div class='del'>- *</div><div class='del'>- * Look for an inode with name @uname in the directory with inode @dir_ni.</div><div class='del'>- * ntfs_lookup_inode_by_name() walks the contents of the directory looking for</div><div class='del'>- * the Unicode name. If the name is found in the directory, the corresponding</div><div class='del'>- * inode number (&gt;= 0) is returned as a mft reference in cpu format, i.e. it</div><div class='del'>- * is a 64-bit number containing the sequence number.</div><div class='del'>- *</div><div class='del'>- * On error, a negative value is returned corresponding to the error code. In</div><div class='del'>- * particular if the inode is not found -ENOENT is returned. Note that you</div><div class='del'>- * can't just check the return value for being negative, you have to check the</div><div class='del'>- * inode number for being negative which you can extract using MREC(return</div><div class='del'>- * value).</div><div class='del'>- *</div><div class='del'>- * Note, @uname_len does not include the (optional) terminating NULL character.</div><div class='del'>- */</div><div class='del'>-u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const ntfschar *uname,</div><div class='del'>-		const int uname_len)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = dir_ni-&gt;vol;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	INDEX_ROOT *ir;</div><div class='del'>-	INDEX_ENTRY *ie;</div><div class='del'>-	INDEX_ALLOCATION *ia;</div><div class='del'>-	u8 *index_end;</div><div class='del'>-	u64 mref;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	int err, rc;</div><div class='del'>-	IGNORE_CASE_BOOL ic;</div><div class='del'>-	VCN vcn, old_vcn;</div><div class='del'>-	struct address_space *ia_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u8 *kaddr;</div><div class='del'>-</div><div class='del'>-	/* Get hold of the mft record for the directory. */</div><div class='del'>-	m = map_mft_record(dir_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		ntfs_error(sb, "map_mft_record() failed with error code %ld.",</div><div class='del'>-				-PTR_ERR(m));</div><div class='del'>-		return ERR_MREF(PTR_ERR(m));</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(dir_ni, m);</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Find the index root attribute in the mft record. */</div><div class='del'>-	err = ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,</div><div class='del'>-			0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT) {</div><div class='del'>-			ntfs_error(sb, "Index root attribute missing in "</div><div class='del'>-					"directory inode 0x%lx.",</div><div class='del'>-					dir_ni-&gt;mft_no);</div><div class='del'>-			err = -EIO;</div><div class='del'>-		}</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get to the index root value (it's been verified in read_inode). */</div><div class='del'>-	ir = (INDEX_ROOT*)((u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-	index_end = (u8*)&amp;ir-&gt;index + le32_to_cpu(ir-&gt;index.index_length);</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ir-&gt;index +</div><div class='del'>-			le32_to_cpu(ir-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry.</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		/* Bounds checks. */</div><div class='del'>-		if ((u8*)ie &lt; (u8*)ctx-&gt;mrec || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				index_end)</div><div class='del'>-			goto dir_err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * The last entry cannot contain a name. It can however contain</div><div class='del'>-		 * a pointer to a child node in the B+tree so we just break out.</div><div class='del'>-		 */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * If the current entry has a name type of POSIX, the name is</div><div class='del'>-		 * case sensitive and not otherwise. This has the effect of us</div><div class='del'>-		 * not being able to access any POSIX file names which collate</div><div class='del'>-		 * after the non-POSIX one when they only differ in case, but</div><div class='del'>-		 * anyone doing screwy stuff like that deserves to burn in</div><div class='del'>-		 * hell... Doing that kind of stuff on NT4 actually causes</div><div class='del'>-		 * corruption on the partition even when using SP6a and Linux</div><div class='del'>-		 * is not involved at all.</div><div class='del'>-		 */</div><div class='del'>-		ic = ie-&gt;key.file_name.file_name_type ? IGNORE_CASE :</div><div class='del'>-				CASE_SENSITIVE;</div><div class='del'>-		/*</div><div class='del'>-		 * If the names match perfectly, we are done and return the</div><div class='del'>-		 * mft reference of the inode (i.e. the inode number together</div><div class='del'>-		 * with the sequence number for consistency checking. We</div><div class='del'>-		 * convert it to cpu format before returning.</div><div class='del'>-		 */</div><div class='del'>-		if (ntfs_are_names_equal(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, ic,</div><div class='del'>-				vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-found_it:</div><div class='del'>-			mref = le64_to_cpu(ie-&gt;data.dir.indexed_file);</div><div class='del'>-			ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-			unmap_mft_record(dir_ni);</div><div class='del'>-			return mref;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not a perfect match, need to do full blown collation so we</div><div class='del'>-		 * know which way in the B+tree we have to go.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				IGNORE_CASE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		/*</div><div class='del'>-		 * If uname collates before the name of the current entry, there</div><div class='del'>-		 * is definitely no such name in this index but we might need to</div><div class='del'>-		 * descend into the B+tree so we just break out of the loop.</div><div class='del'>-		 */</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		/* The names are not equal, continue the search. */</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Names match with case insensitive comparison, now try the</div><div class='del'>-		 * case sensitive comparison, which is required for proper</div><div class='del'>-		 * collation.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				CASE_SENSITIVE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Perfect match, this will never happen as the</div><div class='del'>-		 * ntfs_are_names_equal() call will have gotten a match but we</div><div class='del'>-		 * still treat it correctly.</div><div class='del'>-		 */</div><div class='del'>-		goto found_it;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have finished with this index without success. Check for the</div><div class='del'>-	 * presence of a child node.</div><div class='del'>-	 */</div><div class='del'>-	if (!(ie-&gt;flags &amp; INDEX_ENTRY_NODE)) {</div><div class='del'>-		/* No child node, return -ENOENT. */</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto err_out;</div><div class='del'>-	} /* Child node present, descend into it. */</div><div class='del'>-	/* Consistency check: Verify that an index allocation exists. */</div><div class='del'>-	if (!NInoIndexAllocPresent(dir_ni)) {</div><div class='del'>-		ntfs_error(sb, "No index allocation attribute but index entry "</div><div class='del'>-				"requires one. Directory inode 0x%lx is "</div><div class='del'>-				"corrupt or driver bug.", dir_ni-&gt;mft_no);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the starting vcn of the index_block holding the child node. */</div><div class='del'>-	vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie-&gt;length) - 8);</div><div class='del'>-	ia_mapping = VFS_I(dir_ni)-&gt;i_mapping;</div><div class='del'>-	/*</div><div class='del'>-	 * We are done with the index root and the mft record. Release them,</div><div class='del'>-	 * otherwise we deadlock with ntfs_map_page().</div><div class='del'>-	 */</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(dir_ni);</div><div class='del'>-	m = NULL;</div><div class='del'>-	ctx = NULL;</div><div class='del'>-descend_into_child_node:</div><div class='del'>-	/*</div><div class='del'>-	 * Convert vcn to index into the index allocation attribute in units</div><div class='del'>-	 * of PAGE_SIZE and map the page cache page, reading it from</div><div class='del'>-	 * disk if necessary.</div><div class='del'>-	 */</div><div class='del'>-	page = ntfs_map_page(ia_mapping, vcn &lt;&lt;</div><div class='del'>-			dir_ni-&gt;itype.index.vcn_size_bits &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(sb, "Failed to map directory index page, error %ld.",</div><div class='del'>-				-PTR_ERR(page));</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	kaddr = (u8*)page_address(page);</div><div class='del'>-fast_descend_into_child_node:</div><div class='del'>-	/* Get to the index allocation block. */</div><div class='del'>-	ia = (INDEX_ALLOCATION*)(kaddr + ((vcn &lt;&lt;</div><div class='del'>-			dir_ni-&gt;itype.index.vcn_size_bits) &amp; ~PAGE_MASK));</div><div class='del'>-	/* Bounds checks. */</div><div class='del'>-	if ((u8*)ia &lt; kaddr || (u8*)ia &gt; kaddr + PAGE_SIZE) {</div><div class='del'>-		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "</div><div class='del'>-				"inode 0x%lx or driver bug.", dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Catch multi sector transfer fixup errors. */</div><div class='del'>-	if (unlikely(!ntfs_is_indx_record(ia-&gt;magic))) {</div><div class='del'>-		ntfs_error(sb, "Directory index record with vcn 0x%llx is "</div><div class='del'>-				"corrupt.  Corrupt inode 0x%lx.  Run chkdsk.",</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (sle64_to_cpu(ia-&gt;index_block_vcn) != vcn) {</div><div class='del'>-		ntfs_error(sb, "Actual VCN (0x%llx) of index buffer is "</div><div class='del'>-				"different from expected VCN (0x%llx). "</div><div class='del'>-				"Directory inode 0x%lx is corrupt or driver "</div><div class='del'>-				"bug.", (unsigned long long)</div><div class='del'>-				sle64_to_cpu(ia-&gt;index_block_vcn),</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (le32_to_cpu(ia-&gt;index.allocated_size) + 0x18 !=</div><div class='del'>-			dir_ni-&gt;itype.index.block_size) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode "</div><div class='del'>-				"0x%lx has a size (%u) differing from the "</div><div class='del'>-				"directory specified size (%u). Directory "</div><div class='del'>-				"inode is corrupt or driver bug.",</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no,</div><div class='del'>-				le32_to_cpu(ia-&gt;index.allocated_size) + 0x18,</div><div class='del'>-				dir_ni-&gt;itype.index.block_size);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)ia + dir_ni-&gt;itype.index.block_size;</div><div class='del'>-	if (index_end &gt; kaddr + PAGE_SIZE) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode "</div><div class='del'>-				"0x%lx crosses page boundary. Impossible! "</div><div class='del'>-				"Cannot access! This is probably a bug in the "</div><div class='del'>-				"driver.", (unsigned long long)vcn,</div><div class='del'>-				dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)&amp;ia-&gt;index + le32_to_cpu(ia-&gt;index.index_length);</div><div class='del'>-	if (index_end &gt; (u8*)ia + dir_ni-&gt;itype.index.block_size) {</div><div class='del'>-		ntfs_error(sb, "Size of index buffer (VCN 0x%llx) of directory "</div><div class='del'>-				"inode 0x%lx exceeds maximum size.",</div><div class='del'>-				(unsigned long long)vcn, dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ia-&gt;index +</div><div class='del'>-			le32_to_cpu(ia-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate similar to above big loop but applied to index buffer, thus</div><div class='del'>-	 * loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry.</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		/* Bounds check. */</div><div class='del'>-		if ((u8*)ie &lt; (u8*)ia || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				index_end) {</div><div class='del'>-			ntfs_error(sb, "Index entry out of bounds in "</div><div class='del'>-					"directory inode 0x%lx.",</div><div class='del'>-					dir_ni-&gt;mft_no);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The last entry cannot contain a name. It can however contain</div><div class='del'>-		 * a pointer to a child node in the B+tree so we just break out.</div><div class='del'>-		 */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * If the current entry has a name type of POSIX, the name is</div><div class='del'>-		 * case sensitive and not otherwise. This has the effect of us</div><div class='del'>-		 * not being able to access any POSIX file names which collate</div><div class='del'>-		 * after the non-POSIX one when they only differ in case, but</div><div class='del'>-		 * anyone doing screwy stuff like that deserves to burn in</div><div class='del'>-		 * hell... Doing that kind of stuff on NT4 actually causes</div><div class='del'>-		 * corruption on the partition even when using SP6a and Linux</div><div class='del'>-		 * is not involved at all.</div><div class='del'>-		 */</div><div class='del'>-		ic = ie-&gt;key.file_name.file_name_type ? IGNORE_CASE :</div><div class='del'>-				CASE_SENSITIVE;</div><div class='del'>-		/*</div><div class='del'>-		 * If the names match perfectly, we are done and return the</div><div class='del'>-		 * mft reference of the inode (i.e. the inode number together</div><div class='del'>-		 * with the sequence number for consistency checking. We</div><div class='del'>-		 * convert it to cpu format before returning.</div><div class='del'>-		 */</div><div class='del'>-		if (ntfs_are_names_equal(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, ic,</div><div class='del'>-				vol-&gt;upcase, vol-&gt;upcase_len)) {</div><div class='del'>-found_it2:</div><div class='del'>-			mref = le64_to_cpu(ie-&gt;data.dir.indexed_file);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			return mref;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not a perfect match, need to do full blown collation so we</div><div class='del'>-		 * know which way in the B+tree we have to go.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				IGNORE_CASE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		/*</div><div class='del'>-		 * If uname collates before the name of the current entry, there</div><div class='del'>-		 * is definitely no such name in this index but we might need to</div><div class='del'>-		 * descend into the B+tree so we just break out of the loop.</div><div class='del'>-		 */</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		/* The names are not equal, continue the search. */</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Names match with case insensitive comparison, now try the</div><div class='del'>-		 * case sensitive comparison, which is required for proper</div><div class='del'>-		 * collation.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate_names(uname, uname_len,</div><div class='del'>-				(ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-				ie-&gt;key.file_name.file_name_length, 1,</div><div class='del'>-				CASE_SENSITIVE, vol-&gt;upcase, vol-&gt;upcase_len);</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		if (rc)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Perfect match, this will never happen as the</div><div class='del'>-		 * ntfs_are_names_equal() call will have gotten a match but we</div><div class='del'>-		 * still treat it correctly.</div><div class='del'>-		 */</div><div class='del'>-		goto found_it2;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have finished with this index buffer without success. Check for</div><div class='del'>-	 * the presence of a child node.</div><div class='del'>-	 */</div><div class='del'>-	if (ie-&gt;flags &amp; INDEX_ENTRY_NODE) {</div><div class='del'>-		if ((ia-&gt;index.flags &amp; NODE_MASK) == LEAF_NODE) {</div><div class='del'>-			ntfs_error(sb, "Index entry with child node found in "</div><div class='del'>-					"a leaf node in directory inode 0x%lx.",</div><div class='del'>-					dir_ni-&gt;mft_no);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* Child node present, descend into it. */</div><div class='del'>-		old_vcn = vcn;</div><div class='del'>-		vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie-&gt;length) - 8);</div><div class='del'>-		if (vcn &gt;= 0) {</div><div class='del'>-			/* If vcn is in the same page cache page as old_vcn we</div><div class='del'>-			 * recycle the mapped page. */</div><div class='del'>-			if (old_vcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-					PAGE_SHIFT == vcn &lt;&lt;</div><div class='del'>-					vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-					PAGE_SHIFT)</div><div class='del'>-				goto fast_descend_into_child_node;</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			goto descend_into_child_node;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "Negative child node vcn in directory inode "</div><div class='del'>-				"0x%lx.", dir_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* No child node, return -ENOENT. */</div><div class='del'>-	ntfs_debug("Entry not found.");</div><div class='del'>-	err = -ENOENT;</div><div class='del'>-unm_err_out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-err_out:</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(dir_ni);</div><div class='del'>-	return ERR_MREF(err);</div><div class='del'>-dir_err_out:</div><div class='del'>-	ntfs_error(sb, "Corrupt directory. Aborting lookup.");</div><div class='del'>-	goto err_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_filldir - ntfs specific filldir method</div><div class='del'>- * @vol:	current ntfs volume</div><div class='del'>- * @ndir:	ntfs inode of current directory</div><div class='del'>- * @ia_page:	page in which the index allocation buffer @ie is in resides</div><div class='del'>- * @ie:		current index entry</div><div class='del'>- * @name:	buffer to use for the converted name</div><div class='del'>- * @actor:	what to feed the entries to</div><div class='del'>- *</div><div class='del'>- * Convert the Unicode @name to the loaded NLS and pass it to the @filldir</div><div class='del'>- * callback.</div><div class='del'>- *</div><div class='del'>- * If @ia_page is not NULL it is the locked page containing the index</div><div class='del'>- * allocation block containing the index entry @ie.</div><div class='del'>- *</div><div class='del'>- * Note, we drop (and then reacquire) the page lock on @ia_page across the</div><div class='del'>- * @filldir() call otherwise we would deadlock with NFSd when it calls -&gt;lookup</div><div class='del'>- * since ntfs_lookup() will lock the same page.  As an optimization, we do not</div><div class='del'>- * retake the lock if we are returning a non-zero value as ntfs_readdir()</div><div class='del'>- * would need to drop the lock immediately anyway.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_filldir(ntfs_volume *vol,</div><div class='del'>-		ntfs_inode *ndir, struct page *ia_page, INDEX_ENTRY *ie,</div><div class='del'>-		u8 *name, struct dir_context *actor)</div><div class='del'>-{</div><div class='del'>-	unsigned long mref;</div><div class='del'>-	int name_len;</div><div class='del'>-	unsigned dt_type;</div><div class='del'>-	FILE_NAME_TYPE_FLAGS name_type;</div><div class='del'>-</div><div class='del'>-	name_type = ie-&gt;key.file_name.file_name_type;</div><div class='del'>-	if (name_type == FILE_NAME_DOS) {</div><div class='del'>-		ntfs_debug("Skipping DOS name space entry.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (MREF_LE(ie-&gt;data.dir.indexed_file) == FILE_root) {</div><div class='del'>-		ntfs_debug("Skipping root directory self reference entry.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (MREF_LE(ie-&gt;data.dir.indexed_file) &lt; FILE_first_user &amp;&amp;</div><div class='del'>-			!NVolShowSystemFiles(vol)) {</div><div class='del'>-		ntfs_debug("Skipping system file.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	name_len = ntfs_ucstonls(vol, (ntfschar*)&amp;ie-&gt;key.file_name.file_name,</div><div class='del'>-			ie-&gt;key.file_name.file_name_length, &amp;name,</div><div class='del'>-			NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1);</div><div class='del'>-	if (name_len &lt;= 0) {</div><div class='del'>-		ntfs_warning(vol-&gt;sb, "Skipping unrepresentable inode 0x%llx.",</div><div class='del'>-				(long long)MREF_LE(ie-&gt;data.dir.indexed_file));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (ie-&gt;key.file_name.file_attributes &amp;</div><div class='del'>-			FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)</div><div class='del'>-		dt_type = DT_DIR;</div><div class='del'>-	else</div><div class='del'>-		dt_type = DT_REG;</div><div class='del'>-	mref = MREF_LE(ie-&gt;data.dir.indexed_file);</div><div class='del'>-	/*</div><div class='del'>-	 * Drop the page lock otherwise we deadlock with NFS when it calls</div><div class='del'>-	 * -&gt;lookup since ntfs_lookup() will lock the same page.</div><div class='del'>-	 */</div><div class='del'>-	if (ia_page)</div><div class='del'>-		unlock_page(ia_page);</div><div class='del'>-	ntfs_debug("Calling filldir for %s with len %i, fpos 0x%llx, inode "</div><div class='del'>-			"0x%lx, DT_%s.", name, name_len, actor-&gt;pos, mref,</div><div class='del'>-			dt_type == DT_DIR ? "DIR" : "REG");</div><div class='del'>-	if (!dir_emit(actor, name, name_len, mref, dt_type))</div><div class='del'>-		return 1;</div><div class='del'>-	/* Relock the page but not if we are aborting -&gt;readdir. */</div><div class='del'>-	if (ia_page)</div><div class='del'>-		lock_page(ia_page);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We use the same basic approach as the old NTFS driver, i.e. we parse the</div><div class='del'>- * index root entries and then the index allocation entries that are marked</div><div class='del'>- * as in use in the index bitmap.</div><div class='del'>- *</div><div class='del'>- * While this will return the names in random order this doesn't matter for</div><div class='del'>- * -&gt;readdir but OTOH results in a faster -&gt;readdir.</div><div class='del'>- *</div><div class='del'>- * VFS calls -&gt;readdir without BKL but with i_mutex held. This protects the VFS</div><div class='del'>- * parts (e.g. -&gt;f_pos and -&gt;i_size, and it also protects against directory</div><div class='del'>- * modifications).</div><div class='del'>- *</div><div class='del'>- * Locking:  - Caller must hold i_mutex on the directory.</div><div class='del'>- *	     - Each page cache page in the index allocation mapping must be</div><div class='del'>- *	       locked whilst being accessed otherwise we may find a corrupt</div><div class='del'>- *	       page due to it being under -&gt;writepage at the moment which</div><div class='del'>- *	       applies the mst protection fixups before writing out and then</div><div class='del'>- *	       removes them again after the write is complete after which it </div><div class='del'>- *	       unlocks the page.</div><div class='del'>- */</div><div class='del'>-static int ntfs_readdir(struct file *file, struct dir_context *actor)</div><div class='del'>-{</div><div class='del'>-	s64 ia_pos, ia_start, prev_ia_pos, bmp_pos;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct inode *bmp_vi, *vdir = file_inode(file);</div><div class='del'>-	struct super_block *sb = vdir-&gt;i_sb;</div><div class='del'>-	ntfs_inode *ndir = NTFS_I(vdir);</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(sb);</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	INDEX_ROOT *ir = NULL;</div><div class='del'>-	INDEX_ENTRY *ie;</div><div class='del'>-	INDEX_ALLOCATION *ia;</div><div class='del'>-	u8 *name = NULL;</div><div class='del'>-	int rc, err, ir_pos, cur_bmp_pos;</div><div class='del'>-	struct address_space *ia_mapping, *bmp_mapping;</div><div class='del'>-	struct page *bmp_page = NULL, *ia_page = NULL;</div><div class='del'>-	u8 *kaddr, *bmp, *index_end;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx, fpos 0x%llx.",</div><div class='del'>-			vdir-&gt;i_ino, actor-&gt;pos);</div><div class='del'>-	rc = err = 0;</div><div class='del'>-	/* Are we at end of dir yet? */</div><div class='del'>-	i_size = i_size_read(vdir);</div><div class='del'>-	if (actor-&gt;pos &gt;= i_size + vol-&gt;mft_record_size)</div><div class='del'>-		return 0;</div><div class='del'>-	/* Emulate . and .. for all directories. */</div><div class='del'>-	if (!dir_emit_dots(file, actor))</div><div class='del'>-		return 0;</div><div class='del'>-	m = NULL;</div><div class='del'>-	ctx = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate a buffer to store the current name being processed</div><div class='del'>-	 * converted to format determined by current NLS.</div><div class='del'>-	 */</div><div class='del'>-	name = kmalloc(NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1, GFP_NOFS);</div><div class='del'>-	if (unlikely(!name)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Are we jumping straight into the index allocation attribute? */</div><div class='del'>-	if (actor-&gt;pos &gt;= vol-&gt;mft_record_size)</div><div class='del'>-		goto skip_index_root;</div><div class='del'>-	/* Get hold of the mft record for the directory. */</div><div class='del'>-	m = map_mft_record(ndir);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(ndir, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the offset into the index root attribute. */</div><div class='del'>-	ir_pos = (s64)actor-&gt;pos;</div><div class='del'>-	/* Find the index root attribute in the mft record. */</div><div class='del'>-	err = ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,</div><div class='del'>-			0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(sb, "Index root attribute missing in directory "</div><div class='del'>-				"inode 0x%lx.", vdir-&gt;i_ino);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Copy the index root attribute value to a buffer so that we can put</div><div class='del'>-	 * the search context and unmap the mft record before calling the</div><div class='del'>-	 * filldir() callback.  We need to do this because of NFSd which calls</div><div class='del'>-	 * -&gt;lookup() from its filldir callback() and this causes NTFS to</div><div class='del'>-	 * deadlock as ntfs_lookup() maps the mft record of the directory and</div><div class='del'>-	 * we have got it mapped here already.  The only solution is for us to</div><div class='del'>-	 * unmap the mft record here so that a call to ntfs_lookup() is able to</div><div class='del'>-	 * map the mft record without deadlocking.</div><div class='del'>-	 */</div><div class='del'>-	rc = le32_to_cpu(ctx-&gt;attr-&gt;data.resident.value_length);</div><div class='del'>-	ir = kmalloc(rc, GFP_NOFS);</div><div class='del'>-	if (unlikely(!ir)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Copy the index root value (it has been verified in read_inode). */</div><div class='del'>-	memcpy(ir, (u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset), rc);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(ndir);</div><div class='del'>-	ctx = NULL;</div><div class='del'>-	m = NULL;</div><div class='del'>-	index_end = (u8*)&amp;ir-&gt;index + le32_to_cpu(ir-&gt;index.index_length);</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ir-&gt;index +</div><div class='del'>-			le32_to_cpu(ir-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry or until filldir tells us it has had enough</div><div class='del'>-	 * or signals an error (both covered by the rc test).</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		ntfs_debug("In index root, offset 0x%zx.", (u8*)ie - (u8*)ir);</div><div class='del'>-		/* Bounds checks. */</div><div class='del'>-		if (unlikely((u8*)ie &lt; (u8*)ir || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				index_end))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/* The last entry cannot contain a name. */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/* Skip index root entry if continuing previous readdir. */</div><div class='del'>-		if (ir_pos &gt; (u8*)ie - (u8*)ir)</div><div class='del'>-			continue;</div><div class='del'>-		/* Advance the position even if going to skip the entry. */</div><div class='del'>-		actor-&gt;pos = (u8*)ie - (u8*)ir;</div><div class='del'>-		/* Submit the name to the filldir callback. */</div><div class='del'>-		rc = ntfs_filldir(vol, ndir, NULL, ie, name, actor);</div><div class='del'>-		if (rc) {</div><div class='del'>-			kfree(ir);</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* We are done with the index root and can free the buffer. */</div><div class='del'>-	kfree(ir);</div><div class='del'>-	ir = NULL;</div><div class='del'>-	/* If there is no index allocation attribute we are finished. */</div><div class='del'>-	if (!NInoIndexAllocPresent(ndir))</div><div class='del'>-		goto EOD;</div><div class='del'>-	/* Advance fpos to the beginning of the index allocation. */</div><div class='del'>-	actor-&gt;pos = vol-&gt;mft_record_size;</div><div class='del'>-skip_index_root:</div><div class='del'>-	kaddr = NULL;</div><div class='del'>-	prev_ia_pos = -1LL;</div><div class='del'>-	/* Get the offset into the index allocation attribute. */</div><div class='del'>-	ia_pos = (s64)actor-&gt;pos - vol-&gt;mft_record_size;</div><div class='del'>-	ia_mapping = vdir-&gt;i_mapping;</div><div class='del'>-	ntfs_debug("Inode 0x%lx, getting index bitmap.", vdir-&gt;i_ino);</div><div class='del'>-	bmp_vi = ntfs_attr_iget(vdir, AT_BITMAP, I30, 4);</div><div class='del'>-	if (IS_ERR(bmp_vi)) {</div><div class='del'>-		ntfs_error(sb, "Failed to get bitmap attribute.");</div><div class='del'>-		err = PTR_ERR(bmp_vi);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	bmp_mapping = bmp_vi-&gt;i_mapping;</div><div class='del'>-	/* Get the starting bitmap bit position and sanity check it. */</div><div class='del'>-	bmp_pos = ia_pos &gt;&gt; ndir-&gt;itype.index.block_size_bits;</div><div class='del'>-	if (unlikely(bmp_pos &gt;&gt; 3 &gt;= i_size_read(bmp_vi))) {</div><div class='del'>-		ntfs_error(sb, "Current index allocation position exceeds "</div><div class='del'>-				"index bitmap size.");</div><div class='del'>-		goto iput_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the starting bit position in the current bitmap page. */</div><div class='del'>-	cur_bmp_pos = bmp_pos &amp; ((PAGE_SIZE * 8) - 1);</div><div class='del'>-	bmp_pos &amp;= ~(u64)((PAGE_SIZE * 8) - 1);</div><div class='del'>-get_next_bmp_page:</div><div class='del'>-	ntfs_debug("Reading bitmap with page index 0x%llx, bit ofs 0x%llx",</div><div class='del'>-			(unsigned long long)bmp_pos &gt;&gt; (3 + PAGE_SHIFT),</div><div class='del'>-			(unsigned long long)bmp_pos &amp;</div><div class='del'>-			(unsigned long long)((PAGE_SIZE * 8) - 1));</div><div class='del'>-	bmp_page = ntfs_map_page(bmp_mapping,</div><div class='del'>-			bmp_pos &gt;&gt; (3 + PAGE_SHIFT));</div><div class='del'>-	if (IS_ERR(bmp_page)) {</div><div class='del'>-		ntfs_error(sb, "Reading index bitmap failed.");</div><div class='del'>-		err = PTR_ERR(bmp_page);</div><div class='del'>-		bmp_page = NULL;</div><div class='del'>-		goto iput_err_out;</div><div class='del'>-	}</div><div class='del'>-	bmp = (u8*)page_address(bmp_page);</div><div class='del'>-	/* Find next index block in use. */</div><div class='del'>-	while (!(bmp[cur_bmp_pos &gt;&gt; 3] &amp; (1 &lt;&lt; (cur_bmp_pos &amp; 7)))) {</div><div class='del'>-find_next_index_buffer:</div><div class='del'>-		cur_bmp_pos++;</div><div class='del'>-		/*</div><div class='del'>-		 * If we have reached the end of the bitmap page, get the next</div><div class='del'>-		 * page, and put away the old one.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely((cur_bmp_pos &gt;&gt; 3) &gt;= PAGE_SIZE)) {</div><div class='del'>-			ntfs_unmap_page(bmp_page);</div><div class='del'>-			bmp_pos += PAGE_SIZE * 8;</div><div class='del'>-			cur_bmp_pos = 0;</div><div class='del'>-			goto get_next_bmp_page;</div><div class='del'>-		}</div><div class='del'>-		/* If we have reached the end of the bitmap, we are done. */</div><div class='del'>-		if (unlikely(((bmp_pos + cur_bmp_pos) &gt;&gt; 3) &gt;= i_size))</div><div class='del'>-			goto unm_EOD;</div><div class='del'>-		ia_pos = (bmp_pos + cur_bmp_pos) &lt;&lt;</div><div class='del'>-				ndir-&gt;itype.index.block_size_bits;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Handling index buffer 0x%llx.",</div><div class='del'>-			(unsigned long long)bmp_pos + cur_bmp_pos);</div><div class='del'>-	/* If the current index buffer is in the same page we reuse the page. */</div><div class='del'>-	if ((prev_ia_pos &amp; (s64)PAGE_MASK) !=</div><div class='del'>-			(ia_pos &amp; (s64)PAGE_MASK)) {</div><div class='del'>-		prev_ia_pos = ia_pos;</div><div class='del'>-		if (likely(ia_page != NULL)) {</div><div class='del'>-			unlock_page(ia_page);</div><div class='del'>-			ntfs_unmap_page(ia_page);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Map the page cache page containing the current ia_pos,</div><div class='del'>-		 * reading it from disk if necessary.</div><div class='del'>-		 */</div><div class='del'>-		ia_page = ntfs_map_page(ia_mapping, ia_pos &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		if (IS_ERR(ia_page)) {</div><div class='del'>-			ntfs_error(sb, "Reading index allocation data failed.");</div><div class='del'>-			err = PTR_ERR(ia_page);</div><div class='del'>-			ia_page = NULL;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		lock_page(ia_page);</div><div class='del'>-		kaddr = (u8*)page_address(ia_page);</div><div class='del'>-	}</div><div class='del'>-	/* Get the current index buffer. */</div><div class='del'>-	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos &amp; ~PAGE_MASK &amp;</div><div class='del'>-					  ~(s64)(ndir-&gt;itype.index.block_size - 1)));</div><div class='del'>-	/* Bounds checks. */</div><div class='del'>-	if (unlikely((u8*)ia &lt; kaddr || (u8*)ia &gt; kaddr + PAGE_SIZE)) {</div><div class='del'>-		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "</div><div class='del'>-				"inode 0x%lx or driver bug.", vdir-&gt;i_ino);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Catch multi sector transfer fixup errors. */</div><div class='del'>-	if (unlikely(!ntfs_is_indx_record(ia-&gt;magic))) {</div><div class='del'>-		ntfs_error(sb, "Directory index record with vcn 0x%llx is "</div><div class='del'>-				"corrupt.  Corrupt inode 0x%lx.  Run chkdsk.",</div><div class='del'>-				(unsigned long long)ia_pos &gt;&gt;</div><div class='del'>-				ndir-&gt;itype.index.vcn_size_bits, vdir-&gt;i_ino);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(sle64_to_cpu(ia-&gt;index_block_vcn) != (ia_pos &amp;</div><div class='del'>-			~(s64)(ndir-&gt;itype.index.block_size - 1)) &gt;&gt;</div><div class='del'>-			ndir-&gt;itype.index.vcn_size_bits)) {</div><div class='del'>-		ntfs_error(sb, "Actual VCN (0x%llx) of index buffer is "</div><div class='del'>-				"different from expected VCN (0x%llx). "</div><div class='del'>-				"Directory inode 0x%lx is corrupt or driver "</div><div class='del'>-				"bug. ", (unsigned long long)</div><div class='del'>-				sle64_to_cpu(ia-&gt;index_block_vcn),</div><div class='del'>-				(unsigned long long)ia_pos &gt;&gt;</div><div class='del'>-				ndir-&gt;itype.index.vcn_size_bits, vdir-&gt;i_ino);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(le32_to_cpu(ia-&gt;index.allocated_size) + 0x18 !=</div><div class='del'>-			ndir-&gt;itype.index.block_size)) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode "</div><div class='del'>-				"0x%lx has a size (%u) differing from the "</div><div class='del'>-				"directory specified size (%u). Directory "</div><div class='del'>-				"inode is corrupt or driver bug.",</div><div class='del'>-				(unsigned long long)ia_pos &gt;&gt;</div><div class='del'>-				ndir-&gt;itype.index.vcn_size_bits, vdir-&gt;i_ino,</div><div class='del'>-				le32_to_cpu(ia-&gt;index.allocated_size) + 0x18,</div><div class='del'>-				ndir-&gt;itype.index.block_size);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)ia + ndir-&gt;itype.index.block_size;</div><div class='del'>-	if (unlikely(index_end &gt; kaddr + PAGE_SIZE)) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of directory inode "</div><div class='del'>-				"0x%lx crosses page boundary. Impossible! "</div><div class='del'>-				"Cannot access! This is probably a bug in the "</div><div class='del'>-				"driver.", (unsigned long long)ia_pos &gt;&gt;</div><div class='del'>-				ndir-&gt;itype.index.vcn_size_bits, vdir-&gt;i_ino);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ia_start = ia_pos &amp; ~(s64)(ndir-&gt;itype.index.block_size - 1);</div><div class='del'>-	index_end = (u8*)&amp;ia-&gt;index + le32_to_cpu(ia-&gt;index.index_length);</div><div class='del'>-	if (unlikely(index_end &gt; (u8*)ia + ndir-&gt;itype.index.block_size)) {</div><div class='del'>-		ntfs_error(sb, "Size of index buffer (VCN 0x%llx) of directory "</div><div class='del'>-				"inode 0x%lx exceeds maximum size.",</div><div class='del'>-				(unsigned long long)ia_pos &gt;&gt;</div><div class='del'>-				ndir-&gt;itype.index.vcn_size_bits, vdir-&gt;i_ino);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* The first index entry in this index buffer. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ia-&gt;index +</div><div class='del'>-			le32_to_cpu(ia-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry or until filldir tells us it has had enough</div><div class='del'>-	 * or signals an error (both covered by the rc test).</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		ntfs_debug("In index allocation, offset 0x%llx.",</div><div class='del'>-				(unsigned long long)ia_start +</div><div class='del'>-				(unsigned long long)((u8*)ie - (u8*)ia));</div><div class='del'>-		/* Bounds checks. */</div><div class='del'>-		if (unlikely((u8*)ie &lt; (u8*)ia || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				index_end))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/* The last entry cannot contain a name. */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/* Skip index block entry if continuing previous readdir. */</div><div class='del'>-		if (ia_pos - ia_start &gt; (u8*)ie - (u8*)ia)</div><div class='del'>-			continue;</div><div class='del'>-		/* Advance the position even if going to skip the entry. */</div><div class='del'>-		actor-&gt;pos = (u8*)ie - (u8*)ia +</div><div class='del'>-				(sle64_to_cpu(ia-&gt;index_block_vcn) &lt;&lt;</div><div class='del'>-				ndir-&gt;itype.index.vcn_size_bits) +</div><div class='del'>-				vol-&gt;mft_record_size;</div><div class='del'>-		/*</div><div class='del'>-		 * Submit the name to the @filldir callback.  Note,</div><div class='del'>-		 * ntfs_filldir() drops the lock on @ia_page but it retakes it</div><div class='del'>-		 * before returning, unless a non-zero value is returned in</div><div class='del'>-		 * which case the page is left unlocked.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_filldir(vol, ndir, ia_page, ie, name, actor);</div><div class='del'>-		if (rc) {</div><div class='del'>-			/* @ia_page is already unlocked in this case. */</div><div class='del'>-			ntfs_unmap_page(ia_page);</div><div class='del'>-			ntfs_unmap_page(bmp_page);</div><div class='del'>-			iput(bmp_vi);</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	goto find_next_index_buffer;</div><div class='del'>-unm_EOD:</div><div class='del'>-	if (ia_page) {</div><div class='del'>-		unlock_page(ia_page);</div><div class='del'>-		ntfs_unmap_page(ia_page);</div><div class='del'>-	}</div><div class='del'>-	ntfs_unmap_page(bmp_page);</div><div class='del'>-	iput(bmp_vi);</div><div class='del'>-EOD:</div><div class='del'>-	/* We are finished, set fpos to EOD. */</div><div class='del'>-	actor-&gt;pos = i_size + vol-&gt;mft_record_size;</div><div class='del'>-abort:</div><div class='del'>-	kfree(name);</div><div class='del'>-	return 0;</div><div class='del'>-err_out:</div><div class='del'>-	if (bmp_page) {</div><div class='del'>-		ntfs_unmap_page(bmp_page);</div><div class='del'>-iput_err_out:</div><div class='del'>-		iput(bmp_vi);</div><div class='del'>-	}</div><div class='del'>-	if (ia_page) {</div><div class='del'>-		unlock_page(ia_page);</div><div class='del'>-		ntfs_unmap_page(ia_page);</div><div class='del'>-	}</div><div class='del'>-	kfree(ir);</div><div class='del'>-	kfree(name);</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(ndir);</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	ntfs_debug("Failed. Returning error code %i.", -err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_dir_open - called when an inode is about to be opened</div><div class='del'>- * @vi:		inode to be opened</div><div class='del'>- * @filp:	file structure describing the inode</div><div class='del'>- *</div><div class='del'>- * Limit directory size to the page cache limit on architectures where unsigned</div><div class='del'>- * long is 32-bits. This is the most we can do for now without overflowing the</div><div class='del'>- * page cache page index. Doing it this way means we don't run into problems</div><div class='del'>- * because of existing too large directories. It would be better to allow the</div><div class='del'>- * user to read the accessible part of the directory but I doubt very much</div><div class='del'>- * anyone is going to hit this check on a 32-bit architecture, so there is no</div><div class='del'>- * point in adding the extra complexity required to support this.</div><div class='del'>- *</div><div class='del'>- * On 64-bit architectures, the check is hopefully optimized away by the</div><div class='del'>- * compiler.</div><div class='del'>- */</div><div class='del'>-static int ntfs_dir_open(struct inode *vi, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	if (sizeof(unsigned long) &lt; 8) {</div><div class='del'>-		if (i_size_read(vi) &gt; MAX_LFS_FILESIZE)</div><div class='del'>-			return -EFBIG;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_dir_fsync - sync a directory to disk</div><div class='del'>- * @filp:	directory to be synced</div><div class='del'>- * @start:	offset in bytes of the beginning of data range to sync</div><div class='del'>- * @end:	offset in bytes of the end of data range (inclusive)</div><div class='del'>- * @datasync:	if non-zero only flush user data and not metadata</div><div class='del'>- *</div><div class='del'>- * Data integrity sync of a directory to disk.  Used for fsync, fdatasync, and</div><div class='del'>- * msync system calls.  This function is based on file.c::ntfs_file_fsync().</div><div class='del'>- *</div><div class='del'>- * Write the mft record and all associated extent mft records as well as the</div><div class='del'>- * $INDEX_ALLOCATION and $BITMAP attributes and then sync the block device.</div><div class='del'>- *</div><div class='del'>- * If @datasync is true, we do not wait on the inode(s) to be written out</div><div class='del'>- * but we always wait on the page cache pages to be written out.</div><div class='del'>- *</div><div class='del'>- * Note: In the past @filp could be NULL so we ignore it as we don't need it</div><div class='del'>- * anyway.</div><div class='del'>- *</div><div class='del'>- * Locking: Caller must hold i_mutex on the inode.</div><div class='del'>- *</div><div class='del'>- * TODO: We should probably also write all attribute/index inodes associated</div><div class='del'>- * with this inode but since we have no simple way of getting to them we ignore</div><div class='del'>- * this problem for now.  We do write the $BITMAP attribute if it is present</div><div class='del'>- * which is the important one for a directory so things are not too bad.</div><div class='del'>- */</div><div class='del'>-static int ntfs_dir_fsync(struct file *filp, loff_t start, loff_t end,</div><div class='del'>-			  int datasync)</div><div class='del'>-{</div><div class='del'>-	struct inode *bmp_vi, *vi = filp-&gt;f_mapping-&gt;host;</div><div class='del'>-	int err, ret;</div><div class='del'>-	ntfs_attr na;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	err = file_write_and_wait_range(filp, start, end);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	inode_lock(vi);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!S_ISDIR(vi-&gt;i_mode));</div><div class='del'>-	/* If the bitmap attribute inode is in memory sync it, too. */</div><div class='del'>-	na.mft_no = vi-&gt;i_ino;</div><div class='del'>-	na.type = AT_BITMAP;</div><div class='del'>-	na.name = I30;</div><div class='del'>-	na.name_len = 4;</div><div class='del'>-	bmp_vi = ilookup5(vi-&gt;i_sb, vi-&gt;i_ino, ntfs_test_inode, &amp;na);</div><div class='del'>-	if (bmp_vi) {</div><div class='del'>- 		write_inode_now(bmp_vi, !datasync);</div><div class='del'>-		iput(bmp_vi);</div><div class='del'>-	}</div><div class='del'>-	ret = __ntfs_write_inode(vi, 1);</div><div class='del'>-	write_inode_now(vi, !datasync);</div><div class='del'>-	err = sync_blockdev(vi-&gt;i_sb-&gt;s_bdev);</div><div class='del'>-	if (unlikely(err &amp;&amp; !ret))</div><div class='del'>-		ret = err;</div><div class='del'>-	if (likely(!ret))</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-	else</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Failed to f%ssync inode 0x%lx.  Error "</div><div class='del'>-				"%u.", datasync ? "data" : "", vi-&gt;i_ino, -ret);</div><div class='del'>-	inode_unlock(vi);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-WRAP_DIR_ITER(ntfs_readdir) // FIXME!</div><div class='del'>-const struct file_operations ntfs_dir_ops = {</div><div class='del'>-	.llseek		= generic_file_llseek,	/* Seek inside directory. */</div><div class='del'>-	.read		= generic_read_dir,	/* Return -EISDIR. */</div><div class='del'>-	.iterate_shared	= shared_ntfs_readdir,	/* Read directory contents. */</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.fsync		= ntfs_dir_fsync,	/* Sync a directory to disk. */</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	/*.ioctl	= ,*/			/* Perform function on the</div><div class='del'>-						   mounted filesystem. */</div><div class='del'>-	.open		= ntfs_dir_open,	/* Open directory. */</div><div class='del'>-};</div><div class='head'>diff --git a/fs/ntfs/dir.h b/fs/ntfs/dir.h<br/>deleted file mode 100644<br/>index 0e326753df40..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/dir.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/dir.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * dir.h - Defines for directory handling in NTFS Linux kernel driver. Part of</div><div class='del'>- *	   the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2002-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_DIR_H</div><div class='del'>-#define _LINUX_NTFS_DIR_H</div><div class='del'>-</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_name is used to return the file name to the caller of</div><div class='del'>- * ntfs_lookup_inode_by_name() in order for the caller (namei.c::ntfs_lookup())</div><div class='del'>- * to be able to deal with dcache aliasing issues.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	MFT_REF mref;</div><div class='del'>-	FILE_NAME_TYPE_FLAGS type;</div><div class='del'>-	u8 len;</div><div class='del'>-	ntfschar name[0];</div><div class='del'>-} __attribute__ ((__packed__)) ntfs_name;</div><div class='del'>-</div><div class='del'>-/* The little endian Unicode string $I30 as a global constant. */</div><div class='del'>-extern ntfschar I30[5];</div><div class='del'>-</div><div class='del'>-extern MFT_REF ntfs_lookup_inode_by_name(ntfs_inode *dir_ni,</div><div class='del'>-		const ntfschar *uname, const int uname_len, ntfs_name **res);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_FS_DIR_H */</div><div class='head'>diff --git a/fs/ntfs/endian.h b/fs/ntfs/endian.h<br/>deleted file mode 100644<br/>index f30c139bf9ae..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/endian.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/endian.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * endian.h - Defines for endianness handling in NTFS Linux kernel driver.</div><div class='del'>- *	      Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_ENDIAN_H</div><div class='del'>-#define _LINUX_NTFS_ENDIAN_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include "types.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Signed endianness conversion functions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline s16 sle16_to_cpu(sle16 x)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu((__force le16)x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s32 sle32_to_cpu(sle32 x)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu((__force le32)x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s64 sle64_to_cpu(sle64 x)</div><div class='del'>-{</div><div class='del'>-	return le64_to_cpu((__force le64)x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s16 sle16_to_cpup(sle16 *x)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(*(__force le16*)x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s32 sle32_to_cpup(sle32 *x)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(*(__force le32*)x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline s64 sle64_to_cpup(sle64 *x)</div><div class='del'>-{</div><div class='del'>-	return le64_to_cpu(*(__force le64*)x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sle16 cpu_to_sle16(s16 x)</div><div class='del'>-{</div><div class='del'>-	return (__force sle16)cpu_to_le16(x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sle32 cpu_to_sle32(s32 x)</div><div class='del'>-{</div><div class='del'>-	return (__force sle32)cpu_to_le32(x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sle64 cpu_to_sle64(s64 x)</div><div class='del'>-{</div><div class='del'>-	return (__force sle64)cpu_to_le64(x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sle16 cpu_to_sle16p(s16 *x)</div><div class='del'>-{</div><div class='del'>-	return (__force sle16)cpu_to_le16(*x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sle32 cpu_to_sle32p(s32 *x)</div><div class='del'>-{</div><div class='del'>-	return (__force sle32)cpu_to_le32(*x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sle64 cpu_to_sle64p(s64 *x)</div><div class='del'>-{</div><div class='del'>-	return (__force sle64)cpu_to_le64(*x);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_ENDIAN_H */</div><div class='head'>diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c<br/>deleted file mode 100644<br/>index 297c0b9db621..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1997 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * file.c - NTFS kernel file operations.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2015 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/pagevec.h&gt;</div><div class='del'>-#include &lt;linux/sched/signal.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "bitmap.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "lcnalloc.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_file_open - called when an inode is about to be opened</div><div class='del'>- * @vi:		inode to be opened</div><div class='del'>- * @filp:	file structure describing the inode</div><div class='del'>- *</div><div class='del'>- * Limit file size to the page cache limit on architectures where unsigned long</div><div class='del'>- * is 32-bits. This is the most we can do for now without overflowing the page</div><div class='del'>- * cache page index. Doing it this way means we don't run into problems because</div><div class='del'>- * of existing too large files. It would be better to allow the user to read</div><div class='del'>- * the beginning of the file but I doubt very much anyone is going to hit this</div><div class='del'>- * check on a 32-bit architecture, so there is no point in adding the extra</div><div class='del'>- * complexity required to support this.</div><div class='del'>- *</div><div class='del'>- * On 64-bit architectures, the check is hopefully optimized away by the</div><div class='del'>- * compiler.</div><div class='del'>- *</div><div class='del'>- * After the check passes, just call generic_file_open() to do its work.</div><div class='del'>- */</div><div class='del'>-static int ntfs_file_open(struct inode *vi, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	if (sizeof(unsigned long) &lt; 8) {</div><div class='del'>-		if (i_size_read(vi) &gt; MAX_LFS_FILESIZE)</div><div class='del'>-			return -EOVERFLOW;</div><div class='del'>-	}</div><div class='del'>-	return generic_file_open(vi, filp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_extend_initialized - extend the initialized size of an attribute</div><div class='del'>- * @ni:			ntfs inode of the attribute to extend</div><div class='del'>- * @new_init_size:	requested new initialized size in bytes</div><div class='del'>- *</div><div class='del'>- * Extend the initialized size of an attribute described by the ntfs inode @ni</div><div class='del'>- * to @new_init_size bytes.  This involves zeroing any non-sparse space between</div><div class='del'>- * the old initialized size and @new_init_size both in the page cache and on</div><div class='del'>- * disk (if relevant complete pages are already uptodate in the page cache then</div><div class='del'>- * these are simply marked dirty).</div><div class='del'>- *</div><div class='del'>- * As a side-effect, the file size (vfs inode-&gt;i_size) may be incremented as,</div><div class='del'>- * in the resident attribute case, it is tied to the initialized size and, in</div><div class='del'>- * the non-resident attribute case, it may not fall below the initialized size.</div><div class='del'>- *</div><div class='del'>- * Note that if the attribute is resident, we do not need to touch the page</div><div class='del'>- * cache at all.  This is because if the page cache page is not uptodate we</div><div class='del'>- * bring it uptodate later, when doing the write to the mft record since we</div><div class='del'>- * then already have the page mapped.  And if the page is uptodate, the</div><div class='del'>- * non-initialized region will already have been zeroed when the page was</div><div class='del'>- * brought uptodate and the region may in fact already have been overwritten</div><div class='del'>- * with new data via mmap() based writes, so we cannot just zero it.  And since</div><div class='del'>- * POSIX specifies that the behaviour of resizing a file whilst it is mmap()ped</div><div class='del'>- * is unspecified, we choose not to do zeroing and thus we do not need to touch</div><div class='del'>- * the page at all.  For a more detailed explanation see ntfs_truncate() in</div><div class='del'>- * fs/ntfs/inode.c.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  In the case that an error is</div><div class='del'>- * encountered it is possible that the initialized size will already have been</div><div class='del'>- * incremented some way towards @new_init_size but it is guaranteed that if</div><div class='del'>- * this is the case, the necessary zeroing will also have happened and that all</div><div class='del'>- * metadata is self-consistent.</div><div class='del'>- *</div><div class='del'>- * Locking: i_mutex on the vfs inode corrseponsind to the ntfs inode @ni must be</div><div class='del'>- *	    held by the caller.</div><div class='del'>- */</div><div class='del'>-static int ntfs_attr_extend_initialized(ntfs_inode *ni, const s64 new_init_size)</div><div class='del'>-{</div><div class='del'>-	s64 old_init_size;</div><div class='del'>-	loff_t old_i_size;</div><div class='del'>-	pgoff_t index, end_index;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct inode *vi = VFS_I(ni);</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-	MFT_RECORD *m = NULL;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_attr_search_ctx *ctx = NULL;</div><div class='del'>-	struct address_space *mapping;</div><div class='del'>-	struct page *page = NULL;</div><div class='del'>-	u8 *kattr;</div><div class='del'>-	int err;</div><div class='del'>-	u32 attr_len;</div><div class='del'>-</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	old_init_size = ni-&gt;initialized_size;</div><div class='del'>-	old_i_size = i_size_read(vi);</div><div class='del'>-	BUG_ON(new_init_size &gt; ni-&gt;allocated_size);</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, "</div><div class='del'>-			"old_initialized_size 0x%llx, "</div><div class='del'>-			"new_initialized_size 0x%llx, i_size 0x%llx.",</div><div class='del'>-			vi-&gt;i_ino, (unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-			(unsigned long long)old_init_size,</div><div class='del'>-			(unsigned long long)new_init_size, old_i_size);</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	/* Use goto to reduce indentation and we need the label below anyway. */</div><div class='del'>-	if (NInoNonResident(ni))</div><div class='del'>-		goto do_non_resident_extend;</div><div class='del'>-	BUG_ON(old_init_size != old_i_size);</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	BUG_ON(a-&gt;non_resident);</div><div class='del'>-	/* The total length of the attribute value. */</div><div class='del'>-	attr_len = le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	BUG_ON(old_i_size != (loff_t)attr_len);</div><div class='del'>-	/*</div><div class='del'>-	 * Do the zeroing in the mft record and update the attribute size in</div><div class='del'>-	 * the mft record.</div><div class='del'>-	 */</div><div class='del'>-	kattr = (u8*)a + le16_to_cpu(a-&gt;data.resident.value_offset);</div><div class='del'>-	memset(kattr + attr_len, 0, new_init_size - attr_len);</div><div class='del'>-	a-&gt;data.resident.value_length = cpu_to_le32((u32)new_init_size);</div><div class='del'>-	/* Finally, update the sizes in the vfs and ntfs inodes. */</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	i_size_write(vi, new_init_size);</div><div class='del'>-	ni-&gt;initialized_size = new_init_size;</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	goto done;</div><div class='del'>-do_non_resident_extend:</div><div class='del'>-	/*</div><div class='del'>-	 * If the new initialized size @new_init_size exceeds the current file</div><div class='del'>-	 * size (vfs inode-&gt;i_size), we need to extend the file size to the</div><div class='del'>-	 * new initialized size.</div><div class='del'>-	 */</div><div class='del'>-	if (new_init_size &gt; old_i_size) {</div><div class='del'>-		m = map_mft_record(base_ni);</div><div class='del'>-		if (IS_ERR(m)) {</div><div class='del'>-			err = PTR_ERR(m);</div><div class='del'>-			m = NULL;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-		if (unlikely(!ctx)) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-				CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (err == -ENOENT)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		m = ctx-&gt;mrec;</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		BUG_ON(!a-&gt;non_resident);</div><div class='del'>-		BUG_ON(old_i_size != (loff_t)</div><div class='del'>-				sle64_to_cpu(a-&gt;data.non_resident.data_size));</div><div class='del'>-		a-&gt;data.non_resident.data_size = cpu_to_sle64(new_init_size);</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		/* Update the file size in the vfs inode. */</div><div class='del'>-		i_size_write(vi, new_init_size);</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-		m = NULL;</div><div class='del'>-	}</div><div class='del'>-	mapping = vi-&gt;i_mapping;</div><div class='del'>-	index = old_init_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	end_index = (new_init_size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	do {</div><div class='del'>-		/*</div><div class='del'>-		 * Read the page.  If the page is not present, this will zero</div><div class='del'>-		 * the uninitialized regions for us.</div><div class='del'>-		 */</div><div class='del'>-		page = read_mapping_page(mapping, index, NULL);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-			goto init_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Update the initialized size in the ntfs inode.  This is</div><div class='del'>-		 * enough to make ntfs_writepage() work.</div><div class='del'>-		 */</div><div class='del'>-		write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		ni-&gt;initialized_size = (s64)(index + 1) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		if (ni-&gt;initialized_size &gt; new_init_size)</div><div class='del'>-			ni-&gt;initialized_size = new_init_size;</div><div class='del'>-		write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		/* Set the page dirty so it gets written out. */</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		/*</div><div class='del'>-		 * Play nice with the vm and the rest of the system.  This is</div><div class='del'>-		 * very much needed as we can potentially be modifying the</div><div class='del'>-		 * initialised size from a very small value to a really huge</div><div class='del'>-		 * value, e.g.</div><div class='del'>-		 *	f = open(somefile, O_TRUNC);</div><div class='del'>-		 *	truncate(f, 10GiB);</div><div class='del'>-		 *	seek(f, 10GiB);</div><div class='del'>-		 *	write(f, 1);</div><div class='del'>-		 * And this would mean we would be marking dirty hundreds of</div><div class='del'>-		 * thousands of pages or as in the above example more than</div><div class='del'>-		 * two and a half million pages!</div><div class='del'>-		 *</div><div class='del'>-		 * TODO: For sparse pages could optimize this workload by using</div><div class='del'>-		 * the FsMisc / MiscFs page bit as a "PageIsSparse" bit.  This</div><div class='del'>-		 * would be set in read_folio for sparse pages and here we would</div><div class='del'>-		 * not need to mark dirty any pages which have this bit set.</div><div class='del'>-		 * The only caveat is that we have to clear the bit everywhere</div><div class='del'>-		 * where we allocate any clusters that lie in the page or that</div><div class='del'>-		 * contain the page.</div><div class='del'>-		 *</div><div class='del'>-		 * TODO: An even greater optimization would be for us to only</div><div class='del'>-		 * call read_folio() on pages which are not in sparse regions as</div><div class='del'>-		 * determined from the runlist.  This would greatly reduce the</div><div class='del'>-		 * number of pages we read and make dirty in the case of sparse</div><div class='del'>-		 * files.</div><div class='del'>-		 */</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-		cond_resched();</div><div class='del'>-	} while (++index &lt; end_index);</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	BUG_ON(ni-&gt;initialized_size != new_init_size);</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/* Now bring in sync the initialized_size in the mft record. */</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		goto init_err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto init_err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto init_err_out;</div><div class='del'>-	}</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	BUG_ON(!a-&gt;non_resident);</div><div class='del'>-	a-&gt;data.non_resident.initialized_size = cpu_to_sle64(new_init_size);</div><div class='del'>-done:</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	ntfs_debug("Done, initialized_size 0x%llx, i_size 0x%llx.",</div><div class='del'>-			(unsigned long long)new_init_size, i_size_read(vi));</div><div class='del'>-	return 0;</div><div class='del'>-init_err_out:</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ni-&gt;initialized_size = old_init_size;</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	ntfs_debug("Failed.  Returning error code %i.", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,</div><div class='del'>-		struct iov_iter *from)</div><div class='del'>-{</div><div class='del'>-	loff_t pos;</div><div class='del'>-	s64 end, ll;</div><div class='del'>-	ssize_t err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct inode *vi = file_inode(file);</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, pos "</div><div class='del'>-			"0x%llx, count 0x%zx.", vi-&gt;i_ino,</div><div class='del'>-			(unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-			(unsigned long long)iocb-&gt;ki_pos,</div><div class='del'>-			iov_iter_count(from));</div><div class='del'>-	err = generic_write_checks(iocb, from);</div><div class='del'>-	if (unlikely(err &lt;= 0))</div><div class='del'>-		goto out;</div><div class='del'>-	/*</div><div class='del'>-	 * All checks have passed.  Before we start doing any writing we want</div><div class='del'>-	 * to abort any totally illegal writes.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(NInoMstProtected(ni));</div><div class='del'>-	BUG_ON(ni-&gt;type != AT_DATA);</div><div class='del'>-	/* If file is encrypted, deny access, just like NT4. */</div><div class='del'>-	if (NInoEncrypted(ni)) {</div><div class='del'>-		/* Only $DATA attributes can be encrypted. */</div><div class='del'>-		/*</div><div class='del'>-		 * Reminder for later: Encrypted files are _always_</div><div class='del'>-		 * non-resident so that the content can always be encrypted.</div><div class='del'>-		 */</div><div class='del'>-		ntfs_debug("Denying write access to encrypted file.");</div><div class='del'>-		err = -EACCES;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (NInoCompressed(ni)) {</div><div class='del'>-		/* Only unnamed $DATA attribute can be compressed. */</div><div class='del'>-		BUG_ON(ni-&gt;name_len);</div><div class='del'>-		/*</div><div class='del'>-		 * Reminder for later: If resident, the data is not actually</div><div class='del'>-		 * compressed.  Only on the switch to non-resident does</div><div class='del'>-		 * compression kick in.  This is in contrast to encrypted files</div><div class='del'>-		 * (see above).</div><div class='del'>-		 */</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Writing to compressed files is not "</div><div class='del'>-				"implemented yet.  Sorry.");</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	err = file_remove_privs(file);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto out;</div><div class='del'>-	/*</div><div class='del'>-	 * Our -&gt;update_time method always succeeds thus file_update_time()</div><div class='del'>-	 * cannot fail either so there is no need to check the return code.</div><div class='del'>-	 */</div><div class='del'>-	file_update_time(file);</div><div class='del'>-	pos = iocb-&gt;ki_pos;</div><div class='del'>-	/* The first byte after the last cluster being written to. */</div><div class='del'>-	end = (pos + iov_iter_count(from) + vol-&gt;cluster_size_mask) &amp;</div><div class='del'>-			~(u64)vol-&gt;cluster_size_mask;</div><div class='del'>-	/*</div><div class='del'>-	 * If the write goes beyond the allocated size, extend the allocation</div><div class='del'>-	 * to cover the whole of the write, rounded up to the nearest cluster.</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ll = ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (end &gt; ll) {</div><div class='del'>-		/*</div><div class='del'>-		 * Extend the allocation without changing the data size.</div><div class='del'>-		 *</div><div class='del'>-		 * Note we ensure the allocation is big enough to at least</div><div class='del'>-		 * write some data but we do not require the allocation to be</div><div class='del'>-		 * complete, i.e. it may be partial.</div><div class='del'>-		 */</div><div class='del'>-		ll = ntfs_attr_extend_allocation(ni, end, -1, pos);</div><div class='del'>-		if (likely(ll &gt;= 0)) {</div><div class='del'>-			BUG_ON(pos &gt;= ll);</div><div class='del'>-			/* If the extension was partial truncate the write. */</div><div class='del'>-			if (end &gt; ll) {</div><div class='del'>-				ntfs_debug("Truncating write to inode 0x%lx, "</div><div class='del'>-						"attribute type 0x%x, because "</div><div class='del'>-						"the allocation was only "</div><div class='del'>-						"partially extended.",</div><div class='del'>-						vi-&gt;i_ino, (unsigned)</div><div class='del'>-						le32_to_cpu(ni-&gt;type));</div><div class='del'>-				iov_iter_truncate(from, ll - pos);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			err = ll;</div><div class='del'>-			read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			ll = ni-&gt;allocated_size;</div><div class='del'>-			read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			/* Perform a partial write if possible or fail. */</div><div class='del'>-			if (pos &lt; ll) {</div><div class='del'>-				ntfs_debug("Truncating write to inode 0x%lx "</div><div class='del'>-						"attribute type 0x%x, because "</div><div class='del'>-						"extending the allocation "</div><div class='del'>-						"failed (error %d).",</div><div class='del'>-						vi-&gt;i_ino, (unsigned)</div><div class='del'>-						le32_to_cpu(ni-&gt;type),</div><div class='del'>-						(int)-err);</div><div class='del'>-				iov_iter_truncate(from, ll - pos);</div><div class='del'>-			} else {</div><div class='del'>-				if (err != -ENOSPC)</div><div class='del'>-					ntfs_error(vi-&gt;i_sb, "Cannot perform "</div><div class='del'>-							"write to inode "</div><div class='del'>-							"0x%lx, attribute "</div><div class='del'>-							"type 0x%x, because "</div><div class='del'>-							"extending the "</div><div class='del'>-							"allocation failed "</div><div class='del'>-							"(error %ld).",</div><div class='del'>-							vi-&gt;i_ino, (unsigned)</div><div class='del'>-							le32_to_cpu(ni-&gt;type),</div><div class='del'>-							(long)-err);</div><div class='del'>-				else</div><div class='del'>-					ntfs_debug("Cannot perform write to "</div><div class='del'>-							"inode 0x%lx, "</div><div class='del'>-							"attribute type 0x%x, "</div><div class='del'>-							"because there is not "</div><div class='del'>-							"space left.",</div><div class='del'>-							vi-&gt;i_ino, (unsigned)</div><div class='del'>-							le32_to_cpu(ni-&gt;type));</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the write starts beyond the initialized size, extend it up to the</div><div class='del'>-	 * beginning of the write and initialize all non-sparse space between</div><div class='del'>-	 * the old initialized size and the new one.  This automatically also</div><div class='del'>-	 * increments the vfs inode-&gt;i_size to keep it above or equal to the</div><div class='del'>-	 * initialized_size.</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ll = ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (pos &gt; ll) {</div><div class='del'>-		/*</div><div class='del'>-		 * Wait for ongoing direct i/o to complete before proceeding.</div><div class='del'>-		 * New direct i/o cannot start as we hold i_mutex.</div><div class='del'>-		 */</div><div class='del'>-		inode_dio_wait(vi);</div><div class='del'>-		err = ntfs_attr_extend_initialized(ni, pos);</div><div class='del'>-		if (unlikely(err &lt; 0))</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Cannot perform write to inode "</div><div class='del'>-					"0x%lx, attribute type 0x%x, because "</div><div class='del'>-					"extending the initialized size "</div><div class='del'>-					"failed (error %d).", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-					(int)-err);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_grab_cache_pages - obtain a number of locked pages</div><div class='del'>- * @mapping:	address space mapping from which to obtain page cache pages</div><div class='del'>- * @index:	starting index in @mapping at which to begin obtaining pages</div><div class='del'>- * @nr_pages:	number of page cache pages to obtain</div><div class='del'>- * @pages:	array of pages in which to return the obtained page cache pages</div><div class='del'>- * @cached_page: allocated but as yet unused page</div><div class='del'>- *</div><div class='del'>- * Obtain @nr_pages locked page cache pages from the mapping @mapping and</div><div class='del'>- * starting at index @index.</div><div class='del'>- *</div><div class='del'>- * If a page is newly created, add it to lru list</div><div class='del'>- *</div><div class='del'>- * Note, the page locks are obtained in ascending page index order.</div><div class='del'>- */</div><div class='del'>-static inline int __ntfs_grab_cache_pages(struct address_space *mapping,</div><div class='del'>-		pgoff_t index, const unsigned nr_pages, struct page **pages,</div><div class='del'>-		struct page **cached_page)</div><div class='del'>-{</div><div class='del'>-	int err, nr;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!nr_pages);</div><div class='del'>-	err = nr = 0;</div><div class='del'>-	do {</div><div class='del'>-		pages[nr] = find_get_page_flags(mapping, index, FGP_LOCK |</div><div class='del'>-				FGP_ACCESSED);</div><div class='del'>-		if (!pages[nr]) {</div><div class='del'>-			if (!*cached_page) {</div><div class='del'>-				*cached_page = page_cache_alloc(mapping);</div><div class='del'>-				if (unlikely(!*cached_page)) {</div><div class='del'>-					err = -ENOMEM;</div><div class='del'>-					goto err_out;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			err = add_to_page_cache_lru(*cached_page, mapping,</div><div class='del'>-				   index,</div><div class='del'>-				   mapping_gfp_constraint(mapping, GFP_KERNEL));</div><div class='del'>-			if (unlikely(err)) {</div><div class='del'>-				if (err == -EEXIST)</div><div class='del'>-					continue;</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			pages[nr] = *cached_page;</div><div class='del'>-			*cached_page = NULL;</div><div class='del'>-		}</div><div class='del'>-		index++;</div><div class='del'>-		nr++;</div><div class='del'>-	} while (nr &lt; nr_pages);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-err_out:</div><div class='del'>-	while (nr &gt; 0) {</div><div class='del'>-		unlock_page(pages[--nr]);</div><div class='del'>-		put_page(pages[nr]);</div><div class='del'>-	}</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ntfs_submit_bh_for_read(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	lock_buffer(bh);</div><div class='del'>-	get_bh(bh);</div><div class='del'>-	bh-&gt;b_end_io = end_buffer_read_sync;</div><div class='del'>-	submit_bh(REQ_OP_READ, bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_prepare_pages_for_non_resident_write - prepare pages for receiving data</div><div class='del'>- * @pages:	array of destination pages</div><div class='del'>- * @nr_pages:	number of pages in @pages</div><div class='del'>- * @pos:	byte position in file at which the write begins</div><div class='del'>- * @bytes:	number of bytes to be written</div><div class='del'>- *</div><div class='del'>- * This is called for non-resident attributes from ntfs_file_buffered_write()</div><div class='del'>- * with i_mutex held on the inode (@pages[0]-&gt;mapping-&gt;host).  There are</div><div class='del'>- * @nr_pages pages in @pages which are locked but not kmap()ped.  The source</div><div class='del'>- * data has not yet been copied into the @pages.</div><div class='del'>- * </div><div class='del'>- * Need to fill any holes with actual clusters, allocate buffers if necessary,</div><div class='del'>- * ensure all the buffers are mapped, and bring uptodate any buffers that are</div><div class='del'>- * only partially being written to.</div><div class='del'>- *</div><div class='del'>- * If @nr_pages is greater than one, we are guaranteed that the cluster size is</div><div class='del'>- * greater than PAGE_SIZE, that all pages in @pages are entirely inside</div><div class='del'>- * the same cluster and that they are the entirety of that cluster, and that</div><div class='del'>- * the cluster is sparse, i.e. we need to allocate a cluster to fill the hole.</div><div class='del'>- *</div><div class='del'>- * i_size is not to be modified yet.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success or -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_prepare_pages_for_non_resident_write(struct page **pages,</div><div class='del'>-		unsigned nr_pages, s64 pos, size_t bytes)</div><div class='del'>-{</div><div class='del'>-	VCN vcn, highest_vcn = 0, cpos, cend, bh_cpos, bh_cend;</div><div class='del'>-	LCN lcn;</div><div class='del'>-	s64 bh_pos, vcn_len, end, initialized_size;</div><div class='del'>-	sector_t lcn_block;</div><div class='del'>-	struct folio *folio;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni, *base_ni = NULL;</div><div class='del'>-	ntfs_volume *vol;</div><div class='del'>-	runlist_element *rl, *rl2;</div><div class='del'>-	struct buffer_head *bh, *head, *wait[2], **wait_bh = wait;</div><div class='del'>-	ntfs_attr_search_ctx *ctx = NULL;</div><div class='del'>-	MFT_RECORD *m = NULL;</div><div class='del'>-	ATTR_RECORD *a = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 attr_rec_len = 0;</div><div class='del'>-	unsigned blocksize, u;</div><div class='del'>-	int err, mp_size;</div><div class='del'>-	bool rl_write_locked, was_hole, is_retry;</div><div class='del'>-	unsigned char blocksize_bits;</div><div class='del'>-	struct {</div><div class='del'>-		u8 runlist_merged:1;</div><div class='del'>-		u8 mft_attr_mapped:1;</div><div class='del'>-		u8 mp_rebuilt:1;</div><div class='del'>-		u8 attr_switched:1;</div><div class='del'>-	} status = { 0, 0, 0, 0 };</div><div class='del'>-</div><div class='del'>-	BUG_ON(!nr_pages);</div><div class='del'>-	BUG_ON(!pages);</div><div class='del'>-	BUG_ON(!*pages);</div><div class='del'>-	vi = pages[0]-&gt;mapping-&gt;host;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	vol = ni-&gt;vol;</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "</div><div class='del'>-			"index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.",</div><div class='del'>-			vi-&gt;i_ino, ni-&gt;type, pages[0]-&gt;index, nr_pages,</div><div class='del'>-			(long long)pos, bytes);</div><div class='del'>-	blocksize = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	blocksize_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-	rl_write_locked = false;</div><div class='del'>-	rl = NULL;</div><div class='del'>-	err = 0;</div><div class='del'>-	vcn = lcn = -1;</div><div class='del'>-	vcn_len = 0;</div><div class='del'>-	lcn_block = -1;</div><div class='del'>-	was_hole = false;</div><div class='del'>-	cpos = pos &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-	end = pos + bytes;</div><div class='del'>-	cend = (end + vol-&gt;cluster_size - 1) &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-	/*</div><div class='del'>-	 * Loop over each buffer in each folio.  Use goto to</div><div class='del'>-	 * reduce indentation.</div><div class='del'>-	 */</div><div class='del'>-	u = 0;</div><div class='del'>-do_next_folio:</div><div class='del'>-	folio = page_folio(pages[u]);</div><div class='del'>-	bh_pos = folio_pos(folio);</div><div class='del'>-	head = folio_buffers(folio);</div><div class='del'>-	if (!head)</div><div class='del'>-		/*</div><div class='del'>-		 * create_empty_buffers() will create uptodate/dirty</div><div class='del'>-		 * buffers if the folio is uptodate/dirty.</div><div class='del'>-		 */</div><div class='del'>-		head = create_empty_buffers(folio, blocksize, 0);</div><div class='del'>-	bh = head;</div><div class='del'>-	do {</div><div class='del'>-		VCN cdelta;</div><div class='del'>-		s64 bh_end;</div><div class='del'>-		unsigned bh_cofs;</div><div class='del'>-</div><div class='del'>-		/* Clear buffer_new on all buffers to reinitialise state. */</div><div class='del'>-		if (buffer_new(bh))</div><div class='del'>-			clear_buffer_new(bh);</div><div class='del'>-		bh_end = bh_pos + blocksize;</div><div class='del'>-		bh_cpos = bh_pos &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-		bh_cofs = bh_pos &amp; vol-&gt;cluster_size_mask;</div><div class='del'>-		if (buffer_mapped(bh)) {</div><div class='del'>-			/*</div><div class='del'>-			 * The buffer is already mapped.  If it is uptodate,</div><div class='del'>-			 * ignore it.</div><div class='del'>-			 */</div><div class='del'>-			if (buffer_uptodate(bh))</div><div class='del'>-				continue;</div><div class='del'>-			/*</div><div class='del'>-			 * The buffer is not uptodate.  If the folio is uptodate</div><div class='del'>-			 * set the buffer uptodate and otherwise ignore it.</div><div class='del'>-			 */</div><div class='del'>-			if (folio_test_uptodate(folio)) {</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * Neither the folio nor the buffer are uptodate.  If</div><div class='del'>-			 * the buffer is only partially being written to, we</div><div class='del'>-			 * need to read it in before the write, i.e. now.</div><div class='del'>-			 */</div><div class='del'>-			if ((bh_pos &lt; pos &amp;&amp; bh_end &gt; pos) ||</div><div class='del'>-					(bh_pos &lt; end &amp;&amp; bh_end &gt; end)) {</div><div class='del'>-				/*</div><div class='del'>-				 * If the buffer is fully or partially within</div><div class='del'>-				 * the initialized size, do an actual read.</div><div class='del'>-				 * Otherwise, simply zero the buffer.</div><div class='del'>-				 */</div><div class='del'>-				read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-				initialized_size = ni-&gt;initialized_size;</div><div class='del'>-				read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-				if (bh_pos &lt; initialized_size) {</div><div class='del'>-					ntfs_submit_bh_for_read(bh);</div><div class='del'>-					*wait_bh++ = bh;</div><div class='del'>-				} else {</div><div class='del'>-					folio_zero_range(folio, bh_offset(bh),</div><div class='del'>-							blocksize);</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/* Unmapped buffer.  Need to map it. */</div><div class='del'>-		bh-&gt;b_bdev = vol-&gt;sb-&gt;s_bdev;</div><div class='del'>-		/*</div><div class='del'>-		 * If the current buffer is in the same clusters as the map</div><div class='del'>-		 * cache, there is no need to check the runlist again.  The</div><div class='del'>-		 * map cache is made up of @vcn, which is the first cached file</div><div class='del'>-		 * cluster, @vcn_len which is the number of cached file</div><div class='del'>-		 * clusters, @lcn is the device cluster corresponding to @vcn,</div><div class='del'>-		 * and @lcn_block is the block number corresponding to @lcn.</div><div class='del'>-		 */</div><div class='del'>-		cdelta = bh_cpos - vcn;</div><div class='del'>-		if (likely(!cdelta || (cdelta &gt; 0 &amp;&amp; cdelta &lt; vcn_len))) {</div><div class='del'>-map_buffer_cached:</div><div class='del'>-			BUG_ON(lcn &lt; 0);</div><div class='del'>-			bh-&gt;b_blocknr = lcn_block +</div><div class='del'>-					(cdelta &lt;&lt; (vol-&gt;cluster_size_bits -</div><div class='del'>-					blocksize_bits)) +</div><div class='del'>-					(bh_cofs &gt;&gt; blocksize_bits);</div><div class='del'>-			set_buffer_mapped(bh);</div><div class='del'>-			/*</div><div class='del'>-			 * If the folio is uptodate so is the buffer.  If the</div><div class='del'>-			 * buffer is fully outside the write, we ignore it if</div><div class='del'>-			 * it was already allocated and we mark it dirty so it</div><div class='del'>-			 * gets written out if we allocated it.  On the other</div><div class='del'>-			 * hand, if we allocated the buffer but we are not</div><div class='del'>-			 * marking it dirty we set buffer_new so we can do</div><div class='del'>-			 * error recovery.</div><div class='del'>-			 */</div><div class='del'>-			if (folio_test_uptodate(folio)) {</div><div class='del'>-				if (!buffer_uptodate(bh))</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-				if (unlikely(was_hole)) {</div><div class='del'>-					/* We allocated the buffer. */</div><div class='del'>-					clean_bdev_bh_alias(bh);</div><div class='del'>-					if (bh_end &lt;= pos || bh_pos &gt;= end)</div><div class='del'>-						mark_buffer_dirty(bh);</div><div class='del'>-					else</div><div class='del'>-						set_buffer_new(bh);</div><div class='del'>-				}</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/* Page is _not_ uptodate. */</div><div class='del'>-			if (likely(!was_hole)) {</div><div class='del'>-				/*</div><div class='del'>-				 * Buffer was already allocated.  If it is not</div><div class='del'>-				 * uptodate and is only partially being written</div><div class='del'>-				 * to, we need to read it in before the write,</div><div class='del'>-				 * i.e. now.</div><div class='del'>-				 */</div><div class='del'>-				if (!buffer_uptodate(bh) &amp;&amp; bh_pos &lt; end &amp;&amp;</div><div class='del'>-						bh_end &gt; pos &amp;&amp;</div><div class='del'>-						(bh_pos &lt; pos ||</div><div class='del'>-						bh_end &gt; end)) {</div><div class='del'>-					/*</div><div class='del'>-					 * If the buffer is fully or partially</div><div class='del'>-					 * within the initialized size, do an</div><div class='del'>-					 * actual read.  Otherwise, simply zero</div><div class='del'>-					 * the buffer.</div><div class='del'>-					 */</div><div class='del'>-					read_lock_irqsave(&amp;ni-&gt;size_lock,</div><div class='del'>-							flags);</div><div class='del'>-					initialized_size = ni-&gt;initialized_size;</div><div class='del'>-					read_unlock_irqrestore(&amp;ni-&gt;size_lock,</div><div class='del'>-							flags);</div><div class='del'>-					if (bh_pos &lt; initialized_size) {</div><div class='del'>-						ntfs_submit_bh_for_read(bh);</div><div class='del'>-						*wait_bh++ = bh;</div><div class='del'>-					} else {</div><div class='del'>-						folio_zero_range(folio,</div><div class='del'>-								bh_offset(bh),</div><div class='del'>-								blocksize);</div><div class='del'>-						set_buffer_uptodate(bh);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/* We allocated the buffer. */</div><div class='del'>-			clean_bdev_bh_alias(bh);</div><div class='del'>-			/*</div><div class='del'>-			 * If the buffer is fully outside the write, zero it,</div><div class='del'>-			 * set it uptodate, and mark it dirty so it gets</div><div class='del'>-			 * written out.  If it is partially being written to,</div><div class='del'>-			 * zero region surrounding the write but leave it to</div><div class='del'>-			 * commit write to do anything else.  Finally, if the</div><div class='del'>-			 * buffer is fully being overwritten, do nothing.</div><div class='del'>-			 */</div><div class='del'>-			if (bh_end &lt;= pos || bh_pos &gt;= end) {</div><div class='del'>-				if (!buffer_uptodate(bh)) {</div><div class='del'>-					folio_zero_range(folio, bh_offset(bh),</div><div class='del'>-							blocksize);</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-				}</div><div class='del'>-				mark_buffer_dirty(bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			set_buffer_new(bh);</div><div class='del'>-			if (!buffer_uptodate(bh) &amp;&amp;</div><div class='del'>-					(bh_pos &lt; pos || bh_end &gt; end)) {</div><div class='del'>-				u8 *kaddr;</div><div class='del'>-				unsigned pofs;</div><div class='del'>-					</div><div class='del'>-				kaddr = kmap_local_folio(folio, 0);</div><div class='del'>-				if (bh_pos &lt; pos) {</div><div class='del'>-					pofs = bh_pos &amp; ~PAGE_MASK;</div><div class='del'>-					memset(kaddr + pofs, 0, pos - bh_pos);</div><div class='del'>-				}</div><div class='del'>-				if (bh_end &gt; end) {</div><div class='del'>-					pofs = end &amp; ~PAGE_MASK;</div><div class='del'>-					memset(kaddr + pofs, 0, bh_end - end);</div><div class='del'>-				}</div><div class='del'>-				kunmap_local(kaddr);</div><div class='del'>-				flush_dcache_folio(folio);</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Slow path: this is the first buffer in the cluster.  If it</div><div class='del'>-		 * is outside allocated size and is not uptodate, zero it and</div><div class='del'>-		 * set it uptodate.</div><div class='del'>-		 */</div><div class='del'>-		read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		initialized_size = ni-&gt;allocated_size;</div><div class='del'>-		read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (bh_pos &gt; initialized_size) {</div><div class='del'>-			if (folio_test_uptodate(folio)) {</div><div class='del'>-				if (!buffer_uptodate(bh))</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-			} else if (!buffer_uptodate(bh)) {</div><div class='del'>-				folio_zero_range(folio, bh_offset(bh),</div><div class='del'>-						blocksize);</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		is_retry = false;</div><div class='del'>-		if (!rl) {</div><div class='del'>-			down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-retry_remap:</div><div class='del'>-			rl = ni-&gt;runlist.rl;</div><div class='del'>-		}</div><div class='del'>-		if (likely(rl != NULL)) {</div><div class='del'>-			/* Seek to element containing target cluster. */</div><div class='del'>-			while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= bh_cpos)</div><div class='del'>-				rl++;</div><div class='del'>-			lcn = ntfs_rl_vcn_to_lcn(rl, bh_cpos);</div><div class='del'>-			if (likely(lcn &gt;= 0)) {</div><div class='del'>-				/*</div><div class='del'>-				 * Successful remap, setup the map cache and</div><div class='del'>-				 * use that to deal with the buffer.</div><div class='del'>-				 */</div><div class='del'>-				was_hole = false;</div><div class='del'>-				vcn = bh_cpos;</div><div class='del'>-				vcn_len = rl[1].vcn - vcn;</div><div class='del'>-				lcn_block = lcn &lt;&lt; (vol-&gt;cluster_size_bits -</div><div class='del'>-						blocksize_bits);</div><div class='del'>-				cdelta = 0;</div><div class='del'>-				/*</div><div class='del'>-				 * If the number of remaining clusters touched</div><div class='del'>-				 * by the write is smaller or equal to the</div><div class='del'>-				 * number of cached clusters, unlock the</div><div class='del'>-				 * runlist as the map cache will be used from</div><div class='del'>-				 * now on.</div><div class='del'>-				 */</div><div class='del'>-				if (likely(vcn + vcn_len &gt;= cend)) {</div><div class='del'>-					if (rl_write_locked) {</div><div class='del'>-						up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-						rl_write_locked = false;</div><div class='del'>-					} else</div><div class='del'>-						up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-					rl = NULL;</div><div class='del'>-				}</div><div class='del'>-				goto map_buffer_cached;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-		/*</div><div class='del'>-		 * If it is not a hole and not out of bounds, the runlist is</div><div class='del'>-		 * probably unmapped so try to map it now.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(lcn != LCN_HOLE &amp;&amp; lcn != LCN_ENOENT)) {</div><div class='del'>-			if (likely(!is_retry &amp;&amp; lcn == LCN_RL_NOT_MAPPED)) {</div><div class='del'>-				/* Attempt to map runlist. */</div><div class='del'>-				if (!rl_write_locked) {</div><div class='del'>-					/*</div><div class='del'>-					 * We need the runlist locked for</div><div class='del'>-					 * writing, so if it is locked for</div><div class='del'>-					 * reading relock it now and retry in</div><div class='del'>-					 * case it changed whilst we dropped</div><div class='del'>-					 * the lock.</div><div class='del'>-					 */</div><div class='del'>-					up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-					down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-					rl_write_locked = true;</div><div class='del'>-					goto retry_remap;</div><div class='del'>-				}</div><div class='del'>-				err = ntfs_map_runlist_nolock(ni, bh_cpos,</div><div class='del'>-						NULL);</div><div class='del'>-				if (likely(!err)) {</div><div class='del'>-					is_retry = true;</div><div class='del'>-					goto retry_remap;</div><div class='del'>-				}</div><div class='del'>-				/*</div><div class='del'>-				 * If @vcn is out of bounds, pretend @lcn is</div><div class='del'>-				 * LCN_ENOENT.  As long as the buffer is out</div><div class='del'>-				 * of bounds this will work fine.</div><div class='del'>-				 */</div><div class='del'>-				if (err == -ENOENT) {</div><div class='del'>-					lcn = LCN_ENOENT;</div><div class='del'>-					err = 0;</div><div class='del'>-					goto rl_not_mapped_enoent;</div><div class='del'>-				}</div><div class='del'>-			} else</div><div class='del'>-				err = -EIO;</div><div class='del'>-			/* Failed to map the buffer, even after retrying. */</div><div class='del'>-			bh-&gt;b_blocknr = -1;</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to write to inode 0x%lx, "</div><div class='del'>-					"attribute type 0x%x, vcn 0x%llx, "</div><div class='del'>-					"vcn offset 0x%x, because its "</div><div class='del'>-					"location on disk could not be "</div><div class='del'>-					"determined%s (error code %i).",</div><div class='del'>-					ni-&gt;mft_no, ni-&gt;type,</div><div class='del'>-					(unsigned long long)bh_cpos,</div><div class='del'>-					(unsigned)bh_pos &amp;</div><div class='del'>-					vol-&gt;cluster_size_mask,</div><div class='del'>-					is_retry ? " even after retrying" : "",</div><div class='del'>-					err);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-rl_not_mapped_enoent:</div><div class='del'>-		/*</div><div class='del'>-		 * The buffer is in a hole or out of bounds.  We need to fill</div><div class='del'>-		 * the hole, unless the buffer is in a cluster which is not</div><div class='del'>-		 * touched by the write, in which case we just leave the buffer</div><div class='del'>-		 * unmapped.  This can only happen when the cluster size is</div><div class='del'>-		 * less than the page cache size.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(vol-&gt;cluster_size &lt; PAGE_SIZE)) {</div><div class='del'>-			bh_cend = (bh_end + vol-&gt;cluster_size - 1) &gt;&gt;</div><div class='del'>-					vol-&gt;cluster_size_bits;</div><div class='del'>-			if ((bh_cend &lt;= cpos || bh_cpos &gt;= cend)) {</div><div class='del'>-				bh-&gt;b_blocknr = -1;</div><div class='del'>-				/*</div><div class='del'>-				 * If the buffer is uptodate we skip it.  If it</div><div class='del'>-				 * is not but the folio is uptodate, we can set</div><div class='del'>-				 * the buffer uptodate.  If the folio is not</div><div class='del'>-				 * uptodate, we can clear the buffer and set it</div><div class='del'>-				 * uptodate.  Whether this is worthwhile is</div><div class='del'>-				 * debatable and this could be removed.</div><div class='del'>-				 */</div><div class='del'>-				if (folio_test_uptodate(folio)) {</div><div class='del'>-					if (!buffer_uptodate(bh))</div><div class='del'>-						set_buffer_uptodate(bh);</div><div class='del'>-				} else if (!buffer_uptodate(bh)) {</div><div class='del'>-					folio_zero_range(folio, bh_offset(bh),</div><div class='del'>-						blocksize);</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-				}</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Out of bounds buffer is invalid if it was not really out of</div><div class='del'>-		 * bounds.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(lcn != LCN_HOLE);</div><div class='del'>-		/*</div><div class='del'>-		 * We need the runlist locked for writing, so if it is locked</div><div class='del'>-		 * for reading relock it now and retry in case it changed</div><div class='del'>-		 * whilst we dropped the lock.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(!rl);</div><div class='del'>-		if (!rl_write_locked) {</div><div class='del'>-			up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			rl_write_locked = true;</div><div class='del'>-			goto retry_remap;</div><div class='del'>-		}</div><div class='del'>-		/* Find the previous last allocated cluster. */</div><div class='del'>-		BUG_ON(rl-&gt;lcn != LCN_HOLE);</div><div class='del'>-		lcn = -1;</div><div class='del'>-		rl2 = rl;</div><div class='del'>-		while (--rl2 &gt;= ni-&gt;runlist.rl) {</div><div class='del'>-			if (rl2-&gt;lcn &gt;= 0) {</div><div class='del'>-				lcn = rl2-&gt;lcn + rl2-&gt;length;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rl2 = ntfs_cluster_alloc(vol, bh_cpos, 1, lcn, DATA_ZONE,</div><div class='del'>-				false);</div><div class='del'>-		if (IS_ERR(rl2)) {</div><div class='del'>-			err = PTR_ERR(rl2);</div><div class='del'>-			ntfs_debug("Failed to allocate cluster, error code %i.",</div><div class='del'>-					err);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		lcn = rl2-&gt;lcn;</div><div class='del'>-		rl = ntfs_runlists_merge(ni-&gt;runlist.rl, rl2);</div><div class='del'>-		if (IS_ERR(rl)) {</div><div class='del'>-			err = PTR_ERR(rl);</div><div class='del'>-			if (err != -ENOMEM)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			if (ntfs_cluster_free_from_rl(vol, rl2)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to release "</div><div class='del'>-						"allocated cluster in error "</div><div class='del'>-						"code path.  Run chkdsk to "</div><div class='del'>-						"recover the lost cluster.");</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			ntfs_free(rl2);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ni-&gt;runlist.rl = rl;</div><div class='del'>-		status.runlist_merged = 1;</div><div class='del'>-		ntfs_debug("Allocated cluster, lcn 0x%llx.",</div><div class='del'>-				(unsigned long long)lcn);</div><div class='del'>-		/* Map and lock the mft record and get the attribute record. */</div><div class='del'>-		if (!NInoAttr(ni))</div><div class='del'>-			base_ni = ni;</div><div class='del'>-		else</div><div class='del'>-			base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-		m = map_mft_record(base_ni);</div><div class='del'>-		if (IS_ERR(m)) {</div><div class='del'>-			err = PTR_ERR(m);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-		if (unlikely(!ctx)) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			unmap_mft_record(base_ni);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		status.mft_attr_mapped = 1;</div><div class='del'>-		err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-				CASE_SENSITIVE, bh_cpos, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (err == -ENOENT)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		m = ctx-&gt;mrec;</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		/*</div><div class='del'>-		 * Find the runlist element with which the attribute extent</div><div class='del'>-		 * starts.  Note, we cannot use the _attr_ version because we</div><div class='del'>-		 * have mapped the mft record.  That is ok because we know the</div><div class='del'>-		 * runlist fragment must be mapped already to have ever gotten</div><div class='del'>-		 * here, so we can just use the _rl_ version.</div><div class='del'>-		 */</div><div class='del'>-		vcn = sle64_to_cpu(a-&gt;data.non_resident.lowest_vcn);</div><div class='del'>-		rl2 = ntfs_rl_find_vcn_nolock(rl, vcn);</div><div class='del'>-		BUG_ON(!rl2);</div><div class='del'>-		BUG_ON(!rl2-&gt;length);</div><div class='del'>-		BUG_ON(rl2-&gt;lcn &lt; LCN_HOLE);</div><div class='del'>-		highest_vcn = sle64_to_cpu(a-&gt;data.non_resident.highest_vcn);</div><div class='del'>-		/*</div><div class='del'>-		 * If @highest_vcn is zero, calculate the real highest_vcn</div><div class='del'>-		 * (which can really be zero).</div><div class='del'>-		 */</div><div class='del'>-		if (!highest_vcn)</div><div class='del'>-			highest_vcn = (sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.allocated_size) &gt;&gt;</div><div class='del'>-					vol-&gt;cluster_size_bits) - 1;</div><div class='del'>-		/*</div><div class='del'>-		 * Determine the size of the mapping pairs array for the new</div><div class='del'>-		 * extent, i.e. the old extent with the hole filled.</div><div class='del'>-		 */</div><div class='del'>-		mp_size = ntfs_get_size_for_mapping_pairs(vol, rl2, vcn,</div><div class='del'>-				highest_vcn);</div><div class='del'>-		if (unlikely(mp_size &lt;= 0)) {</div><div class='del'>-			if (!(err = mp_size))</div><div class='del'>-				err = -EIO;</div><div class='del'>-			ntfs_debug("Failed to get size for mapping pairs "</div><div class='del'>-					"array, error code %i.", err);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Resize the attribute record to fit the new mapping pairs</div><div class='del'>-		 * array.</div><div class='del'>-		 */</div><div class='del'>-		attr_rec_len = le32_to_cpu(a-&gt;length);</div><div class='del'>-		err = ntfs_attr_record_resize(m, a, mp_size + le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset));</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			BUG_ON(err != -ENOSPC);</div><div class='del'>-			// TODO: Deal with this by using the current attribute</div><div class='del'>-			// and fill it with as much of the mapping pairs</div><div class='del'>-			// array as possible.  Then loop over each attribute</div><div class='del'>-			// extent rewriting the mapping pairs arrays as we go</div><div class='del'>-			// along and if when we reach the end we have not</div><div class='del'>-			// enough space, try to resize the last attribute</div><div class='del'>-			// extent and if even that fails, add a new attribute</div><div class='del'>-			// extent.</div><div class='del'>-			// We could also try to resize at each step in the hope</div><div class='del'>-			// that we will not need to rewrite every single extent.</div><div class='del'>-			// Note, we may need to decompress some extents to fill</div><div class='del'>-			// the runlist as we are walking the extents...</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Not enough space in the mft "</div><div class='del'>-					"record for the extended attribute "</div><div class='del'>-					"record.  This case is not "</div><div class='del'>-					"implemented yet.");</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			break ;</div><div class='del'>-		}</div><div class='del'>-		status.mp_rebuilt = 1;</div><div class='del'>-		/*</div><div class='del'>-		 * Generate the mapping pairs array directly into the attribute</div><div class='del'>-		 * record.</div><div class='del'>-		 */</div><div class='del'>-		err = ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-				mp_size, rl2, vcn, highest_vcn, NULL);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot fill hole in inode 0x%lx, "</div><div class='del'>-					"attribute type 0x%x, because building "</div><div class='del'>-					"the mapping pairs failed with error "</div><div class='del'>-					"code %i.", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-			err = -EIO;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* Update the highest_vcn but only if it was not set. */</div><div class='del'>-		if (unlikely(!a-&gt;data.non_resident.highest_vcn))</div><div class='del'>-			a-&gt;data.non_resident.highest_vcn =</div><div class='del'>-					cpu_to_sle64(highest_vcn);</div><div class='del'>-		/*</div><div class='del'>-		 * If the attribute is sparse/compressed, update the compressed</div><div class='del'>-		 * size in the ntfs_inode structure and the attribute record.</div><div class='del'>-		 */</div><div class='del'>-		if (likely(NInoSparse(ni) || NInoCompressed(ni))) {</div><div class='del'>-			/*</div><div class='del'>-			 * If we are not in the first attribute extent, switch</div><div class='del'>-			 * to it, but first ensure the changes will make it to</div><div class='del'>-			 * disk later.</div><div class='del'>-			 */</div><div class='del'>-			if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-				flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-				mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-				ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-				err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name,</div><div class='del'>-						ni-&gt;name_len, CASE_SENSITIVE,</div><div class='del'>-						0, NULL, 0, ctx);</div><div class='del'>-				if (unlikely(err)) {</div><div class='del'>-					status.attr_switched = 1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				/* @m is not used any more so do not set it. */</div><div class='del'>-				a = ctx-&gt;attr;</div><div class='del'>-			}</div><div class='del'>-			write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			ni-&gt;itype.compressed.size += vol-&gt;cluster_size;</div><div class='del'>-			a-&gt;data.non_resident.compressed_size =</div><div class='del'>-					cpu_to_sle64(ni-&gt;itype.compressed.size);</div><div class='del'>-			write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		}</div><div class='del'>-		/* Ensure the changes make it to disk. */</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-		/* Successfully filled the hole. */</div><div class='del'>-		status.runlist_merged = 0;</div><div class='del'>-		status.mft_attr_mapped = 0;</div><div class='del'>-		status.mp_rebuilt = 0;</div><div class='del'>-		/* Setup the map cache and use that to deal with the buffer. */</div><div class='del'>-		was_hole = true;</div><div class='del'>-		vcn = bh_cpos;</div><div class='del'>-		vcn_len = 1;</div><div class='del'>-		lcn_block = lcn &lt;&lt; (vol-&gt;cluster_size_bits - blocksize_bits);</div><div class='del'>-		cdelta = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * If the number of remaining clusters in the @pages is smaller</div><div class='del'>-		 * or equal to the number of cached clusters, unlock the</div><div class='del'>-		 * runlist as the map cache will be used from now on.</div><div class='del'>-		 */</div><div class='del'>-		if (likely(vcn + vcn_len &gt;= cend)) {</div><div class='del'>-			up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			rl_write_locked = false;</div><div class='del'>-			rl = NULL;</div><div class='del'>-		}</div><div class='del'>-		goto map_buffer_cached;</div><div class='del'>-	} while (bh_pos += blocksize, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	/* If there are no errors, do the next page. */</div><div class='del'>-	if (likely(!err &amp;&amp; ++u &lt; nr_pages))</div><div class='del'>-		goto do_next_folio;</div><div class='del'>-	/* If there are no errors, release the runlist lock if we took it. */</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		if (unlikely(rl_write_locked)) {</div><div class='del'>-			up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			rl_write_locked = false;</div><div class='del'>-		} else if (unlikely(rl))</div><div class='del'>-			up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-		rl = NULL;</div><div class='del'>-	}</div><div class='del'>-	/* If we issued read requests, let them complete. */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	initialized_size = ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	while (wait_bh &gt; wait) {</div><div class='del'>-		bh = *--wait_bh;</div><div class='del'>-		wait_on_buffer(bh);</div><div class='del'>-		if (likely(buffer_uptodate(bh))) {</div><div class='del'>-			folio = bh-&gt;b_folio;</div><div class='del'>-			bh_pos = folio_pos(folio) + bh_offset(bh);</div><div class='del'>-			/*</div><div class='del'>-			 * If the buffer overflows the initialized size, need</div><div class='del'>-			 * to zero the overflowing region.</div><div class='del'>-			 */</div><div class='del'>-			if (unlikely(bh_pos + blocksize &gt; initialized_size)) {</div><div class='del'>-				int ofs = 0;</div><div class='del'>-</div><div class='del'>-				if (likely(bh_pos &lt; initialized_size))</div><div class='del'>-					ofs = initialized_size - bh_pos;</div><div class='del'>-				folio_zero_segment(folio, bh_offset(bh) + ofs,</div><div class='del'>-						blocksize);</div><div class='del'>-			}</div><div class='del'>-		} else /* if (unlikely(!buffer_uptodate(bh))) */</div><div class='del'>-			err = -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		/* Clear buffer_new on all buffers. */</div><div class='del'>-		u = 0;</div><div class='del'>-		do {</div><div class='del'>-			bh = head = page_buffers(pages[u]);</div><div class='del'>-			do {</div><div class='del'>-				if (buffer_new(bh))</div><div class='del'>-					clear_buffer_new(bh);</div><div class='del'>-			} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-		} while (++u &lt; nr_pages);</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if (status.attr_switched) {</div><div class='del'>-		/* Get back to the attribute extent we modified. */</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		if (ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-				CASE_SENSITIVE, bh_cpos, NULL, 0, ctx)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to find required "</div><div class='del'>-					"attribute extent of attribute in "</div><div class='del'>-					"error code path.  Run chkdsk to "</div><div class='del'>-					"recover.");</div><div class='del'>-			write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			ni-&gt;itype.compressed.size += vol-&gt;cluster_size;</div><div class='del'>-			write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-			flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-			mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-			/*</div><div class='del'>-			 * The only thing that is now wrong is the compressed</div><div class='del'>-			 * size of the base attribute extent which chkdsk</div><div class='del'>-			 * should be able to fix.</div><div class='del'>-			 */</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		} else {</div><div class='del'>-			m = ctx-&gt;mrec;</div><div class='del'>-			a = ctx-&gt;attr;</div><div class='del'>-			status.attr_switched = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the runlist has been modified, need to restore it by punching a</div><div class='del'>-	 * hole into it and we then need to deallocate the on-disk cluster as</div><div class='del'>-	 * well.  Note, we only modify the runlist if we are able to generate a</div><div class='del'>-	 * new mapping pairs array, i.e. only when the mapped attribute extent</div><div class='del'>-	 * is not switched.</div><div class='del'>-	 */</div><div class='del'>-	if (status.runlist_merged &amp;&amp; !status.attr_switched) {</div><div class='del'>-		BUG_ON(!rl_write_locked);</div><div class='del'>-		/* Make the file cluster we allocated sparse in the runlist. */</div><div class='del'>-		if (ntfs_rl_punch_nolock(vol, &amp;ni-&gt;runlist, bh_cpos, 1)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to punch hole into "</div><div class='del'>-					"attribute runlist in error code "</div><div class='del'>-					"path.  Run chkdsk to recover the "</div><div class='del'>-					"lost cluster.");</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		} else /* if (success) */ {</div><div class='del'>-			status.runlist_merged = 0;</div><div class='del'>-			/*</div><div class='del'>-			 * Deallocate the on-disk cluster we allocated but only</div><div class='del'>-			 * if we succeeded in punching its vcn out of the</div><div class='del'>-			 * runlist.</div><div class='del'>-			 */</div><div class='del'>-			down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-			if (ntfs_bitmap_clear_bit(vol-&gt;lcnbmp_ino, lcn)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to release "</div><div class='del'>-						"allocated cluster in error "</div><div class='del'>-						"code path.  Run chkdsk to "</div><div class='del'>-						"recover the lost cluster.");</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Resize the attribute record to its old size and rebuild the mapping</div><div class='del'>-	 * pairs array.  Note, we only can do this if the runlist has been</div><div class='del'>-	 * restored to its old state which also implies that the mapped</div><div class='del'>-	 * attribute extent is not switched.</div><div class='del'>-	 */</div><div class='del'>-	if (status.mp_rebuilt &amp;&amp; !status.runlist_merged) {</div><div class='del'>-		if (ntfs_attr_record_resize(m, a, attr_rec_len)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to restore attribute "</div><div class='del'>-					"record in error code path.  Run "</div><div class='del'>-					"chkdsk to recover.");</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		} else /* if (success) */ {</div><div class='del'>-			if (ntfs_mapping_pairs_build(vol, (u8*)a +</div><div class='del'>-					le16_to_cpu(a-&gt;data.non_resident.</div><div class='del'>-					mapping_pairs_offset), attr_rec_len -</div><div class='del'>-					le16_to_cpu(a-&gt;data.non_resident.</div><div class='del'>-					mapping_pairs_offset), ni-&gt;runlist.rl,</div><div class='del'>-					vcn, highest_vcn, NULL)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to restore "</div><div class='del'>-						"mapping pairs array in error "</div><div class='del'>-						"code path.  Run chkdsk to "</div><div class='del'>-						"recover.");</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-			mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* Release the mft record and the attribute. */</div><div class='del'>-	if (status.mft_attr_mapped) {</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	}</div><div class='del'>-	/* Release the runlist lock. */</div><div class='del'>-	if (rl_write_locked)</div><div class='del'>-		up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	else if (rl)</div><div class='del'>-		up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Zero out any newly allocated blocks to avoid exposing stale data.</div><div class='del'>-	 * If BH_New is set, we know that the block was newly allocated above</div><div class='del'>-	 * and that it has not been fully zeroed and marked dirty yet.</div><div class='del'>-	 */</div><div class='del'>-	nr_pages = u;</div><div class='del'>-	u = 0;</div><div class='del'>-	end = bh_cpos &lt;&lt; vol-&gt;cluster_size_bits;</div><div class='del'>-	do {</div><div class='del'>-		folio = page_folio(pages[u]);</div><div class='del'>-		bh = head = folio_buffers(folio);</div><div class='del'>-		do {</div><div class='del'>-			if (u == nr_pages &amp;&amp;</div><div class='del'>-			    folio_pos(folio) + bh_offset(bh) &gt;= end)</div><div class='del'>-				break;</div><div class='del'>-			if (!buffer_new(bh))</div><div class='del'>-				continue;</div><div class='del'>-			clear_buffer_new(bh);</div><div class='del'>-			if (!buffer_uptodate(bh)) {</div><div class='del'>-				if (folio_test_uptodate(folio))</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-				else {</div><div class='del'>-					folio_zero_range(folio, bh_offset(bh),</div><div class='del'>-							blocksize);</div><div class='del'>-					set_buffer_uptodate(bh);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			mark_buffer_dirty(bh);</div><div class='del'>-		} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	} while (++u &lt;= nr_pages);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed.  Returning error code %i.", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ntfs_flush_dcache_pages(struct page **pages,</div><div class='del'>-		unsigned nr_pages)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!nr_pages);</div><div class='del'>-	/*</div><div class='del'>-	 * Warning: Do not do the decrement at the same time as the call to</div><div class='del'>-	 * flush_dcache_page() because it is a NULL macro on i386 and hence the</div><div class='del'>-	 * decrement never happens so the loop never terminates.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		--nr_pages;</div><div class='del'>-		flush_dcache_page(pages[nr_pages]);</div><div class='del'>-	} while (nr_pages &gt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_commit_pages_after_non_resident_write - commit the received data</div><div class='del'>- * @pages:	array of destination pages</div><div class='del'>- * @nr_pages:	number of pages in @pages</div><div class='del'>- * @pos:	byte position in file at which the write begins</div><div class='del'>- * @bytes:	number of bytes to be written</div><div class='del'>- *</div><div class='del'>- * See description of ntfs_commit_pages_after_write(), below.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_commit_pages_after_non_resident_write(</div><div class='del'>-		struct page **pages, const unsigned nr_pages,</div><div class='del'>-		s64 pos, size_t bytes)</div><div class='del'>-{</div><div class='del'>-	s64 end, initialized_size;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni, *base_ni;</div><div class='del'>-	struct buffer_head *bh, *head;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned blocksize, u;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	vi = pages[0]-&gt;mapping-&gt;host;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	blocksize = vi-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	end = pos + bytes;</div><div class='del'>-	u = 0;</div><div class='del'>-	do {</div><div class='del'>-		s64 bh_pos;</div><div class='del'>-		struct page *page;</div><div class='del'>-		bool partial;</div><div class='del'>-</div><div class='del'>-		page = pages[u];</div><div class='del'>-		bh_pos = (s64)page-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		bh = head = page_buffers(page);</div><div class='del'>-		partial = false;</div><div class='del'>-		do {</div><div class='del'>-			s64 bh_end;</div><div class='del'>-</div><div class='del'>-			bh_end = bh_pos + blocksize;</div><div class='del'>-			if (bh_end &lt;= pos || bh_pos &gt;= end) {</div><div class='del'>-				if (!buffer_uptodate(bh))</div><div class='del'>-					partial = true;</div><div class='del'>-			} else {</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-				mark_buffer_dirty(bh);</div><div class='del'>-			}</div><div class='del'>-		} while (bh_pos += blocksize, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-		/*</div><div class='del'>-		 * If all buffers are now uptodate but the page is not, set the</div><div class='del'>-		 * page uptodate.</div><div class='del'>-		 */</div><div class='del'>-		if (!partial &amp;&amp; !PageUptodate(page))</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-	} while (++u &lt; nr_pages);</div><div class='del'>-	/*</div><div class='del'>-	 * Finally, if we do not need to update initialized_size or i_size we</div><div class='del'>-	 * are finished.</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	initialized_size = ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	if (end &lt;= initialized_size) {</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Update initialized_size/i_size as appropriate, both in the inode and</div><div class='del'>-	 * the mft record.</div><div class='del'>-	 */</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	/* Map, pin, and lock the mft record. */</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	BUG_ON(!a-&gt;non_resident);</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	BUG_ON(end &gt; ni-&gt;allocated_size);</div><div class='del'>-	ni-&gt;initialized_size = end;</div><div class='del'>-	a-&gt;data.non_resident.initialized_size = cpu_to_sle64(end);</div><div class='del'>-	if (end &gt; i_size_read(vi)) {</div><div class='del'>-		i_size_write(vi, end);</div><div class='del'>-		a-&gt;data.non_resident.data_size =</div><div class='del'>-				a-&gt;data.non_resident.initialized_size;</div><div class='del'>-	}</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/* Mark the mft record dirty, so it gets written back. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	ntfs_error(vi-&gt;i_sb, "Failed to update initialized_size/i_size (error "</div><div class='del'>-			"code %i).", err);</div><div class='del'>-	if (err != -ENOMEM)</div><div class='del'>-		NVolSetErrors(ni-&gt;vol);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_commit_pages_after_write - commit the received data</div><div class='del'>- * @pages:	array of destination pages</div><div class='del'>- * @nr_pages:	number of pages in @pages</div><div class='del'>- * @pos:	byte position in file at which the write begins</div><div class='del'>- * @bytes:	number of bytes to be written</div><div class='del'>- *</div><div class='del'>- * This is called from ntfs_file_buffered_write() with i_mutex held on the inode</div><div class='del'>- * (@pages[0]-&gt;mapping-&gt;host).  There are @nr_pages pages in @pages which are</div><div class='del'>- * locked but not kmap()ped.  The source data has already been copied into the</div><div class='del'>- * @page.  ntfs_prepare_pages_for_non_resident_write() has been called before</div><div class='del'>- * the data was copied (for non-resident attributes only) and it returned</div><div class='del'>- * success.</div><div class='del'>- *</div><div class='del'>- * Need to set uptodate and mark dirty all buffers within the boundary of the</div><div class='del'>- * write.  If all buffers in a page are uptodate we set the page uptodate, too.</div><div class='del'>- *</div><div class='del'>- * Setting the buffers dirty ensures that they get written out later when</div><div class='del'>- * ntfs_writepage() is invoked by the VM.</div><div class='del'>- *</div><div class='del'>- * Finally, we need to update i_size and initialized_size as appropriate both</div><div class='del'>- * in the inode and the mft record.</div><div class='del'>- *</div><div class='del'>- * This is modelled after fs/buffer.c::generic_commit_write(), which marks</div><div class='del'>- * buffers uptodate and dirty, sets the page uptodate if all buffers in the</div><div class='del'>- * page are uptodate, and updates i_size if the end of io is beyond i_size.  In</div><div class='del'>- * that case, it also marks the inode dirty.</div><div class='del'>- *</div><div class='del'>- * If things have gone as outlined in</div><div class='del'>- * ntfs_prepare_pages_for_non_resident_write(), we do not need to do any page</div><div class='del'>- * content modifications here for non-resident attributes.  For resident</div><div class='del'>- * attributes we need to do the uptodate bringing here which we combine with</div><div class='del'>- * the copying into the mft record which means we save one atomic kmap.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success or -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_commit_pages_after_write(struct page **pages,</div><div class='del'>-		const unsigned nr_pages, s64 pos, size_t bytes)</div><div class='del'>-{</div><div class='del'>-	s64 end, initialized_size;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni, *base_ni;</div><div class='del'>-	struct page *page;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	char *kattr, *kaddr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 attr_len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!nr_pages);</div><div class='del'>-	BUG_ON(!pages);</div><div class='del'>-	page = pages[0];</div><div class='del'>-	BUG_ON(!page);</div><div class='del'>-	vi = page-&gt;mapping-&gt;host;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "</div><div class='del'>-			"index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.",</div><div class='del'>-			vi-&gt;i_ino, ni-&gt;type, page-&gt;index, nr_pages,</div><div class='del'>-			(long long)pos, bytes);</div><div class='del'>-	if (NInoNonResident(ni))</div><div class='del'>-		return ntfs_commit_pages_after_non_resident_write(pages,</div><div class='del'>-				nr_pages, pos, bytes);</div><div class='del'>-	BUG_ON(nr_pages &gt; 1);</div><div class='del'>-	/*</div><div class='del'>-	 * Attribute is resident, implying it is not compressed, encrypted, or</div><div class='del'>-	 * sparse.</div><div class='del'>-	 */</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	BUG_ON(NInoNonResident(ni));</div><div class='del'>-	/* Map, pin, and lock the mft record. */</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	BUG_ON(a-&gt;non_resident);</div><div class='del'>-	/* The total length of the attribute value. */</div><div class='del'>-	attr_len = le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	i_size = i_size_read(vi);</div><div class='del'>-	BUG_ON(attr_len != i_size);</div><div class='del'>-	BUG_ON(pos &gt; attr_len);</div><div class='del'>-	end = pos + bytes;</div><div class='del'>-	BUG_ON(end &gt; le32_to_cpu(a-&gt;length) -</div><div class='del'>-			le16_to_cpu(a-&gt;data.resident.value_offset));</div><div class='del'>-	kattr = (u8*)a + le16_to_cpu(a-&gt;data.resident.value_offset);</div><div class='del'>-	kaddr = kmap_atomic(page);</div><div class='del'>-	/* Copy the received data from the page to the mft record. */</div><div class='del'>-	memcpy(kattr + pos, kaddr + pos, bytes);</div><div class='del'>-	/* Update the attribute length if necessary. */</div><div class='del'>-	if (end &gt; attr_len) {</div><div class='del'>-		attr_len = end;</div><div class='del'>-		a-&gt;data.resident.value_length = cpu_to_le32(attr_len);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the page is not uptodate, bring the out of bounds area(s)</div><div class='del'>-	 * uptodate by copying data from the mft record to the page.</div><div class='del'>-	 */</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		if (pos &gt; 0)</div><div class='del'>-			memcpy(kaddr, kattr, pos);</div><div class='del'>-		if (end &lt; attr_len)</div><div class='del'>-			memcpy(kaddr + end, kattr + end, attr_len - end);</div><div class='del'>-		/* Zero the region outside the end of the attribute value. */</div><div class='del'>-		memset(kaddr + attr_len, 0, PAGE_SIZE - attr_len);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	}</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='del'>-	/* Update initialized_size/i_size if necessary. */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	initialized_size = ni-&gt;initialized_size;</div><div class='del'>-	BUG_ON(end &gt; ni-&gt;allocated_size);</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	BUG_ON(initialized_size != i_size);</div><div class='del'>-	if (end &gt; initialized_size) {</div><div class='del'>-		write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		ni-&gt;initialized_size = end;</div><div class='del'>-		i_size_write(vi, end);</div><div class='del'>-		write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	}</div><div class='del'>-	/* Mark the mft record dirty, so it gets written back. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-err_out:</div><div class='del'>-	if (err == -ENOMEM) {</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Error allocating memory required to "</div><div class='del'>-				"commit the write.");</div><div class='del'>-		if (PageUptodate(page)) {</div><div class='del'>-			ntfs_warning(vi-&gt;i_sb, "Page is uptodate, setting "</div><div class='del'>-					"dirty so the write will be retried "</div><div class='del'>-					"later on by the VM.");</div><div class='del'>-			/*</div><div class='del'>-			 * Put the page on mapping-&gt;dirty_pages, but leave its</div><div class='del'>-			 * buffers' dirty state as-is.</div><div class='del'>-			 */</div><div class='del'>-			__set_page_dirty_nobuffers(page);</div><div class='del'>-			err = 0;</div><div class='del'>-		} else</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Page is not uptodate.  Written "</div><div class='del'>-					"data has been lost.");</div><div class='del'>-	} else {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Resident attribute commit write failed "</div><div class='del'>-				"with error %i.", err);</div><div class='del'>-		NVolSetErrors(ni-&gt;vol);</div><div class='del'>-	}</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copy as much as we can into the pages and return the number of bytes which</div><div class='del'>- * were successfully copied.  If a fault is encountered then clear the pages</div><div class='del'>- * out to (ofs + bytes) and return the number of bytes which were copied.</div><div class='del'>- */</div><div class='del'>-static size_t ntfs_copy_from_user_iter(struct page **pages, unsigned nr_pages,</div><div class='del'>-		unsigned ofs, struct iov_iter *i, size_t bytes)</div><div class='del'>-{</div><div class='del'>-	struct page **last_page = pages + nr_pages;</div><div class='del'>-	size_t total = 0;</div><div class='del'>-	unsigned len, copied;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = PAGE_SIZE - ofs;</div><div class='del'>-		if (len &gt; bytes)</div><div class='del'>-			len = bytes;</div><div class='del'>-		copied = copy_page_from_iter_atomic(*pages, ofs, len, i);</div><div class='del'>-		total += copied;</div><div class='del'>-		bytes -= copied;</div><div class='del'>-		if (!bytes)</div><div class='del'>-			break;</div><div class='del'>-		if (copied &lt; len)</div><div class='del'>-			goto err;</div><div class='del'>-		ofs = 0;</div><div class='del'>-	} while (++pages &lt; last_page);</div><div class='del'>-out:</div><div class='del'>-	return total;</div><div class='del'>-err:</div><div class='del'>-	/* Zero the rest of the target like __copy_from_user(). */</div><div class='del'>-	len = PAGE_SIZE - copied;</div><div class='del'>-	do {</div><div class='del'>-		if (len &gt; bytes)</div><div class='del'>-			len = bytes;</div><div class='del'>-		zero_user(*pages, copied, len);</div><div class='del'>-		bytes -= len;</div><div class='del'>-		copied = 0;</div><div class='del'>-		len = PAGE_SIZE;</div><div class='del'>-	} while (++pages &lt; last_page);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_perform_write - perform buffered write to a file</div><div class='del'>- * @file:	file to write to</div><div class='del'>- * @i:		iov_iter with data to write</div><div class='del'>- * @pos:	byte offset in file at which to begin writing to</div><div class='del'>- */</div><div class='del'>-static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i,</div><div class='del'>-		loff_t pos)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct inode *vi = mapping-&gt;host;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	struct page *pages[NTFS_MAX_PAGES_PER_CLUSTER];</div><div class='del'>-	struct page *cached_page = NULL;</div><div class='del'>-	VCN last_vcn;</div><div class='del'>-	LCN lcn;</div><div class='del'>-	size_t bytes;</div><div class='del'>-	ssize_t status, written = 0;</div><div class='del'>-	unsigned nr_pages;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, pos "</div><div class='del'>-			"0x%llx, count 0x%lx.", vi-&gt;i_ino,</div><div class='del'>-			(unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-			(unsigned long long)pos,</div><div class='del'>-			(unsigned long)iov_iter_count(i));</div><div class='del'>-	/*</div><div class='del'>-	 * If a previous ntfs_truncate() failed, repeat it and abort if it</div><div class='del'>-	 * fails again.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(NInoTruncateFailed(ni))) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		inode_dio_wait(vi);</div><div class='del'>-		err = ntfs_truncate(vi);</div><div class='del'>-		if (err || NInoTruncateFailed(ni)) {</div><div class='del'>-			if (!err)</div><div class='del'>-				err = -EIO;</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot perform write to inode "</div><div class='del'>-					"0x%lx, attribute type 0x%x, because "</div><div class='del'>-					"ntfs_truncate() failed (error code "</div><div class='del'>-					"%i).", vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Determine the number of pages per cluster for non-resident</div><div class='del'>-	 * attributes.</div><div class='del'>-	 */</div><div class='del'>-	nr_pages = 1;</div><div class='del'>-	if (vol-&gt;cluster_size &gt; PAGE_SIZE &amp;&amp; NInoNonResident(ni))</div><div class='del'>-		nr_pages = vol-&gt;cluster_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	last_vcn = -1;</div><div class='del'>-	do {</div><div class='del'>-		VCN vcn;</div><div class='del'>-		pgoff_t start_idx;</div><div class='del'>-		unsigned ofs, do_pages, u;</div><div class='del'>-		size_t copied;</div><div class='del'>-</div><div class='del'>-		start_idx = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		ofs = pos &amp; ~PAGE_MASK;</div><div class='del'>-		bytes = PAGE_SIZE - ofs;</div><div class='del'>-		do_pages = 1;</div><div class='del'>-		if (nr_pages &gt; 1) {</div><div class='del'>-			vcn = pos &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-			if (vcn != last_vcn) {</div><div class='del'>-				last_vcn = vcn;</div><div class='del'>-				/*</div><div class='del'>-				 * Get the lcn of the vcn the write is in.  If</div><div class='del'>-				 * it is a hole, need to lock down all pages in</div><div class='del'>-				 * the cluster.</div><div class='del'>-				 */</div><div class='del'>-				down_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				lcn = ntfs_attr_vcn_to_lcn_nolock(ni, pos &gt;&gt;</div><div class='del'>-						vol-&gt;cluster_size_bits, false);</div><div class='del'>-				up_read(&amp;ni-&gt;runlist.lock);</div><div class='del'>-				if (unlikely(lcn &lt; LCN_HOLE)) {</div><div class='del'>-					if (lcn == LCN_ENOMEM)</div><div class='del'>-						status = -ENOMEM;</div><div class='del'>-					else {</div><div class='del'>-						status = -EIO;</div><div class='del'>-						ntfs_error(vol-&gt;sb, "Cannot "</div><div class='del'>-							"perform write to "</div><div class='del'>-							"inode 0x%lx, "</div><div class='del'>-							"attribute type 0x%x, "</div><div class='del'>-							"because the attribute "</div><div class='del'>-							"is corrupt.",</div><div class='del'>-							vi-&gt;i_ino, (unsigned)</div><div class='del'>-							le32_to_cpu(ni-&gt;type));</div><div class='del'>-					}</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				if (lcn == LCN_HOLE) {</div><div class='del'>-					start_idx = (pos &amp; ~(s64)</div><div class='del'>-							vol-&gt;cluster_size_mask)</div><div class='del'>-							&gt;&gt; PAGE_SHIFT;</div><div class='del'>-					bytes = vol-&gt;cluster_size - (pos &amp;</div><div class='del'>-							vol-&gt;cluster_size_mask);</div><div class='del'>-					do_pages = nr_pages;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (bytes &gt; iov_iter_count(i))</div><div class='del'>-			bytes = iov_iter_count(i);</div><div class='del'>-again:</div><div class='del'>-		/*</div><div class='del'>-		 * Bring in the user page(s) that we will copy from _first_.</div><div class='del'>-		 * Otherwise there is a nasty deadlock on copying from the same</div><div class='del'>-		 * page(s) as we are writing to, without it/them being marked</div><div class='del'>-		 * up-to-date.  Note, at present there is nothing to stop the</div><div class='del'>-		 * pages being swapped out between us bringing them into memory</div><div class='del'>-		 * and doing the actual copying.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(fault_in_iov_iter_readable(i, bytes))) {</div><div class='del'>-			status = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* Get and lock @do_pages starting at index @start_idx. */</div><div class='del'>-		status = __ntfs_grab_cache_pages(mapping, start_idx, do_pages,</div><div class='del'>-				pages, &amp;cached_page);</div><div class='del'>-		if (unlikely(status))</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * For non-resident attributes, we need to fill any holes with</div><div class='del'>-		 * actual clusters and ensure all bufferes are mapped.  We also</div><div class='del'>-		 * need to bring uptodate any buffers that are only partially</div><div class='del'>-		 * being written to.</div><div class='del'>-		 */</div><div class='del'>-		if (NInoNonResident(ni)) {</div><div class='del'>-			status = ntfs_prepare_pages_for_non_resident_write(</div><div class='del'>-					pages, do_pages, pos, bytes);</div><div class='del'>-			if (unlikely(status)) {</div><div class='del'>-				do {</div><div class='del'>-					unlock_page(pages[--do_pages]);</div><div class='del'>-					put_page(pages[do_pages]);</div><div class='del'>-				} while (do_pages);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		u = (pos &gt;&gt; PAGE_SHIFT) - pages[0]-&gt;index;</div><div class='del'>-		copied = ntfs_copy_from_user_iter(pages + u, do_pages - u, ofs,</div><div class='del'>-					i, bytes);</div><div class='del'>-		ntfs_flush_dcache_pages(pages + u, do_pages - u);</div><div class='del'>-		status = 0;</div><div class='del'>-		if (likely(copied == bytes)) {</div><div class='del'>-			status = ntfs_commit_pages_after_write(pages, do_pages,</div><div class='del'>-					pos, bytes);</div><div class='del'>-		}</div><div class='del'>-		do {</div><div class='del'>-			unlock_page(pages[--do_pages]);</div><div class='del'>-			put_page(pages[do_pages]);</div><div class='del'>-		} while (do_pages);</div><div class='del'>-		if (unlikely(status &lt; 0)) {</div><div class='del'>-			iov_iter_revert(i, copied);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cond_resched();</div><div class='del'>-		if (unlikely(copied &lt; bytes)) {</div><div class='del'>-			iov_iter_revert(i, copied);</div><div class='del'>-			if (copied)</div><div class='del'>-				bytes = copied;</div><div class='del'>-			else if (bytes &gt; PAGE_SIZE - ofs)</div><div class='del'>-				bytes = PAGE_SIZE - ofs;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		pos += copied;</div><div class='del'>-		written += copied;</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-		if (fatal_signal_pending(current)) {</div><div class='del'>-			status = -EINTR;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (iov_iter_count(i));</div><div class='del'>-	if (cached_page)</div><div class='del'>-		put_page(cached_page);</div><div class='del'>-	ntfs_debug("Done.  Returning %s (written 0x%lx, status %li).",</div><div class='del'>-			written ? "written" : "status", (unsigned long)written,</div><div class='del'>-			(long)status);</div><div class='del'>-	return written ? written : status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_file_write_iter - simple wrapper for ntfs_file_write_iter_nolock()</div><div class='del'>- * @iocb:	IO state structure</div><div class='del'>- * @from:	iov_iter with data to write</div><div class='del'>- *</div><div class='del'>- * Basically the same as generic_file_write_iter() except that it ends up</div><div class='del'>- * up calling ntfs_perform_write() instead of generic_perform_write() and that</div><div class='del'>- * O_DIRECT is not implemented.</div><div class='del'>- */</div><div class='del'>-static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='del'>-{</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct inode *vi = file_inode(file);</div><div class='del'>-	ssize_t written = 0;</div><div class='del'>-	ssize_t err;</div><div class='del'>-</div><div class='del'>-	inode_lock(vi);</div><div class='del'>-	/* We can write back this queue in page reclaim. */</div><div class='del'>-	err = ntfs_prepare_file_for_write(iocb, from);</div><div class='del'>-	if (iov_iter_count(from) &amp;&amp; !err)</div><div class='del'>-		written = ntfs_perform_write(file, from, iocb-&gt;ki_pos);</div><div class='del'>-	inode_unlock(vi);</div><div class='del'>-	iocb-&gt;ki_pos += written;</div><div class='del'>-	if (likely(written &gt; 0))</div><div class='del'>-		written = generic_write_sync(iocb, written);</div><div class='del'>-	return written ? written : err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_file_fsync - sync a file to disk</div><div class='del'>- * @filp:	file to be synced</div><div class='del'>- * @datasync:	if non-zero only flush user data and not metadata</div><div class='del'>- *</div><div class='del'>- * Data integrity sync of a file to disk.  Used for fsync, fdatasync, and msync</div><div class='del'>- * system calls.  This function is inspired by fs/buffer.c::file_fsync().</div><div class='del'>- *</div><div class='del'>- * If @datasync is false, write the mft record and all associated extent mft</div><div class='del'>- * records as well as the $DATA attribute and then sync the block device.</div><div class='del'>- *</div><div class='del'>- * If @datasync is true and the attribute is non-resident, we skip the writing</div><div class='del'>- * of the mft record and all associated extent mft records (this might still</div><div class='del'>- * happen due to the write_inode_now() call).</div><div class='del'>- *</div><div class='del'>- * Also, if @datasync is true, we do not wait on the inode to be written out</div><div class='del'>- * but we always wait on the page cache pages to be written out.</div><div class='del'>- *</div><div class='del'>- * Locking: Caller must hold i_mutex on the inode.</div><div class='del'>- *</div><div class='del'>- * TODO: We should probably also write all attribute/index inodes associated</div><div class='del'>- * with this inode but since we have no simple way of getting to them we ignore</div><div class='del'>- * this problem for now.</div><div class='del'>- */</div><div class='del'>-static int ntfs_file_fsync(struct file *filp, loff_t start, loff_t end,</div><div class='del'>-			   int datasync)</div><div class='del'>-{</div><div class='del'>-	struct inode *vi = filp-&gt;f_mapping-&gt;host;</div><div class='del'>-	int err, ret = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	err = file_write_and_wait_range(filp, start, end);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	inode_lock(vi);</div><div class='del'>-</div><div class='del'>-	BUG_ON(S_ISDIR(vi-&gt;i_mode));</div><div class='del'>-	if (!datasync || !NInoNonResident(NTFS_I(vi)))</div><div class='del'>-		ret = __ntfs_write_inode(vi, 1);</div><div class='del'>-	write_inode_now(vi, !datasync);</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: If we were to use mapping-&gt;private_list (see ext2 and</div><div class='del'>-	 * fs/buffer.c) for dirty blocks then we could optimize the below to be</div><div class='del'>-	 * sync_mapping_buffers(vi-&gt;i_mapping).</div><div class='del'>-	 */</div><div class='del'>-	err = sync_blockdev(vi-&gt;i_sb-&gt;s_bdev);</div><div class='del'>-	if (unlikely(err &amp;&amp; !ret))</div><div class='del'>-		ret = err;</div><div class='del'>-	if (likely(!ret))</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-	else</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Failed to f%ssync inode 0x%lx.  Error "</div><div class='del'>-				"%u.", datasync ? "data" : "", vi-&gt;i_ino, -ret);</div><div class='del'>-	inode_unlock(vi);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-const struct file_operations ntfs_file_ops = {</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='del'>-	.read_iter	= generic_file_read_iter,</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.write_iter	= ntfs_file_write_iter,</div><div class='del'>-	.fsync		= ntfs_file_fsync,</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='del'>-	.open		= ntfs_file_open,</div><div class='del'>-	.splice_read	= filemap_splice_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct inode_operations ntfs_file_inode_ops = {</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.setattr	= ntfs_setattr,</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct file_operations ntfs_empty_file_ops = {};</div><div class='del'>-</div><div class='del'>-const struct inode_operations ntfs_empty_inode_ops = {};</div><div class='head'>diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c<br/>deleted file mode 100644<br/>index d46c2c03a032..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/index.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/index.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,440 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * index.c - NTFS kernel index handling.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "collate.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "index.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_index_ctx_get - allocate and initialize a new index context</div><div class='del'>- * @idx_ni:	ntfs index inode with which to initialize the context</div><div class='del'>- *</div><div class='del'>- * Allocate a new index context, initialize it with @idx_ni and return it.</div><div class='del'>- * Return NULL if allocation failed.</div><div class='del'>- *</div><div class='del'>- * Locking:  Caller must hold i_mutex on the index inode.</div><div class='del'>- */</div><div class='del'>-ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni)</div><div class='del'>-{</div><div class='del'>-	ntfs_index_context *ictx;</div><div class='del'>-</div><div class='del'>-	ictx = kmem_cache_alloc(ntfs_index_ctx_cache, GFP_NOFS);</div><div class='del'>-	if (ictx)</div><div class='del'>-		*ictx = (ntfs_index_context){ .idx_ni = idx_ni };</div><div class='del'>-	return ictx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_index_ctx_put - release an index context</div><div class='del'>- * @ictx:	index context to free</div><div class='del'>- *</div><div class='del'>- * Release the index context @ictx, releasing all associated resources.</div><div class='del'>- *</div><div class='del'>- * Locking:  Caller must hold i_mutex on the index inode.</div><div class='del'>- */</div><div class='del'>-void ntfs_index_ctx_put(ntfs_index_context *ictx)</div><div class='del'>-{</div><div class='del'>-	if (ictx-&gt;entry) {</div><div class='del'>-		if (ictx-&gt;is_in_root) {</div><div class='del'>-			if (ictx-&gt;actx)</div><div class='del'>-				ntfs_attr_put_search_ctx(ictx-&gt;actx);</div><div class='del'>-			if (ictx-&gt;base_ni)</div><div class='del'>-				unmap_mft_record(ictx-&gt;base_ni);</div><div class='del'>-		} else {</div><div class='del'>-			struct page *page = ictx-&gt;page;</div><div class='del'>-			if (page) {</div><div class='del'>-				BUG_ON(!PageLocked(page));</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				ntfs_unmap_page(page);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kmem_cache_free(ntfs_index_ctx_cache, ictx);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_index_lookup - find a key in an index and return its index entry</div><div class='del'>- * @key:	[IN] key for which to search in the index</div><div class='del'>- * @key_len:	[IN] length of @key in bytes</div><div class='del'>- * @ictx:	[IN/OUT] context describing the index and the returned entry</div><div class='del'>- *</div><div class='del'>- * Before calling ntfs_index_lookup(), @ictx must have been obtained from a</div><div class='del'>- * call to ntfs_index_ctx_get().</div><div class='del'>- *</div><div class='del'>- * Look for the @key in the index specified by the index lookup context @ictx.</div><div class='del'>- * ntfs_index_lookup() walks the contents of the index looking for the @key.</div><div class='del'>- *</div><div class='del'>- * If the @key is found in the index, 0 is returned and @ictx is setup to</div><div class='del'>- * describe the index entry containing the matching @key.  @ictx-&gt;entry is the</div><div class='del'>- * index entry and @ictx-&gt;data and @ictx-&gt;data_len are the index entry data and</div><div class='del'>- * its length in bytes, respectively.</div><div class='del'>- *</div><div class='del'>- * If the @key is not found in the index, -ENOENT is returned and @ictx is</div><div class='del'>- * setup to describe the index entry whose key collates immediately after the</div><div class='del'>- * search @key, i.e. this is the position in the index at which an index entry</div><div class='del'>- * with a key of @key would need to be inserted.</div><div class='del'>- *</div><div class='del'>- * If an error occurs return the negative error code and @ictx is left</div><div class='del'>- * untouched.</div><div class='del'>- *</div><div class='del'>- * When finished with the entry and its data, call ntfs_index_ctx_put() to free</div><div class='del'>- * the context and other associated resources.</div><div class='del'>- *</div><div class='del'>- * If the index entry was modified, call flush_dcache_index_entry_page()</div><div class='del'>- * immediately after the modification and either ntfs_index_entry_mark_dirty()</div><div class='del'>- * or ntfs_index_entry_write() before the call to ntfs_index_ctx_put() to</div><div class='del'>- * ensure that the changes are written to disk.</div><div class='del'>- *</div><div class='del'>- * Locking:  - Caller must hold i_mutex on the index inode.</div><div class='del'>- *	     - Each page cache page in the index allocation mapping must be</div><div class='del'>- *	       locked whilst being accessed otherwise we may find a corrupt</div><div class='del'>- *	       page due to it being under -&gt;writepage at the moment which</div><div class='del'>- *	       applies the mst protection fixups before writing out and then</div><div class='del'>- *	       removes them again after the write is complete after which it </div><div class='del'>- *	       unlocks the page.</div><div class='del'>- */</div><div class='del'>-int ntfs_index_lookup(const void *key, const int key_len,</div><div class='del'>-		ntfs_index_context *ictx)</div><div class='del'>-{</div><div class='del'>-	VCN vcn, old_vcn;</div><div class='del'>-	ntfs_inode *idx_ni = ictx-&gt;idx_ni;</div><div class='del'>-	ntfs_volume *vol = idx_ni-&gt;vol;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	ntfs_inode *base_ni = idx_ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	INDEX_ROOT *ir;</div><div class='del'>-	INDEX_ENTRY *ie;</div><div class='del'>-	INDEX_ALLOCATION *ia;</div><div class='del'>-	u8 *index_end, *kaddr;</div><div class='del'>-	ntfs_attr_search_ctx *actx;</div><div class='del'>-	struct address_space *ia_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	int rc, err = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	BUG_ON(!NInoAttr(idx_ni));</div><div class='del'>-	BUG_ON(idx_ni-&gt;type != AT_INDEX_ALLOCATION);</div><div class='del'>-	BUG_ON(idx_ni-&gt;nr_extents != -1);</div><div class='del'>-	BUG_ON(!base_ni);</div><div class='del'>-	BUG_ON(!key);</div><div class='del'>-	BUG_ON(key_len &lt;= 0);</div><div class='del'>-	if (!ntfs_is_collation_rule_supported(</div><div class='del'>-			idx_ni-&gt;itype.index.collation_rule)) {</div><div class='del'>-		ntfs_error(sb, "Index uses unsupported collation rule 0x%x.  "</div><div class='del'>-				"Aborting lookup.", le32_to_cpu(</div><div class='del'>-				idx_ni-&gt;itype.index.collation_rule));</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-	/* Get hold of the mft record for the index inode. */</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		ntfs_error(sb, "map_mft_record() failed with error code %ld.",</div><div class='del'>-				-PTR_ERR(m));</div><div class='del'>-		return PTR_ERR(m);</div><div class='del'>-	}</div><div class='del'>-	actx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!actx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Find the index root attribute in the mft record. */</div><div class='del'>-	err = ntfs_attr_lookup(AT_INDEX_ROOT, idx_ni-&gt;name, idx_ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, actx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT) {</div><div class='del'>-			ntfs_error(sb, "Index root attribute missing in inode "</div><div class='del'>-					"0x%lx.", idx_ni-&gt;mft_no);</div><div class='del'>-			err = -EIO;</div><div class='del'>-		}</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get to the index root value (it has been verified in read_inode). */</div><div class='del'>-	ir = (INDEX_ROOT*)((u8*)actx-&gt;attr +</div><div class='del'>-			le16_to_cpu(actx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-	index_end = (u8*)&amp;ir-&gt;index + le32_to_cpu(ir-&gt;index.index_length);</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ir-&gt;index +</div><div class='del'>-			le32_to_cpu(ir-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry.</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		/* Bounds checks. */</div><div class='del'>-		if ((u8*)ie &lt; (u8*)actx-&gt;mrec || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;length) &gt; index_end)</div><div class='del'>-			goto idx_err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * The last entry cannot contain a key.  It can however contain</div><div class='del'>-		 * a pointer to a child node in the B+tree so we just break out.</div><div class='del'>-		 */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/* Further bounds checks. */</div><div class='del'>-		if ((u32)sizeof(INDEX_ENTRY_HEADER) +</div><div class='del'>-				le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				le16_to_cpu(ie-&gt;data.vi.data_offset) ||</div><div class='del'>-				(u32)le16_to_cpu(ie-&gt;data.vi.data_offset) +</div><div class='del'>-				le16_to_cpu(ie-&gt;data.vi.data_length) &gt;</div><div class='del'>-				le16_to_cpu(ie-&gt;length))</div><div class='del'>-			goto idx_err_out;</div><div class='del'>-		/* If the keys match perfectly, we setup @ictx and return 0. */</div><div class='del'>-		if ((key_len == le16_to_cpu(ie-&gt;key_length)) &amp;&amp; !memcmp(key,</div><div class='del'>-				&amp;ie-&gt;key, key_len)) {</div><div class='del'>-ir_done:</div><div class='del'>-			ictx-&gt;is_in_root = true;</div><div class='del'>-			ictx-&gt;ir = ir;</div><div class='del'>-			ictx-&gt;actx = actx;</div><div class='del'>-			ictx-&gt;base_ni = base_ni;</div><div class='del'>-			ictx-&gt;ia = NULL;</div><div class='del'>-			ictx-&gt;page = NULL;</div><div class='del'>-done:</div><div class='del'>-			ictx-&gt;entry = ie;</div><div class='del'>-			ictx-&gt;data = (u8*)ie +</div><div class='del'>-					le16_to_cpu(ie-&gt;data.vi.data_offset);</div><div class='del'>-			ictx-&gt;data_len = le16_to_cpu(ie-&gt;data.vi.data_length);</div><div class='del'>-			ntfs_debug("Done.");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not a perfect match, need to do full blown collation so we</div><div class='del'>-		 * know which way in the B+tree we have to go.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate(vol, idx_ni-&gt;itype.index.collation_rule, key,</div><div class='del'>-				key_len, &amp;ie-&gt;key, le16_to_cpu(ie-&gt;key_length));</div><div class='del'>-		/*</div><div class='del'>-		 * If @key collates before the key of the current entry, there</div><div class='del'>-		 * is definitely no such key in this index but we might need to</div><div class='del'>-		 * descend into the B+tree so we just break out of the loop.</div><div class='del'>-		 */</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * A match should never happen as the memcmp() call should have</div><div class='del'>-		 * cought it, but we still treat it correctly.</div><div class='del'>-		 */</div><div class='del'>-		if (!rc)</div><div class='del'>-			goto ir_done;</div><div class='del'>-		/* The keys are not equal, continue the search. */</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have finished with this index without success.  Check for the</div><div class='del'>-	 * presence of a child node and if not present setup @ictx and return</div><div class='del'>-	 * -ENOENT.</div><div class='del'>-	 */</div><div class='del'>-	if (!(ie-&gt;flags &amp; INDEX_ENTRY_NODE)) {</div><div class='del'>-		ntfs_debug("Entry not found.");</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto ir_done;</div><div class='del'>-	} /* Child node present, descend into it. */</div><div class='del'>-	/* Consistency check: Verify that an index allocation exists. */</div><div class='del'>-	if (!NInoIndexAllocPresent(idx_ni)) {</div><div class='del'>-		ntfs_error(sb, "No index allocation attribute but index entry "</div><div class='del'>-				"requires one.  Inode 0x%lx is corrupt or "</div><div class='del'>-				"driver bug.", idx_ni-&gt;mft_no);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the starting vcn of the index_block holding the child node. */</div><div class='del'>-	vcn = sle64_to_cpup((sle64*)((u8*)ie + le16_to_cpu(ie-&gt;length) - 8));</div><div class='del'>-	ia_mapping = VFS_I(idx_ni)-&gt;i_mapping;</div><div class='del'>-	/*</div><div class='del'>-	 * We are done with the index root and the mft record.  Release them,</div><div class='del'>-	 * otherwise we deadlock with ntfs_map_page().</div><div class='del'>-	 */</div><div class='del'>-	ntfs_attr_put_search_ctx(actx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	m = NULL;</div><div class='del'>-	actx = NULL;</div><div class='del'>-descend_into_child_node:</div><div class='del'>-	/*</div><div class='del'>-	 * Convert vcn to index into the index allocation attribute in units</div><div class='del'>-	 * of PAGE_SIZE and map the page cache page, reading it from</div><div class='del'>-	 * disk if necessary.</div><div class='del'>-	 */</div><div class='del'>-	page = ntfs_map_page(ia_mapping, vcn &lt;&lt;</div><div class='del'>-			idx_ni-&gt;itype.index.vcn_size_bits &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(sb, "Failed to map index page, error %ld.",</div><div class='del'>-				-PTR_ERR(page));</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	kaddr = (u8*)page_address(page);</div><div class='del'>-fast_descend_into_child_node:</div><div class='del'>-	/* Get to the index allocation block. */</div><div class='del'>-	ia = (INDEX_ALLOCATION*)(kaddr + ((vcn &lt;&lt;</div><div class='del'>-			idx_ni-&gt;itype.index.vcn_size_bits) &amp; ~PAGE_MASK));</div><div class='del'>-	/* Bounds checks. */</div><div class='del'>-	if ((u8*)ia &lt; kaddr || (u8*)ia &gt; kaddr + PAGE_SIZE) {</div><div class='del'>-		ntfs_error(sb, "Out of bounds check failed.  Corrupt inode "</div><div class='del'>-				"0x%lx or driver bug.", idx_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Catch multi sector transfer fixup errors. */</div><div class='del'>-	if (unlikely(!ntfs_is_indx_record(ia-&gt;magic))) {</div><div class='del'>-		ntfs_error(sb, "Index record with vcn 0x%llx is corrupt.  "</div><div class='del'>-				"Corrupt inode 0x%lx.  Run chkdsk.",</div><div class='del'>-				(long long)vcn, idx_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (sle64_to_cpu(ia-&gt;index_block_vcn) != vcn) {</div><div class='del'>-		ntfs_error(sb, "Actual VCN (0x%llx) of index buffer is "</div><div class='del'>-				"different from expected VCN (0x%llx).  Inode "</div><div class='del'>-				"0x%lx is corrupt or driver bug.",</div><div class='del'>-				(unsigned long long)</div><div class='del'>-				sle64_to_cpu(ia-&gt;index_block_vcn),</div><div class='del'>-				(unsigned long long)vcn, idx_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (le32_to_cpu(ia-&gt;index.allocated_size) + 0x18 !=</div><div class='del'>-			idx_ni-&gt;itype.index.block_size) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of inode 0x%lx has "</div><div class='del'>-				"a size (%u) differing from the index "</div><div class='del'>-				"specified size (%u).  Inode is corrupt or "</div><div class='del'>-				"driver bug.", (unsigned long long)vcn,</div><div class='del'>-				idx_ni-&gt;mft_no,</div><div class='del'>-				le32_to_cpu(ia-&gt;index.allocated_size) + 0x18,</div><div class='del'>-				idx_ni-&gt;itype.index.block_size);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)ia + idx_ni-&gt;itype.index.block_size;</div><div class='del'>-	if (index_end &gt; kaddr + PAGE_SIZE) {</div><div class='del'>-		ntfs_error(sb, "Index buffer (VCN 0x%llx) of inode 0x%lx "</div><div class='del'>-				"crosses page boundary.  Impossible!  Cannot "</div><div class='del'>-				"access!  This is probably a bug in the "</div><div class='del'>-				"driver.", (unsigned long long)vcn,</div><div class='del'>-				idx_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)&amp;ia-&gt;index + le32_to_cpu(ia-&gt;index.index_length);</div><div class='del'>-	if (index_end &gt; (u8*)ia + idx_ni-&gt;itype.index.block_size) {</div><div class='del'>-		ntfs_error(sb, "Size of index buffer (VCN 0x%llx) of inode "</div><div class='del'>-				"0x%lx exceeds maximum size.",</div><div class='del'>-				(unsigned long long)vcn, idx_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* The first index entry. */</div><div class='del'>-	ie = (INDEX_ENTRY*)((u8*)&amp;ia-&gt;index +</div><div class='del'>-			le32_to_cpu(ia-&gt;index.entries_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Iterate similar to above big loop but applied to index buffer, thus</div><div class='del'>-	 * loop until we exceed valid memory (corruption case) or until we</div><div class='del'>-	 * reach the last entry.</div><div class='del'>-	 */</div><div class='del'>-	for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie-&gt;length))) {</div><div class='del'>-		/* Bounds checks. */</div><div class='del'>-		if ((u8*)ie &lt; (u8*)ia || (u8*)ie +</div><div class='del'>-				sizeof(INDEX_ENTRY_HEADER) &gt; index_end ||</div><div class='del'>-				(u8*)ie + le16_to_cpu(ie-&gt;length) &gt; index_end) {</div><div class='del'>-			ntfs_error(sb, "Index entry out of bounds in inode "</div><div class='del'>-					"0x%lx.", idx_ni-&gt;mft_no);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The last entry cannot contain a key.  It can however contain</div><div class='del'>-		 * a pointer to a child node in the B+tree so we just break out.</div><div class='del'>-		 */</div><div class='del'>-		if (ie-&gt;flags &amp; INDEX_ENTRY_END)</div><div class='del'>-			break;</div><div class='del'>-		/* Further bounds checks. */</div><div class='del'>-		if ((u32)sizeof(INDEX_ENTRY_HEADER) +</div><div class='del'>-				le16_to_cpu(ie-&gt;key_length) &gt;</div><div class='del'>-				le16_to_cpu(ie-&gt;data.vi.data_offset) ||</div><div class='del'>-				(u32)le16_to_cpu(ie-&gt;data.vi.data_offset) +</div><div class='del'>-				le16_to_cpu(ie-&gt;data.vi.data_length) &gt;</div><div class='del'>-				le16_to_cpu(ie-&gt;length)) {</div><div class='del'>-			ntfs_error(sb, "Index entry out of bounds in inode "</div><div class='del'>-					"0x%lx.", idx_ni-&gt;mft_no);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* If the keys match perfectly, we setup @ictx and return 0. */</div><div class='del'>-		if ((key_len == le16_to_cpu(ie-&gt;key_length)) &amp;&amp; !memcmp(key,</div><div class='del'>-				&amp;ie-&gt;key, key_len)) {</div><div class='del'>-ia_done:</div><div class='del'>-			ictx-&gt;is_in_root = false;</div><div class='del'>-			ictx-&gt;actx = NULL;</div><div class='del'>-			ictx-&gt;base_ni = NULL;</div><div class='del'>-			ictx-&gt;ia = ia;</div><div class='del'>-			ictx-&gt;page = page;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not a perfect match, need to do full blown collation so we</div><div class='del'>-		 * know which way in the B+tree we have to go.</div><div class='del'>-		 */</div><div class='del'>-		rc = ntfs_collate(vol, idx_ni-&gt;itype.index.collation_rule, key,</div><div class='del'>-				key_len, &amp;ie-&gt;key, le16_to_cpu(ie-&gt;key_length));</div><div class='del'>-		/*</div><div class='del'>-		 * If @key collates before the key of the current entry, there</div><div class='del'>-		 * is definitely no such key in this index but we might need to</div><div class='del'>-		 * descend into the B+tree so we just break out of the loop.</div><div class='del'>-		 */</div><div class='del'>-		if (rc == -1)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * A match should never happen as the memcmp() call should have</div><div class='del'>-		 * cought it, but we still treat it correctly.</div><div class='del'>-		 */</div><div class='del'>-		if (!rc)</div><div class='del'>-			goto ia_done;</div><div class='del'>-		/* The keys are not equal, continue the search. */</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We have finished with this index buffer without success.  Check for</div><div class='del'>-	 * the presence of a child node and if not present return -ENOENT.</div><div class='del'>-	 */</div><div class='del'>-	if (!(ie-&gt;flags &amp; INDEX_ENTRY_NODE)) {</div><div class='del'>-		ntfs_debug("Entry not found.");</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto ia_done;</div><div class='del'>-	}</div><div class='del'>-	if ((ia-&gt;index.flags &amp; NODE_MASK) == LEAF_NODE) {</div><div class='del'>-		ntfs_error(sb, "Index entry with child node found in a leaf "</div><div class='del'>-				"node in inode 0x%lx.", idx_ni-&gt;mft_no);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Child node present, descend into it. */</div><div class='del'>-	old_vcn = vcn;</div><div class='del'>-	vcn = sle64_to_cpup((sle64*)((u8*)ie + le16_to_cpu(ie-&gt;length) - 8));</div><div class='del'>-	if (vcn &gt;= 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * If vcn is in the same page cache page as old_vcn we recycle</div><div class='del'>-		 * the mapped page.</div><div class='del'>-		 */</div><div class='del'>-		if (old_vcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-				PAGE_SHIFT == vcn &lt;&lt;</div><div class='del'>-				vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-				PAGE_SHIFT)</div><div class='del'>-			goto fast_descend_into_child_node;</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		goto descend_into_child_node;</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(sb, "Negative child node vcn in inode 0x%lx.",</div><div class='del'>-			idx_ni-&gt;mft_no);</div><div class='del'>-unm_err_out:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-err_out:</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (actx)</div><div class='del'>-		ntfs_attr_put_search_ctx(actx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	return err;</div><div class='del'>-idx_err_out:</div><div class='del'>-	ntfs_error(sb, "Corrupt index.  Aborting lookup.");</div><div class='del'>-	goto err_out;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/ntfs/index.h b/fs/ntfs/index.h<br/>deleted file mode 100644<br/>index bb3c3ae55138..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/index.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/index.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * index.h - Defines for NTFS kernel index handling.  Part of the Linux-NTFS</div><div class='del'>- *	     project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_INDEX_H</div><div class='del'>-#define _LINUX_NTFS_INDEX_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * @idx_ni:	index inode containing the @entry described by this context</div><div class='del'>- * @entry:	index entry (points into @ir or @ia)</div><div class='del'>- * @data:	index entry data (points into @entry)</div><div class='del'>- * @data_len:	length in bytes of @data</div><div class='del'>- * @is_in_root:	'true' if @entry is in @ir and 'false' if it is in @ia</div><div class='del'>- * @ir:		index root if @is_in_root and NULL otherwise</div><div class='del'>- * @actx:	attribute search context if @is_in_root and NULL otherwise</div><div class='del'>- * @base_ni:	base inode if @is_in_root and NULL otherwise</div><div class='del'>- * @ia:		index block if @is_in_root is 'false' and NULL otherwise</div><div class='del'>- * @page:	page if @is_in_root is 'false' and NULL otherwise</div><div class='del'>- *</div><div class='del'>- * @idx_ni is the index inode this context belongs to.</div><div class='del'>- *</div><div class='del'>- * @entry is the index entry described by this context.  @data and @data_len</div><div class='del'>- * are the index entry data and its length in bytes, respectively.  @data</div><div class='del'>- * simply points into @entry.  This is probably what the user is interested in.</div><div class='del'>- *</div><div class='del'>- * If @is_in_root is 'true', @entry is in the index root attribute @ir described</div><div class='del'>- * by the attribute search context @actx and the base inode @base_ni.  @ia and</div><div class='del'>- * @page are NULL in this case.</div><div class='del'>- *</div><div class='del'>- * If @is_in_root is 'false', @entry is in the index allocation attribute and @ia</div><div class='del'>- * and @page point to the index allocation block and the mapped, locked page it</div><div class='del'>- * is in, respectively.  @ir, @actx and @base_ni are NULL in this case.</div><div class='del'>- *</div><div class='del'>- * To obtain a context call ntfs_index_ctx_get().</div><div class='del'>- *</div><div class='del'>- * We use this context to allow ntfs_index_lookup() to return the found index</div><div class='del'>- * @entry and its @data without having to allocate a buffer and copy the @entry</div><div class='del'>- * and/or its @data into it.</div><div class='del'>- *</div><div class='del'>- * When finished with the @entry and its @data, call ntfs_index_ctx_put() to</div><div class='del'>- * free the context and other associated resources.</div><div class='del'>- *</div><div class='del'>- * If the index entry was modified, call flush_dcache_index_entry_page()</div><div class='del'>- * immediately after the modification and either ntfs_index_entry_mark_dirty()</div><div class='del'>- * or ntfs_index_entry_write() before the call to ntfs_index_ctx_put() to</div><div class='del'>- * ensure that the changes are written to disk.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	ntfs_inode *idx_ni;</div><div class='del'>-	INDEX_ENTRY *entry;</div><div class='del'>-	void *data;</div><div class='del'>-	u16 data_len;</div><div class='del'>-	bool is_in_root;</div><div class='del'>-	INDEX_ROOT *ir;</div><div class='del'>-	ntfs_attr_search_ctx *actx;</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-	INDEX_ALLOCATION *ia;</div><div class='del'>-	struct page *page;</div><div class='del'>-} ntfs_index_context;</div><div class='del'>-</div><div class='del'>-extern ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni);</div><div class='del'>-extern void ntfs_index_ctx_put(ntfs_index_context *ictx);</div><div class='del'>-</div><div class='del'>-extern int ntfs_index_lookup(const void *key, const int key_len,</div><div class='del'>-		ntfs_index_context *ictx);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_index_entry_flush_dcache_page - flush_dcache_page() for index entries</div><div class='del'>- * @ictx:	ntfs index context describing the index entry</div><div class='del'>- *</div><div class='del'>- * Call flush_dcache_page() for the page in which an index entry resides.</div><div class='del'>- *</div><div class='del'>- * This must be called every time an index entry is modified, just after the</div><div class='del'>- * modification.</div><div class='del'>- *</div><div class='del'>- * If the index entry is in the index root attribute, simply flush the page</div><div class='del'>- * containing the mft record containing the index root attribute.</div><div class='del'>- *</div><div class='del'>- * If the index entry is in an index block belonging to the index allocation</div><div class='del'>- * attribute, simply flush the page cache page containing the index block.</div><div class='del'>- */</div><div class='del'>-static inline void ntfs_index_entry_flush_dcache_page(ntfs_index_context *ictx)</div><div class='del'>-{</div><div class='del'>-	if (ictx-&gt;is_in_root)</div><div class='del'>-		flush_dcache_mft_record_page(ictx-&gt;actx-&gt;ntfs_ino);</div><div class='del'>-	else</div><div class='del'>-		flush_dcache_page(ictx-&gt;page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_index_entry_mark_dirty - mark an index entry dirty</div><div class='del'>- * @ictx:	ntfs index context describing the index entry</div><div class='del'>- *</div><div class='del'>- * Mark the index entry described by the index entry context @ictx dirty.</div><div class='del'>- *</div><div class='del'>- * If the index entry is in the index root attribute, simply mark the mft</div><div class='del'>- * record containing the index root attribute dirty.  This ensures the mft</div><div class='del'>- * record, and hence the index root attribute, will be written out to disk</div><div class='del'>- * later.</div><div class='del'>- *</div><div class='del'>- * If the index entry is in an index block belonging to the index allocation</div><div class='del'>- * attribute, mark the buffers belonging to the index record as well as the</div><div class='del'>- * page cache page the index block is in dirty.  This automatically marks the</div><div class='del'>- * VFS inode of the ntfs index inode to which the index entry belongs dirty,</div><div class='del'>- * too (I_DIRTY_PAGES) and this in turn ensures the page buffers, and hence the</div><div class='del'>- * dirty index block, will be written out to disk later.</div><div class='del'>- */</div><div class='del'>-static inline void ntfs_index_entry_mark_dirty(ntfs_index_context *ictx)</div><div class='del'>-{</div><div class='del'>-	if (ictx-&gt;is_in_root)</div><div class='del'>-		mark_mft_record_dirty(ictx-&gt;actx-&gt;ntfs_ino);</div><div class='del'>-	else</div><div class='del'>-		mark_ntfs_record_dirty(ictx-&gt;page,</div><div class='del'>-				(u8*)ictx-&gt;ia - (u8*)page_address(ictx-&gt;page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_INDEX_H */</div><div class='head'>diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c<br/>deleted file mode 100644<br/>index aba1e22db4e9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/inode.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3102 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * inode.c - NTFS kernel inode handling.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "bitmap.h"</div><div class='del'>-#include "dir.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "lcnalloc.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "time.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_test_inode - compare two (possibly fake) inodes for equality</div><div class='del'>- * @vi:		vfs inode which to test</div><div class='del'>- * @data:	data which is being tested with</div><div class='del'>- *</div><div class='del'>- * Compare the ntfs attribute embedded in the ntfs specific part of the vfs</div><div class='del'>- * inode @vi for equality with the ntfs attribute @data.</div><div class='del'>- *</div><div class='del'>- * If searching for the normal file/directory inode, set @na-&gt;type to AT_UNUSED.</div><div class='del'>- * @na-&gt;name and @na-&gt;name_len are then ignored.</div><div class='del'>- *</div><div class='del'>- * Return 1 if the attributes match and 0 if not.</div><div class='del'>- *</div><div class='del'>- * NOTE: This function runs with the inode_hash_lock spin lock held so it is not</div><div class='del'>- * allowed to sleep.</div><div class='del'>- */</div><div class='del'>-int ntfs_test_inode(struct inode *vi, void *data)</div><div class='del'>-{</div><div class='del'>-	ntfs_attr *na = (ntfs_attr *)data;</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-</div><div class='del'>-	if (vi-&gt;i_ino != na-&gt;mft_no)</div><div class='del'>-		return 0;</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	/* If !NInoAttr(ni), @vi is a normal file or directory inode. */</div><div class='del'>-	if (likely(!NInoAttr(ni))) {</div><div class='del'>-		/* If not looking for a normal inode this is a mismatch. */</div><div class='del'>-		if (unlikely(na-&gt;type != AT_UNUSED))</div><div class='del'>-			return 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* A fake inode describing an attribute. */</div><div class='del'>-		if (ni-&gt;type != na-&gt;type)</div><div class='del'>-			return 0;</div><div class='del'>-		if (ni-&gt;name_len != na-&gt;name_len)</div><div class='del'>-			return 0;</div><div class='del'>-		if (na-&gt;name_len &amp;&amp; memcmp(ni-&gt;name, na-&gt;name,</div><div class='del'>-				na-&gt;name_len * sizeof(ntfschar)))</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	/* Match! */</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_init_locked_inode - initialize an inode</div><div class='del'>- * @vi:		vfs inode to initialize</div><div class='del'>- * @data:	data which to initialize @vi to</div><div class='del'>- *</div><div class='del'>- * Initialize the vfs inode @vi with the values from the ntfs attribute @data in</div><div class='del'>- * order to enable ntfs_test_inode() to do its work.</div><div class='del'>- *</div><div class='del'>- * If initializing the normal file/directory inode, set @na-&gt;type to AT_UNUSED.</div><div class='del'>- * In that case, @na-&gt;name and @na-&gt;name_len should be set to NULL and 0,</div><div class='del'>- * respectively. Although that is not strictly necessary as</div><div class='del'>- * ntfs_read_locked_inode() will fill them in later.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * NOTE: This function runs with the inode-&gt;i_lock spin lock held so it is not</div><div class='del'>- * allowed to sleep. (Hence the GFP_ATOMIC allocation.)</div><div class='del'>- */</div><div class='del'>-static int ntfs_init_locked_inode(struct inode *vi, void *data)</div><div class='del'>-{</div><div class='del'>-	ntfs_attr *na = (ntfs_attr *)data;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-</div><div class='del'>-	vi-&gt;i_ino = na-&gt;mft_no;</div><div class='del'>-</div><div class='del'>-	ni-&gt;type = na-&gt;type;</div><div class='del'>-	if (na-&gt;type == AT_INDEX_ALLOCATION)</div><div class='del'>-		NInoSetMstProtected(ni);</div><div class='del'>-</div><div class='del'>-	ni-&gt;name = na-&gt;name;</div><div class='del'>-	ni-&gt;name_len = na-&gt;name_len;</div><div class='del'>-</div><div class='del'>-	/* If initializing a normal inode, we are done. */</div><div class='del'>-	if (likely(na-&gt;type == AT_UNUSED)) {</div><div class='del'>-		BUG_ON(na-&gt;name);</div><div class='del'>-		BUG_ON(na-&gt;name_len);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* It is a fake inode. */</div><div class='del'>-	NInoSetAttr(ni);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have I30 global constant as an optimization as it is the name</div><div class='del'>-	 * in &gt;99.9% of named attributes! The other &lt;0.1% incur a GFP_ATOMIC</div><div class='del'>-	 * allocation but that is ok. And most attributes are unnamed anyway,</div><div class='del'>-	 * thus the fraction of named attributes with name != I30 is actually</div><div class='del'>-	 * absolutely tiny.</div><div class='del'>-	 */</div><div class='del'>-	if (na-&gt;name_len &amp;&amp; na-&gt;name != I30) {</div><div class='del'>-		unsigned int i;</div><div class='del'>-</div><div class='del'>-		BUG_ON(!na-&gt;name);</div><div class='del'>-		i = na-&gt;name_len * sizeof(ntfschar);</div><div class='del'>-		ni-&gt;name = kmalloc(i + sizeof(ntfschar), GFP_ATOMIC);</div><div class='del'>-		if (!ni-&gt;name)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		memcpy(ni-&gt;name, na-&gt;name, i);</div><div class='del'>-		ni-&gt;name[na-&gt;name_len] = 0;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ntfs_read_locked_inode(struct inode *vi);</div><div class='del'>-static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi);</div><div class='del'>-static int ntfs_read_locked_index_inode(struct inode *base_vi,</div><div class='del'>-		struct inode *vi);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_iget - obtain a struct inode corresponding to a specific normal inode</div><div class='del'>- * @sb:		super block of mounted volume</div><div class='del'>- * @mft_no:	mft record number / inode number to obtain</div><div class='del'>- *</div><div class='del'>- * Obtain the struct inode corresponding to a specific normal inode (i.e. a</div><div class='del'>- * file or directory).</div><div class='del'>- *</div><div class='del'>- * If the inode is in the cache, it is just returned with an increased</div><div class='del'>- * reference count. Otherwise, a new struct inode is allocated and initialized,</div><div class='del'>- * and finally ntfs_read_locked_inode() is called to read in the inode and</div><div class='del'>- * fill in the remainder of the inode structure.</div><div class='del'>- *</div><div class='del'>- * Return the struct inode on success. Check the return value with IS_ERR() and</div><div class='del'>- * if true, the function failed and the error code is obtained from PTR_ERR().</div><div class='del'>- */</div><div class='del'>-struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no)</div><div class='del'>-{</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	int err;</div><div class='del'>-	ntfs_attr na;</div><div class='del'>-</div><div class='del'>-	na.mft_no = mft_no;</div><div class='del'>-	na.type = AT_UNUSED;</div><div class='del'>-	na.name = NULL;</div><div class='del'>-	na.name_len = 0;</div><div class='del'>-</div><div class='del'>-	vi = iget5_locked(sb, mft_no, ntfs_test_inode,</div><div class='del'>-			ntfs_init_locked_inode, &amp;na);</div><div class='del'>-	if (unlikely(!vi))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-	/* If this is a freshly allocated inode, need to read it now. */</div><div class='del'>-	if (vi-&gt;i_state &amp; I_NEW) {</div><div class='del'>-		err = ntfs_read_locked_inode(vi);</div><div class='del'>-		unlock_new_inode(vi);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * There is no point in keeping bad inodes around if the failure was</div><div class='del'>-	 * due to ENOMEM. We want to be able to retry again later.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(err == -ENOMEM)) {</div><div class='del'>-		iput(vi);</div><div class='del'>-		vi = ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-	return vi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr_iget - obtain a struct inode corresponding to an attribute</div><div class='del'>- * @base_vi:	vfs base inode containing the attribute</div><div class='del'>- * @type:	attribute type</div><div class='del'>- * @name:	Unicode name of the attribute (NULL if unnamed)</div><div class='del'>- * @name_len:	length of @name in Unicode characters (0 if unnamed)</div><div class='del'>- *</div><div class='del'>- * Obtain the (fake) struct inode corresponding to the attribute specified by</div><div class='del'>- * @type, @name, and @name_len, which is present in the base mft record</div><div class='del'>- * specified by the vfs inode @base_vi.</div><div class='del'>- *</div><div class='del'>- * If the attribute inode is in the cache, it is just returned with an</div><div class='del'>- * increased reference count. Otherwise, a new struct inode is allocated and</div><div class='del'>- * initialized, and finally ntfs_read_locked_attr_inode() is called to read the</div><div class='del'>- * attribute and fill in the inode structure.</div><div class='del'>- *</div><div class='del'>- * Note, for index allocation attributes, you need to use ntfs_index_iget()</div><div class='del'>- * instead of ntfs_attr_iget() as working with indices is a lot more complex.</div><div class='del'>- *</div><div class='del'>- * Return the struct inode of the attribute inode on success. Check the return</div><div class='del'>- * value with IS_ERR() and if true, the function failed and the error code is</div><div class='del'>- * obtained from PTR_ERR().</div><div class='del'>- */</div><div class='del'>-struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPE type,</div><div class='del'>-		ntfschar *name, u32 name_len)</div><div class='del'>-{</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	int err;</div><div class='del'>-	ntfs_attr na;</div><div class='del'>-</div><div class='del'>-	/* Make sure no one calls ntfs_attr_iget() for indices. */</div><div class='del'>-	BUG_ON(type == AT_INDEX_ALLOCATION);</div><div class='del'>-</div><div class='del'>-	na.mft_no = base_vi-&gt;i_ino;</div><div class='del'>-	na.type = type;</div><div class='del'>-	na.name = name;</div><div class='del'>-	na.name_len = name_len;</div><div class='del'>-</div><div class='del'>-	vi = iget5_locked(base_vi-&gt;i_sb, na.mft_no, ntfs_test_inode,</div><div class='del'>-			ntfs_init_locked_inode, &amp;na);</div><div class='del'>-	if (unlikely(!vi))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-	/* If this is a freshly allocated inode, need to read it now. */</div><div class='del'>-	if (vi-&gt;i_state &amp; I_NEW) {</div><div class='del'>-		err = ntfs_read_locked_attr_inode(base_vi, vi);</div><div class='del'>-		unlock_new_inode(vi);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * There is no point in keeping bad attribute inodes around. This also</div><div class='del'>-	 * simplifies things in that we never need to check for bad attribute</div><div class='del'>-	 * inodes elsewhere.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		iput(vi);</div><div class='del'>-		vi = ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-	return vi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_index_iget - obtain a struct inode corresponding to an index</div><div class='del'>- * @base_vi:	vfs base inode containing the index related attributes</div><div class='del'>- * @name:	Unicode name of the index</div><div class='del'>- * @name_len:	length of @name in Unicode characters</div><div class='del'>- *</div><div class='del'>- * Obtain the (fake) struct inode corresponding to the index specified by @name</div><div class='del'>- * and @name_len, which is present in the base mft record specified by the vfs</div><div class='del'>- * inode @base_vi.</div><div class='del'>- *</div><div class='del'>- * If the index inode is in the cache, it is just returned with an increased</div><div class='del'>- * reference count.  Otherwise, a new struct inode is allocated and</div><div class='del'>- * initialized, and finally ntfs_read_locked_index_inode() is called to read</div><div class='del'>- * the index related attributes and fill in the inode structure.</div><div class='del'>- *</div><div class='del'>- * Return the struct inode of the index inode on success. Check the return</div><div class='del'>- * value with IS_ERR() and if true, the function failed and the error code is</div><div class='del'>- * obtained from PTR_ERR().</div><div class='del'>- */</div><div class='del'>-struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name,</div><div class='del'>-		u32 name_len)</div><div class='del'>-{</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	int err;</div><div class='del'>-	ntfs_attr na;</div><div class='del'>-</div><div class='del'>-	na.mft_no = base_vi-&gt;i_ino;</div><div class='del'>-	na.type = AT_INDEX_ALLOCATION;</div><div class='del'>-	na.name = name;</div><div class='del'>-	na.name_len = name_len;</div><div class='del'>-</div><div class='del'>-	vi = iget5_locked(base_vi-&gt;i_sb, na.mft_no, ntfs_test_inode,</div><div class='del'>-			ntfs_init_locked_inode, &amp;na);</div><div class='del'>-	if (unlikely(!vi))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-	/* If this is a freshly allocated inode, need to read it now. */</div><div class='del'>-	if (vi-&gt;i_state &amp; I_NEW) {</div><div class='del'>-		err = ntfs_read_locked_index_inode(base_vi, vi);</div><div class='del'>-		unlock_new_inode(vi);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * There is no point in keeping bad index inodes around.  This also</div><div class='del'>-	 * simplifies things in that we never need to check for bad index</div><div class='del'>-	 * inodes elsewhere.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		iput(vi);</div><div class='del'>-		vi = ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-	return vi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct inode *ntfs_alloc_big_inode(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	ni = alloc_inode_sb(sb, ntfs_big_inode_cache, GFP_NOFS);</div><div class='del'>-	if (likely(ni != NULL)) {</div><div class='del'>-		ni-&gt;state = 0;</div><div class='del'>-		return VFS_I(ni);</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(sb, "Allocation of NTFS big inode structure failed.");</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ntfs_free_big_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(ntfs_big_inode_cache, NTFS_I(inode));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline ntfs_inode *ntfs_alloc_extent_inode(void)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	ni = kmem_cache_alloc(ntfs_inode_cache, GFP_NOFS);</div><div class='del'>-	if (likely(ni != NULL)) {</div><div class='del'>-		ni-&gt;state = 0;</div><div class='del'>-		return ni;</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(NULL, "Allocation of NTFS inode structure failed.");</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ntfs_destroy_extent_inode(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	BUG_ON(ni-&gt;page);</div><div class='del'>-	if (!atomic_dec_and_test(&amp;ni-&gt;count))</div><div class='del'>-		BUG();</div><div class='del'>-	kmem_cache_free(ntfs_inode_cache, ni);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The attribute runlist lock has separate locking rules from the</div><div class='del'>- * normal runlist lock, so split the two lock-classes:</div><div class='del'>- */</div><div class='del'>-static struct lock_class_key attr_list_rl_lock_class;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_init_inode - initialize ntfs specific part of an inode</div><div class='del'>- * @sb:		super block of mounted volume</div><div class='del'>- * @ni:		freshly allocated ntfs inode which to initialize</div><div class='del'>- *</div><div class='del'>- * Initialize an ntfs inode to defaults.</div><div class='del'>- *</div><div class='del'>- * NOTE: ni-&gt;mft_no, ni-&gt;state, ni-&gt;type, ni-&gt;name, and ni-&gt;name_len are left</div><div class='del'>- * untouched. Make sure to initialize them elsewhere.</div><div class='del'>- *</div><div class='del'>- * Return zero on success and -ENOMEM on error.</div><div class='del'>- */</div><div class='del'>-void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	rwlock_init(&amp;ni-&gt;size_lock);</div><div class='del'>-	ni-&gt;initialized_size = ni-&gt;allocated_size = 0;</div><div class='del'>-	ni-&gt;seq_no = 0;</div><div class='del'>-	atomic_set(&amp;ni-&gt;count, 1);</div><div class='del'>-	ni-&gt;vol = NTFS_SB(sb);</div><div class='del'>-	ntfs_init_runlist(&amp;ni-&gt;runlist);</div><div class='del'>-	mutex_init(&amp;ni-&gt;mrec_lock);</div><div class='del'>-	ni-&gt;page = NULL;</div><div class='del'>-	ni-&gt;page_ofs = 0;</div><div class='del'>-	ni-&gt;attr_list_size = 0;</div><div class='del'>-	ni-&gt;attr_list = NULL;</div><div class='del'>-	ntfs_init_runlist(&amp;ni-&gt;attr_list_rl);</div><div class='del'>-	lockdep_set_class(&amp;ni-&gt;attr_list_rl.lock,</div><div class='del'>-				&amp;attr_list_rl_lock_class);</div><div class='del'>-	ni-&gt;itype.index.block_size = 0;</div><div class='del'>-	ni-&gt;itype.index.vcn_size = 0;</div><div class='del'>-	ni-&gt;itype.index.collation_rule = 0;</div><div class='del'>-	ni-&gt;itype.index.block_size_bits = 0;</div><div class='del'>-	ni-&gt;itype.index.vcn_size_bits = 0;</div><div class='del'>-	mutex_init(&amp;ni-&gt;extent_lock);</div><div class='del'>-	ni-&gt;nr_extents = 0;</div><div class='del'>-	ni-&gt;ext.base_ntfs_ino = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Extent inodes get MFT-mapped in a nested way, while the base inode</div><div class='del'>- * is still mapped. Teach this nesting to the lock validator by creating</div><div class='del'>- * a separate class for nested inode's mrec_lock's:</div><div class='del'>- */</div><div class='del'>-static struct lock_class_key extent_inode_mrec_lock_key;</div><div class='del'>-</div><div class='del'>-inline ntfs_inode *ntfs_new_extent_inode(struct super_block *sb,</div><div class='del'>-		unsigned long mft_no)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni = ntfs_alloc_extent_inode();</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	if (likely(ni != NULL)) {</div><div class='del'>-		__ntfs_init_inode(sb, ni);</div><div class='del'>-		lockdep_set_class(&amp;ni-&gt;mrec_lock, &amp;extent_inode_mrec_lock_key);</div><div class='del'>-		ni-&gt;mft_no = mft_no;</div><div class='del'>-		ni-&gt;type = AT_UNUSED;</div><div class='del'>-		ni-&gt;name = NULL;</div><div class='del'>-		ni-&gt;name_len = 0;</div><div class='del'>-	}</div><div class='del'>-	return ni;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_is_extended_system_file - check if a file is in the $Extend directory</div><div class='del'>- * @ctx:	initialized attribute search context</div><div class='del'>- *</div><div class='del'>- * Search all file name attributes in the inode described by the attribute</div><div class='del'>- * search context @ctx and check if any of the names are in the $Extend system</div><div class='del'>- * directory.</div><div class='del'>- *</div><div class='del'>- * Return values:</div><div class='del'>- *	   1: file is in $Extend directory</div><div class='del'>- *	   0: file is not in $Extend directory</div><div class='del'>- *    -errno: failed to determine if the file is in the $Extend directory</div><div class='del'>- */</div><div class='del'>-static int ntfs_is_extended_system_file(ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	int nr_links, err;</div><div class='del'>-</div><div class='del'>-	/* Restart search. */</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-</div><div class='del'>-	/* Get number of hard links. */</div><div class='del'>-	nr_links = le16_to_cpu(ctx-&gt;mrec-&gt;link_count);</div><div class='del'>-</div><div class='del'>-	/* Loop through all hard links. */</div><div class='del'>-	while (!(err = ntfs_attr_lookup(AT_FILE_NAME, NULL, 0, 0, 0, NULL, 0,</div><div class='del'>-			ctx))) {</div><div class='del'>-		FILE_NAME_ATTR *file_name_attr;</div><div class='del'>-		ATTR_RECORD *attr = ctx-&gt;attr;</div><div class='del'>-		u8 *p, *p2;</div><div class='del'>-</div><div class='del'>-		nr_links--;</div><div class='del'>-		/*</div><div class='del'>-		 * Maximum sanity checking as we are called on an inode that</div><div class='del'>-		 * we suspect might be corrupt.</div><div class='del'>-		 */</div><div class='del'>-		p = (u8*)attr + le32_to_cpu(attr-&gt;length);</div><div class='del'>-		if (p &lt; (u8*)ctx-&gt;mrec || (u8*)p &gt; (u8*)ctx-&gt;mrec +</div><div class='del'>-				le32_to_cpu(ctx-&gt;mrec-&gt;bytes_in_use)) {</div><div class='del'>-err_corrupt_attr:</div><div class='del'>-			ntfs_error(ctx-&gt;ntfs_ino-&gt;vol-&gt;sb, "Corrupt file name "</div><div class='del'>-					"attribute. You should run chkdsk.");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (attr-&gt;non_resident) {</div><div class='del'>-			ntfs_error(ctx-&gt;ntfs_ino-&gt;vol-&gt;sb, "Non-resident file "</div><div class='del'>-					"name. You should run chkdsk.");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (attr-&gt;flags) {</div><div class='del'>-			ntfs_error(ctx-&gt;ntfs_ino-&gt;vol-&gt;sb, "File name with "</div><div class='del'>-					"invalid flags. You should run "</div><div class='del'>-					"chkdsk.");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (!(attr-&gt;data.resident.flags &amp; RESIDENT_ATTR_IS_INDEXED)) {</div><div class='del'>-			ntfs_error(ctx-&gt;ntfs_ino-&gt;vol-&gt;sb, "Unindexed file "</div><div class='del'>-					"name. You should run chkdsk.");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		file_name_attr = (FILE_NAME_ATTR*)((u8*)attr +</div><div class='del'>-				le16_to_cpu(attr-&gt;data.resident.value_offset));</div><div class='del'>-		p2 = (u8 *)file_name_attr + le32_to_cpu(attr-&gt;data.resident.value_length);</div><div class='del'>-		if (p2 &lt; (u8*)attr || p2 &gt; p)</div><div class='del'>-			goto err_corrupt_attr;</div><div class='del'>-		/* This attribute is ok, but is it in the $Extend directory? */</div><div class='del'>-		if (MREF_LE(file_name_attr-&gt;parent_directory) == FILE_Extend)</div><div class='del'>-			return 1;	/* YES, it's an extended system file. */</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(err != -ENOENT))</div><div class='del'>-		return err;</div><div class='del'>-	if (unlikely(nr_links)) {</div><div class='del'>-		ntfs_error(ctx-&gt;ntfs_ino-&gt;vol-&gt;sb, "Inode hard link count "</div><div class='del'>-				"doesn't match number of name attributes. You "</div><div class='del'>-				"should run chkdsk.");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	return 0;	/* NO, it is not an extended system file. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_locked_inode - read an inode from its device</div><div class='del'>- * @vi:		inode to read</div><div class='del'>- *</div><div class='del'>- * ntfs_read_locked_inode() is called from ntfs_iget() to read the inode</div><div class='del'>- * described by @vi into memory from the device.</div><div class='del'>- *</div><div class='del'>- * The only fields in @vi that we need to/can look at when the function is</div><div class='del'>- * called are i_sb, pointing to the mounted device's super block, and i_ino,</div><div class='del'>- * the number of the inode to load.</div><div class='del'>- *</div><div class='del'>- * ntfs_read_locked_inode() maps, pins and locks the mft record number i_ino</div><div class='del'>- * for reading and sets up the necessary @vi fields as well as initializing</div><div class='del'>- * the ntfs inode.</div><div class='del'>- *</div><div class='del'>- * Q: What locks are held when the function is called?</div><div class='del'>- * A: i_state has I_NEW set, hence the inode is locked, also</div><div class='del'>- *    i_count is set to 1, so it is not going to go away</div><div class='del'>- *    i_flags is set to 0 and we have no business touching it.  Only an ioctl()</div><div class='del'>- *    is allowed to write to them. We should of course be honouring them but</div><div class='del'>- *    we need to do that using the IS_* macros defined in include/linux/fs.h.</div><div class='del'>- *    In any case ntfs_read_locked_inode() has nothing to do with i_flags.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  In the error case, the inode will</div><div class='del'>- * have had make_bad_inode() executed on it.</div><div class='del'>- */</div><div class='del'>-static int ntfs_read_locked_inode(struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(vi-&gt;i_sb);</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-	struct inode *bvi;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	STANDARD_INFORMATION *si;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	/* Setup the generic vfs inode parts now. */</div><div class='del'>-	vi-&gt;i_uid = vol-&gt;uid;</div><div class='del'>-	vi-&gt;i_gid = vol-&gt;gid;</div><div class='del'>-	vi-&gt;i_mode = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize the ntfs specific part of @vi special casing</div><div class='del'>-	 * FILE_MFT which we need to do at mount time.</div><div class='del'>-	 */</div><div class='del'>-	if (vi-&gt;i_ino != FILE_MFT)</div><div class='del'>-		ntfs_init_big_inode(vi);</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-</div><div class='del'>-	m = map_mft_record(ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(ni, m);</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(m-&gt;flags &amp; MFT_RECORD_IN_USE)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Inode is not in use!");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (m-&gt;base_mft_record) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Inode is an extent inode!");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Transfer information from mft record into vfs and ntfs inodes. */</div><div class='del'>-	vi-&gt;i_generation = ni-&gt;seq_no = le16_to_cpu(m-&gt;sequence_number);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Keep in mind that link_count is two for files which have both</div><div class='del'>-	 * a long file name and a short file name as separate entries, so if</div><div class='del'>-	 * we are hiding short file names this will be too high. Either we need</div><div class='del'>-	 * to account for the short file names by subtracting them or we need</div><div class='del'>-	 * to make sure we delete files even though i_nlink is not zero which</div><div class='del'>-	 * might be tricky due to vfs interactions. Need to think about this</div><div class='del'>-	 * some more when implementing the unlink command.</div><div class='del'>-	 */</div><div class='del'>-	set_nlink(vi, le16_to_cpu(m-&gt;link_count));</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Reparse points can have the directory bit set even though</div><div class='del'>-	 * they would be S_IFLNK. Need to deal with this further below when we</div><div class='del'>-	 * implement reparse points / symbolic links but it will do for now.</div><div class='del'>-	 * Also if not a directory, it could be something else, rather than</div><div class='del'>-	 * a regular file. But again, will do for now.</div><div class='del'>-	 */</div><div class='del'>-	/* Everyone gets all permissions. */</div><div class='del'>-	vi-&gt;i_mode |= S_IRWXUGO;</div><div class='del'>-	/* If read-only, no one gets write permissions. */</div><div class='del'>-	if (IS_RDONLY(vi))</div><div class='del'>-		vi-&gt;i_mode &amp;= ~S_IWUGO;</div><div class='del'>-	if (m-&gt;flags &amp; MFT_RECORD_IS_DIRECTORY) {</div><div class='del'>-		vi-&gt;i_mode |= S_IFDIR;</div><div class='del'>-		/*</div><div class='del'>-		 * Apply the directory permissions mask set in the mount</div><div class='del'>-		 * options.</div><div class='del'>-		 */</div><div class='del'>-		vi-&gt;i_mode &amp;= ~vol-&gt;dmask;</div><div class='del'>-		/* Things break without this kludge! */</div><div class='del'>-		if (vi-&gt;i_nlink &gt; 1)</div><div class='del'>-			set_nlink(vi, 1);</div><div class='del'>-	} else {</div><div class='del'>-		vi-&gt;i_mode |= S_IFREG;</div><div class='del'>-		/* Apply the file permissions mask set in the mount options. */</div><div class='del'>-		vi-&gt;i_mode &amp;= ~vol-&gt;fmask;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Find the standard information attribute in the mft record. At this</div><div class='del'>-	 * stage we haven't setup the attribute list stuff yet, so this could</div><div class='del'>-	 * in fact fail if the standard information is in an extent record, but</div><div class='del'>-	 * I don't think this actually ever happens.</div><div class='del'>-	 */</div><div class='del'>-	err = ntfs_attr_lookup(AT_STANDARD_INFORMATION, NULL, 0, 0, 0, NULL, 0,</div><div class='del'>-			ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT) {</div><div class='del'>-			/*</div><div class='del'>-			 * TODO: We should be performing a hot fix here (if the</div><div class='del'>-			 * recover mount option is set) by creating a new</div><div class='del'>-			 * attribute.</div><div class='del'>-			 */</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$STANDARD_INFORMATION attribute "</div><div class='del'>-					"is missing.");</div><div class='del'>-		}</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	/* Get the standard information attribute value. */</div><div class='del'>-	if ((u8 *)a + le16_to_cpu(a-&gt;data.resident.value_offset)</div><div class='del'>-			+ le32_to_cpu(a-&gt;data.resident.value_length) &gt;</div><div class='del'>-			(u8 *)ctx-&gt;mrec + vol-&gt;mft_record_size) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Corrupt standard information attribute in inode.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	si = (STANDARD_INFORMATION*)((u8*)a +</div><div class='del'>-			le16_to_cpu(a-&gt;data.resident.value_offset));</div><div class='del'>-</div><div class='del'>-	/* Transfer information from the standard information into vi. */</div><div class='del'>-	/*</div><div class='del'>-	 * Note: The i_?times do not quite map perfectly onto the NTFS times,</div><div class='del'>-	 * but they are close enough, and in the end it doesn't really matter</div><div class='del'>-	 * that much...</div><div class='del'>-	 */</div><div class='del'>-	/*</div><div class='del'>-	 * mtime is the last change of the data within the file. Not changed</div><div class='del'>-	 * when only metadata is changed, e.g. a rename doesn't affect mtime.</div><div class='del'>-	 */</div><div class='del'>-	inode_set_mtime_to_ts(vi, ntfs2utc(si-&gt;last_data_change_time));</div><div class='del'>-	/*</div><div class='del'>-	 * ctime is the last change of the metadata of the file. This obviously</div><div class='del'>-	 * always changes, when mtime is changed. ctime can be changed on its</div><div class='del'>-	 * own, mtime is then not changed, e.g. when a file is renamed.</div><div class='del'>-	 */</div><div class='del'>-	inode_set_ctime_to_ts(vi, ntfs2utc(si-&gt;last_mft_change_time));</div><div class='del'>-	/*</div><div class='del'>-	 * Last access to the data within the file. Not changed during a rename</div><div class='del'>-	 * for example but changed whenever the file is written to.</div><div class='del'>-	 */</div><div class='del'>-	inode_set_atime_to_ts(vi, ntfs2utc(si-&gt;last_access_time));</div><div class='del'>-</div><div class='del'>-	/* Find the attribute list attribute if present. */</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-	err = ntfs_attr_lookup(AT_ATTRIBUTE_LIST, NULL, 0, 0, 0, NULL, 0, ctx);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (unlikely(err != -ENOENT)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Failed to lookup attribute list "</div><div class='del'>-					"attribute.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-	} else /* if (!err) */ {</div><div class='del'>-		if (vi-&gt;i_ino == FILE_MFT)</div><div class='del'>-			goto skip_attr_list_load;</div><div class='del'>-		ntfs_debug("Attribute list found in inode 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-		NInoSetAttrList(ni);</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Attribute list attribute is "</div><div class='del'>-					"compressed.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED ||</div><div class='del'>-				a-&gt;flags &amp; ATTR_IS_SPARSE) {</div><div class='del'>-			if (a-&gt;non_resident) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Non-resident attribute "</div><div class='del'>-						"list attribute is encrypted/"</div><div class='del'>-						"sparse.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			ntfs_warning(vi-&gt;i_sb, "Resident attribute list "</div><div class='del'>-					"attribute in inode 0x%lx is marked "</div><div class='del'>-					"encrypted/sparse which is not true.  "</div><div class='del'>-					"However, Windows allows this and "</div><div class='del'>-					"chkdsk does not detect or correct it "</div><div class='del'>-					"so we will just ignore the invalid "</div><div class='del'>-					"flags and pretend they are not set.",</div><div class='del'>-					vi-&gt;i_ino);</div><div class='del'>-		}</div><div class='del'>-		/* Now allocate memory for the attribute list. */</div><div class='del'>-		ni-&gt;attr_list_size = (u32)ntfs_attr_size(a);</div><div class='del'>-		ni-&gt;attr_list = ntfs_malloc_nofs(ni-&gt;attr_list_size);</div><div class='del'>-		if (!ni-&gt;attr_list) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Not enough memory to allocate "</div><div class='del'>-					"buffer for attribute list.");</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;non_resident) {</div><div class='del'>-			NInoSetAttrListNonResident(ni);</div><div class='del'>-			if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Attribute list has non "</div><div class='del'>-						"zero lowest_vcn.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * Setup the runlist. No need for locking as we have</div><div class='del'>-			 * exclusive access to the inode at this time.</div><div class='del'>-			 */</div><div class='del'>-			ni-&gt;attr_list_rl.rl = ntfs_mapping_pairs_decompress(vol,</div><div class='del'>-					a, NULL);</div><div class='del'>-			if (IS_ERR(ni-&gt;attr_list_rl.rl)) {</div><div class='del'>-				err = PTR_ERR(ni-&gt;attr_list_rl.rl);</div><div class='del'>-				ni-&gt;attr_list_rl.rl = NULL;</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Mapping pairs "</div><div class='del'>-						"decompression failed.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Now load the attribute list. */</div><div class='del'>-			if ((err = load_attribute_list(vol, &amp;ni-&gt;attr_list_rl,</div><div class='del'>-					ni-&gt;attr_list, ni-&gt;attr_list_size,</div><div class='del'>-					sle64_to_cpu(a-&gt;data.non_resident.</div><div class='del'>-					initialized_size)))) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Failed to load "</div><div class='del'>-						"attribute list attribute.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-		} else /* if (!a-&gt;non_resident) */ {</div><div class='del'>-			if ((u8*)a + le16_to_cpu(a-&gt;data.resident.value_offset)</div><div class='del'>-					+ le32_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_length) &gt;</div><div class='del'>-					(u8*)ctx-&gt;mrec + vol-&gt;mft_record_size) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Corrupt attribute list "</div><div class='del'>-						"in inode.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Now copy the attribute list. */</div><div class='del'>-			memcpy(ni-&gt;attr_list, (u8*)a + le16_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_offset),</div><div class='del'>-					le32_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_length));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-skip_attr_list_load:</div><div class='del'>-	/*</div><div class='del'>-	 * If an attribute list is present we now have the attribute list value</div><div class='del'>-	 * in ntfs_ino-&gt;attr_list and it is ntfs_ino-&gt;attr_list_size bytes.</div><div class='del'>-	 */</div><div class='del'>-	if (S_ISDIR(vi-&gt;i_mode)) {</div><div class='del'>-		loff_t bvi_size;</div><div class='del'>-		ntfs_inode *bni;</div><div class='del'>-		INDEX_ROOT *ir;</div><div class='del'>-		u8 *ir_end, *index_end;</div><div class='del'>-</div><div class='del'>-		/* It is a directory, find index root attribute. */</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		err = ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE,</div><div class='del'>-				0, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (err == -ENOENT) {</div><div class='del'>-				// FIXME: File is corrupt! Hot-fix with empty</div><div class='del'>-				// index root attribute if recovery option is</div><div class='del'>-				// set.</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "$INDEX_ROOT attribute "</div><div class='del'>-						"is missing.");</div><div class='del'>-			}</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		/* Set up the state. */</div><div class='del'>-		if (unlikely(a-&gt;non_resident)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "$INDEX_ROOT attribute is not "</div><div class='del'>-					"resident.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* Ensure the attribute name is placed before the value. */</div><div class='del'>-		if (unlikely(a-&gt;name_length &amp;&amp; (le16_to_cpu(a-&gt;name_offset) &gt;=</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset)))) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "$INDEX_ROOT attribute name is "</div><div class='del'>-					"placed after the attribute value.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Compressed/encrypted index root just means that the newly</div><div class='del'>-		 * created files in that directory should be created compressed/</div><div class='del'>-		 * encrypted. However index root cannot be both compressed and</div><div class='del'>-		 * encrypted.</div><div class='del'>-		 */</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK)</div><div class='del'>-			NInoSetCompressed(ni);</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED) {</div><div class='del'>-			if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Found encrypted and "</div><div class='del'>-						"compressed attribute.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			NInoSetEncrypted(ni);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_SPARSE)</div><div class='del'>-			NInoSetSparse(ni);</div><div class='del'>-		ir = (INDEX_ROOT*)((u8*)a +</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset));</div><div class='del'>-		ir_end = (u8*)ir + le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-		if (ir_end &gt; (u8*)ctx-&gt;mrec + vol-&gt;mft_record_size) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ROOT attribute is "</div><div class='del'>-					"corrupt.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		index_end = (u8*)&amp;ir-&gt;index +</div><div class='del'>-				le32_to_cpu(ir-&gt;index.index_length);</div><div class='del'>-		if (index_end &gt; ir_end) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Directory index is corrupt.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (ir-&gt;type != AT_FILE_NAME) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Indexed attribute is not "</div><div class='del'>-					"$FILE_NAME.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (ir-&gt;collation_rule != COLLATION_FILE_NAME) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Index collation rule is not "</div><div class='del'>-					"COLLATION_FILE_NAME.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		ni-&gt;itype.index.collation_rule = ir-&gt;collation_rule;</div><div class='del'>-		ni-&gt;itype.index.block_size = le32_to_cpu(ir-&gt;index_block_size);</div><div class='del'>-		if (ni-&gt;itype.index.block_size &amp;</div><div class='del'>-				(ni-&gt;itype.index.block_size - 1)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Index block size (%u) is not a "</div><div class='del'>-					"power of two.",</div><div class='del'>-					ni-&gt;itype.index.block_size);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (ni-&gt;itype.index.block_size &gt; PAGE_SIZE) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Index block size (%u) &gt; "</div><div class='del'>-					"PAGE_SIZE (%ld) is not "</div><div class='del'>-					"supported.  Sorry.",</div><div class='del'>-					ni-&gt;itype.index.block_size,</div><div class='del'>-					PAGE_SIZE);</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (ni-&gt;itype.index.block_size &lt; NTFS_BLOCK_SIZE) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Index block size (%u) &lt; "</div><div class='del'>-					"NTFS_BLOCK_SIZE (%i) is not "</div><div class='del'>-					"supported.  Sorry.",</div><div class='del'>-					ni-&gt;itype.index.block_size,</div><div class='del'>-					NTFS_BLOCK_SIZE);</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		ni-&gt;itype.index.block_size_bits =</div><div class='del'>-				ffs(ni-&gt;itype.index.block_size) - 1;</div><div class='del'>-		/* Determine the size of a vcn in the directory index. */</div><div class='del'>-		if (vol-&gt;cluster_size &lt;= ni-&gt;itype.index.block_size) {</div><div class='del'>-			ni-&gt;itype.index.vcn_size = vol-&gt;cluster_size;</div><div class='del'>-			ni-&gt;itype.index.vcn_size_bits = vol-&gt;cluster_size_bits;</div><div class='del'>-		} else {</div><div class='del'>-			ni-&gt;itype.index.vcn_size = vol-&gt;sector_size;</div><div class='del'>-			ni-&gt;itype.index.vcn_size_bits = vol-&gt;sector_size_bits;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Setup the index allocation attribute, even if not present. */</div><div class='del'>-		NInoSetMstProtected(ni);</div><div class='del'>-		ni-&gt;type = AT_INDEX_ALLOCATION;</div><div class='del'>-		ni-&gt;name = I30;</div><div class='del'>-		ni-&gt;name_len = 4;</div><div class='del'>-</div><div class='del'>-		if (!(ir-&gt;index.flags &amp; LARGE_INDEX)) {</div><div class='del'>-			/* No index allocation. */</div><div class='del'>-			vi-&gt;i_size = ni-&gt;initialized_size =</div><div class='del'>-					ni-&gt;allocated_size = 0;</div><div class='del'>-			/* We are done with the mft record, so we release it. */</div><div class='del'>-			ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-			unmap_mft_record(ni);</div><div class='del'>-			m = NULL;</div><div class='del'>-			ctx = NULL;</div><div class='del'>-			goto skip_large_dir_stuff;</div><div class='del'>-		} /* LARGE_INDEX: Index allocation present. Setup state. */</div><div class='del'>-		NInoSetIndexAllocPresent(ni);</div><div class='del'>-		/* Find index allocation attribute. */</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		err = ntfs_attr_lookup(AT_INDEX_ALLOCATION, I30, 4,</div><div class='del'>-				CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (err == -ENOENT)</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION "</div><div class='del'>-						"attribute is not present but "</div><div class='del'>-						"$INDEX_ROOT indicated it is.");</div><div class='del'>-			else</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Failed to lookup "</div><div class='del'>-						"$INDEX_ALLOCATION "</div><div class='del'>-						"attribute.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		if (!a-&gt;non_resident) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute "</div><div class='del'>-					"is resident.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Ensure the attribute name is placed before the mapping pairs</div><div class='del'>-		 * array.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(a-&gt;name_length &amp;&amp; (le16_to_cpu(a-&gt;name_offset) &gt;=</div><div class='del'>-				le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset)))) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "$INDEX_ALLOCATION attribute name "</div><div class='del'>-					"is placed after the mapping pairs "</div><div class='del'>-					"array.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute "</div><div class='del'>-					"is encrypted.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_SPARSE) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute "</div><div class='del'>-					"is sparse.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute "</div><div class='del'>-					"is compressed.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "First extent of "</div><div class='del'>-					"$INDEX_ALLOCATION attribute has non "</div><div class='del'>-					"zero lowest_vcn.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		vi-&gt;i_size = sle64_to_cpu(a-&gt;data.non_resident.data_size);</div><div class='del'>-		ni-&gt;initialized_size = sle64_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.initialized_size);</div><div class='del'>-		ni-&gt;allocated_size = sle64_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.allocated_size);</div><div class='del'>-		/*</div><div class='del'>-		 * We are done with the mft record, so we release it. Otherwise</div><div class='del'>-		 * we would deadlock in ntfs_attr_iget().</div><div class='del'>-		 */</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		/* Get the index bitmap attribute inode. */</div><div class='del'>-		bvi = ntfs_attr_iget(vi, AT_BITMAP, I30, 4);</div><div class='del'>-		if (IS_ERR(bvi)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Failed to get bitmap attribute.");</div><div class='del'>-			err = PTR_ERR(bvi);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		bni = NTFS_I(bvi);</div><div class='del'>-		if (NInoCompressed(bni) || NInoEncrypted(bni) ||</div><div class='del'>-				NInoSparse(bni)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$BITMAP attribute is compressed "</div><div class='del'>-					"and/or encrypted and/or sparse.");</div><div class='del'>-			goto iput_unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* Consistency check bitmap size vs. index allocation size. */</div><div class='del'>-		bvi_size = i_size_read(bvi);</div><div class='del'>-		if ((bvi_size &lt;&lt; 3) &lt; (vi-&gt;i_size &gt;&gt;</div><div class='del'>-				ni-&gt;itype.index.block_size_bits)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Index bitmap too small (0x%llx) "</div><div class='del'>-					"for index allocation (0x%llx).",</div><div class='del'>-					bvi_size &lt;&lt; 3, vi-&gt;i_size);</div><div class='del'>-			goto iput_unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* No longer need the bitmap attribute inode. */</div><div class='del'>-		iput(bvi);</div><div class='del'>-skip_large_dir_stuff:</div><div class='del'>-		/* Setup the operations for this inode. */</div><div class='del'>-		vi-&gt;i_op = &amp;ntfs_dir_inode_ops;</div><div class='del'>-		vi-&gt;i_fop = &amp;ntfs_dir_ops;</div><div class='del'>-		vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_mst_aops;</div><div class='del'>-	} else {</div><div class='del'>-		/* It is a file. */</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-</div><div class='del'>-		/* Setup the data attribute, even if not present. */</div><div class='del'>-		ni-&gt;type = AT_DATA;</div><div class='del'>-		ni-&gt;name = NULL;</div><div class='del'>-		ni-&gt;name_len = 0;</div><div class='del'>-</div><div class='del'>-		/* Find first extent of the unnamed data attribute. */</div><div class='del'>-		err = ntfs_attr_lookup(AT_DATA, NULL, 0, 0, 0, NULL, 0, ctx);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			vi-&gt;i_size = ni-&gt;initialized_size =</div><div class='del'>-					ni-&gt;allocated_size = 0;</div><div class='del'>-			if (err != -ENOENT) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Failed to lookup $DATA "</div><div class='del'>-						"attribute.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * FILE_Secure does not have an unnamed $DATA</div><div class='del'>-			 * attribute, so we special case it here.</div><div class='del'>-			 */</div><div class='del'>-			if (vi-&gt;i_ino == FILE_Secure)</div><div class='del'>-				goto no_data_attr_special_case;</div><div class='del'>-			/*</div><div class='del'>-			 * Most if not all the system files in the $Extend</div><div class='del'>-			 * system directory do not have unnamed data</div><div class='del'>-			 * attributes so we need to check if the parent</div><div class='del'>-			 * directory of the file is FILE_Extend and if it is</div><div class='del'>-			 * ignore this error. To do this we need to get the</div><div class='del'>-			 * name of this inode from the mft record as the name</div><div class='del'>-			 * contains the back reference to the parent directory.</div><div class='del'>-			 */</div><div class='del'>-			if (ntfs_is_extended_system_file(ctx) &gt; 0)</div><div class='del'>-				goto no_data_attr_special_case;</div><div class='del'>-			// FIXME: File is corrupt! Hot-fix with empty data</div><div class='del'>-			// attribute if recovery option is set.</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$DATA attribute is missing.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		/* Setup the state. */</div><div class='del'>-		if (a-&gt;flags &amp; (ATTR_COMPRESSION_MASK | ATTR_IS_SPARSE)) {</div><div class='del'>-			if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-				NInoSetCompressed(ni);</div><div class='del'>-				if (vol-&gt;cluster_size &gt; 4096) {</div><div class='del'>-					ntfs_error(vi-&gt;i_sb, "Found "</div><div class='del'>-							"compressed data but "</div><div class='del'>-							"compression is "</div><div class='del'>-							"disabled due to "</div><div class='del'>-							"cluster size (%i) &gt; "</div><div class='del'>-							"4kiB.",</div><div class='del'>-							vol-&gt;cluster_size);</div><div class='del'>-					goto unm_err_out;</div><div class='del'>-				}</div><div class='del'>-				if ((a-&gt;flags &amp; ATTR_COMPRESSION_MASK)</div><div class='del'>-						!= ATTR_IS_COMPRESSED) {</div><div class='del'>-					ntfs_error(vi-&gt;i_sb, "Found unknown "</div><div class='del'>-							"compression method "</div><div class='del'>-							"or corrupt file.");</div><div class='del'>-					goto unm_err_out;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (a-&gt;flags &amp; ATTR_IS_SPARSE)</div><div class='del'>-				NInoSetSparse(ni);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED) {</div><div class='del'>-			if (NInoCompressed(ni)) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Found encrypted and "</div><div class='del'>-						"compressed data.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			NInoSetEncrypted(ni);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;non_resident) {</div><div class='del'>-			NInoSetNonResident(ni);</div><div class='del'>-			if (NInoCompressed(ni) || NInoSparse(ni)) {</div><div class='del'>-				if (NInoCompressed(ni) &amp;&amp; a-&gt;data.non_resident.</div><div class='del'>-						compression_unit != 4) {</div><div class='del'>-					ntfs_error(vi-&gt;i_sb, "Found "</div><div class='del'>-							"non-standard "</div><div class='del'>-							"compression unit (%u "</div><div class='del'>-							"instead of 4).  "</div><div class='del'>-							"Cannot handle this.",</div><div class='del'>-							a-&gt;data.non_resident.</div><div class='del'>-							compression_unit);</div><div class='del'>-					err = -EOPNOTSUPP;</div><div class='del'>-					goto unm_err_out;</div><div class='del'>-				}</div><div class='del'>-				if (a-&gt;data.non_resident.compression_unit) {</div><div class='del'>-					ni-&gt;itype.compressed.block_size = 1U &lt;&lt;</div><div class='del'>-							(a-&gt;data.non_resident.</div><div class='del'>-							compression_unit +</div><div class='del'>-							vol-&gt;cluster_size_bits);</div><div class='del'>-					ni-&gt;itype.compressed.block_size_bits =</div><div class='del'>-							ffs(ni-&gt;itype.</div><div class='del'>-							compressed.</div><div class='del'>-							block_size) - 1;</div><div class='del'>-					ni-&gt;itype.compressed.block_clusters =</div><div class='del'>-							1U &lt;&lt; a-&gt;data.</div><div class='del'>-							non_resident.</div><div class='del'>-							compression_unit;</div><div class='del'>-				} else {</div><div class='del'>-					ni-&gt;itype.compressed.block_size = 0;</div><div class='del'>-					ni-&gt;itype.compressed.block_size_bits =</div><div class='del'>-							0;</div><div class='del'>-					ni-&gt;itype.compressed.block_clusters =</div><div class='del'>-							0;</div><div class='del'>-				}</div><div class='del'>-				ni-&gt;itype.compressed.size = sle64_to_cpu(</div><div class='del'>-						a-&gt;data.non_resident.</div><div class='del'>-						compressed_size);</div><div class='del'>-			}</div><div class='del'>-			if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "First extent of $DATA "</div><div class='del'>-						"attribute has non zero "</div><div class='del'>-						"lowest_vcn.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			vi-&gt;i_size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.data_size);</div><div class='del'>-			ni-&gt;initialized_size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.initialized_size);</div><div class='del'>-			ni-&gt;allocated_size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.allocated_size);</div><div class='del'>-		} else { /* Resident attribute. */</div><div class='del'>-			vi-&gt;i_size = ni-&gt;initialized_size = le32_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_length);</div><div class='del'>-			ni-&gt;allocated_size = le32_to_cpu(a-&gt;length) -</div><div class='del'>-					le16_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_offset);</div><div class='del'>-			if (vi-&gt;i_size &gt; ni-&gt;allocated_size) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Resident data attribute "</div><div class='del'>-						"is corrupt (size exceeds "</div><div class='del'>-						"allocation).");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-no_data_attr_special_case:</div><div class='del'>-		/* We are done with the mft record, so we release it. */</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		/* Setup the operations for this inode. */</div><div class='del'>-		vi-&gt;i_op = &amp;ntfs_file_inode_ops;</div><div class='del'>-		vi-&gt;i_fop = &amp;ntfs_file_ops;</div><div class='del'>-		vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_normal_aops;</div><div class='del'>-		if (NInoMstProtected(ni))</div><div class='del'>-			vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_mst_aops;</div><div class='del'>-		else if (NInoCompressed(ni))</div><div class='del'>-			vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_compressed_aops;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The number of 512-byte blocks used on disk (for stat). This is in so</div><div class='del'>-	 * far inaccurate as it doesn't account for any named streams or other</div><div class='del'>-	 * special non-resident attributes, but that is how Windows works, too,</div><div class='del'>-	 * so we are at least consistent with Windows, if not entirely</div><div class='del'>-	 * consistent with the Linux Way. Doing it the Linux Way would cause a</div><div class='del'>-	 * significant slowdown as it would involve iterating over all</div><div class='del'>-	 * attributes in the mft record and adding the allocated/compressed</div><div class='del'>-	 * sizes of all non-resident attributes present to give us the Linux</div><div class='del'>-	 * correct size that should go into i_blocks (after division by 512).</div><div class='del'>-	 */</div><div class='del'>-	if (S_ISREG(vi-&gt;i_mode) &amp;&amp; (NInoCompressed(ni) || NInoSparse(ni)))</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;itype.compressed.size &gt;&gt; 9;</div><div class='del'>-	else</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;allocated_size &gt;&gt; 9;</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-iput_unm_err_out:</div><div class='del'>-	iput(bvi);</div><div class='del'>-unm_err_out:</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed with error code %i.  Marking corrupt "</div><div class='del'>-			"inode 0x%lx as bad.  Run chkdsk.", err, vi-&gt;i_ino);</div><div class='del'>-	make_bad_inode(vi);</div><div class='del'>-	if (err != -EOPNOTSUPP &amp;&amp; err != -ENOMEM)</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_locked_attr_inode - read an attribute inode from its base inode</div><div class='del'>- * @base_vi:	base inode</div><div class='del'>- * @vi:		attribute inode to read</div><div class='del'>- *</div><div class='del'>- * ntfs_read_locked_attr_inode() is called from ntfs_attr_iget() to read the</div><div class='del'>- * attribute inode described by @vi into memory from the base mft record</div><div class='del'>- * described by @base_ni.</div><div class='del'>- *</div><div class='del'>- * ntfs_read_locked_attr_inode() maps, pins and locks the base inode for</div><div class='del'>- * reading and looks up the attribute described by @vi before setting up the</div><div class='del'>- * necessary fields in @vi as well as initializing the ntfs inode.</div><div class='del'>- *</div><div class='del'>- * Q: What locks are held when the function is called?</div><div class='del'>- * A: i_state has I_NEW set, hence the inode is locked, also</div><div class='del'>- *    i_count is set to 1, so it is not going to go away</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  In the error case, the inode will</div><div class='del'>- * have had make_bad_inode() executed on it.</div><div class='del'>- *</div><div class='del'>- * Note this cannot be called for AT_INDEX_ALLOCATION.</div><div class='del'>- */</div><div class='del'>-static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(vi-&gt;i_sb);</div><div class='del'>-	ntfs_inode *ni, *base_ni;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	ntfs_init_big_inode(vi);</div><div class='del'>-</div><div class='del'>-	ni	= NTFS_I(vi);</div><div class='del'>-	base_ni = NTFS_I(base_vi);</div><div class='del'>-</div><div class='del'>-	/* Just mirror the values from the base inode. */</div><div class='del'>-	vi-&gt;i_uid	= base_vi-&gt;i_uid;</div><div class='del'>-	vi-&gt;i_gid	= base_vi-&gt;i_gid;</div><div class='del'>-	set_nlink(vi, base_vi-&gt;i_nlink);</div><div class='del'>-	inode_set_mtime_to_ts(vi, inode_get_mtime(base_vi));</div><div class='del'>-	inode_set_ctime_to_ts(vi, inode_get_ctime(base_vi));</div><div class='del'>-	inode_set_atime_to_ts(vi, inode_get_atime(base_vi));</div><div class='del'>-	vi-&gt;i_generation = ni-&gt;seq_no = base_ni-&gt;seq_no;</div><div class='del'>-</div><div class='del'>-	/* Set inode type to zero but preserve permissions. */</div><div class='del'>-	vi-&gt;i_mode	= base_vi-&gt;i_mode &amp; ~S_IFMT;</div><div class='del'>-</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Find the attribute. */</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	if (a-&gt;flags &amp; (ATTR_COMPRESSION_MASK | ATTR_IS_SPARSE)) {</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-			NInoSetCompressed(ni);</div><div class='del'>-			if ((ni-&gt;type != AT_DATA) || (ni-&gt;type == AT_DATA &amp;&amp;</div><div class='del'>-					ni-&gt;name_len)) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Found compressed "</div><div class='del'>-						"non-data or named data "</div><div class='del'>-						"attribute.  Please report "</div><div class='del'>-						"you saw this message to "</div><div class='del'>-						"linux-ntfs-dev@lists."</div><div class='del'>-						"sourceforge.net");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			if (vol-&gt;cluster_size &gt; 4096) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Found compressed "</div><div class='del'>-						"attribute but compression is "</div><div class='del'>-						"disabled due to cluster size "</div><div class='del'>-						"(%i) &gt; 4kiB.",</div><div class='del'>-						vol-&gt;cluster_size);</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			if ((a-&gt;flags &amp; ATTR_COMPRESSION_MASK) !=</div><div class='del'>-					ATTR_IS_COMPRESSED) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Found unknown "</div><div class='del'>-						"compression method.");</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The compressed/sparse flag set in an index root just means</div><div class='del'>-		 * to compress all files.</div><div class='del'>-		 */</div><div class='del'>-		if (NInoMstProtected(ni) &amp;&amp; ni-&gt;type != AT_INDEX_ROOT) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Found mst protected attribute "</div><div class='del'>-					"but the attribute is %s.  Please "</div><div class='del'>-					"report you saw this message to "</div><div class='del'>-					"linux-ntfs-dev@lists.sourceforge.net",</div><div class='del'>-					NInoCompressed(ni) ? "compressed" :</div><div class='del'>-					"sparse");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_SPARSE)</div><div class='del'>-			NInoSetSparse(ni);</div><div class='del'>-	}</div><div class='del'>-	if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED) {</div><div class='del'>-		if (NInoCompressed(ni)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Found encrypted and compressed "</div><div class='del'>-					"data.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The encryption flag set in an index root just means to</div><div class='del'>-		 * encrypt all files.</div><div class='del'>-		 */</div><div class='del'>-		if (NInoMstProtected(ni) &amp;&amp; ni-&gt;type != AT_INDEX_ROOT) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Found mst protected attribute "</div><div class='del'>-					"but the attribute is encrypted.  "</div><div class='del'>-					"Please report you saw this message "</div><div class='del'>-					"to linux-ntfs-dev@lists.sourceforge."</div><div class='del'>-					"net");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (ni-&gt;type != AT_DATA) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Found encrypted non-data "</div><div class='del'>-					"attribute.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		NInoSetEncrypted(ni);</div><div class='del'>-	}</div><div class='del'>-	if (!a-&gt;non_resident) {</div><div class='del'>-		/* Ensure the attribute name is placed before the value. */</div><div class='del'>-		if (unlikely(a-&gt;name_length &amp;&amp; (le16_to_cpu(a-&gt;name_offset) &gt;=</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset)))) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Attribute name is placed after "</div><div class='del'>-					"the attribute value.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (NInoMstProtected(ni)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Found mst protected attribute "</div><div class='del'>-					"but the attribute is resident.  "</div><div class='del'>-					"Please report you saw this message to "</div><div class='del'>-					"linux-ntfs-dev@lists.sourceforge.net");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		vi-&gt;i_size = ni-&gt;initialized_size = le32_to_cpu(</div><div class='del'>-				a-&gt;data.resident.value_length);</div><div class='del'>-		ni-&gt;allocated_size = le32_to_cpu(a-&gt;length) -</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset);</div><div class='del'>-		if (vi-&gt;i_size &gt; ni-&gt;allocated_size) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Resident attribute is corrupt "</div><div class='del'>-					"(size exceeds allocation).");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		NInoSetNonResident(ni);</div><div class='del'>-		/*</div><div class='del'>-		 * Ensure the attribute name is placed before the mapping pairs</div><div class='del'>-		 * array.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(a-&gt;name_length &amp;&amp; (le16_to_cpu(a-&gt;name_offset) &gt;=</div><div class='del'>-				le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset)))) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Attribute name is placed after "</div><div class='del'>-					"the mapping pairs array.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (NInoCompressed(ni) || NInoSparse(ni)) {</div><div class='del'>-			if (NInoCompressed(ni) &amp;&amp; a-&gt;data.non_resident.</div><div class='del'>-					compression_unit != 4) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Found non-standard "</div><div class='del'>-						"compression unit (%u instead "</div><div class='del'>-						"of 4).  Cannot handle this.",</div><div class='del'>-						a-&gt;data.non_resident.</div><div class='del'>-						compression_unit);</div><div class='del'>-				err = -EOPNOTSUPP;</div><div class='del'>-				goto unm_err_out;</div><div class='del'>-			}</div><div class='del'>-			if (a-&gt;data.non_resident.compression_unit) {</div><div class='del'>-				ni-&gt;itype.compressed.block_size = 1U &lt;&lt;</div><div class='del'>-						(a-&gt;data.non_resident.</div><div class='del'>-						compression_unit +</div><div class='del'>-						vol-&gt;cluster_size_bits);</div><div class='del'>-				ni-&gt;itype.compressed.block_size_bits =</div><div class='del'>-						ffs(ni-&gt;itype.compressed.</div><div class='del'>-						block_size) - 1;</div><div class='del'>-				ni-&gt;itype.compressed.block_clusters = 1U &lt;&lt;</div><div class='del'>-						a-&gt;data.non_resident.</div><div class='del'>-						compression_unit;</div><div class='del'>-			} else {</div><div class='del'>-				ni-&gt;itype.compressed.block_size = 0;</div><div class='del'>-				ni-&gt;itype.compressed.block_size_bits = 0;</div><div class='del'>-				ni-&gt;itype.compressed.block_clusters = 0;</div><div class='del'>-			}</div><div class='del'>-			ni-&gt;itype.compressed.size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.compressed_size);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "First extent of attribute has "</div><div class='del'>-					"non-zero lowest_vcn.");</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		vi-&gt;i_size = sle64_to_cpu(a-&gt;data.non_resident.data_size);</div><div class='del'>-		ni-&gt;initialized_size = sle64_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.initialized_size);</div><div class='del'>-		ni-&gt;allocated_size = sle64_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.allocated_size);</div><div class='del'>-	}</div><div class='del'>-	vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_normal_aops;</div><div class='del'>-	if (NInoMstProtected(ni))</div><div class='del'>-		vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_mst_aops;</div><div class='del'>-	else if (NInoCompressed(ni))</div><div class='del'>-		vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_compressed_aops;</div><div class='del'>-	if ((NInoCompressed(ni) || NInoSparse(ni)) &amp;&amp; ni-&gt;type != AT_INDEX_ROOT)</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;itype.compressed.size &gt;&gt; 9;</div><div class='del'>-	else</div><div class='del'>-		vi-&gt;i_blocks = ni-&gt;allocated_size &gt;&gt; 9;</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the base inode does not go away and attach it to the</div><div class='del'>-	 * attribute inode.</div><div class='del'>-	 */</div><div class='del'>-	igrab(base_vi);</div><div class='del'>-	ni-&gt;ext.base_ntfs_ino = base_ni;</div><div class='del'>-	ni-&gt;nr_extents = -1;</div><div class='del'>-</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unm_err_out:</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed with error code %i while reading attribute "</div><div class='del'>-			"inode (mft_no 0x%lx, type 0x%x, name_len %i).  "</div><div class='del'>-			"Marking corrupt inode and base inode 0x%lx as bad.  "</div><div class='del'>-			"Run chkdsk.", err, vi-&gt;i_ino, ni-&gt;type, ni-&gt;name_len,</div><div class='del'>-			base_vi-&gt;i_ino);</div><div class='del'>-	make_bad_inode(vi);</div><div class='del'>-	if (err != -ENOMEM)</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_locked_index_inode - read an index inode from its base inode</div><div class='del'>- * @base_vi:	base inode</div><div class='del'>- * @vi:		index inode to read</div><div class='del'>- *</div><div class='del'>- * ntfs_read_locked_index_inode() is called from ntfs_index_iget() to read the</div><div class='del'>- * index inode described by @vi into memory from the base mft record described</div><div class='del'>- * by @base_ni.</div><div class='del'>- *</div><div class='del'>- * ntfs_read_locked_index_inode() maps, pins and locks the base inode for</div><div class='del'>- * reading and looks up the attributes relating to the index described by @vi</div><div class='del'>- * before setting up the necessary fields in @vi as well as initializing the</div><div class='del'>- * ntfs inode.</div><div class='del'>- *</div><div class='del'>- * Note, index inodes are essentially attribute inodes (NInoAttr() is true)</div><div class='del'>- * with the attribute type set to AT_INDEX_ALLOCATION.  Apart from that, they</div><div class='del'>- * are setup like directory inodes since directories are a special case of</div><div class='del'>- * indices ao they need to be treated in much the same way.  Most importantly,</div><div class='del'>- * for small indices the index allocation attribute might not actually exist.</div><div class='del'>- * However, the index root attribute always exists but this does not need to</div><div class='del'>- * have an inode associated with it and this is why we define a new inode type</div><div class='del'>- * index.  Also, like for directories, we need to have an attribute inode for</div><div class='del'>- * the bitmap attribute corresponding to the index allocation attribute and we</div><div class='del'>- * can store this in the appropriate field of the inode, just like we do for</div><div class='del'>- * normal directory inodes.</div><div class='del'>- *</div><div class='del'>- * Q: What locks are held when the function is called?</div><div class='del'>- * A: i_state has I_NEW set, hence the inode is locked, also</div><div class='del'>- *    i_count is set to 1, so it is not going to go away</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  In the error case, the inode will</div><div class='del'>- * have had make_bad_inode() executed on it.</div><div class='del'>- */</div><div class='del'>-static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	loff_t bvi_size;</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(vi-&gt;i_sb);</div><div class='del'>-	ntfs_inode *ni, *base_ni, *bni;</div><div class='del'>-	struct inode *bvi;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	INDEX_ROOT *ir;</div><div class='del'>-	u8 *ir_end, *index_end;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-	ntfs_init_big_inode(vi);</div><div class='del'>-	ni	= NTFS_I(vi);</div><div class='del'>-	base_ni = NTFS_I(base_vi);</div><div class='del'>-	/* Just mirror the values from the base inode. */</div><div class='del'>-	vi-&gt;i_uid	= base_vi-&gt;i_uid;</div><div class='del'>-	vi-&gt;i_gid	= base_vi-&gt;i_gid;</div><div class='del'>-	set_nlink(vi, base_vi-&gt;i_nlink);</div><div class='del'>-	inode_set_mtime_to_ts(vi, inode_get_mtime(base_vi));</div><div class='del'>-	inode_set_ctime_to_ts(vi, inode_get_ctime(base_vi));</div><div class='del'>-	inode_set_atime_to_ts(vi, inode_get_atime(base_vi));</div><div class='del'>-	vi-&gt;i_generation = ni-&gt;seq_no = base_ni-&gt;seq_no;</div><div class='del'>-	/* Set inode type to zero but preserve permissions. */</div><div class='del'>-	vi-&gt;i_mode	= base_vi-&gt;i_mode &amp; ~S_IFMT;</div><div class='del'>-	/* Map the mft record for the base inode. */</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Find the index root attribute. */</div><div class='del'>-	err = ntfs_attr_lookup(AT_INDEX_ROOT, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ROOT attribute is "</div><div class='del'>-					"missing.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	/* Set up the state. */</div><div class='del'>-	if (unlikely(a-&gt;non_resident)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "$INDEX_ROOT attribute is not resident.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Ensure the attribute name is placed before the value. */</div><div class='del'>-	if (unlikely(a-&gt;name_length &amp;&amp; (le16_to_cpu(a-&gt;name_offset) &gt;=</div><div class='del'>-			le16_to_cpu(a-&gt;data.resident.value_offset)))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "$INDEX_ROOT attribute name is placed "</div><div class='del'>-				"after the attribute value.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Compressed/encrypted/sparse index root is not allowed, except for</div><div class='del'>-	 * directories of course but those are not dealt with here.</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;flags &amp; (ATTR_COMPRESSION_MASK | ATTR_IS_ENCRYPTED |</div><div class='del'>-			ATTR_IS_SPARSE)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Found compressed/encrypted/sparse index "</div><div class='del'>-				"root attribute.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	ir = (INDEX_ROOT*)((u8*)a + le16_to_cpu(a-&gt;data.resident.value_offset));</div><div class='del'>-	ir_end = (u8*)ir + le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-	if (ir_end &gt; (u8*)ctx-&gt;mrec + vol-&gt;mft_record_size) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$INDEX_ROOT attribute is corrupt.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	index_end = (u8*)&amp;ir-&gt;index + le32_to_cpu(ir-&gt;index.index_length);</div><div class='del'>-	if (index_end &gt; ir_end) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Index is corrupt.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (ir-&gt;type) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Index type is not 0 (type is 0x%x).",</div><div class='del'>-				le32_to_cpu(ir-&gt;type));</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	ni-&gt;itype.index.collation_rule = ir-&gt;collation_rule;</div><div class='del'>-	ntfs_debug("Index collation rule is 0x%x.",</div><div class='del'>-			le32_to_cpu(ir-&gt;collation_rule));</div><div class='del'>-	ni-&gt;itype.index.block_size = le32_to_cpu(ir-&gt;index_block_size);</div><div class='del'>-	if (!is_power_of_2(ni-&gt;itype.index.block_size)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Index block size (%u) is not a power of "</div><div class='del'>-				"two.", ni-&gt;itype.index.block_size);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (ni-&gt;itype.index.block_size &gt; PAGE_SIZE) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Index block size (%u) &gt; PAGE_SIZE "</div><div class='del'>-				"(%ld) is not supported.  Sorry.",</div><div class='del'>-				ni-&gt;itype.index.block_size, PAGE_SIZE);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (ni-&gt;itype.index.block_size &lt; NTFS_BLOCK_SIZE) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Index block size (%u) &lt; NTFS_BLOCK_SIZE "</div><div class='del'>-				"(%i) is not supported.  Sorry.",</div><div class='del'>-				ni-&gt;itype.index.block_size, NTFS_BLOCK_SIZE);</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	ni-&gt;itype.index.block_size_bits = ffs(ni-&gt;itype.index.block_size) - 1;</div><div class='del'>-	/* Determine the size of a vcn in the index. */</div><div class='del'>-	if (vol-&gt;cluster_size &lt;= ni-&gt;itype.index.block_size) {</div><div class='del'>-		ni-&gt;itype.index.vcn_size = vol-&gt;cluster_size;</div><div class='del'>-		ni-&gt;itype.index.vcn_size_bits = vol-&gt;cluster_size_bits;</div><div class='del'>-	} else {</div><div class='del'>-		ni-&gt;itype.index.vcn_size = vol-&gt;sector_size;</div><div class='del'>-		ni-&gt;itype.index.vcn_size_bits = vol-&gt;sector_size_bits;</div><div class='del'>-	}</div><div class='del'>-	/* Check for presence of index allocation attribute. */</div><div class='del'>-	if (!(ir-&gt;index.flags &amp; LARGE_INDEX)) {</div><div class='del'>-		/* No index allocation. */</div><div class='del'>-		vi-&gt;i_size = ni-&gt;initialized_size = ni-&gt;allocated_size = 0;</div><div class='del'>-		/* We are done with the mft record, so we release it. */</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-		m = NULL;</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		goto skip_large_index_stuff;</div><div class='del'>-	} /* LARGE_INDEX:  Index allocation present.  Setup state. */</div><div class='del'>-	NInoSetIndexAllocPresent(ni);</div><div class='del'>-	/* Find index allocation attribute. */</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-	err = ntfs_attr_lookup(AT_INDEX_ALLOCATION, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute is "</div><div class='del'>-					"not present but $INDEX_ROOT "</div><div class='del'>-					"indicated it is.");</div><div class='del'>-		else</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Failed to lookup "</div><div class='del'>-					"$INDEX_ALLOCATION attribute.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	if (!a-&gt;non_resident) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute is "</div><div class='del'>-				"resident.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure the attribute name is placed before the mapping pairs array.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(a-&gt;name_length &amp;&amp; (le16_to_cpu(a-&gt;name_offset) &gt;=</div><div class='del'>-			le16_to_cpu(</div><div class='del'>-			a-&gt;data.non_resident.mapping_pairs_offset)))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "$INDEX_ALLOCATION attribute name is "</div><div class='del'>-				"placed after the mapping pairs array.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute is "</div><div class='del'>-				"encrypted.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (a-&gt;flags &amp; ATTR_IS_SPARSE) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute is sparse.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$INDEX_ALLOCATION attribute is "</div><div class='del'>-				"compressed.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "First extent of $INDEX_ALLOCATION "</div><div class='del'>-				"attribute has non zero lowest_vcn.");</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	vi-&gt;i_size = sle64_to_cpu(a-&gt;data.non_resident.data_size);</div><div class='del'>-	ni-&gt;initialized_size = sle64_to_cpu(</div><div class='del'>-			a-&gt;data.non_resident.initialized_size);</div><div class='del'>-	ni-&gt;allocated_size = sle64_to_cpu(a-&gt;data.non_resident.allocated_size);</div><div class='del'>-	/*</div><div class='del'>-	 * We are done with the mft record, so we release it.  Otherwise</div><div class='del'>-	 * we would deadlock in ntfs_attr_iget().</div><div class='del'>-	 */</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	m = NULL;</div><div class='del'>-	ctx = NULL;</div><div class='del'>-	/* Get the index bitmap attribute inode. */</div><div class='del'>-	bvi = ntfs_attr_iget(base_vi, AT_BITMAP, ni-&gt;name, ni-&gt;name_len);</div><div class='del'>-	if (IS_ERR(bvi)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed to get bitmap attribute.");</div><div class='del'>-		err = PTR_ERR(bvi);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	bni = NTFS_I(bvi);</div><div class='del'>-	if (NInoCompressed(bni) || NInoEncrypted(bni) ||</div><div class='del'>-			NInoSparse(bni)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$BITMAP attribute is compressed and/or "</div><div class='del'>-				"encrypted and/or sparse.");</div><div class='del'>-		goto iput_unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Consistency check bitmap size vs. index allocation size. */</div><div class='del'>-	bvi_size = i_size_read(bvi);</div><div class='del'>-	if ((bvi_size &lt;&lt; 3) &lt; (vi-&gt;i_size &gt;&gt; ni-&gt;itype.index.block_size_bits)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Index bitmap too small (0x%llx) for "</div><div class='del'>-				"index allocation (0x%llx).", bvi_size &lt;&lt; 3,</div><div class='del'>-				vi-&gt;i_size);</div><div class='del'>-		goto iput_unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	iput(bvi);</div><div class='del'>-skip_large_index_stuff:</div><div class='del'>-	/* Setup the operations for this index inode. */</div><div class='del'>-	vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_mst_aops;</div><div class='del'>-	vi-&gt;i_blocks = ni-&gt;allocated_size &gt;&gt; 9;</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the base inode doesn't go away and attach it to the</div><div class='del'>-	 * index inode.</div><div class='del'>-	 */</div><div class='del'>-	igrab(base_vi);</div><div class='del'>-	ni-&gt;ext.base_ntfs_ino = base_ni;</div><div class='del'>-	ni-&gt;nr_extents = -1;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-iput_unm_err_out:</div><div class='del'>-	iput(bvi);</div><div class='del'>-unm_err_out:</div><div class='del'>-	if (!err)</div><div class='del'>-		err = -EIO;</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_error(vi-&gt;i_sb, "Failed with error code %i while reading index "</div><div class='del'>-			"inode (mft_no 0x%lx, name_len %i.", err, vi-&gt;i_ino,</div><div class='del'>-			ni-&gt;name_len);</div><div class='del'>-	make_bad_inode(vi);</div><div class='del'>-	if (err != -EOPNOTSUPP &amp;&amp; err != -ENOMEM)</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The MFT inode has special locking, so teach the lock validator</div><div class='del'>- * about this by splitting off the locking rules of the MFT from</div><div class='del'>- * the locking rules of other inodes. The MFT inode can never be</div><div class='del'>- * accessed from the VFS side (or even internally), only by the</div><div class='del'>- * map_mft functions.</div><div class='del'>- */</div><div class='del'>-static struct lock_class_key mft_ni_runlist_lock_key, mft_ni_mrec_lock_key;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_read_inode_mount - special read_inode for mount time use only</div><div class='del'>- * @vi:		inode to read</div><div class='del'>- *</div><div class='del'>- * Read inode FILE_MFT at mount time, only called with super_block lock</div><div class='del'>- * held from within the read_super() code path.</div><div class='del'>- *</div><div class='del'>- * This function exists because when it is called the page cache for $MFT/$DATA</div><div class='del'>- * is not initialized and hence we cannot get at the contents of mft records</div><div class='del'>- * by calling map_mft_record*().</div><div class='del'>- *</div><div class='del'>- * Further it needs to cope with the circular references problem, i.e. cannot</div><div class='del'>- * load any attributes other than $ATTRIBUTE_LIST until $DATA is loaded, because</div><div class='del'>- * we do not know where the other extent mft records are yet and again, because</div><div class='del'>- * we cannot call map_mft_record*() yet.  Obviously this applies only when an</div><div class='del'>- * attribute list is actually present in $MFT inode.</div><div class='del'>- *</div><div class='del'>- * We solve these problems by starting with the $DATA attribute before anything</div><div class='del'>- * else and iterating using ntfs_attr_lookup($DATA) over all extents.  As each</div><div class='del'>- * extent is found, we ntfs_mapping_pairs_decompress() including the implied</div><div class='del'>- * ntfs_runlists_merge().  Each step of the iteration necessarily provides</div><div class='del'>- * sufficient information for the next step to complete.</div><div class='del'>- *</div><div class='del'>- * This should work but there are two possible pit falls (see inline comments</div><div class='del'>- * below), but only time will tell if they are real pits or just smoke...</div><div class='del'>- */</div><div class='del'>-int ntfs_read_inode_mount(struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	VCN next_vcn, last_vcn, highest_vcn;</div><div class='del'>-	s64 block;</div><div class='del'>-	struct super_block *sb = vi-&gt;i_sb;</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(sb);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	ntfs_inode *ni;</div><div class='del'>-	MFT_RECORD *m = NULL;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	unsigned int i, nr_blocks;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-</div><div class='del'>-	/* Initialize the ntfs specific part of @vi. */</div><div class='del'>-	ntfs_init_big_inode(vi);</div><div class='del'>-</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-</div><div class='del'>-	/* Setup the data attribute. It is special as it is mst protected. */</div><div class='del'>-	NInoSetNonResident(ni);</div><div class='del'>-	NInoSetMstProtected(ni);</div><div class='del'>-	NInoSetSparseDisabled(ni);</div><div class='del'>-	ni-&gt;type = AT_DATA;</div><div class='del'>-	ni-&gt;name = NULL;</div><div class='del'>-	ni-&gt;name_len = 0;</div><div class='del'>-	/*</div><div class='del'>-	 * This sets up our little cheat allowing us to reuse the async read io</div><div class='del'>-	 * completion handler for directories.</div><div class='del'>-	 */</div><div class='del'>-	ni-&gt;itype.index.block_size = vol-&gt;mft_record_size;</div><div class='del'>-	ni-&gt;itype.index.block_size_bits = vol-&gt;mft_record_size_bits;</div><div class='del'>-</div><div class='del'>-	/* Very important! Needed to be able to call map_mft_record*(). */</div><div class='del'>-	vol-&gt;mft_ino = vi;</div><div class='del'>-</div><div class='del'>-	/* Allocate enough memory to read the first mft record. */</div><div class='del'>-	if (vol-&gt;mft_record_size &gt; 64 * 1024) {</div><div class='del'>-		ntfs_error(sb, "Unsupported mft record size %i (max 64kiB).",</div><div class='del'>-				vol-&gt;mft_record_size);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	i = vol-&gt;mft_record_size;</div><div class='del'>-	if (i &lt; sb-&gt;s_blocksize)</div><div class='del'>-		i = sb-&gt;s_blocksize;</div><div class='del'>-	m = (MFT_RECORD*)ntfs_malloc_nofs(i);</div><div class='del'>-	if (!m) {</div><div class='del'>-		ntfs_error(sb, "Failed to allocate buffer for $MFT record 0.");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Determine the first block of the $MFT/$DATA attribute. */</div><div class='del'>-	block = vol-&gt;mft_lcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-			sb-&gt;s_blocksize_bits;</div><div class='del'>-	nr_blocks = vol-&gt;mft_record_size &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='del'>-	if (!nr_blocks)</div><div class='del'>-		nr_blocks = 1;</div><div class='del'>-</div><div class='del'>-	/* Load $MFT/$DATA's first mft record. */</div><div class='del'>-	for (i = 0; i &lt; nr_blocks; i++) {</div><div class='del'>-		bh = sb_bread(sb, block++);</div><div class='del'>-		if (!bh) {</div><div class='del'>-			ntfs_error(sb, "Device read failed.");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		memcpy((char*)m + (i &lt;&lt; sb-&gt;s_blocksize_bits), bh-&gt;b_data,</div><div class='del'>-				sb-&gt;s_blocksize);</div><div class='del'>-		brelse(bh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (le32_to_cpu(m-&gt;bytes_allocated) != vol-&gt;mft_record_size) {</div><div class='del'>-		ntfs_error(sb, "Incorrect mft record size %u in superblock, should be %u.",</div><div class='del'>-				le32_to_cpu(m-&gt;bytes_allocated), vol-&gt;mft_record_size);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Apply the mst fixups. */</div><div class='del'>-	if (post_read_mst_fixup((NTFS_RECORD*)m, vol-&gt;mft_record_size)) {</div><div class='del'>-		/* FIXME: Try to use the $MFTMirr now. */</div><div class='del'>-		ntfs_error(sb, "MST fixup failed. $MFT is corrupt.");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sanity check offset to the first attribute */</div><div class='del'>-	if (le16_to_cpu(m-&gt;attrs_offset) &gt;= le32_to_cpu(m-&gt;bytes_allocated)) {</div><div class='del'>-		ntfs_error(sb, "Incorrect mft offset to the first attribute %u in superblock.",</div><div class='del'>-			       le16_to_cpu(m-&gt;attrs_offset));</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Need this to sanity check attribute list references to $MFT. */</div><div class='del'>-	vi-&gt;i_generation = ni-&gt;seq_no = le16_to_cpu(m-&gt;sequence_number);</div><div class='del'>-</div><div class='del'>-	/* Provides read_folio() for map_mft_record(). */</div><div class='del'>-	vi-&gt;i_mapping-&gt;a_ops = &amp;ntfs_mst_aops;</div><div class='del'>-</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(ni, m);</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find the attribute list attribute if present. */</div><div class='del'>-	err = ntfs_attr_lookup(AT_ATTRIBUTE_LIST, NULL, 0, 0, 0, NULL, 0, ctx);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (unlikely(err != -ENOENT)) {</div><div class='del'>-			ntfs_error(sb, "Failed to lookup attribute list "</div><div class='del'>-					"attribute. You should run chkdsk.");</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-	} else /* if (!err) */ {</div><div class='del'>-		ATTR_LIST_ENTRY *al_entry, *next_al_entry;</div><div class='del'>-		u8 *al_end;</div><div class='del'>-		static const char *es = "  Not allowed.  $MFT is corrupt.  "</div><div class='del'>-				"You should run chkdsk.";</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Attribute list attribute found in $MFT.");</div><div class='del'>-		NInoSetAttrList(ni);</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK) {</div><div class='del'>-			ntfs_error(sb, "Attribute list attribute is "</div><div class='del'>-					"compressed.%s", es);</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_IS_ENCRYPTED ||</div><div class='del'>-				a-&gt;flags &amp; ATTR_IS_SPARSE) {</div><div class='del'>-			if (a-&gt;non_resident) {</div><div class='del'>-				ntfs_error(sb, "Non-resident attribute list "</div><div class='del'>-						"attribute is encrypted/"</div><div class='del'>-						"sparse.%s", es);</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-			ntfs_warning(sb, "Resident attribute list attribute "</div><div class='del'>-					"in $MFT system file is marked "</div><div class='del'>-					"encrypted/sparse which is not true.  "</div><div class='del'>-					"However, Windows allows this and "</div><div class='del'>-					"chkdsk does not detect or correct it "</div><div class='del'>-					"so we will just ignore the invalid "</div><div class='del'>-					"flags and pretend they are not set.");</div><div class='del'>-		}</div><div class='del'>-		/* Now allocate memory for the attribute list. */</div><div class='del'>-		ni-&gt;attr_list_size = (u32)ntfs_attr_size(a);</div><div class='del'>-		if (!ni-&gt;attr_list_size) {</div><div class='del'>-			ntfs_error(sb, "Attr_list_size is zero");</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-		ni-&gt;attr_list = ntfs_malloc_nofs(ni-&gt;attr_list_size);</div><div class='del'>-		if (!ni-&gt;attr_list) {</div><div class='del'>-			ntfs_error(sb, "Not enough memory to allocate buffer "</div><div class='del'>-					"for attribute list.");</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;non_resident) {</div><div class='del'>-			NInoSetAttrListNonResident(ni);</div><div class='del'>-			if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-				ntfs_error(sb, "Attribute list has non zero "</div><div class='del'>-						"lowest_vcn. $MFT is corrupt. "</div><div class='del'>-						"You should run chkdsk.");</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Setup the runlist. */</div><div class='del'>-			ni-&gt;attr_list_rl.rl = ntfs_mapping_pairs_decompress(vol,</div><div class='del'>-					a, NULL);</div><div class='del'>-			if (IS_ERR(ni-&gt;attr_list_rl.rl)) {</div><div class='del'>-				err = PTR_ERR(ni-&gt;attr_list_rl.rl);</div><div class='del'>-				ni-&gt;attr_list_rl.rl = NULL;</div><div class='del'>-				ntfs_error(sb, "Mapping pairs decompression "</div><div class='del'>-						"failed with error code %i.",</div><div class='del'>-						-err);</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Now load the attribute list. */</div><div class='del'>-			if ((err = load_attribute_list(vol, &amp;ni-&gt;attr_list_rl,</div><div class='del'>-					ni-&gt;attr_list, ni-&gt;attr_list_size,</div><div class='del'>-					sle64_to_cpu(a-&gt;data.</div><div class='del'>-					non_resident.initialized_size)))) {</div><div class='del'>-				ntfs_error(sb, "Failed to load attribute list "</div><div class='del'>-						"attribute with error code %i.",</div><div class='del'>-						-err);</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-		} else /* if (!ctx.attr-&gt;non_resident) */ {</div><div class='del'>-			if ((u8*)a + le16_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_offset) +</div><div class='del'>-					le32_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_length) &gt;</div><div class='del'>-					(u8*)ctx-&gt;mrec + vol-&gt;mft_record_size) {</div><div class='del'>-				ntfs_error(sb, "Corrupt attribute list "</div><div class='del'>-						"attribute.");</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Now copy the attribute list. */</div><div class='del'>-			memcpy(ni-&gt;attr_list, (u8*)a + le16_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_offset),</div><div class='del'>-					le32_to_cpu(</div><div class='del'>-					a-&gt;data.resident.value_length));</div><div class='del'>-		}</div><div class='del'>-		/* The attribute list is now setup in memory. */</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: I don't know if this case is actually possible.</div><div class='del'>-		 * According to logic it is not possible but I have seen too</div><div class='del'>-		 * many weird things in MS software to rely on logic... Thus we</div><div class='del'>-		 * perform a manual search and make sure the first $MFT/$DATA</div><div class='del'>-		 * extent is in the base inode. If it is not we abort with an</div><div class='del'>-		 * error and if we ever see a report of this error we will need</div><div class='del'>-		 * to do some magic in order to have the necessary mft record</div><div class='del'>-		 * loaded and in the right place in the page cache. But</div><div class='del'>-		 * hopefully logic will prevail and this never happens...</div><div class='del'>-		 */</div><div class='del'>-		al_entry = (ATTR_LIST_ENTRY*)ni-&gt;attr_list;</div><div class='del'>-		al_end = (u8*)al_entry + ni-&gt;attr_list_size;</div><div class='del'>-		for (;; al_entry = next_al_entry) {</div><div class='del'>-			/* Out of bounds check. */</div><div class='del'>-			if ((u8*)al_entry &lt; ni-&gt;attr_list ||</div><div class='del'>-					(u8*)al_entry &gt; al_end)</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			/* Catch the end of the attribute list. */</div><div class='del'>-			if ((u8*)al_entry == al_end)</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			if (!al_entry-&gt;length)</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			if ((u8*)al_entry + 6 &gt; al_end || (u8*)al_entry +</div><div class='del'>-					le16_to_cpu(al_entry-&gt;length) &gt; al_end)</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry +</div><div class='del'>-					le16_to_cpu(al_entry-&gt;length));</div><div class='del'>-			if (le32_to_cpu(al_entry-&gt;type) &gt; le32_to_cpu(AT_DATA))</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			if (AT_DATA != al_entry-&gt;type)</div><div class='del'>-				continue;</div><div class='del'>-			/* We want an unnamed attribute. */</div><div class='del'>-			if (al_entry-&gt;name_length)</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			/* Want the first entry, i.e. lowest_vcn == 0. */</div><div class='del'>-			if (al_entry-&gt;lowest_vcn)</div><div class='del'>-				goto em_put_err_out;</div><div class='del'>-			/* First entry has to be in the base mft record. */</div><div class='del'>-			if (MREF_LE(al_entry-&gt;mft_reference) != vi-&gt;i_ino) {</div><div class='del'>-				/* MFT references do not match, logic fails. */</div><div class='del'>-				ntfs_error(sb, "BUG: The first $DATA extent "</div><div class='del'>-						"of $MFT is not in the base "</div><div class='del'>-						"mft record. Please report "</div><div class='del'>-						"you saw this message to "</div><div class='del'>-						"linux-ntfs-dev@lists."</div><div class='del'>-						"sourceforge.net");</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			} else {</div><div class='del'>-				/* Sequence numbers must match. */</div><div class='del'>-				if (MSEQNO_LE(al_entry-&gt;mft_reference) !=</div><div class='del'>-						ni-&gt;seq_no)</div><div class='del'>-					goto em_put_err_out;</div><div class='del'>-				/* Got it. All is ok. We can stop now. */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-</div><div class='del'>-	/* Now load all attribute extents. */</div><div class='del'>-	a = NULL;</div><div class='del'>-	next_vcn = last_vcn = highest_vcn = 0;</div><div class='del'>-	while (!(err = ntfs_attr_lookup(AT_DATA, NULL, 0, 0, next_vcn, NULL, 0,</div><div class='del'>-			ctx))) {</div><div class='del'>-		runlist_element *nrl;</div><div class='del'>-</div><div class='del'>-		/* Cache the current attribute. */</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		/* $MFT must be non-resident. */</div><div class='del'>-		if (!a-&gt;non_resident) {</div><div class='del'>-			ntfs_error(sb, "$MFT must be non-resident but a "</div><div class='del'>-					"resident extent was found. $MFT is "</div><div class='del'>-					"corrupt. Run chkdsk.");</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-		/* $MFT must be uncompressed and unencrypted. */</div><div class='del'>-		if (a-&gt;flags &amp; ATTR_COMPRESSION_MASK ||</div><div class='del'>-				a-&gt;flags &amp; ATTR_IS_ENCRYPTED ||</div><div class='del'>-				a-&gt;flags &amp; ATTR_IS_SPARSE) {</div><div class='del'>-			ntfs_error(sb, "$MFT must be uncompressed, "</div><div class='del'>-					"non-sparse, and unencrypted but a "</div><div class='del'>-					"compressed/sparse/encrypted extent "</div><div class='del'>-					"was found. $MFT is corrupt. Run "</div><div class='del'>-					"chkdsk.");</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Decompress the mapping pairs array of this extent and merge</div><div class='del'>-		 * the result into the existing runlist. No need for locking</div><div class='del'>-		 * as we have exclusive access to the inode at this time and we</div><div class='del'>-		 * are a mount in progress task, too.</div><div class='del'>-		 */</div><div class='del'>-		nrl = ntfs_mapping_pairs_decompress(vol, a, ni-&gt;runlist.rl);</div><div class='del'>-		if (IS_ERR(nrl)) {</div><div class='del'>-			ntfs_error(sb, "ntfs_mapping_pairs_decompress() "</div><div class='del'>-					"failed with error code %ld.  $MFT is "</div><div class='del'>-					"corrupt.", PTR_ERR(nrl));</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-		ni-&gt;runlist.rl = nrl;</div><div class='del'>-</div><div class='del'>-		/* Are we in the first extent? */</div><div class='del'>-		if (!next_vcn) {</div><div class='del'>-			if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-				ntfs_error(sb, "First extent of $DATA "</div><div class='del'>-						"attribute has non zero "</div><div class='del'>-						"lowest_vcn. $MFT is corrupt. "</div><div class='del'>-						"You should run chkdsk.");</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Get the last vcn in the $DATA attribute. */</div><div class='del'>-			last_vcn = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.allocated_size)</div><div class='del'>-					&gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-			/* Fill in the inode size. */</div><div class='del'>-			vi-&gt;i_size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.data_size);</div><div class='del'>-			ni-&gt;initialized_size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.initialized_size);</div><div class='del'>-			ni-&gt;allocated_size = sle64_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.allocated_size);</div><div class='del'>-			/*</div><div class='del'>-			 * Verify the number of mft records does not exceed</div><div class='del'>-			 * 2^32 - 1.</div><div class='del'>-			 */</div><div class='del'>-			if ((vi-&gt;i_size &gt;&gt; vol-&gt;mft_record_size_bits) &gt;=</div><div class='del'>-					(1ULL &lt;&lt; 32)) {</div><div class='del'>-				ntfs_error(sb, "$MFT is too big! Aborting.");</div><div class='del'>-				goto put_err_out;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * We have got the first extent of the runlist for</div><div class='del'>-			 * $MFT which means it is now relatively safe to call</div><div class='del'>-			 * the normal ntfs_read_inode() function.</div><div class='del'>-			 * Complete reading the inode, this will actually</div><div class='del'>-			 * re-read the mft record for $MFT, this time entering</div><div class='del'>-			 * it into the page cache with which we complete the</div><div class='del'>-			 * kick start of the volume. It should be safe to do</div><div class='del'>-			 * this now as the first extent of $MFT/$DATA is</div><div class='del'>-			 * already known and we would hope that we don't need</div><div class='del'>-			 * further extents in order to find the other</div><div class='del'>-			 * attributes belonging to $MFT. Only time will tell if</div><div class='del'>-			 * this is really the case. If not we will have to play</div><div class='del'>-			 * magic at this point, possibly duplicating a lot of</div><div class='del'>-			 * ntfs_read_inode() at this point. We will need to</div><div class='del'>-			 * ensure we do enough of its work to be able to call</div><div class='del'>-			 * ntfs_read_inode() on extents of $MFT/$DATA. But lets</div><div class='del'>-			 * hope this never happens...</div><div class='del'>-			 */</div><div class='del'>-			ntfs_read_locked_inode(vi);</div><div class='del'>-			if (is_bad_inode(vi)) {</div><div class='del'>-				ntfs_error(sb, "ntfs_read_inode() of $MFT "</div><div class='del'>-						"failed. BUG or corrupt $MFT. "</div><div class='del'>-						"Run chkdsk and if no errors "</div><div class='del'>-						"are found, please report you "</div><div class='del'>-						"saw this message to "</div><div class='del'>-						"linux-ntfs-dev@lists."</div><div class='del'>-						"sourceforge.net");</div><div class='del'>-				ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-				/* Revert to the safe super operations. */</div><div class='del'>-				ntfs_free(m);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * Re-initialize some specifics about $MFT's inode as</div><div class='del'>-			 * ntfs_read_inode() will have set up the default ones.</div><div class='del'>-			 */</div><div class='del'>-			/* Set uid and gid to root. */</div><div class='del'>-			vi-&gt;i_uid = GLOBAL_ROOT_UID;</div><div class='del'>-			vi-&gt;i_gid = GLOBAL_ROOT_GID;</div><div class='del'>-			/* Regular file. No access for anyone. */</div><div class='del'>-			vi-&gt;i_mode = S_IFREG;</div><div class='del'>-			/* No VFS initiated operations allowed for $MFT. */</div><div class='del'>-			vi-&gt;i_op = &amp;ntfs_empty_inode_ops;</div><div class='del'>-			vi-&gt;i_fop = &amp;ntfs_empty_file_ops;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Get the lowest vcn for the next extent. */</div><div class='del'>-		highest_vcn = sle64_to_cpu(a-&gt;data.non_resident.highest_vcn);</div><div class='del'>-		next_vcn = highest_vcn + 1;</div><div class='del'>-</div><div class='del'>-		/* Only one extent or error, which we catch below. */</div><div class='del'>-		if (next_vcn &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Avoid endless loops due to corruption. */</div><div class='del'>-		if (next_vcn &lt; sle64_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.lowest_vcn)) {</div><div class='del'>-			ntfs_error(sb, "$MFT has corrupt attribute list "</div><div class='del'>-					"attribute. Run chkdsk.");</div><div class='del'>-			goto put_err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (err != -ENOENT) {</div><div class='del'>-		ntfs_error(sb, "Failed to lookup $MFT/$DATA attribute extent. "</div><div class='del'>-				"$MFT is corrupt. Run chkdsk.");</div><div class='del'>-		goto put_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (!a) {</div><div class='del'>-		ntfs_error(sb, "$MFT/$DATA attribute not found. $MFT is "</div><div class='del'>-				"corrupt. Run chkdsk.");</div><div class='del'>-		goto put_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (highest_vcn &amp;&amp; highest_vcn != last_vcn - 1) {</div><div class='del'>-		ntfs_error(sb, "Failed to load the complete runlist for "</div><div class='del'>-				"$MFT/$DATA. Driver bug or corrupt $MFT. "</div><div class='del'>-				"Run chkdsk.");</div><div class='del'>-		ntfs_debug("highest_vcn = 0x%llx, last_vcn - 1 = 0x%llx",</div><div class='del'>-				(unsigned long long)highest_vcn,</div><div class='del'>-				(unsigned long long)last_vcn - 1);</div><div class='del'>-		goto put_err_out;</div><div class='del'>-	}</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	ntfs_free(m);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Split the locking rules of the MFT inode from the</div><div class='del'>-	 * locking rules of other inodes:</div><div class='del'>-	 */</div><div class='del'>-	lockdep_set_class(&amp;ni-&gt;runlist.lock, &amp;mft_ni_runlist_lock_key);</div><div class='del'>-	lockdep_set_class(&amp;ni-&gt;mrec_lock, &amp;mft_ni_mrec_lock_key);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-em_put_err_out:</div><div class='del'>-	ntfs_error(sb, "Couldn't find first extent of $DATA attribute in "</div><div class='del'>-			"attribute list. $MFT is corrupt. Run chkdsk.");</div><div class='del'>-put_err_out:</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_error(sb, "Failed. Marking inode as bad.");</div><div class='del'>-	make_bad_inode(vi);</div><div class='del'>-	ntfs_free(m);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __ntfs_clear_inode(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	/* Free all alocated memory. */</div><div class='del'>-	down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	if (ni-&gt;runlist.rl) {</div><div class='del'>-		ntfs_free(ni-&gt;runlist.rl);</div><div class='del'>-		ni-&gt;runlist.rl = NULL;</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-</div><div class='del'>-	if (ni-&gt;attr_list) {</div><div class='del'>-		ntfs_free(ni-&gt;attr_list);</div><div class='del'>-		ni-&gt;attr_list = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;ni-&gt;attr_list_rl.lock);</div><div class='del'>-	if (ni-&gt;attr_list_rl.rl) {</div><div class='del'>-		ntfs_free(ni-&gt;attr_list_rl.rl);</div><div class='del'>-		ni-&gt;attr_list_rl.rl = NULL;</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;ni-&gt;attr_list_rl.lock);</div><div class='del'>-</div><div class='del'>-	if (ni-&gt;name_len &amp;&amp; ni-&gt;name != I30) {</div><div class='del'>-		/* Catch bugs... */</div><div class='del'>-		BUG_ON(!ni-&gt;name);</div><div class='del'>-		kfree(ni-&gt;name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ntfs_clear_extent_inode(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", ni-&gt;mft_no);</div><div class='del'>-</div><div class='del'>-	BUG_ON(NInoAttr(ni));</div><div class='del'>-	BUG_ON(ni-&gt;nr_extents != -1);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	if (NInoDirty(ni)) {</div><div class='del'>-		if (!is_bad_inode(VFS_I(ni-&gt;ext.base_ntfs_ino)))</div><div class='del'>-			ntfs_error(ni-&gt;vol-&gt;sb, "Clearing dirty extent inode!  "</div><div class='del'>-					"Losing data!  This is a BUG!!!");</div><div class='del'>-		// FIXME:  Do something!!!</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	__ntfs_clear_inode(ni);</div><div class='del'>-</div><div class='del'>-	/* Bye, bye... */</div><div class='del'>-	ntfs_destroy_extent_inode(ni);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_evict_big_inode - clean up the ntfs specific part of an inode</div><div class='del'>- * @vi:		vfs inode pending annihilation</div><div class='del'>- *</div><div class='del'>- * When the VFS is going to remove an inode from memory, ntfs_clear_big_inode()</div><div class='del'>- * is called, which deallocates all memory belonging to the NTFS specific part</div><div class='del'>- * of the inode and returns.</div><div class='del'>- *</div><div class='del'>- * If the MFT record is dirty, we commit it before doing anything else.</div><div class='del'>- */</div><div class='del'>-void ntfs_evict_big_inode(struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-</div><div class='del'>-	truncate_inode_pages_final(&amp;vi-&gt;i_data);</div><div class='del'>-	clear_inode(vi);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	if (NInoDirty(ni)) {</div><div class='del'>-		bool was_bad = (is_bad_inode(vi));</div><div class='del'>-</div><div class='del'>-		/* Committing the inode also commits all extent inodes. */</div><div class='del'>-		ntfs_commit_inode(vi);</div><div class='del'>-</div><div class='del'>-		if (!was_bad &amp;&amp; (is_bad_inode(vi) || NInoDirty(ni))) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Failed to commit dirty inode "</div><div class='del'>-					"0x%lx.  Losing data!", vi-&gt;i_ino);</div><div class='del'>-			// FIXME:  Do something!!!</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	/* No need to lock at this stage as no one else has a reference. */</div><div class='del'>-	if (ni-&gt;nr_extents &gt; 0) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ni-&gt;nr_extents; i++)</div><div class='del'>-			ntfs_clear_extent_inode(ni-&gt;ext.extent_ntfs_inos[i]);</div><div class='del'>-		kfree(ni-&gt;ext.extent_ntfs_inos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__ntfs_clear_inode(ni);</div><div class='del'>-</div><div class='del'>-	if (NInoAttr(ni)) {</div><div class='del'>-		/* Release the base inode if we are holding it. */</div><div class='del'>-		if (ni-&gt;nr_extents == -1) {</div><div class='del'>-			iput(VFS_I(ni-&gt;ext.base_ntfs_ino));</div><div class='del'>-			ni-&gt;nr_extents = 0;</div><div class='del'>-			ni-&gt;ext.base_ntfs_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(ni-&gt;page);</div><div class='del'>-	if (!atomic_dec_and_test(&amp;ni-&gt;count))</div><div class='del'>-		BUG();</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_show_options - show mount options in /proc/mounts</div><div class='del'>- * @sf:		seq_file in which to write our mount options</div><div class='del'>- * @root:	root of the mounted tree whose mount options to display</div><div class='del'>- *</div><div class='del'>- * Called by the VFS once for each mounted ntfs volume when someone reads</div><div class='del'>- * /proc/mounts in order to display the NTFS specific mount options of each</div><div class='del'>- * mount. The mount options of fs specified by @root are written to the seq file</div><div class='del'>- * @sf and success is returned.</div><div class='del'>- */</div><div class='del'>-int ntfs_show_options(struct seq_file *sf, struct dentry *root)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(root-&gt;d_sb);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	seq_printf(sf, ",uid=%i", from_kuid_munged(&amp;init_user_ns, vol-&gt;uid));</div><div class='del'>-	seq_printf(sf, ",gid=%i", from_kgid_munged(&amp;init_user_ns, vol-&gt;gid));</div><div class='del'>-	if (vol-&gt;fmask == vol-&gt;dmask)</div><div class='del'>-		seq_printf(sf, ",umask=0%o", vol-&gt;fmask);</div><div class='del'>-	else {</div><div class='del'>-		seq_printf(sf, ",fmask=0%o", vol-&gt;fmask);</div><div class='del'>-		seq_printf(sf, ",dmask=0%o", vol-&gt;dmask);</div><div class='del'>-	}</div><div class='del'>-	seq_printf(sf, ",nls=%s", vol-&gt;nls_map-&gt;charset);</div><div class='del'>-	if (NVolCaseSensitive(vol))</div><div class='del'>-		seq_printf(sf, ",case_sensitive");</div><div class='del'>-	if (NVolShowSystemFiles(vol))</div><div class='del'>-		seq_printf(sf, ",show_sys_files");</div><div class='del'>-	if (!NVolSparseEnabled(vol))</div><div class='del'>-		seq_printf(sf, ",disable_sparse");</div><div class='del'>-	for (i = 0; on_errors_arr[i].val; i++) {</div><div class='del'>-		if (on_errors_arr[i].val &amp; vol-&gt;on_errors)</div><div class='del'>-			seq_printf(sf, ",errors=%s", on_errors_arr[i].str);</div><div class='del'>-	}</div><div class='del'>-	seq_printf(sf, ",mft_zone_multiplier=%i", vol-&gt;mft_zone_multiplier);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-static const char *es = "  Leaving inconsistent metadata.  Unmount and run "</div><div class='del'>-		"chkdsk.";</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_truncate - called when the i_size of an ntfs inode is changed</div><div class='del'>- * @vi:		inode for which the i_size was changed</div><div class='del'>- *</div><div class='del'>- * We only support i_size changes for normal files at present, i.e. not</div><div class='del'>- * compressed and not encrypted.  This is enforced in ntfs_setattr(), see</div><div class='del'>- * below.</div><div class='del'>- *</div><div class='del'>- * The kernel guarantees that @vi is a regular file (S_ISREG() is true) and</div><div class='del'>- * that the change is allowed.</div><div class='del'>- *</div><div class='del'>- * This implies for us that @vi is a file inode rather than a directory, index,</div><div class='del'>- * or attribute inode as well as that @vi is a base inode.</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success or -errno on error.</div><div class='del'>- *</div><div class='del'>- * Called with -&gt;i_mutex held.</div><div class='del'>- */</div><div class='del'>-int ntfs_truncate(struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	s64 new_size, old_size, nr_freed, new_alloc_size, old_alloc_size;</div><div class='del'>-	VCN highest_vcn;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	ntfs_inode *base_ni, *ni = NTFS_I(vi);</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	const char *te = "  Leaving file length out of sync with i_size.";</div><div class='del'>-	int err, mp_size, size_change, alloc_change;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-	BUG_ON(NInoAttr(ni));</div><div class='del'>-	BUG_ON(S_ISDIR(vi-&gt;i_mode));</div><div class='del'>-	BUG_ON(NInoMstProtected(ni));</div><div class='del'>-	BUG_ON(ni-&gt;nr_extents &lt; 0);</div><div class='del'>-retry_truncate:</div><div class='del'>-	/*</div><div class='del'>-	 * Lock the runlist for writing and map the mft record to ensure it is</div><div class='del'>-	 * safe to mess with the attribute runlist and sizes.</div><div class='del'>-	 */</div><div class='del'>-	down_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	if (!NInoAttr(ni))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	m = map_mft_record(base_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed to map mft record for inode 0x%lx "</div><div class='del'>-				"(error code %d).%s", vi-&gt;i_ino, err, te);</div><div class='del'>-		ctx = NULL;</div><div class='del'>-		m = NULL;</div><div class='del'>-		goto old_bad_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(base_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed to allocate a search context for "</div><div class='del'>-				"inode 0x%lx (not enough memory).%s",</div><div class='del'>-				vi-&gt;i_ino, te);</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto old_bad_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(ni-&gt;type, ni-&gt;name, ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		if (err == -ENOENT) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Open attribute is missing from "</div><div class='del'>-					"mft record.  Inode 0x%lx is corrupt.  "</div><div class='del'>-					"Run chkdsk.%s", vi-&gt;i_ino, te);</div><div class='del'>-			err = -EIO;</div><div class='del'>-		} else</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Failed to lookup attribute in "</div><div class='del'>-					"inode 0x%lx (error code %d).%s",</div><div class='del'>-					vi-&gt;i_ino, err, te);</div><div class='del'>-		goto old_bad_out;</div><div class='del'>-	}</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	/*</div><div class='del'>-	 * The i_size of the vfs inode is the new size for the attribute value.</div><div class='del'>-	 */</div><div class='del'>-	new_size = i_size_read(vi);</div><div class='del'>-	/* The current size of the attribute value is the old size. */</div><div class='del'>-	old_size = ntfs_attr_size(a);</div><div class='del'>-	/* Calculate the new allocated size. */</div><div class='del'>-	if (NInoNonResident(ni))</div><div class='del'>-		new_alloc_size = (new_size + vol-&gt;cluster_size - 1) &amp;</div><div class='del'>-				~(s64)vol-&gt;cluster_size_mask;</div><div class='del'>-	else</div><div class='del'>-		new_alloc_size = (new_size + 7) &amp; ~7;</div><div class='del'>-	/* The current allocated size is the old allocated size. */</div><div class='del'>-	read_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	old_alloc_size = ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * The change in the file size.  This will be 0 if no change, &gt;0 if the</div><div class='del'>-	 * size is growing, and &lt;0 if the size is shrinking.</div><div class='del'>-	 */</div><div class='del'>-	size_change = -1;</div><div class='del'>-	if (new_size - old_size &gt;= 0) {</div><div class='del'>-		size_change = 1;</div><div class='del'>-		if (new_size == old_size)</div><div class='del'>-			size_change = 0;</div><div class='del'>-	}</div><div class='del'>-	/* As above for the allocated size. */</div><div class='del'>-	alloc_change = -1;</div><div class='del'>-	if (new_alloc_size - old_alloc_size &gt;= 0) {</div><div class='del'>-		alloc_change = 1;</div><div class='del'>-		if (new_alloc_size == old_alloc_size)</div><div class='del'>-			alloc_change = 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If neither the size nor the allocation are being changed there is</div><div class='del'>-	 * nothing to do.</div><div class='del'>-	 */</div><div class='del'>-	if (!size_change &amp;&amp; !alloc_change)</div><div class='del'>-		goto unm_done;</div><div class='del'>-	/* If the size is changing, check if new size is allowed in $AttrDef. */</div><div class='del'>-	if (size_change) {</div><div class='del'>-		err = ntfs_attr_size_bounds_check(vol, ni-&gt;type, new_size);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (err == -ERANGE) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Truncate would cause the "</div><div class='del'>-						"inode 0x%lx to %simum size "</div><div class='del'>-						"for its attribute type "</div><div class='del'>-						"(0x%x).  Aborting truncate.",</div><div class='del'>-						vi-&gt;i_ino,</div><div class='del'>-						new_size &gt; old_size ? "exceed "</div><div class='del'>-						"the max" : "go under the min",</div><div class='del'>-						le32_to_cpu(ni-&gt;type));</div><div class='del'>-				err = -EFBIG;</div><div class='del'>-			} else {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Inode 0x%lx has unknown "</div><div class='del'>-						"attribute type 0x%x.  "</div><div class='del'>-						"Aborting truncate.",</div><div class='del'>-						vi-&gt;i_ino,</div><div class='del'>-						le32_to_cpu(ni-&gt;type));</div><div class='del'>-				err = -EIO;</div><div class='del'>-			}</div><div class='del'>-			/* Reset the vfs inode size to the old size. */</div><div class='del'>-			i_size_write(vi, old_size);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (NInoCompressed(ni) || NInoEncrypted(ni)) {</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Changes in inode size are not "</div><div class='del'>-				"supported yet for %s files, ignoring.",</div><div class='del'>-				NInoCompressed(ni) ? "compressed" :</div><div class='del'>-				"encrypted");</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto bad_out;</div><div class='del'>-	}</div><div class='del'>-	if (a-&gt;non_resident)</div><div class='del'>-		goto do_non_resident_truncate;</div><div class='del'>-	BUG_ON(NInoNonResident(ni));</div><div class='del'>-	/* Resize the attribute record to best fit the new attribute size. */</div><div class='del'>-	if (new_size &lt; vol-&gt;mft_record_size &amp;&amp;</div><div class='del'>-			!ntfs_resident_attr_value_resize(m, a, new_size)) {</div><div class='del'>-		/* The resize succeeded! */</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		/* Update the sizes in the ntfs inode and all is done. */</div><div class='del'>-		ni-&gt;allocated_size = le32_to_cpu(a-&gt;length) -</div><div class='del'>-				le16_to_cpu(a-&gt;data.resident.value_offset);</div><div class='del'>-		/*</div><div class='del'>-		 * Note ntfs_resident_attr_value_resize() has already done any</div><div class='del'>-		 * necessary data clearing in the attribute record.  When the</div><div class='del'>-		 * file is being shrunk vmtruncate() will already have cleared</div><div class='del'>-		 * the top part of the last partial page, i.e. since this is</div><div class='del'>-		 * the resident case this is the page with index 0.  However,</div><div class='del'>-		 * when the file is being expanded, the page cache page data</div><div class='del'>-		 * between the old data_size, i.e. old_size, and the new_size</div><div class='del'>-		 * has not been zeroed.  Fortunately, we do not need to zero it</div><div class='del'>-		 * either since on one hand it will either already be zero due</div><div class='del'>-		 * to both read_folio and writepage clearing partial page data</div><div class='del'>-		 * beyond i_size in which case there is nothing to do or in the</div><div class='del'>-		 * case of the file being mmap()ped at the same time, POSIX</div><div class='del'>-		 * specifies that the behaviour is unspecified thus we do not</div><div class='del'>-		 * have to do anything.  This means that in our implementation</div><div class='del'>-		 * in the rare case that the file is mmap()ped and a write</div><div class='del'>-		 * occurred into the mmap()ped region just beyond the file size</div><div class='del'>-		 * and writepage has not yet been called to write out the page</div><div class='del'>-		 * (which would clear the area beyond the file size) and we now</div><div class='del'>-		 * extend the file size to incorporate this dirty region</div><div class='del'>-		 * outside the file size, a write of the page would result in</div><div class='del'>-		 * this data being written to disk instead of being cleared.</div><div class='del'>-		 * Given both POSIX and the Linux mmap(2) man page specify that</div><div class='del'>-		 * this corner case is undefined, we choose to leave it like</div><div class='del'>-		 * that as this is much simpler for us as we cannot lock the</div><div class='del'>-		 * relevant page now since we are holding too many ntfs locks</div><div class='del'>-		 * which would result in a lock reversal deadlock.</div><div class='del'>-		 */</div><div class='del'>-		ni-&gt;initialized_size = new_size;</div><div class='del'>-		write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		goto unm_done;</div><div class='del'>-	}</div><div class='del'>-	/* If the above resize failed, this must be an attribute extension. */</div><div class='del'>-	BUG_ON(size_change &lt; 0);</div><div class='del'>-	/*</div><div class='del'>-	 * We have to drop all the locks so we can call</div><div class='del'>-	 * ntfs_attr_make_non_resident().  This could be optimised by try-</div><div class='del'>-	 * locking the first page cache page and only if that fails dropping</div><div class='del'>-	 * the locks, locking the page, and redoing all the locking and</div><div class='del'>-	 * lookups.  While this would be a huge optimisation, it is not worth</div><div class='del'>-	 * it as this is definitely a slow code path as it only ever can happen</div><div class='del'>-	 * once for any given file.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Not enough space in the mft record, try to make the attribute</div><div class='del'>-	 * non-resident and if successful restart the truncation process.</div><div class='del'>-	 */</div><div class='del'>-	err = ntfs_attr_make_non_resident(ni, old_size);</div><div class='del'>-	if (likely(!err))</div><div class='del'>-		goto retry_truncate;</div><div class='del'>-	/*</div><div class='del'>-	 * Could not make non-resident.  If this is due to this not being</div><div class='del'>-	 * permitted for this attribute type or there not being enough space,</div><div class='del'>-	 * try to make other attributes non-resident.  Otherwise fail.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(err != -EPERM &amp;&amp; err != -ENOSPC)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Cannot truncate inode 0x%lx, attribute "</div><div class='del'>-				"type 0x%x, because the conversion from "</div><div class='del'>-				"resident to non-resident attribute failed "</div><div class='del'>-				"with error code %i.", vi-&gt;i_ino,</div><div class='del'>-				(unsigned)le32_to_cpu(ni-&gt;type), err);</div><div class='del'>-		if (err != -ENOMEM)</div><div class='del'>-			err = -EIO;</div><div class='del'>-		goto conv_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* TODO: Not implemented from here, abort. */</div><div class='del'>-	if (err == -ENOSPC)</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Not enough space in the mft record/on "</div><div class='del'>-				"disk for the non-resident attribute value.  "</div><div class='del'>-				"This case is not implemented yet.");</div><div class='del'>-	else /* if (err == -EPERM) */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "This attribute type may not be "</div><div class='del'>-				"non-resident.  This case is not implemented "</div><div class='del'>-				"yet.");</div><div class='del'>-	err = -EOPNOTSUPP;</div><div class='del'>-	goto conv_err_out;</div><div class='del'>-#if 0</div><div class='del'>-	// TODO: Attempt to make other attributes non-resident.</div><div class='del'>-	if (!err)</div><div class='del'>-		goto do_resident_extend;</div><div class='del'>-	/*</div><div class='del'>-	 * Both the attribute list attribute and the standard information</div><div class='del'>-	 * attribute must remain in the base inode.  Thus, if this is one of</div><div class='del'>-	 * these attributes, we have to try to move other attributes out into</div><div class='del'>-	 * extent mft records instead.</div><div class='del'>-	 */</div><div class='del'>-	if (ni-&gt;type == AT_ATTRIBUTE_LIST ||</div><div class='del'>-			ni-&gt;type == AT_STANDARD_INFORMATION) {</div><div class='del'>-		// TODO: Attempt to move other attributes into extent mft</div><div class='del'>-		// records.</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		if (!err)</div><div class='del'>-			goto do_resident_extend;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	// TODO: Attempt to move this attribute to an extent mft record, but</div><div class='del'>-	// only if it is not already the only attribute in an mft record in</div><div class='del'>-	// which case there would be nothing to gain.</div><div class='del'>-	err = -EOPNOTSUPP;</div><div class='del'>-	if (!err)</div><div class='del'>-		goto do_resident_extend;</div><div class='del'>-	/* There is nothing we can do to make enough space. )-: */</div><div class='del'>-	goto err_out;</div><div class='del'>-#endif</div><div class='del'>-do_non_resident_truncate:</div><div class='del'>-	BUG_ON(!NInoNonResident(ni));</div><div class='del'>-	if (alloc_change &lt; 0) {</div><div class='del'>-		highest_vcn = sle64_to_cpu(a-&gt;data.non_resident.highest_vcn);</div><div class='del'>-		if (highest_vcn &gt; 0 &amp;&amp;</div><div class='del'>-				old_alloc_size &gt;&gt; vol-&gt;cluster_size_bits &gt;</div><div class='del'>-				highest_vcn + 1) {</div><div class='del'>-			/*</div><div class='del'>-			 * This attribute has multiple extents.  Not yet</div><div class='del'>-			 * supported.</div><div class='del'>-			 */</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot truncate inode 0x%lx, "</div><div class='del'>-					"attribute type 0x%x, because the "</div><div class='del'>-					"attribute is highly fragmented (it "</div><div class='del'>-					"consists of multiple extents) and "</div><div class='del'>-					"this case is not implemented yet.",</div><div class='del'>-					vi-&gt;i_ino,</div><div class='del'>-					(unsigned)le32_to_cpu(ni-&gt;type));</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			goto bad_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the size is shrinking, need to reduce the initialized_size and</div><div class='del'>-	 * the data_size before reducing the allocation.</div><div class='del'>-	 */</div><div class='del'>-	if (size_change &lt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Make the valid size smaller (i_size is already up-to-date).</div><div class='del'>-		 */</div><div class='del'>-		write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		if (new_size &lt; ni-&gt;initialized_size) {</div><div class='del'>-			ni-&gt;initialized_size = new_size;</div><div class='del'>-			a-&gt;data.non_resident.initialized_size =</div><div class='del'>-					cpu_to_sle64(new_size);</div><div class='del'>-		}</div><div class='del'>-		a-&gt;data.non_resident.data_size = cpu_to_sle64(new_size);</div><div class='del'>-		write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		/* If the allocated size is not changing, we are done. */</div><div class='del'>-		if (!alloc_change)</div><div class='del'>-			goto unm_done;</div><div class='del'>-		/*</div><div class='del'>-		 * If the size is shrinking it makes no sense for the</div><div class='del'>-		 * allocation to be growing.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(alloc_change &gt; 0);</div><div class='del'>-	} else /* if (size_change &gt;= 0) */ {</div><div class='del'>-		/*</div><div class='del'>-		 * The file size is growing or staying the same but the</div><div class='del'>-		 * allocation can be shrinking, growing or staying the same.</div><div class='del'>-		 */</div><div class='del'>-		if (alloc_change &gt; 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * We need to extend the allocation and possibly update</div><div class='del'>-			 * the data size.  If we are updating the data size,</div><div class='del'>-			 * since we are not touching the initialized_size we do</div><div class='del'>-			 * not need to worry about the actual data on disk.</div><div class='del'>-			 * And as far as the page cache is concerned, there</div><div class='del'>-			 * will be no pages beyond the old data size and any</div><div class='del'>-			 * partial region in the last page between the old and</div><div class='del'>-			 * new data size (or the end of the page if the new</div><div class='del'>-			 * data size is outside the page) does not need to be</div><div class='del'>-			 * modified as explained above for the resident</div><div class='del'>-			 * attribute truncate case.  To do this, we simply drop</div><div class='del'>-			 * the locks we hold and leave all the work to our</div><div class='del'>-			 * friendly helper ntfs_attr_extend_allocation().</div><div class='del'>-			 */</div><div class='del'>-			ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-			unmap_mft_record(base_ni);</div><div class='del'>-			up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-			err = ntfs_attr_extend_allocation(ni, new_size,</div><div class='del'>-					size_change &gt; 0 ? new_size : -1, -1);</div><div class='del'>-			/*</div><div class='del'>-			 * ntfs_attr_extend_allocation() will have done error</div><div class='del'>-			 * output already.</div><div class='del'>-			 */</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		if (!alloc_change)</div><div class='del'>-			goto alloc_done;</div><div class='del'>-	}</div><div class='del'>-	/* alloc_change &lt; 0 */</div><div class='del'>-	/* Free the clusters. */</div><div class='del'>-	nr_freed = ntfs_cluster_free(ni, new_alloc_size &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits, -1, ctx);</div><div class='del'>-	m = ctx-&gt;mrec;</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	if (unlikely(nr_freed &lt; 0)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to release cluster(s) (error code "</div><div class='del'>-				"%lli).  Unmount and run chkdsk to recover "</div><div class='del'>-				"the lost cluster(s).", (long long)nr_freed);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-		nr_freed = 0;</div><div class='del'>-	}</div><div class='del'>-	/* Truncate the runlist. */</div><div class='del'>-	err = ntfs_rl_truncate_nolock(vol, &amp;ni-&gt;runlist,</div><div class='del'>-			new_alloc_size &gt;&gt; vol-&gt;cluster_size_bits);</div><div class='del'>-	/*</div><div class='del'>-	 * If the runlist truncation failed and/or the search context is no</div><div class='del'>-	 * longer valid, we cannot resize the attribute record or build the</div><div class='del'>-	 * mapping pairs array thus we mark the inode bad so that no access to</div><div class='del'>-	 * the freed clusters can happen.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(err || IS_ERR(m))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to %s (error code %li).%s",</div><div class='del'>-				IS_ERR(m) ?</div><div class='del'>-				"restore attribute search context" :</div><div class='del'>-				"truncate attribute runlist",</div><div class='del'>-				IS_ERR(m) ? PTR_ERR(m) : err, es);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto bad_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the size for the shrunk mapping pairs array for the runlist. */</div><div class='del'>-	mp_size = ntfs_get_size_for_mapping_pairs(vol, ni-&gt;runlist.rl, 0, -1);</div><div class='del'>-	if (unlikely(mp_size &lt;= 0)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Cannot shrink allocation of inode 0x%lx, "</div><div class='del'>-				"attribute type 0x%x, because determining the "</div><div class='del'>-				"size for the mapping pairs failed with error "</div><div class='del'>-				"code %i.%s", vi-&gt;i_ino,</div><div class='del'>-				(unsigned)le32_to_cpu(ni-&gt;type), mp_size, es);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto bad_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Shrink the attribute record for the new mapping pairs array.  Note,</div><div class='del'>-	 * this cannot fail since we are making the attribute smaller thus by</div><div class='del'>-	 * definition there is enough space to do so.</div><div class='del'>-	 */</div><div class='del'>-	err = ntfs_attr_record_resize(m, a, mp_size +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset));</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-	/*</div><div class='del'>-	 * Generate the mapping pairs array directly into the attribute record.</div><div class='del'>-	 */</div><div class='del'>-	err = ntfs_mapping_pairs_build(vol, (u8*)a +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-			mp_size, ni-&gt;runlist.rl, 0, -1, NULL);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Cannot shrink allocation of inode 0x%lx, "</div><div class='del'>-				"attribute type 0x%x, because building the "</div><div class='del'>-				"mapping pairs failed with error code %i.%s",</div><div class='del'>-				vi-&gt;i_ino, (unsigned)le32_to_cpu(ni-&gt;type),</div><div class='del'>-				err, es);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto bad_out;</div><div class='del'>-	}</div><div class='del'>-	/* Update the allocated/compressed size as well as the highest vcn. */</div><div class='del'>-	a-&gt;data.non_resident.highest_vcn = cpu_to_sle64((new_alloc_size &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits) - 1);</div><div class='del'>-	write_lock_irqsave(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	ni-&gt;allocated_size = new_alloc_size;</div><div class='del'>-	a-&gt;data.non_resident.allocated_size = cpu_to_sle64(new_alloc_size);</div><div class='del'>-	if (NInoSparse(ni) || NInoCompressed(ni)) {</div><div class='del'>-		if (nr_freed) {</div><div class='del'>-			ni-&gt;itype.compressed.size -= nr_freed &lt;&lt;</div><div class='del'>-					vol-&gt;cluster_size_bits;</div><div class='del'>-			BUG_ON(ni-&gt;itype.compressed.size &lt; 0);</div><div class='del'>-			a-&gt;data.non_resident.compressed_size = cpu_to_sle64(</div><div class='del'>-					ni-&gt;itype.compressed.size);</div><div class='del'>-			vi-&gt;i_blocks = ni-&gt;itype.compressed.size &gt;&gt; 9;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		vi-&gt;i_blocks = new_alloc_size &gt;&gt; 9;</div><div class='del'>-	write_unlock_irqrestore(&amp;ni-&gt;size_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * We have shrunk the allocation.  If this is a shrinking truncate we</div><div class='del'>-	 * have already dealt with the initialized_size and the data_size above</div><div class='del'>-	 * and we are done.  If the truncate is only changing the allocation</div><div class='del'>-	 * and not the data_size, we are also done.  If this is an extending</div><div class='del'>-	 * truncate, need to extend the data_size now which is ensured by the</div><div class='del'>-	 * fact that @size_change is positive.</div><div class='del'>-	 */</div><div class='del'>-alloc_done:</div><div class='del'>-	/*</div><div class='del'>-	 * If the size is growing, need to update it now.  If it is shrinking,</div><div class='del'>-	 * we have already updated it above (before the allocation change).</div><div class='del'>-	 */</div><div class='del'>-	if (size_change &gt; 0)</div><div class='del'>-		a-&gt;data.non_resident.data_size = cpu_to_sle64(new_size);</div><div class='del'>-	/* Ensure the modified mft record is written out. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-unm_done:</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-done:</div><div class='del'>-	/* Update the mtime and ctime on the base inode. */</div><div class='del'>-	/* normally -&gt;truncate shouldn't update ctime or mtime,</div><div class='del'>-	 * but ntfs did before so it got a copy &amp; paste version</div><div class='del'>-	 * of file_update_time.  one day someone should fix this</div><div class='del'>-	 * for real.</div><div class='del'>-	 */</div><div class='del'>-	if (!IS_NOCMTIME(VFS_I(base_ni)) &amp;&amp; !IS_RDONLY(VFS_I(base_ni))) {</div><div class='del'>-		struct timespec64 now = current_time(VFS_I(base_ni));</div><div class='del'>-		struct timespec64 ctime = inode_get_ctime(VFS_I(base_ni));</div><div class='del'>-		struct timespec64 mtime = inode_get_mtime(VFS_I(base_ni));</div><div class='del'>-		int sync_it = 0;</div><div class='del'>-</div><div class='del'>-		if (!timespec64_equal(&amp;mtime, &amp;now) ||</div><div class='del'>-		    !timespec64_equal(&amp;ctime, &amp;now))</div><div class='del'>-			sync_it = 1;</div><div class='del'>-		inode_set_ctime_to_ts(VFS_I(base_ni), now);</div><div class='del'>-		inode_set_mtime_to_ts(VFS_I(base_ni), now);</div><div class='del'>-</div><div class='del'>-		if (sync_it)</div><div class='del'>-			mark_inode_dirty_sync(VFS_I(base_ni));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		NInoClearTruncateFailed(ni);</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-old_bad_out:</div><div class='del'>-	old_size = -1;</div><div class='del'>-bad_out:</div><div class='del'>-	if (err != -ENOMEM &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	if (err != -EOPNOTSUPP)</div><div class='del'>-		NInoSetTruncateFailed(ni);</div><div class='del'>-	else if (old_size &gt;= 0)</div><div class='del'>-		i_size_write(vi, old_size);</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(base_ni);</div><div class='del'>-	up_write(&amp;ni-&gt;runlist.lock);</div><div class='del'>-out:</div><div class='del'>-	ntfs_debug("Failed.  Returning error code %i.", err);</div><div class='del'>-	return err;</div><div class='del'>-conv_err_out:</div><div class='del'>-	if (err != -ENOMEM &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	if (err != -EOPNOTSUPP)</div><div class='del'>-		NInoSetTruncateFailed(ni);</div><div class='del'>-	else</div><div class='del'>-		i_size_write(vi, old_size);</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_truncate_vfs - wrapper for ntfs_truncate() that has no return value</div><div class='del'>- * @vi:		inode for which the i_size was changed</div><div class='del'>- *</div><div class='del'>- * Wrapper for ntfs_truncate() that has no return value.</div><div class='del'>- *</div><div class='del'>- * See ntfs_truncate() description above for details.</div><div class='del'>- */</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-void ntfs_truncate_vfs(struct inode *vi) {</div><div class='del'>-	ntfs_truncate(vi);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_setattr - called from notify_change() when an attribute is being changed</div><div class='del'>- * @idmap:	idmap of the mount the inode was found from</div><div class='del'>- * @dentry:	dentry whose attributes to change</div><div class='del'>- * @attr:	structure describing the attributes and the changes</div><div class='del'>- *</div><div class='del'>- * We have to trap VFS attempts to truncate the file described by @dentry as</div><div class='del'>- * soon as possible, because we do not implement changes in i_size yet.  So we</div><div class='del'>- * abort all i_size changes here.</div><div class='del'>- *</div><div class='del'>- * We also abort all changes of user, group, and mode as we do not implement</div><div class='del'>- * the NTFS ACLs yet.</div><div class='del'>- *</div><div class='del'>- * Called with -&gt;i_mutex held.</div><div class='del'>- */</div><div class='del'>-int ntfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		 struct iattr *attr)</div><div class='del'>-{</div><div class='del'>-	struct inode *vi = d_inode(dentry);</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int ia_valid = attr-&gt;ia_valid;</div><div class='del'>-</div><div class='del'>-	err = setattr_prepare(&amp;nop_mnt_idmap, dentry, attr);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	/* We do not support NTFS ACLs yet. */</div><div class='del'>-	if (ia_valid &amp; (ATTR_UID | ATTR_GID | ATTR_MODE)) {</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Changes in user/group/mode are not "</div><div class='del'>-				"supported yet, ignoring.");</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (ia_valid &amp; ATTR_SIZE) {</div><div class='del'>-		if (attr-&gt;ia_size != i_size_read(vi)) {</div><div class='del'>-			ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-			/*</div><div class='del'>-			 * FIXME: For now we do not support resizing of</div><div class='del'>-			 * compressed or encrypted files yet.</div><div class='del'>-			 */</div><div class='del'>-			if (NInoCompressed(ni) || NInoEncrypted(ni)) {</div><div class='del'>-				ntfs_warning(vi-&gt;i_sb, "Changes in inode size "</div><div class='del'>-						"are not supported yet for "</div><div class='del'>-						"%s files, ignoring.",</div><div class='del'>-						NInoCompressed(ni) ?</div><div class='del'>-						"compressed" : "encrypted");</div><div class='del'>-				err = -EOPNOTSUPP;</div><div class='del'>-			} else {</div><div class='del'>-				truncate_setsize(vi, attr-&gt;ia_size);</div><div class='del'>-				ntfs_truncate_vfs(vi);</div><div class='del'>-			}</div><div class='del'>-			if (err || ia_valid == ATTR_SIZE)</div><div class='del'>-				goto out;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * We skipped the truncate but must still update</div><div class='del'>-			 * timestamps.</div><div class='del'>-			 */</div><div class='del'>-			ia_valid |= ATTR_MTIME | ATTR_CTIME;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ia_valid &amp; ATTR_ATIME)</div><div class='del'>-		inode_set_atime_to_ts(vi, attr-&gt;ia_atime);</div><div class='del'>-	if (ia_valid &amp; ATTR_MTIME)</div><div class='del'>-		inode_set_mtime_to_ts(vi, attr-&gt;ia_mtime);</div><div class='del'>-	if (ia_valid &amp; ATTR_CTIME)</div><div class='del'>-		inode_set_ctime_to_ts(vi, attr-&gt;ia_ctime);</div><div class='del'>-	mark_inode_dirty(vi);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_write_inode - write out a dirty inode</div><div class='del'>- * @vi:		inode to write out</div><div class='del'>- * @sync:	if true, write out synchronously</div><div class='del'>- *</div><div class='del'>- * Write out a dirty inode to disk including any extent inodes if present.</div><div class='del'>- *</div><div class='del'>- * If @sync is true, commit the inode to disk and wait for io completion.  This</div><div class='del'>- * is done using write_mft_record().</div><div class='del'>- *</div><div class='del'>- * If @sync is false, just schedule the write to happen but do not wait for i/o</div><div class='del'>- * completion.  In 2.6 kernels, scheduling usually happens just by virtue of</div><div class='del'>- * marking the page (and in this case mft record) dirty but we do not implement</div><div class='del'>- * this yet as write_mft_record() largely ignores the @sync parameter and</div><div class='del'>- * always performs synchronous writes.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-int __ntfs_write_inode(struct inode *vi, int sync)</div><div class='del'>-{</div><div class='del'>-	sle64 nt;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	STANDARD_INFORMATION *si;</div><div class='del'>-	int err = 0;</div><div class='del'>-	bool modified = false;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for %sinode 0x%lx.", NInoAttr(ni) ? "attr " : "",</div><div class='del'>-			vi-&gt;i_ino);</div><div class='del'>-	/*</div><div class='del'>-	 * Dirty attribute inodes are written via their real inodes so just</div><div class='del'>-	 * clean them here.  Access time updates are taken care off when the</div><div class='del'>-	 * real inode is written.</div><div class='del'>-	 */</div><div class='del'>-	if (NInoAttr(ni)) {</div><div class='del'>-		NInoClearDirty(ni);</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* Map, pin, and lock the mft record belonging to the inode. */</div><div class='del'>-	m = map_mft_record(ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Update the access times in the standard information attribute. */</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(AT_STANDARD_INFORMATION, NULL, 0,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	si = (STANDARD_INFORMATION*)((u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-	/* Update the access times if they have changed. */</div><div class='del'>-	nt = utc2ntfs(inode_get_mtime(vi));</div><div class='del'>-	if (si-&gt;last_data_change_time != nt) {</div><div class='del'>-		ntfs_debug("Updating mtime for inode 0x%lx: old = 0x%llx, "</div><div class='del'>-				"new = 0x%llx", vi-&gt;i_ino, (long long)</div><div class='del'>-				sle64_to_cpu(si-&gt;last_data_change_time),</div><div class='del'>-				(long long)sle64_to_cpu(nt));</div><div class='del'>-		si-&gt;last_data_change_time = nt;</div><div class='del'>-		modified = true;</div><div class='del'>-	}</div><div class='del'>-	nt = utc2ntfs(inode_get_ctime(vi));</div><div class='del'>-	if (si-&gt;last_mft_change_time != nt) {</div><div class='del'>-		ntfs_debug("Updating ctime for inode 0x%lx: old = 0x%llx, "</div><div class='del'>-				"new = 0x%llx", vi-&gt;i_ino, (long long)</div><div class='del'>-				sle64_to_cpu(si-&gt;last_mft_change_time),</div><div class='del'>-				(long long)sle64_to_cpu(nt));</div><div class='del'>-		si-&gt;last_mft_change_time = nt;</div><div class='del'>-		modified = true;</div><div class='del'>-	}</div><div class='del'>-	nt = utc2ntfs(inode_get_atime(vi));</div><div class='del'>-	if (si-&gt;last_access_time != nt) {</div><div class='del'>-		ntfs_debug("Updating atime for inode 0x%lx: old = 0x%llx, "</div><div class='del'>-				"new = 0x%llx", vi-&gt;i_ino,</div><div class='del'>-				(long long)sle64_to_cpu(si-&gt;last_access_time),</div><div class='del'>-				(long long)sle64_to_cpu(nt));</div><div class='del'>-		si-&gt;last_access_time = nt;</div><div class='del'>-		modified = true;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If we just modified the standard information attribute we need to</div><div class='del'>-	 * mark the mft record it is in dirty.  We do this manually so that</div><div class='del'>-	 * mark_inode_dirty() is not called which would redirty the inode and</div><div class='del'>-	 * hence result in an infinite loop of trying to write the inode.</div><div class='del'>-	 * There is no need to mark the base inode nor the base mft record</div><div class='del'>-	 * dirty, since we are going to write this mft record below in any case</div><div class='del'>-	 * and the base mft record may actually not have been modified so it</div><div class='del'>-	 * might not need to be written out.</div><div class='del'>-	 * NOTE: It is not a problem when the inode for $MFT itself is being</div><div class='del'>-	 * written out as mark_ntfs_record_dirty() will only set I_DIRTY_PAGES</div><div class='del'>-	 * on the $MFT inode and hence __ntfs_write_inode() will not be</div><div class='del'>-	 * re-invoked because of it which in turn is ok since the dirtied mft</div><div class='del'>-	 * record will be cleaned and written out to disk below, i.e. before</div><div class='del'>-	 * this function returns.</div><div class='del'>-	 */</div><div class='del'>-	if (modified) {</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		if (!NInoTestSetDirty(ctx-&gt;ntfs_ino))</div><div class='del'>-			mark_ntfs_record_dirty(ctx-&gt;ntfs_ino-&gt;page,</div><div class='del'>-					ctx-&gt;ntfs_ino-&gt;page_ofs);</div><div class='del'>-	}</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	/* Now the access times are updated, write the base mft record. */</div><div class='del'>-	if (NInoDirty(ni))</div><div class='del'>-		err = write_mft_record(ni, m, sync);</div><div class='del'>-	/* Write all attached extent mft records. */</div><div class='del'>-	mutex_lock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	if (ni-&gt;nr_extents &gt; 0) {</div><div class='del'>-		ntfs_inode **extent_nis = ni-&gt;ext.extent_ntfs_inos;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Writing %i extent inodes.", ni-&gt;nr_extents);</div><div class='del'>-		for (i = 0; i &lt; ni-&gt;nr_extents; i++) {</div><div class='del'>-			ntfs_inode *tni = extent_nis[i];</div><div class='del'>-</div><div class='del'>-			if (NInoDirty(tni)) {</div><div class='del'>-				MFT_RECORD *tm = map_mft_record(tni);</div><div class='del'>-				int ret;</div><div class='del'>-</div><div class='del'>-				if (IS_ERR(tm)) {</div><div class='del'>-					if (!err || err == -ENOMEM)</div><div class='del'>-						err = PTR_ERR(tm);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				ret = write_mft_record(tni, tm, sync);</div><div class='del'>-				unmap_mft_record(tni);</div><div class='del'>-				if (unlikely(ret)) {</div><div class='del'>-					if (!err || err == -ENOMEM)</div><div class='del'>-						err = ret;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto err_out;</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-unm_err_out:</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-err_out:</div><div class='del'>-	if (err == -ENOMEM) {</div><div class='del'>-		ntfs_warning(vi-&gt;i_sb, "Not enough memory to write inode.  "</div><div class='del'>-				"Marking the inode dirty again, so the VFS "</div><div class='del'>-				"retries later.");</div><div class='del'>-		mark_inode_dirty(vi);</div><div class='del'>-	} else {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed (error %i):  Run chkdsk.", -err);</div><div class='del'>-		NVolSetErrors(ni-&gt;vol);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/inode.h b/fs/ntfs/inode.h<br/>deleted file mode 100644<br/>index 147ef4ddb691..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/inode.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,310 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * inode.h - Defines for inode structures NTFS Linux kernel driver. Part of</div><div class='del'>- *	     the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2007 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_INODE_H</div><div class='del'>-#define _LINUX_NTFS_INODE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "runlist.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-</div><div class='del'>-typedef struct _ntfs_inode ntfs_inode;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The NTFS in-memory inode structure. It is just used as an extension to the</div><div class='del'>- * fields already provided in the VFS inode.</div><div class='del'>- */</div><div class='del'>-struct _ntfs_inode {</div><div class='del'>-	rwlock_t size_lock;	/* Lock serializing access to inode sizes. */</div><div class='del'>-	s64 initialized_size;	/* Copy from the attribute record. */</div><div class='del'>-	s64 allocated_size;	/* Copy from the attribute record. */</div><div class='del'>-	unsigned long state;	/* NTFS specific flags describing this inode.</div><div class='del'>-				   See ntfs_inode_state_bits below. */</div><div class='del'>-	unsigned long mft_no;	/* Number of the mft record / inode. */</div><div class='del'>-	u16 seq_no;		/* Sequence number of the mft record. */</div><div class='del'>-	atomic_t count;		/* Inode reference count for book keeping. */</div><div class='del'>-	ntfs_volume *vol;	/* Pointer to the ntfs volume of this inode. */</div><div class='del'>-	/*</div><div class='del'>-	 * If NInoAttr() is true, the below fields describe the attribute which</div><div class='del'>-	 * this fake inode belongs to. The actual inode of this attribute is</div><div class='del'>-	 * pointed to by base_ntfs_ino and nr_extents is always set to -1 (see</div><div class='del'>-	 * below). For real inodes, we also set the type (AT_DATA for files and</div><div class='del'>-	 * AT_INDEX_ALLOCATION for directories), with the name = NULL and</div><div class='del'>-	 * name_len = 0 for files and name = I30 (global constant) and</div><div class='del'>-	 * name_len = 4 for directories.</div><div class='del'>-	 */</div><div class='del'>-	ATTR_TYPE type;	/* Attribute type of this fake inode. */</div><div class='del'>-	ntfschar *name;		/* Attribute name of this fake inode. */</div><div class='del'>-	u32 name_len;		/* Attribute name length of this fake inode. */</div><div class='del'>-	runlist runlist;	/* If state has the NI_NonResident bit set,</div><div class='del'>-				   the runlist of the unnamed data attribute</div><div class='del'>-				   (if a file) or of the index allocation</div><div class='del'>-				   attribute (directory) or of the attribute</div><div class='del'>-				   described by the fake inode (if NInoAttr()).</div><div class='del'>-				   If runlist.rl is NULL, the runlist has not</div><div class='del'>-				   been read in yet or has been unmapped. If</div><div class='del'>-				   NI_NonResident is clear, the attribute is</div><div class='del'>-				   resident (file and fake inode) or there is</div><div class='del'>-				   no $I30 index allocation attribute</div><div class='del'>-				   (small directory). In the latter case</div><div class='del'>-				   runlist.rl is always NULL.*/</div><div class='del'>-	/*</div><div class='del'>-	 * The following fields are only valid for real inodes and extent</div><div class='del'>-	 * inodes.</div><div class='del'>-	 */</div><div class='del'>-	struct mutex mrec_lock;	/* Lock for serializing access to the</div><div class='del'>-				   mft record belonging to this inode. */</div><div class='del'>-	struct page *page;	/* The page containing the mft record of the</div><div class='del'>-				   inode. This should only be touched by the</div><div class='del'>-				   (un)map_mft_record*() functions. */</div><div class='del'>-	int page_ofs;		/* Offset into the page at which the mft record</div><div class='del'>-				   begins. This should only be touched by the</div><div class='del'>-				   (un)map_mft_record*() functions. */</div><div class='del'>-	/*</div><div class='del'>-	 * Attribute list support (only for use by the attribute lookup</div><div class='del'>-	 * functions). Setup during read_inode for all inodes with attribute</div><div class='del'>-	 * lists. Only valid if NI_AttrList is set in state, and attr_list_rl is</div><div class='del'>-	 * further only valid if NI_AttrListNonResident is set.</div><div class='del'>-	 */</div><div class='del'>-	u32 attr_list_size;	/* Length of attribute list value in bytes. */</div><div class='del'>-	u8 *attr_list;		/* Attribute list value itself. */</div><div class='del'>-	runlist attr_list_rl;	/* Run list for the attribute list value. */</div><div class='del'>-	union {</div><div class='del'>-		struct { /* It is a directory, $MFT, or an index inode. */</div><div class='del'>-			u32 block_size;		/* Size of an index block. */</div><div class='del'>-			u32 vcn_size;		/* Size of a vcn in this</div><div class='del'>-						   index. */</div><div class='del'>-			COLLATION_RULE collation_rule; /* The collation rule</div><div class='del'>-						   for the index. */</div><div class='del'>-			u8 block_size_bits; 	/* Log2 of the above. */</div><div class='del'>-			u8 vcn_size_bits;	/* Log2 of the above. */</div><div class='del'>-		} index;</div><div class='del'>-		struct { /* It is a compressed/sparse file/attribute inode. */</div><div class='del'>-			s64 size;		/* Copy of compressed_size from</div><div class='del'>-						   $DATA. */</div><div class='del'>-			u32 block_size;		/* Size of a compression block</div><div class='del'>-						   (cb). */</div><div class='del'>-			u8 block_size_bits;	/* Log2 of the size of a cb. */</div><div class='del'>-			u8 block_clusters;	/* Number of clusters per cb. */</div><div class='del'>-		} compressed;</div><div class='del'>-	} itype;</div><div class='del'>-	struct mutex extent_lock;	/* Lock for accessing/modifying the</div><div class='del'>-					   below . */</div><div class='del'>-	s32 nr_extents;	/* For a base mft record, the number of attached extent</div><div class='del'>-			   inodes (0 if none), for extent records and for fake</div><div class='del'>-			   inodes describing an attribute this is -1. */</div><div class='del'>-	union {		/* This union is only used if nr_extents != 0. */</div><div class='del'>-		ntfs_inode **extent_ntfs_inos;	/* For nr_extents &gt; 0, array of</div><div class='del'>-						   the ntfs inodes of the extent</div><div class='del'>-						   mft records belonging to</div><div class='del'>-						   this base inode which have</div><div class='del'>-						   been loaded. */</div><div class='del'>-		ntfs_inode *base_ntfs_ino;	/* For nr_extents == -1, the</div><div class='del'>-						   ntfs inode of the base mft</div><div class='del'>-						   record. For fake inodes, the</div><div class='del'>-						   real (base) inode to which</div><div class='del'>-						   the attribute belongs. */</div><div class='del'>-	} ext;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Defined bits for the state field in the ntfs_inode structure.</div><div class='del'>- * (f) = files only, (d) = directories only, (a) = attributes/fake inodes only</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	NI_Dirty,		/* 1: Mft record needs to be written to disk. */</div><div class='del'>-	NI_AttrList,		/* 1: Mft record contains an attribute list. */</div><div class='del'>-	NI_AttrListNonResident,	/* 1: Attribute list is non-resident. Implies</div><div class='del'>-				      NI_AttrList is set. */</div><div class='del'>-</div><div class='del'>-	NI_Attr,		/* 1: Fake inode for attribute i/o.</div><div class='del'>-				   0: Real inode or extent inode. */</div><div class='del'>-</div><div class='del'>-	NI_MstProtected,	/* 1: Attribute is protected by MST fixups.</div><div class='del'>-				   0: Attribute is not protected by fixups. */</div><div class='del'>-	NI_NonResident,		/* 1: Unnamed data attr is non-resident (f).</div><div class='del'>-				   1: Attribute is non-resident (a). */</div><div class='del'>-	NI_IndexAllocPresent = NI_NonResident,	/* 1: $I30 index alloc attr is</div><div class='del'>-						   present (d). */</div><div class='del'>-	NI_Compressed,		/* 1: Unnamed data attr is compressed (f).</div><div class='del'>-				   1: Create compressed files by default (d).</div><div class='del'>-				   1: Attribute is compressed (a). */</div><div class='del'>-	NI_Encrypted,		/* 1: Unnamed data attr is encrypted (f).</div><div class='del'>-				   1: Create encrypted files by default (d).</div><div class='del'>-				   1: Attribute is encrypted (a). */</div><div class='del'>-	NI_Sparse,		/* 1: Unnamed data attr is sparse (f).</div><div class='del'>-				   1: Create sparse files by default (d).</div><div class='del'>-				   1: Attribute is sparse (a). */</div><div class='del'>-	NI_SparseDisabled,	/* 1: May not create sparse regions. */</div><div class='del'>-	NI_TruncateFailed,	/* 1: Last ntfs_truncate() call failed. */</div><div class='del'>-} ntfs_inode_state_bits;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE: We should be adding dirty mft records to a list somewhere and they</div><div class='del'>- * should be independent of the (ntfs/vfs) inode structure so that an inode can</div><div class='del'>- * be removed but the record can be left dirty for syncing later.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Macro tricks to expand the NInoFoo(), NInoSetFoo(), and NInoClearFoo()</div><div class='del'>- * functions.</div><div class='del'>- */</div><div class='del'>-#define NINO_FNS(flag)					\</div><div class='del'>-static inline int NIno##flag(ntfs_inode *ni)		\</div><div class='del'>-{							\</div><div class='del'>-	return test_bit(NI_##flag, &amp;(ni)-&gt;state);	\</div><div class='del'>-}							\</div><div class='del'>-static inline void NInoSet##flag(ntfs_inode *ni)	\</div><div class='del'>-{							\</div><div class='del'>-	set_bit(NI_##flag, &amp;(ni)-&gt;state);		\</div><div class='del'>-}							\</div><div class='del'>-static inline void NInoClear##flag(ntfs_inode *ni)	\</div><div class='del'>-{							\</div><div class='del'>-	clear_bit(NI_##flag, &amp;(ni)-&gt;state);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * As above for NInoTestSetFoo() and NInoTestClearFoo().</div><div class='del'>- */</div><div class='del'>-#define TAS_NINO_FNS(flag)					\</div><div class='del'>-static inline int NInoTestSet##flag(ntfs_inode *ni)		\</div><div class='del'>-{								\</div><div class='del'>-	return test_and_set_bit(NI_##flag, &amp;(ni)-&gt;state);	\</div><div class='del'>-}								\</div><div class='del'>-static inline int NInoTestClear##flag(ntfs_inode *ni)		\</div><div class='del'>-{								\</div><div class='del'>-	return test_and_clear_bit(NI_##flag, &amp;(ni)-&gt;state);	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emit the ntfs inode bitops functions. */</div><div class='del'>-NINO_FNS(Dirty)</div><div class='del'>-TAS_NINO_FNS(Dirty)</div><div class='del'>-NINO_FNS(AttrList)</div><div class='del'>-NINO_FNS(AttrListNonResident)</div><div class='del'>-NINO_FNS(Attr)</div><div class='del'>-NINO_FNS(MstProtected)</div><div class='del'>-NINO_FNS(NonResident)</div><div class='del'>-NINO_FNS(IndexAllocPresent)</div><div class='del'>-NINO_FNS(Compressed)</div><div class='del'>-NINO_FNS(Encrypted)</div><div class='del'>-NINO_FNS(Sparse)</div><div class='del'>-NINO_FNS(SparseDisabled)</div><div class='del'>-NINO_FNS(TruncateFailed)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The full structure containing a ntfs_inode and a vfs struct inode. Used for</div><div class='del'>- * all real and fake inodes but not for extent inodes which lack the vfs struct</div><div class='del'>- * inode.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	ntfs_inode ntfs_inode;</div><div class='del'>-	struct inode vfs_inode;		/* The vfs inode structure. */</div><div class='del'>-} big_ntfs_inode;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * NTFS_I - return the ntfs inode given a vfs inode</div><div class='del'>- * @inode:	VFS inode</div><div class='del'>- *</div><div class='del'>- * NTFS_I() returns the ntfs inode associated with the VFS @inode.</div><div class='del'>- */</div><div class='del'>-static inline ntfs_inode *NTFS_I(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return (ntfs_inode *)container_of(inode, big_ntfs_inode, vfs_inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct inode *VFS_I(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	return &amp;((big_ntfs_inode *)ni)-&gt;vfs_inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_attr - ntfs in memory attribute structure</div><div class='del'>- * @mft_no:	mft record number of the base mft record of this attribute</div><div class='del'>- * @name:	Unicode name of the attribute (NULL if unnamed)</div><div class='del'>- * @name_len:	length of @name in Unicode characters (0 if unnamed)</div><div class='del'>- * @type:	attribute type (see layout.h)</div><div class='del'>- *</div><div class='del'>- * This structure exists only to provide a small structure for the</div><div class='del'>- * ntfs_{attr_}iget()/ntfs_test_inode()/ntfs_init_locked_inode() mechanism.</div><div class='del'>- *</div><div class='del'>- * NOTE: Elements are ordered by size to make the structure as compact as</div><div class='del'>- * possible on all architectures.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned long mft_no;</div><div class='del'>-	ntfschar *name;</div><div class='del'>-	u32 name_len;</div><div class='del'>-	ATTR_TYPE type;</div><div class='del'>-} ntfs_attr;</div><div class='del'>-</div><div class='del'>-extern int ntfs_test_inode(struct inode *vi, void *data);</div><div class='del'>-</div><div class='del'>-extern struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no);</div><div class='del'>-extern struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPE type,</div><div class='del'>-		ntfschar *name, u32 name_len);</div><div class='del'>-extern struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name,</div><div class='del'>-		u32 name_len);</div><div class='del'>-</div><div class='del'>-extern struct inode *ntfs_alloc_big_inode(struct super_block *sb);</div><div class='del'>-extern void ntfs_free_big_inode(struct inode *inode);</div><div class='del'>-extern void ntfs_evict_big_inode(struct inode *vi);</div><div class='del'>-</div><div class='del'>-extern void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni);</div><div class='del'>-</div><div class='del'>-static inline void ntfs_init_big_inode(struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	__ntfs_init_inode(vi-&gt;i_sb, ni);</div><div class='del'>-	ni-&gt;mft_no = vi-&gt;i_ino;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern ntfs_inode *ntfs_new_extent_inode(struct super_block *sb,</div><div class='del'>-		unsigned long mft_no);</div><div class='del'>-extern void ntfs_clear_extent_inode(ntfs_inode *ni);</div><div class='del'>-</div><div class='del'>-extern int ntfs_read_inode_mount(struct inode *vi);</div><div class='del'>-</div><div class='del'>-extern int ntfs_show_options(struct seq_file *sf, struct dentry *root);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-extern int ntfs_truncate(struct inode *vi);</div><div class='del'>-extern void ntfs_truncate_vfs(struct inode *vi);</div><div class='del'>-</div><div class='del'>-extern int ntfs_setattr(struct mnt_idmap *idmap,</div><div class='del'>-			struct dentry *dentry, struct iattr *attr);</div><div class='del'>-</div><div class='del'>-extern int __ntfs_write_inode(struct inode *vi, int sync);</div><div class='del'>-</div><div class='del'>-static inline void ntfs_commit_inode(struct inode *vi)</div><div class='del'>-{</div><div class='del'>-	if (!is_bad_inode(vi))</div><div class='del'>-		__ntfs_write_inode(vi, 1);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void ntfs_truncate_vfs(struct inode *vi) {}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_INODE_H */</div><div class='head'>diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h<br/>deleted file mode 100644<br/>index 5d4bf7a3259f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/layout.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/layout.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2421 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * layout.h - All NTFS associated on-disk structures. Part of the Linux-NTFS</div><div class='del'>- *	      project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2005 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_LAYOUT_H</div><div class='del'>-#define _LINUX_NTFS_LAYOUT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-</div><div class='del'>-/* The NTFS oem_id "NTFS    " */</div><div class='del'>-#define magicNTFS	cpu_to_le64(0x202020205346544eULL)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Location of bootsector on partition:</div><div class='del'>- *	The standard NTFS_BOOT_SECTOR is on sector 0 of the partition.</div><div class='del'>- *	On NT4 and above there is one backup copy of the boot sector to</div><div class='del'>- *	be found on the last sector of the partition (not normally accessible</div><div class='del'>- *	from within Windows as the bootsector contained number of sectors</div><div class='del'>- *	value is one less than the actual value!).</div><div class='del'>- *	On versions of NT 3.51 and earlier, the backup copy was located at</div><div class='del'>- *	number of sectors/2 (integer divide), i.e. in the middle of the volume.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS parameter block (bpb) structure.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le16 bytes_per_sector;		/* Size of a sector in bytes. */</div><div class='del'>-	u8  sectors_per_cluster;	/* Size of a cluster in sectors. */</div><div class='del'>-	le16 reserved_sectors;		/* zero */</div><div class='del'>-	u8  fats;			/* zero */</div><div class='del'>-	le16 root_entries;		/* zero */</div><div class='del'>-	le16 sectors;			/* zero */</div><div class='del'>-	u8  media_type;			/* 0xf8 = hard disk */</div><div class='del'>-	le16 sectors_per_fat;		/* zero */</div><div class='del'>-	le16 sectors_per_track;		/* irrelevant */</div><div class='del'>-	le16 heads;			/* irrelevant */</div><div class='del'>-	le32 hidden_sectors;		/* zero */</div><div class='del'>-	le32 large_sectors;		/* zero */</div><div class='del'>-} __attribute__ ((__packed__)) BIOS_PARAMETER_BLOCK;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NTFS boot sector structure.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8  jump[3];			/* Irrelevant (jump to boot up code).*/</div><div class='del'>-	le64 oem_id;			/* Magic "NTFS    ". */</div><div class='del'>-	BIOS_PARAMETER_BLOCK bpb;	/* See BIOS_PARAMETER_BLOCK. */</div><div class='del'>-	u8  unused[4];			/* zero, NTFS diskedit.exe states that</div><div class='del'>-					   this is actually:</div><div class='del'>-						__u8 physical_drive;	// 0x80</div><div class='del'>-						__u8 current_head;	// zero</div><div class='del'>-						__u8 extended_boot_signature;</div><div class='del'>-									// 0x80</div><div class='del'>-						__u8 unused;		// zero</div><div class='del'>-					 */</div><div class='del'>-/*0x28*/sle64 number_of_sectors;	/* Number of sectors in volume. Gives</div><div class='del'>-					   maximum volume size of 2^63 sectors.</div><div class='del'>-					   Assuming standard sector size of 512</div><div class='del'>-					   bytes, the maximum byte size is</div><div class='del'>-					   approx. 4.7x10^21 bytes. (-; */</div><div class='del'>-	sle64 mft_lcn;			/* Cluster location of mft data. */</div><div class='del'>-	sle64 mftmirr_lcn;		/* Cluster location of copy of mft. */</div><div class='del'>-	s8  clusters_per_mft_record;	/* Mft record size in clusters. */</div><div class='del'>-	u8  reserved0[3];		/* zero */</div><div class='del'>-	s8  clusters_per_index_record;	/* Index block size in clusters. */</div><div class='del'>-	u8  reserved1[3];		/* zero */</div><div class='del'>-	le64 volume_serial_number;	/* Irrelevant (serial number). */</div><div class='del'>-	le32 checksum;			/* Boot sector checksum. */</div><div class='del'>-/*0x54*/u8  bootstrap[426];		/* Irrelevant (boot up code). */</div><div class='del'>-	le16 end_of_sector_marker;	/* End of bootsector magic. Always is</div><div class='del'>-					   0xaa55 in little endian. */</div><div class='del'>-/* sizeof() = 512 (0x200) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) NTFS_BOOT_SECTOR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Magic identifiers present at the beginning of all ntfs record containing</div><div class='del'>- * records (like mft records for example).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	/* Found in $MFT/$DATA. */</div><div class='del'>-	magic_FILE = cpu_to_le32(0x454c4946), /* Mft entry. */</div><div class='del'>-	magic_INDX = cpu_to_le32(0x58444e49), /* Index buffer. */</div><div class='del'>-	magic_HOLE = cpu_to_le32(0x454c4f48), /* ? (NTFS 3.0+?) */</div><div class='del'>-</div><div class='del'>-	/* Found in $LogFile/$DATA. */</div><div class='del'>-	magic_RSTR = cpu_to_le32(0x52545352), /* Restart page. */</div><div class='del'>-	magic_RCRD = cpu_to_le32(0x44524352), /* Log record page. */</div><div class='del'>-</div><div class='del'>-	/* Found in $LogFile/$DATA.  (May be found in $MFT/$DATA, also?) */</div><div class='del'>-	magic_CHKD = cpu_to_le32(0x444b4843), /* Modified by chkdsk. */</div><div class='del'>-</div><div class='del'>-	/* Found in all ntfs record containing records. */</div><div class='del'>-	magic_BAAD = cpu_to_le32(0x44414142), /* Failed multi sector</div><div class='del'>-						       transfer was detected. */</div><div class='del'>-	/*</div><div class='del'>-	 * Found in $LogFile/$DATA when a page is full of 0xff bytes and is</div><div class='del'>-	 * thus not initialized.  Page must be initialized before using it.</div><div class='del'>-	 */</div><div class='del'>-	magic_empty = cpu_to_le32(0xffffffff) /* Record is empty. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 NTFS_RECORD_TYPE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generic magic comparison macros. Finally found a use for the ## preprocessor</div><div class='del'>- * operator! (-8</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline bool __ntfs_is_magic(le32 x, NTFS_RECORD_TYPE r)</div><div class='del'>-{</div><div class='del'>-	return (x == r);</div><div class='del'>-}</div><div class='del'>-#define ntfs_is_magic(x, m)	__ntfs_is_magic(x, magic_##m)</div><div class='del'>-</div><div class='del'>-static inline bool __ntfs_is_magicp(le32 *p, NTFS_RECORD_TYPE r)</div><div class='del'>-{</div><div class='del'>-	return (*p == r);</div><div class='del'>-}</div><div class='del'>-#define ntfs_is_magicp(p, m)	__ntfs_is_magicp(p, magic_##m)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Specialised magic comparison macros for the NTFS_RECORD_TYPEs defined above.</div><div class='del'>- */</div><div class='del'>-#define ntfs_is_file_record(x)		( ntfs_is_magic (x, FILE) )</div><div class='del'>-#define ntfs_is_file_recordp(p)		( ntfs_is_magicp(p, FILE) )</div><div class='del'>-#define ntfs_is_mft_record(x)		( ntfs_is_file_record (x) )</div><div class='del'>-#define ntfs_is_mft_recordp(p)		( ntfs_is_file_recordp(p) )</div><div class='del'>-#define ntfs_is_indx_record(x)		( ntfs_is_magic (x, INDX) )</div><div class='del'>-#define ntfs_is_indx_recordp(p)		( ntfs_is_magicp(p, INDX) )</div><div class='del'>-#define ntfs_is_hole_record(x)		( ntfs_is_magic (x, HOLE) )</div><div class='del'>-#define ntfs_is_hole_recordp(p)		( ntfs_is_magicp(p, HOLE) )</div><div class='del'>-</div><div class='del'>-#define ntfs_is_rstr_record(x)		( ntfs_is_magic (x, RSTR) )</div><div class='del'>-#define ntfs_is_rstr_recordp(p)		( ntfs_is_magicp(p, RSTR) )</div><div class='del'>-#define ntfs_is_rcrd_record(x)		( ntfs_is_magic (x, RCRD) )</div><div class='del'>-#define ntfs_is_rcrd_recordp(p)		( ntfs_is_magicp(p, RCRD) )</div><div class='del'>-</div><div class='del'>-#define ntfs_is_chkd_record(x)		( ntfs_is_magic (x, CHKD) )</div><div class='del'>-#define ntfs_is_chkd_recordp(p)		( ntfs_is_magicp(p, CHKD) )</div><div class='del'>-</div><div class='del'>-#define ntfs_is_baad_record(x)		( ntfs_is_magic (x, BAAD) )</div><div class='del'>-#define ntfs_is_baad_recordp(p)		( ntfs_is_magicp(p, BAAD) )</div><div class='del'>-</div><div class='del'>-#define ntfs_is_empty_record(x)		( ntfs_is_magic (x, empty) )</div><div class='del'>-#define ntfs_is_empty_recordp(p)	( ntfs_is_magicp(p, empty) )</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The Update Sequence Array (usa) is an array of the le16 values which belong</div><div class='del'>- * to the end of each sector protected by the update sequence record in which</div><div class='del'>- * this array is contained. Note that the first entry is the Update Sequence</div><div class='del'>- * Number (usn), a cyclic counter of how many times the protected record has</div><div class='del'>- * been written to disk. The values 0 and -1 (ie. 0xffff) are not used. All</div><div class='del'>- * last le16's of each sector have to be equal to the usn (during reading) or</div><div class='del'>- * are set to it (during writing). If they are not, an incomplete multi sector</div><div class='del'>- * transfer has occurred when the data was written.</div><div class='del'>- * The maximum size for the update sequence array is fixed to:</div><div class='del'>- *	maximum size = usa_ofs + (usa_count * 2) = 510 bytes</div><div class='del'>- * The 510 bytes comes from the fact that the last le16 in the array has to</div><div class='del'>- * (obviously) finish before the last le16 of the first 512-byte sector.</div><div class='del'>- * This formula can be used as a consistency check in that usa_ofs +</div><div class='del'>- * (usa_count * 2) has to be less than or equal to 510.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	NTFS_RECORD_TYPE magic;	/* A four-byte magic identifying the record</div><div class='del'>-				   type and/or status. */</div><div class='del'>-	le16 usa_ofs;		/* Offset to the Update Sequence Array (usa)</div><div class='del'>-				   from the start of the ntfs record. */</div><div class='del'>-	le16 usa_count;		/* Number of le16 sized entries in the usa</div><div class='del'>-				   including the Update Sequence Number (usn),</div><div class='del'>-				   thus the number of fixups is the usa_count</div><div class='del'>-				   minus 1. */</div><div class='del'>-} __attribute__ ((__packed__)) NTFS_RECORD;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * System files mft record numbers. All these files are always marked as used</div><div class='del'>- * in the bitmap attribute of the mft; presumably in order to avoid accidental</div><div class='del'>- * allocation for random other mft records. Also, the sequence number for each</div><div class='del'>- * of the system files is always equal to their mft record number and it is</div><div class='del'>- * never modified.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	FILE_MFT       = 0,	/* Master file table (mft). Data attribute</div><div class='del'>-				   contains the entries and bitmap attribute</div><div class='del'>-				   records which ones are in use (bit==1). */</div><div class='del'>-	FILE_MFTMirr   = 1,	/* Mft mirror: copy of first four mft records</div><div class='del'>-				   in data attribute. If cluster size &gt; 4kiB,</div><div class='del'>-				   copy of first N mft records, with</div><div class='del'>-					N = cluster_size / mft_record_size. */</div><div class='del'>-	FILE_LogFile   = 2,	/* Journalling log in data attribute. */</div><div class='del'>-	FILE_Volume    = 3,	/* Volume name attribute and volume information</div><div class='del'>-				   attribute (flags and ntfs version). Windows</div><div class='del'>-				   refers to this file as volume DASD (Direct</div><div class='del'>-				   Access Storage Device). */</div><div class='del'>-	FILE_AttrDef   = 4,	/* Array of attribute definitions in data</div><div class='del'>-				   attribute. */</div><div class='del'>-	FILE_root      = 5,	/* Root directory. */</div><div class='del'>-	FILE_Bitmap    = 6,	/* Allocation bitmap of all clusters (lcns) in</div><div class='del'>-				   data attribute. */</div><div class='del'>-	FILE_Boot      = 7,	/* Boot sector (always at cluster 0) in data</div><div class='del'>-				   attribute. */</div><div class='del'>-	FILE_BadClus   = 8,	/* Contains all bad clusters in the non-resident</div><div class='del'>-				   data attribute. */</div><div class='del'>-	FILE_Secure    = 9,	/* Shared security descriptors in data attribute</div><div class='del'>-				   and two indexes into the descriptors.</div><div class='del'>-				   Appeared in Windows 2000. Before that, this</div><div class='del'>-				   file was named $Quota but was unused. */</div><div class='del'>-	FILE_UpCase    = 10,	/* Uppercase equivalents of all 65536 Unicode</div><div class='del'>-				   characters in data attribute. */</div><div class='del'>-	FILE_Extend    = 11,	/* Directory containing other system files (eg.</div><div class='del'>-				   $ObjId, $Quota, $Reparse and $UsnJrnl). This</div><div class='del'>-				   is new to NTFS3.0. */</div><div class='del'>-	FILE_reserved12 = 12,	/* Reserved for future use (records 12-15). */</div><div class='del'>-	FILE_reserved13 = 13,</div><div class='del'>-	FILE_reserved14 = 14,</div><div class='del'>-	FILE_reserved15 = 15,</div><div class='del'>-	FILE_first_user = 16,	/* First user file, used as test limit for</div><div class='del'>-				   whether to allow opening a file or not. */</div><div class='del'>-} NTFS_SYSTEM_FILES;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are the so far known MFT_RECORD_* flags (16-bit) which contain</div><div class='del'>- * information about the mft record in which they are present.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	MFT_RECORD_IN_USE	= cpu_to_le16(0x0001),</div><div class='del'>-	MFT_RECORD_IS_DIRECTORY = cpu_to_le16(0x0002),</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef le16 MFT_RECORD_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mft references (aka file references or file record segment references) are</div><div class='del'>- * used whenever a structure needs to refer to a record in the mft.</div><div class='del'>- *</div><div class='del'>- * A reference consists of a 48-bit index into the mft and a 16-bit sequence</div><div class='del'>- * number used to detect stale references.</div><div class='del'>- *</div><div class='del'>- * For error reporting purposes we treat the 48-bit index as a signed quantity.</div><div class='del'>- *</div><div class='del'>- * The sequence number is a circular counter (skipping 0) describing how many</div><div class='del'>- * times the referenced mft record has been (re)used. This has to match the</div><div class='del'>- * sequence number of the mft record being referenced, otherwise the reference</div><div class='del'>- * is considered stale and removed (FIXME: only ntfsck or the driver itself?).</div><div class='del'>- *</div><div class='del'>- * If the sequence number is zero it is assumed that no sequence number</div><div class='del'>- * consistency checking should be performed.</div><div class='del'>- *</div><div class='del'>- * FIXME: Since inodes are 32-bit as of now, the driver needs to always check</div><div class='del'>- * for high_part being 0 and if not either BUG(), cause a panic() or handle</div><div class='del'>- * the situation in some other way. This shouldn't be a problem as a volume has</div><div class='del'>- * to become HUGE in order to need more than 32-bits worth of mft records.</div><div class='del'>- * Assuming the standard mft record size of 1kb only the records (never mind</div><div class='del'>- * the non-resident attributes, etc.) would require 4Tb of space on their own</div><div class='del'>- * for the first 32 bits worth of records. This is only if some strange person</div><div class='del'>- * doesn't decide to foul play and make the mft sparse which would be a really</div><div class='del'>- * horrible thing to do as it would trash our current driver implementation. )-:</div><div class='del'>- * Do I hear screams "we want 64-bit inodes!" ?!? (-;</div><div class='del'>- *</div><div class='del'>- * FIXME: The mft zone is defined as the first 12% of the volume. This space is</div><div class='del'>- * reserved so that the mft can grow contiguously and hence doesn't become</div><div class='del'>- * fragmented. Volume free space includes the empty part of the mft zone and</div><div class='del'>- * when the volume's free 88% are used up, the mft zone is shrunk by a factor</div><div class='del'>- * of 2, thus making more space available for more files/data. This process is</div><div class='del'>- * repeated every time there is no more free space except for the mft zone until</div><div class='del'>- * there really is no more free space.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Typedef the MFT_REF as a 64-bit value for easier handling.</div><div class='del'>- * Also define two unpacking macros to get to the reference (MREF) and</div><div class='del'>- * sequence number (MSEQNO) respectively.</div><div class='del'>- * The _LE versions are to be applied on little endian MFT_REFs.</div><div class='del'>- * Note: The _LE versions will return a CPU endian formatted value!</div><div class='del'>- */</div><div class='del'>-#define MFT_REF_MASK_CPU 0x0000ffffffffffffULL</div><div class='del'>-#define MFT_REF_MASK_LE cpu_to_le64(MFT_REF_MASK_CPU)</div><div class='del'>-</div><div class='del'>-typedef u64 MFT_REF;</div><div class='del'>-typedef le64 leMFT_REF;</div><div class='del'>-</div><div class='del'>-#define MK_MREF(m, s)	((MFT_REF)(((MFT_REF)(s) &lt;&lt; 48) |		\</div><div class='del'>-					((MFT_REF)(m) &amp; MFT_REF_MASK_CPU)))</div><div class='del'>-#define MK_LE_MREF(m, s) cpu_to_le64(MK_MREF(m, s))</div><div class='del'>-</div><div class='del'>-#define MREF(x)		((unsigned long)((x) &amp; MFT_REF_MASK_CPU))</div><div class='del'>-#define MSEQNO(x)	((u16)(((x) &gt;&gt; 48) &amp; 0xffff))</div><div class='del'>-#define MREF_LE(x)	((unsigned long)(le64_to_cpu(x) &amp; MFT_REF_MASK_CPU))</div><div class='del'>-#define MSEQNO_LE(x)	((u16)((le64_to_cpu(x) &gt;&gt; 48) &amp; 0xffff))</div><div class='del'>-</div><div class='del'>-#define IS_ERR_MREF(x)	(((x) &amp; 0x0000800000000000ULL) ? true : false)</div><div class='del'>-#define ERR_MREF(x)	((u64)((s64)(x)))</div><div class='del'>-#define MREF_ERR(x)	((int)((s64)(x)))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The mft record header present at the beginning of every record in the mft.</div><div class='del'>- * This is followed by a sequence of variable length attribute records which</div><div class='del'>- * is terminated by an attribute of type AT_END which is a truncated attribute</div><div class='del'>- * in that it only consists of the attribute type code AT_END and none of the</div><div class='del'>- * other members of the attribute structure are present.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0	NTFS_RECORD; -- Unfolded here as gcc doesn't like unnamed structs. */</div><div class='del'>-	NTFS_RECORD_TYPE magic;	/* Usually the magic is "FILE". */</div><div class='del'>-	le16 usa_ofs;		/* See NTFS_RECORD definition above. */</div><div class='del'>-	le16 usa_count;		/* See NTFS_RECORD definition above. */</div><div class='del'>-</div><div class='del'>-/*  8*/	le64 lsn;		/* $LogFile sequence number for this record.</div><div class='del'>-				   Changed every time the record is modified. */</div><div class='del'>-/* 16*/	le16 sequence_number;	/* Number of times this mft record has been</div><div class='del'>-				   reused. (See description for MFT_REF</div><div class='del'>-				   above.) NOTE: The increment (skipping zero)</div><div class='del'>-				   is done when the file is deleted. NOTE: If</div><div class='del'>-				   this is zero it is left zero. */</div><div class='del'>-/* 18*/	le16 link_count;	/* Number of hard links, i.e. the number of</div><div class='del'>-				   directory entries referencing this record.</div><div class='del'>-				   NOTE: Only used in mft base records.</div><div class='del'>-				   NOTE: When deleting a directory entry we</div><div class='del'>-				   check the link_count and if it is 1 we</div><div class='del'>-				   delete the file. Otherwise we delete the</div><div class='del'>-				   FILE_NAME_ATTR being referenced by the</div><div class='del'>-				   directory entry from the mft record and</div><div class='del'>-				   decrement the link_count.</div><div class='del'>-				   FIXME: Careful with Win32 + DOS names! */</div><div class='del'>-/* 20*/	le16 attrs_offset;	/* Byte offset to the first attribute in this</div><div class='del'>-				   mft record from the start of the mft record.</div><div class='del'>-				   NOTE: Must be aligned to 8-byte boundary. */</div><div class='del'>-/* 22*/	MFT_RECORD_FLAGS flags;	/* Bit array of MFT_RECORD_FLAGS. When a file</div><div class='del'>-				   is deleted, the MFT_RECORD_IN_USE flag is</div><div class='del'>-				   set to zero. */</div><div class='del'>-/* 24*/	le32 bytes_in_use;	/* Number of bytes used in this mft record.</div><div class='del'>-				   NOTE: Must be aligned to 8-byte boundary. */</div><div class='del'>-/* 28*/	le32 bytes_allocated;	/* Number of bytes allocated for this mft</div><div class='del'>-				   record. This should be equal to the mft</div><div class='del'>-				   record size. */</div><div class='del'>-/* 32*/	leMFT_REF base_mft_record;/* This is zero for base mft records.</div><div class='del'>-				   When it is not zero it is a mft reference</div><div class='del'>-				   pointing to the base mft record to which</div><div class='del'>-				   this record belongs (this is then used to</div><div class='del'>-				   locate the attribute list attribute present</div><div class='del'>-				   in the base record which describes this</div><div class='del'>-				   extension record and hence might need</div><div class='del'>-				   modification when the extension record</div><div class='del'>-				   itself is modified, also locating the</div><div class='del'>-				   attribute list also means finding the other</div><div class='del'>-				   potential extents, belonging to the non-base</div><div class='del'>-				   mft record). */</div><div class='del'>-/* 40*/	le16 next_attr_instance;/* The instance number that will be assigned to</div><div class='del'>-				   the next attribute added to this mft record.</div><div class='del'>-				   NOTE: Incremented each time after it is used.</div><div class='del'>-				   NOTE: Every time the mft record is reused</div><div class='del'>-				   this number is set to zero.  NOTE: The first</div><div class='del'>-				   instance number is always 0. */</div><div class='del'>-/* The below fields are specific to NTFS 3.1+ (Windows XP and above): */</div><div class='del'>-/* 42*/ le16 reserved;		/* Reserved/alignment. */</div><div class='del'>-/* 44*/ le32 mft_record_number;	/* Number of this mft record. */</div><div class='del'>-/* sizeof() = 48 bytes */</div><div class='del'>-/*</div><div class='del'>- * When (re)using the mft record, we place the update sequence array at this</div><div class='del'>- * offset, i.e. before we start with the attributes.  This also makes sense,</div><div class='del'>- * otherwise we could run into problems with the update sequence array</div><div class='del'>- * containing in itself the last two bytes of a sector which would mean that</div><div class='del'>- * multi sector transfer protection wouldn't work.  As you can't protect data</div><div class='del'>- * by overwriting it since you then can't get it back...</div><div class='del'>- * When reading we obviously use the data from the ntfs record header.</div><div class='del'>- */</div><div class='del'>-} __attribute__ ((__packed__)) MFT_RECORD;</div><div class='del'>-</div><div class='del'>-/* This is the version without the NTFS 3.1+ specific fields. */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0	NTFS_RECORD; -- Unfolded here as gcc doesn't like unnamed structs. */</div><div class='del'>-	NTFS_RECORD_TYPE magic;	/* Usually the magic is "FILE". */</div><div class='del'>-	le16 usa_ofs;		/* See NTFS_RECORD definition above. */</div><div class='del'>-	le16 usa_count;		/* See NTFS_RECORD definition above. */</div><div class='del'>-</div><div class='del'>-/*  8*/	le64 lsn;		/* $LogFile sequence number for this record.</div><div class='del'>-				   Changed every time the record is modified. */</div><div class='del'>-/* 16*/	le16 sequence_number;	/* Number of times this mft record has been</div><div class='del'>-				   reused. (See description for MFT_REF</div><div class='del'>-				   above.) NOTE: The increment (skipping zero)</div><div class='del'>-				   is done when the file is deleted. NOTE: If</div><div class='del'>-				   this is zero it is left zero. */</div><div class='del'>-/* 18*/	le16 link_count;	/* Number of hard links, i.e. the number of</div><div class='del'>-				   directory entries referencing this record.</div><div class='del'>-				   NOTE: Only used in mft base records.</div><div class='del'>-				   NOTE: When deleting a directory entry we</div><div class='del'>-				   check the link_count and if it is 1 we</div><div class='del'>-				   delete the file. Otherwise we delete the</div><div class='del'>-				   FILE_NAME_ATTR being referenced by the</div><div class='del'>-				   directory entry from the mft record and</div><div class='del'>-				   decrement the link_count.</div><div class='del'>-				   FIXME: Careful with Win32 + DOS names! */</div><div class='del'>-/* 20*/	le16 attrs_offset;	/* Byte offset to the first attribute in this</div><div class='del'>-				   mft record from the start of the mft record.</div><div class='del'>-				   NOTE: Must be aligned to 8-byte boundary. */</div><div class='del'>-/* 22*/	MFT_RECORD_FLAGS flags;	/* Bit array of MFT_RECORD_FLAGS. When a file</div><div class='del'>-				   is deleted, the MFT_RECORD_IN_USE flag is</div><div class='del'>-				   set to zero. */</div><div class='del'>-/* 24*/	le32 bytes_in_use;	/* Number of bytes used in this mft record.</div><div class='del'>-				   NOTE: Must be aligned to 8-byte boundary. */</div><div class='del'>-/* 28*/	le32 bytes_allocated;	/* Number of bytes allocated for this mft</div><div class='del'>-				   record. This should be equal to the mft</div><div class='del'>-				   record size. */</div><div class='del'>-/* 32*/	leMFT_REF base_mft_record;/* This is zero for base mft records.</div><div class='del'>-				   When it is not zero it is a mft reference</div><div class='del'>-				   pointing to the base mft record to which</div><div class='del'>-				   this record belongs (this is then used to</div><div class='del'>-				   locate the attribute list attribute present</div><div class='del'>-				   in the base record which describes this</div><div class='del'>-				   extension record and hence might need</div><div class='del'>-				   modification when the extension record</div><div class='del'>-				   itself is modified, also locating the</div><div class='del'>-				   attribute list also means finding the other</div><div class='del'>-				   potential extents, belonging to the non-base</div><div class='del'>-				   mft record). */</div><div class='del'>-/* 40*/	le16 next_attr_instance;/* The instance number that will be assigned to</div><div class='del'>-				   the next attribute added to this mft record.</div><div class='del'>-				   NOTE: Incremented each time after it is used.</div><div class='del'>-				   NOTE: Every time the mft record is reused</div><div class='del'>-				   this number is set to zero.  NOTE: The first</div><div class='del'>-				   instance number is always 0. */</div><div class='del'>-/* sizeof() = 42 bytes */</div><div class='del'>-/*</div><div class='del'>- * When (re)using the mft record, we place the update sequence array at this</div><div class='del'>- * offset, i.e. before we start with the attributes.  This also makes sense,</div><div class='del'>- * otherwise we could run into problems with the update sequence array</div><div class='del'>- * containing in itself the last two bytes of a sector which would mean that</div><div class='del'>- * multi sector transfer protection wouldn't work.  As you can't protect data</div><div class='del'>- * by overwriting it since you then can't get it back...</div><div class='del'>- * When reading we obviously use the data from the ntfs record header.</div><div class='del'>- */</div><div class='del'>-} __attribute__ ((__packed__)) MFT_RECORD_OLD;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * System defined attributes (32-bit).  Each attribute type has a corresponding</div><div class='del'>- * attribute name (Unicode string of maximum 64 character length) as described</div><div class='del'>- * by the attribute definitions present in the data attribute of the $AttrDef</div><div class='del'>- * system file.  On NTFS 3.0 volumes the names are just as the types are named</div><div class='del'>- * in the below defines exchanging AT_ for the dollar sign ($).  If that is not</div><div class='del'>- * a revealing choice of symbol I do not know what is... (-;</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	AT_UNUSED			= cpu_to_le32(         0),</div><div class='del'>-	AT_STANDARD_INFORMATION		= cpu_to_le32(      0x10),</div><div class='del'>-	AT_ATTRIBUTE_LIST		= cpu_to_le32(      0x20),</div><div class='del'>-	AT_FILE_NAME			= cpu_to_le32(      0x30),</div><div class='del'>-	AT_OBJECT_ID			= cpu_to_le32(      0x40),</div><div class='del'>-	AT_SECURITY_DESCRIPTOR		= cpu_to_le32(      0x50),</div><div class='del'>-	AT_VOLUME_NAME			= cpu_to_le32(      0x60),</div><div class='del'>-	AT_VOLUME_INFORMATION		= cpu_to_le32(      0x70),</div><div class='del'>-	AT_DATA				= cpu_to_le32(      0x80),</div><div class='del'>-	AT_INDEX_ROOT			= cpu_to_le32(      0x90),</div><div class='del'>-	AT_INDEX_ALLOCATION		= cpu_to_le32(      0xa0),</div><div class='del'>-	AT_BITMAP			= cpu_to_le32(      0xb0),</div><div class='del'>-	AT_REPARSE_POINT		= cpu_to_le32(      0xc0),</div><div class='del'>-	AT_EA_INFORMATION		= cpu_to_le32(      0xd0),</div><div class='del'>-	AT_EA				= cpu_to_le32(      0xe0),</div><div class='del'>-	AT_PROPERTY_SET			= cpu_to_le32(      0xf0),</div><div class='del'>-	AT_LOGGED_UTILITY_STREAM	= cpu_to_le32(     0x100),</div><div class='del'>-	AT_FIRST_USER_DEFINED_ATTRIBUTE	= cpu_to_le32(    0x1000),</div><div class='del'>-	AT_END				= cpu_to_le32(0xffffffff)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 ATTR_TYPE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The collation rules for sorting views/indexes/etc (32-bit).</div><div class='del'>- *</div><div class='del'>- * COLLATION_BINARY - Collate by binary compare where the first byte is most</div><div class='del'>- *	significant.</div><div class='del'>- * COLLATION_UNICODE_STRING - Collate Unicode strings by comparing their binary</div><div class='del'>- *	Unicode values, except that when a character can be uppercased, the</div><div class='del'>- *	upper case value collates before the lower case one.</div><div class='del'>- * COLLATION_FILE_NAME - Collate file names as Unicode strings. The collation</div><div class='del'>- *	is done very much like COLLATION_UNICODE_STRING. In fact I have no idea</div><div class='del'>- *	what the difference is. Perhaps the difference is that file names</div><div class='del'>- *	would treat some special characters in an odd way (see</div><div class='del'>- *	unistr.c::ntfs_collate_names() and unistr.c::legal_ansi_char_array[]</div><div class='del'>- *	for what I mean but COLLATION_UNICODE_STRING would not give any special</div><div class='del'>- *	treatment to any characters at all, but this is speculation.</div><div class='del'>- * COLLATION_NTOFS_ULONG - Sorting is done according to ascending le32 key</div><div class='del'>- *	values. E.g. used for $SII index in FILE_Secure, which sorts by</div><div class='del'>- *	security_id (le32).</div><div class='del'>- * COLLATION_NTOFS_SID - Sorting is done according to ascending SID values.</div><div class='del'>- *	E.g. used for $O index in FILE_Extend/$Quota.</div><div class='del'>- * COLLATION_NTOFS_SECURITY_HASH - Sorting is done first by ascending hash</div><div class='del'>- *	values and second by ascending security_id values. E.g. used for $SDH</div><div class='del'>- *	index in FILE_Secure.</div><div class='del'>- * COLLATION_NTOFS_ULONGS - Sorting is done according to a sequence of ascending</div><div class='del'>- *	le32 key values. E.g. used for $O index in FILE_Extend/$ObjId, which</div><div class='del'>- *	sorts by object_id (16-byte), by splitting up the object_id in four</div><div class='del'>- *	le32 values and using them as individual keys. E.g. take the following</div><div class='del'>- *	two security_ids, stored as follows on disk:</div><div class='del'>- *		1st: a1 61 65 b7 65 7b d4 11 9e 3d 00 e0 81 10 42 59</div><div class='del'>- *		2nd: 38 14 37 d2 d2 f3 d4 11 a5 21 c8 6b 79 b1 97 45</div><div class='del'>- *	To compare them, they are split into four le32 values each, like so:</div><div class='del'>- *		1st: 0xb76561a1 0x11d47b65 0xe0003d9e 0x59421081</div><div class='del'>- *		2nd: 0xd2371438 0x11d4f3d2 0x6bc821a5 0x4597b179</div><div class='del'>- *	Now, it is apparent why the 2nd object_id collates after the 1st: the</div><div class='del'>- *	first le32 value of the 1st object_id is less than the first le32 of</div><div class='del'>- *	the 2nd object_id. If the first le32 values of both object_ids were</div><div class='del'>- *	equal then the second le32 values would be compared, etc.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	COLLATION_BINARY		= cpu_to_le32(0x00),</div><div class='del'>-	COLLATION_FILE_NAME		= cpu_to_le32(0x01),</div><div class='del'>-	COLLATION_UNICODE_STRING	= cpu_to_le32(0x02),</div><div class='del'>-	COLLATION_NTOFS_ULONG		= cpu_to_le32(0x10),</div><div class='del'>-	COLLATION_NTOFS_SID		= cpu_to_le32(0x11),</div><div class='del'>-	COLLATION_NTOFS_SECURITY_HASH	= cpu_to_le32(0x12),</div><div class='del'>-	COLLATION_NTOFS_ULONGS		= cpu_to_le32(0x13),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 COLLATION_RULE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The flags (32-bit) describing attribute properties in the attribute</div><div class='del'>- * definition structure.  FIXME: This information is based on Regis's</div><div class='del'>- * information and, according to him, it is not certain and probably</div><div class='del'>- * incomplete.  The INDEXABLE flag is fairly certainly correct as only the file</div><div class='del'>- * name attribute has this flag set and this is the only attribute indexed in</div><div class='del'>- * NT4.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	ATTR_DEF_INDEXABLE	= cpu_to_le32(0x02), /* Attribute can be</div><div class='del'>-					indexed. */</div><div class='del'>-	ATTR_DEF_MULTIPLE	= cpu_to_le32(0x04), /* Attribute type</div><div class='del'>-					can be present multiple times in the</div><div class='del'>-					mft records of an inode. */</div><div class='del'>-	ATTR_DEF_NOT_ZERO	= cpu_to_le32(0x08), /* Attribute value</div><div class='del'>-					must contain at least one non-zero</div><div class='del'>-					byte. */</div><div class='del'>-	ATTR_DEF_INDEXED_UNIQUE	= cpu_to_le32(0x10), /* Attribute must be</div><div class='del'>-					indexed and the attribute value must be</div><div class='del'>-					unique for the attribute type in all of</div><div class='del'>-					the mft records of an inode. */</div><div class='del'>-	ATTR_DEF_NAMED_UNIQUE	= cpu_to_le32(0x20), /* Attribute must be</div><div class='del'>-					named and the name must be unique for</div><div class='del'>-					the attribute type in all of the mft</div><div class='del'>-					records of an inode. */</div><div class='del'>-	ATTR_DEF_RESIDENT	= cpu_to_le32(0x40), /* Attribute must be</div><div class='del'>-					resident. */</div><div class='del'>-	ATTR_DEF_ALWAYS_LOG	= cpu_to_le32(0x80), /* Always log</div><div class='del'>-					modifications to this attribute,</div><div class='del'>-					regardless of whether it is resident or</div><div class='del'>-					non-resident.  Without this, only log</div><div class='del'>-					modifications if the attribute is</div><div class='del'>-					resident. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 ATTR_DEF_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The data attribute of FILE_AttrDef contains a sequence of attribute</div><div class='del'>- * definitions for the NTFS volume. With this, it is supposed to be safe for an</div><div class='del'>- * older NTFS driver to mount a volume containing a newer NTFS version without</div><div class='del'>- * damaging it (that's the theory. In practice it's: not damaging it too much).</div><div class='del'>- * Entries are sorted by attribute type. The flags describe whether the</div><div class='del'>- * attribute can be resident/non-resident and possibly other things, but the</div><div class='del'>- * actual bits are unknown.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*hex ofs*/</div><div class='del'>-/*  0*/	ntfschar name[0x40];		/* Unicode name of the attribute. Zero</div><div class='del'>-					   terminated. */</div><div class='del'>-/* 80*/	ATTR_TYPE type;			/* Type of the attribute. */</div><div class='del'>-/* 84*/	le32 display_rule;		/* Default display rule.</div><div class='del'>-					   FIXME: What does it mean? (AIA) */</div><div class='del'>-/* 88*/ COLLATION_RULE collation_rule;	/* Default collation rule. */</div><div class='del'>-/* 8c*/	ATTR_DEF_FLAGS flags;		/* Flags describing the attribute. */</div><div class='del'>-/* 90*/	sle64 min_size;			/* Optional minimum attribute size. */</div><div class='del'>-/* 98*/	sle64 max_size;			/* Maximum size of attribute. */</div><div class='del'>-/* sizeof() = 0xa0 or 160 bytes */</div><div class='del'>-} __attribute__ ((__packed__)) ATTR_DEF;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute flags (16-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	ATTR_IS_COMPRESSED    = cpu_to_le16(0x0001),</div><div class='del'>-	ATTR_COMPRESSION_MASK = cpu_to_le16(0x00ff), /* Compression method</div><div class='del'>-							      mask.  Also, first</div><div class='del'>-							      illegal value. */</div><div class='del'>-	ATTR_IS_ENCRYPTED     = cpu_to_le16(0x4000),</div><div class='del'>-	ATTR_IS_SPARSE	      = cpu_to_le16(0x8000),</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef le16 ATTR_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute compression.</div><div class='del'>- *</div><div class='del'>- * Only the data attribute is ever compressed in the current ntfs driver in</div><div class='del'>- * Windows. Further, compression is only applied when the data attribute is</div><div class='del'>- * non-resident. Finally, to use compression, the maximum allowed cluster size</div><div class='del'>- * on a volume is 4kib.</div><div class='del'>- *</div><div class='del'>- * The compression method is based on independently compressing blocks of X</div><div class='del'>- * clusters, where X is determined from the compression_unit value found in the</div><div class='del'>- * non-resident attribute record header (more precisely: X = 2^compression_unit</div><div class='del'>- * clusters). On Windows NT/2k, X always is 16 clusters (compression_unit = 4).</div><div class='del'>- *</div><div class='del'>- * There are three different cases of how a compression block of X clusters</div><div class='del'>- * can be stored:</div><div class='del'>- *</div><div class='del'>- *   1) The data in the block is all zero (a sparse block):</div><div class='del'>- *	  This is stored as a sparse block in the runlist, i.e. the runlist</div><div class='del'>- *	  entry has length = X and lcn = -1. The mapping pairs array actually</div><div class='del'>- *	  uses a delta_lcn value length of 0, i.e. delta_lcn is not present at</div><div class='del'>- *	  all, which is then interpreted by the driver as lcn = -1.</div><div class='del'>- *	  NOTE: Even uncompressed files can be sparse on NTFS 3.0 volumes, then</div><div class='del'>- *	  the same principles apply as above, except that the length is not</div><div class='del'>- *	  restricted to being any particular value.</div><div class='del'>- *</div><div class='del'>- *   2) The data in the block is not compressed:</div><div class='del'>- *	  This happens when compression doesn't reduce the size of the block</div><div class='del'>- *	  in clusters. I.e. if compression has a small effect so that the</div><div class='del'>- *	  compressed data still occupies X clusters, then the uncompressed data</div><div class='del'>- *	  is stored in the block.</div><div class='del'>- *	  This case is recognised by the fact that the runlist entry has</div><div class='del'>- *	  length = X and lcn &gt;= 0. The mapping pairs array stores this as</div><div class='del'>- *	  normal with a run length of X and some specific delta_lcn, i.e.</div><div class='del'>- *	  delta_lcn has to be present.</div><div class='del'>- *</div><div class='del'>- *   3) The data in the block is compressed:</div><div class='del'>- *	  The common case. This case is recognised by the fact that the run</div><div class='del'>- *	  list entry has length L &lt; X and lcn &gt;= 0. The mapping pairs array</div><div class='del'>- *	  stores this as normal with a run length of X and some specific</div><div class='del'>- *	  delta_lcn, i.e. delta_lcn has to be present. This runlist entry is</div><div class='del'>- *	  immediately followed by a sparse entry with length = X - L and</div><div class='del'>- *	  lcn = -1. The latter entry is to make up the vcn counting to the</div><div class='del'>- *	  full compression block size X.</div><div class='del'>- *</div><div class='del'>- * In fact, life is more complicated because adjacent entries of the same type</div><div class='del'>- * can be coalesced. This means that one has to keep track of the number of</div><div class='del'>- * clusters handled and work on a basis of X clusters at a time being one</div><div class='del'>- * block. An example: if length L &gt; X this means that this particular runlist</div><div class='del'>- * entry contains a block of length X and part of one or more blocks of length</div><div class='del'>- * L - X. Another example: if length L &lt; X, this does not necessarily mean that</div><div class='del'>- * the block is compressed as it might be that the lcn changes inside the block</div><div class='del'>- * and hence the following runlist entry describes the continuation of the</div><div class='del'>- * potentially compressed block. The block would be compressed if the</div><div class='del'>- * following runlist entry describes at least X - L sparse clusters, thus</div><div class='del'>- * making up the compression block length as described in point 3 above. (Of</div><div class='del'>- * course, there can be several runlist entries with small lengths so that the</div><div class='del'>- * sparse entry does not follow the first data containing entry with</div><div class='del'>- * length &lt; X.)</div><div class='del'>- *</div><div class='del'>- * NOTE: At the end of the compressed attribute value, there most likely is not</div><div class='del'>- * just the right amount of data to make up a compression block, thus this data</div><div class='del'>- * is not even attempted to be compressed. It is just stored as is, unless</div><div class='del'>- * the number of clusters it occupies is reduced when compressed in which case</div><div class='del'>- * it is stored as a compressed compression block, complete with sparse</div><div class='del'>- * clusters at the end.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flags of resident attributes (8-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	RESIDENT_ATTR_IS_INDEXED = 0x01, /* Attribute is referenced in an index</div><div class='del'>-					    (has implications for deleting and</div><div class='del'>-					    modifying the attribute). */</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef u8 RESIDENT_ATTR_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute record header. Always aligned to 8-byte boundary.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0*/	ATTR_TYPE type;		/* The (32-bit) type of the attribute. */</div><div class='del'>-/*  4*/	le32 length;		/* Byte size of the resident part of the</div><div class='del'>-				   attribute (aligned to 8-byte boundary).</div><div class='del'>-				   Used to get to the next attribute. */</div><div class='del'>-/*  8*/	u8 non_resident;	/* If 0, attribute is resident.</div><div class='del'>-				   If 1, attribute is non-resident. */</div><div class='del'>-/*  9*/	u8 name_length;		/* Unicode character size of name of attribute.</div><div class='del'>-				   0 if unnamed. */</div><div class='del'>-/* 10*/	le16 name_offset;	/* If name_length != 0, the byte offset to the</div><div class='del'>-				   beginning of the name from the attribute</div><div class='del'>-				   record. Note that the name is stored as a</div><div class='del'>-				   Unicode string. When creating, place offset</div><div class='del'>-				   just at the end of the record header. Then,</div><div class='del'>-				   follow with attribute value or mapping pairs</div><div class='del'>-				   array, resident and non-resident attributes</div><div class='del'>-				   respectively, aligning to an 8-byte</div><div class='del'>-				   boundary. */</div><div class='del'>-/* 12*/	ATTR_FLAGS flags;	/* Flags describing the attribute. */</div><div class='del'>-/* 14*/	le16 instance;		/* The instance of this attribute record. This</div><div class='del'>-				   number is unique within this mft record (see</div><div class='del'>-				   MFT_RECORD/next_attribute_instance notes in</div><div class='del'>-				   mft.h for more details). */</div><div class='del'>-/* 16*/	union {</div><div class='del'>-		/* Resident attributes. */</div><div class='del'>-		struct {</div><div class='del'>-/* 16 */		le32 value_length;/* Byte size of attribute value. */</div><div class='del'>-/* 20 */		le16 value_offset;/* Byte offset of the attribute</div><div class='del'>-					     value from the start of the</div><div class='del'>-					     attribute record. When creating,</div><div class='del'>-					     align to 8-byte boundary if we</div><div class='del'>-					     have a name present as this might</div><div class='del'>-					     not have a length of a multiple</div><div class='del'>-					     of 8-bytes. */</div><div class='del'>-/* 22 */		RESIDENT_ATTR_FLAGS flags; /* See above. */</div><div class='del'>-/* 23 */		s8 reserved;	  /* Reserved/alignment to 8-byte</div><div class='del'>-					     boundary. */</div><div class='del'>-		} __attribute__ ((__packed__)) resident;</div><div class='del'>-		/* Non-resident attributes. */</div><div class='del'>-		struct {</div><div class='del'>-/* 16*/			leVCN lowest_vcn;/* Lowest valid virtual cluster number</div><div class='del'>-				for this portion of the attribute value or</div><div class='del'>-				0 if this is the only extent (usually the</div><div class='del'>-				case). - Only when an attribute list is used</div><div class='del'>-				does lowest_vcn != 0 ever occur. */</div><div class='del'>-/* 24*/			leVCN highest_vcn;/* Highest valid vcn of this extent of</div><div class='del'>-				the attribute value. - Usually there is only one</div><div class='del'>-				portion, so this usually equals the attribute</div><div class='del'>-				value size in clusters minus 1. Can be -1 for</div><div class='del'>-				zero length files. Can be 0 for "single extent"</div><div class='del'>-				attributes. */</div><div class='del'>-/* 32*/			le16 mapping_pairs_offset; /* Byte offset from the</div><div class='del'>-				beginning of the structure to the mapping pairs</div><div class='del'>-				array which contains the mappings between the</div><div class='del'>-				vcns and the logical cluster numbers (lcns).</div><div class='del'>-				When creating, place this at the end of this</div><div class='del'>-				record header aligned to 8-byte boundary. */</div><div class='del'>-/* 34*/			u8 compression_unit; /* The compression unit expressed</div><div class='del'>-				as the log to the base 2 of the number of</div><div class='del'>-				clusters in a compression unit.  0 means not</div><div class='del'>-				compressed.  (This effectively limits the</div><div class='del'>-				compression unit size to be a power of two</div><div class='del'>-				clusters.)  WinNT4 only uses a value of 4.</div><div class='del'>-				Sparse files have this set to 0 on XPSP2. */</div><div class='del'>-/* 35*/			u8 reserved[5];		/* Align to 8-byte boundary. */</div><div class='del'>-/* The sizes below are only used when lowest_vcn is zero, as otherwise it would</div><div class='del'>-   be difficult to keep them up-to-date.*/</div><div class='del'>-/* 40*/			sle64 allocated_size;	/* Byte size of disk space</div><div class='del'>-				allocated to hold the attribute value. Always</div><div class='del'>-				is a multiple of the cluster size. When a file</div><div class='del'>-				is compressed, this field is a multiple of the</div><div class='del'>-				compression block size (2^compression_unit) and</div><div class='del'>-				it represents the logically allocated space</div><div class='del'>-				rather than the actual on disk usage. For this</div><div class='del'>-				use the compressed_size (see below). */</div><div class='del'>-/* 48*/			sle64 data_size;	/* Byte size of the attribute</div><div class='del'>-				value. Can be larger than allocated_size if</div><div class='del'>-				attribute value is compressed or sparse. */</div><div class='del'>-/* 56*/			sle64 initialized_size;	/* Byte size of initialized</div><div class='del'>-				portion of the attribute value. Usually equals</div><div class='del'>-				data_size. */</div><div class='del'>-/* sizeof(uncompressed attr) = 64*/</div><div class='del'>-/* 64*/			sle64 compressed_size;	/* Byte size of the attribute</div><div class='del'>-				value after compression.  Only present when</div><div class='del'>-				compressed or sparse.  Always is a multiple of</div><div class='del'>-				the cluster size.  Represents the actual amount</div><div class='del'>-				of disk space being used on the disk. */</div><div class='del'>-/* sizeof(compressed attr) = 72*/</div><div class='del'>-		} __attribute__ ((__packed__)) non_resident;</div><div class='del'>-	} __attribute__ ((__packed__)) data;</div><div class='del'>-} __attribute__ ((__packed__)) ATTR_RECORD;</div><div class='del'>-</div><div class='del'>-typedef ATTR_RECORD ATTR_REC;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * File attribute flags (32-bit) appearing in the file_attributes fields of the</div><div class='del'>- * STANDARD_INFORMATION attribute of MFT_RECORDs and the FILENAME_ATTR</div><div class='del'>- * attributes of MFT_RECORDs and directory index entries.</div><div class='del'>- *</div><div class='del'>- * All of the below flags appear in the directory index entries but only some</div><div class='del'>- * appear in the STANDARD_INFORMATION attribute whilst only some others appear</div><div class='del'>- * in the FILENAME_ATTR attribute of MFT_RECORDs.  Unless otherwise stated the</div><div class='del'>- * flags appear in all of the above.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	FILE_ATTR_READONLY		= cpu_to_le32(0x00000001),</div><div class='del'>-	FILE_ATTR_HIDDEN		= cpu_to_le32(0x00000002),</div><div class='del'>-	FILE_ATTR_SYSTEM		= cpu_to_le32(0x00000004),</div><div class='del'>-	/* Old DOS volid. Unused in NT.	= cpu_to_le32(0x00000008), */</div><div class='del'>-</div><div class='del'>-	FILE_ATTR_DIRECTORY		= cpu_to_le32(0x00000010),</div><div class='del'>-	/* Note, FILE_ATTR_DIRECTORY is not considered valid in NT.  It is</div><div class='del'>-	   reserved for the DOS SUBDIRECTORY flag. */</div><div class='del'>-	FILE_ATTR_ARCHIVE		= cpu_to_le32(0x00000020),</div><div class='del'>-	FILE_ATTR_DEVICE		= cpu_to_le32(0x00000040),</div><div class='del'>-	FILE_ATTR_NORMAL		= cpu_to_le32(0x00000080),</div><div class='del'>-</div><div class='del'>-	FILE_ATTR_TEMPORARY		= cpu_to_le32(0x00000100),</div><div class='del'>-	FILE_ATTR_SPARSE_FILE		= cpu_to_le32(0x00000200),</div><div class='del'>-	FILE_ATTR_REPARSE_POINT		= cpu_to_le32(0x00000400),</div><div class='del'>-	FILE_ATTR_COMPRESSED		= cpu_to_le32(0x00000800),</div><div class='del'>-</div><div class='del'>-	FILE_ATTR_OFFLINE		= cpu_to_le32(0x00001000),</div><div class='del'>-	FILE_ATTR_NOT_CONTENT_INDEXED	= cpu_to_le32(0x00002000),</div><div class='del'>-	FILE_ATTR_ENCRYPTED		= cpu_to_le32(0x00004000),</div><div class='del'>-</div><div class='del'>-	FILE_ATTR_VALID_FLAGS		= cpu_to_le32(0x00007fb7),</div><div class='del'>-	/* Note, FILE_ATTR_VALID_FLAGS masks out the old DOS VolId and the</div><div class='del'>-	   FILE_ATTR_DEVICE and preserves everything else.  This mask is used</div><div class='del'>-	   to obtain all flags that are valid for reading. */</div><div class='del'>-	FILE_ATTR_VALID_SET_FLAGS	= cpu_to_le32(0x000031a7),</div><div class='del'>-	/* Note, FILE_ATTR_VALID_SET_FLAGS masks out the old DOS VolId, the</div><div class='del'>-	   F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT,</div><div class='del'>-	   F_A_COMPRESSED, and F_A_ENCRYPTED and preserves the rest.  This mask</div><div class='del'>-	   is used to obtain all flags that are valid for setting. */</div><div class='del'>-	/*</div><div class='del'>-	 * The flag FILE_ATTR_DUP_FILENAME_INDEX_PRESENT is present in all</div><div class='del'>-	 * FILENAME_ATTR attributes but not in the STANDARD_INFORMATION</div><div class='del'>-	 * attribute of an mft record.</div><div class='del'>-	 */</div><div class='del'>-	FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT	= cpu_to_le32(0x10000000),</div><div class='del'>-	/* Note, this is a copy of the corresponding bit from the mft record,</div><div class='del'>-	   telling us whether this is a directory or not, i.e. whether it has</div><div class='del'>-	   an index root attribute or not. */</div><div class='del'>-	FILE_ATTR_DUP_VIEW_INDEX_PRESENT	= cpu_to_le32(0x20000000),</div><div class='del'>-	/* Note, this is a copy of the corresponding bit from the mft record,</div><div class='del'>-	   telling us whether this file has a view index present (eg. object id</div><div class='del'>-	   index, quota index, one of the security indexes or the encrypting</div><div class='del'>-	   filesystem related indexes). */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 FILE_ATTR_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE on times in NTFS: All times are in MS standard time format, i.e. they</div><div class='del'>- * are the number of 100-nanosecond intervals since 1st January 1601, 00:00:00</div><div class='del'>- * universal coordinated time (UTC). (In Linux time starts 1st January 1970,</div><div class='del'>- * 00:00:00 UTC and is stored as the number of 1-second intervals since then.)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Standard information (0x10).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident.</div><div class='del'>- * NOTE: Present in all base file records on a volume.</div><div class='del'>- * NOTE: There is conflicting information about the meaning of each of the time</div><div class='del'>- *	 fields but the meaning as defined below has been verified to be</div><div class='del'>- *	 correct by practical experimentation on Windows NT4 SP6a and is hence</div><div class='del'>- *	 assumed to be the one and only correct interpretation.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0*/	sle64 creation_time;		/* Time file was created. Updated when</div><div class='del'>-					   a filename is changed(?). */</div><div class='del'>-/*  8*/	sle64 last_data_change_time;	/* Time the data attribute was last</div><div class='del'>-					   modified. */</div><div class='del'>-/* 16*/	sle64 last_mft_change_time;	/* Time this mft record was last</div><div class='del'>-					   modified. */</div><div class='del'>-/* 24*/	sle64 last_access_time;		/* Approximate time when the file was</div><div class='del'>-					   last accessed (obviously this is not</div><div class='del'>-					   updated on read-only volumes). In</div><div class='del'>-					   Windows this is only updated when</div><div class='del'>-					   accessed if some time delta has</div><div class='del'>-					   passed since the last update. Also,</div><div class='del'>-					   last access time updates can be</div><div class='del'>-					   disabled altogether for speed. */</div><div class='del'>-/* 32*/	FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */</div><div class='del'>-/* 36*/	union {</div><div class='del'>-	/* NTFS 1.2 */</div><div class='del'>-		struct {</div><div class='del'>-		/* 36*/	u8 reserved12[12];	/* Reserved/alignment to 8-byte</div><div class='del'>-						   boundary. */</div><div class='del'>-		} __attribute__ ((__packed__)) v1;</div><div class='del'>-	/* sizeof() = 48 bytes */</div><div class='del'>-	/* NTFS 3.x */</div><div class='del'>-		struct {</div><div class='del'>-/*</div><div class='del'>- * If a volume has been upgraded from a previous NTFS version, then these</div><div class='del'>- * fields are present only if the file has been accessed since the upgrade.</div><div class='del'>- * Recognize the difference by comparing the length of the resident attribute</div><div class='del'>- * value. If it is 48, then the following fields are missing. If it is 72 then</div><div class='del'>- * the fields are present. Maybe just check like this:</div><div class='del'>- *	if (resident.ValueLength &lt; sizeof(STANDARD_INFORMATION)) {</div><div class='del'>- *		Assume NTFS 1.2- format.</div><div class='del'>- *		If (volume version is 3.x)</div><div class='del'>- *			Upgrade attribute to NTFS 3.x format.</div><div class='del'>- *		else</div><div class='del'>- *			Use NTFS 1.2- format for access.</div><div class='del'>- *	} else</div><div class='del'>- *		Use NTFS 3.x format for access.</div><div class='del'>- * Only problem is that it might be legal to set the length of the value to</div><div class='del'>- * arbitrarily large values thus spoiling this check. - But chkdsk probably</div><div class='del'>- * views that as a corruption, assuming that it behaves like this for all</div><div class='del'>- * attributes.</div><div class='del'>- */</div><div class='del'>-		/* 36*/	le32 maximum_versions;	/* Maximum allowed versions for</div><div class='del'>-				file. Zero if version numbering is disabled. */</div><div class='del'>-		/* 40*/	le32 version_number;	/* This file's version (if any).</div><div class='del'>-				Set to zero if maximum_versions is zero. */</div><div class='del'>-		/* 44*/	le32 class_id;		/* Class id from bidirectional</div><div class='del'>-				class id index (?). */</div><div class='del'>-		/* 48*/	le32 owner_id;		/* Owner_id of the user owning</div><div class='del'>-				the file. Translate via $Q index in FILE_Extend</div><div class='del'>-				/$Quota to the quota control entry for the user</div><div class='del'>-				owning the file. Zero if quotas are disabled. */</div><div class='del'>-		/* 52*/	le32 security_id;	/* Security_id for the file.</div><div class='del'>-				Translate via $SII index and $SDS data stream</div><div class='del'>-				in FILE_Secure to the security descriptor. */</div><div class='del'>-		/* 56*/	le64 quota_charged;	/* Byte size of the charge to</div><div class='del'>-				the quota for all streams of the file. Note: Is</div><div class='del'>-				zero if quotas are disabled. */</div><div class='del'>-		/* 64*/	leUSN usn;		/* Last update sequence number</div><div class='del'>-				of the file.  This is a direct index into the</div><div class='del'>-				transaction log file ($UsnJrnl).  It is zero if</div><div class='del'>-				the usn journal is disabled or this file has</div><div class='del'>-				not been subject to logging yet.  See usnjrnl.h</div><div class='del'>-				for details. */</div><div class='del'>-		} __attribute__ ((__packed__)) v3;</div><div class='del'>-	/* sizeof() = 72 bytes (NTFS 3.x) */</div><div class='del'>-	} __attribute__ ((__packed__)) ver;</div><div class='del'>-} __attribute__ ((__packed__)) STANDARD_INFORMATION;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Attribute list (0x20).</div><div class='del'>- *</div><div class='del'>- * - Can be either resident or non-resident.</div><div class='del'>- * - Value consists of a sequence of variable length, 8-byte aligned,</div><div class='del'>- * ATTR_LIST_ENTRY records.</div><div class='del'>- * - The list is not terminated by anything at all! The only way to know when</div><div class='del'>- * the end is reached is to keep track of the current offset and compare it to</div><div class='del'>- * the attribute value size.</div><div class='del'>- * - The attribute list attribute contains one entry for each attribute of</div><div class='del'>- * the file in which the list is located, except for the list attribute</div><div class='del'>- * itself. The list is sorted: first by attribute type, second by attribute</div><div class='del'>- * name (if present), third by instance number. The extents of one</div><div class='del'>- * non-resident attribute (if present) immediately follow after the initial</div><div class='del'>- * extent. They are ordered by lowest_vcn and have their instace set to zero.</div><div class='del'>- * It is not allowed to have two attributes with all sorting keys equal.</div><div class='del'>- * - Further restrictions:</div><div class='del'>- *	- If not resident, the vcn to lcn mapping array has to fit inside the</div><div class='del'>- *	  base mft record.</div><div class='del'>- *	- The attribute list attribute value has a maximum size of 256kb. This</div><div class='del'>- *	  is imposed by the Windows cache manager.</div><div class='del'>- * - Attribute lists are only used when the attributes of mft record do not</div><div class='del'>- * fit inside the mft record despite all attributes (that can be made</div><div class='del'>- * non-resident) having been made non-resident. This can happen e.g. when:</div><div class='del'>- *	- File has a large number of hard links (lots of file name</div><div class='del'>- *	  attributes present).</div><div class='del'>- *	- The mapping pairs array of some non-resident attribute becomes so</div><div class='del'>- *	  large due to fragmentation that it overflows the mft record.</div><div class='del'>- *	- The security descriptor is very complex (not applicable to</div><div class='del'>- *	  NTFS 3.0 volumes).</div><div class='del'>- *	- There are many named streams.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0*/	ATTR_TYPE type;		/* Type of referenced attribute. */</div><div class='del'>-/*  4*/	le16 length;		/* Byte size of this entry (8-byte aligned). */</div><div class='del'>-/*  6*/	u8 name_length;		/* Size in Unicode chars of the name of the</div><div class='del'>-				   attribute or 0 if unnamed. */</div><div class='del'>-/*  7*/	u8 name_offset;		/* Byte offset to beginning of attribute name</div><div class='del'>-				   (always set this to where the name would</div><div class='del'>-				   start even if unnamed). */</div><div class='del'>-/*  8*/	leVCN lowest_vcn;	/* Lowest virtual cluster number of this portion</div><div class='del'>-				   of the attribute value. This is usually 0. It</div><div class='del'>-				   is non-zero for the case where one attribute</div><div class='del'>-				   does not fit into one mft record and thus</div><div class='del'>-				   several mft records are allocated to hold</div><div class='del'>-				   this attribute. In the latter case, each mft</div><div class='del'>-				   record holds one extent of the attribute and</div><div class='del'>-				   there is one attribute list entry for each</div><div class='del'>-				   extent. NOTE: This is DEFINITELY a signed</div><div class='del'>-				   value! The windows driver uses cmp, followed</div><div class='del'>-				   by jg when comparing this, thus it treats it</div><div class='del'>-				   as signed. */</div><div class='del'>-/* 16*/	leMFT_REF mft_reference;/* The reference of the mft record holding</div><div class='del'>-				   the ATTR_RECORD for this portion of the</div><div class='del'>-				   attribute value. */</div><div class='del'>-/* 24*/	le16 instance;		/* If lowest_vcn = 0, the instance of the</div><div class='del'>-				   attribute being referenced; otherwise 0. */</div><div class='del'>-/* 26*/	ntfschar name[0];	/* Use when creating only. When reading use</div><div class='del'>-				   name_offset to determine the location of the</div><div class='del'>-				   name. */</div><div class='del'>-/* sizeof() = 26 + (attribute_name_length * 2) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) ATTR_LIST_ENTRY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The maximum allowed length for a file name.</div><div class='del'>- */</div><div class='del'>-#define MAXIMUM_FILE_NAME_LENGTH	255</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Possible namespaces for filenames in ntfs (8-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	FILE_NAME_POSIX		= 0x00,</div><div class='del'>-	/* This is the largest namespace. It is case sensitive and allows all</div><div class='del'>-	   Unicode characters except for: '\0' and '/'.  Beware that in</div><div class='del'>-	   WinNT/2k/2003 by default files which eg have the same name except</div><div class='del'>-	   for their case will not be distinguished by the standard utilities</div><div class='del'>-	   and thus a "del filename" will delete both "filename" and "fileName"</div><div class='del'>-	   without warning.  However if for example Services For Unix (SFU) are</div><div class='del'>-	   installed and the case sensitive option was enabled at installation</div><div class='del'>-	   time, then you can create/access/delete such files.</div><div class='del'>-	   Note that even SFU places restrictions on the filenames beyond the</div><div class='del'>-	   '\0' and '/' and in particular the following set of characters is</div><div class='del'>-	   not allowed: '"', '/', '&lt;', '&gt;', '\'.  All other characters,</div><div class='del'>-	   including the ones no allowed in WIN32 namespace are allowed.</div><div class='del'>-	   Tested with SFU 3.5 (this is now free) running on Windows XP. */</div><div class='del'>-	FILE_NAME_WIN32		= 0x01,</div><div class='del'>-	/* The standard WinNT/2k NTFS long filenames. Case insensitive.  All</div><div class='del'>-	   Unicode chars except: '\0', '"', '*', '/', ':', '&lt;', '&gt;', '?', '\',</div><div class='del'>-	   and '|'.  Further, names cannot end with a '.' or a space. */</div><div class='del'>-	FILE_NAME_DOS		= 0x02,</div><div class='del'>-	/* The standard DOS filenames (8.3 format). Uppercase only.  All 8-bit</div><div class='del'>-	   characters greater space, except: '"', '*', '+', ',', '/', ':', ';',</div><div class='del'>-	   '&lt;', '=', '&gt;', '?', and '\'. */</div><div class='del'>-	FILE_NAME_WIN32_AND_DOS	= 0x03,</div><div class='del'>-	/* 3 means that both the Win32 and the DOS filenames are identical and</div><div class='del'>-	   hence have been saved in this single filename record. */</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef u8 FILE_NAME_TYPE_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Filename (0x30).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident.</div><div class='del'>- * NOTE: All fields, except the parent_directory, are only updated when the</div><div class='del'>- *	 filename is changed. Until then, they just become out of sync with</div><div class='del'>- *	 reality and the more up to date values are present in the standard</div><div class='del'>- *	 information attribute.</div><div class='del'>- * NOTE: There is conflicting information about the meaning of each of the time</div><div class='del'>- *	 fields but the meaning as defined below has been verified to be</div><div class='del'>- *	 correct by practical experimentation on Windows NT4 SP6a and is hence</div><div class='del'>- *	 assumed to be the one and only correct interpretation.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*hex ofs*/</div><div class='del'>-/*  0*/	leMFT_REF parent_directory;	/* Directory this filename is</div><div class='del'>-					   referenced from. */</div><div class='del'>-/*  8*/	sle64 creation_time;		/* Time file was created. */</div><div class='del'>-/* 10*/	sle64 last_data_change_time;	/* Time the data attribute was last</div><div class='del'>-					   modified. */</div><div class='del'>-/* 18*/	sle64 last_mft_change_time;	/* Time this mft record was last</div><div class='del'>-					   modified. */</div><div class='del'>-/* 20*/	sle64 last_access_time;		/* Time this mft record was last</div><div class='del'>-					   accessed. */</div><div class='del'>-/* 28*/	sle64 allocated_size;		/* Byte size of on-disk allocated space</div><div class='del'>-					   for the unnamed data attribute.  So</div><div class='del'>-					   for normal $DATA, this is the</div><div class='del'>-					   allocated_size from the unnamed</div><div class='del'>-					   $DATA attribute and for compressed</div><div class='del'>-					   and/or sparse $DATA, this is the</div><div class='del'>-					   compressed_size from the unnamed</div><div class='del'>-					   $DATA attribute.  For a directory or</div><div class='del'>-					   other inode without an unnamed $DATA</div><div class='del'>-					   attribute, this is always 0.  NOTE:</div><div class='del'>-					   This is a multiple of the cluster</div><div class='del'>-					   size. */</div><div class='del'>-/* 30*/	sle64 data_size;		/* Byte size of actual data in unnamed</div><div class='del'>-					   data attribute.  For a directory or</div><div class='del'>-					   other inode without an unnamed $DATA</div><div class='del'>-					   attribute, this is always 0. */</div><div class='del'>-/* 38*/	FILE_ATTR_FLAGS file_attributes;	/* Flags describing the file. */</div><div class='del'>-/* 3c*/	union {</div><div class='del'>-	/* 3c*/	struct {</div><div class='del'>-		/* 3c*/	le16 packed_ea_size;	/* Size of the buffer needed to</div><div class='del'>-						   pack the extended attributes</div><div class='del'>-						   (EAs), if such are present.*/</div><div class='del'>-		/* 3e*/	le16 reserved;		/* Reserved for alignment. */</div><div class='del'>-		} __attribute__ ((__packed__)) ea;</div><div class='del'>-	/* 3c*/	struct {</div><div class='del'>-		/* 3c*/	le32 reparse_point_tag;	/* Type of reparse point,</div><div class='del'>-						   present only in reparse</div><div class='del'>-						   points and only if there are</div><div class='del'>-						   no EAs. */</div><div class='del'>-		} __attribute__ ((__packed__)) rp;</div><div class='del'>-	} __attribute__ ((__packed__)) type;</div><div class='del'>-/* 40*/	u8 file_name_length;			/* Length of file name in</div><div class='del'>-						   (Unicode) characters. */</div><div class='del'>-/* 41*/	FILE_NAME_TYPE_FLAGS file_name_type;	/* Namespace of the file name.*/</div><div class='del'>-/* 42*/	ntfschar file_name[0];			/* File name in Unicode. */</div><div class='del'>-} __attribute__ ((__packed__)) FILE_NAME_ATTR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GUID structures store globally unique identifiers (GUID). A GUID is a</div><div class='del'>- * 128-bit value consisting of one group of eight hexadecimal digits, followed</div><div class='del'>- * by three groups of four hexadecimal digits each, followed by one group of</div><div class='del'>- * twelve hexadecimal digits. GUIDs are Microsoft's implementation of the</div><div class='del'>- * distributed computing environment (DCE) universally unique identifier (UUID).</div><div class='del'>- * Example of a GUID:</div><div class='del'>- *	1F010768-5A73-BC91-0010A52216A7</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 data1;	/* The first eight hexadecimal digits of the GUID. */</div><div class='del'>-	le16 data2;	/* The first group of four hexadecimal digits. */</div><div class='del'>-	le16 data3;	/* The second group of four hexadecimal digits. */</div><div class='del'>-	u8 data4[8];	/* The first two bytes are the third group of four</div><div class='del'>-			   hexadecimal digits. The remaining six bytes are the</div><div class='del'>-			   final 12 hexadecimal digits. */</div><div class='del'>-} __attribute__ ((__packed__)) GUID;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FILE_Extend/$ObjId contains an index named $O. This index contains all</div><div class='del'>- * object_ids present on the volume as the index keys and the corresponding</div><div class='del'>- * mft_record numbers as the index entry data parts. The data part (defined</div><div class='del'>- * below) also contains three other object_ids:</div><div class='del'>- *	birth_volume_id - object_id of FILE_Volume on which the file was first</div><div class='del'>- *			  created. Optional (i.e. can be zero).</div><div class='del'>- *	birth_object_id - object_id of file when it was first created. Usually</div><div class='del'>- *			  equals the object_id. Optional (i.e. can be zero).</div><div class='del'>- *	domain_id	- Reserved (always zero).</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	leMFT_REF mft_reference;/* Mft record containing the object_id in</div><div class='del'>-				   the index entry key. */</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			GUID birth_volume_id;</div><div class='del'>-			GUID birth_object_id;</div><div class='del'>-			GUID domain_id;</div><div class='del'>-		} __attribute__ ((__packed__)) origin;</div><div class='del'>-		u8 extended_info[48];</div><div class='del'>-	} __attribute__ ((__packed__)) opt;</div><div class='del'>-} __attribute__ ((__packed__)) OBJ_ID_INDEX_DATA;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Object id (NTFS 3.0+) (0x40).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	GUID object_id;				/* Unique id assigned to the</div><div class='del'>-						   file.*/</div><div class='del'>-	/* The following fields are optional. The attribute value size is 16</div><div class='del'>-	   bytes, i.e. sizeof(GUID), if these are not present at all. Note,</div><div class='del'>-	   the entries can be present but one or more (or all) can be zero</div><div class='del'>-	   meaning that that particular value(s) is(are) not defined. */</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			GUID birth_volume_id;	/* Unique id of volume on which</div><div class='del'>-						   the file was first created.*/</div><div class='del'>-			GUID birth_object_id;	/* Unique id of file when it was</div><div class='del'>-						   first created. */</div><div class='del'>-			GUID domain_id;		/* Reserved, zero. */</div><div class='del'>-		} __attribute__ ((__packed__)) origin;</div><div class='del'>-		u8 extended_info[48];</div><div class='del'>-	} __attribute__ ((__packed__)) opt;</div><div class='del'>-} __attribute__ ((__packed__)) OBJECT_ID_ATTR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The pre-defined IDENTIFIER_AUTHORITIES used as SID_IDENTIFIER_AUTHORITY in</div><div class='del'>- * the SID structure (see below).</div><div class='del'>- */</div><div class='del'>-//typedef enum {					/* SID string prefix. */</div><div class='del'>-//	SECURITY_NULL_SID_AUTHORITY	= {0, 0, 0, 0, 0, 0},	/* S-1-0 */</div><div class='del'>-//	SECURITY_WORLD_SID_AUTHORITY	= {0, 0, 0, 0, 0, 1},	/* S-1-1 */</div><div class='del'>-//	SECURITY_LOCAL_SID_AUTHORITY	= {0, 0, 0, 0, 0, 2},	/* S-1-2 */</div><div class='del'>-//	SECURITY_CREATOR_SID_AUTHORITY	= {0, 0, 0, 0, 0, 3},	/* S-1-3 */</div><div class='del'>-//	SECURITY_NON_UNIQUE_AUTHORITY	= {0, 0, 0, 0, 0, 4},	/* S-1-4 */</div><div class='del'>-//	SECURITY_NT_SID_AUTHORITY	= {0, 0, 0, 0, 0, 5},	/* S-1-5 */</div><div class='del'>-//} IDENTIFIER_AUTHORITIES;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These relative identifiers (RIDs) are used with the above identifier</div><div class='del'>- * authorities to make up universal well-known SIDs.</div><div class='del'>- *</div><div class='del'>- * Note: The relative identifier (RID) refers to the portion of a SID, which</div><div class='del'>- * identifies a user or group in relation to the authority that issued the SID.</div><div class='del'>- * For example, the universal well-known SID Creator Owner ID (S-1-3-0) is</div><div class='del'>- * made up of the identifier authority SECURITY_CREATOR_SID_AUTHORITY (3) and</div><div class='del'>- * the relative identifier SECURITY_CREATOR_OWNER_RID (0).</div><div class='del'>- */</div><div class='del'>-typedef enum {					/* Identifier authority. */</div><div class='del'>-	SECURITY_NULL_RID		  = 0,	/* S-1-0 */</div><div class='del'>-	SECURITY_WORLD_RID		  = 0,	/* S-1-1 */</div><div class='del'>-	SECURITY_LOCAL_RID		  = 0,	/* S-1-2 */</div><div class='del'>-</div><div class='del'>-	SECURITY_CREATOR_OWNER_RID	  = 0,	/* S-1-3 */</div><div class='del'>-	SECURITY_CREATOR_GROUP_RID	  = 1,	/* S-1-3 */</div><div class='del'>-</div><div class='del'>-	SECURITY_CREATOR_OWNER_SERVER_RID = 2,	/* S-1-3 */</div><div class='del'>-	SECURITY_CREATOR_GROUP_SERVER_RID = 3,	/* S-1-3 */</div><div class='del'>-</div><div class='del'>-	SECURITY_DIALUP_RID		  = 1,</div><div class='del'>-	SECURITY_NETWORK_RID		  = 2,</div><div class='del'>-	SECURITY_BATCH_RID		  = 3,</div><div class='del'>-	SECURITY_INTERACTIVE_RID	  = 4,</div><div class='del'>-	SECURITY_SERVICE_RID		  = 6,</div><div class='del'>-	SECURITY_ANONYMOUS_LOGON_RID	  = 7,</div><div class='del'>-	SECURITY_PROXY_RID		  = 8,</div><div class='del'>-	SECURITY_ENTERPRISE_CONTROLLERS_RID=9,</div><div class='del'>-	SECURITY_SERVER_LOGON_RID	  = 9,</div><div class='del'>-	SECURITY_PRINCIPAL_SELF_RID	  = 0xa,</div><div class='del'>-	SECURITY_AUTHENTICATED_USER_RID	  = 0xb,</div><div class='del'>-	SECURITY_RESTRICTED_CODE_RID	  = 0xc,</div><div class='del'>-	SECURITY_TERMINAL_SERVER_RID	  = 0xd,</div><div class='del'>-</div><div class='del'>-	SECURITY_LOGON_IDS_RID		  = 5,</div><div class='del'>-	SECURITY_LOGON_IDS_RID_COUNT	  = 3,</div><div class='del'>-</div><div class='del'>-	SECURITY_LOCAL_SYSTEM_RID	  = 0x12,</div><div class='del'>-</div><div class='del'>-	SECURITY_NT_NON_UNIQUE		  = 0x15,</div><div class='del'>-</div><div class='del'>-	SECURITY_BUILTIN_DOMAIN_RID	  = 0x20,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Well-known domain relative sub-authority values (RIDs).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Users. */</div><div class='del'>-	DOMAIN_USER_RID_ADMIN		  = 0x1f4,</div><div class='del'>-	DOMAIN_USER_RID_GUEST		  = 0x1f5,</div><div class='del'>-	DOMAIN_USER_RID_KRBTGT		  = 0x1f6,</div><div class='del'>-</div><div class='del'>-	/* Groups. */</div><div class='del'>-	DOMAIN_GROUP_RID_ADMINS		  = 0x200,</div><div class='del'>-	DOMAIN_GROUP_RID_USERS		  = 0x201,</div><div class='del'>-	DOMAIN_GROUP_RID_GUESTS		  = 0x202,</div><div class='del'>-	DOMAIN_GROUP_RID_COMPUTERS	  = 0x203,</div><div class='del'>-	DOMAIN_GROUP_RID_CONTROLLERS	  = 0x204,</div><div class='del'>-	DOMAIN_GROUP_RID_CERT_ADMINS	  = 0x205,</div><div class='del'>-	DOMAIN_GROUP_RID_SCHEMA_ADMINS	  = 0x206,</div><div class='del'>-	DOMAIN_GROUP_RID_ENTERPRISE_ADMINS= 0x207,</div><div class='del'>-	DOMAIN_GROUP_RID_POLICY_ADMINS	  = 0x208,</div><div class='del'>-</div><div class='del'>-	/* Aliases. */</div><div class='del'>-	DOMAIN_ALIAS_RID_ADMINS		  = 0x220,</div><div class='del'>-	DOMAIN_ALIAS_RID_USERS		  = 0x221,</div><div class='del'>-	DOMAIN_ALIAS_RID_GUESTS		  = 0x222,</div><div class='del'>-	DOMAIN_ALIAS_RID_POWER_USERS	  = 0x223,</div><div class='del'>-</div><div class='del'>-	DOMAIN_ALIAS_RID_ACCOUNT_OPS	  = 0x224,</div><div class='del'>-	DOMAIN_ALIAS_RID_SYSTEM_OPS	  = 0x225,</div><div class='del'>-	DOMAIN_ALIAS_RID_PRINT_OPS	  = 0x226,</div><div class='del'>-	DOMAIN_ALIAS_RID_BACKUP_OPS	  = 0x227,</div><div class='del'>-</div><div class='del'>-	DOMAIN_ALIAS_RID_REPLICATOR	  = 0x228,</div><div class='del'>-	DOMAIN_ALIAS_RID_RAS_SERVERS	  = 0x229,</div><div class='del'>-	DOMAIN_ALIAS_RID_PREW2KCOMPACCESS = 0x22a,</div><div class='del'>-} RELATIVE_IDENTIFIERS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The universal well-known SIDs:</div><div class='del'>- *</div><div class='del'>- *	NULL_SID			S-1-0-0</div><div class='del'>- *	WORLD_SID			S-1-1-0</div><div class='del'>- *	LOCAL_SID			S-1-2-0</div><div class='del'>- *	CREATOR_OWNER_SID		S-1-3-0</div><div class='del'>- *	CREATOR_GROUP_SID		S-1-3-1</div><div class='del'>- *	CREATOR_OWNER_SERVER_SID	S-1-3-2</div><div class='del'>- *	CREATOR_GROUP_SERVER_SID	S-1-3-3</div><div class='del'>- *</div><div class='del'>- *	(Non-unique IDs)		S-1-4</div><div class='del'>- *</div><div class='del'>- * NT well-known SIDs:</div><div class='del'>- *</div><div class='del'>- *	NT_AUTHORITY_SID	S-1-5</div><div class='del'>- *	DIALUP_SID		S-1-5-1</div><div class='del'>- *</div><div class='del'>- *	NETWORD_SID		S-1-5-2</div><div class='del'>- *	BATCH_SID		S-1-5-3</div><div class='del'>- *	INTERACTIVE_SID		S-1-5-4</div><div class='del'>- *	SERVICE_SID		S-1-5-6</div><div class='del'>- *	ANONYMOUS_LOGON_SID	S-1-5-7		(aka null logon session)</div><div class='del'>- *	PROXY_SID		S-1-5-8</div><div class='del'>- *	SERVER_LOGON_SID	S-1-5-9		(aka domain controller account)</div><div class='del'>- *	SELF_SID		S-1-5-10	(self RID)</div><div class='del'>- *	AUTHENTICATED_USER_SID	S-1-5-11</div><div class='del'>- *	RESTRICTED_CODE_SID	S-1-5-12	(running restricted code)</div><div class='del'>- *	TERMINAL_SERVER_SID	S-1-5-13	(running on terminal server)</div><div class='del'>- *</div><div class='del'>- *	(Logon IDs)		S-1-5-5-X-Y</div><div class='del'>- *</div><div class='del'>- *	(NT non-unique IDs)	S-1-5-0x15-...</div><div class='del'>- *</div><div class='del'>- *	(Built-in domain)	S-1-5-0x20</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The SID_IDENTIFIER_AUTHORITY is a 48-bit value used in the SID structure.</div><div class='del'>- *</div><div class='del'>- * NOTE: This is stored as a big endian number, hence the high_part comes</div><div class='del'>- * before the low_part.</div><div class='del'>- */</div><div class='del'>-typedef union {</div><div class='del'>-	struct {</div><div class='del'>-		u16 high_part;	/* High 16-bits. */</div><div class='del'>-		u32 low_part;	/* Low 32-bits. */</div><div class='del'>-	} __attribute__ ((__packed__)) parts;</div><div class='del'>-	u8 value[6];		/* Value as individual bytes. */</div><div class='del'>-} __attribute__ ((__packed__)) SID_IDENTIFIER_AUTHORITY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The SID structure is a variable-length structure used to uniquely identify</div><div class='del'>- * users or groups. SID stands for security identifier.</div><div class='del'>- *</div><div class='del'>- * The standard textual representation of the SID is of the form:</div><div class='del'>- *	S-R-I-S-S...</div><div class='del'>- * Where:</div><div class='del'>- *    - The first "S" is the literal character 'S' identifying the following</div><div class='del'>- *	digits as a SID.</div><div class='del'>- *    - R is the revision level of the SID expressed as a sequence of digits</div><div class='del'>- *	either in decimal or hexadecimal (if the later, prefixed by "0x").</div><div class='del'>- *    - I is the 48-bit identifier_authority, expressed as digits as R above.</div><div class='del'>- *    - S... is one or more sub_authority values, expressed as digits as above.</div><div class='del'>- *</div><div class='del'>- * Example SID; the domain-relative SID of the local Administrators group on</div><div class='del'>- * Windows NT/2k:</div><div class='del'>- *	S-1-5-32-544</div><div class='del'>- * This translates to a SID with:</div><div class='del'>- *	revision = 1,</div><div class='del'>- *	sub_authority_count = 2,</div><div class='del'>- *	identifier_authority = {0,0,0,0,0,5},	// SECURITY_NT_AUTHORITY</div><div class='del'>- *	sub_authority[0] = 32,			// SECURITY_BUILTIN_DOMAIN_RID</div><div class='del'>- *	sub_authority[1] = 544			// DOMAIN_ALIAS_RID_ADMINS</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 revision;</div><div class='del'>-	u8 sub_authority_count;</div><div class='del'>-	SID_IDENTIFIER_AUTHORITY identifier_authority;</div><div class='del'>-	le32 sub_authority[1];		/* At least one sub_authority. */</div><div class='del'>-} __attribute__ ((__packed__)) SID;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Current constants for SIDs.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	SID_REVISION			=  1,	/* Current revision level. */</div><div class='del'>-	SID_MAX_SUB_AUTHORITIES		= 15,	/* Maximum number of those. */</div><div class='del'>-	SID_RECOMMENDED_SUB_AUTHORITIES	=  1,	/* Will change to around 6 in</div><div class='del'>-						   a future revision. */</div><div class='del'>-} SID_CONSTANTS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The predefined ACE types (8-bit, see below).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	ACCESS_MIN_MS_ACE_TYPE		= 0,</div><div class='del'>-	ACCESS_ALLOWED_ACE_TYPE		= 0,</div><div class='del'>-	ACCESS_DENIED_ACE_TYPE		= 1,</div><div class='del'>-	SYSTEM_AUDIT_ACE_TYPE		= 2,</div><div class='del'>-	SYSTEM_ALARM_ACE_TYPE		= 3, /* Not implemented as of Win2k. */</div><div class='del'>-	ACCESS_MAX_MS_V2_ACE_TYPE	= 3,</div><div class='del'>-</div><div class='del'>-	ACCESS_ALLOWED_COMPOUND_ACE_TYPE= 4,</div><div class='del'>-	ACCESS_MAX_MS_V3_ACE_TYPE	= 4,</div><div class='del'>-</div><div class='del'>-	/* The following are Win2k only. */</div><div class='del'>-	ACCESS_MIN_MS_OBJECT_ACE_TYPE	= 5,</div><div class='del'>-	ACCESS_ALLOWED_OBJECT_ACE_TYPE	= 5,</div><div class='del'>-	ACCESS_DENIED_OBJECT_ACE_TYPE	= 6,</div><div class='del'>-	SYSTEM_AUDIT_OBJECT_ACE_TYPE	= 7,</div><div class='del'>-	SYSTEM_ALARM_OBJECT_ACE_TYPE	= 8,</div><div class='del'>-	ACCESS_MAX_MS_OBJECT_ACE_TYPE	= 8,</div><div class='del'>-</div><div class='del'>-	ACCESS_MAX_MS_V4_ACE_TYPE	= 8,</div><div class='del'>-</div><div class='del'>-	/* This one is for WinNT/2k. */</div><div class='del'>-	ACCESS_MAX_MS_ACE_TYPE		= 8,</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef u8 ACE_TYPES;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ACE flags (8-bit) for audit and inheritance (see below).</div><div class='del'>- *</div><div class='del'>- * SUCCESSFUL_ACCESS_ACE_FLAG is only used with system audit and alarm ACE</div><div class='del'>- * types to indicate that a message is generated (in Windows!) for successful</div><div class='del'>- * accesses.</div><div class='del'>- *</div><div class='del'>- * FAILED_ACCESS_ACE_FLAG is only used with system audit and alarm ACE types</div><div class='del'>- * to indicate that a message is generated (in Windows!) for failed accesses.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	/* The inheritance flags. */</div><div class='del'>-	OBJECT_INHERIT_ACE		= 0x01,</div><div class='del'>-	CONTAINER_INHERIT_ACE		= 0x02,</div><div class='del'>-	NO_PROPAGATE_INHERIT_ACE	= 0x04,</div><div class='del'>-	INHERIT_ONLY_ACE		= 0x08,</div><div class='del'>-	INHERITED_ACE			= 0x10,	/* Win2k only. */</div><div class='del'>-	VALID_INHERIT_FLAGS		= 0x1f,</div><div class='del'>-</div><div class='del'>-	/* The audit flags. */</div><div class='del'>-	SUCCESSFUL_ACCESS_ACE_FLAG	= 0x40,</div><div class='del'>-	FAILED_ACCESS_ACE_FLAG		= 0x80,</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef u8 ACE_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * An ACE is an access-control entry in an access-control list (ACL).</div><div class='del'>- * An ACE defines access to an object for a specific user or group or defines</div><div class='del'>- * the types of access that generate system-administration messages or alarms</div><div class='del'>- * for a specific user or group. The user or group is identified by a security</div><div class='del'>- * identifier (SID).</div><div class='del'>- *</div><div class='del'>- * Each ACE starts with an ACE_HEADER structure (aligned on 4-byte boundary),</div><div class='del'>- * which specifies the type and size of the ACE. The format of the subsequent</div><div class='del'>- * data depends on the ACE type.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0*/	ACE_TYPES type;		/* Type of the ACE. */</div><div class='del'>-/*  1*/	ACE_FLAGS flags;	/* Flags describing the ACE. */</div><div class='del'>-/*  2*/	le16 size;		/* Size in bytes of the ACE. */</div><div class='del'>-} __attribute__ ((__packed__)) ACE_HEADER;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The access mask (32-bit). Defines the access rights.</div><div class='del'>- *</div><div class='del'>- * The specific rights (bits 0 to 15).  These depend on the type of the object</div><div class='del'>- * being secured by the ACE.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	/* Specific rights for files and directories are as follows: */</div><div class='del'>-</div><div class='del'>-	/* Right to read data from the file. (FILE) */</div><div class='del'>-	FILE_READ_DATA			= cpu_to_le32(0x00000001),</div><div class='del'>-	/* Right to list contents of a directory. (DIRECTORY) */</div><div class='del'>-	FILE_LIST_DIRECTORY		= cpu_to_le32(0x00000001),</div><div class='del'>-</div><div class='del'>-	/* Right to write data to the file. (FILE) */</div><div class='del'>-	FILE_WRITE_DATA			= cpu_to_le32(0x00000002),</div><div class='del'>-	/* Right to create a file in the directory. (DIRECTORY) */</div><div class='del'>-	FILE_ADD_FILE			= cpu_to_le32(0x00000002),</div><div class='del'>-</div><div class='del'>-	/* Right to append data to the file. (FILE) */</div><div class='del'>-	FILE_APPEND_DATA		= cpu_to_le32(0x00000004),</div><div class='del'>-	/* Right to create a subdirectory. (DIRECTORY) */</div><div class='del'>-	FILE_ADD_SUBDIRECTORY		= cpu_to_le32(0x00000004),</div><div class='del'>-</div><div class='del'>-	/* Right to read extended attributes. (FILE/DIRECTORY) */</div><div class='del'>-	FILE_READ_EA			= cpu_to_le32(0x00000008),</div><div class='del'>-</div><div class='del'>-	/* Right to write extended attributes. (FILE/DIRECTORY) */</div><div class='del'>-	FILE_WRITE_EA			= cpu_to_le32(0x00000010),</div><div class='del'>-</div><div class='del'>-	/* Right to execute a file. (FILE) */</div><div class='del'>-	FILE_EXECUTE			= cpu_to_le32(0x00000020),</div><div class='del'>-	/* Right to traverse the directory. (DIRECTORY) */</div><div class='del'>-	FILE_TRAVERSE			= cpu_to_le32(0x00000020),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Right to delete a directory and all the files it contains (its</div><div class='del'>-	 * children), even if the files are read-only. (DIRECTORY)</div><div class='del'>-	 */</div><div class='del'>-	FILE_DELETE_CHILD		= cpu_to_le32(0x00000040),</div><div class='del'>-</div><div class='del'>-	/* Right to read file attributes. (FILE/DIRECTORY) */</div><div class='del'>-	FILE_READ_ATTRIBUTES		= cpu_to_le32(0x00000080),</div><div class='del'>-</div><div class='del'>-	/* Right to change file attributes. (FILE/DIRECTORY) */</div><div class='del'>-	FILE_WRITE_ATTRIBUTES		= cpu_to_le32(0x00000100),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The standard rights (bits 16 to 23).  These are independent of the</div><div class='del'>-	 * type of object being secured.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Right to delete the object. */</div><div class='del'>-	DELETE				= cpu_to_le32(0x00010000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Right to read the information in the object's security descriptor,</div><div class='del'>-	 * not including the information in the SACL, i.e. right to read the</div><div class='del'>-	 * security descriptor and owner.</div><div class='del'>-	 */</div><div class='del'>-	READ_CONTROL			= cpu_to_le32(0x00020000),</div><div class='del'>-</div><div class='del'>-	/* Right to modify the DACL in the object's security descriptor. */</div><div class='del'>-	WRITE_DAC			= cpu_to_le32(0x00040000),</div><div class='del'>-</div><div class='del'>-	/* Right to change the owner in the object's security descriptor. */</div><div class='del'>-	WRITE_OWNER			= cpu_to_le32(0x00080000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Right to use the object for synchronization.  Enables a process to</div><div class='del'>-	 * wait until the object is in the signalled state.  Some object types</div><div class='del'>-	 * do not support this access right.</div><div class='del'>-	 */</div><div class='del'>-	SYNCHRONIZE			= cpu_to_le32(0x00100000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The following STANDARD_RIGHTS_* are combinations of the above for</div><div class='del'>-	 * convenience and are defined by the Win32 API.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* These are currently defined to READ_CONTROL. */</div><div class='del'>-	STANDARD_RIGHTS_READ		= cpu_to_le32(0x00020000),</div><div class='del'>-	STANDARD_RIGHTS_WRITE		= cpu_to_le32(0x00020000),</div><div class='del'>-	STANDARD_RIGHTS_EXECUTE		= cpu_to_le32(0x00020000),</div><div class='del'>-</div><div class='del'>-	/* Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access. */</div><div class='del'>-	STANDARD_RIGHTS_REQUIRED	= cpu_to_le32(0x000f0000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and</div><div class='del'>-	 * SYNCHRONIZE access.</div><div class='del'>-	 */</div><div class='del'>-	STANDARD_RIGHTS_ALL		= cpu_to_le32(0x001f0000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The access system ACL and maximum allowed access types (bits 24 to</div><div class='del'>-	 * 25, bits 26 to 27 are reserved).</div><div class='del'>-	 */</div><div class='del'>-	ACCESS_SYSTEM_SECURITY		= cpu_to_le32(0x01000000),</div><div class='del'>-	MAXIMUM_ALLOWED			= cpu_to_le32(0x02000000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The generic rights (bits 28 to 31).  These map onto the standard and</div><div class='del'>-	 * specific rights.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Read, write, and execute access. */</div><div class='del'>-	GENERIC_ALL			= cpu_to_le32(0x10000000),</div><div class='del'>-</div><div class='del'>-	/* Execute access. */</div><div class='del'>-	GENERIC_EXECUTE			= cpu_to_le32(0x20000000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write access.  For files, this maps onto:</div><div class='del'>-	 *	FILE_APPEND_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA |</div><div class='del'>-	 *	FILE_WRITE_EA | STANDARD_RIGHTS_WRITE | SYNCHRONIZE</div><div class='del'>-	 * For directories, the mapping has the same numerical value.  See</div><div class='del'>-	 * above for the descriptions of the rights granted.</div><div class='del'>-	 */</div><div class='del'>-	GENERIC_WRITE			= cpu_to_le32(0x40000000),</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read access.  For files, this maps onto:</div><div class='del'>-	 *	FILE_READ_ATTRIBUTES | FILE_READ_DATA | FILE_READ_EA |</div><div class='del'>-	 *	STANDARD_RIGHTS_READ | SYNCHRONIZE</div><div class='del'>-	 * For directories, the mapping has the same numberical value.  See</div><div class='del'>-	 * above for the descriptions of the rights granted.</div><div class='del'>-	 */</div><div class='del'>-	GENERIC_READ			= cpu_to_le32(0x80000000),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 ACCESS_MASK;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The generic mapping array. Used to denote the mapping of each generic</div><div class='del'>- * access right to a specific access mask.</div><div class='del'>- *</div><div class='del'>- * FIXME: What exactly is this and what is it for? (AIA)</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	ACCESS_MASK generic_read;</div><div class='del'>-	ACCESS_MASK generic_write;</div><div class='del'>-	ACCESS_MASK generic_execute;</div><div class='del'>-	ACCESS_MASK generic_all;</div><div class='del'>-} __attribute__ ((__packed__)) GENERIC_MAPPING;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The predefined ACE type structures are as defined below.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE, SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*  0	ACE_HEADER; -- Unfolded here as gcc doesn't like unnamed structs. */</div><div class='del'>-	ACE_TYPES type;		/* Type of the ACE. */</div><div class='del'>-	ACE_FLAGS flags;	/* Flags describing the ACE. */</div><div class='del'>-	le16 size;		/* Size in bytes of the ACE. */</div><div class='del'>-/*  4*/	ACCESS_MASK mask;	/* Access mask associated with the ACE. */</div><div class='del'>-</div><div class='del'>-/*  8*/	SID sid;		/* The SID associated with the ACE. */</div><div class='del'>-} __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,</div><div class='del'>-			       SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The object ACE flags (32-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	ACE_OBJECT_TYPE_PRESENT			= cpu_to_le32(1),</div><div class='del'>-	ACE_INHERITED_OBJECT_TYPE_PRESENT	= cpu_to_le32(2),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 OBJECT_ACE_FLAGS;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-/*  0	ACE_HEADER; -- Unfolded here as gcc doesn't like unnamed structs. */</div><div class='del'>-	ACE_TYPES type;		/* Type of the ACE. */</div><div class='del'>-	ACE_FLAGS flags;	/* Flags describing the ACE. */</div><div class='del'>-	le16 size;		/* Size in bytes of the ACE. */</div><div class='del'>-/*  4*/	ACCESS_MASK mask;	/* Access mask associated with the ACE. */</div><div class='del'>-</div><div class='del'>-/*  8*/	OBJECT_ACE_FLAGS object_flags;	/* Flags describing the object ACE. */</div><div class='del'>-/* 12*/	GUID object_type;</div><div class='del'>-/* 28*/	GUID inherited_object_type;</div><div class='del'>-</div><div class='del'>-/* 44*/	SID sid;		/* The SID associated with the ACE. */</div><div class='del'>-} __attribute__ ((__packed__)) ACCESS_ALLOWED_OBJECT_ACE,</div><div class='del'>-			       ACCESS_DENIED_OBJECT_ACE,</div><div class='del'>-			       SYSTEM_AUDIT_OBJECT_ACE,</div><div class='del'>-			       SYSTEM_ALARM_OBJECT_ACE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * An ACL is an access-control list (ACL).</div><div class='del'>- * An ACL starts with an ACL header structure, which specifies the size of</div><div class='del'>- * the ACL and the number of ACEs it contains. The ACL header is followed by</div><div class='del'>- * zero or more access control entries (ACEs). The ACL as well as each ACE</div><div class='del'>- * are aligned on 4-byte boundaries.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 revision;	/* Revision of this ACL. */</div><div class='del'>-	u8 alignment1;</div><div class='del'>-	le16 size;	/* Allocated space in bytes for ACL. Includes this</div><div class='del'>-			   header, the ACEs and the remaining free space. */</div><div class='del'>-	le16 ace_count;	/* Number of ACEs in the ACL. */</div><div class='del'>-	le16 alignment2;</div><div class='del'>-/* sizeof() = 8 bytes */</div><div class='del'>-} __attribute__ ((__packed__)) ACL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Current constants for ACLs.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	/* Current revision. */</div><div class='del'>-	ACL_REVISION		= 2,</div><div class='del'>-	ACL_REVISION_DS		= 4,</div><div class='del'>-</div><div class='del'>-	/* History of revisions. */</div><div class='del'>-	ACL_REVISION1		= 1,</div><div class='del'>-	MIN_ACL_REVISION	= 2,</div><div class='del'>-	ACL_REVISION2		= 2,</div><div class='del'>-	ACL_REVISION3		= 3,</div><div class='del'>-	ACL_REVISION4		= 4,</div><div class='del'>-	MAX_ACL_REVISION	= 4,</div><div class='del'>-} ACL_CONSTANTS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The security descriptor control flags (16-bit).</div><div class='del'>- *</div><div class='del'>- * SE_OWNER_DEFAULTED - This boolean flag, when set, indicates that the SID</div><div class='del'>- *	pointed to by the Owner field was provided by a defaulting mechanism</div><div class='del'>- *	rather than explicitly provided by the original provider of the</div><div class='del'>- *	security descriptor.  This may affect the treatment of the SID with</div><div class='del'>- *	respect to inheritance of an owner.</div><div class='del'>- *</div><div class='del'>- * SE_GROUP_DEFAULTED - This boolean flag, when set, indicates that the SID in</div><div class='del'>- *	the Group field was provided by a defaulting mechanism rather than</div><div class='del'>- *	explicitly provided by the original provider of the security</div><div class='del'>- *	descriptor.  This may affect the treatment of the SID with respect to</div><div class='del'>- *	inheritance of a primary group.</div><div class='del'>- *</div><div class='del'>- * SE_DACL_PRESENT - This boolean flag, when set, indicates that the security</div><div class='del'>- *	descriptor contains a discretionary ACL.  If this flag is set and the</div><div class='del'>- *	Dacl field of the SECURITY_DESCRIPTOR is null, then a null ACL is</div><div class='del'>- *	explicitly being specified.</div><div class='del'>- *</div><div class='del'>- * SE_DACL_DEFAULTED - This boolean flag, when set, indicates that the ACL</div><div class='del'>- *	pointed to by the Dacl field was provided by a defaulting mechanism</div><div class='del'>- *	rather than explicitly provided by the original provider of the</div><div class='del'>- *	security descriptor.  This may affect the treatment of the ACL with</div><div class='del'>- *	respect to inheritance of an ACL.  This flag is ignored if the</div><div class='del'>- *	DaclPresent flag is not set.</div><div class='del'>- *</div><div class='del'>- * SE_SACL_PRESENT - This boolean flag, when set,  indicates that the security</div><div class='del'>- *	descriptor contains a system ACL pointed to by the Sacl field.  If this</div><div class='del'>- *	flag is set and the Sacl field of the SECURITY_DESCRIPTOR is null, then</div><div class='del'>- *	an empty (but present) ACL is being specified.</div><div class='del'>- *</div><div class='del'>- * SE_SACL_DEFAULTED - This boolean flag, when set, indicates that the ACL</div><div class='del'>- *	pointed to by the Sacl field was provided by a defaulting mechanism</div><div class='del'>- *	rather than explicitly provided by the original provider of the</div><div class='del'>- *	security descriptor.  This may affect the treatment of the ACL with</div><div class='del'>- *	respect to inheritance of an ACL.  This flag is ignored if the</div><div class='del'>- *	SaclPresent flag is not set.</div><div class='del'>- *</div><div class='del'>- * SE_SELF_RELATIVE - This boolean flag, when set, indicates that the security</div><div class='del'>- *	descriptor is in self-relative form.  In this form, all fields of the</div><div class='del'>- *	security descriptor are contiguous in memory and all pointer fields are</div><div class='del'>- *	expressed as offsets from the beginning of the security descriptor.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	SE_OWNER_DEFAULTED		= cpu_to_le16(0x0001),</div><div class='del'>-	SE_GROUP_DEFAULTED		= cpu_to_le16(0x0002),</div><div class='del'>-	SE_DACL_PRESENT			= cpu_to_le16(0x0004),</div><div class='del'>-	SE_DACL_DEFAULTED		= cpu_to_le16(0x0008),</div><div class='del'>-</div><div class='del'>-	SE_SACL_PRESENT			= cpu_to_le16(0x0010),</div><div class='del'>-	SE_SACL_DEFAULTED		= cpu_to_le16(0x0020),</div><div class='del'>-</div><div class='del'>-	SE_DACL_AUTO_INHERIT_REQ	= cpu_to_le16(0x0100),</div><div class='del'>-	SE_SACL_AUTO_INHERIT_REQ	= cpu_to_le16(0x0200),</div><div class='del'>-	SE_DACL_AUTO_INHERITED		= cpu_to_le16(0x0400),</div><div class='del'>-	SE_SACL_AUTO_INHERITED		= cpu_to_le16(0x0800),</div><div class='del'>-</div><div class='del'>-	SE_DACL_PROTECTED		= cpu_to_le16(0x1000),</div><div class='del'>-	SE_SACL_PROTECTED		= cpu_to_le16(0x2000),</div><div class='del'>-	SE_RM_CONTROL_VALID		= cpu_to_le16(0x4000),</div><div class='del'>-	SE_SELF_RELATIVE		= cpu_to_le16(0x8000)</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef le16 SECURITY_DESCRIPTOR_CONTROL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Self-relative security descriptor. Contains the owner and group SIDs as well</div><div class='del'>- * as the sacl and dacl ACLs inside the security descriptor itself.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 revision;	/* Revision level of the security descriptor. */</div><div class='del'>-	u8 alignment;</div><div class='del'>-	SECURITY_DESCRIPTOR_CONTROL control; /* Flags qualifying the type of</div><div class='del'>-			   the descriptor as well as the following fields. */</div><div class='del'>-	le32 owner;	/* Byte offset to a SID representing an object's</div><div class='del'>-			   owner. If this is NULL, no owner SID is present in</div><div class='del'>-			   the descriptor. */</div><div class='del'>-	le32 group;	/* Byte offset to a SID representing an object's</div><div class='del'>-			   primary group. If this is NULL, no primary group</div><div class='del'>-			   SID is present in the descriptor. */</div><div class='del'>-	le32 sacl;	/* Byte offset to a system ACL. Only valid, if</div><div class='del'>-			   SE_SACL_PRESENT is set in the control field. If</div><div class='del'>-			   SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL</div><div class='del'>-			   is specified. */</div><div class='del'>-	le32 dacl;	/* Byte offset to a discretionary ACL. Only valid, if</div><div class='del'>-			   SE_DACL_PRESENT is set in the control field. If</div><div class='del'>-			   SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL</div><div class='del'>-			   (unconditionally granting access) is specified. */</div><div class='del'>-/* sizeof() = 0x14 bytes */</div><div class='del'>-} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_RELATIVE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Absolute security descriptor. Does not contain the owner and group SIDs, nor</div><div class='del'>- * the sacl and dacl ACLs inside the security descriptor. Instead, it contains</div><div class='del'>- * pointers to these structures in memory. Obviously, absolute security</div><div class='del'>- * descriptors are only useful for in memory representations of security</div><div class='del'>- * descriptors. On disk, a self-relative security descriptor is used.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 revision;	/* Revision level of the security descriptor. */</div><div class='del'>-	u8 alignment;</div><div class='del'>-	SECURITY_DESCRIPTOR_CONTROL control;	/* Flags qualifying the type of</div><div class='del'>-			   the descriptor as well as the following fields. */</div><div class='del'>-	SID *owner;	/* Points to a SID representing an object's owner. If</div><div class='del'>-			   this is NULL, no owner SID is present in the</div><div class='del'>-			   descriptor. */</div><div class='del'>-	SID *group;	/* Points to a SID representing an object's primary</div><div class='del'>-			   group. If this is NULL, no primary group SID is</div><div class='del'>-			   present in the descriptor. */</div><div class='del'>-	ACL *sacl;	/* Points to a system ACL. Only valid, if</div><div class='del'>-			   SE_SACL_PRESENT is set in the control field. If</div><div class='del'>-			   SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL</div><div class='del'>-			   is specified. */</div><div class='del'>-	ACL *dacl;	/* Points to a discretionary ACL. Only valid, if</div><div class='del'>-			   SE_DACL_PRESENT is set in the control field. If</div><div class='del'>-			   SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL</div><div class='del'>-			   (unconditionally granting access) is specified. */</div><div class='del'>-} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Current constants for security descriptors.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	/* Current revision. */</div><div class='del'>-	SECURITY_DESCRIPTOR_REVISION	= 1,</div><div class='del'>-	SECURITY_DESCRIPTOR_REVISION1	= 1,</div><div class='del'>-</div><div class='del'>-	/* The sizes of both the absolute and relative security descriptors is</div><div class='del'>-	   the same as pointers, at least on ia32 architecture are 32-bit. */</div><div class='del'>-	SECURITY_DESCRIPTOR_MIN_LENGTH	= sizeof(SECURITY_DESCRIPTOR),</div><div class='del'>-} SECURITY_DESCRIPTOR_CONSTANTS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Security descriptor (0x50). A standard self-relative security</div><div class='del'>- * descriptor.</div><div class='del'>- *</div><div class='del'>- * NOTE: Can be resident or non-resident.</div><div class='del'>- * NOTE: Not used in NTFS 3.0+, as security descriptors are stored centrally</div><div class='del'>- * in FILE_Secure and the correct descriptor is found using the security_id</div><div class='del'>- * from the standard information attribute.</div><div class='del'>- */</div><div class='del'>-typedef SECURITY_DESCRIPTOR_RELATIVE SECURITY_DESCRIPTOR_ATTR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On NTFS 3.0+, all security descriptors are stored in FILE_Secure. Only one</div><div class='del'>- * referenced instance of each unique security descriptor is stored.</div><div class='del'>- *</div><div class='del'>- * FILE_Secure contains no unnamed data attribute, i.e. it has zero length. It</div><div class='del'>- * does, however, contain two indexes ($SDH and $SII) as well as a named data</div><div class='del'>- * stream ($SDS).</div><div class='del'>- *</div><div class='del'>- * Every unique security descriptor is assigned a unique security identifier</div><div class='del'>- * (security_id, not to be confused with a SID). The security_id is unique for</div><div class='del'>- * the NTFS volume and is used as an index into the $SII index, which maps</div><div class='del'>- * security_ids to the security descriptor's storage location within the $SDS</div><div class='del'>- * data attribute. The $SII index is sorted by ascending security_id.</div><div class='del'>- *</div><div class='del'>- * A simple hash is computed from each security descriptor. This hash is used</div><div class='del'>- * as an index into the $SDH index, which maps security descriptor hashes to</div><div class='del'>- * the security descriptor's storage location within the $SDS data attribute.</div><div class='del'>- * The $SDH index is sorted by security descriptor hash and is stored in a B+</div><div class='del'>- * tree. When searching $SDH (with the intent of determining whether or not a</div><div class='del'>- * new security descriptor is already present in the $SDS data stream), if a</div><div class='del'>- * matching hash is found, but the security descriptors do not match, the</div><div class='del'>- * search in the $SDH index is continued, searching for a next matching hash.</div><div class='del'>- *</div><div class='del'>- * When a precise match is found, the security_id coresponding to the security</div><div class='del'>- * descriptor in the $SDS attribute is read from the found $SDH index entry and</div><div class='del'>- * is stored in the $STANDARD_INFORMATION attribute of the file/directory to</div><div class='del'>- * which the security descriptor is being applied. The $STANDARD_INFORMATION</div><div class='del'>- * attribute is present in all base mft records (i.e. in all files and</div><div class='del'>- * directories).</div><div class='del'>- *</div><div class='del'>- * If a match is not found, the security descriptor is assigned a new unique</div><div class='del'>- * security_id and is added to the $SDS data attribute. Then, entries</div><div class='del'>- * referencing the this security descriptor in the $SDS data attribute are</div><div class='del'>- * added to the $SDH and $SII indexes.</div><div class='del'>- *</div><div class='del'>- * Note: Entries are never deleted from FILE_Secure, even if nothing</div><div class='del'>- * references an entry any more.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This header precedes each security descriptor in the $SDS data stream.</div><div class='del'>- * This is also the index entry data part of both the $SII and $SDH indexes.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 hash;	  /* Hash of the security descriptor. */</div><div class='del'>-	le32 security_id; /* The security_id assigned to the descriptor. */</div><div class='del'>-	le64 offset;	  /* Byte offset of this entry in the $SDS stream. */</div><div class='del'>-	le32 length;	  /* Size in bytes of this entry in $SDS stream. */</div><div class='del'>-} __attribute__ ((__packed__)) SECURITY_DESCRIPTOR_HEADER;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The $SDS data stream contains the security descriptors, aligned on 16-byte</div><div class='del'>- * boundaries, sorted by security_id in a B+ tree. Security descriptors cannot</div><div class='del'>- * cross 256kib boundaries (this restriction is imposed by the Windows cache</div><div class='del'>- * manager). Each security descriptor is contained in a SDS_ENTRY structure.</div><div class='del'>- * Also, each security descriptor is stored twice in the $SDS stream with a</div><div class='del'>- * fixed offset of 0x40000 bytes (256kib, the Windows cache manager's max size)</div><div class='del'>- * between them; i.e. if a SDS_ENTRY specifies an offset of 0x51d0, then the</div><div class='del'>- * first copy of the security descriptor will be at offset 0x51d0 in the</div><div class='del'>- * $SDS data stream and the second copy will be at offset 0x451d0.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0	SECURITY_DESCRIPTOR_HEADER; -- Unfolded here as gcc doesn't like</div><div class='del'>-				       unnamed structs. */</div><div class='del'>-	le32 hash;	  /* Hash of the security descriptor. */</div><div class='del'>-	le32 security_id; /* The security_id assigned to the descriptor. */</div><div class='del'>-	le64 offset;	  /* Byte offset of this entry in the $SDS stream. */</div><div class='del'>-	le32 length;	  /* Size in bytes of this entry in $SDS stream. */</div><div class='del'>-/* 20*/	SECURITY_DESCRIPTOR_RELATIVE sid; /* The self-relative security</div><div class='del'>-					     descriptor. */</div><div class='del'>-} __attribute__ ((__packed__)) SDS_ENTRY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The index entry key used in the $SII index. The collation type is</div><div class='del'>- * COLLATION_NTOFS_ULONG.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 security_id; /* The security_id assigned to the descriptor. */</div><div class='del'>-} __attribute__ ((__packed__)) SII_INDEX_KEY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The index entry key used in the $SDH index. The keys are sorted first by</div><div class='del'>- * hash and then by security_id. The collation rule is</div><div class='del'>- * COLLATION_NTOFS_SECURITY_HASH.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 hash;	  /* Hash of the security descriptor. */</div><div class='del'>-	le32 security_id; /* The security_id assigned to the descriptor. */</div><div class='del'>-} __attribute__ ((__packed__)) SDH_INDEX_KEY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Volume name (0x60).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident.</div><div class='del'>- * NOTE: Present only in FILE_Volume.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	ntfschar name[0];	/* The name of the volume in Unicode. */</div><div class='del'>-} __attribute__ ((__packed__)) VOLUME_NAME;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Possible flags for the volume (16-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	VOLUME_IS_DIRTY			= cpu_to_le16(0x0001),</div><div class='del'>-	VOLUME_RESIZE_LOG_FILE		= cpu_to_le16(0x0002),</div><div class='del'>-	VOLUME_UPGRADE_ON_MOUNT		= cpu_to_le16(0x0004),</div><div class='del'>-	VOLUME_MOUNTED_ON_NT4		= cpu_to_le16(0x0008),</div><div class='del'>-</div><div class='del'>-	VOLUME_DELETE_USN_UNDERWAY	= cpu_to_le16(0x0010),</div><div class='del'>-	VOLUME_REPAIR_OBJECT_ID		= cpu_to_le16(0x0020),</div><div class='del'>-</div><div class='del'>-	VOLUME_CHKDSK_UNDERWAY		= cpu_to_le16(0x4000),</div><div class='del'>-	VOLUME_MODIFIED_BY_CHKDSK	= cpu_to_le16(0x8000),</div><div class='del'>-</div><div class='del'>-	VOLUME_FLAGS_MASK		= cpu_to_le16(0xc03f),</div><div class='del'>-</div><div class='del'>-	/* To make our life easier when checking if we must mount read-only. */</div><div class='del'>-	VOLUME_MUST_MOUNT_RO_MASK	= cpu_to_le16(0xc027),</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef le16 VOLUME_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Volume information (0x70).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident.</div><div class='del'>- * NOTE: Present only in FILE_Volume.</div><div class='del'>- * NOTE: Windows 2000 uses NTFS 3.0 while Windows NT4 service pack 6a uses</div><div class='del'>- *	 NTFS 1.2. I haven't personally seen other values yet.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le64 reserved;		/* Not used (yet?). */</div><div class='del'>-	u8 major_ver;		/* Major version of the ntfs format. */</div><div class='del'>-	u8 minor_ver;		/* Minor version of the ntfs format. */</div><div class='del'>-	VOLUME_FLAGS flags;	/* Bit array of VOLUME_* flags. */</div><div class='del'>-} __attribute__ ((__packed__)) VOLUME_INFORMATION;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Data attribute (0x80).</div><div class='del'>- *</div><div class='del'>- * NOTE: Can be resident or non-resident.</div><div class='del'>- *</div><div class='del'>- * Data contents of a file (i.e. the unnamed stream) or of a named stream.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 data[0];		/* The file's data contents. */</div><div class='del'>-} __attribute__ ((__packed__)) DATA_ATTR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Index header flags (8-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	/*</div><div class='del'>-	 * When index header is in an index root attribute:</div><div class='del'>-	 */</div><div class='del'>-	SMALL_INDEX = 0, /* The index is small enough to fit inside the index</div><div class='del'>-			    root attribute and there is no index allocation</div><div class='del'>-			    attribute present. */</div><div class='del'>-	LARGE_INDEX = 1, /* The index is too large to fit in the index root</div><div class='del'>-			    attribute and/or an index allocation attribute is</div><div class='del'>-			    present. */</div><div class='del'>-	/*</div><div class='del'>-	 * When index header is in an index block, i.e. is part of index</div><div class='del'>-	 * allocation attribute:</div><div class='del'>-	 */</div><div class='del'>-	LEAF_NODE  = 0, /* This is a leaf node, i.e. there are no more nodes</div><div class='del'>-			   branching off it. */</div><div class='del'>-	INDEX_NODE = 1, /* This node indexes other nodes, i.e. it is not a leaf</div><div class='del'>-			   node. */</div><div class='del'>-	NODE_MASK  = 1, /* Mask for accessing the *_NODE bits. */</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef u8 INDEX_HEADER_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the header for indexes, describing the INDEX_ENTRY records, which</div><div class='del'>- * follow the INDEX_HEADER. Together the index header and the index entries</div><div class='del'>- * make up a complete index.</div><div class='del'>- *</div><div class='del'>- * IMPORTANT NOTE: The offset, length and size structure members are counted</div><div class='del'>- * relative to the start of the index header structure and not relative to the</div><div class='del'>- * start of the index root or index allocation structures themselves.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 entries_offset;		/* Byte offset to first INDEX_ENTRY</div><div class='del'>-					   aligned to 8-byte boundary. */</div><div class='del'>-	le32 index_length;		/* Data size of the index in bytes,</div><div class='del'>-					   i.e. bytes used from allocated</div><div class='del'>-					   size, aligned to 8-byte boundary. */</div><div class='del'>-	le32 allocated_size;		/* Byte size of this index (block),</div><div class='del'>-					   multiple of 8 bytes. */</div><div class='del'>-	/* NOTE: For the index root attribute, the above two numbers are always</div><div class='del'>-	   equal, as the attribute is resident and it is resized as needed. In</div><div class='del'>-	   the case of the index allocation attribute the attribute is not</div><div class='del'>-	   resident and hence the allocated_size is a fixed value and must</div><div class='del'>-	   equal the index_block_size specified by the INDEX_ROOT attribute</div><div class='del'>-	   corresponding to the INDEX_ALLOCATION attribute this INDEX_BLOCK</div><div class='del'>-	   belongs to. */</div><div class='del'>-	INDEX_HEADER_FLAGS flags;	/* Bit field of INDEX_HEADER_FLAGS. */</div><div class='del'>-	u8 reserved[3];			/* Reserved/align to 8-byte boundary. */</div><div class='del'>-} __attribute__ ((__packed__)) INDEX_HEADER;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Index root (0x90).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident.</div><div class='del'>- *</div><div class='del'>- * This is followed by a sequence of index entries (INDEX_ENTRY structures)</div><div class='del'>- * as described by the index header.</div><div class='del'>- *</div><div class='del'>- * When a directory is small enough to fit inside the index root then this</div><div class='del'>- * is the only attribute describing the directory. When the directory is too</div><div class='del'>- * large to fit in the index root, on the other hand, two additional attributes</div><div class='del'>- * are present: an index allocation attribute, containing sub-nodes of the B+</div><div class='del'>- * directory tree (see below), and a bitmap attribute, describing which virtual</div><div class='del'>- * cluster numbers (vcns) in the index allocation attribute are in use by an</div><div class='del'>- * index block.</div><div class='del'>- *</div><div class='del'>- * NOTE: The root directory (FILE_root) contains an entry for itself. Other</div><div class='del'>- * directories do not contain entries for themselves, though.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	ATTR_TYPE type;			/* Type of the indexed attribute. Is</div><div class='del'>-					   $FILE_NAME for directories, zero</div><div class='del'>-					   for view indexes. No other values</div><div class='del'>-					   allowed. */</div><div class='del'>-	COLLATION_RULE collation_rule;	/* Collation rule used to sort the</div><div class='del'>-					   index entries. If type is $FILE_NAME,</div><div class='del'>-					   this must be COLLATION_FILE_NAME. */</div><div class='del'>-	le32 index_block_size;		/* Size of each index block in bytes (in</div><div class='del'>-					   the index allocation attribute). */</div><div class='del'>-	u8 clusters_per_index_block;	/* Cluster size of each index block (in</div><div class='del'>-					   the index allocation attribute), when</div><div class='del'>-					   an index block is &gt;= than a cluster,</div><div class='del'>-					   otherwise this will be the log of</div><div class='del'>-					   the size (like how the encoding of</div><div class='del'>-					   the mft record size and the index</div><div class='del'>-					   record size found in the boot sector</div><div class='del'>-					   work). Has to be a power of 2. */</div><div class='del'>-	u8 reserved[3];			/* Reserved/align to 8-byte boundary. */</div><div class='del'>-	INDEX_HEADER index;		/* Index header describing the</div><div class='del'>-					   following index entries. */</div><div class='del'>-} __attribute__ ((__packed__)) INDEX_ROOT;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Index allocation (0xa0).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always non-resident (doesn't make sense to be resident anyway!).</div><div class='del'>- *</div><div class='del'>- * This is an array of index blocks. Each index block starts with an</div><div class='del'>- * INDEX_BLOCK structure containing an index header, followed by a sequence of</div><div class='del'>- * index entries (INDEX_ENTRY structures), as described by the INDEX_HEADER.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*  0	NTFS_RECORD; -- Unfolded here as gcc doesn't like unnamed structs. */</div><div class='del'>-	NTFS_RECORD_TYPE magic;	/* Magic is "INDX". */</div><div class='del'>-	le16 usa_ofs;		/* See NTFS_RECORD definition. */</div><div class='del'>-	le16 usa_count;		/* See NTFS_RECORD definition. */</div><div class='del'>-</div><div class='del'>-/*  8*/	sle64 lsn;		/* $LogFile sequence number of the last</div><div class='del'>-				   modification of this index block. */</div><div class='del'>-/* 16*/	leVCN index_block_vcn;	/* Virtual cluster number of the index block.</div><div class='del'>-				   If the cluster_size on the volume is &lt;= the</div><div class='del'>-				   index_block_size of the directory,</div><div class='del'>-				   index_block_vcn counts in units of clusters,</div><div class='del'>-				   and in units of sectors otherwise. */</div><div class='del'>-/* 24*/	INDEX_HEADER index;	/* Describes the following index entries. */</div><div class='del'>-/* sizeof()= 40 (0x28) bytes */</div><div class='del'>-/*</div><div class='del'>- * When creating the index block, we place the update sequence array at this</div><div class='del'>- * offset, i.e. before we start with the index entries. This also makes sense,</div><div class='del'>- * otherwise we could run into problems with the update sequence array</div><div class='del'>- * containing in itself the last two bytes of a sector which would mean that</div><div class='del'>- * multi sector transfer protection wouldn't work. As you can't protect data</div><div class='del'>- * by overwriting it since you then can't get it back...</div><div class='del'>- * When reading use the data from the ntfs record header.</div><div class='del'>- */</div><div class='del'>-} __attribute__ ((__packed__)) INDEX_BLOCK;</div><div class='del'>-</div><div class='del'>-typedef INDEX_BLOCK INDEX_ALLOCATION;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The system file FILE_Extend/$Reparse contains an index named $R listing</div><div class='del'>- * all reparse points on the volume. The index entry keys are as defined</div><div class='del'>- * below. Note, that there is no index data associated with the index entries.</div><div class='del'>- *</div><div class='del'>- * The index entries are sorted by the index key file_id. The collation rule is</div><div class='del'>- * COLLATION_NTOFS_ULONGS. FIXME: Verify whether the reparse_tag is not the</div><div class='del'>- * primary key / is not a key at all. (AIA)</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 reparse_tag;	/* Reparse point type (inc. flags). */</div><div class='del'>-	leMFT_REF file_id;	/* Mft record of the file containing the</div><div class='del'>-				   reparse point attribute. */</div><div class='del'>-} __attribute__ ((__packed__)) REPARSE_INDEX_KEY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Quota flags (32-bit).</div><div class='del'>- *</div><div class='del'>- * The user quota flags.  Names explain meaning.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	QUOTA_FLAG_DEFAULT_LIMITS	= cpu_to_le32(0x00000001),</div><div class='del'>-	QUOTA_FLAG_LIMIT_REACHED	= cpu_to_le32(0x00000002),</div><div class='del'>-	QUOTA_FLAG_ID_DELETED		= cpu_to_le32(0x00000004),</div><div class='del'>-</div><div class='del'>-	QUOTA_FLAG_USER_MASK		= cpu_to_le32(0x00000007),</div><div class='del'>-	/* This is a bit mask for the user quota flags. */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * These flags are only present in the quota defaults index entry, i.e.</div><div class='del'>-	 * in the entry where owner_id = QUOTA_DEFAULTS_ID.</div><div class='del'>-	 */</div><div class='del'>-	QUOTA_FLAG_TRACKING_ENABLED	= cpu_to_le32(0x00000010),</div><div class='del'>-	QUOTA_FLAG_ENFORCEMENT_ENABLED	= cpu_to_le32(0x00000020),</div><div class='del'>-	QUOTA_FLAG_TRACKING_REQUESTED	= cpu_to_le32(0x00000040),</div><div class='del'>-	QUOTA_FLAG_LOG_THRESHOLD	= cpu_to_le32(0x00000080),</div><div class='del'>-</div><div class='del'>-	QUOTA_FLAG_LOG_LIMIT		= cpu_to_le32(0x00000100),</div><div class='del'>-	QUOTA_FLAG_OUT_OF_DATE		= cpu_to_le32(0x00000200),</div><div class='del'>-	QUOTA_FLAG_CORRUPT		= cpu_to_le32(0x00000400),</div><div class='del'>-	QUOTA_FLAG_PENDING_DELETES	= cpu_to_le32(0x00000800),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 QUOTA_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The system file FILE_Extend/$Quota contains two indexes $O and $Q. Quotas</div><div class='del'>- * are on a per volume and per user basis.</div><div class='del'>- *</div><div class='del'>- * The $Q index contains one entry for each existing user_id on the volume. The</div><div class='del'>- * index key is the user_id of the user/group owning this quota control entry,</div><div class='del'>- * i.e. the key is the owner_id. The user_id of the owner of a file, i.e. the</div><div class='del'>- * owner_id, is found in the standard information attribute. The collation rule</div><div class='del'>- * for $Q is COLLATION_NTOFS_ULONG.</div><div class='del'>- *</div><div class='del'>- * The $O index contains one entry for each user/group who has been assigned</div><div class='del'>- * a quota on that volume. The index key holds the SID of the user_id the</div><div class='del'>- * entry belongs to, i.e. the owner_id. The collation rule for $O is</div><div class='del'>- * COLLATION_NTOFS_SID.</div><div class='del'>- *</div><div class='del'>- * The $O index entry data is the user_id of the user corresponding to the SID.</div><div class='del'>- * This user_id is used as an index into $Q to find the quota control entry</div><div class='del'>- * associated with the SID.</div><div class='del'>- *</div><div class='del'>- * The $Q index entry data is the quota control entry and is defined below.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 version;		/* Currently equals 2. */</div><div class='del'>-	QUOTA_FLAGS flags;	/* Flags describing this quota entry. */</div><div class='del'>-	le64 bytes_used;	/* How many bytes of the quota are in use. */</div><div class='del'>-	sle64 change_time;	/* Last time this quota entry was changed. */</div><div class='del'>-	sle64 threshold;	/* Soft quota (-1 if not limited). */</div><div class='del'>-	sle64 limit;		/* Hard quota (-1 if not limited). */</div><div class='del'>-	sle64 exceeded_time;	/* How long the soft quota has been exceeded. */</div><div class='del'>-	SID sid;		/* The SID of the user/object associated with</div><div class='del'>-				   this quota entry.  Equals zero for the quota</div><div class='del'>-				   defaults entry (and in fact on a WinXP</div><div class='del'>-				   volume, it is not present at all). */</div><div class='del'>-} __attribute__ ((__packed__)) QUOTA_CONTROL_ENTRY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Predefined owner_id values (32-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	QUOTA_INVALID_ID	= cpu_to_le32(0x00000000),</div><div class='del'>-	QUOTA_DEFAULTS_ID	= cpu_to_le32(0x00000001),</div><div class='del'>-	QUOTA_FIRST_USER_ID	= cpu_to_le32(0x00000100),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Current constants for quota control entries.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	/* Current version. */</div><div class='del'>-	QUOTA_VERSION	= 2,</div><div class='del'>-} QUOTA_CONTROL_ENTRY_CONSTANTS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Index entry flags (16-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	INDEX_ENTRY_NODE = cpu_to_le16(1), /* This entry contains a</div><div class='del'>-			sub-node, i.e. a reference to an index block in form of</div><div class='del'>-			a virtual cluster number (see below). */</div><div class='del'>-	INDEX_ENTRY_END  = cpu_to_le16(2), /* This signifies the last</div><div class='del'>-			entry in an index block.  The index entry does not</div><div class='del'>-			represent a file but it can point to a sub-node. */</div><div class='del'>-</div><div class='del'>-	INDEX_ENTRY_SPACE_FILLER = cpu_to_le16(0xffff), /* gcc: Force</div><div class='del'>-			enum bit width to 16-bit. */</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef le16 INDEX_ENTRY_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This the index entry header (see below).</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*  0*/	union {</div><div class='del'>-		struct { /* Only valid when INDEX_ENTRY_END is not set. */</div><div class='del'>-			leMFT_REF indexed_file;	/* The mft reference of the file</div><div class='del'>-						   described by this index</div><div class='del'>-						   entry. Used for directory</div><div class='del'>-						   indexes. */</div><div class='del'>-		} __attribute__ ((__packed__)) dir;</div><div class='del'>-		struct { /* Used for views/indexes to find the entry's data. */</div><div class='del'>-			le16 data_offset;	/* Data byte offset from this</div><div class='del'>-						   INDEX_ENTRY. Follows the</div><div class='del'>-						   index key. */</div><div class='del'>-			le16 data_length;	/* Data length in bytes. */</div><div class='del'>-			le32 reservedV;		/* Reserved (zero). */</div><div class='del'>-		} __attribute__ ((__packed__)) vi;</div><div class='del'>-	} __attribute__ ((__packed__)) data;</div><div class='del'>-/*  8*/	le16 length;		 /* Byte size of this index entry, multiple of</div><div class='del'>-				    8-bytes. */</div><div class='del'>-/* 10*/	le16 key_length;	 /* Byte size of the key value, which is in the</div><div class='del'>-				    index entry. It follows field reserved. Not</div><div class='del'>-				    multiple of 8-bytes. */</div><div class='del'>-/* 12*/	INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */</div><div class='del'>-/* 14*/	le16 reserved;		 /* Reserved/align to 8-byte boundary. */</div><div class='del'>-/* sizeof() = 16 bytes */</div><div class='del'>-} __attribute__ ((__packed__)) INDEX_ENTRY_HEADER;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is an index entry. A sequence of such entries follows each INDEX_HEADER</div><div class='del'>- * structure. Together they make up a complete index. The index follows either</div><div class='del'>- * an index root attribute or an index allocation attribute.</div><div class='del'>- *</div><div class='del'>- * NOTE: Before NTFS 3.0 only filename attributes were indexed.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0	INDEX_ENTRY_HEADER; -- Unfolded here as gcc dislikes unnamed structs. */</div><div class='del'>-	union {</div><div class='del'>-		struct { /* Only valid when INDEX_ENTRY_END is not set. */</div><div class='del'>-			leMFT_REF indexed_file;	/* The mft reference of the file</div><div class='del'>-						   described by this index</div><div class='del'>-						   entry. Used for directory</div><div class='del'>-						   indexes. */</div><div class='del'>-		} __attribute__ ((__packed__)) dir;</div><div class='del'>-		struct { /* Used for views/indexes to find the entry's data. */</div><div class='del'>-			le16 data_offset;	/* Data byte offset from this</div><div class='del'>-						   INDEX_ENTRY. Follows the</div><div class='del'>-						   index key. */</div><div class='del'>-			le16 data_length;	/* Data length in bytes. */</div><div class='del'>-			le32 reservedV;		/* Reserved (zero). */</div><div class='del'>-		} __attribute__ ((__packed__)) vi;</div><div class='del'>-	} __attribute__ ((__packed__)) data;</div><div class='del'>-	le16 length;		 /* Byte size of this index entry, multiple of</div><div class='del'>-				    8-bytes. */</div><div class='del'>-	le16 key_length;	 /* Byte size of the key value, which is in the</div><div class='del'>-				    index entry. It follows field reserved. Not</div><div class='del'>-				    multiple of 8-bytes. */</div><div class='del'>-	INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */</div><div class='del'>-	le16 reserved;		 /* Reserved/align to 8-byte boundary. */</div><div class='del'>-</div><div class='del'>-/* 16*/	union {		/* The key of the indexed attribute. NOTE: Only present</div><div class='del'>-			   if INDEX_ENTRY_END bit in flags is not set. NOTE: On</div><div class='del'>-			   NTFS versions before 3.0 the only valid key is the</div><div class='del'>-			   FILE_NAME_ATTR. On NTFS 3.0+ the following</div><div class='del'>-			   additional index keys are defined: */</div><div class='del'>-		FILE_NAME_ATTR file_name;/* $I30 index in directories. */</div><div class='del'>-		SII_INDEX_KEY sii;	/* $SII index in $Secure. */</div><div class='del'>-		SDH_INDEX_KEY sdh;	/* $SDH index in $Secure. */</div><div class='del'>-		GUID object_id;		/* $O index in FILE_Extend/$ObjId: The</div><div class='del'>-					   object_id of the mft record found in</div><div class='del'>-					   the data part of the index. */</div><div class='del'>-		REPARSE_INDEX_KEY reparse;	/* $R index in</div><div class='del'>-						   FILE_Extend/$Reparse. */</div><div class='del'>-		SID sid;		/* $O index in FILE_Extend/$Quota:</div><div class='del'>-					   SID of the owner of the user_id. */</div><div class='del'>-		le32 owner_id;		/* $Q index in FILE_Extend/$Quota:</div><div class='del'>-					   user_id of the owner of the quota</div><div class='del'>-					   control entry in the data part of</div><div class='del'>-					   the index. */</div><div class='del'>-	} __attribute__ ((__packed__)) key;</div><div class='del'>-	/* The (optional) index data is inserted here when creating. */</div><div class='del'>-	// leVCN vcn;	/* If INDEX_ENTRY_NODE bit in flags is set, the last</div><div class='del'>-	//		   eight bytes of this index entry contain the virtual</div><div class='del'>-	//		   cluster number of the index block that holds the</div><div class='del'>-	//		   entries immediately preceding the current entry (the</div><div class='del'>-	//		   vcn references the corresponding cluster in the data</div><div class='del'>-	//		   of the non-resident index allocation attribute). If</div><div class='del'>-	//		   the key_length is zero, then the vcn immediately</div><div class='del'>-	//		   follows the INDEX_ENTRY_HEADER. Regardless of</div><div class='del'>-	//		   key_length, the address of the 8-byte boundary</div><div class='del'>-	//		   aligned vcn of INDEX_ENTRY{_HEADER} *ie is given by</div><div class='del'>-	//		   (char*)ie + le16_to_cpu(ie*)-&gt;length) - sizeof(VCN),</div><div class='del'>-	//		   where sizeof(VCN) can be hardcoded as 8 if wanted. */</div><div class='del'>-} __attribute__ ((__packed__)) INDEX_ENTRY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Bitmap (0xb0).</div><div class='del'>- *</div><div class='del'>- * Contains an array of bits (aka a bitfield).</div><div class='del'>- *</div><div class='del'>- * When used in conjunction with the index allocation attribute, each bit</div><div class='del'>- * corresponds to one index block within the index allocation attribute. Thus</div><div class='del'>- * the number of bits in the bitmap * index block size / cluster size is the</div><div class='del'>- * number of clusters in the index allocation attribute.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u8 bitmap[0];			/* Array of bits. */</div><div class='del'>-} __attribute__ ((__packed__)) BITMAP_ATTR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The reparse point tag defines the type of the reparse point. It also</div><div class='del'>- * includes several flags, which further describe the reparse point.</div><div class='del'>- *</div><div class='del'>- * The reparse point tag is an unsigned 32-bit value divided in three parts:</div><div class='del'>- *</div><div class='del'>- * 1. The least significant 16 bits (i.e. bits 0 to 15) specifiy the type of</div><div class='del'>- *    the reparse point.</div><div class='del'>- * 2. The 13 bits after this (i.e. bits 16 to 28) are reserved for future use.</div><div class='del'>- * 3. The most significant three bits are flags describing the reparse point.</div><div class='del'>- *    They are defined as follows:</div><div class='del'>- *	bit 29: Name surrogate bit. If set, the filename is an alias for</div><div class='del'>- *		another object in the system.</div><div class='del'>- *	bit 30: High-latency bit. If set, accessing the first byte of data will</div><div class='del'>- *		be slow. (E.g. the data is stored on a tape drive.)</div><div class='del'>- *	bit 31: Microsoft bit. If set, the tag is owned by Microsoft. User</div><div class='del'>- *		defined tags have to use zero here.</div><div class='del'>- *</div><div class='del'>- * These are the predefined reparse point tags:</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	IO_REPARSE_TAG_IS_ALIAS		= cpu_to_le32(0x20000000),</div><div class='del'>-	IO_REPARSE_TAG_IS_HIGH_LATENCY	= cpu_to_le32(0x40000000),</div><div class='del'>-	IO_REPARSE_TAG_IS_MICROSOFT	= cpu_to_le32(0x80000000),</div><div class='del'>-</div><div class='del'>-	IO_REPARSE_TAG_RESERVED_ZERO	= cpu_to_le32(0x00000000),</div><div class='del'>-	IO_REPARSE_TAG_RESERVED_ONE	= cpu_to_le32(0x00000001),</div><div class='del'>-	IO_REPARSE_TAG_RESERVED_RANGE	= cpu_to_le32(0x00000001),</div><div class='del'>-</div><div class='del'>-	IO_REPARSE_TAG_NSS		= cpu_to_le32(0x68000005),</div><div class='del'>-	IO_REPARSE_TAG_NSS_RECOVER	= cpu_to_le32(0x68000006),</div><div class='del'>-	IO_REPARSE_TAG_SIS		= cpu_to_le32(0x68000007),</div><div class='del'>-	IO_REPARSE_TAG_DFS		= cpu_to_le32(0x68000008),</div><div class='del'>-</div><div class='del'>-	IO_REPARSE_TAG_MOUNT_POINT	= cpu_to_le32(0x88000003),</div><div class='del'>-</div><div class='del'>-	IO_REPARSE_TAG_HSM		= cpu_to_le32(0xa8000004),</div><div class='del'>-</div><div class='del'>-	IO_REPARSE_TAG_SYMBOLIC_LINK	= cpu_to_le32(0xe8000000),</div><div class='del'>-</div><div class='del'>-	IO_REPARSE_TAG_VALID_VALUES	= cpu_to_le32(0xe000ffff),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Reparse point (0xc0).</div><div class='del'>- *</div><div class='del'>- * NOTE: Can be resident or non-resident.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 reparse_tag;		/* Reparse point type (inc. flags). */</div><div class='del'>-	le16 reparse_data_length;	/* Byte size of reparse data. */</div><div class='del'>-	le16 reserved;			/* Align to 8-byte boundary. */</div><div class='del'>-	u8 reparse_data[0];		/* Meaning depends on reparse_tag. */</div><div class='del'>-} __attribute__ ((__packed__)) REPARSE_POINT;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Extended attribute (EA) information (0xd0).</div><div class='del'>- *</div><div class='del'>- * NOTE: Always resident. (Is this true???)</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le16 ea_length;		/* Byte size of the packed extended</div><div class='del'>-				   attributes. */</div><div class='del'>-	le16 need_ea_count;	/* The number of extended attributes which have</div><div class='del'>-				   the NEED_EA bit set. */</div><div class='del'>-	le32 ea_query_length;	/* Byte size of the buffer required to query</div><div class='del'>-				   the extended attributes when calling</div><div class='del'>-				   ZwQueryEaFile() in Windows NT/2k. I.e. the</div><div class='del'>-				   byte size of the unpacked extended</div><div class='del'>-				   attributes. */</div><div class='del'>-} __attribute__ ((__packed__)) EA_INFORMATION;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Extended attribute flags (8-bit).</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	NEED_EA	= 0x80		/* If set the file to which the EA belongs</div><div class='del'>-				   cannot be interpreted without understanding</div><div class='del'>-				   the associates extended attributes. */</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef u8 EA_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Extended attribute (EA) (0xe0).</div><div class='del'>- *</div><div class='del'>- * NOTE: Can be resident or non-resident.</div><div class='del'>- *</div><div class='del'>- * Like the attribute list and the index buffer list, the EA attribute value is</div><div class='del'>- * a sequence of EA_ATTR variable length records.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	le32 next_entry_offset;	/* Offset to the next EA_ATTR. */</div><div class='del'>-	EA_FLAGS flags;		/* Flags describing the EA. */</div><div class='del'>-	u8 ea_name_length;	/* Length of the name of the EA in bytes</div><div class='del'>-				   excluding the '\0' byte terminator. */</div><div class='del'>-	le16 ea_value_length;	/* Byte size of the EA's value. */</div><div class='del'>-	u8 ea_name[0];		/* Name of the EA.  Note this is ASCII, not</div><div class='del'>-				   Unicode and it is zero terminated. */</div><div class='del'>-	u8 ea_value[0];		/* The value of the EA.  Immediately follows</div><div class='del'>-				   the name. */</div><div class='del'>-} __attribute__ ((__packed__)) EA_ATTR;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Property set (0xf0).</div><div class='del'>- *</div><div class='del'>- * Intended to support Native Structure Storage (NSS) - a feature removed from</div><div class='del'>- * NTFS 3.0 during beta testing.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Irrelevant as feature unused. */</div><div class='del'>-} __attribute__ ((__packed__)) PROPERTY_SET;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Attribute: Logged utility stream (0x100).</div><div class='del'>- *</div><div class='del'>- * NOTE: Can be resident or non-resident.</div><div class='del'>- *</div><div class='del'>- * Operations on this attribute are logged to the journal ($LogFile) like</div><div class='del'>- * normal metadata changes.</div><div class='del'>- *</div><div class='del'>- * Used by the Encrypting File System (EFS). All encrypted files have this</div><div class='del'>- * attribute with the name $EFS.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Can be anything the creator chooses. */</div><div class='del'>-	/* EFS uses it as follows: */</div><div class='del'>-	// FIXME: Type this info, verifying it along the way. (AIA)</div><div class='del'>-} __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_LAYOUT_H */</div><div class='head'>diff --git a/fs/ntfs/lcnalloc.c b/fs/ntfs/lcnalloc.c<br/>deleted file mode 100644<br/>index eda9972e6159..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/lcnalloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/lcnalloc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1000 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * lcnalloc.c - Cluster (de)allocation code.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "lcnalloc.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "bitmap.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_cluster_free_from_rl_nolock - free clusters from runlist</div><div class='del'>- * @vol:	mounted ntfs volume on which to free the clusters</div><div class='del'>- * @rl:		runlist describing the clusters to free</div><div class='del'>- *</div><div class='del'>- * Free all the clusters described by the runlist @rl on the volume @vol.  In</div><div class='del'>- * the case of an error being returned, at least some of the clusters were not</div><div class='del'>- * freed.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Locking: - The volume lcn bitmap must be locked for writing on entry and is</div><div class='del'>- *	      left locked on return.</div><div class='del'>- */</div><div class='del'>-int ntfs_cluster_free_from_rl_nolock(ntfs_volume *vol,</div><div class='del'>-		const runlist_element *rl)</div><div class='del'>-{</div><div class='del'>-	struct inode *lcnbmp_vi = vol-&gt;lcnbmp_ino;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	if (!rl)</div><div class='del'>-		return 0;</div><div class='del'>-	for (; rl-&gt;length; rl++) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		if (rl-&gt;lcn &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		err = ntfs_bitmap_clear_run(lcnbmp_vi, rl-&gt;lcn, rl-&gt;length);</div><div class='del'>-		if (unlikely(err &amp;&amp; (!ret || ret == -ENOMEM) &amp;&amp; ret != err))</div><div class='del'>-			ret = err;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_cluster_alloc - allocate clusters on an ntfs volume</div><div class='del'>- * @vol:	mounted ntfs volume on which to allocate the clusters</div><div class='del'>- * @start_vcn:	vcn to use for the first allocated cluster</div><div class='del'>- * @count:	number of clusters to allocate</div><div class='del'>- * @start_lcn:	starting lcn at which to allocate the clusters (or -1 if none)</div><div class='del'>- * @zone:	zone from which to allocate the clusters</div><div class='del'>- * @is_extension:	if 'true', this is an attribute extension</div><div class='del'>- *</div><div class='del'>- * Allocate @count clusters preferably starting at cluster @start_lcn or at the</div><div class='del'>- * current allocator position if @start_lcn is -1, on the mounted ntfs volume</div><div class='del'>- * @vol. @zone is either DATA_ZONE for allocation of normal clusters or</div><div class='del'>- * MFT_ZONE for allocation of clusters for the master file table, i.e. the</div><div class='del'>- * $MFT/$DATA attribute.</div><div class='del'>- *</div><div class='del'>- * @start_vcn specifies the vcn of the first allocated cluster.  This makes</div><div class='del'>- * merging the resulting runlist with the old runlist easier.</div><div class='del'>- *</div><div class='del'>- * If @is_extension is 'true', the caller is allocating clusters to extend an</div><div class='del'>- * attribute and if it is 'false', the caller is allocating clusters to fill a</div><div class='del'>- * hole in an attribute.  Practically the difference is that if @is_extension</div><div class='del'>- * is 'true' the returned runlist will be terminated with LCN_ENOENT and if</div><div class='del'>- * @is_extension is 'false' the runlist will be terminated with</div><div class='del'>- * LCN_RL_NOT_MAPPED.</div><div class='del'>- *</div><div class='del'>- * You need to check the return value with IS_ERR().  If this is false, the</div><div class='del'>- * function was successful and the return value is a runlist describing the</div><div class='del'>- * allocated cluster(s).  If IS_ERR() is true, the function failed and</div><div class='del'>- * PTR_ERR() gives you the error code.</div><div class='del'>- *</div><div class='del'>- * Notes on the allocation algorithm</div><div class='del'>- * =================================</div><div class='del'>- *</div><div class='del'>- * There are two data zones.  First is the area between the end of the mft zone</div><div class='del'>- * and the end of the volume, and second is the area between the start of the</div><div class='del'>- * volume and the start of the mft zone.  On unmodified/standard NTFS 1.x</div><div class='del'>- * volumes, the second data zone does not exist due to the mft zone being</div><div class='del'>- * expanded to cover the start of the volume in order to reserve space for the</div><div class='del'>- * mft bitmap attribute.</div><div class='del'>- *</div><div class='del'>- * This is not the prettiest function but the complexity stems from the need of</div><div class='del'>- * implementing the mft vs data zoned approach and from the fact that we have</div><div class='del'>- * access to the lcn bitmap in portions of up to 8192 bytes at a time, so we</div><div class='del'>- * need to cope with crossing over boundaries of two buffers.  Further, the</div><div class='del'>- * fact that the allocator allows for caller supplied hints as to the location</div><div class='del'>- * of where allocation should begin and the fact that the allocator keeps track</div><div class='del'>- * of where in the data zones the next natural allocation should occur,</div><div class='del'>- * contribute to the complexity of the function.  But it should all be</div><div class='del'>- * worthwhile, because this allocator should: 1) be a full implementation of</div><div class='del'>- * the MFT zone approach used by Windows NT, 2) cause reduction in</div><div class='del'>- * fragmentation, and 3) be speedy in allocations (the code is not optimized</div><div class='del'>- * for speed, but the algorithm is, so further speed improvements are probably</div><div class='del'>- * possible).</div><div class='del'>- *</div><div class='del'>- * FIXME: We should be monitoring cluster allocation and increment the MFT zone</div><div class='del'>- * size dynamically but this is something for the future.  We will just cause</div><div class='del'>- * heavier fragmentation by not doing it and I am not even sure Windows would</div><div class='del'>- * grow the MFT zone dynamically, so it might even be correct not to do this.</div><div class='del'>- * The overhead in doing dynamic MFT zone expansion would be very large and</div><div class='del'>- * unlikely worth the effort. (AIA)</div><div class='del'>- *</div><div class='del'>- * TODO: I have added in double the required zone position pointer wrap around</div><div class='del'>- * logic which can be optimized to having only one of the two logic sets.</div><div class='del'>- * However, having the double logic will work fine, but if we have only one of</div><div class='del'>- * the sets and we get it wrong somewhere, then we get into trouble, so</div><div class='del'>- * removing the duplicate logic requires _very_ careful consideration of _all_</div><div class='del'>- * possible code paths.  So at least for now, I am leaving the double logic -</div><div class='del'>- * better safe than sorry... (AIA)</div><div class='del'>- *</div><div class='del'>- * Locking: - The volume lcn bitmap must be unlocked on entry and is unlocked</div><div class='del'>- *	      on return.</div><div class='del'>- *	    - This function takes the volume lcn bitmap lock for writing and</div><div class='del'>- *	      modifies the bitmap contents.</div><div class='del'>- */</div><div class='del'>-runlist_element *ntfs_cluster_alloc(ntfs_volume *vol, const VCN start_vcn,</div><div class='del'>-		const s64 count, const LCN start_lcn,</div><div class='del'>-		const NTFS_CLUSTER_ALLOCATION_ZONES zone,</div><div class='del'>-		const bool is_extension)</div><div class='del'>-{</div><div class='del'>-	LCN zone_start, zone_end, bmp_pos, bmp_initial_pos, last_read_pos, lcn;</div><div class='del'>-	LCN prev_lcn = 0, prev_run_len = 0, mft_zone_size;</div><div class='del'>-	s64 clusters;</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct inode *lcnbmp_vi;</div><div class='del'>-	runlist_element *rl = NULL;</div><div class='del'>-	struct address_space *mapping;</div><div class='del'>-	struct page *page = NULL;</div><div class='del'>-	u8 *buf, *byte;</div><div class='del'>-	int err = 0, rlpos, rlsize, buf_size;</div><div class='del'>-	u8 pass, done_zones, search_zone, need_writeback = 0, bit;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for start_vcn 0x%llx, count 0x%llx, start_lcn "</div><div class='del'>-			"0x%llx, zone %s_ZONE.", (unsigned long long)start_vcn,</div><div class='del'>-			(unsigned long long)count,</div><div class='del'>-			(unsigned long long)start_lcn,</div><div class='del'>-			zone == MFT_ZONE ? "MFT" : "DATA");</div><div class='del'>-	BUG_ON(!vol);</div><div class='del'>-	lcnbmp_vi = vol-&gt;lcnbmp_ino;</div><div class='del'>-	BUG_ON(!lcnbmp_vi);</div><div class='del'>-	BUG_ON(start_vcn &lt; 0);</div><div class='del'>-	BUG_ON(count &lt; 0);</div><div class='del'>-	BUG_ON(start_lcn &lt; -1);</div><div class='del'>-	BUG_ON(zone &lt; FIRST_ZONE);</div><div class='del'>-	BUG_ON(zone &gt; LAST_ZONE);</div><div class='del'>-</div><div class='del'>-	/* Return NULL if @count is zero. */</div><div class='del'>-	if (!count)</div><div class='del'>-		return NULL;</div><div class='del'>-	/* Take the lcnbmp lock for writing. */</div><div class='del'>-	down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * If no specific @start_lcn was requested, use the current data zone</div><div class='del'>-	 * position, otherwise use the requested @start_lcn but make sure it</div><div class='del'>-	 * lies outside the mft zone.  Also set done_zones to 0 (no zones done)</div><div class='del'>-	 * and pass depending on whether we are starting inside a zone (1) or</div><div class='del'>-	 * at the beginning of a zone (2).  If requesting from the MFT_ZONE,</div><div class='del'>-	 * we either start at the current position within the mft zone or at</div><div class='del'>-	 * the specified position.  If the latter is out of bounds then we start</div><div class='del'>-	 * at the beginning of the MFT_ZONE.</div><div class='del'>-	 */</div><div class='del'>-	done_zones = 0;</div><div class='del'>-	pass = 1;</div><div class='del'>-	/*</div><div class='del'>-	 * zone_start and zone_end are the current search range.  search_zone</div><div class='del'>-	 * is 1 for mft zone, 2 for data zone 1 (end of mft zone till end of</div><div class='del'>-	 * volume) and 4 for data zone 2 (start of volume till start of mft</div><div class='del'>-	 * zone).</div><div class='del'>-	 */</div><div class='del'>-	zone_start = start_lcn;</div><div class='del'>-	if (zone_start &lt; 0) {</div><div class='del'>-		if (zone == DATA_ZONE)</div><div class='del'>-			zone_start = vol-&gt;data1_zone_pos;</div><div class='del'>-		else</div><div class='del'>-			zone_start = vol-&gt;mft_zone_pos;</div><div class='del'>-		if (!zone_start) {</div><div class='del'>-			/*</div><div class='del'>-			 * Zone starts at beginning of volume which means a</div><div class='del'>-			 * single pass is sufficient.</div><div class='del'>-			 */</div><div class='del'>-			pass = 2;</div><div class='del'>-		}</div><div class='del'>-	} else if (zone == DATA_ZONE &amp;&amp; zone_start &gt;= vol-&gt;mft_zone_start &amp;&amp;</div><div class='del'>-			zone_start &lt; vol-&gt;mft_zone_end) {</div><div class='del'>-		zone_start = vol-&gt;mft_zone_end;</div><div class='del'>-		/*</div><div class='del'>-		 * Starting at beginning of data1_zone which means a single</div><div class='del'>-		 * pass in this zone is sufficient.</div><div class='del'>-		 */</div><div class='del'>-		pass = 2;</div><div class='del'>-	} else if (zone == MFT_ZONE &amp;&amp; (zone_start &lt; vol-&gt;mft_zone_start ||</div><div class='del'>-			zone_start &gt;= vol-&gt;mft_zone_end)) {</div><div class='del'>-		zone_start = vol-&gt;mft_lcn;</div><div class='del'>-		if (!vol-&gt;mft_zone_end)</div><div class='del'>-			zone_start = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * Starting at beginning of volume which means a single pass</div><div class='del'>-		 * is sufficient.</div><div class='del'>-		 */</div><div class='del'>-		pass = 2;</div><div class='del'>-	}</div><div class='del'>-	if (zone == MFT_ZONE) {</div><div class='del'>-		zone_end = vol-&gt;mft_zone_end;</div><div class='del'>-		search_zone = 1;</div><div class='del'>-	} else /* if (zone == DATA_ZONE) */ {</div><div class='del'>-		/* Skip searching the mft zone. */</div><div class='del'>-		done_zones |= 1;</div><div class='del'>-		if (zone_start &gt;= vol-&gt;mft_zone_end) {</div><div class='del'>-			zone_end = vol-&gt;nr_clusters;</div><div class='del'>-			search_zone = 2;</div><div class='del'>-		} else {</div><div class='del'>-			zone_end = vol-&gt;mft_zone_start;</div><div class='del'>-			search_zone = 4;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * bmp_pos is the current bit position inside the bitmap.  We use</div><div class='del'>-	 * bmp_initial_pos to determine whether or not to do a zone switch.</div><div class='del'>-	 */</div><div class='del'>-	bmp_pos = bmp_initial_pos = zone_start;</div><div class='del'>-</div><div class='del'>-	/* Loop until all clusters are allocated, i.e. clusters == 0. */</div><div class='del'>-	clusters = count;</div><div class='del'>-	rlpos = rlsize = 0;</div><div class='del'>-	mapping = lcnbmp_vi-&gt;i_mapping;</div><div class='del'>-	i_size = i_size_read(lcnbmp_vi);</div><div class='del'>-	while (1) {</div><div class='del'>-		ntfs_debug("Start of outer while loop: done_zones 0x%x, "</div><div class='del'>-				"search_zone %i, pass %i, zone_start 0x%llx, "</div><div class='del'>-				"zone_end 0x%llx, bmp_initial_pos 0x%llx, "</div><div class='del'>-				"bmp_pos 0x%llx, rlpos %i, rlsize %i.",</div><div class='del'>-				done_zones, search_zone, pass,</div><div class='del'>-				(unsigned long long)zone_start,</div><div class='del'>-				(unsigned long long)zone_end,</div><div class='del'>-				(unsigned long long)bmp_initial_pos,</div><div class='del'>-				(unsigned long long)bmp_pos, rlpos, rlsize);</div><div class='del'>-		/* Loop until we run out of free clusters. */</div><div class='del'>-		last_read_pos = bmp_pos &gt;&gt; 3;</div><div class='del'>-		ntfs_debug("last_read_pos 0x%llx.",</div><div class='del'>-				(unsigned long long)last_read_pos);</div><div class='del'>-		if (last_read_pos &gt; i_size) {</div><div class='del'>-			ntfs_debug("End of attribute reached.  "</div><div class='del'>-					"Skipping to zone_pass_done.");</div><div class='del'>-			goto zone_pass_done;</div><div class='del'>-		}</div><div class='del'>-		if (likely(page)) {</div><div class='del'>-			if (need_writeback) {</div><div class='del'>-				ntfs_debug("Marking page dirty.");</div><div class='del'>-				flush_dcache_page(page);</div><div class='del'>-				set_page_dirty(page);</div><div class='del'>-				need_writeback = 0;</div><div class='del'>-			}</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-		}</div><div class='del'>-		page = ntfs_map_page(mapping, last_read_pos &gt;&gt;</div><div class='del'>-				PAGE_SHIFT);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to map page.");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		buf_size = last_read_pos &amp; ~PAGE_MASK;</div><div class='del'>-		buf = page_address(page) + buf_size;</div><div class='del'>-		buf_size = PAGE_SIZE - buf_size;</div><div class='del'>-		if (unlikely(last_read_pos + buf_size &gt; i_size))</div><div class='del'>-			buf_size = i_size - last_read_pos;</div><div class='del'>-		buf_size &lt;&lt;= 3;</div><div class='del'>-		lcn = bmp_pos &amp; 7;</div><div class='del'>-		bmp_pos &amp;= ~(LCN)7;</div><div class='del'>-		ntfs_debug("Before inner while loop: buf_size %i, lcn 0x%llx, "</div><div class='del'>-				"bmp_pos 0x%llx, need_writeback %i.", buf_size,</div><div class='del'>-				(unsigned long long)lcn,</div><div class='del'>-				(unsigned long long)bmp_pos, need_writeback);</div><div class='del'>-		while (lcn &lt; buf_size &amp;&amp; lcn + bmp_pos &lt; zone_end) {</div><div class='del'>-			byte = buf + (lcn &gt;&gt; 3);</div><div class='del'>-			ntfs_debug("In inner while loop: buf_size %i, "</div><div class='del'>-					"lcn 0x%llx, bmp_pos 0x%llx, "</div><div class='del'>-					"need_writeback %i, byte ofs 0x%x, "</div><div class='del'>-					"*byte 0x%x.", buf_size,</div><div class='del'>-					(unsigned long long)lcn,</div><div class='del'>-					(unsigned long long)bmp_pos,</div><div class='del'>-					need_writeback,</div><div class='del'>-					(unsigned int)(lcn &gt;&gt; 3),</div><div class='del'>-					(unsigned int)*byte);</div><div class='del'>-			/* Skip full bytes. */</div><div class='del'>-			if (*byte == 0xff) {</div><div class='del'>-				lcn = (lcn + 8) &amp; ~(LCN)7;</div><div class='del'>-				ntfs_debug("Continuing while loop 1.");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			bit = 1 &lt;&lt; (lcn &amp; 7);</div><div class='del'>-			ntfs_debug("bit 0x%x.", bit);</div><div class='del'>-			/* If the bit is already set, go onto the next one. */</div><div class='del'>-			if (*byte &amp; bit) {</div><div class='del'>-				lcn++;</div><div class='del'>-				ntfs_debug("Continuing while loop 2.");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * Allocate more memory if needed, including space for</div><div class='del'>-			 * the terminator element.</div><div class='del'>-			 * ntfs_malloc_nofs() operates on whole pages only.</div><div class='del'>-			 */</div><div class='del'>-			if ((rlpos + 2) * sizeof(*rl) &gt; rlsize) {</div><div class='del'>-				runlist_element *rl2;</div><div class='del'>-</div><div class='del'>-				ntfs_debug("Reallocating memory.");</div><div class='del'>-				if (!rl)</div><div class='del'>-					ntfs_debug("First free bit is at LCN "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							(lcn + bmp_pos));</div><div class='del'>-				rl2 = ntfs_malloc_nofs(rlsize + (int)PAGE_SIZE);</div><div class='del'>-				if (unlikely(!rl2)) {</div><div class='del'>-					err = -ENOMEM;</div><div class='del'>-					ntfs_error(vol-&gt;sb, "Failed to "</div><div class='del'>-							"allocate memory.");</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				memcpy(rl2, rl, rlsize);</div><div class='del'>-				ntfs_free(rl);</div><div class='del'>-				rl = rl2;</div><div class='del'>-				rlsize += PAGE_SIZE;</div><div class='del'>-				ntfs_debug("Reallocated memory, rlsize 0x%x.",</div><div class='del'>-						rlsize);</div><div class='del'>-			}</div><div class='del'>-			/* Allocate the bitmap bit. */</div><div class='del'>-			*byte |= bit;</div><div class='del'>-			/* We need to write this bitmap page to disk. */</div><div class='del'>-			need_writeback = 1;</div><div class='del'>-			ntfs_debug("*byte 0x%x, need_writeback is set.",</div><div class='del'>-					(unsigned int)*byte);</div><div class='del'>-			/*</div><div class='del'>-			 * Coalesce with previous run if adjacent LCNs.</div><div class='del'>-			 * Otherwise, append a new run.</div><div class='del'>-			 */</div><div class='del'>-			ntfs_debug("Adding run (lcn 0x%llx, len 0x%llx), "</div><div class='del'>-					"prev_lcn 0x%llx, lcn 0x%llx, "</div><div class='del'>-					"bmp_pos 0x%llx, prev_run_len 0x%llx, "</div><div class='del'>-					"rlpos %i.",</div><div class='del'>-					(unsigned long long)(lcn + bmp_pos),</div><div class='del'>-					1ULL, (unsigned long long)prev_lcn,</div><div class='del'>-					(unsigned long long)lcn,</div><div class='del'>-					(unsigned long long)bmp_pos,</div><div class='del'>-					(unsigned long long)prev_run_len,</div><div class='del'>-					rlpos);</div><div class='del'>-			if (prev_lcn == lcn + bmp_pos - prev_run_len &amp;&amp; rlpos) {</div><div class='del'>-				ntfs_debug("Coalescing to run (lcn 0x%llx, "</div><div class='del'>-						"len 0x%llx).",</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						rl[rlpos - 1].lcn,</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						rl[rlpos - 1].length);</div><div class='del'>-				rl[rlpos - 1].length = ++prev_run_len;</div><div class='del'>-				ntfs_debug("Run now (lcn 0x%llx, len 0x%llx), "</div><div class='del'>-						"prev_run_len 0x%llx.",</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						rl[rlpos - 1].lcn,</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						rl[rlpos - 1].length,</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						prev_run_len);</div><div class='del'>-			} else {</div><div class='del'>-				if (likely(rlpos)) {</div><div class='del'>-					ntfs_debug("Adding new run, (previous "</div><div class='del'>-							"run lcn 0x%llx, "</div><div class='del'>-							"len 0x%llx).",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							rl[rlpos - 1].lcn,</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							rl[rlpos - 1].length);</div><div class='del'>-					rl[rlpos].vcn = rl[rlpos - 1].vcn +</div><div class='del'>-							prev_run_len;</div><div class='del'>-				} else {</div><div class='del'>-					ntfs_debug("Adding new run, is first "</div><div class='del'>-							"run.");</div><div class='del'>-					rl[rlpos].vcn = start_vcn;</div><div class='del'>-				}</div><div class='del'>-				rl[rlpos].lcn = prev_lcn = lcn + bmp_pos;</div><div class='del'>-				rl[rlpos].length = prev_run_len = 1;</div><div class='del'>-				rlpos++;</div><div class='del'>-			}</div><div class='del'>-			/* Done? */</div><div class='del'>-			if (!--clusters) {</div><div class='del'>-				LCN tc;</div><div class='del'>-				/*</div><div class='del'>-				 * Update the current zone position.  Positions</div><div class='del'>-				 * of already scanned zones have been updated</div><div class='del'>-				 * during the respective zone switches.</div><div class='del'>-				 */</div><div class='del'>-				tc = lcn + bmp_pos + 1;</div><div class='del'>-				ntfs_debug("Done. Updating current zone "</div><div class='del'>-						"position, tc 0x%llx, "</div><div class='del'>-						"search_zone %i.",</div><div class='del'>-						(unsigned long long)tc,</div><div class='del'>-						search_zone);</div><div class='del'>-				switch (search_zone) {</div><div class='del'>-				case 1:</div><div class='del'>-					ntfs_debug("Before checks, "</div><div class='del'>-							"vol-&gt;mft_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;mft_zone_pos);</div><div class='del'>-					if (tc &gt;= vol-&gt;mft_zone_end) {</div><div class='del'>-						vol-&gt;mft_zone_pos =</div><div class='del'>-								vol-&gt;mft_lcn;</div><div class='del'>-						if (!vol-&gt;mft_zone_end)</div><div class='del'>-							vol-&gt;mft_zone_pos = 0;</div><div class='del'>-					} else if ((bmp_initial_pos &gt;=</div><div class='del'>-							vol-&gt;mft_zone_pos ||</div><div class='del'>-							tc &gt; vol-&gt;mft_zone_pos)</div><div class='del'>-							&amp;&amp; tc &gt;= vol-&gt;mft_lcn)</div><div class='del'>-						vol-&gt;mft_zone_pos = tc;</div><div class='del'>-					ntfs_debug("After checks, "</div><div class='del'>-							"vol-&gt;mft_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;mft_zone_pos);</div><div class='del'>-					break;</div><div class='del'>-				case 2:</div><div class='del'>-					ntfs_debug("Before checks, "</div><div class='del'>-							"vol-&gt;data1_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data1_zone_pos);</div><div class='del'>-					if (tc &gt;= vol-&gt;nr_clusters)</div><div class='del'>-						vol-&gt;data1_zone_pos =</div><div class='del'>-							     vol-&gt;mft_zone_end;</div><div class='del'>-					else if ((bmp_initial_pos &gt;=</div><div class='del'>-						    vol-&gt;data1_zone_pos ||</div><div class='del'>-						    tc &gt; vol-&gt;data1_zone_pos)</div><div class='del'>-						    &amp;&amp; tc &gt;= vol-&gt;mft_zone_end)</div><div class='del'>-						vol-&gt;data1_zone_pos = tc;</div><div class='del'>-					ntfs_debug("After checks, "</div><div class='del'>-							"vol-&gt;data1_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data1_zone_pos);</div><div class='del'>-					break;</div><div class='del'>-				case 4:</div><div class='del'>-					ntfs_debug("Before checks, "</div><div class='del'>-							"vol-&gt;data2_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data2_zone_pos);</div><div class='del'>-					if (tc &gt;= vol-&gt;mft_zone_start)</div><div class='del'>-						vol-&gt;data2_zone_pos = 0;</div><div class='del'>-					else if (bmp_initial_pos &gt;=</div><div class='del'>-						      vol-&gt;data2_zone_pos ||</div><div class='del'>-						      tc &gt; vol-&gt;data2_zone_pos)</div><div class='del'>-						vol-&gt;data2_zone_pos = tc;</div><div class='del'>-					ntfs_debug("After checks, "</div><div class='del'>-							"vol-&gt;data2_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data2_zone_pos);</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					BUG();</div><div class='del'>-				}</div><div class='del'>-				ntfs_debug("Finished.  Going to out.");</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			lcn++;</div><div class='del'>-		}</div><div class='del'>-		bmp_pos += buf_size;</div><div class='del'>-		ntfs_debug("After inner while loop: buf_size 0x%x, lcn "</div><div class='del'>-				"0x%llx, bmp_pos 0x%llx, need_writeback %i.",</div><div class='del'>-				buf_size, (unsigned long long)lcn,</div><div class='del'>-				(unsigned long long)bmp_pos, need_writeback);</div><div class='del'>-		if (bmp_pos &lt; zone_end) {</div><div class='del'>-			ntfs_debug("Continuing outer while loop, "</div><div class='del'>-					"bmp_pos 0x%llx, zone_end 0x%llx.",</div><div class='del'>-					(unsigned long long)bmp_pos,</div><div class='del'>-					(unsigned long long)zone_end);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-zone_pass_done:	/* Finished with the current zone pass. */</div><div class='del'>-		ntfs_debug("At zone_pass_done, pass %i.", pass);</div><div class='del'>-		if (pass == 1) {</div><div class='del'>-			/*</div><div class='del'>-			 * Now do pass 2, scanning the first part of the zone</div><div class='del'>-			 * we omitted in pass 1.</div><div class='del'>-			 */</div><div class='del'>-			pass = 2;</div><div class='del'>-			zone_end = zone_start;</div><div class='del'>-			switch (search_zone) {</div><div class='del'>-			case 1: /* mft_zone */</div><div class='del'>-				zone_start = vol-&gt;mft_zone_start;</div><div class='del'>-				break;</div><div class='del'>-			case 2: /* data1_zone */</div><div class='del'>-				zone_start = vol-&gt;mft_zone_end;</div><div class='del'>-				break;</div><div class='del'>-			case 4: /* data2_zone */</div><div class='del'>-				zone_start = 0;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				BUG();</div><div class='del'>-			}</div><div class='del'>-			/* Sanity check. */</div><div class='del'>-			if (zone_end &lt; zone_start)</div><div class='del'>-				zone_end = zone_start;</div><div class='del'>-			bmp_pos = zone_start;</div><div class='del'>-			ntfs_debug("Continuing outer while loop, pass 2, "</div><div class='del'>-					"zone_start 0x%llx, zone_end 0x%llx, "</div><div class='del'>-					"bmp_pos 0x%llx.",</div><div class='del'>-					(unsigned long long)zone_start,</div><div class='del'>-					(unsigned long long)zone_end,</div><div class='del'>-					(unsigned long long)bmp_pos);</div><div class='del'>-			continue;</div><div class='del'>-		} /* pass == 2 */</div><div class='del'>-done_zones_check:</div><div class='del'>-		ntfs_debug("At done_zones_check, search_zone %i, done_zones "</div><div class='del'>-				"before 0x%x, done_zones after 0x%x.",</div><div class='del'>-				search_zone, done_zones,</div><div class='del'>-				done_zones | search_zone);</div><div class='del'>-		done_zones |= search_zone;</div><div class='del'>-		if (done_zones &lt; 7) {</div><div class='del'>-			ntfs_debug("Switching zone.");</div><div class='del'>-			/* Now switch to the next zone we haven't done yet. */</div><div class='del'>-			pass = 1;</div><div class='del'>-			switch (search_zone) {</div><div class='del'>-			case 1:</div><div class='del'>-				ntfs_debug("Switching from mft zone to data1 "</div><div class='del'>-						"zone.");</div><div class='del'>-				/* Update mft zone position. */</div><div class='del'>-				if (rlpos) {</div><div class='del'>-					LCN tc;</div><div class='del'>-</div><div class='del'>-					ntfs_debug("Before checks, "</div><div class='del'>-							"vol-&gt;mft_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;mft_zone_pos);</div><div class='del'>-					tc = rl[rlpos - 1].lcn +</div><div class='del'>-							rl[rlpos - 1].length;</div><div class='del'>-					if (tc &gt;= vol-&gt;mft_zone_end) {</div><div class='del'>-						vol-&gt;mft_zone_pos =</div><div class='del'>-								vol-&gt;mft_lcn;</div><div class='del'>-						if (!vol-&gt;mft_zone_end)</div><div class='del'>-							vol-&gt;mft_zone_pos = 0;</div><div class='del'>-					} else if ((bmp_initial_pos &gt;=</div><div class='del'>-							vol-&gt;mft_zone_pos ||</div><div class='del'>-							tc &gt; vol-&gt;mft_zone_pos)</div><div class='del'>-							&amp;&amp; tc &gt;= vol-&gt;mft_lcn)</div><div class='del'>-						vol-&gt;mft_zone_pos = tc;</div><div class='del'>-					ntfs_debug("After checks, "</div><div class='del'>-							"vol-&gt;mft_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;mft_zone_pos);</div><div class='del'>-				}</div><div class='del'>-				/* Switch from mft zone to data1 zone. */</div><div class='del'>-switch_to_data1_zone:		search_zone = 2;</div><div class='del'>-				zone_start = bmp_initial_pos =</div><div class='del'>-						vol-&gt;data1_zone_pos;</div><div class='del'>-				zone_end = vol-&gt;nr_clusters;</div><div class='del'>-				if (zone_start == vol-&gt;mft_zone_end)</div><div class='del'>-					pass = 2;</div><div class='del'>-				if (zone_start &gt;= zone_end) {</div><div class='del'>-					vol-&gt;data1_zone_pos = zone_start =</div><div class='del'>-							vol-&gt;mft_zone_end;</div><div class='del'>-					pass = 2;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				ntfs_debug("Switching from data1 zone to "</div><div class='del'>-						"data2 zone.");</div><div class='del'>-				/* Update data1 zone position. */</div><div class='del'>-				if (rlpos) {</div><div class='del'>-					LCN tc;</div><div class='del'>-</div><div class='del'>-					ntfs_debug("Before checks, "</div><div class='del'>-							"vol-&gt;data1_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data1_zone_pos);</div><div class='del'>-					tc = rl[rlpos - 1].lcn +</div><div class='del'>-							rl[rlpos - 1].length;</div><div class='del'>-					if (tc &gt;= vol-&gt;nr_clusters)</div><div class='del'>-						vol-&gt;data1_zone_pos =</div><div class='del'>-							     vol-&gt;mft_zone_end;</div><div class='del'>-					else if ((bmp_initial_pos &gt;=</div><div class='del'>-						    vol-&gt;data1_zone_pos ||</div><div class='del'>-						    tc &gt; vol-&gt;data1_zone_pos)</div><div class='del'>-						    &amp;&amp; tc &gt;= vol-&gt;mft_zone_end)</div><div class='del'>-						vol-&gt;data1_zone_pos = tc;</div><div class='del'>-					ntfs_debug("After checks, "</div><div class='del'>-							"vol-&gt;data1_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data1_zone_pos);</div><div class='del'>-				}</div><div class='del'>-				/* Switch from data1 zone to data2 zone. */</div><div class='del'>-				search_zone = 4;</div><div class='del'>-				zone_start = bmp_initial_pos =</div><div class='del'>-						vol-&gt;data2_zone_pos;</div><div class='del'>-				zone_end = vol-&gt;mft_zone_start;</div><div class='del'>-				if (!zone_start)</div><div class='del'>-					pass = 2;</div><div class='del'>-				if (zone_start &gt;= zone_end) {</div><div class='del'>-					vol-&gt;data2_zone_pos = zone_start =</div><div class='del'>-							bmp_initial_pos = 0;</div><div class='del'>-					pass = 2;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 4:</div><div class='del'>-				ntfs_debug("Switching from data2 zone to "</div><div class='del'>-						"data1 zone.");</div><div class='del'>-				/* Update data2 zone position. */</div><div class='del'>-				if (rlpos) {</div><div class='del'>-					LCN tc;</div><div class='del'>-</div><div class='del'>-					ntfs_debug("Before checks, "</div><div class='del'>-							"vol-&gt;data2_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data2_zone_pos);</div><div class='del'>-					tc = rl[rlpos - 1].lcn +</div><div class='del'>-							rl[rlpos - 1].length;</div><div class='del'>-					if (tc &gt;= vol-&gt;mft_zone_start)</div><div class='del'>-						vol-&gt;data2_zone_pos = 0;</div><div class='del'>-					else if (bmp_initial_pos &gt;=</div><div class='del'>-						      vol-&gt;data2_zone_pos ||</div><div class='del'>-						      tc &gt; vol-&gt;data2_zone_pos)</div><div class='del'>-						vol-&gt;data2_zone_pos = tc;</div><div class='del'>-					ntfs_debug("After checks, "</div><div class='del'>-							"vol-&gt;data2_zone_pos "</div><div class='del'>-							"0x%llx.",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							vol-&gt;data2_zone_pos);</div><div class='del'>-				}</div><div class='del'>-				/* Switch from data2 zone to data1 zone. */</div><div class='del'>-				goto switch_to_data1_zone;</div><div class='del'>-			default:</div><div class='del'>-				BUG();</div><div class='del'>-			}</div><div class='del'>-			ntfs_debug("After zone switch, search_zone %i, "</div><div class='del'>-					"pass %i, bmp_initial_pos 0x%llx, "</div><div class='del'>-					"zone_start 0x%llx, zone_end 0x%llx.",</div><div class='del'>-					search_zone, pass,</div><div class='del'>-					(unsigned long long)bmp_initial_pos,</div><div class='del'>-					(unsigned long long)zone_start,</div><div class='del'>-					(unsigned long long)zone_end);</div><div class='del'>-			bmp_pos = zone_start;</div><div class='del'>-			if (zone_start == zone_end) {</div><div class='del'>-				ntfs_debug("Empty zone, going to "</div><div class='del'>-						"done_zones_check.");</div><div class='del'>-				/* Empty zone. Don't bother searching it. */</div><div class='del'>-				goto done_zones_check;</div><div class='del'>-			}</div><div class='del'>-			ntfs_debug("Continuing outer while loop.");</div><div class='del'>-			continue;</div><div class='del'>-		} /* done_zones == 7 */</div><div class='del'>-		ntfs_debug("All zones are finished.");</div><div class='del'>-		/*</div><div class='del'>-		 * All zones are finished!  If DATA_ZONE, shrink mft zone.  If</div><div class='del'>-		 * MFT_ZONE, we have really run out of space.</div><div class='del'>-		 */</div><div class='del'>-		mft_zone_size = vol-&gt;mft_zone_end - vol-&gt;mft_zone_start;</div><div class='del'>-		ntfs_debug("vol-&gt;mft_zone_start 0x%llx, vol-&gt;mft_zone_end "</div><div class='del'>-				"0x%llx, mft_zone_size 0x%llx.",</div><div class='del'>-				(unsigned long long)vol-&gt;mft_zone_start,</div><div class='del'>-				(unsigned long long)vol-&gt;mft_zone_end,</div><div class='del'>-				(unsigned long long)mft_zone_size);</div><div class='del'>-		if (zone == MFT_ZONE || mft_zone_size &lt;= 0) {</div><div class='del'>-			ntfs_debug("No free clusters left, going to out.");</div><div class='del'>-			/* Really no more space left on device. */</div><div class='del'>-			err = -ENOSPC;</div><div class='del'>-			goto out;</div><div class='del'>-		} /* zone == DATA_ZONE &amp;&amp; mft_zone_size &gt; 0 */</div><div class='del'>-		ntfs_debug("Shrinking mft zone.");</div><div class='del'>-		zone_end = vol-&gt;mft_zone_end;</div><div class='del'>-		mft_zone_size &gt;&gt;= 1;</div><div class='del'>-		if (mft_zone_size &gt; 0)</div><div class='del'>-			vol-&gt;mft_zone_end = vol-&gt;mft_zone_start + mft_zone_size;</div><div class='del'>-		else /* mft zone and data2 zone no longer exist. */</div><div class='del'>-			vol-&gt;data2_zone_pos = vol-&gt;mft_zone_start =</div><div class='del'>-					vol-&gt;mft_zone_end = 0;</div><div class='del'>-		if (vol-&gt;mft_zone_pos &gt;= vol-&gt;mft_zone_end) {</div><div class='del'>-			vol-&gt;mft_zone_pos = vol-&gt;mft_lcn;</div><div class='del'>-			if (!vol-&gt;mft_zone_end)</div><div class='del'>-				vol-&gt;mft_zone_pos = 0;</div><div class='del'>-		}</div><div class='del'>-		bmp_pos = zone_start = bmp_initial_pos =</div><div class='del'>-				vol-&gt;data1_zone_pos = vol-&gt;mft_zone_end;</div><div class='del'>-		search_zone = 2;</div><div class='del'>-		pass = 2;</div><div class='del'>-		done_zones &amp;= ~2;</div><div class='del'>-		ntfs_debug("After shrinking mft zone, mft_zone_size 0x%llx, "</div><div class='del'>-				"vol-&gt;mft_zone_start 0x%llx, "</div><div class='del'>-				"vol-&gt;mft_zone_end 0x%llx, "</div><div class='del'>-				"vol-&gt;mft_zone_pos 0x%llx, search_zone 2, "</div><div class='del'>-				"pass 2, dones_zones 0x%x, zone_start 0x%llx, "</div><div class='del'>-				"zone_end 0x%llx, vol-&gt;data1_zone_pos 0x%llx, "</div><div class='del'>-				"continuing outer while loop.",</div><div class='del'>-				(unsigned long long)mft_zone_size,</div><div class='del'>-				(unsigned long long)vol-&gt;mft_zone_start,</div><div class='del'>-				(unsigned long long)vol-&gt;mft_zone_end,</div><div class='del'>-				(unsigned long long)vol-&gt;mft_zone_pos,</div><div class='del'>-				done_zones, (unsigned long long)zone_start,</div><div class='del'>-				(unsigned long long)zone_end,</div><div class='del'>-				(unsigned long long)vol-&gt;data1_zone_pos);</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("After outer while loop.");</div><div class='del'>-out:</div><div class='del'>-	ntfs_debug("At out.");</div><div class='del'>-	/* Add runlist terminator element. */</div><div class='del'>-	if (likely(rl)) {</div><div class='del'>-		rl[rlpos].vcn = rl[rlpos - 1].vcn + rl[rlpos - 1].length;</div><div class='del'>-		rl[rlpos].lcn = is_extension ? LCN_ENOENT : LCN_RL_NOT_MAPPED;</div><div class='del'>-		rl[rlpos].length = 0;</div><div class='del'>-	}</div><div class='del'>-	if (likely(page &amp;&amp; !IS_ERR(page))) {</div><div class='del'>-		if (need_writeback) {</div><div class='del'>-			ntfs_debug("Marking page dirty.");</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			need_writeback = 0;</div><div class='del'>-		}</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-	}</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-		return rl;</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed to allocate clusters, aborting "</div><div class='del'>-			"(error %i).", err);</div><div class='del'>-	if (rl) {</div><div class='del'>-		int err2;</div><div class='del'>-</div><div class='del'>-		if (err == -ENOSPC)</div><div class='del'>-			ntfs_debug("Not enough space to complete allocation, "</div><div class='del'>-					"err -ENOSPC, first free lcn 0x%llx, "</div><div class='del'>-					"could allocate up to 0x%llx "</div><div class='del'>-					"clusters.",</div><div class='del'>-					(unsigned long long)rl[0].lcn,</div><div class='del'>-					(unsigned long long)(count - clusters));</div><div class='del'>-		/* Deallocate all allocated clusters. */</div><div class='del'>-		ntfs_debug("Attempting rollback...");</div><div class='del'>-		err2 = ntfs_cluster_free_from_rl_nolock(vol, rl);</div><div class='del'>-		if (err2) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to rollback (error %i).  "</div><div class='del'>-					"Leaving inconsistent metadata!  "</div><div class='del'>-					"Unmount and run chkdsk.", err2);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		/* Free the runlist. */</div><div class='del'>-		ntfs_free(rl);</div><div class='del'>-	} else if (err == -ENOSPC)</div><div class='del'>-		ntfs_debug("No space left at all, err = -ENOSPC, first free "</div><div class='del'>-				"lcn = 0x%llx.",</div><div class='del'>-				(long long)vol-&gt;data1_zone_pos);</div><div class='del'>-	up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_cluster_free - free clusters on an ntfs volume</div><div class='del'>- * @ni:		ntfs inode whose runlist describes the clusters to free</div><div class='del'>- * @start_vcn:	vcn in the runlist of @ni at which to start freeing clusters</div><div class='del'>- * @count:	number of clusters to free or -1 for all clusters</div><div class='del'>- * @ctx:	active attribute search context if present or NULL if not</div><div class='del'>- * @is_rollback:	true if this is a rollback operation</div><div class='del'>- *</div><div class='del'>- * Free @count clusters starting at the cluster @start_vcn in the runlist</div><div class='del'>- * described by the vfs inode @ni.</div><div class='del'>- *</div><div class='del'>- * If @count is -1, all clusters from @start_vcn to the end of the runlist are</div><div class='del'>- * deallocated.  Thus, to completely free all clusters in a runlist, use</div><div class='del'>- * @start_vcn = 0 and @count = -1.</div><div class='del'>- *</div><div class='del'>- * If @ctx is specified, it is an active search context of @ni and its base mft</div><div class='del'>- * record.  This is needed when __ntfs_cluster_free() encounters unmapped</div><div class='del'>- * runlist fragments and allows their mapping.  If you do not have the mft</div><div class='del'>- * record mapped, you can specify @ctx as NULL and __ntfs_cluster_free() will</div><div class='del'>- * perform the necessary mapping and unmapping.</div><div class='del'>- *</div><div class='del'>- * Note, __ntfs_cluster_free() saves the state of @ctx on entry and restores it</div><div class='del'>- * before returning.  Thus, @ctx will be left pointing to the same attribute on</div><div class='del'>- * return as on entry.  However, the actual pointers in @ctx may point to</div><div class='del'>- * different memory locations on return, so you must remember to reset any</div><div class='del'>- * cached pointers from the @ctx, i.e. after the call to __ntfs_cluster_free(),</div><div class='del'>- * you will probably want to do:</div><div class='del'>- *	m = ctx-&gt;mrec;</div><div class='del'>- *	a = ctx-&gt;attr;</div><div class='del'>- * Assuming you cache ctx-&gt;attr in a variable @a of type ATTR_RECORD * and that</div><div class='del'>- * you cache ctx-&gt;mrec in a variable @m of type MFT_RECORD *.</div><div class='del'>- *</div><div class='del'>- * @is_rollback should always be 'false', it is for internal use to rollback</div><div class='del'>- * errors.  You probably want to use ntfs_cluster_free() instead.</div><div class='del'>- *</div><div class='del'>- * Note, __ntfs_cluster_free() does not modify the runlist, so you have to</div><div class='del'>- * remove from the runlist or mark sparse the freed runs later.</div><div class='del'>- *</div><div class='del'>- * Return the number of deallocated clusters (not counting sparse ones) on</div><div class='del'>- * success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * WARNING: If @ctx is supplied, regardless of whether success or failure is</div><div class='del'>- *	    returned, you need to check IS_ERR(@ctx-&gt;mrec) and if 'true' the @ctx</div><div class='del'>- *	    is no longer valid, i.e. you need to either call</div><div class='del'>- *	    ntfs_attr_reinit_search_ctx() or ntfs_attr_put_search_ctx() on it.</div><div class='del'>- *	    In that case PTR_ERR(@ctx-&gt;mrec) will give you the error code for</div><div class='del'>- *	    why the mapping of the old inode failed.</div><div class='del'>- *</div><div class='del'>- * Locking: - The runlist described by @ni must be locked for writing on entry</div><div class='del'>- *	      and is locked on return.  Note the runlist may be modified when</div><div class='del'>- *	      needed runlist fragments need to be mapped.</div><div class='del'>- *	    - The volume lcn bitmap must be unlocked on entry and is unlocked</div><div class='del'>- *	      on return.</div><div class='del'>- *	    - This function takes the volume lcn bitmap lock for writing and</div><div class='del'>- *	      modifies the bitmap contents.</div><div class='del'>- *	    - If @ctx is NULL, the base mft record of @ni must not be mapped on</div><div class='del'>- *	      entry and it will be left unmapped on return.</div><div class='del'>- *	    - If @ctx is not NULL, the base mft record must be mapped on entry</div><div class='del'>- *	      and it will be left mapped on return.</div><div class='del'>- */</div><div class='del'>-s64 __ntfs_cluster_free(ntfs_inode *ni, const VCN start_vcn, s64 count,</div><div class='del'>-		ntfs_attr_search_ctx *ctx, const bool is_rollback)</div><div class='del'>-{</div><div class='del'>-	s64 delta, to_free, total_freed, real_freed;</div><div class='del'>-	ntfs_volume *vol;</div><div class='del'>-	struct inode *lcnbmp_vi;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!ni);</div><div class='del'>-	ntfs_debug("Entering for i_ino 0x%lx, start_vcn 0x%llx, count "</div><div class='del'>-			"0x%llx.%s", ni-&gt;mft_no, (unsigned long long)start_vcn,</div><div class='del'>-			(unsigned long long)count,</div><div class='del'>-			is_rollback ? " (rollback)" : "");</div><div class='del'>-	vol = ni-&gt;vol;</div><div class='del'>-	lcnbmp_vi = vol-&gt;lcnbmp_ino;</div><div class='del'>-	BUG_ON(!lcnbmp_vi);</div><div class='del'>-	BUG_ON(start_vcn &lt; 0);</div><div class='del'>-	BUG_ON(count &lt; -1);</div><div class='del'>-	/*</div><div class='del'>-	 * Lock the lcn bitmap for writing but only if not rolling back.  We</div><div class='del'>-	 * must hold the lock all the way including through rollback otherwise</div><div class='del'>-	 * rollback is not possible because once we have cleared a bit and</div><div class='del'>-	 * dropped the lock, anyone could have set the bit again, thus</div><div class='del'>-	 * allocating the cluster for another use.</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!is_rollback))</div><div class='del'>-		down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-</div><div class='del'>-	total_freed = real_freed = 0;</div><div class='del'>-</div><div class='del'>-	rl = ntfs_attr_find_vcn_nolock(ni, start_vcn, ctx);</div><div class='del'>-	if (IS_ERR(rl)) {</div><div class='del'>-		if (!is_rollback)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to find first runlist "</div><div class='del'>-					"element (error %li), aborting.",</div><div class='del'>-					PTR_ERR(rl));</div><div class='del'>-		err = PTR_ERR(rl);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(rl-&gt;lcn &lt; LCN_HOLE)) {</div><div class='del'>-		if (!is_rollback)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "First runlist element has "</div><div class='del'>-					"invalid lcn, aborting.");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Find the starting cluster inside the run that needs freeing. */</div><div class='del'>-	delta = start_vcn - rl-&gt;vcn;</div><div class='del'>-</div><div class='del'>-	/* The number of clusters in this run that need freeing. */</div><div class='del'>-	to_free = rl-&gt;length - delta;</div><div class='del'>-	if (count &gt;= 0 &amp;&amp; to_free &gt; count)</div><div class='del'>-		to_free = count;</div><div class='del'>-</div><div class='del'>-	if (likely(rl-&gt;lcn &gt;= 0)) {</div><div class='del'>-		/* Do the actual freeing of the clusters in this run. */</div><div class='del'>-		err = ntfs_bitmap_set_bits_in_run(lcnbmp_vi, rl-&gt;lcn + delta,</div><div class='del'>-				to_free, likely(!is_rollback) ? 0 : 1);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			if (!is_rollback)</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to clear first run "</div><div class='del'>-						"(error %i), aborting.", err);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		/* We have freed @to_free real clusters. */</div><div class='del'>-		real_freed = to_free;</div><div class='del'>-	};</div><div class='del'>-	/* Go to the next run and adjust the number of clusters left to free. */</div><div class='del'>-	++rl;</div><div class='del'>-	if (count &gt;= 0)</div><div class='del'>-		count -= to_free;</div><div class='del'>-</div><div class='del'>-	/* Keep track of the total "freed" clusters, including sparse ones. */</div><div class='del'>-	total_freed = to_free;</div><div class='del'>-	/*</div><div class='del'>-	 * Loop over the remaining runs, using @count as a capping value, and</div><div class='del'>-	 * free them.</div><div class='del'>-	 */</div><div class='del'>-	for (; rl-&gt;length &amp;&amp; count != 0; ++rl) {</div><div class='del'>-		if (unlikely(rl-&gt;lcn &lt; LCN_HOLE)) {</div><div class='del'>-			VCN vcn;</div><div class='del'>-</div><div class='del'>-			/* Attempt to map runlist. */</div><div class='del'>-			vcn = rl-&gt;vcn;</div><div class='del'>-			rl = ntfs_attr_find_vcn_nolock(ni, vcn, ctx);</div><div class='del'>-			if (IS_ERR(rl)) {</div><div class='del'>-				err = PTR_ERR(rl);</div><div class='del'>-				if (!is_rollback)</div><div class='del'>-					ntfs_error(vol-&gt;sb, "Failed to map "</div><div class='del'>-							"runlist fragment or "</div><div class='del'>-							"failed to find "</div><div class='del'>-							"subsequent runlist "</div><div class='del'>-							"element.");</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			if (unlikely(rl-&gt;lcn &lt; LCN_HOLE)) {</div><div class='del'>-				if (!is_rollback)</div><div class='del'>-					ntfs_error(vol-&gt;sb, "Runlist element "</div><div class='del'>-							"has invalid lcn "</div><div class='del'>-							"(0x%llx).",</div><div class='del'>-							(unsigned long long)</div><div class='del'>-							rl-&gt;lcn);</div><div class='del'>-				err = -EIO;</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* The number of clusters in this run that need freeing. */</div><div class='del'>-		to_free = rl-&gt;length;</div><div class='del'>-		if (count &gt;= 0 &amp;&amp; to_free &gt; count)</div><div class='del'>-			to_free = count;</div><div class='del'>-</div><div class='del'>-		if (likely(rl-&gt;lcn &gt;= 0)) {</div><div class='del'>-			/* Do the actual freeing of the clusters in the run. */</div><div class='del'>-			err = ntfs_bitmap_set_bits_in_run(lcnbmp_vi, rl-&gt;lcn,</div><div class='del'>-					to_free, likely(!is_rollback) ? 0 : 1);</div><div class='del'>-			if (unlikely(err)) {</div><div class='del'>-				if (!is_rollback)</div><div class='del'>-					ntfs_error(vol-&gt;sb, "Failed to clear "</div><div class='del'>-							"subsequent run.");</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			/* We have freed @to_free real clusters. */</div><div class='del'>-			real_freed += to_free;</div><div class='del'>-		}</div><div class='del'>-		/* Adjust the number of clusters left to free. */</div><div class='del'>-		if (count &gt;= 0)</div><div class='del'>-			count -= to_free;</div><div class='del'>-	</div><div class='del'>-		/* Update the total done clusters. */</div><div class='del'>-		total_freed += to_free;</div><div class='del'>-	}</div><div class='del'>-	if (likely(!is_rollback))</div><div class='del'>-		up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(count &gt; 0);</div><div class='del'>-</div><div class='del'>-	/* We are done.  Return the number of actually freed clusters. */</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return real_freed;</div><div class='del'>-err_out:</div><div class='del'>-	if (is_rollback)</div><div class='del'>-		return err;</div><div class='del'>-	/* If no real clusters were freed, no need to rollback. */</div><div class='del'>-	if (!real_freed) {</div><div class='del'>-		up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Attempt to rollback and if that succeeds just return the error code.</div><div class='del'>-	 * If rollback fails, set the volume errors flag, emit an error</div><div class='del'>-	 * message, and return the error code.</div><div class='del'>-	 */</div><div class='del'>-	delta = __ntfs_cluster_free(ni, start_vcn, total_freed, ctx, true);</div><div class='del'>-	if (delta &lt; 0) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to rollback (error %i).  Leaving "</div><div class='del'>-				"inconsistent metadata!  Unmount and run "</div><div class='del'>-				"chkdsk.", (int)delta);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Aborting (error %i).", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/lcnalloc.h b/fs/ntfs/lcnalloc.h<br/>deleted file mode 100644<br/>index 1589a6d8434b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/lcnalloc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/lcnalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * lcnalloc.h - Exports for NTFS kernel cluster (de)allocation.  Part of the</div><div class='del'>- *		Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_LCNALLOC_H</div><div class='del'>-#define _LINUX_NTFS_LCNALLOC_H</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "runlist.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	FIRST_ZONE	= 0,	/* For sanity checking. */</div><div class='del'>-	MFT_ZONE	= 0,	/* Allocate from $MFT zone. */</div><div class='del'>-	DATA_ZONE	= 1,	/* Allocate from $DATA zone. */</div><div class='del'>-	LAST_ZONE	= 1,	/* For sanity checking. */</div><div class='del'>-} NTFS_CLUSTER_ALLOCATION_ZONES;</div><div class='del'>-</div><div class='del'>-extern runlist_element *ntfs_cluster_alloc(ntfs_volume *vol,</div><div class='del'>-		const VCN start_vcn, const s64 count, const LCN start_lcn,</div><div class='del'>-		const NTFS_CLUSTER_ALLOCATION_ZONES zone,</div><div class='del'>-		const bool is_extension);</div><div class='del'>-</div><div class='del'>-extern s64 __ntfs_cluster_free(ntfs_inode *ni, const VCN start_vcn,</div><div class='del'>-		s64 count, ntfs_attr_search_ctx *ctx, const bool is_rollback);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_cluster_free - free clusters on an ntfs volume</div><div class='del'>- * @ni:		ntfs inode whose runlist describes the clusters to free</div><div class='del'>- * @start_vcn:	vcn in the runlist of @ni at which to start freeing clusters</div><div class='del'>- * @count:	number of clusters to free or -1 for all clusters</div><div class='del'>- * @ctx:	active attribute search context if present or NULL if not</div><div class='del'>- *</div><div class='del'>- * Free @count clusters starting at the cluster @start_vcn in the runlist</div><div class='del'>- * described by the ntfs inode @ni.</div><div class='del'>- *</div><div class='del'>- * If @count is -1, all clusters from @start_vcn to the end of the runlist are</div><div class='del'>- * deallocated.  Thus, to completely free all clusters in a runlist, use</div><div class='del'>- * @start_vcn = 0 and @count = -1.</div><div class='del'>- *</div><div class='del'>- * If @ctx is specified, it is an active search context of @ni and its base mft</div><div class='del'>- * record.  This is needed when ntfs_cluster_free() encounters unmapped runlist</div><div class='del'>- * fragments and allows their mapping.  If you do not have the mft record</div><div class='del'>- * mapped, you can specify @ctx as NULL and ntfs_cluster_free() will perform</div><div class='del'>- * the necessary mapping and unmapping.</div><div class='del'>- *</div><div class='del'>- * Note, ntfs_cluster_free() saves the state of @ctx on entry and restores it</div><div class='del'>- * before returning.  Thus, @ctx will be left pointing to the same attribute on</div><div class='del'>- * return as on entry.  However, the actual pointers in @ctx may point to</div><div class='del'>- * different memory locations on return, so you must remember to reset any</div><div class='del'>- * cached pointers from the @ctx, i.e. after the call to ntfs_cluster_free(),</div><div class='del'>- * you will probably want to do:</div><div class='del'>- *	m = ctx-&gt;mrec;</div><div class='del'>- *	a = ctx-&gt;attr;</div><div class='del'>- * Assuming you cache ctx-&gt;attr in a variable @a of type ATTR_RECORD * and that</div><div class='del'>- * you cache ctx-&gt;mrec in a variable @m of type MFT_RECORD *.</div><div class='del'>- *</div><div class='del'>- * Note, ntfs_cluster_free() does not modify the runlist, so you have to remove</div><div class='del'>- * from the runlist or mark sparse the freed runs later.</div><div class='del'>- *</div><div class='del'>- * Return the number of deallocated clusters (not counting sparse ones) on</div><div class='del'>- * success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * WARNING: If @ctx is supplied, regardless of whether success or failure is</div><div class='del'>- *	    returned, you need to check IS_ERR(@ctx-&gt;mrec) and if 'true' the @ctx</div><div class='del'>- *	    is no longer valid, i.e. you need to either call</div><div class='del'>- *	    ntfs_attr_reinit_search_ctx() or ntfs_attr_put_search_ctx() on it.</div><div class='del'>- *	    In that case PTR_ERR(@ctx-&gt;mrec) will give you the error code for</div><div class='del'>- *	    why the mapping of the old inode failed.</div><div class='del'>- *</div><div class='del'>- * Locking: - The runlist described by @ni must be locked for writing on entry</div><div class='del'>- *	      and is locked on return.  Note the runlist may be modified when</div><div class='del'>- *	      needed runlist fragments need to be mapped.</div><div class='del'>- *	    - The volume lcn bitmap must be unlocked on entry and is unlocked</div><div class='del'>- *	      on return.</div><div class='del'>- *	    - This function takes the volume lcn bitmap lock for writing and</div><div class='del'>- *	      modifies the bitmap contents.</div><div class='del'>- *	    - If @ctx is NULL, the base mft record of @ni must not be mapped on</div><div class='del'>- *	      entry and it will be left unmapped on return.</div><div class='del'>- *	    - If @ctx is not NULL, the base mft record must be mapped on entry</div><div class='del'>- *	      and it will be left mapped on return.</div><div class='del'>- */</div><div class='del'>-static inline s64 ntfs_cluster_free(ntfs_inode *ni, const VCN start_vcn,</div><div class='del'>-		s64 count, ntfs_attr_search_ctx *ctx)</div><div class='del'>-{</div><div class='del'>-	return __ntfs_cluster_free(ni, start_vcn, count, ctx, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int ntfs_cluster_free_from_rl_nolock(ntfs_volume *vol,</div><div class='del'>-		const runlist_element *rl);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_cluster_free_from_rl - free clusters from runlist</div><div class='del'>- * @vol:	mounted ntfs volume on which to free the clusters</div><div class='del'>- * @rl:		runlist describing the clusters to free</div><div class='del'>- *</div><div class='del'>- * Free all the clusters described by the runlist @rl on the volume @vol.  In</div><div class='del'>- * the case of an error being returned, at least some of the clusters were not</div><div class='del'>- * freed.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Locking: - This function takes the volume lcn bitmap lock for writing and</div><div class='del'>- *	      modifies the bitmap contents.</div><div class='del'>- *	    - The caller must have locked the runlist @rl for reading or</div><div class='del'>- *	      writing.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_cluster_free_from_rl(ntfs_volume *vol,</div><div class='del'>-		const runlist_element *rl)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	ret = ntfs_cluster_free_from_rl_nolock(vol, rl);</div><div class='del'>-	up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* defined _LINUX_NTFS_LCNALLOC_H */</div><div class='head'>diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c<br/>deleted file mode 100644<br/>index 6ce60ffc6ac0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/logfile.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/logfile.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,849 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * logfile.c - NTFS kernel journal handling. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2002-2007 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "logfile.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_check_restart_page_header - check the page header for consistency</div><div class='del'>- * @vi:		$LogFile inode to which the restart page header belongs</div><div class='del'>- * @rp:		restart page header to check</div><div class='del'>- * @pos:	position in @vi at which the restart page header resides</div><div class='del'>- *</div><div class='del'>- * Check the restart page header @rp for consistency and return 'true' if it is</div><div class='del'>- * consistent and 'false' otherwise.</div><div class='del'>- *</div><div class='del'>- * This function only needs NTFS_BLOCK_SIZE bytes in @rp, i.e. it does not</div><div class='del'>- * require the full restart page.</div><div class='del'>- */</div><div class='del'>-static bool ntfs_check_restart_page_header(struct inode *vi,</div><div class='del'>-		RESTART_PAGE_HEADER *rp, s64 pos)</div><div class='del'>-{</div><div class='del'>-	u32 logfile_system_page_size, logfile_log_page_size;</div><div class='del'>-	u16 ra_ofs, usa_count, usa_ofs, usa_end = 0;</div><div class='del'>-	bool have_usa = true;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/*</div><div class='del'>-	 * If the system or log page sizes are smaller than the ntfs block size</div><div class='del'>-	 * or either is not a power of 2 we cannot handle this log file.</div><div class='del'>-	 */</div><div class='del'>-	logfile_system_page_size = le32_to_cpu(rp-&gt;system_page_size);</div><div class='del'>-	logfile_log_page_size = le32_to_cpu(rp-&gt;log_page_size);</div><div class='del'>-	if (logfile_system_page_size &lt; NTFS_BLOCK_SIZE ||</div><div class='del'>-			logfile_log_page_size &lt; NTFS_BLOCK_SIZE ||</div><div class='del'>-			logfile_system_page_size &amp;</div><div class='del'>-			(logfile_system_page_size - 1) ||</div><div class='del'>-			!is_power_of_2(logfile_log_page_size)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile uses unsupported page size.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We must be either at !pos (1st restart page) or at pos = system page</div><div class='del'>-	 * size (2nd restart page).</div><div class='del'>-	 */</div><div class='del'>-	if (pos &amp;&amp; pos != logfile_system_page_size) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Found restart area in incorrect "</div><div class='del'>-				"position in $LogFile.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* We only know how to handle version 1.1. */</div><div class='del'>-	if (sle16_to_cpu(rp-&gt;major_ver) != 1 ||</div><div class='del'>-			sle16_to_cpu(rp-&gt;minor_ver) != 1) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile version %i.%i is not "</div><div class='del'>-				"supported.  (This driver supports version "</div><div class='del'>-				"1.1 only.)", (int)sle16_to_cpu(rp-&gt;major_ver),</div><div class='del'>-				(int)sle16_to_cpu(rp-&gt;minor_ver));</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If chkdsk has been run the restart page may not be protected by an</div><div class='del'>-	 * update sequence array.</div><div class='del'>-	 */</div><div class='del'>-	if (ntfs_is_chkd_record(rp-&gt;magic) &amp;&amp; !le16_to_cpu(rp-&gt;usa_count)) {</div><div class='del'>-		have_usa = false;</div><div class='del'>-		goto skip_usa_checks;</div><div class='del'>-	}</div><div class='del'>-	/* Verify the size of the update sequence array. */</div><div class='del'>-	usa_count = 1 + (logfile_system_page_size &gt;&gt; NTFS_BLOCK_SIZE_BITS);</div><div class='del'>-	if (usa_count != le16_to_cpu(rp-&gt;usa_count)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart page specifies "</div><div class='del'>-				"inconsistent update sequence array count.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* Verify the position of the update sequence array. */</div><div class='del'>-	usa_ofs = le16_to_cpu(rp-&gt;usa_ofs);</div><div class='del'>-	usa_end = usa_ofs + usa_count * sizeof(u16);</div><div class='del'>-	if (usa_ofs &lt; sizeof(RESTART_PAGE_HEADER) ||</div><div class='del'>-			usa_end &gt; NTFS_BLOCK_SIZE - sizeof(u16)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart page specifies "</div><div class='del'>-				"inconsistent update sequence array offset.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-skip_usa_checks:</div><div class='del'>-	/*</div><div class='del'>-	 * Verify the position of the restart area.  It must be:</div><div class='del'>-	 *	- aligned to 8-byte boundary,</div><div class='del'>-	 *	- after the update sequence array, and</div><div class='del'>-	 *	- within the system page size.</div><div class='del'>-	 */</div><div class='del'>-	ra_ofs = le16_to_cpu(rp-&gt;restart_area_offset);</div><div class='del'>-	if (ra_ofs &amp; 7 || (have_usa ? ra_ofs &lt; usa_end :</div><div class='del'>-			ra_ofs &lt; sizeof(RESTART_PAGE_HEADER)) ||</div><div class='del'>-			ra_ofs &gt; logfile_system_page_size) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart page specifies "</div><div class='del'>-				"inconsistent restart area offset.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Only restart pages modified by chkdsk are allowed to have chkdsk_lsn</div><div class='del'>-	 * set.</div><div class='del'>-	 */</div><div class='del'>-	if (!ntfs_is_chkd_record(rp-&gt;magic) &amp;&amp; sle64_to_cpu(rp-&gt;chkdsk_lsn)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart page is not modified "</div><div class='del'>-				"by chkdsk but a chkdsk LSN is specified.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_check_restart_area - check the restart area for consistency</div><div class='del'>- * @vi:		$LogFile inode to which the restart page belongs</div><div class='del'>- * @rp:		restart page whose restart area to check</div><div class='del'>- *</div><div class='del'>- * Check the restart area of the restart page @rp for consistency and return</div><div class='del'>- * 'true' if it is consistent and 'false' otherwise.</div><div class='del'>- *</div><div class='del'>- * This function assumes that the restart page header has already been</div><div class='del'>- * consistency checked.</div><div class='del'>- *</div><div class='del'>- * This function only needs NTFS_BLOCK_SIZE bytes in @rp, i.e. it does not</div><div class='del'>- * require the full restart page.</div><div class='del'>- */</div><div class='del'>-static bool ntfs_check_restart_area(struct inode *vi, RESTART_PAGE_HEADER *rp)</div><div class='del'>-{</div><div class='del'>-	u64 file_size;</div><div class='del'>-	RESTART_AREA *ra;</div><div class='del'>-	u16 ra_ofs, ra_len, ca_ofs;</div><div class='del'>-	u8 fs_bits;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	ra_ofs = le16_to_cpu(rp-&gt;restart_area_offset);</div><div class='del'>-	ra = (RESTART_AREA*)((u8*)rp + ra_ofs);</div><div class='del'>-	/*</div><div class='del'>-	 * Everything before ra-&gt;file_size must be before the first word</div><div class='del'>-	 * protected by an update sequence number.  This ensures that it is</div><div class='del'>-	 * safe to access ra-&gt;client_array_offset.</div><div class='del'>-	 */</div><div class='del'>-	if (ra_ofs + offsetof(RESTART_AREA, file_size) &gt;</div><div class='del'>-			NTFS_BLOCK_SIZE - sizeof(u16)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area specifies "</div><div class='del'>-				"inconsistent file offset.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Now that we can access ra-&gt;client_array_offset, make sure everything</div><div class='del'>-	 * up to the log client array is before the first word protected by an</div><div class='del'>-	 * update sequence number.  This ensures we can access all of the</div><div class='del'>-	 * restart area elements safely.  Also, the client array offset must be</div><div class='del'>-	 * aligned to an 8-byte boundary.</div><div class='del'>-	 */</div><div class='del'>-	ca_ofs = le16_to_cpu(ra-&gt;client_array_offset);</div><div class='del'>-	if (((ca_ofs + 7) &amp; ~7) != ca_ofs ||</div><div class='del'>-			ra_ofs + ca_ofs &gt; NTFS_BLOCK_SIZE - sizeof(u16)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area specifies "</div><div class='del'>-				"inconsistent client array offset.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The restart area must end within the system page size both when</div><div class='del'>-	 * calculated manually and as specified by ra-&gt;restart_area_length.</div><div class='del'>-	 * Also, the calculated length must not exceed the specified length.</div><div class='del'>-	 */</div><div class='del'>-	ra_len = ca_ofs + le16_to_cpu(ra-&gt;log_clients) *</div><div class='del'>-			sizeof(LOG_CLIENT_RECORD);</div><div class='del'>-	if (ra_ofs + ra_len &gt; le32_to_cpu(rp-&gt;system_page_size) ||</div><div class='del'>-			ra_ofs + le16_to_cpu(ra-&gt;restart_area_length) &gt;</div><div class='del'>-			le32_to_cpu(rp-&gt;system_page_size) ||</div><div class='del'>-			ra_len &gt; le16_to_cpu(ra-&gt;restart_area_length)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area is out of bounds "</div><div class='del'>-				"of the system page size specified by the "</div><div class='del'>-				"restart page header and/or the specified "</div><div class='del'>-				"restart area length is inconsistent.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The ra-&gt;client_free_list and ra-&gt;client_in_use_list must be either</div><div class='del'>-	 * LOGFILE_NO_CLIENT or less than ra-&gt;log_clients or they are</div><div class='del'>-	 * overflowing the client array.</div><div class='del'>-	 */</div><div class='del'>-	if ((ra-&gt;client_free_list != LOGFILE_NO_CLIENT &amp;&amp;</div><div class='del'>-			le16_to_cpu(ra-&gt;client_free_list) &gt;=</div><div class='del'>-			le16_to_cpu(ra-&gt;log_clients)) ||</div><div class='del'>-			(ra-&gt;client_in_use_list != LOGFILE_NO_CLIENT &amp;&amp;</div><div class='del'>-			le16_to_cpu(ra-&gt;client_in_use_list) &gt;=</div><div class='del'>-			le16_to_cpu(ra-&gt;log_clients))) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area specifies "</div><div class='del'>-				"overflowing client free and/or in use lists.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Check ra-&gt;seq_number_bits against ra-&gt;file_size for consistency.</div><div class='del'>-	 * We cannot just use ffs() because the file size is not a power of 2.</div><div class='del'>-	 */</div><div class='del'>-	file_size = (u64)sle64_to_cpu(ra-&gt;file_size);</div><div class='del'>-	fs_bits = 0;</div><div class='del'>-	while (file_size) {</div><div class='del'>-		file_size &gt;&gt;= 1;</div><div class='del'>-		fs_bits++;</div><div class='del'>-	}</div><div class='del'>-	if (le32_to_cpu(ra-&gt;seq_number_bits) != 67 - fs_bits) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area specifies "</div><div class='del'>-				"inconsistent sequence number bits.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* The log record header length must be a multiple of 8. */</div><div class='del'>-	if (((le16_to_cpu(ra-&gt;log_record_header_length) + 7) &amp; ~7) !=</div><div class='del'>-			le16_to_cpu(ra-&gt;log_record_header_length)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area specifies "</div><div class='del'>-				"inconsistent log record header length.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* Dito for the log page data offset. */</div><div class='del'>-	if (((le16_to_cpu(ra-&gt;log_page_data_offset) + 7) &amp; ~7) !=</div><div class='del'>-			le16_to_cpu(ra-&gt;log_page_data_offset)) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "$LogFile restart area specifies "</div><div class='del'>-				"inconsistent log page data offset.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_check_log_client_array - check the log client array for consistency</div><div class='del'>- * @vi:		$LogFile inode to which the restart page belongs</div><div class='del'>- * @rp:		restart page whose log client array to check</div><div class='del'>- *</div><div class='del'>- * Check the log client array of the restart page @rp for consistency and</div><div class='del'>- * return 'true' if it is consistent and 'false' otherwise.</div><div class='del'>- *</div><div class='del'>- * This function assumes that the restart page header and the restart area have</div><div class='del'>- * already been consistency checked.</div><div class='del'>- *</div><div class='del'>- * Unlike ntfs_check_restart_page_header() and ntfs_check_restart_area(), this</div><div class='del'>- * function needs @rp-&gt;system_page_size bytes in @rp, i.e. it requires the full</div><div class='del'>- * restart page and the page must be multi sector transfer deprotected.</div><div class='del'>- */</div><div class='del'>-static bool ntfs_check_log_client_array(struct inode *vi,</div><div class='del'>-		RESTART_PAGE_HEADER *rp)</div><div class='del'>-{</div><div class='del'>-	RESTART_AREA *ra;</div><div class='del'>-	LOG_CLIENT_RECORD *ca, *cr;</div><div class='del'>-	u16 nr_clients, idx;</div><div class='del'>-	bool in_free_list, idx_is_first;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	ra = (RESTART_AREA*)((u8*)rp + le16_to_cpu(rp-&gt;restart_area_offset));</div><div class='del'>-	ca = (LOG_CLIENT_RECORD*)((u8*)ra +</div><div class='del'>-			le16_to_cpu(ra-&gt;client_array_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Check the ra-&gt;client_free_list first and then check the</div><div class='del'>-	 * ra-&gt;client_in_use_list.  Check each of the log client records in</div><div class='del'>-	 * each of the lists and check that the array does not overflow the</div><div class='del'>-	 * ra-&gt;log_clients value.  Also keep track of the number of records</div><div class='del'>-	 * visited as there cannot be more than ra-&gt;log_clients records and</div><div class='del'>-	 * that way we detect eventual loops in within a list.</div><div class='del'>-	 */</div><div class='del'>-	nr_clients = le16_to_cpu(ra-&gt;log_clients);</div><div class='del'>-	idx = le16_to_cpu(ra-&gt;client_free_list);</div><div class='del'>-	in_free_list = true;</div><div class='del'>-check_list:</div><div class='del'>-	for (idx_is_first = true; idx != LOGFILE_NO_CLIENT_CPU; nr_clients--,</div><div class='del'>-			idx = le16_to_cpu(cr-&gt;next_client)) {</div><div class='del'>-		if (!nr_clients || idx &gt;= le16_to_cpu(ra-&gt;log_clients))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/* Set @cr to the current log client record. */</div><div class='del'>-		cr = ca + idx;</div><div class='del'>-		/* The first log client record must not have a prev_client. */</div><div class='del'>-		if (idx_is_first) {</div><div class='del'>-			if (cr-&gt;prev_client != LOGFILE_NO_CLIENT)</div><div class='del'>-				goto err_out;</div><div class='del'>-			idx_is_first = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* Switch to and check the in use list if we just did the free list. */</div><div class='del'>-	if (in_free_list) {</div><div class='del'>-		in_free_list = false;</div><div class='del'>-		idx = le16_to_cpu(ra-&gt;client_in_use_list);</div><div class='del'>-		goto check_list;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_error(vi-&gt;i_sb, "$LogFile log client array is corrupt.");</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_check_and_load_restart_page - check the restart page for consistency</div><div class='del'>- * @vi:		$LogFile inode to which the restart page belongs</div><div class='del'>- * @rp:		restart page to check</div><div class='del'>- * @pos:	position in @vi at which the restart page resides</div><div class='del'>- * @wrp:	[OUT] copy of the multi sector transfer deprotected restart page</div><div class='del'>- * @lsn:	[OUT] set to the current logfile lsn on success</div><div class='del'>- *</div><div class='del'>- * Check the restart page @rp for consistency and return 0 if it is consistent</div><div class='del'>- * and -errno otherwise.  The restart page may have been modified by chkdsk in</div><div class='del'>- * which case its magic is CHKD instead of RSTR.</div><div class='del'>- *</div><div class='del'>- * This function only needs NTFS_BLOCK_SIZE bytes in @rp, i.e. it does not</div><div class='del'>- * require the full restart page.</div><div class='del'>- *</div><div class='del'>- * If @wrp is not NULL, on success, *@wrp will point to a buffer containing a</div><div class='del'>- * copy of the complete multi sector transfer deprotected page.  On failure,</div><div class='del'>- * *@wrp is undefined.</div><div class='del'>- *</div><div class='del'>- * Simillarly, if @lsn is not NULL, on success *@lsn will be set to the current</div><div class='del'>- * logfile lsn according to this restart page.  On failure, *@lsn is undefined.</div><div class='del'>- *</div><div class='del'>- * The following error codes are defined:</div><div class='del'>- *	-EINVAL	- The restart page is inconsistent.</div><div class='del'>- *	-ENOMEM	- Not enough memory to load the restart page.</div><div class='del'>- *	-EIO	- Failed to reading from $LogFile.</div><div class='del'>- */</div><div class='del'>-static int ntfs_check_and_load_restart_page(struct inode *vi,</div><div class='del'>-		RESTART_PAGE_HEADER *rp, s64 pos, RESTART_PAGE_HEADER **wrp,</div><div class='del'>-		LSN *lsn)</div><div class='del'>-{</div><div class='del'>-	RESTART_AREA *ra;</div><div class='del'>-	RESTART_PAGE_HEADER *trp;</div><div class='del'>-	int size, err;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Check the restart page header for consistency. */</div><div class='del'>-	if (!ntfs_check_restart_page_header(vi, rp, pos)) {</div><div class='del'>-		/* Error output already done inside the function. */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	/* Check the restart area for consistency. */</div><div class='del'>-	if (!ntfs_check_restart_area(vi, rp)) {</div><div class='del'>-		/* Error output already done inside the function. */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ra = (RESTART_AREA*)((u8*)rp + le16_to_cpu(rp-&gt;restart_area_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate a buffer to store the whole restart page so we can multi</div><div class='del'>-	 * sector transfer deprotect it.</div><div class='del'>-	 */</div><div class='del'>-	trp = ntfs_malloc_nofs(le32_to_cpu(rp-&gt;system_page_size));</div><div class='del'>-	if (!trp) {</div><div class='del'>-		ntfs_error(vi-&gt;i_sb, "Failed to allocate memory for $LogFile "</div><div class='del'>-				"restart page buffer.");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Read the whole of the restart page into the buffer.  If it fits</div><div class='del'>-	 * completely inside @rp, just copy it from there.  Otherwise map all</div><div class='del'>-	 * the required pages and copy the data from them.</div><div class='del'>-	 */</div><div class='del'>-	size = PAGE_SIZE - (pos &amp; ~PAGE_MASK);</div><div class='del'>-	if (size &gt;= le32_to_cpu(rp-&gt;system_page_size)) {</div><div class='del'>-		memcpy(trp, rp, le32_to_cpu(rp-&gt;system_page_size));</div><div class='del'>-	} else {</div><div class='del'>-		pgoff_t idx;</div><div class='del'>-		struct page *page;</div><div class='del'>-		int have_read, to_read;</div><div class='del'>-</div><div class='del'>-		/* First copy what we already have in @rp. */</div><div class='del'>-		memcpy(trp, rp, size);</div><div class='del'>-		/* Copy the remaining data one page at a time. */</div><div class='del'>-		have_read = size;</div><div class='del'>-		to_read = le32_to_cpu(rp-&gt;system_page_size) - size;</div><div class='del'>-		idx = (pos + size) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		BUG_ON((pos + size) &amp; ~PAGE_MASK);</div><div class='del'>-		do {</div><div class='del'>-			page = ntfs_map_page(vi-&gt;i_mapping, idx);</div><div class='del'>-			if (IS_ERR(page)) {</div><div class='del'>-				ntfs_error(vi-&gt;i_sb, "Error mapping $LogFile "</div><div class='del'>-						"page (index %lu).", idx);</div><div class='del'>-				err = PTR_ERR(page);</div><div class='del'>-				if (err != -EIO &amp;&amp; err != -ENOMEM)</div><div class='del'>-					err = -EIO;</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			size = min_t(int, to_read, PAGE_SIZE);</div><div class='del'>-			memcpy((u8*)trp + have_read, page_address(page), size);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			have_read += size;</div><div class='del'>-			to_read -= size;</div><div class='del'>-			idx++;</div><div class='del'>-		} while (to_read &gt; 0);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Perform the multi sector transfer deprotection on the buffer if the</div><div class='del'>-	 * restart page is protected.</div><div class='del'>-	 */</div><div class='del'>-	if ((!ntfs_is_chkd_record(trp-&gt;magic) || le16_to_cpu(trp-&gt;usa_count))</div><div class='del'>-			&amp;&amp; post_read_mst_fixup((NTFS_RECORD*)trp,</div><div class='del'>-			le32_to_cpu(rp-&gt;system_page_size))) {</div><div class='del'>-		/*</div><div class='del'>-		 * A multi sector tranfer error was detected.  We only need to</div><div class='del'>-		 * abort if the restart page contents exceed the multi sector</div><div class='del'>-		 * transfer fixup of the first sector.</div><div class='del'>-		 */</div><div class='del'>-		if (le16_to_cpu(rp-&gt;restart_area_offset) +</div><div class='del'>-				le16_to_cpu(ra-&gt;restart_area_length) &gt;</div><div class='del'>-				NTFS_BLOCK_SIZE - sizeof(u16)) {</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Multi sector transfer error "</div><div class='del'>-					"detected in $LogFile restart page.");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the restart page is modified by chkdsk or there are no active</div><div class='del'>-	 * logfile clients, the logfile is consistent.  Otherwise, need to</div><div class='del'>-	 * check the log client records for consistency, too.</div><div class='del'>-	 */</div><div class='del'>-	err = 0;</div><div class='del'>-	if (ntfs_is_rstr_record(rp-&gt;magic) &amp;&amp;</div><div class='del'>-			ra-&gt;client_in_use_list != LOGFILE_NO_CLIENT) {</div><div class='del'>-		if (!ntfs_check_log_client_array(vi, trp)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (lsn) {</div><div class='del'>-		if (ntfs_is_rstr_record(rp-&gt;magic))</div><div class='del'>-			*lsn = sle64_to_cpu(ra-&gt;current_lsn);</div><div class='del'>-		else /* if (ntfs_is_chkd_record(rp-&gt;magic)) */</div><div class='del'>-			*lsn = sle64_to_cpu(rp-&gt;chkdsk_lsn);</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	if (wrp)</div><div class='del'>-		*wrp = trp;</div><div class='del'>-	else {</div><div class='del'>-err_out:</div><div class='del'>-		ntfs_free(trp);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_check_logfile - check the journal for consistency</div><div class='del'>- * @log_vi:	struct inode of loaded journal $LogFile to check</div><div class='del'>- * @rp:		[OUT] on success this is a copy of the current restart page</div><div class='del'>- *</div><div class='del'>- * Check the $LogFile journal for consistency and return 'true' if it is</div><div class='del'>- * consistent and 'false' if not.  On success, the current restart page is</div><div class='del'>- * returned in *@rp.  Caller must call ntfs_free(*@rp) when finished with it.</div><div class='del'>- *</div><div class='del'>- * At present we only check the two restart pages and ignore the log record</div><div class='del'>- * pages.</div><div class='del'>- *</div><div class='del'>- * Note that the MstProtected flag is not set on the $LogFile inode and hence</div><div class='del'>- * when reading pages they are not deprotected.  This is because we do not know</div><div class='del'>- * if the $LogFile was created on a system with a different page size to ours</div><div class='del'>- * yet and mst deprotection would fail if our page size is smaller.</div><div class='del'>- */</div><div class='del'>-bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)</div><div class='del'>-{</div><div class='del'>-	s64 size, pos;</div><div class='del'>-	LSN rstr1_lsn, rstr2_lsn;</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(log_vi-&gt;i_sb);</div><div class='del'>-	struct address_space *mapping = log_vi-&gt;i_mapping;</div><div class='del'>-	struct page *page = NULL;</div><div class='del'>-	u8 *kaddr = NULL;</div><div class='del'>-	RESTART_PAGE_HEADER *rstr1_ph = NULL;</div><div class='del'>-	RESTART_PAGE_HEADER *rstr2_ph = NULL;</div><div class='del'>-	int log_page_size, err;</div><div class='del'>-	bool logfile_is_empty = true;</div><div class='del'>-	u8 log_page_bits;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* An empty $LogFile must have been clean before it got emptied. */</div><div class='del'>-	if (NVolLogFileEmpty(vol))</div><div class='del'>-		goto is_empty;</div><div class='del'>-	size = i_size_read(log_vi);</div><div class='del'>-	/* Make sure the file doesn't exceed the maximum allowed size. */</div><div class='del'>-	if (size &gt; MaxLogFileSize)</div><div class='del'>-		size = MaxLogFileSize;</div><div class='del'>-	/*</div><div class='del'>-	 * Truncate size to a multiple of the page cache size or the default</div><div class='del'>-	 * log page size if the page cache size is between the default log page</div><div class='del'>-	 * log page size if the page cache size is between the default log page</div><div class='del'>-	 * size and twice that.</div><div class='del'>-	 */</div><div class='del'>-	if (PAGE_SIZE &gt;= DefaultLogPageSize &amp;&amp; PAGE_SIZE &lt;=</div><div class='del'>-			DefaultLogPageSize * 2)</div><div class='del'>-		log_page_size = DefaultLogPageSize;</div><div class='del'>-	else</div><div class='del'>-		log_page_size = PAGE_SIZE;</div><div class='del'>-	/*</div><div class='del'>-	 * Use ntfs_ffs() instead of ffs() to enable the compiler to</div><div class='del'>-	 * optimize log_page_size and log_page_bits into constants.</div><div class='del'>-	 */</div><div class='del'>-	log_page_bits = ntfs_ffs(log_page_size) - 1;</div><div class='del'>-	size &amp;= ~(s64)(log_page_size - 1);</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure the log file is big enough to store at least the two restart</div><div class='del'>-	 * pages and the minimum number of log record pages.</div><div class='del'>-	 */</div><div class='del'>-	if (size &lt; log_page_size * 2 || (size - log_page_size * 2) &gt;&gt;</div><div class='del'>-			log_page_bits &lt; MinLogRecordPages) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "$LogFile is too small.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Read through the file looking for a restart page.  Since the restart</div><div class='del'>-	 * page header is at the beginning of a page we only need to search at</div><div class='del'>-	 * what could be the beginning of a page (for each page size) rather</div><div class='del'>-	 * than scanning the whole file byte by byte.  If all potential places</div><div class='del'>-	 * contain empty and uninitialzed records, the log file can be assumed</div><div class='del'>-	 * to be empty.</div><div class='del'>-	 */</div><div class='del'>-	for (pos = 0; pos &lt; size; pos &lt;&lt;= 1) {</div><div class='del'>-		pgoff_t idx = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		if (!page || page-&gt;index != idx) {</div><div class='del'>-			if (page)</div><div class='del'>-				ntfs_unmap_page(page);</div><div class='del'>-			page = ntfs_map_page(mapping, idx);</div><div class='del'>-			if (IS_ERR(page)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Error mapping $LogFile "</div><div class='del'>-						"page (index %lu).", idx);</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		kaddr = (u8*)page_address(page) + (pos &amp; ~PAGE_MASK);</div><div class='del'>-		/*</div><div class='del'>-		 * A non-empty block means the logfile is not empty while an</div><div class='del'>-		 * empty block after a non-empty block has been encountered</div><div class='del'>-		 * means we are done.</div><div class='del'>-		 */</div><div class='del'>-		if (!ntfs_is_empty_recordp((le32*)kaddr))</div><div class='del'>-			logfile_is_empty = false;</div><div class='del'>-		else if (!logfile_is_empty)</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * A log record page means there cannot be a restart page after</div><div class='del'>-		 * this so no need to continue searching.</div><div class='del'>-		 */</div><div class='del'>-		if (ntfs_is_rcrd_recordp((le32*)kaddr))</div><div class='del'>-			break;</div><div class='del'>-		/* If not a (modified by chkdsk) restart page, continue. */</div><div class='del'>-		if (!ntfs_is_rstr_recordp((le32*)kaddr) &amp;&amp;</div><div class='del'>-				!ntfs_is_chkd_recordp((le32*)kaddr)) {</div><div class='del'>-			if (!pos)</div><div class='del'>-				pos = NTFS_BLOCK_SIZE &gt;&gt; 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Check the (modified by chkdsk) restart page for consistency</div><div class='del'>-		 * and get a copy of the complete multi sector transfer</div><div class='del'>-		 * deprotected restart page.</div><div class='del'>-		 */</div><div class='del'>-		err = ntfs_check_and_load_restart_page(log_vi,</div><div class='del'>-				(RESTART_PAGE_HEADER*)kaddr, pos,</div><div class='del'>-				!rstr1_ph ? &amp;rstr1_ph : &amp;rstr2_ph,</div><div class='del'>-				!rstr1_ph ? &amp;rstr1_lsn : &amp;rstr2_lsn);</div><div class='del'>-		if (!err) {</div><div class='del'>-			/*</div><div class='del'>-			 * If we have now found the first (modified by chkdsk)</div><div class='del'>-			 * restart page, continue looking for the second one.</div><div class='del'>-			 */</div><div class='del'>-			if (!pos) {</div><div class='del'>-				pos = NTFS_BLOCK_SIZE &gt;&gt; 1;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * We have now found the second (modified by chkdsk)</div><div class='del'>-			 * restart page, so we can stop looking.</div><div class='del'>-			 */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Error output already done inside the function.  Note, we do</div><div class='del'>-		 * not abort if the restart page was invalid as we might still</div><div class='del'>-		 * find a valid one further in the file.</div><div class='del'>-		 */</div><div class='del'>-		if (err != -EINVAL) {</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		/* Continue looking. */</div><div class='del'>-		if (!pos)</div><div class='del'>-			pos = NTFS_BLOCK_SIZE &gt;&gt; 1;</div><div class='del'>-	}</div><div class='del'>-	if (page)</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-	if (logfile_is_empty) {</div><div class='del'>-		NVolSetLogFileEmpty(vol);</div><div class='del'>-is_empty:</div><div class='del'>-		ntfs_debug("Done.  ($LogFile is empty.)");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	if (!rstr1_ph) {</div><div class='del'>-		BUG_ON(rstr2_ph);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Did not find any restart pages in "</div><div class='del'>-				"$LogFile and it was not empty.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* If both restart pages were found, use the more recent one. */</div><div class='del'>-	if (rstr2_ph) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the second restart area is more recent, switch to it.</div><div class='del'>-		 * Otherwise just throw it away.</div><div class='del'>-		 */</div><div class='del'>-		if (rstr2_lsn &gt; rstr1_lsn) {</div><div class='del'>-			ntfs_debug("Using second restart page as it is more "</div><div class='del'>-					"recent.");</div><div class='del'>-			ntfs_free(rstr1_ph);</div><div class='del'>-			rstr1_ph = rstr2_ph;</div><div class='del'>-			/* rstr1_lsn = rstr2_lsn; */</div><div class='del'>-		} else {</div><div class='del'>-			ntfs_debug("Using first restart page as it is more "</div><div class='del'>-					"recent.");</div><div class='del'>-			ntfs_free(rstr2_ph);</div><div class='del'>-		}</div><div class='del'>-		rstr2_ph = NULL;</div><div class='del'>-	}</div><div class='del'>-	/* All consistency checks passed. */</div><div class='del'>-	if (rp)</div><div class='del'>-		*rp = rstr1_ph;</div><div class='del'>-	else</div><div class='del'>-		ntfs_free(rstr1_ph);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-err_out:</div><div class='del'>-	if (rstr1_ph)</div><div class='del'>-		ntfs_free(rstr1_ph);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_is_logfile_clean - check in the journal if the volume is clean</div><div class='del'>- * @log_vi:	struct inode of loaded journal $LogFile to check</div><div class='del'>- * @rp:		copy of the current restart page</div><div class='del'>- *</div><div class='del'>- * Analyze the $LogFile journal and return 'true' if it indicates the volume was</div><div class='del'>- * shutdown cleanly and 'false' if not.</div><div class='del'>- *</div><div class='del'>- * At present we only look at the two restart pages and ignore the log record</div><div class='del'>- * pages.  This is a little bit crude in that there will be a very small number</div><div class='del'>- * of cases where we think that a volume is dirty when in fact it is clean.</div><div class='del'>- * This should only affect volumes that have not been shutdown cleanly but did</div><div class='del'>- * not have any pending, non-check-pointed i/o, i.e. they were completely idle</div><div class='del'>- * at least for the five seconds preceding the unclean shutdown.</div><div class='del'>- *</div><div class='del'>- * This function assumes that the $LogFile journal has already been consistency</div><div class='del'>- * checked by a call to ntfs_check_logfile() and in particular if the $LogFile</div><div class='del'>- * is empty this function requires that NVolLogFileEmpty() is true otherwise an</div><div class='del'>- * empty volume will be reported as dirty.</div><div class='del'>- */</div><div class='del'>-bool ntfs_is_logfile_clean(struct inode *log_vi, const RESTART_PAGE_HEADER *rp)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(log_vi-&gt;i_sb);</div><div class='del'>-	RESTART_AREA *ra;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* An empty $LogFile must have been clean before it got emptied. */</div><div class='del'>-	if (NVolLogFileEmpty(vol)) {</div><div class='del'>-		ntfs_debug("Done.  ($LogFile is empty.)");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!rp);</div><div class='del'>-	if (!ntfs_is_rstr_record(rp-&gt;magic) &amp;&amp;</div><div class='del'>-			!ntfs_is_chkd_record(rp-&gt;magic)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Restart page buffer is invalid.  This is "</div><div class='del'>-				"probably a bug in that the $LogFile should "</div><div class='del'>-				"have been consistency checked before calling "</div><div class='del'>-				"this function.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	ra = (RESTART_AREA*)((u8*)rp + le16_to_cpu(rp-&gt;restart_area_offset));</div><div class='del'>-	/*</div><div class='del'>-	 * If the $LogFile has active clients, i.e. it is open, and we do not</div><div class='del'>-	 * have the RESTART_VOLUME_IS_CLEAN bit set in the restart area flags,</div><div class='del'>-	 * we assume there was an unclean shutdown.</div><div class='del'>-	 */</div><div class='del'>-	if (ra-&gt;client_in_use_list != LOGFILE_NO_CLIENT &amp;&amp;</div><div class='del'>-			!(ra-&gt;flags &amp; RESTART_VOLUME_IS_CLEAN)) {</div><div class='del'>-		ntfs_debug("Done.  $LogFile indicates a dirty shutdown.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* $LogFile indicates a clean shutdown. */</div><div class='del'>-	ntfs_debug("Done.  $LogFile indicates a clean shutdown.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_empty_logfile - empty the contents of the $LogFile journal</div><div class='del'>- * @log_vi:	struct inode of loaded journal $LogFile to empty</div><div class='del'>- *</div><div class='del'>- * Empty the contents of the $LogFile journal @log_vi and return 'true' on</div><div class='del'>- * success and 'false' on error.</div><div class='del'>- *</div><div class='del'>- * This function assumes that the $LogFile journal has already been consistency</div><div class='del'>- * checked by a call to ntfs_check_logfile() and that ntfs_is_logfile_clean()</div><div class='del'>- * has been used to ensure that the $LogFile is clean.</div><div class='del'>- */</div><div class='del'>-bool ntfs_empty_logfile(struct inode *log_vi)</div><div class='del'>-{</div><div class='del'>-	VCN vcn, end_vcn;</div><div class='del'>-	ntfs_inode *log_ni = NTFS_I(log_vi);</div><div class='del'>-	ntfs_volume *vol = log_ni-&gt;vol;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned block_size, block_size_bits;</div><div class='del'>-	int err;</div><div class='del'>-	bool should_wait = true;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	if (NVolLogFileEmpty(vol)) {</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We cannot use ntfs_attr_set() because we may be still in the middle</div><div class='del'>-	 * of a mount operation.  Thus we do the emptying by hand by first</div><div class='del'>-	 * zapping the page cache pages for the $LogFile/$DATA attribute and</div><div class='del'>-	 * then emptying each of the buffers in each of the clusters specified</div><div class='del'>-	 * by the runlist by hand.</div><div class='del'>-	 */</div><div class='del'>-	block_size = sb-&gt;s_blocksize;</div><div class='del'>-	block_size_bits = sb-&gt;s_blocksize_bits;</div><div class='del'>-	vcn = 0;</div><div class='del'>-	read_lock_irqsave(&amp;log_ni-&gt;size_lock, flags);</div><div class='del'>-	end_vcn = (log_ni-&gt;initialized_size + vol-&gt;cluster_size_mask) &gt;&gt;</div><div class='del'>-			vol-&gt;cluster_size_bits;</div><div class='del'>-	read_unlock_irqrestore(&amp;log_ni-&gt;size_lock, flags);</div><div class='del'>-	truncate_inode_pages(log_vi-&gt;i_mapping, 0);</div><div class='del'>-	down_write(&amp;log_ni-&gt;runlist.lock);</div><div class='del'>-	rl = log_ni-&gt;runlist.rl;</div><div class='del'>-	if (unlikely(!rl || vcn &lt; rl-&gt;vcn || !rl-&gt;length)) {</div><div class='del'>-map_vcn:</div><div class='del'>-		err = ntfs_map_runlist_nolock(log_ni, vcn, NULL);</div><div class='del'>-		if (err) {</div><div class='del'>-			ntfs_error(sb, "Failed to map runlist fragment (error "</div><div class='del'>-					"%d).", -err);</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-		rl = log_ni-&gt;runlist.rl;</div><div class='del'>-		BUG_ON(!rl || vcn &lt; rl-&gt;vcn || !rl-&gt;length);</div><div class='del'>-	}</div><div class='del'>-	/* Seek to the runlist element containing @vcn. */</div><div class='del'>-	while (rl-&gt;length &amp;&amp; vcn &gt;= rl[1].vcn)</div><div class='del'>-		rl++;</div><div class='del'>-	do {</div><div class='del'>-		LCN lcn;</div><div class='del'>-		sector_t block, end_block;</div><div class='del'>-		s64 len;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If this run is not mapped map it now and start again as the</div><div class='del'>-		 * runlist will have been updated.</div><div class='del'>-		 */</div><div class='del'>-		lcn = rl-&gt;lcn;</div><div class='del'>-		if (unlikely(lcn == LCN_RL_NOT_MAPPED)) {</div><div class='del'>-			vcn = rl-&gt;vcn;</div><div class='del'>-			goto map_vcn;</div><div class='del'>-		}</div><div class='del'>-		/* If this run is not valid abort with an error. */</div><div class='del'>-		if (unlikely(!rl-&gt;length || lcn &lt; LCN_HOLE))</div><div class='del'>-			goto rl_err;</div><div class='del'>-		/* Skip holes. */</div><div class='del'>-		if (lcn == LCN_HOLE)</div><div class='del'>-			continue;</div><div class='del'>-		block = lcn &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt; block_size_bits;</div><div class='del'>-		len = rl-&gt;length;</div><div class='del'>-		if (rl[1].vcn &gt; end_vcn)</div><div class='del'>-			len = end_vcn - rl-&gt;vcn;</div><div class='del'>-		end_block = (lcn + len) &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-				block_size_bits;</div><div class='del'>-		/* Iterate over the blocks in the run and empty them. */</div><div class='del'>-		do {</div><div class='del'>-			struct buffer_head *bh;</div><div class='del'>-</div><div class='del'>-			/* Obtain the buffer, possibly not uptodate. */</div><div class='del'>-			bh = sb_getblk(sb, block);</div><div class='del'>-			BUG_ON(!bh);</div><div class='del'>-			/* Setup buffer i/o submission. */</div><div class='del'>-			lock_buffer(bh);</div><div class='del'>-			bh-&gt;b_end_io = end_buffer_write_sync;</div><div class='del'>-			get_bh(bh);</div><div class='del'>-			/* Set the entire contents of the buffer to 0xff. */</div><div class='del'>-			memset(bh-&gt;b_data, -1, block_size);</div><div class='del'>-			if (!buffer_uptodate(bh))</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='del'>-			if (buffer_dirty(bh))</div><div class='del'>-				clear_buffer_dirty(bh);</div><div class='del'>-			/*</div><div class='del'>-			 * Submit the buffer and wait for i/o to complete but</div><div class='del'>-			 * only for the first buffer so we do not miss really</div><div class='del'>-			 * serious i/o errors.  Once the first buffer has</div><div class='del'>-			 * completed ignore errors afterwards as we can assume</div><div class='del'>-			 * that if one buffer worked all of them will work.</div><div class='del'>-			 */</div><div class='del'>-			submit_bh(REQ_OP_WRITE, bh);</div><div class='del'>-			if (should_wait) {</div><div class='del'>-				should_wait = false;</div><div class='del'>-				wait_on_buffer(bh);</div><div class='del'>-				if (unlikely(!buffer_uptodate(bh)))</div><div class='del'>-					goto io_err;</div><div class='del'>-			}</div><div class='del'>-			brelse(bh);</div><div class='del'>-		} while (++block &lt; end_block);</div><div class='del'>-	} while ((++rl)-&gt;vcn &lt; end_vcn);</div><div class='del'>-	up_write(&amp;log_ni-&gt;runlist.lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Zap the pages again just in case any got instantiated whilst we were</div><div class='del'>-	 * emptying the blocks by hand.  FIXME: We may not have completed</div><div class='del'>-	 * writing to all the buffer heads yet so this may happen too early.</div><div class='del'>-	 * We really should use a kernel thread to do the emptying</div><div class='del'>-	 * asynchronously and then we can also set the volume dirty and output</div><div class='del'>-	 * an error message if emptying should fail.</div><div class='del'>-	 */</div><div class='del'>-	truncate_inode_pages(log_vi-&gt;i_mapping, 0);</div><div class='del'>-	/* Set the flag so we do not have to do it again on remount. */</div><div class='del'>-	NVolSetLogFileEmpty(vol);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-io_err:</div><div class='del'>-	ntfs_error(sb, "Failed to write buffer.  Unmount and run chkdsk.");</div><div class='del'>-	goto dirty_err;</div><div class='del'>-rl_err:</div><div class='del'>-	ntfs_error(sb, "Runlist is corrupt.  Unmount and run chkdsk.");</div><div class='del'>-dirty_err:</div><div class='del'>-	NVolSetErrors(vol);</div><div class='del'>-	err = -EIO;</div><div class='del'>-err:</div><div class='del'>-	up_write(&amp;log_ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_error(sb, "Failed to fill $LogFile with 0xff bytes (error %d).",</div><div class='del'>-			-err);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/logfile.h b/fs/ntfs/logfile.h<br/>deleted file mode 100644<br/>index 429d4909cc72..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/logfile.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/logfile.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,295 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * logfile.h - Defines for NTFS kernel journal ($LogFile) handling.  Part of</div><div class='del'>- *	       the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2000-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_LOGFILE_H</div><div class='del'>-#define _LINUX_NTFS_LOGFILE_H</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "endian.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Journal ($LogFile) organization:</div><div class='del'>- *</div><div class='del'>- * Two restart areas present in the first two pages (restart pages, one restart</div><div class='del'>- * area in each page).  When the volume is dismounted they should be identical,</div><div class='del'>- * except for the update sequence array which usually has a different update</div><div class='del'>- * sequence number.</div><div class='del'>- *</div><div class='del'>- * These are followed by log records organized in pages headed by a log record</div><div class='del'>- * header going up to log file size.  Not all pages contain log records when a</div><div class='del'>- * volume is first formatted, but as the volume ages, all records will be used.</div><div class='del'>- * When the log file fills up, the records at the beginning are purged (by</div><div class='del'>- * modifying the oldest_lsn to a higher value presumably) and writing begins</div><div class='del'>- * at the beginning of the file.  Effectively, the log file is viewed as a</div><div class='del'>- * circular entity.</div><div class='del'>- *</div><div class='del'>- * NOTE: Windows NT, 2000, and XP all use log file version 1.1 but they accept</div><div class='del'>- * versions &lt;= 1.x, including 0.-1.  (Yes, that is a minus one in there!)  We</div><div class='del'>- * probably only want to support 1.1 as this seems to be the current version</div><div class='del'>- * and we don't know how that differs from the older versions.  The only</div><div class='del'>- * exception is if the journal is clean as marked by the two restart pages</div><div class='del'>- * then it doesn't matter whether we are on an earlier version.  We can just</div><div class='del'>- * reinitialize the logfile and start again with version 1.1.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Some $LogFile related constants. */</div><div class='del'>-#define MaxLogFileSize		0x100000000ULL</div><div class='del'>-#define DefaultLogPageSize	4096</div><div class='del'>-#define MinLogRecordPages	48</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Log file restart page header (begins the restart area).</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0	NTFS_RECORD; -- Unfolded here as gcc doesn't like unnamed structs. */</div><div class='del'>-/*  0*/	NTFS_RECORD_TYPE magic;	/* The magic is "RSTR". */</div><div class='del'>-/*  4*/	le16 usa_ofs;		/* See NTFS_RECORD definition in layout.h.</div><div class='del'>-				   When creating, set this to be immediately</div><div class='del'>-				   after this header structure (without any</div><div class='del'>-				   alignment). */</div><div class='del'>-/*  6*/	le16 usa_count;		/* See NTFS_RECORD definition in layout.h. */</div><div class='del'>-</div><div class='del'>-/*  8*/	leLSN chkdsk_lsn;	/* The last log file sequence number found by</div><div class='del'>-				   chkdsk.  Only used when the magic is changed</div><div class='del'>-				   to "CHKD".  Otherwise this is zero. */</div><div class='del'>-/* 16*/	le32 system_page_size;	/* Byte size of system pages when the log file</div><div class='del'>-				   was created, has to be &gt;= 512 and a power of</div><div class='del'>-				   2.  Use this to calculate the required size</div><div class='del'>-				   of the usa (usa_count) and add it to usa_ofs.</div><div class='del'>-				   Then verify that the result is less than the</div><div class='del'>-				   value of the restart_area_offset. */</div><div class='del'>-/* 20*/	le32 log_page_size;	/* Byte size of log file pages, has to be &gt;=</div><div class='del'>-				   512 and a power of 2.  The default is 4096</div><div class='del'>-				   and is used when the system page size is</div><div class='del'>-				   between 4096 and 8192.  Otherwise this is</div><div class='del'>-				   set to the system page size instead. */</div><div class='del'>-/* 24*/	le16 restart_area_offset;/* Byte offset from the start of this header to</div><div class='del'>-				   the RESTART_AREA.  Value has to be aligned</div><div class='del'>-				   to 8-byte boundary.  When creating, set this</div><div class='del'>-				   to be after the usa. */</div><div class='del'>-/* 26*/	sle16 minor_ver;	/* Log file minor version.  Only check if major</div><div class='del'>-				   version is 1. */</div><div class='del'>-/* 28*/	sle16 major_ver;	/* Log file major version.  We only support</div><div class='del'>-				   version 1.1. */</div><div class='del'>-/* sizeof() = 30 (0x1e) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) RESTART_PAGE_HEADER;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Constant for the log client indices meaning that there are no client records</div><div class='del'>- * in this particular client array.  Also inside the client records themselves,</div><div class='del'>- * this means that there are no client records preceding or following this one.</div><div class='del'>- */</div><div class='del'>-#define LOGFILE_NO_CLIENT	cpu_to_le16(0xffff)</div><div class='del'>-#define LOGFILE_NO_CLIENT_CPU	0xffff</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are the so far known RESTART_AREA_* flags (16-bit) which contain</div><div class='del'>- * information about the log file in which they are present.</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	RESTART_VOLUME_IS_CLEAN	= cpu_to_le16(0x0002),</div><div class='del'>-	RESTART_SPACE_FILLER	= cpu_to_le16(0xffff), /* gcc: Force enum bit width to 16. */</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-typedef le16 RESTART_AREA_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Log file restart area record.  The offset of this record is found by adding</div><div class='del'>- * the offset of the RESTART_PAGE_HEADER to the restart_area_offset value found</div><div class='del'>- * in it.  See notes at restart_area_offset above.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0*/	leLSN current_lsn;	/* The current, i.e. last LSN inside the log</div><div class='del'>-				   when the restart area was last written.</div><div class='del'>-				   This happens often but what is the interval?</div><div class='del'>-				   Is it just fixed time or is it every time a</div><div class='del'>-				   check point is written or somethine else?</div><div class='del'>-				   On create set to 0. */</div><div class='del'>-/*  8*/	le16 log_clients;	/* Number of log client records in the array of</div><div class='del'>-				   log client records which follows this</div><div class='del'>-				   restart area.  Must be 1.  */</div><div class='del'>-/* 10*/	le16 client_free_list;	/* The index of the first free log client record</div><div class='del'>-				   in the array of log client records.</div><div class='del'>-				   LOGFILE_NO_CLIENT means that there are no</div><div class='del'>-				   free log client records in the array.</div><div class='del'>-				   If != LOGFILE_NO_CLIENT, check that</div><div class='del'>-				   log_clients &gt; client_free_list.  On Win2k</div><div class='del'>-				   and presumably earlier, on a clean volume</div><div class='del'>-				   this is != LOGFILE_NO_CLIENT, and it should</div><div class='del'>-				   be 0, i.e. the first (and only) client</div><div class='del'>-				   record is free and thus the logfile is</div><div class='del'>-				   closed and hence clean.  A dirty volume</div><div class='del'>-				   would have left the logfile open and hence</div><div class='del'>-				   this would be LOGFILE_NO_CLIENT.  On WinXP</div><div class='del'>-				   and presumably later, the logfile is always</div><div class='del'>-				   open, even on clean shutdown so this should</div><div class='del'>-				   always be LOGFILE_NO_CLIENT. */</div><div class='del'>-/* 12*/	le16 client_in_use_list;/* The index of the first in-use log client</div><div class='del'>-				   record in the array of log client records.</div><div class='del'>-				   LOGFILE_NO_CLIENT means that there are no</div><div class='del'>-				   in-use log client records in the array.  If</div><div class='del'>-				   != LOGFILE_NO_CLIENT check that log_clients</div><div class='del'>-				   &gt; client_in_use_list.  On Win2k and</div><div class='del'>-				   presumably earlier, on a clean volume this</div><div class='del'>-				   is LOGFILE_NO_CLIENT, i.e. there are no</div><div class='del'>-				   client records in use and thus the logfile</div><div class='del'>-				   is closed and hence clean.  A dirty volume</div><div class='del'>-				   would have left the logfile open and hence</div><div class='del'>-				   this would be != LOGFILE_NO_CLIENT, and it</div><div class='del'>-				   should be 0, i.e. the first (and only)</div><div class='del'>-				   client record is in use.  On WinXP and</div><div class='del'>-				   presumably later, the logfile is always</div><div class='del'>-				   open, even on clean shutdown so this should</div><div class='del'>-				   always be 0. */</div><div class='del'>-/* 14*/	RESTART_AREA_FLAGS flags;/* Flags modifying LFS behaviour.  On Win2k</div><div class='del'>-				   and presumably earlier this is always 0.  On</div><div class='del'>-				   WinXP and presumably later, if the logfile</div><div class='del'>-				   was shutdown cleanly, the second bit,</div><div class='del'>-				   RESTART_VOLUME_IS_CLEAN, is set.  This bit</div><div class='del'>-				   is cleared when the volume is mounted by</div><div class='del'>-				   WinXP and set when the volume is dismounted,</div><div class='del'>-				   thus if the logfile is dirty, this bit is</div><div class='del'>-				   clear.  Thus we don't need to check the</div><div class='del'>-				   Windows version to determine if the logfile</div><div class='del'>-				   is clean.  Instead if the logfile is closed,</div><div class='del'>-				   we know it must be clean.  If it is open and</div><div class='del'>-				   this bit is set, we also know it must be</div><div class='del'>-				   clean.  If on the other hand the logfile is</div><div class='del'>-				   open and this bit is clear, we can be almost</div><div class='del'>-				   certain that the logfile is dirty. */</div><div class='del'>-/* 16*/	le32 seq_number_bits;	/* How many bits to use for the sequence</div><div class='del'>-				   number.  This is calculated as 67 - the</div><div class='del'>-				   number of bits required to store the logfile</div><div class='del'>-				   size in bytes and this can be used in with</div><div class='del'>-				   the specified file_size as a consistency</div><div class='del'>-				   check. */</div><div class='del'>-/* 20*/	le16 restart_area_length;/* Length of the restart area including the</div><div class='del'>-				   client array.  Following checks required if</div><div class='del'>-				   version matches.  Otherwise, skip them.</div><div class='del'>-				   restart_area_offset + restart_area_length</div><div class='del'>-				   has to be &lt;= system_page_size.  Also,</div><div class='del'>-				   restart_area_length has to be &gt;=</div><div class='del'>-				   client_array_offset + (log_clients *</div><div class='del'>-				   sizeof(log client record)). */</div><div class='del'>-/* 22*/	le16 client_array_offset;/* Offset from the start of this record to</div><div class='del'>-				   the first log client record if versions are</div><div class='del'>-				   matched.  When creating, set this to be</div><div class='del'>-				   after this restart area structure, aligned</div><div class='del'>-				   to 8-bytes boundary.  If the versions do not</div><div class='del'>-				   match, this is ignored and the offset is</div><div class='del'>-				   assumed to be (sizeof(RESTART_AREA) + 7) &amp;</div><div class='del'>-				   ~7, i.e. rounded up to first 8-byte</div><div class='del'>-				   boundary.  Either way, client_array_offset</div><div class='del'>-				   has to be aligned to an 8-byte boundary.</div><div class='del'>-				   Also, restart_area_offset +</div><div class='del'>-				   client_array_offset has to be &lt;= 510.</div><div class='del'>-				   Finally, client_array_offset + (log_clients</div><div class='del'>-				   * sizeof(log client record)) has to be &lt;=</div><div class='del'>-				   system_page_size.  On Win2k and presumably</div><div class='del'>-				   earlier, this is 0x30, i.e. immediately</div><div class='del'>-				   following this record.  On WinXP and</div><div class='del'>-				   presumably later, this is 0x40, i.e. there</div><div class='del'>-				   are 16 extra bytes between this record and</div><div class='del'>-				   the client array.  This probably means that</div><div class='del'>-				   the RESTART_AREA record is actually bigger</div><div class='del'>-				   in WinXP and later. */</div><div class='del'>-/* 24*/	sle64 file_size;	/* Usable byte size of the log file.  If the</div><div class='del'>-				   restart_area_offset + the offset of the</div><div class='del'>-				   file_size are &gt; 510 then corruption has</div><div class='del'>-				   occurred.  This is the very first check when</div><div class='del'>-				   starting with the restart_area as if it</div><div class='del'>-				   fails it means that some of the above values</div><div class='del'>-				   will be corrupted by the multi sector</div><div class='del'>-				   transfer protection.  The file_size has to</div><div class='del'>-				   be rounded down to be a multiple of the</div><div class='del'>-				   log_page_size in the RESTART_PAGE_HEADER and</div><div class='del'>-				   then it has to be at least big enough to</div><div class='del'>-				   store the two restart pages and 48 (0x30)</div><div class='del'>-				   log record pages. */</div><div class='del'>-/* 32*/	le32 last_lsn_data_length;/* Length of data of last LSN, not including</div><div class='del'>-				   the log record header.  On create set to</div><div class='del'>-				   0. */</div><div class='del'>-/* 36*/	le16 log_record_header_length;/* Byte size of the log record header.</div><div class='del'>-				   If the version matches then check that the</div><div class='del'>-				   value of log_record_header_length is a</div><div class='del'>-				   multiple of 8, i.e.</div><div class='del'>-				   (log_record_header_length + 7) &amp; ~7 ==</div><div class='del'>-				   log_record_header_length.  When creating set</div><div class='del'>-				   it to sizeof(LOG_RECORD_HEADER), aligned to</div><div class='del'>-				   8 bytes. */</div><div class='del'>-/* 38*/	le16 log_page_data_offset;/* Offset to the start of data in a log record</div><div class='del'>-				   page.  Must be a multiple of 8.  On create</div><div class='del'>-				   set it to immediately after the update</div><div class='del'>-				   sequence array of the log record page. */</div><div class='del'>-/* 40*/	le32 restart_log_open_count;/* A counter that gets incremented every</div><div class='del'>-				   time the logfile is restarted which happens</div><div class='del'>-				   at mount time when the logfile is opened.</div><div class='del'>-				   When creating set to a random value.  Win2k</div><div class='del'>-				   sets it to the low 32 bits of the current</div><div class='del'>-				   system time in NTFS format (see time.h). */</div><div class='del'>-/* 44*/	le32 reserved;		/* Reserved/alignment to 8-byte boundary. */</div><div class='del'>-/* sizeof() = 48 (0x30) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) RESTART_AREA;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Log client record.  The offset of this record is found by adding the offset</div><div class='del'>- * of the RESTART_AREA to the client_array_offset value found in it.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*  0*/	leLSN oldest_lsn;	/* Oldest LSN needed by this client.  On create</div><div class='del'>-				   set to 0. */</div><div class='del'>-/*  8*/	leLSN client_restart_lsn;/* LSN at which this client needs to restart</div><div class='del'>-				   the volume, i.e. the current position within</div><div class='del'>-				   the log file.  At present, if clean this</div><div class='del'>-				   should = current_lsn in restart area but it</div><div class='del'>-				   probably also = current_lsn when dirty most</div><div class='del'>-				   of the time.  At create set to 0. */</div><div class='del'>-/* 16*/	le16 prev_client;	/* The offset to the previous log client record</div><div class='del'>-				   in the array of log client records.</div><div class='del'>-				   LOGFILE_NO_CLIENT means there is no previous</div><div class='del'>-				   client record, i.e. this is the first one.</div><div class='del'>-				   This is always LOGFILE_NO_CLIENT. */</div><div class='del'>-/* 18*/	le16 next_client;	/* The offset to the next log client record in</div><div class='del'>-				   the array of log client records.</div><div class='del'>-				   LOGFILE_NO_CLIENT means there are no next</div><div class='del'>-				   client records, i.e. this is the last one.</div><div class='del'>-				   This is always LOGFILE_NO_CLIENT. */</div><div class='del'>-/* 20*/	le16 seq_number;	/* On Win2k and presumably earlier, this is set</div><div class='del'>-				   to zero every time the logfile is restarted</div><div class='del'>-				   and it is incremented when the logfile is</div><div class='del'>-				   closed at dismount time.  Thus it is 0 when</div><div class='del'>-				   dirty and 1 when clean.  On WinXP and</div><div class='del'>-				   presumably later, this is always 0. */</div><div class='del'>-/* 22*/	u8 reserved[6];		/* Reserved/alignment. */</div><div class='del'>-/* 28*/	le32 client_name_length;/* Length of client name in bytes.  Should</div><div class='del'>-				   always be 8. */</div><div class='del'>-/* 32*/	ntfschar client_name[64];/* Name of the client in Unicode.  Should</div><div class='del'>-				   always be "NTFS" with the remaining bytes</div><div class='del'>-				   set to 0. */</div><div class='del'>-/* sizeof() = 160 (0xa0) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) LOG_CLIENT_RECORD;</div><div class='del'>-</div><div class='del'>-extern bool ntfs_check_logfile(struct inode *log_vi,</div><div class='del'>-		RESTART_PAGE_HEADER **rp);</div><div class='del'>-</div><div class='del'>-extern bool ntfs_is_logfile_clean(struct inode *log_vi,</div><div class='del'>-		const RESTART_PAGE_HEADER *rp);</div><div class='del'>-</div><div class='del'>-extern bool ntfs_empty_logfile(struct inode *log_vi);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_LOGFILE_H */</div><div class='head'>diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h<br/>deleted file mode 100644<br/>index 7068425735f1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/malloc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/malloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * malloc.h - NTFS kernel memory handling. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_MALLOC_H</div><div class='del'>-#define _LINUX_NTFS_MALLOC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_malloc - allocate memory in multiples of pages</div><div class='del'>- * @size:	number of bytes to allocate</div><div class='del'>- * @gfp_mask:	extra flags for the allocator</div><div class='del'>- *</div><div class='del'>- * Internal function.  You probably want ntfs_malloc_nofs()...</div><div class='del'>- *</div><div class='del'>- * Allocates @size bytes of memory, rounded up to multiples of PAGE_SIZE and</div><div class='del'>- * returns a pointer to the allocated memory.</div><div class='del'>- *</div><div class='del'>- * If there was insufficient memory to complete the request, return NULL.</div><div class='del'>- * Depending on @gfp_mask the allocation may be guaranteed to succeed.</div><div class='del'>- */</div><div class='del'>-static inline void *__ntfs_malloc(unsigned long size, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	if (likely(size &lt;= PAGE_SIZE)) {</div><div class='del'>-		BUG_ON(!size);</div><div class='del'>-		/* kmalloc() has per-CPU caches so is faster for now. */</div><div class='del'>-		return kmalloc(PAGE_SIZE, gfp_mask &amp; ~__GFP_HIGHMEM);</div><div class='del'>-		/* return (void *)__get_free_page(gfp_mask); */</div><div class='del'>-	}</div><div class='del'>-	if (likely((size &gt;&gt; PAGE_SHIFT) &lt; totalram_pages()))</div><div class='del'>-		return __vmalloc(size, gfp_mask);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_malloc_nofs - allocate memory in multiples of pages</div><div class='del'>- * @size:	number of bytes to allocate</div><div class='del'>- *</div><div class='del'>- * Allocates @size bytes of memory, rounded up to multiples of PAGE_SIZE and</div><div class='del'>- * returns a pointer to the allocated memory.</div><div class='del'>- *</div><div class='del'>- * If there was insufficient memory to complete the request, return NULL.</div><div class='del'>- */</div><div class='del'>-static inline void *ntfs_malloc_nofs(unsigned long size)</div><div class='del'>-{</div><div class='del'>-	return __ntfs_malloc(size, GFP_NOFS | __GFP_HIGHMEM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_malloc_nofs_nofail - allocate memory in multiples of pages</div><div class='del'>- * @size:	number of bytes to allocate</div><div class='del'>- *</div><div class='del'>- * Allocates @size bytes of memory, rounded up to multiples of PAGE_SIZE and</div><div class='del'>- * returns a pointer to the allocated memory.</div><div class='del'>- *</div><div class='del'>- * This function guarantees that the allocation will succeed.  It will sleep</div><div class='del'>- * for as long as it takes to complete the allocation.</div><div class='del'>- *</div><div class='del'>- * If there was insufficient memory to complete the request, return NULL.</div><div class='del'>- */</div><div class='del'>-static inline void *ntfs_malloc_nofs_nofail(unsigned long size)</div><div class='del'>-{</div><div class='del'>-	return __ntfs_malloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_NOFAIL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ntfs_free(void *addr)</div><div class='del'>-{</div><div class='del'>-	kvfree(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_MALLOC_H */</div><div class='head'>diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c<br/>deleted file mode 100644<br/>index 6fd1dc4b08c8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/mft.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/mft.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2907 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * mft.c - NTFS kernel mft record operations. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2012 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "bitmap.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "dir.h"</div><div class='del'>-#include "lcnalloc.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-#define MAX_BHS	(PAGE_SIZE / NTFS_BLOCK_SIZE)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * map_mft_record_page - map the page in which a specific mft record resides</div><div class='del'>- * @ni:		ntfs inode whose mft record page to map</div><div class='del'>- *</div><div class='del'>- * This maps the page in which the mft record of the ntfs inode @ni is situated</div><div class='del'>- * and returns a pointer to the mft record within the mapped page.</div><div class='del'>- *</div><div class='del'>- * Return value needs to be checked with IS_ERR() and if that is true PTR_ERR()</div><div class='del'>- * contains the negative error code returned.</div><div class='del'>- */</div><div class='del'>-static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	struct inode *mft_vi = vol-&gt;mft_ino;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long index, end_index;</div><div class='del'>-	unsigned ofs;</div><div class='del'>-</div><div class='del'>-	BUG_ON(ni-&gt;page);</div><div class='del'>-	/*</div><div class='del'>-	 * The index into the page cache and the offset within the page cache</div><div class='del'>-	 * page of the wanted mft record. FIXME: We need to check for</div><div class='del'>-	 * overflowing the unsigned long, but I don't think we would ever get</div><div class='del'>-	 * here if the volume was that big...</div><div class='del'>-	 */</div><div class='del'>-	index = (u64)ni-&gt;mft_no &lt;&lt; vol-&gt;mft_record_size_bits &gt;&gt;</div><div class='del'>-			PAGE_SHIFT;</div><div class='del'>-	ofs = (ni-&gt;mft_no &lt;&lt; vol-&gt;mft_record_size_bits) &amp; ~PAGE_MASK;</div><div class='del'>-</div><div class='del'>-	i_size = i_size_read(mft_vi);</div><div class='del'>-	/* The maximum valid index into the page cache for $MFT's data. */</div><div class='del'>-	end_index = i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	/* If the wanted index is out of bounds the mft record doesn't exist. */</div><div class='del'>-	if (unlikely(index &gt;= end_index)) {</div><div class='del'>-		if (index &gt; end_index || (i_size &amp; ~PAGE_MASK) &lt; ofs +</div><div class='del'>-				vol-&gt;mft_record_size) {</div><div class='del'>-			page = ERR_PTR(-ENOENT);</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Attempt to read mft record 0x%lx, "</div><div class='del'>-					"which is beyond the end of the mft.  "</div><div class='del'>-					"This is probably a bug in the ntfs "</div><div class='del'>-					"driver.", ni-&gt;mft_no);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* Read, map, and pin the page. */</div><div class='del'>-	page = ntfs_map_page(mft_vi-&gt;i_mapping, index);</div><div class='del'>-	if (!IS_ERR(page)) {</div><div class='del'>-		/* Catch multi sector transfer fixup errors. */</div><div class='del'>-		if (likely(ntfs_is_mft_recordp((le32*)(page_address(page) +</div><div class='del'>-				ofs)))) {</div><div class='del'>-			ni-&gt;page = page;</div><div class='del'>-			ni-&gt;page_ofs = ofs;</div><div class='del'>-			return page_address(page) + ofs;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Mft record 0x%lx is corrupt.  "</div><div class='del'>-				"Run chkdsk.", ni-&gt;mft_no);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		page = ERR_PTR(-EIO);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-err_out:</div><div class='del'>-	ni-&gt;page = NULL;</div><div class='del'>-	ni-&gt;page_ofs = 0;</div><div class='del'>-	return (void*)page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * map_mft_record - map, pin and lock an mft record</div><div class='del'>- * @ni:		ntfs inode whose MFT record to map</div><div class='del'>- *</div><div class='del'>- * First, take the mrec_lock mutex.  We might now be sleeping, while waiting</div><div class='del'>- * for the mutex if it was already locked by someone else.</div><div class='del'>- *</div><div class='del'>- * The page of the record is mapped using map_mft_record_page() before being</div><div class='del'>- * returned to the caller.</div><div class='del'>- *</div><div class='del'>- * This in turn uses ntfs_map_page() to get the page containing the wanted mft</div><div class='del'>- * record (it in turn calls read_cache_page() which reads it in from disk if</div><div class='del'>- * necessary, increments the use count on the page so that it cannot disappear</div><div class='del'>- * under us and returns a reference to the page cache page).</div><div class='del'>- *</div><div class='del'>- * If read_cache_page() invokes ntfs_readpage() to load the page from disk, it</div><div class='del'>- * sets PG_locked and clears PG_uptodate on the page. Once I/O has completed</div><div class='del'>- * and the post-read mst fixups on each mft record in the page have been</div><div class='del'>- * performed, the page gets PG_uptodate set and PG_locked cleared (this is done</div><div class='del'>- * in our asynchronous I/O completion handler end_buffer_read_mft_async()).</div><div class='del'>- * ntfs_map_page() waits for PG_locked to become clear and checks if</div><div class='del'>- * PG_uptodate is set and returns an error code if not. This provides</div><div class='del'>- * sufficient protection against races when reading/using the page.</div><div class='del'>- *</div><div class='del'>- * However there is the write mapping to think about. Doing the above described</div><div class='del'>- * checking here will be fine, because when initiating the write we will set</div><div class='del'>- * PG_locked and clear PG_uptodate making sure nobody is touching the page</div><div class='del'>- * contents. Doing the locking this way means that the commit to disk code in</div><div class='del'>- * the page cache code paths is automatically sufficiently locked with us as</div><div class='del'>- * we will not touch a page that has been locked or is not uptodate. The only</div><div class='del'>- * locking problem then is them locking the page while we are accessing it.</div><div class='del'>- *</div><div class='del'>- * So that code will end up having to own the mrec_lock of all mft</div><div class='del'>- * records/inodes present in the page before I/O can proceed. In that case we</div><div class='del'>- * wouldn't need to bother with PG_locked and PG_uptodate as nobody will be</div><div class='del'>- * accessing anything without owning the mrec_lock mutex.  But we do need to</div><div class='del'>- * use them because of the read_cache_page() invocation and the code becomes so</div><div class='del'>- * much simpler this way that it is well worth it.</div><div class='del'>- *</div><div class='del'>- * The mft record is now ours and we return a pointer to it. You need to check</div><div class='del'>- * the returned pointer with IS_ERR() and if that is true, PTR_ERR() will return</div><div class='del'>- * the error code.</div><div class='del'>- *</div><div class='del'>- * NOTE: Caller is responsible for setting the mft record dirty before calling</div><div class='del'>- * unmap_mft_record(). This is obviously only necessary if the caller really</div><div class='del'>- * modified the mft record...</div><div class='del'>- * Q: Do we want to recycle one of the VFS inode state bits instead?</div><div class='del'>- * A: No, the inode ones mean we want to change the mft record, not we want to</div><div class='del'>- * write it out.</div><div class='del'>- */</div><div class='del'>-MFT_RECORD *map_mft_record(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for mft_no 0x%lx.", ni-&gt;mft_no);</div><div class='del'>-</div><div class='del'>-	/* Make sure the ntfs inode doesn't go away. */</div><div class='del'>-	atomic_inc(&amp;ni-&gt;count);</div><div class='del'>-</div><div class='del'>-	/* Serialize access to this mft record. */</div><div class='del'>-	mutex_lock(&amp;ni-&gt;mrec_lock);</div><div class='del'>-</div><div class='del'>-	m = map_mft_record_page(ni);</div><div class='del'>-	if (!IS_ERR(m))</div><div class='del'>-		return m;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;ni-&gt;mrec_lock);</div><div class='del'>-	atomic_dec(&amp;ni-&gt;count);</div><div class='del'>-	ntfs_error(ni-&gt;vol-&gt;sb, "Failed with error code %lu.", -PTR_ERR(m));</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * unmap_mft_record_page - unmap the page in which a specific mft record resides</div><div class='del'>- * @ni:		ntfs inode whose mft record page to unmap</div><div class='del'>- *</div><div class='del'>- * This unmaps the page in which the mft record of the ntfs inode @ni is</div><div class='del'>- * situated and returns. This is a NOOP if highmem is not configured.</div><div class='del'>- *</div><div class='del'>- * The unmap happens via ntfs_unmap_page() which in turn decrements the use</div><div class='del'>- * count on the page thus releasing it from the pinned state.</div><div class='del'>- *</div><div class='del'>- * We do not actually unmap the page from memory of course, as that will be</div><div class='del'>- * done by the page cache code itself when memory pressure increases or</div><div class='del'>- * whatever.</div><div class='del'>- */</div><div class='del'>-static inline void unmap_mft_record_page(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!ni-&gt;page);</div><div class='del'>-</div><div class='del'>-	// TODO: If dirty, blah...</div><div class='del'>-	ntfs_unmap_page(ni-&gt;page);</div><div class='del'>-	ni-&gt;page = NULL;</div><div class='del'>-	ni-&gt;page_ofs = 0;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * unmap_mft_record - release a mapped mft record</div><div class='del'>- * @ni:		ntfs inode whose MFT record to unmap</div><div class='del'>- *</div><div class='del'>- * We release the page mapping and the mrec_lock mutex which unmaps the mft</div><div class='del'>- * record and releases it for others to get hold of. We also release the ntfs</div><div class='del'>- * inode by decrementing the ntfs inode reference count.</div><div class='del'>- *</div><div class='del'>- * NOTE: If caller has modified the mft record, it is imperative to set the mft</div><div class='del'>- * record dirty BEFORE calling unmap_mft_record().</div><div class='del'>- */</div><div class='del'>-void unmap_mft_record(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	struct page *page = ni-&gt;page;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!page);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for mft_no 0x%lx.", ni-&gt;mft_no);</div><div class='del'>-</div><div class='del'>-	unmap_mft_record_page(ni);</div><div class='del'>-	mutex_unlock(&amp;ni-&gt;mrec_lock);</div><div class='del'>-	atomic_dec(&amp;ni-&gt;count);</div><div class='del'>-	/*</div><div class='del'>-	 * If pure ntfs_inode, i.e. no vfs inode attached, we leave it to</div><div class='del'>-	 * ntfs_clear_extent_inode() in the extent inode case, and to the</div><div class='del'>-	 * caller in the non-extent, yet pure ntfs inode case, to do the actual</div><div class='del'>-	 * tear down of all structures and freeing of all allocated memory.</div><div class='del'>-	 */</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * map_extent_mft_record - load an extent inode and attach it to its base</div><div class='del'>- * @base_ni:	base ntfs inode</div><div class='del'>- * @mref:	mft reference of the extent inode to load</div><div class='del'>- * @ntfs_ino:	on successful return, pointer to the ntfs_inode structure</div><div class='del'>- *</div><div class='del'>- * Load the extent mft record @mref and attach it to its base inode @base_ni.</div><div class='del'>- * Return the mapped extent mft record if IS_ERR(result) is false.  Otherwise</div><div class='del'>- * PTR_ERR(result) gives the negative error code.</div><div class='del'>- *</div><div class='del'>- * On successful return, @ntfs_ino contains a pointer to the ntfs_inode</div><div class='del'>- * structure of the mapped extent inode.</div><div class='del'>- */</div><div class='del'>-MFT_RECORD *map_extent_mft_record(ntfs_inode *base_ni, MFT_REF mref,</div><div class='del'>-		ntfs_inode **ntfs_ino)</div><div class='del'>-{</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ntfs_inode *ni = NULL;</div><div class='del'>-	ntfs_inode **extent_nis = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long mft_no = MREF(mref);</div><div class='del'>-	u16 seq_no = MSEQNO(mref);</div><div class='del'>-	bool destroy_ni = false;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Mapping extent mft record 0x%lx (base mft record 0x%lx).",</div><div class='del'>-			mft_no, base_ni-&gt;mft_no);</div><div class='del'>-	/* Make sure the base ntfs inode doesn't go away. */</div><div class='del'>-	atomic_inc(&amp;base_ni-&gt;count);</div><div class='del'>-	/*</div><div class='del'>-	 * Check if this extent inode has already been added to the base inode,</div><div class='del'>-	 * in which case just return it. If not found, add it to the base</div><div class='del'>-	 * inode before returning it.</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-	if (base_ni-&gt;nr_extents &gt; 0) {</div><div class='del'>-		extent_nis = base_ni-&gt;ext.extent_ntfs_inos;</div><div class='del'>-		for (i = 0; i &lt; base_ni-&gt;nr_extents; i++) {</div><div class='del'>-			if (mft_no != extent_nis[i]-&gt;mft_no)</div><div class='del'>-				continue;</div><div class='del'>-			ni = extent_nis[i];</div><div class='del'>-			/* Make sure the ntfs inode doesn't go away. */</div><div class='del'>-			atomic_inc(&amp;ni-&gt;count);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (likely(ni != NULL)) {</div><div class='del'>-		mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-		atomic_dec(&amp;base_ni-&gt;count);</div><div class='del'>-		/* We found the record; just have to map and return it. */</div><div class='del'>-		m = map_mft_record(ni);</div><div class='del'>-		/* map_mft_record() has incremented this on success. */</div><div class='del'>-		atomic_dec(&amp;ni-&gt;count);</div><div class='del'>-		if (!IS_ERR(m)) {</div><div class='del'>-			/* Verify the sequence number. */</div><div class='del'>-			if (likely(le16_to_cpu(m-&gt;sequence_number) == seq_no)) {</div><div class='del'>-				ntfs_debug("Done 1.");</div><div class='del'>-				*ntfs_ino = ni;</div><div class='del'>-				return m;</div><div class='del'>-			}</div><div class='del'>-			unmap_mft_record(ni);</div><div class='del'>-			ntfs_error(base_ni-&gt;vol-&gt;sb, "Found stale extent mft "</div><div class='del'>-					"reference! Corrupt filesystem. "</div><div class='del'>-					"Run chkdsk.");</div><div class='del'>-			return ERR_PTR(-EIO);</div><div class='del'>-		}</div><div class='del'>-map_err_out:</div><div class='del'>-		ntfs_error(base_ni-&gt;vol-&gt;sb, "Failed to map extent "</div><div class='del'>-				"mft record, error code %ld.", -PTR_ERR(m));</div><div class='del'>-		return m;</div><div class='del'>-	}</div><div class='del'>-	/* Record wasn't there. Get a new ntfs inode and initialize it. */</div><div class='del'>-	ni = ntfs_new_extent_inode(base_ni-&gt;vol-&gt;sb, mft_no);</div><div class='del'>-	if (unlikely(!ni)) {</div><div class='del'>-		mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-		atomic_dec(&amp;base_ni-&gt;count);</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-	ni-&gt;vol = base_ni-&gt;vol;</div><div class='del'>-	ni-&gt;seq_no = seq_no;</div><div class='del'>-	ni-&gt;nr_extents = -1;</div><div class='del'>-	ni-&gt;ext.base_ntfs_ino = base_ni;</div><div class='del'>-	/* Now map the record. */</div><div class='del'>-	m = map_mft_record(ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-		atomic_dec(&amp;base_ni-&gt;count);</div><div class='del'>-		ntfs_clear_extent_inode(ni);</div><div class='del'>-		goto map_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Verify the sequence number if it is present. */</div><div class='del'>-	if (seq_no &amp;&amp; (le16_to_cpu(m-&gt;sequence_number) != seq_no)) {</div><div class='del'>-		ntfs_error(base_ni-&gt;vol-&gt;sb, "Found stale extent mft "</div><div class='del'>-				"reference! Corrupt filesystem. Run chkdsk.");</div><div class='del'>-		destroy_ni = true;</div><div class='del'>-		m = ERR_PTR(-EIO);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Attach extent inode to base inode, reallocating memory if needed. */</div><div class='del'>-	if (!(base_ni-&gt;nr_extents &amp; 3)) {</div><div class='del'>-		ntfs_inode **tmp;</div><div class='del'>-		int new_size = (base_ni-&gt;nr_extents + 4) * sizeof(ntfs_inode *);</div><div class='del'>-</div><div class='del'>-		tmp = kmalloc(new_size, GFP_NOFS);</div><div class='del'>-		if (unlikely(!tmp)) {</div><div class='del'>-			ntfs_error(base_ni-&gt;vol-&gt;sb, "Failed to allocate "</div><div class='del'>-					"internal buffer.");</div><div class='del'>-			destroy_ni = true;</div><div class='del'>-			m = ERR_PTR(-ENOMEM);</div><div class='del'>-			goto unm_err_out;</div><div class='del'>-		}</div><div class='del'>-		if (base_ni-&gt;nr_extents) {</div><div class='del'>-			BUG_ON(!base_ni-&gt;ext.extent_ntfs_inos);</div><div class='del'>-			memcpy(tmp, base_ni-&gt;ext.extent_ntfs_inos, new_size -</div><div class='del'>-					4 * sizeof(ntfs_inode *));</div><div class='del'>-			kfree(base_ni-&gt;ext.extent_ntfs_inos);</div><div class='del'>-		}</div><div class='del'>-		base_ni-&gt;ext.extent_ntfs_inos = tmp;</div><div class='del'>-	}</div><div class='del'>-	base_ni-&gt;ext.extent_ntfs_inos[base_ni-&gt;nr_extents++] = ni;</div><div class='del'>-	mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-	atomic_dec(&amp;base_ni-&gt;count);</div><div class='del'>-	ntfs_debug("Done 2.");</div><div class='del'>-	*ntfs_ino = ni;</div><div class='del'>-	return m;</div><div class='del'>-unm_err_out:</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-	mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-	atomic_dec(&amp;base_ni-&gt;count);</div><div class='del'>-	/*</div><div class='del'>-	 * If the extent inode was not attached to the base inode we need to</div><div class='del'>-	 * release it or we will leak memory.</div><div class='del'>-	 */</div><div class='del'>-	if (destroy_ni)</div><div class='del'>-		ntfs_clear_extent_inode(ni);</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __mark_mft_record_dirty - set the mft record and the page containing it dirty</div><div class='del'>- * @ni:		ntfs inode describing the mapped mft record</div><div class='del'>- *</div><div class='del'>- * Internal function.  Users should call mark_mft_record_dirty() instead.</div><div class='del'>- *</div><div class='del'>- * Set the mapped (extent) mft record of the (base or extent) ntfs inode @ni,</div><div class='del'>- * as well as the page containing the mft record, dirty.  Also, mark the base</div><div class='del'>- * vfs inode dirty.  This ensures that any changes to the mft record are</div><div class='del'>- * written out to disk.</div><div class='del'>- *</div><div class='del'>- * NOTE:  We only set I_DIRTY_DATASYNC (and not I_DIRTY_PAGES)</div><div class='del'>- * on the base vfs inode, because even though file data may have been modified,</div><div class='del'>- * it is dirty in the inode meta data rather than the data page cache of the</div><div class='del'>- * inode, and thus there are no data pages that need writing out.  Therefore, a</div><div class='del'>- * full mark_inode_dirty() is overkill.  A mark_inode_dirty_sync(), on the</div><div class='del'>- * other hand, is not sufficient, because -&gt;write_inode needs to be called even</div><div class='del'>- * in case of fdatasync. This needs to happen or the file data would not</div><div class='del'>- * necessarily hit the device synchronously, even though the vfs inode has the</div><div class='del'>- * O_SYNC flag set.  Also, I_DIRTY_DATASYNC simply "feels" better than just</div><div class='del'>- * I_DIRTY_SYNC, since the file data has not actually hit the block device yet,</div><div class='del'>- * which is not what I_DIRTY_SYNC on its own would suggest.</div><div class='del'>- */</div><div class='del'>-void __mark_mft_record_dirty(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", ni-&gt;mft_no);</div><div class='del'>-	BUG_ON(NInoAttr(ni));</div><div class='del'>-	mark_ntfs_record_dirty(ni-&gt;page, ni-&gt;page_ofs);</div><div class='del'>-	/* Determine the base vfs inode and mark it dirty, too. */</div><div class='del'>-	mutex_lock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	if (likely(ni-&gt;nr_extents &gt;= 0))</div><div class='del'>-		base_ni = ni;</div><div class='del'>-	else</div><div class='del'>-		base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	mutex_unlock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	__mark_inode_dirty(VFS_I(base_ni), I_DIRTY_DATASYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *ntfs_please_email = "Please email "</div><div class='del'>-		"linux-ntfs-dev@lists.sourceforge.net and say that you saw "</div><div class='del'>-		"this message.  Thank you.";</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_sync_mft_mirror_umount - synchronise an mft record to the mft mirror</div><div class='del'>- * @vol:	ntfs volume on which the mft record to synchronize resides</div><div class='del'>- * @mft_no:	mft record number of mft record to synchronize</div><div class='del'>- * @m:		mapped, mst protected (extent) mft record to synchronize</div><div class='del'>- *</div><div class='del'>- * Write the mapped, mst protected (extent) mft record @m with mft record</div><div class='del'>- * number @mft_no to the mft mirror ($MFTMirr) of the ntfs volume @vol,</div><div class='del'>- * bypassing the page cache and the $MFTMirr inode itself.</div><div class='del'>- *</div><div class='del'>- * This function is only for use at umount time when the mft mirror inode has</div><div class='del'>- * already been disposed off.  We BUG() if we are called while the mft mirror</div><div class='del'>- * inode is still attached to the volume.</div><div class='del'>- *</div><div class='del'>- * On success return 0.  On error return -errno.</div><div class='del'>- *</div><div class='del'>- * NOTE:  This function is not implemented yet as I am not convinced it can</div><div class='del'>- * actually be triggered considering the sequence of commits we do in super.c::</div><div class='del'>- * ntfs_put_super().  But just in case we provide this place holder as the</div><div class='del'>- * alternative would be either to BUG() or to get a NULL pointer dereference</div><div class='del'>- * and Oops.</div><div class='del'>- */</div><div class='del'>-static int ntfs_sync_mft_mirror_umount(ntfs_volume *vol,</div><div class='del'>-		const unsigned long mft_no, MFT_RECORD *m)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(vol-&gt;mftmirr_ino);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Umount time mft mirror syncing is not "</div><div class='del'>-			"implemented yet.  %s", ntfs_please_email);</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_sync_mft_mirror - synchronize an mft record to the mft mirror</div><div class='del'>- * @vol:	ntfs volume on which the mft record to synchronize resides</div><div class='del'>- * @mft_no:	mft record number of mft record to synchronize</div><div class='del'>- * @m:		mapped, mst protected (extent) mft record to synchronize</div><div class='del'>- * @sync:	if true, wait for i/o completion</div><div class='del'>- *</div><div class='del'>- * Write the mapped, mst protected (extent) mft record @m with mft record</div><div class='del'>- * number @mft_no to the mft mirror ($MFTMirr) of the ntfs volume @vol.</div><div class='del'>- *</div><div class='del'>- * On success return 0.  On error return -errno and set the volume errors flag</div><div class='del'>- * in the ntfs volume @vol.</div><div class='del'>- *</div><div class='del'>- * NOTE:  We always perform synchronous i/o and ignore the @sync parameter.</div><div class='del'>- *</div><div class='del'>- * TODO:  If @sync is false, want to do truly asynchronous i/o, i.e. just</div><div class='del'>- * schedule i/o via -&gt;writepage or do it via kntfsd or whatever.</div><div class='del'>- */</div><div class='del'>-int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,</div><div class='del'>-		MFT_RECORD *m, int sync)</div><div class='del'>-{</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned int blocksize = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	int max_bhs = vol-&gt;mft_record_size / blocksize;</div><div class='del'>-	struct buffer_head *bhs[MAX_BHS];</div><div class='del'>-	struct buffer_head *bh, *head;</div><div class='del'>-	u8 *kmirr;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	unsigned int block_start, block_end, m_start, m_end, page_ofs;</div><div class='del'>-	int i_bhs, nr_bhs, err = 0;</div><div class='del'>-	unsigned char blocksize_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", mft_no);</div><div class='del'>-	BUG_ON(!max_bhs);</div><div class='del'>-	if (WARN_ON(max_bhs &gt; MAX_BHS))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (unlikely(!vol-&gt;mftmirr_ino)) {</div><div class='del'>-		/* This could happen during umount... */</div><div class='del'>-		err = ntfs_sync_mft_mirror_umount(vol, mft_no, m);</div><div class='del'>-		if (likely(!err))</div><div class='del'>-			return err;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Get the page containing the mirror copy of the mft record @m. */</div><div class='del'>-	page = ntfs_map_page(vol-&gt;mftmirr_ino-&gt;i_mapping, mft_no &gt;&gt;</div><div class='del'>-			(PAGE_SHIFT - vol-&gt;mft_record_size_bits));</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map mft mirror page.");</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	BUG_ON(!PageUptodate(page));</div><div class='del'>-	ClearPageUptodate(page);</div><div class='del'>-	/* Offset of the mft mirror record inside the page. */</div><div class='del'>-	page_ofs = (mft_no &lt;&lt; vol-&gt;mft_record_size_bits) &amp; ~PAGE_MASK;</div><div class='del'>-	/* The address in the page of the mirror copy of the mft record @m. */</div><div class='del'>-	kmirr = page_address(page) + page_ofs;</div><div class='del'>-	/* Copy the mst protected mft record to the mirror. */</div><div class='del'>-	memcpy(kmirr, m, vol-&gt;mft_record_size);</div><div class='del'>-	/* Create uptodate buffers if not present. */</div><div class='del'>-	if (unlikely(!page_has_buffers(page))) {</div><div class='del'>-		struct buffer_head *tail;</div><div class='del'>-</div><div class='del'>-		bh = head = alloc_page_buffers(page, blocksize, true);</div><div class='del'>-		do {</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-			tail = bh;</div><div class='del'>-			bh = bh-&gt;b_this_page;</div><div class='del'>-		} while (bh);</div><div class='del'>-		tail-&gt;b_this_page = head;</div><div class='del'>-		attach_page_private(page, head);</div><div class='del'>-	}</div><div class='del'>-	bh = head = page_buffers(page);</div><div class='del'>-	BUG_ON(!bh);</div><div class='del'>-	rl = NULL;</div><div class='del'>-	nr_bhs = 0;</div><div class='del'>-	block_start = 0;</div><div class='del'>-	m_start = kmirr - (u8*)page_address(page);</div><div class='del'>-	m_end = m_start + vol-&gt;mft_record_size;</div><div class='del'>-	do {</div><div class='del'>-		block_end = block_start + blocksize;</div><div class='del'>-		/* If the buffer is outside the mft record, skip it. */</div><div class='del'>-		if (block_end &lt;= m_start)</div><div class='del'>-			continue;</div><div class='del'>-		if (unlikely(block_start &gt;= m_end))</div><div class='del'>-			break;</div><div class='del'>-		/* Need to map the buffer if it is not mapped already. */</div><div class='del'>-		if (unlikely(!buffer_mapped(bh))) {</div><div class='del'>-			VCN vcn;</div><div class='del'>-			LCN lcn;</div><div class='del'>-			unsigned int vcn_ofs;</div><div class='del'>-</div><div class='del'>-			bh-&gt;b_bdev = vol-&gt;sb-&gt;s_bdev;</div><div class='del'>-			/* Obtain the vcn and offset of the current block. */</div><div class='del'>-			vcn = ((VCN)mft_no &lt;&lt; vol-&gt;mft_record_size_bits) +</div><div class='del'>-					(block_start - m_start);</div><div class='del'>-			vcn_ofs = vcn &amp; vol-&gt;cluster_size_mask;</div><div class='del'>-			vcn &gt;&gt;= vol-&gt;cluster_size_bits;</div><div class='del'>-			if (!rl) {</div><div class='del'>-				down_read(&amp;NTFS_I(vol-&gt;mftmirr_ino)-&gt;</div><div class='del'>-						runlist.lock);</div><div class='del'>-				rl = NTFS_I(vol-&gt;mftmirr_ino)-&gt;runlist.rl;</div><div class='del'>-				/*</div><div class='del'>-				 * $MFTMirr always has the whole of its runlist</div><div class='del'>-				 * in memory.</div><div class='del'>-				 */</div><div class='del'>-				BUG_ON(!rl);</div><div class='del'>-			}</div><div class='del'>-			/* Seek to element containing target vcn. */</div><div class='del'>-			while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= vcn)</div><div class='del'>-				rl++;</div><div class='del'>-			lcn = ntfs_rl_vcn_to_lcn(rl, vcn);</div><div class='del'>-			/* For $MFTMirr, only lcn &gt;= 0 is a successful remap. */</div><div class='del'>-			if (likely(lcn &gt;= 0)) {</div><div class='del'>-				/* Setup buffer head to correct block. */</div><div class='del'>-				bh-&gt;b_blocknr = ((lcn &lt;&lt;</div><div class='del'>-						vol-&gt;cluster_size_bits) +</div><div class='del'>-						vcn_ofs) &gt;&gt; blocksize_bits;</div><div class='del'>-				set_buffer_mapped(bh);</div><div class='del'>-			} else {</div><div class='del'>-				bh-&gt;b_blocknr = -1;</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Cannot write mft mirror "</div><div class='del'>-						"record 0x%lx because its "</div><div class='del'>-						"location on disk could not "</div><div class='del'>-						"be determined (error code "</div><div class='del'>-						"%lli).", mft_no,</div><div class='del'>-						(long long)lcn);</div><div class='del'>-				err = -EIO;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(!buffer_uptodate(bh));</div><div class='del'>-		BUG_ON(!nr_bhs &amp;&amp; (m_start != block_start));</div><div class='del'>-		BUG_ON(nr_bhs &gt;= max_bhs);</div><div class='del'>-		bhs[nr_bhs++] = bh;</div><div class='del'>-		BUG_ON((nr_bhs &gt;= max_bhs) &amp;&amp; (m_end != block_end));</div><div class='del'>-	} while (block_start = block_end, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	if (unlikely(rl))</div><div class='del'>-		up_read(&amp;NTFS_I(vol-&gt;mftmirr_ino)-&gt;runlist.lock);</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		/* Lock buffers and start synchronous write i/o on them. */</div><div class='del'>-		for (i_bhs = 0; i_bhs &lt; nr_bhs; i_bhs++) {</div><div class='del'>-			struct buffer_head *tbh = bhs[i_bhs];</div><div class='del'>-</div><div class='del'>-			if (!trylock_buffer(tbh))</div><div class='del'>-				BUG();</div><div class='del'>-			BUG_ON(!buffer_uptodate(tbh));</div><div class='del'>-			clear_buffer_dirty(tbh);</div><div class='del'>-			get_bh(tbh);</div><div class='del'>-			tbh-&gt;b_end_io = end_buffer_write_sync;</div><div class='del'>-			submit_bh(REQ_OP_WRITE, tbh);</div><div class='del'>-		}</div><div class='del'>-		/* Wait on i/o completion of buffers. */</div><div class='del'>-		for (i_bhs = 0; i_bhs &lt; nr_bhs; i_bhs++) {</div><div class='del'>-			struct buffer_head *tbh = bhs[i_bhs];</div><div class='del'>-</div><div class='del'>-			wait_on_buffer(tbh);</div><div class='del'>-			if (unlikely(!buffer_uptodate(tbh))) {</div><div class='del'>-				err = -EIO;</div><div class='del'>-				/*</div><div class='del'>-				 * Set the buffer uptodate so the page and</div><div class='del'>-				 * buffer states do not become out of sync.</div><div class='del'>-				 */</div><div class='del'>-				set_buffer_uptodate(tbh);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else /* if (unlikely(err)) */ {</div><div class='del'>-		/* Clean the buffers. */</div><div class='del'>-		for (i_bhs = 0; i_bhs &lt; nr_bhs; i_bhs++)</div><div class='del'>-			clear_buffer_dirty(bhs[i_bhs]);</div><div class='del'>-	}</div><div class='del'>-	/* Current state: all buffers are clean, unlocked, and uptodate. */</div><div class='del'>-	/* Remove the mst protection fixups again. */</div><div class='del'>-	post_write_mst_fixup((NTFS_RECORD*)kmirr);</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-	if (likely(!err)) {</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-	} else {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "I/O error while writing mft mirror "</div><div class='del'>-				"record 0x%lx!", mft_no);</div><div class='del'>-err_out:</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to synchronize $MFTMirr (error "</div><div class='del'>-				"code %i).  Volume will be left marked dirty "</div><div class='del'>-				"on umount.  Run ntfsfix on the partition "</div><div class='del'>-				"after umounting to correct this.", -err);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * write_mft_record_nolock - write out a mapped (extent) mft record</div><div class='del'>- * @ni:		ntfs inode describing the mapped (extent) mft record</div><div class='del'>- * @m:		mapped (extent) mft record to write</div><div class='del'>- * @sync:	if true, wait for i/o completion</div><div class='del'>- *</div><div class='del'>- * Write the mapped (extent) mft record @m described by the (regular or extent)</div><div class='del'>- * ntfs inode @ni to backing store.  If the mft record @m has a counterpart in</div><div class='del'>- * the mft mirror, that is also updated.</div><div class='del'>- *</div><div class='del'>- * We only write the mft record if the ntfs inode @ni is dirty and the first</div><div class='del'>- * buffer belonging to its mft record is dirty, too.  We ignore the dirty state</div><div class='del'>- * of subsequent buffers because we could have raced with</div><div class='del'>- * fs/ntfs/aops.c::mark_ntfs_record_dirty().</div><div class='del'>- *</div><div class='del'>- * On success, clean the mft record and return 0.  On error, leave the mft</div><div class='del'>- * record dirty and return -errno.</div><div class='del'>- *</div><div class='del'>- * NOTE:  We always perform synchronous i/o and ignore the @sync parameter.</div><div class='del'>- * However, if the mft record has a counterpart in the mft mirror and @sync is</div><div class='del'>- * true, we write the mft record, wait for i/o completion, and only then write</div><div class='del'>- * the mft mirror copy.  This ensures that if the system crashes either the mft</div><div class='del'>- * or the mft mirror will contain a self-consistent mft record @m.  If @sync is</div><div class='del'>- * false on the other hand, we start i/o on both and then wait for completion</div><div class='del'>- * on them.  This provides a speedup but no longer guarantees that you will end</div><div class='del'>- * up with a self-consistent mft record in the case of a crash but if you asked</div><div class='del'>- * for asynchronous writing you probably do not care about that anyway.</div><div class='del'>- *</div><div class='del'>- * TODO:  If @sync is false, want to do truly asynchronous i/o, i.e. just</div><div class='del'>- * schedule i/o via -&gt;writepage or do it via kntfsd or whatever.</div><div class='del'>- */</div><div class='del'>-int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	struct page *page = ni-&gt;page;</div><div class='del'>-	unsigned int blocksize = vol-&gt;sb-&gt;s_blocksize;</div><div class='del'>-	unsigned char blocksize_bits = vol-&gt;sb-&gt;s_blocksize_bits;</div><div class='del'>-	int max_bhs = vol-&gt;mft_record_size / blocksize;</div><div class='del'>-	struct buffer_head *bhs[MAX_BHS];</div><div class='del'>-	struct buffer_head *bh, *head;</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	unsigned int block_start, block_end, m_start, m_end;</div><div class='del'>-	int i_bhs, nr_bhs, err = 0;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", ni-&gt;mft_no);</div><div class='del'>-	BUG_ON(NInoAttr(ni));</div><div class='del'>-	BUG_ON(!max_bhs);</div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	if (WARN_ON(max_bhs &gt; MAX_BHS)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the ntfs_inode is clean no need to do anything.  If it is dirty,</div><div class='del'>-	 * mark it as clean now so that it can be redirtied later on if needed.</div><div class='del'>-	 * There is no danger of races since the caller is holding the locks</div><div class='del'>-	 * for the mft record @m and the page it is in.</div><div class='del'>-	 */</div><div class='del'>-	if (!NInoTestClearDirty(ni))</div><div class='del'>-		goto done;</div><div class='del'>-	bh = head = page_buffers(page);</div><div class='del'>-	BUG_ON(!bh);</div><div class='del'>-	rl = NULL;</div><div class='del'>-	nr_bhs = 0;</div><div class='del'>-	block_start = 0;</div><div class='del'>-	m_start = ni-&gt;page_ofs;</div><div class='del'>-	m_end = m_start + vol-&gt;mft_record_size;</div><div class='del'>-	do {</div><div class='del'>-		block_end = block_start + blocksize;</div><div class='del'>-		/* If the buffer is outside the mft record, skip it. */</div><div class='del'>-		if (block_end &lt;= m_start)</div><div class='del'>-			continue;</div><div class='del'>-		if (unlikely(block_start &gt;= m_end))</div><div class='del'>-			break;</div><div class='del'>-		/*</div><div class='del'>-		 * If this block is not the first one in the record, we ignore</div><div class='del'>-		 * the buffer's dirty state because we could have raced with a</div><div class='del'>-		 * parallel mark_ntfs_record_dirty().</div><div class='del'>-		 */</div><div class='del'>-		if (block_start == m_start) {</div><div class='del'>-			/* This block is the first one in the record. */</div><div class='del'>-			if (!buffer_dirty(bh)) {</div><div class='del'>-				BUG_ON(nr_bhs);</div><div class='del'>-				/* Clean records are not written out. */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Need to map the buffer if it is not mapped already. */</div><div class='del'>-		if (unlikely(!buffer_mapped(bh))) {</div><div class='del'>-			VCN vcn;</div><div class='del'>-			LCN lcn;</div><div class='del'>-			unsigned int vcn_ofs;</div><div class='del'>-</div><div class='del'>-			bh-&gt;b_bdev = vol-&gt;sb-&gt;s_bdev;</div><div class='del'>-			/* Obtain the vcn and offset of the current block. */</div><div class='del'>-			vcn = ((VCN)ni-&gt;mft_no &lt;&lt; vol-&gt;mft_record_size_bits) +</div><div class='del'>-					(block_start - m_start);</div><div class='del'>-			vcn_ofs = vcn &amp; vol-&gt;cluster_size_mask;</div><div class='del'>-			vcn &gt;&gt;= vol-&gt;cluster_size_bits;</div><div class='del'>-			if (!rl) {</div><div class='del'>-				down_read(&amp;NTFS_I(vol-&gt;mft_ino)-&gt;runlist.lock);</div><div class='del'>-				rl = NTFS_I(vol-&gt;mft_ino)-&gt;runlist.rl;</div><div class='del'>-				BUG_ON(!rl);</div><div class='del'>-			}</div><div class='del'>-			/* Seek to element containing target vcn. */</div><div class='del'>-			while (rl-&gt;length &amp;&amp; rl[1].vcn &lt;= vcn)</div><div class='del'>-				rl++;</div><div class='del'>-			lcn = ntfs_rl_vcn_to_lcn(rl, vcn);</div><div class='del'>-			/* For $MFT, only lcn &gt;= 0 is a successful remap. */</div><div class='del'>-			if (likely(lcn &gt;= 0)) {</div><div class='del'>-				/* Setup buffer head to correct block. */</div><div class='del'>-				bh-&gt;b_blocknr = ((lcn &lt;&lt;</div><div class='del'>-						vol-&gt;cluster_size_bits) +</div><div class='del'>-						vcn_ofs) &gt;&gt; blocksize_bits;</div><div class='del'>-				set_buffer_mapped(bh);</div><div class='del'>-			} else {</div><div class='del'>-				bh-&gt;b_blocknr = -1;</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Cannot write mft record "</div><div class='del'>-						"0x%lx because its location "</div><div class='del'>-						"on disk could not be "</div><div class='del'>-						"determined (error code %lli).",</div><div class='del'>-						ni-&gt;mft_no, (long long)lcn);</div><div class='del'>-				err = -EIO;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(!buffer_uptodate(bh));</div><div class='del'>-		BUG_ON(!nr_bhs &amp;&amp; (m_start != block_start));</div><div class='del'>-		BUG_ON(nr_bhs &gt;= max_bhs);</div><div class='del'>-		bhs[nr_bhs++] = bh;</div><div class='del'>-		BUG_ON((nr_bhs &gt;= max_bhs) &amp;&amp; (m_end != block_end));</div><div class='del'>-	} while (block_start = block_end, (bh = bh-&gt;b_this_page) != head);</div><div class='del'>-	if (unlikely(rl))</div><div class='del'>-		up_read(&amp;NTFS_I(vol-&gt;mft_ino)-&gt;runlist.lock);</div><div class='del'>-	if (!nr_bhs)</div><div class='del'>-		goto done;</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto cleanup_out;</div><div class='del'>-	/* Apply the mst protection fixups. */</div><div class='del'>-	err = pre_write_mst_fixup((NTFS_RECORD*)m, vol-&gt;mft_record_size);</div><div class='del'>-	if (err) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to apply mst fixups!");</div><div class='del'>-		goto cleanup_out;</div><div class='del'>-	}</div><div class='del'>-	flush_dcache_mft_record_page(ni);</div><div class='del'>-	/* Lock buffers and start synchronous write i/o on them. */</div><div class='del'>-	for (i_bhs = 0; i_bhs &lt; nr_bhs; i_bhs++) {</div><div class='del'>-		struct buffer_head *tbh = bhs[i_bhs];</div><div class='del'>-</div><div class='del'>-		if (!trylock_buffer(tbh))</div><div class='del'>-			BUG();</div><div class='del'>-		BUG_ON(!buffer_uptodate(tbh));</div><div class='del'>-		clear_buffer_dirty(tbh);</div><div class='del'>-		get_bh(tbh);</div><div class='del'>-		tbh-&gt;b_end_io = end_buffer_write_sync;</div><div class='del'>-		submit_bh(REQ_OP_WRITE, tbh);</div><div class='del'>-	}</div><div class='del'>-	/* Synchronize the mft mirror now if not @sync. */</div><div class='del'>-	if (!sync &amp;&amp; ni-&gt;mft_no &lt; vol-&gt;mftmirr_size)</div><div class='del'>-		ntfs_sync_mft_mirror(vol, ni-&gt;mft_no, m, sync);</div><div class='del'>-	/* Wait on i/o completion of buffers. */</div><div class='del'>-	for (i_bhs = 0; i_bhs &lt; nr_bhs; i_bhs++) {</div><div class='del'>-		struct buffer_head *tbh = bhs[i_bhs];</div><div class='del'>-</div><div class='del'>-		wait_on_buffer(tbh);</div><div class='del'>-		if (unlikely(!buffer_uptodate(tbh))) {</div><div class='del'>-			err = -EIO;</div><div class='del'>-			/*</div><div class='del'>-			 * Set the buffer uptodate so the page and buffer</div><div class='del'>-			 * states do not become out of sync.</div><div class='del'>-			 */</div><div class='del'>-			if (PageUptodate(page))</div><div class='del'>-				set_buffer_uptodate(tbh);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* If @sync, now synchronize the mft mirror. */</div><div class='del'>-	if (sync &amp;&amp; ni-&gt;mft_no &lt; vol-&gt;mftmirr_size)</div><div class='del'>-		ntfs_sync_mft_mirror(vol, ni-&gt;mft_no, m, sync);</div><div class='del'>-	/* Remove the mst protection fixups again. */</div><div class='del'>-	post_write_mst_fixup((NTFS_RECORD*)m);</div><div class='del'>-	flush_dcache_mft_record_page(ni);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		/* I/O error during writing.  This is really bad! */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "I/O error while writing mft record "</div><div class='del'>-				"0x%lx!  Marking base inode as bad.  You "</div><div class='del'>-				"should unmount the volume and run chkdsk.",</div><div class='del'>-				ni-&gt;mft_no);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-cleanup_out:</div><div class='del'>-	/* Clean the buffers. */</div><div class='del'>-	for (i_bhs = 0; i_bhs &lt; nr_bhs; i_bhs++)</div><div class='del'>-		clear_buffer_dirty(bhs[i_bhs]);</div><div class='del'>-err_out:</div><div class='del'>-	/*</div><div class='del'>-	 * Current state: all buffers are clean, unlocked, and uptodate.</div><div class='del'>-	 * The caller should mark the base inode as bad so that no more i/o</div><div class='del'>-	 * happens.  -&gt;clear_inode() will still be invoked so all extent inodes</div><div class='del'>-	 * and other allocated memory will be freed.</div><div class='del'>-	 */</div><div class='del'>-	if (err == -ENOMEM) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Not enough memory to write mft record.  "</div><div class='del'>-				"Redirtying so the write is retried later.");</div><div class='del'>-		mark_mft_record_dirty(ni);</div><div class='del'>-		err = 0;</div><div class='del'>-	} else</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_may_write_mft_record - check if an mft record may be written out</div><div class='del'>- * @vol:	[IN]  ntfs volume on which the mft record to check resides</div><div class='del'>- * @mft_no:	[IN]  mft record number of the mft record to check</div><div class='del'>- * @m:		[IN]  mapped mft record to check</div><div class='del'>- * @locked_ni:	[OUT] caller has to unlock this ntfs inode if one is returned</div><div class='del'>- *</div><div class='del'>- * Check if the mapped (base or extent) mft record @m with mft record number</div><div class='del'>- * @mft_no belonging to the ntfs volume @vol may be written out.  If necessary</div><div class='del'>- * and possible the ntfs inode of the mft record is locked and the base vfs</div><div class='del'>- * inode is pinned.  The locked ntfs inode is then returned in @locked_ni.  The</div><div class='del'>- * caller is responsible for unlocking the ntfs inode and unpinning the base</div><div class='del'>- * vfs inode.</div><div class='del'>- *</div><div class='del'>- * Return 'true' if the mft record may be written out and 'false' if not.</div><div class='del'>- *</div><div class='del'>- * The caller has locked the page and cleared the uptodate flag on it which</div><div class='del'>- * means that we can safely write out any dirty mft records that do not have</div><div class='del'>- * their inodes in icache as determined by ilookup5() as anyone</div><div class='del'>- * opening/creating such an inode would block when attempting to map the mft</div><div class='del'>- * record in read_cache_page() until we are finished with the write out.</div><div class='del'>- *</div><div class='del'>- * Here is a description of the tests we perform:</div><div class='del'>- *</div><div class='del'>- * If the inode is found in icache we know the mft record must be a base mft</div><div class='del'>- * record.  If it is dirty, we do not write it and return 'false' as the vfs</div><div class='del'>- * inode write paths will result in the access times being updated which would</div><div class='del'>- * cause the base mft record to be redirtied and written out again.  (We know</div><div class='del'>- * the access time update will modify the base mft record because Windows</div><div class='del'>- * chkdsk complains if the standard information attribute is not in the base</div><div class='del'>- * mft record.)</div><div class='del'>- *</div><div class='del'>- * If the inode is in icache and not dirty, we attempt to lock the mft record</div><div class='del'>- * and if we find the lock was already taken, it is not safe to write the mft</div><div class='del'>- * record and we return 'false'.</div><div class='del'>- *</div><div class='del'>- * If we manage to obtain the lock we have exclusive access to the mft record,</div><div class='del'>- * which also allows us safe writeout of the mft record.  We then set</div><div class='del'>- * @locked_ni to the locked ntfs inode and return 'true'.</div><div class='del'>- *</div><div class='del'>- * Note we cannot just lock the mft record and sleep while waiting for the lock</div><div class='del'>- * because this would deadlock due to lock reversal (normally the mft record is</div><div class='del'>- * locked before the page is locked but we already have the page locked here</div><div class='del'>- * when we try to lock the mft record).</div><div class='del'>- *</div><div class='del'>- * If the inode is not in icache we need to perform further checks.</div><div class='del'>- *</div><div class='del'>- * If the mft record is not a FILE record or it is a base mft record, we can</div><div class='del'>- * safely write it and return 'true'.</div><div class='del'>- *</div><div class='del'>- * We now know the mft record is an extent mft record.  We check if the inode</div><div class='del'>- * corresponding to its base mft record is in icache and obtain a reference to</div><div class='del'>- * it if it is.  If it is not, we can safely write it and return 'true'.</div><div class='del'>- *</div><div class='del'>- * We now have the base inode for the extent mft record.  We check if it has an</div><div class='del'>- * ntfs inode for the extent mft record attached and if not it is safe to write</div><div class='del'>- * the extent mft record and we return 'true'.</div><div class='del'>- *</div><div class='del'>- * The ntfs inode for the extent mft record is attached to the base inode so we</div><div class='del'>- * attempt to lock the extent mft record and if we find the lock was already</div><div class='del'>- * taken, it is not safe to write the extent mft record and we return 'false'.</div><div class='del'>- *</div><div class='del'>- * If we manage to obtain the lock we have exclusive access to the extent mft</div><div class='del'>- * record, which also allows us safe writeout of the extent mft record.  We</div><div class='del'>- * set the ntfs inode of the extent mft record clean and then set @locked_ni to</div><div class='del'>- * the now locked ntfs inode and return 'true'.</div><div class='del'>- *</div><div class='del'>- * Note, the reason for actually writing dirty mft records here and not just</div><div class='del'>- * relying on the vfs inode dirty code paths is that we can have mft records</div><div class='del'>- * modified without them ever having actual inodes in memory.  Also we can have</div><div class='del'>- * dirty mft records with clean ntfs inodes in memory.  None of the described</div><div class='del'>- * cases would result in the dirty mft records being written out if we only</div><div class='del'>- * relied on the vfs inode dirty code paths.  And these cases can really occur</div><div class='del'>- * during allocation of new mft records and in particular when the</div><div class='del'>- * initialized_size of the $MFT/$DATA attribute is extended and the new space</div><div class='del'>- * is initialized using ntfs_mft_record_format().  The clean inode can then</div><div class='del'>- * appear if the mft record is reused for a new inode before it got written</div><div class='del'>- * out.</div><div class='del'>- */</div><div class='del'>-bool ntfs_may_write_mft_record(ntfs_volume *vol, const unsigned long mft_no,</div><div class='del'>-		const MFT_RECORD *m, ntfs_inode **locked_ni)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	struct inode *mft_vi = vol-&gt;mft_ino;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	ntfs_inode *ni, *eni, **extent_nis;</div><div class='del'>-	int i;</div><div class='del'>-	ntfs_attr na;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", mft_no);</div><div class='del'>-	/*</div><div class='del'>-	 * Normally we do not return a locked inode so set @locked_ni to NULL.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(!locked_ni);</div><div class='del'>-	*locked_ni = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the inode corresponding to this mft record is in the VFS</div><div class='del'>-	 * inode cache and obtain a reference to it if it is.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_debug("Looking for inode 0x%lx in icache.", mft_no);</div><div class='del'>-	na.mft_no = mft_no;</div><div class='del'>-	na.name = NULL;</div><div class='del'>-	na.name_len = 0;</div><div class='del'>-	na.type = AT_UNUSED;</div><div class='del'>-	/*</div><div class='del'>-	 * Optimize inode 0, i.e. $MFT itself, since we have it in memory and</div><div class='del'>-	 * we get here for it rather often.</div><div class='del'>-	 */</div><div class='del'>-	if (!mft_no) {</div><div class='del'>-		/* Balance the below iput(). */</div><div class='del'>-		vi = igrab(mft_vi);</div><div class='del'>-		BUG_ON(vi != mft_vi);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Have to use ilookup5_nowait() since ilookup5() waits for the</div><div class='del'>-		 * inode lock which causes ntfs to deadlock when a concurrent</div><div class='del'>-		 * inode write via the inode dirty code paths and the page</div><div class='del'>-		 * dirty code path of the inode dirty code path when writing</div><div class='del'>-		 * $MFT occurs.</div><div class='del'>-		 */</div><div class='del'>-		vi = ilookup5_nowait(sb, mft_no, ntfs_test_inode, &amp;na);</div><div class='del'>-	}</div><div class='del'>-	if (vi) {</div><div class='del'>-		ntfs_debug("Base inode 0x%lx is in icache.", mft_no);</div><div class='del'>-		/* The inode is in icache. */</div><div class='del'>-		ni = NTFS_I(vi);</div><div class='del'>-		/* Take a reference to the ntfs inode. */</div><div class='del'>-		atomic_inc(&amp;ni-&gt;count);</div><div class='del'>-		/* If the inode is dirty, do not write this record. */</div><div class='del'>-		if (NInoDirty(ni)) {</div><div class='del'>-			ntfs_debug("Inode 0x%lx is dirty, do not write it.",</div><div class='del'>-					mft_no);</div><div class='del'>-			atomic_dec(&amp;ni-&gt;count);</div><div class='del'>-			iput(vi);</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-		ntfs_debug("Inode 0x%lx is not dirty.", mft_no);</div><div class='del'>-		/* The inode is not dirty, try to take the mft record lock. */</div><div class='del'>-		if (unlikely(!mutex_trylock(&amp;ni-&gt;mrec_lock))) {</div><div class='del'>-			ntfs_debug("Mft record 0x%lx is already locked, do "</div><div class='del'>-					"not write it.", mft_no);</div><div class='del'>-			atomic_dec(&amp;ni-&gt;count);</div><div class='del'>-			iput(vi);</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-		ntfs_debug("Managed to lock mft record 0x%lx, write it.",</div><div class='del'>-				mft_no);</div><div class='del'>-		/*</div><div class='del'>-		 * The write has to occur while we hold the mft record lock so</div><div class='del'>-		 * return the locked ntfs inode.</div><div class='del'>-		 */</div><div class='del'>-		*locked_ni = ni;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Inode 0x%lx is not in icache.", mft_no);</div><div class='del'>-	/* The inode is not in icache. */</div><div class='del'>-	/* Write the record if it is not a mft record (type "FILE"). */</div><div class='del'>-	if (!ntfs_is_mft_record(m-&gt;magic)) {</div><div class='del'>-		ntfs_debug("Mft record 0x%lx is not a FILE record, write it.",</div><div class='del'>-				mft_no);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	/* Write the mft record if it is a base inode. */</div><div class='del'>-	if (!m-&gt;base_mft_record) {</div><div class='del'>-		ntfs_debug("Mft record 0x%lx is a base record, write it.",</div><div class='del'>-				mft_no);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * This is an extent mft record.  Check if the inode corresponding to</div><div class='del'>-	 * its base mft record is in icache and obtain a reference to it if it</div><div class='del'>-	 * is.</div><div class='del'>-	 */</div><div class='del'>-	na.mft_no = MREF_LE(m-&gt;base_mft_record);</div><div class='del'>-	ntfs_debug("Mft record 0x%lx is an extent record.  Looking for base "</div><div class='del'>-			"inode 0x%lx in icache.", mft_no, na.mft_no);</div><div class='del'>-	if (!na.mft_no) {</div><div class='del'>-		/* Balance the below iput(). */</div><div class='del'>-		vi = igrab(mft_vi);</div><div class='del'>-		BUG_ON(vi != mft_vi);</div><div class='del'>-	} else</div><div class='del'>-		vi = ilookup5_nowait(sb, na.mft_no, ntfs_test_inode,</div><div class='del'>-				&amp;na);</div><div class='del'>-	if (!vi) {</div><div class='del'>-		/*</div><div class='del'>-		 * The base inode is not in icache, write this extent mft</div><div class='del'>-		 * record.</div><div class='del'>-		 */</div><div class='del'>-		ntfs_debug("Base inode 0x%lx is not in icache, write the "</div><div class='del'>-				"extent record.", na.mft_no);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Base inode 0x%lx is in icache.", na.mft_no);</div><div class='del'>-	/*</div><div class='del'>-	 * The base inode is in icache.  Check if it has the extent inode</div><div class='del'>-	 * corresponding to this extent mft record attached.</div><div class='del'>-	 */</div><div class='del'>-	ni = NTFS_I(vi);</div><div class='del'>-	mutex_lock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	if (ni-&gt;nr_extents &lt;= 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * The base inode has no attached extent inodes, write this</div><div class='del'>-		 * extent mft record.</div><div class='del'>-		 */</div><div class='del'>-		mutex_unlock(&amp;ni-&gt;extent_lock);</div><div class='del'>-		iput(vi);</div><div class='del'>-		ntfs_debug("Base inode 0x%lx has no attached extent inodes, "</div><div class='del'>-				"write the extent record.", na.mft_no);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	/* Iterate over the attached extent inodes. */</div><div class='del'>-	extent_nis = ni-&gt;ext.extent_ntfs_inos;</div><div class='del'>-	for (eni = NULL, i = 0; i &lt; ni-&gt;nr_extents; ++i) {</div><div class='del'>-		if (mft_no == extent_nis[i]-&gt;mft_no) {</div><div class='del'>-			/*</div><div class='del'>-			 * Found the extent inode corresponding to this extent</div><div class='del'>-			 * mft record.</div><div class='del'>-			 */</div><div class='del'>-			eni = extent_nis[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the extent inode was not attached to the base inode, write this</div><div class='del'>-	 * extent mft record.</div><div class='del'>-	 */</div><div class='del'>-	if (!eni) {</div><div class='del'>-		mutex_unlock(&amp;ni-&gt;extent_lock);</div><div class='del'>-		iput(vi);</div><div class='del'>-		ntfs_debug("Extent inode 0x%lx is not attached to its base "</div><div class='del'>-				"inode 0x%lx, write the extent record.",</div><div class='del'>-				mft_no, na.mft_no);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Extent inode 0x%lx is attached to its base inode 0x%lx.",</div><div class='del'>-			mft_no, na.mft_no);</div><div class='del'>-	/* Take a reference to the extent ntfs inode. */</div><div class='del'>-	atomic_inc(&amp;eni-&gt;count);</div><div class='del'>-	mutex_unlock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Found the extent inode coresponding to this extent mft record.</div><div class='del'>-	 * Try to take the mft record lock.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!mutex_trylock(&amp;eni-&gt;mrec_lock))) {</div><div class='del'>-		atomic_dec(&amp;eni-&gt;count);</div><div class='del'>-		iput(vi);</div><div class='del'>-		ntfs_debug("Extent mft record 0x%lx is already locked, do "</div><div class='del'>-				"not write it.", mft_no);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Managed to lock extent mft record 0x%lx, write it.",</div><div class='del'>-			mft_no);</div><div class='del'>-	if (NInoTestClearDirty(eni))</div><div class='del'>-		ntfs_debug("Extent inode 0x%lx is dirty, marking it clean.",</div><div class='del'>-				mft_no);</div><div class='del'>-	/*</div><div class='del'>-	 * The write has to occur while we hold the mft record lock so return</div><div class='del'>-	 * the locked extent ntfs inode.</div><div class='del'>-	 */</div><div class='del'>-	*locked_ni = eni;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *es = "  Leaving inconsistent metadata.  Unmount and run "</div><div class='del'>-		"chkdsk.";</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_bitmap_find_and_alloc_free_rec_nolock - see name</div><div class='del'>- * @vol:	volume on which to search for a free mft record</div><div class='del'>- * @base_ni:	open base inode if allocating an extent mft record or NULL</div><div class='del'>- *</div><div class='del'>- * Search for a free mft record in the mft bitmap attribute on the ntfs volume</div><div class='del'>- * @vol.</div><div class='del'>- *</div><div class='del'>- * If @base_ni is NULL start the search at the default allocator position.</div><div class='del'>- *</div><div class='del'>- * If @base_ni is not NULL start the search at the mft record after the base</div><div class='del'>- * mft record @base_ni.</div><div class='del'>- *</div><div class='del'>- * Return the free mft record on success and -errno on error.  An error code of</div><div class='del'>- * -ENOSPC means that there are no free mft records in the currently</div><div class='del'>- * initialized mft bitmap.</div><div class='del'>- *</div><div class='del'>- * Locking: Caller must hold vol-&gt;mftbmp_lock for writing.</div><div class='del'>- */</div><div class='del'>-static int ntfs_mft_bitmap_find_and_alloc_free_rec_nolock(ntfs_volume *vol,</div><div class='del'>-		ntfs_inode *base_ni)</div><div class='del'>-{</div><div class='del'>-	s64 pass_end, ll, data_pos, pass_start, ofs, bit;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct address_space *mftbmp_mapping;</div><div class='del'>-	u8 *buf, *byte;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned int page_ofs, size;</div><div class='del'>-	u8 pass, b;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Searching for free mft record in the currently "</div><div class='del'>-			"initialized mft bitmap.");</div><div class='del'>-	mftbmp_mapping = vol-&gt;mftbmp_ino-&gt;i_mapping;</div><div class='del'>-	/*</div><div class='del'>-	 * Set the end of the pass making sure we do not overflow the mft</div><div class='del'>-	 * bitmap.</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;NTFS_I(vol-&gt;mft_ino)-&gt;size_lock, flags);</div><div class='del'>-	pass_end = NTFS_I(vol-&gt;mft_ino)-&gt;allocated_size &gt;&gt;</div><div class='del'>-			vol-&gt;mft_record_size_bits;</div><div class='del'>-	read_unlock_irqrestore(&amp;NTFS_I(vol-&gt;mft_ino)-&gt;size_lock, flags);</div><div class='del'>-	read_lock_irqsave(&amp;NTFS_I(vol-&gt;mftbmp_ino)-&gt;size_lock, flags);</div><div class='del'>-	ll = NTFS_I(vol-&gt;mftbmp_ino)-&gt;initialized_size &lt;&lt; 3;</div><div class='del'>-	read_unlock_irqrestore(&amp;NTFS_I(vol-&gt;mftbmp_ino)-&gt;size_lock, flags);</div><div class='del'>-	if (pass_end &gt; ll)</div><div class='del'>-		pass_end = ll;</div><div class='del'>-	pass = 1;</div><div class='del'>-	if (!base_ni)</div><div class='del'>-		data_pos = vol-&gt;mft_data_pos;</div><div class='del'>-	else</div><div class='del'>-		data_pos = base_ni-&gt;mft_no + 1;</div><div class='del'>-	if (data_pos &lt; 24)</div><div class='del'>-		data_pos = 24;</div><div class='del'>-	if (data_pos &gt;= pass_end) {</div><div class='del'>-		data_pos = 24;</div><div class='del'>-		pass = 2;</div><div class='del'>-		/* This happens on a freshly formatted volume. */</div><div class='del'>-		if (data_pos &gt;= pass_end)</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-	pass_start = data_pos;</div><div class='del'>-	ntfs_debug("Starting bitmap search: pass %u, pass_start 0x%llx, "</div><div class='del'>-			"pass_end 0x%llx, data_pos 0x%llx.", pass,</div><div class='del'>-			(long long)pass_start, (long long)pass_end,</div><div class='del'>-			(long long)data_pos);</div><div class='del'>-	/* Loop until a free mft record is found. */</div><div class='del'>-	for (; pass &lt;= 2;) {</div><div class='del'>-		/* Cap size to pass_end. */</div><div class='del'>-		ofs = data_pos &gt;&gt; 3;</div><div class='del'>-		page_ofs = ofs &amp; ~PAGE_MASK;</div><div class='del'>-		size = PAGE_SIZE - page_ofs;</div><div class='del'>-		ll = ((pass_end + 7) &gt;&gt; 3) - ofs;</div><div class='del'>-		if (size &gt; ll)</div><div class='del'>-			size = ll;</div><div class='del'>-		size &lt;&lt;= 3;</div><div class='del'>-		/*</div><div class='del'>-		 * If we are still within the active pass, search the next page</div><div class='del'>-		 * for a zero bit.</div><div class='del'>-		 */</div><div class='del'>-		if (size) {</div><div class='del'>-			page = ntfs_map_page(mftbmp_mapping,</div><div class='del'>-					ofs &gt;&gt; PAGE_SHIFT);</div><div class='del'>-			if (IS_ERR(page)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to read mft "</div><div class='del'>-						"bitmap, aborting.");</div><div class='del'>-				return PTR_ERR(page);</div><div class='del'>-			}</div><div class='del'>-			buf = (u8*)page_address(page) + page_ofs;</div><div class='del'>-			bit = data_pos &amp; 7;</div><div class='del'>-			data_pos &amp;= ~7ull;</div><div class='del'>-			ntfs_debug("Before inner for loop: size 0x%x, "</div><div class='del'>-					"data_pos 0x%llx, bit 0x%llx", size,</div><div class='del'>-					(long long)data_pos, (long long)bit);</div><div class='del'>-			for (; bit &lt; size &amp;&amp; data_pos + bit &lt; pass_end;</div><div class='del'>-					bit &amp;= ~7ull, bit += 8) {</div><div class='del'>-				byte = buf + (bit &gt;&gt; 3);</div><div class='del'>-				if (*byte == 0xff)</div><div class='del'>-					continue;</div><div class='del'>-				b = ffz((unsigned long)*byte);</div><div class='del'>-				if (b &lt; 8 &amp;&amp; b &gt;= (bit &amp; 7)) {</div><div class='del'>-					ll = data_pos + (bit &amp; ~7ull) + b;</div><div class='del'>-					if (unlikely(ll &gt; (1ll &lt;&lt; 32))) {</div><div class='del'>-						ntfs_unmap_page(page);</div><div class='del'>-						return -ENOSPC;</div><div class='del'>-					}</div><div class='del'>-					*byte |= 1 &lt;&lt; b;</div><div class='del'>-					flush_dcache_page(page);</div><div class='del'>-					set_page_dirty(page);</div><div class='del'>-					ntfs_unmap_page(page);</div><div class='del'>-					ntfs_debug("Done.  (Found and "</div><div class='del'>-							"allocated mft record "</div><div class='del'>-							"0x%llx.)",</div><div class='del'>-							(long long)ll);</div><div class='del'>-					return ll;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			ntfs_debug("After inner for loop: size 0x%x, "</div><div class='del'>-					"data_pos 0x%llx, bit 0x%llx", size,</div><div class='del'>-					(long long)data_pos, (long long)bit);</div><div class='del'>-			data_pos += size;</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			/*</div><div class='del'>-			 * If the end of the pass has not been reached yet,</div><div class='del'>-			 * continue searching the mft bitmap for a zero bit.</div><div class='del'>-			 */</div><div class='del'>-			if (data_pos &lt; pass_end)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-		/* Do the next pass. */</div><div class='del'>-		if (++pass == 2) {</div><div class='del'>-			/*</div><div class='del'>-			 * Starting the second pass, in which we scan the first</div><div class='del'>-			 * part of the zone which we omitted earlier.</div><div class='del'>-			 */</div><div class='del'>-			pass_end = pass_start;</div><div class='del'>-			data_pos = pass_start = 24;</div><div class='del'>-			ntfs_debug("pass %i, pass_start 0x%llx, pass_end "</div><div class='del'>-					"0x%llx.", pass, (long long)pass_start,</div><div class='del'>-					(long long)pass_end);</div><div class='del'>-			if (data_pos &gt;= pass_end)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* No free mft records in currently initialized mft bitmap. */</div><div class='del'>-	ntfs_debug("Done.  (No free mft records left in currently initialized "</div><div class='del'>-			"mft bitmap.)");</div><div class='del'>-	return -ENOSPC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_bitmap_extend_allocation_nolock - extend mft bitmap by a cluster</div><div class='del'>- * @vol:	volume on which to extend the mft bitmap attribute</div><div class='del'>- *</div><div class='del'>- * Extend the mft bitmap attribute on the ntfs volume @vol by one cluster.</div><div class='del'>- *</div><div class='del'>- * Note: Only changes allocated_size, i.e. does not touch initialized_size or</div><div class='del'>- * data_size.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Locking: - Caller must hold vol-&gt;mftbmp_lock for writing.</div><div class='del'>- *	    - This function takes NTFS_I(vol-&gt;mftbmp_ino)-&gt;runlist.lock for</div><div class='del'>- *	      writing and releases it before returning.</div><div class='del'>- *	    - This function takes vol-&gt;lcnbmp_lock for writing and releases it</div><div class='del'>- *	      before returning.</div><div class='del'>- */</div><div class='del'>-static int ntfs_mft_bitmap_extend_allocation_nolock(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	LCN lcn;</div><div class='del'>-	s64 ll;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct page *page;</div><div class='del'>-	ntfs_inode *mft_ni, *mftbmp_ni;</div><div class='del'>-	runlist_element *rl, *rl2 = NULL;</div><div class='del'>-	ntfs_attr_search_ctx *ctx = NULL;</div><div class='del'>-	MFT_RECORD *mrec;</div><div class='del'>-	ATTR_RECORD *a = NULL;</div><div class='del'>-	int ret, mp_size;</div><div class='del'>-	u32 old_alen = 0;</div><div class='del'>-	u8 *b, tb;</div><div class='del'>-	struct {</div><div class='del'>-		u8 added_cluster:1;</div><div class='del'>-		u8 added_run:1;</div><div class='del'>-		u8 mp_rebuilt:1;</div><div class='del'>-	} status = { 0, 0, 0 };</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Extending mft bitmap allocation.");</div><div class='del'>-	mft_ni = NTFS_I(vol-&gt;mft_ino);</div><div class='del'>-	mftbmp_ni = NTFS_I(vol-&gt;mftbmp_ino);</div><div class='del'>-	/*</div><div class='del'>-	 * Determine the last lcn of the mft bitmap.  The allocated size of the</div><div class='del'>-	 * mft bitmap cannot be zero so we are ok to do this.</div><div class='del'>-	 */</div><div class='del'>-	down_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-	read_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	ll = mftbmp_ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	rl = ntfs_attr_find_vcn_nolock(mftbmp_ni,</div><div class='del'>-			(ll - 1) &gt;&gt; vol-&gt;cluster_size_bits, NULL);</div><div class='del'>-	if (IS_ERR(rl) || unlikely(!rl-&gt;length || rl-&gt;lcn &lt; 0)) {</div><div class='del'>-		up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to determine last allocated "</div><div class='del'>-				"cluster of mft bitmap attribute.");</div><div class='del'>-		if (!IS_ERR(rl))</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		else</div><div class='del'>-			ret = PTR_ERR(rl);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	lcn = rl-&gt;lcn + rl-&gt;length;</div><div class='del'>-	ntfs_debug("Last lcn of mft bitmap attribute is 0x%llx.",</div><div class='del'>-			(long long)lcn);</div><div class='del'>-	/*</div><div class='del'>-	 * Attempt to get the cluster following the last allocated cluster by</div><div class='del'>-	 * hand as it may be in the MFT zone so the allocator would not give it</div><div class='del'>-	 * to us.</div><div class='del'>-	 */</div><div class='del'>-	ll = lcn &gt;&gt; 3;</div><div class='del'>-	page = ntfs_map_page(vol-&gt;lcnbmp_ino-&gt;i_mapping,</div><div class='del'>-			ll &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to read from lcn bitmap.");</div><div class='del'>-		return PTR_ERR(page);</div><div class='del'>-	}</div><div class='del'>-	b = (u8*)page_address(page) + (ll &amp; ~PAGE_MASK);</div><div class='del'>-	tb = 1 &lt;&lt; (lcn &amp; 7ull);</div><div class='del'>-	down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	if (*b != 0xff &amp;&amp; !(*b &amp; tb)) {</div><div class='del'>-		/* Next cluster is free, allocate it. */</div><div class='del'>-		*b |= tb;</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		/* Update the mft bitmap runlist. */</div><div class='del'>-		rl-&gt;length++;</div><div class='del'>-		rl[1].vcn++;</div><div class='del'>-		status.added_cluster = 1;</div><div class='del'>-		ntfs_debug("Appending one cluster to mft bitmap.");</div><div class='del'>-	} else {</div><div class='del'>-		up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		/* Allocate a cluster from the DATA_ZONE. */</div><div class='del'>-		rl2 = ntfs_cluster_alloc(vol, rl[1].vcn, 1, lcn, DATA_ZONE,</div><div class='del'>-				true);</div><div class='del'>-		if (IS_ERR(rl2)) {</div><div class='del'>-			up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to allocate a cluster for "</div><div class='del'>-					"the mft bitmap.");</div><div class='del'>-			return PTR_ERR(rl2);</div><div class='del'>-		}</div><div class='del'>-		rl = ntfs_runlists_merge(mftbmp_ni-&gt;runlist.rl, rl2);</div><div class='del'>-		if (IS_ERR(rl)) {</div><div class='del'>-			up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to merge runlists for mft "</div><div class='del'>-					"bitmap.");</div><div class='del'>-			if (ntfs_cluster_free_from_rl(vol, rl2)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to deallocate "</div><div class='del'>-						"allocated cluster.%s", es);</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			ntfs_free(rl2);</div><div class='del'>-			return PTR_ERR(rl);</div><div class='del'>-		}</div><div class='del'>-		mftbmp_ni-&gt;runlist.rl = rl;</div><div class='del'>-		status.added_run = 1;</div><div class='del'>-		ntfs_debug("Adding one run to mft bitmap.");</div><div class='del'>-		/* Find the last run in the new runlist. */</div><div class='del'>-		for (; rl[1].length; rl++)</div><div class='del'>-			;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Update the attribute record as well.  Note: @rl is the last</div><div class='del'>-	 * (non-terminator) runlist element of mft bitmap.</div><div class='del'>-	 */</div><div class='del'>-	mrec = map_mft_record(mft_ni);</div><div class='del'>-	if (IS_ERR(mrec)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map mft record.");</div><div class='del'>-		ret = PTR_ERR(mrec);</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(mft_ni, mrec);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to get search context.");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	ret = ntfs_attr_lookup(mftbmp_ni-&gt;type, mftbmp_ni-&gt;name,</div><div class='del'>-			mftbmp_ni-&gt;name_len, CASE_SENSITIVE, rl[1].vcn, NULL,</div><div class='del'>-			0, ctx);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find last attribute extent of "</div><div class='del'>-				"mft bitmap attribute.");</div><div class='del'>-		if (ret == -ENOENT)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	ll = sle64_to_cpu(a-&gt;data.non_resident.lowest_vcn);</div><div class='del'>-	/* Search back for the previous last allocated cluster of mft bitmap. */</div><div class='del'>-	for (rl2 = rl; rl2 &gt; mftbmp_ni-&gt;runlist.rl; rl2--) {</div><div class='del'>-		if (ll &gt;= rl2-&gt;vcn)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(ll &lt; rl2-&gt;vcn);</div><div class='del'>-	BUG_ON(ll &gt;= rl2-&gt;vcn + rl2-&gt;length);</div><div class='del'>-	/* Get the size for the new mapping pairs array for this extent. */</div><div class='del'>-	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl2, ll, -1);</div><div class='del'>-	if (unlikely(mp_size &lt;= 0)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Get size for mapping pairs failed for "</div><div class='del'>-				"mft bitmap attribute extent.");</div><div class='del'>-		ret = mp_size;</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	/* Expand the attribute record if necessary. */</div><div class='del'>-	old_alen = le32_to_cpu(a-&gt;length);</div><div class='del'>-	ret = ntfs_attr_record_resize(ctx-&gt;mrec, a, mp_size +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset));</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		if (ret != -ENOSPC) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to resize attribute "</div><div class='del'>-					"record for mft bitmap attribute.");</div><div class='del'>-			goto undo_alloc;</div><div class='del'>-		}</div><div class='del'>-		// TODO: Deal with this by moving this extent to a new mft</div><div class='del'>-		// record or by starting a new extent in a new mft record or by</div><div class='del'>-		// moving other attributes out of this mft record.</div><div class='del'>-		// Note: It will need to be a special mft record and if none of</div><div class='del'>-		// those are available it gets rather complicated...</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Not enough space in this mft record to "</div><div class='del'>-				"accommodate extended mft bitmap attribute "</div><div class='del'>-				"extent.  Cannot handle this yet.");</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	status.mp_rebuilt = 1;</div><div class='del'>-	/* Generate the mapping pairs array directly into the attr record. */</div><div class='del'>-	ret = ntfs_mapping_pairs_build(vol, (u8*)a +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-			mp_size, rl2, ll, -1, NULL);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to build mapping pairs array for "</div><div class='del'>-				"mft bitmap attribute.");</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	/* Update the highest_vcn. */</div><div class='del'>-	a-&gt;data.non_resident.highest_vcn = cpu_to_sle64(rl[1].vcn - 1);</div><div class='del'>-	/*</div><div class='del'>-	 * We now have extended the mft bitmap allocated_size by one cluster.</div><div class='del'>-	 * Reflect this in the ntfs_inode structure and the attribute record.</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-		/*</div><div class='del'>-		 * We are not in the first attribute extent, switch to it, but</div><div class='del'>-		 * first ensure the changes will make it to disk later.</div><div class='del'>-		 */</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		ret = ntfs_attr_lookup(mftbmp_ni-&gt;type, mftbmp_ni-&gt;name,</div><div class='del'>-				mftbmp_ni-&gt;name_len, CASE_SENSITIVE, 0, NULL,</div><div class='del'>-				0, ctx);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to find first attribute "</div><div class='del'>-					"extent of mft bitmap attribute.");</div><div class='del'>-			goto restore_undo_alloc;</div><div class='del'>-		}</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-	}</div><div class='del'>-	write_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	mftbmp_ni-&gt;allocated_size += vol-&gt;cluster_size;</div><div class='del'>-	a-&gt;data.non_resident.allocated_size =</div><div class='del'>-			cpu_to_sle64(mftbmp_ni-&gt;allocated_size);</div><div class='del'>-	write_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	/* Ensure the changes make it to disk. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(mft_ni);</div><div class='del'>-	up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-restore_undo_alloc:</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-	if (ntfs_attr_lookup(mftbmp_ni-&gt;type, mftbmp_ni-&gt;name,</div><div class='del'>-			mftbmp_ni-&gt;name_len, CASE_SENSITIVE, rl[1].vcn, NULL,</div><div class='del'>-			0, ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find last attribute extent of "</div><div class='del'>-				"mft bitmap attribute.%s", es);</div><div class='del'>-		write_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-		mftbmp_ni-&gt;allocated_size += vol-&gt;cluster_size;</div><div class='del'>-		write_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-		up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-		/*</div><div class='del'>-		 * The only thing that is now wrong is -&gt;allocated_size of the</div><div class='del'>-		 * base attribute extent which chkdsk should be able to fix.</div><div class='del'>-		 */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	a-&gt;data.non_resident.highest_vcn = cpu_to_sle64(rl[1].vcn - 2);</div><div class='del'>-undo_alloc:</div><div class='del'>-	if (status.added_cluster) {</div><div class='del'>-		/* Truncate the last run in the runlist by one cluster. */</div><div class='del'>-		rl-&gt;length--;</div><div class='del'>-		rl[1].vcn--;</div><div class='del'>-	} else if (status.added_run) {</div><div class='del'>-		lcn = rl-&gt;lcn;</div><div class='del'>-		/* Remove the last run from the runlist. */</div><div class='del'>-		rl-&gt;lcn = rl[1].lcn;</div><div class='del'>-		rl-&gt;length = 0;</div><div class='del'>-	}</div><div class='del'>-	/* Deallocate the cluster. */</div><div class='del'>-	down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	if (ntfs_bitmap_clear_bit(vol-&gt;lcnbmp_ino, lcn)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to free allocated cluster.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	if (status.mp_rebuilt) {</div><div class='del'>-		if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-				old_alen - le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-				rl2, ll, -1, NULL)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to restore mapping pairs "</div><div class='del'>-					"array.%s", es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		if (ntfs_attr_record_resize(ctx-&gt;mrec, a, old_alen)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to restore attribute "</div><div class='del'>-					"record.%s", es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	}</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (!IS_ERR(mrec))</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-	up_write(&amp;mftbmp_ni-&gt;runlist.lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_bitmap_extend_initialized_nolock - extend mftbmp initialized data</div><div class='del'>- * @vol:	volume on which to extend the mft bitmap attribute</div><div class='del'>- *</div><div class='del'>- * Extend the initialized portion of the mft bitmap attribute on the ntfs</div><div class='del'>- * volume @vol by 8 bytes.</div><div class='del'>- *</div><div class='del'>- * Note:  Only changes initialized_size and data_size, i.e. requires that</div><div class='del'>- * allocated_size is big enough to fit the new initialized_size.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -error on error.</div><div class='del'>- *</div><div class='del'>- * Locking: Caller must hold vol-&gt;mftbmp_lock for writing.</div><div class='del'>- */</div><div class='del'>-static int ntfs_mft_bitmap_extend_initialized_nolock(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	s64 old_data_size, old_initialized_size;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct inode *mftbmp_vi;</div><div class='del'>-	ntfs_inode *mft_ni, *mftbmp_ni;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *mrec;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Extending mft bitmap initiailized (and data) size.");</div><div class='del'>-	mft_ni = NTFS_I(vol-&gt;mft_ino);</div><div class='del'>-	mftbmp_vi = vol-&gt;mftbmp_ino;</div><div class='del'>-	mftbmp_ni = NTFS_I(mftbmp_vi);</div><div class='del'>-	/* Get the attribute record. */</div><div class='del'>-	mrec = map_mft_record(mft_ni);</div><div class='del'>-	if (IS_ERR(mrec)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map mft record.");</div><div class='del'>-		return PTR_ERR(mrec);</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(mft_ni, mrec);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to get search context.");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	ret = ntfs_attr_lookup(mftbmp_ni-&gt;type, mftbmp_ni-&gt;name,</div><div class='del'>-			mftbmp_ni-&gt;name_len, CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find first attribute extent of "</div><div class='del'>-				"mft bitmap attribute.");</div><div class='del'>-		if (ret == -ENOENT)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		goto put_err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	write_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	old_data_size = i_size_read(mftbmp_vi);</div><div class='del'>-	old_initialized_size = mftbmp_ni-&gt;initialized_size;</div><div class='del'>-	/*</div><div class='del'>-	 * We can simply update the initialized_size before filling the space</div><div class='del'>-	 * with zeroes because the caller is holding the mft bitmap lock for</div><div class='del'>-	 * writing which ensures that no one else is trying to access the data.</div><div class='del'>-	 */</div><div class='del'>-	mftbmp_ni-&gt;initialized_size += 8;</div><div class='del'>-	a-&gt;data.non_resident.initialized_size =</div><div class='del'>-			cpu_to_sle64(mftbmp_ni-&gt;initialized_size);</div><div class='del'>-	if (mftbmp_ni-&gt;initialized_size &gt; old_data_size) {</div><div class='del'>-		i_size_write(mftbmp_vi, mftbmp_ni-&gt;initialized_size);</div><div class='del'>-		a-&gt;data.non_resident.data_size =</div><div class='del'>-				cpu_to_sle64(mftbmp_ni-&gt;initialized_size);</div><div class='del'>-	}</div><div class='del'>-	write_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	/* Ensure the changes make it to disk. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(mft_ni);</div><div class='del'>-	/* Initialize the mft bitmap attribute value with zeroes. */</div><div class='del'>-	ret = ntfs_attr_set(mftbmp_ni, old_initialized_size, 8, 0);</div><div class='del'>-	if (likely(!ret)) {</div><div class='del'>-		ntfs_debug("Done.  (Wrote eight initialized bytes to mft "</div><div class='del'>-				"bitmap.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed to write to mft bitmap.");</div><div class='del'>-	/* Try to recover from the error. */</div><div class='del'>-	mrec = map_mft_record(mft_ni);</div><div class='del'>-	if (IS_ERR(mrec)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map mft record.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(mft_ni, mrec);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to get search context.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-		goto unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	if (ntfs_attr_lookup(mftbmp_ni-&gt;type, mftbmp_ni-&gt;name,</div><div class='del'>-			mftbmp_ni-&gt;name_len, CASE_SENSITIVE, 0, NULL, 0, ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find first attribute extent of "</div><div class='del'>-				"mft bitmap attribute.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-put_err_out:</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-unm_err_out:</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	write_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	mftbmp_ni-&gt;initialized_size = old_initialized_size;</div><div class='del'>-	a-&gt;data.non_resident.initialized_size =</div><div class='del'>-			cpu_to_sle64(old_initialized_size);</div><div class='del'>-	if (i_size_read(mftbmp_vi) != old_data_size) {</div><div class='del'>-		i_size_write(mftbmp_vi, old_data_size);</div><div class='del'>-		a-&gt;data.non_resident.data_size = cpu_to_sle64(old_data_size);</div><div class='del'>-	}</div><div class='del'>-	write_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(mft_ni);</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	read_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	ntfs_debug("Restored status of mftbmp: allocated_size 0x%llx, "</div><div class='del'>-			"data_size 0x%llx, initialized_size 0x%llx.",</div><div class='del'>-			(long long)mftbmp_ni-&gt;allocated_size,</div><div class='del'>-			(long long)i_size_read(mftbmp_vi),</div><div class='del'>-			(long long)mftbmp_ni-&gt;initialized_size);</div><div class='del'>-	read_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-#endif /* DEBUG */</div><div class='del'>-err_out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_data_extend_allocation_nolock - extend mft data attribute</div><div class='del'>- * @vol:	volume on which to extend the mft data attribute</div><div class='del'>- *</div><div class='del'>- * Extend the mft data attribute on the ntfs volume @vol by 16 mft records</div><div class='del'>- * worth of clusters or if not enough space for this by one mft record worth</div><div class='del'>- * of clusters.</div><div class='del'>- *</div><div class='del'>- * Note:  Only changes allocated_size, i.e. does not touch initialized_size or</div><div class='del'>- * data_size.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Locking: - Caller must hold vol-&gt;mftbmp_lock for writing.</div><div class='del'>- *	    - This function takes NTFS_I(vol-&gt;mft_ino)-&gt;runlist.lock for</div><div class='del'>- *	      writing and releases it before returning.</div><div class='del'>- *	    - This function calls functions which take vol-&gt;lcnbmp_lock for</div><div class='del'>- *	      writing and release it before returning.</div><div class='del'>- */</div><div class='del'>-static int ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	LCN lcn;</div><div class='del'>-	VCN old_last_vcn;</div><div class='del'>-	s64 min_nr, nr, ll;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	ntfs_inode *mft_ni;</div><div class='del'>-	runlist_element *rl, *rl2;</div><div class='del'>-	ntfs_attr_search_ctx *ctx = NULL;</div><div class='del'>-	MFT_RECORD *mrec;</div><div class='del'>-	ATTR_RECORD *a = NULL;</div><div class='del'>-	int ret, mp_size;</div><div class='del'>-	u32 old_alen = 0;</div><div class='del'>-	bool mp_rebuilt = false;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Extending mft data allocation.");</div><div class='del'>-	mft_ni = NTFS_I(vol-&gt;mft_ino);</div><div class='del'>-	/*</div><div class='del'>-	 * Determine the preferred allocation location, i.e. the last lcn of</div><div class='del'>-	 * the mft data attribute.  The allocated size of the mft data</div><div class='del'>-	 * attribute cannot be zero so we are ok to do this.</div><div class='del'>-	 */</div><div class='del'>-	down_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	ll = mft_ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	rl = ntfs_attr_find_vcn_nolock(mft_ni,</div><div class='del'>-			(ll - 1) &gt;&gt; vol-&gt;cluster_size_bits, NULL);</div><div class='del'>-	if (IS_ERR(rl) || unlikely(!rl-&gt;length || rl-&gt;lcn &lt; 0)) {</div><div class='del'>-		up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to determine last allocated "</div><div class='del'>-				"cluster of mft data attribute.");</div><div class='del'>-		if (!IS_ERR(rl))</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		else</div><div class='del'>-			ret = PTR_ERR(rl);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	lcn = rl-&gt;lcn + rl-&gt;length;</div><div class='del'>-	ntfs_debug("Last lcn of mft data attribute is 0x%llx.", (long long)lcn);</div><div class='del'>-	/* Minimum allocation is one mft record worth of clusters. */</div><div class='del'>-	min_nr = vol-&gt;mft_record_size &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-	if (!min_nr)</div><div class='del'>-		min_nr = 1;</div><div class='del'>-	/* Want to allocate 16 mft records worth of clusters. */</div><div class='del'>-	nr = vol-&gt;mft_record_size &lt;&lt; 4 &gt;&gt; vol-&gt;cluster_size_bits;</div><div class='del'>-	if (!nr)</div><div class='del'>-		nr = min_nr;</div><div class='del'>-	/* Ensure we do not go above 2^32-1 mft records. */</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	ll = mft_ni-&gt;allocated_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	if (unlikely((ll + (nr &lt;&lt; vol-&gt;cluster_size_bits)) &gt;&gt;</div><div class='del'>-			vol-&gt;mft_record_size_bits &gt;= (1ll &lt;&lt; 32))) {</div><div class='del'>-		nr = min_nr;</div><div class='del'>-		if (unlikely((ll + (nr &lt;&lt; vol-&gt;cluster_size_bits)) &gt;&gt;</div><div class='del'>-				vol-&gt;mft_record_size_bits &gt;= (1ll &lt;&lt; 32))) {</div><div class='del'>-			ntfs_warning(vol-&gt;sb, "Cannot allocate mft record "</div><div class='del'>-					"because the maximum number of inodes "</div><div class='del'>-					"(2^32) has already been reached.");</div><div class='del'>-			up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Trying mft data allocation with %s cluster count %lli.",</div><div class='del'>-			nr &gt; min_nr ? "default" : "minimal", (long long)nr);</div><div class='del'>-	old_last_vcn = rl[1].vcn;</div><div class='del'>-	do {</div><div class='del'>-		rl2 = ntfs_cluster_alloc(vol, old_last_vcn, nr, lcn, MFT_ZONE,</div><div class='del'>-				true);</div><div class='del'>-		if (!IS_ERR(rl2))</div><div class='del'>-			break;</div><div class='del'>-		if (PTR_ERR(rl2) != -ENOSPC || nr == min_nr) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to allocate the minimal "</div><div class='del'>-					"number of clusters (%lli) for the "</div><div class='del'>-					"mft data attribute.", (long long)nr);</div><div class='del'>-			up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-			return PTR_ERR(rl2);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * There is not enough space to do the allocation, but there</div><div class='del'>-		 * might be enough space to do a minimal allocation so try that</div><div class='del'>-		 * before failing.</div><div class='del'>-		 */</div><div class='del'>-		nr = min_nr;</div><div class='del'>-		ntfs_debug("Retrying mft data allocation with minimal cluster "</div><div class='del'>-				"count %lli.", (long long)nr);</div><div class='del'>-	} while (1);</div><div class='del'>-	rl = ntfs_runlists_merge(mft_ni-&gt;runlist.rl, rl2);</div><div class='del'>-	if (IS_ERR(rl)) {</div><div class='del'>-		up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to merge runlists for mft data "</div><div class='del'>-				"attribute.");</div><div class='del'>-		if (ntfs_cluster_free_from_rl(vol, rl2)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to deallocate clusters "</div><div class='del'>-					"from the mft data attribute.%s", es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		ntfs_free(rl2);</div><div class='del'>-		return PTR_ERR(rl);</div><div class='del'>-	}</div><div class='del'>-	mft_ni-&gt;runlist.rl = rl;</div><div class='del'>-	ntfs_debug("Allocated %lli clusters.", (long long)nr);</div><div class='del'>-	/* Find the last run in the new runlist. */</div><div class='del'>-	for (; rl[1].length; rl++)</div><div class='del'>-		;</div><div class='del'>-	/* Update the attribute record as well. */</div><div class='del'>-	mrec = map_mft_record(mft_ni);</div><div class='del'>-	if (IS_ERR(mrec)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map mft record.");</div><div class='del'>-		ret = PTR_ERR(mrec);</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(mft_ni, mrec);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to get search context.");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	ret = ntfs_attr_lookup(mft_ni-&gt;type, mft_ni-&gt;name, mft_ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, rl[1].vcn, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find last attribute extent of "</div><div class='del'>-				"mft data attribute.");</div><div class='del'>-		if (ret == -ENOENT)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	ll = sle64_to_cpu(a-&gt;data.non_resident.lowest_vcn);</div><div class='del'>-	/* Search back for the previous last allocated cluster of mft bitmap. */</div><div class='del'>-	for (rl2 = rl; rl2 &gt; mft_ni-&gt;runlist.rl; rl2--) {</div><div class='del'>-		if (ll &gt;= rl2-&gt;vcn)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(ll &lt; rl2-&gt;vcn);</div><div class='del'>-	BUG_ON(ll &gt;= rl2-&gt;vcn + rl2-&gt;length);</div><div class='del'>-	/* Get the size for the new mapping pairs array for this extent. */</div><div class='del'>-	mp_size = ntfs_get_size_for_mapping_pairs(vol, rl2, ll, -1);</div><div class='del'>-	if (unlikely(mp_size &lt;= 0)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Get size for mapping pairs failed for "</div><div class='del'>-				"mft data attribute extent.");</div><div class='del'>-		ret = mp_size;</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	/* Expand the attribute record if necessary. */</div><div class='del'>-	old_alen = le32_to_cpu(a-&gt;length);</div><div class='del'>-	ret = ntfs_attr_record_resize(ctx-&gt;mrec, a, mp_size +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset));</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		if (ret != -ENOSPC) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to resize attribute "</div><div class='del'>-					"record for mft data attribute.");</div><div class='del'>-			goto undo_alloc;</div><div class='del'>-		}</div><div class='del'>-		// TODO: Deal with this by moving this extent to a new mft</div><div class='del'>-		// record or by starting a new extent in a new mft record or by</div><div class='del'>-		// moving other attributes out of this mft record.</div><div class='del'>-		// Note: Use the special reserved mft records and ensure that</div><div class='del'>-		// this extent is not required to find the mft record in</div><div class='del'>-		// question.  If no free special records left we would need to</div><div class='del'>-		// move an existing record away, insert ours in its place, and</div><div class='del'>-		// then place the moved record into the newly allocated space</div><div class='del'>-		// and we would then need to update all references to this mft</div><div class='del'>-		// record appropriately.  This is rather complicated...</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Not enough space in this mft record to "</div><div class='del'>-				"accommodate extended mft data attribute "</div><div class='del'>-				"extent.  Cannot handle this yet.");</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	mp_rebuilt = true;</div><div class='del'>-	/* Generate the mapping pairs array directly into the attr record. */</div><div class='del'>-	ret = ntfs_mapping_pairs_build(vol, (u8*)a +</div><div class='del'>-			le16_to_cpu(a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-			mp_size, rl2, ll, -1, NULL);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to build mapping pairs array of "</div><div class='del'>-				"mft data attribute.");</div><div class='del'>-		goto undo_alloc;</div><div class='del'>-	}</div><div class='del'>-	/* Update the highest_vcn. */</div><div class='del'>-	a-&gt;data.non_resident.highest_vcn = cpu_to_sle64(rl[1].vcn - 1);</div><div class='del'>-	/*</div><div class='del'>-	 * We now have extended the mft data allocated_size by nr clusters.</div><div class='del'>-	 * Reflect this in the ntfs_inode structure and the attribute record.</div><div class='del'>-	 * @rl is the last (non-terminator) runlist element of mft data</div><div class='del'>-	 * attribute.</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-		/*</div><div class='del'>-		 * We are not in the first attribute extent, switch to it, but</div><div class='del'>-		 * first ensure the changes will make it to disk later.</div><div class='del'>-		 */</div><div class='del'>-		flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-		mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-		ret = ntfs_attr_lookup(mft_ni-&gt;type, mft_ni-&gt;name,</div><div class='del'>-				mft_ni-&gt;name_len, CASE_SENSITIVE, 0, NULL, 0,</div><div class='del'>-				ctx);</div><div class='del'>-		if (unlikely(ret)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to find first attribute "</div><div class='del'>-					"extent of mft data attribute.");</div><div class='del'>-			goto restore_undo_alloc;</div><div class='del'>-		}</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-	}</div><div class='del'>-	write_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	mft_ni-&gt;allocated_size += nr &lt;&lt; vol-&gt;cluster_size_bits;</div><div class='del'>-	a-&gt;data.non_resident.allocated_size =</div><div class='del'>-			cpu_to_sle64(mft_ni-&gt;allocated_size);</div><div class='del'>-	write_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	/* Ensure the changes make it to disk. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(mft_ni);</div><div class='del'>-	up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-restore_undo_alloc:</div><div class='del'>-	ntfs_attr_reinit_search_ctx(ctx);</div><div class='del'>-	if (ntfs_attr_lookup(mft_ni-&gt;type, mft_ni-&gt;name, mft_ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, rl[1].vcn, NULL, 0, ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find last attribute extent of "</div><div class='del'>-				"mft data attribute.%s", es);</div><div class='del'>-		write_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-		mft_ni-&gt;allocated_size += nr &lt;&lt; vol-&gt;cluster_size_bits;</div><div class='del'>-		write_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-		up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-		/*</div><div class='del'>-		 * The only thing that is now wrong is -&gt;allocated_size of the</div><div class='del'>-		 * base attribute extent which chkdsk should be able to fix.</div><div class='del'>-		 */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;attr-&gt;data.non_resident.highest_vcn =</div><div class='del'>-			cpu_to_sle64(old_last_vcn - 1);</div><div class='del'>-undo_alloc:</div><div class='del'>-	if (ntfs_cluster_free(mft_ni, old_last_vcn, -1, ctx) &lt; 0) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to free clusters from mft data "</div><div class='del'>-				"attribute.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ntfs_rl_truncate_nolock(vol, &amp;mft_ni-&gt;runlist, old_last_vcn)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to truncate mft data attribute "</div><div class='del'>-				"runlist.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	if (ctx) {</div><div class='del'>-		a = ctx-&gt;attr;</div><div class='del'>-		if (mp_rebuilt &amp;&amp; !IS_ERR(ctx-&gt;mrec)) {</div><div class='del'>-			if (ntfs_mapping_pairs_build(vol, (u8 *)a + le16_to_cpu(</div><div class='del'>-				a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-				old_alen - le16_to_cpu(</div><div class='del'>-					a-&gt;data.non_resident.mapping_pairs_offset),</div><div class='del'>-				rl2, ll, -1, NULL)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to restore mapping pairs "</div><div class='del'>-					"array.%s", es);</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			if (ntfs_attr_record_resize(ctx-&gt;mrec, a, old_alen)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to restore attribute "</div><div class='del'>-					"record.%s", es);</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-			}</div><div class='del'>-			flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-			mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-		} else if (IS_ERR(ctx-&gt;mrec)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to restore attribute search "</div><div class='del'>-				"context.%s", es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-		}</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	}</div><div class='del'>-	if (!IS_ERR(mrec))</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-	up_write(&amp;mft_ni-&gt;runlist.lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_record_layout - layout an mft record into a memory buffer</div><div class='del'>- * @vol:	volume to which the mft record will belong</div><div class='del'>- * @mft_no:	mft reference specifying the mft record number</div><div class='del'>- * @m:		destination buffer of size &gt;= @vol-&gt;mft_record_size bytes</div><div class='del'>- *</div><div class='del'>- * Layout an empty, unused mft record with the mft record number @mft_no into</div><div class='del'>- * the buffer @m.  The volume @vol is needed because the mft record structure</div><div class='del'>- * was modified in NTFS 3.1 so we need to know which volume version this mft</div><div class='del'>- * record will be used on.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_mft_record_layout(const ntfs_volume *vol, const s64 mft_no,</div><div class='del'>-		MFT_RECORD *m)</div><div class='del'>-{</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for mft record 0x%llx.", (long long)mft_no);</div><div class='del'>-	if (mft_no &gt;= (1ll &lt;&lt; 32)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Mft record number 0x%llx exceeds "</div><div class='del'>-				"maximum of 2^32.", (long long)mft_no);</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	}</div><div class='del'>-	/* Start by clearing the whole mft record to gives us a clean slate. */</div><div class='del'>-	memset(m, 0, vol-&gt;mft_record_size);</div><div class='del'>-	/* Aligned to 2-byte boundary. */</div><div class='del'>-	if (vol-&gt;major_ver &lt; 3 || (vol-&gt;major_ver == 3 &amp;&amp; !vol-&gt;minor_ver))</div><div class='del'>-		m-&gt;usa_ofs = cpu_to_le16((sizeof(MFT_RECORD_OLD) + 1) &amp; ~1);</div><div class='del'>-	else {</div><div class='del'>-		m-&gt;usa_ofs = cpu_to_le16((sizeof(MFT_RECORD) + 1) &amp; ~1);</div><div class='del'>-		/*</div><div class='del'>-		 * Set the NTFS 3.1+ specific fields while we know that the</div><div class='del'>-		 * volume version is 3.1+.</div><div class='del'>-		 */</div><div class='del'>-		m-&gt;reserved = 0;</div><div class='del'>-		m-&gt;mft_record_number = cpu_to_le32((u32)mft_no);</div><div class='del'>-	}</div><div class='del'>-	m-&gt;magic = magic_FILE;</div><div class='del'>-	if (vol-&gt;mft_record_size &gt;= NTFS_BLOCK_SIZE)</div><div class='del'>-		m-&gt;usa_count = cpu_to_le16(vol-&gt;mft_record_size /</div><div class='del'>-				NTFS_BLOCK_SIZE + 1);</div><div class='del'>-	else {</div><div class='del'>-		m-&gt;usa_count = cpu_to_le16(1);</div><div class='del'>-		ntfs_warning(vol-&gt;sb, "Sector size is bigger than mft record "</div><div class='del'>-				"size.  Setting usa_count to 1.  If chkdsk "</div><div class='del'>-				"reports this as corruption, please email "</div><div class='del'>-				"linux-ntfs-dev@lists.sourceforge.net stating "</div><div class='del'>-				"that you saw this message and that the "</div><div class='del'>-				"modified filesystem created was corrupt.  "</div><div class='del'>-				"Thank you.");</div><div class='del'>-	}</div><div class='del'>-	/* Set the update sequence number to 1. */</div><div class='del'>-	*(le16*)((u8*)m + le16_to_cpu(m-&gt;usa_ofs)) = cpu_to_le16(1);</div><div class='del'>-	m-&gt;lsn = 0;</div><div class='del'>-	m-&gt;sequence_number = cpu_to_le16(1);</div><div class='del'>-	m-&gt;link_count = 0;</div><div class='del'>-	/*</div><div class='del'>-	 * Place the attributes straight after the update sequence array,</div><div class='del'>-	 * aligned to 8-byte boundary.</div><div class='del'>-	 */</div><div class='del'>-	m-&gt;attrs_offset = cpu_to_le16((le16_to_cpu(m-&gt;usa_ofs) +</div><div class='del'>-			(le16_to_cpu(m-&gt;usa_count) &lt;&lt; 1) + 7) &amp; ~7);</div><div class='del'>-	m-&gt;flags = 0;</div><div class='del'>-	/*</div><div class='del'>-	 * Using attrs_offset plus eight bytes (for the termination attribute).</div><div class='del'>-	 * attrs_offset is already aligned to 8-byte boundary, so no need to</div><div class='del'>-	 * align again.</div><div class='del'>-	 */</div><div class='del'>-	m-&gt;bytes_in_use = cpu_to_le32(le16_to_cpu(m-&gt;attrs_offset) + 8);</div><div class='del'>-	m-&gt;bytes_allocated = cpu_to_le32(vol-&gt;mft_record_size);</div><div class='del'>-	m-&gt;base_mft_record = 0;</div><div class='del'>-	m-&gt;next_attr_instance = 0;</div><div class='del'>-	/* Add the termination attribute. */</div><div class='del'>-	a = (ATTR_RECORD*)((u8*)m + le16_to_cpu(m-&gt;attrs_offset));</div><div class='del'>-	a-&gt;type = AT_END;</div><div class='del'>-	a-&gt;length = 0;</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_record_format - format an mft record on an ntfs volume</div><div class='del'>- * @vol:	volume on which to format the mft record</div><div class='del'>- * @mft_no:	mft record number to format</div><div class='del'>- *</div><div class='del'>- * Format the mft record @mft_no in $MFT/$DATA, i.e. lay out an empty, unused</div><div class='del'>- * mft record into the appropriate place of the mft data attribute.  This is</div><div class='del'>- * used when extending the mft data attribute.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_mft_record_format(const ntfs_volume *vol, const s64 mft_no)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct inode *mft_vi = vol-&gt;mft_ino;</div><div class='del'>-	struct page *page;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	pgoff_t index, end_index;</div><div class='del'>-	unsigned int ofs;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for mft record 0x%llx.", (long long)mft_no);</div><div class='del'>-	/*</div><div class='del'>-	 * The index into the page cache and the offset within the page cache</div><div class='del'>-	 * page of the wanted mft record.</div><div class='del'>-	 */</div><div class='del'>-	index = mft_no &lt;&lt; vol-&gt;mft_record_size_bits &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	ofs = (mft_no &lt;&lt; vol-&gt;mft_record_size_bits) &amp; ~PAGE_MASK;</div><div class='del'>-	/* The maximum valid index into the page cache for $MFT's data. */</div><div class='del'>-	i_size = i_size_read(mft_vi);</div><div class='del'>-	end_index = i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if (unlikely(index &gt;= end_index)) {</div><div class='del'>-		if (unlikely(index &gt; end_index || ofs + vol-&gt;mft_record_size &gt;=</div><div class='del'>-				(i_size &amp; ~PAGE_MASK))) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Tried to format non-existing mft "</div><div class='del'>-					"record 0x%llx.", (long long)mft_no);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* Read, map, and pin the page containing the mft record. */</div><div class='del'>-	page = ntfs_map_page(mft_vi-&gt;i_mapping, index);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map page containing mft record "</div><div class='del'>-				"to format 0x%llx.", (long long)mft_no);</div><div class='del'>-		return PTR_ERR(page);</div><div class='del'>-	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	BUG_ON(!PageUptodate(page));</div><div class='del'>-	ClearPageUptodate(page);</div><div class='del'>-	m = (MFT_RECORD*)((u8*)page_address(page) + ofs);</div><div class='del'>-	err = ntfs_mft_record_layout(vol, mft_no, m);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to layout mft record 0x%llx.",</div><div class='del'>-				(long long)mft_no);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the mft record is written out to disk.  We could use</div><div class='del'>-	 * ilookup5() to check if an inode is in icache and so on but this is</div><div class='del'>-	 * unnecessary as ntfs_writepage() will write the dirty record anyway.</div><div class='del'>-	 */</div><div class='del'>-	mark_ntfs_record_dirty(page, ofs);</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mft_record_alloc - allocate an mft record on an ntfs volume</div><div class='del'>- * @vol:	[IN]  volume on which to allocate the mft record</div><div class='del'>- * @mode:	[IN]  mode if want a file or directory, i.e. base inode or 0</div><div class='del'>- * @base_ni:	[IN]  open base inode if allocating an extent mft record or NULL</div><div class='del'>- * @mrec:	[OUT] on successful return this is the mapped mft record</div><div class='del'>- *</div><div class='del'>- * Allocate an mft record in $MFT/$DATA of an open ntfs volume @vol.</div><div class='del'>- *</div><div class='del'>- * If @base_ni is NULL make the mft record a base mft record, i.e. a file or</div><div class='del'>- * direvctory inode, and allocate it at the default allocator position.  In</div><div class='del'>- * this case @mode is the file mode as given to us by the caller.  We in</div><div class='del'>- * particular use @mode to distinguish whether a file or a directory is being</div><div class='del'>- * created (S_IFDIR(mode) and S_IFREG(mode), respectively).</div><div class='del'>- *</div><div class='del'>- * If @base_ni is not NULL make the allocated mft record an extent record,</div><div class='del'>- * allocate it starting at the mft record after the base mft record and attach</div><div class='del'>- * the allocated and opened ntfs inode to the base inode @base_ni.  In this</div><div class='del'>- * case @mode must be 0 as it is meaningless for extent inodes.</div><div class='del'>- *</div><div class='del'>- * You need to check the return value with IS_ERR().  If false, the function</div><div class='del'>- * was successful and the return value is the now opened ntfs inode of the</div><div class='del'>- * allocated mft record.  *@mrec is then set to the allocated, mapped, pinned,</div><div class='del'>- * and locked mft record.  If IS_ERR() is true, the function failed and the</div><div class='del'>- * error code is obtained from PTR_ERR(return value).  *@mrec is undefined in</div><div class='del'>- * this case.</div><div class='del'>- *</div><div class='del'>- * Allocation strategy:</div><div class='del'>- *</div><div class='del'>- * To find a free mft record, we scan the mft bitmap for a zero bit.  To</div><div class='del'>- * optimize this we start scanning at the place specified by @base_ni or if</div><div class='del'>- * @base_ni is NULL we start where we last stopped and we perform wrap around</div><div class='del'>- * when we reach the end.  Note, we do not try to allocate mft records below</div><div class='del'>- * number 24 because numbers 0 to 15 are the defined system files anyway and 16</div><div class='del'>- * to 24 are special in that they are used for storing extension mft records</div><div class='del'>- * for the $DATA attribute of $MFT.  This is required to avoid the possibility</div><div class='del'>- * of creating a runlist with a circular dependency which once written to disk</div><div class='del'>- * can never be read in again.  Windows will only use records 16 to 24 for</div><div class='del'>- * normal files if the volume is completely out of space.  We never use them</div><div class='del'>- * which means that when the volume is really out of space we cannot create any</div><div class='del'>- * more files while Windows can still create up to 8 small files.  We can start</div><div class='del'>- * doing this at some later time, it does not matter much for now.</div><div class='del'>- *</div><div class='del'>- * When scanning the mft bitmap, we only search up to the last allocated mft</div><div class='del'>- * record.  If there are no free records left in the range 24 to number of</div><div class='del'>- * allocated mft records, then we extend the $MFT/$DATA attribute in order to</div><div class='del'>- * create free mft records.  We extend the allocated size of $MFT/$DATA by 16</div><div class='del'>- * records at a time or one cluster, if cluster size is above 16kiB.  If there</div><div class='del'>- * is not sufficient space to do this, we try to extend by a single mft record</div><div class='del'>- * or one cluster, if cluster size is above the mft record size.</div><div class='del'>- *</div><div class='del'>- * No matter how many mft records we allocate, we initialize only the first</div><div class='del'>- * allocated mft record, incrementing mft data size and initialized size</div><div class='del'>- * accordingly, open an ntfs_inode for it and return it to the caller, unless</div><div class='del'>- * there are less than 24 mft records, in which case we allocate and initialize</div><div class='del'>- * mft records until we reach record 24 which we consider as the first free mft</div><div class='del'>- * record for use by normal files.</div><div class='del'>- *</div><div class='del'>- * If during any stage we overflow the initialized data in the mft bitmap, we</div><div class='del'>- * extend the initialized size (and data size) by 8 bytes, allocating another</div><div class='del'>- * cluster if required.  The bitmap data size has to be at least equal to the</div><div class='del'>- * number of mft records in the mft, but it can be bigger, in which case the</div><div class='del'>- * superflous bits are padded with zeroes.</div><div class='del'>- *</div><div class='del'>- * Thus, when we return successfully (IS_ERR() is false), we will have:</div><div class='del'>- *	- initialized / extended the mft bitmap if necessary,</div><div class='del'>- *	- initialized / extended the mft data if necessary,</div><div class='del'>- *	- set the bit corresponding to the mft record being allocated in the</div><div class='del'>- *	  mft bitmap,</div><div class='del'>- *	- opened an ntfs_inode for the allocated mft record, and we will have</div><div class='del'>- *	- returned the ntfs_inode as well as the allocated mapped, pinned, and</div><div class='del'>- *	  locked mft record.</div><div class='del'>- *</div><div class='del'>- * On error, the volume will be left in a consistent state and no record will</div><div class='del'>- * be allocated.  If rolling back a partial operation fails, we may leave some</div><div class='del'>- * inconsistent metadata in which case we set NVolErrors() so the volume is</div><div class='del'>- * left dirty when unmounted.</div><div class='del'>- *</div><div class='del'>- * Note, this function cannot make use of most of the normal functions, like</div><div class='del'>- * for example for attribute resizing, etc, because when the run list overflows</div><div class='del'>- * the base mft record and an attribute list is used, it is very important that</div><div class='del'>- * the extension mft records used to store the $DATA attribute of $MFT can be</div><div class='del'>- * reached without having to read the information contained inside them, as</div><div class='del'>- * this would make it impossible to find them in the first place after the</div><div class='del'>- * volume is unmounted.  $MFT/$BITMAP probably does not need to follow this</div><div class='del'>- * rule because the bitmap is not essential for finding the mft records, but on</div><div class='del'>- * the other hand, handling the bitmap in this special way would make life</div><div class='del'>- * easier because otherwise there might be circular invocations of functions</div><div class='del'>- * when reading the bitmap.</div><div class='del'>- */</div><div class='del'>-ntfs_inode *ntfs_mft_record_alloc(ntfs_volume *vol, const int mode,</div><div class='del'>-		ntfs_inode *base_ni, MFT_RECORD **mrec)</div><div class='del'>-{</div><div class='del'>-	s64 ll, bit, old_data_initialized, old_data_size;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	struct page *page;</div><div class='del'>-	ntfs_inode *mft_ni, *mftbmp_ni, *ni;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ATTR_RECORD *a;</div><div class='del'>-	pgoff_t index;</div><div class='del'>-	unsigned int ofs;</div><div class='del'>-	int err;</div><div class='del'>-	le16 seq_no, usn;</div><div class='del'>-	bool record_formatted = false;</div><div class='del'>-</div><div class='del'>-	if (base_ni) {</div><div class='del'>-		ntfs_debug("Entering (allocating an extent mft record for "</div><div class='del'>-				"base mft record 0x%llx).",</div><div class='del'>-				(long long)base_ni-&gt;mft_no);</div><div class='del'>-		/* @mode and @base_ni are mutually exclusive. */</div><div class='del'>-		BUG_ON(mode);</div><div class='del'>-	} else</div><div class='del'>-		ntfs_debug("Entering (allocating a base mft record).");</div><div class='del'>-	if (mode) {</div><div class='del'>-		/* @mode and @base_ni are mutually exclusive. */</div><div class='del'>-		BUG_ON(base_ni);</div><div class='del'>-		/* We only support creation of normal files and directories. */</div><div class='del'>-		if (!S_ISREG(mode) &amp;&amp; !S_ISDIR(mode))</div><div class='del'>-			return ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!mrec);</div><div class='del'>-	mft_ni = NTFS_I(vol-&gt;mft_ino);</div><div class='del'>-	mftbmp_ni = NTFS_I(vol-&gt;mftbmp_ino);</div><div class='del'>-	down_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	bit = ntfs_mft_bitmap_find_and_alloc_free_rec_nolock(vol, base_ni);</div><div class='del'>-	if (bit &gt;= 0) {</div><div class='del'>-		ntfs_debug("Found and allocated free record (#1), bit 0x%llx.",</div><div class='del'>-				(long long)bit);</div><div class='del'>-		goto have_alloc_rec;</div><div class='del'>-	}</div><div class='del'>-	if (bit != -ENOSPC) {</div><div class='del'>-		up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-		return ERR_PTR(bit);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * No free mft records left.  If the mft bitmap already covers more</div><div class='del'>-	 * than the currently used mft records, the next records are all free,</div><div class='del'>-	 * so we can simply allocate the first unused mft record.</div><div class='del'>-	 * Note: We also have to make sure that the mft bitmap at least covers</div><div class='del'>-	 * the first 24 mft records as they are special and whilst they may not</div><div class='del'>-	 * be in use, we do not allocate from them.</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	ll = mft_ni-&gt;initialized_size &gt;&gt; vol-&gt;mft_record_size_bits;</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	read_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	old_data_initialized = mftbmp_ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	if (old_data_initialized &lt;&lt; 3 &gt; ll &amp;&amp; old_data_initialized &gt; 3) {</div><div class='del'>-		bit = ll;</div><div class='del'>-		if (bit &lt; 24)</div><div class='del'>-			bit = 24;</div><div class='del'>-		if (unlikely(bit &gt;= (1ll &lt;&lt; 32)))</div><div class='del'>-			goto max_err_out;</div><div class='del'>-		ntfs_debug("Found free record (#2), bit 0x%llx.",</div><div class='del'>-				(long long)bit);</div><div class='del'>-		goto found_free_rec;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The mft bitmap needs to be expanded until it covers the first unused</div><div class='del'>-	 * mft record that we can allocate.</div><div class='del'>-	 * Note: The smallest mft record we allocate is mft record 24.</div><div class='del'>-	 */</div><div class='del'>-	bit = old_data_initialized &lt;&lt; 3;</div><div class='del'>-	if (unlikely(bit &gt;= (1ll &lt;&lt; 32)))</div><div class='del'>-		goto max_err_out;</div><div class='del'>-	read_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	old_data_size = mftbmp_ni-&gt;allocated_size;</div><div class='del'>-	ntfs_debug("Status of mftbmp before extension: allocated_size 0x%llx, "</div><div class='del'>-			"data_size 0x%llx, initialized_size 0x%llx.",</div><div class='del'>-			(long long)old_data_size,</div><div class='del'>-			(long long)i_size_read(vol-&gt;mftbmp_ino),</div><div class='del'>-			(long long)old_data_initialized);</div><div class='del'>-	read_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	if (old_data_initialized + 8 &gt; old_data_size) {</div><div class='del'>-		/* Need to extend bitmap by one more cluster. */</div><div class='del'>-		ntfs_debug("mftbmp: initialized_size + 8 &gt; allocated_size.");</div><div class='del'>-		err = ntfs_mft_bitmap_extend_allocation_nolock(vol);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		read_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-		ntfs_debug("Status of mftbmp after allocation extension: "</div><div class='del'>-				"allocated_size 0x%llx, data_size 0x%llx, "</div><div class='del'>-				"initialized_size 0x%llx.",</div><div class='del'>-				(long long)mftbmp_ni-&gt;allocated_size,</div><div class='del'>-				(long long)i_size_read(vol-&gt;mftbmp_ino),</div><div class='del'>-				(long long)mftbmp_ni-&gt;initialized_size);</div><div class='del'>-		read_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-#endif /* DEBUG */</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We now have sufficient allocated space, extend the initialized_size</div><div class='del'>-	 * as well as the data_size if necessary and fill the new space with</div><div class='del'>-	 * zeroes.</div><div class='del'>-	 */</div><div class='del'>-	err = ntfs_mft_bitmap_extend_initialized_nolock(vol);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	read_lock_irqsave(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-	ntfs_debug("Status of mftbmp after initialized extension: "</div><div class='del'>-			"allocated_size 0x%llx, data_size 0x%llx, "</div><div class='del'>-			"initialized_size 0x%llx.",</div><div class='del'>-			(long long)mftbmp_ni-&gt;allocated_size,</div><div class='del'>-			(long long)i_size_read(vol-&gt;mftbmp_ino),</div><div class='del'>-			(long long)mftbmp_ni-&gt;initialized_size);</div><div class='del'>-	read_unlock_irqrestore(&amp;mftbmp_ni-&gt;size_lock, flags);</div><div class='del'>-#endif /* DEBUG */</div><div class='del'>-	ntfs_debug("Found free record (#3), bit 0x%llx.", (long long)bit);</div><div class='del'>-found_free_rec:</div><div class='del'>-	/* @bit is the found free mft record, allocate it in the mft bitmap. */</div><div class='del'>-	ntfs_debug("At found_free_rec.");</div><div class='del'>-	err = ntfs_bitmap_set_bit(vol-&gt;mftbmp_ino, bit);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to allocate bit in mft bitmap.");</div><div class='del'>-		up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Set bit 0x%llx in mft bitmap.", (long long)bit);</div><div class='del'>-have_alloc_rec:</div><div class='del'>-	/*</div><div class='del'>-	 * The mft bitmap is now uptodate.  Deal with mft data attribute now.</div><div class='del'>-	 * Note, we keep hold of the mft bitmap lock for writing until all</div><div class='del'>-	 * modifications to the mft data attribute are complete, too, as they</div><div class='del'>-	 * will impact decisions for mft bitmap and mft record allocation done</div><div class='del'>-	 * by a parallel allocation and if the lock is not maintained a</div><div class='del'>-	 * parallel allocation could allocate the same mft record as this one.</div><div class='del'>-	 */</div><div class='del'>-	ll = (bit + 1) &lt;&lt; vol-&gt;mft_record_size_bits;</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	old_data_initialized = mft_ni-&gt;initialized_size;</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	if (ll &lt;= old_data_initialized) {</div><div class='del'>-		ntfs_debug("Allocated mft record already initialized.");</div><div class='del'>-		goto mft_rec_already_initialized;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Initializing allocated mft record.");</div><div class='del'>-	/*</div><div class='del'>-	 * The mft record is outside the initialized data.  Extend the mft data</div><div class='del'>-	 * attribute until it covers the allocated record.  The loop is only</div><div class='del'>-	 * actually traversed more than once when a freshly formatted volume is</div><div class='del'>-	 * first written to so it optimizes away nicely in the common case.</div><div class='del'>-	 */</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	ntfs_debug("Status of mft data before extension: "</div><div class='del'>-			"allocated_size 0x%llx, data_size 0x%llx, "</div><div class='del'>-			"initialized_size 0x%llx.",</div><div class='del'>-			(long long)mft_ni-&gt;allocated_size,</div><div class='del'>-			(long long)i_size_read(vol-&gt;mft_ino),</div><div class='del'>-			(long long)mft_ni-&gt;initialized_size);</div><div class='del'>-	while (ll &gt; mft_ni-&gt;allocated_size) {</div><div class='del'>-		read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-		err = ntfs_mft_data_extend_allocation_nolock(vol);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to extend mft data "</div><div class='del'>-					"allocation.");</div><div class='del'>-			goto undo_mftbmp_alloc_nolock;</div><div class='del'>-		}</div><div class='del'>-		read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-		ntfs_debug("Status of mft data after allocation extension: "</div><div class='del'>-				"allocated_size 0x%llx, data_size 0x%llx, "</div><div class='del'>-				"initialized_size 0x%llx.",</div><div class='del'>-				(long long)mft_ni-&gt;allocated_size,</div><div class='del'>-				(long long)i_size_read(vol-&gt;mft_ino),</div><div class='del'>-				(long long)mft_ni-&gt;initialized_size);</div><div class='del'>-	}</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	/*</div><div class='del'>-	 * Extend mft data initialized size (and data size of course) to reach</div><div class='del'>-	 * the allocated mft record, formatting the mft records allong the way.</div><div class='del'>-	 * Note: We only modify the ntfs_inode structure as that is all that is</div><div class='del'>-	 * needed by ntfs_mft_record_format().  We will update the attribute</div><div class='del'>-	 * record itself in one fell swoop later on.</div><div class='del'>-	 */</div><div class='del'>-	write_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	old_data_initialized = mft_ni-&gt;initialized_size;</div><div class='del'>-	old_data_size = vol-&gt;mft_ino-&gt;i_size;</div><div class='del'>-	while (ll &gt; mft_ni-&gt;initialized_size) {</div><div class='del'>-		s64 new_initialized_size, mft_no;</div><div class='del'>-		</div><div class='del'>-		new_initialized_size = mft_ni-&gt;initialized_size +</div><div class='del'>-				vol-&gt;mft_record_size;</div><div class='del'>-		mft_no = mft_ni-&gt;initialized_size &gt;&gt; vol-&gt;mft_record_size_bits;</div><div class='del'>-		if (new_initialized_size &gt; i_size_read(vol-&gt;mft_ino))</div><div class='del'>-			i_size_write(vol-&gt;mft_ino, new_initialized_size);</div><div class='del'>-		write_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-		ntfs_debug("Initializing mft record 0x%llx.",</div><div class='del'>-				(long long)mft_no);</div><div class='del'>-		err = ntfs_mft_record_format(vol, mft_no);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to format mft record.");</div><div class='del'>-			goto undo_data_init;</div><div class='del'>-		}</div><div class='del'>-		write_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-		mft_ni-&gt;initialized_size = new_initialized_size;</div><div class='del'>-	}</div><div class='del'>-	write_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	record_formatted = true;</div><div class='del'>-	/* Update the mft data attribute record to reflect the new sizes. */</div><div class='del'>-	m = map_mft_record(mft_ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map mft record.");</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		goto undo_data_init;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(mft_ni, m);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to get search context.");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-		goto undo_data_init;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(mft_ni-&gt;type, mft_ni-&gt;name, mft_ni-&gt;name_len,</div><div class='del'>-			CASE_SENSITIVE, 0, NULL, 0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find first attribute extent of "</div><div class='del'>-				"mft data attribute.");</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(mft_ni);</div><div class='del'>-		goto undo_data_init;</div><div class='del'>-	}</div><div class='del'>-	a = ctx-&gt;attr;</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	a-&gt;data.non_resident.initialized_size =</div><div class='del'>-			cpu_to_sle64(mft_ni-&gt;initialized_size);</div><div class='del'>-	a-&gt;data.non_resident.data_size =</div><div class='del'>-			cpu_to_sle64(i_size_read(vol-&gt;mft_ino));</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	/* Ensure the changes make it to disk. */</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(mft_ni);</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	ntfs_debug("Status of mft data after mft record initialization: "</div><div class='del'>-			"allocated_size 0x%llx, data_size 0x%llx, "</div><div class='del'>-			"initialized_size 0x%llx.",</div><div class='del'>-			(long long)mft_ni-&gt;allocated_size,</div><div class='del'>-			(long long)i_size_read(vol-&gt;mft_ino),</div><div class='del'>-			(long long)mft_ni-&gt;initialized_size);</div><div class='del'>-	BUG_ON(i_size_read(vol-&gt;mft_ino) &gt; mft_ni-&gt;allocated_size);</div><div class='del'>-	BUG_ON(mft_ni-&gt;initialized_size &gt; i_size_read(vol-&gt;mft_ino));</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-mft_rec_already_initialized:</div><div class='del'>-	/*</div><div class='del'>-	 * We can finally drop the mft bitmap lock as the mft data attribute</div><div class='del'>-	 * has been fully updated.  The only disparity left is that the</div><div class='del'>-	 * allocated mft record still needs to be marked as in use to match the</div><div class='del'>-	 * set bit in the mft bitmap but this is actually not a problem since</div><div class='del'>-	 * this mft record is not referenced from anywhere yet and the fact</div><div class='del'>-	 * that it is allocated in the mft bitmap means that no-one will try to</div><div class='del'>-	 * allocate it either.</div><div class='del'>-	 */</div><div class='del'>-	up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * We now have allocated and initialized the mft record.  Calculate the</div><div class='del'>-	 * index of and the offset within the page cache page the record is in.</div><div class='del'>-	 */</div><div class='del'>-	index = bit &lt;&lt; vol-&gt;mft_record_size_bits &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	ofs = (bit &lt;&lt; vol-&gt;mft_record_size_bits) &amp; ~PAGE_MASK;</div><div class='del'>-	/* Read, map, and pin the page containing the mft record. */</div><div class='del'>-	page = ntfs_map_page(vol-&gt;mft_ino-&gt;i_mapping, index);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to map page containing allocated "</div><div class='del'>-				"mft record 0x%llx.", (long long)bit);</div><div class='del'>-		err = PTR_ERR(page);</div><div class='del'>-		goto undo_mftbmp_alloc;</div><div class='del'>-	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	BUG_ON(!PageUptodate(page));</div><div class='del'>-	ClearPageUptodate(page);</div><div class='del'>-	m = (MFT_RECORD*)((u8*)page_address(page) + ofs);</div><div class='del'>-	/* If we just formatted the mft record no need to do it again. */</div><div class='del'>-	if (!record_formatted) {</div><div class='del'>-		/* Sanity check that the mft record is really not in use. */</div><div class='del'>-		if (ntfs_is_file_record(m-&gt;magic) &amp;&amp;</div><div class='del'>-				(m-&gt;flags &amp; MFT_RECORD_IN_USE)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Mft record 0x%llx was marked "</div><div class='del'>-					"free in mft bitmap but is marked "</div><div class='del'>-					"used itself.  Corrupt filesystem.  "</div><div class='del'>-					"Unmount and run chkdsk.",</div><div class='del'>-					(long long)bit);</div><div class='del'>-			err = -EIO;</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-			goto undo_mftbmp_alloc;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * We need to (re-)format the mft record, preserving the</div><div class='del'>-		 * sequence number if it is not zero as well as the update</div><div class='del'>-		 * sequence number if it is not zero or -1 (0xffff).  This</div><div class='del'>-		 * means we do not need to care whether or not something went</div><div class='del'>-		 * wrong with the previous mft record.</div><div class='del'>-		 */</div><div class='del'>-		seq_no = m-&gt;sequence_number;</div><div class='del'>-		usn = *(le16*)((u8*)m + le16_to_cpu(m-&gt;usa_ofs));</div><div class='del'>-		err = ntfs_mft_record_layout(vol, bit, m);</div><div class='del'>-		if (unlikely(err)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to layout allocated mft "</div><div class='del'>-					"record 0x%llx.", (long long)bit);</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			goto undo_mftbmp_alloc;</div><div class='del'>-		}</div><div class='del'>-		if (seq_no)</div><div class='del'>-			m-&gt;sequence_number = seq_no;</div><div class='del'>-		if (usn &amp;&amp; le16_to_cpu(usn) != 0xffff)</div><div class='del'>-			*(le16*)((u8*)m + le16_to_cpu(m-&gt;usa_ofs)) = usn;</div><div class='del'>-	}</div><div class='del'>-	/* Set the mft record itself in use. */</div><div class='del'>-	m-&gt;flags |= MFT_RECORD_IN_USE;</div><div class='del'>-	if (S_ISDIR(mode))</div><div class='del'>-		m-&gt;flags |= MFT_RECORD_IS_DIRECTORY;</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	if (base_ni) {</div><div class='del'>-		MFT_RECORD *m_tmp;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Setup the base mft record in the extent mft record.  This</div><div class='del'>-		 * completes initialization of the allocated extent mft record</div><div class='del'>-		 * and we can simply use it with map_extent_mft_record().</div><div class='del'>-		 */</div><div class='del'>-		m-&gt;base_mft_record = MK_LE_MREF(base_ni-&gt;mft_no,</div><div class='del'>-				base_ni-&gt;seq_no);</div><div class='del'>-		/*</div><div class='del'>-		 * Allocate an extent inode structure for the new mft record,</div><div class='del'>-		 * attach it to the base inode @base_ni and map, pin, and lock</div><div class='del'>-		 * its, i.e. the allocated, mft record.</div><div class='del'>-		 */</div><div class='del'>-		m_tmp = map_extent_mft_record(base_ni, bit, &amp;ni);</div><div class='del'>-		if (IS_ERR(m_tmp)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to map allocated extent "</div><div class='del'>-					"mft record 0x%llx.", (long long)bit);</div><div class='del'>-			err = PTR_ERR(m_tmp);</div><div class='del'>-			/* Set the mft record itself not in use. */</div><div class='del'>-			m-&gt;flags &amp;= cpu_to_le16(</div><div class='del'>-					~le16_to_cpu(MFT_RECORD_IN_USE));</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			/* Make sure the mft record is written out to disk. */</div><div class='del'>-			mark_ntfs_record_dirty(page, ofs);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			goto undo_mftbmp_alloc;</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(m != m_tmp);</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure the allocated mft record is written out to disk.</div><div class='del'>-		 * No need to set the inode dirty because the caller is going</div><div class='del'>-		 * to do that anyway after finishing with the new extent mft</div><div class='del'>-		 * record (e.g. at a minimum a new attribute will be added to</div><div class='del'>-		 * the mft record.</div><div class='del'>-		 */</div><div class='del'>-		mark_ntfs_record_dirty(page, ofs);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		/*</div><div class='del'>-		 * Need to unmap the page since map_extent_mft_record() mapped</div><div class='del'>-		 * it as well so we have it mapped twice at the moment.</div><div class='del'>-		 */</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Allocate a new VFS inode and set it up.  NOTE: @vi-&gt;i_nlink</div><div class='del'>-		 * is set to 1 but the mft record-&gt;link_count is 0.  The caller</div><div class='del'>-		 * needs to bear this in mind.</div><div class='del'>-		 */</div><div class='del'>-		vi = new_inode(vol-&gt;sb);</div><div class='del'>-		if (unlikely(!vi)) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			/* Set the mft record itself not in use. */</div><div class='del'>-			m-&gt;flags &amp;= cpu_to_le16(</div><div class='del'>-					~le16_to_cpu(MFT_RECORD_IN_USE));</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			/* Make sure the mft record is written out to disk. */</div><div class='del'>-			mark_ntfs_record_dirty(page, ofs);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			goto undo_mftbmp_alloc;</div><div class='del'>-		}</div><div class='del'>-		vi-&gt;i_ino = bit;</div><div class='del'>-</div><div class='del'>-		/* The owner and group come from the ntfs volume. */</div><div class='del'>-		vi-&gt;i_uid = vol-&gt;uid;</div><div class='del'>-		vi-&gt;i_gid = vol-&gt;gid;</div><div class='del'>-</div><div class='del'>-		/* Initialize the ntfs specific part of @vi. */</div><div class='del'>-		ntfs_init_big_inode(vi);</div><div class='del'>-		ni = NTFS_I(vi);</div><div class='del'>-		/*</div><div class='del'>-		 * Set the appropriate mode, attribute type, and name.  For</div><div class='del'>-		 * directories, also setup the index values to the defaults.</div><div class='del'>-		 */</div><div class='del'>-		if (S_ISDIR(mode)) {</div><div class='del'>-			vi-&gt;i_mode = S_IFDIR | S_IRWXUGO;</div><div class='del'>-			vi-&gt;i_mode &amp;= ~vol-&gt;dmask;</div><div class='del'>-</div><div class='del'>-			NInoSetMstProtected(ni);</div><div class='del'>-			ni-&gt;type = AT_INDEX_ALLOCATION;</div><div class='del'>-			ni-&gt;name = I30;</div><div class='del'>-			ni-&gt;name_len = 4;</div><div class='del'>-</div><div class='del'>-			ni-&gt;itype.index.block_size = 4096;</div><div class='del'>-			ni-&gt;itype.index.block_size_bits = ntfs_ffs(4096) - 1;</div><div class='del'>-			ni-&gt;itype.index.collation_rule = COLLATION_FILE_NAME;</div><div class='del'>-			if (vol-&gt;cluster_size &lt;= ni-&gt;itype.index.block_size) {</div><div class='del'>-				ni-&gt;itype.index.vcn_size = vol-&gt;cluster_size;</div><div class='del'>-				ni-&gt;itype.index.vcn_size_bits =</div><div class='del'>-						vol-&gt;cluster_size_bits;</div><div class='del'>-			} else {</div><div class='del'>-				ni-&gt;itype.index.vcn_size = vol-&gt;sector_size;</div><div class='del'>-				ni-&gt;itype.index.vcn_size_bits =</div><div class='del'>-						vol-&gt;sector_size_bits;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			vi-&gt;i_mode = S_IFREG | S_IRWXUGO;</div><div class='del'>-			vi-&gt;i_mode &amp;= ~vol-&gt;fmask;</div><div class='del'>-</div><div class='del'>-			ni-&gt;type = AT_DATA;</div><div class='del'>-			ni-&gt;name = NULL;</div><div class='del'>-			ni-&gt;name_len = 0;</div><div class='del'>-		}</div><div class='del'>-		if (IS_RDONLY(vi))</div><div class='del'>-			vi-&gt;i_mode &amp;= ~S_IWUGO;</div><div class='del'>-</div><div class='del'>-		/* Set the inode times to the current time. */</div><div class='del'>-		simple_inode_init_ts(vi);</div><div class='del'>-		/*</div><div class='del'>-		 * Set the file size to 0, the ntfs inode sizes are set to 0 by</div><div class='del'>-		 * the call to ntfs_init_big_inode() below.</div><div class='del'>-		 */</div><div class='del'>-		vi-&gt;i_size = 0;</div><div class='del'>-		vi-&gt;i_blocks = 0;</div><div class='del'>-</div><div class='del'>-		/* Set the sequence number. */</div><div class='del'>-		vi-&gt;i_generation = ni-&gt;seq_no = le16_to_cpu(m-&gt;sequence_number);</div><div class='del'>-		/*</div><div class='del'>-		 * Manually map, pin, and lock the mft record as we already</div><div class='del'>-		 * have its page mapped and it is very easy to do.</div><div class='del'>-		 */</div><div class='del'>-		atomic_inc(&amp;ni-&gt;count);</div><div class='del'>-		mutex_lock(&amp;ni-&gt;mrec_lock);</div><div class='del'>-		ni-&gt;page = page;</div><div class='del'>-		ni-&gt;page_ofs = ofs;</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure the allocated mft record is written out to disk.</div><div class='del'>-		 * NOTE: We do not set the ntfs inode dirty because this would</div><div class='del'>-		 * fail in ntfs_write_inode() because the inode does not have a</div><div class='del'>-		 * standard information attribute yet.  Also, there is no need</div><div class='del'>-		 * to set the inode dirty because the caller is going to do</div><div class='del'>-		 * that anyway after finishing with the new mft record (e.g. at</div><div class='del'>-		 * a minimum some new attributes will be added to the mft</div><div class='del'>-		 * record.</div><div class='del'>-		 */</div><div class='del'>-		mark_ntfs_record_dirty(page, ofs);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-</div><div class='del'>-		/* Add the inode to the inode hash for the superblock. */</div><div class='del'>-		insert_inode_hash(vi);</div><div class='del'>-</div><div class='del'>-		/* Update the default mft allocation position. */</div><div class='del'>-		vol-&gt;mft_data_pos = bit + 1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Return the opened, allocated inode of the allocated mft record as</div><div class='del'>-	 * well as the mapped, pinned, and locked mft record.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_debug("Returning opened, allocated %sinode 0x%llx.",</div><div class='del'>-			base_ni ? "extent " : "", (long long)bit);</div><div class='del'>-	*mrec = m;</div><div class='del'>-	return ni;</div><div class='del'>-undo_data_init:</div><div class='del'>-	write_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	mft_ni-&gt;initialized_size = old_data_initialized;</div><div class='del'>-	i_size_write(vol-&gt;mft_ino, old_data_size);</div><div class='del'>-	write_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	goto undo_mftbmp_alloc_nolock;</div><div class='del'>-undo_mftbmp_alloc:</div><div class='del'>-	down_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-undo_mftbmp_alloc_nolock:</div><div class='del'>-	if (ntfs_bitmap_clear_bit(vol-&gt;mftbmp_ino, bit)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to clear bit in mft bitmap.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-err_out:</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-max_err_out:</div><div class='del'>-	ntfs_warning(vol-&gt;sb, "Cannot allocate mft record because the maximum "</div><div class='del'>-			"number of inodes (2^32) has already been reached.");</div><div class='del'>-	up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	return ERR_PTR(-ENOSPC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_extent_mft_record_free - free an extent mft record on an ntfs volume</div><div class='del'>- * @ni:		ntfs inode of the mapped extent mft record to free</div><div class='del'>- * @m:		mapped extent mft record of the ntfs inode @ni</div><div class='del'>- *</div><div class='del'>- * Free the mapped extent mft record @m of the extent ntfs inode @ni.</div><div class='del'>- *</div><div class='del'>- * Note that this function unmaps the mft record and closes and destroys @ni</div><div class='del'>- * internally and hence you cannot use either @ni nor @m any more after this</div><div class='del'>- * function returns success.</div><div class='del'>- *</div><div class='del'>- * On success return 0 and on error return -errno.  @ni and @m are still valid</div><div class='del'>- * in this case and have not been freed.</div><div class='del'>- *</div><div class='del'>- * For some errors an error message is displayed and the success code 0 is</div><div class='del'>- * returned and the volume is then left dirty on umount.  This makes sense in</div><div class='del'>- * case we could not rollback the changes that were already done since the</div><div class='del'>- * caller no longer wants to reference this mft record so it does not matter to</div><div class='del'>- * the caller if something is wrong with it as long as it is properly detached</div><div class='del'>- * from the base inode.</div><div class='del'>- */</div><div class='del'>-int ntfs_extent_mft_record_free(ntfs_inode *ni, MFT_RECORD *m)</div><div class='del'>-{</div><div class='del'>-	unsigned long mft_no = ni-&gt;mft_no;</div><div class='del'>-	ntfs_volume *vol = ni-&gt;vol;</div><div class='del'>-	ntfs_inode *base_ni;</div><div class='del'>-	ntfs_inode **extent_nis;</div><div class='del'>-	int i, err;</div><div class='del'>-	le16 old_seq_no;</div><div class='del'>-	u16 seq_no;</div><div class='del'>-	</div><div class='del'>-	BUG_ON(NInoAttr(ni));</div><div class='del'>-	BUG_ON(ni-&gt;nr_extents != -1);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ni-&gt;extent_lock);</div><div class='del'>-	base_ni = ni-&gt;ext.base_ntfs_ino;</div><div class='del'>-	mutex_unlock(&amp;ni-&gt;extent_lock);</div><div class='del'>-</div><div class='del'>-	BUG_ON(base_ni-&gt;nr_extents &lt;= 0);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for extent inode 0x%lx, base inode 0x%lx.\n",</div><div class='del'>-			mft_no, base_ni-&gt;mft_no);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-</div><div class='del'>-	/* Make sure we are holding the only reference to the extent inode. */</div><div class='del'>-	if (atomic_read(&amp;ni-&gt;count) &gt; 2) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Tried to free busy extent inode 0x%lx, "</div><div class='del'>-				"not freeing.", base_ni-&gt;mft_no);</div><div class='del'>-		mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Dissociate the ntfs inode from the base inode. */</div><div class='del'>-	extent_nis = base_ni-&gt;ext.extent_ntfs_inos;</div><div class='del'>-	err = -ENOENT;</div><div class='del'>-	for (i = 0; i &lt; base_ni-&gt;nr_extents; i++) {</div><div class='del'>-		if (ni != extent_nis[i])</div><div class='del'>-			continue;</div><div class='del'>-		extent_nis += i;</div><div class='del'>-		base_ni-&gt;nr_extents--;</div><div class='del'>-		memmove(extent_nis, extent_nis + 1, (base_ni-&gt;nr_extents - i) *</div><div class='del'>-				sizeof(ntfs_inode*));</div><div class='del'>-		err = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Extent inode 0x%lx is not attached to "</div><div class='del'>-				"its base inode 0x%lx.", mft_no,</div><div class='del'>-				base_ni-&gt;mft_no);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The extent inode is no longer attached to the base inode so no one</div><div class='del'>-	 * can get a reference to it any more.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Mark the mft record as not in use. */</div><div class='del'>-	m-&gt;flags &amp;= ~MFT_RECORD_IN_USE;</div><div class='del'>-</div><div class='del'>-	/* Increment the sequence number, skipping zero, if it is not zero. */</div><div class='del'>-	old_seq_no = m-&gt;sequence_number;</div><div class='del'>-	seq_no = le16_to_cpu(old_seq_no);</div><div class='del'>-	if (seq_no == 0xffff)</div><div class='del'>-		seq_no = 1;</div><div class='del'>-	else if (seq_no)</div><div class='del'>-		seq_no++;</div><div class='del'>-	m-&gt;sequence_number = cpu_to_le16(seq_no);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the ntfs inode dirty and write it out.  We do not need to worry</div><div class='del'>-	 * about the base inode here since whatever caused the extent mft</div><div class='del'>-	 * record to be freed is guaranteed to do it already.</div><div class='del'>-	 */</div><div class='del'>-	NInoSetDirty(ni);</div><div class='del'>-	err = write_mft_record(ni, m, 0);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to write mft record 0x%lx, not "</div><div class='del'>-				"freeing.", mft_no);</div><div class='del'>-		goto rollback;</div><div class='del'>-	}</div><div class='del'>-rollback_error:</div><div class='del'>-	/* Unmap and throw away the now freed extent inode. */</div><div class='del'>-	unmap_extent_mft_record(ni);</div><div class='del'>-	ntfs_clear_extent_inode(ni);</div><div class='del'>-</div><div class='del'>-	/* Clear the bit in the $MFT/$BITMAP corresponding to this record. */</div><div class='del'>-	down_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	err = ntfs_bitmap_clear_bit(vol-&gt;mftbmp_ino, mft_no);</div><div class='del'>-	up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		/*</div><div class='del'>-		 * The extent inode is gone but we failed to deallocate it in</div><div class='del'>-		 * the mft bitmap.  Just emit a warning and leave the volume</div><div class='del'>-		 * dirty on umount.</div><div class='del'>-		 */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to clear bit in mft bitmap.%s", es);</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-rollback:</div><div class='del'>-	/* Rollback what we did... */</div><div class='del'>-	mutex_lock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-	extent_nis = base_ni-&gt;ext.extent_ntfs_inos;</div><div class='del'>-	if (!(base_ni-&gt;nr_extents &amp; 3)) {</div><div class='del'>-		int new_size = (base_ni-&gt;nr_extents + 4) * sizeof(ntfs_inode*);</div><div class='del'>-</div><div class='del'>-		extent_nis = kmalloc(new_size, GFP_NOFS);</div><div class='del'>-		if (unlikely(!extent_nis)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to allocate internal "</div><div class='del'>-					"buffer during rollback.%s", es);</div><div class='del'>-			mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-			goto rollback_error;</div><div class='del'>-		}</div><div class='del'>-		if (base_ni-&gt;nr_extents) {</div><div class='del'>-			BUG_ON(!base_ni-&gt;ext.extent_ntfs_inos);</div><div class='del'>-			memcpy(extent_nis, base_ni-&gt;ext.extent_ntfs_inos,</div><div class='del'>-					new_size - 4 * sizeof(ntfs_inode*));</div><div class='del'>-			kfree(base_ni-&gt;ext.extent_ntfs_inos);</div><div class='del'>-		}</div><div class='del'>-		base_ni-&gt;ext.extent_ntfs_inos = extent_nis;</div><div class='del'>-	}</div><div class='del'>-	m-&gt;flags |= MFT_RECORD_IN_USE;</div><div class='del'>-	m-&gt;sequence_number = old_seq_no;</div><div class='del'>-	extent_nis[base_ni-&gt;nr_extents++] = ni;</div><div class='del'>-	mutex_unlock(&amp;base_ni-&gt;extent_lock);</div><div class='del'>-	mark_mft_record_dirty(ni);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/mft.h b/fs/ntfs/mft.h<br/>deleted file mode 100644<br/>index 49c001af16ed..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/mft.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/mft.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * mft.h - Defines for mft record handling in NTFS Linux kernel driver.</div><div class='del'>- *	   Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_MFT_H</div><div class='del'>-#define _LINUX_NTFS_MFT_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "inode.h"</div><div class='del'>-</div><div class='del'>-extern MFT_RECORD *map_mft_record(ntfs_inode *ni);</div><div class='del'>-extern void unmap_mft_record(ntfs_inode *ni);</div><div class='del'>-</div><div class='del'>-extern MFT_RECORD *map_extent_mft_record(ntfs_inode *base_ni, MFT_REF mref,</div><div class='del'>-		ntfs_inode **ntfs_ino);</div><div class='del'>-</div><div class='del'>-static inline void unmap_extent_mft_record(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * flush_dcache_mft_record_page - flush_dcache_page() for mft records</div><div class='del'>- * @ni:		ntfs inode structure of mft record</div><div class='del'>- *</div><div class='del'>- * Call flush_dcache_page() for the page in which an mft record resides.</div><div class='del'>- *</div><div class='del'>- * This must be called every time an mft record is modified, just after the</div><div class='del'>- * modification.</div><div class='del'>- */</div><div class='del'>-static inline void flush_dcache_mft_record_page(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	flush_dcache_page(ni-&gt;page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void __mark_mft_record_dirty(ntfs_inode *ni);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * mark_mft_record_dirty - set the mft record and the page containing it dirty</div><div class='del'>- * @ni:		ntfs inode describing the mapped mft record</div><div class='del'>- *</div><div class='del'>- * Set the mapped (extent) mft record of the (base or extent) ntfs inode @ni,</div><div class='del'>- * as well as the page containing the mft record, dirty.  Also, mark the base</div><div class='del'>- * vfs inode dirty.  This ensures that any changes to the mft record are</div><div class='del'>- * written out to disk.</div><div class='del'>- *</div><div class='del'>- * NOTE:  Do not do anything if the mft record is already marked dirty.</div><div class='del'>- */</div><div class='del'>-static inline void mark_mft_record_dirty(ntfs_inode *ni)</div><div class='del'>-{</div><div class='del'>-	if (!NInoTestSetDirty(ni))</div><div class='del'>-		__mark_mft_record_dirty(ni);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,</div><div class='del'>-		MFT_RECORD *m, int sync);</div><div class='del'>-</div><div class='del'>-extern int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * write_mft_record - write out a mapped (extent) mft record</div><div class='del'>- * @ni:		ntfs inode describing the mapped (extent) mft record</div><div class='del'>- * @m:		mapped (extent) mft record to write</div><div class='del'>- * @sync:	if true, wait for i/o completion</div><div class='del'>- *</div><div class='del'>- * This is just a wrapper for write_mft_record_nolock() (see mft.c), which</div><div class='del'>- * locks the page for the duration of the write.  This ensures that there are</div><div class='del'>- * no race conditions between writing the mft record via the dirty inode code</div><div class='del'>- * paths and via the page cache write back code paths or between writing</div><div class='del'>- * neighbouring mft records residing in the same page.</div><div class='del'>- *</div><div class='del'>- * Locking the page also serializes us against -&gt;read_folio() if the page is not</div><div class='del'>- * uptodate.</div><div class='del'>- *</div><div class='del'>- * On success, clean the mft record and return 0.  On error, leave the mft</div><div class='del'>- * record dirty and return -errno.</div><div class='del'>- */</div><div class='del'>-static inline int write_mft_record(ntfs_inode *ni, MFT_RECORD *m, int sync)</div><div class='del'>-{</div><div class='del'>-	struct page *page = ni-&gt;page;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!page);</div><div class='del'>-	lock_page(page);</div><div class='del'>-	err = write_mft_record_nolock(ni, m, sync);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern bool ntfs_may_write_mft_record(ntfs_volume *vol,</div><div class='del'>-		const unsigned long mft_no, const MFT_RECORD *m,</div><div class='del'>-		ntfs_inode **locked_ni);</div><div class='del'>-</div><div class='del'>-extern ntfs_inode *ntfs_mft_record_alloc(ntfs_volume *vol, const int mode,</div><div class='del'>-		ntfs_inode *base_ni, MFT_RECORD **mrec);</div><div class='del'>-extern int ntfs_extent_mft_record_free(ntfs_inode *ni, MFT_RECORD *m);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_MFT_H */</div><div class='head'>diff --git a/fs/ntfs/mst.c b/fs/ntfs/mst.c<br/>deleted file mode 100644<br/>index 16b3c884abfc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/mst.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/mst.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,189 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * mst.c - NTFS multi sector transfer protection handling code. Part of the</div><div class='del'>- *	   Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * post_read_mst_fixup - deprotect multi sector transfer protected data</div><div class='del'>- * @b:		pointer to the data to deprotect</div><div class='del'>- * @size:	size in bytes of @b</div><div class='del'>- *</div><div class='del'>- * Perform the necessary post read multi sector transfer fixup and detect the</div><div class='del'>- * presence of incomplete multi sector transfers. - In that case, overwrite the</div><div class='del'>- * magic of the ntfs record header being processed with "BAAD" (in memory only!)</div><div class='del'>- * and abort processing.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -EINVAL on error ("BAAD" magic will be present).</div><div class='del'>- *</div><div class='del'>- * NOTE: We consider the absence / invalidity of an update sequence array to</div><div class='del'>- * mean that the structure is not protected at all and hence doesn't need to</div><div class='del'>- * be fixed up. Thus, we return success and not failure in this case. This is</div><div class='del'>- * in contrast to pre_write_mst_fixup(), see below.</div><div class='del'>- */</div><div class='del'>-int post_read_mst_fixup(NTFS_RECORD *b, const u32 size)</div><div class='del'>-{</div><div class='del'>-	u16 usa_ofs, usa_count, usn;</div><div class='del'>-	u16 *usa_pos, *data_pos;</div><div class='del'>-</div><div class='del'>-	/* Setup the variables. */</div><div class='del'>-	usa_ofs = le16_to_cpu(b-&gt;usa_ofs);</div><div class='del'>-	/* Decrement usa_count to get number of fixups. */</div><div class='del'>-	usa_count = le16_to_cpu(b-&gt;usa_count) - 1;</div><div class='del'>-	/* Size and alignment checks. */</div><div class='del'>-	if ( size &amp; (NTFS_BLOCK_SIZE - 1)	||</div><div class='del'>-	     usa_ofs &amp; 1			||</div><div class='del'>-	     usa_ofs + (usa_count * 2) &gt; size	||</div><div class='del'>-	     (size &gt;&gt; NTFS_BLOCK_SIZE_BITS) != usa_count)</div><div class='del'>-		return 0;</div><div class='del'>-	/* Position of usn in update sequence array. */</div><div class='del'>-	usa_pos = (u16*)b + usa_ofs/sizeof(u16);</div><div class='del'>-	/*</div><div class='del'>-	 * The update sequence number which has to be equal to each of the</div><div class='del'>-	 * u16 values before they are fixed up. Note no need to care for</div><div class='del'>-	 * endianness since we are comparing and moving data for on disk</div><div class='del'>-	 * structures which means the data is consistent. - If it is</div><div class='del'>-	 * consistenty the wrong endianness it doesn't make any difference.</div><div class='del'>-	 */</div><div class='del'>-	usn = *usa_pos;</div><div class='del'>-	/*</div><div class='del'>-	 * Position in protected data of first u16 that needs fixing up.</div><div class='del'>-	 */</div><div class='del'>-	data_pos = (u16*)b + NTFS_BLOCK_SIZE/sizeof(u16) - 1;</div><div class='del'>-	/*</div><div class='del'>-	 * Check for incomplete multi sector transfer(s).</div><div class='del'>-	 */</div><div class='del'>-	while (usa_count--) {</div><div class='del'>-		if (*data_pos != usn) {</div><div class='del'>-			/*</div><div class='del'>-			 * Incomplete multi sector transfer detected! )-:</div><div class='del'>-			 * Set the magic to "BAAD" and return failure.</div><div class='del'>-			 * Note that magic_BAAD is already converted to le32.</div><div class='del'>-			 */</div><div class='del'>-			b-&gt;magic = magic_BAAD;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		data_pos += NTFS_BLOCK_SIZE/sizeof(u16);</div><div class='del'>-	}</div><div class='del'>-	/* Re-setup the variables. */</div><div class='del'>-	usa_count = le16_to_cpu(b-&gt;usa_count) - 1;</div><div class='del'>-	data_pos = (u16*)b + NTFS_BLOCK_SIZE/sizeof(u16) - 1;</div><div class='del'>-	/* Fixup all sectors. */</div><div class='del'>-	while (usa_count--) {</div><div class='del'>-		/*</div><div class='del'>-		 * Increment position in usa and restore original data from</div><div class='del'>-		 * the usa into the data buffer.</div><div class='del'>-		 */</div><div class='del'>-		*data_pos = *(++usa_pos);</div><div class='del'>-		/* Increment position in data as well. */</div><div class='del'>-		data_pos += NTFS_BLOCK_SIZE/sizeof(u16);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pre_write_mst_fixup - apply multi sector transfer protection</div><div class='del'>- * @b:		pointer to the data to protect</div><div class='del'>- * @size:	size in bytes of @b</div><div class='del'>- *</div><div class='del'>- * Perform the necessary pre write multi sector transfer fixup on the data</div><div class='del'>- * pointer to by @b of @size.</div><div class='del'>- *</div><div class='del'>- * Return 0 if fixup applied (success) or -EINVAL if no fixup was performed</div><div class='del'>- * (assumed not needed). This is in contrast to post_read_mst_fixup() above.</div><div class='del'>- *</div><div class='del'>- * NOTE: We consider the absence / invalidity of an update sequence array to</div><div class='del'>- * mean that the structure is not subject to protection and hence doesn't need</div><div class='del'>- * to be fixed up. This means that you have to create a valid update sequence</div><div class='del'>- * array header in the ntfs record before calling this function, otherwise it</div><div class='del'>- * will fail (the header needs to contain the position of the update sequence</div><div class='del'>- * array together with the number of elements in the array). You also need to</div><div class='del'>- * initialise the update sequence number before calling this function</div><div class='del'>- * otherwise a random word will be used (whatever was in the record at that</div><div class='del'>- * position at that time).</div><div class='del'>- */</div><div class='del'>-int pre_write_mst_fixup(NTFS_RECORD *b, const u32 size)</div><div class='del'>-{</div><div class='del'>-	le16 *usa_pos, *data_pos;</div><div class='del'>-	u16 usa_ofs, usa_count, usn;</div><div class='del'>-	le16 le_usn;</div><div class='del'>-</div><div class='del'>-	/* Sanity check + only fixup if it makes sense. */</div><div class='del'>-	if (!b || ntfs_is_baad_record(b-&gt;magic) ||</div><div class='del'>-			ntfs_is_hole_record(b-&gt;magic))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/* Setup the variables. */</div><div class='del'>-	usa_ofs = le16_to_cpu(b-&gt;usa_ofs);</div><div class='del'>-	/* Decrement usa_count to get number of fixups. */</div><div class='del'>-	usa_count = le16_to_cpu(b-&gt;usa_count) - 1;</div><div class='del'>-	/* Size and alignment checks. */</div><div class='del'>-	if ( size &amp; (NTFS_BLOCK_SIZE - 1)	||</div><div class='del'>-	     usa_ofs &amp; 1			||</div><div class='del'>-	     usa_ofs + (usa_count * 2) &gt; size	||</div><div class='del'>-	     (size &gt;&gt; NTFS_BLOCK_SIZE_BITS) != usa_count)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/* Position of usn in update sequence array. */</div><div class='del'>-	usa_pos = (le16*)((u8*)b + usa_ofs);</div><div class='del'>-	/*</div><div class='del'>-	 * Cyclically increment the update sequence number</div><div class='del'>-	 * (skipping 0 and -1, i.e. 0xffff).</div><div class='del'>-	 */</div><div class='del'>-	usn = le16_to_cpup(usa_pos) + 1;</div><div class='del'>-	if (usn == 0xffff || !usn)</div><div class='del'>-		usn = 1;</div><div class='del'>-	le_usn = cpu_to_le16(usn);</div><div class='del'>-	*usa_pos = le_usn;</div><div class='del'>-	/* Position in data of first u16 that needs fixing up. */</div><div class='del'>-	data_pos = (le16*)b + NTFS_BLOCK_SIZE/sizeof(le16) - 1;</div><div class='del'>-	/* Fixup all sectors. */</div><div class='del'>-	while (usa_count--) {</div><div class='del'>-		/*</div><div class='del'>-		 * Increment the position in the usa and save the</div><div class='del'>-		 * original data from the data buffer into the usa.</div><div class='del'>-		 */</div><div class='del'>-		*(++usa_pos) = *data_pos;</div><div class='del'>-		/* Apply fixup to data. */</div><div class='del'>-		*data_pos = le_usn;</div><div class='del'>-		/* Increment position in data as well. */</div><div class='del'>-		data_pos += NTFS_BLOCK_SIZE/sizeof(le16);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * post_write_mst_fixup - fast deprotect multi sector transfer protected data</div><div class='del'>- * @b:		pointer to the data to deprotect</div><div class='del'>- *</div><div class='del'>- * Perform the necessary post write multi sector transfer fixup, not checking</div><div class='del'>- * for any errors, because we assume we have just used pre_write_mst_fixup(),</div><div class='del'>- * thus the data will be fine or we would never have gotten here.</div><div class='del'>- */</div><div class='del'>-void post_write_mst_fixup(NTFS_RECORD *b)</div><div class='del'>-{</div><div class='del'>-	le16 *usa_pos, *data_pos;</div><div class='del'>-</div><div class='del'>-	u16 usa_ofs = le16_to_cpu(b-&gt;usa_ofs);</div><div class='del'>-	u16 usa_count = le16_to_cpu(b-&gt;usa_count) - 1;</div><div class='del'>-</div><div class='del'>-	/* Position of usn in update sequence array. */</div><div class='del'>-	usa_pos = (le16*)b + usa_ofs/sizeof(le16);</div><div class='del'>-</div><div class='del'>-	/* Position in protected data of first u16 that needs fixing up. */</div><div class='del'>-	data_pos = (le16*)b + NTFS_BLOCK_SIZE/sizeof(le16) - 1;</div><div class='del'>-</div><div class='del'>-	/* Fixup all sectors. */</div><div class='del'>-	while (usa_count--) {</div><div class='del'>-		/*</div><div class='del'>-		 * Increment position in usa and restore original data from</div><div class='del'>-		 * the usa into the data buffer.</div><div class='del'>-		 */</div><div class='del'>-		*data_pos = *(++usa_pos);</div><div class='del'>-</div><div class='del'>-		/* Increment position in data as well. */</div><div class='del'>-		data_pos += NTFS_BLOCK_SIZE/sizeof(le16);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c<br/>deleted file mode 100644<br/>index d7498ddc4a72..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/namei.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,392 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * namei.c - NTFS kernel directory inode operations. Part of the Linux-NTFS</div><div class='del'>- *	     project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2006 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dcache.h&gt;</div><div class='del'>-#include &lt;linux/exportfs.h&gt;</div><div class='del'>-#include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "attrib.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "dir.h"</div><div class='del'>-#include "mft.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_lookup - find the inode represented by a dentry in a directory inode</div><div class='del'>- * @dir_ino:	directory inode in which to look for the inode</div><div class='del'>- * @dent:	dentry representing the inode to look for</div><div class='del'>- * @flags:	lookup flags</div><div class='del'>- *</div><div class='del'>- * In short, ntfs_lookup() looks for the inode represented by the dentry @dent</div><div class='del'>- * in the directory inode @dir_ino and if found attaches the inode to the</div><div class='del'>- * dentry @dent.</div><div class='del'>- *</div><div class='del'>- * In more detail, the dentry @dent specifies which inode to look for by</div><div class='del'>- * supplying the name of the inode in @dent-&gt;d_name.name. ntfs_lookup()</div><div class='del'>- * converts the name to Unicode and walks the contents of the directory inode</div><div class='del'>- * @dir_ino looking for the converted Unicode name. If the name is found in the</div><div class='del'>- * directory, the corresponding inode is loaded by calling ntfs_iget() on its</div><div class='del'>- * inode number and the inode is associated with the dentry @dent via a call to</div><div class='del'>- * d_splice_alias().</div><div class='del'>- *</div><div class='del'>- * If the name is not found in the directory, a NULL inode is inserted into the</div><div class='del'>- * dentry @dent via a call to d_add(). The dentry is then termed a negative</div><div class='del'>- * dentry.</div><div class='del'>- *</div><div class='del'>- * Only if an actual error occurs, do we return an error via ERR_PTR().</div><div class='del'>- *</div><div class='del'>- * In order to handle the case insensitivity issues of NTFS with regards to the</div><div class='del'>- * dcache and the dcache requiring only one dentry per directory, we deal with</div><div class='del'>- * dentry aliases that only differ in case in -&gt;ntfs_lookup() while maintaining</div><div class='del'>- * a case sensitive dcache. This means that we get the full benefit of dcache</div><div class='del'>- * speed when the file/directory is looked up with the same case as returned by</div><div class='del'>- * -&gt;ntfs_readdir() but that a lookup for any other case (or for the short file</div><div class='del'>- * name) will not find anything in dcache and will enter -&gt;ntfs_lookup()</div><div class='del'>- * instead, where we search the directory for a fully matching file name</div><div class='del'>- * (including case) and if that is not found, we search for a file name that</div><div class='del'>- * matches with different case and if that has non-POSIX semantics we return</div><div class='del'>- * that. We actually do only one search (case sensitive) and keep tabs on</div><div class='del'>- * whether we have found a case insensitive match in the process.</div><div class='del'>- *</div><div class='del'>- * To simplify matters for us, we do not treat the short vs long filenames as</div><div class='del'>- * two hard links but instead if the lookup matches a short filename, we</div><div class='del'>- * return the dentry for the corresponding long filename instead.</div><div class='del'>- *</div><div class='del'>- * There are three cases we need to distinguish here:</div><div class='del'>- *</div><div class='del'>- * 1) @dent perfectly matches (i.e. including case) a directory entry with a</div><div class='del'>- *    file name in the WIN32 or POSIX namespaces. In this case</div><div class='del'>- *    ntfs_lookup_inode_by_name() will return with name set to NULL and we</div><div class='del'>- *    just d_splice_alias() @dent.</div><div class='del'>- * 2) @dent matches (not including case) a directory entry with a file name in</div><div class='del'>- *    the WIN32 namespace. In this case ntfs_lookup_inode_by_name() will return</div><div class='del'>- *    with name set to point to a kmalloc()ed ntfs_name structure containing</div><div class='del'>- *    the properly cased little endian Unicode name. We convert the name to the</div><div class='del'>- *    current NLS code page, search if a dentry with this name already exists</div><div class='del'>- *    and if so return that instead of @dent.  At this point things are</div><div class='del'>- *    complicated by the possibility of 'disconnected' dentries due to NFS</div><div class='del'>- *    which we deal with appropriately (see the code comments).  The VFS will</div><div class='del'>- *    then destroy the old @dent and use the one we returned.  If a dentry is</div><div class='del'>- *    not found, we allocate a new one, d_splice_alias() it, and return it as</div><div class='del'>- *    above.</div><div class='del'>- * 3) @dent matches either perfectly or not (i.e. we don't care about case) a</div><div class='del'>- *    directory entry with a file name in the DOS namespace. In this case</div><div class='del'>- *    ntfs_lookup_inode_by_name() will return with name set to point to a</div><div class='del'>- *    kmalloc()ed ntfs_name structure containing the mft reference (cpu endian)</div><div class='del'>- *    of the inode. We use the mft reference to read the inode and to find the</div><div class='del'>- *    file name in the WIN32 namespace corresponding to the matched short file</div><div class='del'>- *    name. We then convert the name to the current NLS code page, and proceed</div><div class='del'>- *    searching for a dentry with this name, etc, as in case 2), above.</div><div class='del'>- *</div><div class='del'>- * Locking: Caller must hold i_mutex on the directory.</div><div class='del'>- */</div><div class='del'>-static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent,</div><div class='del'>-		unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(dir_ino-&gt;i_sb);</div><div class='del'>-	struct inode *dent_inode;</div><div class='del'>-	ntfschar *uname;</div><div class='del'>-	ntfs_name *name = NULL;</div><div class='del'>-	MFT_REF mref;</div><div class='del'>-	unsigned long dent_ino;</div><div class='del'>-	int uname_len;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Looking up %pd in directory inode 0x%lx.",</div><div class='del'>-			dent, dir_ino-&gt;i_ino);</div><div class='del'>-	/* Convert the name of the dentry to Unicode. */</div><div class='del'>-	uname_len = ntfs_nlstoucs(vol, dent-&gt;d_name.name, dent-&gt;d_name.len,</div><div class='del'>-			&amp;uname);</div><div class='del'>-	if (uname_len &lt; 0) {</div><div class='del'>-		if (uname_len != -ENAMETOOLONG)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to convert name to "</div><div class='del'>-					"Unicode.");</div><div class='del'>-		return ERR_PTR(uname_len);</div><div class='del'>-	}</div><div class='del'>-	mref = ntfs_lookup_inode_by_name(NTFS_I(dir_ino), uname, uname_len,</div><div class='del'>-			&amp;name);</div><div class='del'>-	kmem_cache_free(ntfs_name_cache, uname);</div><div class='del'>-	if (!IS_ERR_MREF(mref)) {</div><div class='del'>-		dent_ino = MREF(mref);</div><div class='del'>-		ntfs_debug("Found inode 0x%lx. Calling ntfs_iget.", dent_ino);</div><div class='del'>-		dent_inode = ntfs_iget(vol-&gt;sb, dent_ino);</div><div class='del'>-		if (!IS_ERR(dent_inode)) {</div><div class='del'>-			/* Consistency check. */</div><div class='del'>-			if (is_bad_inode(dent_inode) || MSEQNO(mref) ==</div><div class='del'>-					NTFS_I(dent_inode)-&gt;seq_no ||</div><div class='del'>-					dent_ino == FILE_MFT) {</div><div class='del'>-				/* Perfect WIN32/POSIX match. -- Case 1. */</div><div class='del'>-				if (!name) {</div><div class='del'>-					ntfs_debug("Done.  (Case 1.)");</div><div class='del'>-					return d_splice_alias(dent_inode, dent);</div><div class='del'>-				}</div><div class='del'>-				/*</div><div class='del'>-				 * We are too indented.  Handle imperfect</div><div class='del'>-				 * matches and short file names further below.</div><div class='del'>-				 */</div><div class='del'>-				goto handle_name;</div><div class='del'>-			}</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Found stale reference to inode "</div><div class='del'>-					"0x%lx (reference sequence number = "</div><div class='del'>-					"0x%x, inode sequence number = 0x%x), "</div><div class='del'>-					"returning -EIO. Run chkdsk.",</div><div class='del'>-					dent_ino, MSEQNO(mref),</div><div class='del'>-					NTFS_I(dent_inode)-&gt;seq_no);</div><div class='del'>-			iput(dent_inode);</div><div class='del'>-			dent_inode = ERR_PTR(-EIO);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_error(vol-&gt;sb, "ntfs_iget(0x%lx) failed with "</div><div class='del'>-					"error code %li.", dent_ino,</div><div class='del'>-					PTR_ERR(dent_inode));</div><div class='del'>-		kfree(name);</div><div class='del'>-		/* Return the error code. */</div><div class='del'>-		return ERR_CAST(dent_inode);</div><div class='del'>-	}</div><div class='del'>-	/* It is guaranteed that @name is no longer allocated at this point. */</div><div class='del'>-	if (MREF_ERR(mref) == -ENOENT) {</div><div class='del'>-		ntfs_debug("Entry was not found, adding negative dentry.");</div><div class='del'>-		/* The dcache will handle negative entries. */</div><div class='del'>-		d_add(dent, NULL);</div><div class='del'>-		ntfs_debug("Done.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(vol-&gt;sb, "ntfs_lookup_ino_by_name() failed with error "</div><div class='del'>-			"code %i.", -MREF_ERR(mref));</div><div class='del'>-	return ERR_PTR(MREF_ERR(mref));</div><div class='del'>-	// TODO: Consider moving this lot to a separate function! (AIA)</div><div class='del'>-handle_name:</div><div class='del'>-   {</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	ntfs_inode *ni = NTFS_I(dent_inode);</div><div class='del'>-	int err;</div><div class='del'>-	struct qstr nls_name;</div><div class='del'>-</div><div class='del'>-	nls_name.name = NULL;</div><div class='del'>-	if (name-&gt;type != FILE_NAME_DOS) {			/* Case 2. */</div><div class='del'>-		ntfs_debug("Case 2.");</div><div class='del'>-		nls_name.len = (unsigned)ntfs_ucstonls(vol,</div><div class='del'>-				(ntfschar*)&amp;name-&gt;name, name-&gt;len,</div><div class='del'>-				(unsigned char**)&amp;nls_name.name, 0);</div><div class='del'>-		kfree(name);</div><div class='del'>-	} else /* if (name-&gt;type == FILE_NAME_DOS) */ {		/* Case 3. */</div><div class='del'>-		FILE_NAME_ATTR *fn;</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Case 3.");</div><div class='del'>-		kfree(name);</div><div class='del'>-</div><div class='del'>-		/* Find the WIN32 name corresponding to the matched DOS name. */</div><div class='del'>-		ni = NTFS_I(dent_inode);</div><div class='del'>-		m = map_mft_record(ni);</div><div class='del'>-		if (IS_ERR(m)) {</div><div class='del'>-			err = PTR_ERR(m);</div><div class='del'>-			m = NULL;</div><div class='del'>-			ctx = NULL;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		ctx = ntfs_attr_get_search_ctx(ni, m);</div><div class='del'>-		if (unlikely(!ctx)) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		do {</div><div class='del'>-			ATTR_RECORD *a;</div><div class='del'>-			u32 val_len;</div><div class='del'>-</div><div class='del'>-			err = ntfs_attr_lookup(AT_FILE_NAME, NULL, 0, 0, 0,</div><div class='del'>-					NULL, 0, ctx);</div><div class='del'>-			if (unlikely(err)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Inode corrupt: No WIN32 "</div><div class='del'>-						"namespace counterpart to DOS "</div><div class='del'>-						"file name. Run chkdsk.");</div><div class='del'>-				if (err == -ENOENT)</div><div class='del'>-					err = -EIO;</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Consistency checks. */</div><div class='del'>-			a = ctx-&gt;attr;</div><div class='del'>-			if (a-&gt;non_resident || a-&gt;flags)</div><div class='del'>-				goto eio_err_out;</div><div class='del'>-			val_len = le32_to_cpu(a-&gt;data.resident.value_length);</div><div class='del'>-			if (le16_to_cpu(a-&gt;data.resident.value_offset) +</div><div class='del'>-					val_len &gt; le32_to_cpu(a-&gt;length))</div><div class='del'>-				goto eio_err_out;</div><div class='del'>-			fn = (FILE_NAME_ATTR*)((u8*)ctx-&gt;attr + le16_to_cpu(</div><div class='del'>-					ctx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-			if ((u32)(fn-&gt;file_name_length * sizeof(ntfschar) +</div><div class='del'>-					sizeof(FILE_NAME_ATTR)) &gt; val_len)</div><div class='del'>-				goto eio_err_out;</div><div class='del'>-		} while (fn-&gt;file_name_type != FILE_NAME_WIN32);</div><div class='del'>-</div><div class='del'>-		/* Convert the found WIN32 name to current NLS code page. */</div><div class='del'>-		nls_name.len = (unsigned)ntfs_ucstonls(vol,</div><div class='del'>-				(ntfschar*)&amp;fn-&gt;file_name, fn-&gt;file_name_length,</div><div class='del'>-				(unsigned char**)&amp;nls_name.name, 0);</div><div class='del'>-</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-	}</div><div class='del'>-	m = NULL;</div><div class='del'>-	ctx = NULL;</div><div class='del'>-</div><div class='del'>-	/* Check if a conversion error occurred. */</div><div class='del'>-	if ((signed)nls_name.len &lt; 0) {</div><div class='del'>-		err = (signed)nls_name.len;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	nls_name.hash = full_name_hash(dent, nls_name.name, nls_name.len);</div><div class='del'>-</div><div class='del'>-	dent = d_add_ci(dent, dent_inode, &amp;nls_name);</div><div class='del'>-	kfree(nls_name.name);</div><div class='del'>-	return dent;</div><div class='del'>-</div><div class='del'>-eio_err_out:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Illegal file name attribute. Run chkdsk.");</div><div class='del'>-	err = -EIO;</div><div class='del'>-err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	if (m)</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-	iput(dent_inode);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed, returning error code %i.", err);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-   }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Inode operations for directories.</div><div class='del'>- */</div><div class='del'>-const struct inode_operations ntfs_dir_inode_ops = {</div><div class='del'>-	.lookup	= ntfs_lookup,	/* VFS: Lookup directory. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_get_parent - find the dentry of the parent of a given directory dentry</div><div class='del'>- * @child_dent:		dentry of the directory whose parent directory to find</div><div class='del'>- *</div><div class='del'>- * Find the dentry for the parent directory of the directory specified by the</div><div class='del'>- * dentry @child_dent.  This function is called from</div><div class='del'>- * fs/exportfs/expfs.c::find_exported_dentry() which in turn is called from the</div><div class='del'>- * default -&gt;decode_fh() which is export_decode_fh() in the same file.</div><div class='del'>- *</div><div class='del'>- * The code is based on the ext3 -&gt;get_parent() implementation found in</div><div class='del'>- * fs/ext3/namei.c::ext3_get_parent().</div><div class='del'>- *</div><div class='del'>- * Note: ntfs_get_parent() is called with @d_inode(child_dent)-&gt;i_mutex down.</div><div class='del'>- *</div><div class='del'>- * Return the dentry of the parent directory on success or the error code on</div><div class='del'>- * error (IS_ERR() is true).</div><div class='del'>- */</div><div class='del'>-static struct dentry *ntfs_get_parent(struct dentry *child_dent)</div><div class='del'>-{</div><div class='del'>-	struct inode *vi = d_inode(child_dent);</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vi);</div><div class='del'>-	MFT_RECORD *mrec;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	ATTR_RECORD *attr;</div><div class='del'>-	FILE_NAME_ATTR *fn;</div><div class='del'>-	unsigned long parent_ino;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for inode 0x%lx.", vi-&gt;i_ino);</div><div class='del'>-	/* Get the mft record of the inode belonging to the child dentry. */</div><div class='del'>-	mrec = map_mft_record(ni);</div><div class='del'>-	if (IS_ERR(mrec))</div><div class='del'>-		return ERR_CAST(mrec);</div><div class='del'>-	/* Find the first file name attribute in the mft record. */</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(ni, mrec);</div><div class='del'>-	if (unlikely(!ctx)) {</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-try_next:</div><div class='del'>-	err = ntfs_attr_lookup(AT_FILE_NAME, NULL, 0, CASE_SENSITIVE, 0, NULL,</div><div class='del'>-			0, ctx);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-		unmap_mft_record(ni);</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			ntfs_error(vi-&gt;i_sb, "Inode 0x%lx does not have a "</div><div class='del'>-					"file name attribute.  Run chkdsk.",</div><div class='del'>-					vi-&gt;i_ino);</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-	attr = ctx-&gt;attr;</div><div class='del'>-	if (unlikely(attr-&gt;non_resident))</div><div class='del'>-		goto try_next;</div><div class='del'>-	fn = (FILE_NAME_ATTR *)((u8 *)attr +</div><div class='del'>-			le16_to_cpu(attr-&gt;data.resident.value_offset));</div><div class='del'>-	if (unlikely((u8 *)fn + le32_to_cpu(attr-&gt;data.resident.value_length) &gt;</div><div class='del'>-			(u8*)attr + le32_to_cpu(attr-&gt;length)))</div><div class='del'>-		goto try_next;</div><div class='del'>-	/* Get the inode number of the parent directory. */</div><div class='del'>-	parent_ino = MREF_LE(fn-&gt;parent_directory);</div><div class='del'>-	/* Release the search context and the mft record of the child. */</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-</div><div class='del'>-	return d_obtain_alias(ntfs_iget(vi-&gt;i_sb, parent_ino));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct inode *ntfs_nfs_get_inode(struct super_block *sb,</div><div class='del'>-		u64 ino, u32 generation)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	inode = ntfs_iget(sb, ino);</div><div class='del'>-	if (!IS_ERR(inode)) {</div><div class='del'>-		if (is_bad_inode(inode) || inode-&gt;i_generation != generation) {</div><div class='del'>-			iput(inode);</div><div class='del'>-			inode = ERR_PTR(-ESTALE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *ntfs_fh_to_dentry(struct super_block *sb, struct fid *fid,</div><div class='del'>-		int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,</div><div class='del'>-				    ntfs_nfs_get_inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *ntfs_fh_to_parent(struct super_block *sb, struct fid *fid,</div><div class='del'>-		int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	return generic_fh_to_parent(sb, fid, fh_len, fh_type,</div><div class='del'>-				    ntfs_nfs_get_inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Export operations allowing NFS exporting of mounted NTFS partitions.</div><div class='del'>- *</div><div class='del'>- * We use the default -&gt;encode_fh() for now.  Note that they</div><div class='del'>- * use 32 bits to store the inode number which is an unsigned long so on 64-bit</div><div class='del'>- * architectures is usually 64 bits so it would all fail horribly on huge</div><div class='del'>- * volumes.  I guess we need to define our own encode and decode fh functions</div><div class='del'>- * that store 64-bit inode numbers at some point but for now we will ignore the</div><div class='del'>- * problem...</div><div class='del'>- *</div><div class='del'>- * We also use the default -&gt;get_name() helper (used by -&gt;decode_fh() via</div><div class='del'>- * fs/exportfs/expfs.c::find_exported_dentry()) as that is completely fs</div><div class='del'>- * independent.</div><div class='del'>- *</div><div class='del'>- * The default -&gt;get_parent() just returns -EACCES so we have to provide our</div><div class='del'>- * own and the default -&gt;get_dentry() is incompatible with NTFS due to not</div><div class='del'>- * allowing the inode number 0 which is used in NTFS for the system file $MFT</div><div class='del'>- * and due to using iget() whereas NTFS needs ntfs_iget().</div><div class='del'>- */</div><div class='del'>-const struct export_operations ntfs_export_ops = {</div><div class='del'>-	.encode_fh	= generic_encode_ino32_fh,</div><div class='del'>-	.get_parent	= ntfs_get_parent,	/* Find the parent of a given</div><div class='del'>-						   directory. */</div><div class='del'>-	.fh_to_dentry	= ntfs_fh_to_dentry,</div><div class='del'>-	.fh_to_parent	= ntfs_fh_to_parent,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h<br/>deleted file mode 100644<br/>index e81376ea9152..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/ntfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/ntfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,150 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * ntfs.h - Defines for NTFS Linux kernel driver.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- * Copyright (C) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_H</div><div class='del'>-#define _LINUX_NTFS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/nls.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	NTFS_BLOCK_SIZE		= 512,</div><div class='del'>-	NTFS_BLOCK_SIZE_BITS	= 9,</div><div class='del'>-	NTFS_SB_MAGIC		= 0x5346544e,	/* 'NTFS' */</div><div class='del'>-	NTFS_MAX_NAME_LEN	= 255,</div><div class='del'>-	NTFS_MAX_ATTR_NAME_LEN	= 255,</div><div class='del'>-	NTFS_MAX_CLUSTER_SIZE	= 64 * 1024,	/* 64kiB */</div><div class='del'>-	NTFS_MAX_PAGES_PER_CLUSTER = NTFS_MAX_CLUSTER_SIZE / PAGE_SIZE,</div><div class='del'>-} NTFS_CONSTANTS;</div><div class='del'>-</div><div class='del'>-/* Global variables. */</div><div class='del'>-</div><div class='del'>-/* Slab caches (from super.c). */</div><div class='del'>-extern struct kmem_cache *ntfs_name_cache;</div><div class='del'>-extern struct kmem_cache *ntfs_inode_cache;</div><div class='del'>-extern struct kmem_cache *ntfs_big_inode_cache;</div><div class='del'>-extern struct kmem_cache *ntfs_attr_ctx_cache;</div><div class='del'>-extern struct kmem_cache *ntfs_index_ctx_cache;</div><div class='del'>-</div><div class='del'>-/* The various operations structs defined throughout the driver files. */</div><div class='del'>-extern const struct address_space_operations ntfs_normal_aops;</div><div class='del'>-extern const struct address_space_operations ntfs_compressed_aops;</div><div class='del'>-extern const struct address_space_operations ntfs_mst_aops;</div><div class='del'>-</div><div class='del'>-extern const struct  file_operations ntfs_file_ops;</div><div class='del'>-extern const struct inode_operations ntfs_file_inode_ops;</div><div class='del'>-</div><div class='del'>-extern const struct  file_operations ntfs_dir_ops;</div><div class='del'>-extern const struct inode_operations ntfs_dir_inode_ops;</div><div class='del'>-</div><div class='del'>-extern const struct  file_operations ntfs_empty_file_ops;</div><div class='del'>-extern const struct inode_operations ntfs_empty_inode_ops;</div><div class='del'>-</div><div class='del'>-extern const struct export_operations ntfs_export_ops;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * NTFS_SB - return the ntfs volume given a vfs super block</div><div class='del'>- * @sb:		VFS super block</div><div class='del'>- *</div><div class='del'>- * NTFS_SB() returns the ntfs volume associated with the VFS super block @sb.</div><div class='del'>- */</div><div class='del'>-static inline ntfs_volume *NTFS_SB(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return sb-&gt;s_fs_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Declarations of functions and global variables. */</div><div class='del'>-</div><div class='del'>-/* From fs/ntfs/compress.c */</div><div class='del'>-extern int ntfs_read_compressed_block(struct page *page);</div><div class='del'>-extern int allocate_compression_buffers(void);</div><div class='del'>-extern void free_compression_buffers(void);</div><div class='del'>-</div><div class='del'>-/* From fs/ntfs/super.c */</div><div class='del'>-#define default_upcase_len 0x10000</div><div class='del'>-extern struct mutex ntfs_lock;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int val;</div><div class='del'>-	char *str;</div><div class='del'>-} option_t;</div><div class='del'>-extern const option_t on_errors_arr[];</div><div class='del'>-</div><div class='del'>-/* From fs/ntfs/mst.c */</div><div class='del'>-extern int post_read_mst_fixup(NTFS_RECORD *b, const u32 size);</div><div class='del'>-extern int pre_write_mst_fixup(NTFS_RECORD *b, const u32 size);</div><div class='del'>-extern void post_write_mst_fixup(NTFS_RECORD *b);</div><div class='del'>-</div><div class='del'>-/* From fs/ntfs/unistr.c */</div><div class='del'>-extern bool ntfs_are_names_equal(const ntfschar *s1, size_t s1_len,</div><div class='del'>-		const ntfschar *s2, size_t s2_len,</div><div class='del'>-		const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_size);</div><div class='del'>-extern int ntfs_collate_names(const ntfschar *name1, const u32 name1_len,</div><div class='del'>-		const ntfschar *name2, const u32 name2_len,</div><div class='del'>-		const int err_val, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len);</div><div class='del'>-extern int ntfs_ucsncmp(const ntfschar *s1, const ntfschar *s2, size_t n);</div><div class='del'>-extern int ntfs_ucsncasecmp(const ntfschar *s1, const ntfschar *s2, size_t n,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_size);</div><div class='del'>-extern void ntfs_upcase_name(ntfschar *name, u32 name_len,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len);</div><div class='del'>-extern void ntfs_file_upcase_value(FILE_NAME_ATTR *file_name_attr,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len);</div><div class='del'>-extern int ntfs_file_compare_values(FILE_NAME_ATTR *file_name_attr1,</div><div class='del'>-		FILE_NAME_ATTR *file_name_attr2,</div><div class='del'>-		const int err_val, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len);</div><div class='del'>-extern int ntfs_nlstoucs(const ntfs_volume *vol, const char *ins,</div><div class='del'>-		const int ins_len, ntfschar **outs);</div><div class='del'>-extern int ntfs_ucstonls(const ntfs_volume *vol, const ntfschar *ins,</div><div class='del'>-		const int ins_len, unsigned char **outs, int outs_len);</div><div class='del'>-</div><div class='del'>-/* From fs/ntfs/upcase.c */</div><div class='del'>-extern ntfschar *generate_default_upcase(void);</div><div class='del'>-</div><div class='del'>-static inline int ntfs_ffs(int x)</div><div class='del'>-{</div><div class='del'>-	int r = 1;</div><div class='del'>-</div><div class='del'>-	if (!x)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!(x &amp; 0xffff)) {</div><div class='del'>-		x &gt;&gt;= 16;</div><div class='del'>-		r += 16;</div><div class='del'>-	}</div><div class='del'>-	if (!(x &amp; 0xff)) {</div><div class='del'>-		x &gt;&gt;= 8;</div><div class='del'>-		r += 8;</div><div class='del'>-	}</div><div class='del'>-	if (!(x &amp; 0xf)) {</div><div class='del'>-		x &gt;&gt;= 4;</div><div class='del'>-		r += 4;</div><div class='del'>-	}</div><div class='del'>-	if (!(x &amp; 3)) {</div><div class='del'>-		x &gt;&gt;= 2;</div><div class='del'>-		r += 2;</div><div class='del'>-	}</div><div class='del'>-	if (!(x &amp; 1)) {</div><div class='del'>-		x &gt;&gt;= 1;</div><div class='del'>-		r += 1;</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_H */</div><div class='head'>diff --git a/fs/ntfs/quota.c b/fs/ntfs/quota.c<br/>deleted file mode 100644<br/>index 9160480222fd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/quota.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/quota.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * quota.c - NTFS kernel quota ($Quota) handling.  Part of the Linux-NTFS</div><div class='del'>- *	     project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include "index.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mark_quotas_out_of_date - mark the quotas out of date on an ntfs volume</div><div class='del'>- * @vol:	ntfs volume on which to mark the quotas out of date</div><div class='del'>- *</div><div class='del'>- * Mark the quotas out of date on the ntfs volume @vol and return 'true' on</div><div class='del'>- * success and 'false' on error.</div><div class='del'>- */</div><div class='del'>-bool ntfs_mark_quotas_out_of_date(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	ntfs_index_context *ictx;</div><div class='del'>-	QUOTA_CONTROL_ENTRY *qce;</div><div class='del'>-	const le32 qid = QUOTA_DEFAULTS_ID;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	if (NVolQuotaOutOfDate(vol))</div><div class='del'>-		goto done;</div><div class='del'>-	if (!vol-&gt;quota_ino || !vol-&gt;quota_q_ino) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Quota inodes are not open.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	inode_lock(vol-&gt;quota_q_ino);</div><div class='del'>-	ictx = ntfs_index_ctx_get(NTFS_I(vol-&gt;quota_q_ino));</div><div class='del'>-	if (!ictx) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to get index context.");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_index_lookup(&amp;qid, sizeof(qid), ictx);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err == -ENOENT)</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Quota defaults entry is not "</div><div class='del'>-					"present.");</div><div class='del'>-		else</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Lookup of quota defaults entry "</div><div class='del'>-					"failed.");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	if (ictx-&gt;data_len &lt; offsetof(QUOTA_CONTROL_ENTRY, sid)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Quota defaults entry size is invalid.  "</div><div class='del'>-				"Run chkdsk.");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	qce = (QUOTA_CONTROL_ENTRY*)ictx-&gt;data;</div><div class='del'>-	if (le32_to_cpu(qce-&gt;version) != QUOTA_VERSION) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Quota defaults entry version 0x%x is not "</div><div class='del'>-				"supported.", le32_to_cpu(qce-&gt;version));</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Quota defaults flags = 0x%x.", le32_to_cpu(qce-&gt;flags));</div><div class='del'>-	/* If quotas are already marked out of date, no need to do anything. */</div><div class='del'>-	if (qce-&gt;flags &amp; QUOTA_FLAG_OUT_OF_DATE)</div><div class='del'>-		goto set_done;</div><div class='del'>-	/*</div><div class='del'>-	 * If quota tracking is neither requested, nor enabled and there are no</div><div class='del'>-	 * pending deletes, no need to mark the quotas out of date.</div><div class='del'>-	 */</div><div class='del'>-	if (!(qce-&gt;flags &amp; (QUOTA_FLAG_TRACKING_ENABLED |</div><div class='del'>-			QUOTA_FLAG_TRACKING_REQUESTED |</div><div class='del'>-			QUOTA_FLAG_PENDING_DELETES)))</div><div class='del'>-		goto set_done;</div><div class='del'>-	/*</div><div class='del'>-	 * Set the QUOTA_FLAG_OUT_OF_DATE bit thus marking quotas out of date.</div><div class='del'>-	 * This is verified on WinXP to be sufficient to cause windows to</div><div class='del'>-	 * rescan the volume on boot and update all quota entries.</div><div class='del'>-	 */</div><div class='del'>-	qce-&gt;flags |= QUOTA_FLAG_OUT_OF_DATE;</div><div class='del'>-	/* Ensure the modified flags are written to disk. */</div><div class='del'>-	ntfs_index_entry_flush_dcache_page(ictx);</div><div class='del'>-	ntfs_index_entry_mark_dirty(ictx);</div><div class='del'>-set_done:</div><div class='del'>-	ntfs_index_ctx_put(ictx);</div><div class='del'>-	inode_unlock(vol-&gt;quota_q_ino);</div><div class='del'>-	/*</div><div class='del'>-	 * We set the flag so we do not try to mark the quotas out of date</div><div class='del'>-	 * again on remount.</div><div class='del'>-	 */</div><div class='del'>-	NVolSetQuotaOutOfDate(vol);</div><div class='del'>-done:</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-err_out:</div><div class='del'>-	if (ictx)</div><div class='del'>-		ntfs_index_ctx_put(ictx);</div><div class='del'>-	inode_unlock(vol-&gt;quota_q_ino);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/quota.h b/fs/ntfs/quota.h<br/>deleted file mode 100644<br/>index fe3132a3d6d2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/quota.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/quota.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * quota.h - Defines for NTFS kernel quota ($Quota) handling.  Part of the</div><div class='del'>- *	     Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_QUOTA_H</div><div class='del'>-#define _LINUX_NTFS_QUOTA_H</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-extern bool ntfs_mark_quotas_out_of_date(ntfs_volume *vol);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_QUOTA_H */</div><div class='head'>diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c<br/>deleted file mode 100644<br/>index 0d448e9881f7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/runlist.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/runlist.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1893 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * runlist.c - NTFS runlist handling code.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2007 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002-2005 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "dir.h"</div><div class='del'>-#include "endian.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_mm - runlist memmove</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlist @base.</div><div class='del'>- */</div><div class='del'>-static inline void ntfs_rl_mm(runlist_element *base, int dst, int src,</div><div class='del'>-		int size)</div><div class='del'>-{</div><div class='del'>-	if (likely((dst != src) &amp;&amp; (size &gt; 0)))</div><div class='del'>-		memmove(base + dst, base + src, size * sizeof(*base));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_mc - runlist memory copy</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dstbase and</div><div class='del'>- * @srcbase.</div><div class='del'>- */</div><div class='del'>-static inline void ntfs_rl_mc(runlist_element *dstbase, int dst,</div><div class='del'>-		runlist_element *srcbase, int src, int size)</div><div class='del'>-{</div><div class='del'>-	if (likely(size &gt; 0))</div><div class='del'>-		memcpy(dstbase + dst, srcbase + src, size * sizeof(*dstbase));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_realloc - Reallocate memory for runlists</div><div class='del'>- * @rl:		original runlist</div><div class='del'>- * @old_size:	number of runlist elements in the original runlist @rl</div><div class='del'>- * @new_size:	number of runlist elements we need space for</div><div class='del'>- *</div><div class='del'>- * As the runlists grow, more memory will be required.  To prevent the</div><div class='del'>- * kernel having to allocate and reallocate large numbers of small bits of</div><div class='del'>- * memory, this function returns an entire page of memory.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlist @rl.</div><div class='del'>- *</div><div class='del'>- * N.B.  If the new allocation doesn't require a different number of pages in</div><div class='del'>- *       memory, the function will return the original pointer.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the newly allocated, or recycled, memory.</div><div class='del'>- * On error, return -errno. The following error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- */</div><div class='del'>-static inline runlist_element *ntfs_rl_realloc(runlist_element *rl,</div><div class='del'>-		int old_size, int new_size)</div><div class='del'>-{</div><div class='del'>-	runlist_element *new_rl;</div><div class='del'>-</div><div class='del'>-	old_size = PAGE_ALIGN(old_size * sizeof(*rl));</div><div class='del'>-	new_size = PAGE_ALIGN(new_size * sizeof(*rl));</div><div class='del'>-	if (old_size == new_size)</div><div class='del'>-		return rl;</div><div class='del'>-</div><div class='del'>-	new_rl = ntfs_malloc_nofs(new_size);</div><div class='del'>-	if (unlikely(!new_rl))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	if (likely(rl != NULL)) {</div><div class='del'>-		if (unlikely(old_size &gt; new_size))</div><div class='del'>-			old_size = new_size;</div><div class='del'>-		memcpy(new_rl, rl, old_size);</div><div class='del'>-		ntfs_free(rl);</div><div class='del'>-	}</div><div class='del'>-	return new_rl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_realloc_nofail - Reallocate memory for runlists</div><div class='del'>- * @rl:		original runlist</div><div class='del'>- * @old_size:	number of runlist elements in the original runlist @rl</div><div class='del'>- * @new_size:	number of runlist elements we need space for</div><div class='del'>- *</div><div class='del'>- * As the runlists grow, more memory will be required.  To prevent the</div><div class='del'>- * kernel having to allocate and reallocate large numbers of small bits of</div><div class='del'>- * memory, this function returns an entire page of memory.</div><div class='del'>- *</div><div class='del'>- * This function guarantees that the allocation will succeed.  It will sleep</div><div class='del'>- * for as long as it takes to complete the allocation.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlist @rl.</div><div class='del'>- *</div><div class='del'>- * N.B.  If the new allocation doesn't require a different number of pages in</div><div class='del'>- *       memory, the function will return the original pointer.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the newly allocated, or recycled, memory.</div><div class='del'>- * On error, return -errno. The following error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- */</div><div class='del'>-static inline runlist_element *ntfs_rl_realloc_nofail(runlist_element *rl,</div><div class='del'>-		int old_size, int new_size)</div><div class='del'>-{</div><div class='del'>-	runlist_element *new_rl;</div><div class='del'>-</div><div class='del'>-	old_size = PAGE_ALIGN(old_size * sizeof(*rl));</div><div class='del'>-	new_size = PAGE_ALIGN(new_size * sizeof(*rl));</div><div class='del'>-	if (old_size == new_size)</div><div class='del'>-		return rl;</div><div class='del'>-</div><div class='del'>-	new_rl = ntfs_malloc_nofs_nofail(new_size);</div><div class='del'>-	BUG_ON(!new_rl);</div><div class='del'>-</div><div class='del'>-	if (likely(rl != NULL)) {</div><div class='del'>-		if (unlikely(old_size &gt; new_size))</div><div class='del'>-			old_size = new_size;</div><div class='del'>-		memcpy(new_rl, rl, old_size);</div><div class='del'>-		ntfs_free(rl);</div><div class='del'>-	}</div><div class='del'>-	return new_rl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_are_rl_mergeable - test if two runlists can be joined together</div><div class='del'>- * @dst:	original runlist</div><div class='del'>- * @src:	new runlist to test for mergeability with @dst</div><div class='del'>- *</div><div class='del'>- * Test if two runlists can be joined together. For this, their VCNs and LCNs</div><div class='del'>- * must be adjacent.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dst and @src.</div><div class='del'>- *</div><div class='del'>- * Return: true   Success, the runlists can be merged.</div><div class='del'>- *	   false  Failure, the runlists cannot be merged.</div><div class='del'>- */</div><div class='del'>-static inline bool ntfs_are_rl_mergeable(runlist_element *dst,</div><div class='del'>-		runlist_element *src)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!dst);</div><div class='del'>-	BUG_ON(!src);</div><div class='del'>-</div><div class='del'>-	/* We can merge unmapped regions even if they are misaligned. */</div><div class='del'>-	if ((dst-&gt;lcn == LCN_RL_NOT_MAPPED) &amp;&amp; (src-&gt;lcn == LCN_RL_NOT_MAPPED))</div><div class='del'>-		return true;</div><div class='del'>-	/* If the runs are misaligned, we cannot merge them. */</div><div class='del'>-	if ((dst-&gt;vcn + dst-&gt;length) != src-&gt;vcn)</div><div class='del'>-		return false;</div><div class='del'>-	/* If both runs are non-sparse and contiguous, we can merge them. */</div><div class='del'>-	if ((dst-&gt;lcn &gt;= 0) &amp;&amp; (src-&gt;lcn &gt;= 0) &amp;&amp;</div><div class='del'>-			((dst-&gt;lcn + dst-&gt;length) == src-&gt;lcn))</div><div class='del'>-		return true;</div><div class='del'>-	/* If we are merging two holes, we can merge them. */</div><div class='del'>-	if ((dst-&gt;lcn == LCN_HOLE) &amp;&amp; (src-&gt;lcn == LCN_HOLE))</div><div class='del'>-		return true;</div><div class='del'>-	/* Cannot merge. */</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __ntfs_rl_merge - merge two runlists without testing if they can be merged</div><div class='del'>- * @dst:	original, destination runlist</div><div class='del'>- * @src:	new runlist to merge with @dst</div><div class='del'>- *</div><div class='del'>- * Merge the two runlists, writing into the destination runlist @dst. The</div><div class='del'>- * caller must make sure the runlists can be merged or this will corrupt the</div><div class='del'>- * destination runlist.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dst and @src.</div><div class='del'>- */</div><div class='del'>-static inline void __ntfs_rl_merge(runlist_element *dst, runlist_element *src)</div><div class='del'>-{</div><div class='del'>-	dst-&gt;length += src-&gt;length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_append - append a runlist after a given element</div><div class='del'>- * @dst:	original runlist to be worked on</div><div class='del'>- * @dsize:	number of elements in @dst (including end marker)</div><div class='del'>- * @src:	runlist to be inserted into @dst</div><div class='del'>- * @ssize:	number of elements in @src (excluding end marker)</div><div class='del'>- * @loc:	append the new runlist @src after this element in @dst</div><div class='del'>- *</div><div class='del'>- * Append the runlist @src after element @loc in @dst.  Merge the right end of</div><div class='del'>- * the new runlist, if necessary. Adjust the size of the hole before the</div><div class='del'>- * appended runlist.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dst and @src.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the new, combined, runlist. Note, both</div><div class='del'>- * runlists @dst and @src are deallocated before returning so you cannot use</div><div class='del'>- * the pointers for anything any more. (Strictly speaking the returned runlist</div><div class='del'>- * may be the same as @dst but this is irrelevant.)</div><div class='del'>- *</div><div class='del'>- * On error, return -errno. Both runlists are left unmodified. The following</div><div class='del'>- * error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- */</div><div class='del'>-static inline runlist_element *ntfs_rl_append(runlist_element *dst,</div><div class='del'>-		int dsize, runlist_element *src, int ssize, int loc)</div><div class='del'>-{</div><div class='del'>-	bool right = false;	/* Right end of @src needs merging. */</div><div class='del'>-	int marker;		/* End of the inserted runs. */</div><div class='del'>-</div><div class='del'>-	BUG_ON(!dst);</div><div class='del'>-	BUG_ON(!src);</div><div class='del'>-</div><div class='del'>-	/* First, check if the right hand end needs merging. */</div><div class='del'>-	if ((loc + 1) &lt; dsize)</div><div class='del'>-		right = ntfs_are_rl_mergeable(src + ssize - 1, dst + loc + 1);</div><div class='del'>-</div><div class='del'>-	/* Space required: @dst size + @src size, less one if we merged. */</div><div class='del'>-	dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - right);</div><div class='del'>-	if (IS_ERR(dst))</div><div class='del'>-		return dst;</div><div class='del'>-	/*</div><div class='del'>-	 * We are guaranteed to succeed from here so can start modifying the</div><div class='del'>-	 * original runlists.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* First, merge the right hand end, if necessary. */</div><div class='del'>-	if (right)</div><div class='del'>-		__ntfs_rl_merge(src + ssize - 1, dst + loc + 1);</div><div class='del'>-</div><div class='del'>-	/* First run after the @src runs that have been inserted. */</div><div class='del'>-	marker = loc + ssize + 1;</div><div class='del'>-</div><div class='del'>-	/* Move the tail of @dst out of the way, then copy in @src. */</div><div class='del'>-	ntfs_rl_mm(dst, marker, loc + 1 + right, dsize - (loc + 1 + right));</div><div class='del'>-	ntfs_rl_mc(dst, loc + 1, src, 0, ssize);</div><div class='del'>-</div><div class='del'>-	/* Adjust the size of the preceding hole. */</div><div class='del'>-	dst[loc].length = dst[loc + 1].vcn - dst[loc].vcn;</div><div class='del'>-</div><div class='del'>-	/* We may have changed the length of the file, so fix the end marker */</div><div class='del'>-	if (dst[marker].lcn == LCN_ENOENT)</div><div class='del'>-		dst[marker].vcn = dst[marker - 1].vcn + dst[marker - 1].length;</div><div class='del'>-</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_insert - insert a runlist into another</div><div class='del'>- * @dst:	original runlist to be worked on</div><div class='del'>- * @dsize:	number of elements in @dst (including end marker)</div><div class='del'>- * @src:	new runlist to be inserted</div><div class='del'>- * @ssize:	number of elements in @src (excluding end marker)</div><div class='del'>- * @loc:	insert the new runlist @src before this element in @dst</div><div class='del'>- *</div><div class='del'>- * Insert the runlist @src before element @loc in the runlist @dst. Merge the</div><div class='del'>- * left end of the new runlist, if necessary. Adjust the size of the hole</div><div class='del'>- * after the inserted runlist.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dst and @src.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the new, combined, runlist. Note, both</div><div class='del'>- * runlists @dst and @src are deallocated before returning so you cannot use</div><div class='del'>- * the pointers for anything any more. (Strictly speaking the returned runlist</div><div class='del'>- * may be the same as @dst but this is irrelevant.)</div><div class='del'>- *</div><div class='del'>- * On error, return -errno. Both runlists are left unmodified. The following</div><div class='del'>- * error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- */</div><div class='del'>-static inline runlist_element *ntfs_rl_insert(runlist_element *dst,</div><div class='del'>-		int dsize, runlist_element *src, int ssize, int loc)</div><div class='del'>-{</div><div class='del'>-	bool left = false;	/* Left end of @src needs merging. */</div><div class='del'>-	bool disc = false;	/* Discontinuity between @dst and @src. */</div><div class='del'>-	int marker;		/* End of the inserted runs. */</div><div class='del'>-</div><div class='del'>-	BUG_ON(!dst);</div><div class='del'>-	BUG_ON(!src);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * disc =&gt; Discontinuity between the end of @dst and the start of @src.</div><div class='del'>-	 *	   This means we might need to insert a "not mapped" run.</div><div class='del'>-	 */</div><div class='del'>-	if (loc == 0)</div><div class='del'>-		disc = (src[0].vcn &gt; 0);</div><div class='del'>-	else {</div><div class='del'>-		s64 merged_length;</div><div class='del'>-</div><div class='del'>-		left = ntfs_are_rl_mergeable(dst + loc - 1, src);</div><div class='del'>-</div><div class='del'>-		merged_length = dst[loc - 1].length;</div><div class='del'>-		if (left)</div><div class='del'>-			merged_length += src-&gt;length;</div><div class='del'>-</div><div class='del'>-		disc = (src[0].vcn &gt; dst[loc - 1].vcn + merged_length);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Space required: @dst size + @src size, less one if we merged, plus</div><div class='del'>-	 * one if there was a discontinuity.</div><div class='del'>-	 */</div><div class='del'>-	dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - left + disc);</div><div class='del'>-	if (IS_ERR(dst))</div><div class='del'>-		return dst;</div><div class='del'>-	/*</div><div class='del'>-	 * We are guaranteed to succeed from here so can start modifying the</div><div class='del'>-	 * original runlist.</div><div class='del'>-	 */</div><div class='del'>-	if (left)</div><div class='del'>-		__ntfs_rl_merge(dst + loc - 1, src);</div><div class='del'>-	/*</div><div class='del'>-	 * First run after the @src runs that have been inserted.</div><div class='del'>-	 * Nominally,  @marker equals @loc + @ssize, i.e. location + number of</div><div class='del'>-	 * runs in @src.  However, if @left, then the first run in @src has</div><div class='del'>-	 * been merged with one in @dst.  And if @disc, then @dst and @src do</div><div class='del'>-	 * not meet and we need an extra run to fill the gap.</div><div class='del'>-	 */</div><div class='del'>-	marker = loc + ssize - left + disc;</div><div class='del'>-</div><div class='del'>-	/* Move the tail of @dst out of the way, then copy in @src. */</div><div class='del'>-	ntfs_rl_mm(dst, marker, loc, dsize - loc);</div><div class='del'>-	ntfs_rl_mc(dst, loc + disc, src, left, ssize - left);</div><div class='del'>-</div><div class='del'>-	/* Adjust the VCN of the first run after the insertion... */</div><div class='del'>-	dst[marker].vcn = dst[marker - 1].vcn + dst[marker - 1].length;</div><div class='del'>-	/* ... and the length. */</div><div class='del'>-	if (dst[marker].lcn == LCN_HOLE || dst[marker].lcn == LCN_RL_NOT_MAPPED)</div><div class='del'>-		dst[marker].length = dst[marker + 1].vcn - dst[marker].vcn;</div><div class='del'>-</div><div class='del'>-	/* Writing beyond the end of the file and there is a discontinuity. */</div><div class='del'>-	if (disc) {</div><div class='del'>-		if (loc &gt; 0) {</div><div class='del'>-			dst[loc].vcn = dst[loc - 1].vcn + dst[loc - 1].length;</div><div class='del'>-			dst[loc].length = dst[loc + 1].vcn - dst[loc].vcn;</div><div class='del'>-		} else {</div><div class='del'>-			dst[loc].vcn = 0;</div><div class='del'>-			dst[loc].length = dst[loc + 1].vcn;</div><div class='del'>-		}</div><div class='del'>-		dst[loc].lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-	}</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_replace - overwrite a runlist element with another runlist</div><div class='del'>- * @dst:	original runlist to be worked on</div><div class='del'>- * @dsize:	number of elements in @dst (including end marker)</div><div class='del'>- * @src:	new runlist to be inserted</div><div class='del'>- * @ssize:	number of elements in @src (excluding end marker)</div><div class='del'>- * @loc:	index in runlist @dst to overwrite with @src</div><div class='del'>- *</div><div class='del'>- * Replace the runlist element @dst at @loc with @src. Merge the left and</div><div class='del'>- * right ends of the inserted runlist, if necessary.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dst and @src.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the new, combined, runlist. Note, both</div><div class='del'>- * runlists @dst and @src are deallocated before returning so you cannot use</div><div class='del'>- * the pointers for anything any more. (Strictly speaking the returned runlist</div><div class='del'>- * may be the same as @dst but this is irrelevant.)</div><div class='del'>- *</div><div class='del'>- * On error, return -errno. Both runlists are left unmodified. The following</div><div class='del'>- * error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- */</div><div class='del'>-static inline runlist_element *ntfs_rl_replace(runlist_element *dst,</div><div class='del'>-		int dsize, runlist_element *src, int ssize, int loc)</div><div class='del'>-{</div><div class='del'>-	signed delta;</div><div class='del'>-	bool left = false;	/* Left end of @src needs merging. */</div><div class='del'>-	bool right = false;	/* Right end of @src needs merging. */</div><div class='del'>-	int tail;		/* Start of tail of @dst. */</div><div class='del'>-	int marker;		/* End of the inserted runs. */</div><div class='del'>-</div><div class='del'>-	BUG_ON(!dst);</div><div class='del'>-	BUG_ON(!src);</div><div class='del'>-</div><div class='del'>-	/* First, see if the left and right ends need merging. */</div><div class='del'>-	if ((loc + 1) &lt; dsize)</div><div class='del'>-		right = ntfs_are_rl_mergeable(src + ssize - 1, dst + loc + 1);</div><div class='del'>-	if (loc &gt; 0)</div><div class='del'>-		left = ntfs_are_rl_mergeable(dst + loc - 1, src);</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate some space.  We will need less if the left, right, or both</div><div class='del'>-	 * ends get merged.  The -1 accounts for the run being replaced.</div><div class='del'>-	 */</div><div class='del'>-	delta = ssize - 1 - left - right;</div><div class='del'>-	if (delta &gt; 0) {</div><div class='del'>-		dst = ntfs_rl_realloc(dst, dsize, dsize + delta);</div><div class='del'>-		if (IS_ERR(dst))</div><div class='del'>-			return dst;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We are guaranteed to succeed from here so can start modifying the</div><div class='del'>-	 * original runlists.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* First, merge the left and right ends, if necessary. */</div><div class='del'>-	if (right)</div><div class='del'>-		__ntfs_rl_merge(src + ssize - 1, dst + loc + 1);</div><div class='del'>-	if (left)</div><div class='del'>-		__ntfs_rl_merge(dst + loc - 1, src);</div><div class='del'>-	/*</div><div class='del'>-	 * Offset of the tail of @dst.  This needs to be moved out of the way</div><div class='del'>-	 * to make space for the runs to be copied from @src, i.e. the first</div><div class='del'>-	 * run of the tail of @dst.</div><div class='del'>-	 * Nominally, @tail equals @loc + 1, i.e. location, skipping the</div><div class='del'>-	 * replaced run.  However, if @right, then one of @dst's runs is</div><div class='del'>-	 * already merged into @src.</div><div class='del'>-	 */</div><div class='del'>-	tail = loc + right + 1;</div><div class='del'>-	/*</div><div class='del'>-	 * First run after the @src runs that have been inserted, i.e. where</div><div class='del'>-	 * the tail of @dst needs to be moved to.</div><div class='del'>-	 * Nominally, @marker equals @loc + @ssize, i.e. location + number of</div><div class='del'>-	 * runs in @src.  However, if @left, then the first run in @src has</div><div class='del'>-	 * been merged with one in @dst.</div><div class='del'>-	 */</div><div class='del'>-	marker = loc + ssize - left;</div><div class='del'>-</div><div class='del'>-	/* Move the tail of @dst out of the way, then copy in @src. */</div><div class='del'>-	ntfs_rl_mm(dst, marker, tail, dsize - tail);</div><div class='del'>-	ntfs_rl_mc(dst, loc, src, left, ssize - left);</div><div class='del'>-</div><div class='del'>-	/* We may have changed the length of the file, so fix the end marker. */</div><div class='del'>-	if (dsize - tail &gt; 0 &amp;&amp; dst[marker].lcn == LCN_ENOENT)</div><div class='del'>-		dst[marker].vcn = dst[marker - 1].vcn + dst[marker - 1].length;</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_split - insert a runlist into the centre of a hole</div><div class='del'>- * @dst:	original runlist to be worked on</div><div class='del'>- * @dsize:	number of elements in @dst (including end marker)</div><div class='del'>- * @src:	new runlist to be inserted</div><div class='del'>- * @ssize:	number of elements in @src (excluding end marker)</div><div class='del'>- * @loc:	index in runlist @dst at which to split and insert @src</div><div class='del'>- *</div><div class='del'>- * Split the runlist @dst at @loc into two and insert @new in between the two</div><div class='del'>- * fragments. No merging of runlists is necessary. Adjust the size of the</div><div class='del'>- * holes either side.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @dst and @src.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the new, combined, runlist. Note, both</div><div class='del'>- * runlists @dst and @src are deallocated before returning so you cannot use</div><div class='del'>- * the pointers for anything any more. (Strictly speaking the returned runlist</div><div class='del'>- * may be the same as @dst but this is irrelevant.)</div><div class='del'>- *</div><div class='del'>- * On error, return -errno. Both runlists are left unmodified. The following</div><div class='del'>- * error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- */</div><div class='del'>-static inline runlist_element *ntfs_rl_split(runlist_element *dst, int dsize,</div><div class='del'>-		runlist_element *src, int ssize, int loc)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!dst);</div><div class='del'>-	BUG_ON(!src);</div><div class='del'>-</div><div class='del'>-	/* Space required: @dst size + @src size + one new hole. */</div><div class='del'>-	dst = ntfs_rl_realloc(dst, dsize, dsize + ssize + 1);</div><div class='del'>-	if (IS_ERR(dst))</div><div class='del'>-		return dst;</div><div class='del'>-	/*</div><div class='del'>-	 * We are guaranteed to succeed from here so can start modifying the</div><div class='del'>-	 * original runlists.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Move the tail of @dst out of the way, then copy in @src. */</div><div class='del'>-	ntfs_rl_mm(dst, loc + 1 + ssize, loc, dsize - loc);</div><div class='del'>-	ntfs_rl_mc(dst, loc + 1, src, 0, ssize);</div><div class='del'>-</div><div class='del'>-	/* Adjust the size of the holes either size of @src. */</div><div class='del'>-	dst[loc].length		= dst[loc+1].vcn       - dst[loc].vcn;</div><div class='del'>-	dst[loc+ssize+1].vcn    = dst[loc+ssize].vcn   + dst[loc+ssize].length;</div><div class='del'>-	dst[loc+ssize+1].length = dst[loc+ssize+2].vcn - dst[loc+ssize+1].vcn;</div><div class='del'>-</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_runlists_merge - merge two runlists into one</div><div class='del'>- * @drl:	original runlist to be worked on</div><div class='del'>- * @srl:	new runlist to be merged into @drl</div><div class='del'>- *</div><div class='del'>- * First we sanity check the two runlists @srl and @drl to make sure that they</div><div class='del'>- * are sensible and can be merged. The runlist @srl must be either after the</div><div class='del'>- * runlist @drl or completely within a hole (or unmapped region) in @drl.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlists @drl and @srl.</div><div class='del'>- *</div><div class='del'>- * Merging of runlists is necessary in two cases:</div><div class='del'>- *   1. When attribute lists are used and a further extent is being mapped.</div><div class='del'>- *   2. When new clusters are allocated to fill a hole or extend a file.</div><div class='del'>- *</div><div class='del'>- * There are four possible ways @srl can be merged. It can:</div><div class='del'>- *	- be inserted at the beginning of a hole,</div><div class='del'>- *	- split the hole in two and be inserted between the two fragments,</div><div class='del'>- *	- be appended at the end of a hole, or it can</div><div class='del'>- *	- replace the whole hole.</div><div class='del'>- * It can also be appended to the end of the runlist, which is just a variant</div><div class='del'>- * of the insert case.</div><div class='del'>- *</div><div class='del'>- * On success, return a pointer to the new, combined, runlist. Note, both</div><div class='del'>- * runlists @drl and @srl are deallocated before returning so you cannot use</div><div class='del'>- * the pointers for anything any more. (Strictly speaking the returned runlist</div><div class='del'>- * may be the same as @dst but this is irrelevant.)</div><div class='del'>- *</div><div class='del'>- * On error, return -errno. Both runlists are left unmodified. The following</div><div class='del'>- * error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- *	-ERANGE	- The runlists overlap and cannot be merged.</div><div class='del'>- */</div><div class='del'>-runlist_element *ntfs_runlists_merge(runlist_element *drl,</div><div class='del'>-		runlist_element *srl)</div><div class='del'>-{</div><div class='del'>-	int di, si;		/* Current index into @[ds]rl. */</div><div class='del'>-	int sstart;		/* First index with lcn &gt; LCN_RL_NOT_MAPPED. */</div><div class='del'>-	int dins;		/* Index into @drl at which to insert @srl. */</div><div class='del'>-	int dend, send;		/* Last index into @[ds]rl. */</div><div class='del'>-	int dfinal, sfinal;	/* The last index into @[ds]rl with</div><div class='del'>-				   lcn &gt;= LCN_HOLE. */</div><div class='del'>-	int marker = 0;</div><div class='del'>-	VCN marker_vcn = 0;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	ntfs_debug("dst:");</div><div class='del'>-	ntfs_debug_dump_runlist(drl);</div><div class='del'>-	ntfs_debug("src:");</div><div class='del'>-	ntfs_debug_dump_runlist(srl);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Check for silly calling... */</div><div class='del'>-	if (unlikely(!srl))</div><div class='del'>-		return drl;</div><div class='del'>-	if (IS_ERR(srl) || IS_ERR(drl))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	/* Check for the case where the first mapping is being done now. */</div><div class='del'>-	if (unlikely(!drl)) {</div><div class='del'>-		drl = srl;</div><div class='del'>-		/* Complete the source runlist if necessary. */</div><div class='del'>-		if (unlikely(drl[0].vcn)) {</div><div class='del'>-			/* Scan to the end of the source runlist. */</div><div class='del'>-			for (dend = 0; likely(drl[dend].length); dend++)</div><div class='del'>-				;</div><div class='del'>-			dend++;</div><div class='del'>-			drl = ntfs_rl_realloc(drl, dend, dend + 1);</div><div class='del'>-			if (IS_ERR(drl))</div><div class='del'>-				return drl;</div><div class='del'>-			/* Insert start element at the front of the runlist. */</div><div class='del'>-			ntfs_rl_mm(drl, 1, 0, dend);</div><div class='del'>-			drl[0].vcn = 0;</div><div class='del'>-			drl[0].lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-			drl[0].length = drl[1].vcn;</div><div class='del'>-		}</div><div class='del'>-		goto finished;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	si = di = 0;</div><div class='del'>-</div><div class='del'>-	/* Skip any unmapped start element(s) in the source runlist. */</div><div class='del'>-	while (srl[si].length &amp;&amp; srl[si].lcn &lt; LCN_HOLE)</div><div class='del'>-		si++;</div><div class='del'>-</div><div class='del'>-	/* Can't have an entirely unmapped source runlist. */</div><div class='del'>-	BUG_ON(!srl[si].length);</div><div class='del'>-</div><div class='del'>-	/* Record the starting points. */</div><div class='del'>-	sstart = si;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Skip forward in @drl until we reach the position where @srl needs to</div><div class='del'>-	 * be inserted. If we reach the end of @drl, @srl just needs to be</div><div class='del'>-	 * appended to @drl.</div><div class='del'>-	 */</div><div class='del'>-	for (; drl[di].length; di++) {</div><div class='del'>-		if (drl[di].vcn + drl[di].length &gt; srl[sstart].vcn)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	dins = di;</div><div class='del'>-</div><div class='del'>-	/* Sanity check for illegal overlaps. */</div><div class='del'>-	if ((drl[di].vcn == srl[si].vcn) &amp;&amp; (drl[di].lcn &gt;= 0) &amp;&amp;</div><div class='del'>-			(srl[si].lcn &gt;= 0)) {</div><div class='del'>-		ntfs_error(NULL, "Run lists overlap. Cannot merge!");</div><div class='del'>-		return ERR_PTR(-ERANGE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Scan to the end of both runlists in order to know their sizes. */</div><div class='del'>-	for (send = si; srl[send].length; send++)</div><div class='del'>-		;</div><div class='del'>-	for (dend = di; drl[dend].length; dend++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	if (srl[send].lcn == LCN_ENOENT)</div><div class='del'>-		marker_vcn = srl[marker = send].vcn;</div><div class='del'>-</div><div class='del'>-	/* Scan to the last element with lcn &gt;= LCN_HOLE. */</div><div class='del'>-	for (sfinal = send; sfinal &gt;= 0 &amp;&amp; srl[sfinal].lcn &lt; LCN_HOLE; sfinal--)</div><div class='del'>-		;</div><div class='del'>-	for (dfinal = dend; dfinal &gt;= 0 &amp;&amp; drl[dfinal].lcn &lt; LCN_HOLE; dfinal--)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-	bool start;</div><div class='del'>-	bool finish;</div><div class='del'>-	int ds = dend + 1;		/* Number of elements in drl &amp; srl */</div><div class='del'>-	int ss = sfinal - sstart + 1;</div><div class='del'>-</div><div class='del'>-	start  = ((drl[dins].lcn &lt;  LCN_RL_NOT_MAPPED) ||    /* End of file   */</div><div class='del'>-		  (drl[dins].vcn == srl[sstart].vcn));	     /* Start of hole */</div><div class='del'>-	finish = ((drl[dins].lcn &gt;= LCN_RL_NOT_MAPPED) &amp;&amp;    /* End of file   */</div><div class='del'>-		 ((drl[dins].vcn + drl[dins].length) &lt;=      /* End of hole   */</div><div class='del'>-		  (srl[send - 1].vcn + srl[send - 1].length)));</div><div class='del'>-</div><div class='del'>-	/* Or we will lose an end marker. */</div><div class='del'>-	if (finish &amp;&amp; !drl[dins].length)</div><div class='del'>-		ss++;</div><div class='del'>-	if (marker &amp;&amp; (drl[dins].vcn + drl[dins].length &gt; srl[send - 1].vcn))</div><div class='del'>-		finish = false;</div><div class='del'>-#if 0</div><div class='del'>-	ntfs_debug("dfinal = %i, dend = %i", dfinal, dend);</div><div class='del'>-	ntfs_debug("sstart = %i, sfinal = %i, send = %i", sstart, sfinal, send);</div><div class='del'>-	ntfs_debug("start = %i, finish = %i", start, finish);</div><div class='del'>-	ntfs_debug("ds = %i, ss = %i, dins = %i", ds, ss, dins);</div><div class='del'>-#endif</div><div class='del'>-	if (start) {</div><div class='del'>-		if (finish)</div><div class='del'>-			drl = ntfs_rl_replace(drl, ds, srl + sstart, ss, dins);</div><div class='del'>-		else</div><div class='del'>-			drl = ntfs_rl_insert(drl, ds, srl + sstart, ss, dins);</div><div class='del'>-	} else {</div><div class='del'>-		if (finish)</div><div class='del'>-			drl = ntfs_rl_append(drl, ds, srl + sstart, ss, dins);</div><div class='del'>-		else</div><div class='del'>-			drl = ntfs_rl_split(drl, ds, srl + sstart, ss, dins);</div><div class='del'>-	}</div><div class='del'>-	if (IS_ERR(drl)) {</div><div class='del'>-		ntfs_error(NULL, "Merge failed.");</div><div class='del'>-		return drl;</div><div class='del'>-	}</div><div class='del'>-	ntfs_free(srl);</div><div class='del'>-	if (marker) {</div><div class='del'>-		ntfs_debug("Triggering marker code.");</div><div class='del'>-		for (ds = dend; drl[ds].length; ds++)</div><div class='del'>-			;</div><div class='del'>-		/* We only need to care if @srl ended after @drl. */</div><div class='del'>-		if (drl[ds].vcn &lt;= marker_vcn) {</div><div class='del'>-			int slots = 0;</div><div class='del'>-</div><div class='del'>-			if (drl[ds].vcn == marker_vcn) {</div><div class='del'>-				ntfs_debug("Old marker = 0x%llx, replacing "</div><div class='del'>-						"with LCN_ENOENT.",</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						drl[ds].lcn);</div><div class='del'>-				drl[ds].lcn = LCN_ENOENT;</div><div class='del'>-				goto finished;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * We need to create an unmapped runlist element in</div><div class='del'>-			 * @drl or extend an existing one before adding the</div><div class='del'>-			 * ENOENT terminator.</div><div class='del'>-			 */</div><div class='del'>-			if (drl[ds].lcn == LCN_ENOENT) {</div><div class='del'>-				ds--;</div><div class='del'>-				slots = 1;</div><div class='del'>-			}</div><div class='del'>-			if (drl[ds].lcn != LCN_RL_NOT_MAPPED) {</div><div class='del'>-				/* Add an unmapped runlist element. */</div><div class='del'>-				if (!slots) {</div><div class='del'>-					drl = ntfs_rl_realloc_nofail(drl, ds,</div><div class='del'>-							ds + 2);</div><div class='del'>-					slots = 2;</div><div class='del'>-				}</div><div class='del'>-				ds++;</div><div class='del'>-				/* Need to set vcn if it isn't set already. */</div><div class='del'>-				if (slots != 1)</div><div class='del'>-					drl[ds].vcn = drl[ds - 1].vcn +</div><div class='del'>-							drl[ds - 1].length;</div><div class='del'>-				drl[ds].lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-				/* We now used up a slot. */</div><div class='del'>-				slots--;</div><div class='del'>-			}</div><div class='del'>-			drl[ds].length = marker_vcn - drl[ds].vcn;</div><div class='del'>-			/* Finally add the ENOENT terminator. */</div><div class='del'>-			ds++;</div><div class='del'>-			if (!slots)</div><div class='del'>-				drl = ntfs_rl_realloc_nofail(drl, ds, ds + 1);</div><div class='del'>-			drl[ds].vcn = marker_vcn;</div><div class='del'>-			drl[ds].lcn = LCN_ENOENT;</div><div class='del'>-			drl[ds].length = (s64)0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-finished:</div><div class='del'>-	/* The merge was completed successfully. */</div><div class='del'>-	ntfs_debug("Merged runlist:");</div><div class='del'>-	ntfs_debug_dump_runlist(drl);</div><div class='del'>-	return drl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mapping_pairs_decompress - convert mapping pairs array to runlist</div><div class='del'>- * @vol:	ntfs volume on which the attribute resides</div><div class='del'>- * @attr:	attribute record whose mapping pairs array to decompress</div><div class='del'>- * @old_rl:	optional runlist in which to insert @attr's runlist</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlist @old_rl.</div><div class='del'>- *</div><div class='del'>- * Decompress the attribute @attr's mapping pairs array into a runlist. On</div><div class='del'>- * success, return the decompressed runlist.</div><div class='del'>- *</div><div class='del'>- * If @old_rl is not NULL, decompressed runlist is inserted into the</div><div class='del'>- * appropriate place in @old_rl and the resultant, combined runlist is</div><div class='del'>- * returned. The original @old_rl is deallocated.</div><div class='del'>- *</div><div class='del'>- * On error, return -errno. @old_rl is left unmodified in that case.</div><div class='del'>- *</div><div class='del'>- * The following error codes are defined:</div><div class='del'>- *	-ENOMEM	- Not enough memory to allocate runlist array.</div><div class='del'>- *	-EIO	- Corrupt runlist.</div><div class='del'>- *	-EINVAL	- Invalid parameters were passed in.</div><div class='del'>- *	-ERANGE	- The two runlists overlap.</div><div class='del'>- *</div><div class='del'>- * FIXME: For now we take the conceptionally simplest approach of creating the</div><div class='del'>- * new runlist disregarding the already existing one and then splicing the</div><div class='del'>- * two into one, if that is possible (we check for overlap and discard the new</div><div class='del'>- * runlist if overlap present before returning ERR_PTR(-ERANGE)).</div><div class='del'>- */</div><div class='del'>-runlist_element *ntfs_mapping_pairs_decompress(const ntfs_volume *vol,</div><div class='del'>-		const ATTR_RECORD *attr, runlist_element *old_rl)</div><div class='del'>-{</div><div class='del'>-	VCN vcn;		/* Current vcn. */</div><div class='del'>-	LCN lcn;		/* Current lcn. */</div><div class='del'>-	s64 deltaxcn;		/* Change in [vl]cn. */</div><div class='del'>-	runlist_element *rl;	/* The output runlist. */</div><div class='del'>-	u8 *buf;		/* Current position in mapping pairs array. */</div><div class='del'>-	u8 *attr_end;		/* End of attribute. */</div><div class='del'>-	int rlsize;		/* Size of runlist buffer. */</div><div class='del'>-	u16 rlpos;		/* Current runlist position in units of</div><div class='del'>-				   runlist_elements. */</div><div class='del'>-	u8 b;			/* Current byte offset in buf. */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	/* Make sure attr exists and is non-resident. */</div><div class='del'>-	if (!attr || !attr-&gt;non_resident || sle64_to_cpu(</div><div class='del'>-			attr-&gt;data.non_resident.lowest_vcn) &lt; (VCN)0) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Invalid arguments.");</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	/* Start at vcn = lowest_vcn and lcn 0. */</div><div class='del'>-	vcn = sle64_to_cpu(attr-&gt;data.non_resident.lowest_vcn);</div><div class='del'>-	lcn = 0;</div><div class='del'>-	/* Get start of the mapping pairs array. */</div><div class='del'>-	buf = (u8*)attr + le16_to_cpu(</div><div class='del'>-			attr-&gt;data.non_resident.mapping_pairs_offset);</div><div class='del'>-	attr_end = (u8*)attr + le32_to_cpu(attr-&gt;length);</div><div class='del'>-	if (unlikely(buf &lt; (u8*)attr || buf &gt; attr_end)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Corrupt attribute.");</div><div class='del'>-		return ERR_PTR(-EIO);</div><div class='del'>-	}</div><div class='del'>-	/* If the mapping pairs array is valid but empty, nothing to do. */</div><div class='del'>-	if (!vcn &amp;&amp; !*buf)</div><div class='del'>-		return old_rl;</div><div class='del'>-	/* Current position in runlist array. */</div><div class='del'>-	rlpos = 0;</div><div class='del'>-	/* Allocate first page and set current runlist size to one page. */</div><div class='del'>-	rl = ntfs_malloc_nofs(rlsize = PAGE_SIZE);</div><div class='del'>-	if (unlikely(!rl))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	/* Insert unmapped starting element if necessary. */</div><div class='del'>-	if (vcn) {</div><div class='del'>-		rl-&gt;vcn = 0;</div><div class='del'>-		rl-&gt;lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-		rl-&gt;length = vcn;</div><div class='del'>-		rlpos++;</div><div class='del'>-	}</div><div class='del'>-	while (buf &lt; attr_end &amp;&amp; *buf) {</div><div class='del'>-		/*</div><div class='del'>-		 * Allocate more memory if needed, including space for the</div><div class='del'>-		 * not-mapped and terminator elements. ntfs_malloc_nofs()</div><div class='del'>-		 * operates on whole pages only.</div><div class='del'>-		 */</div><div class='del'>-		if (((rlpos + 3) * sizeof(*old_rl)) &gt; rlsize) {</div><div class='del'>-			runlist_element *rl2;</div><div class='del'>-</div><div class='del'>-			rl2 = ntfs_malloc_nofs(rlsize + (int)PAGE_SIZE);</div><div class='del'>-			if (unlikely(!rl2)) {</div><div class='del'>-				ntfs_free(rl);</div><div class='del'>-				return ERR_PTR(-ENOMEM);</div><div class='del'>-			}</div><div class='del'>-			memcpy(rl2, rl, rlsize);</div><div class='del'>-			ntfs_free(rl);</div><div class='del'>-			rl = rl2;</div><div class='del'>-			rlsize += PAGE_SIZE;</div><div class='del'>-		}</div><div class='del'>-		/* Enter the current vcn into the current runlist element. */</div><div class='del'>-		rl[rlpos].vcn = vcn;</div><div class='del'>-		/*</div><div class='del'>-		 * Get the change in vcn, i.e. the run length in clusters.</div><div class='del'>-		 * Doing it this way ensures that we signextend negative values.</div><div class='del'>-		 * A negative run length doesn't make any sense, but hey, I</div><div class='del'>-		 * didn't make up the NTFS specs and Windows NT4 treats the run</div><div class='del'>-		 * length as a signed value so that's how it is...</div><div class='del'>-		 */</div><div class='del'>-		b = *buf &amp; 0xf;</div><div class='del'>-		if (b) {</div><div class='del'>-			if (unlikely(buf + b &gt; attr_end))</div><div class='del'>-				goto io_error;</div><div class='del'>-			for (deltaxcn = (s8)buf[b--]; b; b--)</div><div class='del'>-				deltaxcn = (deltaxcn &lt;&lt; 8) + buf[b];</div><div class='del'>-		} else { /* The length entry is compulsory. */</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Missing length entry in mapping "</div><div class='del'>-					"pairs array.");</div><div class='del'>-			deltaxcn = (s64)-1;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Assume a negative length to indicate data corruption and</div><div class='del'>-		 * hence clean-up and return NULL.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(deltaxcn &lt; 0)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Invalid length in mapping pairs "</div><div class='del'>-					"array.");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Enter the current run length into the current runlist</div><div class='del'>-		 * element.</div><div class='del'>-		 */</div><div class='del'>-		rl[rlpos].length = deltaxcn;</div><div class='del'>-		/* Increment the current vcn by the current run length. */</div><div class='del'>-		vcn += deltaxcn;</div><div class='del'>-		/*</div><div class='del'>-		 * There might be no lcn change at all, as is the case for</div><div class='del'>-		 * sparse clusters on NTFS 3.0+, in which case we set the lcn</div><div class='del'>-		 * to LCN_HOLE.</div><div class='del'>-		 */</div><div class='del'>-		if (!(*buf &amp; 0xf0))</div><div class='del'>-			rl[rlpos].lcn = LCN_HOLE;</div><div class='del'>-		else {</div><div class='del'>-			/* Get the lcn change which really can be negative. */</div><div class='del'>-			u8 b2 = *buf &amp; 0xf;</div><div class='del'>-			b = b2 + ((*buf &gt;&gt; 4) &amp; 0xf);</div><div class='del'>-			if (buf + b &gt; attr_end)</div><div class='del'>-				goto io_error;</div><div class='del'>-			for (deltaxcn = (s8)buf[b--]; b &gt; b2; b--)</div><div class='del'>-				deltaxcn = (deltaxcn &lt;&lt; 8) + buf[b];</div><div class='del'>-			/* Change the current lcn to its new value. */</div><div class='del'>-			lcn += deltaxcn;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-			/*</div><div class='del'>-			 * On NTFS 1.2-, apparently can have lcn == -1 to</div><div class='del'>-			 * indicate a hole. But we haven't verified ourselves</div><div class='del'>-			 * whether it is really the lcn or the deltaxcn that is</div><div class='del'>-			 * -1. So if either is found give us a message so we</div><div class='del'>-			 * can investigate it further!</div><div class='del'>-			 */</div><div class='del'>-			if (vol-&gt;major_ver &lt; 3) {</div><div class='del'>-				if (unlikely(deltaxcn == (LCN)-1))</div><div class='del'>-					ntfs_error(vol-&gt;sb, "lcn delta == -1");</div><div class='del'>-				if (unlikely(lcn == (LCN)-1))</div><div class='del'>-					ntfs_error(vol-&gt;sb, "lcn == -1");</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-			/* Check lcn is not below -1. */</div><div class='del'>-			if (unlikely(lcn &lt; (LCN)-1)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Invalid LCN &lt; -1 in "</div><div class='del'>-						"mapping pairs array.");</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			/* Enter the current lcn into the runlist element. */</div><div class='del'>-			rl[rlpos].lcn = lcn;</div><div class='del'>-		}</div><div class='del'>-		/* Get to the next runlist element. */</div><div class='del'>-		rlpos++;</div><div class='del'>-		/* Increment the buffer position to the next mapping pair. */</div><div class='del'>-		buf += (*buf &amp; 0xf) + ((*buf &gt;&gt; 4) &amp; 0xf) + 1;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(buf &gt;= attr_end))</div><div class='del'>-		goto io_error;</div><div class='del'>-	/*</div><div class='del'>-	 * If there is a highest_vcn specified, it must be equal to the final</div><div class='del'>-	 * vcn in the runlist - 1, or something has gone badly wrong.</div><div class='del'>-	 */</div><div class='del'>-	deltaxcn = sle64_to_cpu(attr-&gt;data.non_resident.highest_vcn);</div><div class='del'>-	if (unlikely(deltaxcn &amp;&amp; vcn - 1 != deltaxcn)) {</div><div class='del'>-mpa_err:</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Corrupt mapping pairs array in "</div><div class='del'>-				"non-resident attribute.");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Setup not mapped runlist element if this is the base extent. */</div><div class='del'>-	if (!attr-&gt;data.non_resident.lowest_vcn) {</div><div class='del'>-		VCN max_cluster;</div><div class='del'>-</div><div class='del'>-		max_cluster = ((sle64_to_cpu(</div><div class='del'>-				attr-&gt;data.non_resident.allocated_size) +</div><div class='del'>-				vol-&gt;cluster_size - 1) &gt;&gt;</div><div class='del'>-				vol-&gt;cluster_size_bits) - 1;</div><div class='del'>-		/*</div><div class='del'>-		 * A highest_vcn of zero means this is a single extent</div><div class='del'>-		 * attribute so simply terminate the runlist with LCN_ENOENT).</div><div class='del'>-		 */</div><div class='del'>-		if (deltaxcn) {</div><div class='del'>-			/*</div><div class='del'>-			 * If there is a difference between the highest_vcn and</div><div class='del'>-			 * the highest cluster, the runlist is either corrupt</div><div class='del'>-			 * or, more likely, there are more extents following</div><div class='del'>-			 * this one.</div><div class='del'>-			 */</div><div class='del'>-			if (deltaxcn &lt; max_cluster) {</div><div class='del'>-				ntfs_debug("More extents to follow; deltaxcn "</div><div class='del'>-						"= 0x%llx, max_cluster = "</div><div class='del'>-						"0x%llx",</div><div class='del'>-						(unsigned long long)deltaxcn,</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						max_cluster);</div><div class='del'>-				rl[rlpos].vcn = vcn;</div><div class='del'>-				vcn += rl[rlpos].length = max_cluster -</div><div class='del'>-						deltaxcn;</div><div class='del'>-				rl[rlpos].lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-				rlpos++;</div><div class='del'>-			} else if (unlikely(deltaxcn &gt; max_cluster)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Corrupt attribute.  "</div><div class='del'>-						"deltaxcn = 0x%llx, "</div><div class='del'>-						"max_cluster = 0x%llx",</div><div class='del'>-						(unsigned long long)deltaxcn,</div><div class='del'>-						(unsigned long long)</div><div class='del'>-						max_cluster);</div><div class='del'>-				goto mpa_err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rl[rlpos].lcn = LCN_ENOENT;</div><div class='del'>-	} else /* Not the base extent. There may be more extents to follow. */</div><div class='del'>-		rl[rlpos].lcn = LCN_RL_NOT_MAPPED;</div><div class='del'>-</div><div class='del'>-	/* Setup terminating runlist element. */</div><div class='del'>-	rl[rlpos].vcn = vcn;</div><div class='del'>-	rl[rlpos].length = (s64)0;</div><div class='del'>-	/* If no existing runlist was specified, we are done. */</div><div class='del'>-	if (!old_rl) {</div><div class='del'>-		ntfs_debug("Mapping pairs array successfully decompressed:");</div><div class='del'>-		ntfs_debug_dump_runlist(rl);</div><div class='del'>-		return rl;</div><div class='del'>-	}</div><div class='del'>-	/* Now combine the new and old runlists checking for overlaps. */</div><div class='del'>-	old_rl = ntfs_runlists_merge(old_rl, rl);</div><div class='del'>-	if (!IS_ERR(old_rl))</div><div class='del'>-		return old_rl;</div><div class='del'>-	ntfs_free(rl);</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed to merge runlists.");</div><div class='del'>-	return old_rl;</div><div class='del'>-io_error:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Corrupt attribute.");</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_free(rl);</div><div class='del'>-	return ERR_PTR(-EIO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_vcn_to_lcn - convert a vcn into a lcn given a runlist</div><div class='del'>- * @rl:		runlist to use for conversion</div><div class='del'>- * @vcn:	vcn to convert</div><div class='del'>- *</div><div class='del'>- * Convert the virtual cluster number @vcn of an attribute into a logical</div><div class='del'>- * cluster number (lcn) of a device using the runlist @rl to map vcns to their</div><div class='del'>- * corresponding lcns.</div><div class='del'>- *</div><div class='del'>- * It is up to the caller to serialize access to the runlist @rl.</div><div class='del'>- *</div><div class='del'>- * Since lcns must be &gt;= 0, we use negative return codes with special meaning:</div><div class='del'>- *</div><div class='del'>- * Return code		Meaning / Description</div><div class='del'>- * ==================================================</div><div class='del'>- *  LCN_HOLE		Hole / not allocated on disk.</div><div class='del'>- *  LCN_RL_NOT_MAPPED	This is part of the runlist which has not been</div><div class='del'>- *			inserted into the runlist yet.</div><div class='del'>- *  LCN_ENOENT		There is no such vcn in the attribute.</div><div class='del'>- *</div><div class='del'>- * Locking: - The caller must have locked the runlist (for reading or writing).</div><div class='del'>- *	    - This function does not touch the lock, nor does it modify the</div><div class='del'>- *	      runlist.</div><div class='del'>- */</div><div class='del'>-LCN ntfs_rl_vcn_to_lcn(const runlist_element *rl, const VCN vcn)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(vcn &lt; 0);</div><div class='del'>-	/*</div><div class='del'>-	 * If rl is NULL, assume that we have found an unmapped runlist. The</div><div class='del'>-	 * caller can then attempt to map it and fail appropriately if</div><div class='del'>-	 * necessary.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!rl))</div><div class='del'>-		return LCN_RL_NOT_MAPPED;</div><div class='del'>-</div><div class='del'>-	/* Catch out of lower bounds vcn. */</div><div class='del'>-	if (unlikely(vcn &lt; rl[0].vcn))</div><div class='del'>-		return LCN_ENOENT;</div><div class='del'>-</div><div class='del'>-	for (i = 0; likely(rl[i].length); i++) {</div><div class='del'>-		if (unlikely(vcn &lt; rl[i+1].vcn)) {</div><div class='del'>-			if (likely(rl[i].lcn &gt;= (LCN)0))</div><div class='del'>-				return rl[i].lcn + (vcn - rl[i].vcn);</div><div class='del'>-			return rl[i].lcn;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The terminator element is setup to the correct value, i.e. one of</div><div class='del'>-	 * LCN_HOLE, LCN_RL_NOT_MAPPED, or LCN_ENOENT.</div><div class='del'>-	 */</div><div class='del'>-	if (likely(rl[i].lcn &lt; (LCN)0))</div><div class='del'>-		return rl[i].lcn;</div><div class='del'>-	/* Just in case... We could replace this with BUG() some day. */</div><div class='del'>-	return LCN_ENOENT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_find_vcn_nolock - find a vcn in a runlist</div><div class='del'>- * @rl:		runlist to search</div><div class='del'>- * @vcn:	vcn to find</div><div class='del'>- *</div><div class='del'>- * Find the virtual cluster number @vcn in the runlist @rl and return the</div><div class='del'>- * address of the runlist element containing the @vcn on success.</div><div class='del'>- *</div><div class='del'>- * Return NULL if @rl is NULL or @vcn is in an unmapped part/out of bounds of</div><div class='del'>- * the runlist.</div><div class='del'>- *</div><div class='del'>- * Locking: The runlist must be locked on entry.</div><div class='del'>- */</div><div class='del'>-runlist_element *ntfs_rl_find_vcn_nolock(runlist_element *rl, const VCN vcn)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(vcn &lt; 0);</div><div class='del'>-	if (unlikely(!rl || vcn &lt; rl[0].vcn))</div><div class='del'>-		return NULL;</div><div class='del'>-	while (likely(rl-&gt;length)) {</div><div class='del'>-		if (unlikely(vcn &lt; rl[1].vcn)) {</div><div class='del'>-			if (likely(rl-&gt;lcn &gt;= LCN_HOLE))</div><div class='del'>-				return rl;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		rl++;</div><div class='del'>-	}</div><div class='del'>-	if (likely(rl-&gt;lcn == LCN_ENOENT))</div><div class='del'>-		return rl;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_get_nr_significant_bytes - get number of bytes needed to store a number</div><div class='del'>- * @n:		number for which to get the number of bytes for</div><div class='del'>- *</div><div class='del'>- * Return the number of bytes required to store @n unambiguously as</div><div class='del'>- * a signed number.</div><div class='del'>- *</div><div class='del'>- * This is used in the context of the mapping pairs array to determine how</div><div class='del'>- * many bytes will be needed in the array to store a given logical cluster</div><div class='del'>- * number (lcn) or a specific run length.</div><div class='del'>- *</div><div class='del'>- * Return the number of bytes written.  This function cannot fail.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_get_nr_significant_bytes(const s64 n)</div><div class='del'>-{</div><div class='del'>-	s64 l = n;</div><div class='del'>-	int i;</div><div class='del'>-	s8 j;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	do {</div><div class='del'>-		l &gt;&gt;= 8;</div><div class='del'>-		i++;</div><div class='del'>-	} while (l != 0 &amp;&amp; l != -1);</div><div class='del'>-	j = (n &gt;&gt; 8 * (i - 1)) &amp; 0xff;</div><div class='del'>-	/* If the sign bit is wrong, we need an extra byte. */</div><div class='del'>-	if ((n &lt; 0 &amp;&amp; j &gt;= 0) || (n &gt; 0 &amp;&amp; j &lt; 0))</div><div class='del'>-		i++;</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_get_size_for_mapping_pairs - get bytes needed for mapping pairs array</div><div class='del'>- * @vol:	ntfs volume (needed for the ntfs version)</div><div class='del'>- * @rl:		locked runlist to determine the size of the mapping pairs of</div><div class='del'>- * @first_vcn:	first vcn which to include in the mapping pairs array</div><div class='del'>- * @last_vcn:	last vcn which to include in the mapping pairs array</div><div class='del'>- *</div><div class='del'>- * Walk the locked runlist @rl and calculate the size in bytes of the mapping</div><div class='del'>- * pairs array corresponding to the runlist @rl, starting at vcn @first_vcn and</div><div class='del'>- * finishing with vcn @last_vcn.</div><div class='del'>- *</div><div class='del'>- * A @last_vcn of -1 means end of runlist and in that case the size of the</div><div class='del'>- * mapping pairs array corresponding to the runlist starting at vcn @first_vcn</div><div class='del'>- * and finishing at the end of the runlist is determined.</div><div class='del'>- *</div><div class='del'>- * This for example allows us to allocate a buffer of the right size when</div><div class='del'>- * building the mapping pairs array.</div><div class='del'>- *</div><div class='del'>- * If @rl is NULL, just return 1 (for the single terminator byte).</div><div class='del'>- *</div><div class='del'>- * Return the calculated size in bytes on success.  On error, return -errno.</div><div class='del'>- * The following error codes are defined:</div><div class='del'>- *	-EINVAL	- Run list contains unmapped elements.  Make sure to only pass</div><div class='del'>- *		  fully mapped runlists to this function.</div><div class='del'>- *	-EIO	- The runlist is corrupt.</div><div class='del'>- *</div><div class='del'>- * Locking: @rl must be locked on entry (either for reading or writing), it</div><div class='del'>- *	    remains locked throughout, and is left locked upon return.</div><div class='del'>- */</div><div class='del'>-int ntfs_get_size_for_mapping_pairs(const ntfs_volume *vol,</div><div class='del'>-		const runlist_element *rl, const VCN first_vcn,</div><div class='del'>-		const VCN last_vcn)</div><div class='del'>-{</div><div class='del'>-	LCN prev_lcn;</div><div class='del'>-	int rls;</div><div class='del'>-	bool the_end = false;</div><div class='del'>-</div><div class='del'>-	BUG_ON(first_vcn &lt; 0);</div><div class='del'>-	BUG_ON(last_vcn &lt; -1);</div><div class='del'>-	BUG_ON(last_vcn &gt;= 0 &amp;&amp; first_vcn &gt; last_vcn);</div><div class='del'>-	if (!rl) {</div><div class='del'>-		BUG_ON(first_vcn);</div><div class='del'>-		BUG_ON(last_vcn &gt; 0);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	/* Skip to runlist element containing @first_vcn. */</div><div class='del'>-	while (rl-&gt;length &amp;&amp; first_vcn &gt;= rl[1].vcn)</div><div class='del'>-		rl++;</div><div class='del'>-	if (unlikely((!rl-&gt;length &amp;&amp; first_vcn &gt; rl-&gt;vcn) ||</div><div class='del'>-			first_vcn &lt; rl-&gt;vcn))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	prev_lcn = 0;</div><div class='del'>-	/* Always need the termining zero byte. */</div><div class='del'>-	rls = 1;</div><div class='del'>-	/* Do the first partial run if present. */</div><div class='del'>-	if (first_vcn &gt; rl-&gt;vcn) {</div><div class='del'>-		s64 delta, length = rl-&gt;length;</div><div class='del'>-</div><div class='del'>-		/* We know rl-&gt;length != 0 already. */</div><div class='del'>-		if (unlikely(length &lt; 0 || rl-&gt;lcn &lt; LCN_HOLE))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * If @stop_vcn is given and finishes inside this run, cap the</div><div class='del'>-		 * run length.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(last_vcn &gt;= 0 &amp;&amp; rl[1].vcn &gt; last_vcn)) {</div><div class='del'>-			s64 s1 = last_vcn + 1;</div><div class='del'>-			if (unlikely(rl[1].vcn &gt; s1))</div><div class='del'>-				length = s1 - rl-&gt;vcn;</div><div class='del'>-			the_end = true;</div><div class='del'>-		}</div><div class='del'>-		delta = first_vcn - rl-&gt;vcn;</div><div class='del'>-		/* Header byte + length. */</div><div class='del'>-		rls += 1 + ntfs_get_nr_significant_bytes(length - delta);</div><div class='del'>-		/*</div><div class='del'>-		 * If the logical cluster number (lcn) denotes a hole and we</div><div class='del'>-		 * are on NTFS 3.0+, we don't store it at all, i.e. we need</div><div class='del'>-		 * zero space.  On earlier NTFS versions we just store the lcn.</div><div class='del'>-		 * Note: this assumes that on NTFS 1.2-, holes are stored with</div><div class='del'>-		 * an lcn of -1 and not a delta_lcn of -1 (unless both are -1).</div><div class='del'>-		 */</div><div class='del'>-		if (likely(rl-&gt;lcn &gt;= 0 || vol-&gt;major_ver &lt; 3)) {</div><div class='del'>-			prev_lcn = rl-&gt;lcn;</div><div class='del'>-			if (likely(rl-&gt;lcn &gt;= 0))</div><div class='del'>-				prev_lcn += delta;</div><div class='del'>-			/* Change in lcn. */</div><div class='del'>-			rls += ntfs_get_nr_significant_bytes(prev_lcn);</div><div class='del'>-		}</div><div class='del'>-		/* Go to next runlist element. */</div><div class='del'>-		rl++;</div><div class='del'>-	}</div><div class='del'>-	/* Do the full runs. */</div><div class='del'>-	for (; rl-&gt;length &amp;&amp; !the_end; rl++) {</div><div class='del'>-		s64 length = rl-&gt;length;</div><div class='del'>-</div><div class='del'>-		if (unlikely(length &lt; 0 || rl-&gt;lcn &lt; LCN_HOLE))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * If @stop_vcn is given and finishes inside this run, cap the</div><div class='del'>-		 * run length.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(last_vcn &gt;= 0 &amp;&amp; rl[1].vcn &gt; last_vcn)) {</div><div class='del'>-			s64 s1 = last_vcn + 1;</div><div class='del'>-			if (unlikely(rl[1].vcn &gt; s1))</div><div class='del'>-				length = s1 - rl-&gt;vcn;</div><div class='del'>-			the_end = true;</div><div class='del'>-		}</div><div class='del'>-		/* Header byte + length. */</div><div class='del'>-		rls += 1 + ntfs_get_nr_significant_bytes(length);</div><div class='del'>-		/*</div><div class='del'>-		 * If the logical cluster number (lcn) denotes a hole and we</div><div class='del'>-		 * are on NTFS 3.0+, we don't store it at all, i.e. we need</div><div class='del'>-		 * zero space.  On earlier NTFS versions we just store the lcn.</div><div class='del'>-		 * Note: this assumes that on NTFS 1.2-, holes are stored with</div><div class='del'>-		 * an lcn of -1 and not a delta_lcn of -1 (unless both are -1).</div><div class='del'>-		 */</div><div class='del'>-		if (likely(rl-&gt;lcn &gt;= 0 || vol-&gt;major_ver &lt; 3)) {</div><div class='del'>-			/* Change in lcn. */</div><div class='del'>-			rls += ntfs_get_nr_significant_bytes(rl-&gt;lcn -</div><div class='del'>-					prev_lcn);</div><div class='del'>-			prev_lcn = rl-&gt;lcn;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return rls;</div><div class='del'>-err_out:</div><div class='del'>-	if (rl-&gt;lcn == LCN_RL_NOT_MAPPED)</div><div class='del'>-		rls = -EINVAL;</div><div class='del'>-	else</div><div class='del'>-		rls = -EIO;</div><div class='del'>-	return rls;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_write_significant_bytes - write the significant bytes of a number</div><div class='del'>- * @dst:	destination buffer to write to</div><div class='del'>- * @dst_max:	pointer to last byte of destination buffer for bounds checking</div><div class='del'>- * @n:		number whose significant bytes to write</div><div class='del'>- *</div><div class='del'>- * Store in @dst, the minimum bytes of the number @n which are required to</div><div class='del'>- * identify @n unambiguously as a signed number, taking care not to exceed</div><div class='del'>- * @dest_max, the maximum position within @dst to which we are allowed to</div><div class='del'>- * write.</div><div class='del'>- *</div><div class='del'>- * This is used when building the mapping pairs array of a runlist to compress</div><div class='del'>- * a given logical cluster number (lcn) or a specific run length to the minimum</div><div class='del'>- * size possible.</div><div class='del'>- *</div><div class='del'>- * Return the number of bytes written on success.  On error, i.e. the</div><div class='del'>- * destination buffer @dst is too small, return -ENOSPC.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_write_significant_bytes(s8 *dst, const s8 *dst_max,</div><div class='del'>-		const s64 n)</div><div class='del'>-{</div><div class='del'>-	s64 l = n;</div><div class='del'>-	int i;</div><div class='del'>-	s8 j;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	do {</div><div class='del'>-		if (unlikely(dst &gt; dst_max))</div><div class='del'>-			goto err_out;</div><div class='del'>-		*dst++ = l &amp; 0xffll;</div><div class='del'>-		l &gt;&gt;= 8;</div><div class='del'>-		i++;</div><div class='del'>-	} while (l != 0 &amp;&amp; l != -1);</div><div class='del'>-	j = (n &gt;&gt; 8 * (i - 1)) &amp; 0xff;</div><div class='del'>-	/* If the sign bit is wrong, we need an extra byte. */</div><div class='del'>-	if (n &lt; 0 &amp;&amp; j &gt;= 0) {</div><div class='del'>-		if (unlikely(dst &gt; dst_max))</div><div class='del'>-			goto err_out;</div><div class='del'>-		i++;</div><div class='del'>-		*dst = (s8)-1;</div><div class='del'>-	} else if (n &gt; 0 &amp;&amp; j &lt; 0) {</div><div class='del'>-		if (unlikely(dst &gt; dst_max))</div><div class='del'>-			goto err_out;</div><div class='del'>-		i++;</div><div class='del'>-		*dst = (s8)0;</div><div class='del'>-	}</div><div class='del'>-	return i;</div><div class='del'>-err_out:</div><div class='del'>-	return -ENOSPC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_mapping_pairs_build - build the mapping pairs array from a runlist</div><div class='del'>- * @vol:	ntfs volume (needed for the ntfs version)</div><div class='del'>- * @dst:	destination buffer to which to write the mapping pairs array</div><div class='del'>- * @dst_len:	size of destination buffer @dst in bytes</div><div class='del'>- * @rl:		locked runlist for which to build the mapping pairs array</div><div class='del'>- * @first_vcn:	first vcn which to include in the mapping pairs array</div><div class='del'>- * @last_vcn:	last vcn which to include in the mapping pairs array</div><div class='del'>- * @stop_vcn:	first vcn outside destination buffer on success or -ENOSPC</div><div class='del'>- *</div><div class='del'>- * Create the mapping pairs array from the locked runlist @rl, starting at vcn</div><div class='del'>- * @first_vcn and finishing with vcn @last_vcn and save the array in @dst.</div><div class='del'>- * @dst_len is the size of @dst in bytes and it should be at least equal to the</div><div class='del'>- * value obtained by calling ntfs_get_size_for_mapping_pairs().</div><div class='del'>- *</div><div class='del'>- * A @last_vcn of -1 means end of runlist and in that case the mapping pairs</div><div class='del'>- * array corresponding to the runlist starting at vcn @first_vcn and finishing</div><div class='del'>- * at the end of the runlist is created.</div><div class='del'>- *</div><div class='del'>- * If @rl is NULL, just write a single terminator byte to @dst.</div><div class='del'>- *</div><div class='del'>- * On success or -ENOSPC error, if @stop_vcn is not NULL, *@stop_vcn is set to</div><div class='del'>- * the first vcn outside the destination buffer.  Note that on error, @dst has</div><div class='del'>- * been filled with all the mapping pairs that will fit, thus it can be treated</div><div class='del'>- * as partial success, in that a new attribute extent needs to be created or</div><div class='del'>- * the next extent has to be used and the mapping pairs build has to be</div><div class='del'>- * continued with @first_vcn set to *@stop_vcn.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.  The following error codes are</div><div class='del'>- * defined:</div><div class='del'>- *	-EINVAL	- Run list contains unmapped elements.  Make sure to only pass</div><div class='del'>- *		  fully mapped runlists to this function.</div><div class='del'>- *	-EIO	- The runlist is corrupt.</div><div class='del'>- *	-ENOSPC	- The destination buffer is too small.</div><div class='del'>- *</div><div class='del'>- * Locking: @rl must be locked on entry (either for reading or writing), it</div><div class='del'>- *	    remains locked throughout, and is left locked upon return.</div><div class='del'>- */</div><div class='del'>-int ntfs_mapping_pairs_build(const ntfs_volume *vol, s8 *dst,</div><div class='del'>-		const int dst_len, const runlist_element *rl,</div><div class='del'>-		const VCN first_vcn, const VCN last_vcn, VCN *const stop_vcn)</div><div class='del'>-{</div><div class='del'>-	LCN prev_lcn;</div><div class='del'>-	s8 *dst_max, *dst_next;</div><div class='del'>-	int err = -ENOSPC;</div><div class='del'>-	bool the_end = false;</div><div class='del'>-	s8 len_len, lcn_len;</div><div class='del'>-</div><div class='del'>-	BUG_ON(first_vcn &lt; 0);</div><div class='del'>-	BUG_ON(last_vcn &lt; -1);</div><div class='del'>-	BUG_ON(last_vcn &gt;= 0 &amp;&amp; first_vcn &gt; last_vcn);</div><div class='del'>-	BUG_ON(dst_len &lt; 1);</div><div class='del'>-	if (!rl) {</div><div class='del'>-		BUG_ON(first_vcn);</div><div class='del'>-		BUG_ON(last_vcn &gt; 0);</div><div class='del'>-		if (stop_vcn)</div><div class='del'>-			*stop_vcn = 0;</div><div class='del'>-		/* Terminator byte. */</div><div class='del'>-		*dst = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* Skip to runlist element containing @first_vcn. */</div><div class='del'>-	while (rl-&gt;length &amp;&amp; first_vcn &gt;= rl[1].vcn)</div><div class='del'>-		rl++;</div><div class='del'>-	if (unlikely((!rl-&gt;length &amp;&amp; first_vcn &gt; rl-&gt;vcn) ||</div><div class='del'>-			first_vcn &lt; rl-&gt;vcn))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/*</div><div class='del'>-	 * @dst_max is used for bounds checking in</div><div class='del'>-	 * ntfs_write_significant_bytes().</div><div class='del'>-	 */</div><div class='del'>-	dst_max = dst + dst_len - 1;</div><div class='del'>-	prev_lcn = 0;</div><div class='del'>-	/* Do the first partial run if present. */</div><div class='del'>-	if (first_vcn &gt; rl-&gt;vcn) {</div><div class='del'>-		s64 delta, length = rl-&gt;length;</div><div class='del'>-</div><div class='del'>-		/* We know rl-&gt;length != 0 already. */</div><div class='del'>-		if (unlikely(length &lt; 0 || rl-&gt;lcn &lt; LCN_HOLE))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * If @stop_vcn is given and finishes inside this run, cap the</div><div class='del'>-		 * run length.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(last_vcn &gt;= 0 &amp;&amp; rl[1].vcn &gt; last_vcn)) {</div><div class='del'>-			s64 s1 = last_vcn + 1;</div><div class='del'>-			if (unlikely(rl[1].vcn &gt; s1))</div><div class='del'>-				length = s1 - rl-&gt;vcn;</div><div class='del'>-			the_end = true;</div><div class='del'>-		}</div><div class='del'>-		delta = first_vcn - rl-&gt;vcn;</div><div class='del'>-		/* Write length. */</div><div class='del'>-		len_len = ntfs_write_significant_bytes(dst + 1, dst_max,</div><div class='del'>-				length - delta);</div><div class='del'>-		if (unlikely(len_len &lt; 0))</div><div class='del'>-			goto size_err;</div><div class='del'>-		/*</div><div class='del'>-		 * If the logical cluster number (lcn) denotes a hole and we</div><div class='del'>-		 * are on NTFS 3.0+, we don't store it at all, i.e. we need</div><div class='del'>-		 * zero space.  On earlier NTFS versions we just write the lcn</div><div class='del'>-		 * change.  FIXME: Do we need to write the lcn change or just</div><div class='del'>-		 * the lcn in that case?  Not sure as I have never seen this</div><div class='del'>-		 * case on NT4. - We assume that we just need to write the lcn</div><div class='del'>-		 * change until someone tells us otherwise... (AIA)</div><div class='del'>-		 */</div><div class='del'>-		if (likely(rl-&gt;lcn &gt;= 0 || vol-&gt;major_ver &lt; 3)) {</div><div class='del'>-			prev_lcn = rl-&gt;lcn;</div><div class='del'>-			if (likely(rl-&gt;lcn &gt;= 0))</div><div class='del'>-				prev_lcn += delta;</div><div class='del'>-			/* Write change in lcn. */</div><div class='del'>-			lcn_len = ntfs_write_significant_bytes(dst + 1 +</div><div class='del'>-					len_len, dst_max, prev_lcn);</div><div class='del'>-			if (unlikely(lcn_len &lt; 0))</div><div class='del'>-				goto size_err;</div><div class='del'>-		} else</div><div class='del'>-			lcn_len = 0;</div><div class='del'>-		dst_next = dst + len_len + lcn_len + 1;</div><div class='del'>-		if (unlikely(dst_next &gt; dst_max))</div><div class='del'>-			goto size_err;</div><div class='del'>-		/* Update header byte. */</div><div class='del'>-		*dst = lcn_len &lt;&lt; 4 | len_len;</div><div class='del'>-		/* Position at next mapping pairs array element. */</div><div class='del'>-		dst = dst_next;</div><div class='del'>-		/* Go to next runlist element. */</div><div class='del'>-		rl++;</div><div class='del'>-	}</div><div class='del'>-	/* Do the full runs. */</div><div class='del'>-	for (; rl-&gt;length &amp;&amp; !the_end; rl++) {</div><div class='del'>-		s64 length = rl-&gt;length;</div><div class='del'>-</div><div class='del'>-		if (unlikely(length &lt; 0 || rl-&gt;lcn &lt; LCN_HOLE))</div><div class='del'>-			goto err_out;</div><div class='del'>-		/*</div><div class='del'>-		 * If @stop_vcn is given and finishes inside this run, cap the</div><div class='del'>-		 * run length.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(last_vcn &gt;= 0 &amp;&amp; rl[1].vcn &gt; last_vcn)) {</div><div class='del'>-			s64 s1 = last_vcn + 1;</div><div class='del'>-			if (unlikely(rl[1].vcn &gt; s1))</div><div class='del'>-				length = s1 - rl-&gt;vcn;</div><div class='del'>-			the_end = true;</div><div class='del'>-		}</div><div class='del'>-		/* Write length. */</div><div class='del'>-		len_len = ntfs_write_significant_bytes(dst + 1, dst_max,</div><div class='del'>-				length);</div><div class='del'>-		if (unlikely(len_len &lt; 0))</div><div class='del'>-			goto size_err;</div><div class='del'>-		/*</div><div class='del'>-		 * If the logical cluster number (lcn) denotes a hole and we</div><div class='del'>-		 * are on NTFS 3.0+, we don't store it at all, i.e. we need</div><div class='del'>-		 * zero space.  On earlier NTFS versions we just write the lcn</div><div class='del'>-		 * change.  FIXME: Do we need to write the lcn change or just</div><div class='del'>-		 * the lcn in that case?  Not sure as I have never seen this</div><div class='del'>-		 * case on NT4. - We assume that we just need to write the lcn</div><div class='del'>-		 * change until someone tells us otherwise... (AIA)</div><div class='del'>-		 */</div><div class='del'>-		if (likely(rl-&gt;lcn &gt;= 0 || vol-&gt;major_ver &lt; 3)) {</div><div class='del'>-			/* Write change in lcn. */</div><div class='del'>-			lcn_len = ntfs_write_significant_bytes(dst + 1 +</div><div class='del'>-					len_len, dst_max, rl-&gt;lcn - prev_lcn);</div><div class='del'>-			if (unlikely(lcn_len &lt; 0))</div><div class='del'>-				goto size_err;</div><div class='del'>-			prev_lcn = rl-&gt;lcn;</div><div class='del'>-		} else</div><div class='del'>-			lcn_len = 0;</div><div class='del'>-		dst_next = dst + len_len + lcn_len + 1;</div><div class='del'>-		if (unlikely(dst_next &gt; dst_max))</div><div class='del'>-			goto size_err;</div><div class='del'>-		/* Update header byte. */</div><div class='del'>-		*dst = lcn_len &lt;&lt; 4 | len_len;</div><div class='del'>-		/* Position at next mapping pairs array element. */</div><div class='del'>-		dst = dst_next;</div><div class='del'>-	}</div><div class='del'>-	/* Success. */</div><div class='del'>-	err = 0;</div><div class='del'>-size_err:</div><div class='del'>-	/* Set stop vcn. */</div><div class='del'>-	if (stop_vcn)</div><div class='del'>-		*stop_vcn = rl-&gt;vcn;</div><div class='del'>-	/* Add terminator byte. */</div><div class='del'>-	*dst = 0;</div><div class='del'>-	return err;</div><div class='del'>-err_out:</div><div class='del'>-	if (rl-&gt;lcn == LCN_RL_NOT_MAPPED)</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	else</div><div class='del'>-		err = -EIO;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_truncate_nolock - truncate a runlist starting at a specified vcn</div><div class='del'>- * @vol:	ntfs volume (needed for error output)</div><div class='del'>- * @runlist:	runlist to truncate</div><div class='del'>- * @new_length:	the new length of the runlist in VCNs</div><div class='del'>- *</div><div class='del'>- * Truncate the runlist described by @runlist as well as the memory buffer</div><div class='del'>- * holding the runlist elements to a length of @new_length VCNs.</div><div class='del'>- *</div><div class='del'>- * If @new_length lies within the runlist, the runlist elements with VCNs of</div><div class='del'>- * @new_length and above are discarded.  As a special case if @new_length is</div><div class='del'>- * zero, the runlist is discarded and set to NULL.</div><div class='del'>- *</div><div class='del'>- * If @new_length lies beyond the runlist, a sparse runlist element is added to</div><div class='del'>- * the end of the runlist @runlist or if the last runlist element is a sparse</div><div class='del'>- * one already, this is extended.</div><div class='del'>- *</div><div class='del'>- * Note, no checking is done for unmapped runlist elements.  It is assumed that</div><div class='del'>- * the caller has mapped any elements that need to be mapped already.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- *</div><div class='del'>- * Locking: The caller must hold @runlist-&gt;lock for writing.</div><div class='del'>- */</div><div class='del'>-int ntfs_rl_truncate_nolock(const ntfs_volume *vol, runlist *const runlist,</div><div class='del'>-		const s64 new_length)</div><div class='del'>-{</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	int old_size;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for new_length 0x%llx.", (long long)new_length);</div><div class='del'>-	BUG_ON(!runlist);</div><div class='del'>-	BUG_ON(new_length &lt; 0);</div><div class='del'>-	rl = runlist-&gt;rl;</div><div class='del'>-	if (!new_length) {</div><div class='del'>-		ntfs_debug("Freeing runlist.");</div><div class='del'>-		runlist-&gt;rl = NULL;</div><div class='del'>-		if (rl)</div><div class='del'>-			ntfs_free(rl);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(!rl)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Create a runlist consisting of a sparse runlist element of</div><div class='del'>-		 * length @new_length followed by a terminator runlist element.</div><div class='del'>-		 */</div><div class='del'>-		rl = ntfs_malloc_nofs(PAGE_SIZE);</div><div class='del'>-		if (unlikely(!rl)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Not enough memory to allocate "</div><div class='del'>-					"runlist element buffer.");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		runlist-&gt;rl = rl;</div><div class='del'>-		rl[1].length = rl-&gt;vcn = 0;</div><div class='del'>-		rl-&gt;lcn = LCN_HOLE;</div><div class='del'>-		rl[1].vcn = rl-&gt;length = new_length;</div><div class='del'>-		rl[1].lcn = LCN_ENOENT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(new_length &lt; rl-&gt;vcn);</div><div class='del'>-	/* Find @new_length in the runlist. */</div><div class='del'>-	while (likely(rl-&gt;length &amp;&amp; new_length &gt;= rl[1].vcn))</div><div class='del'>-		rl++;</div><div class='del'>-	/*</div><div class='del'>-	 * If not at the end of the runlist we need to shrink it.</div><div class='del'>-	 * If at the end of the runlist we need to expand it.</div><div class='del'>-	 */</div><div class='del'>-	if (rl-&gt;length) {</div><div class='del'>-		runlist_element *trl;</div><div class='del'>-		bool is_end;</div><div class='del'>-</div><div class='del'>-		ntfs_debug("Shrinking runlist.");</div><div class='del'>-		/* Determine the runlist size. */</div><div class='del'>-		trl = rl + 1;</div><div class='del'>-		while (likely(trl-&gt;length))</div><div class='del'>-			trl++;</div><div class='del'>-		old_size = trl - runlist-&gt;rl + 1;</div><div class='del'>-		/* Truncate the run. */</div><div class='del'>-		rl-&gt;length = new_length - rl-&gt;vcn;</div><div class='del'>-		/*</div><div class='del'>-		 * If a run was partially truncated, make the following runlist</div><div class='del'>-		 * element a terminator.</div><div class='del'>-		 */</div><div class='del'>-		is_end = false;</div><div class='del'>-		if (rl-&gt;length) {</div><div class='del'>-			rl++;</div><div class='del'>-			if (!rl-&gt;length)</div><div class='del'>-				is_end = true;</div><div class='del'>-			rl-&gt;vcn = new_length;</div><div class='del'>-			rl-&gt;length = 0;</div><div class='del'>-		}</div><div class='del'>-		rl-&gt;lcn = LCN_ENOENT;</div><div class='del'>-		/* Reallocate memory if necessary. */</div><div class='del'>-		if (!is_end) {</div><div class='del'>-			int new_size = rl - runlist-&gt;rl + 1;</div><div class='del'>-			rl = ntfs_rl_realloc(runlist-&gt;rl, old_size, new_size);</div><div class='del'>-			if (IS_ERR(rl))</div><div class='del'>-				ntfs_warning(vol-&gt;sb, "Failed to shrink "</div><div class='del'>-						"runlist buffer.  This just "</div><div class='del'>-						"wastes a bit of memory "</div><div class='del'>-						"temporarily so we ignore it "</div><div class='del'>-						"and return success.");</div><div class='del'>-			else</div><div class='del'>-				runlist-&gt;rl = rl;</div><div class='del'>-		}</div><div class='del'>-	} else if (likely(/* !rl-&gt;length &amp;&amp; */ new_length &gt; rl-&gt;vcn)) {</div><div class='del'>-		ntfs_debug("Expanding runlist.");</div><div class='del'>-		/*</div><div class='del'>-		 * If there is a previous runlist element and it is a sparse</div><div class='del'>-		 * one, extend it.  Otherwise need to add a new, sparse runlist</div><div class='del'>-		 * element.</div><div class='del'>-		 */</div><div class='del'>-		if ((rl &gt; runlist-&gt;rl) &amp;&amp; ((rl - 1)-&gt;lcn == LCN_HOLE))</div><div class='del'>-			(rl - 1)-&gt;length = new_length - (rl - 1)-&gt;vcn;</div><div class='del'>-		else {</div><div class='del'>-			/* Determine the runlist size. */</div><div class='del'>-			old_size = rl - runlist-&gt;rl + 1;</div><div class='del'>-			/* Reallocate memory if necessary. */</div><div class='del'>-			rl = ntfs_rl_realloc(runlist-&gt;rl, old_size,</div><div class='del'>-					old_size + 1);</div><div class='del'>-			if (IS_ERR(rl)) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to expand runlist "</div><div class='del'>-						"buffer, aborting.");</div><div class='del'>-				return PTR_ERR(rl);</div><div class='del'>-			}</div><div class='del'>-			runlist-&gt;rl = rl;</div><div class='del'>-			/*</div><div class='del'>-			 * Set @rl to the same runlist element in the new</div><div class='del'>-			 * runlist as before in the old runlist.</div><div class='del'>-			 */</div><div class='del'>-			rl += old_size - 1;</div><div class='del'>-			/* Add a new, sparse runlist element. */</div><div class='del'>-			rl-&gt;lcn = LCN_HOLE;</div><div class='del'>-			rl-&gt;length = new_length - rl-&gt;vcn;</div><div class='del'>-			/* Add a new terminator runlist element. */</div><div class='del'>-			rl++;</div><div class='del'>-			rl-&gt;length = 0;</div><div class='del'>-		}</div><div class='del'>-		rl-&gt;vcn = new_length;</div><div class='del'>-		rl-&gt;lcn = LCN_ENOENT;</div><div class='del'>-	} else /* if (unlikely(!rl-&gt;length &amp;&amp; new_length == rl-&gt;vcn)) */ {</div><div class='del'>-		/* Runlist already has same size as requested. */</div><div class='del'>-		rl-&gt;lcn = LCN_ENOENT;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_rl_punch_nolock - punch a hole into a runlist</div><div class='del'>- * @vol:	ntfs volume (needed for error output)</div><div class='del'>- * @runlist:	runlist to punch a hole into</div><div class='del'>- * @start:	starting VCN of the hole to be created</div><div class='del'>- * @length:	size of the hole to be created in units of clusters</div><div class='del'>- *</div><div class='del'>- * Punch a hole into the runlist @runlist starting at VCN @start and of size</div><div class='del'>- * @length clusters.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error, in which case @runlist has not been</div><div class='del'>- * modified.</div><div class='del'>- *</div><div class='del'>- * If @start and/or @start + @length are outside the runlist return error code</div><div class='del'>- * -ENOENT.</div><div class='del'>- *</div><div class='del'>- * If the runlist contains unmapped or error elements between @start and @start</div><div class='del'>- * + @length return error code -EINVAL.</div><div class='del'>- *</div><div class='del'>- * Locking: The caller must hold @runlist-&gt;lock for writing.</div><div class='del'>- */</div><div class='del'>-int ntfs_rl_punch_nolock(const ntfs_volume *vol, runlist *const runlist,</div><div class='del'>-		const VCN start, const s64 length)</div><div class='del'>-{</div><div class='del'>-	const VCN end = start + length;</div><div class='del'>-	s64 delta;</div><div class='del'>-	runlist_element *rl, *rl_end, *rl_real_end, *trl;</div><div class='del'>-	int old_size;</div><div class='del'>-	bool lcn_fixup = false;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering for start 0x%llx, length 0x%llx.",</div><div class='del'>-			(long long)start, (long long)length);</div><div class='del'>-	BUG_ON(!runlist);</div><div class='del'>-	BUG_ON(start &lt; 0);</div><div class='del'>-	BUG_ON(length &lt; 0);</div><div class='del'>-	BUG_ON(end &lt; 0);</div><div class='del'>-	rl = runlist-&gt;rl;</div><div class='del'>-	if (unlikely(!rl)) {</div><div class='del'>-		if (likely(!start &amp;&amp; !length))</div><div class='del'>-			return 0;</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	/* Find @start in the runlist. */</div><div class='del'>-	while (likely(rl-&gt;length &amp;&amp; start &gt;= rl[1].vcn))</div><div class='del'>-		rl++;</div><div class='del'>-	rl_end = rl;</div><div class='del'>-	/* Find @end in the runlist. */</div><div class='del'>-	while (likely(rl_end-&gt;length &amp;&amp; end &gt;= rl_end[1].vcn)) {</div><div class='del'>-		/* Verify there are no unmapped or error elements. */</div><div class='del'>-		if (unlikely(rl_end-&gt;lcn &lt; LCN_HOLE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		rl_end++;</div><div class='del'>-	}</div><div class='del'>-	/* Check the last element. */</div><div class='del'>-	if (unlikely(rl_end-&gt;length &amp;&amp; rl_end-&gt;lcn &lt; LCN_HOLE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/* This covers @start being out of bounds, too. */</div><div class='del'>-	if (!rl_end-&gt;length &amp;&amp; end &gt; rl_end-&gt;vcn)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	if (!length)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!rl-&gt;length)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	rl_real_end = rl_end;</div><div class='del'>-	/* Determine the runlist size. */</div><div class='del'>-	while (likely(rl_real_end-&gt;length))</div><div class='del'>-		rl_real_end++;</div><div class='del'>-	old_size = rl_real_end - runlist-&gt;rl + 1;</div><div class='del'>-	/* If @start is in a hole simply extend the hole. */</div><div class='del'>-	if (rl-&gt;lcn == LCN_HOLE) {</div><div class='del'>-		/*</div><div class='del'>-		 * If both @start and @end are in the same sparse run, we are</div><div class='del'>-		 * done.</div><div class='del'>-		 */</div><div class='del'>-		if (end &lt;= rl[1].vcn) {</div><div class='del'>-			ntfs_debug("Done (requested hole is already sparse).");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-extend_hole:</div><div class='del'>-		/* Extend the hole. */</div><div class='del'>-		rl-&gt;length = end - rl-&gt;vcn;</div><div class='del'>-		/* If @end is in a hole, merge it with the current one. */</div><div class='del'>-		if (rl_end-&gt;lcn == LCN_HOLE) {</div><div class='del'>-			rl_end++;</div><div class='del'>-			rl-&gt;length = rl_end-&gt;vcn - rl-&gt;vcn;</div><div class='del'>-		}</div><div class='del'>-		/* We have done the hole.  Now deal with the remaining tail. */</div><div class='del'>-		rl++;</div><div class='del'>-		/* Cut out all runlist elements up to @end. */</div><div class='del'>-		if (rl &lt; rl_end)</div><div class='del'>-			memmove(rl, rl_end, (rl_real_end - rl_end + 1) *</div><div class='del'>-					sizeof(*rl));</div><div class='del'>-		/* Adjust the beginning of the tail if necessary. */</div><div class='del'>-		if (end &gt; rl-&gt;vcn) {</div><div class='del'>-			delta = end - rl-&gt;vcn;</div><div class='del'>-			rl-&gt;vcn = end;</div><div class='del'>-			rl-&gt;length -= delta;</div><div class='del'>-			/* Only adjust the lcn if it is real. */</div><div class='del'>-			if (rl-&gt;lcn &gt;= 0)</div><div class='del'>-				rl-&gt;lcn += delta;</div><div class='del'>-		}</div><div class='del'>-shrink_allocation:</div><div class='del'>-		/* Reallocate memory if the allocation changed. */</div><div class='del'>-		if (rl &lt; rl_end) {</div><div class='del'>-			rl = ntfs_rl_realloc(runlist-&gt;rl, old_size,</div><div class='del'>-					old_size - (rl_end - rl));</div><div class='del'>-			if (IS_ERR(rl))</div><div class='del'>-				ntfs_warning(vol-&gt;sb, "Failed to shrink "</div><div class='del'>-						"runlist buffer.  This just "</div><div class='del'>-						"wastes a bit of memory "</div><div class='del'>-						"temporarily so we ignore it "</div><div class='del'>-						"and return success.");</div><div class='del'>-			else</div><div class='del'>-				runlist-&gt;rl = rl;</div><div class='del'>-		}</div><div class='del'>-		ntfs_debug("Done (extend hole).");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If @start is at the beginning of a run things are easier as there is</div><div class='del'>-	 * no need to split the first run.</div><div class='del'>-	 */</div><div class='del'>-	if (start == rl-&gt;vcn) {</div><div class='del'>-		/*</div><div class='del'>-		 * @start is at the beginning of a run.</div><div class='del'>-		 *</div><div class='del'>-		 * If the previous run is sparse, extend its hole.</div><div class='del'>-		 *</div><div class='del'>-		 * If @end is not in the same run, switch the run to be sparse</div><div class='del'>-		 * and extend the newly created hole.</div><div class='del'>-		 *</div><div class='del'>-		 * Thus both of these cases reduce the problem to the above</div><div class='del'>-		 * case of "@start is in a hole".</div><div class='del'>-		 */</div><div class='del'>-		if (rl &gt; runlist-&gt;rl &amp;&amp; (rl - 1)-&gt;lcn == LCN_HOLE) {</div><div class='del'>-			rl--;</div><div class='del'>-			goto extend_hole;</div><div class='del'>-		}</div><div class='del'>-		if (end &gt;= rl[1].vcn) {</div><div class='del'>-			rl-&gt;lcn = LCN_HOLE;</div><div class='del'>-			goto extend_hole;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * The final case is when @end is in the same run as @start.</div><div class='del'>-		 * For this need to split the run into two.  One run for the</div><div class='del'>-		 * sparse region between the beginning of the old run, i.e.</div><div class='del'>-		 * @start, and @end and one for the remaining non-sparse</div><div class='del'>-		 * region, i.e. between @end and the end of the old run.</div><div class='del'>-		 */</div><div class='del'>-		trl = ntfs_rl_realloc(runlist-&gt;rl, old_size, old_size + 1);</div><div class='del'>-		if (IS_ERR(trl))</div><div class='del'>-			goto enomem_out;</div><div class='del'>-		old_size++;</div><div class='del'>-		if (runlist-&gt;rl != trl) {</div><div class='del'>-			rl = trl + (rl - runlist-&gt;rl);</div><div class='del'>-			rl_end = trl + (rl_end - runlist-&gt;rl);</div><div class='del'>-			rl_real_end = trl + (rl_real_end - runlist-&gt;rl);</div><div class='del'>-			runlist-&gt;rl = trl;</div><div class='del'>-		}</div><div class='del'>-split_end:</div><div class='del'>-		/* Shift all the runs up by one. */</div><div class='del'>-		memmove(rl + 1, rl, (rl_real_end - rl + 1) * sizeof(*rl));</div><div class='del'>-		/* Finally, setup the two split runs. */</div><div class='del'>-		rl-&gt;lcn = LCN_HOLE;</div><div class='del'>-		rl-&gt;length = length;</div><div class='del'>-		rl++;</div><div class='del'>-		rl-&gt;vcn += length;</div><div class='del'>-		/* Only adjust the lcn if it is real. */</div><div class='del'>-		if (rl-&gt;lcn &gt;= 0 || lcn_fixup)</div><div class='del'>-			rl-&gt;lcn += length;</div><div class='del'>-		rl-&gt;length -= length;</div><div class='del'>-		ntfs_debug("Done (split one).");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * @start is neither in a hole nor at the beginning of a run.</div><div class='del'>-	 *</div><div class='del'>-	 * If @end is in a hole, things are easier as simply truncating the run</div><div class='del'>-	 * @start is in to end at @start - 1, deleting all runs after that up</div><div class='del'>-	 * to @end, and finally extending the beginning of the run @end is in</div><div class='del'>-	 * to be @start is all that is needed.</div><div class='del'>-	 */</div><div class='del'>-	if (rl_end-&gt;lcn == LCN_HOLE) {</div><div class='del'>-		/* Truncate the run containing @start. */</div><div class='del'>-		rl-&gt;length = start - rl-&gt;vcn;</div><div class='del'>-		rl++;</div><div class='del'>-		/* Cut out all runlist elements up to @end. */</div><div class='del'>-		if (rl &lt; rl_end)</div><div class='del'>-			memmove(rl, rl_end, (rl_real_end - rl_end + 1) *</div><div class='del'>-					sizeof(*rl));</div><div class='del'>-		/* Extend the beginning of the run @end is in to be @start. */</div><div class='del'>-		rl-&gt;vcn = start;</div><div class='del'>-		rl-&gt;length = rl[1].vcn - start;</div><div class='del'>-		goto shrink_allocation;</div><div class='del'>-	}</div><div class='del'>-	/* </div><div class='del'>-	 * If @end is not in a hole there are still two cases to distinguish.</div><div class='del'>-	 * Either @end is or is not in the same run as @start.</div><div class='del'>-	 *</div><div class='del'>-	 * The second case is easier as it can be reduced to an already solved</div><div class='del'>-	 * problem by truncating the run @start is in to end at @start - 1.</div><div class='del'>-	 * Then, if @end is in the next run need to split the run into a sparse</div><div class='del'>-	 * run followed by a non-sparse run (already covered above) and if @end</div><div class='del'>-	 * is not in the next run switching it to be sparse, again reduces the</div><div class='del'>-	 * problem to the already covered case of "@start is in a hole".</div><div class='del'>-	 */</div><div class='del'>-	if (end &gt;= rl[1].vcn) {</div><div class='del'>-		/*</div><div class='del'>-		 * If @end is not in the next run, reduce the problem to the</div><div class='del'>-		 * case of "@start is in a hole".</div><div class='del'>-		 */</div><div class='del'>-		if (rl[1].length &amp;&amp; end &gt;= rl[2].vcn) {</div><div class='del'>-			/* Truncate the run containing @start. */</div><div class='del'>-			rl-&gt;length = start - rl-&gt;vcn;</div><div class='del'>-			rl++;</div><div class='del'>-			rl-&gt;vcn = start;</div><div class='del'>-			rl-&gt;lcn = LCN_HOLE;</div><div class='del'>-			goto extend_hole;</div><div class='del'>-		}</div><div class='del'>-		trl = ntfs_rl_realloc(runlist-&gt;rl, old_size, old_size + 1);</div><div class='del'>-		if (IS_ERR(trl))</div><div class='del'>-			goto enomem_out;</div><div class='del'>-		old_size++;</div><div class='del'>-		if (runlist-&gt;rl != trl) {</div><div class='del'>-			rl = trl + (rl - runlist-&gt;rl);</div><div class='del'>-			rl_end = trl + (rl_end - runlist-&gt;rl);</div><div class='del'>-			rl_real_end = trl + (rl_real_end - runlist-&gt;rl);</div><div class='del'>-			runlist-&gt;rl = trl;</div><div class='del'>-		}</div><div class='del'>-		/* Truncate the run containing @start. */</div><div class='del'>-		rl-&gt;length = start - rl-&gt;vcn;</div><div class='del'>-		rl++;</div><div class='del'>-		/*</div><div class='del'>-		 * @end is in the next run, reduce the problem to the case</div><div class='del'>-		 * where "@start is at the beginning of a run and @end is in</div><div class='del'>-		 * the same run as @start".</div><div class='del'>-		 */</div><div class='del'>-		delta = rl-&gt;vcn - start;</div><div class='del'>-		rl-&gt;vcn = start;</div><div class='del'>-		if (rl-&gt;lcn &gt;= 0) {</div><div class='del'>-			rl-&gt;lcn -= delta;</div><div class='del'>-			/* Need this in case the lcn just became negative. */</div><div class='del'>-			lcn_fixup = true;</div><div class='del'>-		}</div><div class='del'>-		rl-&gt;length += delta;</div><div class='del'>-		goto split_end;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The first case from above, i.e. @end is in the same run as @start.</div><div class='del'>-	 * We need to split the run into three.  One run for the non-sparse</div><div class='del'>-	 * region between the beginning of the old run and @start, one for the</div><div class='del'>-	 * sparse region between @start and @end, and one for the remaining</div><div class='del'>-	 * non-sparse region, i.e. between @end and the end of the old run.</div><div class='del'>-	 */</div><div class='del'>-	trl = ntfs_rl_realloc(runlist-&gt;rl, old_size, old_size + 2);</div><div class='del'>-	if (IS_ERR(trl))</div><div class='del'>-		goto enomem_out;</div><div class='del'>-	old_size += 2;</div><div class='del'>-	if (runlist-&gt;rl != trl) {</div><div class='del'>-		rl = trl + (rl - runlist-&gt;rl);</div><div class='del'>-		rl_end = trl + (rl_end - runlist-&gt;rl);</div><div class='del'>-		rl_real_end = trl + (rl_real_end - runlist-&gt;rl);</div><div class='del'>-		runlist-&gt;rl = trl;</div><div class='del'>-	}</div><div class='del'>-	/* Shift all the runs up by two. */</div><div class='del'>-	memmove(rl + 2, rl, (rl_real_end - rl + 1) * sizeof(*rl));</div><div class='del'>-	/* Finally, setup the three split runs. */</div><div class='del'>-	rl-&gt;length = start - rl-&gt;vcn;</div><div class='del'>-	rl++;</div><div class='del'>-	rl-&gt;vcn = start;</div><div class='del'>-	rl-&gt;lcn = LCN_HOLE;</div><div class='del'>-	rl-&gt;length = length;</div><div class='del'>-	rl++;</div><div class='del'>-	delta = end - rl-&gt;vcn;</div><div class='del'>-	rl-&gt;vcn = end;</div><div class='del'>-	rl-&gt;lcn += delta;</div><div class='del'>-	rl-&gt;length -= delta;</div><div class='del'>-	ntfs_debug("Done (split both).");</div><div class='del'>-	return 0;</div><div class='del'>-enomem_out:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Not enough memory to extend runlist buffer.");</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/runlist.h b/fs/ntfs/runlist.h<br/>deleted file mode 100644<br/>index 38de0a375f59..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/runlist.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/runlist.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * runlist.h - Defines for runlist handling in NTFS Linux kernel driver.</div><div class='del'>- *	       Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2005 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_RUNLIST_H</div><div class='del'>-#define _LINUX_NTFS_RUNLIST_H</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * runlist_element - in memory vcn to lcn mapping array element</div><div class='del'>- * @vcn:	starting vcn of the current array element</div><div class='del'>- * @lcn:	starting lcn of the current array element</div><div class='del'>- * @length:	length in clusters of the current array element</div><div class='del'>- *</div><div class='del'>- * The last vcn (in fact the last vcn + 1) is reached when length == 0.</div><div class='del'>- *</div><div class='del'>- * When lcn == -1 this means that the count vcns starting at vcn are not</div><div class='del'>- * physically allocated (i.e. this is a hole / data is sparse).</div><div class='del'>- */</div><div class='del'>-typedef struct {	/* In memory vcn to lcn mapping structure element. */</div><div class='del'>-	VCN vcn;	/* vcn = Starting virtual cluster number. */</div><div class='del'>-	LCN lcn;	/* lcn = Starting logical cluster number. */</div><div class='del'>-	s64 length;	/* Run length in clusters. */</div><div class='del'>-} runlist_element;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * runlist - in memory vcn to lcn mapping array including a read/write lock</div><div class='del'>- * @rl:		pointer to an array of runlist elements</div><div class='del'>- * @lock:	read/write spinlock for serializing access to @rl</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	runlist_element *rl;</div><div class='del'>-	struct rw_semaphore lock;</div><div class='del'>-} runlist;</div><div class='del'>-</div><div class='del'>-static inline void ntfs_init_runlist(runlist *rl)</div><div class='del'>-{</div><div class='del'>-	rl-&gt;rl = NULL;</div><div class='del'>-	init_rwsem(&amp;rl-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	LCN_HOLE		= -1,	/* Keep this as highest value or die! */</div><div class='del'>-	LCN_RL_NOT_MAPPED	= -2,</div><div class='del'>-	LCN_ENOENT		= -3,</div><div class='del'>-	LCN_ENOMEM		= -4,</div><div class='del'>-	LCN_EIO			= -5,</div><div class='del'>-} LCN_SPECIAL_VALUES;</div><div class='del'>-</div><div class='del'>-extern runlist_element *ntfs_runlists_merge(runlist_element *drl,</div><div class='del'>-		runlist_element *srl);</div><div class='del'>-</div><div class='del'>-extern runlist_element *ntfs_mapping_pairs_decompress(const ntfs_volume *vol,</div><div class='del'>-		const ATTR_RECORD *attr, runlist_element *old_rl);</div><div class='del'>-</div><div class='del'>-extern LCN ntfs_rl_vcn_to_lcn(const runlist_element *rl, const VCN vcn);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-extern runlist_element *ntfs_rl_find_vcn_nolock(runlist_element *rl,</div><div class='del'>-		const VCN vcn);</div><div class='del'>-</div><div class='del'>-extern int ntfs_get_size_for_mapping_pairs(const ntfs_volume *vol,</div><div class='del'>-		const runlist_element *rl, const VCN first_vcn,</div><div class='del'>-		const VCN last_vcn);</div><div class='del'>-</div><div class='del'>-extern int ntfs_mapping_pairs_build(const ntfs_volume *vol, s8 *dst,</div><div class='del'>-		const int dst_len, const runlist_element *rl,</div><div class='del'>-		const VCN first_vcn, const VCN last_vcn, VCN *const stop_vcn);</div><div class='del'>-</div><div class='del'>-extern int ntfs_rl_truncate_nolock(const ntfs_volume *vol,</div><div class='del'>-		runlist *const runlist, const s64 new_length);</div><div class='del'>-</div><div class='del'>-int ntfs_rl_punch_nolock(const ntfs_volume *vol, runlist *const runlist,</div><div class='del'>-		const VCN start, const s64 length);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_RUNLIST_H */</div><div class='head'>diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c<br/>deleted file mode 100644<br/>index 56a7d5bd33e4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/super.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3202 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * super.c - NTFS kernel super block handling. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2012 Anton Altaparmakov and Tuxera Inc.</div><div class='del'>- * Copyright (c) 2001,2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;	/* For bdev_logical_block_size(). */</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/vfs.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sysctl.h"</div><div class='del'>-#include "logfile.h"</div><div class='del'>-#include "quota.h"</div><div class='del'>-#include "usnjrnl.h"</div><div class='del'>-#include "dir.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "index.h"</div><div class='del'>-#include "inode.h"</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/* Number of mounted filesystems which have compression enabled. */</div><div class='del'>-static unsigned long ntfs_nr_compression_users;</div><div class='del'>-</div><div class='del'>-/* A global default upcase table and a corresponding reference count. */</div><div class='del'>-static ntfschar *default_upcase;</div><div class='del'>-static unsigned long ntfs_nr_upcase_users;</div><div class='del'>-</div><div class='del'>-/* Error constants/strings used in inode.c::ntfs_show_options(). */</div><div class='del'>-typedef enum {</div><div class='del'>-	/* One of these must be present, default is ON_ERRORS_CONTINUE. */</div><div class='del'>-	ON_ERRORS_PANIC			= 0x01,</div><div class='del'>-	ON_ERRORS_REMOUNT_RO		= 0x02,</div><div class='del'>-	ON_ERRORS_CONTINUE		= 0x04,</div><div class='del'>-	/* Optional, can be combined with any of the above. */</div><div class='del'>-	ON_ERRORS_RECOVER		= 0x10,</div><div class='del'>-} ON_ERRORS_ACTIONS;</div><div class='del'>-</div><div class='del'>-const option_t on_errors_arr[] = {</div><div class='del'>-	{ ON_ERRORS_PANIC,	"panic" },</div><div class='del'>-	{ ON_ERRORS_REMOUNT_RO,	"remount-ro", },</div><div class='del'>-	{ ON_ERRORS_CONTINUE,	"continue", },</div><div class='del'>-	{ ON_ERRORS_RECOVER,	"recover" },</div><div class='del'>-	{ 0,			NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * simple_getbool - convert input string to a boolean value</div><div class='del'>- * @s: input string to convert</div><div class='del'>- * @setval: where to store the output boolean value</div><div class='del'>- *</div><div class='del'>- * Copied from old ntfs driver (which copied from vfat driver).</div><div class='del'>- *</div><div class='del'>- * "1", "yes", "true", or an empty string are converted to %true.</div><div class='del'>- * "0", "no", and "false" are converted to %false.</div><div class='del'>- *</div><div class='del'>- * Return: %1 if the string is converted or was empty and *setval contains it;</div><div class='del'>- *	   %0 if the string was not valid.</div><div class='del'>- */</div><div class='del'>-static int simple_getbool(char *s, bool *setval)</div><div class='del'>-{</div><div class='del'>-	if (s) {</div><div class='del'>-		if (!strcmp(s, "1") || !strcmp(s, "yes") || !strcmp(s, "true"))</div><div class='del'>-			*setval = true;</div><div class='del'>-		else if (!strcmp(s, "0") || !strcmp(s, "no") ||</div><div class='del'>-							!strcmp(s, "false"))</div><div class='del'>-			*setval = false;</div><div class='del'>-		else</div><div class='del'>-			return 0;</div><div class='del'>-	} else</div><div class='del'>-		*setval = true;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * parse_options - parse the (re)mount options</div><div class='del'>- * @vol:	ntfs volume</div><div class='del'>- * @opt:	string containing the (re)mount options</div><div class='del'>- *</div><div class='del'>- * Parse the recognized options in @opt for the ntfs volume described by @vol.</div><div class='del'>- */</div><div class='del'>-static bool parse_options(ntfs_volume *vol, char *opt)</div><div class='del'>-{</div><div class='del'>-	char *p, *v, *ov;</div><div class='del'>-	static char *utf8 = "utf8";</div><div class='del'>-	int errors = 0, sloppy = 0;</div><div class='del'>-	kuid_t uid = INVALID_UID;</div><div class='del'>-	kgid_t gid = INVALID_GID;</div><div class='del'>-	umode_t fmask = (umode_t)-1, dmask = (umode_t)-1;</div><div class='del'>-	int mft_zone_multiplier = -1, on_errors = -1;</div><div class='del'>-	int show_sys_files = -1, case_sensitive = -1, disable_sparse = -1;</div><div class='del'>-	struct nls_table *nls_map = NULL, *old_nls;</div><div class='del'>-</div><div class='del'>-	/* I am lazy... (-8 */</div><div class='del'>-#define NTFS_GETOPT_WITH_DEFAULT(option, variable, default_value)	\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		if (!v || !*v)						\</div><div class='del'>-			variable = default_value;			\</div><div class='del'>-		else {							\</div><div class='del'>-			variable = simple_strtoul(ov = v, &amp;v, 0);	\</div><div class='del'>-			if (*v)						\</div><div class='del'>-				goto needs_val;				\</div><div class='del'>-		}							\</div><div class='del'>-	}</div><div class='del'>-#define NTFS_GETOPT(option, variable)					\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		if (!v || !*v)						\</div><div class='del'>-			goto needs_arg;					\</div><div class='del'>-		variable = simple_strtoul(ov = v, &amp;v, 0);		\</div><div class='del'>-		if (*v)							\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-	}</div><div class='del'>-#define NTFS_GETOPT_UID(option, variable)				\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		uid_t uid_value;					\</div><div class='del'>-		if (!v || !*v)						\</div><div class='del'>-			goto needs_arg;					\</div><div class='del'>-		uid_value = simple_strtoul(ov = v, &amp;v, 0);		\</div><div class='del'>-		if (*v)							\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-		variable = make_kuid(current_user_ns(), uid_value);	\</div><div class='del'>-		if (!uid_valid(variable))				\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-	}</div><div class='del'>-#define NTFS_GETOPT_GID(option, variable)				\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		gid_t gid_value;					\</div><div class='del'>-		if (!v || !*v)						\</div><div class='del'>-			goto needs_arg;					\</div><div class='del'>-		gid_value = simple_strtoul(ov = v, &amp;v, 0);		\</div><div class='del'>-		if (*v)							\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-		variable = make_kgid(current_user_ns(), gid_value);	\</div><div class='del'>-		if (!gid_valid(variable))				\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-	}</div><div class='del'>-#define NTFS_GETOPT_OCTAL(option, variable)				\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		if (!v || !*v)						\</div><div class='del'>-			goto needs_arg;					\</div><div class='del'>-		variable = simple_strtoul(ov = v, &amp;v, 8);		\</div><div class='del'>-		if (*v)							\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-	}</div><div class='del'>-#define NTFS_GETOPT_BOOL(option, variable)				\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		bool val;						\</div><div class='del'>-		if (!simple_getbool(v, &amp;val))				\</div><div class='del'>-			goto needs_bool;				\</div><div class='del'>-		variable = val;						\</div><div class='del'>-	}</div><div class='del'>-#define NTFS_GETOPT_OPTIONS_ARRAY(option, variable, opt_array)		\</div><div class='del'>-	if (!strcmp(p, option)) {					\</div><div class='del'>-		int _i;							\</div><div class='del'>-		if (!v || !*v)						\</div><div class='del'>-			goto needs_arg;					\</div><div class='del'>-		ov = v;							\</div><div class='del'>-		if (variable == -1)					\</div><div class='del'>-			variable = 0;					\</div><div class='del'>-		for (_i = 0; opt_array[_i].str &amp;&amp; *opt_array[_i].str; _i++) \</div><div class='del'>-			if (!strcmp(opt_array[_i].str, v)) {		\</div><div class='del'>-				variable |= opt_array[_i].val;		\</div><div class='del'>-				break;					\</div><div class='del'>-			}						\</div><div class='del'>-		if (!opt_array[_i].str || !*opt_array[_i].str)		\</div><div class='del'>-			goto needs_val;					\</div><div class='del'>-	}</div><div class='del'>-	if (!opt || !*opt)</div><div class='del'>-		goto no_mount_options;</div><div class='del'>-	ntfs_debug("Entering with mount options string: %s", opt);</div><div class='del'>-	while ((p = strsep(&amp;opt, ","))) {</div><div class='del'>-		if ((v = strchr(p, '=')))</div><div class='del'>-			*v++ = 0;</div><div class='del'>-		NTFS_GETOPT_UID("uid", uid)</div><div class='del'>-		else NTFS_GETOPT_GID("gid", gid)</div><div class='del'>-		else NTFS_GETOPT_OCTAL("umask", fmask = dmask)</div><div class='del'>-		else NTFS_GETOPT_OCTAL("fmask", fmask)</div><div class='del'>-		else NTFS_GETOPT_OCTAL("dmask", dmask)</div><div class='del'>-		else NTFS_GETOPT("mft_zone_multiplier", mft_zone_multiplier)</div><div class='del'>-		else NTFS_GETOPT_WITH_DEFAULT("sloppy", sloppy, true)</div><div class='del'>-		else NTFS_GETOPT_BOOL("show_sys_files", show_sys_files)</div><div class='del'>-		else NTFS_GETOPT_BOOL("case_sensitive", case_sensitive)</div><div class='del'>-		else NTFS_GETOPT_BOOL("disable_sparse", disable_sparse)</div><div class='del'>-		else NTFS_GETOPT_OPTIONS_ARRAY("errors", on_errors,</div><div class='del'>-				on_errors_arr)</div><div class='del'>-		else if (!strcmp(p, "posix") || !strcmp(p, "show_inodes"))</div><div class='del'>-			ntfs_warning(vol-&gt;sb, "Ignoring obsolete option %s.",</div><div class='del'>-					p);</div><div class='del'>-		else if (!strcmp(p, "nls") || !strcmp(p, "iocharset")) {</div><div class='del'>-			if (!strcmp(p, "iocharset"))</div><div class='del'>-				ntfs_warning(vol-&gt;sb, "Option iocharset is "</div><div class='del'>-						"deprecated. Please use "</div><div class='del'>-						"option nls=&lt;charsetname&gt; in "</div><div class='del'>-						"the future.");</div><div class='del'>-			if (!v || !*v)</div><div class='del'>-				goto needs_arg;</div><div class='del'>-use_utf8:</div><div class='del'>-			old_nls = nls_map;</div><div class='del'>-			nls_map = load_nls(v);</div><div class='del'>-			if (!nls_map) {</div><div class='del'>-				if (!old_nls) {</div><div class='del'>-					ntfs_error(vol-&gt;sb, "NLS character set "</div><div class='del'>-							"%s not found.", v);</div><div class='del'>-					return false;</div><div class='del'>-				}</div><div class='del'>-				ntfs_error(vol-&gt;sb, "NLS character set %s not "</div><div class='del'>-						"found. Using previous one %s.",</div><div class='del'>-						v, old_nls-&gt;charset);</div><div class='del'>-				nls_map = old_nls;</div><div class='del'>-			} else /* nls_map */ {</div><div class='del'>-				unload_nls(old_nls);</div><div class='del'>-			}</div><div class='del'>-		} else if (!strcmp(p, "utf8")) {</div><div class='del'>-			bool val = false;</div><div class='del'>-			ntfs_warning(vol-&gt;sb, "Option utf8 is no longer "</div><div class='del'>-				   "supported, using option nls=utf8. Please "</div><div class='del'>-				   "use option nls=utf8 in the future and "</div><div class='del'>-				   "make sure utf8 is compiled either as a "</div><div class='del'>-				   "module or into the kernel.");</div><div class='del'>-			if (!v || !*v)</div><div class='del'>-				val = true;</div><div class='del'>-			else if (!simple_getbool(v, &amp;val))</div><div class='del'>-				goto needs_bool;</div><div class='del'>-			if (val) {</div><div class='del'>-				v = utf8;</div><div class='del'>-				goto use_utf8;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Unrecognized mount option %s.", p);</div><div class='del'>-			if (errors &lt; INT_MAX)</div><div class='del'>-				errors++;</div><div class='del'>-		}</div><div class='del'>-#undef NTFS_GETOPT_OPTIONS_ARRAY</div><div class='del'>-#undef NTFS_GETOPT_BOOL</div><div class='del'>-#undef NTFS_GETOPT</div><div class='del'>-#undef NTFS_GETOPT_WITH_DEFAULT</div><div class='del'>-	}</div><div class='del'>-no_mount_options:</div><div class='del'>-	if (errors &amp;&amp; !sloppy)</div><div class='del'>-		return false;</div><div class='del'>-	if (sloppy)</div><div class='del'>-		ntfs_warning(vol-&gt;sb, "Sloppy option given. Ignoring "</div><div class='del'>-				"unrecognized mount option(s) and continuing.");</div><div class='del'>-	/* Keep this first! */</div><div class='del'>-	if (on_errors != -1) {</div><div class='del'>-		if (!on_errors) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Invalid errors option argument "</div><div class='del'>-					"or bug in options parser.");</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (nls_map) {</div><div class='del'>-		if (vol-&gt;nls_map &amp;&amp; vol-&gt;nls_map != nls_map) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot change NLS character set "</div><div class='del'>-					"on remount.");</div><div class='del'>-			return false;</div><div class='del'>-		} /* else (!vol-&gt;nls_map) */</div><div class='del'>-		ntfs_debug("Using NLS character set %s.", nls_map-&gt;charset);</div><div class='del'>-		vol-&gt;nls_map = nls_map;</div><div class='del'>-	} else /* (!nls_map) */ {</div><div class='del'>-		if (!vol-&gt;nls_map) {</div><div class='del'>-			vol-&gt;nls_map = load_nls_default();</div><div class='del'>-			if (!vol-&gt;nls_map) {</div><div class='del'>-				ntfs_error(vol-&gt;sb, "Failed to load default "</div><div class='del'>-						"NLS character set.");</div><div class='del'>-				return false;</div><div class='del'>-			}</div><div class='del'>-			ntfs_debug("Using default NLS character set (%s).",</div><div class='del'>-					vol-&gt;nls_map-&gt;charset);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (mft_zone_multiplier != -1) {</div><div class='del'>-		if (vol-&gt;mft_zone_multiplier &amp;&amp; vol-&gt;mft_zone_multiplier !=</div><div class='del'>-				mft_zone_multiplier) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Cannot change mft_zone_multiplier "</div><div class='del'>-					"on remount.");</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-		if (mft_zone_multiplier &lt; 1 || mft_zone_multiplier &gt; 4) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Invalid mft_zone_multiplier. "</div><div class='del'>-					"Using default value, i.e. 1.");</div><div class='del'>-			mft_zone_multiplier = 1;</div><div class='del'>-		}</div><div class='del'>-		vol-&gt;mft_zone_multiplier = mft_zone_multiplier;</div><div class='del'>-	}</div><div class='del'>-	if (!vol-&gt;mft_zone_multiplier)</div><div class='del'>-		vol-&gt;mft_zone_multiplier = 1;</div><div class='del'>-	if (on_errors != -1)</div><div class='del'>-		vol-&gt;on_errors = on_errors;</div><div class='del'>-	if (!vol-&gt;on_errors || vol-&gt;on_errors == ON_ERRORS_RECOVER)</div><div class='del'>-		vol-&gt;on_errors |= ON_ERRORS_CONTINUE;</div><div class='del'>-	if (uid_valid(uid))</div><div class='del'>-		vol-&gt;uid = uid;</div><div class='del'>-	if (gid_valid(gid))</div><div class='del'>-		vol-&gt;gid = gid;</div><div class='del'>-	if (fmask != (umode_t)-1)</div><div class='del'>-		vol-&gt;fmask = fmask;</div><div class='del'>-	if (dmask != (umode_t)-1)</div><div class='del'>-		vol-&gt;dmask = dmask;</div><div class='del'>-	if (show_sys_files != -1) {</div><div class='del'>-		if (show_sys_files)</div><div class='del'>-			NVolSetShowSystemFiles(vol);</div><div class='del'>-		else</div><div class='del'>-			NVolClearShowSystemFiles(vol);</div><div class='del'>-	}</div><div class='del'>-	if (case_sensitive != -1) {</div><div class='del'>-		if (case_sensitive)</div><div class='del'>-			NVolSetCaseSensitive(vol);</div><div class='del'>-		else</div><div class='del'>-			NVolClearCaseSensitive(vol);</div><div class='del'>-	}</div><div class='del'>-	if (disable_sparse != -1) {</div><div class='del'>-		if (disable_sparse)</div><div class='del'>-			NVolClearSparseEnabled(vol);</div><div class='del'>-		else {</div><div class='del'>-			if (!NVolSparseEnabled(vol) &amp;&amp;</div><div class='del'>-					vol-&gt;major_ver &amp;&amp; vol-&gt;major_ver &lt; 3)</div><div class='del'>-				ntfs_warning(vol-&gt;sb, "Not enabling sparse "</div><div class='del'>-						"support due to NTFS volume "</div><div class='del'>-						"version %i.%i (need at least "</div><div class='del'>-						"version 3.0).", vol-&gt;major_ver,</div><div class='del'>-						vol-&gt;minor_ver);</div><div class='del'>-			else</div><div class='del'>-				NVolSetSparseEnabled(vol);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-needs_arg:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "The %s option requires an argument.", p);</div><div class='del'>-	return false;</div><div class='del'>-needs_bool:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "The %s option requires a boolean argument.", p);</div><div class='del'>-	return false;</div><div class='del'>-needs_val:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Invalid %s option argument: %s", p, ov);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_write_volume_flags - write new flags to the volume information flags</div><div class='del'>- * @vol:	ntfs volume on which to modify the flags</div><div class='del'>- * @flags:	new flags value for the volume information flags</div><div class='del'>- *</div><div class='del'>- * Internal function.  You probably want to use ntfs_{set,clear}_volume_flags()</div><div class='del'>- * instead (see below).</div><div class='del'>- *</div><div class='del'>- * Replace the volume information flags on the volume @vol with the value</div><div class='del'>- * supplied in @flags.  Note, this overwrites the volume information flags, so</div><div class='del'>- * make sure to combine the flags you want to modify with the old flags and use</div><div class='del'>- * the result when calling ntfs_write_volume_flags().</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_write_volume_flags(ntfs_volume *vol, const VOLUME_FLAGS flags)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni = NTFS_I(vol-&gt;vol_ino);</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	VOLUME_INFORMATION *vi;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering, old flags = 0x%x, new flags = 0x%x.",</div><div class='del'>-			le16_to_cpu(vol-&gt;vol_flags), le16_to_cpu(flags));</div><div class='del'>-	if (vol-&gt;vol_flags == flags)</div><div class='del'>-		goto done;</div><div class='del'>-	BUG_ON(!ni);</div><div class='del'>-	m = map_mft_record(ni);</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-		err = PTR_ERR(m);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	ctx = ntfs_attr_get_search_ctx(ni, m);</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto put_unm_err_out;</div><div class='del'>-	}</div><div class='del'>-	err = ntfs_attr_lookup(AT_VOLUME_INFORMATION, NULL, 0, 0, 0, NULL, 0,</div><div class='del'>-			ctx);</div><div class='del'>-	if (err)</div><div class='del'>-		goto put_unm_err_out;</div><div class='del'>-	vi = (VOLUME_INFORMATION*)((u8*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-	vol-&gt;vol_flags = vi-&gt;flags = flags;</div><div class='del'>-	flush_dcache_mft_record_page(ctx-&gt;ntfs_ino);</div><div class='del'>-	mark_mft_record_dirty(ctx-&gt;ntfs_ino);</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-done:</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-put_unm_err_out:</div><div class='del'>-	if (ctx)</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(ni);</div><div class='del'>-err_out:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed with error code %i.", -err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_set_volume_flags - set bits in the volume information flags</div><div class='del'>- * @vol:	ntfs volume on which to modify the flags</div><div class='del'>- * @flags:	flags to set on the volume</div><div class='del'>- *</div><div class='del'>- * Set the bits in @flags in the volume information flags on the volume @vol.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_set_volume_flags(ntfs_volume *vol, VOLUME_FLAGS flags)</div><div class='del'>-{</div><div class='del'>-	flags &amp;= VOLUME_FLAGS_MASK;</div><div class='del'>-	return ntfs_write_volume_flags(vol, vol-&gt;vol_flags | flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_clear_volume_flags - clear bits in the volume information flags</div><div class='del'>- * @vol:	ntfs volume on which to modify the flags</div><div class='del'>- * @flags:	flags to clear on the volume</div><div class='del'>- *</div><div class='del'>- * Clear the bits in @flags in the volume information flags on the volume @vol.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success and -errno on error.</div><div class='del'>- */</div><div class='del'>-static inline int ntfs_clear_volume_flags(ntfs_volume *vol, VOLUME_FLAGS flags)</div><div class='del'>-{</div><div class='del'>-	flags &amp;= VOLUME_FLAGS_MASK;</div><div class='del'>-	flags = vol-&gt;vol_flags &amp; cpu_to_le16(~le16_to_cpu(flags));</div><div class='del'>-	return ntfs_write_volume_flags(vol, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_remount - change the mount options of a mounted ntfs filesystem</div><div class='del'>- * @sb:		superblock of mounted ntfs filesystem</div><div class='del'>- * @flags:	remount flags</div><div class='del'>- * @opt:	remount options string</div><div class='del'>- *</div><div class='del'>- * Change the mount options of an already mounted ntfs filesystem.</div><div class='del'>- *</div><div class='del'>- * NOTE:  The VFS sets the @sb-&gt;s_flags remount flags to @flags after</div><div class='del'>- * ntfs_remount() returns successfully (i.e. returns 0).  Otherwise,</div><div class='del'>- * @sb-&gt;s_flags are not changed.</div><div class='del'>- */</div><div class='del'>-static int ntfs_remount(struct super_block *sb, int *flags, char *opt)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering with remount options string: %s", opt);</div><div class='del'>-</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-</div><div class='del'>-#ifndef NTFS_RW</div><div class='del'>-	/* For read-only compiled driver, enforce read-only flag. */</div><div class='del'>-	*flags |= SB_RDONLY;</div><div class='del'>-#else /* NTFS_RW */</div><div class='del'>-	/*</div><div class='del'>-	 * For the read-write compiled driver, if we are remounting read-write,</div><div class='del'>-	 * make sure there are no volume errors and that no unsupported volume</div><div class='del'>-	 * flags are set.  Also, empty the logfile journal as it would become</div><div class='del'>-	 * stale as soon as something is written to the volume and mark the</div><div class='del'>-	 * volume dirty so that chkdsk is run if the volume is not umounted</div><div class='del'>-	 * cleanly.  Finally, mark the quotas out of date so Windows rescans</div><div class='del'>-	 * the volume on boot and updates them.</div><div class='del'>-	 *</div><div class='del'>-	 * When remounting read-only, mark the volume clean if no volume errors</div><div class='del'>-	 * have occurred.</div><div class='del'>-	 */</div><div class='del'>-	if (sb_rdonly(sb) &amp;&amp; !(*flags &amp; SB_RDONLY)) {</div><div class='del'>-		static const char *es = ".  Cannot remount read-write.";</div><div class='del'>-</div><div class='del'>-		/* Remounting read-write. */</div><div class='del'>-		if (NVolErrors(vol)) {</div><div class='del'>-			ntfs_error(sb, "Volume has errors and is read-only%s",</div><div class='del'>-					es);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;vol_flags &amp; VOLUME_IS_DIRTY) {</div><div class='del'>-			ntfs_error(sb, "Volume is dirty and read-only%s", es);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;vol_flags &amp; VOLUME_MODIFIED_BY_CHKDSK) {</div><div class='del'>-			ntfs_error(sb, "Volume has been modified by chkdsk "</div><div class='del'>-					"and is read-only%s", es);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;vol_flags &amp; VOLUME_MUST_MOUNT_RO_MASK) {</div><div class='del'>-			ntfs_error(sb, "Volume has unsupported flags set "</div><div class='del'>-					"(0x%x) and is read-only%s",</div><div class='del'>-					(unsigned)le16_to_cpu(vol-&gt;vol_flags),</div><div class='del'>-					es);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-		if (ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY)) {</div><div class='del'>-			ntfs_error(sb, "Failed to set dirty bit in volume "</div><div class='del'>-					"information flags%s", es);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-#if 0</div><div class='del'>-		// TODO: Enable this code once we start modifying anything that</div><div class='del'>-		//	 is different between NTFS 1.2 and 3.x...</div><div class='del'>-		/* Set NT4 compatibility flag on newer NTFS version volumes. */</div><div class='del'>-		if ((vol-&gt;major_ver &gt; 1)) {</div><div class='del'>-			if (ntfs_set_volume_flags(vol, VOLUME_MOUNTED_ON_NT4)) {</div><div class='del'>-				ntfs_error(sb, "Failed to set NT4 "</div><div class='del'>-						"compatibility flag%s", es);</div><div class='del'>-				NVolSetErrors(vol);</div><div class='del'>-				return -EROFS;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		if (!ntfs_empty_logfile(vol-&gt;logfile_ino)) {</div><div class='del'>-			ntfs_error(sb, "Failed to empty journal $LogFile%s",</div><div class='del'>-					es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-		if (!ntfs_mark_quotas_out_of_date(vol)) {</div><div class='del'>-			ntfs_error(sb, "Failed to mark quotas out of date%s",</div><div class='del'>-					es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-		if (!ntfs_stamp_usnjrnl(vol)) {</div><div class='del'>-			ntfs_error(sb, "Failed to stamp transaction log "</div><div class='del'>-					"($UsnJrnl)%s", es);</div><div class='del'>-			NVolSetErrors(vol);</div><div class='del'>-			return -EROFS;</div><div class='del'>-		}</div><div class='del'>-	} else if (!sb_rdonly(sb) &amp;&amp; (*flags &amp; SB_RDONLY)) {</div><div class='del'>-		/* Remounting read-only. */</div><div class='del'>-		if (!NVolErrors(vol)) {</div><div class='del'>-			if (ntfs_clear_volume_flags(vol, VOLUME_IS_DIRTY))</div><div class='del'>-				ntfs_warning(sb, "Failed to clear dirty bit "</div><div class='del'>-						"in volume information "</div><div class='del'>-						"flags.  Run chkdsk.");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	// TODO: Deal with *flags.</div><div class='del'>-</div><div class='del'>-	if (!parse_options(vol, opt))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * is_boot_sector_ntfs - check whether a boot sector is a valid NTFS boot sector</div><div class='del'>- * @sb:		Super block of the device to which @b belongs.</div><div class='del'>- * @b:		Boot sector of device @sb to check.</div><div class='del'>- * @silent:	If 'true', all output will be silenced.</div><div class='del'>- *</div><div class='del'>- * is_boot_sector_ntfs() checks whether the boot sector @b is a valid NTFS boot</div><div class='del'>- * sector. Returns 'true' if it is valid and 'false' if not.</div><div class='del'>- *</div><div class='del'>- * @sb is only needed for warning/error output, i.e. it can be NULL when silent</div><div class='del'>- * is 'true'.</div><div class='del'>- */</div><div class='del'>-static bool is_boot_sector_ntfs(const struct super_block *sb,</div><div class='del'>-		const NTFS_BOOT_SECTOR *b, const bool silent)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Check that checksum == sum of u32 values from b to the checksum</div><div class='del'>-	 * field.  If checksum is zero, no checking is done.  We will work when</div><div class='del'>-	 * the checksum test fails, since some utilities update the boot sector</div><div class='del'>-	 * ignoring the checksum which leaves the checksum out-of-date.  We</div><div class='del'>-	 * report a warning if this is the case.</div><div class='del'>-	 */</div><div class='del'>-	if ((void*)b &lt; (void*)&amp;b-&gt;checksum &amp;&amp; b-&gt;checksum &amp;&amp; !silent) {</div><div class='del'>-		le32 *u;</div><div class='del'>-		u32 i;</div><div class='del'>-</div><div class='del'>-		for (i = 0, u = (le32*)b; u &lt; (le32*)(&amp;b-&gt;checksum); ++u)</div><div class='del'>-			i += le32_to_cpup(u);</div><div class='del'>-		if (le32_to_cpu(b-&gt;checksum) != i)</div><div class='del'>-			ntfs_warning(sb, "Invalid boot sector checksum.");</div><div class='del'>-	}</div><div class='del'>-	/* Check OEMidentifier is "NTFS    " */</div><div class='del'>-	if (b-&gt;oem_id != magicNTFS)</div><div class='del'>-		goto not_ntfs;</div><div class='del'>-	/* Check bytes per sector value is between 256 and 4096. */</div><div class='del'>-	if (le16_to_cpu(b-&gt;bpb.bytes_per_sector) &lt; 0x100 ||</div><div class='del'>-			le16_to_cpu(b-&gt;bpb.bytes_per_sector) &gt; 0x1000)</div><div class='del'>-		goto not_ntfs;</div><div class='del'>-	/* Check sectors per cluster value is valid. */</div><div class='del'>-	switch (b-&gt;bpb.sectors_per_cluster) {</div><div class='del'>-	case 1: case 2: case 4: case 8: case 16: case 32: case 64: case 128:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		goto not_ntfs;</div><div class='del'>-	}</div><div class='del'>-	/* Check the cluster size is not above the maximum (64kiB). */</div><div class='del'>-	if ((u32)le16_to_cpu(b-&gt;bpb.bytes_per_sector) *</div><div class='del'>-			b-&gt;bpb.sectors_per_cluster &gt; NTFS_MAX_CLUSTER_SIZE)</div><div class='del'>-		goto not_ntfs;</div><div class='del'>-	/* Check reserved/unused fields are really zero. */</div><div class='del'>-	if (le16_to_cpu(b-&gt;bpb.reserved_sectors) ||</div><div class='del'>-			le16_to_cpu(b-&gt;bpb.root_entries) ||</div><div class='del'>-			le16_to_cpu(b-&gt;bpb.sectors) ||</div><div class='del'>-			le16_to_cpu(b-&gt;bpb.sectors_per_fat) ||</div><div class='del'>-			le32_to_cpu(b-&gt;bpb.large_sectors) || b-&gt;bpb.fats)</div><div class='del'>-		goto not_ntfs;</div><div class='del'>-	/* Check clusters per file mft record value is valid. */</div><div class='del'>-	if ((u8)b-&gt;clusters_per_mft_record &lt; 0xe1 ||</div><div class='del'>-			(u8)b-&gt;clusters_per_mft_record &gt; 0xf7)</div><div class='del'>-		switch (b-&gt;clusters_per_mft_record) {</div><div class='del'>-		case 1: case 2: case 4: case 8: case 16: case 32: case 64:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto not_ntfs;</div><div class='del'>-		}</div><div class='del'>-	/* Check clusters per index block value is valid. */</div><div class='del'>-	if ((u8)b-&gt;clusters_per_index_record &lt; 0xe1 ||</div><div class='del'>-			(u8)b-&gt;clusters_per_index_record &gt; 0xf7)</div><div class='del'>-		switch (b-&gt;clusters_per_index_record) {</div><div class='del'>-		case 1: case 2: case 4: case 8: case 16: case 32: case 64:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto not_ntfs;</div><div class='del'>-		}</div><div class='del'>-	/*</div><div class='del'>-	 * Check for valid end of sector marker. We will work without it, but</div><div class='del'>-	 * many BIOSes will refuse to boot from a bootsector if the magic is</div><div class='del'>-	 * incorrect, so we emit a warning.</div><div class='del'>-	 */</div><div class='del'>-	if (!silent &amp;&amp; b-&gt;end_of_sector_marker != cpu_to_le16(0xaa55))</div><div class='del'>-		ntfs_warning(sb, "Invalid end of sector marker.");</div><div class='del'>-	return true;</div><div class='del'>-not_ntfs:</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * read_ntfs_boot_sector - read the NTFS boot sector of a device</div><div class='del'>- * @sb:		super block of device to read the boot sector from</div><div class='del'>- * @silent:	if true, suppress all output</div><div class='del'>- *</div><div class='del'>- * Reads the boot sector from the device and validates it. If that fails, tries</div><div class='del'>- * to read the backup boot sector, first from the end of the device a-la NT4 and</div><div class='del'>- * later and then from the middle of the device a-la NT3.51 and before.</div><div class='del'>- *</div><div class='del'>- * If a valid boot sector is found but it is not the primary boot sector, we</div><div class='del'>- * repair the primary boot sector silently (unless the device is read-only or</div><div class='del'>- * the primary boot sector is not accessible).</div><div class='del'>- *</div><div class='del'>- * NOTE: To call this function, @sb must have the fields s_dev, the ntfs super</div><div class='del'>- * block (u.ntfs_sb), nr_blocks and the device flags (s_flags) initialized</div><div class='del'>- * to their respective values.</div><div class='del'>- *</div><div class='del'>- * Return the unlocked buffer head containing the boot sector or NULL on error.</div><div class='del'>- */</div><div class='del'>-static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,</div><div class='del'>-		const int silent)</div><div class='del'>-{</div><div class='del'>-	const char *read_err_str = "Unable to read %s boot sector.";</div><div class='del'>-	struct buffer_head *bh_primary, *bh_backup;</div><div class='del'>-	sector_t nr_blocks = NTFS_SB(sb)-&gt;nr_blocks;</div><div class='del'>-</div><div class='del'>-	/* Try to read primary boot sector. */</div><div class='del'>-	if ((bh_primary = sb_bread(sb, 0))) {</div><div class='del'>-		if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)</div><div class='del'>-				bh_primary-&gt;b_data, silent))</div><div class='del'>-			return bh_primary;</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Primary boot sector is invalid.");</div><div class='del'>-	} else if (!silent)</div><div class='del'>-		ntfs_error(sb, read_err_str, "primary");</div><div class='del'>-	if (!(NTFS_SB(sb)-&gt;on_errors &amp; ON_ERRORS_RECOVER)) {</div><div class='del'>-		if (bh_primary)</div><div class='del'>-			brelse(bh_primary);</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Mount option errors=recover not used. "</div><div class='del'>-					"Aborting without trying to recover.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	/* Try to read NT4+ backup boot sector. */</div><div class='del'>-	if ((bh_backup = sb_bread(sb, nr_blocks - 1))) {</div><div class='del'>-		if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)</div><div class='del'>-				bh_backup-&gt;b_data, silent))</div><div class='del'>-			goto hotfix_primary_boot_sector;</div><div class='del'>-		brelse(bh_backup);</div><div class='del'>-	} else if (!silent)</div><div class='del'>-		ntfs_error(sb, read_err_str, "backup");</div><div class='del'>-	/* Try to read NT3.51- backup boot sector. */</div><div class='del'>-	if ((bh_backup = sb_bread(sb, nr_blocks &gt;&gt; 1))) {</div><div class='del'>-		if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)</div><div class='del'>-				bh_backup-&gt;b_data, silent))</div><div class='del'>-			goto hotfix_primary_boot_sector;</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Could not find a valid backup boot "</div><div class='del'>-					"sector.");</div><div class='del'>-		brelse(bh_backup);</div><div class='del'>-	} else if (!silent)</div><div class='del'>-		ntfs_error(sb, read_err_str, "backup");</div><div class='del'>-	/* We failed. Cleanup and return. */</div><div class='del'>-	if (bh_primary)</div><div class='del'>-		brelse(bh_primary);</div><div class='del'>-	return NULL;</div><div class='del'>-hotfix_primary_boot_sector:</div><div class='del'>-	if (bh_primary) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we managed to read sector zero and the volume is not</div><div class='del'>-		 * read-only, copy the found, valid backup boot sector to the</div><div class='del'>-		 * primary boot sector.  Note we only copy the actual boot</div><div class='del'>-		 * sector structure, not the actual whole device sector as that</div><div class='del'>-		 * may be bigger and would potentially damage the $Boot system</div><div class='del'>-		 * file (FIXME: Would be nice to know if the backup boot sector</div><div class='del'>-		 * on a large sector device contains the whole boot loader or</div><div class='del'>-		 * just the first 512 bytes).</div><div class='del'>-		 */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			ntfs_warning(sb, "Hot-fix: Recovering invalid primary "</div><div class='del'>-					"boot sector from backup copy.");</div><div class='del'>-			memcpy(bh_primary-&gt;b_data, bh_backup-&gt;b_data,</div><div class='del'>-					NTFS_BLOCK_SIZE);</div><div class='del'>-			mark_buffer_dirty(bh_primary);</div><div class='del'>-			sync_dirty_buffer(bh_primary);</div><div class='del'>-			if (buffer_uptodate(bh_primary)) {</div><div class='del'>-				brelse(bh_backup);</div><div class='del'>-				return bh_primary;</div><div class='del'>-			}</div><div class='del'>-			ntfs_error(sb, "Hot-fix: Device write error while "</div><div class='del'>-					"recovering primary boot sector.");</div><div class='del'>-		} else {</div><div class='del'>-			ntfs_warning(sb, "Hot-fix: Recovery of primary boot "</div><div class='del'>-					"sector failed: Read-only mount.");</div><div class='del'>-		}</div><div class='del'>-		brelse(bh_primary);</div><div class='del'>-	}</div><div class='del'>-	ntfs_warning(sb, "Using backup boot sector.");</div><div class='del'>-	return bh_backup;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * parse_ntfs_boot_sector - parse the boot sector and store the data in @vol</div><div class='del'>- * @vol:	volume structure to initialise with data from boot sector</div><div class='del'>- * @b:		boot sector to parse</div><div class='del'>- *</div><div class='del'>- * Parse the ntfs boot sector @b and store all imporant information therein in</div><div class='del'>- * the ntfs super block @vol.  Return 'true' on success and 'false' on error.</div><div class='del'>- */</div><div class='del'>-static bool parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b)</div><div class='del'>-{</div><div class='del'>-	unsigned int sectors_per_cluster_bits, nr_hidden_sects;</div><div class='del'>-	int clusters_per_mft_record, clusters_per_index_record;</div><div class='del'>-	s64 ll;</div><div class='del'>-</div><div class='del'>-	vol-&gt;sector_size = le16_to_cpu(b-&gt;bpb.bytes_per_sector);</div><div class='del'>-	vol-&gt;sector_size_bits = ffs(vol-&gt;sector_size) - 1;</div><div class='del'>-	ntfs_debug("vol-&gt;sector_size = %i (0x%x)", vol-&gt;sector_size,</div><div class='del'>-			vol-&gt;sector_size);</div><div class='del'>-	ntfs_debug("vol-&gt;sector_size_bits = %i (0x%x)", vol-&gt;sector_size_bits,</div><div class='del'>-			vol-&gt;sector_size_bits);</div><div class='del'>-	if (vol-&gt;sector_size &lt; vol-&gt;sb-&gt;s_blocksize) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Sector size (%i) is smaller than the "</div><div class='del'>-				"device block size (%lu).  This is not "</div><div class='del'>-				"supported.  Sorry.", vol-&gt;sector_size,</div><div class='del'>-				vol-&gt;sb-&gt;s_blocksize);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("sectors_per_cluster = 0x%x", b-&gt;bpb.sectors_per_cluster);</div><div class='del'>-	sectors_per_cluster_bits = ffs(b-&gt;bpb.sectors_per_cluster) - 1;</div><div class='del'>-	ntfs_debug("sectors_per_cluster_bits = 0x%x",</div><div class='del'>-			sectors_per_cluster_bits);</div><div class='del'>-	nr_hidden_sects = le32_to_cpu(b-&gt;bpb.hidden_sectors);</div><div class='del'>-	ntfs_debug("number of hidden sectors = 0x%x", nr_hidden_sects);</div><div class='del'>-	vol-&gt;cluster_size = vol-&gt;sector_size &lt;&lt; sectors_per_cluster_bits;</div><div class='del'>-	vol-&gt;cluster_size_mask = vol-&gt;cluster_size - 1;</div><div class='del'>-	vol-&gt;cluster_size_bits = ffs(vol-&gt;cluster_size) - 1;</div><div class='del'>-	ntfs_debug("vol-&gt;cluster_size = %i (0x%x)", vol-&gt;cluster_size,</div><div class='del'>-			vol-&gt;cluster_size);</div><div class='del'>-	ntfs_debug("vol-&gt;cluster_size_mask = 0x%x", vol-&gt;cluster_size_mask);</div><div class='del'>-	ntfs_debug("vol-&gt;cluster_size_bits = %i", vol-&gt;cluster_size_bits);</div><div class='del'>-	if (vol-&gt;cluster_size &lt; vol-&gt;sector_size) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Cluster size (%i) is smaller than the "</div><div class='del'>-				"sector size (%i).  This is not supported.  "</div><div class='del'>-				"Sorry.", vol-&gt;cluster_size, vol-&gt;sector_size);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	clusters_per_mft_record = b-&gt;clusters_per_mft_record;</div><div class='del'>-	ntfs_debug("clusters_per_mft_record = %i (0x%x)",</div><div class='del'>-			clusters_per_mft_record, clusters_per_mft_record);</div><div class='del'>-	if (clusters_per_mft_record &gt; 0)</div><div class='del'>-		vol-&gt;mft_record_size = vol-&gt;cluster_size &lt;&lt;</div><div class='del'>-				(ffs(clusters_per_mft_record) - 1);</div><div class='del'>-	else</div><div class='del'>-		/*</div><div class='del'>-		 * When mft_record_size &lt; cluster_size, clusters_per_mft_record</div><div class='del'>-		 * = -log2(mft_record_size) bytes. mft_record_size normaly is</div><div class='del'>-		 * 1024 bytes, which is encoded as 0xF6 (-10 in decimal).</div><div class='del'>-		 */</div><div class='del'>-		vol-&gt;mft_record_size = 1 &lt;&lt; -clusters_per_mft_record;</div><div class='del'>-	vol-&gt;mft_record_size_mask = vol-&gt;mft_record_size - 1;</div><div class='del'>-	vol-&gt;mft_record_size_bits = ffs(vol-&gt;mft_record_size) - 1;</div><div class='del'>-	ntfs_debug("vol-&gt;mft_record_size = %i (0x%x)", vol-&gt;mft_record_size,</div><div class='del'>-			vol-&gt;mft_record_size);</div><div class='del'>-	ntfs_debug("vol-&gt;mft_record_size_mask = 0x%x",</div><div class='del'>-			vol-&gt;mft_record_size_mask);</div><div class='del'>-	ntfs_debug("vol-&gt;mft_record_size_bits = %i (0x%x)",</div><div class='del'>-			vol-&gt;mft_record_size_bits, vol-&gt;mft_record_size_bits);</div><div class='del'>-	/*</div><div class='del'>-	 * We cannot support mft record sizes above the PAGE_SIZE since</div><div class='del'>-	 * we store $MFT/$DATA, the table of mft records in the page cache.</div><div class='del'>-	 */</div><div class='del'>-	if (vol-&gt;mft_record_size &gt; PAGE_SIZE) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Mft record size (%i) exceeds the "</div><div class='del'>-				"PAGE_SIZE on your system (%lu).  "</div><div class='del'>-				"This is not supported.  Sorry.",</div><div class='del'>-				vol-&gt;mft_record_size, PAGE_SIZE);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* We cannot support mft record sizes below the sector size. */</div><div class='del'>-	if (vol-&gt;mft_record_size &lt; vol-&gt;sector_size) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Mft record size (%i) is smaller than the "</div><div class='del'>-				"sector size (%i).  This is not supported.  "</div><div class='del'>-				"Sorry.", vol-&gt;mft_record_size,</div><div class='del'>-				vol-&gt;sector_size);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	clusters_per_index_record = b-&gt;clusters_per_index_record;</div><div class='del'>-	ntfs_debug("clusters_per_index_record = %i (0x%x)",</div><div class='del'>-			clusters_per_index_record, clusters_per_index_record);</div><div class='del'>-	if (clusters_per_index_record &gt; 0)</div><div class='del'>-		vol-&gt;index_record_size = vol-&gt;cluster_size &lt;&lt;</div><div class='del'>-				(ffs(clusters_per_index_record) - 1);</div><div class='del'>-	else</div><div class='del'>-		/*</div><div class='del'>-		 * When index_record_size &lt; cluster_size,</div><div class='del'>-		 * clusters_per_index_record = -log2(index_record_size) bytes.</div><div class='del'>-		 * index_record_size normaly equals 4096 bytes, which is</div><div class='del'>-		 * encoded as 0xF4 (-12 in decimal).</div><div class='del'>-		 */</div><div class='del'>-		vol-&gt;index_record_size = 1 &lt;&lt; -clusters_per_index_record;</div><div class='del'>-	vol-&gt;index_record_size_mask = vol-&gt;index_record_size - 1;</div><div class='del'>-	vol-&gt;index_record_size_bits = ffs(vol-&gt;index_record_size) - 1;</div><div class='del'>-	ntfs_debug("vol-&gt;index_record_size = %i (0x%x)",</div><div class='del'>-			vol-&gt;index_record_size, vol-&gt;index_record_size);</div><div class='del'>-	ntfs_debug("vol-&gt;index_record_size_mask = 0x%x",</div><div class='del'>-			vol-&gt;index_record_size_mask);</div><div class='del'>-	ntfs_debug("vol-&gt;index_record_size_bits = %i (0x%x)",</div><div class='del'>-			vol-&gt;index_record_size_bits,</div><div class='del'>-			vol-&gt;index_record_size_bits);</div><div class='del'>-	/* We cannot support index record sizes below the sector size. */</div><div class='del'>-	if (vol-&gt;index_record_size &lt; vol-&gt;sector_size) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Index record size (%i) is smaller than "</div><div class='del'>-				"the sector size (%i).  This is not "</div><div class='del'>-				"supported.  Sorry.", vol-&gt;index_record_size,</div><div class='del'>-				vol-&gt;sector_size);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Get the size of the volume in clusters and check for 64-bit-ness.</div><div class='del'>-	 * Windows currently only uses 32 bits to save the clusters so we do</div><div class='del'>-	 * the same as it is much faster on 32-bit CPUs.</div><div class='del'>-	 */</div><div class='del'>-	ll = sle64_to_cpu(b-&gt;number_of_sectors) &gt;&gt; sectors_per_cluster_bits;</div><div class='del'>-	if ((u64)ll &gt;= 1ULL &lt;&lt; 32) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Cannot handle 64-bit clusters.  Sorry.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;nr_clusters = ll;</div><div class='del'>-	ntfs_debug("vol-&gt;nr_clusters = 0x%llx", (long long)vol-&gt;nr_clusters);</div><div class='del'>-	/*</div><div class='del'>-	 * On an architecture where unsigned long is 32-bits, we restrict the</div><div class='del'>-	 * volume size to 2TiB (2^41). On a 64-bit architecture, the compiler</div><div class='del'>-	 * will hopefully optimize the whole check away.</div><div class='del'>-	 */</div><div class='del'>-	if (sizeof(unsigned long) &lt; 8) {</div><div class='del'>-		if ((ll &lt;&lt; vol-&gt;cluster_size_bits) &gt;= (1ULL &lt;&lt; 41)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Volume size (%lluTiB) is too "</div><div class='del'>-					"large for this architecture.  "</div><div class='del'>-					"Maximum supported is 2TiB.  Sorry.",</div><div class='del'>-					(unsigned long long)ll &gt;&gt; (40 -</div><div class='del'>-					vol-&gt;cluster_size_bits));</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ll = sle64_to_cpu(b-&gt;mft_lcn);</div><div class='del'>-	if (ll &gt;= vol-&gt;nr_clusters) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "MFT LCN (%lli, 0x%llx) is beyond end of "</div><div class='del'>-				"volume.  Weird.", (unsigned long long)ll,</div><div class='del'>-				(unsigned long long)ll);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;mft_lcn = ll;</div><div class='del'>-	ntfs_debug("vol-&gt;mft_lcn = 0x%llx", (long long)vol-&gt;mft_lcn);</div><div class='del'>-	ll = sle64_to_cpu(b-&gt;mftmirr_lcn);</div><div class='del'>-	if (ll &gt;= vol-&gt;nr_clusters) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "MFTMirr LCN (%lli, 0x%llx) is beyond end "</div><div class='del'>-				"of volume.  Weird.", (unsigned long long)ll,</div><div class='del'>-				(unsigned long long)ll);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;mftmirr_lcn = ll;</div><div class='del'>-	ntfs_debug("vol-&gt;mftmirr_lcn = 0x%llx", (long long)vol-&gt;mftmirr_lcn);</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/*</div><div class='del'>-	 * Work out the size of the mft mirror in number of mft records. If the</div><div class='del'>-	 * cluster size is less than or equal to the size taken by four mft</div><div class='del'>-	 * records, the mft mirror stores the first four mft records. If the</div><div class='del'>-	 * cluster size is bigger than the size taken by four mft records, the</div><div class='del'>-	 * mft mirror contains as many mft records as will fit into one</div><div class='del'>-	 * cluster.</div><div class='del'>-	 */</div><div class='del'>-	if (vol-&gt;cluster_size &lt;= (4 &lt;&lt; vol-&gt;mft_record_size_bits))</div><div class='del'>-		vol-&gt;mftmirr_size = 4;</div><div class='del'>-	else</div><div class='del'>-		vol-&gt;mftmirr_size = vol-&gt;cluster_size &gt;&gt;</div><div class='del'>-				vol-&gt;mft_record_size_bits;</div><div class='del'>-	ntfs_debug("vol-&gt;mftmirr_size = %i", vol-&gt;mftmirr_size);</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	vol-&gt;serial_no = le64_to_cpu(b-&gt;volume_serial_number);</div><div class='del'>-	ntfs_debug("vol-&gt;serial_no = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;serial_no);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_setup_allocators - initialize the cluster and mft allocators</div><div class='del'>- * @vol:	volume structure for which to setup the allocators</div><div class='del'>- *</div><div class='del'>- * Setup the cluster (lcn) and mft allocators to the starting values.</div><div class='del'>- */</div><div class='del'>-static void ntfs_setup_allocators(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	LCN mft_zone_size, mft_lcn;</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	ntfs_debug("vol-&gt;mft_zone_multiplier = 0x%x",</div><div class='del'>-			vol-&gt;mft_zone_multiplier);</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/* Determine the size of the MFT zone. */</div><div class='del'>-	mft_zone_size = vol-&gt;nr_clusters;</div><div class='del'>-	switch (vol-&gt;mft_zone_multiplier) {  /* % of volume size in clusters */</div><div class='del'>-	case 4:</div><div class='del'>-		mft_zone_size &gt;&gt;= 1;			/* 50%   */</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		mft_zone_size = (mft_zone_size +</div><div class='del'>-				(mft_zone_size &gt;&gt; 1)) &gt;&gt; 2;	/* 37.5% */</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		mft_zone_size &gt;&gt;= 2;			/* 25%   */</div><div class='del'>-		break;</div><div class='del'>-	/* case 1: */</div><div class='del'>-	default:</div><div class='del'>-		mft_zone_size &gt;&gt;= 3;			/* 12.5% */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* Setup the mft zone. */</div><div class='del'>-	vol-&gt;mft_zone_start = vol-&gt;mft_zone_pos = vol-&gt;mft_lcn;</div><div class='del'>-	ntfs_debug("vol-&gt;mft_zone_pos = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;mft_zone_pos);</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate the mft_lcn for an unmodified NTFS volume (see mkntfs</div><div class='del'>-	 * source) and if the actual mft_lcn is in the expected place or even</div><div class='del'>-	 * further to the front of the volume, extend the mft_zone to cover the</div><div class='del'>-	 * beginning of the volume as well.  This is in order to protect the</div><div class='del'>-	 * area reserved for the mft bitmap as well within the mft_zone itself.</div><div class='del'>-	 * On non-standard volumes we do not protect it as the overhead would</div><div class='del'>-	 * be higher than the speed increase we would get by doing it.</div><div class='del'>-	 */</div><div class='del'>-	mft_lcn = (8192 + 2 * vol-&gt;cluster_size - 1) / vol-&gt;cluster_size;</div><div class='del'>-	if (mft_lcn * vol-&gt;cluster_size &lt; 16 * 1024)</div><div class='del'>-		mft_lcn = (16 * 1024 + vol-&gt;cluster_size - 1) /</div><div class='del'>-				vol-&gt;cluster_size;</div><div class='del'>-	if (vol-&gt;mft_zone_start &lt;= mft_lcn)</div><div class='del'>-		vol-&gt;mft_zone_start = 0;</div><div class='del'>-	ntfs_debug("vol-&gt;mft_zone_start = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;mft_zone_start);</div><div class='del'>-	/*</div><div class='del'>-	 * Need to cap the mft zone on non-standard volumes so that it does</div><div class='del'>-	 * not point outside the boundaries of the volume.  We do this by</div><div class='del'>-	 * halving the zone size until we are inside the volume.</div><div class='del'>-	 */</div><div class='del'>-	vol-&gt;mft_zone_end = vol-&gt;mft_lcn + mft_zone_size;</div><div class='del'>-	while (vol-&gt;mft_zone_end &gt;= vol-&gt;nr_clusters) {</div><div class='del'>-		mft_zone_size &gt;&gt;= 1;</div><div class='del'>-		vol-&gt;mft_zone_end = vol-&gt;mft_lcn + mft_zone_size;</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("vol-&gt;mft_zone_end = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;mft_zone_end);</div><div class='del'>-	/*</div><div class='del'>-	 * Set the current position within each data zone to the start of the</div><div class='del'>-	 * respective zone.</div><div class='del'>-	 */</div><div class='del'>-	vol-&gt;data1_zone_pos = vol-&gt;mft_zone_end;</div><div class='del'>-	ntfs_debug("vol-&gt;data1_zone_pos = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;data1_zone_pos);</div><div class='del'>-	vol-&gt;data2_zone_pos = 0;</div><div class='del'>-	ntfs_debug("vol-&gt;data2_zone_pos = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;data2_zone_pos);</div><div class='del'>-</div><div class='del'>-	/* Set the mft data allocation position to mft record 24. */</div><div class='del'>-	vol-&gt;mft_data_pos = 24;</div><div class='del'>-	ntfs_debug("vol-&gt;mft_data_pos = 0x%llx",</div><div class='del'>-			(unsigned long long)vol-&gt;mft_data_pos);</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_and_init_mft_mirror - load and setup the mft mirror inode for a volume</div><div class='del'>- * @vol:	ntfs super block describing device whose mft mirror to load</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- */</div><div class='del'>-static bool load_and_init_mft_mirror(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	struct inode *tmp_ino;</div><div class='del'>-	ntfs_inode *tmp_ni;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Get mft mirror inode. */</div><div class='del'>-	tmp_ino = ntfs_iget(vol-&gt;sb, FILE_MFTMirr);</div><div class='del'>-	if (IS_ERR(tmp_ino) || is_bad_inode(tmp_ino)) {</div><div class='del'>-		if (!IS_ERR(tmp_ino))</div><div class='del'>-			iput(tmp_ino);</div><div class='del'>-		/* Caller will display error message. */</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Re-initialize some specifics about $MFTMirr's inode as</div><div class='del'>-	 * ntfs_read_inode() will have set up the default ones.</div><div class='del'>-	 */</div><div class='del'>-	/* Set uid and gid to root. */</div><div class='del'>-	tmp_ino-&gt;i_uid = GLOBAL_ROOT_UID;</div><div class='del'>-	tmp_ino-&gt;i_gid = GLOBAL_ROOT_GID;</div><div class='del'>-	/* Regular file.  No access for anyone. */</div><div class='del'>-	tmp_ino-&gt;i_mode = S_IFREG;</div><div class='del'>-	/* No VFS initiated operations allowed for $MFTMirr. */</div><div class='del'>-	tmp_ino-&gt;i_op = &amp;ntfs_empty_inode_ops;</div><div class='del'>-	tmp_ino-&gt;i_fop = &amp;ntfs_empty_file_ops;</div><div class='del'>-	/* Put in our special address space operations. */</div><div class='del'>-	tmp_ino-&gt;i_mapping-&gt;a_ops = &amp;ntfs_mst_aops;</div><div class='del'>-	tmp_ni = NTFS_I(tmp_ino);</div><div class='del'>-	/* The $MFTMirr, like the $MFT is multi sector transfer protected. */</div><div class='del'>-	NInoSetMstProtected(tmp_ni);</div><div class='del'>-	NInoSetSparseDisabled(tmp_ni);</div><div class='del'>-	/*</div><div class='del'>-	 * Set up our little cheat allowing us to reuse the async read io</div><div class='del'>-	 * completion handler for directories.</div><div class='del'>-	 */</div><div class='del'>-	tmp_ni-&gt;itype.index.block_size = vol-&gt;mft_record_size;</div><div class='del'>-	tmp_ni-&gt;itype.index.block_size_bits = vol-&gt;mft_record_size_bits;</div><div class='del'>-	vol-&gt;mftmirr_ino = tmp_ino;</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * check_mft_mirror - compare contents of the mft mirror with the mft</div><div class='del'>- * @vol:	ntfs super block describing device whose mft mirror to check</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- *</div><div class='del'>- * Note, this function also results in the mft mirror runlist being completely</div><div class='del'>- * mapped into memory.  The mft mirror write code requires this and will BUG()</div><div class='del'>- * should it find an unmapped runlist element.</div><div class='del'>- */</div><div class='del'>-static bool check_mft_mirror(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	ntfs_inode *mirr_ni;</div><div class='del'>-	struct page *mft_page, *mirr_page;</div><div class='del'>-	u8 *kmft, *kmirr;</div><div class='del'>-	runlist_element *rl, rl2[2];</div><div class='del'>-	pgoff_t index;</div><div class='del'>-	int mrecs_per_page, i;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Compare contents of $MFT and $MFTMirr. */</div><div class='del'>-	mrecs_per_page = PAGE_SIZE / vol-&gt;mft_record_size;</div><div class='del'>-	BUG_ON(!mrecs_per_page);</div><div class='del'>-	BUG_ON(!vol-&gt;mftmirr_size);</div><div class='del'>-	mft_page = mirr_page = NULL;</div><div class='del'>-	kmft = kmirr = NULL;</div><div class='del'>-	index = i = 0;</div><div class='del'>-	do {</div><div class='del'>-		u32 bytes;</div><div class='del'>-</div><div class='del'>-		/* Switch pages if necessary. */</div><div class='del'>-		if (!(i % mrecs_per_page)) {</div><div class='del'>-			if (index) {</div><div class='del'>-				ntfs_unmap_page(mft_page);</div><div class='del'>-				ntfs_unmap_page(mirr_page);</div><div class='del'>-			}</div><div class='del'>-			/* Get the $MFT page. */</div><div class='del'>-			mft_page = ntfs_map_page(vol-&gt;mft_ino-&gt;i_mapping,</div><div class='del'>-					index);</div><div class='del'>-			if (IS_ERR(mft_page)) {</div><div class='del'>-				ntfs_error(sb, "Failed to read $MFT.");</div><div class='del'>-				return false;</div><div class='del'>-			}</div><div class='del'>-			kmft = page_address(mft_page);</div><div class='del'>-			/* Get the $MFTMirr page. */</div><div class='del'>-			mirr_page = ntfs_map_page(vol-&gt;mftmirr_ino-&gt;i_mapping,</div><div class='del'>-					index);</div><div class='del'>-			if (IS_ERR(mirr_page)) {</div><div class='del'>-				ntfs_error(sb, "Failed to read $MFTMirr.");</div><div class='del'>-				goto mft_unmap_out;</div><div class='del'>-			}</div><div class='del'>-			kmirr = page_address(mirr_page);</div><div class='del'>-			++index;</div><div class='del'>-		}</div><div class='del'>-		/* Do not check the record if it is not in use. */</div><div class='del'>-		if (((MFT_RECORD*)kmft)-&gt;flags &amp; MFT_RECORD_IN_USE) {</div><div class='del'>-			/* Make sure the record is ok. */</div><div class='del'>-			if (ntfs_is_baad_recordp((le32*)kmft)) {</div><div class='del'>-				ntfs_error(sb, "Incomplete multi sector "</div><div class='del'>-						"transfer detected in mft "</div><div class='del'>-						"record %i.", i);</div><div class='del'>-mm_unmap_out:</div><div class='del'>-				ntfs_unmap_page(mirr_page);</div><div class='del'>-mft_unmap_out:</div><div class='del'>-				ntfs_unmap_page(mft_page);</div><div class='del'>-				return false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Do not check the mirror record if it is not in use. */</div><div class='del'>-		if (((MFT_RECORD*)kmirr)-&gt;flags &amp; MFT_RECORD_IN_USE) {</div><div class='del'>-			if (ntfs_is_baad_recordp((le32*)kmirr)) {</div><div class='del'>-				ntfs_error(sb, "Incomplete multi sector "</div><div class='del'>-						"transfer detected in mft "</div><div class='del'>-						"mirror record %i.", i);</div><div class='del'>-				goto mm_unmap_out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Get the amount of data in the current record. */</div><div class='del'>-		bytes = le32_to_cpu(((MFT_RECORD*)kmft)-&gt;bytes_in_use);</div><div class='del'>-		if (bytes &lt; sizeof(MFT_RECORD_OLD) ||</div><div class='del'>-				bytes &gt; vol-&gt;mft_record_size ||</div><div class='del'>-				ntfs_is_baad_recordp((le32*)kmft)) {</div><div class='del'>-			bytes = le32_to_cpu(((MFT_RECORD*)kmirr)-&gt;bytes_in_use);</div><div class='del'>-			if (bytes &lt; sizeof(MFT_RECORD_OLD) ||</div><div class='del'>-					bytes &gt; vol-&gt;mft_record_size ||</div><div class='del'>-					ntfs_is_baad_recordp((le32*)kmirr))</div><div class='del'>-				bytes = vol-&gt;mft_record_size;</div><div class='del'>-		}</div><div class='del'>-		/* Compare the two records. */</div><div class='del'>-		if (memcmp(kmft, kmirr, bytes)) {</div><div class='del'>-			ntfs_error(sb, "$MFT and $MFTMirr (record %i) do not "</div><div class='del'>-					"match.  Run ntfsfix or chkdsk.", i);</div><div class='del'>-			goto mm_unmap_out;</div><div class='del'>-		}</div><div class='del'>-		kmft += vol-&gt;mft_record_size;</div><div class='del'>-		kmirr += vol-&gt;mft_record_size;</div><div class='del'>-	} while (++i &lt; vol-&gt;mftmirr_size);</div><div class='del'>-	/* Release the last pages. */</div><div class='del'>-	ntfs_unmap_page(mft_page);</div><div class='del'>-	ntfs_unmap_page(mirr_page);</div><div class='del'>-</div><div class='del'>-	/* Construct the mft mirror runlist by hand. */</div><div class='del'>-	rl2[0].vcn = 0;</div><div class='del'>-	rl2[0].lcn = vol-&gt;mftmirr_lcn;</div><div class='del'>-	rl2[0].length = (vol-&gt;mftmirr_size * vol-&gt;mft_record_size +</div><div class='del'>-			vol-&gt;cluster_size - 1) / vol-&gt;cluster_size;</div><div class='del'>-	rl2[1].vcn = rl2[0].length;</div><div class='del'>-	rl2[1].lcn = LCN_ENOENT;</div><div class='del'>-	rl2[1].length = 0;</div><div class='del'>-	/*</div><div class='del'>-	 * Because we have just read all of the mft mirror, we know we have</div><div class='del'>-	 * mapped the full runlist for it.</div><div class='del'>-	 */</div><div class='del'>-	mirr_ni = NTFS_I(vol-&gt;mftmirr_ino);</div><div class='del'>-	down_read(&amp;mirr_ni-&gt;runlist.lock);</div><div class='del'>-	rl = mirr_ni-&gt;runlist.rl;</div><div class='del'>-	/* Compare the two runlists.  They must be identical. */</div><div class='del'>-	i = 0;</div><div class='del'>-	do {</div><div class='del'>-		if (rl2[i].vcn != rl[i].vcn || rl2[i].lcn != rl[i].lcn ||</div><div class='del'>-				rl2[i].length != rl[i].length) {</div><div class='del'>-			ntfs_error(sb, "$MFTMirr location mismatch.  "</div><div class='del'>-					"Run chkdsk.");</div><div class='del'>-			up_read(&amp;mirr_ni-&gt;runlist.lock);</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-	} while (rl2[i++].length);</div><div class='del'>-	up_read(&amp;mirr_ni-&gt;runlist.lock);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_and_check_logfile - load and check the logfile inode for a volume</div><div class='del'>- * @vol:	ntfs super block describing device whose logfile to load</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- */</div><div class='del'>-static bool load_and_check_logfile(ntfs_volume *vol,</div><div class='del'>-		RESTART_PAGE_HEADER **rp)</div><div class='del'>-{</div><div class='del'>-	struct inode *tmp_ino;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	tmp_ino = ntfs_iget(vol-&gt;sb, FILE_LogFile);</div><div class='del'>-	if (IS_ERR(tmp_ino) || is_bad_inode(tmp_ino)) {</div><div class='del'>-		if (!IS_ERR(tmp_ino))</div><div class='del'>-			iput(tmp_ino);</div><div class='del'>-		/* Caller will display error message. */</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	if (!ntfs_check_logfile(tmp_ino, rp)) {</div><div class='del'>-		iput(tmp_ino);</div><div class='del'>-		/* ntfs_check_logfile() will have displayed error output. */</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	NInoSetSparseDisabled(NTFS_I(tmp_ino));</div><div class='del'>-	vol-&gt;logfile_ino = tmp_ino;</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define NTFS_HIBERFIL_HEADER_SIZE	4096</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * check_windows_hibernation_status - check if Windows is suspended on a volume</div><div class='del'>- * @vol:	ntfs super block of device to check</div><div class='del'>- *</div><div class='del'>- * Check if Windows is hibernated on the ntfs volume @vol.  This is done by</div><div class='del'>- * looking for the file hiberfil.sys in the root directory of the volume.  If</div><div class='del'>- * the file is not present Windows is definitely not suspended.</div><div class='del'>- *</div><div class='del'>- * If hiberfil.sys exists and is less than 4kiB in size it means Windows is</div><div class='del'>- * definitely suspended (this volume is not the system volume).  Caveat:  on a</div><div class='del'>- * system with many volumes it is possible that the &lt; 4kiB check is bogus but</div><div class='del'>- * for now this should do fine.</div><div class='del'>- *</div><div class='del'>- * If hiberfil.sys exists and is larger than 4kiB in size, we need to read the</div><div class='del'>- * hiberfil header (which is the first 4kiB).  If this begins with "hibr",</div><div class='del'>- * Windows is definitely suspended.  If it is completely full of zeroes,</div><div class='del'>- * Windows is definitely not hibernated.  Any other case is treated as if</div><div class='del'>- * Windows is suspended.  This caters for the above mentioned caveat of a</div><div class='del'>- * system with many volumes where no "hibr" magic would be present and there is</div><div class='del'>- * no zero header.</div><div class='del'>- *</div><div class='del'>- * Return 0 if Windows is not hibernated on the volume, &gt;0 if Windows is</div><div class='del'>- * hibernated on the volume, and -errno on error.</div><div class='del'>- */</div><div class='del'>-static int check_windows_hibernation_status(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	MFT_REF mref;</div><div class='del'>-	struct inode *vi;</div><div class='del'>-	struct page *page;</div><div class='del'>-	u32 *kaddr, *kend;</div><div class='del'>-	ntfs_name *name = NULL;</div><div class='del'>-	int ret = 1;</div><div class='del'>-	static const ntfschar hiberfil[13] = { cpu_to_le16('h'),</div><div class='del'>-			cpu_to_le16('i'), cpu_to_le16('b'),</div><div class='del'>-			cpu_to_le16('e'), cpu_to_le16('r'),</div><div class='del'>-			cpu_to_le16('f'), cpu_to_le16('i'),</div><div class='del'>-			cpu_to_le16('l'), cpu_to_le16('.'),</div><div class='del'>-			cpu_to_le16('s'), cpu_to_le16('y'),</div><div class='del'>-			cpu_to_le16('s'), 0 };</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/*</div><div class='del'>-	 * Find the inode number for the hibernation file by looking up the</div><div class='del'>-	 * filename hiberfil.sys in the root directory.</div><div class='del'>-	 */</div><div class='del'>-	inode_lock(vol-&gt;root_ino);</div><div class='del'>-	mref = ntfs_lookup_inode_by_name(NTFS_I(vol-&gt;root_ino), hiberfil, 12,</div><div class='del'>-			&amp;name);</div><div class='del'>-	inode_unlock(vol-&gt;root_ino);</div><div class='del'>-	if (IS_ERR_MREF(mref)) {</div><div class='del'>-		ret = MREF_ERR(mref);</div><div class='del'>-		/* If the file does not exist, Windows is not hibernated. */</div><div class='del'>-		if (ret == -ENOENT) {</div><div class='del'>-			ntfs_debug("hiberfil.sys not present.  Windows is not "</div><div class='del'>-					"hibernated on the volume.");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		/* A real error occurred. */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find inode number for "</div><div class='del'>-				"hiberfil.sys.");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	/* We do not care for the type of match that was found. */</div><div class='del'>-	kfree(name);</div><div class='del'>-	/* Get the inode. */</div><div class='del'>-	vi = ntfs_iget(vol-&gt;sb, MREF(mref));</div><div class='del'>-	if (IS_ERR(vi) || is_bad_inode(vi)) {</div><div class='del'>-		if (!IS_ERR(vi))</div><div class='del'>-			iput(vi);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to load hiberfil.sys.");</div><div class='del'>-		return IS_ERR(vi) ? PTR_ERR(vi) : -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(i_size_read(vi) &lt; NTFS_HIBERFIL_HEADER_SIZE)) {</div><div class='del'>-		ntfs_debug("hiberfil.sys is smaller than 4kiB (0x%llx).  "</div><div class='del'>-				"Windows is hibernated on the volume.  This "</div><div class='del'>-				"is not the system volume.", i_size_read(vi));</div><div class='del'>-		goto iput_out;</div><div class='del'>-	}</div><div class='del'>-	page = ntfs_map_page(vi-&gt;i_mapping, 0);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to read from hiberfil.sys.");</div><div class='del'>-		ret = PTR_ERR(page);</div><div class='del'>-		goto iput_out;</div><div class='del'>-	}</div><div class='del'>-	kaddr = (u32*)page_address(page);</div><div class='del'>-	if (*(le32*)kaddr == cpu_to_le32(0x72626968)/*'hibr'*/) {</div><div class='del'>-		ntfs_debug("Magic \"hibr\" found in hiberfil.sys.  Windows is "</div><div class='del'>-				"hibernated on the volume.  This is the "</div><div class='del'>-				"system volume.");</div><div class='del'>-		goto unm_iput_out;</div><div class='del'>-	}</div><div class='del'>-	kend = kaddr + NTFS_HIBERFIL_HEADER_SIZE/sizeof(*kaddr);</div><div class='del'>-	do {</div><div class='del'>-		if (unlikely(*kaddr)) {</div><div class='del'>-			ntfs_debug("hiberfil.sys is larger than 4kiB "</div><div class='del'>-					"(0x%llx), does not contain the "</div><div class='del'>-					"\"hibr\" magic, and does not have a "</div><div class='del'>-					"zero header.  Windows is hibernated "</div><div class='del'>-					"on the volume.  This is not the "</div><div class='del'>-					"system volume.", i_size_read(vi));</div><div class='del'>-			goto unm_iput_out;</div><div class='del'>-		}</div><div class='del'>-	} while (++kaddr &lt; kend);</div><div class='del'>-	ntfs_debug("hiberfil.sys contains a zero header.  Windows is not "</div><div class='del'>-			"hibernated on the volume.  This is the system "</div><div class='del'>-			"volume.");</div><div class='del'>-	ret = 0;</div><div class='del'>-unm_iput_out:</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-iput_out:</div><div class='del'>-	iput(vi);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_and_init_quota - load and setup the quota file for a volume if present</div><div class='del'>- * @vol:	ntfs super block describing device whose quota file to load</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.  If $Quota is not present, we</div><div class='del'>- * leave vol-&gt;quota_ino as NULL and return success.</div><div class='del'>- */</div><div class='del'>-static bool load_and_init_quota(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	MFT_REF mref;</div><div class='del'>-	struct inode *tmp_ino;</div><div class='del'>-	ntfs_name *name = NULL;</div><div class='del'>-	static const ntfschar Quota[7] = { cpu_to_le16('$'),</div><div class='del'>-			cpu_to_le16('Q'), cpu_to_le16('u'),</div><div class='del'>-			cpu_to_le16('o'), cpu_to_le16('t'),</div><div class='del'>-			cpu_to_le16('a'), 0 };</div><div class='del'>-	static ntfschar Q[3] = { cpu_to_le16('$'),</div><div class='del'>-			cpu_to_le16('Q'), 0 };</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/*</div><div class='del'>-	 * Find the inode number for the quota file by looking up the filename</div><div class='del'>-	 * $Quota in the extended system files directory $Extend.</div><div class='del'>-	 */</div><div class='del'>-	inode_lock(vol-&gt;extend_ino);</div><div class='del'>-	mref = ntfs_lookup_inode_by_name(NTFS_I(vol-&gt;extend_ino), Quota, 6,</div><div class='del'>-			&amp;name);</div><div class='del'>-	inode_unlock(vol-&gt;extend_ino);</div><div class='del'>-	if (IS_ERR_MREF(mref)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the file does not exist, quotas are disabled and have</div><div class='del'>-		 * never been enabled on this volume, just return success.</div><div class='del'>-		 */</div><div class='del'>-		if (MREF_ERR(mref) == -ENOENT) {</div><div class='del'>-			ntfs_debug("$Quota not present.  Volume does not have "</div><div class='del'>-					"quotas enabled.");</div><div class='del'>-			/*</div><div class='del'>-			 * No need to try to set quotas out of date if they are</div><div class='del'>-			 * not enabled.</div><div class='del'>-			 */</div><div class='del'>-			NVolSetQuotaOutOfDate(vol);</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		/* A real error occurred. */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find inode number for $Quota.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* We do not care for the type of match that was found. */</div><div class='del'>-	kfree(name);</div><div class='del'>-	/* Get the inode. */</div><div class='del'>-	tmp_ino = ntfs_iget(vol-&gt;sb, MREF(mref));</div><div class='del'>-	if (IS_ERR(tmp_ino) || is_bad_inode(tmp_ino)) {</div><div class='del'>-		if (!IS_ERR(tmp_ino))</div><div class='del'>-			iput(tmp_ino);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to load $Quota.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;quota_ino = tmp_ino;</div><div class='del'>-	/* Get the $Q index allocation attribute. */</div><div class='del'>-	tmp_ino = ntfs_index_iget(vol-&gt;quota_ino, Q, 2);</div><div class='del'>-	if (IS_ERR(tmp_ino)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to load $Quota/$Q index.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;quota_q_ino = tmp_ino;</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_and_init_usnjrnl - load and setup the transaction log if present</div><div class='del'>- * @vol:	ntfs super block describing device whose usnjrnl file to load</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- *</div><div class='del'>- * If $UsnJrnl is not present or in the process of being disabled, we set</div><div class='del'>- * NVolUsnJrnlStamped() and return success.</div><div class='del'>- *</div><div class='del'>- * If the $UsnJrnl $DATA/$J attribute has a size equal to the lowest valid usn,</div><div class='del'>- * i.e. transaction logging has only just been enabled or the journal has been</div><div class='del'>- * stamped and nothing has been logged since, we also set NVolUsnJrnlStamped()</div><div class='del'>- * and return success.</div><div class='del'>- */</div><div class='del'>-static bool load_and_init_usnjrnl(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	MFT_REF mref;</div><div class='del'>-	struct inode *tmp_ino;</div><div class='del'>-	ntfs_inode *tmp_ni;</div><div class='del'>-	struct page *page;</div><div class='del'>-	ntfs_name *name = NULL;</div><div class='del'>-	USN_HEADER *uh;</div><div class='del'>-	static const ntfschar UsnJrnl[9] = { cpu_to_le16('$'),</div><div class='del'>-			cpu_to_le16('U'), cpu_to_le16('s'),</div><div class='del'>-			cpu_to_le16('n'), cpu_to_le16('J'),</div><div class='del'>-			cpu_to_le16('r'), cpu_to_le16('n'),</div><div class='del'>-			cpu_to_le16('l'), 0 };</div><div class='del'>-	static ntfschar Max[5] = { cpu_to_le16('$'),</div><div class='del'>-			cpu_to_le16('M'), cpu_to_le16('a'),</div><div class='del'>-			cpu_to_le16('x'), 0 };</div><div class='del'>-	static ntfschar J[3] = { cpu_to_le16('$'),</div><div class='del'>-			cpu_to_le16('J'), 0 };</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/*</div><div class='del'>-	 * Find the inode number for the transaction log file by looking up the</div><div class='del'>-	 * filename $UsnJrnl in the extended system files directory $Extend.</div><div class='del'>-	 */</div><div class='del'>-	inode_lock(vol-&gt;extend_ino);</div><div class='del'>-	mref = ntfs_lookup_inode_by_name(NTFS_I(vol-&gt;extend_ino), UsnJrnl, 8,</div><div class='del'>-			&amp;name);</div><div class='del'>-	inode_unlock(vol-&gt;extend_ino);</div><div class='del'>-	if (IS_ERR_MREF(mref)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the file does not exist, transaction logging is disabled,</div><div class='del'>-		 * just return success.</div><div class='del'>-		 */</div><div class='del'>-		if (MREF_ERR(mref) == -ENOENT) {</div><div class='del'>-			ntfs_debug("$UsnJrnl not present.  Volume does not "</div><div class='del'>-					"have transaction logging enabled.");</div><div class='del'>-not_enabled:</div><div class='del'>-			/*</div><div class='del'>-			 * No need to try to stamp the transaction log if</div><div class='del'>-			 * transaction logging is not enabled.</div><div class='del'>-			 */</div><div class='del'>-			NVolSetUsnJrnlStamped(vol);</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-		/* A real error occurred. */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to find inode number for "</div><div class='del'>-				"$UsnJrnl.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* We do not care for the type of match that was found. */</div><div class='del'>-	kfree(name);</div><div class='del'>-	/* Get the inode. */</div><div class='del'>-	tmp_ino = ntfs_iget(vol-&gt;sb, MREF(mref));</div><div class='del'>-	if (IS_ERR(tmp_ino) || unlikely(is_bad_inode(tmp_ino))) {</div><div class='del'>-		if (!IS_ERR(tmp_ino))</div><div class='del'>-			iput(tmp_ino);</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to load $UsnJrnl.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;usnjrnl_ino = tmp_ino;</div><div class='del'>-	/*</div><div class='del'>-	 * If the transaction log is in the process of being deleted, we can</div><div class='del'>-	 * ignore it.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(vol-&gt;vol_flags &amp; VOLUME_DELETE_USN_UNDERWAY)) {</div><div class='del'>-		ntfs_debug("$UsnJrnl in the process of being disabled.  "</div><div class='del'>-				"Volume does not have transaction logging "</div><div class='del'>-				"enabled.");</div><div class='del'>-		goto not_enabled;</div><div class='del'>-	}</div><div class='del'>-	/* Get the $DATA/$Max attribute. */</div><div class='del'>-	tmp_ino = ntfs_attr_iget(vol-&gt;usnjrnl_ino, AT_DATA, Max, 4);</div><div class='del'>-	if (IS_ERR(tmp_ino)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to load $UsnJrnl/$DATA/$Max "</div><div class='del'>-				"attribute.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;usnjrnl_max_ino = tmp_ino;</div><div class='del'>-	if (unlikely(i_size_read(tmp_ino) &lt; sizeof(USN_HEADER))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Found corrupt $UsnJrnl/$DATA/$Max "</div><div class='del'>-				"attribute (size is 0x%llx but should be at "</div><div class='del'>-				"least 0x%zx bytes).", i_size_read(tmp_ino),</div><div class='del'>-				sizeof(USN_HEADER));</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* Get the $DATA/$J attribute. */</div><div class='del'>-	tmp_ino = ntfs_attr_iget(vol-&gt;usnjrnl_ino, AT_DATA, J, 2);</div><div class='del'>-	if (IS_ERR(tmp_ino)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to load $UsnJrnl/$DATA/$J "</div><div class='del'>-				"attribute.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;usnjrnl_j_ino = tmp_ino;</div><div class='del'>-	/* Verify $J is non-resident and sparse. */</div><div class='del'>-	tmp_ni = NTFS_I(vol-&gt;usnjrnl_j_ino);</div><div class='del'>-	if (unlikely(!NInoNonResident(tmp_ni) || !NInoSparse(tmp_ni))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "$UsnJrnl/$DATA/$J attribute is resident "</div><div class='del'>-				"and/or not sparse.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/* Read the USN_HEADER from $DATA/$Max. */</div><div class='del'>-	page = ntfs_map_page(vol-&gt;usnjrnl_max_ino-&gt;i_mapping, 0);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to read from $UsnJrnl/$DATA/$Max "</div><div class='del'>-				"attribute.");</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	uh = (USN_HEADER*)page_address(page);</div><div class='del'>-	/* Sanity check the $Max. */</div><div class='del'>-	if (unlikely(sle64_to_cpu(uh-&gt;allocation_delta) &gt;</div><div class='del'>-			sle64_to_cpu(uh-&gt;maximum_size))) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Allocation delta (0x%llx) exceeds "</div><div class='del'>-				"maximum size (0x%llx).  $UsnJrnl is corrupt.",</div><div class='del'>-				(long long)sle64_to_cpu(uh-&gt;allocation_delta),</div><div class='del'>-				(long long)sle64_to_cpu(uh-&gt;maximum_size));</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the transaction log has been stamped and nothing has been written</div><div class='del'>-	 * to it since, we do not need to stamp it.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(sle64_to_cpu(uh-&gt;lowest_valid_usn) &gt;=</div><div class='del'>-			i_size_read(vol-&gt;usnjrnl_j_ino))) {</div><div class='del'>-		if (likely(sle64_to_cpu(uh-&gt;lowest_valid_usn) ==</div><div class='del'>-				i_size_read(vol-&gt;usnjrnl_j_ino))) {</div><div class='del'>-			ntfs_unmap_page(page);</div><div class='del'>-			ntfs_debug("$UsnJrnl is enabled but nothing has been "</div><div class='del'>-					"logged since it was last stamped.  "</div><div class='del'>-					"Treating this as if the volume does "</div><div class='del'>-					"not have transaction logging "</div><div class='del'>-					"enabled.");</div><div class='del'>-			goto not_enabled;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(vol-&gt;sb, "$UsnJrnl has lowest valid usn (0x%llx) "</div><div class='del'>-				"which is out of bounds (0x%llx).  $UsnJrnl "</div><div class='del'>-				"is corrupt.",</div><div class='del'>-				(long long)sle64_to_cpu(uh-&gt;lowest_valid_usn),</div><div class='del'>-				i_size_read(vol-&gt;usnjrnl_j_ino));</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	ntfs_unmap_page(page);</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_and_init_attrdef - load the attribute definitions table for a volume</div><div class='del'>- * @vol:	ntfs super block describing device whose attrdef to load</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- */</div><div class='del'>-static bool load_and_init_attrdef(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	struct inode *ino;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index, max_index;</div><div class='del'>-	unsigned int size;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Read attrdef table and setup vol-&gt;attrdef and vol-&gt;attrdef_size. */</div><div class='del'>-	ino = ntfs_iget(sb, FILE_AttrDef);</div><div class='del'>-	if (IS_ERR(ino) || is_bad_inode(ino)) {</div><div class='del'>-		if (!IS_ERR(ino))</div><div class='del'>-			iput(ino);</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-	NInoSetSparseDisabled(NTFS_I(ino));</div><div class='del'>-	/* The size of FILE_AttrDef must be above 0 and fit inside 31 bits. */</div><div class='del'>-	i_size = i_size_read(ino);</div><div class='del'>-	if (i_size &lt;= 0 || i_size &gt; 0x7fffffff)</div><div class='del'>-		goto iput_failed;</div><div class='del'>-	vol-&gt;attrdef = (ATTR_DEF*)ntfs_malloc_nofs(i_size);</div><div class='del'>-	if (!vol-&gt;attrdef)</div><div class='del'>-		goto iput_failed;</div><div class='del'>-	index = 0;</div><div class='del'>-	max_index = i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	size = PAGE_SIZE;</div><div class='del'>-	while (index &lt; max_index) {</div><div class='del'>-		/* Read the attrdef table and copy it into the linear buffer. */</div><div class='del'>-read_partial_attrdef_page:</div><div class='del'>-		page = ntfs_map_page(ino-&gt;i_mapping, index);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			goto free_iput_failed;</div><div class='del'>-		memcpy((u8*)vol-&gt;attrdef + (index++ &lt;&lt; PAGE_SHIFT),</div><div class='del'>-				page_address(page), size);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-	}</div><div class='del'>-	if (size == PAGE_SIZE) {</div><div class='del'>-		size = i_size &amp; ~PAGE_MASK;</div><div class='del'>-		if (size)</div><div class='del'>-			goto read_partial_attrdef_page;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;attrdef_size = i_size;</div><div class='del'>-	ntfs_debug("Read %llu bytes from $AttrDef.", i_size);</div><div class='del'>-	iput(ino);</div><div class='del'>-	return true;</div><div class='del'>-free_iput_failed:</div><div class='del'>-	ntfs_free(vol-&gt;attrdef);</div><div class='del'>-	vol-&gt;attrdef = NULL;</div><div class='del'>-iput_failed:</div><div class='del'>-	iput(ino);</div><div class='del'>-failed:</div><div class='del'>-	ntfs_error(sb, "Failed to initialize attribute definition table.");</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_and_init_upcase - load the upcase table for an ntfs volume</div><div class='del'>- * @vol:	ntfs super block describing device whose upcase to load</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- */</div><div class='del'>-static bool load_and_init_upcase(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	loff_t i_size;</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	struct inode *ino;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index, max_index;</div><div class='del'>-	unsigned int size;</div><div class='del'>-	int i, max;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Read upcase table and setup vol-&gt;upcase and vol-&gt;upcase_len. */</div><div class='del'>-	ino = ntfs_iget(sb, FILE_UpCase);</div><div class='del'>-	if (IS_ERR(ino) || is_bad_inode(ino)) {</div><div class='del'>-		if (!IS_ERR(ino))</div><div class='del'>-			iput(ino);</div><div class='del'>-		goto upcase_failed;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * The upcase size must not be above 64k Unicode characters, must not</div><div class='del'>-	 * be zero and must be a multiple of sizeof(ntfschar).</div><div class='del'>-	 */</div><div class='del'>-	i_size = i_size_read(ino);</div><div class='del'>-	if (!i_size || i_size &amp; (sizeof(ntfschar) - 1) ||</div><div class='del'>-			i_size &gt; 64ULL * 1024 * sizeof(ntfschar))</div><div class='del'>-		goto iput_upcase_failed;</div><div class='del'>-	vol-&gt;upcase = (ntfschar*)ntfs_malloc_nofs(i_size);</div><div class='del'>-	if (!vol-&gt;upcase)</div><div class='del'>-		goto iput_upcase_failed;</div><div class='del'>-	index = 0;</div><div class='del'>-	max_index = i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	size = PAGE_SIZE;</div><div class='del'>-	while (index &lt; max_index) {</div><div class='del'>-		/* Read the upcase table and copy it into the linear buffer. */</div><div class='del'>-read_partial_upcase_page:</div><div class='del'>-		page = ntfs_map_page(ino-&gt;i_mapping, index);</div><div class='del'>-		if (IS_ERR(page))</div><div class='del'>-			goto iput_upcase_failed;</div><div class='del'>-		memcpy((char*)vol-&gt;upcase + (index++ &lt;&lt; PAGE_SHIFT),</div><div class='del'>-				page_address(page), size);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-	}</div><div class='del'>-	if (size == PAGE_SIZE) {</div><div class='del'>-		size = i_size &amp; ~PAGE_MASK;</div><div class='del'>-		if (size)</div><div class='del'>-			goto read_partial_upcase_page;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;upcase_len = i_size &gt;&gt; UCHAR_T_SIZE_BITS;</div><div class='del'>-	ntfs_debug("Read %llu bytes from $UpCase (expected %zu bytes).",</div><div class='del'>-			i_size, 64 * 1024 * sizeof(ntfschar));</div><div class='del'>-	iput(ino);</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	if (!default_upcase) {</div><div class='del'>-		ntfs_debug("Using volume specified $UpCase since default is "</div><div class='del'>-				"not present.");</div><div class='del'>-		mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	max = default_upcase_len;</div><div class='del'>-	if (max &gt; vol-&gt;upcase_len)</div><div class='del'>-		max = vol-&gt;upcase_len;</div><div class='del'>-	for (i = 0; i &lt; max; i++)</div><div class='del'>-		if (vol-&gt;upcase[i] != default_upcase[i])</div><div class='del'>-			break;</div><div class='del'>-	if (i == max) {</div><div class='del'>-		ntfs_free(vol-&gt;upcase);</div><div class='del'>-		vol-&gt;upcase = default_upcase;</div><div class='del'>-		vol-&gt;upcase_len = max;</div><div class='del'>-		ntfs_nr_upcase_users++;</div><div class='del'>-		mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-		ntfs_debug("Volume specified $UpCase matches default. Using "</div><div class='del'>-				"default.");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-	ntfs_debug("Using volume specified $UpCase since it does not match "</div><div class='del'>-			"the default.");</div><div class='del'>-	return true;</div><div class='del'>-iput_upcase_failed:</div><div class='del'>-	iput(ino);</div><div class='del'>-	ntfs_free(vol-&gt;upcase);</div><div class='del'>-	vol-&gt;upcase = NULL;</div><div class='del'>-upcase_failed:</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	if (default_upcase) {</div><div class='del'>-		vol-&gt;upcase = default_upcase;</div><div class='del'>-		vol-&gt;upcase_len = default_upcase_len;</div><div class='del'>-		ntfs_nr_upcase_users++;</div><div class='del'>-		mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-		ntfs_error(sb, "Failed to load $UpCase from the volume. Using "</div><div class='del'>-				"default.");</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-	ntfs_error(sb, "Failed to initialize upcase table.");</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The lcn and mft bitmap inodes are NTFS-internal inodes with</div><div class='del'>- * their own special locking rules:</div><div class='del'>- */</div><div class='del'>-static struct lock_class_key</div><div class='del'>-	lcnbmp_runlist_lock_key, lcnbmp_mrec_lock_key,</div><div class='del'>-	mftbmp_runlist_lock_key, mftbmp_mrec_lock_key;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * load_system_files - open the system files using normal functions</div><div class='del'>- * @vol:	ntfs super block describing device whose system files to load</div><div class='del'>- *</div><div class='del'>- * Open the system files with normal access functions and complete setting up</div><div class='del'>- * the ntfs super block @vol.</div><div class='del'>- *</div><div class='del'>- * Return 'true' on success or 'false' on error.</div><div class='del'>- */</div><div class='del'>-static bool load_system_files(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = vol-&gt;sb;</div><div class='del'>-	MFT_RECORD *m;</div><div class='del'>-	VOLUME_INFORMATION *vi;</div><div class='del'>-	ntfs_attr_search_ctx *ctx;</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	RESTART_PAGE_HEADER *rp;</div><div class='del'>-	int err;</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/* Get mft mirror inode compare the contents of $MFT and $MFTMirr. */</div><div class='del'>-	if (!load_and_init_mft_mirror(vol) || !check_mft_mirror(vol)) {</div><div class='del'>-		static const char *es1 = "Failed to load $MFTMirr";</div><div class='del'>-		static const char *es2 = "$MFTMirr does not match $MFT";</div><div class='del'>-		static const char *es3 = ".  Run ntfsfix and/or chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* If a read-write mount, convert it to a read-only mount. */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-					ON_ERRORS_CONTINUE))) {</div><div class='del'>-				ntfs_error(sb, "%s and neither on_errors="</div><div class='del'>-						"continue nor on_errors="</div><div class='del'>-						"remount-ro was specified%s",</div><div class='del'>-						!vol-&gt;mftmirr_ino ? es1 : es2,</div><div class='del'>-						es3);</div><div class='del'>-				goto iput_mirr_err_out;</div><div class='del'>-			}</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			ntfs_error(sb, "%s.  Mounting read-only%s",</div><div class='del'>-					!vol-&gt;mftmirr_ino ? es1 : es2, es3);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_warning(sb, "%s.  Will not be able to remount "</div><div class='del'>-					"read-write%s",</div><div class='del'>-					!vol-&gt;mftmirr_ino ? es1 : es2, es3);</div><div class='del'>-		/* This will prevent a read-write remount. */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	/* Get mft bitmap attribute inode. */</div><div class='del'>-	vol-&gt;mftbmp_ino = ntfs_attr_iget(vol-&gt;mft_ino, AT_BITMAP, NULL, 0);</div><div class='del'>-	if (IS_ERR(vol-&gt;mftbmp_ino)) {</div><div class='del'>-		ntfs_error(sb, "Failed to load $MFT/$BITMAP attribute.");</div><div class='del'>-		goto iput_mirr_err_out;</div><div class='del'>-	}</div><div class='del'>-	lockdep_set_class(&amp;NTFS_I(vol-&gt;mftbmp_ino)-&gt;runlist.lock,</div><div class='del'>-			   &amp;mftbmp_runlist_lock_key);</div><div class='del'>-	lockdep_set_class(&amp;NTFS_I(vol-&gt;mftbmp_ino)-&gt;mrec_lock,</div><div class='del'>-			   &amp;mftbmp_mrec_lock_key);</div><div class='del'>-	/* Read upcase table and setup @vol-&gt;upcase and @vol-&gt;upcase_len. */</div><div class='del'>-	if (!load_and_init_upcase(vol))</div><div class='del'>-		goto iput_mftbmp_err_out;</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/*</div><div class='del'>-	 * Read attribute definitions table and setup @vol-&gt;attrdef and</div><div class='del'>-	 * @vol-&gt;attrdef_size.</div><div class='del'>-	 */</div><div class='del'>-	if (!load_and_init_attrdef(vol))</div><div class='del'>-		goto iput_upcase_err_out;</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	/*</div><div class='del'>-	 * Get the cluster allocation bitmap inode and verify the size, no</div><div class='del'>-	 * need for any locking at this stage as we are already running</div><div class='del'>-	 * exclusively as we are mount in progress task.</div><div class='del'>-	 */</div><div class='del'>-	vol-&gt;lcnbmp_ino = ntfs_iget(sb, FILE_Bitmap);</div><div class='del'>-	if (IS_ERR(vol-&gt;lcnbmp_ino) || is_bad_inode(vol-&gt;lcnbmp_ino)) {</div><div class='del'>-		if (!IS_ERR(vol-&gt;lcnbmp_ino))</div><div class='del'>-			iput(vol-&gt;lcnbmp_ino);</div><div class='del'>-		goto bitmap_failed;</div><div class='del'>-	}</div><div class='del'>-	lockdep_set_class(&amp;NTFS_I(vol-&gt;lcnbmp_ino)-&gt;runlist.lock,</div><div class='del'>-			   &amp;lcnbmp_runlist_lock_key);</div><div class='del'>-	lockdep_set_class(&amp;NTFS_I(vol-&gt;lcnbmp_ino)-&gt;mrec_lock,</div><div class='del'>-			   &amp;lcnbmp_mrec_lock_key);</div><div class='del'>-</div><div class='del'>-	NInoSetSparseDisabled(NTFS_I(vol-&gt;lcnbmp_ino));</div><div class='del'>-	if ((vol-&gt;nr_clusters + 7) &gt;&gt; 3 &gt; i_size_read(vol-&gt;lcnbmp_ino)) {</div><div class='del'>-		iput(vol-&gt;lcnbmp_ino);</div><div class='del'>-bitmap_failed:</div><div class='del'>-		ntfs_error(sb, "Failed to load $Bitmap.");</div><div class='del'>-		goto iput_attrdef_err_out;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Get the volume inode and setup our cache of the volume flags and</div><div class='del'>-	 * version.</div><div class='del'>-	 */</div><div class='del'>-	vol-&gt;vol_ino = ntfs_iget(sb, FILE_Volume);</div><div class='del'>-	if (IS_ERR(vol-&gt;vol_ino) || is_bad_inode(vol-&gt;vol_ino)) {</div><div class='del'>-		if (!IS_ERR(vol-&gt;vol_ino))</div><div class='del'>-			iput(vol-&gt;vol_ino);</div><div class='del'>-volume_failed:</div><div class='del'>-		ntfs_error(sb, "Failed to load $Volume.");</div><div class='del'>-		goto iput_lcnbmp_err_out;</div><div class='del'>-	}</div><div class='del'>-	m = map_mft_record(NTFS_I(vol-&gt;vol_ino));</div><div class='del'>-	if (IS_ERR(m)) {</div><div class='del'>-iput_volume_failed:</div><div class='del'>-		iput(vol-&gt;vol_ino);</div><div class='del'>-		goto volume_failed;</div><div class='del'>-	}</div><div class='del'>-	if (!(ctx = ntfs_attr_get_search_ctx(NTFS_I(vol-&gt;vol_ino), m))) {</div><div class='del'>-		ntfs_error(sb, "Failed to get attribute search context.");</div><div class='del'>-		goto get_ctx_vol_failed;</div><div class='del'>-	}</div><div class='del'>-	if (ntfs_attr_lookup(AT_VOLUME_INFORMATION, NULL, 0, 0, 0, NULL, 0,</div><div class='del'>-			ctx) || ctx-&gt;attr-&gt;non_resident || ctx-&gt;attr-&gt;flags) {</div><div class='del'>-err_put_vol:</div><div class='del'>-		ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-get_ctx_vol_failed:</div><div class='del'>-		unmap_mft_record(NTFS_I(vol-&gt;vol_ino));</div><div class='del'>-		goto iput_volume_failed;</div><div class='del'>-	}</div><div class='del'>-	vi = (VOLUME_INFORMATION*)((char*)ctx-&gt;attr +</div><div class='del'>-			le16_to_cpu(ctx-&gt;attr-&gt;data.resident.value_offset));</div><div class='del'>-	/* Some bounds checks. */</div><div class='del'>-	if ((u8*)vi &lt; (u8*)ctx-&gt;attr || (u8*)vi +</div><div class='del'>-			le32_to_cpu(ctx-&gt;attr-&gt;data.resident.value_length) &gt;</div><div class='del'>-			(u8*)ctx-&gt;attr + le32_to_cpu(ctx-&gt;attr-&gt;length))</div><div class='del'>-		goto err_put_vol;</div><div class='del'>-	/* Copy the volume flags and version to the ntfs_volume structure. */</div><div class='del'>-	vol-&gt;vol_flags = vi-&gt;flags;</div><div class='del'>-	vol-&gt;major_ver = vi-&gt;major_ver;</div><div class='del'>-	vol-&gt;minor_ver = vi-&gt;minor_ver;</div><div class='del'>-	ntfs_attr_put_search_ctx(ctx);</div><div class='del'>-	unmap_mft_record(NTFS_I(vol-&gt;vol_ino));</div><div class='del'>-	pr_info("volume version %i.%i.\n", vol-&gt;major_ver,</div><div class='del'>-			vol-&gt;minor_ver);</div><div class='del'>-	if (vol-&gt;major_ver &lt; 3 &amp;&amp; NVolSparseEnabled(vol)) {</div><div class='del'>-		ntfs_warning(vol-&gt;sb, "Disabling sparse support due to NTFS "</div><div class='del'>-				"volume version %i.%i (need at least version "</div><div class='del'>-				"3.0).", vol-&gt;major_ver, vol-&gt;minor_ver);</div><div class='del'>-		NVolClearSparseEnabled(vol);</div><div class='del'>-	}</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/* Make sure that no unsupported volume flags are set. */</div><div class='del'>-	if (vol-&gt;vol_flags &amp; VOLUME_MUST_MOUNT_RO_MASK) {</div><div class='del'>-		static const char *es1a = "Volume is dirty";</div><div class='del'>-		static const char *es1b = "Volume has been modified by chkdsk";</div><div class='del'>-		static const char *es1c = "Volume has unsupported flags set";</div><div class='del'>-		static const char *es2a = ".  Run chkdsk and mount in Windows.";</div><div class='del'>-		static const char *es2b = ".  Mount in Windows.";</div><div class='del'>-		const char *es1, *es2;</div><div class='del'>-</div><div class='del'>-		es2 = es2a;</div><div class='del'>-		if (vol-&gt;vol_flags &amp; VOLUME_IS_DIRTY)</div><div class='del'>-			es1 = es1a;</div><div class='del'>-		else if (vol-&gt;vol_flags &amp; VOLUME_MODIFIED_BY_CHKDSK) {</div><div class='del'>-			es1 = es1b;</div><div class='del'>-			es2 = es2b;</div><div class='del'>-		} else {</div><div class='del'>-			es1 = es1c;</div><div class='del'>-			ntfs_warning(sb, "Unsupported volume flags 0x%x "</div><div class='del'>-					"encountered.",</div><div class='del'>-					(unsigned)le16_to_cpu(vol-&gt;vol_flags));</div><div class='del'>-		}</div><div class='del'>-		/* If a read-write mount, convert it to a read-only mount. */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-					ON_ERRORS_CONTINUE))) {</div><div class='del'>-				ntfs_error(sb, "%s and neither on_errors="</div><div class='del'>-						"continue nor on_errors="</div><div class='del'>-						"remount-ro was specified%s",</div><div class='del'>-						es1, es2);</div><div class='del'>-				goto iput_vol_err_out;</div><div class='del'>-			}</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_warning(sb, "%s.  Will not be able to remount "</div><div class='del'>-					"read-write%s", es1, es2);</div><div class='del'>-		/*</div><div class='del'>-		 * Do not set NVolErrors() because ntfs_remount() re-checks the</div><div class='del'>-		 * flags which we need to do in case any flags have changed.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Get the inode for the logfile, check it and determine if the volume</div><div class='del'>-	 * was shutdown cleanly.</div><div class='del'>-	 */</div><div class='del'>-	rp = NULL;</div><div class='del'>-	if (!load_and_check_logfile(vol, &amp;rp) ||</div><div class='del'>-			!ntfs_is_logfile_clean(vol-&gt;logfile_ino, rp)) {</div><div class='del'>-		static const char *es1a = "Failed to load $LogFile";</div><div class='del'>-		static const char *es1b = "$LogFile is not clean";</div><div class='del'>-		static const char *es2 = ".  Mount in Windows.";</div><div class='del'>-		const char *es1;</div><div class='del'>-</div><div class='del'>-		es1 = !vol-&gt;logfile_ino ? es1a : es1b;</div><div class='del'>-		/* If a read-write mount, convert it to a read-only mount. */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-					ON_ERRORS_CONTINUE))) {</div><div class='del'>-				ntfs_error(sb, "%s and neither on_errors="</div><div class='del'>-						"continue nor on_errors="</div><div class='del'>-						"remount-ro was specified%s",</div><div class='del'>-						es1, es2);</div><div class='del'>-				if (vol-&gt;logfile_ino) {</div><div class='del'>-					BUG_ON(!rp);</div><div class='del'>-					ntfs_free(rp);</div><div class='del'>-				}</div><div class='del'>-				goto iput_logfile_err_out;</div><div class='del'>-			}</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_warning(sb, "%s.  Will not be able to remount "</div><div class='del'>-					"read-write%s", es1, es2);</div><div class='del'>-		/* This will prevent a read-write remount. */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	ntfs_free(rp);</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	/* Get the root directory inode so we can do path lookups. */</div><div class='del'>-	vol-&gt;root_ino = ntfs_iget(sb, FILE_root);</div><div class='del'>-	if (IS_ERR(vol-&gt;root_ino) || is_bad_inode(vol-&gt;root_ino)) {</div><div class='del'>-		if (!IS_ERR(vol-&gt;root_ino))</div><div class='del'>-			iput(vol-&gt;root_ino);</div><div class='del'>-		ntfs_error(sb, "Failed to load root directory.");</div><div class='del'>-		goto iput_logfile_err_out;</div><div class='del'>-	}</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/*</div><div class='del'>-	 * Check if Windows is suspended to disk on the target volume.  If it</div><div class='del'>-	 * is hibernated, we must not write *anything* to the disk so set</div><div class='del'>-	 * NVolErrors() without setting the dirty volume flag and mount</div><div class='del'>-	 * read-only.  This will prevent read-write remounting and it will also</div><div class='del'>-	 * prevent all writes.</div><div class='del'>-	 */</div><div class='del'>-	err = check_windows_hibernation_status(vol);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		static const char *es1a = "Failed to determine if Windows is "</div><div class='del'>-				"hibernated";</div><div class='del'>-		static const char *es1b = "Windows is hibernated";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-		const char *es1;</div><div class='del'>-</div><div class='del'>-		es1 = err &lt; 0 ? es1a : es1b;</div><div class='del'>-		/* If a read-write mount, convert it to a read-only mount. */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-					ON_ERRORS_CONTINUE))) {</div><div class='del'>-				ntfs_error(sb, "%s and neither on_errors="</div><div class='del'>-						"continue nor on_errors="</div><div class='del'>-						"remount-ro was specified%s",</div><div class='del'>-						es1, es2);</div><div class='del'>-				goto iput_root_err_out;</div><div class='del'>-			}</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_warning(sb, "%s.  Will not be able to remount "</div><div class='del'>-					"read-write%s", es1, es2);</div><div class='del'>-		/* This will prevent a read-write remount. */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	/* If (still) a read-write mount, mark the volume dirty. */</div><div class='del'>-	if (!sb_rdonly(sb) &amp;&amp; ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY)) {</div><div class='del'>-		static const char *es1 = "Failed to set dirty bit in volume "</div><div class='del'>-				"information flags";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* Convert to a read-only mount. */</div><div class='del'>-		if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-				ON_ERRORS_CONTINUE))) {</div><div class='del'>-			ntfs_error(sb, "%s and neither on_errors=continue nor "</div><div class='del'>-					"on_errors=remount-ro was specified%s",</div><div class='del'>-					es1, es2);</div><div class='del'>-			goto iput_root_err_out;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		/*</div><div class='del'>-		 * Do not set NVolErrors() because ntfs_remount() might manage</div><div class='del'>-		 * to set the dirty flag in which case all would be well.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	// TODO: Enable this code once we start modifying anything that is</div><div class='del'>-	//	 different between NTFS 1.2 and 3.x...</div><div class='del'>-	/*</div><div class='del'>-	 * If (still) a read-write mount, set the NT4 compatibility flag on</div><div class='del'>-	 * newer NTFS version volumes.</div><div class='del'>-	 */</div><div class='del'>-	if (!(sb-&gt;s_flags &amp; SB_RDONLY) &amp;&amp; (vol-&gt;major_ver &gt; 1) &amp;&amp;</div><div class='del'>-			ntfs_set_volume_flags(vol, VOLUME_MOUNTED_ON_NT4)) {</div><div class='del'>-		static const char *es1 = "Failed to set NT4 compatibility flag";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* Convert to a read-only mount. */</div><div class='del'>-		if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-				ON_ERRORS_CONTINUE))) {</div><div class='del'>-			ntfs_error(sb, "%s and neither on_errors=continue nor "</div><div class='del'>-					"on_errors=remount-ro was specified%s",</div><div class='del'>-					es1, es2);</div><div class='del'>-			goto iput_root_err_out;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	/* If (still) a read-write mount, empty the logfile. */</div><div class='del'>-	if (!sb_rdonly(sb) &amp;&amp; !ntfs_empty_logfile(vol-&gt;logfile_ino)) {</div><div class='del'>-		static const char *es1 = "Failed to empty $LogFile";</div><div class='del'>-		static const char *es2 = ".  Mount in Windows.";</div><div class='del'>-</div><div class='del'>-		/* Convert to a read-only mount. */</div><div class='del'>-		if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-				ON_ERRORS_CONTINUE))) {</div><div class='del'>-			ntfs_error(sb, "%s and neither on_errors=continue nor "</div><div class='del'>-					"on_errors=remount-ro was specified%s",</div><div class='del'>-					es1, es2);</div><div class='del'>-			goto iput_root_err_out;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	/* If on NTFS versions before 3.0, we are done. */</div><div class='del'>-	if (unlikely(vol-&gt;major_ver &lt; 3))</div><div class='del'>-		return true;</div><div class='del'>-	/* NTFS 3.0+ specific initialization. */</div><div class='del'>-	/* Get the security descriptors inode. */</div><div class='del'>-	vol-&gt;secure_ino = ntfs_iget(sb, FILE_Secure);</div><div class='del'>-	if (IS_ERR(vol-&gt;secure_ino) || is_bad_inode(vol-&gt;secure_ino)) {</div><div class='del'>-		if (!IS_ERR(vol-&gt;secure_ino))</div><div class='del'>-			iput(vol-&gt;secure_ino);</div><div class='del'>-		ntfs_error(sb, "Failed to load $Secure.");</div><div class='del'>-		goto iput_root_err_out;</div><div class='del'>-	}</div><div class='del'>-	// TODO: Initialize security.</div><div class='del'>-	/* Get the extended system files' directory inode. */</div><div class='del'>-	vol-&gt;extend_ino = ntfs_iget(sb, FILE_Extend);</div><div class='del'>-	if (IS_ERR(vol-&gt;extend_ino) || is_bad_inode(vol-&gt;extend_ino) ||</div><div class='del'>-	    !S_ISDIR(vol-&gt;extend_ino-&gt;i_mode)) {</div><div class='del'>-		if (!IS_ERR(vol-&gt;extend_ino))</div><div class='del'>-			iput(vol-&gt;extend_ino);</div><div class='del'>-		ntfs_error(sb, "Failed to load $Extend.");</div><div class='del'>-		goto iput_sec_err_out;</div><div class='del'>-	}</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/* Find the quota file, load it if present, and set it up. */</div><div class='del'>-	if (!load_and_init_quota(vol)) {</div><div class='del'>-		static const char *es1 = "Failed to load $Quota";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* If a read-write mount, convert it to a read-only mount. */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-					ON_ERRORS_CONTINUE))) {</div><div class='del'>-				ntfs_error(sb, "%s and neither on_errors="</div><div class='del'>-						"continue nor on_errors="</div><div class='del'>-						"remount-ro was specified%s",</div><div class='del'>-						es1, es2);</div><div class='del'>-				goto iput_quota_err_out;</div><div class='del'>-			}</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_warning(sb, "%s.  Will not be able to remount "</div><div class='del'>-					"read-write%s", es1, es2);</div><div class='del'>-		/* This will prevent a read-write remount. */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	/* If (still) a read-write mount, mark the quotas out of date. */</div><div class='del'>-	if (!sb_rdonly(sb) &amp;&amp; !ntfs_mark_quotas_out_of_date(vol)) {</div><div class='del'>-		static const char *es1 = "Failed to mark quotas out of date";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* Convert to a read-only mount. */</div><div class='del'>-		if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-				ON_ERRORS_CONTINUE))) {</div><div class='del'>-			ntfs_error(sb, "%s and neither on_errors=continue nor "</div><div class='del'>-					"on_errors=remount-ro was specified%s",</div><div class='del'>-					es1, es2);</div><div class='del'>-			goto iput_quota_err_out;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Find the transaction log file ($UsnJrnl), load it if present, check</div><div class='del'>-	 * it, and set it up.</div><div class='del'>-	 */</div><div class='del'>-	if (!load_and_init_usnjrnl(vol)) {</div><div class='del'>-		static const char *es1 = "Failed to load $UsnJrnl";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* If a read-write mount, convert it to a read-only mount. */</div><div class='del'>-		if (!sb_rdonly(sb)) {</div><div class='del'>-			if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-					ON_ERRORS_CONTINUE))) {</div><div class='del'>-				ntfs_error(sb, "%s and neither on_errors="</div><div class='del'>-						"continue nor on_errors="</div><div class='del'>-						"remount-ro was specified%s",</div><div class='del'>-						es1, es2);</div><div class='del'>-				goto iput_usnjrnl_err_out;</div><div class='del'>-			}</div><div class='del'>-			sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-			ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		} else</div><div class='del'>-			ntfs_warning(sb, "%s.  Will not be able to remount "</div><div class='del'>-					"read-write%s", es1, es2);</div><div class='del'>-		/* This will prevent a read-write remount. */</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-	/* If (still) a read-write mount, stamp the transaction log. */</div><div class='del'>-	if (!sb_rdonly(sb) &amp;&amp; !ntfs_stamp_usnjrnl(vol)) {</div><div class='del'>-		static const char *es1 = "Failed to stamp transaction log "</div><div class='del'>-				"($UsnJrnl)";</div><div class='del'>-		static const char *es2 = ".  Run chkdsk.";</div><div class='del'>-</div><div class='del'>-		/* Convert to a read-only mount. */</div><div class='del'>-		if (!(vol-&gt;on_errors &amp; (ON_ERRORS_REMOUNT_RO |</div><div class='del'>-				ON_ERRORS_CONTINUE))) {</div><div class='del'>-			ntfs_error(sb, "%s and neither on_errors=continue nor "</div><div class='del'>-					"on_errors=remount-ro was specified%s",</div><div class='del'>-					es1, es2);</div><div class='del'>-			goto iput_usnjrnl_err_out;</div><div class='del'>-		}</div><div class='del'>-		ntfs_error(sb, "%s.  Mounting read-only%s", es1, es2);</div><div class='del'>-		sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-		NVolSetErrors(vol);</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	return true;</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-iput_usnjrnl_err_out:</div><div class='del'>-	iput(vol-&gt;usnjrnl_j_ino);</div><div class='del'>-	iput(vol-&gt;usnjrnl_max_ino);</div><div class='del'>-	iput(vol-&gt;usnjrnl_ino);</div><div class='del'>-iput_quota_err_out:</div><div class='del'>-	iput(vol-&gt;quota_q_ino);</div><div class='del'>-	iput(vol-&gt;quota_ino);</div><div class='del'>-	iput(vol-&gt;extend_ino);</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-iput_sec_err_out:</div><div class='del'>-	iput(vol-&gt;secure_ino);</div><div class='del'>-iput_root_err_out:</div><div class='del'>-	iput(vol-&gt;root_ino);</div><div class='del'>-iput_logfile_err_out:</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	iput(vol-&gt;logfile_ino);</div><div class='del'>-iput_vol_err_out:</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	iput(vol-&gt;vol_ino);</div><div class='del'>-iput_lcnbmp_err_out:</div><div class='del'>-	iput(vol-&gt;lcnbmp_ino);</div><div class='del'>-iput_attrdef_err_out:</div><div class='del'>-	vol-&gt;attrdef_size = 0;</div><div class='del'>-	if (vol-&gt;attrdef) {</div><div class='del'>-		ntfs_free(vol-&gt;attrdef);</div><div class='del'>-		vol-&gt;attrdef = NULL;</div><div class='del'>-	}</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-iput_upcase_err_out:</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	vol-&gt;upcase_len = 0;</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	if (vol-&gt;upcase == default_upcase) {</div><div class='del'>-		ntfs_nr_upcase_users--;</div><div class='del'>-		vol-&gt;upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-	if (vol-&gt;upcase) {</div><div class='del'>-		ntfs_free(vol-&gt;upcase);</div><div class='del'>-		vol-&gt;upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-iput_mftbmp_err_out:</div><div class='del'>-	iput(vol-&gt;mftbmp_ino);</div><div class='del'>-iput_mirr_err_out:</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	iput(vol-&gt;mftmirr_ino);</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_put_super - called by the vfs to unmount a volume</div><div class='del'>- * @sb:		vfs superblock of volume to unmount</div><div class='del'>- *</div><div class='del'>- * ntfs_put_super() is called by the VFS (from fs/super.c::do_umount()) when</div><div class='del'>- * the volume is being unmounted (umount system call has been invoked) and it</div><div class='del'>- * releases all inodes and memory belonging to the NTFS specific part of the</div><div class='del'>- * super block.</div><div class='del'>- */</div><div class='del'>-static void ntfs_put_super(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/*</div><div class='del'>-	 * Commit all inodes while they are still open in case some of them</div><div class='del'>-	 * cause others to be dirtied.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_commit_inode(vol-&gt;vol_ino);</div><div class='del'>-</div><div class='del'>-	/* NTFS 3.0+ specific. */</div><div class='del'>-	if (vol-&gt;major_ver &gt;= 3) {</div><div class='del'>-		if (vol-&gt;usnjrnl_j_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;usnjrnl_j_ino);</div><div class='del'>-		if (vol-&gt;usnjrnl_max_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;usnjrnl_max_ino);</div><div class='del'>-		if (vol-&gt;usnjrnl_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;usnjrnl_ino);</div><div class='del'>-		if (vol-&gt;quota_q_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;quota_q_ino);</div><div class='del'>-		if (vol-&gt;quota_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;quota_ino);</div><div class='del'>-		if (vol-&gt;extend_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;extend_ino);</div><div class='del'>-		if (vol-&gt;secure_ino)</div><div class='del'>-			ntfs_commit_inode(vol-&gt;secure_ino);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ntfs_commit_inode(vol-&gt;root_ino);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	ntfs_commit_inode(vol-&gt;lcnbmp_ino);</div><div class='del'>-	up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	ntfs_commit_inode(vol-&gt;mftbmp_ino);</div><div class='del'>-	up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-</div><div class='del'>-	if (vol-&gt;logfile_ino)</div><div class='del'>-		ntfs_commit_inode(vol-&gt;logfile_ino);</div><div class='del'>-</div><div class='del'>-	if (vol-&gt;mftmirr_ino)</div><div class='del'>-		ntfs_commit_inode(vol-&gt;mftmirr_ino);</div><div class='del'>-	ntfs_commit_inode(vol-&gt;mft_ino);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If a read-write mount and no volume errors have occurred, mark the</div><div class='del'>-	 * volume clean.  Also, re-commit all affected inodes.</div><div class='del'>-	 */</div><div class='del'>-	if (!sb_rdonly(sb)) {</div><div class='del'>-		if (!NVolErrors(vol)) {</div><div class='del'>-			if (ntfs_clear_volume_flags(vol, VOLUME_IS_DIRTY))</div><div class='del'>-				ntfs_warning(sb, "Failed to clear dirty bit "</div><div class='del'>-						"in volume information "</div><div class='del'>-						"flags.  Run chkdsk.");</div><div class='del'>-			ntfs_commit_inode(vol-&gt;vol_ino);</div><div class='del'>-			ntfs_commit_inode(vol-&gt;root_ino);</div><div class='del'>-			if (vol-&gt;mftmirr_ino)</div><div class='del'>-				ntfs_commit_inode(vol-&gt;mftmirr_ino);</div><div class='del'>-			ntfs_commit_inode(vol-&gt;mft_ino);</div><div class='del'>-		} else {</div><div class='del'>-			ntfs_warning(sb, "Volume has errors.  Leaving volume "</div><div class='del'>-					"marked dirty.  Run chkdsk.");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	iput(vol-&gt;vol_ino);</div><div class='del'>-	vol-&gt;vol_ino = NULL;</div><div class='del'>-</div><div class='del'>-	/* NTFS 3.0+ specific clean up. */</div><div class='del'>-	if (vol-&gt;major_ver &gt;= 3) {</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-		if (vol-&gt;usnjrnl_j_ino) {</div><div class='del'>-			iput(vol-&gt;usnjrnl_j_ino);</div><div class='del'>-			vol-&gt;usnjrnl_j_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;usnjrnl_max_ino) {</div><div class='del'>-			iput(vol-&gt;usnjrnl_max_ino);</div><div class='del'>-			vol-&gt;usnjrnl_max_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;usnjrnl_ino) {</div><div class='del'>-			iput(vol-&gt;usnjrnl_ino);</div><div class='del'>-			vol-&gt;usnjrnl_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;quota_q_ino) {</div><div class='del'>-			iput(vol-&gt;quota_q_ino);</div><div class='del'>-			vol-&gt;quota_q_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;quota_ino) {</div><div class='del'>-			iput(vol-&gt;quota_ino);</div><div class='del'>-			vol-&gt;quota_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-		if (vol-&gt;extend_ino) {</div><div class='del'>-			iput(vol-&gt;extend_ino);</div><div class='del'>-			vol-&gt;extend_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;secure_ino) {</div><div class='del'>-			iput(vol-&gt;secure_ino);</div><div class='del'>-			vol-&gt;secure_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iput(vol-&gt;root_ino);</div><div class='del'>-	vol-&gt;root_ino = NULL;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	iput(vol-&gt;lcnbmp_ino);</div><div class='del'>-	vol-&gt;lcnbmp_ino = NULL;</div><div class='del'>-	up_write(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	iput(vol-&gt;mftbmp_ino);</div><div class='del'>-	vol-&gt;mftbmp_ino = NULL;</div><div class='del'>-	up_write(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	if (vol-&gt;logfile_ino) {</div><div class='del'>-		iput(vol-&gt;logfile_ino);</div><div class='del'>-		vol-&gt;logfile_ino = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (vol-&gt;mftmirr_ino) {</div><div class='del'>-		/* Re-commit the mft mirror and mft just in case. */</div><div class='del'>-		ntfs_commit_inode(vol-&gt;mftmirr_ino);</div><div class='del'>-		ntfs_commit_inode(vol-&gt;mft_ino);</div><div class='del'>-		iput(vol-&gt;mftmirr_ino);</div><div class='del'>-		vol-&gt;mftmirr_ino = NULL;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We should have no dirty inodes left, due to</div><div class='del'>-	 * mft.c::ntfs_mft_writepage() cleaning all the dirty pages as</div><div class='del'>-	 * the underlying mft records are written out and cleaned.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_commit_inode(vol-&gt;mft_ino);</div><div class='del'>-	write_inode_now(vol-&gt;mft_ino, 1);</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	iput(vol-&gt;mft_ino);</div><div class='del'>-	vol-&gt;mft_ino = NULL;</div><div class='del'>-</div><div class='del'>-	/* Throw away the table of attribute definitions. */</div><div class='del'>-	vol-&gt;attrdef_size = 0;</div><div class='del'>-	if (vol-&gt;attrdef) {</div><div class='del'>-		ntfs_free(vol-&gt;attrdef);</div><div class='del'>-		vol-&gt;attrdef = NULL;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;upcase_len = 0;</div><div class='del'>-	/*</div><div class='del'>-	 * Destroy the global default upcase table if necessary.  Also decrease</div><div class='del'>-	 * the number of upcase users if we are a user.</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	if (vol-&gt;upcase == default_upcase) {</div><div class='del'>-		ntfs_nr_upcase_users--;</div><div class='del'>-		vol-&gt;upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (!ntfs_nr_upcase_users &amp;&amp; default_upcase) {</div><div class='del'>-		ntfs_free(default_upcase);</div><div class='del'>-		default_upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (vol-&gt;cluster_size &lt;= 4096 &amp;&amp; !--ntfs_nr_compression_users)</div><div class='del'>-		free_compression_buffers();</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-	if (vol-&gt;upcase) {</div><div class='del'>-		ntfs_free(vol-&gt;upcase);</div><div class='del'>-		vol-&gt;upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unload_nls(vol-&gt;nls_map);</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='del'>-	kfree(vol);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * get_nr_free_clusters - return the number of free clusters on a volume</div><div class='del'>- * @vol:	ntfs volume for which to obtain free cluster count</div><div class='del'>- *</div><div class='del'>- * Calculate the number of free clusters on the mounted NTFS volume @vol. We</div><div class='del'>- * actually calculate the number of clusters in use instead because this</div><div class='del'>- * allows us to not care about partial pages as these will be just zero filled</div><div class='del'>- * and hence not be counted as allocated clusters.</div><div class='del'>- *</div><div class='del'>- * The only particularity is that clusters beyond the end of the logical ntfs</div><div class='del'>- * volume will be marked as allocated to prevent errors which means we have to</div><div class='del'>- * discount those at the end. This is important as the cluster bitmap always</div><div class='del'>- * has a size in multiples of 8 bytes, i.e. up to 63 clusters could be outside</div><div class='del'>- * the logical volume and marked in use when they are not as they do not exist.</div><div class='del'>- *</div><div class='del'>- * If any pages cannot be read we assume all clusters in the erroring pages are</div><div class='del'>- * in use. This means we return an underestimate on errors which is better than</div><div class='del'>- * an overestimate.</div><div class='del'>- */</div><div class='del'>-static s64 get_nr_free_clusters(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	s64 nr_free = vol-&gt;nr_clusters;</div><div class='del'>-	struct address_space *mapping = vol-&gt;lcnbmp_ino-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index, max_index;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Serialize accesses to the cluster bitmap. */</div><div class='del'>-	down_read(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Convert the number of bits into bytes rounded up, then convert into</div><div class='del'>-	 * multiples of PAGE_SIZE, rounding up so that if we have one</div><div class='del'>-	 * full and one partial page max_index = 2.</div><div class='del'>-	 */</div><div class='del'>-	max_index = (((vol-&gt;nr_clusters + 7) &gt;&gt; 3) + PAGE_SIZE - 1) &gt;&gt;</div><div class='del'>-			PAGE_SHIFT;</div><div class='del'>-	/* Use multiples of 4 bytes, thus max_size is PAGE_SIZE / 4. */</div><div class='del'>-	ntfs_debug("Reading $Bitmap, max_index = 0x%lx, max_size = 0x%lx.",</div><div class='del'>-			max_index, PAGE_SIZE / 4);</div><div class='del'>-	for (index = 0; index &lt; max_index; index++) {</div><div class='del'>-		unsigned long *kaddr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Read the page from page cache, getting it from backing store</div><div class='del'>-		 * if necessary, and increment the use count.</div><div class='del'>-		 */</div><div class='del'>-		page = read_mapping_page(mapping, index, NULL);</div><div class='del'>-		/* Ignore pages which errored synchronously. */</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			ntfs_debug("read_mapping_page() error. Skipping "</div><div class='del'>-					"page (index 0x%lx).", index);</div><div class='del'>-			nr_free -= PAGE_SIZE * 8;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		/*</div><div class='del'>-		 * Subtract the number of set bits. If this</div><div class='del'>-		 * is the last page and it is partial we don't really care as</div><div class='del'>-		 * it just means we do a little extra work but it won't affect</div><div class='del'>-		 * the result as all out of range bytes are set to zero by</div><div class='del'>-		 * ntfs_readpage().</div><div class='del'>-		 */</div><div class='del'>-		nr_free -= bitmap_weight(kaddr,</div><div class='del'>-					PAGE_SIZE * BITS_PER_BYTE);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Finished reading $Bitmap, last index = 0x%lx.", index - 1);</div><div class='del'>-	/*</div><div class='del'>-	 * Fixup for eventual bits outside logical ntfs volume (see function</div><div class='del'>-	 * description above).</div><div class='del'>-	 */</div><div class='del'>-	if (vol-&gt;nr_clusters &amp; 63)</div><div class='del'>-		nr_free += 64 - (vol-&gt;nr_clusters &amp; 63);</div><div class='del'>-	up_read(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-	/* If errors occurred we may well have gone below zero, fix this. */</div><div class='del'>-	if (nr_free &lt; 0)</div><div class='del'>-		nr_free = 0;</div><div class='del'>-	ntfs_debug("Exiting.");</div><div class='del'>-	return nr_free;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __get_nr_free_mft_records - return the number of free inodes on a volume</div><div class='del'>- * @vol:	ntfs volume for which to obtain free inode count</div><div class='del'>- * @nr_free:	number of mft records in filesystem</div><div class='del'>- * @max_index:	maximum number of pages containing set bits</div><div class='del'>- *</div><div class='del'>- * Calculate the number of free mft records (inodes) on the mounted NTFS</div><div class='del'>- * volume @vol. We actually calculate the number of mft records in use instead</div><div class='del'>- * because this allows us to not care about partial pages as these will be just</div><div class='del'>- * zero filled and hence not be counted as allocated mft record.</div><div class='del'>- *</div><div class='del'>- * If any pages cannot be read we assume all mft records in the erroring pages</div><div class='del'>- * are in use. This means we return an underestimate on errors which is better</div><div class='del'>- * than an overestimate.</div><div class='del'>- *</div><div class='del'>- * NOTE: Caller must hold mftbmp_lock rw_semaphore for reading or writing.</div><div class='del'>- */</div><div class='del'>-static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,</div><div class='del'>-		s64 nr_free, const pgoff_t max_index)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = vol-&gt;mftbmp_ino-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Use multiples of 4 bytes, thus max_size is PAGE_SIZE / 4. */</div><div class='del'>-	ntfs_debug("Reading $MFT/$BITMAP, max_index = 0x%lx, max_size = "</div><div class='del'>-			"0x%lx.", max_index, PAGE_SIZE / 4);</div><div class='del'>-	for (index = 0; index &lt; max_index; index++) {</div><div class='del'>-		unsigned long *kaddr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Read the page from page cache, getting it from backing store</div><div class='del'>-		 * if necessary, and increment the use count.</div><div class='del'>-		 */</div><div class='del'>-		page = read_mapping_page(mapping, index, NULL);</div><div class='del'>-		/* Ignore pages which errored synchronously. */</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			ntfs_debug("read_mapping_page() error. Skipping "</div><div class='del'>-					"page (index 0x%lx).", index);</div><div class='del'>-			nr_free -= PAGE_SIZE * 8;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		/*</div><div class='del'>-		 * Subtract the number of set bits. If this</div><div class='del'>-		 * is the last page and it is partial we don't really care as</div><div class='del'>-		 * it just means we do a little extra work but it won't affect</div><div class='del'>-		 * the result as all out of range bytes are set to zero by</div><div class='del'>-		 * ntfs_readpage().</div><div class='del'>-		 */</div><div class='del'>-		nr_free -= bitmap_weight(kaddr,</div><div class='del'>-					PAGE_SIZE * BITS_PER_BYTE);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx.",</div><div class='del'>-			index - 1);</div><div class='del'>-	/* If errors occurred we may well have gone below zero, fix this. */</div><div class='del'>-	if (nr_free &lt; 0)</div><div class='del'>-		nr_free = 0;</div><div class='del'>-	ntfs_debug("Exiting.");</div><div class='del'>-	return nr_free;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_statfs - return information about mounted NTFS volume</div><div class='del'>- * @dentry:	dentry from mounted volume</div><div class='del'>- * @sfs:	statfs structure in which to return the information</div><div class='del'>- *</div><div class='del'>- * Return information about the mounted NTFS volume @dentry in the statfs structure</div><div class='del'>- * pointed to by @sfs (this is initialized with zeros before ntfs_statfs is</div><div class='del'>- * called). We interpret the values to be correct of the moment in time at</div><div class='del'>- * which we are called. Most values are variable otherwise and this isn't just</div><div class='del'>- * the free values but the totals as well. For example we can increase the</div><div class='del'>- * total number of file nodes if we run out and we can keep doing this until</div><div class='del'>- * there is no more space on the volume left at all.</div><div class='del'>- *</div><div class='del'>- * Called from vfs_statfs which is used to handle the statfs, fstatfs, and</div><div class='del'>- * ustat system calls.</div><div class='del'>- *</div><div class='del'>- * Return 0 on success or -errno on error.</div><div class='del'>- */</div><div class='del'>-static int ntfs_statfs(struct dentry *dentry, struct kstatfs *sfs)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = dentry-&gt;d_sb;</div><div class='del'>-	s64 size;</div><div class='del'>-	ntfs_volume *vol = NTFS_SB(sb);</div><div class='del'>-	ntfs_inode *mft_ni = NTFS_I(vol-&gt;mft_ino);</div><div class='del'>-	pgoff_t max_index;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	/* Type of filesystem. */</div><div class='del'>-	sfs-&gt;f_type   = NTFS_SB_MAGIC;</div><div class='del'>-	/* Optimal transfer block size. */</div><div class='del'>-	sfs-&gt;f_bsize  = PAGE_SIZE;</div><div class='del'>-	/*</div><div class='del'>-	 * Total data blocks in filesystem in units of f_bsize and since</div><div class='del'>-	 * inodes are also stored in data blocs ($MFT is a file) this is just</div><div class='del'>-	 * the total clusters.</div><div class='del'>-	 */</div><div class='del'>-	sfs-&gt;f_blocks = vol-&gt;nr_clusters &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-				PAGE_SHIFT;</div><div class='del'>-	/* Free data blocks in filesystem in units of f_bsize. */</div><div class='del'>-	size	      = get_nr_free_clusters(vol) &lt;&lt; vol-&gt;cluster_size_bits &gt;&gt;</div><div class='del'>-				PAGE_SHIFT;</div><div class='del'>-	if (size &lt; 0LL)</div><div class='del'>-		size = 0LL;</div><div class='del'>-	/* Free blocks avail to non-superuser, same as above on NTFS. */</div><div class='del'>-	sfs-&gt;f_bavail = sfs-&gt;f_bfree = size;</div><div class='del'>-	/* Serialize accesses to the inode bitmap. */</div><div class='del'>-	down_read(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	read_lock_irqsave(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	size = i_size_read(vol-&gt;mft_ino) &gt;&gt; vol-&gt;mft_record_size_bits;</div><div class='del'>-	/*</div><div class='del'>-	 * Convert the maximum number of set bits into bytes rounded up, then</div><div class='del'>-	 * convert into multiples of PAGE_SIZE, rounding up so that if we</div><div class='del'>-	 * have one full and one partial page max_index = 2.</div><div class='del'>-	 */</div><div class='del'>-	max_index = ((((mft_ni-&gt;initialized_size &gt;&gt; vol-&gt;mft_record_size_bits)</div><div class='del'>-			+ 7) &gt;&gt; 3) + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	read_unlock_irqrestore(&amp;mft_ni-&gt;size_lock, flags);</div><div class='del'>-	/* Number of inodes in filesystem (at this point in time). */</div><div class='del'>-	sfs-&gt;f_files = size;</div><div class='del'>-	/* Free inodes in fs (based on current total count). */</div><div class='del'>-	sfs-&gt;f_ffree = __get_nr_free_mft_records(vol, size, max_index);</div><div class='del'>-	up_read(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * File system id. This is extremely *nix flavour dependent and even</div><div class='del'>-	 * within Linux itself all fs do their own thing. I interpret this to</div><div class='del'>-	 * mean a unique id associated with the mounted fs and not the id</div><div class='del'>-	 * associated with the filesystem driver, the latter is already given</div><div class='del'>-	 * by the filesystem type in sfs-&gt;f_type. Thus we use the 64-bit</div><div class='del'>-	 * volume serial number splitting it into two 32-bit parts. We enter</div><div class='del'>-	 * the least significant 32-bits in f_fsid[0] and the most significant</div><div class='del'>-	 * 32-bits in f_fsid[1].</div><div class='del'>-	 */</div><div class='del'>-	sfs-&gt;f_fsid = u64_to_fsid(vol-&gt;serial_no);</div><div class='del'>-	/* Maximum length of filenames. */</div><div class='del'>-	sfs-&gt;f_namelen	   = NTFS_MAX_NAME_LEN;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-static int ntfs_write_inode(struct inode *vi, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	return __ntfs_write_inode(vi, wbc-&gt;sync_mode == WB_SYNC_ALL);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The complete super operations.</div><div class='del'>- */</div><div class='del'>-static const struct super_operations ntfs_sops = {</div><div class='del'>-	.alloc_inode	= ntfs_alloc_big_inode,	  /* VFS: Allocate new inode. */</div><div class='del'>-	.free_inode	= ntfs_free_big_inode, /* VFS: Deallocate inode. */</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	.write_inode	= ntfs_write_inode,	/* VFS: Write dirty inode to</div><div class='del'>-						   disk. */</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	.put_super	= ntfs_put_super,	/* Syscall: umount. */</div><div class='del'>-	.statfs		= ntfs_statfs,		/* Syscall: statfs */</div><div class='del'>-	.remount_fs	= ntfs_remount,		/* Syscall: mount -o remount. */</div><div class='del'>-	.evict_inode	= ntfs_evict_big_inode,	/* VFS: Called when an inode is</div><div class='del'>-						   removed from memory. */</div><div class='del'>-	.show_options	= ntfs_show_options,	/* Show mount options in</div><div class='del'>-						   proc. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_fill_super - mount an ntfs filesystem</div><div class='del'>- * @sb:		super block of ntfs filesystem to mount</div><div class='del'>- * @opt:	string containing the mount options</div><div class='del'>- * @silent:	silence error output</div><div class='del'>- *</div><div class='del'>- * ntfs_fill_super() is called by the VFS to mount the device described by @sb</div><div class='del'>- * with the mount otions in @data with the NTFS filesystem.</div><div class='del'>- *</div><div class='del'>- * If @silent is true, remain silent even if errors are detected. This is used</div><div class='del'>- * during bootup, when the kernel tries to mount the root filesystem with all</div><div class='del'>- * registered filesystems one after the other until one succeeds. This implies</div><div class='del'>- * that all filesystems except the correct one will quite correctly and</div><div class='del'>- * expectedly return an error, but nobody wants to see error messages when in</div><div class='del'>- * fact this is what is supposed to happen.</div><div class='del'>- *</div><div class='del'>- * NOTE: @sb-&gt;s_flags contains the mount options flags.</div><div class='del'>- */</div><div class='del'>-static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)</div><div class='del'>-{</div><div class='del'>-	ntfs_volume *vol;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct inode *tmp_ino;</div><div class='del'>-	int blocksize, result;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We do a pretty difficult piece of bootstrap by reading the</div><div class='del'>-	 * MFT (and other metadata) from disk into memory. We'll only</div><div class='del'>-	 * release this metadata during umount, so the locking patterns</div><div class='del'>-	 * observed during bootstrap do not count. So turn off the</div><div class='del'>-	 * observation of locking patterns (strictly for this context</div><div class='del'>-	 * only) while mounting NTFS. [The validator is still active</div><div class='del'>-	 * otherwise, even for this context: it will for example record</div><div class='del'>-	 * lock class registrations.]</div><div class='del'>-	 */</div><div class='del'>-	lockdep_off();</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-#ifndef NTFS_RW</div><div class='del'>-	sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-#endif /* ! NTFS_RW */</div><div class='del'>-	/* Allocate a new ntfs_volume and place it in sb-&gt;s_fs_info. */</div><div class='del'>-	sb-&gt;s_fs_info = kmalloc(sizeof(ntfs_volume), GFP_NOFS);</div><div class='del'>-	vol = NTFS_SB(sb);</div><div class='del'>-	if (!vol) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Allocation of NTFS volume structure "</div><div class='del'>-					"failed. Aborting mount...");</div><div class='del'>-		lockdep_on();</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	/* Initialize ntfs_volume structure. */</div><div class='del'>-	*vol = (ntfs_volume) {</div><div class='del'>-		.sb = sb,</div><div class='del'>-		/*</div><div class='del'>-		 * Default is group and other don't have any access to files or</div><div class='del'>-		 * directories while owner has full access. Further, files by</div><div class='del'>-		 * default are not executable but directories are of course</div><div class='del'>-		 * browseable.</div><div class='del'>-		 */</div><div class='del'>-		.fmask = 0177,</div><div class='del'>-		.dmask = 0077,</div><div class='del'>-	};</div><div class='del'>-	init_rwsem(&amp;vol-&gt;mftbmp_lock);</div><div class='del'>-	init_rwsem(&amp;vol-&gt;lcnbmp_lock);</div><div class='del'>-</div><div class='del'>-	/* By default, enable sparse support. */</div><div class='del'>-	NVolSetSparseEnabled(vol);</div><div class='del'>-</div><div class='del'>-	/* Important to get the mount options dealt with now. */</div><div class='del'>-	if (!parse_options(vol, (char*)opt))</div><div class='del'>-		goto err_out_now;</div><div class='del'>-</div><div class='del'>-	/* We support sector sizes up to the PAGE_SIZE. */</div><div class='del'>-	if (bdev_logical_block_size(sb-&gt;s_bdev) &gt; PAGE_SIZE) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Device has unsupported sector size "</div><div class='del'>-					"(%i).  The maximum supported sector "</div><div class='del'>-					"size on this architecture is %lu "</div><div class='del'>-					"bytes.",</div><div class='del'>-					bdev_logical_block_size(sb-&gt;s_bdev),</div><div class='del'>-					PAGE_SIZE);</div><div class='del'>-		goto err_out_now;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Setup the device access block size to NTFS_BLOCK_SIZE or the hard</div><div class='del'>-	 * sector size, whichever is bigger.</div><div class='del'>-	 */</div><div class='del'>-	blocksize = sb_min_blocksize(sb, NTFS_BLOCK_SIZE);</div><div class='del'>-	if (blocksize &lt; NTFS_BLOCK_SIZE) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Unable to set device block size.");</div><div class='del'>-		goto err_out_now;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(blocksize != sb-&gt;s_blocksize);</div><div class='del'>-	ntfs_debug("Set device block size to %i bytes (block size bits %i).",</div><div class='del'>-			blocksize, sb-&gt;s_blocksize_bits);</div><div class='del'>-	/* Determine the size of the device in units of block_size bytes. */</div><div class='del'>-	vol-&gt;nr_blocks = sb_bdev_nr_blocks(sb);</div><div class='del'>-	if (!vol-&gt;nr_blocks) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Unable to determine device size.");</div><div class='del'>-		goto err_out_now;</div><div class='del'>-	}</div><div class='del'>-	/* Read the boot sector and return unlocked buffer head to it. */</div><div class='del'>-	if (!(bh = read_ntfs_boot_sector(sb, silent))) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Not an NTFS volume.");</div><div class='del'>-		goto err_out_now;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Extract the data from the boot sector and setup the ntfs volume</div><div class='del'>-	 * using it.</div><div class='del'>-	 */</div><div class='del'>-	result = parse_ntfs_boot_sector(vol, (NTFS_BOOT_SECTOR*)bh-&gt;b_data);</div><div class='del'>-	brelse(bh);</div><div class='del'>-	if (!result) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Unsupported NTFS filesystem.");</div><div class='del'>-		goto err_out_now;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If the boot sector indicates a sector size bigger than the current</div><div class='del'>-	 * device block size, switch the device block size to the sector size.</div><div class='del'>-	 * TODO: It may be possible to support this case even when the set</div><div class='del'>-	 * below fails, we would just be breaking up the i/o for each sector</div><div class='del'>-	 * into multiple blocks for i/o purposes but otherwise it should just</div><div class='del'>-	 * work.  However it is safer to leave disabled until someone hits this</div><div class='del'>-	 * error message and then we can get them to try it without the setting</div><div class='del'>-	 * so we know for sure that it works.</div><div class='del'>-	 */</div><div class='del'>-	if (vol-&gt;sector_size &gt; blocksize) {</div><div class='del'>-		blocksize = sb_set_blocksize(sb, vol-&gt;sector_size);</div><div class='del'>-		if (blocksize != vol-&gt;sector_size) {</div><div class='del'>-			if (!silent)</div><div class='del'>-				ntfs_error(sb, "Unable to set device block "</div><div class='del'>-						"size to sector size (%i).",</div><div class='del'>-						vol-&gt;sector_size);</div><div class='del'>-			goto err_out_now;</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(blocksize != sb-&gt;s_blocksize);</div><div class='del'>-		vol-&gt;nr_blocks = sb_bdev_nr_blocks(sb);</div><div class='del'>-		ntfs_debug("Changed device block size to %i bytes (block size "</div><div class='del'>-				"bits %i) to match volume sector size.",</div><div class='del'>-				blocksize, sb-&gt;s_blocksize_bits);</div><div class='del'>-	}</div><div class='del'>-	/* Initialize the cluster and mft allocators. */</div><div class='del'>-	ntfs_setup_allocators(vol);</div><div class='del'>-	/* Setup remaining fields in the super block. */</div><div class='del'>-	sb-&gt;s_magic = NTFS_SB_MAGIC;</div><div class='del'>-	/*</div><div class='del'>-	 * Ntfs allows 63 bits for the file size, i.e. correct would be:</div><div class='del'>-	 *	sb-&gt;s_maxbytes = ~0ULL &gt;&gt; 1;</div><div class='del'>-	 * But the kernel uses a long as the page cache page index which on</div><div class='del'>-	 * 32-bit architectures is only 32-bits. MAX_LFS_FILESIZE is kernel</div><div class='del'>-	 * defined to the maximum the page cache page index can cope with</div><div class='del'>-	 * without overflowing the index or to 2^63 - 1, whichever is smaller.</div><div class='del'>-	 */</div><div class='del'>-	sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='del'>-	/* Ntfs measures time in 100ns intervals. */</div><div class='del'>-	sb-&gt;s_time_gran = 100;</div><div class='del'>-	/*</div><div class='del'>-	 * Now load the metadata required for the page cache and our address</div><div class='del'>-	 * space operations to function. We do this by setting up a specialised</div><div class='del'>-	 * read_inode method and then just calling the normal iget() to obtain</div><div class='del'>-	 * the inode for $MFT which is sufficient to allow our normal inode</div><div class='del'>-	 * operations and associated address space operations to function.</div><div class='del'>-	 */</div><div class='del'>-	sb-&gt;s_op = &amp;ntfs_sops;</div><div class='del'>-	tmp_ino = new_inode(sb);</div><div class='del'>-	if (!tmp_ino) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Failed to load essential metadata.");</div><div class='del'>-		goto err_out_now;</div><div class='del'>-	}</div><div class='del'>-	tmp_ino-&gt;i_ino = FILE_MFT;</div><div class='del'>-	insert_inode_hash(tmp_ino);</div><div class='del'>-	if (ntfs_read_inode_mount(tmp_ino) &lt; 0) {</div><div class='del'>-		if (!silent)</div><div class='del'>-			ntfs_error(sb, "Failed to load essential metadata.");</div><div class='del'>-		goto iput_tmp_ino_err_out_now;</div><div class='del'>-	}</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * The current mount is a compression user if the cluster size is</div><div class='del'>-	 * less than or equal 4kiB.</div><div class='del'>-	 */</div><div class='del'>-	if (vol-&gt;cluster_size &lt;= 4096 &amp;&amp; !ntfs_nr_compression_users++) {</div><div class='del'>-		result = allocate_compression_buffers();</div><div class='del'>-		if (result) {</div><div class='del'>-			ntfs_error(NULL, "Failed to allocate buffers "</div><div class='del'>-					"for compression engine.");</div><div class='del'>-			ntfs_nr_compression_users--;</div><div class='del'>-			mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-			goto iput_tmp_ino_err_out_now;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Generate the global default upcase table if necessary.  Also</div><div class='del'>-	 * temporarily increment the number of upcase users to avoid race</div><div class='del'>-	 * conditions with concurrent (u)mounts.</div><div class='del'>-	 */</div><div class='del'>-	if (!default_upcase)</div><div class='del'>-		default_upcase = generate_default_upcase();</div><div class='del'>-	ntfs_nr_upcase_users++;</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * From now on, ignore @silent parameter. If we fail below this line,</div><div class='del'>-	 * it will be due to a corrupt fs or a system error, so we report it.</div><div class='del'>-	 */</div><div class='del'>-	/*</div><div class='del'>-	 * Open the system files with normal access functions and complete</div><div class='del'>-	 * setting up the ntfs super block.</div><div class='del'>-	 */</div><div class='del'>-	if (!load_system_files(vol)) {</div><div class='del'>-		ntfs_error(sb, "Failed to load system files.");</div><div class='del'>-		goto unl_upcase_iput_tmp_ino_err_out_now;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We grab a reference, simulating an ntfs_iget(). */</div><div class='del'>-	ihold(vol-&gt;root_ino);</div><div class='del'>-	if ((sb-&gt;s_root = d_make_root(vol-&gt;root_ino))) {</div><div class='del'>-		ntfs_debug("Exiting, status successful.");</div><div class='del'>-		/* Release the default upcase if it has no users. */</div><div class='del'>-		mutex_lock(&amp;ntfs_lock);</div><div class='del'>-		if (!--ntfs_nr_upcase_users &amp;&amp; default_upcase) {</div><div class='del'>-			ntfs_free(default_upcase);</div><div class='del'>-			default_upcase = NULL;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-		sb-&gt;s_export_op = &amp;ntfs_export_ops;</div><div class='del'>-		lockdep_on();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ntfs_error(sb, "Failed to allocate root directory.");</div><div class='del'>-	/* Clean up after the successful load_system_files() call from above. */</div><div class='del'>-	// TODO: Use ntfs_put_super() instead of repeating all this code...</div><div class='del'>-	// FIXME: Should mark the volume clean as the error is most likely</div><div class='del'>-	// 	  -ENOMEM.</div><div class='del'>-	iput(vol-&gt;vol_ino);</div><div class='del'>-	vol-&gt;vol_ino = NULL;</div><div class='del'>-	/* NTFS 3.0+ specific clean up. */</div><div class='del'>-	if (vol-&gt;major_ver &gt;= 3) {</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-		if (vol-&gt;usnjrnl_j_ino) {</div><div class='del'>-			iput(vol-&gt;usnjrnl_j_ino);</div><div class='del'>-			vol-&gt;usnjrnl_j_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;usnjrnl_max_ino) {</div><div class='del'>-			iput(vol-&gt;usnjrnl_max_ino);</div><div class='del'>-			vol-&gt;usnjrnl_max_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;usnjrnl_ino) {</div><div class='del'>-			iput(vol-&gt;usnjrnl_ino);</div><div class='del'>-			vol-&gt;usnjrnl_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;quota_q_ino) {</div><div class='del'>-			iput(vol-&gt;quota_q_ino);</div><div class='del'>-			vol-&gt;quota_q_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;quota_ino) {</div><div class='del'>-			iput(vol-&gt;quota_ino);</div><div class='del'>-			vol-&gt;quota_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-		if (vol-&gt;extend_ino) {</div><div class='del'>-			iput(vol-&gt;extend_ino);</div><div class='del'>-			vol-&gt;extend_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (vol-&gt;secure_ino) {</div><div class='del'>-			iput(vol-&gt;secure_ino);</div><div class='del'>-			vol-&gt;secure_ino = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	iput(vol-&gt;root_ino);</div><div class='del'>-	vol-&gt;root_ino = NULL;</div><div class='del'>-	iput(vol-&gt;lcnbmp_ino);</div><div class='del'>-	vol-&gt;lcnbmp_ino = NULL;</div><div class='del'>-	iput(vol-&gt;mftbmp_ino);</div><div class='del'>-	vol-&gt;mftbmp_ino = NULL;</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	if (vol-&gt;logfile_ino) {</div><div class='del'>-		iput(vol-&gt;logfile_ino);</div><div class='del'>-		vol-&gt;logfile_ino = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (vol-&gt;mftmirr_ino) {</div><div class='del'>-		iput(vol-&gt;mftmirr_ino);</div><div class='del'>-		vol-&gt;mftmirr_ino = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	/* Throw away the table of attribute definitions. */</div><div class='del'>-	vol-&gt;attrdef_size = 0;</div><div class='del'>-	if (vol-&gt;attrdef) {</div><div class='del'>-		ntfs_free(vol-&gt;attrdef);</div><div class='del'>-		vol-&gt;attrdef = NULL;</div><div class='del'>-	}</div><div class='del'>-	vol-&gt;upcase_len = 0;</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	if (vol-&gt;upcase == default_upcase) {</div><div class='del'>-		ntfs_nr_upcase_users--;</div><div class='del'>-		vol-&gt;upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-	if (vol-&gt;upcase) {</div><div class='del'>-		ntfs_free(vol-&gt;upcase);</div><div class='del'>-		vol-&gt;upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (vol-&gt;nls_map) {</div><div class='del'>-		unload_nls(vol-&gt;nls_map);</div><div class='del'>-		vol-&gt;nls_map = NULL;</div><div class='del'>-	}</div><div class='del'>-	/* Error exit code path. */</div><div class='del'>-unl_upcase_iput_tmp_ino_err_out_now:</div><div class='del'>-	/*</div><div class='del'>-	 * Decrease the number of upcase users and destroy the global default</div><div class='del'>-	 * upcase table if necessary.</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;ntfs_lock);</div><div class='del'>-	if (!--ntfs_nr_upcase_users &amp;&amp; default_upcase) {</div><div class='del'>-		ntfs_free(default_upcase);</div><div class='del'>-		default_upcase = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (vol-&gt;cluster_size &lt;= 4096 &amp;&amp; !--ntfs_nr_compression_users)</div><div class='del'>-		free_compression_buffers();</div><div class='del'>-	mutex_unlock(&amp;ntfs_lock);</div><div class='del'>-iput_tmp_ino_err_out_now:</div><div class='del'>-	iput(tmp_ino);</div><div class='del'>-	if (vol-&gt;mft_ino &amp;&amp; vol-&gt;mft_ino != tmp_ino)</div><div class='del'>-		iput(vol-&gt;mft_ino);</div><div class='del'>-	vol-&gt;mft_ino = NULL;</div><div class='del'>-	/* Errors at this stage are irrelevant. */</div><div class='del'>-err_out_now:</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='del'>-	kfree(vol);</div><div class='del'>-	ntfs_debug("Failed, returning -EINVAL.");</div><div class='del'>-	lockdep_on();</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is a slab cache to optimize allocations and deallocations of Unicode</div><div class='del'>- * strings of the maximum length allowed by NTFS, which is NTFS_MAX_NAME_LEN</div><div class='del'>- * (255) Unicode characters + a terminating NULL Unicode character.</div><div class='del'>- */</div><div class='del'>-struct kmem_cache *ntfs_name_cache;</div><div class='del'>-</div><div class='del'>-/* Slab caches for efficient allocation/deallocation of inodes. */</div><div class='del'>-struct kmem_cache *ntfs_inode_cache;</div><div class='del'>-struct kmem_cache *ntfs_big_inode_cache;</div><div class='del'>-</div><div class='del'>-/* Init once constructor for the inode slab cache. */</div><div class='del'>-static void ntfs_big_inode_init_once(void *foo)</div><div class='del'>-{</div><div class='del'>-	ntfs_inode *ni = (ntfs_inode *)foo;</div><div class='del'>-</div><div class='del'>-	inode_init_once(VFS_I(ni));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Slab caches to optimize allocations and deallocations of attribute search</div><div class='del'>- * contexts and index contexts, respectively.</div><div class='del'>- */</div><div class='del'>-struct kmem_cache *ntfs_attr_ctx_cache;</div><div class='del'>-struct kmem_cache *ntfs_index_ctx_cache;</div><div class='del'>-</div><div class='del'>-/* Driver wide mutex. */</div><div class='del'>-DEFINE_MUTEX(ntfs_lock);</div><div class='del'>-</div><div class='del'>-static struct dentry *ntfs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='del'>-{</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, ntfs_fill_super);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct file_system_type ntfs_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "ntfs",</div><div class='del'>-	.mount		= ntfs_mount,</div><div class='del'>-	.kill_sb	= kill_block_super,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='del'>-};</div><div class='del'>-MODULE_ALIAS_FS("ntfs");</div><div class='del'>-</div><div class='del'>-/* Stable names for the slab caches. */</div><div class='del'>-static const char ntfs_index_ctx_cache_name[] = "ntfs_index_ctx_cache";</div><div class='del'>-static const char ntfs_attr_ctx_cache_name[] = "ntfs_attr_ctx_cache";</div><div class='del'>-static const char ntfs_name_cache_name[] = "ntfs_name_cache";</div><div class='del'>-static const char ntfs_inode_cache_name[] = "ntfs_inode_cache";</div><div class='del'>-static const char ntfs_big_inode_cache_name[] = "ntfs_big_inode_cache";</div><div class='del'>-</div><div class='del'>-static int __init init_ntfs_fs(void)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* This may be ugly but it results in pretty output so who cares. (-8 */</div><div class='del'>-	pr_info("driver " NTFS_VERSION " [Flags: R/"</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-			"W"</div><div class='del'>-#else</div><div class='del'>-			"O"</div><div class='del'>-#endif</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-			" DEBUG"</div><div class='del'>-#endif</div><div class='del'>-#ifdef MODULE</div><div class='del'>-			" MODULE"</div><div class='del'>-#endif</div><div class='del'>-			"].\n");</div><div class='del'>-</div><div class='del'>-	ntfs_debug("Debug messages are enabled.");</div><div class='del'>-</div><div class='del'>-	ntfs_index_ctx_cache = kmem_cache_create(ntfs_index_ctx_cache_name,</div><div class='del'>-			sizeof(ntfs_index_context), 0 /* offset */,</div><div class='del'>-			SLAB_HWCACHE_ALIGN, NULL /* ctor */);</div><div class='del'>-	if (!ntfs_index_ctx_cache) {</div><div class='del'>-		pr_crit("Failed to create %s!\n", ntfs_index_ctx_cache_name);</div><div class='del'>-		goto ictx_err_out;</div><div class='del'>-	}</div><div class='del'>-	ntfs_attr_ctx_cache = kmem_cache_create(ntfs_attr_ctx_cache_name,</div><div class='del'>-			sizeof(ntfs_attr_search_ctx), 0 /* offset */,</div><div class='del'>-			SLAB_HWCACHE_ALIGN, NULL /* ctor */);</div><div class='del'>-	if (!ntfs_attr_ctx_cache) {</div><div class='del'>-		pr_crit("NTFS: Failed to create %s!\n",</div><div class='del'>-			ntfs_attr_ctx_cache_name);</div><div class='del'>-		goto actx_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ntfs_name_cache = kmem_cache_create(ntfs_name_cache_name,</div><div class='del'>-			(NTFS_MAX_NAME_LEN+1) * sizeof(ntfschar), 0,</div><div class='del'>-			SLAB_HWCACHE_ALIGN, NULL);</div><div class='del'>-	if (!ntfs_name_cache) {</div><div class='del'>-		pr_crit("Failed to create %s!\n", ntfs_name_cache_name);</div><div class='del'>-		goto name_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name,</div><div class='del'>-			sizeof(ntfs_inode), 0,</div><div class='del'>-			SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);</div><div class='del'>-	if (!ntfs_inode_cache) {</div><div class='del'>-		pr_crit("Failed to create %s!\n", ntfs_inode_cache_name);</div><div class='del'>-		goto inode_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name,</div><div class='del'>-			sizeof(big_ntfs_inode), 0,</div><div class='del'>-			SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|</div><div class='del'>-			SLAB_ACCOUNT, ntfs_big_inode_init_once);</div><div class='del'>-	if (!ntfs_big_inode_cache) {</div><div class='del'>-		pr_crit("Failed to create %s!\n", ntfs_big_inode_cache_name);</div><div class='del'>-		goto big_inode_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register the ntfs sysctls. */</div><div class='del'>-	err = ntfs_sysctl(1);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_crit("Failed to register NTFS sysctls!\n");</div><div class='del'>-		goto sysctl_err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = register_filesystem(&amp;ntfs_fs_type);</div><div class='del'>-	if (!err) {</div><div class='del'>-		ntfs_debug("NTFS driver registered successfully.");</div><div class='del'>-		return 0; /* Success! */</div><div class='del'>-	}</div><div class='del'>-	pr_crit("Failed to register NTFS filesystem driver!\n");</div><div class='del'>-</div><div class='del'>-	/* Unregister the ntfs sysctls. */</div><div class='del'>-	ntfs_sysctl(0);</div><div class='del'>-sysctl_err_out:</div><div class='del'>-	kmem_cache_destroy(ntfs_big_inode_cache);</div><div class='del'>-big_inode_err_out:</div><div class='del'>-	kmem_cache_destroy(ntfs_inode_cache);</div><div class='del'>-inode_err_out:</div><div class='del'>-	kmem_cache_destroy(ntfs_name_cache);</div><div class='del'>-name_err_out:</div><div class='del'>-	kmem_cache_destroy(ntfs_attr_ctx_cache);</div><div class='del'>-actx_err_out:</div><div class='del'>-	kmem_cache_destroy(ntfs_index_ctx_cache);</div><div class='del'>-ictx_err_out:</div><div class='del'>-	if (!err) {</div><div class='del'>-		pr_crit("Aborting NTFS filesystem driver registration...\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit exit_ntfs_fs(void)</div><div class='del'>-{</div><div class='del'>-	ntfs_debug("Unregistering NTFS driver.");</div><div class='del'>-</div><div class='del'>-	unregister_filesystem(&amp;ntfs_fs_type);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure all delayed rcu free inodes are flushed before we</div><div class='del'>-	 * destroy cache.</div><div class='del'>-	 */</div><div class='del'>-	rcu_barrier();</div><div class='del'>-	kmem_cache_destroy(ntfs_big_inode_cache);</div><div class='del'>-	kmem_cache_destroy(ntfs_inode_cache);</div><div class='del'>-	kmem_cache_destroy(ntfs_name_cache);</div><div class='del'>-	kmem_cache_destroy(ntfs_attr_ctx_cache);</div><div class='del'>-	kmem_cache_destroy(ntfs_index_ctx_cache);</div><div class='del'>-	/* Unregister the ntfs sysctls. */</div><div class='del'>-	ntfs_sysctl(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Anton Altaparmakov &lt;anton@tuxera.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc.");</div><div class='del'>-MODULE_VERSION(NTFS_VERSION);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-module_param(debug_msgs, bint, 0);</div><div class='del'>-MODULE_PARM_DESC(debug_msgs, "Enable debug messages.");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-module_init(init_ntfs_fs)</div><div class='del'>-module_exit(exit_ntfs_fs)</div><div class='head'>diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c<br/>deleted file mode 100644<br/>index 4e980170d86a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/sysctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/sysctl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of</div><div class='del'>- *	      the Linux-NTFS project. Adapted from the old NTFS driver,</div><div class='del'>- *	      Copyright (C) 1997 Martin von Löwis, Régis Duchesne</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2002-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sysctl.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-</div><div class='del'>-/* Definition of the ntfs sysctl. */</div><div class='del'>-static struct ctl_table ntfs_sysctls[] = {</div><div class='del'>-	{</div><div class='del'>-		.procname	= "ntfs-debug",</div><div class='del'>-		.data		= &amp;debug_msgs,		/* Data pointer and size. */</div><div class='del'>-		.maxlen		= sizeof(debug_msgs),</div><div class='del'>-		.mode		= 0644,			/* Mode, proc handler. */</div><div class='del'>-		.proc_handler	= proc_dointvec</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Storage for the sysctls header. */</div><div class='del'>-static struct ctl_table_header *sysctls_root_table;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_sysctl - add or remove the debug sysctl</div><div class='del'>- * @add:	add (1) or remove (0) the sysctl</div><div class='del'>- *</div><div class='del'>- * Add or remove the debug sysctl. Return 0 on success or -errno on error.</div><div class='del'>- */</div><div class='del'>-int ntfs_sysctl(int add)</div><div class='del'>-{</div><div class='del'>-	if (add) {</div><div class='del'>-		BUG_ON(sysctls_root_table);</div><div class='del'>-		sysctls_root_table = register_sysctl("fs", ntfs_sysctls);</div><div class='del'>-		if (!sysctls_root_table)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	} else {</div><div class='del'>-		BUG_ON(!sysctls_root_table);</div><div class='del'>-		unregister_sysctl_table(sysctls_root_table);</div><div class='del'>-		sysctls_root_table = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SYSCTL */</div><div class='del'>-#endif /* DEBUG */</div><div class='head'>diff --git a/fs/ntfs/sysctl.h b/fs/ntfs/sysctl.h<br/>deleted file mode 100644<br/>index 96bb2299d2d5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/sysctl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/sysctl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of</div><div class='del'>- *	      the Linux-NTFS project. Adapted from the old NTFS driver,</div><div class='del'>- *	      Copyright (C) 1997 Martin von Löwis, Régis Duchesne</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2002-2004 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_SYSCTL_H</div><div class='del'>-#define _LINUX_NTFS_SYSCTL_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(DEBUG) &amp;&amp; defined(CONFIG_SYSCTL)</div><div class='del'>-</div><div class='del'>-extern int ntfs_sysctl(int add);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-/* Just return success. */</div><div class='del'>-static inline int ntfs_sysctl(int add)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* DEBUG &amp;&amp; CONFIG_SYSCTL */</div><div class='del'>-#endif /* _LINUX_NTFS_SYSCTL_H */</div><div class='head'>diff --git a/fs/ntfs/time.h b/fs/ntfs/time.h<br/>deleted file mode 100644<br/>index 6b63261300cc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/time.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/time.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * time.h - NTFS time conversion functions.  Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_TIME_H</div><div class='del'>-#define _LINUX_NTFS_TIME_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;		/* For current_kernel_time(). */</div><div class='del'>-#include &lt;asm/div64.h&gt;		/* For do_div(). */</div><div class='del'>-</div><div class='del'>-#include "endian.h"</div><div class='del'>-</div><div class='del'>-#define NTFS_TIME_OFFSET ((s64)(369 * 365 + 89) * 24 * 3600 * 10000000)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * utc2ntfs - convert Linux UTC time to NTFS time</div><div class='del'>- * @ts:		Linux UTC time to convert to NTFS time</div><div class='del'>- *</div><div class='del'>- * Convert the Linux UTC time @ts to its corresponding NTFS time and return</div><div class='del'>- * that in little endian format.</div><div class='del'>- *</div><div class='del'>- * Linux stores time in a struct timespec64 consisting of a time64_t tv_sec</div><div class='del'>- * and a long tv_nsec where tv_sec is the number of 1-second intervals since</div><div class='del'>- * 1st January 1970, 00:00:00 UTC and tv_nsec is the number of 1-nano-second</div><div class='del'>- * intervals since the value of tv_sec.</div><div class='del'>- *</div><div class='del'>- * NTFS uses Microsoft's standard time format which is stored in a s64 and is</div><div class='del'>- * measured as the number of 100-nano-second intervals since 1st January 1601,</div><div class='del'>- * 00:00:00 UTC.</div><div class='del'>- */</div><div class='del'>-static inline sle64 utc2ntfs(const struct timespec64 ts)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Convert the seconds to 100ns intervals, add the nano-seconds</div><div class='del'>-	 * converted to 100ns intervals, and then add the NTFS time offset.</div><div class='del'>-	 */</div><div class='del'>-	return cpu_to_sle64((s64)ts.tv_sec * 10000000 + ts.tv_nsec / 100 +</div><div class='del'>-			NTFS_TIME_OFFSET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * get_current_ntfs_time - get the current time in little endian NTFS format</div><div class='del'>- *</div><div class='del'>- * Get the current time from the Linux kernel, convert it to its corresponding</div><div class='del'>- * NTFS time and return that in little endian format.</div><div class='del'>- */</div><div class='del'>-static inline sle64 get_current_ntfs_time(void)</div><div class='del'>-{</div><div class='del'>-	struct timespec64 ts;</div><div class='del'>-</div><div class='del'>-	ktime_get_coarse_real_ts64(&amp;ts);</div><div class='del'>-	return utc2ntfs(ts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs2utc - convert NTFS time to Linux time</div><div class='del'>- * @time:	NTFS time (little endian) to convert to Linux UTC</div><div class='del'>- *</div><div class='del'>- * Convert the little endian NTFS time @time to its corresponding Linux UTC</div><div class='del'>- * time and return that in cpu format.</div><div class='del'>- *</div><div class='del'>- * Linux stores time in a struct timespec64 consisting of a time64_t tv_sec</div><div class='del'>- * and a long tv_nsec where tv_sec is the number of 1-second intervals since</div><div class='del'>- * 1st January 1970, 00:00:00 UTC and tv_nsec is the number of 1-nano-second</div><div class='del'>- * intervals since the value of tv_sec.</div><div class='del'>- *</div><div class='del'>- * NTFS uses Microsoft's standard time format which is stored in a s64 and is</div><div class='del'>- * measured as the number of 100 nano-second intervals since 1st January 1601,</div><div class='del'>- * 00:00:00 UTC.</div><div class='del'>- */</div><div class='del'>-static inline struct timespec64 ntfs2utc(const sle64 time)</div><div class='del'>-{</div><div class='del'>-	struct timespec64 ts;</div><div class='del'>-</div><div class='del'>-	/* Subtract the NTFS time offset. */</div><div class='del'>-	u64 t = (u64)(sle64_to_cpu(time) - NTFS_TIME_OFFSET);</div><div class='del'>-	/*</div><div class='del'>-	 * Convert the time to 1-second intervals and the remainder to</div><div class='del'>-	 * 1-nano-second intervals.</div><div class='del'>-	 */</div><div class='del'>-	ts.tv_nsec = do_div(t, 10000000) * 100;</div><div class='del'>-	ts.tv_sec = t;</div><div class='del'>-	return ts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_TIME_H */</div><div class='head'>diff --git a/fs/ntfs/types.h b/fs/ntfs/types.h<br/>deleted file mode 100644<br/>index 9a47859e7a06..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/types.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * types.h - Defines for NTFS Linux kernel driver specific types.</div><div class='del'>- *	     Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_TYPES_H</div><div class='del'>-#define _LINUX_NTFS_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-typedef __le16 le16;</div><div class='del'>-typedef __le32 le32;</div><div class='del'>-typedef __le64 le64;</div><div class='del'>-typedef __u16 __bitwise sle16;</div><div class='del'>-typedef __u32 __bitwise sle32;</div><div class='del'>-typedef __u64 __bitwise sle64;</div><div class='del'>-</div><div class='del'>-/* 2-byte Unicode character type. */</div><div class='del'>-typedef le16 ntfschar;</div><div class='del'>-#define UCHAR_T_SIZE_BITS 1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clusters are signed 64-bit values on NTFS volumes. We define two types, LCN</div><div class='del'>- * and VCN, to allow for type checking and better code readability.</div><div class='del'>- */</div><div class='del'>-typedef s64 VCN;</div><div class='del'>-typedef sle64 leVCN;</div><div class='del'>-typedef s64 LCN;</div><div class='del'>-typedef sle64 leLCN;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The NTFS journal $LogFile uses log sequence numbers which are signed 64-bit</div><div class='del'>- * values.  We define our own type LSN, to allow for type checking and better</div><div class='del'>- * code readability.</div><div class='del'>- */</div><div class='del'>-typedef s64 LSN;</div><div class='del'>-typedef sle64 leLSN;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The NTFS transaction log $UsnJrnl uses usn which are signed 64-bit values.</div><div class='del'>- * We define our own type USN, to allow for type checking and better code</div><div class='del'>- * readability.</div><div class='del'>- */</div><div class='del'>-typedef s64 USN;</div><div class='del'>-typedef sle64 leUSN;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CASE_SENSITIVE = 0,</div><div class='del'>-	IGNORE_CASE = 1,</div><div class='del'>-} IGNORE_CASE_BOOL;</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_TYPES_H */</div><div class='head'>diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c<br/>deleted file mode 100644<br/>index a6b6c64f14a9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/unistr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/unistr.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,384 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * unistr.c - NTFS Unicode string handling. Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2006 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IMPORTANT</div><div class='del'>- * =========</div><div class='del'>- *</div><div class='del'>- * All these routines assume that the Unicode characters are in little endian</div><div class='del'>- * encoding inside the strings!!!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is used by the name collation functions to quickly determine what</div><div class='del'>- * characters are (in)valid.</div><div class='del'>- */</div><div class='del'>-static const u8 legal_ansi_char_array[0x40] = {</div><div class='del'>-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,</div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,</div><div class='del'>-</div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,</div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,</div><div class='del'>-</div><div class='del'>-	0x17, 0x07, 0x18, 0x17, 0x17, 0x17, 0x17, 0x17,</div><div class='del'>-	0x17, 0x17, 0x18, 0x16, 0x16, 0x17, 0x07, 0x00,</div><div class='del'>-</div><div class='del'>-	0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,</div><div class='del'>-	0x17, 0x17, 0x04, 0x16, 0x18, 0x16, 0x18, 0x18,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_are_names_equal - compare two Unicode names for equality</div><div class='del'>- * @s1:			name to compare to @s2</div><div class='del'>- * @s1_len:		length in Unicode characters of @s1</div><div class='del'>- * @s2:			name to compare to @s1</div><div class='del'>- * @s2_len:		length in Unicode characters of @s2</div><div class='del'>- * @ic:			ignore case bool</div><div class='del'>- * @upcase:		upcase table (only if @ic == IGNORE_CASE)</div><div class='del'>- * @upcase_size:	length in Unicode characters of @upcase (if present)</div><div class='del'>- *</div><div class='del'>- * Compare the names @s1 and @s2 and return 'true' (1) if the names are</div><div class='del'>- * identical, or 'false' (0) if they are not identical. If @ic is IGNORE_CASE,</div><div class='del'>- * the @upcase table is used to performa a case insensitive comparison.</div><div class='del'>- */</div><div class='del'>-bool ntfs_are_names_equal(const ntfschar *s1, size_t s1_len,</div><div class='del'>-		const ntfschar *s2, size_t s2_len, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_size)</div><div class='del'>-{</div><div class='del'>-	if (s1_len != s2_len)</div><div class='del'>-		return false;</div><div class='del'>-	if (ic == CASE_SENSITIVE)</div><div class='del'>-		return !ntfs_ucsncmp(s1, s2, s1_len);</div><div class='del'>-	return !ntfs_ucsncasecmp(s1, s2, s1_len, upcase, upcase_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_collate_names - collate two Unicode names</div><div class='del'>- * @name1:	first Unicode name to compare</div><div class='del'>- * @name2:	second Unicode name to compare</div><div class='del'>- * @err_val:	if @name1 contains an invalid character return this value</div><div class='del'>- * @ic:		either CASE_SENSITIVE or IGNORE_CASE</div><div class='del'>- * @upcase:	upcase table (ignored if @ic is CASE_SENSITIVE)</div><div class='del'>- * @upcase_len:	upcase table size (ignored if @ic is CASE_SENSITIVE)</div><div class='del'>- *</div><div class='del'>- * ntfs_collate_names collates two Unicode names and returns:</div><div class='del'>- *</div><div class='del'>- *  -1 if the first name collates before the second one,</div><div class='del'>- *   0 if the names match,</div><div class='del'>- *   1 if the second name collates before the first one, or</div><div class='del'>- * @err_val if an invalid character is found in @name1 during the comparison.</div><div class='del'>- *</div><div class='del'>- * The following characters are considered invalid: '"', '*', '&lt;', '&gt;' and '?'.</div><div class='del'>- */</div><div class='del'>-int ntfs_collate_names(const ntfschar *name1, const u32 name1_len,</div><div class='del'>-		const ntfschar *name2, const u32 name2_len,</div><div class='del'>-		const int err_val, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len)</div><div class='del'>-{</div><div class='del'>-	u32 cnt, min_len;</div><div class='del'>-	u16 c1, c2;</div><div class='del'>-</div><div class='del'>-	min_len = name1_len;</div><div class='del'>-	if (name1_len &gt; name2_len)</div><div class='del'>-		min_len = name2_len;</div><div class='del'>-	for (cnt = 0; cnt &lt; min_len; ++cnt) {</div><div class='del'>-		c1 = le16_to_cpu(*name1++);</div><div class='del'>-		c2 = le16_to_cpu(*name2++);</div><div class='del'>-		if (ic) {</div><div class='del'>-			if (c1 &lt; upcase_len)</div><div class='del'>-				c1 = le16_to_cpu(upcase[c1]);</div><div class='del'>-			if (c2 &lt; upcase_len)</div><div class='del'>-				c2 = le16_to_cpu(upcase[c2]);</div><div class='del'>-		}</div><div class='del'>-		if (c1 &lt; 64 &amp;&amp; legal_ansi_char_array[c1] &amp; 8)</div><div class='del'>-			return err_val;</div><div class='del'>-		if (c1 &lt; c2)</div><div class='del'>-			return -1;</div><div class='del'>-		if (c1 &gt; c2)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	if (name1_len &lt; name2_len)</div><div class='del'>-		return -1;</div><div class='del'>-	if (name1_len == name2_len)</div><div class='del'>-		return 0;</div><div class='del'>-	/* name1_len &gt; name2_len */</div><div class='del'>-	c1 = le16_to_cpu(*name1);</div><div class='del'>-	if (c1 &lt; 64 &amp;&amp; legal_ansi_char_array[c1] &amp; 8)</div><div class='del'>-		return err_val;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_ucsncmp - compare two little endian Unicode strings</div><div class='del'>- * @s1:		first string</div><div class='del'>- * @s2:		second string</div><div class='del'>- * @n:		maximum unicode characters to compare</div><div class='del'>- *</div><div class='del'>- * Compare the first @n characters of the Unicode strings @s1 and @s2,</div><div class='del'>- * The strings in little endian format and appropriate le16_to_cpu()</div><div class='del'>- * conversion is performed on non-little endian machines.</div><div class='del'>- *</div><div class='del'>- * The function returns an integer less than, equal to, or greater than zero</div><div class='del'>- * if @s1 (or the first @n Unicode characters thereof) is found, respectively,</div><div class='del'>- * to be less than, to match, or be greater than @s2.</div><div class='del'>- */</div><div class='del'>-int ntfs_ucsncmp(const ntfschar *s1, const ntfschar *s2, size_t n)</div><div class='del'>-{</div><div class='del'>-	u16 c1, c2;</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; ++i) {</div><div class='del'>-		c1 = le16_to_cpu(s1[i]);</div><div class='del'>-		c2 = le16_to_cpu(s2[i]);</div><div class='del'>-		if (c1 &lt; c2)</div><div class='del'>-			return -1;</div><div class='del'>-		if (c1 &gt; c2)</div><div class='del'>-			return 1;</div><div class='del'>-		if (!c1)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_ucsncasecmp - compare two little endian Unicode strings, ignoring case</div><div class='del'>- * @s1:			first string</div><div class='del'>- * @s2:			second string</div><div class='del'>- * @n:			maximum unicode characters to compare</div><div class='del'>- * @upcase:		upcase table</div><div class='del'>- * @upcase_size:	upcase table size in Unicode characters</div><div class='del'>- *</div><div class='del'>- * Compare the first @n characters of the Unicode strings @s1 and @s2,</div><div class='del'>- * ignoring case. The strings in little endian format and appropriate</div><div class='del'>- * le16_to_cpu() conversion is performed on non-little endian machines.</div><div class='del'>- *</div><div class='del'>- * Each character is uppercased using the @upcase table before the comparison.</div><div class='del'>- *</div><div class='del'>- * The function returns an integer less than, equal to, or greater than zero</div><div class='del'>- * if @s1 (or the first @n Unicode characters thereof) is found, respectively,</div><div class='del'>- * to be less than, to match, or be greater than @s2.</div><div class='del'>- */</div><div class='del'>-int ntfs_ucsncasecmp(const ntfschar *s1, const ntfschar *s2, size_t n,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_size)</div><div class='del'>-{</div><div class='del'>-	size_t i;</div><div class='del'>-	u16 c1, c2;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; ++i) {</div><div class='del'>-		if ((c1 = le16_to_cpu(s1[i])) &lt; upcase_size)</div><div class='del'>-			c1 = le16_to_cpu(upcase[c1]);</div><div class='del'>-		if ((c2 = le16_to_cpu(s2[i])) &lt; upcase_size)</div><div class='del'>-			c2 = le16_to_cpu(upcase[c2]);</div><div class='del'>-		if (c1 &lt; c2)</div><div class='del'>-			return -1;</div><div class='del'>-		if (c1 &gt; c2)</div><div class='del'>-			return 1;</div><div class='del'>-		if (!c1)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ntfs_upcase_name(ntfschar *name, u32 name_len, const ntfschar *upcase,</div><div class='del'>-		const u32 upcase_len)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	u16 u;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; name_len; i++)</div><div class='del'>-		if ((u = le16_to_cpu(name[i])) &lt; upcase_len)</div><div class='del'>-			name[i] = upcase[u];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ntfs_file_upcase_value(FILE_NAME_ATTR *file_name_attr,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len)</div><div class='del'>-{</div><div class='del'>-	ntfs_upcase_name((ntfschar*)&amp;file_name_attr-&gt;file_name,</div><div class='del'>-			file_name_attr-&gt;file_name_length, upcase, upcase_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ntfs_file_compare_values(FILE_NAME_ATTR *file_name_attr1,</div><div class='del'>-		FILE_NAME_ATTR *file_name_attr2,</div><div class='del'>-		const int err_val, const IGNORE_CASE_BOOL ic,</div><div class='del'>-		const ntfschar *upcase, const u32 upcase_len)</div><div class='del'>-{</div><div class='del'>-	return ntfs_collate_names((ntfschar*)&amp;file_name_attr1-&gt;file_name,</div><div class='del'>-			file_name_attr1-&gt;file_name_length,</div><div class='del'>-			(ntfschar*)&amp;file_name_attr2-&gt;file_name,</div><div class='del'>-			file_name_attr2-&gt;file_name_length,</div><div class='del'>-			err_val, ic, upcase, upcase_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_nlstoucs - convert NLS string to little endian Unicode string</div><div class='del'>- * @vol:	ntfs volume which we are working with</div><div class='del'>- * @ins:	input NLS string buffer</div><div class='del'>- * @ins_len:	length of input string in bytes</div><div class='del'>- * @outs:	on return contains the allocated output Unicode string buffer</div><div class='del'>- *</div><div class='del'>- * Convert the input string @ins, which is in whatever format the loaded NLS</div><div class='del'>- * map dictates, into a little endian, 2-byte Unicode string.</div><div class='del'>- *</div><div class='del'>- * This function allocates the string and the caller is responsible for</div><div class='del'>- * calling kmem_cache_free(ntfs_name_cache, *@outs); when finished with it.</div><div class='del'>- *</div><div class='del'>- * On success the function returns the number of Unicode characters written to</div><div class='del'>- * the output string *@outs (&gt;= 0), not counting the terminating Unicode NULL</div><div class='del'>- * character. *@outs is set to the allocated output string buffer.</div><div class='del'>- *</div><div class='del'>- * On error, a negative number corresponding to the error code is returned. In</div><div class='del'>- * that case the output string is not allocated. Both *@outs and *@outs_len</div><div class='del'>- * are then undefined.</div><div class='del'>- *</div><div class='del'>- * This might look a bit odd due to fast path optimization...</div><div class='del'>- */</div><div class='del'>-int ntfs_nlstoucs(const ntfs_volume *vol, const char *ins,</div><div class='del'>-		const int ins_len, ntfschar **outs)</div><div class='del'>-{</div><div class='del'>-	struct nls_table *nls = vol-&gt;nls_map;</div><div class='del'>-	ntfschar *ucs;</div><div class='del'>-	wchar_t wc;</div><div class='del'>-	int i, o, wc_len;</div><div class='del'>-</div><div class='del'>-	/* We do not trust outside sources. */</div><div class='del'>-	if (likely(ins)) {</div><div class='del'>-		ucs = kmem_cache_alloc(ntfs_name_cache, GFP_NOFS);</div><div class='del'>-		if (likely(ucs)) {</div><div class='del'>-			for (i = o = 0; i &lt; ins_len; i += wc_len) {</div><div class='del'>-				wc_len = nls-&gt;char2uni(ins + i, ins_len - i,</div><div class='del'>-						&amp;wc);</div><div class='del'>-				if (likely(wc_len &gt;= 0 &amp;&amp;</div><div class='del'>-						o &lt; NTFS_MAX_NAME_LEN)) {</div><div class='del'>-					if (likely(wc)) {</div><div class='del'>-						ucs[o++] = cpu_to_le16(wc);</div><div class='del'>-						continue;</div><div class='del'>-					} /* else if (!wc) */</div><div class='del'>-					break;</div><div class='del'>-				} /* else if (wc_len &lt; 0 ||</div><div class='del'>-						o &gt;= NTFS_MAX_NAME_LEN) */</div><div class='del'>-				goto name_err;</div><div class='del'>-			}</div><div class='del'>-			ucs[o] = 0;</div><div class='del'>-			*outs = ucs;</div><div class='del'>-			return o;</div><div class='del'>-		} /* else if (!ucs) */</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Failed to allocate buffer for converted "</div><div class='del'>-				"name from ntfs_name_cache.");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	} /* else if (!ins) */</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Received NULL pointer.");</div><div class='del'>-	return -EINVAL;</div><div class='del'>-name_err:</div><div class='del'>-	kmem_cache_free(ntfs_name_cache, ucs);</div><div class='del'>-	if (wc_len &lt; 0) {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Name using character set %s contains "</div><div class='del'>-				"characters that cannot be converted to "</div><div class='del'>-				"Unicode.", nls-&gt;charset);</div><div class='del'>-		i = -EILSEQ;</div><div class='del'>-	} else /* if (o &gt;= NTFS_MAX_NAME_LEN) */ {</div><div class='del'>-		ntfs_error(vol-&gt;sb, "Name is too long (maximum length for a "</div><div class='del'>-				"name on NTFS is %d Unicode characters.",</div><div class='del'>-				NTFS_MAX_NAME_LEN);</div><div class='del'>-		i = -ENAMETOOLONG;</div><div class='del'>-	}</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_ucstonls - convert little endian Unicode string to NLS string</div><div class='del'>- * @vol:	ntfs volume which we are working with</div><div class='del'>- * @ins:	input Unicode string buffer</div><div class='del'>- * @ins_len:	length of input string in Unicode characters</div><div class='del'>- * @outs:	on return contains the (allocated) output NLS string buffer</div><div class='del'>- * @outs_len:	length of output string buffer in bytes</div><div class='del'>- *</div><div class='del'>- * Convert the input little endian, 2-byte Unicode string @ins, of length</div><div class='del'>- * @ins_len into the string format dictated by the loaded NLS.</div><div class='del'>- *</div><div class='del'>- * If *@outs is NULL, this function allocates the string and the caller is</div><div class='del'>- * responsible for calling kfree(*@outs); when finished with it. In this case</div><div class='del'>- * @outs_len is ignored and can be 0.</div><div class='del'>- *</div><div class='del'>- * On success the function returns the number of bytes written to the output</div><div class='del'>- * string *@outs (&gt;= 0), not counting the terminating NULL byte. If the output</div><div class='del'>- * string buffer was allocated, *@outs is set to it.</div><div class='del'>- *</div><div class='del'>- * On error, a negative number corresponding to the error code is returned. In</div><div class='del'>- * that case the output string is not allocated. The contents of *@outs are</div><div class='del'>- * then undefined.</div><div class='del'>- *</div><div class='del'>- * This might look a bit odd due to fast path optimization...</div><div class='del'>- */</div><div class='del'>-int ntfs_ucstonls(const ntfs_volume *vol, const ntfschar *ins,</div><div class='del'>-		const int ins_len, unsigned char **outs, int outs_len)</div><div class='del'>-{</div><div class='del'>-	struct nls_table *nls = vol-&gt;nls_map;</div><div class='del'>-	unsigned char *ns;</div><div class='del'>-	int i, o, ns_len, wc;</div><div class='del'>-</div><div class='del'>-	/* We don't trust outside sources. */</div><div class='del'>-	if (ins) {</div><div class='del'>-		ns = *outs;</div><div class='del'>-		ns_len = outs_len;</div><div class='del'>-		if (ns &amp;&amp; !ns_len) {</div><div class='del'>-			wc = -ENAMETOOLONG;</div><div class='del'>-			goto conversion_err;</div><div class='del'>-		}</div><div class='del'>-		if (!ns) {</div><div class='del'>-			ns_len = ins_len * NLS_MAX_CHARSET_SIZE;</div><div class='del'>-			ns = kmalloc(ns_len + 1, GFP_NOFS);</div><div class='del'>-			if (!ns)</div><div class='del'>-				goto mem_err_out;</div><div class='del'>-		}</div><div class='del'>-		for (i = o = 0; i &lt; ins_len; i++) {</div><div class='del'>-retry:			wc = nls-&gt;uni2char(le16_to_cpu(ins[i]), ns + o,</div><div class='del'>-					ns_len - o);</div><div class='del'>-			if (wc &gt; 0) {</div><div class='del'>-				o += wc;</div><div class='del'>-				continue;</div><div class='del'>-			} else if (!wc)</div><div class='del'>-				break;</div><div class='del'>-			else if (wc == -ENAMETOOLONG &amp;&amp; ns != *outs) {</div><div class='del'>-				unsigned char *tc;</div><div class='del'>-				/* Grow in multiples of 64 bytes. */</div><div class='del'>-				tc = kmalloc((ns_len + 64) &amp;</div><div class='del'>-						~63, GFP_NOFS);</div><div class='del'>-				if (tc) {</div><div class='del'>-					memcpy(tc, ns, ns_len);</div><div class='del'>-					ns_len = ((ns_len + 64) &amp; ~63) - 1;</div><div class='del'>-					kfree(ns);</div><div class='del'>-					ns = tc;</div><div class='del'>-					goto retry;</div><div class='del'>-				} /* No memory so goto conversion_error; */</div><div class='del'>-			} /* wc &lt; 0, real error. */</div><div class='del'>-			goto conversion_err;</div><div class='del'>-		}</div><div class='del'>-		ns[o] = 0;</div><div class='del'>-		*outs = ns;</div><div class='del'>-		return o;</div><div class='del'>-	} /* else (!ins) */</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Received NULL pointer.");</div><div class='del'>-	return -EINVAL;</div><div class='del'>-conversion_err:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Unicode name contains characters that cannot be "</div><div class='del'>-			"converted to character set %s.  You might want to "</div><div class='del'>-			"try to use the mount option nls=utf8.", nls-&gt;charset);</div><div class='del'>-	if (ns != *outs)</div><div class='del'>-		kfree(ns);</div><div class='del'>-	if (wc != -ENAMETOOLONG)</div><div class='del'>-		wc = -EILSEQ;</div><div class='del'>-	return wc;</div><div class='del'>-mem_err_out:</div><div class='del'>-	ntfs_error(vol-&gt;sb, "Failed to allocate name!");</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/ntfs/upcase.c b/fs/ntfs/upcase.c<br/>deleted file mode 100644<br/>index 4ebe84a78dea..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/upcase.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/upcase.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * upcase.c - Generate the full NTFS Unicode upcase table in little endian.</div><div class='del'>- *	      Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001 Richard Russon &lt;ntfs@flatcap.org&gt;</div><div class='del'>- * Copyright (c) 2001-2006 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "malloc.h"</div><div class='del'>-#include "ntfs.h"</div><div class='del'>-</div><div class='del'>-ntfschar *generate_default_upcase(void)</div><div class='del'>-{</div><div class='del'>-	static const int uc_run_table[][3] = { /* Start, End, Add */</div><div class='del'>-	{0x0061, 0x007B,  -32}, {0x0451, 0x045D, -80}, {0x1F70, 0x1F72,  74},</div><div class='del'>-	{0x00E0, 0x00F7,  -32}, {0x045E, 0x0460, -80}, {0x1F72, 0x1F76,  86},</div><div class='del'>-	{0x00F8, 0x00FF,  -32}, {0x0561, 0x0587, -48}, {0x1F76, 0x1F78, 100},</div><div class='del'>-	{0x0256, 0x0258, -205}, {0x1F00, 0x1F08,   8}, {0x1F78, 0x1F7A, 128},</div><div class='del'>-	{0x028A, 0x028C, -217}, {0x1F10, 0x1F16,   8}, {0x1F7A, 0x1F7C, 112},</div><div class='del'>-	{0x03AC, 0x03AD,  -38}, {0x1F20, 0x1F28,   8}, {0x1F7C, 0x1F7E, 126},</div><div class='del'>-	{0x03AD, 0x03B0,  -37}, {0x1F30, 0x1F38,   8}, {0x1FB0, 0x1FB2,   8},</div><div class='del'>-	{0x03B1, 0x03C2,  -32}, {0x1F40, 0x1F46,   8}, {0x1FD0, 0x1FD2,   8},</div><div class='del'>-	{0x03C2, 0x03C3,  -31}, {0x1F51, 0x1F52,   8}, {0x1FE0, 0x1FE2,   8},</div><div class='del'>-	{0x03C3, 0x03CC,  -32}, {0x1F53, 0x1F54,   8}, {0x1FE5, 0x1FE6,   7},</div><div class='del'>-	{0x03CC, 0x03CD,  -64}, {0x1F55, 0x1F56,   8}, {0x2170, 0x2180, -16},</div><div class='del'>-	{0x03CD, 0x03CF,  -63}, {0x1F57, 0x1F58,   8}, {0x24D0, 0x24EA, -26},</div><div class='del'>-	{0x0430, 0x0450,  -32}, {0x1F60, 0x1F68,   8}, {0xFF41, 0xFF5B, -32},</div><div class='del'>-	{0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static const int uc_dup_table[][2] = { /* Start, End */</div><div class='del'>-	{0x0100, 0x012F}, {0x01A0, 0x01A6}, {0x03E2, 0x03EF}, {0x04CB, 0x04CC},</div><div class='del'>-	{0x0132, 0x0137}, {0x01B3, 0x01B7}, {0x0460, 0x0481}, {0x04D0, 0x04EB},</div><div class='del'>-	{0x0139, 0x0149}, {0x01CD, 0x01DD}, {0x0490, 0x04BF}, {0x04EE, 0x04F5},</div><div class='del'>-	{0x014A, 0x0178}, {0x01DE, 0x01EF}, {0x04BF, 0x04BF}, {0x04F8, 0x04F9},</div><div class='del'>-	{0x0179, 0x017E}, {0x01F4, 0x01F5}, {0x04C1, 0x04C4}, {0x1E00, 0x1E95},</div><div class='del'>-	{0x018B, 0x018B}, {0x01FA, 0x0218}, {0x04C7, 0x04C8}, {0x1EA0, 0x1EF9},</div><div class='del'>-	{0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static const int uc_word_table[][2] = { /* Offset, Value */</div><div class='del'>-	{0x00FF, 0x0178}, {0x01AD, 0x01AC}, {0x01F3, 0x01F1}, {0x0269, 0x0196},</div><div class='del'>-	{0x0183, 0x0182}, {0x01B0, 0x01AF}, {0x0253, 0x0181}, {0x026F, 0x019C},</div><div class='del'>-	{0x0185, 0x0184}, {0x01B9, 0x01B8}, {0x0254, 0x0186}, {0x0272, 0x019D},</div><div class='del'>-	{0x0188, 0x0187}, {0x01BD, 0x01BC}, {0x0259, 0x018F}, {0x0275, 0x019F},</div><div class='del'>-	{0x018C, 0x018B}, {0x01C6, 0x01C4}, {0x025B, 0x0190}, {0x0283, 0x01A9},</div><div class='del'>-	{0x0192, 0x0191}, {0x01C9, 0x01C7}, {0x0260, 0x0193}, {0x0288, 0x01AE},</div><div class='del'>-	{0x0199, 0x0198}, {0x01CC, 0x01CA}, {0x0263, 0x0194}, {0x0292, 0x01B7},</div><div class='del'>-	{0x01A8, 0x01A7}, {0x01DD, 0x018E}, {0x0268, 0x0197},</div><div class='del'>-	{0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	int i, r;</div><div class='del'>-	ntfschar *uc;</div><div class='del'>-</div><div class='del'>-	uc = ntfs_malloc_nofs(default_upcase_len * sizeof(ntfschar));</div><div class='del'>-	if (!uc)</div><div class='del'>-		return uc;</div><div class='del'>-	memset(uc, 0, default_upcase_len * sizeof(ntfschar));</div><div class='del'>-	/* Generate the little endian Unicode upcase table used by ntfs. */</div><div class='del'>-	for (i = 0; i &lt; default_upcase_len; i++)</div><div class='del'>-		uc[i] = cpu_to_le16(i);</div><div class='del'>-	for (r = 0; uc_run_table[r][0]; r++)</div><div class='del'>-		for (i = uc_run_table[r][0]; i &lt; uc_run_table[r][1]; i++)</div><div class='del'>-			le16_add_cpu(&amp;uc[i], uc_run_table[r][2]);</div><div class='del'>-	for (r = 0; uc_dup_table[r][0]; r++)</div><div class='del'>-		for (i = uc_dup_table[r][0]; i &lt; uc_dup_table[r][1]; i += 2)</div><div class='del'>-			le16_add_cpu(&amp;uc[i + 1], -1);</div><div class='del'>-	for (r = 0; uc_word_table[r][0]; r++)</div><div class='del'>-		uc[uc_word_table[r][0]] = cpu_to_le16(uc_word_table[r][1]);</div><div class='del'>-	return uc;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/ntfs/usnjrnl.c b/fs/ntfs/usnjrnl.c<br/>deleted file mode 100644<br/>index 9097a0b4ef25..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/usnjrnl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/usnjrnl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * usnjrnl.h - NTFS kernel transaction log ($UsnJrnl) handling.  Part of the</div><div class='del'>- *	       Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#include "aops.h"</div><div class='del'>-#include "debug.h"</div><div class='del'>-#include "endian.h"</div><div class='del'>-#include "time.h"</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "usnjrnl.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ntfs_stamp_usnjrnl - stamp the transaction log ($UsnJrnl) on an ntfs volume</div><div class='del'>- * @vol:	ntfs volume on which to stamp the transaction log</div><div class='del'>- *</div><div class='del'>- * Stamp the transaction log ($UsnJrnl) on the ntfs volume @vol and return</div><div class='del'>- * 'true' on success and 'false' on error.</div><div class='del'>- *</div><div class='del'>- * This function assumes that the transaction log has already been loaded and</div><div class='del'>- * consistency checked by a call to fs/ntfs/super.c::load_and_init_usnjrnl().</div><div class='del'>- */</div><div class='del'>-bool ntfs_stamp_usnjrnl(ntfs_volume *vol)</div><div class='del'>-{</div><div class='del'>-	ntfs_debug("Entering.");</div><div class='del'>-	if (likely(!NVolUsnJrnlStamped(vol))) {</div><div class='del'>-		sle64 stamp;</div><div class='del'>-		struct page *page;</div><div class='del'>-		USN_HEADER *uh;</div><div class='del'>-</div><div class='del'>-		page = ntfs_map_page(vol-&gt;usnjrnl_max_ino-&gt;i_mapping, 0);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			ntfs_error(vol-&gt;sb, "Failed to read from "</div><div class='del'>-					"$UsnJrnl/$DATA/$Max attribute.");</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-		uh = (USN_HEADER*)page_address(page);</div><div class='del'>-		stamp = get_current_ntfs_time();</div><div class='del'>-		ntfs_debug("Stamping transaction log ($UsnJrnl): old "</div><div class='del'>-				"journal_id 0x%llx, old lowest_valid_usn "</div><div class='del'>-				"0x%llx, new journal_id 0x%llx, new "</div><div class='del'>-				"lowest_valid_usn 0x%llx.",</div><div class='del'>-				(long long)sle64_to_cpu(uh-&gt;journal_id),</div><div class='del'>-				(long long)sle64_to_cpu(uh-&gt;lowest_valid_usn),</div><div class='del'>-				(long long)sle64_to_cpu(stamp),</div><div class='del'>-				i_size_read(vol-&gt;usnjrnl_j_ino));</div><div class='del'>-		uh-&gt;lowest_valid_usn =</div><div class='del'>-				cpu_to_sle64(i_size_read(vol-&gt;usnjrnl_j_ino));</div><div class='del'>-		uh-&gt;journal_id = stamp;</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		set_page_dirty(page);</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-		/* Set the flag so we do not have to do it again on remount. */</div><div class='del'>-		NVolSetUsnJrnlStamped(vol);</div><div class='del'>-	}</div><div class='del'>-	ntfs_debug("Done.");</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='head'>diff --git a/fs/ntfs/usnjrnl.h b/fs/ntfs/usnjrnl.h<br/>deleted file mode 100644<br/>index 85f531b59395..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/usnjrnl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/usnjrnl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,191 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * usnjrnl.h - Defines for NTFS kernel transaction log ($UsnJrnl) handling.</div><div class='del'>- *	       Part of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005 Anton Altaparmakov</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_USNJRNL_H</div><div class='del'>-#define _LINUX_NTFS_USNJRNL_H</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "endian.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "volume.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Transaction log ($UsnJrnl) organization:</div><div class='del'>- *</div><div class='del'>- * The transaction log records whenever a file is modified in any way.  So for</div><div class='del'>- * example it will record that file "blah" was written to at a particular time</div><div class='del'>- * but not what was written.  If will record that a file was deleted or</div><div class='del'>- * created, that a file was truncated, etc.  See below for all the reason</div><div class='del'>- * codes used.</div><div class='del'>- *</div><div class='del'>- * The transaction log is in the $Extend directory which is in the root</div><div class='del'>- * directory of each volume.  If it is not present it means transaction</div><div class='del'>- * logging is disabled.  If it is present it means transaction logging is</div><div class='del'>- * either enabled or in the process of being disabled in which case we can</div><div class='del'>- * ignore it as it will go away as soon as Windows gets its hands on it.</div><div class='del'>- *</div><div class='del'>- * To determine whether the transaction logging is enabled or in the process</div><div class='del'>- * of being disabled, need to check the volume flags in the</div><div class='del'>- * $VOLUME_INFORMATION attribute in the $Volume system file (which is present</div><div class='del'>- * in the root directory and has a fixed mft record number, see layout.h).</div><div class='del'>- * If the flag VOLUME_DELETE_USN_UNDERWAY is set it means the transaction log</div><div class='del'>- * is in the process of being disabled and if this flag is clear it means the</div><div class='del'>- * transaction log is enabled.</div><div class='del'>- *</div><div class='del'>- * The transaction log consists of two parts; the $DATA/$Max attribute as well</div><div class='del'>- * as the $DATA/$J attribute.  $Max is a header describing the transaction</div><div class='del'>- * log whilst $J is the transaction log data itself as a sequence of variable</div><div class='del'>- * sized USN_RECORDs (see below for all the structures).</div><div class='del'>- *</div><div class='del'>- * We do not care about transaction logging at this point in time but we still</div><div class='del'>- * need to let windows know that the transaction log is out of date.  To do</div><div class='del'>- * this we need to stamp the transaction log.  This involves setting the</div><div class='del'>- * lowest_valid_usn field in the $DATA/$Max attribute to the usn to be used</div><div class='del'>- * for the next added USN_RECORD to the $DATA/$J attribute as well as</div><div class='del'>- * generating a new journal_id in $DATA/$Max.</div><div class='del'>- *</div><div class='del'>- * The journal_id is as of the current version (2.0) of the transaction log</div><div class='del'>- * simply the 64-bit timestamp of when the journal was either created or last</div><div class='del'>- * stamped.</div><div class='del'>- *</div><div class='del'>- * To determine the next usn there are two ways.  The first is to parse</div><div class='del'>- * $DATA/$J and to find the last USN_RECORD in it and to add its record_length</div><div class='del'>- * to its usn (which is the byte offset in the $DATA/$J attribute).  The</div><div class='del'>- * second is simply to take the data size of the attribute.  Since the usns</div><div class='del'>- * are simply byte offsets into $DATA/$J, this is exactly the next usn.  For</div><div class='del'>- * obvious reasons we use the second method as it is much simpler and faster.</div><div class='del'>- *</div><div class='del'>- * As an aside, note that to actually disable the transaction log, one would</div><div class='del'>- * need to set the VOLUME_DELETE_USN_UNDERWAY flag (see above), then go</div><div class='del'>- * through all the mft records on the volume and set the usn field in their</div><div class='del'>- * $STANDARD_INFORMATION attribute to zero.  Once that is done, one would need</div><div class='del'>- * to delete the transaction log file, i.e. \$Extent\$UsnJrnl, and finally,</div><div class='del'>- * one would need to clear the VOLUME_DELETE_USN_UNDERWAY flag.</div><div class='del'>- *</div><div class='del'>- * Note that if a volume is unmounted whilst the transaction log is being</div><div class='del'>- * disabled, the process will continue the next time the volume is mounted.</div><div class='del'>- * This is why we can safely mount read-write when we see a transaction log</div><div class='del'>- * in the process of being deleted.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Some $UsnJrnl related constants. */</div><div class='del'>-#define UsnJrnlMajorVer		2</div><div class='del'>-#define UsnJrnlMinorVer		0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * $DATA/$Max attribute.  This is (always?) resident and has a fixed size of</div><div class='del'>- * 32 bytes.  It contains the header describing the transaction log.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*   0*/sle64 maximum_size;	/* The maximum on-disk size of the $DATA/$J</div><div class='del'>-				   attribute. */</div><div class='del'>-/*   8*/sle64 allocation_delta;	/* Number of bytes by which to increase the</div><div class='del'>-				   size of the $DATA/$J attribute. */</div><div class='del'>-/*0x10*/sle64 journal_id;	/* Current id of the transaction log. */</div><div class='del'>-/*0x18*/leUSN lowest_valid_usn;	/* Lowest valid usn in $DATA/$J for the</div><div class='del'>-				   current journal_id. */</div><div class='del'>-/* sizeof() = 32 (0x20) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) USN_HEADER;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reason flags (32-bit).  Cumulative flags describing the change(s) to the</div><div class='del'>- * file since it was last opened.  I think the names speak for themselves but</div><div class='del'>- * if you disagree check out the descriptions in the Linux NTFS project NTFS</div><div class='del'>- * documentation: http://www.linux-ntfs.org/</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	USN_REASON_DATA_OVERWRITE	= cpu_to_le32(0x00000001),</div><div class='del'>-	USN_REASON_DATA_EXTEND		= cpu_to_le32(0x00000002),</div><div class='del'>-	USN_REASON_DATA_TRUNCATION	= cpu_to_le32(0x00000004),</div><div class='del'>-	USN_REASON_NAMED_DATA_OVERWRITE	= cpu_to_le32(0x00000010),</div><div class='del'>-	USN_REASON_NAMED_DATA_EXTEND	= cpu_to_le32(0x00000020),</div><div class='del'>-	USN_REASON_NAMED_DATA_TRUNCATION= cpu_to_le32(0x00000040),</div><div class='del'>-	USN_REASON_FILE_CREATE		= cpu_to_le32(0x00000100),</div><div class='del'>-	USN_REASON_FILE_DELETE		= cpu_to_le32(0x00000200),</div><div class='del'>-	USN_REASON_EA_CHANGE		= cpu_to_le32(0x00000400),</div><div class='del'>-	USN_REASON_SECURITY_CHANGE	= cpu_to_le32(0x00000800),</div><div class='del'>-	USN_REASON_RENAME_OLD_NAME	= cpu_to_le32(0x00001000),</div><div class='del'>-	USN_REASON_RENAME_NEW_NAME	= cpu_to_le32(0x00002000),</div><div class='del'>-	USN_REASON_INDEXABLE_CHANGE	= cpu_to_le32(0x00004000),</div><div class='del'>-	USN_REASON_BASIC_INFO_CHANGE	= cpu_to_le32(0x00008000),</div><div class='del'>-	USN_REASON_HARD_LINK_CHANGE	= cpu_to_le32(0x00010000),</div><div class='del'>-	USN_REASON_COMPRESSION_CHANGE	= cpu_to_le32(0x00020000),</div><div class='del'>-	USN_REASON_ENCRYPTION_CHANGE	= cpu_to_le32(0x00040000),</div><div class='del'>-	USN_REASON_OBJECT_ID_CHANGE	= cpu_to_le32(0x00080000),</div><div class='del'>-	USN_REASON_REPARSE_POINT_CHANGE	= cpu_to_le32(0x00100000),</div><div class='del'>-	USN_REASON_STREAM_CHANGE	= cpu_to_le32(0x00200000),</div><div class='del'>-	USN_REASON_CLOSE		= cpu_to_le32(0x80000000),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 USN_REASON_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Source info flags (32-bit).  Information about the source of the change(s)</div><div class='del'>- * to the file.  For detailed descriptions of what these mean, see the Linux</div><div class='del'>- * NTFS project NTFS documentation:</div><div class='del'>- *	http://www.linux-ntfs.org/</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	USN_SOURCE_DATA_MANAGEMENT	  = cpu_to_le32(0x00000001),</div><div class='del'>-	USN_SOURCE_AUXILIARY_DATA	  = cpu_to_le32(0x00000002),</div><div class='del'>-	USN_SOURCE_REPLICATION_MANAGEMENT = cpu_to_le32(0x00000004),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef le32 USN_SOURCE_INFO_FLAGS;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * $DATA/$J attribute.  This is always non-resident, is marked as sparse, and</div><div class='del'>- * is of variabled size.  It consists of a sequence of variable size</div><div class='del'>- * USN_RECORDS.  The minimum allocated_size is allocation_delta as</div><div class='del'>- * specified in $DATA/$Max.  When the maximum_size specified in $DATA/$Max is</div><div class='del'>- * exceeded by more than allocation_delta bytes, allocation_delta bytes are</div><div class='del'>- * allocated and appended to the $DATA/$J attribute and an equal number of</div><div class='del'>- * bytes at the beginning of the attribute are freed and made sparse.  Note the</div><div class='del'>- * making sparse only happens at volume checkpoints and hence the actual</div><div class='del'>- * $DATA/$J size can exceed maximum_size + allocation_delta temporarily.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-/*Ofs*/</div><div class='del'>-/*   0*/le32 length;		/* Byte size of this record (8-byte</div><div class='del'>-				   aligned). */</div><div class='del'>-/*   4*/le16 major_ver;		/* Major version of the transaction log used</div><div class='del'>-				   for this record. */</div><div class='del'>-/*   6*/le16 minor_ver;		/* Minor version of the transaction log used</div><div class='del'>-				   for this record. */</div><div class='del'>-/*   8*/leMFT_REF mft_reference;/* The mft reference of the file (or</div><div class='del'>-				   directory) described by this record. */</div><div class='del'>-/*0x10*/leMFT_REF parent_directory;/* The mft reference of the parent</div><div class='del'>-				   directory of the file described by this</div><div class='del'>-				   record. */</div><div class='del'>-/*0x18*/leUSN usn;		/* The usn of this record.  Equals the offset</div><div class='del'>-				   within the $DATA/$J attribute. */</div><div class='del'>-/*0x20*/sle64 time;		/* Time when this record was created. */</div><div class='del'>-/*0x28*/USN_REASON_FLAGS reason;/* Reason flags (see above). */</div><div class='del'>-/*0x2c*/USN_SOURCE_INFO_FLAGS source_info;/* Source info flags (see above). */</div><div class='del'>-/*0x30*/le32 security_id;	/* File security_id copied from</div><div class='del'>-				   $STANDARD_INFORMATION. */</div><div class='del'>-/*0x34*/FILE_ATTR_FLAGS file_attributes;	/* File attributes copied from</div><div class='del'>-				   $STANDARD_INFORMATION or $FILE_NAME (not</div><div class='del'>-				   sure which). */</div><div class='del'>-/*0x38*/le16 file_name_size;	/* Size of the file name in bytes. */</div><div class='del'>-/*0x3a*/le16 file_name_offset;	/* Offset to the file name in bytes from the</div><div class='del'>-				   start of this record. */</div><div class='del'>-/*0x3c*/ntfschar file_name[0];	/* Use when creating only.  When reading use</div><div class='del'>-				   file_name_offset to determine the location</div><div class='del'>-				   of the name. */</div><div class='del'>-/* sizeof() = 60 (0x3c) bytes */</div><div class='del'>-} __attribute__ ((__packed__)) USN_RECORD;</div><div class='del'>-</div><div class='del'>-extern bool ntfs_stamp_usnjrnl(ntfs_volume *vol);</div><div class='del'>-</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_USNJRNL_H */</div><div class='head'>diff --git a/fs/ntfs/volume.h b/fs/ntfs/volume.h<br/>deleted file mode 100644<br/>index 930a9ae8a053..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs/volume.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs/volume.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,164 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * volume.h - Defines for volume structures in NTFS Linux kernel driver. Part</div><div class='del'>- *	      of the Linux-NTFS project.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2001-2006 Anton Altaparmakov</div><div class='del'>- * Copyright (c) 2002 Richard Russon</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_NTFS_VOLUME_H</div><div class='del'>-#define _LINUX_NTFS_VOLUME_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;linux/uidgid.h&gt;</div><div class='del'>-</div><div class='del'>-#include "types.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The NTFS in memory super block structure.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Reorder to have commonly used together element within the</div><div class='del'>-	 * same cache line, aiming at a cache line size of 32 bytes. Aim for</div><div class='del'>-	 * 64 bytes for less commonly used together elements. Put most commonly</div><div class='del'>-	 * used elements to front of structure. Obviously do this only when the</div><div class='del'>-	 * structure has stabilized... (AIA)</div><div class='del'>-	 */</div><div class='del'>-	/* Device specifics. */</div><div class='del'>-	struct super_block *sb;		/* Pointer back to the super_block. */</div><div class='del'>-	LCN nr_blocks;			/* Number of sb-&gt;s_blocksize bytes</div><div class='del'>-					   sized blocks on the device. */</div><div class='del'>-	/* Configuration provided by user at mount time. */</div><div class='del'>-	unsigned long flags;		/* Miscellaneous flags, see below. */</div><div class='del'>-	kuid_t uid;			/* uid that files will be mounted as. */</div><div class='del'>-	kgid_t gid;			/* gid that files will be mounted as. */</div><div class='del'>-	umode_t fmask;			/* The mask for file permissions. */</div><div class='del'>-	umode_t dmask;			/* The mask for directory</div><div class='del'>-					   permissions. */</div><div class='del'>-	u8 mft_zone_multiplier;		/* Initial mft zone multiplier. */</div><div class='del'>-	u8 on_errors;			/* What to do on filesystem errors. */</div><div class='del'>-	/* NTFS bootsector provided information. */</div><div class='del'>-	u16 sector_size;		/* in bytes */</div><div class='del'>-	u8 sector_size_bits;		/* log2(sector_size) */</div><div class='del'>-	u32 cluster_size;		/* in bytes */</div><div class='del'>-	u32 cluster_size_mask;		/* cluster_size - 1 */</div><div class='del'>-	u8 cluster_size_bits;		/* log2(cluster_size) */</div><div class='del'>-	u32 mft_record_size;		/* in bytes */</div><div class='del'>-	u32 mft_record_size_mask;	/* mft_record_size - 1 */</div><div class='del'>-	u8 mft_record_size_bits;	/* log2(mft_record_size) */</div><div class='del'>-	u32 index_record_size;		/* in bytes */</div><div class='del'>-	u32 index_record_size_mask;	/* index_record_size - 1 */</div><div class='del'>-	u8 index_record_size_bits;	/* log2(index_record_size) */</div><div class='del'>-	LCN nr_clusters;		/* Volume size in clusters == number of</div><div class='del'>-					   bits in lcn bitmap. */</div><div class='del'>-	LCN mft_lcn;			/* Cluster location of mft data. */</div><div class='del'>-	LCN mftmirr_lcn;		/* Cluster location of copy of mft. */</div><div class='del'>-	u64 serial_no;			/* The volume serial number. */</div><div class='del'>-	/* Mount specific NTFS information. */</div><div class='del'>-	u32 upcase_len;			/* Number of entries in upcase[]. */</div><div class='del'>-	ntfschar *upcase;		/* The upcase table. */</div><div class='del'>-</div><div class='del'>-	s32 attrdef_size;		/* Size of the attribute definition</div><div class='del'>-					   table in bytes. */</div><div class='del'>-	ATTR_DEF *attrdef;		/* Table of attribute definitions.</div><div class='del'>-					   Obtained from FILE_AttrDef. */</div><div class='del'>-</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/* Variables used by the cluster and mft allocators. */</div><div class='del'>-	s64 mft_data_pos;		/* Mft record number at which to</div><div class='del'>-					   allocate the next mft record. */</div><div class='del'>-	LCN mft_zone_start;		/* First cluster of the mft zone. */</div><div class='del'>-	LCN mft_zone_end;		/* First cluster beyond the mft zone. */</div><div class='del'>-	LCN mft_zone_pos;		/* Current position in the mft zone. */</div><div class='del'>-	LCN data1_zone_pos;		/* Current position in the first data</div><div class='del'>-					   zone. */</div><div class='del'>-	LCN data2_zone_pos;		/* Current position in the second data</div><div class='del'>-					   zone. */</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	struct inode *mft_ino;		/* The VFS inode of $MFT. */</div><div class='del'>-</div><div class='del'>-	struct inode *mftbmp_ino;	/* Attribute inode for $MFT/$BITMAP. */</div><div class='del'>-	struct rw_semaphore mftbmp_lock; /* Lock for serializing accesses to the</div><div class='del'>-					    mft record bitmap ($MFT/$BITMAP). */</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	struct inode *mftmirr_ino;	/* The VFS inode of $MFTMirr. */</div><div class='del'>-	int mftmirr_size;		/* Size of mft mirror in mft records. */</div><div class='del'>-</div><div class='del'>-	struct inode *logfile_ino;	/* The VFS inode of $LogFile. */</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-</div><div class='del'>-	struct inode *lcnbmp_ino;	/* The VFS inode of $Bitmap. */</div><div class='del'>-	struct rw_semaphore lcnbmp_lock; /* Lock for serializing accesses to the</div><div class='del'>-					    cluster bitmap ($Bitmap/$DATA). */</div><div class='del'>-</div><div class='del'>-	struct inode *vol_ino;		/* The VFS inode of $Volume. */</div><div class='del'>-	VOLUME_FLAGS vol_flags;		/* Volume flags. */</div><div class='del'>-	u8 major_ver;			/* Ntfs major version of volume. */</div><div class='del'>-	u8 minor_ver;			/* Ntfs minor version of volume. */</div><div class='del'>-</div><div class='del'>-	struct inode *root_ino;		/* The VFS inode of the root</div><div class='del'>-					   directory. */</div><div class='del'>-	struct inode *secure_ino;	/* The VFS inode of $Secure (NTFS3.0+</div><div class='del'>-					   only, otherwise NULL). */</div><div class='del'>-	struct inode *extend_ino;	/* The VFS inode of $Extend (NTFS3.0+</div><div class='del'>-					   only, otherwise NULL). */</div><div class='del'>-#ifdef NTFS_RW</div><div class='del'>-	/* $Quota stuff is NTFS3.0+ specific.  Unused/NULL otherwise. */</div><div class='del'>-	struct inode *quota_ino;	/* The VFS inode of $Quota. */</div><div class='del'>-	struct inode *quota_q_ino;	/* Attribute inode for $Quota/$Q. */</div><div class='del'>-	/* $UsnJrnl stuff is NTFS3.0+ specific.  Unused/NULL otherwise. */</div><div class='del'>-	struct inode *usnjrnl_ino;	/* The VFS inode of $UsnJrnl. */</div><div class='del'>-	struct inode *usnjrnl_max_ino;	/* Attribute inode for $UsnJrnl/$Max. */</div><div class='del'>-	struct inode *usnjrnl_j_ino;	/* Attribute inode for $UsnJrnl/$J. */</div><div class='del'>-#endif /* NTFS_RW */</div><div class='del'>-	struct nls_table *nls_map;</div><div class='del'>-} ntfs_volume;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Defined bits for the flags field in the ntfs_volume structure.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	NV_Errors,		/* 1: Volume has errors, prevent remount rw. */</div><div class='del'>-	NV_ShowSystemFiles,	/* 1: Return system files in ntfs_readdir(). */</div><div class='del'>-	NV_CaseSensitive,	/* 1: Treat file names as case sensitive and</div><div class='del'>-				      create filenames in the POSIX namespace.</div><div class='del'>-				      Otherwise be case insensitive but still</div><div class='del'>-				      create file names in POSIX namespace. */</div><div class='del'>-	NV_LogFileEmpty,	/* 1: $LogFile journal is empty. */</div><div class='del'>-	NV_QuotaOutOfDate,	/* 1: $Quota is out of date. */</div><div class='del'>-	NV_UsnJrnlStamped,	/* 1: $UsnJrnl has been stamped. */</div><div class='del'>-	NV_SparseEnabled,	/* 1: May create sparse files. */</div><div class='del'>-} ntfs_volume_flags;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Macro tricks to expand the NVolFoo(), NVolSetFoo(), and NVolClearFoo()</div><div class='del'>- * functions.</div><div class='del'>- */</div><div class='del'>-#define DEFINE_NVOL_BIT_OPS(flag)					\</div><div class='del'>-static inline int NVol##flag(ntfs_volume *vol)		\</div><div class='del'>-{							\</div><div class='del'>-	return test_bit(NV_##flag, &amp;(vol)-&gt;flags);	\</div><div class='del'>-}							\</div><div class='del'>-static inline void NVolSet##flag(ntfs_volume *vol)	\</div><div class='del'>-{							\</div><div class='del'>-	set_bit(NV_##flag, &amp;(vol)-&gt;flags);		\</div><div class='del'>-}							\</div><div class='del'>-static inline void NVolClear##flag(ntfs_volume *vol)	\</div><div class='del'>-{							\</div><div class='del'>-	clear_bit(NV_##flag, &amp;(vol)-&gt;flags);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emit the ntfs volume bitops functions. */</div><div class='del'>-DEFINE_NVOL_BIT_OPS(Errors)</div><div class='del'>-DEFINE_NVOL_BIT_OPS(ShowSystemFiles)</div><div class='del'>-DEFINE_NVOL_BIT_OPS(CaseSensitive)</div><div class='del'>-DEFINE_NVOL_BIT_OPS(LogFileEmpty)</div><div class='del'>-DEFINE_NVOL_BIT_OPS(QuotaOutOfDate)</div><div class='del'>-DEFINE_NVOL_BIT_OPS(UsnJrnlStamped)</div><div class='del'>-DEFINE_NVOL_BIT_OPS(SparseEnabled)</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_NTFS_VOLUME_H */</div><div class='head'>diff --git a/fs/ntfs3/Kconfig b/fs/ntfs3/Kconfig<br/>index cdfdf51e55d7..7bc31d69f680 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/Kconfig</a></div><div class='hunk'>@@ -46,3 +46,12 @@ config NTFS3_FS_POSIX_ACL</div><div class='ctx'> 	  NOTE: this is linux only feature. Windows will ignore these ACLs.</div><div class='ctx'> </div><div class='ctx'> 	  If you don't know what Access Control Lists are, say N.</div><div class='add'>+</div><div class='add'>+config NTFS_FS</div><div class='add'>+	tristate "NTFS file system support"</div><div class='add'>+	select NTFS3_FS</div><div class='add'>+	select BUFFER_HEAD</div><div class='add'>+	select NLS</div><div class='add'>+	help</div><div class='add'>+	  This config option is here only for backward compatibility. NTFS</div><div class='add'>+	  filesystem is now handled by the NTFS3 driver.</div><div class='head'>diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c<br/>index 63f70259edc0..980ae9157248 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/attrib.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/attrib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/attrib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/attrib.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	struct ntfs_sb_info *sbi;</div><div class='ctx'> 	struct ATTRIB *attr_s;</div><div class='ctx'> 	struct MFT_REC *rec;</div><div class='del'>-	u32 used, asize, rsize, aoff, align;</div><div class='add'>+	u32 used, asize, rsize, aoff;</div><div class='ctx'> 	bool is_data;</div><div class='ctx'> 	CLST len, alen;</div><div class='ctx'> 	char *next;</div><div class='hunk'>@@ -252,10 +252,13 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	rsize = le32_to_cpu(attr-&gt;res.data_size);</div><div class='ctx'> 	is_data = attr-&gt;type == ATTR_DATA &amp;&amp; !attr-&gt;name_len;</div><div class='ctx'> </div><div class='del'>-	align = sbi-&gt;cluster_size;</div><div class='del'>-	if (is_attr_compressed(attr))</div><div class='del'>-		align &lt;&lt;= COMPRESSION_UNIT;</div><div class='del'>-	len = (rsize + align - 1) &gt;&gt; sbi-&gt;cluster_bits;</div><div class='add'>+	/* len - how many clusters required to store 'rsize' bytes */</div><div class='add'>+	if (is_attr_compressed(attr)) {</div><div class='add'>+		u8 shift = sbi-&gt;cluster_bits + NTFS_LZNT_CUNIT;</div><div class='add'>+		len = ((rsize + (1u &lt;&lt; shift) - 1) &gt;&gt; shift) &lt;&lt; NTFS_LZNT_CUNIT;</div><div class='add'>+	} else {</div><div class='add'>+		len = bytes_to_cluster(sbi, rsize);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	run_init(run);</div><div class='ctx'> </div><div class='hunk'>@@ -285,22 +288,21 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out2;</div><div class='ctx'> 		} else if (!page) {</div><div class='del'>-			char *kaddr;</div><div class='del'>-</div><div class='del'>-			page = grab_cache_page(ni-&gt;vfs_inode.i_mapping, 0);</div><div class='del'>-			if (!page) {</div><div class='del'>-				err = -ENOMEM;</div><div class='add'>+			struct address_space *mapping = ni-&gt;vfs_inode.i_mapping;</div><div class='add'>+			struct folio *folio;</div><div class='add'>+</div><div class='add'>+			folio = __filemap_get_folio(</div><div class='add'>+				mapping, 0, FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+				mapping_gfp_mask(mapping));</div><div class='add'>+			if (IS_ERR(folio)) {</div><div class='add'>+				err = PTR_ERR(folio);</div><div class='ctx'> 				goto out2;</div><div class='ctx'> 			}</div><div class='del'>-			kaddr = kmap_atomic(page);</div><div class='del'>-			memcpy(kaddr, data, rsize);</div><div class='del'>-			memset(kaddr + rsize, 0, PAGE_SIZE - rsize);</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-			set_page_dirty(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio_fill_tail(folio, 0, data, rsize);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -670,7 +672,8 @@ pack_runs:</div><div class='ctx'> 			goto undo_2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!is_mft)</div><div class='add'>+		/* keep runs for $MFT::$ATTR_DATA and $MFT::$ATTR_BITMAP. */</div><div class='add'>+		if (ni-&gt;mi.rno != MFT_REC_MFT)</div><div class='ctx'> 			run_truncate_head(run, evcn + 1);</div><div class='ctx'> </div><div class='ctx'> 		svcn = le64_to_cpu(attr-&gt;nres.svcn);</div><div class='hunk'>@@ -784,7 +787,8 @@ pack_runs:</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		attr = mi_find_attr(mi, NULL, type, name, name_len, &amp;le-&gt;id);</div><div class='add'>+		attr = mi_find_attr(ni, mi, NULL, type, name, name_len,</div><div class='add'>+				    &amp;le-&gt;id);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto bad_inode;</div><div class='hunk'>@@ -886,7 +890,7 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,</div><div class='ctx'> 	struct runs_tree *run = &amp;ni-&gt;file.run;</div><div class='ctx'> 	struct ntfs_sb_info *sbi;</div><div class='ctx'> 	u8 cluster_bits;</div><div class='del'>-	struct ATTRIB *attr = NULL, *attr_b;</div><div class='add'>+	struct ATTRIB *attr, *attr_b;</div><div class='ctx'> 	struct ATTR_LIST_ENTRY *le, *le_b;</div><div class='ctx'> 	struct mft_inode *mi, *mi_b;</div><div class='ctx'> 	CLST hint, svcn, to_alloc, evcn1, next_svcn, asize, end, vcn0, alen;</div><div class='hunk'>@@ -904,12 +908,8 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,</div><div class='ctx'> 		*len = 0;</div><div class='ctx'> 	up_read(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> </div><div class='del'>-	if (*len) {</div><div class='del'>-		if (*lcn != SPARSE_LCN || !new)</div><div class='del'>-			return 0; /* Fast normal way without allocation. */</div><div class='del'>-		else if (clen &gt; *len)</div><div class='del'>-			clen = *len;</div><div class='del'>-	}</div><div class='add'>+	if (*len &amp;&amp; (*lcn != SPARSE_LCN || !new))</div><div class='add'>+		return 0; /* Fast normal way without allocation. */</div><div class='ctx'> </div><div class='ctx'> 	/* No cluster in cache or we need to allocate cluster in hole. */</div><div class='ctx'> 	sbi = ni-&gt;mi.sbi;</div><div class='hunk'>@@ -918,6 +918,17 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,</div><div class='ctx'> 	ni_lock(ni);</div><div class='ctx'> 	down_write(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> </div><div class='add'>+	/* Repeat the code above (under write lock). */</div><div class='add'>+	if (!run_lookup_entry(run, vcn, lcn, len, NULL))</div><div class='add'>+		*len = 0;</div><div class='add'>+</div><div class='add'>+	if (*len) {</div><div class='add'>+		if (*lcn != SPARSE_LCN || !new)</div><div class='add'>+			goto out; /* normal way without allocation. */</div><div class='add'>+		if (clen &gt; *len)</div><div class='add'>+			clen = *len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	le_b = NULL;</div><div class='ctx'> 	attr_b = ni_find_attr(ni, NULL, &amp;le_b, ATTR_DATA, NULL, 0, NULL, &amp;mi_b);</div><div class='ctx'> 	if (!attr_b) {</div><div class='hunk'>@@ -965,6 +976,21 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Check for compressed frame. */</div><div class='add'>+	err = attr_is_frame_compressed(ni, attr_b, vcn &gt;&gt; NTFS_LZNT_CUNIT,</div><div class='add'>+				       &amp;hint, run);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (hint) {</div><div class='add'>+		/* if frame is compressed - don't touch it. */</div><div class='add'>+		*lcn = COMPRESSED_LCN;</div><div class='add'>+		/* length to the end of frame. */</div><div class='add'>+		*len = NTFS_LZNT_CLUSTERS - (vcn &amp; (NTFS_LZNT_CLUSTERS - 1));</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!*len) {</div><div class='ctx'> 		if (run_lookup_entry(run, vcn, lcn, len, NULL)) {</div><div class='ctx'> 			if (*lcn != SPARSE_LCN || !new)</div><div class='hunk'>@@ -1004,16 +1030,16 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,</div><div class='ctx'> </div><div class='ctx'> 		/* Check if 'vcn' and 'vcn0' in different attribute segments. */</div><div class='ctx'> 		if (vcn &lt; svcn || evcn1 &lt;= vcn) {</div><div class='del'>-			/* Load attribute for truncated vcn. */</div><div class='del'>-			attr = ni_find_attr(ni, attr_b, &amp;le, ATTR_DATA, NULL, 0,</div><div class='del'>-					    &amp;vcn, &amp;mi);</div><div class='del'>-			if (!attr) {</div><div class='add'>+			struct ATTRIB *attr2;</div><div class='add'>+			/* Load runs for truncated vcn. */</div><div class='add'>+			attr2 = ni_find_attr(ni, attr_b, &amp;le_b, ATTR_DATA, NULL,</div><div class='add'>+					     0, &amp;vcn, &amp;mi);</div><div class='add'>+			if (!attr2) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='del'>-			svcn = le64_to_cpu(attr-&gt;nres.svcn);</div><div class='del'>-			evcn1 = le64_to_cpu(attr-&gt;nres.evcn) + 1;</div><div class='del'>-			err = attr_load_runs(attr, ni, run, NULL);</div><div class='add'>+			evcn1 = le64_to_cpu(attr2-&gt;nres.evcn) + 1;</div><div class='add'>+			err = attr_load_runs(attr2, ni, run, NULL);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1156,7 +1182,7 @@ repack:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		attr = mi_find_attr(mi, NULL, ATTR_DATA, NULL, 0, &amp;le-&gt;id);</div><div class='add'>+		attr = mi_find_attr(ni, mi, NULL, ATTR_DATA, NULL, 0, &amp;le-&gt;id);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1216,11 +1242,12 @@ undo1:</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int attr_data_read_resident(struct ntfs_inode *ni, struct page *page)</div><div class='add'>+int attr_data_read_resident(struct ntfs_inode *ni, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	u64 vbo;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='ctx'> 	u32 data_size;</div><div class='add'>+	size_t len;</div><div class='ctx'> </div><div class='ctx'> 	attr = ni_find_attr(ni, NULL, NULL, ATTR_DATA, NULL, 0, NULL, NULL);</div><div class='ctx'> 	if (!attr)</div><div class='hunk'>@@ -1229,30 +1256,20 @@ int attr_data_read_resident(struct ntfs_inode *ni, struct page *page)</div><div class='ctx'> 	if (attr-&gt;non_res)</div><div class='ctx'> 		return E_NTFS_NONRESIDENT;</div><div class='ctx'> </div><div class='del'>-	vbo = page-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	vbo = folio-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	data_size = le32_to_cpu(attr-&gt;res.data_size);</div><div class='del'>-	if (vbo &lt; data_size) {</div><div class='del'>-		const char *data = resident_data(attr);</div><div class='del'>-		char *kaddr = kmap_atomic(page);</div><div class='del'>-		u32 use = data_size - vbo;</div><div class='del'>-</div><div class='del'>-		if (use &gt; PAGE_SIZE)</div><div class='del'>-			use = PAGE_SIZE;</div><div class='add'>+	if (vbo &gt; data_size)</div><div class='add'>+		len = 0;</div><div class='add'>+	else</div><div class='add'>+		len = min(data_size - vbo, folio_size(folio));</div><div class='ctx'> </div><div class='del'>-		memcpy(kaddr, data + vbo, use);</div><div class='del'>-		memset(kaddr + use, 0, PAGE_SIZE - use);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	} else if (!PageUptodate(page)) {</div><div class='del'>-		zero_user_segment(page, 0, PAGE_SIZE);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	}</div><div class='add'>+	folio_fill_tail(folio, 0, resident_data(attr) + vbo, len);</div><div class='add'>+	folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int attr_data_write_resident(struct ntfs_inode *ni, struct page *page)</div><div class='add'>+int attr_data_write_resident(struct ntfs_inode *ni, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	u64 vbo;</div><div class='ctx'> 	struct mft_inode *mi;</div><div class='hunk'>@@ -1268,17 +1285,13 @@ int attr_data_write_resident(struct ntfs_inode *ni, struct page *page)</div><div class='ctx'> 		return E_NTFS_NONRESIDENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vbo = page-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	vbo = folio-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	data_size = le32_to_cpu(attr-&gt;res.data_size);</div><div class='ctx'> 	if (vbo &lt; data_size) {</div><div class='ctx'> 		char *data = resident_data(attr);</div><div class='del'>-		char *kaddr = kmap_atomic(page);</div><div class='del'>-		u32 use = data_size - vbo;</div><div class='add'>+		size_t len = min(data_size - vbo, folio_size(folio));</div><div class='ctx'> </div><div class='del'>-		if (use &gt; PAGE_SIZE)</div><div class='del'>-			use = PAGE_SIZE;</div><div class='del'>-		memcpy(data + vbo, kaddr, use);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='add'>+		memcpy_from_folio(data + vbo, folio, 0, len);</div><div class='ctx'> 		mi-&gt;dirty = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	ni-&gt;i_valid = data_size;</div><div class='hunk'>@@ -1371,7 +1384,7 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	u32 voff;</div><div class='ctx'> 	u8 bytes_per_off;</div><div class='ctx'> 	char *addr;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	__le32 *off32;</div><div class='ctx'> 	__le64 *off64;</div><div class='hunk'>@@ -1394,7 +1407,7 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!attr-&gt;non_res) {</div><div class='ctx'> 		if (vbo[1] + bytes_per_off &gt; le32_to_cpu(attr-&gt;res.data_size)) {</div><div class='del'>-			ntfs_inode_err(&amp;ni-&gt;vfs_inode, "is corrupted");</div><div class='add'>+			_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		addr = resident_data(attr);</div><div class='hunk'>@@ -1416,18 +1429,18 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> </div><div class='ctx'> 	wof_size = le64_to_cpu(attr-&gt;nres.data_size);</div><div class='ctx'> 	down_write(&amp;ni-&gt;file.run_lock);</div><div class='del'>-	page = ni-&gt;file.offs_page;</div><div class='del'>-	if (!page) {</div><div class='del'>-		page = alloc_page(GFP_KERNEL);</div><div class='del'>-		if (!page) {</div><div class='add'>+	folio = ni-&gt;file.offs_folio;</div><div class='add'>+	if (!folio) {</div><div class='add'>+		folio = folio_alloc(GFP_KERNEL, 0);</div><div class='add'>+		if (!folio) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		page-&gt;index = -1;</div><div class='del'>-		ni-&gt;file.offs_page = page;</div><div class='add'>+		folio-&gt;index = -1;</div><div class='add'>+		ni-&gt;file.offs_folio = folio;</div><div class='ctx'> 	}</div><div class='del'>-	lock_page(page);</div><div class='del'>-	addr = page_address(page);</div><div class='add'>+	folio_lock(folio);</div><div class='add'>+	addr = folio_address(folio);</div><div class='ctx'> </div><div class='ctx'> 	if (vbo[1]) {</div><div class='ctx'> 		voff = vbo[1] &amp; (PAGE_SIZE - 1);</div><div class='hunk'>@@ -1443,7 +1456,7 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	do {</div><div class='ctx'> 		pgoff_t index = vbo[i] &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-		if (index != page-&gt;index) {</div><div class='add'>+		if (index != folio-&gt;index) {</div><div class='ctx'> 			u64 from = vbo[i] &amp; ~(u64)(PAGE_SIZE - 1);</div><div class='ctx'> 			u64 to = min(from + PAGE_SIZE, wof_size);</div><div class='ctx'> </div><div class='hunk'>@@ -1453,13 +1466,12 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out1;</div><div class='ctx'> </div><div class='del'>-			err = ntfs_bio_pages(sbi, run, &amp;page, 1, from,</div><div class='del'>-					     to - from, REQ_OP_READ);</div><div class='add'>+			err = ntfs_read_run(sbi, run, addr, from, to - from);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				page-&gt;index = -1;</div><div class='add'>+				folio-&gt;index = -1;</div><div class='ctx'> 				goto out1;</div><div class='ctx'> 			}</div><div class='del'>-			page-&gt;index = index;</div><div class='add'>+			folio-&gt;index = index;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (i) {</div><div class='hunk'>@@ -1497,7 +1509,7 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	*ondisk_size = off[1] - off[0];</div><div class='ctx'> </div><div class='ctx'> out1:</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> out:</div><div class='ctx'> 	up_write(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1506,15 +1518,18 @@ out:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * attr_is_frame_compressed - Used to detect compressed frame.</div><div class='add'>+ *</div><div class='add'>+ * attr - base (primary) attribute segment.</div><div class='add'>+ * run  - run to use, usually == &amp;ni-&gt;file.run.</div><div class='add'>+ * Only base segments contains valid 'attr-&gt;nres.c_unit'</div><div class='ctx'>  */</div><div class='ctx'> int attr_is_frame_compressed(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='del'>-			     CLST frame, CLST *clst_data)</div><div class='add'>+			     CLST frame, CLST *clst_data, struct runs_tree *run)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 clst_frame;</div><div class='ctx'> 	CLST clen, lcn, vcn, alen, slen, vcn_next;</div><div class='ctx'> 	size_t idx;</div><div class='del'>-	struct runs_tree *run;</div><div class='ctx'> </div><div class='ctx'> 	*clst_data = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1526,7 +1541,6 @@ int attr_is_frame_compressed(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> </div><div class='ctx'> 	clst_frame = 1u &lt;&lt; attr-&gt;nres.c_unit;</div><div class='ctx'> 	vcn = frame * clst_frame;</div><div class='del'>-	run = &amp;ni-&gt;file.run;</div><div class='ctx'> </div><div class='ctx'> 	if (!run_lookup_entry(run, vcn, &amp;lcn, &amp;clen, &amp;idx)) {</div><div class='ctx'> 		err = attr_load_runs_vcn(ni, attr-&gt;type, attr_name(attr),</div><div class='hunk'>@@ -1662,7 +1676,7 @@ int attr_allocate_frame(struct ntfs_inode *ni, CLST frame, size_t compr_size,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = attr_is_frame_compressed(ni, attr_b, frame, &amp;clst_data);</div><div class='add'>+	err = attr_is_frame_compressed(ni, attr_b, frame, &amp;clst_data, run);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1715,6 +1729,7 @@ repack:</div><div class='ctx'> </div><div class='ctx'> 	attr_b-&gt;nres.total_size = cpu_to_le64(total_size);</div><div class='ctx'> 	inode_set_bytes(&amp;ni-&gt;vfs_inode, total_size);</div><div class='add'>+	ni-&gt;ni_flags |= NI_FLAG_UPDATE_PARENT;</div><div class='ctx'> </div><div class='ctx'> 	mi_b-&gt;dirty = true;</div><div class='ctx'> 	mark_inode_dirty(&amp;ni-&gt;vfs_inode);</div><div class='hunk'>@@ -1736,8 +1751,10 @@ repack:</div><div class='ctx'> 			le_b = NULL;</div><div class='ctx'> 			attr_b = ni_find_attr(ni, NULL, &amp;le_b, ATTR_DATA, NULL,</div><div class='ctx'> 					      0, NULL, &amp;mi_b);</div><div class='del'>-			if (!attr_b)</div><div class='del'>-				return -ENOENT;</div><div class='add'>+			if (!attr_b) {</div><div class='add'>+				err = -ENOENT;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			attr = attr_b;</div><div class='ctx'> 			le = le_b;</div><div class='hunk'>@@ -1778,7 +1795,7 @@ repack:</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			attr = mi_find_attr(mi, NULL, ATTR_DATA, NULL, 0,</div><div class='add'>+			attr = mi_find_attr(ni, mi, NULL, ATTR_DATA, NULL, 0,</div><div class='ctx'> 					    &amp;le-&gt;id);</div><div class='ctx'> 			if (!attr) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='hunk'>@@ -1818,13 +1835,15 @@ ins_ext:</div><div class='ctx'> ok:</div><div class='ctx'> 	run_truncate_around(run, vcn);</div><div class='ctx'> out:</div><div class='del'>-	if (new_valid &gt; data_size)</div><div class='del'>-		new_valid = data_size;</div><div class='add'>+	if (attr_b) {</div><div class='add'>+		if (new_valid &gt; data_size)</div><div class='add'>+			new_valid = data_size;</div><div class='ctx'> </div><div class='del'>-	valid_size = le64_to_cpu(attr_b-&gt;nres.valid_size);</div><div class='del'>-	if (new_valid != valid_size) {</div><div class='del'>-		attr_b-&gt;nres.valid_size = cpu_to_le64(valid_size);</div><div class='del'>-		mi_b-&gt;dirty = true;</div><div class='add'>+		valid_size = le64_to_cpu(attr_b-&gt;nres.valid_size);</div><div class='add'>+		if (new_valid != valid_size) {</div><div class='add'>+			attr_b-&gt;nres.valid_size = cpu_to_le64(valid_size);</div><div class='add'>+			mi_b-&gt;dirty = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1841,7 +1860,7 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 	struct ATTRIB *attr = NULL, *attr_b;</div><div class='ctx'> 	struct ATTR_LIST_ENTRY *le, *le_b;</div><div class='ctx'> 	struct mft_inode *mi, *mi_b;</div><div class='del'>-	CLST svcn, evcn1, len, dealloc, alen;</div><div class='add'>+	CLST svcn, evcn1, len, dealloc, alen, done;</div><div class='ctx'> 	CLST vcn, end;</div><div class='ctx'> 	u64 valid_size, data_size, alloc_size, total_size;</div><div class='ctx'> 	u32 mask;</div><div class='hunk'>@@ -1904,6 +1923,7 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 	len = bytes &gt;&gt; sbi-&gt;cluster_bits;</div><div class='ctx'> 	end = vcn + len;</div><div class='ctx'> 	dealloc = 0;</div><div class='add'>+	done = 0;</div><div class='ctx'> </div><div class='ctx'> 	svcn = le64_to_cpu(attr_b-&gt;nres.svcn);</div><div class='ctx'> 	evcn1 = le64_to_cpu(attr_b-&gt;nres.evcn) + 1;</div><div class='hunk'>@@ -1912,23 +1932,28 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 		attr = attr_b;</div><div class='ctx'> 		le = le_b;</div><div class='ctx'> 		mi = mi_b;</div><div class='del'>-	} else if (!le_b) {</div><div class='add'>+		goto check_seg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!le_b) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='del'>-	} else {</div><div class='del'>-		le = le_b;</div><div class='del'>-		attr = ni_find_attr(ni, attr_b, &amp;le, ATTR_DATA, NULL, 0, &amp;vcn,</div><div class='del'>-				    &amp;mi);</div><div class='del'>-		if (!attr) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		svcn = le64_to_cpu(attr-&gt;nres.svcn);</div><div class='del'>-		evcn1 = le64_to_cpu(attr-&gt;nres.evcn) + 1;</div><div class='add'>+	le = le_b;</div><div class='add'>+	attr = ni_find_attr(ni, attr_b, &amp;le, ATTR_DATA, NULL, 0, &amp;vcn, &amp;mi);</div><div class='add'>+	if (!attr) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='add'>+		CLST vcn1, eat, next_svcn;</div><div class='add'>+</div><div class='add'>+		svcn = le64_to_cpu(attr-&gt;nres.svcn);</div><div class='add'>+		evcn1 = le64_to_cpu(attr-&gt;nres.evcn) + 1;</div><div class='add'>+</div><div class='add'>+check_seg:</div><div class='ctx'> 		if (svcn &gt;= end) {</div><div class='ctx'> 			/* Shift VCN- */</div><div class='ctx'> 			attr-&gt;nres.svcn = cpu_to_le64(svcn - len);</div><div class='hunk'>@@ -1938,22 +1963,25 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 				ni-&gt;attr_list.dirty = true;</div><div class='ctx'> 			}</div><div class='ctx'> 			mi-&gt;dirty = true;</div><div class='del'>-		} else if (svcn &lt; vcn || end &lt; evcn1) {</div><div class='del'>-			CLST vcn1, eat, next_svcn;</div><div class='add'>+			goto next_attr;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* Collapse a part of this attribute segment. */</div><div class='del'>-			err = attr_load_runs(attr, ni, run, &amp;svcn);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='del'>-			vcn1 = max(vcn, svcn);</div><div class='del'>-			eat = min(end, evcn1) - vcn1;</div><div class='add'>+		run_truncate(run, 0);</div><div class='add'>+		err = attr_load_runs(attr, ni, run, &amp;svcn);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-			err = run_deallocate_ex(sbi, run, vcn1, eat, &amp;dealloc,</div><div class='del'>-						true);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+		vcn1 = vcn + done; /* original vcn in attr/run. */</div><div class='add'>+		eat = min(end, evcn1) - vcn1;</div><div class='add'>+</div><div class='add'>+		err = run_deallocate_ex(sbi, run, vcn1, eat, &amp;dealloc, true);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (svcn + eat &lt; evcn1) {</div><div class='add'>+			/* Collapse a part of this attribute segment. */</div><div class='ctx'> </div><div class='del'>-			if (!run_collapse_range(run, vcn1, eat)) {</div><div class='add'>+			if (!run_collapse_range(run, vcn1, eat, done)) {</div><div class='ctx'> 				err = -ENOMEM;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1961,7 +1989,7 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 			if (svcn &gt;= vcn) {</div><div class='ctx'> 				/* Shift VCN */</div><div class='ctx'> 				attr-&gt;nres.svcn = cpu_to_le64(vcn);</div><div class='del'>-				if (le) {</div><div class='add'>+				if (le &amp;&amp; attr-&gt;nres.svcn != le-&gt;vcn) {</div><div class='ctx'> 					le-&gt;vcn = attr-&gt;nres.svcn;</div><div class='ctx'> 					ni-&gt;attr_list.dirty = true;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1972,7 +2000,7 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			next_svcn = le64_to_cpu(attr-&gt;nres.evcn) + 1;</div><div class='del'>-			if (next_svcn + eat &lt; evcn1) {</div><div class='add'>+			if (next_svcn + eat + done &lt; evcn1) {</div><div class='ctx'> 				err = ni_insert_nonresident(</div><div class='ctx'> 					ni, ATTR_DATA, NULL, 0, run, next_svcn,</div><div class='ctx'> 					evcn1 - eat - next_svcn, a_flags, &amp;attr,</div><div class='hunk'>@@ -1986,18 +2014,9 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> </div><div class='ctx'> 			/* Free all allocated memory. */</div><div class='ctx'> 			run_truncate(run, 0);</div><div class='add'>+			done += eat;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			u16 le_sz;</div><div class='del'>-			u16 roff = le16_to_cpu(attr-&gt;nres.run_off);</div><div class='del'>-</div><div class='del'>-			if (roff &gt; le32_to_cpu(attr-&gt;size)) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			run_unpack_ex(RUN_DEALLOCATE, sbi, ni-&gt;mi.rno, svcn,</div><div class='del'>-				      evcn1 - 1, svcn, Add2Ptr(attr, roff),</div><div class='del'>-				      le32_to_cpu(attr-&gt;size) - roff);</div><div class='ctx'> </div><div class='ctx'> 			/* Delete this attribute segment. */</div><div class='ctx'> 			mi_remove_attr(NULL, mi, attr);</div><div class='hunk'>@@ -2010,6 +2029,7 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			done += evcn1 - svcn;</div><div class='ctx'> 			if (evcn1 &gt;= alen)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -2021,17 +2041,18 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				/* Look for required attribute. */</div><div class='del'>-				attr = mi_find_attr(mi, NULL, ATTR_DATA, NULL,</div><div class='del'>-						    0, &amp;le-&gt;id);</div><div class='add'>+				attr = mi_find_attr(ni, mi, NULL, ATTR_DATA,</div><div class='add'>+						    NULL, 0, &amp;le-&gt;id);</div><div class='ctx'> 				if (!attr) {</div><div class='ctx'> 					err = -EINVAL;</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='del'>-				goto next_attr;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			le = (struct ATTR_LIST_ENTRY *)((u8 *)le - le_sz);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+next_attr:</div><div class='ctx'> 		if (evcn1 &gt;= alen)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -2040,10 +2061,6 @@ int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-next_attr:</div><div class='del'>-		svcn = le64_to_cpu(attr-&gt;nres.svcn);</div><div class='del'>-		evcn1 = le64_to_cpu(attr-&gt;nres.evcn) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!attr_b) {</div><div class='hunk'>@@ -2073,7 +2090,7 @@ next_attr:</div><div class='ctx'> </div><div class='ctx'> 	/* Update inode size. */</div><div class='ctx'> 	ni-&gt;i_valid = valid_size;</div><div class='del'>-	ni-&gt;vfs_inode.i_size = data_size;</div><div class='add'>+	i_size_write(&amp;ni-&gt;vfs_inode, data_size);</div><div class='ctx'> 	inode_set_bytes(&amp;ni-&gt;vfs_inode, total_size);</div><div class='ctx'> 	ni-&gt;ni_flags |= NI_FLAG_UPDATE_PARENT;</div><div class='ctx'> 	mark_inode_dirty(&amp;ni-&gt;vfs_inode);</div><div class='hunk'>@@ -2345,8 +2362,13 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 		mask = (sbi-&gt;cluster_size &lt;&lt; attr_b-&gt;nres.c_unit) - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vbo &gt; data_size) {</div><div class='del'>-		/* Insert range after the file size is not allowed. */</div><div class='add'>+	if (vbo &gt;= data_size) {</div><div class='add'>+		/*</div><div class='add'>+		 * Insert range after the file size is not allowed.</div><div class='add'>+		 * If the offset is equal to or greater than the end of</div><div class='add'>+		 * file, an error is returned.  For such operations (i.e., inserting</div><div class='add'>+		 * a hole at the end of file), ftruncate(2) should be used.</div><div class='add'>+		 */</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2488,7 +2510,7 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)</div><div class='ctx'> 	mi_b-&gt;dirty = true;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	ni-&gt;vfs_inode.i_size += bytes;</div><div class='add'>+	i_size_write(&amp;ni-&gt;vfs_inode, ni-&gt;vfs_inode.i_size + bytes);</div><div class='ctx'> 	ni-&gt;ni_flags |= NI_FLAG_UPDATE_PARENT;</div><div class='ctx'> 	mark_inode_dirty(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> </div><div class='hunk'>@@ -2528,7 +2550,7 @@ undo_insert_range:</div><div class='ctx'> 	if (attr_load_runs(attr, ni, run, NULL))</div><div class='ctx'> 		goto bad_inode;</div><div class='ctx'> </div><div class='del'>-	if (!run_collapse_range(run, vcn, len))</div><div class='add'>+	if (!run_collapse_range(run, vcn, len, 0))</div><div class='ctx'> 		goto bad_inode;</div><div class='ctx'> </div><div class='ctx'> 	if (mi_pack_runs(mi, attr, run, evcn1 + len - svcn))</div><div class='hunk'>@@ -2547,3 +2569,35 @@ undo_insert_range:</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * attr_force_nonresident</div><div class='add'>+ *</div><div class='add'>+ * Convert default data attribute into non resident form.</div><div class='add'>+ */</div><div class='add'>+int attr_force_nonresident(struct ntfs_inode *ni)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct ATTRIB *attr;</div><div class='add'>+	struct ATTR_LIST_ENTRY *le = NULL;</div><div class='add'>+	struct mft_inode *mi;</div><div class='add'>+</div><div class='add'>+	attr = ni_find_attr(ni, NULL, &amp;le, ATTR_DATA, NULL, 0, NULL, &amp;mi);</div><div class='add'>+	if (!attr) {</div><div class='add'>+		_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (attr-&gt;non_res) {</div><div class='add'>+		/* Already non resident. */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down_write(&amp;ni-&gt;file.run_lock);</div><div class='add'>+	err = attr_make_nonresident(ni, attr, le, mi,</div><div class='add'>+				    le32_to_cpu(attr-&gt;res.data_size),</div><div class='add'>+				    &amp;ni-&gt;file.run, &amp;attr, NULL);</div><div class='add'>+	up_write(&amp;ni-&gt;file.run_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/ntfs3/attrlist.c b/fs/ntfs3/attrlist.c<br/>index 7c01735d1219..a4d74bed74fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/attrlist.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/attrlist.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/attrlist.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/attrlist.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ static inline bool al_is_valid_le(const struct ntfs_inode *ni,</div><div class='ctx'> void al_destroy(struct ntfs_inode *ni)</div><div class='ctx'> {</div><div class='ctx'> 	run_close(&amp;ni-&gt;attr_list.run);</div><div class='del'>-	kfree(ni-&gt;attr_list.le);</div><div class='add'>+	kvfree(ni-&gt;attr_list.le);</div><div class='ctx'> 	ni-&gt;attr_list.le = NULL;</div><div class='ctx'> 	ni-&gt;attr_list.size = 0;</div><div class='ctx'> 	ni-&gt;attr_list.dirty = false;</div><div class='hunk'>@@ -127,12 +127,13 @@ struct ATTR_LIST_ENTRY *al_enumerate(struct ntfs_inode *ni,</div><div class='ctx'> {</div><div class='ctx'> 	size_t off;</div><div class='ctx'> 	u16 sz;</div><div class='add'>+	const unsigned le_min_size = le_size(0);</div><div class='ctx'> </div><div class='ctx'> 	if (!le) {</div><div class='ctx'> 		le = ni-&gt;attr_list.le;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sz = le16_to_cpu(le-&gt;size);</div><div class='del'>-		if (sz &lt; sizeof(struct ATTR_LIST_ENTRY)) {</div><div class='add'>+		if (sz &lt; le_min_size) {</div><div class='ctx'> 			/* Impossible 'cause we should not return such le. */</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -141,7 +142,7 @@ struct ATTR_LIST_ENTRY *al_enumerate(struct ntfs_inode *ni,</div><div class='ctx'> </div><div class='ctx'> 	/* Check boundary. */</div><div class='ctx'> 	off = PtrOffset(ni-&gt;attr_list.le, le);</div><div class='del'>-	if (off + sizeof(struct ATTR_LIST_ENTRY) &gt; ni-&gt;attr_list.size) {</div><div class='add'>+	if (off + le_min_size &gt; ni-&gt;attr_list.size) {</div><div class='ctx'> 		/* The regular end of list. */</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -149,8 +150,7 @@ struct ATTR_LIST_ENTRY *al_enumerate(struct ntfs_inode *ni,</div><div class='ctx'> 	sz = le16_to_cpu(le-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	/* Check le for errors. */</div><div class='del'>-	if (sz &lt; sizeof(struct ATTR_LIST_ENTRY) ||</div><div class='del'>-	    off + sz &gt; ni-&gt;attr_list.size ||</div><div class='add'>+	if (sz &lt; le_min_size || off + sz &gt; ni-&gt;attr_list.size ||</div><div class='ctx'> 	    sz &lt; le-&gt;name_off + le-&gt;name_len * sizeof(short)) {</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -318,7 +318,7 @@ int al_add_le(struct ntfs_inode *ni, enum ATTR_TYPE type, const __le16 *name,</div><div class='ctx'> 		memcpy(ptr, al-&gt;le, off);</div><div class='ctx'> 		memcpy(Add2Ptr(ptr, off + sz), le, old_size - off);</div><div class='ctx'> 		le = Add2Ptr(ptr, off);</div><div class='del'>-		kfree(al-&gt;le);</div><div class='add'>+		kvfree(al-&gt;le);</div><div class='ctx'> 		al-&gt;le = ptr;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memmove(Add2Ptr(le, sz), le, old_size - off);</div><div class='hunk'>@@ -382,59 +382,6 @@ bool al_remove_le(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * al_delete_le - Delete first le from the list which matches its parameters.</div><div class='del'>- */</div><div class='del'>-bool al_delete_le(struct ntfs_inode *ni, enum ATTR_TYPE type, CLST vcn,</div><div class='del'>-		  const __le16 *name, u8 name_len, const struct MFT_REF *ref)</div><div class='del'>-{</div><div class='del'>-	u16 size;</div><div class='del'>-	struct ATTR_LIST_ENTRY *le;</div><div class='del'>-	size_t off;</div><div class='del'>-	typeof(ni-&gt;attr_list) *al = &amp;ni-&gt;attr_list;</div><div class='del'>-</div><div class='del'>-	/* Scan forward to the first le that matches the input. */</div><div class='del'>-	le = al_find_ex(ni, NULL, type, name, name_len, &amp;vcn);</div><div class='del'>-	if (!le)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	off = PtrOffset(al-&gt;le, le);</div><div class='del'>-</div><div class='del'>-next:</div><div class='del'>-	if (off &gt;= al-&gt;size)</div><div class='del'>-		return false;</div><div class='del'>-	if (le-&gt;type != type)</div><div class='del'>-		return false;</div><div class='del'>-	if (le-&gt;name_len != name_len)</div><div class='del'>-		return false;</div><div class='del'>-	if (name_len &amp;&amp; ntfs_cmp_names(le_name(le), name_len, name, name_len,</div><div class='del'>-				       ni-&gt;mi.sbi-&gt;upcase, true))</div><div class='del'>-		return false;</div><div class='del'>-	if (le64_to_cpu(le-&gt;vcn) != vcn)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The caller specified a segment reference, so we have to</div><div class='del'>-	 * scan through the matching entries until we find that segment</div><div class='del'>-	 * reference or we run of matching entries.</div><div class='del'>-	 */</div><div class='del'>-	if (ref &amp;&amp; memcmp(ref, &amp;le-&gt;ref, sizeof(*ref))) {</div><div class='del'>-		off += le16_to_cpu(le-&gt;size);</div><div class='del'>-		le = Add2Ptr(al-&gt;le, off);</div><div class='del'>-		goto next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Save on stack the size of 'le'. */</div><div class='del'>-	size = le16_to_cpu(le-&gt;size);</div><div class='del'>-	/* Delete the le. */</div><div class='del'>-	memmove(le, Add2Ptr(le, size), al-&gt;size - (off + size));</div><div class='del'>-</div><div class='del'>-	al-&gt;size -= size;</div><div class='del'>-	al-&gt;dirty = true;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int al_update(struct ntfs_inode *ni, int sync)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='head'>diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c<br/>index 63f14a0232f6..65d05e6a0566 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/bitmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/bitmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/bitmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/bitmap.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ void wnd_close(struct wnd_bitmap *wnd)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node, *next;</div><div class='ctx'> </div><div class='del'>-	kfree(wnd-&gt;free_bits);</div><div class='add'>+	kvfree(wnd-&gt;free_bits);</div><div class='ctx'> 	wnd-&gt;free_bits = NULL;</div><div class='ctx'> 	run_close(&amp;wnd-&gt;run);</div><div class='ctx'> </div><div class='hunk'>@@ -654,7 +654,7 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits)</div><div class='ctx'> 	wnd-&gt;total_zeroes = nbits;</div><div class='ctx'> 	wnd-&gt;extent_max = MINUS_ONE_T;</div><div class='ctx'> 	wnd-&gt;zone_bit = wnd-&gt;zone_end = 0;</div><div class='del'>-	wnd-&gt;nwnd = bytes_to_block(sb, bitmap_size(nbits));</div><div class='add'>+	wnd-&gt;nwnd = bytes_to_block(sb, ntfs3_bitmap_size(nbits));</div><div class='ctx'> 	wnd-&gt;bits_last = nbits &amp; (wbits - 1);</div><div class='ctx'> 	if (!wnd-&gt;bits_last)</div><div class='ctx'> 		wnd-&gt;bits_last = wbits;</div><div class='hunk'>@@ -710,20 +710,17 @@ int wnd_set_free(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct super_block *sb = wnd-&gt;sb;</div><div class='del'>-	size_t bits0 = bits;</div><div class='ctx'> 	u32 wbits = 8 * sb-&gt;s_blocksize;</div><div class='ctx'> 	size_t iw = bit &gt;&gt; (sb-&gt;s_blocksize_bits + 3);</div><div class='ctx'> 	u32 wbit = bit &amp; (wbits - 1);</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='add'>+	u32 op;</div><div class='ctx'> </div><div class='del'>-	while (iw &lt; wnd-&gt;nwnd &amp;&amp; bits) {</div><div class='del'>-		u32 tail, op;</div><div class='del'>-</div><div class='add'>+	for (; iw &lt; wnd-&gt;nwnd &amp;&amp; bits; iw++, bit += op, bits -= op, wbit = 0) {</div><div class='ctx'> 		if (iw + 1 == wnd-&gt;nwnd)</div><div class='ctx'> 			wbits = wnd-&gt;bits_last;</div><div class='ctx'> </div><div class='del'>-		tail = wbits - wbit;</div><div class='del'>-		op = min_t(u32, tail, bits);</div><div class='add'>+		op = min_t(u32, wbits - wbit, bits);</div><div class='ctx'> </div><div class='ctx'> 		bh = wnd_map(wnd, iw);</div><div class='ctx'> 		if (IS_ERR(bh)) {</div><div class='hunk'>@@ -736,20 +733,15 @@ int wnd_set_free(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> 		ntfs_bitmap_clear_le(bh-&gt;b_data, wbit, op);</div><div class='ctx'> </div><div class='ctx'> 		wnd-&gt;free_bits[iw] += op;</div><div class='add'>+		wnd-&gt;total_zeroes += op;</div><div class='ctx'> </div><div class='ctx'> 		set_buffer_uptodate(bh);</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='ctx'> 		put_bh(bh);</div><div class='ctx'> </div><div class='del'>-		wnd-&gt;total_zeroes += op;</div><div class='del'>-		bits -= op;</div><div class='del'>-		wbit = 0;</div><div class='del'>-		iw += 1;</div><div class='add'>+		wnd_add_free_ext(wnd, bit, op, false);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	wnd_add_free_ext(wnd, bit, bits0, false);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -760,20 +752,17 @@ int wnd_set_used(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct super_block *sb = wnd-&gt;sb;</div><div class='del'>-	size_t bits0 = bits;</div><div class='ctx'> 	size_t iw = bit &gt;&gt; (sb-&gt;s_blocksize_bits + 3);</div><div class='ctx'> 	u32 wbits = 8 * sb-&gt;s_blocksize;</div><div class='ctx'> 	u32 wbit = bit &amp; (wbits - 1);</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='add'>+	u32 op;</div><div class='ctx'> </div><div class='del'>-	while (iw &lt; wnd-&gt;nwnd &amp;&amp; bits) {</div><div class='del'>-		u32 tail, op;</div><div class='del'>-</div><div class='add'>+	for (; iw &lt; wnd-&gt;nwnd &amp;&amp; bits; iw++, bit += op, bits -= op, wbit = 0) {</div><div class='ctx'> 		if (unlikely(iw + 1 == wnd-&gt;nwnd))</div><div class='ctx'> 			wbits = wnd-&gt;bits_last;</div><div class='ctx'> </div><div class='del'>-		tail = wbits - wbit;</div><div class='del'>-		op = min_t(u32, tail, bits);</div><div class='add'>+		op = min_t(u32, wbits - wbit, bits);</div><div class='ctx'> </div><div class='ctx'> 		bh = wnd_map(wnd, iw);</div><div class='ctx'> 		if (IS_ERR(bh)) {</div><div class='hunk'>@@ -785,21 +774,16 @@ int wnd_set_used(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> </div><div class='ctx'> 		ntfs_bitmap_set_le(bh-&gt;b_data, wbit, op);</div><div class='ctx'> 		wnd-&gt;free_bits[iw] -= op;</div><div class='add'>+		wnd-&gt;total_zeroes -= op;</div><div class='ctx'> </div><div class='ctx'> 		set_buffer_uptodate(bh);</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='ctx'> 		put_bh(bh);</div><div class='ctx'> </div><div class='del'>-		wnd-&gt;total_zeroes -= op;</div><div class='del'>-		bits -= op;</div><div class='del'>-		wbit = 0;</div><div class='del'>-		iw += 1;</div><div class='add'>+		if (!RB_EMPTY_ROOT(&amp;wnd-&gt;start_tree))</div><div class='add'>+			wnd_remove_free_ext(wnd, bit, op);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (!RB_EMPTY_ROOT(&amp;wnd-&gt;start_tree))</div><div class='del'>-		wnd_remove_free_ext(wnd, bit, bits0);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -852,15 +836,13 @@ static bool wnd_is_free_hlp(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> 	size_t iw = bit &gt;&gt; (sb-&gt;s_blocksize_bits + 3);</div><div class='ctx'> 	u32 wbits = 8 * sb-&gt;s_blocksize;</div><div class='ctx'> 	u32 wbit = bit &amp; (wbits - 1);</div><div class='add'>+	u32 op;</div><div class='ctx'> </div><div class='del'>-	while (iw &lt; wnd-&gt;nwnd &amp;&amp; bits) {</div><div class='del'>-		u32 tail, op;</div><div class='del'>-</div><div class='add'>+	for (; iw &lt; wnd-&gt;nwnd &amp;&amp; bits; iw++, bits -= op, wbit = 0) {</div><div class='ctx'> 		if (unlikely(iw + 1 == wnd-&gt;nwnd))</div><div class='ctx'> 			wbits = wnd-&gt;bits_last;</div><div class='ctx'> </div><div class='del'>-		tail = wbits - wbit;</div><div class='del'>-		op = min_t(u32, tail, bits);</div><div class='add'>+		op = min_t(u32, wbits - wbit, bits);</div><div class='ctx'> </div><div class='ctx'> 		if (wbits != wnd-&gt;free_bits[iw]) {</div><div class='ctx'> 			bool ret;</div><div class='hunk'>@@ -875,10 +857,6 @@ static bool wnd_is_free_hlp(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				return false;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		bits -= op;</div><div class='del'>-		wbit = 0;</div><div class='del'>-		iw += 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -928,6 +906,7 @@ bool wnd_is_used(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> 	size_t iw = bit &gt;&gt; (sb-&gt;s_blocksize_bits + 3);</div><div class='ctx'> 	u32 wbits = 8 * sb-&gt;s_blocksize;</div><div class='ctx'> 	u32 wbit = bit &amp; (wbits - 1);</div><div class='add'>+	u32 op;</div><div class='ctx'> 	size_t end;</div><div class='ctx'> 	struct rb_node *n;</div><div class='ctx'> 	struct e_node *e;</div><div class='hunk'>@@ -945,14 +924,11 @@ bool wnd_is_used(struct wnd_bitmap *wnd, size_t bit, size_t bits)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> use_wnd:</div><div class='del'>-	while (iw &lt; wnd-&gt;nwnd &amp;&amp; bits) {</div><div class='del'>-		u32 tail, op;</div><div class='del'>-</div><div class='add'>+	for (; iw &lt; wnd-&gt;nwnd &amp;&amp; bits; iw++, bits -= op, wbit = 0) {</div><div class='ctx'> 		if (unlikely(iw + 1 == wnd-&gt;nwnd))</div><div class='ctx'> 			wbits = wnd-&gt;bits_last;</div><div class='ctx'> </div><div class='del'>-		tail = wbits - wbit;</div><div class='del'>-		op = min_t(u32, tail, bits);</div><div class='add'>+		op = min_t(u32, wbits - wbit, bits);</div><div class='ctx'> </div><div class='ctx'> 		if (wnd-&gt;free_bits[iw]) {</div><div class='ctx'> 			bool ret;</div><div class='hunk'>@@ -966,10 +942,6 @@ use_wnd:</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		bits -= op;</div><div class='del'>-		wbit = 0;</div><div class='del'>-		iw += 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = true;</div><div class='ctx'> </div><div class='hunk'>@@ -1347,7 +1319,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Align to 8 byte boundary. */</div><div class='del'>-	new_wnd = bytes_to_block(sb, bitmap_size(new_bits));</div><div class='add'>+	new_wnd = bytes_to_block(sb, ntfs3_bitmap_size(new_bits));</div><div class='ctx'> 	new_last = new_bits &amp; (wbits - 1);</div><div class='ctx'> 	if (!new_last)</div><div class='ctx'> 		new_last = wbits;</div><div class='hunk'>@@ -1360,7 +1332,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)</div><div class='ctx'> 		memcpy(new_free, wnd-&gt;free_bits, wnd-&gt;nwnd * sizeof(short));</div><div class='ctx'> 		memset(new_free + wnd-&gt;nwnd, 0,</div><div class='ctx'> 		       (new_wnd - wnd-&gt;nwnd) * sizeof(short));</div><div class='del'>-		kfree(wnd-&gt;free_bits);</div><div class='add'>+		kvfree(wnd-&gt;free_bits);</div><div class='ctx'> 		wnd-&gt;free_bits = new_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1382,7 +1354,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)</div><div class='ctx'> </div><div class='ctx'> 		err = ntfs_vbo_to_lbo(sbi, &amp;wnd-&gt;run, vbo, &amp;lbo, &amp;bytes);</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		bh = ntfs_bread(sb, lbo &gt;&gt; sb-&gt;s_blocksize_bits);</div><div class='ctx'> 		if (!bh)</div><div class='hunk'>@@ -1399,6 +1371,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='ctx'> 		unlock_buffer(bh);</div><div class='ctx'> 		/* err = sync_dirty_buffer(bh); */</div><div class='add'>+		put_bh(bh);</div><div class='ctx'> </div><div class='ctx'> 		b0 = 0;</div><div class='ctx'> 		bits -= op;</div><div class='head'>diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c<br/>index ec0566b322d5..b98e95d6b4d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/dir.c</a></div><div class='hunk'>@@ -272,9 +272,12 @@ out:</div><div class='ctx'> 	return err == -ENOENT ? NULL : err ? ERR_PTR(err) : inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ntfs_filldir(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,</div><div class='del'>-			       const struct NTFS_DE *e, u8 *name,</div><div class='del'>-			       struct dir_context *ctx)</div><div class='add'>+/*</div><div class='add'>+ * returns false if 'ctx' if full</div><div class='add'>+ */</div><div class='add'>+static inline bool ntfs_dir_emit(struct ntfs_sb_info *sbi,</div><div class='add'>+				 struct ntfs_inode *ni, const struct NTFS_DE *e,</div><div class='add'>+				 u8 *name, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ATTR_FILE_NAME *fname;</div><div class='ctx'> 	unsigned long ino;</div><div class='hunk'>@@ -284,48 +287,73 @@ static inline int ntfs_filldir(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,</div><div class='ctx'> 	fname = Add2Ptr(e, sizeof(struct NTFS_DE));</div><div class='ctx'> </div><div class='ctx'> 	if (fname-&gt;type == FILE_NAME_DOS)</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (!mi_is_ref(&amp;ni-&gt;mi, &amp;fname-&gt;home))</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	ino = ino_get(&amp;e-&gt;ref);</div><div class='ctx'> </div><div class='ctx'> 	if (ino == MFT_REC_ROOT)</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Skip meta files. Unless option to show metafiles is set. */</div><div class='ctx'> 	if (!sbi-&gt;options-&gt;showmeta &amp;&amp; ntfs_is_meta_file(sbi, ino))</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (sbi-&gt;options-&gt;nohidden &amp;&amp; (fname-&gt;dup.fa &amp; FILE_ATTRIBUTE_HIDDEN))</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (fname-&gt;name_len + sizeof(struct NTFS_DE) &gt; le16_to_cpu(e-&gt;size))</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	name_len = ntfs_utf16_to_nls(sbi, fname-&gt;name, fname-&gt;name_len, name,</div><div class='ctx'> 				     PATH_MAX);</div><div class='ctx'> 	if (name_len &lt;= 0) {</div><div class='ctx'> 		ntfs_warn(sbi-&gt;sb, "failed to convert name for inode %lx.",</div><div class='ctx'> 			  ino);</div><div class='del'>-		return 0;</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* NTFS: symlinks are "dir + reparse" or "file + reparse" */</div><div class='del'>-	if (fname-&gt;dup.fa &amp; FILE_ATTRIBUTE_REPARSE_POINT)</div><div class='del'>-		dt_type = DT_LNK;</div><div class='del'>-	else</div><div class='del'>-		dt_type = (fname-&gt;dup.fa &amp; FILE_ATTRIBUTE_DIRECTORY) ? DT_DIR : DT_REG;</div><div class='add'>+	/*</div><div class='add'>+	 * NTFS: symlinks are "dir + reparse" or "file + reparse"</div><div class='add'>+	 * Unfortunately reparse attribute is used for many purposes (several dozens).</div><div class='add'>+	 * It is not possible here to know is this name symlink or not.</div><div class='add'>+	 * To get exactly the type of name we should to open inode (read mft).</div><div class='add'>+	 * getattr for opened file (fstat) correctly returns symlink.</div><div class='add'>+	 */</div><div class='add'>+	dt_type = (fname-&gt;dup.fa &amp; FILE_ATTRIBUTE_DIRECTORY) ? DT_DIR : DT_REG;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It is not reliable to detect the type of name using duplicated information</div><div class='add'>+	 * stored in parent directory.</div><div class='add'>+	 * The only correct way to get the type of name - read MFT record and find ATTR_STD.</div><div class='add'>+	 * The code below is not good idea.</div><div class='add'>+	 * It does additional locks/reads just to get the type of name.</div><div class='add'>+	 * Should we use additional mount option to enable branch below?</div><div class='add'>+	 */</div><div class='add'>+	if (fname-&gt;dup.extend_data &amp;&amp; ino != ni-&gt;mi.rno) {</div><div class='add'>+		struct inode *inode = ntfs_iget5(sbi-&gt;sb, &amp;e-&gt;ref, NULL);</div><div class='add'>+		if (!IS_ERR_OR_NULL(inode)) {</div><div class='add'>+			dt_type = fs_umode_to_dtype(inode-&gt;i_mode);</div><div class='add'>+			iput(inode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return !dir_emit(ctx, (s8 *)name, name_len, ino, dt_type);</div><div class='add'>+	return dir_emit(ctx, (s8 *)name, name_len, ino, dt_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ntfs_read_hdr - Helper function for ntfs_readdir().</div><div class='add'>+ *</div><div class='add'>+ * returns 0 if ok.</div><div class='add'>+ * returns -EINVAL if directory is corrupted.</div><div class='add'>+ * returns +1 if 'ctx' is full.</div><div class='ctx'>  */</div><div class='ctx'> static int ntfs_read_hdr(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,</div><div class='ctx'> 			 const struct INDEX_HDR *hdr, u64 vbo, u64 pos,</div><div class='ctx'> 			 u8 *name, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	const struct NTFS_DE *e;</div><div class='ctx'> 	u32 e_size;</div><div class='ctx'> 	u32 end = le32_to_cpu(hdr-&gt;used);</div><div class='hunk'>@@ -333,12 +361,12 @@ static int ntfs_read_hdr(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,</div><div class='ctx'> </div><div class='ctx'> 	for (;; off += e_size) {</div><div class='ctx'> 		if (off + sizeof(struct NTFS_DE) &gt; end)</div><div class='del'>-			return -1;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		e = Add2Ptr(hdr, off);</div><div class='ctx'> 		e_size = le16_to_cpu(e-&gt;size);</div><div class='ctx'> 		if (e_size &lt; sizeof(struct NTFS_DE) || off + e_size &gt; end)</div><div class='del'>-			return -1;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (de_is_last(e))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -348,14 +376,15 @@ static int ntfs_read_hdr(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (le16_to_cpu(e-&gt;key_size) &lt; SIZEOF_ATTRIBUTE_FILENAME)</div><div class='del'>-			return -1;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		ctx-&gt;pos = vbo + off;</div><div class='ctx'> </div><div class='ctx'> 		/* Submit the name to the filldir callback. */</div><div class='del'>-		err = ntfs_filldir(sbi, ni, e, name, ctx);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		if (!ntfs_dir_emit(sbi, ni, e, name, ctx)) {</div><div class='add'>+			/* ctx is full. */</div><div class='add'>+			return +1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -454,7 +483,6 @@ static int ntfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 		vbo = (u64)bit &lt;&lt; index_bits;</div><div class='ctx'> 		if (vbo &gt;= i_size) {</div><div class='del'>-			ntfs_inode_err(dir, "Looks like your dir is corrupt");</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -477,9 +505,16 @@ out:</div><div class='ctx'> 	__putname(name);</div><div class='ctx'> 	put_indx_node(node);</div><div class='ctx'> </div><div class='del'>-	if (err == -ENOENT) {</div><div class='add'>+	if (err == 1) {</div><div class='add'>+		/* 'ctx' is full. */</div><div class='add'>+		err = 0;</div><div class='add'>+	} else if (err == -ENOENT) {</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		ctx-&gt;pos = pos;</div><div class='add'>+	} else if (err &lt; 0) {</div><div class='add'>+		if (err == -EINVAL)</div><div class='add'>+			_ntfs_bad_inode(dir);</div><div class='add'>+		ctx-&gt;pos = eod;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -495,11 +530,9 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,</div><div class='ctx'> 	struct INDEX_HDR *hdr;</div><div class='ctx'> 	const struct ATTR_FILE_NAME *fname;</div><div class='ctx'> 	u32 e_size, off, end;</div><div class='del'>-	u64 vbo = 0;</div><div class='ctx'> 	size_t drs = 0, fles = 0, bit = 0;</div><div class='del'>-	loff_t i_size = ni-&gt;vfs_inode.i_size;</div><div class='ctx'> 	struct indx_node *node = NULL;</div><div class='del'>-	u8 index_bits = ni-&gt;dir.index_bits;</div><div class='add'>+	size_t max_indx = i_size_read(&amp;ni-&gt;vfs_inode) &gt;&gt; ni-&gt;dir.index_bits;</div><div class='ctx'> </div><div class='ctx'> 	if (is_empty)</div><div class='ctx'> 		*is_empty = true;</div><div class='hunk'>@@ -518,8 +551,10 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,</div><div class='ctx'> 			e = Add2Ptr(hdr, off);</div><div class='ctx'> 			e_size = le16_to_cpu(e-&gt;size);</div><div class='ctx'> 			if (e_size &lt; sizeof(struct NTFS_DE) ||</div><div class='del'>-			    off + e_size &gt; end)</div><div class='add'>+			    off + e_size &gt; end) {</div><div class='add'>+				/* Looks like corruption. */</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (de_is_last(e))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -543,7 +578,7 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,</div><div class='ctx'> 				fles += 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (vbo &gt;= i_size)</div><div class='add'>+		if (bit &gt;= max_indx)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		err = indx_used_bit(&amp;ni-&gt;dir, ni, &amp;bit);</div><div class='hunk'>@@ -553,8 +588,7 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,</div><div class='ctx'> 		if (bit == MINUS_ONE_T)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		vbo = (u64)bit &lt;&lt; index_bits;</div><div class='del'>-		if (vbo &gt;= i_size)</div><div class='add'>+		if (bit &gt;= max_indx)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		err = indx_read(&amp;ni-&gt;dir, ni, bit &lt;&lt; ni-&gt;dir.idx2vbn_bits,</div><div class='hunk'>@@ -564,7 +598,6 @@ static int ntfs_dir_count(struct inode *dir, bool *is_empty, size_t *dirs,</div><div class='ctx'> </div><div class='ctx'> 		hdr = &amp;node-&gt;index-&gt;ihdr;</div><div class='ctx'> 		bit += 1;</div><div class='del'>-		vbo = (u64)bit &lt;&lt; ni-&gt;dir.idx2vbn_bits;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -593,5 +626,18 @@ const struct file_operations ntfs_dir_operations = {</div><div class='ctx'> 	.iterate_shared	= ntfs_readdir,</div><div class='ctx'> 	.fsync		= generic_file_fsync,</div><div class='ctx'> 	.open		= ntfs_file_open,</div><div class='add'>+	.unlocked_ioctl = ntfs_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl   = ntfs_compat_ioctl,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NTFS_FS)</div><div class='add'>+const struct file_operations ntfs_legacy_dir_operations = {</div><div class='add'>+	.llseek		= generic_file_llseek,</div><div class='add'>+	.read		= generic_read_dir,</div><div class='add'>+	.iterate_shared	= ntfs_readdir,</div><div class='add'>+	.open		= ntfs_file_open,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> // clang-format on</div><div class='head'>diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c<br/>index a5a30a24ce5d..2e7b2e566ebe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/file.c</a></div><div class='hunk'>@@ -13,11 +13,18 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='ctx'> #include &lt;linux/fiemap.h&gt;</div><div class='add'>+#include &lt;linux/fileattr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "ntfs.h"</div><div class='ctx'> #include "ntfs_fs.h"</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * cifx, btrfs, exfat, ext4, f2fs use this constant.</div><div class='add'>+ * Hope this value will become common to all fs.</div><div class='add'>+ */</div><div class='add'>+#define NTFS3_IOC_SHUTDOWN _IOR('X', 125, __u32)</div><div class='add'>+</div><div class='ctx'> static int ntfs_ioctl_fitrim(struct ntfs_sb_info *sbi, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fstrim_range __user *user_range;</div><div class='hunk'>@@ -48,20 +55,91 @@ static int ntfs_ioctl_fitrim(struct ntfs_sb_info *sbi, unsigned long arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg)</div><div class='add'>+static int ntfs_ioctl_get_volume_label(struct ntfs_sb_info *sbi, u8 __user *buf)</div><div class='add'>+{</div><div class='add'>+	if (copy_to_user(buf, sbi-&gt;volume.label, FSLABEL_MAX))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ntfs_ioctl_set_volume_label(struct ntfs_sb_info *sbi, u8 __user *buf)</div><div class='add'>+{</div><div class='add'>+	u8 user[FSLABEL_MAX] = { 0 };</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(user, buf, FSLABEL_MAX))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	len = strnlen(user, FSLABEL_MAX);</div><div class='add'>+</div><div class='add'>+	return ntfs_set_label(sbi, user, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ntfs_force_shutdown - helper function. Called from ioctl</div><div class='add'>+ */</div><div class='add'>+static int ntfs_force_shutdown(struct super_block *sb, u32 flags)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(sb)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* No additional options yet (flags). */</div><div class='add'>+	err = bdev_freeze(sb-&gt;s_bdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	set_bit(NTFS_FLAGS_SHUTDOWN_BIT, &amp;sbi-&gt;flags);</div><div class='add'>+	bdev_thaw(sb-&gt;s_bdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ntfs_ioctl_shutdown(struct super_block *sb, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (get_user(flags, (__u32 __user *)arg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return ntfs_force_shutdown(sb, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ntfs_ioctl - file_operations::unlocked_ioctl</div><div class='add'>+ */</div><div class='add'>+long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='del'>-	struct ntfs_sb_info *sbi = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='add'>+	struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ntfs_i(inode))))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case FITRIM:</div><div class='ctx'> 		return ntfs_ioctl_fitrim(sbi, arg);</div><div class='add'>+	case FS_IOC_GETFSLABEL:</div><div class='add'>+		return ntfs_ioctl_get_volume_label(sbi, (u8 __user *)arg);</div><div class='add'>+	case FS_IOC_SETFSLABEL:</div><div class='add'>+		return ntfs_ioctl_set_volume_label(sbi, (u8 __user *)arg);</div><div class='add'>+	case NTFS3_IOC_SHUTDOWN:</div><div class='add'>+		return ntfs_ioctl_shutdown(sb, arg);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOTTY; /* Inappropriate ioctl for device. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-static long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg)</div><div class='add'>+long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	return ntfs_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));</div><div class='hunk'>@@ -77,20 +155,31 @@ int ntfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	stat-&gt;result_mask |= STATX_BTIME;</div><div class='add'>+	stat-&gt;btime = ni-&gt;i_crtime;</div><div class='add'>+	stat-&gt;blksize = ni-&gt;mi.sbi-&gt;cluster_size; /* 512, 1K, ..., 2M */</div><div class='add'>+</div><div class='add'>+	if (inode-&gt;i_flags &amp; S_IMMUTABLE)</div><div class='add'>+		stat-&gt;attributes |= STATX_ATTR_IMMUTABLE;</div><div class='add'>+</div><div class='add'>+	if (inode-&gt;i_flags &amp; S_APPEND)</div><div class='add'>+		stat-&gt;attributes |= STATX_ATTR_APPEND;</div><div class='add'>+</div><div class='ctx'> 	if (is_compressed(ni))</div><div class='ctx'> 		stat-&gt;attributes |= STATX_ATTR_COMPRESSED;</div><div class='ctx'> </div><div class='ctx'> 	if (is_encrypted(ni))</div><div class='ctx'> 		stat-&gt;attributes |= STATX_ATTR_ENCRYPTED;</div><div class='ctx'> </div><div class='del'>-	stat-&gt;attributes_mask |= STATX_ATTR_COMPRESSED | STATX_ATTR_ENCRYPTED;</div><div class='add'>+	stat-&gt;attributes_mask |= STATX_ATTR_COMPRESSED | STATX_ATTR_ENCRYPTED |</div><div class='add'>+				 STATX_ATTR_IMMUTABLE | STATX_ATTR_APPEND;</div><div class='ctx'> </div><div class='ctx'> 	generic_fillattr(idmap, request_mask, inode, stat);</div><div class='ctx'> </div><div class='del'>-	stat-&gt;result_mask |= STATX_BTIME;</div><div class='del'>-	stat-&gt;btime = ni-&gt;i_crtime;</div><div class='del'>-	stat-&gt;blksize = ni-&gt;mi.sbi-&gt;cluster_size; /* 512, 1K, ..., 2M */</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -105,17 +194,19 @@ static int ntfs_extend_initialized_size(struct file *file,</div><div class='ctx'> 	loff_t pos = valid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (valid &gt;= new_valid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (is_resident(ni)) {</div><div class='ctx'> 		ni-&gt;i_valid = new_valid;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(is_compressed(ni));</div><div class='del'>-	WARN_ON(valid &gt;= new_valid);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		u32 zerofrom, len;</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		u8 bits;</div><div class='ctx'> 		CLST vcn, lcn, clen;</div><div class='ctx'> </div><div class='hunk'>@@ -141,14 +232,13 @@ static int ntfs_extend_initialized_size(struct file *file,</div><div class='ctx'> 		if (pos + len &gt; new_valid)</div><div class='ctx'> 			len = new_valid - pos;</div><div class='ctx'> </div><div class='del'>-		err = ntfs_write_begin(file, mapping, pos, len, &amp;page, NULL);</div><div class='add'>+		err = ntfs_write_begin(NULL, mapping, pos, len, &amp;folio, NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		zero_user_segment(page, zerofrom, PAGE_SIZE);</div><div class='add'>+		folio_zero_range(folio, zerofrom, folio_size(folio) - zerofrom);</div><div class='ctx'> </div><div class='del'>-		/* This function in any case puts page. */</div><div class='del'>-		err = ntfs_write_end(file, mapping, pos, len, len, page, NULL);</div><div class='add'>+		err = ntfs_write_end(NULL, mapping, pos, len, len, folio, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		pos += len;</div><div class='hunk'>@@ -188,6 +278,7 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)</div><div class='ctx'> 	u32 bh_next, bh_off, to;</div><div class='ctx'> 	sector_t iblock;</div><div class='ctx'> 	struct folio *folio;</div><div class='add'>+	bool dirty = false;</div><div class='ctx'> </div><div class='ctx'> 	for (; idx &lt; idx_end; idx += 1, from = 0) {</div><div class='ctx'> 		page_off = (loff_t)idx &lt;&lt; PAGE_SHIFT;</div><div class='hunk'>@@ -195,9 +286,9 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)</div><div class='ctx'> 						       PAGE_SIZE;</div><div class='ctx'> 		iblock = page_off &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='del'>-		folio = __filemap_get_folio(mapping, idx,</div><div class='del'>-				FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='del'>-				mapping_gfp_constraint(mapping, ~__GFP_FS));</div><div class='add'>+		folio = __filemap_get_folio(</div><div class='add'>+			mapping, idx, FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+			mapping_gfp_constraint(mapping, ~__GFP_FS));</div><div class='ctx'> 		if (IS_ERR(folio))</div><div class='ctx'> 			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='hunk'>@@ -223,44 +314,49 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)</div><div class='ctx'> 			/* Ok, it's mapped. Make sure it's up-to-date. */</div><div class='ctx'> 			if (folio_test_uptodate(folio))</div><div class='ctx'> 				set_buffer_uptodate(bh);</div><div class='del'>-</div><div class='del'>-			if (!buffer_uptodate(bh)) {</div><div class='del'>-				err = bh_read(bh, 0);</div><div class='del'>-				if (err &lt; 0) {</div><div class='del'>-					folio_unlock(folio);</div><div class='del'>-					folio_put(folio);</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='add'>+			else if (bh_read(bh, 0) &lt; 0) {</div><div class='add'>+				err = -EIO;</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				folio_put(folio);</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			mark_buffer_dirty(bh);</div><div class='del'>-</div><div class='ctx'> 		} while (bh_off = bh_next, iblock += 1,</div><div class='ctx'> 			 head != (bh = bh-&gt;b_this_page));</div><div class='ctx'> </div><div class='ctx'> 		folio_zero_segment(folio, from, to);</div><div class='add'>+		dirty = true;</div><div class='ctx'> </div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		folio_put(folio);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	mark_inode_dirty(inode);</div><div class='add'>+	if (dirty)</div><div class='add'>+		mark_inode_dirty(inode);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_file_mmap - file_operations::mmap</div><div class='add'>+ * ntfs_file_mmap_prepare - file_operations::mmap_prepare</div><div class='ctx'>  */</div><div class='del'>-static int ntfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int ntfs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='del'>-	u64 from = ((u64)vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	bool rw = vma-&gt;vm_flags &amp; VM_WRITE;</div><div class='add'>+	u64 from = ((u64)desc-&gt;pgoff &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	bool rw = desc-&gt;vm_flags &amp; VM_WRITE;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (is_encrypted(ni)) {</div><div class='ctx'> 		ntfs_inode_warn(inode, "mmap encrypted not supported");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -271,14 +367,19 @@ static int ntfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_compressed(ni) &amp;&amp; rw) {</div><div class='del'>-		ntfs_inode_warn(inode, "mmap(write) compressed not supported");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	if (is_compressed(ni)) {</div><div class='add'>+		if (rw) {</div><div class='add'>+			ntfs_inode_warn(inode,</div><div class='add'>+					"mmap(write) compressed not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		/* Turn off readahead for compressed files. */</div><div class='add'>+		file-&gt;f_ra.ra_pages = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rw) {</div><div class='ctx'> 		u64 to = min_t(loff_t, i_size_read(inode),</div><div class='del'>-			       from + vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='add'>+			       from + vma_desc_size(desc));</div><div class='ctx'> </div><div class='ctx'> 		if (is_sparsed(ni)) {</div><div class='ctx'> 			/* Allocate clusters for rw map. */</div><div class='hunk'>@@ -309,7 +410,7 @@ static int ntfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = generic_file_mmap(file, vma);</div><div class='add'>+	err = generic_file_mmap_prepare(desc);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -343,6 +444,42 @@ static int ntfs_extend(struct inode *inode, loff_t pos, size_t count,</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (file &amp;&amp; is_sparsed(ni)) {</div><div class='add'>+		/*</div><div class='add'>+		 * This code optimizes large writes to sparse file.</div><div class='add'>+		 * TODO: merge this fragment with fallocate fragment.</div><div class='add'>+		 */</div><div class='add'>+		struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='add'>+		CLST vcn = pos &gt;&gt; sbi-&gt;cluster_bits;</div><div class='add'>+		CLST cend = bytes_to_cluster(sbi, end);</div><div class='add'>+		CLST cend_v = bytes_to_cluster(sbi, ni-&gt;i_valid);</div><div class='add'>+		CLST lcn, clen;</div><div class='add'>+		bool new;</div><div class='add'>+</div><div class='add'>+		if (cend_v &gt; cend)</div><div class='add'>+			cend_v = cend;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate and zero new clusters.</div><div class='add'>+		 * Zeroing these clusters may be too long.</div><div class='add'>+		 */</div><div class='add'>+		for (; vcn &lt; cend_v; vcn += clen) {</div><div class='add'>+			err = attr_data_get_block(ni, vcn, cend_v - vcn, &amp;lcn,</div><div class='add'>+						  &amp;clen, &amp;new, true);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Allocate but not zero new clusters.</div><div class='add'>+		 */</div><div class='add'>+		for (; vcn &lt; cend; vcn += clen) {</div><div class='add'>+			err = attr_data_get_block(ni, vcn, cend - vcn, &amp;lcn,</div><div class='add'>+						  &amp;clen, &amp;new, false);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='ctx'> 	mark_inode_dirty(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -413,13 +550,11 @@ static int ntfs_truncate(struct inode *inode, loff_t new_size)</div><div class='ctx'> 	if (dirty)</div><div class='ctx'> 		mark_inode_dirty(inode);</div><div class='ctx'> </div><div class='del'>-	/*ntfs_flush_inodes(inode-&gt;i_sb, inode, NULL);*/</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_fallocate</div><div class='add'>+ * ntfs_fallocate - file_operations::ntfs_fallocate</div><div class='ctx'>  *</div><div class='ctx'>  * Preallocate space for a file. This implements ntfs's fallocate file</div><div class='ctx'>  * operation, which gets called from sys_fallocate system call. User</div><div class='hunk'>@@ -429,7 +564,7 @@ static int ntfs_truncate(struct inode *inode, loff_t new_size)</div><div class='ctx'>  */</div><div class='ctx'> static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='hunk'>@@ -499,10 +634,14 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)</div><div class='ctx'> 		ni_lock(ni);</div><div class='ctx'> 		err = attr_punch_hole(ni, vbo, len, &amp;frame_size);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='add'>+		if (!err)</div><div class='add'>+			goto ok;</div><div class='add'>+</div><div class='ctx'> 		if (err != E_NTFS_NOTALIGNED)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		/* Process not aligned punch. */</div><div class='add'>+		err = 0;</div><div class='ctx'> 		mask = frame_size - 1;</div><div class='ctx'> 		vbo_a = (vbo + mask) &amp; ~mask;</div><div class='ctx'> 		end_a = end &amp; ~mask;</div><div class='hunk'>@@ -525,6 +664,8 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)</div><div class='ctx'> 			ni_lock(ni);</div><div class='ctx'> 			err = attr_punch_hole(ni, vbo_a, end_a - vbo_a, NULL);</div><div class='ctx'> 			ni_unlock(ni);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (mode &amp; FALLOC_FL_COLLAPSE_RANGE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -548,6 +689,8 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)</div><div class='ctx'> 		ni_lock(ni);</div><div class='ctx'> 		err = attr_collapse_range(ni, vbo, len);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='ctx'> 	} else if (mode &amp; FALLOC_FL_INSERT_RANGE) {</div><div class='ctx'> 		/* Check new size. */</div><div class='ctx'> 		err = inode_newsize_ok(inode, new_size);</div><div class='hunk'>@@ -564,10 +707,21 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)</div><div class='ctx'> 		ni_lock(ni);</div><div class='ctx'> 		err = attr_insert_range(ni, vbo, len);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Check new size. */</div><div class='ctx'> 		u8 cluster_bits = sbi-&gt;cluster_bits;</div><div class='ctx'> </div><div class='add'>+		/* Be sure file is non resident. */</div><div class='add'>+		if (is_resident(ni)) {</div><div class='add'>+			ni_lock(ni);</div><div class='add'>+			err = attr_force_nonresident(ni);</div><div class='add'>+			ni_unlock(ni);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* generic/213: expected -ENOSPC instead of -EFBIG. */</div><div class='ctx'> 		if (!is_supported_holes) {</div><div class='ctx'> 			loff_t to_alloc = new_size - inode_get_bytes(inode);</div><div class='hunk'>@@ -633,11 +787,18 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)</div><div class='ctx'> 					    &amp;ni-&gt;file.run, i_size, &amp;ni-&gt;i_valid,</div><div class='ctx'> 					    true, NULL);</div><div class='ctx'> 			ni_unlock(ni);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='ctx'> 		} else if (new_size &gt; i_size) {</div><div class='del'>-			inode-&gt;i_size = new_size;</div><div class='add'>+			i_size_write(inode, new_size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+ok:</div><div class='add'>+	err = file_modified(file);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	if (map_locked)</div><div class='ctx'> 		filemap_invalidate_unlock(mapping);</div><div class='hunk'>@@ -652,10 +813,10 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs3_setattr - inode_operations::setattr</div><div class='add'>+ * ntfs_setattr - inode_operations::setattr</div><div class='ctx'>  */</div><div class='del'>-int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		  struct iattr *attr)</div><div class='add'>+int ntfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		 struct iattr *attr)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='hunk'>@@ -663,6 +824,13 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	umode_t mode = inode-&gt;i_mode;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	err = setattr_prepare(idmap, dentry, attr);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -676,7 +844,7 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		inode_dio_wait(inode);</div><div class='del'>-		oldsize = inode-&gt;i_size;</div><div class='add'>+		oldsize = i_size_read(inode);</div><div class='ctx'> 		newsize = attr-&gt;ia_size;</div><div class='ctx'> </div><div class='ctx'> 		if (newsize &lt;= oldsize)</div><div class='hunk'>@@ -688,7 +856,7 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		ni-&gt;ni_flags |= NI_FLAG_UPDATE_PARENT;</div><div class='del'>-		inode-&gt;i_size = newsize;</div><div class='add'>+		i_size_write(inode, newsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setattr_copy(idmap, inode, attr);</div><div class='hunk'>@@ -712,22 +880,26 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='add'>+/*</div><div class='add'>+ * check_read_restriction:</div><div class='add'>+ * common code for ntfs_file_read_iter and ntfs_file_splice_read</div><div class='add'>+ */</div><div class='add'>+static int check_read_restriction(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (is_encrypted(ni)) {</div><div class='ctx'> 		ntfs_inode_warn(inode, "encrypted i/o not supported");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_compressed(ni) &amp;&amp; (iocb-&gt;ki_flags &amp; IOCB_DIRECT)) {</div><div class='del'>-		ntfs_inode_warn(inode, "direct i/o + compressed not supported");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_NTFS3_LZX_XPRESS</div><div class='ctx'> 	if (ni-&gt;ni_flags &amp; NI_FLAG_COMPRESSED_MASK) {</div><div class='ctx'> 		ntfs_inode_warn(</div><div class='hunk'>@@ -742,33 +914,63 @@ static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return generic_file_read_iter(iocb, iter);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ntfs_file_splice_read(struct file *in, loff_t *ppos,</div><div class='del'>-				     struct pipe_inode_info *pipe, size_t len,</div><div class='del'>-				     unsigned int flags)</div><div class='add'>+/*</div><div class='add'>+ * ntfs_file_read_iter - file_operations::read_iter</div><div class='add'>+ */</div><div class='add'>+static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = in-&gt;f_mapping-&gt;host;</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='add'>+	ssize_t err;</div><div class='ctx'> </div><div class='del'>-	if (is_encrypted(ni)) {</div><div class='del'>-		ntfs_inode_warn(inode, "encrypted i/o not supported");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	err = check_read_restriction(inode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (is_compressed(ni)) {</div><div class='add'>+		if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='add'>+			ntfs_inode_warn(</div><div class='add'>+				inode, "direct i/o + compressed not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		/* Turn off readahead for compressed files. */</div><div class='add'>+		file-&gt;f_ra.ra_pages = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_NTFS3_LZX_XPRESS</div><div class='del'>-	if (ni-&gt;ni_flags &amp; NI_FLAG_COMPRESSED_MASK) {</div><div class='del'>-		ntfs_inode_warn(</div><div class='del'>-			inode,</div><div class='del'>-			"activate CONFIG_NTFS3_LZX_XPRESS to read external compressed files");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	/* Check minimum alignment for dio. */</div><div class='add'>+	if (iocb-&gt;ki_flags &amp; IOCB_DIRECT) {</div><div class='add'>+		struct super_block *sb = inode-&gt;i_sb;</div><div class='add'>+		struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+		if ((iocb-&gt;ki_pos | iov_iter_alignment(iter)) &amp;</div><div class='add'>+		    sbi-&gt;bdev_blocksize_mask) {</div><div class='add'>+			iocb-&gt;ki_flags &amp;= ~IOCB_DIRECT;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	if (is_dedup(ni)) {</div><div class='del'>-		ntfs_inode_warn(inode, "read deduplicated not supported");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	return generic_file_read_iter(iocb, iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ntfs_file_splice_read - file_operations::splice_read</div><div class='add'>+ */</div><div class='add'>+static ssize_t ntfs_file_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+				     struct pipe_inode_info *pipe, size_t len,</div><div class='add'>+				     unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(in);</div><div class='add'>+	ssize_t err;</div><div class='add'>+</div><div class='add'>+	err = check_read_restriction(inode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (is_compressed(ntfs_i(inode))) {</div><div class='add'>+		/* Turn off readahead for compressed files. */</div><div class='add'>+		in-&gt;f_ra.ra_pages = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return filemap_splice_read(in, ppos, pipe, len, flags);</div><div class='hunk'>@@ -789,23 +991,25 @@ static int ntfs_get_frame_pages(struct address_space *mapping, pgoff_t index,</div><div class='ctx'> 	*frame_uptodate = true;</div><div class='ctx'> </div><div class='ctx'> 	for (npages = 0; npages &lt; pages_per_frame; npages++, index++) {</div><div class='del'>-		struct page *page;</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> </div><div class='del'>-		page = find_or_create_page(mapping, index, gfp_mask);</div><div class='del'>-		if (!page) {</div><div class='add'>+		folio = __filemap_get_folio(mapping, index,</div><div class='add'>+					    FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					    gfp_mask);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='ctx'> 			while (npages--) {</div><div class='del'>-				page = pages[npages];</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				put_page(page);</div><div class='add'>+				folio = page_folio(pages[npages]);</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				folio_put(folio);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!PageUptodate(page))</div><div class='add'>+		if (!folio_test_uptodate(folio))</div><div class='ctx'> 			*frame_uptodate = false;</div><div class='ctx'> </div><div class='del'>-		pages[npages] = page;</div><div class='add'>+		pages[npages] = &amp;folio-&gt;page;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -821,12 +1025,13 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	size_t count = iov_iter_count(from);</div><div class='ctx'> 	loff_t pos = iocb-&gt;ki_pos;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	loff_t i_size = inode-&gt;i_size;</div><div class='add'>+	loff_t i_size = i_size_read(inode);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> 	u64 valid = ni-&gt;i_valid;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='del'>-	struct page *page, **pages = NULL;</div><div class='add'>+	struct page **pages = NULL;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	size_t written = 0;</div><div class='ctx'> 	u8 frame_bits = NTFS_LZNT_CUNIT + sbi-&gt;cluster_bits;</div><div class='ctx'> 	u32 frame_size = 1u &lt;&lt; frame_bits;</div><div class='hunk'>@@ -886,12 +1091,12 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> </div><div class='ctx'> 		if (!frame_uptodate &amp;&amp; off) {</div><div class='ctx'> 			err = ni_read_frame(ni, frame_vbo, pages,</div><div class='del'>-					    pages_per_frame);</div><div class='add'>+					    pages_per_frame, 0);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				for (ip = 0; ip &lt; pages_per_frame; ip++) {</div><div class='del'>-					page = pages[ip];</div><div class='del'>-					unlock_page(page);</div><div class='del'>-					put_page(page);</div><div class='add'>+					folio = page_folio(pages[ip]);</div><div class='add'>+					folio_unlock(folio);</div><div class='add'>+					folio_put(folio);</div><div class='ctx'> 				}</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -900,10 +1105,10 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		ip = off &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		off = offset_in_page(valid);</div><div class='ctx'> 		for (; ip &lt; pages_per_frame; ip++, off = 0) {</div><div class='del'>-			page = pages[ip];</div><div class='del'>-			zero_user_segment(page, off, PAGE_SIZE);</div><div class='del'>-			flush_dcache_page(page);</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+			folio = page_folio(pages[ip]);</div><div class='add'>+			folio_zero_segment(folio, off, PAGE_SIZE);</div><div class='add'>+			flush_dcache_folio(folio);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ni_lock(ni);</div><div class='hunk'>@@ -911,10 +1116,10 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		ni_unlock(ni);</div><div class='ctx'> </div><div class='ctx'> 		for (ip = 0; ip &lt; pages_per_frame; ip++) {</div><div class='del'>-			page = pages[ip];</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio = page_folio(pages[ip]);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -951,13 +1156,13 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> </div><div class='ctx'> 			if (off || (to &lt; i_size &amp;&amp; (to &amp; (frame_size - 1)))) {</div><div class='ctx'> 				err = ni_read_frame(ni, frame_vbo, pages,</div><div class='del'>-						    pages_per_frame);</div><div class='add'>+						    pages_per_frame, 0);</div><div class='ctx'> 				if (err) {</div><div class='ctx'> 					for (ip = 0; ip &lt; pages_per_frame;</div><div class='ctx'> 					     ip++) {</div><div class='del'>-						page = pages[ip];</div><div class='del'>-						unlock_page(page);</div><div class='del'>-						put_page(page);</div><div class='add'>+						folio = page_folio(pages[ip]);</div><div class='add'>+						folio_unlock(folio);</div><div class='add'>+						folio_put(folio);</div><div class='ctx'> 					}</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -973,10 +1178,10 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			size_t cp, tail = PAGE_SIZE - off;</div><div class='ctx'> </div><div class='del'>-			page = pages[ip];</div><div class='del'>-			cp = copy_page_from_iter_atomic(page, off,</div><div class='del'>-							min(tail, bytes), from);</div><div class='del'>-			flush_dcache_page(page);</div><div class='add'>+			folio = page_folio(pages[ip]);</div><div class='add'>+			cp = copy_folio_from_iter_atomic(</div><div class='add'>+				folio, off, min(tail, bytes), from);</div><div class='add'>+			flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> 			copied += cp;</div><div class='ctx'> 			bytes -= cp;</div><div class='hunk'>@@ -996,11 +1201,11 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		ni_unlock(ni);</div><div class='ctx'> </div><div class='ctx'> 		for (ip = 0; ip &lt; pages_per_frame; ip++) {</div><div class='del'>-			page = pages[ip];</div><div class='del'>-			ClearPageDirty(page);</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			put_page(page);</div><div class='add'>+			folio = page_folio(pages[ip]);</div><div class='add'>+			folio_clear_dirty(folio);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='add'>+			folio_unlock(folio);</div><div class='add'>+			folio_put(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1028,46 +1233,77 @@ out:</div><div class='ctx'> 	iocb-&gt;ki_pos += written;</div><div class='ctx'> 	if (iocb-&gt;ki_pos &gt; ni-&gt;i_valid)</div><div class='ctx'> 		ni-&gt;i_valid = iocb-&gt;ki_pos;</div><div class='add'>+	if (iocb-&gt;ki_pos &gt; i_size)</div><div class='add'>+		i_size_write(inode, iocb-&gt;ki_pos);</div><div class='ctx'> </div><div class='ctx'> 	return written;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_file_write_iter - file_operations::write_iter</div><div class='add'>+ * check_write_restriction:</div><div class='add'>+ * common code for ntfs_file_write_iter and ntfs_file_splice_write</div><div class='ctx'>  */</div><div class='del'>-static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+static int check_write_restriction(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct inode *inode = mapping-&gt;host;</div><div class='del'>-	ssize_t ret;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (is_encrypted(ni)) {</div><div class='ctx'> 		ntfs_inode_warn(inode, "encrypted i/o not supported");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_compressed(ni) &amp;&amp; (iocb-&gt;ki_flags &amp; IOCB_DIRECT)) {</div><div class='del'>-		ntfs_inode_warn(inode, "direct i/o + compressed not supported");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (is_dedup(ni)) {</div><div class='ctx'> 		ntfs_inode_warn(inode, "write into deduplicated not supported");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ntfs_file_write_iter - file_operations::write_iter</div><div class='add'>+ */</div><div class='add'>+static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+{</div><div class='add'>+	struct file *file = iocb-&gt;ki_filp;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!inode_trylock(inode)) {</div><div class='ctx'> 		if (iocb-&gt;ki_flags &amp; IOCB_NOWAIT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		inode_lock(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = check_write_restriction(inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (is_compressed(ni) &amp;&amp; (iocb-&gt;ki_flags &amp; IOCB_DIRECT)) {</div><div class='add'>+		ntfs_inode_warn(inode, "direct i/o + compressed not supported");</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = generic_write_checks(iocb, from);</div><div class='ctx'> 	if (ret &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	err = file_modified(iocb-&gt;ki_filp);</div><div class='add'>+	if (err) {</div><div class='add'>+		ret = err;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(ni-&gt;ni_flags &amp; NI_FLAG_COMPRESSED_MASK)) {</div><div class='ctx'> 		/* Should never be here, see ntfs_file_open(). */</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='hunk'>@@ -1097,6 +1333,13 @@ int ntfs_file_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely((is_compressed(ni) || is_encrypted(ni)) &amp;&amp;</div><div class='ctx'> 		     (file-&gt;f_flags &amp; O_DIRECT))) {</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1133,12 +1376,20 @@ static int ntfs_file_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	/* If we are last writer on the inode, drop the block reservation. */</div><div class='ctx'> 	if (sbi-&gt;options-&gt;prealloc &amp;&amp;</div><div class='ctx'> 	    ((file-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp;</div><div class='del'>-	     atomic_read(&amp;inode-&gt;i_writecount) == 1)) {</div><div class='add'>+	     atomic_read(&amp;inode-&gt;i_writecount) == 1)</div><div class='add'>+	    /*</div><div class='add'>+	    * The only file when inode-&gt;i_fop = &amp;ntfs_file_operations and</div><div class='add'>+	    * init_rwsem(&amp;ni-&gt;file.run_lock) is not called explicitly is MFT.</div><div class='add'>+	    *</div><div class='add'>+	    * Add additional check here.</div><div class='add'>+	    */</div><div class='add'>+	    &amp;&amp; inode-&gt;i_ino != MFT_REC_MFT) {</div><div class='ctx'> 		ni_lock(ni);</div><div class='ctx'> 		down_write(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> </div><div class='ctx'> 		err = attr_set_size(ni, ATTR_DATA, NULL, 0, &amp;ni-&gt;file.run,</div><div class='del'>-				    inode-&gt;i_size, &amp;ni-&gt;i_valid, false, NULL);</div><div class='add'>+				    i_size_read(inode), &amp;ni-&gt;i_valid, false,</div><div class='add'>+				    NULL);</div><div class='ctx'> </div><div class='ctx'> 		up_write(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='hunk'>@@ -1147,7 +1398,7 @@ static int ntfs_file_release(struct inode *inode, struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_fiemap - file_operations::fiemap</div><div class='add'>+ * ntfs_fiemap - inode_operations::fiemap</div><div class='ctx'>  */</div><div class='ctx'> int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		__u64 start, __u64 len)</div><div class='hunk'>@@ -1155,6 +1406,10 @@ int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	err = fiemap_prep(inode, fieinfo, start, &amp;len, ~FIEMAP_FLAG_XATTR);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1168,10 +1423,39 @@ int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ntfs_file_splice_write - file_operations::splice_write</div><div class='add'>+ */</div><div class='add'>+static ssize_t ntfs_file_splice_write(struct pipe_inode_info *pipe,</div><div class='add'>+				      struct file *file, loff_t *ppos,</div><div class='add'>+				      size_t len, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	ssize_t err;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+</div><div class='add'>+	err = check_write_restriction(inode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return iter_file_splice_write(pipe, file, ppos, len, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ntfs_file_fsync - file_operations::fsync</div><div class='add'>+ */</div><div class='add'>+static int ntfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return generic_file_fsync(file, start, end, datasync);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> // clang-format off</div><div class='ctx'> const struct inode_operations ntfs_file_inode_operations = {</div><div class='ctx'> 	.getattr	= ntfs_getattr,</div><div class='del'>-	.setattr	= ntfs3_setattr,</div><div class='add'>+	.setattr	= ntfs_setattr,</div><div class='ctx'> 	.listxattr	= ntfs_listxattr,</div><div class='ctx'> 	.get_acl	= ntfs_get_acl,</div><div class='ctx'> 	.set_acl	= ntfs_set_acl,</div><div class='hunk'>@@ -1187,11 +1471,21 @@ const struct file_operations ntfs_file_operations = {</div><div class='ctx'> 	.compat_ioctl	= ntfs_compat_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.splice_read	= ntfs_file_splice_read,</div><div class='del'>-	.mmap		= ntfs_file_mmap,</div><div class='add'>+	.splice_write	= ntfs_file_splice_write,</div><div class='add'>+	.mmap_prepare	= ntfs_file_mmap_prepare,</div><div class='ctx'> 	.open		= ntfs_file_open,</div><div class='del'>-	.fsync		= generic_file_fsync,</div><div class='del'>-	.splice_write	= iter_file_splice_write,</div><div class='add'>+	.fsync		= ntfs_file_fsync,</div><div class='ctx'> 	.fallocate	= ntfs_fallocate,</div><div class='ctx'> 	.release	= ntfs_file_release,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NTFS_FS)</div><div class='add'>+const struct file_operations ntfs_legacy_file_operations = {</div><div class='add'>+	.llseek		= generic_file_llseek,</div><div class='add'>+	.read_iter	= ntfs_file_read_iter,</div><div class='add'>+	.splice_read	= ntfs_file_splice_read,</div><div class='add'>+	.open		= ntfs_file_open,</div><div class='add'>+	.release	= ntfs_file_release,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> // clang-format on</div><div class='head'>diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c<br/>index 3df2d9e34b91..641ddaf8d4a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/frecord.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/frecord.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/frecord.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/frecord.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ struct ATTR_STD_INFO *ni_std(struct ntfs_inode *ni)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ATTRIB *attr;</div><div class='ctx'> </div><div class='del'>-	attr = mi_find_attr(&amp;ni-&gt;mi, NULL, ATTR_STD, NULL, 0, NULL);</div><div class='add'>+	attr = mi_find_attr(ni, &amp;ni-&gt;mi, NULL, ATTR_STD, NULL, 0, NULL);</div><div class='ctx'> 	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO)) :</div><div class='ctx'> 		      NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -89,7 +89,7 @@ struct ATTR_STD_INFO5 *ni_std5(struct ntfs_inode *ni)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ATTRIB *attr;</div><div class='ctx'> </div><div class='del'>-	attr = mi_find_attr(&amp;ni-&gt;mi, NULL, ATTR_STD, NULL, 0, NULL);</div><div class='add'>+	attr = mi_find_attr(ni, &amp;ni-&gt;mi, NULL, ATTR_STD, NULL, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO5)) :</div><div class='ctx'> 		      NULL;</div><div class='hunk'>@@ -102,7 +102,9 @@ void ni_clear(struct ntfs_inode *ni)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node;</div><div class='ctx'> </div><div class='del'>-	if (!ni-&gt;vfs_inode.i_nlink &amp;&amp; ni-&gt;mi.mrec &amp;&amp; is_rec_inuse(ni-&gt;mi.mrec))</div><div class='add'>+	if (!ni-&gt;vfs_inode.i_nlink &amp;&amp; ni-&gt;mi.mrec &amp;&amp;</div><div class='add'>+	    is_rec_inuse(ni-&gt;mi.mrec) &amp;&amp;</div><div class='add'>+	    !(ni-&gt;mi.sbi-&gt;flags &amp; NTFS_FLAGS_LOG_REPLAYING))</div><div class='ctx'> 		ni_delete_all(ni);</div><div class='ctx'> </div><div class='ctx'> 	al_destroy(ni);</div><div class='hunk'>@@ -122,10 +124,10 @@ void ni_clear(struct ntfs_inode *ni)</div><div class='ctx'> 	else {</div><div class='ctx'> 		run_close(&amp;ni-&gt;file.run);</div><div class='ctx'> #ifdef CONFIG_NTFS3_LZX_XPRESS</div><div class='del'>-		if (ni-&gt;file.offs_page) {</div><div class='add'>+		if (ni-&gt;file.offs_folio) {</div><div class='ctx'> 			/* On-demand allocated page for offsets. */</div><div class='del'>-			put_page(ni-&gt;file.offs_page);</div><div class='del'>-			ni-&gt;file.offs_page = NULL;</div><div class='add'>+			folio_put(ni-&gt;file.offs_folio);</div><div class='add'>+			ni-&gt;file.offs_folio = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -146,8 +148,10 @@ int ni_load_mi_ex(struct ntfs_inode *ni, CLST rno, struct mft_inode **mi)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = mi_get(ni-&gt;mi.sbi, rno, &amp;r);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ni_add_mi(ni, r);</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +203,8 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 			*mi = &amp;ni-&gt;mi;</div><div class='ctx'> </div><div class='ctx'> 		/* Look for required attribute in primary record. */</div><div class='del'>-		return mi_find_attr(&amp;ni-&gt;mi, attr, type, name, name_len, NULL);</div><div class='add'>+		return mi_find_attr(ni, &amp;ni-&gt;mi, attr, type, name, name_len,</div><div class='add'>+				    NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* First look for list entry of required type. */</div><div class='hunk'>@@ -215,7 +220,7 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Look for required attribute. */</div><div class='del'>-	attr = mi_find_attr(m, NULL, type, name, name_len, &amp;le-&gt;id);</div><div class='add'>+	attr = mi_find_attr(ni, m, NULL, type, name, name_len, &amp;le-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -236,8 +241,7 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 	return attr;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ntfs_inode_err(&amp;ni-&gt;vfs_inode, "failed to parse mft record");</div><div class='del'>-	ntfs_set_state(ni-&gt;mi.sbi, NTFS_DIRTY_ERROR);</div><div class='add'>+	_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +261,7 @@ struct ATTRIB *ni_enum_attr_ex(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 		if (mi)</div><div class='ctx'> 			*mi = &amp;ni-&gt;mi;</div><div class='ctx'> 		/* Enum attributes in primary record. */</div><div class='del'>-		return mi_enum_attr(&amp;ni-&gt;mi, attr);</div><div class='add'>+		return mi_enum_attr(ni, &amp;ni-&gt;mi, attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get next list entry. */</div><div class='hunk'>@@ -273,62 +277,7 @@ struct ATTRIB *ni_enum_attr_ex(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 		*mi = mi2;</div><div class='ctx'> </div><div class='ctx'> 	/* Find attribute in loaded record. */</div><div class='del'>-	return rec_find_attr_le(mi2, le2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ni_load_attr - Load attribute that contains given VCN.</div><div class='del'>- */</div><div class='del'>-struct ATTRIB *ni_load_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='del'>-			    const __le16 *name, u8 name_len, CLST vcn,</div><div class='del'>-			    struct mft_inode **pmi)</div><div class='del'>-{</div><div class='del'>-	struct ATTR_LIST_ENTRY *le;</div><div class='del'>-	struct ATTRIB *attr;</div><div class='del'>-	struct mft_inode *mi;</div><div class='del'>-	struct ATTR_LIST_ENTRY *next;</div><div class='del'>-</div><div class='del'>-	if (!ni-&gt;attr_list.size) {</div><div class='del'>-		if (pmi)</div><div class='del'>-			*pmi = &amp;ni-&gt;mi;</div><div class='del'>-		return mi_find_attr(&amp;ni-&gt;mi, NULL, type, name, name_len, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	le = al_find_ex(ni, NULL, type, name, name_len, NULL);</div><div class='del'>-	if (!le)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unfortunately ATTR_LIST_ENTRY contains only start VCN.</div><div class='del'>-	 * So to find the ATTRIB segment that contains 'vcn' we should</div><div class='del'>-	 * enumerate some entries.</div><div class='del'>-	 */</div><div class='del'>-	if (vcn) {</div><div class='del'>-		for (;; le = next) {</div><div class='del'>-			next = al_find_ex(ni, le, type, name, name_len, NULL);</div><div class='del'>-			if (!next || le64_to_cpu(next-&gt;vcn) &gt; vcn)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ni_load_mi(ni, le, &amp;mi))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (pmi)</div><div class='del'>-		*pmi = mi;</div><div class='del'>-</div><div class='del'>-	attr = mi_find_attr(mi, NULL, type, name, name_len, &amp;le-&gt;id);</div><div class='del'>-	if (!attr)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!attr-&gt;non_res)</div><div class='del'>-		return attr;</div><div class='del'>-</div><div class='del'>-	if (le64_to_cpu(attr-&gt;nres.svcn) &lt;= vcn &amp;&amp;</div><div class='del'>-	    vcn &lt;= le64_to_cpu(attr-&gt;nres.evcn))</div><div class='del'>-		return attr;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='add'>+	return rec_find_attr_le(ni, mi2, le2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -376,8 +325,10 @@ bool ni_add_subrecord(struct ntfs_inode *ni, CLST rno, struct mft_inode **mi)</div><div class='ctx'> </div><div class='ctx'> 	mi_get_ref(&amp;ni-&gt;mi, &amp;m-&gt;mrec-&gt;parent_ref);</div><div class='ctx'> </div><div class='del'>-	ni_add_mi(ni, m);</div><div class='del'>-	*mi = m;</div><div class='add'>+	*mi = ni_ins_mi(ni, &amp;ni-&gt;mi_tree, m-&gt;rno, &amp;m-&gt;node);</div><div class='add'>+	if (*mi != m)</div><div class='add'>+		mi_put(m);</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +347,8 @@ int ni_remove_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='ctx'> 	int diff;</div><div class='ctx'> </div><div class='ctx'> 	if (base_only || type == ATTR_LIST || !ni-&gt;attr_list.size) {</div><div class='del'>-		attr = mi_find_attr(&amp;ni-&gt;mi, NULL, type, name, name_len, id);</div><div class='add'>+		attr = mi_find_attr(ni, &amp;ni-&gt;mi, NULL, type, name, name_len,</div><div class='add'>+				    id);</div><div class='ctx'> 		if (!attr)</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -435,7 +387,7 @@ next_le2:</div><div class='ctx'> </div><div class='ctx'> 		al_remove_le(ni, le);</div><div class='ctx'> </div><div class='del'>-		attr = mi_find_attr(mi, NULL, type, name, name_len, id);</div><div class='add'>+		attr = mi_find_attr(ni, mi, NULL, type, name, name_len, id);</div><div class='ctx'> 		if (!attr)</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +435,7 @@ ni_ins_new_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='ctx'> 		name = le-&gt;name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	attr = mi_insert_attr(mi, type, name, name_len, asize, name_off);</div><div class='add'>+	attr = mi_insert_attr(ni, mi, type, name, name_len, asize, name_off);</div><div class='ctx'> 	if (!attr) {</div><div class='ctx'> 		if (le_added)</div><div class='ctx'> 			al_remove_le(ni, le);</div><div class='hunk'>@@ -671,7 +623,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	attr_list = mi_find_attr(&amp;ni-&gt;mi, NULL, ATTR_LIST, NULL, 0, NULL);</div><div class='add'>+	attr_list = mi_find_attr(ni, &amp;ni-&gt;mi, NULL, ATTR_LIST, NULL, 0, NULL);</div><div class='ctx'> 	if (!attr_list)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -693,7 +645,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 		if (!mi)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		attr = mi_find_attr(mi, NULL, le-&gt;type, le_name(le),</div><div class='add'>+		attr = mi_find_attr(ni, mi, NULL, le-&gt;type, le_name(le),</div><div class='ctx'> 				    le-&gt;name_len, &amp;le-&gt;id);</div><div class='ctx'> 		if (!attr)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -729,7 +681,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		attr = mi_find_attr(mi, NULL, le-&gt;type, le_name(le),</div><div class='add'>+		attr = mi_find_attr(ni, mi, NULL, le-&gt;type, le_name(le),</div><div class='ctx'> 				    le-&gt;name_len, &amp;le-&gt;id);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			/* Should never happened, 'cause already checked. */</div><div class='hunk'>@@ -738,7 +690,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 		asize = le32_to_cpu(attr-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 		/* Insert into primary record. */</div><div class='del'>-		attr_ins = mi_insert_attr(&amp;ni-&gt;mi, le-&gt;type, le_name(le),</div><div class='add'>+		attr_ins = mi_insert_attr(ni, &amp;ni-&gt;mi, le-&gt;type, le_name(le),</div><div class='ctx'> 					  le-&gt;name_len, asize,</div><div class='ctx'> 					  le16_to_cpu(attr-&gt;name_off));</div><div class='ctx'> 		if (!attr_ins) {</div><div class='hunk'>@@ -766,7 +718,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 		if (!mi)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		attr = mi_find_attr(mi, NULL, le-&gt;type, le_name(le),</div><div class='add'>+		attr = mi_find_attr(ni, mi, NULL, le-&gt;type, le_name(le),</div><div class='ctx'> 				    le-&gt;name_len, &amp;le-&gt;id);</div><div class='ctx'> 		if (!attr)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -778,7 +730,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 	run_deallocate(sbi, &amp;ni-&gt;attr_list.run, true);</div><div class='ctx'> 	run_close(&amp;ni-&gt;attr_list.run);</div><div class='ctx'> 	ni-&gt;attr_list.size = 0;</div><div class='del'>-	kfree(ni-&gt;attr_list.le);</div><div class='add'>+	kvfree(ni-&gt;attr_list.le);</div><div class='ctx'> 	ni-&gt;attr_list.le = NULL;</div><div class='ctx'> 	ni-&gt;attr_list.dirty = false;</div><div class='ctx'> </div><div class='hunk'>@@ -817,7 +769,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 	 * Skip estimating exact memory requirement.</div><div class='ctx'> 	 * Looks like one record_size is always enough.</div><div class='ctx'> 	 */</div><div class='del'>-	le = kmalloc(al_aligned(rs), GFP_NOFS);</div><div class='add'>+	le = kzalloc(al_aligned(rs), GFP_NOFS);</div><div class='ctx'> 	if (!le)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -829,7 +781,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 	free_b = 0;</div><div class='ctx'> 	attr = NULL;</div><div class='ctx'> </div><div class='del'>-	for (; (attr = mi_enum_attr(&amp;ni-&gt;mi, attr)); le = Add2Ptr(le, sz)) {</div><div class='add'>+	for (; (attr = mi_enum_attr(ni, &amp;ni-&gt;mi, attr)); le = Add2Ptr(le, sz)) {</div><div class='ctx'> 		sz = le_size(attr-&gt;name_len);</div><div class='ctx'> 		le-&gt;type = attr-&gt;type;</div><div class='ctx'> 		le-&gt;size = cpu_to_le16(sz);</div><div class='hunk'>@@ -884,7 +836,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 		u32 asize = le32_to_cpu(b-&gt;size);</div><div class='ctx'> 		u16 name_off = le16_to_cpu(b-&gt;name_off);</div><div class='ctx'> </div><div class='del'>-		attr = mi_insert_attr(mi, b-&gt;type, Add2Ptr(b, name_off),</div><div class='add'>+		attr = mi_insert_attr(ni, mi, b-&gt;type, Add2Ptr(b, name_off),</div><div class='ctx'> 				      b-&gt;name_len, asize, name_off);</div><div class='ctx'> 		if (!attr)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -907,7 +859,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	attr = mi_insert_attr(&amp;ni-&gt;mi, ATTR_LIST, NULL, 0,</div><div class='add'>+	attr = mi_insert_attr(ni, &amp;ni-&gt;mi, ATTR_LIST, NULL, 0,</div><div class='ctx'> 			      lsize + SIZEOF_RESIDENT, SIZEOF_RESIDENT);</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -927,7 +879,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	kfree(ni-&gt;attr_list.le);</div><div class='add'>+	kvfree(ni-&gt;attr_list.le);</div><div class='ctx'> 	ni-&gt;attr_list.le = NULL;</div><div class='ctx'> 	ni-&gt;attr_list.size = 0;</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -991,13 +943,13 @@ static int ni_ins_attr_ext(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le,</div><div class='ctx'> 		mi = rb_entry(node, struct mft_inode, node);</div><div class='ctx'> </div><div class='ctx'> 		if (is_mft_data &amp;&amp;</div><div class='del'>-		    (mi_enum_attr(mi, NULL) ||</div><div class='add'>+		    (mi_enum_attr(ni, mi, NULL) ||</div><div class='ctx'> 		     vbo &lt;= ((u64)mi-&gt;rno &lt;&lt; sbi-&gt;record_bits))) {</div><div class='ctx'> 			/* We can't accept this record 'cause MFT's bootstrapping. */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (is_mft &amp;&amp;</div><div class='del'>-		    mi_find_attr(mi, NULL, ATTR_DATA, NULL, 0, NULL)) {</div><div class='add'>+		    mi_find_attr(ni, mi, NULL, ATTR_DATA, NULL, 0, NULL)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * This child record already has a ATTR_DATA.</div><div class='ctx'> 			 * So it can't accept any other records.</div><div class='hunk'>@@ -1006,7 +958,7 @@ static int ni_ins_attr_ext(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((type != ATTR_NAME || name_len) &amp;&amp;</div><div class='del'>-		    mi_find_attr(mi, NULL, type, name, name_len, NULL)) {</div><div class='add'>+		    mi_find_attr(ni, mi, NULL, type, name, name_len, NULL)) {</div><div class='ctx'> 			/* Only indexed attributes can share same record. */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1065,9 +1017,9 @@ insert_ext:</div><div class='ctx'> </div><div class='ctx'> out2:</div><div class='ctx'> 	ni_remove_mi(ni, mi);</div><div class='del'>-	mi_put(mi);</div><div class='ctx'> </div><div class='ctx'> out1:</div><div class='add'>+	mi_put(mi);</div><div class='ctx'> 	ntfs_mark_rec_free(sbi, rno, is_mft);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1155,7 +1107,7 @@ static int ni_insert_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='ctx'> 	/* Estimate the result of moving all possible attributes away. */</div><div class='ctx'> 	attr = NULL;</div><div class='ctx'> </div><div class='del'>-	while ((attr = mi_enum_attr(&amp;ni-&gt;mi, attr))) {</div><div class='add'>+	while ((attr = mi_enum_attr(ni, &amp;ni-&gt;mi, attr))) {</div><div class='ctx'> 		if (attr-&gt;type == ATTR_STD)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (attr-&gt;type == ATTR_LIST)</div><div class='hunk'>@@ -1173,7 +1125,7 @@ static int ni_insert_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='ctx'> 	attr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		attr = mi_enum_attr(&amp;ni-&gt;mi, attr);</div><div class='add'>+		attr = mi_enum_attr(ni, &amp;ni-&gt;mi, attr);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			/* We should never be here 'cause we have already check this case. */</div><div class='ctx'> 			err = -EINVAL;</div><div class='hunk'>@@ -1257,7 +1209,7 @@ static int ni_expand_mft_list(struct ntfs_inode *ni)</div><div class='ctx'> 	for (node = rb_first(&amp;ni-&gt;mi_tree); node; node = rb_next(node)) {</div><div class='ctx'> 		mi = rb_entry(node, struct mft_inode, node);</div><div class='ctx'> </div><div class='del'>-		attr = mi_enum_attr(mi, NULL);</div><div class='add'>+		attr = mi_enum_attr(ni, mi, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			mft_min = mi-&gt;rno;</div><div class='hunk'>@@ -1278,7 +1230,7 @@ static int ni_expand_mft_list(struct ntfs_inode *ni)</div><div class='ctx'> 		ni_remove_mi(ni, mi_new);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	attr = mi_find_attr(&amp;ni-&gt;mi, NULL, ATTR_DATA, NULL, 0, NULL);</div><div class='add'>+	attr = mi_find_attr(ni, &amp;ni-&gt;mi, NULL, ATTR_DATA, NULL, 0, NULL);</div><div class='ctx'> 	if (!attr) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1395,7 +1347,7 @@ int ni_expand_list(struct ntfs_inode *ni)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Find attribute in primary record. */</div><div class='del'>-		attr = rec_find_attr_le(&amp;ni-&gt;mi, le);</div><div class='add'>+		attr = rec_find_attr_le(ni, &amp;ni-&gt;mi, le);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1501,7 +1453,7 @@ int ni_insert_nonresident(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='ctx'> </div><div class='ctx'> 	if (is_ext) {</div><div class='ctx'> 		if (flags &amp; ATTR_FLAG_COMPRESSED)</div><div class='del'>-			attr-&gt;nres.c_unit = COMPRESSION_UNIT;</div><div class='add'>+			attr-&gt;nres.c_unit = NTFS_LZNT_CUNIT;</div><div class='ctx'> 		attr-&gt;nres.total_size = attr-&gt;nres.alloc_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1601,8 +1553,10 @@ int ni_delete_all(struct ntfs_inode *ni)</div><div class='ctx'> 		asize = le32_to_cpu(attr-&gt;size);</div><div class='ctx'> 		roff = le16_to_cpu(attr-&gt;nres.run_off);</div><div class='ctx'> </div><div class='del'>-		if (roff &gt; asize)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		if (roff &gt; asize) {</div><div class='add'>+			/* ni_enum_attr_ex checks this case. */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* run==1 means unpack and deallocate. */</div><div class='ctx'> 		run_unpack_ex(RUN_DEALLOCATE, sbi, ni-&gt;mi.rno, svcn, evcn, svcn,</div><div class='hunk'>@@ -1908,8 +1862,7 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='ctx'> 	u8 cluster_bits = sbi-&gt;cluster_bits;</div><div class='del'>-	struct runs_tree *run;</div><div class='del'>-	struct rw_semaphore *run_lock;</div><div class='add'>+	struct runs_tree run;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='ctx'> 	CLST vcn = vbo &gt;&gt; cluster_bits;</div><div class='ctx'> 	CLST lcn, clen;</div><div class='hunk'>@@ -1920,13 +1873,11 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	bool ok;</div><div class='ctx'> </div><div class='add'>+	run_init(&amp;run);</div><div class='ctx'> 	if (S_ISDIR(ni-&gt;vfs_inode.i_mode)) {</div><div class='del'>-		run = &amp;ni-&gt;dir.alloc_run;</div><div class='ctx'> 		attr = ni_find_attr(ni, NULL, NULL, ATTR_ALLOC, I30_NAME,</div><div class='ctx'> 				    ARRAY_SIZE(I30_NAME), NULL, NULL);</div><div class='del'>-		run_lock = &amp;ni-&gt;dir.run_lock;</div><div class='ctx'> 	} else {</div><div class='del'>-		run = &amp;ni-&gt;file.run;</div><div class='ctx'> 		attr = ni_find_attr(ni, NULL, NULL, ATTR_DATA, NULL, 0, NULL,</div><div class='ctx'> 				    NULL);</div><div class='ctx'> 		if (!attr) {</div><div class='hunk'>@@ -1941,7 +1892,6 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 				"fiemap is not supported for compressed file (cp -r)");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		run_lock = &amp;ni-&gt;file.run_lock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!attr || !attr-&gt;non_res) {</div><div class='hunk'>@@ -1958,35 +1908,27 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	if (end &gt; alloc_size)</div><div class='ctx'> 		end = alloc_size;</div><div class='ctx'> </div><div class='del'>-	down_read(run_lock);</div><div class='del'>-</div><div class='ctx'> 	while (vbo &lt; end) {</div><div class='ctx'> 		if (idx == -1) {</div><div class='del'>-			ok = run_lookup_entry(run, vcn, &amp;lcn, &amp;clen, &amp;idx);</div><div class='add'>+			ok = run_lookup_entry(&amp;run, vcn, &amp;lcn, &amp;clen, &amp;idx);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			CLST vcn_next = vcn;</div><div class='ctx'> </div><div class='del'>-			ok = run_get_entry(run, ++idx, &amp;vcn, &amp;lcn, &amp;clen) &amp;&amp;</div><div class='add'>+			ok = run_get_entry(&amp;run, ++idx, &amp;vcn, &amp;lcn, &amp;clen) &amp;&amp;</div><div class='ctx'> 			     vcn == vcn_next;</div><div class='ctx'> 			if (!ok)</div><div class='ctx'> 				vcn = vcn_next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!ok) {</div><div class='del'>-			up_read(run_lock);</div><div class='del'>-			down_write(run_lock);</div><div class='del'>-</div><div class='ctx'> 			err = attr_load_runs_vcn(ni, attr-&gt;type,</div><div class='ctx'> 						 attr_name(attr),</div><div class='del'>-						 attr-&gt;name_len, run, vcn);</div><div class='del'>-</div><div class='del'>-			up_write(run_lock);</div><div class='del'>-			down_read(run_lock);</div><div class='add'>+						 attr-&gt;name_len, &amp;run, vcn);</div><div class='ctx'> </div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			ok = run_lookup_entry(run, vcn, &amp;lcn, &amp;clen, &amp;idx);</div><div class='add'>+			ok = run_lookup_entry(&amp;run, vcn, &amp;lcn, &amp;clen, &amp;idx);</div><div class='ctx'> </div><div class='ctx'> 			if (!ok) {</div><div class='ctx'> 				err = -EINVAL;</div><div class='hunk'>@@ -2011,8 +1953,9 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		} else if (is_attr_compressed(attr)) {</div><div class='ctx'> 			CLST clst_data;</div><div class='ctx'> </div><div class='del'>-			err = attr_is_frame_compressed(</div><div class='del'>-				ni, attr, vcn &gt;&gt; attr-&gt;nres.c_unit, &amp;clst_data);</div><div class='add'>+			err = attr_is_frame_compressed(ni, attr,</div><div class='add'>+						       vcn &gt;&gt; attr-&gt;nres.c_unit,</div><div class='add'>+						       &amp;clst_data, &amp;run);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (clst_data &lt; NTFS_LZNT_CLUSTERS)</div><div class='hunk'>@@ -2043,6 +1986,7 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> </div><div class='ctx'> 			err = fiemap_fill_next_extent(fieinfo, vbo, lbo, dlen,</div><div class='ctx'> 						      flags);</div><div class='add'>+</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (err == 1) {</div><div class='hunk'>@@ -2073,24 +2017,46 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		vbo += bytes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up_read(run_lock);</div><div class='del'>-</div><div class='ctx'> out:</div><div class='add'>+	run_close(&amp;run);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct page *ntfs_lock_new_page(struct address_space *mapping,</div><div class='add'>+		pgoff_t index, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio = __filemap_get_folio(mapping, index,</div><div class='add'>+			FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return ERR_CAST(folio);</div><div class='add'>+</div><div class='add'>+	if (!folio_test_uptodate(folio))</div><div class='add'>+		return folio_file_page(folio, index);</div><div class='add'>+</div><div class='add'>+	/* Use a temporary page to avoid data corruption */</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='add'>+	page = alloc_page(gfp);</div><div class='add'>+	if (!page)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	__SetPageLocked(page);</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ni_readpage_cmpr</div><div class='ctx'>  *</div><div class='ctx'>  * When decompressing, we typically obtain more than one page per reference.</div><div class='ctx'>  * We inject the additional pages into the page cache.</div><div class='ctx'>  */</div><div class='del'>-int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)</div><div class='add'>+int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='del'>-	pgoff_t index = page-&gt;index;</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='add'>+	pgoff_t index = folio-&gt;index;</div><div class='ctx'> 	u64 frame_vbo, vbo = (u64)index &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	struct page **pages = NULL; /* Array of at most 16 pages. stack? */</div><div class='ctx'> 	u8 frame_bits;</div><div class='hunk'>@@ -2099,8 +2065,9 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)</div><div class='ctx'> 	gfp_t gfp_mask;</div><div class='ctx'> 	struct page *pg;</div><div class='ctx'> </div><div class='del'>-	if (vbo &gt;= ni-&gt;vfs_inode.i_size) {</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+	if (vbo &gt;= i_size_read(&amp;ni-&gt;vfs_inode)) {</div><div class='add'>+		folio_zero_range(folio, 0, folio_size(folio));</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2124,7 +2091,7 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pages[idx] = page;</div><div class='add'>+	pages[idx] = &amp;folio-&gt;page;</div><div class='ctx'> 	index = frame_vbo &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	gfp_mask = mapping_gfp_mask(mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -2132,20 +2099,17 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)</div><div class='ctx'> 		if (i == idx)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		pg = find_or_create_page(mapping, index, gfp_mask);</div><div class='del'>-		if (!pg) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		pg = ntfs_lock_new_page(mapping, index, gfp_mask);</div><div class='add'>+		if (IS_ERR(pg)) {</div><div class='add'>+			err = PTR_ERR(pg);</div><div class='ctx'> 			goto out1;</div><div class='ctx'> 		}</div><div class='ctx'> 		pages[i] = pg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ni_read_frame(ni, frame_vbo, pages, pages_per_frame);</div><div class='add'>+	err = ni_read_frame(ni, frame_vbo, pages, pages_per_frame, 0);</div><div class='ctx'> </div><div class='ctx'> out1:</div><div class='del'>-	if (err)</div><div class='del'>-		SetPageError(page);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; pages_per_frame; i++) {</div><div class='ctx'> 		pg = pages[i];</div><div class='ctx'> 		if (i == idx || !pg)</div><div class='hunk'>@@ -2157,7 +2121,7 @@ out1:</div><div class='ctx'> out:</div><div class='ctx'> 	/* At this point, err contains 0 or -EIO depending on the "critical" page. */</div><div class='ctx'> 	kfree(pages);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2173,7 +2137,7 @@ int ni_decompress_file(struct ntfs_inode *ni)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='ctx'> 	struct inode *inode = &amp;ni-&gt;vfs_inode;</div><div class='del'>-	loff_t i_size = inode-&gt;i_size;</div><div class='add'>+	loff_t i_size = i_size_read(inode);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	gfp_t gfp_mask = mapping_gfp_mask(mapping);</div><div class='ctx'> 	struct page **pages = NULL;</div><div class='hunk'>@@ -2213,17 +2177,9 @@ int ni_decompress_file(struct ntfs_inode *ni)</div><div class='ctx'> 	 */</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	for (vbo = 0; vbo &lt; i_size; vbo += bytes) {</div><div class='del'>-		u32 nr_pages;</div><div class='ctx'> 		bool new;</div><div class='ctx'> </div><div class='del'>-		if (vbo + frame_size &gt; i_size) {</div><div class='del'>-			bytes = i_size - vbo;</div><div class='del'>-			nr_pages = (bytes + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		} else {</div><div class='del'>-			nr_pages = pages_per_frame;</div><div class='del'>-			bytes = frame_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		bytes = vbo + frame_size &gt; i_size ? (i_size - vbo) : frame_size;</div><div class='ctx'> 		end = bytes_to_cluster(sbi, vbo + bytes);</div><div class='ctx'> </div><div class='ctx'> 		for (vcn = vbo &gt;&gt; sbi-&gt;cluster_bits; vcn &lt; end; vcn += clen) {</div><div class='hunk'>@@ -2236,27 +2192,19 @@ int ni_decompress_file(struct ntfs_inode *ni)</div><div class='ctx'> 		for (i = 0; i &lt; pages_per_frame; i++, index++) {</div><div class='ctx'> 			struct page *pg;</div><div class='ctx'> </div><div class='del'>-			pg = find_or_create_page(mapping, index, gfp_mask);</div><div class='del'>-			if (!pg) {</div><div class='add'>+			pg = ntfs_lock_new_page(mapping, index, gfp_mask);</div><div class='add'>+			if (IS_ERR(pg)) {</div><div class='ctx'> 				while (i--) {</div><div class='ctx'> 					unlock_page(pages[i]);</div><div class='ctx'> 					put_page(pages[i]);</div><div class='ctx'> 				}</div><div class='del'>-				err = -ENOMEM;</div><div class='add'>+				err = PTR_ERR(pg);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 			pages[i] = pg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = ni_read_frame(ni, vbo, pages, pages_per_frame);</div><div class='del'>-</div><div class='del'>-		if (!err) {</div><div class='del'>-			down_read(&amp;ni-&gt;file.run_lock);</div><div class='del'>-			err = ntfs_bio_pages(sbi, &amp;ni-&gt;file.run, pages,</div><div class='del'>-					     nr_pages, vbo, bytes,</div><div class='del'>-					     REQ_OP_WRITE);</div><div class='del'>-			up_read(&amp;ni-&gt;file.run_lock);</div><div class='del'>-		}</div><div class='add'>+		err = ni_read_frame(ni, vbo, pages, pages_per_frame, 1);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; pages_per_frame; i++) {</div><div class='ctx'> 			unlock_page(pages[i]);</div><div class='hunk'>@@ -2362,9 +2310,9 @@ remove_wof:</div><div class='ctx'> </div><div class='ctx'> 	/* Clear cached flag. */</div><div class='ctx'> 	ni-&gt;ni_flags &amp;= ~NI_FLAG_COMPRESSED_MASK;</div><div class='del'>-	if (ni-&gt;file.offs_page) {</div><div class='del'>-		put_page(ni-&gt;file.offs_page);</div><div class='del'>-		ni-&gt;file.offs_page = NULL;</div><div class='add'>+	if (ni-&gt;file.offs_folio) {</div><div class='add'>+		folio_put(ni-&gt;file.offs_folio);</div><div class='add'>+		ni-&gt;file.offs_folio = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	mapping-&gt;a_ops = &amp;ntfs_aops;</div><div class='ctx'> </div><div class='hunk'>@@ -2446,20 +2394,19 @@ out2:</div><div class='ctx'>  * Pages - Array of locked pages.</div><div class='ctx'>  */</div><div class='ctx'> int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='del'>-		  u32 pages_per_frame)</div><div class='add'>+		  u32 pages_per_frame, int copy)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='ctx'> 	u8 cluster_bits = sbi-&gt;cluster_bits;</div><div class='ctx'> 	char *frame_ondisk = NULL;</div><div class='ctx'> 	char *frame_mem = NULL;</div><div class='del'>-	struct page **pages_disk = NULL;</div><div class='ctx'> 	struct ATTR_LIST_ENTRY *le = NULL;</div><div class='ctx'> 	struct runs_tree *run = &amp;ni-&gt;file.run;</div><div class='ctx'> 	u64 valid_size = ni-&gt;i_valid;</div><div class='ctx'> 	u64 vbo_disk;</div><div class='ctx'> 	size_t unc_size;</div><div class='del'>-	u32 frame_size, i, npages_disk, ondisk_size;</div><div class='add'>+	u32 frame_size, i, ondisk_size;</div><div class='ctx'> 	struct page *pg;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='ctx'> 	CLST frame, clst_data;</div><div class='hunk'>@@ -2468,9 +2415,6 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 	 * To simplify decompress algorithm do vmap for source</div><div class='ctx'> 	 * and target pages.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; pages_per_frame; i++)</div><div class='del'>-		kmap(pages[i]);</div><div class='del'>-</div><div class='ctx'> 	frame_size = pages_per_frame &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	frame_mem = vmap(pages, pages_per_frame, VM_MAP, PAGE_KERNEL);</div><div class='ctx'> 	if (!frame_mem) {</div><div class='hunk'>@@ -2508,6 +2452,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto out1;</div><div class='ctx'> #else</div><div class='add'>+		loff_t i_size = i_size_read(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> 		u32 frame_bits = ni_ext_compress_bits(ni);</div><div class='ctx'> 		u64 frame64 = frame_vbo &gt;&gt; frame_bits;</div><div class='ctx'> 		u64 frames, vbo_data;</div><div class='hunk'>@@ -2548,16 +2493,15 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		frames = (ni-&gt;vfs_inode.i_size - 1) &gt;&gt; frame_bits;</div><div class='add'>+		frames = (i_size - 1) &gt;&gt; frame_bits;</div><div class='ctx'> </div><div class='ctx'> 		err = attr_wof_frame_info(ni, attr, run, frame64, frames,</div><div class='ctx'> 					  frame_bits, &amp;ondisk_size, &amp;vbo_data);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out2;</div><div class='add'>+			goto out1;</div><div class='ctx'> </div><div class='ctx'> 		if (frame64 == frames) {</div><div class='del'>-			unc_size = 1 + ((ni-&gt;vfs_inode.i_size - 1) &amp;</div><div class='del'>-					(frame_size - 1));</div><div class='add'>+			unc_size = 1 + ((i_size - 1) &amp; (frame_size - 1));</div><div class='ctx'> 			ondisk_size = attr_size(attr) - vbo_data;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			unc_size = frame_size;</div><div class='hunk'>@@ -2565,7 +2509,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> </div><div class='ctx'> 		if (ondisk_size &gt; frame_size) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-			goto out2;</div><div class='add'>+			goto out1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!attr-&gt;non_res) {</div><div class='hunk'>@@ -2586,10 +2530,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 					   ARRAY_SIZE(WOF_NAME), run, vbo_disk,</div><div class='ctx'> 					   vbo_data + ondisk_size);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out2;</div><div class='del'>-		npages_disk = (ondisk_size + (vbo_disk &amp; (PAGE_SIZE - 1)) +</div><div class='del'>-			       PAGE_SIZE - 1) &gt;&gt;</div><div class='del'>-			      PAGE_SHIFT;</div><div class='add'>+			goto out1;</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (is_attr_compressed(attr)) {</div><div class='ctx'> 		/* LZNT compression. */</div><div class='hunk'>@@ -2606,7 +2547,8 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 		down_write(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 		run_truncate_around(run, le64_to_cpu(attr-&gt;nres.svcn));</div><div class='ctx'> 		frame = frame_vbo &gt;&gt; (cluster_bits + NTFS_LZNT_CUNIT);</div><div class='del'>-		err = attr_is_frame_compressed(ni, attr, frame, &amp;clst_data);</div><div class='add'>+		err = attr_is_frame_compressed(ni, attr, frame, &amp;clst_data,</div><div class='add'>+					       run);</div><div class='ctx'> 		up_write(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out1;</div><div class='hunk'>@@ -2622,61 +2564,37 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 		if (clst_data &gt;= NTFS_LZNT_CLUSTERS) {</div><div class='ctx'> 			/* Frame is not compressed. */</div><div class='ctx'> 			down_read(&amp;ni-&gt;file.run_lock);</div><div class='del'>-			err = ntfs_bio_pages(sbi, run, pages, pages_per_frame,</div><div class='del'>-					     frame_vbo, ondisk_size,</div><div class='del'>-					     REQ_OP_READ);</div><div class='add'>+			err = ntfs_read_run(sbi, run, frame_mem, frame_vbo,</div><div class='add'>+					    ondisk_size);</div><div class='ctx'> 			up_read(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 			goto out1;</div><div class='ctx'> 		}</div><div class='ctx'> 		vbo_disk = frame_vbo;</div><div class='del'>-		npages_disk = (ondisk_size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__builtin_unreachable();</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pages_disk = kzalloc(npages_disk * sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	if (!pages_disk) {</div><div class='add'>+	/* Allocate memory to read compressed data to. */</div><div class='add'>+	frame_ondisk = kvmalloc(ondisk_size, GFP_KERNEL);</div><div class='add'>+	if (!frame_ondisk) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; npages_disk; i++) {</div><div class='del'>-		pg = alloc_page(GFP_KERNEL);</div><div class='del'>-		if (!pg) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto out3;</div><div class='del'>-		}</div><div class='del'>-		pages_disk[i] = pg;</div><div class='del'>-		lock_page(pg);</div><div class='del'>-		kmap(pg);</div><div class='add'>+		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read 'ondisk_size' bytes from disk. */</div><div class='ctx'> 	down_read(&amp;ni-&gt;file.run_lock);</div><div class='del'>-	err = ntfs_bio_pages(sbi, run, pages_disk, npages_disk, vbo_disk,</div><div class='del'>-			     ondisk_size, REQ_OP_READ);</div><div class='add'>+	err = ntfs_read_run(sbi, run, frame_ondisk, vbo_disk, ondisk_size);</div><div class='ctx'> 	up_read(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out3;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To simplify decompress algorithm do vmap for source and target pages.</div><div class='del'>-	 */</div><div class='del'>-	frame_ondisk = vmap(pages_disk, npages_disk, VM_MAP, PAGE_KERNEL_RO);</div><div class='del'>-	if (!frame_ondisk) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out3;</div><div class='del'>-	}</div><div class='add'>+		goto out2;</div><div class='ctx'> </div><div class='del'>-	/* Decompress: Frame_ondisk -&gt; frame_mem. */</div><div class='ctx'> #ifdef CONFIG_NTFS3_LZX_XPRESS</div><div class='ctx'> 	if (run != &amp;ni-&gt;file.run) {</div><div class='ctx'> 		/* LZX or XPRESS */</div><div class='del'>-		err = decompress_lzx_xpress(</div><div class='del'>-			sbi, frame_ondisk + (vbo_disk &amp; (PAGE_SIZE - 1)),</div><div class='del'>-			ondisk_size, frame_mem, unc_size, frame_size);</div><div class='add'>+		err = decompress_lzx_xpress(sbi, frame_ondisk, ondisk_size,</div><div class='add'>+					    frame_mem, unc_size, frame_size);</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='hunk'>@@ -2694,31 +2612,25 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='ctx'> 		memset(frame_mem + ok, 0, frame_size - ok);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vunmap(frame_ondisk);</div><div class='del'>-</div><div class='del'>-out3:</div><div class='del'>-	for (i = 0; i &lt; npages_disk; i++) {</div><div class='del'>-		pg = pages_disk[i];</div><div class='del'>-		if (pg) {</div><div class='del'>-			kunmap(pg);</div><div class='del'>-			unlock_page(pg);</div><div class='del'>-			put_page(pg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kfree(pages_disk);</div><div class='del'>-</div><div class='ctx'> out2:</div><div class='add'>+	kvfree(frame_ondisk);</div><div class='add'>+out1:</div><div class='ctx'> #ifdef CONFIG_NTFS3_LZX_XPRESS</div><div class='ctx'> 	if (run != &amp;ni-&gt;file.run)</div><div class='ctx'> 		run_free(run);</div><div class='add'>+	if (!err &amp;&amp; copy) {</div><div class='add'>+		/* We are called from 'ni_decompress_file' */</div><div class='add'>+		/* Copy decompressed LZX or XPRESS data into new place. */</div><div class='add'>+		down_read(&amp;ni-&gt;file.run_lock);</div><div class='add'>+		err = ntfs_write_run(sbi, &amp;ni-&gt;file.run, frame_mem, frame_vbo,</div><div class='add'>+				     frame_size);</div><div class='add'>+		up_read(&amp;ni-&gt;file.run_lock);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='del'>-out1:</div><div class='ctx'> 	vunmap(frame_mem);</div><div class='ctx'> out:</div><div class='ctx'> 	for (i = 0; i &lt; pages_per_frame; i++) {</div><div class='ctx'> 		pg = pages[i];</div><div class='del'>-		kunmap(pg);</div><div class='del'>-		ClearPageError(pg);</div><div class='ctx'> 		SetPageUptodate(pg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2735,18 +2647,16 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='add'>+	struct folio *folio = page_folio(pages[0]);</div><div class='ctx'> 	u8 frame_bits = NTFS_LZNT_CUNIT + sbi-&gt;cluster_bits;</div><div class='ctx'> 	u32 frame_size = sbi-&gt;cluster_size &lt;&lt; NTFS_LZNT_CUNIT;</div><div class='del'>-	u64 frame_vbo = (u64)pages[0]-&gt;index &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	u64 frame_vbo = folio_pos(folio);</div><div class='ctx'> 	CLST frame = frame_vbo &gt;&gt; frame_bits;</div><div class='ctx'> 	char *frame_ondisk = NULL;</div><div class='del'>-	struct page **pages_disk = NULL;</div><div class='ctx'> 	struct ATTR_LIST_ENTRY *le = NULL;</div><div class='ctx'> 	char *frame_mem;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='ctx'> 	struct mft_inode *mi;</div><div class='del'>-	u32 i;</div><div class='del'>-	struct page *pg;</div><div class='ctx'> 	size_t compr_size, ondisk_size;</div><div class='ctx'> 	struct lznt *lznt;</div><div class='ctx'> </div><div class='hunk'>@@ -2781,38 +2691,18 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pages_disk = kcalloc(pages_per_frame, sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	if (!pages_disk) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pages_per_frame; i++) {</div><div class='del'>-		pg = alloc_page(GFP_KERNEL);</div><div class='del'>-		if (!pg) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto out1;</div><div class='del'>-		}</div><div class='del'>-		pages_disk[i] = pg;</div><div class='del'>-		lock_page(pg);</div><div class='del'>-		kmap(pg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* To simplify compress algorithm do vmap for source and target pages. */</div><div class='del'>-	frame_ondisk = vmap(pages_disk, pages_per_frame, VM_MAP, PAGE_KERNEL);</div><div class='add'>+	/* Allocate memory to write compressed data to. */</div><div class='add'>+	frame_ondisk = kvmalloc(frame_size, GFP_KERNEL);</div><div class='ctx'> 	if (!frame_ondisk) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out1;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pages_per_frame; i++)</div><div class='del'>-		kmap(pages[i]);</div><div class='del'>-</div><div class='ctx'> 	/* Map in-memory frame for read-only. */</div><div class='ctx'> 	frame_mem = vmap(pages, pages_per_frame, VM_MAP, PAGE_KERNEL_RO);</div><div class='ctx'> 	if (!frame_mem) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out2;</div><div class='add'>+		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sbi-&gt;compress.mtx_lznt);</div><div class='hunk'>@@ -2828,7 +2718,7 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,</div><div class='ctx'> 		if (!lznt) {</div><div class='ctx'> 			mutex_unlock(&amp;sbi-&gt;compress.mtx_lznt);</div><div class='ctx'> 			err = -ENOMEM;</div><div class='del'>-			goto out3;</div><div class='add'>+			goto out2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sbi-&gt;compress.lznt = lznt;</div><div class='hunk'>@@ -2865,30 +2755,16 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;ni-&gt;file.run_lock);</div><div class='del'>-	err = ntfs_bio_pages(sbi, &amp;ni-&gt;file.run,</div><div class='del'>-			     ondisk_size &lt; frame_size ? pages_disk : pages,</div><div class='del'>-			     pages_per_frame, frame_vbo, ondisk_size,</div><div class='del'>-			     REQ_OP_WRITE);</div><div class='add'>+	err = ntfs_write_run(sbi, &amp;ni-&gt;file.run,</div><div class='add'>+			     ondisk_size &lt; frame_size ? frame_ondisk :</div><div class='add'>+							frame_mem,</div><div class='add'>+			     frame_vbo, ondisk_size);</div><div class='ctx'> 	up_read(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> </div><div class='del'>-out3:</div><div class='del'>-	vunmap(frame_mem);</div><div class='del'>-</div><div class='ctx'> out2:</div><div class='del'>-	for (i = 0; i &lt; pages_per_frame; i++)</div><div class='del'>-		kunmap(pages[i]);</div><div class='del'>-</div><div class='del'>-	vunmap(frame_ondisk);</div><div class='add'>+	vunmap(frame_mem);</div><div class='ctx'> out1:</div><div class='del'>-	for (i = 0; i &lt; pages_per_frame; i++) {</div><div class='del'>-		pg = pages_disk[i];</div><div class='del'>-		if (pg) {</div><div class='del'>-			kunmap(pg);</div><div class='del'>-			unlock_page(pg);</div><div class='del'>-			put_page(pg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kfree(pages_disk);</div><div class='add'>+	kvfree(frame_ondisk);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -3063,8 +2939,7 @@ int ni_add_name(struct ntfs_inode *dir_ni, struct ntfs_inode *ni,</div><div class='ctx'>  * ni_rename - Remove one name and insert new name.</div><div class='ctx'>  */</div><div class='ctx'> int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,</div><div class='del'>-	      struct ntfs_inode *ni, struct NTFS_DE *de, struct NTFS_DE *new_de,</div><div class='del'>-	      bool *is_bad)</div><div class='add'>+	      struct ntfs_inode *ni, struct NTFS_DE *de, struct NTFS_DE *new_de)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct NTFS_DE *de2 = NULL;</div><div class='hunk'>@@ -3087,8 +2962,8 @@ int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,</div><div class='ctx'> 	err = ni_add_name(new_dir_ni, ni, new_de);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		err = ni_remove_name(dir_ni, ni, de, &amp;de2, &amp;undo);</div><div class='del'>-		if (err &amp;&amp; ni_remove_name(new_dir_ni, ni, new_de, &amp;de2, &amp;undo))</div><div class='del'>-			*is_bad = true;</div><div class='add'>+		WARN_ON(err &amp;&amp;</div><div class='add'>+			ni_remove_name(new_dir_ni, ni, new_de, &amp;de2, &amp;undo));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3179,11 +3054,22 @@ static bool ni_update_parent(struct ntfs_inode *ni, struct NTFS_DUP_INFO *dup,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* TODO: Fill reparse info. */</div><div class='del'>-	dup-&gt;reparse = 0;</div><div class='del'>-	dup-&gt;ea_size = 0;</div><div class='add'>+	dup-&gt;extend_data = 0;</div><div class='add'>+</div><div class='add'>+	if (dup-&gt;fa &amp; FILE_ATTRIBUTE_REPARSE_POINT) {</div><div class='add'>+		attr = ni_find_attr(ni, NULL, NULL, ATTR_REPARSE, NULL, 0, NULL,</div><div class='add'>+				    NULL);</div><div class='ctx'> </div><div class='del'>-	if (ni-&gt;ni_flags &amp; NI_FLAG_EA) {</div><div class='add'>+		if (attr) {</div><div class='add'>+			const struct REPARSE_POINT *rp;</div><div class='add'>+</div><div class='add'>+			rp = resident_data_ex(attr,</div><div class='add'>+					      sizeof(struct REPARSE_POINT));</div><div class='add'>+			/* If ATTR_REPARSE exists 'rp' can't be NULL. */</div><div class='add'>+			if (rp)</div><div class='add'>+				dup-&gt;extend_data = rp-&gt;ReparseTag;</div><div class='add'>+		}</div><div class='add'>+	} else if (ni-&gt;ni_flags &amp; NI_FLAG_EA) {</div><div class='ctx'> 		attr = ni_find_attr(ni, attr, &amp;le, ATTR_EA_INFO, NULL, 0, NULL,</div><div class='ctx'> 				    NULL);</div><div class='ctx'> 		if (attr) {</div><div class='hunk'>@@ -3192,7 +3078,7 @@ static bool ni_update_parent(struct ntfs_inode *ni, struct NTFS_DUP_INFO *dup,</div><div class='ctx'> 			info = resident_data_ex(attr, sizeof(struct EA_INFO));</div><div class='ctx'> 			/* If ATTR_EA_INFO exists 'info' can't be NULL. */</div><div class='ctx'> 			if (info)</div><div class='del'>-				dup-&gt;ea_size = info-&gt;size_pack;</div><div class='add'>+				dup-&gt;extend_data = info-&gt;size;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3259,6 +3145,13 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint)</div><div class='ctx'> 	if (is_bad_inode(inode) || sb_rdonly(sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (!ni_trylock(ni)) {</div><div class='ctx'> 		/* 'ni' is under modification, skip for now. */</div><div class='ctx'> 		mark_inode_dirty_sync(inode);</div><div class='hunk'>@@ -3288,7 +3181,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint)</div><div class='ctx'> 			modified = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ts = inode_get_mtime(inode);</div><div class='add'>+		ts = inode_get_ctime(inode);</div><div class='ctx'> 		dup.c_time = kernel2nt(&amp;ts);</div><div class='ctx'> 		if (std-&gt;c_time != dup.c_time) {</div><div class='ctx'> 			std-&gt;c_time = dup.c_time;</div><div class='hunk'>@@ -3349,7 +3242,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint)</div><div class='ctx'> 		if (!mi-&gt;dirty)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		is_empty = !mi_enum_attr(mi, NULL);</div><div class='add'>+		is_empty = !mi_enum_attr(ni, mi, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (is_empty)</div><div class='ctx'> 			clear_rec_inuse(mi-&gt;mrec);</div><div class='head'>diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c<br/>index 98ccb6650858..38934e6978ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/fslog.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/fslog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/fslog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/fslog.c</a></div><div class='hunk'>@@ -465,7 +465,7 @@ static inline bool is_rst_area_valid(const struct RESTART_HDR *rhdr)</div><div class='ctx'> {</div><div class='ctx'> 	const struct RESTART_AREA *ra;</div><div class='ctx'> 	u16 cl, fl, ul;</div><div class='del'>-	u32 off, l_size, file_dat_bits, file_size_round;</div><div class='add'>+	u32 off, l_size, seq_bits;</div><div class='ctx'> 	u16 ro = le16_to_cpu(rhdr-&gt;ra_off);</div><div class='ctx'> 	u32 sys_page = le32_to_cpu(rhdr-&gt;sys_page_size);</div><div class='ctx'> </div><div class='hunk'>@@ -511,13 +511,15 @@ static inline bool is_rst_area_valid(const struct RESTART_HDR *rhdr)</div><div class='ctx'> 	/* Make sure the sequence number bits match the log file size. */</div><div class='ctx'> 	l_size = le64_to_cpu(ra-&gt;l_size);</div><div class='ctx'> </div><div class='del'>-	file_dat_bits = sizeof(u64) * 8 - le32_to_cpu(ra-&gt;seq_num_bits);</div><div class='del'>-	file_size_round = 1u &lt;&lt; (file_dat_bits + 3);</div><div class='del'>-	if (file_size_round != l_size &amp;&amp;</div><div class='del'>-	    (file_size_round &lt; l_size || (file_size_round / 2) &gt; l_size)) {</div><div class='del'>-		return false;</div><div class='add'>+	seq_bits = sizeof(u64) * 8 + 3;</div><div class='add'>+	while (l_size) {</div><div class='add'>+		l_size &gt;&gt;= 1;</div><div class='add'>+		seq_bits -= 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (seq_bits != le32_to_cpu(ra-&gt;seq_num_bits))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* The log page data offset and record header length must be quad-aligned. */</div><div class='ctx'> 	if (!IS_ALIGNED(le16_to_cpu(ra-&gt;data_off), 8) ||</div><div class='ctx'> 	    !IS_ALIGNED(le16_to_cpu(ra-&gt;rec_hdr_len), 8))</div><div class='hunk'>@@ -607,14 +609,29 @@ static inline void add_client(struct CLIENT_REC *ca, u16 index, __le16 *head)</div><div class='ctx'> 	*head = cpu_to_le16(index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Enumerate restart table.</div><div class='add'>+ *</div><div class='add'>+ * @t - table to enumerate.</div><div class='add'>+ * @c - current enumerated element.</div><div class='add'>+ *</div><div class='add'>+ * enumeration starts with @c == NULL</div><div class='add'>+ * returns next element or NULL</div><div class='add'>+ */</div><div class='ctx'> static inline void *enum_rstbl(struct RESTART_TABLE *t, void *c)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *e;</div><div class='ctx'> 	u32 bprt;</div><div class='del'>-	u16 rsize = t ? le16_to_cpu(t-&gt;size) : 0;</div><div class='add'>+	u16 rsize;</div><div class='add'>+</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rsize = le16_to_cpu(t-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	if (!c) {</div><div class='del'>-		if (!t || !t-&gt;total)</div><div class='add'>+		/* start enumeration. */</div><div class='add'>+		if (!t-&gt;total)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		e = Add2Ptr(t, sizeof(struct RESTART_TABLE));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -722,7 +739,8 @@ static bool check_rstbl(const struct RESTART_TABLE *rt, size_t bytes)</div><div class='ctx'> </div><div class='ctx'> 	if (!rsize || rsize &gt; bytes ||</div><div class='ctx'> 	    rsize + sizeof(struct RESTART_TABLE) &gt; bytes || bytes &lt; ts ||</div><div class='del'>-	    le16_to_cpu(rt-&gt;total) &gt; ne || ff &gt; ts || lf &gt; ts ||</div><div class='add'>+	    le16_to_cpu(rt-&gt;total) &gt; ne || ff &gt; ts - sizeof(__le32) ||</div><div class='add'>+	    lf &gt; ts - sizeof(__le32) ||</div><div class='ctx'> 	    (ff &amp;&amp; ff &lt; sizeof(struct RESTART_TABLE)) ||</div><div class='ctx'> 	    (lf &amp;&amp; lf &lt; sizeof(struct RESTART_TABLE))) {</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -752,6 +770,9 @@ static bool check_rstbl(const struct RESTART_TABLE *rt, size_t bytes)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='ctx'> 		off = le32_to_cpu(*(__le32 *)Add2Ptr(rt, off));</div><div class='add'>+</div><div class='add'>+		if (off &gt; ts - sizeof(__le32))</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -974,6 +995,16 @@ skip_looking:</div><div class='ctx'> 	return e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct restart_info {</div><div class='add'>+	u64 last_lsn;</div><div class='add'>+	struct RESTART_HDR *r_page;</div><div class='add'>+	u32 vbo;</div><div class='add'>+	bool chkdsk_was_run;</div><div class='add'>+	bool valid_page;</div><div class='add'>+	bool initialized;</div><div class='add'>+	bool restart;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define RESTART_SINGLE_PAGE_IO cpu_to_le16(0x0001)</div><div class='ctx'> </div><div class='ctx'> #define NTFSLOG_WRAPPED 0x00000001</div><div class='hunk'>@@ -987,6 +1018,7 @@ struct ntfs_log {</div><div class='ctx'> 	struct ntfs_inode *ni;</div><div class='ctx'> </div><div class='ctx'> 	u32 l_size;</div><div class='add'>+	u32 orig_file_size;</div><div class='ctx'> 	u32 sys_page_size;</div><div class='ctx'> 	u32 sys_page_mask;</div><div class='ctx'> 	u32 page_size;</div><div class='hunk'>@@ -1040,6 +1072,8 @@ struct ntfs_log {</div><div class='ctx'> </div><div class='ctx'> 	struct CLIENT_ID client_id;</div><div class='ctx'> 	u32 client_undo_commit;</div><div class='add'>+</div><div class='add'>+	struct restart_info rst_info, rst_info2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32 lsn_to_vbo(struct ntfs_log *log, const u64 lsn)</div><div class='hunk'>@@ -1105,16 +1139,6 @@ static inline bool verify_client_lsn(struct ntfs_log *log,</div><div class='ctx'> 	       lsn &lt;= le64_to_cpu(log-&gt;ra-&gt;current_lsn) &amp;&amp; lsn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct restart_info {</div><div class='del'>-	u64 last_lsn;</div><div class='del'>-	struct RESTART_HDR *r_page;</div><div class='del'>-	u32 vbo;</div><div class='del'>-	bool chkdsk_was_run;</div><div class='del'>-	bool valid_page;</div><div class='del'>-	bool initialized;</div><div class='del'>-	bool restart;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int read_log_page(struct ntfs_log *log, u32 vbo,</div><div class='ctx'> 			 struct RECORD_PAGE_HDR **buffer, bool *usa_error)</div><div class='ctx'> {</div><div class='hunk'>@@ -1176,10 +1200,11 @@ out:</div><div class='ctx'>  * restart page header. It will stop the first time we find a</div><div class='ctx'>  * valid page header.</div><div class='ctx'>  */</div><div class='del'>-static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,</div><div class='add'>+static int log_read_rst(struct ntfs_log *log, bool first,</div><div class='ctx'> 			struct restart_info *info)</div><div class='ctx'> {</div><div class='del'>-	u32 skip, vbo;</div><div class='add'>+	u32 skip;</div><div class='add'>+	u64 vbo;</div><div class='ctx'> 	struct RESTART_HDR *r_page = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine which restart area we are looking for. */</div><div class='hunk'>@@ -1192,7 +1217,7 @@ static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Loop continuously until we succeed. */</div><div class='del'>-	for (; vbo &lt; l_size; vbo = 2 * vbo + skip, skip = 0) {</div><div class='add'>+	for (; vbo &lt; log-&gt;l_size; vbo = 2 * vbo + skip, skip = 0) {</div><div class='ctx'> 		bool usa_error;</div><div class='ctx'> 		bool brst, bchk;</div><div class='ctx'> 		struct RESTART_AREA *ra;</div><div class='hunk'>@@ -1285,22 +1310,17 @@ check_result:</div><div class='ctx'> /*</div><div class='ctx'>  * Ilog_init_pg_hdr - Init @log from restart page header.</div><div class='ctx'>  */</div><div class='del'>-static void log_init_pg_hdr(struct ntfs_log *log, u32 sys_page_size,</div><div class='del'>-			    u32 page_size, u16 major_ver, u16 minor_ver)</div><div class='add'>+static void log_init_pg_hdr(struct ntfs_log *log, u16 major_ver, u16 minor_ver)</div><div class='ctx'> {</div><div class='del'>-	log-&gt;sys_page_size = sys_page_size;</div><div class='del'>-	log-&gt;sys_page_mask = sys_page_size - 1;</div><div class='del'>-	log-&gt;page_size = page_size;</div><div class='del'>-	log-&gt;page_mask = page_size - 1;</div><div class='del'>-	log-&gt;page_bits = blksize_bits(page_size);</div><div class='add'>+	log-&gt;sys_page_size = log-&gt;page_size;</div><div class='add'>+	log-&gt;sys_page_mask = log-&gt;page_mask;</div><div class='ctx'> </div><div class='ctx'> 	log-&gt;clst_per_page = log-&gt;page_size &gt;&gt; log-&gt;ni-&gt;mi.sbi-&gt;cluster_bits;</div><div class='ctx'> 	if (!log-&gt;clst_per_page)</div><div class='ctx'> 		log-&gt;clst_per_page = 1;</div><div class='ctx'> </div><div class='del'>-	log-&gt;first_page = major_ver &gt;= 2 ?</div><div class='del'>-				  0x22 * page_size :</div><div class='del'>-				  ((sys_page_size &lt;&lt; 1) + (page_size &lt;&lt; 1));</div><div class='add'>+	log-&gt;first_page = major_ver &gt;= 2 ? 0x22 * log-&gt;page_size :</div><div class='add'>+					   4 * log-&gt;page_size;</div><div class='ctx'> 	log-&gt;major_ver = major_ver;</div><div class='ctx'> 	log-&gt;minor_ver = minor_ver;</div><div class='ctx'> }</div><div class='hunk'>@@ -1308,12 +1328,11 @@ static void log_init_pg_hdr(struct ntfs_log *log, u32 sys_page_size,</div><div class='ctx'> /*</div><div class='ctx'>  * log_create - Init @log in cases when we don't have a restart area to use.</div><div class='ctx'>  */</div><div class='del'>-static void log_create(struct ntfs_log *log, u32 l_size, const u64 last_lsn,</div><div class='add'>+static void log_create(struct ntfs_log *log, const u64 last_lsn,</div><div class='ctx'> 		       u32 open_log_count, bool wrapped, bool use_multi_page)</div><div class='ctx'> {</div><div class='del'>-	log-&gt;l_size = l_size;</div><div class='ctx'> 	/* All file offsets must be quadword aligned. */</div><div class='del'>-	log-&gt;file_data_bits = blksize_bits(l_size) - 3;</div><div class='add'>+	log-&gt;file_data_bits = blksize_bits(log-&gt;l_size) - 3;</div><div class='ctx'> 	log-&gt;seq_num_mask = (8 &lt;&lt; log-&gt;file_data_bits) - 1;</div><div class='ctx'> 	log-&gt;seq_num_bits = sizeof(u64) * 8 - log-&gt;file_data_bits;</div><div class='ctx'> 	log-&gt;seq_num = (last_lsn &gt;&gt; log-&gt;file_data_bits) + 2;</div><div class='hunk'>@@ -2992,7 +3011,7 @@ static struct ATTRIB *attr_create_nonres_log(struct ntfs_sb_info *sbi,</div><div class='ctx'> 	if (is_ext) {</div><div class='ctx'> 		attr-&gt;name_off = SIZEOF_NONRESIDENT_EX_LE;</div><div class='ctx'> 		if (is_attr_compressed(attr))</div><div class='del'>-			attr-&gt;nres.c_unit = COMPRESSION_UNIT;</div><div class='add'>+			attr-&gt;nres.c_unit = NTFS_LZNT_CUNIT;</div><div class='ctx'> </div><div class='ctx'> 		attr-&gt;nres.run_off =</div><div class='ctx'> 			cpu_to_le16(SIZEOF_NONRESIDENT_EX + name_size);</div><div class='hunk'>@@ -3072,16 +3091,16 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,</div><div class='ctx'> 		inode = ilookup(sbi-&gt;sb, rno);</div><div class='ctx'> 		if (inode) {</div><div class='ctx'> 			mi = &amp;ntfs_i(inode)-&gt;mi;</div><div class='del'>-		} else if (op == InitializeFileRecordSegment) {</div><div class='del'>-			mi = kzalloc(sizeof(struct mft_inode), GFP_NOFS);</div><div class='del'>-			if (!mi)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			err = mi_format_new(mi, sbi, rno, 0, false);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Read from disk. */</div><div class='ctx'> 			err = mi_get(sbi, rno, &amp;mi);</div><div class='add'>+			if (err &amp;&amp; op == InitializeFileRecordSegment) {</div><div class='add'>+				mi = kzalloc(sizeof(struct mft_inode),</div><div class='add'>+					     GFP_NOFS);</div><div class='add'>+				if (!mi)</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+				err = mi_format_new(mi, sbi, rno, 0, false);</div><div class='add'>+			}</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3090,15 +3109,13 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,</div><div class='ctx'> 		if (op == DeallocateFileRecordSegment)</div><div class='ctx'> 			goto skip_load_parent;</div><div class='ctx'> </div><div class='del'>-		if (InitializeFileRecordSegment != op) {</div><div class='del'>-			if (rec-&gt;rhdr.sign == NTFS_BAAD_SIGNATURE)</div><div class='del'>-				goto dirty_vol;</div><div class='del'>-			if (!check_lsn(&amp;rec-&gt;rhdr, rlsn))</div><div class='del'>-				goto out;</div><div class='del'>-			if (!check_file_record(rec, NULL, sbi))</div><div class='del'>-				goto dirty_vol;</div><div class='del'>-			attr = Add2Ptr(rec, roff);</div><div class='del'>-		}</div><div class='add'>+		if (rec-&gt;rhdr.sign == NTFS_BAAD_SIGNATURE)</div><div class='add'>+			goto dirty_vol;</div><div class='add'>+		if (!check_lsn(&amp;rec-&gt;rhdr, rlsn))</div><div class='add'>+			goto out;</div><div class='add'>+		if (!check_file_record(rec, NULL, sbi))</div><div class='add'>+			goto dirty_vol;</div><div class='add'>+		attr = Add2Ptr(rec, roff);</div><div class='ctx'> </div><div class='ctx'> 		if (is_rec_base(rec) || InitializeFileRecordSegment == op) {</div><div class='ctx'> 			rno_base = rno;</div><div class='hunk'>@@ -3124,7 +3141,7 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,</div><div class='ctx'> </div><div class='ctx'> 			if (inode)</div><div class='ctx'> 				iput(inode);</div><div class='del'>-			else if (mi)</div><div class='add'>+			else</div><div class='ctx'> 				mi_put(mi);</div><div class='ctx'> </div><div class='ctx'> 			inode = inode_parent;</div><div class='hunk'>@@ -3720,10 +3737,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='ctx'> 	struct ntfs_log *log;</div><div class='ctx'> </div><div class='del'>-	struct restart_info rst_info, rst_info2;</div><div class='del'>-	u64 rec_lsn, ra_lsn, checkpt_lsn = 0, rlsn = 0;</div><div class='add'>+	u64 rec_lsn, checkpt_lsn = 0, rlsn = 0;</div><div class='ctx'> 	struct ATTR_NAME_ENTRY *attr_names = NULL;</div><div class='del'>-	struct ATTR_NAME_ENTRY *ane;</div><div class='add'>+	u32 attr_names_bytes = 0;</div><div class='add'>+	u32 oatbl_bytes = 0;</div><div class='ctx'> 	struct RESTART_TABLE *dptbl = NULL;</div><div class='ctx'> 	struct RESTART_TABLE *trtbl = NULL;</div><div class='ctx'> 	const struct RESTART_TABLE *rt;</div><div class='hunk'>@@ -3738,12 +3755,11 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)</div><div class='ctx'> 	struct NTFS_RESTART *rst = NULL;</div><div class='ctx'> 	struct lcb *lcb = NULL;</div><div class='ctx'> 	struct OPEN_ATTR_ENRTY *oe;</div><div class='add'>+	struct ATTR_NAME_ENTRY *ane;</div><div class='ctx'> 	struct TRANSACTION_ENTRY *tr;</div><div class='ctx'> 	struct DIR_PAGE_ENTRY *dp;</div><div class='ctx'> 	u32 i, bytes_per_attr_entry;</div><div class='del'>-	u32 l_size = ni-&gt;vfs_inode.i_size;</div><div class='del'>-	u32 orig_file_size = l_size;</div><div class='del'>-	u32 page_size, vbo, tail, off, dlen;</div><div class='add'>+	u32 vbo, tail, off, dlen;</div><div class='ctx'> 	u32 saved_len, rec_len, transact_id;</div><div class='ctx'> 	bool use_second_page;</div><div class='ctx'> 	struct RESTART_AREA *ra2, *ra = NULL;</div><div class='hunk'>@@ -3758,52 +3774,50 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)</div><div class='ctx'> 	u16 t16;</div><div class='ctx'> 	u32 t32;</div><div class='ctx'> </div><div class='del'>-	/* Get the size of page. NOTE: To replay we can use default page. */</div><div class='del'>-#if PAGE_SIZE &gt;= DefaultLogPageSize &amp;&amp; PAGE_SIZE &lt;= DefaultLogPageSize * 2</div><div class='del'>-	page_size = norm_file_page(PAGE_SIZE, &amp;l_size, true);</div><div class='del'>-#else</div><div class='del'>-	page_size = norm_file_page(PAGE_SIZE, &amp;l_size, false);</div><div class='del'>-#endif</div><div class='del'>-	if (!page_size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	log = kzalloc(sizeof(struct ntfs_log), GFP_NOFS);</div><div class='ctx'> 	if (!log)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	log-&gt;ni = ni;</div><div class='del'>-	log-&gt;l_size = l_size;</div><div class='del'>-	log-&gt;one_page_buf = kmalloc(page_size, GFP_NOFS);</div><div class='add'>+	log-&gt;l_size = log-&gt;orig_file_size = ni-&gt;vfs_inode.i_size;</div><div class='ctx'> </div><div class='add'>+	/* Get the size of page. NOTE: To replay we can use default page. */</div><div class='add'>+#if PAGE_SIZE &gt;= DefaultLogPageSize &amp;&amp; PAGE_SIZE &lt;= DefaultLogPageSize * 2</div><div class='add'>+	log-&gt;page_size = norm_file_page(PAGE_SIZE, &amp;log-&gt;l_size, true);</div><div class='add'>+#else</div><div class='add'>+	log-&gt;page_size = norm_file_page(PAGE_SIZE, &amp;log-&gt;l_size, false);</div><div class='add'>+#endif</div><div class='add'>+	if (!log-&gt;page_size) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	log-&gt;one_page_buf = kmalloc(log-&gt;page_size, GFP_NOFS);</div><div class='ctx'> 	if (!log-&gt;one_page_buf) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	log-&gt;page_size = page_size;</div><div class='del'>-	log-&gt;page_mask = page_size - 1;</div><div class='del'>-	log-&gt;page_bits = blksize_bits(page_size);</div><div class='add'>+	log-&gt;page_mask = log-&gt;page_size - 1;</div><div class='add'>+	log-&gt;page_bits = blksize_bits(log-&gt;page_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Look for a restart area on the disk. */</div><div class='del'>-	memset(&amp;rst_info, 0, sizeof(struct restart_info));</div><div class='del'>-	err = log_read_rst(log, l_size, true, &amp;rst_info);</div><div class='add'>+	err = log_read_rst(log, true, &amp;log-&gt;rst_info);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* remember 'initialized' */</div><div class='del'>-	*initialized = rst_info.initialized;</div><div class='add'>+	*initialized = log-&gt;rst_info.initialized;</div><div class='ctx'> </div><div class='del'>-	if (!rst_info.restart) {</div><div class='del'>-		if (rst_info.initialized) {</div><div class='add'>+	if (!log-&gt;rst_info.restart) {</div><div class='add'>+		if (log-&gt;rst_info.initialized) {</div><div class='ctx'> 			/* No restart area but the file is not initialized. */</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		log_init_pg_hdr(log, page_size, page_size, 1, 1);</div><div class='del'>-		log_create(log, l_size, 0, get_random_u32(), false, false);</div><div class='del'>-</div><div class='del'>-		log-&gt;ra = ra;</div><div class='add'>+		log_init_pg_hdr(log, 1, 1);</div><div class='add'>+		log_create(log, 0, get_random_u32(), false, false);</div><div class='ctx'> </div><div class='ctx'> 		ra = log_create_ra(log);</div><div class='ctx'> 		if (!ra) {</div><div class='hunk'>@@ -3820,25 +3834,26 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)</div><div class='ctx'> 	 * If the restart offset above wasn't zero then we won't</div><div class='ctx'> 	 * look for a second restart.</div><div class='ctx'> 	 */</div><div class='del'>-	if (rst_info.vbo)</div><div class='add'>+	if (log-&gt;rst_info.vbo)</div><div class='ctx'> 		goto check_restart_area;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;rst_info2, 0, sizeof(struct restart_info));</div><div class='del'>-	err = log_read_rst(log, l_size, false, &amp;rst_info2);</div><div class='add'>+	err = log_read_rst(log, false, &amp;log-&gt;rst_info2);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine which restart area to use. */</div><div class='del'>-	if (!rst_info2.restart || rst_info2.last_lsn &lt;= rst_info.last_lsn)</div><div class='add'>+	if (!log-&gt;rst_info2.restart ||</div><div class='add'>+	    log-&gt;rst_info2.last_lsn &lt;= log-&gt;rst_info.last_lsn)</div><div class='ctx'> 		goto use_first_page;</div><div class='ctx'> </div><div class='ctx'> 	use_second_page = true;</div><div class='ctx'> </div><div class='del'>-	if (rst_info.chkdsk_was_run &amp;&amp; page_size != rst_info.vbo) {</div><div class='add'>+	if (log-&gt;rst_info.chkdsk_was_run &amp;&amp;</div><div class='add'>+	    log-&gt;page_size != log-&gt;rst_info.vbo) {</div><div class='ctx'> 		struct RECORD_PAGE_HDR *sp = NULL;</div><div class='ctx'> 		bool usa_error;</div><div class='ctx'> </div><div class='del'>-		if (!read_log_page(log, page_size, &amp;sp, &amp;usa_error) &amp;&amp;</div><div class='add'>+		if (!read_log_page(log, log-&gt;page_size, &amp;sp, &amp;usa_error) &amp;&amp;</div><div class='ctx'> 		    sp-&gt;rhdr.sign == NTFS_CHKD_SIGNATURE) {</div><div class='ctx'> 			use_second_page = false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3846,52 +3861,43 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (use_second_page) {</div><div class='del'>-		kfree(rst_info.r_page);</div><div class='del'>-		memcpy(&amp;rst_info, &amp;rst_info2, sizeof(struct restart_info));</div><div class='del'>-		rst_info2.r_page = NULL;</div><div class='add'>+		kfree(log-&gt;rst_info.r_page);</div><div class='add'>+		memcpy(&amp;log-&gt;rst_info, &amp;log-&gt;rst_info2,</div><div class='add'>+		       sizeof(struct restart_info));</div><div class='add'>+		log-&gt;rst_info2.r_page = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> use_first_page:</div><div class='del'>-	kfree(rst_info2.r_page);</div><div class='add'>+	kfree(log-&gt;rst_info2.r_page);</div><div class='ctx'> </div><div class='ctx'> check_restart_area:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the restart area is at offset 0, we want</div><div class='ctx'> 	 * to write the second restart area first.</div><div class='ctx'> 	 */</div><div class='del'>-	log-&gt;init_ra = !!rst_info.vbo;</div><div class='add'>+	log-&gt;init_ra = !!log-&gt;rst_info.vbo;</div><div class='ctx'> </div><div class='ctx'> 	/* If we have a valid page then grab a pointer to the restart area. */</div><div class='del'>-	ra2 = rst_info.valid_page ?</div><div class='del'>-		      Add2Ptr(rst_info.r_page,</div><div class='del'>-			      le16_to_cpu(rst_info.r_page-&gt;ra_off)) :</div><div class='add'>+	ra2 = log-&gt;rst_info.valid_page ?</div><div class='add'>+		      Add2Ptr(log-&gt;rst_info.r_page,</div><div class='add'>+			      le16_to_cpu(log-&gt;rst_info.r_page-&gt;ra_off)) :</div><div class='ctx'> 		      NULL;</div><div class='ctx'> </div><div class='del'>-	if (rst_info.chkdsk_was_run ||</div><div class='add'>+	if (log-&gt;rst_info.chkdsk_was_run ||</div><div class='ctx'> 	    (ra2 &amp;&amp; ra2-&gt;client_idx[1] == LFS_NO_CLIENT_LE)) {</div><div class='ctx'> 		bool wrapped = false;</div><div class='ctx'> 		bool use_multi_page = false;</div><div class='ctx'> 		u32 open_log_count;</div><div class='ctx'> </div><div class='ctx'> 		/* Do some checks based on whether we have a valid log page. */</div><div class='del'>-		if (!rst_info.valid_page) {</div><div class='del'>-			open_log_count = get_random_u32();</div><div class='del'>-			goto init_log_instance;</div><div class='del'>-		}</div><div class='del'>-		open_log_count = le32_to_cpu(ra2-&gt;open_log_count);</div><div class='add'>+		open_log_count = log-&gt;rst_info.valid_page ?</div><div class='add'>+					 le32_to_cpu(ra2-&gt;open_log_count) :</div><div class='add'>+					 get_random_u32();</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If the restart page size isn't changing then we want to</div><div class='del'>-		 * check how much work we need to do.</div><div class='del'>-		 */</div><div class='del'>-		if (page_size != le32_to_cpu(rst_info.r_page-&gt;sys_page_size))</div><div class='del'>-			goto init_log_instance;</div><div class='add'>+		log_init_pg_hdr(log, 1, 1);</div><div class='ctx'> </div><div class='del'>-init_log_instance:</div><div class='del'>-		log_init_pg_hdr(log, page_size, page_size, 1, 1);</div><div class='del'>-</div><div class='del'>-		log_create(log, l_size, rst_info.last_lsn, open_log_count,</div><div class='del'>-			   wrapped, use_multi_page);</div><div class='add'>+		log_create(log, log-&gt;rst_info.last_lsn, open_log_count, wrapped,</div><div class='add'>+			   use_multi_page);</div><div class='ctx'> </div><div class='ctx'> 		ra = log_create_ra(log);</div><div class='ctx'> 		if (!ra) {</div><div class='hunk'>@@ -3916,28 +3922,30 @@ init_log_instance:</div><div class='ctx'> 	 * use the log file. We must use the system page size instead of the</div><div class='ctx'> 	 * default size if there is not a clean shutdown.</div><div class='ctx'> 	 */</div><div class='del'>-	t32 = le32_to_cpu(rst_info.r_page-&gt;sys_page_size);</div><div class='del'>-	if (page_size != t32) {</div><div class='del'>-		l_size = orig_file_size;</div><div class='del'>-		page_size =</div><div class='del'>-			norm_file_page(t32, &amp;l_size, t32 == DefaultLogPageSize);</div><div class='add'>+	t32 = le32_to_cpu(log-&gt;rst_info.r_page-&gt;sys_page_size);</div><div class='add'>+	if (log-&gt;page_size != t32) {</div><div class='add'>+		log-&gt;l_size = log-&gt;orig_file_size;</div><div class='add'>+		log-&gt;page_size = norm_file_page(t32, &amp;log-&gt;l_size,</div><div class='add'>+						t32 == DefaultLogPageSize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page_size != t32 ||</div><div class='del'>-	    page_size != le32_to_cpu(rst_info.r_page-&gt;page_size)) {</div><div class='add'>+	if (log-&gt;page_size != t32 ||</div><div class='add'>+	    log-&gt;page_size != le32_to_cpu(log-&gt;rst_info.r_page-&gt;page_size)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	log-&gt;page_mask = log-&gt;page_size - 1;</div><div class='add'>+	log-&gt;page_bits = blksize_bits(log-&gt;page_size);</div><div class='add'>+</div><div class='ctx'> 	/* If the file size has shrunk then we won't mount it. */</div><div class='del'>-	if (l_size &lt; le64_to_cpu(ra2-&gt;l_size)) {</div><div class='add'>+	if (log-&gt;l_size &lt; le64_to_cpu(ra2-&gt;l_size)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	log_init_pg_hdr(log, page_size, page_size,</div><div class='del'>-			le16_to_cpu(rst_info.r_page-&gt;major_ver),</div><div class='del'>-			le16_to_cpu(rst_info.r_page-&gt;minor_ver));</div><div class='add'>+	log_init_pg_hdr(log, le16_to_cpu(log-&gt;rst_info.r_page-&gt;major_ver),</div><div class='add'>+			le16_to_cpu(log-&gt;rst_info.r_page-&gt;minor_ver));</div><div class='ctx'> </div><div class='ctx'> 	log-&gt;l_size = le64_to_cpu(ra2-&gt;l_size);</div><div class='ctx'> 	log-&gt;seq_num_bits = le32_to_cpu(ra2-&gt;seq_num_bits);</div><div class='hunk'>@@ -3945,7 +3953,7 @@ init_log_instance:</div><div class='ctx'> 	log-&gt;seq_num_mask = (8 &lt;&lt; log-&gt;file_data_bits) - 1;</div><div class='ctx'> 	log-&gt;last_lsn = le64_to_cpu(ra2-&gt;current_lsn);</div><div class='ctx'> 	log-&gt;seq_num = log-&gt;last_lsn &gt;&gt; log-&gt;file_data_bits;</div><div class='del'>-	log-&gt;ra_off = le16_to_cpu(rst_info.r_page-&gt;ra_off);</div><div class='add'>+	log-&gt;ra_off = le16_to_cpu(log-&gt;rst_info.r_page-&gt;ra_off);</div><div class='ctx'> 	log-&gt;restart_size = log-&gt;sys_page_size - log-&gt;ra_off;</div><div class='ctx'> 	log-&gt;record_header_len = le16_to_cpu(ra2-&gt;rec_hdr_len);</div><div class='ctx'> 	log-&gt;ra_size = le16_to_cpu(ra2-&gt;ra_len);</div><div class='hunk'>@@ -4045,7 +4053,7 @@ find_oldest:</div><div class='ctx'> 	log-&gt;current_avail = current_log_avail(log);</div><div class='ctx'> </div><div class='ctx'> 	/* Remember which restart area to write first. */</div><div class='del'>-	log-&gt;init_ra = rst_info.vbo;</div><div class='add'>+	log-&gt;init_ra = log-&gt;rst_info.vbo;</div><div class='ctx'> </div><div class='ctx'> process_log:</div><div class='ctx'> 	/* 1.0, 1.1, 2.0 log-&gt;major_ver/minor_ver - short values. */</div><div class='hunk'>@@ -4105,7 +4113,7 @@ process_log:</div><div class='ctx'> 	log-&gt;client_id.seq_num = cr-&gt;seq_num;</div><div class='ctx'> 	log-&gt;client_id.client_idx = client;</div><div class='ctx'> </div><div class='del'>-	err = read_rst_area(log, &amp;rst, &amp;ra_lsn);</div><div class='add'>+	err = read_rst_area(log, &amp;rst, &amp;checkpt_lsn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -4114,13 +4122,12 @@ process_log:</div><div class='ctx'> </div><div class='ctx'> 	bytes_per_attr_entry = !rst-&gt;major_ver ? 0x2C : 0x28;</div><div class='ctx'> </div><div class='del'>-	checkpt_lsn = le64_to_cpu(rst-&gt;check_point_start);</div><div class='del'>-	if (!checkpt_lsn)</div><div class='del'>-		checkpt_lsn = ra_lsn;</div><div class='add'>+	if (rst-&gt;check_point_start)</div><div class='add'>+		checkpt_lsn = le64_to_cpu(rst-&gt;check_point_start);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate and Read the Transaction Table. */</div><div class='ctx'> 	if (!rst-&gt;transact_table_len)</div><div class='del'>-		goto check_dirty_page_table;</div><div class='add'>+		goto check_dirty_page_table; /* reduce tab pressure. */</div><div class='ctx'> </div><div class='ctx'> 	t64 = le64_to_cpu(rst-&gt;transact_table_lsn);</div><div class='ctx'> 	err = read_log_rec_lcb(log, t64, lcb_ctx_prev, &amp;lcb);</div><div class='hunk'>@@ -4160,7 +4167,7 @@ process_log:</div><div class='ctx'> check_dirty_page_table:</div><div class='ctx'> 	/* The next record back should be the Dirty Pages Table. */</div><div class='ctx'> 	if (!rst-&gt;dirty_pages_len)</div><div class='del'>-		goto check_attribute_names;</div><div class='add'>+		goto check_attribute_names; /* reduce tab pressure. */</div><div class='ctx'> </div><div class='ctx'> 	t64 = le64_to_cpu(rst-&gt;dirty_pages_table_lsn);</div><div class='ctx'> 	err = read_log_rec_lcb(log, t64, lcb_ctx_prev, &amp;lcb);</div><div class='hunk'>@@ -4196,7 +4203,7 @@ check_dirty_page_table:</div><div class='ctx'> </div><div class='ctx'> 	/* Convert Ra version '0' into version '1'. */</div><div class='ctx'> 	if (rst-&gt;major_ver)</div><div class='del'>-		goto end_conv_1;</div><div class='add'>+		goto end_conv_1; /* reduce tab pressure. */</div><div class='ctx'> </div><div class='ctx'> 	dp = NULL;</div><div class='ctx'> 	while ((dp = enum_rstbl(dptbl, dp))) {</div><div class='hunk'>@@ -4216,8 +4223,7 @@ end_conv_1:</div><div class='ctx'> 	 * remembering the oldest lsn values.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sbi-&gt;cluster_size &lt;= log-&gt;page_size)</div><div class='del'>-		goto trace_dp_table;</div><div class='del'>-</div><div class='add'>+		goto trace_dp_table; /* reduce tab pressure. */</div><div class='ctx'> 	dp = NULL;</div><div class='ctx'> 	while ((dp = enum_rstbl(dptbl, dp))) {</div><div class='ctx'> 		struct DIR_PAGE_ENTRY *next = dp;</div><div class='hunk'>@@ -4238,7 +4244,7 @@ trace_dp_table:</div><div class='ctx'> check_attribute_names:</div><div class='ctx'> 	/* The next record should be the Attribute Names. */</div><div class='ctx'> 	if (!rst-&gt;attr_names_len)</div><div class='del'>-		goto check_attr_table;</div><div class='add'>+		goto check_attr_table; /* reduce tab pressure. */</div><div class='ctx'> </div><div class='ctx'> 	t64 = le64_to_cpu(rst-&gt;attr_names_lsn);</div><div class='ctx'> 	err = read_log_rec_lcb(log, t64, lcb_ctx_prev, &amp;lcb);</div><div class='hunk'>@@ -4256,9 +4262,9 @@ check_attribute_names:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t32 = lrh_length(lrh);</div><div class='del'>-	rec_len -= t32;</div><div class='add'>+	attr_names_bytes = rec_len - t32;</div><div class='ctx'> </div><div class='del'>-	attr_names = kmemdup(Add2Ptr(lrh, t32), rec_len, GFP_NOFS);</div><div class='add'>+	attr_names = kmemdup(Add2Ptr(lrh, t32), attr_names_bytes, GFP_NOFS);</div><div class='ctx'> 	if (!attr_names) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4270,7 +4276,7 @@ check_attribute_names:</div><div class='ctx'> check_attr_table:</div><div class='ctx'> 	/* The next record should be the attribute Table. */</div><div class='ctx'> 	if (!rst-&gt;open_attr_len)</div><div class='del'>-		goto check_attribute_names2;</div><div class='add'>+		goto check_attribute_names2; /* reduce tab pressure. */</div><div class='ctx'> </div><div class='ctx'> 	t64 = le64_to_cpu(rst-&gt;open_attr_table_lsn);</div><div class='ctx'> 	err = read_log_rec_lcb(log, t64, lcb_ctx_prev, &amp;lcb);</div><div class='hunk'>@@ -4290,14 +4296,14 @@ check_attr_table:</div><div class='ctx'> 	t16 = le16_to_cpu(lrh-&gt;redo_off);</div><div class='ctx'> </div><div class='ctx'> 	rt = Add2Ptr(lrh, t16);</div><div class='del'>-	t32 = rec_len - t16;</div><div class='add'>+	oatbl_bytes = rec_len - t16;</div><div class='ctx'> </div><div class='del'>-	if (!check_rstbl(rt, t32)) {</div><div class='add'>+	if (!check_rstbl(rt, oatbl_bytes)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	oatbl = kmemdup(rt, t32, GFP_NOFS);</div><div class='add'>+	oatbl = kmemdup(rt, oatbl_bytes, GFP_NOFS);</div><div class='ctx'> 	if (!oatbl) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4330,23 +4336,43 @@ check_attr_table:</div><div class='ctx'> 	lcb = NULL;</div><div class='ctx'> </div><div class='ctx'> check_attribute_names2:</div><div class='del'>-	if (!rst-&gt;attr_names_len)</div><div class='del'>-		goto trace_attribute_table;</div><div class='del'>-</div><div class='del'>-	ane = attr_names;</div><div class='del'>-	if (!oatbl)</div><div class='del'>-		goto trace_attribute_table;</div><div class='del'>-	while (ane-&gt;off) {</div><div class='del'>-		/* TODO: Clear table on exit! */</div><div class='del'>-		oe = Add2Ptr(oatbl, le16_to_cpu(ane-&gt;off));</div><div class='del'>-		t16 = le16_to_cpu(ane-&gt;name_bytes);</div><div class='del'>-		oe-&gt;name_len = t16 / sizeof(short);</div><div class='del'>-		oe-&gt;ptr = ane-&gt;name;</div><div class='del'>-		oe-&gt;is_attr_name = 2;</div><div class='del'>-		ane = Add2Ptr(ane, sizeof(struct ATTR_NAME_ENTRY) + t16);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-trace_attribute_table:</div><div class='add'>+	if (attr_names &amp;&amp; oatbl) {</div><div class='add'>+		off = 0;</div><div class='add'>+		for (;;) {</div><div class='add'>+			/* Check we can use attribute name entry 'ane'. */</div><div class='add'>+			static_assert(sizeof(*ane) == 4);</div><div class='add'>+			if (off + sizeof(*ane) &gt; attr_names_bytes) {</div><div class='add'>+				/* just ignore the rest. */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ane = Add2Ptr(attr_names, off);</div><div class='add'>+			t16 = le16_to_cpu(ane-&gt;off);</div><div class='add'>+			if (!t16) {</div><div class='add'>+				/* this is the only valid exit. */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Check we can use open attribute entry 'oe'. */</div><div class='add'>+			if (t16 + sizeof(*oe) &gt; oatbl_bytes) {</div><div class='add'>+				/* just ignore the rest. */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* TODO: Clear table on exit! */</div><div class='add'>+			oe = Add2Ptr(oatbl, t16);</div><div class='add'>+			t16 = le16_to_cpu(ane-&gt;name_bytes);</div><div class='add'>+			off += t16 + sizeof(*ane);</div><div class='add'>+			if (off &gt; attr_names_bytes) {</div><div class='add'>+				/* just ignore the rest. */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			oe-&gt;name_len = t16 / sizeof(short);</div><div class='add'>+			oe-&gt;ptr = ane-&gt;name;</div><div class='add'>+			oe-&gt;is_attr_name = 2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the checkpt_lsn is zero, then this is a freshly</div><div class='ctx'> 	 * formatted disk and we have no work to do.</div><div class='hunk'>@@ -4539,7 +4565,6 @@ copy_lcns:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		goto next_log_record_analyze;</div><div class='del'>-		;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case OpenNonresidentAttribute:</div><div class='hunk'>@@ -4678,7 +4703,7 @@ end_log_records_enumerate:</div><div class='ctx'> 	 * table are not empty.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((!dptbl || !dptbl-&gt;total) &amp;&amp; (!trtbl || !trtbl-&gt;total))</div><div class='del'>-		goto end_reply;</div><div class='add'>+		goto end_replay;</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;flags |= NTFS_FLAGS_NEED_REPLAY;</div><div class='ctx'> 	if (is_ro)</div><div class='hunk'>@@ -5107,7 +5132,7 @@ undo_action_done:</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;flags &amp;= ~NTFS_FLAGS_NEED_REPLAY;</div><div class='ctx'> </div><div class='del'>-end_reply:</div><div class='add'>+end_replay:</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	if (is_ro)</div><div class='hunk'>@@ -5189,7 +5214,7 @@ out:</div><div class='ctx'> 	kfree(oatbl);</div><div class='ctx'> 	kfree(dptbl);</div><div class='ctx'> 	kfree(attr_names);</div><div class='del'>-	kfree(rst_info.r_page);</div><div class='add'>+	kfree(log-&gt;rst_info.r_page);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ra);</div><div class='ctx'> 	kfree(log-&gt;one_page_buf);</div><div class='head'>diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c<br/>index fbfe21dbb425..5f138f715835 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/fsntfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/fsntfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/fsntfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/fsntfs.c</a></div><div class='hunk'>@@ -522,7 +522,7 @@ static int ntfs_extend_mft(struct ntfs_sb_info *sbi)</div><div class='ctx'> 	ni-&gt;mi.dirty = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Step 2: Resize $MFT::BITMAP. */</div><div class='del'>-	new_bitmap_bytes = bitmap_size(new_mft_total);</div><div class='add'>+	new_bitmap_bytes = ntfs3_bitmap_size(new_mft_total);</div><div class='ctx'> </div><div class='ctx'> 	err = attr_set_size(ni, ATTR_BITMAP, NULL, 0, &amp;sbi-&gt;mft.bitmap.run,</div><div class='ctx'> 			    new_bitmap_bytes, &amp;new_bitmap_bytes, true, NULL);</div><div class='hunk'>@@ -853,7 +853,8 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * sb can be NULL here. In this case sbi-&gt;flags should be 0 too.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!sb || !(sbi-&gt;flags &amp; NTFS_FLAGS_MFTMIRR))</div><div class='add'>+	if (!sb || !(sbi-&gt;flags &amp; NTFS_FLAGS_MFTMIRR) ||</div><div class='add'>+	    unlikely(ntfs3_forced_shutdown(sb)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	blocksize = sb-&gt;s_blocksize;</div><div class='hunk'>@@ -904,10 +905,18 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)</div><div class='ctx'> void ntfs_bad_inode(struct inode *inode, const char *hint)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_sb_info *sbi = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='add'>+	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='ctx'> 	ntfs_inode_err(inode, "%s", hint);</div><div class='del'>-	make_bad_inode(inode);</div><div class='del'>-	ntfs_set_state(sbi, NTFS_DIRTY_ERROR);</div><div class='add'>+</div><div class='add'>+	/* Do not call make_bad_inode()! */</div><div class='add'>+	ni-&gt;ni_bad = true;</div><div class='add'>+</div><div class='add'>+	/* Avoid recursion if bad inode is $Volume. */</div><div class='add'>+	if (inode-&gt;i_ino != MFT_REC_VOL &amp;&amp;</div><div class='add'>+	    !(sbi-&gt;flags &amp; NTFS_FLAGS_LOG_REPLAYING)) {</div><div class='add'>+		ntfs_set_state(sbi, NTFS_DIRTY_ERROR);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1006,32 +1015,28 @@ static inline __le32 security_hash(const void *sd, size_t bytes)</div><div class='ctx'> 	return cpu_to_le32(hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ntfs_sb_read(struct super_block *sb, u64 lbo, size_t bytes, void *buffer)</div><div class='add'>+/*</div><div class='add'>+ * simple wrapper for sb_bread_unmovable.</div><div class='add'>+ */</div><div class='add'>+struct buffer_head *ntfs_bread(struct super_block *sb, sector_t block)</div><div class='ctx'> {</div><div class='del'>-	struct block_device *bdev = sb-&gt;s_bdev;</div><div class='del'>-	u32 blocksize = sb-&gt;s_blocksize;</div><div class='del'>-	u64 block = lbo &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='del'>-	u32 off = lbo &amp; (blocksize - 1);</div><div class='del'>-	u32 op = blocksize - off;</div><div class='del'>-</div><div class='del'>-	for (; bytes; block += 1, off = 0, op = blocksize) {</div><div class='del'>-		struct buffer_head *bh = __bread(bdev, block, blocksize);</div><div class='del'>-</div><div class='del'>-		if (!bh)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		if (op &gt; bytes)</div><div class='del'>-			op = bytes;</div><div class='del'>-</div><div class='del'>-		memcpy(buffer, bh-&gt;b_data + off, op);</div><div class='del'>-</div><div class='del'>-		put_bh(bh);</div><div class='add'>+	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-		bytes -= op;</div><div class='del'>-		buffer = Add2Ptr(buffer, op);</div><div class='add'>+	if (unlikely(block &gt;= sbi-&gt;volume.blocks)) {</div><div class='add'>+		/* prevent generic message "attempt to access beyond end of device" */</div><div class='add'>+		ntfs_err(sb, "try to read out of volume at offset 0x%llx",</div><div class='add'>+			 (u64)block &lt;&lt; sb-&gt;s_blocksize_bits);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	bh = sb_bread_unmovable(sb, block);</div><div class='add'>+	if (bh)</div><div class='add'>+		return bh;</div><div class='add'>+</div><div class='add'>+	ntfs_err(sb, "failed to read volume at offset 0x%llx",</div><div class='add'>+		 (u64)block &lt;&lt; sb-&gt;s_blocksize_bits);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ntfs_sb_write(struct super_block *sb, u64 lbo, size_t bytes,</div><div class='hunk'>@@ -1344,7 +1349,14 @@ int ntfs_get_bh(struct ntfs_sb_info *sbi, const struct runs_tree *run, u64 vbo,</div><div class='ctx'> 				}</div><div class='ctx'> 				if (buffer_locked(bh))</div><div class='ctx'> 					__wait_on_buffer(bh);</div><div class='del'>-				set_buffer_uptodate(bh);</div><div class='add'>+</div><div class='add'>+				lock_buffer(bh);</div><div class='add'>+				if (!buffer_uptodate(bh))</div><div class='add'>+				{</div><div class='add'>+					memset(bh-&gt;b_data, 0, blocksize);</div><div class='add'>+					set_buffer_uptodate(bh);</div><div class='add'>+				}</div><div class='add'>+				unlock_buffer(bh);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				bh = ntfs_bread(sb, block);</div><div class='ctx'> 				if (!bh) {</div><div class='hunk'>@@ -1467,99 +1479,86 @@ int ntfs_write_bh(struct ntfs_sb_info *sbi, struct NTFS_RECORD_HEADER *rhdr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_bio_pages - Read/write pages from/to disk.</div><div class='add'>+ * ntfs_read_write_run - Read/Write disk's page cache.</div><div class='ctx'>  */</div><div class='del'>-int ntfs_bio_pages(struct ntfs_sb_info *sbi, const struct runs_tree *run,</div><div class='del'>-		   struct page **pages, u32 nr_pages, u64 vbo, u32 bytes,</div><div class='del'>-		   enum req_op op)</div><div class='add'>+int ntfs_read_write_run(struct ntfs_sb_info *sbi, const struct runs_tree *run,</div><div class='add'>+			void *buf, u64 vbo, size_t bytes, int wr)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct bio *new, *bio = NULL;</div><div class='ctx'> 	struct super_block *sb = sbi-&gt;sb;</div><div class='del'>-	struct block_device *bdev = sb-&gt;s_bdev;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct address_space *mapping = sb-&gt;s_bdev-&gt;bd_mapping;</div><div class='ctx'> 	u8 cluster_bits = sbi-&gt;cluster_bits;</div><div class='del'>-	CLST lcn, clen, vcn, vcn_next;</div><div class='del'>-	u32 add, off, page_idx;</div><div class='add'>+	CLST vcn_next, vcn = vbo &gt;&gt; cluster_bits;</div><div class='add'>+	CLST lcn, clen;</div><div class='ctx'> 	u64 lbo, len;</div><div class='del'>-	size_t run_idx;</div><div class='del'>-	struct blk_plug plug;</div><div class='add'>+	size_t idx;</div><div class='add'>+	u32 off, op;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+	char *kaddr;</div><div class='ctx'> </div><div class='ctx'> 	if (!bytes)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	blk_start_plug(&amp;plug);</div><div class='add'>+	if (!run_lookup_entry(run, vcn, &amp;lcn, &amp;clen, &amp;idx))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	/* Align vbo and bytes to be 512 bytes aligned. */</div><div class='del'>-	lbo = (vbo + bytes + 511) &amp; ~511ull;</div><div class='del'>-	vbo = vbo &amp; ~511ull;</div><div class='del'>-	bytes = lbo - vbo;</div><div class='add'>+	if (lcn == SPARSE_LCN)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	vcn = vbo &gt;&gt; cluster_bits;</div><div class='del'>-	if (!run_lookup_entry(run, vcn, &amp;lcn, &amp;clen, &amp;run_idx)) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	off = vbo &amp; sbi-&gt;cluster_mask;</div><div class='del'>-	page_idx = 0;</div><div class='del'>-	page = pages[0];</div><div class='add'>+	lbo = ((u64)lcn &lt;&lt; cluster_bits) + off;</div><div class='add'>+	len = ((u64)clen &lt;&lt; cluster_bits) - off;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		lbo = ((u64)lcn &lt;&lt; cluster_bits) + off;</div><div class='del'>-		len = ((u64)clen &lt;&lt; cluster_bits) - off;</div><div class='del'>-new_bio:</div><div class='del'>-		new = bio_alloc(bdev, nr_pages - page_idx, op, GFP_NOFS);</div><div class='del'>-		if (bio) {</div><div class='del'>-			bio_chain(bio, new);</div><div class='del'>-			submit_bio(bio);</div><div class='del'>-		}</div><div class='del'>-		bio = new;</div><div class='del'>-		bio-&gt;bi_iter.bi_sector = lbo &gt;&gt; 9;</div><div class='add'>+		/* Read range [lbo, lbo+len). */</div><div class='add'>+		folio = read_mapping_folio(mapping, lbo &gt;&gt; PAGE_SHIFT, NULL);</div><div class='ctx'> </div><div class='del'>-		while (len) {</div><div class='del'>-			off = vbo &amp; (PAGE_SIZE - 1);</div><div class='del'>-			add = off + len &gt; PAGE_SIZE ? (PAGE_SIZE - off) : len;</div><div class='add'>+		if (IS_ERR(folio))</div><div class='add'>+			return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-			if (bio_add_page(bio, page, add, off) &lt; add)</div><div class='del'>-				goto new_bio;</div><div class='add'>+		off = offset_in_page(lbo);</div><div class='add'>+		op = PAGE_SIZE - off;</div><div class='ctx'> </div><div class='del'>-			if (bytes &lt;= add)</div><div class='del'>-				goto out;</div><div class='del'>-			bytes -= add;</div><div class='del'>-			vbo += add;</div><div class='add'>+		if (op &gt; len)</div><div class='add'>+			op = len;</div><div class='add'>+		if (op &gt; bytes)</div><div class='add'>+			op = bytes;</div><div class='ctx'> </div><div class='del'>-			if (add + off == PAGE_SIZE) {</div><div class='del'>-				page_idx += 1;</div><div class='del'>-				if (WARN_ON(page_idx &gt;= nr_pages)) {</div><div class='del'>-					err = -EINVAL;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				page = pages[page_idx];</div><div class='del'>-			}</div><div class='add'>+		kaddr = kmap_local_folio(folio, 0);</div><div class='add'>+		if (wr) {</div><div class='add'>+			memcpy(kaddr + off, buf, op);</div><div class='add'>+			folio_mark_dirty(folio);</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(buf, kaddr + off, op);</div><div class='add'>+			flush_dcache_folio(folio);</div><div class='add'>+		}</div><div class='add'>+		kunmap_local(kaddr);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> </div><div class='del'>-			if (len &lt;= add)</div><div class='del'>-				break;</div><div class='del'>-			len -= add;</div><div class='del'>-			lbo += add;</div><div class='add'>+		bytes -= op;</div><div class='add'>+		if (!bytes)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		buf += op;</div><div class='add'>+		len -= op;</div><div class='add'>+		if (len) {</div><div class='add'>+			/* next volume's page. */</div><div class='add'>+			lbo += op;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* get next range. */</div><div class='ctx'> 		vcn_next = vcn + clen;</div><div class='del'>-		if (!run_get_entry(run, ++run_idx, &amp;vcn, &amp;lcn, &amp;clen) ||</div><div class='add'>+		if (!run_get_entry(run, ++idx, &amp;vcn, &amp;lcn, &amp;clen) ||</div><div class='ctx'> 		    vcn != vcn_next) {</div><div class='del'>-			err = -ENOENT;</div><div class='del'>-			goto out;</div><div class='add'>+			return -ENOENT;</div><div class='ctx'> 		}</div><div class='del'>-		off = 0;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (bio) {</div><div class='del'>-		if (!err)</div><div class='del'>-			err = submit_bio_wait(bio);</div><div class='del'>-		bio_put(bio);</div><div class='del'>-	}</div><div class='del'>-	blk_finish_plug(&amp;plug);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+		if (lcn == SPARSE_LCN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		lbo = ((u64)lcn &lt;&lt; cluster_bits);</div><div class='add'>+		len = ((u64)clen &lt;&lt; cluster_bits);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2128,8 +2127,8 @@ int ntfs_insert_security(struct ntfs_sb_info *sbi,</div><div class='ctx'> 			if (le32_to_cpu(d_security-&gt;size) == new_sec_size &amp;&amp;</div><div class='ctx'> 			    d_security-&gt;key.hash == hash_key.hash &amp;&amp;</div><div class='ctx'> 			    !memcmp(d_security + 1, sd, size_sd)) {</div><div class='del'>-				*security_id = d_security-&gt;key.sec_id;</div><div class='ctx'> 				/* Such security already exists. */</div><div class='add'>+				*security_id = d_security-&gt;key.sec_id;</div><div class='ctx'> 				err = 0;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2625,8 +2624,8 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='add'>+	u32 uni_bytes;</div><div class='ctx'> 	struct ntfs_inode *ni = sbi-&gt;volume.ni;</div><div class='del'>-	const u8 max_ulen = 0x80; /* TODO: use attrdef to get maximum length */</div><div class='ctx'> 	/* Allocate PATH_MAX bytes. */</div><div class='ctx'> 	struct cpu_str *uni = __getname();</div><div class='ctx'> </div><div class='hunk'>@@ -2638,7 +2637,8 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (uni-&gt;len &gt; max_ulen) {</div><div class='add'>+	uni_bytes = uni-&gt;len * sizeof(u16);</div><div class='add'>+	if (uni_bytes &gt; NTFS_LABEL_MAX_LENGTH * sizeof(u16)) {</div><div class='ctx'> 		ntfs_warn(sbi-&gt;sb, "new label is too long");</div><div class='ctx'> 		err = -EFBIG;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2649,13 +2649,13 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)</div><div class='ctx'> 	/* Ignore any errors. */</div><div class='ctx'> 	ni_remove_attr(ni, ATTR_LABEL, NULL, 0, false, NULL);</div><div class='ctx'> </div><div class='del'>-	err = ni_insert_resident(ni, uni-&gt;len * sizeof(u16), ATTR_LABEL, NULL,</div><div class='del'>-				 0, &amp;attr, NULL, NULL);</div><div class='add'>+	err = ni_insert_resident(ni, uni_bytes, ATTR_LABEL, NULL, 0, &amp;attr,</div><div class='add'>+				 NULL, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto unlock_out;</div><div class='ctx'> </div><div class='ctx'> 	/* write new label in on-disk struct. */</div><div class='del'>-	memcpy(resident_data(attr), uni-&gt;name, uni-&gt;len * sizeof(u16));</div><div class='add'>+	memcpy(resident_data(attr), uni-&gt;name, uni_bytes);</div><div class='ctx'> </div><div class='ctx'> 	/* update cached value of current label. */</div><div class='ctx'> 	if (len &gt;= ARRAY_SIZE(sbi-&gt;volume.label))</div><div class='hunk'>@@ -2673,4 +2673,4 @@ unlock_out:</div><div class='ctx'> out:</div><div class='ctx'> 	__putname(uni);</div><div class='ctx'> 	return err;</div><div class='del'>-}
\ No newline at end of file</div><div class='add'>+}</div><div class='head'>diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c<br/>index cf92b2433f7a..7157cfd70fdc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/index.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/index.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/index.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/index.c</a></div><div class='hunk'>@@ -618,7 +618,7 @@ static bool index_hdr_check(const struct INDEX_HDR *hdr, u32 bytes)</div><div class='ctx'> 	u32 off = le32_to_cpu(hdr-&gt;de_off);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ALIGNED(off, 8) || tot &gt; bytes || end &gt; tot ||</div><div class='del'>-	    off + sizeof(struct NTFS_DE) &gt; end) {</div><div class='add'>+	    size_add(off, sizeof(struct NTFS_DE)) &gt; end) {</div><div class='ctx'> 		/* incorrect index buffer. */</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -736,7 +736,7 @@ fill_table:</div><div class='ctx'> 	if (end &gt; total)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (off + sizeof(struct NTFS_DE) &gt; end)</div><div class='add'>+	if (size_add(off, sizeof(struct NTFS_DE)) &gt; end)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	e = Add2Ptr(hdr, off);</div><div class='hunk'>@@ -978,7 +978,7 @@ static struct indx_node *indx_new(struct ntfs_index *indx,</div><div class='ctx'> 		hdr-&gt;used =</div><div class='ctx'> 			cpu_to_le32(eo + sizeof(struct NTFS_DE) + sizeof(u64));</div><div class='ctx'> 		de_set_vbn_le(e, *sub_vbn);</div><div class='del'>-		hdr-&gt;flags = 1;</div><div class='add'>+		hdr-&gt;flags = NTFS_INDEX_HDR_HAS_SUBNODES;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		e-&gt;size = cpu_to_le16(sizeof(struct NTFS_DE));</div><div class='ctx'> 		hdr-&gt;used = cpu_to_le32(eo + sizeof(struct NTFS_DE));</div><div class='hunk'>@@ -1094,8 +1094,7 @@ int indx_read(struct ntfs_index *indx, struct ntfs_inode *ni, CLST vbn,</div><div class='ctx'> </div><div class='ctx'> ok:</div><div class='ctx'> 	if (!index_buf_check(ib, bytes, &amp;vbn)) {</div><div class='del'>-		ntfs_inode_err(&amp;ni-&gt;vfs_inode, "directory corrupted");</div><div class='del'>-		ntfs_set_state(ni-&gt;mi.sbi, NTFS_DIRTY_ERROR);</div><div class='add'>+		_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1117,8 +1116,7 @@ ok:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (err == -E_NTFS_CORRUPT) {</div><div class='del'>-		ntfs_inode_err(&amp;ni-&gt;vfs_inode, "directory corrupted");</div><div class='del'>-		ntfs_set_state(ni-&gt;mi.sbi, NTFS_DIRTY_ERROR);</div><div class='add'>+		_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1456,13 +1454,13 @@ static int indx_create_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> </div><div class='ctx'> 	alloc-&gt;nres.valid_size = alloc-&gt;nres.data_size = cpu_to_le64(data_size);</div><div class='ctx'> </div><div class='del'>-	err = ni_insert_resident(ni, bitmap_size(1), ATTR_BITMAP, in-&gt;name,</div><div class='del'>-				 in-&gt;name_len, &amp;bitmap, NULL, NULL);</div><div class='add'>+	err = ni_insert_resident(ni, ntfs3_bitmap_size(1), ATTR_BITMAP,</div><div class='add'>+				 in-&gt;name, in-&gt;name_len, &amp;bitmap, NULL, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='ctx'> 	if (in-&gt;name == I30_NAME) {</div><div class='del'>-		ni-&gt;vfs_inode.i_size = data_size;</div><div class='add'>+		i_size_write(&amp;ni-&gt;vfs_inode, data_size);</div><div class='ctx'> 		inode_set_bytes(&amp;ni-&gt;vfs_inode, alloc_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1510,6 +1508,16 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 			bmp_size = bmp_size_v = le32_to_cpu(bmp-&gt;res.data_size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Index blocks exist, but $BITMAP has zero valid bits.</div><div class='add'>+		 * This implies an on-disk corruption and must be rejected.</div><div class='add'>+		 */</div><div class='add'>+		if (in-&gt;name == I30_NAME &amp;&amp;</div><div class='add'>+		    unlikely(bmp_size_v == 0 &amp;&amp; indx-&gt;alloc_run.count)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		bit = bmp_size &lt;&lt; 3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1518,8 +1526,9 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 	if (bmp) {</div><div class='ctx'> 		/* Increase bitmap. */</div><div class='ctx'> 		err = attr_set_size(ni, ATTR_BITMAP, in-&gt;name, in-&gt;name_len,</div><div class='del'>-				    &amp;indx-&gt;bitmap_run, bitmap_size(bit + 1),</div><div class='del'>-				    NULL, true, NULL);</div><div class='add'>+				    &amp;indx-&gt;bitmap_run,</div><div class='add'>+				    ntfs3_bitmap_size(bit + 1), NULL, true,</div><div class='add'>+				    NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1533,6 +1542,11 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (data_size &lt;= le64_to_cpu(alloc-&gt;nres.data_size)) {</div><div class='add'>+		/* Reuse index. */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Increase allocation. */</div><div class='ctx'> 	err = attr_set_size(ni, ATTR_ALLOC, in-&gt;name, in-&gt;name_len,</div><div class='ctx'> 			    &amp;indx-&gt;alloc_run, data_size, &amp;data_size, true,</div><div class='hunk'>@@ -1544,8 +1558,9 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (in-&gt;name == I30_NAME)</div><div class='del'>-		ni-&gt;vfs_inode.i_size = data_size;</div><div class='add'>+		i_size_write(&amp;ni-&gt;vfs_inode, data_size);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	*vbn = bit &lt;&lt; indx-&gt;idx2vbn_bits;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1676,7 +1691,7 @@ static int indx_insert_into_root(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 	e-&gt;size = cpu_to_le16(sizeof(struct NTFS_DE) + sizeof(u64));</div><div class='ctx'> 	e-&gt;flags = NTFS_IE_HAS_SUBNODES | NTFS_IE_LAST;</div><div class='ctx'> </div><div class='del'>-	hdr-&gt;flags = 1;</div><div class='add'>+	hdr-&gt;flags = NTFS_INDEX_HDR_HAS_SUBNODES;</div><div class='ctx'> 	hdr-&gt;used = hdr-&gt;total =</div><div class='ctx'> 		cpu_to_le32(new_root_size - offsetof(struct INDEX_ROOT, ihdr));</div><div class='ctx'> </div><div class='hunk'>@@ -1909,7 +1924,8 @@ indx_insert_into_buffer(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 		 * Undo critical operations.</div><div class='ctx'> 		 */</div><div class='ctx'> 		indx_mark_free(indx, ni, new_vbn &gt;&gt; indx-&gt;idx2vbn_bits);</div><div class='del'>-		memcpy(hdr1, hdr1_saved, used1);</div><div class='add'>+		unsafe_memcpy(hdr1, hdr1_saved, used1,</div><div class='add'>+			      "There are entries after the structure");</div><div class='ctx'> 		indx_write(indx, ni, n1, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2090,9 +2106,9 @@ static int indx_shrink(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (in-&gt;name == I30_NAME)</div><div class='del'>-		ni-&gt;vfs_inode.i_size = new_data;</div><div class='add'>+		i_size_write(&amp;ni-&gt;vfs_inode, new_data);</div><div class='ctx'> </div><div class='del'>-	bpb = bitmap_size(bit);</div><div class='add'>+	bpb = ntfs3_bitmap_size(bit);</div><div class='ctx'> 	if (bpb * 8 == nbits)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2177,6 +2193,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx,</div><div class='ctx'> </div><div class='ctx'> 		e = hdr_first_de(&amp;n-&gt;index-&gt;ihdr);</div><div class='ctx'> 		fnd_push(fnd, n, e);</div><div class='add'>+		if (!e) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (!de_is_last(e)) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2198,6 +2218,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx,</div><div class='ctx'> </div><div class='ctx'> 	n = fnd-&gt;nodes[level];</div><div class='ctx'> 	te = hdr_first_de(&amp;n-&gt;index-&gt;ihdr);</div><div class='add'>+	if (!te) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	/* Copy the candidate entry into the replacement entry buffer. */</div><div class='ctx'> 	re = kmalloc(le16_to_cpu(te-&gt;size) + sizeof(u64), GFP_NOFS);</div><div class='ctx'> 	if (!re) {</div><div class='hunk'>@@ -2576,7 +2600,7 @@ int indx_delete_entry(struct ntfs_index *indx, struct ntfs_inode *ni,</div><div class='ctx'> 		err = attr_set_size(ni, ATTR_ALLOC, in-&gt;name, in-&gt;name_len,</div><div class='ctx'> 				    &amp;indx-&gt;alloc_run, 0, NULL, false, NULL);</div><div class='ctx'> 		if (in-&gt;name == I30_NAME)</div><div class='del'>-			ni-&gt;vfs_inode.i_size = 0;</div><div class='add'>+			i_size_write(&amp;ni-&gt;vfs_inode, 0);</div><div class='ctx'> </div><div class='ctx'> 		err = ni_remove_attr(ni, ATTR_ALLOC, in-&gt;name, in-&gt;name_len,</div><div class='ctx'> 				     false, NULL);</div><div class='head'>diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c<br/>index 5e3d71374918..0a9ac5efeb67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/inode.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include "ntfs_fs.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_read_mft - Read record and parses MFT.</div><div class='add'>+ * ntfs_read_mft - Read record and parse MFT.</div><div class='ctx'>  */</div><div class='ctx'> static struct inode *ntfs_read_mft(struct inode *inode,</div><div class='ctx'> 				   const struct cpu_str *name,</div><div class='hunk'>@@ -37,7 +37,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,</div><div class='ctx'> 	bool is_dir;</div><div class='ctx'> 	unsigned long ino = inode-&gt;i_ino;</div><div class='ctx'> 	u32 rp_fa = 0, asize, t32;</div><div class='del'>-	u16 roff, rsize, names = 0;</div><div class='add'>+	u16 roff, rsize, names = 0, links = 0;</div><div class='ctx'> 	const struct ATTR_FILE_NAME *fname = NULL;</div><div class='ctx'> 	const struct INDEX_ROOT *root;</div><div class='ctx'> 	struct REPARSE_DATA_BUFFER rp; // 0x18 bytes</div><div class='hunk'>@@ -200,11 +200,12 @@ next_attr:</div><div class='ctx'> 		    rsize &lt; SIZEOF_ATTRIBUTE_FILENAME)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='add'>+		names += 1;</div><div class='ctx'> 		fname = Add2Ptr(attr, roff);</div><div class='ctx'> 		if (fname-&gt;type == FILE_NAME_DOS)</div><div class='ctx'> 			goto next_attr;</div><div class='ctx'> </div><div class='del'>-		names += 1;</div><div class='add'>+		links += 1;</div><div class='ctx'> 		if (name &amp;&amp; name-&gt;len == fname-&gt;name_len &amp;&amp;</div><div class='ctx'> 		    !ntfs_cmp_names_cpu(name, (struct le_str *)&amp;fname-&gt;name_len,</div><div class='ctx'> 					NULL, false))</div><div class='hunk'>@@ -345,9 +346,7 @@ next_attr:</div><div class='ctx'> 			inode-&gt;i_size = le16_to_cpu(rp.SymbolicLinkReparseBuffer</div><div class='ctx'> 							    .PrintNameLength) /</div><div class='ctx'> 					sizeof(u16);</div><div class='del'>-</div><div class='ctx'> 			ni-&gt;i_valid = inode-&gt;i_size;</div><div class='del'>-</div><div class='ctx'> 			/* Clear directory bit. */</div><div class='ctx'> 			if (ni-&gt;ni_flags &amp; NI_FLAG_DIR) {</div><div class='ctx'> 				indx_clear(&amp;ni-&gt;dir);</div><div class='hunk'>@@ -411,8 +410,10 @@ end_enum:</div><div class='ctx'> 	if (!std5)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (is_bad_inode(inode))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (!is_match &amp;&amp; name) {</div><div class='del'>-		/* Reuse rec as buffer for ascii name. */</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -427,11 +428,12 @@ end_enum:</div><div class='ctx'> </div><div class='ctx'> 	if (names != le16_to_cpu(rec-&gt;hard_links)) {</div><div class='ctx'> 		/* Correct minor error on the fly. Do not mark inode as dirty. */</div><div class='add'>+		ntfs_inode_warn(inode, "Correct links count -&gt; %u.", names);</div><div class='ctx'> 		rec-&gt;hard_links = cpu_to_le16(names);</div><div class='ctx'> 		ni-&gt;mi.dirty = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_nlink(inode, names);</div><div class='add'>+	set_nlink(inode, links);</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(mode)) {</div><div class='ctx'> 		ni-&gt;std_fa |= FILE_ATTRIBUTE_DIRECTORY;</div><div class='hunk'>@@ -442,7 +444,9 @@ end_enum:</div><div class='ctx'> 		 * Usually a hard links to directories are disabled.</div><div class='ctx'> 		 */</div><div class='ctx'> 		inode-&gt;i_op = &amp;ntfs_dir_inode_operations;</div><div class='del'>-		inode-&gt;i_fop = &amp;ntfs_dir_operations;</div><div class='add'>+		inode-&gt;i_fop = unlikely(is_legacy_ntfs(sb)) ?</div><div class='add'>+				       &amp;ntfs_legacy_dir_operations :</div><div class='add'>+				       &amp;ntfs_dir_operations;</div><div class='ctx'> 		ni-&gt;i_valid = 0;</div><div class='ctx'> 	} else if (S_ISLNK(mode)) {</div><div class='ctx'> 		ni-&gt;std_fa &amp;= ~FILE_ATTRIBUTE_DIRECTORY;</div><div class='hunk'>@@ -452,7 +456,9 @@ end_enum:</div><div class='ctx'> 	} else if (S_ISREG(mode)) {</div><div class='ctx'> 		ni-&gt;std_fa &amp;= ~FILE_ATTRIBUTE_DIRECTORY;</div><div class='ctx'> 		inode-&gt;i_op = &amp;ntfs_file_inode_operations;</div><div class='del'>-		inode-&gt;i_fop = &amp;ntfs_file_operations;</div><div class='add'>+		inode-&gt;i_fop = unlikely(is_legacy_ntfs(sb)) ?</div><div class='add'>+				       &amp;ntfs_legacy_file_operations :</div><div class='add'>+				       &amp;ntfs_file_operations;</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = is_compressed(ni) ? &amp;ntfs_aops_cmpr :</div><div class='ctx'> 							      &amp;ntfs_aops;</div><div class='ctx'> 		if (ino != MFT_REC_MFT)</div><div class='hunk'>@@ -465,6 +471,8 @@ end_enum:</div><div class='ctx'> 		   fname-&gt;home.seq == cpu_to_le16(MFT_REC_EXTEND)) {</div><div class='ctx'> 		/* Records in $Extend are not a files or general directories. */</div><div class='ctx'> 		inode-&gt;i_op = &amp;ntfs_file_inode_operations;</div><div class='add'>+		mode = S_IFREG;</div><div class='add'>+		init_rwsem(&amp;ni-&gt;file.run_lock);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -530,14 +538,18 @@ struct inode *ntfs_iget5(struct super_block *sb, const struct MFT_REF *ref,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	/* If this is a freshly allocated inode, need to read it now. */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW)</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW)</div><div class='ctx'> 		inode = ntfs_read_mft(inode, name, ref);</div><div class='ctx'> 	else if (ref-&gt;seq != ntfs_i(inode)-&gt;mi.mrec-&gt;seq) {</div><div class='del'>-		/* Inode overlaps? */</div><div class='del'>-		_ntfs_bad_inode(inode);</div><div class='add'>+		/*</div><div class='add'>+		 * Sequence number is not expected.</div><div class='add'>+		 * Looks like inode was reused but caller uses the old reference</div><div class='add'>+		 */</div><div class='add'>+		iput(inode);</div><div class='add'>+		inode = ERR_PTR(-ESTALE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(inode) &amp;&amp; name)</div><div class='add'>+	if (IS_ERR(inode))</div><div class='ctx'> 		ntfs_set_state(sb-&gt;s_fs_info, NTFS_DIRTY_ERROR);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='hunk'>@@ -572,13 +584,19 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,</div><div class='ctx'> 	clear_buffer_uptodate(bh);</div><div class='ctx'> </div><div class='ctx'> 	if (is_resident(ni)) {</div><div class='del'>-		ni_lock(ni);</div><div class='del'>-		err = attr_data_read_resident(ni, &amp;folio-&gt;page);</div><div class='del'>-		ni_unlock(ni);</div><div class='del'>-</div><div class='del'>-		if (!err)</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='add'>+		bh-&gt;b_blocknr = RESIDENT_LCN;</div><div class='ctx'> 		bh-&gt;b_size = block_size;</div><div class='add'>+		if (!folio) {</div><div class='add'>+			/* direct io (read) or bmap call */</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			ni_lock(ni);</div><div class='add'>+			err = attr_data_read_resident(ni, folio);</div><div class='add'>+			ni_unlock(ni);</div><div class='add'>+</div><div class='add'>+			if (!err)</div><div class='add'>+				set_buffer_uptodate(bh);</div><div class='add'>+		}</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -596,7 +614,8 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,</div><div class='ctx'> </div><div class='ctx'> 	bytes = ((u64)len &lt;&lt; cluster_bits) - off;</div><div class='ctx'> </div><div class='del'>-	if (lcn == SPARSE_LCN) {</div><div class='add'>+	if (lcn &gt;= sbi-&gt;used.bitmap.nbits) {</div><div class='add'>+		/* This case includes resident/compressed/sparse. */</div><div class='ctx'> 		if (!create) {</div><div class='ctx'> 			if (bh-&gt;b_size &gt; bytes)</div><div class='ctx'> 				bh-&gt;b_size = bytes;</div><div class='hunk'>@@ -653,9 +672,10 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,</div><div class='ctx'> 			off = vbo &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 			folio_set_bh(bh, folio, off);</div><div class='ctx'> </div><div class='del'>-			err = bh_read(bh, 0);</div><div class='del'>-			if (err &lt; 0)</div><div class='add'>+			if (bh_read(bh, 0) &lt; 0) {</div><div class='add'>+				err = -EIO;</div><div class='ctx'> 				goto out;</div><div class='add'>+			}</div><div class='ctx'> 			folio_zero_segment(folio, off + voff, off + block_size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -699,25 +719,24 @@ static sector_t ntfs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> </div><div class='ctx'> static int ntfs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct address_space *mapping = page-&gt;mapping;</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (is_resident(ni)) {</div><div class='ctx'> 		ni_lock(ni);</div><div class='del'>-		err = attr_data_read_resident(ni, page);</div><div class='add'>+		err = attr_data_read_resident(ni, folio);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='ctx'> 		if (err != E_NTFS_NONRESIDENT) {</div><div class='del'>-			unlock_page(page);</div><div class='add'>+			folio_unlock(folio);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_compressed(ni)) {</div><div class='ctx'> 		ni_lock(ni);</div><div class='del'>-		err = ni_readpage_cmpr(ni, page);</div><div class='add'>+		err = ni_readpage_cmpr(ni, folio);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -788,6 +807,10 @@ static ssize_t ntfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	if (is_compressed(ni)) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = blockdev_direct_IO(iocb, inode, iter,</div><div class='ctx'> 				 wr ? ntfs_get_block_direct_IO_W :</div><div class='hunk'>@@ -850,14 +873,22 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ntfs_resident_writepage(struct folio *folio,</div><div class='del'>-				   struct writeback_control *wbc, void *data)</div><div class='add'>+				   struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = data;</div><div class='del'>-	struct ntfs_inode *ni = ntfs_i(mapping-&gt;host);</div><div class='add'>+	struct address_space *mapping = folio-&gt;mapping;</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	ni_lock(ni);</div><div class='del'>-	ret = attr_data_write_resident(ni, &amp;folio-&gt;page);</div><div class='add'>+	ret = attr_data_write_resident(ni, folio);</div><div class='ctx'> 	ni_unlock(ni);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != E_NTFS_NONRESIDENT)</div><div class='hunk'>@@ -869,9 +900,23 @@ static int ntfs_resident_writepage(struct folio *folio,</div><div class='ctx'> static int ntfs_writepages(struct address_space *mapping,</div><div class='ctx'> 			   struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	if (is_resident(ntfs_i(mapping-&gt;host)))</div><div class='del'>-		return write_cache_pages(mapping, wbc, ntfs_resident_writepage,</div><div class='del'>-					 mapping);</div><div class='add'>+	struct inode *inode = mapping-&gt;host;</div><div class='add'>+</div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ntfs_i(inode))))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (is_resident(ntfs_i(inode))) {</div><div class='add'>+		struct folio *folio = NULL;</div><div class='add'>+		int error;</div><div class='add'>+</div><div class='add'>+		while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)))</div><div class='add'>+			error = ntfs_resident_writepage(folio, wbc);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='ctx'> 	return mpage_writepages(mapping, wbc, ntfs_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -882,39 +927,46 @@ static int ntfs_get_block_write_begin(struct inode *inode, sector_t vbn,</div><div class='ctx'> 				  bh_result, create, GET_BLOCK_WRITE_BEGIN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ntfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		     loff_t pos, u32 len, struct page **pagep, void **fsdata)</div><div class='add'>+int ntfs_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		     loff_t pos, u32 len, struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='del'>-	*pagep = NULL;</div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (is_resident(ni)) {</div><div class='del'>-		struct page *page =</div><div class='del'>-			grab_cache_page_write_begin(mapping, pos &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		struct folio *folio = __filemap_get_folio(</div><div class='add'>+			mapping, pos &gt;&gt; PAGE_SHIFT, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='ctx'> </div><div class='del'>-		if (!page) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			err = PTR_ERR(folio);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ni_lock(ni);</div><div class='del'>-		err = attr_data_read_resident(ni, page);</div><div class='add'>+		err = attr_data_read_resident(ni, folio);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='ctx'> </div><div class='ctx'> 		if (!err) {</div><div class='del'>-			*pagep = page;</div><div class='add'>+			*foliop = folio;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 		if (err != E_NTFS_NONRESIDENT)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = block_write_begin(mapping, pos, len, pagep,</div><div class='add'>+	err = block_write_begin(mapping, pos, len, foliop,</div><div class='ctx'> 				ntfs_get_block_write_begin);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -924,8 +976,9 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * ntfs_write_end - Address_space_operations::write_end.</div><div class='ctx'>  */</div><div class='del'>-int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,</div><div class='del'>-		   u32 len, u32 copied, struct page *page, void *fsdata)</div><div class='add'>+int ntfs_write_end(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		   loff_t pos, u32 len, u32 copied, struct folio *folio,</div><div class='add'>+		   void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='hunk'>@@ -935,28 +988,28 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,</div><div class='ctx'> </div><div class='ctx'> 	if (is_resident(ni)) {</div><div class='ctx'> 		ni_lock(ni);</div><div class='del'>-		err = attr_data_write_resident(ni, page);</div><div class='add'>+		err = attr_data_write_resident(ni, folio);</div><div class='ctx'> 		ni_unlock(ni);</div><div class='ctx'> 		if (!err) {</div><div class='add'>+			struct buffer_head *head = folio_buffers(folio);</div><div class='ctx'> 			dirty = true;</div><div class='del'>-			/* Clear any buffers in page. */</div><div class='del'>-			if (page_has_buffers(page)) {</div><div class='del'>-				struct buffer_head *head, *bh;</div><div class='add'>+			/* Clear any buffers in folio. */</div><div class='add'>+			if (head) {</div><div class='add'>+				struct buffer_head *bh = head;</div><div class='ctx'> </div><div class='del'>-				bh = head = page_buffers(page);</div><div class='ctx'> 				do {</div><div class='ctx'> 					clear_buffer_dirty(bh);</div><div class='ctx'> 					clear_buffer_mapped(bh);</div><div class='ctx'> 					set_buffer_uptodate(bh);</div><div class='ctx'> 				} while (head != (bh = bh-&gt;b_this_page));</div><div class='ctx'> 			}</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='ctx'> 			err = copied;</div><div class='ctx'> 		}</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = generic_write_end(file, mapping, pos, len, copied, page,</div><div class='add'>+		err = generic_write_end(iocb, mapping, pos, len, copied, folio,</div><div class='ctx'> 					fsdata);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -974,7 +1027,7 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pos + err &gt; inode-&gt;i_size) {</div><div class='del'>-			inode-&gt;i_size = pos + err;</div><div class='add'>+			i_size_write(inode, pos + err);</div><div class='ctx'> 			dirty = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -985,45 +1038,6 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int reset_log_file(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	loff_t pos = 0;</div><div class='del'>-	u32 log_size = inode-&gt;i_size;</div><div class='del'>-	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		u32 len;</div><div class='del'>-		void *kaddr;</div><div class='del'>-		struct page *page;</div><div class='del'>-</div><div class='del'>-		len = pos + PAGE_SIZE &gt; log_size ? (log_size - pos) : PAGE_SIZE;</div><div class='del'>-</div><div class='del'>-		err = block_write_begin(mapping, pos, len, &amp;page,</div><div class='del'>-					ntfs_get_block_write_begin);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		kaddr = kmap_atomic(page);</div><div class='del'>-		memset(kaddr, -1, len);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-</div><div class='del'>-		err = block_write_end(NULL, mapping, pos, len, len, page, NULL);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		pos += len;</div><div class='del'>-</div><div class='del'>-		if (pos &gt;= log_size)</div><div class='del'>-			break;</div><div class='del'>-		balance_dirty_pages_ratelimited(mapping);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mark_inode_dirty_sync(inode);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ntfs3_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='ctx'> 	return _ni_write_inode(inode, wbc-&gt;sync_mode == WB_SYNC_ALL);</div><div class='hunk'>@@ -1035,68 +1049,26 @@ int ntfs_sync_inode(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * writeback_inode - Helper function for ntfs_flush_inodes().</div><div class='del'>- *</div><div class='del'>- * This writes both the inode and the file data blocks, waiting</div><div class='del'>- * for in flight data blocks before the start of the call.  It</div><div class='del'>- * does not wait for any io started during the call.</div><div class='del'>- */</div><div class='del'>-static int writeback_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	int ret = sync_inode_metadata(inode, 0);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ntfs_flush_inodes</div><div class='del'>- *</div><div class='del'>- * Write data and metadata corresponding to i1 and i2.  The io is</div><div class='del'>- * started but we do not wait for any of it to finish.</div><div class='del'>- *</div><div class='del'>- * filemap_flush() is used for the block device, so if there is a dirty</div><div class='del'>- * page for a block already in flight, we will not wait and start the</div><div class='del'>- * io over again.</div><div class='add'>+ * Helper function to read file.</div><div class='ctx'>  */</div><div class='del'>-int ntfs_flush_inodes(struct super_block *sb, struct inode *i1,</div><div class='del'>-		      struct inode *i2)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (i1)</div><div class='del'>-		ret = writeback_inode(i1);</div><div class='del'>-	if (!ret &amp;&amp; i2)</div><div class='del'>-		ret = writeback_inode(i2);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = sync_blockdev_nowait(sb-&gt;s_bdev);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int inode_write_data(struct inode *inode, const void *data, size_t bytes)</div><div class='add'>+int inode_read_data(struct inode *inode, void *data, size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t idx;</div><div class='add'>+	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> </div><div class='del'>-	/* Write non resident data. */</div><div class='ctx'> 	for (idx = 0; bytes; idx++) {</div><div class='ctx'> 		size_t op = bytes &gt; PAGE_SIZE ? PAGE_SIZE : bytes;</div><div class='del'>-		struct page *page = ntfs_map_page(inode-&gt;i_mapping, idx);</div><div class='add'>+		struct page *page = read_mapping_page(mapping, idx, NULL);</div><div class='add'>+		void *kaddr;</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(page))</div><div class='ctx'> 			return PTR_ERR(page);</div><div class='ctx'> </div><div class='del'>-		lock_page(page);</div><div class='del'>-		WARN_ON(!PageUptodate(page));</div><div class='del'>-		ClearPageUptodate(page);</div><div class='del'>-</div><div class='del'>-		memcpy(page_address(page), data, op);</div><div class='del'>-</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		kaddr = kmap_atomic(page);</div><div class='add'>+		memcpy(data, kaddr, op);</div><div class='add'>+		kunmap_atomic(kaddr);</div><div class='ctx'> </div><div class='del'>-		ntfs_unmap_page(page);</div><div class='add'>+		put_page(page);</div><div class='ctx'> </div><div class='ctx'> 		bytes -= op;</div><div class='ctx'> 		data = Add2Ptr(data, PAGE_SIZE);</div><div class='hunk'>@@ -1110,10 +1082,10 @@ int inode_write_data(struct inode *inode, const void *data, size_t bytes)</div><div class='ctx'>  * Number of bytes for REPARSE_DATA_BUFFER(IO_REPARSE_TAG_SYMLINK)</div><div class='ctx'>  * for unicode string of @uni_len length.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 ntfs_reparse_bytes(u32 uni_len)</div><div class='add'>+static inline u32 ntfs_reparse_bytes(u32 uni_len, bool is_absolute)</div><div class='ctx'> {</div><div class='ctx'> 	/* Header + unicode string + decorated unicode string. */</div><div class='del'>-	return sizeof(short) * (2 * uni_len + 4) +</div><div class='add'>+	return sizeof(short) * (2 * uni_len + (is_absolute ? 4 : 0)) +</div><div class='ctx'> 	       offsetof(struct REPARSE_DATA_BUFFER,</div><div class='ctx'> 			SymbolicLinkReparseBuffer.PathBuffer);</div><div class='ctx'> }</div><div class='hunk'>@@ -1126,8 +1098,11 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname,</div><div class='ctx'> 	struct REPARSE_DATA_BUFFER *rp;</div><div class='ctx'> 	__le16 *rp_name;</div><div class='ctx'> 	typeof(rp-&gt;SymbolicLinkReparseBuffer) *rs;</div><div class='add'>+	bool is_absolute;</div><div class='ctx'> </div><div class='del'>-	rp = kzalloc(ntfs_reparse_bytes(2 * size + 2), GFP_NOFS);</div><div class='add'>+	is_absolute = symname[0] &amp;&amp; symname[1] == ':';</div><div class='add'>+</div><div class='add'>+	rp = kzalloc(ntfs_reparse_bytes(2 * size + 2, is_absolute), GFP_NOFS);</div><div class='ctx'> 	if (!rp)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='hunk'>@@ -1142,7 +1117,7 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* err = the length of unicode name of symlink. */</div><div class='del'>-	*nsize = ntfs_reparse_bytes(err);</div><div class='add'>+	*nsize = ntfs_reparse_bytes(err, is_absolute);</div><div class='ctx'> </div><div class='ctx'> 	if (*nsize &gt; sbi-&gt;reparse.max_size) {</div><div class='ctx'> 		err = -EFBIG;</div><div class='hunk'>@@ -1162,24 +1137,28 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname,</div><div class='ctx'> </div><div class='ctx'> 	/* PrintName + SubstituteName. */</div><div class='ctx'> 	rs-&gt;SubstituteNameOffset = cpu_to_le16(sizeof(short) * err);</div><div class='del'>-	rs-&gt;SubstituteNameLength = cpu_to_le16(sizeof(short) * err + 8);</div><div class='add'>+	rs-&gt;SubstituteNameLength =</div><div class='add'>+		cpu_to_le16(sizeof(short) * err + (is_absolute ? 8 : 0));</div><div class='ctx'> 	rs-&gt;PrintNameLength = rs-&gt;SubstituteNameOffset;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO: Use relative path if possible to allow Windows to</div><div class='ctx'> 	 * parse this path.</div><div class='del'>-	 * 0-absolute path 1- relative path (SYMLINK_FLAG_RELATIVE).</div><div class='add'>+	 * 0-absolute path, 1- relative path (SYMLINK_FLAG_RELATIVE).</div><div class='ctx'> 	 */</div><div class='del'>-	rs-&gt;Flags = 0;</div><div class='del'>-</div><div class='del'>-	memmove(rp_name + err + 4, rp_name, sizeof(short) * err);</div><div class='del'>-</div><div class='del'>-	/* Decorate SubstituteName. */</div><div class='del'>-	rp_name += err;</div><div class='del'>-	rp_name[0] = cpu_to_le16('\\');</div><div class='del'>-	rp_name[1] = cpu_to_le16('?');</div><div class='del'>-	rp_name[2] = cpu_to_le16('?');</div><div class='del'>-	rp_name[3] = cpu_to_le16('\\');</div><div class='add'>+	rs-&gt;Flags = cpu_to_le32(is_absolute ? 0 : SYMLINK_FLAG_RELATIVE);</div><div class='add'>+</div><div class='add'>+	memmove(rp_name + err + (is_absolute ? 4 : 0), rp_name,</div><div class='add'>+		sizeof(short) * err);</div><div class='add'>+</div><div class='add'>+	if (is_absolute) {</div><div class='add'>+		/* Decorate SubstituteName. */</div><div class='add'>+		rp_name += err;</div><div class='add'>+		rp_name[0] = cpu_to_le16('\\');</div><div class='add'>+		rp_name[1] = cpu_to_le16('?');</div><div class='add'>+		rp_name[2] = cpu_to_le16('?');</div><div class='add'>+		rp_name[3] = cpu_to_le16('\\');</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rp;</div><div class='ctx'> out:</div><div class='hunk'>@@ -1199,11 +1178,10 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: if fnd != NULL (ntfs_atomic_open) then @dir is locked</div><div class='ctx'>  */</div><div class='del'>-struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-				struct dentry *dentry,</div><div class='del'>-				const struct cpu_str *uni, umode_t mode,</div><div class='del'>-				dev_t dev, const char *symname, u32 size,</div><div class='del'>-				struct ntfs_fnd *fnd)</div><div class='add'>+int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+		      struct dentry *dentry, const struct cpu_str *uni,</div><div class='add'>+		      umode_t mode, dev_t dev, const char *symname, u32 size,</div><div class='add'>+		      struct ntfs_fnd *fnd)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='hunk'>@@ -1228,6 +1206,9 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	struct REPARSE_DATA_BUFFER *rp = NULL;</div><div class='ctx'> 	bool rp_inserted = false;</div><div class='ctx'> </div><div class='add'>+	/* New file will be resident or non resident. */</div><div class='add'>+	const bool new_file_resident = 1;</div><div class='add'>+</div><div class='ctx'> 	if (!fnd)</div><div class='ctx'> 		ni_lock_dir(dir_ni);</div><div class='ctx'> </div><div class='hunk'>@@ -1300,12 +1281,23 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		fa |= FILE_ATTRIBUTE_READONLY;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate PATH_MAX bytes. */</div><div class='del'>-	new_de = __getname();</div><div class='add'>+	new_de = kmem_cache_zalloc(names_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (!new_de) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(dir_ni))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(sb))) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto out2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Mark rw ntfs as dirty. it will be cleared at umount. */</div><div class='ctx'> 	ntfs_set_state(sbi, NTFS_DIRTY_DIRTY);</div><div class='ctx'> </div><div class='hunk'>@@ -1391,7 +1383,7 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		fname-&gt;dup.a_time = std5-&gt;cr_time;</div><div class='ctx'> 	fname-&gt;dup.alloc_size = fname-&gt;dup.data_size = 0;</div><div class='ctx'> 	fname-&gt;dup.fa = std5-&gt;fa;</div><div class='del'>-	fname-&gt;dup.ea_size = fname-&gt;dup.reparse = 0;</div><div class='add'>+	fname-&gt;dup.extend_data = S_ISLNK(mode) ? IO_REPARSE_TAG_SYMLINK : 0;</div><div class='ctx'> </div><div class='ctx'> 	dsize = le16_to_cpu(new_de-&gt;key_size);</div><div class='ctx'> 	asize = ALIGN(SIZEOF_RESIDENT + dsize, 8);</div><div class='hunk'>@@ -1462,7 +1454,7 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		attr-&gt;size = cpu_to_le32(SIZEOF_RESIDENT);</div><div class='ctx'> 		attr-&gt;name_off = SIZEOF_RESIDENT_LE;</div><div class='ctx'> 		attr-&gt;res.data_off = SIZEOF_RESIDENT_LE;</div><div class='del'>-	} else if (S_ISREG(mode)) {</div><div class='add'>+	} else if (!new_file_resident &amp;&amp; S_ISREG(mode)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Regular file. Create empty non resident data attribute.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1478,7 +1470,7 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			attr-&gt;size = cpu_to_le32(SIZEOF_NONRESIDENT_EX + 8);</div><div class='ctx'> 			attr-&gt;name_off = SIZEOF_NONRESIDENT_EX_LE;</div><div class='ctx'> 			attr-&gt;flags = ATTR_FLAG_COMPRESSED;</div><div class='del'>-			attr-&gt;nres.c_unit = COMPRESSION_UNIT;</div><div class='add'>+			attr-&gt;nres.c_unit = NTFS_LZNT_CUNIT;</div><div class='ctx'> 			asize = SIZEOF_NONRESIDENT_EX + 8;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			attr-&gt;size = cpu_to_le32(SIZEOF_NONRESIDENT + 8);</div><div class='hunk'>@@ -1529,7 +1521,7 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Below function 'ntfs_save_wsl_perm' requires 0x78 bytes.</div><div class='del'>-		 * It is good idea to keep extened attributes resident.</div><div class='add'>+		 * It is good idea to keep extended attributes resident.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (asize + t16 + 0x78 + 8 &gt; sbi-&gt;record_size) {</div><div class='ctx'> 			CLST alen;</div><div class='hunk'>@@ -1598,7 +1590,9 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;ntfs_dir_inode_operations;</div><div class='del'>-		inode-&gt;i_fop = &amp;ntfs_dir_operations;</div><div class='add'>+		inode-&gt;i_fop = unlikely(is_legacy_ntfs(sb)) ?</div><div class='add'>+				       &amp;ntfs_legacy_dir_operations :</div><div class='add'>+				       &amp;ntfs_dir_operations;</div><div class='ctx'> 	} else if (S_ISLNK(mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;ntfs_link_inode_operations;</div><div class='ctx'> 		inode-&gt;i_fop = NULL;</div><div class='hunk'>@@ -1607,7 +1601,9 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		inode_nohighmem(inode);</div><div class='ctx'> 	} else if (S_ISREG(mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;ntfs_file_inode_operations;</div><div class='del'>-		inode-&gt;i_fop = &amp;ntfs_file_operations;</div><div class='add'>+		inode-&gt;i_fop = unlikely(is_legacy_ntfs(sb)) ?</div><div class='add'>+				       &amp;ntfs_legacy_file_operations :</div><div class='add'>+				       &amp;ntfs_file_operations;</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = is_compressed(ni) ? &amp;ntfs_aops_cmpr :</div><div class='ctx'> 							      &amp;ntfs_aops;</div><div class='ctx'> 		init_rwsem(&amp;ni-&gt;file.run_lock);</div><div class='hunk'>@@ -1627,25 +1623,30 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		inode-&gt;i_flags |= S_NOSEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * ntfs_init_acl and ntfs_save_wsl_perm update extended attribute.</div><div class='del'>-	 * The packed size of extended attribute is stored in direntry too.</div><div class='del'>-	 * 'fname' here points to inside new_de.</div><div class='del'>-	 */</div><div class='del'>-	ntfs_save_wsl_perm(inode, &amp;fname-&gt;dup.ea_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * update ea_size in file_name attribute too.</div><div class='del'>-	 * Use ni_find_attr cause layout of MFT record may be changed</div><div class='del'>-	 * in ntfs_init_acl and ntfs_save_wsl_perm.</div><div class='del'>-	 */</div><div class='del'>-	attr = ni_find_attr(ni, NULL, NULL, ATTR_NAME, NULL, 0, NULL, NULL);</div><div class='del'>-	if (attr) {</div><div class='del'>-		struct ATTR_FILE_NAME *fn;</div><div class='add'>+	if (!S_ISLNK(mode)) {</div><div class='add'>+		/*</div><div class='add'>+		 * ntfs_init_acl and ntfs_save_wsl_perm update extended attribute.</div><div class='add'>+		 * The packed size of extended attribute is stored in direntry too.</div><div class='add'>+		 * 'fname' here points to inside new_de.</div><div class='add'>+		 */</div><div class='add'>+		err = ntfs_save_wsl_perm(inode, &amp;fname-&gt;dup.extend_data);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out6;</div><div class='ctx'> </div><div class='del'>-		fn = resident_data_ex(attr, SIZEOF_ATTRIBUTE_FILENAME);</div><div class='del'>-		if (fn)</div><div class='del'>-			fn-&gt;dup.ea_size = fname-&gt;dup.ea_size;</div><div class='add'>+		/*</div><div class='add'>+		 * update ea_size in file_name attribute too.</div><div class='add'>+		 * Use ni_find_attr cause layout of MFT record may be changed</div><div class='add'>+		 * in ntfs_init_acl and ntfs_save_wsl_perm.</div><div class='add'>+		 */</div><div class='add'>+		attr = ni_find_attr(ni, NULL, NULL, ATTR_NAME, NULL, 0, NULL,</div><div class='add'>+				    NULL);</div><div class='add'>+		if (attr) {</div><div class='add'>+			struct ATTR_FILE_NAME *fn;</div><div class='add'>+</div><div class='add'>+			fn = resident_data_ex(attr, SIZEOF_ATTRIBUTE_FILENAME);</div><div class='add'>+			if (fn)</div><div class='add'>+				fn-&gt;dup.extend_data = fname-&gt;dup.extend_data;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We do not need to update parent directory later */</div><div class='hunk'>@@ -1676,6 +1677,15 @@ struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	goto out2;</div><div class='ctx'> </div><div class='ctx'> out6:</div><div class='add'>+	attr = ni_find_attr(ni, NULL, NULL, ATTR_EA, NULL, 0, NULL, NULL);</div><div class='add'>+	if (attr &amp;&amp; attr-&gt;non_res) {</div><div class='add'>+		/* Delete ATTR_EA, if non-resident. */</div><div class='add'>+		struct runs_tree run;</div><div class='add'>+		run_init(&amp;run);</div><div class='add'>+		attr_set_size(ni, ATTR_EA, NULL, 0, &amp;run, 0, NULL, false, NULL);</div><div class='add'>+		run_close(&amp;run);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (rp_inserted)</div><div class='ctx'> 		ntfs_remove_reparse(sbi, IO_REPARSE_TAG_SYMLINK, &amp;new_de-&gt;ref);</div><div class='ctx'> </div><div class='hunk'>@@ -1699,12 +1709,10 @@ out1:</div><div class='ctx'> 	if (!fnd)</div><div class='ctx'> 		ni_unlock(dir_ni);</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+	if (!err)</div><div class='add'>+		unlock_new_inode(inode);</div><div class='ctx'> </div><div class='del'>-	unlock_new_inode(inode);</div><div class='del'>-</div><div class='del'>-	return inode;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ntfs_link_inode(struct inode *inode, struct dentry *dentry)</div><div class='hunk'>@@ -1715,7 +1723,7 @@ int ntfs_link_inode(struct inode *inode, struct dentry *dentry)</div><div class='ctx'> 	struct NTFS_DE *de;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate PATH_MAX bytes. */</div><div class='del'>-	de = __getname();</div><div class='add'>+	de = kmem_cache_zalloc(names_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (!de)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1753,7 +1761,7 @@ int ntfs_unlink_inode(struct inode *dir, const struct dentry *dentry)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate PATH_MAX bytes. */</div><div class='del'>-	de = __getname();</div><div class='add'>+	de = kmem_cache_zalloc(names_cachep, GFP_KERNEL);</div><div class='ctx'> 	if (!de)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2079,7 +2087,7 @@ static const char *ntfs_get_link(struct dentry *de, struct inode *inode,</div><div class='ctx'> // clang-format off</div><div class='ctx'> const struct inode_operations ntfs_link_inode_operations = {</div><div class='ctx'> 	.get_link	= ntfs_get_link,</div><div class='del'>-	.setattr	= ntfs3_setattr,</div><div class='add'>+	.setattr	= ntfs_setattr,</div><div class='ctx'> 	.listxattr	= ntfs_listxattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2098,6 +2106,7 @@ const struct address_space_operations ntfs_aops = {</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations ntfs_aops_cmpr = {</div><div class='ctx'> 	.read_folio	= ntfs_read_folio,</div><div class='del'>-	.readahead	= ntfs_readahead,</div><div class='add'>+	.dirty_folio	= block_dirty_folio,</div><div class='add'>+	.direct_IO	= ntfs_direct_IO,</div><div class='ctx'> };</div><div class='ctx'> // clang-format on</div><div class='head'>diff --git a/fs/ntfs3/lib/decompress_common.h b/fs/ntfs3/lib/decompress_common.h<br/>index dd7ced000d0e..f0cad9c4a289 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/lib/decompress_common.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/lib/decompress_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/lib/decompress_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/lib/decompress_common.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* "Force inline" macro (not required, but helpful for performance)  */</div><div class='head'>diff --git a/fs/ntfs3/lib/lzx_decompress.c b/fs/ntfs3/lib/lzx_decompress.c<br/>index 6b16f07073c1..4d5701024f83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/lib/lzx_decompress.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/lib/lzx_decompress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/lib/lzx_decompress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/lib/lzx_decompress.c</a></div><div class='hunk'>@@ -512,8 +512,7 @@ static int lzx_decompress_block(const struct lzx_decompressor *d,</div><div class='ctx'> 			 * the same code.  (For R0, the swap is a no-op.)</div><div class='ctx'> 			 */</div><div class='ctx'> 			match_offset = recent_offsets[offset_slot];</div><div class='del'>-			recent_offsets[offset_slot] = recent_offsets[0];</div><div class='del'>-			recent_offsets[0] = match_offset;</div><div class='add'>+			swap(recent_offsets[offset_slot], recent_offsets[0]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Explicit offset  */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ntfs3/lznt.c b/fs/ntfs3/lznt.c<br/>index 4aae598d6d88..fdc9b2ebf341 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/lznt.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/lznt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/lznt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/lznt.c</a></div><div class='hunk'>@@ -236,6 +236,9 @@ static inline ssize_t decompress_chunk(u8 *unc, u8 *unc_end, const u8 *cmpr,</div><div class='ctx'> </div><div class='ctx'> 	/* Do decompression until pointers are inside range. */</div><div class='ctx'> 	while (up &lt; unc_end &amp;&amp; cmpr &lt; cmpr_end) {</div><div class='add'>+		// return err if more than LZNT_CHUNK_SIZE bytes are written</div><div class='add'>+		if (up - unc &gt; LZNT_CHUNK_SIZE)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		/* Correct index */</div><div class='ctx'> 		while (unc + s_max_off[index] &lt; up)</div><div class='ctx'> 			index += 1;</div><div class='head'>diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c<br/>index ee3093be5170..3b24ca02de61 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/namei.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			inode = ERR_PTR(err);</div><div class='ctx'> 		else {</div><div class='del'>-			ni_lock(ni);</div><div class='add'>+			ni_lock_dir(ni);</div><div class='ctx'> 			inode = dir_search_u(dir, uni, NULL);</div><div class='ctx'> 			ni_unlock(ni);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -107,28 +107,18 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> static int ntfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		       struct dentry *dentry, umode_t mode, bool excl)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFREG | mode, 0,</div><div class='del'>-				  NULL, 0, NULL);</div><div class='del'>-</div><div class='del'>-	return IS_ERR(inode) ? PTR_ERR(inode) : 0;</div><div class='add'>+	return ntfs_create_inode(idmap, dir, dentry, NULL, S_IFREG | mode, 0,</div><div class='add'>+				 NULL, 0, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_mknod</div><div class='del'>- *</div><div class='del'>- * inode_operations::mknod</div><div class='add'>+ * ntfs_mknod - inode_operations::mknod</div><div class='ctx'>  */</div><div class='ctx'> static int ntfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		      struct dentry *dentry, umode_t mode, dev_t rdev)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	inode = ntfs_create_inode(idmap, dir, dentry, NULL, mode, rdev, NULL, 0,</div><div class='del'>-				  NULL);</div><div class='del'>-</div><div class='del'>-	return IS_ERR(inode) ? PTR_ERR(inode) : 0;</div><div class='add'>+	return ntfs_create_inode(idmap, dir, dentry, NULL, mode, rdev, NULL, 0,</div><div class='add'>+				 NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -181,6 +171,13 @@ static int ntfs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(dir);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(dir-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	ni_lock_dir(ni);</div><div class='ctx'> </div><div class='ctx'> 	err = ntfs_unlink_inode(dir, dentry);</div><div class='hunk'>@@ -197,26 +194,26 @@ static int ntfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 			struct dentry *dentry, const char *symname)</div><div class='ctx'> {</div><div class='ctx'> 	u32 size = strlen(symname);</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFLNK | 0777, 0,</div><div class='del'>-				  symname, size, NULL);</div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ntfs_i(dir))))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return IS_ERR(inode) ? PTR_ERR(inode) : 0;</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(dir-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return ntfs_create_inode(idmap, dir, dentry, NULL, S_IFLNK | 0777, 0,</div><div class='add'>+				 symname, size, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_mkdir- inode_operations::mkdir</div><div class='add'>+ * ntfs_mkdir - inode_operations::mkdir</div><div class='ctx'>  */</div><div class='del'>-static int ntfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *ntfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFDIR | mode, 0,</div><div class='del'>-				  NULL, 0, NULL);</div><div class='del'>-</div><div class='del'>-	return IS_ERR(inode) ? PTR_ERR(inode) : 0;</div><div class='add'>+	return ERR_PTR(ntfs_create_inode(idmap, dir, dentry, NULL,</div><div class='add'>+					 S_IFDIR | mode, 0, NULL, 0, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -227,6 +224,13 @@ static int ntfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(dir);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(dir-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	ni_lock_dir(ni);</div><div class='ctx'> </div><div class='ctx'> 	err = ntfs_unlink_inode(dir, dentry);</div><div class='hunk'>@@ -252,7 +256,7 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> 	struct inode *new_inode = d_inode(new_dentry);</div><div class='ctx'> 	struct NTFS_DE *de, *new_de;</div><div class='del'>-	bool is_same, is_bad;</div><div class='add'>+	bool is_same;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * de		- memory of PATH_MAX bytes:</div><div class='ctx'> 	 * [0-1024)	- original name (dentry-&gt;d_name)</div><div class='hunk'>@@ -264,6 +268,13 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 		      1024);</div><div class='ctx'> 	static_assert(PATH_MAX &gt;= 4 * 1024);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	if (flags &amp; ~RENAME_NOREPLACE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -318,12 +329,8 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	if (dir_ni != new_dir_ni)</div><div class='ctx'> 		ni_lock_dir2(new_dir_ni);</div><div class='ctx'> </div><div class='del'>-	is_bad = false;</div><div class='del'>-	err = ni_rename(dir_ni, new_dir_ni, ni, de, new_de, &amp;is_bad);</div><div class='del'>-	if (is_bad) {</div><div class='del'>-		/* Restore after failed rename failed too. */</div><div class='del'>-		_ntfs_bad_inode(inode);</div><div class='del'>-	} else if (!err) {</div><div class='add'>+	err = ni_rename(dir_ni, new_dir_ni, ni, de, new_de);</div><div class='add'>+	if (!err) {</div><div class='ctx'> 		simple_rename_timestamp(dir, dentry, new_dir, new_dentry);</div><div class='ctx'> 		mark_inode_dirty(inode);</div><div class='ctx'> 		mark_inode_dirty(dir);</div><div class='hunk'>@@ -346,95 +353,6 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * ntfs_atomic_open</div><div class='del'>- *</div><div class='del'>- * inode_operations::atomic_open</div><div class='del'>- */</div><div class='del'>-static int ntfs_atomic_open(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			    struct file *file, u32 flags, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct ntfs_fnd *fnd = NULL;</div><div class='del'>-	struct ntfs_inode *ni = ntfs_i(dir);</div><div class='del'>-	struct dentry *d = NULL;</div><div class='del'>-	struct cpu_str *uni = __getname();</div><div class='del'>-	bool locked = false;</div><div class='del'>-</div><div class='del'>-	if (!uni)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = ntfs_nls_to_utf16(ni-&gt;mi.sbi, dentry-&gt;d_name.name,</div><div class='del'>-				dentry-&gt;d_name.len, uni, NTFS_NAME_LEN,</div><div class='del'>-				UTF16_HOST_ENDIAN);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NTFS3_FS_POSIX_ACL</div><div class='del'>-	if (IS_POSIXACL(dir)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Load in cache current acl to avoid ni_lock(dir):</div><div class='del'>-		 * ntfs_create_inode -&gt; ntfs_init_acl -&gt; posix_acl_create -&gt;</div><div class='del'>-		 * ntfs_get_acl -&gt; ntfs_get_acl_ex -&gt; ni_lock</div><div class='del'>-		 */</div><div class='del'>-		struct posix_acl *p = get_inode_acl(dir, ACL_TYPE_DEFAULT);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(p)) {</div><div class='del'>-			err = PTR_ERR(p);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		posix_acl_release(p);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (d_in_lookup(dentry)) {</div><div class='del'>-		ni_lock_dir(ni);</div><div class='del'>-		locked = true;</div><div class='del'>-		fnd = fnd_get();</div><div class='del'>-		if (!fnd) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto out1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d = d_splice_alias(dir_search_u(dir, uni, fnd), dentry);</div><div class='del'>-		if (IS_ERR(d)) {</div><div class='del'>-			err = PTR_ERR(d);</div><div class='del'>-			d = NULL;</div><div class='del'>-			goto out2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (d)</div><div class='del'>-			dentry = d;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; O_CREAT) || d_really_is_positive(dentry)) {</div><div class='del'>-		err = finish_no_open(file, d);</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	file-&gt;f_mode |= FMODE_CREATED;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * fnd contains tree's path to insert to.</div><div class='del'>-	 * If fnd is not NULL then dir is locked.</div><div class='del'>-	 */</div><div class='del'>-	inode = ntfs_create_inode(mnt_idmap(file-&gt;f_path.mnt), dir, dentry, uni,</div><div class='del'>-				  mode, 0, NULL, 0, fnd);</div><div class='del'>-	err = IS_ERR(inode) ? PTR_ERR(inode) :</div><div class='del'>-			      finish_open(file, dentry, ntfs_file_open);</div><div class='del'>-	dput(d);</div><div class='del'>-</div><div class='del'>-out2:</div><div class='del'>-	fnd_put(fnd);</div><div class='del'>-out1:</div><div class='del'>-	if (locked)</div><div class='del'>-		ni_unlock(ni);</div><div class='del'>-out:</div><div class='del'>-	__putname(uni);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct dentry *ntfs3_get_parent(struct dentry *child)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(child);</div><div class='hunk'>@@ -489,7 +407,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try slow way with current upcase table</div><div class='ctx'> 	 */</div><div class='del'>-	uni = __getname();</div><div class='add'>+	uni = kmem_cache_alloc(names_cachep, GFP_NOWAIT);</div><div class='ctx'> 	if (!uni)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +429,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	__putname(uni);</div><div class='add'>+	kmem_cache_free(names_cachep, uni);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -597,15 +515,14 @@ const struct inode_operations ntfs_dir_inode_operations = {</div><div class='ctx'> 	.rename		= ntfs_rename,</div><div class='ctx'> 	.get_acl	= ntfs_get_acl,</div><div class='ctx'> 	.set_acl	= ntfs_set_acl,</div><div class='del'>-	.setattr	= ntfs3_setattr,</div><div class='add'>+	.setattr	= ntfs_setattr,</div><div class='ctx'> 	.getattr	= ntfs_getattr,</div><div class='ctx'> 	.listxattr	= ntfs_listxattr,</div><div class='del'>-	.atomic_open	= ntfs_atomic_open,</div><div class='ctx'> 	.fiemap		= ntfs_fiemap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct inode_operations ntfs_special_inode_operations = {</div><div class='del'>-	.setattr	= ntfs3_setattr,</div><div class='add'>+	.setattr	= ntfs_setattr,</div><div class='ctx'> 	.getattr	= ntfs_getattr,</div><div class='ctx'> 	.listxattr	= ntfs_listxattr,</div><div class='ctx'> 	.get_acl	= ntfs_get_acl,</div><div class='head'>diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h<br/>index 86aecbb01a92..552b97905813 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/ntfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/ntfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/ntfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/ntfs.h</a></div><div class='hunk'>@@ -59,7 +59,7 @@ struct GUID {</div><div class='ctx'> struct cpu_str {</div><div class='ctx'> 	u8 len;</div><div class='ctx'> 	u8 unused;</div><div class='del'>-	u16 name[10];</div><div class='add'>+	u16 name[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct le_str {</div><div class='hunk'>@@ -82,9 +82,6 @@ typedef u32 CLST;</div><div class='ctx'> #define RESIDENT_LCN   ((CLST)-2)</div><div class='ctx'> #define COMPRESSED_LCN ((CLST)-3)</div><div class='ctx'> </div><div class='del'>-#define COMPRESSION_UNIT     4</div><div class='del'>-#define COMPRESS_MAX_CLUSTER 0x1000</div><div class='del'>-</div><div class='ctx'> enum RECORD_NUM {</div><div class='ctx'> 	MFT_REC_MFT		= 0,</div><div class='ctx'> 	MFT_REC_MIRR		= 1,</div><div class='hunk'>@@ -523,12 +520,10 @@ struct ATTR_LIST_ENTRY {</div><div class='ctx'> 	__le64 vcn;		// 0x08: Starting VCN of this attribute.</div><div class='ctx'> 	struct MFT_REF ref;	// 0x10: MFT record number with attribute.</div><div class='ctx'> 	__le16 id;		// 0x18: struct ATTRIB ID.</div><div class='del'>-	__le16 name[3];		// 0x1A: Just to align. To get real name can use bNameOffset.</div><div class='add'>+	__le16 name[];		// 0x1A: To get real name use name_off.</div><div class='ctx'> </div><div class='ctx'> }; // sizeof(0x20)</div><div class='ctx'> </div><div class='del'>-static_assert(sizeof(struct ATTR_LIST_ENTRY) == 0x20);</div><div class='del'>-</div><div class='ctx'> static inline u32 le_size(u8 name_len)</div><div class='ctx'> {</div><div class='ctx'> 	return ALIGN(offsetof(struct ATTR_LIST_ENTRY, name) +</div><div class='hunk'>@@ -566,8 +561,7 @@ struct NTFS_DUP_INFO {</div><div class='ctx'> 	__le64 alloc_size;	// 0x20: Data attribute allocated size, multiple of cluster size.</div><div class='ctx'> 	__le64 data_size;	// 0x28: Data attribute size &lt;= Dataalloc_size.</div><div class='ctx'> 	enum FILE_ATTRIBUTE fa;	// 0x30: Standard DOS attributes &amp; more.</div><div class='del'>-	__le16 ea_size;		// 0x34: Packed EAs.</div><div class='del'>-	__le16 reparse;		// 0x36: Used by Reparse.</div><div class='add'>+	__le32 extend_data;	// 0x34: Extended data.</div><div class='ctx'> </div><div class='ctx'> }; // 0x38</div><div class='ctx'> </div><div class='hunk'>@@ -698,14 +692,15 @@ static inline bool de_has_vcn_ex(const struct NTFS_DE *e)</div><div class='ctx'> 	      offsetof(struct ATTR_FILE_NAME, name) + \</div><div class='ctx'> 	      NTFS_NAME_LEN * sizeof(short), 8)</div><div class='ctx'> </div><div class='add'>+#define NTFS_INDEX_HDR_HAS_SUBNODES cpu_to_le32(1)</div><div class='add'>+</div><div class='ctx'> struct INDEX_HDR {</div><div class='ctx'> 	__le32 de_off;	// 0x00: The offset from the start of this structure</div><div class='ctx'> 			// to the first NTFS_DE.</div><div class='ctx'> 	__le32 used;	// 0x04: The size of this structure plus all</div><div class='ctx'> 			// entries (quad-word aligned).</div><div class='ctx'> 	__le32 total;	// 0x08: The allocated size of for this structure plus all entries.</div><div class='del'>-	u8 flags;	// 0x0C: 0x00 = Small directory, 0x01 = Large directory.</div><div class='del'>-	u8 res[3];</div><div class='add'>+	__le32 flags;	// 0x0C: 0x00 = Small directory, 0x01 = Large directory.</div><div class='ctx'> </div><div class='ctx'> 	//</div><div class='ctx'> 	// de_off + used &lt;= total</div><div class='hunk'>@@ -721,7 +716,7 @@ static inline struct NTFS_DE *hdr_first_de(const struct INDEX_HDR *hdr)</div><div class='ctx'> 	struct NTFS_DE *e;</div><div class='ctx'> 	u16 esize;</div><div class='ctx'> </div><div class='del'>-	if (de_off &gt;= used || de_off + sizeof(struct NTFS_DE) &gt; used )</div><div class='add'>+	if (de_off &gt;= used || size_add(de_off, sizeof(struct NTFS_DE)) &gt; used)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	e = Add2Ptr(hdr, de_off);</div><div class='hunk'>@@ -753,7 +748,7 @@ static inline struct NTFS_DE *hdr_next_de(const struct INDEX_HDR *hdr,</div><div class='ctx'> </div><div class='ctx'> static inline bool hdr_has_subnode(const struct INDEX_HDR *hdr)</div><div class='ctx'> {</div><div class='del'>-	return hdr-&gt;flags &amp; 1;</div><div class='add'>+	return hdr-&gt;flags &amp; NTFS_INDEX_HDR_HAS_SUBNODES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct INDEX_BUFFER {</div><div class='hunk'>@@ -773,7 +768,7 @@ static inline bool ib_is_empty(const struct INDEX_BUFFER *ib)</div><div class='ctx'> </div><div class='ctx'> static inline bool ib_is_leaf(const struct INDEX_BUFFER *ib)</div><div class='ctx'> {</div><div class='del'>-	return !(ib-&gt;ihdr.flags &amp; 1);</div><div class='add'>+	return !(ib-&gt;ihdr.flags &amp; NTFS_INDEX_HDR_HAS_SUBNODES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Index root structure ( 0x90 ). */</div><div class='hunk'>@@ -1004,9 +999,6 @@ struct REPARSE_POINT {</div><div class='ctx'> </div><div class='ctx'> static_assert(sizeof(struct REPARSE_POINT) == 0x18);</div><div class='ctx'> </div><div class='del'>-/* Maximum allowed size of the reparse data. */</div><div class='del'>-#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE	(16 * 1024)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The value of the following constant needs to satisfy the following</div><div class='ctx'>  * conditions:</div><div class='head'>diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h<br/>index f6706143d14b..a4559c9f64e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/ntfs_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/ntfs_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/ntfs_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/ntfs_fs.h</a></div><div class='hunk'>@@ -61,6 +61,8 @@ enum utf16_endian;</div><div class='ctx'> </div><div class='ctx'> /* sbi-&gt;flags */</div><div class='ctx'> #define NTFS_FLAGS_NODISCARD		0x00000001</div><div class='add'>+/* ntfs in shutdown state. */</div><div class='add'>+#define NTFS_FLAGS_SHUTDOWN_BIT		0x00000002  /* == 4*/</div><div class='ctx'> /* Set when LogFile is replaying. */</div><div class='ctx'> #define NTFS_FLAGS_LOG_REPLAYING	0x00000008</div><div class='ctx'> /* Set when we changed first MFT's which copy must be updated in $MftMirr. */</div><div class='hunk'>@@ -210,6 +212,7 @@ struct ntfs_sb_info {</div><div class='ctx'> </div><div class='ctx'> 	u32 discard_granularity;</div><div class='ctx'> 	u64 discard_granularity_mask_inv; // ~(discard_granularity_mask_inv-1)</div><div class='add'>+	u32 bdev_blocksize_mask; // bdev_logical_block_size(bdev) - 1;</div><div class='ctx'> </div><div class='ctx'> 	u32 cluster_size; // bytes per cluster</div><div class='ctx'> 	u32 cluster_mask; // == cluster_size - 1</div><div class='hunk'>@@ -226,7 +229,7 @@ struct ntfs_sb_info {</div><div class='ctx'> 	u64 maxbytes; // Maximum size for normal files.</div><div class='ctx'> 	u64 maxbytes_sparse; // Maximum size for sparse file.</div><div class='ctx'> </div><div class='del'>-	u32 flags; // See NTFS_FLAGS_XXX.</div><div class='add'>+	unsigned long flags; // See NTFS_FLAGS_</div><div class='ctx'> </div><div class='ctx'> 	CLST zone_max; // Maximum MFT zone length in clusters</div><div class='ctx'> 	CLST bad_clusters; // The count of marked bad clusters.</div><div class='hunk'>@@ -278,7 +281,7 @@ struct ntfs_sb_info {</div><div class='ctx'> 		__le16 flags; // Cached current VOLUME_INFO::flags, VOLUME_FLAG_DIRTY.</div><div class='ctx'> 		u8 major_ver;</div><div class='ctx'> 		u8 minor_ver;</div><div class='del'>-		char label[256];</div><div class='add'>+		char label[FSLABEL_MAX];</div><div class='ctx'> 		bool real_dirty; // Real fs state.</div><div class='ctx'> 	} volume;</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +335,7 @@ struct mft_inode {</div><div class='ctx'> </div><div class='ctx'> /* Nested class for ntfs_inode::ni_lock. */</div><div class='ctx'> enum ntfs_inode_mutex_lock_class {</div><div class='del'>-	NTFS_INODE_MUTEX_DIRTY,</div><div class='add'>+	NTFS_INODE_MUTEX_DIRTY = 1,</div><div class='ctx'> 	NTFS_INODE_MUTEX_SECURITY,</div><div class='ctx'> 	NTFS_INODE_MUTEX_OBJID,</div><div class='ctx'> 	NTFS_INODE_MUTEX_REPARSE,</div><div class='hunk'>@@ -375,13 +378,20 @@ struct ntfs_inode {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 mi_loaded;</div><div class='ctx'> </div><div class='add'>+	/* </div><div class='add'>+	 * Use this field to avoid any write(s).</div><div class='add'>+	 * If inode is bad during initialization - use make_bad_inode</div><div class='add'>+	 * If inode is bad during operations - use this field</div><div class='add'>+	 */</div><div class='add'>+	u8 ni_bad;</div><div class='add'>+</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ntfs_index dir;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct rw_semaphore run_lock;</div><div class='ctx'> 			struct runs_tree run;</div><div class='ctx'> #ifdef CONFIG_NTFS3_LZX_XPRESS</div><div class='del'>-			struct page *offs_page;</div><div class='add'>+			struct folio *offs_folio;</div><div class='ctx'> #endif</div><div class='ctx'> 		} file;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -432,8 +442,8 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='ctx'> 		  struct ATTRIB **ret);</div><div class='ctx'> int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,</div><div class='ctx'> 			CLST *len, bool *new, bool zero);</div><div class='del'>-int attr_data_read_resident(struct ntfs_inode *ni, struct page *page);</div><div class='del'>-int attr_data_write_resident(struct ntfs_inode *ni, struct page *page);</div><div class='add'>+int attr_data_read_resident(struct ntfs_inode *ni, struct folio *folio);</div><div class='add'>+int attr_data_write_resident(struct ntfs_inode *ni, struct folio *folio);</div><div class='ctx'> int attr_load_runs_vcn(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='ctx'> 		       const __le16 *name, u8 name_len, struct runs_tree *run,</div><div class='ctx'> 		       CLST vcn);</div><div class='hunk'>@@ -444,12 +454,14 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 			struct runs_tree *run, u64 frame, u64 frames,</div><div class='ctx'> 			u8 frame_bits, u32 *ondisk_size, u64 *vbo_data);</div><div class='ctx'> int attr_is_frame_compressed(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='del'>-			     CLST frame, CLST *clst_data);</div><div class='add'>+			     CLST frame, CLST *clst_data,</div><div class='add'>+			     struct runs_tree *run);</div><div class='ctx'> int attr_allocate_frame(struct ntfs_inode *ni, CLST frame, size_t compr_size,</div><div class='ctx'> 			u64 new_valid);</div><div class='ctx'> int attr_collapse_range(struct ntfs_inode *ni, u64 vbo, u64 bytes);</div><div class='ctx'> int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes);</div><div class='ctx'> int attr_punch_hole(struct ntfs_inode *ni, u64 vbo, u64 bytes, u32 *frame_size);</div><div class='add'>+int attr_force_nonresident(struct ntfs_inode *ni);</div><div class='ctx'> </div><div class='ctx'> /* Functions from attrlist.c */</div><div class='ctx'> void al_destroy(struct ntfs_inode *ni);</div><div class='hunk'>@@ -468,12 +480,10 @@ int al_add_le(struct ntfs_inode *ni, enum ATTR_TYPE type, const __le16 *name,</div><div class='ctx'> 	      u8 name_len, CLST svcn, __le16 id, const struct MFT_REF *ref,</div><div class='ctx'> 	      struct ATTR_LIST_ENTRY **new_le);</div><div class='ctx'> bool al_remove_le(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le);</div><div class='del'>-bool al_delete_le(struct ntfs_inode *ni, enum ATTR_TYPE type, CLST vcn,</div><div class='del'>-		  const __le16 *name, u8 name_len, const struct MFT_REF *ref);</div><div class='ctx'> int al_update(struct ntfs_inode *ni, int sync);</div><div class='ctx'> static inline size_t al_aligned(size_t size)</div><div class='ctx'> {</div><div class='del'>-	return (size + 1023) &amp; ~(size_t)1023;</div><div class='add'>+	return size_add(size, 1023) &amp; ~(size_t)1023;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Globals from bitfunc.c */</div><div class='hunk'>@@ -491,18 +501,22 @@ struct inode *dir_search_u(struct inode *dir, const struct cpu_str *uni,</div><div class='ctx'> 			   struct ntfs_fnd *fnd);</div><div class='ctx'> bool dir_is_empty(struct inode *dir);</div><div class='ctx'> extern const struct file_operations ntfs_dir_operations;</div><div class='add'>+extern const struct file_operations ntfs_legacy_dir_operations;</div><div class='ctx'> </div><div class='ctx'> /* Globals from file.c */</div><div class='ctx'> int ntfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		 struct kstat *stat, u32 request_mask, u32 flags);</div><div class='del'>-int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		  struct iattr *attr);</div><div class='add'>+int ntfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+		 struct iattr *attr);</div><div class='ctx'> int ntfs_file_open(struct inode *inode, struct file *file);</div><div class='ctx'> int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		__u64 start, __u64 len);</div><div class='add'>+long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg);</div><div class='add'>+long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg);</div><div class='ctx'> extern const struct inode_operations ntfs_special_inode_operations;</div><div class='ctx'> extern const struct inode_operations ntfs_file_inode_operations;</div><div class='ctx'> extern const struct file_operations ntfs_file_operations;</div><div class='add'>+extern const struct file_operations ntfs_legacy_file_operations;</div><div class='ctx'> </div><div class='ctx'> /* Globals from frecord.c */</div><div class='ctx'> void ni_remove_mi(struct ntfs_inode *ni, struct mft_inode *mi);</div><div class='hunk'>@@ -520,9 +534,6 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> struct ATTRIB *ni_enum_attr_ex(struct ntfs_inode *ni, struct ATTRIB *attr,</div><div class='ctx'> 			       struct ATTR_LIST_ENTRY **le,</div><div class='ctx'> 			       struct mft_inode **mi);</div><div class='del'>-struct ATTRIB *ni_load_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='del'>-			    const __le16 *name, u8 name_len, CLST vcn,</div><div class='del'>-			    struct mft_inode **pmi);</div><div class='ctx'> int ni_load_all_mi(struct ntfs_inode *ni);</div><div class='ctx'> bool ni_add_subrecord(struct ntfs_inode *ni, CLST rno, struct mft_inode **mi);</div><div class='ctx'> int ni_remove_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,</div><div class='hunk'>@@ -557,10 +568,10 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint);</div><div class='ctx'> #define _ni_write_inode(i, w) ni_write_inode(i, w, __func__)</div><div class='ctx'> int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	      __u64 vbo, __u64 len);</div><div class='del'>-int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page);</div><div class='add'>+int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio);</div><div class='ctx'> int ni_decompress_file(struct ntfs_inode *ni);</div><div class='ctx'> int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,</div><div class='del'>-		  u32 pages_per_frame);</div><div class='add'>+		  u32 pages_per_frame, int copy);</div><div class='ctx'> int ni_write_frame(struct ntfs_inode *ni, struct page **pages,</div><div class='ctx'> 		   u32 pages_per_frame);</div><div class='ctx'> int ni_remove_name(struct ntfs_inode *dir_ni, struct ntfs_inode *ni,</div><div class='hunk'>@@ -574,8 +585,8 @@ int ni_add_name(struct ntfs_inode *dir_ni, struct ntfs_inode *ni,</div><div class='ctx'> 		struct NTFS_DE *de);</div><div class='ctx'> </div><div class='ctx'> int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,</div><div class='del'>-	      struct ntfs_inode *ni, struct NTFS_DE *de, struct NTFS_DE *new_de,</div><div class='del'>-	      bool *is_bad);</div><div class='add'>+	      struct ntfs_inode *ni, struct NTFS_DE *de,</div><div class='add'>+	      struct NTFS_DE *new_de);</div><div class='ctx'> </div><div class='ctx'> bool ni_is_dirty(struct inode *inode);</div><div class='ctx'> </div><div class='hunk'>@@ -584,6 +595,7 @@ bool check_index_header(const struct INDEX_HDR *hdr, size_t bytes);</div><div class='ctx'> int log_replay(struct ntfs_inode *ni, bool *initialized);</div><div class='ctx'> </div><div class='ctx'> /* Globals from fsntfs.c */</div><div class='add'>+struct buffer_head *ntfs_bread(struct super_block *sb, sector_t block);</div><div class='ctx'> bool ntfs_fix_pre_write(struct NTFS_RECORD_HEADER *rhdr, size_t bytes);</div><div class='ctx'> int ntfs_fix_post_read(struct NTFS_RECORD_HEADER *rhdr, size_t bytes,</div><div class='ctx'> 		       bool simple);</div><div class='hunk'>@@ -607,7 +619,6 @@ enum NTFS_DIRTY_FLAGS {</div><div class='ctx'> 	NTFS_DIRTY_ERROR = 2,</div><div class='ctx'> };</div><div class='ctx'> int ntfs_set_state(struct ntfs_sb_info *sbi, enum NTFS_DIRTY_FLAGS dirty);</div><div class='del'>-int ntfs_sb_read(struct super_block *sb, u64 lbo, size_t bytes, void *buffer);</div><div class='ctx'> int ntfs_sb_write(struct super_block *sb, u64 lbo, size_t bytes,</div><div class='ctx'> 		  const void *buffer, int wait);</div><div class='ctx'> int ntfs_sb_write_run(struct ntfs_sb_info *sbi, const struct runs_tree *run,</div><div class='hunk'>@@ -623,9 +634,21 @@ int ntfs_get_bh(struct ntfs_sb_info *sbi, const struct runs_tree *run, u64 vbo,</div><div class='ctx'> 		u32 bytes, struct ntfs_buffers *nb);</div><div class='ctx'> int ntfs_write_bh(struct ntfs_sb_info *sbi, struct NTFS_RECORD_HEADER *rhdr,</div><div class='ctx'> 		  struct ntfs_buffers *nb, int sync);</div><div class='del'>-int ntfs_bio_pages(struct ntfs_sb_info *sbi, const struct runs_tree *run,</div><div class='del'>-		   struct page **pages, u32 nr_pages, u64 vbo, u32 bytes,</div><div class='del'>-		   enum req_op op);</div><div class='add'>+int ntfs_read_write_run(struct ntfs_sb_info *sbi, const struct runs_tree *run,</div><div class='add'>+			void *buf, u64 vbo, size_t bytes, int wr);</div><div class='add'>+static inline int ntfs_read_run(struct ntfs_sb_info *sbi,</div><div class='add'>+				const struct runs_tree *run, void *buf, u64 vbo,</div><div class='add'>+				size_t bytes)</div><div class='add'>+{</div><div class='add'>+	return ntfs_read_write_run(sbi, run, buf, vbo, bytes, 0);</div><div class='add'>+}</div><div class='add'>+static inline int ntfs_write_run(struct ntfs_sb_info *sbi,</div><div class='add'>+				 const struct runs_tree *run, void *buf,</div><div class='add'>+				 u64 vbo, size_t bytes)</div><div class='add'>+{</div><div class='add'>+	return ntfs_read_write_run(sbi, run, buf, vbo, bytes, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ntfs_bio_fill_1(struct ntfs_sb_info *sbi, const struct runs_tree *run);</div><div class='ctx'> int ntfs_vbo_to_lbo(struct ntfs_sb_info *sbi, const struct runs_tree *run,</div><div class='ctx'> 		    u64 vbo, u64 *lbo, u64 *bytes);</div><div class='hunk'>@@ -697,23 +720,20 @@ int indx_update_dup(struct ntfs_inode *ni, struct ntfs_sb_info *sbi,</div><div class='ctx'> struct inode *ntfs_iget5(struct super_block *sb, const struct MFT_REF *ref,</div><div class='ctx'> 			 const struct cpu_str *name);</div><div class='ctx'> int ntfs_set_size(struct inode *inode, u64 new_size);</div><div class='del'>-int reset_log_file(struct inode *inode);</div><div class='ctx'> int ntfs_get_block(struct inode *inode, sector_t vbn,</div><div class='ctx'> 		   struct buffer_head *bh_result, int create);</div><div class='del'>-int ntfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-		     loff_t pos, u32 len, struct page **pagep, void **fsdata);</div><div class='del'>-int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,</div><div class='del'>-		   u32 len, u32 copied, struct page *page, void *fsdata);</div><div class='add'>+int ntfs_write_begin(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		     loff_t pos, u32 len, struct folio **foliop, void **fsdata);</div><div class='add'>+int ntfs_write_end(const struct kiocb *iocb, struct address_space *mapping,</div><div class='add'>+		   loff_t pos, u32 len, u32 copied, struct folio *folio,</div><div class='add'>+		   void *fsdata);</div><div class='ctx'> int ntfs3_write_inode(struct inode *inode, struct writeback_control *wbc);</div><div class='ctx'> int ntfs_sync_inode(struct inode *inode);</div><div class='del'>-int ntfs_flush_inodes(struct super_block *sb, struct inode *i1,</div><div class='del'>-		      struct inode *i2);</div><div class='del'>-int inode_write_data(struct inode *inode, const void *data, size_t bytes);</div><div class='del'>-struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-				struct dentry *dentry,</div><div class='del'>-				const struct cpu_str *uni, umode_t mode,</div><div class='del'>-				dev_t dev, const char *symname, u32 size,</div><div class='del'>-				struct ntfs_fnd *fnd);</div><div class='add'>+int inode_read_data(struct inode *inode, void *data, size_t bytes);</div><div class='add'>+int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+		      struct dentry *dentry, const struct cpu_str *uni,</div><div class='add'>+		      umode_t mode, dev_t dev, const char *symname, u32 size,</div><div class='add'>+		      struct ntfs_fnd *fnd);</div><div class='ctx'> int ntfs_link_inode(struct inode *inode, struct dentry *dentry);</div><div class='ctx'> int ntfs_unlink_inode(struct inode *dir, const struct dentry *dentry);</div><div class='ctx'> void ntfs_evict_inode(struct inode *inode);</div><div class='hunk'>@@ -735,29 +755,30 @@ int mi_get(struct ntfs_sb_info *sbi, CLST rno, struct mft_inode **mi);</div><div class='ctx'> void mi_put(struct mft_inode *mi);</div><div class='ctx'> int mi_init(struct mft_inode *mi, struct ntfs_sb_info *sbi, CLST rno);</div><div class='ctx'> int mi_read(struct mft_inode *mi, bool is_mft);</div><div class='del'>-struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr);</div><div class='del'>-// TODO: id?</div><div class='del'>-struct ATTRIB *mi_find_attr(struct mft_inode *mi, struct ATTRIB *attr,</div><div class='del'>-			    enum ATTR_TYPE type, const __le16 *name,</div><div class='del'>-			    u8 name_len, const __le16 *id);</div><div class='del'>-static inline struct ATTRIB *rec_find_attr_le(struct mft_inode *rec,</div><div class='add'>+struct ATTRIB *mi_enum_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='add'>+			    struct ATTRIB *attr);</div><div class='add'>+struct ATTRIB *mi_find_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='add'>+			    struct ATTRIB *attr, enum ATTR_TYPE type,</div><div class='add'>+			    const __le16 *name, u8 name_len, const __le16 *id);</div><div class='add'>+static inline struct ATTRIB *rec_find_attr_le(struct ntfs_inode *ni,</div><div class='add'>+					      struct mft_inode *rec,</div><div class='ctx'> 					      struct ATTR_LIST_ENTRY *le)</div><div class='ctx'> {</div><div class='del'>-	return mi_find_attr(rec, NULL, le-&gt;type, le_name(le), le-&gt;name_len,</div><div class='add'>+	return mi_find_attr(ni, rec, NULL, le-&gt;type, le_name(le), le-&gt;name_len,</div><div class='ctx'> 			    &amp;le-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> int mi_write(struct mft_inode *mi, int wait);</div><div class='ctx'> int mi_format_new(struct mft_inode *mi, struct ntfs_sb_info *sbi, CLST rno,</div><div class='ctx'> 		  __le16 flags, bool is_mft);</div><div class='del'>-struct ATTRIB *mi_insert_attr(struct mft_inode *mi, enum ATTR_TYPE type,</div><div class='del'>-			      const __le16 *name, u8 name_len, u32 asize,</div><div class='del'>-			      u16 name_off);</div><div class='add'>+struct ATTRIB *mi_insert_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='add'>+			      enum ATTR_TYPE type, const __le16 *name,</div><div class='add'>+			      u8 name_len, u32 asize, u16 name_off);</div><div class='ctx'> </div><div class='ctx'> bool mi_remove_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='ctx'> 		    struct ATTRIB *attr);</div><div class='ctx'> bool mi_resize_attr(struct mft_inode *mi, struct ATTRIB *attr, int bytes);</div><div class='ctx'> int mi_pack_runs(struct mft_inode *mi, struct ATTRIB *attr,</div><div class='del'>-		 struct runs_tree *run, CLST len);</div><div class='add'>+		 const struct runs_tree *run, CLST len);</div><div class='ctx'> static inline bool mi_is_ref(const struct mft_inode *mi,</div><div class='ctx'> 			     const struct MFT_REF *ref)</div><div class='ctx'> {</div><div class='hunk'>@@ -792,7 +813,7 @@ void run_truncate_head(struct runs_tree *run, CLST vcn);</div><div class='ctx'> void run_truncate_around(struct runs_tree *run, CLST vcn);</div><div class='ctx'> bool run_add_entry(struct runs_tree *run, CLST vcn, CLST lcn, CLST len,</div><div class='ctx'> 		   bool is_mft);</div><div class='del'>-bool run_collapse_range(struct runs_tree *run, CLST vcn, CLST len);</div><div class='add'>+bool run_collapse_range(struct runs_tree *run, CLST vcn, CLST len, CLST sub);</div><div class='ctx'> bool run_insert_range(struct runs_tree *run, CLST vcn, CLST len);</div><div class='ctx'> bool run_get_entry(const struct runs_tree *run, size_t index, CLST *vcn,</div><div class='ctx'> 		   CLST *lcn, CLST *len);</div><div class='hunk'>@@ -872,9 +893,9 @@ int ntfs_init_acl(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> int ntfs_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry);</div><div class='ctx'> ssize_t ntfs_listxattr(struct dentry *dentry, char *buffer, size_t size);</div><div class='del'>-extern const struct xattr_handler * const ntfs_xattr_handlers[];</div><div class='add'>+extern const struct xattr_handler *const ntfs_xattr_handlers[];</div><div class='ctx'> </div><div class='del'>-int ntfs_save_wsl_perm(struct inode *inode, __le16 *ea_size);</div><div class='add'>+int ntfs_save_wsl_perm(struct inode *inode, __le32 *ea_size);</div><div class='ctx'> void ntfs_get_wsl_perm(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> /* globals from lznt.c */</div><div class='hunk'>@@ -903,22 +924,6 @@ static inline bool ntfs_is_meta_file(struct ntfs_sb_info *sbi, CLST rno)</div><div class='ctx'> 	       rno == sbi-&gt;usn_jrnl_no;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ntfs_unmap_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	kunmap(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct page *ntfs_map_page(struct address_space *mapping,</div><div class='del'>-					 unsigned long index)</div><div class='del'>-{</div><div class='del'>-	struct page *page = read_mapping_page(mapping, index, NULL);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(page))</div><div class='del'>-		kmap(page);</div><div class='del'>-	return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline size_t wnd_zone_bit(const struct wnd_bitmap *wnd)</div><div class='ctx'> {</div><div class='ctx'> 	return wnd-&gt;zone_bit;</div><div class='hunk'>@@ -961,9 +966,9 @@ static inline bool run_is_empty(struct runs_tree *run)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* NTFS uses quad aligned bitmaps. */</div><div class='del'>-static inline size_t bitmap_size(size_t bits)</div><div class='add'>+static inline size_t ntfs3_bitmap_size(size_t bits)</div><div class='ctx'> {</div><div class='del'>-	return ALIGN((bits + 7) &gt;&gt; 3, 8);</div><div class='add'>+	return BITS_TO_U64(bits) * sizeof(u64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define _100ns2seconds 10000000</div><div class='hunk'>@@ -987,11 +992,12 @@ static inline __le64 kernel2nt(const struct timespec64 *ts)</div><div class='ctx'>  */</div><div class='ctx'> static inline void nt2kernel(const __le64 tm, struct timespec64 *ts)</div><div class='ctx'> {</div><div class='del'>-	u64 t = le64_to_cpu(tm) - _100ns2seconds * SecondsToStartOf1970;</div><div class='add'>+	s32 t32;</div><div class='add'>+	/* use signed 64 bit to support timestamps prior to epoch. xfstest 258. */</div><div class='add'>+	s64 t = le64_to_cpu(tm) - _100ns2seconds * SecondsToStartOf1970;</div><div class='ctx'> </div><div class='del'>-	// WARNING: do_div changes its first argument(!)</div><div class='del'>-	ts-&gt;tv_nsec = do_div(t, _100ns2seconds) * 100;</div><div class='del'>-	ts-&gt;tv_sec = t;</div><div class='add'>+	ts-&gt;tv_sec = div_s64_rem(t, _100ns2seconds, &amp;t32);</div><div class='add'>+	ts-&gt;tv_nsec = t32 * 100;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct ntfs_sb_info *ntfs_sb(struct super_block *sb)</div><div class='hunk'>@@ -999,6 +1005,11 @@ static inline struct ntfs_sb_info *ntfs_sb(struct super_block *sb)</div><div class='ctx'> 	return sb-&gt;s_fs_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ntfs3_forced_shutdown(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return test_bit(NTFS_FLAGS_SHUTDOWN_BIT, &amp;ntfs_sb(sb)-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ntfs_up_cluster - Align up on cluster boundary.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1025,19 +1036,6 @@ static inline u64 bytes_to_block(const struct super_block *sb, u64 size)</div><div class='ctx'> 	return (size + sb-&gt;s_blocksize - 1) &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct buffer_head *ntfs_bread(struct super_block *sb,</div><div class='del'>-					     sector_t block)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh = sb_bread(sb, block);</div><div class='del'>-</div><div class='del'>-	if (bh)</div><div class='del'>-		return bh;</div><div class='del'>-</div><div class='del'>-	ntfs_err(sb, "failed to read volume at offset 0x%llx",</div><div class='del'>-		 (u64)block &lt;&lt; sb-&gt;s_blocksize_bits);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct ntfs_inode *ntfs_i(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(inode, struct ntfs_inode, vfs_inode);</div><div class='hunk'>@@ -1049,6 +1047,11 @@ static inline bool is_compressed(const struct ntfs_inode *ni)</div><div class='ctx'> 	       (ni-&gt;ni_flags &amp; NI_FLAG_COMPRESSED_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_bad_ni(const struct ntfs_inode *ni)</div><div class='add'>+{</div><div class='add'>+	return ni-&gt;ni_bad;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ni_ext_compress_bits(const struct ntfs_inode *ni)</div><div class='ctx'> {</div><div class='ctx'> 	return 0xb + (ni-&gt;ni_flags &amp; NI_FLAG_COMPRESSED_MASK);</div><div class='hunk'>@@ -1157,4 +1160,13 @@ static inline void le64_sub_cpu(__le64 *var, u64 val)</div><div class='ctx'> 	*var = cpu_to_le64(le64_to_cpu(*var) - val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_NTFS_FS)</div><div class='add'>+bool is_legacy_ntfs(struct super_block *sb);</div><div class='add'>+#else</div><div class='add'>+static inline bool is_legacy_ntfs(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_NTFS3_NTFS_FS_H */</div><div class='head'>diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c<br/>index 53629b1f65e9..167093e8d287 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/record.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/record.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/record.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/record.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ static inline int compare_attr(const struct ATTRIB *left, enum ATTR_TYPE type,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Unused attribute id that is less than mrec-&gt;next_attr_id.</div><div class='ctx'>  */</div><div class='del'>-static __le16 mi_new_attt_id(struct mft_inode *mi)</div><div class='add'>+static __le16 mi_new_attt_id(struct ntfs_inode *ni, struct mft_inode *mi)</div><div class='ctx'> {</div><div class='ctx'> 	u16 free_id, max_id, t16;</div><div class='ctx'> 	struct MFT_REC *rec = mi-&gt;mrec;</div><div class='hunk'>@@ -52,7 +52,7 @@ static __le16 mi_new_attt_id(struct mft_inode *mi)</div><div class='ctx'> 	attr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		attr = mi_enum_attr(mi, attr);</div><div class='add'>+		attr = mi_enum_attr(ni, mi, attr);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			rec-&gt;next_attr_id = cpu_to_le16(max_id + 1);</div><div class='ctx'> 			mi-&gt;dirty = true;</div><div class='hunk'>@@ -195,7 +195,8 @@ out:</div><div class='ctx'>  * NOTE: mi-&gt;mrec - memory of size sbi-&gt;record_size</div><div class='ctx'>  * here we sure that mi-&gt;mrec-&gt;total == sbi-&gt;record_size (see mi_read)</div><div class='ctx'>  */</div><div class='del'>-struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)</div><div class='add'>+struct ATTRIB *mi_enum_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='add'>+			    struct ATTRIB *attr)</div><div class='ctx'> {</div><div class='ctx'> 	const struct MFT_REC *rec = mi-&gt;mrec;</div><div class='ctx'> 	u32 used = le32_to_cpu(rec-&gt;used);</div><div class='hunk'>@@ -209,11 +210,11 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)</div><div class='ctx'> 		off = le16_to_cpu(rec-&gt;attr_off);</div><div class='ctx'> </div><div class='ctx'> 		if (used &gt; total)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (off &gt;= used || off &lt; MFTRECORD_FIXUP_OFFSET_1 ||</div><div class='del'>-		    !IS_ALIGNED(off, 4)) {</div><div class='del'>-			return NULL;</div><div class='add'>+		    !IS_ALIGNED(off, 8)) {</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Skip non-resident records. */</div><div class='hunk'>@@ -223,32 +224,27 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)</div><div class='ctx'> 		prev_type = 0;</div><div class='ctx'> 		attr = Add2Ptr(rec, off);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Check if input attr inside record. */</div><div class='add'>+		/*</div><div class='add'>+		 * We don't need to check previous attr here. There is</div><div class='add'>+		 * a bounds checking in the previous round.</div><div class='add'>+		 */</div><div class='ctx'> 		off = PtrOffset(rec, attr);</div><div class='del'>-		if (off &gt;= used)</div><div class='del'>-			return NULL;</div><div class='ctx'> </div><div class='ctx'> 		asize = le32_to_cpu(attr-&gt;size);</div><div class='del'>-		if (asize &lt; SIZEOF_RESIDENT) {</div><div class='del'>-			/* Impossible 'cause we should not return such attribute. */</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Overflow check. */</div><div class='del'>-		if (off + asize &lt; off)</div><div class='del'>-			return NULL;</div><div class='ctx'> </div><div class='ctx'> 		prev_type = le32_to_cpu(attr-&gt;type);</div><div class='ctx'> 		attr = Add2Ptr(attr, asize);</div><div class='ctx'> 		off += asize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	asize = le32_to_cpu(attr-&gt;size);</div><div class='del'>-</div><div class='del'>-	/* Can we use the first field (attr-&gt;type). */</div><div class='add'>+	/*</div><div class='add'>+	 * Can we use the first fields:</div><div class='add'>+	 * attr-&gt;type,</div><div class='add'>+	 * attr-&gt;size</div><div class='add'>+	 */</div><div class='ctx'> 	if (off + 8 &gt; used) {</div><div class='ctx'> 		static_assert(ALIGN(sizeof(enum ATTR_TYPE), 8) == 8);</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;type == ATTR_END) {</div><div class='hunk'>@@ -259,98 +255,116 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)</div><div class='ctx'> 	/* 0x100 is last known attribute for now. */</div><div class='ctx'> 	t32 = le32_to_cpu(attr-&gt;type);</div><div class='ctx'> 	if (!t32 || (t32 &amp; 0xf) || (t32 &gt; 0x100))</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* attributes in record must be ordered by type */</div><div class='ctx'> 	if (t32 &lt; prev_type)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	asize = le32_to_cpu(attr-&gt;size);</div><div class='add'>+</div><div class='add'>+	if (!IS_ALIGNED(asize, 8))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Check overflow and boundary. */</div><div class='ctx'> 	if (off + asize &lt; off || off + asize &gt; used)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Can we use the field attr-&gt;non_res. */</div><div class='add'>+	if (off + 9 &gt; used)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Check size of attribute. */</div><div class='ctx'> 	if (!attr-&gt;non_res) {</div><div class='ctx'> 		/* Check resident fields. */</div><div class='ctx'> 		if (asize &lt; SIZEOF_RESIDENT)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		t16 = le16_to_cpu(attr-&gt;res.data_off);</div><div class='ctx'> 		if (t16 &gt; asize)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-		if (t16 + le32_to_cpu(attr-&gt;res.data_size) &gt; asize)</div><div class='del'>-			return NULL;</div><div class='add'>+		if (le32_to_cpu(attr-&gt;res.data_size) &gt; asize - t16)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		t32 = sizeof(short) * attr-&gt;name_len;</div><div class='ctx'> 		if (t32 &amp;&amp; le16_to_cpu(attr-&gt;name_off) + t32 &gt; t16)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		return attr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check nonresident fields. */</div><div class='ctx'> 	if (attr-&gt;non_res != 1)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Can we use memory including attr-&gt;nres.valid_size? */</div><div class='add'>+	if (asize &lt; SIZEOF_NONRESIDENT)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	t16 = le16_to_cpu(attr-&gt;nres.run_off);</div><div class='ctx'> 	if (t16 &gt; asize)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	t32 = sizeof(short) * attr-&gt;name_len;</div><div class='ctx'> 	if (t32 &amp;&amp; le16_to_cpu(attr-&gt;name_off) + t32 &gt; t16)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Check start/end vcn. */</div><div class='ctx'> 	if (le64_to_cpu(attr-&gt;nres.svcn) &gt; le64_to_cpu(attr-&gt;nres.evcn) + 1)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	data_size = le64_to_cpu(attr-&gt;nres.data_size);</div><div class='ctx'> 	if (le64_to_cpu(attr-&gt;nres.valid_size) &gt; data_size)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	alloc_size = le64_to_cpu(attr-&gt;nres.alloc_size);</div><div class='ctx'> 	if (data_size &gt; alloc_size)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	t32 = mi-&gt;sbi-&gt;cluster_mask;</div><div class='ctx'> 	if (alloc_size &amp; t32)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!attr-&gt;nres.svcn &amp;&amp; is_attr_ext(attr)) {</div><div class='ctx'> 		/* First segment of sparse/compressed attribute */</div><div class='del'>-		if (asize + 8 &lt; SIZEOF_NONRESIDENT_EX)</div><div class='del'>-			return NULL;</div><div class='add'>+		/* Can we use memory including attr-&gt;nres.total_size? */</div><div class='add'>+		if (asize &lt; SIZEOF_NONRESIDENT_EX)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		tot_size = le64_to_cpu(attr-&gt;nres.total_size);</div><div class='ctx'> 		if (tot_size &amp; t32)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='ctx'> 		if (tot_size &gt; alloc_size)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (asize + 8 &lt; SIZEOF_NONRESIDENT)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='ctx'> 		if (attr-&gt;nres.c_unit)</div><div class='del'>-			return NULL;</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (alloc_size &gt; mi-&gt;sbi-&gt;volume.size)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return attr;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	_ntfs_bad_inode(&amp;ni-&gt;vfs_inode);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * mi_find_attr - Find the attribute by type and name and id.</div><div class='ctx'>  */</div><div class='del'>-struct ATTRIB *mi_find_attr(struct mft_inode *mi, struct ATTRIB *attr,</div><div class='del'>-			    enum ATTR_TYPE type, const __le16 *name,</div><div class='del'>-			    u8 name_len, const __le16 *id)</div><div class='add'>+struct ATTRIB *mi_find_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='add'>+			    struct ATTRIB *attr, enum ATTR_TYPE type,</div><div class='add'>+			    const __le16 *name, u8 name_len, const __le16 *id)</div><div class='ctx'> {</div><div class='ctx'> 	u32 type_in = le32_to_cpu(type);</div><div class='ctx'> 	u32 atype;</div><div class='ctx'> </div><div class='ctx'> next_attr:</div><div class='del'>-	attr = mi_enum_attr(mi, attr);</div><div class='add'>+	attr = mi_enum_attr(ni, mi, attr);</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -458,9 +472,9 @@ int mi_format_new(struct mft_inode *mi, struct ntfs_sb_info *sbi, CLST rno,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Not full constructed attribute or NULL if not possible to create.</div><div class='ctx'>  */</div><div class='del'>-struct ATTRIB *mi_insert_attr(struct mft_inode *mi, enum ATTR_TYPE type,</div><div class='del'>-			      const __le16 *name, u8 name_len, u32 asize,</div><div class='del'>-			      u16 name_off)</div><div class='add'>+struct ATTRIB *mi_insert_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='add'>+			      enum ATTR_TYPE type, const __le16 *name,</div><div class='add'>+			      u8 name_len, u32 asize, u16 name_off)</div><div class='ctx'> {</div><div class='ctx'> 	size_t tail;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='hunk'>@@ -479,7 +493,7 @@ struct ATTRIB *mi_insert_attr(struct mft_inode *mi, enum ATTR_TYPE type,</div><div class='ctx'> 	 * at which we should insert it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	attr = NULL;</div><div class='del'>-	while ((attr = mi_enum_attr(mi, attr))) {</div><div class='add'>+	while ((attr = mi_enum_attr(ni, mi, attr))) {</div><div class='ctx'> 		int diff = compare_attr(attr, type, name, name_len, upcase);</div><div class='ctx'> </div><div class='ctx'> 		if (diff &lt; 0)</div><div class='hunk'>@@ -499,7 +513,7 @@ struct ATTRIB *mi_insert_attr(struct mft_inode *mi, enum ATTR_TYPE type,</div><div class='ctx'> 		tail = used - PtrOffset(rec, attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	id = mi_new_attt_id(mi);</div><div class='add'>+	id = mi_new_attt_id(ni, mi);</div><div class='ctx'> </div><div class='ctx'> 	memmove(Add2Ptr(attr, asize), attr, tail);</div><div class='ctx'> 	memset(attr, 0, asize);</div><div class='hunk'>@@ -534,9 +548,14 @@ bool mi_remove_attr(struct ntfs_inode *ni, struct mft_inode *mi,</div><div class='ctx'> 	if (aoff + asize &gt; used)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (ni &amp;&amp; is_attr_indexed(attr)) {</div><div class='del'>-		le16_add_cpu(&amp;ni-&gt;mi.mrec-&gt;hard_links, -1);</div><div class='del'>-		ni-&gt;mi.dirty = true;</div><div class='add'>+	if (ni &amp;&amp; is_attr_indexed(attr) &amp;&amp; attr-&gt;type == ATTR_NAME) {</div><div class='add'>+		u16 links = le16_to_cpu(ni-&gt;mi.mrec-&gt;hard_links);</div><div class='add'>+		if (!links) {</div><div class='add'>+			/* minor error. Not critical. */</div><div class='add'>+		} else {</div><div class='add'>+			ni-&gt;mi.mrec-&gt;hard_links = cpu_to_le16(links - 1);</div><div class='add'>+			ni-&gt;mi.dirty = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	used -= asize;</div><div class='hunk'>@@ -602,7 +621,7 @@ bool mi_resize_attr(struct mft_inode *mi, struct ATTRIB *attr, int bytes)</div><div class='ctx'>  * If failed record is not changed.</div><div class='ctx'>  */</div><div class='ctx'> int mi_pack_runs(struct mft_inode *mi, struct ATTRIB *attr,</div><div class='del'>-		 struct runs_tree *run, CLST len)</div><div class='add'>+		 const struct runs_tree *run, CLST len)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = mi-&gt;sbi;</div><div class='head'>diff --git a/fs/ntfs3/run.c b/fs/ntfs3/run.c<br/>index cb8cf0161177..395b20492525 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/run.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/run.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/run.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/run.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "ntfs.h"</div><div class='hunk'>@@ -486,7 +487,7 @@ requires_new_range:</div><div class='ctx'>  * Helper for attr_collapse_range(),</div><div class='ctx'>  * which is helper for fallocate(collapse_range).</div><div class='ctx'>  */</div><div class='del'>-bool run_collapse_range(struct runs_tree *run, CLST vcn, CLST len)</div><div class='add'>+bool run_collapse_range(struct runs_tree *run, CLST vcn, CLST len, CLST sub)</div><div class='ctx'> {</div><div class='ctx'> 	size_t index, eat;</div><div class='ctx'> 	struct ntfs_run *r, *e, *eat_start, *eat_end;</div><div class='hunk'>@@ -510,7 +511,7 @@ bool run_collapse_range(struct runs_tree *run, CLST vcn, CLST len)</div><div class='ctx'> 			/* Collapse a middle part of normal run, split. */</div><div class='ctx'> 			if (!run_add_entry(run, vcn, SPARSE_LCN, len, false))</div><div class='ctx'> 				return false;</div><div class='del'>-			return run_collapse_range(run, vcn, len);</div><div class='add'>+			return run_collapse_range(run, vcn, len, sub);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		r += 1;</div><div class='hunk'>@@ -544,6 +545,13 @@ bool run_collapse_range(struct runs_tree *run, CLST vcn, CLST len)</div><div class='ctx'> 	memmove(eat_start, eat_end, (e - eat_end) * sizeof(*r));</div><div class='ctx'> 	run-&gt;count -= eat;</div><div class='ctx'> </div><div class='add'>+	if (sub) {</div><div class='add'>+		e -= eat;</div><div class='add'>+		for (r = run-&gt;runs; r &lt; e; r++) {</div><div class='add'>+			r-&gt;vcn -= sub;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -959,7 +967,7 @@ int run_unpack(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,</div><div class='ctx'> 		 * Large positive number requires to store 5 bytes</div><div class='ctx'> 		 * e.g.: 05 FF 7E FF FF 00 00 00</div><div class='ctx'> 		 */</div><div class='del'>-		if (size_size &gt; 8)</div><div class='add'>+		if (size_size &gt; sizeof(len))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		len = run_unpack_s64(run_buf, size_size, 0);</div><div class='hunk'>@@ -971,7 +979,7 @@ int run_unpack(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,</div><div class='ctx'> </div><div class='ctx'> 		if (!offset_size)</div><div class='ctx'> 			lcn = SPARSE_LCN64;</div><div class='del'>-		else if (offset_size &lt;= 8) {</div><div class='add'>+		else if (offset_size &lt;= sizeof(s64)) {</div><div class='ctx'> 			s64 dlcn;</div><div class='ctx'> </div><div class='ctx'> 			/* Initial value of dlcn is -1 or 0. */</div><div class='hunk'>@@ -982,12 +990,22 @@ int run_unpack(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,</div><div class='ctx'> </div><div class='ctx'> 			if (!dlcn)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			lcn = prev_lcn + dlcn;</div><div class='add'>+</div><div class='add'>+			/* Check special combination: 0 + SPARSE_LCN64. */</div><div class='add'>+			if (!prev_lcn &amp;&amp; dlcn == SPARSE_LCN64) {</div><div class='add'>+				lcn = SPARSE_LCN64;</div><div class='add'>+			} else if (check_add_overflow(prev_lcn, dlcn, &amp;lcn)) {</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 			prev_lcn = lcn;</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='add'>+			/* The size of 'dlcn' can't be &gt; 8. */</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (check_add_overflow(vcn64, len, &amp;next_vcn))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		next_vcn = vcn64 + len;</div><div class='ctx'> 		/* Check boundary. */</div><div class='ctx'> 		if (next_vcn &gt; evcn + 1)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1053,8 +1071,8 @@ int run_unpack_ex(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,</div><div class='ctx'> {</div><div class='ctx'> 	int ret, err;</div><div class='ctx'> 	CLST next_vcn, lcn, len;</div><div class='del'>-	size_t index;</div><div class='del'>-	bool ok;</div><div class='add'>+	size_t index, done;</div><div class='add'>+	bool ok, zone;</div><div class='ctx'> 	struct wnd_bitmap *wnd;</div><div class='ctx'> </div><div class='ctx'> 	ret = run_unpack(run, sbi, ino, svcn, evcn, vcn, run_buf, run_buf_size);</div><div class='hunk'>@@ -1085,8 +1103,9 @@ int run_unpack_ex(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		down_read_nested(&amp;wnd-&gt;rw_lock, BITMAP_MUTEX_CLUSTERS);</div><div class='add'>+		zone = max(wnd-&gt;zone_bit, lcn) &lt; min(wnd-&gt;zone_end, lcn + len);</div><div class='ctx'> 		/* Check for free blocks. */</div><div class='del'>-		ok = wnd_is_used(wnd, lcn, len);</div><div class='add'>+		ok = !zone &amp;&amp; wnd_is_used(wnd, lcn, len);</div><div class='ctx'> 		up_read(&amp;wnd-&gt;rw_lock);</div><div class='ctx'> 		if (ok)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1094,14 +1113,33 @@ int run_unpack_ex(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino,</div><div class='ctx'> 		/* Looks like volume is corrupted. */</div><div class='ctx'> 		ntfs_set_state(sbi, NTFS_DIRTY_ERROR);</div><div class='ctx'> </div><div class='del'>-		if (down_write_trylock(&amp;wnd-&gt;rw_lock)) {</div><div class='del'>-			/* Mark all zero bits as used in range [lcn, lcn+len). */</div><div class='del'>-			size_t done;</div><div class='del'>-			err = wnd_set_used_safe(wnd, lcn, len, &amp;done);</div><div class='del'>-			up_write(&amp;wnd-&gt;rw_lock);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='add'>+		if (!down_write_trylock(&amp;wnd-&gt;rw_lock))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (zone) {</div><div class='add'>+			/*</div><div class='add'>+			 * Range [lcn, lcn + len) intersects with zone.</div><div class='add'>+			 * To avoid complex with zone just turn it off.</div><div class='add'>+			 */</div><div class='add'>+			wnd_zone_set(wnd, 0, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Mark all zero bits as used in range [lcn, lcn+len). */</div><div class='add'>+		err = wnd_set_used_safe(wnd, lcn, len, &amp;done);</div><div class='add'>+		if (zone) {</div><div class='add'>+			/* Restore zone. Lock mft run. */</div><div class='add'>+			struct rw_semaphore *lock =</div><div class='add'>+				is_mounted(sbi) ? &amp;sbi-&gt;mft.ni-&gt;file.run_lock :</div><div class='add'>+						  NULL;</div><div class='add'>+			if (lock)</div><div class='add'>+				down_read(lock);</div><div class='add'>+			ntfs_refresh_zone(sbi);</div><div class='add'>+			if (lock)</div><div class='add'>+				up_read(lock);</div><div class='ctx'> 		}</div><div class='add'>+		up_write(&amp;wnd-&gt;rw_lock);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1131,7 +1169,8 @@ int run_get_highest_vcn(CLST vcn, const u8 *run_buf, u64 *highest_vcn)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		run_buf += size_size + offset_size;</div><div class='del'>-		vcn64 += len;</div><div class='add'>+		if (check_add_overflow(vcn64, len, &amp;vcn64))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_NTFS3_64BIT_CLUSTER</div><div class='ctx'> 		if (vcn64 &gt; 0x100000000ull)</div><div class='head'>diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c<br/>index 9153dffde950..8b0cf0ed4f72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/super.c</a></div><div class='hunk'>@@ -16,6 +16,13 @@</div><div class='ctx'>  * mi  - MFT inode               - One MFT record(usually 1024 bytes or 4K), consists of attributes.</div><div class='ctx'>  * ni  - NTFS inode              - Extends linux inode. consists of one or more mft inodes.</div><div class='ctx'>  * index - unit inside directory - 2K, 4K, &lt;=page size, does not depend on cluster size.</div><div class='add'>+ * resident attribute            - Attribute with content stored directly in the MFT record</div><div class='add'>+ * non-resident attribute        - Attribute with content stored in clusters</div><div class='add'>+ * data_size                     - Size of attribute content in bytes. Equal to inode-&gt;i_size</div><div class='add'>+ * valid_size                    - Number of bytes written to the non-resident attribute</div><div class='add'>+ * allocated_size                - Total size of clusters allocated for non-resident content</div><div class='add'>+ * total_size                    - Actual size of allocated clusters for sparse or compressed attributes</div><div class='add'>+ *                               - Constraint: valid_size &lt;= data_size &lt;= allocated_size</div><div class='ctx'>  *</div><div class='ctx'>  * WSL - Windows Subsystem for Linux</div><div class='ctx'>  * https://docs.microsoft.com/en-us/windows/wsl/file-permissions</div><div class='hunk'>@@ -51,6 +58,7 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='hunk'>@@ -90,7 +98,7 @@ void ntfs_printk(const struct super_block *sb, const char *fmt, ...)</div><div class='ctx'> 	level = printk_get_level(fmt);</div><div class='ctx'> 	vaf.fmt = printk_skip_level(fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='del'>-	printk("%c%cntfs3: %s: %pV\n", KERN_SOH_ASCII, level, sb-&gt;s_id, &amp;vaf);</div><div class='add'>+	printk("%c%cntfs3(%s): %pV\n", KERN_SOH_ASCII, level, sb-&gt;s_id, &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='hunk'>@@ -122,13 +130,17 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)</div><div class='ctx'> </div><div class='ctx'> 	if (name) {</div><div class='ctx'> 		struct dentry *de = d_find_alias(inode);</div><div class='del'>-		const u32 name_len = ARRAY_SIZE(s_name_buf) - 1;</div><div class='ctx'> </div><div class='ctx'> 		if (de) {</div><div class='add'>+			int len;</div><div class='ctx'> 			spin_lock(&amp;de-&gt;d_lock);</div><div class='del'>-			snprintf(name, name_len, " \"%s\"", de-&gt;d_name.name);</div><div class='add'>+			len = snprintf(name, sizeof(s_name_buf), " \"%s\"",</div><div class='add'>+				       de-&gt;d_name.name);</div><div class='ctx'> 			spin_unlock(&amp;de-&gt;d_lock);</div><div class='del'>-			name[name_len] = 0; /* To be sure. */</div><div class='add'>+			if (len &lt;= 0)</div><div class='add'>+				name[0] = 0;</div><div class='add'>+			else if (len &gt;= sizeof(s_name_buf))</div><div class='add'>+				name[sizeof(s_name_buf) - 1] = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			name[0] = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -141,7 +153,7 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)</div><div class='ctx'> 	vaf.fmt = printk_skip_level(fmt);</div><div class='ctx'> 	vaf.va = &amp;args;</div><div class='ctx'> </div><div class='del'>-	printk("%c%cntfs3: %s: ino=%lx,%s %pV\n", KERN_SOH_ASCII, level,</div><div class='add'>+	printk("%c%cntfs3(%s): ino=%lx,%s %pV\n", KERN_SOH_ASCII, level,</div><div class='ctx'> 	       sb-&gt;s_id, inode-&gt;i_ino, name ? name : "", &amp;vaf);</div><div class='ctx'> </div><div class='ctx'> 	va_end(args);</div><div class='hunk'>@@ -260,23 +272,23 @@ enum Opt {</div><div class='ctx'> </div><div class='ctx'> // clang-format off</div><div class='ctx'> static const struct fs_parameter_spec ntfs_fs_parameters[] = {</div><div class='del'>-	fsparam_u32("uid",			Opt_uid),</div><div class='del'>-	fsparam_u32("gid",			Opt_gid),</div><div class='del'>-	fsparam_u32oct("umask",			Opt_umask),</div><div class='del'>-	fsparam_u32oct("dmask",			Opt_dmask),</div><div class='del'>-	fsparam_u32oct("fmask",			Opt_fmask),</div><div class='del'>-	fsparam_flag_no("sys_immutable",	Opt_immutable),</div><div class='del'>-	fsparam_flag_no("discard",		Opt_discard),</div><div class='del'>-	fsparam_flag_no("force",		Opt_force),</div><div class='del'>-	fsparam_flag_no("sparse",		Opt_sparse),</div><div class='del'>-	fsparam_flag_no("hidden",		Opt_nohidden),</div><div class='del'>-	fsparam_flag_no("hide_dot_files",	Opt_hide_dot_files),</div><div class='del'>-	fsparam_flag_no("windows_names",	Opt_windows_names),</div><div class='del'>-	fsparam_flag_no("showmeta",		Opt_showmeta),</div><div class='del'>-	fsparam_flag_no("acl",			Opt_acl),</div><div class='del'>-	fsparam_string("iocharset",		Opt_iocharset),</div><div class='del'>-	fsparam_flag_no("prealloc",		Opt_prealloc),</div><div class='del'>-	fsparam_flag_no("nocase",		Opt_nocase),</div><div class='add'>+	fsparam_uid("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct("umask",		Opt_umask),</div><div class='add'>+	fsparam_u32oct("dmask",		Opt_dmask),</div><div class='add'>+	fsparam_u32oct("fmask",		Opt_fmask),</div><div class='add'>+	fsparam_flag("sys_immutable",	Opt_immutable),</div><div class='add'>+	fsparam_flag("discard",		Opt_discard),</div><div class='add'>+	fsparam_flag("force",		Opt_force),</div><div class='add'>+	fsparam_flag("sparse",		Opt_sparse),</div><div class='add'>+	fsparam_flag("nohidden",	Opt_nohidden),</div><div class='add'>+	fsparam_flag("hide_dot_files",	Opt_hide_dot_files),</div><div class='add'>+	fsparam_flag("windows_names",	Opt_windows_names),</div><div class='add'>+	fsparam_flag("showmeta",	Opt_showmeta),</div><div class='add'>+	fsparam_flag_no("acl",		Opt_acl),</div><div class='add'>+	fsparam_string("iocharset",	Opt_iocharset),</div><div class='add'>+	fsparam_flag_no("prealloc",	Opt_prealloc),</div><div class='add'>+	fsparam_flag("nocase",		Opt_nocase),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> // clang-format on</div><div class='hunk'>@@ -284,10 +296,8 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * Load nls table or if @nls is utf8 then return NULL.</div><div class='ctx'>  *</div><div class='del'>- * It is good idea to use here "const char *nls".</div><div class='del'>- * But load_nls accepts "char*".</div><div class='ctx'>  */</div><div class='del'>-static struct nls_table *ntfs_load_nls(char *nls)</div><div class='add'>+static struct nls_table *ntfs_load_nls(const char *nls)</div><div class='ctx'> {</div><div class='ctx'> 	struct nls_table *ret;</div><div class='ctx'> </div><div class='hunk'>@@ -320,14 +330,10 @@ static int ntfs_fs_parse_param(struct fs_context *fc,</div><div class='ctx'> </div><div class='ctx'> 	switch (opt) {</div><div class='ctx'> 	case Opt_uid:</div><div class='del'>-		opts-&gt;fs_uid = make_kuid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!uid_valid(opts-&gt;fs_uid))</div><div class='del'>-			return invalf(fc, "ntfs3: Invalid value for uid.");</div><div class='add'>+		opts-&gt;fs_uid = result.uid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_gid:</div><div class='del'>-		opts-&gt;fs_gid = make_kgid(current_user_ns(), result.uint_32);</div><div class='del'>-		if (!gid_valid(opts-&gt;fs_gid))</div><div class='del'>-			return invalf(fc, "ntfs3: Invalid value for gid.");</div><div class='add'>+		opts-&gt;fs_gid = result.gid;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_umask:</div><div class='ctx'> 		if (result.uint_32 &amp; ~07777)</div><div class='hunk'>@@ -350,28 +356,28 @@ static int ntfs_fs_parse_param(struct fs_context *fc,</div><div class='ctx'> 		opts-&gt;fmask = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_immutable:</div><div class='del'>-		opts-&gt;sys_immutable = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;sys_immutable = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_discard:</div><div class='del'>-		opts-&gt;discard = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;discard = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_force:</div><div class='del'>-		opts-&gt;force = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;force = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_sparse:</div><div class='del'>-		opts-&gt;sparse = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;sparse = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_nohidden:</div><div class='del'>-		opts-&gt;nohidden = result.negated ? 1 : 0;</div><div class='add'>+		opts-&gt;nohidden = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_hide_dot_files:</div><div class='del'>-		opts-&gt;hide_dot_files = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;hide_dot_files = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_windows_names:</div><div class='del'>-		opts-&gt;windows_names = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;windows_names = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_showmeta:</div><div class='del'>-		opts-&gt;showmeta = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;showmeta = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_acl:</div><div class='ctx'> 		if (!result.negated)</div><div class='hunk'>@@ -390,10 +396,10 @@ static int ntfs_fs_parse_param(struct fs_context *fc,</div><div class='ctx'> 		param-&gt;string = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_prealloc:</div><div class='del'>-		opts-&gt;prealloc = result.negated ? 0 : 1;</div><div class='add'>+		opts-&gt;prealloc = !result.negated;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case Opt_nocase:</div><div class='del'>-		opts-&gt;nocase = result.negated ? 1 : 0;</div><div class='add'>+		opts-&gt;nocase = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Should not be here unless we forget add case. */</div><div class='hunk'>@@ -409,6 +415,12 @@ static int ntfs_fs_reconfigure(struct fs_context *fc)</div><div class='ctx'> 	struct ntfs_mount_options *new_opts = fc-&gt;fs_private;</div><div class='ctx'> 	int ro_rw;</div><div class='ctx'> </div><div class='add'>+	/* If ntfs3 is used as legacy ntfs enforce read-only mode. */</div><div class='add'>+	if (is_legacy_ntfs(sb)) {</div><div class='add'>+		fc-&gt;sb_flags |= SB_RDONLY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ro_rw = sb_rdonly(sb) &amp;&amp; !(fc-&gt;sb_flags &amp; SB_RDONLY);</div><div class='ctx'> 	if (ro_rw &amp;&amp; (sbi-&gt;flags &amp; NTFS_FLAGS_NEED_REPLAY)) {</div><div class='ctx'> 		errorf(fc,</div><div class='hunk'>@@ -428,8 +440,6 @@ static int ntfs_fs_reconfigure(struct fs_context *fc)</div><div class='ctx'> 			fc,</div><div class='ctx'> 			"ntfs3: Cannot use different iocharset when remounting!");</div><div class='ctx'> </div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-</div><div class='ctx'> 	if (ro_rw &amp;&amp; (sbi-&gt;volume.flags &amp; VOLUME_FLAG_DIRTY) &amp;&amp;</div><div class='ctx'> 	    !new_opts-&gt;force) {</div><div class='ctx'> 		errorf(fc,</div><div class='hunk'>@@ -437,6 +447,8 @@ static int ntfs_fs_reconfigure(struct fs_context *fc)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	sync_filesystem(sb);</div><div class='ctx'> 	swap(sbi-&gt;options, fc-&gt;fs_private);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -463,7 +475,7 @@ static int ntfs3_volinfo(struct seq_file *m, void *o)</div><div class='ctx'> 	struct super_block *sb = m-&gt;private;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "ntfs%d.%d\n%u\n%zu\n\%zu\n%zu\n%s\n%s\n",</div><div class='add'>+	seq_printf(m, "ntfs%d.%d\n%u\n%zu\n%zu\n%zu\n%s\n%s\n",</div><div class='ctx'> 		   sbi-&gt;volume.major_ver, sbi-&gt;volume.minor_ver,</div><div class='ctx'> 		   sbi-&gt;cluster_size, sbi-&gt;used.bitmap.nbits,</div><div class='ctx'> 		   sbi-&gt;mft.bitmap.nbits,</div><div class='hunk'>@@ -549,6 +561,55 @@ static const struct proc_ops ntfs3_label_fops = {</div><div class='ctx'> 	.proc_write = ntfs3_label_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void ntfs_create_procdir(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct proc_dir_entry *e;</div><div class='add'>+</div><div class='add'>+	if (!proc_info_root)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	e = proc_mkdir(sb-&gt;s_id, proc_info_root);</div><div class='add'>+	if (e) {</div><div class='add'>+		struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+		proc_create_data("volinfo", 0444, e, &amp;ntfs3_volinfo_fops, sb);</div><div class='add'>+		proc_create_data("label", 0644, e, &amp;ntfs3_label_fops, sb);</div><div class='add'>+		sbi-&gt;procdir = e;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ntfs_remove_procdir(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	if (!sbi-&gt;procdir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	remove_proc_entry("label", sbi-&gt;procdir);</div><div class='add'>+	remove_proc_entry("volinfo", sbi-&gt;procdir);</div><div class='add'>+	remove_proc_entry(sb-&gt;s_id, proc_info_root);</div><div class='add'>+	sbi-&gt;procdir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ntfs_create_proc_root(void)</div><div class='add'>+{</div><div class='add'>+	proc_info_root = proc_mkdir("fs/ntfs3", NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ntfs_remove_proc_root(void)</div><div class='add'>+{</div><div class='add'>+	if (proc_info_root) {</div><div class='add'>+		remove_proc_entry("fs/ntfs3", NULL);</div><div class='add'>+		proc_info_root = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+// clang-format off</div><div class='add'>+static void ntfs_create_procdir(struct super_block *sb){}</div><div class='add'>+static void ntfs_remove_procdir(struct super_block *sb){}</div><div class='add'>+static void ntfs_create_proc_root(void){}</div><div class='add'>+static void ntfs_remove_proc_root(void){}</div><div class='add'>+// clang-format on</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *ntfs_inode_cachep;</div><div class='hunk'>@@ -625,7 +686,7 @@ static void ntfs3_free_sbi(struct ntfs_sb_info *sbi)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(sbi-&gt;new_rec);</div><div class='ctx'> 	kvfree(ntfs_put_shared(sbi-&gt;upcase));</div><div class='del'>-	kfree(sbi-&gt;def_table);</div><div class='add'>+	kvfree(sbi-&gt;def_table);</div><div class='ctx'> 	kfree(sbi-&gt;compress.lznt);</div><div class='ctx'> #ifdef CONFIG_NTFS3_LZX_XPRESS</div><div class='ctx'> 	xpress_free_decompressor(sbi-&gt;compress.xpress);</div><div class='hunk'>@@ -638,18 +699,18 @@ static void ntfs_put_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	// Remove /proc/fs/ntfs3/..</div><div class='del'>-	if (sbi-&gt;procdir) {</div><div class='del'>-		remove_proc_entry("label", sbi-&gt;procdir);</div><div class='del'>-		remove_proc_entry("volinfo", sbi-&gt;procdir);</div><div class='del'>-		remove_proc_entry(sb-&gt;s_id, proc_info_root);</div><div class='del'>-		sbi-&gt;procdir = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	ntfs_remove_procdir(sb);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark rw ntfs as clear, if possible. */</div><div class='ctx'> 	ntfs_set_state(sbi, NTFS_DIRTY_CLEAR);</div><div class='add'>+</div><div class='add'>+	if (sbi-&gt;options) {</div><div class='add'>+		unload_nls(sbi-&gt;options-&gt;nls);</div><div class='add'>+		kfree(sbi-&gt;options-&gt;nls_name);</div><div class='add'>+		kfree(sbi-&gt;options);</div><div class='add'>+		sbi-&gt;options = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ntfs3_put_sbi(sbi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -715,6 +776,14 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ntfs_shutdown - super_operations::shutdown</div><div class='add'>+ */</div><div class='add'>+static void ntfs_shutdown(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	set_bit(NTFS_FLAGS_SHUTDOWN_BIT, &amp;ntfs_sb(sb)-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * ntfs_sync_fs - super_operations::sync_fs</div><div class='ctx'>  */</div><div class='ctx'> static int ntfs_sync_fs(struct super_block *sb, int wait)</div><div class='hunk'>@@ -724,6 +793,9 @@ static int ntfs_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 	struct ntfs_inode *ni;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	ni = sbi-&gt;security.ni;</div><div class='ctx'> 	if (ni) {</div><div class='ctx'> 		inode = &amp;ni-&gt;vfs_inode;</div><div class='hunk'>@@ -763,6 +835,7 @@ static const struct super_operations ntfs_sops = {</div><div class='ctx'> 	.put_super = ntfs_put_super,</div><div class='ctx'> 	.statfs = ntfs_statfs,</div><div class='ctx'> 	.show_options = ntfs_show_options,</div><div class='add'>+	.shutdown = ntfs_shutdown,</div><div class='ctx'> 	.sync_fs = ntfs_sync_fs,</div><div class='ctx'> 	.write_inode = ntfs3_write_inode,</div><div class='ctx'> };</div><div class='hunk'>@@ -866,6 +939,7 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,</div><div class='ctx'> 	u16 fn, ao;</div><div class='ctx'> 	u8 cluster_bits;</div><div class='ctx'> 	u32 boot_off = 0;</div><div class='add'>+	sector_t boot_block = 0;</div><div class='ctx'> 	const char *hint = "Primary boot";</div><div class='ctx'> </div><div class='ctx'> 	/* Save original dev_size. Used with alternative boot. */</div><div class='hunk'>@@ -873,11 +947,16 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;volume.blocks = dev_size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	bh = ntfs_bread(sb, 0);</div><div class='add'>+	/* Set dummy blocksize to read boot_block. */</div><div class='add'>+	if (!sb_min_blocksize(sb, PAGE_SIZE)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+read_boot:</div><div class='add'>+	bh = ntfs_bread(sb, boot_block);</div><div class='ctx'> 	if (!bh)</div><div class='del'>-		return -EIO;</div><div class='add'>+		return boot_block ? -EINVAL : -EIO;</div><div class='ctx'> </div><div class='del'>-check_boot:</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Corrupted image; do not read OOB */</div><div class='hunk'>@@ -997,6 +1076,7 @@ check_boot:</div><div class='ctx'> 		dev_size += sector_size - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sbi-&gt;bdev_blocksize_mask = max(boot_sector_size, sector_size) - 1;</div><div class='ctx'> 	sbi-&gt;mft.lbo = mlcn &lt;&lt; cluster_bits;</div><div class='ctx'> 	sbi-&gt;mft.lbo2 = mlcn2 &lt;&lt; cluster_bits;</div><div class='ctx'> </div><div class='hunk'>@@ -1108,26 +1188,24 @@ check_boot:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (err == -EINVAL &amp;&amp; !bh-&gt;b_blocknr &amp;&amp; dev_size0 &gt; PAGE_SHIFT) {</div><div class='add'>+	brelse(bh);</div><div class='add'>+</div><div class='add'>+	if (err == -EINVAL &amp;&amp; !boot_block &amp;&amp; dev_size0 &gt; PAGE_SHIFT) {</div><div class='ctx'> 		u32 block_size = min_t(u32, sector_size, PAGE_SIZE);</div><div class='ctx'> 		u64 lbo = dev_size0 - sizeof(*boot);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-	 	 * Try alternative boot (last sector)</div><div class='del'>-		 */</div><div class='del'>-		brelse(bh);</div><div class='del'>-</div><div class='del'>-		sb_set_blocksize(sb, block_size);</div><div class='del'>-		bh = ntfs_bread(sb, lbo &gt;&gt; blksize_bits(block_size));</div><div class='del'>-		if (!bh)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='add'>+		boot_block = lbo &gt;&gt; blksize_bits(block_size);</div><div class='ctx'> 		boot_off = lbo &amp; (block_size - 1);</div><div class='del'>-		hint = "Alternative boot";</div><div class='del'>-		dev_size = dev_size0; /* restore original size. */</div><div class='del'>-		goto check_boot;</div><div class='add'>+		if (boot_block &amp;&amp; block_size &gt;= boot_off + sizeof(*boot)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Try alternative boot (last sector)</div><div class='add'>+			 */</div><div class='add'>+			sb_set_blocksize(sb, block_size);</div><div class='add'>+			hint = "Alternative boot";</div><div class='add'>+			dev_size = dev_size0; /* restore original size. */</div><div class='add'>+			goto read_boot;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	brelse(bh);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1140,14 +1218,15 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='ctx'> 	struct block_device *bdev = sb-&gt;s_bdev;</div><div class='del'>-	struct ntfs_mount_options *options;</div><div class='add'>+	struct ntfs_mount_options *fc_opts;</div><div class='add'>+	struct ntfs_mount_options *options = NULL;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct ntfs_inode *ni;</div><div class='ctx'> 	size_t i, tt, bad_len, bad_frags;</div><div class='ctx'> 	CLST vcn, lcn, len;</div><div class='ctx'> 	struct ATTRIB *attr;</div><div class='ctx'> 	const struct VOLUME_INFO *info;</div><div class='del'>-	u32 idx, done, bytes;</div><div class='add'>+	u32 done, bytes;</div><div class='ctx'> 	struct ATTR_DEF_ENTRY *t;</div><div class='ctx'> 	u16 *shared;</div><div class='ctx'> 	struct MFT_REF ref;</div><div class='hunk'>@@ -1157,7 +1236,23 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	ref.high = 0;</div><div class='ctx'> </div><div class='ctx'> 	sbi-&gt;sb = sb;</div><div class='del'>-	sbi-&gt;options = options = fc-&gt;fs_private;</div><div class='add'>+	fc_opts = fc-&gt;fs_private;</div><div class='add'>+	if (!fc_opts) {</div><div class='add'>+		errorf(fc, "missing mount options");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	options = kmemdup(fc_opts, sizeof(*fc_opts), GFP_KERNEL);</div><div class='add'>+	if (!options)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (fc_opts-&gt;nls_name) {</div><div class='add'>+		options-&gt;nls_name = kstrdup(fc_opts-&gt;nls_name, GFP_KERNEL);</div><div class='add'>+		if (!options-&gt;nls_name) {</div><div class='add'>+			kfree(options);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	sbi-&gt;options = options;</div><div class='ctx'> 	fc-&gt;fs_private = NULL;</div><div class='ctx'> 	sb-&gt;s_flags |= SB_NODIRATIME;</div><div class='ctx'> 	sb-&gt;s_magic = 0x7366746e; // "ntfs"</div><div class='hunk'>@@ -1165,7 +1260,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_export_op = &amp;ntfs_export_ops;</div><div class='ctx'> 	sb-&gt;s_time_gran = NTFS_TIME_GRAN; // 100 nsec</div><div class='ctx'> 	sb-&gt;s_xattr = ntfs_xattr_handlers;</div><div class='del'>-	sb-&gt;s_d_op = options-&gt;nocase ? &amp;ntfs_dentry_ops : NULL;</div><div class='add'>+	set_default_d_op(sb, options-&gt;nocase ? &amp;ntfs_dentry_ops : NULL);</div><div class='ctx'> </div><div class='ctx'> 	options-&gt;nls = ntfs_load_nls(options-&gt;nls_name);</div><div class='ctx'> 	if (IS_ERR(options-&gt;nls)) {</div><div class='hunk'>@@ -1189,7 +1284,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Load $Volume. This should be done before $LogFile</div><div class='del'>-	 * 'cause 'sbi-&gt;volume.ni' is used 'ntfs_set_state'.</div><div class='add'>+	 * 'cause 'sbi-&gt;volume.ni' is used in 'ntfs_set_state'.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ref.low = cpu_to_le32(MFT_REC_VOL);</div><div class='ctx'> 	ref.seq = cpu_to_le16(MFT_REC_VOL);</div><div class='hunk'>@@ -1235,7 +1330,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sbi-&gt;volume.ni = ni;</div><div class='ctx'> 	if (info-&gt;flags &amp; VOLUME_FLAG_DIRTY) {</div><div class='ctx'> 		sbi-&gt;volume.real_dirty = true;</div><div class='del'>-		ntfs_info(sb, "It is recommened to use chkdsk.");</div><div class='add'>+		ntfs_info(sb, "It is recommended to use chkdsk.");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Load $MFTMirr to estimate recs_mirr. */</div><div class='hunk'>@@ -1331,7 +1426,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> 	/* Check bitmap boundary. */</div><div class='ctx'> 	tt = sbi-&gt;used.bitmap.nbits;</div><div class='del'>-	if (inode-&gt;i_size &lt; bitmap_size(tt)) {</div><div class='add'>+	if (inode-&gt;i_size &lt; ntfs3_bitmap_size(tt)) {</div><div class='ctx'> 		ntfs_err(sb, "$Bitmap is corrupted.");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto put_inode_out;</div><div class='hunk'>@@ -1419,31 +1514,22 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		goto put_inode_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (done = idx = 0; done &lt; bytes; done += PAGE_SIZE, idx++) {</div><div class='del'>-		unsigned long tail = bytes - done;</div><div class='del'>-		struct page *page = ntfs_map_page(inode-&gt;i_mapping, idx);</div><div class='add'>+	/* Read the entire file. */</div><div class='add'>+	err = inode_read_data(inode, sbi-&gt;def_table, bytes);</div><div class='add'>+	if (err) {</div><div class='add'>+		ntfs_err(sb, "Failed to read $AttrDef (%d).", err);</div><div class='add'>+		goto put_inode_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-			ntfs_err(sb, "Failed to read $AttrDef (%d).", err);</div><div class='del'>-			goto put_inode_out;</div><div class='del'>-		}</div><div class='del'>-		memcpy(Add2Ptr(t, done), page_address(page),</div><div class='del'>-		       min(PAGE_SIZE, tail));</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='del'>-</div><div class='del'>-		if (!idx &amp;&amp; ATTR_STD != t-&gt;type) {</div><div class='del'>-			ntfs_err(sb, "$AttrDef is corrupted.");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto put_inode_out;</div><div class='del'>-		}</div><div class='add'>+	if (ATTR_STD != t-&gt;type) {</div><div class='add'>+		ntfs_err(sb, "$AttrDef is corrupted.");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto put_inode_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t += 1;</div><div class='ctx'> 	sbi-&gt;def_entries = 1;</div><div class='ctx'> 	done = sizeof(struct ATTR_DEF_ENTRY);</div><div class='del'>-	sbi-&gt;reparse.max_size = MAXIMUM_REPARSE_DATA_BUFFER_SIZE;</div><div class='del'>-	sbi-&gt;ea_max_size = 0x10000; /* default formatter value */</div><div class='ctx'> </div><div class='ctx'> 	while (done + sizeof(struct ATTR_DEF_ENTRY) &lt;= bytes) {</div><div class='ctx'> 		u32 t32 = le32_to_cpu(t-&gt;type);</div><div class='hunk'>@@ -1479,27 +1565,21 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		goto put_inode_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (idx = 0; idx &lt; (0x10000 * sizeof(short) &gt;&gt; PAGE_SHIFT); idx++) {</div><div class='del'>-		const __le16 *src;</div><div class='del'>-		u16 *dst = Add2Ptr(sbi-&gt;upcase, idx &lt;&lt; PAGE_SHIFT);</div><div class='del'>-		struct page *page = ntfs_map_page(inode-&gt;i_mapping, idx);</div><div class='del'>-</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-			ntfs_err(sb, "Failed to read $UpCase (%d).", err);</div><div class='del'>-			goto put_inode_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		src = page_address(page);</div><div class='add'>+	/* Read the entire file. */</div><div class='add'>+	err = inode_read_data(inode, sbi-&gt;upcase, 0x10000 * sizeof(short));</div><div class='add'>+	if (err) {</div><div class='add'>+		ntfs_err(sb, "Failed to read $UpCase (%d).", err);</div><div class='add'>+		goto put_inode_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='del'>-		for (i = 0; i &lt; PAGE_SIZE / sizeof(u16); i++)</div><div class='del'>-			*dst++ = le16_to_cpu(*src++);</div><div class='del'>-#else</div><div class='del'>-		memcpy(dst, src, PAGE_SIZE);</div><div class='del'>-#endif</div><div class='del'>-		ntfs_unmap_page(page);</div><div class='add'>+	{</div><div class='add'>+		u16 *dst = sbi-&gt;upcase;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 0x10000; i++)</div><div class='add'>+			__swab16s(dst++);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	shared = ntfs_set_shared(sbi-&gt;upcase, 0x10000 * sizeof(short));</div><div class='ctx'> 	if (shared &amp;&amp; sbi-&gt;upcase != shared) {</div><div class='hunk'>@@ -1588,29 +1668,25 @@ load_root:</div><div class='ctx'> 		kfree(boot2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	/* Create /proc/fs/ntfs3/.. */</div><div class='del'>-	if (proc_info_root) {</div><div class='del'>-		struct proc_dir_entry *e = proc_mkdir(sb-&gt;s_id, proc_info_root);</div><div class='del'>-		static_assert((S_IRUGO | S_IWUSR) == 0644);</div><div class='del'>-		if (e) {</div><div class='del'>-			proc_create_data("volinfo", S_IRUGO, e,</div><div class='del'>-					 &amp;ntfs3_volinfo_fops, sb);</div><div class='del'>-			proc_create_data("label", S_IRUGO | S_IWUSR, e,</div><div class='del'>-					 &amp;ntfs3_label_fops, sb);</div><div class='del'>-			sbi-&gt;procdir = e;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	ntfs_create_procdir(sb);</div><div class='ctx'> </div><div class='add'>+	if (is_legacy_ntfs(sb))</div><div class='add'>+		sb-&gt;s_flags |= SB_RDONLY;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> put_inode_out:</div><div class='ctx'> 	iput(inode);</div><div class='ctx'> out:</div><div class='add'>+	/* sbi-&gt;options == options */</div><div class='add'>+	if (options) {</div><div class='add'>+		unload_nls(options-&gt;nls);</div><div class='add'>+		kfree(options-&gt;nls_name);</div><div class='add'>+		kfree(options);</div><div class='add'>+		sbi-&gt;options = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ntfs3_put_sbi(sbi);</div><div class='ctx'> 	kfree(boot2);</div><div class='del'>-	ntfs3_put_sbi(sbi);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1720,7 +1796,7 @@ static const struct fs_context_operations ntfs_context_ops = {</div><div class='ctx'>  * This will called when mount/remount. We will first initialize</div><div class='ctx'>  * options so that if remount we can use just that.</div><div class='ctx'>  */</div><div class='del'>-static int ntfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+static int __ntfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_mount_options *opts;</div><div class='ctx'> 	struct ntfs_sb_info *sbi;</div><div class='hunk'>@@ -1734,6 +1810,12 @@ static int ntfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	opts-&gt;fs_gid = current_gid();</div><div class='ctx'> 	opts-&gt;fs_fmask_inv = ~current_umask();</div><div class='ctx'> 	opts-&gt;fs_dmask_inv = ~current_umask();</div><div class='add'>+	opts-&gt;prealloc = 1;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NTFS3_FS_POSIX_ACL</div><div class='add'>+	/* Set the default value 'acl' */</div><div class='add'>+	fc-&gt;sb_flags |= SB_POSIXACL;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)</div><div class='ctx'> 		goto ok;</div><div class='hunk'>@@ -1768,6 +1850,11 @@ free_opts:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ntfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return __ntfs_init_fs_context(fc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ntfs3_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_sb_info *sbi = sb-&gt;s_fs_info;</div><div class='hunk'>@@ -1788,14 +1875,54 @@ static struct file_system_type ntfs_fs_type = {</div><div class='ctx'> 	.kill_sb		= ntfs3_kill_sb,</div><div class='ctx'> 	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NTFS_FS)</div><div class='add'>+static int ntfs_legacy_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __ntfs_init_fs_context(fc);</div><div class='add'>+	/* If ntfs3 is used as legacy ntfs enforce read-only mode. */</div><div class='add'>+	fc-&gt;sb_flags |= SB_RDONLY;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type ntfs_legacy_fs_type = {</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "ntfs",</div><div class='add'>+	.init_fs_context	= ntfs_legacy_init_fs_context,</div><div class='add'>+	.parameters		= ntfs_fs_parameters,</div><div class='add'>+	.kill_sb		= ntfs3_kill_sb,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,</div><div class='add'>+};</div><div class='add'>+MODULE_ALIAS_FS("ntfs");</div><div class='add'>+</div><div class='add'>+static inline void register_as_ntfs_legacy(void)</div><div class='add'>+{</div><div class='add'>+	int err = register_filesystem(&amp;ntfs_legacy_fs_type);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_warn("ntfs3: Failed to register legacy ntfs filesystem driver: %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unregister_as_ntfs_legacy(void)</div><div class='add'>+{</div><div class='add'>+	unregister_filesystem(&amp;ntfs_legacy_fs_type);</div><div class='add'>+}</div><div class='add'>+bool is_legacy_ntfs(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return sb-&gt;s_type == &amp;ntfs_legacy_fs_type;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void register_as_ntfs_legacy(void) {}</div><div class='add'>+static inline void unregister_as_ntfs_legacy(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> // clang-format on</div><div class='ctx'> </div><div class='ctx'> static int __init init_ntfs_fs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	pr_info("ntfs3: Max link count %u\n", NTFS_LINK_MAX);</div><div class='del'>-</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_NTFS3_FS_POSIX_ACL))</div><div class='ctx'> 		pr_info("ntfs3: Enabled Linux POSIX ACLs support\n");</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_NTFS3_64BIT_CLUSTER))</div><div class='hunk'>@@ -1804,24 +1931,21 @@ static int __init init_ntfs_fs(void)</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_NTFS3_LZX_XPRESS))</div><div class='ctx'> 		pr_info("ntfs3: Read-only LZX/Xpress compression included\n");</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	/* Create "/proc/fs/ntfs3" */</div><div class='del'>-	proc_info_root = proc_mkdir("fs/ntfs3", NULL);</div><div class='del'>-#endif</div><div class='add'>+	ntfs_create_proc_root();</div><div class='ctx'> </div><div class='ctx'> 	err = ntfs3_init_bitmap();</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		goto out2;</div><div class='ctx'> </div><div class='ctx'> 	ntfs_inode_cachep = kmem_cache_create(</div><div class='ctx'> 		"ntfs_inode_cache", sizeof(struct ntfs_inode), 0,</div><div class='del'>-		(SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT),</div><div class='del'>-		init_once);</div><div class='add'>+		(SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT), init_once);</div><div class='ctx'> 	if (!ntfs_inode_cachep) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	register_as_ntfs_legacy();</div><div class='ctx'> 	err = register_filesystem(&amp;ntfs_fs_type);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1831,6 +1955,8 @@ out:</div><div class='ctx'> 	kmem_cache_destroy(ntfs_inode_cachep);</div><div class='ctx'> out1:</div><div class='ctx'> 	ntfs3_exit_bitmap();</div><div class='add'>+out2:</div><div class='add'>+	ntfs_remove_proc_root();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1839,12 +1965,9 @@ static void __exit exit_ntfs_fs(void)</div><div class='ctx'> 	rcu_barrier();</div><div class='ctx'> 	kmem_cache_destroy(ntfs_inode_cachep);</div><div class='ctx'> 	unregister_filesystem(&amp;ntfs_fs_type);</div><div class='add'>+	unregister_as_ntfs_legacy();</div><div class='ctx'> 	ntfs3_exit_bitmap();</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	if (proc_info_root)</div><div class='del'>-		remove_proc_entry("fs/ntfs3", NULL);</div><div class='del'>-#endif</div><div class='add'>+	ntfs_remove_proc_root();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c<br/>index 4274b6f31cfa..c93df55e98d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ntfs3/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ntfs3/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ntfs3/xattr.c</a></div><div class='hunk'>@@ -195,10 +195,8 @@ static ssize_t ntfs_list_ea(struct ntfs_inode *ni, char *buffer,</div><div class='ctx'> {</div><div class='ctx'> 	const struct EA_INFO *info;</div><div class='ctx'> 	struct EA_FULL *ea_all = NULL;</div><div class='del'>-	const struct EA_FULL *ea;</div><div class='ctx'> 	u32 off, size;</div><div class='ctx'> 	int err;</div><div class='del'>-	int ea_size;</div><div class='ctx'> 	size_t ret;</div><div class='ctx'> </div><div class='ctx'> 	err = ntfs_read_ea(ni, &amp;ea_all, 0, &amp;info);</div><div class='hunk'>@@ -212,28 +210,37 @@ static ssize_t ntfs_list_ea(struct ntfs_inode *ni, char *buffer,</div><div class='ctx'> </div><div class='ctx'> 	/* Enumerate all xattrs. */</div><div class='ctx'> 	ret = 0;</div><div class='del'>-	for (off = 0; off + sizeof(struct EA_FULL) &lt; size; off += ea_size) {</div><div class='del'>-		ea = Add2Ptr(ea_all, off);</div><div class='del'>-		ea_size = unpacked_ea_size(ea);</div><div class='add'>+	off = 0;</div><div class='add'>+	while (off + sizeof(struct EA_FULL) &lt; size) {</div><div class='add'>+		const struct EA_FULL *ea = Add2Ptr(ea_all, off);</div><div class='add'>+		int ea_size = unpacked_ea_size(ea);</div><div class='add'>+		u8 name_len = ea-&gt;name_len;</div><div class='ctx'> </div><div class='del'>-		if (!ea-&gt;name_len)</div><div class='add'>+		if (!name_len)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		if (name_len &gt; ea_size) {</div><div class='add'>+			ntfs_set_state(ni-&gt;mi.sbi, NTFS_DIRTY_ERROR);</div><div class='add'>+			err = -EINVAL; /* corrupted fs. */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (buffer) {</div><div class='ctx'> 			/* Check if we can use field ea-&gt;name */</div><div class='ctx'> 			if (off + ea_size &gt; size)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			if (ret + ea-&gt;name_len + 1 &gt; bytes_per_buffer) {</div><div class='add'>+			if (ret + name_len + 1 &gt; bytes_per_buffer) {</div><div class='ctx'> 				err = -ERANGE;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			memcpy(buffer + ret, ea-&gt;name, ea-&gt;name_len);</div><div class='del'>-			buffer[ret + ea-&gt;name_len] = 0;</div><div class='add'>+			memcpy(buffer + ret, ea-&gt;name, name_len);</div><div class='add'>+			buffer[ret + name_len] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret += ea-&gt;name_len + 1;</div><div class='add'>+		ret += name_len + 1;</div><div class='add'>+		off += ea_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -306,7 +313,7 @@ out:</div><div class='ctx'> static noinline int ntfs_set_ea(struct inode *inode, const char *name,</div><div class='ctx'> 				size_t name_len, const void *value,</div><div class='ctx'> 				size_t val_size, int flags, bool locked,</div><div class='del'>-				__le16 *ea_size)</div><div class='add'>+				__le32 *ea_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> 	struct ntfs_sb_info *sbi = ni-&gt;mi.sbi;</div><div class='hunk'>@@ -515,7 +522,7 @@ update_ea:</div><div class='ctx'> 	if (ea_info.size_pack != size_pack)</div><div class='ctx'> 		ni-&gt;ni_flags |= NI_FLAG_UPDATE_PARENT;</div><div class='ctx'> 	if (ea_size)</div><div class='del'>-		*ea_size = ea_info.size_pack;</div><div class='add'>+		*ea_size = ea_info.size;</div><div class='ctx'> 	mark_inode_dirty(&amp;ni-&gt;vfs_inode);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -545,6 +552,10 @@ struct posix_acl *ntfs_get_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	void *buf;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='ctx'> 	/* Allocate PATH_MAX bytes. */</div><div class='ctx'> 	buf = __getname();</div><div class='ctx'> 	if (!buf)</div><div class='hunk'>@@ -593,6 +604,10 @@ static noinline int ntfs_set_acl_ex(struct mnt_idmap *idmap,</div><div class='ctx'> 	int flags;</div><div class='ctx'> 	umode_t mode;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ntfs_i(inode))))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (S_ISLNK(inode-&gt;i_mode))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -639,12 +654,22 @@ static noinline int ntfs_set_acl_ex(struct mnt_idmap *idmap,</div><div class='ctx'> 	err = ntfs_set_ea(inode, name, name_len, value, size, flags, 0, NULL);</div><div class='ctx'> 	if (err == -ENODATA &amp;&amp; !size)</div><div class='ctx'> 		err = 0; /* Removing non existed xattr. */</div><div class='del'>-	if (!err) {</div><div class='del'>-		set_cached_acl(inode, type, acl);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (inode-&gt;i_mode != mode) {</div><div class='add'>+		umode_t old_mode = inode-&gt;i_mode;</div><div class='add'>+		inode-&gt;i_mode = mode;</div><div class='add'>+		err = ntfs_save_wsl_perm(inode, NULL);</div><div class='add'>+		if (err) {</div><div class='add'>+			inode-&gt;i_mode = old_mode;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		inode-&gt;i_mode = mode;</div><div class='del'>-		inode_set_ctime_current(inode);</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='ctx'> 	}</div><div class='add'>+	set_cached_acl(inode, type, acl);</div><div class='add'>+	inode_set_ctime_current(inode);</div><div class='add'>+	mark_inode_dirty(inode);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(value);</div><div class='hunk'>@@ -698,7 +723,7 @@ int ntfs_init_acl(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ntfs_acl_chmod - Helper for ntfs3_setattr().</div><div class='add'>+ * ntfs_acl_chmod - Helper for ntfs_setattr().</div><div class='ctx'>  */</div><div class='ctx'> int ntfs_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry)</div><div class='ctx'> {</div><div class='hunk'>@@ -723,6 +748,10 @@ ssize_t ntfs_listxattr(struct dentry *dentry, char *buffer, size_t size)</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (!(ni-&gt;ni_flags &amp; NI_FLAG_EA)) {</div><div class='ctx'> 		/* no xattr in file */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -744,6 +773,13 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ntfs_inode *ni = ntfs_i(inode);</div><div class='ctx'> </div><div class='add'>+	/* Avoid any operation if inode is bad. */</div><div class='add'>+	if (unlikely(is_bad_ni(ni)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(ntfs3_forced_shutdown(inode-&gt;i_sb)))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	/* Dispatch request. */</div><div class='ctx'> 	if (!strcmp(name, SYSTEM_DOS_ATTRIB)) {</div><div class='ctx'> 		/* system.dos_attrib */</div><div class='hunk'>@@ -940,7 +976,7 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * save uid/gid/mode in xattr</div><div class='ctx'>  */</div><div class='del'>-int ntfs_save_wsl_perm(struct inode *inode, __le16 *ea_size)</div><div class='add'>+int ntfs_save_wsl_perm(struct inode *inode, __le32 *ea_size)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	__le32 value;</div><div class='head'>diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c<br/>index 62464d194da3..af1e2cedb217 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/acl.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;cluster/masklog.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c<br/>index ea9127ba3208..b267ec580da9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/alloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/alloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/alloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/alloc.c</a></div><div class='hunk'>@@ -566,7 +566,7 @@ static void ocfs2_adjust_rightmost_records(handle_t *handle,</div><div class='ctx'> 					   struct ocfs2_path *path,</div><div class='ctx'> 					   struct ocfs2_extent_rec *insert_rec);</div><div class='ctx'> /*</div><div class='del'>- * Reset the actual path elements so that we can re-use the structure</div><div class='add'>+ * Reset the actual path elements so that we can reuse the structure</div><div class='ctx'>  * to build another path. Generally, this involves freeing the buffer</div><div class='ctx'>  * heads.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1182,7 +1182,7 @@ static int ocfs2_add_branch(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there is a gap before the root end and the real end</div><div class='del'>-	 * of the righmost leaf block, we need to remove the gap</div><div class='add'>+	 * of the rightmost leaf block, we need to remove the gap</div><div class='ctx'> 	 * between new_cpos and root_end first so that the tree</div><div class='ctx'> 	 * is consistent after we add a new branch(it will start</div><div class='ctx'> 	 * from new_cpos).</div><div class='hunk'>@@ -1238,7 +1238,7 @@ static int ocfs2_add_branch(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	/* Note: new_eb_bhs[new_blocks - 1] is the guy which will be</div><div class='ctx'> 	 * linked with the rest of the tree.</div><div class='del'>-	 * conversly, new_eb_bhs[0] is the new bottommost leaf.</div><div class='add'>+	 * conversely, new_eb_bhs[0] is the new bottommost leaf.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * when we leave the loop, new_last_eb_blk will point to the</div><div class='ctx'> 	 * newest leaf, and next_blkno will point to the topmost extent</div><div class='hunk'>@@ -1803,6 +1803,14 @@ static int __ocfs2_find_path(struct ocfs2_caching_info *ci,</div><div class='ctx'> </div><div class='ctx'> 	el = root_el;</div><div class='ctx'> 	while (el-&gt;l_tree_depth) {</div><div class='add'>+		if (unlikely(le16_to_cpu(el-&gt;l_tree_depth) &gt;= OCFS2_MAX_PATH_DEPTH)) {</div><div class='add'>+			ocfs2_error(ocfs2_metadata_cache_get_super(ci),</div><div class='add'>+				    "Owner %llu has invalid tree depth %u in extent list\n",</div><div class='add'>+				    (unsigned long long)ocfs2_metadata_cache_owner(ci),</div><div class='add'>+				    le16_to_cpu(el-&gt;l_tree_depth));</div><div class='add'>+			ret = -EROFS;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		if (le16_to_cpu(el-&gt;l_next_free_rec) == 0) {</div><div class='ctx'> 			ocfs2_error(ocfs2_metadata_cache_get_super(ci),</div><div class='ctx'> 				    "Owner %llu has empty extent list at depth %u\n",</div><div class='hunk'>@@ -3712,7 +3720,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle,</div><div class='ctx'> 		 * update split_index here.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * When the split_index is zero, we need to merge it to the</div><div class='del'>-		 * prevoius extent block. It is more efficient and easier</div><div class='add'>+		 * previous extent block. It is more efficient and easier</div><div class='ctx'> 		 * if we do merge_right first and merge_left later.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = ocfs2_merge_rec_right(path, handle, et, split_rec,</div><div class='hunk'>@@ -4517,7 +4525,7 @@ static void ocfs2_figure_contig_type(struct ocfs2_extent_tree *et,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This should only be called against the righmost leaf extent list.</div><div class='add'>+ * This should only be called against the rightmost leaf extent list.</div><div class='ctx'>  *</div><div class='ctx'>  * ocfs2_figure_appending_type() will figure out whether we'll have to</div><div class='ctx'>  * insert at the tail of the rightmost leaf.</div><div class='hunk'>@@ -4767,7 +4775,7 @@ bail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Allcate and add clusters into the extent b-tree.</div><div class='add'>+ * Allocate and add clusters into the extent b-tree.</div><div class='ctx'>  * The new clusters(clusters_to_add) will be inserted at logical_offset.</div><div class='ctx'>  * The extent b-tree's root is specified by et, and</div><div class='ctx'>  * it is not limited to the file storage. Any extent tree can use this</div><div class='hunk'>@@ -6154,6 +6162,9 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb,</div><div class='ctx'> 	int status;</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='add'>+	struct ocfs2_dinode *di;</div><div class='add'>+	struct ocfs2_truncate_log *tl;</div><div class='add'>+	unsigned int tl_count;</div><div class='ctx'> </div><div class='ctx'> 	inode = ocfs2_get_system_file_inode(osb,</div><div class='ctx'> 					   TRUNCATE_LOG_SYSTEM_INODE,</div><div class='hunk'>@@ -6171,6 +6182,18 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb,</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	di = (struct ocfs2_dinode *)bh-&gt;b_data;</div><div class='add'>+	tl = &amp;di-&gt;id2.i_dealloc;</div><div class='add'>+	tl_count = le16_to_cpu(tl-&gt;tl_count);</div><div class='add'>+	if (unlikely(tl_count &gt; ocfs2_truncate_recs_per_inode(osb-&gt;sb) ||</div><div class='add'>+		     tl_count == 0)) {</div><div class='add'>+		status = -EFSCORRUPTED;</div><div class='add'>+		iput(inode);</div><div class='add'>+		brelse(bh);</div><div class='add'>+		mlog_errno(status);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	*tl_inode = inode;</div><div class='ctx'> 	*tl_bh    = bh;</div><div class='ctx'> bail:</div><div class='hunk'>@@ -6808,27 +6831,27 @@ static int ocfs2_zero_func(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,</div><div class='del'>-			      unsigned int from, unsigned int to,</div><div class='del'>-			      struct page *page, int zero, u64 *phys)</div><div class='add'>+void ocfs2_map_and_dirty_folio(struct inode *inode, handle_t *handle,</div><div class='add'>+		size_t from, size_t to, struct folio *folio, int zero,</div><div class='add'>+		u64 *phys)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, partial = 0;</div><div class='del'>-	loff_t start_byte = ((loff_t)page-&gt;index &lt;&lt; PAGE_SHIFT) + from;</div><div class='add'>+	loff_t start_byte = folio_pos(folio) + from;</div><div class='ctx'> 	loff_t length = to - from;</div><div class='ctx'> </div><div class='del'>-	ret = ocfs2_map_page_blocks(page, phys, inode, from, to, 0);</div><div class='add'>+	ret = ocfs2_map_folio_blocks(folio, phys, inode, from, to, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> </div><div class='ctx'> 	if (zero)</div><div class='del'>-		zero_user_segment(page, from, to);</div><div class='add'>+		folio_zero_segment(folio, from, to);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Need to set the buffers we zero'd into uptodate</div><div class='ctx'> 	 * here if they aren't - ocfs2_map_page_blocks()</div><div class='ctx'> 	 * might've skipped some</div><div class='ctx'> 	 */</div><div class='del'>-	ret = walk_page_buffers(handle, page_buffers(page),</div><div class='add'>+	ret = walk_page_buffers(handle, folio_buffers(folio),</div><div class='ctx'> 				from, to, &amp;partial,</div><div class='ctx'> 				ocfs2_zero_func);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -6841,92 +6864,88 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!partial)</div><div class='del'>-		SetPageUptodate(page);</div><div class='add'>+		folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='del'>-	flush_dcache_page(page);</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ocfs2_zero_cluster_pages(struct inode *inode, loff_t start,</div><div class='del'>-				     loff_t end, struct page **pages,</div><div class='del'>-				     int numpages, u64 phys, handle_t *handle)</div><div class='add'>+static void ocfs2_zero_cluster_folios(struct inode *inode, loff_t start,</div><div class='add'>+		loff_t end, struct folio **folios, int numfolios,</div><div class='add'>+		u64 phys, handle_t *handle)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned int from, to = PAGE_SIZE;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ocfs2_sparse_alloc(OCFS2_SB(sb)));</div><div class='ctx'> </div><div class='del'>-	if (numpages == 0)</div><div class='add'>+	if (numfolios == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	to = PAGE_SIZE;</div><div class='del'>-	for(i = 0; i &lt; numpages; i++) {</div><div class='del'>-		page = pages[i];</div><div class='add'>+	for (i = 0; i &lt; numfolios; i++) {</div><div class='add'>+		struct folio *folio = folios[i];</div><div class='add'>+		size_t to = folio_size(folio);</div><div class='add'>+		size_t from = offset_in_folio(folio, start);</div><div class='ctx'> </div><div class='del'>-		from = start &amp; (PAGE_SIZE - 1);</div><div class='del'>-		if ((end &gt;&gt; PAGE_SHIFT) == page-&gt;index)</div><div class='del'>-			to = end &amp; (PAGE_SIZE - 1);</div><div class='add'>+		if (to &gt; end - folio_pos(folio))</div><div class='add'>+			to = end - folio_pos(folio);</div><div class='ctx'> </div><div class='del'>-		BUG_ON(from &gt; PAGE_SIZE);</div><div class='del'>-		BUG_ON(to &gt; PAGE_SIZE);</div><div class='add'>+		ocfs2_map_and_dirty_folio(inode, handle, from, to, folio, 1,</div><div class='add'>+				&amp;phys);</div><div class='ctx'> </div><div class='del'>-		ocfs2_map_and_dirty_page(inode, handle, from, to, page, 1,</div><div class='del'>-					 &amp;phys);</div><div class='del'>-</div><div class='del'>-		start = (page-&gt;index + 1) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		start = folio_next_pos(folio);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (pages)</div><div class='del'>-		ocfs2_unlock_and_free_pages(pages, numpages);</div><div class='add'>+	if (folios)</div><div class='add'>+		ocfs2_unlock_and_free_folios(folios, numfolios);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,</div><div class='del'>-		     struct page **pages, int *num)</div><div class='add'>+static int ocfs2_grab_folios(struct inode *inode, loff_t start, loff_t end,</div><div class='add'>+		struct folio **folios, int *num)</div><div class='ctx'> {</div><div class='del'>-	int numpages, ret = 0;</div><div class='add'>+	int numfolios, ret = 0;</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> 	unsigned long index;</div><div class='ctx'> 	loff_t last_page_bytes;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(start &gt; end);</div><div class='ctx'> </div><div class='del'>-	numpages = 0;</div><div class='add'>+	numfolios = 0;</div><div class='ctx'> 	last_page_bytes = PAGE_ALIGN(end);</div><div class='ctx'> 	index = start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	do {</div><div class='del'>-		pages[numpages] = find_or_create_page(mapping, index, GFP_NOFS);</div><div class='del'>-		if (!pages[numpages]) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='add'>+		folios[numfolios] = __filemap_get_folio(mapping, index,</div><div class='add'>+				FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS);</div><div class='add'>+		if (IS_ERR(folios[numfolios])) {</div><div class='add'>+			ret = PTR_ERR(folios[numfolios]);</div><div class='ctx'> 			mlog_errno(ret);</div><div class='add'>+			folios[numfolios] = NULL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		numpages++;</div><div class='del'>-		index++;</div><div class='add'>+		index = folio_next_index(folios[numfolios]);</div><div class='add'>+		numfolios++;</div><div class='ctx'> 	} while (index &lt; (last_page_bytes &gt;&gt; PAGE_SHIFT));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		if (pages)</div><div class='del'>-			ocfs2_unlock_and_free_pages(pages, numpages);</div><div class='del'>-		numpages = 0;</div><div class='add'>+		ocfs2_unlock_and_free_folios(folios, numfolios);</div><div class='add'>+		numfolios = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*num = numpages;</div><div class='add'>+	*num = numfolios;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_grab_eof_pages(struct inode *inode, loff_t start, loff_t end,</div><div class='del'>-				struct page **pages, int *num)</div><div class='add'>+static int ocfs2_grab_eof_folios(struct inode *inode, loff_t start, loff_t end,</div><div class='add'>+				struct folio **folios, int *num)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(start &gt;&gt; OCFS2_SB(sb)-&gt;s_clustersize_bits !=</div><div class='ctx'> 	       (end - 1) &gt;&gt; OCFS2_SB(sb)-&gt;s_clustersize_bits);</div><div class='ctx'> </div><div class='del'>-	return ocfs2_grab_pages(inode, start, end, pages, num);</div><div class='add'>+	return ocfs2_grab_folios(inode, start, end, folios, num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -6940,8 +6959,8 @@ static int ocfs2_grab_eof_pages(struct inode *inode, loff_t start, loff_t end,</div><div class='ctx'> int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,</div><div class='ctx'> 				  u64 range_start, u64 range_end)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0, numpages;</div><div class='del'>-	struct page **pages = NULL;</div><div class='add'>+	int ret = 0, numfolios;</div><div class='add'>+	struct folio **folios = NULL;</div><div class='ctx'> 	u64 phys;</div><div class='ctx'> 	unsigned int ext_flags;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='hunk'>@@ -6954,17 +6973,17 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Avoid zeroing pages fully beyond current i_size. It is pointless as</div><div class='del'>-	 * underlying blocks of those pages should be already zeroed out and</div><div class='add'>+	 * Avoid zeroing folios fully beyond current i_size. It is pointless as</div><div class='add'>+	 * underlying blocks of those folios should be already zeroed out and</div><div class='ctx'> 	 * page writeback will skip them anyway.</div><div class='ctx'> 	 */</div><div class='ctx'> 	range_end = min_t(u64, range_end, i_size_read(inode));</div><div class='ctx'> 	if (range_start &gt;= range_end)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pages = kcalloc(ocfs2_pages_per_cluster(sb),</div><div class='del'>-			sizeof(struct page *), GFP_NOFS);</div><div class='del'>-	if (pages == NULL) {</div><div class='add'>+	folios = kcalloc(ocfs2_pages_per_cluster(sb),</div><div class='add'>+			sizeof(struct folio *), GFP_NOFS);</div><div class='add'>+	if (folios == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -6985,18 +7004,18 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,</div><div class='ctx'> 	if (phys == 0 || ext_flags &amp; OCFS2_EXT_UNWRITTEN)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = ocfs2_grab_eof_pages(inode, range_start, range_end, pages,</div><div class='del'>-				   &amp;numpages);</div><div class='add'>+	ret = ocfs2_grab_eof_folios(inode, range_start, range_end, folios,</div><div class='add'>+				   &amp;numfolios);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ocfs2_zero_cluster_pages(inode, range_start, range_end, pages,</div><div class='del'>-				 numpages, phys, handle);</div><div class='add'>+	ocfs2_zero_cluster_folios(inode, range_start, range_end, folios,</div><div class='add'>+				 numfolios, phys, handle);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Initiate writeout of the pages we zero'd here. We don't</div><div class='add'>+	 * Initiate writeout of the folios we zero'd here. We don't</div><div class='ctx'> 	 * wait on them - the truncate_inode_pages() call later will</div><div class='ctx'> 	 * do that for us.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -7006,7 +7025,7 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	kfree(pages);</div><div class='add'>+	kfree(folios);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -7059,7 +7078,7 @@ void ocfs2_set_inode_data_inline(struct inode *inode, struct ocfs2_dinode *di)</div><div class='ctx'> int ocfs2_convert_inline_data_to_extents(struct inode *inode,</div><div class='ctx'> 					 struct buffer_head *di_bh)</div><div class='ctx'> {</div><div class='del'>-	int ret, has_data, num_pages = 0;</div><div class='add'>+	int ret, has_data, num_folios = 0;</div><div class='ctx'> 	int need_free = 0;</div><div class='ctx'> 	u32 bit_off, num;</div><div class='ctx'> 	handle_t *handle;</div><div class='hunk'>@@ -7068,7 +7087,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh-&gt;b_data;</div><div class='ctx'> 	struct ocfs2_alloc_context *data_ac = NULL;</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	struct ocfs2_extent_tree et;</div><div class='ctx'> 	int did_quota = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -7119,12 +7138,12 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Save two copies, one for insert, and one that can</div><div class='del'>-		 * be changed by ocfs2_map_and_dirty_page() below.</div><div class='add'>+		 * be changed by ocfs2_map_and_dirty_folio() below.</div><div class='ctx'> 		 */</div><div class='ctx'> 		block = phys = ocfs2_clusters_to_blocks(inode-&gt;i_sb, bit_off);</div><div class='ctx'> </div><div class='del'>-		ret = ocfs2_grab_eof_pages(inode, 0, page_end, &amp;page,</div><div class='del'>-					   &amp;num_pages);</div><div class='add'>+		ret = ocfs2_grab_eof_folios(inode, 0, page_end, &amp;folio,</div><div class='add'>+					   &amp;num_folios);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			mlog_errno(ret);</div><div class='ctx'> 			need_free = 1;</div><div class='hunk'>@@ -7135,15 +7154,15 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,</div><div class='ctx'> 		 * This should populate the 1st page for us and mark</div><div class='ctx'> 		 * it up to date.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = ocfs2_read_inline_data(inode, page, di_bh);</div><div class='add'>+		ret = ocfs2_read_inline_data(inode, folio, di_bh);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			mlog_errno(ret);</div><div class='ctx'> 			need_free = 1;</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ocfs2_map_and_dirty_page(inode, handle, 0, page_end, page, 0,</div><div class='del'>-					 &amp;phys);</div><div class='add'>+		ocfs2_map_and_dirty_folio(inode, handle, 0, page_end, folio, 0,</div><div class='add'>+				&amp;phys);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;oi-&gt;ip_lock);</div><div class='hunk'>@@ -7174,8 +7193,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	if (page)</div><div class='del'>-		ocfs2_unlock_and_free_pages(&amp;page, num_pages);</div><div class='add'>+	if (folio)</div><div class='add'>+		ocfs2_unlock_and_free_folios(&amp;folio, num_folios);</div><div class='ctx'> </div><div class='ctx'> out_commit:</div><div class='ctx'> 	if (ret &lt; 0 &amp;&amp; did_quota)</div><div class='head'>diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h<br/>index 4af7abaa6e40..1c0c83362904 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/alloc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/alloc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/alloc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/alloc.h</a></div><div class='hunk'>@@ -254,11 +254,9 @@ static inline int ocfs2_is_empty_extent(struct ocfs2_extent_rec *rec)</div><div class='ctx'> 	return !rec-&gt;e_leaf_clusters;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,</div><div class='del'>-		     struct page **pages, int *num);</div><div class='del'>-void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,</div><div class='del'>-			      unsigned int from, unsigned int to,</div><div class='del'>-			      struct page *page, int zero, u64 *phys);</div><div class='add'>+void ocfs2_map_and_dirty_folio(struct inode *inode, handle_t *handle,</div><div class='add'>+		size_t from, size_t to, struct folio *folio, int zero,</div><div class='add'>+		u64 *phys);</div><div class='ctx'> /*</div><div class='ctx'>  * Structures which describe a path through a btree, and functions to</div><div class='ctx'>  * manipulate them.</div><div class='head'>diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c<br/>index b82185075de7..76c86f1c2b1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/aops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/aops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/aops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/aops.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='ctx'> 	struct buffer_head *buffer_cache_bh = NULL;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(inode-&gt;i_sb);</div><div class='del'>-	void *kaddr;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_symlink_get_block(</div><div class='ctx'> 			(unsigned long long)OCFS2_I(inode)-&gt;ip_blkno,</div><div class='hunk'>@@ -91,17 +90,11 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 		 * could've happened. Since we've got a reference on</div><div class='ctx'> 		 * the bh, even if it commits while we're doing the</div><div class='ctx'> 		 * copy, the data is still good. */</div><div class='del'>-		if (buffer_jbd(buffer_cache_bh)</div><div class='del'>-		    &amp;&amp; ocfs2_inode_is_new(inode)) {</div><div class='del'>-			kaddr = kmap_atomic(bh_result-&gt;b_page);</div><div class='del'>-			if (!kaddr) {</div><div class='del'>-				mlog(ML_ERROR, "couldn't kmap!\n");</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			memcpy(kaddr + (bh_result-&gt;b_size * iblock),</div><div class='del'>-			       buffer_cache_bh-&gt;b_data,</div><div class='del'>-			       bh_result-&gt;b_size);</div><div class='del'>-			kunmap_atomic(kaddr);</div><div class='add'>+		if (buffer_jbd(buffer_cache_bh) &amp;&amp; ocfs2_inode_is_new(inode)) {</div><div class='add'>+			memcpy_to_folio(bh_result-&gt;b_folio,</div><div class='add'>+					bh_result-&gt;b_size * iblock,</div><div class='add'>+					buffer_cache_bh-&gt;b_data,</div><div class='add'>+					bh_result-&gt;b_size);</div><div class='ctx'> 			set_buffer_uptodate(bh_result);</div><div class='ctx'> 		}</div><div class='ctx'> 		brelse(buffer_cache_bh);</div><div class='hunk'>@@ -156,9 +149,8 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock,</div><div class='ctx'> 	err = ocfs2_extent_map_get_blocks(inode, iblock, &amp;p_blkno, &amp;count,</div><div class='ctx'> 					  &amp;ext_flags);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "</div><div class='del'>-		     "%llu, NULL)\n", err, inode, (unsigned long long)iblock,</div><div class='del'>-		     (unsigned long long)p_blkno);</div><div class='add'>+		mlog(ML_ERROR, "get_blocks() failed, inode: 0x%p, "</div><div class='add'>+		     "block: %llu\n", inode, (unsigned long long)iblock);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -216,10 +208,9 @@ bail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ocfs2_read_inline_data(struct inode *inode, struct page *page,</div><div class='add'>+int ocfs2_read_inline_data(struct inode *inode, struct folio *folio,</div><div class='ctx'> 			   struct buffer_head *di_bh)</div><div class='ctx'> {</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	loff_t size;</div><div class='ctx'> 	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh-&gt;b_data;</div><div class='ctx'> </div><div class='hunk'>@@ -231,7 +222,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page,</div><div class='ctx'> </div><div class='ctx'> 	size = i_size_read(inode);</div><div class='ctx'> </div><div class='del'>-	if (size &gt; PAGE_SIZE ||</div><div class='add'>+	if (size &gt; folio_size(folio) ||</div><div class='ctx'> 	    size &gt; ocfs2_max_inline_data_with_xattr(inode-&gt;i_sb, di)) {</div><div class='ctx'> 		ocfs2_error(inode-&gt;i_sb,</div><div class='ctx'> 			    "Inode %llu has with inline data has bad size: %Lu\n",</div><div class='hunk'>@@ -240,25 +231,18 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page,</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(page);</div><div class='del'>-	if (size)</div><div class='del'>-		memcpy(kaddr, di-&gt;id2.i_data.id_data, size);</div><div class='del'>-	/* Clear the remaining part of the page */</div><div class='del'>-	memset(kaddr + size, 0, PAGE_SIZE - size);</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='del'>-</div><div class='del'>-	SetPageUptodate(page);</div><div class='add'>+	folio_fill_tail(folio, 0, di-&gt;id2.i_data.id_data, size);</div><div class='add'>+	folio_mark_uptodate(folio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_readpage_inline(struct inode *inode, struct page *page)</div><div class='add'>+static int ocfs2_readpage_inline(struct inode *inode, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct buffer_head *di_bh = NULL;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='add'>+	BUG_ON(!folio_test_locked(folio));</div><div class='ctx'> 	BUG_ON(!(OCFS2_I(inode)-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL));</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_read_inode_block(inode, &amp;di_bh);</div><div class='hunk'>@@ -267,9 +251,9 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ocfs2_read_inline_data(inode, page, di_bh);</div><div class='add'>+	ret = ocfs2_read_inline_data(inode, folio, di_bh);</div><div class='ctx'> out:</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='ctx'> </div><div class='ctx'> 	brelse(di_bh);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -284,7 +268,7 @@ static int ocfs2_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_readpage((unsigned long long)oi-&gt;ip_blkno, folio-&gt;index);</div><div class='ctx'> </div><div class='del'>-	ret = ocfs2_inode_lock_with_page(inode, NULL, 0, &amp;folio-&gt;page);</div><div class='add'>+	ret = ocfs2_inode_lock_with_folio(inode, NULL, 0, folio);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		if (ret == AOP_TRUNCATED_PAGE)</div><div class='ctx'> 			unlock = 0;</div><div class='hunk'>@@ -306,7 +290,7 @@ static int ocfs2_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * i_size might have just been updated as we grabed the meta lock.  We</div><div class='add'>+	 * i_size might have just been updated as we grabbed the meta lock.  We</div><div class='ctx'> 	 * might now be discovering a truncate that hit on another node.</div><div class='ctx'> 	 * block_read_full_folio-&gt;get_block freaks out if it is asked to read</div><div class='ctx'> 	 * beyond the end of a file, so we check here.  Callers</div><div class='hunk'>@@ -323,7 +307,7 @@ static int ocfs2_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (oi-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL)</div><div class='del'>-		ret = ocfs2_readpage_inline(inode, &amp;folio-&gt;page);</div><div class='add'>+		ret = ocfs2_readpage_inline(inode, folio);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = block_read_full_folio(folio, ocfs2_get_block);</div><div class='ctx'> 	unlock = 0;</div><div class='hunk'>@@ -535,7 +519,7 @@ static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,</div><div class='ctx'>  *</div><div class='ctx'>  * from == to == 0 is code for "zero the entire cluster region"</div><div class='ctx'>  */</div><div class='del'>-static void ocfs2_clear_page_regions(struct page *page,</div><div class='add'>+static void ocfs2_clear_folio_regions(struct folio *folio,</div><div class='ctx'> 				     struct ocfs2_super *osb, u32 cpos,</div><div class='ctx'> 				     unsigned from, unsigned to)</div><div class='ctx'> {</div><div class='hunk'>@@ -544,7 +528,7 @@ static void ocfs2_clear_page_regions(struct page *page,</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_figure_cluster_boundaries(osb, cpos, &amp;cluster_start, &amp;cluster_end);</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(page);</div><div class='add'>+	kaddr = kmap_local_folio(folio, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (from || to) {</div><div class='ctx'> 		if (from &gt; cluster_start)</div><div class='hunk'>@@ -555,13 +539,13 @@ static void ocfs2_clear_page_regions(struct page *page,</div><div class='ctx'> 		memset(kaddr + cluster_start, 0, cluster_end - cluster_start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	kunmap_local(kaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Nonsparse file systems fully allocate before we get to the write</div><div class='ctx'>  * code. This prevents ocfs2_write() from tagging the write as an</div><div class='del'>- * allocating one, which means ocfs2_map_page_blocks() might try to</div><div class='add'>+ * allocating one, which means ocfs2_map_folio_blocks() might try to</div><div class='ctx'>  * read-in the blocks at the tail of our file. Avoid reading them by</div><div class='ctx'>  * testing i_size against each block offset.</div><div class='ctx'>  */</div><div class='hunk'>@@ -586,11 +570,10 @@ static int ocfs2_should_read_blk(struct inode *inode, struct folio *folio,</div><div class='ctx'>  *</div><div class='ctx'>  * This will also skip zeroing, which is handled externally.</div><div class='ctx'>  */</div><div class='del'>-int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,</div><div class='add'>+int ocfs2_map_folio_blocks(struct folio *folio, u64 *p_blkno,</div><div class='ctx'> 			  struct inode *inode, unsigned int from,</div><div class='ctx'> 			  unsigned int to, int new)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct buffer_head *head, *bh, *wait[2], **wait_bh = wait;</div><div class='ctx'> 	unsigned int block_end, block_start;</div><div class='hunk'>@@ -730,24 +713,24 @@ struct ocfs2_write_ctxt {</div><div class='ctx'> 	unsigned int			w_large_pages;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Pages involved in this write.</div><div class='add'>+	 * Folios involved in this write.</div><div class='ctx'> 	 *</div><div class='del'>-	 * w_target_page is the page being written to by the user.</div><div class='add'>+	 * w_target_folio is the folio being written to by the user.</div><div class='ctx'> 	 *</div><div class='del'>-	 * w_pages is an array of pages which always contains</div><div class='del'>-	 * w_target_page, and in the case of an allocating write with</div><div class='add'>+	 * w_folios is an array of folios which always contains</div><div class='add'>+	 * w_target_folio, and in the case of an allocating write with</div><div class='ctx'> 	 * page_size &lt; cluster size, it will contain zero'd and mapped</div><div class='del'>-	 * pages adjacent to w_target_page which need to be written</div><div class='add'>+	 * pages adjacent to w_target_folio which need to be written</div><div class='ctx'> 	 * out in so that future reads from that region will get</div><div class='ctx'> 	 * zero's.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int			w_num_pages;</div><div class='del'>-	struct page			*w_pages[OCFS2_MAX_CTXT_PAGES];</div><div class='del'>-	struct page			*w_target_page;</div><div class='add'>+	unsigned int			w_num_folios;</div><div class='add'>+	struct folio			*w_folios[OCFS2_MAX_CTXT_PAGES];</div><div class='add'>+	struct folio			*w_target_folio;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * w_target_locked is used for page_mkwrite path indicating no unlocking</div><div class='del'>-	 * against w_target_page in ocfs2_write_end_nolock.</div><div class='add'>+	 * against w_target_folio in ocfs2_write_end_nolock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int			w_target_locked:1;</div><div class='ctx'> </div><div class='hunk'>@@ -772,40 +755,40 @@ struct ocfs2_write_ctxt {</div><div class='ctx'> 	unsigned int			w_unwritten_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages)</div><div class='add'>+void ocfs2_unlock_and_free_folios(struct folio **folios, int num_folios)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; num_pages; i++) {</div><div class='del'>-		if (pages[i]) {</div><div class='del'>-			unlock_page(pages[i]);</div><div class='del'>-			mark_page_accessed(pages[i]);</div><div class='del'>-			put_page(pages[i]);</div><div class='del'>-		}</div><div class='add'>+	for(i = 0; i &lt; num_folios; i++) {</div><div class='add'>+		if (!folios[i])</div><div class='add'>+			continue;</div><div class='add'>+		folio_unlock(folios[i]);</div><div class='add'>+		folio_mark_accessed(folios[i]);</div><div class='add'>+		folio_put(folios[i]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ocfs2_unlock_pages(struct ocfs2_write_ctxt *wc)</div><div class='add'>+static void ocfs2_unlock_folios(struct ocfs2_write_ctxt *wc)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * w_target_locked is only set to true in the page_mkwrite() case.</div><div class='ctx'> 	 * The intent is to allow us to lock the target page from write_begin()</div><div class='del'>-	 * to write_end(). The caller must hold a ref on w_target_page.</div><div class='add'>+	 * to write_end(). The caller must hold a ref on w_target_folio.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (wc-&gt;w_target_locked) {</div><div class='del'>-		BUG_ON(!wc-&gt;w_target_page);</div><div class='del'>-		for (i = 0; i &lt; wc-&gt;w_num_pages; i++) {</div><div class='del'>-			if (wc-&gt;w_target_page == wc-&gt;w_pages[i]) {</div><div class='del'>-				wc-&gt;w_pages[i] = NULL;</div><div class='add'>+		BUG_ON(!wc-&gt;w_target_folio);</div><div class='add'>+		for (i = 0; i &lt; wc-&gt;w_num_folios; i++) {</div><div class='add'>+			if (wc-&gt;w_target_folio == wc-&gt;w_folios[i]) {</div><div class='add'>+				wc-&gt;w_folios[i] = NULL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		mark_page_accessed(wc-&gt;w_target_page);</div><div class='del'>-		put_page(wc-&gt;w_target_page);</div><div class='add'>+		folio_mark_accessed(wc-&gt;w_target_folio);</div><div class='add'>+		folio_put(wc-&gt;w_target_folio);</div><div class='ctx'> 	}</div><div class='del'>-	ocfs2_unlock_and_free_pages(wc-&gt;w_pages, wc-&gt;w_num_pages);</div><div class='add'>+	ocfs2_unlock_and_free_folios(wc-&gt;w_folios, wc-&gt;w_num_folios);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ocfs2_free_unwritten_list(struct inode *inode,</div><div class='hunk'>@@ -827,7 +810,7 @@ static void ocfs2_free_write_ctxt(struct inode *inode,</div><div class='ctx'> 				  struct ocfs2_write_ctxt *wc)</div><div class='ctx'> {</div><div class='ctx'> 	ocfs2_free_unwritten_list(inode, &amp;wc-&gt;w_unwritten_list);</div><div class='del'>-	ocfs2_unlock_pages(wc);</div><div class='add'>+	ocfs2_unlock_folios(wc);</div><div class='ctx'> 	brelse(wc-&gt;w_di_bh);</div><div class='ctx'> 	kfree(wc);</div><div class='ctx'> }</div><div class='hunk'>@@ -870,29 +853,30 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,</div><div class='ctx'>  * and dirty so they'll be written out (in order to prevent uninitialised</div><div class='ctx'>  * block data from leaking). And clear the new bit.</div><div class='ctx'>  */</div><div class='del'>-static void ocfs2_zero_new_buffers(struct page *page, unsigned from, unsigned to)</div><div class='add'>+static void ocfs2_zero_new_buffers(struct folio *folio, size_t from, size_t to)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int block_start, block_end;</div><div class='ctx'> 	struct buffer_head *head, *bh;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	if (!page_has_buffers(page))</div><div class='add'>+	BUG_ON(!folio_test_locked(folio));</div><div class='add'>+	head = folio_buffers(folio);</div><div class='add'>+	if (!head)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bh = head = page_buffers(page);</div><div class='add'>+	bh = head;</div><div class='ctx'> 	block_start = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		block_end = block_start + bh-&gt;b_size;</div><div class='ctx'> </div><div class='ctx'> 		if (buffer_new(bh)) {</div><div class='ctx'> 			if (block_end &gt; from &amp;&amp; block_start &lt; to) {</div><div class='del'>-				if (!PageUptodate(page)) {</div><div class='add'>+				if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 					unsigned start, end;</div><div class='ctx'> </div><div class='ctx'> 					start = max(from, block_start);</div><div class='ctx'> 					end = min(to, block_end);</div><div class='ctx'> </div><div class='del'>-					zero_user_segment(page, start, end);</div><div class='add'>+					folio_zero_segment(folio, start, end);</div><div class='ctx'> 					set_buffer_uptodate(bh);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -917,29 +901,26 @@ static void ocfs2_write_failure(struct inode *inode,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned from = user_pos &amp; (PAGE_SIZE - 1),</div><div class='ctx'> 		to = user_pos + user_len;</div><div class='del'>-	struct page *tmppage;</div><div class='ctx'> </div><div class='del'>-	if (wc-&gt;w_target_page)</div><div class='del'>-		ocfs2_zero_new_buffers(wc-&gt;w_target_page, from, to);</div><div class='add'>+	if (wc-&gt;w_target_folio)</div><div class='add'>+		ocfs2_zero_new_buffers(wc-&gt;w_target_folio, from, to);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; wc-&gt;w_num_pages; i++) {</div><div class='del'>-		tmppage = wc-&gt;w_pages[i];</div><div class='add'>+	for (i = 0; i &lt; wc-&gt;w_num_folios; i++) {</div><div class='add'>+		struct folio *folio = wc-&gt;w_folios[i];</div><div class='ctx'> </div><div class='del'>-		if (tmppage &amp;&amp; page_has_buffers(tmppage)) {</div><div class='add'>+		if (folio &amp;&amp; folio_buffers(folio)) {</div><div class='ctx'> 			if (ocfs2_should_order_data(inode))</div><div class='ctx'> 				ocfs2_jbd2_inode_add_write(wc-&gt;w_handle, inode,</div><div class='ctx'> 							   user_pos, user_len);</div><div class='ctx'> </div><div class='del'>-			block_commit_write(tmppage, from, to);</div><div class='add'>+			block_commit_write(folio, from, to);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,</div><div class='del'>-					struct ocfs2_write_ctxt *wc,</div><div class='del'>-					struct page *page, u32 cpos,</div><div class='del'>-					loff_t user_pos, unsigned user_len,</div><div class='del'>-					int new)</div><div class='add'>+static int ocfs2_prepare_folio_for_write(struct inode *inode, u64 *p_blkno,</div><div class='add'>+		struct ocfs2_write_ctxt *wc, struct folio *folio, u32 cpos,</div><div class='add'>+		loff_t user_pos, unsigned user_len, int new)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned int map_from = 0, map_to = 0;</div><div class='hunk'>@@ -952,20 +933,19 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,</div><div class='ctx'> 	/* treat the write as new if the a hole/lseek spanned across</div><div class='ctx'> 	 * the page boundary.</div><div class='ctx'> 	 */</div><div class='del'>-	new = new | ((i_size_read(inode) &lt;= page_offset(page)) &amp;&amp;</div><div class='del'>-			(page_offset(page) &lt;= user_pos));</div><div class='add'>+	new = new | ((i_size_read(inode) &lt;= folio_pos(folio)) &amp;&amp;</div><div class='add'>+			(folio_pos(folio) &lt;= user_pos));</div><div class='ctx'> </div><div class='del'>-	if (page == wc-&gt;w_target_page) {</div><div class='add'>+	if (folio == wc-&gt;w_target_folio) {</div><div class='ctx'> 		map_from = user_pos &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 		map_to = map_from + user_len;</div><div class='ctx'> </div><div class='ctx'> 		if (new)</div><div class='del'>-			ret = ocfs2_map_page_blocks(page, p_blkno, inode,</div><div class='del'>-						    cluster_start, cluster_end,</div><div class='del'>-						    new);</div><div class='add'>+			ret = ocfs2_map_folio_blocks(folio, p_blkno, inode,</div><div class='add'>+					cluster_start, cluster_end, new);</div><div class='ctx'> 		else</div><div class='del'>-			ret = ocfs2_map_page_blocks(page, p_blkno, inode,</div><div class='del'>-						    map_from, map_to, new);</div><div class='add'>+			ret = ocfs2_map_folio_blocks(folio, p_blkno, inode,</div><div class='add'>+					map_from, map_to, new);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			mlog_errno(ret);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -979,7 +959,7 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='del'>-		 * If we haven't allocated the new page yet, we</div><div class='add'>+		 * If we haven't allocated the new folio yet, we</div><div class='ctx'> 		 * shouldn't be writing it out without copying user</div><div class='ctx'> 		 * data. This is likely a math error from the caller.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -988,8 +968,8 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,</div><div class='ctx'> 		map_from = cluster_start;</div><div class='ctx'> 		map_to = cluster_end;</div><div class='ctx'> </div><div class='del'>-		ret = ocfs2_map_page_blocks(page, p_blkno, inode,</div><div class='del'>-					    cluster_start, cluster_end, new);</div><div class='add'>+		ret = ocfs2_map_folio_blocks(folio, p_blkno, inode,</div><div class='add'>+				cluster_start, cluster_end, new);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			mlog_errno(ret);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -997,20 +977,20 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Parts of newly allocated pages need to be zero'd.</div><div class='add'>+	 * Parts of newly allocated folios need to be zero'd.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Above, we have also rewritten 'to' and 'from' - as far as</div><div class='ctx'> 	 * the rest of the function is concerned, the entire cluster</div><div class='del'>-	 * range inside of a page needs to be written.</div><div class='add'>+	 * range inside of a folio needs to be written.</div><div class='ctx'> 	 *</div><div class='del'>-	 * We can skip this if the page is up to date - it's already</div><div class='add'>+	 * We can skip this if the folio is uptodate - it's already</div><div class='ctx'> 	 * been zero'd from being read in as a hole.</div><div class='ctx'> 	 */</div><div class='del'>-	if (new &amp;&amp; !PageUptodate(page))</div><div class='del'>-		ocfs2_clear_page_regions(page, OCFS2_SB(inode-&gt;i_sb),</div><div class='add'>+	if (new &amp;&amp; !folio_test_uptodate(folio))</div><div class='add'>+		ocfs2_clear_folio_regions(folio, OCFS2_SB(inode-&gt;i_sb),</div><div class='ctx'> 					 cpos, user_data_from, user_data_to);</div><div class='ctx'> </div><div class='del'>-	flush_dcache_page(page);</div><div class='add'>+	flush_dcache_folio(folio);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1019,11 +999,9 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * This function will only grab one clusters worth of pages.</div><div class='ctx'>  */</div><div class='del'>-static int ocfs2_grab_pages_for_write(struct address_space *mapping,</div><div class='del'>-				      struct ocfs2_write_ctxt *wc,</div><div class='del'>-				      u32 cpos, loff_t user_pos,</div><div class='del'>-				      unsigned user_len, int new,</div><div class='del'>-				      struct page *mmap_page)</div><div class='add'>+static int ocfs2_grab_folios_for_write(struct address_space *mapping,</div><div class='add'>+		struct ocfs2_write_ctxt *wc, u32 cpos, loff_t user_pos,</div><div class='add'>+		unsigned user_len, int new, struct folio *mmap_folio)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> 	unsigned long start, target_index, end_index, index;</div><div class='hunk'>@@ -1040,7 +1018,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,</div><div class='ctx'> 	 * last page of the write.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (new) {</div><div class='del'>-		wc-&gt;w_num_pages = ocfs2_pages_per_cluster(inode-&gt;i_sb);</div><div class='add'>+		wc-&gt;w_num_folios = ocfs2_pages_per_cluster(inode-&gt;i_sb);</div><div class='ctx'> 		start = ocfs2_align_clusters_to_page_index(inode-&gt;i_sb, cpos);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need the index *past* the last page we could possibly</div><div class='hunk'>@@ -1050,15 +1028,15 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,</div><div class='ctx'> 		last_byte = max(user_pos + user_len, i_size_read(inode));</div><div class='ctx'> 		BUG_ON(last_byte &lt; 1);</div><div class='ctx'> 		end_index = ((last_byte - 1) &gt;&gt; PAGE_SHIFT) + 1;</div><div class='del'>-		if ((start + wc-&gt;w_num_pages) &gt; end_index)</div><div class='del'>-			wc-&gt;w_num_pages = end_index - start;</div><div class='add'>+		if ((start + wc-&gt;w_num_folios) &gt; end_index)</div><div class='add'>+			wc-&gt;w_num_folios = end_index - start;</div><div class='ctx'> 	} else {</div><div class='del'>-		wc-&gt;w_num_pages = 1;</div><div class='add'>+		wc-&gt;w_num_folios = 1;</div><div class='ctx'> 		start = target_index;</div><div class='ctx'> 	}</div><div class='ctx'> 	end_index = (user_pos + user_len - 1) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; wc-&gt;w_num_pages; i++) {</div><div class='add'>+	for(i = 0; i &lt; wc-&gt;w_num_folios; i++) {</div><div class='ctx'> 		index = start + i;</div><div class='ctx'> </div><div class='ctx'> 		if (index &gt;= target_index &amp;&amp; index &lt;= end_index &amp;&amp;</div><div class='hunk'>@@ -1068,37 +1046,39 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,</div><div class='ctx'> 			 * and wants us to directly use the page</div><div class='ctx'> 			 * passed in.</div><div class='ctx'> 			 */</div><div class='del'>-			lock_page(mmap_page);</div><div class='add'>+			folio_lock(mmap_folio);</div><div class='ctx'> </div><div class='ctx'> 			/* Exit and let the caller retry */</div><div class='del'>-			if (mmap_page-&gt;mapping != mapping) {</div><div class='del'>-				WARN_ON(mmap_page-&gt;mapping);</div><div class='del'>-				unlock_page(mmap_page);</div><div class='add'>+			if (mmap_folio-&gt;mapping != mapping) {</div><div class='add'>+				WARN_ON(mmap_folio-&gt;mapping);</div><div class='add'>+				folio_unlock(mmap_folio);</div><div class='ctx'> 				ret = -EAGAIN;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			get_page(mmap_page);</div><div class='del'>-			wc-&gt;w_pages[i] = mmap_page;</div><div class='add'>+			folio_get(mmap_folio);</div><div class='add'>+			wc-&gt;w_folios[i] = mmap_folio;</div><div class='ctx'> 			wc-&gt;w_target_locked = true;</div><div class='ctx'> 		} else if (index &gt;= target_index &amp;&amp; index &lt;= end_index &amp;&amp;</div><div class='ctx'> 			   wc-&gt;w_type == OCFS2_WRITE_DIRECT) {</div><div class='ctx'> 			/* Direct write has no mapping page. */</div><div class='del'>-			wc-&gt;w_pages[i] = NULL;</div><div class='add'>+			wc-&gt;w_folios[i] = NULL;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		} else {</div><div class='del'>-			wc-&gt;w_pages[i] = find_or_create_page(mapping, index,</div><div class='del'>-							     GFP_NOFS);</div><div class='del'>-			if (!wc-&gt;w_pages[i]) {</div><div class='del'>-				ret = -ENOMEM;</div><div class='add'>+			wc-&gt;w_folios[i] = __filemap_get_folio(mapping, index,</div><div class='add'>+					FGP_LOCK | FGP_ACCESSED | FGP_CREAT,</div><div class='add'>+					GFP_NOFS);</div><div class='add'>+			if (IS_ERR(wc-&gt;w_folios[i])) {</div><div class='add'>+				ret = PTR_ERR(wc-&gt;w_folios[i]);</div><div class='ctx'> 				mlog_errno(ret);</div><div class='add'>+				wc-&gt;w_folios[i] = NULL;</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		wait_for_stable_page(wc-&gt;w_pages[i]);</div><div class='add'>+		folio_wait_stable(wc-&gt;w_folios[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (index == target_index)</div><div class='del'>-			wc-&gt;w_target_page = wc-&gt;w_pages[i];</div><div class='add'>+			wc-&gt;w_target_folio = wc-&gt;w_folios[i];</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1182,19 +1162,18 @@ static int ocfs2_write_cluster(struct address_space *mapping,</div><div class='ctx'> 	if (!should_zero)</div><div class='ctx'> 		p_blkno += (user_pos &gt;&gt; inode-&gt;i_sb-&gt;s_blocksize_bits) &amp; (u64)(bpc - 1);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; wc-&gt;w_num_pages; i++) {</div><div class='add'>+	for (i = 0; i &lt; wc-&gt;w_num_folios; i++) {</div><div class='ctx'> 		int tmpret;</div><div class='ctx'> </div><div class='ctx'> 		/* This is the direct io target page. */</div><div class='del'>-		if (wc-&gt;w_pages[i] == NULL) {</div><div class='del'>-			p_blkno++;</div><div class='add'>+		if (wc-&gt;w_folios[i] == NULL) {</div><div class='add'>+			p_blkno += (1 &lt;&lt; (PAGE_SHIFT - inode-&gt;i_sb-&gt;s_blocksize_bits));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tmpret = ocfs2_prepare_page_for_write(inode, &amp;p_blkno, wc,</div><div class='del'>-						      wc-&gt;w_pages[i], cpos,</div><div class='del'>-						      user_pos, user_len,</div><div class='del'>-						      should_zero);</div><div class='add'>+		tmpret = ocfs2_prepare_folio_for_write(inode, &amp;p_blkno, wc,</div><div class='add'>+				wc-&gt;w_folios[i], cpos, user_pos, user_len,</div><div class='add'>+				should_zero);</div><div class='ctx'> 		if (tmpret) {</div><div class='ctx'> 			mlog_errno(tmpret);</div><div class='ctx'> 			if (ret == 0)</div><div class='hunk'>@@ -1473,7 +1452,7 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(inode-&gt;i_sb);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc-&gt;w_di_bh-&gt;b_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1484,19 +1463,21 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page = find_or_create_page(mapping, 0, GFP_NOFS);</div><div class='del'>-	if (!page) {</div><div class='add'>+	folio = __filemap_get_folio(mapping, 0,</div><div class='add'>+			FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='ctx'> 		ocfs2_commit_trans(osb, handle);</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	 * If we don't set w_num_pages then this page won't get unlocked</div><div class='add'>+	 * If we don't set w_num_folios then this folio won't get unlocked</div><div class='ctx'> 	 * and freed on cleanup of the write context.</div><div class='ctx'> 	 */</div><div class='del'>-	wc-&gt;w_pages[0] = wc-&gt;w_target_page = page;</div><div class='del'>-	wc-&gt;w_num_pages = 1;</div><div class='add'>+	wc-&gt;w_target_folio = folio;</div><div class='add'>+	wc-&gt;w_folios[0] = folio;</div><div class='add'>+	wc-&gt;w_num_folios = 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc-&gt;w_di_bh,</div><div class='ctx'> 				      OCFS2_JOURNAL_ACCESS_WRITE);</div><div class='hunk'>@@ -1510,8 +1491,8 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,</div><div class='ctx'> 	if (!(OCFS2_I(inode)-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL))</div><div class='ctx'> 		ocfs2_set_inode_data_inline(inode, di);</div><div class='ctx'> </div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='del'>-		ret = ocfs2_read_inline_data(inode, page, wc-&gt;w_di_bh);</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='add'>+		ret = ocfs2_read_inline_data(inode, folio, wc-&gt;w_di_bh);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ocfs2_commit_trans(osb, handle);</div><div class='ctx'> </div><div class='hunk'>@@ -1534,9 +1515,8 @@ int ocfs2_size_fits_inline_data(struct buffer_head *di_bh, u64 new_size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ocfs2_try_to_write_inline_data(struct address_space *mapping,</div><div class='del'>-					  struct inode *inode, loff_t pos,</div><div class='del'>-					  unsigned len, struct page *mmap_page,</div><div class='del'>-					  struct ocfs2_write_ctxt *wc)</div><div class='add'>+		struct inode *inode, loff_t pos, size_t len,</div><div class='add'>+		struct folio *mmap_folio, struct ocfs2_write_ctxt *wc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, written = 0;</div><div class='ctx'> 	loff_t end = pos + len;</div><div class='hunk'>@@ -1551,7 +1531,7 @@ static int ocfs2_try_to_write_inline_data(struct address_space *mapping,</div><div class='ctx'> 	 * Handle inodes which already have inline data 1st.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (oi-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL) {</div><div class='del'>-		if (mmap_page == NULL &amp;&amp;</div><div class='add'>+		if (mmap_folio == NULL &amp;&amp;</div><div class='ctx'> 		    ocfs2_size_fits_inline_data(wc-&gt;w_di_bh, end))</div><div class='ctx'> 			goto do_inline_write;</div><div class='ctx'> </div><div class='hunk'>@@ -1575,7 +1555,7 @@ static int ocfs2_try_to_write_inline_data(struct address_space *mapping,</div><div class='ctx'> 	 * Check whether the write can fit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	di = (struct ocfs2_dinode *)wc-&gt;w_di_bh-&gt;b_data;</div><div class='del'>-	if (mmap_page ||</div><div class='add'>+	if (mmap_folio ||</div><div class='ctx'> 	    end &gt; ocfs2_max_inline_data_with_xattr(inode-&gt;i_sb, di))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1642,9 +1622,9 @@ static int ocfs2_zero_tail(struct inode *inode, struct buffer_head *di_bh,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_write_begin_nolock(struct address_space *mapping,</div><div class='del'>-			     loff_t pos, unsigned len, ocfs2_write_type_t type,</div><div class='del'>-			     struct page **pagep, void **fsdata,</div><div class='del'>-			     struct buffer_head *di_bh, struct page *mmap_page)</div><div class='add'>+		loff_t pos, unsigned len, ocfs2_write_type_t type,</div><div class='add'>+		struct folio **foliop, void **fsdata,</div><div class='add'>+		struct buffer_head *di_bh, struct folio *mmap_folio)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, cluster_of_pages, credits = OCFS2_INODE_UPDATE_CREDITS;</div><div class='ctx'> 	unsigned int clusters_to_alloc, extents_to_split, clusters_need = 0;</div><div class='hunk'>@@ -1667,7 +1647,7 @@ try_again:</div><div class='ctx'> </div><div class='ctx'> 	if (ocfs2_supports_inline_data(osb)) {</div><div class='ctx'> 		ret = ocfs2_try_to_write_inline_data(mapping, inode, pos, len,</div><div class='del'>-						     mmap_page, wc);</div><div class='add'>+						     mmap_folio, wc);</div><div class='ctx'> 		if (ret == 1) {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto success;</div><div class='hunk'>@@ -1719,7 +1699,7 @@ try_again:</div><div class='ctx'> 			(unsigned long long)OCFS2_I(inode)-&gt;ip_blkno,</div><div class='ctx'> 			(long long)i_size_read(inode),</div><div class='ctx'> 			le32_to_cpu(di-&gt;i_clusters),</div><div class='del'>-			pos, len, type, mmap_page,</div><div class='add'>+			pos, len, type, mmap_folio,</div><div class='ctx'> 			clusters_to_alloc, extents_to_split);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1790,21 +1770,21 @@ try_again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Fill our page array first. That way we've grabbed enough so</div><div class='add'>+	 * Fill our folio array first. That way we've grabbed enough so</div><div class='ctx'> 	 * that we can zero and flush if we error after adding the</div><div class='ctx'> 	 * extent.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ocfs2_grab_pages_for_write(mapping, wc, wc-&gt;w_cpos, pos, len,</div><div class='del'>-					 cluster_of_pages, mmap_page);</div><div class='add'>+	ret = ocfs2_grab_folios_for_write(mapping, wc, wc-&gt;w_cpos, pos, len,</div><div class='add'>+			cluster_of_pages, mmap_folio);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * ocfs2_grab_pages_for_write() returns -EAGAIN if it could not lock</div><div class='del'>-		 * the target page. In this case, we exit with no error and no target</div><div class='del'>-		 * page. This will trigger the caller, page_mkwrite(), to re-try</div><div class='del'>-		 * the operation.</div><div class='add'>+		 * ocfs2_grab_folios_for_write() returns -EAGAIN if it</div><div class='add'>+		 * could not lock the target folio. In this case, we exit</div><div class='add'>+		 * with no error and no target folio. This will trigger</div><div class='add'>+		 * the caller, page_mkwrite(), to re-try the operation.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (type == OCFS2_WRITE_MMAP &amp;&amp; ret == -EAGAIN) {</div><div class='del'>-			BUG_ON(wc-&gt;w_target_page);</div><div class='add'>+			BUG_ON(wc-&gt;w_target_folio);</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto out_quota;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1826,8 +1806,8 @@ try_again:</div><div class='ctx'> 		ocfs2_free_alloc_context(meta_ac);</div><div class='ctx'> </div><div class='ctx'> success:</div><div class='del'>-	if (pagep)</div><div class='del'>-		*pagep = wc-&gt;w_target_page;</div><div class='add'>+	if (foliop)</div><div class='add'>+		*foliop = wc-&gt;w_target_folio;</div><div class='ctx'> 	*fsdata = wc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_quota:</div><div class='hunk'>@@ -1846,7 +1826,7 @@ out:</div><div class='ctx'> 	 * to VM code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (wc-&gt;w_target_locked)</div><div class='del'>-		unlock_page(mmap_page);</div><div class='add'>+		folio_unlock(mmap_folio);</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_free_write_ctxt(inode, wc);</div><div class='ctx'> </div><div class='hunk'>@@ -1877,9 +1857,10 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_write_begin(struct file *file, struct address_space *mapping,</div><div class='add'>+static int ocfs2_write_begin(const struct kiocb *iocb,</div><div class='add'>+			     struct address_space *mapping,</div><div class='ctx'> 			     loff_t pos, unsigned len,</div><div class='del'>-			     struct page **pagep, void **fsdata)</div><div class='add'>+			     struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct buffer_head *di_bh = NULL;</div><div class='hunk'>@@ -1901,7 +1882,7 @@ static int ocfs2_write_begin(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	down_write(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_BUFFER,</div><div class='del'>-				       pagep, fsdata, di_bh, NULL);</div><div class='add'>+				       foliop, fsdata, di_bh, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> 		goto out_fail;</div><div class='hunk'>@@ -1925,18 +1906,15 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos,</div><div class='ctx'> 				   struct ocfs2_dinode *di,</div><div class='ctx'> 				   struct ocfs2_write_ctxt *wc)</div><div class='ctx'> {</div><div class='del'>-	void *kaddr;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(*copied &lt; len)) {</div><div class='del'>-		if (!PageUptodate(wc-&gt;w_target_page)) {</div><div class='add'>+		if (!folio_test_uptodate(wc-&gt;w_target_folio)) {</div><div class='ctx'> 			*copied = 0;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kaddr = kmap_atomic(wc-&gt;w_target_page);</div><div class='del'>-	memcpy(di-&gt;id2.i_data.id_data + pos, kaddr + pos, *copied);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='add'>+	memcpy_from_folio(di-&gt;id2.i_data.id_data + pos, wc-&gt;w_target_folio,</div><div class='add'>+			pos, *copied);</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_write_end_inline(</div><div class='ctx'> 	     (unsigned long long)OCFS2_I(inode)-&gt;ip_blkno,</div><div class='hunk'>@@ -1945,17 +1923,16 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos,</div><div class='ctx'> 	     le16_to_cpu(di-&gt;i_dyn_features));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ocfs2_write_end_nolock(struct address_space *mapping,</div><div class='del'>-			   loff_t pos, unsigned len, unsigned copied, void *fsdata)</div><div class='add'>+int ocfs2_write_end_nolock(struct address_space *mapping, loff_t pos,</div><div class='add'>+		unsigned len, unsigned copied, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	unsigned from, to, start = pos &amp; (PAGE_SIZE - 1);</div><div class='add'>+	size_t from, to, start = pos &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(inode-&gt;i_sb);</div><div class='ctx'> 	struct ocfs2_write_ctxt *wc = fsdata;</div><div class='ctx'> 	struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc-&gt;w_di_bh-&gt;b_data;</div><div class='ctx'> 	handle_t *handle = wc-&gt;w_handle;</div><div class='del'>-	struct page *tmppage;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!list_empty(&amp;wc-&gt;w_unwritten_list));</div><div class='ctx'> </div><div class='hunk'>@@ -1974,44 +1951,44 @@ int ocfs2_write_end_nolock(struct address_space *mapping,</div><div class='ctx'> 		goto out_write_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(copied &lt; len) &amp;&amp; wc-&gt;w_target_page) {</div><div class='add'>+	if (unlikely(copied &lt; len) &amp;&amp; wc-&gt;w_target_folio) {</div><div class='ctx'> 		loff_t new_isize;</div><div class='ctx'> </div><div class='del'>-		if (!PageUptodate(wc-&gt;w_target_page))</div><div class='add'>+		if (!folio_test_uptodate(wc-&gt;w_target_folio))</div><div class='ctx'> 			copied = 0;</div><div class='ctx'> </div><div class='ctx'> 		new_isize = max_t(loff_t, i_size_read(inode), pos + copied);</div><div class='del'>-		if (new_isize &gt; page_offset(wc-&gt;w_target_page))</div><div class='del'>-			ocfs2_zero_new_buffers(wc-&gt;w_target_page, start+copied,</div><div class='add'>+		if (new_isize &gt; folio_pos(wc-&gt;w_target_folio))</div><div class='add'>+			ocfs2_zero_new_buffers(wc-&gt;w_target_folio, start+copied,</div><div class='ctx'> 					       start+len);</div><div class='ctx'> 		else {</div><div class='ctx'> 			/*</div><div class='del'>-			 * When page is fully beyond new isize (data copy</div><div class='del'>-			 * failed), do not bother zeroing the page. Invalidate</div><div class='add'>+			 * When folio is fully beyond new isize (data copy</div><div class='add'>+			 * failed), do not bother zeroing the folio. Invalidate</div><div class='ctx'> 			 * it instead so that writeback does not get confused</div><div class='ctx'> 			 * put page &amp; buffer dirty bits into inconsistent</div><div class='ctx'> 			 * state.</div><div class='ctx'> 			 */</div><div class='del'>-			block_invalidate_folio(page_folio(wc-&gt;w_target_page),</div><div class='del'>-						0, PAGE_SIZE);</div><div class='add'>+			block_invalidate_folio(wc-&gt;w_target_folio, 0,</div><div class='add'>+					folio_size(wc-&gt;w_target_folio));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (wc-&gt;w_target_page)</div><div class='del'>-		flush_dcache_page(wc-&gt;w_target_page);</div><div class='add'>+	if (wc-&gt;w_target_folio)</div><div class='add'>+		flush_dcache_folio(wc-&gt;w_target_folio);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; wc-&gt;w_num_pages; i++) {</div><div class='del'>-		tmppage = wc-&gt;w_pages[i];</div><div class='add'>+	for (i = 0; i &lt; wc-&gt;w_num_folios; i++) {</div><div class='add'>+		struct folio *folio = wc-&gt;w_folios[i];</div><div class='ctx'> </div><div class='del'>-		/* This is the direct io target page. */</div><div class='del'>-		if (tmppage == NULL)</div><div class='add'>+		/* This is the direct io target folio */</div><div class='add'>+		if (folio == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (tmppage == wc-&gt;w_target_page) {</div><div class='add'>+		if (folio == wc-&gt;w_target_folio) {</div><div class='ctx'> 			from = wc-&gt;w_target_from;</div><div class='ctx'> 			to = wc-&gt;w_target_to;</div><div class='ctx'> </div><div class='del'>-			BUG_ON(from &gt; PAGE_SIZE ||</div><div class='del'>-			       to &gt; PAGE_SIZE ||</div><div class='add'>+			BUG_ON(from &gt; folio_size(folio) ||</div><div class='add'>+			       to &gt; folio_size(folio) ||</div><div class='ctx'> 			       to &lt; from);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2020,19 +1997,17 @@ int ocfs2_write_end_nolock(struct address_space *mapping,</div><div class='ctx'> 			 * to flush their entire range.</div><div class='ctx'> 			 */</div><div class='ctx'> 			from = 0;</div><div class='del'>-			to = PAGE_SIZE;</div><div class='add'>+			to = folio_size(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (page_has_buffers(tmppage)) {</div><div class='add'>+		if (folio_buffers(folio)) {</div><div class='ctx'> 			if (handle &amp;&amp; ocfs2_should_order_data(inode)) {</div><div class='del'>-				loff_t start_byte =</div><div class='del'>-					((loff_t)tmppage-&gt;index &lt;&lt; PAGE_SHIFT) +</div><div class='del'>-					from;</div><div class='add'>+				loff_t start_byte = folio_pos(folio) + from;</div><div class='ctx'> 				loff_t length = to - from;</div><div class='ctx'> 				ocfs2_jbd2_inode_add_write(handle, inode,</div><div class='ctx'> 							   start_byte, length);</div><div class='ctx'> 			}</div><div class='del'>-			block_commit_write(tmppage, from, to);</div><div class='add'>+			block_commit_write(folio, from, to);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2061,7 +2036,7 @@ out:</div><div class='ctx'> 	 * this lock and will ask for the page lock when flushing the data.</div><div class='ctx'> 	 * put it here to preserve the unlock order.</div><div class='ctx'> 	 */</div><div class='del'>-	ocfs2_unlock_pages(wc);</div><div class='add'>+	ocfs2_unlock_folios(wc);</div><div class='ctx'> </div><div class='ctx'> 	if (handle)</div><div class='ctx'> 		ocfs2_commit_trans(osb, handle);</div><div class='hunk'>@@ -2074,9 +2049,10 @@ out:</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_write_end(struct file *file, struct address_space *mapping,</div><div class='add'>+static int ocfs2_write_end(const struct kiocb *iocb,</div><div class='add'>+			   struct address_space *mapping,</div><div class='ctx'> 			   loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			   struct page *page, void *fsdata)</div><div class='add'>+			   struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='hunk'>@@ -2283,8 +2259,6 @@ unlock:</div><div class='ctx'> 	ocfs2_inode_unlock(inode, 1);</div><div class='ctx'> 	brelse(di_bh);</div><div class='ctx'> out:</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		ret = -EIO;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2368,6 +2342,11 @@ static int ocfs2_dio_end_io_write(struct inode *inode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ue, &amp;dwc-&gt;dw_zero_list, ue_node) {</div><div class='add'>+		ret = ocfs2_assure_trans_credits(handle, credits);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			mlog_errno(ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		ret = ocfs2_mark_extent_written(inode, &amp;et, handle,</div><div class='ctx'> 						ue-&gt;ue_cpos, 1,</div><div class='ctx'> 						ue-&gt;ue_phys,</div><div class='head'>diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h<br/>index 3a520117fa59..114efc9111e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/aops.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/aops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/aops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/aops.h</a></div><div class='hunk'>@@ -8,16 +8,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='del'>-handle_t *ocfs2_start_walk_page_trans(struct inode *inode,</div><div class='del'>-							 struct page *page,</div><div class='del'>-							 unsigned from,</div><div class='del'>-							 unsigned to);</div><div class='del'>-</div><div class='del'>-int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,</div><div class='add'>+int ocfs2_map_folio_blocks(struct folio *folio, u64 *p_blkno,</div><div class='ctx'> 			  struct inode *inode, unsigned int from,</div><div class='ctx'> 			  unsigned int to, int new);</div><div class='ctx'> </div><div class='del'>-void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages);</div><div class='add'>+void ocfs2_unlock_and_free_folios(struct folio **folios, int num_folios);</div><div class='ctx'> </div><div class='ctx'> int walk_page_buffers(	handle_t *handle,</div><div class='ctx'> 			struct buffer_head *head,</div><div class='hunk'>@@ -37,11 +32,11 @@ typedef enum {</div><div class='ctx'> } ocfs2_write_type_t;</div><div class='ctx'> </div><div class='ctx'> int ocfs2_write_begin_nolock(struct address_space *mapping,</div><div class='del'>-			     loff_t pos, unsigned len, ocfs2_write_type_t type,</div><div class='del'>-			     struct page **pagep, void **fsdata,</div><div class='del'>-			     struct buffer_head *di_bh, struct page *mmap_page);</div><div class='add'>+		loff_t pos, unsigned len, ocfs2_write_type_t type,</div><div class='add'>+		struct folio **foliop, void **fsdata,</div><div class='add'>+		struct buffer_head *di_bh, struct folio *mmap_folio);</div><div class='ctx'> </div><div class='del'>-int ocfs2_read_inline_data(struct inode *inode, struct page *page,</div><div class='add'>+int ocfs2_read_inline_data(struct inode *inode, struct folio *folio,</div><div class='ctx'> 			   struct buffer_head *di_bh);</div><div class='ctx'> int ocfs2_size_fits_inline_data(struct buffer_head *di_bh, u64 new_size);</div><div class='ctx'> </div><div class='hunk'>@@ -70,6 +65,8 @@ enum ocfs2_iocb_lock_bits {</div><div class='ctx'> 	OCFS2_IOCB_NUM_LOCKS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ocfs2_iocb_init_rw_locked(iocb) \</div><div class='add'>+	(iocb-&gt;private = NULL)</div><div class='ctx'> #define ocfs2_iocb_clear_rw_locked(iocb) \</div><div class='ctx'> 	clear_bit(OCFS2_IOCB_RW_LOCK, (unsigned long *)&amp;iocb-&gt;private)</div><div class='ctx'> #define ocfs2_iocb_rw_locked_level(iocb) \</div><div class='head'>diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c<br/>index cdb9b9bdea1f..8f714406528d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/buffer_head_io.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/buffer_head_io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/buffer_head_io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/buffer_head_io.c</a></div><div class='hunk'>@@ -235,7 +235,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,</div><div class='ctx'> 		if (bhs[i] == NULL) {</div><div class='ctx'> 			bhs[i] = sb_getblk(sb, block++);</div><div class='ctx'> 			if (bhs[i] == NULL) {</div><div class='del'>-				ocfs2_metadata_cache_io_unlock(ci);</div><div class='ctx'> 				status = -ENOMEM;</div><div class='ctx'> 				mlog_errno(status);</div><div class='ctx'> 				/* Don't forget to put previous bh! */</div><div class='hunk'>@@ -389,7 +388,8 @@ read_failure:</div><div class='ctx'> 		/* Always set the buffer in the cache, even if it was</div><div class='ctx'> 		 * a forced read, or read-ahead which hasn't yet</div><div class='ctx'> 		 * completed. */</div><div class='del'>-		ocfs2_set_buffer_uptodate(ci, bh);</div><div class='add'>+		if (bh)</div><div class='add'>+			ocfs2_set_buffer_uptodate(ci, bh);</div><div class='ctx'> 	}</div><div class='ctx'> 	ocfs2_metadata_cache_io_unlock(ci);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c<br/>index 1bde1281d514..724350925aff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/heartbeat.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/heartbeat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/heartbeat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/cluster/heartbeat.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Copyright (C) 2004, 2005 Oracle.  All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include "linux/kstrtox.h"</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -1020,7 +1021,7 @@ fire_callbacks:</div><div class='ctx'> 	if (list_empty(&amp;slot-&gt;ds_live_item))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* live nodes only go dead after enough consequtive missed</div><div class='add'>+	/* live nodes only go dead after enough consecutive missed</div><div class='ctx'> 	 * samples..  reset the missed counter whenever we see</div><div class='ctx'> 	 * activity */</div><div class='ctx'> 	if (slot-&gt;ds_equal_samples &gt;= o2hb_dead_threshold || gen_changed) {</div><div class='hunk'>@@ -1535,10 +1536,11 @@ static int o2hb_read_block_input(struct o2hb_region *reg,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bytes;</div><div class='ctx'> 	char *p = (char *)page;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	bytes = simple_strtoul(p, &amp;p, 0);</div><div class='del'>-	if (!p || (*p &amp;&amp; (*p != '\n')))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul(p, 0, &amp;bytes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Heartbeat and fs min / max block sizes are the same. */</div><div class='ctx'> 	if (bytes &gt; 4096 || bytes &lt; 512)</div><div class='hunk'>@@ -1622,13 +1624,14 @@ static ssize_t o2hb_region_blocks_store(struct config_item *item,</div><div class='ctx'> 	struct o2hb_region *reg = to_o2hb_region(item);</div><div class='ctx'> 	unsigned long tmp;</div><div class='ctx'> 	char *p = (char *)page;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;hr_bdev_file)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	tmp = simple_strtoul(p, &amp;p, 0);</div><div class='del'>-	if (!p || (*p &amp;&amp; (*p != '\n')))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ret = kstrtoul(p, 0, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (tmp &gt; O2NM_MAX_NODES || tmp == 0)</div><div class='ctx'> 		return -ERANGE;</div><div class='hunk'>@@ -1765,42 +1768,41 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,</div><div class='ctx'> 	long fd;</div><div class='ctx'> 	int sectsize;</div><div class='ctx'> 	char *p = (char *)page;</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	ssize_t ret = -EINVAL;</div><div class='ctx'> 	int live_threshold;</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;hr_bdev_file)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* We can't heartbeat without having had our node number</div><div class='ctx'> 	 * configured yet. */</div><div class='ctx'> 	if (o2nm_this_node() == O2NM_MAX_NODES)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	fd = simple_strtol(p, &amp;p, 0);</div><div class='del'>-	if (!p || (*p &amp;&amp; (*p != '\n')))</div><div class='del'>-		goto out;</div><div class='add'>+	ret = kstrtol(p, 0, &amp;fd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fd &lt; 0 || fd &gt;= INT_MAX)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (f.file == NULL)</div><div class='del'>-		goto out;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (reg-&gt;hr_blocks == 0 || reg-&gt;hr_start_block == 0 ||</div><div class='ctx'> 	    reg-&gt;hr_block_bytes == 0)</div><div class='del'>-		goto out2;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!S_ISBLK(f.file-&gt;f_mapping-&gt;host-&gt;i_mode))</div><div class='del'>-		goto out2;</div><div class='add'>+	if (!S_ISBLK(fd_file(f)-&gt;f_mapping-&gt;host-&gt;i_mode))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	reg-&gt;hr_bdev_file = bdev_file_open_by_dev(f.file-&gt;f_mapping-&gt;host-&gt;i_rdev,</div><div class='add'>+	reg-&gt;hr_bdev_file = bdev_file_open_by_dev(fd_file(f)-&gt;f_mapping-&gt;host-&gt;i_rdev,</div><div class='ctx'> 			BLK_OPEN_WRITE | BLK_OPEN_READ, NULL, NULL);</div><div class='ctx'> 	if (IS_ERR(reg-&gt;hr_bdev_file)) {</div><div class='ctx'> 		ret = PTR_ERR(reg-&gt;hr_bdev_file);</div><div class='ctx'> 		reg-&gt;hr_bdev_file = NULL;</div><div class='del'>-		goto out2;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sectsize = bdev_logical_block_size(reg_bdev(reg));</div><div class='hunk'>@@ -1906,9 +1908,6 @@ out3:</div><div class='ctx'> 		fput(reg-&gt;hr_bdev_file);</div><div class='ctx'> 		reg-&gt;hr_bdev_file = NULL;</div><div class='ctx'> 	}</div><div class='del'>-out2:</div><div class='del'>-	fdput(f);</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2140,10 +2139,11 @@ static ssize_t o2hb_heartbeat_group_dead_threshold_store(struct config_item *ite</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tmp;</div><div class='ctx'> 	char *p = (char *)page;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	tmp = simple_strtoul(p, &amp;p, 10);</div><div class='del'>-	if (!p || (*p &amp;&amp; (*p != '\n')))</div><div class='del'>-                return -EINVAL;</div><div class='add'>+	ret = kstrtoul(p, 10, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* this will validate ranges for us. */</div><div class='ctx'> 	o2hb_dead_threshold_set((unsigned int) tmp);</div><div class='head'>diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h<br/>index b73fc42e46ff..630bd5a3dd0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/masklog.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/masklog.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/masklog.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/cluster/masklog.h</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  * just calling printk() so that this can eventually make its way through</div><div class='ctx'>  * relayfs along with the debugging messages.  Everything else gets KERN_DEBUG.</div><div class='ctx'>  * The inline tests and macro dance give GCC the opportunity to quite cleverly</div><div class='del'>- * only emit the appropriage printk() when the caller passes in a constant</div><div class='add'>+ * only emit the appropriate printk() when the caller passes in a constant</div><div class='ctx'>  * mask, as is almost always the case.</div><div class='ctx'>  *</div><div class='ctx'>  * All this bitmask nonsense is managed from the files under</div><div class='head'>diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c<br/>index 15d0ed9c13e5..bfb8b456876c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/quorum.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/quorum.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/quorum.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/cluster/quorum.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  * race between when we see a node start heartbeating and when we connect</div><div class='ctx'>  * to it.</div><div class='ctx'>  *</div><div class='del'>- * So nodes that are in this transtion put a hold on the quorum decision</div><div class='add'>+ * So nodes that are in this transition put a hold on the quorum decision</div><div class='ctx'>  * with a counter.  As they fall out of this transition they drop the count</div><div class='ctx'>  * and if they're the last, they fire off the decision.</div><div class='ctx'>  */</div><div class='hunk'>@@ -60,7 +60,7 @@ static void o2quo_fence_self(void)</div><div class='ctx'> 	switch (o2nm_single_cluster-&gt;cl_fence_method) {</div><div class='ctx'> 	case O2NM_FENCE_PANIC:</div><div class='ctx'> 		panic("*** ocfs2 is very sorry to be fencing this system by "</div><div class='del'>-		      "panicing ***\n");</div><div class='add'>+		      "panicking ***\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(o2nm_single_cluster-&gt;cl_fence_method &gt;=</div><div class='hunk'>@@ -189,7 +189,7 @@ static void o2quo_clear_hold(struct o2quo_state *qs, u8 node)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* as a node comes up we delay the quorum decision until we know the fate of</div><div class='del'>- * the connection.  the hold will be droped in conn_up or hb_down.  it might be</div><div class='add'>+ * the connection.  the hold will be dropped in conn_up or hb_down.  it might be</div><div class='ctx'>  * perpetuated by con_err until hb_down.  if we already have a conn, we might</div><div class='ctx'>  * be dropping a hold that conn_up got. */</div><div class='ctx'> void o2quo_hb_up(u8 node)</div><div class='hunk'>@@ -256,7 +256,7 @@ void o2quo_hb_still_up(u8 node)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This is analogous to hb_up.  as a node's connection comes up we delay the</div><div class='del'>- * quorum decision until we see it heartbeating.  the hold will be droped in</div><div class='add'>+ * quorum decision until we see it heartbeating.  the hold will be dropped in</div><div class='ctx'>  * hb_up or hb_down.  it might be perpetuated by con_err until hb_down.  if</div><div class='ctx'>  * it's already heartbeating we might be dropping a hold that conn_up got.</div><div class='ctx'>  * */</div><div class='head'>diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c<br/>index 960080753d3b..79b281e32f4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/tcp.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/cluster/tcp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/cluster/tcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/cluster/tcp.c</a></div><div class='hunk'>@@ -5,13 +5,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * ----</div><div class='ctx'>  *</div><div class='del'>- * Callers for this were originally written against a very simple synchronus</div><div class='add'>+ * Callers for this were originally written against a very simple synchronous</div><div class='ctx'>  * API.  This implementation reflects those simple callers.  Some day I'm sure</div><div class='ctx'>  * we'll need to move to a more robust posting/callback mechanism.</div><div class='ctx'>  *</div><div class='ctx'>  * Transmit calls pass in kernel virtual addresses and block copying this into</div><div class='ctx'>  * the socket's tx buffers via a usual blocking sendmsg.  They'll block waiting</div><div class='del'>- * for a failed socket to timeout.  TX callers can also pass in a poniter to an</div><div class='add'>+ * for a failed socket to timeout.  TX callers can also pass in a pointer to an</div><div class='ctx'>  * 'int' which gets filled with an errno off the wire in response to the</div><div class='ctx'>  * message they send.</div><div class='ctx'>  *</div><div class='hunk'>@@ -101,7 +101,7 @@ static struct socket *o2net_listen_sock;</div><div class='ctx'>  * o2net_wq.  teardown detaches the callbacks before destroying the workqueue.</div><div class='ctx'>  * quorum work is queued as sock containers are shutdown.. stop_listening</div><div class='ctx'>  * tears down all the node's sock containers, preventing future shutdowns</div><div class='del'>- * and queued quroum work, before canceling delayed quorum work and</div><div class='add'>+ * and queued quorum work, before canceling delayed quorum work and</div><div class='ctx'>  * destroying the work queue.</div><div class='ctx'>  */</div><div class='ctx'> static struct workqueue_struct *o2net_wq;</div><div class='hunk'>@@ -724,7 +724,7 @@ static void o2net_shutdown_sc(struct work_struct *work)</div><div class='ctx'> 	if (o2net_unregister_callbacks(sc-&gt;sc_sock-&gt;sk, sc)) {</div><div class='ctx'> 		/* we shouldn't flush as we're in the thread, the</div><div class='ctx'> 		 * races with pending sc work structs are harmless */</div><div class='del'>-		del_timer_sync(&amp;sc-&gt;sc_idle_timeout);</div><div class='add'>+		timer_delete_sync(&amp;sc-&gt;sc_idle_timeout);</div><div class='ctx'> 		o2net_sc_cancel_delayed_work(sc, &amp;sc-&gt;sc_keepalive_work);</div><div class='ctx'> 		sc_put(sc);</div><div class='ctx'> 		kernel_sock_shutdown(sc-&gt;sc_sock, SHUT_RDWR);</div><div class='hunk'>@@ -1419,7 +1419,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* this work func is triggerd by data ready.  it reads until it can read no</div><div class='add'>+/* this work func is triggered by data ready.  it reads until it can read no</div><div class='ctx'>  * more.  it interprets 0, eof, as fatal.  if data_ready hits while we're doing</div><div class='ctx'>  * our work the work struct will be marked and we'll be called again. */</div><div class='ctx'> static void o2net_rx_until_empty(struct work_struct *work)</div><div class='hunk'>@@ -1483,12 +1483,13 @@ static void o2net_sc_send_keep_req(struct work_struct *work)</div><div class='ctx'> 	sc_put(sc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* socket shutdown does a del_timer_sync against this as it tears down.</div><div class='add'>+/* socket shutdown does a timer_delete_sync against this as it tears down.</div><div class='ctx'>  * we can't start this timer until we've got to the point in sc buildup</div><div class='ctx'>  * where shutdown is going to be involved */</div><div class='ctx'> static void o2net_idle_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct o2net_sock_container *sc = from_timer(sc, t, sc_idle_timeout);</div><div class='add'>+	struct o2net_sock_container *sc = timer_container_of(sc, t,</div><div class='add'>+							     sc_idle_timeout);</div><div class='ctx'> 	struct o2net_node *nn = o2net_nn_from_num(sc-&gt;sc_node-&gt;nd_num);</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	unsigned long msecs = ktime_to_ms(ktime_get()) -</div><div class='hunk'>@@ -1614,7 +1615,7 @@ static void o2net_start_connect(struct work_struct *work)</div><div class='ctx'> 	myaddr.sin_addr.s_addr = mynode-&gt;nd_ipv4_address;</div><div class='ctx'> 	myaddr.sin_port = htons(0); /* any port */</div><div class='ctx'> </div><div class='del'>-	ret = sock-&gt;ops-&gt;bind(sock, (struct sockaddr *)&amp;myaddr,</div><div class='add'>+	ret = sock-&gt;ops-&gt;bind(sock, (struct sockaddr_unsized *)&amp;myaddr,</div><div class='ctx'> 			      sizeof(myaddr));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		mlog(ML_ERROR, "bind failed with %d at address %pI4\n",</div><div class='hunk'>@@ -1637,7 +1638,7 @@ static void o2net_start_connect(struct work_struct *work)</div><div class='ctx'> 	remoteaddr.sin_port = node-&gt;nd_ipv4_port;</div><div class='ctx'> </div><div class='ctx'> 	ret = sc-&gt;sc_sock-&gt;ops-&gt;connect(sc-&gt;sc_sock,</div><div class='del'>-					(struct sockaddr *)&amp;remoteaddr,</div><div class='add'>+					(struct sockaddr_unsized *)&amp;remoteaddr,</div><div class='ctx'> 					sizeof(remoteaddr),</div><div class='ctx'> 					O_NONBLOCK);</div><div class='ctx'> 	if (ret == -EINPROGRESS)</div><div class='hunk'>@@ -1784,6 +1785,9 @@ static int o2net_accept_one(struct socket *sock, int *more)</div><div class='ctx'> 	struct o2nm_node *node = NULL;</div><div class='ctx'> 	struct o2nm_node *local_node = NULL;</div><div class='ctx'> 	struct o2net_sock_container *sc = NULL;</div><div class='add'>+	struct proto_accept_arg arg = {</div><div class='add'>+		.flags = O_NONBLOCK,</div><div class='add'>+	};</div><div class='ctx'> 	struct o2net_node *nn;</div><div class='ctx'> 	unsigned int nofs_flag;</div><div class='ctx'> </div><div class='hunk'>@@ -1802,7 +1806,7 @@ static int o2net_accept_one(struct socket *sock, int *more)</div><div class='ctx'> </div><div class='ctx'> 	new_sock-&gt;type = sock-&gt;type;</div><div class='ctx'> 	new_sock-&gt;ops = sock-&gt;ops;</div><div class='del'>-	ret = sock-&gt;ops-&gt;accept(sock, new_sock, O_NONBLOCK, false);</div><div class='add'>+	ret = sock-&gt;ops-&gt;accept(sock, new_sock, &amp;arg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1998,7 +2002,7 @@ static int o2net_open_listening_sock(__be32 addr, __be16 port)</div><div class='ctx'> 	INIT_WORK(&amp;o2net_listen_work, o2net_accept_many);</div><div class='ctx'> </div><div class='ctx'> 	sock-&gt;sk-&gt;sk_reuse = SK_CAN_REUSE;</div><div class='del'>-	ret = sock-&gt;ops-&gt;bind(sock, (struct sockaddr *)&amp;sin, sizeof(sin));</div><div class='add'>+	ret = sock-&gt;ops-&gt;bind(sock, (struct sockaddr_unsized *)&amp;sin, sizeof(sin));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "o2net: Error %d while binding socket at "</div><div class='ctx'> 		       "%pI4:%u\n", ret, &amp;addr, ntohs(port)); </div><div class='head'>diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c<br/>index a9b8688aaf30..1873bbbb7e5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dcache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dcache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dcache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dcache.c</a></div><div class='hunk'>@@ -32,7 +32,8 @@ void ocfs2_dentry_attach_gen(struct dentry *dentry)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int ocfs2_dentry_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				   struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	int ret = 0;    /* if all else fails, just return false */</div><div class='hunk'>@@ -44,8 +45,7 @@ static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	inode = d_inode(dentry);</div><div class='ctx'> 	osb = OCFS2_SB(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='del'>-	trace_ocfs2_dentry_revalidate(dentry, dentry-&gt;d_name.len,</div><div class='del'>-				      dentry-&gt;d_name.name);</div><div class='add'>+	trace_ocfs2_dentry_revalidate(dentry, name-&gt;len, name-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* For a negative dentry -</div><div class='ctx'> 	 * check the generation number of the parent and compare with the</div><div class='hunk'>@@ -53,12 +53,8 @@ static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (inode == NULL) {</div><div class='ctx'> 		unsigned long gen = (unsigned long) dentry-&gt;d_fsdata;</div><div class='del'>-		unsigned long pgen;</div><div class='del'>-		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		pgen = OCFS2_I(d_inode(dentry-&gt;d_parent))-&gt;ip_dir_lock_gen;</div><div class='del'>-		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		trace_ocfs2_dentry_revalidate_negative(dentry-&gt;d_name.len,</div><div class='del'>-						       dentry-&gt;d_name.name,</div><div class='add'>+		unsigned long pgen = OCFS2_I(dir)-&gt;ip_dir_lock_gen;</div><div class='add'>+		trace_ocfs2_dentry_revalidate_negative(name-&gt;len, name-&gt;name,</div><div class='ctx'> 						       pgen, gen);</div><div class='ctx'> 		if (gen != pgen)</div><div class='ctx'> 			goto bail;</div><div class='head'>diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c<br/>index d620d4c53c6f..2785ff245e79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dir.c</a></div><div class='hunk'>@@ -294,13 +294,29 @@ out:</div><div class='ctx'>  * bh passed here can be an inode block or a dir data block, depending</div><div class='ctx'>  * on the inode inline data flag.</div><div class='ctx'>  */</div><div class='del'>-static int ocfs2_check_dir_entry(struct inode * dir,</div><div class='del'>-				 struct ocfs2_dir_entry * de,</div><div class='del'>-				 struct buffer_head * bh,</div><div class='add'>+static int ocfs2_check_dir_entry(struct inode *dir,</div><div class='add'>+				 struct ocfs2_dir_entry *de,</div><div class='add'>+				 struct buffer_head *bh,</div><div class='add'>+				 char *buf,</div><div class='add'>+				 unsigned int size,</div><div class='ctx'> 				 unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	const char *error_msg = NULL;</div><div class='del'>-	const int rlen = le16_to_cpu(de-&gt;rec_len);</div><div class='add'>+	unsigned long next_offset;</div><div class='add'>+	int rlen;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; size - OCFS2_DIR_REC_LEN(1)) {</div><div class='add'>+		/* Dirent is (maybe partially) beyond the buffer</div><div class='add'>+		 * boundaries so touching 'de' members is unsafe.</div><div class='add'>+		 */</div><div class='add'>+		mlog(ML_ERROR, "directory entry (#%llu: offset=%lu) "</div><div class='add'>+		     "too close to end or out-of-bounds",</div><div class='add'>+		     (unsigned long long)OCFS2_I(dir)-&gt;ip_blkno, offset);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rlen = le16_to_cpu(de-&gt;rec_len);</div><div class='add'>+	next_offset = ((char *) de - buf) + rlen;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(rlen &lt; OCFS2_DIR_REC_LEN(1)))</div><div class='ctx'> 		error_msg = "rec_len is smaller than minimal";</div><div class='hunk'>@@ -308,9 +324,11 @@ static int ocfs2_check_dir_entry(struct inode * dir,</div><div class='ctx'> 		error_msg = "rec_len % 4 != 0";</div><div class='ctx'> 	else if (unlikely(rlen &lt; OCFS2_DIR_REC_LEN(de-&gt;name_len)))</div><div class='ctx'> 		error_msg = "rec_len is too small for name_len";</div><div class='del'>-	else if (unlikely(</div><div class='del'>-		 ((char *) de - bh-&gt;b_data) + rlen &gt; dir-&gt;i_sb-&gt;s_blocksize))</div><div class='del'>-		error_msg = "directory entry across blocks";</div><div class='add'>+	else if (unlikely(next_offset &gt; size))</div><div class='add'>+		error_msg = "directory entry overrun";</div><div class='add'>+	else if (unlikely(next_offset &gt; size - OCFS2_DIR_REC_LEN(1)) &amp;&amp;</div><div class='add'>+		 next_offset != size)</div><div class='add'>+		error_msg = "directory entry too close to end";</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(error_msg != NULL))</div><div class='ctx'> 		mlog(ML_ERROR, "bad entry in directory #%llu: %s - "</div><div class='hunk'>@@ -352,16 +370,17 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh,</div><div class='ctx'> 	de_buf = first_de;</div><div class='ctx'> 	dlimit = de_buf + bytes;</div><div class='ctx'> </div><div class='del'>-	while (de_buf &lt; dlimit) {</div><div class='add'>+	while (de_buf &lt; dlimit - OCFS2_DIR_MEMBER_LEN) {</div><div class='ctx'> 		/* this code is executed quadratically often */</div><div class='ctx'> 		/* do minimal checking `by hand' */</div><div class='ctx'> </div><div class='ctx'> 		de = (struct ocfs2_dir_entry *) de_buf;</div><div class='ctx'> </div><div class='del'>-		if (de_buf + namelen &lt;= dlimit &amp;&amp;</div><div class='add'>+		if (de-&gt;name + namelen &lt;= dlimit &amp;&amp;</div><div class='ctx'> 		    ocfs2_match(namelen, name, de)) {</div><div class='ctx'> 			/* found a match - just to be sure, do a full check */</div><div class='del'>-			if (!ocfs2_check_dir_entry(dir, de, bh, offset)) {</div><div class='add'>+			if (!ocfs2_check_dir_entry(dir, de, bh, first_de,</div><div class='add'>+						   bytes, offset)) {</div><div class='ctx'> 				ret = -1;</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -772,6 +791,14 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,</div><div class='ctx'> 	struct ocfs2_extent_block *eb;</div><div class='ctx'> 	struct ocfs2_extent_rec *rec = NULL;</div><div class='ctx'> </div><div class='add'>+	if (le16_to_cpu(el-&gt;l_count) !=</div><div class='add'>+	    ocfs2_extent_recs_per_dx_root(inode-&gt;i_sb)) {</div><div class='add'>+		ret = ocfs2_error(inode-&gt;i_sb,</div><div class='add'>+				  "Inode %lu has invalid extent list length %u\n",</div><div class='add'>+				  inode-&gt;i_ino, le16_to_cpu(el-&gt;l_count));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (el-&gt;l_tree_depth) {</div><div class='ctx'> 		ret = ocfs2_find_leaf(INODE_CACHE(inode), el, major_hash,</div><div class='ctx'> 				      &amp;eb_bh);</div><div class='hunk'>@@ -792,6 +819,14 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (le16_to_cpu(el-&gt;l_next_free_rec) == 0) {</div><div class='add'>+		ret = ocfs2_error(inode-&gt;i_sb,</div><div class='add'>+				  "Inode %lu has empty extent list at depth %u\n",</div><div class='add'>+				  inode-&gt;i_ino,</div><div class='add'>+				  le16_to_cpu(el-&gt;l_tree_depth));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	found = 0;</div><div class='ctx'> 	for (i = le16_to_cpu(el-&gt;l_next_free_rec) - 1; i &gt;= 0; i--) {</div><div class='ctx'> 		rec = &amp;el-&gt;l_recs[i];</div><div class='hunk'>@@ -1059,26 +1094,39 @@ int ocfs2_find_entry(const char *name, int namelen,</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct ocfs2_dir_entry *res_dir = NULL;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ocfs2_dir_indexed(dir))</div><div class='ctx'> 		return ocfs2_find_entry_dx(name, namelen, dir, lookup);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(i_size_read(dir) &lt;= 0)) {</div><div class='add'>+		ret = -EFSCORRUPTED;</div><div class='add'>+		mlog_errno(ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The unindexed dir code only uses part of the lookup</div><div class='ctx'> 	 * structure, so there's no reason to push it down further</div><div class='ctx'> 	 * than this.</div><div class='ctx'> 	 */</div><div class='del'>-	if (OCFS2_I(dir)-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL)</div><div class='add'>+	if (OCFS2_I(dir)-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL) {</div><div class='add'>+		if (unlikely(i_size_read(dir) &gt; dir-&gt;i_sb-&gt;s_blocksize)) {</div><div class='add'>+			ret = -EFSCORRUPTED;</div><div class='add'>+			mlog_errno(ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		bh = ocfs2_find_entry_id(name, namelen, dir, &amp;res_dir);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		bh = ocfs2_find_entry_el(name, namelen, dir, &amp;res_dir);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (bh == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	lookup-&gt;dl_leaf_bh = bh;</div><div class='ctx'> 	lookup-&gt;dl_entry = res_dir;</div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1138,7 +1186,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,</div><div class='ctx'> 	pde = NULL;</div><div class='ctx'> 	de = (struct ocfs2_dir_entry *) first_de;</div><div class='ctx'> 	while (i &lt; bytes) {</div><div class='del'>-		if (!ocfs2_check_dir_entry(dir, de, bh, i)) {</div><div class='add'>+		if (!ocfs2_check_dir_entry(dir, de, bh, first_de, bytes, i)) {</div><div class='ctx'> 			status = -EIO;</div><div class='ctx'> 			mlog_errno(status);</div><div class='ctx'> 			goto bail;</div><div class='hunk'>@@ -1635,7 +1683,8 @@ int __ocfs2_add_entry(handle_t *handle,</div><div class='ctx'> 		/* These checks should've already been passed by the</div><div class='ctx'> 		 * prepare function, but I guess we can leave them</div><div class='ctx'> 		 * here anyway. */</div><div class='del'>-		if (!ocfs2_check_dir_entry(dir, de, insert_bh, offset)) {</div><div class='add'>+		if (!ocfs2_check_dir_entry(dir, de, insert_bh, data_start,</div><div class='add'>+					   size, offset)) {</div><div class='ctx'> 			retval = -ENOENT;</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1774,7 +1823,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		de = (struct ocfs2_dir_entry *) (data-&gt;id_data + ctx-&gt;pos);</div><div class='del'>-		if (!ocfs2_check_dir_entry(inode, de, di_bh, ctx-&gt;pos)) {</div><div class='add'>+		if (!ocfs2_check_dir_entry(inode, de, di_bh, (char *)data-&gt;id_data,</div><div class='add'>+					   i_size_read(inode), ctx-&gt;pos)) {</div><div class='ctx'> 			/* On error, skip the f_pos to the end. */</div><div class='ctx'> 			ctx-&gt;pos = i_size_read(inode);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1867,7 +1917,8 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,</div><div class='ctx'> 		while (ctx-&gt;pos &lt; i_size_read(inode)</div><div class='ctx'> 		       &amp;&amp; offset &lt; sb-&gt;s_blocksize) {</div><div class='ctx'> 			de = (struct ocfs2_dir_entry *) (bh-&gt;b_data + offset);</div><div class='del'>-			if (!ocfs2_check_dir_entry(inode, de, bh, offset)) {</div><div class='add'>+			if (!ocfs2_check_dir_entry(inode, de, bh, bh-&gt;b_data,</div><div class='add'>+						   sb-&gt;s_blocksize, offset)) {</div><div class='ctx'> 				/* On error, skip the f_pos to the</div><div class='ctx'> 				   next block. */</div><div class='ctx'> 				ctx-&gt;pos = (ctx-&gt;pos | (sb-&gt;s_blocksize - 1)) + 1;</div><div class='hunk'>@@ -1923,6 +1974,7 @@ int ocfs2_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='add'>+	struct ocfs2_file_private *fp = file-&gt;private_data;</div><div class='ctx'> 	int lock_level = 0;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)-&gt;ip_blkno);</div><div class='hunk'>@@ -1943,7 +1995,7 @@ int ocfs2_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		goto bail_nolock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = ocfs2_dir_foreach_blk(inode, &amp;file-&gt;f_version, ctx, false);</div><div class='add'>+	error = ocfs2_dir_foreach_blk(inode, &amp;fp-&gt;cookie, ctx, false);</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_inode_unlock(inode, lock_level);</div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -2000,6 +2052,7 @@ int ocfs2_lookup_ino_from_name(struct inode *dir, const char *name,</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 if the name does not exist</div><div class='ctx'>  * Return -EEXIST if the directory contains the name</div><div class='add'>+ * Return -EFSCORRUPTED if found corruption</div><div class='ctx'>  *</div><div class='ctx'>  * Callers should have i_rwsem + a cluster lock on dir</div><div class='ctx'>  */</div><div class='hunk'>@@ -2013,9 +2066,12 @@ int ocfs2_check_dir_for_entry(struct inode *dir,</div><div class='ctx'> 	trace_ocfs2_check_dir_for_entry(</div><div class='ctx'> 		(unsigned long long)OCFS2_I(dir)-&gt;ip_blkno, namelen, name);</div><div class='ctx'> </div><div class='del'>-	if (ocfs2_find_entry(name, namelen, dir, &amp;lookup) == 0) {</div><div class='add'>+	ret = ocfs2_find_entry(name, namelen, dir, &amp;lookup);</div><div class='add'>+	if (ret == 0) {</div><div class='ctx'> 		ret = -EEXIST;</div><div class='ctx'> 		mlog_errno(ret);</div><div class='add'>+	} else if (ret == -ENOENT) {</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_free_dir_lookup_result(&amp;lookup);</div><div class='hunk'>@@ -3339,7 +3395,7 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,</div><div class='ctx'> 	struct super_block *sb = dir-&gt;i_sb;</div><div class='ctx'> 	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh-&gt;b_data;</div><div class='ctx'> 	struct ocfs2_dir_entry *de, *last_de = NULL;</div><div class='del'>-	char *de_buf, *limit;</div><div class='add'>+	char *first_de, *de_buf, *limit;</div><div class='ctx'> 	unsigned long offset = 0;</div><div class='ctx'> 	unsigned int rec_len, new_rec_len, free_space;</div><div class='ctx'> </div><div class='hunk'>@@ -3352,14 +3408,16 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,</div><div class='ctx'> 	else</div><div class='ctx'> 		free_space = dir-&gt;i_sb-&gt;s_blocksize - i_size_read(dir);</div><div class='ctx'> </div><div class='del'>-	de_buf = di-&gt;id2.i_data.id_data;</div><div class='add'>+	first_de = di-&gt;id2.i_data.id_data;</div><div class='add'>+	de_buf = first_de;</div><div class='ctx'> 	limit = de_buf + i_size_read(dir);</div><div class='ctx'> 	rec_len = OCFS2_DIR_REC_LEN(namelen);</div><div class='ctx'> </div><div class='ctx'> 	while (de_buf &lt; limit) {</div><div class='ctx'> 		de = (struct ocfs2_dir_entry *)de_buf;</div><div class='ctx'> </div><div class='del'>-		if (!ocfs2_check_dir_entry(dir, de, di_bh, offset)) {</div><div class='add'>+		if (!ocfs2_check_dir_entry(dir, de, di_bh, first_de,</div><div class='add'>+					   i_size_read(dir), offset)) {</div><div class='ctx'> 			ret = -ENOENT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3386,6 +3444,14 @@ static int ocfs2_find_dir_space_id(struct inode *dir, struct buffer_head *di_bh,</div><div class='ctx'> 		offset += le16_to_cpu(de-&gt;rec_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!last_de) {</div><div class='add'>+		ret = ocfs2_error(sb, "Directory entry (#%llu: size=%lld) "</div><div class='add'>+				  "is unexpectedly short",</div><div class='add'>+				  (unsigned long long)OCFS2_I(dir)-&gt;ip_blkno,</div><div class='add'>+				  i_size_read(dir));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're going to require expansion of the directory - figure</div><div class='ctx'> 	 * out how many blocks we'll need so that a place for the</div><div class='hunk'>@@ -3441,7 +3507,8 @@ static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,</div><div class='ctx'> 			/* move to next block */</div><div class='ctx'> 			de = (struct ocfs2_dir_entry *) bh-&gt;b_data;</div><div class='ctx'> 		}</div><div class='del'>-		if (!ocfs2_check_dir_entry(dir, de, bh, offset)) {</div><div class='add'>+		if (!ocfs2_check_dir_entry(dir, de, bh, bh-&gt;b_data, blocksize,</div><div class='add'>+					   offset)) {</div><div class='ctx'> 			status = -ENOENT;</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3499,16 +3566,6 @@ static int dx_leaf_sort_cmp(const void *a, const void *b)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dx_leaf_sort_swap(void *a, void *b, int size)</div><div class='del'>-{</div><div class='del'>-	struct ocfs2_dx_entry *entry1 = a;</div><div class='del'>-	struct ocfs2_dx_entry *entry2 = b;</div><div class='del'>-</div><div class='del'>-	BUG_ON(size != sizeof(*entry1));</div><div class='del'>-</div><div class='del'>-	swap(*entry1, *entry2);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ocfs2_dx_leaf_same_major(struct ocfs2_dx_leaf *dx_leaf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ocfs2_dx_entry_list *dl_list = &amp;dx_leaf-&gt;dl_list;</div><div class='hunk'>@@ -3769,7 +3826,7 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sort(dx_leaf-&gt;dl_list.de_entries, num_used,</div><div class='ctx'> 	     sizeof(struct ocfs2_dx_entry), dx_leaf_sort_cmp,</div><div class='del'>-	     dx_leaf_sort_swap);</div><div class='add'>+	     NULL);</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_journal_dirty(handle, dx_leaf_bh);</div><div class='ctx'> </div><div class='hunk'>@@ -4076,10 +4133,15 @@ static int ocfs2_expand_inline_dx_root(struct inode *dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dx_root-&gt;dr_flags &amp;= ~OCFS2_DX_FLAG_INLINE;</div><div class='del'>-	memset(&amp;dx_root-&gt;dr_list, 0, osb-&gt;sb-&gt;s_blocksize -</div><div class='del'>-	       offsetof(struct ocfs2_dx_root_block, dr_list));</div><div class='add'>+</div><div class='add'>+	dx_root-&gt;dr_list.l_tree_depth = 0;</div><div class='ctx'> 	dx_root-&gt;dr_list.l_count =</div><div class='ctx'> 		cpu_to_le16(ocfs2_extent_recs_per_dx_root(osb-&gt;sb));</div><div class='add'>+	dx_root-&gt;dr_list.l_next_free_rec = 0;</div><div class='add'>+	memset(&amp;dx_root-&gt;dr_list.l_recs, 0,</div><div class='add'>+	       osb-&gt;sb-&gt;s_blocksize -</div><div class='add'>+	       (offsetof(struct ocfs2_dx_root_block, dr_list) +</div><div class='add'>+		offsetof(struct ocfs2_extent_list, l_recs)));</div><div class='ctx'> </div><div class='ctx'> 	/* This should never fail considering we start with an empty</div><div class='ctx'> 	 * dx_root. */</div><div class='head'>diff --git a/fs/ocfs2/dlm/dlmapi.h b/fs/ocfs2/dlm/dlmapi.h<br/>index bae60ca2672a..1969db8ffa9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmapi.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmapi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmapi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlm/dlmapi.h</a></div><div class='hunk'>@@ -62,8 +62,6 @@ enum dlm_status {</div><div class='ctx'> 	DLM_MAXSTATS,             /* 41: upper limit for return code validation */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* for pretty-printing dlm_status error messages */</div><div class='del'>-const char *dlm_errmsg(enum dlm_status err);</div><div class='ctx'> /* for pretty-printing dlm_status error names */</div><div class='ctx'> const char *dlm_errname(enum dlm_status err);</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +118,7 @@ struct dlm_lockstatus {</div><div class='ctx'> #define LKM_VALBLK       0x00000100  /* lock value block request */</div><div class='ctx'> #define LKM_NOQUEUE      0x00000200  /* non blocking request */</div><div class='ctx'> #define LKM_CONVERT      0x00000400  /* conversion request */</div><div class='del'>-#define LKM_NODLCKWT     0x00000800  /* this lock wont deadlock (U) */</div><div class='add'>+#define LKM_NODLCKWT     0x00000800  /* this lock won't deadlock (U) */</div><div class='ctx'> #define LKM_UNLOCK       0x00001000  /* deallocate this lock */</div><div class='ctx'> #define LKM_CANCEL       0x00002000  /* cancel conversion request */</div><div class='ctx'> #define LKM_DEQALL       0x00004000  /* remove all locks held by proc (U) */</div><div class='head'>diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c<br/>index be5e9ed7da8d..fe4fdd09bae3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmdebug.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmdebug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmdebug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlm/dlmdebug.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../cluster/heartbeat.h"</div><div class='ctx'> #include "../cluster/nodemanager.h"</div><div class='hunk'>@@ -90,12 +91,12 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)</div><div class='ctx'> 	       buf, res-&gt;owner, res-&gt;state);</div><div class='ctx'> 	printk("  last used: %lu, refcnt: %u, on purge list: %s\n",</div><div class='ctx'> 	       res-&gt;last_used, kref_read(&amp;res-&gt;refs),</div><div class='del'>-	       list_empty(&amp;res-&gt;purge) ? "no" : "yes");</div><div class='add'>+	       str_no_yes(list_empty(&amp;res-&gt;purge)));</div><div class='ctx'> 	printk("  on dirty list: %s, on reco list: %s, "</div><div class='ctx'> 	       "migrating pending: %s\n",</div><div class='del'>-	       list_empty(&amp;res-&gt;dirty) ? "no" : "yes",</div><div class='del'>-	       list_empty(&amp;res-&gt;recovering) ? "no" : "yes",</div><div class='del'>-	       res-&gt;migration_pending ? "yes" : "no");</div><div class='add'>+	       str_no_yes(list_empty(&amp;res-&gt;dirty)),</div><div class='add'>+	       str_no_yes(list_empty(&amp;res-&gt;recovering)),</div><div class='add'>+	       str_yes_no(res-&gt;migration_pending));</div><div class='ctx'> 	printk("  inflight locks: %d, asts reserved: %d\n",</div><div class='ctx'> 	       res-&gt;inflight_locks, atomic_read(&amp;res-&gt;asts_reserved));</div><div class='ctx'> 	dlm_print_lockres_refmap(res);</div><div class='hunk'>@@ -164,59 +165,6 @@ static const char *dlm_errnames[] = {</div><div class='ctx'> 	[DLM_MAXSTATS] =		"DLM_MAXSTATS",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char *dlm_errmsgs[] = {</div><div class='del'>-	[DLM_NORMAL] = 			"request in progress",</div><div class='del'>-	[DLM_GRANTED] = 		"request granted",</div><div class='del'>-	[DLM_DENIED] = 			"request denied",</div><div class='del'>-	[DLM_DENIED_NOLOCKS] = 		"request denied, out of system resources",</div><div class='del'>-	[DLM_WORKING] = 		"async request in progress",</div><div class='del'>-	[DLM_BLOCKED] = 		"lock request blocked",</div><div class='del'>-	[DLM_BLOCKED_ORPHAN] = 		"lock request blocked by a orphan lock",</div><div class='del'>-	[DLM_DENIED_GRACE_PERIOD] = 	"topological change in progress",</div><div class='del'>-	[DLM_SYSERR] = 			"system error",</div><div class='del'>-	[DLM_NOSUPPORT] = 		"unsupported",</div><div class='del'>-	[DLM_CANCELGRANT] = 		"can't cancel convert: already granted",</div><div class='del'>-	[DLM_IVLOCKID] = 		"bad lockid",</div><div class='del'>-	[DLM_SYNC] = 			"synchronous request granted",</div><div class='del'>-	[DLM_BADTYPE] = 		"bad resource type",</div><div class='del'>-	[DLM_BADRESOURCE] = 		"bad resource handle",</div><div class='del'>-	[DLM_MAXHANDLES] = 		"no more resource handles",</div><div class='del'>-	[DLM_NOCLINFO] = 		"can't contact cluster manager",</div><div class='del'>-	[DLM_NOLOCKMGR] = 		"can't contact lock manager",</div><div class='del'>-	[DLM_NOPURGED] = 		"can't contact purge daemon",</div><div class='del'>-	[DLM_BADARGS] = 		"bad api args",</div><div class='del'>-	[DLM_VOID] = 			"no status",</div><div class='del'>-	[DLM_NOTQUEUED] = 		"NOQUEUE was specified and request failed",</div><div class='del'>-	[DLM_IVBUFLEN] = 		"invalid resource name length",</div><div class='del'>-	[DLM_CVTUNGRANT] = 		"attempted to convert ungranted lock",</div><div class='del'>-	[DLM_BADPARAM] = 		"invalid lock mode specified",</div><div class='del'>-	[DLM_VALNOTVALID] = 		"value block has been invalidated",</div><div class='del'>-	[DLM_REJECTED] = 		"request rejected, unrecognized client",</div><div class='del'>-	[DLM_ABORT] = 			"blocked lock request cancelled",</div><div class='del'>-	[DLM_CANCEL] = 			"conversion request cancelled",</div><div class='del'>-	[DLM_IVRESHANDLE] = 		"invalid resource handle",</div><div class='del'>-	[DLM_DEADLOCK] = 		"deadlock recovery refused this request",</div><div class='del'>-	[DLM_DENIED_NOASTS] = 		"failed to allocate AST",</div><div class='del'>-	[DLM_FORWARD] = 		"request must wait for primary's response",</div><div class='del'>-	[DLM_TIMEOUT] = 		"timeout value for lock has expired",</div><div class='del'>-	[DLM_IVGROUPID] = 		"invalid group specification",</div><div class='del'>-	[DLM_VERS_CONFLICT] = 		"version conflicts prevent request handling",</div><div class='del'>-	[DLM_BAD_DEVICE_PATH] = 	"Locks device does not exist or path wrong",</div><div class='del'>-	[DLM_NO_DEVICE_PERMISSION] = 	"Client has insufficient perms for device",</div><div class='del'>-	[DLM_NO_CONTROL_DEVICE] = 	"Cannot set options on opened device ",</div><div class='del'>-	[DLM_RECOVERING] = 		"lock resource being recovered",</div><div class='del'>-	[DLM_MIGRATING] = 		"lock resource being migrated",</div><div class='del'>-	[DLM_MAXSTATS] = 		"invalid error number",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char *dlm_errmsg(enum dlm_status err)</div><div class='del'>-{</div><div class='del'>-	if (err &gt;= DLM_MAXSTATS || err &lt; 0)</div><div class='del'>-		return dlm_errmsgs[DLM_MAXSTATS];</div><div class='del'>-	return dlm_errmsgs[err];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(dlm_errmsg);</div><div class='del'>-</div><div class='ctx'> const char *dlm_errname(enum dlm_status err)</div><div class='ctx'> {</div><div class='ctx'> 	if (err &gt;= DLM_MAXSTATS || err &lt; 0)</div><div class='head'>diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c<br/>index 5c04dde99981..2347a50f079b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmdomain.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmdomain.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmdomain.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlm/dlmdomain.c</a></div><div class='hunk'>@@ -1274,7 +1274,7 @@ static int dlm_query_nodeinfo_handler(struct o2net_msg *msg, u32 len,</div><div class='ctx'> {</div><div class='ctx'> 	struct dlm_query_nodeinfo *qn;</div><div class='ctx'> 	struct dlm_ctxt *dlm = NULL;</div><div class='del'>-	int locked = 0, status = -EINVAL;</div><div class='add'>+	int status = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	qn = (struct dlm_query_nodeinfo *) msg-&gt;buf;</div><div class='ctx'> </div><div class='hunk'>@@ -1290,12 +1290,11 @@ static int dlm_query_nodeinfo_handler(struct o2net_msg *msg, u32 len,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dlm-&gt;spinlock);</div><div class='del'>-	locked = 1;</div><div class='ctx'> 	if (dlm-&gt;joining_node != qn-&gt;qn_nodenum) {</div><div class='ctx'> 		mlog(ML_ERROR, "Node %d queried nodes on domain %s but "</div><div class='ctx'> 		     "joining node is %d\n", qn-&gt;qn_nodenum, qn-&gt;qn_domain,</div><div class='ctx'> 		     dlm-&gt;joining_node);</div><div class='del'>-		goto bail;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Support for node query was added in 1.1 */</div><div class='hunk'>@@ -1305,14 +1304,14 @@ static int dlm_query_nodeinfo_handler(struct o2net_msg *msg, u32 len,</div><div class='ctx'> 		     "but active dlm protocol is %d.%d\n", qn-&gt;qn_nodenum,</div><div class='ctx'> 		     qn-&gt;qn_domain, dlm-&gt;dlm_locking_proto.pv_major,</div><div class='ctx'> 		     dlm-&gt;dlm_locking_proto.pv_minor);</div><div class='del'>-		goto bail;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = dlm_match_nodes(dlm, qn);</div><div class='ctx'> </div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;dlm-&gt;spinlock);</div><div class='ctx'> bail:</div><div class='del'>-	if (locked)</div><div class='del'>-		spin_unlock(&amp;dlm-&gt;spinlock);</div><div class='ctx'> 	spin_unlock(&amp;dlm_domain_lock);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -1528,7 +1527,6 @@ static void dlm_send_join_asserts(struct dlm_ctxt *dlm,</div><div class='ctx'> {</div><div class='ctx'> 	int status, node, live;</div><div class='ctx'> </div><div class='del'>-	status = 0;</div><div class='ctx'> 	node = -1;</div><div class='ctx'> 	while ((node = find_next_bit(node_map, O2NM_MAX_NODES,</div><div class='ctx'> 				     node + 1)) &lt; O2NM_MAX_NODES) {</div><div class='hunk'>@@ -1878,7 +1876,8 @@ static int dlm_join_domain(struct dlm_ctxt *dlm)</div><div class='ctx'> 	dlm_debug_init(dlm);</div><div class='ctx'> </div><div class='ctx'> 	snprintf(wq_name, O2NM_MAX_NAME_LEN, "dlm_wq-%s", dlm-&gt;name);</div><div class='del'>-	dlm-&gt;dlm_worker = alloc_workqueue(wq_name, WQ_MEM_RECLAIM, 0);</div><div class='add'>+	dlm-&gt;dlm_worker = alloc_workqueue(wq_name, WQ_MEM_RECLAIM | WQ_PERCPU,</div><div class='add'>+					  0);</div><div class='ctx'> 	if (!dlm-&gt;dlm_worker) {</div><div class='ctx'> 		status = -ENOMEM;</div><div class='ctx'> 		mlog_errno(status);</div><div class='head'>diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c<br/>index d610da8e2f24..4145e06d2c08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmmaster.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmmaster.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmmaster.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlm/dlmmaster.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../cluster/heartbeat.h"</div><div class='ctx'> #include "../cluster/nodemanager.h"</div><div class='hunk'>@@ -1477,7 +1477,6 @@ way_up_top:</div><div class='ctx'> 			goto send_response;</div><div class='ctx'> 		} else if (res-&gt;owner != DLM_LOCK_RES_OWNER_UNKNOWN) {</div><div class='ctx'> 			spin_unlock(&amp;res-&gt;spinlock);</div><div class='del'>-			// mlog(0, "node %u is the master\n", res-&gt;owner);</div><div class='ctx'> 			response = DLM_MASTER_RESP_NO;</div><div class='ctx'> 			if (mle)</div><div class='ctx'> 				kmem_cache_free(dlm_mle_cache, mle);</div><div class='hunk'>@@ -1493,7 +1492,6 @@ way_up_top:</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		// mlog(0, "lockres is in progress...\n");</div><div class='ctx'> 		spin_lock(&amp;dlm-&gt;master_lock);</div><div class='ctx'> 		found = dlm_find_mle(dlm, &amp;tmpmle, name, namelen);</div><div class='ctx'> 		if (!found) {</div><div class='hunk'>@@ -1503,8 +1501,6 @@ way_up_top:</div><div class='ctx'> 		set_maybe = 1;</div><div class='ctx'> 		spin_lock(&amp;tmpmle-&gt;spinlock);</div><div class='ctx'> 		if (tmpmle-&gt;type == DLM_MLE_BLOCK) {</div><div class='del'>-			// mlog(0, "this node is waiting for "</div><div class='del'>-			// "lockres to be mastered\n");</div><div class='ctx'> 			response = DLM_MASTER_RESP_NO;</div><div class='ctx'> 		} else if (tmpmle-&gt;type == DLM_MLE_MIGRATION) {</div><div class='ctx'> 			mlog(0, "node %u is master, but trying to migrate to "</div><div class='hunk'>@@ -1531,8 +1527,6 @@ way_up_top:</div><div class='ctx'> 			} else</div><div class='ctx'> 				response = DLM_MASTER_RESP_NO;</div><div class='ctx'> 		} else {</div><div class='del'>-			// mlog(0, "this node is attempting to "</div><div class='del'>-			// "master lockres\n");</div><div class='ctx'> 			response = DLM_MASTER_RESP_MAYBE;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (set_maybe)</div><div class='hunk'>@@ -1559,7 +1553,6 @@ way_up_top:</div><div class='ctx'> 	found = dlm_find_mle(dlm, &amp;tmpmle, name, namelen);</div><div class='ctx'> 	if (!found) {</div><div class='ctx'> 		/* this lockid has never been seen on this node yet */</div><div class='del'>-		// mlog(0, "no mle found\n");</div><div class='ctx'> 		if (!mle) {</div><div class='ctx'> 			spin_unlock(&amp;dlm-&gt;master_lock);</div><div class='ctx'> 			spin_unlock(&amp;dlm-&gt;spinlock);</div><div class='hunk'>@@ -1573,8 +1566,6 @@ way_up_top:</div><div class='ctx'> 			goto way_up_top;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		// mlog(0, "this is second time thru, already allocated, "</div><div class='del'>-		// "add the block.\n");</div><div class='ctx'> 		dlm_init_mle(mle, DLM_MLE_BLOCK, dlm, NULL, name, namelen);</div><div class='ctx'> 		set_bit(request-&gt;node_idx, mle-&gt;maybe_map);</div><div class='ctx'> 		__dlm_insert_mle(dlm, mle);</div><div class='hunk'>@@ -1897,8 +1888,6 @@ ok:</div><div class='ctx'> 		spin_unlock(&amp;res-&gt;spinlock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	// mlog(0, "woo!  got an assert_master from node %u!\n",</div><div class='del'>-	// 	     assert-&gt;node_idx);</div><div class='ctx'> 	if (mle) {</div><div class='ctx'> 		int extra_ref = 0;</div><div class='ctx'> 		int nn = -1;</div><div class='hunk'>@@ -2859,7 +2848,7 @@ static int dlm_mark_lockres_migrating(struct dlm_ctxt *dlm,</div><div class='ctx'> 	dlm_lockres_release_ast(dlm, res);</div><div class='ctx'> </div><div class='ctx'> 	mlog(0, "about to wait on migration_wq, dirty=%s\n",</div><div class='del'>-	       res-&gt;state &amp; DLM_LOCK_RES_DIRTY ? "yes" : "no");</div><div class='add'>+	       str_yes_no(res-&gt;state &amp; DLM_LOCK_RES_DIRTY));</div><div class='ctx'> 	/* if the extra ref we just put was the final one, this</div><div class='ctx'> 	 * will pass thru immediately.  otherwise, we need to wait</div><div class='ctx'> 	 * for the last ast to finish. */</div><div class='hunk'>@@ -2869,12 +2858,12 @@ again:</div><div class='ctx'> 		   msecs_to_jiffies(1000));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		mlog(0, "woken again: migrating? %s, dead? %s\n",</div><div class='del'>-		       res-&gt;state &amp; DLM_LOCK_RES_MIGRATING ? "yes":"no",</div><div class='del'>-		       test_bit(target, dlm-&gt;domain_map) ? "no":"yes");</div><div class='add'>+		       str_yes_no(res-&gt;state &amp; DLM_LOCK_RES_MIGRATING),</div><div class='add'>+		       str_no_yes(test_bit(target, dlm-&gt;domain_map)));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mlog(0, "all is well: migrating? %s, dead? %s\n",</div><div class='del'>-		       res-&gt;state &amp; DLM_LOCK_RES_MIGRATING ? "yes":"no",</div><div class='del'>-		       test_bit(target, dlm-&gt;domain_map) ? "no":"yes");</div><div class='add'>+		       str_yes_no(res-&gt;state &amp; DLM_LOCK_RES_MIGRATING),</div><div class='add'>+		       str_no_yes(test_bit(target, dlm-&gt;domain_map)));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!dlm_migration_can_proceed(dlm, res, target)) {</div><div class='ctx'> 		mlog(0, "trying again...\n");</div><div class='head'>diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c<br/>index 50da8af988c1..843ee02bd85f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmrecovery.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlm/dlmrecovery.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlm/dlmrecovery.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlm/dlmrecovery.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../cluster/heartbeat.h"</div><div class='ctx'> #include "../cluster/nodemanager.h"</div><div class='hunk'>@@ -207,7 +207,7 @@ void dlm_complete_recovery_thread(struct dlm_ctxt *dlm)</div><div class='ctx'>  * 1) all recovery threads cluster wide will work on recovering</div><div class='ctx'>  *    ONE node at a time</div><div class='ctx'>  * 2) negotiate who will take over all the locks for the dead node.</div><div class='del'>- *    thats right... ALL the locks.</div><div class='add'>+ *    that's right... ALL the locks.</div><div class='ctx'>  * 3) once a new master is chosen, everyone scans all locks</div><div class='ctx'>  *    and moves aside those mastered by the dead guy</div><div class='ctx'>  * 4) each of these locks should be locked until recovery is done</div><div class='hunk'>@@ -464,7 +464,6 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dlm-&gt;reco.dead_node == O2NM_INVALID_NODE_NUM) {</div><div class='del'>-		// mlog(0, "nothing to recover!  sleeping now!\n");</div><div class='ctx'> 		spin_unlock(&amp;dlm-&gt;spinlock);</div><div class='ctx'> 		/* return to main thread loop and sleep. */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -581,8 +580,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 dead_node)</div><div class='ctx'> 							   msecs_to_jiffies(1000));</div><div class='ctx'> 					mlog(0, "waited 1 sec for %u, "</div><div class='ctx'> 					     "dead? %s\n", ndata-&gt;node_num,</div><div class='del'>-					     dlm_is_node_dead(dlm, ndata-&gt;node_num) ?</div><div class='del'>-					     "yes" : "no");</div><div class='add'>+					     str_yes_no(dlm_is_node_dead(dlm, ndata-&gt;node_num)));</div><div class='ctx'> 				} else {</div><div class='ctx'> 					/* -ENOMEM on the other node */</div><div class='ctx'> 					mlog(0, "%s: node %u returned "</div><div class='hunk'>@@ -677,7 +675,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 dead_node)</div><div class='ctx'> 		spin_unlock(&amp;dlm_reco_state_lock);</div><div class='ctx'> </div><div class='ctx'> 		mlog(0, "pass #%d, all_nodes_done?: %s\n", ++pass,</div><div class='del'>-		     all_nodes_done?"yes":"no");</div><div class='add'>+		     str_yes_no(all_nodes_done));</div><div class='ctx'> 		if (all_nodes_done) {</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1469,7 +1467,7 @@ int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data,</div><div class='ctx'> 		 * The first one is handled at the end of this function. The</div><div class='ctx'> 		 * other two are handled in the worker thread after locks have</div><div class='ctx'> 		 * been attached. Yes, we don't wait for purge time to match</div><div class='del'>-		 * kref_init. The lockres will still have atleast one ref</div><div class='add'>+		 * kref_init. The lockres will still have at least one ref</div><div class='ctx'> 		 * added because it is in the hash __dlm_insert_lockres() */</div><div class='ctx'> 		extra_refs++;</div><div class='ctx'> </div><div class='hunk'>@@ -1735,7 +1733,7 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data,</div><div class='ctx'> 				spin_unlock(&amp;res-&gt;spinlock);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			/* put.. incase we are not the master */</div><div class='add'>+			/* put.. in case we are not the master */</div><div class='ctx'> 			spin_unlock(&amp;res-&gt;spinlock);</div><div class='ctx'> 			dlm_lockres_put(res);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2633,7 +2631,7 @@ again:</div><div class='ctx'> 					 dlm_reco_master_ready(dlm),</div><div class='ctx'> 					 msecs_to_jiffies(1000));</div><div class='ctx'> 		if (!dlm_reco_master_ready(dlm)) {</div><div class='del'>-			mlog(0, "%s: reco master taking awhile\n",</div><div class='add'>+			mlog(0, "%s: reco master taking a while\n",</div><div class='ctx'> 			     dlm-&gt;name);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c<br/>index 85215162c9dd..339f0b11cdc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlmfs/dlmfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlmfs/dlmfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlmfs/dlmfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlmfs/dlmfs.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -401,10 +402,10 @@ static struct inode *dlmfs_get_inode(struct inode *parent,</div><div class='ctx'>  * File creation. Allocate an inode, and we're done..</div><div class='ctx'>  */</div><div class='ctx'> /* SMP-safe */</div><div class='del'>-static int dlmfs_mkdir(struct mnt_idmap * idmap,</div><div class='del'>-		       struct inode * dir,</div><div class='del'>-		       struct dentry * dentry,</div><div class='del'>-		       umode_t mode)</div><div class='add'>+static struct dentry *dlmfs_mkdir(struct mnt_idmap * idmap,</div><div class='add'>+				  struct inode * dir,</div><div class='add'>+				  struct dentry * dentry,</div><div class='add'>+				  umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='hunk'>@@ -440,14 +441,13 @@ static int dlmfs_mkdir(struct mnt_idmap * idmap,</div><div class='ctx'> 	ip-&gt;ip_conn = conn;</div><div class='ctx'> </div><div class='ctx'> 	inc_nlink(dir);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	dget(dentry);	/* Extra count - pin the dentry in core */</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> </div><div class='ctx'> 	status = 0;</div><div class='ctx'> bail:</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		iput(inode);</div><div class='del'>-	return status;</div><div class='add'>+	return ERR_PTR(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dlmfs_create(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -479,8 +479,7 @@ static int dlmfs_create(struct mnt_idmap *idmap,</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	dget(dentry);	/* Extra count - pin the dentry in core */</div><div class='add'>+	d_make_persistent(dentry, inode);</div><div class='ctx'> bail:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -506,9 +505,7 @@ bail:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dlmfs_fill_super(struct super_block * sb,</div><div class='del'>-			    void * data,</div><div class='del'>-			    int silent)</div><div class='add'>+static int dlmfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='ctx'> 	sb-&gt;s_blocksize = PAGE_SIZE;</div><div class='hunk'>@@ -548,7 +545,7 @@ static const struct super_operations dlmfs_ops = {</div><div class='ctx'> 	.alloc_inode	= dlmfs_alloc_inode,</div><div class='ctx'> 	.free_inode	= dlmfs_free_inode,</div><div class='ctx'> 	.evict_inode	= dlmfs_evict_inode,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations dlmfs_file_inode_operations = {</div><div class='hunk'>@@ -556,17 +553,27 @@ static const struct inode_operations dlmfs_file_inode_operations = {</div><div class='ctx'> 	.setattr	= dlmfs_file_setattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dentry *dlmfs_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int dlmfs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_nodev(fc, dlmfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations dlmfs_context_ops = {</div><div class='add'>+	.get_tree       = dlmfs_get_tree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dlmfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_nodev(fs_type, flags, data, dlmfs_fill_super);</div><div class='add'>+	fc-&gt;ops = &amp;dlmfs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type dlmfs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "ocfs2_dlmfs",</div><div class='del'>-	.mount		= dlmfs_mount,</div><div class='del'>-	.kill_sb	= kill_litter_super,</div><div class='add'>+	.kill_sb	= kill_anon_super,</div><div class='add'>+	.init_fs_context = dlmfs_init_fs_context,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("ocfs2_dlmfs");</div><div class='ctx'> </div><div class='hunk'>@@ -578,7 +585,7 @@ static int __init init_dlmfs_fs(void)</div><div class='ctx'> 	dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache",</div><div class='ctx'> 				sizeof(struct dlmfs_inode_private),</div><div class='ctx'> 				0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-					SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+					SLAB_ACCOUNT),</div><div class='ctx'> 				dlmfs_init_once);</div><div class='ctx'> 	if (!dlmfs_inode_cache) {</div><div class='ctx'> 		status = -ENOMEM;</div><div class='hunk'>@@ -586,7 +593,8 @@ static int __init init_dlmfs_fs(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	cleanup_inode = 1;</div><div class='ctx'> </div><div class='del'>-	user_dlm_worker = alloc_workqueue("user_dlm", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	user_dlm_worker = alloc_workqueue("user_dlm",</div><div class='add'>+					  WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 	if (!user_dlm_worker) {</div><div class='ctx'> 		status = -ENOMEM;</div><div class='ctx'> 		goto bail;</div><div class='head'>diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c<br/>index 64a6ef638495..619ff03b15d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlmglue.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlmglue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlmglue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlmglue.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MLOG_MASK_PREFIX ML_DLM_GLUE</div><div class='ctx'> #include &lt;cluster/masklog.h&gt;</div><div class='hunk'>@@ -221,12 +222,12 @@ struct ocfs2_lock_res_ops {</div><div class='ctx'>  */</div><div class='ctx'> #define LOCK_TYPE_USES_LVB		0x2</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_inode_rw_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_inode_rw_lops = {</div><div class='ctx'> 	.get_osb	= ocfs2_get_inode_osb,</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_inode_inode_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_inode_inode_lops = {</div><div class='ctx'> 	.get_osb	= ocfs2_get_inode_osb,</div><div class='ctx'> 	.check_downconvert = ocfs2_check_meta_downconvert,</div><div class='ctx'> 	.set_lvb	= ocfs2_set_meta_lvb,</div><div class='hunk'>@@ -234,50 +235,50 @@ static struct ocfs2_lock_res_ops ocfs2_inode_inode_lops = {</div><div class='ctx'> 	.flags		= LOCK_TYPE_REQUIRES_REFRESH|LOCK_TYPE_USES_LVB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_super_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_super_lops = {</div><div class='ctx'> 	.flags		= LOCK_TYPE_REQUIRES_REFRESH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_rename_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_rename_lops = {</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_nfs_sync_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_nfs_sync_lops = {</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_trim_fs_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_trim_fs_lops = {</div><div class='ctx'> 	.flags		= LOCK_TYPE_REQUIRES_REFRESH|LOCK_TYPE_USES_LVB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_orphan_scan_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_orphan_scan_lops = {</div><div class='ctx'> 	.flags		= LOCK_TYPE_REQUIRES_REFRESH|LOCK_TYPE_USES_LVB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_dentry_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_dentry_lops = {</div><div class='ctx'> 	.get_osb	= ocfs2_get_dentry_osb,</div><div class='ctx'> 	.post_unlock	= ocfs2_dentry_post_unlock,</div><div class='ctx'> 	.downconvert_worker = ocfs2_dentry_convert_worker,</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_inode_open_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_inode_open_lops = {</div><div class='ctx'> 	.get_osb	= ocfs2_get_inode_osb,</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_flock_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_flock_lops = {</div><div class='ctx'> 	.get_osb	= ocfs2_get_file_osb,</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_qinfo_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_qinfo_lops = {</div><div class='ctx'> 	.set_lvb	= ocfs2_set_qinfo_lvb,</div><div class='ctx'> 	.get_osb	= ocfs2_get_qinfo_osb,</div><div class='ctx'> 	.flags		= LOCK_TYPE_REQUIRES_REFRESH | LOCK_TYPE_USES_LVB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_lock_res_ops ocfs2_refcount_block_lops = {</div><div class='add'>+static const struct ocfs2_lock_res_ops ocfs2_refcount_block_lops = {</div><div class='ctx'> 	.check_downconvert = ocfs2_check_refcount_downconvert,</div><div class='ctx'> 	.downconvert_worker = ocfs2_refcount_convert_worker,</div><div class='ctx'> 	.flags		= 0,</div><div class='hunk'>@@ -510,7 +511,7 @@ static inline void ocfs2_init_start_time(struct ocfs2_mask_waiter *mw)</div><div class='ctx'> static void ocfs2_lock_res_init_common(struct ocfs2_super *osb,</div><div class='ctx'> 				       struct ocfs2_lock_res *res,</div><div class='ctx'> 				       enum ocfs2_lock_type type,</div><div class='del'>-				       struct ocfs2_lock_res_ops *ops,</div><div class='add'>+				       const struct ocfs2_lock_res_ops *ops,</div><div class='ctx'> 				       void *priv)</div><div class='ctx'> {</div><div class='ctx'> 	res-&gt;l_type          = type;</div><div class='hunk'>@@ -553,7 +554,7 @@ void ocfs2_inode_lock_res_init(struct ocfs2_lock_res *res,</div><div class='ctx'> 			       unsigned int generation,</div><div class='ctx'> 			       struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct ocfs2_lock_res_ops *ops;</div><div class='add'>+	const struct ocfs2_lock_res_ops *ops;</div><div class='ctx'> </div><div class='ctx'> 	switch(type) {</div><div class='ctx'> 		case OCFS2_LOCK_TYPE_RW:</div><div class='hunk'>@@ -794,7 +795,7 @@ void ocfs2_lock_res_free(struct ocfs2_lock_res *res)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Keep a list of processes who have interest in a lockres.</div><div class='del'>- * Note: this is now only uesed for check recursive cluster locking.</div><div class='add'>+ * Note: this is now only used for check recursive cluster locking.</div><div class='ctx'>  */</div><div class='ctx'> static inline void ocfs2_add_holder(struct ocfs2_lock_res *lockres,</div><div class='ctx'> 				   struct ocfs2_lock_holder *oh)</div><div class='hunk'>@@ -1615,7 +1616,7 @@ update_holders:</div><div class='ctx'> unlock:</div><div class='ctx'> 	lockres_clear_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING);</div><div class='ctx'> </div><div class='del'>-	/* ocfs2_unblock_lock reques on seeing OCFS2_LOCK_UPCONVERT_FINISHING */</div><div class='add'>+	/* ocfs2_unblock_lock request on seeing OCFS2_LOCK_UPCONVERT_FINISHING */</div><div class='ctx'> 	kick_dc = (lockres-&gt;l_flags &amp; OCFS2_LOCK_BLOCKED);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lockres-&gt;l_lock, flags);</div><div class='hunk'>@@ -2486,7 +2487,7 @@ update:</div><div class='ctx'> 	 * which hasn't been populated yet, so clear the refresh flag</div><div class='ctx'> 	 * and let the caller handle it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 		if (lockres)</div><div class='ctx'> 			ocfs2_complete_lock_res_refresh(lockres, 0);</div><div class='hunk'>@@ -2529,30 +2530,28 @@ bail:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is working around a lock inversion between tasks acquiring DLM</div><div class='del'>- * locks while holding a page lock and the downconvert thread which</div><div class='del'>- * blocks dlm lock acquiry while acquiring page locks.</div><div class='add'>+ * locks while holding a folio lock and the downconvert thread which</div><div class='add'>+ * blocks dlm lock acquiry while acquiring folio locks.</div><div class='ctx'>  *</div><div class='del'>- * ** These _with_page variantes are only intended to be called from aop</div><div class='del'>- * methods that hold page locks and return a very specific *positive* error</div><div class='add'>+ * ** These _with_folio variants are only intended to be called from aop</div><div class='add'>+ * methods that hold folio locks and return a very specific *positive* error</div><div class='ctx'>  * code that aop methods pass up to the VFS -- test for errors with != 0. **</div><div class='ctx'>  *</div><div class='ctx'>  * The DLM is called such that it returns -EAGAIN if it would have</div><div class='ctx'>  * blocked waiting for the downconvert thread.  In that case we unlock</div><div class='del'>- * our page so the downconvert thread can make progress.  Once we've</div><div class='add'>+ * our folio so the downconvert thread can make progress.  Once we've</div><div class='ctx'>  * done this we have to return AOP_TRUNCATED_PAGE so the aop method</div><div class='ctx'>  * that called us can bubble that back up into the VFS who will then</div><div class='ctx'>  * immediately retry the aop call.</div><div class='ctx'>  */</div><div class='del'>-int ocfs2_inode_lock_with_page(struct inode *inode,</div><div class='del'>-			      struct buffer_head **ret_bh,</div><div class='del'>-			      int ex,</div><div class='del'>-			      struct page *page)</div><div class='add'>+int ocfs2_inode_lock_with_folio(struct inode *inode,</div><div class='add'>+		struct buffer_head **ret_bh, int ex, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_inode_lock_full(inode, ret_bh, ex, OCFS2_LOCK_NONBLOCK);</div><div class='ctx'> 	if (ret == -EAGAIN) {</div><div class='del'>-		unlock_page(page);</div><div class='add'>+		folio_unlock(folio);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we can't get inode lock immediately, we should not return</div><div class='ctx'> 		 * directly here, since this will lead to a softlockup problem.</div><div class='hunk'>@@ -2630,7 +2629,7 @@ void ocfs2_inode_unlock(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This _tracker variantes are introduced to deal with the recursive cluster</div><div class='add'>+ * This _tracker variants are introduced to deal with the recursive cluster</div><div class='ctx'>  * locking issue. The idea is to keep track of a lock holder on the stack of</div><div class='ctx'>  * the current process. If there's a lock holder on the stack, we know the</div><div class='ctx'>  * task context is already protected by cluster locking. Currently, they're</div><div class='hunk'>@@ -2735,7 +2734,7 @@ void ocfs2_inode_unlock_tracker(struct inode *inode,</div><div class='ctx'> 	struct ocfs2_lock_res *lockres;</div><div class='ctx'> </div><div class='ctx'> 	lockres = &amp;OCFS2_I(inode)-&gt;ip_inode_lockres;</div><div class='del'>-	/* had_lock means that the currect process already takes the cluster</div><div class='add'>+	/* had_lock means that the current process already takes the cluster</div><div class='ctx'> 	 * lock previously.</div><div class='ctx'> 	 * If had_lock is 1, we have nothing to do here.</div><div class='ctx'> 	 * If had_lock is 0, we will release the lock.</div><div class='hunk'>@@ -3110,6 +3109,7 @@ static void *ocfs2_dlm_seq_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='ctx'> 	struct ocfs2_lock_res *iter = v;</div><div class='ctx'> 	struct ocfs2_lock_res *dummy = &amp;priv-&gt;p_iter_res;</div><div class='ctx'> </div><div class='add'>+	(*pos)++;</div><div class='ctx'> 	spin_lock(&amp;ocfs2_dlm_tracking_lock);</div><div class='ctx'> 	iter = ocfs2_dlm_next_res(iter, priv);</div><div class='ctx'> 	list_del_init(&amp;dummy-&gt;l_debug_list);</div><div class='hunk'>@@ -3151,11 +3151,8 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)</div><div class='ctx'> #ifdef CONFIG_OCFS2_FS_STATS</div><div class='ctx'> 	if (!lockres-&gt;l_lock_wait &amp;&amp; dlm_debug-&gt;d_filter_secs) {</div><div class='ctx'> 		now = ktime_to_us(ktime_get_real());</div><div class='del'>-		if (lockres-&gt;l_lock_prmode.ls_last &gt;</div><div class='del'>-		    lockres-&gt;l_lock_exmode.ls_last)</div><div class='del'>-			last = lockres-&gt;l_lock_prmode.ls_last;</div><div class='del'>-		else</div><div class='del'>-			last = lockres-&gt;l_lock_exmode.ls_last;</div><div class='add'>+		last = max(lockres-&gt;l_lock_prmode.ls_last,</div><div class='add'>+			   lockres-&gt;l_lock_exmode.ls_last);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Use d_filter_secs field to filter lock resources dump,</div><div class='ctx'> 		 * the default d_filter_secs(0) value filters nothing,</div><div class='hunk'>@@ -3804,9 +3801,9 @@ recheck:</div><div class='ctx'> 	 * set when the ast is received for an upconvert just before the</div><div class='ctx'> 	 * OCFS2_LOCK_BUSY flag is cleared. Now if the fs received a bast</div><div class='ctx'> 	 * on the heels of the ast, we want to delay the downconvert just</div><div class='del'>-	 * enough to allow the up requestor to do its task. Because this</div><div class='add'>+	 * enough to allow the up requester to do its task. Because this</div><div class='ctx'> 	 * lock is in the blocked queue, the lock will be downconverted</div><div class='del'>-	 * as soon as the requestor is done with the lock.</div><div class='add'>+	 * as soon as the requester is done with the lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (lockres-&gt;l_flags &amp; OCFS2_LOCK_UPCONVERT_FINISHING)</div><div class='ctx'> 		goto leave_requeue;</div><div class='hunk'>@@ -4341,7 +4338,7 @@ unqueue:</div><div class='ctx'> 		ocfs2_schedule_blocked_lock(osb, lockres);</div><div class='ctx'> </div><div class='ctx'> 	mlog(ML_BASTS, "lockres %s, requeue = %s.\n", lockres-&gt;l_name,</div><div class='del'>-	     ctl.requeue ? "yes" : "no");</div><div class='add'>+	     str_yes_no(ctl.requeue));</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lockres-&gt;l_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ctl.unblock_action != UNBLOCK_CONTINUE</div><div class='head'>diff --git a/fs/ocfs2/dlmglue.h b/fs/ocfs2/dlmglue.h<br/>index e5da5809ed95..a3ebd7303ea2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlmglue.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/dlmglue.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/dlmglue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/dlmglue.h</a></div><div class='hunk'>@@ -137,10 +137,8 @@ int ocfs2_inode_lock_full_nested(struct inode *inode,</div><div class='ctx'> 			 int ex,</div><div class='ctx'> 			 int arg_flags,</div><div class='ctx'> 			 int subclass);</div><div class='del'>-int ocfs2_inode_lock_with_page(struct inode *inode,</div><div class='del'>-			      struct buffer_head **ret_bh,</div><div class='del'>-			      int ex,</div><div class='del'>-			      struct page *page);</div><div class='add'>+int ocfs2_inode_lock_with_folio(struct inode *inode,</div><div class='add'>+		struct buffer_head **ret_bh, int ex, struct folio *folio);</div><div class='ctx'> /* Variants without special locking class or flags */</div><div class='ctx'> #define ocfs2_inode_lock_full(i, r, e, f)\</div><div class='ctx'> 		ocfs2_inode_lock_full_nested(i, r, e, f, OI_LS_NORMAL)</div><div class='head'>diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c<br/>index b8b6a191b5cb..b95724b767e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/export.c</a></div><div class='hunk'>@@ -255,9 +255,9 @@ static struct dentry *ocfs2_fh_to_dentry(struct super_block *sb,</div><div class='ctx'> 	if (fh_len &lt; 3 || fh_type &gt; 2)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	handle.ih_blkno = (u64)le32_to_cpu(fid-&gt;raw[0]) &lt;&lt; 32;</div><div class='del'>-	handle.ih_blkno |= (u64)le32_to_cpu(fid-&gt;raw[1]);</div><div class='del'>-	handle.ih_generation = le32_to_cpu(fid-&gt;raw[2]);</div><div class='add'>+	handle.ih_blkno = (u64)le32_to_cpu((__force __le32)fid-&gt;raw[0]) &lt;&lt; 32;</div><div class='add'>+	handle.ih_blkno |= (u64)le32_to_cpu((__force __le32)fid-&gt;raw[1]);</div><div class='add'>+	handle.ih_generation = le32_to_cpu((__force __le32)fid-&gt;raw[2]);</div><div class='ctx'> 	return ocfs2_get_dentry(sb, &amp;handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -269,9 +269,9 @@ static struct dentry *ocfs2_fh_to_parent(struct super_block *sb,</div><div class='ctx'> 	if (fh_type != 2 || fh_len &lt; 6)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	parent.ih_blkno = (u64)le32_to_cpu(fid-&gt;raw[3]) &lt;&lt; 32;</div><div class='del'>-	parent.ih_blkno |= (u64)le32_to_cpu(fid-&gt;raw[4]);</div><div class='del'>-	parent.ih_generation = le32_to_cpu(fid-&gt;raw[5]);</div><div class='add'>+	parent.ih_blkno = (u64)le32_to_cpu((__force __le32)fid-&gt;raw[3]) &lt;&lt; 32;</div><div class='add'>+	parent.ih_blkno |= (u64)le32_to_cpu((__force __le32)fid-&gt;raw[4]);</div><div class='add'>+	parent.ih_generation = le32_to_cpu((__force __le32)fid-&gt;raw[5]);</div><div class='ctx'> 	return ocfs2_get_dentry(sb, &amp;parent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -280,5 +280,4 @@ const struct export_operations ocfs2_export_ops = {</div><div class='ctx'> 	.fh_to_dentry	= ocfs2_fh_to_dentry,</div><div class='ctx'> 	.fh_to_parent	= ocfs2_fh_to_parent,</div><div class='ctx'> 	.get_parent	= ocfs2_get_parent,</div><div class='del'>-	.flags		= EXPORT_OP_ASYNC_LOCK,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c<br/>index 70a768b623cf..ef147e8b3271 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/extent_map.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/extent_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/extent_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/extent_map.c</a></div><div class='hunk'>@@ -435,6 +435,16 @@ static int ocfs2_get_clusters_nocache(struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (le16_to_cpu(el-&gt;l_next_free_rec) &gt; le16_to_cpu(el-&gt;l_count)) {</div><div class='add'>+		ocfs2_error(inode-&gt;i_sb,</div><div class='add'>+			    "Inode %lu has an invalid extent (next_free_rec %u, count %u)\n",</div><div class='add'>+			    inode-&gt;i_ino,</div><div class='add'>+			    le16_to_cpu(el-&gt;l_next_free_rec),</div><div class='add'>+			    le16_to_cpu(el-&gt;l_count));</div><div class='add'>+		ret = -EROFS;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	i = ocfs2_search_extent_list(el, v_cluster);</div><div class='ctx'> 	if (i == -1) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -696,6 +706,8 @@ out:</div><div class='ctx'>  * it not only handles the fiemap for inlined files, but also deals</div><div class='ctx'>  * with the fast symlink, cause they have no difference for extent</div><div class='ctx'>  * mapping per se.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with ip_alloc_sem semaphore held.</div><div class='ctx'>  */</div><div class='ctx'> static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh,</div><div class='ctx'> 			       struct fiemap_extent_info *fieinfo,</div><div class='hunk'>@@ -707,6 +719,7 @@ static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh,</div><div class='ctx'> 	u64 phys;</div><div class='ctx'> 	u32 flags = FIEMAP_EXTENT_DATA_INLINE|FIEMAP_EXTENT_LAST;</div><div class='ctx'> 	struct ocfs2_inode_info *oi = OCFS2_I(inode);</div><div class='add'>+	lockdep_assert_held_read(&amp;oi-&gt;ip_alloc_sem);</div><div class='ctx'> </div><div class='ctx'> 	di = (struct ocfs2_dinode *)di_bh-&gt;b_data;</div><div class='ctx'> 	if (ocfs2_inode_is_fast_symlink(inode))</div><div class='hunk'>@@ -722,8 +735,11 @@ static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh,</div><div class='ctx'> 			phys += offsetof(struct ocfs2_dinode,</div><div class='ctx'> 					 id2.i_data.id_data);</div><div class='ctx'> </div><div class='add'>+		/* Release the ip_alloc_sem to prevent deadlock on page fault */</div><div class='add'>+		up_read(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> 		ret = fiemap_fill_next_extent(fieinfo, 0, phys, id_count,</div><div class='ctx'> 					      flags);</div><div class='add'>+		down_read(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -792,9 +808,11 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		len_bytes = (u64)le16_to_cpu(rec.e_leaf_clusters) &lt;&lt; osb-&gt;s_clustersize_bits;</div><div class='ctx'> 		phys_bytes = le64_to_cpu(rec.e_blkno) &lt;&lt; osb-&gt;sb-&gt;s_blocksize_bits;</div><div class='ctx'> 		virt_bytes = (u64)le32_to_cpu(rec.e_cpos) &lt;&lt; osb-&gt;s_clustersize_bits;</div><div class='del'>-</div><div class='add'>+		/* Release the ip_alloc_sem to prevent deadlock on page fault */</div><div class='add'>+		up_read(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> 		ret = fiemap_fill_next_extent(fieinfo, virt_bytes, phys_bytes,</div><div class='ctx'> 					      len_bytes, fe_flags);</div><div class='add'>+		down_read(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -973,7 +991,13 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (done &lt; nr) {</div><div class='del'>-		down_read(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='add'>+		if (!down_read_trylock(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem)) {</div><div class='add'>+			rc = -EAGAIN;</div><div class='add'>+			mlog(ML_ERROR,</div><div class='add'>+				 "Inode #%llu ip_alloc_sem is temporarily unavailable\n",</div><div class='add'>+				 (unsigned long long)OCFS2_I(inode)-&gt;ip_blkno);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		rc = ocfs2_extent_map_get_blocks(inode, v_block + done,</div><div class='ctx'> 						 &amp;p_block, &amp;p_count, NULL);</div><div class='ctx'> 		up_read(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='head'>diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c<br/>index 8b6d15010703..21d797ccccd0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/file.c</a></div><div class='hunk'>@@ -755,7 +755,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,</div><div class='ctx'> 				 u64 abs_to, struct buffer_head *di_bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	unsigned long index = abs_from &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -774,18 +774,19 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page = find_or_create_page(mapping, index, GFP_NOFS);</div><div class='del'>-	if (!page) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	folio = __filemap_get_folio(mapping, index,</div><div class='add'>+			FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='add'>+		ret = PTR_ERR(folio);</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> 		goto out_commit_trans;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get the offsets within the page that we want to zero */</div><div class='del'>-	zero_from = abs_from &amp; (PAGE_SIZE - 1);</div><div class='del'>-	zero_to = abs_to &amp; (PAGE_SIZE - 1);</div><div class='add'>+	/* Get the offsets within the folio that we want to zero */</div><div class='add'>+	zero_from = offset_in_folio(folio, abs_from);</div><div class='add'>+	zero_to = offset_in_folio(folio, abs_to);</div><div class='ctx'> 	if (!zero_to)</div><div class='del'>-		zero_to = PAGE_SIZE;</div><div class='add'>+		zero_to = folio_size(folio);</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_write_zero_page(</div><div class='ctx'> 			(unsigned long long)OCFS2_I(inode)-&gt;ip_blkno,</div><div class='hunk'>@@ -803,7 +804,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,</div><div class='ctx'> 		 * __block_write_begin and block_commit_write to zero the</div><div class='ctx'> 		 * whole block.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = __block_write_begin(page, block_start + 1, 0,</div><div class='add'>+		ret = __block_write_begin(folio, block_start + 1, 0,</div><div class='ctx'> 					  ocfs2_get_block);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			mlog_errno(ret);</div><div class='hunk'>@@ -812,7 +813,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 		/* must not update i_size! */</div><div class='del'>-		block_commit_write(page, block_start + 1, block_start + 1);</div><div class='add'>+		block_commit_write(folio, block_start + 1, block_start + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -833,8 +834,8 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> out_commit_trans:</div><div class='ctx'> 	if (handle)</div><div class='ctx'> 		ocfs2_commit_trans(OCFS2_SB(inode-&gt;i_sb), handle);</div><div class='hunk'>@@ -1128,9 +1129,12 @@ int ocfs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	trace_ocfs2_setattr(inode, dentry,</div><div class='ctx'> 			    (unsigned long long)OCFS2_I(inode)-&gt;ip_blkno,</div><div class='ctx'> 			    dentry-&gt;d_name.len, dentry-&gt;d_name.name,</div><div class='del'>-			    attr-&gt;ia_valid, attr-&gt;ia_mode,</div><div class='del'>-			    from_kuid(&amp;init_user_ns, attr-&gt;ia_uid),</div><div class='del'>-			    from_kgid(&amp;init_user_ns, attr-&gt;ia_gid));</div><div class='add'>+			    attr-&gt;ia_valid,</div><div class='add'>+				attr-&gt;ia_valid &amp; ATTR_MODE ? attr-&gt;ia_mode : 0,</div><div class='add'>+				attr-&gt;ia_valid &amp; ATTR_UID ?</div><div class='add'>+					from_kuid(&amp;init_user_ns, attr-&gt;ia_uid) : 0,</div><div class='add'>+				attr-&gt;ia_valid &amp; ATTR_GID ?</div><div class='add'>+					from_kgid(&amp;init_user_ns, attr-&gt;ia_gid) : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* ensuring we don't even attempt to truncate a symlink */</div><div class='ctx'> 	if (S_ISLNK(inode-&gt;i_mode))</div><div class='hunk'>@@ -1783,6 +1787,14 @@ int ocfs2_remove_inode_range(struct inode *inode,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (OCFS2_I(inode)-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL) {</div><div class='add'>+		int id_count = ocfs2_max_inline_data_with_xattr(inode-&gt;i_sb, di);</div><div class='add'>+</div><div class='add'>+		if (byte_start &gt; id_count || byte_start + byte_len &gt; id_count) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			mlog_errno(ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ret = ocfs2_truncate_inline(inode, di_bh, byte_start,</div><div class='ctx'> 					    byte_start + byte_len, 0);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1936,6 +1948,8 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> </div><div class='add'>+	/* Wait all existing dio workers, newcomers will block on i_rwsem */</div><div class='add'>+	inode_dio_wait(inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This prevents concurrent writes on other nodes</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2384,6 +2398,8 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,</div><div class='ctx'> 	} else</div><div class='ctx'> 		inode_lock(inode);</div><div class='ctx'> </div><div class='add'>+	ocfs2_iocb_init_rw_locked(iocb);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Concurrent O_DIRECT writes are allowed with</div><div class='ctx'> 	 * mount_option "coherency=buffered".</div><div class='hunk'>@@ -2530,6 +2546,8 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,</div><div class='ctx'> 	if (!direct_io &amp;&amp; nowait)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	ocfs2_iocb_init_rw_locked(iocb);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * buffered reads protect themselves in -&gt;read_folio().  O_DIRECT reads</div><div class='ctx'> 	 * need locks to protect pending reads from racing with truncate.</div><div class='hunk'>@@ -2748,6 +2766,13 @@ out_unlock:</div><div class='ctx'> 	return remapped &gt; 0 ? remapped : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static loff_t ocfs2_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='add'>+{</div><div class='add'>+	struct ocfs2_file_private *fp = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return generic_llseek_cookie(file, offset, whence, &amp;fp-&gt;cookie);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct inode_operations ocfs2_file_iops = {</div><div class='ctx'> 	.setattr	= ocfs2_setattr,</div><div class='ctx'> 	.getattr	= ocfs2_getattr,</div><div class='hunk'>@@ -2763,6 +2788,7 @@ const struct inode_operations ocfs2_file_iops = {</div><div class='ctx'> const struct inode_operations ocfs2_special_file_iops = {</div><div class='ctx'> 	.setattr	= ocfs2_setattr,</div><div class='ctx'> 	.getattr	= ocfs2_getattr,</div><div class='add'>+	.listxattr	= ocfs2_listxattr,</div><div class='ctx'> 	.permission	= ocfs2_permission,</div><div class='ctx'> 	.get_inode_acl	= ocfs2_iop_get_acl,</div><div class='ctx'> 	.set_acl	= ocfs2_iop_set_acl,</div><div class='hunk'>@@ -2774,7 +2800,7 @@ const struct inode_operations ocfs2_special_file_iops = {</div><div class='ctx'>  */</div><div class='ctx'> const struct file_operations ocfs2_fops = {</div><div class='ctx'> 	.llseek		= ocfs2_file_llseek,</div><div class='del'>-	.mmap		= ocfs2_mmap,</div><div class='add'>+	.mmap_prepare	= ocfs2_mmap_prepare,</div><div class='ctx'> 	.fsync		= ocfs2_sync_file,</div><div class='ctx'> 	.release	= ocfs2_file_release,</div><div class='ctx'> 	.open		= ocfs2_file_open,</div><div class='hunk'>@@ -2790,11 +2816,12 @@ const struct file_operations ocfs2_fops = {</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='ctx'> 	.fallocate	= ocfs2_fallocate,</div><div class='ctx'> 	.remap_file_range = ocfs2_remap_file_range,</div><div class='add'>+	.fop_flags	= FOP_ASYNC_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> WRAP_DIR_ITER(ocfs2_readdir) // FIXME!</div><div class='ctx'> const struct file_operations ocfs2_dops = {</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='add'>+	.llseek		= ocfs2_dir_llseek,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='ctx'> 	.iterate_shared	= shared_ocfs2_readdir,</div><div class='ctx'> 	.fsync		= ocfs2_sync_file,</div><div class='hunk'>@@ -2806,6 +2833,7 @@ const struct file_operations ocfs2_dops = {</div><div class='ctx'> #endif</div><div class='ctx'> 	.lock		= ocfs2_lock,</div><div class='ctx'> 	.flock		= ocfs2_flock,</div><div class='add'>+	.fop_flags	= FOP_ASYNC_LOCK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2822,7 +2850,7 @@ const struct file_operations ocfs2_dops = {</div><div class='ctx'>  */</div><div class='ctx'> const struct file_operations ocfs2_fops_no_plocks = {</div><div class='ctx'> 	.llseek		= ocfs2_file_llseek,</div><div class='del'>-	.mmap		= ocfs2_mmap,</div><div class='add'>+	.mmap_prepare	= ocfs2_mmap_prepare,</div><div class='ctx'> 	.fsync		= ocfs2_sync_file,</div><div class='ctx'> 	.release	= ocfs2_file_release,</div><div class='ctx'> 	.open		= ocfs2_file_open,</div><div class='hunk'>@@ -2840,7 +2868,7 @@ const struct file_operations ocfs2_fops_no_plocks = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct file_operations ocfs2_dops_no_plocks = {</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='add'>+	.llseek		= ocfs2_dir_llseek,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='ctx'> 	.iterate_shared	= shared_ocfs2_readdir,</div><div class='ctx'> 	.fsync		= ocfs2_sync_file,</div><div class='head'>diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h<br/>index 8e53e4ac1120..41e65e45a9f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/file.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/file.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@ struct ocfs2_alloc_context;</div><div class='ctx'> enum ocfs2_alloc_restarted;</div><div class='ctx'> </div><div class='ctx'> struct ocfs2_file_private {</div><div class='add'>+	u64			cookie;</div><div class='ctx'> 	struct file		*fp_file;</div><div class='ctx'> 	struct mutex		fp_mutex;</div><div class='ctx'> 	struct ocfs2_lock_res	fp_flock;</div><div class='head'>diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c<br/>index 1ad7106741f8..3ad7baf67658 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/filecheck.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/filecheck.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/filecheck.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/filecheck.c</a></div><div class='hunk'>@@ -505,5 +505,5 @@ static ssize_t ocfs2_filecheck_attr_store(struct kobject *kobj,</div><div class='ctx'> 		ocfs2_filecheck_handle_entry(ent, entry);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	return (!ret ? count : ret);</div><div class='add'>+	return ret ?: count;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c<br/>index 999111bfc271..8340525e5589 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/inode.c</a></div><div class='hunk'>@@ -50,8 +50,6 @@ struct ocfs2_find_inode_args</div><div class='ctx'> 	unsigned int	fi_sysfile_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct lock_class_key ocfs2_sysfile_lock_key[NUM_SYSTEM_INODES];</div><div class='del'>-</div><div class='ctx'> static int ocfs2_read_locked_inode(struct inode *inode,</div><div class='ctx'> 				   struct ocfs2_find_inode_args *args);</div><div class='ctx'> static int ocfs2_init_locked_inode(struct inode *inode, void *opaque);</div><div class='hunk'>@@ -154,8 +152,8 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags,</div><div class='ctx'> 		mlog_errno(PTR_ERR(inode));</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='del'>-	trace_ocfs2_iget5_locked(inode-&gt;i_state);</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	trace_ocfs2_iget5_locked(inode_state_read_once(inode));</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		rc = ocfs2_read_locked_inode(inode, &amp;args);</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,6 +198,22 @@ bail:</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ocfs2_dinode_has_extents(struct ocfs2_dinode *di)</div><div class='add'>+{</div><div class='add'>+	/* inodes flagged with other stuff in id2 */</div><div class='add'>+	if (le32_to_cpu(di-&gt;i_flags) &amp;</div><div class='add'>+	    (OCFS2_SUPER_BLOCK_FL | OCFS2_LOCAL_ALLOC_FL | OCFS2_CHAIN_FL |</div><div class='add'>+	     OCFS2_DEALLOC_FL))</div><div class='add'>+		return 0;</div><div class='add'>+	/* i_flags doesn't indicate when id2 is a fast symlink */</div><div class='add'>+	if (S_ISLNK(le16_to_cpu(di-&gt;i_mode)) &amp;&amp; le64_to_cpu(di-&gt;i_size) &amp;&amp;</div><div class='add'>+	    !le32_to_cpu(di-&gt;i_clusters))</div><div class='add'>+		return 0;</div><div class='add'>+	if (le16_to_cpu(di-&gt;i_dyn_features) &amp; OCFS2_INLINE_DATA_FL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * here's how inodes get read from disk:</div><div class='hunk'>@@ -236,14 +250,77 @@ bail:</div><div class='ctx'> static int ocfs2_init_locked_inode(struct inode *inode, void *opaque)</div><div class='ctx'> {</div><div class='ctx'> 	struct ocfs2_find_inode_args *args = opaque;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	static struct lock_class_key ocfs2_sysfile_lock_key[NUM_SYSTEM_INODES];</div><div class='ctx'> 	static struct lock_class_key ocfs2_quota_ip_alloc_sem_key,</div><div class='ctx'> 				     ocfs2_file_ip_alloc_sem_key;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_ino = args-&gt;fi_ino;</div><div class='ctx'> 	OCFS2_I(inode)-&gt;ip_blkno = args-&gt;fi_blkno;</div><div class='del'>-	if (args-&gt;fi_sysfile_type != 0)</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	switch (args-&gt;fi_sysfile_type) {</div><div class='add'>+	case BAD_BLOCK_SYSTEM_INODE:</div><div class='add'>+		break;</div><div class='add'>+	case GLOBAL_INODE_ALLOC_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[GLOBAL_INODE_ALLOC_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case SLOT_MAP_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[SLOT_MAP_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case HEARTBEAT_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[HEARTBEAT_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case GLOBAL_BITMAP_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[GLOBAL_BITMAP_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case USER_QUOTA_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[USER_QUOTA_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case GROUP_QUOTA_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[GROUP_QUOTA_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case ORPHAN_DIR_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[ORPHAN_DIR_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case EXTENT_ALLOC_SYSTEM_INODE:</div><div class='ctx'> 		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='del'>-			&amp;ocfs2_sysfile_lock_key[args-&gt;fi_sysfile_type]);</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[EXTENT_ALLOC_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case INODE_ALLOC_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[INODE_ALLOC_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case JOURNAL_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[JOURNAL_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case LOCAL_ALLOC_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[LOCAL_ALLOC_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case TRUNCATE_LOG_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[TRUNCATE_LOG_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case LOCAL_USER_QUOTA_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[LOCAL_USER_QUOTA_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	case LOCAL_GROUP_QUOTA_SYSTEM_INODE:</div><div class='add'>+		lockdep_set_class(&amp;inode-&gt;i_rwsem,</div><div class='add'>+				  &amp;ocfs2_sysfile_lock_key[LOCAL_GROUP_QUOTA_SYSTEM_INODE]);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Unknown sysfile type %d\n", args-&gt;fi_sysfile_type);</div><div class='add'>+	}</div><div class='ctx'> 	if (args-&gt;fi_sysfile_type == USER_QUOTA_SYSTEM_INODE ||</div><div class='ctx'> 	    args-&gt;fi_sysfile_type == GROUP_QUOTA_SYSTEM_INODE ||</div><div class='ctx'> 	    args-&gt;fi_sysfile_type == LOCAL_USER_QUOTA_SYSTEM_INODE ||</div><div class='hunk'>@@ -253,6 +330,7 @@ static int ocfs2_init_locked_inode(struct inode *inode, void *opaque)</div><div class='ctx'> 	else</div><div class='ctx'> 		lockdep_set_class(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem,</div><div class='ctx'> 				  &amp;ocfs2_file_ip_alloc_sem_key);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1122,7 +1200,7 @@ static void ocfs2_clear_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	dquot_drop(inode);</div><div class='ctx'> </div><div class='del'>-	/* To preven remote deletes we hold open lock before, now it</div><div class='add'>+	/* To prevent remote deletes we hold open lock before, now it</div><div class='ctx'> 	 * is time to unlock PR and EX open locks. */</div><div class='ctx'> 	ocfs2_open_unlock(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -1205,12 +1283,17 @@ static void ocfs2_clear_inode(struct inode *inode)</div><div class='ctx'> 	 * the journal is flushed before journal shutdown. Thus it is safe to</div><div class='ctx'> 	 * have inodes get cleaned up after journal shutdown.</div><div class='ctx'> 	 */</div><div class='add'>+	if (!osb-&gt;journal)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	jbd2_journal_release_jbd_inode(osb-&gt;journal-&gt;j_journal,</div><div class='ctx'> 				       &amp;oi-&gt;ip_jinode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ocfs2_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	write_inode_now(inode, 1);</div><div class='add'>+</div><div class='ctx'> 	if (!inode-&gt;i_nlink ||</div><div class='ctx'> 	    (OCFS2_I(inode)-&gt;ip_flags &amp; OCFS2_INODE_MAYBE_ORPHANED)) {</div><div class='ctx'> 		ocfs2_delete_inode(inode);</div><div class='hunk'>@@ -1220,27 +1303,6 @@ void ocfs2_evict_inode(struct inode *inode)</div><div class='ctx'> 	ocfs2_clear_inode(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Called under inode_lock, with no more references on the</div><div class='del'>- * struct inode, so it's safe here to check the flags field</div><div class='del'>- * and to manipulate i_nlink without any other locks. */</div><div class='del'>-int ocfs2_drop_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct ocfs2_inode_info *oi = OCFS2_I(inode);</div><div class='del'>-</div><div class='del'>-	trace_ocfs2_drop_inode((unsigned long long)oi-&gt;ip_blkno,</div><div class='del'>-				inode-&gt;i_nlink, oi-&gt;ip_flags);</div><div class='del'>-</div><div class='del'>-	assert_spin_locked(&amp;inode-&gt;i_lock);</div><div class='del'>-	inode-&gt;i_state |= I_WILL_FREE;</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-	write_inode_now(inode, 1);</div><div class='del'>-	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	WARN_ON(inode-&gt;i_state &amp; I_NEW);</div><div class='del'>-	inode-&gt;i_state &amp;= ~I_WILL_FREE;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This is called from our getattr.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1400,7 +1462,7 @@ int ocfs2_validate_inode_block(struct super_block *sb,</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(di-&gt;i_flags &amp; cpu_to_le32(OCFS2_VALID_FL))) {</div><div class='add'>+	if (!(le32_to_cpu(di-&gt;i_flags) &amp; OCFS2_VALID_FL)) {</div><div class='ctx'> 		rc = ocfs2_error(sb,</div><div class='ctx'> 				 "Invalid dinode #%llu: OCFS2_VALID_FL not set\n",</div><div class='ctx'> 				 (unsigned long long)bh-&gt;b_blocknr);</div><div class='hunk'>@@ -1416,6 +1478,49 @@ int ocfs2_validate_inode_block(struct super_block *sb,</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (le16_to_cpu(di-&gt;i_suballoc_slot) != (u16)OCFS2_INVALID_SLOT &amp;&amp;</div><div class='add'>+	    (u32)le16_to_cpu(di-&gt;i_suballoc_slot) &gt; OCFS2_SB(sb)-&gt;max_slots - 1) {</div><div class='add'>+		rc = ocfs2_error(sb, "Invalid dinode %llu: suballoc slot %u\n",</div><div class='add'>+				 (unsigned long long)bh-&gt;b_blocknr,</div><div class='add'>+				 le16_to_cpu(di-&gt;i_suballoc_slot));</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((le16_to_cpu(di-&gt;i_dyn_features) &amp; OCFS2_INLINE_DATA_FL) &amp;&amp;</div><div class='add'>+	    le32_to_cpu(di-&gt;i_clusters)) {</div><div class='add'>+		rc = ocfs2_error(sb, "Invalid dinode %llu: %u clusters\n",</div><div class='add'>+				 (unsigned long long)bh-&gt;b_blocknr,</div><div class='add'>+				 le32_to_cpu(di-&gt;i_clusters));</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(di-&gt;i_flags) &amp; OCFS2_CHAIN_FL) {</div><div class='add'>+		struct ocfs2_chain_list *cl = &amp;di-&gt;id2.i_chain;</div><div class='add'>+		u16 bpc = 1 &lt;&lt; (OCFS2_SB(sb)-&gt;s_clustersize_bits -</div><div class='add'>+				sb-&gt;s_blocksize_bits);</div><div class='add'>+</div><div class='add'>+		if (le16_to_cpu(cl-&gt;cl_count) != ocfs2_chain_recs_per_inode(sb)) {</div><div class='add'>+			rc = ocfs2_error(sb, "Invalid dinode %llu: chain list count %u\n",</div><div class='add'>+					 (unsigned long long)bh-&gt;b_blocknr,</div><div class='add'>+					 le16_to_cpu(cl-&gt;cl_count));</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+		if (le16_to_cpu(cl-&gt;cl_next_free_rec) &gt; le16_to_cpu(cl-&gt;cl_count)) {</div><div class='add'>+			rc = ocfs2_error(sb, "Invalid dinode %llu: chain list index %u\n",</div><div class='add'>+					 (unsigned long long)bh-&gt;b_blocknr,</div><div class='add'>+					 le16_to_cpu(cl-&gt;cl_next_free_rec));</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+		if (OCFS2_SB(sb)-&gt;bitmap_blkno &amp;&amp;</div><div class='add'>+		    OCFS2_SB(sb)-&gt;bitmap_blkno != le64_to_cpu(di-&gt;i_blkno) &amp;&amp;</div><div class='add'>+		    le16_to_cpu(cl-&gt;cl_bpc) != bpc) {</div><div class='add'>+			rc = ocfs2_error(sb, "Invalid dinode %llu: bits per cluster %u\n",</div><div class='add'>+					 (unsigned long long)bh-&gt;b_blocknr,</div><div class='add'>+					 le16_to_cpu(cl-&gt;cl_bpc));</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='hunk'>@@ -1437,7 +1542,7 @@ static int ocfs2_filecheck_validate_inode_block(struct super_block *sb,</div><div class='ctx'> 	 * Call ocfs2_validate_meta_ecc() first since it has ecc repair</div><div class='ctx'> 	 * function, but we should not return error immediately when ecc</div><div class='ctx'> 	 * validation fails, because the reason is quite likely the invalid</div><div class='del'>-	 * inode number inputed.</div><div class='add'>+	 * inode number inputted.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rc = ocfs2_validate_meta_ecc(sb, bh-&gt;b_data, &amp;di-&gt;i_check);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -1547,6 +1652,16 @@ static int ocfs2_filecheck_repair_inode_block(struct super_block *sb,</div><div class='ctx'> 		     le32_to_cpu(di-&gt;i_fs_generation));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ocfs2_dinode_has_extents(di) &amp;&amp;</div><div class='add'>+	    le16_to_cpu(di-&gt;id2.i_list.l_next_free_rec) &gt; le16_to_cpu(di-&gt;id2.i_list.l_count)) {</div><div class='add'>+		di-&gt;id2.i_list.l_next_free_rec = di-&gt;id2.i_list.l_count;</div><div class='add'>+		changed = 1;</div><div class='add'>+		mlog(ML_ERROR,</div><div class='add'>+		     "Filecheck: reset dinode #%llu: l_next_free_rec to %u\n",</div><div class='add'>+		     (unsigned long long)bh-&gt;b_blocknr,</div><div class='add'>+		     le16_to_cpu(di-&gt;id2.i_list.l_next_free_rec));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (changed || ocfs2_validate_meta_ecc(sb, bh-&gt;b_data, &amp;di-&gt;i_check)) {</div><div class='ctx'> 		ocfs2_compute_meta_ecc(sb, bh-&gt;b_data, &amp;di-&gt;i_check);</div><div class='ctx'> 		mark_buffer_dirty(bh);</div><div class='hunk'>@@ -1593,6 +1708,8 @@ int ocfs2_read_inode_block_full(struct inode *inode, struct buffer_head **bh,</div><div class='ctx'> 	rc = ocfs2_read_blocks(INODE_CACHE(inode), OCFS2_I(inode)-&gt;ip_blkno,</div><div class='ctx'> 			       1, &amp;tmp, flags, ocfs2_validate_inode_block);</div><div class='ctx'> </div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		make_bad_inode(inode);</div><div class='ctx'> 	/* If ocfs2_read_blocks() got us a new bh, pass it up. */</div><div class='ctx'> 	if (!rc &amp;&amp; !*bh)</div><div class='ctx'> 		*bh = tmp;</div><div class='hunk'>@@ -1621,6 +1738,7 @@ static struct super_block *ocfs2_inode_cache_get_super(struct ocfs2_caching_info</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ocfs2_inode_cache_lock(struct ocfs2_caching_info *ci)</div><div class='add'>+__acquires(&amp;oi-&gt;ip_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct ocfs2_inode_info *oi = cache_info_to_inode(ci);</div><div class='ctx'> </div><div class='hunk'>@@ -1628,6 +1746,7 @@ static void ocfs2_inode_cache_lock(struct ocfs2_caching_info *ci)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ocfs2_inode_cache_unlock(struct ocfs2_caching_info *ci)</div><div class='add'>+__releases(&amp;oi-&gt;ip_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct ocfs2_inode_info *oi = cache_info_to_inode(ci);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h<br/>index 82b28fdacc7e..07bd838e7843 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/inode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/inode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/inode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/inode.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@ struct ocfs2_inode_info</div><div class='ctx'> 	tid_t i_sync_tid;</div><div class='ctx'> 	tid_t i_datasync_tid;</div><div class='ctx'> </div><div class='del'>-	struct dquot *i_dquot[MAXQUOTAS];</div><div class='add'>+	struct dquot __rcu *i_dquot[MAXQUOTAS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -116,7 +116,6 @@ static inline struct ocfs2_caching_info *INODE_CACHE(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ocfs2_evict_inode(struct inode *inode);</div><div class='del'>-int ocfs2_drop_inode(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> /* Flags for ocfs2_iget() */</div><div class='ctx'> #define OCFS2_FI_FLAG_SYSFILE		0x1</div><div class='head'>diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c<br/>index b1550ba73f96..b6864602814c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ioctl.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static inline int o2info_coherent(struct ocfs2_info_request *req)</div><div class='ctx'> 	return (!(req-&gt;ir_flags &amp; OCFS2_INFO_FL_NON_COHERENT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ocfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int ocfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	unsigned int flags;</div><div class='hunk'>@@ -83,7 +83,7 @@ int ocfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		       struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		       struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	unsigned int flags = fa-&gt;flags;</div><div class='hunk'>@@ -125,6 +125,7 @@ int ocfs2_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_inode-&gt;ip_attr = flags;</div><div class='ctx'> 	ocfs2_set_inode_flags(inode);</div><div class='add'>+	inode_set_ctime_current(inode);</div><div class='ctx'> </div><div class='ctx'> 	status = ocfs2_mark_inode_dirty(handle, inode, bh);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -357,13 +358,11 @@ static int ocfs2_info_handle_freeinode(struct inode *inode,</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			ocfs2_sprintf_system_inode_name(namebuf,</div><div class='del'>-							sizeof(namebuf),</div><div class='del'>-							type, i);</div><div class='add'>+			int len = ocfs2_sprintf_system_inode_name(namebuf,</div><div class='add'>+								  sizeof(namebuf),</div><div class='add'>+								  type, i);</div><div class='ctx'> 			status = ocfs2_lookup_ino_from_name(osb-&gt;sys_root_inode,</div><div class='del'>-							    namebuf,</div><div class='del'>-							    strlen(namebuf),</div><div class='del'>-							    &amp;blkno);</div><div class='add'>+							    namebuf, len, &amp;blkno);</div><div class='ctx'> 			if (status &lt; 0) {</div><div class='ctx'> 				status = -ENOENT;</div><div class='ctx'> 				goto bail;</div><div class='hunk'>@@ -650,12 +649,10 @@ static int ocfs2_info_handle_freefrag(struct inode *inode,</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf), type,</div><div class='del'>-						OCFS2_INVALID_SLOT);</div><div class='add'>+		int len = ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf),</div><div class='add'>+							  type, OCFS2_INVALID_SLOT);</div><div class='ctx'> 		status = ocfs2_lookup_ino_from_name(osb-&gt;sys_root_inode,</div><div class='del'>-						    namebuf,</div><div class='del'>-						    strlen(namebuf),</div><div class='del'>-						    &amp;blkno);</div><div class='add'>+						    namebuf, len, &amp;blkno);</div><div class='ctx'> 		if (status &lt; 0) {</div><div class='ctx'> 			status = -ENOENT;</div><div class='ctx'> 			goto bail;</div><div class='hunk'>@@ -795,7 +792,7 @@ bail:</div><div class='ctx'> /*</div><div class='ctx'>  * OCFS2_IOC_INFO handles an array of requests passed from userspace.</div><div class='ctx'>  *</div><div class='del'>- * ocfs2_info_handle() recevies a large info aggregation, grab and</div><div class='add'>+ * ocfs2_info_handle() receives a large info aggregation, grab and</div><div class='ctx'>  * validate the request count from header, then break it into small</div><div class='ctx'>  * pieces, later specific handlers can handle them one by one.</div><div class='ctx'>  *</div><div class='head'>diff --git a/fs/ocfs2/ioctl.h b/fs/ocfs2/ioctl.h<br/>index 48a5fdfe87a1..4a1c2313b429 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ioctl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ioctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ioctl.h</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'> #ifndef OCFS2_IOCTL_PROTO_H</div><div class='ctx'> #define OCFS2_IOCTL_PROTO_H</div><div class='ctx'> </div><div class='del'>-int ocfs2_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int ocfs2_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int ocfs2_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		       struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		       struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);</div><div class='ctx'> long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c<br/>index 604fea3a26ff..85239807dec7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/journal.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/journal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/journal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/journal.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ int ocfs2_recovery_init(struct ocfs2_super *osb)</div><div class='ctx'> 	struct ocfs2_recovery_map *rm;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;osb-&gt;recovery_lock);</div><div class='del'>-	osb-&gt;disable_recovery = 0;</div><div class='add'>+	osb-&gt;recovery_state = OCFS2_REC_ENABLED;</div><div class='ctx'> 	osb-&gt;recovery_thread_task = NULL;</div><div class='ctx'> 	init_waitqueue_head(&amp;osb-&gt;recovery_event);</div><div class='ctx'> </div><div class='hunk'>@@ -190,31 +190,53 @@ int ocfs2_recovery_init(struct ocfs2_super *osb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* we can't grab the goofy sem lock from inside wait_event, so we use</div><div class='del'>- * memory barriers to make sure that we'll see the null task before</div><div class='del'>- * being woken up */</div><div class='ctx'> static int ocfs2_recovery_thread_running(struct ocfs2_super *osb)</div><div class='ctx'> {</div><div class='del'>-	mb();</div><div class='ctx'> 	return osb-&gt;recovery_thread_task != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ocfs2_recovery_exit(struct ocfs2_super *osb)</div><div class='add'>+static void ocfs2_recovery_disable(struct ocfs2_super *osb,</div><div class='add'>+				   enum ocfs2_recovery_state state)</div><div class='ctx'> {</div><div class='del'>-	struct ocfs2_recovery_map *rm;</div><div class='del'>-</div><div class='del'>-	/* disable any new recovery threads and wait for any currently</div><div class='del'>-	 * running ones to exit. Do this before setting the vol_state. */</div><div class='ctx'> 	mutex_lock(&amp;osb-&gt;recovery_lock);</div><div class='del'>-	osb-&gt;disable_recovery = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * If recovery thread is not running, we can directly transition to</div><div class='add'>+	 * final state.</div><div class='add'>+	 */</div><div class='add'>+	if (!ocfs2_recovery_thread_running(osb)) {</div><div class='add'>+		osb-&gt;recovery_state = state + 1;</div><div class='add'>+		goto out_lock;</div><div class='add'>+	}</div><div class='add'>+	osb-&gt;recovery_state = state;</div><div class='add'>+	/* Wait for recovery thread to acknowledge state transition */</div><div class='add'>+	wait_event_cmd(osb-&gt;recovery_event,</div><div class='add'>+		       !ocfs2_recovery_thread_running(osb) ||</div><div class='add'>+				osb-&gt;recovery_state &gt;= state + 1,</div><div class='add'>+		       mutex_unlock(&amp;osb-&gt;recovery_lock),</div><div class='add'>+		       mutex_lock(&amp;osb-&gt;recovery_lock));</div><div class='add'>+out_lock:</div><div class='ctx'> 	mutex_unlock(&amp;osb-&gt;recovery_lock);</div><div class='del'>-	wait_event(osb-&gt;recovery_event, !ocfs2_recovery_thread_running(osb));</div><div class='ctx'> </div><div class='del'>-	/* At this point, we know that no more recovery threads can be</div><div class='del'>-	 * launched, so wait for any recovery completion work to</div><div class='del'>-	 * complete. */</div><div class='add'>+	/*</div><div class='add'>+	 * At this point we know that no more recovery work can be queued so</div><div class='add'>+	 * wait for any recovery completion work to complete.</div><div class='add'>+	 */</div><div class='ctx'> 	if (osb-&gt;ocfs2_wq)</div><div class='ctx'> 		flush_workqueue(osb-&gt;ocfs2_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ocfs2_recovery_disable_quota(struct ocfs2_super *osb)</div><div class='add'>+{</div><div class='add'>+	ocfs2_recovery_disable(osb, OCFS2_REC_QUOTA_WANT_DISABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ocfs2_recovery_exit(struct ocfs2_super *osb)</div><div class='add'>+{</div><div class='add'>+	struct ocfs2_recovery_map *rm;</div><div class='add'>+</div><div class='add'>+	/* disable any new recovery threads and wait for any currently</div><div class='add'>+	 * running ones to exit. Do this before setting the vol_state. */</div><div class='add'>+	ocfs2_recovery_disable(osb, OCFS2_REC_WANT_DISABLE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now that recovery is shut down, and the osb is about to be</div><div class='hunk'>@@ -446,6 +468,23 @@ bail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Make sure handle has at least 'nblocks' credits available. If it does not</div><div class='add'>+ * have that many credits available, we will try to extend the handle to have</div><div class='add'>+ * enough credits. If that fails, we will restart transaction to have enough</div><div class='add'>+ * credits. Similar notes regarding data consistency and locking implications</div><div class='add'>+ * as for ocfs2_extend_trans() apply here.</div><div class='add'>+ */</div><div class='add'>+int ocfs2_assure_trans_credits(handle_t *handle, int nblocks)</div><div class='add'>+{</div><div class='add'>+	int old_nblks = jbd2_handle_buffer_credits(handle);</div><div class='add'>+</div><div class='add'>+	trace_ocfs2_assure_trans_credits(old_nblks);</div><div class='add'>+	if (old_nblks &gt;= nblocks)</div><div class='add'>+		return 0;</div><div class='add'>+	return ocfs2_extend_trans(handle, nblocks - old_nblks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * If we have fewer than thresh credits, extend by OCFS2_MAX_TRANS_DATA.</div><div class='ctx'>  * If that fails, restart the transaction &amp; regain write access for the</div><div class='ctx'>  * buffer head which is used for metadata modifications.</div><div class='hunk'>@@ -479,12 +518,6 @@ bail:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct ocfs2_triggers {</div><div class='del'>-	struct jbd2_buffer_trigger_type	ot_triggers;</div><div class='del'>-	int				ot_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static inline struct ocfs2_triggers *to_ocfs2_trigger(struct jbd2_buffer_trigger_type *triggers)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(triggers, struct ocfs2_triggers, ot_triggers);</div><div class='hunk'>@@ -548,85 +581,76 @@ static void ocfs2_db_frozen_trigger(struct jbd2_buffer_trigger_type *triggers,</div><div class='ctx'> static void ocfs2_abort_trigger(struct jbd2_buffer_trigger_type *triggers,</div><div class='ctx'> 				struct buffer_head *bh)</div><div class='ctx'> {</div><div class='add'>+	struct ocfs2_triggers *ot = to_ocfs2_trigger(triggers);</div><div class='add'>+</div><div class='ctx'> 	mlog(ML_ERROR,</div><div class='ctx'> 	     "ocfs2_abort_trigger called by JBD2.  bh = 0x%lx, "</div><div class='ctx'> 	     "bh-&gt;b_blocknr = %llu\n",</div><div class='ctx'> 	     (unsigned long)bh,</div><div class='ctx'> 	     (unsigned long long)bh-&gt;b_blocknr);</div><div class='ctx'> </div><div class='del'>-	ocfs2_error(bh-&gt;b_assoc_map-&gt;host-&gt;i_sb,</div><div class='add'>+	ocfs2_error(ot-&gt;sb,</div><div class='ctx'> 		    "JBD2 has aborted our journal, ocfs2 cannot continue\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_triggers di_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_dinode, i_check),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ocfs2_triggers eb_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_extent_block, h_check),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ocfs2_triggers rb_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_refcount_block, rf_check),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ocfs2_triggers gd_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_group_desc, bg_check),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct ocfs2_triggers db_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_db_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+static void ocfs2_setup_csum_triggers(struct super_block *sb,</div><div class='add'>+				      enum ocfs2_journal_trigger_type type,</div><div class='add'>+				      struct ocfs2_triggers *ot)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(type &gt;= OCFS2_JOURNAL_TRIGGER_COUNT);</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_triggers xb_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_xattr_block, xb_check),</div><div class='del'>-};</div><div class='add'>+	switch (type) {</div><div class='add'>+	case OCFS2_JTR_DI:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_dinode, i_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_EB:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_extent_block, h_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_RB:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_refcount_block, rf_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_GD:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_group_desc, bg_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_DB:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_db_frozen_trigger;</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_XB:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_xattr_block, xb_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_DQ:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_dq_frozen_trigger;</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_DR:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_dx_root_block, dr_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_DL:</div><div class='add'>+		ot-&gt;ot_triggers.t_frozen = ocfs2_frozen_trigger;</div><div class='add'>+		ot-&gt;ot_offset = offsetof(struct ocfs2_dx_leaf, dl_check);</div><div class='add'>+		break;</div><div class='add'>+	case OCFS2_JTR_NONE:</div><div class='add'>+		/* To make compiler happy... */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_triggers dq_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_dq_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+	ot-&gt;ot_triggers.t_abort = ocfs2_abort_trigger;</div><div class='add'>+	ot-&gt;sb = sb;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_triggers dr_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_dx_root_block, dr_check),</div><div class='del'>-};</div><div class='add'>+void ocfs2_initialize_journal_triggers(struct super_block *sb,</div><div class='add'>+				       struct ocfs2_triggers triggers[])</div><div class='add'>+{</div><div class='add'>+	enum ocfs2_journal_trigger_type type;</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_triggers dl_triggers = {</div><div class='del'>-	.ot_triggers = {</div><div class='del'>-		.t_frozen = ocfs2_frozen_trigger,</div><div class='del'>-		.t_abort = ocfs2_abort_trigger,</div><div class='del'>-	},</div><div class='del'>-	.ot_offset	= offsetof(struct ocfs2_dx_leaf, dl_check),</div><div class='del'>-};</div><div class='add'>+	for (type = OCFS2_JTR_DI; type &lt; OCFS2_JOURNAL_TRIGGER_COUNT; type++)</div><div class='add'>+		ocfs2_setup_csum_triggers(sb, type, &amp;triggers[type]);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int __ocfs2_journal_access(handle_t *handle,</div><div class='ctx'> 				  struct ocfs2_caching_info *ci,</div><div class='hunk'>@@ -708,56 +732,91 @@ static int __ocfs2_journal_access(handle_t *handle,</div><div class='ctx'> int ocfs2_journal_access_di(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;di_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				      &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_DI],</div><div class='add'>+				      type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_eb(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;eb_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				      &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_EB],</div><div class='add'>+				      type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_rb(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;rb_triggers,</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				      &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_RB],</div><div class='ctx'> 				      type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_gd(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;gd_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				     &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_GD],</div><div class='add'>+				     type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_db(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;db_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				     &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_DB],</div><div class='add'>+				     type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_xb(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;xb_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				     &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_XB],</div><div class='add'>+				     type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_dq(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;dq_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				     &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_DQ],</div><div class='add'>+				     type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_dr(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;dr_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				     &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_DR],</div><div class='add'>+				     type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access_dl(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='ctx'> 			    struct buffer_head *bh, int type)</div><div class='ctx'> {</div><div class='del'>-	return __ocfs2_journal_access(handle, ci, bh, &amp;dl_triggers, type);</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(ocfs2_metadata_cache_get_super(ci));</div><div class='add'>+</div><div class='add'>+	return __ocfs2_journal_access(handle, ci, bh,</div><div class='add'>+				     &amp;osb-&gt;s_journal_triggers[OCFS2_JTR_DL],</div><div class='add'>+				     type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_access(handle_t *handle, struct ocfs2_caching_info *ci,</div><div class='hunk'>@@ -778,13 +837,15 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)</div><div class='ctx'> 		if (!is_handle_aborted(handle)) {</div><div class='ctx'> 			journal_t *journal = handle-&gt;h_transaction-&gt;t_journal;</div><div class='ctx'> </div><div class='del'>-			mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed. "</div><div class='del'>-					"Aborting transaction and journal.\n");</div><div class='add'>+			mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed: "</div><div class='add'>+			     "handle type %u started at line %u, credits %u/%u "</div><div class='add'>+			     "errcode %d. Aborting transaction and journal.\n",</div><div class='add'>+			     handle-&gt;h_type, handle-&gt;h_line_no,</div><div class='add'>+			     handle-&gt;h_requested_credits,</div><div class='add'>+			     jbd2_handle_buffer_credits(handle), status);</div><div class='ctx'> 			handle-&gt;h_err = status;</div><div class='ctx'> 			jbd2_journal_abort_handle(handle);</div><div class='ctx'> 			jbd2_journal_abort(journal, status);</div><div class='del'>-			ocfs2_abort(bh-&gt;b_assoc_map-&gt;host-&gt;i_sb,</div><div class='del'>-				    "Journal already aborted.\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -841,15 +902,8 @@ bail:</div><div class='ctx'> </div><div class='ctx'> static int ocfs2_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = jinode-&gt;i_vfs_inode-&gt;i_mapping;</div><div class='del'>-	struct writeback_control wbc = {</div><div class='del'>-		.sync_mode =  WB_SYNC_ALL,</div><div class='del'>-		.nr_to_write = mapping-&gt;nrpages * 2,</div><div class='del'>-		.range_start = jinode-&gt;i_dirty_start,</div><div class='del'>-		.range_end = jinode-&gt;i_dirty_end,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return filemap_fdatawrite_wbc(mapping, &amp;wbc);</div><div class='add'>+	return filemap_fdatawrite_range(jinode-&gt;i_vfs_inode-&gt;i_mapping,</div><div class='add'>+			jinode-&gt;i_dirty_start, jinode-&gt;i_dirty_end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ocfs2_journal_init(struct ocfs2_super *osb, int *dirty)</div><div class='hunk'>@@ -1016,7 +1070,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)</div><div class='ctx'> 	if (!igrab(inode))</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='del'>-	num_running_trans = atomic_read(&amp;(osb-&gt;journal-&gt;j_num_trans));</div><div class='add'>+	num_running_trans = atomic_read(&amp;(journal-&gt;j_num_trans));</div><div class='ctx'> 	trace_ocfs2_journal_shutdown(num_running_trans);</div><div class='ctx'> </div><div class='ctx'> 	/* Do a commit_cache here. It will flush our journal, *and*</div><div class='hunk'>@@ -1035,9 +1089,10 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)</div><div class='ctx'> 		osb-&gt;commit_task = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(atomic_read(&amp;(osb-&gt;journal-&gt;j_num_trans)) != 0);</div><div class='add'>+	BUG_ON(atomic_read(&amp;(journal-&gt;j_num_trans)) != 0);</div><div class='ctx'> </div><div class='del'>-	if (ocfs2_mount_local(osb)) {</div><div class='add'>+	if (ocfs2_mount_local(osb) &amp;&amp;</div><div class='add'>+	    (journal-&gt;j_journal-&gt;j_flags &amp; JBD2_LOADED)) {</div><div class='ctx'> 		jbd2_journal_lock_updates(journal-&gt;j_journal);</div><div class='ctx'> 		status = jbd2_journal_flush(journal-&gt;j_journal, 0);</div><div class='ctx'> 		jbd2_journal_unlock_updates(journal-&gt;j_journal);</div><div class='hunk'>@@ -1209,7 +1264,7 @@ static int ocfs2_force_read_journal(struct inode *inode)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; p_blocks; i++, p_blkno++) {</div><div class='del'>-			bh = __find_get_block(osb-&gt;sb-&gt;s_bdev, p_blkno,</div><div class='add'>+			bh = __find_get_block_nonatomic(osb-&gt;sb-&gt;s_bdev, p_blkno,</div><div class='ctx'> 					osb-&gt;sb-&gt;s_blocksize);</div><div class='ctx'> 			/* block not cached. */</div><div class='ctx'> 			if (!bh)</div><div class='hunk'>@@ -1432,6 +1487,18 @@ static int __ocfs2_recovery_thread(void *arg)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> restart:</div><div class='add'>+	if (quota_enabled) {</div><div class='add'>+		mutex_lock(&amp;osb-&gt;recovery_lock);</div><div class='add'>+		/* Confirm that recovery thread will no longer recover quotas */</div><div class='add'>+		if (osb-&gt;recovery_state == OCFS2_REC_QUOTA_WANT_DISABLE) {</div><div class='add'>+			osb-&gt;recovery_state = OCFS2_REC_QUOTA_DISABLED;</div><div class='add'>+			wake_up(&amp;osb-&gt;recovery_event);</div><div class='add'>+		}</div><div class='add'>+		if (osb-&gt;recovery_state &gt;= OCFS2_REC_QUOTA_DISABLED)</div><div class='add'>+			quota_enabled = 0;</div><div class='add'>+		mutex_unlock(&amp;osb-&gt;recovery_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = ocfs2_super_lock(osb, 1);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		mlog_errno(status);</div><div class='hunk'>@@ -1529,27 +1596,29 @@ bail:</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_free_replay_slots(osb);</div><div class='ctx'> 	osb-&gt;recovery_thread_task = NULL;</div><div class='del'>-	mb(); /* sync with ocfs2_recovery_thread_running */</div><div class='add'>+	if (osb-&gt;recovery_state == OCFS2_REC_WANT_DISABLE)</div><div class='add'>+		osb-&gt;recovery_state = OCFS2_REC_DISABLED;</div><div class='ctx'> 	wake_up(&amp;osb-&gt;recovery_event);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;osb-&gt;recovery_lock);</div><div class='ctx'> </div><div class='del'>-	if (quota_enabled)</div><div class='del'>-		kfree(rm_quota);</div><div class='add'>+	kfree(rm_quota);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)</div><div class='ctx'> {</div><div class='add'>+	int was_set = -1;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;osb-&gt;recovery_lock);</div><div class='add'>+	if (osb-&gt;recovery_state &lt; OCFS2_REC_WANT_DISABLE)</div><div class='add'>+		was_set = ocfs2_recovery_map_set(osb, node_num);</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_recovery_thread(node_num, osb-&gt;node_num,</div><div class='del'>-		osb-&gt;disable_recovery, osb-&gt;recovery_thread_task,</div><div class='del'>-		osb-&gt;disable_recovery ?</div><div class='del'>-		-1 : ocfs2_recovery_map_set(osb, node_num));</div><div class='add'>+		osb-&gt;recovery_state, osb-&gt;recovery_thread_task, was_set);</div><div class='ctx'> </div><div class='del'>-	if (osb-&gt;disable_recovery)</div><div class='add'>+	if (osb-&gt;recovery_state &gt;= OCFS2_REC_WANT_DISABLE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (osb-&gt;recovery_thread_task)</div><div class='hunk'>@@ -1916,7 +1985,7 @@ bail:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Scan timer should get fired every ORPHAN_SCAN_SCHEDULE_TIMEOUT. Add some</div><div class='del'>- * randomness to the timeout to minimize multple nodes firing the timer at the</div><div class='add'>+ * randomness to the timeout to minimize multiple nodes firing the timer at the</div><div class='ctx'>  * same time.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long ocfs2_orphan_scan_timeout(void)</div><div class='head'>diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h<br/>index 41c9fe7e62f9..6397170f302f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/journal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/journal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/journal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/journal.h</a></div><div class='hunk'>@@ -148,6 +148,7 @@ void ocfs2_wait_for_recovery(struct ocfs2_super *osb);</div><div class='ctx'> </div><div class='ctx'> int ocfs2_recovery_init(struct ocfs2_super *osb);</div><div class='ctx'> void ocfs2_recovery_exit(struct ocfs2_super *osb);</div><div class='add'>+void ocfs2_recovery_disable_quota(struct ocfs2_super *osb);</div><div class='ctx'> </div><div class='ctx'> int ocfs2_compute_replay_slots(struct ocfs2_super *osb);</div><div class='ctx'> void ocfs2_free_replay_slots(struct ocfs2_super *osb);</div><div class='hunk'>@@ -243,6 +244,8 @@ handle_t		    *ocfs2_start_trans(struct ocfs2_super *osb,</div><div class='ctx'> int			     ocfs2_commit_trans(struct ocfs2_super *osb,</div><div class='ctx'> 						handle_t *handle);</div><div class='ctx'> int			     ocfs2_extend_trans(handle_t *handle, int nblocks);</div><div class='add'>+int			     ocfs2_assure_trans_credits(handle_t *handle,</div><div class='add'>+						int nblocks);</div><div class='ctx'> int			     ocfs2_allocate_extend_trans(handle_t *handle,</div><div class='ctx'> 						int thresh);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c<br/>index c803c10dd97e..d1aa04a5af1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/localalloc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/localalloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/localalloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/localalloc.c</a></div><div class='hunk'>@@ -212,14 +212,15 @@ static inline int ocfs2_la_state_enabled(struct ocfs2_super *osb)</div><div class='ctx'> void ocfs2_local_alloc_seen_free_bits(struct ocfs2_super *osb,</div><div class='ctx'> 				      unsigned int num_clusters)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;osb-&gt;osb_lock);</div><div class='del'>-	if (osb-&gt;local_alloc_state == OCFS2_LA_DISABLED ||</div><div class='del'>-	    osb-&gt;local_alloc_state == OCFS2_LA_THROTTLED)</div><div class='del'>-		if (num_clusters &gt;= osb-&gt;local_alloc_default_bits) {</div><div class='add'>+	if (num_clusters &gt;= osb-&gt;local_alloc_default_bits) {</div><div class='add'>+		spin_lock(&amp;osb-&gt;osb_lock);</div><div class='add'>+		if (osb-&gt;local_alloc_state == OCFS2_LA_DISABLED ||</div><div class='add'>+		    osb-&gt;local_alloc_state == OCFS2_LA_THROTTLED) {</div><div class='ctx'> 			cancel_delayed_work(&amp;osb-&gt;la_enable_wq);</div><div class='ctx'> 			osb-&gt;local_alloc_state = OCFS2_LA_ENABLED;</div><div class='ctx'> 		}</div><div class='del'>-	spin_unlock(&amp;osb-&gt;osb_lock);</div><div class='add'>+		spin_unlock(&amp;osb-&gt;osb_lock);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ocfs2_la_enable_worker(struct work_struct *work)</div><div class='hunk'>@@ -335,7 +336,7 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb)</div><div class='ctx'> 		     "found = %u, set = %u, taken = %u, off = %u\n",</div><div class='ctx'> 		     num_used, le32_to_cpu(alloc-&gt;id1.bitmap1.i_used),</div><div class='ctx'> 		     le32_to_cpu(alloc-&gt;id1.bitmap1.i_total),</div><div class='del'>-		     OCFS2_LOCAL_ALLOC(alloc)-&gt;la_bm_off);</div><div class='add'>+		     le32_to_cpu(OCFS2_LOCAL_ALLOC(alloc)-&gt;la_bm_off));</div><div class='ctx'> </div><div class='ctx'> 		status = -EINVAL;</div><div class='ctx'> 		goto bail;</div><div class='hunk'>@@ -863,14 +864,8 @@ static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb,</div><div class='ctx'> </div><div class='ctx'> 	numfound = bitoff = startoff = 0;</div><div class='ctx'> 	left = le32_to_cpu(alloc-&gt;id1.bitmap1.i_total);</div><div class='del'>-	while ((bitoff = ocfs2_find_next_zero_bit(bitmap, left, startoff)) != -1) {</div><div class='del'>-		if (bitoff == left) {</div><div class='del'>-			/* mlog(0, "bitoff (%d) == left", bitoff); */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* mlog(0, "Found a zero: bitoff = %d, startoff = %d, "</div><div class='del'>-		   "numfound = %d\n", bitoff, startoff, numfound);*/</div><div class='del'>-</div><div class='add'>+	while ((bitoff = ocfs2_find_next_zero_bit(bitmap, left, startoff)) &lt;</div><div class='add'>+	       left) {</div><div class='ctx'> 		/* Ok, we found a zero bit... is it contig. or do we</div><div class='ctx'> 		 * start over?*/</div><div class='ctx'> 		if (bitoff == startoff) {</div><div class='hunk'>@@ -976,8 +971,8 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,</div><div class='ctx'> 	start = count = 0;</div><div class='ctx'> 	left = le32_to_cpu(alloc-&gt;id1.bitmap1.i_total);</div><div class='ctx'> </div><div class='del'>-	while ((bit_off = ocfs2_find_next_zero_bit(bitmap, left, start))</div><div class='del'>-	       != -1) {</div><div class='add'>+	while (1) {</div><div class='add'>+		bit_off = ocfs2_find_next_zero_bit(bitmap, left, start);</div><div class='ctx'> 		if ((bit_off &lt; left) &amp;&amp; (bit_off == start)) {</div><div class='ctx'> 			count++;</div><div class='ctx'> 			start++;</div><div class='hunk'>@@ -1002,6 +997,7 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (bit_off &gt;= left)</div><div class='ctx'> 			break;</div><div class='ctx'> 		count = 1;</div><div class='hunk'>@@ -1220,7 +1216,7 @@ retry_enospc:</div><div class='ctx'> 			     OCFS2_LOCAL_ALLOC(alloc)-&gt;la_bitmap);</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_local_alloc_new_window_result(</div><div class='del'>-		OCFS2_LOCAL_ALLOC(alloc)-&gt;la_bm_off,</div><div class='add'>+		le32_to_cpu(OCFS2_LOCAL_ALLOC(alloc)-&gt;la_bm_off),</div><div class='ctx'> 		le32_to_cpu(alloc-&gt;id1.bitmap1.i_total));</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='head'>diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c<br/>index f37174e79fad..6de944818c56 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/locks.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/locks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/locks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/locks.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode,</div><div class='ctx'> 	struct ocfs2_file_private *fp = file-&gt;private_data;</div><div class='ctx'> 	struct ocfs2_lock_res *lockres = &amp;fp-&gt;fp_flock;</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_type == F_WRLCK)</div><div class='add'>+	if (lock_is_write(fl))</div><div class='ctx'> 		level = 1;</div><div class='ctx'> 	if (!IS_SETLKW(cmd))</div><div class='ctx'> 		trylock = 1;</div><div class='hunk'>@@ -53,8 +53,8 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode,</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		locks_init_lock(&amp;request);</div><div class='del'>-		request.fl_type = F_UNLCK;</div><div class='del'>-		request.fl_flags = FL_FLOCK;</div><div class='add'>+		request.c.flc_type = F_UNLCK;</div><div class='add'>+		request.c.flc_flags = FL_FLOCK;</div><div class='ctx'> 		locks_lock_file_wait(file, &amp;request);</div><div class='ctx'> </div><div class='ctx'> 		ocfs2_file_unlock(file);</div><div class='hunk'>@@ -100,14 +100,14 @@ int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(inode-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_FLOCK))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_FLOCK))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	if ((osb-&gt;s_mount_opt &amp; OCFS2_MOUNT_LOCALFLOCKS) ||</div><div class='ctx'> 	    ocfs2_mount_local(osb))</div><div class='ctx'> 		return locks_lock_file_wait(file, fl);</div><div class='ctx'> </div><div class='del'>-	if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	if (lock_is_unlock(fl))</div><div class='ctx'> 		return ocfs2_do_funlock(file, cmd, fl);</div><div class='ctx'> 	else</div><div class='ctx'> 		return ocfs2_do_flock(file, inode, cmd, fl);</div><div class='hunk'>@@ -118,7 +118,7 @@ int ocfs2_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='ctx'> 	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(inode-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	if (!(fl-&gt;fl_flags &amp; FL_POSIX))</div><div class='add'>+	if (!(fl-&gt;c.flc_flags &amp; FL_POSIX))</div><div class='ctx'> 		return -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	return ocfs2_plock(osb-&gt;cconn, OCFS2_I(inode)-&gt;ip_blkno, file, cmd, fl);</div><div class='head'>diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c<br/>index 1834f26522ed..50e2faf64c19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/mmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/mmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/mmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/mmap.c</a></div><div class='hunk'>@@ -44,16 +44,16 @@ static vm_fault_t ocfs2_fault(struct vm_fault *vmf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static vm_fault_t __ocfs2_page_mkwrite(struct file *file,</div><div class='del'>-			struct buffer_head *di_bh, struct page *page)</div><div class='add'>+			struct buffer_head *di_bh, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	vm_fault_t ret = VM_FAULT_NOPAGE;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct address_space *mapping = inode-&gt;i_mapping;</div><div class='del'>-	loff_t pos = page_offset(page);</div><div class='add'>+	loff_t pos = folio_pos(folio);</div><div class='ctx'> 	unsigned int len = PAGE_SIZE;</div><div class='ctx'> 	pgoff_t last_index;</div><div class='del'>-	struct page *locked_page = NULL;</div><div class='add'>+	struct folio *locked_folio = NULL;</div><div class='ctx'> 	void *fsdata;</div><div class='ctx'> 	loff_t size = i_size_read(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -72,9 +72,9 @@ static vm_fault_t __ocfs2_page_mkwrite(struct file *file,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Let VM retry with these cases.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((page-&gt;mapping != inode-&gt;i_mapping) ||</div><div class='del'>-	    (!PageUptodate(page)) ||</div><div class='del'>-	    (page_offset(page) &gt;= size))</div><div class='add'>+	if ((folio-&gt;mapping != inode-&gt;i_mapping) ||</div><div class='add'>+	    !folio_test_uptodate(folio) ||</div><div class='add'>+	    (pos &gt;= size))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -87,11 +87,11 @@ static vm_fault_t __ocfs2_page_mkwrite(struct file *file,</div><div class='ctx'> 	 * worry about ocfs2_write_begin() skipping some buffer reads</div><div class='ctx'> 	 * because the "write" would invalidate their data.</div><div class='ctx'> 	 */</div><div class='del'>-	if (page-&gt;index == last_index)</div><div class='add'>+	if (folio-&gt;index == last_index)</div><div class='ctx'> 		len = ((size - 1) &amp; ~PAGE_MASK) + 1;</div><div class='ctx'> </div><div class='ctx'> 	err = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_MMAP,</div><div class='del'>-				       &amp;locked_page, &amp;fsdata, di_bh, page);</div><div class='add'>+				       &amp;locked_folio, &amp;fsdata, di_bh, folio);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err != -ENOSPC)</div><div class='ctx'> 			mlog_errno(err);</div><div class='hunk'>@@ -99,7 +99,7 @@ static vm_fault_t __ocfs2_page_mkwrite(struct file *file,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!locked_page) {</div><div class='add'>+	if (!locked_folio) {</div><div class='ctx'> 		ret = VM_FAULT_NOPAGE;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -112,7 +112,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static vm_fault_t ocfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = vmf-&gt;page;</div><div class='add'>+	struct folio *folio = page_folio(vmf-&gt;page);</div><div class='ctx'> 	struct inode *inode = file_inode(vmf-&gt;vma-&gt;vm_file);</div><div class='ctx'> 	struct buffer_head *di_bh = NULL;</div><div class='ctx'> 	sigset_t oldset;</div><div class='hunk'>@@ -141,7 +141,7 @@ static vm_fault_t ocfs2_page_mkwrite(struct vm_fault *vmf)</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_write(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> </div><div class='del'>-	ret = __ocfs2_page_mkwrite(vmf-&gt;vma-&gt;vm_file, di_bh, page);</div><div class='add'>+	ret = __ocfs2_page_mkwrite(vmf-&gt;vma-&gt;vm_file, di_bh, folio);</div><div class='ctx'> </div><div class='ctx'> 	up_write(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -159,8 +159,9 @@ static const struct vm_operations_struct ocfs2_file_vm_ops = {</div><div class='ctx'> 	.page_mkwrite	= ocfs2_page_mkwrite,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+int ocfs2_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='ctx'> 	int ret = 0, lock_level = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_inode_lock_atime(file_inode(file),</div><div class='hunk'>@@ -171,7 +172,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	}</div><div class='ctx'> 	ocfs2_inode_unlock(file_inode(file), lock_level);</div><div class='ctx'> out:</div><div class='del'>-	vma-&gt;vm_ops = &amp;ocfs2_file_vm_ops;</div><div class='add'>+	desc-&gt;vm_ops = &amp;ocfs2_file_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/mmap.h b/fs/ocfs2/mmap.h<br/>index 1051507cc684..d21c30de6b8c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/mmap.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/mmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/mmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/mmap.h</a></div><div class='hunk'>@@ -2,6 +2,6 @@</div><div class='ctx'> #ifndef OCFS2_MMAP_H</div><div class='ctx'> #define OCFS2_MMAP_H</div><div class='ctx'> </div><div class='del'>-int ocfs2_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='add'>+int ocfs2_mmap_prepare(struct vm_area_desc *desc);</div><div class='ctx'> </div><div class='ctx'> #endif  /* OCFS2_MMAP_H */</div><div class='head'>diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c<br/>index 1f9ed117e78b..ce978a2497d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/move_extents.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/move_extents.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/move_extents.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/move_extents.c</a></div><div class='hunk'>@@ -98,7 +98,13 @@ static int __ocfs2_move_extent(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	rec = &amp;el-&gt;l_recs[index];</div><div class='ctx'> </div><div class='del'>-	BUG_ON(ext_flags != rec-&gt;e_flags);</div><div class='add'>+	if (ext_flags != rec-&gt;e_flags) {</div><div class='add'>+		ret = ocfs2_error(inode-&gt;i_sb,</div><div class='add'>+				  "Inode %llu has corrupted extent %d with flags 0x%x at cpos %u\n",</div><div class='add'>+				  (unsigned long long)ino, index, rec-&gt;e_flags, cpos);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * after moving/defraging to new location, the extent is not going</div><div class='ctx'> 	 * to be refcounted anymore.</div><div class='hunk'>@@ -364,7 +370,7 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,</div><div class='ctx'> 					 int *vict_bit,</div><div class='ctx'> 					 struct buffer_head **ret_bh)</div><div class='ctx'> {</div><div class='del'>-	int ret, i, bits_per_unit = 0;</div><div class='add'>+	int ret, i, len, bits_per_unit = 0;</div><div class='ctx'> 	u64 blkno;</div><div class='ctx'> 	char namebuf[40];</div><div class='ctx'> </div><div class='hunk'>@@ -375,9 +381,9 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,</div><div class='ctx'> 	struct ocfs2_dinode *ac_dinode;</div><div class='ctx'> 	struct ocfs2_group_desc *bg;</div><div class='ctx'> </div><div class='del'>-	ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf), type, slot);</div><div class='del'>-	ret = ocfs2_lookup_ino_from_name(osb-&gt;sys_root_inode, namebuf,</div><div class='del'>-					 strlen(namebuf), &amp;blkno);</div><div class='add'>+	len = ocfs2_sprintf_system_inode_name(namebuf, sizeof(namebuf), type, slot);</div><div class='add'>+	ret = ocfs2_lookup_ino_from_name(osb-&gt;sys_root_inode, namebuf, len, &amp;blkno);</div><div class='add'>+</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -492,7 +498,7 @@ static int ocfs2_validate_and_adjust_move_goal(struct inode *inode,</div><div class='ctx'> 	bg = (struct ocfs2_group_desc *)gd_bh-&gt;b_data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * moving goal is not allowd to start with a group desc blok(#0 blk)</div><div class='add'>+	 * moving goal is not allowed to start with a group desc blok(#0 blk)</div><div class='ctx'> 	 * let's compromise to the latter cluster.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (range-&gt;me_goal == le64_to_cpu(bg-&gt;bg_blkno))</div><div class='hunk'>@@ -617,6 +623,8 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,</div><div class='ctx'> 	 */</div><div class='ctx'> 	credits += OCFS2_INODE_UPDATE_CREDITS + 1;</div><div class='ctx'> </div><div class='add'>+	inode_lock(tl_inode);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ocfs2_move_extent() didn't reserve any clusters in lock_allocators()</div><div class='ctx'> 	 * logic, while we still need to lock the global_bitmap.</div><div class='hunk'>@@ -626,7 +634,7 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,</div><div class='ctx'> 	if (!gb_inode) {</div><div class='ctx'> 		mlog(ML_ERROR, "unable to get global_bitmap inode\n");</div><div class='ctx'> 		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock_tl_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(gb_inode);</div><div class='hunk'>@@ -634,16 +642,14 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,</div><div class='ctx'> 	ret = ocfs2_inode_lock(gb_inode, &amp;gb_bh, 1);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		mlog_errno(ret);</div><div class='del'>-		goto out_unlock_gb_mutex;</div><div class='add'>+		goto out_unlock_gb_inode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_lock(tl_inode);</div><div class='del'>-</div><div class='ctx'> 	handle = ocfs2_start_trans(osb, credits);</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='ctx'> 		ret = PTR_ERR(handle);</div><div class='ctx'> 		mlog_errno(ret);</div><div class='del'>-		goto out_unlock_tl_inode;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new_phys_blkno = ocfs2_clusters_to_blocks(inode-&gt;i_sb, *new_phys_cpos);</div><div class='hunk'>@@ -658,7 +664,7 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * probe the victim cluster group to find a proper</div><div class='del'>-	 * region to fit wanted movement, it even will perfrom</div><div class='add'>+	 * region to fit wanted movement, it even will perform</div><div class='ctx'> 	 * a best-effort attempt by compromising to a threshold</div><div class='ctx'> 	 * around the goal.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -685,7 +691,7 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_block_group_set_bits(handle, gb_inode, gd, gd_bh,</div><div class='del'>-					 goal_bit, len);</div><div class='add'>+					 goal_bit, len, 0, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ocfs2_rollback_alloc_dinode_counts(gb_inode, gb_bh, len,</div><div class='ctx'> 					       le16_to_cpu(gd-&gt;bg_chain));</div><div class='hunk'>@@ -703,15 +709,14 @@ static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,</div><div class='ctx'> out_commit:</div><div class='ctx'> 	ocfs2_commit_trans(osb, handle);</div><div class='ctx'> 	brelse(gd_bh);</div><div class='del'>-</div><div class='del'>-out_unlock_tl_inode:</div><div class='del'>-	inode_unlock(tl_inode);</div><div class='del'>-</div><div class='add'>+out_unlock:</div><div class='ctx'> 	ocfs2_inode_unlock(gb_inode, 1);</div><div class='del'>-out_unlock_gb_mutex:</div><div class='add'>+out_unlock_gb_inode:</div><div class='ctx'> 	inode_unlock(gb_inode);</div><div class='ctx'> 	brelse(gb_bh);</div><div class='ctx'> 	iput(gb_inode);</div><div class='add'>+out_unlock_tl_inode:</div><div class='add'>+	inode_unlock(tl_inode);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (context-&gt;meta_ac) {</div><div class='hunk'>@@ -868,6 +873,11 @@ static int __ocfs2_move_extents_range(struct buffer_head *di_bh,</div><div class='ctx'> 			mlog_errno(ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * Invalidate extent cache after moving/defragging to prevent</div><div class='add'>+		 * stale cached data with outdated extent flags.</div><div class='add'>+		 */</div><div class='add'>+		ocfs2_extent_map_trunc(inode, cpos);</div><div class='ctx'> </div><div class='ctx'> 		context-&gt;clusters_moved += alloc_size;</div><div class='ctx'> next:</div><div class='hunk'>@@ -920,7 +930,7 @@ static int ocfs2_move_extents(struct ocfs2_move_extents_context *context)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * rememer ip_xattr_sem also needs to be held if necessary</div><div class='add'>+	 * remember ip_xattr_sem also needs to be held if necessary</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_write(&amp;OCFS2_I(inode)-&gt;ip_alloc_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -1022,7 +1032,7 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)</div><div class='ctx'> 	context-&gt;range = &amp;range;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * ok, the default theshold for the defragmentation</div><div class='add'>+	 * ok, the default threshold for the defragmentation</div><div class='ctx'> 	 * is 1M, since our maximum clustersize was 1M also.</div><div class='ctx'> 	 * any thought?</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1032,6 +1042,12 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)</div><div class='ctx'> 	if (range.me_threshold &gt; i_size_read(inode))</div><div class='ctx'> 		range.me_threshold = i_size_read(inode);</div><div class='ctx'> </div><div class='add'>+	if (range.me_flags &amp; ~(OCFS2_MOVE_EXT_FL_AUTO_DEFRAG |</div><div class='add'>+			       OCFS2_MOVE_EXT_FL_PART_DEFRAG)) {</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (range.me_flags &amp; OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) {</div><div class='ctx'> 		context-&gt;auto_defrag = 1;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c<br/>index 9221a33f917b..c90b254da75e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/namei.c</a></div><div class='hunk'>@@ -142,6 +142,8 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> bail_add:</div><div class='ctx'> 	ret = d_splice_alias(inode, dentry);</div><div class='add'>+	if (IS_ERR(ret))</div><div class='add'>+		goto bail_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -154,15 +156,16 @@ bail_add:</div><div class='ctx'> 		 * NOTE: This dentry already has -&gt;d_op set from</div><div class='ctx'> 		 * ocfs2_get_parent() and ocfs2_get_dentry()</div><div class='ctx'> 		 */</div><div class='del'>-		if (!IS_ERR_OR_NULL(ret))</div><div class='add'>+		if (ret)</div><div class='ctx'> 			dentry = ret;</div><div class='ctx'> </div><div class='ctx'> 		status = ocfs2_dentry_attach_lock(dentry, inode,</div><div class='ctx'> 						  OCFS2_I(dir)-&gt;ip_blkno);</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			mlog_errno(status);</div><div class='add'>+			if (ret)</div><div class='add'>+				dput(ret);</div><div class='ctx'> 			ret = ERR_PTR(status);</div><div class='del'>-			goto bail_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		ocfs2_dentry_attach_gen(dentry);</div><div class='hunk'>@@ -200,8 +203,10 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode)</div><div class='ctx'> 	mode = mode_strip_sgid(&amp;nop_mnt_idmap, dir, mode);</div><div class='ctx'> 	inode_init_owner(&amp;nop_mnt_idmap, inode, dir, mode);</div><div class='ctx'> 	status = dquot_initialize(inode);</div><div class='del'>-	if (status)</div><div class='add'>+	if (status) {</div><div class='add'>+		iput(inode);</div><div class='ctx'> 		return ERR_PTR(status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -506,7 +511,6 @@ static int __ocfs2_mknod_locked(struct inode *dir,</div><div class='ctx'> 				struct inode *inode,</div><div class='ctx'> 				dev_t dev,</div><div class='ctx'> 				struct buffer_head **new_fe_bh,</div><div class='del'>-				struct buffer_head *parent_fe_bh,</div><div class='ctx'> 				handle_t *handle,</div><div class='ctx'> 				struct ocfs2_alloc_context *inode_ac,</div><div class='ctx'> 				u64 fe_blkno, u64 suballoc_loc, u16 suballoc_bit)</div><div class='hunk'>@@ -566,7 +570,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,</div><div class='ctx'> 	fe-&gt;i_last_eb_blk = 0;</div><div class='ctx'> 	strcpy(fe-&gt;i_signature, OCFS2_INODE_SIGNATURE);</div><div class='ctx'> 	fe-&gt;i_flags |= cpu_to_le32(OCFS2_VALID_FL);</div><div class='del'>-	ktime_get_real_ts64(&amp;ts);</div><div class='add'>+	ktime_get_coarse_real_ts64(&amp;ts);</div><div class='ctx'> 	fe-&gt;i_atime = fe-&gt;i_ctime = fe-&gt;i_mtime =</div><div class='ctx'> 		cpu_to_le64(ts.tv_sec);</div><div class='ctx'> 	fe-&gt;i_mtime_nsec = fe-&gt;i_ctime_nsec = fe-&gt;i_atime_nsec =</div><div class='hunk'>@@ -639,14 +643,14 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh,</div><div class='del'>-				    parent_fe_bh, handle, inode_ac,</div><div class='del'>-				    fe_blkno, suballoc_loc, suballoc_bit);</div><div class='add'>+				    handle, inode_ac, fe_blkno,</div><div class='add'>+				    suballoc_loc, suballoc_bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_mkdir(struct mnt_idmap *idmap,</div><div class='del'>-		       struct inode *dir,</div><div class='del'>-		       struct dentry *dentry,</div><div class='del'>-		       umode_t mode)</div><div class='add'>+static struct dentry *ocfs2_mkdir(struct mnt_idmap *idmap,</div><div class='add'>+				  struct inode *dir,</div><div class='add'>+				  struct dentry *dentry,</div><div class='add'>+				  umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -656,7 +660,7 @@ static int ocfs2_mkdir(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ocfs2_create(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -797,6 +801,7 @@ static int ocfs2_link(struct dentry *old_dentry,</div><div class='ctx'> 	ocfs2_set_links_count(fe, inode-&gt;i_nlink);</div><div class='ctx'> 	fe-&gt;i_ctime = cpu_to_le64(inode_get_ctime_sec(inode));</div><div class='ctx'> 	fe-&gt;i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));</div><div class='add'>+	ocfs2_update_inode_fsync_trans(handle, inode, 0);</div><div class='ctx'> 	ocfs2_journal_dirty(handle, fe_bh);</div><div class='ctx'> </div><div class='ctx'> 	err = ocfs2_add_entry(handle, dentry, inode,</div><div class='hunk'>@@ -993,6 +998,7 @@ static int ocfs2_unlink(struct inode *dir,</div><div class='ctx'> 		drop_nlink(inode);</div><div class='ctx'> 	drop_nlink(inode);</div><div class='ctx'> 	ocfs2_set_links_count(fe, inode-&gt;i_nlink);</div><div class='add'>+	ocfs2_update_inode_fsync_trans(handle, inode, 0);</div><div class='ctx'> 	ocfs2_journal_dirty(handle, fe_bh);</div><div class='ctx'> </div><div class='ctx'> 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='hunk'>@@ -1449,8 +1455,8 @@ static int ocfs2_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 		newfe = (struct ocfs2_dinode *) newfe_bh-&gt;b_data;</div><div class='ctx'> </div><div class='ctx'> 		trace_ocfs2_rename_over_existing(</div><div class='del'>-		     (unsigned long long)newfe_blkno, newfe_bh, newfe_bh ?</div><div class='del'>-		     (unsigned long long)newfe_bh-&gt;b_blocknr : 0ULL);</div><div class='add'>+		     (unsigned long long)newfe_blkno, newfe_bh,</div><div class='add'>+		     (unsigned long long)newfe_bh-&gt;b_blocknr);</div><div class='ctx'> </div><div class='ctx'> 		if (S_ISDIR(new_inode-&gt;i_mode) || (new_inode-&gt;i_nlink == 1)) {</div><div class='ctx'> 			status = ocfs2_prepare_orphan_dir(osb, &amp;orphan_dir,</div><div class='hunk'>@@ -2187,8 +2193,10 @@ static int __ocfs2_prepare_orphan_dir(struct inode *orphan_dir_inode,</div><div class='ctx'>  * @osb: ocfs2 file system</div><div class='ctx'>  * @ret_orphan_dir: Orphan dir inode - returned locked!</div><div class='ctx'>  * @blkno: Actual block number of the inode to be inserted into orphan dir.</div><div class='add'>+ * @name: Buffer to store the name of the orphan.</div><div class='ctx'>  * @lookup: dir lookup result, to be passed back into functions like</div><div class='ctx'>  *          ocfs2_orphan_add</div><div class='add'>+ * @dio: Flag indicating if direct IO is being used or not.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success and the ret_orphan_dir, name and lookup</div><div class='ctx'>  * fields will be populated.</div><div class='hunk'>@@ -2570,7 +2578,7 @@ int ocfs2_create_inode_in_orphan(struct inode *dir,</div><div class='ctx'> 	clear_nlink(inode);</div><div class='ctx'> 	/* do the real work now. */</div><div class='ctx'> 	status = __ocfs2_mknod_locked(dir, inode,</div><div class='del'>-				      0, &amp;new_di_bh, parent_di_bh, handle,</div><div class='add'>+				      0, &amp;new_di_bh, handle,</div><div class='ctx'> 				      inode_ac, di_blkno, suballoc_loc,</div><div class='ctx'> 				      suballoc_bit);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='head'>diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h<br/>index a503c553bab2..6aaa94c554c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ocfs2.h</a></div><div class='hunk'>@@ -154,7 +154,7 @@ struct ocfs2_lock_stats {</div><div class='ctx'> </div><div class='ctx'> struct ocfs2_lock_res {</div><div class='ctx'> 	void                    *l_priv;</div><div class='del'>-	struct ocfs2_lock_res_ops *l_ops;</div><div class='add'>+	const struct ocfs2_lock_res_ops *l_ops;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	struct list_head         l_blocked_list;</div><div class='hunk'>@@ -284,6 +284,45 @@ enum ocfs2_mount_options</div><div class='ctx'> #define OCFS2_OSB_ERROR_FS	0x0004</div><div class='ctx'> #define OCFS2_DEFAULT_ATIME_QUANTUM	60</div><div class='ctx'> </div><div class='add'>+struct ocfs2_triggers {</div><div class='add'>+	struct jbd2_buffer_trigger_type	ot_triggers;</div><div class='add'>+	int				ot_offset;</div><div class='add'>+	struct super_block		*sb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ocfs2_journal_trigger_type {</div><div class='add'>+	OCFS2_JTR_DI,</div><div class='add'>+	OCFS2_JTR_EB,</div><div class='add'>+	OCFS2_JTR_RB,</div><div class='add'>+	OCFS2_JTR_GD,</div><div class='add'>+	OCFS2_JTR_DB,</div><div class='add'>+	OCFS2_JTR_XB,</div><div class='add'>+	OCFS2_JTR_DQ,</div><div class='add'>+	OCFS2_JTR_DR,</div><div class='add'>+	OCFS2_JTR_DL,</div><div class='add'>+	OCFS2_JTR_NONE  /* This must be the last entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OCFS2_JOURNAL_TRIGGER_COUNT OCFS2_JTR_NONE</div><div class='add'>+</div><div class='add'>+void ocfs2_initialize_journal_triggers(struct super_block *sb,</div><div class='add'>+				       struct ocfs2_triggers triggers[]);</div><div class='add'>+</div><div class='add'>+enum ocfs2_recovery_state {</div><div class='add'>+	OCFS2_REC_ENABLED = 0,</div><div class='add'>+	OCFS2_REC_QUOTA_WANT_DISABLE,</div><div class='add'>+	/*</div><div class='add'>+	 * Must be OCFS2_REC_QUOTA_WANT_DISABLE + 1 for</div><div class='add'>+	 * ocfs2_recovery_disable_quota() to work.</div><div class='add'>+	 */</div><div class='add'>+	OCFS2_REC_QUOTA_DISABLED,</div><div class='add'>+	OCFS2_REC_WANT_DISABLE,</div><div class='add'>+	/*</div><div class='add'>+	 * Must be OCFS2_REC_WANT_DISABLE + 1 for ocfs2_recovery_exit() to work</div><div class='add'>+	 */</div><div class='add'>+	OCFS2_REC_DISABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ocfs2_journal;</div><div class='ctx'> struct ocfs2_slot_info;</div><div class='ctx'> struct ocfs2_recovery_map;</div><div class='hunk'>@@ -346,11 +385,14 @@ struct ocfs2_super</div><div class='ctx'> 	struct ocfs2_recovery_map *recovery_map;</div><div class='ctx'> 	struct ocfs2_replay_map *replay_map;</div><div class='ctx'> 	struct task_struct *recovery_thread_task;</div><div class='del'>-	int disable_recovery;</div><div class='add'>+	enum ocfs2_recovery_state recovery_state;</div><div class='ctx'> 	wait_queue_head_t checkpoint_event;</div><div class='ctx'> 	struct ocfs2_journal *journal;</div><div class='ctx'> 	unsigned long osb_commit_interval;</div><div class='ctx'> </div><div class='add'>+	/* Journal triggers for checksum */</div><div class='add'>+	struct ocfs2_triggers s_journal_triggers[OCFS2_JOURNAL_TRIGGER_COUNT];</div><div class='add'>+</div><div class='ctx'> 	struct delayed_work		la_enable_wq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h<br/>index 7aebdbf5cc0a..f7763da5c4a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_fs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ocfs2_fs.h</a></div><div class='hunk'>@@ -132,7 +132,7 @@</div><div class='ctx'>  * well as the name of the cluster being joined.</div><div class='ctx'>  * mount.ocfs2 must pass in a matching stack name.</div><div class='ctx'>  *</div><div class='del'>- * If not set, the classic stack will be used.  This is compatbile with</div><div class='add'>+ * If not set, the classic stack will be used.  This is compatible with</div><div class='ctx'>  * all older versions.</div><div class='ctx'>  */</div><div class='ctx'> #define OCFS2_FEATURE_INCOMPAT_USERSPACE_STACK	0x0080</div><div class='hunk'>@@ -143,7 +143,7 @@</div><div class='ctx'> /* Support for extended attributes */</div><div class='ctx'> #define OCFS2_FEATURE_INCOMPAT_XATTR		0x0200</div><div class='ctx'> </div><div class='del'>-/* Support for indexed directores */</div><div class='add'>+/* Support for indexed directories */</div><div class='ctx'> #define OCFS2_FEATURE_INCOMPAT_INDEXED_DIRS	0x0400</div><div class='ctx'> </div><div class='ctx'> /* Metadata checksum and error correction */</div><div class='hunk'>@@ -156,7 +156,7 @@</div><div class='ctx'> #define OCFS2_FEATURE_INCOMPAT_DISCONTIG_BG	0x2000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Incompat bit to indicate useable clusterinfo with stackflags for all</div><div class='add'>+ * Incompat bit to indicate usable clusterinfo with stackflags for all</div><div class='ctx'>  * cluster stacks (userspace adnd o2cb). If this bit is set,</div><div class='ctx'>  * INCOMPAT_USERSPACE_STACK becomes superfluous and thus should not be set.</div><div class='ctx'>  */</div><div class='hunk'>@@ -468,7 +468,8 @@ struct ocfs2_extent_list {</div><div class='ctx'> 	__le16 l_reserved1;</div><div class='ctx'> 	__le64 l_reserved2;		/* Pad to</div><div class='ctx'> 					   sizeof(ocfs2_extent_rec) */</div><div class='del'>-/*10*/	struct ocfs2_extent_rec l_recs[];	/* Extent records */</div><div class='add'>+					/* Extent records */</div><div class='add'>+/*10*/	struct ocfs2_extent_rec l_recs[] __counted_by_le(l_count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -482,7 +483,8 @@ struct ocfs2_chain_list {</div><div class='ctx'> 	__le16 cl_count;		/* Total chains in this list */</div><div class='ctx'> 	__le16 cl_next_free_rec;	/* Next unused chain slot */</div><div class='ctx'> 	__le64 cl_reserved1;</div><div class='del'>-/*10*/	struct ocfs2_chain_rec cl_recs[];	/* Chain records */</div><div class='add'>+					/* Chain records */</div><div class='add'>+/*10*/	struct ocfs2_chain_rec cl_recs[] __counted_by_le(cl_count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -494,7 +496,8 @@ struct ocfs2_truncate_log {</div><div class='ctx'> /*00*/	__le16 tl_count;		/* Total records in this log */</div><div class='ctx'> 	__le16 tl_used;			/* Number of records in use */</div><div class='ctx'> 	__le32 tl_reserved1;</div><div class='del'>-/*08*/	struct ocfs2_truncate_rec tl_recs[];	/* Truncate records */</div><div class='add'>+					/* Truncate records */</div><div class='add'>+/*08*/	struct ocfs2_truncate_rec tl_recs[] __counted_by_le(tl_count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -614,7 +617,7 @@ struct ocfs2_super_block {</div><div class='ctx'> 	__le16 s_reserved0;</div><div class='ctx'> 	__le32 s_dx_seed[3];		/* seed[0-2] for dx dir hash.</div><div class='ctx'> 					 * s_uuid_hash serves as seed[3]. */</div><div class='del'>-/*C0*/  __le64 s_reserved2[15];		/* Fill out superblock */</div><div class='add'>+/*C8*/  __le64 s_reserved2[15];		/* Fill out superblock */</div><div class='ctx'> /*140*/</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -796,9 +799,10 @@ struct ocfs2_dx_entry_list {</div><div class='ctx'> 					 * possible in de_entries */</div><div class='ctx'> 	__le16		de_num_used;	/* Current number of</div><div class='ctx'> 					 * de_entries entries */</div><div class='del'>-	struct	ocfs2_dx_entry		de_entries[];	/* Indexed dir entries</div><div class='del'>-							 * in a packed array of</div><div class='del'>-							 * length de_num_used */</div><div class='add'>+					/* Indexed dir entries in a packed</div><div class='add'>+					 * array of length de_num_used.</div><div class='add'>+					 */</div><div class='add'>+	struct	ocfs2_dx_entry		de_entries[] __counted_by_le(de_count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define OCFS2_DX_FLAG_INLINE	0x01</div><div class='hunk'>@@ -883,7 +887,8 @@ struct ocfs2_group_desc</div><div class='ctx'> 	__le16	bg_free_bits_count;     /* Free bits count */</div><div class='ctx'> 	__le16   bg_chain;               /* What chain I am in. */</div><div class='ctx'> /*10*/	__le32   bg_generation;</div><div class='del'>-	__le32	bg_reserved1;</div><div class='add'>+	__le16   bg_contig_free_bits;   /* max contig free bits length */</div><div class='add'>+	__le16   bg_reserved1;</div><div class='ctx'> 	__le64   bg_next_group;          /* Next group in my list, in</div><div class='ctx'> 					   blocks */</div><div class='ctx'> /*20*/	__le64   bg_parent_dinode;       /* dinode which owns me, in</div><div class='hunk'>@@ -933,7 +938,8 @@ struct ocfs2_refcount_list {</div><div class='ctx'> 	__le16 rl_used;		/* Current number of used records */</div><div class='ctx'> 	__le32 rl_reserved2;</div><div class='ctx'> 	__le64 rl_reserved1;	/* Pad to sizeof(ocfs2_refcount_record) */</div><div class='del'>-/*10*/	struct ocfs2_refcount_rec rl_recs[];	/* Refcount records */</div><div class='add'>+				/* Refcount records */</div><div class='add'>+/*10*/	struct ocfs2_refcount_rec rl_recs[] __counted_by_le(rl_count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1019,7 +1025,8 @@ struct ocfs2_xattr_header {</div><div class='ctx'> 						    buckets.  A block uses</div><div class='ctx'> 						    xb_check and sets</div><div class='ctx'> 						    this field to zero.) */</div><div class='del'>-	struct ocfs2_xattr_entry xh_entries[]; /* xattr entry list. */</div><div class='add'>+						/* xattr entry list. */</div><div class='add'>+	struct ocfs2_xattr_entry xh_entries[] __counted_by_le(xh_count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1082,7 +1089,7 @@ struct ocfs2_xattr_block {</div><div class='ctx'> 		struct ocfs2_xattr_header xb_header; /* xattr header if this</div><div class='ctx'> 							block contains xattr */</div><div class='ctx'> 		struct ocfs2_xattr_tree_root xb_root;/* xattr tree root if this</div><div class='del'>-							block cotains xattr</div><div class='add'>+							block contains xattr</div><div class='ctx'> 							tree. */</div><div class='ctx'> 	} xb_attrs;</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/ocfs2/ocfs2_ioctl.h b/fs/ocfs2/ocfs2_ioctl.h<br/>index 9680797bc531..2de2f8733283 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_ioctl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_ioctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_ioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ocfs2_ioctl.h</a></div><div class='hunk'>@@ -215,7 +215,7 @@ struct ocfs2_move_extents {</div><div class='ctx'> 							   movement less likely</div><div class='ctx'> 							   to fail, may make fs</div><div class='ctx'> 							   even more fragmented */</div><div class='del'>-#define OCFS2_MOVE_EXT_FL_COMPLETE	(0x00000004)	/* Move or defragmenation</div><div class='add'>+#define OCFS2_MOVE_EXT_FL_COMPLETE	(0x00000004)	/* Move or defragmentation</div><div class='ctx'> 							   completely gets done.</div><div class='ctx'> 							 */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h<br/>index 8ac357ce6a30..9b234c03d693 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_lockid.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_lockid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_lockid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ocfs2_lockid.h</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static char *ocfs2_lock_type_strings[] = {</div><div class='ctx'> 	[OCFS2_LOCK_TYPE_DATA] = "Data",</div><div class='ctx'> 	[OCFS2_LOCK_TYPE_SUPER] = "Super",</div><div class='ctx'> 	[OCFS2_LOCK_TYPE_RENAME] = "Rename",</div><div class='del'>-	/* Need to differntiate from [R]ename.. serializing writes is the</div><div class='add'>+	/* Need to differentiate from [R]ename.. serializing writes is the</div><div class='ctx'> 	 * important job it does, anyway. */</div><div class='ctx'> 	[OCFS2_LOCK_TYPE_RW] = "Write/Read",</div><div class='ctx'> 	[OCFS2_LOCK_TYPE_DENTRY] = "Dentry",</div><div class='head'>diff --git a/fs/ocfs2/ocfs2_trace.h b/fs/ocfs2/ocfs2_trace.h<br/>index 9898c11bdfa1..4b32fb5658ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_trace.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/ocfs2_trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/ocfs2_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/ocfs2_trace.h</a></div><div class='hunk'>@@ -82,7 +82,7 @@ DECLARE_EVENT_CLASS(ocfs2__string,</div><div class='ctx'> 		__string(name,name)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%s", __get_str(name))</div><div class='ctx'> );</div><div class='hunk'>@@ -1289,7 +1289,7 @@ DECLARE_EVENT_CLASS(ocfs2__file_ops,</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='ctx'> 		__entry-&gt;d_len = d_len;</div><div class='del'>-		__assign_str(d_name, d_name);</div><div class='add'>+		__assign_str(d_name);</div><div class='ctx'> 		__entry-&gt;para = para;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%p %p %p %llu %llu %.*s", __entry-&gt;inode, __entry-&gt;file,</div><div class='hunk'>@@ -1425,7 +1425,7 @@ TRACE_EVENT(ocfs2_setattr,</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='ctx'> 		__entry-&gt;d_len = d_len;</div><div class='del'>-		__assign_str(d_name, d_name);</div><div class='add'>+		__assign_str(d_name);</div><div class='ctx'> 		__entry-&gt;ia_valid = ia_valid;</div><div class='ctx'> 		__entry-&gt;ia_mode = ia_mode;</div><div class='ctx'> 		__entry-&gt;ia_uid = ia_uid;</div><div class='hunk'>@@ -1569,8 +1569,6 @@ DEFINE_OCFS2_ULL_ULL_UINT_EVENT(ocfs2_delete_inode);</div><div class='ctx'> </div><div class='ctx'> DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_clear_inode);</div><div class='ctx'> </div><div class='del'>-DEFINE_OCFS2_ULL_UINT_UINT_EVENT(ocfs2_drop_inode);</div><div class='del'>-</div><div class='ctx'> TRACE_EVENT(ocfs2_inode_revalidate,</div><div class='ctx'> 	TP_PROTO(void *inode, unsigned long long ino,</div><div class='ctx'> 		 unsigned int flags),</div><div class='hunk'>@@ -1658,34 +1656,34 @@ TRACE_EVENT(ocfs2_remount,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(ocfs2_fill_super,</div><div class='del'>-	TP_PROTO(void *sb, void *data, int silent),</div><div class='del'>-	TP_ARGS(sb, data, silent),</div><div class='add'>+	TP_PROTO(void *sb, void *fc, int silent),</div><div class='add'>+	TP_ARGS(sb, fc, silent),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(void *, sb)</div><div class='del'>-		__field(void *, data)</div><div class='add'>+		__field(void *, fc)</div><div class='ctx'> 		__field(int, silent)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;sb = sb;</div><div class='del'>-		__entry-&gt;data = data;</div><div class='add'>+		__entry-&gt;fc = fc;</div><div class='ctx'> 		__entry-&gt;silent = silent;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%p %p %d", __entry-&gt;sb,</div><div class='del'>-		  __entry-&gt;data, __entry-&gt;silent)</div><div class='add'>+		  __entry-&gt;fc, __entry-&gt;silent)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(ocfs2_parse_options,</div><div class='del'>-	TP_PROTO(int is_remount, char *options),</div><div class='del'>-	TP_ARGS(is_remount, options),</div><div class='add'>+	TP_PROTO(int is_remount, const char *option),</div><div class='add'>+	TP_ARGS(is_remount, option),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		__field(int, is_remount)</div><div class='del'>-		__string(options, options)</div><div class='add'>+		__string(option, option)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;is_remount = is_remount;</div><div class='del'>-		__assign_str(options, options);</div><div class='add'>+		__assign_str(option);</div><div class='ctx'> 	),</div><div class='del'>-	TP_printk("%d %s", __entry-&gt;is_remount, __get_str(options))</div><div class='add'>+	TP_printk("%d %s", __entry-&gt;is_remount, __get_str(option))</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> DEFINE_OCFS2_POINTER_EVENT(ocfs2_put_super);</div><div class='hunk'>@@ -1718,8 +1716,8 @@ TRACE_EVENT(ocfs2_initialize_super,</div><div class='ctx'> 		__field(int, cluster_bits)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(label, label);</div><div class='del'>-		__assign_str(uuid_str, uuid_str);</div><div class='add'>+		__assign_str(label);</div><div class='add'>+		__assign_str(uuid_str);</div><div class='ctx'> 		__entry-&gt;root_dir = root_dir;</div><div class='ctx'> 		__entry-&gt;system_dir = system_dir;</div><div class='ctx'> 		__entry-&gt;cluster_bits = cluster_bits;</div><div class='hunk'>@@ -1746,7 +1744,7 @@ TRACE_EVENT(ocfs2_init_xattr_set_ctxt,</div><div class='ctx'> 		__field(int, credits)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;meta = meta;</div><div class='ctx'> 		__entry-&gt;clusters = clusters;</div><div class='ctx'> 		__entry-&gt;credits = credits;</div><div class='hunk'>@@ -1770,7 +1768,7 @@ DECLARE_EVENT_CLASS(ocfs2__xattr_find,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;name_index = name_index;</div><div class='ctx'> 		__entry-&gt;hash = hash;</div><div class='ctx'> 		__entry-&gt;location = location;</div><div class='hunk'>@@ -2019,7 +2017,7 @@ TRACE_EVENT(ocfs2_sync_dquot_helper,</div><div class='ctx'> 		__entry-&gt;dq_id = dq_id;</div><div class='ctx'> 		__entry-&gt;dq_type = dq_type;</div><div class='ctx'> 		__entry-&gt;type = type;</div><div class='del'>-		__assign_str(s_id, s_id);</div><div class='add'>+		__assign_str(s_id);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%u %u %lu %s", __entry-&gt;dq_id, __entry-&gt;dq_type,</div><div class='ctx'> 		  __entry-&gt;type, __get_str(s_id))</div><div class='hunk'>@@ -2060,7 +2058,7 @@ TRACE_EVENT(ocfs2_dx_dir_search,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='ctx'> 		__entry-&gt;namelen = namelen;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;major_hash = major_hash;</div><div class='ctx'> 		__entry-&gt;minor_hash = minor_hash;</div><div class='ctx'> 		__entry-&gt;blkno = blkno;</div><div class='hunk'>@@ -2088,7 +2086,7 @@ TRACE_EVENT(ocfs2_find_files_on_disk,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;namelen = namelen;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;blkno = blkno;</div><div class='ctx'> 		__entry-&gt;dir = dir;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -2107,7 +2105,7 @@ TRACE_EVENT(ocfs2_check_dir_for_entry,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;dir = dir;</div><div class='ctx'> 		__entry-&gt;namelen = namelen;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%llu %.*s", __entry-&gt;dir,</div><div class='ctx'> 		  __entry-&gt;namelen, __get_str(name))</div><div class='hunk'>@@ -2135,7 +2133,7 @@ TRACE_EVENT(ocfs2_dx_dir_index_root_block,</div><div class='ctx'> 		__entry-&gt;major_hash = major_hash;</div><div class='ctx'> 		__entry-&gt;minor_hash = minor_hash;</div><div class='ctx'> 		__entry-&gt;namelen = namelen;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;num_used = num_used;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%llu %x %x %.*s %u", __entry-&gt;dir,</div><div class='hunk'>@@ -2171,7 +2169,7 @@ DECLARE_EVENT_CLASS(ocfs2__dentry_ops,</div><div class='ctx'> 		__entry-&gt;dir = dir;</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;name_len = name_len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;dir_blkno = dir_blkno;</div><div class='ctx'> 		__entry-&gt;extra = extra;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -2217,7 +2215,7 @@ TRACE_EVENT(ocfs2_mknod,</div><div class='ctx'> 		__entry-&gt;dir = dir;</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;name_len = name_len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;dir_blkno = dir_blkno;</div><div class='ctx'> 		__entry-&gt;dev = dev;</div><div class='ctx'> 		__entry-&gt;mode = mode;</div><div class='hunk'>@@ -2241,9 +2239,9 @@ TRACE_EVENT(ocfs2_link,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='ctx'> 		__entry-&gt;old_len = old_len;</div><div class='del'>-		__assign_str(old_name, old_name);</div><div class='add'>+		__assign_str(old_name);</div><div class='ctx'> 		__entry-&gt;name_len = name_len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%llu %.*s %.*s", __entry-&gt;ino,</div><div class='ctx'> 		  __entry-&gt;old_len, __get_str(old_name),</div><div class='hunk'>@@ -2279,9 +2277,9 @@ TRACE_EVENT(ocfs2_rename,</div><div class='ctx'> 		__entry-&gt;new_dir = new_dir;</div><div class='ctx'> 		__entry-&gt;new_dentry = new_dentry;</div><div class='ctx'> 		__entry-&gt;old_len = old_len;</div><div class='del'>-		__assign_str(old_name, old_name);</div><div class='add'>+		__assign_str(old_name);</div><div class='ctx'> 		__entry-&gt;new_len = new_len;</div><div class='del'>-		__assign_str(new_name, new_name);</div><div class='add'>+		__assign_str(new_name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%p %p %p %p %.*s %.*s",</div><div class='ctx'> 		  __entry-&gt;old_dir, __entry-&gt;old_dentry,</div><div class='hunk'>@@ -2301,7 +2299,7 @@ TRACE_EVENT(ocfs2_rename_target_exists,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;new_len = new_len;</div><div class='del'>-		__assign_str(new_name, new_name);</div><div class='add'>+		__assign_str(new_name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%.*s", __entry-&gt;new_len, __get_str(new_name))</div><div class='ctx'> );</div><div class='hunk'>@@ -2344,7 +2342,7 @@ TRACE_EVENT(ocfs2_symlink_begin,</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;symname = symname;</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%p %p %s %.*s", __entry-&gt;dir, __entry-&gt;dentry,</div><div class='ctx'> 		  __entry-&gt;symname, __entry-&gt;len, __get_str(name))</div><div class='hunk'>@@ -2360,7 +2358,7 @@ TRACE_EVENT(ocfs2_blkno_stringify,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;blkno = blkno;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;namelen = namelen;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%llu %s %d", __entry-&gt;blkno, __get_str(name),</div><div class='hunk'>@@ -2381,7 +2379,7 @@ TRACE_EVENT(ocfs2_orphan_del,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;dir = dir;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;namelen = namelen;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%llu %s %d", __entry-&gt;dir, __get_str(name),</div><div class='hunk'>@@ -2403,7 +2401,7 @@ TRACE_EVENT(ocfs2_dentry_revalidate,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%p %.*s", __entry-&gt;dentry, __entry-&gt;len, __get_str(name))</div><div class='ctx'> );</div><div class='hunk'>@@ -2420,7 +2418,7 @@ TRACE_EVENT(ocfs2_dentry_revalidate_negative,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;pgen = pgen;</div><div class='ctx'> 		__entry-&gt;gen = gen;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -2445,7 +2443,7 @@ TRACE_EVENT(ocfs2_find_local_alias,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%.*s", __entry-&gt;len, __get_str(name))</div><div class='ctx'> );</div><div class='hunk'>@@ -2462,7 +2460,7 @@ TRACE_EVENT(ocfs2_dentry_attach_lock,</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;parent = parent;</div><div class='ctx'> 		__entry-&gt;fsdata = fsdata;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -2480,7 +2478,7 @@ TRACE_EVENT(ocfs2_dentry_attach_lock_found,</div><div class='ctx'> 		__field(unsigned long long, ino)</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_fast_assign(</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;parent = parent;</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='ctx'> 	),</div><div class='hunk'>@@ -2527,7 +2525,7 @@ TRACE_EVENT(ocfs2_get_parent,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;child = child;</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;ino = ino;</div><div class='ctx'> 	),</div><div class='ctx'> 	TP_printk("%p %.*s %llu", __entry-&gt;child, __entry-&gt;len,</div><div class='hunk'>@@ -2551,7 +2549,7 @@ TRACE_EVENT(ocfs2_encode_fh_begin,</div><div class='ctx'> 	TP_fast_assign(</div><div class='ctx'> 		__entry-&gt;dentry = dentry;</div><div class='ctx'> 		__entry-&gt;name_len = name_len;</div><div class='del'>-		__assign_str(name, name);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 		__entry-&gt;fh = fh;</div><div class='ctx'> 		__entry-&gt;len = len;</div><div class='ctx'> 		__entry-&gt;connectable = connectable;</div><div class='hunk'>@@ -2577,6 +2575,8 @@ DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_commit_cache_end);</div><div class='ctx'> </div><div class='ctx'> DEFINE_OCFS2_INT_INT_EVENT(ocfs2_extend_trans);</div><div class='ctx'> </div><div class='add'>+DEFINE_OCFS2_INT_EVENT(ocfs2_assure_trans_credits);</div><div class='add'>+</div><div class='ctx'> DEFINE_OCFS2_INT_EVENT(ocfs2_extend_trans_restart);</div><div class='ctx'> </div><div class='ctx'> DEFINE_OCFS2_INT_INT_EVENT(ocfs2_allocate_extend_trans);</div><div class='head'>diff --git a/fs/ocfs2/quota.h b/fs/ocfs2/quota.h<br/>index ebb5c99f490e..788a8de922a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/quota.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/quota.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/quota.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/quota.h</a></div><div class='hunk'>@@ -97,7 +97,6 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 			  const char *data, size_t len, loff_t off);</div><div class='ctx'> int ocfs2_global_read_info(struct super_block *sb, int type);</div><div class='ctx'> int ocfs2_global_write_info(struct super_block *sb, int type);</div><div class='del'>-int ocfs2_global_read_dquot(struct dquot *dquot);</div><div class='ctx'> int __ocfs2_sync_dquot(struct dquot *dquot, int freeing);</div><div class='ctx'> static inline int ocfs2_sync_dquot(struct dquot *dquot)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c<br/>index dc9f76ab7e13..e85b1ccf81be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/quota_global.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/quota_global.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/quota_global.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/quota_global.c</a></div><div class='hunk'>@@ -273,7 +273,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 	if (new)</div><div class='ctx'> 		memset(bh-&gt;b_data, 0, sb-&gt;s_blocksize);</div><div class='ctx'> 	memcpy(bh-&gt;b_data + offset, data, len);</div><div class='del'>-	flush_dcache_page(bh-&gt;b_page);</div><div class='add'>+	flush_dcache_folio(bh-&gt;b_folio);</div><div class='ctx'> 	set_buffer_uptodate(bh);</div><div class='ctx'> 	unlock_buffer(bh);</div><div class='ctx'> 	ocfs2_set_buffer_uptodate(INODE_CACHE(gqinode), bh);</div><div class='hunk'>@@ -371,12 +371,16 @@ int ocfs2_global_read_info(struct super_block *sb, int type)</div><div class='ctx'> </div><div class='ctx'> 	status = ocfs2_extent_map_get_blocks(oinfo-&gt;dqi_gqinode, 0, &amp;oinfo-&gt;dqi_giblk,</div><div class='ctx'> 					     &amp;pcount, NULL);</div><div class='del'>-	if (status &lt; 0)</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		mlog_errno(status);</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	status = ocfs2_qinfo_lock(oinfo, 0);</div><div class='del'>-	if (status &lt; 0)</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		mlog_errno(status);</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> 	status = sb-&gt;s_op-&gt;quota_read(sb, type, (char *)&amp;dinfo,</div><div class='ctx'> 				      sizeof(struct ocfs2_global_disk_dqinfo),</div><div class='ctx'> 				      OCFS2_GLOBAL_INFO_OFF);</div><div class='hunk'>@@ -404,12 +408,11 @@ int ocfs2_global_read_info(struct super_block *sb, int type)</div><div class='ctx'> 	schedule_delayed_work(&amp;oinfo-&gt;dqi_sync_work,</div><div class='ctx'> 			      msecs_to_jiffies(oinfo-&gt;dqi_syncms));</div><div class='ctx'> </div><div class='del'>-out_err:</div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	ocfs2_unlock_global_qf(oinfo, 0);</div><div class='del'>-	mlog_errno(status);</div><div class='del'>-	goto out_err;</div><div class='add'>+out_err:</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write information to global quota file. Expects exclusive lock on quota</div><div class='hunk'>@@ -447,14 +450,17 @@ int ocfs2_global_write_info(struct super_block *sb, int type)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='ctx'> 	struct ocfs2_mem_dqinfo *info = dqopt-&gt;info[type].dqi_priv;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	err = ocfs2_qinfo_lock(info, 1);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_sem;</div><div class='ctx'> 	err = __ocfs2_global_write_info(sb, type);</div><div class='ctx'> 	ocfs2_qinfo_unlock(info, 1);</div><div class='ctx'> out_sem:</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -601,6 +607,7 @@ static int ocfs2_sync_dquot_helper(struct dquot *dquot, unsigned long type)</div><div class='ctx'> 	struct ocfs2_mem_dqinfo *oinfo = sb_dqinfo(sb, type)-&gt;dqi_priv;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(sb);</div><div class='ctx'> 	int status = 0;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_sync_dquot_helper(from_kqid(&amp;init_user_ns, dquot-&gt;dq_id),</div><div class='ctx'> 				      dquot-&gt;dq_id.type,</div><div class='hunk'>@@ -618,6 +625,7 @@ static int ocfs2_sync_dquot_helper(struct dquot *dquot, unsigned long type)</div><div class='ctx'> 		goto out_ilock;</div><div class='ctx'> 	}</div><div class='ctx'> 	down_write(&amp;sb_dqopt(sb)-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	status = ocfs2_sync_dquot(dquot);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		mlog_errno(status);</div><div class='hunk'>@@ -625,6 +633,7 @@ static int ocfs2_sync_dquot_helper(struct dquot *dquot, unsigned long type)</div><div class='ctx'> 	status = ocfs2_local_write_dquot(dquot);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		mlog_errno(status);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;sb_dqopt(sb)-&gt;dqio_sem);</div><div class='ctx'> 	ocfs2_commit_trans(osb, handle);</div><div class='ctx'> out_ilock:</div><div class='hunk'>@@ -662,6 +671,7 @@ static int ocfs2_write_dquot(struct dquot *dquot)</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(dquot-&gt;dq_sb);</div><div class='ctx'> 	int status = 0;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_write_dquot(from_kqid(&amp;init_user_ns, dquot-&gt;dq_id),</div><div class='ctx'> 				dquot-&gt;dq_id.type);</div><div class='hunk'>@@ -673,7 +683,9 @@ static int ocfs2_write_dquot(struct dquot *dquot)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	down_write(&amp;sb_dqopt(dquot-&gt;dq_sb)-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	status = ocfs2_local_write_dquot(dquot);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;sb_dqopt(dquot-&gt;dq_sb)-&gt;dqio_sem);</div><div class='ctx'> 	ocfs2_commit_trans(osb, handle);</div><div class='ctx'> out:</div><div class='hunk'>@@ -749,6 +761,11 @@ static int ocfs2_release_dquot(struct dquot *dquot)</div><div class='ctx'> 	handle = ocfs2_start_trans(osb,</div><div class='ctx'> 		ocfs2_calc_qdel_credits(dquot-&gt;dq_sb, dquot-&gt;dq_id.type));</div><div class='ctx'> 	if (IS_ERR(handle)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Mark dquot as inactive to avoid endless cycle in</div><div class='add'>+		 * quota_release_workfn().</div><div class='add'>+		 */</div><div class='add'>+		clear_bit(DQ_ACTIVE_B, &amp;dquot-&gt;dq_flags);</div><div class='ctx'> 		status = PTR_ERR(handle);</div><div class='ctx'> 		mlog_errno(status);</div><div class='ctx'> 		goto out_ilock;</div><div class='hunk'>@@ -881,7 +898,7 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_get_next_id(from_kqid(&amp;init_user_ns, *qid), type);</div><div class='del'>-	if (!sb_has_quota_loaded(sb, type)) {</div><div class='add'>+	if (!sb_has_quota_active(sb, type)) {</div><div class='ctx'> 		status = -ESRCH;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -920,6 +937,7 @@ static int ocfs2_mark_dquot_dirty(struct dquot *dquot)</div><div class='ctx'> 	struct ocfs2_mem_dqinfo *oinfo = sb_dqinfo(sb, type)-&gt;dqi_priv;</div><div class='ctx'> 	handle_t *handle;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(sb);</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_mark_dquot_dirty(from_kqid(&amp;init_user_ns, dquot-&gt;dq_id),</div><div class='ctx'> 				     type);</div><div class='hunk'>@@ -946,6 +964,7 @@ static int ocfs2_mark_dquot_dirty(struct dquot *dquot)</div><div class='ctx'> 		goto out_ilock;</div><div class='ctx'> 	}</div><div class='ctx'> 	down_write(&amp;sb_dqopt(sb)-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	status = ocfs2_sync_dquot(dquot);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		mlog_errno(status);</div><div class='hunk'>@@ -954,6 +973,7 @@ static int ocfs2_mark_dquot_dirty(struct dquot *dquot)</div><div class='ctx'> 	/* Now write updated local dquot structure */</div><div class='ctx'> 	status = ocfs2_local_write_dquot(dquot);</div><div class='ctx'> out_dlock:</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;sb_dqopt(sb)-&gt;dqio_sem);</div><div class='ctx'> 	ocfs2_commit_trans(osb, handle);</div><div class='ctx'> out_ilock:</div><div class='head'>diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c<br/>index e09842fc9d4d..de7f12858729 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/quota_local.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/quota_local.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/quota_local.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/quota_local.c</a></div><div class='hunk'>@@ -453,8 +453,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /* Sync changes in local quota file into global quota file and</div><div class='ctx'>  * reinitialize local quota file.</div><div class='del'>- * The function expects local quota file to be already locked and</div><div class='del'>- * s_umount locked in shared mode. */</div><div class='add'>+ * The function expects local quota file to be already locked. */</div><div class='ctx'> static int ocfs2_recover_local_quota_file(struct inode *lqinode,</div><div class='ctx'> 					  int type,</div><div class='ctx'> 					  struct ocfs2_quota_recovery *rec)</div><div class='hunk'>@@ -470,6 +469,7 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,</div><div class='ctx'> 	int bit, chunk;</div><div class='ctx'> 	struct ocfs2_recovery_chunk *rchunk, *next;</div><div class='ctx'> 	qsize_t spacechange, inodechange;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_recover_local_quota_file((unsigned long)lqinode-&gt;i_ino, type);</div><div class='ctx'> </div><div class='hunk'>@@ -521,6 +521,7 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,</div><div class='ctx'> 				goto out_drop_lock;</div><div class='ctx'> 			}</div><div class='ctx'> 			down_write(&amp;sb_dqopt(sb)-&gt;dqio_sem);</div><div class='add'>+			memalloc = memalloc_nofs_save();</div><div class='ctx'> 			spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 			/* Add usage from quota entry into quota changes</div><div class='ctx'> 			 * of our node. Auxiliary variables are important</div><div class='hunk'>@@ -553,6 +554,7 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,</div><div class='ctx'> 			unlock_buffer(qbh);</div><div class='ctx'> 			ocfs2_journal_dirty(handle, qbh);</div><div class='ctx'> out_commit:</div><div class='add'>+			memalloc_nofs_restore(memalloc);</div><div class='ctx'> 			up_write(&amp;sb_dqopt(sb)-&gt;dqio_sem);</div><div class='ctx'> 			ocfs2_commit_trans(OCFS2_SB(sb), handle);</div><div class='ctx'> out_drop_lock:</div><div class='hunk'>@@ -585,7 +587,6 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ino[OCFS2_MAXQUOTAS] = { LOCAL_USER_QUOTA_SYSTEM_INODE,</div><div class='ctx'> 					      LOCAL_GROUP_QUOTA_SYSTEM_INODE };</div><div class='del'>-	struct super_block *sb = osb-&gt;sb;</div><div class='ctx'> 	struct ocfs2_local_disk_dqinfo *ldinfo;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	handle_t *handle;</div><div class='hunk'>@@ -597,7 +598,6 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,</div><div class='ctx'> 	printk(KERN_NOTICE "ocfs2: Finishing quota recovery on device (%s) for "</div><div class='ctx'> 	       "slot %u\n", osb-&gt;dev_str, slot_num);</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;sb-&gt;s_umount);</div><div class='ctx'> 	for (type = 0; type &lt; OCFS2_MAXQUOTAS; type++) {</div><div class='ctx'> 		if (list_empty(&amp;(rec-&gt;r_list[type])))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -674,8 +674,7 @@ out_put:</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	up_read(&amp;sb-&gt;s_umount);</div><div class='del'>-	kfree(rec);</div><div class='add'>+	ocfs2_free_quota_recovery(rec);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -689,7 +688,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)</div><div class='ctx'> 	int status;</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='ctx'> 	struct ocfs2_quota_recovery *rec;</div><div class='del'>-	int locked = 0;</div><div class='add'>+	int locked = 0, global_read = 0;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;dqi_max_spc_limit = 0x7fffffffffffffffLL;</div><div class='ctx'> 	info-&gt;dqi_max_ino_limit = 0x7fffffffffffffffLL;</div><div class='hunk'>@@ -697,6 +696,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)</div><div class='ctx'> 	if (!oinfo) {</div><div class='ctx'> 		mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"</div><div class='ctx'> 			       " info.");</div><div class='add'>+		status = -ENOMEM;</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;dqi_priv = oinfo;</div><div class='hunk'>@@ -709,6 +709,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)</div><div class='ctx'> 	status = ocfs2_global_read_info(sb, type);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out_err;</div><div class='add'>+	global_read = 1;</div><div class='ctx'> </div><div class='ctx'> 	status = ocfs2_inode_lock(lqinode, &amp;oinfo-&gt;dqi_lqi_bh, 1);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='hunk'>@@ -779,10 +780,12 @@ out_err:</div><div class='ctx'> 		if (locked)</div><div class='ctx'> 			ocfs2_inode_unlock(lqinode, 1);</div><div class='ctx'> 		ocfs2_release_local_quota_bitmaps(&amp;oinfo-&gt;dqi_chunk);</div><div class='add'>+		if (global_read)</div><div class='add'>+			cancel_delayed_work_sync(&amp;oinfo-&gt;dqi_sync_work);</div><div class='ctx'> 		kfree(oinfo);</div><div class='ctx'> 	}</div><div class='ctx'> 	brelse(bh);</div><div class='del'>-	return -1;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write local info to quota file */</div><div class='hunk'>@@ -836,8 +839,7 @@ static int ocfs2_local_free_info(struct super_block *sb, int type)</div><div class='ctx'> 	ocfs2_release_local_quota_bitmaps(&amp;oinfo-&gt;dqi_chunk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * s_umount held in exclusive mode protects us against racing with</div><div class='del'>-	 * recovery thread...</div><div class='add'>+	 * ocfs2_dismount_volume() has already aborted quota recovery...</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (oinfo-&gt;dqi_rec) {</div><div class='ctx'> 		ocfs2_free_quota_recovery(oinfo-&gt;dqi_rec);</div><div class='hunk'>@@ -860,6 +862,7 @@ out:</div><div class='ctx'> 	brelse(oinfo-&gt;dqi_libh);</div><div class='ctx'> 	brelse(oinfo-&gt;dqi_lqi_bh);</div><div class='ctx'> 	kfree(oinfo);</div><div class='add'>+	info-&gt;dqi_priv = NULL;</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c<br/>index 3f80a56d0d60..c92e0ea85bca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/refcounttree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/refcounttree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/refcounttree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/refcounttree.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include "namei.h"</div><div class='ctx'> #include "ocfs2_trace.h"</div><div class='ctx'> #include "file.h"</div><div class='add'>+#include "symlink.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -33,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/pagevec.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='hunk'>@@ -620,7 +622,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode,</div><div class='ctx'> 	/* Initialize ocfs2_refcount_block. */</div><div class='ctx'> 	rb = (struct ocfs2_refcount_block *)new_bh-&gt;b_data;</div><div class='ctx'> 	memset(rb, 0, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-	strcpy((void *)rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);</div><div class='add'>+	strscpy(rb-&gt;rf_signature, OCFS2_REFCOUNT_BLOCK_SIGNATURE);</div><div class='ctx'> 	rb-&gt;rf_suballoc_slot = cpu_to_le16(meta_ac-&gt;ac_alloc_slot);</div><div class='ctx'> 	rb-&gt;rf_suballoc_loc = cpu_to_le64(suballoc_loc);</div><div class='ctx'> 	rb-&gt;rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);</div><div class='hunk'>@@ -630,7 +632,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode,</div><div class='ctx'> 	rb-&gt;rf_records.rl_count =</div><div class='ctx'> 			cpu_to_le16(ocfs2_refcount_recs_per_rb(osb-&gt;sb));</div><div class='ctx'> 	spin_lock(&amp;osb-&gt;osb_lock);</div><div class='del'>-	rb-&gt;rf_generation = osb-&gt;s_next_generation++;</div><div class='add'>+	rb-&gt;rf_generation = cpu_to_le32(osb-&gt;s_next_generation++);</div><div class='ctx'> 	spin_unlock(&amp;osb-&gt;osb_lock);</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_journal_dirty(handle, new_bh);</div><div class='hunk'>@@ -1392,13 +1394,6 @@ static int cmp_refcount_rec_by_cpos(const void *a, const void *b)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void swap_refcount_rec(void *a, void *b, int size)</div><div class='del'>-{</div><div class='del'>-	struct ocfs2_refcount_rec *l = a, *r = b;</div><div class='del'>-</div><div class='del'>-	swap(*l, *r);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The refcount cpos are ordered by their 64bit cpos,</div><div class='ctx'>  * But we will use the low 32 bit to be the e_cpos in the b-tree.</div><div class='hunk'>@@ -1474,7 +1469,7 @@ static int ocfs2_divide_leaf_refcount_block(struct buffer_head *ref_leaf_bh,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sort(&amp;rl-&gt;rl_recs, le16_to_cpu(rl-&gt;rl_used),</div><div class='ctx'> 	     sizeof(struct ocfs2_refcount_rec),</div><div class='del'>-	     cmp_refcount_rec_by_low_cpos, swap_refcount_rec);</div><div class='add'>+	     cmp_refcount_rec_by_low_cpos, NULL);</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_find_refcount_split_pos(rl, &amp;cpos, &amp;split_index);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1499,11 +1494,11 @@ static int ocfs2_divide_leaf_refcount_block(struct buffer_head *ref_leaf_bh,</div><div class='ctx'> </div><div class='ctx'> 	sort(&amp;rl-&gt;rl_recs, le16_to_cpu(rl-&gt;rl_used),</div><div class='ctx'> 	     sizeof(struct ocfs2_refcount_rec),</div><div class='del'>-	     cmp_refcount_rec_by_cpos, swap_refcount_rec);</div><div class='add'>+	     cmp_refcount_rec_by_cpos, NULL);</div><div class='ctx'> </div><div class='ctx'> 	sort(&amp;new_rl-&gt;rl_recs, le16_to_cpu(new_rl-&gt;rl_used),</div><div class='ctx'> 	     sizeof(struct ocfs2_refcount_rec),</div><div class='del'>-	     cmp_refcount_rec_by_cpos, swap_refcount_rec);</div><div class='add'>+	     cmp_refcount_rec_by_cpos, NULL);</div><div class='ctx'> </div><div class='ctx'> 	*split_cpos = cpos;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1568,7 +1563,7 @@ static int ocfs2_new_leaf_refcount_block(handle_t *handle,</div><div class='ctx'> 	/* Initialize ocfs2_refcount_block. */</div><div class='ctx'> 	new_rb = (struct ocfs2_refcount_block *)new_bh-&gt;b_data;</div><div class='ctx'> 	memset(new_rb, 0, sb-&gt;s_blocksize);</div><div class='del'>-	strcpy((void *)new_rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);</div><div class='add'>+	strscpy(new_rb-&gt;rf_signature, OCFS2_REFCOUNT_BLOCK_SIGNATURE);</div><div class='ctx'> 	new_rb-&gt;rf_suballoc_slot = cpu_to_le16(meta_ac-&gt;ac_alloc_slot);</div><div class='ctx'> 	new_rb-&gt;rf_suballoc_loc = cpu_to_le64(suballoc_loc);</div><div class='ctx'> 	new_rb-&gt;rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);</div><div class='hunk'>@@ -2426,7 +2421,7 @@ static int ocfs2_calc_refcount_meta_credits(struct super_block *sb,</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * If we will insert a new one, this is easy and only happens</div><div class='ctx'> 		 * during adding refcounted flag to the extent, so we don't</div><div class='del'>-		 * have a chance of spliting. We just need one record.</div><div class='add'>+		 * have a chance of splitting. We just need one record.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * If the refcount rec already exists, that would be a little</div><div class='ctx'> 		 * complicated. we may have to:</div><div class='hunk'>@@ -2616,11 +2611,11 @@ static inline unsigned int ocfs2_cow_align_length(struct super_block *sb,</div><div class='ctx'> /*</div><div class='ctx'>  * Calculate out the start and number of virtual clusters we need to CoW.</div><div class='ctx'>  *</div><div class='del'>- * cpos is vitual start cluster position we want to do CoW in a</div><div class='add'>+ * cpos is virtual start cluster position we want to do CoW in a</div><div class='ctx'>  * file and write_len is the cluster length.</div><div class='ctx'>  * max_cpos is the place where we want to stop CoW intentionally.</div><div class='ctx'>  *</div><div class='del'>- * Normal we will start CoW from the beginning of extent record cotaining cpos.</div><div class='add'>+ * Normal we will start CoW from the beginning of extent record containing cpos.</div><div class='ctx'>  * We try to break up extents on boundaries of MAX_CONTIG_BYTES so that we</div><div class='ctx'>  * get good I/O from the resulting extent tree.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2908,7 +2903,6 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,</div><div class='ctx'> 	int ret = 0, partial;</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	u64 new_block = ocfs2_clusters_to_blocks(sb, new_cluster);</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	pgoff_t page_index;</div><div class='ctx'> 	unsigned int from, to;</div><div class='ctx'> 	loff_t offset, end, map_end;</div><div class='hunk'>@@ -2927,6 +2921,7 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,</div><div class='ctx'> 		end = i_size_read(inode);</div><div class='ctx'> </div><div class='ctx'> 	while (offset &lt; end) {</div><div class='add'>+		struct folio *folio;</div><div class='ctx'> 		page_index = offset &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		map_end = ((loff_t)page_index + 1) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 		if (map_end &gt; end)</div><div class='hunk'>@@ -2939,9 +2934,10 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,</div><div class='ctx'> 			to = map_end &amp; (PAGE_SIZE - 1);</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-		page = find_or_create_page(mapping, page_index, GFP_NOFS);</div><div class='del'>-		if (!page) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='add'>+		folio = __filemap_get_folio(mapping, page_index,</div><div class='add'>+				FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS);</div><div class='add'>+		if (IS_ERR(folio)) {</div><div class='add'>+			ret = PTR_ERR(folio);</div><div class='ctx'> 			mlog_errno(ret);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2951,9 +2947,9 @@ retry:</div><div class='ctx'> 		 * page, so write it back.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (PAGE_SIZE &lt;= OCFS2_SB(sb)-&gt;s_clustersize) {</div><div class='del'>-			if (PageDirty(page)) {</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				put_page(page);</div><div class='add'>+			if (folio_test_dirty(folio)) {</div><div class='add'>+				folio_unlock(folio);</div><div class='add'>+				folio_put(folio);</div><div class='ctx'> </div><div class='ctx'> 				ret = filemap_write_and_wait_range(mapping,</div><div class='ctx'> 						offset, map_end - 1);</div><div class='hunk'>@@ -2961,9 +2957,7 @@ retry:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!PageUptodate(page)) {</div><div class='del'>-			struct folio *folio = page_folio(page);</div><div class='del'>-</div><div class='add'>+		if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 			ret = block_read_full_folio(folio, ocfs2_get_block);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				mlog_errno(ret);</div><div class='hunk'>@@ -2972,8 +2966,8 @@ retry:</div><div class='ctx'> 			folio_lock(folio);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (page_has_buffers(page)) {</div><div class='del'>-			ret = walk_page_buffers(handle, page_buffers(page),</div><div class='add'>+		if (folio_buffers(folio)) {</div><div class='add'>+			ret = walk_page_buffers(handle, folio_buffers(folio),</div><div class='ctx'> 						from, to, &amp;partial,</div><div class='ctx'> 						ocfs2_clear_cow_buffer);</div><div class='ctx'> 			if (ret) {</div><div class='hunk'>@@ -2982,14 +2976,12 @@ retry:</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ocfs2_map_and_dirty_page(inode,</div><div class='del'>-					 handle, from, to,</div><div class='del'>-					 page, 0, &amp;new_block);</div><div class='del'>-		mark_page_accessed(page);</div><div class='add'>+		ocfs2_map_and_dirty_folio(inode, handle, from, to,</div><div class='add'>+				folio, 0, &amp;new_block);</div><div class='add'>+		folio_mark_accessed(folio);</div><div class='ctx'> unlock:</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		page = NULL;</div><div class='add'>+		folio_unlock(folio);</div><div class='add'>+		folio_put(folio);</div><div class='ctx'> 		offset = map_end;</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4155,8 +4147,9 @@ static int __ocfs2_reflink(struct dentry *old_dentry,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct inode *inode = d_inode(old_dentry);</div><div class='ctx'> 	struct buffer_head *new_bh = NULL;</div><div class='add'>+	struct ocfs2_inode_info *oi = OCFS2_I(inode);</div><div class='ctx'> </div><div class='del'>-	if (OCFS2_I(inode)-&gt;ip_flags &amp; OCFS2_INODE_SYSTEM_FILE) {</div><div class='add'>+	if (oi-&gt;ip_flags &amp; OCFS2_INODE_SYSTEM_FILE) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		mlog_errno(ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -4182,6 +4175,26 @@ static int __ocfs2_reflink(struct dentry *old_dentry,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((oi-&gt;ip_dyn_features &amp; OCFS2_HAS_XATTR_FL) &amp;&amp;</div><div class='add'>+	    (oi-&gt;ip_dyn_features &amp; OCFS2_INLINE_XATTR_FL)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Adjust extent record count to reserve space for extended attribute.</div><div class='add'>+		 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().</div><div class='add'>+		 */</div><div class='add'>+		struct ocfs2_inode_info *new_oi = OCFS2_I(new_inode);</div><div class='add'>+</div><div class='add'>+		if (!(new_oi-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL) &amp;&amp;</div><div class='add'>+		    !(ocfs2_inode_is_fast_symlink(new_inode))) {</div><div class='add'>+			struct ocfs2_dinode *new_di = (struct ocfs2_dinode *)new_bh-&gt;b_data;</div><div class='add'>+			struct ocfs2_dinode *old_di = (struct ocfs2_dinode *)old_bh-&gt;b_data;</div><div class='add'>+			struct ocfs2_extent_list *el = &amp;new_di-&gt;id2.i_list;</div><div class='add'>+			int inline_size = le16_to_cpu(old_di-&gt;i_xattr_inline_size);</div><div class='add'>+</div><div class='add'>+			le16_add_cpu(&amp;el-&gt;l_count, -(inline_size /</div><div class='add'>+					sizeof(struct ocfs2_extent_rec)));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = ocfs2_create_reflink_node(inode, old_bh,</div><div class='ctx'> 					new_inode, new_bh, preserve);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -4189,7 +4202,7 @@ static int __ocfs2_reflink(struct dentry *old_dentry,</div><div class='ctx'> 		goto inode_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (OCFS2_I(inode)-&gt;ip_dyn_features &amp; OCFS2_HAS_XATTR_FL) {</div><div class='add'>+	if (oi-&gt;ip_dyn_features &amp; OCFS2_HAS_XATTR_FL) {</div><div class='ctx'> 		ret = ocfs2_reflink_xattrs(inode, old_bh,</div><div class='ctx'> 					   new_inode, new_bh,</div><div class='ctx'> 					   preserve);</div><div class='hunk'>@@ -4406,7 +4419,7 @@ int ocfs2_reflink_ioctl(struct inode *inode,</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	new_dentry = user_path_create(AT_FDCWD, newname, &amp;new_path, 0);</div><div class='add'>+	new_dentry = start_creating_user_path(AT_FDCWD, newname, &amp;new_path, 0);</div><div class='ctx'> 	error = PTR_ERR(new_dentry);</div><div class='ctx'> 	if (IS_ERR(new_dentry)) {</div><div class='ctx'> 		mlog_errno(error);</div><div class='hunk'>@@ -4423,7 +4436,7 @@ int ocfs2_reflink_ioctl(struct inode *inode,</div><div class='ctx'> 				  d_inode(new_path.dentry),</div><div class='ctx'> 				  new_dentry, preserve);</div><div class='ctx'> out_dput:</div><div class='del'>-	done_path_create(&amp;new_path, new_dentry);</div><div class='add'>+	end_creating_path(&amp;new_path, new_dentry);</div><div class='ctx'> out:</div><div class='ctx'> 	path_put(&amp;old_path);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c<br/>index a9d1296d736d..1fe61974d9f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/reservations.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/reservations.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/reservations.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/reservations.c</a></div><div class='hunk'>@@ -414,7 +414,7 @@ static int ocfs2_resmap_find_free_bits(struct ocfs2_reservation_map *resmap,</div><div class='ctx'> </div><div class='ctx'> 	start = search_start;</div><div class='ctx'> 	while ((offset = ocfs2_find_next_zero_bit(bitmap, resmap-&gt;m_bitmap_len,</div><div class='del'>-						 start)) != -1) {</div><div class='add'>+					start)) &lt; resmap-&gt;m_bitmap_len) {</div><div class='ctx'> 		/* Search reached end of the region */</div><div class='ctx'> 		if (offset &gt;= (search_start + search_len))</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/fs/ocfs2/reservations.h b/fs/ocfs2/reservations.h<br/>index ec8101ef5717..4fce17180342 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/reservations.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/reservations.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/reservations.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/reservations.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@ struct ocfs2_alloc_reservation {</div><div class='ctx'> </div><div class='ctx'> #define	OCFS2_RESV_FLAG_INUSE	0x01	/* Set when r_node is part of a btree */</div><div class='ctx'> #define	OCFS2_RESV_FLAG_TMP	0x02	/* Temporary reservation, will be</div><div class='del'>-					 * destroyed immedately after use */</div><div class='add'>+					 * destroyed immediately after use */</div><div class='ctx'> #define	OCFS2_RESV_FLAG_DIR	0x04	/* Reservation is for an unindexed</div><div class='ctx'> 					 * directory btree */</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +125,7 @@ int ocfs2_resmap_resv_bits(struct ocfs2_reservation_map *resmap,</div><div class='ctx'> /**</div><div class='ctx'>  * ocfs2_resmap_claimed_bits() - Tell the reservation code that bits were used.</div><div class='ctx'>  * @resmap: reservations bitmap</div><div class='del'>- * @resv: optional reservation to recalulate based on new bitmap</div><div class='add'>+ * @resv: optional reservation to recalculate based on new bitmap</div><div class='ctx'>  * @cstart: start of allocation in clusters</div><div class='ctx'>  * @clen: end of allocation in clusters.</div><div class='ctx'>  *</div><div class='head'>diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c<br/>index d65d43c61857..b0733c08ed13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/resize.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/resize.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/resize.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/resize.c</a></div><div class='hunk'>@@ -91,6 +91,8 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,</div><div class='ctx'> 	u16 cl_bpc = le16_to_cpu(cl-&gt;cl_bpc);</div><div class='ctx'> 	u16 cl_cpg = le16_to_cpu(cl-&gt;cl_cpg);</div><div class='ctx'> 	u16 old_bg_clusters;</div><div class='add'>+	u16 contig_bits;</div><div class='add'>+	__le16 old_bg_contig_free_bits;</div><div class='ctx'> </div><div class='ctx'> 	trace_ocfs2_update_last_group_and_inode(new_clusters,</div><div class='ctx'> 						first_new_cluster);</div><div class='hunk'>@@ -122,6 +124,11 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,</div><div class='ctx'> 		le16_add_cpu(&amp;group-&gt;bg_free_bits_count, -1 * backups);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	contig_bits = ocfs2_find_max_contig_free_bits(group-&gt;bg_bitmap,</div><div class='add'>+					le16_to_cpu(group-&gt;bg_bits), 0);</div><div class='add'>+	old_bg_contig_free_bits = group-&gt;bg_contig_free_bits;</div><div class='add'>+	group-&gt;bg_contig_free_bits = cpu_to_le16(contig_bits);</div><div class='add'>+</div><div class='ctx'> 	ocfs2_journal_dirty(handle, group_bh);</div><div class='ctx'> </div><div class='ctx'> 	/* update the inode accordingly. */</div><div class='hunk'>@@ -160,6 +167,7 @@ out_rollback:</div><div class='ctx'> 		le16_add_cpu(&amp;group-&gt;bg_free_bits_count, backups);</div><div class='ctx'> 		le16_add_cpu(&amp;group-&gt;bg_bits, -1 * num_bits);</div><div class='ctx'> 		le16_add_cpu(&amp;group-&gt;bg_free_bits_count, -1 * num_bits);</div><div class='add'>+		group-&gt;bg_contig_free_bits = old_bg_contig_free_bits;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -566,6 +574,8 @@ out_commit:</div><div class='ctx'> 	ocfs2_commit_trans(osb, handle);</div><div class='ctx'> </div><div class='ctx'> out_free_group_bh:</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ocfs2_remove_from_cache(INODE_CACHE(inode), group_bh);</div><div class='ctx'> 	brelse(group_bh);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='head'>diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c<br/>index c973c03f6fd8..f58e891aa2da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stack_o2cb.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stack_o2cb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stack_o2cb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/stack_o2cb.c</a></div><div class='hunk'>@@ -227,7 +227,7 @@ static int o2cb_dlm_lock_status(struct ocfs2_dlm_lksb *lksb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * o2dlm aways has a "valid" LVB. If the dlm loses track of the LVB</div><div class='add'>+ * o2dlm always has a "valid" LVB. If the dlm loses track of the LVB</div><div class='ctx'>  * contents, it will zero out the LVB.  Thus the caller can always trust</div><div class='ctx'>  * the contents.</div><div class='ctx'>  */</div><div class='hunk'>@@ -404,7 +404,7 @@ static int o2cb_cluster_this_node(struct ocfs2_cluster_connection *conn,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_stack_operations o2cb_stack_ops = {</div><div class='add'>+static const struct ocfs2_stack_operations o2cb_stack_ops = {</div><div class='ctx'> 	.connect	= o2cb_cluster_connect,</div><div class='ctx'> 	.disconnect	= o2cb_cluster_disconnect,</div><div class='ctx'> 	.this_node	= o2cb_cluster_this_node,</div><div class='head'>diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c<br/>index 9b76ee66aeb2..be0a5758bd40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stack_user.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stack_user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stack_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/stack_user.c</a></div><div class='hunk'>@@ -360,7 +360,6 @@ static int ocfs2_control_do_setnode_msg(struct file *file,</div><div class='ctx'> 					struct ocfs2_control_message_setn *msg)</div><div class='ctx'> {</div><div class='ctx'> 	long nodenum;</div><div class='del'>-	char *ptr = NULL;</div><div class='ctx'> 	struct ocfs2_control_private *p = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (ocfs2_control_get_handshake_state(file) !=</div><div class='hunk'>@@ -375,8 +374,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	msg-&gt;space = msg-&gt;newline = '\0';</div><div class='ctx'> </div><div class='del'>-	nodenum = simple_strtol(msg-&gt;nodestr, &amp;ptr, 16);</div><div class='del'>-	if (!ptr || *ptr)</div><div class='add'>+	if (kstrtol(msg-&gt;nodestr, 16, &amp;nodenum))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((nodenum == LONG_MIN) || (nodenum == LONG_MAX) ||</div><div class='hunk'>@@ -391,7 +389,6 @@ static int ocfs2_control_do_setversion_msg(struct file *file,</div><div class='ctx'> 					   struct ocfs2_control_message_setv *msg)</div><div class='ctx'> {</div><div class='ctx'> 	long major, minor;</div><div class='del'>-	char *ptr = NULL;</div><div class='ctx'> 	struct ocfs2_control_private *p = file-&gt;private_data;</div><div class='ctx'> 	struct ocfs2_protocol_version *max =</div><div class='ctx'> 		&amp;ocfs2_user_plugin.sp_max_proto;</div><div class='hunk'>@@ -409,11 +406,9 @@ static int ocfs2_control_do_setversion_msg(struct file *file,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	msg-&gt;space1 = msg-&gt;space2 = msg-&gt;newline = '\0';</div><div class='ctx'> </div><div class='del'>-	major = simple_strtol(msg-&gt;major, &amp;ptr, 16);</div><div class='del'>-	if (!ptr || *ptr)</div><div class='add'>+	if (kstrtol(msg-&gt;major, 16, &amp;major))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	minor = simple_strtol(msg-&gt;minor, &amp;ptr, 16);</div><div class='del'>-	if (!ptr || *ptr)</div><div class='add'>+	if (kstrtol(msg-&gt;minor, 16, &amp;minor))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -441,7 +436,6 @@ static int ocfs2_control_do_down_msg(struct file *file,</div><div class='ctx'> 				     struct ocfs2_control_message_down *msg)</div><div class='ctx'> {</div><div class='ctx'> 	long nodenum;</div><div class='del'>-	char *p = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ocfs2_control_get_handshake_state(file) !=</div><div class='ctx'> 	    OCFS2_CONTROL_HANDSHAKE_VALID)</div><div class='hunk'>@@ -456,8 +450,7 @@ static int ocfs2_control_do_down_msg(struct file *file,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	msg-&gt;space1 = msg-&gt;space2 = msg-&gt;newline = '\0';</div><div class='ctx'> </div><div class='del'>-	nodenum = simple_strtol(msg-&gt;nodestr, &amp;p, 16);</div><div class='del'>-	if (!p || *p)</div><div class='add'>+	if (kstrtol(msg-&gt;nodestr, 16, &amp;nodenum))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((nodenum == LONG_MIN) || (nodenum == LONG_MAX) ||</div><div class='hunk'>@@ -744,7 +737,7 @@ static int user_plock(struct ocfs2_cluster_connection *conn,</div><div class='ctx'> 		return dlm_posix_cancel(conn-&gt;cc_lockspace, ino, file, fl);</div><div class='ctx'> 	else if (IS_GETLK(cmd))</div><div class='ctx'> 		return dlm_posix_get(conn-&gt;cc_lockspace, ino, file, fl);</div><div class='del'>-	else if (fl-&gt;fl_type == F_UNLCK)</div><div class='add'>+	else if (lock_is_unlock(fl))</div><div class='ctx'> 		return dlm_posix_unlock(conn-&gt;cc_lockspace, ino, file, fl);</div><div class='ctx'> 	else</div><div class='ctx'> 		return dlm_posix_lock(conn-&gt;cc_lockspace, ino, file, cmd, fl);</div><div class='hunk'>@@ -959,7 +952,7 @@ static const struct dlm_lockspace_ops ocfs2_ls_ops = {</div><div class='ctx'> static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn)</div><div class='ctx'> {</div><div class='ctx'> 	version_unlock(conn);</div><div class='del'>-	dlm_release_lockspace(conn-&gt;cc_lockspace, 2);</div><div class='add'>+	dlm_release_lockspace(conn-&gt;cc_lockspace, DLM_RELEASE_NORMAL);</div><div class='ctx'> 	conn-&gt;cc_lockspace = NULL;</div><div class='ctx'> 	ocfs2_live_connection_drop(conn-&gt;cc_private);</div><div class='ctx'> 	conn-&gt;cc_private = NULL;</div><div class='hunk'>@@ -1018,6 +1011,7 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn)</div><div class='ctx'> 			printk(KERN_ERR "ocfs2: Could not determine"</div><div class='ctx'> 					" locking version\n");</div><div class='ctx'> 			user_cluster_disconnect(conn);</div><div class='add'>+			lc = NULL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		wait_event(lc-&gt;oc_wait, (atomic_read(&amp;lc-&gt;oc_this_node) &gt; 0));</div><div class='hunk'>@@ -1065,7 +1059,7 @@ static int user_cluster_this_node(struct ocfs2_cluster_connection *conn,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ocfs2_stack_operations ocfs2_user_plugin_ops = {</div><div class='add'>+static const struct ocfs2_stack_operations ocfs2_user_plugin_ops = {</div><div class='ctx'> 	.connect	= user_cluster_connect,</div><div class='ctx'> 	.disconnect	= user_cluster_disconnect,</div><div class='ctx'> 	.this_node	= user_cluster_this_node,</div><div class='head'>diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c<br/>index 20aa37b67cfb..a28c127b9934 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stackglue.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stackglue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stackglue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/stackglue.c</a></div><div class='hunk'>@@ -650,7 +650,7 @@ error:</div><div class='ctx'>  * and easier to preserve the name.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct ctl_table ocfs2_nm_table[] = {</div><div class='add'>+static const struct ctl_table ocfs2_nm_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "hb_ctl_path",</div><div class='ctx'> 		.data		= ocfs2_hb_ctl_path,</div><div class='hunk'>@@ -691,8 +691,7 @@ static void __exit ocfs2_stack_glue_exit(void)</div><div class='ctx'> 	memset(&amp;locking_max_version, 0,</div><div class='ctx'> 	       sizeof(struct ocfs2_protocol_version));</div><div class='ctx'> 	ocfs2_sysfs_exit();</div><div class='del'>-	if (ocfs2_table_header)</div><div class='del'>-		unregister_sysctl_table(ocfs2_table_header);</div><div class='add'>+	unregister_sysctl_table(ocfs2_table_header);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Oracle");</div><div class='head'>diff --git a/fs/ocfs2/stackglue.h b/fs/ocfs2/stackglue.h<br/>index 3636847fae19..5486a6dce70a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stackglue.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/stackglue.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/stackglue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/stackglue.h</a></div><div class='hunk'>@@ -210,7 +210,7 @@ struct ocfs2_stack_operations {</div><div class='ctx'> 		     struct file_lock *fl);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * This is an optoinal debugging hook.  If provided, the</div><div class='add'>+	 * This is an optional debugging hook.  If provided, the</div><div class='ctx'> 	 * stack can dump debugging information about this lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*dump_lksb)(struct ocfs2_dlm_lksb *lksb);</div><div class='hunk'>@@ -223,7 +223,7 @@ struct ocfs2_stack_operations {</div><div class='ctx'>  */</div><div class='ctx'> struct ocfs2_stack_plugin {</div><div class='ctx'> 	char *sp_name;</div><div class='del'>-	struct ocfs2_stack_operations *sp_ops;</div><div class='add'>+	const struct ocfs2_stack_operations *sp_ops;</div><div class='ctx'> 	struct module *sp_owner;</div><div class='ctx'> </div><div class='ctx'> 	/* These are managed by the stackglue code. */</div><div class='head'>diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c<br/>index 166c8918c825..6ac4dcd54588 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/suballoc.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/suballoc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/suballoc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/suballoc.c</a></div><div class='hunk'>@@ -50,6 +50,10 @@ struct ocfs2_suballoc_result {</div><div class='ctx'> 	u64		sr_blkno;	/* The first allocated block */</div><div class='ctx'> 	unsigned int	sr_bit_offset;	/* The bit in the bg */</div><div class='ctx'> 	unsigned int	sr_bits;	/* How many bits we claimed */</div><div class='add'>+	unsigned int	sr_max_contig_bits; /* The length for contiguous</div><div class='add'>+					     * free bits, only available</div><div class='add'>+					     * for cluster group</div><div class='add'>+					     */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u64 ocfs2_group_from_res(struct ocfs2_suballoc_result *res)</div><div class='hunk'>@@ -694,10 +698,12 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,</div><div class='ctx'> </div><div class='ctx'> 	bg_bh = ocfs2_block_group_alloc_contig(osb, handle, alloc_inode,</div><div class='ctx'> 					       ac, cl);</div><div class='del'>-	if (PTR_ERR(bg_bh) == -ENOSPC)</div><div class='add'>+	if (PTR_ERR(bg_bh) == -ENOSPC) {</div><div class='add'>+		ac-&gt;ac_which = OCFS2_AC_USE_MAIN_DISCONTIG;</div><div class='ctx'> 		bg_bh = ocfs2_block_group_alloc_discontig(handle,</div><div class='ctx'> 							  alloc_inode,</div><div class='ctx'> 							  ac, cl);</div><div class='add'>+	}</div><div class='ctx'> 	if (IS_ERR(bg_bh)) {</div><div class='ctx'> 		status = PTR_ERR(bg_bh);</div><div class='ctx'> 		bg_bh = NULL;</div><div class='hunk'>@@ -1272,6 +1278,26 @@ static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u16 ocfs2_find_max_contig_free_bits(void *bitmap,</div><div class='add'>+			 u16 total_bits, u16 start)</div><div class='add'>+{</div><div class='add'>+	u16 offset, free_bits;</div><div class='add'>+	u16 contig_bits = 0;</div><div class='add'>+</div><div class='add'>+	while (start &lt; total_bits) {</div><div class='add'>+		offset = ocfs2_find_next_zero_bit(bitmap, total_bits, start);</div><div class='add'>+		if (offset == total_bits)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		start = ocfs2_find_next_bit(bitmap, total_bits, offset);</div><div class='add'>+		free_bits = start - offset;</div><div class='add'>+		if (contig_bits &lt; free_bits)</div><div class='add'>+			contig_bits = free_bits;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return contig_bits;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,</div><div class='ctx'> 					     struct buffer_head *bg_bh,</div><div class='ctx'> 					     unsigned int bits_wanted,</div><div class='hunk'>@@ -1280,6 +1306,7 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,</div><div class='ctx'> {</div><div class='ctx'> 	void *bitmap;</div><div class='ctx'> 	u16 best_offset, best_size;</div><div class='add'>+	u16 prev_best_size = 0;</div><div class='ctx'> 	int offset, start, found, status = 0;</div><div class='ctx'> 	struct ocfs2_group_desc *bg = (struct ocfs2_group_desc *) bg_bh-&gt;b_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1290,10 +1317,8 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,</div><div class='ctx'> 	found = start = best_offset = best_size = 0;</div><div class='ctx'> 	bitmap = bg-&gt;bg_bitmap;</div><div class='ctx'> </div><div class='del'>-	while((offset = ocfs2_find_next_zero_bit(bitmap, total_bits, start)) != -1) {</div><div class='del'>-		if (offset == total_bits)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='add'>+	while ((offset = ocfs2_find_next_zero_bit(bitmap, total_bits, start)) &lt;</div><div class='add'>+	       total_bits) {</div><div class='ctx'> 		if (!ocfs2_test_bg_bit_allocatable(bg_bh, offset)) {</div><div class='ctx'> 			/* We found a zero, but we can't use it as it</div><div class='ctx'> 			 * hasn't been put to disk yet! */</div><div class='hunk'>@@ -1308,6 +1333,7 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,</div><div class='ctx'> 			/* got a zero after some ones */</div><div class='ctx'> 			found = 1;</div><div class='ctx'> 			start = offset + 1;</div><div class='add'>+			prev_best_size = best_size;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (found &gt; best_size) {</div><div class='ctx'> 			best_size = found;</div><div class='hunk'>@@ -1320,6 +1346,8 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* best_size will be allocated, we save prev_best_size */</div><div class='add'>+	res-&gt;sr_max_contig_bits = prev_best_size;</div><div class='ctx'> 	if (best_size) {</div><div class='ctx'> 		res-&gt;sr_bit_offset = best_offset;</div><div class='ctx'> 		res-&gt;sr_bits = best_size;</div><div class='hunk'>@@ -1337,11 +1365,16 @@ int ocfs2_block_group_set_bits(handle_t *handle,</div><div class='ctx'> 					     struct ocfs2_group_desc *bg,</div><div class='ctx'> 					     struct buffer_head *group_bh,</div><div class='ctx'> 					     unsigned int bit_off,</div><div class='del'>-					     unsigned int num_bits)</div><div class='add'>+					     unsigned int num_bits,</div><div class='add'>+					     unsigned int max_contig_bits,</div><div class='add'>+					     int fastpath)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	void *bitmap = bg-&gt;bg_bitmap;</div><div class='ctx'> 	int journal_type = OCFS2_JOURNAL_ACCESS_WRITE;</div><div class='add'>+	unsigned int start = bit_off + num_bits;</div><div class='add'>+	u16 contig_bits;</div><div class='add'>+	struct ocfs2_super *osb = OCFS2_SB(alloc_inode-&gt;i_sb);</div><div class='ctx'> </div><div class='ctx'> 	/* All callers get the descriptor via</div><div class='ctx'> 	 * ocfs2_read_group_descriptor().  Any corruption is a code bug. */</div><div class='hunk'>@@ -1373,6 +1406,29 @@ int ocfs2_block_group_set_bits(handle_t *handle,</div><div class='ctx'> 	while(num_bits--)</div><div class='ctx'> 		ocfs2_set_bit(bit_off++, bitmap);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * this is optimize path, caller set old contig value</div><div class='add'>+	 * in max_contig_bits to bypass finding action.</div><div class='add'>+	 */</div><div class='add'>+	if (fastpath) {</div><div class='add'>+		bg-&gt;bg_contig_free_bits = cpu_to_le16(max_contig_bits);</div><div class='add'>+	} else if (ocfs2_is_cluster_bitmap(alloc_inode)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Usually, the block group bitmap allocates only 1 bit</div><div class='add'>+		 * at a time, while the cluster group allocates n bits</div><div class='add'>+		 * each time. Therefore, we only save the contig bits for</div><div class='add'>+		 * the cluster group.</div><div class='add'>+		 */</div><div class='add'>+		contig_bits = ocfs2_find_max_contig_free_bits(bitmap,</div><div class='add'>+				    le16_to_cpu(bg-&gt;bg_bits), start);</div><div class='add'>+		if (contig_bits &gt; max_contig_bits)</div><div class='add'>+			max_contig_bits = contig_bits;</div><div class='add'>+		bg-&gt;bg_contig_free_bits = cpu_to_le16(max_contig_bits);</div><div class='add'>+		ocfs2_local_alloc_seen_free_bits(osb, max_contig_bits);</div><div class='add'>+	} else {</div><div class='add'>+		bg-&gt;bg_contig_free_bits = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ocfs2_journal_dirty(handle, group_bh);</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='hunk'>@@ -1486,7 +1542,12 @@ static int ocfs2_cluster_group_search(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ocfs2_is_cluster_bitmap(inode));</div><div class='ctx'> </div><div class='del'>-	if (gd-&gt;bg_free_bits_count) {</div><div class='add'>+	if (le16_to_cpu(gd-&gt;bg_contig_free_bits) &amp;&amp;</div><div class='add'>+	    le16_to_cpu(gd-&gt;bg_contig_free_bits) &lt; bits_wanted)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* -&gt;bg_contig_free_bits may un-initialized, so compare again */</div><div class='add'>+	if (le16_to_cpu(gd-&gt;bg_free_bits_count) &gt;= bits_wanted) {</div><div class='ctx'> 		max_bits = le16_to_cpu(gd-&gt;bg_bits);</div><div class='ctx'> </div><div class='ctx'> 		/* Tail groups in cluster bitmaps which aren't cpg</div><div class='hunk'>@@ -1530,13 +1591,6 @@ static int ocfs2_cluster_group_search(struct inode *inode,</div><div class='ctx'> 		 * of bits. */</div><div class='ctx'> 		if (min_bits &lt;= res-&gt;sr_bits)</div><div class='ctx'> 			search = 0; /* success */</div><div class='del'>-		else if (res-&gt;sr_bits) {</div><div class='del'>-			/*</div><div class='del'>-			 * Don't show bits which we'll be returning</div><div class='del'>-			 * for allocation to the local alloc bitmap.</div><div class='del'>-			 */</div><div class='del'>-			ocfs2_local_alloc_seen_free_bits(osb, res-&gt;sr_bits);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return search;</div><div class='hunk'>@@ -1555,7 +1609,7 @@ static int ocfs2_block_group_search(struct inode *inode,</div><div class='ctx'> 	BUG_ON(min_bits != 1);</div><div class='ctx'> 	BUG_ON(ocfs2_is_cluster_bitmap(inode));</div><div class='ctx'> </div><div class='del'>-	if (bg-&gt;bg_free_bits_count) {</div><div class='add'>+	if (le16_to_cpu(bg-&gt;bg_free_bits_count) &gt;= bits_wanted) {</div><div class='ctx'> 		ret = ocfs2_block_group_find_clear_bits(OCFS2_SB(inode-&gt;i_sb),</div><div class='ctx'> 							group_bh, bits_wanted,</div><div class='ctx'> 							le16_to_cpu(bg-&gt;bg_bits),</div><div class='hunk'>@@ -1715,7 +1769,8 @@ static int ocfs2_search_one_group(struct ocfs2_alloc_context *ac,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ocfs2_block_group_set_bits(handle, alloc_inode, gd, group_bh,</div><div class='del'>-					 res-&gt;sr_bit_offset, res-&gt;sr_bits);</div><div class='add'>+					 res-&gt;sr_bit_offset, res-&gt;sr_bits,</div><div class='add'>+					 res-&gt;sr_max_contig_bits, 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ocfs2_rollback_alloc_dinode_counts(alloc_inode, ac-&gt;ac_bh,</div><div class='ctx'> 					       res-&gt;sr_bits,</div><div class='hunk'>@@ -1741,6 +1796,7 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	u16 chain;</div><div class='add'>+	u32 contig_bits;</div><div class='ctx'> 	u64 next_group;</div><div class='ctx'> 	struct inode *alloc_inode = ac-&gt;ac_inode;</div><div class='ctx'> 	struct buffer_head *group_bh = NULL;</div><div class='hunk'>@@ -1766,10 +1822,21 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,</div><div class='ctx'> 	status = -ENOSPC;</div><div class='ctx'> 	/* for now, the chain search is a bit simplistic. We just use</div><div class='ctx'> 	 * the 1st group with any empty bits. */</div><div class='del'>-	while ((status = ac-&gt;ac_group_search(alloc_inode, group_bh,</div><div class='del'>-					     bits_wanted, min_bits,</div><div class='del'>-					     ac-&gt;ac_max_block,</div><div class='del'>-					     res)) == -ENOSPC) {</div><div class='add'>+	while (1) {</div><div class='add'>+		if (ac-&gt;ac_which == OCFS2_AC_USE_MAIN_DISCONTIG) {</div><div class='add'>+			contig_bits = le16_to_cpu(bg-&gt;bg_contig_free_bits);</div><div class='add'>+			if (!contig_bits)</div><div class='add'>+				contig_bits = ocfs2_find_max_contig_free_bits(bg-&gt;bg_bitmap,</div><div class='add'>+						le16_to_cpu(bg-&gt;bg_bits), 0);</div><div class='add'>+			if (bits_wanted &gt; contig_bits &amp;&amp; contig_bits &gt;= min_bits)</div><div class='add'>+				bits_wanted = contig_bits;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = ac-&gt;ac_group_search(alloc_inode, group_bh,</div><div class='add'>+				bits_wanted, min_bits,</div><div class='add'>+				ac-&gt;ac_max_block, res);</div><div class='add'>+		if (status != -ENOSPC)</div><div class='add'>+			break;</div><div class='ctx'> 		if (!bg-&gt;bg_next_group)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1849,7 +1916,9 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,</div><div class='ctx'> 					    bg,</div><div class='ctx'> 					    group_bh,</div><div class='ctx'> 					    res-&gt;sr_bit_offset,</div><div class='del'>-					    res-&gt;sr_bits);</div><div class='add'>+					    res-&gt;sr_bits,</div><div class='add'>+					    res-&gt;sr_max_contig_bits,</div><div class='add'>+					    0);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		ocfs2_rollback_alloc_dinode_counts(alloc_inode,</div><div class='ctx'> 					ac-&gt;ac_bh, res-&gt;sr_bits, chain);</div><div class='hunk'>@@ -1927,6 +1996,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,</div><div class='ctx'> 	victim = ocfs2_find_victim_chain(cl);</div><div class='ctx'> 	ac-&gt;ac_chain = victim;</div><div class='ctx'> </div><div class='add'>+search:</div><div class='ctx'> 	status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits,</div><div class='ctx'> 				    res, &amp;bits_left);</div><div class='ctx'> 	if (!status) {</div><div class='hunk'>@@ -1951,7 +2021,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,</div><div class='ctx'> 	for (i = 0; i &lt; le16_to_cpu(cl-&gt;cl_next_free_rec); i ++) {</div><div class='ctx'> 		if (i == victim)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!cl-&gt;cl_recs[i].c_free)</div><div class='add'>+		if (le32_to_cpu(cl-&gt;cl_recs[i].c_free) &lt; bits_wanted)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		ac-&gt;ac_chain = i;</div><div class='hunk'>@@ -1967,6 +2037,16 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Chains can't supply the bits_wanted contiguous space.</div><div class='add'>+	 * We should switch to using every single bit when allocating</div><div class='add'>+	 * from the global bitmap. */</div><div class='add'>+	if (i == le16_to_cpu(cl-&gt;cl_next_free_rec) &amp;&amp;</div><div class='add'>+	    status == -ENOSPC &amp;&amp; ac-&gt;ac_which == OCFS2_AC_USE_MAIN) {</div><div class='add'>+		ac-&gt;ac_which = OCFS2_AC_USE_MAIN_DISCONTIG;</div><div class='add'>+		ac-&gt;ac_chain = victim;</div><div class='add'>+		goto search;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> set_hint:</div><div class='ctx'> 	if (status != -ENOSPC) {</div><div class='ctx'> 		/* If the next search of this group is not likely to</div><div class='hunk'>@@ -2163,7 +2243,9 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,</div><div class='ctx'> 					 bg,</div><div class='ctx'> 					 bg_bh,</div><div class='ctx'> 					 res-&gt;sr_bit_offset,</div><div class='del'>-					 res-&gt;sr_bits);</div><div class='add'>+					 res-&gt;sr_bits,</div><div class='add'>+					 res-&gt;sr_max_contig_bits,</div><div class='add'>+					 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ocfs2_rollback_alloc_dinode_counts(ac-&gt;ac_inode,</div><div class='ctx'> 					       ac-&gt;ac_bh, res-&gt;sr_bits, chain);</div><div class='hunk'>@@ -2308,7 +2390,8 @@ int __ocfs2_claim_clusters(handle_t *handle,</div><div class='ctx'> 	BUG_ON(ac-&gt;ac_bits_given &gt;= ac-&gt;ac_bits_wanted);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ac-&gt;ac_which != OCFS2_AC_USE_LOCAL</div><div class='del'>-	       &amp;&amp; ac-&gt;ac_which != OCFS2_AC_USE_MAIN);</div><div class='add'>+	       &amp;&amp; ac-&gt;ac_which != OCFS2_AC_USE_MAIN</div><div class='add'>+	       &amp;&amp; ac-&gt;ac_which != OCFS2_AC_USE_MAIN_DISCONTIG);</div><div class='ctx'> </div><div class='ctx'> 	if (ac-&gt;ac_which == OCFS2_AC_USE_LOCAL) {</div><div class='ctx'> 		WARN_ON(min_clusters &gt; 1);</div><div class='hunk'>@@ -2382,11 +2465,13 @@ static int ocfs2_block_group_clear_bits(handle_t *handle,</div><div class='ctx'> 					struct buffer_head *group_bh,</div><div class='ctx'> 					unsigned int bit_off,</div><div class='ctx'> 					unsigned int num_bits,</div><div class='add'>+					unsigned int max_contig_bits,</div><div class='ctx'> 					void (*undo_fn)(unsigned int bit,</div><div class='ctx'> 							unsigned long *bmap))</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	unsigned int tmp;</div><div class='add'>+	u16 contig_bits;</div><div class='ctx'> 	struct ocfs2_group_desc *undo_bg = NULL;</div><div class='ctx'> 	struct journal_head *jh;</div><div class='ctx'> </div><div class='hunk'>@@ -2433,6 +2518,20 @@ static int ocfs2_block_group_clear_bits(handle_t *handle,</div><div class='ctx'> 				   num_bits);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * TODO: even 'num_bits == 1' (the worst case, release 1 cluster),</div><div class='add'>+	 * we still need to rescan whole bitmap.</div><div class='add'>+	 */</div><div class='add'>+	if (ocfs2_is_cluster_bitmap(alloc_inode)) {</div><div class='add'>+		contig_bits = ocfs2_find_max_contig_free_bits(bg-&gt;bg_bitmap,</div><div class='add'>+				    le16_to_cpu(bg-&gt;bg_bits), 0);</div><div class='add'>+		if (contig_bits &gt; max_contig_bits)</div><div class='add'>+			max_contig_bits = contig_bits;</div><div class='add'>+		bg-&gt;bg_contig_free_bits = cpu_to_le16(max_contig_bits);</div><div class='add'>+	} else {</div><div class='add'>+		bg-&gt;bg_contig_free_bits = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (undo_fn)</div><div class='ctx'> 		spin_unlock(&amp;jh-&gt;b_state_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2459,6 +2558,7 @@ static int _ocfs2_free_suballoc_bits(handle_t *handle,</div><div class='ctx'> 	struct ocfs2_chain_list *cl = &amp;fe-&gt;id2.i_chain;</div><div class='ctx'> 	struct buffer_head *group_bh = NULL;</div><div class='ctx'> 	struct ocfs2_group_desc *group;</div><div class='add'>+	__le16 old_bg_contig_free_bits = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* The alloc_bh comes from ocfs2_free_dinode() or</div><div class='ctx'> 	 * ocfs2_free_clusters().  The callers have all locked the</div><div class='hunk'>@@ -2483,9 +2583,11 @@ static int _ocfs2_free_suballoc_bits(handle_t *handle,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON((count + start_bit) &gt; le16_to_cpu(group-&gt;bg_bits));</div><div class='ctx'> </div><div class='add'>+	if (ocfs2_is_cluster_bitmap(alloc_inode))</div><div class='add'>+		old_bg_contig_free_bits = group-&gt;bg_contig_free_bits;</div><div class='ctx'> 	status = ocfs2_block_group_clear_bits(handle, alloc_inode,</div><div class='ctx'> 					      group, group_bh,</div><div class='del'>-					      start_bit, count, undo_fn);</div><div class='add'>+					      start_bit, count, 0, undo_fn);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		mlog_errno(status);</div><div class='ctx'> 		goto bail;</div><div class='hunk'>@@ -2496,7 +2598,8 @@ static int _ocfs2_free_suballoc_bits(handle_t *handle,</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		mlog_errno(status);</div><div class='ctx'> 		ocfs2_block_group_set_bits(handle, alloc_inode, group, group_bh,</div><div class='del'>-				start_bit, count);</div><div class='add'>+				start_bit, count,</div><div class='add'>+				le16_to_cpu(old_bg_contig_free_bits), 1);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h<br/>index 9c74eace3adc..bcf2ed4a8631 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/suballoc.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/suballoc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/suballoc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/suballoc.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@ struct ocfs2_alloc_context {</div><div class='ctx'> #define OCFS2_AC_USE_MAIN  2</div><div class='ctx'> #define OCFS2_AC_USE_INODE 3</div><div class='ctx'> #define OCFS2_AC_USE_META  4</div><div class='add'>+#define OCFS2_AC_USE_MAIN_DISCONTIG  5</div><div class='ctx'> 	u32    ac_which;</div><div class='ctx'> </div><div class='ctx'> 	/* these are used by the chain search */</div><div class='hunk'>@@ -79,12 +80,16 @@ void ocfs2_rollback_alloc_dinode_counts(struct inode *inode,</div><div class='ctx'> 			 struct buffer_head *di_bh,</div><div class='ctx'> 			 u32 num_bits,</div><div class='ctx'> 			 u16 chain);</div><div class='add'>+u16 ocfs2_find_max_contig_free_bits(void *bitmap,</div><div class='add'>+			 u16 total_bits, u16 start);</div><div class='ctx'> int ocfs2_block_group_set_bits(handle_t *handle,</div><div class='ctx'> 			 struct inode *alloc_inode,</div><div class='ctx'> 			 struct ocfs2_group_desc *bg,</div><div class='ctx'> 			 struct buffer_head *group_bh,</div><div class='ctx'> 			 unsigned int bit_off,</div><div class='del'>-			 unsigned int num_bits);</div><div class='add'>+			 unsigned int num_bits,</div><div class='add'>+			 unsigned int max_contig_bits,</div><div class='add'>+			 int fastpath);</div><div class='ctx'> </div><div class='ctx'> int ocfs2_claim_metadata(handle_t *handle,</div><div class='ctx'> 			 struct ocfs2_alloc_context *ac,</div><div class='head'>diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c<br/>index 6b906424902b..2c7ba1480f7a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/super.c</a></div><div class='hunk'>@@ -19,10 +19,10 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -80,17 +80,15 @@ struct mount_options</div><div class='ctx'> 	unsigned int	resv_level;</div><div class='ctx'> 	int		dir_resv_level;</div><div class='ctx'> 	char		cluster_stack[OCFS2_STACK_LABEL_LEN + 1];</div><div class='add'>+	bool		user_stack;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ocfs2_parse_options(struct super_block *sb, char *options,</div><div class='del'>-			       struct mount_options *mopt,</div><div class='del'>-			       int is_remount);</div><div class='add'>+static int ocfs2_parse_param(struct fs_context *fc, struct fs_parameter *param);</div><div class='ctx'> static int ocfs2_check_set_options(struct super_block *sb,</div><div class='ctx'> 				   struct mount_options *options);</div><div class='ctx'> static int ocfs2_show_options(struct seq_file *s, struct dentry *root);</div><div class='ctx'> static void ocfs2_put_super(struct super_block *sb);</div><div class='ctx'> static int ocfs2_mount_volume(struct super_block *sb);</div><div class='del'>-static int ocfs2_remount(struct super_block *sb, int *flags, char *data);</div><div class='ctx'> static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err);</div><div class='ctx'> static int ocfs2_initialize_mem_caches(void);</div><div class='ctx'> static void ocfs2_free_mem_caches(void);</div><div class='hunk'>@@ -122,7 +120,7 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend);</div><div class='ctx'> static int ocfs2_enable_quotas(struct ocfs2_super *osb);</div><div class='ctx'> static void ocfs2_disable_quotas(struct ocfs2_super *osb);</div><div class='ctx'> </div><div class='del'>-static struct dquot **ocfs2_get_dquots(struct inode *inode)</div><div class='add'>+static struct dquot __rcu **ocfs2_get_dquots(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return OCFS2_I(inode)-&gt;i_dquot;</div><div class='ctx'> }</div><div class='hunk'>@@ -131,11 +129,10 @@ static const struct super_operations ocfs2_sops = {</div><div class='ctx'> 	.statfs		= ocfs2_statfs,</div><div class='ctx'> 	.alloc_inode	= ocfs2_alloc_inode,</div><div class='ctx'> 	.free_inode	= ocfs2_free_inode,</div><div class='del'>-	.drop_inode	= ocfs2_drop_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.evict_inode	= ocfs2_evict_inode,</div><div class='ctx'> 	.sync_fs	= ocfs2_sync_fs,</div><div class='ctx'> 	.put_super	= ocfs2_put_super,</div><div class='del'>-	.remount_fs	= ocfs2_remount,</div><div class='ctx'> 	.show_options   = ocfs2_show_options,</div><div class='ctx'> 	.quota_read	= ocfs2_quota_read,</div><div class='ctx'> 	.quota_write	= ocfs2_quota_write,</div><div class='hunk'>@@ -144,15 +141,10 @@ static const struct super_operations ocfs2_sops = {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	Opt_barrier,</div><div class='del'>-	Opt_err_panic,</div><div class='del'>-	Opt_err_ro,</div><div class='add'>+	Opt_errors,</div><div class='ctx'> 	Opt_intr,</div><div class='del'>-	Opt_nointr,</div><div class='del'>-	Opt_hb_none,</div><div class='del'>-	Opt_hb_local,</div><div class='del'>-	Opt_hb_global,</div><div class='del'>-	Opt_data_ordered,</div><div class='del'>-	Opt_data_writeback,</div><div class='add'>+	Opt_heartbeat,</div><div class='add'>+	Opt_data,</div><div class='ctx'> 	Opt_atime_quantum,</div><div class='ctx'> 	Opt_slot,</div><div class='ctx'> 	Opt_commit,</div><div class='hunk'>@@ -160,52 +152,64 @@ enum {</div><div class='ctx'> 	Opt_localflocks,</div><div class='ctx'> 	Opt_stack,</div><div class='ctx'> 	Opt_user_xattr,</div><div class='del'>-	Opt_nouser_xattr,</div><div class='ctx'> 	Opt_inode64,</div><div class='ctx'> 	Opt_acl,</div><div class='del'>-	Opt_noacl,</div><div class='ctx'> 	Opt_usrquota,</div><div class='ctx'> 	Opt_grpquota,</div><div class='del'>-	Opt_coherency_buffered,</div><div class='del'>-	Opt_coherency_full,</div><div class='add'>+	Opt_coherency,</div><div class='ctx'> 	Opt_resv_level,</div><div class='ctx'> 	Opt_dir_resv_level,</div><div class='ctx'> 	Opt_journal_async_commit,</div><div class='del'>-	Opt_err_cont,</div><div class='del'>-	Opt_err,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_barrier, "barrier=%u"},</div><div class='del'>-	{Opt_err_panic, "errors=panic"},</div><div class='del'>-	{Opt_err_ro, "errors=remount-ro"},</div><div class='del'>-	{Opt_intr, "intr"},</div><div class='del'>-	{Opt_nointr, "nointr"},</div><div class='del'>-	{Opt_hb_none, OCFS2_HB_NONE},</div><div class='del'>-	{Opt_hb_local, OCFS2_HB_LOCAL},</div><div class='del'>-	{Opt_hb_global, OCFS2_HB_GLOBAL},</div><div class='del'>-	{Opt_data_ordered, "data=ordered"},</div><div class='del'>-	{Opt_data_writeback, "data=writeback"},</div><div class='del'>-	{Opt_atime_quantum, "atime_quantum=%u"},</div><div class='del'>-	{Opt_slot, "preferred_slot=%u"},</div><div class='del'>-	{Opt_commit, "commit=%u"},</div><div class='del'>-	{Opt_localalloc, "localalloc=%d"},</div><div class='del'>-	{Opt_localflocks, "localflocks"},</div><div class='del'>-	{Opt_stack, "cluster_stack=%s"},</div><div class='del'>-	{Opt_user_xattr, "user_xattr"},</div><div class='del'>-	{Opt_nouser_xattr, "nouser_xattr"},</div><div class='del'>-	{Opt_inode64, "inode64"},</div><div class='del'>-	{Opt_acl, "acl"},</div><div class='del'>-	{Opt_noacl, "noacl"},</div><div class='del'>-	{Opt_usrquota, "usrquota"},</div><div class='del'>-	{Opt_grpquota, "grpquota"},</div><div class='del'>-	{Opt_coherency_buffered, "coherency=buffered"},</div><div class='del'>-	{Opt_coherency_full, "coherency=full"},</div><div class='del'>-	{Opt_resv_level, "resv_level=%u"},</div><div class='del'>-	{Opt_dir_resv_level, "dir_resv_level=%u"},</div><div class='del'>-	{Opt_journal_async_commit, "journal_async_commit"},</div><div class='del'>-	{Opt_err_cont, "errors=continue"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct constant_table ocfs2_param_errors[] = {</div><div class='add'>+	{"panic",	OCFS2_MOUNT_ERRORS_PANIC},</div><div class='add'>+	{"remount-ro",	OCFS2_MOUNT_ERRORS_ROFS},</div><div class='add'>+	{"continue",	OCFS2_MOUNT_ERRORS_CONT},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table ocfs2_param_heartbeat[] = {</div><div class='add'>+	{"local",	OCFS2_MOUNT_HB_LOCAL},</div><div class='add'>+	{"none",	OCFS2_MOUNT_HB_NONE},</div><div class='add'>+	{"global",	OCFS2_MOUNT_HB_GLOBAL},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table ocfs2_param_data[] = {</div><div class='add'>+	{"writeback",	OCFS2_MOUNT_DATA_WRITEBACK},</div><div class='add'>+	{"ordered",	0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct constant_table ocfs2_param_coherency[] = {</div><div class='add'>+	{"buffered",	OCFS2_MOUNT_COHERENCY_BUFFERED},</div><div class='add'>+	{"full",	0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct fs_parameter_spec ocfs2_param_spec[] = {</div><div class='add'>+	fsparam_u32	("barrier",	Opt_barrier),</div><div class='add'>+	fsparam_enum	("errors",	Opt_errors,	ocfs2_param_errors),</div><div class='add'>+	fsparam_flag_no	("intr",	Opt_intr),</div><div class='add'>+	fsparam_enum	("heartbeat",	Opt_heartbeat,	ocfs2_param_heartbeat),</div><div class='add'>+	fsparam_enum	("data",	Opt_data,	ocfs2_param_data),</div><div class='add'>+	fsparam_u32	("atime_quantum", Opt_atime_quantum),</div><div class='add'>+	fsparam_u32	("preferred_slot", Opt_slot),</div><div class='add'>+	fsparam_u32	("commit",	Opt_commit),</div><div class='add'>+	fsparam_s32	("localalloc",	Opt_localalloc),</div><div class='add'>+	fsparam_flag	("localflocks",	Opt_localflocks),</div><div class='add'>+	fsparam_string	("cluster_stack", Opt_stack),</div><div class='add'>+	fsparam_flag_no	("user_xattr",	Opt_user_xattr),</div><div class='add'>+	fsparam_flag	("inode64",	Opt_inode64),</div><div class='add'>+	fsparam_flag_no	("acl",		Opt_acl),</div><div class='add'>+	fsparam_flag	("usrquota",	Opt_usrquota),</div><div class='add'>+	fsparam_flag	("grpquota",	Opt_grpquota),</div><div class='add'>+	fsparam_enum	("coherency",	Opt_coherency,	ocfs2_param_coherency),</div><div class='add'>+	fsparam_u32	("resv_level",	Opt_resv_level),</div><div class='add'>+	fsparam_u32	("dir_resv_level",	Opt_dir_resv_level),</div><div class='add'>+	fsparam_flag	("journal_async_commit", Opt_journal_async_commit),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='hunk'>@@ -600,32 +604,32 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits,</div><div class='ctx'> 	return (((unsigned long long)bytes) &lt;&lt; bitshift) - trim;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int ocfs2_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	int incompat_features;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct mount_options parsed_options;</div><div class='add'>+	struct mount_options *parsed_options = fc-&gt;fs_private;</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct ocfs2_super *osb = OCFS2_SB(sb);</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> </div><div class='del'>-	if (!ocfs2_parse_options(sb, data, &amp;parsed_options, 1) ||</div><div class='del'>-	    !ocfs2_check_set_options(sb, &amp;parsed_options)) {</div><div class='add'>+	if (!ocfs2_check_set_options(sb, parsed_options)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = OCFS2_MOUNT_HB_LOCAL | OCFS2_MOUNT_HB_GLOBAL |</div><div class='ctx'> 		OCFS2_MOUNT_HB_NONE;</div><div class='del'>-	if ((osb-&gt;s_mount_opt &amp; tmp) != (parsed_options.mount_opt &amp; tmp)) {</div><div class='add'>+	if ((osb-&gt;s_mount_opt &amp; tmp) != (parsed_options-&gt;mount_opt &amp; tmp)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		mlog(ML_ERROR, "Cannot change heartbeat mode on remount\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((osb-&gt;s_mount_opt &amp; OCFS2_MOUNT_DATA_WRITEBACK) !=</div><div class='del'>-	    (parsed_options.mount_opt &amp; OCFS2_MOUNT_DATA_WRITEBACK)) {</div><div class='add'>+	    (parsed_options-&gt;mount_opt &amp; OCFS2_MOUNT_DATA_WRITEBACK)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		mlog(ML_ERROR, "Cannot change data mode on remount\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -634,16 +638,16 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	/* Probably don't want this on remount; it might</div><div class='ctx'> 	 * mess with other nodes */</div><div class='ctx'> 	if (!(osb-&gt;s_mount_opt &amp; OCFS2_MOUNT_INODE64) &amp;&amp;</div><div class='del'>-	    (parsed_options.mount_opt &amp; OCFS2_MOUNT_INODE64)) {</div><div class='add'>+	    (parsed_options-&gt;mount_opt &amp; OCFS2_MOUNT_INODE64)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		mlog(ML_ERROR, "Cannot enable inode64 on remount\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We're going to/from readonly mode. */</div><div class='del'>-	if ((bool)(*flags &amp; SB_RDONLY) != sb_rdonly(sb)) {</div><div class='add'>+	if ((bool)(fc-&gt;sb_flags &amp; SB_RDONLY) != sb_rdonly(sb)) {</div><div class='ctx'> 		/* Disable quota accounting before remounting RO */</div><div class='del'>-		if (*flags &amp; SB_RDONLY) {</div><div class='add'>+		if (fc-&gt;sb_flags &amp; SB_RDONLY) {</div><div class='ctx'> 			ret = ocfs2_susp_quotas(osb, 0);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -657,7 +661,7 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 			goto unlock_osb;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (*flags &amp; SB_RDONLY) {</div><div class='add'>+		if (fc-&gt;sb_flags &amp; SB_RDONLY) {</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='ctx'> 			osb-&gt;osb_flags |= OCFS2_OSB_SOFT_RO;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -678,11 +682,11 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 			sb-&gt;s_flags &amp;= ~SB_RDONLY;</div><div class='ctx'> 			osb-&gt;osb_flags &amp;= ~OCFS2_OSB_SOFT_RO;</div><div class='ctx'> 		}</div><div class='del'>-		trace_ocfs2_remount(sb-&gt;s_flags, osb-&gt;osb_flags, *flags);</div><div class='add'>+		trace_ocfs2_remount(sb-&gt;s_flags, osb-&gt;osb_flags, fc-&gt;sb_flags);</div><div class='ctx'> unlock_osb:</div><div class='ctx'> 		spin_unlock(&amp;osb-&gt;osb_lock);</div><div class='ctx'> 		/* Enable quota accounting after remounting RW */</div><div class='del'>-		if (!ret &amp;&amp; !(*flags &amp; SB_RDONLY)) {</div><div class='add'>+		if (!ret &amp;&amp; !(fc-&gt;sb_flags &amp; SB_RDONLY)) {</div><div class='ctx'> 			if (sb_any_quota_suspended(sb))</div><div class='ctx'> 				ret = ocfs2_susp_quotas(osb, 1);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -701,11 +705,11 @@ unlock_osb:</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		/* Only save off the new mount options in case of a successful</div><div class='ctx'> 		 * remount. */</div><div class='del'>-		osb-&gt;s_mount_opt = parsed_options.mount_opt;</div><div class='del'>-		osb-&gt;s_atime_quantum = parsed_options.atime_quantum;</div><div class='del'>-		osb-&gt;preferred_slot = parsed_options.slot;</div><div class='del'>-		if (parsed_options.commit_interval)</div><div class='del'>-			osb-&gt;osb_commit_interval = parsed_options.commit_interval;</div><div class='add'>+		osb-&gt;s_mount_opt = parsed_options-&gt;mount_opt;</div><div class='add'>+		osb-&gt;s_atime_quantum = parsed_options-&gt;atime_quantum;</div><div class='add'>+		osb-&gt;preferred_slot = parsed_options-&gt;slot;</div><div class='add'>+		if (parsed_options-&gt;commit_interval)</div><div class='add'>+			osb-&gt;osb_commit_interval = parsed_options-&gt;commit_interval;</div><div class='ctx'> </div><div class='ctx'> 		if (!ocfs2_is_hard_readonly(osb))</div><div class='ctx'> 			ocfs2_set_journal_params(osb);</div><div class='hunk'>@@ -966,23 +970,18 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int ocfs2_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *root;</div><div class='ctx'> 	int status, sector_size;</div><div class='del'>-	struct mount_options parsed_options;</div><div class='add'>+	struct mount_options *parsed_options = fc-&gt;fs_private;</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> 	struct ocfs2_super *osb = NULL;</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='ctx'> 	char nodestr[12];</div><div class='ctx'> 	struct ocfs2_blockcheck_stats stats;</div><div class='ctx'> </div><div class='del'>-	trace_ocfs2_fill_super(sb, data, silent);</div><div class='del'>-</div><div class='del'>-	if (!ocfs2_parse_options(sb, data, &amp;parsed_options, 0)) {</div><div class='del'>-		status = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	trace_ocfs2_fill_super(sb, fc, fc-&gt;sb_flags &amp; SB_SILENT);</div><div class='ctx'> </div><div class='ctx'> 	/* probe for superblock */</div><div class='ctx'> 	status = ocfs2_sb_probe(sb, &amp;bh, &amp;sector_size, &amp;stats);</div><div class='hunk'>@@ -999,24 +998,24 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	osb = OCFS2_SB(sb);</div><div class='ctx'> </div><div class='del'>-	if (!ocfs2_check_set_options(sb, &amp;parsed_options)) {</div><div class='add'>+	if (!ocfs2_check_set_options(sb, parsed_options)) {</div><div class='ctx'> 		status = -EINVAL;</div><div class='ctx'> 		goto out_super;</div><div class='ctx'> 	}</div><div class='del'>-	osb-&gt;s_mount_opt = parsed_options.mount_opt;</div><div class='del'>-	osb-&gt;s_atime_quantum = parsed_options.atime_quantum;</div><div class='del'>-	osb-&gt;preferred_slot = parsed_options.slot;</div><div class='del'>-	osb-&gt;osb_commit_interval = parsed_options.commit_interval;</div><div class='add'>+	osb-&gt;s_mount_opt = parsed_options-&gt;mount_opt;</div><div class='add'>+	osb-&gt;s_atime_quantum = parsed_options-&gt;atime_quantum;</div><div class='add'>+	osb-&gt;preferred_slot = parsed_options-&gt;slot;</div><div class='add'>+	osb-&gt;osb_commit_interval = parsed_options-&gt;commit_interval;</div><div class='ctx'> </div><div class='del'>-	ocfs2_la_set_sizes(osb, parsed_options.localalloc_opt);</div><div class='del'>-	osb-&gt;osb_resv_level = parsed_options.resv_level;</div><div class='del'>-	osb-&gt;osb_dir_resv_level = parsed_options.resv_level;</div><div class='del'>-	if (parsed_options.dir_resv_level == -1)</div><div class='del'>-		osb-&gt;osb_dir_resv_level = parsed_options.resv_level;</div><div class='add'>+	ocfs2_la_set_sizes(osb, parsed_options-&gt;localalloc_opt);</div><div class='add'>+	osb-&gt;osb_resv_level = parsed_options-&gt;resv_level;</div><div class='add'>+	osb-&gt;osb_dir_resv_level = parsed_options-&gt;resv_level;</div><div class='add'>+	if (parsed_options-&gt;dir_resv_level == -1)</div><div class='add'>+		osb-&gt;osb_dir_resv_level = parsed_options-&gt;resv_level;</div><div class='ctx'> 	else</div><div class='del'>-		osb-&gt;osb_dir_resv_level = parsed_options.dir_resv_level;</div><div class='add'>+		osb-&gt;osb_dir_resv_level = parsed_options-&gt;dir_resv_level;</div><div class='ctx'> </div><div class='del'>-	status = ocfs2_verify_userspace_stack(osb, &amp;parsed_options);</div><div class='add'>+	status = ocfs2_verify_userspace_stack(osb, parsed_options);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto out_super;</div><div class='ctx'> </div><div class='hunk'>@@ -1075,9 +1074,11 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	debugfs_create_file("fs_state", S_IFREG|S_IRUSR, osb-&gt;osb_debug_root,</div><div class='ctx'> 			    osb, &amp;ocfs2_osb_debug_fops);</div><div class='ctx'> </div><div class='del'>-	if (ocfs2_meta_ecc(osb))</div><div class='add'>+	if (ocfs2_meta_ecc(osb)) {</div><div class='add'>+		ocfs2_initialize_journal_triggers(sb, osb-&gt;s_journal_triggers);</div><div class='ctx'> 		ocfs2_blockcheck_stats_debugfs_install( &amp;osb-&gt;osb_ecc_stats,</div><div class='ctx'> 							osb-&gt;osb_debug_root);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	status = ocfs2_mount_volume(sb);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -1178,27 +1179,72 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *ocfs2_mount(struct file_system_type *fs_type,</div><div class='del'>-			int flags,</div><div class='del'>-			const char *dev_name,</div><div class='del'>-			void *data)</div><div class='add'>+static int ocfs2_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, ocfs2_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocfs2_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations ocfs2_context_ops = {</div><div class='add'>+	.parse_param	= ocfs2_parse_param,</div><div class='add'>+	.get_tree	= ocfs2_get_tree,</div><div class='add'>+	.reconfigure	= ocfs2_reconfigure,</div><div class='add'>+	.free		= ocfs2_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ocfs2_init_fs_context(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, ocfs2_fill_super);</div><div class='add'>+	struct mount_options *mopt;</div><div class='add'>+</div><div class='add'>+	mopt = kzalloc(sizeof(struct mount_options), GFP_KERNEL);</div><div class='add'>+	if (!mopt)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mopt-&gt;commit_interval = 0;</div><div class='add'>+	mopt-&gt;mount_opt = OCFS2_MOUNT_NOINTR;</div><div class='add'>+	mopt-&gt;atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;</div><div class='add'>+	mopt-&gt;slot = OCFS2_INVALID_SLOT;</div><div class='add'>+	mopt-&gt;localalloc_opt = -1;</div><div class='add'>+	mopt-&gt;cluster_stack[0] = '\0';</div><div class='add'>+	mopt-&gt;resv_level = OCFS2_DEFAULT_RESV_LEVEL;</div><div class='add'>+	mopt-&gt;dir_resv_level = -1;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = mopt;</div><div class='add'>+	fc-&gt;ops = &amp;ocfs2_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type ocfs2_fs_type = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.name           = "ocfs2",</div><div class='del'>-	.mount          = ocfs2_mount,</div><div class='ctx'> 	.kill_sb        = kill_block_super,</div><div class='ctx'> 	.fs_flags       = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE,</div><div class='del'>-	.next           = NULL</div><div class='add'>+	.next           = NULL,</div><div class='add'>+	.init_fs_context = ocfs2_init_fs_context,</div><div class='add'>+	.parameters	= ocfs2_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("ocfs2");</div><div class='ctx'> </div><div class='ctx'> static int ocfs2_check_set_options(struct super_block *sb,</div><div class='ctx'> 				   struct mount_options *options)</div><div class='ctx'> {</div><div class='add'>+	if (options-&gt;user_stack == 0) {</div><div class='add'>+		u32 tmp;</div><div class='add'>+</div><div class='add'>+		/* Ensure only one heartbeat mode */</div><div class='add'>+		tmp = options-&gt;mount_opt &amp; (OCFS2_MOUNT_HB_LOCAL |</div><div class='add'>+					    OCFS2_MOUNT_HB_GLOBAL |</div><div class='add'>+					    OCFS2_MOUNT_HB_NONE);</div><div class='add'>+		if (hweight32(tmp) != 1) {</div><div class='add'>+			mlog(ML_ERROR, "Invalid heartbeat mount options\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (options-&gt;mount_opt &amp; OCFS2_MOUNT_USRQUOTA &amp;&amp;</div><div class='ctx'> 	    !OCFS2_HAS_RO_COMPAT_FEATURE(sb,</div><div class='ctx'> 					 OCFS2_FEATURE_RO_COMPAT_USRQUOTA)) {</div><div class='hunk'>@@ -1230,241 +1276,142 @@ static int ocfs2_check_set_options(struct super_block *sb,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_parse_options(struct super_block *sb,</div><div class='del'>-			       char *options,</div><div class='del'>-			       struct mount_options *mopt,</div><div class='del'>-			       int is_remount)</div><div class='add'>+static int ocfs2_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	int status, user_stack = 0;</div><div class='del'>-	char *p;</div><div class='del'>-	u32 tmp;</div><div class='del'>-	int token, option;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-</div><div class='del'>-	trace_ocfs2_parse_options(is_remount, options ? options : "(none)");</div><div class='del'>-</div><div class='del'>-	mopt-&gt;commit_interval = 0;</div><div class='del'>-	mopt-&gt;mount_opt = OCFS2_MOUNT_NOINTR;</div><div class='del'>-	mopt-&gt;atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;</div><div class='del'>-	mopt-&gt;slot = OCFS2_INVALID_SLOT;</div><div class='del'>-	mopt-&gt;localalloc_opt = -1;</div><div class='del'>-	mopt-&gt;cluster_stack[0] = '\0';</div><div class='del'>-	mopt-&gt;resv_level = OCFS2_DEFAULT_RESV_LEVEL;</div><div class='del'>-	mopt-&gt;dir_resv_level = -1;</div><div class='del'>-</div><div class='del'>-	if (!options) {</div><div class='del'>-		status = 1;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_hb_local:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_HB_LOCAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_hb_none:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_HB_NONE;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_hb_global:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_HB_GLOBAL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_barrier:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option)</div><div class='del'>-				mopt-&gt;mount_opt |= OCFS2_MOUNT_BARRIER;</div><div class='del'>-			else</div><div class='del'>-				mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_BARRIER;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_intr:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_NOINTR;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nointr:</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+	struct mount_options *mopt = fc-&gt;fs_private;</div><div class='add'>+	bool is_remount = (fc-&gt;purpose &amp; FS_CONTEXT_FOR_RECONFIGURE);</div><div class='add'>+</div><div class='add'>+	trace_ocfs2_parse_options(is_remount, param-&gt;key);</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, ocfs2_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_heartbeat:</div><div class='add'>+		mopt-&gt;mount_opt |= result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_barrier:</div><div class='add'>+		if (result.uint_32)</div><div class='add'>+			mopt-&gt;mount_opt |= OCFS2_MOUNT_BARRIER;</div><div class='add'>+		else</div><div class='add'>+			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_BARRIER;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_intr:</div><div class='add'>+		if (result.negated)</div><div class='ctx'> 			mopt-&gt;mount_opt |= OCFS2_MOUNT_NOINTR;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_panic:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_ERRORS_CONT;</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_ERRORS_ROFS;</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_ro:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_ERRORS_CONT;</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_ERRORS_PANIC;</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_ERRORS_ROFS;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_err_cont:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_ERRORS_ROFS;</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_ERRORS_PANIC;</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_ERRORS_CONT;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_data_ordered:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_DATA_WRITEBACK;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_data_writeback:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_user_xattr:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_NOUSERXATTR;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_nouser_xattr:</div><div class='add'>+		else</div><div class='add'>+			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_NOINTR;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_errors:</div><div class='add'>+		mopt-&gt;mount_opt &amp;= ~(OCFS2_MOUNT_ERRORS_CONT |</div><div class='add'>+				     OCFS2_MOUNT_ERRORS_ROFS |</div><div class='add'>+				     OCFS2_MOUNT_ERRORS_PANIC);</div><div class='add'>+		mopt-&gt;mount_opt |= result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_data:</div><div class='add'>+		mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_DATA_WRITEBACK;</div><div class='add'>+		mopt-&gt;mount_opt |= result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_user_xattr:</div><div class='add'>+		if (result.negated)</div><div class='ctx'> 			mopt-&gt;mount_opt |= OCFS2_MOUNT_NOUSERXATTR;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_atime_quantum:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option &gt;= 0)</div><div class='del'>-				mopt-&gt;atime_quantum = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_slot:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option)</div><div class='del'>-				mopt-&gt;slot = (u16)option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_commit:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option &lt; 0)</div><div class='del'>-				return 0;</div><div class='del'>-			if (option == 0)</div><div class='del'>-				option = JBD2_DEFAULT_MAX_COMMIT_AGE;</div><div class='del'>-			mopt-&gt;commit_interval = HZ * option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_localalloc:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option &gt;= 0)</div><div class='del'>-				mopt-&gt;localalloc_opt = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_localflocks:</div><div class='del'>-			/*</div><div class='del'>-			 * Changing this during remount could race</div><div class='del'>-			 * flock() requests, or "unbalance" existing</div><div class='del'>-			 * ones (e.g., a lock is taken in one mode but</div><div class='del'>-			 * dropped in the other). If users care enough</div><div class='del'>-			 * to flip locking modes during remount, we</div><div class='del'>-			 * could add a "local" flag to individual</div><div class='del'>-			 * flock structures for proper tracking of</div><div class='del'>-			 * state.</div><div class='del'>-			 */</div><div class='del'>-			if (!is_remount)</div><div class='del'>-				mopt-&gt;mount_opt |= OCFS2_MOUNT_LOCALFLOCKS;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_stack:</div><div class='del'>-			/* Check both that the option we were passed</div><div class='del'>-			 * is of the right length and that it is a proper</div><div class='del'>-			 * string of the right length.</div><div class='del'>-			 */</div><div class='del'>-			if (((args[0].to - args[0].from) !=</div><div class='del'>-			     OCFS2_STACK_LABEL_LEN) ||</div><div class='del'>-			    (strnlen(args[0].from,</div><div class='del'>-				     OCFS2_STACK_LABEL_LEN) !=</div><div class='del'>-			     OCFS2_STACK_LABEL_LEN)) {</div><div class='del'>-				mlog(ML_ERROR,</div><div class='del'>-				     "Invalid cluster_stack option\n");</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			memcpy(mopt-&gt;cluster_stack, args[0].from,</div><div class='del'>-			       OCFS2_STACK_LABEL_LEN);</div><div class='del'>-			mopt-&gt;cluster_stack[OCFS2_STACK_LABEL_LEN] = '\0';</div><div class='del'>-			/*</div><div class='del'>-			 * Open code the memcmp here as we don't have</div><div class='del'>-			 * an osb to pass to</div><div class='del'>-			 * ocfs2_userspace_stack().</div><div class='del'>-			 */</div><div class='del'>-			if (memcmp(mopt-&gt;cluster_stack,</div><div class='del'>-				   OCFS2_CLASSIC_CLUSTER_STACK,</div><div class='del'>-				   OCFS2_STACK_LABEL_LEN))</div><div class='del'>-				user_stack = 1;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_inode64:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_INODE64;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_usrquota:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_USRQUOTA;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_grpquota:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_GRPQUOTA;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_coherency_buffered:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_COHERENCY_BUFFERED;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_coherency_full:</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_COHERENCY_BUFFERED;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_acl:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_POSIX_ACL;</div><div class='del'>-			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_NO_POSIX_ACL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_noacl:</div><div class='add'>+		else</div><div class='add'>+			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_NOUSERXATTR;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_atime_quantum:</div><div class='add'>+		mopt-&gt;atime_quantum = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_slot:</div><div class='add'>+		if (result.uint_32)</div><div class='add'>+			mopt-&gt;slot = (u16)result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_commit:</div><div class='add'>+		if (result.uint_32 == 0)</div><div class='add'>+			mopt-&gt;commit_interval = HZ * JBD2_DEFAULT_MAX_COMMIT_AGE;</div><div class='add'>+		else</div><div class='add'>+			mopt-&gt;commit_interval = HZ * result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_localalloc:</div><div class='add'>+		if (result.int_32 &gt;= 0)</div><div class='add'>+			mopt-&gt;localalloc_opt = result.int_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_localflocks:</div><div class='add'>+		/*</div><div class='add'>+		 * Changing this during remount could race flock() requests, or</div><div class='add'>+		 * "unbalance" existing ones (e.g., a lock is taken in one mode</div><div class='add'>+		 * but dropped in the other). If users care enough to flip</div><div class='add'>+		 * locking modes during remount, we could add a "local" flag to</div><div class='add'>+		 * individual flock structures for proper tracking of state.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_remount)</div><div class='add'>+			mopt-&gt;mount_opt |= OCFS2_MOUNT_LOCALFLOCKS;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_stack:</div><div class='add'>+		/* Check both that the option we were passed is of the right</div><div class='add'>+		 * length and that it is a proper string of the right length.</div><div class='add'>+		 */</div><div class='add'>+		if (strlen(param-&gt;string) != OCFS2_STACK_LABEL_LEN) {</div><div class='add'>+			mlog(ML_ERROR, "Invalid cluster_stack option\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(mopt-&gt;cluster_stack, param-&gt;string, OCFS2_STACK_LABEL_LEN);</div><div class='add'>+		mopt-&gt;cluster_stack[OCFS2_STACK_LABEL_LEN] = '\0';</div><div class='add'>+		/*</div><div class='add'>+		 * Open code the memcmp here as we don't have an osb to pass</div><div class='add'>+		 * to ocfs2_userspace_stack().</div><div class='add'>+		 */</div><div class='add'>+		if (memcmp(mopt-&gt;cluster_stack,</div><div class='add'>+			   OCFS2_CLASSIC_CLUSTER_STACK,</div><div class='add'>+			   OCFS2_STACK_LABEL_LEN))</div><div class='add'>+			mopt-&gt;user_stack = 1;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_inode64:</div><div class='add'>+		mopt-&gt;mount_opt |= OCFS2_MOUNT_INODE64;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_usrquota:</div><div class='add'>+		mopt-&gt;mount_opt |= OCFS2_MOUNT_USRQUOTA;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_grpquota:</div><div class='add'>+		mopt-&gt;mount_opt |= OCFS2_MOUNT_GRPQUOTA;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_coherency:</div><div class='add'>+		mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_COHERENCY_BUFFERED;</div><div class='add'>+		mopt-&gt;mount_opt |= result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_acl:</div><div class='add'>+		if (result.negated) {</div><div class='ctx'> 			mopt-&gt;mount_opt |= OCFS2_MOUNT_NO_POSIX_ACL;</div><div class='ctx'> 			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_POSIX_ACL;</div><div class='add'>+		} else {</div><div class='add'>+			mopt-&gt;mount_opt |= OCFS2_MOUNT_POSIX_ACL;</div><div class='add'>+			mopt-&gt;mount_opt &amp;= ~OCFS2_MOUNT_NO_POSIX_ACL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case Opt_resv_level:</div><div class='add'>+		if (is_remount)</div><div class='ctx'> 			break;</div><div class='del'>-		case Opt_resv_level:</div><div class='del'>-			if (is_remount)</div><div class='del'>-				break;</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option &gt;= OCFS2_MIN_RESV_LEVEL &amp;&amp;</div><div class='del'>-			    option &lt; OCFS2_MAX_RESV_LEVEL)</div><div class='del'>-				mopt-&gt;resv_level = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_dir_resv_level:</div><div class='del'>-			if (is_remount)</div><div class='del'>-				break;</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option)) {</div><div class='del'>-				status = 0;</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			if (option &gt;= OCFS2_MIN_RESV_LEVEL &amp;&amp;</div><div class='del'>-			    option &lt; OCFS2_MAX_RESV_LEVEL)</div><div class='del'>-				mopt-&gt;dir_resv_level = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_journal_async_commit:</div><div class='del'>-			mopt-&gt;mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;</div><div class='add'>+		if (result.uint_32 &gt;= OCFS2_MIN_RESV_LEVEL &amp;&amp;</div><div class='add'>+		    result.uint_32 &lt; OCFS2_MAX_RESV_LEVEL)</div><div class='add'>+			mopt-&gt;resv_level = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dir_resv_level:</div><div class='add'>+		if (is_remount)</div><div class='ctx'> 			break;</div><div class='del'>-		default:</div><div class='del'>-			mlog(ML_ERROR,</div><div class='del'>-			     "Unrecognized mount option \"%s\" "</div><div class='del'>-			     "or missing value\n", p);</div><div class='del'>-			status = 0;</div><div class='del'>-			goto bail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (user_stack == 0) {</div><div class='del'>-		/* Ensure only one heartbeat mode */</div><div class='del'>-		tmp = mopt-&gt;mount_opt &amp; (OCFS2_MOUNT_HB_LOCAL |</div><div class='del'>-					 OCFS2_MOUNT_HB_GLOBAL |</div><div class='del'>-					 OCFS2_MOUNT_HB_NONE);</div><div class='del'>-		if (hweight32(tmp) != 1) {</div><div class='del'>-			mlog(ML_ERROR, "Invalid heartbeat mount options\n");</div><div class='del'>-			status = 0;</div><div class='del'>-			goto bail;</div><div class='del'>-		}</div><div class='add'>+		if (result.uint_32 &gt;= OCFS2_MIN_RESV_LEVEL &amp;&amp;</div><div class='add'>+		    result.uint_32 &lt; OCFS2_MAX_RESV_LEVEL)</div><div class='add'>+			mopt-&gt;dir_resv_level = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_journal_async_commit:</div><div class='add'>+		mopt-&gt;mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = 1;</div><div class='del'>-</div><div class='del'>-bail:</div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ocfs2_show_options(struct seq_file *s, struct dentry *root)</div><div class='hunk'>@@ -1569,15 +1516,13 @@ static int __init ocfs2_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ocfs2_set_locking_protocol();</div><div class='ctx'> </div><div class='del'>-	status = register_quota_format(&amp;ocfs2_quota_format);</div><div class='del'>-	if (status &lt; 0)</div><div class='del'>-		goto out3;</div><div class='add'>+	register_quota_format(&amp;ocfs2_quota_format);</div><div class='add'>+</div><div class='ctx'> 	status = register_filesystem(&amp;ocfs2_fs_type);</div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	unregister_quota_format(&amp;ocfs2_quota_format);</div><div class='del'>-out3:</div><div class='ctx'> 	debugfs_remove(ocfs2_debugfs_root);</div><div class='ctx'> 	ocfs2_free_mem_caches();</div><div class='ctx'> out2:</div><div class='hunk'>@@ -1706,18 +1651,17 @@ static int ocfs2_initialize_mem_caches(void)</div><div class='ctx'> 				       sizeof(struct ocfs2_inode_info),</div><div class='ctx'> 				       0,</div><div class='ctx'> 				       (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 				       ocfs2_inode_init_once);</div><div class='ctx'> 	ocfs2_dquot_cachep = kmem_cache_create("ocfs2_dquot_cache",</div><div class='ctx'> 					sizeof(struct ocfs2_dquot),</div><div class='ctx'> 					0,</div><div class='del'>-					(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD),</div><div class='add'>+					SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 					NULL);</div><div class='ctx'> 	ocfs2_qf_chunk_cachep = kmem_cache_create("ocfs2_qf_chunk_cache",</div><div class='ctx'> 					sizeof(struct ocfs2_quota_chunk),</div><div class='ctx'> 					0,</div><div class='del'>-					(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD),</div><div class='add'>+					SLAB_RECLAIM_ACCOUNT,</div><div class='ctx'> 					NULL);</div><div class='ctx'> 	if (!ocfs2_inode_cachep || !ocfs2_dquot_cachep ||</div><div class='ctx'> 	    !ocfs2_qf_chunk_cachep) {</div><div class='hunk'>@@ -1859,7 +1803,7 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)</div><div class='ctx'> 	osb = OCFS2_SB(sb);</div><div class='ctx'> 	BUG_ON(!osb);</div><div class='ctx'> </div><div class='del'>-	/* Remove file check sysfs related directores/files,</div><div class='add'>+	/* Remove file check sysfs related directories/files,</div><div class='ctx'> 	 * and wait for the pending file check operations */</div><div class='ctx'> 	ocfs2_filecheck_remove_sysfs(osb);</div><div class='ctx'> </div><div class='hunk'>@@ -1868,6 +1812,9 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)</div><div class='ctx'> 	/* Orphan scan should be stopped as early as possible */</div><div class='ctx'> 	ocfs2_orphan_scan_stop(osb);</div><div class='ctx'> </div><div class='add'>+	/* Stop quota recovery so that we can disable quotas */</div><div class='add'>+	ocfs2_recovery_disable_quota(osb);</div><div class='add'>+</div><div class='ctx'> 	ocfs2_disable_quotas(osb);</div><div class='ctx'> </div><div class='ctx'> 	/* All dquots should be freed by now */</div><div class='hunk'>@@ -2015,7 +1962,7 @@ static int ocfs2_initialize_super(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_fs_info = osb;</div><div class='ctx'> 	sb-&gt;s_op = &amp;ocfs2_sops;</div><div class='del'>-	sb-&gt;s_d_op = &amp;ocfs2_dentry_ops;</div><div class='add'>+	set_default_d_op(sb, &amp;ocfs2_dentry_ops);</div><div class='ctx'> 	sb-&gt;s_export_op = &amp;ocfs2_export_ops;</div><div class='ctx'> 	sb-&gt;s_qcop = &amp;dquot_quotactl_sysfile_ops;</div><div class='ctx'> 	sb-&gt;dq_op = &amp;ocfs2_quota_operations;</div><div class='hunk'>@@ -2027,8 +1974,8 @@ static int ocfs2_initialize_super(struct super_block *sb,</div><div class='ctx'> 	cbits = le32_to_cpu(di-&gt;id2.i_super.s_clustersize_bits);</div><div class='ctx'> 	bbits = le32_to_cpu(di-&gt;id2.i_super.s_blocksize_bits);</div><div class='ctx'> 	sb-&gt;s_maxbytes = ocfs2_max_file_offset(bbits, cbits);</div><div class='del'>-	memcpy(&amp;sb-&gt;s_uuid, di-&gt;id2.i_super.s_uuid,</div><div class='del'>-	       sizeof(di-&gt;id2.i_super.s_uuid));</div><div class='add'>+	super_set_uuid(sb, di-&gt;id2.i_super.s_uuid,</div><div class='add'>+		       sizeof(di-&gt;id2.i_super.s_uuid));</div><div class='ctx'> </div><div class='ctx'> 	osb-&gt;osb_dx_mask = (1 &lt;&lt; (cbits - bbits)) - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -2320,6 +2267,7 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,</div><div class='ctx'> 			       struct ocfs2_blockcheck_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	int status = -EAGAIN;</div><div class='add'>+	u32 blksz_bits;</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(di-&gt;i_signature, OCFS2_SUPER_BLOCK_SIGNATURE,</div><div class='ctx'> 		   strlen(OCFS2_SUPER_BLOCK_SIGNATURE)) == 0) {</div><div class='hunk'>@@ -2334,11 +2282,15 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		status = -EINVAL;</div><div class='del'>-		if ((1 &lt;&lt; le32_to_cpu(di-&gt;id2.i_super.s_blocksize_bits)) != blksz) {</div><div class='add'>+		/* Acceptable block sizes are 512 bytes, 1K, 2K and 4K. */</div><div class='add'>+		blksz_bits = le32_to_cpu(di-&gt;id2.i_super.s_blocksize_bits);</div><div class='add'>+		if (blksz_bits &lt; 9 || blksz_bits &gt; 12) {</div><div class='add'>+			mlog(ML_ERROR, "found superblock with incorrect block "</div><div class='add'>+			     "size bits: found %u, should be 9, 10, 11, or 12\n",</div><div class='add'>+			     blksz_bits);</div><div class='add'>+		} else if ((1 &lt;&lt; blksz_bits) != blksz) {</div><div class='ctx'> 			mlog(ML_ERROR, "found superblock with incorrect block "</div><div class='del'>-			     "size: found %u, should be %u\n",</div><div class='del'>-			     1 &lt;&lt; le32_to_cpu(di-&gt;id2.i_super.s_blocksize_bits),</div><div class='del'>-			       blksz);</div><div class='add'>+			     "size: found %u, should be %u\n", 1 &lt;&lt; blksz_bits, blksz);</div><div class='ctx'> 		} else if (le16_to_cpu(di-&gt;id2.i_super.s_major_rev_level) !=</div><div class='ctx'> 			   OCFS2_MAJOR_REV_LEVEL ||</div><div class='ctx'> 			   le16_to_cpu(di-&gt;id2.i_super.s_minor_rev_level) !=</div><div class='hunk'>@@ -2356,8 +2308,8 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,</div><div class='ctx'> 			     (unsigned long long)bh-&gt;b_blocknr);</div><div class='ctx'> 		} else if (le32_to_cpu(di-&gt;id2.i_super.s_clustersize_bits) &lt; 12 ||</div><div class='ctx'> 			    le32_to_cpu(di-&gt;id2.i_super.s_clustersize_bits) &gt; 20) {</div><div class='del'>-			mlog(ML_ERROR, "bad cluster size found: %u\n",</div><div class='del'>-			     1 &lt;&lt; le32_to_cpu(di-&gt;id2.i_super.s_clustersize_bits));</div><div class='add'>+			mlog(ML_ERROR, "bad cluster size bit found: %u\n",</div><div class='add'>+			     le32_to_cpu(di-&gt;id2.i_super.s_clustersize_bits));</div><div class='ctx'> 		} else if (!le64_to_cpu(di-&gt;id2.i_super.s_root_blkno)) {</div><div class='ctx'> 			mlog(ML_ERROR, "bad root_blkno: 0\n");</div><div class='ctx'> 		} else if (!le64_to_cpu(di-&gt;id2.i_super.s_system_dir_blkno)) {</div><div class='head'>diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c<br/>index d4c5fdcfa1e4..ad8be3300b49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/symlink.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/symlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/symlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/symlink.c</a></div><div class='hunk'>@@ -54,31 +54,27 @@</div><div class='ctx'> </div><div class='ctx'> static int ocfs2_fast_symlink_read_folio(struct file *f, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = &amp;folio-&gt;page;</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='ctx'> 	int status = ocfs2_read_inode_block(inode, &amp;bh);</div><div class='ctx'> 	struct ocfs2_dinode *fe;</div><div class='ctx'> 	const char *link;</div><div class='del'>-	void *kaddr;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> </div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		mlog_errno(status);</div><div class='del'>-		return status;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fe = (struct ocfs2_dinode *) bh-&gt;b_data;</div><div class='ctx'> 	link = (char *) fe-&gt;id2.i_symlink;</div><div class='ctx'> 	/* will be less than a page size */</div><div class='ctx'> 	len = strnlen(link, ocfs2_fast_symlink_chars(inode-&gt;i_sb));</div><div class='del'>-	kaddr = kmap_atomic(page);</div><div class='del'>-	memcpy(kaddr, link, len + 1);</div><div class='del'>-	kunmap_atomic(kaddr);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	unlock_page(page);</div><div class='add'>+	memcpy_to_folio(folio, 0, link, len + 1);</div><div class='add'>+out:</div><div class='add'>+	folio_end_read(folio, status == 0);</div><div class='ctx'> 	brelse(bh);</div><div class='del'>-	return 0;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct address_space_operations ocfs2_fast_symlink_aops = {</div><div class='head'>diff --git a/fs/ocfs2/sysfile.c b/fs/ocfs2/sysfile.c<br/>index 53a945da873b..d53a6cc866be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/sysfile.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/sysfile.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/sysfile.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/sysfile.c</a></div><div class='hunk'>@@ -127,14 +127,14 @@ static struct inode * _ocfs2_get_system_file_inode(struct ocfs2_super *osb,</div><div class='ctx'> 	char namebuf[40];</div><div class='ctx'> 	struct inode *inode = NULL;</div><div class='ctx'> 	u64 blkno;</div><div class='del'>-	int status = 0;</div><div class='add'>+	int len, status = 0;</div><div class='ctx'> </div><div class='del'>-	ocfs2_sprintf_system_inode_name(namebuf,</div><div class='del'>-					sizeof(namebuf),</div><div class='del'>-					type, slot);</div><div class='add'>+	len = ocfs2_sprintf_system_inode_name(namebuf,</div><div class='add'>+					      sizeof(namebuf),</div><div class='add'>+					      type, slot);</div><div class='ctx'> </div><div class='del'>-	status = ocfs2_lookup_ino_from_name(osb-&gt;sys_root_inode, namebuf,</div><div class='del'>-					    strlen(namebuf), &amp;blkno);</div><div class='add'>+	status = ocfs2_lookup_ino_from_name(osb-&gt;sys_root_inode,</div><div class='add'>+					    namebuf, len, &amp;blkno);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c<br/>index 3b81213ed7b8..dc1761e84814 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ocfs2/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ocfs2/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ocfs2/xattr.c</a></div><div class='hunk'>@@ -648,7 +648,7 @@ int ocfs2_calc_xattr_init(struct inode *dir,</div><div class='ctx'> 	 * 256(name) + 80(value) + 16(entry) = 352 bytes,</div><div class='ctx'> 	 * The max space of acl xattr taken inline is</div><div class='ctx'> 	 * 80(value) + 16(entry) * 2(if directory) = 192 bytes,</div><div class='del'>-	 * when blocksize = 512, may reserve one more cluser for</div><div class='add'>+	 * when blocksize = 512, may reserve one more cluster for</div><div class='ctx'> 	 * xattr bucket, otherwise reserve one metadata block</div><div class='ctx'> 	 * for them is ok.</div><div class='ctx'> 	 * If this is a new directory with inline data,</div><div class='hunk'>@@ -1062,13 +1062,13 @@ ssize_t ocfs2_listxattr(struct dentry *dentry,</div><div class='ctx'> 	return i_ret + b_ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ocfs2_xattr_find_entry(int name_index,</div><div class='add'>+static int ocfs2_xattr_find_entry(struct inode *inode, int name_index,</div><div class='ctx'> 				  const char *name,</div><div class='ctx'> 				  struct ocfs2_xattr_search *xs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ocfs2_xattr_entry *entry;</div><div class='ctx'> 	size_t name_len;</div><div class='del'>-	int i, cmp = 1;</div><div class='add'>+	int i, name_offset, cmp = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (name == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1076,13 +1076,22 @@ static int ocfs2_xattr_find_entry(int name_index,</div><div class='ctx'> 	name_len = strlen(name);</div><div class='ctx'> 	entry = xs-&gt;here;</div><div class='ctx'> 	for (i = 0; i &lt; le16_to_cpu(xs-&gt;header-&gt;xh_count); i++) {</div><div class='add'>+		if ((void *)entry &gt;= xs-&gt;end) {</div><div class='add'>+			ocfs2_error(inode-&gt;i_sb, "corrupted xattr entries");</div><div class='add'>+			return -EFSCORRUPTED;</div><div class='add'>+		}</div><div class='ctx'> 		cmp = name_index - ocfs2_xattr_get_type(entry);</div><div class='ctx'> 		if (!cmp)</div><div class='ctx'> 			cmp = name_len - entry-&gt;xe_name_len;</div><div class='del'>-		if (!cmp)</div><div class='del'>-			cmp = memcmp(name, (xs-&gt;base +</div><div class='del'>-				     le16_to_cpu(entry-&gt;xe_name_offset)),</div><div class='del'>-				     name_len);</div><div class='add'>+		if (!cmp) {</div><div class='add'>+			name_offset = le16_to_cpu(entry-&gt;xe_name_offset);</div><div class='add'>+			if ((xs-&gt;base + name_offset + name_len) &gt; xs-&gt;end) {</div><div class='add'>+				ocfs2_error(inode-&gt;i_sb,</div><div class='add'>+					    "corrupted xattr entries");</div><div class='add'>+				return -EFSCORRUPTED;</div><div class='add'>+			}</div><div class='add'>+			cmp = memcmp(name, (xs-&gt;base + name_offset), name_len);</div><div class='add'>+		}</div><div class='ctx'> 		if (cmp == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		entry += 1;</div><div class='hunk'>@@ -1166,7 +1175,7 @@ static int ocfs2_xattr_ibody_get(struct inode *inode,</div><div class='ctx'> 	xs-&gt;base = (void *)xs-&gt;header;</div><div class='ctx'> 	xs-&gt;here = xs-&gt;header-&gt;xh_entries;</div><div class='ctx'> </div><div class='del'>-	ret = ocfs2_xattr_find_entry(name_index, name, xs);</div><div class='add'>+	ret = ocfs2_xattr_find_entry(inode, name_index, name, xs);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	size = le64_to_cpu(xs-&gt;here-&gt;xe_value_size);</div><div class='hunk'>@@ -2027,8 +2036,7 @@ static int ocfs2_xa_remove(struct ocfs2_xa_loc *loc,</div><div class='ctx'> 				rc = 0;</div><div class='ctx'> 			ocfs2_xa_cleanup_value_truncate(loc, "removing",</div><div class='ctx'> 							orig_clusters);</div><div class='del'>-			if (rc)</div><div class='del'>-				goto out;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2698,7 +2706,7 @@ static int ocfs2_xattr_ibody_find(struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 	/* Find the named attribute. */</div><div class='ctx'> 	if (oi-&gt;ip_dyn_features &amp; OCFS2_INLINE_XATTR_FL) {</div><div class='del'>-		ret = ocfs2_xattr_find_entry(name_index, name, xs);</div><div class='add'>+		ret = ocfs2_xattr_find_entry(inode, name_index, name, xs);</div><div class='ctx'> 		if (ret &amp;&amp; ret != -ENODATA)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		xs-&gt;not_found = ret;</div><div class='hunk'>@@ -2833,7 +2841,7 @@ static int ocfs2_xattr_block_find(struct inode *inode,</div><div class='ctx'> 		xs-&gt;end = (void *)(blk_bh-&gt;b_data) + blk_bh-&gt;b_size;</div><div class='ctx'> 		xs-&gt;here = xs-&gt;header-&gt;xh_entries;</div><div class='ctx'> </div><div class='del'>-		ret = ocfs2_xattr_find_entry(name_index, name, xs);</div><div class='add'>+		ret = ocfs2_xattr_find_entry(inode, name_index, name, xs);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ret = ocfs2_xattr_index_block_find(inode, blk_bh,</div><div class='ctx'> 						   name_index,</div><div class='hunk'>@@ -2900,7 +2908,7 @@ static int ocfs2_create_xattr_block(struct inode *inode,</div><div class='ctx'> 	/* Initialize ocfs2_xattr_block */</div><div class='ctx'> 	xblk = (struct ocfs2_xattr_block *)new_bh-&gt;b_data;</div><div class='ctx'> 	memset(xblk, 0, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-	strcpy((void *)xblk, OCFS2_XATTR_BLOCK_SIGNATURE);</div><div class='add'>+	strscpy(xblk-&gt;xb_signature, OCFS2_XATTR_BLOCK_SIGNATURE);</div><div class='ctx'> 	xblk-&gt;xb_suballoc_slot = cpu_to_le16(ctxt-&gt;meta_ac-&gt;ac_alloc_slot);</div><div class='ctx'> 	xblk-&gt;xb_suballoc_loc = cpu_to_le64(suballoc_loc);</div><div class='ctx'> 	xblk-&gt;xb_suballoc_bit = cpu_to_le16(suballoc_bit_start);</div><div class='hunk'>@@ -4158,15 +4166,6 @@ static int cmp_xe(const void *a, const void *b)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void swap_xe(void *a, void *b, int size)</div><div class='del'>-{</div><div class='del'>-	struct ocfs2_xattr_entry *l = a, *r = b, tmp;</div><div class='del'>-</div><div class='del'>-	tmp = *l;</div><div class='del'>-	memcpy(l, r, sizeof(struct ocfs2_xattr_entry));</div><div class='del'>-	memcpy(r, &amp;tmp, sizeof(struct ocfs2_xattr_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * When the ocfs2_xattr_block is filled up, new bucket will be created</div><div class='ctx'>  * and all the xattr entries will be moved to the new bucket.</div><div class='hunk'>@@ -4232,7 +4231,7 @@ static void ocfs2_cp_xattr_block_to_bucket(struct inode *inode,</div><div class='ctx'> 	trace_ocfs2_cp_xattr_block_to_bucket_end(offset, size, off_change);</div><div class='ctx'> </div><div class='ctx'> 	sort(target + offset, count, sizeof(struct ocfs2_xattr_entry),</div><div class='del'>-	     cmp_xe, swap_xe);</div><div class='add'>+	     cmp_xe, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4372,7 +4371,7 @@ static int cmp_xe_offset(const void *a, const void *b)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * defrag a xattr bucket if we find that the bucket has some</div><div class='del'>- * holes beteen name/value pairs.</div><div class='add'>+ * holes between name/value pairs.</div><div class='ctx'>  * We will move all the name/value pairs to the end of the bucket</div><div class='ctx'>  * so that we can spare some space for insertion.</div><div class='ctx'>  */</div><div class='hunk'>@@ -4427,7 +4426,7 @@ static int ocfs2_defrag_xattr_bucket(struct inode *inode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sort(entries, le16_to_cpu(xh-&gt;xh_count),</div><div class='ctx'> 	     sizeof(struct ocfs2_xattr_entry),</div><div class='del'>-	     cmp_xe_offset, swap_xe);</div><div class='add'>+	     cmp_xe_offset, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Move all name/values to the end of the bucket. */</div><div class='ctx'> 	xe = xh-&gt;xh_entries;</div><div class='hunk'>@@ -4469,7 +4468,7 @@ static int ocfs2_defrag_xattr_bucket(struct inode *inode,</div><div class='ctx'> 	/* sort the entries by their name_hash. */</div><div class='ctx'> 	sort(entries, le16_to_cpu(xh-&gt;xh_count),</div><div class='ctx'> 	     sizeof(struct ocfs2_xattr_entry),</div><div class='del'>-	     cmp_xe, swap_xe);</div><div class='add'>+	     cmp_xe, NULL);</div><div class='ctx'> </div><div class='ctx'> 	buf = bucket_buf;</div><div class='ctx'> 	for (i = 0; i &lt; bucket-&gt;bu_blocks; i++, buf += blocksize)</div><div class='hunk'>@@ -5012,7 +5011,7 @@ static int ocfs2_divide_xattr_cluster(struct inode *inode,</div><div class='ctx'>  * 2. If cluster_size == bucket_size:</div><div class='ctx'>  *    a) If the previous extent rec has more than one cluster and the insert</div><div class='ctx'>  *       place isn't in the last cluster, copy the entire last cluster to the</div><div class='del'>- *       new one. This time, we don't need to upate the first_bh and header_bh</div><div class='add'>+ *       new one. This time, we don't need to update the first_bh and header_bh</div><div class='ctx'>  *       since they will not be moved into the new cluster.</div><div class='ctx'>  *    b) Otherwise, move the bottom half of the xattrs in the last cluster into</div><div class='ctx'>  *       the new one. And we set the extend flag to zero if the insert place is</div><div class='hunk'>@@ -6190,7 +6189,7 @@ struct ocfs2_xattr_reflink {</div><div class='ctx'> /*</div><div class='ctx'>  * Given a xattr header and xe offset,</div><div class='ctx'>  * return the proper xv and the corresponding bh.</div><div class='del'>- * xattr in inode, block and xattr tree have different implementaions.</div><div class='add'>+ * xattr in inode, block and xattr tree have different implementations.</div><div class='ctx'>  */</div><div class='ctx'> typedef int (get_xattr_value_root)(struct super_block *sb,</div><div class='ctx'> 				   struct buffer_head *bh,</div><div class='hunk'>@@ -6270,7 +6269,7 @@ static int ocfs2_get_xattr_value_root(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Lock the meta_ac and caculate how much credits we need for reflink xattrs.</div><div class='add'>+ * Lock the meta_ac and calculate how much credits we need for reflink xattrs.</div><div class='ctx'>  * It is only used for inline xattr and xattr block.</div><div class='ctx'>  */</div><div class='ctx'> static int ocfs2_reflink_lock_xattr_allocators(struct ocfs2_super *osb,</div><div class='hunk'>@@ -6352,7 +6351,7 @@ static int ocfs2_reflink_xattr_header(handle_t *handle,</div><div class='ctx'> 	trace_ocfs2_reflink_xattr_header((unsigned long long)old_bh-&gt;b_blocknr,</div><div class='ctx'> 					 le16_to_cpu(xh-&gt;xh_count));</div><div class='ctx'> </div><div class='del'>-	last = &amp;new_xh-&gt;xh_entries[le16_to_cpu(new_xh-&gt;xh_count)];</div><div class='add'>+	last = &amp;new_xh-&gt;xh_entries[le16_to_cpu(new_xh-&gt;xh_count)] - 1;</div><div class='ctx'> 	for (i = 0, j = 0; i &lt; le16_to_cpu(xh-&gt;xh_count); i++, j++) {</div><div class='ctx'> 		xe = &amp;xh-&gt;xh_entries[i];</div><div class='ctx'> </div><div class='hunk'>@@ -6511,16 +6510,7 @@ static int ocfs2_reflink_xattr_inline(struct ocfs2_xattr_reflink *args)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new_oi = OCFS2_I(args-&gt;new_inode);</div><div class='del'>-	/*</div><div class='del'>-	 * Adjust extent record count to reserve space for extended attribute.</div><div class='del'>-	 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().</div><div class='del'>-	 */</div><div class='del'>-	if (!(new_oi-&gt;ip_dyn_features &amp; OCFS2_INLINE_DATA_FL) &amp;&amp;</div><div class='del'>-	    !(ocfs2_inode_is_fast_symlink(args-&gt;new_inode))) {</div><div class='del'>-		struct ocfs2_extent_list *el = &amp;new_di-&gt;id2.i_list;</div><div class='del'>-		le16_add_cpu(&amp;el-&gt;l_count, -(inline_size /</div><div class='del'>-					sizeof(struct ocfs2_extent_rec)));</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;new_oi-&gt;ip_lock);</div><div class='ctx'> 	new_oi-&gt;ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;</div><div class='ctx'> 	new_di-&gt;i_dyn_features = cpu_to_le16(new_oi-&gt;ip_dyn_features);</div><div class='head'>diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c<br/>index 6bda275826d6..2ed541fccf33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/omfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/omfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/omfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/omfs/dir.c</a></div><div class='hunk'>@@ -279,10 +279,10 @@ out_free_inode:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		      struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *omfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	return omfs_add_node(dir, dentry, mode | S_IFDIR);</div><div class='add'>+	return ERR_PTR(omfs_add_node(dir, dentry, mode | S_IFDIR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='head'>diff --git a/fs/omfs/file.c b/fs/omfs/file.c<br/>index 6b580b9da8e3..49a1de5a827f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/omfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/omfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/omfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/omfs/file.c</a></div><div class='hunk'>@@ -310,13 +310,14 @@ static void omfs_write_failed(struct address_space *mapping, loff_t to)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omfs_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata)</div><div class='add'>+static int omfs_write_begin(const struct kiocb *iocb,</div><div class='add'>+			    struct address_space *mapping,</div><div class='add'>+			    loff_t pos, unsigned len,</div><div class='add'>+			    struct folio **foliop, void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = block_write_begin(mapping, pos, len, pagep, omfs_get_block);</div><div class='add'>+	ret = block_write_begin(mapping, pos, len, foliop, omfs_get_block);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		omfs_write_failed(mapping, pos + len);</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +333,7 @@ const struct file_operations omfs_file_operations = {</div><div class='ctx'> 	.llseek = generic_file_llseek,</div><div class='ctx'> 	.read_iter = generic_file_read_iter,</div><div class='ctx'> 	.write_iter = generic_file_write_iter,</div><div class='del'>-	.mmap = generic_file_mmap,</div><div class='add'>+	.mmap_prepare = generic_file_mmap_prepare,</div><div class='ctx'> 	.fsync = generic_file_fsync,</div><div class='ctx'> 	.splice_read = filemap_splice_read,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c<br/>index d6cd81163030..701ed85d9831 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/omfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/omfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/omfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/omfs/inode.c</a></div><div class='hunk'>@@ -9,12 +9,14 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/crc-itu-t.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include "omfs.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Bob Copeland &lt;me@bobcopeland.com&gt;");</div><div class='hunk'>@@ -211,7 +213,7 @@ struct inode *omfs_iget(struct super_block *sb, ino_t ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	bh = omfs_bread(inode-&gt;i_sb, ino);</div><div class='hunk'>@@ -384,79 +386,83 @@ nomem:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct omfs_mount_options {</div><div class='add'>+	kuid_t s_uid;</div><div class='add'>+	kgid_t s_gid;</div><div class='add'>+	int s_dmask;</div><div class='add'>+	int s_fmask;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='del'>-	Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask, Opt_err</div><div class='add'>+	Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_uid, "uid=%u"},</div><div class='del'>-	{Opt_gid, "gid=%u"},</div><div class='del'>-	{Opt_umask, "umask=%o"},</div><div class='del'>-	{Opt_dmask, "dmask=%o"},</div><div class='del'>-	{Opt_fmask, "fmask=%o"},</div><div class='del'>-	{Opt_err, NULL},</div><div class='add'>+static const struct fs_parameter_spec omfs_param_spec[] = {</div><div class='add'>+	fsparam_uid	("uid",		Opt_uid),</div><div class='add'>+	fsparam_gid	("gid",		Opt_gid),</div><div class='add'>+	fsparam_u32oct	("umask",	Opt_umask),</div><div class='add'>+	fsparam_u32oct	("dmask",	Opt_dmask),</div><div class='add'>+	fsparam_u32oct	("fmask",	Opt_fmask),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int parse_options(char *options, struct omfs_sb_info *sbi)</div><div class='add'>+static int</div><div class='add'>+omfs_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	int option;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_uid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			sbi-&gt;s_uid = make_kuid(current_user_ns(), option);</div><div class='del'>-			if (!uid_valid(sbi-&gt;s_uid))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_gid:</div><div class='del'>-			if (match_int(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			sbi-&gt;s_gid = make_kgid(current_user_ns(), option);</div><div class='del'>-			if (!gid_valid(sbi-&gt;s_gid))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_umask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			sbi-&gt;s_fmask = sbi-&gt;s_dmask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_dmask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			sbi-&gt;s_dmask = option;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_fmask:</div><div class='del'>-			if (match_octal(&amp;args[0], &amp;option))</div><div class='del'>-				return 0;</div><div class='del'>-			sbi-&gt;s_fmask = option;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	struct omfs_mount_options *opts = fc-&gt;fs_private;</div><div class='add'>+	int token;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+</div><div class='add'>+	/* All options are ignored on remount */</div><div class='add'>+	if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	token = fs_parse(fc, omfs_param_spec, param, &amp;result);</div><div class='add'>+	if (token &lt; 0)</div><div class='add'>+		return token;</div><div class='add'>+</div><div class='add'>+	switch (token) {</div><div class='add'>+	case Opt_uid:</div><div class='add'>+		opts-&gt;s_uid = result.uid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_gid:</div><div class='add'>+		opts-&gt;s_gid = result.gid;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_umask:</div><div class='add'>+		opts-&gt;s_fmask = opts-&gt;s_dmask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_dmask:</div><div class='add'>+		opts-&gt;s_dmask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_fmask:</div><div class='add'>+		opts-&gt;s_fmask = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static void</div><div class='add'>+omfs_set_options(struct omfs_sb_info *sbi, struct omfs_mount_options *opts)</div><div class='add'>+{</div><div class='add'>+	sbi-&gt;s_uid = opts-&gt;s_uid;</div><div class='add'>+	sbi-&gt;s_gid = opts-&gt;s_gid;</div><div class='add'>+	sbi-&gt;s_dmask = opts-&gt;s_dmask;</div><div class='add'>+	sbi-&gt;s_fmask = opts-&gt;s_fmask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int omfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh, *bh2;</div><div class='ctx'> 	struct omfs_super_block *omfs_sb;</div><div class='ctx'> 	struct omfs_root_block *omfs_rb;</div><div class='ctx'> 	struct omfs_sb_info *sbi;</div><div class='ctx'> 	struct inode *root;</div><div class='add'>+	struct omfs_mount_options *parsed_opts = fc-&gt;fs_private;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	sbi = kzalloc(sizeof(struct omfs_sb_info), GFP_KERNEL);</div><div class='ctx'> 	if (!sbi)</div><div class='hunk'>@@ -464,12 +470,7 @@ static int omfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_fs_info = sbi;</div><div class='ctx'> </div><div class='del'>-	sbi-&gt;s_uid = current_uid();</div><div class='del'>-	sbi-&gt;s_gid = current_gid();</div><div class='del'>-	sbi-&gt;s_dmask = sbi-&gt;s_fmask = current_umask();</div><div class='del'>-</div><div class='del'>-	if (!parse_options((char *) data, sbi))</div><div class='del'>-		goto end;</div><div class='add'>+	omfs_set_options(sbi, parsed_opts);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_maxbytes = 0xffffffff;</div><div class='ctx'> </div><div class='hunk'>@@ -594,18 +595,50 @@ end:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *omfs_mount(struct file_system_type *fs_type,</div><div class='del'>-			int flags, const char *dev_name, void *data)</div><div class='add'>+static int omfs_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, omfs_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void omfs_free_fc(struct fs_context *fc);</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations omfs_context_ops = {</div><div class='add'>+	.parse_param	= omfs_parse_param,</div><div class='add'>+	.get_tree	= omfs_get_tree,</div><div class='add'>+	.free		= omfs_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int omfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct omfs_mount_options *opts;</div><div class='add'>+</div><div class='add'>+	opts = kzalloc(sizeof(*opts), GFP_KERNEL);</div><div class='add'>+	if (!opts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Set mount options defaults */</div><div class='add'>+	opts-&gt;s_uid = current_uid();</div><div class='add'>+	opts-&gt;s_gid = current_gid();</div><div class='add'>+	opts-&gt;s_dmask = opts-&gt;s_fmask = current_umask();</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = opts;</div><div class='add'>+	fc-&gt;ops = &amp;omfs_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void omfs_free_fc(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, omfs_fill_super);</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type omfs_fs_type = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.name = "omfs",</div><div class='del'>-	.mount = omfs_mount,</div><div class='del'>-	.kill_sb = kill_block_super,</div><div class='del'>-	.fs_flags = FS_REQUIRES_DEV,</div><div class='add'>+	.owner		 = THIS_MODULE,</div><div class='add'>+	.name		 = "omfs",</div><div class='add'>+	.kill_sb	 = kill_block_super,</div><div class='add'>+	.fs_flags	 = FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context = omfs_init_fs_context,</div><div class='add'>+	.parameters	 = omfs_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("omfs");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/open.c b/fs/open.c<br/>index a84d21e55c39..f328622061c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/open.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/open.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/open.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/open.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/audit.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='ctx'> #include &lt;linux/fs_struct.h&gt;</div><div class='del'>-#include &lt;linux/ima.h&gt;</div><div class='ctx'> #include &lt;linux/dnotify.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/mnt_idmapping.h&gt;</div><div class='hunk'>@@ -61,18 +60,21 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		newattrs.ia_valid |= ret | ATTR_FORCE;</div><div class='ctx'> </div><div class='del'>-	inode_lock(dentry-&gt;d_inode);</div><div class='add'>+	ret = inode_lock_killable(dentry-&gt;d_inode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* Note any delegations or leases have already been broken: */</div><div class='ctx'> 	ret = notify_change(idmap, dentry, &amp;newattrs, NULL);</div><div class='ctx'> 	inode_unlock(dentry-&gt;d_inode);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long vfs_truncate(const struct path *path, loff_t length)</div><div class='add'>+int vfs_truncate(const struct path *path, loff_t length)</div><div class='ctx'> {</div><div class='ctx'> 	struct mnt_idmap *idmap;</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	long error;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	inode = path-&gt;dentry-&gt;d_inode;</div><div class='ctx'> </div><div class='hunk'>@@ -82,14 +84,18 @@ long vfs_truncate(const struct path *path, loff_t length)</div><div class='ctx'> 	if (!S_ISREG(inode-&gt;i_mode))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	error = mnt_want_write(path-&gt;mnt);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	idmap = mnt_idmap(path-&gt;mnt);</div><div class='ctx'> 	error = inode_permission(idmap, inode, MAY_WRITE);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto mnt_drop_write_and_out;</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = fsnotify_truncate_perm(path, length);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = mnt_want_write(path-&gt;mnt);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = -EPERM;</div><div class='ctx'> 	if (IS_APPEND(inode))</div><div class='hunk'>@@ -115,12 +121,12 @@ put_write_and_out:</div><div class='ctx'> 	put_write_access(inode);</div><div class='ctx'> mnt_drop_write_and_out:</div><div class='ctx'> 	mnt_drop_write(path-&gt;mnt);</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vfs_truncate);</div><div class='ctx'> </div><div class='del'>-long do_sys_truncate(const char __user *pathname, loff_t length)</div><div class='add'>+int do_sys_truncate(const char __user *pathname, loff_t length)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int lookup_flags = LOOKUP_FOLLOW;</div><div class='ctx'> 	struct path path;</div><div class='hunk'>@@ -154,59 +160,60 @@ COMPAT_SYSCALL_DEFINE2(truncate, const char __user *, path, compat_off_t, length</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-long do_sys_ftruncate(unsigned int fd, loff_t length, int small)</div><div class='add'>+int do_ftruncate(struct file *file, loff_t length, int small)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = -EINVAL;</div><div class='del'>-	if (length &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	error = -EBADF;</div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (!f.file)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	/* explicitly opened as large or we are on 64-bit box */</div><div class='del'>-	if (f.file-&gt;f_flags &amp; O_LARGEFILE)</div><div class='add'>+	if (file-&gt;f_flags &amp; O_LARGEFILE)</div><div class='ctx'> 		small = 0;</div><div class='ctx'> </div><div class='del'>-	dentry = f.file-&gt;f_path.dentry;</div><div class='add'>+	dentry = file-&gt;f_path.dentry;</div><div class='ctx'> 	inode = dentry-&gt;d_inode;</div><div class='del'>-	error = -EINVAL;</div><div class='del'>-	if (!S_ISREG(inode-&gt;i_mode) || !(f.file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-		goto out_putf;</div><div class='add'>+	if (!S_ISREG(inode-&gt;i_mode) || !(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	error = -EINVAL;</div><div class='ctx'> 	/* Cannot ftruncate over 2^31 bytes without large file support */</div><div class='ctx'> 	if (small &amp;&amp; length &gt; MAX_NON_LFS)</div><div class='del'>-		goto out_putf;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	error = -EPERM;</div><div class='ctx'> 	/* Check IS_APPEND on real upper inode */</div><div class='del'>-	if (IS_APPEND(file_inode(f.file)))</div><div class='del'>-		goto out_putf;</div><div class='del'>-	sb_start_write(inode-&gt;i_sb);</div><div class='del'>-	error = security_file_truncate(f.file);</div><div class='del'>-	if (!error)</div><div class='del'>-		error = do_truncate(file_mnt_idmap(f.file), dentry, length,</div><div class='del'>-				    ATTR_MTIME | ATTR_CTIME, f.file);</div><div class='del'>-	sb_end_write(inode-&gt;i_sb);</div><div class='del'>-out_putf:</div><div class='del'>-	fdput(f);</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='add'>+	if (IS_APPEND(file_inode(file)))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	error = security_file_truncate(file);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = fsnotify_truncate_perm(&amp;file-&gt;f_path, length);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	scoped_guard(super_write, inode-&gt;i_sb)</div><div class='add'>+		return do_truncate(file_mnt_idmap(file), dentry, length,</div><div class='add'>+				   ATTR_MTIME | ATTR_CTIME, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int do_sys_ftruncate(unsigned int fd, loff_t length, int small)</div><div class='add'>+{</div><div class='add'>+	if (length &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	return do_ftruncate(fd_file(f), length, small);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SYSCALL_DEFINE2(ftruncate, unsigned int, fd, unsigned long, length)</div><div class='add'>+SYSCALL_DEFINE2(ftruncate, unsigned int, fd, off_t, length)</div><div class='ctx'> {</div><div class='ctx'> 	return do_sys_ftruncate(fd, length, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_ulong_t, length)</div><div class='add'>+COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_off_t, length)</div><div class='ctx'> {</div><div class='ctx'> 	return do_sys_ftruncate(fd, length, 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -244,45 +251,46 @@ COMPAT_SYSCALL_DEFINE3(ftruncate64, unsigned int, fd,</div><div class='ctx'> int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	long ret;</div><div class='add'>+	int ret;</div><div class='add'>+	loff_t sum;</div><div class='ctx'> </div><div class='ctx'> 	if (offset &lt; 0 || len &lt;= 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Return error if mode is not supported */</div><div class='del'>-	if (mode &amp; ~FALLOC_FL_SUPPORTED_MASK)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/* Punch hole and zero range are mutually exclusive */</div><div class='del'>-	if ((mode &amp; (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE)) ==</div><div class='del'>-	    (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE))</div><div class='add'>+	if (mode &amp; ~(FALLOC_FL_MODE_MASK | FALLOC_FL_KEEP_SIZE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* Punch hole must have keep size set */</div><div class='del'>-	if ((mode &amp; FALLOC_FL_PUNCH_HOLE) &amp;&amp;</div><div class='del'>-	    !(mode &amp; FALLOC_FL_KEEP_SIZE))</div><div class='add'>+	/*</div><div class='add'>+	 * Modes are exclusive, even if that is not obvious from the encoding</div><div class='add'>+	 * as bit masks and the mix with the flag in the same namespace.</div><div class='add'>+	 *</div><div class='add'>+	 * To make things even more complicated, FALLOC_FL_ALLOCATE_RANGE is</div><div class='add'>+	 * encoded as no bit set.</div><div class='add'>+	 */</div><div class='add'>+	switch (mode &amp; FALLOC_FL_MODE_MASK) {</div><div class='add'>+	case FALLOC_FL_ALLOCATE_RANGE:</div><div class='add'>+	case FALLOC_FL_UNSHARE_RANGE:</div><div class='add'>+	case FALLOC_FL_ZERO_RANGE:</div><div class='add'>+		break;</div><div class='add'>+	case FALLOC_FL_PUNCH_HOLE:</div><div class='add'>+		if (!(mode &amp; FALLOC_FL_KEEP_SIZE))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	case FALLOC_FL_COLLAPSE_RANGE:</div><div class='add'>+	case FALLOC_FL_INSERT_RANGE:</div><div class='add'>+	case FALLOC_FL_WRITE_ZEROES:</div><div class='add'>+		if (mode &amp; FALLOC_FL_KEEP_SIZE)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/* Collapse range should only be used exclusively. */</div><div class='del'>-	if ((mode &amp; FALLOC_FL_COLLAPSE_RANGE) &amp;&amp;</div><div class='del'>-	    (mode &amp; ~FALLOC_FL_COLLAPSE_RANGE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Insert range should only be used exclusively. */</div><div class='del'>-	if ((mode &amp; FALLOC_FL_INSERT_RANGE) &amp;&amp;</div><div class='del'>-	    (mode &amp; ~FALLOC_FL_INSERT_RANGE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Unshare range should only be used with allocate mode. */</div><div class='del'>-	if ((mode &amp; FALLOC_FL_UNSHARE_RANGE) &amp;&amp;</div><div class='del'>-	    (mode &amp; ~(FALLOC_FL_UNSHARE_RANGE | FALLOC_FL_KEEP_SIZE)))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We can only allow pure fallocate on append only files</div><div class='add'>+	 * On append-only files only space preallocation is supported.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((mode &amp; ~FALLOC_FL_KEEP_SIZE) &amp;&amp; IS_APPEND(inode))</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -317,8 +325,11 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len)</div><div class='ctx'> 	if (!S_ISREG(inode-&gt;i_mode) &amp;&amp; !S_ISBLK(inode-&gt;i_mode))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Check for wrap through zero too */</div><div class='del'>-	if (((offset + len) &gt; inode-&gt;i_sb-&gt;s_maxbytes) || ((offset + len) &lt; 0))</div><div class='add'>+	/* Check for wraparound */</div><div class='add'>+	if (check_add_overflow(offset, len, &amp;sum))</div><div class='add'>+		return -EFBIG;</div><div class='add'>+</div><div class='add'>+	if (sum &gt; inode-&gt;i_sb-&gt;s_maxbytes)</div><div class='ctx'> 		return -EFBIG;</div><div class='ctx'> </div><div class='ctx'> 	if (!file-&gt;f_op-&gt;fallocate)</div><div class='hunk'>@@ -344,14 +355,12 @@ EXPORT_SYMBOL_GPL(vfs_fallocate);</div><div class='ctx'> </div><div class='ctx'> int ksys_fallocate(int fd, int mode, loff_t offset, loff_t len)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='del'>-	int error = -EBADF;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		error = vfs_fallocate(f.file, mode, offset, len);</div><div class='del'>-		fdput(f);</div><div class='del'>-	}</div><div class='del'>-	return error;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	return vfs_fallocate(fd_file(f), mode, offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)</div><div class='hunk'>@@ -405,7 +414,6 @@ static bool access_need_override_creds(int flags)</div><div class='ctx'> </div><div class='ctx'> static const struct cred *access_override_creds(void)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	struct cred *override_cred;</div><div class='ctx'> </div><div class='ctx'> 	override_cred = prepare_creds();</div><div class='hunk'>@@ -450,16 +458,10 @@ static const struct cred *access_override_creds(void)</div><div class='ctx'> 	 * freeing.</div><div class='ctx'> 	 */</div><div class='ctx'> 	override_cred-&gt;non_rcu = 1;</div><div class='del'>-</div><div class='del'>-	old_cred = override_creds(override_cred);</div><div class='del'>-</div><div class='del'>-	/* override_cred() gets its own ref */</div><div class='del'>-	put_cred(override_cred);</div><div class='del'>-</div><div class='del'>-	return old_cred;</div><div class='add'>+	return override_creds(override_cred);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long do_faccessat(int dfd, const char __user *filename, int mode, int flags)</div><div class='add'>+static int do_faccessat(int dfd, const char __user *filename, int mode, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -526,7 +528,7 @@ out_path_release:</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (old_cred)</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		put_cred(revert_creds(old_cred));</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -575,23 +577,18 @@ out:</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE1(fchdir, unsigned int, fd)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget_raw(fd);</div><div class='add'>+	CLASS(fd_raw, f)(fd);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = -EBADF;</div><div class='del'>-	if (!f.file)</div><div class='del'>-		goto out;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = -ENOTDIR;</div><div class='del'>-	if (!d_can_lookup(f.file-&gt;f_path.dentry))</div><div class='del'>-		goto out_putf;</div><div class='add'>+	if (!d_can_lookup(fd_file(f)-&gt;f_path.dentry))</div><div class='add'>+		return -ENOTDIR;</div><div class='ctx'> </div><div class='del'>-	error = file_permission(f.file, MAY_EXEC | MAY_CHDIR);</div><div class='add'>+	error = file_permission(fd_file(f), MAY_EXEC | MAY_CHDIR);</div><div class='ctx'> 	if (!error)</div><div class='del'>-		set_fs_pwd(current-&gt;fs, &amp;f.file-&gt;f_path);</div><div class='del'>-out_putf:</div><div class='del'>-	fdput(f);</div><div class='del'>-out:</div><div class='add'>+		set_fs_pwd(current-&gt;fs, &amp;fd_file(f)-&gt;f_path);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -631,7 +628,7 @@ out:</div><div class='ctx'> int chmod_common(const struct path *path, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = path-&gt;dentry-&gt;d_inode;</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> 	struct iattr newattrs;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -639,7 +636,9 @@ int chmod_common(const struct path *path, umode_t mode)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> retry_deleg:</div><div class='del'>-	inode_lock(inode);</div><div class='add'>+	error = inode_lock_killable(inode);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_mnt_unlock;</div><div class='ctx'> 	error = security_path_chmod(path, mode);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -649,11 +648,12 @@ retry_deleg:</div><div class='ctx'> 			      &amp;newattrs, &amp;delegated_inode);</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			goto retry_deleg;</div><div class='ctx'> 	}</div><div class='add'>+out_mnt_unlock:</div><div class='ctx'> 	mnt_drop_write(path-&gt;mnt);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -666,14 +666,12 @@ int vfs_fchmod(struct file *file, umode_t mode)</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE2(fchmod, unsigned int, fd, umode_t, mode)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='del'>-	int err = -EBADF;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		err = vfs_fchmod(f.file, mode);</div><div class='del'>-		fdput(f);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	return vfs_fchmod(fd_file(f), mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int do_fchmodat(int dfd, const char __user *filename, umode_t mode,</div><div class='hunk'>@@ -755,7 +753,7 @@ int chown_common(const struct path *path, uid_t user, gid_t group)</div><div class='ctx'> 	struct mnt_idmap *idmap;</div><div class='ctx'> 	struct user_namespace *fs_userns;</div><div class='ctx'> 	struct inode *inode = path-&gt;dentry-&gt;d_inode;</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct iattr newattrs;</div><div class='ctx'> 	kuid_t uid;</div><div class='hunk'>@@ -775,7 +773,9 @@ retry_deleg:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if ((group != (gid_t)-1) &amp;&amp; !setattr_vfsgid(&amp;newattrs, gid))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	inode_lock(inode);</div><div class='add'>+	error = inode_lock_killable(inode);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='ctx'> 	if (!S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_PRIV |</div><div class='ctx'> 				     setattr_should_drop_sgid(idmap, inode);</div><div class='hunk'>@@ -788,7 +788,7 @@ retry_deleg:</div><div class='ctx'> 		error = notify_change(idmap, path-&gt;dentry, &amp;newattrs,</div><div class='ctx'> 				      &amp;delegated_inode);</div><div class='ctx'> 	inode_unlock(inode);</div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			goto retry_deleg;</div><div class='hunk'>@@ -860,14 +860,12 @@ int vfs_fchown(struct file *file, uid_t user, gid_t group)</div><div class='ctx'> </div><div class='ctx'> int ksys_fchown(unsigned int fd, uid_t user, gid_t group)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget(fd);</div><div class='del'>-	int error = -EBADF;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		error = vfs_fchown(f.file, user, group);</div><div class='del'>-		fdput(f);</div><div class='del'>-	}</div><div class='del'>-	return error;</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	return vfs_fchown(fd_file(f), user, group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)</div><div class='hunk'>@@ -900,10 +898,10 @@ cleanup_inode:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int do_dentry_open(struct file *f,</div><div class='del'>-			  struct inode *inode,</div><div class='ctx'> 			  int (*open)(struct inode *, struct file *))</div><div class='ctx'> {</div><div class='ctx'> 	static const struct file_operations empty_fops = {};</div><div class='add'>+	struct inode *inode = f-&gt;f_path.dentry-&gt;d_inode;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	path_get(&amp;f-&gt;f_path);</div><div class='hunk'>@@ -914,6 +912,7 @@ static int do_dentry_open(struct file *f,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(f-&gt;f_flags &amp; O_PATH)) {</div><div class='ctx'> 		f-&gt;f_mode = FMODE_PATH | FMODE_OPENED;</div><div class='add'>+		file_set_fsnotify_mode(f, FMODE_NONOTIFY);</div><div class='ctx'> 		f-&gt;f_op = &amp;empty_fops;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -938,11 +937,21 @@ static int do_dentry_open(struct file *f,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = security_file_open(f);</div><div class='del'>-	if (error)</div><div class='add'>+	if (unlikely(error))</div><div class='add'>+		goto cleanup_all;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call fsnotify open permission hook and set FMODE_NONOTIFY_* bits</div><div class='add'>+	 * according to existing permission watches.</div><div class='add'>+	 * If FMODE_NONOTIFY mode was already set for an fanotify fd or for a</div><div class='add'>+	 * pseudo file, this call will not change the mode.</div><div class='add'>+	 */</div><div class='add'>+	error = fsnotify_open_perm_and_set_mode(f);</div><div class='add'>+	if (unlikely(error))</div><div class='ctx'> 		goto cleanup_all;</div><div class='ctx'> </div><div class='ctx'> 	error = break_lease(file_inode(f), f-&gt;f_flags);</div><div class='del'>-	if (error)</div><div class='add'>+	if (unlikely(error))</div><div class='ctx'> 		goto cleanup_all;</div><div class='ctx'> </div><div class='ctx'> 	/* normally all 3 are set; -&gt;open() can clear them if needed */</div><div class='hunk'>@@ -980,12 +989,11 @@ static int do_dentry_open(struct file *f,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (f-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Paired with smp_mb() in collapse_file() to ensure nr_thps</div><div class='del'>-		 * is up to date and the update to i_writecount by</div><div class='del'>-		 * get_write_access() is visible. Ensures subsequent insertion</div><div class='del'>-		 * of THPs into the page cache will fail.</div><div class='add'>+		 * Depends on full fence from get_write_access() to synchronize</div><div class='add'>+		 * against collapse_file() regarding i_writecount and nr_thps</div><div class='add'>+		 * updates. Ensures subsequent insertion of THPs into the page</div><div class='add'>+		 * cache will fail.</div><div class='ctx'> 		 */</div><div class='del'>-		smp_mb();</div><div class='ctx'> 		if (filemap_nr_thps(inode-&gt;i_mapping)) {</div><div class='ctx'> 			struct address_space *mapping = inode-&gt;i_mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -1002,11 +1010,6 @@ static int do_dentry_open(struct file *f,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Once we return a file with FMODE_OPENED, __fput() will call</div><div class='del'>-	 * fsnotify_close(), so we need fsnotify_open() here for symmetry.</div><div class='del'>-	 */</div><div class='del'>-	fsnotify_open(f);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> cleanup_all:</div><div class='hunk'>@@ -1016,8 +1019,8 @@ cleanup_all:</div><div class='ctx'> 	put_file_access(f);</div><div class='ctx'> cleanup_file:</div><div class='ctx'> 	path_put(&amp;f-&gt;f_path);</div><div class='del'>-	f-&gt;f_path.mnt = NULL;</div><div class='del'>-	f-&gt;f_path.dentry = NULL;</div><div class='add'>+	f-&gt;__f_path.mnt = NULL;</div><div class='add'>+	f-&gt;__f_path.dentry = NULL;</div><div class='ctx'> 	f-&gt;f_inode = NULL;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -1044,8 +1047,8 @@ int finish_open(struct file *file, struct dentry *dentry,</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(file-&gt;f_mode &amp; FMODE_OPENED); /* once it's opened, it's opened */</div><div class='ctx'> </div><div class='del'>-	file-&gt;f_path.dentry = dentry;</div><div class='del'>-	return do_dentry_open(file, d_backing_inode(dentry), open);</div><div class='add'>+	file-&gt;__f_path.dentry = dentry;</div><div class='add'>+	return do_dentry_open(file, open);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(finish_open);</div><div class='ctx'> </div><div class='hunk'>@@ -1053,19 +1056,21 @@ EXPORT_SYMBOL(finish_open);</div><div class='ctx'>  * finish_no_open - finish -&gt;atomic_open() without opening the file</div><div class='ctx'>  *</div><div class='ctx'>  * @file: file pointer</div><div class='del'>- * @dentry: dentry or NULL (as returned from -&gt;lookup())</div><div class='add'>+ * @dentry: dentry, ERR_PTR(-E...) or NULL (as returned from -&gt;lookup())</div><div class='ctx'>  *</div><div class='del'>- * This can be used to set the result of a successful lookup in -&gt;atomic_open().</div><div class='add'>+ * This can be used to set the result of a lookup in -&gt;atomic_open().</div><div class='ctx'>  *</div><div class='ctx'>  * NB: unlike finish_open() this function does consume the dentry reference and</div><div class='ctx'>  * the caller need not dput() it.</div><div class='ctx'>  *</div><div class='del'>- * Returns "0" which must be the return value of -&gt;atomic_open() after having</div><div class='del'>- * called this function.</div><div class='add'>+ * Returns 0 or -E..., which must be the return value of -&gt;atomic_open() after</div><div class='add'>+ * having called this function.</div><div class='ctx'>  */</div><div class='ctx'> int finish_no_open(struct file *file, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	file-&gt;f_path.dentry = dentry;</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='add'>+	file-&gt;__f_path.dentry = dentry;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(finish_no_open);</div><div class='hunk'>@@ -1083,8 +1088,19 @@ EXPORT_SYMBOL(file_path);</div><div class='ctx'>  */</div><div class='ctx'> int vfs_open(const struct path *path, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	file-&gt;f_path = *path;</div><div class='del'>-	return do_dentry_open(file, d_backing_inode(path-&gt;dentry), NULL);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	file-&gt;__f_path = *path;</div><div class='add'>+	ret = do_dentry_open(file, NULL);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/*</div><div class='add'>+		 * Once we return a file with FMODE_OPENED, __fput() will call</div><div class='add'>+		 * fsnotify_close(), so we need fsnotify_open() here for</div><div class='add'>+		 * symmetry.</div><div class='add'>+		 */</div><div class='add'>+		fsnotify_open(file);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file *dentry_open(const struct path *path, int flags,</div><div class='hunk'>@@ -1108,6 +1124,23 @@ struct file *dentry_open(const struct path *path, int flags,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dentry_open);</div><div class='ctx'> </div><div class='add'>+struct file *dentry_open_nonotify(const struct path *path, int flags,</div><div class='add'>+				  const struct cred *cred)</div><div class='add'>+{</div><div class='add'>+	struct file *f = alloc_empty_file(flags, cred);</div><div class='add'>+	if (!IS_ERR(f)) {</div><div class='add'>+		int error;</div><div class='add'>+</div><div class='add'>+		file_set_fsnotify_mode(f, FMODE_NONOTIFY);</div><div class='add'>+		error = vfs_open(path, f);</div><div class='add'>+		if (error) {</div><div class='add'>+			fput(f);</div><div class='add'>+			f = ERR_PTR(error);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return f;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * dentry_create - Create and open a file</div><div class='ctx'>  * @path: path to create</div><div class='hunk'>@@ -1135,9 +1168,7 @@ struct file *dentry_create(const struct path *path, int flags, umode_t mode,</div><div class='ctx'> 	if (IS_ERR(f))</div><div class='ctx'> 		return f;</div><div class='ctx'> </div><div class='del'>-	error = vfs_create(mnt_idmap(path-&gt;mnt),</div><div class='del'>-			   d_inode(path-&gt;dentry-&gt;d_parent),</div><div class='del'>-			   path-&gt;dentry, mode, true);</div><div class='add'>+	error = vfs_create(mnt_idmap(path-&gt;mnt), path-&gt;dentry, mode, NULL);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = vfs_open(path, f);</div><div class='ctx'> </div><div class='hunk'>@@ -1153,7 +1184,6 @@ EXPORT_SYMBOL(dentry_create);</div><div class='ctx'>  * kernel_file_open - open a file for kernel internal use</div><div class='ctx'>  * @path:	path of the file to open</div><div class='ctx'>  * @flags:	open flags</div><div class='del'>- * @inode:	the inode</div><div class='ctx'>  * @cred:	credentials for open</div><div class='ctx'>  *</div><div class='ctx'>  * Open a file for use by in-kernel consumers. The file is not accounted</div><div class='hunk'>@@ -1163,7 +1193,7 @@ EXPORT_SYMBOL(dentry_create);</div><div class='ctx'>  * Return: Opened file on success, an error pointer on failure.</div><div class='ctx'>  */</div><div class='ctx'> struct file *kernel_file_open(const struct path *path, int flags,</div><div class='del'>-				struct inode *inode, const struct cred *cred)</div><div class='add'>+				const struct cred *cred)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *f;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -1172,11 +1202,10 @@ struct file *kernel_file_open(const struct path *path, int flags,</div><div class='ctx'> 	if (IS_ERR(f))</div><div class='ctx'> 		return f;</div><div class='ctx'> </div><div class='del'>-	f-&gt;f_path = *path;</div><div class='del'>-	error = do_dentry_open(f, inode, NULL);</div><div class='add'>+	error = vfs_open(path, f);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		fput(f);</div><div class='del'>-		f = ERR_PTR(error);</div><div class='add'>+		return ERR_PTR(error);</div><div class='ctx'> 	}</div><div class='ctx'> 	return f;</div><div class='ctx'> }</div><div class='hunk'>@@ -1204,7 +1233,7 @@ inline struct open_how build_open_how(int flags, umode_t mode)</div><div class='ctx'> inline int build_open_flags(const struct open_how *how, struct open_flags *op)</div><div class='ctx'> {</div><div class='ctx'> 	u64 flags = how-&gt;flags;</div><div class='del'>-	u64 strip = __FMODE_NONOTIFY | O_CLOEXEC;</div><div class='add'>+	u64 strip = O_CLOEXEC;</div><div class='ctx'> 	int lookup_flags = 0;</div><div class='ctx'> 	int acc_mode = ACC_MODE(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1212,9 +1241,7 @@ inline int build_open_flags(const struct open_how *how, struct open_flags *op)</div><div class='ctx'> 			 "struct open_flags doesn't yet handle flags &gt; 32 bits");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Strip flags that either shouldn't be set by userspace like</div><div class='del'>-	 * FMODE_NONOTIFY or that aren't relevant in determining struct</div><div class='del'>-	 * open_flags like O_CLOEXEC.</div><div class='add'>+	 * Strip flags that aren't relevant in determining struct open_flags.</div><div class='ctx'> 	 */</div><div class='ctx'> 	flags &amp;= ~strip;</div><div class='ctx'> </div><div class='hunk'>@@ -1364,7 +1391,7 @@ struct file *filp_open(const char *filename, int flags, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct filename *name = getname_kernel(filename);</div><div class='ctx'> 	struct file *file = ERR_CAST(name);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!IS_ERR(name)) {</div><div class='ctx'> 		file = file_open_name(name, flags, mode);</div><div class='ctx'> 		putname(name);</div><div class='hunk'>@@ -1385,35 +1412,25 @@ struct file *file_open_root(const struct path *root,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(file_open_root);</div><div class='ctx'> </div><div class='del'>-static long do_sys_openat2(int dfd, const char __user *filename,</div><div class='del'>-			   struct open_how *how)</div><div class='add'>+static int do_sys_openat2(int dfd, const char __user *filename,</div><div class='add'>+			  struct open_how *how)</div><div class='ctx'> {</div><div class='ctx'> 	struct open_flags op;</div><div class='del'>-	int fd = build_open_flags(how, &amp;op);</div><div class='del'>-	struct filename *tmp;</div><div class='add'>+	struct filename *tmp __free(putname) = NULL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (fd)</div><div class='del'>-		return fd;</div><div class='add'>+	err = build_open_flags(how, &amp;op);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	tmp = getname(filename);</div><div class='ctx'> 	if (IS_ERR(tmp))</div><div class='ctx'> 		return PTR_ERR(tmp);</div><div class='ctx'> </div><div class='del'>-	fd = get_unused_fd_flags(how-&gt;flags);</div><div class='del'>-	if (fd &gt;= 0) {</div><div class='del'>-		struct file *f = do_filp_open(dfd, tmp, &amp;op);</div><div class='del'>-		if (IS_ERR(f)) {</div><div class='del'>-			put_unused_fd(fd);</div><div class='del'>-			fd = PTR_ERR(f);</div><div class='del'>-		} else {</div><div class='del'>-			fd_install(fd, f);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	putname(tmp);</div><div class='del'>-	return fd;</div><div class='add'>+	return FD_ADD(how-&gt;flags, do_filp_open(dfd, tmp, &amp;op));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)</div><div class='add'>+int do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct open_how how = build_open_how(flags, mode);</div><div class='ctx'> 	return do_sys_openat2(dfd, filename, &amp;how);</div><div class='hunk'>@@ -1446,6 +1463,8 @@ SYSCALL_DEFINE4(openat2, int, dfd, const char __user *, filename,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(usize &lt; OPEN_HOW_SIZE_VER0))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (unlikely(usize &gt; PAGE_SIZE))</div><div class='add'>+		return -E2BIG;</div><div class='ctx'> </div><div class='ctx'> 	err = copy_struct_from_user(&amp;tmp, sizeof(tmp), how, usize);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1504,7 +1523,7 @@ static int filp_flush(struct file *filp, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='del'>-	if (CHECK_DATA_CORRUPTION(file_count(filp) == 0,</div><div class='add'>+	if (CHECK_DATA_CORRUPTION(file_count(filp) == 0, filp,</div><div class='ctx'> 			"VFS: Close: file count is 0 (f_op=%ps)",</div><div class='ctx'> 			filp-&gt;f_op)) {</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1525,7 +1544,7 @@ int filp_close(struct file *filp, fl_owner_t id)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	retval = filp_flush(filp, id);</div><div class='del'>-	fput(filp);</div><div class='add'>+	fput_close(filp);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -1551,35 +1570,21 @@ SYSCALL_DEFINE1(close, unsigned int, fd)</div><div class='ctx'> 	 * We're returning to user space. Don't bother</div><div class='ctx'> 	 * with any delayed fput() cases.</div><div class='ctx'> 	 */</div><div class='del'>-	__fput_sync(file);</div><div class='add'>+	fput_close_sync(file);</div><div class='add'>+</div><div class='add'>+	if (likely(retval == 0))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* can't restart close syscall because file table entry was cleared */</div><div class='del'>-	if (unlikely(retval == -ERESTARTSYS ||</div><div class='del'>-		     retval == -ERESTARTNOINTR ||</div><div class='del'>-		     retval == -ERESTARTNOHAND ||</div><div class='del'>-		     retval == -ERESTART_RESTARTBLOCK))</div><div class='add'>+	if (retval == -ERESTARTSYS ||</div><div class='add'>+	    retval == -ERESTARTNOINTR ||</div><div class='add'>+	    retval == -ERESTARTNOHAND ||</div><div class='add'>+	    retval == -ERESTART_RESTARTBLOCK)</div><div class='ctx'> 		retval = -EINTR;</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * sys_close_range() - Close all file descriptors in a given range.</div><div class='del'>- *</div><div class='del'>- * @fd:     starting file descriptor to close</div><div class='del'>- * @max_fd: last file descriptor to close</div><div class='del'>- * @flags:  reserved for future extensions</div><div class='del'>- *</div><div class='del'>- * This closes a range of file descriptors. All file descriptors</div><div class='del'>- * from @fd up to and including @max_fd are closed.</div><div class='del'>- * Currently, errors to close a given file descriptor are ignored.</div><div class='del'>- */</div><div class='del'>-SYSCALL_DEFINE3(close_range, unsigned int, fd, unsigned int, max_fd,</div><div class='del'>-		unsigned int, flags)</div><div class='del'>-{</div><div class='del'>-	return __close_range(fd, max_fd, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This routine simulates a hangup on the tty, to arrange that users</div><div class='ctx'>  * are given clean terminals at login time.</div><div class='head'>diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c<br/>index c4b65a6d41cc..fb8d84bdedfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/openpromfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/openpromfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/openpromfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/openpromfs/inode.c</a></div><div class='hunk'>@@ -236,7 +236,7 @@ found:</div><div class='ctx'> 	mutex_unlock(&amp;op_mutex);</div><div class='ctx'> 	if (IS_ERR(inode))</div><div class='ctx'> 		return ERR_CAST(inode);</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW) {</div><div class='ctx'> 		simple_inode_init_ts(inode);</div><div class='ctx'> 		ent_oi = OP_I(inode);</div><div class='ctx'> 		ent_oi-&gt;type = ent_type;</div><div class='hunk'>@@ -355,10 +355,10 @@ static struct inode *openprom_iget(struct super_block *sb, ino_t ino)</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int openprom_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int openpromfs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_NOATIME;</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	fc-&gt;sb_flags |= SB_NOATIME;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +366,6 @@ static const struct super_operations openprom_sops = {</div><div class='ctx'> 	.alloc_inode	= openprom_alloc_inode,</div><div class='ctx'> 	.free_inode	= openprom_free_inode,</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='del'>-	.remount_fs	= openprom_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int openprom_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='hunk'>@@ -415,6 +414,7 @@ static int openpromfs_get_tree(struct fs_context *fc)</div><div class='ctx'> </div><div class='ctx'> static const struct fs_context_operations openpromfs_context_ops = {</div><div class='ctx'> 	.get_tree	= openpromfs_get_tree,</div><div class='add'>+	.reconfigure	= openpromfs_reconfigure,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int openpromfs_init_fs_context(struct fs_context *fc)</div><div class='hunk'>@@ -446,7 +446,7 @@ static int __init init_openprom_fs(void)</div><div class='ctx'> 					    sizeof(struct op_inode_info),</div><div class='ctx'> 					    0,</div><div class='ctx'> 					    (SLAB_RECLAIM_ACCOUNT |</div><div class='del'>-					     SLAB_MEM_SPREAD | SLAB_ACCOUNT),</div><div class='add'>+					     SLAB_ACCOUNT),</div><div class='ctx'> 					    op_inode_init_once);</div><div class='ctx'> 	if (!op_inode_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -471,4 +471,5 @@ static void __exit exit_openprom_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_openprom_fs)</div><div class='ctx'> module_exit(exit_openprom_fs)</div><div class='add'>+MODULE_DESCRIPTION("OpenPROM filesystem support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c<br/>index 8bbe9486e3a6..a19d1ad705db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/dcache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/dcache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/dcache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/dcache.c</a></div><div class='hunk'>@@ -13,10 +13,9 @@</div><div class='ctx'> #include "orangefs-kernel.h"</div><div class='ctx'> </div><div class='ctx'> /* Returns 1 if dentry can still be trusted, else 0. */</div><div class='del'>-static int orangefs_revalidate_lookup(struct dentry *dentry)</div><div class='add'>+static int orangefs_revalidate_lookup(struct inode *parent_inode, const struct qstr *name,</div><div class='add'>+				      struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *parent_dentry = dget_parent(dentry);</div><div class='del'>-	struct inode *parent_inode = parent_dentry-&gt;d_inode;</div><div class='ctx'> 	struct orangefs_inode_s *parent = ORANGEFS_I(parent_inode);</div><div class='ctx'> 	struct inode *inode = dentry-&gt;d_inode;</div><div class='ctx'> 	struct orangefs_kernel_op_s *new_op;</div><div class='hunk'>@@ -26,16 +25,14 @@ static int orangefs_revalidate_lookup(struct dentry *dentry)</div><div class='ctx'> 	gossip_debug(GOSSIP_DCACHE_DEBUG, "%s: attempting lookup.\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	new_op = op_alloc(ORANGEFS_VFS_OP_LOOKUP);</div><div class='del'>-	if (!new_op) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_put_parent;</div><div class='del'>-	}</div><div class='add'>+	if (!new_op)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	new_op-&gt;upcall.req.lookup.sym_follow = ORANGEFS_LOOKUP_LINK_NO_FOLLOW;</div><div class='ctx'> 	new_op-&gt;upcall.req.lookup.parent_refn = parent-&gt;refn;</div><div class='del'>-	strncpy(new_op-&gt;upcall.req.lookup.d_name,</div><div class='del'>-		dentry-&gt;d_name.name,</div><div class='del'>-		ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	/* op_alloc() leaves -&gt;upcall zeroed */</div><div class='add'>+	memcpy(new_op-&gt;upcall.req.lookup.d_name, name-&gt;name,</div><div class='add'>+			min(name-&gt;len, ORANGEFS_NAME_MAX - 1));</div><div class='ctx'> </div><div class='ctx'> 	gossip_debug(GOSSIP_DCACHE_DEBUG,</div><div class='ctx'> 		     "%s:%s:%d interrupt flag [%d]\n",</div><div class='hunk'>@@ -80,8 +77,6 @@ static int orangefs_revalidate_lookup(struct dentry *dentry)</div><div class='ctx'> 	ret = 1;</div><div class='ctx'> out_release_op:</div><div class='ctx'> 	op_release(new_op);</div><div class='del'>-out_put_parent:</div><div class='del'>-	dput(parent_dentry);</div><div class='ctx'> 	return ret;</div><div class='ctx'> out_drop:</div><div class='ctx'> 	gossip_debug(GOSSIP_DCACHE_DEBUG, "%s:%s:%d revalidate failed\n",</div><div class='hunk'>@@ -94,7 +89,8 @@ out_drop:</div><div class='ctx'>  *</div><div class='ctx'>  * Should return 1 if dentry can still be trusted, else 0.</div><div class='ctx'>  */</div><div class='del'>-static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int orangefs_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long time = (unsigned long) dentry-&gt;d_fsdata;</div><div class='hunk'>@@ -116,7 +112,7 @@ static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	 * If this passes, the positive dentry still exists or the negative</div><div class='ctx'> 	 * dentry still does not exist.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!orangefs_revalidate_lookup(dentry))</div><div class='add'>+	if (!orangefs_revalidate_lookup(dir, name, dentry))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We do not need to continue with negative dentries. */</div><div class='head'>diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c<br/>index d68372241b30..919f99b16834 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/file.c</a></div><div class='hunk'>@@ -57,8 +57,8 @@ ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inode,</div><div class='ctx'> 	int buffer_index;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	size_t copy_amount;</div><div class='del'>-	int open_for_read;</div><div class='del'>-	int open_for_write;</div><div class='add'>+	bool open_for_read;</div><div class='add'>+	bool open_for_write;</div><div class='ctx'> </div><div class='ctx'> 	new_op = op_alloc(ORANGEFS_VFS_OP_FILE_IO);</div><div class='ctx'> 	if (!new_op)</div><div class='hunk'>@@ -398,8 +398,9 @@ static const struct vm_operations_struct orangefs_file_vm_ops = {</div><div class='ctx'> /*</div><div class='ctx'>  * Memory map a region of a file.</div><div class='ctx'>  */</div><div class='del'>-static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int orangefs_file_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	struct file *file = desc-&gt;file;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = orangefs_revalidate_mapping(file_inode(file));</div><div class='hunk'>@@ -410,10 +411,11 @@ static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		     "orangefs_file_mmap: called on %pD\n", file);</div><div class='ctx'> </div><div class='ctx'> 	/* set the sequential readahead hint */</div><div class='del'>-	vm_flags_mod(vma, VM_SEQ_READ, VM_RAND_READ);</div><div class='add'>+	desc-&gt;vm_flags |= VM_SEQ_READ;</div><div class='add'>+	desc-&gt;vm_flags &amp;= ~VM_RAND_READ;</div><div class='ctx'> </div><div class='ctx'> 	file_accessed(file);</div><div class='del'>-	vma-&gt;vm_ops = &amp;orangefs_file_vm_ops;</div><div class='add'>+	desc-&gt;vm_ops = &amp;orangefs_file_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -574,7 +576,7 @@ const struct file_operations orangefs_file_operations = {</div><div class='ctx'> 	.read_iter	= orangefs_file_read_iter,</div><div class='ctx'> 	.write_iter	= orangefs_file_write_iter,</div><div class='ctx'> 	.lock		= orangefs_lock,</div><div class='del'>-	.mmap		= orangefs_file_mmap,</div><div class='add'>+	.mmap_prepare	= orangefs_file_mmap_prepare,</div><div class='ctx'> 	.open		= generic_file_open,</div><div class='ctx'> 	.splice_read    = orangefs_file_splice_read,</div><div class='ctx'> 	.splice_write   = iter_file_splice_write,</div><div class='head'>diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c<br/>index 085912268442..d7275990ffa4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/inode.c</a></div><div class='hunk'>@@ -16,61 +16,50 @@</div><div class='ctx'> #include "orangefs-kernel.h"</div><div class='ctx'> #include "orangefs-bufmap.h"</div><div class='ctx'> </div><div class='del'>-static int orangefs_writepage_locked(struct page *page,</div><div class='del'>-    struct writeback_control *wbc)</div><div class='add'>+static int orangefs_writepage_locked(struct folio *folio,</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct orangefs_write_range *wr = NULL;</div><div class='ctx'> 	struct iov_iter iter;</div><div class='ctx'> 	struct bio_vec bv;</div><div class='del'>-	size_t len, wlen;</div><div class='add'>+	size_t wlen;</div><div class='ctx'> 	ssize_t ret;</div><div class='del'>-	loff_t off;</div><div class='add'>+	loff_t len, off;</div><div class='ctx'> </div><div class='del'>-	set_page_writeback(page);</div><div class='add'>+	folio_start_writeback(folio);</div><div class='ctx'> </div><div class='ctx'> 	len = i_size_read(inode);</div><div class='del'>-	if (PagePrivate(page)) {</div><div class='del'>-		wr = (struct orangefs_write_range *)page_private(page);</div><div class='del'>-		WARN_ON(wr-&gt;pos &gt;= len);</div><div class='add'>+	if (folio-&gt;private) {</div><div class='add'>+		wr = folio-&gt;private;</div><div class='ctx'> 		off = wr-&gt;pos;</div><div class='del'>-		if (off + wr-&gt;len &gt; len)</div><div class='add'>+		if ((off + wr-&gt;len &gt; len) &amp;&amp; (off &lt;= len))</div><div class='ctx'> 			wlen = len - off;</div><div class='ctx'> 		else</div><div class='ctx'> 			wlen = wr-&gt;len;</div><div class='add'>+		if (wlen == 0)</div><div class='add'>+			wlen = wr-&gt;len;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		WARN_ON(1);</div><div class='del'>-		off = page_offset(page);</div><div class='del'>-		if (off + PAGE_SIZE &gt; len)</div><div class='add'>+		off = folio_pos(folio);</div><div class='add'>+		wlen = folio_size(folio);</div><div class='add'>+</div><div class='add'>+		if (wlen &gt; len - off)</div><div class='ctx'> 			wlen = len - off;</div><div class='del'>-		else</div><div class='del'>-			wlen = PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='del'>-	/* Should've been handled in orangefs_invalidate_folio. */</div><div class='del'>-	WARN_ON(off == len || off + wlen &gt; len);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(wlen == 0);</div><div class='del'>-	bvec_set_page(&amp;bv, page, wlen, off % PAGE_SIZE);</div><div class='add'>+	bvec_set_folio(&amp;bv, folio, wlen, offset_in_folio(folio, off));</div><div class='ctx'> 	iov_iter_bvec(&amp;iter, ITER_SOURCE, &amp;bv, 1, wlen);</div><div class='ctx'> </div><div class='ctx'> 	ret = wait_for_direct_io(ORANGEFS_IO_WRITE, inode, &amp;off, &amp;iter, wlen,</div><div class='ctx'> 	    len, wr, NULL, NULL);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		SetPageError(page);</div><div class='del'>-		mapping_set_error(page-&gt;mapping, ret);</div><div class='add'>+		mapping_set_error(folio-&gt;mapping, ret);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='del'>-	kfree(detach_page_private(page));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orangefs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	ret = orangefs_writepage_locked(page, wbc);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	end_page_writeback(page);</div><div class='add'>+	kfree(folio_detach_private(folio));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,33 +69,33 @@ struct orangefs_writepages {</div><div class='ctx'> 	kuid_t uid;</div><div class='ctx'> 	kgid_t gid;</div><div class='ctx'> 	int maxpages;</div><div class='del'>-	int npages;</div><div class='del'>-	struct page **pages;</div><div class='add'>+	int nfolios;</div><div class='add'>+	struct address_space *mapping;</div><div class='add'>+	struct folio **folios;</div><div class='ctx'> 	struct bio_vec *bv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int orangefs_writepages_work(struct orangefs_writepages *ow,</div><div class='del'>-    struct writeback_control *wbc)</div><div class='add'>+		struct writeback_control *wbc)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = ow-&gt;pages[0]-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = ow-&gt;mapping-&gt;host;</div><div class='ctx'> 	struct orangefs_write_range *wrp, wr;</div><div class='ctx'> 	struct iov_iter iter;</div><div class='ctx'> 	ssize_t ret;</div><div class='del'>-	size_t len;</div><div class='del'>-	loff_t off;</div><div class='add'>+	size_t start;</div><div class='add'>+	loff_t len, off;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	len = i_size_read(inode);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ow-&gt;npages; i++) {</div><div class='del'>-		set_page_writeback(ow-&gt;pages[i]);</div><div class='del'>-		bvec_set_page(&amp;ow-&gt;bv[i], ow-&gt;pages[i],</div><div class='del'>-			      min(page_offset(ow-&gt;pages[i]) + PAGE_SIZE,</div><div class='del'>-			          ow-&gt;off + ow-&gt;len) -</div><div class='del'>-			      max(ow-&gt;off, page_offset(ow-&gt;pages[i])),</div><div class='del'>-			      i == 0 ? ow-&gt;off - page_offset(ow-&gt;pages[i]) : 0);</div><div class='add'>+	start = offset_in_folio(ow-&gt;folios[0], ow-&gt;off);</div><div class='add'>+	for (i = 0; i &lt; ow-&gt;nfolios; i++) {</div><div class='add'>+		folio_start_writeback(ow-&gt;folios[i]);</div><div class='add'>+		bvec_set_folio(&amp;ow-&gt;bv[i], ow-&gt;folios[i],</div><div class='add'>+				folio_size(ow-&gt;folios[i]) - start, start);</div><div class='add'>+		start = 0;</div><div class='ctx'> 	}</div><div class='del'>-	iov_iter_bvec(&amp;iter, ITER_SOURCE, ow-&gt;bv, ow-&gt;npages, ow-&gt;len);</div><div class='add'>+	iov_iter_bvec(&amp;iter, ITER_SOURCE, ow-&gt;bv, ow-&gt;nfolios, ow-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(ow-&gt;off &gt;= len);</div><div class='ctx'> 	if (ow-&gt;off + ow-&gt;len &gt; len)</div><div class='hunk'>@@ -117,41 +106,24 @@ static int orangefs_writepages_work(struct orangefs_writepages *ow,</div><div class='ctx'> 	wr.gid = ow-&gt;gid;</div><div class='ctx'> 	ret = wait_for_direct_io(ORANGEFS_IO_WRITE, inode, &amp;off, &amp;iter, ow-&gt;len,</div><div class='ctx'> 	    0, &amp;wr, NULL, NULL);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		for (i = 0; i &lt; ow-&gt;npages; i++) {</div><div class='del'>-			SetPageError(ow-&gt;pages[i]);</div><div class='del'>-			mapping_set_error(ow-&gt;pages[i]-&gt;mapping, ret);</div><div class='del'>-			if (PagePrivate(ow-&gt;pages[i])) {</div><div class='del'>-				wrp = (struct orangefs_write_range *)</div><div class='del'>-				    page_private(ow-&gt;pages[i]);</div><div class='del'>-				ClearPagePrivate(ow-&gt;pages[i]);</div><div class='del'>-				put_page(ow-&gt;pages[i]);</div><div class='del'>-				kfree(wrp);</div><div class='del'>-			}</div><div class='del'>-			end_page_writeback(ow-&gt;pages[i]);</div><div class='del'>-			unlock_page(ow-&gt;pages[i]);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		mapping_set_error(ow-&gt;mapping, ret);</div><div class='add'>+	else</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		for (i = 0; i &lt; ow-&gt;npages; i++) {</div><div class='del'>-			if (PagePrivate(ow-&gt;pages[i])) {</div><div class='del'>-				wrp = (struct orangefs_write_range *)</div><div class='del'>-				    page_private(ow-&gt;pages[i]);</div><div class='del'>-				ClearPagePrivate(ow-&gt;pages[i]);</div><div class='del'>-				put_page(ow-&gt;pages[i]);</div><div class='del'>-				kfree(wrp);</div><div class='del'>-			}</div><div class='del'>-			end_page_writeback(ow-&gt;pages[i]);</div><div class='del'>-			unlock_page(ow-&gt;pages[i]);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ow-&gt;nfolios; i++) {</div><div class='add'>+		wrp = folio_detach_private(ow-&gt;folios[i]);</div><div class='add'>+		kfree(wrp);</div><div class='add'>+		folio_end_writeback(ow-&gt;folios[i]);</div><div class='add'>+		folio_unlock(ow-&gt;folios[i]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int orangefs_writepages_callback(struct folio *folio,</div><div class='del'>-		struct writeback_control *wbc, void *data)</div><div class='add'>+		struct writeback_control *wbc, struct orangefs_writepages *ow)</div><div class='ctx'> {</div><div class='del'>-	struct orangefs_writepages *ow = data;</div><div class='ctx'> 	struct orangefs_write_range *wr = folio-&gt;private;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -164,41 +136,41 @@ static int orangefs_writepages_callback(struct folio *folio,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = -1;</div><div class='del'>-	if (ow-&gt;npages == 0) {</div><div class='add'>+	if (ow-&gt;nfolios == 0) {</div><div class='ctx'> 		ow-&gt;off = wr-&gt;pos;</div><div class='ctx'> 		ow-&gt;len = wr-&gt;len;</div><div class='ctx'> 		ow-&gt;uid = wr-&gt;uid;</div><div class='ctx'> 		ow-&gt;gid = wr-&gt;gid;</div><div class='del'>-		ow-&gt;pages[ow-&gt;npages++] = &amp;folio-&gt;page;</div><div class='add'>+		ow-&gt;folios[ow-&gt;nfolios++] = folio;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!uid_eq(ow-&gt;uid, wr-&gt;uid) || !gid_eq(ow-&gt;gid, wr-&gt;gid)) {</div><div class='ctx'> 		orangefs_writepages_work(ow, wbc);</div><div class='del'>-		ow-&gt;npages = 0;</div><div class='add'>+		ow-&gt;nfolios = 0;</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ow-&gt;off + ow-&gt;len == wr-&gt;pos) {</div><div class='ctx'> 		ow-&gt;len += wr-&gt;len;</div><div class='del'>-		ow-&gt;pages[ow-&gt;npages++] = &amp;folio-&gt;page;</div><div class='add'>+		ow-&gt;folios[ow-&gt;nfolios++] = folio;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='ctx'> 	if (ret == -1) {</div><div class='del'>-		if (ow-&gt;npages) {</div><div class='add'>+		if (ow-&gt;nfolios) {</div><div class='ctx'> 			orangefs_writepages_work(ow, wbc);</div><div class='del'>-			ow-&gt;npages = 0;</div><div class='add'>+			ow-&gt;nfolios = 0;</div><div class='ctx'> 		}</div><div class='del'>-		ret = orangefs_writepage_locked(&amp;folio-&gt;page, wbc);</div><div class='add'>+		ret = orangefs_writepage_locked(folio, wbc);</div><div class='ctx'> 		mapping_set_error(folio-&gt;mapping, ret);</div><div class='ctx'> 		folio_unlock(folio);</div><div class='ctx'> 		folio_end_writeback(folio);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (ow-&gt;npages == ow-&gt;maxpages) {</div><div class='add'>+		if (ow-&gt;nfolios == ow-&gt;maxpages) {</div><div class='ctx'> 			orangefs_writepages_work(ow, wbc);</div><div class='del'>-			ow-&gt;npages = 0;</div><div class='add'>+			ow-&gt;nfolios = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -209,31 +181,35 @@ static int orangefs_writepages(struct address_space *mapping,</div><div class='ctx'> {</div><div class='ctx'> 	struct orangefs_writepages *ow;</div><div class='ctx'> 	struct blk_plug plug;</div><div class='del'>-	int ret;</div><div class='add'>+	int error;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+</div><div class='ctx'> 	ow = kzalloc(sizeof(struct orangefs_writepages), GFP_KERNEL);</div><div class='ctx'> 	if (!ow)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ow-&gt;maxpages = orangefs_bufmap_size_query()/PAGE_SIZE;</div><div class='del'>-	ow-&gt;pages = kcalloc(ow-&gt;maxpages, sizeof(struct page *), GFP_KERNEL);</div><div class='del'>-	if (!ow-&gt;pages) {</div><div class='add'>+	ow-&gt;folios = kcalloc(ow-&gt;maxpages, sizeof(struct folio *), GFP_KERNEL);</div><div class='add'>+	if (!ow-&gt;folios) {</div><div class='ctx'> 		kfree(ow);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	ow-&gt;bv = kcalloc(ow-&gt;maxpages, sizeof(struct bio_vec), GFP_KERNEL);</div><div class='ctx'> 	if (!ow-&gt;bv) {</div><div class='del'>-		kfree(ow-&gt;pages);</div><div class='add'>+		kfree(ow-&gt;folios);</div><div class='ctx'> 		kfree(ow);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	ow-&gt;mapping = mapping;</div><div class='ctx'> 	blk_start_plug(&amp;plug);</div><div class='del'>-	ret = write_cache_pages(mapping, wbc, orangefs_writepages_callback, ow);</div><div class='del'>-	if (ow-&gt;npages)</div><div class='del'>-		ret = orangefs_writepages_work(ow, wbc);</div><div class='add'>+	while ((folio = writeback_iter(mapping, wbc, folio, &amp;error)))</div><div class='add'>+		error = orangefs_writepages_callback(folio, wbc, ow);</div><div class='add'>+	if (ow-&gt;nfolios)</div><div class='add'>+		error = orangefs_writepages_work(ow, wbc);</div><div class='ctx'> 	blk_finish_plug(&amp;plug);</div><div class='del'>-	kfree(ow-&gt;pages);</div><div class='add'>+	kfree(ow-&gt;folios);</div><div class='ctx'> 	kfree(ow-&gt;bv);</div><div class='ctx'> 	kfree(ow);</div><div class='del'>-	return ret;</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int orangefs_launder_folio(struct folio *);</div><div class='hunk'>@@ -303,35 +279,27 @@ static int orangefs_read_folio(struct file *file, struct folio *folio)</div><div class='ctx'> 	iov_iter_zero(~0U, &amp;iter);</div><div class='ctx'> 	/* takes care of potential aliasing */</div><div class='ctx'> 	flush_dcache_folio(folio);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		folio_set_error(folio);</div><div class='del'>-	} else {</div><div class='del'>-		folio_mark_uptodate(folio);</div><div class='add'>+	if (ret &gt; 0)</div><div class='ctx'> 		ret = 0;</div><div class='del'>-	}</div><div class='del'>-	/* unlock the folio after the -&gt;read_folio() routine completes */</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-        return ret;</div><div class='add'>+	folio_end_read(folio, ret == 0);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int orangefs_write_begin(struct file *file,</div><div class='del'>-		struct address_space *mapping, loff_t pos, unsigned len,</div><div class='del'>-		struct page **pagep, void **fsdata)</div><div class='add'>+static int orangefs_write_begin(const struct kiocb *iocb,</div><div class='add'>+				struct address_space *mapping, loff_t pos,</div><div class='add'>+				unsigned len, struct folio **foliop,</div><div class='add'>+				void **fsdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct orangefs_write_range *wr;</div><div class='ctx'> 	struct folio *folio;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	index = pos &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	folio = __filemap_get_folio(mapping, pos / PAGE_SIZE, FGP_WRITEBEGIN,</div><div class='add'>+			mapping_gfp_mask(mapping));</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return PTR_ERR(folio);</div><div class='ctx'> </div><div class='del'>-	page = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	*pagep = page;</div><div class='del'>-	folio = page_folio(page);</div><div class='add'>+	*foliop = folio;</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_dirty(folio) &amp;&amp; !folio_test_private(folio)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -352,6 +320,8 @@ static int orangefs_write_begin(struct file *file,</div><div class='ctx'> 			wr-&gt;len += len;</div><div class='ctx'> 			goto okay;</div><div class='ctx'> 		} else {</div><div class='add'>+			wr-&gt;pos = pos;</div><div class='add'>+			wr-&gt;len = len;</div><div class='ctx'> 			ret = orangefs_launder_folio(folio);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='hunk'>@@ -371,10 +341,12 @@ okay:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int orangefs_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-    loff_t pos, unsigned len, unsigned copied, struct page *page, void *fsdata)</div><div class='add'>+static int orangefs_write_end(const struct kiocb *iocb,</div><div class='add'>+			      struct address_space *mapping,</div><div class='add'>+			      loff_t pos, unsigned len, unsigned copied,</div><div class='add'>+			      struct folio *folio, void *fsdata)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='ctx'> 	loff_t last_pos = pos + copied;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -384,25 +356,25 @@ static int orangefs_write_end(struct file *file, struct address_space *mapping,</div><div class='ctx'> 	if (last_pos &gt; inode-&gt;i_size)</div><div class='ctx'> 		i_size_write(inode, last_pos);</div><div class='ctx'> </div><div class='del'>-	/* zero the stale part of the page if we did a short copy */</div><div class='del'>-	if (!PageUptodate(page)) {</div><div class='add'>+	/* zero the stale part of the folio if we did a short copy */</div><div class='add'>+	if (!folio_test_uptodate(folio)) {</div><div class='ctx'> 		unsigned from = pos &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 		if (copied &lt; len) {</div><div class='del'>-			zero_user(page, from + copied, len - copied);</div><div class='add'>+			folio_zero_range(folio, from + copied, len - copied);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Set fully written pages uptodate. */</div><div class='del'>-		if (pos == page_offset(page) &amp;&amp;</div><div class='add'>+		if (pos == folio_pos(folio) &amp;&amp;</div><div class='ctx'> 		    (len == PAGE_SIZE || pos + len == inode-&gt;i_size)) {</div><div class='del'>-			zero_user_segment(page, from + copied, PAGE_SIZE);</div><div class='del'>-			SetPageUptodate(page);</div><div class='add'>+			folio_zero_segment(folio, from + copied, PAGE_SIZE);</div><div class='add'>+			folio_mark_uptodate(folio);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(page);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='add'>+	folio_mark_dirty(folio);</div><div class='add'>+	folio_unlock(folio);</div><div class='add'>+	folio_put(folio);</div><div class='ctx'> </div><div class='del'>-	mark_inode_dirty_sync(file_inode(file));</div><div class='add'>+	mark_inode_dirty_sync(file_inode(iocb-&gt;ki_filp));</div><div class='ctx'> 	return copied;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -494,7 +466,7 @@ static int orangefs_launder_folio(struct folio *folio)</div><div class='ctx'> 	};</div><div class='ctx'> 	folio_wait_writeback(folio);</div><div class='ctx'> 	if (folio_clear_dirty_for_io(folio)) {</div><div class='del'>-		r = orangefs_writepage_locked(&amp;folio-&gt;page, &amp;wbc);</div><div class='add'>+		r = orangefs_writepage_locked(folio, &amp;wbc);</div><div class='ctx'> 		folio_end_writeback(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -616,7 +588,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> /** ORANGEFS2 implementation of address space operations */</div><div class='ctx'> static const struct address_space_operations orangefs_address_operations = {</div><div class='del'>-	.writepage = orangefs_writepage,</div><div class='ctx'> 	.readahead = orangefs_readahead,</div><div class='ctx'> 	.read_folio = orangefs_read_folio,</div><div class='ctx'> 	.writepages = orangefs_writepages,</div><div class='hunk'>@@ -626,6 +597,7 @@ static const struct address_space_operations orangefs_address_operations = {</div><div class='ctx'> 	.invalidate_folio = orangefs_invalidate_folio,</div><div class='ctx'> 	.release_folio = orangefs_release_folio,</div><div class='ctx'> 	.free_folio = orangefs_free_folio,</div><div class='add'>+	.migrate_folio = filemap_migrate_folio,</div><div class='ctx'> 	.launder_folio = orangefs_launder_folio,</div><div class='ctx'> 	.direct_IO = orangefs_direct_IO,</div><div class='ctx'> };</div><div class='hunk'>@@ -906,7 +878,9 @@ int orangefs_update_time(struct inode *inode, int flags)</div><div class='ctx'> </div><div class='ctx'> 	gossip_debug(GOSSIP_INODE_DEBUG, "orangefs_update_time: %pU\n",</div><div class='ctx'> 	    get_khandle_from_ino(inode));</div><div class='del'>-	flags = generic_update_time(inode, flags);</div><div class='add'>+</div><div class='add'>+	flags = inode_update_timestamps(inode, flags);</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;iattr, 0, sizeof iattr);</div><div class='ctx'>         if (flags &amp; S_ATIME)</div><div class='ctx'> 		iattr.ia_valid |= ATTR_ATIME;</div><div class='hunk'>@@ -917,7 +891,7 @@ int orangefs_update_time(struct inode *inode, int flags)</div><div class='ctx'> 	return __orangefs_setattr(inode, &amp;iattr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int orangefs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+static int orangefs_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -938,7 +912,7 @@ static int orangefs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int orangefs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-				 struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+				 struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1069,7 +1043,7 @@ struct inode *orangefs_iget(struct super_block *sb,</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	error = orangefs_inode_getattr(inode, ORANGEFS_GETATTR_NEW);</div><div class='head'>diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c<br/>index c9dfd5c6a097..bec5475de094 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/namei.c</a></div><div class='hunk'>@@ -38,11 +38,9 @@ static int orangefs_create(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	new_op-&gt;upcall.req.create.parent_refn = parent-&gt;refn;</div><div class='ctx'> </div><div class='del'>-	fill_default_sys_attrs(new_op-&gt;upcall.req.create.attributes,</div><div class='del'>-			       ORANGEFS_TYPE_METAFILE, mode);</div><div class='add'>+	fill_default_sys_attrs(new_op-&gt;upcall.req.create.attributes, mode);</div><div class='ctx'> </div><div class='del'>-	strncpy(new_op-&gt;upcall.req.create.d_name,</div><div class='del'>-		dentry-&gt;d_name.name, ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.create.d_name, dentry-&gt;d_name.name);</div><div class='ctx'> </div><div class='ctx'> 	ret = service_operation(new_op, __func__, get_interruptible_flag(dir));</div><div class='ctx'> </div><div class='hunk'>@@ -137,8 +135,7 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		     &amp;parent-&gt;refn.khandle);</div><div class='ctx'> 	new_op-&gt;upcall.req.lookup.parent_refn = parent-&gt;refn;</div><div class='ctx'> </div><div class='del'>-	strncpy(new_op-&gt;upcall.req.lookup.d_name, dentry-&gt;d_name.name,</div><div class='del'>-		ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.lookup.d_name, dentry-&gt;d_name.name);</div><div class='ctx'> </div><div class='ctx'> 	gossip_debug(GOSSIP_NAME_DEBUG,</div><div class='ctx'> 		     "%s: doing lookup on %s under %pU,%d\n",</div><div class='hunk'>@@ -192,8 +189,7 @@ static int orangefs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	new_op-&gt;upcall.req.remove.parent_refn = parent-&gt;refn;</div><div class='del'>-	strncpy(new_op-&gt;upcall.req.remove.d_name, dentry-&gt;d_name.name,</div><div class='del'>-		ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.remove.d_name, dentry-&gt;d_name.name);</div><div class='ctx'> </div><div class='ctx'> 	ret = service_operation(new_op, "orangefs_unlink",</div><div class='ctx'> 				get_interruptible_flag(inode));</div><div class='hunk'>@@ -243,14 +239,10 @@ static int orangefs_symlink(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 	new_op-&gt;upcall.req.sym.parent_refn = parent-&gt;refn;</div><div class='ctx'> </div><div class='del'>-	fill_default_sys_attrs(new_op-&gt;upcall.req.sym.attributes,</div><div class='del'>-			       ORANGEFS_TYPE_SYMLINK,</div><div class='del'>-			       mode);</div><div class='add'>+	fill_default_sys_attrs(new_op-&gt;upcall.req.sym.attributes, mode);</div><div class='ctx'> </div><div class='del'>-	strncpy(new_op-&gt;upcall.req.sym.entry_name,</div><div class='del'>-		dentry-&gt;d_name.name,</div><div class='del'>-		ORANGEFS_NAME_MAX - 1);</div><div class='del'>-	strncpy(new_op-&gt;upcall.req.sym.target, symname, ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.sym.entry_name, dentry-&gt;d_name.name);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.sym.target, symname);</div><div class='ctx'> </div><div class='ctx'> 	ret = service_operation(new_op, __func__, get_interruptible_flag(dir));</div><div class='ctx'> </div><div class='hunk'>@@ -305,8 +297,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int orangefs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			  struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *orangefs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				     struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct orangefs_inode_s *parent = ORANGEFS_I(dir);</div><div class='ctx'> 	struct orangefs_kernel_op_s *new_op;</div><div class='hunk'>@@ -317,15 +309,13 @@ static int orangefs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 	new_op = op_alloc(ORANGEFS_VFS_OP_MKDIR);</div><div class='ctx'> 	if (!new_op)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	new_op-&gt;upcall.req.mkdir.parent_refn = parent-&gt;refn;</div><div class='ctx'> </div><div class='del'>-	fill_default_sys_attrs(new_op-&gt;upcall.req.mkdir.attributes,</div><div class='del'>-			      ORANGEFS_TYPE_DIRECTORY, mode);</div><div class='add'>+	fill_default_sys_attrs(new_op-&gt;upcall.req.mkdir.attributes, mode);</div><div class='ctx'> </div><div class='del'>-	strncpy(new_op-&gt;upcall.req.mkdir.d_name,</div><div class='del'>-		dentry-&gt;d_name.name, ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.mkdir.d_name, dentry-&gt;d_name.name);</div><div class='ctx'> </div><div class='ctx'> 	ret = service_operation(new_op, __func__, get_interruptible_flag(dir));</div><div class='ctx'> </div><div class='hunk'>@@ -372,7 +362,7 @@ static int orangefs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	__orangefs_setattr(dir, &amp;iattr);</div><div class='ctx'> out:</div><div class='ctx'> 	op_release(new_op);</div><div class='del'>-	return ret;</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int orangefs_rename(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -405,12 +395,8 @@ static int orangefs_rename(struct mnt_idmap *idmap,</div><div class='ctx'> 	new_op-&gt;upcall.req.rename.old_parent_refn = ORANGEFS_I(old_dir)-&gt;refn;</div><div class='ctx'> 	new_op-&gt;upcall.req.rename.new_parent_refn = ORANGEFS_I(new_dir)-&gt;refn;</div><div class='ctx'> </div><div class='del'>-	strncpy(new_op-&gt;upcall.req.rename.d_old_name,</div><div class='del'>-		old_dentry-&gt;d_name.name,</div><div class='del'>-		ORANGEFS_NAME_MAX - 1);</div><div class='del'>-	strncpy(new_op-&gt;upcall.req.rename.d_new_name,</div><div class='del'>-		new_dentry-&gt;d_name.name,</div><div class='del'>-		ORANGEFS_NAME_MAX - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.rename.d_old_name, old_dentry-&gt;d_name.name);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.rename.d_new_name, new_dentry-&gt;d_name.name);</div><div class='ctx'> </div><div class='ctx'> 	ret = service_operation(new_op,</div><div class='ctx'> 				"orangefs_rename",</div><div class='head'>diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c<br/>index b501dc07f922..b562d3dbc76b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-bufmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-bufmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-bufmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-bufmap.c</a></div><div class='hunk'>@@ -197,18 +197,6 @@ int orangefs_bufmap_size_query(void)</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int orangefs_bufmap_shift_query(void)</div><div class='del'>-{</div><div class='del'>-	struct orangefs_bufmap *bufmap;</div><div class='del'>-	int shift = 0;</div><div class='del'>-	spin_lock(&amp;orangefs_bufmap_lock);</div><div class='del'>-	bufmap = __orangefs_bufmap;</div><div class='del'>-	if (bufmap)</div><div class='del'>-		shift = bufmap-&gt;desc_shift;</div><div class='del'>-	spin_unlock(&amp;orangefs_bufmap_lock);</div><div class='del'>-	return shift;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(bufmap_waitq);</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(readdir_waitq);</div><div class='ctx'> </div><div class='hunk'>@@ -274,10 +262,8 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap,</div><div class='ctx'> 		gossip_err("orangefs error: asked for %d pages, only got %d.\n",</div><div class='ctx'> 				bufmap-&gt;page_count, ret);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ret; i++) {</div><div class='del'>-			SetPageError(bufmap-&gt;page_array[i]);</div><div class='add'>+		for (i = 0; i &lt; ret; i++)</div><div class='ctx'> 			unpin_user_page(bufmap-&gt;page_array[i]);</div><div class='del'>-		}</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -534,16 +520,3 @@ int orangefs_bufmap_copy_to_iovec(struct iov_iter *iter,</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void orangefs_bufmap_page_fill(void *page_to,</div><div class='del'>-				int buffer_index,</div><div class='del'>-				int slot_index)</div><div class='del'>-{</div><div class='del'>-	struct orangefs_bufmap_desc *from;</div><div class='del'>-	void *page_from;</div><div class='del'>-</div><div class='del'>-	from = &amp;__orangefs_bufmap-&gt;desc_array[buffer_index];</div><div class='del'>-	page_from = kmap_atomic(from-&gt;page_array[slot_index]);</div><div class='del'>-	memcpy(page_to, page_from, PAGE_SIZE);</div><div class='del'>-	kunmap_atomic(page_from);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/orangefs/orangefs-bufmap.h b/fs/orangefs/orangefs-bufmap.h<br/>index 75b2d2833af1..4231175ccdb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-bufmap.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-bufmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-bufmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-bufmap.h</a></div><div class='hunk'>@@ -10,8 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> int orangefs_bufmap_size_query(void);</div><div class='ctx'> </div><div class='del'>-int orangefs_bufmap_shift_query(void);</div><div class='del'>-</div><div class='ctx'> int orangefs_bufmap_initialize(struct ORANGEFS_dev_map_desc *user_desc);</div><div class='ctx'> </div><div class='ctx'> void orangefs_bufmap_finalize(void);</div><div class='hunk'>@@ -34,6 +32,5 @@ int orangefs_bufmap_copy_to_iovec(struct iov_iter *iter,</div><div class='ctx'> 			      int buffer_index,</div><div class='ctx'> 			      size_t size);</div><div class='ctx'> </div><div class='del'>-void orangefs_bufmap_page_fill(void *kaddr, int buffer_index, int slot_index);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ORANGEFS_BUFMAP_H */</div><div class='head'>diff --git a/fs/orangefs/orangefs-cache.c b/fs/orangefs/orangefs-cache.c<br/>index 3b6982bf6bcf..e75e173a9186 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-cache.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-cache.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-cache.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-cache.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@ int op_cache_initialize(void)</div><div class='ctx'> 	op_cache = kmem_cache_create("orangefs_op_cache",</div><div class='ctx'> 				     sizeof(struct orangefs_kernel_op_s),</div><div class='ctx'> 				     0,</div><div class='del'>-				     ORANGEFS_CACHE_CREATE_FLAGS,</div><div class='add'>+				     0,</div><div class='ctx'> 				     NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!op_cache) {</div><div class='head'>diff --git a/fs/orangefs/orangefs-debug.h b/fs/orangefs/orangefs-debug.h<br/>index 6e079d4230d0..d4463534cec6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-debug.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-debug.h</a></div><div class='hunk'>@@ -43,47 +43,4 @@</div><div class='ctx'> #define GOSSIP_MAX_NR                 16</div><div class='ctx'> #define GOSSIP_MAX_DEBUG              (((__u64)1 &lt;&lt; GOSSIP_MAX_NR) - 1)</div><div class='ctx'> </div><div class='del'>-/* a private internal type */</div><div class='del'>-struct __keyword_mask_s {</div><div class='del'>-	const char *keyword;</div><div class='del'>-	__u64 mask_val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Map all kmod keywords to kmod debug masks here. Keep this</div><div class='del'>- * structure "packed":</div><div class='del'>- *</div><div class='del'>- *   "all" is always last...</div><div class='del'>- *</div><div class='del'>- *   keyword     mask_val     index</div><div class='del'>- *     foo          1           0</div><div class='del'>- *     bar          2           1</div><div class='del'>- *     baz          4           2</div><div class='del'>- *     qux          8           3</div><div class='del'>- *      .           .           .</div><div class='del'>- */</div><div class='del'>-static struct __keyword_mask_s s_kmod_keyword_mask_map[] = {</div><div class='del'>-	{"super", GOSSIP_SUPER_DEBUG},</div><div class='del'>-	{"inode", GOSSIP_INODE_DEBUG},</div><div class='del'>-	{"file", GOSSIP_FILE_DEBUG},</div><div class='del'>-	{"dir", GOSSIP_DIR_DEBUG},</div><div class='del'>-	{"utils", GOSSIP_UTILS_DEBUG},</div><div class='del'>-	{"wait", GOSSIP_WAIT_DEBUG},</div><div class='del'>-	{"acl", GOSSIP_ACL_DEBUG},</div><div class='del'>-	{"dcache", GOSSIP_DCACHE_DEBUG},</div><div class='del'>-	{"dev", GOSSIP_DEV_DEBUG},</div><div class='del'>-	{"name", GOSSIP_NAME_DEBUG},</div><div class='del'>-	{"bufmap", GOSSIP_BUFMAP_DEBUG},</div><div class='del'>-	{"cache", GOSSIP_CACHE_DEBUG},</div><div class='del'>-	{"debugfs", GOSSIP_DEBUGFS_DEBUG},</div><div class='del'>-	{"xattr", GOSSIP_XATTR_DEBUG},</div><div class='del'>-	{"init", GOSSIP_INIT_DEBUG},</div><div class='del'>-	{"sysfs", GOSSIP_SYSFS_DEBUG},</div><div class='del'>-	{"none", GOSSIP_NO_DEBUG},</div><div class='del'>-	{"all", GOSSIP_MAX_DEBUG}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int num_kmod_keyword_mask_map = (int)</div><div class='del'>-	(ARRAY_SIZE(s_kmod_keyword_mask_map));</div><div class='del'>-</div><div class='ctx'> #endif /* __ORANGEFS_DEBUG_H */</div><div class='head'>diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c<br/>index 1b508f543384..79267b3419f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-debugfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-debugfs.c</a></div><div class='hunk'>@@ -44,6 +44,49 @@</div><div class='ctx'> #include "protocol.h"</div><div class='ctx'> #include "orangefs-kernel.h"</div><div class='ctx'> </div><div class='add'>+/* a private internal type */</div><div class='add'>+struct __keyword_mask_s {</div><div class='add'>+	const char *keyword;</div><div class='add'>+	__u64 mask_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Map all kmod keywords to kmod debug masks here. Keep this</div><div class='add'>+ * structure "packed":</div><div class='add'>+ *</div><div class='add'>+ *   "all" is always last...</div><div class='add'>+ *</div><div class='add'>+ *   keyword     mask_val     index</div><div class='add'>+ *     foo          1           0</div><div class='add'>+ *     bar          2           1</div><div class='add'>+ *     baz          4           2</div><div class='add'>+ *     qux          8           3</div><div class='add'>+ *      .           .           .</div><div class='add'>+ */</div><div class='add'>+static struct __keyword_mask_s s_kmod_keyword_mask_map[] = {</div><div class='add'>+	{"super", GOSSIP_SUPER_DEBUG},</div><div class='add'>+	{"inode", GOSSIP_INODE_DEBUG},</div><div class='add'>+	{"file", GOSSIP_FILE_DEBUG},</div><div class='add'>+	{"dir", GOSSIP_DIR_DEBUG},</div><div class='add'>+	{"utils", GOSSIP_UTILS_DEBUG},</div><div class='add'>+	{"wait", GOSSIP_WAIT_DEBUG},</div><div class='add'>+	{"acl", GOSSIP_ACL_DEBUG},</div><div class='add'>+	{"dcache", GOSSIP_DCACHE_DEBUG},</div><div class='add'>+	{"dev", GOSSIP_DEV_DEBUG},</div><div class='add'>+	{"name", GOSSIP_NAME_DEBUG},</div><div class='add'>+	{"bufmap", GOSSIP_BUFMAP_DEBUG},</div><div class='add'>+	{"cache", GOSSIP_CACHE_DEBUG},</div><div class='add'>+	{"debugfs", GOSSIP_DEBUGFS_DEBUG},</div><div class='add'>+	{"xattr", GOSSIP_XATTR_DEBUG},</div><div class='add'>+	{"init", GOSSIP_INIT_DEBUG},</div><div class='add'>+	{"sysfs", GOSSIP_SYSFS_DEBUG},</div><div class='add'>+	{"none", GOSSIP_NO_DEBUG},</div><div class='add'>+	{"all", GOSSIP_MAX_DEBUG}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int num_kmod_keyword_mask_map = (int)</div><div class='add'>+	(ARRAY_SIZE(s_kmod_keyword_mask_map));</div><div class='add'>+</div><div class='ctx'> #define DEBUG_HELP_STRING_SIZE 4096</div><div class='ctx'> #define HELP_STRING_UNINITIALIZED \</div><div class='ctx'> 	"Client Debug Keywords are unknown until the first time\n" \</div><div class='hunk'>@@ -206,8 +249,8 @@ static void orangefs_kernel_debug_init(void)</div><div class='ctx'> 		pr_info("%s: overflow 1!\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	debugfs_create_file(ORANGEFS_KMOD_DEBUG_FILE, 0444, debug_dir, k_buffer,</div><div class='del'>-			    &amp;kernel_debug_fops);</div><div class='add'>+	debugfs_create_file_aux_num(ORANGEFS_KMOD_DEBUG_FILE, 0444, debug_dir, k_buffer,</div><div class='add'>+			    0, &amp;kernel_debug_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -306,11 +349,10 @@ static void orangefs_client_debug_init(void)</div><div class='ctx'> 		pr_info("%s: overflow! 2\n", __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	client_debug_dentry = debugfs_create_file(ORANGEFS_CLIENT_DEBUG_FILE,</div><div class='del'>-						  0444,</div><div class='del'>-						  debug_dir,</div><div class='del'>-						  c_buffer,</div><div class='del'>-						  &amp;kernel_debug_fops);</div><div class='add'>+	client_debug_dentry = debugfs_create_file_aux_num(</div><div class='add'>+					  ORANGEFS_CLIENT_DEBUG_FILE,</div><div class='add'>+					  0444, debug_dir, c_buffer, 1,</div><div class='add'>+					  &amp;kernel_debug_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* open ORANGEFS_KMOD_DEBUG_FILE or ORANGEFS_CLIENT_DEBUG_FILE.*/</div><div class='hunk'>@@ -354,7 +396,7 @@ static ssize_t orangefs_debug_read(struct file *file,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;orangefs_debug_lock);</div><div class='del'>-	sprintf_ret = sprintf(buf, "%s", (char *)file-&gt;private_data);</div><div class='add'>+	sprintf_ret = scnprintf(buf, ORANGEFS_MAX_DEBUG_STRING_LEN, "%s", (char *)file-&gt;private_data);</div><div class='ctx'> 	mutex_unlock(&amp;orangefs_debug_lock);</div><div class='ctx'> </div><div class='ctx'> 	read_ret = simple_read_from_buffer(ubuf, count, ppos, buf, sprintf_ret);</div><div class='hunk'>@@ -393,19 +435,18 @@ static ssize_t orangefs_debug_write(struct file *file,</div><div class='ctx'> 	 * Thwart users who try to jamb a ridiculous number</div><div class='ctx'> 	 * of bytes into the debug file...</div><div class='ctx'> 	 */</div><div class='del'>-	if (count &gt; ORANGEFS_MAX_DEBUG_STRING_LEN + 1) {</div><div class='add'>+	if (count &gt; ORANGEFS_MAX_DEBUG_STRING_LEN) {</div><div class='ctx'> 		silly = count;</div><div class='del'>-		count = ORANGEFS_MAX_DEBUG_STRING_LEN + 1;</div><div class='add'>+		count = ORANGEFS_MAX_DEBUG_STRING_LEN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	buf = kzalloc(ORANGEFS_MAX_DEBUG_STRING_LEN, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(buf, ubuf, count - 1)) {</div><div class='add'>+	buf = memdup_user_nul(ubuf, count - 1);</div><div class='add'>+	if (IS_ERR(buf)) {</div><div class='ctx'> 		gossip_debug(GOSSIP_DEBUGFS_DEBUG,</div><div class='del'>-			     "%s: copy_from_user failed!\n",</div><div class='add'>+			     "%s: memdup_user_nul failed!\n",</div><div class='ctx'> 			     __func__);</div><div class='add'>+		rc = PTR_ERR(buf);</div><div class='add'>+		buf = NULL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -418,8 +459,7 @@ static ssize_t orangefs_debug_write(struct file *file,</div><div class='ctx'> 	 * A service operation is required to set a new client-side</div><div class='ctx'> 	 * debug mask.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!strcmp(file-&gt;f_path.dentry-&gt;d_name.name,</div><div class='del'>-		    ORANGEFS_KMOD_DEBUG_FILE)) {</div><div class='add'>+	if (!debugfs_get_aux_num(file)) {	// kernel-debug</div><div class='ctx'> 		debug_string_to_mask(buf, &amp;orangefs_gossip_debug_mask, 0);</div><div class='ctx'> 		debug_mask_to_string(&amp;orangefs_gossip_debug_mask, 0);</div><div class='ctx'> 		debug_string = kernel_debug_string;</div><div class='hunk'>@@ -728,8 +768,8 @@ static void do_k_string(void *k_mask, int index)</div><div class='ctx'> </div><div class='ctx'> 	if (*mask &amp; s_kmod_keyword_mask_map[index].mask_val) {</div><div class='ctx'> 		if ((strlen(kernel_debug_string) +</div><div class='del'>-		     strlen(s_kmod_keyword_mask_map[index].keyword))</div><div class='del'>-			&lt; ORANGEFS_MAX_DEBUG_STRING_LEN - 1) {</div><div class='add'>+		     strlen(s_kmod_keyword_mask_map[index].keyword) + 1)</div><div class='add'>+			&lt; ORANGEFS_MAX_DEBUG_STRING_LEN) {</div><div class='ctx'> 				strcat(kernel_debug_string,</div><div class='ctx'> 				       s_kmod_keyword_mask_map[index].keyword);</div><div class='ctx'> 				strcat(kernel_debug_string, ",");</div><div class='hunk'>@@ -756,7 +796,7 @@ static void do_c_string(void *c_mask, int index)</div><div class='ctx'> 	    (mask-&gt;mask2 &amp; cdm_array[index].mask2)) {</div><div class='ctx'> 		if ((strlen(client_debug_string) +</div><div class='ctx'> 		     strlen(cdm_array[index].keyword) + 1)</div><div class='del'>-			&lt; ORANGEFS_MAX_DEBUG_STRING_LEN - 2) {</div><div class='add'>+			&lt; ORANGEFS_MAX_DEBUG_STRING_LEN) {</div><div class='ctx'> 				strcat(client_debug_string,</div><div class='ctx'> 				       cdm_array[index].keyword);</div><div class='ctx'> 				strcat(client_debug_string, ",");</div><div class='head'>diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h<br/>index 926d9c0a428a..29c6da43e396 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-kernel.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-kernel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-kernel.h</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/aio.h&gt;</div><div class='hunk'>@@ -53,7 +55,7 @@</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/hashtable.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "orangefs-dev-proto.h"</div><div class='ctx'> </div><div class='hunk'>@@ -93,16 +95,6 @@ enum orangefs_vfs_op_states {</div><div class='ctx'> 	OP_VFS_STATE_GIVEN_UP = 16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * orangefs kernel memory related flags</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if (defined CONFIG_DEBUG_SLAB)</div><div class='del'>-#define ORANGEFS_CACHE_CREATE_FLAGS SLAB_RED_ZONE</div><div class='del'>-#else</div><div class='del'>-#define ORANGEFS_CACHE_CREATE_FLAGS 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern const struct xattr_handler * const orangefs_xattr_handlers[];</div><div class='ctx'> </div><div class='ctx'> extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type, bool rcu);</div><div class='hunk'>@@ -338,11 +330,9 @@ void purge_waiting_ops(void);</div><div class='ctx'>  * defined in super.c</div><div class='ctx'>  */</div><div class='ctx'> extern uint64_t orangefs_features;</div><div class='add'>+extern const struct fs_parameter_spec orangefs_fs_param_spec[];</div><div class='ctx'> </div><div class='del'>-struct dentry *orangefs_mount(struct file_system_type *fst,</div><div class='del'>-			   int flags,</div><div class='del'>-			   const char *devname,</div><div class='del'>-			   void *data);</div><div class='add'>+int orangefs_init_fs_context(struct fs_context *fc);</div><div class='ctx'> </div><div class='ctx'> void orangefs_kill_sb(struct super_block *sb);</div><div class='ctx'> int orangefs_remount(struct orangefs_sb_info_s *);</div><div class='hunk'>@@ -472,7 +462,7 @@ int service_operation(struct orangefs_kernel_op_s *op,</div><div class='ctx'> 	((ORANGEFS_SB(inode-&gt;i_sb)-&gt;flags &amp; ORANGEFS_OPT_INTR) ? \</div><div class='ctx'> 		ORANGEFS_OP_INTERRUPTIBLE : 0)</div><div class='ctx'> </div><div class='del'>-#define fill_default_sys_attrs(sys_attr, type, mode)			\</div><div class='add'>+#define fill_default_sys_attrs(sys_attr, mode)			\</div><div class='ctx'> do {									\</div><div class='ctx'> 	sys_attr.owner = from_kuid(&amp;init_user_ns, current_fsuid()); \</div><div class='ctx'> 	sys_attr.group = from_kgid(&amp;init_user_ns, current_fsgid()); \</div><div class='head'>diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c<br/>index 5ab741c60b7e..7ac16a4d2dc6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-mod.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-mod.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-mod.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-mod.c</a></div><div class='hunk'>@@ -46,7 +46,8 @@ MODULE_PARM_DESC(hash_table_size,</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type orangefs_fs_type = {</div><div class='ctx'> 	.name = "pvfs2",</div><div class='del'>-	.mount = orangefs_mount,</div><div class='add'>+	.init_fs_context = orangefs_init_fs_context,</div><div class='add'>+	.parameters = orangefs_fs_param_spec,</div><div class='ctx'> 	.kill_sb = orangefs_kill_sb,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/orangefs/orangefs-sysfs.c b/fs/orangefs/orangefs-sysfs.c<br/>index be4ba03a01a0..369455b354ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-sysfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-sysfs.c</a></div><div class='hunk'>@@ -217,36 +217,31 @@ static ssize_t sysfs_int_show(struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(kobj-&gt;name, ORANGEFS_KOBJ_ID)) {</div><div class='ctx'> 		if (!strcmp(attr-&gt;attr.name, "op_timeout_secs")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%d\n",</div><div class='ctx'> 				       op_timeout_secs);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (!strcmp(attr-&gt;attr.name,</div><div class='ctx'> 				   "slot_timeout_secs")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%d\n",</div><div class='ctx'> 				       slot_timeout_secs);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (!strcmp(attr-&gt;attr.name,</div><div class='ctx'> 				   "cache_timeout_msecs")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%d\n",</div><div class='ctx'> 				       orangefs_cache_timeout_msecs);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (!strcmp(attr-&gt;attr.name,</div><div class='ctx'> 				   "dcache_timeout_msecs")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%d\n",</div><div class='ctx'> 				       orangefs_dcache_timeout_msecs);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (!strcmp(attr-&gt;attr.name,</div><div class='ctx'> 				   "getattr_timeout_msecs")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%d\n",</div><div class='ctx'> 				       orangefs_getattr_timeout_msecs);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -256,14 +251,12 @@ static ssize_t sysfs_int_show(struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> 	} else if (!strcmp(kobj-&gt;name, STATS_KOBJ_ID)) {</div><div class='ctx'> 		if (!strcmp(attr-&gt;attr.name, "reads")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%lu\n",</div><div class='ctx'> 				       orangefs_stats.reads);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		} else if (!strcmp(attr-&gt;attr.name, "writes")) {</div><div class='del'>-			rc = scnprintf(buf,</div><div class='del'>-				       PAGE_SIZE,</div><div class='add'>+			rc = sysfs_emit(buf,</div><div class='ctx'> 				       "%lu\n",</div><div class='ctx'> 				       orangefs_stats.writes);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -497,19 +490,18 @@ out:</div><div class='ctx'> 		if (strcmp(kobj-&gt;name, PC_KOBJ_ID)) {</div><div class='ctx'> 			if (new_op-&gt;upcall.req.param.op ==</div><div class='ctx'> 			    ORANGEFS_PARAM_REQUEST_OP_READAHEAD_COUNT_SIZE) {</div><div class='del'>-				rc = scnprintf(buf, PAGE_SIZE, "%d %d\n",</div><div class='add'>+				rc = sysfs_emit(buf, "%d %d\n",</div><div class='ctx'> 				    (int)new_op-&gt;downcall.resp.param.u.</div><div class='ctx'> 				    value32[0],</div><div class='ctx'> 				    (int)new_op-&gt;downcall.resp.param.u.</div><div class='ctx'> 				    value32[1]);</div><div class='ctx'> 			} else {</div><div class='del'>-				rc = scnprintf(buf, PAGE_SIZE, "%d\n",</div><div class='add'>+				rc = sysfs_emit(buf, "%d\n",</div><div class='ctx'> 				    (int)new_op-&gt;downcall.resp.param.u.value64);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			rc = scnprintf(</div><div class='add'>+			rc = sysfs_emit(</div><div class='ctx'> 				buf,</div><div class='del'>-				PAGE_SIZE,</div><div class='ctx'> 				"%s",</div><div class='ctx'> 				new_op-&gt;downcall.resp.perf_count.buffer);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -904,7 +896,7 @@ static void orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type orangefs_ktype = {</div><div class='add'>+static const struct kobj_type orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = orangefs_default_groups,</div><div class='ctx'> 	.release = orangefs_obj_release,</div><div class='hunk'>@@ -951,7 +943,7 @@ static void acache_orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	acache_orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type acache_orangefs_ktype = {</div><div class='add'>+static const struct kobj_type acache_orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = acache_orangefs_default_groups,</div><div class='ctx'> 	.release = acache_orangefs_obj_release,</div><div class='hunk'>@@ -998,7 +990,7 @@ static void capcache_orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	capcache_orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type capcache_orangefs_ktype = {</div><div class='add'>+static const struct kobj_type capcache_orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = capcache_orangefs_default_groups,</div><div class='ctx'> 	.release = capcache_orangefs_obj_release,</div><div class='hunk'>@@ -1045,7 +1037,7 @@ static void ccache_orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	ccache_orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type ccache_orangefs_ktype = {</div><div class='add'>+static const struct kobj_type ccache_orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = ccache_orangefs_default_groups,</div><div class='ctx'> 	.release = ccache_orangefs_obj_release,</div><div class='hunk'>@@ -1092,7 +1084,7 @@ static void ncache_orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	ncache_orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type ncache_orangefs_ktype = {</div><div class='add'>+static const struct kobj_type ncache_orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = ncache_orangefs_default_groups,</div><div class='ctx'> 	.release = ncache_orangefs_obj_release,</div><div class='hunk'>@@ -1132,7 +1124,7 @@ static void pc_orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	pc_orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type pc_orangefs_ktype = {</div><div class='add'>+static const struct kobj_type pc_orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = pc_orangefs_default_groups,</div><div class='ctx'> 	.release = pc_orangefs_obj_release,</div><div class='hunk'>@@ -1165,7 +1157,7 @@ static void stats_orangefs_obj_release(struct kobject *kobj)</div><div class='ctx'> 	stats_orangefs_obj = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct kobj_type stats_orangefs_ktype = {</div><div class='add'>+static const struct kobj_type stats_orangefs_ktype = {</div><div class='ctx'> 	.sysfs_ops = &amp;orangefs_sysfs_ops,</div><div class='ctx'> 	.default_groups = stats_orangefs_default_groups,</div><div class='ctx'> 	.release = stats_orangefs_obj_release,</div><div class='head'>diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c<br/>index 0fdceb00ca07..9ab1119ebd28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-utils.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/orangefs-utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/orangefs-utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/orangefs-utils.c</a></div><div class='hunk'>@@ -247,7 +247,7 @@ again:</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	/* Must have all the attributes in the mask and be within cache time. */</div><div class='ctx'> 	if ((!flags &amp;&amp; time_before(jiffies, orangefs_inode-&gt;getattr_time)) ||</div><div class='del'>-	    orangefs_inode-&gt;attr_valid || inode-&gt;i_state &amp; I_DIRTY_PAGES) {</div><div class='add'>+	    orangefs_inode-&gt;attr_valid || inode_state_read(inode) &amp; I_DIRTY_PAGES) {</div><div class='ctx'> 		if (orangefs_inode-&gt;attr_valid) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			write_inode_now(inode, 1);</div><div class='hunk'>@@ -281,13 +281,13 @@ again2:</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	/* Must have all the attributes in the mask and be within cache time. */</div><div class='ctx'> 	if ((!flags &amp;&amp; time_before(jiffies, orangefs_inode-&gt;getattr_time)) ||</div><div class='del'>-	    orangefs_inode-&gt;attr_valid || inode-&gt;i_state &amp; I_DIRTY_PAGES) {</div><div class='add'>+	    orangefs_inode-&gt;attr_valid || inode_state_read(inode) &amp; I_DIRTY_PAGES) {</div><div class='ctx'> 		if (orangefs_inode-&gt;attr_valid) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			write_inode_now(inode, 1);</div><div class='ctx'> 			goto again2;</div><div class='ctx'> 		}</div><div class='del'>-		if (inode-&gt;i_state &amp; I_DIRTY_PAGES) {</div><div class='add'>+		if (inode_state_read(inode) &amp; I_DIRTY_PAGES) {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c<br/>index 5254256a224d..b46100a4f529 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/super.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #include "orangefs-kernel.h"</div><div class='ctx'> #include "orangefs-bufmap.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/hashtable.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,18 +21,16 @@ LIST_HEAD(orangefs_superblocks);</div><div class='ctx'> DEFINE_SPINLOCK(orangefs_superblocks_lock);</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_intr,</div><div class='ctx'> 	Opt_acl,</div><div class='add'>+	Opt_intr,</div><div class='ctx'> 	Opt_local_lock,</div><div class='del'>-</div><div class='del'>-	Opt_err</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{ Opt_acl,		"acl" },</div><div class='del'>-	{ Opt_intr,		"intr" },</div><div class='del'>-	{ Opt_local_lock,	"local_lock" },</div><div class='del'>-	{ Opt_err,	NULL }</div><div class='add'>+const struct fs_parameter_spec orangefs_fs_param_spec[] = {</div><div class='add'>+	fsparam_flag	("acl",			Opt_acl),</div><div class='add'>+	fsparam_flag	("intr",		Opt_intr),</div><div class='add'>+	fsparam_flag	("local_lock",		Opt_local_lock),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> uint64_t orangefs_features;</div><div class='hunk'>@@ -51,48 +48,30 @@ static int orangefs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int parse_mount_options(struct super_block *sb, char *options,</div><div class='del'>-		int silent)</div><div class='add'>+static int orangefs_parse_param(struct fs_context *fc,</div><div class='add'>+		struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	struct orangefs_sb_info_s *orangefs_sb = ORANGEFS_SB(sb);</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Force any potential flags that might be set from the mount</div><div class='del'>-	 * to zero, ie, initialize to unset.</div><div class='del'>-	 */</div><div class='del'>-	sb-&gt;s_flags &amp;= ~SB_POSIXACL;</div><div class='del'>-	orangefs_sb-&gt;flags &amp;= ~ORANGEFS_OPT_INTR;</div><div class='del'>-	orangefs_sb-&gt;flags &amp;= ~ORANGEFS_OPT_LOCAL_LOCK;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_acl:</div><div class='del'>-			sb-&gt;s_flags |= SB_POSIXACL;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_intr:</div><div class='del'>-			orangefs_sb-&gt;flags |= ORANGEFS_OPT_INTR;</div><div class='del'>-			break;</div><div class='del'>-		case Opt_local_lock:</div><div class='del'>-			orangefs_sb-&gt;flags |= ORANGEFS_OPT_LOCAL_LOCK;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='add'>+	struct orangefs_sb_info_s *orangefs_sb = fc-&gt;s_fs_info;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, orangefs_fs_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_acl:</div><div class='add'>+		fc-&gt;sb_flags |= SB_POSIXACL;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_intr:</div><div class='add'>+		orangefs_sb-&gt;flags |= ORANGEFS_OPT_INTR;</div><div class='add'>+		break;</div><div class='add'>+	case Opt_local_lock:</div><div class='add'>+		orangefs_sb-&gt;flags |= ORANGEFS_OPT_LOCAL_LOCK;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-fail:</div><div class='del'>-	if (!silent)</div><div class='del'>-		gossip_err("Error: mount option [%s] is not supported.\n", p);</div><div class='del'>-	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void orangefs_inode_cache_ctor(void *req)</div><div class='hunk'>@@ -201,7 +180,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> 		     (long)new_op-&gt;downcall.resp.statfs.files_avail);</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type = sb-&gt;s_magic;</div><div class='del'>-	memcpy(&amp;buf-&gt;f_fsid, &amp;ORANGEFS_SB(sb)-&gt;fs_id, sizeof(buf-&gt;f_fsid));</div><div class='add'>+	buf-&gt;f_fsid.val[0] = ORANGEFS_SB(sb)-&gt;fs_id;</div><div class='add'>+	buf-&gt;f_fsid.val[1] = ORANGEFS_SB(sb)-&gt;id;</div><div class='ctx'> 	buf-&gt;f_bsize = new_op-&gt;downcall.resp.statfs.block_size;</div><div class='ctx'> 	buf-&gt;f_namelen = ORANGEFS_NAME_MAX;</div><div class='ctx'> </div><div class='hunk'>@@ -222,10 +202,20 @@ out_op_release:</div><div class='ctx'>  * Remount as initiated by VFS layer.  We just need to reparse the mount</div><div class='ctx'>  * options, no need to signal pvfs2-client-core about it.</div><div class='ctx'>  */</div><div class='del'>-static int orangefs_remount_fs(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int orangefs_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	gossip_debug(GOSSIP_SUPER_DEBUG, "orangefs_remount_fs: called\n");</div><div class='del'>-	return parse_mount_options(sb, data, 1);</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+	struct orangefs_sb_info_s *orangefs_sb = ORANGEFS_SB(sb);</div><div class='add'>+	struct orangefs_sb_info_s *revised = fc-&gt;s_fs_info;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+</div><div class='add'>+	flags = orangefs_sb-&gt;flags;</div><div class='add'>+	flags &amp;= ~(ORANGEFS_OPT_INTR | ORANGEFS_OPT_LOCAL_LOCK);</div><div class='add'>+	flags |= revised-&gt;flags;</div><div class='add'>+	WRITE_ONCE(orangefs_sb-&gt;flags, flags);</div><div class='add'>+</div><div class='add'>+	gossip_debug(GOSSIP_SUPER_DEBUG, "orangefs_reconfigure: called\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -253,9 +243,8 @@ int orangefs_remount(struct orangefs_sb_info_s *orangefs_sb)</div><div class='ctx'> 	new_op = op_alloc(ORANGEFS_VFS_OP_FS_MOUNT);</div><div class='ctx'> 	if (!new_op)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	strncpy(new_op-&gt;upcall.req.fs_mount.orangefs_config_server,</div><div class='del'>-		orangefs_sb-&gt;devname,</div><div class='del'>-		ORANGEFS_MAX_SERVER_ADDR_LEN);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.fs_mount.orangefs_config_server,</div><div class='add'>+		orangefs_sb-&gt;devname);</div><div class='ctx'> </div><div class='ctx'> 	gossip_debug(GOSSIP_SUPER_DEBUG,</div><div class='ctx'> 		     "Attempting ORANGEFS Remount via host %s\n",</div><div class='hunk'>@@ -317,9 +306,8 @@ static const struct super_operations orangefs_s_ops = {</div><div class='ctx'> 	.free_inode = orangefs_free_inode,</div><div class='ctx'> 	.destroy_inode = orangefs_destroy_inode,</div><div class='ctx'> 	.write_inode = orangefs_write_inode,</div><div class='del'>-	.drop_inode = generic_delete_inode,</div><div class='add'>+	.drop_inode = inode_just_drop,</div><div class='ctx'> 	.statfs = orangefs_statfs,</div><div class='del'>-	.remount_fs = orangefs_remount_fs,</div><div class='ctx'> 	.show_options = orangefs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -400,8 +388,7 @@ static int orangefs_unmount(int id, __s32 fs_id, const char *devname)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	op-&gt;upcall.req.fs_umount.id = id;</div><div class='ctx'> 	op-&gt;upcall.req.fs_umount.fs_id = fs_id;</div><div class='del'>-	strncpy(op-&gt;upcall.req.fs_umount.orangefs_config_server,</div><div class='del'>-	    devname, ORANGEFS_MAX_SERVER_ADDR_LEN - 1);</div><div class='add'>+	strscpy(op-&gt;upcall.req.fs_umount.orangefs_config_server, devname);</div><div class='ctx'> 	r = service_operation(op, "orangefs_fs_umount", 0);</div><div class='ctx'> 	/* Not much to do about an error here. */</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -411,8 +398,8 @@ static int orangefs_unmount(int id, __s32 fs_id, const char *devname)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int orangefs_fill_sb(struct super_block *sb,</div><div class='del'>-		struct orangefs_fs_mount_response *fs_mount,</div><div class='del'>-		void *data, int silent)</div><div class='add'>+			    struct fs_context *fc,</div><div class='add'>+			    struct orangefs_fs_mount_response *fs_mount)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct inode *root;</div><div class='hunk'>@@ -425,17 +412,11 @@ static int orangefs_fill_sb(struct super_block *sb,</div><div class='ctx'> 	ORANGEFS_SB(sb)-&gt;fs_id = fs_mount-&gt;fs_id;</div><div class='ctx'> 	ORANGEFS_SB(sb)-&gt;id = fs_mount-&gt;id;</div><div class='ctx'> </div><div class='del'>-	if (data) {</div><div class='del'>-		ret = parse_mount_options(sb, data, silent);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Hang the xattr handlers off the superblock */</div><div class='ctx'> 	sb-&gt;s_xattr = orangefs_xattr_handlers;</div><div class='ctx'> 	sb-&gt;s_magic = ORANGEFS_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op = &amp;orangefs_s_ops;</div><div class='del'>-	sb-&gt;s_d_op = &amp;orangefs_dentry_operations;</div><div class='add'>+	set_default_d_op(sb, &amp;orangefs_dentry_operations);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_blocksize = PAGE_SIZE;</div><div class='ctx'> 	sb-&gt;s_blocksize_bits = PAGE_SHIFT;</div><div class='hunk'>@@ -471,32 +452,24 @@ static int orangefs_fill_sb(struct super_block *sb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *orangefs_mount(struct file_system_type *fst,</div><div class='del'>-			   int flags,</div><div class='del'>-			   const char *devname,</div><div class='del'>-			   void *data)</div><div class='add'>+static int orangefs_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct super_block *sb = ERR_PTR(-EINVAL);</div><div class='ctx'> 	struct orangefs_kernel_op_s *new_op;</div><div class='del'>-	struct dentry *d = ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	if (!fc-&gt;source)</div><div class='add'>+		return invalf(fc, "Device name not specified.\n");</div><div class='ctx'> </div><div class='ctx'> 	gossip_debug(GOSSIP_SUPER_DEBUG,</div><div class='ctx'> 		     "orangefs_mount: called with devname %s\n",</div><div class='del'>-		     devname);</div><div class='del'>-</div><div class='del'>-	if (!devname) {</div><div class='del'>-		gossip_err("ERROR: device name not specified.\n");</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='add'>+		     fc-&gt;source);</div><div class='ctx'> </div><div class='ctx'> 	new_op = op_alloc(ORANGEFS_VFS_OP_FS_MOUNT);</div><div class='ctx'> 	if (!new_op)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	strncpy(new_op-&gt;upcall.req.fs_mount.orangefs_config_server,</div><div class='del'>-		devname,</div><div class='del'>-		ORANGEFS_MAX_SERVER_ADDR_LEN - 1);</div><div class='add'>+	strscpy(new_op-&gt;upcall.req.fs_mount.orangefs_config_server, fc-&gt;source);</div><div class='ctx'> </div><div class='ctx'> 	gossip_debug(GOSSIP_SUPER_DEBUG,</div><div class='ctx'> 		     "Attempting ORANGEFS Mount via host %s\n",</div><div class='hunk'>@@ -514,38 +487,27 @@ struct dentry *orangefs_mount(struct file_system_type *fst,</div><div class='ctx'> 		goto free_op;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sb = sget(fst, NULL, set_anon_super, flags, NULL);</div><div class='add'>+	sb = sget_fc(fc, NULL, set_anon_super_fc);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(sb)) {</div><div class='del'>-		d = ERR_CAST(sb);</div><div class='add'>+		ret = PTR_ERR(sb);</div><div class='ctx'> 		orangefs_unmount(new_op-&gt;downcall.resp.fs_mount.id,</div><div class='del'>-		    new_op-&gt;downcall.resp.fs_mount.fs_id, devname);</div><div class='add'>+				 new_op-&gt;downcall.resp.fs_mount.fs_id,</div><div class='add'>+				 fc-&gt;source);</div><div class='ctx'> 		goto free_op;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* alloc and init our private orangefs sb info */</div><div class='del'>-	sb-&gt;s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);</div><div class='del'>-	if (!ORANGEFS_SB(sb)) {</div><div class='del'>-		d = ERR_PTR(-ENOMEM);</div><div class='del'>-		goto free_sb_and_op;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = orangefs_fill_sb(sb,</div><div class='del'>-	      &amp;new_op-&gt;downcall.resp.fs_mount, data,</div><div class='del'>-	      flags &amp; SB_SILENT ? 1 : 0);</div><div class='add'>+	/* init our private orangefs sb info */</div><div class='add'>+	ret = orangefs_fill_sb(sb, fc, &amp;new_op-&gt;downcall.resp.fs_mount);</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		d = ERR_PTR(ret);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto free_sb_and_op;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * on successful mount, store the devname and data</div><div class='ctx'> 	 * used</div><div class='ctx'> 	 */</div><div class='del'>-	strncpy(ORANGEFS_SB(sb)-&gt;devname,</div><div class='del'>-		devname,</div><div class='del'>-		ORANGEFS_MAX_SERVER_ADDR_LEN - 1);</div><div class='add'>+	strscpy(ORANGEFS_SB(sb)-&gt;devname, fc-&gt;source);</div><div class='ctx'> </div><div class='ctx'> 	/* mount_pending must be cleared */</div><div class='ctx'> 	ORANGEFS_SB(sb)-&gt;mount_pending = 0;</div><div class='hunk'>@@ -568,7 +530,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst,</div><div class='ctx'> 	if (orangefs_userspace_version &gt;= 20906) {</div><div class='ctx'> 		new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES);</div><div class='ctx'> 		if (!new_op)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		new_op-&gt;upcall.req.features.features = 0;</div><div class='ctx'> 		ret = service_operation(new_op, "orangefs_features", 0);</div><div class='ctx'> 		orangefs_features = new_op-&gt;downcall.resp.features.features;</div><div class='hunk'>@@ -577,7 +539,8 @@ struct dentry *orangefs_mount(struct file_system_type *fst,</div><div class='ctx'> 		orangefs_features = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return dget(sb-&gt;s_root);</div><div class='add'>+	fc-&gt;root = dget(sb-&gt;s_root);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> free_sb_and_op:</div><div class='ctx'> 	/* Will call orangefs_kill_sb with sb not in list. */</div><div class='hunk'>@@ -593,7 +556,43 @@ free_op:</div><div class='ctx'> </div><div class='ctx'> 	op_release(new_op);</div><div class='ctx'> </div><div class='del'>-	return d;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void orangefs_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;s_fs_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations orangefs_context_ops = {</div><div class='add'>+	.free		= orangefs_free_fc,</div><div class='add'>+	.parse_param	= orangefs_parse_param,</div><div class='add'>+	.get_tree	= orangefs_get_tree,</div><div class='add'>+	.reconfigure	= orangefs_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up the filesystem mount context.</div><div class='add'>+ */</div><div class='add'>+int orangefs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct orangefs_sb_info_s *osi;</div><div class='add'>+</div><div class='add'>+	osi = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);</div><div class='add'>+	if (!osi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force any potential flags that might be set from the mount</div><div class='add'>+	 * to zero, ie, initialize to unset.</div><div class='add'>+	 */</div><div class='add'>+	fc-&gt;sb_flags_mask &amp;= ~SB_POSIXACL;</div><div class='add'>+	osi-&gt;flags &amp;= ~ORANGEFS_OPT_INTR;</div><div class='add'>+	osi-&gt;flags &amp;= ~ORANGEFS_OPT_LOCAL_LOCK;</div><div class='add'>+</div><div class='add'>+	fc-&gt;s_fs_info = osi;</div><div class='add'>+	fc-&gt;ops = &amp;orangefs_context_ops;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void orangefs_kill_sb(struct super_block *sb)</div><div class='hunk'>@@ -644,7 +643,7 @@ int orangefs_inode_cache_initialize(void)</div><div class='ctx'> 					"orangefs_inode_cache",</div><div class='ctx'> 					sizeof(struct orangefs_inode_s),</div><div class='ctx'> 					0,</div><div class='del'>-					ORANGEFS_CACHE_CREATE_FLAGS,</div><div class='add'>+					0,</div><div class='ctx'> 					offsetof(struct orangefs_inode_s,</div><div class='ctx'> 						link_target),</div><div class='ctx'> 					sizeof_field(struct orangefs_inode_s,</div><div class='head'>diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c<br/>index 74ef75586f38..eee3c5ed1bbb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/orangefs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/orangefs/xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/orangefs/xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/orangefs/xattr.c</a></div><div class='hunk'>@@ -54,7 +54,9 @@ static inline int convert_to_internal_xattr_flags(int setxattr_flags)</div><div class='ctx'> static unsigned int xattr_key(const char *key)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i = 0;</div><div class='del'>-	while (key)</div><div class='add'>+	if (!key)</div><div class='add'>+		return 0;</div><div class='add'>+	while (*key)</div><div class='ctx'> 		i += *key++;</div><div class='ctx'> 	return i % 16;</div><div class='ctx'> }</div><div class='hunk'>@@ -175,8 +177,8 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *name,</div><div class='ctx'> 				cx-&gt;length = -1;</div><div class='ctx'> 				cx-&gt;timeout = jiffies +</div><div class='ctx'> 				    orangefs_getattr_timeout_msecs*HZ/1000;</div><div class='del'>-				hash_add(orangefs_inode-&gt;xattr_cache, &amp;cx-&gt;node,</div><div class='del'>-				    xattr_key(cx-&gt;key));</div><div class='add'>+				hlist_add_head( &amp;cx-&gt;node,</div><div class='add'>+                                   &amp;orangefs_inode-&gt;xattr_cache[xattr_key(cx-&gt;key)]);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out_release_op;</div><div class='hunk'>@@ -229,8 +231,8 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *name,</div><div class='ctx'> 			memcpy(cx-&gt;val, buffer, length);</div><div class='ctx'> 			cx-&gt;length = length;</div><div class='ctx'> 			cx-&gt;timeout = jiffies + HZ;</div><div class='del'>-			hash_add(orangefs_inode-&gt;xattr_cache, &amp;cx-&gt;node,</div><div class='del'>-			    xattr_key(cx-&gt;key));</div><div class='add'>+			hlist_add_head(&amp;cx-&gt;node,</div><div class='add'>+				&amp;orangefs_inode-&gt;xattr_cache[xattr_key(cx-&gt;key)]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c<br/>index b8e25ca51016..758611ee4475 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/copy_up.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/copy_up.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/copy_up.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/copy_up.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include "overlayfs.h"</div><div class='hunk'>@@ -114,13 +113,13 @@ int ovl_copy_xattr(struct super_block *sb, const struct path *oldpath, struct de</div><div class='ctx'> 		if (ovl_is_private_xattr(sb, name))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		error = security_inode_copy_up_xattr(name);</div><div class='del'>-		if (error &lt; 0 &amp;&amp; error != -EOPNOTSUPP)</div><div class='del'>-			break;</div><div class='del'>-		if (error == 1) {</div><div class='add'>+		error = security_inode_copy_up_xattr(old, name);</div><div class='add'>+		if (error == -ECANCELED) {</div><div class='ctx'> 			error = 0;</div><div class='ctx'> 			continue; /* Discard */</div><div class='ctx'> 		}</div><div class='add'>+		if (error &lt; 0 &amp;&amp; error != -EOPNOTSUPP)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		if (is_posix_acl_xattr(name)) {</div><div class='ctx'> 			error = ovl_copy_acl(OVL_FS(sb), oldpath, new, name);</div><div class='hunk'>@@ -172,8 +171,8 @@ out:</div><div class='ctx'> static int ovl_copy_fileattr(struct inode *inode, const struct path *old,</div><div class='ctx'> 			     const struct path *new)</div><div class='ctx'> {</div><div class='del'>-	struct fileattr oldfa = { .flags_valid = true };</div><div class='del'>-	struct fileattr newfa = { .flags_valid = true };</div><div class='add'>+	struct file_kattr oldfa = { .flags_valid = true };</div><div class='add'>+	struct file_kattr newfa = { .flags_valid = true };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = ovl_real_fileattr_get(old, &amp;oldfa);</div><div class='hunk'>@@ -234,17 +233,33 @@ static int ovl_verify_area(loff_t pos, loff_t pos2, loff_t len, loff_t totlen)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t tmp;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON_ONCE(pos != pos2))</div><div class='add'>+	if (pos != pos2)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (WARN_ON_ONCE(pos &lt; 0 || len &lt; 0 || totlen &lt; 0))</div><div class='add'>+	if (pos &lt; 0 || len &lt; 0 || totlen &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (WARN_ON_ONCE(check_add_overflow(pos, len, &amp;tmp)))</div><div class='add'>+	if (check_add_overflow(pos, len, &amp;tmp))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ovl_sync_file(const struct path *path)</div><div class='add'>+{</div><div class='add'>+	struct file *new_file;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	new_file = ovl_path_open(path, O_LARGEFILE | O_RDONLY);</div><div class='add'>+	if (IS_ERR(new_file))</div><div class='add'>+		return PTR_ERR(new_file);</div><div class='add'>+</div><div class='add'>+	err = vfs_fsync(new_file, 0);</div><div class='add'>+	fput(new_file);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ovl_copy_up_file(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='del'>-			    struct file *new_file, loff_t len)</div><div class='add'>+			    struct file *new_file, loff_t len,</div><div class='add'>+			    bool datasync)</div><div class='ctx'> {</div><div class='ctx'> 	struct path datapath;</div><div class='ctx'> 	struct file *old_file;</div><div class='hunk'>@@ -265,20 +280,18 @@ static int ovl_copy_up_file(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='ctx'> 	if (IS_ERR(old_file))</div><div class='ctx'> 		return PTR_ERR(old_file);</div><div class='ctx'> </div><div class='add'>+	/* Try to use clone_file_range to clone up within the same fs */</div><div class='add'>+	cloned = vfs_clone_file_range(old_file, 0, new_file, 0, len, 0);</div><div class='add'>+	if (cloned == len)</div><div class='add'>+		goto out_fput;</div><div class='add'>+</div><div class='add'>+	/* Couldn't clone, so now we try to copy the data */</div><div class='ctx'> 	error = rw_verify_area(READ, old_file, &amp;old_pos, len);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = rw_verify_area(WRITE, new_file, &amp;new_pos, len);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_fput;</div><div class='ctx'> </div><div class='del'>-	/* Try to use clone_file_range to clone up within the same fs */</div><div class='del'>-	ovl_start_write(dentry);</div><div class='del'>-	cloned = do_clone_file_range(old_file, 0, new_file, 0, len, 0);</div><div class='del'>-	ovl_end_write(dentry);</div><div class='del'>-	if (cloned == len)</div><div class='del'>-		goto out_fput;</div><div class='del'>-	/* Couldn't clone, so now we try to copy the data */</div><div class='del'>-</div><div class='ctx'> 	/* Check if lower fs supports seek operation */</div><div class='ctx'> 	if (old_file-&gt;f_mode &amp; FMODE_LSEEK)</div><div class='ctx'> 		skip_hole = true;</div><div class='hunk'>@@ -344,7 +357,8 @@ static int ovl_copy_up_file(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> 		len -= bytes;</div><div class='ctx'> 	}</div><div class='del'>-	if (!error &amp;&amp; ovl_should_sync(ofs))</div><div class='add'>+	/* call fsync once, either now or later along with metadata */</div><div class='add'>+	if (!error &amp;&amp; ovl_should_sync(ofs) &amp;&amp; datasync)</div><div class='ctx'> 		error = vfs_fsync(new_file, 0);</div><div class='ctx'> out_fput:</div><div class='ctx'> 	fput(old_file);</div><div class='hunk'>@@ -401,13 +415,13 @@ int ovl_set_attr(struct ovl_fs *ofs, struct dentry *upperdentry,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,</div><div class='add'>+struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct inode *realinode,</div><div class='ctx'> 				  bool is_upper)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fh *fh;</div><div class='ctx'> 	int fh_type, dwords;</div><div class='ctx'> 	int buflen = MAX_HANDLE_SZ;</div><div class='del'>-	uuid_t *uuid = &amp;real-&gt;d_sb-&gt;s_uuid;</div><div class='add'>+	uuid_t *uuid = &amp;realinode-&gt;i_sb-&gt;s_uuid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the real fid stays 32bit aligned */</div><div class='hunk'>@@ -424,13 +438,13 @@ struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,</div><div class='ctx'> 	 * the price or reconnecting the dentry.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dwords = buflen &gt;&gt; 2;</div><div class='del'>-	fh_type = exportfs_encode_fh(real, (void *)fh-&gt;fb.fid, &amp;dwords, 0);</div><div class='add'>+	fh_type = exportfs_encode_inode_fh(realinode, (void *)fh-&gt;fb.fid,</div><div class='add'>+					   &amp;dwords, NULL, 0);</div><div class='ctx'> 	buflen = (dwords &lt;&lt; 2);</div><div class='ctx'> </div><div class='ctx'> 	err = -EIO;</div><div class='del'>-	if (WARN_ON(fh_type &lt; 0) ||</div><div class='del'>-	    WARN_ON(buflen &gt; MAX_HANDLE_SZ) ||</div><div class='del'>-	    WARN_ON(fh_type == FILEID_INVALID))</div><div class='add'>+	if (fh_type &lt; 0 || fh_type == FILEID_INVALID ||</div><div class='add'>+	    WARN_ON(buflen &gt; MAX_HANDLE_SZ))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	fh-&gt;fb.version = OVL_FH_VERSION;</div><div class='hunk'>@@ -466,7 +480,7 @@ struct ovl_fh *ovl_get_origin_fh(struct ovl_fs *ofs, struct dentry *origin)</div><div class='ctx'> 	if (!ovl_can_decode_fh(origin-&gt;d_sb))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return ovl_encode_real_fh(ofs, origin, false);</div><div class='add'>+	return ovl_encode_real_fh(ofs, d_inode(origin), false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ovl_set_origin_fh(struct ovl_fs *ofs, const struct ovl_fh *fh,</div><div class='hunk'>@@ -491,7 +505,7 @@ static int ovl_set_upper_fh(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> 	const struct ovl_fh *fh;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fh = ovl_encode_real_fh(ofs, upper, true);</div><div class='add'>+	fh = ovl_encode_real_fh(ofs, d_inode(upper), true);</div><div class='ctx'> 	if (IS_ERR(fh))</div><div class='ctx'> 		return PTR_ERR(fh);</div><div class='ctx'> </div><div class='hunk'>@@ -503,17 +517,14 @@ static int ovl_set_upper_fh(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Create and install index entry.</div><div class='del'>- *</div><div class='del'>- * Caller must hold i_mutex on indexdir.</div><div class='ctx'>  */</div><div class='ctx'> static int ovl_create_index(struct dentry *dentry, const struct ovl_fh *fh,</div><div class='ctx'> 			    struct dentry *upper)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct dentry *indexdir = ovl_indexdir(dentry-&gt;d_sb);</div><div class='del'>-	struct inode *dir = d_inode(indexdir);</div><div class='del'>-	struct dentry *index = NULL;</div><div class='ctx'> 	struct dentry *temp = NULL;</div><div class='add'>+	struct renamedata rd = {};</div><div class='ctx'> 	struct qstr name = { };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -545,16 +556,18 @@ static int ovl_create_index(struct dentry *dentry, const struct ovl_fh *fh,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	index = ovl_lookup_upper(ofs, name.name, indexdir, name.len);</div><div class='del'>-	if (IS_ERR(index)) {</div><div class='del'>-		err = PTR_ERR(index);</div><div class='del'>-	} else {</div><div class='del'>-		err = ovl_do_rename(ofs, dir, temp, dir, index, 0);</div><div class='del'>-		dput(index);</div><div class='del'>-	}</div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = indexdir;</div><div class='add'>+	rd.new_parent = indexdir;</div><div class='add'>+	err = start_renaming_dentry(&amp;rd, 0, temp, &amp;name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> out:</div><div class='ctx'> 	if (err)</div><div class='del'>-		ovl_cleanup(ofs, dir, temp);</div><div class='add'>+		ovl_cleanup(ofs, indexdir, temp);</div><div class='ctx'> 	dput(temp);</div><div class='ctx'> free_name:</div><div class='ctx'> 	kfree(name.name);</div><div class='hunk'>@@ -576,6 +589,7 @@ struct ovl_copy_up_ctx {</div><div class='ctx'> 	bool indexed;</div><div class='ctx'> 	bool metacopy;</div><div class='ctx'> 	bool metacopy_digest;</div><div class='add'>+	bool metadata_fsync;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ovl_link_up(struct ovl_copy_up_ctx *c)</div><div class='hunk'>@@ -597,13 +611,12 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(udir, I_MUTEX_PARENT);</div><div class='del'>-	upper = ovl_lookup_upper(ofs, c-&gt;dentry-&gt;d_name.name, upperdir,</div><div class='del'>-				 c-&gt;dentry-&gt;d_name.len);</div><div class='add'>+	upper = ovl_start_creating_upper(ofs, upperdir,</div><div class='add'>+					 &amp;QSTR_LEN(c-&gt;dentry-&gt;d_name.name,</div><div class='add'>+						   c-&gt;dentry-&gt;d_name.len));</div><div class='ctx'> 	err = PTR_ERR(upper);</div><div class='ctx'> 	if (!IS_ERR(upper)) {</div><div class='ctx'> 		err = ovl_do_link(ofs, ovl_dentry_upper(c-&gt;dentry), udir, upper);</div><div class='del'>-		dput(upper);</div><div class='ctx'> </div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			/* Restore timestamps on parent (best effort) */</div><div class='hunk'>@@ -611,8 +624,8 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 			ovl_dentry_set_upper_alias(c-&gt;dentry);</div><div class='ctx'> 			ovl_dentry_update_reval(c-&gt;dentry, upper);</div><div class='ctx'> 		}</div><div class='add'>+		end_creating(upper);</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(udir);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -636,7 +649,8 @@ static int ovl_copy_up_data(struct ovl_copy_up_ctx *c, const struct path *temp)</div><div class='ctx'> 	if (IS_ERR(new_file))</div><div class='ctx'> 		return PTR_ERR(new_file);</div><div class='ctx'> </div><div class='del'>-	err = ovl_copy_up_file(ofs, c-&gt;dentry, new_file, c-&gt;stat.size);</div><div class='add'>+	err = ovl_copy_up_file(ofs, c-&gt;dentry, new_file, c-&gt;stat.size,</div><div class='add'>+			       !c-&gt;metadata_fsync);</div><div class='ctx'> 	fput(new_file);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -653,7 +667,7 @@ static int ovl_copy_up_metadata(struct ovl_copy_up_ctx *c, struct dentry *temp)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_flags &amp; OVL_COPY_I_FLAGS_MASK &amp;&amp;</div><div class='add'>+	if (inode-&gt;i_flags &amp; OVL_FATTR_I_FLAGS_MASK &amp;&amp;</div><div class='ctx'> 	    (S_ISREG(c-&gt;stat.mode) || S_ISDIR(c-&gt;stat.mode))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Copy the fileattr inode flags that are the source of already</div><div class='hunk'>@@ -703,37 +717,40 @@ static int ovl_copy_up_metadata(struct ovl_copy_up_ctx *c, struct dentry *temp)</div><div class='ctx'> 		err = ovl_set_attr(ofs, temp, &amp;c-&gt;stat);</div><div class='ctx'> 	inode_unlock(temp-&gt;d_inode);</div><div class='ctx'> </div><div class='add'>+	/* fsync metadata before moving it into upper dir */</div><div class='add'>+	if (!err &amp;&amp; ovl_should_sync(ofs) &amp;&amp; c-&gt;metadata_fsync)</div><div class='add'>+		err = ovl_sync_file(&amp;upperpath);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ovl_cu_creds {</div><div class='del'>-	const struct cred *old;</div><div class='del'>-	struct cred *new;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ovl_prep_cu_creds(struct dentry *dentry, struct ovl_cu_creds *cc)</div><div class='add'>+static const struct cred *ovl_prepare_copy_up_creds(struct dentry *dentry)</div><div class='ctx'> {</div><div class='add'>+	struct cred *copy_up_cred = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cc-&gt;old = cc-&gt;new = NULL;</div><div class='del'>-	err = security_inode_copy_up(dentry, &amp;cc-&gt;new);</div><div class='add'>+	err = security_inode_copy_up(dentry, &amp;copy_up_cred);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	if (cc-&gt;new)</div><div class='del'>-		cc-&gt;old = override_creds(cc-&gt;new);</div><div class='add'>+	if (!copy_up_cred)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return override_creds(copy_up_cred);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ovl_revert_cu_creds(struct ovl_cu_creds *cc)</div><div class='add'>+static void ovl_revert_copy_up_creds(const struct cred *orig_cred)</div><div class='ctx'> {</div><div class='del'>-	if (cc-&gt;new) {</div><div class='del'>-		revert_creds(cc-&gt;old);</div><div class='del'>-		put_cred(cc-&gt;new);</div><div class='del'>-	}</div><div class='add'>+	const struct cred *copy_up_cred;</div><div class='add'>+</div><div class='add'>+	copy_up_cred = revert_creds(orig_cred);</div><div class='add'>+	put_cred(copy_up_cred);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_CLASS(copy_up_creds, const struct cred *,</div><div class='add'>+	     if (!IS_ERR_OR_NULL(_T)) ovl_revert_copy_up_creds(_T),</div><div class='add'>+	     ovl_prepare_copy_up_creds(dentry), struct dentry *dentry)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Copyup using workdir to prepare temp file.  Used when copying up directories,</div><div class='ctx'>  * special files or when upper fs doesn't support O_TMPFILE.</div><div class='hunk'>@@ -742,10 +759,9 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(c-&gt;dentry-&gt;d_sb);</div><div class='ctx'> 	struct inode *inode;</div><div class='del'>-	struct inode *udir = d_inode(c-&gt;destdir), *wdir = d_inode(c-&gt;workdir);</div><div class='ctx'> 	struct path path = { .mnt = ovl_upper_mnt(ofs) };</div><div class='del'>-	struct dentry *temp, *upper, *trap;</div><div class='del'>-	struct ovl_cu_creds cc;</div><div class='add'>+	struct renamedata rd = {};</div><div class='add'>+	struct dentry *temp;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ovl_cattr cattr = {</div><div class='ctx'> 		/* Can't properly set mode on creation because of the umask */</div><div class='hunk'>@@ -754,16 +770,14 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 		.link = c-&gt;link</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	err = ovl_prep_cu_creds(c-&gt;dentry, &amp;cc);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	scoped_class(copy_up_creds, copy_up_creds, c-&gt;dentry) {</div><div class='add'>+		if (IS_ERR(copy_up_creds))</div><div class='add'>+			return PTR_ERR(copy_up_creds);</div><div class='ctx'> </div><div class='del'>-	ovl_start_write(c-&gt;dentry);</div><div class='del'>-	inode_lock(wdir);</div><div class='del'>-	temp = ovl_create_temp(ofs, c-&gt;workdir, &amp;cattr);</div><div class='del'>-	inode_unlock(wdir);</div><div class='del'>-	ovl_end_write(c-&gt;dentry);</div><div class='del'>-	ovl_revert_cu_creds(&amp;cc);</div><div class='add'>+		ovl_start_write(c-&gt;dentry);</div><div class='add'>+		temp = ovl_create_temp(ofs, c-&gt;workdir, &amp;cattr);</div><div class='add'>+		ovl_end_write(c-&gt;dentry);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(temp))</div><div class='ctx'> 		return PTR_ERR(temp);</div><div class='hunk'>@@ -774,45 +788,42 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 	 */</div><div class='ctx'> 	path.dentry = temp;</div><div class='ctx'> 	err = ovl_copy_up_data(c, &amp;path);</div><div class='add'>+	ovl_start_write(c-&gt;dentry);</div><div class='add'>+	if (err)</div><div class='add'>+		goto cleanup_unlocked;</div><div class='add'>+</div><div class='add'>+	if (S_ISDIR(c-&gt;stat.mode) &amp;&amp; c-&gt;indexed) {</div><div class='add'>+		err = ovl_create_index(c-&gt;dentry, c-&gt;origin_fh, temp);</div><div class='add'>+		if (err)</div><div class='add'>+			goto cleanup_unlocked;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We cannot hold lock_rename() throughout this helper, because of</div><div class='ctx'> 	 * lock ordering with sb_writers, which shouldn't be held when calling</div><div class='ctx'> 	 * ovl_copy_up_data(), so lock workdir and destdir and make sure that</div><div class='ctx'> 	 * temp wasn't moved before copy up completion or cleanup.</div><div class='ctx'> 	 */</div><div class='del'>-	ovl_start_write(c-&gt;dentry);</div><div class='del'>-	trap = lock_rename(c-&gt;workdir, c-&gt;destdir);</div><div class='del'>-	if (trap || temp-&gt;d_parent != c-&gt;workdir) {</div><div class='del'>-		/* temp or workdir moved underneath us? abort without cleanup */</div><div class='del'>-		dput(temp);</div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = c-&gt;workdir;</div><div class='add'>+	rd.new_parent = c-&gt;destdir;</div><div class='add'>+	rd.flags = 0;</div><div class='add'>+	err = start_renaming_dentry(&amp;rd, 0, temp,</div><div class='add'>+				    &amp;QSTR_LEN(c-&gt;destname.name, c-&gt;destname.len));</div><div class='add'>+	if (err) {</div><div class='add'>+		/* temp or workdir moved underneath us? map to -EIO */</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		if (IS_ERR(trap))</div><div class='del'>-			goto out;</div><div class='del'>-		goto unlock;</div><div class='del'>-	} else if (err) {</div><div class='del'>-		goto cleanup;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	err = ovl_copy_up_metadata(c, temp);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto cleanup;</div><div class='add'>+		goto cleanup_unlocked;</div><div class='ctx'> </div><div class='del'>-	if (S_ISDIR(c-&gt;stat.mode) &amp;&amp; c-&gt;indexed) {</div><div class='del'>-		err = ovl_create_index(c-&gt;dentry, c-&gt;origin_fh, temp);</div><div class='del'>-		if (err)</div><div class='del'>-			goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	upper = ovl_lookup_upper(ofs, c-&gt;destname.name, c-&gt;destdir,</div><div class='del'>-				 c-&gt;destname.len);</div><div class='del'>-	err = PTR_ERR(upper);</div><div class='del'>-	if (IS_ERR(upper))</div><div class='del'>-		goto cleanup;</div><div class='add'>+	err = ovl_copy_up_metadata(c, temp);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> </div><div class='del'>-	err = ovl_do_rename(ofs, wdir, temp, udir, upper, 0);</div><div class='del'>-	dput(upper);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto cleanup;</div><div class='add'>+		goto cleanup_unlocked;</div><div class='ctx'> </div><div class='ctx'> 	inode = d_inode(c-&gt;dentry);</div><div class='ctx'> 	if (c-&gt;metacopy_digest)</div><div class='hunk'>@@ -826,17 +837,15 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 	ovl_inode_update(inode, temp);</div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='ctx'> 		ovl_set_flag(OVL_WHITEOUTS, inode);</div><div class='del'>-unlock:</div><div class='del'>-	unlock_rename(c-&gt;workdir, c-&gt;destdir);</div><div class='ctx'> out:</div><div class='ctx'> 	ovl_end_write(c-&gt;dentry);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>-cleanup:</div><div class='del'>-	ovl_cleanup(ofs, wdir, temp);</div><div class='add'>+cleanup_unlocked:</div><div class='add'>+	ovl_cleanup(ofs, c-&gt;workdir, temp);</div><div class='ctx'> 	dput(temp);</div><div class='del'>-	goto unlock;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Copyup using O_TMPFILE which does not require cross dir locking */</div><div class='hunk'>@@ -846,23 +855,24 @@ static int ovl_copy_up_tmpfile(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 	struct inode *udir = d_inode(c-&gt;destdir);</div><div class='ctx'> 	struct dentry *temp, *upper;</div><div class='ctx'> 	struct file *tmpfile;</div><div class='del'>-	struct ovl_cu_creds cc;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = ovl_prep_cu_creds(c-&gt;dentry, &amp;cc);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	scoped_class(copy_up_creds, copy_up_creds, c-&gt;dentry) {</div><div class='add'>+		if (IS_ERR(copy_up_creds))</div><div class='add'>+			return PTR_ERR(copy_up_creds);</div><div class='add'>+</div><div class='add'>+		ovl_start_write(c-&gt;dentry);</div><div class='add'>+		tmpfile = ovl_do_tmpfile(ofs, c-&gt;workdir, c-&gt;stat.mode);</div><div class='add'>+		ovl_end_write(c-&gt;dentry);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ovl_start_write(c-&gt;dentry);</div><div class='del'>-	tmpfile = ovl_do_tmpfile(ofs, c-&gt;workdir, c-&gt;stat.mode);</div><div class='del'>-	ovl_end_write(c-&gt;dentry);</div><div class='del'>-	ovl_revert_cu_creds(&amp;cc);</div><div class='ctx'> 	if (IS_ERR(tmpfile))</div><div class='ctx'> 		return PTR_ERR(tmpfile);</div><div class='ctx'> </div><div class='ctx'> 	temp = tmpfile-&gt;f_path.dentry;</div><div class='ctx'> 	if (!c-&gt;metacopy &amp;&amp; c-&gt;stat.size) {</div><div class='del'>-		err = ovl_copy_up_file(ofs, c-&gt;dentry, tmpfile, c-&gt;stat.size);</div><div class='add'>+		err = ovl_copy_up_file(ofs, c-&gt;dentry, tmpfile, c-&gt;stat.size,</div><div class='add'>+				       !c-&gt;metadata_fsync);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_fput;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -873,16 +883,14 @@ static int ovl_copy_up_tmpfile(struct ovl_copy_up_ctx *c)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(udir, I_MUTEX_PARENT);</div><div class='del'>-</div><div class='del'>-	upper = ovl_lookup_upper(ofs, c-&gt;destname.name, c-&gt;destdir,</div><div class='del'>-				 c-&gt;destname.len);</div><div class='add'>+	upper = ovl_start_creating_upper(ofs, c-&gt;destdir,</div><div class='add'>+					 &amp;QSTR_LEN(c-&gt;destname.name,</div><div class='add'>+						   c-&gt;destname.len));</div><div class='ctx'> 	err = PTR_ERR(upper);</div><div class='ctx'> 	if (!IS_ERR(upper)) {</div><div class='ctx'> 		err = ovl_do_link(ofs, temp, udir, upper);</div><div class='del'>-		dput(upper);</div><div class='add'>+		end_creating(upper);</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(udir);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1137,6 +1145,17 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,</div><div class='ctx'> 	    !kgid_has_mapping(current_user_ns(), ctx.stat.gid))</div><div class='ctx'> 		return -EOVERFLOW;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * With metacopy disabled, we fsync after final metadata copyup, for</div><div class='add'>+	 * both regular files and directories to get atomic copyup semantics</div><div class='add'>+	 * on filesystems that do not use strict metadata ordering (e.g. ubifs).</div><div class='add'>+	 *</div><div class='add'>+	 * With metacopy enabled we want to avoid fsync on all meta copyup</div><div class='add'>+	 * that will hurt performance of workloads such as chown -R, so we</div><div class='add'>+	 * only fsync on data copyup as legacy behavior.</div><div class='add'>+	 */</div><div class='add'>+	ctx.metadata_fsync = !OVL_FS(dentry-&gt;d_sb)-&gt;config.metacopy &amp;&amp;</div><div class='add'>+			     (S_ISREG(ctx.stat.mode) || S_ISDIR(ctx.stat.mode));</div><div class='ctx'> 	ctx.metacopy = ovl_need_meta_copy_up(dentry, ctx.stat.mode, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (parent) {</div><div class='hunk'>@@ -1182,7 +1201,6 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,</div><div class='ctx'> static int ovl_copy_up_flags(struct dentry *dentry, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	bool disconnected = (dentry-&gt;d_flags &amp; DCACHE_DISCONNECTED);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1202,7 +1220,6 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='ctx'> 	while (!err) {</div><div class='ctx'> 		struct dentry *next;</div><div class='ctx'> 		struct dentry *parent = NULL;</div><div class='hunk'>@@ -1222,12 +1239,12 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)</div><div class='ctx'> 			next = parent;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = ovl_copy_up_one(parent, next, flags);</div><div class='add'>+		with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+			err = ovl_copy_up_one(parent, next, flags);</div><div class='ctx'> </div><div class='ctx'> 		dput(parent);</div><div class='ctx'> 		dput(next);</div><div class='ctx'> 	}</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c<br/>index 0f8b4a719237..ff3dbd1ca61f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/dir.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/posix_acl_xattr.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='add'>+#include &lt;linux/backing-file.h&gt;</div><div class='ctx'> #include "overlayfs.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned short ovl_redirect_max = 256;</div><div class='hunk'>@@ -23,7 +24,8 @@ MODULE_PARM_DESC(redirect_max,</div><div class='ctx'> </div><div class='ctx'> static int ovl_set_redirect(struct dentry *dentry, bool samedir);</div><div class='ctx'> </div><div class='del'>-int ovl_cleanup(struct ovl_fs *ofs, struct inode *wdir, struct dentry *wdentry)</div><div class='add'>+static int ovl_cleanup_locked(struct ovl_fs *ofs, struct inode *wdir,</div><div class='add'>+			      struct dentry *wdentry)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -42,75 +44,86 @@ int ovl_cleanup(struct ovl_fs *ofs, struct inode *wdir, struct dentry *wdentry)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *ovl_lookup_temp(struct ovl_fs *ofs, struct dentry *workdir)</div><div class='add'>+int ovl_cleanup(struct ovl_fs *ofs, struct dentry *workdir,</div><div class='add'>+		struct dentry *wdentry)</div><div class='add'>+{</div><div class='add'>+	wdentry = start_removing_dentry(workdir, wdentry);</div><div class='add'>+	if (IS_ERR(wdentry))</div><div class='add'>+		return PTR_ERR(wdentry);</div><div class='add'>+</div><div class='add'>+	ovl_cleanup_locked(ofs, workdir-&gt;d_inode, wdentry);</div><div class='add'>+	end_removing(wdentry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ovl_tempname(char name[OVL_TEMPNAME_SIZE])</div><div class='ctx'> {</div><div class='del'>-	struct dentry *temp;</div><div class='del'>-	char name[20];</div><div class='ctx'> 	static atomic_t temp_id = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> 	/* counter is allowed to wrap, since temp dentries are ephemeral */</div><div class='del'>-	snprintf(name, sizeof(name), "#%x", atomic_inc_return(&amp;temp_id));</div><div class='add'>+	snprintf(name, OVL_TEMPNAME_SIZE, "#%x", atomic_inc_return(&amp;temp_id));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	temp = ovl_lookup_upper(ofs, name, workdir, strlen(name));</div><div class='del'>-	if (!IS_ERR(temp) &amp;&amp; temp-&gt;d_inode) {</div><div class='del'>-		pr_err("workdir/%s already exists\n", name);</div><div class='del'>-		dput(temp);</div><div class='del'>-		temp = ERR_PTR(-EIO);</div><div class='del'>-	}</div><div class='add'>+static struct dentry *ovl_start_creating_temp(struct ovl_fs *ofs,</div><div class='add'>+					      struct dentry *workdir)</div><div class='add'>+{</div><div class='add'>+	char name[OVL_TEMPNAME_SIZE];</div><div class='ctx'> </div><div class='del'>-	return temp;</div><div class='add'>+	ovl_tempname(name);</div><div class='add'>+	return start_creating(ovl_upper_mnt_idmap(ofs), workdir,</div><div class='add'>+			      &amp;QSTR(name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* caller holds i_mutex on workdir */</div><div class='ctx'> static struct dentry *ovl_whiteout(struct ovl_fs *ofs)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct dentry *whiteout;</div><div class='add'>+	struct dentry *whiteout, *link;</div><div class='ctx'> 	struct dentry *workdir = ofs-&gt;workdir;</div><div class='ctx'> 	struct inode *wdir = workdir-&gt;d_inode;</div><div class='ctx'> </div><div class='add'>+	guard(mutex)(&amp;ofs-&gt;whiteout_lock);</div><div class='add'>+</div><div class='ctx'> 	if (!ofs-&gt;whiteout) {</div><div class='del'>-		whiteout = ovl_lookup_temp(ofs, workdir);</div><div class='add'>+		whiteout = ovl_start_creating_temp(ofs, workdir);</div><div class='ctx'> 		if (IS_ERR(whiteout))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='add'>+			return whiteout;</div><div class='ctx'> 		err = ovl_do_whiteout(ofs, wdir, whiteout);</div><div class='del'>-		if (err) {</div><div class='del'>-			dput(whiteout);</div><div class='del'>-			whiteout = ERR_PTR(err);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		ofs-&gt;whiteout = whiteout;</div><div class='add'>+		if (!err)</div><div class='add'>+			ofs-&gt;whiteout = dget(whiteout);</div><div class='add'>+		end_creating(whiteout);</div><div class='add'>+		if (err)</div><div class='add'>+			return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ofs-&gt;no_shared_whiteout) {</div><div class='del'>-		whiteout = ovl_lookup_temp(ofs, workdir);</div><div class='del'>-		if (IS_ERR(whiteout))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		err = ovl_do_link(ofs, ofs-&gt;whiteout, wdir, whiteout);</div><div class='add'>+		link = ovl_start_creating_temp(ofs, workdir);</div><div class='add'>+		if (IS_ERR(link))</div><div class='add'>+			return link;</div><div class='add'>+		err = ovl_do_link(ofs, ofs-&gt;whiteout, wdir, link);</div><div class='ctx'> 		if (!err)</div><div class='del'>-			goto out;</div><div class='add'>+			whiteout = dget(link);</div><div class='add'>+		end_creating(link);</div><div class='add'>+		if (!err)</div><div class='add'>+			return whiteout;</div><div class='ctx'> </div><div class='ctx'> 		if (err != -EMLINK) {</div><div class='del'>-			pr_warn("Failed to link whiteout - disabling whiteout inode sharing(nlink=%u, err=%i)\n",</div><div class='del'>-				ofs-&gt;whiteout-&gt;d_inode-&gt;i_nlink, err);</div><div class='add'>+			pr_warn("Failed to link whiteout - disabling whiteout inode sharing(nlink=%u, err=%u)\n",</div><div class='add'>+				ofs-&gt;whiteout-&gt;d_inode-&gt;i_nlink,</div><div class='add'>+				err);</div><div class='ctx'> 			ofs-&gt;no_shared_whiteout = true;</div><div class='ctx'> 		}</div><div class='del'>-		dput(whiteout);</div><div class='ctx'> 	}</div><div class='ctx'> 	whiteout = ofs-&gt;whiteout;</div><div class='ctx'> 	ofs-&gt;whiteout = NULL;</div><div class='del'>-out:</div><div class='ctx'> 	return whiteout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller must hold i_mutex on both workdir and dir */</div><div class='del'>-int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct inode *dir,</div><div class='add'>+int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct dentry *dir,</div><div class='ctx'> 			     struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	struct inode *wdir = ofs-&gt;workdir-&gt;d_inode;</div><div class='ctx'> 	struct dentry *whiteout;</div><div class='add'>+	struct renamedata rd = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -122,55 +135,33 @@ int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct inode *dir,</div><div class='ctx'> 	if (d_is_dir(dentry))</div><div class='ctx'> 		flags = RENAME_EXCHANGE;</div><div class='ctx'> </div><div class='del'>-	err = ovl_do_rename(ofs, wdir, whiteout, dir, dentry, flags);</div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = ofs-&gt;workdir;</div><div class='add'>+	rd.new_parent = dir;</div><div class='add'>+	rd.flags = flags;</div><div class='add'>+	err = start_renaming_two_dentries(&amp;rd, whiteout, dentry);</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+		end_renaming(&amp;rd);</div><div class='add'>+	}</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto kill_whiteout;</div><div class='ctx'> 	if (flags)</div><div class='del'>-		ovl_cleanup(ofs, wdir, dentry);</div><div class='add'>+		ovl_cleanup(ofs, ofs-&gt;workdir, dentry);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	dput(whiteout);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> kill_whiteout:</div><div class='del'>-	ovl_cleanup(ofs, wdir, whiteout);</div><div class='add'>+	ovl_cleanup(ofs, ofs-&gt;workdir, whiteout);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_mkdir_real(struct ovl_fs *ofs, struct inode *dir,</div><div class='del'>-		   struct dentry **newdentry, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct dentry *d, *dentry = *newdentry;</div><div class='del'>-</div><div class='del'>-	err = ovl_do_mkdir(ofs, dir, dentry, mode);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (likely(!d_unhashed(dentry)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * vfs_mkdir() may succeed and leave the dentry passed</div><div class='del'>-	 * to it unhashed and negative. If that happens, try to</div><div class='del'>-	 * lookup a new hashed and positive dentry.</div><div class='del'>-	 */</div><div class='del'>-	d = ovl_lookup_upper(ofs, dentry-&gt;d_name.name, dentry-&gt;d_parent,</div><div class='del'>-			     dentry-&gt;d_name.len);</div><div class='del'>-	if (IS_ERR(d)) {</div><div class='del'>-		pr_warn("failed lookup after mkdir (%pd2, err=%i).\n",</div><div class='del'>-			dentry, err);</div><div class='del'>-		return PTR_ERR(d);</div><div class='del'>-	}</div><div class='del'>-	dput(dentry);</div><div class='del'>-	*newdentry = d;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dentry *ovl_create_real(struct ovl_fs *ofs, struct inode *dir,</div><div class='add'>+struct dentry *ovl_create_real(struct ovl_fs *ofs, struct dentry *parent,</div><div class='ctx'> 			       struct dentry *newdentry, struct ovl_cattr *attr)</div><div class='ctx'> {</div><div class='add'>+	struct inode *dir = parent-&gt;d_inode;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(newdentry))</div><div class='hunk'>@@ -190,7 +181,15 @@ struct dentry *ovl_create_real(struct ovl_fs *ofs, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> 		case S_IFDIR:</div><div class='ctx'> 			/* mkdir is special... */</div><div class='del'>-			err =  ovl_mkdir_real(ofs, dir, &amp;newdentry, attr-&gt;mode);</div><div class='add'>+			newdentry =  ovl_do_mkdir(ofs, dir, newdentry, attr-&gt;mode);</div><div class='add'>+			err = PTR_ERR_OR_ZERO(newdentry);</div><div class='add'>+			/* expect to inherit casefolding from workdir/upperdir */</div><div class='add'>+			if (!err &amp;&amp; ofs-&gt;casefold != ovl_dentry_casefolded(newdentry)) {</div><div class='add'>+				pr_warn_ratelimited("wrong inherited casefold (%pd2)\n",</div><div class='add'>+						    newdentry);</div><div class='add'>+				end_creating(newdentry);</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case S_IFCHR:</div><div class='hunk'>@@ -209,16 +208,36 @@ struct dentry *ovl_create_real(struct ovl_fs *ofs, struct inode *dir,</div><div class='ctx'> 			err = -EPERM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!err &amp;&amp; WARN_ON(!newdentry-&gt;d_inode)) {</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!newdentry-&gt;d_inode)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Not quite sure if non-instantiated dentry is legal or not.</div><div class='ctx'> 		 * VFS doesn't seem to care so check and warn here.</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = -EIO;</div><div class='add'>+	} else if (d_unhashed(newdentry)) {</div><div class='add'>+		struct dentry *d;</div><div class='add'>+		/*</div><div class='add'>+		 * Some filesystems (i.e. casefolded) may return an unhashed</div><div class='add'>+		 * negative dentry from the ovl_lookup_upper() call before</div><div class='add'>+		 * ovl_create_real().</div><div class='add'>+		 * In that case, lookup again after making the newdentry</div><div class='add'>+		 * positive, so ovl_create_upper() always returns a hashed</div><div class='add'>+		 * positive dentry.</div><div class='add'>+		 */</div><div class='add'>+		d = ovl_lookup_upper(ofs, newdentry-&gt;d_name.name, parent,</div><div class='add'>+				     newdentry-&gt;d_name.len);</div><div class='add'>+		dput(newdentry);</div><div class='add'>+		if (IS_ERR_OR_NULL(d))</div><div class='add'>+			err = d ? PTR_ERR(d) : -ENOENT;</div><div class='add'>+		else</div><div class='add'>+			return d;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dput(newdentry);</div><div class='add'>+		end_creating(newdentry);</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> 	return newdentry;</div><div class='hunk'>@@ -227,8 +246,12 @@ out:</div><div class='ctx'> struct dentry *ovl_create_temp(struct ovl_fs *ofs, struct dentry *workdir,</div><div class='ctx'> 			       struct ovl_cattr *attr)</div><div class='ctx'> {</div><div class='del'>-	return ovl_create_real(ofs, d_inode(workdir),</div><div class='del'>-			       ovl_lookup_temp(ofs, workdir), attr);</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+	ret = ovl_start_creating_temp(ofs, workdir);</div><div class='add'>+	if (IS_ERR(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = ovl_create_real(ofs, workdir, ret, attr);</div><div class='add'>+	return end_creating_keep(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_set_opaque_xerr(struct dentry *dentry, struct dentry *upper,</div><div class='hunk'>@@ -260,14 +283,13 @@ static int ovl_set_opaque(struct dentry *dentry, struct dentry *upperdentry)</div><div class='ctx'>  * may not use to instantiate the new dentry.</div><div class='ctx'>  */</div><div class='ctx'> static int ovl_instantiate(struct dentry *dentry, struct inode *inode,</div><div class='del'>-			   struct dentry *newdentry, bool hardlink)</div><div class='add'>+			   struct dentry *newdentry, bool hardlink, struct file *tmpfile)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_inode_params oip = {</div><div class='ctx'> 		.upperdentry = newdentry,</div><div class='ctx'> 		.newinode = inode,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ovl_dir_modified(dentry-&gt;d_parent, false);</div><div class='ctx'> 	ovl_dentry_set_upper_alias(dentry);</div><div class='ctx'> 	ovl_dentry_init_reval(dentry, newdentry, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -282,7 +304,8 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		 * XXX: if we ever use ovl_obtain_alias() to decode directory</div><div class='ctx'> 		 * file handles, need to use ovl_get_inode_locked() and</div><div class='ctx'> 		 * d_instantiate_new() here to prevent from creating two</div><div class='del'>-		 * hashed directory inode aliases.</div><div class='add'>+		 * hashed directory inode aliases.  We then need to return</div><div class='add'>+		 * the obtained alias to ovl_mkdir().</div><div class='ctx'> 		 */</div><div class='ctx'> 		inode = ovl_get_inode(dentry-&gt;d_sb, &amp;oip);</div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='hunk'>@@ -295,6 +318,9 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		inc_nlink(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (tmpfile)</div><div class='add'>+		d_mark_tmpfile(tmpfile, inode);</div><div class='add'>+</div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='ctx'> 	if (inode != oip.newinode) {</div><div class='ctx'> 		pr_warn_ratelimited("newly created inode found in cache (%pd2)\n",</div><div class='hunk'>@@ -323,21 +349,19 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct dentry *upperdir = ovl_dentry_upper(dentry-&gt;d_parent);</div><div class='del'>-	struct inode *udir = upperdir-&gt;d_inode;</div><div class='ctx'> 	struct dentry *newdentry;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!attr-&gt;hardlink &amp;&amp; !IS_POSIXACL(udir))</div><div class='del'>-		attr-&gt;mode &amp;= ~current_umask();</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(udir, I_MUTEX_PARENT);</div><div class='del'>-	newdentry = ovl_create_real(ofs, udir,</div><div class='del'>-				    ovl_lookup_upper(ofs, dentry-&gt;d_name.name,</div><div class='del'>-						     upperdir, dentry-&gt;d_name.len),</div><div class='del'>-				    attr);</div><div class='del'>-	err = PTR_ERR(newdentry);</div><div class='add'>+	newdentry = ovl_start_creating_upper(ofs, upperdir,</div><div class='add'>+					     &amp;QSTR_LEN(dentry-&gt;d_name.name,</div><div class='add'>+						       dentry-&gt;d_name.len));</div><div class='ctx'> 	if (IS_ERR(newdentry))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return PTR_ERR(newdentry);</div><div class='add'>+	newdentry = ovl_create_real(ofs, upperdir, newdentry, attr);</div><div class='add'>+	if (IS_ERR(newdentry))</div><div class='add'>+		return PTR_ERR(newdentry);</div><div class='add'>+</div><div class='add'>+	end_creating_keep(newdentry);</div><div class='ctx'> </div><div class='ctx'> 	if (ovl_type_merge(dentry-&gt;d_parent) &amp;&amp; d_is_dir(newdentry) &amp;&amp;</div><div class='ctx'> 	    !ovl_allow_offline_changes(ofs)) {</div><div class='hunk'>@@ -345,17 +369,16 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		ovl_set_opaque(dentry, newdentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ovl_instantiate(dentry, inode, newdentry, !!attr-&gt;hardlink);</div><div class='add'>+	ovl_dir_modified(dentry-&gt;d_parent, false);</div><div class='add'>+	err = ovl_instantiate(dentry, inode, newdentry, !!attr-&gt;hardlink, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_cleanup;</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(udir);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> out_cleanup:</div><div class='del'>-	ovl_cleanup(ofs, udir, newdentry);</div><div class='add'>+	ovl_cleanup(ofs, upperdir, newdentry);</div><div class='ctx'> 	dput(newdentry);</div><div class='del'>-	goto out_unlock;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *ovl_clear_empty(struct dentry *dentry,</div><div class='hunk'>@@ -363,9 +386,8 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct dentry *workdir = ovl_workdir(dentry);</div><div class='del'>-	struct inode *wdir = workdir-&gt;d_inode;</div><div class='ctx'> 	struct dentry *upperdir = ovl_dentry_upper(dentry-&gt;d_parent);</div><div class='del'>-	struct inode *udir = upperdir-&gt;d_inode;</div><div class='add'>+	struct renamedata rd = {};</div><div class='ctx'> 	struct path upperpath;</div><div class='ctx'> 	struct dentry *upper;</div><div class='ctx'> 	struct dentry *opaquedir;</div><div class='hunk'>@@ -375,27 +397,29 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,</div><div class='ctx'> 	if (WARN_ON(!workdir))</div><div class='ctx'> 		return ERR_PTR(-EROFS);</div><div class='ctx'> </div><div class='del'>-	err = ovl_lock_rename_workdir(workdir, upperdir);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	ovl_path_upper(dentry, &amp;upperpath);</div><div class='ctx'> 	err = vfs_getattr(&amp;upperpath, &amp;stat,</div><div class='ctx'> 			  STATX_BASIC_STATS, AT_STATX_SYNC_AS_STAT);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -ESTALE;</div><div class='ctx'> 	if (!S_ISDIR(stat.mode))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	upper = upperpath.dentry;</div><div class='del'>-	if (upper-&gt;d_parent-&gt;d_inode != udir)</div><div class='del'>-		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	opaquedir = ovl_create_temp(ofs, workdir, OVL_CATTR(stat.mode));</div><div class='ctx'> 	err = PTR_ERR(opaquedir);</div><div class='ctx'> 	if (IS_ERR(opaquedir))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = workdir;</div><div class='add'>+	rd.new_parent = upperdir;</div><div class='add'>+	rd.flags = RENAME_EXCHANGE;</div><div class='add'>+	err = start_renaming_two_dentries(&amp;rd, opaquedir, upper);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_cleanup_unlocked;</div><div class='ctx'> </div><div class='ctx'> 	err = ovl_copy_xattr(dentry-&gt;d_sb, &amp;upperpath, opaquedir);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -411,13 +435,13 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_cleanup;</div><div class='ctx'> </div><div class='del'>-	err = ovl_do_rename(ofs, wdir, opaquedir, udir, upper, RENAME_EXCHANGE);</div><div class='add'>+	err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_cleanup;</div><div class='add'>+		goto out_cleanup_unlocked;</div><div class='ctx'> </div><div class='ctx'> 	ovl_cleanup_whiteouts(ofs, upper, list);</div><div class='del'>-	ovl_cleanup(ofs, wdir, upper);</div><div class='del'>-	unlock_rename(workdir, upperdir);</div><div class='add'>+	ovl_cleanup(ofs, workdir, upper);</div><div class='ctx'> </div><div class='ctx'> 	/* dentry's upper doesn't match now, get rid of it */</div><div class='ctx'> 	d_drop(dentry);</div><div class='hunk'>@@ -425,10 +449,10 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,</div><div class='ctx'> 	return opaquedir;</div><div class='ctx'> </div><div class='ctx'> out_cleanup:</div><div class='del'>-	ovl_cleanup(ofs, wdir, opaquedir);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='add'>+out_cleanup_unlocked:</div><div class='add'>+	ovl_cleanup(ofs, workdir, opaquedir);</div><div class='ctx'> 	dput(opaquedir);</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_rename(workdir, upperdir);</div><div class='ctx'> out:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='hunk'>@@ -447,9 +471,8 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct dentry *workdir = ovl_workdir(dentry);</div><div class='del'>-	struct inode *wdir = workdir-&gt;d_inode;</div><div class='ctx'> 	struct dentry *upperdir = ovl_dentry_upper(dentry-&gt;d_parent);</div><div class='del'>-	struct inode *udir = upperdir-&gt;d_inode;</div><div class='add'>+	struct renamedata rd = {};</div><div class='ctx'> 	struct dentry *upper;</div><div class='ctx'> 	struct dentry *newdentry;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -466,15 +489,11 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ovl_lock_rename_workdir(workdir, upperdir);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	upper = ovl_lookup_upper(ofs, dentry-&gt;d_name.name, upperdir,</div><div class='del'>-				 dentry-&gt;d_name.len);</div><div class='add'>+	upper = ovl_lookup_upper_unlocked(ofs, dentry-&gt;d_name.name, upperdir,</div><div class='add'>+					  dentry-&gt;d_name.len);</div><div class='ctx'> 	err = PTR_ERR(upper);</div><div class='ctx'> 	if (IS_ERR(upper))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = -ESTALE;</div><div class='ctx'> 	if (d_is_negative(upper) || !ovl_upper_is_whiteout(ofs, upper))</div><div class='hunk'>@@ -485,6 +504,14 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 	if (IS_ERR(newdentry))</div><div class='ctx'> 		goto out_dput;</div><div class='ctx'> </div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = workdir;</div><div class='add'>+	rd.new_parent = upperdir;</div><div class='add'>+	rd.flags = 0;</div><div class='add'>+	err = start_renaming_two_dentries(&amp;rd, newdentry, upper);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_cleanup_unlocked;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * mode could have been mutilated due to umask (e.g. sgid directory)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -518,26 +545,27 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_cleanup;</div><div class='ctx'> </div><div class='del'>-		err = ovl_do_rename(ofs, wdir, newdentry, udir, upper,</div><div class='del'>-				    RENAME_EXCHANGE);</div><div class='add'>+		rd.flags = RENAME_EXCHANGE;</div><div class='add'>+		err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+		end_renaming(&amp;rd);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_cleanup;</div><div class='add'>+			goto out_cleanup_unlocked;</div><div class='ctx'> </div><div class='del'>-		ovl_cleanup(ofs, wdir, upper);</div><div class='add'>+		ovl_cleanup(ofs, workdir, upper);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = ovl_do_rename(ofs, wdir, newdentry, udir, upper, 0);</div><div class='add'>+		err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+		end_renaming(&amp;rd);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_cleanup;</div><div class='add'>+			goto out_cleanup_unlocked;</div><div class='ctx'> 	}</div><div class='del'>-	err = ovl_instantiate(dentry, inode, newdentry, hardlink);</div><div class='add'>+	ovl_dir_modified(dentry-&gt;d_parent, false);</div><div class='add'>+	err = ovl_instantiate(dentry, inode, newdentry, hardlink, NULL);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		ovl_cleanup(ofs, udir, newdentry);</div><div class='add'>+		ovl_cleanup(ofs, upperdir, newdentry);</div><div class='ctx'> 		dput(newdentry);</div><div class='ctx'> 	}</div><div class='ctx'> out_dput:</div><div class='ctx'> 	dput(upper);</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_rename(workdir, upperdir);</div><div class='ctx'> out:</div><div class='ctx'> 	if (!hardlink) {</div><div class='ctx'> 		posix_acl_release(acl);</div><div class='hunk'>@@ -546,36 +574,80 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> out_cleanup:</div><div class='del'>-	ovl_cleanup(ofs, wdir, newdentry);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='add'>+out_cleanup_unlocked:</div><div class='add'>+	ovl_cleanup(ofs, workdir, newdentry);</div><div class='ctx'> 	dput(newdentry);</div><div class='ctx'> 	goto out_dput;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct cred *ovl_override_creator_creds(const struct cred *original_creds,</div><div class='add'>+						     struct dentry *dentry, struct inode *inode, umode_t mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(current-&gt;cred != ovl_creds(dentry-&gt;d_sb)))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	CLASS(prepare_creds, override_cred)();</div><div class='add'>+	if (!override_cred)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	override_cred-&gt;fsuid = inode-&gt;i_uid;</div><div class='add'>+	override_cred-&gt;fsgid = inode-&gt;i_gid;</div><div class='add'>+</div><div class='add'>+	err = security_dentry_create_files_as(dentry, mode, &amp;dentry-&gt;d_name,</div><div class='add'>+					      original_creds, override_cred);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	return override_creds(no_free_ptr(override_cred));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ovl_revert_creator_creds(const struct cred *old_cred)</div><div class='add'>+{</div><div class='add'>+	const struct cred *override_cred;</div><div class='add'>+</div><div class='add'>+	override_cred = revert_creds(old_cred);</div><div class='add'>+	put_cred(override_cred);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_CLASS(ovl_override_creator_creds,</div><div class='add'>+	     const struct cred *,</div><div class='add'>+	     if (!IS_ERR_OR_NULL(_T)) ovl_revert_creator_creds(_T),</div><div class='add'>+	     ovl_override_creator_creds(original_creds, dentry, inode, mode),</div><div class='add'>+	     const struct cred *original_creds,</div><div class='add'>+	     struct dentry *dentry,</div><div class='add'>+	     struct inode *inode,</div><div class='add'>+	     umode_t mode)</div><div class='add'>+</div><div class='add'>+static int ovl_create_handle_whiteouts(struct dentry *dentry,</div><div class='add'>+				       struct inode *inode,</div><div class='add'>+				       struct ovl_cattr *attr)</div><div class='add'>+{</div><div class='add'>+	if (!ovl_dentry_is_whiteout(dentry))</div><div class='add'>+		return ovl_create_upper(dentry, inode, attr);</div><div class='add'>+</div><div class='add'>+	return ovl_create_over_whiteout(dentry, inode, attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 			      struct ovl_cattr *attr, bool origin)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	struct cred *override_cred;</div><div class='ctx'> 	struct dentry *parent = dentry-&gt;d_parent;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When linking a file with copy up origin into a new parent, mark the</div><div class='del'>-	 * new parent dir "impure".</div><div class='del'>-	 */</div><div class='del'>-	if (origin) {</div><div class='del'>-		err = ovl_set_impure(parent, ovl_dentry_upper(parent));</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_revert_creds;</div><div class='del'>-	}</div><div class='add'>+	scoped_class(override_creds_ovl, original_creds, dentry-&gt;d_sb) {</div><div class='add'>+		/*</div><div class='add'>+		 * When linking a file with copy up origin into a new parent, mark the</div><div class='add'>+		 * new parent dir "impure".</div><div class='add'>+		 */</div><div class='add'>+		if (origin) {</div><div class='add'>+			err = ovl_set_impure(parent, ovl_dentry_upper(parent));</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (!attr-&gt;hardlink) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		override_cred = prepare_creds();</div><div class='del'>-		if (!override_cred)</div><div class='del'>-			goto out_revert_creds;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In the creation cases(create, mkdir, mknod, symlink),</div><div class='ctx'> 		 * ovl should transfer current's fs{u,g}id to underlying</div><div class='hunk'>@@ -589,26 +661,16 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		 * create a new inode, so just use the ovl mounter's</div><div class='ctx'> 		 * fs{u,g}id.</div><div class='ctx'> 		 */</div><div class='del'>-		override_cred-&gt;fsuid = inode-&gt;i_uid;</div><div class='del'>-		override_cred-&gt;fsgid = inode-&gt;i_gid;</div><div class='del'>-		err = security_dentry_create_files_as(dentry,</div><div class='del'>-				attr-&gt;mode, &amp;dentry-&gt;d_name, old_cred,</div><div class='del'>-				override_cred);</div><div class='del'>-		if (err) {</div><div class='del'>-			put_cred(override_cred);</div><div class='del'>-			goto out_revert_creds;</div><div class='del'>-		}</div><div class='del'>-		put_cred(override_creds(override_cred));</div><div class='del'>-		put_cred(override_cred);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!ovl_dentry_is_whiteout(dentry))</div><div class='del'>-		err = ovl_create_upper(dentry, inode, attr);</div><div class='del'>-	else</div><div class='del'>-		err = ovl_create_over_whiteout(dentry, inode, attr);</div><div class='add'>+		if (attr-&gt;hardlink)</div><div class='add'>+			return ovl_create_handle_whiteouts(dentry, inode, attr);</div><div class='ctx'> </div><div class='del'>-out_revert_creds:</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+		scoped_class(ovl_override_creator_creds, cred, original_creds, dentry, inode, attr-&gt;mode) {</div><div class='add'>+			if (IS_ERR(cred))</div><div class='add'>+				return PTR_ERR(cred);</div><div class='add'>+			return ovl_create_handle_whiteouts(dentry, inode, attr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -637,7 +699,7 @@ static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,</div><div class='ctx'> 		goto out_drop_write;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	inode-&gt;i_state |= I_CREATING;</div><div class='add'>+	inode_state_set(inode, I_CREATING);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 	inode_init_owner(&amp;nop_mnt_idmap, inode, dentry-&gt;d_parent-&gt;d_inode, mode);</div><div class='hunk'>@@ -660,10 +722,10 @@ static int ovl_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	return ovl_create_object(dentry, (mode &amp; 07777) | S_IFREG, 0, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		     struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *ovl_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	return ovl_create_object(dentry, (mode &amp; 07777) | S_IFDIR, 0, NULL);</div><div class='add'>+	return ERR_PTR(ovl_create_object(dentry, (mode &amp; 07777) | S_IFDIR, 0, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -684,14 +746,8 @@ static int ovl_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> </div><div class='ctx'> static int ovl_set_link_redirect(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	err = ovl_set_redirect(dentry, false);</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		return ovl_set_redirect(dentry, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_link(struct dentry *old, struct inode *newdir,</div><div class='hunk'>@@ -758,15 +814,11 @@ static int ovl_remove_and_whiteout(struct dentry *dentry,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ovl_lock_rename_workdir(workdir, upperdir);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_dput;</div><div class='del'>-</div><div class='del'>-	upper = ovl_lookup_upper(ofs, dentry-&gt;d_name.name, upperdir,</div><div class='del'>-				 dentry-&gt;d_name.len);</div><div class='add'>+	upper = ovl_lookup_upper_unlocked(ofs, dentry-&gt;d_name.name, upperdir,</div><div class='add'>+					  dentry-&gt;d_name.len);</div><div class='ctx'> 	err = PTR_ERR(upper);</div><div class='ctx'> 	if (IS_ERR(upper))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out_dput;</div><div class='ctx'> </div><div class='ctx'> 	err = -ESTALE;</div><div class='ctx'> 	if ((opaquedir &amp;&amp; upper != opaquedir) ||</div><div class='hunk'>@@ -775,17 +827,13 @@ static int ovl_remove_and_whiteout(struct dentry *dentry,</div><div class='ctx'> 		goto out_dput_upper;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ovl_cleanup_and_whiteout(ofs, d_inode(upperdir), upper);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_d_drop;</div><div class='add'>+	err = ovl_cleanup_and_whiteout(ofs, upperdir, upper);</div><div class='add'>+	if (!err)</div><div class='add'>+		ovl_dir_modified(dentry-&gt;d_parent, true);</div><div class='ctx'> </div><div class='del'>-	ovl_dir_modified(dentry-&gt;d_parent, true);</div><div class='del'>-out_d_drop:</div><div class='ctx'> 	d_drop(dentry);</div><div class='ctx'> out_dput_upper:</div><div class='ctx'> 	dput(upper);</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_rename(workdir, upperdir);</div><div class='ctx'> out_dput:</div><div class='ctx'> 	dput(opaquedir);</div><div class='ctx'> out:</div><div class='hunk'>@@ -809,17 +857,17 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='del'>-	upper = ovl_lookup_upper(ofs, dentry-&gt;d_name.name, upperdir,</div><div class='del'>-				 dentry-&gt;d_name.len);</div><div class='add'>+	upper = ovl_start_removing_upper(ofs, upperdir,</div><div class='add'>+					 &amp;QSTR_LEN(dentry-&gt;d_name.name,</div><div class='add'>+						   dentry-&gt;d_name.len));</div><div class='ctx'> 	err = PTR_ERR(upper);</div><div class='ctx'> 	if (IS_ERR(upper))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out_dput;</div><div class='ctx'> </div><div class='ctx'> 	err = -ESTALE;</div><div class='ctx'> 	if ((opaquedir &amp;&amp; upper != opaquedir) ||</div><div class='ctx'> 	    (!opaquedir &amp;&amp; !ovl_matches_upper(dentry, upper)))</div><div class='del'>-		goto out_dput_upper;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (is_dir)</div><div class='ctx'> 		err = ovl_do_rmdir(ofs, dir, upper);</div><div class='hunk'>@@ -835,10 +883,9 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		d_drop(dentry);</div><div class='del'>-out_dput_upper:</div><div class='del'>-	dput(upper);</div><div class='ctx'> out_unlock:</div><div class='del'>-	inode_unlock(dir);</div><div class='add'>+	end_removing(upper);</div><div class='add'>+out_dput:</div><div class='ctx'> 	dput(opaquedir);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -875,7 +922,6 @@ static void ovl_drop_nlink(struct dentry *dentry)</div><div class='ctx'> static int ovl_do_remove(struct dentry *dentry, bool is_dir)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	bool lower_positive = ovl_lower_positive(dentry);</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> </div><div class='hunk'>@@ -894,12 +940,12 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	if (!lower_positive)</div><div class='del'>-		err = ovl_remove_upper(dentry, is_dir, &amp;list);</div><div class='del'>-	else</div><div class='del'>-		err = ovl_remove_and_whiteout(dentry, &amp;list);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb) {</div><div class='add'>+		if (!lower_positive)</div><div class='add'>+			err = ovl_remove_upper(dentry, is_dir, &amp;list);</div><div class='add'>+		else</div><div class='add'>+			err = ovl_remove_and_whiteout(dentry, &amp;list);</div><div class='add'>+	}</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		if (is_dir)</div><div class='ctx'> 			clear_nlink(dentry-&gt;d_inode);</div><div class='hunk'>@@ -1063,102 +1109,107 @@ static int ovl_set_redirect(struct dentry *dentry, bool samedir)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='del'>-		      struct dentry *old, struct inode *newdir,</div><div class='del'>-		      struct dentry *new, unsigned int flags)</div><div class='add'>+struct ovl_renamedata {</div><div class='add'>+	struct renamedata;</div><div class='add'>+	struct dentry *opaquedir;</div><div class='add'>+	bool cleanup_whiteout;</div><div class='add'>+	bool update_nlink;</div><div class='add'>+	bool overwrite;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ovl_rename_start(struct ovl_renamedata *ovlrd, struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct dentry *old_upperdir;</div><div class='del'>-	struct dentry *new_upperdir;</div><div class='del'>-	struct dentry *olddentry;</div><div class='del'>-	struct dentry *newdentry;</div><div class='del'>-	struct dentry *trap;</div><div class='del'>-	bool old_opaque;</div><div class='del'>-	bool new_opaque;</div><div class='del'>-	bool cleanup_whiteout = false;</div><div class='del'>-	bool update_nlink = false;</div><div class='del'>-	bool overwrite = !(flags &amp; RENAME_EXCHANGE);</div><div class='add'>+	struct dentry *old = ovlrd-&gt;old_dentry;</div><div class='add'>+	struct dentry *new = ovlrd-&gt;new_dentry;</div><div class='ctx'> 	bool is_dir = d_is_dir(old);</div><div class='ctx'> 	bool new_is_dir = d_is_dir(new);</div><div class='del'>-	bool samedir = olddir == newdir;</div><div class='del'>-	struct dentry *opaquedir = NULL;</div><div class='del'>-	const struct cred *old_cred = NULL;</div><div class='del'>-	struct ovl_fs *ofs = OVL_FS(old-&gt;d_sb);</div><div class='del'>-	LIST_HEAD(list);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = -EINVAL;</div><div class='del'>-	if (flags &amp; ~(RENAME_EXCHANGE | RENAME_NOREPLACE))</div><div class='del'>-		goto out;</div><div class='add'>+	if (ovlrd-&gt;flags &amp; ~(RENAME_EXCHANGE | RENAME_NOREPLACE))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	flags &amp;= ~RENAME_NOREPLACE;</div><div class='add'>+	ovlrd-&gt;flags &amp;= ~RENAME_NOREPLACE;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't copy up directory trees */</div><div class='ctx'> 	err = -EXDEV;</div><div class='ctx'> 	if (!ovl_can_move(old))</div><div class='del'>-		goto out;</div><div class='del'>-	if (!overwrite &amp;&amp; !ovl_can_move(new))</div><div class='del'>-		goto out;</div><div class='add'>+		return err;</div><div class='add'>+	if (!ovlrd-&gt;overwrite &amp;&amp; !ovl_can_move(new))</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (overwrite &amp;&amp; new_is_dir &amp;&amp; !ovl_pure_upper(new)) {</div><div class='del'>-		err = ovl_check_empty_dir(new, &amp;list);</div><div class='add'>+	if (ovlrd-&gt;overwrite &amp;&amp; new_is_dir &amp;&amp; !ovl_pure_upper(new)) {</div><div class='add'>+		err = ovl_check_empty_dir(new, list);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (overwrite) {</div><div class='add'>+	if (ovlrd-&gt;overwrite) {</div><div class='ctx'> 		if (ovl_lower_positive(old)) {</div><div class='ctx'> 			if (!ovl_dentry_is_whiteout(new)) {</div><div class='ctx'> 				/* Whiteout source */</div><div class='del'>-				flags |= RENAME_WHITEOUT;</div><div class='add'>+				ovlrd-&gt;flags |= RENAME_WHITEOUT;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Switch whiteouts */</div><div class='del'>-				flags |= RENAME_EXCHANGE;</div><div class='add'>+				ovlrd-&gt;flags |= RENAME_EXCHANGE;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (is_dir &amp;&amp; ovl_dentry_is_whiteout(new)) {</div><div class='del'>-			flags |= RENAME_EXCHANGE;</div><div class='del'>-			cleanup_whiteout = true;</div><div class='add'>+			ovlrd-&gt;flags |= RENAME_EXCHANGE;</div><div class='add'>+			ovlrd-&gt;cleanup_whiteout = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = ovl_copy_up(old);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = ovl_copy_up(new-&gt;d_parent);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	if (!overwrite) {</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!ovlrd-&gt;overwrite) {</div><div class='ctx'> 		err = ovl_copy_up(new);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> 	} else if (d_inode(new)) {</div><div class='ctx'> 		err = ovl_nlink_start(new);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		update_nlink = true;</div><div class='add'>+		ovlrd-&gt;update_nlink = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!update_nlink) {</div><div class='add'>+	if (!ovlrd-&gt;update_nlink) {</div><div class='ctx'> 		/* ovl_nlink_start() took ovl_want_write() */</div><div class='ctx'> 		err = ovl_want_write(old);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(old-&gt;d_sb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;list)) {</div><div class='del'>-		opaquedir = ovl_clear_empty(new, &amp;list);</div><div class='del'>-		err = PTR_ERR(opaquedir);</div><div class='del'>-		if (IS_ERR(opaquedir)) {</div><div class='del'>-			opaquedir = NULL;</div><div class='del'>-			goto out_revert_creds;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static int ovl_rename_upper(struct ovl_renamedata *ovlrd, struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct dentry *old = ovlrd-&gt;old_dentry;</div><div class='add'>+	struct dentry *new = ovlrd-&gt;new_dentry;</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(old-&gt;d_sb);</div><div class='add'>+	struct dentry *old_upperdir = ovl_dentry_upper(old-&gt;d_parent);</div><div class='add'>+	struct dentry *new_upperdir = ovl_dentry_upper(new-&gt;d_parent);</div><div class='add'>+	bool is_dir = d_is_dir(old);</div><div class='add'>+	bool new_is_dir = d_is_dir(new);</div><div class='add'>+	bool samedir = old-&gt;d_parent == new-&gt;d_parent;</div><div class='add'>+	struct renamedata rd = {};</div><div class='add'>+	struct dentry *de;</div><div class='add'>+	struct dentry *whiteout = NULL;</div><div class='add'>+	bool old_opaque, new_opaque;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	old_upperdir = ovl_dentry_upper(old-&gt;d_parent);</div><div class='del'>-	new_upperdir = ovl_dentry_upper(new-&gt;d_parent);</div><div class='add'>+	if (!list_empty(list)) {</div><div class='add'>+		de = ovl_clear_empty(new, list);</div><div class='add'>+		if (IS_ERR(de))</div><div class='add'>+			return PTR_ERR(de);</div><div class='add'>+		ovlrd-&gt;opaquedir = de;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!samedir) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1170,92 +1221,88 @@ static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='ctx'> 		if (ovl_type_origin(old)) {</div><div class='ctx'> 			err = ovl_set_impure(new-&gt;d_parent, new_upperdir);</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto out_revert_creds;</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='del'>-		if (!overwrite &amp;&amp; ovl_type_origin(new)) {</div><div class='add'>+		if (!ovlrd-&gt;overwrite &amp;&amp; ovl_type_origin(new)) {</div><div class='ctx'> 			err = ovl_set_impure(old-&gt;d_parent, old_upperdir);</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto out_revert_creds;</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	trap = lock_rename(new_upperdir, old_upperdir);</div><div class='del'>-	if (IS_ERR(trap)) {</div><div class='del'>-		err = PTR_ERR(trap);</div><div class='del'>-		goto out_revert_creds;</div><div class='del'>-	}</div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = old_upperdir;</div><div class='add'>+	rd.new_parent = new_upperdir;</div><div class='add'>+	rd.flags = ovlrd-&gt;flags;</div><div class='ctx'> </div><div class='del'>-	olddentry = ovl_lookup_upper(ofs, old-&gt;d_name.name, old_upperdir,</div><div class='del'>-				     old-&gt;d_name.len);</div><div class='del'>-	err = PTR_ERR(olddentry);</div><div class='del'>-	if (IS_ERR(olddentry))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	err = start_renaming(&amp;rd, 0,</div><div class='add'>+			     &amp;QSTR_LEN(old-&gt;d_name.name, old-&gt;d_name.len),</div><div class='add'>+			     &amp;QSTR_LEN(new-&gt;d_name.name, new-&gt;d_name.len));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = -ESTALE;</div><div class='del'>-	if (!ovl_matches_upper(old, olddentry))</div><div class='del'>-		goto out_dput_old;</div><div class='del'>-</div><div class='del'>-	newdentry = ovl_lookup_upper(ofs, new-&gt;d_name.name, new_upperdir,</div><div class='del'>-				     new-&gt;d_name.len);</div><div class='del'>-	err = PTR_ERR(newdentry);</div><div class='del'>-	if (IS_ERR(newdentry))</div><div class='del'>-		goto out_dput_old;</div><div class='add'>+	if (!ovl_matches_upper(old, rd.old_dentry))</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	old_opaque = ovl_dentry_is_opaque(old);</div><div class='ctx'> 	new_opaque = ovl_dentry_is_opaque(new);</div><div class='ctx'> </div><div class='ctx'> 	err = -ESTALE;</div><div class='ctx'> 	if (d_inode(new) &amp;&amp; ovl_dentry_upper(new)) {</div><div class='del'>-		if (opaquedir) {</div><div class='del'>-			if (newdentry != opaquedir)</div><div class='del'>-				goto out_dput;</div><div class='add'>+		if (ovlrd-&gt;opaquedir) {</div><div class='add'>+			if (rd.new_dentry != ovlrd-&gt;opaquedir)</div><div class='add'>+				goto out_unlock;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (!ovl_matches_upper(new, newdentry))</div><div class='del'>-				goto out_dput;</div><div class='add'>+			if (!ovl_matches_upper(new, rd.new_dentry))</div><div class='add'>+				goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!d_is_negative(newdentry)) {</div><div class='del'>-			if (!new_opaque || !ovl_upper_is_whiteout(ofs, newdentry))</div><div class='del'>-				goto out_dput;</div><div class='add'>+		if (!d_is_negative(rd.new_dentry)) {</div><div class='add'>+			if (!new_opaque || !ovl_upper_is_whiteout(ofs, rd.new_dentry))</div><div class='add'>+				goto out_unlock;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (flags &amp; RENAME_EXCHANGE)</div><div class='del'>-				goto out_dput;</div><div class='add'>+			if (ovlrd-&gt;flags &amp; RENAME_EXCHANGE)</div><div class='add'>+				goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (olddentry == trap)</div><div class='del'>-		goto out_dput;</div><div class='del'>-	if (newdentry == trap)</div><div class='del'>-		goto out_dput;</div><div class='del'>-</div><div class='del'>-	if (olddentry-&gt;d_inode == newdentry-&gt;d_inode)</div><div class='del'>-		goto out_dput;</div><div class='add'>+	if (rd.old_dentry-&gt;d_inode == rd.new_dentry-&gt;d_inode)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	if (ovl_type_merge_or_lower(old))</div><div class='ctx'> 		err = ovl_set_redirect(old, samedir);</div><div class='ctx'> 	else if (is_dir &amp;&amp; !old_opaque &amp;&amp; ovl_type_merge(new-&gt;d_parent))</div><div class='del'>-		err = ovl_set_opaque_xerr(old, olddentry, -EXDEV);</div><div class='add'>+		err = ovl_set_opaque_xerr(old, rd.old_dentry, -EXDEV);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_dput;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	if (!overwrite &amp;&amp; ovl_type_merge_or_lower(new))</div><div class='add'>+	if (!ovlrd-&gt;overwrite &amp;&amp; ovl_type_merge_or_lower(new))</div><div class='ctx'> 		err = ovl_set_redirect(new, samedir);</div><div class='del'>-	else if (!overwrite &amp;&amp; new_is_dir &amp;&amp; !new_opaque &amp;&amp;</div><div class='add'>+	else if (!ovlrd-&gt;overwrite &amp;&amp; new_is_dir &amp;&amp; !new_opaque &amp;&amp;</div><div class='ctx'> 		 ovl_type_merge(old-&gt;d_parent))</div><div class='del'>-		err = ovl_set_opaque_xerr(new, newdentry, -EXDEV);</div><div class='add'>+		err = ovl_set_opaque_xerr(new, rd.new_dentry, -EXDEV);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_dput;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; ovlrd-&gt;cleanup_whiteout)</div><div class='add'>+		whiteout = dget(rd.new_dentry);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> </div><div class='del'>-	err = ovl_do_rename(ofs, old_upperdir-&gt;d_inode, olddentry,</div><div class='del'>-			    new_upperdir-&gt;d_inode, newdentry, flags);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_dput;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (cleanup_whiteout)</div><div class='del'>-		ovl_cleanup(ofs, old_upperdir-&gt;d_inode, newdentry);</div><div class='add'>+	if (whiteout) {</div><div class='add'>+		ovl_cleanup(ofs, old_upperdir, whiteout);</div><div class='add'>+		dput(whiteout);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (overwrite &amp;&amp; d_inode(new)) {</div><div class='add'>+	if (ovlrd-&gt;overwrite &amp;&amp; d_inode(new)) {</div><div class='ctx'> 		if (new_is_dir)</div><div class='ctx'> 			clear_nlink(d_inode(new));</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1263,7 +1310,7 @@ static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ovl_dir_modified(old-&gt;d_parent, ovl_type_origin(old) ||</div><div class='del'>-			 (!overwrite &amp;&amp; ovl_type_origin(new)));</div><div class='add'>+			 (!ovlrd-&gt;overwrite &amp;&amp; ovl_type_origin(new)));</div><div class='ctx'> 	ovl_dir_modified(new-&gt;d_parent, ovl_type_origin(old) ||</div><div class='ctx'> 			 (d_inode(new) &amp;&amp; ovl_type_origin(new)));</div><div class='ctx'> </div><div class='hunk'>@@ -1272,24 +1319,144 @@ static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='ctx'> 	if (d_inode(new) &amp;&amp; ovl_dentry_upper(new))</div><div class='ctx'> 		ovl_copyattr(d_inode(new));</div><div class='ctx'> </div><div class='del'>-out_dput:</div><div class='del'>-	dput(newdentry);</div><div class='del'>-out_dput_old:</div><div class='del'>-	dput(olddentry);</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_rename(new_upperdir, old_upperdir);</div><div class='del'>-out_revert_creds:</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-	if (update_nlink)</div><div class='del'>-		ovl_nlink_end(new);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ovl_rename_end(struct ovl_renamedata *ovlrd)</div><div class='add'>+{</div><div class='add'>+	if (ovlrd-&gt;update_nlink)</div><div class='add'>+		ovl_nlink_end(ovlrd-&gt;new_dentry);</div><div class='ctx'> 	else</div><div class='del'>-		ovl_drop_write(old);</div><div class='del'>-out:</div><div class='del'>-	dput(opaquedir);</div><div class='add'>+		ovl_drop_write(ovlrd-&gt;old_dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir,</div><div class='add'>+		      struct dentry *old, struct inode *newdir,</div><div class='add'>+		      struct dentry *new, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct ovl_renamedata ovlrd = {</div><div class='add'>+		.old_parent		= old-&gt;d_parent,</div><div class='add'>+		.old_dentry		= old,</div><div class='add'>+		.new_parent		= new-&gt;d_parent,</div><div class='add'>+		.new_dentry		= new,</div><div class='add'>+		.flags			= flags,</div><div class='add'>+		.overwrite		= !(flags &amp; RENAME_EXCHANGE),</div><div class='add'>+	};</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ovl_rename_start(&amp;ovlrd, &amp;list);</div><div class='add'>+	if (!err) {</div><div class='add'>+		with_ovl_creds(old-&gt;d_sb)</div><div class='add'>+			err = ovl_rename_upper(&amp;ovlrd, &amp;list);</div><div class='add'>+		ovl_rename_end(&amp;ovlrd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dput(ovlrd.opaquedir);</div><div class='ctx'> 	ovl_cache_free(&amp;list);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ovl_create_tmpfile(struct file *file, struct dentry *dentry,</div><div class='add'>+			      struct inode *inode, umode_t mode)</div><div class='add'>+{</div><div class='add'>+	struct path realparentpath;</div><div class='add'>+	struct file *realfile;</div><div class='add'>+	struct ovl_file *of;</div><div class='add'>+	struct dentry *newdentry;</div><div class='add'>+	/* It's okay to set O_NOATIME, since the owner will be current fsuid */</div><div class='add'>+	int flags = file-&gt;f_flags | OVL_OPEN_FLAGS;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_class(override_creds_ovl, original_creds, dentry-&gt;d_sb) {</div><div class='add'>+		scoped_class(ovl_override_creator_creds, cred, original_creds, dentry, inode, mode) {</div><div class='add'>+			if (IS_ERR(cred))</div><div class='add'>+				return PTR_ERR(cred);</div><div class='add'>+</div><div class='add'>+			ovl_path_upper(dentry-&gt;d_parent, &amp;realparentpath);</div><div class='add'>+			realfile = backing_tmpfile_open(&amp;file-&gt;f_path, flags, &amp;realparentpath,</div><div class='add'>+							mode, current_cred());</div><div class='add'>+			err = PTR_ERR_OR_ZERO(realfile);</div><div class='add'>+			pr_debug("tmpfile/open(%pd2, 0%o) = %i\n", realparentpath.dentry, mode, err);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			of = ovl_file_alloc(realfile);</div><div class='add'>+			if (!of) {</div><div class='add'>+				fput(realfile);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* ovl_instantiate() consumes the newdentry reference on success */</div><div class='add'>+			newdentry = dget(realfile-&gt;f_path.dentry);</div><div class='add'>+			err = ovl_instantiate(dentry, inode, newdentry, false, file);</div><div class='add'>+			if (!err) {</div><div class='add'>+				file-&gt;private_data = of;</div><div class='add'>+			} else {</div><div class='add'>+				dput(newdentry);</div><div class='add'>+				ovl_file_free(of);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ovl_dummy_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ovl_tmpfile(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+		       struct file *file, umode_t mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	if (!OVL_FS(dentry-&gt;d_sb)-&gt;tmpfile)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = ovl_copy_up(dentry-&gt;d_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ovl_want_write(dentry);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	inode = ovl_new_inode(dentry-&gt;d_sb, mode, 0);</div><div class='add'>+	if (!inode)</div><div class='add'>+		goto drop_write;</div><div class='add'>+</div><div class='add'>+	inode_init_owner(&amp;nop_mnt_idmap, inode, dir, mode);</div><div class='add'>+	err = ovl_create_tmpfile(file, dentry, inode, inode-&gt;i_mode);</div><div class='add'>+	if (err)</div><div class='add'>+		goto put_inode;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the preallocated inode was actually used.  Having something</div><div class='add'>+	 * else assigned to the dentry shouldn't happen as that would indicate</div><div class='add'>+	 * that the backing tmpfile "leaked" out of overlayfs.</div><div class='add'>+	 */</div><div class='add'>+	err = -EIO;</div><div class='add'>+	if (WARN_ON(inode != d_inode(dentry)))</div><div class='add'>+		goto put_realfile;</div><div class='add'>+</div><div class='add'>+	/* inode reference was transferred to dentry */</div><div class='add'>+	inode = NULL;</div><div class='add'>+	err = finish_open(file, dentry, ovl_dummy_open);</div><div class='add'>+put_realfile:</div><div class='add'>+	/* Without FMODE_OPENED -&gt;release() won't be called on @file */</div><div class='add'>+	if (!(file-&gt;f_mode &amp; FMODE_OPENED))</div><div class='add'>+		ovl_file_free(file-&gt;private_data);</div><div class='add'>+put_inode:</div><div class='add'>+	iput(inode);</div><div class='add'>+drop_write:</div><div class='add'>+	ovl_drop_write(dentry);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct inode_operations ovl_dir_inode_operations = {</div><div class='ctx'> 	.lookup		= ovl_lookup,</div><div class='ctx'> 	.mkdir		= ovl_mkdir,</div><div class='hunk'>@@ -1310,4 +1477,5 @@ const struct inode_operations ovl_dir_inode_operations = {</div><div class='ctx'> 	.update_time	= ovl_update_time,</div><div class='ctx'> 	.fileattr_get	= ovl_fileattr_get,</div><div class='ctx'> 	.fileattr_set	= ovl_fileattr_set,</div><div class='add'>+	.tmpfile	= ovl_tmpfile,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c<br/>index 063409069f56..83f80fdb1567 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/export.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/export.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/export.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/export.c</a></div><div class='hunk'>@@ -176,31 +176,37 @@ static int ovl_connect_layer(struct dentry *dentry)</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 for upper file handle, &gt; 0 for lower file handle or &lt; 0 on error.</div><div class='ctx'>  */</div><div class='del'>-static int ovl_check_encode_origin(struct dentry *dentry)</div><div class='add'>+static int ovl_check_encode_origin(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(inode-&gt;i_sb);</div><div class='ctx'> 	bool decodable = ofs-&gt;config.nfs_export;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* No upper layer? */</div><div class='add'>+	if (!ovl_upper_mnt(ofs))</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Lower file handle for non-upper non-decodable */</div><div class='del'>-	if (!ovl_dentry_upper(dentry) &amp;&amp; !decodable)</div><div class='add'>+	if (!ovl_inode_upper(inode) &amp;&amp; !decodable)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Upper file handle for pure upper */</div><div class='del'>-	if (!ovl_dentry_lower(dentry))</div><div class='add'>+	if (!ovl_inode_lower(inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Root is never indexed, so if there's an upper layer, encode upper for</div><div class='ctx'> 	 * root.</div><div class='ctx'> 	 */</div><div class='del'>-	if (dentry == dentry-&gt;d_sb-&gt;s_root)</div><div class='add'>+	if (inode == d_inode(inode-&gt;i_sb-&gt;s_root))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Upper decodable file handle for non-indexed upper.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ovl_dentry_upper(dentry) &amp;&amp; decodable &amp;&amp;</div><div class='del'>-	    !ovl_test_flag(OVL_INDEX, d_inode(dentry)))</div><div class='add'>+	if (ovl_inode_upper(inode) &amp;&amp; decodable &amp;&amp;</div><div class='add'>+	    !ovl_test_flag(OVL_INDEX, inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -209,14 +215,23 @@ static int ovl_check_encode_origin(struct dentry *dentry)</div><div class='ctx'> 	 * ovl_connect_layer() will try to make origin's layer "connected" by</div><div class='ctx'> 	 * copying up a "connectable" ancestor.</div><div class='ctx'> 	 */</div><div class='del'>-	if (d_is_dir(dentry) &amp;&amp; ovl_upper_mnt(ofs) &amp;&amp; decodable)</div><div class='del'>-		return ovl_connect_layer(dentry);</div><div class='add'>+	if (!decodable || !S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	dentry = d_find_any_alias(inode);</div><div class='add'>+	if (!dentry)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = ovl_connect_layer(dentry);</div><div class='add'>+	dput(dentry);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Lower file handle for indexed and non-upper dir/non-dir */</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='add'>+static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct inode *inode,</div><div class='ctx'> 			     u32 *fid, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fh *fh = NULL;</div><div class='hunk'>@@ -227,13 +242,13 @@ static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='ctx'> 	 * Check if we should encode a lower or upper file handle and maybe</div><div class='ctx'> 	 * copy up an ancestor to make lower file handle connectable.</div><div class='ctx'> 	 */</div><div class='del'>-	err = enc_lower = ovl_check_encode_origin(dentry);</div><div class='add'>+	err = enc_lower = ovl_check_encode_origin(inode);</div><div class='ctx'> 	if (enc_lower &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* Encode an upper or lower file handle */</div><div class='del'>-	fh = ovl_encode_real_fh(ofs, enc_lower ? ovl_dentry_lower(dentry) :</div><div class='del'>-				ovl_dentry_upper(dentry), !enc_lower);</div><div class='add'>+	fh = ovl_encode_real_fh(ofs, enc_lower ? ovl_inode_lower(inode) :</div><div class='add'>+				ovl_inode_upper(inode), !enc_lower);</div><div class='ctx'> 	if (IS_ERR(fh))</div><div class='ctx'> 		return PTR_ERR(fh);</div><div class='ctx'> </div><div class='hunk'>@@ -247,8 +262,8 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	pr_warn_ratelimited("failed to encode file handle (%pd2, err=%i)\n",</div><div class='del'>-			    dentry, err);</div><div class='add'>+	pr_warn_ratelimited("failed to encode file handle (ino=%lu, err=%i)\n",</div><div class='add'>+			    inode-&gt;i_ino, err);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -256,19 +271,13 @@ static int ovl_encode_fh(struct inode *inode, u32 *fid, int *max_len,</div><div class='ctx'> 			 struct inode *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(inode-&gt;i_sb);</div><div class='del'>-	struct dentry *dentry;</div><div class='ctx'> 	int bytes, buflen = *max_len &lt;&lt; 2;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: encode connectable file handles */</div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		return FILEID_INVALID;</div><div class='ctx'> </div><div class='del'>-	dentry = d_find_any_alias(inode);</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return FILEID_INVALID;</div><div class='del'>-</div><div class='del'>-	bytes = ovl_dentry_to_fid(ofs, dentry, fid, buflen);</div><div class='del'>-	dput(dentry);</div><div class='add'>+	bytes = ovl_dentry_to_fid(ofs, inode, fid, buflen);</div><div class='ctx'> 	if (bytes &lt;= 0)</div><div class='ctx'> 		return FILEID_INVALID;</div><div class='ctx'> </div><div class='hunk'>@@ -376,11 +385,9 @@ static struct dentry *ovl_lookup_real_one(struct dentry *connected,</div><div class='ctx'> 	 */</div><div class='ctx'> 	take_dentry_name_snapshot(&amp;name, real);</div><div class='ctx'> 	/*</div><div class='del'>-	 * No idmap handling here: it's an internal lookup.  Could skip</div><div class='del'>-	 * permission checking altogether, but for now just use non-idmap</div><div class='del'>-	 * transformed ids.</div><div class='add'>+	 * No idmap handling here: it's an internal lookup.</div><div class='ctx'> 	 */</div><div class='del'>-	this = lookup_one_len(name.name.name, connected, name.name.len);</div><div class='add'>+	this = lookup_noperm(&amp;name.name, connected);</div><div class='ctx'> 	release_dentry_name_snapshot(&amp;name);</div><div class='ctx'> 	err = PTR_ERR(this);</div><div class='ctx'> 	if (IS_ERR(this)) {</div><div class='head'>diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c<br/>index 05536964d37f..cbae89457234 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/file.c</a></div><div class='hunk'>@@ -24,9 +24,6 @@ static char ovl_whatisit(struct inode *inode, struct inode *realinode)</div><div class='ctx'> 		return 'm';</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* No atime modification on underlying */</div><div class='del'>-#define OVL_OPEN_FLAGS (O_NOATIME)</div><div class='del'>-</div><div class='ctx'> static struct file *ovl_open_realfile(const struct file *file,</div><div class='ctx'> 				      const struct path *realpath)</div><div class='ctx'> {</div><div class='hunk'>@@ -34,7 +31,6 @@ static struct file *ovl_open_realfile(const struct file *file,</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	struct mnt_idmap *real_idmap;</div><div class='ctx'> 	struct file *realfile;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	int flags = file-&gt;f_flags | OVL_OPEN_FLAGS;</div><div class='ctx'> 	int acc_mode = ACC_MODE(flags);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -42,19 +38,19 @@ static struct file *ovl_open_realfile(const struct file *file,</div><div class='ctx'> 	if (flags &amp; O_APPEND)</div><div class='ctx'> 		acc_mode |= MAY_APPEND;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='del'>-	real_idmap = mnt_idmap(realpath-&gt;mnt);</div><div class='del'>-	err = inode_permission(real_idmap, realinode, MAY_OPEN | acc_mode);</div><div class='del'>-	if (err) {</div><div class='del'>-		realfile = ERR_PTR(err);</div><div class='del'>-	} else {</div><div class='del'>-		if (!inode_owner_or_capable(real_idmap, realinode))</div><div class='del'>-			flags &amp;= ~O_NOATIME;</div><div class='del'>-</div><div class='del'>-		realfile = backing_file_open(&amp;file-&gt;f_path, flags, realpath,</div><div class='del'>-					     current_cred());</div><div class='add'>+	with_ovl_creds(inode-&gt;i_sb) {</div><div class='add'>+		real_idmap = mnt_idmap(realpath-&gt;mnt);</div><div class='add'>+		err = inode_permission(real_idmap, realinode, MAY_OPEN | acc_mode);</div><div class='add'>+		if (err) {</div><div class='add'>+			realfile = ERR_PTR(err);</div><div class='add'>+		} else {</div><div class='add'>+			if (!inode_owner_or_capable(real_idmap, realinode))</div><div class='add'>+				flags &amp;= ~O_NOATIME;</div><div class='add'>+</div><div class='add'>+			realfile = backing_file_open(file_user_path(file),</div><div class='add'>+						     flags, realpath, current_cred());</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("open(%p[%pD2/%c], 0%o) -&gt; (%p, 0%o)\n",</div><div class='ctx'> 		 file, file, ovl_whatisit(inode, realinode), file-&gt;f_flags,</div><div class='hunk'>@@ -92,54 +88,110 @@ static int ovl_change_flags(struct file *file, unsigned int flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_real_fdget_meta(const struct file *file, struct fd *real,</div><div class='del'>-			       bool allow_meta)</div><div class='add'>+struct ovl_file {</div><div class='add'>+	struct file *realfile;</div><div class='add'>+	struct file *upperfile;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ovl_file *ovl_file_alloc(struct file *realfile)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *dentry = file_dentry(file);</div><div class='del'>-	struct path realpath;</div><div class='del'>-	int err;</div><div class='add'>+	struct ovl_file *of = kzalloc(sizeof(struct ovl_file), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	real-&gt;flags = 0;</div><div class='del'>-	real-&gt;file = file-&gt;private_data;</div><div class='add'>+	if (unlikely(!of))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (allow_meta) {</div><div class='del'>-		ovl_path_real(dentry, &amp;realpath);</div><div class='del'>-	} else {</div><div class='del'>-		/* lazy lookup and verify of lowerdata */</div><div class='del'>-		err = ovl_verify_lowerdata(dentry);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	of-&gt;realfile = realfile;</div><div class='add'>+	return of;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ovl_path_realdata(dentry, &amp;realpath);</div><div class='del'>-	}</div><div class='del'>-	if (!realpath.dentry)</div><div class='del'>-		return -EIO;</div><div class='add'>+void ovl_file_free(struct ovl_file *of)</div><div class='add'>+{</div><div class='add'>+	fput(of-&gt;realfile);</div><div class='add'>+	if (of-&gt;upperfile)</div><div class='add'>+		fput(of-&gt;upperfile);</div><div class='add'>+	kfree(of);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ovl_is_real_file(const struct file *realfile,</div><div class='add'>+			     const struct path *realpath)</div><div class='add'>+{</div><div class='add'>+	return file_inode(realfile) == d_inode(realpath-&gt;dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file *ovl_real_file_path(const struct file *file,</div><div class='add'>+				       const struct path *realpath)</div><div class='add'>+{</div><div class='add'>+	struct ovl_file *of = file-&gt;private_data;</div><div class='add'>+	struct file *realfile = of-&gt;realfile;</div><div class='ctx'> </div><div class='del'>-	/* Has it been copied up since we'd opened it? */</div><div class='del'>-	if (unlikely(file_inode(real-&gt;file) != d_inode(realpath.dentry))) {</div><div class='del'>-		real-&gt;flags = FDPUT_FPUT;</div><div class='del'>-		real-&gt;file = ovl_open_realfile(file, &amp;realpath);</div><div class='add'>+	if (WARN_ON_ONCE(!realpath-&gt;dentry))</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='ctx'> </div><div class='del'>-		return PTR_ERR_OR_ZERO(real-&gt;file);</div><div class='add'>+	/*</div><div class='add'>+	 * If the realfile that we want is not where the data used to be at</div><div class='add'>+	 * open time, either we'd been copied up, or it's an fsync of a</div><div class='add'>+	 * metacopied file.  We need the upperfile either way, so see if it</div><div class='add'>+	 * is already opened and if it is not then open and store it.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!ovl_is_real_file(realfile, realpath))) {</div><div class='add'>+		struct file *upperfile = READ_ONCE(of-&gt;upperfile);</div><div class='add'>+		struct file *old;</div><div class='add'>+</div><div class='add'>+		if (!upperfile) { /* Nobody opened upperfile yet */</div><div class='add'>+			upperfile = ovl_open_realfile(file, realpath);</div><div class='add'>+			if (IS_ERR(upperfile))</div><div class='add'>+				return upperfile;</div><div class='add'>+</div><div class='add'>+			/* Store the upperfile for later */</div><div class='add'>+			old = cmpxchg_release(&amp;of-&gt;upperfile, NULL, upperfile);</div><div class='add'>+			if (old) { /* Someone opened upperfile before us */</div><div class='add'>+				fput(upperfile);</div><div class='add'>+				upperfile = old;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Stored file must be from the right inode, unless someone's</div><div class='add'>+		 * been corrupting the upper layer.</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ON_ONCE(!ovl_is_real_file(upperfile, realpath)))</div><div class='add'>+			return ERR_PTR(-EIO);</div><div class='add'>+</div><div class='add'>+		realfile = upperfile;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Did the flags change since open? */</div><div class='del'>-	if (unlikely((file-&gt;f_flags ^ real-&gt;file-&gt;f_flags) &amp; ~OVL_OPEN_FLAGS))</div><div class='del'>-		return ovl_change_flags(real-&gt;file, file-&gt;f_flags);</div><div class='add'>+	if (unlikely((file-&gt;f_flags ^ realfile-&gt;f_flags) &amp; ~OVL_OPEN_FLAGS)) {</div><div class='add'>+		int err = ovl_change_flags(realfile, file-&gt;f_flags);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+		if (err)</div><div class='add'>+			return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return realfile;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_real_fdget(const struct file *file, struct fd *real)</div><div class='add'>+static struct file *ovl_real_file(const struct file *file)</div><div class='ctx'> {</div><div class='del'>-	if (d_is_dir(file_dentry(file))) {</div><div class='del'>-		real-&gt;flags = 0;</div><div class='del'>-		real-&gt;file = ovl_dir_real_file(file, false);</div><div class='add'>+	struct dentry *dentry = file_dentry(file);</div><div class='add'>+	struct path realpath;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (d_is_dir(dentry)) {</div><div class='add'>+		struct file *f = ovl_dir_real_file(file, false);</div><div class='ctx'> </div><div class='del'>-		return PTR_ERR_OR_ZERO(real-&gt;file);</div><div class='add'>+		if (WARN_ON_ONCE(!f))</div><div class='add'>+			return ERR_PTR(-EIO);</div><div class='add'>+		return f;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ovl_real_fdget_meta(file, real, false);</div><div class='add'>+	/* lazy lookup and verify of lowerdata */</div><div class='add'>+	err = ovl_verify_lowerdata(dentry);</div><div class='add'>+	if (err)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	ovl_path_realdata(dentry, &amp;realpath);</div><div class='add'>+</div><div class='add'>+	return ovl_real_file_path(file, &amp;realpath);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -147,6 +199,7 @@ static int ovl_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct dentry *dentry = file_dentry(file);</div><div class='ctx'> 	struct file *realfile;</div><div class='ctx'> 	struct path realpath;</div><div class='add'>+	struct ovl_file *of;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* lazy lookup and verify lowerdata */</div><div class='hunk'>@@ -169,23 +222,27 @@ static int ovl_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (IS_ERR(realfile))</div><div class='ctx'> 		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='del'>-	file-&gt;private_data = realfile;</div><div class='add'>+	of = ovl_file_alloc(realfile);</div><div class='add'>+	if (!of) {</div><div class='add'>+		fput(realfile);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = of;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	fput(file-&gt;private_data);</div><div class='del'>-</div><div class='add'>+	ovl_file_free(file-&gt;private_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct fd real;</div><div class='del'>-	const struct cred *old_cred;</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> 	loff_t ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -200,9 +257,9 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 			return vfs_setpos(file, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(file, &amp;real);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	realfile = ovl_real_file(file);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='add'>+		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Overlay file f_pos is the master copy that is preserved</div><div class='hunk'>@@ -212,17 +269,14 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	 * files, so we use the real file to perform seeks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ovl_inode_lock(inode);</div><div class='del'>-	real.file-&gt;f_pos = file-&gt;f_pos;</div><div class='add'>+	realfile-&gt;f_pos = file-&gt;f_pos;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='del'>-	ret = vfs_llseek(real.file, offset, whence);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(inode-&gt;i_sb)</div><div class='add'>+		ret = vfs_llseek(realfile, offset, whence);</div><div class='ctx'> </div><div class='del'>-	file-&gt;f_pos = real.file-&gt;f_pos;</div><div class='add'>+	file-&gt;f_pos = realfile-&gt;f_pos;</div><div class='ctx'> 	ovl_inode_unlock(inode);</div><div class='ctx'> </div><div class='del'>-	fdput(real);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -232,6 +286,11 @@ static void ovl_file_modified(struct file *file)</div><div class='ctx'> 	ovl_copyattr(file_inode(file));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ovl_file_end_write(struct kiocb *iocb, ssize_t ret)</div><div class='add'>+{</div><div class='add'>+	ovl_file_modified(iocb-&gt;ki_filp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ovl_file_accessed(struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode, *upperinode;</div><div class='hunk'>@@ -263,39 +322,33 @@ static void ovl_file_accessed(struct file *file)</div><div class='ctx'> static ssize_t ovl_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct fd real;</div><div class='del'>-	ssize_t ret;</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> 	struct backing_file_ctx ctx = {</div><div class='ctx'> 		.cred = ovl_creds(file_inode(file)-&gt;i_sb),</div><div class='del'>-		.user_file = file,</div><div class='ctx'> 		.accessed = ovl_file_accessed,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!iov_iter_count(iter))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(file, &amp;real);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = backing_file_read_iter(real.file, iter, iocb, iocb-&gt;ki_flags,</div><div class='del'>-				     &amp;ctx);</div><div class='del'>-	fdput(real);</div><div class='add'>+	realfile = ovl_real_file(file);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='add'>+		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return backing_file_read_iter(realfile, iter, iocb, iocb-&gt;ki_flags,</div><div class='add'>+				      &amp;ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct fd real;</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	int ifl = iocb-&gt;ki_flags;</div><div class='ctx'> 	struct backing_file_ctx ctx = {</div><div class='ctx'> 		.cred = ovl_creds(inode-&gt;i_sb),</div><div class='del'>-		.user_file = file,</div><div class='del'>-		.end_write = ovl_file_modified,</div><div class='add'>+		.end_write = ovl_file_end_write,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!iov_iter_count(iter))</div><div class='hunk'>@@ -305,20 +358,15 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	/* Update mode */</div><div class='ctx'> 	ovl_copyattr(inode);</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(file, &amp;real);</div><div class='del'>-	if (ret)</div><div class='add'>+	realfile = ovl_real_file(file);</div><div class='add'>+	ret = PTR_ERR(realfile);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	if (!ovl_should_sync(OVL_FS(inode-&gt;i_sb)))</div><div class='ctx'> 		ifl &amp;= ~(IOCB_DSYNC | IOCB_SYNC);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Overlayfs doesn't support deferred completions, don't copy</div><div class='del'>-	 * this property in case it is set by the issuer.</div><div class='del'>-	 */</div><div class='del'>-	ifl &amp;= ~IOCB_DIO_CALLER_COMP;</div><div class='del'>-	ret = backing_file_write_iter(real.file, iter, iocb, ifl, &amp;ctx);</div><div class='del'>-	fdput(real);</div><div class='add'>+	ret = backing_file_write_iter(realfile, iter, iocb, ifl, &amp;ctx);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='hunk'>@@ -330,20 +378,22 @@ static ssize_t ovl_splice_read(struct file *in, loff_t *ppos,</div><div class='ctx'> 			       struct pipe_inode_info *pipe, size_t len,</div><div class='ctx'> 			       unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct fd real;</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	struct backing_file_ctx ctx = {</div><div class='ctx'> 		.cred = ovl_creds(file_inode(in)-&gt;i_sb),</div><div class='del'>-		.user_file = in,</div><div class='ctx'> 		.accessed = ovl_file_accessed,</div><div class='ctx'> 	};</div><div class='add'>+	struct kiocb iocb;</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(in, &amp;real);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	realfile = ovl_real_file(in);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='add'>+		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='del'>-	ret = backing_file_splice_read(real.file, ppos, pipe, len, flags, &amp;ctx);</div><div class='del'>-	fdput(real);</div><div class='add'>+	init_sync_kiocb(&amp;iocb, in);</div><div class='add'>+	iocb.ki_pos = *ppos;</div><div class='add'>+	ret = backing_file_splice_read(realfile, &amp;iocb, pipe, len, flags, &amp;ctx);</div><div class='add'>+	*ppos = iocb.ki_pos;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -351,7 +401,7 @@ static ssize_t ovl_splice_read(struct file *in, loff_t *ppos,</div><div class='ctx'> /*</div><div class='ctx'>  * Calling iter_file_splice_write() directly from overlay's f_op may deadlock</div><div class='ctx'>  * due to lock order inversion between pipe-&gt;mutex in iter_file_splice_write()</div><div class='del'>- * and file_start_write(real.file) in ovl_write_iter().</div><div class='add'>+ * and file_start_write(realfile) in ovl_write_iter().</div><div class='ctx'>  *</div><div class='ctx'>  * So do everything ovl_write_iter() does and call iter_file_splice_write() on</div><div class='ctx'>  * the real file.</div><div class='hunk'>@@ -359,25 +409,28 @@ static ssize_t ovl_splice_read(struct file *in, loff_t *ppos,</div><div class='ctx'> static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out,</div><div class='ctx'> 				loff_t *ppos, size_t len, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct fd real;</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> 	struct inode *inode = file_inode(out);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	struct backing_file_ctx ctx = {</div><div class='ctx'> 		.cred = ovl_creds(inode-&gt;i_sb),</div><div class='del'>-		.user_file = out,</div><div class='del'>-		.end_write = ovl_file_modified,</div><div class='add'>+		.end_write = ovl_file_end_write,</div><div class='ctx'> 	};</div><div class='add'>+	struct kiocb iocb;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='ctx'> 	/* Update mode */</div><div class='ctx'> 	ovl_copyattr(inode);</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(out, &amp;real);</div><div class='del'>-	if (ret)</div><div class='add'>+	realfile = ovl_real_file(out);</div><div class='add'>+	ret = PTR_ERR(realfile);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	ret = backing_file_splice_write(pipe, real.file, ppos, len, flags, &amp;ctx);</div><div class='del'>-	fdput(real);</div><div class='add'>+	init_sync_kiocb(&amp;iocb, out);</div><div class='add'>+	iocb.ki_pos = *ppos;</div><div class='add'>+	ret = backing_file_splice_write(pipe, realfile, &amp;iocb, len, flags, &amp;ctx);</div><div class='add'>+	*ppos = iocb.ki_pos;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='hunk'>@@ -387,47 +440,45 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync)</div><div class='ctx'> {</div><div class='del'>-	struct fd real;</div><div class='del'>-	const struct cred *old_cred;</div><div class='add'>+	struct dentry *dentry = file_dentry(file);</div><div class='add'>+	enum ovl_path_type type;</div><div class='add'>+	struct path upperpath;</div><div class='add'>+	struct file *upperfile;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ovl_sync_status(OVL_FS(file_inode(file)-&gt;i_sb));</div><div class='ctx'> 	if (ret &lt;= 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget_meta(file, &amp;real, !datasync);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	/* Don't sync lower file for fear of receiving EROFS error */</div><div class='del'>-	if (file_inode(real.file) == ovl_inode_upper(file_inode(file))) {</div><div class='del'>-		old_cred = ovl_override_creds(file_inode(file)-&gt;i_sb);</div><div class='del'>-		ret = vfs_fsync_range(real.file, start, end, datasync);</div><div class='del'>-		revert_creds(old_cred);</div><div class='del'>-	}</div><div class='add'>+	type = ovl_path_type(dentry);</div><div class='add'>+	if (!OVL_TYPE_UPPER(type) || (datasync &amp;&amp; OVL_TYPE_MERGE(type)))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	fdput(real);</div><div class='add'>+	ovl_path_upper(dentry, &amp;upperpath);</div><div class='add'>+	upperfile = ovl_real_file_path(file, &amp;upperpath);</div><div class='add'>+	if (IS_ERR(upperfile))</div><div class='add'>+		return PTR_ERR(upperfile);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	with_ovl_creds(file_inode(file)-&gt;i_sb)</div><div class='add'>+		return vfs_fsync_range(upperfile, start, end, datasync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct file *realfile = file-&gt;private_data;</div><div class='add'>+	struct ovl_file *of = file-&gt;private_data;</div><div class='ctx'> 	struct backing_file_ctx ctx = {</div><div class='ctx'> 		.cred = ovl_creds(file_inode(file)-&gt;i_sb),</div><div class='del'>-		.user_file = file,</div><div class='ctx'> 		.accessed = ovl_file_accessed,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return backing_file_mmap(realfile, vma, &amp;ctx);</div><div class='add'>+	return backing_file_mmap(of-&gt;realfile, vma, &amp;ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='del'>-	struct fd real;</div><div class='del'>-	const struct cred *old_cred;</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode);</div><div class='hunk'>@@ -437,19 +488,17 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(file, &amp;real);</div><div class='del'>-	if (ret)</div><div class='add'>+	realfile = ovl_real_file(file);</div><div class='add'>+	ret = PTR_ERR(realfile);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(file_inode(file)-&gt;i_sb);</div><div class='del'>-	ret = vfs_fallocate(real.file, mode, offset, len);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(inode-&gt;i_sb)</div><div class='add'>+		ret = vfs_fallocate(realfile, mode, offset, len);</div><div class='ctx'> </div><div class='ctx'> 	/* Update size */</div><div class='ctx'> 	ovl_file_modified(file);</div><div class='ctx'> </div><div class='del'>-	fdput(real);</div><div class='del'>-</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -458,21 +507,14 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> static int ovl_fadvise(struct file *file, loff_t offset, loff_t len, int advice)</div><div class='ctx'> {</div><div class='del'>-	struct fd real;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = ovl_real_fdget(file, &amp;real);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	old_cred = ovl_override_creds(file_inode(file)-&gt;i_sb);</div><div class='del'>-	ret = vfs_fadvise(real.file, offset, len, advice);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	struct file *realfile;</div><div class='ctx'> </div><div class='del'>-	fdput(real);</div><div class='add'>+	realfile = ovl_real_file(file);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='add'>+		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	with_ovl_creds(file_inode(file)-&gt;i_sb)</div><div class='add'>+		return vfs_fadvise(realfile, offset, len, advice);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum ovl_copyop {</div><div class='hunk'>@@ -486,8 +528,7 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 			    loff_t len, unsigned int flags, enum ovl_copyop op)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode_out = file_inode(file_out);</div><div class='del'>-	struct fd real_in, real_out;</div><div class='del'>-	const struct cred *old_cred;</div><div class='add'>+	struct file *realfile_in, *realfile_out;</div><div class='ctx'> 	loff_t ret;</div><div class='ctx'> </div><div class='ctx'> 	inode_lock(inode_out);</div><div class='hunk'>@@ -499,42 +540,39 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(file_out, &amp;real_out);</div><div class='del'>-	if (ret)</div><div class='add'>+	realfile_out = ovl_real_file(file_out);</div><div class='add'>+	ret = PTR_ERR(realfile_out);</div><div class='add'>+	if (IS_ERR(realfile_out))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	ret = ovl_real_fdget(file_in, &amp;real_in);</div><div class='del'>-	if (ret) {</div><div class='del'>-		fdput(real_out);</div><div class='add'>+	realfile_in = ovl_real_file(file_in);</div><div class='add'>+	ret = PTR_ERR(realfile_in);</div><div class='add'>+	if (IS_ERR(realfile_in))</div><div class='ctx'> 		goto out_unlock;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(file_inode(file_out)-&gt;i_sb);</div><div class='del'>-	switch (op) {</div><div class='del'>-	case OVL_COPY:</div><div class='del'>-		ret = vfs_copy_file_range(real_in.file, pos_in,</div><div class='del'>-					  real_out.file, pos_out, len, flags);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case OVL_CLONE:</div><div class='del'>-		ret = vfs_clone_file_range(real_in.file, pos_in,</div><div class='del'>-					   real_out.file, pos_out, len, flags);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case OVL_DEDUPE:</div><div class='del'>-		ret = vfs_dedupe_file_range_one(real_in.file, pos_in,</div><div class='del'>-						real_out.file, pos_out, len,</div><div class='del'>-						flags);</div><div class='del'>-		break;</div><div class='add'>+	with_ovl_creds(file_inode(file_out)-&gt;i_sb) {</div><div class='add'>+		switch (op) {</div><div class='add'>+		case OVL_COPY:</div><div class='add'>+			ret = vfs_copy_file_range(realfile_in, pos_in,</div><div class='add'>+						  realfile_out, pos_out, len, flags);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case OVL_CLONE:</div><div class='add'>+			ret = vfs_clone_file_range(realfile_in, pos_in,</div><div class='add'>+						   realfile_out, pos_out, len, flags);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case OVL_DEDUPE:</div><div class='add'>+			ret = vfs_dedupe_file_range_one(realfile_in, pos_in,</div><div class='add'>+							realfile_out, pos_out, len,</div><div class='add'>+							flags);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='ctx'> 	/* Update size */</div><div class='ctx'> 	ovl_file_modified(file_out);</div><div class='ctx'> </div><div class='del'>-	fdput(real_in);</div><div class='del'>-	fdput(real_out);</div><div class='del'>-</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	inode_unlock(inode_out);</div><div class='ctx'> </div><div class='hunk'>@@ -578,20 +616,17 @@ static loff_t ovl_remap_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> </div><div class='ctx'> static int ovl_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> {</div><div class='del'>-	struct fd real;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	int err;</div><div class='add'>+	struct file *realfile;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	err = ovl_real_fdget(file, &amp;real);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	realfile = ovl_real_file(file);</div><div class='add'>+	if (IS_ERR(realfile))</div><div class='add'>+		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='del'>-	if (real.file-&gt;f_op-&gt;flush) {</div><div class='del'>-		old_cred = ovl_override_creds(file_inode(file)-&gt;i_sb);</div><div class='del'>-		err = real.file-&gt;f_op-&gt;flush(real.file, id);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+	if (realfile-&gt;f_op-&gt;flush) {</div><div class='add'>+		with_ovl_creds(file_inode(file)-&gt;i_sb)</div><div class='add'>+			err = realfile-&gt;f_op-&gt;flush(realfile, id);</div><div class='ctx'> 	}</div><div class='del'>-	fdput(real);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c<br/>index c63b31a460be..bdbf86b56a9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/inode.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/fiemap.h&gt;</div><div class='ctx'> #include &lt;linux/fileattr.h&gt;</div><div class='hunk'>@@ -26,7 +25,6 @@ int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	bool full_copy_up = false;</div><div class='ctx'> 	struct dentry *upperdentry;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> </div><div class='ctx'> 	err = setattr_prepare(&amp;nop_mnt_idmap, dentry, attr);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -79,9 +77,8 @@ int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 			goto out_put_write;</div><div class='ctx'> </div><div class='ctx'> 		inode_lock(upperdentry-&gt;d_inode);</div><div class='del'>-		old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-		err = ovl_do_notify_change(ofs, upperdentry, attr);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+			err = ovl_do_notify_change(ofs, upperdentry, attr);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			ovl_copyattr(dentry-&gt;d_inode);</div><div class='ctx'> 		inode_unlock(upperdentry-&gt;d_inode);</div><div class='hunk'>@@ -154,13 +151,22 @@ static void ovl_map_dev_ino(struct dentry *dentry, struct kstat *stat, int fsid)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ovl_real_getattr_nosec(struct super_block *sb,</div><div class='add'>+					 const struct path *path,</div><div class='add'>+					 struct kstat *stat, u32 request_mask,</div><div class='add'>+					 unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	with_ovl_creds(sb)</div><div class='add'>+		return vfs_getattr_nosec(path, stat, request_mask, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 		struct kstat *stat, u32 request_mask, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = path-&gt;dentry;</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	enum ovl_path_type type;</div><div class='ctx'> 	struct path realpath;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	bool is_dir = S_ISDIR(inode-&gt;i_mode);</div><div class='ctx'> 	int fsid = 0;</div><div class='hunk'>@@ -170,10 +176,9 @@ int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 	metacopy_blocks = ovl_is_metacopy_dentry(dentry);</div><div class='ctx'> </div><div class='ctx'> 	type = ovl_path_real(dentry, &amp;realpath);</div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	err = ovl_do_getattr(&amp;realpath, stat, request_mask, flags);</div><div class='add'>+	err = ovl_real_getattr_nosec(sb, &amp;realpath, stat, request_mask, flags);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Report the effective immutable/append-only STATX flags */</div><div class='ctx'> 	generic_fill_statx_attr(inode, stat);</div><div class='hunk'>@@ -196,10 +201,9 @@ int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 					(!is_dir ? STATX_NLINK : 0);</div><div class='ctx'> </div><div class='ctx'> 			ovl_path_lower(dentry, &amp;realpath);</div><div class='del'>-			err = ovl_do_getattr(&amp;realpath, &amp;lowerstat, lowermask,</div><div class='del'>-					     flags);</div><div class='add'>+			err = ovl_real_getattr_nosec(sb, &amp;realpath, &amp;lowerstat, lowermask, flags);</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto out;</div><div class='add'>+				return err;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Lower hardlinks may be broken on copy up to different</div><div class='hunk'>@@ -249,10 +253,10 @@ int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> </div><div class='ctx'> 			ovl_path_lowerdata(dentry, &amp;realpath);</div><div class='ctx'> 			if (realpath.dentry) {</div><div class='del'>-				err = ovl_do_getattr(&amp;realpath, &amp;lowerdatastat,</div><div class='del'>-						     lowermask, flags);</div><div class='add'>+				err = ovl_real_getattr_nosec(sb, &amp;realpath, &amp;lowerdatastat,</div><div class='add'>+							     lowermask, flags);</div><div class='ctx'> 				if (err)</div><div class='del'>-					goto out;</div><div class='add'>+					return err;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				lowerdatastat.blocks =</div><div class='ctx'> 					round_up(stat-&gt;size, stat-&gt;blksize) &gt;&gt; 9;</div><div class='hunk'>@@ -280,9 +284,6 @@ int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='ctx'> 	if (!is_dir &amp;&amp; ovl_test_flag(OVL_INDEX, d_inode(dentry)))</div><div class='ctx'> 		stat-&gt;nlink = dentry-&gt;d_inode-&gt;i_nlink;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +293,6 @@ int ovl_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 	struct inode *upperinode = ovl_inode_upper(inode);</div><div class='ctx'> 	struct inode *realinode;</div><div class='ctx'> 	struct path realpath;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Careful in RCU walk mode */</div><div class='hunk'>@@ -310,33 +310,26 @@ int ovl_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='ctx'> 	if (!upperinode &amp;&amp;</div><div class='ctx'> 	    !special_file(realinode-&gt;i_mode) &amp;&amp; mask &amp; MAY_WRITE) {</div><div class='ctx'> 		mask &amp;= ~(MAY_WRITE | MAY_APPEND);</div><div class='ctx'> 		/* Make sure mounter can read file for copy up later */</div><div class='ctx'> 		mask |= MAY_READ;</div><div class='ctx'> 	}</div><div class='del'>-	err = inode_permission(mnt_idmap(realpath.mnt), realinode, mask);</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	with_ovl_creds(inode-&gt;i_sb)</div><div class='add'>+		return inode_permission(mnt_idmap(realpath.mnt), realinode, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *ovl_get_link(struct dentry *dentry,</div><div class='ctx'> 				struct inode *inode,</div><div class='ctx'> 				struct delayed_call *done)</div><div class='ctx'> {</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='ctx'> 	if (!dentry)</div><div class='ctx'> 		return ERR_PTR(-ECHILD);</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	p = vfs_get_link(ovl_dentry_real(dentry), done);</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-	return p;</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		return vfs_get_link(ovl_dentry_real(dentry), done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_POSIX_ACL</div><div class='hunk'>@@ -466,11 +459,8 @@ struct posix_acl *do_ovl_get_acl(struct mnt_idmap *idmap,</div><div class='ctx'> </div><div class='ctx'> 		acl = get_cached_acl_rcu(realinode, type);</div><div class='ctx'> 	} else {</div><div class='del'>-		const struct cred *old_cred;</div><div class='del'>-</div><div class='del'>-		old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='del'>-		acl = ovl_get_acl_path(&amp;realpath, posix_acl_xattr_name(type), noperm);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		with_ovl_creds(inode-&gt;i_sb)</div><div class='add'>+			acl = ovl_get_acl_path(&amp;realpath, posix_acl_xattr_name(type), noperm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return acl;</div><div class='hunk'>@@ -482,7 +472,6 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct path realpath;</div><div class='ctx'> 	const char *acl_name;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct dentry *upperdentry = ovl_dentry_upper(dentry);</div><div class='ctx'> 	struct dentry *realdentry = upperdentry ?: ovl_dentry_lower(dentry);</div><div class='hunk'>@@ -496,10 +485,8 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 		struct posix_acl *real_acl;</div><div class='ctx'> </div><div class='ctx'> 		ovl_path_lower(dentry, &amp;realpath);</div><div class='del'>-		old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-		real_acl = vfs_get_acl(mnt_idmap(realpath.mnt), realdentry,</div><div class='del'>-				       acl_name);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+			real_acl = vfs_get_acl(mnt_idmap(realpath.mnt), realdentry, acl_name);</div><div class='ctx'> 		if (IS_ERR(real_acl)) {</div><div class='ctx'> 			err = PTR_ERR(real_acl);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -519,12 +506,12 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	if (acl)</div><div class='del'>-		err = ovl_do_set_acl(ofs, realdentry, acl_name, acl);</div><div class='del'>-	else</div><div class='del'>-		err = ovl_do_remove_acl(ofs, realdentry, acl_name);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb) {</div><div class='add'>+		if (acl)</div><div class='add'>+			err = ovl_do_set_acl(ofs, realdentry, acl_name, acl);</div><div class='add'>+		else</div><div class='add'>+			err = ovl_do_remove_acl(ofs, realdentry, acl_name);</div><div class='add'>+	}</div><div class='ctx'> 	ovl_drop_write(dentry);</div><div class='ctx'> </div><div class='ctx'> 	/* copy c/mtime */</div><div class='hunk'>@@ -589,9 +576,7 @@ int ovl_update_time(struct inode *inode, int flags)</div><div class='ctx'> static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		      u64 start, u64 len)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	struct inode *realinode = ovl_inode_realdata(inode);</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> </div><div class='ctx'> 	if (!realinode)</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -599,11 +584,8 @@ static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 	if (!realinode-&gt;i_op-&gt;fiemap)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='del'>-	err = realinode-&gt;i_op-&gt;fiemap(realinode, fieinfo, start, len);</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	with_ovl_creds(inode-&gt;i_sb)</div><div class='add'>+		return realinode-&gt;i_op-&gt;fiemap(realinode, fieinfo, start, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -611,14 +593,19 @@ static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'>  * Introducing security_inode_fileattr_get/set() hooks would solve this issue</div><div class='ctx'>  * properly.</div><div class='ctx'>  */</div><div class='del'>-static int ovl_security_fileattr(const struct path *realpath, struct fileattr *fa,</div><div class='add'>+static int ovl_security_fileattr(const struct path *realpath, struct file_kattr *fa,</div><div class='ctx'> 				 bool set)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file;</div><div class='ctx'> 	unsigned int cmd;</div><div class='ctx'> 	int err;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+</div><div class='add'>+	flags = O_RDONLY;</div><div class='add'>+	if (force_o_largefile())</div><div class='add'>+		flags |= O_LARGEFILE;</div><div class='ctx'> </div><div class='del'>-	file = dentry_open(realpath, O_RDONLY, current_cred());</div><div class='add'>+	file = dentry_open(realpath, flags, current_cred());</div><div class='ctx'> 	if (IS_ERR(file))</div><div class='ctx'> 		return PTR_ERR(file);</div><div class='ctx'> </div><div class='hunk'>@@ -633,7 +620,7 @@ static int ovl_security_fileattr(const struct path *realpath, struct fileattr *f</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa)</div><div class='add'>+int ovl_real_fileattr_set(const struct path *realpath, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -645,11 +632,10 @@ int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ovl_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		     struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+		     struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct path upperpath;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -661,18 +647,18 @@ int ovl_fileattr_set(struct mnt_idmap *idmap,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='del'>-		/*</div><div class='del'>-		 * Store immutable/append-only flags in xattr and clear them</div><div class='del'>-		 * in upper fileattr (in case they were set by older kernel)</div><div class='del'>-		 * so children of "ovl-immutable" directories lower aliases of</div><div class='del'>-		 * "ovl-immutable" hardlinks could be copied up.</div><div class='del'>-		 * Clear xattr when flags are cleared.</div><div class='del'>-		 */</div><div class='del'>-		err = ovl_set_protattr(inode, upperpath.dentry, fa);</div><div class='del'>-		if (!err)</div><div class='del'>-			err = ovl_real_fileattr_set(&amp;upperpath, fa);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		with_ovl_creds(inode-&gt;i_sb) {</div><div class='add'>+			/*</div><div class='add'>+			 * Store immutable/append-only flags in xattr and clear them</div><div class='add'>+			 * in upper fileattr (in case they were set by older kernel)</div><div class='add'>+			 * so children of "ovl-immutable" directories lower aliases of</div><div class='add'>+			 * "ovl-immutable" hardlinks could be copied up.</div><div class='add'>+			 * Clear xattr when flags are cleared.</div><div class='add'>+			 */</div><div class='add'>+			err = ovl_set_protattr(inode, upperpath.dentry, fa);</div><div class='add'>+			if (!err)</div><div class='add'>+				err = ovl_real_fileattr_set(&amp;upperpath, fa);</div><div class='add'>+		}</div><div class='ctx'> 		ovl_drop_write(dentry);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -693,7 +679,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Convert inode protection flags to fileattr flags */</div><div class='del'>-static void ovl_fileattr_prot_flags(struct inode *inode, struct fileattr *fa)</div><div class='add'>+static void ovl_fileattr_prot_flags(struct inode *inode, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	BUILD_BUG_ON(OVL_PROT_FS_FLAGS_MASK &amp; ~FS_COMMON_FL);</div><div class='ctx'> 	BUILD_BUG_ON(OVL_PROT_FSX_FLAGS_MASK &amp; ~FS_XFLAG_COMMON);</div><div class='hunk'>@@ -708,7 +694,7 @@ static void ovl_fileattr_prot_flags(struct inode *inode, struct fileattr *fa)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa)</div><div class='add'>+int ovl_real_fileattr_get(const struct path *realpath, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -722,19 +708,17 @@ int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='add'>+int ovl_fileattr_get(struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	struct path realpath;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ovl_path_real(dentry, &amp;realpath);</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(inode-&gt;i_sb);</div><div class='del'>-	err = ovl_real_fileattr_get(&amp;realpath, fa);</div><div class='add'>+	with_ovl_creds(inode-&gt;i_sb)</div><div class='add'>+		err = ovl_real_fileattr_get(&amp;realpath, fa);</div><div class='ctx'> 	ovl_fileattr_prot_flags(inode, fa);</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1148,7 +1132,7 @@ struct inode *ovl_get_trap_inode(struct super_block *sb, struct dentry *dir)</div><div class='ctx'> 	if (!trap)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (!(trap-&gt;i_state &amp; I_NEW)) {</div><div class='add'>+	if (!(inode_state_read_once(trap) &amp; I_NEW)) {</div><div class='ctx'> 		/* Conflicting layer roots? */</div><div class='ctx'> 		iput(trap);</div><div class='ctx'> 		return ERR_PTR(-ELOOP);</div><div class='hunk'>@@ -1239,7 +1223,7 @@ struct inode *ovl_get_inode(struct super_block *sb,</div><div class='ctx'> 		inode = ovl_iget5(sb, oip-&gt;newinode, key);</div><div class='ctx'> 		if (!inode)</div><div class='ctx'> 			goto out_err;</div><div class='del'>-		if (!(inode-&gt;i_state &amp; I_NEW)) {</div><div class='add'>+		if (!(inode_state_read_once(inode) &amp; I_NEW)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Verify that the underlying files stored in the inode</div><div class='ctx'> 			 * match those in the dentry.</div><div class='hunk'>@@ -1276,6 +1260,7 @@ struct inode *ovl_get_inode(struct super_block *sb,</div><div class='ctx'> 	}</div><div class='ctx'> 	ovl_fill_inode(inode, realinode-&gt;i_mode, realinode-&gt;i_rdev);</div><div class='ctx'> 	ovl_inode_init(inode, oip, ino, fsid);</div><div class='add'>+	WARN_ON_ONCE(!!IS_CASEFOLDED(inode) != ofs-&gt;casefold);</div><div class='ctx'> </div><div class='ctx'> 	if (upperdentry &amp;&amp; ovl_is_impuredir(sb, upperdentry))</div><div class='ctx'> 		ovl_set_flag(OVL_IMPURE, inode);</div><div class='hunk'>@@ -1298,7 +1283,7 @@ struct inode *ovl_get_inode(struct super_block *sb,</div><div class='ctx'> 	if (upperdentry)</div><div class='ctx'> 		ovl_check_protattr(inode, upperdentry);</div><div class='ctx'> </div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW)</div><div class='add'>+	if (inode_state_read_once(inode) &amp; I_NEW)</div><div class='ctx'> 		unlock_new_inode(inode);</div><div class='ctx'> out:</div><div class='ctx'> 	return inode;</div><div class='head'>diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c<br/>index 984ffdaeed6c..e9a69c95be91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/namei.c</a></div><div class='hunk'>@@ -14,17 +14,18 @@</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include "overlayfs.h"</div><div class='ctx'> </div><div class='del'>-#include "../internal.h"	/* for vfs_path_lookup */</div><div class='del'>-</div><div class='ctx'> struct ovl_lookup_data {</div><div class='ctx'> 	struct super_block *sb;</div><div class='del'>-	struct vfsmount *mnt;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	const struct ovl_layer *layer;</div><div class='ctx'> 	struct qstr name;</div><div class='ctx'> 	bool is_dir;</div><div class='ctx'> 	bool opaque;</div><div class='add'>+	bool xwhiteouts;</div><div class='ctx'> 	bool stop;</div><div class='ctx'> 	bool last;</div><div class='ctx'> 	char *redirect;</div><div class='add'>+	char *upperredirect;</div><div class='ctx'> 	int metacopy;</div><div class='ctx'> 	/* Referring to last redirect xattr */</div><div class='ctx'> 	bool absolute_redirect;</div><div class='hunk'>@@ -201,17 +202,13 @@ struct dentry *ovl_decode_real_fh(struct ovl_fs *ofs, struct ovl_fh *fh,</div><div class='ctx'> 	return real;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ovl_is_opaquedir(struct ovl_fs *ofs, const struct path *path)</div><div class='del'>-{</div><div class='del'>-	return ovl_path_check_dir_xattr(ofs, path, OVL_XATTR_OPAQUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct dentry *ovl_lookup_positive_unlocked(struct ovl_lookup_data *d,</div><div class='ctx'> 						   const char *name,</div><div class='ctx'> 						   struct dentry *base, int len,</div><div class='ctx'> 						   bool drop_negative)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *ret = lookup_one_unlocked(mnt_idmap(d-&gt;mnt), name, base, len);</div><div class='add'>+	struct dentry *ret = lookup_one_unlocked(mnt_idmap(d-&gt;layer-&gt;mnt),</div><div class='add'>+						 &amp;QSTR_LEN(name, len), base);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(ret) &amp;&amp; d_flags_negative(smp_load_acquire(&amp;ret-&gt;d_flags))) {</div><div class='ctx'> 		if (drop_negative &amp;&amp; ret-&gt;d_lockref.count == 1) {</div><div class='hunk'>@@ -232,10 +229,27 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,</div><div class='ctx'> 			     size_t prelen, const char *post,</div><div class='ctx'> 			     struct dentry **ret, bool drop_negative)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *this;</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(d-&gt;sb);</div><div class='add'>+	struct dentry *this = NULL;</div><div class='add'>+	const char *warn;</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool last_element = !post[0];</div><div class='add'>+	bool is_upper = d-&gt;layer-&gt;idx == 0;</div><div class='add'>+	char val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We allow filesystems that are case-folding capable as long as the</div><div class='add'>+	 * layers are consistently enabled in the stack, enabled for every dir</div><div class='add'>+	 * or disabled in all dirs. If someone has modified case folding on a</div><div class='add'>+	 * directory on underlying layer, the warranty of the ovl stack is</div><div class='add'>+	 * voided.</div><div class='add'>+	 */</div><div class='add'>+	if (ofs-&gt;casefold != ovl_dentry_casefolded(base)) {</div><div class='add'>+		warn = "parent wrong casefold";</div><div class='add'>+		err = -ESTALE;</div><div class='add'>+		goto out_warn;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	this = ovl_lookup_positive_unlocked(d, name, base, namelen, drop_negative);</div><div class='ctx'> 	if (IS_ERR(this)) {</div><div class='hunk'>@@ -246,15 +260,22 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ofs-&gt;casefold != ovl_dentry_casefolded(this)) {</div><div class='add'>+		warn = "child wrong casefold";</div><div class='add'>+		err = -EREMOTE;</div><div class='add'>+		goto out_warn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ovl_dentry_weird(this)) {</div><div class='ctx'> 		/* Don't support traversing automounts and other weirdness */</div><div class='add'>+		warn = "unsupported object type";</div><div class='ctx'> 		err = -EREMOTE;</div><div class='del'>-		goto out_err;</div><div class='add'>+		goto out_warn;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	path.dentry = this;</div><div class='del'>-	path.mnt = d-&gt;mnt;</div><div class='del'>-	if (ovl_path_is_whiteout(OVL_FS(d-&gt;sb), &amp;path)) {</div><div class='add'>+	path.mnt = d-&gt;layer-&gt;mnt;</div><div class='add'>+	if (ovl_path_is_whiteout(ofs, &amp;path)) {</div><div class='ctx'> 		d-&gt;stop = d-&gt;opaque = true;</div><div class='ctx'> 		goto put_and_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -272,7 +293,7 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,</div><div class='ctx'> 			d-&gt;stop = true;</div><div class='ctx'> 			goto put_and_out;</div><div class='ctx'> 		}</div><div class='del'>-		err = ovl_check_metacopy_xattr(OVL_FS(d-&gt;sb), &amp;path, NULL);</div><div class='add'>+		err = ovl_check_metacopy_xattr(ofs, &amp;path, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +304,9 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ovl_lookup_trap_inode(d-&gt;sb, this)) {</div><div class='ctx'> 			/* Caught in a trap of overlapping layers */</div><div class='add'>+			warn = "overlapping layers";</div><div class='ctx'> 			err = -ELOOP;</div><div class='del'>-			goto out_err;</div><div class='add'>+			goto out_warn;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (last_element)</div><div class='hunk'>@@ -292,7 +314,12 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,</div><div class='ctx'> 		if (d-&gt;last)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (ovl_is_opaquedir(OVL_FS(d-&gt;sb), &amp;path)) {</div><div class='add'>+		/* overlay.opaque=x means xwhiteouts directory */</div><div class='add'>+		val = ovl_get_opaquedir_val(ofs, &amp;path);</div><div class='add'>+		if (last_element &amp;&amp; !is_upper &amp;&amp; val == 'x') {</div><div class='add'>+			d-&gt;xwhiteouts = true;</div><div class='add'>+			ovl_layer_set_xwhiteouts(ofs, d-&gt;layer);</div><div class='add'>+		} else if (val == 'y') {</div><div class='ctx'> 			d-&gt;stop = true;</div><div class='ctx'> 			if (last_element)</div><div class='ctx'> 				d-&gt;opaque = true;</div><div class='hunk'>@@ -311,6 +338,10 @@ put_and_out:</div><div class='ctx'> 	this = NULL;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='add'>+out_warn:</div><div class='add'>+	pr_warn_ratelimited("failed lookup in %s (%pd2, name='%.*s', err=%i): %s\n",</div><div class='add'>+			    is_upper ? "upper" : "lower", base,</div><div class='add'>+			    namelen, name, err, warn);</div><div class='ctx'> out_err:</div><div class='ctx'> 	dput(this);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -537,7 +568,7 @@ int ovl_verify_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='ctx'> 	struct ovl_fh *fh;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fh = ovl_encode_real_fh(ofs, real, is_upper);</div><div class='add'>+	fh = ovl_encode_real_fh(ofs, d_inode(real), is_upper);</div><div class='ctx'> 	err = PTR_ERR(fh);</div><div class='ctx'> 	if (IS_ERR(fh)) {</div><div class='ctx'> 		fh = NULL;</div><div class='hunk'>@@ -733,7 +764,7 @@ int ovl_get_index_name(struct ovl_fs *ofs, struct dentry *origin,</div><div class='ctx'> 	struct ovl_fh *fh;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fh = ovl_encode_real_fh(ofs, origin, false);</div><div class='add'>+	fh = ovl_encode_real_fh(ofs, d_inode(origin), false);</div><div class='ctx'> 	if (IS_ERR(fh))</div><div class='ctx'> 		return PTR_ERR(fh);</div><div class='ctx'> </div><div class='hunk'>@@ -754,7 +785,7 @@ struct dentry *ovl_get_index_fh(struct ovl_fs *ofs, struct ovl_fh *fh)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	index = lookup_positive_unlocked(name.name, ofs-&gt;workdir, name.len);</div><div class='add'>+	index = lookup_noperm_positive_unlocked(&amp;name, ofs-&gt;workdir);</div><div class='ctx'> 	kfree(name.name);</div><div class='ctx'> 	if (IS_ERR(index)) {</div><div class='ctx'> 		if (PTR_ERR(index) == -ENOENT)</div><div class='hunk'>@@ -786,8 +817,8 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> </div><div class='del'>-	index = lookup_one_positive_unlocked(ovl_upper_mnt_idmap(ofs), name.name,</div><div class='del'>-					     ofs-&gt;workdir, name.len);</div><div class='add'>+	index = lookup_one_positive_unlocked(ovl_upper_mnt_idmap(ofs), &amp;name,</div><div class='add'>+					     ofs-&gt;workdir);</div><div class='ctx'> 	if (IS_ERR(index)) {</div><div class='ctx'> 		err = PTR_ERR(index);</div><div class='ctx'> 		if (err == -ENOENT) {</div><div class='hunk'>@@ -863,7 +894,8 @@ fail:</div><div class='ctx'>  * Returns next layer in stack starting from top.</div><div class='ctx'>  * Returns -1 if this is the last layer.</div><div class='ctx'>  */</div><div class='del'>-int ovl_path_next(int idx, struct dentry *dentry, struct path *path)</div><div class='add'>+int ovl_path_next(int idx, struct dentry *dentry, struct path *path,</div><div class='add'>+		  const struct ovl_layer **layer)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_entry *oe = OVL_E(dentry);</div><div class='ctx'> 	struct ovl_path *lowerstack = ovl_lowerstack(oe);</div><div class='hunk'>@@ -871,13 +903,16 @@ int ovl_path_next(int idx, struct dentry *dentry, struct path *path)</div><div class='ctx'> 	BUG_ON(idx &lt; 0);</div><div class='ctx'> 	if (idx == 0) {</div><div class='ctx'> 		ovl_path_upper(dentry, path);</div><div class='del'>-		if (path-&gt;dentry)</div><div class='add'>+		if (path-&gt;dentry) {</div><div class='add'>+			*layer = &amp;OVL_FS(dentry-&gt;d_sb)-&gt;layers[0];</div><div class='ctx'> 			return ovl_numlower(oe) ? 1 : -1;</div><div class='add'>+		}</div><div class='ctx'> 		idx++;</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(idx &gt; ovl_numlower(oe));</div><div class='ctx'> 	path-&gt;dentry = lowerstack[idx - 1].dentry;</div><div class='del'>-	path-&gt;mnt = lowerstack[idx - 1].layer-&gt;mnt;</div><div class='add'>+	*layer = lowerstack[idx - 1].layer;</div><div class='add'>+	path-&gt;mnt = (*layer)-&gt;mnt;</div><div class='ctx'> </div><div class='ctx'> 	return (idx &lt; ovl_numlower(oe)) ? idx + 1 : -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -944,15 +979,10 @@ static int ovl_maybe_validate_verity(struct dentry *dentry)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ovl_test_flag(OVL_VERIFIED_DIGEST, inode)) {</div><div class='del'>-		const struct cred *old_cred;</div><div class='del'>-</div><div class='del'>-		old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-</div><div class='del'>-		err = ovl_validate_verity(ofs, &amp;metapath, &amp;datapath);</div><div class='add'>+		with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+			err = ovl_validate_verity(ofs, &amp;metapath, &amp;datapath);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			ovl_set_flag(OVL_VERIFIED_DIGEST, inode);</div><div class='del'>-</div><div class='del'>-		revert_creds(old_cred);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ovl_inode_unlock(inode);</div><div class='hunk'>@@ -966,7 +996,6 @@ static int ovl_maybe_lookup_lowerdata(struct dentry *dentry)</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> 	const char *redirect = ovl_lowerdata_redirect(inode);</div><div class='ctx'> 	struct ovl_path datapath = {};</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!redirect || ovl_dentry_lowerdata(dentry))</div><div class='hunk'>@@ -984,9 +1013,8 @@ static int ovl_maybe_lookup_lowerdata(struct dentry *dentry)</div><div class='ctx'> 	if (ovl_dentry_lowerdata(dentry))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	err = ovl_lookup_data_layers(dentry, redirect, &amp;datapath);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		err = ovl_lookup_data_layers(dentry, redirect, &amp;datapath);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='hunk'>@@ -1017,55 +1045,69 @@ int ovl_verify_lowerdata(struct dentry *dentry)</div><div class='ctx'> 	return ovl_maybe_validate_verity(dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			  unsigned int flags)</div><div class='add'>+/*</div><div class='add'>+ * Following redirects/metacopy can have security consequences: it's like a</div><div class='add'>+ * symlink into the lower layer without the permission checks.</div><div class='add'>+ *</div><div class='add'>+ * This is only a problem if the upper layer is untrusted (e.g comes from an USB</div><div class='add'>+ * drive).  This can allow a non-readable file or directory to become readable.</div><div class='add'>+ *</div><div class='add'>+ * Only following redirects when redirects are enabled disables this attack</div><div class='add'>+ * vector when not necessary.</div><div class='add'>+ */</div><div class='add'>+static bool ovl_check_follow_redirect(struct ovl_lookup_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(d-&gt;sb);</div><div class='add'>+</div><div class='add'>+	if (d-&gt;metacopy &amp;&amp; !ofs-&gt;config.metacopy) {</div><div class='add'>+		pr_warn_ratelimited("refusing to follow metacopy origin for (%pd2)\n", d-&gt;dentry);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if ((d-&gt;redirect || d-&gt;upperredirect) &amp;&amp; !ovl_redirect_follow(ofs)) {</div><div class='add'>+		pr_warn_ratelimited("refusing to follow redirect for (%pd2)\n", d-&gt;dentry);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ovl_lookup_ctx {</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct ovl_entry *oe;</div><div class='add'>+	struct ovl_path *stack;</div><div class='add'>+	struct ovl_path *origin_path;</div><div class='add'>+	struct dentry *upperdentry;</div><div class='add'>+	struct dentry *index;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	unsigned int ctr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ovl_lookup_layers(struct ovl_lookup_ctx *ctx, struct ovl_lookup_data *d)</div><div class='ctx'> {</div><div class='del'>-	struct ovl_entry *oe = NULL;</div><div class='del'>-	const struct cred *old_cred;</div><div class='add'>+	struct dentry *dentry = ctx-&gt;dentry;</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct ovl_entry *poe = OVL_E(dentry-&gt;d_parent);</div><div class='ctx'> 	struct ovl_entry *roe = OVL_E(dentry-&gt;d_sb-&gt;s_root);</div><div class='del'>-	struct ovl_path *stack = NULL, *origin_path = NULL;</div><div class='del'>-	struct dentry *upperdir, *upperdentry = NULL;</div><div class='add'>+	bool check_redirect = (ovl_redirect_follow(ofs) || ofs-&gt;numdatalayer);</div><div class='add'>+	struct dentry *upperdir;</div><div class='add'>+	struct dentry *this;</div><div class='ctx'> 	struct dentry *origin = NULL;</div><div class='del'>-	struct dentry *index = NULL;</div><div class='del'>-	unsigned int ctr = 0;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='ctx'> 	bool upperopaque = false;</div><div class='del'>-	char *upperredirect = NULL;</div><div class='del'>-	struct dentry *this;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int err;</div><div class='ctx'> 	bool uppermetacopy = false;</div><div class='ctx'> 	int metacopy_size = 0;</div><div class='del'>-	struct ovl_lookup_data d = {</div><div class='del'>-		.sb = dentry-&gt;d_sb,</div><div class='del'>-		.name = dentry-&gt;d_name,</div><div class='del'>-		.is_dir = false,</div><div class='del'>-		.opaque = false,</div><div class='del'>-		.stop = false,</div><div class='del'>-		.last = ovl_redirect_follow(ofs) ? false : !ovl_numlower(poe),</div><div class='del'>-		.redirect = NULL,</div><div class='del'>-		.metacopy = 0,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (dentry-&gt;d_name.len &gt; ofs-&gt;namelen)</div><div class='del'>-		return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='ctx'> 	upperdir = ovl_dentry_upper(dentry-&gt;d_parent);</div><div class='ctx'> 	if (upperdir) {</div><div class='del'>-		d.mnt = ovl_upper_mnt(ofs);</div><div class='del'>-		err = ovl_lookup_layer(upperdir, &amp;d, &amp;upperdentry, true);</div><div class='add'>+		d-&gt;layer = &amp;ofs-&gt;layers[0];</div><div class='add'>+		err = ovl_lookup_layer(upperdir, d, &amp;ctx-&gt;upperdentry, true);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		if (upperdentry &amp;&amp; upperdentry-&gt;d_flags &amp; DCACHE_OP_REAL) {</div><div class='del'>-			dput(upperdentry);</div><div class='del'>-			err = -EREMOTE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		if (upperdentry &amp;&amp; !d.is_dir) {</div><div class='add'>+		if (ctx-&gt;upperdentry &amp;&amp; ctx-&gt;upperdentry-&gt;d_flags &amp; DCACHE_OP_REAL)</div><div class='add'>+			return -EREMOTE;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;upperdentry &amp;&amp; !d-&gt;is_dir) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Lookup copy up origin by decoding origin file handle.</div><div class='ctx'> 			 * We may get a disconnected dentry, which is fine,</div><div class='hunk'>@@ -1076,65 +1118,63 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			 * number - it's the same as if we held a reference</div><div class='ctx'> 			 * to a dentry in lower layer that was moved under us.</div><div class='ctx'> 			 */</div><div class='del'>-			err = ovl_check_origin(ofs, upperdentry, &amp;origin_path);</div><div class='add'>+			err = ovl_check_origin(ofs, ctx-&gt;upperdentry, &amp;ctx-&gt;origin_path);</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto out_put_upper;</div><div class='add'>+				return err;</div><div class='ctx'> </div><div class='del'>-			if (d.metacopy)</div><div class='add'>+			if (d-&gt;metacopy)</div><div class='ctx'> 				uppermetacopy = true;</div><div class='del'>-			metacopy_size = d.metacopy;</div><div class='add'>+			metacopy_size = d-&gt;metacopy;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (d.redirect) {</div><div class='add'>+		if (d-&gt;redirect) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='del'>-			upperredirect = kstrdup(d.redirect, GFP_KERNEL);</div><div class='del'>-			if (!upperredirect)</div><div class='del'>-				goto out_put_upper;</div><div class='del'>-			if (d.redirect[0] == '/')</div><div class='add'>+			d-&gt;upperredirect = kstrdup(d-&gt;redirect, GFP_KERNEL);</div><div class='add'>+			if (!d-&gt;upperredirect)</div><div class='add'>+				return err;</div><div class='add'>+			if (d-&gt;redirect[0] == '/')</div><div class='ctx'> 				poe = roe;</div><div class='ctx'> 		}</div><div class='del'>-		upperopaque = d.opaque;</div><div class='add'>+		upperopaque = d-&gt;opaque;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!d.stop &amp;&amp; ovl_numlower(poe)) {</div><div class='add'>+	if (!d-&gt;stop &amp;&amp; ovl_numlower(poe)) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		stack = ovl_stack_alloc(ofs-&gt;numlayer - 1);</div><div class='del'>-		if (!stack)</div><div class='del'>-			goto out_put_upper;</div><div class='add'>+		ctx-&gt;stack = ovl_stack_alloc(ofs-&gt;numlayer - 1);</div><div class='add'>+		if (!ctx-&gt;stack)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; !d.stop &amp;&amp; i &lt; ovl_numlower(poe); i++) {</div><div class='add'>+	for (i = 0; !d-&gt;stop &amp;&amp; i &lt; ovl_numlower(poe); i++) {</div><div class='ctx'> 		struct ovl_path lower = ovl_lowerstack(poe)[i];</div><div class='ctx'> </div><div class='del'>-		if (!ovl_redirect_follow(ofs))</div><div class='del'>-			d.last = i == ovl_numlower(poe) - 1;</div><div class='del'>-		else if (d.is_dir || !ofs-&gt;numdatalayer)</div><div class='del'>-			d.last = lower.layer-&gt;idx == ovl_numlower(roe);</div><div class='add'>+		if (!ovl_check_follow_redirect(d)) {</div><div class='add'>+			err = -EPERM;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_redirect)</div><div class='add'>+			d-&gt;last = i == ovl_numlower(poe) - 1;</div><div class='add'>+		else if (d-&gt;is_dir || !ofs-&gt;numdatalayer)</div><div class='add'>+			d-&gt;last = lower.layer-&gt;idx == ovl_numlower(roe);</div><div class='ctx'> </div><div class='del'>-		d.mnt = lower.layer-&gt;mnt;</div><div class='del'>-		err = ovl_lookup_layer(lower.dentry, &amp;d, &amp;this, false);</div><div class='add'>+		d-&gt;layer = lower.layer;</div><div class='add'>+		err = ovl_lookup_layer(lower.dentry, d, &amp;this, false);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_put;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		if (!this)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if ((uppermetacopy || d.metacopy) &amp;&amp; !ofs-&gt;config.metacopy) {</div><div class='del'>-			dput(this);</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			pr_warn_ratelimited("refusing to follow metacopy origin for (%pd2)\n", dentry);</div><div class='del'>-			goto out_put;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If no origin fh is stored in upper of a merge dir, store fh</div><div class='ctx'> 		 * of lower dir and set upper parent "impure".</div><div class='ctx'> 		 */</div><div class='del'>-		if (upperdentry &amp;&amp; !ctr &amp;&amp; !ofs-&gt;noxattr &amp;&amp; d.is_dir) {</div><div class='del'>-			err = ovl_fix_origin(ofs, dentry, this, upperdentry);</div><div class='add'>+		if (ctx-&gt;upperdentry &amp;&amp; !ctx-&gt;ctr &amp;&amp; !ofs-&gt;noxattr &amp;&amp; d-&gt;is_dir) {</div><div class='add'>+			err = ovl_fix_origin(ofs, dentry, this, ctx-&gt;upperdentry);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				dput(this);</div><div class='del'>-				goto out_put;</div><div class='add'>+				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1147,23 +1187,23 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		 * matches the dentry found using path based lookup,</div><div class='ctx'> 		 * otherwise error out.</div><div class='ctx'> 		 */</div><div class='del'>-		if (upperdentry &amp;&amp; !ctr &amp;&amp;</div><div class='del'>-		    ((d.is_dir &amp;&amp; ovl_verify_lower(dentry-&gt;d_sb)) ||</div><div class='del'>-		     (!d.is_dir &amp;&amp; ofs-&gt;config.index &amp;&amp; origin_path))) {</div><div class='del'>-			err = ovl_verify_origin(ofs, upperdentry, this, false);</div><div class='add'>+		if (ctx-&gt;upperdentry &amp;&amp; !ctx-&gt;ctr &amp;&amp;</div><div class='add'>+		    ((d-&gt;is_dir &amp;&amp; ovl_verify_lower(dentry-&gt;d_sb)) ||</div><div class='add'>+		     (!d-&gt;is_dir &amp;&amp; ofs-&gt;config.index &amp;&amp; ctx-&gt;origin_path))) {</div><div class='add'>+			err = ovl_verify_origin(ofs, ctx-&gt;upperdentry, this, false);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				dput(this);</div><div class='del'>-				if (d.is_dir)</div><div class='add'>+				if (d-&gt;is_dir)</div><div class='ctx'> 					break;</div><div class='del'>-				goto out_put;</div><div class='add'>+				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 			origin = this;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!upperdentry &amp;&amp; !d.is_dir &amp;&amp; !ctr &amp;&amp; d.metacopy)</div><div class='del'>-			metacopy_size = d.metacopy;</div><div class='add'>+		if (!ctx-&gt;upperdentry &amp;&amp; !d-&gt;is_dir &amp;&amp; !ctx-&gt;ctr &amp;&amp; d-&gt;metacopy)</div><div class='add'>+			metacopy_size = d-&gt;metacopy;</div><div class='ctx'> </div><div class='del'>-		if (d.metacopy &amp;&amp; ctr) {</div><div class='add'>+		if (d-&gt;metacopy &amp;&amp; ctx-&gt;ctr) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Do not store intermediate metacopy dentries in</div><div class='ctx'> 			 * lower chain, except top most lower metacopy dentry.</div><div class='hunk'>@@ -1173,42 +1213,31 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			dput(this);</div><div class='ctx'> 			this = NULL;</div><div class='ctx'> 		} else {</div><div class='del'>-			stack[ctr].dentry = this;</div><div class='del'>-			stack[ctr].layer = lower.layer;</div><div class='del'>-			ctr++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Following redirects can have security consequences: it's like</div><div class='del'>-		 * a symlink into the lower layer without the permission checks.</div><div class='del'>-		 * This is only a problem if the upper layer is untrusted (e.g</div><div class='del'>-		 * comes from an USB drive).  This can allow a non-readable file</div><div class='del'>-		 * or directory to become readable.</div><div class='del'>-		 *</div><div class='del'>-		 * Only following redirects when redirects are enabled disables</div><div class='del'>-		 * this attack vector when not necessary.</div><div class='del'>-		 */</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		if (d.redirect &amp;&amp; !ovl_redirect_follow(ofs)) {</div><div class='del'>-			pr_warn_ratelimited("refusing to follow redirect for (%pd2)\n",</div><div class='del'>-					    dentry);</div><div class='del'>-			goto out_put;</div><div class='add'>+			ctx-&gt;stack[ctx-&gt;ctr].dentry = this;</div><div class='add'>+			ctx-&gt;stack[ctx-&gt;ctr].layer = lower.layer;</div><div class='add'>+			ctx-&gt;ctr++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (d.stop)</div><div class='add'>+		if (d-&gt;stop)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (d.redirect &amp;&amp; d.redirect[0] == '/' &amp;&amp; poe != roe) {</div><div class='add'>+		if (d-&gt;redirect &amp;&amp; d-&gt;redirect[0] == '/' &amp;&amp; poe != roe) {</div><div class='ctx'> 			poe = roe;</div><div class='ctx'> 			/* Find the current layer on the root dentry */</div><div class='ctx'> 			i = lower.layer-&gt;idx - 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Defer lookup of lowerdata in data-only layers to first access */</div><div class='del'>-	if (d.metacopy &amp;&amp; ctr &amp;&amp; ofs-&gt;numdatalayer &amp;&amp; d.absolute_redirect) {</div><div class='del'>-		d.metacopy = 0;</div><div class='del'>-		ctr++;</div><div class='add'>+	/*</div><div class='add'>+	 * Defer lookup of lowerdata in data-only layers to first access.</div><div class='add'>+	 * Don't require redirect=follow and metacopy=on in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (d-&gt;metacopy &amp;&amp; ctx-&gt;ctr &amp;&amp; ofs-&gt;numdatalayer &amp;&amp; d-&gt;absolute_redirect) {</div><div class='add'>+		d-&gt;metacopy = 0;</div><div class='add'>+		ctx-&gt;ctr++;</div><div class='add'>+	} else if (!ovl_check_follow_redirect(d)) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1219,20 +1248,20 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	 * For metacopy dentry, path based lookup will find lower dentries.</div><div class='ctx'> 	 * Just make sure a corresponding data dentry has been found.</div><div class='ctx'> 	 */</div><div class='del'>-	if (d.metacopy || (uppermetacopy &amp;&amp; !ctr)) {</div><div class='add'>+	if (d-&gt;metacopy || (uppermetacopy &amp;&amp; !ctx-&gt;ctr)) {</div><div class='ctx'> 		pr_warn_ratelimited("metacopy with no lower data found - abort lookup (%pd2)\n",</div><div class='ctx'> 				    dentry);</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		goto out_put;</div><div class='del'>-	} else if (!d.is_dir &amp;&amp; upperdentry &amp;&amp; !ctr &amp;&amp; origin_path) {</div><div class='del'>-		if (WARN_ON(stack != NULL)) {</div><div class='add'>+		return err;</div><div class='add'>+	} else if (!d-&gt;is_dir &amp;&amp; ctx-&gt;upperdentry &amp;&amp; !ctx-&gt;ctr &amp;&amp; ctx-&gt;origin_path) {</div><div class='add'>+		if (WARN_ON(ctx-&gt;stack != NULL)) {</div><div class='ctx'> 			err = -EIO;</div><div class='del'>-			goto out_put;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='del'>-		stack = origin_path;</div><div class='del'>-		ctr = 1;</div><div class='del'>-		origin = origin_path-&gt;dentry;</div><div class='del'>-		origin_path = NULL;</div><div class='add'>+		ctx-&gt;stack = ctx-&gt;origin_path;</div><div class='add'>+		ctx-&gt;ctr = 1;</div><div class='add'>+		origin = ctx-&gt;origin_path-&gt;dentry;</div><div class='add'>+		ctx-&gt;origin_path = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1254,116 +1283,141 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	 * is enabled and if upper had an ORIGIN xattr.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='del'>-	if (!upperdentry &amp;&amp; ctr)</div><div class='del'>-		origin = stack[0].dentry;</div><div class='add'>+	if (!ctx-&gt;upperdentry &amp;&amp; ctx-&gt;ctr)</div><div class='add'>+		origin = ctx-&gt;stack[0].dentry;</div><div class='ctx'> </div><div class='ctx'> 	if (origin &amp;&amp; ovl_indexdir(dentry-&gt;d_sb) &amp;&amp;</div><div class='del'>-	    (!d.is_dir || ovl_index_all(dentry-&gt;d_sb))) {</div><div class='del'>-		index = ovl_lookup_index(ofs, upperdentry, origin, true);</div><div class='del'>-		if (IS_ERR(index)) {</div><div class='del'>-			err = PTR_ERR(index);</div><div class='del'>-			index = NULL;</div><div class='del'>-			goto out_put;</div><div class='add'>+	    (!d-&gt;is_dir || ovl_index_all(dentry-&gt;d_sb))) {</div><div class='add'>+		ctx-&gt;index = ovl_lookup_index(ofs, ctx-&gt;upperdentry, origin, true);</div><div class='add'>+		if (IS_ERR(ctx-&gt;index)) {</div><div class='add'>+			err = PTR_ERR(ctx-&gt;index);</div><div class='add'>+			ctx-&gt;index = NULL;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctr) {</div><div class='del'>-		oe = ovl_alloc_entry(ctr);</div><div class='add'>+	if (ctx-&gt;ctr) {</div><div class='add'>+		ctx-&gt;oe = ovl_alloc_entry(ctx-&gt;ctr);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		if (!oe)</div><div class='del'>-			goto out_put;</div><div class='add'>+		if (!ctx-&gt;oe)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		ovl_stack_cpy(ovl_lowerstack(oe), stack, ctr);</div><div class='add'>+		ovl_stack_cpy(ovl_lowerstack(ctx-&gt;oe), ctx-&gt;stack, ctx-&gt;ctr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (upperopaque)</div><div class='ctx'> 		ovl_dentry_set_opaque(dentry);</div><div class='add'>+	if (d-&gt;xwhiteouts)</div><div class='add'>+		ovl_dentry_set_xwhiteouts(dentry);</div><div class='ctx'> </div><div class='del'>-	if (upperdentry)</div><div class='add'>+	if (ctx-&gt;upperdentry)</div><div class='ctx'> 		ovl_dentry_set_upper_alias(dentry);</div><div class='del'>-	else if (index) {</div><div class='add'>+	else if (ctx-&gt;index) {</div><div class='add'>+		char *upperredirect;</div><div class='ctx'> 		struct path upperpath = {</div><div class='del'>-			.dentry = upperdentry = dget(index),</div><div class='add'>+			.dentry = ctx-&gt;upperdentry = dget(ctx-&gt;index),</div><div class='ctx'> 			.mnt = ovl_upper_mnt(ofs),</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * It's safe to assign upperredirect here: the previous</div><div class='del'>-		 * assignment of happens only if upperdentry is non-NULL, and</div><div class='add'>+		 * assignment happens only if upperdentry is non-NULL, and</div><div class='ctx'> 		 * this one only if upperdentry is NULL.</div><div class='ctx'> 		 */</div><div class='ctx'> 		upperredirect = ovl_get_redirect_xattr(ofs, &amp;upperpath, 0);</div><div class='del'>-		if (IS_ERR(upperredirect)) {</div><div class='del'>-			err = PTR_ERR(upperredirect);</div><div class='del'>-			upperredirect = NULL;</div><div class='del'>-			goto out_free_oe;</div><div class='del'>-		}</div><div class='add'>+		if (IS_ERR(upperredirect))</div><div class='add'>+			return PTR_ERR(upperredirect);</div><div class='add'>+		d-&gt;upperredirect = upperredirect;</div><div class='add'>+</div><div class='ctx'> 		err = ovl_check_metacopy_xattr(ofs, &amp;upperpath, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto out_free_oe;</div><div class='del'>-		uppermetacopy = err;</div><div class='add'>+			return err;</div><div class='add'>+		d-&gt;metacopy = uppermetacopy = err;</div><div class='ctx'> 		metacopy_size = err;</div><div class='add'>+</div><div class='add'>+		if (!ovl_check_follow_redirect(d)) {</div><div class='add'>+			err = -EPERM;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (upperdentry || ctr) {</div><div class='add'>+	if (ctx-&gt;upperdentry || ctx-&gt;ctr) {</div><div class='add'>+		struct inode *inode;</div><div class='ctx'> 		struct ovl_inode_params oip = {</div><div class='del'>-			.upperdentry = upperdentry,</div><div class='del'>-			.oe = oe,</div><div class='del'>-			.index = index,</div><div class='del'>-			.redirect = upperredirect,</div><div class='add'>+			.upperdentry = ctx-&gt;upperdentry,</div><div class='add'>+			.oe = ctx-&gt;oe,</div><div class='add'>+			.index = ctx-&gt;index,</div><div class='add'>+			.redirect = d-&gt;upperredirect,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* Store lowerdata redirect for lazy lookup */</div><div class='del'>-		if (ctr &gt; 1 &amp;&amp; !d.is_dir &amp;&amp; !stack[ctr - 1].dentry) {</div><div class='del'>-			oip.lowerdata_redirect = d.redirect;</div><div class='del'>-			d.redirect = NULL;</div><div class='add'>+		if (ctx-&gt;ctr &gt; 1 &amp;&amp; !d-&gt;is_dir &amp;&amp; !ctx-&gt;stack[ctx-&gt;ctr - 1].dentry) {</div><div class='add'>+			oip.lowerdata_redirect = d-&gt;redirect;</div><div class='add'>+			d-&gt;redirect = NULL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		inode = ovl_get_inode(dentry-&gt;d_sb, &amp;oip);</div><div class='del'>-		err = PTR_ERR(inode);</div><div class='ctx'> 		if (IS_ERR(inode))</div><div class='del'>-			goto out_free_oe;</div><div class='del'>-		if (upperdentry &amp;&amp; !uppermetacopy)</div><div class='del'>-			ovl_set_flag(OVL_UPPERDATA, inode);</div><div class='add'>+			return PTR_ERR(inode);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;inode = inode;</div><div class='add'>+		if (ctx-&gt;upperdentry &amp;&amp; !uppermetacopy)</div><div class='add'>+			ovl_set_flag(OVL_UPPERDATA, ctx-&gt;inode);</div><div class='ctx'> </div><div class='ctx'> 		if (metacopy_size &gt; OVL_METACOPY_MIN_SIZE)</div><div class='del'>-			ovl_set_flag(OVL_HAS_DIGEST, inode);</div><div class='add'>+			ovl_set_flag(OVL_HAS_DIGEST, ctx-&gt;inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ovl_dentry_init_reval(dentry, upperdentry, OVL_I_E(inode));</div><div class='add'>+	ovl_dentry_init_reval(dentry, ctx-&gt;upperdentry, OVL_I_E(ctx-&gt;inode));</div><div class='ctx'> </div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-	if (origin_path) {</div><div class='del'>-		dput(origin_path-&gt;dentry);</div><div class='del'>-		kfree(origin_path);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='add'>+			  unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='add'>+	struct ovl_entry *poe = OVL_E(dentry-&gt;d_parent);</div><div class='add'>+	bool check_redirect = (ovl_redirect_follow(ofs) || ofs-&gt;numdatalayer);</div><div class='add'>+	int err;</div><div class='add'>+	struct ovl_lookup_ctx ctx = {</div><div class='add'>+		.dentry = dentry,</div><div class='add'>+	};</div><div class='add'>+	struct ovl_lookup_data d = {</div><div class='add'>+		.sb	= dentry-&gt;d_sb,</div><div class='add'>+		.dentry = dentry,</div><div class='add'>+		.name	= dentry-&gt;d_name,</div><div class='add'>+		.last	= check_redirect ? false : !ovl_numlower(poe),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (dentry-&gt;d_name.len &gt; ofs-&gt;namelen)</div><div class='add'>+		return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		err = ovl_lookup_layers(&amp;ctx, &amp;d);</div><div class='add'>+</div><div class='add'>+	if (ctx.origin_path) {</div><div class='add'>+		dput(ctx.origin_path-&gt;dentry);</div><div class='add'>+		kfree(ctx.origin_path);</div><div class='ctx'> 	}</div><div class='del'>-	dput(index);</div><div class='del'>-	ovl_stack_free(stack, ctr);</div><div class='add'>+	dput(ctx.index);</div><div class='add'>+	ovl_stack_free(ctx.stack, ctx.ctr);</div><div class='ctx'> 	kfree(d.redirect);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='ctx'> </div><div class='del'>-out_free_oe:</div><div class='del'>-	ovl_free_entry(oe);</div><div class='del'>-out_put:</div><div class='del'>-	dput(index);</div><div class='del'>-	ovl_stack_free(stack, ctr);</div><div class='del'>-out_put_upper:</div><div class='del'>-	if (origin_path) {</div><div class='del'>-		dput(origin_path-&gt;dentry);</div><div class='del'>-		kfree(origin_path);</div><div class='add'>+	if (err) {</div><div class='add'>+		ovl_free_entry(ctx.oe);</div><div class='add'>+		dput(ctx.upperdentry);</div><div class='add'>+		kfree(d.upperredirect);</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='del'>-	dput(upperdentry);</div><div class='del'>-	kfree(upperredirect);</div><div class='del'>-out:</div><div class='del'>-	kfree(d.redirect);</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	return d_splice_alias(ctx.inode, dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool ovl_lower_positive(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_entry *poe = OVL_E(dentry-&gt;d_parent);</div><div class='ctx'> 	const struct qstr *name = &amp;dentry-&gt;d_name;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	bool positive = false;</div><div class='ctx'> 	bool done = false;</div><div class='hunk'>@@ -1379,40 +1433,45 @@ bool ovl_lower_positive(struct dentry *dentry)</div><div class='ctx'> 	if (!ovl_dentry_upper(dentry))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	/* Positive upper -&gt; have to look up lower to see whether it exists */</div><div class='del'>-	for (i = 0; !done &amp;&amp; !positive &amp;&amp; i &lt; ovl_numlower(poe); i++) {</div><div class='del'>-		struct dentry *this;</div><div class='del'>-		struct ovl_path *parentpath = &amp;ovl_lowerstack(poe)[i];</div><div class='del'>-</div><div class='del'>-		this = lookup_one_positive_unlocked(</div><div class='del'>-				mnt_idmap(parentpath-&gt;layer-&gt;mnt),</div><div class='del'>-				name-&gt;name, parentpath-&gt;dentry, name-&gt;len);</div><div class='del'>-		if (IS_ERR(this)) {</div><div class='del'>-			switch (PTR_ERR(this)) {</div><div class='del'>-			case -ENOENT:</div><div class='del'>-			case -ENAMETOOLONG:</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				/*</div><div class='del'>-				 * Assume something is there, we just couldn't</div><div class='del'>-				 * access it.</div><div class='del'>-				 */</div><div class='del'>-				positive = true;</div><div class='del'>-				break;</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb) {</div><div class='add'>+		/* Positive upper -&gt; have to look up lower to see whether it exists */</div><div class='add'>+		for (i = 0; !done &amp;&amp; !positive &amp;&amp; i &lt; ovl_numlower(poe); i++) {</div><div class='add'>+			struct dentry *this;</div><div class='add'>+			struct ovl_path *parentpath = &amp;ovl_lowerstack(poe)[i];</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * We need to make a non-const copy of dentry-&gt;d_name,</div><div class='add'>+			 * because lookup_one_positive_unlocked() will hash name</div><div class='add'>+			 * with parentpath base, which is on another (lower fs).</div><div class='add'>+			 */</div><div class='add'>+			this = lookup_one_positive_unlocked(mnt_idmap(parentpath-&gt;layer-&gt;mnt),</div><div class='add'>+							    &amp;QSTR_LEN(name-&gt;name, name-&gt;len),</div><div class='add'>+							    parentpath-&gt;dentry);</div><div class='add'>+			if (IS_ERR(this)) {</div><div class='add'>+				switch (PTR_ERR(this)) {</div><div class='add'>+				case -ENOENT:</div><div class='add'>+				case -ENAMETOOLONG:</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					/*</div><div class='add'>+					 * Assume something is there, we just couldn't</div><div class='add'>+					 * access it.</div><div class='add'>+					 */</div><div class='add'>+					positive = true;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				struct path path = {</div><div class='add'>+					.dentry = this,</div><div class='add'>+					.mnt	= parentpath-&gt;layer-&gt;mnt,</div><div class='add'>+				};</div><div class='add'>+				positive = !ovl_path_is_whiteout(OVL_FS(dentry-&gt;d_sb), &amp;path);</div><div class='add'>+				done = true;</div><div class='add'>+				dput(this);</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='del'>-			struct path path = {</div><div class='del'>-				.dentry = this,</div><div class='del'>-				.mnt = parentpath-&gt;layer-&gt;mnt,</div><div class='del'>-			};</div><div class='del'>-			positive = !ovl_path_is_whiteout(OVL_FS(dentry-&gt;d_sb), &amp;path);</div><div class='del'>-			done = true;</div><div class='del'>-			dput(this);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='ctx'> 	return positive;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h<br/>index 5ba11eb43767..f9ac9bdde830 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/overlayfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/overlayfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/overlayfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/overlayfs.h</a></div><div class='hunk'>@@ -50,7 +50,6 @@ enum ovl_xattr {</div><div class='ctx'> 	OVL_XATTR_METACOPY,</div><div class='ctx'> 	OVL_XATTR_PROTATTR,</div><div class='ctx'> 	OVL_XATTR_XWHITEOUT,</div><div class='del'>-	OVL_XATTR_XWHITEOUTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ovl_inode_flag {</div><div class='hunk'>@@ -70,6 +69,8 @@ enum ovl_entry_flag {</div><div class='ctx'> 	OVL_E_UPPER_ALIAS,</div><div class='ctx'> 	OVL_E_OPAQUE,</div><div class='ctx'> 	OVL_E_CONNECTED,</div><div class='add'>+	/* Lower stack may contain xwhiteout entries */</div><div class='add'>+	OVL_E_XWHITEOUTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -174,6 +175,9 @@ static inline int ovl_metadata_digest_size(const struct ovl_metacopy *metacopy)</div><div class='ctx'> 	return (int)metacopy-&gt;len - OVL_METACOPY_MIN_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* No atime modification on underlying */</div><div class='add'>+#define OVL_OPEN_FLAGS (O_NOATIME)</div><div class='add'>+</div><div class='ctx'> extern const char *const ovl_xattr_table[][2];</div><div class='ctx'> static inline const char *ovl_xattr(struct ovl_fs *ofs, enum ovl_xattr ox)</div><div class='ctx'> {</div><div class='hunk'>@@ -202,7 +206,7 @@ static inline int ovl_do_notify_change(struct ovl_fs *ofs,</div><div class='ctx'> static inline int ovl_do_rmdir(struct ovl_fs *ofs,</div><div class='ctx'> 			       struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	int err = vfs_rmdir(ovl_upper_mnt_idmap(ofs), dir, dentry);</div><div class='add'>+	int err = vfs_rmdir(ovl_upper_mnt_idmap(ofs), dir, dentry, NULL);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("rmdir(%pd2) = %i\n", dentry, err);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -231,26 +235,29 @@ static inline int ovl_do_create(struct ovl_fs *ofs,</div><div class='ctx'> 				struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 				umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	int err = vfs_create(ovl_upper_mnt_idmap(ofs), dir, dentry, mode, true);</div><div class='add'>+	int err = vfs_create(ovl_upper_mnt_idmap(ofs), dentry, mode, NULL);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("create(%pd2, 0%o) = %i\n", dentry, mode, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ovl_do_mkdir(struct ovl_fs *ofs,</div><div class='del'>-			       struct inode *dir, struct dentry *dentry,</div><div class='del'>-			       umode_t mode)</div><div class='add'>+static inline struct dentry *ovl_do_mkdir(struct ovl_fs *ofs,</div><div class='add'>+					  struct inode *dir,</div><div class='add'>+					  struct dentry *dentry,</div><div class='add'>+					  umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	int err = vfs_mkdir(ovl_upper_mnt_idmap(ofs), dir, dentry, mode);</div><div class='del'>-	pr_debug("mkdir(%pd2, 0%o) = %i\n", dentry, mode, err);</div><div class='del'>-	return err;</div><div class='add'>+	struct dentry *ret;</div><div class='add'>+</div><div class='add'>+	ret = vfs_mkdir(ovl_upper_mnt_idmap(ofs), dir, dentry, mode, NULL);</div><div class='add'>+	pr_debug("mkdir(%pd2, 0%o) = %i\n", dentry, mode, PTR_ERR_OR_ZERO(ret));</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ovl_do_mknod(struct ovl_fs *ofs,</div><div class='ctx'> 			       struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			       umode_t mode, dev_t dev)</div><div class='ctx'> {</div><div class='del'>-	int err = vfs_mknod(ovl_upper_mnt_idmap(ofs), dir, dentry, mode, dev);</div><div class='add'>+	int err = vfs_mknod(ovl_upper_mnt_idmap(ofs), dir, dentry, mode, dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("mknod(%pd2, 0%o, 0%o) = %i\n", dentry, mode, dev, err);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -260,7 +267,7 @@ static inline int ovl_do_symlink(struct ovl_fs *ofs,</div><div class='ctx'> 				 struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 				 const char *oldname)</div><div class='ctx'> {</div><div class='del'>-	int err = vfs_symlink(ovl_upper_mnt_idmap(ofs), dir, dentry, oldname);</div><div class='add'>+	int err = vfs_symlink(ovl_upper_mnt_idmap(ofs), dir, dentry, oldname, NULL);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("symlink(\"%s\", %pd2) = %i\n", oldname, dentry, err);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -348,30 +355,36 @@ static inline int ovl_do_remove_acl(struct ovl_fs *ofs, struct dentry *dentry,</div><div class='ctx'> 	return vfs_remove_acl(ovl_upper_mnt_idmap(ofs), dentry, acl_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ovl_do_rename(struct ovl_fs *ofs, struct inode *olddir,</div><div class='del'>-				struct dentry *olddentry, struct inode *newdir,</div><div class='del'>-				struct dentry *newdentry, unsigned int flags)</div><div class='add'>+static inline int ovl_do_rename_rd(struct renamedata *rd)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct renamedata rd = {</div><div class='del'>-		.old_mnt_idmap	= ovl_upper_mnt_idmap(ofs),</div><div class='del'>-		.old_dir 	= olddir,</div><div class='del'>-		.old_dentry 	= olddentry,</div><div class='del'>-		.new_mnt_idmap	= ovl_upper_mnt_idmap(ofs),</div><div class='del'>-		.new_dir 	= newdir,</div><div class='del'>-		.new_dentry 	= newdentry,</div><div class='del'>-		.flags 		= flags,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	pr_debug("rename(%pd2, %pd2, 0x%x)\n", olddentry, newdentry, flags);</div><div class='del'>-	err = vfs_rename(&amp;rd);</div><div class='add'>+	pr_debug("rename(%pd2, %pd2, 0x%x)\n", rd-&gt;old_dentry, rd-&gt;new_dentry,</div><div class='add'>+		 rd-&gt;flags);</div><div class='add'>+	err = vfs_rename(rd);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("...rename(%pd2, %pd2, ...) = %i\n",</div><div class='del'>-			 olddentry, newdentry, err);</div><div class='add'>+			 rd-&gt;old_dentry, rd-&gt;new_dentry, err);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ovl_do_rename(struct ovl_fs *ofs, struct dentry *olddir,</div><div class='add'>+				struct dentry *olddentry, struct dentry *newdir,</div><div class='add'>+				struct dentry *newdentry, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct renamedata rd = {</div><div class='add'>+		.mnt_idmap	= ovl_upper_mnt_idmap(ofs),</div><div class='add'>+		.old_parent	= olddir,</div><div class='add'>+		.old_dentry	= olddentry,</div><div class='add'>+		.new_parent	= newdir,</div><div class='add'>+		.new_dentry	= newdentry,</div><div class='add'>+		.flags		= flags,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ovl_do_rename_rd(&amp;rd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ovl_do_whiteout(struct ovl_fs *ofs,</div><div class='ctx'> 				  struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='hunk'>@@ -397,7 +410,32 @@ static inline struct dentry *ovl_lookup_upper(struct ovl_fs *ofs,</div><div class='ctx'> 					      const char *name,</div><div class='ctx'> 					      struct dentry *base, int len)</div><div class='ctx'> {</div><div class='del'>-	return lookup_one(ovl_upper_mnt_idmap(ofs), name, base, len);</div><div class='add'>+	return lookup_one(ovl_upper_mnt_idmap(ofs), &amp;QSTR_LEN(name, len), base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct dentry *ovl_lookup_upper_unlocked(struct ovl_fs *ofs,</div><div class='add'>+						       const char *name,</div><div class='add'>+						       struct dentry *base,</div><div class='add'>+						       int len)</div><div class='add'>+{</div><div class='add'>+	return lookup_one_unlocked(ovl_upper_mnt_idmap(ofs),</div><div class='add'>+				   &amp;QSTR_LEN(name, len), base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct dentry *ovl_start_creating_upper(struct ovl_fs *ofs,</div><div class='add'>+						      struct dentry *parent,</div><div class='add'>+						      struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	return start_creating(ovl_upper_mnt_idmap(ofs),</div><div class='add'>+			      parent, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct dentry *ovl_start_removing_upper(struct ovl_fs *ofs,</div><div class='add'>+						      struct dentry *parent,</div><div class='add'>+						      struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	return start_removing(ovl_upper_mnt_idmap(ofs),</div><div class='add'>+			      parent, name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ovl_open_flags_need_copy_up(int flags)</div><div class='hunk'>@@ -408,14 +446,6 @@ static inline bool ovl_open_flags_need_copy_up(int flags)</div><div class='ctx'> 	return ((OPEN_FMODE(flags) &amp; FMODE_WRITE) || (flags &amp; O_TRUNC));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ovl_do_getattr(const struct path *path, struct kstat *stat,</div><div class='del'>-				 u32 request_mask, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; AT_GETATTR_NOSEC)</div><div class='del'>-		return vfs_getattr_nosec(path, stat, request_mask, flags);</div><div class='del'>-	return vfs_getattr(path, stat, request_mask, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* util.c */</div><div class='ctx'> int ovl_get_write_access(struct dentry *dentry);</div><div class='ctx'> void ovl_put_write_access(struct dentry *dentry);</div><div class='hunk'>@@ -426,6 +456,11 @@ void ovl_drop_write(struct dentry *dentry);</div><div class='ctx'> struct dentry *ovl_workdir(struct dentry *dentry);</div><div class='ctx'> const struct cred *ovl_override_creds(struct super_block *sb);</div><div class='ctx'> </div><div class='add'>+EXTEND_CLASS(override_creds, _ovl, ovl_override_creds(sb), struct super_block *sb)</div><div class='add'>+</div><div class='add'>+#define with_ovl_creds(sb) \</div><div class='add'>+	scoped_class(override_creds_ovl, __UNIQUE_ID(label), sb)</div><div class='add'>+</div><div class='ctx'> static inline const struct cred *ovl_creds(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	return OVL_FS(sb)-&gt;creator_cred;</div><div class='hunk'>@@ -448,6 +483,12 @@ void ovl_dentry_init_reval(struct dentry *dentry, struct dentry *upperdentry,</div><div class='ctx'> void ovl_dentry_init_flags(struct dentry *dentry, struct dentry *upperdentry,</div><div class='ctx'> 			   struct ovl_entry *oe, unsigned int mask);</div><div class='ctx'> bool ovl_dentry_weird(struct dentry *dentry);</div><div class='add'>+</div><div class='add'>+static inline bool ovl_dentry_casefolded(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	return sb_has_encoding(dentry-&gt;d_sb) &amp;&amp; IS_CASEFOLDED(d_inode(dentry));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum ovl_path_type ovl_path_type(struct dentry *dentry);</div><div class='ctx'> void ovl_path_upper(struct dentry *dentry, struct path *path);</div><div class='ctx'> void ovl_path_lower(struct dentry *dentry, struct path *path);</div><div class='hunk'>@@ -477,6 +518,10 @@ bool ovl_dentry_test_flag(unsigned long flag, struct dentry *dentry);</div><div class='ctx'> bool ovl_dentry_is_opaque(struct dentry *dentry);</div><div class='ctx'> bool ovl_dentry_is_whiteout(struct dentry *dentry);</div><div class='ctx'> void ovl_dentry_set_opaque(struct dentry *dentry);</div><div class='add'>+bool ovl_dentry_has_xwhiteouts(struct dentry *dentry);</div><div class='add'>+void ovl_dentry_set_xwhiteouts(struct dentry *dentry);</div><div class='add'>+void ovl_layer_set_xwhiteouts(struct ovl_fs *ofs,</div><div class='add'>+			      const struct ovl_layer *layer);</div><div class='ctx'> bool ovl_dentry_has_upper_alias(struct dentry *dentry);</div><div class='ctx'> void ovl_dentry_set_upper_alias(struct dentry *dentry);</div><div class='ctx'> bool ovl_dentry_needs_data_copy_up(struct dentry *dentry, int flags);</div><div class='hunk'>@@ -494,11 +539,10 @@ struct file *ovl_path_open(const struct path *path, int flags);</div><div class='ctx'> int ovl_copy_up_start(struct dentry *dentry, int flags);</div><div class='ctx'> void ovl_copy_up_end(struct dentry *dentry);</div><div class='ctx'> bool ovl_already_copied_up(struct dentry *dentry, int flags);</div><div class='del'>-bool ovl_path_check_dir_xattr(struct ovl_fs *ofs, const struct path *path,</div><div class='del'>-			      enum ovl_xattr ox);</div><div class='add'>+char ovl_get_dir_xattr_val(struct ovl_fs *ofs, const struct path *path,</div><div class='add'>+			   enum ovl_xattr ox);</div><div class='ctx'> bool ovl_path_check_origin_xattr(struct ovl_fs *ofs, const struct path *path);</div><div class='ctx'> bool ovl_path_check_xwhiteout_xattr(struct ovl_fs *ofs, const struct path *path);</div><div class='del'>-bool ovl_path_check_xwhiteouts_xattr(struct ovl_fs *ofs, const struct path *path);</div><div class='ctx'> bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs,</div><div class='ctx'> 			 const struct path *upperpath);</div><div class='ctx'> </div><div class='hunk'>@@ -532,20 +576,19 @@ bool ovl_is_inuse(struct dentry *dentry);</div><div class='ctx'> bool ovl_need_index(struct dentry *dentry);</div><div class='ctx'> int ovl_nlink_start(struct dentry *dentry);</div><div class='ctx'> void ovl_nlink_end(struct dentry *dentry);</div><div class='del'>-int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir);</div><div class='add'>+int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *work,</div><div class='add'>+			    struct dentry *upperdir, struct dentry *upper);</div><div class='ctx'> int ovl_check_metacopy_xattr(struct ovl_fs *ofs, const struct path *path,</div><div class='ctx'> 			     struct ovl_metacopy *data);</div><div class='ctx'> int ovl_set_metacopy_xattr(struct ovl_fs *ofs, struct dentry *d,</div><div class='ctx'> 			   struct ovl_metacopy *metacopy);</div><div class='ctx'> bool ovl_is_metacopy_dentry(struct dentry *dentry);</div><div class='ctx'> char *ovl_get_redirect_xattr(struct ovl_fs *ofs, const struct path *path, int padding);</div><div class='del'>-int ovl_ensure_verity_loaded(struct path *path);</div><div class='del'>-int ovl_get_verity_xattr(struct ovl_fs *ofs, const struct path *path,</div><div class='del'>-			 u8 *digest_buf, int *buf_length);</div><div class='add'>+int ovl_ensure_verity_loaded(const struct path *path);</div><div class='ctx'> int ovl_validate_verity(struct ovl_fs *ofs,</div><div class='del'>-			struct path *metapath,</div><div class='del'>-			struct path *datapath);</div><div class='del'>-int ovl_get_verity_digest(struct ovl_fs *ofs, struct path *src,</div><div class='add'>+			const struct path *metapath,</div><div class='add'>+			const struct path *datapath);</div><div class='add'>+int ovl_get_verity_digest(struct ovl_fs *ofs, const struct path *src,</div><div class='ctx'> 			  struct ovl_metacopy *metacopy);</div><div class='ctx'> int ovl_sync_status(struct ovl_fs *ofs);</div><div class='ctx'> </div><div class='hunk'>@@ -573,7 +616,13 @@ static inline bool ovl_is_impuredir(struct super_block *sb,</div><div class='ctx'> 		.mnt = ovl_upper_mnt(ofs),</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return ovl_path_check_dir_xattr(ofs, &amp;upperpath, OVL_XATTR_IMPURE);</div><div class='add'>+	return ovl_get_dir_xattr_val(ofs, &amp;upperpath, OVL_XATTR_IMPURE) == 'y';</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline char ovl_get_opaquedir_val(struct ovl_fs *ofs,</div><div class='add'>+					 const struct path *path)</div><div class='add'>+{</div><div class='add'>+	return ovl_get_dir_xattr_val(ofs, path, OVL_XATTR_OPAQUE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ovl_redirect_follow(struct ovl_fs *ofs)</div><div class='hunk'>@@ -680,7 +729,8 @@ int ovl_get_index_name(struct ovl_fs *ofs, struct dentry *origin,</div><div class='ctx'> struct dentry *ovl_get_index_fh(struct ovl_fs *ofs, struct ovl_fh *fh);</div><div class='ctx'> struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> 				struct dentry *origin, bool verify);</div><div class='del'>-int ovl_path_next(int idx, struct dentry *dentry, struct path *path);</div><div class='add'>+int ovl_path_next(int idx, struct dentry *dentry, struct path *path,</div><div class='add'>+		  const struct ovl_layer **layer);</div><div class='ctx'> int ovl_verify_lowerdata(struct dentry *dentry);</div><div class='ctx'> struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			  unsigned int flags);</div><div class='hunk'>@@ -715,7 +765,7 @@ void ovl_cleanup_whiteouts(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> void ovl_cache_free(struct list_head *list);</div><div class='ctx'> void ovl_dir_cache_free(struct inode *inode);</div><div class='ctx'> int ovl_check_d_type_supported(const struct path *realpath);</div><div class='del'>-int ovl_workdir_cleanup(struct ovl_fs *ofs, struct inode *dir,</div><div class='add'>+int ovl_workdir_cleanup(struct ovl_fs *ofs, struct dentry *parent,</div><div class='ctx'> 			struct vfsmount *mnt, struct dentry *dentry, int level);</div><div class='ctx'> int ovl_indexdir_cleanup(struct ovl_fs *ofs);</div><div class='ctx'> </div><div class='hunk'>@@ -792,10 +842,12 @@ struct inode *ovl_get_inode(struct super_block *sb,</div><div class='ctx'> 			    struct ovl_inode_params *oip);</div><div class='ctx'> void ovl_copyattr(struct inode *to);</div><div class='ctx'> </div><div class='add'>+/* vfs fileattr flags read from overlay.protattr xattr to ovl inode */</div><div class='add'>+#define OVL_PROT_I_FLAGS_MASK  (S_APPEND | S_IMMUTABLE)</div><div class='add'>+/* vfs fileattr flags copied from real to ovl inode */</div><div class='add'>+#define OVL_FATTR_I_FLAGS_MASK (OVL_PROT_I_FLAGS_MASK | S_SYNC | S_NOATIME)</div><div class='ctx'> /* vfs inode flags copied from real to ovl inode */</div><div class='del'>-#define OVL_COPY_I_FLAGS_MASK	(S_SYNC | S_NOATIME | S_APPEND | S_IMMUTABLE)</div><div class='del'>-/* vfs inode flags read from overlay.protattr xattr to ovl inode */</div><div class='del'>-#define OVL_PROT_I_FLAGS_MASK	(S_APPEND | S_IMMUTABLE)</div><div class='add'>+#define OVL_COPY_I_FLAGS_MASK  (OVL_FATTR_I_FLAGS_MASK | S_CASEFOLD)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * fileattr flags copied from lower to upper inode on copy up.</div><div class='hunk'>@@ -809,7 +861,7 @@ void ovl_copyattr(struct inode *to);</div><div class='ctx'> </div><div class='ctx'> void ovl_check_protattr(struct inode *inode, struct dentry *upper);</div><div class='ctx'> int ovl_set_protattr(struct inode *inode, struct dentry *upper,</div><div class='del'>-		      struct fileattr *fa);</div><div class='add'>+		      struct file_kattr *fa);</div><div class='ctx'> </div><div class='ctx'> static inline void ovl_copyflags(struct inode *from, struct inode *to)</div><div class='ctx'> {</div><div class='hunk'>@@ -820,7 +872,7 @@ static inline void ovl_copyflags(struct inode *from, struct inode *to)</div><div class='ctx'> </div><div class='ctx'> /* dir.c */</div><div class='ctx'> extern const struct inode_operations ovl_dir_inode_operations;</div><div class='del'>-int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct inode *dir,</div><div class='add'>+int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct dentry *dir,</div><div class='ctx'> 			     struct dentry *dentry);</div><div class='ctx'> struct ovl_cattr {</div><div class='ctx'> 	dev_t rdev;</div><div class='hunk'>@@ -831,23 +883,25 @@ struct ovl_cattr {</div><div class='ctx'> </div><div class='ctx'> #define OVL_CATTR(m) (&amp;(struct ovl_cattr) { .mode = (m) })</div><div class='ctx'> </div><div class='del'>-int ovl_mkdir_real(struct ovl_fs *ofs, struct inode *dir,</div><div class='del'>-		   struct dentry **newdentry, umode_t mode);</div><div class='ctx'> struct dentry *ovl_create_real(struct ovl_fs *ofs,</div><div class='del'>-			       struct inode *dir, struct dentry *newdentry,</div><div class='add'>+			       struct dentry *parent, struct dentry *newdentry,</div><div class='ctx'> 			       struct ovl_cattr *attr);</div><div class='del'>-int ovl_cleanup(struct ovl_fs *ofs, struct inode *dir, struct dentry *dentry);</div><div class='del'>-struct dentry *ovl_lookup_temp(struct ovl_fs *ofs, struct dentry *workdir);</div><div class='add'>+int ovl_cleanup(struct ovl_fs *ofs, struct dentry *workdir, struct dentry *dentry);</div><div class='add'>+#define OVL_TEMPNAME_SIZE 20</div><div class='add'>+void ovl_tempname(char name[OVL_TEMPNAME_SIZE]);</div><div class='ctx'> struct dentry *ovl_create_temp(struct ovl_fs *ofs, struct dentry *workdir,</div><div class='ctx'> 			       struct ovl_cattr *attr);</div><div class='ctx'> </div><div class='ctx'> /* file.c */</div><div class='ctx'> extern const struct file_operations ovl_file_operations;</div><div class='del'>-int ovl_real_fileattr_get(const struct path *realpath, struct fileattr *fa);</div><div class='del'>-int ovl_real_fileattr_set(const struct path *realpath, struct fileattr *fa);</div><div class='del'>-int ovl_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int ovl_real_fileattr_get(const struct path *realpath, struct file_kattr *fa);</div><div class='add'>+int ovl_real_fileattr_set(const struct path *realpath, struct file_kattr *fa);</div><div class='add'>+int ovl_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int ovl_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-		     struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+		     struct dentry *dentry, struct file_kattr *fa);</div><div class='add'>+struct ovl_file;</div><div class='add'>+struct ovl_file *ovl_file_alloc(struct file *realfile);</div><div class='add'>+void ovl_file_free(struct ovl_file *of);</div><div class='ctx'> </div><div class='ctx'> /* copy_up.c */</div><div class='ctx'> int ovl_copy_up(struct dentry *dentry);</div><div class='hunk'>@@ -855,7 +909,7 @@ int ovl_copy_up_with_data(struct dentry *dentry);</div><div class='ctx'> int ovl_maybe_copy_up(struct dentry *dentry, int flags);</div><div class='ctx'> int ovl_copy_xattr(struct super_block *sb, const struct path *path, struct dentry *new);</div><div class='ctx'> int ovl_set_attr(struct ovl_fs *ofs, struct dentry *upper, struct kstat *stat);</div><div class='del'>-struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,</div><div class='add'>+struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct inode *realinode,</div><div class='ctx'> 				  bool is_upper);</div><div class='ctx'> struct ovl_fh *ovl_get_origin_fh(struct ovl_fs *ofs, struct dentry *origin);</div><div class='ctx'> int ovl_set_origin_fh(struct ovl_fs *ofs, const struct ovl_fh *fh,</div><div class='head'>diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h<br/>index 5fa9c58af65f..1d4828dbcf7a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/ovl_entry.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/ovl_entry.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/ovl_entry.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/ovl_entry.h</a></div><div class='hunk'>@@ -40,6 +40,8 @@ struct ovl_layer {</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	/* One fsid per unique underlying sb (upper fsid == 0) */</div><div class='ctx'> 	int fsid;</div><div class='add'>+	/* xwhiteouts were found on this layer */</div><div class='add'>+	bool has_xwhiteouts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ovl_path {</div><div class='hunk'>@@ -49,7 +51,7 @@ struct ovl_path {</div><div class='ctx'> </div><div class='ctx'> struct ovl_entry {</div><div class='ctx'> 	unsigned int __numlower;</div><div class='del'>-	struct ovl_path __lowerstack[];</div><div class='add'>+	struct ovl_path __lowerstack[] __counted_by(__numlower);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* private information held for overlayfs's superblock */</div><div class='hunk'>@@ -59,7 +61,7 @@ struct ovl_fs {</div><div class='ctx'> 	unsigned int numfs;</div><div class='ctx'> 	/* Number of data-only lower layers */</div><div class='ctx'> 	unsigned int numdatalayer;</div><div class='del'>-	const struct ovl_layer *layers;</div><div class='add'>+	struct ovl_layer *layers;</div><div class='ctx'> 	struct ovl_sb *fs;</div><div class='ctx'> 	/* workbasedir is the path at workdir= mount option */</div><div class='ctx'> 	struct dentry *workbasedir;</div><div class='hunk'>@@ -86,8 +88,10 @@ struct ovl_fs {</div><div class='ctx'> 	/* Shared whiteout cache */</div><div class='ctx'> 	struct dentry *whiteout;</div><div class='ctx'> 	bool no_shared_whiteout;</div><div class='add'>+	struct mutex whiteout_lock;</div><div class='ctx'> 	/* r/o snapshot of upperdir sb's only taken on volatile mounts */</div><div class='ctx'> 	errseq_t errseq;</div><div class='add'>+	bool casefold;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Number of lower layers, not including data-only layers */</div><div class='head'>diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c<br/>index 112b4b12f825..63b7346c5ee1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/params.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/params.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/params.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/params.c</a></div><div class='hunk'>@@ -59,6 +59,7 @@ enum ovl_opt {</div><div class='ctx'> 	Opt_metacopy,</div><div class='ctx'> 	Opt_verity,</div><div class='ctx'> 	Opt_volatile,</div><div class='add'>+	Opt_override_creds,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct constant_table ovl_parameter_bool[] = {</div><div class='hunk'>@@ -139,16 +140,12 @@ static int ovl_verity_mode_def(void)</div><div class='ctx'> 	return OVL_VERITY_OFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define fsparam_string_empty(NAME, OPT) \</div><div class='del'>-	__fsparam(fs_param_is_string, NAME, OPT, fs_param_can_be_empty, NULL)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> const struct fs_parameter_spec ovl_parameter_spec[] = {</div><div class='ctx'> 	fsparam_string_empty("lowerdir",    Opt_lowerdir),</div><div class='del'>-	fsparam_string("lowerdir+",         Opt_lowerdir_add),</div><div class='del'>-	fsparam_string("datadir+",          Opt_datadir_add),</div><div class='del'>-	fsparam_string("upperdir",          Opt_upperdir),</div><div class='del'>-	fsparam_string("workdir",           Opt_workdir),</div><div class='add'>+	fsparam_file_or_string("lowerdir+", Opt_lowerdir_add),</div><div class='add'>+	fsparam_file_or_string("datadir+",  Opt_datadir_add),</div><div class='add'>+	fsparam_file_or_string("upperdir",  Opt_upperdir),</div><div class='add'>+	fsparam_file_or_string("workdir",   Opt_workdir),</div><div class='ctx'> 	fsparam_flag("default_permissions", Opt_default_permissions),</div><div class='ctx'> 	fsparam_enum("redirect_dir",        Opt_redirect_dir, ovl_parameter_redirect_dir),</div><div class='ctx'> 	fsparam_enum("index",               Opt_index, ovl_parameter_bool),</div><div class='hunk'>@@ -159,6 +156,7 @@ const struct fs_parameter_spec ovl_parameter_spec[] = {</div><div class='ctx'> 	fsparam_enum("metacopy",            Opt_metacopy, ovl_parameter_bool),</div><div class='ctx'> 	fsparam_enum("verity",              Opt_verity, ovl_parameter_verity),</div><div class='ctx'> 	fsparam_flag("volatile",            Opt_volatile),</div><div class='add'>+	fsparam_flag_no("override_creds",   Opt_override_creds),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -278,14 +276,29 @@ static int ovl_mount_dir(const char *name, struct path *path)</div><div class='ctx'> static int ovl_mount_dir_check(struct fs_context *fc, const struct path *path,</div><div class='ctx'> 			       enum ovl_opt layer, const char *name, bool upper)</div><div class='ctx'> {</div><div class='add'>+	bool is_casefolded = ovl_dentry_casefolded(path-&gt;dentry);</div><div class='ctx'> 	struct ovl_fs_context *ctx = fc-&gt;fs_private;</div><div class='del'>-</div><div class='del'>-	if (ovl_dentry_weird(path-&gt;dentry))</div><div class='del'>-		return invalfc(fc, "filesystem on %s not supported", name);</div><div class='add'>+	struct ovl_fs *ofs = fc-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	if (!d_is_dir(path-&gt;dentry))</div><div class='ctx'> 		return invalfc(fc, "%s is not a directory", name);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Allow filesystems that are case-folding capable but deny composing</div><div class='add'>+	 * ovl stack from inconsistent case-folded directories.</div><div class='add'>+	 */</div><div class='add'>+	if (!ctx-&gt;casefold_set) {</div><div class='add'>+		ofs-&gt;casefold = is_casefolded;</div><div class='add'>+		ctx-&gt;casefold_set = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ofs-&gt;casefold != is_casefolded) {</div><div class='add'>+		return invalfc(fc, "case-%ssensitive directory on %s is inconsistent",</div><div class='add'>+			       is_casefolded ? "in" : "", name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ovl_dentry_weird(path-&gt;dentry))</div><div class='add'>+		return invalfc(fc, "filesystem on %s not supported", name);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check whether upper path is read-only here to report failures</div><div class='hunk'>@@ -349,6 +362,8 @@ static void ovl_add_layer(struct fs_context *fc, enum ovl_opt layer,</div><div class='ctx'> 	case Opt_datadir_add:</div><div class='ctx'> 		ctx-&gt;nr_data++;</div><div class='ctx'> 		fallthrough;</div><div class='add'>+	case Opt_lowerdir:</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case Opt_lowerdir_add:</div><div class='ctx'> 		WARN_ON(ctx-&gt;nr &gt;= ctx-&gt;capacity);</div><div class='ctx'> 		l = &amp;ctx-&gt;lower[ctx-&gt;nr++];</div><div class='hunk'>@@ -361,41 +376,100 @@ static void ovl_add_layer(struct fs_context *fc, enum ovl_opt layer,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_parse_layer(struct fs_context *fc, struct fs_parameter *param,</div><div class='del'>-			   enum ovl_opt layer)</div><div class='add'>+static inline bool is_upper_layer(enum ovl_opt layer)</div><div class='add'>+{</div><div class='add'>+	return layer == Opt_upperdir || layer == Opt_workdir;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle non-file descriptor-based layer options that require path lookup. */</div><div class='add'>+static inline int ovl_kern_path(const char *layer_name, struct path *layer_path,</div><div class='add'>+				enum ovl_opt layer)</div><div class='ctx'> {</div><div class='del'>-	char *name = kstrdup(param-&gt;string, GFP_KERNEL);</div><div class='del'>-	bool upper = (layer == Opt_upperdir || layer == Opt_workdir);</div><div class='del'>-	struct path path;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	switch (layer) {</div><div class='add'>+	case Opt_upperdir:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case Opt_workdir:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case Opt_lowerdir:</div><div class='add'>+		err = ovl_mount_dir(layer_name, layer_path);</div><div class='add'>+		break;</div><div class='add'>+	case Opt_lowerdir_add:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case Opt_datadir_add:</div><div class='add'>+		err = ovl_mount_dir_noesc(layer_name, layer_path);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ovl_do_parse_layer(struct fs_context *fc, const char *layer_name,</div><div class='add'>+			      struct path *layer_path, enum ovl_opt layer)</div><div class='add'>+{</div><div class='add'>+	char *name __free(kfree) = kstrdup(layer_name, GFP_KERNEL);</div><div class='add'>+	bool upper;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='ctx'> 	if (!name)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (upper)</div><div class='del'>-		err = ovl_mount_dir(name, &amp;path);</div><div class='del'>-	else</div><div class='del'>-		err = ovl_mount_dir_noesc(name, &amp;path);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	err = ovl_mount_dir_check(fc, &amp;path, layer, name, upper);</div><div class='add'>+	upper = is_upper_layer(layer);</div><div class='add'>+	err = ovl_mount_dir_check(fc, layer_path, layer, name, upper);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_put;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!upper) {</div><div class='ctx'> 		err = ovl_ctx_realloc_lower(fc);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_put;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Store the user provided path string in ctx to show in mountinfo */</div><div class='del'>-	ovl_add_layer(fc, layer, &amp;path, &amp;name);</div><div class='add'>+	ovl_add_layer(fc, layer, layer_path, &amp;name);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ovl_parse_layer(struct fs_context *fc, struct fs_parameter *param,</div><div class='add'>+			   enum ovl_opt layer)</div><div class='add'>+{</div><div class='add'>+	struct path layer_path __free(path_put) = {};</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (param-&gt;type) {</div><div class='add'>+	case fs_value_is_string:</div><div class='add'>+		err = ovl_kern_path(param-&gt;string, &amp;layer_path, layer);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		err = ovl_do_parse_layer(fc, param-&gt;string, &amp;layer_path, layer);</div><div class='add'>+		break;</div><div class='add'>+	case fs_value_is_file: {</div><div class='add'>+		char *buf __free(kfree);</div><div class='add'>+		char *layer_name;</div><div class='add'>+</div><div class='add'>+		buf = kmalloc(PATH_MAX, GFP_KERNEL_ACCOUNT);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		layer_path = param-&gt;file-&gt;f_path;</div><div class='add'>+		path_get(&amp;layer_path);</div><div class='add'>+</div><div class='add'>+		layer_name = d_path(&amp;layer_path, buf, PATH_MAX);</div><div class='add'>+		if (IS_ERR(layer_name))</div><div class='add'>+			return PTR_ERR(layer_name);</div><div class='add'>+</div><div class='add'>+		err = ovl_do_parse_layer(fc, layer_name, &amp;layer_path, layer);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out_put:</div><div class='del'>-	path_put(&amp;path);</div><div class='del'>-out_free:</div><div class='del'>-	kfree(name);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -428,7 +502,6 @@ static int ovl_parse_param_lowerdir(const char *name, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ovl_fs_context *ctx = fc-&gt;fs_private;</div><div class='del'>-	struct ovl_fs_context_layer *l;</div><div class='ctx'> 	char *dup = NULL, *iter;</div><div class='ctx'> 	ssize_t nr_lower, nr;</div><div class='ctx'> 	bool data_layer = false;</div><div class='hunk'>@@ -445,7 +518,7 @@ static int ovl_parse_param_lowerdir(const char *name, struct fs_context *fc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (*name == ':') {</div><div class='del'>-		pr_err("cannot append lower layer");</div><div class='add'>+		pr_err("cannot append lower layer\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -468,35 +541,17 @@ static int ovl_parse_param_lowerdir(const char *name, struct fs_context *fc)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nr_lower &gt; ctx-&gt;capacity) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		l = krealloc_array(ctx-&gt;lower, nr_lower, sizeof(*ctx-&gt;lower),</div><div class='del'>-				   GFP_KERNEL_ACCOUNT);</div><div class='del'>-		if (!l)</div><div class='del'>-			goto out_err;</div><div class='del'>-</div><div class='del'>-		ctx-&gt;lower = l;</div><div class='del'>-		ctx-&gt;capacity = nr_lower;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	iter = dup;</div><div class='del'>-	l = ctx-&gt;lower;</div><div class='del'>-	for (nr = 0; nr &lt; nr_lower; nr++, l++) {</div><div class='del'>-		ctx-&gt;nr++;</div><div class='del'>-		memset(l, 0, sizeof(*l));</div><div class='add'>+	for (nr = 0; nr &lt; nr_lower; nr++) {</div><div class='add'>+		struct path path __free(path_put) = {};</div><div class='ctx'> </div><div class='del'>-		err = ovl_mount_dir(iter, &amp;l-&gt;path);</div><div class='add'>+		err = ovl_kern_path(iter, &amp;path, Opt_lowerdir);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_put;</div><div class='add'>+			goto out_err;</div><div class='ctx'> </div><div class='del'>-		err = ovl_mount_dir_check(fc, &amp;l-&gt;path, Opt_lowerdir, iter, false);</div><div class='add'>+		err = ovl_do_parse_layer(fc, iter, &amp;path, Opt_lowerdir);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_put;</div><div class='del'>-</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		l-&gt;name = kstrdup(iter, GFP_KERNEL_ACCOUNT);</div><div class='del'>-		if (!l-&gt;name)</div><div class='del'>-			goto out_put;</div><div class='add'>+			goto out_err;</div><div class='ctx'> </div><div class='ctx'> 		if (data_layer)</div><div class='ctx'> 			ctx-&gt;nr_data++;</div><div class='hunk'>@@ -513,8 +568,8 @@ static int ovl_parse_param_lowerdir(const char *name, struct fs_context *fc)</div><div class='ctx'> 			 * there are no data layers.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (ctx-&gt;nr_data &gt; 0) {</div><div class='del'>-				pr_err("regular lower layers cannot follow data lower layers");</div><div class='del'>-				goto out_put;</div><div class='add'>+				pr_err("regular lower layers cannot follow data lower layers\n");</div><div class='add'>+				goto out_err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			data_layer = false;</div><div class='hunk'>@@ -528,9 +583,6 @@ static int ovl_parse_param_lowerdir(const char *name, struct fs_context *fc)</div><div class='ctx'> 	kfree(dup);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_put:</div><div class='del'>-	ovl_reset_lowerdirs(ctx);</div><div class='del'>-</div><div class='ctx'> out_err:</div><div class='ctx'> 	kfree(dup);</div><div class='ctx'> </div><div class='hunk'>@@ -619,6 +671,29 @@ static int ovl_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 	case Opt_userxattr:</div><div class='ctx'> 		config-&gt;userxattr = true;</div><div class='ctx'> 		break;</div><div class='add'>+	case Opt_override_creds: {</div><div class='add'>+		const struct cred *cred = NULL;</div><div class='add'>+</div><div class='add'>+		if (result.negated) {</div><div class='add'>+			swap(cred, ofs-&gt;creator_cred);</div><div class='add'>+			put_cred(cred);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!current_in_userns(fc-&gt;user_ns)) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cred = prepare_creds();</div><div class='add'>+		if (cred)</div><div class='add'>+			swap(cred, ofs-&gt;creator_cred);</div><div class='add'>+		else</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		put_cred(cred);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		pr_err("unrecognized mount option \"%s\" or missing value\n",</div><div class='ctx'> 		       param-&gt;key);</div><div class='hunk'>@@ -729,6 +804,8 @@ int ovl_init_fs_context(struct fs_context *fc)</div><div class='ctx'> 	fc-&gt;s_fs_info		= ofs;</div><div class='ctx'> 	fc-&gt;fs_private		= ctx;</div><div class='ctx'> 	fc-&gt;ops			= &amp;ovl_context_ops;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ofs-&gt;whiteout_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='hunk'>@@ -778,11 +855,6 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_opt_set set = ctx-&gt;set;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;nr_data &gt; 0 &amp;&amp; !config-&gt;metacopy) {</div><div class='del'>-		pr_err("lower data-only dirs require metacopy support.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Workdir/index are useless in non-upper mount */</div><div class='ctx'> 	if (!config-&gt;upperdir) {</div><div class='ctx'> 		if (config-&gt;workdir) {</div><div class='hunk'>@@ -808,18 +880,6 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,</div><div class='ctx'> 		config-&gt;uuid = OVL_UUID_NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Resolve verity -&gt; metacopy dependency */</div><div class='del'>-	if (config-&gt;verity_mode &amp;&amp; !config-&gt;metacopy) {</div><div class='del'>-		/* Don't allow explicit specified conflicting combinations */</div><div class='del'>-		if (set.metacopy) {</div><div class='del'>-			pr_err("conflicting options: metacopy=off,verity=%s\n",</div><div class='del'>-			       ovl_verity_mode(config));</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		/* Otherwise automatically enable metacopy. */</div><div class='del'>-		config-&gt;metacopy = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is to make the logic below simpler.  It doesn't make any other</div><div class='ctx'> 	 * difference, since redirect_dir=on is only used for upper.</div><div class='hunk'>@@ -827,18 +887,13 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,</div><div class='ctx'> 	if (!config-&gt;upperdir &amp;&amp; config-&gt;redirect_mode == OVL_REDIRECT_FOLLOW)</div><div class='ctx'> 		config-&gt;redirect_mode = OVL_REDIRECT_ON;</div><div class='ctx'> </div><div class='del'>-	/* Resolve verity -&gt; metacopy -&gt; redirect_dir dependency */</div><div class='add'>+	/* metacopy -&gt; redirect_dir dependency */</div><div class='ctx'> 	if (config-&gt;metacopy &amp;&amp; config-&gt;redirect_mode != OVL_REDIRECT_ON) {</div><div class='ctx'> 		if (set.metacopy &amp;&amp; set.redirect) {</div><div class='ctx'> 			pr_err("conflicting options: metacopy=on,redirect_dir=%s\n",</div><div class='ctx'> 			       ovl_redirect_mode(config));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (config-&gt;verity_mode &amp;&amp; set.redirect) {</div><div class='del'>-			pr_err("conflicting options: verity=%s,redirect_dir=%s\n",</div><div class='del'>-			       ovl_verity_mode(config), ovl_redirect_mode(config));</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 		if (set.redirect) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * There was an explicit redirect_dir=... that resulted</div><div class='hunk'>@@ -907,7 +962,7 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	/* Resolve userxattr -&gt; !redirect &amp;&amp; !metacopy &amp;&amp; !verity dependency */</div><div class='add'>+	/* Resolve userxattr -&gt; !redirect &amp;&amp; !metacopy dependency */</div><div class='ctx'> 	if (config-&gt;userxattr) {</div><div class='ctx'> 		if (set.redirect &amp;&amp;</div><div class='ctx'> 		    config-&gt;redirect_mode != OVL_REDIRECT_NOFOLLOW) {</div><div class='hunk'>@@ -919,11 +974,6 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,</div><div class='ctx'> 			pr_err("conflicting options: userxattr,metacopy=on\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (config-&gt;verity_mode) {</div><div class='del'>-			pr_err("conflicting options: userxattr,verity=%s\n",</div><div class='del'>-			       ovl_verity_mode(config));</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Silently disable default setting of redirect and metacopy.</div><div class='ctx'> 		 * This shall be the default in the future as well: these</div><div class='hunk'>@@ -934,6 +984,34 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,</div><div class='ctx'> 		config-&gt;metacopy = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Fail if we don't have trusted xattr capability and a feature was</div><div class='add'>+	 * explicitly requested that requires them.</div><div class='add'>+	 */</div><div class='add'>+	if (!config-&gt;userxattr &amp;&amp; !capable(CAP_SYS_ADMIN)) {</div><div class='add'>+		if (set.redirect &amp;&amp;</div><div class='add'>+		    config-&gt;redirect_mode != OVL_REDIRECT_NOFOLLOW) {</div><div class='add'>+			pr_err("redirect_dir requires permission to access trusted xattrs\n");</div><div class='add'>+			return -EPERM;</div><div class='add'>+		}</div><div class='add'>+		if (config-&gt;metacopy &amp;&amp; set.metacopy) {</div><div class='add'>+			pr_err("metacopy requires permission to access trusted xattrs\n");</div><div class='add'>+			return -EPERM;</div><div class='add'>+		}</div><div class='add'>+		if (config-&gt;verity_mode) {</div><div class='add'>+			pr_err("verity requires permission to access trusted xattrs\n");</div><div class='add'>+			return -EPERM;</div><div class='add'>+		}</div><div class='add'>+		if (ctx-&gt;nr_data &gt; 0) {</div><div class='add'>+			pr_err("lower data-only dirs require permission to access trusted xattrs\n");</div><div class='add'>+			return -EPERM;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Other xattr-dependent features should be disabled without</div><div class='add'>+		 * great disturbance to the user in ovl_make_workdir().</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -982,17 +1060,16 @@ int ovl_show_options(struct seq_file *m, struct dentry *dentry)</div><div class='ctx'> 		seq_printf(m, ",redirect_dir=%s",</div><div class='ctx'> 			   ovl_redirect_mode(&amp;ofs-&gt;config));</div><div class='ctx'> 	if (ofs-&gt;config.index != ovl_index_def)</div><div class='del'>-		seq_printf(m, ",index=%s", ofs-&gt;config.index ? "on" : "off");</div><div class='add'>+		seq_printf(m, ",index=%s", str_on_off(ofs-&gt;config.index));</div><div class='ctx'> 	if (ofs-&gt;config.uuid != ovl_uuid_def())</div><div class='ctx'> 		seq_printf(m, ",uuid=%s", ovl_uuid_mode(&amp;ofs-&gt;config));</div><div class='ctx'> 	if (ofs-&gt;config.nfs_export != ovl_nfs_export_def)</div><div class='del'>-		seq_printf(m, ",nfs_export=%s", ofs-&gt;config.nfs_export ?</div><div class='del'>-						"on" : "off");</div><div class='add'>+		seq_printf(m, ",nfs_export=%s",</div><div class='add'>+			   str_on_off(ofs-&gt;config.nfs_export));</div><div class='ctx'> 	if (ofs-&gt;config.xino != ovl_xino_def() &amp;&amp; !ovl_same_fs(ofs))</div><div class='ctx'> 		seq_printf(m, ",xino=%s", ovl_xino_mode(&amp;ofs-&gt;config));</div><div class='ctx'> 	if (ofs-&gt;config.metacopy != ovl_metacopy_def)</div><div class='del'>-		seq_printf(m, ",metacopy=%s",</div><div class='del'>-			   ofs-&gt;config.metacopy ? "on" : "off");</div><div class='add'>+		seq_printf(m, ",metacopy=%s", str_on_off(ofs-&gt;config.metacopy));</div><div class='ctx'> 	if (ofs-&gt;config.ovl_volatile)</div><div class='ctx'> 		seq_puts(m, ",volatile");</div><div class='ctx'> 	if (ofs-&gt;config.userxattr)</div><div class='head'>diff --git a/fs/overlayfs/params.h b/fs/overlayfs/params.h<br/>index c96d93982021..ffd53cdd8482 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/params.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/params.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/params.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/params.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@ struct ovl_fs_context {</div><div class='ctx'> 	struct ovl_opt_set set;</div><div class='ctx'> 	struct ovl_fs_context_layer *lower;</div><div class='ctx'> 	char *lowerdir_all; /* user provided lowerdir string */</div><div class='add'>+	bool casefold_set;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ovl_init_fs_context(struct fs_context *fc);</div><div class='head'>diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c<br/>index e71156baa7bc..160960bb0ad0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/readdir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/readdir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/readdir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/readdir.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='ctx'> #include "overlayfs.h"</div><div class='ctx'> </div><div class='ctx'> struct ovl_cache_entry {</div><div class='hunk'>@@ -26,6 +27,8 @@ struct ovl_cache_entry {</div><div class='ctx'> 	bool is_upper;</div><div class='ctx'> 	bool is_whiteout;</div><div class='ctx'> 	bool check_xwhiteout;</div><div class='add'>+	const char *c_name;</div><div class='add'>+	int c_len;</div><div class='ctx'> 	char name[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -44,6 +47,7 @@ struct ovl_readdir_data {</div><div class='ctx'> 	struct list_head *list;</div><div class='ctx'> 	struct list_head middle;</div><div class='ctx'> 	struct ovl_cache_entry *first_maybe_whiteout;</div><div class='add'>+	struct unicode_map *map;</div><div class='ctx'> 	int count;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool is_upper;</div><div class='hunk'>@@ -65,6 +69,31 @@ static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)</div><div class='ctx'> 	return rb_entry(n, struct ovl_cache_entry, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ovl_casefold(struct ovl_readdir_data *rdd, const char *str, int len,</div><div class='add'>+			char **dst)</div><div class='add'>+{</div><div class='add'>+	const struct qstr qstr = { .name = str, .len = len };</div><div class='add'>+	char *cf_name;</div><div class='add'>+	int cf_len;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_UNICODE) || !rdd-&gt;map || is_dot_dotdot(str, len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cf_name = kmalloc(NAME_MAX, GFP_KERNEL);</div><div class='add'>+	if (!cf_name) {</div><div class='add'>+		rdd-&gt;err = -ENOMEM;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cf_len = utf8_casefold(rdd-&gt;map, &amp;qstr, cf_name, NAME_MAX);</div><div class='add'>+	if (cf_len &gt; 0)</div><div class='add'>+		*dst = cf_name;</div><div class='add'>+	else</div><div class='add'>+		kfree(cf_name);</div><div class='add'>+</div><div class='add'>+	return cf_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool ovl_cache_entry_find_link(const char *name, int len,</div><div class='ctx'> 				      struct rb_node ***link,</div><div class='ctx'> 				      struct rb_node **parent)</div><div class='hunk'>@@ -78,10 +107,10 @@ static bool ovl_cache_entry_find_link(const char *name, int len,</div><div class='ctx'> </div><div class='ctx'> 		*parent = *newp;</div><div class='ctx'> 		tmp = ovl_cache_entry_from_node(*newp);</div><div class='del'>-		cmp = strncmp(name, tmp-&gt;name, len);</div><div class='add'>+		cmp = strncmp(name, tmp-&gt;c_name, len);</div><div class='ctx'> 		if (cmp &gt; 0)</div><div class='ctx'> 			newp = &amp;tmp-&gt;node.rb_right;</div><div class='del'>-		else if (cmp &lt; 0 || len &lt; tmp-&gt;len)</div><div class='add'>+		else if (cmp &lt; 0 || len &lt; tmp-&gt;c_len)</div><div class='ctx'> 			newp = &amp;tmp-&gt;node.rb_left;</div><div class='ctx'> 		else</div><div class='ctx'> 			found = true;</div><div class='hunk'>@@ -100,10 +129,10 @@ static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,</div><div class='ctx'> 	while (node) {</div><div class='ctx'> 		struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);</div><div class='ctx'> </div><div class='del'>-		cmp = strncmp(name, p-&gt;name, len);</div><div class='add'>+		cmp = strncmp(name, p-&gt;c_name, len);</div><div class='ctx'> 		if (cmp &gt; 0)</div><div class='ctx'> 			node = p-&gt;node.rb_right;</div><div class='del'>-		else if (cmp &lt; 0 || len &lt; p-&gt;len)</div><div class='add'>+		else if (cmp &lt; 0 || len &lt; p-&gt;c_len)</div><div class='ctx'> 			node = p-&gt;node.rb_left;</div><div class='ctx'> 		else</div><div class='ctx'> 			return p;</div><div class='hunk'>@@ -144,12 +173,12 @@ static bool ovl_calc_d_ino(struct ovl_readdir_data *rdd,</div><div class='ctx'> </div><div class='ctx'> static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd,</div><div class='ctx'> 						   const char *name, int len,</div><div class='add'>+						   const char *c_name, int c_len,</div><div class='ctx'> 						   u64 ino, unsigned int d_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='del'>-	size_t size = offsetof(struct ovl_cache_entry, name[len + 1]);</div><div class='ctx'> </div><div class='del'>-	p = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	p = kmalloc(struct_size(p, name, len + 1), GFP_KERNEL);</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +196,14 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd,</div><div class='ctx'> 	/* Defer check for overlay.whiteout to ovl_iterate() */</div><div class='ctx'> 	p-&gt;check_xwhiteout = rdd-&gt;in_xwhiteouts_dir &amp;&amp; d_type == DT_REG;</div><div class='ctx'> </div><div class='add'>+	if (c_name &amp;&amp; c_name != name) {</div><div class='add'>+		p-&gt;c_name = c_name;</div><div class='add'>+		p-&gt;c_len = c_len;</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;c_name = p-&gt;name;</div><div class='add'>+		p-&gt;c_len = len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (d_type == DT_CHR) {</div><div class='ctx'> 		p-&gt;next_maybe_whiteout = rdd-&gt;first_maybe_whiteout;</div><div class='ctx'> 		rdd-&gt;first_maybe_whiteout = p;</div><div class='hunk'>@@ -174,48 +211,62 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd,</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,</div><div class='del'>-				  const char *name, int len, u64 ino,</div><div class='add'>+/* Return 0 for found, 1 for added, &lt;0 for error */</div><div class='add'>+static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,</div><div class='add'>+				  const char *name, int len,</div><div class='add'>+				  const char *c_name, int c_len,</div><div class='add'>+				  u64 ino,</div><div class='ctx'> 				  unsigned int d_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node **newp = &amp;rdd-&gt;root-&gt;rb_node;</div><div class='ctx'> 	struct rb_node *parent = NULL;</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='ctx'> </div><div class='del'>-	if (ovl_cache_entry_find_link(name, len, &amp;newp, &amp;parent))</div><div class='del'>-		return true;</div><div class='add'>+	if (ovl_cache_entry_find_link(c_name, c_len, &amp;newp, &amp;parent))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	p = ovl_cache_entry_new(rdd, name, len, ino, d_type);</div><div class='add'>+	p = ovl_cache_entry_new(rdd, name, len, c_name, c_len, ino, d_type);</div><div class='ctx'> 	if (p == NULL) {</div><div class='ctx'> 		rdd-&gt;err = -ENOMEM;</div><div class='del'>-		return false;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;p-&gt;l_node, rdd-&gt;list);</div><div class='ctx'> 	rb_link_node(&amp;p-&gt;node, parent, newp);</div><div class='ctx'> 	rb_insert_color(&amp;p-&gt;node, rdd-&gt;root);</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ovl_fill_lowest(struct ovl_readdir_data *rdd,</div><div class='add'>+/* Return 0 for found, 1 for added, &lt;0 for error */</div><div class='add'>+static int ovl_fill_lowest(struct ovl_readdir_data *rdd,</div><div class='ctx'> 			   const char *name, int namelen,</div><div class='add'>+			   const char *c_name, int c_len,</div><div class='ctx'> 			   loff_t offset, u64 ino, unsigned int d_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='ctx'> </div><div class='del'>-	p = ovl_cache_entry_find(rdd-&gt;root, name, namelen);</div><div class='add'>+	p = ovl_cache_entry_find(rdd-&gt;root, c_name, c_len);</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		list_move_tail(&amp;p-&gt;l_node, &amp;rdd-&gt;middle);</div><div class='add'>+		return 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		p = ovl_cache_entry_new(rdd, name, namelen, ino, d_type);</div><div class='add'>+		p = ovl_cache_entry_new(rdd, name, namelen, c_name, c_len,</div><div class='add'>+					ino, d_type);</div><div class='ctx'> 		if (p == NULL)</div><div class='ctx'> 			rdd-&gt;err = -ENOMEM;</div><div class='ctx'> 		else</div><div class='ctx'> 			list_add_tail(&amp;p-&gt;l_node, &amp;rdd-&gt;middle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rdd-&gt;err == 0;</div><div class='add'>+	return rdd-&gt;err ?: 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ovl_cache_entry_free(struct ovl_cache_entry *p)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;c_name != p-&gt;name)</div><div class='add'>+		kfree(p-&gt;c_name);</div><div class='add'>+	kfree(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ovl_cache_free(struct list_head *list)</div><div class='hunk'>@@ -224,7 +275,7 @@ void ovl_cache_free(struct list_head *list)</div><div class='ctx'> 	struct ovl_cache_entry *n;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(p, n, list, l_node)</div><div class='del'>-		kfree(p);</div><div class='add'>+		ovl_cache_entry_free(p);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(list);</div><div class='ctx'> }</div><div class='hunk'>@@ -260,39 +311,61 @@ static bool ovl_fill_merge(struct dir_context *ctx, const char *name,</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_readdir_data *rdd =</div><div class='ctx'> 		container_of(ctx, struct ovl_readdir_data, ctx);</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(rdd-&gt;dentry-&gt;d_sb);</div><div class='add'>+	const char *c_name = NULL;</div><div class='add'>+	char *cf_name = NULL;</div><div class='add'>+	int c_len = 0, ret;</div><div class='add'>+</div><div class='add'>+	if (ofs-&gt;casefold)</div><div class='add'>+		c_len = ovl_casefold(rdd, name, namelen, &amp;cf_name);</div><div class='add'>+</div><div class='add'>+	if (rdd-&gt;err)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (c_len &lt;= 0) {</div><div class='add'>+		c_name = name;</div><div class='add'>+		c_len = namelen;</div><div class='add'>+	} else {</div><div class='add'>+		c_name = cf_name;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rdd-&gt;count++;</div><div class='ctx'> 	if (!rdd-&gt;is_lowest)</div><div class='del'>-		return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);</div><div class='add'>+		ret = ovl_cache_entry_add_rb(rdd, name, namelen, c_name, c_len, ino, d_type);</div><div class='ctx'> 	else</div><div class='del'>-		return ovl_fill_lowest(rdd, name, namelen, offset, ino, d_type);</div><div class='add'>+		ret = ovl_fill_lowest(rdd, name, namelen, c_name, c_len, offset, ino, d_type);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If ret == 1, that means that c_name is being used as part of struct</div><div class='add'>+	 * ovl_cache_entry and will be freed at ovl_cache_free(). Otherwise,</div><div class='add'>+	 * c_name was found in the rb-tree so we can free it here.</div><div class='add'>+	 */</div><div class='add'>+	if (ret != 1 &amp;&amp; c_name != name)</div><div class='add'>+		kfree(c_name);</div><div class='add'>+</div><div class='add'>+	return ret &gt;= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_check_whiteouts(const struct path *path, struct ovl_readdir_data *rdd)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct ovl_cache_entry *p;</div><div class='ctx'> 	struct dentry *dentry, *dir = path-&gt;dentry;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-</div><div class='del'>-	old_cred = ovl_override_creds(rdd-&gt;dentry-&gt;d_sb);</div><div class='del'>-</div><div class='del'>-	err = down_write_killable(&amp;dir-&gt;d_inode-&gt;i_rwsem);</div><div class='del'>-	if (!err) {</div><div class='del'>-		while (rdd-&gt;first_maybe_whiteout) {</div><div class='del'>-			p = rdd-&gt;first_maybe_whiteout;</div><div class='del'>-			rdd-&gt;first_maybe_whiteout = p-&gt;next_maybe_whiteout;</div><div class='del'>-			dentry = lookup_one(mnt_idmap(path-&gt;mnt), p-&gt;name, dir, p-&gt;len);</div><div class='del'>-			if (!IS_ERR(dentry)) {</div><div class='del'>-				p-&gt;is_whiteout = ovl_is_whiteout(dentry);</div><div class='del'>-				dput(dentry);</div><div class='del'>-			}</div><div class='add'>+</div><div class='add'>+	while (rdd-&gt;first_maybe_whiteout) {</div><div class='add'>+		struct ovl_cache_entry *p =</div><div class='add'>+			rdd-&gt;first_maybe_whiteout;</div><div class='add'>+		rdd-&gt;first_maybe_whiteout = p-&gt;next_maybe_whiteout;</div><div class='add'>+		dentry = lookup_one_positive_killable(mnt_idmap(path-&gt;mnt),</div><div class='add'>+						      &amp;QSTR_LEN(p-&gt;name, p-&gt;len),</div><div class='add'>+						      dir);</div><div class='add'>+		if (!IS_ERR(dentry)) {</div><div class='add'>+			p-&gt;is_whiteout = ovl_is_whiteout(dentry);</div><div class='add'>+			dput(dentry);</div><div class='add'>+		} else if (PTR_ERR(dentry) == -EINTR) {</div><div class='add'>+			return -EINTR;</div><div class='ctx'> 		}</div><div class='del'>-		inode_unlock(dir-&gt;d_inode);</div><div class='ctx'> 	}</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ovl_dir_read(const struct path *realpath,</div><div class='hunk'>@@ -305,8 +378,6 @@ static inline int ovl_dir_read(const struct path *realpath,</div><div class='ctx'> 	if (IS_ERR(realfile))</div><div class='ctx'> 		return PTR_ERR(realfile);</div><div class='ctx'> </div><div class='del'>-	rdd-&gt;in_xwhiteouts_dir = rdd-&gt;dentry &amp;&amp;</div><div class='del'>-		ovl_path_check_xwhiteouts_xattr(OVL_FS(rdd-&gt;dentry-&gt;d_sb), realpath);</div><div class='ctx'> 	rdd-&gt;first_maybe_whiteout = NULL;</div><div class='ctx'> 	rdd-&gt;ctx.pos = 0;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -353,16 +424,26 @@ static int ovl_dir_read_merged(struct dentry *dentry, struct list_head *list,</div><div class='ctx'> 	struct path realpath;</div><div class='ctx'> 	struct ovl_readdir_data rdd = {</div><div class='ctx'> 		.ctx.actor = ovl_fill_merge,</div><div class='add'>+		.ctx.count = INT_MAX,</div><div class='ctx'> 		.dentry = dentry,</div><div class='ctx'> 		.list = list,</div><div class='ctx'> 		.root = root,</div><div class='ctx'> 		.is_lowest = false,</div><div class='add'>+		.map = NULL,</div><div class='ctx'> 	};</div><div class='ctx'> 	int idx, next;</div><div class='add'>+	const struct ovl_layer *layer;</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx != -1; idx = next) {</div><div class='del'>-		next = ovl_path_next(idx, dentry, &amp;realpath);</div><div class='add'>+		next = ovl_path_next(idx, dentry, &amp;realpath, &amp;layer);</div><div class='add'>+</div><div class='add'>+		if (ofs-&gt;casefold)</div><div class='add'>+			rdd.map = sb_encoding(realpath.dentry-&gt;d_sb);</div><div class='add'>+</div><div class='ctx'> 		rdd.is_upper = ovl_dentry_upper(dentry) == realpath.dentry;</div><div class='add'>+		rdd.in_xwhiteouts_dir = layer-&gt;has_xwhiteouts &amp;&amp;</div><div class='add'>+					ovl_dentry_has_xwhiteouts(dentry);</div><div class='ctx'> </div><div class='ctx'> 		if (next != -1) {</div><div class='ctx'> 			err = ovl_dir_read(&amp;realpath, &amp;rdd);</div><div class='hunk'>@@ -491,7 +572,7 @@ static int ovl_cache_update(const struct path *path, struct ovl_cache_entry *p,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* This checks also for xwhiteouts */</div><div class='del'>-	this = lookup_one(mnt_idmap(path-&gt;mnt), p-&gt;name, dir, p-&gt;len);</div><div class='add'>+	this = lookup_one(mnt_idmap(path-&gt;mnt), &amp;QSTR_LEN(p-&gt;name, p-&gt;len), dir);</div><div class='ctx'> 	if (IS_ERR_OR_NULL(this) || !this-&gt;d_inode) {</div><div class='ctx'> 		/* Mark a stale entry */</div><div class='ctx'> 		p-&gt;is_whiteout = true;</div><div class='hunk'>@@ -552,7 +633,7 @@ static bool ovl_fill_plain(struct dir_context *ctx, const char *name,</div><div class='ctx'> 		container_of(ctx, struct ovl_readdir_data, ctx);</div><div class='ctx'> </div><div class='ctx'> 	rdd-&gt;count++;</div><div class='del'>-	p = ovl_cache_entry_new(rdd, name, namelen, ino, d_type);</div><div class='add'>+	p = ovl_cache_entry_new(rdd, name, namelen, NULL, 0, ino, d_type);</div><div class='ctx'> 	if (p == NULL) {</div><div class='ctx'> 		rdd-&gt;err = -ENOMEM;</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -570,6 +651,7 @@ static int ovl_dir_read_impure(const struct path *path,  struct list_head *list,</div><div class='ctx'> 	struct ovl_cache_entry *p, *n;</div><div class='ctx'> 	struct ovl_readdir_data rdd = {</div><div class='ctx'> 		.ctx.actor = ovl_fill_plain,</div><div class='add'>+		.ctx.count = INT_MAX,</div><div class='ctx'> 		.list = list,</div><div class='ctx'> 		.root = root,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -591,7 +673,7 @@ static int ovl_dir_read_impure(const struct path *path,  struct list_head *list,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (p-&gt;ino == p-&gt;real_ino) {</div><div class='ctx'> 			list_del(&amp;p-&gt;l_node);</div><div class='del'>-			kfree(p);</div><div class='add'>+			ovl_cache_entry_free(p);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct rb_node **newp = &amp;root-&gt;rb_node;</div><div class='ctx'> 			struct rb_node *parent = NULL;</div><div class='hunk'>@@ -671,6 +753,7 @@ static bool ovl_fill_real(struct dir_context *ctx, const char *name,</div><div class='ctx'> 	struct ovl_readdir_translate *rdt =</div><div class='ctx'> 		container_of(ctx, struct ovl_readdir_translate, ctx);</div><div class='ctx'> 	struct dir_context *orig_ctx = rdt-&gt;orig_ctx;</div><div class='add'>+	bool res;</div><div class='ctx'> </div><div class='ctx'> 	if (rdt-&gt;parent_ino &amp;&amp; strcmp(name, "..") == 0) {</div><div class='ctx'> 		ino = rdt-&gt;parent_ino;</div><div class='hunk'>@@ -685,7 +768,10 @@ static bool ovl_fill_real(struct dir_context *ctx, const char *name,</div><div class='ctx'> 					  name, namelen, rdt-&gt;xinowarn);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return orig_ctx-&gt;actor(orig_ctx, name, namelen, offset, ino, d_type);</div><div class='add'>+	res = orig_ctx-&gt;actor(orig_ctx, name, namelen, offset, ino, d_type);</div><div class='add'>+	ctx-&gt;count = orig_ctx-&gt;count;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ovl_is_impure_dir(struct file *file)</div><div class='hunk'>@@ -712,6 +798,7 @@ static int ovl_iterate_real(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	const struct ovl_layer *lower_layer = ovl_layer_lower(dir);</div><div class='ctx'> 	struct ovl_readdir_translate rdt = {</div><div class='ctx'> 		.ctx.actor = ovl_fill_real,</div><div class='add'>+		.ctx.count = ctx-&gt;count,</div><div class='ctx'> 		.orig_ctx = ctx,</div><div class='ctx'> 		.xinobits = ovl_xino_bits(ofs),</div><div class='ctx'> 		.xinowarn = ovl_xino_warn(ofs),</div><div class='hunk'>@@ -745,36 +832,12 @@ static int ovl_iterate_real(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int ovl_iterate(struct file *file, struct dir_context *ctx)</div><div class='add'>+static int ovl_iterate_merged(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_dir_file *od = file-&gt;private_data;</div><div class='ctx'> 	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='del'>-	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	if (!ctx-&gt;pos)</div><div class='del'>-		ovl_dir_reset(file);</div><div class='del'>-</div><div class='del'>-	if (od-&gt;is_real) {</div><div class='del'>-		/*</div><div class='del'>-		 * If parent is merge, then need to adjust d_ino for '..', if</div><div class='del'>-		 * dir is impure then need to adjust d_ino for copied up</div><div class='del'>-		 * entries.</div><div class='del'>-		 */</div><div class='del'>-		if (ovl_xino_bits(ofs) ||</div><div class='del'>-		    (ovl_same_fs(ofs) &amp;&amp;</div><div class='del'>-		     (ovl_is_impure_dir(file) ||</div><div class='del'>-		      OVL_TYPE_MERGE(ovl_path_type(dentry-&gt;d_parent))))) {</div><div class='del'>-			err = ovl_iterate_real(file, ctx);</div><div class='del'>-		} else {</div><div class='del'>-			err = iterate_dir(od-&gt;realfile, ctx);</div><div class='del'>-		}</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!od-&gt;cache) {</div><div class='ctx'> 		struct ovl_dir_cache *cache;</div><div class='hunk'>@@ -782,7 +845,7 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		cache = ovl_cache_get(dentry);</div><div class='ctx'> 		err = PTR_ERR(cache);</div><div class='ctx'> 		if (IS_ERR(cache))</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		od-&gt;cache = cache;</div><div class='ctx'> 		ovl_seek_cursor(od, ctx-&gt;pos);</div><div class='hunk'>@@ -794,7 +857,7 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 			if (!p-&gt;ino || p-&gt;check_xwhiteout) {</div><div class='ctx'> 				err = ovl_cache_update(&amp;file-&gt;f_path, p, !p-&gt;ino);</div><div class='ctx'> 				if (err)</div><div class='del'>-					goto out;</div><div class='add'>+					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* ovl_cache_update() sets is_whiteout on stale entry */</div><div class='hunk'>@@ -805,12 +868,50 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		od-&gt;cursor = p-&gt;l_node.next;</div><div class='ctx'> 		ctx-&gt;pos++;</div><div class='ctx'> 	}</div><div class='del'>-	err = 0;</div><div class='del'>-out:</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ovl_need_adjust_d_ino(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry = file-&gt;f_path.dentry;</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='add'>+</div><div class='add'>+	/* If parent is merge, then need to adjust d_ino for '..' */</div><div class='add'>+	if (ovl_xino_bits(ofs))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Can't do consistent inode numbering */</div><div class='add'>+	if (!ovl_same_fs(ofs))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* If dir is impure then need to adjust d_ino for copied up entries */</div><div class='add'>+	if (ovl_is_impure_dir(file) ||</div><div class='add'>+	    OVL_TYPE_MERGE(ovl_path_type(dentry-&gt;d_parent)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Pure: no need to adjust d_ino */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ovl_iterate(struct file *file, struct dir_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ovl_dir_file *od = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;pos)</div><div class='add'>+		ovl_dir_reset(file);</div><div class='add'>+</div><div class='add'>+	with_ovl_creds(file_dentry(file)-&gt;d_sb) {</div><div class='add'>+		if (!od-&gt;is_real)</div><div class='add'>+			return ovl_iterate_merged(file, ctx);</div><div class='add'>+</div><div class='add'>+		if (ovl_need_adjust_d_ino(file))</div><div class='add'>+			return ovl_iterate_real(file, ctx);</div><div class='add'>+</div><div class='add'>+		return iterate_dir(od-&gt;realfile, ctx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t res;</div><div class='hunk'>@@ -854,14 +955,8 @@ out_unlock:</div><div class='ctx'> static struct file *ovl_dir_open_realfile(const struct file *file,</div><div class='ctx'> 					  const struct path *realpath)</div><div class='ctx'> {</div><div class='del'>-	struct file *res;</div><div class='del'>-	const struct cred *old_cred;</div><div class='del'>-</div><div class='del'>-	old_cred = ovl_override_creds(file_inode(file)-&gt;i_sb);</div><div class='del'>-	res = ovl_path_open(realpath, O_RDONLY | (file-&gt;f_flags &amp; O_LARGEFILE));</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='add'>+	with_ovl_creds(file_inode(file)-&gt;i_sb)</div><div class='add'>+		return ovl_path_open(realpath, O_RDONLY | (file-&gt;f_flags &amp; O_LARGEFILE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -982,11 +1077,9 @@ int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ovl_cache_entry *p, *n;</div><div class='ctx'> 	struct rb_root root = RB_ROOT;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	err = ovl_dir_read_merged(dentry, list, &amp;root);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		err = ovl_dir_read_merged(dentry, list, &amp;root);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1014,7 +1107,7 @@ int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)</div><div class='ctx'> </div><div class='ctx'> del_entry:</div><div class='ctx'> 		list_del(&amp;p-&gt;l_node);</div><div class='del'>-		kfree(p);</div><div class='add'>+		ovl_cache_entry_free(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1025,14 +1118,13 @@ void ovl_cleanup_whiteouts(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(upper-&gt;d_inode, I_MUTEX_CHILD);</div><div class='ctx'> 	list_for_each_entry(p, list, l_node) {</div><div class='ctx'> 		struct dentry *dentry;</div><div class='ctx'> </div><div class='ctx'> 		if (WARN_ON(!p-&gt;is_whiteout || !p-&gt;is_upper))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		dentry = ovl_lookup_upper(ofs, p-&gt;name, upper, p-&gt;len);</div><div class='add'>+		dentry = ovl_lookup_upper_unlocked(ofs, p-&gt;name, upper, p-&gt;len);</div><div class='ctx'> 		if (IS_ERR(dentry)) {</div><div class='ctx'> 			pr_err("lookup '%s/%.*s' failed (%i)\n",</div><div class='ctx'> 			       upper-&gt;d_name.name, p-&gt;len, p-&gt;name,</div><div class='hunk'>@@ -1040,10 +1132,9 @@ void ovl_cleanup_whiteouts(struct ovl_fs *ofs, struct dentry *upper,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (dentry-&gt;d_inode)</div><div class='del'>-			ovl_cleanup(ofs, upper-&gt;d_inode, dentry);</div><div class='add'>+			ovl_cleanup(ofs, upper, dentry);</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(upper-&gt;d_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ovl_check_d_type(struct dir_context *ctx, const char *name,</div><div class='hunk'>@@ -1072,6 +1163,7 @@ int ovl_check_d_type_supported(const struct path *realpath)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ovl_readdir_data rdd = {</div><div class='ctx'> 		.ctx.actor = ovl_check_d_type,</div><div class='add'>+		.ctx.count = INT_MAX,</div><div class='ctx'> 		.d_type_supported = false,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1088,11 +1180,11 @@ static int ovl_workdir_cleanup_recurse(struct ovl_fs *ofs, const struct path *pa</div><div class='ctx'> 				       int level)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct inode *dir = path-&gt;dentry-&gt;d_inode;</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='ctx'> 	struct ovl_readdir_data rdd = {</div><div class='ctx'> 		.ctx.actor = ovl_fill_plain,</div><div class='add'>+		.ctx.count = INT_MAX,</div><div class='ctx'> 		.list = &amp;list,</div><div class='ctx'> 	};</div><div class='ctx'> 	bool incompat = false;</div><div class='hunk'>@@ -1113,7 +1205,6 @@ static int ovl_workdir_cleanup_recurse(struct ovl_fs *ofs, const struct path *pa</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='ctx'> 	list_for_each_entry(p, &amp;list, l_node) {</div><div class='ctx'> 		struct dentry *dentry;</div><div class='ctx'> </div><div class='hunk'>@@ -1128,39 +1219,40 @@ static int ovl_workdir_cleanup_recurse(struct ovl_fs *ofs, const struct path *pa</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		dentry = ovl_lookup_upper(ofs, p-&gt;name, path-&gt;dentry, p-&gt;len);</div><div class='add'>+		dentry = ovl_lookup_upper_unlocked(ofs, p-&gt;name, path-&gt;dentry, p-&gt;len);</div><div class='ctx'> 		if (IS_ERR(dentry))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (dentry-&gt;d_inode)</div><div class='del'>-			err = ovl_workdir_cleanup(ofs, dir, path-&gt;mnt, dentry, level);</div><div class='add'>+			err = ovl_workdir_cleanup(ofs, path-&gt;dentry, path-&gt;mnt,</div><div class='add'>+						  dentry, level);</div><div class='ctx'> 		dput(dentry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	inode_unlock(dir);</div><div class='ctx'> out:</div><div class='ctx'> 	ovl_cache_free(&amp;list);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_workdir_cleanup(struct ovl_fs *ofs, struct inode *dir,</div><div class='add'>+int ovl_workdir_cleanup(struct ovl_fs *ofs, struct dentry *parent,</div><div class='ctx'> 			struct vfsmount *mnt, struct dentry *dentry, int level)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!d_is_dir(dentry) || level &gt; 1) {</div><div class='del'>-		return ovl_cleanup(ofs, dir, dentry);</div><div class='del'>-	}</div><div class='add'>+	if (!d_is_dir(dentry) || level &gt; 1)</div><div class='add'>+		return ovl_cleanup(ofs, parent, dentry);</div><div class='ctx'> </div><div class='del'>-	err = ovl_do_rmdir(ofs, dir, dentry);</div><div class='add'>+	dentry = start_removing_dentry(parent, dentry);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return PTR_ERR(dentry);</div><div class='add'>+	err = ovl_do_rmdir(ofs, parent-&gt;d_inode, dentry);</div><div class='add'>+	end_removing(dentry);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		struct path path = { .mnt = mnt, .dentry = dentry };</div><div class='ctx'> </div><div class='del'>-		inode_unlock(dir);</div><div class='ctx'> 		err = ovl_workdir_cleanup_recurse(ofs, &amp;path, level + 1);</div><div class='del'>-		inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='ctx'> 		if (!err)</div><div class='del'>-			err = ovl_cleanup(ofs, dir, dentry);</div><div class='add'>+			err = ovl_cleanup(ofs, parent, dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1171,12 +1263,12 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct dentry *indexdir = ofs-&gt;workdir;</div><div class='ctx'> 	struct dentry *index = NULL;</div><div class='del'>-	struct inode *dir = indexdir-&gt;d_inode;</div><div class='ctx'> 	struct path path = { .mnt = ovl_upper_mnt(ofs), .dentry = indexdir };</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	struct ovl_cache_entry *p;</div><div class='ctx'> 	struct ovl_readdir_data rdd = {</div><div class='ctx'> 		.ctx.actor = ovl_fill_plain,</div><div class='add'>+		.ctx.count = INT_MAX,</div><div class='ctx'> 		.list = &amp;list,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1276,6 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='ctx'> 	list_for_each_entry(p, &amp;list, l_node) {</div><div class='ctx'> 		if (p-&gt;name[0] == '.') {</div><div class='ctx'> 			if (p-&gt;len == 1)</div><div class='hunk'>@@ -1192,7 +1283,7 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)</div><div class='ctx'> 			if (p-&gt;len == 2 &amp;&amp; p-&gt;name[1] == '.')</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='del'>-		index = ovl_lookup_upper(ofs, p-&gt;name, indexdir, p-&gt;len);</div><div class='add'>+		index = ovl_lookup_upper_unlocked(ofs, p-&gt;name, indexdir, p-&gt;len);</div><div class='ctx'> 		if (IS_ERR(index)) {</div><div class='ctx'> 			err = PTR_ERR(index);</div><div class='ctx'> 			index = NULL;</div><div class='hunk'>@@ -1200,7 +1291,7 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Cleanup leftover from index create/cleanup attempt */</div><div class='ctx'> 		if (index-&gt;d_name.name[0] == '#') {</div><div class='del'>-			err = ovl_workdir_cleanup(ofs, dir, path.mnt, index, 1);</div><div class='add'>+			err = ovl_workdir_cleanup(ofs, indexdir, path.mnt, index, 1);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 			goto next;</div><div class='hunk'>@@ -1210,7 +1301,7 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		} else if (err == -ESTALE) {</div><div class='ctx'> 			/* Cleanup stale index entries */</div><div class='del'>-			err = ovl_cleanup(ofs, dir, index);</div><div class='add'>+			err = ovl_cleanup(ofs, indexdir, index);</div><div class='ctx'> 		} else if (err != -ENOENT) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Abort mount to avoid corrupting the index if</div><div class='hunk'>@@ -1223,10 +1314,10 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs)</div><div class='ctx'> 			 * Whiteout orphan index to block future open by</div><div class='ctx'> 			 * handle after overlay nlink dropped to zero.</div><div class='ctx'> 			 */</div><div class='del'>-			err = ovl_cleanup_and_whiteout(ofs, dir, index);</div><div class='add'>+			err = ovl_cleanup_and_whiteout(ofs, indexdir, index);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Cleanup orphan index entries */</div><div class='del'>-			err = ovl_cleanup(ofs, dir, index);</div><div class='add'>+			err = ovl_cleanup(ofs, indexdir, index);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1237,7 +1328,6 @@ next:</div><div class='ctx'> 		index = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dput(index);</div><div class='del'>-	inode_unlock(dir);</div><div class='ctx'> out:</div><div class='ctx'> 	ovl_cache_free(&amp;list);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c<br/>index 4ab66e3d4cff..ba9146f22a2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/super.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/super.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/super.c</a></div><div class='hunk'>@@ -28,41 +28,38 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> struct ovl_dir_cache;</div><div class='ctx'> </div><div class='del'>-static struct dentry *ovl_d_real(struct dentry *dentry,</div><div class='del'>-				 const struct inode *inode)</div><div class='add'>+static struct dentry *ovl_d_real(struct dentry *dentry, enum d_real_type type)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *real = NULL, *lower;</div><div class='add'>+	struct dentry *upper, *lower;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * vfs is only expected to call d_real() with NULL from d_real_inode()</div><div class='del'>-	 * and with overlay inode from file_dentry() on an overlay file.</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: remove @inode argument from d_real() API, remove code in this</div><div class='del'>-	 * function that deals with non-NULL @inode and remove d_real() call</div><div class='del'>-	 * from file_dentry().</div><div class='del'>-	 */</div><div class='del'>-	if (inode &amp;&amp; d_inode(dentry) == inode)</div><div class='del'>-		return dentry;</div><div class='del'>-	else if (inode)</div><div class='add'>+	switch (type) {</div><div class='add'>+	case D_REAL_DATA:</div><div class='add'>+	case D_REAL_METADATA:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		goto bug;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!d_is_reg(dentry)) {</div><div class='ctx'> 		/* d_real_inode() is only relevant for regular files */</div><div class='ctx'> 		return dentry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	real = ovl_dentry_upper(dentry);</div><div class='del'>-	if (real &amp;&amp; (inode == d_inode(real)))</div><div class='del'>-		return real;</div><div class='add'>+	upper = ovl_dentry_upper(dentry);</div><div class='add'>+	if (upper &amp;&amp; (type == D_REAL_METADATA ||</div><div class='add'>+		      ovl_has_upperdata(d_inode(dentry))))</div><div class='add'>+		return upper;</div><div class='ctx'> </div><div class='del'>-	if (real &amp;&amp; !inode &amp;&amp; ovl_has_upperdata(d_inode(dentry)))</div><div class='del'>-		return real;</div><div class='add'>+	if (type == D_REAL_METADATA) {</div><div class='add'>+		lower = ovl_dentry_lower(dentry);</div><div class='add'>+		goto real_lower;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Best effort lazy lookup of lowerdata for !inode case to return</div><div class='add'>+	 * Best effort lazy lookup of lowerdata for D_REAL_DATA case to return</div><div class='ctx'> 	 * the real lowerdata dentry.  The only current caller of d_real() with</div><div class='del'>-	 * NULL inode is d_real_inode() from trace_uprobe and this caller is</div><div class='add'>+	 * D_REAL_DATA is d_real_inode() from trace_uprobe and this caller is</div><div class='ctx'> 	 * likely going to be followed reading from the file, before placing</div><div class='ctx'> 	 * uprobes on offset within the file, so lowerdata should be available</div><div class='ctx'> 	 * when setting the uprobe.</div><div class='hunk'>@@ -73,18 +70,13 @@ static struct dentry *ovl_d_real(struct dentry *dentry,</div><div class='ctx'> 	lower = ovl_dentry_lowerdata(dentry);</div><div class='ctx'> 	if (!lower)</div><div class='ctx'> 		goto bug;</div><div class='del'>-	real = lower;</div><div class='ctx'> </div><div class='del'>-	/* Handle recursion */</div><div class='del'>-	real = d_real(real, inode);</div><div class='add'>+real_lower:</div><div class='add'>+	/* Handle recursion into stacked lower fs */</div><div class='add'>+	return d_real(lower, type);</div><div class='ctx'> </div><div class='del'>-	if (!inode || inode == d_inode(real))</div><div class='del'>-		return real;</div><div class='ctx'> bug:</div><div class='del'>-	WARN(1, "%s(%pd4, %s:%lu): real dentry (%p/%lu) not found\n",</div><div class='del'>-	     __func__, dentry, inode ? inode-&gt;i_sb-&gt;s_id : "NULL",</div><div class='del'>-	     inode ? inode-&gt;i_ino : 0, real,</div><div class='del'>-	     real &amp;&amp; d_inode(real) ? d_inode(real)-&gt;i_ino : 0);</div><div class='add'>+	WARN(1, "%s(%pd4, %d): real dentry not found\n", __func__, dentry, type);</div><div class='ctx'> 	return dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +91,24 @@ static int ovl_revalidate_real(struct dentry *d, unsigned int flags, bool weak)</div><div class='ctx'> 		if (d-&gt;d_flags &amp; DCACHE_OP_WEAK_REVALIDATE)</div><div class='ctx'> 			ret =  d-&gt;d_op-&gt;d_weak_revalidate(d, flags);</div><div class='ctx'> 	} else if (d-&gt;d_flags &amp; DCACHE_OP_REVALIDATE) {</div><div class='del'>-		ret = d-&gt;d_op-&gt;d_revalidate(d, flags);</div><div class='add'>+		struct dentry *parent;</div><div class='add'>+		struct inode *dir;</div><div class='add'>+		struct name_snapshot n;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; LOOKUP_RCU) {</div><div class='add'>+			parent = READ_ONCE(d-&gt;d_parent);</div><div class='add'>+			dir = d_inode_rcu(parent);</div><div class='add'>+			if (!dir)</div><div class='add'>+				return -ECHILD;</div><div class='add'>+		} else {</div><div class='add'>+			parent = dget_parent(d);</div><div class='add'>+			dir = d_inode(parent);</div><div class='add'>+		}</div><div class='add'>+		take_dentry_name_snapshot(&amp;n, d);</div><div class='add'>+		ret = d-&gt;d_op-&gt;d_revalidate(dir, &amp;n.name, d, flags);</div><div class='add'>+		release_dentry_name_snapshot(&amp;n);</div><div class='add'>+		if (!(flags &amp; LOOKUP_RCU))</div><div class='add'>+			dput(parent);</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			if (!(flags &amp; LOOKUP_RCU))</div><div class='ctx'> 				d_invalidate(d);</div><div class='hunk'>@@ -119,9 +128,17 @@ static int ovl_dentry_revalidate_common(struct dentry *dentry,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret = 1;</div><div class='ctx'> </div><div class='del'>-	/* Careful in RCU mode */</div><div class='del'>-	if (!inode)</div><div class='add'>+	if (!inode) {</div><div class='add'>+		/*</div><div class='add'>+		 * Lookup of negative dentries will call ovl_dentry_init_flags()</div><div class='add'>+		 * with NULL upperdentry and NULL oe, resulting in the</div><div class='add'>+		 * DCACHE_OP*_REVALIDATE flags being cleared.  Hence the only</div><div class='add'>+		 * way to get a negative inode is due to a race with dentry</div><div class='add'>+		 * destruction.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(!(flags &amp; LOOKUP_RCU));</div><div class='ctx'> 		return -ECHILD;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	oe = OVL_I_E(inode);</div><div class='ctx'> 	lowerstack = ovl_lowerstack(oe);</div><div class='hunk'>@@ -135,7 +152,8 @@ static int ovl_dentry_revalidate_common(struct dentry *dentry,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_dentry_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int ovl_dentry_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return ovl_dentry_revalidate_common(dentry, flags, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -151,6 +169,16 @@ static const struct dentry_operations ovl_dentry_operations = {</div><div class='ctx'> 	.d_weak_revalidate = ovl_dentry_weak_revalidate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+static const struct dentry_operations ovl_dentry_ci_operations = {</div><div class='add'>+	.d_real = ovl_d_real,</div><div class='add'>+	.d_revalidate = ovl_dentry_revalidate,</div><div class='add'>+	.d_weak_revalidate = ovl_dentry_weak_revalidate,</div><div class='add'>+	.d_hash = generic_ci_d_hash,</div><div class='add'>+	.d_compare = generic_ci_d_compare,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct kmem_cache *ovl_inode_cachep;</div><div class='ctx'> </div><div class='ctx'> static struct inode *ovl_alloc_inode(struct super_block *sb)</div><div class='hunk'>@@ -210,15 +238,9 @@ static int ovl_sync_fs(struct super_block *sb, int wait)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ovl_sync_status(ofs);</div><div class='del'>-	/*</div><div class='del'>-	 * We have to always set the err, because the return value isn't</div><div class='del'>-	 * checked in syncfs, and instead indirectly return an error via</div><div class='del'>-	 * the sb's writeback errseq, which VFS inspects after this call.</div><div class='del'>-	 */</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		errseq_set(&amp;sb-&gt;s_wb_err, -EIO);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -276,7 +298,7 @@ static const struct super_operations ovl_super_operations = {</div><div class='ctx'> 	.alloc_inode	= ovl_alloc_inode,</div><div class='ctx'> 	.free_inode	= ovl_free_inode,</div><div class='ctx'> 	.destroy_inode	= ovl_destroy_inode,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.put_super	= ovl_put_super,</div><div class='ctx'> 	.sync_fs	= ovl_sync_fs,</div><div class='ctx'> 	.statfs		= ovl_statfs,</div><div class='hunk'>@@ -295,9 +317,8 @@ static struct dentry *ovl_workdir_create(struct ovl_fs *ofs,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool retried = false;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='ctx'> retry:</div><div class='del'>-	work = ovl_lookup_upper(ofs, name, ofs-&gt;workbasedir, strlen(name));</div><div class='add'>+	work = ovl_start_creating_upper(ofs, ofs-&gt;workbasedir, &amp;QSTR(name));</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(work)) {</div><div class='ctx'> 		struct iattr attr = {</div><div class='hunk'>@@ -306,26 +327,26 @@ retry:</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		if (work-&gt;d_inode) {</div><div class='add'>+			end_creating_keep(work);</div><div class='add'>+			if (persist)</div><div class='add'>+				return work;</div><div class='ctx'> 			err = -EEXIST;</div><div class='ctx'> 			if (retried)</div><div class='ctx'> 				goto out_dput;</div><div class='del'>-</div><div class='del'>-			if (persist)</div><div class='del'>-				goto out_unlock;</div><div class='del'>-</div><div class='ctx'> 			retried = true;</div><div class='del'>-			err = ovl_workdir_cleanup(ofs, dir, mnt, work, 0);</div><div class='add'>+			err = ovl_workdir_cleanup(ofs, ofs-&gt;workbasedir, mnt, work, 0);</div><div class='ctx'> 			dput(work);</div><div class='del'>-			if (err == -EINVAL) {</div><div class='del'>-				work = ERR_PTR(err);</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='add'>+			if (err == -EINVAL)</div><div class='add'>+				return ERR_PTR(err);</div><div class='add'>+</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = ovl_mkdir_real(ofs, dir, &amp;work, attr.ia_mode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_dput;</div><div class='add'>+		work = ovl_do_mkdir(ofs, dir, work, attr.ia_mode);</div><div class='add'>+		end_creating_keep(work);</div><div class='add'>+		err = PTR_ERR(work);</div><div class='add'>+		if (IS_ERR(work))</div><div class='add'>+			goto out_err;</div><div class='ctx'> </div><div class='ctx'> 		/* Weird filesystem returning with hashed negative (kernfs)? */</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -363,8 +384,6 @@ retry:</div><div class='ctx'> 		err = PTR_ERR(work);</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(dir);</div><div class='ctx'> 	return work;</div><div class='ctx'> </div><div class='ctx'> out_dput:</div><div class='hunk'>@@ -372,8 +391,7 @@ out_dput:</div><div class='ctx'> out_err:</div><div class='ctx'> 	pr_warn("failed to create directory %s/%s (errno: %i); mounting read-only\n",</div><div class='ctx'> 		ofs-&gt;config.workdir, name, -err);</div><div class='del'>-	work = NULL;</div><div class='del'>-	goto out_unlock;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ovl_check_namelen(const struct path *path, struct ovl_fs *ofs,</div><div class='hunk'>@@ -390,7 +408,7 @@ static int ovl_check_namelen(const struct path *path, struct ovl_fs *ofs,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ovl_lower_dir(const char *name, struct path *path,</div><div class='add'>+static int ovl_lower_dir(const char *name, const struct path *path,</div><div class='ctx'> 			 struct ovl_fs *ofs, int *stack_depth)</div><div class='ctx'> {</div><div class='ctx'> 	int fh_type;</div><div class='hunk'>@@ -552,37 +570,41 @@ out:</div><div class='ctx'> static int ovl_check_rename_whiteout(struct ovl_fs *ofs)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *workdir = ofs-&gt;workdir;</div><div class='del'>-	struct inode *dir = d_inode(workdir);</div><div class='ctx'> 	struct dentry *temp;</div><div class='del'>-	struct dentry *dest;</div><div class='ctx'> 	struct dentry *whiteout;</div><div class='ctx'> 	struct name_snapshot name;</div><div class='add'>+	struct renamedata rd = {};</div><div class='add'>+	char name2[OVL_TEMPNAME_SIZE];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='del'>-</div><div class='ctx'> 	temp = ovl_create_temp(ofs, workdir, OVL_CATTR(S_IFREG | 0));</div><div class='ctx'> 	err = PTR_ERR(temp);</div><div class='ctx'> 	if (IS_ERR(temp))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	dest = ovl_lookup_temp(ofs, workdir);</div><div class='del'>-	err = PTR_ERR(dest);</div><div class='del'>-	if (IS_ERR(dest)) {</div><div class='add'>+	rd.mnt_idmap = ovl_upper_mnt_idmap(ofs);</div><div class='add'>+	rd.old_parent = workdir;</div><div class='add'>+	rd.new_parent = workdir;</div><div class='add'>+	rd.flags = RENAME_WHITEOUT;</div><div class='add'>+	ovl_tempname(name2);</div><div class='add'>+	err = start_renaming_dentry(&amp;rd, 0, temp, &amp;QSTR(name2));</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dput(temp);</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Name is inline and stable - using snapshot as a copy helper */</div><div class='ctx'> 	take_dentry_name_snapshot(&amp;name, temp);</div><div class='del'>-	err = ovl_do_rename(ofs, dir, temp, dir, dest, RENAME_WHITEOUT);</div><div class='add'>+	err = ovl_do_rename_rd(&amp;rd);</div><div class='add'>+	end_renaming(&amp;rd);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (err == -EINVAL)</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		goto cleanup_temp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	whiteout = ovl_lookup_upper(ofs, name.name.name, workdir, name.name.len);</div><div class='add'>+	whiteout = ovl_lookup_upper_unlocked(ofs, name.name.name,</div><div class='add'>+					     workdir, name.name.len);</div><div class='ctx'> 	err = PTR_ERR(whiteout);</div><div class='ctx'> 	if (IS_ERR(whiteout))</div><div class='ctx'> 		goto cleanup_temp;</div><div class='hunk'>@@ -591,17 +613,13 @@ static int ovl_check_rename_whiteout(struct ovl_fs *ofs)</div><div class='ctx'> </div><div class='ctx'> 	/* Best effort cleanup of whiteout and temp file */</div><div class='ctx'> 	if (err)</div><div class='del'>-		ovl_cleanup(ofs, dir, whiteout);</div><div class='add'>+		ovl_cleanup(ofs, workdir, whiteout);</div><div class='ctx'> 	dput(whiteout);</div><div class='ctx'> </div><div class='ctx'> cleanup_temp:</div><div class='del'>-	ovl_cleanup(ofs, dir, temp);</div><div class='add'>+	ovl_cleanup(ofs, workdir, temp);</div><div class='ctx'> 	release_dentry_name_snapshot(&amp;name);</div><div class='ctx'> 	dput(temp);</div><div class='del'>-	dput(dest);</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	inode_unlock(dir);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -610,15 +628,15 @@ static struct dentry *ovl_lookup_or_create(struct ovl_fs *ofs,</div><div class='ctx'> 					   struct dentry *parent,</div><div class='ctx'> 					   const char *name, umode_t mode)</div><div class='ctx'> {</div><div class='del'>-	size_t len = strlen(name);</div><div class='ctx'> 	struct dentry *child;</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(parent-&gt;d_inode, I_MUTEX_PARENT);</div><div class='del'>-	child = ovl_lookup_upper(ofs, name, parent, len);</div><div class='del'>-	if (!IS_ERR(child) &amp;&amp; !child-&gt;d_inode)</div><div class='del'>-		child = ovl_create_real(ofs, parent-&gt;d_inode, child,</div><div class='del'>-					OVL_CATTR(mode));</div><div class='del'>-	inode_unlock(parent-&gt;d_inode);</div><div class='add'>+	child = ovl_start_creating_upper(ofs, parent, &amp;QSTR(name));</div><div class='add'>+	if (!IS_ERR(child)) {</div><div class='add'>+		if (!child-&gt;d_inode)</div><div class='add'>+			child = ovl_create_real(ofs, parent, child,</div><div class='add'>+						OVL_CATTR(mode));</div><div class='add'>+		end_creating_keep(child);</div><div class='add'>+	}</div><div class='ctx'> 	dput(parent);</div><div class='ctx'> </div><div class='ctx'> 	return child;</div><div class='hunk'>@@ -986,6 +1004,25 @@ static int ovl_get_data_fsid(struct ovl_fs *ofs)</div><div class='ctx'> 	return ofs-&gt;numfs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Set the ovl sb encoding as the same one used by the first layer</div><div class='add'>+ */</div><div class='add'>+static int ovl_set_encoding(struct super_block *sb, struct super_block *fs_sb)</div><div class='add'>+{</div><div class='add'>+	if (!sb_has_encoding(fs_sb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+	if (sb_has_strict_encoding(fs_sb)) {</div><div class='add'>+		pr_err("strict encoding not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_encoding = fs_sb-&gt;s_encoding;</div><div class='add'>+	sb-&gt;s_encoding_flags = fs_sb-&gt;s_encoding_flags;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,</div><div class='ctx'> 			  struct ovl_fs_context *ctx, struct ovl_layer *layers)</div><div class='hunk'>@@ -1019,6 +1056,12 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,</div><div class='ctx'> 	if (ovl_upper_mnt(ofs)) {</div><div class='ctx'> 		ofs-&gt;fs[0].sb = ovl_upper_mnt(ofs)-&gt;mnt_sb;</div><div class='ctx'> 		ofs-&gt;fs[0].is_lower = false;</div><div class='add'>+</div><div class='add'>+		if (ofs-&gt;casefold) {</div><div class='add'>+			err = ovl_set_encoding(sb, ofs-&gt;fs[0].sb);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nr_merged_lower = ctx-&gt;nr - ctx-&gt;nr_data;</div><div class='hunk'>@@ -1078,6 +1121,19 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,</div><div class='ctx'> 		l-&gt;name = NULL;</div><div class='ctx'> 		ofs-&gt;numlayer++;</div><div class='ctx'> 		ofs-&gt;fs[fsid].is_lower = true;</div><div class='add'>+</div><div class='add'>+		if (ofs-&gt;casefold) {</div><div class='add'>+			if (!ovl_upper_mnt(ofs) &amp;&amp; !sb_has_encoding(sb)) {</div><div class='add'>+				err = ovl_set_encoding(sb, ofs-&gt;fs[fsid].sb);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!sb_same_encoding(sb, mnt-&gt;mnt_sb)) {</div><div class='add'>+				pr_err("all layers must have the same encoding\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1133,6 +1189,11 @@ static struct ovl_entry *ovl_get_lowerstack(struct super_block *sb,</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;nr == ctx-&gt;nr_data) {</div><div class='add'>+		pr_err("at least one non-data lowerdir is required\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	for (i = 0; i &lt; ctx-&gt;nr; i++) {</div><div class='ctx'> 		l = &amp;ctx-&gt;lower[i];</div><div class='hunk'>@@ -1249,6 +1310,7 @@ static struct dentry *ovl_get_root(struct super_block *sb,</div><div class='ctx'> 				   struct ovl_entry *oe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *root;</div><div class='add'>+	struct ovl_fs *ofs = OVL_FS(sb);</div><div class='ctx'> 	struct ovl_path *lowerpath = ovl_lowerstack(oe);</div><div class='ctx'> 	unsigned long ino = d_inode(lowerpath-&gt;dentry)-&gt;i_ino;</div><div class='ctx'> 	int fsid = lowerpath-&gt;layer-&gt;fsid;</div><div class='hunk'>@@ -1270,11 +1332,26 @@ static struct dentry *ovl_get_root(struct super_block *sb,</div><div class='ctx'> 			ovl_set_flag(OVL_IMPURE, d_inode(root));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Look for xwhiteouts marker except in the lowermost layer */</div><div class='add'>+	for (int i = 0; i &lt; ovl_numlower(oe) - 1; i++, lowerpath++) {</div><div class='add'>+		struct path path = {</div><div class='add'>+			.mnt = lowerpath-&gt;layer-&gt;mnt,</div><div class='add'>+			.dentry = lowerpath-&gt;dentry,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* overlay.opaque=x means xwhiteouts directory */</div><div class='add'>+		if (ovl_get_opaquedir_val(ofs, &amp;path) == 'x') {</div><div class='add'>+			ovl_layer_set_xwhiteouts(ofs, lowerpath-&gt;layer);</div><div class='add'>+			ovl_dentry_set_xwhiteouts(root);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Root is always merge -&gt; can have whiteouts */</div><div class='ctx'> 	ovl_set_flag(OVL_WHITEOUTS, d_inode(root));</div><div class='ctx'> 	ovl_dentry_set_flag(OVL_E_CONNECTED, root);</div><div class='ctx'> 	ovl_set_upperdata(d_inode(root));</div><div class='ctx'> 	ovl_inode_init(d_inode(root), &amp;oip, ino, fsid);</div><div class='add'>+	WARN_ON(!!IS_CASEFOLDED(d_inode(root)) != ofs-&gt;casefold);</div><div class='ctx'> 	ovl_dentry_init_flags(root, upperdentry, oe, DCACHE_OP_WEAK_REVALIDATE);</div><div class='ctx'> 	/* root keeps a reference of upperdentry */</div><div class='ctx'> 	dget(upperdentry);</div><div class='hunk'>@@ -1282,47 +1359,48 @@ static struct dentry *ovl_get_root(struct super_block *sb,</div><div class='ctx'> 	return root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='add'>+static void ovl_set_d_op(struct super_block *sb)</div><div class='ctx'> {</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='ctx'> 	struct ovl_fs *ofs = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	if (ofs-&gt;casefold) {</div><div class='add'>+		set_default_d_op(sb, &amp;ovl_dentry_ci_operations);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	set_default_d_op(sb, &amp;ovl_dentry_operations);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ovl_fill_super_creds(struct fs_context *fc, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct ovl_fs *ofs = sb-&gt;s_fs_info;</div><div class='add'>+	struct cred *creator_cred = (struct cred *)ofs-&gt;creator_cred;</div><div class='ctx'> 	struct ovl_fs_context *ctx = fc-&gt;fs_private;</div><div class='del'>-	struct dentry *root_dentry;</div><div class='del'>-	struct ovl_entry *oe;</div><div class='ctx'> 	struct ovl_layer *layers;</div><div class='del'>-	struct cred *cred;</div><div class='add'>+	struct ovl_entry *oe = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = -EIO;</div><div class='del'>-	if (WARN_ON(fc-&gt;user_ns != current_user_ns()))</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_d_op = &amp;ovl_dentry_operations;</div><div class='del'>-</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	ofs-&gt;creator_cred = cred = prepare_creds();</div><div class='del'>-	if (!cred)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='ctx'> 	err = ovl_fs_params_verify(ctx, &amp;ofs-&gt;config);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	if (ctx-&gt;nr == 0) {</div><div class='ctx'> 		if (!(fc-&gt;sb_flags &amp; SB_SILENT))</div><div class='ctx'> 			pr_err("missing 'lowerdir'\n");</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	layers = kcalloc(ctx-&gt;nr + 1, sizeof(struct ovl_layer), GFP_KERNEL);</div><div class='ctx'> 	if (!layers)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	ofs-&gt;config.lowerdirs = kcalloc(ctx-&gt;nr + 1, sizeof(char *), GFP_KERNEL);</div><div class='ctx'> 	if (!ofs-&gt;config.lowerdirs) {</div><div class='ctx'> 		kfree(layers);</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	ofs-&gt;layers = layers;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1355,12 +1433,12 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		if (!ofs-&gt;config.workdir) {</div><div class='ctx'> 			pr_err("missing 'workdir'\n");</div><div class='del'>-			goto out_err;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = ovl_get_upper(sb, ofs, &amp;layers[0], &amp;ctx-&gt;upper);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_err;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		upper_sb = ovl_upper_mnt(ofs)-&gt;mnt_sb;</div><div class='ctx'> 		if (!ovl_should_sync(ofs)) {</div><div class='hunk'>@@ -1368,13 +1446,13 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 			if (errseq_check(&amp;upper_sb-&gt;s_wb_err, ofs-&gt;errseq)) {</div><div class='ctx'> 				err = -EIO;</div><div class='ctx'> 				pr_err("Cannot mount volatile when upperdir has an unseen error. Sync upperdir fs to clear state.\n");</div><div class='del'>-				goto out_err;</div><div class='add'>+				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = ovl_get_workdir(sb, ofs, &amp;ctx-&gt;upper, &amp;ctx-&gt;work);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_err;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		if (!ofs-&gt;workdir)</div><div class='ctx'> 			sb-&gt;s_flags |= SB_RDONLY;</div><div class='hunk'>@@ -1385,7 +1463,7 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	oe = ovl_get_lowerstack(sb, ctx, ofs, layers);</div><div class='ctx'> 	err = PTR_ERR(oe);</div><div class='ctx'> 	if (IS_ERR(oe))</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* If the upper fs is nonexistent, we mark overlayfs r/o too */</div><div class='ctx'> 	if (!ovl_upper_mnt(ofs))</div><div class='hunk'>@@ -1438,7 +1516,7 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 		sb-&gt;s_export_op = &amp;ovl_export_fid_operations;</div><div class='ctx'> </div><div class='ctx'> 	/* Never override disk quota limits or use reserved space */</div><div class='del'>-	cap_lower(cred-&gt;cap_effective, CAP_SYS_RESOURCE);</div><div class='add'>+	cap_lower(creator_cred-&gt;cap_effective, CAP_SYS_RESOURCE);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_magic = OVERLAYFS_SUPER_MAGIC;</div><div class='ctx'> 	sb-&gt;s_xattr = ovl_xattr_handlers(ofs);</div><div class='hunk'>@@ -1453,22 +1531,47 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	 * lead to unexpected results.</div><div class='ctx'> 	 */</div><div class='ctx'> 	sb-&gt;s_iflags |= SB_I_NOUMASK;</div><div class='del'>-	sb-&gt;s_iflags |= SB_I_EVM_UNSUPPORTED;</div><div class='add'>+	sb-&gt;s_iflags |= SB_I_EVM_HMAC_UNSUPPORTED;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	root_dentry = ovl_get_root(sb, ctx-&gt;upper.dentry, oe);</div><div class='del'>-	if (!root_dentry)</div><div class='add'>+	sb-&gt;s_root = ovl_get_root(sb, ctx-&gt;upper.dentry, oe);</div><div class='add'>+	if (!sb-&gt;s_root)</div><div class='ctx'> 		goto out_free_oe;</div><div class='ctx'> </div><div class='del'>-	sb-&gt;s_root = root_dentry;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_free_oe:</div><div class='ctx'> 	ovl_free_entry(oe);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ovl_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct ovl_fs *ofs = sb-&gt;s_fs_info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = -EIO;</div><div class='add'>+	if (WARN_ON(fc-&gt;user_ns != current_user_ns()))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	ovl_set_d_op(sb);</div><div class='add'>+</div><div class='add'>+	if (!ofs-&gt;creator_cred) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		ofs-&gt;creator_cred = prepare_creds();</div><div class='add'>+		if (!ofs-&gt;creator_cred)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	with_ovl_creds(sb)</div><div class='add'>+		err = ovl_fill_super_creds(fc, sb);</div><div class='add'>+</div><div class='ctx'> out_err:</div><div class='del'>-	ovl_free_fs(ofs);</div><div class='del'>-	sb-&gt;s_fs_info = NULL;</div><div class='add'>+	if (err) {</div><div class='add'>+		ovl_free_fs(ofs);</div><div class='add'>+		sb-&gt;s_fs_info = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1496,7 +1599,7 @@ static int __init ovl_init(void)</div><div class='ctx'> 	ovl_inode_cachep = kmem_cache_create("ovl_inode",</div><div class='ctx'> 					     sizeof(struct ovl_inode), 0,</div><div class='ctx'> 					     (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-					      SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+					      SLAB_ACCOUNT),</div><div class='ctx'> 					     ovl_inode_init_once);</div><div class='ctx'> 	if (ovl_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c<br/>index 0217094c23ea..94986d11a166 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/util.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/util.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='ctx'> #include &lt;linux/namei.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='ctx'> #include "overlayfs.h"</div><div class='ctx'> </div><div class='ctx'> /* Get write access to upper mnt - may fail if upper sb was remounted ro */</div><div class='hunk'>@@ -140,9 +141,9 @@ void ovl_stack_free(struct ovl_path *stack, unsigned int n)</div><div class='ctx'> </div><div class='ctx'> struct ovl_entry *ovl_alloc_entry(unsigned int numlower)</div><div class='ctx'> {</div><div class='del'>-	size_t size = offsetof(struct ovl_entry, __lowerstack[numlower]);</div><div class='del'>-	struct ovl_entry *oe = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	struct ovl_entry *oe;</div><div class='ctx'> </div><div class='add'>+	oe = kzalloc(struct_size(oe, __lowerstack, numlower), GFP_KERNEL);</div><div class='ctx'> 	if (oe)</div><div class='ctx'> 		oe-&gt;__numlower = numlower;</div><div class='ctx'> </div><div class='hunk'>@@ -197,10 +198,20 @@ void ovl_dentry_init_flags(struct dentry *dentry, struct dentry *upperdentry,</div><div class='ctx'> </div><div class='ctx'> bool ovl_dentry_weird(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return dentry-&gt;d_flags &amp; (DCACHE_NEED_AUTOMOUNT |</div><div class='del'>-				  DCACHE_MANAGE_TRANSIT |</div><div class='del'>-				  DCACHE_OP_HASH |</div><div class='del'>-				  DCACHE_OP_COMPARE);</div><div class='add'>+	if (!d_can_lookup(dentry) &amp;&amp; !d_is_file(dentry) &amp;&amp; !d_is_symlink(dentry))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (dentry-&gt;d_flags &amp; (DCACHE_NEED_AUTOMOUNT | DCACHE_MANAGE_TRANSIT))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Exceptionally for layers with casefold, we accept that they have</div><div class='add'>+	 * their own hash and compare operations</div><div class='add'>+	 */</div><div class='add'>+	if (sb_has_encoding(dentry-&gt;d_sb))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return dentry-&gt;d_flags &amp; (DCACHE_OP_HASH | DCACHE_OP_COMPARE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum ovl_path_type ovl_path_type(struct dentry *dentry)</div><div class='hunk'>@@ -297,7 +308,9 @@ enum ovl_path_type ovl_path_realdata(struct dentry *dentry, struct path *path)</div><div class='ctx'> </div><div class='ctx'> struct dentry *ovl_dentry_upper(struct dentry *dentry)</div><div class='ctx'> {</div><div class='del'>-	return ovl_upperdentry_dereference(OVL_I(d_inode(dentry)));</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+</div><div class='add'>+	return inode ? ovl_upperdentry_dereference(OVL_I(inode)) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dentry *ovl_dentry_lower(struct dentry *dentry)</div><div class='hunk'>@@ -461,6 +474,33 @@ void ovl_dentry_set_opaque(struct dentry *dentry)</div><div class='ctx'> 	ovl_dentry_set_flag(OVL_E_OPAQUE, dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool ovl_dentry_has_xwhiteouts(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	return ovl_dentry_test_flag(OVL_E_XWHITEOUTS, dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ovl_dentry_set_xwhiteouts(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	ovl_dentry_set_flag(OVL_E_XWHITEOUTS, dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ovl_layer_set_xwhiteouts() is called before adding the overlay dir</div><div class='add'>+ * dentry to dcache, while readdir of that same directory happens after</div><div class='add'>+ * the overlay dir dentry is in dcache, so if some cpu observes that</div><div class='add'>+ * ovl_dentry_is_xwhiteouts(), it will also observe layer-&gt;has_xwhiteouts</div><div class='add'>+ * for the layers where xwhiteouts marker was found in that merge dir.</div><div class='add'>+ */</div><div class='add'>+void ovl_layer_set_xwhiteouts(struct ovl_fs *ofs,</div><div class='add'>+			      const struct ovl_layer *layer)</div><div class='add'>+{</div><div class='add'>+	if (layer-&gt;has_xwhiteouts)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Write once to read-mostly layer properties */</div><div class='add'>+	ofs-&gt;layers[layer-&gt;idx].has_xwhiteouts = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * For hard links and decoded file handles, it's possible for ovl_dentry_upper()</div><div class='ctx'>  * to return positive, while there's no actual upper alias for the inode.</div><div class='hunk'>@@ -739,19 +779,6 @@ bool ovl_path_check_xwhiteout_xattr(struct ovl_fs *ofs, const struct path *path)</div><div class='ctx'> 	return res &gt;= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool ovl_path_check_xwhiteouts_xattr(struct ovl_fs *ofs, const struct path *path)</div><div class='del'>-{</div><div class='del'>-	struct dentry *dentry = path-&gt;dentry;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	/* xattr.whiteouts must be a directory */</div><div class='del'>-	if (!d_is_dir(dentry))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	res = ovl_path_getxattr(ofs, path, OVL_XATTR_XWHITEOUTS, NULL, 0);</div><div class='del'>-	return res &gt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Load persistent uuid from xattr into s_uuid if found, or store a new</div><div class='ctx'>  * random generated value in s_uuid and in xattr.</div><div class='hunk'>@@ -760,13 +787,14 @@ bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs,</div><div class='ctx'> 			 const struct path *upperpath)</div><div class='ctx'> {</div><div class='ctx'> 	bool set = false;</div><div class='add'>+	uuid_t uuid;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to load existing persistent uuid */</div><div class='del'>-	res = ovl_path_getxattr(ofs, upperpath, OVL_XATTR_UUID, sb-&gt;s_uuid.b,</div><div class='add'>+	res = ovl_path_getxattr(ofs, upperpath, OVL_XATTR_UUID, uuid.b,</div><div class='ctx'> 				UUID_SIZE);</div><div class='ctx'> 	if (res == UUID_SIZE)</div><div class='del'>-		return true;</div><div class='add'>+		goto set_uuid;</div><div class='ctx'> </div><div class='ctx'> 	if (res != -ENODATA)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -794,37 +822,37 @@ bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Generate overlay instance uuid */</div><div class='del'>-	uuid_gen(&amp;sb-&gt;s_uuid);</div><div class='add'>+	uuid_gen(&amp;uuid);</div><div class='ctx'> </div><div class='ctx'> 	/* Try to store persistent uuid */</div><div class='ctx'> 	set = true;</div><div class='del'>-	res = ovl_setxattr(ofs, upperpath-&gt;dentry, OVL_XATTR_UUID, sb-&gt;s_uuid.b,</div><div class='add'>+	res = ovl_setxattr(ofs, upperpath-&gt;dentry, OVL_XATTR_UUID, uuid.b,</div><div class='ctx'> 			   UUID_SIZE);</div><div class='del'>-	if (res == 0)</div><div class='del'>-		return true;</div><div class='add'>+	if (res)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+set_uuid:</div><div class='add'>+	super_set_uuid(sb, uuid.b, sizeof(uuid));</div><div class='add'>+	return true;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	memset(sb-&gt;s_uuid.b, 0, UUID_SIZE);</div><div class='ctx'> 	ofs-&gt;config.uuid = OVL_UUID_NULL;</div><div class='ctx'> 	pr_warn("failed to %s uuid (%pd2, err=%i); falling back to uuid=null.\n",</div><div class='ctx'> 		set ? "set" : "get", upperpath-&gt;dentry, res);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool ovl_path_check_dir_xattr(struct ovl_fs *ofs, const struct path *path,</div><div class='del'>-			       enum ovl_xattr ox)</div><div class='add'>+char ovl_get_dir_xattr_val(struct ovl_fs *ofs, const struct path *path,</div><div class='add'>+			   enum ovl_xattr ox)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> 	char val;</div><div class='ctx'> </div><div class='ctx'> 	if (!d_is_dir(path-&gt;dentry))</div><div class='del'>-		return false;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	res = ovl_path_getxattr(ofs, path, ox, &amp;val, 1);</div><div class='del'>-	if (res == 1 &amp;&amp; val == 'y')</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='add'>+	return res == 1 ? val : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define OVL_XATTR_OPAQUE_POSTFIX	"opaque"</div><div class='hunk'>@@ -837,7 +865,6 @@ bool ovl_path_check_dir_xattr(struct ovl_fs *ofs, const struct path *path,</div><div class='ctx'> #define OVL_XATTR_METACOPY_POSTFIX	"metacopy"</div><div class='ctx'> #define OVL_XATTR_PROTATTR_POSTFIX	"protattr"</div><div class='ctx'> #define OVL_XATTR_XWHITEOUT_POSTFIX	"whiteout"</div><div class='del'>-#define OVL_XATTR_XWHITEOUTS_POSTFIX	"whiteouts"</div><div class='ctx'> </div><div class='ctx'> #define OVL_XATTR_TAB_ENTRY(x) \</div><div class='ctx'> 	[x] = { [false] = OVL_XATTR_TRUSTED_PREFIX x ## _POSTFIX, \</div><div class='hunk'>@@ -854,7 +881,6 @@ const char *const ovl_xattr_table[][2] = {</div><div class='ctx'> 	OVL_XATTR_TAB_ENTRY(OVL_XATTR_METACOPY),</div><div class='ctx'> 	OVL_XATTR_TAB_ENTRY(OVL_XATTR_PROTATTR),</div><div class='ctx'> 	OVL_XATTR_TAB_ENTRY(OVL_XATTR_XWHITEOUT),</div><div class='del'>-	OVL_XATTR_TAB_ENTRY(OVL_XATTR_XWHITEOUTS),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ovl_check_setxattr(struct ovl_fs *ofs, struct dentry *upperdentry,</div><div class='hunk'>@@ -935,7 +961,7 @@ void ovl_check_protattr(struct inode *inode, struct dentry *upper)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ovl_set_protattr(struct inode *inode, struct dentry *upper,</div><div class='del'>-		      struct fileattr *fa)</div><div class='add'>+		      struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(inode-&gt;i_sb);</div><div class='ctx'> 	char buf[OVL_PROTATTR_MAX];</div><div class='hunk'>@@ -988,8 +1014,8 @@ bool ovl_inuse_trylock(struct dentry *dentry)</div><div class='ctx'> 	bool locked = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_OVL_INUSE)) {</div><div class='del'>-		inode-&gt;i_state |= I_OVL_INUSE;</div><div class='add'>+	if (!(inode_state_read(inode) &amp; I_OVL_INUSE)) {</div><div class='add'>+		inode_state_set(inode, I_OVL_INUSE);</div><div class='ctx'> 		locked = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -1003,8 +1029,8 @@ void ovl_inuse_unlock(struct dentry *dentry)</div><div class='ctx'> 		struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		WARN_ON(!(inode-&gt;i_state &amp; I_OVL_INUSE));</div><div class='del'>-		inode-&gt;i_state &amp;= ~I_OVL_INUSE;</div><div class='add'>+		WARN_ON(!(inode_state_read(inode) &amp; I_OVL_INUSE));</div><div class='add'>+		inode_state_clear(inode, I_OVL_INUSE);</div><div class='ctx'> 		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1015,7 +1041,7 @@ bool ovl_is_inuse(struct dentry *dentry)</div><div class='ctx'> 	bool inuse;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	inuse = (inode-&gt;i_state &amp; I_OVL_INUSE);</div><div class='add'>+	inuse = (inode_state_read(inode) &amp; I_OVL_INUSE);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='ctx'> 	return inuse;</div><div class='hunk'>@@ -1047,7 +1073,6 @@ static void ovl_cleanup_index(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_fs *ofs = OVL_FS(dentry-&gt;d_sb);</div><div class='ctx'> 	struct dentry *indexdir = ovl_indexdir(dentry-&gt;d_sb);</div><div class='del'>-	struct inode *dir = indexdir-&gt;d_inode;</div><div class='ctx'> 	struct dentry *lowerdentry = ovl_dentry_lower(dentry);</div><div class='ctx'> 	struct dentry *upperdentry = ovl_dentry_upper(dentry);</div><div class='ctx'> 	struct dentry *index = NULL;</div><div class='hunk'>@@ -1083,21 +1108,18 @@ static void ovl_cleanup_index(struct dentry *dentry)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	inode_lock_nested(dir, I_MUTEX_PARENT);</div><div class='del'>-	index = ovl_lookup_upper(ofs, name.name, indexdir, name.len);</div><div class='add'>+	index = ovl_lookup_upper_unlocked(ofs, name.name, indexdir, name.len);</div><div class='ctx'> 	err = PTR_ERR(index);</div><div class='ctx'> 	if (IS_ERR(index)) {</div><div class='ctx'> 		index = NULL;</div><div class='ctx'> 	} else if (ovl_index_all(dentry-&gt;d_sb)) {</div><div class='ctx'> 		/* Whiteout orphan index to block future open by handle */</div><div class='ctx'> 		err = ovl_cleanup_and_whiteout(OVL_FS(dentry-&gt;d_sb),</div><div class='del'>-					       dir, index);</div><div class='add'>+					       indexdir, index);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Cleanup orphan index entries */</div><div class='del'>-		err = ovl_cleanup(ofs, dir, index);</div><div class='add'>+		err = ovl_cleanup(ofs, indexdir, index);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	inode_unlock(dir);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -1120,7 +1142,6 @@ fail:</div><div class='ctx'> int ovl_nlink_start(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!inode))</div><div class='hunk'>@@ -1157,15 +1178,14 @@ int ovl_nlink_start(struct dentry *dentry)</div><div class='ctx'> 	if (d_is_dir(dentry) || !ovl_test_flag(OVL_INDEX, inode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The overlay inode nlink should be incremented/decremented IFF the</div><div class='ctx'> 	 * upper operation succeeds, along with nlink change of upper inode.</div><div class='ctx'> 	 * Therefore, before link/unlink/rename, we store the union nlink</div><div class='ctx'> 	 * value relative to the upper inode nlink in an upper inode xattr.</div><div class='ctx'> 	 */</div><div class='del'>-	err = ovl_set_nlink_upper(dentry);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		err = ovl_set_nlink_upper(dentry);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_drop_write;</div><div class='ctx'> </div><div class='hunk'>@@ -1186,30 +1206,28 @@ void ovl_nlink_end(struct dentry *dentry)</div><div class='ctx'> 	ovl_drop_write(dentry);</div><div class='ctx'> </div><div class='ctx'> 	if (ovl_test_flag(OVL_INDEX, inode) &amp;&amp; inode-&gt;i_nlink == 0) {</div><div class='del'>-		const struct cred *old_cred;</div><div class='del'>-</div><div class='del'>-		old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-		ovl_cleanup_index(dentry);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+			ovl_cleanup_index(dentry);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ovl_inode_unlock(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir)</div><div class='add'>+int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *work,</div><div class='add'>+			    struct dentry *upperdir, struct dentry *upper)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *trap;</div><div class='ctx'> </div><div class='del'>-	/* Workdir should not be the same as upperdir */</div><div class='del'>-	if (workdir == upperdir)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='ctx'> 	/* Workdir should not be subdir of upperdir and vice versa */</div><div class='ctx'> 	trap = lock_rename(workdir, upperdir);</div><div class='ctx'> 	if (IS_ERR(trap))</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	if (trap)</div><div class='ctx'> 		goto err_unlock;</div><div class='add'>+	if (work &amp;&amp; (work-&gt;d_parent != workdir || d_unhashed(work)))</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	if (upper &amp;&amp; (upper-&gt;d_parent != upperdir || d_unhashed(upper)))</div><div class='add'>+		goto err_unlock;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1353,7 +1371,7 @@ err_free:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Call with mounter creds as it may open the file */</div><div class='del'>-int ovl_ensure_verity_loaded(struct path *datapath)</div><div class='add'>+int ovl_ensure_verity_loaded(const struct path *datapath)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(datapath-&gt;dentry);</div><div class='ctx'> 	struct file *filp;</div><div class='hunk'>@@ -1363,7 +1381,7 @@ int ovl_ensure_verity_loaded(struct path *datapath)</div><div class='ctx'> 		 * If this inode was not yet opened, the verity info hasn't been</div><div class='ctx'> 		 * loaded yet, so we need to do that here to force it into memory.</div><div class='ctx'> 		 */</div><div class='del'>-		filp = kernel_file_open(datapath, O_RDONLY, inode, current_cred());</div><div class='add'>+		filp = kernel_file_open(datapath, O_RDONLY, current_cred());</div><div class='ctx'> 		if (IS_ERR(filp))</div><div class='ctx'> 			return PTR_ERR(filp);</div><div class='ctx'> 		fput(filp);</div><div class='hunk'>@@ -1373,8 +1391,8 @@ int ovl_ensure_verity_loaded(struct path *datapath)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ovl_validate_verity(struct ovl_fs *ofs,</div><div class='del'>-			struct path *metapath,</div><div class='del'>-			struct path *datapath)</div><div class='add'>+			const struct path *metapath,</div><div class='add'>+			const struct path *datapath)</div><div class='ctx'> {</div><div class='ctx'> 	struct ovl_metacopy metacopy_data;</div><div class='ctx'> 	u8 actual_digest[FS_VERITY_MAX_DIGEST_SIZE];</div><div class='hunk'>@@ -1427,7 +1445,7 @@ int ovl_validate_verity(struct ovl_fs *ofs,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ovl_get_verity_digest(struct ovl_fs *ofs, struct path *src,</div><div class='add'>+int ovl_get_verity_digest(struct ovl_fs *ofs, const struct path *src,</div><div class='ctx'> 			  struct ovl_metacopy *metacopy)</div><div class='ctx'> {</div><div class='ctx'> 	int err, digest_size;</div><div class='head'>diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c<br/>index 383978e4663c..aa95855c7023 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/xattrs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/overlayfs/xattrs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/overlayfs/xattrs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/overlayfs/xattrs.c</a></div><div class='hunk'>@@ -41,13 +41,11 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char</div><div class='ctx'> 	struct dentry *upperdentry = ovl_i_dentry_upper(inode);</div><div class='ctx'> 	struct dentry *realdentry = upperdentry ?: ovl_dentry_lower(dentry);</div><div class='ctx'> 	struct path realpath;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> </div><div class='ctx'> 	if (!value &amp;&amp; !upperdentry) {</div><div class='ctx'> 		ovl_path_lower(dentry, &amp;realpath);</div><div class='del'>-		old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-		err = vfs_getxattr(mnt_idmap(realpath.mnt), realdentry, name, NULL, 0);</div><div class='del'>-		revert_creds(old_cred);</div><div class='add'>+		with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+			err = vfs_getxattr(mnt_idmap(realpath.mnt), realdentry, name, NULL, 0);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -64,15 +62,14 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	if (value) {</div><div class='del'>-		err = ovl_do_setxattr(ofs, realdentry, name, value, size,</div><div class='del'>-				      flags);</div><div class='del'>-	} else {</div><div class='del'>-		WARN_ON(flags != XATTR_REPLACE);</div><div class='del'>-		err = ovl_do_removexattr(ofs, realdentry, name);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb) {</div><div class='add'>+		if (value) {</div><div class='add'>+			err = ovl_do_setxattr(ofs, realdentry, name, value, size, flags);</div><div class='add'>+		} else {</div><div class='add'>+			WARN_ON(flags != XATTR_REPLACE);</div><div class='add'>+			err = ovl_do_removexattr(ofs, realdentry, name);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	revert_creds(old_cred);</div><div class='ctx'> 	ovl_drop_write(dentry);</div><div class='ctx'> </div><div class='ctx'> 	/* copy c/mtime */</div><div class='hunk'>@@ -84,15 +81,11 @@ out:</div><div class='ctx'> static int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,</div><div class='ctx'> 			 void *value, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ssize_t res;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	struct path realpath;</div><div class='ctx'> </div><div class='ctx'> 	ovl_i_path_real(inode, &amp;realpath);</div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	res = vfs_getxattr(mnt_idmap(realpath.mnt), realpath.dentry, name, value, size);</div><div class='del'>-	revert_creds(old_cred);</div><div class='del'>-	return res;</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		return vfs_getxattr(mnt_idmap(realpath.mnt), realpath.dentry, name, value, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ovl_can_list(struct super_block *sb, const char *s)</div><div class='hunk'>@@ -116,12 +109,10 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	char *s;</div><div class='del'>-	const struct cred *old_cred;</div><div class='ctx'> 	size_t prefix_len, name_len;</div><div class='ctx'> </div><div class='del'>-	old_cred = ovl_override_creds(dentry-&gt;d_sb);</div><div class='del'>-	res = vfs_listxattr(realdentry, list, size);</div><div class='del'>-	revert_creds(old_cred);</div><div class='add'>+	with_ovl_creds(dentry-&gt;d_sb)</div><div class='add'>+		res = vfs_listxattr(realdentry, list, size);</div><div class='ctx'> 	if (res &lt;= 0 || size == 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -268,4 +259,3 @@ const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs)</div><div class='ctx'> 	return ofs-&gt;config.userxattr ? ovl_user_xattr_handlers :</div><div class='ctx'> 		ovl_trusted_xattr_handlers;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/fs/pidfs.c b/fs/pidfs.c<br/>new file mode 100644<br/>index 000000000000..dba703d4ce4a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pidfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pidfs.c</a></div><div class='hunk'>@@ -0,0 +1,1104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/anon_inodes.h&gt;</div><div class='add'>+#include &lt;linux/exportfs.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/cgroup.h&gt;</div><div class='add'>+#include &lt;linux/magic.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/pid.h&gt;</div><div class='add'>+#include &lt;linux/pidfs.h&gt;</div><div class='add'>+#include &lt;linux/pid_namespace.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/proc_ns.h&gt;</div><div class='add'>+#include &lt;linux/pseudo_fs.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;uapi/linux/pidfd.h&gt;</div><div class='add'>+#include &lt;linux/ipc_namespace.h&gt;</div><div class='add'>+#include &lt;linux/time_namespace.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;linux/coredump.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+#include "mount.h"</div><div class='add'>+</div><div class='add'>+#define PIDFS_PID_DEAD ERR_PTR(-ESRCH)</div><div class='add'>+</div><div class='add'>+static struct kmem_cache *pidfs_attr_cachep __ro_after_init;</div><div class='add'>+static struct kmem_cache *pidfs_xattr_cachep __ro_after_init;</div><div class='add'>+</div><div class='add'>+static struct path pidfs_root_path = {};</div><div class='add'>+</div><div class='add'>+void pidfs_get_root(struct path *path)</div><div class='add'>+{</div><div class='add'>+	*path = pidfs_root_path;</div><div class='add'>+	path_get(path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum pidfs_attr_mask_bits {</div><div class='add'>+	PIDFS_ATTR_BIT_EXIT	= 0,</div><div class='add'>+	PIDFS_ATTR_BIT_COREDUMP	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pidfs_attr {</div><div class='add'>+	unsigned long attr_mask;</div><div class='add'>+	struct simple_xattrs *xattrs;</div><div class='add'>+	struct /* exit info */ {</div><div class='add'>+		__u64 cgroupid;</div><div class='add'>+		__s32 exit_code;</div><div class='add'>+	};</div><div class='add'>+	__u32 coredump_mask;</div><div class='add'>+	__u32 coredump_signal;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rb_root pidfs_ino_tree = RB_ROOT;</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+static inline unsigned long pidfs_ino(u64 ino)</div><div class='add'>+{</div><div class='add'>+	return lower_32_bits(ino);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On 32 bit the generation number are the upper 32 bits. */</div><div class='add'>+static inline u32 pidfs_gen(u64 ino)</div><div class='add'>+{</div><div class='add'>+	return upper_32_bits(ino);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/* On 64 bit simply return ino. */</div><div class='add'>+static inline unsigned long pidfs_ino(u64 ino)</div><div class='add'>+{</div><div class='add'>+	return ino;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On 64 bit the generation number is 0. */</div><div class='add'>+static inline u32 pidfs_gen(u64 ino)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int pidfs_ino_cmp(struct rb_node *a, const struct rb_node *b)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid_a = rb_entry(a, struct pid, pidfs_node);</div><div class='add'>+	struct pid *pid_b = rb_entry(b, struct pid, pidfs_node);</div><div class='add'>+	u64 pid_ino_a = pid_a-&gt;ino;</div><div class='add'>+	u64 pid_ino_b = pid_b-&gt;ino;</div><div class='add'>+</div><div class='add'>+	if (pid_ino_a &lt; pid_ino_b)</div><div class='add'>+		return -1;</div><div class='add'>+	if (pid_ino_a &gt; pid_ino_b)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pidfs_add_pid(struct pid *pid)</div><div class='add'>+{</div><div class='add'>+	static u64 pidfs_ino_nr = 2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On 64 bit nothing special happens. The 64bit number assigned</div><div class='add'>+	 * to struct pid is the inode number.</div><div class='add'>+	 *</div><div class='add'>+	 * On 32 bit the 64 bit number assigned to struct pid is split</div><div class='add'>+	 * into two 32 bit numbers. The lower 32 bits are used as the</div><div class='add'>+	 * inode number and the upper 32 bits are used as the inode</div><div class='add'>+	 * generation number.</div><div class='add'>+	 *</div><div class='add'>+	 * On 32 bit pidfs_ino() will return the lower 32 bit. When</div><div class='add'>+	 * pidfs_ino() returns zero a wrap around happened. When a</div><div class='add'>+	 * wraparound happens the 64 bit number will be incremented by 2</div><div class='add'>+	 * so inode numbering starts at 2 again.</div><div class='add'>+	 *</div><div class='add'>+	 * On 64 bit comparing two pidfds is as simple as comparing</div><div class='add'>+	 * inode numbers.</div><div class='add'>+	 *</div><div class='add'>+	 * When a wraparound happens on 32 bit multiple pidfds with the</div><div class='add'>+	 * same inode number are likely to exist (This isn't a problem</div><div class='add'>+	 * since before pidfs pidfds used the anonymous inode meaning</div><div class='add'>+	 * all pidfds had the same inode number.). Userspace can</div><div class='add'>+	 * reconstruct the 64 bit identifier by retrieving both the</div><div class='add'>+	 * inode number and the inode generation number to compare or</div><div class='add'>+	 * use file handles.</div><div class='add'>+	 */</div><div class='add'>+	if (pidfs_ino(pidfs_ino_nr) == 0)</div><div class='add'>+		pidfs_ino_nr += 2;</div><div class='add'>+</div><div class='add'>+	pid-&gt;ino = pidfs_ino_nr;</div><div class='add'>+	pid-&gt;stashed = NULL;</div><div class='add'>+	pid-&gt;attr = NULL;</div><div class='add'>+	pidfs_ino_nr++;</div><div class='add'>+</div><div class='add'>+	write_seqcount_begin(&amp;pidmap_lock_seq);</div><div class='add'>+	rb_find_add_rcu(&amp;pid-&gt;pidfs_node, &amp;pidfs_ino_tree, pidfs_ino_cmp);</div><div class='add'>+	write_seqcount_end(&amp;pidmap_lock_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pidfs_remove_pid(struct pid *pid)</div><div class='add'>+{</div><div class='add'>+	write_seqcount_begin(&amp;pidmap_lock_seq);</div><div class='add'>+	rb_erase(&amp;pid-&gt;pidfs_node, &amp;pidfs_ino_tree);</div><div class='add'>+	write_seqcount_end(&amp;pidmap_lock_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pidfs_free_pid(struct pid *pid)</div><div class='add'>+{</div><div class='add'>+	struct pidfs_attr *attr __free(kfree) = no_free_ptr(pid-&gt;attr);</div><div class='add'>+	struct simple_xattrs *xattrs __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Any dentry must've been wiped from the pid by now.</div><div class='add'>+	 * Otherwise there's a reference count bug.</div><div class='add'>+	 */</div><div class='add'>+	VFS_WARN_ON_ONCE(pid-&gt;stashed);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This if an error occurred during e.g., task creation that</div><div class='add'>+	 * causes us to never go through the exit path.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!attr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This never had a pidfd created. */</div><div class='add'>+	if (IS_ERR(attr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xattrs = no_free_ptr(attr-&gt;xattrs);</div><div class='add'>+	if (xattrs)</div><div class='add'>+		simple_xattrs_free(xattrs, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+/**</div><div class='add'>+ * pidfd_show_fdinfo - print information about a pidfd</div><div class='add'>+ * @m: proc fdinfo file</div><div class='add'>+ * @f: file referencing a pidfd</div><div class='add'>+ *</div><div class='add'>+ * Pid:</div><div class='add'>+ * This function will print the pid that a given pidfd refers to in the</div><div class='add'>+ * pid namespace of the procfs instance.</div><div class='add'>+ * If the pid namespace of the process is not a descendant of the pid</div><div class='add'>+ * namespace of the procfs instance 0 will be shown as its pid. This is</div><div class='add'>+ * similar to calling getppid() on a process whose parent is outside of</div><div class='add'>+ * its pid namespace.</div><div class='add'>+ *</div><div class='add'>+ * NSpid:</div><div class='add'>+ * If pid namespaces are supported then this function will also print</div><div class='add'>+ * the pid of a given pidfd refers to for all descendant pid namespaces</div><div class='add'>+ * starting from the current pid namespace of the instance, i.e. the</div><div class='add'>+ * Pid field and the first entry in the NSpid field will be identical.</div><div class='add'>+ * If the pid namespace of the process is not a descendant of the pid</div><div class='add'>+ * namespace of the procfs instance 0 will be shown as its first NSpid</div><div class='add'>+ * entry and no others will be shown.</div><div class='add'>+ * Note that this differs from the Pid and NSpid fields in</div><div class='add'>+ * /proc/&lt;pid&gt;/status where Pid and NSpid are always shown relative to</div><div class='add'>+ * the  pid namespace of the procfs instance. The difference becomes</div><div class='add'>+ * obvious when sending around a pidfd between pid namespaces from a</div><div class='add'>+ * different branch of the tree, i.e. where no ancestral relation is</div><div class='add'>+ * present between the pid namespaces:</div><div class='add'>+ * - create two new pid namespaces ns1 and ns2 in the initial pid</div><div class='add'>+ *   namespace (also take care to create new mount namespaces in the</div><div class='add'>+ *   new pid namespace and mount procfs)</div><div class='add'>+ * - create a process with a pidfd in ns1</div><div class='add'>+ * - send pidfd from ns1 to ns2</div><div class='add'>+ * - read /proc/self/fdinfo/&lt;pidfd&gt; and observe that both Pid and NSpid</div><div class='add'>+ *   have exactly one entry, which is 0</div><div class='add'>+ */</div><div class='add'>+static void pidfd_show_fdinfo(struct seq_file *m, struct file *f)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = pidfd_pid(f);</div><div class='add'>+	struct pid_namespace *ns;</div><div class='add'>+	pid_t nr = -1;</div><div class='add'>+</div><div class='add'>+	if (likely(pid_has_task(pid, PIDTYPE_PID))) {</div><div class='add'>+		ns = proc_pid_ns(file_inode(m-&gt;file)-&gt;i_sb);</div><div class='add'>+		nr = pid_nr_ns(pid, ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_put_decimal_ll(m, "Pid:\t", nr);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PID_NS</div><div class='add'>+	seq_put_decimal_ll(m, "\nNSpid:\t", nr);</div><div class='add'>+	if (nr &gt; 0) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		/* If nr is non-zero it means that 'pid' is valid and that</div><div class='add'>+		 * ns, i.e. the pid namespace associated with the procfs</div><div class='add'>+		 * instance, is in the pid namespace hierarchy of pid.</div><div class='add'>+		 * Start at one below the already printed level.</div><div class='add'>+		 */</div><div class='add'>+		for (i = ns-&gt;level + 1; i &lt;= pid-&gt;level; i++)</div><div class='add'>+			seq_put_decimal_ll(m, "\t", pid-&gt;numbers[i].nr);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	seq_putc(m, '\n');</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Poll support for process exit notification.</div><div class='add'>+ */</div><div class='add'>+static __poll_t pidfd_poll(struct file *file, struct poll_table_struct *pts)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = pidfd_pid(file);</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	__poll_t poll_flags = 0;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;pid-&gt;wait_pidfd, pts);</div><div class='add'>+	/*</div><div class='add'>+	 * Don't wake waiters if the thread-group leader exited</div><div class='add'>+	 * prematurely. They either get notified when the last subthread</div><div class='add'>+	 * exits or not at all if one of the remaining subthreads execs</div><div class='add'>+	 * and assumes the struct pid of the old thread-group leader.</div><div class='add'>+	 */</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	task = pid_task(pid, PIDTYPE_PID);</div><div class='add'>+	if (!task)</div><div class='add'>+		poll_flags = EPOLLIN | EPOLLRDNORM | EPOLLHUP;</div><div class='add'>+	else if (task-&gt;exit_state &amp;&amp; !delay_group_leader(task))</div><div class='add'>+		poll_flags = EPOLLIN | EPOLLRDNORM;</div><div class='add'>+</div><div class='add'>+	return poll_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pid_in_current_pidns(const struct pid *pid)</div><div class='add'>+{</div><div class='add'>+	const struct pid_namespace *ns = task_active_pid_ns(current);</div><div class='add'>+</div><div class='add'>+	if (ns-&gt;level &lt;= pid-&gt;level)</div><div class='add'>+		return pid-&gt;numbers[ns-&gt;level].ns == ns;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u32 pidfs_coredump_mask(unsigned long mm_flags)</div><div class='add'>+{</div><div class='add'>+	switch (__get_dumpable(mm_flags)) {</div><div class='add'>+	case SUID_DUMP_USER:</div><div class='add'>+		return PIDFD_COREDUMP_USER;</div><div class='add'>+	case SUID_DUMP_ROOT:</div><div class='add'>+		return PIDFD_COREDUMP_ROOT;</div><div class='add'>+	case SUID_DUMP_DISABLE:</div><div class='add'>+		return PIDFD_COREDUMP_SKIP;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This must be updated whenever a new flag is added */</div><div class='add'>+#define PIDFD_INFO_SUPPORTED (PIDFD_INFO_PID | \</div><div class='add'>+			      PIDFD_INFO_CREDS | \</div><div class='add'>+			      PIDFD_INFO_CGROUPID | \</div><div class='add'>+			      PIDFD_INFO_EXIT | \</div><div class='add'>+			      PIDFD_INFO_COREDUMP | \</div><div class='add'>+			      PIDFD_INFO_SUPPORTED_MASK | \</div><div class='add'>+			      PIDFD_INFO_COREDUMP_SIGNAL)</div><div class='add'>+</div><div class='add'>+static long pidfd_info(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct pidfd_info __user *uinfo = (struct pidfd_info __user *)arg;</div><div class='add'>+	struct task_struct *task __free(put_task) = NULL;</div><div class='add'>+	struct pid *pid = pidfd_pid(file);</div><div class='add'>+	size_t usize = _IOC_SIZE(cmd);</div><div class='add'>+	struct pidfd_info kinfo = {};</div><div class='add'>+	struct user_namespace *user_ns;</div><div class='add'>+	struct pidfs_attr *attr;</div><div class='add'>+	const struct cred *c;</div><div class='add'>+	__u64 mask;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct pidfd_info) != PIDFD_INFO_SIZE_VER2);</div><div class='add'>+</div><div class='add'>+	if (!uinfo)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (usize &lt; PIDFD_INFO_SIZE_VER0)</div><div class='add'>+		return -EINVAL; /* First version, no smaller struct possible */</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;mask, &amp;uinfo-&gt;mask, sizeof(mask)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restrict information retrieval to tasks within the caller's pid</div><div class='add'>+	 * namespace hierarchy.</div><div class='add'>+	 */</div><div class='add'>+	if (!pid_in_current_pidns(pid))</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	attr = READ_ONCE(pid-&gt;attr);</div><div class='add'>+	if (mask &amp; PIDFD_INFO_EXIT) {</div><div class='add'>+		if (test_bit(PIDFS_ATTR_BIT_EXIT, &amp;attr-&gt;attr_mask)) {</div><div class='add'>+			smp_rmb();</div><div class='add'>+			kinfo.mask |= PIDFD_INFO_EXIT;</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+			kinfo.cgroupid = attr-&gt;cgroupid;</div><div class='add'>+			kinfo.mask |= PIDFD_INFO_CGROUPID;</div><div class='add'>+#endif</div><div class='add'>+			kinfo.exit_code = attr-&gt;exit_code;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mask &amp; PIDFD_INFO_COREDUMP) {</div><div class='add'>+		if (test_bit(PIDFS_ATTR_BIT_COREDUMP, &amp;attr-&gt;attr_mask)) {</div><div class='add'>+			smp_rmb();</div><div class='add'>+			kinfo.mask |= PIDFD_INFO_COREDUMP | PIDFD_INFO_COREDUMP_SIGNAL;</div><div class='add'>+			kinfo.coredump_mask = attr-&gt;coredump_mask;</div><div class='add'>+			kinfo.coredump_signal = attr-&gt;coredump_signal;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	task = get_pid_task(pid, PIDTYPE_PID);</div><div class='add'>+	if (!task) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the task has already been reaped, only exit</div><div class='add'>+		 * information is available</div><div class='add'>+		 */</div><div class='add'>+		if (!(mask &amp; PIDFD_INFO_EXIT))</div><div class='add'>+			return -ESRCH;</div><div class='add'>+</div><div class='add'>+		goto copy_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	c = get_task_cred(task);</div><div class='add'>+	if (!c)</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	if ((mask &amp; PIDFD_INFO_COREDUMP) &amp;&amp; !kinfo.coredump_mask) {</div><div class='add'>+		guard(task_lock)(task);</div><div class='add'>+		if (task-&gt;mm) {</div><div class='add'>+			unsigned long flags = __mm_flags_get_dumpable(task-&gt;mm);</div><div class='add'>+</div><div class='add'>+			kinfo.coredump_mask = pidfs_coredump_mask(flags);</div><div class='add'>+			kinfo.mask |= PIDFD_INFO_COREDUMP;</div><div class='add'>+			/* No coredump actually took place, so no coredump signal. */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unconditionally return identifiers and credentials, the rest only on request */</div><div class='add'>+</div><div class='add'>+	user_ns = current_user_ns();</div><div class='add'>+	kinfo.ruid = from_kuid_munged(user_ns, c-&gt;uid);</div><div class='add'>+	kinfo.rgid = from_kgid_munged(user_ns, c-&gt;gid);</div><div class='add'>+	kinfo.euid = from_kuid_munged(user_ns, c-&gt;euid);</div><div class='add'>+	kinfo.egid = from_kgid_munged(user_ns, c-&gt;egid);</div><div class='add'>+	kinfo.suid = from_kuid_munged(user_ns, c-&gt;suid);</div><div class='add'>+	kinfo.sgid = from_kgid_munged(user_ns, c-&gt;sgid);</div><div class='add'>+	kinfo.fsuid = from_kuid_munged(user_ns, c-&gt;fsuid);</div><div class='add'>+	kinfo.fsgid = from_kgid_munged(user_ns, c-&gt;fsgid);</div><div class='add'>+	kinfo.mask |= PIDFD_INFO_CREDS;</div><div class='add'>+	put_cred(c);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+	if (!kinfo.cgroupid) {</div><div class='add'>+		struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		cgrp = task_dfl_cgroup(task);</div><div class='add'>+		kinfo.cgroupid = cgroup_id(cgrp);</div><div class='add'>+		kinfo.mask |= PIDFD_INFO_CGROUPID;</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Copy pid/tgid last, to reduce the chances the information might be</div><div class='add'>+	 * stale. Note that it is not possible to ensure it will be valid as the</div><div class='add'>+	 * task might return as soon as the copy_to_user finishes, but that's ok</div><div class='add'>+	 * and userspace expects that might happen and can act accordingly, so</div><div class='add'>+	 * this is just best-effort. What we can do however is checking that all</div><div class='add'>+	 * the fields are set correctly, or return ESRCH to avoid providing</div><div class='add'>+	 * incomplete information. */</div><div class='add'>+</div><div class='add'>+	kinfo.ppid = task_ppid_nr_ns(task, NULL);</div><div class='add'>+	kinfo.tgid = task_tgid_vnr(task);</div><div class='add'>+	kinfo.pid = task_pid_vnr(task);</div><div class='add'>+	kinfo.mask |= PIDFD_INFO_PID;</div><div class='add'>+</div><div class='add'>+	if (kinfo.pid == 0 || kinfo.tgid == 0)</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+copy_out:</div><div class='add'>+	if (mask &amp; PIDFD_INFO_SUPPORTED_MASK) {</div><div class='add'>+		kinfo.mask |= PIDFD_INFO_SUPPORTED_MASK;</div><div class='add'>+		kinfo.supported_mask = PIDFD_INFO_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Are there bits in the return mask not present in PIDFD_INFO_SUPPORTED? */</div><div class='add'>+	WARN_ON_ONCE(~PIDFD_INFO_SUPPORTED &amp; kinfo.mask);</div><div class='add'>+	/*</div><div class='add'>+	 * If userspace and the kernel have the same struct size it can just</div><div class='add'>+	 * be copied. If userspace provides an older struct, only the bits that</div><div class='add'>+	 * userspace knows about will be copied. If userspace provides a new</div><div class='add'>+	 * struct, only the bits that the kernel knows about will be copied.</div><div class='add'>+	 */</div><div class='add'>+	return copy_struct_to_user(uinfo, usize, &amp;kinfo, sizeof(kinfo), NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool pidfs_ioctl_valid(unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case FS_IOC_GETVERSION:</div><div class='add'>+	case PIDFD_GET_CGROUP_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_IPC_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_MNT_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_NET_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_TIME_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_UTS_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_USER_NAMESPACE:</div><div class='add'>+	case PIDFD_GET_PID_NAMESPACE:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Extensible ioctls require some more careful checks. */</div><div class='add'>+	switch (_IOC_NR(cmd)) {</div><div class='add'>+	case _IOC_NR(PIDFD_GET_INFO):</div><div class='add'>+		/*</div><div class='add'>+		 * Try to prevent performing a pidfd ioctl when someone</div><div class='add'>+		 * erronously mistook the file descriptor for a pidfd.</div><div class='add'>+		 * This is not perfect but will catch most cases.</div><div class='add'>+		 */</div><div class='add'>+		return extensible_ioctl_valid(cmd, PIDFD_GET_INFO, PIDFD_INFO_SIZE_VER0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long pidfd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task __free(put_task) = NULL;</div><div class='add'>+	struct nsproxy *nsp __free(put_nsproxy) = NULL;</div><div class='add'>+	struct ns_common *ns_common = NULL;</div><div class='add'>+</div><div class='add'>+	if (!pidfs_ioctl_valid(cmd))</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+</div><div class='add'>+	if (cmd == FS_IOC_GETVERSION) {</div><div class='add'>+		if (!arg)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		__u32 __user *argp = (__u32 __user *)arg;</div><div class='add'>+		return put_user(file_inode(file)-&gt;i_generation, argp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Extensible IOCTL that does not open namespace FDs, take a shortcut */</div><div class='add'>+	if (_IOC_NR(cmd) == _IOC_NR(PIDFD_GET_INFO))</div><div class='add'>+		return pidfd_info(file, cmd, arg);</div><div class='add'>+</div><div class='add'>+	task = get_pid_task(pidfd_pid(file), PIDTYPE_PID);</div><div class='add'>+	if (!task)</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	if (arg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	scoped_guard(task_lock, task) {</div><div class='add'>+		nsp = task-&gt;nsproxy;</div><div class='add'>+		if (nsp)</div><div class='add'>+			get_nsproxy(nsp);</div><div class='add'>+	}</div><div class='add'>+	if (!nsp)</div><div class='add'>+		return -ESRCH; /* just pretend it didn't exist */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're trying to open a file descriptor to the namespace so perform a</div><div class='add'>+	 * filesystem cred ptrace check. Also, we mirror nsfs behavior.</div><div class='add'>+	 */</div><div class='add'>+	if (!ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	/* Namespaces that hang of nsproxy. */</div><div class='add'>+	case PIDFD_GET_CGROUP_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;cgroup_ns))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;cgroup_ns);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_IPC_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;ipc_ns))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;ipc_ns);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_MNT_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;mnt_ns))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;mnt_ns);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_NET_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;net_ns))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;net_ns);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;pid_ns_for_children))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;pid_ns_for_children);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_TIME_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;time_ns))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;time_ns);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;time_ns_for_children))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;time_ns_for_children);</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_UTS_NAMESPACE:</div><div class='add'>+		if (!ns_ref_get(nsp-&gt;uts_ns))</div><div class='add'>+			break;</div><div class='add'>+		ns_common = to_ns_common(nsp-&gt;uts_ns);</div><div class='add'>+		break;</div><div class='add'>+	/* Namespaces that don't hang of nsproxy. */</div><div class='add'>+	case PIDFD_GET_USER_NAMESPACE:</div><div class='add'>+		scoped_guard(rcu) {</div><div class='add'>+			struct user_namespace *user_ns;</div><div class='add'>+</div><div class='add'>+			user_ns = task_cred_xxx(task, user_ns);</div><div class='add'>+			if (!ns_ref_get(user_ns))</div><div class='add'>+				break;</div><div class='add'>+			ns_common = to_ns_common(user_ns);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PIDFD_GET_PID_NAMESPACE:</div><div class='add'>+		scoped_guard(rcu) {</div><div class='add'>+			struct pid_namespace *pid_ns;</div><div class='add'>+</div><div class='add'>+			pid_ns = task_active_pid_ns(task);</div><div class='add'>+			if (!ns_ref_get(pid_ns))</div><div class='add'>+				break;</div><div class='add'>+			ns_common = to_ns_common(pid_ns);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ns_common)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* open_namespace() unconditionally consumes the reference */</div><div class='add'>+	return open_namespace(ns_common);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations pidfs_file_operations = {</div><div class='add'>+	.poll		= pidfd_poll,</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	.show_fdinfo	= pidfd_show_fdinfo,</div><div class='add'>+#endif</div><div class='add'>+	.unlocked_ioctl	= pidfd_ioctl,</div><div class='add'>+	.compat_ioctl   = compat_ptr_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pid *pidfd_pid(const struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (file-&gt;f_op != &amp;pidfs_file_operations)</div><div class='add'>+		return ERR_PTR(-EBADF);</div><div class='add'>+	return file_inode(file)-&gt;i_private;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We're called from release_task(). We know there's at least one</div><div class='add'>+ * reference to struct pid being held that won't be released until the</div><div class='add'>+ * task has been reaped which cannot happen until we're out of</div><div class='add'>+ * release_task().</div><div class='add'>+ *</div><div class='add'>+ * If this struct pid has at least once been referred to by a pidfd then</div><div class='add'>+ * pid-&gt;attr will be allocated. If not we mark the struct pid as dead so</div><div class='add'>+ * anyone who is trying to register it with pidfs will fail to do so.</div><div class='add'>+ * Otherwise we would hand out pidfs for reaped tasks without having</div><div class='add'>+ * exit information available.</div><div class='add'>+ *</div><div class='add'>+ * Worst case is that we've filled in the info and the pid gets freed</div><div class='add'>+ * right away in free_pid() when no one holds a pidfd anymore. Since</div><div class='add'>+ * pidfs_exit() currently is placed after exit_task_work() we know that</div><div class='add'>+ * it cannot be us aka the exiting task holding a pidfd to itself.</div><div class='add'>+ */</div><div class='add'>+void pidfs_exit(struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = task_pid(tsk);</div><div class='add'>+	struct pidfs_attr *attr;</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	/* Synchronize with pidfs_register_pid(). */</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;pid-&gt;wait_pidfd.lock) {</div><div class='add'>+		attr = pid-&gt;attr;</div><div class='add'>+		if (!attr) {</div><div class='add'>+			/*</div><div class='add'>+			 * No one ever held a pidfd for this struct pid.</div><div class='add'>+			 * Mark it as dead so no one can add a pidfs</div><div class='add'>+			 * entry anymore. We're about to be reaped and</div><div class='add'>+			 * so no exit information would be available.</div><div class='add'>+			 */</div><div class='add'>+			pid-&gt;attr = PIDFS_PID_DEAD;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If @pid-&gt;attr is set someone might still legitimately hold a</div><div class='add'>+	 * pidfd to @pid or someone might concurrently still be getting</div><div class='add'>+	 * a reference to an already stashed dentry from @pid-&gt;stashed.</div><div class='add'>+	 * So defer cleaning @pid-&gt;attr until the last reference to @pid</div><div class='add'>+	 * is put</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	cgrp = task_dfl_cgroup(tsk);</div><div class='add'>+	attr-&gt;cgroupid = cgroup_id(cgrp);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+#endif</div><div class='add'>+	attr-&gt;exit_code = tsk-&gt;exit_code;</div><div class='add'>+</div><div class='add'>+	/* Ensure that PIDFD_GET_INFO sees either all or nothing. */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	set_bit(PIDFS_ATTR_BIT_EXIT, &amp;attr-&gt;attr_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COREDUMP</div><div class='add'>+void pidfs_coredump(const struct coredump_params *cprm)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = cprm-&gt;pid;</div><div class='add'>+	struct pidfs_attr *attr;</div><div class='add'>+</div><div class='add'>+	attr = READ_ONCE(pid-&gt;attr);</div><div class='add'>+</div><div class='add'>+	VFS_WARN_ON_ONCE(!attr);</div><div class='add'>+	VFS_WARN_ON_ONCE(attr == PIDFS_PID_DEAD);</div><div class='add'>+</div><div class='add'>+	/* Note how we were coredumped and that we coredumped. */</div><div class='add'>+	attr-&gt;coredump_mask = pidfs_coredump_mask(cprm-&gt;mm_flags) |</div><div class='add'>+			      PIDFD_COREDUMPED;</div><div class='add'>+	/* If coredumping is set to skip we should never end up here. */</div><div class='add'>+	VFS_WARN_ON_ONCE(attr-&gt;coredump_mask &amp; PIDFD_COREDUMP_SKIP);</div><div class='add'>+	/* Expose the signal number that caused the coredump. */</div><div class='add'>+	attr-&gt;coredump_signal = cprm-&gt;siginfo-&gt;si_signo;</div><div class='add'>+	smp_wmb();</div><div class='add'>+	set_bit(PIDFS_ATTR_BIT_COREDUMP, &amp;attr-&gt;attr_mask);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct vfsmount *pidfs_mnt __ro_after_init;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The vfs falls back to simple_setattr() if i_op-&gt;setattr() isn't</div><div class='add'>+ * implemented. Let's reject it completely until we have a clean</div><div class='add'>+ * permission concept for pidfds.</div><div class='add'>+ */</div><div class='add'>+static int pidfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='add'>+			 struct iattr *attr)</div><div class='add'>+{</div><div class='add'>+	return anon_inode_setattr(idmap, dentry, attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pidfs_getattr(struct mnt_idmap *idmap, const struct path *path,</div><div class='add'>+			 struct kstat *stat, u32 request_mask,</div><div class='add'>+			 unsigned int query_flags)</div><div class='add'>+{</div><div class='add'>+	return anon_inode_getattr(idmap, path, stat, request_mask, query_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pidfs_listxattr(struct dentry *dentry, char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = d_inode(dentry);</div><div class='add'>+	struct pid *pid = inode-&gt;i_private;</div><div class='add'>+	struct pidfs_attr *attr = pid-&gt;attr;</div><div class='add'>+	struct simple_xattrs *xattrs;</div><div class='add'>+</div><div class='add'>+	xattrs = READ_ONCE(attr-&gt;xattrs);</div><div class='add'>+	if (!xattrs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return simple_xattr_list(inode, xattrs, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct inode_operations pidfs_inode_operations = {</div><div class='add'>+	.getattr	= pidfs_getattr,</div><div class='add'>+	.setattr	= pidfs_setattr,</div><div class='add'>+	.listxattr	= pidfs_listxattr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void pidfs_evict_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	clear_inode(inode);</div><div class='add'>+	put_pid(pid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct super_operations pidfs_sops = {</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='add'>+	.evict_inode	= pidfs_evict_inode,</div><div class='add'>+	.statfs		= simple_statfs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'lsof' has knowledge of out historical anon_inode use, and expects</div><div class='add'>+ * the pidfs dentry name to start with 'anon_inode'.</div><div class='add'>+ */</div><div class='add'>+static char *pidfs_dname(struct dentry *dentry, char *buffer, int buflen)</div><div class='add'>+{</div><div class='add'>+	return dynamic_dname(buffer, buflen, "anon_inode:[pidfd]");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct dentry_operations pidfs_dentry_operations = {</div><div class='add'>+	.d_dname	= pidfs_dname,</div><div class='add'>+	.d_prune	= stashed_dentry_prune,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pidfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,</div><div class='add'>+			   struct inode *parent)</div><div class='add'>+{</div><div class='add'>+	const struct pid *pid = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	if (*max_len &lt; 2) {</div><div class='add'>+		*max_len = 2;</div><div class='add'>+		return FILEID_INVALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*max_len = 2;</div><div class='add'>+	*(u64 *)fh = pid-&gt;ino;</div><div class='add'>+	return FILEID_KERNFS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pidfs_ino_find(const void *key, const struct rb_node *node)</div><div class='add'>+{</div><div class='add'>+	const u64 pid_ino = *(u64 *)key;</div><div class='add'>+	const struct pid *pid = rb_entry(node, struct pid, pidfs_node);</div><div class='add'>+</div><div class='add'>+	if (pid_ino &lt; pid-&gt;ino)</div><div class='add'>+		return -1;</div><div class='add'>+	if (pid_ino &gt; pid-&gt;ino)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find a struct pid based on the inode number. */</div><div class='add'>+static struct pid *pidfs_ino_get_pid(u64 ino)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	unsigned int seq;</div><div class='add'>+</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	do {</div><div class='add'>+		seq = read_seqcount_begin(&amp;pidmap_lock_seq);</div><div class='add'>+		node = rb_find_rcu(&amp;ino, &amp;pidfs_ino_tree, pidfs_ino_find);</div><div class='add'>+		if (node)</div><div class='add'>+			break;</div><div class='add'>+	} while (read_seqcount_retry(&amp;pidmap_lock_seq, seq));</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pid = rb_entry(node, struct pid, pidfs_node);</div><div class='add'>+</div><div class='add'>+	/* Within our pid namespace hierarchy? */</div><div class='add'>+	if (pid_vnr(pid) == 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return get_pid(pid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *pidfs_fh_to_dentry(struct super_block *sb,</div><div class='add'>+					 struct fid *fid, int fh_len,</div><div class='add'>+					 int fh_type)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u64 pid_ino;</div><div class='add'>+	struct path path;</div><div class='add'>+	struct pid *pid;</div><div class='add'>+</div><div class='add'>+	if (fh_len &lt; 2)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	switch (fh_type) {</div><div class='add'>+	case FILEID_KERNFS:</div><div class='add'>+		pid_ino = *(u64 *)fid;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pid = pidfs_ino_get_pid(pid_ino);</div><div class='add'>+	if (!pid)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret = path_from_stashed(&amp;pid-&gt;stashed, pidfs_mnt, pid, &amp;path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	VFS_WARN_ON_ONCE(!pid-&gt;attr);</div><div class='add'>+</div><div class='add'>+	mntput(path.mnt);</div><div class='add'>+	return path.dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Make sure that we reject any nonsensical flags that users pass via</div><div class='add'>+ * open_by_handle_at(). Note that PIDFD_THREAD is defined as O_EXCL, and</div><div class='add'>+ * PIDFD_NONBLOCK as O_NONBLOCK.</div><div class='add'>+ */</div><div class='add'>+#define VALID_FILE_HANDLE_OPEN_FLAGS \</div><div class='add'>+	(O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_CLOEXEC | O_EXCL)</div><div class='add'>+</div><div class='add'>+static int pidfs_export_permission(struct handle_to_path_ctx *ctx,</div><div class='add'>+				   unsigned int oflags)</div><div class='add'>+{</div><div class='add'>+	if (oflags &amp; ~(VALID_FILE_HANDLE_OPEN_FLAGS | O_LARGEFILE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * pidfd_ino_get_pid() will verify that the struct pid is part</div><div class='add'>+	 * of the caller's pid namespace hierarchy. No further</div><div class='add'>+	 * permission checks are needed.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file *pidfs_export_open(const struct path *path, unsigned int oflags)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Clear O_LARGEFILE as open_by_handle_at() forces it and raise</div><div class='add'>+	 * O_RDWR as pidfds always are.</div><div class='add'>+	 */</div><div class='add'>+	oflags &amp;= ~O_LARGEFILE;</div><div class='add'>+	return dentry_open(path, oflags | O_RDWR, current_cred());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct export_operations pidfs_export_operations = {</div><div class='add'>+	.encode_fh	= pidfs_encode_fh,</div><div class='add'>+	.fh_to_dentry	= pidfs_fh_to_dentry,</div><div class='add'>+	.open		= pidfs_export_open,</div><div class='add'>+	.permission	= pidfs_export_permission,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pidfs_init_inode(struct inode *inode, void *data)</div><div class='add'>+{</div><div class='add'>+	const struct pid *pid = data;</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_private = data;</div><div class='add'>+	inode-&gt;i_flags |= S_PRIVATE | S_ANON_INODE;</div><div class='add'>+	/* We allow to set xattrs. */</div><div class='add'>+	inode-&gt;i_flags &amp;= ~S_IMMUTABLE;</div><div class='add'>+	inode-&gt;i_mode |= S_IRWXU;</div><div class='add'>+	inode-&gt;i_op = &amp;pidfs_inode_operations;</div><div class='add'>+	inode-&gt;i_fop = &amp;pidfs_file_operations;</div><div class='add'>+	inode-&gt;i_ino = pidfs_ino(pid-&gt;ino);</div><div class='add'>+	inode-&gt;i_generation = pidfs_gen(pid-&gt;ino);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pidfs_put_data(void *data)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = data;</div><div class='add'>+	put_pid(pid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pidfs_register_pid - register a struct pid in pidfs</div><div class='add'>+ * @pid: pid to pin</div><div class='add'>+ *</div><div class='add'>+ * Register a struct pid in pidfs.</div><div class='add'>+ *</div><div class='add'>+ * Return: On success zero, on error a negative error code is returned.</div><div class='add'>+ */</div><div class='add'>+int pidfs_register_pid(struct pid *pid)</div><div class='add'>+{</div><div class='add'>+	struct pidfs_attr *new_attr __free(kfree) = NULL;</div><div class='add'>+	struct pidfs_attr *attr;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (!pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	attr = READ_ONCE(pid-&gt;attr);</div><div class='add'>+	if (unlikely(attr == PIDFS_PID_DEAD))</div><div class='add'>+		return PTR_ERR(PIDFS_PID_DEAD);</div><div class='add'>+	if (attr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	new_attr = kmem_cache_zalloc(pidfs_attr_cachep, GFP_KERNEL);</div><div class='add'>+	if (!new_attr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Synchronize with pidfs_exit(). */</div><div class='add'>+	guard(spinlock_irq)(&amp;pid-&gt;wait_pidfd.lock);</div><div class='add'>+</div><div class='add'>+	attr = pid-&gt;attr;</div><div class='add'>+	if (unlikely(attr == PIDFS_PID_DEAD))</div><div class='add'>+		return PTR_ERR(PIDFS_PID_DEAD);</div><div class='add'>+	if (unlikely(attr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pid-&gt;attr = no_free_ptr(new_attr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *pidfs_stash_dentry(struct dentry **stashed,</div><div class='add'>+					 struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct pid *pid = d_inode(dentry)-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	VFS_WARN_ON_ONCE(stashed != &amp;pid-&gt;stashed);</div><div class='add'>+</div><div class='add'>+	ret = pidfs_register_pid(pid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	return stash_dentry(stashed, dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct stashed_operations pidfs_stashed_ops = {</div><div class='add'>+	.stash_dentry	= pidfs_stash_dentry,</div><div class='add'>+	.init_inode	= pidfs_init_inode,</div><div class='add'>+	.put_data	= pidfs_put_data,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pidfs_xattr_get(const struct xattr_handler *handler,</div><div class='add'>+			   struct dentry *unused, struct inode *inode,</div><div class='add'>+			   const char *suffix, void *value, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = inode-&gt;i_private;</div><div class='add'>+	struct pidfs_attr *attr = pid-&gt;attr;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct simple_xattrs *xattrs;</div><div class='add'>+</div><div class='add'>+	xattrs = READ_ONCE(attr-&gt;xattrs);</div><div class='add'>+	if (!xattrs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	name = xattr_full_name(handler, suffix);</div><div class='add'>+	return simple_xattr_get(xattrs, name, value, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pidfs_xattr_set(const struct xattr_handler *handler,</div><div class='add'>+			   struct mnt_idmap *idmap, struct dentry *unused,</div><div class='add'>+			   struct inode *inode, const char *suffix,</div><div class='add'>+			   const void *value, size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	struct pid *pid = inode-&gt;i_private;</div><div class='add'>+	struct pidfs_attr *attr = pid-&gt;attr;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct simple_xattrs *xattrs;</div><div class='add'>+	struct simple_xattr *old_xattr;</div><div class='add'>+</div><div class='add'>+	/* Ensure we're the only one to set @attr-&gt;xattrs. */</div><div class='add'>+	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='add'>+</div><div class='add'>+	xattrs = READ_ONCE(attr-&gt;xattrs);</div><div class='add'>+	if (!xattrs) {</div><div class='add'>+		xattrs = kmem_cache_zalloc(pidfs_xattr_cachep, GFP_KERNEL);</div><div class='add'>+		if (!xattrs)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		simple_xattrs_init(xattrs);</div><div class='add'>+		smp_store_release(&amp;pid-&gt;attr-&gt;xattrs, xattrs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	name = xattr_full_name(handler, suffix);</div><div class='add'>+	old_xattr = simple_xattr_set(xattrs, name, value, size, flags);</div><div class='add'>+	if (IS_ERR(old_xattr))</div><div class='add'>+		return PTR_ERR(old_xattr);</div><div class='add'>+</div><div class='add'>+	simple_xattr_free(old_xattr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xattr_handler pidfs_trusted_xattr_handler = {</div><div class='add'>+	.prefix = XATTR_TRUSTED_PREFIX,</div><div class='add'>+	.get	= pidfs_xattr_get,</div><div class='add'>+	.set	= pidfs_xattr_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct xattr_handler *const pidfs_xattr_handlers[] = {</div><div class='add'>+	&amp;pidfs_trusted_xattr_handler,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pidfs_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_fs_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = init_pseudo(fc, PID_FS_MAGIC);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fc-&gt;s_iflags |= SB_I_NOEXEC;</div><div class='add'>+	fc-&gt;s_iflags |= SB_I_NODEV;</div><div class='add'>+	ctx-&gt;s_d_flags |= DCACHE_DONTCACHE;</div><div class='add'>+	ctx-&gt;ops = &amp;pidfs_sops;</div><div class='add'>+	ctx-&gt;eops = &amp;pidfs_export_operations;</div><div class='add'>+	ctx-&gt;dops = &amp;pidfs_dentry_operations;</div><div class='add'>+	ctx-&gt;xattr = pidfs_xattr_handlers;</div><div class='add'>+	fc-&gt;s_fs_info = (void *)&amp;pidfs_stashed_ops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type pidfs_type = {</div><div class='add'>+	.name			= "pidfs",</div><div class='add'>+	.init_fs_context	= pidfs_init_fs_context,</div><div class='add'>+	.kill_sb		= kill_anon_super,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct file *pidfs_alloc_file(struct pid *pid, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct file *pidfd_file;</div><div class='add'>+	struct path path __free(path_put) = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that PIDFD_STALE can be passed as a flag without</div><div class='add'>+	 * overloading other uapi pidfd flags.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(PIDFD_STALE == PIDFD_THREAD);</div><div class='add'>+	BUILD_BUG_ON(PIDFD_STALE == PIDFD_NONBLOCK);</div><div class='add'>+</div><div class='add'>+	ret = path_from_stashed(&amp;pid-&gt;stashed, pidfs_mnt, get_pid(pid), &amp;path);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	VFS_WARN_ON_ONCE(!pid-&gt;attr);</div><div class='add'>+</div><div class='add'>+	flags &amp;= ~PIDFD_STALE;</div><div class='add'>+	flags |= O_RDWR;</div><div class='add'>+	pidfd_file = dentry_open(&amp;path, flags, current_cred());</div><div class='add'>+	/* Raise PIDFD_THREAD explicitly as do_dentry_open() strips it. */</div><div class='add'>+	if (!IS_ERR(pidfd_file))</div><div class='add'>+		pidfd_file-&gt;f_flags |= (flags &amp; PIDFD_THREAD);</div><div class='add'>+</div><div class='add'>+	return pidfd_file;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init pidfs_init(void)</div><div class='add'>+{</div><div class='add'>+	pidfs_attr_cachep = kmem_cache_create("pidfs_attr_cache", sizeof(struct pidfs_attr), 0,</div><div class='add'>+					 (SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT |</div><div class='add'>+					  SLAB_ACCOUNT | SLAB_PANIC), NULL);</div><div class='add'>+</div><div class='add'>+	pidfs_xattr_cachep = kmem_cache_create("pidfs_xattr_cache",</div><div class='add'>+					       sizeof(struct simple_xattrs), 0,</div><div class='add'>+					       (SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT |</div><div class='add'>+						SLAB_ACCOUNT | SLAB_PANIC), NULL);</div><div class='add'>+</div><div class='add'>+	pidfs_mnt = kern_mount(&amp;pidfs_type);</div><div class='add'>+	if (IS_ERR(pidfs_mnt))</div><div class='add'>+		panic("Failed to mount pidfs pseudo filesystem");</div><div class='add'>+</div><div class='add'>+	pidfs_root_path.mnt = pidfs_mnt;</div><div class='add'>+	pidfs_root_path.dentry = pidfs_mnt-&gt;mnt_root;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/pipe.c b/fs/pipe.c<br/>index f1adbfe743d4..9e6a01475815 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pipe.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pipe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pipe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pipe.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/memcontrol.h&gt;</div><div class='ctx'> #include &lt;linux/watch_queue.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/ioctls.h&gt;</div><div class='hunk'>@@ -76,18 +77,18 @@ static unsigned long pipe_user_pages_soft = PIPE_DEF_BUFFERS * INR_OPEN_CUR;</div><div class='ctx'>  * -- Manfred Spraul &lt;manfred@colorfullife.com&gt; 2002-05-09</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)</div><div class='add'>+#ifdef CONFIG_PROVE_LOCKING</div><div class='add'>+static int pipe_lock_cmp_fn(const struct lockdep_map *a,</div><div class='add'>+			    const struct lockdep_map *b)</div><div class='ctx'> {</div><div class='del'>-	if (pipe-&gt;files)</div><div class='del'>-		mutex_lock_nested(&amp;pipe-&gt;mutex, subclass);</div><div class='add'>+	return cmp_int((unsigned long) a, (unsigned long) b);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void pipe_lock(struct pipe_inode_info *pipe)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * pipe_lock() nests non-pipe inode locks (for writing to a file)</div><div class='del'>-	 */</div><div class='del'>-	pipe_lock_nested(pipe, I_MUTEX_PARENT);</div><div class='add'>+	if (pipe-&gt;files)</div><div class='add'>+		mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pipe_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -98,28 +99,44 @@ void pipe_unlock(struct pipe_inode_info *pipe)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pipe_unlock);</div><div class='ctx'> </div><div class='del'>-static inline void __pipe_lock(struct pipe_inode_info *pipe)</div><div class='add'>+void pipe_double_lock(struct pipe_inode_info *pipe1,</div><div class='add'>+		      struct pipe_inode_info *pipe2)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock_nested(&amp;pipe-&gt;mutex, I_MUTEX_PARENT);</div><div class='add'>+	BUG_ON(pipe1 == pipe2);</div><div class='add'>+</div><div class='add'>+	if (pipe1 &gt; pipe2)</div><div class='add'>+		swap(pipe1, pipe2);</div><div class='add'>+</div><div class='add'>+	pipe_lock(pipe1);</div><div class='add'>+	pipe_lock(pipe2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __pipe_unlock(struct pipe_inode_info *pipe)</div><div class='add'>+static struct page *anon_pipe_get_page(struct pipe_inode_info *pipe)</div><div class='ctx'> {</div><div class='del'>-	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(pipe-&gt;tmp_page); i++) {</div><div class='add'>+		if (pipe-&gt;tmp_page[i]) {</div><div class='add'>+			struct page *page = pipe-&gt;tmp_page[i];</div><div class='add'>+			pipe-&gt;tmp_page[i] = NULL;</div><div class='add'>+			return page;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return alloc_page(GFP_HIGHUSER | __GFP_ACCOUNT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void pipe_double_lock(struct pipe_inode_info *pipe1,</div><div class='del'>-		      struct pipe_inode_info *pipe2)</div><div class='add'>+static void anon_pipe_put_page(struct pipe_inode_info *pipe,</div><div class='add'>+			       struct page *page)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(pipe1 == pipe2);</div><div class='del'>-</div><div class='del'>-	if (pipe1 &lt; pipe2) {</div><div class='del'>-		pipe_lock_nested(pipe1, I_MUTEX_PARENT);</div><div class='del'>-		pipe_lock_nested(pipe2, I_MUTEX_CHILD);</div><div class='del'>-	} else {</div><div class='del'>-		pipe_lock_nested(pipe2, I_MUTEX_PARENT);</div><div class='del'>-		pipe_lock_nested(pipe1, I_MUTEX_CHILD);</div><div class='add'>+	if (page_count(page) == 1) {</div><div class='add'>+		for (int i = 0; i &lt; ARRAY_SIZE(pipe-&gt;tmp_page); i++) {</div><div class='add'>+			if (!pipe-&gt;tmp_page[i]) {</div><div class='add'>+				pipe-&gt;tmp_page[i] = page;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	put_page(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void anon_pipe_buf_release(struct pipe_inode_info *pipe,</div><div class='hunk'>@@ -127,15 +144,7 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe,</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = buf-&gt;page;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If nobody else uses this page, and we don't already have a</div><div class='del'>-	 * temporary page, let's keep track of it as a one-deep</div><div class='del'>-	 * allocation cache. (Otherwise just release our reference to it)</div><div class='del'>-	 */</div><div class='del'>-	if (page_count(page) == 1 &amp;&amp; !pipe-&gt;tmp_page)</div><div class='del'>-		pipe-&gt;tmp_page = page;</div><div class='del'>-	else</div><div class='del'>-		put_page(page);</div><div class='add'>+	anon_pipe_put_page(pipe, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool anon_pipe_buf_try_steal(struct pipe_inode_info *pipe,</div><div class='hunk'>@@ -220,11 +229,10 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = {</div><div class='ctx'> /* Done while waiting without holding the pipe lock - thus the READ_ONCE() */</div><div class='ctx'> static inline bool pipe_readable(const struct pipe_inode_info *pipe)</div><div class='ctx'> {</div><div class='del'>-	unsigned int head = READ_ONCE(pipe-&gt;head);</div><div class='del'>-	unsigned int tail = READ_ONCE(pipe-&gt;tail);</div><div class='add'>+	union pipe_index idx = { .head_tail = READ_ONCE(pipe-&gt;head_tail) };</div><div class='ctx'> 	unsigned int writers = READ_ONCE(pipe-&gt;writers);</div><div class='ctx'> </div><div class='del'>-	return !pipe_empty(head, tail) || !writers;</div><div class='add'>+	return !pipe_empty(idx.head, idx.tail) || !writers;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int pipe_update_tail(struct pipe_inode_info *pipe,</div><div class='hunk'>@@ -258,12 +266,12 @@ static inline unsigned int pipe_update_tail(struct pipe_inode_info *pipe,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='add'>+anon_pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> {</div><div class='ctx'> 	size_t total_len = iov_iter_count(to);</div><div class='ctx'> 	struct file *filp = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct pipe_inode_info *pipe = filp-&gt;private_data;</div><div class='del'>-	bool was_full, wake_next_reader = false;</div><div class='add'>+	bool wake_writer = false, wake_next_reader = false;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Null read succeeds. */</div><div class='hunk'>@@ -271,22 +279,20 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='del'>-	__pipe_lock(pipe);</div><div class='add'>+	mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * We only wake up writers if the pipe was full when we started</div><div class='del'>-	 * reading in order to avoid unnecessary wakeups.</div><div class='add'>+	 * We only wake up writers if the pipe was full when we started reading</div><div class='add'>+	 * and it is no longer full after reading to avoid unnecessary wakeups.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * But when we do wake up writers, we do so using a sync wakeup</div><div class='ctx'> 	 * (WF_SYNC), because we want them to get going and generate more</div><div class='ctx'> 	 * data for us.</div><div class='ctx'> 	 */</div><div class='del'>-	was_full = pipe_full(pipe-&gt;head, pipe-&gt;tail, pipe-&gt;max_usage);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		/* Read -&gt;head with a barrier vs post_one_notification() */</div><div class='ctx'> 		unsigned int head = smp_load_acquire(&amp;pipe-&gt;head);</div><div class='ctx'> 		unsigned int tail = pipe-&gt;tail;</div><div class='del'>-		unsigned int mask = pipe-&gt;ring_size - 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_WATCH_QUEUE</div><div class='ctx'> 		if (pipe-&gt;note_loss) {</div><div class='hunk'>@@ -313,7 +319,7 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		if (!pipe_empty(head, tail)) {</div><div class='del'>-			struct pipe_buffer *buf = &amp;pipe-&gt;bufs[tail &amp; mask];</div><div class='add'>+			struct pipe_buffer *buf = pipe_buf(pipe, tail);</div><div class='ctx'> 			size_t chars = buf-&gt;len;</div><div class='ctx'> 			size_t written;</div><div class='ctx'> 			int error;</div><div class='hunk'>@@ -350,8 +356,10 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 				buf-&gt;len = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (!buf-&gt;len)</div><div class='add'>+			if (!buf-&gt;len) {</div><div class='add'>+				wake_writer |= pipe_full(head, tail, pipe-&gt;max_usage);</div><div class='ctx'> 				tail = pipe_update_tail(pipe, buf, tail);</div><div class='add'>+			}</div><div class='ctx'> 			total_len -= chars;</div><div class='ctx'> 			if (!total_len)</div><div class='ctx'> 				break;	/* common path: read succeeded */</div><div class='hunk'>@@ -368,30 +376,10 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 			ret = -EAGAIN;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		__pipe_unlock(pipe);</div><div class='del'>-</div><div class='add'>+		mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We only get here if we didn't actually read anything.</div><div class='ctx'> 		 *</div><div class='del'>-		 * However, we could have seen (and removed) a zero-sized</div><div class='del'>-		 * pipe buffer, and might have made space in the buffers</div><div class='del'>-		 * that way.</div><div class='del'>-		 *</div><div class='del'>-		 * You can't make zero-sized pipe buffers by doing an empty</div><div class='del'>-		 * write (not even in packet mode), but they can happen if</div><div class='del'>-		 * the writer gets an EFAULT when trying to fill a buffer</div><div class='del'>-		 * that already got allocated and inserted in the buffer</div><div class='del'>-		 * array.</div><div class='del'>-		 *</div><div class='del'>-		 * So we still need to wake up any pending writers in the</div><div class='del'>-		 * _very_ unlikely case that the pipe was full, but we got</div><div class='del'>-		 * no data.</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(was_full))</div><div class='del'>-			wake_up_interruptible_sync_poll(&amp;pipe-&gt;wr_wait, EPOLLOUT | EPOLLWRNORM);</div><div class='del'>-		kill_fasync(&amp;pipe-&gt;fasync_writers, SIGIO, POLL_OUT);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='ctx'> 		 * But because we didn't read anything, at this point we can</div><div class='ctx'> 		 * just return directly with -ERESTARTSYS if we're interrupted,</div><div class='ctx'> 		 * since we've done any required wakeups and there's no need</div><div class='hunk'>@@ -400,21 +388,27 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> 		if (wait_event_interruptible_exclusive(pipe-&gt;rd_wait, pipe_readable(pipe)) &lt; 0)</div><div class='ctx'> 			return -ERESTARTSYS;</div><div class='ctx'> </div><div class='del'>-		__pipe_lock(pipe);</div><div class='del'>-		was_full = pipe_full(pipe-&gt;head, pipe-&gt;tail, pipe-&gt;max_usage);</div><div class='ctx'> 		wake_next_reader = true;</div><div class='add'>+		mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 	}</div><div class='del'>-	if (pipe_empty(pipe-&gt;head, pipe-&gt;tail))</div><div class='add'>+	if (pipe_is_empty(pipe))</div><div class='ctx'> 		wake_next_reader = false;</div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (was_full)</div><div class='add'>+	if (wake_writer)</div><div class='ctx'> 		wake_up_interruptible_sync_poll(&amp;pipe-&gt;wr_wait, EPOLLOUT | EPOLLWRNORM);</div><div class='ctx'> 	if (wake_next_reader)</div><div class='ctx'> 		wake_up_interruptible_sync_poll(&amp;pipe-&gt;rd_wait, EPOLLIN | EPOLLRDNORM);</div><div class='ctx'> 	kill_fasync(&amp;pipe-&gt;fasync_writers, SIGIO, POLL_OUT);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+fifo_pipe_read(struct kiocb *iocb, struct iov_iter *to)</div><div class='add'>+{</div><div class='add'>+	int ret = anon_pipe_read(iocb, to);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='del'>-		file_accessed(filp);</div><div class='add'>+		file_accessed(iocb-&gt;ki_filp);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -426,16 +420,15 @@ static inline int is_packetized(struct file *file)</div><div class='ctx'> /* Done while waiting without holding the pipe lock - thus the READ_ONCE() */</div><div class='ctx'> static inline bool pipe_writable(const struct pipe_inode_info *pipe)</div><div class='ctx'> {</div><div class='del'>-	unsigned int head = READ_ONCE(pipe-&gt;head);</div><div class='del'>-	unsigned int tail = READ_ONCE(pipe-&gt;tail);</div><div class='add'>+	union pipe_index idx = { .head_tail = READ_ONCE(pipe-&gt;head_tail) };</div><div class='ctx'> 	unsigned int max_usage = READ_ONCE(pipe-&gt;max_usage);</div><div class='ctx'> </div><div class='del'>-	return !pipe_full(head, tail, max_usage) ||</div><div class='add'>+	return !pipe_full(idx.head, idx.tail, max_usage) ||</div><div class='ctx'> 		!READ_ONCE(pipe-&gt;readers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+anon_pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *filp = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct pipe_inode_info *pipe = filp-&gt;private_data;</div><div class='hunk'>@@ -462,10 +455,11 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	if (unlikely(total_len == 0))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	__pipe_lock(pipe);</div><div class='add'>+	mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!pipe-&gt;readers) {</div><div class='del'>-		send_sig(SIGPIPE, current, 0);</div><div class='add'>+		if ((iocb-&gt;ki_flags &amp; IOCB_NOSIGNAL) == 0)</div><div class='add'>+			send_sig(SIGPIPE, current, 0);</div><div class='ctx'> 		ret = -EPIPE;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -482,8 +476,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 	was_empty = pipe_empty(head, pipe-&gt;tail);</div><div class='ctx'> 	chars = total_len &amp; (PAGE_SIZE-1);</div><div class='ctx'> 	if (chars &amp;&amp; !was_empty) {</div><div class='del'>-		unsigned int mask = pipe-&gt;ring_size - 1;</div><div class='del'>-		struct pipe_buffer *buf = &amp;pipe-&gt;bufs[(head - 1) &amp; mask];</div><div class='add'>+		struct pipe_buffer *buf = pipe_buf(pipe, head - 1);</div><div class='ctx'> 		int offset = buf-&gt;offset + buf-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		if ((buf-&gt;flags &amp; PIPE_BUF_FLAG_CAN_MERGE) &amp;&amp;</div><div class='hunk'>@@ -506,7 +499,8 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (!pipe-&gt;readers) {</div><div class='del'>-			send_sig(SIGPIPE, current, 0);</div><div class='add'>+			if ((iocb-&gt;ki_flags &amp; IOCB_NOSIGNAL) == 0)</div><div class='add'>+				send_sig(SIGPIPE, current, 0);</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				ret = -EPIPE;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -514,54 +508,44 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> </div><div class='ctx'> 		head = pipe-&gt;head;</div><div class='ctx'> 		if (!pipe_full(head, pipe-&gt;tail, pipe-&gt;max_usage)) {</div><div class='del'>-			unsigned int mask = pipe-&gt;ring_size - 1;</div><div class='ctx'> 			struct pipe_buffer *buf;</div><div class='del'>-			struct page *page = pipe-&gt;tmp_page;</div><div class='add'>+			struct page *page;</div><div class='ctx'> 			int copied;</div><div class='ctx'> </div><div class='del'>-			if (!page) {</div><div class='del'>-				page = alloc_page(GFP_HIGHUSER | __GFP_ACCOUNT);</div><div class='del'>-				if (unlikely(!page)) {</div><div class='del'>-					ret = ret ? : -ENOMEM;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				pipe-&gt;tmp_page = page;</div><div class='add'>+			page = anon_pipe_get_page(pipe);</div><div class='add'>+			if (unlikely(!page)) {</div><div class='add'>+				if (!ret)</div><div class='add'>+					ret = -ENOMEM;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* Allocate a slot in the ring in advance and attach an</div><div class='del'>-			 * empty buffer.  If we fault or otherwise fail to use</div><div class='del'>-			 * it, either the reader will consume it or it'll still</div><div class='del'>-			 * be there for the next write.</div><div class='del'>-			 */</div><div class='del'>-			pipe-&gt;head = head + 1;</div><div class='add'>+			copied = copy_page_from_iter(page, 0, PAGE_SIZE, from);</div><div class='add'>+			if (unlikely(copied &lt; PAGE_SIZE &amp;&amp; iov_iter_count(from))) {</div><div class='add'>+				anon_pipe_put_page(pipe, page);</div><div class='add'>+				if (!ret)</div><div class='add'>+					ret = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='add'>+			pipe-&gt;head = head + 1;</div><div class='ctx'> 			/* Insert it into the buffer array */</div><div class='del'>-			buf = &amp;pipe-&gt;bufs[head &amp; mask];</div><div class='add'>+			buf = pipe_buf(pipe, head);</div><div class='ctx'> 			buf-&gt;page = page;</div><div class='ctx'> 			buf-&gt;ops = &amp;anon_pipe_buf_ops;</div><div class='ctx'> 			buf-&gt;offset = 0;</div><div class='del'>-			buf-&gt;len = 0;</div><div class='ctx'> 			if (is_packetized(filp))</div><div class='ctx'> 				buf-&gt;flags = PIPE_BUF_FLAG_PACKET;</div><div class='ctx'> 			else</div><div class='ctx'> 				buf-&gt;flags = PIPE_BUF_FLAG_CAN_MERGE;</div><div class='del'>-			pipe-&gt;tmp_page = NULL;</div><div class='ctx'> </div><div class='del'>-			copied = copy_page_from_iter(page, 0, PAGE_SIZE, from);</div><div class='del'>-			if (unlikely(copied &lt; PAGE_SIZE &amp;&amp; iov_iter_count(from))) {</div><div class='del'>-				if (!ret)</div><div class='del'>-					ret = -EFAULT;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			ret += copied;</div><div class='ctx'> 			buf-&gt;len = copied;</div><div class='add'>+			ret += copied;</div><div class='ctx'> </div><div class='ctx'> 			if (!iov_iter_count(from))</div><div class='ctx'> 				break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (!pipe_full(head, pipe-&gt;tail, pipe-&gt;max_usage))</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Wait for buffer space to become available. */</div><div class='ctx'> 		if ((filp-&gt;f_flags &amp; O_NONBLOCK) ||</div><div class='hunk'>@@ -582,19 +566,19 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> 		 * after waiting we need to re-check whether the pipe</div><div class='ctx'> 		 * become empty while we dropped the lock.</div><div class='ctx'> 		 */</div><div class='del'>-		__pipe_unlock(pipe);</div><div class='add'>+		mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 		if (was_empty)</div><div class='ctx'> 			wake_up_interruptible_sync_poll(&amp;pipe-&gt;rd_wait, EPOLLIN | EPOLLRDNORM);</div><div class='ctx'> 		kill_fasync(&amp;pipe-&gt;fasync_readers, SIGIO, POLL_IN);</div><div class='ctx'> 		wait_event_interruptible_exclusive(pipe-&gt;wr_wait, pipe_writable(pipe));</div><div class='del'>-		__pipe_lock(pipe);</div><div class='del'>-		was_empty = pipe_empty(pipe-&gt;head, pipe-&gt;tail);</div><div class='add'>+		mutex_lock(&amp;pipe-&gt;mutex);</div><div class='add'>+		was_empty = pipe_is_empty(pipe);</div><div class='ctx'> 		wake_next_writer = true;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	if (pipe_full(pipe-&gt;head, pipe-&gt;tail, pipe-&gt;max_usage))</div><div class='add'>+	if (pipe_is_full(pipe))</div><div class='ctx'> 		wake_next_writer = false;</div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we do do a wakeup event, we do a 'sync' wakeup, because we</div><div class='hunk'>@@ -613,11 +597,21 @@ out:</div><div class='ctx'> 	kill_fasync(&amp;pipe-&gt;fasync_readers, SIGIO, POLL_IN);</div><div class='ctx'> 	if (wake_next_writer)</div><div class='ctx'> 		wake_up_interruptible_sync_poll(&amp;pipe-&gt;wr_wait, EPOLLOUT | EPOLLWRNORM);</div><div class='del'>-	if (ret &gt; 0 &amp;&amp; sb_start_write_trylock(file_inode(filp)-&gt;i_sb)) {</div><div class='del'>-		int err = file_update_time(filp);</div><div class='del'>-		if (err)</div><div class='del'>-			ret = err;</div><div class='del'>-		sb_end_write(file_inode(filp)-&gt;i_sb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+fifo_pipe_write(struct kiocb *iocb, struct iov_iter *from)</div><div class='add'>+{</div><div class='add'>+	int ret = anon_pipe_write(iocb, from);</div><div class='add'>+	if (ret &gt; 0) {</div><div class='add'>+		struct file *filp = iocb-&gt;ki_filp;</div><div class='add'>+		if (sb_start_write_trylock(file_inode(filp)-&gt;i_sb)) {</div><div class='add'>+			int err = file_update_time(filp);</div><div class='add'>+			if (err)</div><div class='add'>+				ret = err;</div><div class='add'>+			sb_end_write(file_inode(filp)-&gt;i_sb);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -625,30 +619,29 @@ out:</div><div class='ctx'> static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pipe_inode_info *pipe = filp-&gt;private_data;</div><div class='del'>-	unsigned int count, head, tail, mask;</div><div class='add'>+	unsigned int count, head, tail;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case FIONREAD:</div><div class='del'>-		__pipe_lock(pipe);</div><div class='add'>+		mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 		count = 0;</div><div class='ctx'> 		head = pipe-&gt;head;</div><div class='ctx'> 		tail = pipe-&gt;tail;</div><div class='del'>-		mask = pipe-&gt;ring_size - 1;</div><div class='ctx'> </div><div class='del'>-		while (tail != head) {</div><div class='del'>-			count += pipe-&gt;bufs[tail &amp; mask].len;</div><div class='add'>+		while (!pipe_empty(head, tail)) {</div><div class='add'>+			count += pipe_buf(pipe, tail)-&gt;len;</div><div class='ctx'> 			tail++;</div><div class='ctx'> 		}</div><div class='del'>-		__pipe_unlock(pipe);</div><div class='add'>+		mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 		return put_user(count, (int __user *)arg);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_WATCH_QUEUE</div><div class='ctx'> 	case IOC_WATCH_QUEUE_SET_SIZE: {</div><div class='ctx'> 		int ret;</div><div class='del'>-		__pipe_lock(pipe);</div><div class='add'>+		mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 		ret = watch_queue_set_size(pipe, arg);</div><div class='del'>-		__pipe_unlock(pipe);</div><div class='add'>+		mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -668,7 +661,7 @@ pipe_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	__poll_t mask;</div><div class='ctx'> 	struct pipe_inode_info *pipe = filp-&gt;private_data;</div><div class='del'>-	unsigned int head, tail;</div><div class='add'>+	union pipe_index idx;</div><div class='ctx'> </div><div class='ctx'> 	/* Epoll has some historical nasty semantics, this enables them */</div><div class='ctx'> 	WRITE_ONCE(pipe-&gt;poll_usage, true);</div><div class='hunk'>@@ -689,19 +682,18 @@ pipe_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> 	 * if something changes and you got it wrong, the poll</div><div class='ctx'> 	 * table entry will wake you up and fix it.</div><div class='ctx'> 	 */</div><div class='del'>-	head = READ_ONCE(pipe-&gt;head);</div><div class='del'>-	tail = READ_ONCE(pipe-&gt;tail);</div><div class='add'>+	idx.head_tail = READ_ONCE(pipe-&gt;head_tail);</div><div class='ctx'> </div><div class='ctx'> 	mask = 0;</div><div class='ctx'> 	if (filp-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		if (!pipe_empty(head, tail))</div><div class='add'>+		if (!pipe_empty(idx.head, idx.tail))</div><div class='ctx'> 			mask |= EPOLLIN | EPOLLRDNORM;</div><div class='del'>-		if (!pipe-&gt;writers &amp;&amp; filp-&gt;f_version != pipe-&gt;w_counter)</div><div class='add'>+		if (!pipe-&gt;writers &amp;&amp; filp-&gt;f_pipe != pipe-&gt;w_counter)</div><div class='ctx'> 			mask |= EPOLLHUP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (filp-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		if (!pipe_full(head, tail, pipe-&gt;max_usage))</div><div class='add'>+		if (!pipe_full(idx.head, idx.tail, pipe-&gt;max_usage))</div><div class='ctx'> 			mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Most Unices do not set EPOLLERR for FIFOs but on Linux they</div><div class='hunk'>@@ -734,7 +726,7 @@ pipe_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct pipe_inode_info *pipe = file-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	__pipe_lock(pipe);</div><div class='add'>+	mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='ctx'> 		pipe-&gt;readers--;</div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='hunk'>@@ -747,7 +739,7 @@ pipe_release(struct inode *inode, struct file *file)</div><div class='ctx'> 		kill_fasync(&amp;pipe-&gt;fasync_readers, SIGIO, POLL_IN);</div><div class='ctx'> 		kill_fasync(&amp;pipe-&gt;fasync_writers, SIGIO, POLL_OUT);</div><div class='ctx'> 	}</div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	put_pipe_info(inode, pipe);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -759,7 +751,7 @@ pipe_fasync(int fd, struct file *filp, int on)</div><div class='ctx'> 	struct pipe_inode_info *pipe = filp-&gt;private_data;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='del'>-	__pipe_lock(pipe);</div><div class='add'>+	mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 	if (filp-&gt;f_mode &amp; FMODE_READ)</div><div class='ctx'> 		retval = fasync_helper(fd, filp, on, &amp;pipe-&gt;fasync_readers);</div><div class='ctx'> 	if ((filp-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; retval &gt;= 0) {</div><div class='hunk'>@@ -768,7 +760,7 @@ pipe_fasync(int fd, struct file *filp, int on)</div><div class='ctx'> 			/* this can happen only if on == T */</div><div class='ctx'> 			fasync_helper(-1, filp, 0, &amp;pipe-&gt;fasync_readers);</div><div class='ctx'> 	}</div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -834,6 +826,7 @@ struct pipe_inode_info *alloc_pipe_info(void)</div><div class='ctx'> 		pipe-&gt;nr_accounted = pipe_bufs;</div><div class='ctx'> 		pipe-&gt;user = user;</div><div class='ctx'> 		mutex_init(&amp;pipe-&gt;mutex);</div><div class='add'>+		lock_set_cmp_fn(&amp;pipe-&gt;mutex, pipe_lock_cmp_fn, NULL);</div><div class='ctx'> 		return pipe;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -865,8 +858,10 @@ void free_pipe_info(struct pipe_inode_info *pipe)</div><div class='ctx'> 	if (pipe-&gt;watch_queue)</div><div class='ctx'> 		put_watch_queue(pipe-&gt;watch_queue);</div><div class='ctx'> #endif</div><div class='del'>-	if (pipe-&gt;tmp_page)</div><div class='del'>-		__free_page(pipe-&gt;tmp_page);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pipe-&gt;tmp_page); i++) {</div><div class='add'>+		if (pipe-&gt;tmp_page[i])</div><div class='add'>+			__free_page(pipe-&gt;tmp_page[i]);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(pipe-&gt;bufs);</div><div class='ctx'> 	kfree(pipe);</div><div class='ctx'> }</div><div class='hunk'>@@ -886,6 +881,8 @@ static const struct dentry_operations pipefs_dentry_operations = {</div><div class='ctx'> 	.d_dname	= pipefs_dname,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations pipeanon_fops;</div><div class='add'>+</div><div class='ctx'> static struct inode * get_pipe_inode(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = new_inode_pseudo(pipe_mnt-&gt;mnt_sb);</div><div class='hunk'>@@ -903,7 +900,7 @@ static struct inode * get_pipe_inode(void)</div><div class='ctx'> 	inode-&gt;i_pipe = pipe;</div><div class='ctx'> 	pipe-&gt;files = 2;</div><div class='ctx'> 	pipe-&gt;readers = pipe-&gt;writers = 1;</div><div class='del'>-	inode-&gt;i_fop = &amp;pipefifo_fops;</div><div class='add'>+	inode-&gt;i_fop = &amp;pipeanon_fops;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mark the inode dirty from the very beginning,</div><div class='hunk'>@@ -911,7 +908,7 @@ static struct inode * get_pipe_inode(void)</div><div class='ctx'> 	 * list because "mark_inode_dirty()" will think</div><div class='ctx'> 	 * that it already _is_ on the dirty list.</div><div class='ctx'> 	 */</div><div class='del'>-	inode-&gt;i_state = I_DIRTY;</div><div class='add'>+	inode_state_assign_raw(inode, I_DIRTY);</div><div class='ctx'> 	inode-&gt;i_mode = S_IFIFO | S_IRUSR | S_IWUSR;</div><div class='ctx'> 	inode-&gt;i_uid = current_fsuid();</div><div class='ctx'> 	inode-&gt;i_gid = current_fsgid();</div><div class='hunk'>@@ -946,7 +943,7 @@ int create_pipe_files(struct file **res, int flags)</div><div class='ctx'> </div><div class='ctx'> 	f = alloc_file_pseudo(inode, pipe_mnt, "",</div><div class='ctx'> 				O_WRONLY | (flags &amp; (O_NONBLOCK | O_DIRECT)),</div><div class='del'>-				&amp;pipefifo_fops);</div><div class='add'>+				&amp;pipeanon_fops);</div><div class='ctx'> 	if (IS_ERR(f)) {</div><div class='ctx'> 		free_pipe_info(inode-&gt;i_pipe);</div><div class='ctx'> 		iput(inode);</div><div class='hunk'>@@ -954,18 +951,31 @@ int create_pipe_files(struct file **res, int flags)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;private_data = inode-&gt;i_pipe;</div><div class='add'>+	f-&gt;f_pipe = 0;</div><div class='ctx'> </div><div class='ctx'> 	res[0] = alloc_file_clone(f, O_RDONLY | (flags &amp; O_NONBLOCK),</div><div class='del'>-				  &amp;pipefifo_fops);</div><div class='add'>+				  &amp;pipeanon_fops);</div><div class='ctx'> 	if (IS_ERR(res[0])) {</div><div class='ctx'> 		put_pipe_info(inode, inode-&gt;i_pipe);</div><div class='ctx'> 		fput(f);</div><div class='ctx'> 		return PTR_ERR(res[0]);</div><div class='ctx'> 	}</div><div class='ctx'> 	res[0]-&gt;private_data = inode-&gt;i_pipe;</div><div class='add'>+	res[0]-&gt;f_pipe = 0;</div><div class='ctx'> 	res[1] = f;</div><div class='ctx'> 	stream_open(inode, res[0]);</div><div class='ctx'> 	stream_open(inode, res[1]);</div><div class='add'>+</div><div class='add'>+	/* pipe groks IOCB_NOWAIT */</div><div class='add'>+	res[0]-&gt;f_mode |= FMODE_NOWAIT;</div><div class='add'>+	res[1]-&gt;f_mode |= FMODE_NOWAIT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable permission and pre-content events, but enable legacy</div><div class='add'>+	 * inotify events for legacy users.</div><div class='add'>+	 */</div><div class='add'>+	file_set_fsnotify_mode(res[0], FMODE_NONOTIFY_PERM);</div><div class='add'>+	file_set_fsnotify_mode(res[1], FMODE_NONOTIFY_PERM);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -994,9 +1004,6 @@ static int __do_pipe_flags(int *fd, struct file **files, int flags)</div><div class='ctx'> 	audit_fd_pair(fdr, fdw);</div><div class='ctx'> 	fd[0] = fdr;</div><div class='ctx'> 	fd[1] = fdw;</div><div class='del'>-	/* pipe groks IOCB_NOWAIT */</div><div class='del'>-	files[0]-&gt;f_mode |= FMODE_NOWAIT;</div><div class='del'>-	files[1]-&gt;f_mode |= FMODE_NOWAIT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_fdr:</div><div class='hunk'>@@ -1113,11 +1120,11 @@ static void wake_up_partner(struct pipe_inode_info *pipe)</div><div class='ctx'> </div><div class='ctx'> static int fifo_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='add'>+	bool is_pipe = inode-&gt;i_fop == &amp;pipeanon_fops;</div><div class='ctx'> 	struct pipe_inode_info *pipe;</div><div class='del'>-	bool is_pipe = inode-&gt;i_sb-&gt;s_magic == PIPEFS_MAGIC;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	filp-&gt;f_version = 0;</div><div class='add'>+	filp-&gt;f_pipe = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (inode-&gt;i_pipe) {</div><div class='hunk'>@@ -1144,7 +1151,7 @@ static int fifo_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	filp-&gt;private_data = pipe;</div><div class='ctx'> 	/* OK, we have a pipe and it's pinned down */</div><div class='ctx'> </div><div class='del'>-	__pipe_lock(pipe);</div><div class='add'>+	mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* We can only do regular read/write on fifos */</div><div class='ctx'> 	stream_open(inode, filp);</div><div class='hunk'>@@ -1164,7 +1171,7 @@ static int fifo_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 			if ((filp-&gt;f_flags &amp; O_NONBLOCK)) {</div><div class='ctx'> 				/* suppress EPOLLHUP until we have</div><div class='ctx'> 				 * seen a writer */</div><div class='del'>-				filp-&gt;f_version = pipe-&gt;w_counter;</div><div class='add'>+				filp-&gt;f_pipe = pipe-&gt;w_counter;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (wait_for_partner(pipe, &amp;pipe-&gt;w_counter))</div><div class='ctx'> 					goto err_rd;</div><div class='hunk'>@@ -1214,7 +1221,7 @@ static int fifo_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ok! */</div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_rd:</div><div class='hunk'>@@ -1230,7 +1237,7 @@ err_wr:</div><div class='ctx'> 	goto err;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	put_pipe_info(inode, pipe);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1238,9 +1245,19 @@ err:</div><div class='ctx'> </div><div class='ctx'> const struct file_operations pipefifo_fops = {</div><div class='ctx'> 	.open		= fifo_open,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-	.read_iter	= pipe_read,</div><div class='del'>-	.write_iter	= pipe_write,</div><div class='add'>+	.read_iter	= fifo_pipe_read,</div><div class='add'>+	.write_iter	= fifo_pipe_write,</div><div class='add'>+	.poll		= pipe_poll,</div><div class='add'>+	.unlocked_ioctl	= pipe_ioctl,</div><div class='add'>+	.release	= pipe_release,</div><div class='add'>+	.fasync		= pipe_fasync,</div><div class='add'>+	.splice_write	= iter_file_splice_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations pipeanon_fops = {</div><div class='add'>+	.open		= fifo_open,</div><div class='add'>+	.read_iter	= anon_pipe_read,</div><div class='add'>+	.write_iter	= anon_pipe_write,</div><div class='ctx'> 	.poll		= pipe_poll,</div><div class='ctx'> 	.unlocked_ioctl	= pipe_ioctl,</div><div class='ctx'> 	.release	= pipe_release,</div><div class='hunk'>@@ -1276,6 +1293,10 @@ int pipe_resize_ring(struct pipe_inode_info *pipe, unsigned int nr_slots)</div><div class='ctx'> 	struct pipe_buffer *bufs;</div><div class='ctx'> 	unsigned int head, tail, mask, n;</div><div class='ctx'> </div><div class='add'>+	/* nr_slots larger than limits of pipe-&gt;{head,tail} */</div><div class='add'>+	if (unlikely(nr_slots &gt; (pipe_index_t)-1u))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	bufs = kcalloc(nr_slots, sizeof(*bufs),</div><div class='ctx'> 		       GFP_KERNEL_ACCOUNT | __GFP_NOWARN);</div><div class='ctx'> 	if (unlikely(!bufs))</div><div class='hunk'>@@ -1395,7 +1416,9 @@ struct pipe_inode_info *get_pipe_info(struct file *file, bool for_splice)</div><div class='ctx'> {</div><div class='ctx'> 	struct pipe_inode_info *pipe = file-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if (file-&gt;f_op != &amp;pipefifo_fops || !pipe)</div><div class='add'>+	if (!pipe)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (file-&gt;f_op != &amp;pipefifo_fops &amp;&amp; file-&gt;f_op != &amp;pipeanon_fops)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (for_splice &amp;&amp; pipe_has_watch_queue(pipe))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1411,7 +1434,7 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned int arg)</div><div class='ctx'> 	if (!pipe)</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	__pipe_lock(pipe);</div><div class='add'>+	mutex_lock(&amp;pipe-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case F_SETPIPE_SZ:</div><div class='hunk'>@@ -1425,7 +1448,7 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned int arg)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__pipe_unlock(pipe);</div><div class='add'>+	mutex_unlock(&amp;pipe-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1436,7 +1459,7 @@ static const struct super_operations pipefs_ops = {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * pipefs should _never_ be mounted by userland - too much of security hassle,</div><div class='del'>- * no real gain from having the whole whorehouse mounted. So we don't need</div><div class='add'>+ * no real gain from having the whole file system mounted. So we don't need</div><div class='ctx'>  * any operations on the root directory. However, we need a non-trivial</div><div class='ctx'>  * d_name - pipe: will go nicely and kill the special-casing in procfs.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1458,40 +1481,26 @@ static struct file_system_type pipe_fs_type = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='del'>-static int do_proc_dopipe_max_size_conv(unsigned long *lvalp,</div><div class='del'>-					unsigned int *valp,</div><div class='del'>-					int write, void *data)</div><div class='del'>-{</div><div class='del'>-	if (write) {</div><div class='del'>-		unsigned int val;</div><div class='del'>-</div><div class='del'>-		val = round_pipe_size(*lvalp);</div><div class='del'>-		if (val == 0)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		*valp = val;</div><div class='del'>-	} else {</div><div class='del'>-		unsigned int val = *valp;</div><div class='del'>-		*lvalp = (unsigned long) val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static SYSCTL_USER_TO_KERN_UINT_CONV(_pipe_maxsz, round_pipe_size)</div><div class='add'>+static SYSCTL_UINT_CONV_CUSTOM(_pipe_maxsz,</div><div class='add'>+			       sysctl_user_to_kern_uint_conv_pipe_maxsz,</div><div class='add'>+			       sysctl_kern_to_user_uint_conv, true)</div><div class='ctx'> </div><div class='del'>-static int proc_dopipe_max_size(struct ctl_table *table, int write,</div><div class='add'>+static int proc_dopipe_max_size(const struct ctl_table *table, int write,</div><div class='ctx'> 				void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	return do_proc_douintvec(table, write, buffer, lenp, ppos,</div><div class='del'>-				 do_proc_dopipe_max_size_conv, NULL);</div><div class='add'>+	return proc_douintvec_conv(table, write, buffer, lenp, ppos,</div><div class='add'>+				   do_proc_uint_conv_pipe_maxsz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table fs_pipe_sysctls[] = {</div><div class='add'>+static const struct ctl_table fs_pipe_sysctls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "pipe-max-size",</div><div class='ctx'> 		.data		= &amp;pipe_max_size,</div><div class='ctx'> 		.maxlen		= sizeof(pipe_max_size),</div><div class='ctx'> 		.mode		= 0644,</div><div class='ctx'> 		.proc_handler	= proc_dopipe_max_size,</div><div class='add'>+		.extra1		= SYSCTL_ONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "pipe-user-pages-hard",</div><div class='head'>diff --git a/fs/pnode.c b/fs/pnode.c<br/>index a799e0315cc9..5d91c3e58d2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pnode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pnode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pnode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pnode.c</a></div><div class='hunk'>@@ -21,19 +21,15 @@ static inline struct mount *next_peer(struct mount *p)</div><div class='ctx'> </div><div class='ctx'> static inline struct mount *first_slave(struct mount *p)</div><div class='ctx'> {</div><div class='del'>-	return list_entry(p-&gt;mnt_slave_list.next, struct mount, mnt_slave);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct mount *last_slave(struct mount *p)</div><div class='del'>-{</div><div class='del'>-	return list_entry(p-&gt;mnt_slave_list.prev, struct mount, mnt_slave);</div><div class='add'>+	return hlist_entry(p-&gt;mnt_slave_list.first, struct mount, mnt_slave);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct mount *next_slave(struct mount *p)</div><div class='ctx'> {</div><div class='del'>-	return list_entry(p-&gt;mnt_slave.next, struct mount, mnt_slave);</div><div class='add'>+	return hlist_entry(p-&gt;mnt_slave.next, struct mount, mnt_slave);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* locks: namespace_shared &amp;&amp; is_mounted(mnt) */</div><div class='ctx'> static struct mount *get_peer_under_root(struct mount *mnt,</div><div class='ctx'> 					 struct mnt_namespace *ns,</div><div class='ctx'> 					 const struct path *root)</div><div class='hunk'>@@ -55,7 +51,7 @@ static struct mount *get_peer_under_root(struct mount *mnt,</div><div class='ctx'>  * Get ID of closest dominating peer group having a representative</div><div class='ctx'>  * under the given root.</div><div class='ctx'>  *</div><div class='del'>- * Caller must hold namespace_sem</div><div class='add'>+ * locks: namespace_shared</div><div class='ctx'>  */</div><div class='ctx'> int get_dominating_id(struct mount *mnt, const struct path *root)</div><div class='ctx'> {</div><div class='hunk'>@@ -70,69 +66,128 @@ int get_dominating_id(struct mount *mnt, const struct path *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_make_slave(struct mount *mnt)</div><div class='add'>+static inline bool will_be_unmounted(struct mount *m)</div><div class='ctx'> {</div><div class='del'>-	struct mount *master, *slave_mnt;</div><div class='add'>+	return m-&gt;mnt.mnt_flags &amp; MNT_UMOUNT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;mnt-&gt;mnt_share)) {</div><div class='del'>-		if (IS_MNT_SHARED(mnt)) {</div><div class='del'>-			mnt_release_group_id(mnt);</div><div class='del'>-			CLEAR_MNT_SHARED(mnt);</div><div class='del'>-		}</div><div class='del'>-		master = mnt-&gt;mnt_master;</div><div class='del'>-		if (!master) {</div><div class='del'>-			struct list_head *p = &amp;mnt-&gt;mnt_slave_list;</div><div class='del'>-			while (!list_empty(p)) {</div><div class='del'>-				slave_mnt = list_first_entry(p,</div><div class='del'>-						struct mount, mnt_slave);</div><div class='del'>-				list_del_init(&amp;slave_mnt-&gt;mnt_slave);</div><div class='del'>-				slave_mnt-&gt;mnt_master = NULL;</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct mount *m;</div><div class='del'>-		/*</div><div class='del'>-		 * slave 'mnt' to a peer mount that has the</div><div class='del'>-		 * same root dentry. If none is available then</div><div class='del'>-		 * slave it to anything that is available.</div><div class='del'>-		 */</div><div class='del'>-		for (m = master = next_peer(mnt); m != mnt; m = next_peer(m)) {</div><div class='del'>-			if (m-&gt;mnt.mnt_root == mnt-&gt;mnt.mnt_root) {</div><div class='del'>-				master = m;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		list_del_init(&amp;mnt-&gt;mnt_share);</div><div class='del'>-		mnt-&gt;mnt_group_id = 0;</div><div class='del'>-		CLEAR_MNT_SHARED(mnt);</div><div class='add'>+static void transfer_propagation(struct mount *mnt, struct mount *to)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *p = NULL, *n;</div><div class='add'>+	struct mount *m;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(m, n, &amp;mnt-&gt;mnt_slave_list, mnt_slave) {</div><div class='add'>+		m-&gt;mnt_master = to;</div><div class='add'>+		if (!to)</div><div class='add'>+			hlist_del_init(&amp;m-&gt;mnt_slave);</div><div class='add'>+		else</div><div class='add'>+			p = &amp;m-&gt;mnt_slave;</div><div class='ctx'> 	}</div><div class='del'>-	list_for_each_entry(slave_mnt, &amp;mnt-&gt;mnt_slave_list, mnt_slave)</div><div class='del'>-		slave_mnt-&gt;mnt_master = master;</div><div class='del'>-	list_move(&amp;mnt-&gt;mnt_slave, &amp;master-&gt;mnt_slave_list);</div><div class='del'>-	list_splice(&amp;mnt-&gt;mnt_slave_list, master-&gt;mnt_slave_list.prev);</div><div class='del'>-	INIT_LIST_HEAD(&amp;mnt-&gt;mnt_slave_list);</div><div class='del'>-	mnt-&gt;mnt_master = master;</div><div class='del'>-	return 0;</div><div class='add'>+	if (p)</div><div class='add'>+		hlist_splice_init(&amp;mnt-&gt;mnt_slave_list, p, &amp;to-&gt;mnt_slave_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vfsmount lock must be held for write</div><div class='add'>+ * EXCL[namespace_sem]</div><div class='ctx'>  */</div><div class='ctx'> void change_mnt_propagation(struct mount *mnt, int type)</div><div class='ctx'> {</div><div class='add'>+	struct mount *m = mnt-&gt;mnt_master;</div><div class='add'>+</div><div class='ctx'> 	if (type == MS_SHARED) {</div><div class='ctx'> 		set_mnt_shared(mnt);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	do_make_slave(mnt);</div><div class='del'>-	if (type != MS_SLAVE) {</div><div class='del'>-		list_del_init(&amp;mnt-&gt;mnt_slave);</div><div class='add'>+	if (IS_MNT_SHARED(mnt)) {</div><div class='add'>+		if (list_empty(&amp;mnt-&gt;mnt_share)) {</div><div class='add'>+			mnt_release_group_id(mnt);</div><div class='add'>+		} else {</div><div class='add'>+			m = next_peer(mnt);</div><div class='add'>+			list_del_init(&amp;mnt-&gt;mnt_share);</div><div class='add'>+			mnt-&gt;mnt_group_id = 0;</div><div class='add'>+		}</div><div class='add'>+		CLEAR_MNT_SHARED(mnt);</div><div class='add'>+		transfer_propagation(mnt, m);</div><div class='add'>+	}</div><div class='add'>+	hlist_del_init(&amp;mnt-&gt;mnt_slave);</div><div class='add'>+	if (type == MS_SLAVE) {</div><div class='add'>+		mnt-&gt;mnt_master = m;</div><div class='add'>+		if (m)</div><div class='add'>+			hlist_add_head(&amp;mnt-&gt;mnt_slave, &amp;m-&gt;mnt_slave_list);</div><div class='add'>+	} else {</div><div class='ctx'> 		mnt-&gt;mnt_master = NULL;</div><div class='ctx'> 		if (type == MS_UNBINDABLE)</div><div class='del'>-			mnt-&gt;mnt.mnt_flags |= MNT_UNBINDABLE;</div><div class='add'>+			mnt-&gt;mnt_t_flags |= T_UNBINDABLE;</div><div class='ctx'> 		else</div><div class='del'>-			mnt-&gt;mnt.mnt_flags &amp;= ~MNT_UNBINDABLE;</div><div class='add'>+			mnt-&gt;mnt_t_flags &amp;= ~T_UNBINDABLE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mount *trace_transfers(struct mount *m)</div><div class='add'>+{</div><div class='add'>+	while (1) {</div><div class='add'>+		struct mount *next = next_peer(m);</div><div class='add'>+</div><div class='add'>+		if (next != m) {</div><div class='add'>+			list_del_init(&amp;m-&gt;mnt_share);</div><div class='add'>+			m-&gt;mnt_group_id = 0;</div><div class='add'>+			m-&gt;mnt_master = next;</div><div class='add'>+		} else {</div><div class='add'>+			if (IS_MNT_SHARED(m))</div><div class='add'>+				mnt_release_group_id(m);</div><div class='add'>+			next = m-&gt;mnt_master;</div><div class='add'>+		}</div><div class='add'>+		hlist_del_init(&amp;m-&gt;mnt_slave);</div><div class='add'>+		CLEAR_MNT_SHARED(m);</div><div class='add'>+		SET_MNT_MARK(m);</div><div class='add'>+</div><div class='add'>+		if (!next || !will_be_unmounted(next))</div><div class='add'>+			return next;</div><div class='add'>+		if (IS_MNT_MARKED(next))</div><div class='add'>+			return next-&gt;mnt_master;</div><div class='add'>+		m = next;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_destinations(struct mount *m, struct mount *master)</div><div class='add'>+{</div><div class='add'>+	struct mount *next;</div><div class='add'>+</div><div class='add'>+	while ((next = m-&gt;mnt_master) != master) {</div><div class='add'>+		m-&gt;mnt_master = master;</div><div class='add'>+		m = next;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bulk_make_private(struct list_head *set)</div><div class='add'>+{</div><div class='add'>+	struct mount *m;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(m, set, mnt_list)</div><div class='add'>+		if (!IS_MNT_MARKED(m))</div><div class='add'>+			set_destinations(m, trace_transfers(m));</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(m, set, mnt_list) {</div><div class='add'>+		transfer_propagation(m, m-&gt;mnt_master);</div><div class='add'>+		m-&gt;mnt_master = NULL;</div><div class='add'>+		CLEAR_MNT_MARK(m);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mount *__propagation_next(struct mount *m,</div><div class='add'>+					 struct mount *origin)</div><div class='add'>+{</div><div class='add'>+	while (1) {</div><div class='add'>+		struct mount *master = m-&gt;mnt_master;</div><div class='add'>+</div><div class='add'>+		if (master == origin-&gt;mnt_master) {</div><div class='add'>+			struct mount *next = next_peer(m);</div><div class='add'>+			return (next == origin) ? NULL : next;</div><div class='add'>+		} else if (m-&gt;mnt_slave.next)</div><div class='add'>+			return next_slave(m);</div><div class='add'>+</div><div class='add'>+		/* back at master */</div><div class='add'>+		m = master;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -150,34 +205,24 @@ static struct mount *propagation_next(struct mount *m,</div><div class='ctx'> 					 struct mount *origin)</div><div class='ctx'> {</div><div class='ctx'> 	/* are there any slaves of this mount? */</div><div class='del'>-	if (!IS_MNT_NEW(m) &amp;&amp; !list_empty(&amp;m-&gt;mnt_slave_list))</div><div class='add'>+	if (!IS_MNT_NEW(m) &amp;&amp; !hlist_empty(&amp;m-&gt;mnt_slave_list))</div><div class='ctx'> 		return first_slave(m);</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		struct mount *master = m-&gt;mnt_master;</div><div class='del'>-</div><div class='del'>-		if (master == origin-&gt;mnt_master) {</div><div class='del'>-			struct mount *next = next_peer(m);</div><div class='del'>-			return (next == origin) ? NULL : next;</div><div class='del'>-		} else if (m-&gt;mnt_slave.next != &amp;master-&gt;mnt_slave_list)</div><div class='del'>-			return next_slave(m);</div><div class='del'>-</div><div class='del'>-		/* back at master */</div><div class='del'>-		m = master;</div><div class='del'>-	}</div><div class='add'>+	return __propagation_next(m, origin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mount *skip_propagation_subtree(struct mount *m,</div><div class='ctx'> 						struct mount *origin)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Advance m such that propagation_next will not return</div><div class='del'>-	 * the slaves of m.</div><div class='add'>+	 * Advance m past everything that gets propagation from it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!IS_MNT_NEW(m) &amp;&amp; !list_empty(&amp;m-&gt;mnt_slave_list))</div><div class='del'>-		m = last_slave(m);</div><div class='add'>+	struct mount *p = __propagation_next(m, origin);</div><div class='ctx'> </div><div class='del'>-	return m;</div><div class='add'>+	while (p &amp;&amp; peers(m, p))</div><div class='add'>+		p = __propagation_next(p, origin);</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mount *next_group(struct mount *m, struct mount *origin)</div><div class='hunk'>@@ -185,7 +230,7 @@ static struct mount *next_group(struct mount *m, struct mount *origin)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		while (1) {</div><div class='ctx'> 			struct mount *next;</div><div class='del'>-			if (!IS_MNT_NEW(m) &amp;&amp; !list_empty(&amp;m-&gt;mnt_slave_list))</div><div class='add'>+			if (!IS_MNT_NEW(m) &amp;&amp; !hlist_empty(&amp;m-&gt;mnt_slave_list))</div><div class='ctx'> 				return first_slave(m);</div><div class='ctx'> 			next = next_peer(m);</div><div class='ctx'> 			if (m-&gt;mnt_group_id == origin-&gt;mnt_group_id) {</div><div class='hunk'>@@ -198,7 +243,7 @@ static struct mount *next_group(struct mount *m, struct mount *origin)</div><div class='ctx'> 		/* m is the last peer */</div><div class='ctx'> 		while (1) {</div><div class='ctx'> 			struct mount *master = m-&gt;mnt_master;</div><div class='del'>-			if (m-&gt;mnt_slave.next != &amp;master-&gt;mnt_slave_list)</div><div class='add'>+			if (m-&gt;mnt_slave.next)</div><div class='ctx'> 				return next_slave(m);</div><div class='ctx'> 			m = next_peer(master);</div><div class='ctx'> 			if (master-&gt;mnt_group_id == origin-&gt;mnt_group_id)</div><div class='hunk'>@@ -212,138 +257,112 @@ static struct mount *next_group(struct mount *m, struct mount *origin)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* all accesses are serialized by namespace_sem */</div><div class='del'>-static struct mount *last_dest, *first_source, *last_source, *dest_master;</div><div class='del'>-static struct hlist_head *list;</div><div class='del'>-</div><div class='del'>-static inline bool peers(const struct mount *m1, const struct mount *m2)</div><div class='del'>-{</div><div class='del'>-	return m1-&gt;mnt_group_id == m2-&gt;mnt_group_id &amp;&amp; m1-&gt;mnt_group_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int propagate_one(struct mount *m, struct mountpoint *dest_mp)</div><div class='add'>+static bool need_secondary(struct mount *m, struct mountpoint *dest_mp)</div><div class='ctx'> {</div><div class='del'>-	struct mount *child;</div><div class='del'>-	int type;</div><div class='ctx'> 	/* skip ones added by this propagate_mnt() */</div><div class='ctx'> 	if (IS_MNT_NEW(m))</div><div class='del'>-		return 0;</div><div class='del'>-	/* skip if mountpoint isn't covered by it */</div><div class='add'>+		return false;</div><div class='add'>+	/* skip if mountpoint isn't visible in m */</div><div class='ctx'> 	if (!is_subdir(dest_mp-&gt;m_dentry, m-&gt;mnt.mnt_root))</div><div class='del'>-		return 0;</div><div class='del'>-	if (peers(m, last_dest)) {</div><div class='del'>-		type = CL_MAKE_SHARED;</div><div class='del'>-	} else {</div><div class='del'>-		struct mount *n, *p;</div><div class='del'>-		bool done;</div><div class='del'>-		for (n = m; ; n = p) {</div><div class='del'>-			p = n-&gt;mnt_master;</div><div class='del'>-			if (p == dest_master || IS_MNT_MARKED(p))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		do {</div><div class='del'>-			struct mount *parent = last_source-&gt;mnt_parent;</div><div class='del'>-			if (peers(last_source, first_source))</div><div class='del'>-				break;</div><div class='del'>-			done = parent-&gt;mnt_master == p;</div><div class='del'>-			if (done &amp;&amp; peers(n, parent))</div><div class='del'>-				break;</div><div class='del'>-			last_source = last_source-&gt;mnt_master;</div><div class='del'>-		} while (!done);</div><div class='add'>+		return false;</div><div class='add'>+	/* skip if m is in the anon_ns */</div><div class='add'>+	if (is_anon_ns(m-&gt;mnt_ns))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		type = CL_SLAVE;</div><div class='del'>-		/* beginning of peer group among the slaves? */</div><div class='del'>-		if (IS_MNT_SHARED(m))</div><div class='del'>-			type |= CL_MAKE_SHARED;</div><div class='add'>+static struct mount *find_master(struct mount *m,</div><div class='add'>+				struct mount *last_copy,</div><div class='add'>+				struct mount *original)</div><div class='add'>+{</div><div class='add'>+	struct mount *p;</div><div class='add'>+</div><div class='add'>+	// ascend until there's a copy for something with the same master</div><div class='add'>+	for (;;) {</div><div class='add'>+		p = m-&gt;mnt_master;</div><div class='add'>+		if (!p || IS_MNT_MARKED(p))</div><div class='add'>+			break;</div><div class='add'>+		m = p;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='del'>-	child = copy_tree(last_source, last_source-&gt;mnt.mnt_root, type);</div><div class='del'>-	if (IS_ERR(child))</div><div class='del'>-		return PTR_ERR(child);</div><div class='del'>-	read_seqlock_excl(&amp;mount_lock);</div><div class='del'>-	mnt_set_mountpoint(m, dest_mp, child);</div><div class='del'>-	if (m-&gt;mnt_master != dest_master)</div><div class='del'>-		SET_MNT_MARK(m-&gt;mnt_master);</div><div class='del'>-	read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-	last_dest = m;</div><div class='del'>-	last_source = child;</div><div class='del'>-	hlist_add_head(&amp;child-&gt;mnt_hash, list);</div><div class='del'>-	return count_mounts(m-&gt;mnt_ns, child);</div><div class='add'>+	while (!peers(last_copy, original)) {</div><div class='add'>+		struct mount *parent = last_copy-&gt;mnt_parent;</div><div class='add'>+		if (parent-&gt;mnt_master == p) {</div><div class='add'>+			if (!peers(parent, m))</div><div class='add'>+				last_copy = last_copy-&gt;mnt_master;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		last_copy = last_copy-&gt;mnt_master;</div><div class='add'>+	}</div><div class='add'>+	return last_copy;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * mount 'source_mnt' under the destination 'dest_mnt' at</div><div class='del'>- * dentry 'dest_dentry'. And propagate that mount to</div><div class='del'>- * all the peer and slave mounts of 'dest_mnt'.</div><div class='del'>- * Link all the new mounts into a propagation tree headed at</div><div class='del'>- * source_mnt. Also link all the new mounts using -&gt;mnt_list</div><div class='del'>- * headed at source_mnt's -&gt;mnt_list</div><div class='add'>+/**</div><div class='add'>+ * propagate_mnt() - create secondary copies for tree attachment</div><div class='add'>+ * @dest_mnt:    destination mount.</div><div class='add'>+ * @dest_mp:     destination mountpoint.</div><div class='add'>+ * @source_mnt:  source mount.</div><div class='add'>+ * @tree_list:   list of secondaries to be attached.</div><div class='ctx'>  *</div><div class='del'>- * @dest_mnt: destination mount.</div><div class='del'>- * @dest_dentry: destination dentry.</div><div class='del'>- * @source_mnt: source mount.</div><div class='del'>- * @tree_list : list of heads of trees to be attached.</div><div class='add'>+ * Create secondary copies for attaching a tree with root @source_mnt</div><div class='add'>+ * at mount @dest_mnt with mountpoint @dest_mp.  Link all new mounts</div><div class='add'>+ * into a propagation graph.  Set mountpoints for all secondaries,</div><div class='add'>+ * link their roots into @tree_list via -&gt;mnt_hash.</div><div class='ctx'>  */</div><div class='ctx'> int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp,</div><div class='del'>-		    struct mount *source_mnt, struct hlist_head *tree_list)</div><div class='add'>+		  struct mount *source_mnt, struct hlist_head *tree_list)</div><div class='ctx'> {</div><div class='del'>-	struct mount *m, *n;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we don't want to bother passing tons of arguments to</div><div class='del'>-	 * propagate_one(); everything is serialized by namespace_sem,</div><div class='del'>-	 * so globals will do just fine.</div><div class='del'>-	 */</div><div class='del'>-	last_dest = dest_mnt;</div><div class='del'>-	first_source = source_mnt;</div><div class='del'>-	last_source = source_mnt;</div><div class='del'>-	list = tree_list;</div><div class='del'>-	dest_master = dest_mnt-&gt;mnt_master;</div><div class='del'>-</div><div class='del'>-	/* all peers of dest_mnt, except dest_mnt itself */</div><div class='del'>-	for (n = next_peer(dest_mnt); n != dest_mnt; n = next_peer(n)) {</div><div class='del'>-		ret = propagate_one(n, dest_mp);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* all slave groups */</div><div class='del'>-	for (m = next_group(dest_mnt, dest_mnt); m;</div><div class='del'>-			m = next_group(m, dest_mnt)) {</div><div class='del'>-		/* everything in that slave group */</div><div class='del'>-		n = m;</div><div class='add'>+	struct mount *m, *n, *copy, *this;</div><div class='add'>+	int err = 0, type;</div><div class='add'>+</div><div class='add'>+	if (dest_mnt-&gt;mnt_master)</div><div class='add'>+		SET_MNT_MARK(dest_mnt-&gt;mnt_master);</div><div class='add'>+</div><div class='add'>+	/* iterate over peer groups, depth first */</div><div class='add'>+	for (m = dest_mnt; m &amp;&amp; !err; m = next_group(m, dest_mnt)) {</div><div class='add'>+		if (m == dest_mnt) { // have one for dest_mnt itself</div><div class='add'>+			copy = source_mnt;</div><div class='add'>+			type = CL_MAKE_SHARED;</div><div class='add'>+			n = next_peer(m);</div><div class='add'>+			if (n == m)</div><div class='add'>+				continue;</div><div class='add'>+		} else {</div><div class='add'>+			type = CL_SLAVE;</div><div class='add'>+			/* beginning of peer group among the slaves? */</div><div class='add'>+			if (IS_MNT_SHARED(m))</div><div class='add'>+				type |= CL_MAKE_SHARED;</div><div class='add'>+			n = m;</div><div class='add'>+		}</div><div class='ctx'> 		do {</div><div class='del'>-			ret = propagate_one(n, dest_mp);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-			n = next_peer(n);</div><div class='del'>-		} while (n != m);</div><div class='add'>+			if (!need_secondary(n, dest_mp))</div><div class='add'>+				continue;</div><div class='add'>+			if (type &amp; CL_SLAVE) // first in this peer group</div><div class='add'>+				copy = find_master(n, copy, source_mnt);</div><div class='add'>+			this = copy_tree(copy, copy-&gt;mnt.mnt_root, type);</div><div class='add'>+			if (IS_ERR(this)) {</div><div class='add'>+				err = PTR_ERR(this);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			scoped_guard(mount_locked_reader)</div><div class='add'>+				mnt_set_mountpoint(n, dest_mp, this);</div><div class='add'>+			if (n-&gt;mnt_master)</div><div class='add'>+				SET_MNT_MARK(n-&gt;mnt_master);</div><div class='add'>+			copy = this;</div><div class='add'>+			hlist_add_head(&amp;this-&gt;mnt_hash, tree_list);</div><div class='add'>+			err = count_mounts(n-&gt;mnt_ns, this);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			type = CL_MAKE_SHARED;</div><div class='add'>+		} while ((n = next_peer(n)) != m);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	read_seqlock_excl(&amp;mount_lock);</div><div class='add'>+</div><div class='ctx'> 	hlist_for_each_entry(n, tree_list, mnt_hash) {</div><div class='ctx'> 		m = n-&gt;mnt_parent;</div><div class='del'>-		if (m-&gt;mnt_master != dest_mnt-&gt;mnt_master)</div><div class='add'>+		if (m-&gt;mnt_master)</div><div class='ctx'> 			CLEAR_MNT_MARK(m-&gt;mnt_master);</div><div class='ctx'> 	}</div><div class='del'>-	read_sequnlock_excl(&amp;mount_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mount *find_topper(struct mount *mnt)</div><div class='del'>-{</div><div class='del'>-	/* If there is exactly one mount covering mnt completely return it. */</div><div class='del'>-	struct mount *child;</div><div class='del'>-</div><div class='del'>-	if (!list_is_singular(&amp;mnt-&gt;mnt_mounts))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	child = list_first_entry(&amp;mnt-&gt;mnt_mounts, struct mount, mnt_child);</div><div class='del'>-	if (child-&gt;mnt_mountpoint != mnt-&gt;mnt.mnt_root)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return child;</div><div class='add'>+	if (dest_mnt-&gt;mnt_master)</div><div class='add'>+		CLEAR_MNT_MARK(dest_mnt-&gt;mnt_master);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -380,9 +399,6 @@ bool propagation_would_overmount(const struct mount *from,</div><div class='ctx'> 	if (!IS_MNT_SHARED(from))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (IS_MNT_NEW(to))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	if (to-&gt;mnt.mnt_root != mp-&gt;m_dentry)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -406,12 +422,8 @@ bool propagation_would_overmount(const struct mount *from,</div><div class='ctx'>  */</div><div class='ctx'> int propagate_mount_busy(struct mount *mnt, int refcnt)</div><div class='ctx'> {</div><div class='del'>-	struct mount *m, *child, *topper;</div><div class='ctx'> 	struct mount *parent = mnt-&gt;mnt_parent;</div><div class='ctx'> </div><div class='del'>-	if (mnt == parent)</div><div class='del'>-		return do_refcount_check(mnt, refcnt);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * quickly check if the current mount can be unmounted.</div><div class='ctx'> 	 * If not, we don't have to go checking for all other</div><div class='hunk'>@@ -420,23 +432,27 @@ int propagate_mount_busy(struct mount *mnt, int refcnt)</div><div class='ctx'> 	if (!list_empty(&amp;mnt-&gt;mnt_mounts) || do_refcount_check(mnt, refcnt))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	for (m = propagation_next(parent, parent); m;</div><div class='add'>+	if (mnt == parent)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (struct mount *m = propagation_next(parent, parent); m;</div><div class='ctx'> 	     		m = propagation_next(m, parent)) {</div><div class='del'>-		int count = 1;</div><div class='del'>-		child = __lookup_mnt(&amp;m-&gt;mnt, mnt-&gt;mnt_mountpoint);</div><div class='del'>-		if (!child)</div><div class='del'>-			continue;</div><div class='add'>+		struct list_head *head;</div><div class='add'>+		struct mount *child = __lookup_mnt(&amp;m-&gt;mnt, mnt-&gt;mnt_mountpoint);</div><div class='ctx'> </div><div class='del'>-		/* Is there exactly one mount on the child that covers</div><div class='del'>-		 * it completely whose reference should be ignored?</div><div class='del'>-		 */</div><div class='del'>-		topper = find_topper(child);</div><div class='del'>-		if (topper)</div><div class='del'>-			count += 1;</div><div class='del'>-		else if (!list_empty(&amp;child-&gt;mnt_mounts))</div><div class='add'>+		if (!child)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (do_refcount_check(child, count))</div><div class='add'>+		head = &amp;child-&gt;mnt_mounts;</div><div class='add'>+		if (!list_empty(head)) {</div><div class='add'>+			/*</div><div class='add'>+			 * a mount that covers child completely wouldn't prevent</div><div class='add'>+			 * it being pulled out; any other would.</div><div class='add'>+			 */</div><div class='add'>+			if (!list_is_singular(head) || !child-&gt;overmount)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		if (do_refcount_check(child, 1))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -462,179 +478,210 @@ void propagate_mount_unlock(struct mount *mnt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void umount_one(struct mount *mnt, struct list_head *to_umount)</div><div class='add'>+static inline bool is_candidate(struct mount *m)</div><div class='ctx'> {</div><div class='del'>-	CLEAR_MNT_MARK(mnt);</div><div class='del'>-	mnt-&gt;mnt.mnt_flags |= MNT_UMOUNT;</div><div class='del'>-	list_del_init(&amp;mnt-&gt;mnt_child);</div><div class='del'>-	list_del_init(&amp;mnt-&gt;mnt_umounting);</div><div class='del'>-	move_from_ns(mnt, to_umount);</div><div class='add'>+	return m-&gt;mnt_t_flags &amp; T_UMOUNT_CANDIDATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * NOTE: unmounting 'mnt' naturally propagates to all other mounts its</div><div class='del'>- * parent propagates to.</div><div class='del'>- */</div><div class='del'>-static bool __propagate_umount(struct mount *mnt,</div><div class='del'>-			       struct list_head *to_umount,</div><div class='del'>-			       struct list_head *to_restore)</div><div class='add'>+static void umount_one(struct mount *m, struct list_head *to_umount)</div><div class='ctx'> {</div><div class='del'>-	bool progress = false;</div><div class='del'>-	struct mount *child;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The state of the parent won't change if this mount is</div><div class='del'>-	 * already unmounted or marked as without children.</div><div class='del'>-	 */</div><div class='del'>-	if (mnt-&gt;mnt.mnt_flags &amp; (MNT_UMOUNT | MNT_MARKED))</div><div class='del'>-		goto out;</div><div class='add'>+	m-&gt;mnt.mnt_flags |= MNT_UMOUNT;</div><div class='add'>+	list_del_init(&amp;m-&gt;mnt_child);</div><div class='add'>+	move_from_ns(m);</div><div class='add'>+	list_add_tail(&amp;m-&gt;mnt_list, to_umount);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Verify topper is the only grandchild that has not been</div><div class='del'>-	 * speculatively unmounted.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(child, &amp;mnt-&gt;mnt_mounts, mnt_child) {</div><div class='del'>-		if (child-&gt;mnt_mountpoint == mnt-&gt;mnt.mnt_root)</div><div class='del'>-			continue;</div><div class='del'>-		if (!list_empty(&amp;child-&gt;mnt_umounting) &amp;&amp; IS_MNT_MARKED(child))</div><div class='del'>-			continue;</div><div class='del'>-		/* Found a mounted child */</div><div class='del'>-		goto children;</div><div class='del'>-	}</div><div class='add'>+static void remove_from_candidate_list(struct mount *m)</div><div class='add'>+{</div><div class='add'>+	m-&gt;mnt_t_flags &amp;= ~(T_MARKED | T_UMOUNT_CANDIDATE);</div><div class='add'>+	list_del_init(&amp;m-&gt;mnt_list);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Mark mounts that can be unmounted if not locked */</div><div class='del'>-	SET_MNT_MARK(mnt);</div><div class='del'>-	progress = true;</div><div class='add'>+static void gather_candidates(struct list_head *set,</div><div class='add'>+			      struct list_head *candidates)</div><div class='add'>+{</div><div class='add'>+	struct mount *m, *p, *q;</div><div class='ctx'> </div><div class='del'>-	/* If a mount is without children and not locked umount it. */</div><div class='del'>-	if (!IS_MNT_LOCKED(mnt)) {</div><div class='del'>-		umount_one(mnt, to_umount);</div><div class='del'>-	} else {</div><div class='del'>-children:</div><div class='del'>-		list_move_tail(&amp;mnt-&gt;mnt_umounting, to_restore);</div><div class='add'>+	list_for_each_entry(m, set, mnt_list) {</div><div class='add'>+		if (is_candidate(m))</div><div class='add'>+			continue;</div><div class='add'>+		m-&gt;mnt_t_flags |= T_UMOUNT_CANDIDATE;</div><div class='add'>+		p = m-&gt;mnt_parent;</div><div class='add'>+		q = propagation_next(p, p);</div><div class='add'>+		while (q) {</div><div class='add'>+			struct mount *child = __lookup_mnt(&amp;q-&gt;mnt,</div><div class='add'>+							   m-&gt;mnt_mountpoint);</div><div class='add'>+			if (child) {</div><div class='add'>+				/*</div><div class='add'>+				 * We might've already run into this one.  That</div><div class='add'>+				 * must've happened on earlier iteration of the</div><div class='add'>+				 * outer loop; in that case we can skip those</div><div class='add'>+				 * parents that get propagation from q - there</div><div class='add'>+				 * will be nothing new on those as well.</div><div class='add'>+				 */</div><div class='add'>+				if (is_candidate(child)) {</div><div class='add'>+					q = skip_propagation_subtree(q, p);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				child-&gt;mnt_t_flags |= T_UMOUNT_CANDIDATE;</div><div class='add'>+				if (!will_be_unmounted(child))</div><div class='add'>+					list_add(&amp;child-&gt;mnt_list, candidates);</div><div class='add'>+			}</div><div class='add'>+			q = propagation_next(q, p);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='del'>-	return progress;</div><div class='add'>+	list_for_each_entry(m, set, mnt_list)</div><div class='add'>+		m-&gt;mnt_t_flags &amp;= ~T_UMOUNT_CANDIDATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void umount_list(struct list_head *to_umount,</div><div class='del'>-			struct list_head *to_restore)</div><div class='add'>+/*</div><div class='add'>+ * We know that some child of @m can't be unmounted.  In all places where the</div><div class='add'>+ * chain of descent of @m has child not overmounting the root of parent,</div><div class='add'>+ * the parent can't be unmounted either.</div><div class='add'>+ */</div><div class='add'>+static void trim_ancestors(struct mount *m)</div><div class='ctx'> {</div><div class='del'>-	struct mount *mnt, *child, *tmp;</div><div class='del'>-	list_for_each_entry(mnt, to_umount, mnt_list) {</div><div class='del'>-		list_for_each_entry_safe(child, tmp, &amp;mnt-&gt;mnt_mounts, mnt_child) {</div><div class='del'>-			/* topper? */</div><div class='del'>-			if (child-&gt;mnt_mountpoint == mnt-&gt;mnt.mnt_root)</div><div class='del'>-				list_move_tail(&amp;child-&gt;mnt_umounting, to_restore);</div><div class='del'>-			else</div><div class='del'>-				umount_one(child, to_umount);</div><div class='del'>-		}</div><div class='add'>+	struct mount *p;</div><div class='add'>+</div><div class='add'>+	for (p = m-&gt;mnt_parent; is_candidate(p); m = p, p = p-&gt;mnt_parent) {</div><div class='add'>+		if (IS_MNT_MARKED(m))	// all candidates beneath are overmounts</div><div class='add'>+			return;</div><div class='add'>+		SET_MNT_MARK(m);</div><div class='add'>+		if (m != p-&gt;overmount)</div><div class='add'>+			p-&gt;mnt_t_flags &amp;= ~T_UMOUNT_CANDIDATE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void restore_mounts(struct list_head *to_restore)</div><div class='add'>+/*</div><div class='add'>+ * Find and exclude all umount candidates forbidden by @m</div><div class='add'>+ * (see Documentation/filesystems/propagate_umount.txt)</div><div class='add'>+ * If we can immediately tell that @m is OK to unmount (unlocked</div><div class='add'>+ * and all children are already committed to unmounting) commit</div><div class='add'>+ * to unmounting it.</div><div class='add'>+ * Only @m itself might be taken from the candidates list;</div><div class='add'>+ * anything found by trim_ancestors() is marked non-candidate</div><div class='add'>+ * and left on the list.</div><div class='add'>+ */</div><div class='add'>+static void trim_one(struct mount *m, struct list_head *to_umount)</div><div class='ctx'> {</div><div class='del'>-	/* Restore mounts to a clean working state */</div><div class='del'>-	while (!list_empty(to_restore)) {</div><div class='del'>-		struct mount *mnt, *parent;</div><div class='del'>-		struct mountpoint *mp;</div><div class='del'>-</div><div class='del'>-		mnt = list_first_entry(to_restore, struct mount, mnt_umounting);</div><div class='del'>-		CLEAR_MNT_MARK(mnt);</div><div class='del'>-		list_del_init(&amp;mnt-&gt;mnt_umounting);</div><div class='del'>-</div><div class='del'>-		/* Should this mount be reparented? */</div><div class='del'>-		mp = mnt-&gt;mnt_mp;</div><div class='del'>-		parent = mnt-&gt;mnt_parent;</div><div class='del'>-		while (parent-&gt;mnt.mnt_flags &amp; MNT_UMOUNT) {</div><div class='del'>-			mp = parent-&gt;mnt_mp;</div><div class='del'>-			parent = parent-&gt;mnt_parent;</div><div class='add'>+	bool remove_this = false, found = false, umount_this = false;</div><div class='add'>+	struct mount *n;</div><div class='add'>+</div><div class='add'>+	if (!is_candidate(m)) { // trim_ancestors() left it on list</div><div class='add'>+		remove_from_candidate_list(m);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(n, &amp;m-&gt;mnt_mounts, mnt_child) {</div><div class='add'>+		if (!is_candidate(n)) {</div><div class='add'>+			found = true;</div><div class='add'>+			if (n != m-&gt;overmount) {</div><div class='add'>+				remove_this = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		if (parent != mnt-&gt;mnt_parent)</div><div class='del'>-			mnt_change_mountpoint(parent, mp, mnt);</div><div class='add'>+	}</div><div class='add'>+	if (found) {</div><div class='add'>+		trim_ancestors(m);</div><div class='add'>+	} else if (!IS_MNT_LOCKED(m) &amp;&amp; list_empty(&amp;m-&gt;mnt_mounts)) {</div><div class='add'>+		remove_this = true;</div><div class='add'>+		umount_this = true;</div><div class='add'>+	}</div><div class='add'>+	if (remove_this) {</div><div class='add'>+		remove_from_candidate_list(m);</div><div class='add'>+		if (umount_this)</div><div class='add'>+			umount_one(m, to_umount);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cleanup_umount_visitations(struct list_head *visited)</div><div class='add'>+static void handle_locked(struct mount *m, struct list_head *to_umount)</div><div class='ctx'> {</div><div class='del'>-	while (!list_empty(visited)) {</div><div class='del'>-		struct mount *mnt =</div><div class='del'>-			list_first_entry(visited, struct mount, mnt_umounting);</div><div class='del'>-		list_del_init(&amp;mnt-&gt;mnt_umounting);</div><div class='add'>+	struct mount *cutoff = m, *p;</div><div class='add'>+</div><div class='add'>+	if (!is_candidate(m)) { // trim_ancestors() left it on list</div><div class='add'>+		remove_from_candidate_list(m);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	for (p = m; is_candidate(p); p = p-&gt;mnt_parent) {</div><div class='add'>+		remove_from_candidate_list(p);</div><div class='add'>+		if (!IS_MNT_LOCKED(p))</div><div class='add'>+			cutoff = p-&gt;mnt_parent;</div><div class='add'>+	}</div><div class='add'>+	if (will_be_unmounted(p))</div><div class='add'>+		cutoff = p;</div><div class='add'>+	while (m != cutoff) {</div><div class='add'>+		umount_one(m, to_umount);</div><div class='add'>+		m = m-&gt;mnt_parent;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * collect all mounts that receive propagation from the mount in @list,</div><div class='del'>- * and return these additional mounts in the same list.</div><div class='del'>- * @list: the list of mounts to be unmounted.</div><div class='add'>+ * @m is not to going away, and it overmounts the top of a stack of mounts</div><div class='add'>+ * that are going away.  We know that all of those are fully overmounted</div><div class='add'>+ * by the one above (@m being the topmost of the chain), so @m can be slid</div><div class='add'>+ * in place where the bottom of the stack is attached.</div><div class='ctx'>  *</div><div class='del'>- * vfsmount lock must be held for write</div><div class='add'>+ * NOTE: here we temporarily violate a constraint - two mounts end up with</div><div class='add'>+ * the same parent and mountpoint; that will be remedied as soon as we</div><div class='add'>+ * return from propagate_umount() - its caller (umount_tree()) will detach</div><div class='add'>+ * the stack from the parent it (and now @m) is attached to.  umount_tree()</div><div class='add'>+ * might choose to keep unmounted pieces stuck to each other, but it always</div><div class='add'>+ * detaches them from the mounts that remain in the tree.</div><div class='ctx'>  */</div><div class='del'>-int propagate_umount(struct list_head *list)</div><div class='add'>+static void reparent(struct mount *m)</div><div class='ctx'> {</div><div class='del'>-	struct mount *mnt;</div><div class='del'>-	LIST_HEAD(to_restore);</div><div class='del'>-	LIST_HEAD(to_umount);</div><div class='del'>-	LIST_HEAD(visited);</div><div class='del'>-</div><div class='del'>-	/* Find candidates for unmounting */</div><div class='del'>-	list_for_each_entry_reverse(mnt, list, mnt_list) {</div><div class='del'>-		struct mount *parent = mnt-&gt;mnt_parent;</div><div class='del'>-		struct mount *m;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If this mount has already been visited it is known that it's</div><div class='del'>-		 * entire peer group and all of their slaves in the propagation</div><div class='del'>-		 * tree for the mountpoint has already been visited and there is</div><div class='del'>-		 * no need to visit them again.</div><div class='del'>-		 */</div><div class='del'>-		if (!list_empty(&amp;mnt-&gt;mnt_umounting))</div><div class='del'>-			continue;</div><div class='add'>+	struct mount *p = m;</div><div class='add'>+	struct mountpoint *mp;</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;mnt-&gt;mnt_umounting, &amp;visited);</div><div class='del'>-		for (m = propagation_next(parent, parent); m;</div><div class='del'>-		     m = propagation_next(m, parent)) {</div><div class='del'>-			struct mount *child = __lookup_mnt(&amp;m-&gt;mnt,</div><div class='del'>-							   mnt-&gt;mnt_mountpoint);</div><div class='del'>-			if (!child)</div><div class='del'>-				continue;</div><div class='add'>+	do {</div><div class='add'>+		mp = p-&gt;mnt_mp;</div><div class='add'>+		p = p-&gt;mnt_parent;</div><div class='add'>+	} while (will_be_unmounted(p));</div><div class='ctx'> </div><div class='del'>-			if (!list_empty(&amp;child-&gt;mnt_umounting)) {</div><div class='del'>-				/*</div><div class='del'>-				 * If the child has already been visited it is</div><div class='del'>-				 * know that it's entire peer group and all of</div><div class='del'>-				 * their slaves in the propgation tree for the</div><div class='del'>-				 * mountpoint has already been visited and there</div><div class='del'>-				 * is no need to visit this subtree again.</div><div class='del'>-				 */</div><div class='del'>-				m = skip_propagation_subtree(m, parent);</div><div class='del'>-				continue;</div><div class='del'>-			} else if (child-&gt;mnt.mnt_flags &amp; MNT_UMOUNT) {</div><div class='del'>-				/*</div><div class='del'>-				 * We have come accross an partially unmounted</div><div class='del'>-				 * mount in list that has not been visited yet.</div><div class='del'>-				 * Remember it has been visited and continue</div><div class='del'>-				 * about our merry way.</div><div class='del'>-				 */</div><div class='del'>-				list_add_tail(&amp;child-&gt;mnt_umounting, &amp;visited);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+	mnt_change_mountpoint(p, mp, m);</div><div class='add'>+	mnt_notify_add(m);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			/* Check the child and parents while progress is made */</div><div class='del'>-			while (__propagate_umount(child,</div><div class='del'>-						  &amp;to_umount, &amp;to_restore)) {</div><div class='del'>-				/* Is the parent a umount candidate? */</div><div class='del'>-				child = child-&gt;mnt_parent;</div><div class='del'>-				if (list_empty(&amp;child-&gt;mnt_umounting))</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+/**</div><div class='add'>+ * propagate_umount - apply propagation rules to the set of mounts for umount()</div><div class='add'>+ * @set: the list of mounts to be unmounted.</div><div class='add'>+ *</div><div class='add'>+ * Collect all mounts that receive propagation from the mount in @set and have</div><div class='add'>+ * no obstacles to being unmounted.  Add these additional mounts to the set.</div><div class='add'>+ *</div><div class='add'>+ * See Documentation/filesystems/propagate_umount.txt if you do anything in</div><div class='add'>+ * this area.</div><div class='add'>+ *</div><div class='add'>+ * Locks held:</div><div class='add'>+ * mount_lock (write_seqlock), namespace_sem (exclusive).</div><div class='add'>+ */</div><div class='add'>+void propagate_umount(struct list_head *set)</div><div class='add'>+{</div><div class='add'>+	struct mount *m, *p;</div><div class='add'>+	LIST_HEAD(to_umount);	// committed to unmounting</div><div class='add'>+	LIST_HEAD(candidates);	// undecided umount candidates</div><div class='add'>+</div><div class='add'>+	// collect all candidates</div><div class='add'>+	gather_candidates(set, &amp;candidates);</div><div class='add'>+</div><div class='add'>+	// reduce the set until it's non-shifting</div><div class='add'>+	list_for_each_entry_safe(m, p, &amp;candidates, mnt_list)</div><div class='add'>+		trim_one(m, &amp;to_umount);</div><div class='add'>+</div><div class='add'>+	// ... and non-revealing</div><div class='add'>+	while (!list_empty(&amp;candidates)) {</div><div class='add'>+		m = list_first_entry(&amp;candidates,struct mount, mnt_list);</div><div class='add'>+		handle_locked(m, &amp;to_umount);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	umount_list(&amp;to_umount, &amp;to_restore);</div><div class='del'>-	restore_mounts(&amp;to_restore);</div><div class='del'>-	cleanup_umount_visitations(&amp;visited);</div><div class='del'>-	list_splice_tail(&amp;to_umount, list);</div><div class='add'>+	// now to_umount consists of all acceptable candidates</div><div class='add'>+	// deal with reparenting of surviving overmounts on those</div><div class='add'>+	list_for_each_entry(m, &amp;to_umount, mnt_list) {</div><div class='add'>+		struct mount *over = m-&gt;overmount;</div><div class='add'>+		if (over &amp;&amp; !will_be_unmounted(over))</div><div class='add'>+			reparent(over);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	// and fold them into the set</div><div class='add'>+	list_splice_tail_init(&amp;to_umount, set);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/pnode.h b/fs/pnode.h<br/>index 0b02a6393891..b029db225f33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pnode.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pnode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pnode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pnode.h</a></div><div class='hunk'>@@ -10,14 +10,14 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include "mount.h"</div><div class='ctx'> </div><div class='del'>-#define IS_MNT_SHARED(m) ((m)-&gt;mnt.mnt_flags &amp; MNT_SHARED)</div><div class='add'>+#define IS_MNT_SHARED(m) ((m)-&gt;mnt_t_flags &amp; T_SHARED)</div><div class='ctx'> #define IS_MNT_SLAVE(m) ((m)-&gt;mnt_master)</div><div class='del'>-#define IS_MNT_NEW(m)  (!(m)-&gt;mnt_ns || is_anon_ns((m)-&gt;mnt_ns))</div><div class='del'>-#define CLEAR_MNT_SHARED(m) ((m)-&gt;mnt.mnt_flags &amp;= ~MNT_SHARED)</div><div class='del'>-#define IS_MNT_UNBINDABLE(m) ((m)-&gt;mnt.mnt_flags &amp; MNT_UNBINDABLE)</div><div class='del'>-#define IS_MNT_MARKED(m) ((m)-&gt;mnt.mnt_flags &amp; MNT_MARKED)</div><div class='del'>-#define SET_MNT_MARK(m) ((m)-&gt;mnt.mnt_flags |= MNT_MARKED)</div><div class='del'>-#define CLEAR_MNT_MARK(m) ((m)-&gt;mnt.mnt_flags &amp;= ~MNT_MARKED)</div><div class='add'>+#define IS_MNT_NEW(m) (!(m)-&gt;mnt_ns)</div><div class='add'>+#define CLEAR_MNT_SHARED(m) ((m)-&gt;mnt_t_flags &amp;= ~T_SHARED)</div><div class='add'>+#define IS_MNT_UNBINDABLE(m) ((m)-&gt;mnt_t_flags &amp; T_UNBINDABLE)</div><div class='add'>+#define IS_MNT_MARKED(m) ((m)-&gt;mnt_t_flags &amp; T_MARKED)</div><div class='add'>+#define SET_MNT_MARK(m) ((m)-&gt;mnt_t_flags |= T_MARKED)</div><div class='add'>+#define CLEAR_MNT_MARK(m) ((m)-&gt;mnt_t_flags &amp;= ~T_MARKED)</div><div class='ctx'> #define IS_MNT_LOCKED(m) ((m)-&gt;mnt.mnt_flags &amp; MNT_LOCKED)</div><div class='ctx'> </div><div class='ctx'> #define CL_EXPIRE    		0x01</div><div class='hunk'>@@ -25,21 +25,27 @@</div><div class='ctx'> #define CL_COPY_UNBINDABLE	0x04</div><div class='ctx'> #define CL_MAKE_SHARED 		0x08</div><div class='ctx'> #define CL_PRIVATE 		0x10</div><div class='del'>-#define CL_SHARED_TO_SLAVE	0x20</div><div class='ctx'> #define CL_COPY_MNT_NS_FILE	0x40</div><div class='ctx'> </div><div class='del'>-#define CL_COPY_ALL		(CL_COPY_UNBINDABLE | CL_COPY_MNT_NS_FILE)</div><div class='del'>-</div><div class='add'>+/*</div><div class='add'>+ * EXCL[namespace_sem]</div><div class='add'>+ */</div><div class='ctx'> static inline void set_mnt_shared(struct mount *mnt)</div><div class='ctx'> {</div><div class='del'>-	mnt-&gt;mnt.mnt_flags &amp;= ~MNT_SHARED_MASK;</div><div class='del'>-	mnt-&gt;mnt.mnt_flags |= MNT_SHARED;</div><div class='add'>+	mnt-&gt;mnt_t_flags &amp;= ~T_SHARED_MASK;</div><div class='add'>+	mnt-&gt;mnt_t_flags |= T_SHARED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool peers(const struct mount *m1, const struct mount *m2)</div><div class='add'>+{</div><div class='add'>+	return m1-&gt;mnt_group_id == m2-&gt;mnt_group_id &amp;&amp; m1-&gt;mnt_group_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void change_mnt_propagation(struct mount *, int);</div><div class='add'>+void bulk_make_private(struct list_head *);</div><div class='ctx'> int propagate_mnt(struct mount *, struct mountpoint *, struct mount *,</div><div class='ctx'> 		struct hlist_head *);</div><div class='del'>-int propagate_umount(struct list_head *);</div><div class='add'>+void propagate_umount(struct list_head *);</div><div class='ctx'> int propagate_mount_busy(struct mount *, int);</div><div class='ctx'> void propagate_mount_unlock(struct mount *);</div><div class='ctx'> void mnt_release_group_id(struct mount *);</div><div class='head'>diff --git a/fs/posix_acl.c b/fs/posix_acl.c<br/>index e1af20893ebe..768f027c1428 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/posix_acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/posix_acl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/posix_acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/posix_acl.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/mnt_idmapping.h&gt;</div><div class='ctx'> #include &lt;linux/iversion.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/evm.h&gt;</div><div class='ctx'> #include &lt;linux/fsnotify.h&gt;</div><div class='ctx'> #include &lt;linux/filelock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -201,11 +200,11 @@ EXPORT_SYMBOL(posix_acl_init);</div><div class='ctx'>  * Allocate a new ACL with the specified number of entries.</div><div class='ctx'>  */</div><div class='ctx'> struct posix_acl *</div><div class='del'>-posix_acl_alloc(int count, gfp_t flags)</div><div class='add'>+posix_acl_alloc(unsigned int count, gfp_t flags)</div><div class='ctx'> {</div><div class='del'>-	const size_t size = sizeof(struct posix_acl) +</div><div class='del'>-	                    count * sizeof(struct posix_acl_entry);</div><div class='del'>-	struct posix_acl *acl = kmalloc(size, flags);</div><div class='add'>+	struct posix_acl *acl;</div><div class='add'>+</div><div class='add'>+	acl = kmalloc(struct_size(acl, a_entries, count), flags);</div><div class='ctx'> 	if (acl)</div><div class='ctx'> 		posix_acl_init(acl, count);</div><div class='ctx'> 	return acl;</div><div class='hunk'>@@ -221,9 +220,8 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)</div><div class='ctx'> 	struct posix_acl *clone = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (acl) {</div><div class='del'>-		int size = sizeof(struct posix_acl) + acl-&gt;a_count *</div><div class='del'>-		           sizeof(struct posix_acl_entry);</div><div class='del'>-		clone = kmemdup(acl, size, flags);</div><div class='add'>+		clone = kmemdup(acl, struct_size(acl, a_entries, acl-&gt;a_count),</div><div class='add'>+				flags);</div><div class='ctx'> 		if (clone)</div><div class='ctx'> 			refcount_set(&amp;clone-&gt;a_refcount, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -716,8 +714,8 @@ int posix_acl_update_mode(struct mnt_idmap *idmap,</div><div class='ctx'> 		return error;</div><div class='ctx'> 	if (error == 0)</div><div class='ctx'> 		*acl = NULL;</div><div class='del'>-	if (!vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)) &amp;&amp;</div><div class='del'>-	    !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID))</div><div class='add'>+	if (!in_group_or_capable(idmap, inode,</div><div class='add'>+				 i_gid_into_vfsgid(idmap, inode)))</div><div class='ctx'> 		mode &amp;= ~S_ISGID;</div><div class='ctx'> 	*mode_p = mode;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -786,12 +784,12 @@ struct posix_acl *posix_acl_from_xattr(struct user_namespace *userns,</div><div class='ctx'> 		return ERR_PTR(count);</div><div class='ctx'> 	if (count == 0)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	acl = posix_acl_alloc(count, GFP_NOFS);</div><div class='ctx'> 	if (!acl)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	acl_e = acl-&gt;a_entries;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (end = entry + count; entry != end; acl_e++, entry++) {</div><div class='ctx'> 		acl_e-&gt;e_tag  = le16_to_cpu(entry-&gt;e_tag);</div><div class='ctx'> 		acl_e-&gt;e_perm = le16_to_cpu(entry-&gt;e_perm);</div><div class='hunk'>@@ -1093,7 +1091,7 @@ int vfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	int acl_type;</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> </div><div class='ctx'> 	acl_type = posix_acl_type(acl_name);</div><div class='ctx'> 	if (acl_type &lt; 0)</div><div class='hunk'>@@ -1137,13 +1135,13 @@ retry_deleg:</div><div class='ctx'> 		error = -EIO;</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		fsnotify_xattr(dentry);</div><div class='del'>-		evm_inode_post_set_acl(dentry, acl_name, kacl);</div><div class='add'>+		security_inode_post_set_acl(dentry, acl_name, kacl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_inode_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			goto retry_deleg;</div><div class='hunk'>@@ -1214,7 +1212,7 @@ int vfs_remove_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> 	int acl_type;</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='del'>-	struct inode *delegated_inode = NULL;</div><div class='add'>+	struct delegated_inode delegated_inode = { };</div><div class='ctx'> </div><div class='ctx'> 	acl_type = posix_acl_type(acl_name);</div><div class='ctx'> 	if (acl_type &lt; 0)</div><div class='hunk'>@@ -1245,13 +1243,13 @@ retry_deleg:</div><div class='ctx'> 		error = -EIO;</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		fsnotify_xattr(dentry);</div><div class='del'>-		evm_inode_post_remove_acl(idmap, dentry, acl_name);</div><div class='add'>+		security_inode_post_remove_acl(idmap, dentry, acl_name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_inode_unlock:</div><div class='ctx'> 	inode_unlock(inode);</div><div class='ctx'> </div><div class='del'>-	if (delegated_inode) {</div><div class='add'>+	if (is_delegated(&amp;delegated_inode)) {</div><div class='ctx'> 		error = break_deleg_wait(&amp;delegated_inode);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			goto retry_deleg;</div><div class='head'>diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig<br/>index 32b1116ae137..6ae966c561e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/Kconfig</a></div><div class='hunk'>@@ -32,7 +32,7 @@ config PROC_FS</div><div class='ctx'> config PROC_KCORE</div><div class='ctx'> 	bool "/proc/kcore support" if !ARM</div><div class='ctx'> 	depends on PROC_FS &amp;&amp; MMU</div><div class='del'>-	select CRASH_CORE</div><div class='add'>+	select VMCORE_INFO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Provides a virtual ELF core file of the live kernel.  This can</div><div class='ctx'> 	  be read with gdb and other ELF tools.  No modifications can be</div><div class='hunk'>@@ -61,6 +61,25 @@ config PROC_VMCORE_DEVICE_DUMP</div><div class='ctx'> 	  as ELF notes to /proc/vmcore. You can still disable device</div><div class='ctx'> 	  dump using the kernel command line option 'novmcoredd'.</div><div class='ctx'> </div><div class='add'>+config NEED_PROC_VMCORE_DEVICE_RAM</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config PROC_VMCORE_DEVICE_RAM</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on PROC_VMCORE &amp;&amp; NEED_PROC_VMCORE_DEVICE_RAM</div><div class='add'>+	depends on VIRTIO_MEM</div><div class='add'>+	help</div><div class='add'>+	  If the elfcore hdr is allocated and prepared by the dump kernel</div><div class='add'>+	  ("2nd kernel") instead of the crashed kernel, RAM provided by memory</div><div class='add'>+	  devices such as virtio-mem will not be included in the dump</div><div class='add'>+	  image, because only the device driver can properly detect them.</div><div class='add'>+</div><div class='add'>+	  With this config enabled, these RAM ranges will be queried from the</div><div class='add'>+	  device drivers once the device gets probed, so they can be included</div><div class='add'>+	  in the crash dump.</div><div class='add'>+</div><div class='add'>+	  Relevant architectures should select NEED_PROC_VMCORE_DEVICE_RAM.</div><div class='add'>+</div><div class='ctx'> config PROC_SYSCTL</div><div class='ctx'> 	bool "Sysctl support (/proc/sys)" if EXPERT</div><div class='ctx'> 	depends on PROC_FS</div><div class='head'>diff --git a/fs/proc/Makefile b/fs/proc/Makefile<br/>index bd08616ed8ba..7b4db9c56e6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-y   += proc.o</div><div class='ctx'> </div><div class='del'>-CFLAGS_task_mmu.o	+= $(call cc-option,-Wno-override-init,)</div><div class='add'>+CFLAGS_task_mmu.o	+= -Wno-override-init</div><div class='ctx'> proc-y			:= nommu.o task_nommu.o</div><div class='ctx'> proc-$(CONFIG_MMU)	:= task_mmu.o</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/array.c b/fs/proc/array.c<br/>index ff08a8957552..42932f88141a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/array.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/array.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/array.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/array.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ void proc_task_name(struct seq_file *m, struct task_struct *p, bool escape)</div><div class='ctx'> 	else if (p-&gt;flags &amp; PF_KTHREAD)</div><div class='ctx'> 		get_kthread_comm(tcomm, sizeof(tcomm), p);</div><div class='ctx'> 	else</div><div class='del'>-		__get_task_comm(tcomm, sizeof(tcomm), p);</div><div class='add'>+		get_task_comm(tcomm, p);</div><div class='ctx'> </div><div class='ctx'> 	if (escape)</div><div class='ctx'> 		seq_escape_str(m, tcomm, ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");</div><div class='hunk'>@@ -157,13 +157,11 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 	unsigned int max_fds = 0;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	ppid = pid_alive(p) ?</div><div class='del'>-		task_tgid_nr_ns(rcu_dereference(p-&gt;real_parent), ns) : 0;</div><div class='del'>-</div><div class='ctx'> 	tracer = ptrace_parent(p);</div><div class='ctx'> 	if (tracer)</div><div class='ctx'> 		tpid = task_pid_nr_ns(tracer, ns);</div><div class='ctx'> </div><div class='add'>+	ppid = task_ppid_nr_ns(p, ns);</div><div class='ctx'> 	tgid = task_tgid_nr_ns(p, ns);</div><div class='ctx'> 	ngid = task_numa_group_id(p);</div><div class='ctx'> 	cred = get_task_cred(p);</div><div class='hunk'>@@ -422,7 +420,7 @@ static inline void task_thp_status(struct seq_file *m, struct mm_struct *mm)</div><div class='ctx'> 	bool thp_enabled = IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE);</div><div class='ctx'> </div><div class='ctx'> 	if (thp_enabled)</div><div class='del'>-		thp_enabled = !test_bit(MMF_DISABLE_THP, &amp;mm-&gt;flags);</div><div class='add'>+		thp_enabled = !mm_flags_test(MMF_DISABLE_THP_COMPLETELY, mm);</div><div class='ctx'> 	seq_printf(m, "THP_enabled:\t%d\n", thp_enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -477,13 +475,12 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 	int permitted;</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> 	unsigned long long start_time;</div><div class='del'>-	unsigned long cmin_flt = 0, cmaj_flt = 0;</div><div class='del'>-	unsigned long  min_flt = 0,  maj_flt = 0;</div><div class='del'>-	u64 cutime, cstime, utime, stime;</div><div class='del'>-	u64 cgtime, gtime;</div><div class='add'>+	unsigned long cmin_flt, cmaj_flt, min_flt, maj_flt;</div><div class='add'>+	u64 cutime, cstime, cgtime, utime, stime, gtime;</div><div class='ctx'> 	unsigned long rsslim = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int exit_code = task-&gt;exit_code;</div><div class='add'>+	struct signal_struct *sig = task-&gt;signal;</div><div class='ctx'> </div><div class='ctx'> 	state = *get_task_state(task);</div><div class='ctx'> 	vsize = eip = esp = 0;</div><div class='hunk'>@@ -500,7 +497,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 		 * a program is not able to use ptrace(2) in that case. It is</div><div class='ctx'> 		 * safe because the task has stopped executing permanently.</div><div class='ctx'> 		 */</div><div class='del'>-		if (permitted &amp;&amp; (task-&gt;flags &amp; (PF_EXITING|PF_DUMPCORE))) {</div><div class='add'>+		if (permitted &amp;&amp; (task-&gt;flags &amp; (PF_EXITING|PF_DUMPCORE|PF_POSTCOREDUMP))) {</div><div class='ctx'> 			if (try_get_task_stack(task)) {</div><div class='ctx'> 				eip = KSTK_EIP(task);</div><div class='ctx'> 				esp = KSTK_ESP(task);</div><div class='hunk'>@@ -511,12 +508,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> </div><div class='ctx'> 	sigemptyset(&amp;sigign);</div><div class='ctx'> 	sigemptyset(&amp;sigcatch);</div><div class='del'>-	cutime = cstime = utime = stime = 0;</div><div class='del'>-	cgtime = gtime = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (lock_task_sighand(task, &amp;flags)) {</div><div class='del'>-		struct signal_struct *sig = task-&gt;signal;</div><div class='del'>-</div><div class='ctx'> 		if (sig-&gt;tty) {</div><div class='ctx'> 			struct pid *pgrp = tty_get_pgrp(sig-&gt;tty);</div><div class='ctx'> 			tty_pgrp = pid_nr_ns(pgrp, ns);</div><div class='hunk'>@@ -527,28 +520,9 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 		num_threads = get_nr_threads(task);</div><div class='ctx'> 		collect_sigign_sigcatch(task, &amp;sigign, &amp;sigcatch);</div><div class='ctx'> </div><div class='del'>-		cmin_flt = sig-&gt;cmin_flt;</div><div class='del'>-		cmaj_flt = sig-&gt;cmaj_flt;</div><div class='del'>-		cutime = sig-&gt;cutime;</div><div class='del'>-		cstime = sig-&gt;cstime;</div><div class='del'>-		cgtime = sig-&gt;cgtime;</div><div class='ctx'> 		rsslim = READ_ONCE(sig-&gt;rlim[RLIMIT_RSS].rlim_cur);</div><div class='ctx'> </div><div class='del'>-		/* add up live thread stats at the group level */</div><div class='ctx'> 		if (whole) {</div><div class='del'>-			struct task_struct *t;</div><div class='del'>-</div><div class='del'>-			__for_each_thread(sig, t) {</div><div class='del'>-				min_flt += t-&gt;min_flt;</div><div class='del'>-				maj_flt += t-&gt;maj_flt;</div><div class='del'>-				gtime += task_gtime(t);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			min_flt += sig-&gt;min_flt;</div><div class='del'>-			maj_flt += sig-&gt;maj_flt;</div><div class='del'>-			thread_group_cputime_adjusted(task, &amp;utime, &amp;stime);</div><div class='del'>-			gtime += sig-&gt;gtime;</div><div class='del'>-</div><div class='ctx'> 			if (sig-&gt;flags &amp; (SIGNAL_GROUP_EXIT | SIGNAL_STOP_STOPPED))</div><div class='ctx'> 				exit_code = sig-&gt;group_exit_code;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -562,10 +536,37 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> </div><div class='ctx'> 	if (permitted &amp;&amp; (!whole || num_threads &lt; 2))</div><div class='ctx'> 		wchan = !task_is_running(task);</div><div class='del'>-	if (!whole) {</div><div class='add'>+</div><div class='add'>+	scoped_guard(rcu) {</div><div class='add'>+		scoped_seqlock_read (&amp;sig-&gt;stats_lock, ss_lock_irqsave) {</div><div class='add'>+			cmin_flt = sig-&gt;cmin_flt;</div><div class='add'>+			cmaj_flt = sig-&gt;cmaj_flt;</div><div class='add'>+			cutime = sig-&gt;cutime;</div><div class='add'>+			cstime = sig-&gt;cstime;</div><div class='add'>+			cgtime = sig-&gt;cgtime;</div><div class='add'>+</div><div class='add'>+			if (whole) {</div><div class='add'>+				struct task_struct *t;</div><div class='add'>+</div><div class='add'>+				min_flt = sig-&gt;min_flt;</div><div class='add'>+				maj_flt = sig-&gt;maj_flt;</div><div class='add'>+				gtime = sig-&gt;gtime;</div><div class='add'>+</div><div class='add'>+				__for_each_thread(sig, t) {</div><div class='add'>+					min_flt += t-&gt;min_flt;</div><div class='add'>+					maj_flt += t-&gt;maj_flt;</div><div class='add'>+					gtime += task_gtime(t);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (whole) {</div><div class='add'>+		thread_group_cputime_adjusted(task, &amp;utime, &amp;stime);</div><div class='add'>+	} else {</div><div class='add'>+		task_cputime_adjusted(task, &amp;utime, &amp;stime);</div><div class='ctx'> 		min_flt = task-&gt;min_flt;</div><div class='ctx'> 		maj_flt = task-&gt;maj_flt;</div><div class='del'>-		task_cputime_adjusted(task, &amp;utime, &amp;stime);</div><div class='ctx'> 		gtime = task_gtime(task);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/base.c b/fs/proc/base.c<br/>index 98a031ac2648..4eec684baca9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/base.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/base.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/base.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/base.c</a></div><div class='hunk'>@@ -58,7 +58,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/fdtable.h&gt;</div><div class='ctx'> #include &lt;linux/generic-radix-tree.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -85,6 +84,7 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/pid_namespace.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched/autogroup.h&gt;</div><div class='hunk'>@@ -117,6 +117,40 @@</div><div class='ctx'> static u8 nlink_tid __ro_after_init;</div><div class='ctx'> static u8 nlink_tgid __ro_after_init;</div><div class='ctx'> </div><div class='add'>+enum proc_mem_force {</div><div class='add'>+	PROC_MEM_FORCE_ALWAYS,</div><div class='add'>+	PROC_MEM_FORCE_PTRACE,</div><div class='add'>+	PROC_MEM_FORCE_NEVER</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum proc_mem_force proc_mem_force_override __ro_after_init =</div><div class='add'>+	IS_ENABLED(CONFIG_PROC_MEM_NO_FORCE) ? PROC_MEM_FORCE_NEVER :</div><div class='add'>+	IS_ENABLED(CONFIG_PROC_MEM_FORCE_PTRACE) ? PROC_MEM_FORCE_PTRACE :</div><div class='add'>+	PROC_MEM_FORCE_ALWAYS;</div><div class='add'>+</div><div class='add'>+static const struct constant_table proc_mem_force_table[] __initconst = {</div><div class='add'>+	{ "always", PROC_MEM_FORCE_ALWAYS },</div><div class='add'>+	{ "ptrace", PROC_MEM_FORCE_PTRACE },</div><div class='add'>+	{ "never", PROC_MEM_FORCE_NEVER },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init early_proc_mem_force_override(char *buf)</div><div class='add'>+{</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * lookup_constant() defaults to proc_mem_force_override to preseve</div><div class='add'>+	 * the initial Kconfig choice in case an invalid param gets passed.</div><div class='add'>+	 */</div><div class='add'>+	proc_mem_force_override = lookup_constant(proc_mem_force_table,</div><div class='add'>+						  buf, proc_mem_force_override);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("proc_mem.force_override", early_proc_mem_force_override);</div><div class='add'>+</div><div class='ctx'> struct pid_entry {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	unsigned int len;</div><div class='hunk'>@@ -382,7 +416,7 @@ static const struct file_operations proc_pid_cmdline_ops = {</div><div class='ctx'> #ifdef CONFIG_KALLSYMS</div><div class='ctx'> /*</div><div class='ctx'>  * Provides a wchan file via kallsyms in a proper one-value-per-file format.</div><div class='del'>- * Returns the resolved symbol.  If that fails, simply return the address.</div><div class='add'>+ * Returns the resolved symbol to user space.</div><div class='ctx'>  */</div><div class='ctx'> static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 			  struct pid *pid, struct task_struct *task)</div><div class='hunk'>@@ -793,23 +827,31 @@ static const struct file_operations proc_single_file_operations = {</div><div class='ctx'> 	.release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/*</div><div class='add'>+ * proc_mem_open() can return errno, NULL or mm_struct*.</div><div class='add'>+ *</div><div class='add'>+ *   - Returns NULL if the task has no mm (PF_KTHREAD or PF_EXITING)</div><div class='add'>+ *   - Returns mm_struct* on success</div><div class='add'>+ *   - Returns error code on failure</div><div class='add'>+ */</div><div class='ctx'> struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *task = get_proc_task(inode);</div><div class='del'>-	struct mm_struct *mm = ERR_PTR(-ESRCH);</div><div class='add'>+	struct mm_struct *mm;</div><div class='ctx'> </div><div class='del'>-	if (task) {</div><div class='del'>-		mm = mm_access(task, mode | PTRACE_MODE_FSCREDS);</div><div class='del'>-		put_task_struct(task);</div><div class='add'>+	if (!task)</div><div class='add'>+		return ERR_PTR(-ESRCH);</div><div class='ctx'> </div><div class='del'>-		if (!IS_ERR_OR_NULL(mm)) {</div><div class='del'>-			/* ensure this mm_struct can't be freed */</div><div class='del'>-			mmgrab(mm);</div><div class='del'>-			/* but do not pin its memory */</div><div class='del'>-			mmput(mm);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	mm = mm_access(task, mode | PTRACE_MODE_FSCREDS);</div><div class='add'>+	put_task_struct(task);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(mm))</div><div class='add'>+		return mm == ERR_PTR(-ESRCH) ? NULL : mm;</div><div class='add'>+</div><div class='add'>+	/* ensure this mm_struct can't be freed */</div><div class='add'>+	mmgrab(mm);</div><div class='add'>+	/* but do not pin its memory */</div><div class='add'>+	mmput(mm);</div><div class='ctx'> </div><div class='ctx'> 	return mm;</div><div class='ctx'> }</div><div class='hunk'>@@ -818,8 +860,8 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = proc_mem_open(inode, mode);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(mm))</div><div class='del'>-		return PTR_ERR(mm);</div><div class='add'>+	if (IS_ERR_OR_NULL(mm))</div><div class='add'>+		return mm ? PTR_ERR(mm) : -ESRCH;</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = mm;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -827,12 +869,31 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)</div><div class='ctx'> </div><div class='ctx'> static int mem_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int ret = __mem_open(inode, file, PTRACE_MODE_ATTACH);</div><div class='del'>-</div><div class='del'>-	/* OK to pass negative loff_t, we can catch out-of-range */</div><div class='del'>-	file-&gt;f_mode |= FMODE_UNSIGNED_OFFSET;</div><div class='add'>+	if (WARN_ON_ONCE(!(file-&gt;f_op-&gt;fop_flags &amp; FOP_UNSIGNED_OFFSET)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return __mem_open(inode, file, PTRACE_MODE_ATTACH);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+static bool proc_mem_foll_force(struct file *file, struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	bool ptrace_active = false;</div><div class='add'>+</div><div class='add'>+	switch (proc_mem_force_override) {</div><div class='add'>+	case PROC_MEM_FORCE_NEVER:</div><div class='add'>+		return false;</div><div class='add'>+	case PROC_MEM_FORCE_PTRACE:</div><div class='add'>+		task = get_proc_task(file_inode(file));</div><div class='add'>+		if (task) {</div><div class='add'>+			ptrace_active =	READ_ONCE(task-&gt;ptrace) &amp;&amp;</div><div class='add'>+					READ_ONCE(task-&gt;mm) == mm &amp;&amp;</div><div class='add'>+					READ_ONCE(task-&gt;parent) == current;</div><div class='add'>+			put_task_struct(task);</div><div class='add'>+		}</div><div class='add'>+		return ptrace_active;</div><div class='add'>+	default:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t mem_rw(struct file *file, char __user *buf,</div><div class='hunk'>@@ -855,7 +916,9 @@ static ssize_t mem_rw(struct file *file, char __user *buf,</div><div class='ctx'> 	if (!mmget_not_zero(mm))</div><div class='ctx'> 		goto free;</div><div class='ctx'> </div><div class='del'>-	flags = FOLL_FORCE | (write ? FOLL_WRITE : 0);</div><div class='add'>+	flags = write ? FOLL_WRITE : 0;</div><div class='add'>+	if (proc_mem_foll_force(file, mm))</div><div class='add'>+		flags |= FOLL_FORCE;</div><div class='ctx'> </div><div class='ctx'> 	while (count &gt; 0) {</div><div class='ctx'> 		size_t this_len = min_t(size_t, count, PAGE_SIZE);</div><div class='hunk'>@@ -932,6 +995,7 @@ static const struct file_operations proc_mem_operations = {</div><div class='ctx'> 	.write		= mem_write,</div><div class='ctx'> 	.open		= mem_open,</div><div class='ctx'> 	.release	= mem_release,</div><div class='add'>+	.fop_flags	= FOP_UNSIGNED_OFFSET,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int environ_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1099,7 +1163,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy)</div><div class='ctx'> 		struct task_struct *p = find_lock_task_mm(task);</div><div class='ctx'> </div><div class='ctx'> 		if (p) {</div><div class='del'>-			if (test_bit(MMF_MULTIPROCESS, &amp;p-&gt;mm-&gt;flags)) {</div><div class='add'>+			if (mm_flags_test(MMF_MULTIPROCESS, p-&gt;mm)) {</div><div class='ctx'> 				mm = p-&gt;mm;</div><div class='ctx'> 				mmgrab(mm);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1431,7 +1495,6 @@ static const struct file_operations proc_fail_nth_operations = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> /*</div><div class='ctx'>  * Print out various scheduling related per-task fields:</div><div class='ctx'>  */</div><div class='hunk'>@@ -1481,8 +1544,6 @@ static const struct file_operations proc_pid_sched_operations = {</div><div class='ctx'> 	.release	= single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SCHED_AUTOGROUP</div><div class='ctx'> /*</div><div class='ctx'>  * Print out autogroup related information:</div><div class='hunk'>@@ -1878,8 +1939,6 @@ void proc_pid_evict_inode(struct proc_inode *ei)</div><div class='ctx'> 		hlist_del_init_rcu(&amp;ei-&gt;sibling_inodes);</div><div class='ctx'> 		spin_unlock(&amp;pid-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	put_pid(pid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct inode *proc_pid_make_inode(struct super_block *sb,</div><div class='hunk'>@@ -2002,7 +2061,8 @@ void pid_update_inode(struct task_struct *task, struct inode *inode)</div><div class='ctx'>  * performed a setuid(), etc.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int pid_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int pid_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			  struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct task_struct *task;</div><div class='hunk'>@@ -2067,7 +2127,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 	unsigned type = DT_UNKNOWN;</div><div class='ctx'> 	ino_t ino = 1;</div><div class='ctx'> </div><div class='del'>-	child = d_hash_and_lookup(dir, &amp;qname);</div><div class='add'>+	child = try_lookup_noperm(&amp;qname, dir);</div><div class='ctx'> 	if (!child) {</div><div class='ctx'> 		DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);</div><div class='ctx'> 		child = d_alloc_parallel(dir, &amp;qname, &amp;wq);</div><div class='hunk'>@@ -2135,7 +2195,8 @@ static int dname_to_vma_addr(struct dentry *dentry,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int map_files_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int map_files_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				  struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long vm_start, vm_end;</div><div class='ctx'> 	bool exact_vma_exists = false;</div><div class='hunk'>@@ -2153,7 +2214,7 @@ static int map_files_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 		goto out_notask;</div><div class='ctx'> </div><div class='ctx'> 	mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);</div><div class='del'>-	if (IS_ERR_OR_NULL(mm))</div><div class='add'>+	if (IS_ERR(mm))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (!dname_to_vma_addr(dentry, &amp;vm_start, &amp;vm_end)) {</div><div class='hunk'>@@ -2278,8 +2339,8 @@ proc_map_files_instantiate(struct dentry *dentry,</div><div class='ctx'> 	inode-&gt;i_op = &amp;proc_map_files_link_inode_operations;</div><div class='ctx'> 	inode-&gt;i_size = 64;</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;tid_map_files_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return proc_splice_unmountable(inode, dentry,</div><div class='add'>+				       &amp;tid_map_files_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *proc_map_files_lookup(struct inode *dir,</div><div class='hunk'>@@ -2439,11 +2500,9 @@ static const struct file_operations proc_map_files_operations = {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CHECKPOINT_RESTORE) &amp;&amp; defined(CONFIG_POSIX_TIMERS)</div><div class='ctx'> struct timers_private {</div><div class='del'>-	struct pid *pid;</div><div class='del'>-	struct task_struct *task;</div><div class='del'>-	struct sighand_struct *sighand;</div><div class='del'>-	struct pid_namespace *ns;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct pid		*pid;</div><div class='add'>+	struct task_struct	*task;</div><div class='add'>+	struct pid_namespace	*ns;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void *timers_start(struct seq_file *m, loff_t *pos)</div><div class='hunk'>@@ -2454,54 +2513,48 @@ static void *timers_start(struct seq_file *m, loff_t *pos)</div><div class='ctx'> 	if (!tp-&gt;task)</div><div class='ctx'> 		return ERR_PTR(-ESRCH);</div><div class='ctx'> </div><div class='del'>-	tp-&gt;sighand = lock_task_sighand(tp-&gt;task, &amp;tp-&gt;flags);</div><div class='del'>-	if (!tp-&gt;sighand)</div><div class='del'>-		return ERR_PTR(-ESRCH);</div><div class='del'>-</div><div class='del'>-	return seq_list_start(&amp;tp-&gt;task-&gt;signal-&gt;posix_timers, *pos);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	return seq_hlist_start_rcu(&amp;tp-&gt;task-&gt;signal-&gt;posix_timers, *pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *timers_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct timers_private *tp = m-&gt;private;</div><div class='del'>-	return seq_list_next(v, &amp;tp-&gt;task-&gt;signal-&gt;posix_timers, pos);</div><div class='add'>+</div><div class='add'>+	return seq_hlist_next_rcu(v, &amp;tp-&gt;task-&gt;signal-&gt;posix_timers, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void timers_stop(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct timers_private *tp = m-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;sighand) {</div><div class='del'>-		unlock_task_sighand(tp-&gt;task, &amp;tp-&gt;flags);</div><div class='del'>-		tp-&gt;sighand = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (tp-&gt;task) {</div><div class='ctx'> 		put_task_struct(tp-&gt;task);</div><div class='ctx'> 		tp-&gt;task = NULL;</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int show_timer(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='del'>-	struct k_itimer *timer;</div><div class='del'>-	struct timers_private *tp = m-&gt;private;</div><div class='del'>-	int notify;</div><div class='ctx'> 	static const char * const nstr[] = {</div><div class='del'>-		[SIGEV_SIGNAL] = "signal",</div><div class='del'>-		[SIGEV_NONE] = "none",</div><div class='del'>-		[SIGEV_THREAD] = "thread",</div><div class='add'>+		[SIGEV_SIGNAL]	= "signal",</div><div class='add'>+		[SIGEV_NONE]	= "none",</div><div class='add'>+		[SIGEV_THREAD]	= "thread",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	timer = list_entry((struct list_head *)v, struct k_itimer, list);</div><div class='del'>-	notify = timer-&gt;it_sigev_notify;</div><div class='add'>+	struct k_itimer *timer = hlist_entry((struct hlist_node *)v, struct k_itimer, list);</div><div class='add'>+	struct timers_private *tp = m-&gt;private;</div><div class='add'>+	int notify = timer-&gt;it_sigev_notify;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;timer-&gt;it_lock);</div><div class='add'>+	if (!posixtimer_valid(timer))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "ID: %d\n", timer-&gt;it_id);</div><div class='del'>-	seq_printf(m, "signal: %d/%px\n",</div><div class='del'>-		   timer-&gt;sigq-&gt;info.si_signo,</div><div class='del'>-		   timer-&gt;sigq-&gt;info.si_value.sival_ptr);</div><div class='del'>-	seq_printf(m, "notify: %s/%s.%d\n",</div><div class='del'>-		   nstr[notify &amp; ~SIGEV_THREAD_ID],</div><div class='add'>+	seq_printf(m, "signal: %d/%px\n", timer-&gt;sigq.info.si_signo,</div><div class='add'>+		   timer-&gt;sigq.info.si_value.sival_ptr);</div><div class='add'>+	seq_printf(m, "notify: %s/%s.%d\n", nstr[notify &amp; ~SIGEV_THREAD_ID],</div><div class='ctx'> 		   (notify &amp; SIGEV_THREAD_ID) ? "tid" : "pid",</div><div class='ctx'> 		   pid_nr_ns(timer-&gt;it_pid, tp-&gt;ns));</div><div class='ctx'> 	seq_printf(m, "ClockID: %d\n", timer-&gt;it_clock);</div><div class='hunk'>@@ -2571,10 +2624,11 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	task_lock(p);</div><div class='del'>-	if (slack_ns == 0)</div><div class='del'>-		p-&gt;timer_slack_ns = p-&gt;default_timer_slack_ns;</div><div class='del'>-	else</div><div class='del'>-		p-&gt;timer_slack_ns = slack_ns;</div><div class='add'>+	if (rt_or_dl_task_policy(p))</div><div class='add'>+		slack_ns = 0;</div><div class='add'>+	else if (slack_ns == 0)</div><div class='add'>+		slack_ns = p-&gt;default_timer_slack_ns;</div><div class='add'>+	p-&gt;timer_slack_ns = slack_ns;</div><div class='ctx'> 	task_unlock(p);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -2650,8 +2704,7 @@ static struct dentry *proc_pident_instantiate(struct dentry *dentry,</div><div class='ctx'> 		inode-&gt;i_fop = p-&gt;fop;</div><div class='ctx'> 	ei-&gt;op = p-&gt;op;</div><div class='ctx'> 	pid_update_inode(task, inode);</div><div class='del'>-	d_set_d_op(dentry, &amp;pid_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return d_splice_alias_ops(inode, dentry, &amp;pid_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *proc_pident_lookup(struct inode *dir, </div><div class='hunk'>@@ -2909,8 +2962,10 @@ static ssize_t proc_coredump_filter_read(struct file *file, char __user *buf,</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	mm = get_task_mm(task);</div><div class='ctx'> 	if (mm) {</div><div class='add'>+		unsigned long flags = __mm_flags_get_dumpable(mm);</div><div class='add'>+</div><div class='ctx'> 		len = snprintf(buffer, sizeof(buffer), "%08lx\n",</div><div class='del'>-			       ((mm-&gt;flags &amp; MMF_DUMP_FILTER_MASK) &gt;&gt;</div><div class='add'>+			       ((flags &amp; MMF_DUMP_FILTER_MASK) &gt;&gt;</div><div class='ctx'> 				MMF_DUMP_FILTER_SHIFT));</div><div class='ctx'> 		mmput(mm);</div><div class='ctx'> 		ret = simple_read_from_buffer(buf, count, ppos, buffer, len);</div><div class='hunk'>@@ -2949,9 +3004,9 @@ static ssize_t proc_coredump_filter_write(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, mask = 1; i &lt; MMF_DUMP_FILTER_BITS; i++, mask &lt;&lt;= 1) {</div><div class='ctx'> 		if (val &amp; mask)</div><div class='del'>-			set_bit(i + MMF_DUMP_FILTER_SHIFT, &amp;mm-&gt;flags);</div><div class='add'>+			mm_flags_set(i + MMF_DUMP_FILTER_SHIFT, mm);</div><div class='ctx'> 		else</div><div class='del'>-			clear_bit(i + MMF_DUMP_FILTER_SHIFT, &amp;mm-&gt;flags);</div><div class='add'>+			mm_flags_clear(i + MMF_DUMP_FILTER_SHIFT, mm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mmput(mm);</div><div class='hunk'>@@ -2988,21 +3043,14 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh</div><div class='ctx'> 	if (whole) {</div><div class='ctx'> 		struct signal_struct *sig = task-&gt;signal;</div><div class='ctx'> 		struct task_struct *t;</div><div class='del'>-		unsigned int seq = 1;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		do {</div><div class='del'>-			seq++; /* 2 on the 1st/lockless path, otherwise odd */</div><div class='del'>-			flags = read_seqbegin_or_lock_irqsave(&amp;sig-&gt;stats_lock, &amp;seq);</div><div class='ctx'> </div><div class='add'>+		guard(rcu)();</div><div class='add'>+		scoped_seqlock_read (&amp;sig-&gt;stats_lock, ss_lock_irqsave) {</div><div class='ctx'> 			acct = sig-&gt;ioac;</div><div class='ctx'> 			__for_each_thread(sig, t)</div><div class='ctx'> 				task_io_accounting_add(&amp;acct, &amp;t-&gt;ioac);</div><div class='ctx'> </div><div class='del'>-		} while (need_seqretry(&amp;sig-&gt;stats_lock, seq));</div><div class='del'>-		done_seqretry_irqrestore(&amp;sig-&gt;stats_lock, seq, flags);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		acct = task-&gt;ioac;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3212,13 +3260,24 @@ static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 				struct pid *pid, struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mm = get_task_mm(task);</div><div class='ctx'> 	if (mm) {</div><div class='ctx'> 		seq_printf(m, "ksm_rmap_items %lu\n", mm-&gt;ksm_rmap_items);</div><div class='del'>-		seq_printf(m, "ksm_zero_pages %lu\n", mm-&gt;ksm_zero_pages);</div><div class='add'>+		seq_printf(m, "ksm_zero_pages %ld\n", mm_ksm_zero_pages(mm));</div><div class='ctx'> 		seq_printf(m, "ksm_merging_pages %lu\n", mm-&gt;ksm_merging_pages);</div><div class='ctx'> 		seq_printf(m, "ksm_process_profit %ld\n", ksm_process_profit(mm));</div><div class='add'>+		seq_printf(m, "ksm_merge_any: %s\n",</div><div class='add'>+				mm_flags_test(MMF_VM_MERGE_ANY, mm) ? "yes" : "no");</div><div class='add'>+		ret = mmap_read_lock_killable(mm);</div><div class='add'>+		if (ret) {</div><div class='add'>+			mmput(mm);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		seq_printf(m, "ksm_mergeable: %s\n",</div><div class='add'>+				ksm_process_mergeable(mm) ? "yes" : "no");</div><div class='add'>+		mmap_read_unlock(mm);</div><div class='ctx'> 		mmput(mm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3226,7 +3285,7 @@ static int proc_pid_ksm_stat(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_KSM */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_STACKLEAK_METRICS</div><div class='add'>+#ifdef CONFIG_KSTACK_ERASE_METRICS</div><div class='ctx'> static int proc_stack_depth(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 				struct pid *pid, struct task_struct *task)</div><div class='ctx'> {</div><div class='hunk'>@@ -3239,7 +3298,7 @@ static int proc_stack_depth(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 							prev_depth, depth);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_STACKLEAK_METRICS */</div><div class='add'>+#endif /* CONFIG_KSTACK_ERASE_METRICS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Thread groups</div><div class='hunk'>@@ -3261,9 +3320,7 @@ static const struct pid_entry tgid_base_stuff[] = {</div><div class='ctx'> 	ONE("status",     S_IRUGO, proc_pid_status),</div><div class='ctx'> 	ONE("personality", S_IRUSR, proc_pid_personality),</div><div class='ctx'> 	ONE("limits",	  S_IRUGO, proc_pid_limits),</div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> 	REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_SCHED_AUTOGROUP</div><div class='ctx'> 	REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3348,7 +3405,7 @@ static const struct pid_entry tgid_base_stuff[] = {</div><div class='ctx'> #ifdef CONFIG_LIVEPATCH</div><div class='ctx'> 	ONE("patch_state",  S_IRUSR, proc_pid_patch_state),</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_STACKLEAK_METRICS</div><div class='add'>+#ifdef CONFIG_KSTACK_ERASE_METRICS</div><div class='ctx'> 	ONE("stack_depth", S_IRUGO, proc_stack_depth),</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PROC_PID_ARCH_STATUS</div><div class='hunk'>@@ -3438,8 +3495,7 @@ static struct dentry *proc_pid_instantiate(struct dentry * dentry,</div><div class='ctx'> 	set_nlink(inode, nlink_tgid);</div><div class='ctx'> 	pid_update_inode(task, inode);</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;pid_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return d_splice_alias_ops(inode, dentry, &amp;pid_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dentry *proc_pid_lookup(struct dentry *dentry, unsigned int flags)</div><div class='hunk'>@@ -3522,14 +3578,12 @@ int proc_pid_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pos == TGID_OFFSET - 2) {</div><div class='del'>-		struct inode *inode = d_inode(fs_info-&gt;proc_self);</div><div class='del'>-		if (!dir_emit(ctx, "self", 4, inode-&gt;i_ino, DT_LNK))</div><div class='add'>+		if (!dir_emit(ctx, "self", 4, self_inum, DT_LNK))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		ctx-&gt;pos = pos = pos + 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pos == TGID_OFFSET - 1) {</div><div class='del'>-		struct inode *inode = d_inode(fs_info-&gt;proc_thread_self);</div><div class='del'>-		if (!dir_emit(ctx, "thread-self", 11, inode-&gt;i_ino, DT_LNK))</div><div class='add'>+		if (!dir_emit(ctx, "thread-self", 11, thread_self_inum, DT_LNK))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		ctx-&gt;pos = pos = pos + 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3612,9 +3666,7 @@ static const struct pid_entry tid_base_stuff[] = {</div><div class='ctx'> 	ONE("status",    S_IRUGO, proc_pid_status),</div><div class='ctx'> 	ONE("personality", S_IRUSR, proc_pid_personality),</div><div class='ctx'> 	ONE("limits",	 S_IRUGO, proc_pid_limits),</div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> 	REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),</div><div class='del'>-#endif</div><div class='ctx'> 	NOD("comm",      S_IFREG|S_IRUGO|S_IWUSR,</div><div class='ctx'> 			 &amp;proc_tid_comm_inode_operations,</div><div class='ctx'> 			 &amp;proc_pid_set_comm_operations, {}),</div><div class='hunk'>@@ -3743,8 +3795,7 @@ static struct dentry *proc_task_instantiate(struct dentry *dentry,</div><div class='ctx'> 	set_nlink(inode, nlink_tid);</div><div class='ctx'> 	pid_update_inode(task, inode);</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;pid_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return d_splice_alias_ops(inode, dentry, &amp;pid_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)</div><div class='hunk'>@@ -3872,12 +3923,12 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	if (!dir_emit_dots(file, ctx))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* f_version caches the tgid value that the last readdir call couldn't</div><div class='del'>-	 * return. lseek aka telldir automagically resets f_version to 0.</div><div class='add'>+	/* We cache the tgid value that the last readdir call couldn't</div><div class='add'>+	 * return and lseek resets it to 0.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ns = proc_pid_ns(inode-&gt;i_sb);</div><div class='del'>-	tid = (int)file-&gt;f_version;</div><div class='del'>-	file-&gt;f_version = 0;</div><div class='add'>+	tid = (int)(intptr_t)file-&gt;private_data;</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='ctx'> 	for (task = first_tid(proc_pid(inode), tid, ctx-&gt;pos - 2, ns);</div><div class='ctx'> 	     task;</div><div class='ctx'> 	     task = next_tid(task), ctx-&gt;pos++) {</div><div class='hunk'>@@ -3887,12 +3938,12 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 		tid = task_pid_nr_ns(task, ns);</div><div class='ctx'> 		if (!tid)</div><div class='ctx'> 			continue;	/* The task has just exited. */</div><div class='del'>-		len = snprintf(name, sizeof(name), "%u", tid);</div><div class='add'>+		len = snprintf(name, sizeof(name), "%d", tid);</div><div class='ctx'> 		if (!proc_fill_cache(file, ctx, name, len,</div><div class='ctx'> 				proc_task_instantiate, task, NULL)) {</div><div class='ctx'> 			/* returning this tgid failed, save it as the first</div><div class='ctx'> 			 * pid for the next readir call */</div><div class='del'>-			file-&gt;f_version = (u64)tid;</div><div class='add'>+			file-&gt;private_data = (void *)(intptr_t)tid;</div><div class='ctx'> 			put_task_struct(task);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3917,6 +3968,24 @@ static int proc_task_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * proc_task_readdir() set @file-&gt;private_data to a positive integer</div><div class='add'>+ * value, so casting that to u64 is safe. generic_llseek_cookie() will</div><div class='add'>+ * set @cookie to 0, so casting to an int is safe. The WARN_ON_ONCE() is</div><div class='add'>+ * here to catch any unexpected change in behavior either in</div><div class='add'>+ * proc_task_readdir() or generic_llseek_cookie().</div><div class='add'>+ */</div><div class='add'>+static loff_t proc_dir_llseek(struct file *file, loff_t offset, int whence)</div><div class='add'>+{</div><div class='add'>+	u64 cookie = (u64)(intptr_t)file-&gt;private_data;</div><div class='add'>+	loff_t off;</div><div class='add'>+</div><div class='add'>+	off = generic_llseek_cookie(file, offset, whence, &amp;cookie);</div><div class='add'>+	WARN_ON_ONCE(cookie &gt; INT_MAX);</div><div class='add'>+	file-&gt;private_data = (void *)(intptr_t)cookie; /* serialized by f_pos_lock */</div><div class='add'>+	return off;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct inode_operations proc_task_inode_operations = {</div><div class='ctx'> 	.lookup		= proc_task_lookup,</div><div class='ctx'> 	.getattr	= proc_task_getattr,</div><div class='hunk'>@@ -3927,7 +3996,7 @@ static const struct inode_operations proc_task_inode_operations = {</div><div class='ctx'> static const struct file_operations proc_task_operations = {</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='ctx'> 	.iterate_shared	= proc_task_readdir,</div><div class='del'>-	.llseek		= generic_file_llseek,</div><div class='add'>+	.llseek		= proc_dir_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init set_proc_pid_nlink(void)</div><div class='head'>diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c<br/>index 902b326e1e56..87dcaae32ff8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/bootconfig.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/bootconfig.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/bootconfig.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/bootconfig.c</a></div><div class='hunk'>@@ -62,12 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)</div><div class='ctx'> 				break;</div><div class='ctx'> 			dst += ret;</div><div class='ctx'> 		}</div><div class='del'>-		if (ret &gt;= 0 &amp;&amp; boot_command_line[0]) {</div><div class='del'>-			ret = snprintf(dst, rest(dst, end), "# Parameters from bootloader:\n# %s\n",</div><div class='del'>-				       boot_command_line);</div><div class='del'>-			if (ret &gt; 0)</div><div class='del'>-				dst += ret;</div><div class='del'>-		}</div><div class='add'>+	}</div><div class='add'>+	if (cmdline_has_extra_options() &amp;&amp; ret &gt;= 0 &amp;&amp; boot_command_line[0]) {</div><div class='add'>+		ret = snprintf(dst, rest(dst, end), "# Parameters from bootloader:\n# %s\n",</div><div class='add'>+			       boot_command_line);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			dst += ret;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(key);</div><div class='head'>diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c<br/>index e0758fe7936d..b7cab1ad990d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/consoles.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/consoles.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/consoles.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/consoles.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@ static int show_console_dev(struct seq_file *m, void *v)</div><div class='ctx'> 		{ CON_ENABLED,		'E' },</div><div class='ctx'> 		{ CON_CONSDEV,		'C' },</div><div class='ctx'> 		{ CON_BOOT,		'B' },</div><div class='add'>+		{ CON_NBCON,		'N' },</div><div class='ctx'> 		{ CON_PRINTBUFFER,	'p' },</div><div class='ctx'> 		{ CON_BRL,		'b' },</div><div class='ctx'> 		{ CON_ANYTIME,		'a' },</div><div class='hunk'>@@ -58,8 +59,8 @@ static int show_console_dev(struct seq_file *m, void *v)</div><div class='ctx'> 	seq_printf(m, "%s%d", con-&gt;name, con-&gt;index);</div><div class='ctx'> 	seq_pad(m, ' ');</div><div class='ctx'> 	seq_printf(m, "%c%c%c (%s)", con-&gt;read ? 'R' : '-',</div><div class='del'>-			con-&gt;write ? 'W' : '-', con-&gt;unblank ? 'U' : '-',</div><div class='del'>-			flags);</div><div class='add'>+		   ((con-&gt;flags &amp; CON_NBCON) || con-&gt;write) ? 'W' : '-',</div><div class='add'>+		   con-&gt;unblank ? 'U' : '-', flags);</div><div class='ctx'> 	if (dev)</div><div class='ctx'> 		seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +69,7 @@ static int show_console_dev(struct seq_file *m, void *v)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *c_start(struct seq_file *m, loff_t *pos)</div><div class='add'>+	__acquires(&amp;console_mutex)</div><div class='ctx'> {</div><div class='ctx'> 	struct console *con;</div><div class='ctx'> 	loff_t off = 0;</div><div class='hunk'>@@ -94,6 +96,7 @@ static void *c_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c_stop(struct seq_file *m, void *v)</div><div class='add'>+	__releases(&amp;console_mutex)</div><div class='ctx'> {</div><div class='ctx'> 	console_list_unlock();</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/proc/fd.c b/fs/proc/fd.c<br/>index 6e72e5ad42bc..9eeccff49b2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/fd.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/fd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/fd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/fd.c</a></div><div class='hunk'>@@ -39,10 +39,8 @@ static int seq_show(struct seq_file *m, void *v)</div><div class='ctx'> 		spin_lock(&amp;files-&gt;file_lock);</div><div class='ctx'> 		file = files_lookup_fd_locked(files, fd);</div><div class='ctx'> 		if (file) {</div><div class='del'>-			struct fdtable *fdt = files_fdtable(files);</div><div class='del'>-</div><div class='ctx'> 			f_flags = file-&gt;f_flags;</div><div class='del'>-			if (close_on_exec(fd, fdt))</div><div class='add'>+			if (close_on_exec(fd, files))</div><div class='ctx'> 				f_flags |= O_CLOEXEC;</div><div class='ctx'> </div><div class='ctx'> 			get_file(file);</div><div class='hunk'>@@ -61,7 +59,7 @@ static int seq_show(struct seq_file *m, void *v)</div><div class='ctx'> 		   real_mount(file-&gt;f_path.mnt)-&gt;mnt_id,</div><div class='ctx'> 		   file_inode(file)-&gt;i_ino);</div><div class='ctx'> </div><div class='del'>-	/* show_fd_locks() never deferences files so a stale value is safe */</div><div class='add'>+	/* show_fd_locks() never dereferences files, so a stale value is safe */</div><div class='ctx'> 	show_fd_locks(m, file, files);</div><div class='ctx'> 	if (seq_has_overflowed(m))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -74,7 +72,18 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_fdinfo_access_allowed(struct inode *inode)</div><div class='add'>+static int seq_fdinfo_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, seq_show, inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shared /proc/pid/fdinfo and /proc/pid/fdinfo/fd permission helper to ensure</div><div class='add'>+ * that the current task has PTRACE_MODE_READ in addition to the normal</div><div class='add'>+ * POSIX-like checks.</div><div class='add'>+ */</div><div class='add'>+static int proc_fdinfo_permission(struct mnt_idmap *idmap, struct inode *inode,</div><div class='add'>+				  int mask)</div><div class='ctx'> {</div><div class='ctx'> 	bool allowed = false;</div><div class='ctx'> 	struct task_struct *task = get_proc_task(inode);</div><div class='hunk'>@@ -88,18 +97,13 @@ static int proc_fdinfo_access_allowed(struct inode *inode)</div><div class='ctx'> 	if (!allowed)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return generic_permission(idmap, inode, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seq_fdinfo_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret = proc_fdinfo_access_allowed(inode);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return single_open(file, seq_show, inode);</div><div class='del'>-}</div><div class='add'>+static const struct inode_operations proc_fdinfo_file_inode_operations = {</div><div class='add'>+	.permission	= proc_fdinfo_permission,</div><div class='add'>+	.setattr	= proc_setattr,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations proc_fdinfo_file_operations = {</div><div class='ctx'> 	.open		= seq_fdinfo_open,</div><div class='hunk'>@@ -112,9 +116,7 @@ static bool tid_fd_mode(struct task_struct *task, unsigned fd, fmode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	file = task_lookup_fdget_rcu(task, fd);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	file = fget_task(task, fd);</div><div class='ctx'> 	if (file) {</div><div class='ctx'> 		*mode = file-&gt;f_mode;</div><div class='ctx'> 		fput(file);</div><div class='hunk'>@@ -138,7 +140,8 @@ static void tid_fd_update_inode(struct task_struct *task, struct inode *inode,</div><div class='ctx'> 	security_task_to_inode(task, inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tid_fd_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int tid_fd_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			     struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *task;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -216,8 +219,8 @@ static struct dentry *proc_fd_instantiate(struct dentry *dentry,</div><div class='ctx'> 	ei-&gt;op.proc_get_link = proc_fd_link;</div><div class='ctx'> 	tid_fd_update_inode(task, inode, data-&gt;mode);</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;tid_fd_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return proc_splice_unmountable(inode, dentry,</div><div class='add'>+				       &amp;tid_fd_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *proc_lookupfd_common(struct inode *dir,</div><div class='hunk'>@@ -254,19 +257,17 @@ static int proc_readfd_common(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 	if (!dir_emit_dots(file, ctx))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	for (fd = ctx-&gt;pos - 2;; fd++) {</div><div class='ctx'> 		struct file *f;</div><div class='ctx'> 		struct fd_data data;</div><div class='ctx'> 		char name[10 + 1];</div><div class='ctx'> 		unsigned int len;</div><div class='ctx'> </div><div class='del'>-		f = task_lookup_next_fdget_rcu(p, &amp;fd);</div><div class='add'>+		f = fget_task_next(p, &amp;fd);</div><div class='ctx'> 		ctx-&gt;pos = fd + 2LL;</div><div class='ctx'> 		if (!f)</div><div class='ctx'> 			break;</div><div class='ctx'> 		data.mode = f-&gt;f_mode;</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 		fput(f);</div><div class='ctx'> 		data.fd = fd;</div><div class='ctx'> </div><div class='hunk'>@@ -274,11 +275,9 @@ static int proc_readfd_common(struct file *file, struct dir_context *ctx,</div><div class='ctx'> 		if (!proc_fill_cache(file, ctx,</div><div class='ctx'> 				     name, len, instantiate, p,</div><div class='ctx'> 				     &amp;data))</div><div class='del'>-			goto out;</div><div class='add'>+			break;</div><div class='ctx'> 		cond_resched();</div><div class='del'>-		rcu_read_lock();</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> out:</div><div class='ctx'> 	put_task_struct(p);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -308,14 +307,14 @@ static int proc_readfd_count(struct inode *inode, loff_t *count)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_readfd(struct file *file, struct dir_context *ctx)</div><div class='add'>+static int proc_fd_iterate(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return proc_readfd_common(file, ctx, proc_fd_instantiate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct file_operations proc_fd_operations = {</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='del'>-	.iterate_shared	= proc_readfd,</div><div class='add'>+	.iterate_shared	= proc_fd_iterate,</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -353,18 +352,9 @@ static int proc_fd_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> 			u32 request_mask, unsigned int query_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='del'>-	int rv = 0;</div><div class='ctx'> </div><div class='ctx'> 	generic_fillattr(&amp;nop_mnt_idmap, request_mask, inode, stat);</div><div class='del'>-</div><div class='del'>-	/* If it's a directory, put the number of open fds there */</div><div class='del'>-	if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-		rv = proc_readfd_count(inode, &amp;stat-&gt;size);</div><div class='del'>-		if (rv &lt; 0)</div><div class='del'>-			return rv;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='add'>+	return proc_readfd_count(inode, &amp;stat-&gt;size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct inode_operations proc_fd_inode_operations = {</div><div class='hunk'>@@ -388,11 +378,13 @@ static struct dentry *proc_fdinfo_instantiate(struct dentry *dentry,</div><div class='ctx'> 	ei = PROC_I(inode);</div><div class='ctx'> 	ei-&gt;fd = data-&gt;fd;</div><div class='ctx'> </div><div class='add'>+	inode-&gt;i_op = &amp;proc_fdinfo_file_inode_operations;</div><div class='add'>+</div><div class='ctx'> 	inode-&gt;i_fop = &amp;proc_fdinfo_file_operations;</div><div class='ctx'> 	tid_fd_update_inode(task, inode, 0);</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;tid_fd_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return proc_splice_unmountable(inode, dentry,</div><div class='add'>+				       &amp;tid_fd_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dentry *</div><div class='hunk'>@@ -401,30 +393,20 @@ proc_lookupfdinfo(struct inode *dir, struct dentry *dentry, unsigned int flags)</div><div class='ctx'> 	return proc_lookupfd_common(dir, dentry, proc_fdinfo_instantiate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_readfdinfo(struct file *file, struct dir_context *ctx)</div><div class='add'>+static int proc_fdinfo_iterate(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return proc_readfd_common(file, ctx,</div><div class='ctx'> 				  proc_fdinfo_instantiate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_open_fdinfo(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret = proc_fdinfo_access_allowed(inode);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const struct inode_operations proc_fdinfo_inode_operations = {</div><div class='ctx'> 	.lookup		= proc_lookupfdinfo,</div><div class='add'>+	.permission	= proc_fdinfo_permission,</div><div class='ctx'> 	.setattr	= proc_setattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct file_operations proc_fdinfo_operations = {</div><div class='del'>-	.open		= proc_open_fdinfo,</div><div class='ctx'> 	.read		= generic_read_dir,</div><div class='del'>-	.iterate_shared	= proc_readfdinfo,</div><div class='add'>+	.iterate_shared	= proc_fdinfo_iterate,</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/proc/generic.c b/fs/proc/generic.c<br/>index 775ce0bcf08c..501889856461 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/generic.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/generic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/generic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/generic.c</a></div><div class='hunk'>@@ -202,8 +202,8 @@ int proc_alloc_inum(unsigned int *inum)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	i = ida_simple_get(&amp;proc_inum_ida, 0, UINT_MAX - PROC_DYNAMIC_FIRST + 1,</div><div class='del'>-			   GFP_KERNEL);</div><div class='add'>+	i = ida_alloc_max(&amp;proc_inum_ida, UINT_MAX - PROC_DYNAMIC_FIRST,</div><div class='add'>+			  GFP_KERNEL);</div><div class='ctx'> 	if (i &lt; 0)</div><div class='ctx'> 		return i;</div><div class='ctx'> </div><div class='hunk'>@@ -213,10 +213,11 @@ int proc_alloc_inum(unsigned int *inum)</div><div class='ctx'> </div><div class='ctx'> void proc_free_inum(unsigned int inum)</div><div class='ctx'> {</div><div class='del'>-	ida_simple_remove(&amp;proc_inum_ida, inum - PROC_DYNAMIC_FIRST);</div><div class='add'>+	ida_free(&amp;proc_inum_ida, inum - PROC_DYNAMIC_FIRST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int proc_misc_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int proc_misc_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				  struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='hunk'>@@ -253,8 +254,11 @@ struct dentry *proc_lookup_de(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 		inode = proc_get_inode(dir-&gt;i_sb, de);</div><div class='ctx'> 		if (!inode)</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='del'>-		d_set_d_op(dentry, de-&gt;proc_dops);</div><div class='del'>-		return d_splice_alias(inode, dentry);</div><div class='add'>+		if (de-&gt;flags &amp; PROC_ENTRY_FORCE_LOOKUP)</div><div class='add'>+			return d_splice_alias_ops(inode, dentry,</div><div class='add'>+						  &amp;proc_net_dentry_ops);</div><div class='add'>+		return d_splice_alias_ops(inode, dentry,</div><div class='add'>+					  &amp;proc_misc_dentry_ops);</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;proc_subdir_lock);</div><div class='ctx'> 	return ERR_PTR(-ENOENT);</div><div class='hunk'>@@ -343,7 +347,8 @@ static const struct file_operations proc_dir_operations = {</div><div class='ctx'> 	.iterate_shared		= proc_readdir,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int proc_net_d_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int proc_net_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				 struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -362,6 +367,25 @@ static const struct inode_operations proc_dir_inode_operations = {</div><div class='ctx'> 	.setattr	= proc_notify_change,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void pde_set_flags(struct proc_dir_entry *pde)</div><div class='add'>+{</div><div class='add'>+	const struct proc_ops *proc_ops = pde-&gt;proc_ops;</div><div class='add'>+</div><div class='add'>+	if (!proc_ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (proc_ops-&gt;proc_flags &amp; PROC_ENTRY_PERMANENT)</div><div class='add'>+		pde-&gt;flags |= PROC_ENTRY_PERMANENT;</div><div class='add'>+	if (proc_ops-&gt;proc_read_iter)</div><div class='add'>+		pde-&gt;flags |= PROC_ENTRY_proc_read_iter;</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	if (proc_ops-&gt;proc_compat_ioctl)</div><div class='add'>+		pde-&gt;flags |= PROC_ENTRY_proc_compat_ioctl;</div><div class='add'>+#endif</div><div class='add'>+	if (proc_ops-&gt;proc_lseek)</div><div class='add'>+		pde-&gt;flags |= PROC_ENTRY_proc_lseek;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* returns the registered entry, or frees dp and returns NULL on failure */</div><div class='ctx'> struct proc_dir_entry *proc_register(struct proc_dir_entry *dir,</div><div class='ctx'> 		struct proc_dir_entry *dp)</div><div class='hunk'>@@ -369,6 +393,9 @@ struct proc_dir_entry *proc_register(struct proc_dir_entry *dir,</div><div class='ctx'> 	if (proc_alloc_inum(&amp;dp-&gt;low_ino))</div><div class='ctx'> 		goto out_free_entry;</div><div class='ctx'> </div><div class='add'>+	if (!S_ISDIR(dp-&gt;mode))</div><div class='add'>+		pde_set_flags(dp);</div><div class='add'>+</div><div class='ctx'> 	write_lock(&amp;proc_subdir_lock);</div><div class='ctx'> 	dp-&gt;parent = dir;</div><div class='ctx'> 	if (pde_subdir_insert(dir, dp) == false) {</div><div class='hunk'>@@ -446,9 +473,8 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ent-&gt;pde_openers);</div><div class='ctx'> 	proc_set_user(ent, (*parent)-&gt;uid, (*parent)-&gt;gid);</div><div class='ctx'> </div><div class='del'>-	ent-&gt;proc_dops = &amp;proc_misc_dentry_ops;</div><div class='ctx'> 	/* Revalidate everything under /proc/${pid}/net */</div><div class='del'>-	if ((*parent)-&gt;proc_dops == &amp;proc_net_dentry_ops)</div><div class='add'>+	if ((*parent)-&gt;flags &amp; PROC_ENTRY_FORCE_LOOKUP)</div><div class='ctx'> 		pde_force_lookup(ent);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -464,9 +490,9 @@ struct proc_dir_entry *proc_symlink(const char *name,</div><div class='ctx'> 			  (S_IFLNK | S_IRUGO | S_IWUGO | S_IXUGO),1);</div><div class='ctx'> </div><div class='ctx'> 	if (ent) {</div><div class='del'>-		ent-&gt;data = kmalloc((ent-&gt;size=strlen(dest))+1, GFP_KERNEL);</div><div class='add'>+		ent-&gt;size = strlen(dest);</div><div class='add'>+		ent-&gt;data = kmemdup(dest, ent-&gt;size + 1, GFP_KERNEL);</div><div class='ctx'> 		if (ent-&gt;data) {</div><div class='del'>-			strcpy((char*)ent-&gt;data,dest);</div><div class='ctx'> 			ent-&gt;proc_iops = &amp;proc_link_inode_operations;</div><div class='ctx'> 			ent = proc_register(parent, ent);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -557,12 +583,6 @@ struct proc_dir_entry *proc_create_reg(const char *name, umode_t mode,</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pde_set_flags(struct proc_dir_entry *pde)</div><div class='del'>-{</div><div class='del'>-	if (pde-&gt;proc_ops-&gt;proc_flags &amp; PROC_ENTRY_PERMANENT)</div><div class='del'>-		pde-&gt;flags |= PROC_ENTRY_PERMANENT;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,</div><div class='ctx'> 		struct proc_dir_entry *parent,</div><div class='ctx'> 		const struct proc_ops *proc_ops, void *data)</div><div class='hunk'>@@ -573,7 +593,6 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,</div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	p-&gt;proc_ops = proc_ops;</div><div class='del'>-	pde_set_flags(p);</div><div class='ctx'> 	return proc_register(parent, p);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(proc_create_data);</div><div class='hunk'>@@ -679,6 +698,12 @@ void pde_put(struct proc_dir_entry *pde)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void pde_erase(struct proc_dir_entry *pde, struct proc_dir_entry *parent)</div><div class='add'>+{</div><div class='add'>+	rb_erase(&amp;pde-&gt;subdir_node, &amp;parent-&gt;subdir);</div><div class='add'>+	RB_CLEAR_NODE(&amp;pde-&gt;subdir_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Remove a /proc entry and free it if it's not currently in use.</div><div class='ctx'>  */</div><div class='hunk'>@@ -701,7 +726,7 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)</div><div class='ctx'> 			WARN(1, "removing permanent /proc entry '%s'", de-&gt;name);</div><div class='ctx'> 			de = NULL;</div><div class='ctx'> 		} else {</div><div class='del'>-			rb_erase(&amp;de-&gt;subdir_node, &amp;parent-&gt;subdir);</div><div class='add'>+			pde_erase(de, parent);</div><div class='ctx'> 			if (S_ISDIR(de-&gt;mode))</div><div class='ctx'> 				parent-&gt;nlink--;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -745,7 +770,7 @@ int remove_proc_subtree(const char *name, struct proc_dir_entry *parent)</div><div class='ctx'> 			root-&gt;parent-&gt;name, root-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	rb_erase(&amp;root-&gt;subdir_node, &amp;parent-&gt;subdir);</div><div class='add'>+	pde_erase(root, parent);</div><div class='ctx'> </div><div class='ctx'> 	de = root;</div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -757,7 +782,7 @@ int remove_proc_subtree(const char *name, struct proc_dir_entry *parent)</div><div class='ctx'> 					next-&gt;parent-&gt;name, next-&gt;name);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			rb_erase(&amp;next-&gt;subdir_node, &amp;de-&gt;subdir);</div><div class='add'>+			pde_erase(next, de);</div><div class='ctx'> 			de = next;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/fs/proc/inode.c b/fs/proc/inode.c<br/>index b33e490e3fd9..b7634f975d98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/inode.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> </div><div class='ctx'> static void proc_evict_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct proc_dir_entry *de;</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='ctx'> 	struct proc_inode *ei = PROC_I(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -38,21 +37,12 @@ static void proc_evict_inode(struct inode *inode)</div><div class='ctx'> 	clear_inode(inode);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop tracking associated processes */</div><div class='del'>-	if (ei-&gt;pid) {</div><div class='add'>+	if (ei-&gt;pid)</div><div class='ctx'> 		proc_pid_evict_inode(ei);</div><div class='del'>-		ei-&gt;pid = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Let go of any associated proc directory entry */</div><div class='del'>-	de = ei-&gt;pde;</div><div class='del'>-	if (de) {</div><div class='del'>-		pde_put(de);</div><div class='del'>-		ei-&gt;pde = NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	head = ei-&gt;sysctl;</div><div class='ctx'> 	if (head) {</div><div class='del'>-		RCU_INIT_POINTER(ei-&gt;sysctl, NULL);</div><div class='add'>+		WRITE_ONCE(ei-&gt;sysctl, NULL);</div><div class='ctx'> 		proc_sys_evict_inode(inode, head);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -80,6 +70,13 @@ static struct inode *proc_alloc_inode(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> static void proc_free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct proc_inode *ei = PROC_I(inode);</div><div class='add'>+</div><div class='add'>+	if (ei-&gt;pid)</div><div class='add'>+		put_pid(ei-&gt;pid);</div><div class='add'>+	/* Let go of any associated proc directory entry */</div><div class='add'>+	if (ei-&gt;pde)</div><div class='add'>+		pde_put(ei-&gt;pde);</div><div class='ctx'> 	kmem_cache_free(proc_inode_cachep, PROC_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +92,7 @@ void __init proc_init_kmemcache(void)</div><div class='ctx'> 	proc_inode_cachep = kmem_cache_create("proc_inode_cache",</div><div class='ctx'> 					     sizeof(struct proc_inode),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT|</div><div class='add'>+						SLAB_ACCOUNT|</div><div class='ctx'> 						SLAB_PANIC),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	pde_opener_cache =</div><div class='hunk'>@@ -190,7 +187,7 @@ static int proc_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> const struct super_operations proc_sops = {</div><div class='ctx'> 	.alloc_inode	= proc_alloc_inode,</div><div class='ctx'> 	.free_inode	= proc_free_inode,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.evict_inode	= proc_evict_inode,</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='ctx'> 	.show_options	= proc_show_options,</div><div class='hunk'>@@ -306,9 +303,7 @@ static ssize_t proc_reg_read_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> </div><div class='ctx'> static ssize_t pde_read(struct proc_dir_entry *pde, struct file *file, char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_read) read;</div><div class='del'>-</div><div class='del'>-	read = pde-&gt;proc_ops-&gt;proc_read;</div><div class='add'>+	const auto read = pde-&gt;proc_ops-&gt;proc_read;</div><div class='ctx'> 	if (read)</div><div class='ctx'> 		return read(file, buf, count, ppos);</div><div class='ctx'> 	return -EIO;</div><div class='hunk'>@@ -330,9 +325,7 @@ static ssize_t proc_reg_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> </div><div class='ctx'> static ssize_t pde_write(struct proc_dir_entry *pde, struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_write) write;</div><div class='del'>-</div><div class='del'>-	write = pde-&gt;proc_ops-&gt;proc_write;</div><div class='add'>+	const auto write = pde-&gt;proc_ops-&gt;proc_write;</div><div class='ctx'> 	if (write)</div><div class='ctx'> 		return write(file, buf, count, ppos);</div><div class='ctx'> 	return -EIO;</div><div class='hunk'>@@ -354,9 +347,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t</div><div class='ctx'> </div><div class='ctx'> static __poll_t pde_poll(struct proc_dir_entry *pde, struct file *file, struct poll_table_struct *pts)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_poll) poll;</div><div class='del'>-</div><div class='del'>-	poll = pde-&gt;proc_ops-&gt;proc_poll;</div><div class='add'>+	const auto poll = pde-&gt;proc_ops-&gt;proc_poll;</div><div class='ctx'> 	if (poll)</div><div class='ctx'> 		return poll(file, pts);</div><div class='ctx'> 	return DEFAULT_POLLMASK;</div><div class='hunk'>@@ -378,9 +369,7 @@ static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts)</div><div class='ctx'> </div><div class='ctx'> static long pde_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_ioctl) ioctl;</div><div class='del'>-</div><div class='del'>-	ioctl = pde-&gt;proc_ops-&gt;proc_ioctl;</div><div class='add'>+	const auto ioctl = pde-&gt;proc_ops-&gt;proc_ioctl;</div><div class='ctx'> 	if (ioctl)</div><div class='ctx'> 		return ioctl(file, cmd, arg);</div><div class='ctx'> 	return -ENOTTY;</div><div class='hunk'>@@ -403,9 +392,7 @@ static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static long pde_compat_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_compat_ioctl) compat_ioctl;</div><div class='del'>-</div><div class='del'>-	compat_ioctl = pde-&gt;proc_ops-&gt;proc_compat_ioctl;</div><div class='add'>+	const auto compat_ioctl = pde-&gt;proc_ops-&gt;proc_compat_ioctl;</div><div class='ctx'> 	if (compat_ioctl)</div><div class='ctx'> 		return compat_ioctl(file, cmd, arg);</div><div class='ctx'> 	return -ENOTTY;</div><div class='hunk'>@@ -427,9 +414,7 @@ static long proc_reg_compat_ioctl(struct file *file, unsigned int cmd, unsigned</div><div class='ctx'> </div><div class='ctx'> static int pde_mmap(struct proc_dir_entry *pde, struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_mmap) mmap;</div><div class='del'>-</div><div class='del'>-	mmap = pde-&gt;proc_ops-&gt;proc_mmap;</div><div class='add'>+	const auto mmap = pde-&gt;proc_ops-&gt;proc_mmap;</div><div class='ctx'> 	if (mmap)</div><div class='ctx'> 		return mmap(file, vma);</div><div class='ctx'> 	return -EIO;</div><div class='hunk'>@@ -454,15 +439,13 @@ pde_get_unmapped_area(struct proc_dir_entry *pde, struct file *file, unsigned lo</div><div class='ctx'> 			   unsigned long len, unsigned long pgoff,</div><div class='ctx'> 			   unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	typeof_member(struct proc_ops, proc_get_unmapped_area) get_area;</div><div class='add'>+	if (pde-&gt;proc_ops-&gt;proc_get_unmapped_area)</div><div class='add'>+		return pde-&gt;proc_ops-&gt;proc_get_unmapped_area(file, orig_addr, len, pgoff, flags);</div><div class='ctx'> </div><div class='del'>-	get_area = pde-&gt;proc_ops-&gt;proc_get_unmapped_area;</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-	if (!get_area)</div><div class='del'>-		get_area = current-&gt;mm-&gt;get_unmapped_area;</div><div class='add'>+	return mm_get_unmapped_area(file, orig_addr, len, pgoff, flags);</div><div class='ctx'> #endif</div><div class='del'>-	if (get_area)</div><div class='del'>-		return get_area(file, orig_addr, len, pgoff, flags);</div><div class='add'>+</div><div class='ctx'> 	return orig_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -488,10 +471,9 @@ static int proc_reg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct proc_dir_entry *pde = PDE(inode);</div><div class='ctx'> 	int rv = 0;</div><div class='ctx'> 	typeof_member(struct proc_ops, proc_open) open;</div><div class='del'>-	typeof_member(struct proc_ops, proc_release) release;</div><div class='ctx'> 	struct pde_opener *pdeo;</div><div class='ctx'> </div><div class='del'>-	if (!pde-&gt;proc_ops-&gt;proc_lseek)</div><div class='add'>+	if (!pde_has_proc_lseek(pde))</div><div class='ctx'> 		file-&gt;f_mode &amp;= ~FMODE_LSEEK;</div><div class='ctx'> </div><div class='ctx'> 	if (pde_is_permanent(pde)) {</div><div class='hunk'>@@ -515,7 +497,7 @@ static int proc_reg_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!use_pde(pde))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	release = pde-&gt;proc_ops-&gt;proc_release;</div><div class='add'>+	const auto release = pde-&gt;proc_ops-&gt;proc_release;</div><div class='ctx'> 	if (release) {</div><div class='ctx'> 		pdeo = kmem_cache_alloc(pde_opener_cache, GFP_KERNEL);</div><div class='ctx'> 		if (!pdeo) {</div><div class='hunk'>@@ -552,12 +534,9 @@ static int proc_reg_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct pde_opener *pdeo;</div><div class='ctx'> </div><div class='ctx'> 	if (pde_is_permanent(pde)) {</div><div class='del'>-		typeof_member(struct proc_ops, proc_release) release;</div><div class='del'>-</div><div class='del'>-		release = pde-&gt;proc_ops-&gt;proc_release;</div><div class='del'>-		if (release) {</div><div class='add'>+		const auto release = pde-&gt;proc_ops-&gt;proc_release;</div><div class='add'>+		if (release)</div><div class='ctx'> 			return release(inode, file);</div><div class='del'>-		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -676,13 +655,13 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode)) {</div><div class='ctx'> 		inode-&gt;i_op = de-&gt;proc_iops;</div><div class='del'>-		if (de-&gt;proc_ops-&gt;proc_read_iter)</div><div class='add'>+		if (pde_has_proc_read_iter(de))</div><div class='ctx'> 			inode-&gt;i_fop = &amp;proc_iter_file_ops;</div><div class='ctx'> 		else</div><div class='ctx'> 			inode-&gt;i_fop = &amp;proc_reg_file_ops;</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-		if (de-&gt;proc_ops-&gt;proc_compat_ioctl) {</div><div class='del'>-			if (de-&gt;proc_ops-&gt;proc_read_iter)</div><div class='add'>+		if (pde_has_proc_compat_ioctl(de)) {</div><div class='add'>+			if (pde_has_proc_read_iter(de))</div><div class='ctx'> 				inode-&gt;i_fop = &amp;proc_iter_file_ops_compat;</div><div class='ctx'> 			else</div><div class='ctx'> 				inode-&gt;i_fop = &amp;proc_reg_file_ops_compat;</div><div class='head'>diff --git a/fs/proc/internal.h b/fs/proc/internal.h<br/>index a71ac5379584..c1e8eb984da8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/internal.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/sched/coredump.h&gt;</div><div class='ctx'> #include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ctl_table_header;</div><div class='ctx'> struct mempolicy;</div><div class='hunk'>@@ -43,7 +44,6 @@ struct proc_dir_entry {</div><div class='ctx'> 		const struct proc_ops *proc_ops;</div><div class='ctx'> 		const struct file_operations *proc_dir_ops;</div><div class='ctx'> 	};</div><div class='del'>-	const struct dentry_operations *proc_dops;</div><div class='ctx'> 	union {</div><div class='ctx'> 		const struct seq_operations *seq_ops;</div><div class='ctx'> 		int (*single_show)(struct seq_file *, void *);</div><div class='hunk'>@@ -84,6 +84,25 @@ static inline void pde_make_permanent(struct proc_dir_entry *pde)</div><div class='ctx'> 	pde-&gt;flags |= PROC_ENTRY_PERMANENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool pde_has_proc_read_iter(const struct proc_dir_entry *pde)</div><div class='add'>+{</div><div class='add'>+	return pde-&gt;flags &amp; PROC_ENTRY_proc_read_iter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pde_has_proc_compat_ioctl(const struct proc_dir_entry *pde)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	return pde-&gt;flags &amp; PROC_ENTRY_proc_compat_ioctl;</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pde_has_proc_lseek(const struct proc_dir_entry *pde)</div><div class='add'>+{</div><div class='add'>+	return pde-&gt;flags &amp; PROC_ENTRY_proc_lseek;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern struct kmem_cache *proc_dir_entry_cache;</div><div class='ctx'> void pde_free(struct proc_dir_entry *pde);</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +120,7 @@ struct proc_inode {</div><div class='ctx'> 	union proc_op op;</div><div class='ctx'> 	struct proc_dir_entry *pde;</div><div class='ctx'> 	struct ctl_table_header *sysctl;</div><div class='del'>-	struct ctl_table *sysctl_entry;</div><div class='add'>+	const struct ctl_table *sysctl_entry;</div><div class='ctx'> 	struct hlist_node sibling_inodes;</div><div class='ctx'> 	const struct proc_ns_operations *ns_ops;</div><div class='ctx'> 	struct inode vfs_inode;</div><div class='hunk'>@@ -142,6 +161,80 @@ unsigned name_to_int(const struct qstr *qstr);</div><div class='ctx'> /* Worst case buffer size needed for holding an integer. */</div><div class='ctx'> #define PROC_NUMBUF 13</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PAGE_MAPCOUNT</div><div class='add'>+/**</div><div class='add'>+ * folio_precise_page_mapcount() - Number of mappings of this folio page.</div><div class='add'>+ * @folio: The folio.</div><div class='add'>+ * @page: The page.</div><div class='add'>+ *</div><div class='add'>+ * The number of present user page table entries that reference this page</div><div class='add'>+ * as tracked via the RMAP: either referenced directly (PTE) or as part of</div><div class='add'>+ * a larger area that covers this page (e.g., PMD).</div><div class='add'>+ *</div><div class='add'>+ * Use this function only for the calculation of existing statistics</div><div class='add'>+ * (USS, PSS, mapcount_max) and for debugging purposes (/proc/kpagecount).</div><div class='add'>+ *</div><div class='add'>+ * Do not add new users.</div><div class='add'>+ *</div><div class='add'>+ * Returns: The number of mappings of this folio page. 0 for</div><div class='add'>+ * folios that are not mapped to user space or are not tracked via the RMAP</div><div class='add'>+ * (e.g., shared zeropage).</div><div class='add'>+ */</div><div class='add'>+static inline int folio_precise_page_mapcount(struct folio *folio,</div><div class='add'>+		struct page *page)</div><div class='add'>+{</div><div class='add'>+	int mapcount = atomic_read(&amp;page-&gt;_mapcount) + 1;</div><div class='add'>+</div><div class='add'>+	if (page_mapcount_is_type(mapcount))</div><div class='add'>+		mapcount = 0;</div><div class='add'>+	if (folio_test_large(folio))</div><div class='add'>+		mapcount += folio_entire_mapcount(folio);</div><div class='add'>+</div><div class='add'>+	return mapcount;</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_PAGE_MAPCOUNT */</div><div class='add'>+static inline int folio_precise_page_mapcount(struct folio *folio,</div><div class='add'>+		struct page *page)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG();</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PAGE_MAPCOUNT */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folio_average_page_mapcount() - Average number of mappings per page in this</div><div class='add'>+ *				   folio</div><div class='add'>+ * @folio: The folio.</div><div class='add'>+ *</div><div class='add'>+ * The average number of user page table entries that reference each page in</div><div class='add'>+ * this folio as tracked via the RMAP: either referenced directly (PTE) or</div><div class='add'>+ * as part of a larger area that covers this page (e.g., PMD).</div><div class='add'>+ *</div><div class='add'>+ * The average is calculated by rounding to the nearest integer; however,</div><div class='add'>+ * to avoid duplicated code in current callers, the average is at least</div><div class='add'>+ * 1 if any page of the folio is mapped.</div><div class='add'>+ *</div><div class='add'>+ * Returns: The average number of mappings per page in this folio.</div><div class='add'>+ */</div><div class='add'>+static inline int folio_average_page_mapcount(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	int mapcount, entire_mapcount, avg;</div><div class='add'>+</div><div class='add'>+	if (!folio_test_large(folio))</div><div class='add'>+		return atomic_read(&amp;folio-&gt;_mapcount) + 1;</div><div class='add'>+</div><div class='add'>+	mapcount = folio_large_mapcount(folio);</div><div class='add'>+	if (unlikely(mapcount &lt;= 0))</div><div class='add'>+		return 0;</div><div class='add'>+	entire_mapcount = folio_entire_mapcount(folio);</div><div class='add'>+	if (mapcount &lt;= entire_mapcount)</div><div class='add'>+		return entire_mapcount;</div><div class='add'>+	mapcount -= entire_mapcount;</div><div class='add'>+</div><div class='add'>+	/* Round to closest integer ... */</div><div class='add'>+	avg = ((unsigned int)mapcount + folio_large_nr_pages(folio) / 2) &gt;&gt; folio_large_order(folio);</div><div class='add'>+	/* ... but return at least 1. */</div><div class='add'>+	return max_t(int, avg + entire_mapcount, 1);</div><div class='add'>+}</div><div class='ctx'> /*</div><div class='ctx'>  * array.c</div><div class='ctx'>  */</div><div class='hunk'>@@ -280,16 +373,27 @@ static inline void proc_tty_init(void) {}</div><div class='ctx'> extern struct proc_dir_entry proc_root;</div><div class='ctx'> </div><div class='ctx'> extern void proc_self_init(void);</div><div class='add'>+extern unsigned self_inum, thread_self_inum;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * task_[no]mmu.c</div><div class='ctx'>  */</div><div class='ctx'> struct mem_size_stats;</div><div class='add'>+</div><div class='add'>+struct proc_maps_locking_ctx {</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+#ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+	bool mmap_locked;</div><div class='add'>+	struct vm_area_struct *locked_vma;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct proc_maps_private {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct task_struct *task;</div><div class='del'>-	struct mm_struct *mm;</div><div class='ctx'> 	struct vma_iterator iter;</div><div class='add'>+	loff_t last_pos;</div><div class='add'>+	struct proc_maps_locking_ctx lock_ctx;</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> 	struct mempolicy *task_mempolicy;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -314,5 +418,17 @@ extern const struct dentry_operations proc_net_dentry_ops;</div><div class='ctx'> static inline void pde_force_lookup(struct proc_dir_entry *pde)</div><div class='ctx'> {</div><div class='ctx'> 	/* /proc/net/ entries can be changed under us by setns(CLONE_NEWNET) */</div><div class='del'>-	pde-&gt;proc_dops = &amp;proc_net_dentry_ops;</div><div class='add'>+	pde-&gt;flags |= PROC_ENTRY_FORCE_LOOKUP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add a new procfs dentry that can't serve as a mountpoint. That should</div><div class='add'>+ * encompass anything that is ephemeral and can just disappear while the</div><div class='add'>+ * process is still around.</div><div class='add'>+ */</div><div class='add'>+static inline struct dentry *proc_splice_unmountable(struct inode *inode,</div><div class='add'>+		struct dentry *dentry, const struct dentry_operations *d_ops)</div><div class='add'>+{</div><div class='add'>+	dont_mount(dentry);</div><div class='add'>+	return d_splice_alias_ops(inode, dentry, d_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c<br/>index cb0edc7cbf09..714a22ded8a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/interrupts.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/interrupts.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/interrupts.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/interrupts.c</a></div><div class='hunk'>@@ -11,13 +11,13 @@</div><div class='ctx'>  */</div><div class='ctx'> static void *int_seq_start(struct seq_file *f, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	return (*pos &lt;= nr_irqs) ? pos : NULL;</div><div class='add'>+	return *pos &lt;= irq_get_nr_irqs() ? pos : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *int_seq_next(struct seq_file *f, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	(*pos)++;</div><div class='del'>-	if (*pos &gt; nr_irqs)</div><div class='add'>+	if (*pos &gt; irq_get_nr_irqs())</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return pos;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c<br/>index 6422e569b080..728630b10fdf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/kcore.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/kcore.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/kcore.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/kcore.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  *	Safe accesses to vmalloc/direct-mapped discontiguous areas, Kanoj Sarcar &lt;kanoj@sgi.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/crash_core.h&gt;</div><div class='add'>+#include &lt;linux/vmcore_info.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/kcore.h&gt;</div><div class='hunk'>@@ -34,8 +34,6 @@</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='del'>-#define CORE_STR "CORE"</div><div class='del'>-</div><div class='ctx'> #ifndef ELF_CORE_EFLAGS</div><div class='ctx'> #define ELF_CORE_EFLAGS	0</div><div class='ctx'> #endif</div><div class='hunk'>@@ -50,8 +48,26 @@ static struct proc_dir_entry *proc_root_kcore;</div><div class='ctx'> #define	kc_offset_to_vaddr(o) ((o) + PAGE_OFFSET)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef kc_xlate_dev_mem_ptr</div><div class='add'>+#define kc_xlate_dev_mem_ptr kc_xlate_dev_mem_ptr</div><div class='add'>+static inline void *kc_xlate_dev_mem_ptr(phys_addr_t phys)</div><div class='add'>+{</div><div class='add'>+	return __va(phys);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#ifndef kc_unxlate_dev_mem_ptr</div><div class='add'>+#define kc_unxlate_dev_mem_ptr kc_unxlate_dev_mem_ptr</div><div class='add'>+static inline void kc_unxlate_dev_mem_ptr(phys_addr_t phys, void *virt)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static LIST_HEAD(kclist_head);</div><div class='del'>-static DECLARE_RWSEM(kclist_lock);</div><div class='add'>+static int kcore_nphdr;</div><div class='add'>+static size_t kcore_phdrs_len;</div><div class='add'>+static size_t kcore_notes_len;</div><div class='add'>+static size_t kcore_data_offset;</div><div class='add'>+DEFINE_STATIC_PERCPU_RWSEM(kclist_lock);</div><div class='ctx'> static int kcore_need_update = 1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -87,33 +103,34 @@ void __init kclist_add(struct kcore_list *new, void *addr, size_t size,</div><div class='ctx'> 	list_add_tail(&amp;new-&gt;list, &amp;kclist_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t get_kcore_size(int *nphdr, size_t *phdrs_len, size_t *notes_len,</div><div class='del'>-			     size_t *data_offset)</div><div class='add'>+static void update_kcore_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	size_t try, size;</div><div class='ctx'> 	struct kcore_list *m;</div><div class='ctx'> </div><div class='del'>-	*nphdr = 1; /* PT_NOTE */</div><div class='add'>+	kcore_nphdr = 1; /* PT_NOTE */</div><div class='ctx'> 	size = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(m, &amp;kclist_head, list) {</div><div class='ctx'> 		try = kc_vaddr_to_offset((size_t)m-&gt;addr + m-&gt;size);</div><div class='ctx'> 		if (try &gt; size)</div><div class='ctx'> 			size = try;</div><div class='del'>-		*nphdr = *nphdr + 1;</div><div class='add'>+		kcore_nphdr++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*phdrs_len = *nphdr * sizeof(struct elf_phdr);</div><div class='del'>-	*notes_len = (4 * sizeof(struct elf_note) +</div><div class='del'>-		      3 * ALIGN(sizeof(CORE_STR), 4) +</div><div class='del'>-		      VMCOREINFO_NOTE_NAME_BYTES +</div><div class='del'>-		      ALIGN(sizeof(struct elf_prstatus), 4) +</div><div class='del'>-		      ALIGN(sizeof(struct elf_prpsinfo), 4) +</div><div class='del'>-		      ALIGN(arch_task_struct_size, 4) +</div><div class='del'>-		      ALIGN(vmcoreinfo_size, 4));</div><div class='del'>-	*data_offset = PAGE_ALIGN(sizeof(struct elfhdr) + *phdrs_len +</div><div class='del'>-				  *notes_len);</div><div class='del'>-	return *data_offset + size;</div><div class='add'>+	kcore_phdrs_len = kcore_nphdr * sizeof(struct elf_phdr);</div><div class='add'>+	kcore_notes_len = (4 * sizeof(struct elf_note) +</div><div class='add'>+			   ALIGN(sizeof(NN_PRSTATUS), 4) +</div><div class='add'>+			   ALIGN(sizeof(NN_PRPSINFO), 4) +</div><div class='add'>+			   ALIGN(sizeof(NN_TASKSTRUCT), 4) +</div><div class='add'>+			   VMCOREINFO_NOTE_NAME_BYTES +</div><div class='add'>+			   ALIGN(sizeof(struct elf_prstatus), 4) +</div><div class='add'>+			   ALIGN(sizeof(struct elf_prpsinfo), 4) +</div><div class='add'>+			   ALIGN(arch_task_struct_size, 4) +</div><div class='add'>+			   ALIGN(vmcoreinfo_size, 4));</div><div class='add'>+	kcore_data_offset = PAGE_ALIGN(sizeof(struct elfhdr) + kcore_phdrs_len +</div><div class='add'>+				       kcore_notes_len);</div><div class='add'>+	proc_root_kcore-&gt;size = kcore_data_offset + size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='hunk'>@@ -235,7 +252,7 @@ static int kcore_ram_list(struct list_head *list)</div><div class='ctx'> 	int nid, ret;</div><div class='ctx'> 	unsigned long end_pfn;</div><div class='ctx'> </div><div class='del'>-	/* Not inialized....update now */</div><div class='add'>+	/* Not initialized....update now */</div><div class='ctx'> 	/* find out "max pfn" */</div><div class='ctx'> 	end_pfn = 0;</div><div class='ctx'> 	for_each_node_state(nid, N_MEMORY) {</div><div class='hunk'>@@ -256,12 +273,10 @@ static int kcore_update_ram(void)</div><div class='ctx'> {</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> 	LIST_HEAD(garbage);</div><div class='del'>-	int nphdr;</div><div class='del'>-	size_t phdrs_len, notes_len, data_offset;</div><div class='ctx'> 	struct kcore_list *tmp, *pos;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;kclist_lock);</div><div class='add'>+	percpu_down_write(&amp;kclist_lock);</div><div class='ctx'> 	if (!xchg(&amp;kcore_need_update, 0))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -279,11 +294,10 @@ static int kcore_update_ram(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	list_splice_tail(&amp;list, &amp;kclist_head);</div><div class='ctx'> </div><div class='del'>-	proc_root_kcore-&gt;size = get_kcore_size(&amp;nphdr, &amp;phdrs_len, &amp;notes_len,</div><div class='del'>-					       &amp;data_offset);</div><div class='add'>+	update_kcore_size();</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	up_write(&amp;kclist_lock);</div><div class='add'>+	percpu_up_write(&amp;kclist_lock);</div><div class='ctx'> 	list_for_each_entry_safe(pos, tmp, &amp;garbage, list) {</div><div class='ctx'> 		list_del(&amp;pos-&gt;list);</div><div class='ctx'> 		kfree(pos);</div><div class='hunk'>@@ -312,27 +326,24 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	char *buf = file-&gt;private_data;</div><div class='ctx'> 	loff_t *fpos = &amp;iocb-&gt;ki_pos;</div><div class='del'>-	size_t phdrs_offset, notes_offset, data_offset;</div><div class='add'>+	size_t phdrs_offset, notes_offset;</div><div class='ctx'> 	size_t page_offline_frozen = 1;</div><div class='del'>-	size_t phdrs_len, notes_len;</div><div class='ctx'> 	struct kcore_list *m;</div><div class='ctx'> 	size_t tsz;</div><div class='del'>-	int nphdr;</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> 	size_t buflen = iov_iter_count(iter);</div><div class='ctx'> 	size_t orig_buflen = buflen;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;kclist_lock);</div><div class='add'>+	percpu_down_read(&amp;kclist_lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't race against drivers that set PageOffline() and expect no</div><div class='ctx'> 	 * further page access.</div><div class='ctx'> 	 */</div><div class='ctx'> 	page_offline_freeze();</div><div class='ctx'> </div><div class='del'>-	get_kcore_size(&amp;nphdr, &amp;phdrs_len, &amp;notes_len, &amp;data_offset);</div><div class='ctx'> 	phdrs_offset = sizeof(struct elfhdr);</div><div class='del'>-	notes_offset = phdrs_offset + phdrs_len;</div><div class='add'>+	notes_offset = phdrs_offset + kcore_phdrs_len;</div><div class='ctx'> </div><div class='ctx'> 	/* ELF file header. */</div><div class='ctx'> 	if (buflen &amp;&amp; *fpos &lt; sizeof(struct elfhdr)) {</div><div class='hunk'>@@ -354,7 +365,7 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 			.e_flags = ELF_CORE_EFLAGS,</div><div class='ctx'> 			.e_ehsize = sizeof(struct elfhdr),</div><div class='ctx'> 			.e_phentsize = sizeof(struct elf_phdr),</div><div class='del'>-			.e_phnum = nphdr,</div><div class='add'>+			.e_phnum = kcore_nphdr,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		tsz = min_t(size_t, buflen, sizeof(struct elfhdr) - *fpos);</div><div class='hunk'>@@ -368,10 +379,10 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ELF program headers. */</div><div class='del'>-	if (buflen &amp;&amp; *fpos &lt; phdrs_offset + phdrs_len) {</div><div class='add'>+	if (buflen &amp;&amp; *fpos &lt; phdrs_offset + kcore_phdrs_len) {</div><div class='ctx'> 		struct elf_phdr *phdrs, *phdr;</div><div class='ctx'> </div><div class='del'>-		phdrs = kzalloc(phdrs_len, GFP_KERNEL);</div><div class='add'>+		phdrs = kzalloc(kcore_phdrs_len, GFP_KERNEL);</div><div class='ctx'> 		if (!phdrs) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -379,13 +390,14 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> </div><div class='ctx'> 		phdrs[0].p_type = PT_NOTE;</div><div class='ctx'> 		phdrs[0].p_offset = notes_offset;</div><div class='del'>-		phdrs[0].p_filesz = notes_len;</div><div class='add'>+		phdrs[0].p_filesz = kcore_notes_len;</div><div class='ctx'> </div><div class='ctx'> 		phdr = &amp;phdrs[1];</div><div class='ctx'> 		list_for_each_entry(m, &amp;kclist_head, list) {</div><div class='ctx'> 			phdr-&gt;p_type = PT_LOAD;</div><div class='ctx'> 			phdr-&gt;p_flags = PF_R | PF_W | PF_X;</div><div class='del'>-			phdr-&gt;p_offset = kc_vaddr_to_offset(m-&gt;addr) + data_offset;</div><div class='add'>+			phdr-&gt;p_offset = kc_vaddr_to_offset(m-&gt;addr)</div><div class='add'>+					 + kcore_data_offset;</div><div class='ctx'> 			phdr-&gt;p_vaddr = (size_t)m-&gt;addr;</div><div class='ctx'> 			if (m-&gt;type == KCORE_RAM)</div><div class='ctx'> 				phdr-&gt;p_paddr = __pa(m-&gt;addr);</div><div class='hunk'>@@ -398,7 +410,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 			phdr++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tsz = min_t(size_t, buflen, phdrs_offset + phdrs_len - *fpos);</div><div class='add'>+		tsz = min_t(size_t, buflen,</div><div class='add'>+			    phdrs_offset + kcore_phdrs_len - *fpos);</div><div class='ctx'> 		if (copy_to_iter((char *)phdrs + *fpos - phdrs_offset, tsz,</div><div class='ctx'> 				 iter) != tsz) {</div><div class='ctx'> 			kfree(phdrs);</div><div class='hunk'>@@ -412,7 +425,7 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ELF note segment. */</div><div class='del'>-	if (buflen &amp;&amp; *fpos &lt; notes_offset + notes_len) {</div><div class='add'>+	if (buflen &amp;&amp; *fpos &lt; notes_offset + kcore_notes_len) {</div><div class='ctx'> 		struct elf_prstatus prstatus = {};</div><div class='ctx'> 		struct elf_prpsinfo prpsinfo = {</div><div class='ctx'> 			.pr_sname = 'R',</div><div class='hunk'>@@ -424,17 +437,17 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 		strscpy(prpsinfo.pr_psargs, saved_command_line,</div><div class='ctx'> 			sizeof(prpsinfo.pr_psargs));</div><div class='ctx'> </div><div class='del'>-		notes = kzalloc(notes_len, GFP_KERNEL);</div><div class='add'>+		notes = kzalloc(kcore_notes_len, GFP_KERNEL);</div><div class='ctx'> 		if (!notes) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		append_kcore_note(notes, &amp;i, CORE_STR, NT_PRSTATUS, &amp;prstatus,</div><div class='add'>+		append_kcore_note(notes, &amp;i, NN_PRSTATUS, NT_PRSTATUS, &amp;prstatus,</div><div class='ctx'> 				  sizeof(prstatus));</div><div class='del'>-		append_kcore_note(notes, &amp;i, CORE_STR, NT_PRPSINFO, &amp;prpsinfo,</div><div class='add'>+		append_kcore_note(notes, &amp;i, NN_PRPSINFO, NT_PRPSINFO, &amp;prpsinfo,</div><div class='ctx'> 				  sizeof(prpsinfo));</div><div class='del'>-		append_kcore_note(notes, &amp;i, CORE_STR, NT_TASKSTRUCT, current,</div><div class='add'>+		append_kcore_note(notes, &amp;i, NN_TASKSTRUCT, NT_TASKSTRUCT, current,</div><div class='ctx'> 				  arch_task_struct_size);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * vmcoreinfo_size is mostly constant after init time, but it</div><div class='hunk'>@@ -445,9 +458,10 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 		 */</div><div class='ctx'> 		append_kcore_note(notes, &amp;i, VMCOREINFO_NOTE_NAME, 0,</div><div class='ctx'> 				  vmcoreinfo_data,</div><div class='del'>-				  min(vmcoreinfo_size, notes_len - i));</div><div class='add'>+				  min(vmcoreinfo_size, kcore_notes_len - i));</div><div class='ctx'> </div><div class='del'>-		tsz = min_t(size_t, buflen, notes_offset + notes_len - *fpos);</div><div class='add'>+		tsz = min_t(size_t, buflen,</div><div class='add'>+			    notes_offset + kcore_notes_len - *fpos);</div><div class='ctx'> 		if (copy_to_iter(notes + *fpos - notes_offset, tsz, iter) != tsz) {</div><div class='ctx'> 			kfree(notes);</div><div class='ctx'> 			ret = -EFAULT;</div><div class='hunk'>@@ -463,7 +477,7 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	 * Check to see if our file offset matches with any of</div><div class='ctx'> 	 * the addresses in the elf_phdr on our list.</div><div class='ctx'> 	 */</div><div class='del'>-	start = kc_offset_to_vaddr(*fpos - data_offset);</div><div class='add'>+	start = kc_offset_to_vaddr(*fpos - kcore_data_offset);</div><div class='ctx'> 	if ((tsz = (PAGE_SIZE - (start &amp; ~PAGE_MASK))) &gt; buflen)</div><div class='ctx'> 		tsz = buflen;</div><div class='ctx'> </div><div class='hunk'>@@ -471,19 +485,21 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	while (buflen) {</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> 		unsigned long pfn;</div><div class='add'>+		phys_addr_t phys;</div><div class='add'>+		void *__start;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If this is the first iteration or the address is not within</div><div class='ctx'> 		 * the previous entry, search for a matching entry.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!m || start &lt; m-&gt;addr || start &gt;= m-&gt;addr + m-&gt;size) {</div><div class='del'>-			struct kcore_list *iter;</div><div class='add'>+			struct kcore_list *pos;</div><div class='ctx'> </div><div class='ctx'> 			m = NULL;</div><div class='del'>-			list_for_each_entry(iter, &amp;kclist_head, list) {</div><div class='del'>-				if (start &gt;= iter-&gt;addr &amp;&amp;</div><div class='del'>-				    start &lt; iter-&gt;addr + iter-&gt;size) {</div><div class='del'>-					m = iter;</div><div class='add'>+			list_for_each_entry(pos, &amp;kclist_head, list) {</div><div class='add'>+				if (start &gt;= pos-&gt;addr &amp;&amp;</div><div class='add'>+				    start &lt; pos-&gt;addr + pos-&gt;size) {</div><div class='add'>+					m = pos;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -537,7 +553,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case KCORE_RAM:</div><div class='del'>-			pfn = __pa(start) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+			phys = __pa(start);</div><div class='add'>+			pfn =  phys &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 			page = pfn_to_online_page(pfn);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -557,17 +574,33 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 			fallthrough;</div><div class='ctx'> 		case KCORE_VMEMMAP:</div><div class='ctx'> 		case KCORE_TEXT:</div><div class='add'>+			if (m-&gt;type == KCORE_RAM) {</div><div class='add'>+				__start = kc_xlate_dev_mem_ptr(phys);</div><div class='add'>+				if (!__start) {</div><div class='add'>+					ret = -ENOMEM;</div><div class='add'>+					if (iov_iter_zero(tsz, iter) != tsz)</div><div class='add'>+						ret = -EFAULT;</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				__start = (void *)start;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Sadly we must use a bounce buffer here to be able to</div><div class='ctx'> 			 * make use of copy_from_kernel_nofault(), as these</div><div class='ctx'> 			 * memory regions might not always be mapped on all</div><div class='ctx'> 			 * architectures.</div><div class='ctx'> 			 */</div><div class='del'>-			if (copy_from_kernel_nofault(buf, (void *)start, tsz)) {</div><div class='add'>+			ret = copy_from_kernel_nofault(buf, __start, tsz);</div><div class='add'>+			if (m-&gt;type == KCORE_RAM)</div><div class='add'>+				kc_unxlate_dev_mem_ptr(phys, __start);</div><div class='add'>+			if (ret) {</div><div class='ctx'> 				if (iov_iter_zero(tsz, iter) != tsz) {</div><div class='ctx'> 					ret = -EFAULT;</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				}</div><div class='add'>+				ret = 0;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We know the bounce buffer is safe to copy from, so</div><div class='ctx'> 			 * use _copy_to_iter() directly.</div><div class='hunk'>@@ -593,7 +626,7 @@ skip:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	page_offline_thaw();</div><div class='del'>-	up_read(&amp;kclist_lock);</div><div class='add'>+	percpu_up_read(&amp;kclist_lock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	return orig_buflen - buflen;</div><div class='hunk'>@@ -630,6 +663,7 @@ static int release_kcore(struct inode *inode, struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct proc_ops kcore_proc_ops = {</div><div class='add'>+	.proc_flags	= PROC_ENTRY_PERMANENT,</div><div class='ctx'> 	.proc_read_iter	= read_kcore_iter,</div><div class='ctx'> 	.proc_open	= open_kcore,</div><div class='ctx'> 	.proc_release	= release_kcore,</div><div class='head'>diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c<br/>index 45af9a989d40..a458f1e112fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/meminfo.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/meminfo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/meminfo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/meminfo.c</a></div><div class='hunk'>@@ -89,10 +89,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	show_val_kb(m, "SwapTotal:      ", i.totalswap);</div><div class='ctx'> 	show_val_kb(m, "SwapFree:       ", i.freeswap);</div><div class='ctx'> #ifdef CONFIG_ZSWAP</div><div class='del'>-	seq_printf(m,  "Zswap:          %8lu kB\n",</div><div class='del'>-		   (unsigned long)(zswap_pool_total_size &gt;&gt; 10));</div><div class='add'>+	show_val_kb(m, "Zswap:          ", zswap_total_pages());</div><div class='ctx'> 	seq_printf(m,  "Zswapped:       %8lu kB\n",</div><div class='del'>-		   (unsigned long)atomic_read(&amp;zswap_stored_pages) &lt;&lt;</div><div class='add'>+		   (unsigned long)atomic_long_read(&amp;zswap_stored_pages) &lt;&lt;</div><div class='ctx'> 		   (PAGE_SHIFT - 10));</div><div class='ctx'> #endif</div><div class='ctx'> 	show_val_kb(m, "Dirty:          ",</div><div class='hunk'>@@ -121,10 +120,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 		    global_node_page_state(NR_SECONDARY_PAGETABLE));</div><div class='ctx'> </div><div class='ctx'> 	show_val_kb(m, "NFS_Unstable:   ", 0);</div><div class='del'>-	show_val_kb(m, "Bounce:         ",</div><div class='del'>-		    global_zone_page_state(NR_BOUNCE));</div><div class='del'>-	show_val_kb(m, "WritebackTmp:   ",</div><div class='del'>-		    global_node_page_state(NR_WRITEBACK_TEMP));</div><div class='add'>+	show_val_kb(m, "Bounce:         ", 0);</div><div class='add'>+	show_val_kb(m, "WritebackTmp:   ", 0);</div><div class='ctx'> 	show_val_kb(m, "CommitLimit:    ", vm_commit_limit());</div><div class='ctx'> 	show_val_kb(m, "Committed_AS:   ", committed);</div><div class='ctx'> 	seq_printf(m, "VmallocTotal:   %8lu kB\n",</div><div class='hunk'>@@ -163,6 +160,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)</div><div class='ctx'> 	show_val_kb(m, "Unaccepted:     ",</div><div class='ctx'> 		    global_zone_page_state(NR_UNACCEPTED));</div><div class='ctx'> #endif</div><div class='add'>+	show_val_kb(m, "Balloon:        ",</div><div class='add'>+		    global_node_page_state(NR_BALLOON_PAGES));</div><div class='ctx'> </div><div class='ctx'> 	hugetlb_report_meminfo(m);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c<br/>index 8e159fc78c0a..ea2b597fd92c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/namespaces.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/namespaces.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/namespaces.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/namespaces.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const struct proc_ns_operations *ns_entries[] = {</div><div class='add'>+static const struct proc_ns_operations *const ns_entries[] = {</div><div class='ctx'> #ifdef CONFIG_NET_NS</div><div class='ctx'> 	&amp;netns_operations,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -83,7 +83,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl</div><div class='ctx'> 	if (ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS)) {</div><div class='ctx'> 		res = ns_get_name(name, sizeof(name), task, ns_ops);</div><div class='ctx'> 		if (res &gt;= 0)</div><div class='del'>-			res = readlink_copy(buffer, buflen, name);</div><div class='add'>+			res = readlink_copy(buffer, buflen, name, strlen(name));</div><div class='ctx'> 	}</div><div class='ctx'> 	put_task_struct(task);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -111,14 +111,13 @@ static struct dentry *proc_ns_instantiate(struct dentry *dentry,</div><div class='ctx'> 	ei-&gt;ns_ops = ns_ops;</div><div class='ctx'> 	pid_update_inode(task, inode);</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;pid_dentry_operations);</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='add'>+	return d_splice_alias_ops(inode, dentry, &amp;pid_dentry_operations);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int proc_ns_dir_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *task = get_proc_task(file_inode(file));</div><div class='del'>-	const struct proc_ns_operations **entry, **last;</div><div class='add'>+	const struct proc_ns_operations *const *entry, *const *last;</div><div class='ctx'> </div><div class='ctx'> 	if (!task)</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -152,7 +151,7 @@ static struct dentry *proc_ns_dir_lookup(struct inode *dir,</div><div class='ctx'> 				struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *task = get_proc_task(dir);</div><div class='del'>-	const struct proc_ns_operations **entry, **last;</div><div class='add'>+	const struct proc_ns_operations *const *entry, *const *last;</div><div class='ctx'> 	unsigned int len = dentry-&gt;d_name.len;</div><div class='ctx'> 	struct dentry *res = ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/page.c b/fs/proc/page.c<br/>index 195b077c0fac..f9b2c2c906cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/page.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/page.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/page.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/page.c</a></div><div class='hunk'>@@ -20,7 +20,12 @@</div><div class='ctx'> </div><div class='ctx'> #define KPMSIZE sizeof(u64)</div><div class='ctx'> #define KPMMASK (KPMSIZE - 1)</div><div class='del'>-#define KPMBITS (KPMSIZE * BITS_PER_BYTE)</div><div class='add'>+</div><div class='add'>+enum kpage_operation {</div><div class='add'>+	KPAGE_FLAGS,</div><div class='add'>+	KPAGE_COUNT,</div><div class='add'>+	KPAGE_CGROUP,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long get_max_dump_pfn(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -37,21 +42,33 @@ static inline unsigned long get_max_dump_pfn(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* /proc/kpagecount - an array exposing page counts</div><div class='del'>- *</div><div class='del'>- * Each entry is a u64 representing the corresponding</div><div class='del'>- * physical page count.</div><div class='del'>- */</div><div class='del'>-static ssize_t kpagecount_read(struct file *file, char __user *buf,</div><div class='del'>-			     size_t count, loff_t *ppos)</div><div class='add'>+static u64 get_kpage_count(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	struct page_snapshot ps;</div><div class='add'>+	u64 ret;</div><div class='add'>+</div><div class='add'>+	snapshot_page(&amp;ps, page);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT))</div><div class='add'>+		ret = folio_precise_page_mapcount(&amp;ps.folio_snapshot,</div><div class='add'>+						  &amp;ps.page_snapshot);</div><div class='add'>+	else</div><div class='add'>+		ret = folio_average_page_mapcount(&amp;ps.folio_snapshot);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t kpage_read(struct file *file, char __user *buf,</div><div class='add'>+		size_t count, loff_t *ppos,</div><div class='add'>+		enum kpage_operation op)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned long max_dump_pfn = get_max_dump_pfn();</div><div class='ctx'> 	u64 __user *out = (u64 __user *)buf;</div><div class='del'>-	struct page *ppage;</div><div class='add'>+	struct page *page;</div><div class='ctx'> 	unsigned long src = *ppos;</div><div class='ctx'> 	unsigned long pfn;</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='del'>-	u64 pcount;</div><div class='add'>+	u64 info;</div><div class='ctx'> </div><div class='ctx'> 	pfn = src / KPMSIZE;</div><div class='ctx'> 	if (src &amp; KPMMASK || count &amp; KPMMASK)</div><div class='hunk'>@@ -65,14 +82,27 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf,</div><div class='ctx'> 		 * TODO: ZONE_DEVICE support requires to identify</div><div class='ctx'> 		 * memmaps that were actually initialized.</div><div class='ctx'> 		 */</div><div class='del'>-		ppage = pfn_to_online_page(pfn);</div><div class='del'>-</div><div class='del'>-		if (!ppage || PageSlab(ppage) || page_has_type(ppage))</div><div class='del'>-			pcount = 0;</div><div class='del'>-		else</div><div class='del'>-			pcount = page_mapcount(ppage);</div><div class='del'>-</div><div class='del'>-		if (put_user(pcount, out)) {</div><div class='add'>+		page = pfn_to_online_page(pfn);</div><div class='add'>+</div><div class='add'>+		if (page) {</div><div class='add'>+			switch (op) {</div><div class='add'>+			case KPAGE_FLAGS:</div><div class='add'>+				info = stable_page_flags(page);</div><div class='add'>+				break;</div><div class='add'>+			case KPAGE_COUNT:</div><div class='add'>+				info = get_kpage_count(page);</div><div class='add'>+				break;</div><div class='add'>+			case KPAGE_CGROUP:</div><div class='add'>+				info = page_cgroup_ino(page);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				info = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			info = 0;</div><div class='add'>+</div><div class='add'>+		if (put_user(info, out)) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -90,27 +120,37 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* /proc/kpagecount - an array exposing page mapcounts</div><div class='add'>+ *</div><div class='add'>+ * Each entry is a u64 representing the corresponding</div><div class='add'>+ * physical page mapcount.</div><div class='add'>+ */</div><div class='add'>+static ssize_t kpagecount_read(struct file *file, char __user *buf,</div><div class='add'>+		size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	return kpage_read(file, buf, count, ppos, KPAGE_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct proc_ops kpagecount_proc_ops = {</div><div class='ctx'> 	.proc_flags	= PROC_ENTRY_PERMANENT,</div><div class='ctx'> 	.proc_lseek	= mem_lseek,</div><div class='ctx'> 	.proc_read	= kpagecount_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* /proc/kpageflags - an array exposing page flags</div><div class='del'>- *</div><div class='del'>- * Each entry is a u64 representing the corresponding</div><div class='del'>- * physical page flags.</div><div class='del'>- */</div><div class='ctx'> </div><div class='ctx'> static inline u64 kpf_copy_bit(u64 kflags, int ubit, int kbit)</div><div class='ctx'> {</div><div class='ctx'> 	return ((kflags &gt;&gt; kbit) &amp; 1) &lt;&lt; ubit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 stable_page_flags(struct page *page)</div><div class='add'>+u64 stable_page_flags(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	u64 k;</div><div class='del'>-	u64 u;</div><div class='add'>+	const struct folio *folio;</div><div class='add'>+	struct page_snapshot ps;</div><div class='add'>+	unsigned long k;</div><div class='add'>+	unsigned long mapping;</div><div class='add'>+	bool is_anon;</div><div class='add'>+	u64 u = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pseudo flag: KPF_NOPAGE</div><div class='hunk'>@@ -119,75 +159,63 @@ u64 stable_page_flags(struct page *page)</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return 1 &lt;&lt; KPF_NOPAGE;</div><div class='ctx'> </div><div class='del'>-	k = page-&gt;flags;</div><div class='del'>-	u = 0;</div><div class='add'>+	snapshot_page(&amp;ps, page);</div><div class='add'>+	folio = &amp;ps.folio_snapshot;</div><div class='add'>+</div><div class='add'>+	k = folio-&gt;flags.f;</div><div class='add'>+	mapping = (unsigned long)folio-&gt;mapping;</div><div class='add'>+	is_anon = mapping &amp; FOLIO_MAPPING_ANON;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pseudo flags for the well known (anonymous) memory mapped pages</div><div class='del'>-	 *</div><div class='del'>-	 * Note that page-&gt;_mapcount is overloaded in SLAB, so the</div><div class='del'>-	 * simple test in page_mapped() is not enough.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!PageSlab(page) &amp;&amp; page_mapped(page))</div><div class='add'>+	if (folio_mapped(folio))</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_MMAP;</div><div class='del'>-	if (PageAnon(page))</div><div class='add'>+	if (is_anon) {</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_ANON;</div><div class='del'>-	if (PageKsm(page))</div><div class='del'>-		u |= 1 &lt;&lt; KPF_KSM;</div><div class='add'>+		if (mapping &amp; FOLIO_MAPPING_KSM)</div><div class='add'>+			u |= 1 &lt;&lt; KPF_KSM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * compound pages: export both head/tail info</div><div class='ctx'> 	 * they together define a compound page's start/end pos and order</div><div class='ctx'> 	 */</div><div class='del'>-	if (PageHead(page))</div><div class='del'>-		u |= 1 &lt;&lt; KPF_COMPOUND_HEAD;</div><div class='del'>-	if (PageTail(page))</div><div class='add'>+	if (ps.idx == 0)</div><div class='add'>+		u |= kpf_copy_bit(k, KPF_COMPOUND_HEAD, PG_head);</div><div class='add'>+	else</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_COMPOUND_TAIL;</div><div class='del'>-	if (PageHuge(page))</div><div class='add'>+	if (folio_test_hugetlb(folio))</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_HUGE;</div><div class='del'>-	/*</div><div class='del'>-	 * PageTransCompound can be true for non-huge compound pages (slab</div><div class='del'>-	 * pages or pages allocated by drivers with __GFP_COMP) because it</div><div class='del'>-	 * just checks PG_head/PG_tail, so we need to check PageLRU/PageAnon</div><div class='del'>-	 * to make sure a given page is a thp, not a non-huge compound page.</div><div class='del'>-	 */</div><div class='del'>-	else if (PageTransCompound(page)) {</div><div class='del'>-		struct page *head = compound_head(page);</div><div class='del'>-</div><div class='del'>-		if (PageLRU(head) || PageAnon(head))</div><div class='del'>-			u |= 1 &lt;&lt; KPF_THP;</div><div class='del'>-		else if (is_huge_zero_page(head)) {</div><div class='del'>-			u |= 1 &lt;&lt; KPF_ZERO_PAGE;</div><div class='del'>-			u |= 1 &lt;&lt; KPF_THP;</div><div class='del'>-		}</div><div class='del'>-	} else if (is_zero_pfn(page_to_pfn(page)))</div><div class='add'>+	else if (folio_test_large(folio) &amp;&amp;</div><div class='add'>+	         folio_test_large_rmappable(folio)) {</div><div class='add'>+		/* Note: we indicate any THPs here, not just PMD-sized ones */</div><div class='add'>+		u |= 1 &lt;&lt; KPF_THP;</div><div class='add'>+	} else if (is_huge_zero_pfn(ps.pfn)) {</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_ZERO_PAGE;</div><div class='add'>+		u |= 1 &lt;&lt; KPF_THP;</div><div class='add'>+	} else if (is_zero_pfn(ps.pfn)) {</div><div class='add'>+		u |= 1 &lt;&lt; KPF_ZERO_PAGE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Caveats on high order pages: PG_buddy and PG_slab will only be set</div><div class='del'>-	 * on the head page.</div><div class='del'>-	 */</div><div class='del'>-	if (PageBuddy(page))</div><div class='del'>-		u |= 1 &lt;&lt; KPF_BUDDY;</div><div class='del'>-	else if (page_count(page) == 0 &amp;&amp; is_free_buddy_page(page))</div><div class='add'>+	if (ps.flags &amp; PAGE_SNAPSHOT_PG_BUDDY)</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_BUDDY;</div><div class='ctx'> </div><div class='del'>-	if (PageOffline(page))</div><div class='add'>+	if (folio_test_offline(folio))</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_OFFLINE;</div><div class='del'>-	if (PageTable(page))</div><div class='add'>+	if (folio_test_pgtable(folio))</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_PGTABLE;</div><div class='add'>+	if (folio_test_slab(folio))</div><div class='add'>+		u |= 1 &lt;&lt; KPF_SLAB;</div><div class='ctx'> </div><div class='del'>-	if (page_is_idle(page))</div><div class='add'>+#if defined(CONFIG_PAGE_IDLE_FLAG) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+	u |= kpf_copy_bit(k, KPF_IDLE,          PG_idle);</div><div class='add'>+#else</div><div class='add'>+	if (ps.flags &amp; PAGE_SNAPSHOT_PG_IDLE)</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_IDLE;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_LOCKED,	PG_locked);</div><div class='del'>-</div><div class='del'>-	u |= kpf_copy_bit(k, KPF_SLAB,		PG_slab);</div><div class='del'>-	if (PageTail(page) &amp;&amp; PageSlab(page))</div><div class='del'>-		u |= 1 &lt;&lt; KPF_SLAB;</div><div class='del'>-</div><div class='del'>-	u |= kpf_copy_bit(k, KPF_ERROR,		PG_error);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_DIRTY,		PG_dirty);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_UPTODATE,	PG_uptodate);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_WRITEBACK,	PG_writeback);</div><div class='hunk'>@@ -197,7 +225,8 @@ u64 stable_page_flags(struct page *page)</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_ACTIVE,	PG_active);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_RECLAIM,	PG_reclaim);</div><div class='ctx'> </div><div class='del'>-	if (PageSwapCache(page))</div><div class='add'>+#define SWAPCACHE ((1 &lt;&lt; PG_swapbacked) | (1 &lt;&lt; PG_swapcache))</div><div class='add'>+	if ((k &amp; SWAPCACHE) == SWAPCACHE)</div><div class='ctx'> 		u |= 1 &lt;&lt; KPF_SWAPCACHE;</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_SWAPBACKED,	PG_swapbacked);</div><div class='ctx'> </div><div class='hunk'>@@ -205,67 +234,38 @@ u64 stable_page_flags(struct page *page)</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_MLOCKED,	PG_mlocked);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_FAILURE</div><div class='del'>-	u |= kpf_copy_bit(k, KPF_HWPOISON,	PG_hwpoison);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_USES_PG_UNCACHED</div><div class='del'>-	u |= kpf_copy_bit(k, KPF_UNCACHED,	PG_uncached);</div><div class='add'>+	if (u &amp; (1 &lt;&lt; KPF_HUGE))</div><div class='add'>+		u |= kpf_copy_bit(k, KPF_HWPOISON,	PG_hwpoison);</div><div class='add'>+	else</div><div class='add'>+		u |= kpf_copy_bit(ps.page_snapshot.flags.f, KPF_HWPOISON, PG_hwpoison);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_RESERVED,	PG_reserved);</div><div class='del'>-	u |= kpf_copy_bit(k, KPF_MAPPEDTODISK,	PG_mappedtodisk);</div><div class='add'>+	u |= kpf_copy_bit(k, KPF_OWNER_2,	PG_owner_2);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_PRIVATE,	PG_private);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_PRIVATE_2,	PG_private_2);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_OWNER_PRIVATE,	PG_owner_priv_1);</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_ARCH,		PG_arch_1);</div><div class='del'>-#ifdef CONFIG_ARCH_USES_PG_ARCH_X</div><div class='add'>+#ifdef CONFIG_ARCH_USES_PG_ARCH_2</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_ARCH_2,	PG_arch_2);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_USES_PG_ARCH_3</div><div class='ctx'> 	u |= kpf_copy_bit(k, KPF_ARCH_3,	PG_arch_3);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return u;</div><div class='del'>-};</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(stable_page_flags);</div><div class='ctx'> </div><div class='add'>+/* /proc/kpageflags - an array exposing page flags</div><div class='add'>+ *</div><div class='add'>+ * Each entry is a u64 representing the corresponding</div><div class='add'>+ * physical page flags.</div><div class='add'>+ */</div><div class='ctx'> static ssize_t kpageflags_read(struct file *file, char __user *buf,</div><div class='del'>-			     size_t count, loff_t *ppos)</div><div class='add'>+		size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	const unsigned long max_dump_pfn = get_max_dump_pfn();</div><div class='del'>-	u64 __user *out = (u64 __user *)buf;</div><div class='del'>-	struct page *ppage;</div><div class='del'>-	unsigned long src = *ppos;</div><div class='del'>-	unsigned long pfn;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-</div><div class='del'>-	pfn = src / KPMSIZE;</div><div class='del'>-	if (src &amp; KPMMASK || count &amp; KPMMASK)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (src &gt;= max_dump_pfn * KPMSIZE)</div><div class='del'>-		return 0;</div><div class='del'>-	count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src);</div><div class='del'>-</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * TODO: ZONE_DEVICE support requires to identify</div><div class='del'>-		 * memmaps that were actually initialized.</div><div class='del'>-		 */</div><div class='del'>-		ppage = pfn_to_online_page(pfn);</div><div class='del'>-</div><div class='del'>-		if (put_user(stable_page_flags(ppage), out)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pfn++;</div><div class='del'>-		out++;</div><div class='del'>-		count -= KPMSIZE;</div><div class='del'>-</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*ppos += (char __user *)out - buf;</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = (char __user *)out - buf;</div><div class='del'>-	return ret;</div><div class='add'>+	return kpage_read(file, buf, count, ppos, KPAGE_FLAGS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct proc_ops kpageflags_proc_ops = {</div><div class='hunk'>@@ -276,53 +276,10 @@ static const struct proc_ops kpageflags_proc_ops = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='ctx'> static ssize_t kpagecgroup_read(struct file *file, char __user *buf,</div><div class='del'>-				size_t count, loff_t *ppos)</div><div class='add'>+		size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	const unsigned long max_dump_pfn = get_max_dump_pfn();</div><div class='del'>-	u64 __user *out = (u64 __user *)buf;</div><div class='del'>-	struct page *ppage;</div><div class='del'>-	unsigned long src = *ppos;</div><div class='del'>-	unsigned long pfn;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-	u64 ino;</div><div class='del'>-</div><div class='del'>-	pfn = src / KPMSIZE;</div><div class='del'>-	if (src &amp; KPMMASK || count &amp; KPMMASK)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (src &gt;= max_dump_pfn * KPMSIZE)</div><div class='del'>-		return 0;</div><div class='del'>-	count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src);</div><div class='del'>-</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * TODO: ZONE_DEVICE support requires to identify</div><div class='del'>-		 * memmaps that were actually initialized.</div><div class='del'>-		 */</div><div class='del'>-		ppage = pfn_to_online_page(pfn);</div><div class='del'>-</div><div class='del'>-		if (ppage)</div><div class='del'>-			ino = page_cgroup_ino(ppage);</div><div class='del'>-		else</div><div class='del'>-			ino = 0;</div><div class='del'>-</div><div class='del'>-		if (put_user(ino, out)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pfn++;</div><div class='del'>-		out++;</div><div class='del'>-		count -= KPMSIZE;</div><div class='del'>-</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*ppos += (char __user *)out - buf;</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = (char __user *)out - buf;</div><div class='del'>-	return ret;</div><div class='add'>+	return kpage_read(file, buf, count, ppos, KPAGE_CGROUP);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static const struct proc_ops kpagecgroup_proc_ops = {</div><div class='ctx'> 	.proc_flags	= PROC_ENTRY_PERMANENT,</div><div class='ctx'> 	.proc_lseek	= mem_lseek,</div><div class='head'>diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c<br/>index 2ba31b6d68c0..52f0b75cbce2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/proc_net.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/proc_net.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/proc_net.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/proc_net.c</a></div><div class='hunk'>@@ -135,6 +135,7 @@ EXPORT_SYMBOL_GPL(proc_create_net_data);</div><div class='ctx'>  * @parent: The parent directory in which to create.</div><div class='ctx'>  * @ops: The seq_file ops with which to read the file.</div><div class='ctx'>  * @write: The write method with which to 'modify' the file.</div><div class='add'>+ * @state_size: The size of the per-file private state to allocate.</div><div class='ctx'>  * @data: Data for retrieval by pde_data().</div><div class='ctx'>  *</div><div class='ctx'>  * Create a network namespaced proc file in the @parent directory with the</div><div class='head'>diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c<br/>index 37cde0efee57..49ab74e0bfde 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/proc_sysctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/proc_sysctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/proc_sysctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/proc_sysctl.c</a></div><div class='hunk'>@@ -17,11 +17,12 @@</div><div class='ctx'> #include &lt;linux/bpf-cgroup.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/kmemleak.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define list_for_each_table_entry(entry, header)	\</div><div class='ctx'> 	entry = header-&gt;ctl_table;			\</div><div class='del'>-	for (size_t i = 0 ; i &lt; header-&gt;ctl_table_size &amp;&amp; entry-&gt;procname; ++i, entry++)</div><div class='add'>+	for (size_t i = 0 ; i &lt; header-&gt;ctl_table_size; ++i, entry++)</div><div class='ctx'> </div><div class='ctx'> static const struct dentry_operations proc_sys_dentry_operations;</div><div class='ctx'> static const struct file_operations proc_sys_file_operations;</div><div class='hunk'>@@ -29,9 +30,12 @@ static const struct inode_operations proc_sys_inode_operations;</div><div class='ctx'> static const struct file_operations proc_sys_dir_file_operations;</div><div class='ctx'> static const struct inode_operations proc_sys_dir_operations;</div><div class='ctx'> </div><div class='del'>-/* Support for permanently empty directories */</div><div class='del'>-static struct ctl_table sysctl_mount_point[] = {</div><div class='del'>-	{.type = SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY }</div><div class='add'>+/*</div><div class='add'>+ * Support for permanently empty directories.</div><div class='add'>+ * Must be non-empty to avoid sharing an address with other tables.</div><div class='add'>+ */</div><div class='add'>+static const struct ctl_table sysctl_mount_point[] = {</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -44,18 +48,16 @@ static struct ctl_table sysctl_mount_point[] = {</div><div class='ctx'>  */</div><div class='ctx'> struct ctl_table_header *register_sysctl_mount_point(const char *path)</div><div class='ctx'> {</div><div class='del'>-	return register_sysctl(path, sysctl_mount_point);</div><div class='add'>+	return register_sysctl_sz(path, sysctl_mount_point, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(register_sysctl_mount_point);</div><div class='ctx'> </div><div class='del'>-#define sysctl_is_perm_empty_ctl_table(tptr)		\</div><div class='del'>-	(tptr[0].type == SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)</div><div class='ctx'> #define sysctl_is_perm_empty_ctl_header(hptr)		\</div><div class='del'>-	(sysctl_is_perm_empty_ctl_table(hptr-&gt;ctl_table))</div><div class='add'>+	(hptr-&gt;type == SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)</div><div class='ctx'> #define sysctl_set_perm_empty_ctl_header(hptr)		\</div><div class='del'>-	(hptr-&gt;ctl_table[0].type = SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)</div><div class='add'>+	(hptr-&gt;type = SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)</div><div class='ctx'> #define sysctl_clear_perm_empty_ctl_header(hptr)	\</div><div class='del'>-	(hptr-&gt;ctl_table[0].type = SYSCTL_TABLE_TYPE_DEFAULT)</div><div class='add'>+	(hptr-&gt;type = SYSCTL_TABLE_TYPE_DEFAULT)</div><div class='ctx'> </div><div class='ctx'> void proc_sys_poll_notify(struct ctl_table_poll *poll)</div><div class='ctx'> {</div><div class='hunk'>@@ -66,7 +68,7 @@ void proc_sys_poll_notify(struct ctl_table_poll *poll)</div><div class='ctx'> 	wake_up_interruptible(&amp;poll-&gt;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table root_table[] = {</div><div class='add'>+static const struct ctl_table root_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname = "",</div><div class='ctx'> 		.mode = S_IFDIR|S_IRUGO|S_IXUGO,</div><div class='hunk'>@@ -87,7 +89,7 @@ static DEFINE_SPINLOCK(sysctl_lock);</div><div class='ctx'> </div><div class='ctx'> static void drop_sysctl_table(struct ctl_table_header *header);</div><div class='ctx'> static int sysctl_follow_link(struct ctl_table_header **phead,</div><div class='del'>-	struct ctl_table **pentry);</div><div class='add'>+	const struct ctl_table **pentry);</div><div class='ctx'> static int insert_links(struct ctl_table_header *head);</div><div class='ctx'> static void put_links(struct ctl_table_header *header);</div><div class='ctx'> </div><div class='hunk'>@@ -108,14 +110,15 @@ static int namecmp(const char *name1, int len1, const char *name2, int len2)</div><div class='ctx'> 	return cmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Called under sysctl_lock */</div><div class='del'>-static struct ctl_table *find_entry(struct ctl_table_header **phead,</div><div class='add'>+static const struct ctl_table *find_entry(struct ctl_table_header **phead,</div><div class='ctx'> 	struct ctl_dir *dir, const char *name, int namelen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> 	struct rb_node *node = dir-&gt;root.rb_node;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;sysctl_lock);</div><div class='add'>+</div><div class='ctx'> 	while (node)</div><div class='ctx'> 	{</div><div class='ctx'> 		struct ctl_node *ctl_node;</div><div class='hunk'>@@ -140,7 +143,7 @@ static struct ctl_table *find_entry(struct ctl_table_header **phead,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)</div><div class='add'>+static int insert_entry(struct ctl_table_header *head, const struct ctl_table *entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node = &amp;head-&gt;node[entry - head-&gt;ctl_table].node;</div><div class='ctx'> 	struct rb_node **p = &amp;head-&gt;parent-&gt;root.rb_node;</div><div class='hunk'>@@ -150,7 +153,7 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)</div><div class='ctx'> </div><div class='ctx'> 	while (*p) {</div><div class='ctx'> 		struct ctl_table_header *parent_head;</div><div class='del'>-		struct ctl_table *parent_entry;</div><div class='add'>+		const struct ctl_table *parent_entry;</div><div class='ctx'> 		struct ctl_node *parent_node;</div><div class='ctx'> 		const char *parent_name;</div><div class='ctx'> 		int cmp;</div><div class='hunk'>@@ -179,7 +182,7 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void erase_entry(struct ctl_table_header *head, struct ctl_table *entry)</div><div class='add'>+static void erase_entry(struct ctl_table_header *head, const struct ctl_table *entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node = &amp;head-&gt;node[entry - head-&gt;ctl_table].node;</div><div class='ctx'> </div><div class='hunk'>@@ -188,7 +191,7 @@ static void erase_entry(struct ctl_table_header *head, struct ctl_table *entry)</div><div class='ctx'> </div><div class='ctx'> static void init_header(struct ctl_table_header *head,</div><div class='ctx'> 	struct ctl_table_root *root, struct ctl_table_set *set,</div><div class='del'>-	struct ctl_node *node, struct ctl_table *table, size_t table_size)</div><div class='add'>+	struct ctl_node *node, const struct ctl_table *table, size_t table_size)</div><div class='ctx'> {</div><div class='ctx'> 	head-&gt;ctl_table = table;</div><div class='ctx'> 	head-&gt;ctl_table_size = table_size;</div><div class='hunk'>@@ -203,18 +206,20 @@ static void init_header(struct ctl_table_header *head,</div><div class='ctx'> 	head-&gt;node = node;</div><div class='ctx'> 	INIT_HLIST_HEAD(&amp;head-&gt;inodes);</div><div class='ctx'> 	if (node) {</div><div class='del'>-		struct ctl_table *entry;</div><div class='add'>+		const struct ctl_table *entry;</div><div class='ctx'> </div><div class='ctx'> 		list_for_each_table_entry(entry, head) {</div><div class='ctx'> 			node-&gt;header = head;</div><div class='ctx'> 			node++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (table == sysctl_mount_point)</div><div class='add'>+		sysctl_set_perm_empty_ctl_header(head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void erase_header(struct ctl_table_header *head)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_table_entry(entry, head)</div><div class='ctx'> 		erase_entry(head, entry);</div><div class='hunk'>@@ -222,7 +227,7 @@ static void erase_header(struct ctl_table_header *head)</div><div class='ctx'> </div><div class='ctx'> static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> 	struct ctl_table_header *dir_h = &amp;dir-&gt;header;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -232,8 +237,7 @@ static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header)</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='ctx'> 	/* Am I creating a permanently empty directory? */</div><div class='del'>-	if (header-&gt;ctl_table_size &gt; 0 &amp;&amp;</div><div class='del'>-	    sysctl_is_perm_empty_ctl_table(header-&gt;ctl_table)) {</div><div class='add'>+	if (sysctl_is_perm_empty_ctl_header(header)) {</div><div class='ctx'> 		if (!RB_EMPTY_ROOT(&amp;dir-&gt;root))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		sysctl_set_perm_empty_ctl_header(dir_h);</div><div class='hunk'>@@ -261,18 +265,20 @@ fail_links:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called under sysctl_lock */</div><div class='ctx'> static int use_table(struct ctl_table_header *p)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_held(&amp;sysctl_lock);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(p-&gt;unregistering))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	p-&gt;used++;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called under sysctl_lock */</div><div class='ctx'> static void unuse_table(struct ctl_table_header *p)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_held(&amp;sysctl_lock);</div><div class='add'>+</div><div class='ctx'> 	if (!--p-&gt;used)</div><div class='ctx'> 		if (unlikely(p-&gt;unregistering))</div><div class='ctx'> 			complete(p-&gt;unregistering);</div><div class='hunk'>@@ -283,9 +289,11 @@ static void proc_sys_invalidate_dcache(struct ctl_table_header *head)</div><div class='ctx'> 	proc_invalidate_siblings_dcache(&amp;head-&gt;inodes, &amp;sysctl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* called under sysctl_lock, will reacquire if has to wait */</div><div class='ctx'> static void start_unregistering(struct ctl_table_header *p)</div><div class='ctx'> {</div><div class='add'>+	/* will reacquire if has to wait */</div><div class='add'>+	lockdep_assert_held(&amp;sysctl_lock);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if p-&gt;used is 0, nobody will ever touch that entry again;</div><div class='ctx'> 	 * we'll eliminate all paths to it before dropping sysctl_lock</div><div class='hunk'>@@ -342,12 +350,12 @@ lookup_header_set(struct ctl_table_root *root)</div><div class='ctx'> 	return set;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table *lookup_entry(struct ctl_table_header **phead,</div><div class='del'>-				      struct ctl_dir *dir,</div><div class='del'>-				      const char *name, int namelen)</div><div class='add'>+static const struct ctl_table *lookup_entry(struct ctl_table_header **phead,</div><div class='add'>+					    struct ctl_dir *dir,</div><div class='add'>+					    const char *name, int namelen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sysctl_lock);</div><div class='ctx'> 	entry = find_entry(&amp;head, dir, name, namelen);</div><div class='hunk'>@@ -372,10 +380,10 @@ static struct ctl_node *first_usable_entry(struct rb_node *node)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void first_entry(struct ctl_dir *dir,</div><div class='del'>-	struct ctl_table_header **phead, struct ctl_table **pentry)</div><div class='add'>+	struct ctl_table_header **phead, const struct ctl_table **pentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head = NULL;</div><div class='del'>-	struct ctl_table *entry = NULL;</div><div class='add'>+	const struct ctl_table *entry = NULL;</div><div class='ctx'> 	struct ctl_node *ctl_node;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sysctl_lock);</div><div class='hunk'>@@ -389,10 +397,10 @@ static void first_entry(struct ctl_dir *dir,</div><div class='ctx'> 	*pentry = entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void next_entry(struct ctl_table_header **phead, struct ctl_table **pentry)</div><div class='add'>+static void next_entry(struct ctl_table_header **phead, const struct ctl_table **pentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head = *phead;</div><div class='del'>-	struct ctl_table *entry = *pentry;</div><div class='add'>+	const struct ctl_table *entry = *pentry;</div><div class='ctx'> 	struct ctl_node *ctl_node = &amp;head-&gt;node[entry - head-&gt;ctl_table];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sysctl_lock);</div><div class='hunk'>@@ -425,7 +433,7 @@ static int test_perm(int mode, int op)</div><div class='ctx'> 	return -EACCES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sysctl_perm(struct ctl_table_header *head, struct ctl_table *table, int op)</div><div class='add'>+static int sysctl_perm(struct ctl_table_header *head, const struct ctl_table *table, int op)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_root *root = head-&gt;root;</div><div class='ctx'> 	int mode;</div><div class='hunk'>@@ -439,7 +447,7 @@ static int sysctl_perm(struct ctl_table_header *head, struct ctl_table *table, i</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct inode *proc_sys_make_inode(struct super_block *sb,</div><div class='del'>-		struct ctl_table_header *head, struct ctl_table *table)</div><div class='add'>+		struct ctl_table_header *head, const struct ctl_table *table)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_root *root = head-&gt;root;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -479,12 +487,10 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,</div><div class='ctx'> 			make_empty_dir_inode(inode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	inode-&gt;i_uid = GLOBAL_ROOT_UID;</div><div class='add'>+	inode-&gt;i_gid = GLOBAL_ROOT_GID;</div><div class='ctx'> 	if (root-&gt;set_ownership)</div><div class='del'>-		root-&gt;set_ownership(head, table, &amp;inode-&gt;i_uid, &amp;inode-&gt;i_gid);</div><div class='del'>-	else {</div><div class='del'>-		inode-&gt;i_uid = GLOBAL_ROOT_UID;</div><div class='del'>-		inode-&gt;i_gid = GLOBAL_ROOT_GID;</div><div class='del'>-	}</div><div class='add'>+		root-&gt;set_ownership(head, &amp;inode-&gt;i_uid, &amp;inode-&gt;i_gid);</div><div class='ctx'> </div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -512,7 +518,7 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	struct ctl_table_header *head = grab_header(dir);</div><div class='ctx'> 	struct ctl_table_header *h = NULL;</div><div class='ctx'> 	const struct qstr *name = &amp;dentry-&gt;d_name;</div><div class='del'>-	struct ctl_table *p;</div><div class='add'>+	const struct ctl_table *p;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct dentry *err = ERR_PTR(-ENOENT);</div><div class='ctx'> 	struct ctl_dir *ctl_dir;</div><div class='hunk'>@@ -534,9 +540,8 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	d_set_d_op(dentry, &amp;proc_sys_dentry_operations);</div><div class='ctx'> 	inode = proc_sys_make_inode(dir-&gt;i_sb, h ? h : head, p);</div><div class='del'>-	err = d_splice_alias(inode, dentry);</div><div class='add'>+	err = d_splice_alias_ops(inode, dentry, &amp;proc_sys_dentry_operations);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (h)</div><div class='hunk'>@@ -550,7 +555,7 @@ static ssize_t proc_sys_call_handler(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(iocb-&gt;ki_filp);</div><div class='ctx'> 	struct ctl_table_header *head = grab_header(inode);</div><div class='del'>-	struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='add'>+	const struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='ctx'> 	size_t count = iov_iter_count(iter);</div><div class='ctx'> 	char *kbuf;</div><div class='ctx'> 	ssize_t error;</div><div class='hunk'>@@ -624,7 +629,7 @@ static ssize_t proc_sys_write(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> static int proc_sys_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head = grab_header(inode);</div><div class='del'>-	struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='add'>+	const struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='ctx'> </div><div class='ctx'> 	/* sysctl was unregistered */</div><div class='ctx'> 	if (IS_ERR(head))</div><div class='hunk'>@@ -642,7 +647,7 @@ static __poll_t proc_sys_poll(struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file_inode(filp);</div><div class='ctx'> 	struct ctl_table_header *head = grab_header(inode);</div><div class='del'>-	struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='add'>+	const struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='ctx'> 	__poll_t ret = DEFAULT_POLLMASK;</div><div class='ctx'> 	unsigned long event;</div><div class='ctx'> </div><div class='hunk'>@@ -673,7 +678,7 @@ out:</div><div class='ctx'> static bool proc_sys_fill_cache(struct file *file,</div><div class='ctx'> 				struct dir_context *ctx,</div><div class='ctx'> 				struct ctl_table_header *head,</div><div class='del'>-				struct ctl_table *table)</div><div class='add'>+				const struct ctl_table *table)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *child, *dir = file-&gt;f_path.dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -693,16 +698,16 @@ static bool proc_sys_fill_cache(struct file *file,</div><div class='ctx'> 			return false;</div><div class='ctx'> 		if (d_in_lookup(child)) {</div><div class='ctx'> 			struct dentry *res;</div><div class='del'>-			d_set_d_op(child, &amp;proc_sys_dentry_operations);</div><div class='ctx'> 			inode = proc_sys_make_inode(dir-&gt;d_sb, head, table);</div><div class='del'>-			res = d_splice_alias(inode, child);</div><div class='add'>+			res = d_splice_alias_ops(inode, child,</div><div class='add'>+						 &amp;proc_sys_dentry_operations);</div><div class='ctx'> 			d_lookup_done(child);</div><div class='ctx'> 			if (unlikely(res)) {</div><div class='del'>-				if (IS_ERR(res)) {</div><div class='del'>-					dput(child);</div><div class='del'>-					return false;</div><div class='del'>-				}</div><div class='ctx'> 				dput(child);</div><div class='add'>+</div><div class='add'>+				if (IS_ERR(res))</div><div class='add'>+					return false;</div><div class='add'>+</div><div class='ctx'> 				child = res;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -717,7 +722,7 @@ static bool proc_sys_fill_cache(struct file *file,</div><div class='ctx'> static bool proc_sys_link_fill_cache(struct file *file,</div><div class='ctx'> 				    struct dir_context *ctx,</div><div class='ctx'> 				    struct ctl_table_header *head,</div><div class='del'>-				    struct ctl_table *table)</div><div class='add'>+				    const struct ctl_table *table)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret = true;</div><div class='ctx'> </div><div class='hunk'>@@ -735,7 +740,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int scan(struct ctl_table_header *head, struct ctl_table *table,</div><div class='add'>+static int scan(struct ctl_table_header *head, const struct ctl_table *table,</div><div class='ctx'> 		unsigned long *pos, struct file *file,</div><div class='ctx'> 		struct dir_context *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -759,7 +764,7 @@ static int proc_sys_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head = grab_header(file_inode(file));</div><div class='ctx'> 	struct ctl_table_header *h = NULL;</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> 	struct ctl_dir *ctl_dir;</div><div class='ctx'> 	unsigned long pos;</div><div class='ctx'> </div><div class='hunk'>@@ -792,7 +797,7 @@ static int proc_sys_permission(struct mnt_idmap *idmap,</div><div class='ctx'> 	 * are _NOT_ writeable, capabilities or not.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	/* Executable files are not allowed under /proc/sys/ */</div><div class='hunk'>@@ -836,7 +841,7 @@ static int proc_sys_getattr(struct mnt_idmap *idmap,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='ctx'> 	struct ctl_table_header *head = grab_header(inode);</div><div class='del'>-	struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='add'>+	const struct ctl_table *table = PROC_I(inode)-&gt;sysctl_entry;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(head))</div><div class='ctx'> 		return PTR_ERR(head);</div><div class='hunk'>@@ -878,7 +883,8 @@ static const struct inode_operations proc_sys_dir_operations = {</div><div class='ctx'> 	.getattr	= proc_sys_getattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int proc_sys_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='add'>+static int proc_sys_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			       struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; LOOKUP_RCU)</div><div class='ctx'> 		return -ECHILD;</div><div class='hunk'>@@ -911,17 +917,21 @@ static int proc_sys_compare(const struct dentry *dentry,</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	/* Although proc doesn't have negative dentries, rcu-walk means</div><div class='del'>-	 * that inode here can be NULL */</div><div class='del'>-	/* AV: can it, indeed? */</div><div class='del'>-	inode = d_inode_rcu(dentry);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return 1;</div><div class='ctx'> 	if (name-&gt;len != len)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (memcmp(name-&gt;name, str, len))</div><div class='ctx'> 		return 1;</div><div class='del'>-	head = rcu_dereference(PROC_I(inode)-&gt;sysctl);</div><div class='add'>+</div><div class='add'>+	// false positive is fine here - we'll recheck anyway</div><div class='add'>+	if (d_in_lookup(dentry))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	inode = d_inode_rcu(dentry);</div><div class='add'>+	// we just might have run into dentry in the middle of __dentry_kill()</div><div class='add'>+	if (!inode)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	head = READ_ONCE(PROC_I(inode)-&gt;sysctl);</div><div class='ctx'> 	return !head || !sysctl_is_seen(head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +945,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,</div><div class='ctx'> 				   const char *name, int namelen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = find_entry(&amp;head, dir, name, namelen);</div><div class='ctx'> 	if (!entry)</div><div class='hunk'>@@ -954,14 +964,14 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,</div><div class='ctx'> 	char *new_name;</div><div class='ctx'> </div><div class='ctx'> 	new = kzalloc(sizeof(*new) + sizeof(struct ctl_node) +</div><div class='del'>-		      sizeof(struct ctl_table)*2 +  namelen + 1,</div><div class='add'>+		      sizeof(struct ctl_table) +  namelen + 1,</div><div class='ctx'> 		      GFP_KERNEL);</div><div class='ctx'> 	if (!new)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	node = (struct ctl_node *)(new + 1);</div><div class='ctx'> 	table = (struct ctl_table *)(node + 1);</div><div class='del'>-	new_name = (char *)(table + 2);</div><div class='add'>+	new_name = (char *)(table + 1);</div><div class='ctx'> 	memcpy(new_name, name, namelen);</div><div class='ctx'> 	table[0].procname = new_name;</div><div class='ctx'> 	table[0].mode = S_IFDIR|S_IRUGO|S_IXUGO;</div><div class='hunk'>@@ -1046,12 +1056,12 @@ static struct ctl_dir *xlate_dir(struct ctl_table_set *set, struct ctl_dir *dir)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sysctl_follow_link(struct ctl_table_header **phead,</div><div class='del'>-	struct ctl_table **pentry)</div><div class='add'>+	const struct ctl_table **pentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> 	struct ctl_table_root *root;</div><div class='ctx'> 	struct ctl_table_set *set;</div><div class='del'>-	struct ctl_table *entry;</div><div class='ctx'> 	struct ctl_dir *dir;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1078,7 +1088,7 @@ static int sysctl_follow_link(struct ctl_table_header **phead,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sysctl_err(const char *path, struct ctl_table *table, char *fmt, ...)</div><div class='add'>+static int sysctl_err(const char *path, const struct ctl_table *table, char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	struct va_format vaf;</div><div class='ctx'> 	va_list args;</div><div class='hunk'>@@ -1094,8 +1104,9 @@ static int sysctl_err(const char *path, struct ctl_table *table, char *fmt, ...)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sysctl_check_table_array(const char *path, struct ctl_table *table)</div><div class='add'>+static int sysctl_check_table_array(const char *path, const struct ctl_table *table)</div><div class='ctx'> {</div><div class='add'>+	unsigned int extra;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((table-&gt;proc_handler == proc_douintvec) ||</div><div class='hunk'>@@ -1107,6 +1118,19 @@ static int sysctl_check_table_array(const char *path, struct ctl_table *table)</div><div class='ctx'> 	if (table-&gt;proc_handler == proc_dou8vec_minmax) {</div><div class='ctx'> 		if (table-&gt;maxlen != sizeof(u8))</div><div class='ctx'> 			err |= sysctl_err(path, table, "array not allowed");</div><div class='add'>+</div><div class='add'>+		if (table-&gt;extra1) {</div><div class='add'>+			extra = *(unsigned int *) table-&gt;extra1;</div><div class='add'>+			if (extra &gt; 255U)</div><div class='add'>+				err |= sysctl_err(path, table,</div><div class='add'>+						"range value too large for proc_dou8vec_minmax");</div><div class='add'>+		}</div><div class='add'>+		if (table-&gt;extra2) {</div><div class='add'>+			extra = *(unsigned int *) table-&gt;extra2;</div><div class='add'>+			if (extra &gt; 255U)</div><div class='add'>+				err |= sysctl_err(path, table,</div><div class='add'>+						"range value too large for proc_dou8vec_minmax");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (table-&gt;proc_handler == proc_dobool) {</div><div class='hunk'>@@ -1119,9 +1143,11 @@ static int sysctl_check_table_array(const char *path, struct ctl_table *table)</div><div class='ctx'> </div><div class='ctx'> static int sysctl_check_table(const char *path, struct ctl_table_header *header)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	list_for_each_table_entry(entry, header) {</div><div class='add'>+		if (!entry-&gt;procname)</div><div class='add'>+			err |= sysctl_err(path, entry, "procname is null");</div><div class='ctx'> 		if ((entry-&gt;proc_handler == proc_dostring) ||</div><div class='ctx'> 		    (entry-&gt;proc_handler == proc_dobool) ||</div><div class='ctx'> 		    (entry-&gt;proc_handler == proc_dointvec) ||</div><div class='hunk'>@@ -1153,22 +1179,21 @@ static int sysctl_check_table(const char *path, struct ctl_table_header *header)</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table_header *head)</div><div class='ctx'> {</div><div class='del'>-	struct ctl_table *link_table, *entry, *link;</div><div class='add'>+	struct ctl_table *link_table, *link;</div><div class='ctx'> 	struct ctl_table_header *links;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> 	struct ctl_node *node;</div><div class='ctx'> 	char *link_name;</div><div class='del'>-	int nr_entries, name_bytes;</div><div class='add'>+	int name_bytes;</div><div class='ctx'> </div><div class='ctx'> 	name_bytes = 0;</div><div class='del'>-	nr_entries = 0;</div><div class='ctx'> 	list_for_each_table_entry(entry, head) {</div><div class='del'>-		nr_entries++;</div><div class='ctx'> 		name_bytes += strlen(entry-&gt;procname) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	links = kzalloc(sizeof(struct ctl_table_header) +</div><div class='del'>-			sizeof(struct ctl_node)*nr_entries +</div><div class='del'>-			sizeof(struct ctl_table)*(nr_entries + 1) +</div><div class='add'>+			sizeof(struct ctl_node)*head-&gt;ctl_table_size +</div><div class='add'>+			sizeof(struct ctl_table)*head-&gt;ctl_table_size +</div><div class='ctx'> 			name_bytes,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -1176,8 +1201,8 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table_</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	node = (struct ctl_node *)(links + 1);</div><div class='del'>-	link_table = (struct ctl_table *)(node + nr_entries);</div><div class='del'>-	link_name = (char *)&amp;link_table[nr_entries + 1];</div><div class='add'>+	link_table = (struct ctl_table *)(node + head-&gt;ctl_table_size);</div><div class='add'>+	link_name = (char *)(link_table + head-&gt;ctl_table_size);</div><div class='ctx'> 	link = link_table;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_table_entry(entry, head) {</div><div class='hunk'>@@ -1191,7 +1216,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table_</div><div class='ctx'> 	}</div><div class='ctx'> 	init_header(links, dir-&gt;header.root, dir-&gt;header.set, node, link_table,</div><div class='ctx'> 		    head-&gt;ctl_table_size);</div><div class='del'>-	links-&gt;nreg = nr_entries;</div><div class='add'>+	links-&gt;nreg = head-&gt;ctl_table_size;</div><div class='ctx'> </div><div class='ctx'> 	return links;</div><div class='ctx'> }</div><div class='hunk'>@@ -1201,10 +1226,10 @@ static bool get_links(struct ctl_dir *dir,</div><div class='ctx'> 		      struct ctl_table_root *link_root)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *tmp_head;</div><div class='del'>-	struct ctl_table *entry, *link;</div><div class='add'>+	const struct ctl_table *entry, *link;</div><div class='ctx'> </div><div class='ctx'> 	if (header-&gt;ctl_table_size == 0 ||</div><div class='del'>-	    sysctl_is_perm_empty_ctl_table(header-&gt;ctl_table))</div><div class='add'>+	    sysctl_is_perm_empty_ctl_header(header))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* Are there links available for every entry in table? */</div><div class='hunk'>@@ -1303,28 +1328,23 @@ static struct ctl_dir *sysctl_mkdir_p(struct ctl_dir *dir, const char *path)</div><div class='ctx'>  * __register_sysctl_table - register a leaf sysctl table</div><div class='ctx'>  * @set: Sysctl tree to register on</div><div class='ctx'>  * @path: The path to the directory the sysctl table is in.</div><div class='del'>- * @table: the top-level table structure without any child. This table</div><div class='del'>- * 	 should not be free'd after registration. So it should not be</div><div class='del'>- * 	 used on stack. It can either be a global or dynamically allocated</div><div class='del'>- * 	 by the caller and free'd later after sysctl unregistration.</div><div class='add'>+ *</div><div class='add'>+ * @table: the top-level table structure. This table should not be free'd</div><div class='add'>+ *         after registration. So it should not be used on stack. It can either</div><div class='add'>+ *         be a global or dynamically allocated by the caller and free'd later</div><div class='add'>+ *         after sysctl unregistration.</div><div class='ctx'>  * @table_size : The number of elements in table</div><div class='ctx'>  *</div><div class='ctx'>  * Register a sysctl table hierarchy. @table should be a filled in ctl_table</div><div class='del'>- * array. A completely 0 filled entry terminates the table.</div><div class='add'>+ * array.</div><div class='ctx'>  *</div><div class='ctx'>  * The members of the &amp;struct ctl_table structure are used as follows:</div><div class='del'>- *</div><div class='ctx'>  * procname - the name of the sysctl file under /proc/sys. Set to %NULL to not</div><div class='ctx'>  *            enter a sysctl file</div><div class='del'>- *</div><div class='del'>- * data - a pointer to data for use by proc_handler</div><div class='del'>- *</div><div class='del'>- * maxlen - the maximum size in bytes of the data</div><div class='del'>- *</div><div class='del'>- * mode - the file permissions for the /proc/sys file</div><div class='del'>- *</div><div class='del'>- * child - must be %NULL.</div><div class='del'>- *</div><div class='add'>+ * data     - a pointer to data for use by proc_handler</div><div class='add'>+ * maxlen   - the maximum size in bytes of the data</div><div class='add'>+ * mode     - the file permissions for the /proc/sys file</div><div class='add'>+ * type     - Defines the target type (described in struct definition)</div><div class='ctx'>  * proc_handler - the text handler routine (described below)</div><div class='ctx'>  *</div><div class='ctx'>  * extra1, extra2 - extra pointers usable by the proc handler routines</div><div class='hunk'>@@ -1332,8 +1352,7 @@ static struct ctl_dir *sysctl_mkdir_p(struct ctl_dir *dir, const char *path)</div><div class='ctx'>  * [0] https://lkml.kernel.org/87zgpte9o4.fsf@email.froward.int.ebiederm.org</div><div class='ctx'>  *</div><div class='ctx'>  * Leaf nodes in the sysctl tree will be represented by a single file</div><div class='del'>- * under /proc; non-leaf nodes (where child is not NULL) are not allowed,</div><div class='del'>- * sysctl_check_table() verifies this.</div><div class='add'>+ * under /proc; non-leaf nodes are not allowed.</div><div class='ctx'>  *</div><div class='ctx'>  * There must be a proc_handler routine for any terminal nodes.</div><div class='ctx'>  * Several default handlers are available to cover common cases -</div><div class='hunk'>@@ -1350,7 +1369,7 @@ static struct ctl_dir *sysctl_mkdir_p(struct ctl_dir *dir, const char *path)</div><div class='ctx'>  */</div><div class='ctx'> struct ctl_table_header *__register_sysctl_table(</div><div class='ctx'> 	struct ctl_table_set *set,</div><div class='del'>-	const char *path, struct ctl_table *table, size_t table_size)</div><div class='add'>+	const char *path, const struct ctl_table *table, size_t table_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_root *root = set-&gt;dir.header.root;</div><div class='ctx'> 	struct ctl_table_header *header;</div><div class='hunk'>@@ -1411,7 +1430,7 @@ fail:</div><div class='ctx'>  *</div><div class='ctx'>  * See __register_sysctl_table for more details.</div><div class='ctx'>  */</div><div class='del'>-struct ctl_table_header *register_sysctl_sz(const char *path, struct ctl_table *table,</div><div class='add'>+struct ctl_table_header *register_sysctl_sz(const char *path, const struct ctl_table *table,</div><div class='ctx'> 					    size_t table_size)</div><div class='ctx'> {</div><div class='ctx'> 	return __register_sysctl_table(&amp;sysctl_table_root.default_set,</div><div class='hunk'>@@ -1440,7 +1459,7 @@ EXPORT_SYMBOL(register_sysctl_sz);</div><div class='ctx'>  *</div><div class='ctx'>  * Context: if your base directory does not exist it will be created for you.</div><div class='ctx'>  */</div><div class='del'>-void __init __register_sysctl_init(const char *path, struct ctl_table *table,</div><div class='add'>+void __init __register_sysctl_init(const char *path, const struct ctl_table *table,</div><div class='ctx'> 				 const char *table_name, size_t table_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct ctl_table_header *hdr = register_sysctl_sz(path, table, table_size);</div><div class='hunk'>@@ -1458,7 +1477,7 @@ static void put_links(struct ctl_table_header *header)</div><div class='ctx'> 	struct ctl_table_root *root = header-&gt;root;</div><div class='ctx'> 	struct ctl_dir *parent = header-&gt;parent;</div><div class='ctx'> 	struct ctl_dir *core_parent;</div><div class='del'>-	struct ctl_table *entry;</div><div class='add'>+	const struct ctl_table *entry;</div><div class='ctx'> </div><div class='ctx'> 	if (header-&gt;set == root_set)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1469,7 +1488,7 @@ static void put_links(struct ctl_table_header *header)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_table_entry(entry, header) {</div><div class='ctx'> 		struct ctl_table_header *link_head;</div><div class='del'>-		struct ctl_table *link;</div><div class='add'>+		const struct ctl_table *link;</div><div class='ctx'> 		const char *name = entry-&gt;procname;</div><div class='ctx'> </div><div class='ctx'> 		link = find_entry(&amp;link_head, core_parent, name, strlen(name));</div><div class='head'>diff --git a/fs/proc/root.c b/fs/proc/root.c<br/>index b55dbc70287b..d8ca41d823e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/root.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/root.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/root.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/root.c</a></div><div class='hunk'>@@ -38,12 +38,14 @@ enum proc_param {</div><div class='ctx'> 	Opt_gid,</div><div class='ctx'> 	Opt_hidepid,</div><div class='ctx'> 	Opt_subset,</div><div class='add'>+	Opt_pidns,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fs_parameter_spec proc_fs_parameters[] = {</div><div class='del'>-	fsparam_u32("gid",	Opt_gid),</div><div class='add'>+	fsparam_u32("gid",		Opt_gid),</div><div class='ctx'> 	fsparam_string("hidepid",	Opt_hidepid),</div><div class='ctx'> 	fsparam_string("subset",	Opt_subset),</div><div class='add'>+	fsparam_file_or_string("pidns",	Opt_pidns),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -109,11 +111,66 @@ static int proc_parse_subset_param(struct fs_context *fc, char *value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PID_NS</div><div class='add'>+static int proc_parse_pidns_param(struct fs_context *fc,</div><div class='add'>+				  struct fs_parameter *param,</div><div class='add'>+				  struct fs_parse_result *result)</div><div class='add'>+{</div><div class='add'>+	struct proc_fs_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct pid_namespace *target, *active = task_active_pid_ns(current);</div><div class='add'>+	struct ns_common *ns;</div><div class='add'>+	struct file *ns_filp __free(fput) = NULL;</div><div class='add'>+</div><div class='add'>+	switch (param-&gt;type) {</div><div class='add'>+	case fs_value_is_file:</div><div class='add'>+		/* came through fsconfig, steal the file reference */</div><div class='add'>+		ns_filp = no_free_ptr(param-&gt;file);</div><div class='add'>+		break;</div><div class='add'>+	case fs_value_is_string:</div><div class='add'>+		ns_filp = filp_open(param-&gt;string, O_RDONLY, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(true);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!ns_filp)</div><div class='add'>+		ns_filp = ERR_PTR(-EBADF);</div><div class='add'>+	if (IS_ERR(ns_filp)) {</div><div class='add'>+		errorfc(fc, "could not get file from pidns argument");</div><div class='add'>+		return PTR_ERR(ns_filp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!proc_ns_file(ns_filp))</div><div class='add'>+		return invalfc(fc, "pidns argument is not an nsfs file");</div><div class='add'>+	ns = get_proc_ns(file_inode(ns_filp));</div><div class='add'>+	if (ns-&gt;ns_type != CLONE_NEWPID)</div><div class='add'>+		return invalfc(fc, "pidns argument is not a pidns file");</div><div class='add'>+	target = container_of(ns, struct pid_namespace, ns);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * pidns= is shorthand for joining the pidns to get a fsopen fd, so the</div><div class='add'>+	 * permission model should be the same as pidns_install().</div><div class='add'>+	 */</div><div class='add'>+	if (!ns_capable(target-&gt;user_ns, CAP_SYS_ADMIN)) {</div><div class='add'>+		errorfc(fc, "insufficient permissions to set pidns");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	if (!pidns_is_ancestor(target, active))</div><div class='add'>+		return invalfc(fc, "cannot set pidns to non-descendant pidns");</div><div class='add'>+</div><div class='add'>+	put_pid_ns(ctx-&gt;pid_ns);</div><div class='add'>+	ctx-&gt;pid_ns = get_pid_ns(target);</div><div class='add'>+	put_user_ns(fc-&gt;user_ns);</div><div class='add'>+	fc-&gt;user_ns = get_user_ns(ctx-&gt;pid_ns-&gt;user_ns);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PID_NS */</div><div class='add'>+</div><div class='ctx'> static int proc_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_fs_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct fs_parse_result result;</div><div class='del'>-	int opt;</div><div class='add'>+	int opt, err;</div><div class='ctx'> </div><div class='ctx'> 	opt = fs_parse(fc, proc_fs_parameters, param, &amp;result);</div><div class='ctx'> 	if (opt &lt; 0)</div><div class='hunk'>@@ -125,14 +182,38 @@ static int proc_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case Opt_hidepid:</div><div class='del'>-		if (proc_parse_hidepid_param(fc, param))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		err = proc_parse_hidepid_param(fc, param);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case Opt_subset:</div><div class='del'>-		if (proc_parse_subset_param(fc, param-&gt;string) &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		err = proc_parse_subset_param(fc, param-&gt;string);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case Opt_pidns:</div><div class='add'>+#ifdef CONFIG_PID_NS</div><div class='add'>+		/*</div><div class='add'>+		 * We would have to RCU-protect every proc_pid_ns() or</div><div class='add'>+		 * proc_sb_info() access if we allowed this to be reconfigured</div><div class='add'>+		 * for an existing procfs instance. Luckily, procfs instances</div><div class='add'>+		 * are cheap to create, and mount-beneath would let you</div><div class='add'>+		 * atomically replace an instance even with overmounts.</div><div class='add'>+		 */</div><div class='add'>+		if (fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE) {</div><div class='add'>+			errorfc(fc, "cannot reconfigure pidns for existing procfs");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		err = proc_parse_pidns_param(fc, param, &amp;result);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 		break;</div><div class='add'>+#else</div><div class='add'>+		errorfc(fc, "pidns mount flag not supported on this system");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -154,6 +235,11 @@ static void proc_apply_options(struct proc_fs_info *fs_info,</div><div class='ctx'> 		fs_info-&gt;hide_pid = ctx-&gt;hidepid;</div><div class='ctx'> 	if (ctx-&gt;mask &amp; (1 &lt;&lt; Opt_subset))</div><div class='ctx'> 		fs_info-&gt;pidonly = ctx-&gt;pidonly;</div><div class='add'>+	if (ctx-&gt;mask &amp; (1 &lt;&lt; Opt_pidns) &amp;&amp;</div><div class='add'>+	    !WARN_ON_ONCE(fc-&gt;purpose == FS_CONTEXT_FOR_RECONFIGURE)) {</div><div class='add'>+		put_pid_ns(fs_info-&gt;pid_ns);</div><div class='add'>+		fs_info-&gt;pid_ns = get_pid_ns(ctx-&gt;pid_ns);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int proc_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='hunk'>@@ -261,17 +347,11 @@ static void proc_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_fs_info *fs_info = proc_sb_info(sb);</div><div class='ctx'> </div><div class='del'>-	if (!fs_info) {</div><div class='del'>-		kill_anon_super(sb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dput(fs_info-&gt;proc_self);</div><div class='del'>-	dput(fs_info-&gt;proc_thread_self);</div><div class='del'>-</div><div class='ctx'> 	kill_anon_super(sb);</div><div class='del'>-	put_pid_ns(fs_info-&gt;pid_ns);</div><div class='del'>-	kfree(fs_info);</div><div class='add'>+	if (fs_info) {</div><div class='add'>+		put_pid_ns(fs_info-&gt;pid_ns);</div><div class='add'>+		kfree_rcu(fs_info, rcu);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type proc_fs_type = {</div><div class='hunk'>@@ -363,12 +443,12 @@ static const struct inode_operations proc_root_inode_operations = {</div><div class='ctx'>  * This is the root "inode" in the /proc tree..</div><div class='ctx'>  */</div><div class='ctx'> struct proc_dir_entry proc_root = {</div><div class='del'>-	.low_ino	= PROC_ROOT_INO, </div><div class='del'>-	.namelen	= 5, </div><div class='del'>-	.mode		= S_IFDIR | S_IRUGO | S_IXUGO, </div><div class='del'>-	.nlink		= 2, </div><div class='add'>+	.low_ino	= PROCFS_ROOT_INO,</div><div class='add'>+	.namelen	= 5,</div><div class='add'>+	.mode		= S_IFDIR | S_IRUGO | S_IXUGO,</div><div class='add'>+	.nlink		= 2,</div><div class='ctx'> 	.refcnt		= REFCOUNT_INIT(1),</div><div class='del'>-	.proc_iops	= &amp;proc_root_inode_operations, </div><div class='add'>+	.proc_iops	= &amp;proc_root_inode_operations,</div><div class='ctx'> 	.proc_dir_ops	= &amp;proc_root_operations,</div><div class='ctx'> 	.parent		= &amp;proc_root,</div><div class='ctx'> 	.subdir		= RB_ROOT,</div><div class='head'>diff --git a/fs/proc/self.c b/fs/proc/self.c<br/>index b46fbfd22681..62d2c0cfe35c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/self.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/self.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/self.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/self.c</a></div><div class='hunk'>@@ -31,12 +31,11 @@ static const struct inode_operations proc_self_inode_operations = {</div><div class='ctx'> 	.get_link	= proc_self_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned self_inum __ro_after_init;</div><div class='add'>+unsigned self_inum __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> int proc_setup_self(struct super_block *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *root_inode = d_inode(s-&gt;s_root);</div><div class='del'>-	struct proc_fs_info *fs_info = proc_sb_info(s);</div><div class='ctx'> 	struct dentry *self;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -51,18 +50,15 @@ int proc_setup_self(struct super_block *s)</div><div class='ctx'> 			inode-&gt;i_uid = GLOBAL_ROOT_UID;</div><div class='ctx'> 			inode-&gt;i_gid = GLOBAL_ROOT_GID;</div><div class='ctx'> 			inode-&gt;i_op = &amp;proc_self_inode_operations;</div><div class='del'>-			d_add(self, inode);</div><div class='add'>+			d_make_persistent(self, inode);</div><div class='ctx'> 			ret = 0;</div><div class='del'>-		} else {</div><div class='del'>-			dput(self);</div><div class='ctx'> 		}</div><div class='add'>+		dput(self);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode_unlock(root_inode);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_err("proc_fill_super: can't allocate /proc/self\n");</div><div class='del'>-	else</div><div class='del'>-		fs_info-&gt;proc_self = self;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/proc/softirqs.c b/fs/proc/softirqs.c<br/>index f4616083faef..04bb29721419 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/softirqs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/softirqs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/softirqs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/softirqs.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@ static int show_softirqs(struct seq_file *p, void *v)</div><div class='ctx'> 	for (i = 0; i &lt; NR_SOFTIRQS; i++) {</div><div class='ctx'> 		seq_printf(p, "%12s:", softirq_to_name[i]);</div><div class='ctx'> 		for_each_possible_cpu(j)</div><div class='del'>-			seq_printf(p, " %10u", kstat_softirqs_cpu(i, j));</div><div class='add'>+			seq_put_decimal_ull_width(p, " ", kstat_softirqs_cpu(i, j), 10);</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/proc/stat.c b/fs/proc/stat.c<br/>index da60956b2915..8b444e862319 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/stat.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/stat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/stat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/stat.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ static void show_all_irqs(struct seq_file *p)</div><div class='ctx'> 		seq_put_decimal_ull(p, " ", kstat_irqs_usr(i));</div><div class='ctx'> 		next = i + 1;</div><div class='ctx'> 	}</div><div class='del'>-	show_irq_gap(p, nr_irqs - next);</div><div class='add'>+	show_irq_gap(p, irq_get_nr_irqs() - next);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int show_stat(struct seq_file *p, void *v)</div><div class='hunk'>@@ -196,7 +196,7 @@ static int stat_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	unsigned int size = 1024 + 128 * num_online_cpus();</div><div class='ctx'> </div><div class='ctx'> 	/* minimum size to display an interrupt count : 2 bytes */</div><div class='del'>-	size += 2 * nr_irqs;</div><div class='add'>+	size += 2 * irq_get_nr_irqs();</div><div class='ctx'> 	return single_open_size(file, show_stat, NULL, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c<br/>index 3f78ebbb795f..81dfc26bfae8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/task_mmu.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/task_mmu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/task_mmu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/task_mmu.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/rmap.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='del'>-#include &lt;linux/swapops.h&gt;</div><div class='add'>+#include &lt;linux/leafops.h&gt;</div><div class='ctx'> #include &lt;linux/mmu_notifier.h&gt;</div><div class='ctx'> #include &lt;linux/page_idle.h&gt;</div><div class='ctx'> #include &lt;linux/shmem_fs.h&gt;</div><div class='hunk'>@@ -22,12 +22,16 @@</div><div class='ctx'> #include &lt;linux/pkeys.h&gt;</div><div class='ctx'> #include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/overflow.h&gt;</div><div class='add'>+#include &lt;linux/buildid.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+#define SENTINEL_VMA_END	-1</div><div class='add'>+#define SENTINEL_VMA_GATE	-2</div><div class='add'>+</div><div class='ctx'> #define SEQ_PUT_DEC(str, val) \</div><div class='ctx'> 		seq_put_decimal_ull_width(m, str, (val) &lt;&lt; (PAGE_SHIFT-10), 8)</div><div class='ctx'> void task_mem(struct seq_file *m, struct mm_struct *mm)</div><div class='hunk'>@@ -35,9 +39,9 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)</div><div class='ctx'> 	unsigned long text, lib, swap, anon, file, shmem;</div><div class='ctx'> 	unsigned long hiwater_vm, total_vm, hiwater_rss, total_rss;</div><div class='ctx'> </div><div class='del'>-	anon = get_mm_counter(mm, MM_ANONPAGES);</div><div class='del'>-	file = get_mm_counter(mm, MM_FILEPAGES);</div><div class='del'>-	shmem = get_mm_counter(mm, MM_SHMEMPAGES);</div><div class='add'>+	anon = get_mm_counter_sum(mm, MM_ANONPAGES);</div><div class='add'>+	file = get_mm_counter_sum(mm, MM_FILEPAGES);</div><div class='add'>+	shmem = get_mm_counter_sum(mm, MM_SHMEMPAGES);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: to minimize their overhead, mm maintains hiwater_vm and</div><div class='hunk'>@@ -58,7 +62,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)</div><div class='ctx'> 	text = min(text, mm-&gt;exec_vm &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> 	lib = (mm-&gt;exec_vm &lt;&lt; PAGE_SHIFT) - text;</div><div class='ctx'> </div><div class='del'>-	swap = get_mm_counter(mm, MM_SWAPENTS);</div><div class='add'>+	swap = get_mm_counter_sum(mm, MM_SWAPENTS);</div><div class='ctx'> 	SEQ_PUT_DEC("VmPeak:\t", hiwater_vm);</div><div class='ctx'> 	SEQ_PUT_DEC(" kB\nVmSize:\t", total_vm);</div><div class='ctx'> 	SEQ_PUT_DEC(" kB\nVmLck:\t", mm-&gt;locked_vm);</div><div class='hunk'>@@ -91,12 +95,12 @@ unsigned long task_statm(struct mm_struct *mm,</div><div class='ctx'> 			 unsigned long *shared, unsigned long *text,</div><div class='ctx'> 			 unsigned long *data, unsigned long *resident)</div><div class='ctx'> {</div><div class='del'>-	*shared = get_mm_counter(mm, MM_FILEPAGES) +</div><div class='del'>-			get_mm_counter(mm, MM_SHMEMPAGES);</div><div class='add'>+	*shared = get_mm_counter_sum(mm, MM_FILEPAGES) +</div><div class='add'>+			get_mm_counter_sum(mm, MM_SHMEMPAGES);</div><div class='ctx'> 	*text = (PAGE_ALIGN(mm-&gt;end_code) - (mm-&gt;start_code &amp; PAGE_MASK))</div><div class='ctx'> 								&gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	*data = mm-&gt;data_vm + mm-&gt;stack_vm;</div><div class='del'>-	*resident = *shared + get_mm_counter(mm, MM_ANONPAGES);</div><div class='add'>+	*resident = *shared + get_mm_counter_sum(mm, MM_ANONPAGES);</div><div class='ctx'> 	return mm-&gt;total_vm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -126,16 +130,143 @@ static void release_task_mempolicy(struct proc_maps_private *priv)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct vm_area_struct *proc_get_vma(struct proc_maps_private *priv,</div><div class='del'>-						loff_t *ppos)</div><div class='add'>+#ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+</div><div class='add'>+static void reset_lock_ctx(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	lock_ctx-&gt;locked_vma = NULL;</div><div class='add'>+	lock_ctx-&gt;mmap_locked = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unlock_ctx_vma(struct proc_maps_locking_ctx *lock_ctx)</div><div class='ctx'> {</div><div class='del'>-	struct vm_area_struct *vma = vma_next(&amp;priv-&gt;iter);</div><div class='add'>+	if (lock_ctx-&gt;locked_vma) {</div><div class='add'>+		vma_end_read(lock_ctx-&gt;locked_vma);</div><div class='add'>+		lock_ctx-&gt;locked_vma = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct seq_operations proc_pid_maps_op;</div><div class='add'>+</div><div class='add'>+static inline bool lock_vma_range(struct seq_file *m,</div><div class='add'>+				  struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * smaps and numa_maps perform page table walk, therefore require</div><div class='add'>+	 * mmap_lock but maps can be read with locking just the vma and</div><div class='add'>+	 * walking the vma tree under rcu read protection.</div><div class='add'>+	 */</div><div class='add'>+	if (m-&gt;op != &amp;proc_pid_maps_op) {</div><div class='add'>+		if (mmap_read_lock_killable(lock_ctx-&gt;mm))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		lock_ctx-&gt;mmap_locked = true;</div><div class='add'>+	} else {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		reset_lock_ctx(lock_ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unlock_vma_range(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	if (lock_ctx-&gt;mmap_locked) {</div><div class='add'>+		mmap_read_unlock(lock_ctx-&gt;mm);</div><div class='add'>+	} else {</div><div class='add'>+		unlock_ctx_vma(lock_ctx);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_area_struct *get_next_vma(struct proc_maps_private *priv,</div><div class='add'>+					   loff_t last_pos)</div><div class='add'>+{</div><div class='add'>+	struct proc_maps_locking_ctx *lock_ctx = &amp;priv-&gt;lock_ctx;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+</div><div class='add'>+	if (lock_ctx-&gt;mmap_locked)</div><div class='add'>+		return vma_next(&amp;priv-&gt;iter);</div><div class='add'>+</div><div class='add'>+	unlock_ctx_vma(lock_ctx);</div><div class='add'>+	vma = lock_next_vma(lock_ctx-&gt;mm, &amp;priv-&gt;iter, last_pos);</div><div class='add'>+	if (!IS_ERR_OR_NULL(vma))</div><div class='add'>+		lock_ctx-&gt;locked_vma = vma;</div><div class='ctx'> </div><div class='add'>+	return vma;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fallback_to_mmap_lock(struct proc_maps_private *priv,</div><div class='add'>+					 loff_t pos)</div><div class='add'>+{</div><div class='add'>+	struct proc_maps_locking_ctx *lock_ctx = &amp;priv-&gt;lock_ctx;</div><div class='add'>+</div><div class='add'>+	if (lock_ctx-&gt;mmap_locked)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	mmap_read_lock(lock_ctx-&gt;mm);</div><div class='add'>+	/* Reinitialize the iterator after taking mmap_lock */</div><div class='add'>+	vma_iter_set(&amp;priv-&gt;iter, pos);</div><div class='add'>+	lock_ctx-&gt;mmap_locked = true;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_PER_VMA_LOCK */</div><div class='add'>+</div><div class='add'>+static inline bool lock_vma_range(struct seq_file *m,</div><div class='add'>+				  struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	return mmap_read_lock_killable(lock_ctx-&gt;mm) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void unlock_vma_range(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	mmap_read_unlock(lock_ctx-&gt;mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_area_struct *get_next_vma(struct proc_maps_private *priv,</div><div class='add'>+					   loff_t last_pos)</div><div class='add'>+{</div><div class='add'>+	return vma_next(&amp;priv-&gt;iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool fallback_to_mmap_lock(struct proc_maps_private *priv,</div><div class='add'>+					 loff_t pos)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PER_VMA_LOCK */</div><div class='add'>+</div><div class='add'>+static struct vm_area_struct *proc_get_vma(struct seq_file *m, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct proc_maps_private *priv = m-&gt;private;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	vma = get_next_vma(priv, *ppos);</div><div class='add'>+	/* EINTR of EAGAIN is possible */</div><div class='add'>+	if (IS_ERR(vma)) {</div><div class='add'>+		if (PTR_ERR(vma) == -EAGAIN &amp;&amp; fallback_to_mmap_lock(priv, *ppos))</div><div class='add'>+			goto retry;</div><div class='add'>+</div><div class='add'>+		return vma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store previous position to be able to restart if needed */</div><div class='add'>+	priv-&gt;last_pos = *ppos;</div><div class='ctx'> 	if (vma) {</div><div class='del'>-		*ppos = vma-&gt;vm_start;</div><div class='add'>+		/*</div><div class='add'>+		 * Track the end of the reported vma to ensure position changes</div><div class='add'>+		 * even if previous vma was merged with the next vma and we</div><div class='add'>+		 * found the extended vma with the same vm_start.</div><div class='add'>+		 */</div><div class='add'>+		*ppos = vma-&gt;vm_end;</div><div class='ctx'> 	} else {</div><div class='del'>-		*ppos = -2UL;</div><div class='del'>-		vma = get_gate_vma(priv-&gt;mm);</div><div class='add'>+		*ppos = SENTINEL_VMA_GATE;</div><div class='add'>+		vma = get_gate_vma(priv-&gt;lock_ctx.mm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return vma;</div><div class='hunk'>@@ -144,58 +275,66 @@ static struct vm_area_struct *proc_get_vma(struct proc_maps_private *priv,</div><div class='ctx'> static void *m_start(struct seq_file *m, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_maps_private *priv = m-&gt;private;</div><div class='del'>-	unsigned long last_addr = *ppos;</div><div class='add'>+	struct proc_maps_locking_ctx *lock_ctx;</div><div class='add'>+	loff_t last_addr = *ppos;</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> </div><div class='ctx'> 	/* See m_next(). Zero at the start or after lseek. */</div><div class='del'>-	if (last_addr == -1UL)</div><div class='add'>+	if (last_addr == SENTINEL_VMA_END)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;task = get_proc_task(priv-&gt;inode);</div><div class='ctx'> 	if (!priv-&gt;task)</div><div class='ctx'> 		return ERR_PTR(-ESRCH);</div><div class='ctx'> </div><div class='del'>-	mm = priv-&gt;mm;</div><div class='add'>+	lock_ctx = &amp;priv-&gt;lock_ctx;</div><div class='add'>+	mm = lock_ctx-&gt;mm;</div><div class='ctx'> 	if (!mm || !mmget_not_zero(mm)) {</div><div class='ctx'> 		put_task_struct(priv-&gt;task);</div><div class='ctx'> 		priv-&gt;task = NULL;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mmap_read_lock_killable(mm)) {</div><div class='add'>+	if (!lock_vma_range(m, lock_ctx)) {</div><div class='ctx'> 		mmput(mm);</div><div class='ctx'> 		put_task_struct(priv-&gt;task);</div><div class='ctx'> 		priv-&gt;task = NULL;</div><div class='ctx'> 		return ERR_PTR(-EINTR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vma_iter_init(&amp;priv-&gt;iter, mm, last_addr);</div><div class='add'>+	/*</div><div class='add'>+	 * Reset current position if last_addr was set before</div><div class='add'>+	 * and it's not a sentinel.</div><div class='add'>+	 */</div><div class='add'>+	if (last_addr &gt; 0)</div><div class='add'>+		*ppos = last_addr = priv-&gt;last_pos;</div><div class='add'>+	vma_iter_init(&amp;priv-&gt;iter, mm, (unsigned long)last_addr);</div><div class='ctx'> 	hold_task_mempolicy(priv);</div><div class='del'>-	if (last_addr == -2UL)</div><div class='add'>+	if (last_addr == SENTINEL_VMA_GATE)</div><div class='ctx'> 		return get_gate_vma(mm);</div><div class='ctx'> </div><div class='del'>-	return proc_get_vma(priv, ppos);</div><div class='add'>+	return proc_get_vma(m, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *m_next(struct seq_file *m, void *v, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	if (*ppos == -2UL) {</div><div class='del'>-		*ppos = -1UL;</div><div class='add'>+	if (*ppos == SENTINEL_VMA_GATE) {</div><div class='add'>+		*ppos = SENTINEL_VMA_END;</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	return proc_get_vma(m-&gt;private, ppos);</div><div class='add'>+	return proc_get_vma(m, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void m_stop(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_maps_private *priv = m-&gt;private;</div><div class='del'>-	struct mm_struct *mm = priv-&gt;mm;</div><div class='add'>+	struct mm_struct *mm = priv-&gt;lock_ctx.mm;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;task)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	release_task_mempolicy(priv);</div><div class='del'>-	mmap_read_unlock(mm);</div><div class='add'>+	unlock_vma_range(&amp;priv-&gt;lock_ctx);</div><div class='ctx'> 	mmput(mm);</div><div class='ctx'> 	put_task_struct(priv-&gt;task);</div><div class='ctx'> 	priv-&gt;task = NULL;</div><div class='hunk'>@@ -210,9 +349,9 @@ static int proc_maps_open(struct inode *inode, struct file *file,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;inode = inode;</div><div class='del'>-	priv-&gt;mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='del'>-	if (IS_ERR(priv-&gt;mm)) {</div><div class='del'>-		int err = PTR_ERR(priv-&gt;mm);</div><div class='add'>+	priv-&gt;lock_ctx.mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='add'>+	if (IS_ERR(priv-&gt;lock_ctx.mm)) {</div><div class='add'>+		int err = PTR_ERR(priv-&gt;lock_ctx.mm);</div><div class='ctx'> </div><div class='ctx'> 		seq_release_private(inode, file);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -226,8 +365,8 @@ static int proc_map_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct seq_file *seq = file-&gt;private_data;</div><div class='ctx'> 	struct proc_maps_private *priv = seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mm)</div><div class='del'>-		mmdrop(priv-&gt;mm);</div><div class='add'>+	if (priv-&gt;lock_ctx.mm)</div><div class='add'>+		mmdrop(priv-&gt;lock_ctx.mm);</div><div class='ctx'> </div><div class='ctx'> 	return seq_release_private(inode, file);</div><div class='ctx'> }</div><div class='hunk'>@@ -239,6 +378,67 @@ static int do_maps_open(struct inode *inode, struct file *file,</div><div class='ctx'> 				sizeof(struct proc_maps_private));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void get_vma_name(struct vm_area_struct *vma,</div><div class='add'>+			 const struct path **path,</div><div class='add'>+			 const char **name,</div><div class='add'>+			 const char **name_fmt)</div><div class='add'>+{</div><div class='add'>+	struct anon_vma_name *anon_name = vma-&gt;vm_mm ? anon_vma_name(vma) : NULL;</div><div class='add'>+</div><div class='add'>+	*name = NULL;</div><div class='add'>+	*path = NULL;</div><div class='add'>+	*name_fmt = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Print the dentry name for named mappings, and a</div><div class='add'>+	 * special [heap] marker for the heap:</div><div class='add'>+	 */</div><div class='add'>+	if (vma-&gt;vm_file) {</div><div class='add'>+		/*</div><div class='add'>+		 * If user named this anon shared memory via</div><div class='add'>+		 * prctl(PR_SET_VMA ..., use the provided name.</div><div class='add'>+		 */</div><div class='add'>+		if (anon_name) {</div><div class='add'>+			*name_fmt = "[anon_shmem:%s]";</div><div class='add'>+			*name = anon_name-&gt;name;</div><div class='add'>+		} else {</div><div class='add'>+			*path = file_user_path(vma-&gt;vm_file);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_ops &amp;&amp; vma-&gt;vm_ops-&gt;name) {</div><div class='add'>+		*name = vma-&gt;vm_ops-&gt;name(vma);</div><div class='add'>+		if (*name)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*name = arch_vma_name(vma);</div><div class='add'>+	if (*name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!vma-&gt;vm_mm) {</div><div class='add'>+		*name = "[vdso]";</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vma_is_initial_heap(vma)) {</div><div class='add'>+		*name = "[heap]";</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vma_is_initial_stack(vma)) {</div><div class='add'>+		*name = "[stack]";</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (anon_name) {</div><div class='add'>+		*name_fmt = "[anon:%s]";</div><div class='add'>+		*name = anon_name-&gt;name;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void show_vma_header_prefix(struct seq_file *m,</div><div class='ctx'> 				   unsigned long start, unsigned long end,</div><div class='ctx'> 				   vm_flags_t flags, unsigned long long pgoff,</div><div class='hunk'>@@ -262,17 +462,15 @@ static void show_vma_header_prefix(struct seq_file *m,</div><div class='ctx'> static void</div><div class='ctx'> show_map_vma(struct seq_file *m, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct anon_vma_name *anon_name = NULL;</div><div class='del'>-	struct mm_struct *mm = vma-&gt;vm_mm;</div><div class='del'>-	struct file *file = vma-&gt;vm_file;</div><div class='add'>+	const struct path *path;</div><div class='add'>+	const char *name_fmt, *name;</div><div class='ctx'> 	vm_flags_t flags = vma-&gt;vm_flags;</div><div class='ctx'> 	unsigned long ino = 0;</div><div class='ctx'> 	unsigned long long pgoff = 0;</div><div class='ctx'> 	unsigned long start, end;</div><div class='ctx'> 	dev_t dev = 0;</div><div class='del'>-	const char *name = NULL;</div><div class='ctx'> </div><div class='del'>-	if (file) {</div><div class='add'>+	if (vma-&gt;vm_file) {</div><div class='ctx'> 		const struct inode *inode = file_user_inode(vma-&gt;vm_file);</div><div class='ctx'> </div><div class='ctx'> 		dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='hunk'>@@ -283,57 +481,15 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)</div><div class='ctx'> 	start = vma-&gt;vm_start;</div><div class='ctx'> 	end = vma-&gt;vm_end;</div><div class='ctx'> 	show_vma_header_prefix(m, start, end, flags, pgoff, dev, ino);</div><div class='del'>-	if (mm)</div><div class='del'>-		anon_name = anon_vma_name(vma);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Print the dentry name for named mappings, and a</div><div class='del'>-	 * special [heap] marker for the heap:</div><div class='del'>-	 */</div><div class='del'>-	if (file) {</div><div class='add'>+	get_vma_name(vma, &amp;path, &amp;name, &amp;name_fmt);</div><div class='add'>+	if (path) {</div><div class='ctx'> 		seq_pad(m, ' ');</div><div class='del'>-		/*</div><div class='del'>-		 * If user named this anon shared memory via</div><div class='del'>-		 * prctl(PR_SET_VMA ..., use the provided name.</div><div class='del'>-		 */</div><div class='del'>-		if (anon_name)</div><div class='del'>-			seq_printf(m, "[anon_shmem:%s]", anon_name-&gt;name);</div><div class='del'>-		else</div><div class='del'>-			seq_path(m, file_user_path(file), "\n");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vma-&gt;vm_ops &amp;&amp; vma-&gt;vm_ops-&gt;name) {</div><div class='del'>-		name = vma-&gt;vm_ops-&gt;name(vma);</div><div class='del'>-		if (name)</div><div class='del'>-			goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name = arch_vma_name(vma);</div><div class='del'>-	if (!name) {</div><div class='del'>-		if (!mm) {</div><div class='del'>-			name = "[vdso]";</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vma_is_initial_heap(vma)) {</div><div class='del'>-			name = "[heap]";</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vma_is_initial_stack(vma)) {</div><div class='del'>-			name = "[stack]";</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (anon_name) {</div><div class='del'>-			seq_pad(m, ' ');</div><div class='del'>-			seq_printf(m, "[anon:%s]", anon_name-&gt;name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	if (name) {</div><div class='add'>+		seq_path(m, path, "\n");</div><div class='add'>+	} else if (name_fmt) {</div><div class='add'>+		seq_pad(m, ' ');</div><div class='add'>+		seq_printf(m, name_fmt, name);</div><div class='add'>+	} else if (name) {</div><div class='ctx'> 		seq_pad(m, ' ');</div><div class='ctx'> 		seq_puts(m, name);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -358,11 +514,315 @@ static int pid_maps_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return do_maps_open(inode, file, &amp;proc_pid_maps_op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define PROCMAP_QUERY_VMA_FLAGS (				\</div><div class='add'>+		PROCMAP_QUERY_VMA_READABLE |			\</div><div class='add'>+		PROCMAP_QUERY_VMA_WRITABLE |			\</div><div class='add'>+		PROCMAP_QUERY_VMA_EXECUTABLE |			\</div><div class='add'>+		PROCMAP_QUERY_VMA_SHARED			\</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#define PROCMAP_QUERY_VALID_FLAGS_MASK (			\</div><div class='add'>+		PROCMAP_QUERY_COVERING_OR_NEXT_VMA |		\</div><div class='add'>+		PROCMAP_QUERY_FILE_BACKED_VMA |			\</div><div class='add'>+		PROCMAP_QUERY_VMA_FLAGS				\</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+</div><div class='add'>+static int query_vma_setup(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	reset_lock_ctx(lock_ctx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_vma_teardown(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	if (lock_ctx-&gt;mmap_locked) {</div><div class='add'>+		mmap_read_unlock(lock_ctx-&gt;mm);</div><div class='add'>+		lock_ctx-&gt;mmap_locked = false;</div><div class='add'>+	} else {</div><div class='add'>+		unlock_ctx_vma(lock_ctx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_area_struct *query_vma_find_by_addr(struct proc_maps_locking_ctx *lock_ctx,</div><div class='add'>+						     unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = lock_ctx-&gt;mm;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct vma_iterator vmi;</div><div class='add'>+</div><div class='add'>+	if (lock_ctx-&gt;mmap_locked)</div><div class='add'>+		return find_vma(mm, addr);</div><div class='add'>+</div><div class='add'>+	/* Unlock previously locked VMA and find the next one under RCU */</div><div class='add'>+	unlock_ctx_vma(lock_ctx);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	vma_iter_init(&amp;vmi, mm, addr);</div><div class='add'>+	vma = lock_next_vma(mm, &amp;vmi, addr);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (!vma)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(vma)) {</div><div class='add'>+		lock_ctx-&gt;locked_vma = vma;</div><div class='add'>+		return vma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (PTR_ERR(vma) == -EAGAIN) {</div><div class='add'>+		/* Fallback to mmap_lock on vma-&gt;vm_refcnt overflow */</div><div class='add'>+		mmap_read_lock(mm);</div><div class='add'>+		vma = find_vma(mm, addr);</div><div class='add'>+		lock_ctx-&gt;mmap_locked = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vma;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_PER_VMA_LOCK */</div><div class='add'>+</div><div class='add'>+static int query_vma_setup(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	return mmap_read_lock_killable(lock_ctx-&gt;mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void query_vma_teardown(struct proc_maps_locking_ctx *lock_ctx)</div><div class='add'>+{</div><div class='add'>+	mmap_read_unlock(lock_ctx-&gt;mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_area_struct *query_vma_find_by_addr(struct proc_maps_locking_ctx *lock_ctx,</div><div class='add'>+						     unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return find_vma(lock_ctx-&gt;mm, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* CONFIG_PER_VMA_LOCK */</div><div class='add'>+</div><div class='add'>+static struct vm_area_struct *query_matching_vma(struct proc_maps_locking_ctx *lock_ctx,</div><div class='add'>+						 unsigned long addr, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+</div><div class='add'>+next_vma:</div><div class='add'>+	vma = query_vma_find_by_addr(lock_ctx, addr);</div><div class='add'>+	if (IS_ERR(vma))</div><div class='add'>+		return vma;</div><div class='add'>+</div><div class='add'>+	if (!vma)</div><div class='add'>+		goto no_vma;</div><div class='add'>+</div><div class='add'>+	/* user requested only file-backed VMA, keep iterating */</div><div class='add'>+	if ((flags &amp; PROCMAP_QUERY_FILE_BACKED_VMA) &amp;&amp; !vma-&gt;vm_file)</div><div class='add'>+		goto skip_vma;</div><div class='add'>+</div><div class='add'>+	/* VMA permissions should satisfy query flags */</div><div class='add'>+	if (flags &amp; PROCMAP_QUERY_VMA_FLAGS) {</div><div class='add'>+		u32 perm = 0;</div><div class='add'>+</div><div class='add'>+		if (flags &amp; PROCMAP_QUERY_VMA_READABLE)</div><div class='add'>+			perm |= VM_READ;</div><div class='add'>+		if (flags &amp; PROCMAP_QUERY_VMA_WRITABLE)</div><div class='add'>+			perm |= VM_WRITE;</div><div class='add'>+		if (flags &amp; PROCMAP_QUERY_VMA_EXECUTABLE)</div><div class='add'>+			perm |= VM_EXEC;</div><div class='add'>+		if (flags &amp; PROCMAP_QUERY_VMA_SHARED)</div><div class='add'>+			perm |= VM_MAYSHARE;</div><div class='add'>+</div><div class='add'>+		if ((vma-&gt;vm_flags &amp; perm) != perm)</div><div class='add'>+			goto skip_vma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* found covering VMA or user is OK with the matching next VMA */</div><div class='add'>+	if ((flags &amp; PROCMAP_QUERY_COVERING_OR_NEXT_VMA) || vma-&gt;vm_start &lt;= addr)</div><div class='add'>+		return vma;</div><div class='add'>+</div><div class='add'>+skip_vma:</div><div class='add'>+	/*</div><div class='add'>+	 * If the user needs closest matching VMA, keep iterating.</div><div class='add'>+	 */</div><div class='add'>+	addr = vma-&gt;vm_end;</div><div class='add'>+	if (flags &amp; PROCMAP_QUERY_COVERING_OR_NEXT_VMA)</div><div class='add'>+		goto next_vma;</div><div class='add'>+</div><div class='add'>+no_vma:</div><div class='add'>+	return ERR_PTR(-ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_procmap_query(struct mm_struct *mm, void __user *uarg)</div><div class='add'>+{</div><div class='add'>+	struct proc_maps_locking_ctx lock_ctx = { .mm = mm };</div><div class='add'>+	struct procmap_query karg;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	const char *name = NULL;</div><div class='add'>+	char build_id_buf[BUILD_ID_SIZE_MAX], *name_buf = NULL;</div><div class='add'>+	__u64 usize;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;usize, (void __user *)uarg, sizeof(usize)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	/* argument struct can never be that large, reject abuse */</div><div class='add'>+	if (usize &gt; PAGE_SIZE)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	/* argument struct should have at least query_flags and query_addr fields */</div><div class='add'>+	if (usize &lt; offsetofend(struct procmap_query, query_addr))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	err = copy_struct_from_user(&amp;karg, sizeof(karg), uarg, usize);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* reject unknown flags */</div><div class='add'>+	if (karg.query_flags &amp; ~PROCMAP_QUERY_VALID_FLAGS_MASK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* either both buffer address and size are set, or both should be zero */</div><div class='add'>+	if (!!karg.vma_name_size != !!karg.vma_name_addr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!!karg.build_id_size != !!karg.build_id_addr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!mm || !mmget_not_zero(mm))</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	err = query_vma_setup(&amp;lock_ctx);</div><div class='add'>+	if (err) {</div><div class='add'>+		mmput(mm);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vma = query_matching_vma(&amp;lock_ctx, karg.query_addr, karg.query_flags);</div><div class='add'>+	if (IS_ERR(vma)) {</div><div class='add'>+		err = PTR_ERR(vma);</div><div class='add'>+		vma = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	karg.vma_start = vma-&gt;vm_start;</div><div class='add'>+	karg.vma_end = vma-&gt;vm_end;</div><div class='add'>+</div><div class='add'>+	karg.vma_flags = 0;</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_READ)</div><div class='add'>+		karg.vma_flags |= PROCMAP_QUERY_VMA_READABLE;</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_WRITE)</div><div class='add'>+		karg.vma_flags |= PROCMAP_QUERY_VMA_WRITABLE;</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_EXEC)</div><div class='add'>+		karg.vma_flags |= PROCMAP_QUERY_VMA_EXECUTABLE;</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_MAYSHARE)</div><div class='add'>+		karg.vma_flags |= PROCMAP_QUERY_VMA_SHARED;</div><div class='add'>+</div><div class='add'>+	karg.vma_page_size = vma_kernel_pagesize(vma);</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_file) {</div><div class='add'>+		const struct inode *inode = file_user_inode(vma-&gt;vm_file);</div><div class='add'>+</div><div class='add'>+		karg.vma_offset = ((__u64)vma-&gt;vm_pgoff) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		karg.dev_major = MAJOR(inode-&gt;i_sb-&gt;s_dev);</div><div class='add'>+		karg.dev_minor = MINOR(inode-&gt;i_sb-&gt;s_dev);</div><div class='add'>+		karg.inode = inode-&gt;i_ino;</div><div class='add'>+	} else {</div><div class='add'>+		karg.vma_offset = 0;</div><div class='add'>+		karg.dev_major = 0;</div><div class='add'>+		karg.dev_minor = 0;</div><div class='add'>+		karg.inode = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (karg.build_id_size) {</div><div class='add'>+		__u32 build_id_sz;</div><div class='add'>+</div><div class='add'>+		err = build_id_parse(vma, build_id_buf, &amp;build_id_sz);</div><div class='add'>+		if (err) {</div><div class='add'>+			karg.build_id_size = 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (karg.build_id_size &lt; build_id_sz) {</div><div class='add'>+				err = -ENAMETOOLONG;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			karg.build_id_size = build_id_sz;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (karg.vma_name_size) {</div><div class='add'>+		size_t name_buf_sz = min_t(size_t, PATH_MAX, karg.vma_name_size);</div><div class='add'>+		const struct path *path;</div><div class='add'>+		const char *name_fmt;</div><div class='add'>+		size_t name_sz = 0;</div><div class='add'>+</div><div class='add'>+		get_vma_name(vma, &amp;path, &amp;name, &amp;name_fmt);</div><div class='add'>+</div><div class='add'>+		if (path || name_fmt || name) {</div><div class='add'>+			name_buf = kmalloc(name_buf_sz, GFP_KERNEL);</div><div class='add'>+			if (!name_buf) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (path) {</div><div class='add'>+			name = d_path(path, name_buf, name_buf_sz);</div><div class='add'>+			if (IS_ERR(name)) {</div><div class='add'>+				err = PTR_ERR(name);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			name_sz = name_buf + name_buf_sz - name;</div><div class='add'>+		} else if (name || name_fmt) {</div><div class='add'>+			name_sz = 1 + snprintf(name_buf, name_buf_sz, name_fmt ?: "%s", name);</div><div class='add'>+			name = name_buf;</div><div class='add'>+		}</div><div class='add'>+		if (name_sz &gt; name_buf_sz) {</div><div class='add'>+			err = -ENAMETOOLONG;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		karg.vma_name_size = name_sz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unlock vma or mmap_lock, and put mm_struct before copying data to user */</div><div class='add'>+	query_vma_teardown(&amp;lock_ctx);</div><div class='add'>+	mmput(mm);</div><div class='add'>+</div><div class='add'>+	if (karg.vma_name_size &amp;&amp; copy_to_user(u64_to_user_ptr(karg.vma_name_addr),</div><div class='add'>+					       name, karg.vma_name_size)) {</div><div class='add'>+		kfree(name_buf);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	kfree(name_buf);</div><div class='add'>+</div><div class='add'>+	if (karg.build_id_size &amp;&amp; copy_to_user(u64_to_user_ptr(karg.build_id_addr),</div><div class='add'>+					       build_id_buf, karg.build_id_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(uarg, &amp;karg, min_t(size_t, sizeof(karg), usize)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	query_vma_teardown(&amp;lock_ctx);</div><div class='add'>+	mmput(mm);</div><div class='add'>+	kfree(name_buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long procfs_procmap_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seq = file-&gt;private_data;</div><div class='add'>+	struct proc_maps_private *priv = seq-&gt;private;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case PROCMAP_QUERY:</div><div class='add'>+		/* priv-&gt;lock_ctx.mm is set during file open operation */</div><div class='add'>+		return do_procmap_query(priv-&gt;lock_ctx.mm, (void __user *)arg);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct file_operations proc_pid_maps_operations = {</div><div class='ctx'> 	.open		= pid_maps_open,</div><div class='ctx'> 	.read		= seq_read,</div><div class='ctx'> 	.llseek		= seq_lseek,</div><div class='ctx'> 	.release	= proc_map_release,</div><div class='add'>+	.unlocked_ioctl = procfs_procmap_ioctl,</div><div class='add'>+	.compat_ioctl	= compat_ptr_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -411,14 +871,14 @@ struct mem_size_stats {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void smaps_page_accumulate(struct mem_size_stats *mss,</div><div class='del'>-		struct page *page, unsigned long size, unsigned long pss,</div><div class='add'>+		struct folio *folio, unsigned long size, unsigned long pss,</div><div class='ctx'> 		bool dirty, bool locked, bool private)</div><div class='ctx'> {</div><div class='ctx'> 	mss-&gt;pss += pss;</div><div class='ctx'> </div><div class='del'>-	if (PageAnon(page))</div><div class='add'>+	if (folio_test_anon(folio))</div><div class='ctx'> 		mss-&gt;pss_anon += pss;</div><div class='del'>-	else if (PageSwapBacked(page))</div><div class='add'>+	else if (folio_test_swapbacked(folio))</div><div class='ctx'> 		mss-&gt;pss_shmem += pss;</div><div class='ctx'> 	else</div><div class='ctx'> 		mss-&gt;pss_file += pss;</div><div class='hunk'>@@ -426,7 +886,7 @@ static void smaps_page_accumulate(struct mem_size_stats *mss,</div><div class='ctx'> 	if (locked)</div><div class='ctx'> 		mss-&gt;pss_locked += pss;</div><div class='ctx'> </div><div class='del'>-	if (dirty || PageDirty(page)) {</div><div class='add'>+	if (dirty || folio_test_dirty(folio)) {</div><div class='ctx'> 		mss-&gt;pss_dirty += pss;</div><div class='ctx'> 		if (private)</div><div class='ctx'> 			mss-&gt;private_dirty += size;</div><div class='hunk'>@@ -442,56 +902,76 @@ static void smaps_page_accumulate(struct mem_size_stats *mss,</div><div class='ctx'> </div><div class='ctx'> static void smaps_account(struct mem_size_stats *mss, struct page *page,</div><div class='ctx'> 		bool compound, bool young, bool dirty, bool locked,</div><div class='del'>-		bool migration)</div><div class='add'>+		bool present)</div><div class='ctx'> {</div><div class='add'>+	struct folio *folio = page_folio(page);</div><div class='ctx'> 	int i, nr = compound ? compound_nr(page) : 1;</div><div class='ctx'> 	unsigned long size = nr * PAGE_SIZE;</div><div class='add'>+	bool exclusive;</div><div class='add'>+	int mapcount;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First accumulate quantities that depend only on |size| and the type</div><div class='ctx'> 	 * of the compound page.</div><div class='ctx'> 	 */</div><div class='del'>-	if (PageAnon(page)) {</div><div class='add'>+	if (folio_test_anon(folio)) {</div><div class='ctx'> 		mss-&gt;anonymous += size;</div><div class='del'>-		if (!PageSwapBacked(page) &amp;&amp; !dirty &amp;&amp; !PageDirty(page))</div><div class='add'>+		if (!folio_test_swapbacked(folio) &amp;&amp; !dirty &amp;&amp;</div><div class='add'>+		    !folio_test_dirty(folio))</div><div class='ctx'> 			mss-&gt;lazyfree += size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (PageKsm(page))</div><div class='add'>+	if (folio_test_ksm(folio))</div><div class='ctx'> 		mss-&gt;ksm += size;</div><div class='ctx'> </div><div class='ctx'> 	mss-&gt;resident += size;</div><div class='ctx'> 	/* Accumulate the size in pages that have been accessed. */</div><div class='del'>-	if (young || page_is_young(page) || PageReferenced(page))</div><div class='add'>+	if (young || folio_test_young(folio) || folio_test_referenced(folio))</div><div class='ctx'> 		mss-&gt;referenced += size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Then accumulate quantities that may depend on sharing, or that may</div><div class='ctx'> 	 * differ page-by-page.</div><div class='ctx'> 	 *</div><div class='del'>-	 * page_count(page) == 1 guarantees the page is mapped exactly once.</div><div class='del'>-	 * If any subpage of the compound page mapped with PTE it would elevate</div><div class='del'>-	 * page_count().</div><div class='add'>+	 * refcount == 1 for present entries guarantees that the folio is mapped</div><div class='add'>+	 * exactly once. For large folios this implies that exactly one</div><div class='add'>+	 * PTE/PMD/... maps (a part of) this folio.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The page_mapcount() is called to get a snapshot of the mapcount.</div><div class='del'>-	 * Without holding the page lock this snapshot can be slightly wrong as</div><div class='del'>-	 * we cannot always read the mapcount atomically.  It is not safe to</div><div class='del'>-	 * call page_mapcount() even with PTL held if the page is not mapped,</div><div class='del'>-	 * especially for migration entries.  Treat regular migration entries</div><div class='del'>-	 * as mapcount == 1.</div><div class='add'>+	 * Treat all non-present entries (where relying on the mapcount and</div><div class='add'>+	 * refcount doesn't make sense) as "maybe shared, but not sure how</div><div class='add'>+	 * often". We treat device private entries as being fake-present.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that it would not be safe to read the mapcount especially for</div><div class='add'>+	 * pages referenced by migration entries, even with the PTL held.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((page_count(page) == 1) || migration) {</div><div class='del'>-		smaps_page_accumulate(mss, page, size, size &lt;&lt; PSS_SHIFT, dirty,</div><div class='del'>-			locked, true);</div><div class='add'>+	if (folio_ref_count(folio) == 1 || !present) {</div><div class='add'>+		smaps_page_accumulate(mss, folio, size, size &lt;&lt; PSS_SHIFT,</div><div class='add'>+				      dirty, locked, present);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_NO_PAGE_MAPCOUNT)) {</div><div class='add'>+		mapcount = folio_average_page_mapcount(folio);</div><div class='add'>+		exclusive = !folio_maybe_mapped_shared(folio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We obtain a snapshot of the mapcount. Without holding the folio lock</div><div class='add'>+	 * this snapshot can be slightly wrong as we cannot always read the</div><div class='add'>+	 * mapcount atomically.</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; nr; i++, page++) {</div><div class='del'>-		int mapcount = page_mapcount(page);</div><div class='ctx'> 		unsigned long pss = PAGE_SIZE &lt;&lt; PSS_SHIFT;</div><div class='add'>+</div><div class='add'>+		if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) {</div><div class='add'>+			mapcount = folio_precise_page_mapcount(folio, page);</div><div class='add'>+			exclusive = mapcount &lt; 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (mapcount &gt;= 2)</div><div class='ctx'> 			pss /= mapcount;</div><div class='del'>-		smaps_page_accumulate(mss, page, PAGE_SIZE, pss, dirty, locked,</div><div class='del'>-				      mapcount &lt; 2);</div><div class='add'>+		smaps_page_accumulate(mss, folio, PAGE_SIZE, pss,</div><div class='add'>+				dirty, locked, exclusive);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -529,21 +1009,24 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,</div><div class='ctx'> 	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='ctx'> 	bool locked = !!(vma-&gt;vm_flags &amp; VM_LOCKED);</div><div class='ctx'> 	struct page *page = NULL;</div><div class='del'>-	bool migration = false, young = false, dirty = false;</div><div class='add'>+	bool present = false, young = false, dirty = false;</div><div class='ctx'> 	pte_t ptent = ptep_get(pte);</div><div class='ctx'> </div><div class='ctx'> 	if (pte_present(ptent)) {</div><div class='ctx'> 		page = vm_normal_page(vma, addr, ptent);</div><div class='ctx'> 		young = pte_young(ptent);</div><div class='ctx'> 		dirty = pte_dirty(ptent);</div><div class='del'>-	} else if (is_swap_pte(ptent)) {</div><div class='del'>-		swp_entry_t swpent = pte_to_swp_entry(ptent);</div><div class='add'>+		present = true;</div><div class='add'>+	} else if (pte_none(ptent)) {</div><div class='add'>+		smaps_pte_hole_lookup(addr, walk);</div><div class='add'>+	} else {</div><div class='add'>+		const softleaf_t entry = softleaf_from_pte(ptent);</div><div class='ctx'> </div><div class='del'>-		if (!non_swap_entry(swpent)) {</div><div class='add'>+		if (softleaf_is_swap(entry)) {</div><div class='ctx'> 			int mapcount;</div><div class='ctx'> </div><div class='ctx'> 			mss-&gt;swap += PAGE_SIZE;</div><div class='del'>-			mapcount = swp_swapcount(swpent);</div><div class='add'>+			mapcount = swp_swapcount(entry);</div><div class='ctx'> 			if (mapcount &gt;= 2) {</div><div class='ctx'> 				u64 pss_delta = (u64)PAGE_SIZE &lt;&lt; PSS_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -552,20 +1035,17 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,</div><div class='ctx'> 			} else {</div><div class='ctx'> 				mss-&gt;swap_pss += (u64)PAGE_SIZE &lt;&lt; PSS_SHIFT;</div><div class='ctx'> 			}</div><div class='del'>-		} else if (is_pfn_swap_entry(swpent)) {</div><div class='del'>-			if (is_migration_entry(swpent))</div><div class='del'>-				migration = true;</div><div class='del'>-			page = pfn_swap_entry_to_page(swpent);</div><div class='add'>+		} else if (softleaf_has_pfn(entry)) {</div><div class='add'>+			if (softleaf_is_device_private(entry))</div><div class='add'>+				present = true;</div><div class='add'>+			page = softleaf_to_page(entry);</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		smaps_pte_hole_lookup(addr, walk);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	smaps_account(mss, page, false, young, dirty, locked, migration);</div><div class='add'>+	smaps_account(mss, page, false, young, dirty, locked, present);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='hunk'>@@ -576,31 +1056,34 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> 	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='ctx'> 	bool locked = !!(vma-&gt;vm_flags &amp; VM_LOCKED);</div><div class='ctx'> 	struct page *page = NULL;</div><div class='del'>-	bool migration = false;</div><div class='add'>+	bool present = false;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='add'>+	if (pmd_none(*pmd))</div><div class='add'>+		return;</div><div class='ctx'> 	if (pmd_present(*pmd)) {</div><div class='ctx'> 		page = vm_normal_page_pmd(vma, addr, *pmd);</div><div class='del'>-	} else if (unlikely(thp_migration_supported() &amp;&amp; is_swap_pmd(*pmd))) {</div><div class='del'>-		swp_entry_t entry = pmd_to_swp_entry(*pmd);</div><div class='add'>+		present = true;</div><div class='add'>+	} else if (unlikely(thp_migration_supported())) {</div><div class='add'>+		const softleaf_t entry = softleaf_from_pmd(*pmd);</div><div class='ctx'> </div><div class='del'>-		if (is_migration_entry(entry)) {</div><div class='del'>-			migration = true;</div><div class='del'>-			page = pfn_swap_entry_to_page(entry);</div><div class='del'>-		}</div><div class='add'>+		if (softleaf_has_pfn(entry))</div><div class='add'>+			page = softleaf_to_page(entry);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (IS_ERR_OR_NULL(page))</div><div class='ctx'> 		return;</div><div class='del'>-	if (PageAnon(page))</div><div class='add'>+	folio = page_folio(page);</div><div class='add'>+	if (folio_test_anon(folio))</div><div class='ctx'> 		mss-&gt;anonymous_thp += HPAGE_PMD_SIZE;</div><div class='del'>-	else if (PageSwapBacked(page))</div><div class='add'>+	else if (folio_test_swapbacked(folio))</div><div class='ctx'> 		mss-&gt;shmem_thp += HPAGE_PMD_SIZE;</div><div class='del'>-	else if (is_zone_device_page(page))</div><div class='add'>+	else if (folio_is_zone_device(folio))</div><div class='ctx'> 		/* pass */;</div><div class='ctx'> 	else</div><div class='ctx'> 		mss-&gt;file_thp += HPAGE_PMD_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	smaps_account(mss, page, true, pmd_young(*pmd), pmd_dirty(*pmd),</div><div class='del'>-		      locked, migration);</div><div class='add'>+		      locked, present);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,</div><div class='hunk'>@@ -640,8 +1123,15 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Don't forget to update Documentation/ on changes.</div><div class='add'>+	 *</div><div class='add'>+	 * The length of the second argument of mnemonics[]</div><div class='add'>+	 * needs to be 3 instead of previously set 2</div><div class='add'>+	 * (i.e. from [BITS_PER_LONG][2] to [BITS_PER_LONG][3])</div><div class='add'>+	 * to avoid spurious</div><div class='add'>+	 * -Werror=unterminated-string-initialization warning</div><div class='add'>+	 *  with GCC 15</div><div class='ctx'> 	 */</div><div class='del'>-	static const char mnemonics[BITS_PER_LONG][2] = {</div><div class='add'>+	static const char mnemonics[BITS_PER_LONG][3] = {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In case if we meet a flag we don't know about.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -657,6 +1147,7 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)</div><div class='ctx'> 		[ilog2(VM_MAYSHARE)]	= "ms",</div><div class='ctx'> 		[ilog2(VM_GROWSDOWN)]	= "gd",</div><div class='ctx'> 		[ilog2(VM_PFNMAP)]	= "pf",</div><div class='add'>+		[ilog2(VM_MAYBE_GUARD)]	= "gu",</div><div class='ctx'> 		[ilog2(VM_LOCKED)]	= "lo",</div><div class='ctx'> 		[ilog2(VM_IO)]		= "io",</div><div class='ctx'> 		[ilog2(VM_SEQ_READ)]	= "sr",</div><div class='hunk'>@@ -692,17 +1183,25 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)</div><div class='ctx'> 		[ilog2(VM_PKEY_BIT0)]	= "",</div><div class='ctx'> 		[ilog2(VM_PKEY_BIT1)]	= "",</div><div class='ctx'> 		[ilog2(VM_PKEY_BIT2)]	= "",</div><div class='add'>+#if CONFIG_ARCH_PKEY_BITS &gt; 3</div><div class='ctx'> 		[ilog2(VM_PKEY_BIT3)]	= "",</div><div class='del'>-#if VM_PKEY_BIT4</div><div class='add'>+#endif</div><div class='add'>+#if CONFIG_ARCH_PKEY_BITS &gt; 4</div><div class='ctx'> 		[ilog2(VM_PKEY_BIT4)]	= "",</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_ARCH_HAS_PKEYS */</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR</div><div class='ctx'> 		[ilog2(VM_UFFD_MINOR)]	= "ui",</div><div class='ctx'> #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */</div><div class='del'>-#ifdef CONFIG_X86_USER_SHADOW_STACK</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK</div><div class='ctx'> 		[ilog2(VM_SHADOW_STACK)] = "ss",</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_64BIT) || defined(CONFIG_PPC32)</div><div class='add'>+		[ilog2(VM_DROPPABLE)] = "dp",</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+		[ilog2(VM_SEALED)] = "sl",</div><div class='add'>+#endif</div><div class='ctx'> 	};</div><div class='ctx'> 	size_t i;</div><div class='ctx'> </div><div class='hunk'>@@ -710,11 +1209,8 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)</div><div class='ctx'> 	for (i = 0; i &lt; BITS_PER_LONG; i++) {</div><div class='ctx'> 		if (!mnemonics[i][0])</div><div class='ctx'> 			continue;</div><div class='del'>-		if (vma-&gt;vm_flags &amp; (1UL &lt;&lt; i)) {</div><div class='del'>-			seq_putc(m, mnemonics[i][0]);</div><div class='del'>-			seq_putc(m, mnemonics[i][1]);</div><div class='del'>-			seq_putc(m, ' ');</div><div class='del'>-		}</div><div class='add'>+		if (vma-&gt;vm_flags &amp; (1UL &lt;&lt; i))</div><div class='add'>+			seq_printf(m, "%s ", mnemonics[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_putc(m, '\n');</div><div class='ctx'> }</div><div class='hunk'>@@ -726,23 +1222,32 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask,</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_size_stats *mss = walk-&gt;private;</div><div class='ctx'> 	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='del'>-	struct page *page = NULL;</div><div class='del'>-	pte_t ptent = ptep_get(pte);</div><div class='add'>+	struct folio *folio = NULL;</div><div class='add'>+	bool present = false;</div><div class='add'>+	spinlock_t *ptl;</div><div class='add'>+	pte_t ptent;</div><div class='ctx'> </div><div class='add'>+	ptl = huge_pte_lock(hstate_vma(vma), walk-&gt;mm, pte);</div><div class='add'>+	ptent = huge_ptep_get(walk-&gt;mm, addr, pte);</div><div class='ctx'> 	if (pte_present(ptent)) {</div><div class='del'>-		page = vm_normal_page(vma, addr, ptent);</div><div class='del'>-	} else if (is_swap_pte(ptent)) {</div><div class='del'>-		swp_entry_t swpent = pte_to_swp_entry(ptent);</div><div class='add'>+		folio = page_folio(pte_page(ptent));</div><div class='add'>+		present = true;</div><div class='add'>+	} else {</div><div class='add'>+		const softleaf_t entry = softleaf_from_pte(ptent);</div><div class='ctx'> </div><div class='del'>-		if (is_pfn_swap_entry(swpent))</div><div class='del'>-			page = pfn_swap_entry_to_page(swpent);</div><div class='add'>+		if (softleaf_has_pfn(entry))</div><div class='add'>+			folio = softleaf_to_folio(entry);</div><div class='ctx'> 	}</div><div class='del'>-	if (page) {</div><div class='del'>-		if (page_mapcount(page) &gt;= 2 || hugetlb_pmd_shared(pte))</div><div class='add'>+</div><div class='add'>+	if (folio) {</div><div class='add'>+		/* We treat non-present entries as "maybe shared". */</div><div class='add'>+		if (!present || folio_maybe_mapped_shared(folio) ||</div><div class='add'>+		    hugetlb_pmd_shared(pte))</div><div class='ctx'> 			mss-&gt;shared_hugetlb += huge_page_size(hstate_vma(vma));</div><div class='ctx'> 		else</div><div class='ctx'> 			mss-&gt;private_hugetlb += huge_page_size(hstate_vma(vma));</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(ptl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -866,8 +1371,8 @@ static int show_smap(struct seq_file *m, void *v)</div><div class='ctx'> 	__show_smap(m, &amp;mss, false);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "THPeligible:    %8u\n",</div><div class='del'>-		   !!thp_vma_allowable_orders(vma, vma-&gt;vm_flags, true, false,</div><div class='del'>-					      true, THP_ORDERS_ALL));</div><div class='add'>+		   !!thp_vma_allowable_orders(vma, vma-&gt;vm_flags, TVA_SMAPS,</div><div class='add'>+					      THP_ORDERS_ALL));</div><div class='ctx'> </div><div class='ctx'> 	if (arch_pkeys_enabled())</div><div class='ctx'> 		seq_printf(m, "ProtectionKey:  %8u\n", vma_pkey(vma));</div><div class='hunk'>@@ -880,7 +1385,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_maps_private *priv = m-&gt;private;</div><div class='ctx'> 	struct mem_size_stats mss = {};</div><div class='del'>-	struct mm_struct *mm = priv-&gt;mm;</div><div class='add'>+	struct mm_struct *mm = priv-&gt;lock_ctx.mm;</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long vma_start = 0, last_vma_end = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -965,12 +1470,17 @@ static int show_smaps_rollup(struct seq_file *m, void *v)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			/* Case 1 and 2 above */</div><div class='del'>-			if (vma-&gt;vm_start &gt;= last_vma_end)</div><div class='add'>+			if (vma-&gt;vm_start &gt;= last_vma_end) {</div><div class='add'>+				smap_gather_stats(vma, &amp;mss, 0);</div><div class='add'>+				last_vma_end = vma-&gt;vm_end;</div><div class='ctx'> 				continue;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* Case 4 above */</div><div class='del'>-			if (vma-&gt;vm_end &gt; last_vma_end)</div><div class='add'>+			if (vma-&gt;vm_end &gt; last_vma_end) {</div><div class='ctx'> 				smap_gather_stats(vma, &amp;mss, last_vma_end);</div><div class='add'>+				last_vma_end = vma-&gt;vm_end;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} for_each_vma(vmi, vma);</div><div class='ctx'> </div><div class='hunk'>@@ -1020,9 +1530,9 @@ static int smaps_rollup_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;inode = inode;</div><div class='del'>-	priv-&gt;mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='del'>-	if (IS_ERR(priv-&gt;mm)) {</div><div class='del'>-		ret = PTR_ERR(priv-&gt;mm);</div><div class='add'>+	priv-&gt;lock_ctx.mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='add'>+	if (IS_ERR_OR_NULL(priv-&gt;lock_ctx.mm)) {</div><div class='add'>+		ret = priv-&gt;lock_ctx.mm ? PTR_ERR(priv-&gt;lock_ctx.mm) : -ESRCH;</div><div class='ctx'> </div><div class='ctx'> 		single_release(inode, file);</div><div class='ctx'> 		goto out_free;</div><div class='hunk'>@@ -1040,8 +1550,8 @@ static int smaps_rollup_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct seq_file *seq = file-&gt;private_data;</div><div class='ctx'> 	struct proc_maps_private *priv = seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mm)</div><div class='del'>-		mmdrop(priv-&gt;mm);</div><div class='add'>+	if (priv-&gt;lock_ctx.mm)</div><div class='add'>+		mmdrop(priv-&gt;lock_ctx.mm);</div><div class='ctx'> </div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> 	return single_release(inode, file);</div><div class='hunk'>@@ -1074,27 +1584,27 @@ struct clear_refs_private {</div><div class='ctx'> 	enum clear_refs_types type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEM_SOFT_DIRTY</div><div class='del'>-</div><div class='ctx'> static inline bool pte_is_pinned(struct vm_area_struct *vma, unsigned long addr, pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	if (!pte_write(pte))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (!is_cow_mapping(vma-&gt;vm_flags))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (likely(!test_bit(MMF_HAS_PINNED, &amp;vma-&gt;vm_mm-&gt;flags)))</div><div class='add'>+	if (likely(!mm_flags_test(MMF_HAS_PINNED, vma-&gt;vm_mm)))</div><div class='ctx'> 		return false;</div><div class='del'>-	page = vm_normal_page(vma, addr, pte);</div><div class='del'>-	if (!page)</div><div class='add'>+	folio = vm_normal_folio(vma, addr, pte);</div><div class='add'>+	if (!folio)</div><div class='ctx'> 		return false;</div><div class='del'>-	return page_maybe_dma_pinned(page);</div><div class='add'>+	return folio_maybe_dma_pinned(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void clear_soft_dirty(struct vm_area_struct *vma,</div><div class='ctx'> 		unsigned long addr, pte_t *pte)</div><div class='ctx'> {</div><div class='add'>+	if (!pgtable_supports_soft_dirty())</div><div class='add'>+		return;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The soft-dirty tracker uses #PF-s to catch writes</div><div class='ctx'> 	 * to pages, so write-protect the pte as well. See the</div><div class='hunk'>@@ -1103,6 +1613,9 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma,</div><div class='ctx'> 	 */</div><div class='ctx'> 	pte_t ptent = ptep_get(pte);</div><div class='ctx'> </div><div class='add'>+	if (pte_none(ptent))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (pte_present(ptent)) {</div><div class='ctx'> 		pte_t old_pte;</div><div class='ctx'> </div><div class='hunk'>@@ -1112,24 +1625,21 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma,</div><div class='ctx'> 		ptent = pte_wrprotect(old_pte);</div><div class='ctx'> 		ptent = pte_clear_soft_dirty(ptent);</div><div class='ctx'> 		ptep_modify_prot_commit(vma, addr, pte, old_pte, ptent);</div><div class='del'>-	} else if (is_swap_pte(ptent)) {</div><div class='add'>+	} else {</div><div class='ctx'> 		ptent = pte_swp_clear_soft_dirty(ptent);</div><div class='ctx'> 		set_pte_at(vma-&gt;vm_mm, addr, pte, ptent);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline void clear_soft_dirty(struct vm_area_struct *vma,</div><div class='del'>-		unsigned long addr, pte_t *pte)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MEM_SOFT_DIRTY) &amp;&amp; defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='add'>+#if defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='ctx'> static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma,</div><div class='ctx'> 		unsigned long addr, pmd_t *pmdp)</div><div class='ctx'> {</div><div class='ctx'> 	pmd_t old, pmd = *pmdp;</div><div class='ctx'> </div><div class='add'>+	if (!pgtable_supports_soft_dirty())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (pmd_present(pmd)) {</div><div class='ctx'> 		/* See comment in change_huge_pmd() */</div><div class='ctx'> 		old = pmdp_invalidate(vma, addr, pmdp);</div><div class='hunk'>@@ -1142,7 +1652,7 @@ static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma,</div><div class='ctx'> 		pmd = pmd_clear_soft_dirty(pmd);</div><div class='ctx'> </div><div class='ctx'> 		set_pmd_at(vma-&gt;vm_mm, addr, pmdp, pmd);</div><div class='del'>-	} else if (is_migration_entry(pmd_to_swp_entry(pmd))) {</div><div class='add'>+	} else if (pmd_is_migration_entry(pmd)) {</div><div class='ctx'> 		pmd = pmd_swp_clear_soft_dirty(pmd);</div><div class='ctx'> 		set_pmd_at(vma-&gt;vm_mm, addr, pmdp, pmd);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1161,7 +1671,7 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> 	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='ctx'> 	pte_t *pte, ptent;</div><div class='ctx'> 	spinlock_t *ptl;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	ptl = pmd_trans_huge_lock(pmd, vma);</div><div class='ctx'> 	if (ptl) {</div><div class='hunk'>@@ -1173,12 +1683,12 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> 		if (!pmd_present(*pmd))</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		page = pmd_page(*pmd);</div><div class='add'>+		folio = pmd_folio(*pmd);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear accessed and referenced bits. */</div><div class='ctx'> 		pmdp_test_and_clear_young(vma, addr, pmd);</div><div class='del'>-		test_and_clear_page_young(page);</div><div class='del'>-		ClearPageReferenced(page);</div><div class='add'>+		folio_test_clear_young(folio);</div><div class='add'>+		folio_clear_referenced(folio);</div><div class='ctx'> out:</div><div class='ctx'> 		spin_unlock(ptl);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1200,14 +1710,14 @@ out:</div><div class='ctx'> 		if (!pte_present(ptent))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		page = vm_normal_page(vma, addr, ptent);</div><div class='del'>-		if (!page)</div><div class='add'>+		folio = vm_normal_folio(vma, addr, ptent);</div><div class='add'>+		if (!folio)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Clear accessed and referenced bits. */</div><div class='ctx'> 		ptep_test_and_clear_young(vma, addr, pte);</div><div class='del'>-		test_and_clear_page_young(page);</div><div class='del'>-		ClearPageReferenced(page);</div><div class='add'>+		folio_test_clear_young(folio);</div><div class='add'>+		folio_clear_referenced(folio);</div><div class='ctx'> 	}</div><div class='ctx'> 	pte_unmap_unlock(pte - 1, ptl);</div><div class='ctx'> 	cond_resched();</div><div class='hunk'>@@ -1341,6 +1851,7 @@ struct pagemapread {</div><div class='ctx'> #define PM_SOFT_DIRTY		BIT_ULL(55)</div><div class='ctx'> #define PM_MMAP_EXCLUSIVE	BIT_ULL(56)</div><div class='ctx'> #define PM_UFFD_WP		BIT_ULL(57)</div><div class='add'>+#define PM_GUARD_REGION		BIT_ULL(58)</div><div class='ctx'> #define PM_FILE			BIT_ULL(61)</div><div class='ctx'> #define PM_SWAP			BIT_ULL(62)</div><div class='ctx'> #define PM_PRESENT		BIT_ULL(63)</div><div class='hunk'>@@ -1352,8 +1863,7 @@ static inline pagemap_entry_t make_pme(u64 frame, u64 flags)</div><div class='ctx'> 	return (pagemap_entry_t) { .pme = (frame &amp; PM_PFRAME_MASK) | flags };</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int add_to_pagemap(unsigned long addr, pagemap_entry_t *pme,</div><div class='del'>-			  struct pagemapread *pm)</div><div class='add'>+static int add_to_pagemap(pagemap_entry_t *pme, struct pagemapread *pm)</div><div class='ctx'> {</div><div class='ctx'> 	pm-&gt;buffer[pm-&gt;pos++] = *pme;</div><div class='ctx'> 	if (pm-&gt;pos &gt;= pm-&gt;len)</div><div class='hunk'>@@ -1361,6 +1871,13 @@ static int add_to_pagemap(unsigned long addr, pagemap_entry_t *pme,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool __folio_page_mapped_exclusively(struct folio *folio, struct page *page)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT))</div><div class='add'>+		return folio_precise_page_mapcount(folio, page) == 1;</div><div class='add'>+	return !folio_maybe_mapped_shared(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pagemap_pte_hole(unsigned long start, unsigned long end,</div><div class='ctx'> 			    __always_unused int depth, struct mm_walk *walk)</div><div class='ctx'> {</div><div class='hunk'>@@ -1380,7 +1897,7 @@ static int pagemap_pte_hole(unsigned long start, unsigned long end,</div><div class='ctx'> 			hole_end = end;</div><div class='ctx'> </div><div class='ctx'> 		for (; addr &lt; hole_end; addr += PAGE_SIZE) {</div><div class='del'>-			err = add_to_pagemap(addr, &amp;pme, pm);</div><div class='add'>+			err = add_to_pagemap(&amp;pme, pm);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1392,7 +1909,7 @@ static int pagemap_pte_hole(unsigned long start, unsigned long end,</div><div class='ctx'> 		if (vma-&gt;vm_flags &amp; VM_SOFTDIRTY)</div><div class='ctx'> 			pme = make_pme(0, PM_SOFT_DIRTY);</div><div class='ctx'> 		for (; addr &lt; min(end, vma-&gt;vm_end); addr += PAGE_SIZE) {</div><div class='del'>-			err = add_to_pagemap(addr, &amp;pme, pm);</div><div class='add'>+			err = add_to_pagemap(&amp;pme, pm);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1406,7 +1923,10 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm,</div><div class='ctx'> {</div><div class='ctx'> 	u64 frame = 0, flags = 0;</div><div class='ctx'> 	struct page *page = NULL;</div><div class='del'>-	bool migration = false;</div><div class='add'>+	struct folio *folio;</div><div class='add'>+</div><div class='add'>+	if (pte_none(pte))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (pte_present(pte)) {</div><div class='ctx'> 		if (pm-&gt;show_pfn)</div><div class='hunk'>@@ -1417,122 +1937,149 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm,</div><div class='ctx'> 			flags |= PM_SOFT_DIRTY;</div><div class='ctx'> 		if (pte_uffd_wp(pte))</div><div class='ctx'> 			flags |= PM_UFFD_WP;</div><div class='del'>-	} else if (is_swap_pte(pte)) {</div><div class='del'>-		swp_entry_t entry;</div><div class='add'>+	} else {</div><div class='add'>+		softleaf_t entry;</div><div class='add'>+</div><div class='ctx'> 		if (pte_swp_soft_dirty(pte))</div><div class='ctx'> 			flags |= PM_SOFT_DIRTY;</div><div class='ctx'> 		if (pte_swp_uffd_wp(pte))</div><div class='ctx'> 			flags |= PM_UFFD_WP;</div><div class='del'>-		entry = pte_to_swp_entry(pte);</div><div class='add'>+		entry = softleaf_from_pte(pte);</div><div class='ctx'> 		if (pm-&gt;show_pfn) {</div><div class='ctx'> 			pgoff_t offset;</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * For PFN swap offsets, keeping the offset field</div><div class='ctx'> 			 * to be PFN only to be compatible with old smaps.</div><div class='ctx'> 			 */</div><div class='del'>-			if (is_pfn_swap_entry(entry))</div><div class='del'>-				offset = swp_offset_pfn(entry);</div><div class='add'>+			if (softleaf_has_pfn(entry))</div><div class='add'>+				offset = softleaf_to_pfn(entry);</div><div class='ctx'> 			else</div><div class='ctx'> 				offset = swp_offset(entry);</div><div class='ctx'> 			frame = swp_type(entry) |</div><div class='ctx'> 			    (offset &lt;&lt; MAX_SWAPFILES_SHIFT);</div><div class='ctx'> 		}</div><div class='ctx'> 		flags |= PM_SWAP;</div><div class='del'>-		migration = is_migration_entry(entry);</div><div class='del'>-		if (is_pfn_swap_entry(entry))</div><div class='del'>-			page = pfn_swap_entry_to_page(entry);</div><div class='del'>-		if (pte_marker_entry_uffd_wp(entry))</div><div class='add'>+		if (softleaf_has_pfn(entry))</div><div class='add'>+			page = softleaf_to_page(entry);</div><div class='add'>+		if (softleaf_is_uffd_wp_marker(entry))</div><div class='ctx'> 			flags |= PM_UFFD_WP;</div><div class='add'>+		if (softleaf_is_guard_marker(entry))</div><div class='add'>+			flags |=  PM_GUARD_REGION;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (page) {</div><div class='add'>+		folio = page_folio(page);</div><div class='add'>+		if (!folio_test_anon(folio))</div><div class='add'>+			flags |= PM_FILE;</div><div class='add'>+		if ((flags &amp; PM_PRESENT) &amp;&amp;</div><div class='add'>+		    __folio_page_mapped_exclusively(folio, page))</div><div class='add'>+			flags |= PM_MMAP_EXCLUSIVE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (page &amp;&amp; !PageAnon(page))</div><div class='del'>-		flags |= PM_FILE;</div><div class='del'>-	if (page &amp;&amp; !migration &amp;&amp; page_mapcount(page) == 1)</div><div class='del'>-		flags |= PM_MMAP_EXCLUSIVE;</div><div class='add'>+out:</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_SOFTDIRTY)</div><div class='ctx'> 		flags |= PM_SOFT_DIRTY;</div><div class='ctx'> </div><div class='ctx'> 	return make_pme(frame, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,</div><div class='del'>-			     struct mm_walk *walk)</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+static int pagemap_pmd_range_thp(pmd_t *pmdp, unsigned long addr,</div><div class='add'>+		unsigned long end, struct vm_area_struct *vma,</div><div class='add'>+		struct pagemapread *pm)</div><div class='ctx'> {</div><div class='del'>-	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='del'>-	struct pagemapread *pm = walk-&gt;private;</div><div class='del'>-	spinlock_t *ptl;</div><div class='del'>-	pte_t *pte, *orig_pte;</div><div class='add'>+	unsigned int idx = (addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	u64 flags = 0, frame = 0;</div><div class='add'>+	pmd_t pmd = *pmdp;</div><div class='add'>+	struct page *page = NULL;</div><div class='add'>+	struct folio *folio = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-	bool migration = false;</div><div class='ctx'> </div><div class='del'>-	ptl = pmd_trans_huge_lock(pmdp, vma);</div><div class='del'>-	if (ptl) {</div><div class='del'>-		u64 flags = 0, frame = 0;</div><div class='del'>-		pmd_t pmd = *pmdp;</div><div class='del'>-		struct page *page = NULL;</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_SOFTDIRTY)</div><div class='add'>+		flags |= PM_SOFT_DIRTY;</div><div class='ctx'> </div><div class='del'>-		if (vma-&gt;vm_flags &amp; VM_SOFTDIRTY)</div><div class='add'>+	if (pmd_none(pmd))</div><div class='add'>+		goto populate_pagemap;</div><div class='add'>+</div><div class='add'>+	if (pmd_present(pmd)) {</div><div class='add'>+		page = pmd_page(pmd);</div><div class='add'>+</div><div class='add'>+		flags |= PM_PRESENT;</div><div class='add'>+		if (pmd_soft_dirty(pmd))</div><div class='ctx'> 			flags |= PM_SOFT_DIRTY;</div><div class='add'>+		if (pmd_uffd_wp(pmd))</div><div class='add'>+			flags |= PM_UFFD_WP;</div><div class='add'>+		if (pm-&gt;show_pfn)</div><div class='add'>+			frame = pmd_pfn(pmd) + idx;</div><div class='add'>+	} else if (thp_migration_supported()) {</div><div class='add'>+		const softleaf_t entry = softleaf_from_pmd(pmd);</div><div class='add'>+		unsigned long offset;</div><div class='ctx'> </div><div class='del'>-		if (pmd_present(pmd)) {</div><div class='del'>-			page = pmd_page(pmd);</div><div class='del'>-</div><div class='del'>-			flags |= PM_PRESENT;</div><div class='del'>-			if (pmd_soft_dirty(pmd))</div><div class='del'>-				flags |= PM_SOFT_DIRTY;</div><div class='del'>-			if (pmd_uffd_wp(pmd))</div><div class='del'>-				flags |= PM_UFFD_WP;</div><div class='del'>-			if (pm-&gt;show_pfn)</div><div class='del'>-				frame = pmd_pfn(pmd) +</div><div class='del'>-					((addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION</div><div class='del'>-		else if (is_swap_pmd(pmd)) {</div><div class='del'>-			swp_entry_t entry = pmd_to_swp_entry(pmd);</div><div class='del'>-			unsigned long offset;</div><div class='del'>-</div><div class='del'>-			if (pm-&gt;show_pfn) {</div><div class='del'>-				if (is_pfn_swap_entry(entry))</div><div class='del'>-					offset = swp_offset_pfn(entry);</div><div class='del'>-				else</div><div class='del'>-					offset = swp_offset(entry);</div><div class='del'>-				offset = offset +</div><div class='del'>-					((addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-				frame = swp_type(entry) |</div><div class='del'>-					(offset &lt;&lt; MAX_SWAPFILES_SHIFT);</div><div class='del'>-			}</div><div class='del'>-			flags |= PM_SWAP;</div><div class='del'>-			if (pmd_swp_soft_dirty(pmd))</div><div class='del'>-				flags |= PM_SOFT_DIRTY;</div><div class='del'>-			if (pmd_swp_uffd_wp(pmd))</div><div class='del'>-				flags |= PM_UFFD_WP;</div><div class='del'>-			VM_BUG_ON(!is_pmd_migration_entry(pmd));</div><div class='del'>-			migration = is_migration_entry(entry);</div><div class='del'>-			page = pfn_swap_entry_to_page(entry);</div><div class='add'>+		if (pm-&gt;show_pfn) {</div><div class='add'>+			if (softleaf_has_pfn(entry))</div><div class='add'>+				offset = softleaf_to_pfn(entry) + idx;</div><div class='add'>+			else</div><div class='add'>+				offset = swp_offset(entry) + idx;</div><div class='add'>+			frame = swp_type(entry) |</div><div class='add'>+				(offset &lt;&lt; MAX_SWAPFILES_SHIFT);</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='add'>+		flags |= PM_SWAP;</div><div class='add'>+		if (pmd_swp_soft_dirty(pmd))</div><div class='add'>+			flags |= PM_SOFT_DIRTY;</div><div class='add'>+		if (pmd_swp_uffd_wp(pmd))</div><div class='add'>+			flags |= PM_UFFD_WP;</div><div class='add'>+		VM_WARN_ON_ONCE(!pmd_is_migration_entry(pmd));</div><div class='add'>+		page = softleaf_to_page(entry);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (page &amp;&amp; !migration &amp;&amp; page_mapcount(page) == 1)</div><div class='del'>-			flags |= PM_MMAP_EXCLUSIVE;</div><div class='add'>+	if (page) {</div><div class='add'>+		folio = page_folio(page);</div><div class='add'>+		if (!folio_test_anon(folio))</div><div class='add'>+			flags |= PM_FILE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		for (; addr != end; addr += PAGE_SIZE) {</div><div class='del'>-			pagemap_entry_t pme = make_pme(frame, flags);</div><div class='add'>+populate_pagemap:</div><div class='add'>+	for (; addr != end; addr += PAGE_SIZE, idx++) {</div><div class='add'>+		u64 cur_flags = flags;</div><div class='add'>+		pagemap_entry_t pme;</div><div class='ctx'> </div><div class='del'>-			err = add_to_pagemap(addr, &amp;pme, pm);</div><div class='del'>-			if (err)</div><div class='del'>-				break;</div><div class='del'>-			if (pm-&gt;show_pfn) {</div><div class='del'>-				if (flags &amp; PM_PRESENT)</div><div class='del'>-					frame++;</div><div class='del'>-				else if (flags &amp; PM_SWAP)</div><div class='del'>-					frame += (1 &lt;&lt; MAX_SWAPFILES_SHIFT);</div><div class='del'>-			}</div><div class='add'>+		if (folio &amp;&amp; (flags &amp; PM_PRESENT) &amp;&amp;</div><div class='add'>+		    __folio_page_mapped_exclusively(folio, page))</div><div class='add'>+			cur_flags |= PM_MMAP_EXCLUSIVE;</div><div class='add'>+</div><div class='add'>+		pme = make_pme(frame, cur_flags);</div><div class='add'>+		err = add_to_pagemap(&amp;pme, pm);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		if (pm-&gt;show_pfn) {</div><div class='add'>+			if (flags &amp; PM_PRESENT)</div><div class='add'>+				frame++;</div><div class='add'>+			else if (flags &amp; PM_SWAP)</div><div class='add'>+				frame += (1 &lt;&lt; MAX_SWAPFILES_SHIFT);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='add'>+</div><div class='add'>+static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,</div><div class='add'>+			     struct mm_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='add'>+	struct pagemapread *pm = walk-&gt;private;</div><div class='add'>+	spinlock_t *ptl;</div><div class='add'>+	pte_t *pte, *orig_pte;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+	ptl = pmd_trans_huge_lock(pmdp, vma);</div><div class='add'>+	if (ptl) {</div><div class='add'>+		err = pagemap_pmd_range_thp(pmdp, addr, end, vma, pm);</div><div class='ctx'> 		spin_unlock(ptl);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can assume that @vma always points to a valid one and @end never</div><div class='hunk'>@@ -1547,7 +2094,7 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,</div><div class='ctx'> 		pagemap_entry_t pme;</div><div class='ctx'> </div><div class='ctx'> 		pme = pte_to_pagemap_entry(pm, vma, addr, ptep_get(pte));</div><div class='del'>-		err = add_to_pagemap(addr, &amp;pme, pm);</div><div class='add'>+		err = add_to_pagemap(&amp;pme, pm);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1567,20 +2114,23 @@ static int pagemap_hugetlb_range(pte_t *ptep, unsigned long hmask,</div><div class='ctx'> 	struct pagemapread *pm = walk-&gt;private;</div><div class='ctx'> 	struct vm_area_struct *vma = walk-&gt;vma;</div><div class='ctx'> 	u64 flags = 0, frame = 0;</div><div class='add'>+	spinlock_t *ptl;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	pte_t pte;</div><div class='ctx'> </div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_SOFTDIRTY)</div><div class='ctx'> 		flags |= PM_SOFT_DIRTY;</div><div class='ctx'> </div><div class='del'>-	pte = huge_ptep_get(ptep);</div><div class='add'>+	ptl = huge_pte_lock(hstate_vma(vma), walk-&gt;mm, ptep);</div><div class='add'>+	pte = huge_ptep_get(walk-&gt;mm, addr, ptep);</div><div class='ctx'> 	if (pte_present(pte)) {</div><div class='del'>-		struct page *page = pte_page(pte);</div><div class='add'>+		struct folio *folio = page_folio(pte_page(pte));</div><div class='ctx'> </div><div class='del'>-		if (!PageAnon(page))</div><div class='add'>+		if (!folio_test_anon(folio))</div><div class='ctx'> 			flags |= PM_FILE;</div><div class='ctx'> </div><div class='del'>-		if (page_mapcount(page) == 1)</div><div class='add'>+		if (!folio_maybe_mapped_shared(folio) &amp;&amp;</div><div class='add'>+		    !hugetlb_pmd_shared(ptep))</div><div class='ctx'> 			flags |= PM_MMAP_EXCLUSIVE;</div><div class='ctx'> </div><div class='ctx'> 		if (huge_pte_uffd_wp(pte))</div><div class='hunk'>@@ -1597,13 +2147,14 @@ static int pagemap_hugetlb_range(pte_t *ptep, unsigned long hmask,</div><div class='ctx'> 	for (; addr != end; addr += PAGE_SIZE) {</div><div class='ctx'> 		pagemap_entry_t pme = make_pme(frame, flags);</div><div class='ctx'> </div><div class='del'>-		err = add_to_pagemap(addr, &amp;pme, pm);</div><div class='add'>+		err = add_to_pagemap(&amp;pme, pm);</div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='add'>+			break;</div><div class='ctx'> 		if (pm-&gt;show_pfn &amp;&amp; (flags &amp; PM_PRESENT))</div><div class='ctx'> 			frame++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock(ptl);</div><div class='ctx'> 	cond_resched();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1631,7 +2182,8 @@ static const struct mm_walk_ops pagemap_ops = {</div><div class='ctx'>  * Bit  55    pte is soft-dirty (see Documentation/admin-guide/mm/soft-dirty.rst)</div><div class='ctx'>  * Bit  56    page exclusively mapped</div><div class='ctx'>  * Bit  57    pte is uffd-wp write-protected</div><div class='del'>- * Bits 58-60 zero</div><div class='add'>+ * Bit  58    pte is a guard region</div><div class='add'>+ * Bits 59-60 zero</div><div class='ctx'>  * Bit  61    page is file-page or shared-anon</div><div class='ctx'>  * Bit  62    page swapped</div><div class='ctx'>  * Bit  63    page present</div><div class='hunk'>@@ -1745,8 +2297,8 @@ static int pagemap_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> </div><div class='ctx'> 	mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='del'>-	if (IS_ERR(mm))</div><div class='del'>-		return PTR_ERR(mm);</div><div class='add'>+	if (IS_ERR_OR_NULL(mm))</div><div class='add'>+		return mm ? PTR_ERR(mm) : -ESRCH;</div><div class='ctx'> 	file-&gt;private_data = mm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1763,7 +2315,8 @@ static int pagemap_release(struct inode *inode, struct file *file)</div><div class='ctx'> #define PM_SCAN_CATEGORIES	(PAGE_IS_WPALLOWED | PAGE_IS_WRITTEN |	\</div><div class='ctx'> 				 PAGE_IS_FILE |	PAGE_IS_PRESENT |	\</div><div class='ctx'> 				 PAGE_IS_SWAPPED | PAGE_IS_PFNZERO |	\</div><div class='del'>-				 PAGE_IS_HUGE | PAGE_IS_SOFT_DIRTY)</div><div class='add'>+				 PAGE_IS_HUGE | PAGE_IS_SOFT_DIRTY |	\</div><div class='add'>+				 PAGE_IS_GUARD)</div><div class='ctx'> #define PM_SCAN_FLAGS		(PM_SCAN_WP_MATCHING | PM_SCAN_CHECK_WPASYNC)</div><div class='ctx'> </div><div class='ctx'> struct pagemap_scan_private {</div><div class='hunk'>@@ -1778,12 +2331,16 @@ static unsigned long pagemap_page_category(struct pagemap_scan_private *p,</div><div class='ctx'> 					   struct vm_area_struct *vma,</div><div class='ctx'> 					   unsigned long addr, pte_t pte)</div><div class='ctx'> {</div><div class='del'>-	unsigned long categories = 0;</div><div class='add'>+	unsigned long categories;</div><div class='add'>+</div><div class='add'>+	if (pte_none(pte))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (pte_present(pte)) {</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='del'>-		categories |= PAGE_IS_PRESENT;</div><div class='add'>+		categories = PAGE_IS_PRESENT;</div><div class='add'>+</div><div class='ctx'> 		if (!pte_uffd_wp(pte))</div><div class='ctx'> 			categories |= PAGE_IS_WRITTEN;</div><div class='ctx'> </div><div class='hunk'>@@ -1797,19 +2354,22 @@ static unsigned long pagemap_page_category(struct pagemap_scan_private *p,</div><div class='ctx'> 			categories |= PAGE_IS_PFNZERO;</div><div class='ctx'> 		if (pte_soft_dirty(pte))</div><div class='ctx'> 			categories |= PAGE_IS_SOFT_DIRTY;</div><div class='del'>-	} else if (is_swap_pte(pte)) {</div><div class='del'>-		swp_entry_t swp;</div><div class='add'>+	} else {</div><div class='add'>+		softleaf_t entry;</div><div class='add'>+</div><div class='add'>+		categories = PAGE_IS_SWAPPED;</div><div class='ctx'> </div><div class='del'>-		categories |= PAGE_IS_SWAPPED;</div><div class='ctx'> 		if (!pte_swp_uffd_wp_any(pte))</div><div class='ctx'> 			categories |= PAGE_IS_WRITTEN;</div><div class='ctx'> </div><div class='del'>-		if (p-&gt;masks_of_interest &amp; PAGE_IS_FILE) {</div><div class='del'>-			swp = pte_to_swp_entry(pte);</div><div class='del'>-			if (is_pfn_swap_entry(swp) &amp;&amp;</div><div class='del'>-			    !PageAnon(pfn_swap_entry_to_page(swp)))</div><div class='del'>-				categories |= PAGE_IS_FILE;</div><div class='del'>-		}</div><div class='add'>+		entry = softleaf_from_pte(pte);</div><div class='add'>+		if (softleaf_is_guard_marker(entry))</div><div class='add'>+			categories |= PAGE_IS_GUARD;</div><div class='add'>+		else if ((p-&gt;masks_of_interest &amp; PAGE_IS_FILE) &amp;&amp;</div><div class='add'>+			 softleaf_has_pfn(entry) &amp;&amp;</div><div class='add'>+			 !folio_test_anon(softleaf_to_folio(entry)))</div><div class='add'>+			categories |= PAGE_IS_FILE;</div><div class='add'>+</div><div class='ctx'> 		if (pte_swp_soft_dirty(pte))</div><div class='ctx'> 			categories |= PAGE_IS_SOFT_DIRTY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1818,22 +2378,20 @@ static unsigned long pagemap_page_category(struct pagemap_scan_private *p,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void make_uffd_wp_pte(struct vm_area_struct *vma,</div><div class='del'>-			     unsigned long addr, pte_t *pte)</div><div class='add'>+			     unsigned long addr, pte_t *pte, pte_t ptent)</div><div class='ctx'> {</div><div class='del'>-	pte_t ptent = ptep_get(pte);</div><div class='del'>-</div><div class='ctx'> 	if (pte_present(ptent)) {</div><div class='ctx'> 		pte_t old_pte;</div><div class='ctx'> </div><div class='ctx'> 		old_pte = ptep_modify_prot_start(vma, addr, pte);</div><div class='del'>-		ptent = pte_mkuffd_wp(ptent);</div><div class='add'>+		ptent = pte_mkuffd_wp(old_pte);</div><div class='ctx'> 		ptep_modify_prot_commit(vma, addr, pte, old_pte, ptent);</div><div class='del'>-	} else if (is_swap_pte(ptent)) {</div><div class='del'>-		ptent = pte_swp_mkuffd_wp(ptent);</div><div class='del'>-		set_pte_at(vma-&gt;vm_mm, addr, pte, ptent);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (pte_none(ptent)) {</div><div class='ctx'> 		set_pte_at(vma-&gt;vm_mm, addr, pte,</div><div class='ctx'> 			   make_pte_marker(PTE_MARKER_UFFD_WP));</div><div class='add'>+	} else {</div><div class='add'>+		ptent = pte_swp_mkuffd_wp(ptent);</div><div class='add'>+		set_pte_at(vma-&gt;vm_mm, addr, pte, ptent);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1844,6 +2402,9 @@ static unsigned long pagemap_thp_category(struct pagemap_scan_private *p,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long categories = PAGE_IS_HUGE;</div><div class='ctx'> </div><div class='add'>+	if (pmd_none(pmd))</div><div class='add'>+		return categories;</div><div class='add'>+</div><div class='ctx'> 	if (pmd_present(pmd)) {</div><div class='ctx'> 		struct page *page;</div><div class='ctx'> </div><div class='hunk'>@@ -1857,13 +2418,11 @@ static unsigned long pagemap_thp_category(struct pagemap_scan_private *p,</div><div class='ctx'> 				categories |= PAGE_IS_FILE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (is_zero_pfn(pmd_pfn(pmd)))</div><div class='add'>+		if (is_huge_zero_pmd(pmd))</div><div class='ctx'> 			categories |= PAGE_IS_PFNZERO;</div><div class='ctx'> 		if (pmd_soft_dirty(pmd))</div><div class='ctx'> 			categories |= PAGE_IS_SOFT_DIRTY;</div><div class='del'>-	} else if (is_swap_pmd(pmd)) {</div><div class='del'>-		swp_entry_t swp;</div><div class='del'>-</div><div class='add'>+	} else {</div><div class='ctx'> 		categories |= PAGE_IS_SWAPPED;</div><div class='ctx'> 		if (!pmd_swp_uffd_wp(pmd))</div><div class='ctx'> 			categories |= PAGE_IS_WRITTEN;</div><div class='hunk'>@@ -1871,9 +2430,10 @@ static unsigned long pagemap_thp_category(struct pagemap_scan_private *p,</div><div class='ctx'> 			categories |= PAGE_IS_SOFT_DIRTY;</div><div class='ctx'> </div><div class='ctx'> 		if (p-&gt;masks_of_interest &amp; PAGE_IS_FILE) {</div><div class='del'>-			swp = pmd_to_swp_entry(pmd);</div><div class='del'>-			if (is_pfn_swap_entry(swp) &amp;&amp;</div><div class='del'>-			    !PageAnon(pfn_swap_entry_to_page(swp)))</div><div class='add'>+			const softleaf_t entry = softleaf_from_pmd(pmd);</div><div class='add'>+</div><div class='add'>+			if (softleaf_has_pfn(entry) &amp;&amp;</div><div class='add'>+			    !folio_test_anon(softleaf_to_folio(entry)))</div><div class='ctx'> 				categories |= PAGE_IS_FILE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1890,7 +2450,7 @@ static void make_uffd_wp_pmd(struct vm_area_struct *vma,</div><div class='ctx'> 		old = pmdp_invalidate_ad(vma, addr, pmdp);</div><div class='ctx'> 		pmd = pmd_mkuffd_wp(old);</div><div class='ctx'> 		set_pmd_at(vma-&gt;vm_mm, addr, pmdp, pmd);</div><div class='del'>-	} else if (is_migration_entry(pmd_to_swp_entry(pmd))) {</div><div class='add'>+	} else if (pmd_is_migration_entry(pmd)) {</div><div class='ctx'> 		pmd = pmd_swp_mkuffd_wp(pmd);</div><div class='ctx'> 		set_pmd_at(vma-&gt;vm_mm, addr, pmdp, pmd);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1902,6 +2462,9 @@ static unsigned long pagemap_hugetlb_category(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long categories = PAGE_IS_HUGE;</div><div class='ctx'> </div><div class='add'>+	if (pte_none(pte))</div><div class='add'>+		return categories;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * According to pagemap_hugetlb_range(), file-backed HugeTLB</div><div class='ctx'> 	 * page cannot be swapped. So PAGE_IS_FILE is not checked for</div><div class='hunk'>@@ -1909,6 +2472,7 @@ static unsigned long pagemap_hugetlb_category(pte_t pte)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pte_present(pte)) {</div><div class='ctx'> 		categories |= PAGE_IS_PRESENT;</div><div class='add'>+</div><div class='ctx'> 		if (!huge_pte_uffd_wp(pte))</div><div class='ctx'> 			categories |= PAGE_IS_WRITTEN;</div><div class='ctx'> 		if (!PageAnon(pte_page(pte)))</div><div class='hunk'>@@ -1917,8 +2481,9 @@ static unsigned long pagemap_hugetlb_category(pte_t pte)</div><div class='ctx'> 			categories |= PAGE_IS_PFNZERO;</div><div class='ctx'> 		if (pte_soft_dirty(pte))</div><div class='ctx'> 			categories |= PAGE_IS_SOFT_DIRTY;</div><div class='del'>-	} else if (is_swap_pte(pte)) {</div><div class='add'>+	} else {</div><div class='ctx'> 		categories |= PAGE_IS_SWAPPED;</div><div class='add'>+</div><div class='ctx'> 		if (!pte_swp_uffd_wp_any(pte))</div><div class='ctx'> 			categories |= PAGE_IS_WRITTEN;</div><div class='ctx'> 		if (pte_swp_soft_dirty(pte))</div><div class='hunk'>@@ -1932,22 +2497,25 @@ static void make_uffd_wp_huge_pte(struct vm_area_struct *vma,</div><div class='ctx'> 				  unsigned long addr, pte_t *ptep,</div><div class='ctx'> 				  pte_t ptent)</div><div class='ctx'> {</div><div class='del'>-	unsigned long psize;</div><div class='add'>+	const unsigned long psize = huge_page_size(hstate_vma(vma));</div><div class='add'>+	softleaf_t entry;</div><div class='ctx'> </div><div class='del'>-	if (is_hugetlb_entry_hwpoisoned(ptent) || is_pte_marker(ptent))</div><div class='add'>+	if (huge_pte_none(ptent)) {</div><div class='add'>+		set_huge_pte_at(vma-&gt;vm_mm, addr, ptep,</div><div class='add'>+				make_pte_marker(PTE_MARKER_UFFD_WP), psize);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	psize = huge_page_size(hstate_vma(vma));</div><div class='add'>+	entry = softleaf_from_pte(ptent);</div><div class='add'>+	if (softleaf_is_hwpoison(entry) || softleaf_is_marker(entry))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (is_hugetlb_entry_migration(ptent))</div><div class='add'>+	if (softleaf_is_migration(entry))</div><div class='ctx'> 		set_huge_pte_at(vma-&gt;vm_mm, addr, ptep,</div><div class='ctx'> 				pte_swp_mkuffd_wp(ptent), psize);</div><div class='del'>-	else if (!huge_pte_none(ptent))</div><div class='add'>+	else</div><div class='ctx'> 		huge_ptep_modify_prot_commit(vma, addr, ptep, ptent,</div><div class='ctx'> 					     huge_pte_mkuffd_wp(ptent));</div><div class='del'>-	else</div><div class='del'>-		set_huge_pte_at(vma-&gt;vm_mm, addr, ptep,</div><div class='del'>-				make_pte_marker(PTE_MARKER_UFFD_WP), psize);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='hunk'>@@ -1957,6 +2525,9 @@ static void pagemap_scan_backout_range(struct pagemap_scan_private *p,</div><div class='ctx'> {</div><div class='ctx'> 	struct page_region *cur_buf = &amp;p-&gt;vec_buf[p-&gt;vec_buf_index];</div><div class='ctx'> </div><div class='add'>+	if (!p-&gt;vec_buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (cur_buf-&gt;start != addr)</div><div class='ctx'> 		cur_buf-&gt;end = addr;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2157,28 +2728,28 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,</div><div class='ctx'> 	spinlock_t *ptl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	arch_enter_lazy_mmu_mode();</div><div class='del'>-</div><div class='ctx'> 	ret = pagemap_scan_thp_entry(pmd, start, end, walk);</div><div class='del'>-	if (ret != -ENOENT) {</div><div class='del'>-		arch_leave_lazy_mmu_mode();</div><div class='add'>+	if (ret != -ENOENT)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	start_pte = pte = pte_offset_map_lock(vma-&gt;vm_mm, pmd, start, &amp;ptl);</div><div class='ctx'> 	if (!pte) {</div><div class='del'>-		arch_leave_lazy_mmu_mode();</div><div class='ctx'> 		walk-&gt;action = ACTION_AGAIN;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	arch_enter_lazy_mmu_mode();</div><div class='add'>+</div><div class='ctx'> 	if ((p-&gt;arg.flags &amp; PM_SCAN_WP_MATCHING) &amp;&amp; !p-&gt;vec_out) {</div><div class='ctx'> 		/* Fast path for performing exclusive WP */</div><div class='ctx'> 		for (addr = start; addr != end; pte++, addr += PAGE_SIZE) {</div><div class='del'>-			if (pte_uffd_wp(ptep_get(pte)))</div><div class='add'>+			pte_t ptent = ptep_get(pte);</div><div class='add'>+</div><div class='add'>+			if ((pte_present(ptent) &amp;&amp; pte_uffd_wp(ptent)) ||</div><div class='add'>+			    pte_swp_uffd_wp_any(ptent))</div><div class='ctx'> 				continue;</div><div class='del'>-			make_uffd_wp_pte(vma, addr, pte);</div><div class='add'>+			make_uffd_wp_pte(vma, addr, pte, ptent);</div><div class='ctx'> 			if (!flush_end)</div><div class='ctx'> 				start = addr;</div><div class='ctx'> 			flush_end = addr + PAGE_SIZE;</div><div class='hunk'>@@ -2191,8 +2762,10 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,</div><div class='ctx'> 	    p-&gt;arg.return_mask == PAGE_IS_WRITTEN) {</div><div class='ctx'> 		for (addr = start; addr &lt; end; pte++, addr += PAGE_SIZE) {</div><div class='ctx'> 			unsigned long next = addr + PAGE_SIZE;</div><div class='add'>+			pte_t ptent = ptep_get(pte);</div><div class='ctx'> </div><div class='del'>-			if (pte_uffd_wp(ptep_get(pte)))</div><div class='add'>+			if ((pte_present(ptent) &amp;&amp; pte_uffd_wp(ptent)) ||</div><div class='add'>+			    pte_swp_uffd_wp_any(ptent))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			ret = pagemap_scan_output(p-&gt;cur_vma_category | PAGE_IS_WRITTEN,</div><div class='ctx'> 						  p, addr, &amp;next);</div><div class='hunk'>@@ -2200,7 +2773,7 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (~p-&gt;arg.flags &amp; PM_SCAN_WP_MATCHING)</div><div class='ctx'> 				continue;</div><div class='del'>-			make_uffd_wp_pte(vma, addr, pte);</div><div class='add'>+			make_uffd_wp_pte(vma, addr, pte, ptent);</div><div class='ctx'> 			if (!flush_end)</div><div class='ctx'> 				start = addr;</div><div class='ctx'> 			flush_end = next;</div><div class='hunk'>@@ -2209,8 +2782,9 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (addr = start; addr != end; pte++, addr += PAGE_SIZE) {</div><div class='add'>+		pte_t ptent = ptep_get(pte);</div><div class='ctx'> 		unsigned long categories = p-&gt;cur_vma_category |</div><div class='del'>-					   pagemap_page_category(p, vma, addr, ptep_get(pte));</div><div class='add'>+					   pagemap_page_category(p, vma, addr, ptent);</div><div class='ctx'> 		unsigned long next = addr + PAGE_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		if (!pagemap_scan_is_interesting_page(categories, p))</div><div class='hunk'>@@ -2225,7 +2799,7 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,</div><div class='ctx'> 		if (~categories &amp; PAGE_IS_WRITTEN)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		make_uffd_wp_pte(vma, addr, pte);</div><div class='add'>+		make_uffd_wp_pte(vma, addr, pte, ptent);</div><div class='ctx'> 		if (!flush_end)</div><div class='ctx'> 			start = addr;</div><div class='ctx'> 		flush_end = next;</div><div class='hunk'>@@ -2235,8 +2809,8 @@ flush_and_return:</div><div class='ctx'> 	if (flush_end)</div><div class='ctx'> 		flush_tlb_range(vma, start, addr);</div><div class='ctx'> </div><div class='del'>-	pte_unmap_unlock(start_pte, ptl);</div><div class='ctx'> 	arch_leave_lazy_mmu_mode();</div><div class='add'>+	pte_unmap_unlock(start_pte, ptl);</div><div class='ctx'> </div><div class='ctx'> 	cond_resched();</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2257,7 +2831,7 @@ static int pagemap_scan_hugetlb_entry(pte_t *ptep, unsigned long hmask,</div><div class='ctx'> 	if (~p-&gt;arg.flags &amp; PM_SCAN_WP_MATCHING) {</div><div class='ctx'> 		/* Go the short route when not write-protecting pages. */</div><div class='ctx'> </div><div class='del'>-		pte = huge_ptep_get(ptep);</div><div class='add'>+		pte = huge_ptep_get(walk-&gt;mm, start, ptep);</div><div class='ctx'> 		categories = p-&gt;cur_vma_category | pagemap_hugetlb_category(pte);</div><div class='ctx'> </div><div class='ctx'> 		if (!pagemap_scan_is_interesting_page(categories, p))</div><div class='hunk'>@@ -2269,7 +2843,7 @@ static int pagemap_scan_hugetlb_entry(pte_t *ptep, unsigned long hmask,</div><div class='ctx'> 	i_mmap_lock_write(vma-&gt;vm_file-&gt;f_mapping);</div><div class='ctx'> 	ptl = huge_pte_lock(hstate_vma(vma), vma-&gt;vm_mm, ptep);</div><div class='ctx'> </div><div class='del'>-	pte = huge_ptep_get(ptep);</div><div class='add'>+	pte = huge_ptep_get(walk-&gt;mm, start, ptep);</div><div class='ctx'> 	categories = p-&gt;cur_vma_category | pagemap_hugetlb_category(pte);</div><div class='ctx'> </div><div class='ctx'> 	if (!pagemap_scan_is_interesting_page(categories, p))</div><div class='hunk'>@@ -2361,8 +2935,10 @@ static int pagemap_scan_get_args(struct pm_scan_arg *arg,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (!arg-&gt;vec &amp;&amp; arg-&gt;vec_len)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (UINT_MAX == SIZE_MAX &amp;&amp; arg-&gt;vec_len &gt; SIZE_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (arg-&gt;vec &amp;&amp; !access_ok((void __user *)(long)arg-&gt;vec,</div><div class='del'>-			      arg-&gt;vec_len * sizeof(struct page_region)))</div><div class='add'>+				   size_mul(arg-&gt;vec_len, sizeof(struct page_region))))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* Fixup default values */</div><div class='hunk'>@@ -2548,28 +3124,34 @@ struct numa_maps_private {</div><div class='ctx'> static void gather_stats(struct page *page, struct numa_maps *md, int pte_dirty,</div><div class='ctx'> 			unsigned long nr_pages)</div><div class='ctx'> {</div><div class='del'>-	int count = page_mapcount(page);</div><div class='add'>+	struct folio *folio = page_folio(page);</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT))</div><div class='add'>+		count = folio_precise_page_mapcount(folio, page);</div><div class='add'>+	else</div><div class='add'>+		count = folio_average_page_mapcount(folio);</div><div class='ctx'> </div><div class='ctx'> 	md-&gt;pages += nr_pages;</div><div class='del'>-	if (pte_dirty || PageDirty(page))</div><div class='add'>+	if (pte_dirty || folio_test_dirty(folio))</div><div class='ctx'> 		md-&gt;dirty += nr_pages;</div><div class='ctx'> </div><div class='del'>-	if (PageSwapCache(page))</div><div class='add'>+	if (folio_test_swapcache(folio))</div><div class='ctx'> 		md-&gt;swapcache += nr_pages;</div><div class='ctx'> </div><div class='del'>-	if (PageActive(page) || PageUnevictable(page))</div><div class='add'>+	if (folio_test_active(folio) || folio_test_unevictable(folio))</div><div class='ctx'> 		md-&gt;active += nr_pages;</div><div class='ctx'> </div><div class='del'>-	if (PageWriteback(page))</div><div class='add'>+	if (folio_test_writeback(folio))</div><div class='ctx'> 		md-&gt;writeback += nr_pages;</div><div class='ctx'> </div><div class='del'>-	if (PageAnon(page))</div><div class='add'>+	if (folio_test_anon(folio))</div><div class='ctx'> 		md-&gt;anon += nr_pages;</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; md-&gt;mapcount_max)</div><div class='ctx'> 		md-&gt;mapcount_max = count;</div><div class='ctx'> </div><div class='del'>-	md-&gt;node[page_to_nid(page)] += nr_pages;</div><div class='add'>+	md-&gt;node[folio_nid(folio)] += nr_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma,</div><div class='hunk'>@@ -2664,17 +3246,22 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,</div><div class='ctx'> static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask,</div><div class='ctx'> 		unsigned long addr, unsigned long end, struct mm_walk *walk)</div><div class='ctx'> {</div><div class='del'>-	pte_t huge_pte = huge_ptep_get(pte);</div><div class='add'>+	pte_t huge_pte;</div><div class='ctx'> 	struct numa_maps *md;</div><div class='ctx'> 	struct page *page;</div><div class='add'>+	spinlock_t *ptl;</div><div class='ctx'> </div><div class='add'>+	ptl = huge_pte_lock(hstate_vma(walk-&gt;vma), walk-&gt;mm, pte);</div><div class='add'>+	huge_pte = huge_ptep_get(walk-&gt;mm, addr, pte);</div><div class='ctx'> 	if (!pte_present(huge_pte))</div><div class='del'>-		return 0;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	page = pte_page(huge_pte);</div><div class='ctx'> </div><div class='ctx'> 	md = walk-&gt;private;</div><div class='ctx'> 	gather_stats(page, md, pte_dirty(huge_pte), 1);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(ptl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c<br/>index bce674533000..d362919f4f68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/task_nommu.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/task_nommu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/task_nommu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/task_nommu.c</a></div><div class='hunk'>@@ -204,7 +204,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos)</div><div class='ctx'> 	if (!priv-&gt;task)</div><div class='ctx'> 		return ERR_PTR(-ESRCH);</div><div class='ctx'> </div><div class='del'>-	mm = priv-&gt;mm;</div><div class='add'>+	mm = priv-&gt;lock_ctx.mm;</div><div class='ctx'> 	if (!mm || !mmget_not_zero(mm)) {</div><div class='ctx'> 		put_task_struct(priv-&gt;task);</div><div class='ctx'> 		priv-&gt;task = NULL;</div><div class='hunk'>@@ -226,7 +226,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos)</div><div class='ctx'> static void m_stop(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_maps_private *priv = m-&gt;private;</div><div class='del'>-	struct mm_struct *mm = priv-&gt;mm;</div><div class='add'>+	struct mm_struct *mm = priv-&gt;lock_ctx.mm;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;task)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -259,9 +259,9 @@ static int maps_open(struct inode *inode, struct file *file,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;inode = inode;</div><div class='del'>-	priv-&gt;mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='del'>-	if (IS_ERR(priv-&gt;mm)) {</div><div class='del'>-		int err = PTR_ERR(priv-&gt;mm);</div><div class='add'>+	priv-&gt;lock_ctx.mm = proc_mem_open(inode, PTRACE_MODE_READ);</div><div class='add'>+	if (IS_ERR_OR_NULL(priv-&gt;lock_ctx.mm)) {</div><div class='add'>+		int err = priv-&gt;lock_ctx.mm ? PTR_ERR(priv-&gt;lock_ctx.mm) : -ESRCH;</div><div class='ctx'> </div><div class='ctx'> 		seq_release_private(inode, file);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -276,8 +276,8 @@ static int map_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct seq_file *seq = file-&gt;private_data;</div><div class='ctx'> 	struct proc_maps_private *priv = seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mm)</div><div class='del'>-		mmdrop(priv-&gt;mm);</div><div class='add'>+	if (priv-&gt;lock_ctx.mm)</div><div class='add'>+		mmdrop(priv-&gt;lock_ctx.mm);</div><div class='ctx'> </div><div class='ctx'> 	return seq_release_private(inode, file);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c<br/>index 0e5050d6ab64..d6113dbe58e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/thread_self.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/thread_self.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/thread_self.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/thread_self.c</a></div><div class='hunk'>@@ -31,12 +31,11 @@ static const struct inode_operations proc_thread_self_inode_operations = {</div><div class='ctx'> 	.get_link	= proc_thread_self_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned thread_self_inum __ro_after_init;</div><div class='add'>+unsigned thread_self_inum __ro_after_init;</div><div class='ctx'> </div><div class='ctx'> int proc_setup_thread_self(struct super_block *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *root_inode = d_inode(s-&gt;s_root);</div><div class='del'>-	struct proc_fs_info *fs_info = proc_sb_info(s);</div><div class='ctx'> 	struct dentry *thread_self;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -51,19 +50,15 @@ int proc_setup_thread_self(struct super_block *s)</div><div class='ctx'> 			inode-&gt;i_uid = GLOBAL_ROOT_UID;</div><div class='ctx'> 			inode-&gt;i_gid = GLOBAL_ROOT_GID;</div><div class='ctx'> 			inode-&gt;i_op = &amp;proc_thread_self_inode_operations;</div><div class='del'>-			d_add(thread_self, inode);</div><div class='add'>+			d_make_persistent(thread_self, inode);</div><div class='ctx'> 			ret = 0;</div><div class='del'>-		} else {</div><div class='del'>-			dput(thread_self);</div><div class='ctx'> 		}</div><div class='add'>+		dput(thread_self);</div><div class='ctx'> 	}</div><div class='ctx'> 	inode_unlock(root_inode);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		pr_err("proc_fill_super: can't allocate /proc/thread-self\n");</div><div class='del'>-	else</div><div class='del'>-		fs_info-&gt;proc_thread_self = thread_self;</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c<br/>index 1fb213f379a5..f188bd900eb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc/vmcore.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc/vmcore.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc/vmcore.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc/vmcore.c</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) "vmcore: " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kcore.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='hunk'>@@ -51,9 +53,14 @@ static u64 vmcore_size;</div><div class='ctx'> static struct proc_dir_entry *proc_vmcore;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP</div><div class='add'>+struct vmcoredd_node {</div><div class='add'>+	struct list_head list;	/* List of dumps */</div><div class='add'>+	void *buf;		/* Buffer containing device's dump */</div><div class='add'>+	unsigned int size;	/* Size of the buffer */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Device Dump list and mutex to synchronize access to list */</div><div class='ctx'> static LIST_HEAD(vmcoredd_list);</div><div class='del'>-static DEFINE_MUTEX(vmcoredd_mutex);</div><div class='ctx'> </div><div class='ctx'> static bool vmcoredd_disabled;</div><div class='ctx'> core_param(novmcoredd, vmcoredd_disabled, bool, 0);</div><div class='hunk'>@@ -62,17 +69,22 @@ core_param(novmcoredd, vmcoredd_disabled, bool, 0);</div><div class='ctx'> /* Device Dump Size */</div><div class='ctx'> static size_t vmcoredd_orig_sz;</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(vmcore_cb_lock);</div><div class='add'>+static DEFINE_MUTEX(vmcore_mutex);</div><div class='add'>+</div><div class='ctx'> DEFINE_STATIC_SRCU(vmcore_cb_srcu);</div><div class='ctx'> /* List of registered vmcore callbacks. */</div><div class='ctx'> static LIST_HEAD(vmcore_cb_list);</div><div class='ctx'> /* Whether the vmcore has been opened once. */</div><div class='ctx'> static bool vmcore_opened;</div><div class='add'>+/* Whether the vmcore is currently open. */</div><div class='add'>+static unsigned int vmcore_open;</div><div class='add'>+</div><div class='add'>+static void vmcore_process_device_ram(struct vmcore_cb *cb);</div><div class='ctx'> </div><div class='ctx'> void register_vmcore_cb(struct vmcore_cb *cb)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cb-&gt;next);</div><div class='del'>-	spin_lock(&amp;vmcore_cb_lock);</div><div class='add'>+	mutex_lock(&amp;vmcore_mutex);</div><div class='ctx'> 	list_add_tail(&amp;cb-&gt;next, &amp;vmcore_cb_list);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Registering a vmcore callback after the vmcore was opened is</div><div class='hunk'>@@ -80,13 +92,15 @@ void register_vmcore_cb(struct vmcore_cb *cb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vmcore_opened)</div><div class='ctx'> 		pr_warn_once("Unexpected vmcore callback registration\n");</div><div class='del'>-	spin_unlock(&amp;vmcore_cb_lock);</div><div class='add'>+	if (!vmcore_open &amp;&amp; cb-&gt;get_device_ram)</div><div class='add'>+		vmcore_process_device_ram(cb);</div><div class='add'>+	mutex_unlock(&amp;vmcore_mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(register_vmcore_cb);</div><div class='ctx'> </div><div class='ctx'> void unregister_vmcore_cb(struct vmcore_cb *cb)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;vmcore_cb_lock);</div><div class='add'>+	mutex_lock(&amp;vmcore_mutex);</div><div class='ctx'> 	list_del_rcu(&amp;cb-&gt;next);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Unregistering a vmcore callback after the vmcore was opened is</div><div class='hunk'>@@ -95,7 +109,7 @@ void unregister_vmcore_cb(struct vmcore_cb *cb)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vmcore_opened)</div><div class='ctx'> 		pr_warn_once("Unexpected vmcore callback unregistration\n");</div><div class='del'>-	spin_unlock(&amp;vmcore_cb_lock);</div><div class='add'>+	mutex_unlock(&amp;vmcore_mutex);</div><div class='ctx'> </div><div class='ctx'> 	synchronize_srcu(&amp;vmcore_cb_srcu);</div><div class='ctx'> }</div><div class='hunk'>@@ -120,9 +134,23 @@ static bool pfn_is_ram(unsigned long pfn)</div><div class='ctx'> </div><div class='ctx'> static int open_vmcore(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;vmcore_cb_lock);</div><div class='add'>+	mutex_lock(&amp;vmcore_mutex);</div><div class='ctx'> 	vmcore_opened = true;</div><div class='del'>-	spin_unlock(&amp;vmcore_cb_lock);</div><div class='add'>+	if (vmcore_open + 1 == 0) {</div><div class='add'>+		mutex_unlock(&amp;vmcore_mutex);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	vmcore_open++;</div><div class='add'>+	mutex_unlock(&amp;vmcore_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int release_vmcore(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;vmcore_mutex);</div><div class='add'>+	vmcore_open--;</div><div class='add'>+	mutex_unlock(&amp;vmcore_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -243,33 +271,27 @@ static int vmcoredd_copy_dumps(struct iov_iter *iter, u64 start, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmcoredd_node *dump;</div><div class='ctx'> 	u64 offset = 0;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	size_t tsz;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;vmcoredd_mutex);</div><div class='ctx'> 	list_for_each_entry(dump, &amp;vmcoredd_list, list) {</div><div class='ctx'> 		if (start &lt; offset + dump-&gt;size) {</div><div class='ctx'> 			tsz = min(offset + (u64)dump-&gt;size - start, (u64)size);</div><div class='ctx'> 			buf = dump-&gt;buf + start - offset;</div><div class='del'>-			if (copy_to_iter(buf, tsz, iter) &lt; tsz) {</div><div class='del'>-				ret = -EFAULT;</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='add'>+			if (copy_to_iter(buf, tsz, iter) &lt; tsz)</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 			size -= tsz;</div><div class='ctx'> 			start += tsz;</div><div class='ctx'> </div><div class='ctx'> 			/* Leave now if buffer filled already */</div><div class='ctx'> 			if (!size)</div><div class='del'>-				goto out_unlock;</div><div class='add'>+				return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += dump-&gt;size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;vmcoredd_mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='hunk'>@@ -278,20 +300,16 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst,</div><div class='ctx'> {</div><div class='ctx'> 	struct vmcoredd_node *dump;</div><div class='ctx'> 	u64 offset = 0;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	size_t tsz;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;vmcoredd_mutex);</div><div class='ctx'> 	list_for_each_entry(dump, &amp;vmcoredd_list, list) {</div><div class='ctx'> 		if (start &lt; offset + dump-&gt;size) {</div><div class='ctx'> 			tsz = min(offset + (u64)dump-&gt;size - start, (u64)size);</div><div class='ctx'> 			buf = dump-&gt;buf + start - offset;</div><div class='ctx'> 			if (remap_vmalloc_range_partial(vma, dst, buf, 0,</div><div class='del'>-							tsz)) {</div><div class='del'>-				ret = -EFAULT;</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='add'>+							tsz))</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 			size -= tsz;</div><div class='ctx'> 			start += tsz;</div><div class='hunk'>@@ -299,14 +317,12 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst,</div><div class='ctx'> </div><div class='ctx'> 			/* Leave now if buffer filled already */</div><div class='ctx'> 			if (!size)</div><div class='del'>-				goto out_unlock;</div><div class='add'>+				return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset += dump-&gt;size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;vmcoredd_mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */</div><div class='hunk'>@@ -316,10 +332,10 @@ out_unlock:</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t __read_vmcore(struct iov_iter *iter, loff_t *fpos)</div><div class='ctx'> {</div><div class='add'>+	struct vmcore_range *m = NULL;</div><div class='ctx'> 	ssize_t acc = 0, tmp;</div><div class='ctx'> 	size_t tsz;</div><div class='ctx'> 	u64 start;</div><div class='del'>-	struct vmcore *m = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!iov_iter_count(iter) || *fpos &gt;= vmcore_size)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -383,6 +399,8 @@ static ssize_t __read_vmcore(struct iov_iter *iter, loff_t *fpos)</div><div class='ctx'> 		/* leave now if filled buffer already */</div><div class='ctx'> 		if (!iov_iter_count(iter))</div><div class='ctx'> 			return acc;</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(m, &amp;vmcore_list, list) {</div><div class='hunk'>@@ -402,6 +420,8 @@ static ssize_t __read_vmcore(struct iov_iter *iter, loff_t *fpos)</div><div class='ctx'> 			if (!iov_iter_count(iter))</div><div class='ctx'> 				return acc;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return acc;</div><div class='hunk'>@@ -412,6 +432,34 @@ static ssize_t read_vmcore(struct kiocb *iocb, struct iov_iter *iter)</div><div class='ctx'> 	return __read_vmcore(iter, &amp;iocb-&gt;ki_pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * vmcore_alloc_buf - allocate buffer in vmalloc memory</div><div class='add'>+ * @size: size of buffer</div><div class='add'>+ *</div><div class='add'>+ * If CONFIG_MMU is defined, use vmalloc_user() to allow users to mmap</div><div class='add'>+ * the buffer to user-space by means of remap_vmalloc_range().</div><div class='add'>+ *</div><div class='add'>+ * If CONFIG_MMU is not defined, use vzalloc() since mmap_vmcore() is</div><div class='add'>+ * disabled and there's no need to allow users to mmap the buffer.</div><div class='add'>+ */</div><div class='add'>+static inline char *vmcore_alloc_buf(size_t size)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	return vmalloc_user(size);</div><div class='add'>+#else</div><div class='add'>+	return vzalloc(size);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable mmap_vmcore() if CONFIG_MMU is not defined. MMU is</div><div class='add'>+ * essential for mmap_vmcore() in order to map physically</div><div class='add'>+ * non-contiguous objects (ELF header, ELF note segment and memory</div><div class='add'>+ * regions in the 1st kernel pointed to by PT_LOAD entries) into</div><div class='add'>+ * virtually contiguous user-space in ELF layout.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The vmcore fault handler uses the page cache and fills data using the</div><div class='ctx'>  * standard __read_vmcore() function.</div><div class='hunk'>@@ -459,33 +507,6 @@ static const struct vm_operations_struct vmcore_mmap_ops = {</div><div class='ctx'> 	.fault = mmap_vmcore_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * vmcore_alloc_buf - allocate buffer in vmalloc memory</div><div class='del'>- * @size: size of buffer</div><div class='del'>- *</div><div class='del'>- * If CONFIG_MMU is defined, use vmalloc_user() to allow users to mmap</div><div class='del'>- * the buffer to user-space by means of remap_vmalloc_range().</div><div class='del'>- *</div><div class='del'>- * If CONFIG_MMU is not defined, use vzalloc() since mmap_vmcore() is</div><div class='del'>- * disabled and there's no need to allow users to mmap the buffer.</div><div class='del'>- */</div><div class='del'>-static inline char *vmcore_alloc_buf(size_t size)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-	return vmalloc_user(size);</div><div class='del'>-#else</div><div class='del'>-	return vzalloc(size);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Disable mmap_vmcore() if CONFIG_MMU is not defined. MMU is</div><div class='del'>- * essential for mmap_vmcore() in order to map physically</div><div class='del'>- * non-contiguous objects (ELF header, ELF note segment and memory</div><div class='del'>- * regions in the 1st kernel pointed to by PT_LOAD entries) into</div><div class='del'>- * virtually contiguous user-space in ELF layout.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='ctx'> /*</div><div class='ctx'>  * remap_oldmem_pfn_checked - do remap_oldmem_pfn_range replacing all pages</div><div class='ctx'>  * reported as not being ram with the zero page.</div><div class='hunk'>@@ -571,7 +592,7 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	size_t size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='ctx'> 	u64 start, end, len, tsz;</div><div class='del'>-	struct vmcore *m;</div><div class='add'>+	struct vmcore_range *m;</div><div class='ctx'> </div><div class='ctx'> 	start = (u64)vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	end = start + size;</div><div class='hunk'>@@ -688,21 +709,17 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> static const struct proc_ops vmcore_proc_ops = {</div><div class='ctx'> 	.proc_open	= open_vmcore,</div><div class='add'>+	.proc_release	= release_vmcore,</div><div class='ctx'> 	.proc_read_iter	= read_vmcore,</div><div class='ctx'> 	.proc_lseek	= default_llseek,</div><div class='ctx'> 	.proc_mmap	= mmap_vmcore,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct vmcore* __init get_new_element(void)</div><div class='del'>-{</div><div class='del'>-	return kzalloc(sizeof(struct vmcore), GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u64 get_vmcore_size(size_t elfsz, size_t elfnotesegsz,</div><div class='ctx'> 			   struct list_head *vc_list)</div><div class='ctx'> {</div><div class='add'>+	struct vmcore_range *m;</div><div class='ctx'> 	u64 size;</div><div class='del'>-	struct vmcore *m;</div><div class='ctx'> </div><div class='ctx'> 	size = elfsz + elfnotesegsz;</div><div class='ctx'> 	list_for_each_entry(m, vc_list, list) {</div><div class='hunk'>@@ -1104,7 +1121,6 @@ static int __init process_ptload_program_headers_elf64(char *elfptr,</div><div class='ctx'> 	Elf64_Ehdr *ehdr_ptr;</div><div class='ctx'> 	Elf64_Phdr *phdr_ptr;</div><div class='ctx'> 	loff_t vmcore_off;</div><div class='del'>-	struct vmcore *new;</div><div class='ctx'> </div><div class='ctx'> 	ehdr_ptr = (Elf64_Ehdr *)elfptr;</div><div class='ctx'> 	phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr)); /* PT_NOTE hdr */</div><div class='hunk'>@@ -1123,13 +1139,8 @@ static int __init process_ptload_program_headers_elf64(char *elfptr,</div><div class='ctx'> 		end = roundup(paddr + phdr_ptr-&gt;p_memsz, PAGE_SIZE);</div><div class='ctx'> 		size = end - start;</div><div class='ctx'> </div><div class='del'>-		/* Add this contiguous chunk of memory to vmcore list.*/</div><div class='del'>-		new = get_new_element();</div><div class='del'>-		if (!new)</div><div class='add'>+		if (vmcore_alloc_add_range(vc_list, start, size))</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		new-&gt;paddr = start;</div><div class='del'>-		new-&gt;size = size;</div><div class='del'>-		list_add_tail(&amp;new-&gt;list, vc_list);</div><div class='ctx'> </div><div class='ctx'> 		/* Update the program header offset. */</div><div class='ctx'> 		phdr_ptr-&gt;p_offset = vmcore_off + (paddr - start);</div><div class='hunk'>@@ -1147,7 +1158,6 @@ static int __init process_ptload_program_headers_elf32(char *elfptr,</div><div class='ctx'> 	Elf32_Ehdr *ehdr_ptr;</div><div class='ctx'> 	Elf32_Phdr *phdr_ptr;</div><div class='ctx'> 	loff_t vmcore_off;</div><div class='del'>-	struct vmcore *new;</div><div class='ctx'> </div><div class='ctx'> 	ehdr_ptr = (Elf32_Ehdr *)elfptr;</div><div class='ctx'> 	phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr)); /* PT_NOTE hdr */</div><div class='hunk'>@@ -1166,13 +1176,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr,</div><div class='ctx'> 		end = roundup(paddr + phdr_ptr-&gt;p_memsz, PAGE_SIZE);</div><div class='ctx'> 		size = end - start;</div><div class='ctx'> </div><div class='del'>-		/* Add this contiguous chunk of memory to vmcore list.*/</div><div class='del'>-		new = get_new_element();</div><div class='del'>-		if (!new)</div><div class='add'>+		if (vmcore_alloc_add_range(vc_list, start, size))</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		new-&gt;paddr = start;</div><div class='del'>-		new-&gt;size = size;</div><div class='del'>-		list_add_tail(&amp;new-&gt;list, vc_list);</div><div class='ctx'> </div><div class='ctx'> 		/* Update the program header offset */</div><div class='ctx'> 		phdr_ptr-&gt;p_offset = vmcore_off + (paddr - start);</div><div class='hunk'>@@ -1185,8 +1190,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr,</div><div class='ctx'> static void set_vmcore_list_offsets(size_t elfsz, size_t elfnotes_sz,</div><div class='ctx'> 				    struct list_head *vc_list)</div><div class='ctx'> {</div><div class='add'>+	struct vmcore_range *m;</div><div class='ctx'> 	loff_t vmcore_off;</div><div class='del'>-	struct vmcore *m;</div><div class='ctx'> </div><div class='ctx'> 	/* Skip ELF header, program headers and ELF note segment. */</div><div class='ctx'> 	vmcore_off = elfsz + elfnotes_sz;</div><div class='hunk'>@@ -1370,9 +1375,8 @@ static void vmcoredd_write_header(void *buf, struct vmcoredd_data *data,</div><div class='ctx'> 	vdd_hdr-&gt;n_descsz = size + sizeof(vdd_hdr-&gt;dump_name);</div><div class='ctx'> 	vdd_hdr-&gt;n_type = NT_VMCOREDD;</div><div class='ctx'> </div><div class='del'>-	strncpy((char *)vdd_hdr-&gt;name, VMCOREDD_NOTE_NAME,</div><div class='del'>-		sizeof(vdd_hdr-&gt;name));</div><div class='del'>-	memcpy(vdd_hdr-&gt;dump_name, data-&gt;dump_name, sizeof(vdd_hdr-&gt;dump_name));</div><div class='add'>+	strscpy_pad(vdd_hdr-&gt;name, VMCOREDD_NOTE_NAME);</div><div class='add'>+	strscpy_pad(vdd_hdr-&gt;dump_name, data-&gt;dump_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1486,10 +1490,8 @@ int vmcore_add_device_dump(struct vmcoredd_data *data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dump = vzalloc(sizeof(*dump));</div><div class='del'>-	if (!dump) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='add'>+	if (!dump)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Keep size of the buffer page aligned so that it can be mmaped */</div><div class='ctx'> 	data_size = roundup(sizeof(struct vmcoredd_header) + data-&gt;size,</div><div class='hunk'>@@ -1514,12 +1516,18 @@ int vmcore_add_device_dump(struct vmcoredd_data *data)</div><div class='ctx'> 	dump-&gt;buf = buf;</div><div class='ctx'> 	dump-&gt;size = data_size;</div><div class='ctx'> </div><div class='del'>-	/* Add the dump to driver sysfs list */</div><div class='del'>-	mutex_lock(&amp;vmcoredd_mutex);</div><div class='del'>-	list_add_tail(&amp;dump-&gt;list, &amp;vmcoredd_list);</div><div class='del'>-	mutex_unlock(&amp;vmcoredd_mutex);</div><div class='add'>+	/* Add the dump to driver sysfs list and update the elfcore hdr */</div><div class='add'>+	scoped_guard(mutex, &amp;vmcore_mutex) {</div><div class='add'>+		if (vmcore_opened)</div><div class='add'>+			pr_warn_once("Unexpected adding of device dump\n");</div><div class='add'>+		if (vmcore_open) {</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	vmcoredd_update_size(data_size);</div><div class='add'>+		list_add_tail(&amp;dump-&gt;list, &amp;vmcoredd_list);</div><div class='add'>+		vmcoredd_update_size(data_size);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='hunk'>@@ -1531,11 +1539,163 @@ out_err:</div><div class='ctx'> EXPORT_SYMBOL(vmcore_add_device_dump);</div><div class='ctx'> #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PROC_VMCORE_DEVICE_RAM</div><div class='add'>+static int vmcore_realloc_elfcore_buffer_elf64(size_t new_size)</div><div class='add'>+{</div><div class='add'>+	char *elfcorebuf_new;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(new_size &lt; elfcorebuf_sz))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (get_order(elfcorebuf_sz_orig) == get_order(new_size)) {</div><div class='add'>+		elfcorebuf_sz_orig = new_size;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	elfcorebuf_new = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+						  get_order(new_size));</div><div class='add'>+	if (!elfcorebuf_new)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(elfcorebuf_new, elfcorebuf, elfcorebuf_sz);</div><div class='add'>+	free_pages((unsigned long)elfcorebuf, get_order(elfcorebuf_sz_orig));</div><div class='add'>+	elfcorebuf = elfcorebuf_new;</div><div class='add'>+	elfcorebuf_sz_orig = new_size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vmcore_reset_offsets_elf64(void)</div><div class='add'>+{</div><div class='add'>+	Elf64_Phdr *phdr_start = (Elf64_Phdr *)(elfcorebuf + sizeof(Elf64_Ehdr));</div><div class='add'>+	loff_t vmcore_off = elfcorebuf_sz + elfnotes_sz;</div><div class='add'>+	Elf64_Ehdr *ehdr = (Elf64_Ehdr *)elfcorebuf;</div><div class='add'>+	Elf64_Phdr *phdr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, phdr = phdr_start; i &lt; ehdr-&gt;e_phnum; i++, phdr++) {</div><div class='add'>+		u64 start, end;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * After merge_note_headers_elf64() we should only have a single</div><div class='add'>+		 * PT_NOTE entry that starts immediately after elfcorebuf_sz.</div><div class='add'>+		 */</div><div class='add'>+		if (phdr-&gt;p_type == PT_NOTE) {</div><div class='add'>+			phdr-&gt;p_offset = elfcorebuf_sz;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		start = rounddown(phdr-&gt;p_offset, PAGE_SIZE);</div><div class='add'>+		end = roundup(phdr-&gt;p_offset + phdr-&gt;p_memsz, PAGE_SIZE);</div><div class='add'>+		phdr-&gt;p_offset = vmcore_off + (phdr-&gt;p_offset - start);</div><div class='add'>+		vmcore_off = vmcore_off + end - start;</div><div class='add'>+	}</div><div class='add'>+	set_vmcore_list_offsets(elfcorebuf_sz, elfnotes_sz, &amp;vmcore_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vmcore_add_device_ram_elf64(struct list_head *list, size_t count)</div><div class='add'>+{</div><div class='add'>+	Elf64_Phdr *phdr_start = (Elf64_Phdr *)(elfcorebuf + sizeof(Elf64_Ehdr));</div><div class='add'>+	Elf64_Ehdr *ehdr = (Elf64_Ehdr *)elfcorebuf;</div><div class='add'>+	struct vmcore_range *cur;</div><div class='add'>+	Elf64_Phdr *phdr;</div><div class='add'>+	size_t new_size;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if ((Elf32_Half)(ehdr-&gt;e_phnum + count) != ehdr-&gt;e_phnum + count) {</div><div class='add'>+		pr_err("too many device ram ranges\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* elfcorebuf_sz must always cover full pages. */</div><div class='add'>+	new_size = sizeof(Elf64_Ehdr) +</div><div class='add'>+		   (ehdr-&gt;e_phnum + count) * sizeof(Elf64_Phdr);</div><div class='add'>+	new_size = roundup(new_size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure we have sufficient space to include the new PT_LOAD</div><div class='add'>+	 * entries.</div><div class='add'>+	 */</div><div class='add'>+	rc = vmcore_realloc_elfcore_buffer_elf64(new_size);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_err("resizing elfcore failed\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Modify our used elfcore buffer size to cover the new entries. */</div><div class='add'>+	elfcorebuf_sz = new_size;</div><div class='add'>+</div><div class='add'>+	/* Fill the added PT_LOAD entries. */</div><div class='add'>+	phdr = phdr_start + ehdr-&gt;e_phnum;</div><div class='add'>+	list_for_each_entry(cur, list, list) {</div><div class='add'>+		WARN_ON_ONCE(!IS_ALIGNED(cur-&gt;paddr | cur-&gt;size, PAGE_SIZE));</div><div class='add'>+		elfcorehdr_fill_device_ram_ptload_elf64(phdr, cur-&gt;paddr, cur-&gt;size);</div><div class='add'>+</div><div class='add'>+		/* p_offset will be adjusted later. */</div><div class='add'>+		phdr++;</div><div class='add'>+		ehdr-&gt;e_phnum++;</div><div class='add'>+	}</div><div class='add'>+	list_splice_tail(list, &amp;vmcore_list);</div><div class='add'>+</div><div class='add'>+	/* We changed elfcorebuf_sz and added new entries; reset all offsets. */</div><div class='add'>+	vmcore_reset_offsets_elf64();</div><div class='add'>+</div><div class='add'>+	/* Finally, recalculate the total vmcore size. */</div><div class='add'>+	vmcore_size = get_vmcore_size(elfcorebuf_sz, elfnotes_sz,</div><div class='add'>+				      &amp;vmcore_list);</div><div class='add'>+	proc_vmcore-&gt;size = vmcore_size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vmcore_process_device_ram(struct vmcore_cb *cb)</div><div class='add'>+{</div><div class='add'>+	unsigned char *e_ident = (unsigned char *)elfcorebuf;</div><div class='add'>+	struct vmcore_range *first, *m;</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	/* We only support Elf64 dumps for now. */</div><div class='add'>+	if (WARN_ON_ONCE(e_ident[EI_CLASS] != ELFCLASS64)) {</div><div class='add'>+		pr_err("device ram ranges only support Elf64\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cb-&gt;get_device_ram(cb, &amp;list)) {</div><div class='add'>+		pr_err("obtaining device ram ranges failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	count = list_count_nodes(&amp;list);</div><div class='add'>+	if (!count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For some reason these ranges are already know? Might happen</div><div class='add'>+	 * with unusual register-&gt;unregister-&gt;register sequences; we'll simply</div><div class='add'>+	 * sanity check using the first range.</div><div class='add'>+	 */</div><div class='add'>+	first = list_first_entry(&amp;list, struct vmcore_range, list);</div><div class='add'>+	list_for_each_entry(m, &amp;vmcore_list, list) {</div><div class='add'>+		unsigned long long m_end = m-&gt;paddr + m-&gt;size;</div><div class='add'>+		unsigned long long first_end = first-&gt;paddr + first-&gt;size;</div><div class='add'>+</div><div class='add'>+		if (first-&gt;paddr &lt; m_end &amp;&amp; m-&gt;paddr &lt; first_end)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If adding the mem nodes succeeds, they must not be freed. */</div><div class='add'>+	if (!vmcore_add_device_ram_elf64(&amp;list, count))</div><div class='add'>+		return;</div><div class='add'>+out_free:</div><div class='add'>+	vmcore_free_ranges(&amp;list);</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_PROC_VMCORE_DEVICE_RAM */</div><div class='add'>+static void vmcore_process_device_ram(struct vmcore_cb *cb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PROC_VMCORE_DEVICE_RAM */</div><div class='add'>+</div><div class='ctx'> /* Free all dumps in vmcore device dump list */</div><div class='ctx'> static void vmcore_free_device_dumps(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP</div><div class='del'>-	mutex_lock(&amp;vmcoredd_mutex);</div><div class='add'>+	mutex_lock(&amp;vmcore_mutex);</div><div class='ctx'> 	while (!list_empty(&amp;vmcoredd_list)) {</div><div class='ctx'> 		struct vmcoredd_node *dump;</div><div class='ctx'> </div><div class='hunk'>@@ -1545,7 +1705,7 @@ static void vmcore_free_device_dumps(void)</div><div class='ctx'> 		vfree(dump-&gt;buf);</div><div class='ctx'> 		vfree(dump);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;vmcoredd_mutex);</div><div class='add'>+	mutex_unlock(&amp;vmcore_mutex);</div><div class='ctx'> #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1567,7 +1727,7 @@ static int __init vmcore_init(void)</div><div class='ctx'> 	rc = parse_crash_elf_headers();</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		elfcorehdr_free(elfcorehdr_addr);</div><div class='del'>-		pr_warn("Kdump: vmcore not initialized\n");</div><div class='add'>+		pr_warn("not initialized\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	elfcorehdr_free(elfcorehdr_addr);</div><div class='hunk'>@@ -1588,14 +1748,7 @@ void vmcore_cleanup(void)</div><div class='ctx'> 		proc_vmcore = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* clear the vmcore list. */</div><div class='del'>-	while (!list_empty(&amp;vmcore_list)) {</div><div class='del'>-		struct vmcore *m;</div><div class='del'>-</div><div class='del'>-		m = list_first_entry(&amp;vmcore_list, struct vmcore, list);</div><div class='del'>-		list_del(&amp;m-&gt;list);</div><div class='del'>-		kfree(m);</div><div class='del'>-	}</div><div class='add'>+	vmcore_free_ranges(&amp;vmcore_list);</div><div class='ctx'> 	free_elfcorebuf();</div><div class='ctx'> </div><div class='ctx'> 	/* clear vmcore device dump list */</div><div class='head'>diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c<br/>index 0a808951b7d3..5c555db68aa2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/proc_namespace.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/proc_namespace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/proc_namespace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/proc_namespace.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ static int show_sb_opts(struct seq_file *m, struct super_block *sb)</div><div class='ctx'> 	return security_sb_show_options(m, sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt)</div><div class='add'>+static void show_vfsmnt_opts(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct proc_fs_opts mnt_opts[] = {</div><div class='ctx'> 		{ MNT_NOSUID, ",nosuid" },</div><div class='hunk'>@@ -111,7 +111,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='del'>-		mangle(m, r-&gt;mnt_devname ? r-&gt;mnt_devname : "none");</div><div class='add'>+		mangle(m, r-&gt;mnt_devname);</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_putc(m, ' ');</div><div class='ctx'> 	/* mountpoints outside of chroot jail will give SEQ_SKIP on this */</div><div class='hunk'>@@ -124,7 +124,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> 	err = show_sb_opts(m, sb);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='del'>-	show_mnt_opts(m, mnt);</div><div class='add'>+	show_vfsmnt_opts(m, mnt);</div><div class='ctx'> 	if (sb-&gt;s_op-&gt;show_options)</div><div class='ctx'> 		err = sb-&gt;s_op-&gt;show_options(m, mnt_path.dentry);</div><div class='ctx'> 	seq_puts(m, " 0 0\n");</div><div class='hunk'>@@ -153,7 +153,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(m, mnt-&gt;mnt_flags &amp; MNT_READONLY ? " ro" : " rw");</div><div class='del'>-	show_mnt_opts(m, mnt);</div><div class='add'>+	show_vfsmnt_opts(m, mnt);</div><div class='ctx'> </div><div class='ctx'> 	/* Tagged fields ("foo:X" or "bar") */</div><div class='ctx'> 	if (IS_MNT_SHARED(r))</div><div class='hunk'>@@ -177,7 +177,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='del'>-		mangle(m, r-&gt;mnt_devname ? r-&gt;mnt_devname : "none");</div><div class='add'>+		mangle(m, r-&gt;mnt_devname);</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_puts(m, sb_rdonly(sb) ? " ro" : " rw");</div><div class='ctx'> 	err = show_sb_opts(m, sb);</div><div class='hunk'>@@ -199,17 +199,13 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* device */</div><div class='add'>+	seq_puts(m, "device ");</div><div class='ctx'> 	if (sb-&gt;s_op-&gt;show_devname) {</div><div class='del'>-		seq_puts(m, "device ");</div><div class='ctx'> 		err = sb-&gt;s_op-&gt;show_devname(m, mnt_path.dentry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (r-&gt;mnt_devname) {</div><div class='del'>-			seq_puts(m, "device ");</div><div class='del'>-			mangle(m, r-&gt;mnt_devname);</div><div class='del'>-		} else</div><div class='del'>-			seq_puts(m, "no device");</div><div class='add'>+		mangle(m, r-&gt;mnt_devname);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* mount point */</div><div class='head'>diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c<br/>index de8cf5d75f34..fa6b8cb788a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pstore/blk.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/blk.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pstore/blk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pstore/blk.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static struct pstore_device_info *pstore_device_info;</div><div class='ctx'> 		_##name_ = check_size(name, alignsize);		\</div><div class='ctx'> 	else							\</div><div class='ctx'> 		_##name_ = 0;					\</div><div class='del'>-	/* Synchronize module parameters with resuls. */	\</div><div class='add'>+	/* Synchronize module parameters with results. */	\</div><div class='ctx'> 	name = _##name_ / 1024;					\</div><div class='ctx'> 	dev-&gt;zone.name = _##name_;				\</div><div class='ctx'> }</div><div class='hunk'>@@ -121,7 +121,7 @@ static int __register_pstore_device(struct pstore_device_info *dev)</div><div class='ctx'> 	if (pstore_device_info)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	/* zero means not limit on which backends to attempt to store. */</div><div class='add'>+	/* zero means no limit on which backends attempt to store. */</div><div class='ctx'> 	if (!dev-&gt;flags)</div><div class='ctx'> 		dev-&gt;flags = UINT_MAX;</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,7 @@ err:</div><div class='ctx'> /* get information of pstore/blk */</div><div class='ctx'> int pstore_blk_get_config(struct pstore_blk_config *info)</div><div class='ctx'> {</div><div class='del'>-	strncpy(info-&gt;device, blkdev, 80);</div><div class='add'>+	strscpy(info-&gt;device, blkdev);</div><div class='ctx'> 	info-&gt;max_reason = max_reason;</div><div class='ctx'> 	info-&gt;kmsg_size = check_size(kmsg_size, 4096);</div><div class='ctx'> 	info-&gt;pmsg_size = check_size(pmsg_size, 4096);</div><div class='head'>diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c<br/>index d0d9bfdad30c..71deffcc3356 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pstore/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pstore/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pstore/inode.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/ramfs.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/pstore.h&gt;</div><div class='hunk'>@@ -226,37 +226,38 @@ static struct inode *pstore_get_inode(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_kmsg_bytes, Opt_err</div><div class='add'>+	Opt_kmsg_bytes</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_kmsg_bytes, "kmsg_bytes=%u"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+static const struct fs_parameter_spec pstore_param_spec[] = {</div><div class='add'>+	fsparam_u32	("kmsg_bytes",	Opt_kmsg_bytes),</div><div class='add'>+	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void parse_options(char *options)</div><div class='del'>-{</div><div class='del'>-	char		*p;</div><div class='del'>-	substring_t	args[MAX_OPT_ARGS];</div><div class='del'>-	int		option;</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return;</div><div class='add'>+struct pstore_context {</div><div class='add'>+	unsigned int kmsg_bytes;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='add'>+static int pstore_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct pstore_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='ctx'> </div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='add'>+	opt = fs_parse(fc, pstore_param_spec, param, &amp;result);</div><div class='add'>+	/* pstore has historically ignored invalid kmsg_bytes param */</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_kmsg_bytes:</div><div class='del'>-			if (!match_int(&amp;args[0], &amp;option))</div><div class='del'>-				pstore_set_kmsg_bytes(option);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_kmsg_bytes:</div><div class='add'>+		ctx-&gt;kmsg_bytes = result.uint_32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -265,23 +266,24 @@ static void parse_options(char *options)</div><div class='ctx'> static int pstore_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> {</div><div class='ctx'> 	if (kmsg_bytes != CONFIG_PSTORE_DEFAULT_KMSG_BYTES)</div><div class='del'>-		seq_printf(m, ",kmsg_bytes=%lu", kmsg_bytes);</div><div class='add'>+		seq_printf(m, ",kmsg_bytes=%u", kmsg_bytes);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pstore_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int pstore_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	sync_filesystem(sb);</div><div class='del'>-	parse_options(data);</div><div class='add'>+	struct pstore_context *ctx = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	sync_filesystem(fc-&gt;root-&gt;d_sb);</div><div class='add'>+	pstore_set_kmsg_bytes(ctx-&gt;kmsg_bytes);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations pstore_ops = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.evict_inode	= pstore_evict_inode,</div><div class='del'>-	.remount_fs	= pstore_remount,</div><div class='ctx'> 	.show_options	= pstore_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -298,7 +300,7 @@ static struct dentry *psinfo_lock_root(void)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	root = pstore_sb-&gt;s_root;</div><div class='del'>-	inode_lock(d_inode(root));</div><div class='add'>+	inode_lock_nested(d_inode(root), I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='ctx'> 	return root;</div><div class='ctx'> }</div><div class='hunk'>@@ -307,7 +309,6 @@ int pstore_put_backend_records(struct pstore_info *psi)</div><div class='ctx'> {</div><div class='ctx'> 	struct pstore_private *pos, *tmp;</div><div class='ctx'> 	struct dentry *root;</div><div class='del'>-	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	root = psinfo_lock_root();</div><div class='ctx'> 	if (!root)</div><div class='hunk'>@@ -317,11 +318,7 @@ int pstore_put_backend_records(struct pstore_info *psi)</div><div class='ctx'> 		list_for_each_entry_safe(pos, tmp, &amp;records_list, list) {</div><div class='ctx'> 			if (pos-&gt;record-&gt;psi == psi) {</div><div class='ctx'> 				list_del_init(&amp;pos-&gt;list);</div><div class='del'>-				rc = simple_unlink(d_inode(root), pos-&gt;dentry);</div><div class='del'>-				if (WARN_ON(rc))</div><div class='del'>-					break;</div><div class='del'>-				d_drop(pos-&gt;dentry);</div><div class='del'>-				dput(pos-&gt;dentry);</div><div class='add'>+				locked_recursive_removal(pos-&gt;dentry, NULL);</div><div class='ctx'> 				pos-&gt;dentry = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -329,7 +326,7 @@ int pstore_put_backend_records(struct pstore_info *psi)</div><div class='ctx'> </div><div class='ctx'> 	inode_unlock(d_inode(root));</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -376,7 +373,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)</div><div class='ctx'> 	if (!dentry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	private-&gt;dentry = dentry;</div><div class='add'>+	private-&gt;dentry = dentry; // borrowed</div><div class='ctx'> 	private-&gt;record = record;</div><div class='ctx'> 	inode-&gt;i_size = private-&gt;total_size = size;</div><div class='ctx'> 	inode-&gt;i_private = private;</div><div class='hunk'>@@ -385,7 +382,8 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)</div><div class='ctx'> 		inode_set_mtime_to_ts(inode,</div><div class='ctx'> 				      inode_set_ctime_to_ts(inode, record-&gt;time));</div><div class='ctx'> </div><div class='del'>-	d_add(dentry, no_free_ptr(inode));</div><div class='add'>+	d_make_persistent(dentry, no_free_ptr(inode));</div><div class='add'>+	dput(dentry);</div><div class='ctx'> </div><div class='ctx'> 	list_add(&amp;(no_free_ptr(private))-&gt;list, &amp;records_list);</div><div class='ctx'> </div><div class='hunk'>@@ -410,8 +408,9 @@ void pstore_get_records(int quiet)</div><div class='ctx'> 	inode_unlock(d_inode(root));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pstore_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+static int pstore_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct pstore_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_maxbytes		= MAX_LFS_FILESIZE;</div><div class='hunk'>@@ -421,7 +420,7 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	sb-&gt;s_op		= &amp;pstore_ops;</div><div class='ctx'> 	sb-&gt;s_time_gran		= 1;</div><div class='ctx'> </div><div class='del'>-	parse_options(data);</div><div class='add'>+	pstore_set_kmsg_bytes(ctx-&gt;kmsg_bytes);</div><div class='ctx'> </div><div class='ctx'> 	inode = pstore_get_inode(sb);</div><div class='ctx'> 	if (inode) {</div><div class='hunk'>@@ -442,29 +441,65 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *pstore_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int pstore_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_single(fs_type, flags, data, pstore_fill_super);</div><div class='add'>+	if (fc-&gt;root)</div><div class='add'>+		return pstore_reconfigure(fc);</div><div class='add'>+</div><div class='add'>+	return get_tree_single(fc, pstore_fill_super);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void pstore_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations pstore_context_ops = {</div><div class='add'>+	.parse_param	= pstore_parse_param,</div><div class='add'>+	.get_tree	= pstore_get_tree,</div><div class='add'>+	.reconfigure	= pstore_reconfigure,</div><div class='add'>+	.free		= pstore_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void pstore_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	guard(mutex)(&amp;pstore_sb_lock);</div><div class='ctx'> 	WARN_ON(pstore_sb &amp;&amp; pstore_sb != sb);</div><div class='ctx'> </div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> 	pstore_sb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	guard(mutex)(&amp;records_list_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;records_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pstore_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct pstore_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct pstore_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Global kmsg_bytes is initialized to default, and updated</div><div class='add'>+	 * every time we (re)mount the single-sb filesystem with the</div><div class='add'>+	 * option specified.</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;kmsg_bytes = kmsg_bytes;</div><div class='add'>+</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+	fc-&gt;ops = &amp;pstore_context_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct file_system_type pstore_fs_type = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.name		= "pstore",</div><div class='del'>-	.mount		= pstore_mount,</div><div class='ctx'> 	.kill_sb	= pstore_kill_sb,</div><div class='add'>+	.init_fs_context = pstore_init_fs_context,</div><div class='add'>+	.parameters	= pstore_param_spec,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init pstore_init_fs(void)</div><div class='head'>diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h<br/>index 801d6c0b170c..a0fc51196910 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pstore/internal.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pstore/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pstore/internal.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/pstore.h&gt;</div><div class='ctx'> </div><div class='del'>-extern unsigned long kmsg_bytes;</div><div class='add'>+extern unsigned int kmsg_bytes;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PSTORE_FTRACE</div><div class='ctx'> extern void pstore_register_ftrace(void);</div><div class='hunk'>@@ -35,7 +35,7 @@ static inline void pstore_unregister_pmsg(void) {}</div><div class='ctx'> </div><div class='ctx'> extern struct pstore_info *psinfo;</div><div class='ctx'> </div><div class='del'>-extern void	pstore_set_kmsg_bytes(int);</div><div class='add'>+extern void	pstore_set_kmsg_bytes(unsigned int bytes);</div><div class='ctx'> extern void	pstore_get_records(int);</div><div class='ctx'> extern void	pstore_get_backend_records(struct pstore_info *psi,</div><div class='ctx'> 					   struct dentry *root, int quiet);</div><div class='head'>diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c<br/>index 03425928d2fb..f8b9c9c73997 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pstore/platform.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/platform.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pstore/platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pstore/platform.c</a></div><div class='hunk'>@@ -92,8 +92,8 @@ module_param(compress, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(compress, "compression to use");</div><div class='ctx'> </div><div class='ctx'> /* How much of the kernel log to snapshot */</div><div class='del'>-unsigned long kmsg_bytes = CONFIG_PSTORE_DEFAULT_KMSG_BYTES;</div><div class='del'>-module_param(kmsg_bytes, ulong, 0444);</div><div class='add'>+unsigned int kmsg_bytes = CONFIG_PSTORE_DEFAULT_KMSG_BYTES;</div><div class='add'>+module_param(kmsg_bytes, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(kmsg_bytes, "amount of kernel log to snapshot (in bytes)");</div><div class='ctx'> </div><div class='ctx'> static void *compress_workspace;</div><div class='hunk'>@@ -107,9 +107,9 @@ static void *compress_workspace;</div><div class='ctx'> static char *big_oops_buf;</div><div class='ctx'> static size_t max_compressed_size;</div><div class='ctx'> </div><div class='del'>-void pstore_set_kmsg_bytes(int bytes)</div><div class='add'>+void pstore_set_kmsg_bytes(unsigned int bytes)</div><div class='ctx'> {</div><div class='del'>-	kmsg_bytes = bytes;</div><div class='add'>+	WRITE_ONCE(kmsg_bytes, bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Tag each group of saved records with a sequence number */</div><div class='hunk'>@@ -275,9 +275,10 @@ void pstore_record_init(struct pstore_record *record,</div><div class='ctx'>  * end of the buffer.</div><div class='ctx'>  */</div><div class='ctx'> static void pstore_dump(struct kmsg_dumper *dumper,</div><div class='del'>-			enum kmsg_dump_reason reason)</div><div class='add'>+			struct kmsg_dump_detail *detail)</div><div class='ctx'> {</div><div class='ctx'> 	struct kmsg_dump_iter iter;</div><div class='add'>+	unsigned int	remaining = READ_ONCE(kmsg_bytes);</div><div class='ctx'> 	unsigned long	total = 0;</div><div class='ctx'> 	const char	*why;</div><div class='ctx'> 	unsigned int	part = 1;</div><div class='hunk'>@@ -285,22 +286,22 @@ static void pstore_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 	int		saved_ret = 0;</div><div class='ctx'> 	int		ret;</div><div class='ctx'> </div><div class='del'>-	why = kmsg_dump_reason_str(reason);</div><div class='add'>+	why = kmsg_dump_reason_str(detail-&gt;reason);</div><div class='ctx'> </div><div class='del'>-	if (pstore_cannot_block_path(reason)) {</div><div class='del'>-		if (!spin_trylock_irqsave(&amp;psinfo-&gt;buf_lock, flags)) {</div><div class='add'>+	if (pstore_cannot_block_path(detail-&gt;reason)) {</div><div class='add'>+		if (!raw_spin_trylock_irqsave(&amp;psinfo-&gt;buf_lock, flags)) {</div><div class='ctx'> 			pr_err("dump skipped in %s path because of concurrent dump\n",</div><div class='ctx'> 					in_nmi() ? "NMI" : why);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;psinfo-&gt;buf_lock, flags);</div><div class='add'>+		raw_spin_lock_irqsave(&amp;psinfo-&gt;buf_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kmsg_dump_rewind(&amp;iter);</div><div class='ctx'> </div><div class='ctx'> 	oopscount++;</div><div class='del'>-	while (total &lt; kmsg_bytes) {</div><div class='add'>+	while (total &lt; remaining) {</div><div class='ctx'> 		char *dst;</div><div class='ctx'> 		size_t dst_size;</div><div class='ctx'> 		int header_size;</div><div class='hunk'>@@ -311,7 +312,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 		pstore_record_init(&amp;record, psinfo);</div><div class='ctx'> 		record.type = PSTORE_TYPE_DMESG;</div><div class='ctx'> 		record.count = oopscount;</div><div class='del'>-		record.reason = reason;</div><div class='add'>+		record.reason = detail-&gt;reason;</div><div class='ctx'> 		record.part = part;</div><div class='ctx'> 		record.buf = psinfo-&gt;buf;</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +353,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = psinfo-&gt;write(&amp;record);</div><div class='del'>-		if (ret == 0 &amp;&amp; reason == KMSG_DUMP_OOPS) {</div><div class='add'>+		if (ret == 0 &amp;&amp; detail-&gt;reason == KMSG_DUMP_OOPS) {</div><div class='ctx'> 			pstore_new_entry = 1;</div><div class='ctx'> 			pstore_timer_kick();</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -364,7 +365,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 		total += record.size;</div><div class='ctx'> 		part++;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;psinfo-&gt;buf_lock, flags);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;psinfo-&gt;buf_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (saved_ret) {</div><div class='ctx'> 		pr_err_once("backend (%s) writing error (%d)\n", psinfo-&gt;name,</div><div class='hunk'>@@ -503,7 +504,7 @@ int pstore_register(struct pstore_info *psi)</div><div class='ctx'> 		psi-&gt;write_user = pstore_write_user_compat;</div><div class='ctx'> 	psinfo = psi;</div><div class='ctx'> 	mutex_init(&amp;psinfo-&gt;read_mutex);</div><div class='del'>-	spin_lock_init(&amp;psinfo-&gt;buf_lock);</div><div class='add'>+	raw_spin_lock_init(&amp;psinfo-&gt;buf_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (psi-&gt;flags &amp; PSTORE_FLAGS_DMESG)</div><div class='ctx'> 		allocate_buf_for_compression();</div><div class='hunk'>@@ -562,7 +563,7 @@ void pstore_unregister(struct pstore_info *psi)</div><div class='ctx'> 		pstore_unregister_kmsg();</div><div class='ctx'> </div><div class='ctx'> 	/* Stop timer and make sure all work has finished. */</div><div class='del'>-	del_timer_sync(&amp;pstore_timer);</div><div class='add'>+	timer_delete_sync(&amp;pstore_timer);</div><div class='ctx'> 	flush_work(&amp;pstore_work);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove all backend records from filesystem tree. */</div><div class='hunk'>@@ -761,4 +762,5 @@ static void __exit pstore_exit(void)</div><div class='ctx'> module_exit(pstore_exit)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Tony Luck &lt;tony.luck@intel.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Persistent Storage - platform driver interface");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c<br/>index 88b34fdbf759..39936d6da0dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pstore/ram.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/ram.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pstore/ram.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pstore/ram.c</a></div><div class='hunk'>@@ -50,6 +50,10 @@ module_param_hw(mem_address, ullong, other, 0400);</div><div class='ctx'> MODULE_PARM_DESC(mem_address,</div><div class='ctx'> 		"start of reserved RAM used to store oops/panic logs");</div><div class='ctx'> </div><div class='add'>+static char *mem_name;</div><div class='add'>+module_param_named(mem_name, mem_name, charp, 0400);</div><div class='add'>+MODULE_PARM_DESC(mem_name, "name of kernel param that holds addr");</div><div class='add'>+</div><div class='ctx'> static ulong mem_size;</div><div class='ctx'> module_param(mem_size, ulong, 0400);</div><div class='ctx'> MODULE_PARM_DESC(mem_size,</div><div class='hunk'>@@ -860,6 +864,8 @@ static int ramoops_probe(struct platform_device *pdev)</div><div class='ctx'> 	ramoops_console_size = pdata-&gt;console_size;</div><div class='ctx'> 	ramoops_pmsg_size = pdata-&gt;pmsg_size;</div><div class='ctx'> 	ramoops_ftrace_size = pdata-&gt;ftrace_size;</div><div class='add'>+	mem_type = pdata-&gt;mem_type;</div><div class='add'>+	ramoops_ecc = pdata-&gt;ecc_info.ecc_size;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("using 0x%lx@0x%llx, ecc: %d\n",</div><div class='ctx'> 		cxt-&gt;size, (unsigned long long)cxt-&gt;phys_addr,</div><div class='hunk'>@@ -893,10 +899,11 @@ static const struct of_device_id dt_match[] = {</div><div class='ctx'> 	{ .compatible = "ramoops" },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(of, dt_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ramoops_driver = {</div><div class='ctx'> 	.probe		= ramoops_probe,</div><div class='del'>-	.remove_new	= ramoops_remove,</div><div class='add'>+	.remove		= ramoops_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "ramoops",</div><div class='ctx'> 		.of_match_table	= dt_match,</div><div class='hunk'>@@ -913,6 +920,16 @@ static void __init ramoops_register_dummy(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct ramoops_platform_data pdata;</div><div class='ctx'> </div><div class='add'>+	if (mem_name) {</div><div class='add'>+		phys_addr_t start;</div><div class='add'>+		phys_addr_t size;</div><div class='add'>+</div><div class='add'>+		if (reserve_mem_find_by_name(mem_name, &amp;start, &amp;size)) {</div><div class='add'>+			mem_address = start;</div><div class='add'>+			mem_size = size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prepare a dummy platform data structure to carry the module</div><div class='ctx'> 	 * parameters. If mem_size isn't set, then there are no module</div><div class='head'>diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c<br/>index 2770746bb7aa..eb61ba5bb964 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/pstore/zone.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/pstore/zone.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/pstore/zone.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/pstore/zone.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ struct psz_buffer {</div><div class='ctx'>  *</div><div class='ctx'>  * @magic: magic num for kmsg dump header</div><div class='ctx'>  * @time: kmsg dump trigger time</div><div class='del'>- * @compressed: whether conpressed</div><div class='add'>+ * @compressed: whether compressed</div><div class='ctx'>  * @counter: kmsg dump counter</div><div class='ctx'>  * @reason: the kmsg dump reason (e.g. oops, panic, etc)</div><div class='ctx'>  * @data: pointer to log data</div><div class='hunk'>@@ -214,7 +214,7 @@ static int psz_zone_write(struct pstore_zone *zone,</div><div class='ctx'> 		atomic_set(&amp;zone-&gt;buffer-&gt;datalen, wlen + off);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* avoid to damage old records */</div><div class='add'>+	/* avoid damaging old records */</div><div class='ctx'> 	if (!is_on_panic() &amp;&amp; !atomic_read(&amp;pstore_zone_cxt.recovered))</div><div class='ctx'> 		goto dirty;</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +249,7 @@ static int psz_zone_write(struct pstore_zone *zone,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> dirty:</div><div class='del'>-	/* no need to mark dirty if going to try next zone */</div><div class='add'>+	/* no need to mark it dirty if going to try next zone */</div><div class='ctx'> 	if (wcnt == -ENOMSG)</div><div class='ctx'> 		return -ENOMSG;</div><div class='ctx'> 	atomic_set(&amp;zone-&gt;dirty, true);</div><div class='hunk'>@@ -378,7 +378,7 @@ static int psz_kmsg_recover_meta(struct psz_context *cxt)</div><div class='ctx'> 	struct timespec64 time = { };</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> 	/*</div><div class='del'>-	 * Recover may on panic, we can't allocate any memory by kmalloc.</div><div class='add'>+	 * Recover may happen on panic, we can't allocate any memory by kmalloc.</div><div class='ctx'> 	 * So, we use local array instead.</div><div class='ctx'> 	 */</div><div class='ctx'> 	char buffer_header[sizeof(*buf) + sizeof(*hdr)] = {0};</div><div class='hunk'>@@ -856,11 +856,11 @@ static int notrace psz_record_write(struct pstore_zone *zone,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * psz_zone_write will set datalen as start + cnt.</div><div class='del'>-	 * It work if actual data length lesser than buffer size.</div><div class='del'>-	 * If data length greater than buffer size, pmsg will rewrite to</div><div class='del'>-	 * beginning of zone, which make buffer-&gt;datalen wrongly.</div><div class='add'>+	 * It works if actual data length is lesser than buffer size.</div><div class='add'>+	 * If data length is greater than buffer size, pmsg will rewrite to</div><div class='add'>+	 * the beginning of the zone, which makes buffer-&gt;datalen wrong.</div><div class='ctx'> 	 * So we should reset datalen as buffer size once actual data length</div><div class='del'>-	 * greater than buffer size.</div><div class='add'>+	 * is greater than buffer size.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_full_data) {</div><div class='ctx'> 		atomic_set(&amp;zone-&gt;buffer-&gt;datalen, zone-&gt;buffer_size);</div><div class='hunk'>@@ -878,8 +878,9 @@ static int notrace psz_pstore_write(struct pstore_record *record)</div><div class='ctx'> 		atomic_set(&amp;cxt-&gt;on_panic, 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * if on panic, do not write except panic records</div><div class='del'>-	 * Fix case that panic_write prints log which wakes up console backend.</div><div class='add'>+	 * If on panic, do not write anything except panic records.</div><div class='add'>+	 * Fix the case when panic_write prints log that wakes up</div><div class='add'>+	 * console backend.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_on_panic() &amp;&amp; record-&gt;type != PSTORE_TYPE_DMESG)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -973,6 +974,8 @@ static ssize_t psz_kmsg_read(struct pstore_zone *zone,</div><div class='ctx'> 		char *buf = kasprintf(GFP_KERNEL, "%s: Total %d times\n",</div><div class='ctx'> 				      kmsg_dump_reason_str(record-&gt;reason),</div><div class='ctx'> 				      record-&gt;count);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		hlen = strlen(buf);</div><div class='ctx'> 		record-&gt;buf = krealloc(buf, hlen + size, GFP_KERNEL);</div><div class='ctx'> 		if (!record-&gt;buf) {</div><div class='hunk'>@@ -1210,12 +1213,16 @@ static struct pstore_zone **psz_init_zones(enum pstore_type_id type,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	c = total_size / record_size;</div><div class='add'>+	if (unlikely(!c)) {</div><div class='add'>+		pr_err("zone %s total_size too small\n", name);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	zones = kcalloc(c, sizeof(*zones), GFP_KERNEL);</div><div class='ctx'> 	if (!zones) {</div><div class='ctx'> 		pr_err("allocate for zones %s failed\n", name);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='del'>-	memset(zones, 0, c * sizeof(*zones));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; c; i++) {</div><div class='ctx'> 		zone = psz_init_zone(type, off, record_size);</div><div class='head'>diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c<br/>index 6eb9bb369b57..31d78da203ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/qnx4/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx4/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/qnx4/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/qnx4/inode.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include "qnx4.h"</div><div class='ctx'> </div><div class='ctx'> #define QNX4_VERSION  4</div><div class='hunk'>@@ -30,28 +31,33 @@ static const struct super_operations qnx4_sops;</div><div class='ctx'> </div><div class='ctx'> static struct inode *qnx4_alloc_inode(struct super_block *sb);</div><div class='ctx'> static void qnx4_free_inode(struct inode *inode);</div><div class='del'>-static int qnx4_remount(struct super_block *sb, int *flags, char *data);</div><div class='ctx'> static int qnx4_statfs(struct dentry *, struct kstatfs *);</div><div class='add'>+static int qnx4_get_tree(struct fs_context *fc);</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations qnx4_sops =</div><div class='ctx'> {</div><div class='ctx'> 	.alloc_inode	= qnx4_alloc_inode,</div><div class='ctx'> 	.free_inode	= qnx4_free_inode,</div><div class='ctx'> 	.statfs		= qnx4_statfs,</div><div class='del'>-	.remount_fs	= qnx4_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int qnx4_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int qnx4_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='ctx'> 	struct qnx4_sb_info *qs;</div><div class='ctx'> </div><div class='ctx'> 	sync_filesystem(sb);</div><div class='ctx'> 	qs = qnx4_sb(sb);</div><div class='ctx'> 	qs-&gt;Version = QNX4_VERSION;</div><div class='del'>-	*flags |= SB_RDONLY;</div><div class='add'>+	fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct fs_context_operations qnx4_context_opts = {</div><div class='add'>+	.get_tree	= qnx4_get_tree,</div><div class='add'>+	.reconfigure	= qnx4_reconfigure,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create )</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long phys;</div><div class='hunk'>@@ -183,12 +189,13 @@ static const char *qnx4_checkroot(struct super_block *sb,</div><div class='ctx'> 	return "bitmap file not found.";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qnx4_fill_super(struct super_block *s, void *data, int silent)</div><div class='add'>+static int qnx4_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> 	const char *errmsg;</div><div class='ctx'> 	struct qnx4_sb_info *qs;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	qs = kzalloc(sizeof(struct qnx4_sb_info), GFP_KERNEL);</div><div class='ctx'> 	if (!qs)</div><div class='hunk'>@@ -216,7 +223,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	errmsg = qnx4_checkroot(s, (struct qnx4_super_block *) bh-&gt;b_data);</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> 	if (errmsg != NULL) {</div><div class='del'>- 		if (!silent)</div><div class='add'>+		if (!silent)</div><div class='ctx'> 			printk(KERN_ERR "qnx4: %s\n", errmsg);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -235,6 +242,18 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int qnx4_get_tree(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	return get_tree_bdev(fc, qnx4_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qnx4_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	fc-&gt;ops = &amp;qnx4_context_opts;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void qnx4_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct qnx4_sb_info *qs = qnx4_sb(sb);</div><div class='hunk'>@@ -271,7 +290,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)</div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	qnx4_inode = qnx4_raw_inode(inode);</div><div class='hunk'>@@ -359,7 +378,7 @@ static int init_inodecache(void)</div><div class='ctx'> 	qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache",</div><div class='ctx'> 					     sizeof(struct qnx4_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (qnx4_inode_cachep == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -376,18 +395,12 @@ static void destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(qnx4_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *qnx4_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='del'>-{</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, qnx4_fill_super);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct file_system_type qnx4_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "qnx4",</div><div class='del'>-	.mount		= qnx4_mount,</div><div class='del'>-	.kill_sb	= qnx4_kill_sb,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "qnx4",</div><div class='add'>+	.kill_sb		= qnx4_kill_sb,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context	= qnx4_init_fs_context,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("qnx4");</div><div class='ctx'> </div><div class='hunk'>@@ -417,5 +430,6 @@ static void __exit exit_qnx4_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_qnx4_fs)</div><div class='ctx'> module_exit(exit_qnx4_fs)</div><div class='add'>+MODULE_DESCRIPTION("QNX4 file system");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='head'>diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c<br/>index c1cfb8a19e9d..b4d10e45f2e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/qnx6/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/dir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/qnx6/dir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/qnx6/dir.c</a></div><div class='hunk'>@@ -24,13 +24,15 @@ static unsigned qnx6_lfile_checksum(char *name, unsigned size)</div><div class='ctx'> 	return crc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *qnx6_get_page(struct inode *dir, unsigned long n)</div><div class='add'>+static void *qnx6_get_folio(struct inode *dir, unsigned long n,</div><div class='add'>+		struct folio **foliop)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = dir-&gt;i_mapping;</div><div class='del'>-	struct page *page = read_mapping_page(mapping, n, NULL);</div><div class='del'>-	if (!IS_ERR(page))</div><div class='del'>-		kmap(page);</div><div class='del'>-	return page;</div><div class='add'>+	struct folio *folio = read_mapping_folio(dir-&gt;i_mapping, n, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return folio;</div><div class='add'>+	*foliop = folio;</div><div class='add'>+	return kmap_local_folio(folio, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned last_entry(struct inode *inode, unsigned long page_nr)</div><div class='hunk'>@@ -44,19 +46,20 @@ static unsigned last_entry(struct inode *inode, unsigned long page_nr)</div><div class='ctx'> </div><div class='ctx'> static struct qnx6_long_filename *qnx6_longname(struct super_block *sb,</div><div class='ctx'> 					 struct qnx6_long_dir_entry *de,</div><div class='del'>-					 struct page **p)</div><div class='add'>+					 struct folio **foliop)</div><div class='ctx'> {</div><div class='ctx'> 	struct qnx6_sb_info *sbi = QNX6_SB(sb);</div><div class='ctx'> 	u32 s = fs32_to_cpu(sbi, de-&gt;de_long_inode); /* in block units */</div><div class='ctx'> 	u32 n = s &gt;&gt; (PAGE_SHIFT - sb-&gt;s_blocksize_bits); /* in pages */</div><div class='del'>-	/* within page */</div><div class='del'>-	u32 offs = (s &lt;&lt; sb-&gt;s_blocksize_bits) &amp; ~PAGE_MASK;</div><div class='add'>+	u32 offs;</div><div class='ctx'> 	struct address_space *mapping = sbi-&gt;longfile-&gt;i_mapping;</div><div class='del'>-	struct page *page = read_mapping_page(mapping, n, NULL);</div><div class='del'>-	if (IS_ERR(page))</div><div class='del'>-		return ERR_CAST(page);</div><div class='del'>-	kmap(*p = page);</div><div class='del'>-	return (struct qnx6_long_filename *)(page_address(page) + offs);</div><div class='add'>+	struct folio *folio = read_mapping_folio(mapping, n, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(folio))</div><div class='add'>+		return ERR_CAST(folio);</div><div class='add'>+	offs = offset_in_folio(folio, s &lt;&lt; sb-&gt;s_blocksize_bits);</div><div class='add'>+	*foliop = folio;</div><div class='add'>+	return kmap_local_folio(folio, offs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qnx6_dir_longfilename(struct inode *inode,</div><div class='hunk'>@@ -67,7 +70,7 @@ static int qnx6_dir_longfilename(struct inode *inode,</div><div class='ctx'> 	struct qnx6_long_filename *lf;</div><div class='ctx'> 	struct super_block *s = inode-&gt;i_sb;</div><div class='ctx'> 	struct qnx6_sb_info *sbi = QNX6_SB(s);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int lf_size;</div><div class='ctx'> </div><div class='ctx'> 	if (de-&gt;de_size != 0xff) {</div><div class='hunk'>@@ -76,7 +79,7 @@ static int qnx6_dir_longfilename(struct inode *inode,</div><div class='ctx'> 		pr_err("invalid direntry size (%i).\n", de-&gt;de_size);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	lf = qnx6_longname(s, de, &amp;page);</div><div class='add'>+	lf = qnx6_longname(s, de, &amp;folio);</div><div class='ctx'> 	if (IS_ERR(lf)) {</div><div class='ctx'> 		pr_err("Error reading longname\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -87,7 +90,7 @@ static int qnx6_dir_longfilename(struct inode *inode,</div><div class='ctx'> 	if (lf_size &gt; QNX6_LONG_NAME_MAX) {</div><div class='ctx'> 		pr_debug("file %s\n", lf-&gt;lf_fname);</div><div class='ctx'> 		pr_err("Filename too long (%i)\n", lf_size);</div><div class='del'>-		qnx6_put_page(page);</div><div class='add'>+		folio_release_kmap(folio, lf);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -100,11 +103,11 @@ static int qnx6_dir_longfilename(struct inode *inode,</div><div class='ctx'> 	pr_debug("qnx6_readdir:%.*s inode:%u\n",</div><div class='ctx'> 		 lf_size, lf-&gt;lf_fname, de_inode);</div><div class='ctx'> 	if (!dir_emit(ctx, lf-&gt;lf_fname, lf_size, de_inode, DT_UNKNOWN)) {</div><div class='del'>-		qnx6_put_page(page);</div><div class='add'>+		folio_release_kmap(folio, lf);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qnx6_put_page(page);</div><div class='add'>+	folio_release_kmap(folio, lf);</div><div class='ctx'> 	/* success */</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -117,26 +120,27 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 	loff_t pos = ctx-&gt;pos &amp; ~(QNX6_DIR_ENTRY_SIZE - 1);</div><div class='ctx'> 	unsigned long npages = dir_pages(inode);</div><div class='ctx'> 	unsigned long n = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned start = (pos &amp; ~PAGE_MASK) / QNX6_DIR_ENTRY_SIZE;</div><div class='add'>+	unsigned offset = (pos &amp; ~PAGE_MASK) / QNX6_DIR_ENTRY_SIZE;</div><div class='ctx'> 	bool done = false;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;pos = pos;</div><div class='ctx'> 	if (ctx-&gt;pos &gt;= inode-&gt;i_size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	for ( ; !done &amp;&amp; n &lt; npages; n++, start = 0) {</div><div class='del'>-		struct page *page = qnx6_get_page(inode, n);</div><div class='del'>-		int limit = last_entry(inode, n);</div><div class='add'>+	for ( ; !done &amp;&amp; n &lt; npages; n++, offset = 0) {</div><div class='ctx'> 		struct qnx6_dir_entry *de;</div><div class='del'>-		int i = start;</div><div class='add'>+		struct folio *folio;</div><div class='add'>+		char *kaddr = qnx6_get_folio(inode, n, &amp;folio);</div><div class='add'>+		char *limit;</div><div class='ctx'> </div><div class='del'>-		if (IS_ERR(page)) {</div><div class='add'>+		if (IS_ERR(kaddr)) {</div><div class='ctx'> 			pr_err("%s(): read failed\n", __func__);</div><div class='ctx'> 			ctx-&gt;pos = (n + 1) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-			return PTR_ERR(page);</div><div class='add'>+			return PTR_ERR(kaddr);</div><div class='ctx'> 		}</div><div class='del'>-		de = ((struct qnx6_dir_entry *)page_address(page)) + start;</div><div class='del'>-		for (; i &lt; limit; i++, de++, ctx-&gt;pos += QNX6_DIR_ENTRY_SIZE) {</div><div class='add'>+		de = (struct qnx6_dir_entry *)(kaddr + offset);</div><div class='add'>+		limit = kaddr + last_entry(inode, n);</div><div class='add'>+		for (; (char *)de &lt; limit; de++, ctx-&gt;pos += QNX6_DIR_ENTRY_SIZE) {</div><div class='ctx'> 			int size = de-&gt;de_size;</div><div class='ctx'> 			u32 no_inode = fs32_to_cpu(sbi, de-&gt;de_inode);</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +168,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		qnx6_put_page(page);</div><div class='add'>+		folio_release_kmap(folio, kaddr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -177,23 +181,23 @@ static unsigned qnx6_long_match(int len, const char *name,</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *s = dir-&gt;i_sb;</div><div class='ctx'> 	struct qnx6_sb_info *sbi = QNX6_SB(s);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	int thislen;</div><div class='del'>-	struct qnx6_long_filename *lf = qnx6_longname(s, de, &amp;page);</div><div class='add'>+	struct qnx6_long_filename *lf = qnx6_longname(s, de, &amp;folio);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(lf))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	thislen = fs16_to_cpu(sbi, lf-&gt;lf_size);</div><div class='ctx'> 	if (len != thislen) {</div><div class='del'>-		qnx6_put_page(page);</div><div class='add'>+		folio_release_kmap(folio, lf);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (memcmp(name, lf-&gt;lf_fname, len) == 0) {</div><div class='del'>-		qnx6_put_page(page);</div><div class='add'>+		folio_release_kmap(folio, lf);</div><div class='ctx'> 		return fs32_to_cpu(sbi, de-&gt;de_inode);</div><div class='ctx'> 	}</div><div class='del'>-	qnx6_put_page(page);</div><div class='add'>+	folio_release_kmap(folio, lf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -210,20 +214,17 @@ static unsigned qnx6_match(struct super_block *s, int len, const char *name,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,</div><div class='del'>-			 struct page **res_page)</div><div class='add'>+unsigned qnx6_find_ino(int len, struct inode *dir, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *s = dir-&gt;i_sb;</div><div class='ctx'> 	struct qnx6_inode_info *ei = QNX6_I(dir);</div><div class='del'>-	struct page *page = NULL;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	unsigned long start, n;</div><div class='ctx'> 	unsigned long npages = dir_pages(dir);</div><div class='ctx'> 	unsigned ino;</div><div class='ctx'> 	struct qnx6_dir_entry *de;</div><div class='ctx'> 	struct qnx6_long_dir_entry *lde;</div><div class='ctx'> </div><div class='del'>-	*res_page = NULL;</div><div class='del'>-</div><div class='ctx'> 	if (npages == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	start = ei-&gt;i_dir_start_lookup;</div><div class='hunk'>@@ -232,12 +233,11 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,</div><div class='ctx'> 	n = start;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		page = qnx6_get_page(dir, n);</div><div class='del'>-		if (!IS_ERR(page)) {</div><div class='add'>+		de = qnx6_get_folio(dir, n, &amp;folio);</div><div class='add'>+		if (!IS_ERR(de)) {</div><div class='ctx'> 			int limit = last_entry(dir, n);</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='del'>-			de = (struct qnx6_dir_entry *)page_address(page);</div><div class='ctx'> 			for (i = 0; i &lt; limit; i++, de++) {</div><div class='ctx'> 				if (len &lt;= QNX6_SHORT_NAME_MAX) {</div><div class='ctx'> 					/* short filename */</div><div class='hunk'>@@ -256,7 +256,7 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,</div><div class='ctx'> 				} else</div><div class='ctx'> 					pr_err("undefined filename size in inode.\n");</div><div class='ctx'> 			}</div><div class='del'>-			qnx6_put_page(page);</div><div class='add'>+			folio_release_kmap(folio, de - i);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (++n &gt;= npages)</div><div class='hunk'>@@ -265,8 +265,8 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='del'>-	*res_page = page;</div><div class='ctx'> 	ei-&gt;i_dir_start_lookup = n;</div><div class='add'>+	folio_release_kmap(folio, de);</div><div class='ctx'> 	return ino;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c<br/>index a286c545717f..88d285005083 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/qnx6/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/qnx6/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/qnx6/inode.c</a></div><div class='hunk'>@@ -19,11 +19,11 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='del'>-#include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/mpage.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='ctx'> #include "qnx6.h"</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations qnx6_sops;</div><div class='hunk'>@@ -31,7 +31,7 @@ static const struct super_operations qnx6_sops;</div><div class='ctx'> static void qnx6_put_super(struct super_block *sb);</div><div class='ctx'> static struct inode *qnx6_alloc_inode(struct super_block *sb);</div><div class='ctx'> static void qnx6_free_inode(struct inode *inode);</div><div class='del'>-static int qnx6_remount(struct super_block *sb, int *flags, char *data);</div><div class='add'>+static int qnx6_reconfigure(struct fs_context *fc);</div><div class='ctx'> static int qnx6_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='ctx'> static int qnx6_show_options(struct seq_file *seq, struct dentry *root);</div><div class='ctx'> </div><div class='hunk'>@@ -40,7 +40,6 @@ static const struct super_operations qnx6_sops = {</div><div class='ctx'> 	.free_inode	= qnx6_free_inode,</div><div class='ctx'> 	.put_super	= qnx6_put_super,</div><div class='ctx'> 	.statfs		= qnx6_statfs,</div><div class='del'>-	.remount_fs	= qnx6_remount,</div><div class='ctx'> 	.show_options	= qnx6_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -54,10 +53,12 @@ static int qnx6_show_options(struct seq_file *seq, struct dentry *root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qnx6_remount(struct super_block *sb, int *flags, char *data)</div><div class='add'>+static int qnx6_reconfigure(struct fs_context *fc)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = fc-&gt;root-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	sync_filesystem(sb);</div><div class='del'>-	*flags |= SB_RDONLY;</div><div class='add'>+	fc-&gt;sb_flags |= SB_RDONLY;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -178,22 +179,19 @@ static int qnx6_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'>  */</div><div class='ctx'> static const char *qnx6_checkroot(struct super_block *s)</div><div class='ctx'> {</div><div class='del'>-	static char match_root[2][3] = {".\0\0", "..\0"};</div><div class='del'>-	int i, error = 0;</div><div class='add'>+	int error = 0;</div><div class='ctx'> 	struct qnx6_dir_entry *dir_entry;</div><div class='ctx'> 	struct inode *root = d_inode(s-&gt;s_root);</div><div class='ctx'> 	struct address_space *mapping = root-&gt;i_mapping;</div><div class='del'>-	struct page *page = read_mapping_page(mapping, 0, NULL);</div><div class='del'>-	if (IS_ERR(page))</div><div class='add'>+	struct folio *folio = read_mapping_folio(mapping, 0, NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(folio))</div><div class='ctx'> 		return "error reading root directory";</div><div class='del'>-	kmap(page);</div><div class='del'>-	dir_entry = page_address(page);</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		/* maximum 3 bytes - due to match_root limitation */</div><div class='del'>-		if (strncmp(dir_entry[i].de_fname, match_root[i], 3))</div><div class='del'>-			error = 1;</div><div class='del'>-	}</div><div class='del'>-	qnx6_put_page(page);</div><div class='add'>+	dir_entry = kmap_local_folio(folio, 0);</div><div class='add'>+	if (memcmp(dir_entry[0].de_fname, ".", 2) ||</div><div class='add'>+	    memcmp(dir_entry[1].de_fname, "..", 3))</div><div class='add'>+		error = 1;</div><div class='add'>+	folio_release_kmap(folio, dir_entry);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return "error reading root directory.";</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -218,39 +216,36 @@ void qnx6_superblock_debug(struct qnx6_super_block *sb, struct super_block *s)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	Opt_mmifs,</div><div class='del'>-	Opt_err</div><div class='add'>+	Opt_mmifs</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const match_table_t tokens = {</div><div class='del'>-	{Opt_mmifs, "mmi_fs"},</div><div class='del'>-	{Opt_err, NULL}</div><div class='add'>+struct qnx6_context {</div><div class='add'>+	unsigned long s_mount_opts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int qnx6_parse_options(char *options, struct super_block *sb)</div><div class='add'>+static const struct fs_parameter_spec qnx6_param_spec[] = {</div><div class='add'>+	fsparam_flag	("mmi_fs",	Opt_mmifs),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int qnx6_parse_param(struct fs_context *fc, struct fs_parameter *param)</div><div class='ctx'> {</div><div class='del'>-	char *p;</div><div class='del'>-	struct qnx6_sb_info *sbi = QNX6_SB(sb);</div><div class='del'>-	substring_t args[MAX_OPT_ARGS];</div><div class='del'>-</div><div class='del'>-	if (!options)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	while ((p = strsep(&amp;options, ",")) != NULL) {</div><div class='del'>-		int token;</div><div class='del'>-		if (!*p)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		token = match_token(p, tokens, args);</div><div class='del'>-		switch (token) {</div><div class='del'>-		case Opt_mmifs:</div><div class='del'>-			set_opt(sbi-&gt;s_mount_opt, MMI_FS);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	struct qnx6_context *ctx = fc-&gt;fs_private;</div><div class='add'>+	struct fs_parse_result result;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	opt = fs_parse(fc, qnx6_param_spec, param, &amp;result);</div><div class='add'>+	if (opt &lt; 0)</div><div class='add'>+		return opt;</div><div class='add'>+</div><div class='add'>+	switch (opt) {</div><div class='add'>+	case Opt_mmifs:</div><div class='add'>+		ctx-&gt;s_mount_opts |= QNX6_MOUNT_MMI_FS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct buffer_head *qnx6_check_first_superblock(struct super_block *s,</div><div class='hunk'>@@ -293,22 +288,25 @@ static struct buffer_head *qnx6_check_first_superblock(struct super_block *s,</div><div class='ctx'> static struct inode *qnx6_private_inode(struct super_block *s,</div><div class='ctx'> 					struct qnx6_root_node *p);</div><div class='ctx'> </div><div class='del'>-static int qnx6_fill_super(struct super_block *s, void *data, int silent)</div><div class='add'>+static int qnx6_fill_super(struct super_block *s, struct fs_context *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh1 = NULL, *bh2 = NULL;</div><div class='ctx'> 	struct qnx6_super_block *sb1 = NULL, *sb2 = NULL;</div><div class='ctx'> 	struct qnx6_sb_info *sbi;</div><div class='add'>+	struct qnx6_context *ctx = fc-&gt;fs_private;</div><div class='ctx'> 	struct inode *root;</div><div class='ctx'> 	const char *errmsg;</div><div class='ctx'> 	struct qnx6_sb_info *qs;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> 	u64 offset;</div><div class='ctx'> 	int bootblock_offset = QNX6_BOOTBLOCK_SIZE;</div><div class='add'>+	int silent = fc-&gt;sb_flags &amp; SB_SILENT;</div><div class='ctx'> </div><div class='ctx'> 	qs = kzalloc(sizeof(struct qnx6_sb_info), GFP_KERNEL);</div><div class='ctx'> 	if (!qs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	s-&gt;s_fs_info = qs;</div><div class='add'>+	qs-&gt;s_mount_opt = ctx-&gt;s_mount_opts;</div><div class='ctx'> </div><div class='ctx'> 	/* Superblock always is 512 Byte long */</div><div class='ctx'> 	if (!sb_set_blocksize(s, QNX6_SUPERBLOCK_SIZE)) {</div><div class='hunk'>@@ -316,12 +314,7 @@ static int qnx6_fill_super(struct super_block *s, void *data, int silent)</div><div class='ctx'> 		goto outnobh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* parse the mount-options */</div><div class='del'>-	if (!qnx6_parse_options((char *) data, s)) {</div><div class='del'>-		pr_err("invalid mount options.\n");</div><div class='del'>-		goto outnobh;</div><div class='del'>-	}</div><div class='del'>-	if (test_opt(s, MMI_FS)) {</div><div class='add'>+	if (qs-&gt;s_mount_opt == QNX6_MOUNT_MMI_FS) {</div><div class='ctx'> 		sb1 = qnx6_mmi_fill_super(s, silent);</div><div class='ctx'> 		if (sb1)</div><div class='ctx'> 			goto mmi_success;</div><div class='hunk'>@@ -522,13 +515,13 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct qnx6_inode_info	*ei;</div><div class='ctx'> 	struct address_space *mapping;</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> 	u32 n, offs;</div><div class='ctx'> </div><div class='ctx'> 	inode = iget_locked(sb, ino);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW))</div><div class='add'>+	if (!(inode_state_read_once(inode) &amp; I_NEW))</div><div class='ctx'> 		return inode;</div><div class='ctx'> </div><div class='ctx'> 	ei = QNX6_I(inode);</div><div class='hunk'>@@ -542,17 +535,16 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)</div><div class='ctx'> 		return ERR_PTR(-EIO);</div><div class='ctx'> 	}</div><div class='ctx'> 	n = (ino - 1) &gt;&gt; (PAGE_SHIFT - QNX6_INODE_SIZE_BITS);</div><div class='del'>-	offs = (ino - 1) &amp; (~PAGE_MASK &gt;&gt; QNX6_INODE_SIZE_BITS);</div><div class='ctx'> 	mapping = sbi-&gt;inodes-&gt;i_mapping;</div><div class='del'>-	page = read_mapping_page(mapping, n, NULL);</div><div class='del'>-	if (IS_ERR(page)) {</div><div class='add'>+	folio = read_mapping_folio(mapping, n, NULL);</div><div class='add'>+	if (IS_ERR(folio)) {</div><div class='ctx'> 		pr_err("major problem: unable to read inode from dev %s\n",</div><div class='ctx'> 		       sb-&gt;s_id);</div><div class='ctx'> 		iget_failed(inode);</div><div class='del'>-		return ERR_CAST(page);</div><div class='add'>+		return ERR_CAST(folio);</div><div class='ctx'> 	}</div><div class='del'>-	kmap(page);</div><div class='del'>-	raw_inode = ((struct qnx6_inode_entry *)page_address(page)) + offs;</div><div class='add'>+	offs = offset_in_folio(folio, (ino - 1) &lt;&lt; QNX6_INODE_SIZE_BITS);</div><div class='add'>+	raw_inode = kmap_local_folio(folio, offs);</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode    = fs16_to_cpu(sbi, raw_inode-&gt;di_mode);</div><div class='ctx'> 	i_uid_write(inode, (uid_t)fs32_to_cpu(sbi, raw_inode-&gt;di_uid));</div><div class='hunk'>@@ -582,7 +574,7 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = &amp;qnx6_aops;</div><div class='ctx'> 	} else</div><div class='ctx'> 		init_special_inode(inode, inode-&gt;i_mode, 0);</div><div class='del'>-	qnx6_put_page(page);</div><div class='add'>+	folio_release_kmap(folio, raw_inode);</div><div class='ctx'> 	unlock_new_inode(inode);</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='hunk'>@@ -615,7 +607,7 @@ static int init_inodecache(void)</div><div class='ctx'> 	qnx6_inode_cachep = kmem_cache_create("qnx6_inode_cache",</div><div class='ctx'> 					     sizeof(struct qnx6_inode_info),</div><div class='ctx'> 					     0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						SLAB_MEM_SPREAD|SLAB_ACCOUNT),</div><div class='add'>+						SLAB_ACCOUNT),</div><div class='ctx'> 					     init_once);</div><div class='ctx'> 	if (!qnx6_inode_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -632,18 +624,43 @@ static void destroy_inodecache(void)</div><div class='ctx'> 	kmem_cache_destroy(qnx6_inode_cachep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dentry *qnx6_mount(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int qnx6_get_tree(struct fs_context *fc)</div><div class='ctx'> {</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, qnx6_fill_super);</div><div class='add'>+	return get_tree_bdev(fc, qnx6_fill_super);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qnx6_free_fc(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	kfree(fc-&gt;fs_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fs_context_operations qnx6_context_ops = {</div><div class='add'>+	.parse_param	= qnx6_parse_param,</div><div class='add'>+	.get_tree	= qnx6_get_tree,</div><div class='add'>+	.reconfigure	= qnx6_reconfigure,</div><div class='add'>+	.free		= qnx6_free_fc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int qnx6_init_fs_context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct qnx6_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(struct qnx6_context), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	fc-&gt;ops = &amp;qnx6_context_ops;</div><div class='add'>+	fc-&gt;fs_private = ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type qnx6_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "qnx6",</div><div class='del'>-	.mount		= qnx6_mount,</div><div class='del'>-	.kill_sb	= kill_block_super,</div><div class='del'>-	.fs_flags	= FS_REQUIRES_DEV,</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.name			= "qnx6",</div><div class='add'>+	.kill_sb		= kill_block_super,</div><div class='add'>+	.fs_flags		= FS_REQUIRES_DEV,</div><div class='add'>+	.init_fs_context	= qnx6_init_fs_context,</div><div class='add'>+	.parameters		= qnx6_param_spec,</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS_FS("qnx6");</div><div class='ctx'> </div><div class='hunk'>@@ -673,4 +690,5 @@ static void __exit exit_qnx6_fs(void)</div><div class='ctx'> </div><div class='ctx'> module_init(init_qnx6_fs)</div><div class='ctx'> module_exit(exit_qnx6_fs)</div><div class='add'>+MODULE_DESCRIPTION("QNX6 file system");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/fs/qnx6/namei.c b/fs/qnx6/namei.c<br/>index e2e98e653b8d..0f0755a9ecb5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/qnx6/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/namei.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/qnx6/namei.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/qnx6/namei.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@ struct dentry *qnx6_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 				unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned ino;</div><div class='del'>-	struct page *page;</div><div class='ctx'> 	struct inode *foundinode = NULL;</div><div class='ctx'> 	const char *name = dentry-&gt;d_name.name;</div><div class='ctx'> 	int len = dentry-&gt;d_name.len;</div><div class='hunk'>@@ -25,10 +24,9 @@ struct dentry *qnx6_lookup(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	if (len &gt; QNX6_LONG_NAME_MAX)</div><div class='ctx'> 		return ERR_PTR(-ENAMETOOLONG);</div><div class='ctx'> </div><div class='del'>-	ino = qnx6_find_entry(len, dir, name, &amp;page);</div><div class='add'>+	ino = qnx6_find_ino(len, dir, name);</div><div class='ctx'> 	if (ino) {</div><div class='ctx'> 		foundinode = qnx6_iget(dir-&gt;i_sb, ino);</div><div class='del'>-		qnx6_put_page(page);</div><div class='ctx'> 		if (IS_ERR(foundinode))</div><div class='ctx'> 			pr_debug("lookup-&gt;iget -&gt;  error %ld\n",</div><div class='ctx'> 				 PTR_ERR(foundinode));</div><div class='head'>diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h<br/>index 34a6b126a3a9..56ed1367499e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/qnx6/qnx6.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/qnx6/qnx6.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/qnx6/qnx6.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/qnx6/qnx6.h</a></div><div class='hunk'>@@ -126,11 +126,4 @@ static inline __fs16 cpu_to_fs16(struct qnx6_sb_info *sbi, __u16 n)</div><div class='ctx'> extern struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s,</div><div class='ctx'> 						    int silent);</div><div class='ctx'> </div><div class='del'>-static inline void qnx6_put_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	kunmap(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,</div><div class='del'>-				struct page **res_page);</div><div class='add'>+unsigned qnx6_find_ino(int len, struct inode *dir, const char *name);</div><div class='head'>diff --git a/fs/quota/Kconfig b/fs/quota/Kconfig<br/>index 4c925e55dbcd..818083a36bef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/quota/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/quota/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/quota/Kconfig</a></div><div class='hunk'>@@ -9,14 +9,13 @@ config QUOTA</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here, you will be able to set per user limits for disk</div><div class='ctx'> 	  usage (also called disk quotas). Currently, it works for the</div><div class='del'>-	  ext2, ext3, ext4, f2fs, jfs, ocfs2 and reiserfs file systems.</div><div class='del'>-	  Note that gfs2 and xfs use their own quota system.</div><div class='del'>-	  Ext3, ext4 and reiserfs also support journaled quotas for which</div><div class='del'>-	  you don't need to run quotacheck(8) after an unclean shutdown.</div><div class='del'>-	  For further details, read the Quota mini-HOWTO, available from</div><div class='del'>-	  &lt;https://www.tldp.org/docs.html#howto&gt;, or the documentation provided</div><div class='del'>-	  with the quota tools. Probably the quota support is only useful for</div><div class='del'>-	  multi user systems. If unsure, say N.</div><div class='add'>+	  ext2, ext3, ext4, f2fs, jfs and ocfs2 file systems. Note that gfs2</div><div class='add'>+	  and xfs use their own quota system. Ext3 and ext4 also support</div><div class='add'>+	  journaled quotas for which you don't need to run quotacheck(8) after</div><div class='add'>+	  an unclean shutdown. For further details, read the Quota mini-HOWTO,</div><div class='add'>+	  available from &lt;https://www.tldp.org/docs.html#howto&gt;, or the</div><div class='add'>+	  documentation provided with the quota tools. Probably the quota</div><div class='add'>+	  support is only useful for multi user systems. If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config QUOTA_NETLINK_INTERFACE</div><div class='ctx'> 	bool "Report quota messages through netlink interface"</div><div class='head'>diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c<br/>index 1f0c754416b6..376739f6420e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/quota/dquot.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/dquot.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/quota/dquot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/quota/dquot.c</a></div><div class='hunk'>@@ -80,7 +80,6 @@</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/sched/mm.h&gt;</div><div class='del'>-#include "../internal.h" /* ugh */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -163,13 +162,15 @@ static struct quota_module_name module_names[] = INIT_QUOTA_MODULE_NAMES;</div><div class='ctx'> /* SLAB cache for dquot structures */</div><div class='ctx'> static struct kmem_cache *dquot_cachep;</div><div class='ctx'> </div><div class='del'>-int register_quota_format(struct quota_format_type *fmt)</div><div class='add'>+/* workqueue for work quota_release_work*/</div><div class='add'>+static struct workqueue_struct *quota_unbound_wq;</div><div class='add'>+</div><div class='add'>+void register_quota_format(struct quota_format_type *fmt)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;dq_list_lock);</div><div class='ctx'> 	fmt-&gt;qf_next = quota_formats;</div><div class='ctx'> 	quota_formats = fmt;</div><div class='ctx'> 	spin_unlock(&amp;dq_list_lock);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(register_quota_format);</div><div class='ctx'> </div><div class='hunk'>@@ -399,16 +400,18 @@ int dquot_mark_dquot_dirty(struct dquot *dquot)</div><div class='ctx'> EXPORT_SYMBOL(dquot_mark_dquot_dirty);</div><div class='ctx'> </div><div class='ctx'> /* Dirtify all the dquots - this can block when journalling */</div><div class='del'>-static inline int mark_all_dquot_dirty(struct dquot * const *dquot)</div><div class='add'>+static inline int mark_all_dquot_dirty(struct dquot __rcu * const *dquots)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, err, cnt;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> </div><div class='ctx'> 	ret = err = 0;</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='del'>-		if (dquot[cnt])</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (dquot)</div><div class='ctx'> 			/* Even in case of error we have to continue */</div><div class='del'>-			ret = mark_dquot_dirty(dquot[cnt]);</div><div class='del'>-		if (!err)</div><div class='add'>+			ret = mark_dquot_dirty(dquot);</div><div class='add'>+		if (!err &amp;&amp; ret &lt; 0)</div><div class='ctx'> 			err = ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -688,6 +691,8 @@ int dquot_writeback_dquots(struct super_block *sb, int type)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON_ONCE(!rwsem_is_locked(&amp;sb-&gt;s_umount));</div><div class='ctx'> </div><div class='add'>+	flush_delayed_work(&amp;quota_release_work);</div><div class='add'>+</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='ctx'> 		if (type != -1 &amp;&amp; cnt != type)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -875,14 +880,11 @@ void dqput(struct dquot *dquot)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Need to release dquot? */</div><div class='del'>-#ifdef CONFIG_QUOTA_DEBUG</div><div class='del'>-	/* sanity check */</div><div class='del'>-	BUG_ON(!list_empty(&amp;dquot-&gt;dq_free));</div><div class='del'>-#endif</div><div class='add'>+	WARN_ON_ONCE(!list_empty(&amp;dquot-&gt;dq_free));</div><div class='ctx'> 	put_releasing_dquots(dquot);</div><div class='ctx'> 	atomic_dec(&amp;dquot-&gt;dq_count);</div><div class='ctx'> 	spin_unlock(&amp;dq_list_lock);</div><div class='del'>-	queue_delayed_work(system_unbound_wq, &amp;quota_release_work, 1);</div><div class='add'>+	queue_delayed_work(quota_unbound_wq, &amp;quota_release_work, 1);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dqput);</div><div class='ctx'> </div><div class='hunk'>@@ -987,9 +989,8 @@ we_slept:</div><div class='ctx'> 	 * smp_mb__before_atomic() in dquot_acquire().</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_rmb();</div><div class='del'>-#ifdef CONFIG_QUOTA_DEBUG</div><div class='del'>-	BUG_ON(!dquot-&gt;dq_sb);	/* Has somebody invalidated entry under us? */</div><div class='del'>-#endif</div><div class='add'>+	/* Has somebody invalidated entry under us? */</div><div class='add'>+	WARN_ON_ONCE(hlist_unhashed(&amp;dquot-&gt;dq_hash));</div><div class='ctx'> out:</div><div class='ctx'> 	if (empty)</div><div class='ctx'> 		do_destroy_dquot(empty);</div><div class='hunk'>@@ -998,14 +999,14 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dqget);</div><div class='ctx'> </div><div class='del'>-static inline struct dquot **i_dquot(struct inode *inode)</div><div class='add'>+static inline struct dquot __rcu **i_dquot(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return inode-&gt;i_sb-&gt;s_op-&gt;get_dquots(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dqinit_needed(struct inode *inode, int type)</div><div class='ctx'> {</div><div class='del'>-	struct dquot * const *dquots;</div><div class='add'>+	struct dquot __rcu * const *dquots;</div><div class='ctx'> 	int cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_NOQUOTA(inode))</div><div class='hunk'>@@ -1032,7 +1033,7 @@ static int add_dquot_ref(struct super_block *sb, int type)</div><div class='ctx'> 	spin_lock(&amp;sb-&gt;s_inode_list_lock);</div><div class='ctx'> 	list_for_each_entry(inode, &amp;sb-&gt;s_inodes, i_sb_list) {</div><div class='ctx'> 		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		if ((inode-&gt;i_state &amp; (I_FREEING|I_WILL_FREE|I_NEW)) ||</div><div class='add'>+		if ((inode_state_read(inode) &amp; (I_FREEING | I_WILL_FREE | I_NEW)) ||</div><div class='ctx'> 		    !atomic_read(&amp;inode-&gt;i_writecount) ||</div><div class='ctx'> 		    !dqinit_needed(inode, type)) {</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='hunk'>@@ -1095,14 +1096,16 @@ static void remove_dquot_ref(struct super_block *sb, int type)</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock(&amp;dq_data_lock);</div><div class='ctx'> 		if (!IS_NOQUOTA(inode)) {</div><div class='del'>-			struct dquot **dquots = i_dquot(inode);</div><div class='del'>-			struct dquot *dquot = dquots[type];</div><div class='add'>+			struct dquot __rcu **dquots = i_dquot(inode);</div><div class='add'>+			struct dquot *dquot = srcu_dereference_check(</div><div class='add'>+				dquots[type], &amp;dquot_srcu,</div><div class='add'>+				lockdep_is_held(&amp;dq_data_lock));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA_DEBUG</div><div class='ctx'> 			if (unlikely(inode_get_rsv_space(inode) &gt; 0))</div><div class='ctx'> 				reserved = 1;</div><div class='ctx'> #endif</div><div class='del'>-			dquots[type] = NULL;</div><div class='add'>+			rcu_assign_pointer(dquots[type], NULL);</div><div class='ctx'> 			if (dquot)</div><div class='ctx'> 				dqput(dquot);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1455,7 +1458,8 @@ static int inode_quota_active(const struct inode *inode)</div><div class='ctx'> static int __dquot_initialize(struct inode *inode, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt, init_needed = 0;</div><div class='del'>-	struct dquot **dquots, *got[MAXQUOTAS] = {};</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='add'>+	struct dquot *got[MAXQUOTAS] = {};</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	qsize_t rsv;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1530,7 +1534,7 @@ static int __dquot_initialize(struct inode *inode, int type)</div><div class='ctx'> 		if (!got[cnt])</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!dquots[cnt]) {</div><div class='del'>-			dquots[cnt] = got[cnt];</div><div class='add'>+			rcu_assign_pointer(dquots[cnt], got[cnt]);</div><div class='ctx'> 			got[cnt] = NULL;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Make quota reservation system happy if someone</div><div class='hunk'>@@ -1538,12 +1542,16 @@ static int __dquot_initialize(struct inode *inode, int type)</div><div class='ctx'> 			 */</div><div class='ctx'> 			rsv = inode_get_rsv_space(inode);</div><div class='ctx'> 			if (unlikely(rsv)) {</div><div class='add'>+				struct dquot *dquot = srcu_dereference_check(</div><div class='add'>+					dquots[cnt], &amp;dquot_srcu,</div><div class='add'>+					lockdep_is_held(&amp;dq_data_lock));</div><div class='add'>+</div><div class='ctx'> 				spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 				/* Get reservation again under proper lock */</div><div class='ctx'> 				rsv = __inode_get_rsv_space(inode);</div><div class='del'>-				spin_lock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='del'>-				dquots[cnt]-&gt;dq_dqb.dqb_rsvspace += rsv;</div><div class='del'>-				spin_unlock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='add'>+				spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='add'>+				dquot-&gt;dq_dqb.dqb_rsvspace += rsv;</div><div class='add'>+				spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 				spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1565,7 +1573,7 @@ EXPORT_SYMBOL(dquot_initialize);</div><div class='ctx'> </div><div class='ctx'> bool dquot_initialize_needed(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct dquot **dquots;</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode))</div><div class='hunk'>@@ -1590,13 +1598,14 @@ EXPORT_SYMBOL(dquot_initialize_needed);</div><div class='ctx'> static void __dquot_drop(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt;</div><div class='del'>-	struct dquot **dquots = i_dquot(inode);</div><div class='add'>+	struct dquot __rcu **dquots = i_dquot(inode);</div><div class='ctx'> 	struct dquot *put[MAXQUOTAS];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dq_data_lock);</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='del'>-		put[cnt] = dquots[cnt];</div><div class='del'>-		dquots[cnt] = NULL;</div><div class='add'>+		put[cnt] = srcu_dereference_check(dquots[cnt], &amp;dquot_srcu,</div><div class='add'>+					lockdep_is_held(&amp;dq_data_lock));</div><div class='add'>+		rcu_assign_pointer(dquots[cnt], NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;dq_data_lock);</div><div class='ctx'> 	dqput_all(put);</div><div class='hunk'>@@ -1604,7 +1613,7 @@ static void __dquot_drop(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> void dquot_drop(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	struct dquot * const *dquots;</div><div class='add'>+	struct dquot __rcu * const *dquots;</div><div class='ctx'> 	int cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_NOQUOTA(inode))</div><div class='hunk'>@@ -1677,7 +1686,8 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)</div><div class='ctx'> 	int cnt, ret = 0, index;</div><div class='ctx'> 	struct dquot_warn warn[MAXQUOTAS];</div><div class='ctx'> 	int reserve = flags &amp; DQUOT_SPACE_RESERVE;</div><div class='del'>-	struct dquot **dquots;</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode)) {</div><div class='ctx'> 		if (reserve) {</div><div class='hunk'>@@ -1697,27 +1707,26 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)</div><div class='ctx'> 	index = srcu_read_lock(&amp;dquot_srcu);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='del'>-		if (!dquots[cnt])</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (!dquot)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (reserve) {</div><div class='del'>-			ret = dquot_add_space(dquots[cnt], 0, number, flags,</div><div class='del'>-					      &amp;warn[cnt]);</div><div class='add'>+			ret = dquot_add_space(dquot, 0, number, flags, &amp;warn[cnt]);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = dquot_add_space(dquots[cnt], number, 0, flags,</div><div class='del'>-					      &amp;warn[cnt]);</div><div class='add'>+			ret = dquot_add_space(dquot, number, 0, flags, &amp;warn[cnt]);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			/* Back out changes we already did */</div><div class='ctx'> 			for (cnt--; cnt &gt;= 0; cnt--) {</div><div class='del'>-				if (!dquots[cnt])</div><div class='add'>+				dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+				if (!dquot)</div><div class='ctx'> 					continue;</div><div class='del'>-				spin_lock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='add'>+				spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 				if (reserve)</div><div class='del'>-					dquot_free_reserved_space(dquots[cnt],</div><div class='del'>-								  number);</div><div class='add'>+					dquot_free_reserved_space(dquot, number);</div><div class='ctx'> 				else</div><div class='del'>-					dquot_decr_space(dquots[cnt], number);</div><div class='del'>-				spin_unlock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='add'>+					dquot_decr_space(dquot, number);</div><div class='add'>+				spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 			goto out_flush_warn;</div><div class='hunk'>@@ -1731,7 +1740,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)</div><div class='ctx'> </div><div class='ctx'> 	if (reserve)</div><div class='ctx'> 		goto out_flush_warn;</div><div class='del'>-	mark_all_dquot_dirty(dquots);</div><div class='add'>+	ret = mark_all_dquot_dirty(dquots);</div><div class='ctx'> out_flush_warn:</div><div class='ctx'> 	srcu_read_unlock(&amp;dquot_srcu, index);</div><div class='ctx'> 	flush_warnings(warn);</div><div class='hunk'>@@ -1747,7 +1756,8 @@ int dquot_alloc_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt, ret = 0, index;</div><div class='ctx'> 	struct dquot_warn warn[MAXQUOTAS];</div><div class='del'>-	struct dquot * const *dquots;</div><div class='add'>+	struct dquot __rcu * const *dquots;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1758,17 +1768,19 @@ int dquot_alloc_inode(struct inode *inode)</div><div class='ctx'> 	index = srcu_read_lock(&amp;dquot_srcu);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='del'>-		if (!dquots[cnt])</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (!dquot)</div><div class='ctx'> 			continue;</div><div class='del'>-		ret = dquot_add_inodes(dquots[cnt], 1, &amp;warn[cnt]);</div><div class='add'>+		ret = dquot_add_inodes(dquot, 1, &amp;warn[cnt]);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			for (cnt--; cnt &gt;= 0; cnt--) {</div><div class='del'>-				if (!dquots[cnt])</div><div class='add'>+				dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+				if (!dquot)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				/* Back out changes we already did */</div><div class='del'>-				spin_lock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='del'>-				dquot_decr_inodes(dquots[cnt], 1);</div><div class='del'>-				spin_unlock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='add'>+				spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='add'>+				dquot_decr_inodes(dquot, 1);</div><div class='add'>+				spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 			goto warn_put_all;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1777,7 +1789,7 @@ int dquot_alloc_inode(struct inode *inode)</div><div class='ctx'> warn_put_all:</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		mark_all_dquot_dirty(dquots);</div><div class='add'>+		ret = mark_all_dquot_dirty(dquots);</div><div class='ctx'> 	srcu_read_unlock(&amp;dquot_srcu, index);</div><div class='ctx'> 	flush_warnings(warn);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1789,7 +1801,8 @@ EXPORT_SYMBOL(dquot_alloc_inode);</div><div class='ctx'>  */</div><div class='ctx'> void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)</div><div class='ctx'> {</div><div class='del'>-	struct dquot **dquots;</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> 	int cnt, index;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode)) {</div><div class='hunk'>@@ -1805,9 +1818,8 @@ void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	/* Claim reserved quotas to allocated quotas */</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='del'>-		if (dquots[cnt]) {</div><div class='del'>-			struct dquot *dquot = dquots[cnt];</div><div class='del'>-</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (dquot) {</div><div class='ctx'> 			spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 			if (WARN_ON_ONCE(dquot-&gt;dq_dqb.dqb_rsvspace &lt; number))</div><div class='ctx'> 				number = dquot-&gt;dq_dqb.dqb_rsvspace;</div><div class='hunk'>@@ -1822,7 +1834,6 @@ void dquot_claim_space_nodirty(struct inode *inode, qsize_t number)</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	mark_all_dquot_dirty(dquots);</div><div class='ctx'> 	srcu_read_unlock(&amp;dquot_srcu, index);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dquot_claim_space_nodirty);</div><div class='ctx'> </div><div class='hunk'>@@ -1831,7 +1842,8 @@ EXPORT_SYMBOL(dquot_claim_space_nodirty);</div><div class='ctx'>  */</div><div class='ctx'> void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)</div><div class='ctx'> {</div><div class='del'>-	struct dquot **dquots;</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> 	int cnt, index;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode)) {</div><div class='hunk'>@@ -1847,9 +1859,8 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	/* Claim reserved quotas to allocated quotas */</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='del'>-		if (dquots[cnt]) {</div><div class='del'>-			struct dquot *dquot = dquots[cnt];</div><div class='del'>-</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (dquot) {</div><div class='ctx'> 			spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 			if (WARN_ON_ONCE(dquot-&gt;dq_dqb.dqb_curspace &lt; number))</div><div class='ctx'> 				number = dquot-&gt;dq_dqb.dqb_curspace;</div><div class='hunk'>@@ -1864,7 +1875,6 @@ void dquot_reclaim_space_nodirty(struct inode *inode, qsize_t number)</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	mark_all_dquot_dirty(dquots);</div><div class='ctx'> 	srcu_read_unlock(&amp;dquot_srcu, index);</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dquot_reclaim_space_nodirty);</div><div class='ctx'> </div><div class='hunk'>@@ -1875,7 +1885,8 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cnt;</div><div class='ctx'> 	struct dquot_warn warn[MAXQUOTAS];</div><div class='del'>-	struct dquot **dquots;</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> 	int reserve = flags &amp; DQUOT_SPACE_RESERVE, index;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode)) {</div><div class='hunk'>@@ -1896,17 +1907,18 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)</div><div class='ctx'> 		int wtype;</div><div class='ctx'> </div><div class='ctx'> 		warn[cnt].w_type = QUOTA_NL_NOWARN;</div><div class='del'>-		if (!dquots[cnt])</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (!dquot)</div><div class='ctx'> 			continue;</div><div class='del'>-		spin_lock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='del'>-		wtype = info_bdq_free(dquots[cnt], number);</div><div class='add'>+		spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='add'>+		wtype = info_bdq_free(dquot, number);</div><div class='ctx'> 		if (wtype != QUOTA_NL_NOWARN)</div><div class='del'>-			prepare_warning(&amp;warn[cnt], dquots[cnt], wtype);</div><div class='add'>+			prepare_warning(&amp;warn[cnt], dquot, wtype);</div><div class='ctx'> 		if (reserve)</div><div class='del'>-			dquot_free_reserved_space(dquots[cnt], number);</div><div class='add'>+			dquot_free_reserved_space(dquot, number);</div><div class='ctx'> 		else</div><div class='del'>-			dquot_decr_space(dquots[cnt], number);</div><div class='del'>-		spin_unlock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='add'>+			dquot_decr_space(dquot, number);</div><div class='add'>+		spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (reserve)</div><div class='ctx'> 		*inode_reserved_space(inode) -= number;</div><div class='hunk'>@@ -1930,7 +1942,8 @@ void dquot_free_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cnt;</div><div class='ctx'> 	struct dquot_warn warn[MAXQUOTAS];</div><div class='del'>-	struct dquot * const *dquots;</div><div class='add'>+	struct dquot __rcu * const *dquots;</div><div class='add'>+	struct dquot *dquot;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='ctx'> 	if (!inode_quota_active(inode))</div><div class='hunk'>@@ -1941,16 +1954,16 @@ void dquot_free_inode(struct inode *inode)</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='ctx'> 		int wtype;</div><div class='del'>-</div><div class='ctx'> 		warn[cnt].w_type = QUOTA_NL_NOWARN;</div><div class='del'>-		if (!dquots[cnt])</div><div class='add'>+		dquot = srcu_dereference(dquots[cnt], &amp;dquot_srcu);</div><div class='add'>+		if (!dquot)</div><div class='ctx'> 			continue;</div><div class='del'>-		spin_lock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='del'>-		wtype = info_idq_free(dquots[cnt], 1);</div><div class='add'>+		spin_lock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='add'>+		wtype = info_idq_free(dquot, 1);</div><div class='ctx'> 		if (wtype != QUOTA_NL_NOWARN)</div><div class='del'>-			prepare_warning(&amp;warn[cnt], dquots[cnt], wtype);</div><div class='del'>-		dquot_decr_inodes(dquots[cnt], 1);</div><div class='del'>-		spin_unlock(&amp;dquots[cnt]-&gt;dq_dqb_lock);</div><div class='add'>+			prepare_warning(&amp;warn[cnt], dquot, wtype);</div><div class='add'>+		dquot_decr_inodes(dquot, 1);</div><div class='add'>+		spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	mark_all_dquot_dirty(dquots);</div><div class='hunk'>@@ -1976,8 +1989,9 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)</div><div class='ctx'> 	qsize_t cur_space;</div><div class='ctx'> 	qsize_t rsv_space = 0;</div><div class='ctx'> 	qsize_t inode_usage = 1;</div><div class='add'>+	struct dquot __rcu **dquots;</div><div class='ctx'> 	struct dquot *transfer_from[MAXQUOTAS] = {};</div><div class='del'>-	int cnt, ret = 0;</div><div class='add'>+	int cnt, index, ret = 0, err;</div><div class='ctx'> 	char is_valid[MAXQUOTAS] = {};</div><div class='ctx'> 	struct dquot_warn warn_to[MAXQUOTAS];</div><div class='ctx'> 	struct dquot_warn warn_from_inodes[MAXQUOTAS];</div><div class='hunk'>@@ -2008,6 +2022,7 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)</div><div class='ctx'> 	}</div><div class='ctx'> 	cur_space = __inode_get_bytes(inode);</div><div class='ctx'> 	rsv_space = __inode_get_rsv_space(inode);</div><div class='add'>+	dquots = i_dquot(inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Build the transfer_from list, check limits, and update usage in</div><div class='ctx'> 	 * the target structures.</div><div class='hunk'>@@ -2022,7 +2037,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)</div><div class='ctx'> 		if (!sb_has_quota_active(inode-&gt;i_sb, cnt))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		is_valid[cnt] = 1;</div><div class='del'>-		transfer_from[cnt] = i_dquot(inode)[cnt];</div><div class='add'>+		transfer_from[cnt] = srcu_dereference_check(dquots[cnt],</div><div class='add'>+				&amp;dquot_srcu, lockdep_is_held(&amp;dq_data_lock));</div><div class='ctx'> 		ret = dquot_add_inodes(transfer_to[cnt], inode_usage,</div><div class='ctx'> 				       &amp;warn_to[cnt]);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -2061,13 +2077,25 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)</div><div class='ctx'> 						  rsv_space);</div><div class='ctx'> 			spin_unlock(&amp;transfer_from[cnt]-&gt;dq_dqb_lock);</div><div class='ctx'> 		}</div><div class='del'>-		i_dquot(inode)[cnt] = transfer_to[cnt];</div><div class='add'>+		rcu_assign_pointer(dquots[cnt], transfer_to[cnt]);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	spin_unlock(&amp;dq_data_lock);</div><div class='ctx'> </div><div class='del'>-	mark_all_dquot_dirty(transfer_from);</div><div class='del'>-	mark_all_dquot_dirty(transfer_to);</div><div class='add'>+	/*</div><div class='add'>+	 * These arrays are local and we hold dquot references so we don't need</div><div class='add'>+	 * the srcu protection but still take dquot_srcu to avoid warning in</div><div class='add'>+	 * mark_all_dquot_dirty().</div><div class='add'>+	 */</div><div class='add'>+	index = srcu_read_lock(&amp;dquot_srcu);</div><div class='add'>+	err = mark_all_dquot_dirty((struct dquot __rcu **)transfer_from);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ret = err;</div><div class='add'>+	err = mark_all_dquot_dirty((struct dquot __rcu **)transfer_to);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ret = err;</div><div class='add'>+	srcu_read_unlock(&amp;dquot_srcu, index);</div><div class='add'>+</div><div class='ctx'> 	flush_warnings(warn_to);</div><div class='ctx'> 	flush_warnings(warn_from_inodes);</div><div class='ctx'> 	flush_warnings(warn_from_space);</div><div class='hunk'>@@ -2075,7 +2103,7 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)</div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++)</div><div class='ctx'> 		if (is_valid[cnt])</div><div class='ctx'> 			transfer_to[cnt] = transfer_from[cnt];</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> over_quota:</div><div class='ctx'> 	/* Back out changes we already did */</div><div class='ctx'> 	for (cnt--; cnt &gt;= 0; cnt--) {</div><div class='hunk'>@@ -2219,9 +2247,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags)</div><div class='ctx'> 	int cnt;</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='ctx'> </div><div class='del'>-	/* s_umount should be held in exclusive mode */</div><div class='del'>-	if (WARN_ON_ONCE(down_read_trylock(&amp;sb-&gt;s_umount)))</div><div class='del'>-		up_read(&amp;sb-&gt;s_umount);</div><div class='add'>+	rwsem_assert_held_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> </div><div class='ctx'> 	/* Cannot turn off usage accounting without turning off limits, or</div><div class='ctx'> 	 * suspend quotas and simultaneously turn quotas off. */</div><div class='hunk'>@@ -2381,15 +2407,17 @@ static int vfs_setup_quota_inode(struct inode *inode, int type)</div><div class='ctx'> int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,</div><div class='ctx'> 	unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct quota_format_type *fmt = find_quota_format(format_id);</div><div class='add'>+	struct quota_format_type *fmt;</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> </div><div class='ctx'> 	/* Just unsuspend quotas? */</div><div class='del'>-	BUG_ON(flags &amp; DQUOT_SUSPENDED);</div><div class='add'>+	if (WARN_ON_ONCE(flags &amp; DQUOT_SUSPENDED))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	fmt = find_quota_format(format_id);</div><div class='ctx'> 	if (!fmt)</div><div class='ctx'> 		return -ESRCH;</div><div class='ctx'> 	if (!sb-&gt;dq_op || !sb-&gt;s_qcop ||</div><div class='hunk'>@@ -2482,9 +2510,7 @@ int dquot_resume(struct super_block *sb, int type)</div><div class='ctx'> 	int ret = 0, cnt;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> </div><div class='del'>-	/* s_umount should be held in exclusive mode */</div><div class='del'>-	if (WARN_ON_ONCE(down_read_trylock(&amp;sb-&gt;s_umount)))</div><div class='del'>-		up_read(&amp;sb-&gt;s_umount);</div><div class='add'>+	rwsem_assert_held_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 0; cnt &lt; MAXQUOTAS; cnt++) {</div><div class='ctx'> 		if (type != -1 &amp;&amp; cnt != type)</div><div class='hunk'>@@ -2537,7 +2563,7 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	dentry = lookup_positive_unlocked(qf_name, sb-&gt;s_root, strlen(qf_name));</div><div class='add'>+	dentry = lookup_noperm_positive_unlocked(&amp;QSTR(qf_name), sb-&gt;s_root);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='ctx'> 		return PTR_ERR(dentry);</div><div class='ctx'> </div><div class='hunk'>@@ -2572,7 +2598,8 @@ static int dquot_quota_enable(struct super_block *sb, unsigned int flags)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sb_has_quota_limits_enabled(sb, type)) {</div><div class='del'>-			ret = -EBUSY;</div><div class='add'>+			/* compatible with XFS */</div><div class='add'>+			ret = -EEXIST;</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock(&amp;dq_state_lock);</div><div class='hunk'>@@ -2586,9 +2613,6 @@ out_err:</div><div class='ctx'> 		if (flags &amp; qtype_enforce_flag(type))</div><div class='ctx'> 			dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);</div><div class='ctx'> 	}</div><div class='del'>-	/* Error code translation for better compatibility with XFS */</div><div class='del'>-	if (ret == -EBUSY)</div><div class='del'>-		ret = -EEXIST;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2702,6 +2726,7 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di)</div><div class='ctx'> 	struct mem_dqblk *dm = &amp;dquot-&gt;dq_dqb;</div><div class='ctx'> 	int check_blim = 0, check_ilim = 0;</div><div class='ctx'> 	struct mem_dqinfo *dqi = &amp;sb_dqopt(dquot-&gt;dq_sb)-&gt;info[dquot-&gt;dq_id.type];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;d_fieldmask &amp; ~VFS_QC_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2783,8 +2808,9 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di)</div><div class='ctx'> 	else</div><div class='ctx'> 		set_bit(DQ_FAKE_B, &amp;dquot-&gt;dq_flags);</div><div class='ctx'> 	spin_unlock(&amp;dquot-&gt;dq_dqb_lock);</div><div class='del'>-	mark_dquot_dirty(dquot);</div><div class='del'>-</div><div class='add'>+	ret = mark_dquot_dirty(dquot);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2887,7 +2913,7 @@ const struct quotactl_ops dquot_quotactl_sysfile_ops = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(dquot_quotactl_sysfile_ops);</div><div class='ctx'> </div><div class='del'>-static int do_proc_dqstats(struct ctl_table *table, int write,</div><div class='add'>+static int do_proc_dqstats(const struct ctl_table *table, int write,</div><div class='ctx'> 		     void *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int type = (unsigned long *)table-&gt;data - dqstats.stat;</div><div class='hunk'>@@ -2903,7 +2929,7 @@ static int do_proc_dqstats(struct ctl_table *table, int write,</div><div class='ctx'> 	return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ctl_table fs_dqstats_table[] = {</div><div class='add'>+static const struct ctl_table fs_dqstats_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.procname	= "lookups",</div><div class='ctx'> 		.data		= &amp;dqstats.stat[DQST_LOOKUPS],</div><div class='hunk'>@@ -2984,7 +3010,7 @@ static int __init dquot_init(void)</div><div class='ctx'> 	dquot_cachep = kmem_cache_create("dquot",</div><div class='ctx'> 			sizeof(struct dquot), sizeof(unsigned long) * 4,</div><div class='ctx'> 			(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-				SLAB_MEM_SPREAD|SLAB_PANIC),</div><div class='add'>+				SLAB_PANIC),</div><div class='ctx'> 			NULL);</div><div class='ctx'> </div><div class='ctx'> 	order = 0;</div><div class='hunk'>@@ -2992,11 +3018,10 @@ static int __init dquot_init(void)</div><div class='ctx'> 	if (!dquot_hash)</div><div class='ctx'> 		panic("Cannot create dquot hash table");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; _DQST_DQSTAT_LAST; i++) {</div><div class='del'>-		ret = percpu_counter_init(&amp;dqstats.counter[i], 0, GFP_KERNEL);</div><div class='del'>-		if (ret)</div><div class='del'>-			panic("Cannot create dquot stat counters");</div><div class='del'>-	}</div><div class='add'>+	ret = percpu_counter_init_many(dqstats.counter, 0, GFP_KERNEL,</div><div class='add'>+				       _DQST_DQSTAT_LAST);</div><div class='add'>+	if (ret)</div><div class='add'>+		panic("Cannot create dquot stat counters");</div><div class='ctx'> </div><div class='ctx'> 	/* Find power-of-two hlist_heads which can fit into allocation */</div><div class='ctx'> 	nr_hash = (1UL &lt;&lt; order) * PAGE_SIZE / sizeof(struct hlist_head);</div><div class='hunk'>@@ -3019,6 +3044,11 @@ static int __init dquot_init(void)</div><div class='ctx'> </div><div class='ctx'> 	shrinker_register(dqcache_shrinker);</div><div class='ctx'> </div><div class='add'>+	quota_unbound_wq = alloc_workqueue("quota_events_unbound",</div><div class='add'>+					   WQ_UNBOUND | WQ_MEM_RECLAIM, WQ_MAX_ACTIVE);</div><div class='add'>+	if (!quota_unbound_wq)</div><div class='add'>+		panic("Cannot create quota_unbound_wq\n");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> fs_initcall(dquot_init);</div><div class='head'>diff --git a/fs/quota/quota.c b/fs/quota/quota.c<br/>index 0e41fb84060f..7c2b75a44485 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/quota/quota.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/quota/quota.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/quota/quota.c</a></div><div class='hunk'>@@ -976,24 +976,22 @@ SYSCALL_DEFINE4(quotactl_fd, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	unsigned int cmds = cmd &gt;&gt; SUBCMDSHIFT;</div><div class='ctx'> 	unsigned int type = cmd &amp; SUBCMDMASK;</div><div class='del'>-	struct fd f;</div><div class='add'>+	CLASS(fd_raw, f)(fd);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	f = fdget_raw(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	ret = -EINVAL;</div><div class='ctx'> 	if (type &gt;= MAXQUOTAS)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (quotactl_cmd_write(cmds)) {</div><div class='del'>-		ret = mnt_want_write(f.file-&gt;f_path.mnt);</div><div class='add'>+		ret = mnt_want_write(fd_file(f)-&gt;f_path.mnt);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sb = f.file-&gt;f_path.mnt-&gt;mnt_sb;</div><div class='add'>+	sb = fd_file(f)-&gt;f_path.mnt-&gt;mnt_sb;</div><div class='ctx'> 	if (quotactl_cmd_onoff(cmds))</div><div class='ctx'> 		down_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1007,8 +1005,6 @@ SYSCALL_DEFINE4(quotactl_fd, unsigned int, fd, unsigned int, cmd,</div><div class='ctx'> 		up_read(&amp;sb-&gt;s_umount);</div><div class='ctx'> </div><div class='ctx'> 	if (quotactl_cmd_write(cmds))</div><div class='del'>-		mnt_drop_write(f.file-&gt;f_path.mnt);</div><div class='del'>-out:</div><div class='del'>-	fdput(f);</div><div class='add'>+		mnt_drop_write(fd_file(f)-&gt;f_path.mnt);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c<br/>index 0f1493e0f6d0..afceef3ddfaa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/quota/quota_tree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota_tree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/quota/quota_tree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/quota/quota_tree.c</a></div><div class='hunk'>@@ -21,6 +21,12 @@ MODULE_AUTHOR("Jan Kara");</div><div class='ctx'> MODULE_DESCRIPTION("Quota trie support");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Maximum quota tree depth we support. Only to limit recursion when working</div><div class='add'>+ * with the tree.</div><div class='add'>+ */</div><div class='add'>+#define MAX_QTREE_DEPTH 6</div><div class='add'>+</div><div class='ctx'> #define __QUOTA_QT_PARANOIA</div><div class='ctx'> </div><div class='ctx'> static int __get_index(struct qtree_mem_dqinfo *info, qid_t id, int depth)</div><div class='hunk'>@@ -108,7 +114,7 @@ static int check_dquot_block_header(struct qtree_mem_dqinfo *info,</div><div class='ctx'> /* Remove empty block from list and return it */</div><div class='ctx'> static int get_free_dqblk(struct qtree_mem_dqinfo *info)</div><div class='ctx'> {</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	struct qt_disk_dqdbheader *dh = (struct qt_disk_dqdbheader *)buf;</div><div class='ctx'> 	int ret, blk;</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +166,7 @@ static int put_free_dqblk(struct qtree_mem_dqinfo *info, char *buf, uint blk)</div><div class='ctx'> static int remove_free_dqentry(struct qtree_mem_dqinfo *info, char *buf,</div><div class='ctx'> 			       uint blk)</div><div class='ctx'> {</div><div class='del'>-	char *tmpbuf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *tmpbuf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	struct qt_disk_dqdbheader *dh = (struct qt_disk_dqdbheader *)buf;</div><div class='ctx'> 	uint nextblk = le32_to_cpu(dh-&gt;dqdh_next_free);</div><div class='ctx'> 	uint prevblk = le32_to_cpu(dh-&gt;dqdh_prev_free);</div><div class='hunk'>@@ -207,7 +213,7 @@ out_buf:</div><div class='ctx'> static int insert_free_dqentry(struct qtree_mem_dqinfo *info, char *buf,</div><div class='ctx'> 			       uint blk)</div><div class='ctx'> {</div><div class='del'>-	char *tmpbuf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *tmpbuf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	struct qt_disk_dqdbheader *dh = (struct qt_disk_dqdbheader *)buf;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +261,7 @@ static uint find_free_dqentry(struct qtree_mem_dqinfo *info,</div><div class='ctx'> {</div><div class='ctx'> 	uint blk, i;</div><div class='ctx'> 	struct qt_disk_dqdbheader *dh;</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	char *ddquot;</div><div class='ctx'> </div><div class='ctx'> 	*err = 0;</div><div class='hunk'>@@ -327,27 +333,36 @@ out_buf:</div><div class='ctx'> </div><div class='ctx'> /* Insert reference to structure into the trie */</div><div class='ctx'> static int do_insert_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,</div><div class='del'>-			  uint *treeblk, int depth)</div><div class='add'>+			  uint *blks, int depth)</div><div class='ctx'> {</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	int ret = 0, newson = 0, newact = 0;</div><div class='ctx'> 	__le32 *ref;</div><div class='ctx'> 	uint newblk;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!*treeblk) {</div><div class='add'>+	if (!blks[depth]) {</div><div class='ctx'> 		ret = get_free_dqblk(info);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_buf;</div><div class='del'>-		*treeblk = ret;</div><div class='add'>+		for (i = 0; i &lt; depth; i++)</div><div class='add'>+			if (ret == blks[i]) {</div><div class='add'>+				quota_error(dquot-&gt;dq_sb,</div><div class='add'>+					"Free block already used in tree: block %u",</div><div class='add'>+					ret);</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out_buf;</div><div class='add'>+			}</div><div class='add'>+		blks[depth] = ret;</div><div class='ctx'> 		memset(buf, 0, info-&gt;dqi_usable_bs);</div><div class='ctx'> 		newact = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = read_blk(info, *treeblk, buf);</div><div class='add'>+		ret = read_blk(info, blks[depth], buf);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			quota_error(dquot-&gt;dq_sb, "Can't read tree quota "</div><div class='del'>-				    "block %u", *treeblk);</div><div class='add'>+				    "block %u", blks[depth]);</div><div class='ctx'> 			goto out_buf;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -357,8 +372,20 @@ static int do_insert_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,</div><div class='ctx'> 			     info-&gt;dqi_blocks - 1);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_buf;</div><div class='del'>-	if (!newblk)</div><div class='add'>+	if (!newblk) {</div><div class='ctx'> 		newson = 1;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt;= depth; i++)</div><div class='add'>+			if (newblk == blks[i]) {</div><div class='add'>+				quota_error(dquot-&gt;dq_sb,</div><div class='add'>+					"Cycle in quota tree detected: block %u index %u",</div><div class='add'>+					blks[depth],</div><div class='add'>+					get_index(info, dquot-&gt;dq_id, depth));</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				goto out_buf;</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+	blks[depth + 1] = newblk;</div><div class='ctx'> 	if (depth == info-&gt;dqi_qtree_depth - 1) {</div><div class='ctx'> #ifdef __QUOTA_QT_PARANOIA</div><div class='ctx'> 		if (newblk) {</div><div class='hunk'>@@ -370,16 +397,16 @@ static int do_insert_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,</div><div class='ctx'> 			goto out_buf;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		newblk = find_free_dqentry(info, dquot, &amp;ret);</div><div class='add'>+		blks[depth + 1] = find_free_dqentry(info, dquot, &amp;ret);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = do_insert_tree(info, dquot, &amp;newblk, depth+1);</div><div class='add'>+		ret = do_insert_tree(info, dquot, blks, depth + 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (newson &amp;&amp; ret &gt;= 0) {</div><div class='ctx'> 		ref[get_index(info, dquot-&gt;dq_id, depth)] =</div><div class='del'>-							cpu_to_le32(newblk);</div><div class='del'>-		ret = write_blk(info, *treeblk, buf);</div><div class='add'>+						cpu_to_le32(blks[depth + 1]);</div><div class='add'>+		ret = write_blk(info, blks[depth], buf);</div><div class='ctx'> 	} else if (newact &amp;&amp; ret &lt; 0) {</div><div class='del'>-		put_free_dqblk(info, buf, *treeblk);</div><div class='add'>+		put_free_dqblk(info, buf, blks[depth]);</div><div class='ctx'> 	}</div><div class='ctx'> out_buf:</div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -390,7 +417,7 @@ out_buf:</div><div class='ctx'> static inline int dq_insert_tree(struct qtree_mem_dqinfo *info,</div><div class='ctx'> 				 struct dquot *dquot)</div><div class='ctx'> {</div><div class='del'>-	int tmp = QT_TREEOFF;</div><div class='add'>+	uint blks[MAX_QTREE_DEPTH] = { QT_TREEOFF };</div><div class='ctx'> </div><div class='ctx'> #ifdef __QUOTA_QT_PARANOIA</div><div class='ctx'> 	if (info-&gt;dqi_blocks &lt;= QT_TREEOFF) {</div><div class='hunk'>@@ -398,7 +425,11 @@ static inline int dq_insert_tree(struct qtree_mem_dqinfo *info,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	return do_insert_tree(info, dquot, &amp;tmp, 0);</div><div class='add'>+	if (info-&gt;dqi_qtree_depth &gt;= MAX_QTREE_DEPTH) {</div><div class='add'>+		quota_error(dquot-&gt;dq_sb, "Quota tree depth too big!");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return do_insert_tree(info, dquot, blks, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -410,7 +441,7 @@ int qtree_write_dquot(struct qtree_mem_dqinfo *info, struct dquot *dquot)</div><div class='ctx'> 	int type = dquot-&gt;dq_id.type;</div><div class='ctx'> 	struct super_block *sb = dquot-&gt;dq_sb;</div><div class='ctx'> 	ssize_t ret;</div><div class='del'>-	char *ddquot = kmalloc(info-&gt;dqi_entry_size, GFP_NOFS);</div><div class='add'>+	char *ddquot = kmalloc(info-&gt;dqi_entry_size, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!ddquot)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -449,7 +480,7 @@ static int free_dqentry(struct qtree_mem_dqinfo *info, struct dquot *dquot,</div><div class='ctx'> 			uint blk)</div><div class='ctx'> {</div><div class='ctx'> 	struct qt_disk_dqdbheader *dh;</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf)</div><div class='hunk'>@@ -511,19 +542,20 @@ out_buf:</div><div class='ctx'> </div><div class='ctx'> /* Remove reference to dquot from tree */</div><div class='ctx'> static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,</div><div class='del'>-		       uint *blk, int depth)</div><div class='add'>+		       uint *blks, int depth)</div><div class='ctx'> {</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	uint newblk;</div><div class='ctx'> 	__le32 *ref = (__le32 *)buf;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = read_blk(info, *blk, buf);</div><div class='add'>+	ret = read_blk(info, blks[depth], buf);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		quota_error(dquot-&gt;dq_sb, "Can't read quota data block %u",</div><div class='del'>-			    *blk);</div><div class='add'>+			    blks[depth]);</div><div class='ctx'> 		goto out_buf;</div><div class='ctx'> 	}</div><div class='ctx'> 	newblk = le32_to_cpu(ref[get_index(info, dquot-&gt;dq_id, depth)]);</div><div class='hunk'>@@ -532,29 +564,38 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_buf;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt;= depth; i++)</div><div class='add'>+		if (newblk == blks[i]) {</div><div class='add'>+			quota_error(dquot-&gt;dq_sb,</div><div class='add'>+				"Cycle in quota tree detected: block %u index %u",</div><div class='add'>+				blks[depth],</div><div class='add'>+				get_index(info, dquot-&gt;dq_id, depth));</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out_buf;</div><div class='add'>+		}</div><div class='ctx'> 	if (depth == info-&gt;dqi_qtree_depth - 1) {</div><div class='ctx'> 		ret = free_dqentry(info, dquot, newblk);</div><div class='del'>-		newblk = 0;</div><div class='add'>+		blks[depth + 1] = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = remove_tree(info, dquot, &amp;newblk, depth+1);</div><div class='add'>+		blks[depth + 1] = newblk;</div><div class='add'>+		ret = remove_tree(info, dquot, blks, depth + 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (ret &gt;= 0 &amp;&amp; !newblk) {</div><div class='del'>-		int i;</div><div class='add'>+	if (ret &gt;= 0 &amp;&amp; !blks[depth + 1]) {</div><div class='ctx'> 		ref[get_index(info, dquot-&gt;dq_id, depth)] = cpu_to_le32(0);</div><div class='ctx'> 		/* Block got empty? */</div><div class='ctx'> 		for (i = 0; i &lt; (info-&gt;dqi_usable_bs &gt;&gt; 2) &amp;&amp; !ref[i]; i++)</div><div class='ctx'> 			;</div><div class='ctx'> 		/* Don't put the root block into the free block list */</div><div class='ctx'> 		if (i == (info-&gt;dqi_usable_bs &gt;&gt; 2)</div><div class='del'>-		    &amp;&amp; *blk != QT_TREEOFF) {</div><div class='del'>-			put_free_dqblk(info, buf, *blk);</div><div class='del'>-			*blk = 0;</div><div class='add'>+		    &amp;&amp; blks[depth] != QT_TREEOFF) {</div><div class='add'>+			put_free_dqblk(info, buf, blks[depth]);</div><div class='add'>+			blks[depth] = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = write_blk(info, *blk, buf);</div><div class='add'>+			ret = write_blk(info, blks[depth], buf);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				quota_error(dquot-&gt;dq_sb,</div><div class='ctx'> 					    "Can't write quota tree block %u",</div><div class='del'>-					    *blk);</div><div class='add'>+					    blks[depth]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> out_buf:</div><div class='hunk'>@@ -565,11 +606,15 @@ out_buf:</div><div class='ctx'> /* Delete dquot from tree */</div><div class='ctx'> int qtree_delete_dquot(struct qtree_mem_dqinfo *info, struct dquot *dquot)</div><div class='ctx'> {</div><div class='del'>-	uint tmp = QT_TREEOFF;</div><div class='add'>+	uint blks[MAX_QTREE_DEPTH] = { QT_TREEOFF };</div><div class='ctx'> </div><div class='ctx'> 	if (!dquot-&gt;dq_off)	/* Even not allocated? */</div><div class='ctx'> 		return 0;</div><div class='del'>-	return remove_tree(info, dquot, &amp;tmp, 0);</div><div class='add'>+	if (info-&gt;dqi_qtree_depth &gt;= MAX_QTREE_DEPTH) {</div><div class='add'>+		quota_error(dquot-&gt;dq_sb, "Quota tree depth too big!");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return remove_tree(info, dquot, blks, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(qtree_delete_dquot);</div><div class='ctx'> </div><div class='hunk'>@@ -577,7 +622,7 @@ EXPORT_SYMBOL(qtree_delete_dquot);</div><div class='ctx'> static loff_t find_block_dqentry(struct qtree_mem_dqinfo *info,</div><div class='ctx'> 				 struct dquot *dquot, uint blk)</div><div class='ctx'> {</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	loff_t ret = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *ddquot;</div><div class='hunk'>@@ -613,18 +658,20 @@ out_buf:</div><div class='ctx'> </div><div class='ctx'> /* Find entry for given id in the tree */</div><div class='ctx'> static loff_t find_tree_dqentry(struct qtree_mem_dqinfo *info,</div><div class='del'>-				struct dquot *dquot, uint blk, int depth)</div><div class='add'>+				struct dquot *dquot, uint *blks, int depth)</div><div class='ctx'> {</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	loff_t ret = 0;</div><div class='ctx'> 	__le32 *ref = (__le32 *)buf;</div><div class='add'>+	uint blk;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	ret = read_blk(info, blk, buf);</div><div class='add'>+	ret = read_blk(info, blks[depth], buf);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		quota_error(dquot-&gt;dq_sb, "Can't read quota tree block %u",</div><div class='del'>-			    blk);</div><div class='add'>+			    blks[depth]);</div><div class='ctx'> 		goto out_buf;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -636,8 +683,19 @@ static loff_t find_tree_dqentry(struct qtree_mem_dqinfo *info,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_buf;</div><div class='ctx'> </div><div class='add'>+	/* Check for cycles in the tree */</div><div class='add'>+	for (i = 0; i &lt;= depth; i++)</div><div class='add'>+		if (blk == blks[i]) {</div><div class='add'>+			quota_error(dquot-&gt;dq_sb,</div><div class='add'>+				"Cycle in quota tree detected: block %u index %u",</div><div class='add'>+				blks[depth],</div><div class='add'>+				get_index(info, dquot-&gt;dq_id, depth));</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out_buf;</div><div class='add'>+		}</div><div class='add'>+	blks[depth + 1] = blk;</div><div class='ctx'> 	if (depth &lt; info-&gt;dqi_qtree_depth - 1)</div><div class='del'>-		ret = find_tree_dqentry(info, dquot, blk, depth+1);</div><div class='add'>+		ret = find_tree_dqentry(info, dquot, blks, depth + 1);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = find_block_dqentry(info, dquot, blk);</div><div class='ctx'> out_buf:</div><div class='hunk'>@@ -649,7 +707,13 @@ out_buf:</div><div class='ctx'> static inline loff_t find_dqentry(struct qtree_mem_dqinfo *info,</div><div class='ctx'> 				  struct dquot *dquot)</div><div class='ctx'> {</div><div class='del'>-	return find_tree_dqentry(info, dquot, QT_TREEOFF, 0);</div><div class='add'>+	uint blks[MAX_QTREE_DEPTH] = { QT_TREEOFF };</div><div class='add'>+</div><div class='add'>+	if (info-&gt;dqi_qtree_depth &gt;= MAX_QTREE_DEPTH) {</div><div class='add'>+		quota_error(dquot-&gt;dq_sb, "Quota tree depth too big!");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return find_tree_dqentry(info, dquot, blks, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qtree_read_dquot(struct qtree_mem_dqinfo *info, struct dquot *dquot)</div><div class='hunk'>@@ -684,7 +748,7 @@ int qtree_read_dquot(struct qtree_mem_dqinfo *info, struct dquot *dquot)</div><div class='ctx'> 		}</div><div class='ctx'> 		dquot-&gt;dq_off = offset;</div><div class='ctx'> 	}</div><div class='del'>-	ddquot = kmalloc(info-&gt;dqi_entry_size, GFP_NOFS);</div><div class='add'>+	ddquot = kmalloc(info-&gt;dqi_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!ddquot)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ret = sb-&gt;s_op-&gt;quota_read(sb, type, ddquot, info-&gt;dqi_entry_size,</div><div class='hunk'>@@ -728,7 +792,7 @@ EXPORT_SYMBOL(qtree_release_dquot);</div><div class='ctx'> static int find_next_id(struct qtree_mem_dqinfo *info, qid_t *id,</div><div class='ctx'> 			unsigned int blk, int depth)</div><div class='ctx'> {</div><div class='del'>-	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_NOFS);</div><div class='add'>+	char *buf = kmalloc(info-&gt;dqi_usable_bs, GFP_KERNEL);</div><div class='ctx'> 	__le32 *ref = (__le32 *)buf;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	unsigned int epb = info-&gt;dqi_usable_bs &gt;&gt; 2;</div><div class='head'>diff --git a/fs/quota/quota_v1.c b/fs/quota/quota_v1.c<br/>index a0db3f195e95..6f7f0b4afba9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/quota/quota_v1.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota_v1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/quota/quota_v1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/quota/quota_v1.c</a></div><div class='hunk'>@@ -160,9 +160,11 @@ static int v1_read_file_info(struct super_block *sb, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='ctx'> 	struct v1_disk_dqblk dqblk;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = sb-&gt;s_op-&gt;quota_read(sb, type, (char *)&amp;dqblk,</div><div class='ctx'> 				sizeof(struct v1_disk_dqblk), v1_dqoff(0));</div><div class='ctx'> 	if (ret != sizeof(struct v1_disk_dqblk)) {</div><div class='hunk'>@@ -179,6 +181,7 @@ static int v1_read_file_info(struct super_block *sb, int type)</div><div class='ctx'> 	dqopt-&gt;info[type].dqi_bgrace =</div><div class='ctx'> 			dqblk.dqb_btime ? dqblk.dqb_btime : MAX_DQ_TIME;</div><div class='ctx'> out:</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_read(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -187,9 +190,11 @@ static int v1_write_file_info(struct super_block *sb, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='ctx'> 	struct v1_disk_dqblk dqblk;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = sb-&gt;s_op-&gt;quota_read(sb, type, (char *)&amp;dqblk,</div><div class='ctx'> 				sizeof(struct v1_disk_dqblk), v1_dqoff(0));</div><div class='ctx'> 	if (ret != sizeof(struct v1_disk_dqblk)) {</div><div class='hunk'>@@ -209,6 +214,7 @@ static int v1_write_file_info(struct super_block *sb, int type)</div><div class='ctx'> 	else if (ret &gt;= 0)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> out:</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -229,7 +235,8 @@ static struct quota_format_type v1_quota_format = {</div><div class='ctx'> </div><div class='ctx'> static int __init init_v1_quota_format(void)</div><div class='ctx'> {</div><div class='del'>-        return register_quota_format(&amp;v1_quota_format);</div><div class='add'>+	register_quota_format(&amp;v1_quota_format);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_v1_quota_format(void)</div><div class='head'>diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c<br/>index ae99e7b88205..1fda93dcbc1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/quota/quota_v2.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/quota/quota_v2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/quota/quota_v2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/quota/quota_v2.c</a></div><div class='hunk'>@@ -96,9 +96,11 @@ static int v2_read_file_info(struct super_block *sb, int type)</div><div class='ctx'> 	struct qtree_mem_dqinfo *qinfo;</div><div class='ctx'> 	ssize_t size;</div><div class='ctx'> 	unsigned int version;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = v2_read_header(sb, type, &amp;dqhead);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -119,7 +121,7 @@ static int v2_read_file_info(struct super_block *sb, int type)</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	info-&gt;dqi_priv = kmalloc(sizeof(struct qtree_mem_dqinfo), GFP_NOFS);</div><div class='add'>+	info-&gt;dqi_priv = kmalloc(sizeof(struct qtree_mem_dqinfo), GFP_KERNEL);</div><div class='ctx'> 	if (!info-&gt;dqi_priv) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -166,14 +168,17 @@ static int v2_read_file_info(struct super_block *sb, int type)</div><div class='ctx'> 		    i_size_read(sb_dqopt(sb)-&gt;files[type]));</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	if (qinfo-&gt;dqi_free_blk &gt;= qinfo-&gt;dqi_blocks) {</div><div class='del'>-		quota_error(sb, "Free block number too big (%u &gt;= %u).",</div><div class='del'>-			    qinfo-&gt;dqi_free_blk, qinfo-&gt;dqi_blocks);</div><div class='add'>+	if (qinfo-&gt;dqi_free_blk &amp;&amp; (qinfo-&gt;dqi_free_blk &lt;= QT_TREEOFF ||</div><div class='add'>+	    qinfo-&gt;dqi_free_blk &gt;= qinfo-&gt;dqi_blocks)) {</div><div class='add'>+		quota_error(sb, "Free block number %u out of range (%u, %u).",</div><div class='add'>+			    qinfo-&gt;dqi_free_blk, QT_TREEOFF, qinfo-&gt;dqi_blocks);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	if (qinfo-&gt;dqi_free_entry &gt;= qinfo-&gt;dqi_blocks) {</div><div class='del'>-		quota_error(sb, "Block with free entry too big (%u &gt;= %u).",</div><div class='del'>-			    qinfo-&gt;dqi_free_entry, qinfo-&gt;dqi_blocks);</div><div class='add'>+	if (qinfo-&gt;dqi_free_entry &amp;&amp; (qinfo-&gt;dqi_free_entry &lt;= QT_TREEOFF ||</div><div class='add'>+	    qinfo-&gt;dqi_free_entry &gt;= qinfo-&gt;dqi_blocks)) {</div><div class='add'>+		quota_error(sb, "Block with free entry %u out of range (%u, %u).",</div><div class='add'>+			    qinfo-&gt;dqi_free_entry, QT_TREEOFF,</div><div class='add'>+			    qinfo-&gt;dqi_blocks);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -183,6 +188,7 @@ out_free:</div><div class='ctx'> 		info-&gt;dqi_priv = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_read(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -195,8 +201,10 @@ static int v2_write_file_info(struct super_block *sb, int type)</div><div class='ctx'> 	struct mem_dqinfo *info = &amp;dqopt-&gt;info[type];</div><div class='ctx'> 	struct qtree_mem_dqinfo *qinfo = info-&gt;dqi_priv;</div><div class='ctx'> 	ssize_t size;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	spin_lock(&amp;dq_data_lock);</div><div class='ctx'> 	info-&gt;dqi_flags &amp;= ~DQF_INFO_DIRTY;</div><div class='ctx'> 	dinfo.dqi_bgrace = cpu_to_le32(info-&gt;dqi_bgrace);</div><div class='hunk'>@@ -209,6 +217,7 @@ static int v2_write_file_info(struct super_block *sb, int type)</div><div class='ctx'> 	dinfo.dqi_free_entry = cpu_to_le32(qinfo-&gt;dqi_free_entry);</div><div class='ctx'> 	size = sb-&gt;s_op-&gt;quota_write(sb, type, (char *)&amp;dinfo,</div><div class='ctx'> 	       sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	if (size != sizeof(struct v2_disk_dqinfo)) {</div><div class='ctx'> 		quota_error(sb, "Can't write info structure");</div><div class='hunk'>@@ -328,11 +337,14 @@ static int v2_read_dquot(struct dquot *dquot)</div><div class='ctx'> {</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(dquot-&gt;dq_sb);</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = qtree_read_dquot(</div><div class='ctx'> 			sb_dqinfo(dquot-&gt;dq_sb, dquot-&gt;dq_id.type)-&gt;dqi_priv,</div><div class='ctx'> 			dquot);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_read(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -342,6 +354,7 @@ static int v2_write_dquot(struct dquot *dquot)</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(dquot-&gt;dq_sb);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool alloc = false;</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If space for dquot is already allocated, we don't need any</div><div class='hunk'>@@ -355,9 +368,11 @@ static int v2_write_dquot(struct dquot *dquot)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		down_read(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	}</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = qtree_write_dquot(</div><div class='ctx'> 			sb_dqinfo(dquot-&gt;dq_sb, dquot-&gt;dq_id.type)-&gt;dqi_priv,</div><div class='ctx'> 			dquot);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	if (alloc)</div><div class='ctx'> 		up_write(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -368,10 +383,13 @@ static int v2_write_dquot(struct dquot *dquot)</div><div class='ctx'> static int v2_release_dquot(struct dquot *dquot)</div><div class='ctx'> {</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(dquot-&gt;dq_sb);</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = qtree_release_dquot(sb_dqinfo(dquot-&gt;dq_sb, dquot-&gt;dq_id.type)-&gt;dqi_priv, dquot);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_write(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -386,10 +404,13 @@ static int v2_free_file_info(struct super_block *sb, int type)</div><div class='ctx'> static int v2_get_next_id(struct super_block *sb, struct kqid *qid)</div><div class='ctx'> {</div><div class='ctx'> 	struct quota_info *dqopt = sb_dqopt(sb);</div><div class='add'>+	unsigned int memalloc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;dqopt-&gt;dqio_sem);</div><div class='add'>+	memalloc = memalloc_nofs_save();</div><div class='ctx'> 	ret = qtree_get_next_id(sb_dqinfo(sb, qid-&gt;type)-&gt;dqi_priv, qid);</div><div class='add'>+	memalloc_nofs_restore(memalloc);</div><div class='ctx'> 	up_read(&amp;dqopt-&gt;dqio_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -419,12 +440,9 @@ static struct quota_format_type v2r1_quota_format = {</div><div class='ctx'> </div><div class='ctx'> static int __init init_v2_quota_format(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = register_quota_format(&amp;v2r0_quota_format);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	return register_quota_format(&amp;v2r1_quota_format);</div><div class='add'>+	register_quota_format(&amp;v2r0_quota_format);</div><div class='add'>+	register_quota_format(&amp;v2r1_quota_format);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_v2_quota_format(void)</div><div class='head'>diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c<br/>index c7a1aa3c882b..c3ed1c5117b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ramfs/file-mmu.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ramfs/file-mmu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ramfs/file-mmu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ramfs/file-mmu.c</a></div><div class='hunk'>@@ -35,13 +35,13 @@ static unsigned long ramfs_mmu_get_unmapped_area(struct file *file,</div><div class='ctx'> 		unsigned long addr, unsigned long len, unsigned long pgoff,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	return current-&gt;mm-&gt;get_unmapped_area(file, addr, len, pgoff, flags);</div><div class='add'>+	return mm_get_unmapped_area(file, addr, len, pgoff, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct file_operations ramfs_file_operations = {</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='ctx'> 	.write_iter	= generic_file_write_iter,</div><div class='del'>-	.mmap		= generic_file_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_mmap_prepare,</div><div class='ctx'> 	.fsync		= noop_fsync,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='ctx'> 	.splice_write	= iter_file_splice_write,</div><div class='head'>diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c<br/>index 7a6d980e614d..77b8ca2757e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ramfs/file-nommu.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ramfs/file-nommu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ramfs/file-nommu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ramfs/file-nommu.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@ static unsigned long ramfs_nommu_get_unmapped_area(struct file *file,</div><div class='ctx'> 						   unsigned long len,</div><div class='ctx'> 						   unsigned long pgoff,</div><div class='ctx'> 						   unsigned long flags);</div><div class='del'>-static int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='add'>+static int ramfs_nommu_mmap_prepare(struct vm_area_desc *desc);</div><div class='ctx'> </div><div class='ctx'> static unsigned ramfs_mmap_capabilities(struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -38,7 +38,7 @@ static unsigned ramfs_mmap_capabilities(struct file *file)</div><div class='ctx'> </div><div class='ctx'> const struct file_operations ramfs_file_operations = {</div><div class='ctx'> 	.mmap_capabilities	= ramfs_mmap_capabilities,</div><div class='del'>-	.mmap			= ramfs_nommu_mmap,</div><div class='add'>+	.mmap_prepare		= ramfs_nommu_mmap_prepare,</div><div class='ctx'> 	.get_unmapped_area	= ramfs_nommu_get_unmapped_area,</div><div class='ctx'> 	.read_iter		= generic_file_read_iter,</div><div class='ctx'> 	.write_iter		= generic_file_write_iter,</div><div class='hunk'>@@ -262,12 +262,12 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * set up a mapping for shared memory segments</div><div class='ctx'>  */</div><div class='del'>-static int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int ramfs_nommu_mmap_prepare(struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	if (!is_nommu_shared_mapping(vma-&gt;vm_flags))</div><div class='add'>+	if (!is_nommu_shared_mapping(desc-&gt;vm_flags))</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='del'>-	file_accessed(file);</div><div class='del'>-	vma-&gt;vm_ops = &amp;generic_file_vm_ops;</div><div class='add'>+	file_accessed(desc-&gt;file);</div><div class='add'>+	desc-&gt;vm_ops = &amp;generic_file_vm_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c<br/>index 4ac05a9e25bc..505d10a0cb36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/ramfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/ramfs/inode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/ramfs/inode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/ramfs/inode.c</a></div><div class='hunk'>@@ -102,21 +102,29 @@ ramfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	int error = -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	if (inode) {</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-		dget(dentry);	/* Extra count - pin the dentry in core */</div><div class='add'>+		error = security_inode_init_security(inode, dir,</div><div class='add'>+						     &amp;dentry-&gt;d_name, NULL,</div><div class='add'>+						     NULL);</div><div class='add'>+		if (error) {</div><div class='add'>+			iput(inode);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		d_make_persistent(dentry, inode);</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 		inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ramfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-		       struct dentry *dentry, umode_t mode)</div><div class='add'>+static struct dentry *ramfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='add'>+				 struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = ramfs_mknod(&amp;nop_mnt_idmap, dir, dentry, mode | S_IFDIR, 0);</div><div class='ctx'> 	if (!retval)</div><div class='ctx'> 		inc_nlink(dir);</div><div class='del'>-	return retval;</div><div class='add'>+	return ERR_PTR(retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ramfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='hunk'>@@ -134,15 +142,24 @@ static int ramfs_symlink(struct mnt_idmap *idmap, struct inode *dir,</div><div class='ctx'> 	inode = ramfs_get_inode(dir-&gt;i_sb, dir, S_IFLNK|S_IRWXUGO, 0);</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		int l = strlen(symname)+1;</div><div class='add'>+</div><div class='add'>+		error = security_inode_init_security(inode, dir,</div><div class='add'>+						     &amp;dentry-&gt;d_name, NULL,</div><div class='add'>+						     NULL);</div><div class='add'>+		if (error) {</div><div class='add'>+			iput(inode);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		error = page_symlink(inode, symname, l);</div><div class='ctx'> 		if (!error) {</div><div class='del'>-			d_instantiate(dentry, inode);</div><div class='del'>-			dget(dentry);</div><div class='add'>+			d_make_persistent(dentry, inode);</div><div class='ctx'> 			inode_set_mtime_to_ts(dir,</div><div class='ctx'> 					      inode_set_ctime_current(dir));</div><div class='ctx'> 		} else</div><div class='ctx'> 			iput(inode);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -150,12 +167,23 @@ static int ramfs_tmpfile(struct mnt_idmap *idmap,</div><div class='ctx'> 			 struct inode *dir, struct file *file, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	inode = ramfs_get_inode(dir-&gt;i_sb, dir, mode, 0);</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	error = security_inode_init_security(inode, dir,</div><div class='add'>+					     &amp;file_dentry(file)-&gt;d_name, NULL,</div><div class='add'>+					     NULL);</div><div class='add'>+	if (error) {</div><div class='add'>+		iput(inode);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	d_tmpfile(file, inode);</div><div class='del'>-	return finish_open_simple(file, 0);</div><div class='add'>+out:</div><div class='add'>+	return finish_open_simple(file, error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct inode_operations ramfs_dir_inode_operations = {</div><div class='hunk'>@@ -185,7 +213,7 @@ static int ramfs_show_options(struct seq_file *m, struct dentry *root)</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations ramfs_ops = {</div><div class='ctx'> 	.statfs		= simple_statfs,</div><div class='del'>-	.drop_inode	= generic_delete_inode,</div><div class='add'>+	.drop_inode	= inode_just_drop,</div><div class='ctx'> 	.show_options	= ramfs_show_options,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -239,6 +267,7 @@ static int ramfs_fill_super(struct super_block *sb, struct fs_context *fc)</div><div class='ctx'> 	sb-&gt;s_blocksize_bits	= PAGE_SHIFT;</div><div class='ctx'> 	sb-&gt;s_magic		= RAMFS_MAGIC;</div><div class='ctx'> 	sb-&gt;s_op		= &amp;ramfs_ops;</div><div class='add'>+	sb-&gt;s_d_flags		= DCACHE_DONTCACHE;</div><div class='ctx'> 	sb-&gt;s_time_gran		= 1;</div><div class='ctx'> </div><div class='ctx'> 	inode = ramfs_get_inode(sb, NULL, S_IFDIR | fsi-&gt;mount_opts.mode, 0);</div><div class='hunk'>@@ -282,7 +311,7 @@ int ramfs_init_fs_context(struct fs_context *fc)</div><div class='ctx'> void ramfs_kill_sb(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(sb-&gt;s_fs_info);</div><div class='del'>-	kill_litter_super(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type ramfs_fs_type = {</div><div class='head'>diff --git a/fs/read_write.c b/fs/read_write.c<br/>index d4c036e82b6c..833bae068770 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/read_write.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/read_write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/read_write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/read_write.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> const struct file_operations generic_ro_fops = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read_iter	= generic_file_read_iter,</div><div class='del'>-	.mmap		= generic_file_readonly_mmap,</div><div class='add'>+	.mmap_prepare	= generic_file_readonly_mmap_prepare,</div><div class='ctx'> 	.splice_read	= filemap_splice_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -36,22 +36,24 @@ EXPORT_SYMBOL(generic_ro_fops);</div><div class='ctx'> </div><div class='ctx'> static inline bool unsigned_offsets(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return file-&gt;f_mode &amp; FMODE_UNSIGNED_OFFSET;</div><div class='add'>+	return file-&gt;f_op-&gt;fop_flags &amp; FOP_UNSIGNED_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vfs_setpos - update the file offset for lseek</div><div class='add'>+ * vfs_setpos_cookie - update the file offset for lseek and reset cookie</div><div class='ctx'>  * @file:	file structure in question</div><div class='ctx'>  * @offset:	file offset to seek to</div><div class='ctx'>  * @maxsize:	maximum file size</div><div class='add'>+ * @cookie:	cookie to reset</div><div class='ctx'>  *</div><div class='del'>- * This is a low-level filesystem helper for updating the file offset to</div><div class='del'>- * the value specified by @offset if the given offset is valid and it is</div><div class='del'>- * not equal to the current file offset.</div><div class='add'>+ * Update the file offset to the value specified by @offset if the given</div><div class='add'>+ * offset is valid and it is not equal to the current file offset and</div><div class='add'>+ * reset the specified cookie to indicate that a seek happened.</div><div class='ctx'>  *</div><div class='ctx'>  * Return the specified offset on success and -EINVAL on invalid offset.</div><div class='ctx'>  */</div><div class='del'>-loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize)</div><div class='add'>+static loff_t vfs_setpos_cookie(struct file *file, loff_t offset,</div><div class='add'>+				loff_t maxsize, u64 *cookie)</div><div class='ctx'> {</div><div class='ctx'> 	if (offset &lt; 0 &amp;&amp; !unsigned_offsets(file))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -60,35 +62,48 @@ loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize)</div><div class='ctx'> </div><div class='ctx'> 	if (offset != file-&gt;f_pos) {</div><div class='ctx'> 		file-&gt;f_pos = offset;</div><div class='del'>-		file-&gt;f_version = 0;</div><div class='add'>+		if (cookie)</div><div class='add'>+			*cookie = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return offset;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(vfs_setpos);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * generic_file_llseek_size - generic llseek implementation for regular files</div><div class='del'>- * @file:	file structure to seek on</div><div class='add'>+ * vfs_setpos - update the file offset for lseek</div><div class='add'>+ * @file:	file structure in question</div><div class='ctx'>  * @offset:	file offset to seek to</div><div class='del'>- * @whence:	type of seek</div><div class='del'>- * @maxsize:	max size of this file in file system</div><div class='del'>- * @eof:	offset used for SEEK_END position</div><div class='add'>+ * @maxsize:	maximum file size</div><div class='ctx'>  *</div><div class='del'>- * This is a variant of generic_file_llseek that allows passing in a custom</div><div class='del'>- * maximum file size and a custom EOF position, for e.g. hashed directories</div><div class='add'>+ * This is a low-level filesystem helper for updating the file offset to</div><div class='add'>+ * the value specified by @offset if the given offset is valid and it is</div><div class='add'>+ * not equal to the current file offset.</div><div class='ctx'>  *</div><div class='del'>- * Synchronization:</div><div class='del'>- * SEEK_SET and SEEK_END are unsynchronized (but atomic on 64bit platforms)</div><div class='del'>- * SEEK_CUR is synchronized against other SEEK_CURs, but not read/writes.</div><div class='del'>- * read/writes behave like SEEK_SET against seeks.</div><div class='add'>+ * Return the specified offset on success and -EINVAL on invalid offset.</div><div class='ctx'>  */</div><div class='del'>-loff_t</div><div class='del'>-generic_file_llseek_size(struct file *file, loff_t offset, int whence,</div><div class='del'>-		loff_t maxsize, loff_t eof)</div><div class='add'>+loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize)</div><div class='add'>+{</div><div class='add'>+	return vfs_setpos_cookie(file, offset, maxsize, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vfs_setpos);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * must_set_pos - check whether f_pos has to be updated</div><div class='add'>+ * @file: file to seek on</div><div class='add'>+ * @offset: offset to use</div><div class='add'>+ * @whence: type of seek operation</div><div class='add'>+ * @eof: end of file</div><div class='add'>+ *</div><div class='add'>+ * Check whether f_pos needs to be updated and update @offset according</div><div class='add'>+ * to @whence.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if f_pos doesn't need to be updated, 1 if f_pos has to be</div><div class='add'>+ * updated, and negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int must_set_pos(struct file *file, loff_t *offset, int whence, loff_t eof)</div><div class='ctx'> {</div><div class='ctx'> 	switch (whence) {</div><div class='ctx'> 	case SEEK_END:</div><div class='del'>-		offset += eof;</div><div class='add'>+		*offset += eof;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEEK_CUR:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -97,23 +112,17 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,</div><div class='ctx'> 		 * f_pos value back to the file because a concurrent read(),</div><div class='ctx'> 		 * write() or lseek() might have altered it</div><div class='ctx'> 		 */</div><div class='del'>-		if (offset == 0)</div><div class='del'>-			return file-&gt;f_pos;</div><div class='del'>-		/*</div><div class='del'>-		 * f_lock protects against read/modify/write race with other</div><div class='del'>-		 * SEEK_CURs. Note that parallel writes and reads behave</div><div class='del'>-		 * like SEEK_SET.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;file-&gt;f_lock);</div><div class='del'>-		offset = vfs_setpos(file, file-&gt;f_pos + offset, maxsize);</div><div class='del'>-		spin_unlock(&amp;file-&gt;f_lock);</div><div class='del'>-		return offset;</div><div class='add'>+		if (*offset == 0) {</div><div class='add'>+			*offset = file-&gt;f_pos;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case SEEK_DATA:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In the generic case the entire file is data, so as long as</div><div class='ctx'> 		 * offset isn't at the end of the file then the offset is data.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((unsigned long long)offset &gt;= eof)</div><div class='add'>+		if ((unsigned long long)*offset &gt;= eof)</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEEK_HOLE:</div><div class='hunk'>@@ -121,23 +130,114 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,</div><div class='ctx'> 		 * There is a virtual hole at the end of the file, so as long as</div><div class='ctx'> 		 * offset isn't i_size or larger, return i_size.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((unsigned long long)offset &gt;= eof)</div><div class='add'>+		if ((unsigned long long)*offset &gt;= eof)</div><div class='ctx'> 			return -ENXIO;</div><div class='del'>-		offset = eof;</div><div class='add'>+		*offset = eof;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * generic_file_llseek_size - generic llseek implementation for regular files</div><div class='add'>+ * @file:	file structure to seek on</div><div class='add'>+ * @offset:	file offset to seek to</div><div class='add'>+ * @whence:	type of seek</div><div class='add'>+ * @maxsize:	max size of this file in file system</div><div class='add'>+ * @eof:	offset used for SEEK_END position</div><div class='add'>+ *</div><div class='add'>+ * This is a variant of generic_file_llseek that allows passing in a custom</div><div class='add'>+ * maximum file size and a custom EOF position, for e.g. hashed directories</div><div class='add'>+ *</div><div class='add'>+ * Synchronization:</div><div class='add'>+ * SEEK_SET and SEEK_END are unsynchronized (but atomic on 64bit platforms)</div><div class='add'>+ * SEEK_CUR is synchronized against other SEEK_CURs, but not read/writes.</div><div class='add'>+ * read/writes behave like SEEK_SET against seeks.</div><div class='add'>+ */</div><div class='add'>+loff_t</div><div class='add'>+generic_file_llseek_size(struct file *file, loff_t offset, int whence,</div><div class='add'>+		loff_t maxsize, loff_t eof)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = must_set_pos(file, &amp;offset, whence, eof);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return offset;</div><div class='add'>+</div><div class='add'>+	if (whence == SEEK_CUR) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the file requires locking via f_pos_lock we know</div><div class='add'>+		 * that mutual exclusion for SEEK_CUR on the same file</div><div class='add'>+		 * is guaranteed. If the file isn't locked, we take</div><div class='add'>+		 * f_lock to protect against f_pos races with other</div><div class='add'>+		 * SEEK_CURs.</div><div class='add'>+		 */</div><div class='add'>+		if (file_seek_cur_needs_f_lock(file)) {</div><div class='add'>+			guard(spinlock)(&amp;file-&gt;f_lock);</div><div class='add'>+			return vfs_setpos(file, file-&gt;f_pos + offset, maxsize);</div><div class='add'>+		}</div><div class='add'>+		return vfs_setpos(file, file-&gt;f_pos + offset, maxsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return vfs_setpos(file, offset, maxsize);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(generic_file_llseek_size);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * generic_llseek_cookie - versioned llseek implementation</div><div class='add'>+ * @file:	file structure to seek on</div><div class='add'>+ * @offset:	file offset to seek to</div><div class='add'>+ * @whence:	type of seek</div><div class='add'>+ * @cookie:	cookie to update</div><div class='add'>+ *</div><div class='add'>+ * See generic_file_llseek for a general description and locking assumptions.</div><div class='add'>+ *</div><div class='add'>+ * In contrast to generic_file_llseek, this function also resets a</div><div class='add'>+ * specified cookie to indicate a seek took place.</div><div class='add'>+ */</div><div class='add'>+loff_t generic_llseek_cookie(struct file *file, loff_t offset, int whence,</div><div class='add'>+			     u64 *cookie)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+	loff_t maxsize = inode-&gt;i_sb-&gt;s_maxbytes;</div><div class='add'>+	loff_t eof = i_size_read(inode);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!cookie))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Require that this is only used for directories that guarantee</div><div class='add'>+	 * synchronization between readdir and seek so that an update to</div><div class='add'>+	 * @cookie is correctly synchronized with concurrent readdir.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(!(file-&gt;f_mode &amp; FMODE_ATOMIC_POS)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = must_set_pos(file, &amp;offset, whence, eof);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return offset;</div><div class='add'>+</div><div class='add'>+	/* No need to hold f_lock because we know that f_pos_lock is held. */</div><div class='add'>+	if (whence == SEEK_CUR)</div><div class='add'>+		return vfs_setpos_cookie(file, file-&gt;f_pos + offset, maxsize, cookie);</div><div class='add'>+</div><div class='add'>+	return vfs_setpos_cookie(file, offset, maxsize, cookie);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(generic_llseek_cookie);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * generic_file_llseek - generic llseek implementation for regular files</div><div class='ctx'>  * @file:	file structure to seek on</div><div class='ctx'>  * @offset:	file offset to seek to</div><div class='ctx'>  * @whence:	type of seek</div><div class='ctx'>  *</div><div class='del'>- * This is a generic implemenation of -&gt;llseek useable for all normal local</div><div class='add'>+ * This is a generic implementation of -&gt;llseek useable for all normal local</div><div class='ctx'>  * filesystems.  It just updates the file offset to the value specified by</div><div class='ctx'>  * @offset and @whence.</div><div class='ctx'>  */</div><div class='hunk'>@@ -232,7 +332,9 @@ loff_t default_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	struct inode *inode = file_inode(file);</div><div class='ctx'> 	loff_t retval;</div><div class='ctx'> </div><div class='del'>-	inode_lock(inode);</div><div class='add'>+	retval = inode_lock_killable(inode);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> 	switch (whence) {</div><div class='ctx'> 		case SEEK_END:</div><div class='ctx'> 			offset += i_size_read(inode);</div><div class='hunk'>@@ -270,10 +372,8 @@ loff_t default_llseek(struct file *file, loff_t offset, int whence)</div><div class='ctx'> 	}</div><div class='ctx'> 	retval = -EINVAL;</div><div class='ctx'> 	if (offset &gt;= 0 || unsigned_offsets(file)) {</div><div class='del'>-		if (offset != file-&gt;f_pos) {</div><div class='add'>+		if (offset != file-&gt;f_pos)</div><div class='ctx'> 			file-&gt;f_pos = offset;</div><div class='del'>-			file-&gt;f_version = 0;</div><div class='del'>-		}</div><div class='ctx'> 		retval = offset;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -293,18 +393,17 @@ EXPORT_SYMBOL(vfs_llseek);</div><div class='ctx'> static off_t ksys_lseek(unsigned int fd, off_t offset, unsigned int whence)</div><div class='ctx'> {</div><div class='ctx'> 	off_t retval;</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	retval = -EINVAL;</div><div class='ctx'> 	if (whence &lt;= SEEK_MAX) {</div><div class='del'>-		loff_t res = vfs_llseek(f.file, offset, whence);</div><div class='add'>+		loff_t res = vfs_llseek(fd_file(f), offset, whence);</div><div class='ctx'> 		retval = res;</div><div class='ctx'> 		if (res != (loff_t)retval)</div><div class='ctx'> 			retval = -EOVERFLOW;	/* LFS: should only happen on 32 bit platforms */</div><div class='ctx'> 	}</div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -327,17 +426,16 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,</div><div class='ctx'> 		unsigned int, whence)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	loff_t offset;</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	retval = -EINVAL;</div><div class='ctx'> 	if (whence &gt; SEEK_MAX)</div><div class='del'>-		goto out_putf;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	offset = vfs_llseek(f.file, ((loff_t) offset_high &lt;&lt; 32) | offset_low,</div><div class='add'>+	offset = vfs_llseek(fd_file(f), ((loff_t) offset_high &lt;&lt; 32) | offset_low,</div><div class='ctx'> 			whence);</div><div class='ctx'> </div><div class='ctx'> 	retval = (int)offset;</div><div class='hunk'>@@ -346,8 +444,6 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,</div><div class='ctx'> 		if (!copy_to_user(result, &amp;offset, sizeof(offset)))</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 	}</div><div class='del'>-out_putf:</div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -392,7 +488,7 @@ static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo</div><div class='ctx'> 	kiocb.ki_pos = (ppos ? *ppos : 0);</div><div class='ctx'> 	iov_iter_ubuf(&amp;iter, ITER_DEST, buf, len);</div><div class='ctx'> </div><div class='del'>-	ret = call_read_iter(filp, &amp;kiocb, &amp;iter);</div><div class='add'>+	ret = filp-&gt;f_op-&gt;read_iter(&amp;kiocb, &amp;iter);</div><div class='ctx'> 	BUG_ON(ret == -EIOCBQUEUED);</div><div class='ctx'> 	if (ppos)</div><div class='ctx'> 		*ppos = kiocb.ki_pos;</div><div class='hunk'>@@ -494,7 +590,7 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t</div><div class='ctx'> 	kiocb.ki_pos = (ppos ? *ppos : 0);</div><div class='ctx'> 	iov_iter_ubuf(&amp;iter, ITER_SOURCE, (void __user *)buf, len);</div><div class='ctx'> </div><div class='del'>-	ret = call_write_iter(filp, &amp;kiocb, &amp;iter);</div><div class='add'>+	ret = filp-&gt;f_op-&gt;write_iter(&amp;kiocb, &amp;iter);</div><div class='ctx'> 	BUG_ON(ret == -EIOCBQUEUED);</div><div class='ctx'> 	if (ret &gt; 0 &amp;&amp; ppos)</div><div class='ctx'> 		*ppos = kiocb.ki_pos;</div><div class='hunk'>@@ -607,19 +703,18 @@ static inline loff_t *file_ppos(struct file *file)</div><div class='ctx'> </div><div class='ctx'> ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		loff_t pos, *ppos = file_ppos(f.file);</div><div class='add'>+	if (!fd_empty(f)) {</div><div class='add'>+		loff_t pos, *ppos = file_ppos(fd_file(f));</div><div class='ctx'> 		if (ppos) {</div><div class='ctx'> 			pos = *ppos;</div><div class='ctx'> 			ppos = &amp;pos;</div><div class='ctx'> 		}</div><div class='del'>-		ret = vfs_read(f.file, buf, count, ppos);</div><div class='add'>+		ret = vfs_read(fd_file(f), buf, count, ppos);</div><div class='ctx'> 		if (ret &gt;= 0 &amp;&amp; ppos)</div><div class='del'>-			f.file-&gt;f_pos = pos;</div><div class='del'>-		fdput_pos(f);</div><div class='add'>+			fd_file(f)-&gt;f_pos = pos;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -631,19 +726,18 @@ SYSCALL_DEFINE3(read, unsigned int, fd, char __user *, buf, size_t, count)</div><div class='ctx'> </div><div class='ctx'> ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		loff_t pos, *ppos = file_ppos(f.file);</div><div class='add'>+	if (!fd_empty(f)) {</div><div class='add'>+		loff_t pos, *ppos = file_ppos(fd_file(f));</div><div class='ctx'> 		if (ppos) {</div><div class='ctx'> 			pos = *ppos;</div><div class='ctx'> 			ppos = &amp;pos;</div><div class='ctx'> 		}</div><div class='del'>-		ret = vfs_write(f.file, buf, count, ppos);</div><div class='add'>+		ret = vfs_write(fd_file(f), buf, count, ppos);</div><div class='ctx'> 		if (ret &gt;= 0 &amp;&amp; ppos)</div><div class='del'>-			f.file-&gt;f_pos = pos;</div><div class='del'>-		fdput_pos(f);</div><div class='add'>+			fd_file(f)-&gt;f_pos = pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -658,21 +752,17 @@ SYSCALL_DEFINE3(write, unsigned int, fd, const char __user *, buf,</div><div class='ctx'> ssize_t ksys_pread64(unsigned int fd, char __user *buf, size_t count,</div><div class='ctx'> 		     loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='del'>-	ssize_t ret = -EBADF;</div><div class='del'>-</div><div class='ctx'> 	if (pos &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (f.file) {</div><div class='del'>-		ret = -ESPIPE;</div><div class='del'>-		if (f.file-&gt;f_mode &amp; FMODE_PREAD)</div><div class='del'>-			ret = vfs_read(f.file, buf, count, &amp;pos);</div><div class='del'>-		fdput(f);</div><div class='del'>-	}</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (fd_file(f)-&gt;f_mode &amp; FMODE_PREAD)</div><div class='add'>+		return vfs_read(fd_file(f), buf, count, &amp;pos);</div><div class='add'>+</div><div class='add'>+	return -ESPIPE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE4(pread64, unsigned int, fd, char __user *, buf,</div><div class='hunk'>@@ -692,21 +782,17 @@ COMPAT_SYSCALL_DEFINE5(pread64, unsigned int, fd, char __user *, buf,</div><div class='ctx'> ssize_t ksys_pwrite64(unsigned int fd, const char __user *buf,</div><div class='ctx'> 		      size_t count, loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='del'>-	ssize_t ret = -EBADF;</div><div class='del'>-</div><div class='ctx'> 	if (pos &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (f.file) {</div><div class='del'>-		ret = -ESPIPE;</div><div class='del'>-		if (f.file-&gt;f_mode &amp; FMODE_PWRITE)  </div><div class='del'>-			ret = vfs_write(f.file, buf, count, &amp;pos);</div><div class='del'>-		fdput(f);</div><div class='del'>-	}</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (fd_file(f)-&gt;f_mode &amp; FMODE_PWRITE)</div><div class='add'>+		return vfs_write(fd_file(f), buf, count, &amp;pos);</div><div class='add'>+</div><div class='add'>+	return -ESPIPE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SYSCALL_DEFINE4(pwrite64, unsigned int, fd, const char __user *, buf,</div><div class='hunk'>@@ -730,15 +816,15 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter,</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	init_sync_kiocb(&amp;kiocb, filp);</div><div class='del'>-	ret = kiocb_set_rw_flags(&amp;kiocb, flags);</div><div class='add'>+	ret = kiocb_set_rw_flags(&amp;kiocb, flags, type);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	kiocb.ki_pos = (ppos ? *ppos : 0);</div><div class='ctx'> </div><div class='ctx'> 	if (type == READ)</div><div class='del'>-		ret = call_read_iter(filp, &amp;kiocb, iter);</div><div class='add'>+		ret = filp-&gt;f_op-&gt;read_iter(&amp;kiocb, iter);</div><div class='ctx'> 	else</div><div class='del'>-		ret = call_write_iter(filp, &amp;kiocb, iter);</div><div class='add'>+		ret = filp-&gt;f_op-&gt;write_iter(&amp;kiocb, iter);</div><div class='ctx'> 	BUG_ON(ret == -EIOCBQUEUED);</div><div class='ctx'> 	if (ppos)</div><div class='ctx'> 		*ppos = kiocb.ki_pos;</div><div class='hunk'>@@ -799,7 +885,7 @@ ssize_t vfs_iocb_iter_read(struct file *file, struct kiocb *iocb,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = call_read_iter(file, iocb, iter);</div><div class='add'>+	ret = file-&gt;f_op-&gt;read_iter(iocb, iter);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret &gt;= 0)</div><div class='ctx'> 		fsnotify_access(file);</div><div class='hunk'>@@ -860,7 +946,7 @@ ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	kiocb_start_write(iocb);</div><div class='del'>-	ret = call_write_iter(file, iocb, iter);</div><div class='add'>+	ret = file-&gt;f_op-&gt;write_iter(iocb, iter);</div><div class='ctx'> 	if (ret != -EIOCBQUEUED)</div><div class='ctx'> 		kiocb_end_write(iocb);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -982,19 +1068,18 @@ out:</div><div class='ctx'> static ssize_t do_readv(unsigned long fd, const struct iovec __user *vec,</div><div class='ctx'> 			unsigned long vlen, rwf_t flags)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		loff_t pos, *ppos = file_ppos(f.file);</div><div class='add'>+	if (!fd_empty(f)) {</div><div class='add'>+		loff_t pos, *ppos = file_ppos(fd_file(f));</div><div class='ctx'> 		if (ppos) {</div><div class='ctx'> 			pos = *ppos;</div><div class='ctx'> 			ppos = &amp;pos;</div><div class='ctx'> 		}</div><div class='del'>-		ret = vfs_readv(f.file, vec, vlen, ppos, flags);</div><div class='add'>+		ret = vfs_readv(fd_file(f), vec, vlen, ppos, flags);</div><div class='ctx'> 		if (ret &gt;= 0 &amp;&amp; ppos)</div><div class='del'>-			f.file-&gt;f_pos = pos;</div><div class='del'>-		fdput_pos(f);</div><div class='add'>+			fd_file(f)-&gt;f_pos = pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -1006,19 +1091,18 @@ static ssize_t do_readv(unsigned long fd, const struct iovec __user *vec,</div><div class='ctx'> static ssize_t do_writev(unsigned long fd, const struct iovec __user *vec,</div><div class='ctx'> 			 unsigned long vlen, rwf_t flags)</div><div class='ctx'> {</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='del'>-	if (f.file) {</div><div class='del'>-		loff_t pos, *ppos = file_ppos(f.file);</div><div class='add'>+	if (!fd_empty(f)) {</div><div class='add'>+		loff_t pos, *ppos = file_ppos(fd_file(f));</div><div class='ctx'> 		if (ppos) {</div><div class='ctx'> 			pos = *ppos;</div><div class='ctx'> 			ppos = &amp;pos;</div><div class='ctx'> 		}</div><div class='del'>-		ret = vfs_writev(f.file, vec, vlen, ppos, flags);</div><div class='add'>+		ret = vfs_writev(fd_file(f), vec, vlen, ppos, flags);</div><div class='ctx'> 		if (ret &gt;= 0 &amp;&amp; ppos)</div><div class='del'>-			f.file-&gt;f_pos = pos;</div><div class='del'>-		fdput_pos(f);</div><div class='add'>+			fd_file(f)-&gt;f_pos = pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -1036,18 +1120,16 @@ static inline loff_t pos_from_hilo(unsigned long high, unsigned long low)</div><div class='ctx'> static ssize_t do_preadv(unsigned long fd, const struct iovec __user *vec,</div><div class='ctx'> 			 unsigned long vlen, loff_t pos, rwf_t flags)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	if (pos &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (f.file) {</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (!fd_empty(f)) {</div><div class='ctx'> 		ret = -ESPIPE;</div><div class='del'>-		if (f.file-&gt;f_mode &amp; FMODE_PREAD)</div><div class='del'>-			ret = vfs_readv(f.file, vec, vlen, &amp;pos, flags);</div><div class='del'>-		fdput(f);</div><div class='add'>+		if (fd_file(f)-&gt;f_mode &amp; FMODE_PREAD)</div><div class='add'>+			ret = vfs_readv(fd_file(f), vec, vlen, &amp;pos, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -1059,18 +1141,16 @@ static ssize_t do_preadv(unsigned long fd, const struct iovec __user *vec,</div><div class='ctx'> static ssize_t do_pwritev(unsigned long fd, const struct iovec __user *vec,</div><div class='ctx'> 			  unsigned long vlen, loff_t pos, rwf_t flags)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='ctx'> 	if (pos &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = fdget(fd);</div><div class='del'>-	if (f.file) {</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='add'>+	if (!fd_empty(f)) {</div><div class='ctx'> 		ret = -ESPIPE;</div><div class='del'>-		if (f.file-&gt;f_mode &amp; FMODE_PWRITE)</div><div class='del'>-			ret = vfs_writev(f.file, vec, vlen, &amp;pos, flags);</div><div class='del'>-		fdput(f);</div><div class='add'>+		if (fd_file(f)-&gt;f_mode &amp; FMODE_PWRITE)</div><div class='add'>+			ret = vfs_writev(fd_file(f), vec, vlen, &amp;pos, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -1222,7 +1302,6 @@ COMPAT_SYSCALL_DEFINE6(pwritev2, compat_ulong_t, fd,</div><div class='ctx'> static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,</div><div class='ctx'> 			   size_t count, loff_t max)</div><div class='ctx'> {</div><div class='del'>-	struct fd in, out;</div><div class='ctx'> 	struct inode *in_inode, *out_inode;</div><div class='ctx'> 	struct pipe_inode_info *opipe;</div><div class='ctx'> 	loff_t pos;</div><div class='hunk'>@@ -1233,46 +1312,42 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get input file, and verify that it is ok..</div><div class='ctx'> 	 */</div><div class='del'>-	retval = -EBADF;</div><div class='del'>-	in = fdget(in_fd);</div><div class='del'>-	if (!in.file)</div><div class='del'>-		goto out;</div><div class='del'>-	if (!(in.file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-		goto fput_in;</div><div class='del'>-	retval = -ESPIPE;</div><div class='add'>+	CLASS(fd, in)(in_fd);</div><div class='add'>+	if (fd_empty(in))</div><div class='add'>+		return -EBADF;</div><div class='add'>+	if (!(fd_file(in)-&gt;f_mode &amp; FMODE_READ))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> 	if (!ppos) {</div><div class='del'>-		pos = in.file-&gt;f_pos;</div><div class='add'>+		pos = fd_file(in)-&gt;f_pos;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pos = *ppos;</div><div class='del'>-		if (!(in.file-&gt;f_mode &amp; FMODE_PREAD))</div><div class='del'>-			goto fput_in;</div><div class='add'>+		if (!(fd_file(in)-&gt;f_mode &amp; FMODE_PREAD))</div><div class='add'>+			return -ESPIPE;</div><div class='ctx'> 	}</div><div class='del'>-	retval = rw_verify_area(READ, in.file, &amp;pos, count);</div><div class='add'>+	retval = rw_verify_area(READ, fd_file(in), &amp;pos, count);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='del'>-		goto fput_in;</div><div class='add'>+		return retval;</div><div class='ctx'> 	if (count &gt; MAX_RW_COUNT)</div><div class='ctx'> 		count =  MAX_RW_COUNT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get output file, and verify that it is ok..</div><div class='ctx'> 	 */</div><div class='del'>-	retval = -EBADF;</div><div class='del'>-	out = fdget(out_fd);</div><div class='del'>-	if (!out.file)</div><div class='del'>-		goto fput_in;</div><div class='del'>-	if (!(out.file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-		goto fput_out;</div><div class='del'>-	in_inode = file_inode(in.file);</div><div class='del'>-	out_inode = file_inode(out.file);</div><div class='del'>-	out_pos = out.file-&gt;f_pos;</div><div class='add'>+	CLASS(fd, out)(out_fd);</div><div class='add'>+	if (fd_empty(out))</div><div class='add'>+		return -EBADF;</div><div class='add'>+	if (!(fd_file(out)-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		return -EBADF;</div><div class='add'>+	in_inode = file_inode(fd_file(in));</div><div class='add'>+	out_inode = file_inode(fd_file(out));</div><div class='add'>+	out_pos = fd_file(out)-&gt;f_pos;</div><div class='ctx'> </div><div class='ctx'> 	if (!max)</div><div class='ctx'> 		max = min(in_inode-&gt;i_sb-&gt;s_maxbytes, out_inode-&gt;i_sb-&gt;s_maxbytes);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(pos + count &gt; max)) {</div><div class='del'>-		retval = -EOVERFLOW;</div><div class='ctx'> 		if (pos &gt;= max)</div><div class='del'>-			goto fput_out;</div><div class='add'>+			return -EOVERFLOW;</div><div class='ctx'> 		count = max - pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1284,45 +1359,39 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,</div><div class='ctx'> 	 * and the application is arguably buggy if it doesn't expect</div><div class='ctx'> 	 * EAGAIN on a non-blocking file descriptor.</div><div class='ctx'> 	 */</div><div class='del'>-	if (in.file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='add'>+	if (fd_file(in)-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 		fl = SPLICE_F_NONBLOCK;</div><div class='ctx'> #endif</div><div class='del'>-	opipe = get_pipe_info(out.file, true);</div><div class='add'>+	opipe = get_pipe_info(fd_file(out), true);</div><div class='ctx'> 	if (!opipe) {</div><div class='del'>-		retval = rw_verify_area(WRITE, out.file, &amp;out_pos, count);</div><div class='add'>+		retval = rw_verify_area(WRITE, fd_file(out), &amp;out_pos, count);</div><div class='ctx'> 		if (retval &lt; 0)</div><div class='del'>-			goto fput_out;</div><div class='del'>-		retval = do_splice_direct(in.file, &amp;pos, out.file, &amp;out_pos,</div><div class='add'>+			return retval;</div><div class='add'>+		retval = do_splice_direct(fd_file(in), &amp;pos, fd_file(out), &amp;out_pos,</div><div class='ctx'> 					  count, fl);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (out.file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='add'>+		if (fd_file(out)-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 			fl |= SPLICE_F_NONBLOCK;</div><div class='ctx'> </div><div class='del'>-		retval = splice_file_to_pipe(in.file, opipe, &amp;pos, count, fl);</div><div class='add'>+		retval = splice_file_to_pipe(fd_file(in), opipe, &amp;pos, count, fl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (retval &gt; 0) {</div><div class='ctx'> 		add_rchar(current, retval);</div><div class='ctx'> 		add_wchar(current, retval);</div><div class='del'>-		fsnotify_access(in.file);</div><div class='del'>-		fsnotify_modify(out.file);</div><div class='del'>-		out.file-&gt;f_pos = out_pos;</div><div class='add'>+		fsnotify_access(fd_file(in));</div><div class='add'>+		fsnotify_modify(fd_file(out));</div><div class='add'>+		fd_file(out)-&gt;f_pos = out_pos;</div><div class='ctx'> 		if (ppos)</div><div class='ctx'> 			*ppos = pos;</div><div class='ctx'> 		else</div><div class='del'>-			in.file-&gt;f_pos = pos;</div><div class='add'>+			fd_file(in)-&gt;f_pos = pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inc_syscr(current);</div><div class='ctx'> 	inc_syscw(current);</div><div class='ctx'> 	if (pos &gt; max)</div><div class='ctx'> 		retval = -EOVERFLOW;</div><div class='del'>-</div><div class='del'>-fput_out:</div><div class='del'>-	fdput(out);</div><div class='del'>-fput_in:</div><div class='del'>-	fdput(in);</div><div class='del'>-out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1507,6 +1576,13 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Make sure return value doesn't overflow in 32bit compat mode.  Also</div><div class='add'>+	 * limit the size for all cases except when calling -&gt;copy_file_range().</div><div class='add'>+	 */</div><div class='add'>+	if (splice || !file_out-&gt;f_op-&gt;copy_file_range || in_compat_syscall())</div><div class='add'>+		len = min_t(size_t, MAX_RW_COUNT, len);</div><div class='add'>+</div><div class='ctx'> 	file_start_write(file_out);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1520,9 +1596,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 						      len, flags);</div><div class='ctx'> 	} else if (!splice &amp;&amp; file_in-&gt;f_op-&gt;remap_file_range &amp;&amp; samesb) {</div><div class='ctx'> 		ret = file_in-&gt;f_op-&gt;remap_file_range(file_in, pos_in,</div><div class='del'>-				file_out, pos_out,</div><div class='del'>-				min_t(loff_t, MAX_RW_COUNT, len),</div><div class='del'>-				REMAP_FILE_CAN_SHORTEN);</div><div class='add'>+				file_out, pos_out, len, REMAP_FILE_CAN_SHORTEN);</div><div class='ctx'> 		/* fallback to splice */</div><div class='ctx'> 		if (ret &lt;= 0)</div><div class='ctx'> 			splice = true;</div><div class='hunk'>@@ -1555,8 +1629,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	 * to splicing from input file, while file_start_write() is held on</div><div class='ctx'> 	 * the output file on a different sb.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = do_splice_direct(file_in, &amp;pos_in, file_out, &amp;pos_out,</div><div class='del'>-			       min_t(size_t, len, MAX_RW_COUNT), 0);</div><div class='add'>+	ret = do_splice_direct(file_in, &amp;pos_in, file_out, &amp;pos_out, len, 0);</div><div class='ctx'> done:</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='ctx'> 		fsnotify_access(file_in);</div><div class='hunk'>@@ -1578,38 +1651,34 @@ SYSCALL_DEFINE6(copy_file_range, int, fd_in, loff_t __user *, off_in,</div><div class='ctx'> {</div><div class='ctx'> 	loff_t pos_in;</div><div class='ctx'> 	loff_t pos_out;</div><div class='del'>-	struct fd f_in;</div><div class='del'>-	struct fd f_out;</div><div class='ctx'> 	ssize_t ret = -EBADF;</div><div class='ctx'> </div><div class='del'>-	f_in = fdget(fd_in);</div><div class='del'>-	if (!f_in.file)</div><div class='del'>-		goto out2;</div><div class='add'>+	CLASS(fd, f_in)(fd_in);</div><div class='add'>+	if (fd_empty(f_in))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	f_out = fdget(fd_out);</div><div class='del'>-	if (!f_out.file)</div><div class='del'>-		goto out1;</div><div class='add'>+	CLASS(fd, f_out)(fd_out);</div><div class='add'>+	if (fd_empty(f_out))</div><div class='add'>+		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	ret = -EFAULT;</div><div class='ctx'> 	if (off_in) {</div><div class='ctx'> 		if (copy_from_user(&amp;pos_in, off_in, sizeof(loff_t)))</div><div class='del'>-			goto out;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	} else {</div><div class='del'>-		pos_in = f_in.file-&gt;f_pos;</div><div class='add'>+		pos_in = fd_file(f_in)-&gt;f_pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (off_out) {</div><div class='ctx'> 		if (copy_from_user(&amp;pos_out, off_out, sizeof(loff_t)))</div><div class='del'>-			goto out;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	} else {</div><div class='del'>-		pos_out = f_out.file-&gt;f_pos;</div><div class='add'>+		pos_out = fd_file(f_out)-&gt;f_pos;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = -EINVAL;</div><div class='ctx'> 	if (flags != 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = vfs_copy_file_range(f_in.file, pos_in, f_out.file, pos_out, len,</div><div class='add'>+	ret = vfs_copy_file_range(fd_file(f_in), pos_in, fd_file(f_out), pos_out, len,</div><div class='ctx'> 				  flags);</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='ctx'> 		pos_in += ret;</div><div class='hunk'>@@ -1619,22 +1688,16 @@ SYSCALL_DEFINE6(copy_file_range, int, fd_in, loff_t __user *, off_in,</div><div class='ctx'> 			if (copy_to_user(off_in, &amp;pos_in, sizeof(loff_t)))</div><div class='ctx'> 				ret = -EFAULT;</div><div class='ctx'> 		} else {</div><div class='del'>-			f_in.file-&gt;f_pos = pos_in;</div><div class='add'>+			fd_file(f_in)-&gt;f_pos = pos_in;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (off_out) {</div><div class='ctx'> 			if (copy_to_user(off_out, &amp;pos_out, sizeof(loff_t)))</div><div class='ctx'> 				ret = -EFAULT;</div><div class='ctx'> 		} else {</div><div class='del'>-			f_out.file-&gt;f_pos = pos_out;</div><div class='add'>+			fd_file(f_out)-&gt;f_pos = pos_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	fdput(f_out);</div><div class='del'>-out1:</div><div class='del'>-	fdput(f_in);</div><div class='del'>-out2:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1667,6 +1730,7 @@ int generic_write_check_limits(struct file *file, loff_t pos, loff_t *count)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(generic_write_check_limits);</div><div class='ctx'> </div><div class='ctx'> /* Like generic_write_checks(), but takes size of write instead of iter. */</div><div class='ctx'> int generic_write_checks_count(struct kiocb *iocb, loff_t *count)</div><div class='hunk'>@@ -1685,7 +1749,7 @@ int generic_write_checks_count(struct kiocb *iocb, loff_t *count)</div><div class='ctx'> </div><div class='ctx'> 	if ((iocb-&gt;ki_flags &amp; IOCB_NOWAIT) &amp;&amp;</div><div class='ctx'> 	    !((iocb-&gt;ki_flags &amp; IOCB_DIRECT) ||</div><div class='del'>-	      (file-&gt;f_mode &amp; FMODE_BUF_WASYNC)))</div><div class='add'>+	      (file-&gt;f_op-&gt;fop_flags &amp; FOP_BUFFER_WASYNC)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return generic_write_check_limits(iocb-&gt;ki_filp, iocb-&gt;ki_pos, count);</div><div class='hunk'>@@ -1735,3 +1799,23 @@ int generic_file_rw_checks(struct file *file_in, struct file *file_out)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int generic_atomic_write_valid(struct kiocb *iocb, struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	size_t len = iov_iter_count(iter);</div><div class='add'>+</div><div class='add'>+	if (!iter_is_ubuf(iter))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!is_power_of_2(len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!IS_ALIGNED(iocb-&gt;ki_pos, len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(iocb-&gt;ki_flags &amp; IOCB_DIRECT))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(generic_atomic_write_valid);</div><div class='head'>diff --git a/fs/readdir.c b/fs/readdir.c<br/>index 278bc0254732..7764b8638978 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/readdir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/readdir.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/readdir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/readdir.c</a></div><div class='hunk'>@@ -22,8 +22,6 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Some filesystems were never converted to '-&gt;iterate_shared()'</div><div class='ctx'>  * and their directory iterators want the inode lock held for</div><div class='hunk'>@@ -72,7 +70,7 @@ int wrap_directory_iterator(struct file *file,</div><div class='ctx'> EXPORT_SYMBOL(wrap_directory_iterator);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Note the "unsafe_put_user() semantics: we goto a</div><div class='add'>+ * Note the "unsafe_put_user()" semantics: we goto a</div><div class='ctx'>  * label for errors.</div><div class='ctx'>  */</div><div class='ctx'> #define unsafe_copy_dirent_name(_dst, _src, _len, label) do {	\</div><div class='hunk'>@@ -221,20 +219,20 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,</div><div class='ctx'> 		struct old_linux_dirent __user *, dirent, unsigned int, count)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	struct readdir_callback buf = {</div><div class='ctx'> 		.ctx.actor = fillonedir,</div><div class='add'>+		.ctx.count = 1, /* Hint to fs: just one entry. */</div><div class='ctx'> 		.dirent = dirent</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = iterate_dir(f.file, &amp;buf.ctx);</div><div class='add'>+	error = iterate_dir(fd_file(f), &amp;buf.ctx);</div><div class='ctx'> 	if (buf.result)</div><div class='ctx'> 		error = buf.result;</div><div class='ctx'> </div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +253,6 @@ struct getdents_callback {</div><div class='ctx'> 	struct dir_context ctx;</div><div class='ctx'> 	struct linux_dirent __user * current_dir;</div><div class='ctx'> 	int prev_reclen;</div><div class='del'>-	int count;</div><div class='ctx'> 	int error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -269,12 +266,16 @@ static bool filldir(struct dir_context *ctx, const char *name, int namlen,</div><div class='ctx'> 	int reclen = ALIGN(offsetof(struct linux_dirent, d_name) + namlen + 2,</div><div class='ctx'> 		sizeof(long));</div><div class='ctx'> 	int prev_reclen;</div><div class='add'>+	unsigned int flags = d_type;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(FILLDIR_FLAG_NOINTR &amp; S_DT_MASK);</div><div class='add'>+	d_type &amp;= S_DT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;error = verify_dirent_name(name, namlen);</div><div class='ctx'> 	if (unlikely(buf-&gt;error))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	buf-&gt;error = -EINVAL;	/* only used if we fail.. */</div><div class='del'>-	if (reclen &gt; buf-&gt;count)</div><div class='add'>+	if (reclen &gt; ctx-&gt;count)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	d_ino = ino;</div><div class='ctx'> 	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino) {</div><div class='hunk'>@@ -282,7 +283,7 @@ static bool filldir(struct dir_context *ctx, const char *name, int namlen,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	prev_reclen = buf-&gt;prev_reclen;</div><div class='del'>-	if (prev_reclen &amp;&amp; signal_pending(current))</div><div class='add'>+	if (!(flags &amp; FILLDIR_FLAG_NOINTR) &amp;&amp; prev_reclen &amp;&amp; signal_pending(current))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	dirent = buf-&gt;current_dir;</div><div class='ctx'> 	prev = (void __user *) dirent - prev_reclen;</div><div class='hunk'>@@ -299,7 +300,7 @@ static bool filldir(struct dir_context *ctx, const char *name, int namlen,</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;current_dir = (void __user *)dirent + reclen;</div><div class='ctx'> 	buf-&gt;prev_reclen = reclen;</div><div class='del'>-	buf-&gt;count -= reclen;</div><div class='add'>+	ctx-&gt;count -= reclen;</div><div class='ctx'> 	return true;</div><div class='ctx'> efault_end:</div><div class='ctx'> 	user_write_access_end();</div><div class='hunk'>@@ -311,19 +312,18 @@ efault:</div><div class='ctx'> SYSCALL_DEFINE3(getdents, unsigned int, fd,</div><div class='ctx'> 		struct linux_dirent __user *, dirent, unsigned int, count)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	struct getdents_callback buf = {</div><div class='ctx'> 		.ctx.actor = filldir,</div><div class='del'>-		.count = count,</div><div class='add'>+		.ctx.count = count,</div><div class='ctx'> 		.current_dir = dirent</div><div class='ctx'> 	};</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	f = fdget_pos(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = iterate_dir(f.file, &amp;buf.ctx);</div><div class='add'>+	error = iterate_dir(fd_file(f), &amp;buf.ctx);</div><div class='ctx'> 	if (error &gt;= 0)</div><div class='ctx'> 		error = buf.error;</div><div class='ctx'> 	if (buf.prev_reclen) {</div><div class='hunk'>@@ -333,9 +333,8 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,</div><div class='ctx'> 		if (put_user(buf.ctx.pos, &amp;lastdirent-&gt;d_off))</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			error = count - buf.count;</div><div class='add'>+			error = count - buf.ctx.count;</div><div class='ctx'> 	}</div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -343,7 +342,6 @@ struct getdents_callback64 {</div><div class='ctx'> 	struct dir_context ctx;</div><div class='ctx'> 	struct linux_dirent64 __user * current_dir;</div><div class='ctx'> 	int prev_reclen;</div><div class='del'>-	int count;</div><div class='ctx'> 	int error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -356,15 +354,19 @@ static bool filldir64(struct dir_context *ctx, const char *name, int namlen,</div><div class='ctx'> 	int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1,</div><div class='ctx'> 		sizeof(u64));</div><div class='ctx'> 	int prev_reclen;</div><div class='add'>+	unsigned int flags = d_type;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(FILLDIR_FLAG_NOINTR &amp; S_DT_MASK);</div><div class='add'>+	d_type &amp;= S_DT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;error = verify_dirent_name(name, namlen);</div><div class='ctx'> 	if (unlikely(buf-&gt;error))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	buf-&gt;error = -EINVAL;	/* only used if we fail.. */</div><div class='del'>-	if (reclen &gt; buf-&gt;count)</div><div class='add'>+	if (reclen &gt; ctx-&gt;count)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	prev_reclen = buf-&gt;prev_reclen;</div><div class='del'>-	if (prev_reclen &amp;&amp; signal_pending(current))</div><div class='add'>+	if (!(flags &amp; FILLDIR_FLAG_NOINTR) &amp;&amp; prev_reclen &amp;&amp; signal_pending(current))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	dirent = buf-&gt;current_dir;</div><div class='ctx'> 	prev = (void __user *)dirent - prev_reclen;</div><div class='hunk'>@@ -381,7 +383,7 @@ static bool filldir64(struct dir_context *ctx, const char *name, int namlen,</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;prev_reclen = reclen;</div><div class='ctx'> 	buf-&gt;current_dir = (void __user *)dirent + reclen;</div><div class='del'>-	buf-&gt;count -= reclen;</div><div class='add'>+	ctx-&gt;count -= reclen;</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> efault_end:</div><div class='hunk'>@@ -394,19 +396,18 @@ efault:</div><div class='ctx'> SYSCALL_DEFINE3(getdents64, unsigned int, fd,</div><div class='ctx'> 		struct linux_dirent64 __user *, dirent, unsigned int, count)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	struct getdents_callback64 buf = {</div><div class='ctx'> 		.ctx.actor = filldir64,</div><div class='del'>-		.count = count,</div><div class='add'>+		.ctx.count = count,</div><div class='ctx'> 		.current_dir = dirent</div><div class='ctx'> 	};</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	f = fdget_pos(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = iterate_dir(f.file, &amp;buf.ctx);</div><div class='add'>+	error = iterate_dir(fd_file(f), &amp;buf.ctx);</div><div class='ctx'> 	if (error &gt;= 0)</div><div class='ctx'> 		error = buf.error;</div><div class='ctx'> 	if (buf.prev_reclen) {</div><div class='hunk'>@@ -417,9 +418,8 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,</div><div class='ctx'> 		if (put_user(d_off, &amp;lastdirent-&gt;d_off))</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			error = count - buf.count;</div><div class='add'>+			error = count - buf.ctx.count;</div><div class='ctx'> 	}</div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -479,20 +479,20 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,</div><div class='ctx'> 		struct compat_old_linux_dirent __user *, dirent, unsigned int, count)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='del'>-	struct fd f = fdget_pos(fd);</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	struct compat_readdir_callback buf = {</div><div class='ctx'> 		.ctx.actor = compat_fillonedir,</div><div class='add'>+		.ctx.count = 1, /* Hint to fs: just one entry. */</div><div class='ctx'> 		.dirent = dirent</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = iterate_dir(f.file, &amp;buf.ctx);</div><div class='add'>+	error = iterate_dir(fd_file(f), &amp;buf.ctx);</div><div class='ctx'> 	if (buf.result)</div><div class='ctx'> 		error = buf.result;</div><div class='ctx'> </div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -507,7 +507,6 @@ struct compat_getdents_callback {</div><div class='ctx'> 	struct dir_context ctx;</div><div class='ctx'> 	struct compat_linux_dirent __user *current_dir;</div><div class='ctx'> 	int prev_reclen;</div><div class='del'>-	int count;</div><div class='ctx'> 	int error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -521,12 +520,16 @@ static bool compat_filldir(struct dir_context *ctx, const char *name, int namlen</div><div class='ctx'> 	int reclen = ALIGN(offsetof(struct compat_linux_dirent, d_name) +</div><div class='ctx'> 		namlen + 2, sizeof(compat_long_t));</div><div class='ctx'> 	int prev_reclen;</div><div class='add'>+	unsigned int flags = d_type;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(FILLDIR_FLAG_NOINTR &amp; S_DT_MASK);</div><div class='add'>+	d_type &amp;= S_DT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;error = verify_dirent_name(name, namlen);</div><div class='ctx'> 	if (unlikely(buf-&gt;error))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	buf-&gt;error = -EINVAL;	/* only used if we fail.. */</div><div class='del'>-	if (reclen &gt; buf-&gt;count)</div><div class='add'>+	if (reclen &gt; ctx-&gt;count)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	d_ino = ino;</div><div class='ctx'> 	if (sizeof(d_ino) &lt; sizeof(ino) &amp;&amp; d_ino != ino) {</div><div class='hunk'>@@ -534,7 +537,7 @@ static bool compat_filldir(struct dir_context *ctx, const char *name, int namlen</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	prev_reclen = buf-&gt;prev_reclen;</div><div class='del'>-	if (prev_reclen &amp;&amp; signal_pending(current))</div><div class='add'>+	if (!(flags &amp; FILLDIR_FLAG_NOINTR) &amp;&amp; prev_reclen &amp;&amp; signal_pending(current))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	dirent = buf-&gt;current_dir;</div><div class='ctx'> 	prev = (void __user *) dirent - prev_reclen;</div><div class='hunk'>@@ -550,7 +553,7 @@ static bool compat_filldir(struct dir_context *ctx, const char *name, int namlen</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;prev_reclen = reclen;</div><div class='ctx'> 	buf-&gt;current_dir = (void __user *)dirent + reclen;</div><div class='del'>-	buf-&gt;count -= reclen;</div><div class='add'>+	ctx-&gt;count -= reclen;</div><div class='ctx'> 	return true;</div><div class='ctx'> efault_end:</div><div class='ctx'> 	user_write_access_end();</div><div class='hunk'>@@ -562,19 +565,18 @@ efault:</div><div class='ctx'> COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,</div><div class='ctx'> 		struct compat_linux_dirent __user *, dirent, unsigned int, count)</div><div class='ctx'> {</div><div class='del'>-	struct fd f;</div><div class='add'>+	CLASS(fd_pos, f)(fd);</div><div class='ctx'> 	struct compat_getdents_callback buf = {</div><div class='ctx'> 		.ctx.actor = compat_filldir,</div><div class='add'>+		.ctx.count = count,</div><div class='ctx'> 		.current_dir = dirent,</div><div class='del'>-		.count = count</div><div class='ctx'> 	};</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	f = fdget_pos(fd);</div><div class='del'>-	if (!f.file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADF;</div><div class='ctx'> </div><div class='del'>-	error = iterate_dir(f.file, &amp;buf.ctx);</div><div class='add'>+	error = iterate_dir(fd_file(f), &amp;buf.ctx);</div><div class='ctx'> 	if (error &gt;= 0)</div><div class='ctx'> 		error = buf.error;</div><div class='ctx'> 	if (buf.prev_reclen) {</div><div class='hunk'>@@ -584,9 +586,8 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,</div><div class='ctx'> 		if (put_user(buf.ctx.pos, &amp;lastdirent-&gt;d_off))</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			error = count - buf.count;</div><div class='add'>+			error = count - buf.ctx.count;</div><div class='ctx'> 	}</div><div class='del'>-	fdput_pos(f);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig<br/>deleted file mode 100644<br/>index 0e6fe26458fe..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/Kconfig?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config REISERFS_FS</div><div class='del'>-	tristate "Reiserfs support (deprecated)"</div><div class='del'>-	select BUFFER_HEAD</div><div class='del'>-	select CRC32</div><div class='del'>-	select LEGACY_DIRECT_IO</div><div class='del'>-	help</div><div class='del'>-	  Reiserfs is deprecated and scheduled to be removed from the kernel</div><div class='del'>-	  in 2025. If you are still using it, please migrate to another</div><div class='del'>-	  filesystem or tell us your usecase for reiserfs.</div><div class='del'>-</div><div class='del'>-	  Reiserfs stores not just filenames but the files themselves in a</div><div class='del'>-	  balanced tree.  Uses journalling.</div><div class='del'>-</div><div class='del'>-	  Balanced trees are more efficient than traditional file system</div><div class='del'>-	  architectural foundations.</div><div class='del'>-</div><div class='del'>-	  In general, ReiserFS is as fast as ext2, but is very efficient with</div><div class='del'>-	  large directories and small files.  Additional patches are needed</div><div class='del'>-	  for NFS and quotas, please see </div><div class='del'>-	  &lt;https://reiser4.wiki.kernel.org/index.php/Main_Page&gt; for links.</div><div class='del'>-</div><div class='del'>-	  It is more easily extended to have features currently found in</div><div class='del'>-	  database and keyword search systems than block allocation based file</div><div class='del'>-	  systems are.  The next version will be so extended, and will support</div><div class='del'>-	  plugins consistent with our motto ``It takes more than a license to</div><div class='del'>-	  make source code open.''</div><div class='del'>-</div><div class='del'>-	  Read &lt;https://reiser4.wiki.kernel.org/index.php/Main_Page&gt; </div><div class='del'>-	  to learn more about reiserfs.</div><div class='del'>-</div><div class='del'>-	  Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.</div><div class='del'>-</div><div class='del'>-	  If you like it, you can pay us to add new features to it that you</div><div class='del'>-	  need, buy a support contract, or pay us to port it to another OS.</div><div class='del'>-</div><div class='del'>-config REISERFS_CHECK</div><div class='del'>-	bool "Enable reiserfs debug mode"</div><div class='del'>-	depends on REISERFS_FS</div><div class='del'>-	help</div><div class='del'>-	  If you set this to Y, then ReiserFS will perform every check it can</div><div class='del'>-	  possibly imagine of its internal consistency throughout its</div><div class='del'>-	  operation.  It will also go substantially slower.  More than once we</div><div class='del'>-	  have forgotten that this was on, and then gone despondent over the</div><div class='del'>-	  latest benchmarks.:-) Use of this option allows our team to go all</div><div class='del'>-	  out in checking for consistency when debugging without fear of its</div><div class='del'>-	  effect on end users.  If you are on the verge of sending in a bug</div><div class='del'>-	  report, say Y and you might get a useful error message.  Almost</div><div class='del'>-	  everyone should say N.</div><div class='del'>-</div><div class='del'>-config REISERFS_PROC_INFO</div><div class='del'>-	bool "Stats in /proc/fs/reiserfs"</div><div class='del'>-	depends on REISERFS_FS &amp;&amp; PROC_FS</div><div class='del'>-	help</div><div class='del'>-	  Create under /proc/fs/reiserfs a hierarchy of files, displaying</div><div class='del'>-	  various ReiserFS statistics and internal data at the expense of</div><div class='del'>-	  making your kernel or module slightly larger (+8 KB). This also</div><div class='del'>-	  increases the amount of kernel memory required for each mount.</div><div class='del'>-	  Almost everyone but ReiserFS developers and people fine-tuning</div><div class='del'>-	  reiserfs or tracing problems should say N.</div><div class='del'>-</div><div class='del'>-config REISERFS_FS_XATTR</div><div class='del'>-	bool "ReiserFS extended attributes"</div><div class='del'>-	depends on REISERFS_FS</div><div class='del'>-	help</div><div class='del'>-	  Extended attributes are name:value pairs associated with inodes by</div><div class='del'>-	  the kernel or by users (see the attr(5) manual page for details).</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='del'>-</div><div class='del'>-config REISERFS_FS_POSIX_ACL</div><div class='del'>-	bool "ReiserFS POSIX Access Control Lists"</div><div class='del'>-	depends on REISERFS_FS_XATTR</div><div class='del'>-	select FS_POSIX_ACL</div><div class='del'>-	help</div><div class='del'>-	  Posix Access Control Lists (ACLs) support permissions for users and</div><div class='del'>-	  groups beyond the owner/group/world scheme.</div><div class='del'>-</div><div class='del'>-	  If you don't know what Access Control Lists are, say N</div><div class='del'>-</div><div class='del'>-config REISERFS_FS_SECURITY</div><div class='del'>-	bool "ReiserFS Security Labels"</div><div class='del'>-	depends on REISERFS_FS_XATTR</div><div class='del'>-	help</div><div class='del'>-	  Security labels support alternative access control models</div><div class='del'>-	  implemented by security modules like SELinux.  This option</div><div class='del'>-	  enables an extended attribute handler for file security</div><div class='del'>-	  labels in the ReiserFS filesystem.</div><div class='del'>-</div><div class='del'>-	  If you are not using a security module that requires using</div><div class='del'>-	  extended attributes for file security labels, say N.</div><div class='head'>diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile<br/>deleted file mode 100644<br/>index bd29c58ccbd8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/Makefile?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# Makefile for the linux reiser-filesystem routines.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_REISERFS_FS) += reiserfs.o</div><div class='del'>-</div><div class='del'>-reiserfs-objs := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o \</div><div class='del'>-		 super.o prints.o objectid.o lbalance.o ibalance.o stree.o \</div><div class='del'>-		 hashes.o tail_conversion.o journal.o resize.o \</div><div class='del'>-		 item_ops.o ioctl.o xattr.o lock.o</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_REISERFS_PROC_INFO),y)</div><div class='del'>-reiserfs-objs += procfs.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_REISERFS_FS_XATTR),y)</div><div class='del'>-reiserfs-objs += xattr_user.o xattr_trusted.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_REISERFS_FS_SECURITY),y)</div><div class='del'>-reiserfs-objs += xattr_security.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_REISERFS_FS_POSIX_ACL),y)</div><div class='del'>-reiserfs-objs += xattr_acl.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-TAGS:</div><div class='del'>-	etags *.c</div><div class='head'>diff --git a/fs/reiserfs/README b/fs/reiserfs/README<br/>deleted file mode 100644<br/>index e2f7a264e3ff..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/README?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-[LICENSING]</div><div class='del'>-</div><div class='del'>-ReiserFS is hereby licensed under the GNU General</div><div class='del'>-Public License version 2.</div><div class='del'>-</div><div class='del'>-Source code files that contain the phrase "licensing governed by</div><div class='del'>-reiserfs/README" are "governed files" throughout this file.  Governed</div><div class='del'>-files are licensed under the GPL.  The portions of them owned by Hans</div><div class='del'>-Reiser, or authorized to be licensed by him, have been in the past,</div><div class='del'>-and likely will be in the future, licensed to other parties under</div><div class='del'>-other licenses.  If you add your code to governed files, and don't</div><div class='del'>-want it to be owned by Hans Reiser, put your copyright label on that</div><div class='del'>-code so the poor blight and his customers can keep things straight.</div><div class='del'>-All portions of governed files not labeled otherwise are owned by Hans</div><div class='del'>-Reiser, and by adding your code to it, widely distributing it to</div><div class='del'>-others or sending us a patch, and leaving the sentence in stating that</div><div class='del'>-licensing is governed by the statement in this file, you accept this.</div><div class='del'>-It will be a kindness if you identify whether Hans Reiser is allowed</div><div class='del'>-to license code labeled as owned by you on your behalf other than</div><div class='del'>-under the GPL, because he wants to know if it is okay to do so and put</div><div class='del'>-a check in the mail to you (for non-trivial improvements) when he</div><div class='del'>-makes his next sale.  He makes no guarantees as to the amount if any,</div><div class='del'>-though he feels motivated to motivate contributors, and you can surely</div><div class='del'>-discuss this with him before or after contributing.  You have the</div><div class='del'>-right to decline to allow him to license your code contribution other</div><div class='del'>-than under the GPL.</div><div class='del'>-</div><div class='del'>-Further licensing options are available for commercial and/or other</div><div class='del'>-interests directly from Hans Reiser: hans@reiser.to.  If you interpret</div><div class='del'>-the GPL as not allowing those additional licensing options, you read</div><div class='del'>-it wrongly, and Richard Stallman agrees with me, when carefully read</div><div class='del'>-you can see that those restrictions on additional terms do not apply</div><div class='del'>-to the owner of the copyright, and my interpretation of this shall</div><div class='del'>-govern for this license.</div><div class='del'>-</div><div class='del'>-Finally, nothing in this license shall be interpreted to allow you to</div><div class='del'>-fail to fairly credit me, or to remove my credits, without my</div><div class='del'>-permission, unless you are an end user not redistributing to others.</div><div class='del'>-If you have doubts about how to properly do that, or about what is</div><div class='del'>-fair, ask.  (Last I spoke with him Richard was contemplating how best</div><div class='del'>-to address the fair crediting issue in the next GPL version.)</div><div class='del'>-</div><div class='del'>-[END LICENSING]</div><div class='del'>-</div><div class='del'>-Reiserfs is a file system based on balanced tree algorithms, which is</div><div class='del'>-described at https://reiser4.wiki.kernel.org/index.php/Main_Page </div><div class='del'>-</div><div class='del'>-Stop reading here.  Go there, then return.</div><div class='del'>-</div><div class='del'>-Send bug reports to yura@namesys.botik.ru.</div><div class='del'>-</div><div class='del'>-mkreiserfs and other utilities are in reiserfs/utils, or wherever your</div><div class='del'>-Linux provider put them.  There is some disagreement about how useful</div><div class='del'>-it is for users to get their fsck and mkreiserfs out of sync with the</div><div class='del'>-version of reiserfs that is in their kernel, with many important</div><div class='del'>-distributors wanting them out of sync.:-) Please try to remember to</div><div class='del'>-recompile and reinstall fsck and mkreiserfs with every update of</div><div class='del'>-reiserfs, this is a common source of confusion.  Note that some of the</div><div class='del'>-utilities cannot be compiled without accessing the balancing code</div><div class='del'>-which is in the kernel code, and relocating the utilities may require</div><div class='del'>-you to specify where that code can be found.</div><div class='del'>-</div><div class='del'>-Yes, if you update your reiserfs kernel module you do have to</div><div class='del'>-recompile your kernel, most of the time.  The errors you get will be</div><div class='del'>-quite cryptic if your forget to do so.</div><div class='del'>-</div><div class='del'>-Real users, as opposed to folks who want to hack and then understand</div><div class='del'>-what went wrong, will want REISERFS_CHECK off.</div><div class='del'>-</div><div class='del'>-Hideous Commercial Pitch: Spread your development costs across other OS</div><div class='del'>-vendors.  Select from the best in the world, not the best in your</div><div class='del'>-building, by buying from third party OS component suppliers.  Leverage</div><div class='del'>-the software component development power of the internet.  Be the most</div><div class='del'>-aggressive in taking advantage of the commercial possibilities of</div><div class='del'>-decentralized internet development, and add value through your branded</div><div class='del'>-integration that you sell as an operating system.  Let your competitors</div><div class='del'>-be the ones to compete against the entire internet by themselves.  Be</div><div class='del'>-hip, get with the new economic trend, before your competitors do.  Send</div><div class='del'>-email to hans@reiser.to.</div><div class='del'>-</div><div class='del'>-To understand the code, after reading the website, start reading the</div><div class='del'>-code by reading reiserfs_fs.h first.</div><div class='del'>-</div><div class='del'>-Hans Reiser was the project initiator, primary architect, source of all</div><div class='del'>-funding for the first 5.5 years, and one of the programmers.  He owns</div><div class='del'>-the copyright.</div><div class='del'>-</div><div class='del'>-Vladimir Saveljev was one of the programmers, and he worked long hours</div><div class='del'>-writing the cleanest code.  He always made the effort to be the best he</div><div class='del'>-could be, and to make his code the best that it could be.  What resulted</div><div class='del'>-was quite remarkable. I don't think that money can ever motivate someone</div><div class='del'>-to work the way he did, he is one of the most selfless men I know.</div><div class='del'>-</div><div class='del'>-Yura helps with benchmarking, coding hashes, and block pre-allocation</div><div class='del'>-code.</div><div class='del'>-</div><div class='del'>-Anatoly Pinchuk is a former member of our team who worked closely with</div><div class='del'>-Vladimir throughout the project's development.  He wrote a quite</div><div class='del'>-substantial portion of the total code.  He realized that there was a</div><div class='del'>-space problem with packing tails of files for files larger than a node</div><div class='del'>-that start on a node aligned boundary (there are reasons to want to node</div><div class='del'>-align files), and he invented and implemented indirect items and</div><div class='del'>-unformatted nodes as the solution.</div><div class='del'>-</div><div class='del'>-Konstantin Shvachko, with the help of the Russian version of a VC,</div><div class='del'>-tried to put me in a position where I was forced into giving control</div><div class='del'>-of the project to him.  (Fortunately, as the person paying the money</div><div class='del'>-for all salaries from my dayjob I owned all copyrights, and you can't</div><div class='del'>-really force takeovers of sole proprietorships.)  This was something</div><div class='del'>-curious, because he never really understood the value of our project,</div><div class='del'>-why we should do what we do, or why innovation was possible in</div><div class='del'>-general, but he was sure that he ought to be controlling it.  Every</div><div class='del'>-innovation had to be forced past him while he was with us.  He added</div><div class='del'>-two years to the time required to complete reiserfs, and was a net</div><div class='del'>-loss for me.  Mikhail Gilula was a brilliant innovator who also left</div><div class='del'>-in a destructive way that erased the value of his contributions, and</div><div class='del'>-that he was shown much generosity just makes it more painful.</div><div class='del'>-</div><div class='del'>-Grigory Zaigralin was an extremely effective system administrator for</div><div class='del'>-our group.</div><div class='del'>-</div><div class='del'>-Igor Krasheninnikov was wonderful at hardware procurement, repair, and</div><div class='del'>-network installation.</div><div class='del'>-</div><div class='del'>-Jeremy Fitzhardinge wrote the teahash.c code, and he gives credit to a</div><div class='del'>-textbook he got the algorithm from in the code.  Note that his analysis</div><div class='del'>-of how we could use the hashing code in making 32 bit NFS cookies work</div><div class='del'>-was probably more important than the actual algorithm.  Colin Plumb also</div><div class='del'>-contributed to it.</div><div class='del'>-</div><div class='del'>-Chris Mason dived right into our code, and in just a few months produced</div><div class='del'>-the journaling code that dramatically increased the value of ReiserFS.</div><div class='del'>-He is just an amazing programmer.</div><div class='del'>-</div><div class='del'>-Igor Zagorovsky is writing much of the new item handler and extent code</div><div class='del'>-for our next major release.</div><div class='del'>-</div><div class='del'>-Alexander Zarochentcev (sometimes known as zam, or sasha), wrote the</div><div class='del'>-resizer, and is hard at work on implementing allocate on flush.  SGI</div><div class='del'>-implemented allocate on flush before us for XFS, and generously took</div><div class='del'>-the time to convince me we should do it also.  They are great people,</div><div class='del'>-and a great company.</div><div class='del'>-</div><div class='del'>-Yuri Shevchuk and Nikita Danilov are doing squid cache optimization.</div><div class='del'>-</div><div class='del'>-Vitaly Fertman is doing fsck.</div><div class='del'>-</div><div class='del'>-Jeff Mahoney, of SuSE, contributed a few cleanup fixes, most notably</div><div class='del'>-the endian safe patches which allow ReiserFS to run on any platform</div><div class='del'>-supported by the Linux kernel.</div><div class='del'>-</div><div class='del'>-SuSE, IntegratedLinux.com, Ecila, MP3.com, bigstorage.com, and the</div><div class='del'>-Alpha PC Company made it possible for me to not have a day job</div><div class='del'>-anymore, and to dramatically increase our staffing.  Ecila funded</div><div class='del'>-hypertext feature development, MP3.com funded journaling, SuSE funded</div><div class='del'>-core development, IntegratedLinux.com funded squid web cache</div><div class='del'>-appliances, bigstorage.com funded HSM, and the alpha PC company funded</div><div class='del'>-the alpha port.  Many of these tasks were helped by sponsors other</div><div class='del'>-than the ones just named.  SuSE has helped in much more than just</div><div class='del'>-funding....</div><div class='del'>-</div><div class='head'>diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h<br/>deleted file mode 100644<br/>index 2571b1a8be84..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/acl.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/acl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl.h&gt;</div><div class='del'>-</div><div class='del'>-#define REISERFS_ACL_VERSION	0x0001</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le16 e_tag;</div><div class='del'>-	__le16 e_perm;</div><div class='del'>-	__le32 e_id;</div><div class='del'>-} reiserfs_acl_entry;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le16 e_tag;</div><div class='del'>-	__le16 e_perm;</div><div class='del'>-} reiserfs_acl_entry_short;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	__le32 a_version;</div><div class='del'>-} reiserfs_acl_header;</div><div class='del'>-</div><div class='del'>-static inline size_t reiserfs_acl_size(int count)</div><div class='del'>-{</div><div class='del'>-	if (count &lt;= 4) {</div><div class='del'>-		return sizeof(reiserfs_acl_header) +</div><div class='del'>-		    count * sizeof(reiserfs_acl_entry_short);</div><div class='del'>-	} else {</div><div class='del'>-		return sizeof(reiserfs_acl_header) +</div><div class='del'>-		    4 * sizeof(reiserfs_acl_entry_short) +</div><div class='del'>-		    (count - 4) * sizeof(reiserfs_acl_entry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_acl_count(size_t size)</div><div class='del'>-{</div><div class='del'>-	ssize_t s;</div><div class='del'>-	size -= sizeof(reiserfs_acl_header);</div><div class='del'>-	s = size - 4 * sizeof(reiserfs_acl_entry_short);</div><div class='del'>-	if (s &lt; 0) {</div><div class='del'>-		if (size % sizeof(reiserfs_acl_entry_short))</div><div class='del'>-			return -1;</div><div class='del'>-		return size / sizeof(reiserfs_acl_entry_short);</div><div class='del'>-	} else {</div><div class='del'>-		if (s % sizeof(reiserfs_acl_entry))</div><div class='del'>-			return -1;</div><div class='del'>-		return s / sizeof(reiserfs_acl_entry) + 4;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_POSIX_ACL</div><div class='del'>-struct posix_acl *reiserfs_get_acl(struct inode *inode, int type, bool rcu);</div><div class='del'>-int reiserfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		     struct posix_acl *acl, int type);</div><div class='del'>-int reiserfs_acl_chmod(struct dentry *dentry);</div><div class='del'>-int reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,</div><div class='del'>-				 struct inode *dir, struct dentry *dentry,</div><div class='del'>-				 struct inode *inode);</div><div class='del'>-int reiserfs_cache_default_acl(struct inode *dir);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define reiserfs_cache_default_acl(inode) 0</div><div class='del'>-#define reiserfs_get_acl NULL</div><div class='del'>-#define reiserfs_set_acl NULL</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_acl_chmod(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     const struct inode *dir, struct dentry *dentry,</div><div class='del'>-			     struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c<br/>deleted file mode 100644<br/>index bf708ac287b4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/bitmap.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/bitmap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1476 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-/* Reiserfs block (de)allocator, bitmap-based. */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-#define PREALLOCATION_SIZE 9</div><div class='del'>-</div><div class='del'>-/* different reiserfs block allocator options */</div><div class='del'>-</div><div class='del'>-#define SB_ALLOC_OPTS(s) (REISERFS_SB(s)-&gt;s_alloc_options.bits)</div><div class='del'>-</div><div class='del'>-#define  _ALLOC_concentrating_formatted_nodes 0</div><div class='del'>-#define  _ALLOC_displacing_large_files 1</div><div class='del'>-#define  _ALLOC_displacing_new_packing_localities 2</div><div class='del'>-#define  _ALLOC_old_hashed_relocation 3</div><div class='del'>-#define  _ALLOC_new_hashed_relocation 4</div><div class='del'>-#define  _ALLOC_skip_busy 5</div><div class='del'>-#define  _ALLOC_displace_based_on_dirid 6</div><div class='del'>-#define  _ALLOC_hashed_formatted_nodes 7</div><div class='del'>-#define  _ALLOC_old_way 8</div><div class='del'>-#define  _ALLOC_hundredth_slices 9</div><div class='del'>-#define  _ALLOC_dirid_groups 10</div><div class='del'>-#define  _ALLOC_oid_groups 11</div><div class='del'>-#define  _ALLOC_packing_groups 12</div><div class='del'>-</div><div class='del'>-#define  concentrating_formatted_nodes(s)	test_bit(_ALLOC_concentrating_formatted_nodes, &amp;SB_ALLOC_OPTS(s))</div><div class='del'>-#define  displacing_large_files(s)		test_bit(_ALLOC_displacing_large_files, &amp;SB_ALLOC_OPTS(s))</div><div class='del'>-#define  displacing_new_packing_localities(s)	test_bit(_ALLOC_displacing_new_packing_localities, &amp;SB_ALLOC_OPTS(s))</div><div class='del'>-</div><div class='del'>-#define SET_OPTION(optname) \</div><div class='del'>-   do { \</div><div class='del'>-	reiserfs_info(s, "block allocator option \"%s\" is set", #optname); \</div><div class='del'>-	set_bit(_ALLOC_ ## optname , &amp;SB_ALLOC_OPTS(s)); \</div><div class='del'>-    } while(0)</div><div class='del'>-#define TEST_OPTION(optname, s) \</div><div class='del'>-    test_bit(_ALLOC_ ## optname , &amp;SB_ALLOC_OPTS(s))</div><div class='del'>-</div><div class='del'>-static inline void get_bit_address(struct super_block *s,</div><div class='del'>-				   b_blocknr_t block,</div><div class='del'>-				   unsigned int *bmap_nr,</div><div class='del'>-				   unsigned int *offset)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * It is in the bitmap block number equal to the block</div><div class='del'>-	 * number divided by the number of bits in a block.</div><div class='del'>-	 */</div><div class='del'>-	*bmap_nr = block &gt;&gt; (s-&gt;s_blocksize_bits + 3);</div><div class='del'>-	/* Within that bitmap block it is located at bit offset *offset. */</div><div class='del'>-	*offset = block &amp; ((s-&gt;s_blocksize &lt;&lt; 3) - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)</div><div class='del'>-{</div><div class='del'>-	unsigned int bmap, offset;</div><div class='del'>-	unsigned int bmap_count = reiserfs_bmap_count(s);</div><div class='del'>-</div><div class='del'>-	if (block == 0 || block &gt;= SB_BLOCK_COUNT(s)) {</div><div class='del'>-		reiserfs_error(s, "vs-4010",</div><div class='del'>-			       "block number is out of range %lu (%u)",</div><div class='del'>-			       block, SB_BLOCK_COUNT(s));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	get_bit_address(s, block, &amp;bmap, &amp;offset);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Old format filesystem? Unlikely, but the bitmaps are all</div><div class='del'>-	 * up front so we need to account for it.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(test_bit(REISERFS_OLD_FORMAT,</div><div class='del'>-			      &amp;REISERFS_SB(s)-&gt;s_properties))) {</div><div class='del'>-		b_blocknr_t bmap1 = REISERFS_SB(s)-&gt;s_sbh-&gt;b_blocknr + 1;</div><div class='del'>-		if (block &gt;= bmap1 &amp;&amp;</div><div class='del'>-		    block &lt;= bmap1 + bmap_count) {</div><div class='del'>-			reiserfs_error(s, "vs-4019", "bitmap block %lu(%u) "</div><div class='del'>-				       "can't be freed or reused",</div><div class='del'>-				       block, bmap_count);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (offset == 0) {</div><div class='del'>-			reiserfs_error(s, "vs-4020", "bitmap block %lu(%u) "</div><div class='del'>-				       "can't be freed or reused",</div><div class='del'>-				       block, bmap_count);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bmap &gt;= bmap_count) {</div><div class='del'>-		reiserfs_error(s, "vs-4030", "bitmap for requested block "</div><div class='del'>-			       "is out of range: block=%lu, bitmap_nr=%u",</div><div class='del'>-			       block, bmap);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bit_value == 0 &amp;&amp; block == SB_ROOT_BLOCK(s)) {</div><div class='del'>-		reiserfs_error(s, "vs-4050", "this is root block (%u), "</div><div class='del'>-			       "it must be busy", SB_ROOT_BLOCK(s));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Searches in journal structures for a given block number (bmap, off).</div><div class='del'>- * If block is found in reiserfs journal it suggests next free block</div><div class='del'>- * candidate to test.</div><div class='del'>- */</div><div class='del'>-static inline int is_block_in_journal(struct super_block *s, unsigned int bmap,</div><div class='del'>-				      int off, int *next)</div><div class='del'>-{</div><div class='del'>-	b_blocknr_t tmp;</div><div class='del'>-</div><div class='del'>-	if (reiserfs_in_journal(s, bmap, off, 1, &amp;tmp)) {</div><div class='del'>-		if (tmp) {	/* hint supplied */</div><div class='del'>-			*next = tmp;</div><div class='del'>-			PROC_INFO_INC(s, scan_bitmap.in_journal_hint);</div><div class='del'>-		} else {</div><div class='del'>-			(*next) = off + 1;  /* inc offset to avoid looping. */</div><div class='del'>-			PROC_INFO_INC(s, scan_bitmap.in_journal_nohint);</div><div class='del'>-		}</div><div class='del'>-		PROC_INFO_INC(s, scan_bitmap.retry);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Searches for a window of zero bits with given minimum and maximum</div><div class='del'>- * lengths in one bitmap block</div><div class='del'>- */</div><div class='del'>-static int scan_bitmap_block(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     unsigned int bmap_n, int *beg, int boundary,</div><div class='del'>-			     int min, int max, int unfm)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_bitmap_info *bi = &amp;SB_AP_BITMAP(s)[bmap_n];</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int end, next;</div><div class='del'>-	int org = *beg;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	RFALSE(bmap_n &gt;= reiserfs_bmap_count(s), "Bitmap %u is out of "</div><div class='del'>-	       "range (0..%u)", bmap_n, reiserfs_bmap_count(s) - 1);</div><div class='del'>-	PROC_INFO_INC(s, scan_bitmap.bmap);</div><div class='del'>-</div><div class='del'>-	if (!bi) {</div><div class='del'>-		reiserfs_error(s, "jdm-4055", "NULL bitmap info pointer "</div><div class='del'>-			       "for bitmap %d", bmap_n);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bh = reiserfs_read_bitmap_block(s, bmap_n);</div><div class='del'>-	if (bh == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-cont:</div><div class='del'>-		if (bi-&gt;free_count &lt; min) {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			return 0;	/* No free blocks in this bitmap */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* search for a first zero bit -- beginning of a window */</div><div class='del'>-		*beg = reiserfs_find_next_zero_le_bit</div><div class='del'>-		    ((unsigned long *)(bh-&gt;b_data), boundary, *beg);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * search for a zero bit fails or the rest of bitmap block</div><div class='del'>-		 * cannot contain a zero window of minimum size</div><div class='del'>-		 */</div><div class='del'>-		if (*beg + min &gt; boundary) {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unfm &amp;&amp; is_block_in_journal(s, bmap_n, *beg, beg))</div><div class='del'>-			continue;</div><div class='del'>-		/* first zero bit found; we check next bits */</div><div class='del'>-		for (end = *beg + 1;; end++) {</div><div class='del'>-			if (end &gt;= *beg + max || end &gt;= boundary</div><div class='del'>-			    || reiserfs_test_le_bit(end, bh-&gt;b_data)) {</div><div class='del'>-				next = end;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * finding the other end of zero bit window requires</div><div class='del'>-			 * looking into journal structures (in case of</div><div class='del'>-			 * searching for free blocks for unformatted nodes)</div><div class='del'>-			 */</div><div class='del'>-			if (unfm &amp;&amp; is_block_in_journal(s, bmap_n, end, &amp;next))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * now (*beg) points to beginning of zero bits window,</div><div class='del'>-		 * (end) points to one bit after the window end</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* found window of proper size */</div><div class='del'>-		if (end - *beg &gt;= min) {</div><div class='del'>-			int i;</div><div class='del'>-			reiserfs_prepare_for_journal(s, bh, 1);</div><div class='del'>-			/*</div><div class='del'>-			 * try to set all blocks used checking are</div><div class='del'>-			 * they still free</div><div class='del'>-			 */</div><div class='del'>-			for (i = *beg; i &lt; end; i++) {</div><div class='del'>-				/* Don't check in journal again. */</div><div class='del'>-				if (reiserfs_test_and_set_le_bit</div><div class='del'>-				    (i, bh-&gt;b_data)) {</div><div class='del'>-					/*</div><div class='del'>-					 * bit was set by another process while</div><div class='del'>-					 * we slept in prepare_for_journal()</div><div class='del'>-					 */</div><div class='del'>-					PROC_INFO_INC(s, scan_bitmap.stolen);</div><div class='del'>-</div><div class='del'>-					/*</div><div class='del'>-					 * we can continue with smaller set</div><div class='del'>-					 * of allocated blocks, if length of</div><div class='del'>-					 * this set is more or equal to `min'</div><div class='del'>-					 */</div><div class='del'>-					if (i &gt;= *beg + min) {</div><div class='del'>-						end = i;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					/*</div><div class='del'>-					 * otherwise we clear all bit</div><div class='del'>-					 * were set ...</div><div class='del'>-					 */</div><div class='del'>-					while (--i &gt;= *beg)</div><div class='del'>-						reiserfs_clear_le_bit</div><div class='del'>-						    (i, bh-&gt;b_data);</div><div class='del'>-					reiserfs_restore_prepared_buffer(s, bh);</div><div class='del'>-					*beg = org;</div><div class='del'>-</div><div class='del'>-					/*</div><div class='del'>-					 * Search again in current block</div><div class='del'>-					 * from beginning</div><div class='del'>-					 */</div><div class='del'>-					goto cont;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			bi-&gt;free_count -= (end - *beg);</div><div class='del'>-			journal_mark_dirty(th, bh);</div><div class='del'>-			brelse(bh);</div><div class='del'>-</div><div class='del'>-			/* free block count calculation */</div><div class='del'>-			reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s),</div><div class='del'>-						     1);</div><div class='del'>-			PUT_SB_FREE_BLOCKS(s, SB_FREE_BLOCKS(s) - (end - *beg));</div><div class='del'>-			journal_mark_dirty(th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-</div><div class='del'>-			return end - (*beg);</div><div class='del'>-		} else {</div><div class='del'>-			*beg = next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bmap_hash_id(struct super_block *s, u32 id)</div><div class='del'>-{</div><div class='del'>-	char *hash_in = NULL;</div><div class='del'>-	unsigned long hash;</div><div class='del'>-	unsigned bm;</div><div class='del'>-</div><div class='del'>-	if (id &lt;= 2) {</div><div class='del'>-		bm = 1;</div><div class='del'>-	} else {</div><div class='del'>-		hash_in = (char *)(&amp;id);</div><div class='del'>-		hash = keyed_hash(hash_in, 4);</div><div class='del'>-		bm = hash % reiserfs_bmap_count(s);</div><div class='del'>-		if (!bm)</div><div class='del'>-			bm = 1;</div><div class='del'>-	}</div><div class='del'>-	/* this can only be true when SB_BMAP_NR = 1 */</div><div class='del'>-	if (bm &gt;= reiserfs_bmap_count(s))</div><div class='del'>-		bm = 0;</div><div class='del'>-	return bm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * hashes the id and then returns &gt; 0 if the block group for the</div><div class='del'>- * corresponding hash is full</div><div class='del'>- */</div><div class='del'>-static inline int block_group_used(struct super_block *s, u32 id)</div><div class='del'>-{</div><div class='del'>-	int bm = bmap_hash_id(s, id);</div><div class='del'>-	struct reiserfs_bitmap_info *info = &amp;SB_AP_BITMAP(s)[bm];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we don't have cached information on this bitmap block, we're</div><div class='del'>-	 * going to have to load it later anyway. Loading it here allows us</div><div class='del'>-	 * to make a better decision. This favors long-term performance gain</div><div class='del'>-	 * with a better on-disk layout vs. a short term gain of skipping the</div><div class='del'>-	 * read and potentially having a bad placement.</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;free_count == UINT_MAX) {</div><div class='del'>-		struct buffer_head *bh = reiserfs_read_bitmap_block(s, bm);</div><div class='del'>-		brelse(bh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info-&gt;free_count &gt; ((s-&gt;s_blocksize &lt;&lt; 3) * 60 / 100)) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the packing is returned in disk byte order</div><div class='del'>- */</div><div class='del'>-__le32 reiserfs_choose_packing(struct inode * dir)</div><div class='del'>-{</div><div class='del'>-	__le32 packing;</div><div class='del'>-	if (TEST_OPTION(packing_groups, dir-&gt;i_sb)) {</div><div class='del'>-		u32 parent_dir = le32_to_cpu(INODE_PKEY(dir)-&gt;k_dir_id);</div><div class='del'>-		/*</div><div class='del'>-		 * some versions of reiserfsck expect packing locality 1 to be</div><div class='del'>-		 * special</div><div class='del'>-		 */</div><div class='del'>-		if (parent_dir == 1 || block_group_used(dir-&gt;i_sb, parent_dir))</div><div class='del'>-			packing = INODE_PKEY(dir)-&gt;k_objectid;</div><div class='del'>-		else</div><div class='del'>-			packing = INODE_PKEY(dir)-&gt;k_dir_id;</div><div class='del'>-	} else</div><div class='del'>-		packing = INODE_PKEY(dir)-&gt;k_objectid;</div><div class='del'>-	return packing;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Tries to find contiguous zero bit window (given size) in given region of</div><div class='del'>- * bitmap and place new blocks there. Returns number of allocated blocks.</div><div class='del'>- */</div><div class='del'>-static int scan_bitmap(struct reiserfs_transaction_handle *th,</div><div class='del'>-		       b_blocknr_t * start, b_blocknr_t finish,</div><div class='del'>-		       int min, int max, int unfm, sector_t file_block)</div><div class='del'>-{</div><div class='del'>-	int nr_allocated = 0;</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	unsigned int bm, off;</div><div class='del'>-	unsigned int end_bm, end_off;</div><div class='del'>-	unsigned int off_max = s-&gt;s_blocksize &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	PROC_INFO_INC(s, scan_bitmap.call);</div><div class='del'>-</div><div class='del'>-	/* No point in looking for more free blocks */</div><div class='del'>-	if (SB_FREE_BLOCKS(s) &lt;= 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	get_bit_address(s, *start, &amp;bm, &amp;off);</div><div class='del'>-	get_bit_address(s, finish, &amp;end_bm, &amp;end_off);</div><div class='del'>-	if (bm &gt; reiserfs_bmap_count(s))</div><div class='del'>-		return 0;</div><div class='del'>-	if (end_bm &gt; reiserfs_bmap_count(s))</div><div class='del'>-		end_bm = reiserfs_bmap_count(s);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When the bitmap is more than 10% free, anyone can allocate.</div><div class='del'>-	 * When it's less than 10% free, only files that already use the</div><div class='del'>-	 * bitmap are allowed. Once we pass 80% full, this restriction</div><div class='del'>-	 * is lifted.</div><div class='del'>-	 *</div><div class='del'>-	 * We do this so that files that grow later still have space close to</div><div class='del'>-	 * their original allocation. This improves locality, and presumably</div><div class='del'>-	 * performance as a result.</div><div class='del'>-	 *</div><div class='del'>-	 * This is only an allocation policy and does not make up for getting a</div><div class='del'>-	 * bad hint. Decent hinting must be implemented for this to work well.</div><div class='del'>-	 */</div><div class='del'>-	if (TEST_OPTION(skip_busy, s)</div><div class='del'>-	    &amp;&amp; SB_FREE_BLOCKS(s) &gt; SB_BLOCK_COUNT(s) / 20) {</div><div class='del'>-		for (; bm &lt; end_bm; bm++, off = 0) {</div><div class='del'>-			if ((off &amp;&amp; (!unfm || (file_block != 0)))</div><div class='del'>-			    || SB_AP_BITMAP(s)[bm].free_count &gt;</div><div class='del'>-			    (s-&gt;s_blocksize &lt;&lt; 3) / 10)</div><div class='del'>-				nr_allocated =</div><div class='del'>-				    scan_bitmap_block(th, bm, &amp;off, off_max,</div><div class='del'>-						      min, max, unfm);</div><div class='del'>-			if (nr_allocated)</div><div class='del'>-				goto ret;</div><div class='del'>-		}</div><div class='del'>-		/* we know from above that start is a reasonable number */</div><div class='del'>-		get_bit_address(s, *start, &amp;bm, &amp;off);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (; bm &lt; end_bm; bm++, off = 0) {</div><div class='del'>-		nr_allocated =</div><div class='del'>-		    scan_bitmap_block(th, bm, &amp;off, off_max, min, max, unfm);</div><div class='del'>-		if (nr_allocated)</div><div class='del'>-			goto ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr_allocated =</div><div class='del'>-	    scan_bitmap_block(th, bm, &amp;off, end_off + 1, min, max, unfm);</div><div class='del'>-</div><div class='del'>-ret:</div><div class='del'>-	*start = bm * off_max + off;</div><div class='del'>-	return nr_allocated;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,</div><div class='del'>-				 struct inode *inode, b_blocknr_t block,</div><div class='del'>-				 int for_unformatted)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_super_block *rs;</div><div class='del'>-	struct buffer_head *sbh, *bmbh;</div><div class='del'>-	struct reiserfs_bitmap_info *apbi;</div><div class='del'>-	unsigned int nr, offset;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	PROC_INFO_INC(s, free_block);</div><div class='del'>-	rs = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-	sbh = SB_BUFFER_WITH_SB(s);</div><div class='del'>-	apbi = SB_AP_BITMAP(s);</div><div class='del'>-</div><div class='del'>-	get_bit_address(s, block, &amp;nr, &amp;offset);</div><div class='del'>-</div><div class='del'>-	if (nr &gt;= reiserfs_bmap_count(s)) {</div><div class='del'>-		reiserfs_error(s, "vs-4075", "block %lu is out of range",</div><div class='del'>-			       block);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bmbh = reiserfs_read_bitmap_block(s, nr);</div><div class='del'>-	if (!bmbh)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	reiserfs_prepare_for_journal(s, bmbh, 1);</div><div class='del'>-</div><div class='del'>-	/* clear bit for the given block in bit map */</div><div class='del'>-	if (!reiserfs_test_and_clear_le_bit(offset, bmbh-&gt;b_data)) {</div><div class='del'>-		reiserfs_error(s, "vs-4080",</div><div class='del'>-			       "block %lu: bit already cleared", block);</div><div class='del'>-	}</div><div class='del'>-	apbi[nr].free_count++;</div><div class='del'>-	journal_mark_dirty(th, bmbh);</div><div class='del'>-	brelse(bmbh);</div><div class='del'>-</div><div class='del'>-	reiserfs_prepare_for_journal(s, sbh, 1);</div><div class='del'>-	/* update super block */</div><div class='del'>-	set_sb_free_blocks(rs, sb_free_blocks(rs) + 1);</div><div class='del'>-</div><div class='del'>-	journal_mark_dirty(th, sbh);</div><div class='del'>-	if (for_unformatted) {</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		dquot_free_block_nodirty(inode, 1);</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_free_block(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct inode *inode, b_blocknr_t block,</div><div class='del'>-			 int for_unformatted)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	RFALSE(!s, "vs-4061: trying to free block on nonexistent device");</div><div class='del'>-	if (!is_reusable(s, block, 1))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (block &gt; sb_block_count(REISERFS_SB(s)-&gt;s_rs)) {</div><div class='del'>-		reiserfs_error(th-&gt;t_super, "bitmap-4072",</div><div class='del'>-			       "Trying to free block outside file system "</div><div class='del'>-			       "boundaries (%lu &gt; %lu)",</div><div class='del'>-			       block, sb_block_count(REISERFS_SB(s)-&gt;s_rs));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* mark it before we clear it, just in case */</div><div class='del'>-	journal_mark_freed(th, s, block);</div><div class='del'>-	_reiserfs_free_block(th, inode, block, for_unformatted);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* preallocated blocks don't need to be run through journal_mark_freed */</div><div class='del'>-static void reiserfs_free_prealloc_block(struct reiserfs_transaction_handle *th,</div><div class='del'>-					 struct inode *inode, b_blocknr_t block)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	RFALSE(!th-&gt;t_super,</div><div class='del'>-	       "vs-4060: trying to free block on nonexistent device");</div><div class='del'>-	if (!is_reusable(th-&gt;t_super, block, 1))</div><div class='del'>-		return;</div><div class='del'>-	_reiserfs_free_block(th, inode, block, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __discard_prealloc(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       struct reiserfs_inode_info *ei)</div><div class='del'>-{</div><div class='del'>-	unsigned long save = ei-&gt;i_prealloc_block;</div><div class='del'>-	int dirty = 0;</div><div class='del'>-	struct inode *inode = &amp;ei-&gt;vfs_inode;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	if (ei-&gt;i_prealloc_count &lt; 0)</div><div class='del'>-		reiserfs_error(th-&gt;t_super, "zam-4001",</div><div class='del'>-			       "inode has negative prealloc blocks count.");</div><div class='del'>-#endif</div><div class='del'>-	while (ei-&gt;i_prealloc_count &gt; 0) {</div><div class='del'>-		b_blocknr_t block_to_free;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * reiserfs_free_prealloc_block can drop the write lock,</div><div class='del'>-		 * which could allow another caller to free the same block.</div><div class='del'>-		 * We can protect against it by modifying the prealloc</div><div class='del'>-		 * state before calling it.</div><div class='del'>-		 */</div><div class='del'>-		block_to_free = ei-&gt;i_prealloc_block++;</div><div class='del'>-		ei-&gt;i_prealloc_count--;</div><div class='del'>-		reiserfs_free_prealloc_block(th, inode, block_to_free);</div><div class='del'>-		dirty = 1;</div><div class='del'>-	}</div><div class='del'>-	if (dirty)</div><div class='del'>-		reiserfs_update_sd(th, inode);</div><div class='del'>-	ei-&gt;i_prealloc_block = save;</div><div class='del'>-	list_del_init(&amp;ei-&gt;i_prealloc_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: It should be inline function */</div><div class='del'>-void reiserfs_discard_prealloc(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_inode_info *ei = REISERFS_I(inode);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	if (ei-&gt;i_prealloc_count)</div><div class='del'>-		__discard_prealloc(th, ei);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	struct list_head *plist = &amp;SB_JOURNAL(th-&gt;t_super)-&gt;j_prealloc_list;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	while (!list_empty(plist)) {</div><div class='del'>-		struct reiserfs_inode_info *ei;</div><div class='del'>-		ei = list_entry(plist-&gt;next, struct reiserfs_inode_info,</div><div class='del'>-				i_prealloc_list);</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		if (!ei-&gt;i_prealloc_count) {</div><div class='del'>-			reiserfs_error(th-&gt;t_super, "zam-4001",</div><div class='del'>-				       "inode is in prealloc list but has "</div><div class='del'>-				       "no preallocated blocks.");</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		__discard_prealloc(th, ei);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_init_alloc_options(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	set_bit(_ALLOC_skip_busy, &amp;SB_ALLOC_OPTS(s));</div><div class='del'>-	set_bit(_ALLOC_dirid_groups, &amp;SB_ALLOC_OPTS(s));</div><div class='del'>-	set_bit(_ALLOC_packing_groups, &amp;SB_ALLOC_OPTS(s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* block allocator related options are parsed here */</div><div class='del'>-int reiserfs_parse_alloc_options(struct super_block *s, char *options)</div><div class='del'>-{</div><div class='del'>-	char *this_char, *value;</div><div class='del'>-</div><div class='del'>-	/* clear default settings */</div><div class='del'>-	REISERFS_SB(s)-&gt;s_alloc_options.bits = 0;</div><div class='del'>-</div><div class='del'>-	while ((this_char = strsep(&amp;options, ":")) != NULL) {</div><div class='del'>-		if ((value = strchr(this_char, '=')) != NULL)</div><div class='del'>-			*value++ = 0;</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "concentrating_formatted_nodes")) {</div><div class='del'>-			int temp;</div><div class='del'>-			SET_OPTION(concentrating_formatted_nodes);</div><div class='del'>-			temp = (value</div><div class='del'>-				&amp;&amp; *value) ? simple_strtoul(value, &amp;value,</div><div class='del'>-							    0) : 10;</div><div class='del'>-			if (temp &lt;= 0 || temp &gt; 100) {</div><div class='del'>-				REISERFS_SB(s)-&gt;s_alloc_options.border = 10;</div><div class='del'>-			} else {</div><div class='del'>-				REISERFS_SB(s)-&gt;s_alloc_options.border =</div><div class='del'>-				    100 / temp;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!strcmp(this_char, "displacing_large_files")) {</div><div class='del'>-			SET_OPTION(displacing_large_files);</div><div class='del'>-			REISERFS_SB(s)-&gt;s_alloc_options.large_file_size =</div><div class='del'>-			    (value</div><div class='del'>-			     &amp;&amp; *value) ? simple_strtoul(value, &amp;value, 0) : 16;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!strcmp(this_char, "displacing_new_packing_localities")) {</div><div class='del'>-			SET_OPTION(displacing_new_packing_localities);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "old_hashed_relocation")) {</div><div class='del'>-			SET_OPTION(old_hashed_relocation);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "new_hashed_relocation")) {</div><div class='del'>-			SET_OPTION(new_hashed_relocation);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "dirid_groups")) {</div><div class='del'>-			SET_OPTION(dirid_groups);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!strcmp(this_char, "oid_groups")) {</div><div class='del'>-			SET_OPTION(oid_groups);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!strcmp(this_char, "packing_groups")) {</div><div class='del'>-			SET_OPTION(packing_groups);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (!strcmp(this_char, "hashed_formatted_nodes")) {</div><div class='del'>-			SET_OPTION(hashed_formatted_nodes);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "skip_busy")) {</div><div class='del'>-			SET_OPTION(skip_busy);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "hundredth_slices")) {</div><div class='del'>-			SET_OPTION(hundredth_slices);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "old_way")) {</div><div class='del'>-			SET_OPTION(old_way);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "displace_based_on_dirid")) {</div><div class='del'>-			SET_OPTION(displace_based_on_dirid);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "preallocmin")) {</div><div class='del'>-			REISERFS_SB(s)-&gt;s_alloc_options.preallocmin =</div><div class='del'>-			    (value</div><div class='del'>-			     &amp;&amp; *value) ? simple_strtoul(value, &amp;value, 0) : 4;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp(this_char, "preallocsize")) {</div><div class='del'>-			REISERFS_SB(s)-&gt;s_alloc_options.preallocsize =</div><div class='del'>-			    (value</div><div class='del'>-			     &amp;&amp; *value) ? simple_strtoul(value, &amp;value,</div><div class='del'>-							 0) :</div><div class='del'>-			    PREALLOCATION_SIZE;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_warning(s, "zam-4001", "unknown option - %s",</div><div class='del'>-				 this_char);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_info(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_sep(struct seq_file *seq, int *first)</div><div class='del'>-{</div><div class='del'>-	if (!*first)</div><div class='del'>-		seq_puts(seq, ":");</div><div class='del'>-	else</div><div class='del'>-		*first = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void show_alloc_options(struct seq_file *seq, struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	int first = 1;</div><div class='del'>-</div><div class='del'>-	if (SB_ALLOC_OPTS(s) == ((1 &lt;&lt; _ALLOC_skip_busy) |</div><div class='del'>-		(1 &lt;&lt; _ALLOC_dirid_groups) | (1 &lt;&lt; _ALLOC_packing_groups)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	seq_puts(seq, ",alloc=");</div><div class='del'>-</div><div class='del'>-	if (TEST_OPTION(concentrating_formatted_nodes, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		if (REISERFS_SB(s)-&gt;s_alloc_options.border != 10) {</div><div class='del'>-			seq_printf(seq, "concentrating_formatted_nodes=%d",</div><div class='del'>-				100 / REISERFS_SB(s)-&gt;s_alloc_options.border);</div><div class='del'>-		} else</div><div class='del'>-			seq_puts(seq, "concentrating_formatted_nodes");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(displacing_large_files, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		if (REISERFS_SB(s)-&gt;s_alloc_options.large_file_size != 16) {</div><div class='del'>-			seq_printf(seq, "displacing_large_files=%lu",</div><div class='del'>-			    REISERFS_SB(s)-&gt;s_alloc_options.large_file_size);</div><div class='del'>-		} else</div><div class='del'>-			seq_puts(seq, "displacing_large_files");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(displacing_new_packing_localities, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "displacing_new_packing_localities");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(old_hashed_relocation, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "old_hashed_relocation");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(new_hashed_relocation, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "new_hashed_relocation");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(dirid_groups, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "dirid_groups");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(oid_groups, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "oid_groups");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(packing_groups, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "packing_groups");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(hashed_formatted_nodes, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "hashed_formatted_nodes");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(skip_busy, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "skip_busy");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(hundredth_slices, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "hundredth_slices");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(old_way, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "old_way");</div><div class='del'>-	}</div><div class='del'>-	if (TEST_OPTION(displace_based_on_dirid, s)) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_puts(seq, "displace_based_on_dirid");</div><div class='del'>-	}</div><div class='del'>-	if (REISERFS_SB(s)-&gt;s_alloc_options.preallocmin != 0) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_printf(seq, "preallocmin=%d",</div><div class='del'>-				REISERFS_SB(s)-&gt;s_alloc_options.preallocmin);</div><div class='del'>-	}</div><div class='del'>-	if (REISERFS_SB(s)-&gt;s_alloc_options.preallocsize != 17) {</div><div class='del'>-		print_sep(seq, &amp;first);</div><div class='del'>-		seq_printf(seq, "preallocsize=%d",</div><div class='del'>-				REISERFS_SB(s)-&gt;s_alloc_options.preallocsize);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void new_hashed_relocation(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	char *hash_in;</div><div class='del'>-</div><div class='del'>-	if (hint-&gt;formatted_node) {</div><div class='del'>-		hash_in = (char *)&amp;hint-&gt;key.k_dir_id;</div><div class='del'>-	} else {</div><div class='del'>-		if (!hint-&gt;inode) {</div><div class='del'>-			/*hint-&gt;search_start = hint-&gt;beg;*/</div><div class='del'>-			hash_in = (char *)&amp;hint-&gt;key.k_dir_id;</div><div class='del'>-		} else</div><div class='del'>-		    if (TEST_OPTION(displace_based_on_dirid, hint-&gt;th-&gt;t_super))</div><div class='del'>-			hash_in = (char *)(&amp;INODE_PKEY(hint-&gt;inode)-&gt;k_dir_id);</div><div class='del'>-		else</div><div class='del'>-			hash_in =</div><div class='del'>-			    (char *)(&amp;INODE_PKEY(hint-&gt;inode)-&gt;k_objectid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hint-&gt;search_start =</div><div class='del'>-	    hint-&gt;beg + keyed_hash(hash_in, 4) % (hint-&gt;end - hint-&gt;beg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Relocation based on dirid, hashing them into a given bitmap block</div><div class='del'>- * files. Formatted nodes are unaffected, a separate policy covers them</div><div class='del'>- */</div><div class='del'>-static void dirid_groups(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	unsigned long hash;</div><div class='del'>-	__u32 dirid = 0;</div><div class='del'>-	int bm = 0;</div><div class='del'>-	struct super_block *sb = hint-&gt;th-&gt;t_super;</div><div class='del'>-</div><div class='del'>-	if (hint-&gt;inode)</div><div class='del'>-		dirid = le32_to_cpu(INODE_PKEY(hint-&gt;inode)-&gt;k_dir_id);</div><div class='del'>-	else if (hint-&gt;formatted_node)</div><div class='del'>-		dirid = hint-&gt;key.k_dir_id;</div><div class='del'>-</div><div class='del'>-	if (dirid) {</div><div class='del'>-		bm = bmap_hash_id(sb, dirid);</div><div class='del'>-		hash = bm * (sb-&gt;s_blocksize &lt;&lt; 3);</div><div class='del'>-		/* give a portion of the block group to metadata */</div><div class='del'>-		if (hint-&gt;inode)</div><div class='del'>-			hash += sb-&gt;s_blocksize / 2;</div><div class='del'>-		hint-&gt;search_start = hash;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Relocation based on oid, hashing them into a given bitmap block</div><div class='del'>- * files. Formatted nodes are unaffected, a separate policy covers them</div><div class='del'>- */</div><div class='del'>-static void oid_groups(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	if (hint-&gt;inode) {</div><div class='del'>-		unsigned long hash;</div><div class='del'>-		__u32 oid;</div><div class='del'>-		__u32 dirid;</div><div class='del'>-		int bm;</div><div class='del'>-</div><div class='del'>-		dirid = le32_to_cpu(INODE_PKEY(hint-&gt;inode)-&gt;k_dir_id);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * keep the root dir and it's first set of subdirs close to</div><div class='del'>-		 * the start of the disk</div><div class='del'>-		 */</div><div class='del'>-		if (dirid &lt;= 2)</div><div class='del'>-			hash = (hint-&gt;inode-&gt;i_sb-&gt;s_blocksize &lt;&lt; 3);</div><div class='del'>-		else {</div><div class='del'>-			oid = le32_to_cpu(INODE_PKEY(hint-&gt;inode)-&gt;k_objectid);</div><div class='del'>-			bm = bmap_hash_id(hint-&gt;inode-&gt;i_sb, oid);</div><div class='del'>-			hash = bm * (hint-&gt;inode-&gt;i_sb-&gt;s_blocksize &lt;&lt; 3);</div><div class='del'>-		}</div><div class='del'>-		hint-&gt;search_start = hash;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns 1 if it finds an indirect item and gets valid hint info</div><div class='del'>- * from it, otherwise 0</div><div class='del'>- */</div><div class='del'>-static int get_left_neighbor(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	struct treepath *path;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	int pos_in_item;</div><div class='del'>-	__le32 *item;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reiserfs code can call this function w/o pointer to path</div><div class='del'>-	 * structure supplied; then we rely on supplied search_start</div><div class='del'>-	 */</div><div class='del'>-	if (!hint-&gt;path)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	path = hint-&gt;path;</div><div class='del'>-	bh = get_last_bh(path);</div><div class='del'>-	RFALSE(!bh, "green-4002: Illegal path specified to get_left_neighbor");</div><div class='del'>-	ih = tp_item_head(path);</div><div class='del'>-	pos_in_item = path-&gt;pos_in_item;</div><div class='del'>-	item = tp_item_body(path);</div><div class='del'>-</div><div class='del'>-	hint-&gt;search_start = bh-&gt;b_blocknr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * for indirect item: go to left and look for the first non-hole entry</div><div class='del'>-	 * in the indirect item</div><div class='del'>-	 */</div><div class='del'>-	if (!hint-&gt;formatted_node &amp;&amp; is_indirect_le_ih(ih)) {</div><div class='del'>-		if (pos_in_item == I_UNFM_NUM(ih))</div><div class='del'>-			pos_in_item--;</div><div class='del'>-		while (pos_in_item &gt;= 0) {</div><div class='del'>-			int t = get_block_num(item, pos_in_item);</div><div class='del'>-			if (t) {</div><div class='del'>-				hint-&gt;search_start = t;</div><div class='del'>-				ret = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			pos_in_item--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* does result value fit into specified region? */</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * should be, if formatted node, then try to put on first part of the device</div><div class='del'>- * specified as number of percent with mount option device, else try to put</div><div class='del'>- * on last of device.  This is not to say it is good code to do so,</div><div class='del'>- * but the effect should be measured.</div><div class='del'>- */</div><div class='del'>-static inline void set_border_in_hint(struct super_block *s,</div><div class='del'>-				      reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	b_blocknr_t border =</div><div class='del'>-	    SB_BLOCK_COUNT(s) / REISERFS_SB(s)-&gt;s_alloc_options.border;</div><div class='del'>-</div><div class='del'>-	if (hint-&gt;formatted_node)</div><div class='del'>-		hint-&gt;end = border - 1;</div><div class='del'>-	else</div><div class='del'>-		hint-&gt;beg = border;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void displace_large_file(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	if (TEST_OPTION(displace_based_on_dirid, hint-&gt;th-&gt;t_super))</div><div class='del'>-		hint-&gt;search_start =</div><div class='del'>-		    hint-&gt;beg +</div><div class='del'>-		    keyed_hash((char *)(&amp;INODE_PKEY(hint-&gt;inode)-&gt;k_dir_id),</div><div class='del'>-			       4) % (hint-&gt;end - hint-&gt;beg);</div><div class='del'>-	else</div><div class='del'>-		hint-&gt;search_start =</div><div class='del'>-		    hint-&gt;beg +</div><div class='del'>-		    keyed_hash((char *)(&amp;INODE_PKEY(hint-&gt;inode)-&gt;k_objectid),</div><div class='del'>-			       4) % (hint-&gt;end - hint-&gt;beg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hash_formatted_node(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	char *hash_in;</div><div class='del'>-</div><div class='del'>-	if (!hint-&gt;inode)</div><div class='del'>-		hash_in = (char *)&amp;hint-&gt;key.k_dir_id;</div><div class='del'>-	else if (TEST_OPTION(displace_based_on_dirid, hint-&gt;th-&gt;t_super))</div><div class='del'>-		hash_in = (char *)(&amp;INODE_PKEY(hint-&gt;inode)-&gt;k_dir_id);</div><div class='del'>-	else</div><div class='del'>-		hash_in = (char *)(&amp;INODE_PKEY(hint-&gt;inode)-&gt;k_objectid);</div><div class='del'>-</div><div class='del'>-	hint-&gt;search_start =</div><div class='del'>-	    hint-&gt;beg + keyed_hash(hash_in, 4) % (hint-&gt;end - hint-&gt;beg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-this_blocknr_allocation_would_make_it_a_large_file(reiserfs_blocknr_hint_t *</div><div class='del'>-						   hint)</div><div class='del'>-{</div><div class='del'>-	return hint-&gt;block ==</div><div class='del'>-	    REISERFS_SB(hint-&gt;th-&gt;t_super)-&gt;s_alloc_options.large_file_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-static inline void displace_new_packing_locality(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	struct in_core_key *key = &amp;hint-&gt;key;</div><div class='del'>-</div><div class='del'>-	hint-&gt;th-&gt;displace_new_blocks = 0;</div><div class='del'>-	hint-&gt;search_start =</div><div class='del'>-	    hint-&gt;beg + keyed_hash((char *)(&amp;key-&gt;k_objectid),</div><div class='del'>-				   4) % (hint-&gt;end - hint-&gt;beg);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int old_hashed_relocation(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	b_blocknr_t border;</div><div class='del'>-	u32 hash_in;</div><div class='del'>-</div><div class='del'>-	if (hint-&gt;formatted_node || hint-&gt;inode == NULL) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hash_in = le32_to_cpu((INODE_PKEY(hint-&gt;inode))-&gt;k_dir_id);</div><div class='del'>-	border =</div><div class='del'>-	    hint-&gt;beg + (u32) keyed_hash(((char *)(&amp;hash_in)),</div><div class='del'>-					 4) % (hint-&gt;end - hint-&gt;beg - 1);</div><div class='del'>-	if (border &gt; hint-&gt;search_start)</div><div class='del'>-		hint-&gt;search_start = border;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int old_way(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	b_blocknr_t border;</div><div class='del'>-</div><div class='del'>-	if (hint-&gt;formatted_node || hint-&gt;inode == NULL) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	border =</div><div class='del'>-	    hint-&gt;beg +</div><div class='del'>-	    le32_to_cpu(INODE_PKEY(hint-&gt;inode)-&gt;k_dir_id) % (hint-&gt;end -</div><div class='del'>-							      hint-&gt;beg);</div><div class='del'>-	if (border &gt; hint-&gt;search_start)</div><div class='del'>-		hint-&gt;search_start = border;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hundredth_slices(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	struct in_core_key *key = &amp;hint-&gt;key;</div><div class='del'>-	b_blocknr_t slice_start;</div><div class='del'>-</div><div class='del'>-	slice_start =</div><div class='del'>-	    (keyed_hash((char *)(&amp;key-&gt;k_dir_id), 4) % 100) * (hint-&gt;end / 100);</div><div class='del'>-	if (slice_start &gt; hint-&gt;search_start</div><div class='del'>-	    || slice_start + (hint-&gt;end / 100) &lt;= hint-&gt;search_start) {</div><div class='del'>-		hint-&gt;search_start = slice_start;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void determine_search_start(reiserfs_blocknr_hint_t * hint,</div><div class='del'>-				   int amount_needed)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = hint-&gt;th-&gt;t_super;</div><div class='del'>-	int unfm_hint;</div><div class='del'>-</div><div class='del'>-	hint-&gt;beg = 0;</div><div class='del'>-	hint-&gt;end = SB_BLOCK_COUNT(s) - 1;</div><div class='del'>-</div><div class='del'>-	/* This is former border algorithm. Now with tunable border offset */</div><div class='del'>-	if (concentrating_formatted_nodes(s))</div><div class='del'>-		set_border_in_hint(s, hint);</div><div class='del'>-</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	/*</div><div class='del'>-	 * whenever we create a new directory, we displace it.  At first</div><div class='del'>-	 * we will hash for location, later we might look for a moderately</div><div class='del'>-	 * empty place for it</div><div class='del'>-	 */</div><div class='del'>-	if (displacing_new_packing_localities(s)</div><div class='del'>-	    &amp;&amp; hint-&gt;th-&gt;displace_new_blocks) {</div><div class='del'>-		displace_new_packing_locality(hint);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * we do not continue determine_search_start,</div><div class='del'>-		 * if new packing locality is being displaced</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * all persons should feel encouraged to add more special cases</div><div class='del'>-	 * here and test them</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (displacing_large_files(s) &amp;&amp; !hint-&gt;formatted_node</div><div class='del'>-	    &amp;&amp; this_blocknr_allocation_would_make_it_a_large_file(hint)) {</div><div class='del'>-		displace_large_file(hint);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if none of our special cases is relevant, use the left</div><div class='del'>-	 * neighbor in the tree order of the new node we are allocating for</div><div class='del'>-	 */</div><div class='del'>-	if (hint-&gt;formatted_node &amp;&amp; TEST_OPTION(hashed_formatted_nodes, s)) {</div><div class='del'>-		hash_formatted_node(hint);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unfm_hint = get_left_neighbor(hint);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Mimic old block allocator behaviour, that is if VFS allowed for</div><div class='del'>-	 * preallocation, new blocks are displaced based on directory ID.</div><div class='del'>-	 * Also, if suggested search_start is less than last preallocated</div><div class='del'>-	 * block, we start searching from it, assuming that HDD dataflow</div><div class='del'>-	 * is faster in forward direction</div><div class='del'>-	 */</div><div class='del'>-	if (TEST_OPTION(old_way, s)) {</div><div class='del'>-		if (!hint-&gt;formatted_node) {</div><div class='del'>-			if (!reiserfs_hashed_relocation(s))</div><div class='del'>-				old_way(hint);</div><div class='del'>-			else if (!reiserfs_no_unhashed_relocation(s))</div><div class='del'>-				old_hashed_relocation(hint);</div><div class='del'>-</div><div class='del'>-			if (hint-&gt;inode</div><div class='del'>-			    &amp;&amp; hint-&gt;search_start &lt;</div><div class='del'>-			    REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_block)</div><div class='del'>-				hint-&gt;search_start =</div><div class='del'>-				    REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_block;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This is an approach proposed by Hans */</div><div class='del'>-	if (TEST_OPTION(hundredth_slices, s)</div><div class='del'>-	    &amp;&amp; !(displacing_large_files(s) &amp;&amp; !hint-&gt;formatted_node)) {</div><div class='del'>-		hundredth_slices(hint);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* old_hashed_relocation only works on unformatted */</div><div class='del'>-	if (!unfm_hint &amp;&amp; !hint-&gt;formatted_node &amp;&amp;</div><div class='del'>-	    TEST_OPTION(old_hashed_relocation, s)) {</div><div class='del'>-		old_hashed_relocation(hint);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* new_hashed_relocation works with both formatted/unformatted nodes */</div><div class='del'>-	if ((!unfm_hint || hint-&gt;formatted_node) &amp;&amp;</div><div class='del'>-	    TEST_OPTION(new_hashed_relocation, s)) {</div><div class='del'>-		new_hashed_relocation(hint);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* dirid grouping works only on unformatted nodes */</div><div class='del'>-	if (!unfm_hint &amp;&amp; !hint-&gt;formatted_node &amp;&amp; TEST_OPTION(dirid_groups, s)) {</div><div class='del'>-		dirid_groups(hint);</div><div class='del'>-	}</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	if (hint-&gt;formatted_node &amp;&amp; TEST_OPTION(dirid_groups, s)) {</div><div class='del'>-		dirid_groups(hint);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* oid grouping works only on unformatted nodes */</div><div class='del'>-	if (!unfm_hint &amp;&amp; !hint-&gt;formatted_node &amp;&amp; TEST_OPTION(oid_groups, s)) {</div><div class='del'>-		oid_groups(hint);</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int determine_prealloc_size(reiserfs_blocknr_hint_t * hint)</div><div class='del'>-{</div><div class='del'>-	/* make minimum size a mount option and benchmark both ways */</div><div class='del'>-	/* we preallocate blocks only for regular files, specific size */</div><div class='del'>-	/* benchmark preallocating always and see what happens */</div><div class='del'>-</div><div class='del'>-	hint-&gt;prealloc_size = 0;</div><div class='del'>-</div><div class='del'>-	if (!hint-&gt;formatted_node &amp;&amp; hint-&gt;preallocate) {</div><div class='del'>-		if (S_ISREG(hint-&gt;inode-&gt;i_mode) &amp;&amp; !IS_PRIVATE(hint-&gt;inode)</div><div class='del'>-		    &amp;&amp; hint-&gt;inode-&gt;i_size &gt;=</div><div class='del'>-		    REISERFS_SB(hint-&gt;th-&gt;t_super)-&gt;s_alloc_options.</div><div class='del'>-		    preallocmin * hint-&gt;inode-&gt;i_sb-&gt;s_blocksize)</div><div class='del'>-			hint-&gt;prealloc_size =</div><div class='del'>-			    REISERFS_SB(hint-&gt;th-&gt;t_super)-&gt;s_alloc_options.</div><div class='del'>-			    preallocsize - 1;</div><div class='del'>-	}</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int allocate_without_wrapping_disk(reiserfs_blocknr_hint_t * hint,</div><div class='del'>-						 b_blocknr_t * new_blocknrs,</div><div class='del'>-						 b_blocknr_t start,</div><div class='del'>-						 b_blocknr_t finish, int min,</div><div class='del'>-						 int amount_needed,</div><div class='del'>-						 int prealloc_size)</div><div class='del'>-{</div><div class='del'>-	int rest = amount_needed;</div><div class='del'>-	int nr_allocated;</div><div class='del'>-</div><div class='del'>-	while (rest &gt; 0 &amp;&amp; start &lt;= finish) {</div><div class='del'>-		nr_allocated = scan_bitmap(hint-&gt;th, &amp;start, finish, min,</div><div class='del'>-					   rest + prealloc_size,</div><div class='del'>-					   !hint-&gt;formatted_node, hint-&gt;block);</div><div class='del'>-</div><div class='del'>-		if (nr_allocated == 0)	/* no new blocks allocated, return */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* fill free_blocknrs array first */</div><div class='del'>-		while (rest &gt; 0 &amp;&amp; nr_allocated &gt; 0) {</div><div class='del'>-			*new_blocknrs++ = start++;</div><div class='del'>-			rest--;</div><div class='del'>-			nr_allocated--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* do we have something to fill prealloc. array also ? */</div><div class='del'>-		if (nr_allocated &gt; 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * it means prealloc_size was greater that 0 and</div><div class='del'>-			 * we do preallocation</div><div class='del'>-			 */</div><div class='del'>-			list_add(&amp;REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_list,</div><div class='del'>-				 &amp;SB_JOURNAL(hint-&gt;th-&gt;t_super)-&gt;</div><div class='del'>-				 j_prealloc_list);</div><div class='del'>-			REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_block = start;</div><div class='del'>-			REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_count =</div><div class='del'>-			    nr_allocated;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (amount_needed - rest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int blocknrs_and_prealloc_arrays_from_search_start</div><div class='del'>-    (reiserfs_blocknr_hint_t * hint, b_blocknr_t * new_blocknrs,</div><div class='del'>-     int amount_needed) {</div><div class='del'>-	struct super_block *s = hint-&gt;th-&gt;t_super;</div><div class='del'>-	b_blocknr_t start = hint-&gt;search_start;</div><div class='del'>-	b_blocknr_t finish = SB_BLOCK_COUNT(s) - 1;</div><div class='del'>-	int passno = 0;</div><div class='del'>-	int nr_allocated = 0;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	determine_prealloc_size(hint);</div><div class='del'>-	if (!hint-&gt;formatted_node) {</div><div class='del'>-		int quota_ret;</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-		reiserfs_debug(s, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "reiserquota: allocating %d blocks id=%u",</div><div class='del'>-			       amount_needed, hint-&gt;inode-&gt;i_uid);</div><div class='del'>-#endif</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		quota_ret =</div><div class='del'>-		    dquot_alloc_block_nodirty(hint-&gt;inode, amount_needed);</div><div class='del'>-		if (quota_ret) {	/* Quota exceeded? */</div><div class='del'>-			reiserfs_write_lock_nested(s, depth);</div><div class='del'>-			return QUOTA_EXCEEDED;</div><div class='del'>-		}</div><div class='del'>-		if (hint-&gt;preallocate &amp;&amp; hint-&gt;prealloc_size) {</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-			reiserfs_debug(s, REISERFS_DEBUG_CODE,</div><div class='del'>-				       "reiserquota: allocating (prealloc) %d blocks id=%u",</div><div class='del'>-				       hint-&gt;prealloc_size, hint-&gt;inode-&gt;i_uid);</div><div class='del'>-#endif</div><div class='del'>-			quota_ret = dquot_prealloc_block_nodirty(hint-&gt;inode,</div><div class='del'>-							 hint-&gt;prealloc_size);</div><div class='del'>-			if (quota_ret)</div><div class='del'>-				hint-&gt;preallocate = hint-&gt;prealloc_size = 0;</div><div class='del'>-		}</div><div class='del'>-		/* for unformatted nodes, force large allocations */</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		switch (passno++) {</div><div class='del'>-		case 0:	/* Search from hint-&gt;search_start to end of disk */</div><div class='del'>-			start = hint-&gt;search_start;</div><div class='del'>-			finish = SB_BLOCK_COUNT(s) - 1;</div><div class='del'>-			break;</div><div class='del'>-		case 1:	/* Search from hint-&gt;beg to hint-&gt;search_start */</div><div class='del'>-			start = hint-&gt;beg;</div><div class='del'>-			finish = hint-&gt;search_start;</div><div class='del'>-			break;</div><div class='del'>-		case 2:	/* Last chance: Search from 0 to hint-&gt;beg */</div><div class='del'>-			start = 0;</div><div class='del'>-			finish = hint-&gt;beg;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* We've tried searching everywhere, not enough space */</div><div class='del'>-			/* Free the blocks */</div><div class='del'>-			if (!hint-&gt;formatted_node) {</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-				reiserfs_debug(s, REISERFS_DEBUG_CODE,</div><div class='del'>-					       "reiserquota: freeing (nospace) %d blocks id=%u",</div><div class='del'>-					       amount_needed +</div><div class='del'>-					       hint-&gt;prealloc_size -</div><div class='del'>-					       nr_allocated,</div><div class='del'>-					       hint-&gt;inode-&gt;i_uid);</div><div class='del'>-#endif</div><div class='del'>-				/* Free not allocated blocks */</div><div class='del'>-				depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-				dquot_free_block_nodirty(hint-&gt;inode,</div><div class='del'>-					amount_needed + hint-&gt;prealloc_size -</div><div class='del'>-					nr_allocated);</div><div class='del'>-				reiserfs_write_lock_nested(s, depth);</div><div class='del'>-			}</div><div class='del'>-			while (nr_allocated--)</div><div class='del'>-				reiserfs_free_block(hint-&gt;th, hint-&gt;inode,</div><div class='del'>-						    new_blocknrs[nr_allocated],</div><div class='del'>-						    !hint-&gt;formatted_node);</div><div class='del'>-</div><div class='del'>-			return NO_DISK_SPACE;</div><div class='del'>-		}</div><div class='del'>-	} while ((nr_allocated += allocate_without_wrapping_disk(hint,</div><div class='del'>-								 new_blocknrs +</div><div class='del'>-								 nr_allocated,</div><div class='del'>-								 start, finish,</div><div class='del'>-								 1,</div><div class='del'>-								 amount_needed -</div><div class='del'>-								 nr_allocated,</div><div class='del'>-								 hint-&gt;</div><div class='del'>-								 prealloc_size))</div><div class='del'>-		 &lt; amount_needed);</div><div class='del'>-	if (!hint-&gt;formatted_node &amp;&amp;</div><div class='del'>-	    amount_needed + hint-&gt;prealloc_size &gt;</div><div class='del'>-	    nr_allocated + REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_count) {</div><div class='del'>-		/* Some of preallocation blocks were not allocated */</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-		reiserfs_debug(s, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "reiserquota: freeing (failed prealloc) %d blocks id=%u",</div><div class='del'>-			       amount_needed + hint-&gt;prealloc_size -</div><div class='del'>-			       nr_allocated -</div><div class='del'>-			       REISERFS_I(hint-&gt;inode)-&gt;i_prealloc_count,</div><div class='del'>-			       hint-&gt;inode-&gt;i_uid);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		dquot_free_block_nodirty(hint-&gt;inode, amount_needed +</div><div class='del'>-					 hint-&gt;prealloc_size - nr_allocated -</div><div class='del'>-					 REISERFS_I(hint-&gt;inode)-&gt;</div><div class='del'>-					 i_prealloc_count);</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* grab new blocknrs from preallocated list */</div><div class='del'>-/* return amount still needed after using them */</div><div class='del'>-static int use_preallocated_list_if_available(reiserfs_blocknr_hint_t * hint,</div><div class='del'>-					      b_blocknr_t * new_blocknrs,</div><div class='del'>-					      int amount_needed)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = hint-&gt;inode;</div><div class='del'>-</div><div class='del'>-	if (REISERFS_I(inode)-&gt;i_prealloc_count &gt; 0) {</div><div class='del'>-		while (amount_needed) {</div><div class='del'>-</div><div class='del'>-			*new_blocknrs++ = REISERFS_I(inode)-&gt;i_prealloc_block++;</div><div class='del'>-			REISERFS_I(inode)-&gt;i_prealloc_count--;</div><div class='del'>-</div><div class='del'>-			amount_needed--;</div><div class='del'>-</div><div class='del'>-			if (REISERFS_I(inode)-&gt;i_prealloc_count &lt;= 0) {</div><div class='del'>-				list_del(&amp;REISERFS_I(inode)-&gt;i_prealloc_list);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* return amount still needed after using preallocated blocks */</div><div class='del'>-	return amount_needed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_allocate_blocknrs(reiserfs_blocknr_hint_t *hint,</div><div class='del'>-			       b_blocknr_t *new_blocknrs,</div><div class='del'>-			       int amount_needed,</div><div class='del'>-			       /* Amount of blocks we have already reserved */</div><div class='del'>-			       int reserved_by_us)</div><div class='del'>-{</div><div class='del'>-	int initial_amount_needed = amount_needed;</div><div class='del'>-	int ret;</div><div class='del'>-	struct super_block *s = hint-&gt;th-&gt;t_super;</div><div class='del'>-</div><div class='del'>-	/* Check if there is enough space, taking into account reserved space */</div><div class='del'>-	if (SB_FREE_BLOCKS(s) - REISERFS_SB(s)-&gt;reserved_blocks &lt;</div><div class='del'>-	    amount_needed - reserved_by_us)</div><div class='del'>-		return NO_DISK_SPACE;</div><div class='del'>-	/* should this be if !hint-&gt;inode &amp;&amp;  hint-&gt;preallocate? */</div><div class='del'>-	/* do you mean hint-&gt;formatted_node can be removed ? - Zam */</div><div class='del'>-	/*</div><div class='del'>-	 * hint-&gt;formatted_node cannot be removed because we try to access</div><div class='del'>-	 * inode information here, and there is often no inode associated with</div><div class='del'>-	 * metadata allocations - green</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!hint-&gt;formatted_node &amp;&amp; hint-&gt;preallocate) {</div><div class='del'>-		amount_needed = use_preallocated_list_if_available</div><div class='del'>-		    (hint, new_blocknrs, amount_needed);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We have all the block numbers we need from the</div><div class='del'>-		 * prealloc list</div><div class='del'>-		 */</div><div class='del'>-		if (amount_needed == 0)</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		new_blocknrs += (initial_amount_needed - amount_needed);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* find search start and save it in hint structure */</div><div class='del'>-	determine_search_start(hint, amount_needed);</div><div class='del'>-	if (hint-&gt;search_start &gt;= SB_BLOCK_COUNT(s))</div><div class='del'>-		hint-&gt;search_start = SB_BLOCK_COUNT(s) - 1;</div><div class='del'>-</div><div class='del'>-	/* allocation itself; fill new_blocknrs and preallocation arrays */</div><div class='del'>-	ret = blocknrs_and_prealloc_arrays_from_search_start</div><div class='del'>-	    (hint, new_blocknrs, amount_needed);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We used prealloc. list to fill (partially) new_blocknrs array.</div><div class='del'>-	 * If final allocation fails we need to return blocks back to</div><div class='del'>-	 * prealloc. list or just free them. -- Zam (I chose second</div><div class='del'>-	 * variant)</div><div class='del'>-	 */</div><div class='del'>-	if (ret != CARRY_ON) {</div><div class='del'>-		while (amount_needed++ &lt; initial_amount_needed) {</div><div class='del'>-			reiserfs_free_block(hint-&gt;th, hint-&gt;inode,</div><div class='del'>-					    *(--new_blocknrs), 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_cache_bitmap_metadata(struct super_block *sb,</div><div class='del'>-                                    struct buffer_head *bh,</div><div class='del'>-                                    struct reiserfs_bitmap_info *info)</div><div class='del'>-{</div><div class='del'>-	unsigned long *cur = (unsigned long *)(bh-&gt;b_data + bh-&gt;b_size);</div><div class='del'>-</div><div class='del'>-	/* The first bit must ALWAYS be 1 */</div><div class='del'>-	if (!reiserfs_test_le_bit(0, (unsigned long *)bh-&gt;b_data))</div><div class='del'>-		reiserfs_error(sb, "reiserfs-2025", "bitmap block %lu is "</div><div class='del'>-			       "corrupted: first bit must be 1", bh-&gt;b_blocknr);</div><div class='del'>-</div><div class='del'>-	info-&gt;free_count = 0;</div><div class='del'>-</div><div class='del'>-	while (--cur &gt;= (unsigned long *)bh-&gt;b_data) {</div><div class='del'>-		/* 0 and ~0 are special, we can optimize for them */</div><div class='del'>-		if (*cur == 0)</div><div class='del'>-			info-&gt;free_count += BITS_PER_LONG;</div><div class='del'>-		else if (*cur != ~0L)	/* A mix, investigate */</div><div class='del'>-			info-&gt;free_count += BITS_PER_LONG - hweight_long(*cur);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb,</div><div class='del'>-                                               unsigned int bitmap)</div><div class='del'>-{</div><div class='del'>-	b_blocknr_t block = (sb-&gt;s_blocksize &lt;&lt; 3) * bitmap;</div><div class='del'>-	struct reiserfs_bitmap_info *info = SB_AP_BITMAP(sb) + bitmap;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Way old format filesystems had the bitmaps packed up front.</div><div class='del'>-	 * I doubt there are any of these left, but just in case...</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(test_bit(REISERFS_OLD_FORMAT,</div><div class='del'>-			      &amp;REISERFS_SB(sb)-&gt;s_properties)))</div><div class='del'>-		block = REISERFS_SB(sb)-&gt;s_sbh-&gt;b_blocknr + 1 + bitmap;</div><div class='del'>-	else if (bitmap == 0)</div><div class='del'>-		block = (REISERFS_DISK_OFFSET_IN_BYTES &gt;&gt; sb-&gt;s_blocksize_bits) + 1;</div><div class='del'>-</div><div class='del'>-	bh = sb_bread(sb, block);</div><div class='del'>-	if (bh == NULL)</div><div class='del'>-		reiserfs_warning(sb, "sh-2029: %s: bitmap block (#%u) "</div><div class='del'>-		                 "reading failed", __func__, block);</div><div class='del'>-	else {</div><div class='del'>-		if (buffer_locked(bh)) {</div><div class='del'>-			int depth;</div><div class='del'>-			PROC_INFO_INC(sb, scan_bitmap.wait);</div><div class='del'>-			depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-			__wait_on_buffer(bh);</div><div class='del'>-			reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-		}</div><div class='del'>-		BUG_ON(!buffer_uptodate(bh));</div><div class='del'>-		BUG_ON(atomic_read(&amp;bh-&gt;b_count) == 0);</div><div class='del'>-</div><div class='del'>-		if (info-&gt;free_count == UINT_MAX)</div><div class='del'>-			reiserfs_cache_bitmap_metadata(sb, bh, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bh;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_init_bitmap_cache(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_bitmap_info *bitmap;</div><div class='del'>-	unsigned int bmap_nr = reiserfs_bmap_count(sb);</div><div class='del'>-</div><div class='del'>-	bitmap = vmalloc(array_size(bmap_nr, sizeof(*bitmap)));</div><div class='del'>-	if (bitmap == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memset(bitmap, 0xff, sizeof(*bitmap) * bmap_nr);</div><div class='del'>-</div><div class='del'>-	SB_AP_BITMAP(sb) = bitmap;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_free_bitmap_cache(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	if (SB_AP_BITMAP(sb)) {</div><div class='del'>-		vfree(SB_AP_BITMAP(sb));</div><div class='del'>-		SB_AP_BITMAP(sb) = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c<br/>deleted file mode 100644<br/>index 79ee2b436685..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/dir.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/dir.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,346 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-extern const struct reiserfs_key MIN_KEY;</div><div class='del'>-</div><div class='del'>-static int reiserfs_readdir(struct file *, struct dir_context *);</div><div class='del'>-static int reiserfs_dir_fsync(struct file *filp, loff_t start, loff_t end,</div><div class='del'>-			      int datasync);</div><div class='del'>-</div><div class='del'>-const struct file_operations reiserfs_dir_operations = {</div><div class='del'>-	.llseek = generic_file_llseek,</div><div class='del'>-	.read = generic_read_dir,</div><div class='del'>-	.iterate_shared = reiserfs_readdir,</div><div class='del'>-	.fsync = reiserfs_dir_fsync,</div><div class='del'>-	.unlocked_ioctl = reiserfs_ioctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl = reiserfs_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int reiserfs_dir_fsync(struct file *filp, loff_t start, loff_t end,</div><div class='del'>-			      int datasync)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = filp-&gt;f_mapping-&gt;host;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = file_write_and_wait_range(filp, start, end);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	err = reiserfs_commit_for_inode(inode);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define store_ih(where,what) copy_item_head (where, what)</div><div class='del'>-</div><div class='del'>-static inline bool is_privroot_deh(struct inode *dir, struct reiserfs_de_head *deh)</div><div class='del'>-{</div><div class='del'>-	struct dentry *privroot = REISERFS_SB(dir-&gt;i_sb)-&gt;priv_root;</div><div class='del'>-	return (d_really_is_positive(privroot) &amp;&amp;</div><div class='del'>-	        deh-&gt;deh_objectid == INODE_PKEY(d_inode(privroot))-&gt;k_objectid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* key of current position in the directory (key of directory entry) */</div><div class='del'>-	struct cpu_key pos_key;</div><div class='del'>-</div><div class='del'>-	INITIALIZE_PATH(path_to_entry);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int item_num, entry_num;</div><div class='del'>-	const struct reiserfs_key *rkey;</div><div class='del'>-	struct item_head *ih, tmp_ih;</div><div class='del'>-	int search_res;</div><div class='del'>-	char *local_buf;</div><div class='del'>-	loff_t next_pos;</div><div class='del'>-	char small_buf[32];	/* avoid kmalloc if we can */</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	reiserfs_check_lock_depth(inode-&gt;i_sb, "readdir");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * form key for search the next directory entry using</div><div class='del'>-	 * f_pos field of file structure</div><div class='del'>-	 */</div><div class='del'>-	make_cpu_key(&amp;pos_key, inode, ctx-&gt;pos ?: DOT_OFFSET, TYPE_DIRENTRY, 3);</div><div class='del'>-	next_pos = cpu_key_k_offset(&amp;pos_key);</div><div class='del'>-</div><div class='del'>-	path_to_entry.reada = PATH_READA;</div><div class='del'>-	while (1) {</div><div class='del'>-research:</div><div class='del'>-		/*</div><div class='del'>-		 * search the directory item, containing entry with</div><div class='del'>-		 * specified key</div><div class='del'>-		 */</div><div class='del'>-		search_res =</div><div class='del'>-		    search_by_entry_key(inode-&gt;i_sb, &amp;pos_key, &amp;path_to_entry,</div><div class='del'>-					&amp;de);</div><div class='del'>-		if (search_res == IO_ERROR) {</div><div class='del'>-			/*</div><div class='del'>-			 * FIXME: we could just skip part of directory</div><div class='del'>-			 * which could not be read</div><div class='del'>-			 */</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		entry_num = de.de_entry_num;</div><div class='del'>-		bh = de.de_bh;</div><div class='del'>-		item_num = de.de_item_num;</div><div class='del'>-		ih = de.de_ih;</div><div class='del'>-		store_ih(&amp;tmp_ih, ih);</div><div class='del'>-</div><div class='del'>-		/* we must have found item, that is item of this directory, */</div><div class='del'>-		RFALSE(COMP_SHORT_KEYS(&amp;ih-&gt;ih_key, &amp;pos_key),</div><div class='del'>-		       "vs-9000: found item %h does not match to dir we readdir %K",</div><div class='del'>-		       ih, &amp;pos_key);</div><div class='del'>-		RFALSE(item_num &gt; B_NR_ITEMS(bh) - 1,</div><div class='del'>-		       "vs-9005 item_num == %d, item amount == %d",</div><div class='del'>-		       item_num, B_NR_ITEMS(bh));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * and entry must be not more than number of entries</div><div class='del'>-		 * in the item</div><div class='del'>-		 */</div><div class='del'>-		RFALSE(ih_entry_count(ih) &lt; entry_num,</div><div class='del'>-		       "vs-9010: entry number is too big %d (%d)",</div><div class='del'>-		       entry_num, ih_entry_count(ih));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * go through all entries in the directory item beginning</div><div class='del'>-		 * from the entry, that has been found</div><div class='del'>-		 */</div><div class='del'>-		if (search_res == POSITION_FOUND</div><div class='del'>-		    || entry_num &lt; ih_entry_count(ih)) {</div><div class='del'>-			struct reiserfs_de_head *deh =</div><div class='del'>-			    B_I_DEH(bh, ih) + entry_num;</div><div class='del'>-</div><div class='del'>-			for (; entry_num &lt; ih_entry_count(ih);</div><div class='del'>-			     entry_num++, deh++) {</div><div class='del'>-				int d_reclen;</div><div class='del'>-				char *d_name;</div><div class='del'>-				ino_t d_ino;</div><div class='del'>-				loff_t cur_pos = deh_offset(deh);</div><div class='del'>-</div><div class='del'>-				/* it is hidden entry */</div><div class='del'>-				if (!de_visible(deh))</div><div class='del'>-					continue;</div><div class='del'>-				d_reclen = entry_length(bh, ih, entry_num);</div><div class='del'>-				d_name = B_I_DEH_ENTRY_FILE_NAME(bh, ih, deh);</div><div class='del'>-</div><div class='del'>-				if (d_reclen &lt;= 0 ||</div><div class='del'>-				    d_name + d_reclen &gt; bh-&gt;b_data + bh-&gt;b_size) {</div><div class='del'>-					/*</div><div class='del'>-					 * There is corrupted data in entry,</div><div class='del'>-					 * We'd better stop here</div><div class='del'>-					 */</div><div class='del'>-					pathrelse(&amp;path_to_entry);</div><div class='del'>-					ret = -EIO;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (!d_name[d_reclen - 1])</div><div class='del'>-					d_reclen = strlen(d_name);</div><div class='del'>-</div><div class='del'>-				/* too big to send back to VFS */</div><div class='del'>-				if (d_reclen &gt;</div><div class='del'>-				    REISERFS_MAX_NAME(inode-&gt;i_sb-&gt;</div><div class='del'>-						      s_blocksize)) {</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* Ignore the .reiserfs_priv entry */</div><div class='del'>-				if (is_privroot_deh(inode, deh))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				ctx-&gt;pos = deh_offset(deh);</div><div class='del'>-				d_ino = deh_objectid(deh);</div><div class='del'>-				if (d_reclen &lt;= 32) {</div><div class='del'>-					local_buf = small_buf;</div><div class='del'>-				} else {</div><div class='del'>-					local_buf = kmalloc(d_reclen,</div><div class='del'>-							    GFP_NOFS);</div><div class='del'>-					if (!local_buf) {</div><div class='del'>-						pathrelse(&amp;path_to_entry);</div><div class='del'>-						ret = -ENOMEM;</div><div class='del'>-						goto out;</div><div class='del'>-					}</div><div class='del'>-					if (item_moved(&amp;tmp_ih, &amp;path_to_entry)) {</div><div class='del'>-						kfree(local_buf);</div><div class='del'>-						goto research;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * Note, that we copy name to user space via</div><div class='del'>-				 * temporary buffer (local_buf) because</div><div class='del'>-				 * filldir will block if user space buffer is</div><div class='del'>-				 * swapped out. At that time entry can move to</div><div class='del'>-				 * somewhere else</div><div class='del'>-				 */</div><div class='del'>-				memcpy(local_buf, d_name, d_reclen);</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * Since filldir might sleep, we can release</div><div class='del'>-				 * the write lock here for other waiters</div><div class='del'>-				 */</div><div class='del'>-				depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-				if (!dir_emit</div><div class='del'>-				    (ctx, local_buf, d_reclen, d_ino,</div><div class='del'>-				     DT_UNKNOWN)) {</div><div class='del'>-					reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-					if (local_buf != small_buf) {</div><div class='del'>-						kfree(local_buf);</div><div class='del'>-					}</div><div class='del'>-					goto end;</div><div class='del'>-				}</div><div class='del'>-				reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-				if (local_buf != small_buf) {</div><div class='del'>-					kfree(local_buf);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* deh_offset(deh) may be invalid now. */</div><div class='del'>-				next_pos = cur_pos + 1;</div><div class='del'>-</div><div class='del'>-				if (item_moved(&amp;tmp_ih, &amp;path_to_entry)) {</div><div class='del'>-					set_cpu_key_k_offset(&amp;pos_key,</div><div class='del'>-							     next_pos);</div><div class='del'>-					goto research;</div><div class='del'>-				}</div><div class='del'>-			}	/* for */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* end of directory has been reached */</div><div class='del'>-		if (item_num != B_NR_ITEMS(bh) - 1)</div><div class='del'>-			goto end;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * item we went through is last item of node. Using right</div><div class='del'>-		 * delimiting key check is it directory end</div><div class='del'>-		 */</div><div class='del'>-		rkey = get_rkey(&amp;path_to_entry, inode-&gt;i_sb);</div><div class='del'>-		if (!comp_le_keys(rkey, &amp;MIN_KEY)) {</div><div class='del'>-			/*</div><div class='del'>-			 * set pos_key to key, that is the smallest and greater</div><div class='del'>-			 * that key of the last entry in the item</div><div class='del'>-			 */</div><div class='del'>-			set_cpu_key_k_offset(&amp;pos_key, next_pos);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* end of directory has been reached */</div><div class='del'>-		if (COMP_SHORT_KEYS(rkey, &amp;pos_key)) {</div><div class='del'>-			goto end;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* directory continues in the right neighboring block */</div><div class='del'>-		set_cpu_key_k_offset(&amp;pos_key,</div><div class='del'>-				     le_key_k_offset(KEY_FORMAT_3_5, rkey));</div><div class='del'>-</div><div class='del'>-	}			/* while */</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-	ctx-&gt;pos = next_pos;</div><div class='del'>-	pathrelse(&amp;path_to_entry);</div><div class='del'>-	reiserfs_check_path(&amp;path_to_entry);</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_readdir(struct file *file, struct dir_context *ctx)</div><div class='del'>-{</div><div class='del'>-	return reiserfs_readdir_inode(file_inode(file), ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * compose directory item containing "." and ".." entries (entries are</div><div class='del'>- * not aligned to 4 byte boundary)</div><div class='del'>- */</div><div class='del'>-void make_empty_dir_item_v1(char *body, __le32 dirid, __le32 objid,</div><div class='del'>-			    __le32 par_dirid, __le32 par_objid)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *dot, *dotdot;</div><div class='del'>-</div><div class='del'>-	memset(body, 0, EMPTY_DIR_SIZE_V1);</div><div class='del'>-	dot = (struct reiserfs_de_head *)body;</div><div class='del'>-	dotdot = dot + 1;</div><div class='del'>-</div><div class='del'>-	/* direntry header of "." */</div><div class='del'>-	put_deh_offset(dot, DOT_OFFSET);</div><div class='del'>-	/* these two are from make_le_item_head, and are LE */</div><div class='del'>-	dot-&gt;deh_dir_id = dirid;</div><div class='del'>-	dot-&gt;deh_objectid = objid;</div><div class='del'>-	dot-&gt;deh_state = 0;	/* Endian safe if 0 */</div><div class='del'>-	put_deh_location(dot, EMPTY_DIR_SIZE_V1 - strlen("."));</div><div class='del'>-	mark_de_visible(dot);</div><div class='del'>-</div><div class='del'>-	/* direntry header of ".." */</div><div class='del'>-	put_deh_offset(dotdot, DOT_DOT_OFFSET);</div><div class='del'>-	/* key of ".." for the root directory */</div><div class='del'>-	/* these two are from the inode, and are LE */</div><div class='del'>-	dotdot-&gt;deh_dir_id = par_dirid;</div><div class='del'>-	dotdot-&gt;deh_objectid = par_objid;</div><div class='del'>-	dotdot-&gt;deh_state = 0;	/* Endian safe if 0 */</div><div class='del'>-	put_deh_location(dotdot, deh_location(dot) - strlen(".."));</div><div class='del'>-	mark_de_visible(dotdot);</div><div class='del'>-</div><div class='del'>-	/* copy ".." and "." */</div><div class='del'>-	memcpy(body + deh_location(dot), ".", 1);</div><div class='del'>-	memcpy(body + deh_location(dotdot), "..", 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* compose directory item containing "." and ".." entries */</div><div class='del'>-void make_empty_dir_item(char *body, __le32 dirid, __le32 objid,</div><div class='del'>-			 __le32 par_dirid, __le32 par_objid)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *dot, *dotdot;</div><div class='del'>-</div><div class='del'>-	memset(body, 0, EMPTY_DIR_SIZE);</div><div class='del'>-	dot = (struct reiserfs_de_head *)body;</div><div class='del'>-	dotdot = dot + 1;</div><div class='del'>-</div><div class='del'>-	/* direntry header of "." */</div><div class='del'>-	put_deh_offset(dot, DOT_OFFSET);</div><div class='del'>-	/* these two are from make_le_item_head, and are LE */</div><div class='del'>-	dot-&gt;deh_dir_id = dirid;</div><div class='del'>-	dot-&gt;deh_objectid = objid;</div><div class='del'>-	dot-&gt;deh_state = 0;	/* Endian safe if 0 */</div><div class='del'>-	put_deh_location(dot, EMPTY_DIR_SIZE - ROUND_UP(strlen(".")));</div><div class='del'>-	mark_de_visible(dot);</div><div class='del'>-</div><div class='del'>-	/* direntry header of ".." */</div><div class='del'>-	put_deh_offset(dotdot, DOT_DOT_OFFSET);</div><div class='del'>-	/* key of ".." for the root directory */</div><div class='del'>-	/* these two are from the inode, and are LE */</div><div class='del'>-	dotdot-&gt;deh_dir_id = par_dirid;</div><div class='del'>-	dotdot-&gt;deh_objectid = par_objid;</div><div class='del'>-	dotdot-&gt;deh_state = 0;	/* Endian safe if 0 */</div><div class='del'>-	put_deh_location(dotdot, deh_location(dot) - ROUND_UP(strlen("..")));</div><div class='del'>-	mark_de_visible(dotdot);</div><div class='del'>-</div><div class='del'>-	/* copy ".." and "." */</div><div class='del'>-	memcpy(body + deh_location(dot), ".", 1);</div><div class='del'>-	memcpy(body + deh_location(dotdot), "..", 2);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c<br/>deleted file mode 100644<br/>index 5129efc6f2e6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/do_balan.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/do_balan.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1900 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Now we have all buffers that must be used in balancing of the tree</div><div class='del'>- * Further calculations can not cause schedule(), and thus the buffer</div><div class='del'>- * tree will be stable until the balancing will be finished</div><div class='del'>- * balance the tree according to the analysis made before,</div><div class='del'>- * and using buffers obtained after all above.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-static inline void buffer_info_init_left(struct tree_balance *tb,</div><div class='del'>-                                         struct buffer_info *bi)</div><div class='del'>-{</div><div class='del'>-	bi-&gt;tb          = tb;</div><div class='del'>-	bi-&gt;bi_bh       = tb-&gt;L[0];</div><div class='del'>-	bi-&gt;bi_parent   = tb-&gt;FL[0];</div><div class='del'>-	bi-&gt;bi_position = get_left_neighbor_position(tb, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void buffer_info_init_right(struct tree_balance *tb,</div><div class='del'>-                                          struct buffer_info *bi)</div><div class='del'>-{</div><div class='del'>-	bi-&gt;tb          = tb;</div><div class='del'>-	bi-&gt;bi_bh       = tb-&gt;R[0];</div><div class='del'>-	bi-&gt;bi_parent   = tb-&gt;FR[0];</div><div class='del'>-	bi-&gt;bi_position = get_right_neighbor_position(tb, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void buffer_info_init_tbS0(struct tree_balance *tb,</div><div class='del'>-                                         struct buffer_info *bi)</div><div class='del'>-{</div><div class='del'>-	bi-&gt;tb          = tb;</div><div class='del'>-	bi-&gt;bi_bh        = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	bi-&gt;bi_parent   = PATH_H_PPARENT(tb-&gt;tb_path, 0);</div><div class='del'>-	bi-&gt;bi_position = PATH_H_POSITION(tb-&gt;tb_path, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void buffer_info_init_bh(struct tree_balance *tb,</div><div class='del'>-                                       struct buffer_info *bi,</div><div class='del'>-                                       struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	bi-&gt;tb          = tb;</div><div class='del'>-	bi-&gt;bi_bh       = bh;</div><div class='del'>-	bi-&gt;bi_parent   = NULL;</div><div class='del'>-	bi-&gt;bi_position = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void do_balance_mark_leaf_dirty(struct tree_balance *tb,</div><div class='del'>-				       struct buffer_head *bh, int flag)</div><div class='del'>-{</div><div class='del'>-	journal_mark_dirty(tb-&gt;transaction_handle, bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define do_balance_mark_internal_dirty do_balance_mark_leaf_dirty</div><div class='del'>-#define do_balance_mark_sb_dirty do_balance_mark_leaf_dirty</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * summary:</div><div class='del'>- *  if deleting something ( tb-&gt;insert_size[0] &lt; 0 )</div><div class='del'>- *    return(balance_leaf_when_delete()); (flag d handled here)</div><div class='del'>- *  else</div><div class='del'>- *    if lnum is larger than 0 we put items into the left node</div><div class='del'>- *    if rnum is larger than 0 we put items into the right node</div><div class='del'>- *    if snum1 is larger than 0 we put items into the new node s1</div><div class='del'>- *    if snum2 is larger than 0 we put items into the new node s2</div><div class='del'>- * Note that all *num* count new items being created.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void balance_leaf_when_delete_del(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int item_pos = PATH_LAST_POSITION(tb-&gt;tb_path);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	struct item_head *ih = item_head(tbS0, item_pos);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	RFALSE(ih_item_len(ih) + IH_SIZE != -tb-&gt;insert_size[0],</div><div class='del'>-	       "vs-12013: mode Delete, insert size %d, ih to be deleted %h",</div><div class='del'>-	       -tb-&gt;insert_size[0], ih);</div><div class='del'>-</div><div class='del'>-	buffer_info_init_tbS0(tb, &amp;bi);</div><div class='del'>-	leaf_delete_items(&amp;bi, 0, item_pos, 1, -1);</div><div class='del'>-</div><div class='del'>-	if (!item_pos &amp;&amp; tb-&gt;CFL[0]) {</div><div class='del'>-		if (B_NR_ITEMS(tbS0)) {</div><div class='del'>-			replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0], tbS0, 0);</div><div class='del'>-		} else {</div><div class='del'>-			if (!PATH_H_POSITION(tb-&gt;tb_path, 1))</div><div class='del'>-				replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0],</div><div class='del'>-					    PATH_H_PPARENT(tb-&gt;tb_path, 0), 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(!item_pos &amp;&amp; !tb-&gt;CFL[0],</div><div class='del'>-	       "PAP-12020: tb-&gt;CFL[0]==%p, tb-&gt;L[0]==%p", tb-&gt;CFL[0],</div><div class='del'>-	       tb-&gt;L[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* cut item in S[0] */</div><div class='del'>-static void balance_leaf_when_delete_cut(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int item_pos = PATH_LAST_POSITION(tb-&gt;tb_path);</div><div class='del'>-	struct item_head *ih = item_head(tbS0, item_pos);</div><div class='del'>-	int pos_in_item = tb-&gt;tb_path-&gt;pos_in_item;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	buffer_info_init_tbS0(tb, &amp;bi);</div><div class='del'>-</div><div class='del'>-	if (is_direntry_le_ih(ih)) {</div><div class='del'>-		/*</div><div class='del'>-		 * UFS unlink semantics are such that you can only</div><div class='del'>-		 * delete one directory entry at a time.</div><div class='del'>-		 *</div><div class='del'>-		 * when we cut a directory tb-&gt;insert_size[0] means</div><div class='del'>-		 * number of entries to be cut (always 1)</div><div class='del'>-		 */</div><div class='del'>-		tb-&gt;insert_size[0] = -1;</div><div class='del'>-		leaf_cut_from_buffer(&amp;bi, item_pos, pos_in_item,</div><div class='del'>-				     -tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		RFALSE(!item_pos &amp;&amp; !pos_in_item &amp;&amp; !tb-&gt;CFL[0],</div><div class='del'>-		       "PAP-12030: can not change delimiting key. CFL[0]=%p",</div><div class='del'>-		       tb-&gt;CFL[0]);</div><div class='del'>-</div><div class='del'>-		if (!item_pos &amp;&amp; !pos_in_item &amp;&amp; tb-&gt;CFL[0])</div><div class='del'>-			replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0], tbS0, 0);</div><div class='del'>-	} else {</div><div class='del'>-		leaf_cut_from_buffer(&amp;bi, item_pos, pos_in_item,</div><div class='del'>-				     -tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		RFALSE(!ih_item_len(ih),</div><div class='del'>-		       "PAP-12035: cut must leave non-zero dynamic "</div><div class='del'>-		       "length of item");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int balance_leaf_when_delete_left(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-</div><div class='del'>-	/* L[0] must be joined with S[0] */</div><div class='del'>-	if (tb-&gt;lnum[0] == -1) {</div><div class='del'>-		/* R[0] must be also joined with S[0] */</div><div class='del'>-		if (tb-&gt;rnum[0] == -1) {</div><div class='del'>-			if (tb-&gt;FR[0] == PATH_H_PPARENT(tb-&gt;tb_path, 0)) {</div><div class='del'>-				/*</div><div class='del'>-				 * all contents of all the</div><div class='del'>-				 * 3 buffers will be in L[0]</div><div class='del'>-				 */</div><div class='del'>-				if (PATH_H_POSITION(tb-&gt;tb_path, 1) == 0 &amp;&amp;</div><div class='del'>-				    1 &lt; B_NR_ITEMS(tb-&gt;FR[0]))</div><div class='del'>-					replace_key(tb, tb-&gt;CFL[0],</div><div class='del'>-						    tb-&gt;lkey[0], tb-&gt;FR[0], 1);</div><div class='del'>-</div><div class='del'>-				leaf_move_items(LEAF_FROM_S_TO_L, tb, n, -1,</div><div class='del'>-						NULL);</div><div class='del'>-				leaf_move_items(LEAF_FROM_R_TO_L, tb,</div><div class='del'>-						B_NR_ITEMS(tb-&gt;R[0]), -1,</div><div class='del'>-						NULL);</div><div class='del'>-</div><div class='del'>-				reiserfs_invalidate_buffer(tb, tbS0);</div><div class='del'>-				reiserfs_invalidate_buffer(tb, tb-&gt;R[0]);</div><div class='del'>-</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* all contents of all the 3 buffers will be in R[0] */</div><div class='del'>-			leaf_move_items(LEAF_FROM_S_TO_R, tb, n, -1, NULL);</div><div class='del'>-			leaf_move_items(LEAF_FROM_L_TO_R, tb,</div><div class='del'>-					B_NR_ITEMS(tb-&gt;L[0]), -1, NULL);</div><div class='del'>-</div><div class='del'>-			/* right_delimiting_key is correct in R[0] */</div><div class='del'>-			replace_key(tb, tb-&gt;CFR[0], tb-&gt;rkey[0], tb-&gt;R[0], 0);</div><div class='del'>-</div><div class='del'>-			reiserfs_invalidate_buffer(tb, tbS0);</div><div class='del'>-			reiserfs_invalidate_buffer(tb, tb-&gt;L[0]);</div><div class='del'>-</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RFALSE(tb-&gt;rnum[0] != 0,</div><div class='del'>-		       "PAP-12045: rnum must be 0 (%d)", tb-&gt;rnum[0]);</div><div class='del'>-		/* all contents of L[0] and S[0] will be in L[0] */</div><div class='del'>-		leaf_shift_left(tb, n, -1);</div><div class='del'>-</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbS0);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * a part of contents of S[0] will be in L[0] and</div><div class='del'>-	 * the rest part of S[0] will be in R[0]</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	RFALSE((tb-&gt;lnum[0] + tb-&gt;rnum[0] &lt; n) ||</div><div class='del'>-	       (tb-&gt;lnum[0] + tb-&gt;rnum[0] &gt; n + 1),</div><div class='del'>-	       "PAP-12050: rnum(%d) and lnum(%d) and item "</div><div class='del'>-	       "number(%d) in S[0] are not consistent",</div><div class='del'>-	       tb-&gt;rnum[0], tb-&gt;lnum[0], n);</div><div class='del'>-	RFALSE((tb-&gt;lnum[0] + tb-&gt;rnum[0] == n) &amp;&amp;</div><div class='del'>-	       (tb-&gt;lbytes != -1 || tb-&gt;rbytes != -1),</div><div class='del'>-	       "PAP-12055: bad rbytes (%d)/lbytes (%d) "</div><div class='del'>-	       "parameters when items are not split",</div><div class='del'>-	       tb-&gt;rbytes, tb-&gt;lbytes);</div><div class='del'>-	RFALSE((tb-&gt;lnum[0] + tb-&gt;rnum[0] == n + 1) &amp;&amp;</div><div class='del'>-	       (tb-&gt;lbytes &lt; 1 || tb-&gt;rbytes != -1),</div><div class='del'>-	       "PAP-12060: bad rbytes (%d)/lbytes (%d) "</div><div class='del'>-	       "parameters when items are split",</div><div class='del'>-	       tb-&gt;rbytes, tb-&gt;lbytes);</div><div class='del'>-</div><div class='del'>-	leaf_shift_left(tb, tb-&gt;lnum[0], tb-&gt;lbytes);</div><div class='del'>-	leaf_shift_right(tb, tb-&gt;rnum[0], tb-&gt;rbytes);</div><div class='del'>-</div><div class='del'>-	reiserfs_invalidate_buffer(tb, tbS0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Balance leaf node in case of delete or cut: insert_size[0] &lt; 0</div><div class='del'>- *</div><div class='del'>- * lnum, rnum can have values &gt;= -1</div><div class='del'>- *	-1 means that the neighbor must be joined with S</div><div class='del'>- *	 0 means that nothing should be done with the neighbor</div><div class='del'>- *	&gt;0 means to shift entirely or partly the specified number of items</div><div class='del'>- *         to the neighbor</div><div class='del'>- */</div><div class='del'>-static int balance_leaf_when_delete(struct tree_balance *tb, int flag)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;FR[0] &amp;&amp; B_LEVEL(tb-&gt;FR[0]) != DISK_LEAF_NODE_LEVEL + 1,</div><div class='del'>-	       "vs- 12000: level: wrong FR %z", tb-&gt;FR[0]);</div><div class='del'>-	RFALSE(tb-&gt;blknum[0] &gt; 1,</div><div class='del'>-	       "PAP-12005: tb-&gt;blknum == %d, can not be &gt; 1", tb-&gt;blknum[0]);</div><div class='del'>-	RFALSE(!tb-&gt;blknum[0] &amp;&amp; !PATH_H_PPARENT(tb-&gt;tb_path, 0),</div><div class='del'>-	       "PAP-12010: tree can not be empty");</div><div class='del'>-</div><div class='del'>-	buffer_info_init_tbS0(tb, &amp;bi);</div><div class='del'>-</div><div class='del'>-	/* Delete or truncate the item */</div><div class='del'>-</div><div class='del'>-	BUG_ON(flag != M_DELETE &amp;&amp; flag != M_CUT);</div><div class='del'>-	if (flag == M_DELETE)</div><div class='del'>-		balance_leaf_when_delete_del(tb);</div><div class='del'>-	else /* M_CUT */</div><div class='del'>-		balance_leaf_when_delete_cut(tb);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the rule is that no shifting occurs unless by shifting</div><div class='del'>-	 * a node can be freed</div><div class='del'>-	 */</div><div class='del'>-	n = B_NR_ITEMS(tbS0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* L[0] takes part in balancing */</div><div class='del'>-	if (tb-&gt;lnum[0])</div><div class='del'>-		return balance_leaf_when_delete_left(tb);</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;rnum[0] == -1) {</div><div class='del'>-		/* all contents of R[0] and S[0] will be in R[0] */</div><div class='del'>-		leaf_shift_right(tb, n, -1);</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbS0);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;rnum[0],</div><div class='del'>-	       "PAP-12065: bad rnum parameter must be 0 (%d)", tb-&gt;rnum[0]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int balance_leaf_insert_left(struct tree_balance *tb,</div><div class='del'>-					     struct item_head *const ih,</div><div class='del'>-					     const char * const body)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	int n = B_NR_ITEMS(tb-&gt;L[0]);</div><div class='del'>-	unsigned body_shift_bytes = 0;</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;item_pos == tb-&gt;lnum[0] - 1 &amp;&amp; tb-&gt;lbytes != -1) {</div><div class='del'>-		/* part of new item falls into L[0] */</div><div class='del'>-		int new_item_len, shift;</div><div class='del'>-</div><div class='del'>-		ret = leaf_shift_left(tb, tb-&gt;lnum[0] - 1, -1);</div><div class='del'>-</div><div class='del'>-		/* Calculate item length to insert to S[0] */</div><div class='del'>-		new_item_len = ih_item_len(ih) - tb-&gt;lbytes;</div><div class='del'>-</div><div class='del'>-		/* Calculate and check item length to insert to L[0] */</div><div class='del'>-		put_ih_item_len(ih, ih_item_len(ih) - new_item_len);</div><div class='del'>-</div><div class='del'>-		RFALSE(ih_item_len(ih) &lt;= 0,</div><div class='del'>-		       "PAP-12080: there is nothing to insert into L[0]: "</div><div class='del'>-		       "ih_item_len=%d", ih_item_len(ih));</div><div class='del'>-</div><div class='del'>-		/* Insert new item into L[0] */</div><div class='del'>-		buffer_info_init_left(tb, &amp;bi);</div><div class='del'>-		leaf_insert_into_buf(&amp;bi, n + tb-&gt;item_pos - ret, ih, body,</div><div class='del'>-			     min_t(int, tb-&gt;zeroes_num, ih_item_len(ih)));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate key component, item length and body to</div><div class='del'>-		 * insert into S[0]</div><div class='del'>-		 */</div><div class='del'>-		shift = 0;</div><div class='del'>-		if (is_indirect_le_ih(ih))</div><div class='del'>-			shift = tb-&gt;tb_sb-&gt;s_blocksize_bits - UNFM_P_SHIFT;</div><div class='del'>-</div><div class='del'>-		add_le_ih_k_offset(ih, tb-&gt;lbytes &lt;&lt; shift);</div><div class='del'>-</div><div class='del'>-		put_ih_item_len(ih, new_item_len);</div><div class='del'>-		if (tb-&gt;lbytes &gt; tb-&gt;zeroes_num) {</div><div class='del'>-			body_shift_bytes = tb-&gt;lbytes - tb-&gt;zeroes_num;</div><div class='del'>-			tb-&gt;zeroes_num = 0;</div><div class='del'>-		} else</div><div class='del'>-			tb-&gt;zeroes_num -= tb-&gt;lbytes;</div><div class='del'>-</div><div class='del'>-		RFALSE(ih_item_len(ih) &lt;= 0,</div><div class='del'>-		       "PAP-12085: there is nothing to insert into S[0]: "</div><div class='del'>-		       "ih_item_len=%d", ih_item_len(ih));</div><div class='del'>-	} else {</div><div class='del'>-		/* new item in whole falls into L[0] */</div><div class='del'>-		/* Shift lnum[0]-1 items to L[0] */</div><div class='del'>-		ret = leaf_shift_left(tb, tb-&gt;lnum[0] - 1, tb-&gt;lbytes);</div><div class='del'>-</div><div class='del'>-		/* Insert new item into L[0] */</div><div class='del'>-		buffer_info_init_left(tb, &amp;bi);</div><div class='del'>-		leaf_insert_into_buf(&amp;bi, n + tb-&gt;item_pos - ret, ih, body,</div><div class='del'>-				     tb-&gt;zeroes_num);</div><div class='del'>-		tb-&gt;insert_size[0] = 0;</div><div class='del'>-		tb-&gt;zeroes_num = 0;</div><div class='del'>-	}</div><div class='del'>-	return body_shift_bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_paste_left_shift_dirent(struct tree_balance *tb,</div><div class='del'>-						 struct item_head * const ih,</div><div class='del'>-						 const char * const body)</div><div class='del'>-{</div><div class='del'>-	int n = B_NR_ITEMS(tb-&gt;L[0]);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;zeroes_num,</div><div class='del'>-	       "PAP-12090: invalid parameter in case of a directory");</div><div class='del'>-</div><div class='del'>-	/* directory item */</div><div class='del'>-	if (tb-&gt;lbytes &gt; tb-&gt;pos_in_item) {</div><div class='del'>-		/* new directory entry falls into L[0] */</div><div class='del'>-		struct item_head *pasted;</div><div class='del'>-		int ret, l_pos_in_item = tb-&gt;pos_in_item;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Shift lnum[0] - 1 items in whole.</div><div class='del'>-		 * Shift lbytes - 1 entries from given directory item</div><div class='del'>-		 */</div><div class='del'>-		ret = leaf_shift_left(tb, tb-&gt;lnum[0], tb-&gt;lbytes - 1);</div><div class='del'>-		if (ret &amp;&amp; !tb-&gt;item_pos) {</div><div class='del'>-			pasted = item_head(tb-&gt;L[0], B_NR_ITEMS(tb-&gt;L[0]) - 1);</div><div class='del'>-			l_pos_in_item += ih_entry_count(pasted) -</div><div class='del'>-					 (tb-&gt;lbytes - 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Append given directory entry to directory item */</div><div class='del'>-		buffer_info_init_left(tb, &amp;bi);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, n + tb-&gt;item_pos - ret,</div><div class='del'>-				     l_pos_in_item, tb-&gt;insert_size[0],</div><div class='del'>-				     body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * previous string prepared space for pasting new entry,</div><div class='del'>-		 * following string pastes this entry</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * when we have merge directory item, pos_in_item</div><div class='del'>-		 * has been changed too</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* paste new directory entry. 1 is entry number */</div><div class='del'>-		leaf_paste_entries(&amp;bi, n + tb-&gt;item_pos - ret,</div><div class='del'>-				   l_pos_in_item, 1,</div><div class='del'>-				   (struct reiserfs_de_head *) body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-		tb-&gt;insert_size[0] = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* new directory item doesn't fall into L[0] */</div><div class='del'>-		/*</div><div class='del'>-		 * Shift lnum[0]-1 items in whole. Shift lbytes</div><div class='del'>-		 * directory entries from directory item number lnum[0]</div><div class='del'>-		 */</div><div class='del'>-		leaf_shift_left(tb, tb-&gt;lnum[0], tb-&gt;lbytes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate new position to append in item body */</div><div class='del'>-	tb-&gt;pos_in_item -= tb-&gt;lbytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int balance_leaf_paste_left_shift(struct tree_balance *tb,</div><div class='del'>-						  struct item_head * const ih,</div><div class='del'>-						  const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tb-&gt;L[0]);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	int body_shift_bytes = 0;</div><div class='del'>-</div><div class='del'>-	if (is_direntry_le_ih(item_head(tbS0, tb-&gt;item_pos))) {</div><div class='del'>-		balance_leaf_paste_left_shift_dirent(tb, ih, body);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;lbytes &lt;= 0,</div><div class='del'>-	       "PAP-12095: there is nothing to shift to L[0]. "</div><div class='del'>-	       "lbytes=%d", tb-&gt;lbytes);</div><div class='del'>-	RFALSE(tb-&gt;pos_in_item != ih_item_len(item_head(tbS0, tb-&gt;item_pos)),</div><div class='del'>-	       "PAP-12100: incorrect position to paste: "</div><div class='del'>-	       "item_len=%d, pos_in_item=%d",</div><div class='del'>-	       ih_item_len(item_head(tbS0, tb-&gt;item_pos)), tb-&gt;pos_in_item);</div><div class='del'>-</div><div class='del'>-	/* appended item will be in L[0] in whole */</div><div class='del'>-	if (tb-&gt;lbytes &gt;= tb-&gt;pos_in_item) {</div><div class='del'>-		struct item_head *tbS0_pos_ih, *tbL0_ih;</div><div class='del'>-		struct item_head *tbS0_0_ih;</div><div class='del'>-		struct reiserfs_key *left_delim_key;</div><div class='del'>-		int ret, l_n, version, temp_l;</div><div class='del'>-</div><div class='del'>-		tbS0_pos_ih = item_head(tbS0, tb-&gt;item_pos);</div><div class='del'>-		tbS0_0_ih = item_head(tbS0, 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * this bytes number must be appended</div><div class='del'>-		 * to the last item of L[h]</div><div class='del'>-		 */</div><div class='del'>-		l_n = tb-&gt;lbytes - tb-&gt;pos_in_item;</div><div class='del'>-</div><div class='del'>-		/* Calculate new insert_size[0] */</div><div class='del'>-		tb-&gt;insert_size[0] -= l_n;</div><div class='del'>-</div><div class='del'>-		RFALSE(tb-&gt;insert_size[0] &lt;= 0,</div><div class='del'>-		       "PAP-12105: there is nothing to paste into "</div><div class='del'>-		       "L[0]. insert_size=%d", tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		ret = leaf_shift_left(tb, tb-&gt;lnum[0],</div><div class='del'>-				      ih_item_len(tbS0_pos_ih));</div><div class='del'>-</div><div class='del'>-		tbL0_ih = item_head(tb-&gt;L[0], n + tb-&gt;item_pos - ret);</div><div class='del'>-</div><div class='del'>-		/* Append to body of item in L[0] */</div><div class='del'>-		buffer_info_init_left(tb, &amp;bi);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, n + tb-&gt;item_pos - ret,</div><div class='del'>-				     ih_item_len(tbL0_ih), l_n, body,</div><div class='del'>-				     min_t(int, l_n, tb-&gt;zeroes_num));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * 0-th item in S0 can be only of DIRECT type</div><div class='del'>-		 * when l_n != 0</div><div class='del'>-		 */</div><div class='del'>-		temp_l = l_n;</div><div class='del'>-</div><div class='del'>-		RFALSE(ih_item_len(tbS0_0_ih),</div><div class='del'>-		       "PAP-12106: item length must be 0");</div><div class='del'>-		RFALSE(comp_short_le_keys(&amp;tbS0_0_ih-&gt;ih_key,</div><div class='del'>-		       leaf_key(tb-&gt;L[0], n + tb-&gt;item_pos - ret)),</div><div class='del'>-		       "PAP-12107: items must be of the same file");</div><div class='del'>-</div><div class='del'>-		if (is_indirect_le_ih(tbL0_ih)) {</div><div class='del'>-			int shift = tb-&gt;tb_sb-&gt;s_blocksize_bits - UNFM_P_SHIFT;</div><div class='del'>-			temp_l = l_n &lt;&lt; shift;</div><div class='del'>-		}</div><div class='del'>-		/* update key of first item in S0 */</div><div class='del'>-		version = ih_version(tbS0_0_ih);</div><div class='del'>-		add_le_key_k_offset(version, &amp;tbS0_0_ih-&gt;ih_key, temp_l);</div><div class='del'>-</div><div class='del'>-		/* update left delimiting key */</div><div class='del'>-		left_delim_key = internal_key(tb-&gt;CFL[0], tb-&gt;lkey[0]);</div><div class='del'>-		add_le_key_k_offset(version, left_delim_key, temp_l);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate new body, position in item and</div><div class='del'>-		 * insert_size[0]</div><div class='del'>-		 */</div><div class='del'>-		if (l_n &gt; tb-&gt;zeroes_num) {</div><div class='del'>-			body_shift_bytes = l_n - tb-&gt;zeroes_num;</div><div class='del'>-			tb-&gt;zeroes_num = 0;</div><div class='del'>-		} else</div><div class='del'>-			tb-&gt;zeroes_num -= l_n;</div><div class='del'>-		tb-&gt;pos_in_item = 0;</div><div class='del'>-</div><div class='del'>-		RFALSE(comp_short_le_keys(&amp;tbS0_0_ih-&gt;ih_key,</div><div class='del'>-					  leaf_key(tb-&gt;L[0],</div><div class='del'>-						 B_NR_ITEMS(tb-&gt;L[0]) - 1)) ||</div><div class='del'>-		       !op_is_left_mergeable(leaf_key(tbS0, 0), tbS0-&gt;b_size) ||</div><div class='del'>-		       !op_is_left_mergeable(left_delim_key, tbS0-&gt;b_size),</div><div class='del'>-		       "PAP-12120: item must be merge-able with left "</div><div class='del'>-		       "neighboring item");</div><div class='del'>-	} else {</div><div class='del'>-		/* only part of the appended item will be in L[0] */</div><div class='del'>-</div><div class='del'>-		/* Calculate position in item for append in S[0] */</div><div class='del'>-		tb-&gt;pos_in_item -= tb-&gt;lbytes;</div><div class='del'>-</div><div class='del'>-		RFALSE(tb-&gt;pos_in_item &lt;= 0,</div><div class='del'>-		       "PAP-12125: no place for paste. pos_in_item=%d",</div><div class='del'>-		       tb-&gt;pos_in_item);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Shift lnum[0] - 1 items in whole.</div><div class='del'>-		 * Shift lbytes - 1 byte from item number lnum[0]</div><div class='del'>-		 */</div><div class='del'>-		leaf_shift_left(tb, tb-&gt;lnum[0], tb-&gt;lbytes);</div><div class='del'>-	}</div><div class='del'>-	return body_shift_bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* appended item will be in L[0] in whole */</div><div class='del'>-static void balance_leaf_paste_left_whole(struct tree_balance *tb,</div><div class='del'>-					  struct item_head * const ih,</div><div class='del'>-					  const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tb-&gt;L[0]);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	struct item_head *pasted;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* if we paste into first item of S[0] and it is left mergable */</div><div class='del'>-	if (!tb-&gt;item_pos &amp;&amp;</div><div class='del'>-	    op_is_left_mergeable(leaf_key(tbS0, 0), tbS0-&gt;b_size)) {</div><div class='del'>-		/*</div><div class='del'>-		 * then increment pos_in_item by the size of the</div><div class='del'>-		 * last item in L[0]</div><div class='del'>-		 */</div><div class='del'>-		pasted = item_head(tb-&gt;L[0], n - 1);</div><div class='del'>-		if (is_direntry_le_ih(pasted))</div><div class='del'>-			tb-&gt;pos_in_item += ih_entry_count(pasted);</div><div class='del'>-		else</div><div class='del'>-			tb-&gt;pos_in_item += ih_item_len(pasted);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Shift lnum[0] - 1 items in whole.</div><div class='del'>-	 * Shift lbytes - 1 byte from item number lnum[0]</div><div class='del'>-	 */</div><div class='del'>-	ret = leaf_shift_left(tb, tb-&gt;lnum[0], tb-&gt;lbytes);</div><div class='del'>-</div><div class='del'>-	/* Append to body of item in L[0] */</div><div class='del'>-	buffer_info_init_left(tb, &amp;bi);</div><div class='del'>-	leaf_paste_in_buffer(&amp;bi, n + tb-&gt;item_pos - ret, tb-&gt;pos_in_item,</div><div class='del'>-			     tb-&gt;insert_size[0], body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-	/* if appended item is directory, paste entry */</div><div class='del'>-	pasted = item_head(tb-&gt;L[0], n + tb-&gt;item_pos - ret);</div><div class='del'>-	if (is_direntry_le_ih(pasted))</div><div class='del'>-		leaf_paste_entries(&amp;bi, n + tb-&gt;item_pos - ret,</div><div class='del'>-				   tb-&gt;pos_in_item, 1,</div><div class='del'>-				   (struct reiserfs_de_head *)body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if appended item is indirect item, put unformatted node</div><div class='del'>-	 * into un list</div><div class='del'>-	 */</div><div class='del'>-	if (is_indirect_le_ih(pasted))</div><div class='del'>-		set_ih_free_space(pasted, 0);</div><div class='del'>-</div><div class='del'>-	tb-&gt;insert_size[0] = 0;</div><div class='del'>-	tb-&gt;zeroes_num = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int balance_leaf_paste_left(struct tree_balance *tb,</div><div class='del'>-					    struct item_head * const ih,</div><div class='del'>-					    const char * const body)</div><div class='del'>-{</div><div class='del'>-	/* we must shift the part of the appended item */</div><div class='del'>-	if (tb-&gt;item_pos == tb-&gt;lnum[0] - 1 &amp;&amp; tb-&gt;lbytes != -1)</div><div class='del'>-		return balance_leaf_paste_left_shift(tb, ih, body);</div><div class='del'>-	else</div><div class='del'>-		balance_leaf_paste_left_whole(tb, ih, body);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Shift lnum[0] items from S[0] to the left neighbor L[0] */</div><div class='del'>-static unsigned int balance_leaf_left(struct tree_balance *tb,</div><div class='del'>-				      struct item_head * const ih,</div><div class='del'>-				      const char * const body, int flag)</div><div class='del'>-{</div><div class='del'>-	if (tb-&gt;lnum[0] &lt;= 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* new item or it part falls to L[0], shift it too */</div><div class='del'>-	if (tb-&gt;item_pos &lt; tb-&gt;lnum[0]) {</div><div class='del'>-		BUG_ON(flag != M_INSERT &amp;&amp; flag != M_PASTE);</div><div class='del'>-</div><div class='del'>-		if (flag == M_INSERT)</div><div class='del'>-			return balance_leaf_insert_left(tb, ih, body);</div><div class='del'>-		else /* M_PASTE */</div><div class='del'>-			return balance_leaf_paste_left(tb, ih, body);</div><div class='del'>-	} else</div><div class='del'>-		/* new item doesn't fall into L[0] */</div><div class='del'>-		leaf_shift_left(tb, tb-&gt;lnum[0], tb-&gt;lbytes);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void balance_leaf_insert_right(struct tree_balance *tb,</div><div class='del'>-				      struct item_head * const ih,</div><div class='del'>-				      const char * const body)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	/* new item or part of it doesn't fall into R[0] */</div><div class='del'>-	if (n - tb-&gt;rnum[0] &gt;= tb-&gt;item_pos) {</div><div class='del'>-		leaf_shift_right(tb, tb-&gt;rnum[0], tb-&gt;rbytes);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* new item or its part falls to R[0] */</div><div class='del'>-</div><div class='del'>-	/* part of new item falls into R[0] */</div><div class='del'>-	if (tb-&gt;item_pos == n - tb-&gt;rnum[0] + 1 &amp;&amp; tb-&gt;rbytes != -1) {</div><div class='del'>-		loff_t old_key_comp, old_len, r_zeroes_number;</div><div class='del'>-		const char *r_body;</div><div class='del'>-		int shift;</div><div class='del'>-		loff_t offset;</div><div class='del'>-</div><div class='del'>-		leaf_shift_right(tb, tb-&gt;rnum[0] - 1, -1);</div><div class='del'>-</div><div class='del'>-		/* Remember key component and item length */</div><div class='del'>-		old_key_comp = le_ih_k_offset(ih);</div><div class='del'>-		old_len = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate key component and item length to insert</div><div class='del'>-		 * into R[0]</div><div class='del'>-		 */</div><div class='del'>-		shift = 0;</div><div class='del'>-		if (is_indirect_le_ih(ih))</div><div class='del'>-			shift = tb-&gt;tb_sb-&gt;s_blocksize_bits - UNFM_P_SHIFT;</div><div class='del'>-		offset = le_ih_k_offset(ih) + ((old_len - tb-&gt;rbytes) &lt;&lt; shift);</div><div class='del'>-		set_le_ih_k_offset(ih, offset);</div><div class='del'>-		put_ih_item_len(ih, tb-&gt;rbytes);</div><div class='del'>-</div><div class='del'>-		/* Insert part of the item into R[0] */</div><div class='del'>-		buffer_info_init_right(tb, &amp;bi);</div><div class='del'>-		if ((old_len - tb-&gt;rbytes) &gt; tb-&gt;zeroes_num) {</div><div class='del'>-			r_zeroes_number = 0;</div><div class='del'>-			r_body = body + (old_len - tb-&gt;rbytes) - tb-&gt;zeroes_num;</div><div class='del'>-		} else {</div><div class='del'>-			r_body = body;</div><div class='del'>-			r_zeroes_number = tb-&gt;zeroes_num -</div><div class='del'>-					  (old_len - tb-&gt;rbytes);</div><div class='del'>-			tb-&gt;zeroes_num -= r_zeroes_number;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		leaf_insert_into_buf(&amp;bi, 0, ih, r_body, r_zeroes_number);</div><div class='del'>-</div><div class='del'>-		/* Replace right delimiting key by first key in R[0] */</div><div class='del'>-		replace_key(tb, tb-&gt;CFR[0], tb-&gt;rkey[0], tb-&gt;R[0], 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate key component and item length to</div><div class='del'>-		 * insert into S[0]</div><div class='del'>-		 */</div><div class='del'>-		set_le_ih_k_offset(ih, old_key_comp);</div><div class='del'>-		put_ih_item_len(ih, old_len - tb-&gt;rbytes);</div><div class='del'>-</div><div class='del'>-		tb-&gt;insert_size[0] -= tb-&gt;rbytes;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/* whole new item falls into R[0] */</div><div class='del'>-</div><div class='del'>-		/* Shift rnum[0]-1 items to R[0] */</div><div class='del'>-		leaf_shift_right(tb, tb-&gt;rnum[0] - 1, tb-&gt;rbytes);</div><div class='del'>-</div><div class='del'>-		/* Insert new item into R[0] */</div><div class='del'>-		buffer_info_init_right(tb, &amp;bi);</div><div class='del'>-		leaf_insert_into_buf(&amp;bi, tb-&gt;item_pos - n + tb-&gt;rnum[0] - 1,</div><div class='del'>-				     ih, body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		if (tb-&gt;item_pos - n + tb-&gt;rnum[0] - 1 == 0)</div><div class='del'>-			replace_key(tb, tb-&gt;CFR[0], tb-&gt;rkey[0], tb-&gt;R[0], 0);</div><div class='del'>-</div><div class='del'>-		tb-&gt;zeroes_num = tb-&gt;insert_size[0] = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void balance_leaf_paste_right_shift_dirent(struct tree_balance *tb,</div><div class='del'>-				     struct item_head * const ih,</div><div class='del'>-				     const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	int entry_count;</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;zeroes_num,</div><div class='del'>-	       "PAP-12145: invalid parameter in case of a directory");</div><div class='del'>-	entry_count = ih_entry_count(item_head(tbS0, tb-&gt;item_pos));</div><div class='del'>-</div><div class='del'>-	/* new directory entry falls into R[0] */</div><div class='del'>-	if (entry_count - tb-&gt;rbytes &lt; tb-&gt;pos_in_item) {</div><div class='del'>-		int paste_entry_position;</div><div class='del'>-</div><div class='del'>-		RFALSE(tb-&gt;rbytes - 1 &gt;= entry_count || !tb-&gt;insert_size[0],</div><div class='del'>-		       "PAP-12150: no enough of entries to shift to R[0]: "</div><div class='del'>-		       "rbytes=%d, entry_count=%d", tb-&gt;rbytes, entry_count);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Shift rnum[0]-1 items in whole.</div><div class='del'>-		 * Shift rbytes-1 directory entries from directory</div><div class='del'>-		 * item number rnum[0]</div><div class='del'>-		 */</div><div class='del'>-		leaf_shift_right(tb, tb-&gt;rnum[0], tb-&gt;rbytes - 1);</div><div class='del'>-</div><div class='del'>-		/* Paste given directory entry to directory item */</div><div class='del'>-		paste_entry_position = tb-&gt;pos_in_item - entry_count +</div><div class='del'>-				       tb-&gt;rbytes - 1;</div><div class='del'>-		buffer_info_init_right(tb, &amp;bi);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, 0, paste_entry_position,</div><div class='del'>-				     tb-&gt;insert_size[0], body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		/* paste entry */</div><div class='del'>-		leaf_paste_entries(&amp;bi, 0, paste_entry_position, 1,</div><div class='del'>-				   (struct reiserfs_de_head *) body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		/* change delimiting keys */</div><div class='del'>-		if (paste_entry_position == 0)</div><div class='del'>-			replace_key(tb, tb-&gt;CFR[0], tb-&gt;rkey[0], tb-&gt;R[0], 0);</div><div class='del'>-</div><div class='del'>-		tb-&gt;insert_size[0] = 0;</div><div class='del'>-		tb-&gt;pos_in_item++;</div><div class='del'>-	} else {</div><div class='del'>-		/* new directory entry doesn't fall into R[0] */</div><div class='del'>-		leaf_shift_right(tb, tb-&gt;rnum[0], tb-&gt;rbytes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_paste_right_shift(struct tree_balance *tb,</div><div class='del'>-				     struct item_head * const ih,</div><div class='del'>-				     const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n_shift, n_rem, r_zeroes_number, version;</div><div class='del'>-	unsigned long temp_rem;</div><div class='del'>-	const char *r_body;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	/* we append to directory item */</div><div class='del'>-	if (is_direntry_le_ih(item_head(tbS0, tb-&gt;item_pos))) {</div><div class='del'>-		balance_leaf_paste_right_shift_dirent(tb, ih, body);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* regular object */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate number of bytes which must be shifted</div><div class='del'>-	 * from appended item</div><div class='del'>-	 */</div><div class='del'>-	n_shift = tb-&gt;rbytes - tb-&gt;insert_size[0];</div><div class='del'>-	if (n_shift &lt; 0)</div><div class='del'>-		n_shift = 0;</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;pos_in_item != ih_item_len(item_head(tbS0, tb-&gt;item_pos)),</div><div class='del'>-	       "PAP-12155: invalid position to paste. ih_item_len=%d, "</div><div class='del'>-	       "pos_in_item=%d", tb-&gt;pos_in_item,</div><div class='del'>-	       ih_item_len(item_head(tbS0, tb-&gt;item_pos)));</div><div class='del'>-</div><div class='del'>-	leaf_shift_right(tb, tb-&gt;rnum[0], n_shift);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate number of bytes which must remain in body</div><div class='del'>-	 * after appending to R[0]</div><div class='del'>-	 */</div><div class='del'>-	n_rem = tb-&gt;insert_size[0] - tb-&gt;rbytes;</div><div class='del'>-	if (n_rem &lt; 0)</div><div class='del'>-		n_rem = 0;</div><div class='del'>-</div><div class='del'>-	temp_rem = n_rem;</div><div class='del'>-</div><div class='del'>-	version = ih_version(item_head(tb-&gt;R[0], 0));</div><div class='del'>-</div><div class='del'>-	if (is_indirect_le_key(version, leaf_key(tb-&gt;R[0], 0))) {</div><div class='del'>-		int shift = tb-&gt;tb_sb-&gt;s_blocksize_bits - UNFM_P_SHIFT;</div><div class='del'>-		temp_rem = n_rem &lt;&lt; shift;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	add_le_key_k_offset(version, leaf_key(tb-&gt;R[0], 0), temp_rem);</div><div class='del'>-	add_le_key_k_offset(version, internal_key(tb-&gt;CFR[0], tb-&gt;rkey[0]),</div><div class='del'>-			    temp_rem);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(tb, tb-&gt;CFR[0], 0);</div><div class='del'>-</div><div class='del'>-	/* Append part of body into R[0] */</div><div class='del'>-	buffer_info_init_right(tb, &amp;bi);</div><div class='del'>-	if (n_rem &gt; tb-&gt;zeroes_num) {</div><div class='del'>-		r_zeroes_number = 0;</div><div class='del'>-		r_body = body + n_rem - tb-&gt;zeroes_num;</div><div class='del'>-	} else {</div><div class='del'>-		r_body = body;</div><div class='del'>-		r_zeroes_number = tb-&gt;zeroes_num - n_rem;</div><div class='del'>-		tb-&gt;zeroes_num -= r_zeroes_number;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	leaf_paste_in_buffer(&amp;bi, 0, n_shift, tb-&gt;insert_size[0] - n_rem,</div><div class='del'>-			     r_body, r_zeroes_number);</div><div class='del'>-</div><div class='del'>-	if (is_indirect_le_ih(item_head(tb-&gt;R[0], 0)))</div><div class='del'>-		set_ih_free_space(item_head(tb-&gt;R[0], 0), 0);</div><div class='del'>-</div><div class='del'>-	tb-&gt;insert_size[0] = n_rem;</div><div class='del'>-	if (!n_rem)</div><div class='del'>-		tb-&gt;pos_in_item++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_paste_right_whole(struct tree_balance *tb,</div><div class='del'>-				     struct item_head * const ih,</div><div class='del'>-				     const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-	struct item_head *pasted;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	buffer_info_init_right(tb, &amp;bi);</div><div class='del'>-	leaf_shift_right(tb, tb-&gt;rnum[0], tb-&gt;rbytes);</div><div class='del'>-</div><div class='del'>-	/* append item in R[0] */</div><div class='del'>-	if (tb-&gt;pos_in_item &gt;= 0) {</div><div class='del'>-		buffer_info_init_right(tb, &amp;bi);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, tb-&gt;item_pos - n + tb-&gt;rnum[0],</div><div class='del'>-				     tb-&gt;pos_in_item, tb-&gt;insert_size[0], body,</div><div class='del'>-				     tb-&gt;zeroes_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* paste new entry, if item is directory item */</div><div class='del'>-	pasted = item_head(tb-&gt;R[0], tb-&gt;item_pos - n + tb-&gt;rnum[0]);</div><div class='del'>-	if (is_direntry_le_ih(pasted) &amp;&amp; tb-&gt;pos_in_item &gt;= 0) {</div><div class='del'>-		leaf_paste_entries(&amp;bi, tb-&gt;item_pos - n + tb-&gt;rnum[0],</div><div class='del'>-				   tb-&gt;pos_in_item, 1,</div><div class='del'>-				   (struct reiserfs_de_head *)body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		if (!tb-&gt;pos_in_item) {</div><div class='del'>-</div><div class='del'>-			RFALSE(tb-&gt;item_pos - n + tb-&gt;rnum[0],</div><div class='del'>-			       "PAP-12165: directory item must be first "</div><div class='del'>-			       "item of node when pasting is in 0th position");</div><div class='del'>-</div><div class='del'>-			/* update delimiting keys */</div><div class='del'>-			replace_key(tb, tb-&gt;CFR[0], tb-&gt;rkey[0], tb-&gt;R[0], 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_indirect_le_ih(pasted))</div><div class='del'>-		set_ih_free_space(pasted, 0);</div><div class='del'>-	tb-&gt;zeroes_num = tb-&gt;insert_size[0] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_paste_right(struct tree_balance *tb,</div><div class='del'>-				     struct item_head * const ih,</div><div class='del'>-				     const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-</div><div class='del'>-	/* new item doesn't fall into R[0] */</div><div class='del'>-	if (n - tb-&gt;rnum[0] &gt; tb-&gt;item_pos) {</div><div class='del'>-		leaf_shift_right(tb, tb-&gt;rnum[0], tb-&gt;rbytes);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* pasted item or part of it falls to R[0] */</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;item_pos == n - tb-&gt;rnum[0] &amp;&amp; tb-&gt;rbytes != -1)</div><div class='del'>-		/* we must shift the part of the appended item */</div><div class='del'>-		balance_leaf_paste_right_shift(tb, ih, body);</div><div class='del'>-	else</div><div class='del'>-		/* pasted item in whole falls into R[0] */</div><div class='del'>-		balance_leaf_paste_right_whole(tb, ih, body);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* shift rnum[0] items from S[0] to the right neighbor R[0] */</div><div class='del'>-static void balance_leaf_right(struct tree_balance *tb,</div><div class='del'>-			       struct item_head * const ih,</div><div class='del'>-			       const char * const body, int flag)</div><div class='del'>-{</div><div class='del'>-	if (tb-&gt;rnum[0] &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	BUG_ON(flag != M_INSERT &amp;&amp; flag != M_PASTE);</div><div class='del'>-</div><div class='del'>-	if (flag == M_INSERT)</div><div class='del'>-		balance_leaf_insert_right(tb, ih, body);</div><div class='del'>-	else /* M_PASTE */</div><div class='del'>-		balance_leaf_paste_right(tb, ih, body);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_new_nodes_insert(struct tree_balance *tb,</div><div class='del'>-					  struct item_head * const ih,</div><div class='del'>-					  const char * const body,</div><div class='del'>-					  struct item_head *insert_key,</div><div class='del'>-					  struct buffer_head **insert_ptr,</div><div class='del'>-					  int i)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	int shift;</div><div class='del'>-</div><div class='del'>-	/* new item or it part don't falls into S_new[i] */</div><div class='del'>-	if (n - tb-&gt;snum[i] &gt;= tb-&gt;item_pos) {</div><div class='del'>-		leaf_move_items(LEAF_FROM_S_TO_SNEW, tb,</div><div class='del'>-				tb-&gt;snum[i], tb-&gt;sbytes[i], tb-&gt;S_new[i]);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* new item or it's part falls to first new node S_new[i] */</div><div class='del'>-</div><div class='del'>-	/* part of new item falls into S_new[i] */</div><div class='del'>-	if (tb-&gt;item_pos == n - tb-&gt;snum[i] + 1 &amp;&amp; tb-&gt;sbytes[i] != -1) {</div><div class='del'>-		int old_key_comp, old_len, r_zeroes_number;</div><div class='del'>-		const char *r_body;</div><div class='del'>-</div><div class='del'>-		/* Move snum[i]-1 items from S[0] to S_new[i] */</div><div class='del'>-		leaf_move_items(LEAF_FROM_S_TO_SNEW, tb, tb-&gt;snum[i] - 1, -1,</div><div class='del'>-				tb-&gt;S_new[i]);</div><div class='del'>-</div><div class='del'>-		/* Remember key component and item length */</div><div class='del'>-		old_key_comp = le_ih_k_offset(ih);</div><div class='del'>-		old_len = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate key component and item length to insert</div><div class='del'>-		 * into S_new[i]</div><div class='del'>-		 */</div><div class='del'>-		shift = 0;</div><div class='del'>-		if (is_indirect_le_ih(ih))</div><div class='del'>-			shift = tb-&gt;tb_sb-&gt;s_blocksize_bits - UNFM_P_SHIFT;</div><div class='del'>-		set_le_ih_k_offset(ih,</div><div class='del'>-				   le_ih_k_offset(ih) +</div><div class='del'>-				   ((old_len - tb-&gt;sbytes[i]) &lt;&lt; shift));</div><div class='del'>-</div><div class='del'>-		put_ih_item_len(ih, tb-&gt;sbytes[i]);</div><div class='del'>-</div><div class='del'>-		/* Insert part of the item into S_new[i] before 0-th item */</div><div class='del'>-		buffer_info_init_bh(tb, &amp;bi, tb-&gt;S_new[i]);</div><div class='del'>-</div><div class='del'>-		if ((old_len - tb-&gt;sbytes[i]) &gt; tb-&gt;zeroes_num) {</div><div class='del'>-			r_zeroes_number = 0;</div><div class='del'>-			r_body = body + (old_len - tb-&gt;sbytes[i]) -</div><div class='del'>-					 tb-&gt;zeroes_num;</div><div class='del'>-		} else {</div><div class='del'>-			r_body = body;</div><div class='del'>-			r_zeroes_number = tb-&gt;zeroes_num - (old_len -</div><div class='del'>-					  tb-&gt;sbytes[i]);</div><div class='del'>-			tb-&gt;zeroes_num -= r_zeroes_number;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		leaf_insert_into_buf(&amp;bi, 0, ih, r_body, r_zeroes_number);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate key component and item length to</div><div class='del'>-		 * insert into S[i]</div><div class='del'>-		 */</div><div class='del'>-		set_le_ih_k_offset(ih, old_key_comp);</div><div class='del'>-		put_ih_item_len(ih, old_len - tb-&gt;sbytes[i]);</div><div class='del'>-		tb-&gt;insert_size[0] -= tb-&gt;sbytes[i];</div><div class='del'>-	} else {</div><div class='del'>-		/* whole new item falls into S_new[i] */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Shift snum[0] - 1 items to S_new[i]</div><div class='del'>-		 * (sbytes[i] of split item)</div><div class='del'>-		 */</div><div class='del'>-		leaf_move_items(LEAF_FROM_S_TO_SNEW, tb,</div><div class='del'>-				tb-&gt;snum[i] - 1, tb-&gt;sbytes[i], tb-&gt;S_new[i]);</div><div class='del'>-</div><div class='del'>-		/* Insert new item into S_new[i] */</div><div class='del'>-		buffer_info_init_bh(tb, &amp;bi, tb-&gt;S_new[i]);</div><div class='del'>-		leaf_insert_into_buf(&amp;bi, tb-&gt;item_pos - n + tb-&gt;snum[i] - 1,</div><div class='del'>-				     ih, body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		tb-&gt;zeroes_num = tb-&gt;insert_size[0] = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* we append to directory item */</div><div class='del'>-static void balance_leaf_new_nodes_paste_dirent(struct tree_balance *tb,</div><div class='del'>-					 struct item_head * const ih,</div><div class='del'>-					 const char * const body,</div><div class='del'>-					 struct item_head *insert_key,</div><div class='del'>-					 struct buffer_head **insert_ptr,</div><div class='del'>-					 int i)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct item_head *aux_ih = item_head(tbS0, tb-&gt;item_pos);</div><div class='del'>-	int entry_count = ih_entry_count(aux_ih);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	if (entry_count - tb-&gt;sbytes[i] &lt; tb-&gt;pos_in_item &amp;&amp;</div><div class='del'>-	    tb-&gt;pos_in_item &lt;= entry_count) {</div><div class='del'>-		/* new directory entry falls into S_new[i] */</div><div class='del'>-</div><div class='del'>-		RFALSE(!tb-&gt;insert_size[0],</div><div class='del'>-		       "PAP-12215: insert_size is already 0");</div><div class='del'>-		RFALSE(tb-&gt;sbytes[i] - 1 &gt;= entry_count,</div><div class='del'>-		       "PAP-12220: there are no so much entries (%d), only %d",</div><div class='del'>-		       tb-&gt;sbytes[i] - 1, entry_count);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Shift snum[i]-1 items in whole.</div><div class='del'>-		 * Shift sbytes[i] directory entries</div><div class='del'>-		 * from directory item number snum[i]</div><div class='del'>-		 */</div><div class='del'>-		leaf_move_items(LEAF_FROM_S_TO_SNEW, tb, tb-&gt;snum[i],</div><div class='del'>-				tb-&gt;sbytes[i] - 1, tb-&gt;S_new[i]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Paste given directory entry to</div><div class='del'>-		 * directory item</div><div class='del'>-		 */</div><div class='del'>-		buffer_info_init_bh(tb, &amp;bi, tb-&gt;S_new[i]);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, 0, tb-&gt;pos_in_item - entry_count +</div><div class='del'>-				     tb-&gt;sbytes[i] - 1, tb-&gt;insert_size[0],</div><div class='del'>-				     body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		/* paste new directory entry */</div><div class='del'>-		leaf_paste_entries(&amp;bi, 0, tb-&gt;pos_in_item - entry_count +</div><div class='del'>-				   tb-&gt;sbytes[i] - 1, 1,</div><div class='del'>-				   (struct reiserfs_de_head *) body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		tb-&gt;insert_size[0] = 0;</div><div class='del'>-		tb-&gt;pos_in_item++;</div><div class='del'>-	} else {</div><div class='del'>-		/* new directory entry doesn't fall into S_new[i] */</div><div class='del'>-		leaf_move_items(LEAF_FROM_S_TO_SNEW, tb, tb-&gt;snum[i],</div><div class='del'>-				tb-&gt;sbytes[i], tb-&gt;S_new[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_new_nodes_paste_shift(struct tree_balance *tb,</div><div class='del'>-					 struct item_head * const ih,</div><div class='del'>-					 const char * const body,</div><div class='del'>-					 struct item_head *insert_key,</div><div class='del'>-					 struct buffer_head **insert_ptr,</div><div class='del'>-					 int i)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct item_head *aux_ih = item_head(tbS0, tb-&gt;item_pos);</div><div class='del'>-	int n_shift, n_rem, r_zeroes_number, shift;</div><div class='del'>-	const char *r_body;</div><div class='del'>-	struct item_head *tmp;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	RFALSE(ih, "PAP-12210: ih must be 0");</div><div class='del'>-</div><div class='del'>-	if (is_direntry_le_ih(aux_ih)) {</div><div class='del'>-		balance_leaf_new_nodes_paste_dirent(tb, ih, body, insert_key,</div><div class='del'>-						    insert_ptr, i);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* regular object */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;pos_in_item != ih_item_len(item_head(tbS0, tb-&gt;item_pos)) ||</div><div class='del'>-	       tb-&gt;insert_size[0] &lt;= 0,</div><div class='del'>-	       "PAP-12225: item too short or insert_size &lt;= 0");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate number of bytes which must be shifted from appended item</div><div class='del'>-	 */</div><div class='del'>-	n_shift = tb-&gt;sbytes[i] - tb-&gt;insert_size[0];</div><div class='del'>-	if (n_shift &lt; 0)</div><div class='del'>-		n_shift = 0;</div><div class='del'>-	leaf_move_items(LEAF_FROM_S_TO_SNEW, tb, tb-&gt;snum[i], n_shift,</div><div class='del'>-			tb-&gt;S_new[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calculate number of bytes which must remain in body after</div><div class='del'>-	 * append to S_new[i]</div><div class='del'>-	 */</div><div class='del'>-	n_rem = tb-&gt;insert_size[0] - tb-&gt;sbytes[i];</div><div class='del'>-	if (n_rem &lt; 0)</div><div class='del'>-		n_rem = 0;</div><div class='del'>-</div><div class='del'>-	/* Append part of body into S_new[0] */</div><div class='del'>-	buffer_info_init_bh(tb, &amp;bi, tb-&gt;S_new[i]);</div><div class='del'>-	if (n_rem &gt; tb-&gt;zeroes_num) {</div><div class='del'>-		r_zeroes_number = 0;</div><div class='del'>-		r_body = body + n_rem - tb-&gt;zeroes_num;</div><div class='del'>-	} else {</div><div class='del'>-		r_body = body;</div><div class='del'>-		r_zeroes_number = tb-&gt;zeroes_num - n_rem;</div><div class='del'>-		tb-&gt;zeroes_num -= r_zeroes_number;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	leaf_paste_in_buffer(&amp;bi, 0, n_shift, tb-&gt;insert_size[0] - n_rem,</div><div class='del'>-			     r_body, r_zeroes_number);</div><div class='del'>-</div><div class='del'>-	tmp = item_head(tb-&gt;S_new[i], 0);</div><div class='del'>-	shift = 0;</div><div class='del'>-	if (is_indirect_le_ih(tmp)) {</div><div class='del'>-		set_ih_free_space(tmp, 0);</div><div class='del'>-		shift = tb-&gt;tb_sb-&gt;s_blocksize_bits - UNFM_P_SHIFT;</div><div class='del'>-	}</div><div class='del'>-	add_le_ih_k_offset(tmp, n_rem &lt;&lt; shift);</div><div class='del'>-</div><div class='del'>-	tb-&gt;insert_size[0] = n_rem;</div><div class='del'>-	if (!n_rem)</div><div class='del'>-		tb-&gt;pos_in_item++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_new_nodes_paste_whole(struct tree_balance *tb,</div><div class='del'>-					       struct item_head * const ih,</div><div class='del'>-					       const char * const body,</div><div class='del'>-					       struct item_head *insert_key,</div><div class='del'>-					       struct buffer_head **insert_ptr,</div><div class='del'>-					       int i)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-	int leaf_mi;</div><div class='del'>-	struct item_head *pasted;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	struct item_head *ih_check = item_head(tbS0, tb-&gt;item_pos);</div><div class='del'>-</div><div class='del'>-	if (!is_direntry_le_ih(ih_check) &amp;&amp;</div><div class='del'>-	    (tb-&gt;pos_in_item != ih_item_len(ih_check) ||</div><div class='del'>-	    tb-&gt;insert_size[0] &lt;= 0))</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb,</div><div class='del'>-			     "PAP-12235",</div><div class='del'>-			     "pos_in_item must be equal to ih_item_len");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	leaf_mi = leaf_move_items(LEAF_FROM_S_TO_SNEW, tb, tb-&gt;snum[i],</div><div class='del'>-				  tb-&gt;sbytes[i], tb-&gt;S_new[i]);</div><div class='del'>-</div><div class='del'>-	RFALSE(leaf_mi,</div><div class='del'>-	       "PAP-12240: unexpected value returned by leaf_move_items (%d)",</div><div class='del'>-	       leaf_mi);</div><div class='del'>-</div><div class='del'>-	/* paste into item */</div><div class='del'>-	buffer_info_init_bh(tb, &amp;bi, tb-&gt;S_new[i]);</div><div class='del'>-	leaf_paste_in_buffer(&amp;bi, tb-&gt;item_pos - n + tb-&gt;snum[i],</div><div class='del'>-			     tb-&gt;pos_in_item, tb-&gt;insert_size[0],</div><div class='del'>-			     body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-	pasted = item_head(tb-&gt;S_new[i], tb-&gt;item_pos - n +</div><div class='del'>-			   tb-&gt;snum[i]);</div><div class='del'>-	if (is_direntry_le_ih(pasted))</div><div class='del'>-		leaf_paste_entries(&amp;bi, tb-&gt;item_pos - n + tb-&gt;snum[i],</div><div class='del'>-				   tb-&gt;pos_in_item, 1,</div><div class='del'>-				   (struct reiserfs_de_head *)body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-	/* if we paste to indirect item update ih_free_space */</div><div class='del'>-	if (is_indirect_le_ih(pasted))</div><div class='del'>-		set_ih_free_space(pasted, 0);</div><div class='del'>-</div><div class='del'>-	tb-&gt;zeroes_num = tb-&gt;insert_size[0] = 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-static void balance_leaf_new_nodes_paste(struct tree_balance *tb,</div><div class='del'>-					 struct item_head * const ih,</div><div class='del'>-					 const char * const body,</div><div class='del'>-					 struct item_head *insert_key,</div><div class='del'>-					 struct buffer_head **insert_ptr,</div><div class='del'>-					 int i)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int n = B_NR_ITEMS(tbS0);</div><div class='del'>-</div><div class='del'>-	/* pasted item doesn't fall into S_new[i] */</div><div class='del'>-	if (n - tb-&gt;snum[i] &gt; tb-&gt;item_pos) {</div><div class='del'>-		leaf_move_items(LEAF_FROM_S_TO_SNEW, tb,</div><div class='del'>-				tb-&gt;snum[i], tb-&gt;sbytes[i], tb-&gt;S_new[i]);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* pasted item or part if it falls to S_new[i] */</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;item_pos == n - tb-&gt;snum[i] &amp;&amp; tb-&gt;sbytes[i] != -1)</div><div class='del'>-		/* we must shift part of the appended item */</div><div class='del'>-		balance_leaf_new_nodes_paste_shift(tb, ih, body, insert_key,</div><div class='del'>-						   insert_ptr, i);</div><div class='del'>-	else</div><div class='del'>-		/* item falls wholly into S_new[i] */</div><div class='del'>-		balance_leaf_new_nodes_paste_whole(tb, ih, body, insert_key,</div><div class='del'>-						   insert_ptr, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fill new nodes that appear in place of S[0] */</div><div class='del'>-static void balance_leaf_new_nodes(struct tree_balance *tb,</div><div class='del'>-				   struct item_head * const ih,</div><div class='del'>-				   const char * const body,</div><div class='del'>-				   struct item_head *insert_key,</div><div class='del'>-				   struct buffer_head **insert_ptr,</div><div class='del'>-				   int flag)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = tb-&gt;blknum[0] - 2; i &gt;= 0; i--) {</div><div class='del'>-		BUG_ON(flag != M_INSERT &amp;&amp; flag != M_PASTE);</div><div class='del'>-</div><div class='del'>-		RFALSE(!tb-&gt;snum[i],</div><div class='del'>-		       "PAP-12200: snum[%d] == %d. Must be &gt; 0", i,</div><div class='del'>-		       tb-&gt;snum[i]);</div><div class='del'>-</div><div class='del'>-		/* here we shift from S to S_new nodes */</div><div class='del'>-</div><div class='del'>-		tb-&gt;S_new[i] = get_FEB(tb);</div><div class='del'>-</div><div class='del'>-		/* initialized block type and tree level */</div><div class='del'>-		set_blkh_level(B_BLK_HEAD(tb-&gt;S_new[i]), DISK_LEAF_NODE_LEVEL);</div><div class='del'>-</div><div class='del'>-		if (flag == M_INSERT)</div><div class='del'>-			balance_leaf_new_nodes_insert(tb, ih, body, insert_key,</div><div class='del'>-						      insert_ptr, i);</div><div class='del'>-		else /* M_PASTE */</div><div class='del'>-			balance_leaf_new_nodes_paste(tb, ih, body, insert_key,</div><div class='del'>-						     insert_ptr, i);</div><div class='del'>-</div><div class='del'>-		memcpy(insert_key + i, leaf_key(tb-&gt;S_new[i], 0), KEY_SIZE);</div><div class='del'>-		insert_ptr[i] = tb-&gt;S_new[i];</div><div class='del'>-</div><div class='del'>-		RFALSE(!buffer_journaled(tb-&gt;S_new[i])</div><div class='del'>-		       || buffer_journal_dirty(tb-&gt;S_new[i])</div><div class='del'>-		       || buffer_dirty(tb-&gt;S_new[i]),</div><div class='del'>-		       "PAP-12247: S_new[%d] : (%b)",</div><div class='del'>-		       i, tb-&gt;S_new[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_finish_node_insert(struct tree_balance *tb,</div><div class='del'>-					    struct item_head * const ih,</div><div class='del'>-					    const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	buffer_info_init_tbS0(tb, &amp;bi);</div><div class='del'>-	leaf_insert_into_buf(&amp;bi, tb-&gt;item_pos, ih, body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-	/* If we insert the first key change the delimiting key */</div><div class='del'>-	if (tb-&gt;item_pos == 0) {</div><div class='del'>-		if (tb-&gt;CFL[0])	/* can be 0 in reiserfsck */</div><div class='del'>-			replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0], tbS0, 0);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_finish_node_paste_dirent(struct tree_balance *tb,</div><div class='del'>-						  struct item_head * const ih,</div><div class='del'>-						  const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct item_head *pasted = item_head(tbS0, tb-&gt;item_pos);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;pos_in_item &gt;= 0 &amp;&amp; tb-&gt;pos_in_item &lt;= ih_entry_count(pasted)) {</div><div class='del'>-		RFALSE(!tb-&gt;insert_size[0],</div><div class='del'>-		       "PAP-12260: insert_size is 0 already");</div><div class='del'>-</div><div class='del'>-		/* prepare space */</div><div class='del'>-		buffer_info_init_tbS0(tb, &amp;bi);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, tb-&gt;item_pos, tb-&gt;pos_in_item,</div><div class='del'>-				     tb-&gt;insert_size[0], body, tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		/* paste entry */</div><div class='del'>-		leaf_paste_entries(&amp;bi, tb-&gt;item_pos, tb-&gt;pos_in_item, 1,</div><div class='del'>-				   (struct reiserfs_de_head *)body,</div><div class='del'>-				   body + DEH_SIZE, tb-&gt;insert_size[0]);</div><div class='del'>-</div><div class='del'>-		if (!tb-&gt;item_pos &amp;&amp; !tb-&gt;pos_in_item) {</div><div class='del'>-			RFALSE(!tb-&gt;CFL[0] || !tb-&gt;L[0],</div><div class='del'>-			       "PAP-12270: CFL[0]/L[0] must  be specified");</div><div class='del'>-			if (tb-&gt;CFL[0])</div><div class='del'>-				replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0],</div><div class='del'>-					    tbS0, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tb-&gt;insert_size[0] = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void balance_leaf_finish_node_paste(struct tree_balance *tb,</div><div class='del'>-					   struct item_head * const ih,</div><div class='del'>-					   const char * const body)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-	struct item_head *pasted = item_head(tbS0, tb-&gt;item_pos);</div><div class='del'>-</div><div class='del'>-	/* when directory, may be new entry already pasted */</div><div class='del'>-	if (is_direntry_le_ih(pasted)) {</div><div class='del'>-		balance_leaf_finish_node_paste_dirent(tb, ih, body);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* regular object */</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;pos_in_item == ih_item_len(pasted)) {</div><div class='del'>-		RFALSE(tb-&gt;insert_size[0] &lt;= 0,</div><div class='del'>-		       "PAP-12275: insert size must not be %d",</div><div class='del'>-		       tb-&gt;insert_size[0]);</div><div class='del'>-		buffer_info_init_tbS0(tb, &amp;bi);</div><div class='del'>-		leaf_paste_in_buffer(&amp;bi, tb-&gt;item_pos,</div><div class='del'>-				     tb-&gt;pos_in_item, tb-&gt;insert_size[0], body,</div><div class='del'>-				     tb-&gt;zeroes_num);</div><div class='del'>-</div><div class='del'>-		if (is_indirect_le_ih(pasted))</div><div class='del'>-			set_ih_free_space(pasted, 0);</div><div class='del'>-</div><div class='del'>-		tb-&gt;insert_size[0] = 0;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	else if (tb-&gt;insert_size[0]) {</div><div class='del'>-		print_cur_tb("12285");</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "PAP-12285",</div><div class='del'>-		    "insert_size must be 0 (%d)", tb-&gt;insert_size[0]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if the affected item was not wholly shifted then we</div><div class='del'>- * perform all necessary operations on that part or whole</div><div class='del'>- * of the affected item which remains in S</div><div class='del'>- */</div><div class='del'>-static void balance_leaf_finish_node(struct tree_balance *tb,</div><div class='del'>-				      struct item_head * const ih,</div><div class='del'>-				      const char * const body, int flag)</div><div class='del'>-{</div><div class='del'>-	/* if we must insert or append into buffer S[0] */</div><div class='del'>-	if (0 &lt;= tb-&gt;item_pos &amp;&amp; tb-&gt;item_pos &lt; tb-&gt;s0num) {</div><div class='del'>-		if (flag == M_INSERT)</div><div class='del'>-			balance_leaf_finish_node_insert(tb, ih, body);</div><div class='del'>-		else /* M_PASTE */</div><div class='del'>-			balance_leaf_finish_node_paste(tb, ih, body);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * balance_leaf - reiserfs tree balancing algorithm</div><div class='del'>- * @tb: tree balance state</div><div class='del'>- * @ih: item header of inserted item (little endian)</div><div class='del'>- * @body: body of inserted item or bytes to paste</div><div class='del'>- * @flag: i - insert, d - delete, c - cut, p - paste (see do_balance)</div><div class='del'>- * passed back:</div><div class='del'>- * @insert_key: key to insert new nodes</div><div class='del'>- * @insert_ptr: array of nodes to insert at the next level</div><div class='del'>- *</div><div class='del'>- * In our processing of one level we sometimes determine what must be</div><div class='del'>- * inserted into the next higher level.  This insertion consists of a</div><div class='del'>- * key or two keys and their corresponding pointers.</div><div class='del'>- */</div><div class='del'>-static int balance_leaf(struct tree_balance *tb, struct item_head *ih,</div><div class='del'>-			const char *body, int flag,</div><div class='del'>-			struct item_head *insert_key,</div><div class='del'>-			struct buffer_head **insert_ptr)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(tb-&gt;tb_sb, balance_at[0]);</div><div class='del'>-</div><div class='del'>-	/* Make balance in case insert_size[0] &lt; 0 */</div><div class='del'>-	if (tb-&gt;insert_size[0] &lt; 0)</div><div class='del'>-		return balance_leaf_when_delete(tb, flag);</div><div class='del'>-</div><div class='del'>-	tb-&gt;item_pos = PATH_LAST_POSITION(tb-&gt;tb_path),</div><div class='del'>-	tb-&gt;pos_in_item = tb-&gt;tb_path-&gt;pos_in_item,</div><div class='del'>-	tb-&gt;zeroes_num = 0;</div><div class='del'>-	if (flag == M_INSERT &amp;&amp; !body)</div><div class='del'>-		tb-&gt;zeroes_num = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * for indirect item pos_in_item is measured in unformatted node</div><div class='del'>-	 * pointers. Recalculate to bytes</div><div class='del'>-	 */</div><div class='del'>-	if (flag != M_INSERT</div><div class='del'>-	    &amp;&amp; is_indirect_le_ih(item_head(tbS0, tb-&gt;item_pos)))</div><div class='del'>-		tb-&gt;pos_in_item *= UNFM_P_SIZE;</div><div class='del'>-</div><div class='del'>-	body += balance_leaf_left(tb, ih, body, flag);</div><div class='del'>-</div><div class='del'>-	/* tb-&gt;lnum[0] &gt; 0 */</div><div class='del'>-	/* Calculate new item position */</div><div class='del'>-	tb-&gt;item_pos -= (tb-&gt;lnum[0] - ((tb-&gt;lbytes != -1) ? 1 : 0));</div><div class='del'>-</div><div class='del'>-	balance_leaf_right(tb, ih, body, flag);</div><div class='del'>-</div><div class='del'>-	/* tb-&gt;rnum[0] &gt; 0 */</div><div class='del'>-	RFALSE(tb-&gt;blknum[0] &gt; 3,</div><div class='del'>-	       "PAP-12180: blknum can not be %d. It must be &lt;= 3", tb-&gt;blknum[0]);</div><div class='del'>-	RFALSE(tb-&gt;blknum[0] &lt; 0,</div><div class='del'>-	       "PAP-12185: blknum can not be %d. It must be &gt;= 0", tb-&gt;blknum[0]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if while adding to a node we discover that it is possible to split</div><div class='del'>-	 * it in two, and merge the left part into the left neighbor and the</div><div class='del'>-	 * right part into the right neighbor, eliminating the node</div><div class='del'>-	 */</div><div class='del'>-	if (tb-&gt;blknum[0] == 0) {	/* node S[0] is empty now */</div><div class='del'>-</div><div class='del'>-		RFALSE(!tb-&gt;lnum[0] || !tb-&gt;rnum[0],</div><div class='del'>-		       "PAP-12190: lnum and rnum must not be zero");</div><div class='del'>-		/*</div><div class='del'>-		 * if insertion was done before 0-th position in R[0], right</div><div class='del'>-		 * delimiting key of the tb-&gt;L[0]'s and left delimiting key are</div><div class='del'>-		 * not set correctly</div><div class='del'>-		 */</div><div class='del'>-		if (tb-&gt;CFL[0]) {</div><div class='del'>-			if (!tb-&gt;CFR[0])</div><div class='del'>-				reiserfs_panic(tb-&gt;tb_sb, "vs-12195",</div><div class='del'>-					       "CFR not initialized");</div><div class='del'>-			copy_key(internal_key(tb-&gt;CFL[0], tb-&gt;lkey[0]),</div><div class='del'>-				 internal_key(tb-&gt;CFR[0], tb-&gt;rkey[0]));</div><div class='del'>-			do_balance_mark_internal_dirty(tb, tb-&gt;CFL[0], 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbS0);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	balance_leaf_new_nodes(tb, ih, body, insert_key, insert_ptr, flag);</div><div class='del'>-</div><div class='del'>-	balance_leaf_finish_node(tb, ih, body, flag);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	if (flag == M_PASTE &amp;&amp; tb-&gt;insert_size[0]) {</div><div class='del'>-		print_cur_tb("12290");</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb,</div><div class='del'>-			       "PAP-12290", "insert_size is still not 0 (%d)",</div><div class='del'>-			       tb-&gt;insert_size[0]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Leaf level of the tree is balanced (end of balance_leaf) */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Make empty node */</div><div class='del'>-void make_empty_node(struct buffer_info *bi)</div><div class='del'>-{</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-</div><div class='del'>-	RFALSE(bi-&gt;bi_bh == NULL, "PAP-12295: pointer to the buffer is NULL");</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bi-&gt;bi_bh);</div><div class='del'>-	set_blkh_nr_item(blkh, 0);</div><div class='del'>-	set_blkh_free_space(blkh, MAX_CHILD_SIZE(bi-&gt;bi_bh));</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_parent)</div><div class='del'>-		B_N_CHILD(bi-&gt;bi_parent, bi-&gt;bi_position)-&gt;dc_size = 0;	/* Endian safe if 0 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get first empty buffer */</div><div class='del'>-struct buffer_head *get_FEB(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_FEB_SIZE; i++)</div><div class='del'>-		if (tb-&gt;FEB[i] != NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (i == MAX_FEB_SIZE)</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "vs-12300", "FEB list is empty");</div><div class='del'>-</div><div class='del'>-	buffer_info_init_bh(tb, &amp;bi, tb-&gt;FEB[i]);</div><div class='del'>-	make_empty_node(&amp;bi);</div><div class='del'>-	set_buffer_uptodate(tb-&gt;FEB[i]);</div><div class='del'>-	tb-&gt;used[i] = tb-&gt;FEB[i];</div><div class='del'>-	tb-&gt;FEB[i] = NULL;</div><div class='del'>-</div><div class='del'>-	return tb-&gt;used[i];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is now used because reiserfs_free_block has to be able to schedule. */</div><div class='del'>-static void store_thrown(struct tree_balance *tb, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (buffer_dirty(bh))</div><div class='del'>-		reiserfs_warning(tb-&gt;tb_sb, "reiserfs-12320",</div><div class='del'>-				 "called with dirty buffer");</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tb-&gt;thrown); i++)</div><div class='del'>-		if (!tb-&gt;thrown[i]) {</div><div class='del'>-			tb-&gt;thrown[i] = bh;</div><div class='del'>-			get_bh(bh);	/* free_thrown puts this */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	reiserfs_warning(tb-&gt;tb_sb, "reiserfs-12321",</div><div class='del'>-			 "too many thrown buffers");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_thrown(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	b_blocknr_t blocknr;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tb-&gt;thrown); i++) {</div><div class='del'>-		if (tb-&gt;thrown[i]) {</div><div class='del'>-			blocknr = tb-&gt;thrown[i]-&gt;b_blocknr;</div><div class='del'>-			if (buffer_dirty(tb-&gt;thrown[i]))</div><div class='del'>-				reiserfs_warning(tb-&gt;tb_sb, "reiserfs-12322",</div><div class='del'>-						 "called with dirty buffer %d",</div><div class='del'>-						 blocknr);</div><div class='del'>-			brelse(tb-&gt;thrown[i]);	/* incremented in store_thrown */</div><div class='del'>-			reiserfs_free_block(tb-&gt;transaction_handle, NULL,</div><div class='del'>-					    blocknr, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_invalidate_buffer(struct tree_balance *tb, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	set_blkh_level(blkh, FREE_LEVEL);</div><div class='del'>-	set_blkh_nr_item(blkh, 0);</div><div class='del'>-</div><div class='del'>-	clear_buffer_dirty(bh);</div><div class='del'>-	store_thrown(tb, bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replace n_dest'th key in buffer dest by n_src'th key of buffer src.*/</div><div class='del'>-void replace_key(struct tree_balance *tb, struct buffer_head *dest, int n_dest,</div><div class='del'>-		 struct buffer_head *src, int n_src)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	RFALSE(dest == NULL || src == NULL,</div><div class='del'>-	       "vs-12305: source or destination buffer is 0 (src=%p, dest=%p)",</div><div class='del'>-	       src, dest);</div><div class='del'>-	RFALSE(!B_IS_KEYS_LEVEL(dest),</div><div class='del'>-	       "vs-12310: invalid level (%z) for destination buffer. dest must be leaf",</div><div class='del'>-	       dest);</div><div class='del'>-	RFALSE(n_dest &lt; 0 || n_src &lt; 0,</div><div class='del'>-	       "vs-12315: src(%d) or dest(%d) key number &lt; 0", n_src, n_dest);</div><div class='del'>-	RFALSE(n_dest &gt;= B_NR_ITEMS(dest) || n_src &gt;= B_NR_ITEMS(src),</div><div class='del'>-	       "vs-12320: src(%d(%d)) or dest(%d(%d)) key number is too big",</div><div class='del'>-	       n_src, B_NR_ITEMS(src), n_dest, B_NR_ITEMS(dest));</div><div class='del'>-</div><div class='del'>-	if (B_IS_ITEMS_LEVEL(src))</div><div class='del'>-		/* source buffer contains leaf node */</div><div class='del'>-		memcpy(internal_key(dest, n_dest), item_head(src, n_src),</div><div class='del'>-		       KEY_SIZE);</div><div class='del'>-	else</div><div class='del'>-		memcpy(internal_key(dest, n_dest), internal_key(src, n_src),</div><div class='del'>-		       KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(tb, dest, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_left_neighbor_position(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	int Sh_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-</div><div class='del'>-	RFALSE(PATH_H_PPARENT(tb-&gt;tb_path, h) == NULL || tb-&gt;FL[h] == NULL,</div><div class='del'>-	       "vs-12325: FL[%d](%p) or F[%d](%p) does not exist",</div><div class='del'>-	       h, tb-&gt;FL[h], h, PATH_H_PPARENT(tb-&gt;tb_path, h));</div><div class='del'>-</div><div class='del'>-	if (Sh_position == 0)</div><div class='del'>-		return B_NR_ITEMS(tb-&gt;FL[h]);</div><div class='del'>-	else</div><div class='del'>-		return Sh_position - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_right_neighbor_position(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	int Sh_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-</div><div class='del'>-	RFALSE(PATH_H_PPARENT(tb-&gt;tb_path, h) == NULL || tb-&gt;FR[h] == NULL,</div><div class='del'>-	       "vs-12330: F[%d](%p) or FR[%d](%p) does not exist",</div><div class='del'>-	       h, PATH_H_PPARENT(tb-&gt;tb_path, h), h, tb-&gt;FR[h]);</div><div class='del'>-</div><div class='del'>-	if (Sh_position == B_NR_ITEMS(PATH_H_PPARENT(tb-&gt;tb_path, h)))</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return Sh_position + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-</div><div class='del'>-int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value);</div><div class='del'>-static void check_internal_node(struct super_block *s, struct buffer_head *bh,</div><div class='del'>-				char *mes)</div><div class='del'>-{</div><div class='del'>-	struct disk_child *dc;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	RFALSE(!bh, "PAP-12336: bh == 0");</div><div class='del'>-</div><div class='del'>-	if (!bh || !B_IS_IN_TREE(bh))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	RFALSE(!buffer_dirty(bh) &amp;&amp;</div><div class='del'>-	       !(buffer_journaled(bh) || buffer_journal_dirty(bh)),</div><div class='del'>-	       "PAP-12337: buffer (%b) must be dirty", bh);</div><div class='del'>-	dc = B_N_CHILD(bh, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= B_NR_ITEMS(bh); i++, dc++) {</div><div class='del'>-		if (!is_reusable(s, dc_block_number(dc), 1)) {</div><div class='del'>-			print_cur_tb(mes);</div><div class='del'>-			reiserfs_panic(s, "PAP-12338",</div><div class='del'>-				       "invalid child pointer %y in %b",</div><div class='del'>-				       dc, bh);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int locked_or_not_in_tree(struct tree_balance *tb,</div><div class='del'>-				  struct buffer_head *bh, char *which)</div><div class='del'>-{</div><div class='del'>-	if ((!buffer_journal_prepared(bh) &amp;&amp; buffer_locked(bh)) ||</div><div class='del'>-	    !B_IS_IN_TREE(bh)) {</div><div class='del'>-		reiserfs_warning(tb-&gt;tb_sb, "vs-12339", "%s (%b)", which, bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_before_balancing(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	if (REISERFS_SB(tb-&gt;tb_sb)-&gt;cur_tb) {</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "vs-12335", "suspect that schedule "</div><div class='del'>-			       "occurred based on cur_tb not being null at "</div><div class='del'>-			       "this point in code. do_balance cannot properly "</div><div class='del'>-			       "handle concurrent tree accesses on a same "</div><div class='del'>-			       "mount point.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * double check that buffers that we will modify are unlocked.</div><div class='del'>-	 * (fix_nodes should already have prepped all of these for us).</div><div class='del'>-	 */</div><div class='del'>-	if (tb-&gt;lnum[0]) {</div><div class='del'>-		retval |= locked_or_not_in_tree(tb, tb-&gt;L[0], "L[0]");</div><div class='del'>-		retval |= locked_or_not_in_tree(tb, tb-&gt;FL[0], "FL[0]");</div><div class='del'>-		retval |= locked_or_not_in_tree(tb, tb-&gt;CFL[0], "CFL[0]");</div><div class='del'>-		check_leaf(tb-&gt;L[0]);</div><div class='del'>-	}</div><div class='del'>-	if (tb-&gt;rnum[0]) {</div><div class='del'>-		retval |= locked_or_not_in_tree(tb, tb-&gt;R[0], "R[0]");</div><div class='del'>-		retval |= locked_or_not_in_tree(tb, tb-&gt;FR[0], "FR[0]");</div><div class='del'>-		retval |= locked_or_not_in_tree(tb, tb-&gt;CFR[0], "CFR[0]");</div><div class='del'>-		check_leaf(tb-&gt;R[0]);</div><div class='del'>-	}</div><div class='del'>-	retval |= locked_or_not_in_tree(tb, PATH_PLAST_BUFFER(tb-&gt;tb_path),</div><div class='del'>-					"S[0]");</div><div class='del'>-	check_leaf(PATH_PLAST_BUFFER(tb-&gt;tb_path));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_after_balance_leaf(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	if (tb-&gt;lnum[0]) {</div><div class='del'>-		if (B_FREE_SPACE(tb-&gt;L[0]) !=</div><div class='del'>-		    MAX_CHILD_SIZE(tb-&gt;L[0]) -</div><div class='del'>-		    dc_size(B_N_CHILD</div><div class='del'>-			    (tb-&gt;FL[0], get_left_neighbor_position(tb, 0)))) {</div><div class='del'>-			print_cur_tb("12221");</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "PAP-12355",</div><div class='del'>-				       "shift to left was incorrect");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (tb-&gt;rnum[0]) {</div><div class='del'>-		if (B_FREE_SPACE(tb-&gt;R[0]) !=</div><div class='del'>-		    MAX_CHILD_SIZE(tb-&gt;R[0]) -</div><div class='del'>-		    dc_size(B_N_CHILD</div><div class='del'>-			    (tb-&gt;FR[0], get_right_neighbor_position(tb, 0)))) {</div><div class='del'>-			print_cur_tb("12222");</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "PAP-12360",</div><div class='del'>-				       "shift to right was incorrect");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (PATH_H_PBUFFER(tb-&gt;tb_path, 1) &amp;&amp;</div><div class='del'>-	    (B_FREE_SPACE(PATH_H_PBUFFER(tb-&gt;tb_path, 0)) !=</div><div class='del'>-	     (MAX_CHILD_SIZE(PATH_H_PBUFFER(tb-&gt;tb_path, 0)) -</div><div class='del'>-	      dc_size(B_N_CHILD(PATH_H_PBUFFER(tb-&gt;tb_path, 1),</div><div class='del'>-				PATH_H_POSITION(tb-&gt;tb_path, 1)))))) {</div><div class='del'>-		int left = B_FREE_SPACE(PATH_H_PBUFFER(tb-&gt;tb_path, 0));</div><div class='del'>-		int right = (MAX_CHILD_SIZE(PATH_H_PBUFFER(tb-&gt;tb_path, 0)) -</div><div class='del'>-			     dc_size(B_N_CHILD(PATH_H_PBUFFER(tb-&gt;tb_path, 1),</div><div class='del'>-					       PATH_H_POSITION(tb-&gt;tb_path,</div><div class='del'>-							       1))));</div><div class='del'>-		print_cur_tb("12223");</div><div class='del'>-		reiserfs_warning(tb-&gt;tb_sb, "reiserfs-12363",</div><div class='del'>-				 "B_FREE_SPACE (PATH_H_PBUFFER(tb-&gt;tb_path,0)) = %d; "</div><div class='del'>-				 "MAX_CHILD_SIZE (%d) - dc_size( %y, %d ) [%d] = %d",</div><div class='del'>-				 left,</div><div class='del'>-				 MAX_CHILD_SIZE(PATH_H_PBUFFER(tb-&gt;tb_path, 0)),</div><div class='del'>-				 PATH_H_PBUFFER(tb-&gt;tb_path, 1),</div><div class='del'>-				 PATH_H_POSITION(tb-&gt;tb_path, 1),</div><div class='del'>-				 dc_size(B_N_CHILD</div><div class='del'>-					 (PATH_H_PBUFFER(tb-&gt;tb_path, 1),</div><div class='del'>-					  PATH_H_POSITION(tb-&gt;tb_path, 1))),</div><div class='del'>-				 right);</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "PAP-12365", "S is incorrect");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_leaf_level(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	check_leaf(tb-&gt;L[0]);</div><div class='del'>-	check_leaf(tb-&gt;R[0]);</div><div class='del'>-	check_leaf(PATH_PLAST_BUFFER(tb-&gt;tb_path));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_internal_levels(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int h;</div><div class='del'>-</div><div class='del'>-	/* check all internal nodes */</div><div class='del'>-	for (h = 1; tb-&gt;insert_size[h]; h++) {</div><div class='del'>-		check_internal_node(tb-&gt;tb_sb, PATH_H_PBUFFER(tb-&gt;tb_path, h),</div><div class='del'>-				    "BAD BUFFER ON PATH");</div><div class='del'>-		if (tb-&gt;lnum[h])</div><div class='del'>-			check_internal_node(tb-&gt;tb_sb, tb-&gt;L[h], "BAD L");</div><div class='del'>-		if (tb-&gt;rnum[h])</div><div class='del'>-			check_internal_node(tb-&gt;tb_sb, tb-&gt;R[h], "BAD R");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Now we have all of the buffers that must be used in balancing of</div><div class='del'>- * the tree.  We rely on the assumption that schedule() will not occur</div><div class='del'>- * while do_balance works. ( Only interrupt handlers are acceptable.)</div><div class='del'>- * We balance the tree according to the analysis made before this,</div><div class='del'>- * using buffers already obtained.  For SMP support it will someday be</div><div class='del'>- * necessary to add ordered locking of tb.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some interesting rules of balancing:</div><div class='del'>- * we delete a maximum of two nodes per level per balancing: we never</div><div class='del'>- * delete R, when we delete two of three nodes L, S, R then we move</div><div class='del'>- * them into R.</div><div class='del'>- *</div><div class='del'>- * we only delete L if we are deleting two nodes, if we delete only</div><div class='del'>- * one node we delete S</div><div class='del'>- *</div><div class='del'>- * if we shift leaves then we shift as much as we can: this is a</div><div class='del'>- * deliberate policy of extremism in node packing which results in</div><div class='del'>- * higher average utilization after repeated random balance operations</div><div class='del'>- * at the cost of more memory copies and more balancing as a result of</div><div class='del'>- * small insertions to full nodes.</div><div class='del'>- *</div><div class='del'>- * if we shift internal nodes we try to evenly balance the node</div><div class='del'>- * utilization, with consequent less balancing at the cost of lower</div><div class='del'>- * utilization.</div><div class='del'>- *</div><div class='del'>- * one could argue that the policy for directories in leaves should be</div><div class='del'>- * that of internal nodes, but we will wait until another day to</div><div class='del'>- * evaluate this....  It would be nice to someday measure and prove</div><div class='del'>- * these assumptions as to what is optimal....</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void do_balance_starts(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	/* use print_cur_tb() to see initial state of struct tree_balance */</div><div class='del'>-</div><div class='del'>-	/* store_print_tb (tb); */</div><div class='del'>-</div><div class='del'>-	/* do not delete, just comment it out */</div><div class='del'>-	/*</div><div class='del'>-	print_tb(flag, PATH_LAST_POSITION(tb-&gt;tb_path),</div><div class='del'>-		 tb-&gt;tb_path-&gt;pos_in_item, tb, "check");</div><div class='del'>-	*/</div><div class='del'>-	RFALSE(check_before_balancing(tb), "PAP-12340: locked buffers in TB");</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	REISERFS_SB(tb-&gt;tb_sb)-&gt;cur_tb = tb;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void do_balance_completed(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	check_leaf_level(tb);</div><div class='del'>-	check_internal_levels(tb);</div><div class='del'>-	REISERFS_SB(tb-&gt;tb_sb)-&gt;cur_tb = NULL;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reiserfs_free_block is no longer schedule safe.  So, we need to</div><div class='del'>-	 * put the buffers we want freed on the thrown list during do_balance,</div><div class='del'>-	 * and then free them now</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	REISERFS_SB(tb-&gt;tb_sb)-&gt;s_do_balance++;</div><div class='del'>-</div><div class='del'>-	/* release all nodes hold to perform the balancing */</div><div class='del'>-	unfix_nodes(tb);</div><div class='del'>-</div><div class='del'>-	free_thrown(tb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * do_balance - balance the tree</div><div class='del'>- *</div><div class='del'>- * @tb: tree_balance structure</div><div class='del'>- * @ih: item header of inserted item</div><div class='del'>- * @body: body of inserted item or bytes to paste</div><div class='del'>- * @flag: 'i' - insert, 'd' - delete, 'c' - cut, 'p' paste</div><div class='del'>- *</div><div class='del'>- * Cut means delete part of an item (includes removing an entry from a</div><div class='del'>- * directory).</div><div class='del'>- *</div><div class='del'>- * Delete means delete whole item.</div><div class='del'>- *</div><div class='del'>- * Insert means add a new item into the tree.</div><div class='del'>- *</div><div class='del'>- * Paste means to append to the end of an existing file or to</div><div class='del'>- * insert a directory entry.</div><div class='del'>- */</div><div class='del'>-void do_balance(struct tree_balance *tb, struct item_head *ih,</div><div class='del'>-		const char *body, int flag)</div><div class='del'>-{</div><div class='del'>-	int child_pos;		/* position of a child node in its parent */</div><div class='del'>-	int h;			/* level of the tree being processed */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * in our processing of one level we sometimes determine what</div><div class='del'>-	 * must be inserted into the next higher level.  This insertion</div><div class='del'>-	 * consists of a key or two keys and their corresponding</div><div class='del'>-	 * pointers</div><div class='del'>-	 */</div><div class='del'>-	struct item_head insert_key[2];</div><div class='del'>-</div><div class='del'>-	/* inserted node-ptrs for the next level */</div><div class='del'>-	struct buffer_head *insert_ptr[2];</div><div class='del'>-</div><div class='del'>-	tb-&gt;tb_mode = flag;</div><div class='del'>-	tb-&gt;need_balance_dirty = 0;</div><div class='del'>-</div><div class='del'>-	if (FILESYSTEM_CHANGED_TB(tb)) {</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "clm-6000", "fs generation has "</div><div class='del'>-			       "changed");</div><div class='del'>-	}</div><div class='del'>-	/* if we have no real work to do  */</div><div class='del'>-	if (!tb-&gt;insert_size[0]) {</div><div class='del'>-		reiserfs_warning(tb-&gt;tb_sb, "PAP-12350",</div><div class='del'>-				 "insert_size == 0, mode == %c", flag);</div><div class='del'>-		unfix_nodes(tb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;fs_generation(tb-&gt;tb_sb));</div><div class='del'>-	do_balance_starts(tb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * balance_leaf returns 0 except if combining L R and S into</div><div class='del'>-	 * one node.  see balance_internal() for explanation of this</div><div class='del'>-	 * line of code.</div><div class='del'>-	 */</div><div class='del'>-	child_pos = PATH_H_B_ITEM_ORDER(tb-&gt;tb_path, 0) +</div><div class='del'>-	    balance_leaf(tb, ih, body, flag, insert_key, insert_ptr);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	check_after_balance_leaf(tb);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Balance internal level of the tree. */</div><div class='del'>-	for (h = 1; h &lt; MAX_HEIGHT &amp;&amp; tb-&gt;insert_size[h]; h++)</div><div class='del'>-		child_pos = balance_internal(tb, h, child_pos, insert_key,</div><div class='del'>-					     insert_ptr);</div><div class='del'>-</div><div class='del'>-	do_balance_completed(tb);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c<br/>deleted file mode 100644<br/>index 8eb3ad3e8ae9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/file.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,270 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We pack the tails of files on file close, not at the time they are written.</div><div class='del'>- * This implies an unnecessary copy of the tail and an unnecessary indirect item</div><div class='del'>- * insertion/balancing, for files that are written in one write.</div><div class='del'>- * It avoids unnecessary tail packings (balances) for files that are written in</div><div class='del'>- * multiple writes and are small enough to have tails.</div><div class='del'>- *</div><div class='del'>- * file_release is called by the VFS layer when the file is closed.  If</div><div class='del'>- * this is the last open file descriptor, and the file</div><div class='del'>- * small enough to have a tail, and the tail is currently in an</div><div class='del'>- * unformatted node, the tail is converted back into a direct item.</div><div class='del'>- *</div><div class='del'>- * We use reiserfs_truncate_file to pack the tail, since it already has</div><div class='del'>- * all the conditions coded.</div><div class='del'>- */</div><div class='del'>-static int reiserfs_file_release(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int err;</div><div class='del'>-	int jbegin_failure = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!S_ISREG(inode-&gt;i_mode));</div><div class='del'>-</div><div class='del'>-	if (!atomic_dec_and_mutex_lock(&amp;REISERFS_I(inode)-&gt;openers,</div><div class='del'>-				       &amp;REISERFS_I(inode)-&gt;tailpack))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* fast out for when nothing needs to be done */</div><div class='del'>-	if ((!(REISERFS_I(inode)-&gt;i_flags &amp; i_pack_on_close_mask) ||</div><div class='del'>-	     !tail_has_to_be_packed(inode)) &amp;&amp;</div><div class='del'>-	    REISERFS_I(inode)-&gt;i_prealloc_count &lt;= 0) {</div><div class='del'>-		mutex_unlock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	/*</div><div class='del'>-	 * freeing preallocation only involves relogging blocks that</div><div class='del'>-	 * are already in the current transaction.  preallocation gets</div><div class='del'>-	 * freed at the end of each transaction, so it is impossible for</div><div class='del'>-	 * us to log any additional blocks (including quota blocks)</div><div class='del'>-	 */</div><div class='del'>-	err = journal_begin(&amp;th, inode-&gt;i_sb, 1);</div><div class='del'>-	if (err) {</div><div class='del'>-		/*</div><div class='del'>-		 * uh oh, we can't allow the inode to go away while there</div><div class='del'>-		 * is still preallocation blocks pending.  Try to join the</div><div class='del'>-		 * aborted transaction</div><div class='del'>-		 */</div><div class='del'>-		jbegin_failure = err;</div><div class='del'>-		err = journal_join_abort(&amp;th, inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		if (err) {</div><div class='del'>-			/*</div><div class='del'>-			 * hmpf, our choices here aren't good.  We can pin</div><div class='del'>-			 * the inode which will disallow unmount from ever</div><div class='del'>-			 * happening, we can do nothing, which will corrupt</div><div class='del'>-			 * random memory on unmount, or we can forcibly</div><div class='del'>-			 * remove the file from the preallocation list, which</div><div class='del'>-			 * will leak blocks on disk.  Lets pin the inode</div><div class='del'>-			 * and let the admin know what is going on.</div><div class='del'>-			 */</div><div class='del'>-			igrab(inode);</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "clm-9001",</div><div class='del'>-					 "pinning inode %lu because the "</div><div class='del'>-					 "preallocation can't be freed",</div><div class='del'>-					 inode-&gt;i_ino);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-</div><div class='del'>-#ifdef REISERFS_PREALLOCATE</div><div class='del'>-	reiserfs_discard_prealloc(&amp;th, inode);</div><div class='del'>-#endif</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-</div><div class='del'>-	/* copy back the error code from journal_begin */</div><div class='del'>-	if (!err)</div><div class='del'>-		err = jbegin_failure;</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp;</div><div class='del'>-	    (REISERFS_I(inode)-&gt;i_flags &amp; i_pack_on_close_mask) &amp;&amp;</div><div class='del'>-	    tail_has_to_be_packed(inode)) {</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if regular file is released by last holder and it has been</div><div class='del'>-		 * appended (we append by unformatted node only) or its direct</div><div class='del'>-		 * item(s) had to be converted, then it may have to be</div><div class='del'>-		 * indirect2direct converted</div><div class='del'>-		 */</div><div class='del'>-		err = reiserfs_truncate_file(inode, 0);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	mutex_unlock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_file_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int err = dquot_file_open(inode, file);</div><div class='del'>-</div><div class='del'>-	/* somebody might be tailpacking on final close; wait for it */</div><div class='del'>-        if (!atomic_inc_not_zero(&amp;REISERFS_I(inode)-&gt;openers)) {</div><div class='del'>-		mutex_lock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-		atomic_inc(&amp;REISERFS_I(inode)-&gt;openers);</div><div class='del'>-		mutex_unlock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_vfs_truncate_file(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-	reiserfs_truncate_file(inode, 1);</div><div class='del'>-	mutex_unlock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sync a reiserfs file. */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: sync_mapping_buffers() never has anything to sync.  Can</div><div class='del'>- * be removed...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int reiserfs_sync_file(struct file *filp, loff_t start, loff_t end,</div><div class='del'>-			      int datasync)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = filp-&gt;f_mapping-&gt;host;</div><div class='del'>-	int err;</div><div class='del'>-	int barrier_done;</div><div class='del'>-</div><div class='del'>-	err = file_write_and_wait_range(filp, start, end);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='del'>-	BUG_ON(!S_ISREG(inode-&gt;i_mode));</div><div class='del'>-	err = sync_mapping_buffers(inode-&gt;i_mapping);</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	barrier_done = reiserfs_commit_for_inode(inode);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	if (barrier_done != 1 &amp;&amp; reiserfs_barrier_flush(inode-&gt;i_sb))</div><div class='del'>-		blkdev_issue_flush(inode-&gt;i_sb-&gt;s_bdev);</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-	if (barrier_done &lt; 0)</div><div class='del'>-		return barrier_done;</div><div class='del'>-	return (err &lt; 0) ? -EIO : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* taken fs/buffer.c:__block_commit_write */</div><div class='del'>-int reiserfs_commit_page(struct inode *inode, struct page *page,</div><div class='del'>-			 unsigned from, unsigned to)</div><div class='del'>-{</div><div class='del'>-	unsigned block_start, block_end;</div><div class='del'>-	int partial = 0;</div><div class='del'>-	unsigned blocksize;</div><div class='del'>-	struct buffer_head *bh, *head;</div><div class='del'>-	unsigned long i_size_index = inode-&gt;i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	int new;</div><div class='del'>-	int logit = reiserfs_file_data_log(inode);</div><div class='del'>-	struct super_block *s = inode-&gt;i_sb;</div><div class='del'>-	int bh_per_page = PAGE_SIZE / s-&gt;s_blocksize;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	th.t_trans_id = 0;</div><div class='del'>-	blocksize = i_blocksize(inode);</div><div class='del'>-</div><div class='del'>-	if (logit) {</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-		ret = journal_begin(&amp;th, s, bh_per_page + 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto drop_write_lock;</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-	}</div><div class='del'>-	for (bh = head = page_buffers(page), block_start = 0;</div><div class='del'>-	     bh != head || !block_start;</div><div class='del'>-	     block_start = block_end, bh = bh-&gt;b_this_page) {</div><div class='del'>-</div><div class='del'>-		new = buffer_new(bh);</div><div class='del'>-		clear_buffer_new(bh);</div><div class='del'>-		block_end = block_start + blocksize;</div><div class='del'>-		if (block_end &lt;= from || block_start &gt;= to) {</div><div class='del'>-			if (!buffer_uptodate(bh))</div><div class='del'>-				partial = 1;</div><div class='del'>-		} else {</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-			if (logit) {</div><div class='del'>-				reiserfs_prepare_for_journal(s, bh, 1);</div><div class='del'>-				journal_mark_dirty(&amp;th, bh);</div><div class='del'>-			} else if (!buffer_dirty(bh)) {</div><div class='del'>-				mark_buffer_dirty(bh);</div><div class='del'>-				/*</div><div class='del'>-				 * do data=ordered on any page past the end</div><div class='del'>-				 * of file and any buffer marked BH_New.</div><div class='del'>-				 */</div><div class='del'>-				if (reiserfs_data_ordered(inode-&gt;i_sb) &amp;&amp;</div><div class='del'>-				    (new || page-&gt;index &gt;= i_size_index)) {</div><div class='del'>-					reiserfs_add_ordered_list(inode, bh);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (logit) {</div><div class='del'>-		ret = journal_end(&amp;th);</div><div class='del'>-drop_write_lock:</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If this is a partial write which happened to make all buffers</div><div class='del'>-	 * uptodate then we can optimize away a bogus read_folio() for</div><div class='del'>-	 * the next read(). Here we 'discover' whether the page went</div><div class='del'>-	 * uptodate as a result of this (potentially partial) write.</div><div class='del'>-	 */</div><div class='del'>-	if (!partial)</div><div class='del'>-		SetPageUptodate(page);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct file_operations reiserfs_file_operations = {</div><div class='del'>-	.unlocked_ioctl = reiserfs_ioctl,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl = reiserfs_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-	.mmap = generic_file_mmap,</div><div class='del'>-	.open = reiserfs_file_open,</div><div class='del'>-	.release = reiserfs_file_release,</div><div class='del'>-	.fsync = reiserfs_sync_file,</div><div class='del'>-	.read_iter = generic_file_read_iter,</div><div class='del'>-	.write_iter = generic_file_write_iter,</div><div class='del'>-	.splice_read = filemap_splice_read,</div><div class='del'>-	.splice_write = iter_file_splice_write,</div><div class='del'>-	.llseek = generic_file_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct inode_operations reiserfs_file_inode_operations = {</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.listxattr = reiserfs_listxattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-	.get_inode_acl = reiserfs_get_acl,</div><div class='del'>-	.set_acl = reiserfs_set_acl,</div><div class='del'>-	.fileattr_get = reiserfs_fileattr_get,</div><div class='del'>-	.fileattr_set = reiserfs_fileattr_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct inode_operations reiserfs_priv_file_inode_operations = {</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-	.fileattr_get = reiserfs_fileattr_get,</div><div class='del'>-	.fileattr_set = reiserfs_fileattr_set,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c<br/>deleted file mode 100644<br/>index 6c13a8d9a73c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/fix_node.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/fix_node.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2822 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * To make any changes in the tree we find a node that contains item</div><div class='del'>- * to be changed/deleted or position in the node we insert a new item</div><div class='del'>- * to. We call this node S. To do balancing we need to decide what we</div><div class='del'>- * will shift to left/right neighbor, or to a new node, where new item</div><div class='del'>- * will be etc. To make this analysis simpler we build virtual</div><div class='del'>- * node. Virtual node is an array of items, that will replace items of</div><div class='del'>- * node S. (For instance if we are going to delete an item, virtual</div><div class='del'>- * node does not contain it). Virtual node keeps information about</div><div class='del'>- * item sizes and types, mergeability of first and last items, sizes</div><div class='del'>- * of all entries in directory item. We use this array of items when</div><div class='del'>- * calculating what we can shift to neighbors and how many nodes we</div><div class='del'>- * have to have if we do not any shiftings, if we shift to left/right</div><div class='del'>- * neighbor or to both.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Takes item number in virtual node, returns number of item</div><div class='del'>- * that it has in source buffer</div><div class='del'>- */</div><div class='del'>-static inline int old_item_num(int new_num, int affected_item_num, int mode)</div><div class='del'>-{</div><div class='del'>-	if (mode == M_PASTE || mode == M_CUT || new_num &lt; affected_item_num)</div><div class='del'>-		return new_num;</div><div class='del'>-</div><div class='del'>-	if (mode == M_INSERT) {</div><div class='del'>-</div><div class='del'>-		RFALSE(new_num == 0,</div><div class='del'>-		       "vs-8005: for INSERT mode and item number of inserted item");</div><div class='del'>-</div><div class='del'>-		return new_num - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(mode != M_DELETE,</div><div class='del'>-	       "vs-8010: old_item_num: mode must be M_DELETE (mode = \'%c\'",</div><div class='del'>-	       mode);</div><div class='del'>-	/* delete mode */</div><div class='del'>-	return new_num + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void create_virtual_node(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	int new_num;</div><div class='del'>-	struct buffer_head *Sh;	/* this comes from tb-&gt;S[h] */</div><div class='del'>-</div><div class='del'>-	Sh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-</div><div class='del'>-	/* size of changed node */</div><div class='del'>-	vn-&gt;vn_size =</div><div class='del'>-	    MAX_CHILD_SIZE(Sh) - B_FREE_SPACE(Sh) + tb-&gt;insert_size[h];</div><div class='del'>-</div><div class='del'>-	/* for internal nodes array if virtual items is not created */</div><div class='del'>-	if (h) {</div><div class='del'>-		vn-&gt;vn_nr_item = (vn-&gt;vn_size - DC_SIZE) / (DC_SIZE + KEY_SIZE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* number of items in virtual node  */</div><div class='del'>-	vn-&gt;vn_nr_item =</div><div class='del'>-	    B_NR_ITEMS(Sh) + ((vn-&gt;vn_mode == M_INSERT) ? 1 : 0) -</div><div class='del'>-	    ((vn-&gt;vn_mode == M_DELETE) ? 1 : 0);</div><div class='del'>-</div><div class='del'>-	/* first virtual item */</div><div class='del'>-	vn-&gt;vn_vi = (struct virtual_item *)(tb-&gt;tb_vn + 1);</div><div class='del'>-	memset(vn-&gt;vn_vi, 0, vn-&gt;vn_nr_item * sizeof(struct virtual_item));</div><div class='del'>-	vn-&gt;vn_free_ptr += vn-&gt;vn_nr_item * sizeof(struct virtual_item);</div><div class='del'>-</div><div class='del'>-	/* first item in the node */</div><div class='del'>-	ih = item_head(Sh, 0);</div><div class='del'>-</div><div class='del'>-	/* define the mergeability for 0-th item (if it is not being deleted) */</div><div class='del'>-	if (op_is_left_mergeable(&amp;ih-&gt;ih_key, Sh-&gt;b_size)</div><div class='del'>-	    &amp;&amp; (vn-&gt;vn_mode != M_DELETE || vn-&gt;vn_affected_item_num))</div><div class='del'>-		vn-&gt;vn_vi[0].vi_type |= VI_TYPE_LEFT_MERGEABLE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * go through all items that remain in the virtual</div><div class='del'>-	 * node (except for the new (inserted) one)</div><div class='del'>-	 */</div><div class='del'>-	for (new_num = 0; new_num &lt; vn-&gt;vn_nr_item; new_num++) {</div><div class='del'>-		int j;</div><div class='del'>-		struct virtual_item *vi = vn-&gt;vn_vi + new_num;</div><div class='del'>-		int is_affected =</div><div class='del'>-		    ((new_num != vn-&gt;vn_affected_item_num) ? 0 : 1);</div><div class='del'>-</div><div class='del'>-		if (is_affected &amp;&amp; vn-&gt;vn_mode == M_INSERT)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* get item number in source node */</div><div class='del'>-		j = old_item_num(new_num, vn-&gt;vn_affected_item_num,</div><div class='del'>-				 vn-&gt;vn_mode);</div><div class='del'>-</div><div class='del'>-		vi-&gt;vi_item_len += ih_item_len(ih + j) + IH_SIZE;</div><div class='del'>-		vi-&gt;vi_ih = ih + j;</div><div class='del'>-		vi-&gt;vi_item = ih_item_body(Sh, ih + j);</div><div class='del'>-		vi-&gt;vi_uarea = vn-&gt;vn_free_ptr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: there is no check that item operation did not</div><div class='del'>-		 * consume too much memory</div><div class='del'>-		 */</div><div class='del'>-		vn-&gt;vn_free_ptr +=</div><div class='del'>-		    op_create_vi(vn, vi, is_affected, tb-&gt;insert_size[0]);</div><div class='del'>-		if (tb-&gt;vn_buf + tb-&gt;vn_buf_size &lt; vn-&gt;vn_free_ptr)</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "vs-8030",</div><div class='del'>-				       "virtual node space consumed");</div><div class='del'>-</div><div class='del'>-		if (!is_affected)</div><div class='del'>-			/* this is not being changed */</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (vn-&gt;vn_mode == M_PASTE || vn-&gt;vn_mode == M_CUT) {</div><div class='del'>-			vn-&gt;vn_vi[new_num].vi_item_len += tb-&gt;insert_size[0];</div><div class='del'>-			/* pointer to data which is going to be pasted */</div><div class='del'>-			vi-&gt;vi_new_data = vn-&gt;vn_data;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* virtual inserted item is not defined yet */</div><div class='del'>-	if (vn-&gt;vn_mode == M_INSERT) {</div><div class='del'>-		struct virtual_item *vi = vn-&gt;vn_vi + vn-&gt;vn_affected_item_num;</div><div class='del'>-</div><div class='del'>-		RFALSE(vn-&gt;vn_ins_ih == NULL,</div><div class='del'>-		       "vs-8040: item header of inserted item is not specified");</div><div class='del'>-		vi-&gt;vi_item_len = tb-&gt;insert_size[0];</div><div class='del'>-		vi-&gt;vi_ih = vn-&gt;vn_ins_ih;</div><div class='del'>-		vi-&gt;vi_item = vn-&gt;vn_data;</div><div class='del'>-		vi-&gt;vi_uarea = vn-&gt;vn_free_ptr;</div><div class='del'>-</div><div class='del'>-		op_create_vi(vn, vi, 0 /*not pasted or cut */ ,</div><div class='del'>-			     tb-&gt;insert_size[0]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set right merge flag we take right delimiting key and</div><div class='del'>-	 * check whether it is a mergeable item</div><div class='del'>-	 */</div><div class='del'>-	if (tb-&gt;CFR[0]) {</div><div class='del'>-		struct reiserfs_key *key;</div><div class='del'>-</div><div class='del'>-		key = internal_key(tb-&gt;CFR[0], tb-&gt;rkey[0]);</div><div class='del'>-		if (op_is_left_mergeable(key, Sh-&gt;b_size)</div><div class='del'>-		    &amp;&amp; (vn-&gt;vn_mode != M_DELETE</div><div class='del'>-			|| vn-&gt;vn_affected_item_num != B_NR_ITEMS(Sh) - 1))</div><div class='del'>-			vn-&gt;vn_vi[vn-&gt;vn_nr_item - 1].vi_type |=</div><div class='del'>-			    VI_TYPE_RIGHT_MERGEABLE;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		if (op_is_left_mergeable(key, Sh-&gt;b_size) &amp;&amp;</div><div class='del'>-		    !(vn-&gt;vn_mode != M_DELETE</div><div class='del'>-		      || vn-&gt;vn_affected_item_num != B_NR_ITEMS(Sh) - 1)) {</div><div class='del'>-			/*</div><div class='del'>-			 * we delete last item and it could be merged</div><div class='del'>-			 * with right neighbor's first item</div><div class='del'>-			 */</div><div class='del'>-			if (!</div><div class='del'>-			    (B_NR_ITEMS(Sh) == 1</div><div class='del'>-			     &amp;&amp; is_direntry_le_ih(item_head(Sh, 0))</div><div class='del'>-			     &amp;&amp; ih_entry_count(item_head(Sh, 0)) == 1)) {</div><div class='del'>-				/*</div><div class='del'>-				 * node contains more than 1 item, or item</div><div class='del'>-				 * is not directory item, or this item</div><div class='del'>-				 * contains more than 1 entry</div><div class='del'>-				 */</div><div class='del'>-				print_block(Sh, 0, -1, -1);</div><div class='del'>-				reiserfs_panic(tb-&gt;tb_sb, "vs-8045",</div><div class='del'>-					       "rdkey %k, affected item==%d "</div><div class='del'>-					       "(mode==%c) Must be %c",</div><div class='del'>-					       key, vn-&gt;vn_affected_item_num,</div><div class='del'>-					       vn-&gt;vn_mode, M_DELETE);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Using virtual node check, how many items can be</div><div class='del'>- * shifted to left neighbor</div><div class='del'>- */</div><div class='del'>-static void check_left(struct tree_balance *tb, int h, int cur_free)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	struct virtual_item *vi;</div><div class='del'>-	int d_size, ih_size;</div><div class='del'>-</div><div class='del'>-	RFALSE(cur_free &lt; 0, "vs-8050: cur_free (%d) &lt; 0", cur_free);</div><div class='del'>-</div><div class='del'>-	/* internal level */</div><div class='del'>-	if (h &gt; 0) {</div><div class='del'>-		tb-&gt;lnum[h] = cur_free / (DC_SIZE + KEY_SIZE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* leaf level */</div><div class='del'>-</div><div class='del'>-	if (!cur_free || !vn-&gt;vn_nr_item) {</div><div class='del'>-		/* no free space or nothing to move */</div><div class='del'>-		tb-&gt;lnum[h] = 0;</div><div class='del'>-		tb-&gt;lbytes = -1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(!PATH_H_PPARENT(tb-&gt;tb_path, 0),</div><div class='del'>-	       "vs-8055: parent does not exist or invalid");</div><div class='del'>-</div><div class='del'>-	vi = vn-&gt;vn_vi;</div><div class='del'>-	if ((unsigned int)cur_free &gt;=</div><div class='del'>-	    (vn-&gt;vn_size -</div><div class='del'>-	     ((vi-&gt;vi_type &amp; VI_TYPE_LEFT_MERGEABLE) ? IH_SIZE : 0))) {</div><div class='del'>-		/* all contents of S[0] fits into L[0] */</div><div class='del'>-</div><div class='del'>-		RFALSE(vn-&gt;vn_mode == M_INSERT || vn-&gt;vn_mode == M_PASTE,</div><div class='del'>-		       "vs-8055: invalid mode or balance condition failed");</div><div class='del'>-</div><div class='del'>-		tb-&gt;lnum[0] = vn-&gt;vn_nr_item;</div><div class='del'>-		tb-&gt;lbytes = -1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d_size = 0, ih_size = IH_SIZE;</div><div class='del'>-</div><div class='del'>-	/* first item may be merge with last item in left neighbor */</div><div class='del'>-	if (vi-&gt;vi_type &amp; VI_TYPE_LEFT_MERGEABLE)</div><div class='del'>-		d_size = -((int)IH_SIZE), ih_size = 0;</div><div class='del'>-</div><div class='del'>-	tb-&gt;lnum[0] = 0;</div><div class='del'>-	for (i = 0; i &lt; vn-&gt;vn_nr_item;</div><div class='del'>-	     i++, ih_size = IH_SIZE, d_size = 0, vi++) {</div><div class='del'>-		d_size += vi-&gt;vi_item_len;</div><div class='del'>-		if (cur_free &gt;= d_size) {</div><div class='del'>-			/* the item can be shifted entirely */</div><div class='del'>-			cur_free -= d_size;</div><div class='del'>-			tb-&gt;lnum[0]++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* the item cannot be shifted entirely, try to split it */</div><div class='del'>-		/*</div><div class='del'>-		 * check whether L[0] can hold ih and at least one byte</div><div class='del'>-		 * of the item body</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* cannot shift even a part of the current item */</div><div class='del'>-		if (cur_free &lt;= ih_size) {</div><div class='del'>-			tb-&gt;lbytes = -1;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		cur_free -= ih_size;</div><div class='del'>-</div><div class='del'>-		tb-&gt;lbytes = op_check_left(vi, cur_free, 0, 0);</div><div class='del'>-		if (tb-&gt;lbytes != -1)</div><div class='del'>-			/* count partially shifted item */</div><div class='del'>-			tb-&gt;lnum[0]++;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Using virtual node check, how many items can be</div><div class='del'>- * shifted to right neighbor</div><div class='del'>- */</div><div class='del'>-static void check_right(struct tree_balance *tb, int h, int cur_free)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	struct virtual_item *vi;</div><div class='del'>-	int d_size, ih_size;</div><div class='del'>-</div><div class='del'>-	RFALSE(cur_free &lt; 0, "vs-8070: cur_free &lt; 0");</div><div class='del'>-</div><div class='del'>-	/* internal level */</div><div class='del'>-	if (h &gt; 0) {</div><div class='del'>-		tb-&gt;rnum[h] = cur_free / (DC_SIZE + KEY_SIZE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* leaf level */</div><div class='del'>-</div><div class='del'>-	if (!cur_free || !vn-&gt;vn_nr_item) {</div><div class='del'>-		/* no free space  */</div><div class='del'>-		tb-&gt;rnum[h] = 0;</div><div class='del'>-		tb-&gt;rbytes = -1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(!PATH_H_PPARENT(tb-&gt;tb_path, 0),</div><div class='del'>-	       "vs-8075: parent does not exist or invalid");</div><div class='del'>-</div><div class='del'>-	vi = vn-&gt;vn_vi + vn-&gt;vn_nr_item - 1;</div><div class='del'>-	if ((unsigned int)cur_free &gt;=</div><div class='del'>-	    (vn-&gt;vn_size -</div><div class='del'>-	     ((vi-&gt;vi_type &amp; VI_TYPE_RIGHT_MERGEABLE) ? IH_SIZE : 0))) {</div><div class='del'>-		/* all contents of S[0] fits into R[0] */</div><div class='del'>-</div><div class='del'>-		RFALSE(vn-&gt;vn_mode == M_INSERT || vn-&gt;vn_mode == M_PASTE,</div><div class='del'>-		       "vs-8080: invalid mode or balance condition failed");</div><div class='del'>-</div><div class='del'>-		tb-&gt;rnum[h] = vn-&gt;vn_nr_item;</div><div class='del'>-		tb-&gt;rbytes = -1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d_size = 0, ih_size = IH_SIZE;</div><div class='del'>-</div><div class='del'>-	/* last item may be merge with first item in right neighbor */</div><div class='del'>-	if (vi-&gt;vi_type &amp; VI_TYPE_RIGHT_MERGEABLE)</div><div class='del'>-		d_size = -(int)IH_SIZE, ih_size = 0;</div><div class='del'>-</div><div class='del'>-	tb-&gt;rnum[0] = 0;</div><div class='del'>-	for (i = vn-&gt;vn_nr_item - 1; i &gt;= 0;</div><div class='del'>-	     i--, d_size = 0, ih_size = IH_SIZE, vi--) {</div><div class='del'>-		d_size += vi-&gt;vi_item_len;</div><div class='del'>-		if (cur_free &gt;= d_size) {</div><div class='del'>-			/* the item can be shifted entirely */</div><div class='del'>-			cur_free -= d_size;</div><div class='del'>-			tb-&gt;rnum[0]++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * check whether R[0] can hold ih and at least one</div><div class='del'>-		 * byte of the item body</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* cannot shift even a part of the current item */</div><div class='del'>-		if (cur_free &lt;= ih_size) {</div><div class='del'>-			tb-&gt;rbytes = -1;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * R[0] can hold the header of the item and at least</div><div class='del'>-		 * one byte of its body</div><div class='del'>-		 */</div><div class='del'>-		cur_free -= ih_size;	/* cur_free is still &gt; 0 */</div><div class='del'>-</div><div class='del'>-		tb-&gt;rbytes = op_check_right(vi, cur_free);</div><div class='del'>-		if (tb-&gt;rbytes != -1)</div><div class='del'>-			/* count partially shifted item */</div><div class='del'>-			tb-&gt;rnum[0]++;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * from - number of items, which are shifted to left neighbor entirely</div><div class='del'>- * to - number of item, which are shifted to right neighbor entirely</div><div class='del'>- * from_bytes - number of bytes of boundary item (or directory entries)</div><div class='del'>- *              which are shifted to left neighbor</div><div class='del'>- * to_bytes - number of bytes of boundary item (or directory entries)</div><div class='del'>- *            which are shifted to right neighbor</div><div class='del'>- */</div><div class='del'>-static int get_num_ver(int mode, struct tree_balance *tb, int h,</div><div class='del'>-		       int from, int from_bytes,</div><div class='del'>-		       int to, int to_bytes, short *snum012, int flow)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int units;</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	int total_node_size, max_node_size, current_item_size;</div><div class='del'>-	int needed_nodes;</div><div class='del'>-</div><div class='del'>-	/* position of item we start filling node from */</div><div class='del'>-	int start_item;</div><div class='del'>-</div><div class='del'>-	/* position of item we finish filling node by */</div><div class='del'>-	int end_item;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of first bytes (entries for directory) of start_item-th item</div><div class='del'>-	 * we do not include into node that is being filled</div><div class='del'>-	 */</div><div class='del'>-	int start_bytes;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of last bytes (entries for directory) of end_item-th item</div><div class='del'>-	 * we do node include into node that is being filled</div><div class='del'>-	 */</div><div class='del'>-	int end_bytes;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * these are positions in virtual item of items, that are split</div><div class='del'>-	 * between S[0] and S1new and S1new and S2new</div><div class='del'>-	 */</div><div class='del'>-	int split_item_positions[2];</div><div class='del'>-</div><div class='del'>-	split_item_positions[0] = -1;</div><div class='del'>-	split_item_positions[1] = -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We only create additional nodes if we are in insert or paste mode</div><div class='del'>-	 * or we are in replace mode at the internal level. If h is 0 and</div><div class='del'>-	 * the mode is M_REPLACE then in fix_nodes we change the mode to</div><div class='del'>-	 * paste or insert before we get here in the code.</div><div class='del'>-	 */</div><div class='del'>-	RFALSE(tb-&gt;insert_size[h] &lt; 0 || (mode != M_INSERT &amp;&amp; mode != M_PASTE),</div><div class='del'>-	       "vs-8100: insert_size &lt; 0 in overflow");</div><div class='del'>-</div><div class='del'>-	max_node_size = MAX_CHILD_SIZE(PATH_H_PBUFFER(tb-&gt;tb_path, h));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * snum012 [0-2] - number of items, that lay</div><div class='del'>-	 * to S[0], first new node and second new node</div><div class='del'>-	 */</div><div class='del'>-	snum012[3] = -1;	/* s1bytes */</div><div class='del'>-	snum012[4] = -1;	/* s2bytes */</div><div class='del'>-</div><div class='del'>-	/* internal level */</div><div class='del'>-	if (h &gt; 0) {</div><div class='del'>-		i = ((to - from) * (KEY_SIZE + DC_SIZE) + DC_SIZE);</div><div class='del'>-		if (i == max_node_size)</div><div class='del'>-			return 1;</div><div class='del'>-		return (i / max_node_size + 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* leaf level */</div><div class='del'>-	needed_nodes = 1;</div><div class='del'>-	total_node_size = 0;</div><div class='del'>-</div><div class='del'>-	/* start from 'from'-th item */</div><div class='del'>-	start_item = from;</div><div class='del'>-	/* skip its first 'start_bytes' units */</div><div class='del'>-	start_bytes = ((from_bytes != -1) ? from_bytes : 0);</div><div class='del'>-</div><div class='del'>-	/* last included item is the 'end_item'-th one */</div><div class='del'>-	end_item = vn-&gt;vn_nr_item - to - 1;</div><div class='del'>-	/* do not count last 'end_bytes' units of 'end_item'-th item */</div><div class='del'>-	end_bytes = (to_bytes != -1) ? to_bytes : 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * go through all item beginning from the start_item-th item</div><div class='del'>-	 * and ending by the end_item-th item. Do not count first</div><div class='del'>-	 * 'start_bytes' units of 'start_item'-th item and last</div><div class='del'>-	 * 'end_bytes' of 'end_item'-th item</div><div class='del'>-	 */</div><div class='del'>-	for (i = start_item; i &lt;= end_item; i++) {</div><div class='del'>-		struct virtual_item *vi = vn-&gt;vn_vi + i;</div><div class='del'>-		int skip_from_end = ((i == end_item) ? end_bytes : 0);</div><div class='del'>-</div><div class='del'>-		RFALSE(needed_nodes &gt; 3, "vs-8105: too many nodes are needed");</div><div class='del'>-</div><div class='del'>-		/* get size of current item */</div><div class='del'>-		current_item_size = vi-&gt;vi_item_len;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * do not take in calculation head part (from_bytes)</div><div class='del'>-		 * of from-th item</div><div class='del'>-		 */</div><div class='del'>-		current_item_size -=</div><div class='del'>-		    op_part_size(vi, 0 /*from start */ , start_bytes);</div><div class='del'>-</div><div class='del'>-		/* do not take in calculation tail part of last item */</div><div class='del'>-		current_item_size -=</div><div class='del'>-		    op_part_size(vi, 1 /*from end */ , skip_from_end);</div><div class='del'>-</div><div class='del'>-		/* if item fits into current node entierly */</div><div class='del'>-		if (total_node_size + current_item_size &lt;= max_node_size) {</div><div class='del'>-			snum012[needed_nodes - 1]++;</div><div class='del'>-			total_node_size += current_item_size;</div><div class='del'>-			start_bytes = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * virtual item length is longer, than max size of item in</div><div class='del'>-		 * a node. It is impossible for direct item</div><div class='del'>-		 */</div><div class='del'>-		if (current_item_size &gt; max_node_size) {</div><div class='del'>-			RFALSE(is_direct_le_ih(vi-&gt;vi_ih),</div><div class='del'>-			       "vs-8110: "</div><div class='del'>-			       "direct item length is %d. It can not be longer than %d",</div><div class='del'>-			       current_item_size, max_node_size);</div><div class='del'>-			/* we will try to split it */</div><div class='del'>-			flow = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* as we do not split items, take new node and continue */</div><div class='del'>-		if (!flow) {</div><div class='del'>-			needed_nodes++;</div><div class='del'>-			i--;</div><div class='del'>-			total_node_size = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * calculate number of item units which fit into node being</div><div class='del'>-		 * filled</div><div class='del'>-		 */</div><div class='del'>-		{</div><div class='del'>-			int free_space;</div><div class='del'>-</div><div class='del'>-			free_space = max_node_size - total_node_size - IH_SIZE;</div><div class='del'>-			units =</div><div class='del'>-			    op_check_left(vi, free_space, start_bytes,</div><div class='del'>-					  skip_from_end);</div><div class='del'>-			/*</div><div class='del'>-			 * nothing fits into current node, take new</div><div class='del'>-			 * node and continue</div><div class='del'>-			 */</div><div class='del'>-			if (units == -1) {</div><div class='del'>-				needed_nodes++, i--, total_node_size = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* something fits into the current node */</div><div class='del'>-		start_bytes += units;</div><div class='del'>-		snum012[needed_nodes - 1 + 3] = units;</div><div class='del'>-</div><div class='del'>-		if (needed_nodes &gt; 2)</div><div class='del'>-			reiserfs_warning(tb-&gt;tb_sb, "vs-8111",</div><div class='del'>-					 "split_item_position is out of range");</div><div class='del'>-		snum012[needed_nodes - 1]++;</div><div class='del'>-		split_item_positions[needed_nodes - 1] = i;</div><div class='del'>-		needed_nodes++;</div><div class='del'>-		/* continue from the same item with start_bytes != -1 */</div><div class='del'>-		start_item = i;</div><div class='del'>-		i--;</div><div class='del'>-		total_node_size = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * sum012[4] (if it is not -1) contains number of units of which</div><div class='del'>-	 * are to be in S1new, snum012[3] - to be in S0. They are supposed</div><div class='del'>-	 * to be S1bytes and S2bytes correspondingly, so recalculate</div><div class='del'>-	 */</div><div class='del'>-	if (snum012[4] &gt; 0) {</div><div class='del'>-		int split_item_num;</div><div class='del'>-		int bytes_to_r, bytes_to_l;</div><div class='del'>-		int bytes_to_S1new;</div><div class='del'>-</div><div class='del'>-		split_item_num = split_item_positions[1];</div><div class='del'>-		bytes_to_l =</div><div class='del'>-		    ((from == split_item_num</div><div class='del'>-		      &amp;&amp; from_bytes != -1) ? from_bytes : 0);</div><div class='del'>-		bytes_to_r =</div><div class='del'>-		    ((end_item == split_item_num</div><div class='del'>-		      &amp;&amp; end_bytes != -1) ? end_bytes : 0);</div><div class='del'>-		bytes_to_S1new =</div><div class='del'>-		    ((split_item_positions[0] ==</div><div class='del'>-		      split_item_positions[1]) ? snum012[3] : 0);</div><div class='del'>-</div><div class='del'>-		/* s2bytes */</div><div class='del'>-		snum012[4] =</div><div class='del'>-		    op_unit_num(&amp;vn-&gt;vn_vi[split_item_num]) - snum012[4] -</div><div class='del'>-		    bytes_to_r - bytes_to_l - bytes_to_S1new;</div><div class='del'>-</div><div class='del'>-		if (vn-&gt;vn_vi[split_item_num].vi_index != TYPE_DIRENTRY &amp;&amp;</div><div class='del'>-		    vn-&gt;vn_vi[split_item_num].vi_index != TYPE_INDIRECT)</div><div class='del'>-			reiserfs_warning(tb-&gt;tb_sb, "vs-8115",</div><div class='del'>-					 "not directory or indirect item");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now we know S2bytes, calculate S1bytes */</div><div class='del'>-	if (snum012[3] &gt; 0) {</div><div class='del'>-		int split_item_num;</div><div class='del'>-		int bytes_to_r, bytes_to_l;</div><div class='del'>-		int bytes_to_S2new;</div><div class='del'>-</div><div class='del'>-		split_item_num = split_item_positions[0];</div><div class='del'>-		bytes_to_l =</div><div class='del'>-		    ((from == split_item_num</div><div class='del'>-		      &amp;&amp; from_bytes != -1) ? from_bytes : 0);</div><div class='del'>-		bytes_to_r =</div><div class='del'>-		    ((end_item == split_item_num</div><div class='del'>-		      &amp;&amp; end_bytes != -1) ? end_bytes : 0);</div><div class='del'>-		bytes_to_S2new =</div><div class='del'>-		    ((split_item_positions[0] == split_item_positions[1]</div><div class='del'>-		      &amp;&amp; snum012[4] != -1) ? snum012[4] : 0);</div><div class='del'>-</div><div class='del'>-		/* s1bytes */</div><div class='del'>-		snum012[3] =</div><div class='del'>-		    op_unit_num(&amp;vn-&gt;vn_vi[split_item_num]) - snum012[3] -</div><div class='del'>-		    bytes_to_r - bytes_to_l - bytes_to_S2new;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return needed_nodes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set parameters for balancing.</div><div class='del'>- * Performs write of results of analysis of balancing into structure tb,</div><div class='del'>- * where it will later be used by the functions that actually do the balancing.</div><div class='del'>- * Parameters:</div><div class='del'>- *	tb	tree_balance structure;</div><div class='del'>- *	h	current level of the node;</div><div class='del'>- *	lnum	number of items from S[h] that must be shifted to L[h];</div><div class='del'>- *	rnum	number of items from S[h] that must be shifted to R[h];</div><div class='del'>- *	blk_num	number of blocks that S[h] will be splitted into;</div><div class='del'>- *	s012	number of items that fall into splitted nodes.</div><div class='del'>- *	lbytes	number of bytes which flow to the left neighbor from the</div><div class='del'>- *              item that is not shifted entirely</div><div class='del'>- *	rbytes	number of bytes which flow to the right neighbor from the</div><div class='del'>- *              item that is not shifted entirely</div><div class='del'>- *	s1bytes	number of bytes which flow to the first  new node when</div><div class='del'>- *              S[0] splits (this number is contained in s012 array)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void set_parameters(struct tree_balance *tb, int h, int lnum,</div><div class='del'>-			   int rnum, int blk_num, short *s012, int lb, int rb)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	tb-&gt;lnum[h] = lnum;</div><div class='del'>-	tb-&gt;rnum[h] = rnum;</div><div class='del'>-	tb-&gt;blknum[h] = blk_num;</div><div class='del'>-</div><div class='del'>-	/* only for leaf level */</div><div class='del'>-	if (h == 0) {</div><div class='del'>-		if (s012 != NULL) {</div><div class='del'>-			tb-&gt;s0num = *s012++;</div><div class='del'>-			tb-&gt;snum[0] = *s012++;</div><div class='del'>-			tb-&gt;snum[1] = *s012++;</div><div class='del'>-			tb-&gt;sbytes[0] = *s012++;</div><div class='del'>-			tb-&gt;sbytes[1] = *s012;</div><div class='del'>-		}</div><div class='del'>-		tb-&gt;lbytes = lb;</div><div class='del'>-		tb-&gt;rbytes = rb;</div><div class='del'>-	}</div><div class='del'>-	PROC_INFO_ADD(tb-&gt;tb_sb, lnum[h], lnum);</div><div class='del'>-	PROC_INFO_ADD(tb-&gt;tb_sb, rnum[h], rnum);</div><div class='del'>-</div><div class='del'>-	PROC_INFO_ADD(tb-&gt;tb_sb, lbytes[h], lb);</div><div class='del'>-	PROC_INFO_ADD(tb-&gt;tb_sb, rbytes[h], rb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * check if node disappears if we shift tb-&gt;lnum[0] items to left</div><div class='del'>- * neighbor and tb-&gt;rnum[0] to the right one.</div><div class='del'>- */</div><div class='del'>-static int is_leaf_removable(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	int to_left, to_right;</div><div class='del'>-	int size;</div><div class='del'>-	int remain_items;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of items that will be shifted to left (right) neighbor</div><div class='del'>-	 * entirely</div><div class='del'>-	 */</div><div class='del'>-	to_left = tb-&gt;lnum[0] - ((tb-&gt;lbytes != -1) ? 1 : 0);</div><div class='del'>-	to_right = tb-&gt;rnum[0] - ((tb-&gt;rbytes != -1) ? 1 : 0);</div><div class='del'>-	remain_items = vn-&gt;vn_nr_item;</div><div class='del'>-</div><div class='del'>-	/* how many items remain in S[0] after shiftings to neighbors */</div><div class='del'>-	remain_items -= (to_left + to_right);</div><div class='del'>-</div><div class='del'>-	/* all content of node can be shifted to neighbors */</div><div class='del'>-	if (remain_items &lt; 1) {</div><div class='del'>-		set_parameters(tb, 0, to_left, vn-&gt;vn_nr_item - to_left, 0,</div><div class='del'>-			       NULL, -1, -1);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* S[0] is not removable */</div><div class='del'>-	if (remain_items &gt; 1 || tb-&gt;lbytes == -1 || tb-&gt;rbytes == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check whether we can divide 1 remaining item between neighbors */</div><div class='del'>-</div><div class='del'>-	/* get size of remaining item (in item units) */</div><div class='del'>-	size = op_unit_num(&amp;vn-&gt;vn_vi[to_left]);</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;lbytes + tb-&gt;rbytes &gt;= size) {</div><div class='del'>-		set_parameters(tb, 0, to_left + 1, to_right + 1, 0, NULL,</div><div class='del'>-			       tb-&gt;lbytes, -1);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check whether L, S, R can be joined in one node */</div><div class='del'>-static int are_leaves_removable(struct tree_balance *tb, int lfree, int rfree)</div><div class='del'>-{</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	int ih_size;</div><div class='del'>-	struct buffer_head *S0;</div><div class='del'>-</div><div class='del'>-	S0 = PATH_H_PBUFFER(tb-&gt;tb_path, 0);</div><div class='del'>-</div><div class='del'>-	ih_size = 0;</div><div class='del'>-	if (vn-&gt;vn_nr_item) {</div><div class='del'>-		if (vn-&gt;vn_vi[0].vi_type &amp; VI_TYPE_LEFT_MERGEABLE)</div><div class='del'>-			ih_size += IH_SIZE;</div><div class='del'>-</div><div class='del'>-		if (vn-&gt;vn_vi[vn-&gt;vn_nr_item - 1].</div><div class='del'>-		    vi_type &amp; VI_TYPE_RIGHT_MERGEABLE)</div><div class='del'>-			ih_size += IH_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		/* there was only one item and it will be deleted */</div><div class='del'>-		struct item_head *ih;</div><div class='del'>-</div><div class='del'>-		RFALSE(B_NR_ITEMS(S0) != 1,</div><div class='del'>-		       "vs-8125: item number must be 1: it is %d",</div><div class='del'>-		       B_NR_ITEMS(S0));</div><div class='del'>-</div><div class='del'>-		ih = item_head(S0, 0);</div><div class='del'>-		if (tb-&gt;CFR[0]</div><div class='del'>-		    &amp;&amp; !comp_short_le_keys(&amp;ih-&gt;ih_key,</div><div class='del'>-					   internal_key(tb-&gt;CFR[0],</div><div class='del'>-							  tb-&gt;rkey[0])))</div><div class='del'>-			/*</div><div class='del'>-			 * Directory must be in correct state here: that is</div><div class='del'>-			 * somewhere at the left side should exist first</div><div class='del'>-			 * directory item. But the item being deleted can</div><div class='del'>-			 * not be that first one because its right neighbor</div><div class='del'>-			 * is item of the same directory. (But first item</div><div class='del'>-			 * always gets deleted in last turn). So, neighbors</div><div class='del'>-			 * of deleted item can be merged, so we can save</div><div class='del'>-			 * ih_size</div><div class='del'>-			 */</div><div class='del'>-			if (is_direntry_le_ih(ih)) {</div><div class='del'>-				ih_size = IH_SIZE;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * we might check that left neighbor exists</div><div class='del'>-				 * and is of the same directory</div><div class='del'>-				 */</div><div class='del'>-				RFALSE(le_ih_k_offset(ih) == DOT_OFFSET,</div><div class='del'>-				       "vs-8130: first directory item can not be removed until directory is not empty");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (MAX_CHILD_SIZE(S0) + vn-&gt;vn_size &lt;= rfree + lfree + ih_size) {</div><div class='del'>-		set_parameters(tb, 0, -1, -1, -1, NULL, -1, -1);</div><div class='del'>-		PROC_INFO_INC(tb-&gt;tb_sb, leaves_removable);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* when we do not split item, lnum and rnum are numbers of entire items */</div><div class='del'>-#define SET_PAR_SHIFT_LEFT \</div><div class='del'>-if (h)\</div><div class='del'>-{\</div><div class='del'>-   int to_l;\</div><div class='del'>-   \</div><div class='del'>-   to_l = (MAX_NR_KEY(Sh)+1 - lpar + vn-&gt;vn_nr_item + 1) / 2 -\</div><div class='del'>-	      (MAX_NR_KEY(Sh) + 1 - lpar);\</div><div class='del'>-	      \</div><div class='del'>-	      set_parameters (tb, h, to_l, 0, lnver, NULL, -1, -1);\</div><div class='del'>-}\</div><div class='del'>-else \</div><div class='del'>-{\</div><div class='del'>-   if (lset==LEFT_SHIFT_FLOW)\</div><div class='del'>-     set_parameters (tb, h, lpar, 0, lnver, snum012+lset,\</div><div class='del'>-		     tb-&gt;lbytes, -1);\</div><div class='del'>-   else\</div><div class='del'>-     set_parameters (tb, h, lpar - (tb-&gt;lbytes!=-1), 0, lnver, snum012+lset,\</div><div class='del'>-		     -1, -1);\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SET_PAR_SHIFT_RIGHT \</div><div class='del'>-if (h)\</div><div class='del'>-{\</div><div class='del'>-   int to_r;\</div><div class='del'>-   \</div><div class='del'>-   to_r = (MAX_NR_KEY(Sh)+1 - rpar + vn-&gt;vn_nr_item + 1) / 2 - (MAX_NR_KEY(Sh) + 1 - rpar);\</div><div class='del'>-   \</div><div class='del'>-   set_parameters (tb, h, 0, to_r, rnver, NULL, -1, -1);\</div><div class='del'>-}\</div><div class='del'>-else \</div><div class='del'>-{\</div><div class='del'>-   if (rset==RIGHT_SHIFT_FLOW)\</div><div class='del'>-     set_parameters (tb, h, 0, rpar, rnver, snum012+rset,\</div><div class='del'>-		  -1, tb-&gt;rbytes);\</div><div class='del'>-   else\</div><div class='del'>-     set_parameters (tb, h, 0, rpar - (tb-&gt;rbytes!=-1), rnver, snum012+rset,\</div><div class='del'>-		  -1, -1);\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_buffers_in_tb(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	pathrelse(tb-&gt;tb_path);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_HEIGHT; i++) {</div><div class='del'>-		brelse(tb-&gt;L[i]);</div><div class='del'>-		brelse(tb-&gt;R[i]);</div><div class='del'>-		brelse(tb-&gt;FL[i]);</div><div class='del'>-		brelse(tb-&gt;FR[i]);</div><div class='del'>-		brelse(tb-&gt;CFL[i]);</div><div class='del'>-		brelse(tb-&gt;CFR[i]);</div><div class='del'>-</div><div class='del'>-		tb-&gt;L[i] = NULL;</div><div class='del'>-		tb-&gt;R[i] = NULL;</div><div class='del'>-		tb-&gt;FL[i] = NULL;</div><div class='del'>-		tb-&gt;FR[i] = NULL;</div><div class='del'>-		tb-&gt;CFL[i] = NULL;</div><div class='del'>-		tb-&gt;CFR[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get new buffers for storing new nodes that are created while balancing.</div><div class='del'>- * Returns:	SCHEDULE_OCCURRED - schedule occurred while the function worked;</div><div class='del'>- *	        CARRY_ON - schedule didn't occur while the function worked;</div><div class='del'>- *	        NO_DISK_SPACE - no disk space.</div><div class='del'>- */</div><div class='del'>-/* The function is NOT SCHEDULE-SAFE! */</div><div class='del'>-static int get_empty_nodes(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *new_bh, *Sh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-	b_blocknr_t *blocknr, blocknrs[MAX_AMOUNT_NEEDED] = { 0, };</div><div class='del'>-	int counter, number_of_freeblk;</div><div class='del'>-	int  amount_needed;	/* number of needed empty blocks */</div><div class='del'>-	int  retval = CARRY_ON;</div><div class='del'>-	struct super_block *sb = tb-&gt;tb_sb;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number_of_freeblk is the number of empty blocks which have been</div><div class='del'>-	 * acquired for use by the balancing algorithm minus the number of</div><div class='del'>-	 * empty blocks used in the previous levels of the analysis,</div><div class='del'>-	 * number_of_freeblk = tb-&gt;cur_blknum can be non-zero if a schedule</div><div class='del'>-	 * occurs after empty blocks are acquired, and the balancing analysis</div><div class='del'>-	 * is then restarted, amount_needed is the number needed by this</div><div class='del'>-	 * level (h) of the balancing analysis.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that for systems with many processes writing, it would be</div><div class='del'>-	 * more layout optimal to calculate the total number needed by all</div><div class='del'>-	 * levels and then to run reiserfs_new_blocks to get all of them at</div><div class='del'>-	 * once.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initiate number_of_freeblk to the amount acquired prior to the</div><div class='del'>-	 * restart of the analysis or 0 if not restarted, then subtract the</div><div class='del'>-	 * amount needed by all of the levels of the tree below h.</div><div class='del'>-	 */</div><div class='del'>-	/* blknum includes S[h], so we subtract 1 in this calculation */</div><div class='del'>-	for (counter = 0, number_of_freeblk = tb-&gt;cur_blknum;</div><div class='del'>-	     counter &lt; h; counter++)</div><div class='del'>-		number_of_freeblk -=</div><div class='del'>-		    (tb-&gt;blknum[counter]) ? (tb-&gt;blknum[counter] -</div><div class='del'>-						   1) : 0;</div><div class='del'>-</div><div class='del'>-	/* Allocate missing empty blocks. */</div><div class='del'>-	/* if Sh == 0  then we are getting a new root */</div><div class='del'>-	amount_needed = (Sh) ? (tb-&gt;blknum[h] - 1) : 1;</div><div class='del'>-	/*</div><div class='del'>-	 * Amount_needed = the amount that we need more than the</div><div class='del'>-	 * amount that we have.</div><div class='del'>-	 */</div><div class='del'>-	if (amount_needed &gt; number_of_freeblk)</div><div class='del'>-		amount_needed -= number_of_freeblk;</div><div class='del'>-	else	/* If we have enough already then there is nothing to do. */</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No need to check quota - is not allocated for blocks used</div><div class='del'>-	 * for formatted nodes</div><div class='del'>-	 */</div><div class='del'>-	if (reiserfs_new_form_blocknrs(tb, blocknrs,</div><div class='del'>-				       amount_needed) == NO_DISK_SPACE)</div><div class='del'>-		return NO_DISK_SPACE;</div><div class='del'>-</div><div class='del'>-	/* for each blocknumber we just got, get a buffer and stick it on FEB */</div><div class='del'>-	for (blocknr = blocknrs, counter = 0;</div><div class='del'>-	     counter &lt; amount_needed; blocknr++, counter++) {</div><div class='del'>-</div><div class='del'>-		RFALSE(!*blocknr,</div><div class='del'>-		       "PAP-8135: reiserfs_new_blocknrs failed when got new blocks");</div><div class='del'>-</div><div class='del'>-		new_bh = sb_getblk(sb, *blocknr);</div><div class='del'>-		RFALSE(buffer_dirty(new_bh) ||</div><div class='del'>-		       buffer_journaled(new_bh) ||</div><div class='del'>-		       buffer_journal_dirty(new_bh),</div><div class='del'>-		       "PAP-8140: journaled or dirty buffer %b for the new block",</div><div class='del'>-		       new_bh);</div><div class='del'>-</div><div class='del'>-		/* Put empty buffers into the array. */</div><div class='del'>-		RFALSE(tb-&gt;FEB[tb-&gt;cur_blknum],</div><div class='del'>-		       "PAP-8141: busy slot for new buffer");</div><div class='del'>-</div><div class='del'>-		set_buffer_journal_new(new_bh);</div><div class='del'>-		tb-&gt;FEB[tb-&gt;cur_blknum++] = new_bh;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (retval == CARRY_ON &amp;&amp; FILESYSTEM_CHANGED_TB(tb))</div><div class='del'>-		retval = REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get free space of the left neighbor, which is stored in the parent</div><div class='del'>- * node of the left neighbor.</div><div class='del'>- */</div><div class='del'>-static int get_lfree(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *l, *f;</div><div class='del'>-	int order;</div><div class='del'>-</div><div class='del'>-	if ((f = PATH_H_PPARENT(tb-&gt;tb_path, h)) == NULL ||</div><div class='del'>-	    (l = tb-&gt;FL[h]) == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (f == l)</div><div class='del'>-		order = PATH_H_B_ITEM_ORDER(tb-&gt;tb_path, h) - 1;</div><div class='del'>-	else {</div><div class='del'>-		order = B_NR_ITEMS(l);</div><div class='del'>-		f = l;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (MAX_CHILD_SIZE(f) - dc_size(B_N_CHILD(f, order)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get free space of the right neighbor,</div><div class='del'>- * which is stored in the parent node of the right neighbor.</div><div class='del'>- */</div><div class='del'>-static int get_rfree(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *r, *f;</div><div class='del'>-	int order;</div><div class='del'>-</div><div class='del'>-	if ((f = PATH_H_PPARENT(tb-&gt;tb_path, h)) == NULL ||</div><div class='del'>-	    (r = tb-&gt;FR[h]) == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (f == r)</div><div class='del'>-		order = PATH_H_B_ITEM_ORDER(tb-&gt;tb_path, h) + 1;</div><div class='del'>-	else {</div><div class='del'>-		order = 0;</div><div class='del'>-		f = r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (MAX_CHILD_SIZE(f) - dc_size(B_N_CHILD(f, order)));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Check whether left neighbor is in memory. */</div><div class='del'>-static int is_left_neighbor_in_cache(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *father, *left;</div><div class='del'>-	struct super_block *sb = tb-&gt;tb_sb;</div><div class='del'>-	b_blocknr_t left_neighbor_blocknr;</div><div class='del'>-	int left_neighbor_position;</div><div class='del'>-</div><div class='del'>-	/* Father of the left neighbor does not exist. */</div><div class='del'>-	if (!tb-&gt;FL[h])</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Calculate father of the node to be balanced. */</div><div class='del'>-	father = PATH_H_PBUFFER(tb-&gt;tb_path, h + 1);</div><div class='del'>-</div><div class='del'>-	RFALSE(!father ||</div><div class='del'>-	       !B_IS_IN_TREE(father) ||</div><div class='del'>-	       !B_IS_IN_TREE(tb-&gt;FL[h]) ||</div><div class='del'>-	       !buffer_uptodate(father) ||</div><div class='del'>-	       !buffer_uptodate(tb-&gt;FL[h]),</div><div class='del'>-	       "vs-8165: F[h] (%b) or FL[h] (%b) is invalid",</div><div class='del'>-	       father, tb-&gt;FL[h]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get position of the pointer to the left neighbor</div><div class='del'>-	 * into the left father.</div><div class='del'>-	 */</div><div class='del'>-	left_neighbor_position = (father == tb-&gt;FL[h]) ?</div><div class='del'>-	    tb-&gt;lkey[h] : B_NR_ITEMS(tb-&gt;FL[h]);</div><div class='del'>-	/* Get left neighbor block number. */</div><div class='del'>-	left_neighbor_blocknr =</div><div class='del'>-	    B_N_CHILD_NUM(tb-&gt;FL[h], left_neighbor_position);</div><div class='del'>-	/* Look for the left neighbor in the cache. */</div><div class='del'>-	if ((left = sb_find_get_block(sb, left_neighbor_blocknr))) {</div><div class='del'>-</div><div class='del'>-		RFALSE(buffer_uptodate(left) &amp;&amp; !B_IS_IN_TREE(left),</div><div class='del'>-		       "vs-8170: left neighbor (%b %z) is not in the tree",</div><div class='del'>-		       left, left);</div><div class='del'>-		put_bh(left);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define LEFT_PARENTS  'l'</div><div class='del'>-#define RIGHT_PARENTS 'r'</div><div class='del'>-</div><div class='del'>-static void decrement_key(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	/* call item specific function for this key */</div><div class='del'>-	item_ops[cpu_key_k_type(key)]-&gt;decrement_key(key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calculate far left/right parent of the left/right neighbor of the</div><div class='del'>- * current node, that is calculate the left/right (FL[h]/FR[h]) neighbor</div><div class='del'>- * of the parent F[h].</div><div class='del'>- * Calculate left/right common parent of the current node and L[h]/R[h].</div><div class='del'>- * Calculate left/right delimiting key position.</div><div class='del'>- * Returns:	PATH_INCORRECT    - path in the tree is not correct</div><div class='del'>- *		SCHEDULE_OCCURRED - schedule occurred while the function worked</div><div class='del'>- *	        CARRY_ON          - schedule didn't occur while the function</div><div class='del'>- *				    worked</div><div class='del'>- */</div><div class='del'>-static int get_far_parent(struct tree_balance *tb,</div><div class='del'>-			  int h,</div><div class='del'>-			  struct buffer_head **pfather,</div><div class='del'>-			  struct buffer_head **pcom_father, char c_lr_par)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *parent;</div><div class='del'>-	INITIALIZE_PATH(s_path_to_neighbor_father);</div><div class='del'>-	struct treepath *path = tb-&gt;tb_path;</div><div class='del'>-	struct cpu_key s_lr_father_key;</div><div class='del'>-	int counter,</div><div class='del'>-	    position = INT_MAX,</div><div class='del'>-	    first_last_position = 0,</div><div class='del'>-	    path_offset = PATH_H_PATH_OFFSET(path, h);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Starting from F[h] go upwards in the tree, and look for the common</div><div class='del'>-	 * ancestor of F[h], and its neighbor l/r, that should be obtained.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	counter = path_offset;</div><div class='del'>-</div><div class='del'>-	RFALSE(counter &lt; FIRST_PATH_ELEMENT_OFFSET,</div><div class='del'>-	       "PAP-8180: invalid path length");</div><div class='del'>-</div><div class='del'>-	for (; counter &gt; FIRST_PATH_ELEMENT_OFFSET; counter--) {</div><div class='del'>-		/*</div><div class='del'>-		 * Check whether parent of the current buffer in the path</div><div class='del'>-		 * is really parent in the tree.</div><div class='del'>-		 */</div><div class='del'>-		if (!B_IS_IN_TREE</div><div class='del'>-		    (parent = PATH_OFFSET_PBUFFER(path, counter - 1)))</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-		/* Check whether position in the parent is correct. */</div><div class='del'>-		if ((position =</div><div class='del'>-		     PATH_OFFSET_POSITION(path,</div><div class='del'>-					  counter - 1)) &gt;</div><div class='del'>-		    B_NR_ITEMS(parent))</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check whether parent at the path really points</div><div class='del'>-		 * to the child.</div><div class='del'>-		 */</div><div class='del'>-		if (B_N_CHILD_NUM(parent, position) !=</div><div class='del'>-		    PATH_OFFSET_PBUFFER(path, counter)-&gt;b_blocknr)</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Return delimiting key if position in the parent is not</div><div class='del'>-		 * equal to first/last one.</div><div class='del'>-		 */</div><div class='del'>-		if (c_lr_par == RIGHT_PARENTS)</div><div class='del'>-			first_last_position = B_NR_ITEMS(parent);</div><div class='del'>-		if (position != first_last_position) {</div><div class='del'>-			*pcom_father = parent;</div><div class='del'>-			get_bh(*pcom_father);</div><div class='del'>-			/*(*pcom_father = parent)-&gt;b_count++; */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if we are in the root of the tree, then there is no common father */</div><div class='del'>-	if (counter == FIRST_PATH_ELEMENT_OFFSET) {</div><div class='del'>-		/*</div><div class='del'>-		 * Check whether first buffer in the path is the</div><div class='del'>-		 * root of the tree.</div><div class='del'>-		 */</div><div class='del'>-		if (PATH_OFFSET_PBUFFER</div><div class='del'>-		    (tb-&gt;tb_path,</div><div class='del'>-		     FIRST_PATH_ELEMENT_OFFSET)-&gt;b_blocknr ==</div><div class='del'>-		    SB_ROOT_BLOCK(tb-&gt;tb_sb)) {</div><div class='del'>-			*pfather = *pcom_father = NULL;</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(B_LEVEL(*pcom_father) &lt;= DISK_LEAF_NODE_LEVEL,</div><div class='del'>-	       "PAP-8185: (%b %z) level too small",</div><div class='del'>-	       *pcom_father, *pcom_father);</div><div class='del'>-</div><div class='del'>-	/* Check whether the common parent is locked. */</div><div class='del'>-</div><div class='del'>-	if (buffer_locked(*pcom_father)) {</div><div class='del'>-</div><div class='del'>-		/* Release the write lock while the buffer is busy */</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(tb-&gt;tb_sb);</div><div class='del'>-		__wait_on_buffer(*pcom_father);</div><div class='del'>-		reiserfs_write_lock_nested(tb-&gt;tb_sb, depth);</div><div class='del'>-		if (FILESYSTEM_CHANGED_TB(tb)) {</div><div class='del'>-			brelse(*pcom_father);</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * So, we got common parent of the current node and its</div><div class='del'>-	 * left/right neighbor.  Now we are getting the parent of the</div><div class='del'>-	 * left/right neighbor.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Form key to get parent of the left/right neighbor. */</div><div class='del'>-	le_key2cpu_key(&amp;s_lr_father_key,</div><div class='del'>-		       internal_key(*pcom_father,</div><div class='del'>-				      (c_lr_par ==</div><div class='del'>-				       LEFT_PARENTS) ? (tb-&gt;lkey[h - 1] =</div><div class='del'>-							position -</div><div class='del'>-							1) : (tb-&gt;rkey[h -</div><div class='del'>-									   1] =</div><div class='del'>-							      position)));</div><div class='del'>-</div><div class='del'>-	if (c_lr_par == LEFT_PARENTS)</div><div class='del'>-		decrement_key(&amp;s_lr_father_key);</div><div class='del'>-</div><div class='del'>-	if (search_by_key</div><div class='del'>-	    (tb-&gt;tb_sb, &amp;s_lr_father_key, &amp;s_path_to_neighbor_father,</div><div class='del'>-	     h + 1) == IO_ERROR)</div><div class='del'>-		/* path is released */</div><div class='del'>-		return IO_ERROR;</div><div class='del'>-</div><div class='del'>-	if (FILESYSTEM_CHANGED_TB(tb)) {</div><div class='del'>-		pathrelse(&amp;s_path_to_neighbor_father);</div><div class='del'>-		brelse(*pcom_father);</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pfather = PATH_PLAST_BUFFER(&amp;s_path_to_neighbor_father);</div><div class='del'>-</div><div class='del'>-	RFALSE(B_LEVEL(*pfather) != h + 1,</div><div class='del'>-	       "PAP-8190: (%b %z) level too small", *pfather, *pfather);</div><div class='del'>-	RFALSE(s_path_to_neighbor_father.path_length &lt;</div><div class='del'>-	       FIRST_PATH_ELEMENT_OFFSET, "PAP-8192: path length is too small");</div><div class='del'>-</div><div class='del'>-	s_path_to_neighbor_father.path_length--;</div><div class='del'>-	pathrelse(&amp;s_path_to_neighbor_father);</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get parents of neighbors of node in the path(S[path_offset]) and</div><div class='del'>- * common parents of S[path_offset] and L[path_offset]/R[path_offset]:</div><div class='del'>- * F[path_offset], FL[path_offset], FR[path_offset], CFL[path_offset],</div><div class='del'>- * CFR[path_offset].</div><div class='del'>- * Calculate numbers of left and right delimiting keys position:</div><div class='del'>- * lkey[path_offset], rkey[path_offset].</div><div class='del'>- * Returns:	SCHEDULE_OCCURRED - schedule occurred while the function worked</div><div class='del'>- *	        CARRY_ON - schedule didn't occur while the function worked</div><div class='del'>- */</div><div class='del'>-static int get_parents(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct treepath *path = tb-&gt;tb_path;</div><div class='del'>-	int position,</div><div class='del'>-	    ret,</div><div class='del'>-	    path_offset = PATH_H_PATH_OFFSET(tb-&gt;tb_path, h);</div><div class='del'>-	struct buffer_head *curf, *curcf;</div><div class='del'>-</div><div class='del'>-	/* Current node is the root of the tree or will be root of the tree */</div><div class='del'>-	if (path_offset &lt;= FIRST_PATH_ELEMENT_OFFSET) {</div><div class='del'>-		/*</div><div class='del'>-		 * The root can not have parents.</div><div class='del'>-		 * Release nodes which previously were obtained as</div><div class='del'>-		 * parents of the current node neighbors.</div><div class='del'>-		 */</div><div class='del'>-		brelse(tb-&gt;FL[h]);</div><div class='del'>-		brelse(tb-&gt;CFL[h]);</div><div class='del'>-		brelse(tb-&gt;FR[h]);</div><div class='del'>-		brelse(tb-&gt;CFR[h]);</div><div class='del'>-		tb-&gt;FL[h]  = NULL;</div><div class='del'>-		tb-&gt;CFL[h] = NULL;</div><div class='del'>-		tb-&gt;FR[h]  = NULL;</div><div class='del'>-		tb-&gt;CFR[h] = NULL;</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get parent FL[path_offset] of L[path_offset]. */</div><div class='del'>-	position = PATH_OFFSET_POSITION(path, path_offset - 1);</div><div class='del'>-	if (position) {</div><div class='del'>-		/* Current node is not the first child of its parent. */</div><div class='del'>-		curf = PATH_OFFSET_PBUFFER(path, path_offset - 1);</div><div class='del'>-		curcf = PATH_OFFSET_PBUFFER(path, path_offset - 1);</div><div class='del'>-		get_bh(curf);</div><div class='del'>-		get_bh(curf);</div><div class='del'>-		tb-&gt;lkey[h] = position - 1;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate current parent of L[path_offset], which is the</div><div class='del'>-		 * left neighbor of the current node.  Calculate current</div><div class='del'>-		 * common parent of L[path_offset] and the current node.</div><div class='del'>-		 * Note that CFL[path_offset] not equal FL[path_offset] and</div><div class='del'>-		 * CFL[path_offset] not equal F[path_offset].</div><div class='del'>-		 * Calculate lkey[path_offset].</div><div class='del'>-		 */</div><div class='del'>-		if ((ret = get_far_parent(tb, h + 1, &amp;curf,</div><div class='del'>-						  &amp;curcf,</div><div class='del'>-						  LEFT_PARENTS)) != CARRY_ON)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	brelse(tb-&gt;FL[h]);</div><div class='del'>-	tb-&gt;FL[h] = curf;	/* New initialization of FL[h]. */</div><div class='del'>-	brelse(tb-&gt;CFL[h]);</div><div class='del'>-	tb-&gt;CFL[h] = curcf;	/* New initialization of CFL[h]. */</div><div class='del'>-</div><div class='del'>-	RFALSE((curf &amp;&amp; !B_IS_IN_TREE(curf)) ||</div><div class='del'>-	       (curcf &amp;&amp; !B_IS_IN_TREE(curcf)),</div><div class='del'>-	       "PAP-8195: FL (%b) or CFL (%b) is invalid", curf, curcf);</div><div class='del'>-</div><div class='del'>-	/* Get parent FR[h] of R[h]. */</div><div class='del'>-</div><div class='del'>-	/* Current node is the last child of F[h]. FR[h] != F[h]. */</div><div class='del'>-	if (position == B_NR_ITEMS(PATH_H_PBUFFER(path, h + 1))) {</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate current parent of R[h], which is the right</div><div class='del'>-		 * neighbor of F[h].  Calculate current common parent of</div><div class='del'>-		 * R[h] and current node. Note that CFR[h] not equal</div><div class='del'>-		 * FR[path_offset] and CFR[h] not equal F[h].</div><div class='del'>-		 */</div><div class='del'>-		if ((ret =</div><div class='del'>-		     get_far_parent(tb, h + 1, &amp;curf, &amp;curcf,</div><div class='del'>-				    RIGHT_PARENTS)) != CARRY_ON)</div><div class='del'>-			return ret;</div><div class='del'>-	} else {</div><div class='del'>-		/* Current node is not the last child of its parent F[h]. */</div><div class='del'>-		curf = PATH_OFFSET_PBUFFER(path, path_offset - 1);</div><div class='del'>-		curcf = PATH_OFFSET_PBUFFER(path, path_offset - 1);</div><div class='del'>-		get_bh(curf);</div><div class='del'>-		get_bh(curf);</div><div class='del'>-		tb-&gt;rkey[h] = position;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	brelse(tb-&gt;FR[h]);</div><div class='del'>-	/* New initialization of FR[path_offset]. */</div><div class='del'>-	tb-&gt;FR[h] = curf;</div><div class='del'>-</div><div class='del'>-	brelse(tb-&gt;CFR[h]);</div><div class='del'>-	/* New initialization of CFR[path_offset]. */</div><div class='del'>-	tb-&gt;CFR[h] = curcf;</div><div class='del'>-</div><div class='del'>-	RFALSE((curf &amp;&amp; !B_IS_IN_TREE(curf)) ||</div><div class='del'>-	       (curcf &amp;&amp; !B_IS_IN_TREE(curcf)),</div><div class='del'>-	       "PAP-8205: FR (%b) or CFR (%b) is invalid", curf, curcf);</div><div class='del'>-</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * it is possible to remove node as result of shiftings to</div><div class='del'>- * neighbors even when we insert or paste item.</div><div class='del'>- */</div><div class='del'>-static inline int can_node_be_removed(int mode, int lfree, int sfree, int rfree,</div><div class='del'>-				      struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *Sh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-	int levbytes = tb-&gt;insert_size[h];</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	struct reiserfs_key *r_key = NULL;</div><div class='del'>-</div><div class='del'>-	ih = item_head(Sh, 0);</div><div class='del'>-	if (tb-&gt;CFR[h])</div><div class='del'>-		r_key = internal_key(tb-&gt;CFR[h], tb-&gt;rkey[h]);</div><div class='del'>-</div><div class='del'>-	if (lfree + rfree + sfree &lt; MAX_CHILD_SIZE(Sh) + levbytes</div><div class='del'>-	    /* shifting may merge items which might save space */</div><div class='del'>-	    -</div><div class='del'>-	    ((!h</div><div class='del'>-	      &amp;&amp; op_is_left_mergeable(&amp;ih-&gt;ih_key, Sh-&gt;b_size)) ? IH_SIZE : 0)</div><div class='del'>-	    -</div><div class='del'>-	    ((!h &amp;&amp; r_key</div><div class='del'>-	      &amp;&amp; op_is_left_mergeable(r_key, Sh-&gt;b_size)) ? IH_SIZE : 0)</div><div class='del'>-	    + ((h) ? KEY_SIZE : 0)) {</div><div class='del'>-		/* node can not be removed */</div><div class='del'>-		if (sfree &gt;= levbytes) {</div><div class='del'>-			/* new item fits into node S[h] without any shifting */</div><div class='del'>-			if (!h)</div><div class='del'>-				tb-&gt;s0num =</div><div class='del'>-				    B_NR_ITEMS(Sh) +</div><div class='del'>-				    ((mode == M_INSERT) ? 1 : 0);</div><div class='del'>-			set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-			return NO_BALANCING_NEEDED;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	PROC_INFO_INC(tb-&gt;tb_sb, can_node_be_removed[h]);</div><div class='del'>-	return !NO_BALANCING_NEEDED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether current node S[h] is balanced when increasing its size by</div><div class='del'>- * Inserting or Pasting.</div><div class='del'>- * Calculate parameters for balancing for current level h.</div><div class='del'>- * Parameters:</div><div class='del'>- *	tb	tree_balance structure;</div><div class='del'>- *	h	current level of the node;</div><div class='del'>- *	inum	item number in S[h];</div><div class='del'>- *	mode	i - insert, p - paste;</div><div class='del'>- * Returns:	1 - schedule occurred;</div><div class='del'>- *	        0 - balancing for higher levels needed;</div><div class='del'>- *	       -1 - no balancing for higher levels needed;</div><div class='del'>- *	       -2 - no disk space.</div><div class='del'>- */</div><div class='del'>-/* ip means Inserting or Pasting */</div><div class='del'>-static int ip_check_balance(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-	/*</div><div class='del'>-	 * Number of bytes that must be inserted into (value is negative</div><div class='del'>-	 * if bytes are deleted) buffer which contains node being balanced.</div><div class='del'>-	 * The mnemonic is that the attempted change in node space used</div><div class='del'>-	 * level is levbytes bytes.</div><div class='del'>-	 */</div><div class='del'>-	int levbytes;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	int lfree, sfree, rfree /* free space in L, S and R */ ;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * nver is short for number of vertixes, and lnver is the number if</div><div class='del'>-	 * we shift to the left, rnver is the number if we shift to the</div><div class='del'>-	 * right, and lrnver is the number if we shift in both directions.</div><div class='del'>-	 * The goal is to minimize first the number of vertixes, and second,</div><div class='del'>-	 * the number of vertixes whose contents are changed by shifting,</div><div class='del'>-	 * and third the number of uncached vertixes whose contents are</div><div class='del'>-	 * changed by shifting and must be read from disk.</div><div class='del'>-	 */</div><div class='del'>-	int nver, lnver, rnver, lrnver;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * used at leaf level only, S0 = S[0] is the node being balanced,</div><div class='del'>-	 * sInum [ I = 0,1,2 ] is the number of items that will</div><div class='del'>-	 * remain in node SI after balancing.  S1 and S2 are new</div><div class='del'>-	 * nodes that might be created.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we perform 8 calls to get_num_ver().  For each call we</div><div class='del'>-	 * calculate five parameters.  where 4th parameter is s1bytes</div><div class='del'>-	 * and 5th - s2bytes</div><div class='del'>-	 *</div><div class='del'>-	 * s0num, s1num, s2num for 8 cases</div><div class='del'>-	 * 0,1 - do not shift and do not shift but bottle</div><div class='del'>-	 * 2   - shift only whole item to left</div><div class='del'>-	 * 3   - shift to left and bottle as much as possible</div><div class='del'>-	 * 4,5 - shift to right (whole items and as much as possible</div><div class='del'>-	 * 6,7 - shift to both directions (whole items and as much as possible)</div><div class='del'>-	 */</div><div class='del'>-	short snum012[40] = { 0, };</div><div class='del'>-</div><div class='del'>-	/* Sh is the node whose balance is currently being checked */</div><div class='del'>-	struct buffer_head *Sh;</div><div class='del'>-</div><div class='del'>-	Sh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-	levbytes = tb-&gt;insert_size[h];</div><div class='del'>-</div><div class='del'>-	/* Calculate balance parameters for creating new root. */</div><div class='del'>-	if (!Sh) {</div><div class='del'>-		if (!h)</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "vs-8210",</div><div class='del'>-				       "S[0] can not be 0");</div><div class='del'>-		switch (ret = get_empty_nodes(tb, h)) {</div><div class='del'>-		/* no balancing for higher levels needed */</div><div class='del'>-		case CARRY_ON:</div><div class='del'>-			set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-			return NO_BALANCING_NEEDED;</div><div class='del'>-</div><div class='del'>-		case NO_DISK_SPACE:</div><div class='del'>-		case REPEAT_SEARCH:</div><div class='del'>-			return ret;</div><div class='del'>-		default:</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "vs-8215", "incorrect "</div><div class='del'>-				       "return value of get_empty_nodes");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get parents of S[h] neighbors. */</div><div class='del'>-	ret = get_parents(tb, h);</div><div class='del'>-	if (ret != CARRY_ON)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	sfree = B_FREE_SPACE(Sh);</div><div class='del'>-</div><div class='del'>-	/* get free space of neighbors */</div><div class='del'>-	rfree = get_rfree(tb, h);</div><div class='del'>-	lfree = get_lfree(tb, h);</div><div class='del'>-</div><div class='del'>-	/* and new item fits into node S[h] without any shifting */</div><div class='del'>-	if (can_node_be_removed(vn-&gt;vn_mode, lfree, sfree, rfree, tb, h) ==</div><div class='del'>-	    NO_BALANCING_NEEDED)</div><div class='del'>-		return NO_BALANCING_NEEDED;</div><div class='del'>-</div><div class='del'>-	create_virtual_node(tb, h);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * determine maximal number of items we can shift to the left</div><div class='del'>-	 * neighbor (in tb structure) and the maximal number of bytes</div><div class='del'>-	 * that can flow to the left neighbor from the left most liquid</div><div class='del'>-	 * item that cannot be shifted from S[0] entirely (returned value)</div><div class='del'>-	 */</div><div class='del'>-	check_left(tb, h, lfree);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * determine maximal number of items we can shift to the right</div><div class='del'>-	 * neighbor (in tb structure) and the maximal number of bytes</div><div class='del'>-	 * that can flow to the right neighbor from the right most liquid</div><div class='del'>-	 * item that cannot be shifted from S[0] entirely (returned value)</div><div class='del'>-	 */</div><div class='del'>-	check_right(tb, h, rfree);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * all contents of internal node S[h] can be moved into its</div><div class='del'>-	 * neighbors, S[h] will be removed after balancing</div><div class='del'>-	 */</div><div class='del'>-	if (h &amp;&amp; (tb-&gt;rnum[h] + tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item + 1)) {</div><div class='del'>-		int to_r;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Since we are working on internal nodes, and our internal</div><div class='del'>-		 * nodes have fixed size entries, then we can balance by the</div><div class='del'>-		 * number of items rather than the space they consume.  In this</div><div class='del'>-		 * routine we set the left node equal to the right node,</div><div class='del'>-		 * allowing a difference of less than or equal to 1 child</div><div class='del'>-		 * pointer.</div><div class='del'>-		 */</div><div class='del'>-		to_r =</div><div class='del'>-		    ((MAX_NR_KEY(Sh) &lt;&lt; 1) + 2 - tb-&gt;lnum[h] - tb-&gt;rnum[h] +</div><div class='del'>-		     vn-&gt;vn_nr_item + 1) / 2 - (MAX_NR_KEY(Sh) + 1 -</div><div class='del'>-						tb-&gt;rnum[h]);</div><div class='del'>-		set_parameters(tb, h, vn-&gt;vn_nr_item + 1 - to_r, to_r, 0, NULL,</div><div class='del'>-			       -1, -1);</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this checks balance condition, that any two neighboring nodes</div><div class='del'>-	 * can not fit in one node</div><div class='del'>-	 */</div><div class='del'>-	RFALSE(h &amp;&amp;</div><div class='del'>-	       (tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item + 1 ||</div><div class='del'>-		tb-&gt;rnum[h] &gt;= vn-&gt;vn_nr_item + 1),</div><div class='del'>-	       "vs-8220: tree is not balanced on internal level");</div><div class='del'>-	RFALSE(!h &amp;&amp; ((tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item &amp;&amp; (tb-&gt;lbytes == -1)) ||</div><div class='del'>-		      (tb-&gt;rnum[h] &gt;= vn-&gt;vn_nr_item &amp;&amp; (tb-&gt;rbytes == -1))),</div><div class='del'>-	       "vs-8225: tree is not balanced on leaf level");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * all contents of S[0] can be moved into its neighbors</div><div class='del'>-	 * S[0] will be removed after balancing.</div><div class='del'>-	 */</div><div class='del'>-	if (!h &amp;&amp; is_leaf_removable(tb))</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * why do we perform this check here rather than earlier??</div><div class='del'>-	 * Answer: we can win 1 node in some cases above. Moreover we</div><div class='del'>-	 * checked it above, when we checked, that S[0] is not removable</div><div class='del'>-	 * in principle</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	 /* new item fits into node S[h] without any shifting */</div><div class='del'>-	if (sfree &gt;= levbytes) {</div><div class='del'>-		if (!h)</div><div class='del'>-			tb-&gt;s0num = vn-&gt;vn_nr_item;</div><div class='del'>-		set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-		return NO_BALANCING_NEEDED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		int lpar, rpar, nset, lset, rset, lrset;</div><div class='del'>-		/* regular overflowing of the node */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * get_num_ver works in 2 modes (FLOW &amp; NO_FLOW)</div><div class='del'>-		 * lpar, rpar - number of items we can shift to left/right</div><div class='del'>-		 *              neighbor (including splitting item)</div><div class='del'>-		 * nset, lset, rset, lrset - shows, whether flowing items</div><div class='del'>-		 *                           give better packing</div><div class='del'>-		 */</div><div class='del'>-#define FLOW 1</div><div class='del'>-#define NO_FLOW 0		/* do not any splitting */</div><div class='del'>-</div><div class='del'>-		/* we choose one of the following */</div><div class='del'>-#define NOTHING_SHIFT_NO_FLOW	0</div><div class='del'>-#define NOTHING_SHIFT_FLOW	5</div><div class='del'>-#define LEFT_SHIFT_NO_FLOW	10</div><div class='del'>-#define LEFT_SHIFT_FLOW		15</div><div class='del'>-#define RIGHT_SHIFT_NO_FLOW	20</div><div class='del'>-#define RIGHT_SHIFT_FLOW	25</div><div class='del'>-#define LR_SHIFT_NO_FLOW	30</div><div class='del'>-#define LR_SHIFT_FLOW		35</div><div class='del'>-</div><div class='del'>-		lpar = tb-&gt;lnum[h];</div><div class='del'>-		rpar = tb-&gt;rnum[h];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * calculate number of blocks S[h] must be split into when</div><div class='del'>-		 * nothing is shifted to the neighbors, as well as number of</div><div class='del'>-		 * items in each part of the split node (s012 numbers),</div><div class='del'>-		 * and number of bytes (s1bytes) of the shared drop which</div><div class='del'>-		 * flow to S1 if any</div><div class='del'>-		 */</div><div class='del'>-		nset = NOTHING_SHIFT_NO_FLOW;</div><div class='del'>-		nver = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-				   0, -1, h ? vn-&gt;vn_nr_item : 0, -1,</div><div class='del'>-				   snum012, NO_FLOW);</div><div class='del'>-</div><div class='del'>-		if (!h) {</div><div class='del'>-			int nver1;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * note, that in this case we try to bottle</div><div class='del'>-			 * between S[0] and S1 (S1 - the first new node)</div><div class='del'>-			 */</div><div class='del'>-			nver1 = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-					    0, -1, 0, -1,</div><div class='del'>-					    snum012 + NOTHING_SHIFT_FLOW, FLOW);</div><div class='del'>-			if (nver &gt; nver1)</div><div class='del'>-				nset = NOTHING_SHIFT_FLOW, nver = nver1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * calculate number of blocks S[h] must be split into when</div><div class='del'>-		 * l_shift_num first items and l_shift_bytes of the right</div><div class='del'>-		 * most liquid item to be shifted are shifted to the left</div><div class='del'>-		 * neighbor, as well as number of items in each part of the</div><div class='del'>-		 * splitted node (s012 numbers), and number of bytes</div><div class='del'>-		 * (s1bytes) of the shared drop which flow to S1 if any</div><div class='del'>-		 */</div><div class='del'>-		lset = LEFT_SHIFT_NO_FLOW;</div><div class='del'>-		lnver = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-				    lpar - ((h || tb-&gt;lbytes == -1) ? 0 : 1),</div><div class='del'>-				    -1, h ? vn-&gt;vn_nr_item : 0, -1,</div><div class='del'>-				    snum012 + LEFT_SHIFT_NO_FLOW, NO_FLOW);</div><div class='del'>-		if (!h) {</div><div class='del'>-			int lnver1;</div><div class='del'>-</div><div class='del'>-			lnver1 = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-					     lpar -</div><div class='del'>-					     ((tb-&gt;lbytes != -1) ? 1 : 0),</div><div class='del'>-					     tb-&gt;lbytes, 0, -1,</div><div class='del'>-					     snum012 + LEFT_SHIFT_FLOW, FLOW);</div><div class='del'>-			if (lnver &gt; lnver1)</div><div class='del'>-				lset = LEFT_SHIFT_FLOW, lnver = lnver1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * calculate number of blocks S[h] must be split into when</div><div class='del'>-		 * r_shift_num first items and r_shift_bytes of the left most</div><div class='del'>-		 * liquid item to be shifted are shifted to the right neighbor,</div><div class='del'>-		 * as well as number of items in each part of the splitted</div><div class='del'>-		 * node (s012 numbers), and number of bytes (s1bytes) of the</div><div class='del'>-		 * shared drop which flow to S1 if any</div><div class='del'>-		 */</div><div class='del'>-		rset = RIGHT_SHIFT_NO_FLOW;</div><div class='del'>-		rnver = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-				    0, -1,</div><div class='del'>-				    h ? (vn-&gt;vn_nr_item - rpar) : (rpar -</div><div class='del'>-								   ((tb-&gt;</div><div class='del'>-								     rbytes !=</div><div class='del'>-								     -1) ? 1 :</div><div class='del'>-								    0)), -1,</div><div class='del'>-				    snum012 + RIGHT_SHIFT_NO_FLOW, NO_FLOW);</div><div class='del'>-		if (!h) {</div><div class='del'>-			int rnver1;</div><div class='del'>-</div><div class='del'>-			rnver1 = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-					     0, -1,</div><div class='del'>-					     (rpar -</div><div class='del'>-					      ((tb-&gt;rbytes != -1) ? 1 : 0)),</div><div class='del'>-					     tb-&gt;rbytes,</div><div class='del'>-					     snum012 + RIGHT_SHIFT_FLOW, FLOW);</div><div class='del'>-</div><div class='del'>-			if (rnver &gt; rnver1)</div><div class='del'>-				rset = RIGHT_SHIFT_FLOW, rnver = rnver1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * calculate number of blocks S[h] must be split into when</div><div class='del'>-		 * items are shifted in both directions, as well as number</div><div class='del'>-		 * of items in each part of the splitted node (s012 numbers),</div><div class='del'>-		 * and number of bytes (s1bytes) of the shared drop which</div><div class='del'>-		 * flow to S1 if any</div><div class='del'>-		 */</div><div class='del'>-		lrset = LR_SHIFT_NO_FLOW;</div><div class='del'>-		lrnver = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-				     lpar - ((h || tb-&gt;lbytes == -1) ? 0 : 1),</div><div class='del'>-				     -1,</div><div class='del'>-				     h ? (vn-&gt;vn_nr_item - rpar) : (rpar -</div><div class='del'>-								    ((tb-&gt;</div><div class='del'>-								      rbytes !=</div><div class='del'>-								      -1) ? 1 :</div><div class='del'>-								     0)), -1,</div><div class='del'>-				     snum012 + LR_SHIFT_NO_FLOW, NO_FLOW);</div><div class='del'>-		if (!h) {</div><div class='del'>-			int lrnver1;</div><div class='del'>-</div><div class='del'>-			lrnver1 = get_num_ver(vn-&gt;vn_mode, tb, h,</div><div class='del'>-					      lpar -</div><div class='del'>-					      ((tb-&gt;lbytes != -1) ? 1 : 0),</div><div class='del'>-					      tb-&gt;lbytes,</div><div class='del'>-					      (rpar -</div><div class='del'>-					       ((tb-&gt;rbytes != -1) ? 1 : 0)),</div><div class='del'>-					      tb-&gt;rbytes,</div><div class='del'>-					      snum012 + LR_SHIFT_FLOW, FLOW);</div><div class='del'>-			if (lrnver &gt; lrnver1)</div><div class='del'>-				lrset = LR_SHIFT_FLOW, lrnver = lrnver1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Our general shifting strategy is:</div><div class='del'>-		 * 1) to minimized number of new nodes;</div><div class='del'>-		 * 2) to minimized number of neighbors involved in shifting;</div><div class='del'>-		 * 3) to minimized number of disk reads;</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* we can win TWO or ONE nodes by shifting in both directions */</div><div class='del'>-		if (lrnver &lt; lnver &amp;&amp; lrnver &lt; rnver) {</div><div class='del'>-			RFALSE(h &amp;&amp;</div><div class='del'>-			       (tb-&gt;lnum[h] != 1 ||</div><div class='del'>-				tb-&gt;rnum[h] != 1 ||</div><div class='del'>-				lrnver != 1 || rnver != 2 || lnver != 2</div><div class='del'>-				|| h != 1), "vs-8230: bad h");</div><div class='del'>-			if (lrset == LR_SHIFT_FLOW)</div><div class='del'>-				set_parameters(tb, h, tb-&gt;lnum[h], tb-&gt;rnum[h],</div><div class='del'>-					       lrnver, snum012 + lrset,</div><div class='del'>-					       tb-&gt;lbytes, tb-&gt;rbytes);</div><div class='del'>-			else</div><div class='del'>-				set_parameters(tb, h,</div><div class='del'>-					       tb-&gt;lnum[h] -</div><div class='del'>-					       ((tb-&gt;lbytes == -1) ? 0 : 1),</div><div class='del'>-					       tb-&gt;rnum[h] -</div><div class='del'>-					       ((tb-&gt;rbytes == -1) ? 0 : 1),</div><div class='del'>-					       lrnver, snum012 + lrset, -1, -1);</div><div class='del'>-</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if shifting doesn't lead to better packing</div><div class='del'>-		 * then don't shift</div><div class='del'>-		 */</div><div class='del'>-		if (nver == lrnver) {</div><div class='del'>-			set_parameters(tb, h, 0, 0, nver, snum012 + nset, -1,</div><div class='del'>-				       -1);</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * now we know that for better packing shifting in only one</div><div class='del'>-		 * direction either to the left or to the right is required</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if shifting to the left is better than</div><div class='del'>-		 * shifting to the right</div><div class='del'>-		 */</div><div class='del'>-		if (lnver &lt; rnver) {</div><div class='del'>-			SET_PAR_SHIFT_LEFT;</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if shifting to the right is better than</div><div class='del'>-		 * shifting to the left</div><div class='del'>-		 */</div><div class='del'>-		if (lnver &gt; rnver) {</div><div class='del'>-			SET_PAR_SHIFT_RIGHT;</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * now shifting in either direction gives the same number</div><div class='del'>-		 * of nodes and we can make use of the cached neighbors</div><div class='del'>-		 */</div><div class='del'>-		if (is_left_neighbor_in_cache(tb, h)) {</div><div class='del'>-			SET_PAR_SHIFT_LEFT;</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * shift to the right independently on whether the</div><div class='del'>-		 * right neighbor in cache or not</div><div class='del'>-		 */</div><div class='del'>-		SET_PAR_SHIFT_RIGHT;</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether current node S[h] is balanced when Decreasing its size by</div><div class='del'>- * Deleting or Cutting for INTERNAL node of S+tree.</div><div class='del'>- * Calculate parameters for balancing for current level h.</div><div class='del'>- * Parameters:</div><div class='del'>- *	tb	tree_balance structure;</div><div class='del'>- *	h	current level of the node;</div><div class='del'>- *	inum	item number in S[h];</div><div class='del'>- *	mode	i - insert, p - paste;</div><div class='del'>- * Returns:	1 - schedule occurred;</div><div class='del'>- *	        0 - balancing for higher levels needed;</div><div class='del'>- *	       -1 - no balancing for higher levels needed;</div><div class='del'>- *	       -2 - no disk space.</div><div class='del'>- *</div><div class='del'>- * Note: Items of internal nodes have fixed size, so the balance condition for</div><div class='del'>- * the internal part of S+tree is as for the B-trees.</div><div class='del'>- */</div><div class='del'>-static int dc_check_balance_internal(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sh is the node whose balance is currently being checked,</div><div class='del'>-	 * and Fh is its father.</div><div class='del'>-	 */</div><div class='del'>-	struct buffer_head *Sh, *Fh;</div><div class='del'>-	int ret;</div><div class='del'>-	int lfree, rfree /* free space in L and R */ ;</div><div class='del'>-</div><div class='del'>-	Sh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-	Fh = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * using tb-&gt;insert_size[h], which is negative in this case,</div><div class='del'>-	 * create_virtual_node calculates:</div><div class='del'>-	 * new_nr_item = number of items node would have if operation is</div><div class='del'>-	 * performed without balancing (new_nr_item);</div><div class='del'>-	 */</div><div class='del'>-	create_virtual_node(tb, h);</div><div class='del'>-</div><div class='del'>-	if (!Fh) {		/* S[h] is the root. */</div><div class='del'>-		/* no balancing for higher levels needed */</div><div class='del'>-		if (vn-&gt;vn_nr_item &gt; 0) {</div><div class='del'>-			set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-			return NO_BALANCING_NEEDED;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * new_nr_item == 0.</div><div class='del'>-		 * Current root will be deleted resulting in</div><div class='del'>-		 * decrementing the tree height.</div><div class='del'>-		 */</div><div class='del'>-		set_parameters(tb, h, 0, 0, 0, NULL, -1, -1);</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ret = get_parents(tb, h)) != CARRY_ON)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* get free space of neighbors */</div><div class='del'>-	rfree = get_rfree(tb, h);</div><div class='del'>-	lfree = get_lfree(tb, h);</div><div class='del'>-</div><div class='del'>-	/* determine maximal number of items we can fit into neighbors */</div><div class='del'>-	check_left(tb, h, lfree);</div><div class='del'>-	check_right(tb, h, rfree);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Balance condition for the internal node is valid.</div><div class='del'>-	 * In this case we balance only if it leads to better packing.</div><div class='del'>-	 */</div><div class='del'>-	if (vn-&gt;vn_nr_item &gt;= MIN_NR_KEY(Sh)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Here we join S[h] with one of its neighbors,</div><div class='del'>-		 * which is impossible with greater values of new_nr_item.</div><div class='del'>-		 */</div><div class='del'>-		if (vn-&gt;vn_nr_item == MIN_NR_KEY(Sh)) {</div><div class='del'>-			/* All contents of S[h] can be moved to L[h]. */</div><div class='del'>-			if (tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item + 1) {</div><div class='del'>-				int n;</div><div class='del'>-				int order_L;</div><div class='del'>-</div><div class='del'>-				order_L =</div><div class='del'>-				    ((n =</div><div class='del'>-				      PATH_H_B_ITEM_ORDER(tb-&gt;tb_path,</div><div class='del'>-							  h)) ==</div><div class='del'>-				     0) ? B_NR_ITEMS(tb-&gt;FL[h]) : n - 1;</div><div class='del'>-				n = dc_size(B_N_CHILD(tb-&gt;FL[h], order_L)) /</div><div class='del'>-				    (DC_SIZE + KEY_SIZE);</div><div class='del'>-				set_parameters(tb, h, -n - 1, 0, 0, NULL, -1,</div><div class='del'>-					       -1);</div><div class='del'>-				return CARRY_ON;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* All contents of S[h] can be moved to R[h]. */</div><div class='del'>-			if (tb-&gt;rnum[h] &gt;= vn-&gt;vn_nr_item + 1) {</div><div class='del'>-				int n;</div><div class='del'>-				int order_R;</div><div class='del'>-</div><div class='del'>-				order_R =</div><div class='del'>-				    ((n =</div><div class='del'>-				      PATH_H_B_ITEM_ORDER(tb-&gt;tb_path,</div><div class='del'>-							  h)) ==</div><div class='del'>-				     B_NR_ITEMS(Fh)) ? 0 : n + 1;</div><div class='del'>-				n = dc_size(B_N_CHILD(tb-&gt;FR[h], order_R)) /</div><div class='del'>-				    (DC_SIZE + KEY_SIZE);</div><div class='del'>-				set_parameters(tb, h, 0, -n - 1, 0, NULL, -1,</div><div class='del'>-					       -1);</div><div class='del'>-				return CARRY_ON;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * All contents of S[h] can be moved to the neighbors</div><div class='del'>-		 * (L[h] &amp; R[h]).</div><div class='del'>-		 */</div><div class='del'>-		if (tb-&gt;rnum[h] + tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item + 1) {</div><div class='del'>-			int to_r;</div><div class='del'>-</div><div class='del'>-			to_r =</div><div class='del'>-			    ((MAX_NR_KEY(Sh) &lt;&lt; 1) + 2 - tb-&gt;lnum[h] -</div><div class='del'>-			     tb-&gt;rnum[h] + vn-&gt;vn_nr_item + 1) / 2 -</div><div class='del'>-			    (MAX_NR_KEY(Sh) + 1 - tb-&gt;rnum[h]);</div><div class='del'>-			set_parameters(tb, h, vn-&gt;vn_nr_item + 1 - to_r, to_r,</div><div class='del'>-				       0, NULL, -1, -1);</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Balancing does not lead to better packing. */</div><div class='del'>-		set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-		return NO_BALANCING_NEEDED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Current node contain insufficient number of items.</div><div class='del'>-	 * Balancing is required.</div><div class='del'>-	 */</div><div class='del'>-	/* Check whether we can merge S[h] with left neighbor. */</div><div class='del'>-	if (tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item + 1)</div><div class='del'>-		if (is_left_neighbor_in_cache(tb, h)</div><div class='del'>-		    || tb-&gt;rnum[h] &lt; vn-&gt;vn_nr_item + 1 || !tb-&gt;FR[h]) {</div><div class='del'>-			int n;</div><div class='del'>-			int order_L;</div><div class='del'>-</div><div class='del'>-			order_L =</div><div class='del'>-			    ((n =</div><div class='del'>-			      PATH_H_B_ITEM_ORDER(tb-&gt;tb_path,</div><div class='del'>-						  h)) ==</div><div class='del'>-			     0) ? B_NR_ITEMS(tb-&gt;FL[h]) : n - 1;</div><div class='del'>-			n = dc_size(B_N_CHILD(tb-&gt;FL[h], order_L)) / (DC_SIZE +</div><div class='del'>-								      KEY_SIZE);</div><div class='del'>-			set_parameters(tb, h, -n - 1, 0, 0, NULL, -1, -1);</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/* Check whether we can merge S[h] with right neighbor. */</div><div class='del'>-	if (tb-&gt;rnum[h] &gt;= vn-&gt;vn_nr_item + 1) {</div><div class='del'>-		int n;</div><div class='del'>-		int order_R;</div><div class='del'>-</div><div class='del'>-		order_R =</div><div class='del'>-		    ((n =</div><div class='del'>-		      PATH_H_B_ITEM_ORDER(tb-&gt;tb_path,</div><div class='del'>-					  h)) == B_NR_ITEMS(Fh)) ? 0 : (n + 1);</div><div class='del'>-		n = dc_size(B_N_CHILD(tb-&gt;FR[h], order_R)) / (DC_SIZE +</div><div class='del'>-							      KEY_SIZE);</div><div class='del'>-		set_parameters(tb, h, 0, -n - 1, 0, NULL, -1, -1);</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* All contents of S[h] can be moved to the neighbors (L[h] &amp; R[h]). */</div><div class='del'>-	if (tb-&gt;rnum[h] + tb-&gt;lnum[h] &gt;= vn-&gt;vn_nr_item + 1) {</div><div class='del'>-		int to_r;</div><div class='del'>-</div><div class='del'>-		to_r =</div><div class='del'>-		    ((MAX_NR_KEY(Sh) &lt;&lt; 1) + 2 - tb-&gt;lnum[h] - tb-&gt;rnum[h] +</div><div class='del'>-		     vn-&gt;vn_nr_item + 1) / 2 - (MAX_NR_KEY(Sh) + 1 -</div><div class='del'>-						tb-&gt;rnum[h]);</div><div class='del'>-		set_parameters(tb, h, vn-&gt;vn_nr_item + 1 - to_r, to_r, 0, NULL,</div><div class='del'>-			       -1, -1);</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* For internal nodes try to borrow item from a neighbor */</div><div class='del'>-	RFALSE(!tb-&gt;FL[h] &amp;&amp; !tb-&gt;FR[h], "vs-8235: trying to borrow for root");</div><div class='del'>-</div><div class='del'>-	/* Borrow one or two items from caching neighbor */</div><div class='del'>-	if (is_left_neighbor_in_cache(tb, h) || !tb-&gt;FR[h]) {</div><div class='del'>-		int from_l;</div><div class='del'>-</div><div class='del'>-		from_l =</div><div class='del'>-		    (MAX_NR_KEY(Sh) + 1 - tb-&gt;lnum[h] + vn-&gt;vn_nr_item +</div><div class='del'>-		     1) / 2 - (vn-&gt;vn_nr_item + 1);</div><div class='del'>-		set_parameters(tb, h, -from_l, 0, 1, NULL, -1, -1);</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_parameters(tb, h, 0,</div><div class='del'>-		       -((MAX_NR_KEY(Sh) + 1 - tb-&gt;rnum[h] + vn-&gt;vn_nr_item +</div><div class='del'>-			  1) / 2 - (vn-&gt;vn_nr_item + 1)), 1, NULL, -1, -1);</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether current node S[h] is balanced when Decreasing its size by</div><div class='del'>- * Deleting or Truncating for LEAF node of S+tree.</div><div class='del'>- * Calculate parameters for balancing for current level h.</div><div class='del'>- * Parameters:</div><div class='del'>- *	tb	tree_balance structure;</div><div class='del'>- *	h	current level of the node;</div><div class='del'>- *	inum	item number in S[h];</div><div class='del'>- *	mode	i - insert, p - paste;</div><div class='del'>- * Returns:	1 - schedule occurred;</div><div class='del'>- *	        0 - balancing for higher levels needed;</div><div class='del'>- *	       -1 - no balancing for higher levels needed;</div><div class='del'>- *	       -2 - no disk space.</div><div class='del'>- */</div><div class='del'>-static int dc_check_balance_leaf(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct virtual_node *vn = tb-&gt;tb_vn;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Number of bytes that must be deleted from</div><div class='del'>-	 * (value is negative if bytes are deleted) buffer which</div><div class='del'>-	 * contains node being balanced.  The mnemonic is that the</div><div class='del'>-	 * attempted change in node space used level is levbytes bytes.</div><div class='del'>-	 */</div><div class='del'>-	int levbytes;</div><div class='del'>-</div><div class='del'>-	/* the maximal item size */</div><div class='del'>-	int maxsize, ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * S0 is the node whose balance is currently being checked,</div><div class='del'>-	 * and F0 is its father.</div><div class='del'>-	 */</div><div class='del'>-	struct buffer_head *S0, *F0;</div><div class='del'>-	int lfree, rfree /* free space in L and R */ ;</div><div class='del'>-</div><div class='del'>-	S0 = PATH_H_PBUFFER(tb-&gt;tb_path, 0);</div><div class='del'>-	F0 = PATH_H_PPARENT(tb-&gt;tb_path, 0);</div><div class='del'>-</div><div class='del'>-	levbytes = tb-&gt;insert_size[h];</div><div class='del'>-</div><div class='del'>-	maxsize = MAX_CHILD_SIZE(S0);	/* maximal possible size of an item */</div><div class='del'>-</div><div class='del'>-	if (!F0) {		/* S[0] is the root now. */</div><div class='del'>-</div><div class='del'>-		RFALSE(-levbytes &gt;= maxsize - B_FREE_SPACE(S0),</div><div class='del'>-		       "vs-8240: attempt to create empty buffer tree");</div><div class='del'>-</div><div class='del'>-		set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-		return NO_BALANCING_NEEDED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ret = get_parents(tb, h)) != CARRY_ON)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* get free space of neighbors */</div><div class='del'>-	rfree = get_rfree(tb, h);</div><div class='del'>-	lfree = get_lfree(tb, h);</div><div class='del'>-</div><div class='del'>-	create_virtual_node(tb, h);</div><div class='del'>-</div><div class='del'>-	/* if 3 leaves can be merge to one, set parameters and return */</div><div class='del'>-	if (are_leaves_removable(tb, lfree, rfree))</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * determine maximal number of items we can shift to the left/right</div><div class='del'>-	 * neighbor and the maximal number of bytes that can flow to the</div><div class='del'>-	 * left/right neighbor from the left/right most liquid item that</div><div class='del'>-	 * cannot be shifted from S[0] entirely</div><div class='del'>-	 */</div><div class='del'>-	check_left(tb, h, lfree);</div><div class='del'>-	check_right(tb, h, rfree);</div><div class='del'>-</div><div class='del'>-	/* check whether we can merge S with left neighbor. */</div><div class='del'>-	if (tb-&gt;lnum[0] &gt;= vn-&gt;vn_nr_item &amp;&amp; tb-&gt;lbytes == -1)</div><div class='del'>-		if (is_left_neighbor_in_cache(tb, h) || ((tb-&gt;rnum[0] - ((tb-&gt;rbytes == -1) ? 0 : 1)) &lt; vn-&gt;vn_nr_item) ||	/* S can not be merged with R */</div><div class='del'>-		    !tb-&gt;FR[h]) {</div><div class='del'>-</div><div class='del'>-			RFALSE(!tb-&gt;FL[h],</div><div class='del'>-			       "vs-8245: dc_check_balance_leaf: FL[h] must exist");</div><div class='del'>-</div><div class='del'>-			/* set parameter to merge S[0] with its left neighbor */</div><div class='del'>-			set_parameters(tb, h, -1, 0, 0, NULL, -1, -1);</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/* check whether we can merge S[0] with right neighbor. */</div><div class='del'>-	if (tb-&gt;rnum[0] &gt;= vn-&gt;vn_nr_item &amp;&amp; tb-&gt;rbytes == -1) {</div><div class='del'>-		set_parameters(tb, h, 0, -1, 0, NULL, -1, -1);</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * All contents of S[0] can be moved to the neighbors (L[0] &amp; R[0]).</div><div class='del'>-	 * Set parameters and return</div><div class='del'>-	 */</div><div class='del'>-	if (is_leaf_removable(tb))</div><div class='del'>-		return CARRY_ON;</div><div class='del'>-</div><div class='del'>-	/* Balancing is not required. */</div><div class='del'>-	tb-&gt;s0num = vn-&gt;vn_nr_item;</div><div class='del'>-	set_parameters(tb, h, 0, 0, 1, NULL, -1, -1);</div><div class='del'>-	return NO_BALANCING_NEEDED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether current node S[h] is balanced when Decreasing its size by</div><div class='del'>- * Deleting or Cutting.</div><div class='del'>- * Calculate parameters for balancing for current level h.</div><div class='del'>- * Parameters:</div><div class='del'>- *	tb	tree_balance structure;</div><div class='del'>- *	h	current level of the node;</div><div class='del'>- *	inum	item number in S[h];</div><div class='del'>- *	mode	d - delete, c - cut.</div><div class='del'>- * Returns:	1 - schedule occurred;</div><div class='del'>- *	        0 - balancing for higher levels needed;</div><div class='del'>- *	       -1 - no balancing for higher levels needed;</div><div class='del'>- *	       -2 - no disk space.</div><div class='del'>- */</div><div class='del'>-static int dc_check_balance(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	RFALSE(!(PATH_H_PBUFFER(tb-&gt;tb_path, h)),</div><div class='del'>-	       "vs-8250: S is not initialized");</div><div class='del'>-</div><div class='del'>-	if (h)</div><div class='del'>-		return dc_check_balance_internal(tb, h);</div><div class='del'>-	else</div><div class='del'>-		return dc_check_balance_leaf(tb, h);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether current node S[h] is balanced.</div><div class='del'>- * Calculate parameters for balancing for current level h.</div><div class='del'>- * Parameters:</div><div class='del'>- *</div><div class='del'>- *	tb	tree_balance structure:</div><div class='del'>- *</div><div class='del'>- *              tb is a large structure that must be read about in the header</div><div class='del'>- *		file at the same time as this procedure if the reader is</div><div class='del'>- *		to successfully understand this procedure</div><div class='del'>- *</div><div class='del'>- *	h	current level of the node;</div><div class='del'>- *	inum	item number in S[h];</div><div class='del'>- *	mode	i - insert, p - paste, d - delete, c - cut.</div><div class='del'>- * Returns:	1 - schedule occurred;</div><div class='del'>- *	        0 - balancing for higher levels needed;</div><div class='del'>- *	       -1 - no balancing for higher levels needed;</div><div class='del'>- *	       -2 - no disk space.</div><div class='del'>- */</div><div class='del'>-static int check_balance(int mode,</div><div class='del'>-			 struct tree_balance *tb,</div><div class='del'>-			 int h,</div><div class='del'>-			 int inum,</div><div class='del'>-			 int pos_in_item,</div><div class='del'>-			 struct item_head *ins_ih, const void *data)</div><div class='del'>-{</div><div class='del'>-	struct virtual_node *vn;</div><div class='del'>-</div><div class='del'>-	vn = tb-&gt;tb_vn = (struct virtual_node *)(tb-&gt;vn_buf);</div><div class='del'>-	vn-&gt;vn_free_ptr = (char *)(tb-&gt;tb_vn + 1);</div><div class='del'>-	vn-&gt;vn_mode = mode;</div><div class='del'>-	vn-&gt;vn_affected_item_num = inum;</div><div class='del'>-	vn-&gt;vn_pos_in_item = pos_in_item;</div><div class='del'>-	vn-&gt;vn_ins_ih = ins_ih;</div><div class='del'>-	vn-&gt;vn_data = data;</div><div class='del'>-</div><div class='del'>-	RFALSE(mode == M_INSERT &amp;&amp; !vn-&gt;vn_ins_ih,</div><div class='del'>-	       "vs-8255: ins_ih can not be 0 in insert mode");</div><div class='del'>-</div><div class='del'>-	/* Calculate balance parameters when size of node is increasing. */</div><div class='del'>-	if (tb-&gt;insert_size[h] &gt; 0)</div><div class='del'>-		return ip_check_balance(tb, h);</div><div class='del'>-</div><div class='del'>-	/* Calculate balance parameters when  size of node is decreasing. */</div><div class='del'>-	return dc_check_balance(tb, h);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Check whether parent at the path is the really parent of the current node.*/</div><div class='del'>-static int get_direct_parent(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct treepath *path = tb-&gt;tb_path;</div><div class='del'>-	int position,</div><div class='del'>-	    path_offset = PATH_H_PATH_OFFSET(tb-&gt;tb_path, h);</div><div class='del'>-</div><div class='del'>-	/* We are in the root or in the new root. */</div><div class='del'>-	if (path_offset &lt;= FIRST_PATH_ELEMENT_OFFSET) {</div><div class='del'>-</div><div class='del'>-		RFALSE(path_offset &lt; FIRST_PATH_ELEMENT_OFFSET - 1,</div><div class='del'>-		       "PAP-8260: invalid offset in the path");</div><div class='del'>-</div><div class='del'>-		if (PATH_OFFSET_PBUFFER(path, FIRST_PATH_ELEMENT_OFFSET)-&gt;</div><div class='del'>-		    b_blocknr == SB_ROOT_BLOCK(tb-&gt;tb_sb)) {</div><div class='del'>-			/* Root is not changed. */</div><div class='del'>-			PATH_OFFSET_PBUFFER(path, path_offset - 1) = NULL;</div><div class='del'>-			PATH_OFFSET_POSITION(path, path_offset - 1) = 0;</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-		/* Root is changed and we must recalculate the path. */</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parent in the path is not in the tree. */</div><div class='del'>-	if (!B_IS_IN_TREE</div><div class='del'>-	    (bh = PATH_OFFSET_PBUFFER(path, path_offset - 1)))</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	if ((position =</div><div class='del'>-	     PATH_OFFSET_POSITION(path,</div><div class='del'>-				  path_offset - 1)) &gt; B_NR_ITEMS(bh))</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	/* Parent in the path is not parent of the current node in the tree. */</div><div class='del'>-	if (B_N_CHILD_NUM(bh, position) !=</div><div class='del'>-	    PATH_OFFSET_PBUFFER(path, path_offset)-&gt;b_blocknr)</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	if (buffer_locked(bh)) {</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(tb-&gt;tb_sb);</div><div class='del'>-		__wait_on_buffer(bh);</div><div class='del'>-		reiserfs_write_lock_nested(tb-&gt;tb_sb, depth);</div><div class='del'>-		if (FILESYSTEM_CHANGED_TB(tb))</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Parent in the path is unlocked and really parent</div><div class='del'>-	 * of the current node.</div><div class='del'>-	 */</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Using lnum[h] and rnum[h] we should determine what neighbors</div><div class='del'>- * of S[h] we</div><div class='del'>- * need in order to balance S[h], and get them if necessary.</div><div class='del'>- * Returns:	SCHEDULE_OCCURRED - schedule occurred while the function worked;</div><div class='del'>- *	        CARRY_ON - schedule didn't occur while the function worked;</div><div class='del'>- */</div><div class='del'>-static int get_neighbors(struct tree_balance *tb, int h)</div><div class='del'>-{</div><div class='del'>-	int child_position,</div><div class='del'>-	    path_offset = PATH_H_PATH_OFFSET(tb-&gt;tb_path, h + 1);</div><div class='del'>-	unsigned long son_number;</div><div class='del'>-	struct super_block *sb = tb-&gt;tb_sb;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(sb, get_neighbors[h]);</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;lnum[h]) {</div><div class='del'>-		/* We need left neighbor to balance S[h]. */</div><div class='del'>-		PROC_INFO_INC(sb, need_l_neighbor[h]);</div><div class='del'>-		bh = PATH_OFFSET_PBUFFER(tb-&gt;tb_path, path_offset);</div><div class='del'>-</div><div class='del'>-		RFALSE(bh == tb-&gt;FL[h] &amp;&amp;</div><div class='del'>-		       !PATH_OFFSET_POSITION(tb-&gt;tb_path, path_offset),</div><div class='del'>-		       "PAP-8270: invalid position in the parent");</div><div class='del'>-</div><div class='del'>-		child_position =</div><div class='del'>-		    (bh ==</div><div class='del'>-		     tb-&gt;FL[h]) ? tb-&gt;lkey[h] : B_NR_ITEMS(tb-&gt;</div><div class='del'>-								       FL[h]);</div><div class='del'>-		son_number = B_N_CHILD_NUM(tb-&gt;FL[h], child_position);</div><div class='del'>-		depth = reiserfs_write_unlock_nested(tb-&gt;tb_sb);</div><div class='del'>-		bh = sb_bread(sb, son_number);</div><div class='del'>-		reiserfs_write_lock_nested(tb-&gt;tb_sb, depth);</div><div class='del'>-		if (!bh)</div><div class='del'>-			return IO_ERROR;</div><div class='del'>-		if (FILESYSTEM_CHANGED_TB(tb)) {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			PROC_INFO_INC(sb, get_neighbors_restart[h]);</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RFALSE(!B_IS_IN_TREE(tb-&gt;FL[h]) ||</div><div class='del'>-		       child_position &gt; B_NR_ITEMS(tb-&gt;FL[h]) ||</div><div class='del'>-		       B_N_CHILD_NUM(tb-&gt;FL[h], child_position) !=</div><div class='del'>-		       bh-&gt;b_blocknr, "PAP-8275: invalid parent");</div><div class='del'>-		RFALSE(!B_IS_IN_TREE(bh), "PAP-8280: invalid child");</div><div class='del'>-		RFALSE(!h &amp;&amp;</div><div class='del'>-		       B_FREE_SPACE(bh) !=</div><div class='del'>-		       MAX_CHILD_SIZE(bh) -</div><div class='del'>-		       dc_size(B_N_CHILD(tb-&gt;FL[0], child_position)),</div><div class='del'>-		       "PAP-8290: invalid child size of left neighbor");</div><div class='del'>-</div><div class='del'>-		brelse(tb-&gt;L[h]);</div><div class='del'>-		tb-&gt;L[h] = bh;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We need right neighbor to balance S[path_offset]. */</div><div class='del'>-	if (tb-&gt;rnum[h]) {</div><div class='del'>-		PROC_INFO_INC(sb, need_r_neighbor[h]);</div><div class='del'>-		bh = PATH_OFFSET_PBUFFER(tb-&gt;tb_path, path_offset);</div><div class='del'>-</div><div class='del'>-		RFALSE(bh == tb-&gt;FR[h] &amp;&amp;</div><div class='del'>-		       PATH_OFFSET_POSITION(tb-&gt;tb_path,</div><div class='del'>-					    path_offset) &gt;=</div><div class='del'>-		       B_NR_ITEMS(bh),</div><div class='del'>-		       "PAP-8295: invalid position in the parent");</div><div class='del'>-</div><div class='del'>-		child_position =</div><div class='del'>-		    (bh == tb-&gt;FR[h]) ? tb-&gt;rkey[h] + 1 : 0;</div><div class='del'>-		son_number = B_N_CHILD_NUM(tb-&gt;FR[h], child_position);</div><div class='del'>-		depth = reiserfs_write_unlock_nested(tb-&gt;tb_sb);</div><div class='del'>-		bh = sb_bread(sb, son_number);</div><div class='del'>-		reiserfs_write_lock_nested(tb-&gt;tb_sb, depth);</div><div class='del'>-		if (!bh)</div><div class='del'>-			return IO_ERROR;</div><div class='del'>-		if (FILESYSTEM_CHANGED_TB(tb)) {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			PROC_INFO_INC(sb, get_neighbors_restart[h]);</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-		}</div><div class='del'>-		brelse(tb-&gt;R[h]);</div><div class='del'>-		tb-&gt;R[h] = bh;</div><div class='del'>-</div><div class='del'>-		RFALSE(!h</div><div class='del'>-		       &amp;&amp; B_FREE_SPACE(bh) !=</div><div class='del'>-		       MAX_CHILD_SIZE(bh) -</div><div class='del'>-		       dc_size(B_N_CHILD(tb-&gt;FR[0], child_position)),</div><div class='del'>-		       "PAP-8300: invalid child size of right neighbor (%d != %d - %d)",</div><div class='del'>-		       B_FREE_SPACE(bh), MAX_CHILD_SIZE(bh),</div><div class='del'>-		       dc_size(B_N_CHILD(tb-&gt;FR[0], child_position)));</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_virtual_node_size(struct super_block *sb, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	int max_num_of_items;</div><div class='del'>-	int max_num_of_entries;</div><div class='del'>-	unsigned long blocksize = sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-#define MIN_NAME_LEN 1</div><div class='del'>-</div><div class='del'>-	max_num_of_items = (blocksize - BLKH_SIZE) / (IH_SIZE + MIN_ITEM_LEN);</div><div class='del'>-	max_num_of_entries = (blocksize - BLKH_SIZE - IH_SIZE) /</div><div class='del'>-	    (DEH_SIZE + MIN_NAME_LEN);</div><div class='del'>-</div><div class='del'>-	return sizeof(struct virtual_node) +</div><div class='del'>-	    max(max_num_of_items * sizeof(struct virtual_item),</div><div class='del'>-		sizeof(struct virtual_item) +</div><div class='del'>-		struct_size_t(struct direntry_uarea, entry_sizes,</div><div class='del'>-			      max_num_of_entries));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * maybe we should fail balancing we are going to perform when kmalloc</div><div class='del'>- * fails several times. But now it will loop until kmalloc gets</div><div class='del'>- * required memory</div><div class='del'>- */</div><div class='del'>-static int get_mem_for_virtual_node(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int check_fs = 0;</div><div class='del'>-	int size;</div><div class='del'>-	char *buf;</div><div class='del'>-</div><div class='del'>-	size = get_virtual_node_size(tb-&gt;tb_sb, PATH_PLAST_BUFFER(tb-&gt;tb_path));</div><div class='del'>-</div><div class='del'>-	/* we have to allocate more memory for virtual node */</div><div class='del'>-	if (size &gt; tb-&gt;vn_buf_size) {</div><div class='del'>-		if (tb-&gt;vn_buf) {</div><div class='del'>-			/* free memory allocated before */</div><div class='del'>-			kfree(tb-&gt;vn_buf);</div><div class='del'>-			/* this is not needed if kfree is atomic */</div><div class='del'>-			check_fs = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* virtual node requires now more memory */</div><div class='del'>-		tb-&gt;vn_buf_size = size;</div><div class='del'>-</div><div class='del'>-		/* get memory for virtual item */</div><div class='del'>-		buf = kmalloc(size, GFP_ATOMIC | __GFP_NOWARN);</div><div class='del'>-		if (!buf) {</div><div class='del'>-			/*</div><div class='del'>-			 * getting memory with GFP_KERNEL priority may involve</div><div class='del'>-			 * balancing now (due to indirect_to_direct conversion</div><div class='del'>-			 * on dcache shrinking). So, release path and collected</div><div class='del'>-			 * resources here</div><div class='del'>-			 */</div><div class='del'>-			free_buffers_in_tb(tb);</div><div class='del'>-			buf = kmalloc(size, GFP_NOFS);</div><div class='del'>-			if (!buf) {</div><div class='del'>-				tb-&gt;vn_buf_size = 0;</div><div class='del'>-			}</div><div class='del'>-			tb-&gt;vn_buf = buf;</div><div class='del'>-			schedule();</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tb-&gt;vn_buf = buf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (check_fs &amp;&amp; FILESYSTEM_CHANGED_TB(tb))</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-static void tb_buffer_sanity_check(struct super_block *sb,</div><div class='del'>-				   struct buffer_head *bh,</div><div class='del'>-				   const char *descr, int level)</div><div class='del'>-{</div><div class='del'>-	if (bh) {</div><div class='del'>-		if (atomic_read(&amp;(bh-&gt;b_count)) &lt;= 0)</div><div class='del'>-</div><div class='del'>-			reiserfs_panic(sb, "jmacd-1", "negative or zero "</div><div class='del'>-				       "reference counter for buffer %s[%d] "</div><div class='del'>-				       "(%b)", descr, level, bh);</div><div class='del'>-</div><div class='del'>-		if (!buffer_uptodate(bh))</div><div class='del'>-			reiserfs_panic(sb, "jmacd-2", "buffer is not up "</div><div class='del'>-				       "to date %s[%d] (%b)",</div><div class='del'>-				       descr, level, bh);</div><div class='del'>-</div><div class='del'>-		if (!B_IS_IN_TREE(bh))</div><div class='del'>-			reiserfs_panic(sb, "jmacd-3", "buffer is not "</div><div class='del'>-				       "in tree %s[%d] (%b)",</div><div class='del'>-				       descr, level, bh);</div><div class='del'>-</div><div class='del'>-		if (bh-&gt;b_bdev != sb-&gt;s_bdev)</div><div class='del'>-			reiserfs_panic(sb, "jmacd-4", "buffer has wrong "</div><div class='del'>-				       "device %s[%d] (%b)",</div><div class='del'>-				       descr, level, bh);</div><div class='del'>-</div><div class='del'>-		if (bh-&gt;b_size != sb-&gt;s_blocksize)</div><div class='del'>-			reiserfs_panic(sb, "jmacd-5", "buffer has wrong "</div><div class='del'>-				       "blocksize %s[%d] (%b)",</div><div class='del'>-				       descr, level, bh);</div><div class='del'>-</div><div class='del'>-		if (bh-&gt;b_blocknr &gt; SB_BLOCK_COUNT(sb))</div><div class='del'>-			reiserfs_panic(sb, "jmacd-6", "buffer block "</div><div class='del'>-				       "number too high %s[%d] (%b)",</div><div class='del'>-				       descr, level, bh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void tb_buffer_sanity_check(struct super_block *sb,</div><div class='del'>-				   struct buffer_head *bh,</div><div class='del'>-				   const char *descr, int level)</div><div class='del'>-{;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int clear_all_dirty_bits(struct super_block *s, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	return reiserfs_prepare_for_journal(s, bh, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wait_tb_buffers_until_unlocked(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *locked;</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	int repeat_counter = 0;</div><div class='del'>-#endif</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-</div><div class='del'>-		locked = NULL;</div><div class='del'>-</div><div class='del'>-		for (i = tb-&gt;tb_path-&gt;path_length;</div><div class='del'>-		     !locked &amp;&amp; i &gt; ILLEGAL_PATH_ELEMENT_OFFSET; i--) {</div><div class='del'>-			if (PATH_OFFSET_PBUFFER(tb-&gt;tb_path, i)) {</div><div class='del'>-				/*</div><div class='del'>-				 * if I understand correctly, we can only</div><div class='del'>-				 * be sure the last buffer in the path is</div><div class='del'>-				 * in the tree --clm</div><div class='del'>-				 */</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-				if (PATH_PLAST_BUFFER(tb-&gt;tb_path) ==</div><div class='del'>-				    PATH_OFFSET_PBUFFER(tb-&gt;tb_path, i))</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       PATH_OFFSET_PBUFFER</div><div class='del'>-							       (tb-&gt;tb_path,</div><div class='del'>-								i), "S",</div><div class='del'>-							       tb-&gt;tb_path-&gt;</div><div class='del'>-							       path_length - i);</div><div class='del'>-#endif</div><div class='del'>-				if (!clear_all_dirty_bits(tb-&gt;tb_sb,</div><div class='del'>-							  PATH_OFFSET_PBUFFER</div><div class='del'>-							  (tb-&gt;tb_path,</div><div class='del'>-							   i))) {</div><div class='del'>-					locked =</div><div class='del'>-					    PATH_OFFSET_PBUFFER(tb-&gt;tb_path,</div><div class='del'>-								i);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; !locked &amp;&amp; i &lt; MAX_HEIGHT &amp;&amp; tb-&gt;insert_size[i];</div><div class='del'>-		     i++) {</div><div class='del'>-</div><div class='del'>-			if (tb-&gt;lnum[i]) {</div><div class='del'>-</div><div class='del'>-				if (tb-&gt;L[i]) {</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       tb-&gt;L[i],</div><div class='del'>-							       "L", i);</div><div class='del'>-					if (!clear_all_dirty_bits</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;L[i]))</div><div class='del'>-						locked = tb-&gt;L[i];</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (!locked &amp;&amp; tb-&gt;FL[i]) {</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       tb-&gt;FL[i],</div><div class='del'>-							       "FL", i);</div><div class='del'>-					if (!clear_all_dirty_bits</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;FL[i]))</div><div class='del'>-						locked = tb-&gt;FL[i];</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (!locked &amp;&amp; tb-&gt;CFL[i]) {</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       tb-&gt;CFL[i],</div><div class='del'>-							       "CFL", i);</div><div class='del'>-					if (!clear_all_dirty_bits</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;CFL[i]))</div><div class='del'>-						locked = tb-&gt;CFL[i];</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!locked &amp;&amp; (tb-&gt;rnum[i])) {</div><div class='del'>-</div><div class='del'>-				if (tb-&gt;R[i]) {</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       tb-&gt;R[i],</div><div class='del'>-							       "R", i);</div><div class='del'>-					if (!clear_all_dirty_bits</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;R[i]))</div><div class='del'>-						locked = tb-&gt;R[i];</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (!locked &amp;&amp; tb-&gt;FR[i]) {</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       tb-&gt;FR[i],</div><div class='del'>-							       "FR", i);</div><div class='del'>-					if (!clear_all_dirty_bits</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;FR[i]))</div><div class='del'>-						locked = tb-&gt;FR[i];</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (!locked &amp;&amp; tb-&gt;CFR[i]) {</div><div class='del'>-					tb_buffer_sanity_check(tb-&gt;tb_sb,</div><div class='del'>-							       tb-&gt;CFR[i],</div><div class='del'>-							       "CFR", i);</div><div class='del'>-					if (!clear_all_dirty_bits</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;CFR[i]))</div><div class='del'>-						locked = tb-&gt;CFR[i];</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * as far as I can tell, this is not required.  The FEB list</div><div class='del'>-		 * seems to be full of newly allocated nodes, which will</div><div class='del'>-		 * never be locked, dirty, or anything else.</div><div class='del'>-		 * To be safe, I'm putting in the checks and waits in.</div><div class='del'>-		 * For the moment, they are needed to keep the code in</div><div class='del'>-		 * journal.c from complaining about the buffer.</div><div class='del'>-		 * That code is inside CONFIG_REISERFS_CHECK as well.  --clm</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; !locked &amp;&amp; i &lt; MAX_FEB_SIZE; i++) {</div><div class='del'>-			if (tb-&gt;FEB[i]) {</div><div class='del'>-				if (!clear_all_dirty_bits</div><div class='del'>-				    (tb-&gt;tb_sb, tb-&gt;FEB[i]))</div><div class='del'>-					locked = tb-&gt;FEB[i];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (locked) {</div><div class='del'>-			int depth;</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-			repeat_counter++;</div><div class='del'>-			if ((repeat_counter % 10000) == 0) {</div><div class='del'>-				reiserfs_warning(tb-&gt;tb_sb, "reiserfs-8200",</div><div class='del'>-						 "too many iterations waiting "</div><div class='del'>-						 "for buffer to unlock "</div><div class='del'>-						 "(%b)", locked);</div><div class='del'>-</div><div class='del'>-				/* Don't loop forever.  Try to recover from possible error. */</div><div class='del'>-</div><div class='del'>-				return (FILESYSTEM_CHANGED_TB(tb)) ?</div><div class='del'>-				    REPEAT_SEARCH : CARRY_ON;</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-			depth = reiserfs_write_unlock_nested(tb-&gt;tb_sb);</div><div class='del'>-			__wait_on_buffer(locked);</div><div class='del'>-			reiserfs_write_lock_nested(tb-&gt;tb_sb, depth);</div><div class='del'>-			if (FILESYSTEM_CHANGED_TB(tb))</div><div class='del'>-				return REPEAT_SEARCH;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} while (locked);</div><div class='del'>-</div><div class='del'>-	return CARRY_ON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare for balancing, that is</div><div class='del'>- *	get all necessary parents, and neighbors;</div><div class='del'>- *	analyze what and where should be moved;</div><div class='del'>- *	get sufficient number of new nodes;</div><div class='del'>- * Balancing will start only after all resources will be collected at a time.</div><div class='del'>- *</div><div class='del'>- * When ported to SMP kernels, only at the last moment after all needed nodes</div><div class='del'>- * are collected in cache, will the resources be locked using the usual</div><div class='del'>- * textbook ordered lock acquisition algorithms.  Note that ensuring that</div><div class='del'>- * this code neither write locks what it does not need to write lock nor locks</div><div class='del'>- * out of order will be a pain in the butt that could have been avoided.</div><div class='del'>- * Grumble grumble. -Hans</div><div class='del'>- *</div><div class='del'>- * fix is meant in the sense of render unchanging</div><div class='del'>- *</div><div class='del'>- * Latency might be improved by first gathering a list of what buffers</div><div class='del'>- * are needed and then getting as many of them in parallel as possible? -Hans</div><div class='del'>- *</div><div class='del'>- * Parameters:</div><div class='del'>- *	op_mode	i - insert, d - delete, c - cut (truncate), p - paste (append)</div><div class='del'>- *	tb	tree_balance structure;</div><div class='del'>- *	inum	item number in S[h];</div><div class='del'>- *      pos_in_item - comment this if you can</div><div class='del'>- *      ins_ih	item head of item being inserted</div><div class='del'>- *	data	inserted item or data to be pasted</div><div class='del'>- * Returns:	1 - schedule occurred while the function worked;</div><div class='del'>- *	        0 - schedule didn't occur while the function worked;</div><div class='del'>- *             -1 - if no_disk_space</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int fix_nodes(int op_mode, struct tree_balance *tb,</div><div class='del'>-	      struct item_head *ins_ih, const void *data)</div><div class='del'>-{</div><div class='del'>-	int ret, h, item_num = PATH_LAST_POSITION(tb-&gt;tb_path);</div><div class='del'>-	int pos_in_item;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we set wait_tb_buffers_run when we have to restore any dirty</div><div class='del'>-	 * bits cleared during wait_tb_buffers_run</div><div class='del'>-	 */</div><div class='del'>-	int wait_tb_buffers_run = 0;</div><div class='del'>-	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-</div><div class='del'>-	++REISERFS_SB(tb-&gt;tb_sb)-&gt;s_fix_nodes;</div><div class='del'>-</div><div class='del'>-	pos_in_item = tb-&gt;tb_path-&gt;pos_in_item;</div><div class='del'>-</div><div class='del'>-	tb-&gt;fs_gen = get_generation(tb-&gt;tb_sb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we prepare and log the super here so it will already be in the</div><div class='del'>-	 * transaction when do_balance needs to change it.</div><div class='del'>-	 * This way do_balance won't have to schedule when trying to prepare</div><div class='del'>-	 * the super for logging</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_prepare_for_journal(tb-&gt;tb_sb,</div><div class='del'>-				     SB_BUFFER_WITH_SB(tb-&gt;tb_sb), 1);</div><div class='del'>-	journal_mark_dirty(tb-&gt;transaction_handle,</div><div class='del'>-			   SB_BUFFER_WITH_SB(tb-&gt;tb_sb));</div><div class='del'>-	if (FILESYSTEM_CHANGED_TB(tb))</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	/* if it possible in indirect_to_direct conversion */</div><div class='del'>-	if (buffer_locked(tbS0)) {</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(tb-&gt;tb_sb);</div><div class='del'>-		__wait_on_buffer(tbS0);</div><div class='del'>-		reiserfs_write_lock_nested(tb-&gt;tb_sb, depth);</div><div class='del'>-		if (FILESYSTEM_CHANGED_TB(tb))</div><div class='del'>-			return REPEAT_SEARCH;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	if (REISERFS_SB(tb-&gt;tb_sb)-&gt;cur_tb) {</div><div class='del'>-		print_cur_tb("fix_nodes");</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "PAP-8305",</div><div class='del'>-			       "there is pending do_balance");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!buffer_uptodate(tbS0) || !B_IS_IN_TREE(tbS0))</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "PAP-8320", "S[0] (%b %z) is "</div><div class='del'>-			       "not uptodate at the beginning of fix_nodes "</div><div class='del'>-			       "or not in tree (mode %c)",</div><div class='del'>-			       tbS0, tbS0, op_mode);</div><div class='del'>-</div><div class='del'>-	/* Check parameters. */</div><div class='del'>-	switch (op_mode) {</div><div class='del'>-	case M_INSERT:</div><div class='del'>-		if (item_num &lt;= 0 || item_num &gt; B_NR_ITEMS(tbS0))</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "PAP-8330", "Incorrect "</div><div class='del'>-				       "item number %d (in S0 - %d) in case "</div><div class='del'>-				       "of insert", item_num,</div><div class='del'>-				       B_NR_ITEMS(tbS0));</div><div class='del'>-		break;</div><div class='del'>-	case M_PASTE:</div><div class='del'>-	case M_DELETE:</div><div class='del'>-	case M_CUT:</div><div class='del'>-		if (item_num &lt; 0 || item_num &gt;= B_NR_ITEMS(tbS0)) {</div><div class='del'>-			print_block(tbS0, 0, -1, -1);</div><div class='del'>-			reiserfs_panic(tb-&gt;tb_sb, "PAP-8335", "Incorrect "</div><div class='del'>-				       "item number(%d); mode = %c "</div><div class='del'>-				       "insert_size = %d",</div><div class='del'>-				       item_num, op_mode,</div><div class='del'>-				       tb-&gt;insert_size[0]);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "PAP-8340", "Incorrect mode "</div><div class='del'>-			       "of operation");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (get_mem_for_virtual_node(tb) == REPEAT_SEARCH)</div><div class='del'>-		/* FIXME: maybe -ENOMEM when tb-&gt;vn_buf == 0? Now just repeat */</div><div class='del'>-		return REPEAT_SEARCH;</div><div class='del'>-</div><div class='del'>-	/* Starting from the leaf level; for all levels h of the tree. */</div><div class='del'>-	for (h = 0; h &lt; MAX_HEIGHT &amp;&amp; tb-&gt;insert_size[h]; h++) {</div><div class='del'>-		ret = get_direct_parent(tb, h);</div><div class='del'>-		if (ret != CARRY_ON)</div><div class='del'>-			goto repeat;</div><div class='del'>-</div><div class='del'>-		ret = check_balance(op_mode, tb, h, item_num,</div><div class='del'>-				    pos_in_item, ins_ih, data);</div><div class='del'>-		if (ret != CARRY_ON) {</div><div class='del'>-			if (ret == NO_BALANCING_NEEDED) {</div><div class='del'>-				/* No balancing for higher levels needed. */</div><div class='del'>-				ret = get_neighbors(tb, h);</div><div class='del'>-				if (ret != CARRY_ON)</div><div class='del'>-					goto repeat;</div><div class='del'>-				if (h != MAX_HEIGHT - 1)</div><div class='del'>-					tb-&gt;insert_size[h + 1] = 0;</div><div class='del'>-				/*</div><div class='del'>-				 * ok, analysis and resource gathering</div><div class='del'>-				 * are complete</div><div class='del'>-				 */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			goto repeat;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = get_neighbors(tb, h);</div><div class='del'>-		if (ret != CARRY_ON)</div><div class='del'>-			goto repeat;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * No disk space, or schedule occurred and analysis may be</div><div class='del'>-		 * invalid and needs to be redone.</div><div class='del'>-		 */</div><div class='del'>-		ret = get_empty_nodes(tb, h);</div><div class='del'>-		if (ret != CARRY_ON)</div><div class='del'>-			goto repeat;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We have a positive insert size but no nodes exist on this</div><div class='del'>-		 * level, this means that we are creating a new root.</div><div class='del'>-		 */</div><div class='del'>-		if (!PATH_H_PBUFFER(tb-&gt;tb_path, h)) {</div><div class='del'>-</div><div class='del'>-			RFALSE(tb-&gt;blknum[h] != 1,</div><div class='del'>-			       "PAP-8350: creating new empty root");</div><div class='del'>-</div><div class='del'>-			if (h &lt; MAX_HEIGHT - 1)</div><div class='del'>-				tb-&gt;insert_size[h + 1] = 0;</div><div class='del'>-		} else if (!PATH_H_PBUFFER(tb-&gt;tb_path, h + 1)) {</div><div class='del'>-			/*</div><div class='del'>-			 * The tree needs to be grown, so this node S[h]</div><div class='del'>-			 * which is the root node is split into two nodes,</div><div class='del'>-			 * and a new node (S[h+1]) will be created to</div><div class='del'>-			 * become the root node.</div><div class='del'>-			 */</div><div class='del'>-			if (tb-&gt;blknum[h] &gt; 1) {</div><div class='del'>-</div><div class='del'>-				RFALSE(h == MAX_HEIGHT - 1,</div><div class='del'>-				       "PAP-8355: attempt to create too high of a tree");</div><div class='del'>-</div><div class='del'>-				tb-&gt;insert_size[h + 1] =</div><div class='del'>-				    (DC_SIZE +</div><div class='del'>-				     KEY_SIZE) * (tb-&gt;blknum[h] - 1) +</div><div class='del'>-				    DC_SIZE;</div><div class='del'>-			} else if (h &lt; MAX_HEIGHT - 1)</div><div class='del'>-				tb-&gt;insert_size[h + 1] = 0;</div><div class='del'>-		} else</div><div class='del'>-			tb-&gt;insert_size[h + 1] =</div><div class='del'>-			    (DC_SIZE + KEY_SIZE) * (tb-&gt;blknum[h] - 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = wait_tb_buffers_until_unlocked(tb);</div><div class='del'>-	if (ret == CARRY_ON) {</div><div class='del'>-		if (FILESYSTEM_CHANGED_TB(tb)) {</div><div class='del'>-			wait_tb_buffers_run = 1;</div><div class='del'>-			ret = REPEAT_SEARCH;</div><div class='del'>-			goto repeat;</div><div class='del'>-		} else {</div><div class='del'>-			return CARRY_ON;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		wait_tb_buffers_run = 1;</div><div class='del'>-		goto repeat;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-repeat:</div><div class='del'>-	/*</div><div class='del'>-	 * fix_nodes was unable to perform its calculation due to</div><div class='del'>-	 * filesystem got changed under us, lack of free disk space or i/o</div><div class='del'>-	 * failure. If the first is the case - the search will be</div><div class='del'>-	 * repeated. For now - free all resources acquired so far except</div><div class='del'>-	 * for the new allocated nodes</div><div class='del'>-	 */</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		/* Release path buffers. */</div><div class='del'>-		if (wait_tb_buffers_run) {</div><div class='del'>-			pathrelse_and_restore(tb-&gt;tb_sb, tb-&gt;tb_path);</div><div class='del'>-		} else {</div><div class='del'>-			pathrelse(tb-&gt;tb_path);</div><div class='del'>-		}</div><div class='del'>-		/* brelse all resources collected for balancing */</div><div class='del'>-		for (i = 0; i &lt; MAX_HEIGHT; i++) {</div><div class='del'>-			if (wait_tb_buffers_run) {</div><div class='del'>-				reiserfs_restore_prepared_buffer(tb-&gt;tb_sb,</div><div class='del'>-								 tb-&gt;L[i]);</div><div class='del'>-				reiserfs_restore_prepared_buffer(tb-&gt;tb_sb,</div><div class='del'>-								 tb-&gt;R[i]);</div><div class='del'>-				reiserfs_restore_prepared_buffer(tb-&gt;tb_sb,</div><div class='del'>-								 tb-&gt;FL[i]);</div><div class='del'>-				reiserfs_restore_prepared_buffer(tb-&gt;tb_sb,</div><div class='del'>-								 tb-&gt;FR[i]);</div><div class='del'>-				reiserfs_restore_prepared_buffer(tb-&gt;tb_sb,</div><div class='del'>-								 tb-&gt;</div><div class='del'>-								 CFL[i]);</div><div class='del'>-				reiserfs_restore_prepared_buffer(tb-&gt;tb_sb,</div><div class='del'>-								 tb-&gt;</div><div class='del'>-								 CFR[i]);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			brelse(tb-&gt;L[i]);</div><div class='del'>-			brelse(tb-&gt;R[i]);</div><div class='del'>-			brelse(tb-&gt;FL[i]);</div><div class='del'>-			brelse(tb-&gt;FR[i]);</div><div class='del'>-			brelse(tb-&gt;CFL[i]);</div><div class='del'>-			brelse(tb-&gt;CFR[i]);</div><div class='del'>-</div><div class='del'>-			tb-&gt;L[i] = NULL;</div><div class='del'>-			tb-&gt;R[i] = NULL;</div><div class='del'>-			tb-&gt;FL[i] = NULL;</div><div class='del'>-			tb-&gt;FR[i] = NULL;</div><div class='del'>-			tb-&gt;CFL[i] = NULL;</div><div class='del'>-			tb-&gt;CFR[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wait_tb_buffers_run) {</div><div class='del'>-			for (i = 0; i &lt; MAX_FEB_SIZE; i++) {</div><div class='del'>-				if (tb-&gt;FEB[i])</div><div class='del'>-					reiserfs_restore_prepared_buffer</div><div class='del'>-					    (tb-&gt;tb_sb, tb-&gt;FEB[i]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void unfix_nodes(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Release path buffers. */</div><div class='del'>-	pathrelse_and_restore(tb-&gt;tb_sb, tb-&gt;tb_path);</div><div class='del'>-</div><div class='del'>-	/* brelse all resources collected for balancing */</div><div class='del'>-	for (i = 0; i &lt; MAX_HEIGHT; i++) {</div><div class='del'>-		reiserfs_restore_prepared_buffer(tb-&gt;tb_sb, tb-&gt;L[i]);</div><div class='del'>-		reiserfs_restore_prepared_buffer(tb-&gt;tb_sb, tb-&gt;R[i]);</div><div class='del'>-		reiserfs_restore_prepared_buffer(tb-&gt;tb_sb, tb-&gt;FL[i]);</div><div class='del'>-		reiserfs_restore_prepared_buffer(tb-&gt;tb_sb, tb-&gt;FR[i]);</div><div class='del'>-		reiserfs_restore_prepared_buffer(tb-&gt;tb_sb, tb-&gt;CFL[i]);</div><div class='del'>-		reiserfs_restore_prepared_buffer(tb-&gt;tb_sb, tb-&gt;CFR[i]);</div><div class='del'>-</div><div class='del'>-		brelse(tb-&gt;L[i]);</div><div class='del'>-		brelse(tb-&gt;R[i]);</div><div class='del'>-		brelse(tb-&gt;FL[i]);</div><div class='del'>-		brelse(tb-&gt;FR[i]);</div><div class='del'>-		brelse(tb-&gt;CFL[i]);</div><div class='del'>-		brelse(tb-&gt;CFR[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* deal with list of allocated (used and unused) nodes */</div><div class='del'>-	for (i = 0; i &lt; MAX_FEB_SIZE; i++) {</div><div class='del'>-		if (tb-&gt;FEB[i]) {</div><div class='del'>-			b_blocknr_t blocknr = tb-&gt;FEB[i]-&gt;b_blocknr;</div><div class='del'>-			/*</div><div class='del'>-			 * de-allocated block which was not used by</div><div class='del'>-			 * balancing and bforget about buffer for it</div><div class='del'>-			 */</div><div class='del'>-			brelse(tb-&gt;FEB[i]);</div><div class='del'>-			reiserfs_free_block(tb-&gt;transaction_handle, NULL,</div><div class='del'>-					    blocknr, 0);</div><div class='del'>-		}</div><div class='del'>-		if (tb-&gt;used[i]) {</div><div class='del'>-			/* release used as new nodes including a new root */</div><div class='del'>-			brelse(tb-&gt;used[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(tb-&gt;vn_buf);</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/hashes.c b/fs/reiserfs/hashes.c<br/>deleted file mode 100644<br/>index 7a26c4fe6c46..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/hashes.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/hashes.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,177 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Keyed 32-bit hash function using TEA in a Davis-Meyer function</div><div class='del'>- *   H0 = Key</div><div class='del'>- *   Hi = E Mi(Hi-1) + Hi-1</div><div class='del'>- *</div><div class='del'>- * (see Applied Cryptography, 2nd edition, p448).</div><div class='del'>- *</div><div class='del'>- * Jeremy Fitzhardinge &lt;jeremy@zip.com.au&gt; 1998</div><div class='del'>- *</div><div class='del'>- * Jeremy has agreed to the contents of reiserfs/README. -Hans</div><div class='del'>- * Yura's function is added (04/07/2000)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define DELTA 0x9E3779B9</div><div class='del'>-#define FULLROUNDS 10		/* 32 is overkill, 16 is strong crypto */</div><div class='del'>-#define PARTROUNDS 6		/* 6 gets complete mixing */</div><div class='del'>-</div><div class='del'>-/* a, b, c, d - data; h0, h1 - accumulated hash */</div><div class='del'>-#define TEACORE(rounds)							\</div><div class='del'>-	do {								\</div><div class='del'>-		u32 sum = 0;						\</div><div class='del'>-		int n = rounds;						\</div><div class='del'>-		u32 b0, b1;						\</div><div class='del'>-									\</div><div class='del'>-		b0 = h0;						\</div><div class='del'>-		b1 = h1;						\</div><div class='del'>-									\</div><div class='del'>-		do							\</div><div class='del'>-		{							\</div><div class='del'>-			sum += DELTA;					\</div><div class='del'>-			b0 += ((b1 &lt;&lt; 4)+a) ^ (b1+sum) ^ ((b1 &gt;&gt; 5)+b);	\</div><div class='del'>-			b1 += ((b0 &lt;&lt; 4)+c) ^ (b0+sum) ^ ((b0 &gt;&gt; 5)+d);	\</div><div class='del'>-		} while(--n);						\</div><div class='del'>-									\</div><div class='del'>-		h0 += b0;						\</div><div class='del'>-		h1 += b1;						\</div><div class='del'>-	} while(0)</div><div class='del'>-</div><div class='del'>-u32 keyed_hash(const signed char *msg, int len)</div><div class='del'>-{</div><div class='del'>-	u32 k[] = { 0x9464a485, 0x542e1a94, 0x3e846bff, 0xb75bcfc3 };</div><div class='del'>-</div><div class='del'>-	u32 h0 = k[0], h1 = k[1];</div><div class='del'>-	u32 a, b, c, d;</div><div class='del'>-	u32 pad;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*      assert(len &gt;= 0 &amp;&amp; len &lt; 256); */</div><div class='del'>-</div><div class='del'>-	pad = (u32) len | ((u32) len &lt;&lt; 8);</div><div class='del'>-	pad |= pad &lt;&lt; 16;</div><div class='del'>-</div><div class='del'>-	while (len &gt;= 16) {</div><div class='del'>-		a = (u32) msg[0] |</div><div class='del'>-		    (u32) msg[1] &lt;&lt; 8 | (u32) msg[2] &lt;&lt; 16 | (u32) msg[3] &lt;&lt; 24;</div><div class='del'>-		b = (u32) msg[4] |</div><div class='del'>-		    (u32) msg[5] &lt;&lt; 8 | (u32) msg[6] &lt;&lt; 16 | (u32) msg[7] &lt;&lt; 24;</div><div class='del'>-		c = (u32) msg[8] |</div><div class='del'>-		    (u32) msg[9] &lt;&lt; 8 |</div><div class='del'>-		    (u32) msg[10] &lt;&lt; 16 | (u32) msg[11] &lt;&lt; 24;</div><div class='del'>-		d = (u32) msg[12] |</div><div class='del'>-		    (u32) msg[13] &lt;&lt; 8 |</div><div class='del'>-		    (u32) msg[14] &lt;&lt; 16 | (u32) msg[15] &lt;&lt; 24;</div><div class='del'>-</div><div class='del'>-		TEACORE(PARTROUNDS);</div><div class='del'>-</div><div class='del'>-		len -= 16;</div><div class='del'>-		msg += 16;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &gt;= 12) {</div><div class='del'>-		a = (u32) msg[0] |</div><div class='del'>-		    (u32) msg[1] &lt;&lt; 8 | (u32) msg[2] &lt;&lt; 16 | (u32) msg[3] &lt;&lt; 24;</div><div class='del'>-		b = (u32) msg[4] |</div><div class='del'>-		    (u32) msg[5] &lt;&lt; 8 | (u32) msg[6] &lt;&lt; 16 | (u32) msg[7] &lt;&lt; 24;</div><div class='del'>-		c = (u32) msg[8] |</div><div class='del'>-		    (u32) msg[9] &lt;&lt; 8 |</div><div class='del'>-		    (u32) msg[10] &lt;&lt; 16 | (u32) msg[11] &lt;&lt; 24;</div><div class='del'>-</div><div class='del'>-		d = pad;</div><div class='del'>-		for (i = 12; i &lt; len; i++) {</div><div class='del'>-			d &lt;&lt;= 8;</div><div class='del'>-			d |= msg[i];</div><div class='del'>-		}</div><div class='del'>-	} else if (len &gt;= 8) {</div><div class='del'>-		a = (u32) msg[0] |</div><div class='del'>-		    (u32) msg[1] &lt;&lt; 8 | (u32) msg[2] &lt;&lt; 16 | (u32) msg[3] &lt;&lt; 24;</div><div class='del'>-		b = (u32) msg[4] |</div><div class='del'>-		    (u32) msg[5] &lt;&lt; 8 | (u32) msg[6] &lt;&lt; 16 | (u32) msg[7] &lt;&lt; 24;</div><div class='del'>-</div><div class='del'>-		c = d = pad;</div><div class='del'>-		for (i = 8; i &lt; len; i++) {</div><div class='del'>-			c &lt;&lt;= 8;</div><div class='del'>-			c |= msg[i];</div><div class='del'>-		}</div><div class='del'>-	} else if (len &gt;= 4) {</div><div class='del'>-		a = (u32) msg[0] |</div><div class='del'>-		    (u32) msg[1] &lt;&lt; 8 | (u32) msg[2] &lt;&lt; 16 | (u32) msg[3] &lt;&lt; 24;</div><div class='del'>-</div><div class='del'>-		b = c = d = pad;</div><div class='del'>-		for (i = 4; i &lt; len; i++) {</div><div class='del'>-			b &lt;&lt;= 8;</div><div class='del'>-			b |= msg[i];</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		a = b = c = d = pad;</div><div class='del'>-		for (i = 0; i &lt; len; i++) {</div><div class='del'>-			a &lt;&lt;= 8;</div><div class='del'>-			a |= msg[i];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	TEACORE(FULLROUNDS);</div><div class='del'>-</div><div class='del'>-/*	return 0;*/</div><div class='del'>-	return h0 ^ h1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * What follows in this file is copyright 2000 by Hans Reiser, and the</div><div class='del'>- * licensing of what follows is governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-u32 yura_hash(const signed char *msg, int len)</div><div class='del'>-{</div><div class='del'>-	int j, pow;</div><div class='del'>-	u32 a, c;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (pow = 1, i = 1; i &lt; len; i++)</div><div class='del'>-		pow = pow * 10;</div><div class='del'>-</div><div class='del'>-	if (len == 1)</div><div class='del'>-		a = msg[0] - 48;</div><div class='del'>-	else</div><div class='del'>-		a = (msg[0] - 48) * pow;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; len; i++) {</div><div class='del'>-		c = msg[i] - 48;</div><div class='del'>-		for (pow = 1, j = i; j &lt; len - 1; j++)</div><div class='del'>-			pow = pow * 10;</div><div class='del'>-		a = a + c * pow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (; i &lt; 40; i++) {</div><div class='del'>-		c = '0' - 48;</div><div class='del'>-		for (pow = 1, j = i; j &lt; len - 1; j++)</div><div class='del'>-			pow = pow * 10;</div><div class='del'>-		a = a + c * pow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (; i &lt; 256; i++) {</div><div class='del'>-		c = i;</div><div class='del'>-		for (pow = 1, j = i; j &lt; len - 1; j++)</div><div class='del'>-			pow = pow * 10;</div><div class='del'>-		a = a + c * pow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	a = a &lt;&lt; 7;</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 r5_hash(const signed char *msg, int len)</div><div class='del'>-{</div><div class='del'>-	u32 a = 0;</div><div class='del'>-	while (*msg) {</div><div class='del'>-		a += *msg &lt;&lt; 4;</div><div class='del'>-		a += *msg &gt;&gt; 4;</div><div class='del'>-		a *= 11;</div><div class='del'>-		msg++;</div><div class='del'>-	}</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c<br/>deleted file mode 100644<br/>index 5db6f45b3fed..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/ibalance.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/ibalance.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1161 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-/* this is one and only function that is used outside (do_balance.c) */</div><div class='del'>-int balance_internal(struct tree_balance *,</div><div class='del'>-		     int, int, struct item_head *, struct buffer_head **);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * modes of internal_shift_left, internal_shift_right and</div><div class='del'>- * internal_insert_childs</div><div class='del'>- */</div><div class='del'>-#define INTERNAL_SHIFT_FROM_S_TO_L 0</div><div class='del'>-#define INTERNAL_SHIFT_FROM_R_TO_S 1</div><div class='del'>-#define INTERNAL_SHIFT_FROM_L_TO_S 2</div><div class='del'>-#define INTERNAL_SHIFT_FROM_S_TO_R 3</div><div class='del'>-#define INTERNAL_INSERT_TO_S 4</div><div class='del'>-#define INTERNAL_INSERT_TO_L 5</div><div class='del'>-#define INTERNAL_INSERT_TO_R 6</div><div class='del'>-</div><div class='del'>-static void internal_define_dest_src_infos(int shift_mode,</div><div class='del'>-					   struct tree_balance *tb,</div><div class='del'>-					   int h,</div><div class='del'>-					   struct buffer_info *dest_bi,</div><div class='del'>-					   struct buffer_info *src_bi,</div><div class='del'>-					   int *d_key, struct buffer_head **cf)</div><div class='del'>-{</div><div class='del'>-	memset(dest_bi, 0, sizeof(struct buffer_info));</div><div class='del'>-	memset(src_bi, 0, sizeof(struct buffer_info));</div><div class='del'>-	/* define dest, src, dest parent, dest position */</div><div class='del'>-	switch (shift_mode) {</div><div class='del'>-</div><div class='del'>-	/* used in internal_shift_left */</div><div class='del'>-	case INTERNAL_SHIFT_FROM_S_TO_L:</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-		src_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		src_bi-&gt;bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;L[h];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FL[h];</div><div class='del'>-		dest_bi-&gt;bi_position = get_left_neighbor_position(tb, h);</div><div class='del'>-		*d_key = tb-&gt;lkey[h];</div><div class='del'>-		*cf = tb-&gt;CFL[h];</div><div class='del'>-		break;</div><div class='del'>-	case INTERNAL_SHIFT_FROM_L_TO_S:</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = tb-&gt;L[h];</div><div class='del'>-		src_bi-&gt;bi_parent = tb-&gt;FL[h];</div><div class='del'>-		src_bi-&gt;bi_position = get_left_neighbor_position(tb, h);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-		dest_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		/* dest position is analog of dest-&gt;b_item_order */</div><div class='del'>-		dest_bi-&gt;bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-		*d_key = tb-&gt;lkey[h];</div><div class='del'>-		*cf = tb-&gt;CFL[h];</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* used in internal_shift_left */</div><div class='del'>-	case INTERNAL_SHIFT_FROM_R_TO_S:</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = tb-&gt;R[h];</div><div class='del'>-		src_bi-&gt;bi_parent = tb-&gt;FR[h];</div><div class='del'>-		src_bi-&gt;bi_position = get_right_neighbor_position(tb, h);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-		dest_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		dest_bi-&gt;bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-		*d_key = tb-&gt;rkey[h];</div><div class='del'>-		*cf = tb-&gt;CFR[h];</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case INTERNAL_SHIFT_FROM_S_TO_R:</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-		src_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		src_bi-&gt;bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;R[h];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FR[h];</div><div class='del'>-		dest_bi-&gt;bi_position = get_right_neighbor_position(tb, h);</div><div class='del'>-		*d_key = tb-&gt;rkey[h];</div><div class='del'>-		*cf = tb-&gt;CFR[h];</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case INTERNAL_INSERT_TO_L:</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;L[h];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FL[h];</div><div class='del'>-		dest_bi-&gt;bi_position = get_left_neighbor_position(tb, h);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case INTERNAL_INSERT_TO_S:</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-		dest_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		dest_bi-&gt;bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case INTERNAL_INSERT_TO_R:</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;R[h];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FR[h];</div><div class='del'>-		dest_bi-&gt;bi_position = get_right_neighbor_position(tb, h);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		reiserfs_panic(tb-&gt;tb_sb, "ibalance-1",</div><div class='del'>-			       "shift type is unknown (%d)",</div><div class='del'>-			       shift_mode);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Insert count node pointers into buffer cur before position to + 1.</div><div class='del'>- * Insert count items into buffer cur before position to.</div><div class='del'>- * Items and node pointers are specified by inserted and bh respectively.</div><div class='del'>- */</div><div class='del'>-static void internal_insert_childs(struct buffer_info *cur_bi,</div><div class='del'>-				   int to, int count,</div><div class='del'>-				   struct item_head *inserted,</div><div class='del'>-				   struct buffer_head **bh)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *cur = cur_bi-&gt;bi_bh;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	int nr;</div><div class='del'>-	struct reiserfs_key *ih;</div><div class='del'>-	struct disk_child new_dc[2];</div><div class='del'>-	struct disk_child *dc;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (count &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(cur);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	RFALSE(count &gt; 2, "too many children (%d) are to be inserted", count);</div><div class='del'>-	RFALSE(B_FREE_SPACE(cur) &lt; count * (KEY_SIZE + DC_SIZE),</div><div class='del'>-	       "no enough free space (%d), needed %d bytes",</div><div class='del'>-	       B_FREE_SPACE(cur), count * (KEY_SIZE + DC_SIZE));</div><div class='del'>-</div><div class='del'>-	/* prepare space for count disk_child */</div><div class='del'>-	dc = B_N_CHILD(cur, to + 1);</div><div class='del'>-</div><div class='del'>-	memmove(dc + count, dc, (nr + 1 - (to + 1)) * DC_SIZE);</div><div class='del'>-</div><div class='del'>-	/* copy to_be_insert disk children */</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		put_dc_size(&amp;new_dc[i],</div><div class='del'>-			    MAX_CHILD_SIZE(bh[i]) - B_FREE_SPACE(bh[i]));</div><div class='del'>-		put_dc_block_number(&amp;new_dc[i], bh[i]-&gt;b_blocknr);</div><div class='del'>-	}</div><div class='del'>-	memcpy(dc, new_dc, DC_SIZE * count);</div><div class='del'>-</div><div class='del'>-	/* prepare space for count items  */</div><div class='del'>-	ih = internal_key(cur, ((to == -1) ? 0 : to));</div><div class='del'>-</div><div class='del'>-	memmove(ih + count, ih,</div><div class='del'>-		(nr - to) * KEY_SIZE + (nr + 1 + count) * DC_SIZE);</div><div class='del'>-</div><div class='del'>-	/* copy item headers (keys) */</div><div class='del'>-	memcpy(ih, inserted, KEY_SIZE);</div><div class='del'>-	if (count &gt; 1)</div><div class='del'>-		memcpy(ih + 1, inserted + 1, KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	/* sizes, item number */</div><div class='del'>-	set_blkh_nr_item(blkh, blkh_nr_item(blkh) + count);</div><div class='del'>-	set_blkh_free_space(blkh,</div><div class='del'>-			    blkh_free_space(blkh) - count * (DC_SIZE +</div><div class='del'>-							     KEY_SIZE));</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(cur_bi-&gt;tb, cur, 0);</div><div class='del'>-</div><div class='del'>-	/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-	check_internal(cur);</div><div class='del'>-	/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-</div><div class='del'>-	if (cur_bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc =</div><div class='del'>-		    B_N_CHILD(cur_bi-&gt;bi_parent, cur_bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc,</div><div class='del'>-			    dc_size(t_dc) + (count * (DC_SIZE + KEY_SIZE)));</div><div class='del'>-		do_balance_mark_internal_dirty(cur_bi-&gt;tb, cur_bi-&gt;bi_parent,</div><div class='del'>-					       0);</div><div class='del'>-</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-		check_internal(cur_bi-&gt;bi_parent);</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Delete del_num items and node pointers from buffer cur starting from</div><div class='del'>- * the first_i'th item and first_p'th pointers respectively.</div><div class='del'>- */</div><div class='del'>-static void internal_delete_pointers_items(struct buffer_info *cur_bi,</div><div class='del'>-					   int first_p,</div><div class='del'>-					   int first_i, int del_num)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *cur = cur_bi-&gt;bi_bh;</div><div class='del'>-	int nr;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct reiserfs_key *key;</div><div class='del'>-	struct disk_child *dc;</div><div class='del'>-</div><div class='del'>-	RFALSE(cur == NULL, "buffer is 0");</div><div class='del'>-	RFALSE(del_num &lt; 0,</div><div class='del'>-	       "negative number of items (%d) can not be deleted", del_num);</div><div class='del'>-	RFALSE(first_p &lt; 0 || first_p + del_num &gt; B_NR_ITEMS(cur) + 1</div><div class='del'>-	       || first_i &lt; 0,</div><div class='del'>-	       "first pointer order (%d) &lt; 0 or "</div><div class='del'>-	       "no so many pointers (%d), only (%d) or "</div><div class='del'>-	       "first key order %d &lt; 0", first_p, first_p + del_num,</div><div class='del'>-	       B_NR_ITEMS(cur) + 1, first_i);</div><div class='del'>-	if (del_num == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(cur);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	if (first_p == 0 &amp;&amp; del_num == nr + 1) {</div><div class='del'>-		RFALSE(first_i != 0,</div><div class='del'>-		       "1st deleted key must have order 0, not %d", first_i);</div><div class='del'>-		make_empty_node(cur_bi);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(first_i + del_num &gt; B_NR_ITEMS(cur),</div><div class='del'>-	       "first_i = %d del_num = %d "</div><div class='del'>-	       "no so many keys (%d) in the node (%b)(%z)",</div><div class='del'>-	       first_i, del_num, first_i + del_num, cur, cur);</div><div class='del'>-</div><div class='del'>-	/* deleting */</div><div class='del'>-	dc = B_N_CHILD(cur, first_p);</div><div class='del'>-</div><div class='del'>-	memmove(dc, dc + del_num, (nr + 1 - first_p - del_num) * DC_SIZE);</div><div class='del'>-	key = internal_key(cur, first_i);</div><div class='del'>-	memmove(key, key + del_num,</div><div class='del'>-		(nr - first_i - del_num) * KEY_SIZE + (nr + 1 -</div><div class='del'>-						       del_num) * DC_SIZE);</div><div class='del'>-</div><div class='del'>-	/* sizes, item number */</div><div class='del'>-	set_blkh_nr_item(blkh, blkh_nr_item(blkh) - del_num);</div><div class='del'>-	set_blkh_free_space(blkh,</div><div class='del'>-			    blkh_free_space(blkh) +</div><div class='del'>-			    (del_num * (KEY_SIZE + DC_SIZE)));</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(cur_bi-&gt;tb, cur, 0);</div><div class='del'>-	/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-	check_internal(cur);</div><div class='del'>-	/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-</div><div class='del'>-	if (cur_bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc;</div><div class='del'>-		t_dc = B_N_CHILD(cur_bi-&gt;bi_parent, cur_bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc,</div><div class='del'>-			    dc_size(t_dc) - (del_num * (KEY_SIZE + DC_SIZE)));</div><div class='del'>-</div><div class='del'>-		do_balance_mark_internal_dirty(cur_bi-&gt;tb, cur_bi-&gt;bi_parent,</div><div class='del'>-					       0);</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-		check_internal(cur_bi-&gt;bi_parent);</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* delete n node pointers and items starting from given position */</div><div class='del'>-static void internal_delete_childs(struct buffer_info *cur_bi, int from, int n)</div><div class='del'>-{</div><div class='del'>-	int i_from;</div><div class='del'>-</div><div class='del'>-	i_from = (from == 0) ? from : from - 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * delete n pointers starting from `from' position in CUR;</div><div class='del'>-	 * delete n keys starting from 'i_from' position in CUR;</div><div class='del'>-	 */</div><div class='del'>-	internal_delete_pointers_items(cur_bi, from, i_from, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * copy cpy_num node pointers and cpy_num - 1 items from buffer src to buffer</div><div class='del'>- * dest</div><div class='del'>- * last_first == FIRST_TO_LAST means that we copy first items</div><div class='del'>- *                             from src to tail of dest</div><div class='del'>- * last_first == LAST_TO_FIRST means that we copy last items</div><div class='del'>- *                             from src to head of dest</div><div class='del'>- */</div><div class='del'>-static void internal_copy_pointers_items(struct buffer_info *dest_bi,</div><div class='del'>-					 struct buffer_head *src,</div><div class='del'>-					 int last_first, int cpy_num)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * ATTENTION! Number of node pointers in DEST is equal to number</div><div class='del'>-	 * of items in DEST  as delimiting key have already inserted to</div><div class='del'>-	 * buffer dest.</div><div class='del'>-	 */</div><div class='del'>-	struct buffer_head *dest = dest_bi-&gt;bi_bh;</div><div class='del'>-	int nr_dest, nr_src;</div><div class='del'>-	int dest_order, src_order;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct reiserfs_key *key;</div><div class='del'>-	struct disk_child *dc;</div><div class='del'>-</div><div class='del'>-	nr_src = B_NR_ITEMS(src);</div><div class='del'>-</div><div class='del'>-	RFALSE(dest == NULL || src == NULL,</div><div class='del'>-	       "src (%p) or dest (%p) buffer is 0", src, dest);</div><div class='del'>-	RFALSE(last_first != FIRST_TO_LAST &amp;&amp; last_first != LAST_TO_FIRST,</div><div class='del'>-	       "invalid last_first parameter (%d)", last_first);</div><div class='del'>-	RFALSE(nr_src &lt; cpy_num - 1,</div><div class='del'>-	       "no so many items (%d) in src (%d)", cpy_num, nr_src);</div><div class='del'>-	RFALSE(cpy_num &lt; 0, "cpy_num less than 0 (%d)", cpy_num);</div><div class='del'>-	RFALSE(cpy_num - 1 + B_NR_ITEMS(dest) &gt; (int)MAX_NR_KEY(dest),</div><div class='del'>-	       "cpy_num (%d) + item number in dest (%d) can not be &gt; MAX_NR_KEY(%d)",</div><div class='del'>-	       cpy_num, B_NR_ITEMS(dest), MAX_NR_KEY(dest));</div><div class='del'>-</div><div class='del'>-	if (cpy_num == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* coping */</div><div class='del'>-	blkh = B_BLK_HEAD(dest);</div><div class='del'>-	nr_dest = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	/*dest_order = (last_first == LAST_TO_FIRST) ? 0 : nr_dest; */</div><div class='del'>-	/*src_order = (last_first == LAST_TO_FIRST) ? (nr_src - cpy_num + 1) : 0; */</div><div class='del'>-	(last_first == LAST_TO_FIRST) ? (dest_order = 0, src_order =</div><div class='del'>-					 nr_src - cpy_num + 1) : (dest_order =</div><div class='del'>-								  nr_dest,</div><div class='del'>-								  src_order =</div><div class='del'>-								  0);</div><div class='del'>-</div><div class='del'>-	/* prepare space for cpy_num pointers */</div><div class='del'>-	dc = B_N_CHILD(dest, dest_order);</div><div class='del'>-</div><div class='del'>-	memmove(dc + cpy_num, dc, (nr_dest - dest_order) * DC_SIZE);</div><div class='del'>-</div><div class='del'>-	/* insert pointers */</div><div class='del'>-	memcpy(dc, B_N_CHILD(src, src_order), DC_SIZE * cpy_num);</div><div class='del'>-</div><div class='del'>-	/* prepare space for cpy_num - 1 item headers */</div><div class='del'>-	key = internal_key(dest, dest_order);</div><div class='del'>-	memmove(key + cpy_num - 1, key,</div><div class='del'>-		KEY_SIZE * (nr_dest - dest_order) + DC_SIZE * (nr_dest +</div><div class='del'>-							       cpy_num));</div><div class='del'>-</div><div class='del'>-	/* insert headers */</div><div class='del'>-	memcpy(key, internal_key(src, src_order), KEY_SIZE * (cpy_num - 1));</div><div class='del'>-</div><div class='del'>-	/* sizes, item number */</div><div class='del'>-	set_blkh_nr_item(blkh, blkh_nr_item(blkh) + (cpy_num - 1));</div><div class='del'>-	set_blkh_free_space(blkh,</div><div class='del'>-			    blkh_free_space(blkh) - (KEY_SIZE * (cpy_num - 1) +</div><div class='del'>-						     DC_SIZE * cpy_num));</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(dest_bi-&gt;tb, dest, 0);</div><div class='del'>-</div><div class='del'>-	/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-	check_internal(dest);</div><div class='del'>-	/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-</div><div class='del'>-	if (dest_bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc;</div><div class='del'>-		t_dc = B_N_CHILD(dest_bi-&gt;bi_parent, dest_bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc,</div><div class='del'>-			    dc_size(t_dc) + (KEY_SIZE * (cpy_num - 1) +</div><div class='del'>-					     DC_SIZE * cpy_num));</div><div class='del'>-</div><div class='del'>-		do_balance_mark_internal_dirty(dest_bi-&gt;tb, dest_bi-&gt;bi_parent,</div><div class='del'>-					       0);</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-		check_internal(dest_bi-&gt;bi_parent);</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copy cpy_num node pointers and cpy_num - 1 items from buffer src to</div><div class='del'>- * buffer dest.</div><div class='del'>- * Delete cpy_num - del_par items and node pointers from buffer src.</div><div class='del'>- * last_first == FIRST_TO_LAST means, that we copy/delete first items from src.</div><div class='del'>- * last_first == LAST_TO_FIRST means, that we copy/delete last items from src.</div><div class='del'>- */</div><div class='del'>-static void internal_move_pointers_items(struct buffer_info *dest_bi,</div><div class='del'>-					 struct buffer_info *src_bi,</div><div class='del'>-					 int last_first, int cpy_num,</div><div class='del'>-					 int del_par)</div><div class='del'>-{</div><div class='del'>-	int first_pointer;</div><div class='del'>-	int first_item;</div><div class='del'>-</div><div class='del'>-	internal_copy_pointers_items(dest_bi, src_bi-&gt;bi_bh, last_first,</div><div class='del'>-				     cpy_num);</div><div class='del'>-</div><div class='del'>-	if (last_first == FIRST_TO_LAST) {	/* shift_left occurs */</div><div class='del'>-		first_pointer = 0;</div><div class='del'>-		first_item = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * delete cpy_num - del_par pointers and keys starting for</div><div class='del'>-		 * pointers with first_pointer, for key - with first_item</div><div class='del'>-		 */</div><div class='del'>-		internal_delete_pointers_items(src_bi, first_pointer,</div><div class='del'>-					       first_item, cpy_num - del_par);</div><div class='del'>-	} else {		/* shift_right occurs */</div><div class='del'>-		int i, j;</div><div class='del'>-</div><div class='del'>-		i = (cpy_num - del_par ==</div><div class='del'>-		     (j =</div><div class='del'>-		      B_NR_ITEMS(src_bi-&gt;bi_bh)) + 1) ? 0 : j - cpy_num +</div><div class='del'>-		    del_par;</div><div class='del'>-</div><div class='del'>-		internal_delete_pointers_items(src_bi,</div><div class='del'>-					       j + 1 - cpy_num + del_par, i,</div><div class='del'>-					       cpy_num - del_par);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Insert n_src'th key of buffer src before n_dest'th key of buffer dest. */</div><div class='del'>-static void internal_insert_key(struct buffer_info *dest_bi,</div><div class='del'>-				/* insert key before key with n_dest number */</div><div class='del'>-				int dest_position_before,</div><div class='del'>-				struct buffer_head *src, int src_position)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *dest = dest_bi-&gt;bi_bh;</div><div class='del'>-	int nr;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct reiserfs_key *key;</div><div class='del'>-</div><div class='del'>-	RFALSE(dest == NULL || src == NULL,</div><div class='del'>-	       "source(%p) or dest(%p) buffer is 0", src, dest);</div><div class='del'>-	RFALSE(dest_position_before &lt; 0 || src_position &lt; 0,</div><div class='del'>-	       "source(%d) or dest(%d) key number less than 0",</div><div class='del'>-	       src_position, dest_position_before);</div><div class='del'>-	RFALSE(dest_position_before &gt; B_NR_ITEMS(dest) ||</div><div class='del'>-	       src_position &gt;= B_NR_ITEMS(src),</div><div class='del'>-	       "invalid position in dest (%d (key number %d)) or in src (%d (key number %d))",</div><div class='del'>-	       dest_position_before, B_NR_ITEMS(dest),</div><div class='del'>-	       src_position, B_NR_ITEMS(src));</div><div class='del'>-	RFALSE(B_FREE_SPACE(dest) &lt; KEY_SIZE,</div><div class='del'>-	       "no enough free space (%d) in dest buffer", B_FREE_SPACE(dest));</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(dest);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	/* prepare space for inserting key */</div><div class='del'>-	key = internal_key(dest, dest_position_before);</div><div class='del'>-	memmove(key + 1, key,</div><div class='del'>-		(nr - dest_position_before) * KEY_SIZE + (nr + 1) * DC_SIZE);</div><div class='del'>-</div><div class='del'>-	/* insert key */</div><div class='del'>-	memcpy(key, internal_key(src, src_position), KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Change dirt, free space, item number fields. */</div><div class='del'>-</div><div class='del'>-	set_blkh_nr_item(blkh, blkh_nr_item(blkh) + 1);</div><div class='del'>-	set_blkh_free_space(blkh, blkh_free_space(blkh) - KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(dest_bi-&gt;tb, dest, 0);</div><div class='del'>-</div><div class='del'>-	if (dest_bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc;</div><div class='del'>-		t_dc = B_N_CHILD(dest_bi-&gt;bi_parent, dest_bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc, dc_size(t_dc) + KEY_SIZE);</div><div class='del'>-</div><div class='del'>-		do_balance_mark_internal_dirty(dest_bi-&gt;tb, dest_bi-&gt;bi_parent,</div><div class='del'>-					       0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Insert d_key'th (delimiting) key from buffer cfl to tail of dest.</div><div class='del'>- * Copy pointer_amount node pointers and pointer_amount - 1 items from</div><div class='del'>- * buffer src to buffer dest.</div><div class='del'>- * Replace  d_key'th key in buffer cfl.</div><div class='del'>- * Delete pointer_amount items and node pointers from buffer src.</div><div class='del'>- */</div><div class='del'>-/* this can be invoked both to shift from S to L and from R to S */</div><div class='del'>-static void internal_shift_left(</div><div class='del'>-				/*</div><div class='del'>-				 * INTERNAL_FROM_S_TO_L | INTERNAL_FROM_R_TO_S</div><div class='del'>-				 */</div><div class='del'>-				int mode,</div><div class='del'>-				struct tree_balance *tb,</div><div class='del'>-				int h, int pointer_amount)</div><div class='del'>-{</div><div class='del'>-	struct buffer_info dest_bi, src_bi;</div><div class='del'>-	struct buffer_head *cf;</div><div class='del'>-	int d_key_position;</div><div class='del'>-</div><div class='del'>-	internal_define_dest_src_infos(mode, tb, h, &amp;dest_bi, &amp;src_bi,</div><div class='del'>-				       &amp;d_key_position, &amp;cf);</div><div class='del'>-</div><div class='del'>-	/*printk("pointer_amount = %d\n",pointer_amount); */</div><div class='del'>-</div><div class='del'>-	if (pointer_amount) {</div><div class='del'>-		/*</div><div class='del'>-		 * insert delimiting key from common father of dest and</div><div class='del'>-		 * src to node dest into position B_NR_ITEM(dest)</div><div class='del'>-		 */</div><div class='del'>-		internal_insert_key(&amp;dest_bi, B_NR_ITEMS(dest_bi.bi_bh), cf,</div><div class='del'>-				    d_key_position);</div><div class='del'>-</div><div class='del'>-		if (B_NR_ITEMS(src_bi.bi_bh) == pointer_amount - 1) {</div><div class='del'>-			if (src_bi.bi_position /*src-&gt;b_item_order */  == 0)</div><div class='del'>-				replace_key(tb, cf, d_key_position,</div><div class='del'>-					    src_bi.</div><div class='del'>-					    bi_parent /*src-&gt;b_parent */ , 0);</div><div class='del'>-		} else</div><div class='del'>-			replace_key(tb, cf, d_key_position, src_bi.bi_bh,</div><div class='del'>-				    pointer_amount - 1);</div><div class='del'>-	}</div><div class='del'>-	/* last parameter is del_parameter */</div><div class='del'>-	internal_move_pointers_items(&amp;dest_bi, &amp;src_bi, FIRST_TO_LAST,</div><div class='del'>-				     pointer_amount, 0);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Insert delimiting key to L[h].</div><div class='del'>- * Copy n node pointers and n - 1 items from buffer S[h] to L[h].</div><div class='del'>- * Delete n - 1 items and node pointers from buffer S[h].</div><div class='del'>- */</div><div class='del'>-/* it always shifts from S[h] to L[h] */</div><div class='del'>-static void internal_shift1_left(struct tree_balance *tb,</div><div class='del'>-				 int h, int pointer_amount)</div><div class='del'>-{</div><div class='del'>-	struct buffer_info dest_bi, src_bi;</div><div class='del'>-	struct buffer_head *cf;</div><div class='del'>-	int d_key_position;</div><div class='del'>-</div><div class='del'>-	internal_define_dest_src_infos(INTERNAL_SHIFT_FROM_S_TO_L, tb, h,</div><div class='del'>-				       &amp;dest_bi, &amp;src_bi, &amp;d_key_position, &amp;cf);</div><div class='del'>-</div><div class='del'>-	/* insert lkey[h]-th key  from CFL[h] to left neighbor L[h] */</div><div class='del'>-	if (pointer_amount &gt; 0)</div><div class='del'>-		internal_insert_key(&amp;dest_bi, B_NR_ITEMS(dest_bi.bi_bh), cf,</div><div class='del'>-				    d_key_position);</div><div class='del'>-</div><div class='del'>-	/* last parameter is del_parameter */</div><div class='del'>-	internal_move_pointers_items(&amp;dest_bi, &amp;src_bi, FIRST_TO_LAST,</div><div class='del'>-				     pointer_amount, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Insert d_key'th (delimiting) key from buffer cfr to head of dest.</div><div class='del'>- * Copy n node pointers and n - 1 items from buffer src to buffer dest.</div><div class='del'>- * Replace  d_key'th key in buffer cfr.</div><div class='del'>- * Delete n items and node pointers from buffer src.</div><div class='del'>- */</div><div class='del'>-static void internal_shift_right(</div><div class='del'>-				 /*</div><div class='del'>-				  * INTERNAL_FROM_S_TO_R | INTERNAL_FROM_L_TO_S</div><div class='del'>-				  */</div><div class='del'>-				 int mode,</div><div class='del'>-				 struct tree_balance *tb,</div><div class='del'>-				 int h, int pointer_amount)</div><div class='del'>-{</div><div class='del'>-	struct buffer_info dest_bi, src_bi;</div><div class='del'>-	struct buffer_head *cf;</div><div class='del'>-	int d_key_position;</div><div class='del'>-	int nr;</div><div class='del'>-</div><div class='del'>-	internal_define_dest_src_infos(mode, tb, h, &amp;dest_bi, &amp;src_bi,</div><div class='del'>-				       &amp;d_key_position, &amp;cf);</div><div class='del'>-</div><div class='del'>-	nr = B_NR_ITEMS(src_bi.bi_bh);</div><div class='del'>-</div><div class='del'>-	if (pointer_amount &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * insert delimiting key from common father of dest</div><div class='del'>-		 * and src to dest node into position 0</div><div class='del'>-		 */</div><div class='del'>-		internal_insert_key(&amp;dest_bi, 0, cf, d_key_position);</div><div class='del'>-		if (nr == pointer_amount - 1) {</div><div class='del'>-			RFALSE(src_bi.bi_bh != PATH_H_PBUFFER(tb-&gt;tb_path, h) /*tb-&gt;S[h] */ ||</div><div class='del'>-			       dest_bi.bi_bh != tb-&gt;R[h],</div><div class='del'>-			       "src (%p) must be == tb-&gt;S[h](%p) when it disappears",</div><div class='del'>-			       src_bi.bi_bh, PATH_H_PBUFFER(tb-&gt;tb_path, h));</div><div class='del'>-			/* when S[h] disappers replace left delemiting key as well */</div><div class='del'>-			if (tb-&gt;CFL[h])</div><div class='del'>-				replace_key(tb, cf, d_key_position, tb-&gt;CFL[h],</div><div class='del'>-					    tb-&gt;lkey[h]);</div><div class='del'>-		} else</div><div class='del'>-			replace_key(tb, cf, d_key_position, src_bi.bi_bh,</div><div class='del'>-				    nr - pointer_amount);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* last parameter is del_parameter */</div><div class='del'>-	internal_move_pointers_items(&amp;dest_bi, &amp;src_bi, LAST_TO_FIRST,</div><div class='del'>-				     pointer_amount, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Insert delimiting key to R[h].</div><div class='del'>- * Copy n node pointers and n - 1 items from buffer S[h] to R[h].</div><div class='del'>- * Delete n - 1 items and node pointers from buffer S[h].</div><div class='del'>- */</div><div class='del'>-/* it always shift from S[h] to R[h] */</div><div class='del'>-static void internal_shift1_right(struct tree_balance *tb,</div><div class='del'>-				  int h, int pointer_amount)</div><div class='del'>-{</div><div class='del'>-	struct buffer_info dest_bi, src_bi;</div><div class='del'>-	struct buffer_head *cf;</div><div class='del'>-	int d_key_position;</div><div class='del'>-</div><div class='del'>-	internal_define_dest_src_infos(INTERNAL_SHIFT_FROM_S_TO_R, tb, h,</div><div class='del'>-				       &amp;dest_bi, &amp;src_bi, &amp;d_key_position, &amp;cf);</div><div class='del'>-</div><div class='del'>-	/* insert rkey from CFR[h] to right neighbor R[h] */</div><div class='del'>-	if (pointer_amount &gt; 0)</div><div class='del'>-		internal_insert_key(&amp;dest_bi, 0, cf, d_key_position);</div><div class='del'>-</div><div class='del'>-	/* last parameter is del_parameter */</div><div class='del'>-	internal_move_pointers_items(&amp;dest_bi, &amp;src_bi, LAST_TO_FIRST,</div><div class='del'>-				     pointer_amount, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Delete insert_num node pointers together with their left items</div><div class='del'>- * and balance current node.</div><div class='del'>- */</div><div class='del'>-static void balance_internal_when_delete(struct tree_balance *tb,</div><div class='del'>-					 int h, int child_pos)</div><div class='del'>-{</div><div class='del'>-	int insert_num;</div><div class='del'>-	int n;</div><div class='del'>-	struct buffer_head *tbSh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	insert_num = tb-&gt;insert_size[h] / ((int)(DC_SIZE + KEY_SIZE));</div><div class='del'>-</div><div class='del'>-	/* delete child-node-pointer(s) together with their left item(s) */</div><div class='del'>-	bi.tb = tb;</div><div class='del'>-	bi.bi_bh = tbSh;</div><div class='del'>-	bi.bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-	bi.bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-</div><div class='del'>-	internal_delete_childs(&amp;bi, child_pos, -insert_num);</div><div class='del'>-</div><div class='del'>-	RFALSE(tb-&gt;blknum[h] &gt; 1,</div><div class='del'>-	       "tb-&gt;blknum[%d]=%d when insert_size &lt; 0", h, tb-&gt;blknum[h]);</div><div class='del'>-</div><div class='del'>-	n = B_NR_ITEMS(tbSh);</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;lnum[h] == 0 &amp;&amp; tb-&gt;rnum[h] == 0) {</div><div class='del'>-		if (tb-&gt;blknum[h] == 0) {</div><div class='del'>-			/* node S[h] (root of the tree) is empty now */</div><div class='del'>-			struct buffer_head *new_root;</div><div class='del'>-</div><div class='del'>-			RFALSE(n</div><div class='del'>-			       || B_FREE_SPACE(tbSh) !=</div><div class='del'>-			       MAX_CHILD_SIZE(tbSh) - DC_SIZE,</div><div class='del'>-			       "buffer must have only 0 keys (%d)", n);</div><div class='del'>-			RFALSE(bi.bi_parent, "root has parent (%p)",</div><div class='del'>-			       bi.bi_parent);</div><div class='del'>-</div><div class='del'>-			/* choose a new root */</div><div class='del'>-			if (!tb-&gt;L[h - 1] || !B_NR_ITEMS(tb-&gt;L[h - 1]))</div><div class='del'>-				new_root = tb-&gt;R[h - 1];</div><div class='del'>-			else</div><div class='del'>-				new_root = tb-&gt;L[h - 1];</div><div class='del'>-			/*</div><div class='del'>-			 * switch super block's tree root block</div><div class='del'>-			 * number to the new value */</div><div class='del'>-			PUT_SB_ROOT_BLOCK(tb-&gt;tb_sb, new_root-&gt;b_blocknr);</div><div class='del'>-			/*REISERFS_SB(tb-&gt;tb_sb)-&gt;s_rs-&gt;s_tree_height --; */</div><div class='del'>-			PUT_SB_TREE_HEIGHT(tb-&gt;tb_sb,</div><div class='del'>-					   SB_TREE_HEIGHT(tb-&gt;tb_sb) - 1);</div><div class='del'>-</div><div class='del'>-			do_balance_mark_sb_dirty(tb,</div><div class='del'>-						 REISERFS_SB(tb-&gt;tb_sb)-&gt;s_sbh,</div><div class='del'>-						 1);</div><div class='del'>-			/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-			/* use check_internal if new root is an internal node */</div><div class='del'>-			if (h &gt; 1)</div><div class='del'>-				check_internal(new_root);</div><div class='del'>-			/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-</div><div class='del'>-			/* do what is needed for buffer thrown from tree */</div><div class='del'>-			reiserfs_invalidate_buffer(tb, tbSh);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* join S[h] with L[h] */</div><div class='del'>-	if (tb-&gt;L[h] &amp;&amp; tb-&gt;lnum[h] == -B_NR_ITEMS(tb-&gt;L[h]) - 1) {</div><div class='del'>-</div><div class='del'>-		RFALSE(tb-&gt;rnum[h] != 0,</div><div class='del'>-		       "invalid tb-&gt;rnum[%d]==%d when joining S[h] with L[h]",</div><div class='del'>-		       h, tb-&gt;rnum[h]);</div><div class='del'>-</div><div class='del'>-		internal_shift_left(INTERNAL_SHIFT_FROM_S_TO_L, tb, h, n + 1);</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbSh);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* join S[h] with R[h] */</div><div class='del'>-	if (tb-&gt;R[h] &amp;&amp; tb-&gt;rnum[h] == -B_NR_ITEMS(tb-&gt;R[h]) - 1) {</div><div class='del'>-		RFALSE(tb-&gt;lnum[h] != 0,</div><div class='del'>-		       "invalid tb-&gt;lnum[%d]==%d when joining S[h] with R[h]",</div><div class='del'>-		       h, tb-&gt;lnum[h]);</div><div class='del'>-</div><div class='del'>-		internal_shift_right(INTERNAL_SHIFT_FROM_S_TO_R, tb, h, n + 1);</div><div class='del'>-</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbSh);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* borrow from left neighbor L[h] */</div><div class='del'>-	if (tb-&gt;lnum[h] &lt; 0) {</div><div class='del'>-		RFALSE(tb-&gt;rnum[h] != 0,</div><div class='del'>-		       "wrong tb-&gt;rnum[%d]==%d when borrow from L[h]", h,</div><div class='del'>-		       tb-&gt;rnum[h]);</div><div class='del'>-		internal_shift_right(INTERNAL_SHIFT_FROM_L_TO_S, tb, h,</div><div class='del'>-				     -tb-&gt;lnum[h]);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* borrow from right neighbor R[h] */</div><div class='del'>-	if (tb-&gt;rnum[h] &lt; 0) {</div><div class='del'>-		RFALSE(tb-&gt;lnum[h] != 0,</div><div class='del'>-		       "invalid tb-&gt;lnum[%d]==%d when borrow from R[h]",</div><div class='del'>-		       h, tb-&gt;lnum[h]);</div><div class='del'>-		internal_shift_left(INTERNAL_SHIFT_FROM_R_TO_S, tb, h, -tb-&gt;rnum[h]);	/*tb-&gt;S[h], tb-&gt;CFR[h], tb-&gt;rkey[h], tb-&gt;R[h], -tb-&gt;rnum[h]); */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* split S[h] into two parts and put them into neighbors */</div><div class='del'>-	if (tb-&gt;lnum[h] &gt; 0) {</div><div class='del'>-		RFALSE(tb-&gt;rnum[h] == 0 || tb-&gt;lnum[h] + tb-&gt;rnum[h] != n + 1,</div><div class='del'>-		       "invalid tb-&gt;lnum[%d]==%d or tb-&gt;rnum[%d]==%d when S[h](item number == %d) is split between them",</div><div class='del'>-		       h, tb-&gt;lnum[h], h, tb-&gt;rnum[h], n);</div><div class='del'>-</div><div class='del'>-		internal_shift_left(INTERNAL_SHIFT_FROM_S_TO_L, tb, h, tb-&gt;lnum[h]);	/*tb-&gt;L[h], tb-&gt;CFL[h], tb-&gt;lkey[h], tb-&gt;S[h], tb-&gt;lnum[h]); */</div><div class='del'>-		internal_shift_right(INTERNAL_SHIFT_FROM_S_TO_R, tb, h,</div><div class='del'>-				     tb-&gt;rnum[h]);</div><div class='del'>-</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbSh);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_panic(tb-&gt;tb_sb, "ibalance-2",</div><div class='del'>-		       "unexpected tb-&gt;lnum[%d]==%d or tb-&gt;rnum[%d]==%d",</div><div class='del'>-		       h, tb-&gt;lnum[h], h, tb-&gt;rnum[h]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replace delimiting key of buffers L[h] and S[h] by the given key.*/</div><div class='del'>-static void replace_lkey(struct tree_balance *tb, int h, struct item_head *key)</div><div class='del'>-{</div><div class='del'>-	RFALSE(tb-&gt;L[h] == NULL || tb-&gt;CFL[h] == NULL,</div><div class='del'>-	       "L[h](%p) and CFL[h](%p) must exist in replace_lkey",</div><div class='del'>-	       tb-&gt;L[h], tb-&gt;CFL[h]);</div><div class='del'>-</div><div class='del'>-	if (B_NR_ITEMS(PATH_H_PBUFFER(tb-&gt;tb_path, h)) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memcpy(internal_key(tb-&gt;CFL[h], tb-&gt;lkey[h]), key, KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(tb, tb-&gt;CFL[h], 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replace delimiting key of buffers S[h] and R[h] by the given key.*/</div><div class='del'>-static void replace_rkey(struct tree_balance *tb, int h, struct item_head *key)</div><div class='del'>-{</div><div class='del'>-	RFALSE(tb-&gt;R[h] == NULL || tb-&gt;CFR[h] == NULL,</div><div class='del'>-	       "R[h](%p) and CFR[h](%p) must exist in replace_rkey",</div><div class='del'>-	       tb-&gt;R[h], tb-&gt;CFR[h]);</div><div class='del'>-	RFALSE(B_NR_ITEMS(tb-&gt;R[h]) == 0,</div><div class='del'>-	       "R[h] can not be empty if it exists (item number=%d)",</div><div class='del'>-	       B_NR_ITEMS(tb-&gt;R[h]));</div><div class='del'>-</div><div class='del'>-	memcpy(internal_key(tb-&gt;CFR[h], tb-&gt;rkey[h]), key, KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_internal_dirty(tb, tb-&gt;CFR[h], 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if inserting/pasting {</div><div class='del'>- *   child_pos is the position of the node-pointer in S[h] that</div><div class='del'>- *   pointed to S[h-1] before balancing of the h-1 level;</div><div class='del'>- *   this means that new pointers and items must be inserted AFTER</div><div class='del'>- *   child_pos</div><div class='del'>- * } else {</div><div class='del'>- *   it is the position of the leftmost pointer that must be deleted</div><div class='del'>- *   (together with its corresponding key to the left of the pointer)</div><div class='del'>- *   as a result of the previous level's balancing.</div><div class='del'>- * }</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int balance_internal(struct tree_balance *tb,</div><div class='del'>-		     int h,	/* level of the tree */</div><div class='del'>-		     int child_pos,</div><div class='del'>-		     /* key for insertion on higher level    */</div><div class='del'>-		     struct item_head *insert_key,</div><div class='del'>-		     /* node for insertion on higher level */</div><div class='del'>-		     struct buffer_head **insert_ptr)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *tbSh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-	struct buffer_info bi;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we return this: it is 0 if there is no S[h],</div><div class='del'>-	 * else it is tb-&gt;S[h]-&gt;b_item_order</div><div class='del'>-	 */</div><div class='del'>-	int order;</div><div class='del'>-	int insert_num, n, k;</div><div class='del'>-	struct buffer_head *S_new;</div><div class='del'>-	struct item_head new_insert_key;</div><div class='del'>-	struct buffer_head *new_insert_ptr = NULL;</div><div class='del'>-	struct item_head *new_insert_key_addr = insert_key;</div><div class='del'>-</div><div class='del'>-	RFALSE(h &lt; 1, "h (%d) can not be &lt; 1 on internal level", h);</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(tb-&gt;tb_sb, balance_at[h]);</div><div class='del'>-</div><div class='del'>-	order =</div><div class='del'>-	    (tbSh) ? PATH_H_POSITION(tb-&gt;tb_path,</div><div class='del'>-				     h + 1) /*tb-&gt;S[h]-&gt;b_item_order */ : 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Using insert_size[h] calculate the number insert_num of items</div><div class='del'>-	 * that must be inserted to or deleted from S[h].</div><div class='del'>-	 */</div><div class='del'>-	insert_num = tb-&gt;insert_size[h] / ((int)(KEY_SIZE + DC_SIZE));</div><div class='del'>-</div><div class='del'>-	/* Check whether insert_num is proper * */</div><div class='del'>-	RFALSE(insert_num &lt; -2 || insert_num &gt; 2,</div><div class='del'>-	       "incorrect number of items inserted to the internal node (%d)",</div><div class='del'>-	       insert_num);</div><div class='del'>-	RFALSE(h &gt; 1 &amp;&amp; (insert_num &gt; 1 || insert_num &lt; -1),</div><div class='del'>-	       "incorrect number of items (%d) inserted to the internal node on a level (h=%d) higher than last internal level",</div><div class='del'>-	       insert_num, h);</div><div class='del'>-</div><div class='del'>-	/* Make balance in case insert_num &lt; 0 */</div><div class='del'>-	if (insert_num &lt; 0) {</div><div class='del'>-		balance_internal_when_delete(tb, h, child_pos);</div><div class='del'>-		return order;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	k = 0;</div><div class='del'>-	if (tb-&gt;lnum[h] &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * shift lnum[h] items from S[h] to the left neighbor L[h].</div><div class='del'>-		 * check how many of new items fall into L[h] or CFL[h] after</div><div class='del'>-		 * shifting</div><div class='del'>-		 */</div><div class='del'>-		n = B_NR_ITEMS(tb-&gt;L[h]);	/* number of items in L[h] */</div><div class='del'>-		if (tb-&gt;lnum[h] &lt;= child_pos) {</div><div class='del'>-			/* new items don't fall into L[h] or CFL[h] */</div><div class='del'>-			internal_shift_left(INTERNAL_SHIFT_FROM_S_TO_L, tb, h,</div><div class='del'>-					    tb-&gt;lnum[h]);</div><div class='del'>-			child_pos -= tb-&gt;lnum[h];</div><div class='del'>-		} else if (tb-&gt;lnum[h] &gt; child_pos + insert_num) {</div><div class='del'>-			/* all new items fall into L[h] */</div><div class='del'>-			internal_shift_left(INTERNAL_SHIFT_FROM_S_TO_L, tb, h,</div><div class='del'>-					    tb-&gt;lnum[h] - insert_num);</div><div class='del'>-			/* insert insert_num keys and node-pointers into L[h] */</div><div class='del'>-			bi.tb = tb;</div><div class='del'>-			bi.bi_bh = tb-&gt;L[h];</div><div class='del'>-			bi.bi_parent = tb-&gt;FL[h];</div><div class='del'>-			bi.bi_position = get_left_neighbor_position(tb, h);</div><div class='del'>-			internal_insert_childs(&amp;bi,</div><div class='del'>-					       /*tb-&gt;L[h], tb-&gt;S[h-1]-&gt;b_next */</div><div class='del'>-					       n + child_pos + 1,</div><div class='del'>-					       insert_num, insert_key,</div><div class='del'>-					       insert_ptr);</div><div class='del'>-</div><div class='del'>-			insert_num = 0;</div><div class='del'>-		} else {</div><div class='del'>-			struct disk_child *dc;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * some items fall into L[h] or CFL[h],</div><div class='del'>-			 * but some don't fall</div><div class='del'>-			 */</div><div class='del'>-			internal_shift1_left(tb, h, child_pos + 1);</div><div class='del'>-			/* calculate number of new items that fall into L[h] */</div><div class='del'>-			k = tb-&gt;lnum[h] - child_pos - 1;</div><div class='del'>-			bi.tb = tb;</div><div class='del'>-			bi.bi_bh = tb-&gt;L[h];</div><div class='del'>-			bi.bi_parent = tb-&gt;FL[h];</div><div class='del'>-			bi.bi_position = get_left_neighbor_position(tb, h);</div><div class='del'>-			internal_insert_childs(&amp;bi,</div><div class='del'>-					       /*tb-&gt;L[h], tb-&gt;S[h-1]-&gt;b_next, */</div><div class='del'>-					       n + child_pos + 1, k,</div><div class='del'>-					       insert_key, insert_ptr);</div><div class='del'>-</div><div class='del'>-			replace_lkey(tb, h, insert_key + k);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * replace the first node-ptr in S[h] by</div><div class='del'>-			 * node-ptr to insert_ptr[k]</div><div class='del'>-			 */</div><div class='del'>-			dc = B_N_CHILD(tbSh, 0);</div><div class='del'>-			put_dc_size(dc,</div><div class='del'>-				    MAX_CHILD_SIZE(insert_ptr[k]) -</div><div class='del'>-				    B_FREE_SPACE(insert_ptr[k]));</div><div class='del'>-			put_dc_block_number(dc, insert_ptr[k]-&gt;b_blocknr);</div><div class='del'>-</div><div class='del'>-			do_balance_mark_internal_dirty(tb, tbSh, 0);</div><div class='del'>-</div><div class='del'>-			k++;</div><div class='del'>-			insert_key += k;</div><div class='del'>-			insert_ptr += k;</div><div class='del'>-			insert_num -= k;</div><div class='del'>-			child_pos = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* tb-&gt;lnum[h] &gt; 0 */</div><div class='del'>-	if (tb-&gt;rnum[h] &gt; 0) {</div><div class='del'>-		/*shift rnum[h] items from S[h] to the right neighbor R[h] */</div><div class='del'>-		/*</div><div class='del'>-		 * check how many of new items fall into R or CFR</div><div class='del'>-		 * after shifting</div><div class='del'>-		 */</div><div class='del'>-		n = B_NR_ITEMS(tbSh);	/* number of items in S[h] */</div><div class='del'>-		if (n - tb-&gt;rnum[h] &gt;= child_pos)</div><div class='del'>-			/* new items fall into S[h] */</div><div class='del'>-			internal_shift_right(INTERNAL_SHIFT_FROM_S_TO_R, tb, h,</div><div class='del'>-					     tb-&gt;rnum[h]);</div><div class='del'>-		else if (n + insert_num - tb-&gt;rnum[h] &lt; child_pos) {</div><div class='del'>-			/* all new items fall into R[h] */</div><div class='del'>-			internal_shift_right(INTERNAL_SHIFT_FROM_S_TO_R, tb, h,</div><div class='del'>-					     tb-&gt;rnum[h] - insert_num);</div><div class='del'>-</div><div class='del'>-			/* insert insert_num keys and node-pointers into R[h] */</div><div class='del'>-			bi.tb = tb;</div><div class='del'>-			bi.bi_bh = tb-&gt;R[h];</div><div class='del'>-			bi.bi_parent = tb-&gt;FR[h];</div><div class='del'>-			bi.bi_position = get_right_neighbor_position(tb, h);</div><div class='del'>-			internal_insert_childs(&amp;bi,</div><div class='del'>-					       /*tb-&gt;R[h],tb-&gt;S[h-1]-&gt;b_next */</div><div class='del'>-					       child_pos - n - insert_num +</div><div class='del'>-					       tb-&gt;rnum[h] - 1,</div><div class='del'>-					       insert_num, insert_key,</div><div class='del'>-					       insert_ptr);</div><div class='del'>-			insert_num = 0;</div><div class='del'>-		} else {</div><div class='del'>-			struct disk_child *dc;</div><div class='del'>-</div><div class='del'>-			/* one of the items falls into CFR[h] */</div><div class='del'>-			internal_shift1_right(tb, h, n - child_pos + 1);</div><div class='del'>-			/* calculate number of new items that fall into R[h] */</div><div class='del'>-			k = tb-&gt;rnum[h] - n + child_pos - 1;</div><div class='del'>-			bi.tb = tb;</div><div class='del'>-			bi.bi_bh = tb-&gt;R[h];</div><div class='del'>-			bi.bi_parent = tb-&gt;FR[h];</div><div class='del'>-			bi.bi_position = get_right_neighbor_position(tb, h);</div><div class='del'>-			internal_insert_childs(&amp;bi,</div><div class='del'>-					       /*tb-&gt;R[h], tb-&gt;R[h]-&gt;b_child, */</div><div class='del'>-					       0, k, insert_key + 1,</div><div class='del'>-					       insert_ptr + 1);</div><div class='del'>-</div><div class='del'>-			replace_rkey(tb, h, insert_key + insert_num - k - 1);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * replace the first node-ptr in R[h] by</div><div class='del'>-			 * node-ptr insert_ptr[insert_num-k-1]</div><div class='del'>-			 */</div><div class='del'>-			dc = B_N_CHILD(tb-&gt;R[h], 0);</div><div class='del'>-			put_dc_size(dc,</div><div class='del'>-				    MAX_CHILD_SIZE(insert_ptr</div><div class='del'>-						   [insert_num - k - 1]) -</div><div class='del'>-				    B_FREE_SPACE(insert_ptr</div><div class='del'>-						 [insert_num - k - 1]));</div><div class='del'>-			put_dc_block_number(dc,</div><div class='del'>-					    insert_ptr[insert_num - k -</div><div class='del'>-						       1]-&gt;b_blocknr);</div><div class='del'>-</div><div class='del'>-			do_balance_mark_internal_dirty(tb, tb-&gt;R[h], 0);</div><div class='del'>-</div><div class='del'>-			insert_num -= (k + 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/** Fill new node that appears instead of S[h] **/</div><div class='del'>-	RFALSE(tb-&gt;blknum[h] &gt; 2, "blknum can not be &gt; 2 for internal level");</div><div class='del'>-	RFALSE(tb-&gt;blknum[h] &lt; 0, "blknum can not be &lt; 0");</div><div class='del'>-</div><div class='del'>-	if (!tb-&gt;blknum[h]) {	/* node S[h] is empty now */</div><div class='del'>-		RFALSE(!tbSh, "S[h] is equal NULL");</div><div class='del'>-</div><div class='del'>-		/* do what is needed for buffer thrown from tree */</div><div class='del'>-		reiserfs_invalidate_buffer(tb, tbSh);</div><div class='del'>-		return order;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!tbSh) {</div><div class='del'>-		/* create new root */</div><div class='del'>-		struct disk_child *dc;</div><div class='del'>-		struct buffer_head *tbSh_1 = PATH_H_PBUFFER(tb-&gt;tb_path, h - 1);</div><div class='del'>-		struct block_head *blkh;</div><div class='del'>-</div><div class='del'>-		if (tb-&gt;blknum[h] != 1)</div><div class='del'>-			reiserfs_panic(NULL, "ibalance-3", "One new node "</div><div class='del'>-				       "required for creating the new root");</div><div class='del'>-		/* S[h] = empty buffer from the list FEB. */</div><div class='del'>-		tbSh = get_FEB(tb);</div><div class='del'>-		blkh = B_BLK_HEAD(tbSh);</div><div class='del'>-		set_blkh_level(blkh, h + 1);</div><div class='del'>-</div><div class='del'>-		/* Put the unique node-pointer to S[h] that points to S[h-1]. */</div><div class='del'>-</div><div class='del'>-		dc = B_N_CHILD(tbSh, 0);</div><div class='del'>-		put_dc_block_number(dc, tbSh_1-&gt;b_blocknr);</div><div class='del'>-		put_dc_size(dc,</div><div class='del'>-			    (MAX_CHILD_SIZE(tbSh_1) - B_FREE_SPACE(tbSh_1)));</div><div class='del'>-</div><div class='del'>-		tb-&gt;insert_size[h] -= DC_SIZE;</div><div class='del'>-		set_blkh_free_space(blkh, blkh_free_space(blkh) - DC_SIZE);</div><div class='del'>-</div><div class='del'>-		do_balance_mark_internal_dirty(tb, tbSh, 0);</div><div class='del'>-</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-		check_internal(tbSh);</div><div class='del'>-		/*&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp; */</div><div class='del'>-</div><div class='del'>-		/* put new root into path structure */</div><div class='del'>-		PATH_OFFSET_PBUFFER(tb-&gt;tb_path, ILLEGAL_PATH_ELEMENT_OFFSET) =</div><div class='del'>-		    tbSh;</div><div class='del'>-</div><div class='del'>-		/* Change root in structure super block. */</div><div class='del'>-		PUT_SB_ROOT_BLOCK(tb-&gt;tb_sb, tbSh-&gt;b_blocknr);</div><div class='del'>-		PUT_SB_TREE_HEIGHT(tb-&gt;tb_sb, SB_TREE_HEIGHT(tb-&gt;tb_sb) + 1);</div><div class='del'>-		do_balance_mark_sb_dirty(tb, REISERFS_SB(tb-&gt;tb_sb)-&gt;s_sbh, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tb-&gt;blknum[h] == 2) {</div><div class='del'>-		int snum;</div><div class='del'>-		struct buffer_info dest_bi, src_bi;</div><div class='del'>-</div><div class='del'>-		/* S_new = free buffer from list FEB */</div><div class='del'>-		S_new = get_FEB(tb);</div><div class='del'>-</div><div class='del'>-		set_blkh_level(B_BLK_HEAD(S_new), h + 1);</div><div class='del'>-</div><div class='del'>-		dest_bi.tb = tb;</div><div class='del'>-		dest_bi.bi_bh = S_new;</div><div class='del'>-		dest_bi.bi_parent = NULL;</div><div class='del'>-		dest_bi.bi_position = 0;</div><div class='del'>-		src_bi.tb = tb;</div><div class='del'>-		src_bi.bi_bh = tbSh;</div><div class='del'>-		src_bi.bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		src_bi.bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-</div><div class='del'>-		n = B_NR_ITEMS(tbSh);	/* number of items in S[h] */</div><div class='del'>-		snum = (insert_num + n + 1) / 2;</div><div class='del'>-		if (n - snum &gt;= child_pos) {</div><div class='del'>-			/* new items don't fall into S_new */</div><div class='del'>-			/*  store the delimiting key for the next level */</div><div class='del'>-			/* new_insert_key = (n - snum)'th key in S[h] */</div><div class='del'>-			memcpy(&amp;new_insert_key, internal_key(tbSh, n - snum),</div><div class='del'>-			       KEY_SIZE);</div><div class='del'>-			/* last parameter is del_par */</div><div class='del'>-			internal_move_pointers_items(&amp;dest_bi, &amp;src_bi,</div><div class='del'>-						     LAST_TO_FIRST, snum, 0);</div><div class='del'>-		} else if (n + insert_num - snum &lt; child_pos) {</div><div class='del'>-			/* all new items fall into S_new */</div><div class='del'>-			/*  store the delimiting key for the next level */</div><div class='del'>-			/*</div><div class='del'>-			 * new_insert_key = (n + insert_item - snum)'th</div><div class='del'>-			 * key in S[h]</div><div class='del'>-			 */</div><div class='del'>-			memcpy(&amp;new_insert_key,</div><div class='del'>-			       internal_key(tbSh, n + insert_num - snum),</div><div class='del'>-			       KEY_SIZE);</div><div class='del'>-			/* last parameter is del_par */</div><div class='del'>-			internal_move_pointers_items(&amp;dest_bi, &amp;src_bi,</div><div class='del'>-						     LAST_TO_FIRST,</div><div class='del'>-						     snum - insert_num, 0);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * insert insert_num keys and node-pointers</div><div class='del'>-			 * into S_new</div><div class='del'>-			 */</div><div class='del'>-			internal_insert_childs(&amp;dest_bi,</div><div class='del'>-					       /*S_new,tb-&gt;S[h-1]-&gt;b_next, */</div><div class='del'>-					       child_pos - n - insert_num +</div><div class='del'>-					       snum - 1,</div><div class='del'>-					       insert_num, insert_key,</div><div class='del'>-					       insert_ptr);</div><div class='del'>-</div><div class='del'>-			insert_num = 0;</div><div class='del'>-		} else {</div><div class='del'>-			struct disk_child *dc;</div><div class='del'>-</div><div class='del'>-			/* some items fall into S_new, but some don't fall */</div><div class='del'>-			/* last parameter is del_par */</div><div class='del'>-			internal_move_pointers_items(&amp;dest_bi, &amp;src_bi,</div><div class='del'>-						     LAST_TO_FIRST,</div><div class='del'>-						     n - child_pos + 1, 1);</div><div class='del'>-			/* calculate number of new items that fall into S_new */</div><div class='del'>-			k = snum - n + child_pos - 1;</div><div class='del'>-</div><div class='del'>-			internal_insert_childs(&amp;dest_bi, /*S_new, */ 0, k,</div><div class='del'>-					       insert_key + 1, insert_ptr + 1);</div><div class='del'>-</div><div class='del'>-			/* new_insert_key = insert_key[insert_num - k - 1] */</div><div class='del'>-			memcpy(&amp;new_insert_key, insert_key + insert_num - k - 1,</div><div class='del'>-			       KEY_SIZE);</div><div class='del'>-			/*</div><div class='del'>-			 * replace first node-ptr in S_new by node-ptr</div><div class='del'>-			 * to insert_ptr[insert_num-k-1]</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			dc = B_N_CHILD(S_new, 0);</div><div class='del'>-			put_dc_size(dc,</div><div class='del'>-				    (MAX_CHILD_SIZE</div><div class='del'>-				     (insert_ptr[insert_num - k - 1]) -</div><div class='del'>-				     B_FREE_SPACE(insert_ptr</div><div class='del'>-						  [insert_num - k - 1])));</div><div class='del'>-			put_dc_block_number(dc,</div><div class='del'>-					    insert_ptr[insert_num - k -</div><div class='del'>-						       1]-&gt;b_blocknr);</div><div class='del'>-</div><div class='del'>-			do_balance_mark_internal_dirty(tb, S_new, 0);</div><div class='del'>-</div><div class='del'>-			insert_num -= (k + 1);</div><div class='del'>-		}</div><div class='del'>-		/* new_insert_ptr = node_pointer to S_new */</div><div class='del'>-		new_insert_ptr = S_new;</div><div class='del'>-</div><div class='del'>-		RFALSE(!buffer_journaled(S_new) || buffer_journal_dirty(S_new)</div><div class='del'>-		       || buffer_dirty(S_new), "cm-00001: bad S_new (%b)",</div><div class='del'>-		       S_new);</div><div class='del'>-</div><div class='del'>-		/* S_new is released in unfix_nodes */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = B_NR_ITEMS(tbSh);	/*number of items in S[h] */</div><div class='del'>-</div><div class='del'>-	if (0 &lt;= child_pos &amp;&amp; child_pos &lt;= n &amp;&amp; insert_num &gt; 0) {</div><div class='del'>-		bi.tb = tb;</div><div class='del'>-		bi.bi_bh = tbSh;</div><div class='del'>-		bi.bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		bi.bi_position = PATH_H_POSITION(tb-&gt;tb_path, h + 1);</div><div class='del'>-		internal_insert_childs(&amp;bi,	/*tbSh, */</div><div class='del'>-				       /*          ( tb-&gt;S[h-1]-&gt;b_parent == tb-&gt;S[h] ) ? tb-&gt;S[h-1]-&gt;b_next :  tb-&gt;S[h]-&gt;b_child-&gt;b_next, */</div><div class='del'>-				       child_pos, insert_num, insert_key,</div><div class='del'>-				       insert_ptr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	insert_ptr[0] = new_insert_ptr;</div><div class='del'>-	if (new_insert_ptr)</div><div class='del'>-		memcpy(new_insert_key_addr, &amp;new_insert_key, KEY_SIZE);</div><div class='del'>-</div><div class='del'>-	return order;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c<br/>deleted file mode 100644<br/>index 1d825459ee6e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/inode.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/inode.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3418 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/exportfs.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/mpage.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-</div><div class='del'>-int reiserfs_commit_write(struct file *f, struct page *page,</div><div class='del'>-			  unsigned from, unsigned to);</div><div class='del'>-</div><div class='del'>-void reiserfs_evict_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We need blocks for transaction + (user+group) quota</div><div class='del'>-	 * update (possibly delete)</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 2 +</div><div class='del'>-	    2 * REISERFS_QUOTA_INIT_BLOCKS(inode-&gt;i_sb);</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!inode-&gt;i_nlink &amp;&amp; !is_bad_inode(inode))</div><div class='del'>-		dquot_initialize(inode);</div><div class='del'>-</div><div class='del'>-	truncate_inode_pages_final(&amp;inode-&gt;i_data);</div><div class='del'>-	if (inode-&gt;i_nlink)</div><div class='del'>-		goto no_delete;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The = 0 happens when we abort creating a new inode</div><div class='del'>-	 * for some reason like lack of space..</div><div class='del'>-	 * also handles bad_inode case</div><div class='del'>-	 */</div><div class='del'>-	if (!(inode-&gt;i_state &amp; I_NEW) &amp;&amp; INODE_PKEY(inode)-&gt;k_objectid != 0) {</div><div class='del'>-</div><div class='del'>-		reiserfs_delete_xattrs(inode);</div><div class='del'>-</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		if (journal_begin(&amp;th, inode-&gt;i_sb, jbegin_count))</div><div class='del'>-			goto out;</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-</div><div class='del'>-		reiserfs_discard_prealloc(&amp;th, inode);</div><div class='del'>-</div><div class='del'>-		err = reiserfs_delete_object(&amp;th, inode);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Do quota update inside a transaction for journaled quotas.</div><div class='del'>-		 * We must do that after delete_object so that quota updates</div><div class='del'>-		 * go into the same transaction as stat data deletion</div><div class='del'>-		 */</div><div class='del'>-		if (!err) {</div><div class='del'>-			int depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-			dquot_free_inode(inode);</div><div class='del'>-			reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (journal_end(&amp;th))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * check return value from reiserfs_delete_object after</div><div class='del'>-		 * ending the transaction</div><div class='del'>-		 */</div><div class='del'>-		if (err)</div><div class='del'>-		    goto out;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * all items of file are deleted, so we can remove</div><div class='del'>-		 * "save" link</div><div class='del'>-		 * we can't do anything about an error here</div><div class='del'>-		 */</div><div class='del'>-		remove_save_link(inode, 0 /* not truncate */);</div><div class='del'>-out:</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	} else {</div><div class='del'>-		/* no object items are in the tree */</div><div class='del'>-		;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* note this must go after the journal_end to prevent deadlock */</div><div class='del'>-	clear_inode(inode);</div><div class='del'>-</div><div class='del'>-	dquot_drop(inode);</div><div class='del'>-	inode-&gt;i_blocks = 0;</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-no_delete:</div><div class='del'>-	clear_inode(inode);</div><div class='del'>-	dquot_drop(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void _make_cpu_key(struct cpu_key *key, int version, __u32 dirid,</div><div class='del'>-			  __u32 objectid, loff_t offset, int type, int length)</div><div class='del'>-{</div><div class='del'>-	key-&gt;version = version;</div><div class='del'>-</div><div class='del'>-	key-&gt;on_disk_key.k_dir_id = dirid;</div><div class='del'>-	key-&gt;on_disk_key.k_objectid = objectid;</div><div class='del'>-	set_cpu_key_k_offset(key, offset);</div><div class='del'>-	set_cpu_key_k_type(key, type);</div><div class='del'>-	key-&gt;key_length = length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * take base of inode_key (it comes from inode always) (dirid, objectid)</div><div class='del'>- * and version from an inode, set offset and type of key</div><div class='del'>- */</div><div class='del'>-void make_cpu_key(struct cpu_key *key, struct inode *inode, loff_t offset,</div><div class='del'>-		  int type, int length)</div><div class='del'>-{</div><div class='del'>-	_make_cpu_key(key, get_inode_item_key_version(inode),</div><div class='del'>-		      le32_to_cpu(INODE_PKEY(inode)-&gt;k_dir_id),</div><div class='del'>-		      le32_to_cpu(INODE_PKEY(inode)-&gt;k_objectid), offset, type,</div><div class='del'>-		      length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* when key is 0, do not set version and short key */</div><div class='del'>-inline void make_le_item_head(struct item_head *ih, const struct cpu_key *key,</div><div class='del'>-			      int version,</div><div class='del'>-			      loff_t offset, int type, int length,</div><div class='del'>-			      int entry_count /*or ih_free_space */ )</div><div class='del'>-{</div><div class='del'>-	if (key) {</div><div class='del'>-		ih-&gt;ih_key.k_dir_id = cpu_to_le32(key-&gt;on_disk_key.k_dir_id);</div><div class='del'>-		ih-&gt;ih_key.k_objectid =</div><div class='del'>-		    cpu_to_le32(key-&gt;on_disk_key.k_objectid);</div><div class='del'>-	}</div><div class='del'>-	put_ih_version(ih, version);</div><div class='del'>-	set_le_ih_k_offset(ih, offset);</div><div class='del'>-	set_le_ih_k_type(ih, type);</div><div class='del'>-	put_ih_item_len(ih, length);</div><div class='del'>-	/*    set_ih_free_space (ih, 0); */</div><div class='del'>-	/*</div><div class='del'>-	 * for directory items it is entry count, for directs and stat</div><div class='del'>-	 * datas - 0xffff, for indirects - 0</div><div class='del'>-	 */</div><div class='del'>-	put_ih_entry_count(ih, entry_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: we might cache recently accessed indirect item</div><div class='del'>- * Ugh.  Not too eager for that....</div><div class='del'>- * I cut the code until such time as I see a convincing argument (benchmark).</div><div class='del'>- * I don't want a bloated inode struct..., and I don't like code complexity....</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * cutting the code is fine, since it really isn't in use yet and is easy</div><div class='del'>- * to add back in.  But, Vladimir has a really good idea here.  Think</div><div class='del'>- * about what happens for reading a file.  For each page,</div><div class='del'>- * The VFS layer calls reiserfs_read_folio, who searches the tree to find</div><div class='del'>- * an indirect item.  This indirect item has X number of pointers, where</div><div class='del'>- * X is a big number if we've done the block allocation right.  But,</div><div class='del'>- * we only use one or two of these pointers during each call to read_folio,</div><div class='del'>- * needlessly researching again later on.</div><div class='del'>- *</div><div class='del'>- * The size of the cache could be dynamic based on the size of the file.</div><div class='del'>- *</div><div class='del'>- * I'd also like to see us cache the location the stat data item, since</div><div class='del'>- * we are needlessly researching for that frequently.</div><div class='del'>- *</div><div class='del'>- * --chris</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If this page has a file tail in it, and</div><div class='del'>- * it was read in by get_block_create_0, the page data is valid,</div><div class='del'>- * but tail is still sitting in a direct item, and we can't write to</div><div class='del'>- * it.  So, look through this page, and check all the mapped buffers</div><div class='del'>- * to make sure they have valid block numbers.  Any that don't need</div><div class='del'>- * to be unmapped, so that __block_write_begin will correctly call</div><div class='del'>- * reiserfs_get_block to convert the tail into an unformatted node</div><div class='del'>- */</div><div class='del'>-static inline void fix_tail_page_for_writing(struct page *page)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *head, *next, *bh;</div><div class='del'>-</div><div class='del'>-	if (page &amp;&amp; page_has_buffers(page)) {</div><div class='del'>-		head = page_buffers(page);</div><div class='del'>-		bh = head;</div><div class='del'>-		do {</div><div class='del'>-			next = bh-&gt;b_this_page;</div><div class='del'>-			if (buffer_mapped(bh) &amp;&amp; bh-&gt;b_blocknr == 0) {</div><div class='del'>-				reiserfs_unmap_buffer(bh);</div><div class='del'>-			}</div><div class='del'>-			bh = next;</div><div class='del'>-		} while (bh != head);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * reiserfs_get_block does not need to allocate a block only if it has been</div><div class='del'>- * done already or non-hole position has been found in the indirect item</div><div class='del'>- */</div><div class='del'>-static inline int allocation_needed(int retval, b_blocknr_t allocated,</div><div class='del'>-				    struct item_head *ih,</div><div class='del'>-				    __le32 * item, int pos_in_item)</div><div class='del'>-{</div><div class='del'>-	if (allocated)</div><div class='del'>-		return 0;</div><div class='del'>-	if (retval == POSITION_FOUND &amp;&amp; is_indirect_le_ih(ih) &amp;&amp;</div><div class='del'>-	    get_block_num(item, pos_in_item))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int indirect_item_found(int retval, struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return (retval == POSITION_FOUND) &amp;&amp; is_indirect_le_ih(ih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_block_dev_mapped(struct buffer_head *bh,</div><div class='del'>-					b_blocknr_t block, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	map_bh(bh, inode-&gt;i_sb, block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * files which were created in the earlier version can not be longer,</div><div class='del'>- * than 2 gb</div><div class='del'>- */</div><div class='del'>-static int file_capable(struct inode *inode, sector_t block)</div><div class='del'>-{</div><div class='del'>-	/* it is new file. */</div><div class='del'>-	if (get_inode_item_key_version(inode) != KEY_FORMAT_3_5 ||</div><div class='del'>-	    /* old file, but 'block' is inside of 2gb */</div><div class='del'>-	    block &lt; (1 &lt;&lt; (31 - inode-&gt;i_sb-&gt;s_blocksize_bits)))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int restart_transaction(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       struct inode *inode, struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	BUG_ON(!th-&gt;t_refcount);</div><div class='del'>-</div><div class='del'>-	pathrelse(path);</div><div class='del'>-</div><div class='del'>-	/* we cannot restart while nested */</div><div class='del'>-	if (th-&gt;t_refcount &gt; 1) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_update_sd(th, inode);</div><div class='del'>-	err = journal_end(th);</div><div class='del'>-	if (!err) {</div><div class='del'>-		err = journal_begin(th, s, JOURNAL_PER_BALANCE_CNT * 6);</div><div class='del'>-		if (!err)</div><div class='del'>-			reiserfs_update_inode_transaction(inode);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * it is called by get_block when create == 0. Returns block number</div><div class='del'>- * for 'block'-th logical block of file. When it hits direct item it</div><div class='del'>- * returns 0 (being called from bmap) or read direct item into piece</div><div class='del'>- * of page (bh_result)</div><div class='del'>- * Please improve the english/clarity in the comment above, as it is</div><div class='del'>- * hard to understand.</div><div class='del'>- */</div><div class='del'>-static int _get_block_create_0(struct inode *inode, sector_t block,</div><div class='del'>-			       struct buffer_head *bh_result, int args)</div><div class='del'>-{</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct item_head *ih, tmp_ih;</div><div class='del'>-	b_blocknr_t blocknr;</div><div class='del'>-	char *p;</div><div class='del'>-	int chars;</div><div class='del'>-	int ret;</div><div class='del'>-	int result;</div><div class='del'>-	int done = 0;</div><div class='del'>-	unsigned long offset;</div><div class='del'>-</div><div class='del'>-	/* prepare the key to look for the 'block'-th block of file */</div><div class='del'>-	make_cpu_key(&amp;key, inode,</div><div class='del'>-		     (loff_t) block * inode-&gt;i_sb-&gt;s_blocksize + 1, TYPE_ANY,</div><div class='del'>-		     3);</div><div class='del'>-</div><div class='del'>-	result = search_for_position_by_key(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-	if (result != POSITION_FOUND) {</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		if (result == IO_ERROR)</div><div class='del'>-			return -EIO;</div><div class='del'>-		/*</div><div class='del'>-		 * We do not return -ENOENT if there is a hole but page is</div><div class='del'>-		 * uptodate, because it means that there is some MMAPED data</div><div class='del'>-		 * associated with it that is yet to be written to disk.</div><div class='del'>-		 */</div><div class='del'>-		if ((args &amp; GET_BLOCK_NO_HOLE)</div><div class='del'>-		    &amp;&amp; !PageUptodate(bh_result-&gt;b_page)) {</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bh = get_last_bh(&amp;path);</div><div class='del'>-	ih = tp_item_head(&amp;path);</div><div class='del'>-	if (is_indirect_le_ih(ih)) {</div><div class='del'>-		__le32 *ind_item = (__le32 *) ih_item_body(bh, ih);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: here we could cache indirect item or part of it in</div><div class='del'>-		 * the inode to avoid search_by_key in case of subsequent</div><div class='del'>-		 * access to file</div><div class='del'>-		 */</div><div class='del'>-		blocknr = get_block_num(ind_item, path.pos_in_item);</div><div class='del'>-		ret = 0;</div><div class='del'>-		if (blocknr) {</div><div class='del'>-			map_bh(bh_result, inode-&gt;i_sb, blocknr);</div><div class='del'>-			if (path.pos_in_item ==</div><div class='del'>-			    ((ih_item_len(ih) / UNFM_P_SIZE) - 1)) {</div><div class='del'>-				set_buffer_boundary(bh_result);</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			/*</div><div class='del'>-			 * We do not return -ENOENT if there is a hole but</div><div class='del'>-			 * page is uptodate, because it means that there is</div><div class='del'>-			 * some MMAPED data associated with it that is</div><div class='del'>-			 * yet to be written to disk.</div><div class='del'>-			 */</div><div class='del'>-		if ((args &amp; GET_BLOCK_NO_HOLE)</div><div class='del'>-			    &amp;&amp; !PageUptodate(bh_result-&gt;b_page)) {</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	/* requested data are in direct item(s) */</div><div class='del'>-	if (!(args &amp; GET_BLOCK_READ_DIRECT)) {</div><div class='del'>-		/*</div><div class='del'>-		 * we are called by bmap. FIXME: we can not map block of file</div><div class='del'>-		 * when it is stored in direct item(s)</div><div class='del'>-		 */</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if we've got a direct item, and the buffer or page was uptodate,</div><div class='del'>-	 * we don't want to pull data off disk again.  skip to the</div><div class='del'>-	 * end, where we map the buffer and return</div><div class='del'>-	 */</div><div class='del'>-	if (buffer_uptodate(bh_result)) {</div><div class='del'>-		goto finished;</div><div class='del'>-	} else</div><div class='del'>-		/*</div><div class='del'>-		 * grab_tail_page can trigger calls to reiserfs_get_block on</div><div class='del'>-		 * up to date pages without any buffers.  If the page is up</div><div class='del'>-		 * to date, we don't want read old data off disk.  Set the up</div><div class='del'>-		 * to date bit on the buffer instead and jump to the end</div><div class='del'>-		 */</div><div class='del'>-	if (!bh_result-&gt;b_page || PageUptodate(bh_result-&gt;b_page)) {</div><div class='del'>-		set_buffer_uptodate(bh_result);</div><div class='del'>-		goto finished;</div><div class='del'>-	}</div><div class='del'>-	/* read file tail into part of page */</div><div class='del'>-	offset = (cpu_key_k_offset(&amp;key) - 1) &amp; (PAGE_SIZE - 1);</div><div class='del'>-	copy_item_head(&amp;tmp_ih, ih);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we only want to kmap if we are reading the tail into the page.</div><div class='del'>-	 * this is not the common case, so we don't kmap until we are</div><div class='del'>-	 * sure we need to.  But, this means the item might move if</div><div class='del'>-	 * kmap schedules</div><div class='del'>-	 */</div><div class='del'>-	p = (char *)kmap(bh_result-&gt;b_page);</div><div class='del'>-	p += offset;</div><div class='del'>-	memset(p, 0, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-	do {</div><div class='del'>-		if (!is_direct_le_ih(ih)) {</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * make sure we don't read more bytes than actually exist in</div><div class='del'>-		 * the file.  This can happen in odd cases where i_size isn't</div><div class='del'>-		 * correct, and when direct item padding results in a few</div><div class='del'>-		 * extra bytes at the end of the direct item</div><div class='del'>-		 */</div><div class='del'>-		if ((le_ih_k_offset(ih) + path.pos_in_item) &gt; inode-&gt;i_size)</div><div class='del'>-			break;</div><div class='del'>-		if ((le_ih_k_offset(ih) - 1 + ih_item_len(ih)) &gt; inode-&gt;i_size) {</div><div class='del'>-			chars =</div><div class='del'>-			    inode-&gt;i_size - (le_ih_k_offset(ih) - 1) -</div><div class='del'>-			    path.pos_in_item;</div><div class='del'>-			done = 1;</div><div class='del'>-		} else {</div><div class='del'>-			chars = ih_item_len(ih) - path.pos_in_item;</div><div class='del'>-		}</div><div class='del'>-		memcpy(p, ih_item_body(bh, ih) + path.pos_in_item, chars);</div><div class='del'>-</div><div class='del'>-		if (done)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		p += chars;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * we done, if read direct item is not the last item of</div><div class='del'>-		 * node FIXME: we could try to check right delimiting key</div><div class='del'>-		 * to see whether direct item continues in the right</div><div class='del'>-		 * neighbor or rely on i_size</div><div class='del'>-		 */</div><div class='del'>-		if (PATH_LAST_POSITION(&amp;path) != (B_NR_ITEMS(bh) - 1))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* update key to look for the next piece */</div><div class='del'>-		set_cpu_key_k_offset(&amp;key, cpu_key_k_offset(&amp;key) + chars);</div><div class='del'>-		result = search_for_position_by_key(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-		if (result != POSITION_FOUND)</div><div class='del'>-			/* i/o error most likely */</div><div class='del'>-			break;</div><div class='del'>-		bh = get_last_bh(&amp;path);</div><div class='del'>-		ih = tp_item_head(&amp;path);</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	flush_dcache_page(bh_result-&gt;b_page);</div><div class='del'>-	kunmap(bh_result-&gt;b_page);</div><div class='del'>-</div><div class='del'>-finished:</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-</div><div class='del'>-	if (result == IO_ERROR)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this buffer has valid data, but isn't valid for io.  mapping it to</div><div class='del'>-	 * block #0 tells the rest of reiserfs it just has a tail in it</div><div class='del'>-	 */</div><div class='del'>-	map_bh(bh_result, inode-&gt;i_sb, 0);</div><div class='del'>-	set_buffer_uptodate(bh_result);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this is called to create file map. So, _get_block_create_0 will not</div><div class='del'>- * read direct item</div><div class='del'>- */</div><div class='del'>-static int reiserfs_bmap(struct inode *inode, sector_t block,</div><div class='del'>-			 struct buffer_head *bh_result, int create)</div><div class='del'>-{</div><div class='del'>-	if (!file_capable(inode, block))</div><div class='del'>-		return -EFBIG;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	/* do not read the direct item */</div><div class='del'>-	_get_block_create_0(inode, block, bh_result, 0);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * special version of get_block that is only used by grab_tail_page right</div><div class='del'>- * now.  It is sent to __block_write_begin, and when you try to get a</div><div class='del'>- * block past the end of the file (or a block from a hole) it returns</div><div class='del'>- * -ENOENT instead of a valid buffer.  __block_write_begin expects to</div><div class='del'>- * be able to do i/o on the buffers returned, unless an error value</div><div class='del'>- * is also returned.</div><div class='del'>- *</div><div class='del'>- * So, this allows __block_write_begin to be used for reading a single block</div><div class='del'>- * in a page.  Where it does not produce a valid page for holes, or past the</div><div class='del'>- * end of the file.  This turns out to be exactly what we need for reading</div><div class='del'>- * tails for conversion.</div><div class='del'>- *</div><div class='del'>- * The point of the wrapper is forcing a certain value for create, even</div><div class='del'>- * though the VFS layer is calling this function with create==1.  If you</div><div class='del'>- * don't want to send create == GET_BLOCK_NO_HOLE to reiserfs_get_block,</div><div class='del'>- * don't use this function.</div><div class='del'>-*/</div><div class='del'>-static int reiserfs_get_block_create_0(struct inode *inode, sector_t block,</div><div class='del'>-				       struct buffer_head *bh_result,</div><div class='del'>-				       int create)</div><div class='del'>-{</div><div class='del'>-	return reiserfs_get_block(inode, block, bh_result, GET_BLOCK_NO_HOLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is special helper for reiserfs_get_block in case we are executing</div><div class='del'>- * direct_IO request.</div><div class='del'>- */</div><div class='del'>-static int reiserfs_get_blocks_direct_io(struct inode *inode,</div><div class='del'>-					 sector_t iblock,</div><div class='del'>-					 struct buffer_head *bh_result,</div><div class='del'>-					 int create)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	bh_result-&gt;b_page = NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We set the b_size before reiserfs_get_block call since it is</div><div class='del'>-	 * referenced in convert_tail_for_hole() that may be called from</div><div class='del'>-	 * reiserfs_get_block()</div><div class='del'>-	 */</div><div class='del'>-	bh_result-&gt;b_size = i_blocksize(inode);</div><div class='del'>-</div><div class='del'>-	ret = reiserfs_get_block(inode, iblock, bh_result,</div><div class='del'>-				 create | GET_BLOCK_NO_DANGLE);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* don't allow direct io onto tail pages */</div><div class='del'>-	if (buffer_mapped(bh_result) &amp;&amp; bh_result-&gt;b_blocknr == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * make sure future calls to the direct io funcs for this</div><div class='del'>-		 * offset in the file fail by unmapping the buffer</div><div class='del'>-		 */</div><div class='del'>-		clear_buffer_mapped(bh_result);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Possible unpacked tail. Flush the data before pages have</div><div class='del'>-	 * disappeared</div><div class='del'>-	 */</div><div class='del'>-	if (REISERFS_I(inode)-&gt;i_flags &amp; i_pack_on_close_mask) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		err = reiserfs_commit_for_inode(inode);</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags &amp;= ~i_pack_on_close_mask;</div><div class='del'>-</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			ret = err;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * helper function for when reiserfs_get_block is called for a hole</div><div class='del'>- * but the file tail is still in a direct item</div><div class='del'>- * bh_result is the buffer head for the hole</div><div class='del'>- * tail_offset is the offset of the start of the tail in the file</div><div class='del'>- *</div><div class='del'>- * This calls prepare_write, which will start a new transaction</div><div class='del'>- * you should not be in a transaction, or have any paths held when you</div><div class='del'>- * call this.</div><div class='del'>- */</div><div class='del'>-static int convert_tail_for_hole(struct inode *inode,</div><div class='del'>-				 struct buffer_head *bh_result,</div><div class='del'>-				 loff_t tail_offset)</div><div class='del'>-{</div><div class='del'>-	unsigned long index;</div><div class='del'>-	unsigned long tail_end;</div><div class='del'>-	unsigned long tail_start;</div><div class='del'>-	struct page *tail_page;</div><div class='del'>-	struct page *hole_page = bh_result-&gt;b_page;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	if ((tail_offset &amp; (bh_result-&gt;b_size - 1)) != 1)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* always try to read until the end of the block */</div><div class='del'>-	tail_start = tail_offset &amp; (PAGE_SIZE - 1);</div><div class='del'>-	tail_end = (tail_start | (bh_result-&gt;b_size - 1)) + 1;</div><div class='del'>-</div><div class='del'>-	index = tail_offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	/*</div><div class='del'>-	 * hole_page can be zero in case of direct_io, we are sure</div><div class='del'>-	 * that we cannot get here if we write with O_DIRECT into tail page</div><div class='del'>-	 */</div><div class='del'>-	if (!hole_page || index != hole_page-&gt;index) {</div><div class='del'>-		tail_page = grab_cache_page(inode-&gt;i_mapping, index);</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		if (!tail_page) {</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		tail_page = hole_page;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we don't have to make sure the conversion did not happen while</div><div class='del'>-	 * we were locking the page because anyone that could convert</div><div class='del'>-	 * must first take i_mutex.</div><div class='del'>-	 *</div><div class='del'>-	 * We must fix the tail page for writing because it might have buffers</div><div class='del'>-	 * that are mapped, but have a block number of 0.  This indicates tail</div><div class='del'>-	 * data that has been read directly into the page, and</div><div class='del'>-	 * __block_write_begin won't trigger a get_block in this case.</div><div class='del'>-	 */</div><div class='del'>-	fix_tail_page_for_writing(tail_page);</div><div class='del'>-	retval = __reiserfs_write_begin(tail_page, tail_start,</div><div class='del'>-				      tail_end - tail_start);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/* tail conversion might change the data in the page */</div><div class='del'>-	flush_dcache_page(tail_page);</div><div class='del'>-</div><div class='del'>-	retval = reiserfs_commit_write(NULL, tail_page, tail_start, tail_end);</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	if (tail_page != hole_page) {</div><div class='del'>-		unlock_page(tail_page);</div><div class='del'>-		put_page(tail_page);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int _allocate_block(struct reiserfs_transaction_handle *th,</div><div class='del'>-				  sector_t block,</div><div class='del'>-				  struct inode *inode,</div><div class='del'>-				  b_blocknr_t * allocated_block_nr,</div><div class='del'>-				  struct treepath *path, int flags)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-#ifdef REISERFS_PREALLOCATE</div><div class='del'>-	if (!(flags &amp; GET_BLOCK_NO_IMUX)) {</div><div class='del'>-		return reiserfs_new_unf_blocknrs2(th, inode, allocated_block_nr,</div><div class='del'>-						  path, block);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return reiserfs_new_unf_blocknrs(th, inode, allocated_block_nr, path,</div><div class='del'>-					 block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_get_block(struct inode *inode, sector_t block,</div><div class='del'>-		       struct buffer_head *bh_result, int create)</div><div class='del'>-{</div><div class='del'>-	int repeat, retval = 0;</div><div class='del'>-	/* b_blocknr_t is (unsigned) 32 bit int*/</div><div class='del'>-	b_blocknr_t allocated_block_nr = 0;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	int pos_in_item;</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	struct buffer_head *bh, *unbh = NULL;</div><div class='del'>-	struct item_head *ih, tmp_ih;</div><div class='del'>-	__le32 *item;</div><div class='del'>-	int done;</div><div class='del'>-	int fs_gen;</div><div class='del'>-	struct reiserfs_transaction_handle *th = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * space reserved in transaction batch:</div><div class='del'>-	 * . 3 balancings in direct-&gt;indirect conversion</div><div class='del'>-	 * . 1 block involved into reiserfs_update_sd()</div><div class='del'>-	 * XXX in practically impossible worst case direct2indirect()</div><div class='del'>-	 * can incur (much) more than 3 balancings.</div><div class='del'>-	 * quota update for user, group</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 3 + 1 +</div><div class='del'>-	    2 * REISERFS_QUOTA_TRANS_BLOCKS(inode-&gt;i_sb);</div><div class='del'>-	int version;</div><div class='del'>-	int dangle = 1;</div><div class='del'>-	loff_t new_offset =</div><div class='del'>-	    (((loff_t) block) &lt;&lt; inode-&gt;i_sb-&gt;s_blocksize_bits) + 1;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	version = get_inode_item_key_version(inode);</div><div class='del'>-</div><div class='del'>-	if (!file_capable(inode, block)) {</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		return -EFBIG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if !create, we aren't changing the FS, so we don't need to</div><div class='del'>-	 * log anything, so we don't need to start a transaction</div><div class='del'>-	 */</div><div class='del'>-	if (!(create &amp; GET_BLOCK_CREATE)) {</div><div class='del'>-		int ret;</div><div class='del'>-		/* find number of block-th logical block of the file */</div><div class='del'>-		ret = _get_block_create_0(inode, block, bh_result,</div><div class='del'>-					  create | GET_BLOCK_READ_DIRECT);</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if we're already in a transaction, make sure to close</div><div class='del'>-	 * any new transactions we start in this func</div><div class='del'>-	 */</div><div class='del'>-	if ((create &amp; GET_BLOCK_NO_DANGLE) ||</div><div class='del'>-	    reiserfs_transaction_running(inode-&gt;i_sb))</div><div class='del'>-		dangle = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If file is of such a size, that it might have a tail and</div><div class='del'>-	 * tails are enabled  we should mark it as possibly needing</div><div class='del'>-	 * tail packing on close</div><div class='del'>-	 */</div><div class='del'>-	if ((have_large_tails(inode-&gt;i_sb)</div><div class='del'>-	     &amp;&amp; inode-&gt;i_size &lt; i_block_size(inode) * 4)</div><div class='del'>-	    || (have_small_tails(inode-&gt;i_sb)</div><div class='del'>-		&amp;&amp; inode-&gt;i_size &lt; i_block_size(inode)))</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags |= i_pack_on_close_mask;</div><div class='del'>-</div><div class='del'>-	/* set the key of the first byte in the 'block'-th block of file */</div><div class='del'>-	make_cpu_key(&amp;key, inode, new_offset, TYPE_ANY, 3 /*key length */ );</div><div class='del'>-	if ((new_offset + inode-&gt;i_sb-&gt;s_blocksize - 1) &gt; inode-&gt;i_size) {</div><div class='del'>-start_trans:</div><div class='del'>-		th = reiserfs_persistent_transaction(inode-&gt;i_sb, jbegin_count);</div><div class='del'>-		if (!th) {</div><div class='del'>-			retval = -ENOMEM;</div><div class='del'>-			goto failure;</div><div class='del'>-		}</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-	}</div><div class='del'>-research:</div><div class='del'>-</div><div class='del'>-	retval = search_for_position_by_key(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bh = get_last_bh(&amp;path);</div><div class='del'>-	ih = tp_item_head(&amp;path);</div><div class='del'>-	item = tp_item_body(&amp;path);</div><div class='del'>-	pos_in_item = path.pos_in_item;</div><div class='del'>-</div><div class='del'>-	fs_gen = get_generation(inode-&gt;i_sb);</div><div class='del'>-	copy_item_head(&amp;tmp_ih, ih);</div><div class='del'>-</div><div class='del'>-	if (allocation_needed</div><div class='del'>-	    (retval, allocated_block_nr, ih, item, pos_in_item)) {</div><div class='del'>-		/* we have to allocate block for the unformatted node */</div><div class='del'>-		if (!th) {</div><div class='del'>-			pathrelse(&amp;path);</div><div class='del'>-			goto start_trans;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		repeat =</div><div class='del'>-		    _allocate_block(th, block, inode, &amp;allocated_block_nr,</div><div class='del'>-				    &amp;path, create);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * restart the transaction to give the journal a chance to free</div><div class='del'>-		 * some blocks.  releases the path, so we have to go back to</div><div class='del'>-		 * research if we succeed on the second try</div><div class='del'>-		 */</div><div class='del'>-		if (repeat == NO_DISK_SPACE || repeat == QUOTA_EXCEEDED) {</div><div class='del'>-			SB_JOURNAL(inode-&gt;i_sb)-&gt;j_next_async_flush = 1;</div><div class='del'>-			retval = restart_transaction(th, inode, &amp;path);</div><div class='del'>-			if (retval)</div><div class='del'>-				goto failure;</div><div class='del'>-			repeat =</div><div class='del'>-			    _allocate_block(th, block, inode,</div><div class='del'>-					    &amp;allocated_block_nr, NULL, create);</div><div class='del'>-</div><div class='del'>-			if (repeat != NO_DISK_SPACE &amp;&amp; repeat != QUOTA_EXCEEDED) {</div><div class='del'>-				goto research;</div><div class='del'>-			}</div><div class='del'>-			if (repeat == QUOTA_EXCEEDED)</div><div class='del'>-				retval = -EDQUOT;</div><div class='del'>-			else</div><div class='del'>-				retval = -ENOSPC;</div><div class='del'>-			goto failure;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fs_changed(fs_gen, inode-&gt;i_sb)</div><div class='del'>-		    &amp;&amp; item_moved(&amp;tmp_ih, &amp;path)) {</div><div class='del'>-			goto research;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (indirect_item_found(retval, ih)) {</div><div class='del'>-		b_blocknr_t unfm_ptr;</div><div class='del'>-		/*</div><div class='del'>-		 * 'block'-th block is in the file already (there is</div><div class='del'>-		 * corresponding cell in some indirect item). But it may be</div><div class='del'>-		 * zero unformatted node pointer (hole)</div><div class='del'>-		 */</div><div class='del'>-		unfm_ptr = get_block_num(item, pos_in_item);</div><div class='del'>-		if (unfm_ptr == 0) {</div><div class='del'>-			/* use allocated block to plug the hole */</div><div class='del'>-			reiserfs_prepare_for_journal(inode-&gt;i_sb, bh, 1);</div><div class='del'>-			if (fs_changed(fs_gen, inode-&gt;i_sb)</div><div class='del'>-			    &amp;&amp; item_moved(&amp;tmp_ih, &amp;path)) {</div><div class='del'>-				reiserfs_restore_prepared_buffer(inode-&gt;i_sb,</div><div class='del'>-								 bh);</div><div class='del'>-				goto research;</div><div class='del'>-			}</div><div class='del'>-			set_buffer_new(bh_result);</div><div class='del'>-			if (buffer_dirty(bh_result)</div><div class='del'>-			    &amp;&amp; reiserfs_data_ordered(inode-&gt;i_sb))</div><div class='del'>-				reiserfs_add_ordered_list(inode, bh_result);</div><div class='del'>-			put_block_num(item, pos_in_item, allocated_block_nr);</div><div class='del'>-			unfm_ptr = allocated_block_nr;</div><div class='del'>-			journal_mark_dirty(th, bh);</div><div class='del'>-			reiserfs_update_sd(th, inode);</div><div class='del'>-		}</div><div class='del'>-		set_block_dev_mapped(bh_result, unfm_ptr, inode);</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		retval = 0;</div><div class='del'>-		if (!dangle &amp;&amp; th)</div><div class='del'>-			retval = reiserfs_end_persistent_transaction(th);</div><div class='del'>-</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * the item was found, so new blocks were not added to the file</div><div class='del'>-		 * there is no need to make sure the inode is updated with this</div><div class='del'>-		 * transaction</div><div class='del'>-		 */</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!th) {</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		goto start_trans;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * desired position is not found or is in the direct item. We have</div><div class='del'>-	 * to append file with holes up to 'block'-th block converting</div><div class='del'>-	 * direct items to indirect one if necessary</div><div class='del'>-	 */</div><div class='del'>-	done = 0;</div><div class='del'>-	do {</div><div class='del'>-		if (is_statdata_le_ih(ih)) {</div><div class='del'>-			__le32 unp = 0;</div><div class='del'>-			struct cpu_key tmp_key;</div><div class='del'>-</div><div class='del'>-			/* indirect item has to be inserted */</div><div class='del'>-			make_le_item_head(&amp;tmp_ih, &amp;key, version, 1,</div><div class='del'>-					  TYPE_INDIRECT, UNFM_P_SIZE,</div><div class='del'>-					  0 /* free_space */ );</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * we are going to add 'block'-th block to the file.</div><div class='del'>-			 * Use allocated block for that</div><div class='del'>-			 */</div><div class='del'>-			if (cpu_key_k_offset(&amp;key) == 1) {</div><div class='del'>-				unp = cpu_to_le32(allocated_block_nr);</div><div class='del'>-				set_block_dev_mapped(bh_result,</div><div class='del'>-						     allocated_block_nr, inode);</div><div class='del'>-				set_buffer_new(bh_result);</div><div class='del'>-				done = 1;</div><div class='del'>-			}</div><div class='del'>-			tmp_key = key;	/* ;) */</div><div class='del'>-			set_cpu_key_k_offset(&amp;tmp_key, 1);</div><div class='del'>-			PATH_LAST_POSITION(&amp;path)++;</div><div class='del'>-</div><div class='del'>-			retval =</div><div class='del'>-			    reiserfs_insert_item(th, &amp;path, &amp;tmp_key, &amp;tmp_ih,</div><div class='del'>-						 inode, (char *)&amp;unp);</div><div class='del'>-			if (retval) {</div><div class='del'>-				reiserfs_free_block(th, inode,</div><div class='del'>-						    allocated_block_nr, 1);</div><div class='del'>-				/*</div><div class='del'>-				 * retval == -ENOSPC, -EDQUOT or -EIO</div><div class='del'>-				 * or -EEXIST</div><div class='del'>-				 */</div><div class='del'>-				goto failure;</div><div class='del'>-			}</div><div class='del'>-		} else if (is_direct_le_ih(ih)) {</div><div class='del'>-			/* direct item has to be converted */</div><div class='del'>-			loff_t tail_offset;</div><div class='del'>-</div><div class='del'>-			tail_offset =</div><div class='del'>-			    ((le_ih_k_offset(ih) -</div><div class='del'>-			      1) &amp; ~(inode-&gt;i_sb-&gt;s_blocksize - 1)) + 1;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * direct item we just found fits into block we have</div><div class='del'>-			 * to map. Convert it into unformatted node: use</div><div class='del'>-			 * bh_result for the conversion</div><div class='del'>-			 */</div><div class='del'>-			if (tail_offset == cpu_key_k_offset(&amp;key)) {</div><div class='del'>-				set_block_dev_mapped(bh_result,</div><div class='del'>-						     allocated_block_nr, inode);</div><div class='del'>-				unbh = bh_result;</div><div class='del'>-				done = 1;</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * we have to pad file tail stored in direct</div><div class='del'>-				 * item(s) up to block size and convert it</div><div class='del'>-				 * to unformatted node. FIXME: this should</div><div class='del'>-				 * also get into page cache</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				pathrelse(&amp;path);</div><div class='del'>-				/*</div><div class='del'>-				 * ugly, but we can only end the transaction if</div><div class='del'>-				 * we aren't nested</div><div class='del'>-				 */</div><div class='del'>-				BUG_ON(!th-&gt;t_refcount);</div><div class='del'>-				if (th-&gt;t_refcount == 1) {</div><div class='del'>-					retval =</div><div class='del'>-					    reiserfs_end_persistent_transaction</div><div class='del'>-					    (th);</div><div class='del'>-					th = NULL;</div><div class='del'>-					if (retval)</div><div class='del'>-						goto failure;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				retval =</div><div class='del'>-				    convert_tail_for_hole(inode, bh_result,</div><div class='del'>-							  tail_offset);</div><div class='del'>-				if (retval) {</div><div class='del'>-					if (retval != -ENOSPC)</div><div class='del'>-						reiserfs_error(inode-&gt;i_sb,</div><div class='del'>-							"clm-6004",</div><div class='del'>-							"convert tail failed "</div><div class='del'>-							"inode %lu, error %d",</div><div class='del'>-							inode-&gt;i_ino,</div><div class='del'>-							retval);</div><div class='del'>-					if (allocated_block_nr) {</div><div class='del'>-						/*</div><div class='del'>-						 * the bitmap, the super,</div><div class='del'>-						 * and the stat data == 3</div><div class='del'>-						 */</div><div class='del'>-						if (!th)</div><div class='del'>-							th = reiserfs_persistent_transaction(inode-&gt;i_sb, 3);</div><div class='del'>-						if (th)</div><div class='del'>-							reiserfs_free_block(th,</div><div class='del'>-									    inode,</div><div class='del'>-									    allocated_block_nr,</div><div class='del'>-									    1);</div><div class='del'>-					}</div><div class='del'>-					goto failure;</div><div class='del'>-				}</div><div class='del'>-				goto research;</div><div class='del'>-			}</div><div class='del'>-			retval =</div><div class='del'>-			    direct2indirect(th, inode, &amp;path, unbh,</div><div class='del'>-					    tail_offset);</div><div class='del'>-			if (retval) {</div><div class='del'>-				reiserfs_unmap_buffer(unbh);</div><div class='del'>-				reiserfs_free_block(th, inode,</div><div class='del'>-						    allocated_block_nr, 1);</div><div class='del'>-				goto failure;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * it is important the set_buffer_uptodate is done</div><div class='del'>-			 * after the direct2indirect.  The buffer might</div><div class='del'>-			 * contain valid data newer than the data on disk</div><div class='del'>-			 * (read by read_folio, changed, and then sent here by</div><div class='del'>-			 * writepage).  direct2indirect needs to know if unbh</div><div class='del'>-			 * was already up to date, so it can decide if the</div><div class='del'>-			 * data in unbh needs to be replaced with data from</div><div class='del'>-			 * the disk</div><div class='del'>-			 */</div><div class='del'>-			set_buffer_uptodate(unbh);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * unbh-&gt;b_page == NULL in case of DIRECT_IO request,</div><div class='del'>-			 * this means buffer will disappear shortly, so it</div><div class='del'>-			 * should not be added to</div><div class='del'>-			 */</div><div class='del'>-			if (unbh-&gt;b_page) {</div><div class='del'>-				/*</div><div class='del'>-				 * we've converted the tail, so we must</div><div class='del'>-				 * flush unbh before the transaction commits</div><div class='del'>-				 */</div><div class='del'>-				reiserfs_add_tail_list(inode, unbh);</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * mark it dirty now to prevent commit_write</div><div class='del'>-				 * from adding this buffer to the inode's</div><div class='del'>-				 * dirty buffer list</div><div class='del'>-				 */</div><div class='del'>-				/*</div><div class='del'>-				 * AKPM: changed __mark_buffer_dirty to</div><div class='del'>-				 * mark_buffer_dirty().  It's still atomic,</div><div class='del'>-				 * but it sets the page dirty too, which makes</div><div class='del'>-				 * it eligible for writeback at any time by the</div><div class='del'>-				 * VM (which was also the case with</div><div class='del'>-				 * __mark_buffer_dirty())</div><div class='del'>-				 */</div><div class='del'>-				mark_buffer_dirty(unbh);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * append indirect item with holes if needed, when</div><div class='del'>-			 * appending pointer to 'block'-th block use block,</div><div class='del'>-			 * which is already allocated</div><div class='del'>-			 */</div><div class='del'>-			struct cpu_key tmp_key;</div><div class='del'>-			/*</div><div class='del'>-			 * We use this in case we need to allocate</div><div class='del'>-			 * only one block which is a fastpath</div><div class='del'>-			 */</div><div class='del'>-			unp_t unf_single = 0;</div><div class='del'>-			unp_t *un;</div><div class='del'>-			__u64 max_to_insert =</div><div class='del'>-			    MAX_ITEM_LEN(inode-&gt;i_sb-&gt;s_blocksize) /</div><div class='del'>-			    UNFM_P_SIZE;</div><div class='del'>-			__u64 blocks_needed;</div><div class='del'>-</div><div class='del'>-			RFALSE(pos_in_item != ih_item_len(ih) / UNFM_P_SIZE,</div><div class='del'>-			       "vs-804: invalid position for append");</div><div class='del'>-			/*</div><div class='del'>-			 * indirect item has to be appended,</div><div class='del'>-			 * set up key of that position</div><div class='del'>-			 * (key type is unimportant)</div><div class='del'>-			 */</div><div class='del'>-			make_cpu_key(&amp;tmp_key, inode,</div><div class='del'>-				     le_key_k_offset(version,</div><div class='del'>-						     &amp;ih-&gt;ih_key) +</div><div class='del'>-				     op_bytes_number(ih,</div><div class='del'>-						     inode-&gt;i_sb-&gt;s_blocksize),</div><div class='del'>-				     TYPE_INDIRECT, 3);</div><div class='del'>-</div><div class='del'>-			RFALSE(cpu_key_k_offset(&amp;tmp_key) &gt; cpu_key_k_offset(&amp;key),</div><div class='del'>-			       "green-805: invalid offset");</div><div class='del'>-			blocks_needed =</div><div class='del'>-			    1 +</div><div class='del'>-			    ((cpu_key_k_offset(&amp;key) -</div><div class='del'>-			      cpu_key_k_offset(&amp;tmp_key)) &gt;&gt; inode-&gt;i_sb-&gt;</div><div class='del'>-			     s_blocksize_bits);</div><div class='del'>-</div><div class='del'>-			if (blocks_needed == 1) {</div><div class='del'>-				un = &amp;unf_single;</div><div class='del'>-			} else {</div><div class='del'>-				un = kcalloc(min(blocks_needed, max_to_insert),</div><div class='del'>-					     UNFM_P_SIZE, GFP_NOFS);</div><div class='del'>-				if (!un) {</div><div class='del'>-					un = &amp;unf_single;</div><div class='del'>-					blocks_needed = 1;</div><div class='del'>-					max_to_insert = 0;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (blocks_needed &lt;= max_to_insert) {</div><div class='del'>-				/*</div><div class='del'>-				 * we are going to add target block to</div><div class='del'>-				 * the file. Use allocated block for that</div><div class='del'>-				 */</div><div class='del'>-				un[blocks_needed - 1] =</div><div class='del'>-				    cpu_to_le32(allocated_block_nr);</div><div class='del'>-				set_block_dev_mapped(bh_result,</div><div class='del'>-						     allocated_block_nr, inode);</div><div class='del'>-				set_buffer_new(bh_result);</div><div class='del'>-				done = 1;</div><div class='del'>-			} else {</div><div class='del'>-				/* paste hole to the indirect item */</div><div class='del'>-				/*</div><div class='del'>-				 * If kcalloc failed, max_to_insert becomes</div><div class='del'>-				 * zero and it means we only have space for</div><div class='del'>-				 * one block</div><div class='del'>-				 */</div><div class='del'>-				blocks_needed =</div><div class='del'>-				    max_to_insert ? max_to_insert : 1;</div><div class='del'>-			}</div><div class='del'>-			retval =</div><div class='del'>-			    reiserfs_paste_into_item(th, &amp;path, &amp;tmp_key, inode,</div><div class='del'>-						     (char *)un,</div><div class='del'>-						     UNFM_P_SIZE *</div><div class='del'>-						     blocks_needed);</div><div class='del'>-</div><div class='del'>-			if (blocks_needed != 1)</div><div class='del'>-				kfree(un);</div><div class='del'>-</div><div class='del'>-			if (retval) {</div><div class='del'>-				reiserfs_free_block(th, inode,</div><div class='del'>-						    allocated_block_nr, 1);</div><div class='del'>-				goto failure;</div><div class='del'>-			}</div><div class='del'>-			if (!done) {</div><div class='del'>-				/*</div><div class='del'>-				 * We need to mark new file size in case</div><div class='del'>-				 * this function will be interrupted/aborted</div><div class='del'>-				 * later on. And we may do this only for</div><div class='del'>-				 * holes.</div><div class='del'>-				 */</div><div class='del'>-				inode-&gt;i_size +=</div><div class='del'>-				    inode-&gt;i_sb-&gt;s_blocksize * blocks_needed;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (done == 1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * this loop could log more blocks than we had originally</div><div class='del'>-		 * asked for.  So, we have to allow the transaction to end</div><div class='del'>-		 * if it is too big or too full.  Update the inode so things</div><div class='del'>-		 * are consistent if we crash before the function returns</div><div class='del'>-		 * release the path so that anybody waiting on the path before</div><div class='del'>-		 * ending their transaction will be able to continue.</div><div class='del'>-		 */</div><div class='del'>-		if (journal_transaction_should_end(th, th-&gt;t_blocks_allocated)) {</div><div class='del'>-			retval = restart_transaction(th, inode, &amp;path);</div><div class='del'>-			if (retval)</div><div class='del'>-				goto failure;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * inserting indirect pointers for a hole can take a</div><div class='del'>-		 * long time.  reschedule if needed and also release the write</div><div class='del'>-		 * lock for others.</div><div class='del'>-		 */</div><div class='del'>-		reiserfs_cond_resched(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		retval = search_for_position_by_key(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			retval = -EIO;</div><div class='del'>-			goto failure;</div><div class='del'>-		}</div><div class='del'>-		if (retval == POSITION_FOUND) {</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "vs-825",</div><div class='del'>-					 "%K should not be found", &amp;key);</div><div class='del'>-			retval = -EEXIST;</div><div class='del'>-			if (allocated_block_nr)</div><div class='del'>-				reiserfs_free_block(th, inode,</div><div class='del'>-						    allocated_block_nr, 1);</div><div class='del'>-			pathrelse(&amp;path);</div><div class='del'>-			goto failure;</div><div class='del'>-		}</div><div class='del'>-		bh = get_last_bh(&amp;path);</div><div class='del'>-		ih = tp_item_head(&amp;path);</div><div class='del'>-		item = tp_item_body(&amp;path);</div><div class='del'>-		pos_in_item = path.pos_in_item;</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	retval = 0;</div><div class='del'>-</div><div class='del'>-failure:</div><div class='del'>-	if (th &amp;&amp; (!dangle || (retval &amp;&amp; !th-&gt;t_trans_id))) {</div><div class='del'>-		int err;</div><div class='del'>-		if (th-&gt;t_trans_id)</div><div class='del'>-			reiserfs_update_sd(th, inode);</div><div class='del'>-		err = reiserfs_end_persistent_transaction(th);</div><div class='del'>-		if (err)</div><div class='del'>-			retval = err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	reiserfs_check_path(&amp;path);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reiserfs_readahead(struct readahead_control *rac)</div><div class='del'>-{</div><div class='del'>-	mpage_readahead(rac, reiserfs_get_block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compute real number of used bytes by file</div><div class='del'>- * Following three functions can go away when we'll have enough space in</div><div class='del'>- * stat item</div><div class='del'>- */</div><div class='del'>-static int real_space_diff(struct inode *inode, int sd_size)</div><div class='del'>-{</div><div class='del'>-	int bytes;</div><div class='del'>-	loff_t blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-	if (S_ISLNK(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		return sd_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * End of file is also in full block with indirect reference, so round</div><div class='del'>-	 * up to the next block.</div><div class='del'>-	 *</div><div class='del'>-	 * there is just no way to know if the tail is actually packed</div><div class='del'>-	 * on the file, so we have to assume it isn't.  When we pack the</div><div class='del'>-	 * tail, we add 4 bytes to pretend there really is an unformatted</div><div class='del'>-	 * node pointer</div><div class='del'>-	 */</div><div class='del'>-	bytes =</div><div class='del'>-	    ((inode-&gt;i_size +</div><div class='del'>-	      (blocksize - 1)) &gt;&gt; inode-&gt;i_sb-&gt;s_blocksize_bits) * UNFM_P_SIZE +</div><div class='del'>-	    sd_size;</div><div class='del'>-	return bytes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t to_real_used_space(struct inode *inode, ulong blocks,</div><div class='del'>-					int sd_size)</div><div class='del'>-{</div><div class='del'>-	if (S_ISLNK(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-		return inode-&gt;i_size +</div><div class='del'>-		    (loff_t) (real_space_diff(inode, sd_size));</div><div class='del'>-	}</div><div class='del'>-	return ((loff_t) real_space_diff(inode, sd_size)) +</div><div class='del'>-	    (((loff_t) blocks) &lt;&lt; 9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compute number of blocks used by file in ReiserFS counting */</div><div class='del'>-static inline ulong to_fake_used_blocks(struct inode *inode, int sd_size)</div><div class='del'>-{</div><div class='del'>-	loff_t bytes = inode_get_bytes(inode);</div><div class='del'>-	loff_t real_space = real_space_diff(inode, sd_size);</div><div class='del'>-</div><div class='del'>-	/* keeps fsck and non-quota versions of reiserfs happy */</div><div class='del'>-	if (S_ISLNK(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-		bytes += (loff_t) 511;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * files from before the quota patch might i_blocks such that</div><div class='del'>-	 * bytes &lt; real_space.  Deal with that here to prevent it from</div><div class='del'>-	 * going negative.</div><div class='del'>-	 */</div><div class='del'>-	if (bytes &lt; real_space)</div><div class='del'>-		return 0;</div><div class='del'>-	return (bytes - real_space) &gt;&gt; 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BAD: new directories have stat data of new type and all other items</div><div class='del'>- * of old type. Version stored in the inode says about body items, so</div><div class='del'>- * in update_stat_data we can not rely on inode, but have to check</div><div class='del'>- * item version directly</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* called by read_locked_inode */</div><div class='del'>-static void init_inode(struct inode *inode, struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	__u32 rdev;</div><div class='del'>-</div><div class='del'>-	bh = PATH_PLAST_BUFFER(path);</div><div class='del'>-	ih = tp_item_head(path);</div><div class='del'>-</div><div class='del'>-	copy_key(INODE_PKEY(inode), &amp;ih-&gt;ih_key);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;REISERFS_I(inode)-&gt;i_prealloc_list);</div><div class='del'>-	REISERFS_I(inode)-&gt;i_flags = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_prealloc_block = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_prealloc_count = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_trans_id = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_jl = NULL;</div><div class='del'>-	reiserfs_init_xattr_rwsem(inode);</div><div class='del'>-</div><div class='del'>-	if (stat_data_v1(ih)) {</div><div class='del'>-		struct stat_data_v1 *sd =</div><div class='del'>-		    (struct stat_data_v1 *)ih_item_body(bh, ih);</div><div class='del'>-		unsigned long blocks;</div><div class='del'>-</div><div class='del'>-		set_inode_item_key_version(inode, KEY_FORMAT_3_5);</div><div class='del'>-		set_inode_sd_version(inode, STAT_DATA_V1);</div><div class='del'>-		inode-&gt;i_mode = sd_v1_mode(sd);</div><div class='del'>-		set_nlink(inode, sd_v1_nlink(sd));</div><div class='del'>-		i_uid_write(inode, sd_v1_uid(sd));</div><div class='del'>-		i_gid_write(inode, sd_v1_gid(sd));</div><div class='del'>-		inode-&gt;i_size = sd_v1_size(sd);</div><div class='del'>-		inode_set_atime(inode, sd_v1_atime(sd), 0);</div><div class='del'>-		inode_set_mtime(inode, sd_v1_mtime(sd), 0);</div><div class='del'>-		inode_set_ctime(inode, sd_v1_ctime(sd), 0);</div><div class='del'>-</div><div class='del'>-		inode-&gt;i_blocks = sd_v1_blocks(sd);</div><div class='del'>-		inode-&gt;i_generation = le32_to_cpu(INODE_PKEY(inode)-&gt;k_dir_id);</div><div class='del'>-		blocks = (inode-&gt;i_size + 511) &gt;&gt; 9;</div><div class='del'>-		blocks = _ROUND_UP(blocks, inode-&gt;i_sb-&gt;s_blocksize &gt;&gt; 9);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * there was a bug in &lt;=3.5.23 when i_blocks could take</div><div class='del'>-		 * negative values. Starting from 3.5.17 this value could</div><div class='del'>-		 * even be stored in stat data. For such files we set</div><div class='del'>-		 * i_blocks based on file size. Just 2 notes: this can be</div><div class='del'>-		 * wrong for sparse files. On-disk value will be only</div><div class='del'>-		 * updated if file's inode will ever change</div><div class='del'>-		 */</div><div class='del'>-		if (inode-&gt;i_blocks &gt; blocks) {</div><div class='del'>-			inode-&gt;i_blocks = blocks;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		rdev = sd_v1_rdev(sd);</div><div class='del'>-		REISERFS_I(inode)-&gt;i_first_direct_byte =</div><div class='del'>-		    sd_v1_first_direct_byte(sd);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * an early bug in the quota code can give us an odd</div><div class='del'>-		 * number for the block count.  This is incorrect, fix it here.</div><div class='del'>-		 */</div><div class='del'>-		if (inode-&gt;i_blocks &amp; 1) {</div><div class='del'>-			inode-&gt;i_blocks++;</div><div class='del'>-		}</div><div class='del'>-		inode_set_bytes(inode,</div><div class='del'>-				to_real_used_space(inode, inode-&gt;i_blocks,</div><div class='del'>-						   SD_V1_SIZE));</div><div class='del'>-		/*</div><div class='del'>-		 * nopack is initially zero for v1 objects. For v2 objects,</div><div class='del'>-		 * nopack is initialised from sd_attrs</div><div class='del'>-		 */</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags &amp;= ~i_nopack_mask;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * new stat data found, but object may have old items</div><div class='del'>-		 * (directories and symlinks)</div><div class='del'>-		 */</div><div class='del'>-		struct stat_data *sd = (struct stat_data *)ih_item_body(bh, ih);</div><div class='del'>-</div><div class='del'>-		inode-&gt;i_mode = sd_v2_mode(sd);</div><div class='del'>-		set_nlink(inode, sd_v2_nlink(sd));</div><div class='del'>-		i_uid_write(inode, sd_v2_uid(sd));</div><div class='del'>-		inode-&gt;i_size = sd_v2_size(sd);</div><div class='del'>-		i_gid_write(inode, sd_v2_gid(sd));</div><div class='del'>-		inode_set_mtime(inode, sd_v2_mtime(sd), 0);</div><div class='del'>-		inode_set_atime(inode, sd_v2_atime(sd), 0);</div><div class='del'>-		inode_set_ctime(inode, sd_v2_ctime(sd), 0);</div><div class='del'>-		inode-&gt;i_blocks = sd_v2_blocks(sd);</div><div class='del'>-		rdev = sd_v2_rdev(sd);</div><div class='del'>-		if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode))</div><div class='del'>-			inode-&gt;i_generation =</div><div class='del'>-			    le32_to_cpu(INODE_PKEY(inode)-&gt;k_dir_id);</div><div class='del'>-		else</div><div class='del'>-			inode-&gt;i_generation = sd_v2_generation(sd);</div><div class='del'>-</div><div class='del'>-		if (S_ISDIR(inode-&gt;i_mode) || S_ISLNK(inode-&gt;i_mode))</div><div class='del'>-			set_inode_item_key_version(inode, KEY_FORMAT_3_5);</div><div class='del'>-		else</div><div class='del'>-			set_inode_item_key_version(inode, KEY_FORMAT_3_6);</div><div class='del'>-		REISERFS_I(inode)-&gt;i_first_direct_byte = 0;</div><div class='del'>-		set_inode_sd_version(inode, STAT_DATA_V2);</div><div class='del'>-		inode_set_bytes(inode,</div><div class='del'>-				to_real_used_space(inode, inode-&gt;i_blocks,</div><div class='del'>-						   SD_V2_SIZE));</div><div class='del'>-		/*</div><div class='del'>-		 * read persistent inode attributes from sd and initialise</div><div class='del'>-		 * generic inode flags from them</div><div class='del'>-		 */</div><div class='del'>-		REISERFS_I(inode)-&gt;i_attrs = sd_v2_attrs(sd);</div><div class='del'>-		sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pathrelse(path);</div><div class='del'>-	if (S_ISREG(inode-&gt;i_mode)) {</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_file_inode_operations;</div><div class='del'>-		inode-&gt;i_fop = &amp;reiserfs_file_operations;</div><div class='del'>-		inode-&gt;i_mapping-&gt;a_ops = &amp;reiserfs_address_space_operations;</div><div class='del'>-	} else if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_dir_inode_operations;</div><div class='del'>-		inode-&gt;i_fop = &amp;reiserfs_dir_operations;</div><div class='del'>-	} else if (S_ISLNK(inode-&gt;i_mode)) {</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_symlink_inode_operations;</div><div class='del'>-		inode_nohighmem(inode);</div><div class='del'>-		inode-&gt;i_mapping-&gt;a_ops = &amp;reiserfs_address_space_operations;</div><div class='del'>-	} else {</div><div class='del'>-		inode-&gt;i_blocks = 0;</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_special_inode_operations;</div><div class='del'>-		init_special_inode(inode, inode-&gt;i_mode, new_decode_dev(rdev));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* update new stat data with inode fields */</div><div class='del'>-static void inode2sd(void *sd, struct inode *inode, loff_t size)</div><div class='del'>-{</div><div class='del'>-	struct stat_data *sd_v2 = (struct stat_data *)sd;</div><div class='del'>-</div><div class='del'>-	set_sd_v2_mode(sd_v2, inode-&gt;i_mode);</div><div class='del'>-	set_sd_v2_nlink(sd_v2, inode-&gt;i_nlink);</div><div class='del'>-	set_sd_v2_uid(sd_v2, i_uid_read(inode));</div><div class='del'>-	set_sd_v2_size(sd_v2, size);</div><div class='del'>-	set_sd_v2_gid(sd_v2, i_gid_read(inode));</div><div class='del'>-	set_sd_v2_mtime(sd_v2, inode_get_mtime_sec(inode));</div><div class='del'>-	set_sd_v2_atime(sd_v2, inode_get_atime_sec(inode));</div><div class='del'>-	set_sd_v2_ctime(sd_v2, inode_get_ctime_sec(inode));</div><div class='del'>-	set_sd_v2_blocks(sd_v2, to_fake_used_blocks(inode, SD_V2_SIZE));</div><div class='del'>-	if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode))</div><div class='del'>-		set_sd_v2_rdev(sd_v2, new_encode_dev(inode-&gt;i_rdev));</div><div class='del'>-	else</div><div class='del'>-		set_sd_v2_generation(sd_v2, inode-&gt;i_generation);</div><div class='del'>-	set_sd_v2_attrs(sd_v2, REISERFS_I(inode)-&gt;i_attrs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used to copy inode's fields to old stat data */</div><div class='del'>-static void inode2sd_v1(void *sd, struct inode *inode, loff_t size)</div><div class='del'>-{</div><div class='del'>-	struct stat_data_v1 *sd_v1 = (struct stat_data_v1 *)sd;</div><div class='del'>-</div><div class='del'>-	set_sd_v1_mode(sd_v1, inode-&gt;i_mode);</div><div class='del'>-	set_sd_v1_uid(sd_v1, i_uid_read(inode));</div><div class='del'>-	set_sd_v1_gid(sd_v1, i_gid_read(inode));</div><div class='del'>-	set_sd_v1_nlink(sd_v1, inode-&gt;i_nlink);</div><div class='del'>-	set_sd_v1_size(sd_v1, size);</div><div class='del'>-	set_sd_v1_atime(sd_v1, inode_get_atime_sec(inode));</div><div class='del'>-	set_sd_v1_ctime(sd_v1, inode_get_ctime_sec(inode));</div><div class='del'>-	set_sd_v1_mtime(sd_v1, inode_get_mtime_sec(inode));</div><div class='del'>-</div><div class='del'>-	if (S_ISCHR(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode))</div><div class='del'>-		set_sd_v1_rdev(sd_v1, new_encode_dev(inode-&gt;i_rdev));</div><div class='del'>-	else</div><div class='del'>-		set_sd_v1_blocks(sd_v1, to_fake_used_blocks(inode, SD_V1_SIZE));</div><div class='del'>-</div><div class='del'>-	/* Sigh. i_first_direct_byte is back */</div><div class='del'>-	set_sd_v1_first_direct_byte(sd_v1,</div><div class='del'>-				    REISERFS_I(inode)-&gt;i_first_direct_byte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOTE, you must prepare the buffer head before sending it here,</div><div class='del'>- * and then log it after the call</div><div class='del'>- */</div><div class='del'>-static void update_stat_data(struct treepath *path, struct inode *inode,</div><div class='del'>-			     loff_t size)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-</div><div class='del'>-	bh = PATH_PLAST_BUFFER(path);</div><div class='del'>-	ih = tp_item_head(path);</div><div class='del'>-</div><div class='del'>-	if (!is_statdata_le_ih(ih))</div><div class='del'>-		reiserfs_panic(inode-&gt;i_sb, "vs-13065", "key %k, found item %h",</div><div class='del'>-			       INODE_PKEY(inode), ih);</div><div class='del'>-</div><div class='del'>-	/* path points to old stat data */</div><div class='del'>-	if (stat_data_v1(ih)) {</div><div class='del'>-		inode2sd_v1(ih_item_body(bh, ih), inode, size);</div><div class='del'>-	} else {</div><div class='del'>-		inode2sd(ih_item_body(bh, ih), inode, size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     struct inode *inode, loff_t size)</div><div class='del'>-{</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int fs_gen;</div><div class='del'>-	struct item_head *ih, tmp_ih;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	/* key type is unimportant */</div><div class='del'>-	make_cpu_key(&amp;key, inode, SD_OFFSET, TYPE_STAT_DATA, 3);</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		int pos;</div><div class='del'>-		/* look for the object's stat data */</div><div class='del'>-		retval = search_item(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			reiserfs_error(inode-&gt;i_sb, "vs-13050",</div><div class='del'>-				       "i/o failure occurred trying to "</div><div class='del'>-				       "update %K stat data", &amp;key);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (retval == ITEM_NOT_FOUND) {</div><div class='del'>-			pos = PATH_LAST_POSITION(&amp;path);</div><div class='del'>-			pathrelse(&amp;path);</div><div class='del'>-			if (inode-&gt;i_nlink == 0) {</div><div class='del'>-				/*reiserfs_warning (inode-&gt;i_sb, "vs-13050: reiserfs_update_sd: i_nlink == 0, stat data not found"); */</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "vs-13060",</div><div class='del'>-					 "stat data of object %k (nlink == %d) "</div><div class='del'>-					 "not found (pos %d)",</div><div class='del'>-					 INODE_PKEY(inode), inode-&gt;i_nlink,</div><div class='del'>-					 pos);</div><div class='del'>-			reiserfs_check_path(&amp;path);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * sigh, prepare_for_journal might schedule.  When it</div><div class='del'>-		 * schedules the FS might change.  We have to detect that,</div><div class='del'>-		 * and loop back to the search if the stat data item has moved</div><div class='del'>-		 */</div><div class='del'>-		bh = get_last_bh(&amp;path);</div><div class='del'>-		ih = tp_item_head(&amp;path);</div><div class='del'>-		copy_item_head(&amp;tmp_ih, ih);</div><div class='del'>-		fs_gen = get_generation(inode-&gt;i_sb);</div><div class='del'>-		reiserfs_prepare_for_journal(inode-&gt;i_sb, bh, 1);</div><div class='del'>-</div><div class='del'>-		/* Stat_data item has been moved after scheduling. */</div><div class='del'>-		if (fs_changed(fs_gen, inode-&gt;i_sb)</div><div class='del'>-		    &amp;&amp; item_moved(&amp;tmp_ih, &amp;path)) {</div><div class='del'>-			reiserfs_restore_prepared_buffer(inode-&gt;i_sb, bh);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	update_stat_data(&amp;path, inode, size);</div><div class='del'>-	journal_mark_dirty(th, bh);</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * reiserfs_read_locked_inode is called to read the inode off disk, and it</div><div class='del'>- * does a make_bad_inode when things go wrong.  But, we need to make sure</div><div class='del'>- * and clear the key in the private portion of the inode, otherwise a</div><div class='del'>- * corresponding iput might try to delete whatever object the inode last</div><div class='del'>- * represented.</div><div class='del'>- */</div><div class='del'>-static void reiserfs_make_bad_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	memset(INODE_PKEY(inode), 0, KEY_SIZE);</div><div class='del'>-	make_bad_inode(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initially this function was derived from minix or ext2's analog and</div><div class='del'>- * evolved as the prototype did</div><div class='del'>- */</div><div class='del'>-int reiserfs_init_locked_inode(struct inode *inode, void *p)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_iget_args *args = (struct reiserfs_iget_args *)p;</div><div class='del'>-	inode-&gt;i_ino = args-&gt;objectid;</div><div class='del'>-	INODE_PKEY(inode)-&gt;k_dir_id = cpu_to_le32(args-&gt;dirid);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * looks for stat data in the tree, and fills up the fields of in-core</div><div class='del'>- * inode stat data fields</div><div class='del'>- */</div><div class='del'>-void reiserfs_read_locked_inode(struct inode *inode,</div><div class='del'>-				struct reiserfs_iget_args *args)</div><div class='del'>-{</div><div class='del'>-	INITIALIZE_PATH(path_to_sd);</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	unsigned long dirino;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	dirino = args-&gt;dirid;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set version 1, version 2 could be used too, because stat data</div><div class='del'>-	 * key is the same in both versions</div><div class='del'>-	 */</div><div class='del'>-	_make_cpu_key(&amp;key, KEY_FORMAT_3_5, dirino, inode-&gt;i_ino, 0, 0, 3);</div><div class='del'>-</div><div class='del'>-	/* look for the object's stat data */</div><div class='del'>-	retval = search_item(inode-&gt;i_sb, &amp;key, &amp;path_to_sd);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		reiserfs_error(inode-&gt;i_sb, "vs-13070",</div><div class='del'>-			       "i/o failure occurred trying to find "</div><div class='del'>-			       "stat data of %K", &amp;key);</div><div class='del'>-		reiserfs_make_bad_inode(inode);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* a stale NFS handle can trigger this without it being an error */</div><div class='del'>-	if (retval != ITEM_FOUND) {</div><div class='del'>-		pathrelse(&amp;path_to_sd);</div><div class='del'>-		reiserfs_make_bad_inode(inode);</div><div class='del'>-		clear_nlink(inode);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_inode(inode, &amp;path_to_sd);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It is possible that knfsd is trying to access inode of a file</div><div class='del'>-	 * that is being removed from the disk by some other thread. As we</div><div class='del'>-	 * update sd on unlink all that is required is to check for nlink</div><div class='del'>-	 * here. This bug was first found by Sizif when debugging</div><div class='del'>-	 * SquidNG/Butterfly, forgotten, and found again after Philippe</div><div class='del'>-	 * Gramoulle &lt;philippe.gramoulle@mmania.com&gt; reproduced it.</div><div class='del'>-</div><div class='del'>-	 * More logical fix would require changes in fs/inode.c:iput() to</div><div class='del'>-	 * remove inode from hash-table _after_ fs cleaned disk stuff up and</div><div class='del'>-	 * in iget() to return NULL if I_FREEING inode is found in</div><div class='del'>-	 * hash-table.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Currently there is one place where it's ok to meet inode with</div><div class='del'>-	 * nlink==0: processing of open-unlinked and half-truncated files</div><div class='del'>-	 * during mount (fs/reiserfs/super.c:finish_unfinished()).</div><div class='del'>-	 */</div><div class='del'>-	if ((inode-&gt;i_nlink == 0) &amp;&amp;</div><div class='del'>-	    !REISERFS_SB(inode-&gt;i_sb)-&gt;s_is_unlinked_ok) {</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "vs-13075",</div><div class='del'>-				 "dead inode read from disk %K. "</div><div class='del'>-				 "This is likely to be race with knfsd. Ignore",</div><div class='del'>-				 &amp;key);</div><div class='del'>-		reiserfs_make_bad_inode(inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* init inode should be relsing */</div><div class='del'>-	reiserfs_check_path(&amp;path_to_sd);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Stat data v1 doesn't support ACLs.</div><div class='del'>-	 */</div><div class='del'>-	if (get_inode_sd_version(inode) == STAT_DATA_V1)</div><div class='del'>-		cache_no_acl(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * reiserfs_find_actor() - "find actor" reiserfs supplies to iget5_locked().</div><div class='del'>- *</div><div class='del'>- * @inode:    inode from hash table to check</div><div class='del'>- * @opaque:   "cookie" passed to iget5_locked(). This is &amp;reiserfs_iget_args.</div><div class='del'>- *</div><div class='del'>- * This function is called by iget5_locked() to distinguish reiserfs inodes</div><div class='del'>- * having the same inode numbers. Such inodes can only exist due to some</div><div class='del'>- * error condition. One of them should be bad. Inodes with identical</div><div class='del'>- * inode numbers (objectids) are distinguished by parent directory ids.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int reiserfs_find_actor(struct inode *inode, void *opaque)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_iget_args *args;</div><div class='del'>-</div><div class='del'>-	args = opaque;</div><div class='del'>-	/* args is already in CPU order */</div><div class='del'>-	return (inode-&gt;i_ino == args-&gt;objectid) &amp;&amp;</div><div class='del'>-	    (le32_to_cpu(INODE_PKEY(inode)-&gt;k_dir_id) == args-&gt;dirid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct inode *reiserfs_iget(struct super_block *s, const struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct reiserfs_iget_args args;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	args.objectid = key-&gt;on_disk_key.k_objectid;</div><div class='del'>-	args.dirid = key-&gt;on_disk_key.k_dir_id;</div><div class='del'>-	depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-	inode = iget5_locked(s, key-&gt;on_disk_key.k_objectid,</div><div class='del'>-			     reiserfs_find_actor, reiserfs_init_locked_inode,</div><div class='del'>-			     (void *)(&amp;args));</div><div class='del'>-	reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	if (!inode)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW) {</div><div class='del'>-		reiserfs_read_locked_inode(inode, &amp;args);</div><div class='del'>-		unlock_new_inode(inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp_short_keys(INODE_PKEY(inode), key) || is_bad_inode(inode)) {</div><div class='del'>-		/* either due to i/o error or a stale NFS handle */</div><div class='del'>-		iput(inode);</div><div class='del'>-		inode = NULL;</div><div class='del'>-	}</div><div class='del'>-	return inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *reiserfs_get_dentry(struct super_block *sb,</div><div class='del'>-	u32 objectid, u32 dir_id, u32 generation)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	key.on_disk_key.k_objectid = objectid;</div><div class='del'>-	key.on_disk_key.k_dir_id = dir_id;</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-	inode = reiserfs_iget(sb, &amp;key);</div><div class='del'>-	if (inode &amp;&amp; !IS_ERR(inode) &amp;&amp; generation != 0 &amp;&amp;</div><div class='del'>-	    generation != inode-&gt;i_generation) {</div><div class='del'>-		iput(inode);</div><div class='del'>-		inode = NULL;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-</div><div class='del'>-	return d_obtain_alias(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dentry *reiserfs_fh_to_dentry(struct super_block *sb, struct fid *fid,</div><div class='del'>-		int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * fhtype happens to reflect the number of u32s encoded.</div><div class='del'>-	 * due to a bug in earlier code, fhtype might indicate there</div><div class='del'>-	 * are more u32s then actually fitted.</div><div class='del'>-	 * so if fhtype seems to be more than len, reduce fhtype.</div><div class='del'>-	 * Valid types are:</div><div class='del'>-	 *   2 - objectid + dir_id - legacy support</div><div class='del'>-	 *   3 - objectid + dir_id + generation</div><div class='del'>-	 *   4 - objectid + dir_id + objectid and dirid of parent - legacy</div><div class='del'>-	 *   5 - objectid + dir_id + generation + objectid and dirid of parent</div><div class='del'>-	 *   6 - as above plus generation of directory</div><div class='del'>-	 * 6 does not fit in NFSv2 handles</div><div class='del'>-	 */</div><div class='del'>-	if (fh_type &gt; fh_len) {</div><div class='del'>-		if (fh_type != 6 || fh_len != 5)</div><div class='del'>-			reiserfs_warning(sb, "reiserfs-13077",</div><div class='del'>-				"nfsd/reiserfs, fhtype=%d, len=%d - odd",</div><div class='del'>-				fh_type, fh_len);</div><div class='del'>-		fh_type = fh_len;</div><div class='del'>-	}</div><div class='del'>-	if (fh_len &lt; 2)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return reiserfs_get_dentry(sb, fid-&gt;raw[0], fid-&gt;raw[1],</div><div class='del'>-		(fh_type == 3 || fh_type &gt;= 5) ? fid-&gt;raw[2] : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dentry *reiserfs_fh_to_parent(struct super_block *sb, struct fid *fid,</div><div class='del'>-		int fh_len, int fh_type)</div><div class='del'>-{</div><div class='del'>-	if (fh_type &gt; fh_len)</div><div class='del'>-		fh_type = fh_len;</div><div class='del'>-	if (fh_type &lt; 4)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return reiserfs_get_dentry(sb,</div><div class='del'>-		(fh_type &gt;= 5) ? fid-&gt;raw[3] : fid-&gt;raw[2],</div><div class='del'>-		(fh_type &gt;= 5) ? fid-&gt;raw[4] : fid-&gt;raw[3],</div><div class='del'>-		(fh_type == 6) ? fid-&gt;raw[5] : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_encode_fh(struct inode *inode, __u32 * data, int *lenp,</div><div class='del'>-		       struct inode *parent)</div><div class='del'>-{</div><div class='del'>-	int maxlen = *lenp;</div><div class='del'>-</div><div class='del'>-	if (parent &amp;&amp; (maxlen &lt; 5)) {</div><div class='del'>-		*lenp = 5;</div><div class='del'>-		return FILEID_INVALID;</div><div class='del'>-	} else if (maxlen &lt; 3) {</div><div class='del'>-		*lenp = 3;</div><div class='del'>-		return FILEID_INVALID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data[0] = inode-&gt;i_ino;</div><div class='del'>-	data[1] = le32_to_cpu(INODE_PKEY(inode)-&gt;k_dir_id);</div><div class='del'>-	data[2] = inode-&gt;i_generation;</div><div class='del'>-	*lenp = 3;</div><div class='del'>-	if (parent) {</div><div class='del'>-		data[3] = parent-&gt;i_ino;</div><div class='del'>-		data[4] = le32_to_cpu(INODE_PKEY(parent)-&gt;k_dir_id);</div><div class='del'>-		*lenp = 5;</div><div class='del'>-		if (maxlen &gt;= 6) {</div><div class='del'>-			data[5] = parent-&gt;i_generation;</div><div class='del'>-			*lenp = 6;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return *lenp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * looks for stat data, then copies fields to it, marks the buffer</div><div class='del'>- * containing stat data as dirty</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * reiserfs inodes are never really dirty, since the dirty inode call</div><div class='del'>- * always logs them.  This call allows the VFS inode marking routines</div><div class='del'>- * to properly mark inodes for datasync and such, but only actually</div><div class='del'>- * does something when called for a synchronous update.</div><div class='del'>- */</div><div class='del'>-int reiserfs_write_inode(struct inode *inode, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int jbegin_count = 1;</div><div class='del'>-</div><div class='del'>-	if (sb_rdonly(inode-&gt;i_sb))</div><div class='del'>-		return -EROFS;</div><div class='del'>-	/*</div><div class='del'>-	 * memory pressure can sometimes initiate write_inode calls with</div><div class='del'>-	 * sync == 1,</div><div class='del'>-	 * these cases are just when the system needs ram, not when the</div><div class='del'>-	 * inode needs to reach disk for safety, and they can safely be</div><div class='del'>-	 * ignored because the altered inode has already been logged.</div><div class='del'>-	 */</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_ALL &amp;&amp; !(current-&gt;flags &amp; PF_MEMALLOC)) {</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		if (!journal_begin(&amp;th, inode-&gt;i_sb, jbegin_count)) {</div><div class='del'>-			reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-			journal_end_sync(&amp;th);</div><div class='del'>-		}</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * stat data of new object is inserted already, this inserts the item</div><div class='del'>- * containing "." and ".." entries</div><div class='del'>- */</div><div class='del'>-static int reiserfs_new_directory(struct reiserfs_transaction_handle *th,</div><div class='del'>-				  struct inode *inode,</div><div class='del'>-				  struct item_head *ih, struct treepath *path,</div><div class='del'>-				  struct inode *dir)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	char empty_dir[EMPTY_DIR_SIZE];</div><div class='del'>-	char *body = empty_dir;</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	_make_cpu_key(&amp;key, KEY_FORMAT_3_5, le32_to_cpu(ih-&gt;ih_key.k_dir_id),</div><div class='del'>-		      le32_to_cpu(ih-&gt;ih_key.k_objectid), DOT_OFFSET,</div><div class='del'>-		      TYPE_DIRENTRY, 3 /*key length */ );</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * compose item head for new item. Directories consist of items of</div><div class='del'>-	 * old type (ITEM_VERSION_1). Do not set key (second arg is 0), it</div><div class='del'>-	 * is done by reiserfs_new_inode</div><div class='del'>-	 */</div><div class='del'>-	if (old_format_only(sb)) {</div><div class='del'>-		make_le_item_head(ih, NULL, KEY_FORMAT_3_5, DOT_OFFSET,</div><div class='del'>-				  TYPE_DIRENTRY, EMPTY_DIR_SIZE_V1, 2);</div><div class='del'>-</div><div class='del'>-		make_empty_dir_item_v1(body, ih-&gt;ih_key.k_dir_id,</div><div class='del'>-				       ih-&gt;ih_key.k_objectid,</div><div class='del'>-				       INODE_PKEY(dir)-&gt;k_dir_id,</div><div class='del'>-				       INODE_PKEY(dir)-&gt;k_objectid);</div><div class='del'>-	} else {</div><div class='del'>-		make_le_item_head(ih, NULL, KEY_FORMAT_3_5, DOT_OFFSET,</div><div class='del'>-				  TYPE_DIRENTRY, EMPTY_DIR_SIZE, 2);</div><div class='del'>-</div><div class='del'>-		make_empty_dir_item(body, ih-&gt;ih_key.k_dir_id,</div><div class='del'>-				    ih-&gt;ih_key.k_objectid,</div><div class='del'>-				    INODE_PKEY(dir)-&gt;k_dir_id,</div><div class='del'>-				    INODE_PKEY(dir)-&gt;k_objectid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* look for place in the tree for new item */</div><div class='del'>-	retval = search_item(sb, &amp;key, path);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		reiserfs_error(sb, "vs-13080",</div><div class='del'>-			       "i/o failure occurred creating new directory");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (retval == ITEM_FOUND) {</div><div class='del'>-		pathrelse(path);</div><div class='del'>-		reiserfs_warning(sb, "vs-13070",</div><div class='del'>-				 "object with this key exists (%k)",</div><div class='del'>-				 &amp;(ih-&gt;ih_key));</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* insert item, that is empty directory item */</div><div class='del'>-	return reiserfs_insert_item(th, path, &amp;key, ih, inode, body);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * stat data of object has been inserted, this inserts the item</div><div class='del'>- * containing the body of symlink</div><div class='del'>- */</div><div class='del'>-static int reiserfs_new_symlink(struct reiserfs_transaction_handle *th,</div><div class='del'>-				struct inode *inode,</div><div class='del'>-				struct item_head *ih,</div><div class='del'>-				struct treepath *path, const char *symname,</div><div class='del'>-				int item_len)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	_make_cpu_key(&amp;key, KEY_FORMAT_3_5,</div><div class='del'>-		      le32_to_cpu(ih-&gt;ih_key.k_dir_id),</div><div class='del'>-		      le32_to_cpu(ih-&gt;ih_key.k_objectid),</div><div class='del'>-		      1, TYPE_DIRECT, 3 /*key length */ );</div><div class='del'>-</div><div class='del'>-	make_le_item_head(ih, NULL, KEY_FORMAT_3_5, 1, TYPE_DIRECT, item_len,</div><div class='del'>-			  0 /*free_space */ );</div><div class='del'>-</div><div class='del'>-	/* look for place in the tree for new item */</div><div class='del'>-	retval = search_item(sb, &amp;key, path);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		reiserfs_error(sb, "vs-13080",</div><div class='del'>-			       "i/o failure occurred creating new symlink");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (retval == ITEM_FOUND) {</div><div class='del'>-		pathrelse(path);</div><div class='del'>-		reiserfs_warning(sb, "vs-13080",</div><div class='del'>-				 "object with this key exists (%k)",</div><div class='del'>-				 &amp;(ih-&gt;ih_key));</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* insert item, that is body of symlink */</div><div class='del'>-	return reiserfs_insert_item(th, path, &amp;key, ih, inode, symname);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inserts the stat data into the tree, and then calls</div><div class='del'>- * reiserfs_new_directory (to insert ".", ".." item if new object is</div><div class='del'>- * directory) or reiserfs_new_symlink (to insert symlink body if new</div><div class='del'>- * object is symlink) or nothing (if new object is regular file)</div><div class='del'>-</div><div class='del'>- * NOTE! uid and gid must already be set in the inode.  If we return</div><div class='del'>- * non-zero due to an error, we have to drop the quota previously allocated</div><div class='del'>- * for the fresh inode.  This can only be done outside a transaction, so</div><div class='del'>- * if we return non-zero, we also end the transaction.</div><div class='del'>- *</div><div class='del'>- * @th: active transaction handle</div><div class='del'>- * @dir: parent directory for new inode</div><div class='del'>- * @mode: mode of new inode</div><div class='del'>- * @symname: symlink contents if inode is symlink</div><div class='del'>- * @isize: 0 for regular file, EMPTY_DIR_SIZE for dirs, strlen(symname) for</div><div class='del'>- *         symlinks</div><div class='del'>- * @inode: inode to be filled</div><div class='del'>- * @security: optional security context to associate with this inode</div><div class='del'>- */</div><div class='del'>-int reiserfs_new_inode(struct reiserfs_transaction_handle *th,</div><div class='del'>-		       struct inode *dir, umode_t mode, const char *symname,</div><div class='del'>-		       /* 0 for regular, EMTRY_DIR_SIZE for dirs,</div><div class='del'>-		          strlen (symname) for symlinks) */</div><div class='del'>-		       loff_t i_size, struct dentry *dentry,</div><div class='del'>-		       struct inode *inode,</div><div class='del'>-		       struct reiserfs_security_handle *security)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = dir-&gt;i_sb;</div><div class='del'>-	struct reiserfs_iget_args args;</div><div class='del'>-	INITIALIZE_PATH(path_to_key);</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	struct item_head ih;</div><div class='del'>-	struct stat_data sd;</div><div class='del'>-	int retval;</div><div class='del'>-	int err;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-	err = dquot_alloc_inode(inode);</div><div class='del'>-	reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_end_trans;</div><div class='del'>-	if (!dir-&gt;i_nlink) {</div><div class='del'>-		err = -EPERM;</div><div class='del'>-		goto out_bad_inode;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* item head of new item */</div><div class='del'>-	ih.ih_key.k_dir_id = reiserfs_choose_packing(dir);</div><div class='del'>-	ih.ih_key.k_objectid = cpu_to_le32(reiserfs_get_unused_objectid(th));</div><div class='del'>-	if (!ih.ih_key.k_objectid) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out_bad_inode;</div><div class='del'>-	}</div><div class='del'>-	args.objectid = inode-&gt;i_ino = le32_to_cpu(ih.ih_key.k_objectid);</div><div class='del'>-	if (old_format_only(sb))</div><div class='del'>-		make_le_item_head(&amp;ih, NULL, KEY_FORMAT_3_5, SD_OFFSET,</div><div class='del'>-				  TYPE_STAT_DATA, SD_V1_SIZE, MAX_US_INT);</div><div class='del'>-	else</div><div class='del'>-		make_le_item_head(&amp;ih, NULL, KEY_FORMAT_3_6, SD_OFFSET,</div><div class='del'>-				  TYPE_STAT_DATA, SD_SIZE, MAX_US_INT);</div><div class='del'>-	memcpy(INODE_PKEY(inode), &amp;ih.ih_key, KEY_SIZE);</div><div class='del'>-	args.dirid = le32_to_cpu(ih.ih_key.k_dir_id);</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-	err = insert_inode_locked4(inode, args.objectid,</div><div class='del'>-			     reiserfs_find_actor, &amp;args);</div><div class='del'>-	reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-	if (err) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out_bad_inode;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (old_format_only(sb))</div><div class='del'>-		/*</div><div class='del'>-		 * not a perfect generation count, as object ids can be reused,</div><div class='del'>-		 * but this is as good as reiserfs can do right now.</div><div class='del'>-		 * note that the private part of inode isn't filled in yet,</div><div class='del'>-		 * we have to use the directory.</div><div class='del'>-		 */</div><div class='del'>-		inode-&gt;i_generation = le32_to_cpu(INODE_PKEY(dir)-&gt;k_objectid);</div><div class='del'>-	else</div><div class='del'>-#if defined( USE_INODE_GENERATION_COUNTER )</div><div class='del'>-		inode-&gt;i_generation =</div><div class='del'>-		    le32_to_cpu(REISERFS_SB(sb)-&gt;s_rs-&gt;s_inode_generation);</div><div class='del'>-#else</div><div class='del'>-		inode-&gt;i_generation = ++event;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* fill stat data */</div><div class='del'>-	set_nlink(inode, (S_ISDIR(mode) ? 2 : 1));</div><div class='del'>-</div><div class='del'>-	/* uid and gid must already be set by the caller for quota init */</div><div class='del'>-</div><div class='del'>-	simple_inode_init_ts(inode);</div><div class='del'>-	inode-&gt;i_size = i_size;</div><div class='del'>-	inode-&gt;i_blocks = 0;</div><div class='del'>-	inode-&gt;i_bytes = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_first_direct_byte = S_ISLNK(mode) ? 1 :</div><div class='del'>-	    U32_MAX /*NO_BYTES_IN_DIRECT_ITEM */ ;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;REISERFS_I(inode)-&gt;i_prealloc_list);</div><div class='del'>-	REISERFS_I(inode)-&gt;i_flags = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_prealloc_block = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_prealloc_count = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_trans_id = 0;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_jl = NULL;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_attrs =</div><div class='del'>-	    REISERFS_I(dir)-&gt;i_attrs &amp; REISERFS_INHERIT_MASK;</div><div class='del'>-	sd_attrs_to_i_attrs(REISERFS_I(inode)-&gt;i_attrs, inode);</div><div class='del'>-	reiserfs_init_xattr_rwsem(inode);</div><div class='del'>-</div><div class='del'>-	/* key to search for correct place for new stat data */</div><div class='del'>-	_make_cpu_key(&amp;key, KEY_FORMAT_3_6, le32_to_cpu(ih.ih_key.k_dir_id),</div><div class='del'>-		      le32_to_cpu(ih.ih_key.k_objectid), SD_OFFSET,</div><div class='del'>-		      TYPE_STAT_DATA, 3 /*key length */ );</div><div class='del'>-</div><div class='del'>-	/* find proper place for inserting of stat data */</div><div class='del'>-	retval = search_item(sb, &amp;key, &amp;path_to_key);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto out_bad_inode;</div><div class='del'>-	}</div><div class='del'>-	if (retval == ITEM_FOUND) {</div><div class='del'>-		pathrelse(&amp;path_to_key);</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-		goto out_bad_inode;</div><div class='del'>-	}</div><div class='del'>-	if (old_format_only(sb)) {</div><div class='del'>-		/* i_uid or i_gid is too big to be stored in stat data v3.5 */</div><div class='del'>-		if (i_uid_read(inode) &amp; ~0xffff || i_gid_read(inode) &amp; ~0xffff) {</div><div class='del'>-			pathrelse(&amp;path_to_key);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out_bad_inode;</div><div class='del'>-		}</div><div class='del'>-		inode2sd_v1(&amp;sd, inode, inode-&gt;i_size);</div><div class='del'>-	} else {</div><div class='del'>-		inode2sd(&amp;sd, inode, inode-&gt;i_size);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * store in in-core inode the key of stat data and version all</div><div class='del'>-	 * object items will have (directory items will have old offset</div><div class='del'>-	 * format, other new objects will consist of new items)</div><div class='del'>-	 */</div><div class='del'>-	if (old_format_only(sb) || S_ISDIR(mode) || S_ISLNK(mode))</div><div class='del'>-		set_inode_item_key_version(inode, KEY_FORMAT_3_5);</div><div class='del'>-	else</div><div class='del'>-		set_inode_item_key_version(inode, KEY_FORMAT_3_6);</div><div class='del'>-	if (old_format_only(sb))</div><div class='del'>-		set_inode_sd_version(inode, STAT_DATA_V1);</div><div class='del'>-	else</div><div class='del'>-		set_inode_sd_version(inode, STAT_DATA_V2);</div><div class='del'>-</div><div class='del'>-	/* insert the stat data into the tree */</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	if (REISERFS_I(dir)-&gt;new_packing_locality)</div><div class='del'>-		th-&gt;displace_new_blocks = 1;</div><div class='del'>-#endif</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_insert_item(th, &amp;path_to_key, &amp;key, &amp;ih, inode,</div><div class='del'>-				 (char *)(&amp;sd));</div><div class='del'>-	if (retval) {</div><div class='del'>-		err = retval;</div><div class='del'>-		reiserfs_check_path(&amp;path_to_key);</div><div class='del'>-		goto out_bad_inode;</div><div class='del'>-	}</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	if (!th-&gt;displace_new_blocks)</div><div class='del'>-		REISERFS_I(dir)-&gt;new_packing_locality = 0;</div><div class='del'>-#endif</div><div class='del'>-	if (S_ISDIR(mode)) {</div><div class='del'>-		/* insert item with "." and ".." */</div><div class='del'>-		retval =</div><div class='del'>-		    reiserfs_new_directory(th, inode, &amp;ih, &amp;path_to_key, dir);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (S_ISLNK(mode)) {</div><div class='del'>-		/* insert body of symlink */</div><div class='del'>-		if (!old_format_only(sb))</div><div class='del'>-			i_size = ROUND_UP(i_size);</div><div class='del'>-		retval =</div><div class='del'>-		    reiserfs_new_symlink(th, inode, &amp;ih, &amp;path_to_key, symname,</div><div class='del'>-					 i_size);</div><div class='del'>-	}</div><div class='del'>-	if (retval) {</div><div class='del'>-		err = retval;</div><div class='del'>-		reiserfs_check_path(&amp;path_to_key);</div><div class='del'>-		journal_end(th);</div><div class='del'>-		goto out_inserted_sd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Mark it private if we're creating the privroot</div><div class='del'>-	 * or something under it.</div><div class='del'>-	 */</div><div class='del'>-	if (IS_PRIVATE(dir) || dentry == REISERFS_SB(sb)-&gt;priv_root)</div><div class='del'>-		reiserfs_init_priv_inode(inode);</div><div class='del'>-</div><div class='del'>-	if (reiserfs_posixacl(inode-&gt;i_sb)) {</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		retval = reiserfs_inherit_default_acl(th, dir, dentry, inode);</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		if (retval) {</div><div class='del'>-			err = retval;</div><div class='del'>-			reiserfs_check_path(&amp;path_to_key);</div><div class='del'>-			journal_end(th);</div><div class='del'>-			goto out_inserted_sd;</div><div class='del'>-		}</div><div class='del'>-	} else if (inode-&gt;i_sb-&gt;s_flags &amp; SB_POSIXACL) {</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "jdm-13090",</div><div class='del'>-				 "ACLs aren't enabled in the fs, "</div><div class='del'>-				 "but vfs thinks they are!");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (security-&gt;name) {</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		retval = reiserfs_security_write(th, inode, security);</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		if (retval) {</div><div class='del'>-			err = retval;</div><div class='del'>-			reiserfs_check_path(&amp;path_to_key);</div><div class='del'>-			retval = journal_end(th);</div><div class='del'>-			if (retval)</div><div class='del'>-				err = retval;</div><div class='del'>-			goto out_inserted_sd;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_update_sd(th, inode);</div><div class='del'>-	reiserfs_check_path(&amp;path_to_key);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_bad_inode:</div><div class='del'>-	/* Invalidate the object, nothing was inserted yet */</div><div class='del'>-	INODE_PKEY(inode)-&gt;k_objectid = 0;</div><div class='del'>-</div><div class='del'>-	/* Quota change must be inside a transaction for journaling */</div><div class='del'>-	depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-	dquot_free_inode(inode);</div><div class='del'>-	reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-</div><div class='del'>-out_end_trans:</div><div class='del'>-	journal_end(th);</div><div class='del'>-	/*</div><div class='del'>-	 * Drop can be outside and it needs more credits so it's better</div><div class='del'>-	 * to have it outside</div><div class='del'>-	 */</div><div class='del'>-	depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-	dquot_drop(inode);</div><div class='del'>-	reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-	inode-&gt;i_flags |= S_NOQUOTA;</div><div class='del'>-	make_bad_inode(inode);</div><div class='del'>-</div><div class='del'>-out_inserted_sd:</div><div class='del'>-	clear_nlink(inode);</div><div class='del'>-	th-&gt;t_trans_id = 0;	/* so the caller can't use this handle later */</div><div class='del'>-	if (inode-&gt;i_state &amp; I_NEW)</div><div class='del'>-		unlock_new_inode(inode);</div><div class='del'>-	iput(inode);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * finds the tail page in the page cache,</div><div class='del'>- * reads the last block in.</div><div class='del'>- *</div><div class='del'>- * On success, page_result is set to a locked, pinned page, and bh_result</div><div class='del'>- * is set to an up to date buffer for the last block in the file.  returns 0.</div><div class='del'>- *</div><div class='del'>- * tail conversion is not done, so bh_result might not be valid for writing</div><div class='del'>- * check buffer_mapped(bh_result) and bh_result-&gt;b_blocknr != 0 before</div><div class='del'>- * trying to write the block.</div><div class='del'>- *</div><div class='del'>- * on failure, nonzero is returned, page_result and bh_result are untouched.</div><div class='del'>- */</div><div class='del'>-static int grab_tail_page(struct inode *inode,</div><div class='del'>-			  struct page **page_result,</div><div class='del'>-			  struct buffer_head **bh_result)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we want the page with the last byte in the file,</div><div class='del'>-	 * not the page that will hold the next byte for appending</div><div class='del'>-	 */</div><div class='del'>-	unsigned long index = (inode-&gt;i_size - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	unsigned long pos = 0;</div><div class='del'>-	unsigned long start = 0;</div><div class='del'>-	unsigned long blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	unsigned long offset = (inode-&gt;i_size) &amp; (PAGE_SIZE - 1);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct buffer_head *head;</div><div class='del'>-	struct page *page;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we know that we are only called with inode-&gt;i_size &gt; 0.</div><div class='del'>-	 * we also know that a file tail can never be as big as a block</div><div class='del'>-	 * If i_size % blocksize == 0, our file is currently block aligned</div><div class='del'>-	 * and it won't need converting or zeroing after a truncate.</div><div class='del'>-	 */</div><div class='del'>-	if ((offset &amp; (blocksize - 1)) == 0) {</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	page = grab_cache_page(inode-&gt;i_mapping, index);</div><div class='del'>-	error = -ENOMEM;</div><div class='del'>-	if (!page) {</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/* start within the page of the last block in the file */</div><div class='del'>-	start = (offset / blocksize) * blocksize;</div><div class='del'>-</div><div class='del'>-	error = __block_write_begin(page, start, offset - start,</div><div class='del'>-				    reiserfs_get_block_create_0);</div><div class='del'>-	if (error)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	head = page_buffers(page);</div><div class='del'>-	bh = head;</div><div class='del'>-	do {</div><div class='del'>-		if (pos &gt;= start) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		bh = bh-&gt;b_this_page;</div><div class='del'>-		pos += blocksize;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-</div><div class='del'>-	if (!buffer_uptodate(bh)) {</div><div class='del'>-		/*</div><div class='del'>-		 * note, this should never happen, prepare_write should be</div><div class='del'>-		 * taking care of this for us.  If the buffer isn't up to</div><div class='del'>-		 * date, I've screwed up the code to find the buffer, or the</div><div class='del'>-		 * code to call prepare_write</div><div class='del'>-		 */</div><div class='del'>-		reiserfs_error(inode-&gt;i_sb, "clm-6000",</div><div class='del'>-			       "error reading block %lu", bh-&gt;b_blocknr);</div><div class='del'>-		error = -EIO;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-	*bh_result = bh;</div><div class='del'>-	*page_result = page;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vfs version of truncate file.  Must NOT be called with</div><div class='del'>- * a transaction already started.</div><div class='del'>- *</div><div class='del'>- * some code taken from block_truncate_page</div><div class='del'>- */</div><div class='del'>-int reiserfs_truncate_file(struct inode *inode, int update_timestamps)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	/* we want the offset for the first byte after the end of the file */</div><div class='del'>-	unsigned long offset = inode-&gt;i_size &amp; (PAGE_SIZE - 1);</div><div class='del'>-	unsigned blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-	unsigned length;</div><div class='del'>-	struct page *page = NULL;</div><div class='del'>-	int error;</div><div class='del'>-	struct buffer_head *bh = NULL;</div><div class='del'>-	int err2;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;i_size &gt; 0) {</div><div class='del'>-		error = grab_tail_page(inode, &amp;page, &amp;bh);</div><div class='del'>-		if (error) {</div><div class='del'>-			/*</div><div class='del'>-			 * -ENOENT means we truncated past the end of the</div><div class='del'>-			 * file, and get_block_create_0 could not find a</div><div class='del'>-			 * block to read in, which is ok.</div><div class='del'>-			 */</div><div class='del'>-			if (error != -ENOENT)</div><div class='del'>-				reiserfs_error(inode-&gt;i_sb, "clm-6001",</div><div class='del'>-					       "grab_tail_page failed %d",</div><div class='del'>-					       error);</div><div class='del'>-			page = NULL;</div><div class='del'>-			bh = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * so, if page != NULL, we have a buffer head for the offset at</div><div class='del'>-	 * the end of the file. if the bh is mapped, and bh-&gt;b_blocknr != 0,</div><div class='del'>-	 * then we have an unformatted node.  Otherwise, we have a direct item,</div><div class='del'>-	 * and no zeroing is required on disk.  We zero after the truncate,</div><div class='del'>-	 * because the truncate might pack the item anyway</div><div class='del'>-	 * (it will unmap bh if it packs).</div><div class='del'>-	 *</div><div class='del'>-	 * it is enough to reserve space in transaction for 2 balancings:</div><div class='del'>-	 * one for "save" link adding and another for the first</div><div class='del'>-	 * cut_from_item. 1 is for update_sd</div><div class='del'>-	 */</div><div class='del'>-	error = journal_begin(&amp;th, inode-&gt;i_sb,</div><div class='del'>-			      JOURNAL_PER_BALANCE_CNT * 2 + 1);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out;</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	if (update_timestamps)</div><div class='del'>-		/*</div><div class='del'>-		 * we are doing real truncate: if the system crashes</div><div class='del'>-		 * before the last transaction of truncating gets committed</div><div class='del'>-		 * - on reboot the file either appears truncated properly</div><div class='del'>-		 * or not truncated at all</div><div class='del'>-		 */</div><div class='del'>-		add_save_link(&amp;th, inode, 1);</div><div class='del'>-	err2 = reiserfs_do_truncate(&amp;th, inode, page, update_timestamps);</div><div class='del'>-	error = journal_end(&amp;th);</div><div class='del'>-	if (error)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* check reiserfs_do_truncate after ending the transaction */</div><div class='del'>-	if (err2) {</div><div class='del'>-		error = err2;</div><div class='del'>-  		goto out;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (update_timestamps) {</div><div class='del'>-		error = remove_save_link(inode, 1 /* truncate */);</div><div class='del'>-		if (error)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (page) {</div><div class='del'>-		length = offset &amp; (blocksize - 1);</div><div class='del'>-		/* if we are not on a block boundary */</div><div class='del'>-		if (length) {</div><div class='del'>-			length = blocksize - length;</div><div class='del'>-			zero_user(page, offset, length);</div><div class='del'>-			if (buffer_mapped(bh) &amp;&amp; bh-&gt;b_blocknr != 0) {</div><div class='del'>-				mark_buffer_dirty(bh);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-out:</div><div class='del'>-	if (page) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int map_block_for_writepage(struct inode *inode,</div><div class='del'>-				   struct buffer_head *bh_result,</div><div class='del'>-				   unsigned long block)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int fs_gen;</div><div class='del'>-	struct item_head tmp_ih;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	__le32 *item;</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	int pos_in_item;</div><div class='del'>-	int jbegin_count = JOURNAL_PER_BALANCE_CNT;</div><div class='del'>-	loff_t byte_offset = ((loff_t)block &lt;&lt; inode-&gt;i_sb-&gt;s_blocksize_bits)+1;</div><div class='del'>-	int retval;</div><div class='del'>-	int use_get_block = 0;</div><div class='del'>-	int bytes_copied = 0;</div><div class='del'>-	int copy_size;</div><div class='del'>-	int trans_running = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * catch places below that try to log something without</div><div class='del'>-	 * starting a trans</div><div class='del'>-	 */</div><div class='del'>-	th.t_trans_id = 0;</div><div class='del'>-</div><div class='del'>-	if (!buffer_uptodate(bh_result)) {</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kmap(bh_result-&gt;b_page);</div><div class='del'>-start_over:</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	make_cpu_key(&amp;key, inode, byte_offset, TYPE_ANY, 3);</div><div class='del'>-</div><div class='del'>-research:</div><div class='del'>-	retval = search_for_position_by_key(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-	if (retval != POSITION_FOUND) {</div><div class='del'>-		use_get_block = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bh = get_last_bh(&amp;path);</div><div class='del'>-	ih = tp_item_head(&amp;path);</div><div class='del'>-	item = tp_item_body(&amp;path);</div><div class='del'>-	pos_in_item = path.pos_in_item;</div><div class='del'>-</div><div class='del'>-	/* we've found an unformatted node */</div><div class='del'>-	if (indirect_item_found(retval, ih)) {</div><div class='del'>-		if (bytes_copied &gt; 0) {</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "clm-6002",</div><div class='del'>-					 "bytes_copied %d", bytes_copied);</div><div class='del'>-		}</div><div class='del'>-		if (!get_block_num(item, pos_in_item)) {</div><div class='del'>-			/* crap, we are writing to a hole */</div><div class='del'>-			use_get_block = 1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		set_block_dev_mapped(bh_result,</div><div class='del'>-				     get_block_num(item, pos_in_item), inode);</div><div class='del'>-	} else if (is_direct_le_ih(ih)) {</div><div class='del'>-		char *p;</div><div class='del'>-		p = page_address(bh_result-&gt;b_page);</div><div class='del'>-		p += (byte_offset - 1) &amp; (PAGE_SIZE - 1);</div><div class='del'>-		copy_size = ih_item_len(ih) - pos_in_item;</div><div class='del'>-</div><div class='del'>-		fs_gen = get_generation(inode-&gt;i_sb);</div><div class='del'>-		copy_item_head(&amp;tmp_ih, ih);</div><div class='del'>-</div><div class='del'>-		if (!trans_running) {</div><div class='del'>-			/* vs-3050 is gone, no need to drop the path */</div><div class='del'>-			retval = journal_begin(&amp;th, inode-&gt;i_sb, jbegin_count);</div><div class='del'>-			if (retval)</div><div class='del'>-				goto out;</div><div class='del'>-			reiserfs_update_inode_transaction(inode);</div><div class='del'>-			trans_running = 1;</div><div class='del'>-			if (fs_changed(fs_gen, inode-&gt;i_sb)</div><div class='del'>-			    &amp;&amp; item_moved(&amp;tmp_ih, &amp;path)) {</div><div class='del'>-				reiserfs_restore_prepared_buffer(inode-&gt;i_sb,</div><div class='del'>-								 bh);</div><div class='del'>-				goto research;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_prepare_for_journal(inode-&gt;i_sb, bh, 1);</div><div class='del'>-</div><div class='del'>-		if (fs_changed(fs_gen, inode-&gt;i_sb)</div><div class='del'>-		    &amp;&amp; item_moved(&amp;tmp_ih, &amp;path)) {</div><div class='del'>-			reiserfs_restore_prepared_buffer(inode-&gt;i_sb, bh);</div><div class='del'>-			goto research;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(ih_item_body(bh, ih) + pos_in_item, p + bytes_copied,</div><div class='del'>-		       copy_size);</div><div class='del'>-</div><div class='del'>-		journal_mark_dirty(&amp;th, bh);</div><div class='del'>-		bytes_copied += copy_size;</div><div class='del'>-		set_block_dev_mapped(bh_result, 0, inode);</div><div class='del'>-</div><div class='del'>-		/* are there still bytes left? */</div><div class='del'>-		if (bytes_copied &lt; bh_result-&gt;b_size &amp;&amp;</div><div class='del'>-		    (byte_offset + bytes_copied) &lt; inode-&gt;i_size) {</div><div class='del'>-			set_cpu_key_k_offset(&amp;key,</div><div class='del'>-					     cpu_key_k_offset(&amp;key) +</div><div class='del'>-					     copy_size);</div><div class='del'>-			goto research;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "clm-6003",</div><div class='del'>-				 "bad item inode %lu", inode-&gt;i_ino);</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	retval = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-	if (trans_running) {</div><div class='del'>-		int err = journal_end(&amp;th);</div><div class='del'>-		if (err)</div><div class='del'>-			retval = err;</div><div class='del'>-		trans_running = 0;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	/* this is where we fill in holes in the file. */</div><div class='del'>-	if (use_get_block) {</div><div class='del'>-		retval = reiserfs_get_block(inode, block, bh_result,</div><div class='del'>-					    GET_BLOCK_CREATE | GET_BLOCK_NO_IMUX</div><div class='del'>-					    | GET_BLOCK_NO_DANGLE);</div><div class='del'>-		if (!retval) {</div><div class='del'>-			if (!buffer_mapped(bh_result)</div><div class='del'>-			    || bh_result-&gt;b_blocknr == 0) {</div><div class='del'>-				/* get_block failed to find a mapped unformatted node. */</div><div class='del'>-				use_get_block = 0;</div><div class='del'>-				goto start_over;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kunmap(bh_result-&gt;b_page);</div><div class='del'>-</div><div class='del'>-	if (!retval &amp;&amp; buffer_mapped(bh_result) &amp;&amp; bh_result-&gt;b_blocknr == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * we've copied data from the page into the direct item, so the</div><div class='del'>-		 * buffer in the page is now clean, mark it to reflect that.</div><div class='del'>-		 */</div><div class='del'>-		lock_buffer(bh_result);</div><div class='del'>-		clear_buffer_dirty(bh_result);</div><div class='del'>-		unlock_buffer(bh_result);</div><div class='del'>-	}</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mason@suse.com: updated in 2.5.54 to follow the same general io</div><div class='del'>- * start/recovery path as __block_write_full_folio, along with special</div><div class='del'>- * code to handle reiserfs tails.</div><div class='del'>- */</div><div class='del'>-static int reiserfs_write_full_folio(struct folio *folio,</div><div class='del'>-				    struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	unsigned long end_index = inode-&gt;i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	int error = 0;</div><div class='del'>-	unsigned long block;</div><div class='del'>-	sector_t last_block;</div><div class='del'>-	struct buffer_head *head, *bh;</div><div class='del'>-	int partial = 0;</div><div class='del'>-	int nr = 0;</div><div class='del'>-	int checked = folio_test_checked(folio);</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct super_block *s = inode-&gt;i_sb;</div><div class='del'>-	int bh_per_page = PAGE_SIZE / s-&gt;s_blocksize;</div><div class='del'>-	th.t_trans_id = 0;</div><div class='del'>-</div><div class='del'>-	/* no logging allowed when nonblocking or from PF_MEMALLOC */</div><div class='del'>-	if (checked &amp;&amp; (current-&gt;flags &amp; PF_MEMALLOC)) {</div><div class='del'>-		folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The folio dirty bit is cleared before writepage is called, which</div><div class='del'>-	 * means we have to tell create_empty_buffers to make dirty buffers</div><div class='del'>-	 * The folio really should be up to date at this point, so tossing</div><div class='del'>-	 * in the BH_Uptodate is just a sanity check.</div><div class='del'>-	 */</div><div class='del'>-	head = folio_buffers(folio);</div><div class='del'>-	if (!head)</div><div class='del'>-		head = create_empty_buffers(folio, s-&gt;s_blocksize,</div><div class='del'>-				     (1 &lt;&lt; BH_Dirty) | (1 &lt;&lt; BH_Uptodate));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * last folio in the file, zero out any contents past the</div><div class='del'>-	 * last byte in the file</div><div class='del'>-	 */</div><div class='del'>-	if (folio-&gt;index &gt;= end_index) {</div><div class='del'>-		unsigned last_offset;</div><div class='del'>-</div><div class='del'>-		last_offset = inode-&gt;i_size &amp; (PAGE_SIZE - 1);</div><div class='del'>-		/* no file contents in this folio */</div><div class='del'>-		if (folio-&gt;index &gt;= end_index + 1 || !last_offset) {</div><div class='del'>-			folio_unlock(folio);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		folio_zero_segment(folio, last_offset, folio_size(folio));</div><div class='del'>-	}</div><div class='del'>-	bh = head;</div><div class='del'>-	block = folio-&gt;index &lt;&lt; (PAGE_SHIFT - s-&gt;s_blocksize_bits);</div><div class='del'>-	last_block = (i_size_read(inode) - 1) &gt;&gt; inode-&gt;i_blkbits;</div><div class='del'>-	/* first map all the buffers, logging any direct items we find */</div><div class='del'>-	do {</div><div class='del'>-		if (block &gt; last_block) {</div><div class='del'>-			/*</div><div class='del'>-			 * This can happen when the block size is less than</div><div class='del'>-			 * the folio size.  The corresponding bytes in the folio</div><div class='del'>-			 * were zero filled above</div><div class='del'>-			 */</div><div class='del'>-			clear_buffer_dirty(bh);</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-		} else if ((checked || buffer_dirty(bh)) &amp;&amp;</div><div class='del'>-			   (!buffer_mapped(bh) || bh-&gt;b_blocknr == 0)) {</div><div class='del'>-			/*</div><div class='del'>-			 * not mapped yet, or it points to a direct item, search</div><div class='del'>-			 * the btree for the mapping info, and log any direct</div><div class='del'>-			 * items found</div><div class='del'>-			 */</div><div class='del'>-			if ((error = map_block_for_writepage(inode, bh, block))) {</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		bh = bh-&gt;b_this_page;</div><div class='del'>-		block++;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we start the transaction after map_block_for_writepage,</div><div class='del'>-	 * because it can create holes in the file (an unbounded operation).</div><div class='del'>-	 * starting it here, we can make a reliable estimate for how many</div><div class='del'>-	 * blocks we're going to log</div><div class='del'>-	 */</div><div class='del'>-	if (checked) {</div><div class='del'>-		folio_clear_checked(folio);</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-		error = journal_begin(&amp;th, s, bh_per_page + 1);</div><div class='del'>-		if (error) {</div><div class='del'>-			reiserfs_write_unlock(s);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-	}</div><div class='del'>-	/* now go through and lock any dirty buffers on the folio */</div><div class='del'>-	do {</div><div class='del'>-		get_bh(bh);</div><div class='del'>-		if (!buffer_mapped(bh))</div><div class='del'>-			continue;</div><div class='del'>-		if (buffer_mapped(bh) &amp;&amp; bh-&gt;b_blocknr == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (checked) {</div><div class='del'>-			reiserfs_prepare_for_journal(s, bh, 1);</div><div class='del'>-			journal_mark_dirty(&amp;th, bh);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * from this point on, we know the buffer is mapped to a</div><div class='del'>-		 * real block and not a direct item</div><div class='del'>-		 */</div><div class='del'>-		if (wbc-&gt;sync_mode != WB_SYNC_NONE) {</div><div class='del'>-			lock_buffer(bh);</div><div class='del'>-		} else {</div><div class='del'>-			if (!trylock_buffer(bh)) {</div><div class='del'>-				folio_redirty_for_writepage(wbc, folio);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (test_clear_buffer_dirty(bh)) {</div><div class='del'>-			mark_buffer_async_write(bh);</div><div class='del'>-		} else {</div><div class='del'>-			unlock_buffer(bh);</div><div class='del'>-		}</div><div class='del'>-	} while ((bh = bh-&gt;b_this_page) != head);</div><div class='del'>-</div><div class='del'>-	if (checked) {</div><div class='del'>-		error = journal_end(&amp;th);</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-		if (error)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(folio_test_writeback(folio));</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * since any buffer might be the only dirty buffer on the folio,</div><div class='del'>-	 * the first submit_bh can bring the folio out of writeback.</div><div class='del'>-	 * be careful with the buffers.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='del'>-		if (buffer_async_write(bh)) {</div><div class='del'>-			submit_bh(REQ_OP_WRITE, bh);</div><div class='del'>-			nr++;</div><div class='del'>-		}</div><div class='del'>-		put_bh(bh);</div><div class='del'>-		bh = next;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-</div><div class='del'>-	error = 0;</div><div class='del'>-done:</div><div class='del'>-	if (nr == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * if this folio only had a direct item, it is very possible for</div><div class='del'>-		 * no io to be required without there being an error.  Or,</div><div class='del'>-		 * someone else could have locked them and sent them down the</div><div class='del'>-		 * pipe without locking the folio</div><div class='del'>-		 */</div><div class='del'>-		bh = head;</div><div class='del'>-		do {</div><div class='del'>-			if (!buffer_uptodate(bh)) {</div><div class='del'>-				partial = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			bh = bh-&gt;b_this_page;</div><div class='del'>-		} while (bh != head);</div><div class='del'>-		if (!partial)</div><div class='del'>-			folio_mark_uptodate(folio);</div><div class='del'>-		folio_end_writeback(folio);</div><div class='del'>-	}</div><div class='del'>-	return error;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	/*</div><div class='del'>-	 * catches various errors, we need to make sure any valid dirty blocks</div><div class='del'>-	 * get to the media.  The folio is currently locked and not marked for</div><div class='del'>-	 * writeback</div><div class='del'>-	 */</div><div class='del'>-	folio_clear_uptodate(folio);</div><div class='del'>-	bh = head;</div><div class='del'>-	do {</div><div class='del'>-		get_bh(bh);</div><div class='del'>-		if (buffer_mapped(bh) &amp;&amp; buffer_dirty(bh) &amp;&amp; bh-&gt;b_blocknr) {</div><div class='del'>-			lock_buffer(bh);</div><div class='del'>-			mark_buffer_async_write(bh);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * clear any dirty bits that might have come from</div><div class='del'>-			 * getting attached to a dirty folio</div><div class='del'>-			 */</div><div class='del'>-			clear_buffer_dirty(bh);</div><div class='del'>-		}</div><div class='del'>-		bh = bh-&gt;b_this_page;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-	folio_set_error(folio);</div><div class='del'>-	BUG_ON(folio_test_writeback(folio));</div><div class='del'>-	folio_start_writeback(folio);</div><div class='del'>-	folio_unlock(folio);</div><div class='del'>-	do {</div><div class='del'>-		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='del'>-		if (buffer_async_write(bh)) {</div><div class='del'>-			clear_buffer_dirty(bh);</div><div class='del'>-			submit_bh(REQ_OP_WRITE, bh);</div><div class='del'>-			nr++;</div><div class='del'>-		}</div><div class='del'>-		put_bh(bh);</div><div class='del'>-		bh = next;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-	goto done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_read_folio(struct file *f, struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return block_read_full_folio(folio, reiserfs_get_block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_writepage(struct page *page, struct writeback_control *wbc)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	reiserfs_wait_on_write_block(inode-&gt;i_sb);</div><div class='del'>-	return reiserfs_write_full_folio(folio, wbc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reiserfs_truncate_failed_write(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	truncate_inode_pages(inode-&gt;i_mapping, inode-&gt;i_size);</div><div class='del'>-	reiserfs_truncate_file(inode, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_write_begin(struct file *file,</div><div class='del'>-				struct address_space *mapping,</div><div class='del'>-				loff_t pos, unsigned len,</div><div class='del'>-				struct page **pagep, void **fsdata)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct page *page;</div><div class='del'>-	pgoff_t index;</div><div class='del'>-	int ret;</div><div class='del'>-	int old_ref = 0;</div><div class='del'>-</div><div class='del'>- 	inode = mapping-&gt;host;</div><div class='del'>-	index = pos &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	page = grab_cache_page_write_begin(mapping, index);</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	*pagep = page;</div><div class='del'>-</div><div class='del'>-	reiserfs_wait_on_write_block(inode-&gt;i_sb);</div><div class='del'>-	fix_tail_page_for_writing(page);</div><div class='del'>-	if (reiserfs_transaction_running(inode-&gt;i_sb)) {</div><div class='del'>-		struct reiserfs_transaction_handle *th;</div><div class='del'>-		th = (struct reiserfs_transaction_handle *)current-&gt;</div><div class='del'>-		    journal_info;</div><div class='del'>-		BUG_ON(!th-&gt;t_refcount);</div><div class='del'>-		BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-		old_ref = th-&gt;t_refcount;</div><div class='del'>-		th-&gt;t_refcount++;</div><div class='del'>-	}</div><div class='del'>-	ret = __block_write_begin(page, pos, len, reiserfs_get_block);</div><div class='del'>-	if (ret &amp;&amp; reiserfs_transaction_running(inode-&gt;i_sb)) {</div><div class='del'>-		struct reiserfs_transaction_handle *th = current-&gt;journal_info;</div><div class='del'>-		/*</div><div class='del'>-		 * this gets a little ugly.  If reiserfs_get_block returned an</div><div class='del'>-		 * error and left a transacstion running, we've got to close</div><div class='del'>-		 * it, and we've got to free handle if it was a persistent</div><div class='del'>-		 * transaction.</div><div class='del'>-		 *</div><div class='del'>-		 * But, if we had nested into an existing transaction, we need</div><div class='del'>-		 * to just drop the ref count on the handle.</div><div class='del'>-		 *</div><div class='del'>-		 * If old_ref == 0, the transaction is from reiserfs_get_block,</div><div class='del'>-		 * and it was a persistent trans.  Otherwise, it was nested</div><div class='del'>-		 * above.</div><div class='del'>-		 */</div><div class='del'>-		if (th-&gt;t_refcount &gt; old_ref) {</div><div class='del'>-			if (old_ref)</div><div class='del'>-				th-&gt;t_refcount--;</div><div class='del'>-			else {</div><div class='del'>-				int err;</div><div class='del'>-				reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-				err = reiserfs_end_persistent_transaction(th);</div><div class='del'>-				reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-				if (err)</div><div class='del'>-					ret = err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ret) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		/* Truncate allocated blocks */</div><div class='del'>-		reiserfs_truncate_failed_write(inode);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	int ret;</div><div class='del'>-	int old_ref = 0;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-	reiserfs_wait_on_write_block(inode-&gt;i_sb);</div><div class='del'>-	reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-</div><div class='del'>-	fix_tail_page_for_writing(page);</div><div class='del'>-	if (reiserfs_transaction_running(inode-&gt;i_sb)) {</div><div class='del'>-		struct reiserfs_transaction_handle *th;</div><div class='del'>-		th = (struct reiserfs_transaction_handle *)current-&gt;</div><div class='del'>-		    journal_info;</div><div class='del'>-		BUG_ON(!th-&gt;t_refcount);</div><div class='del'>-		BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-		old_ref = th-&gt;t_refcount;</div><div class='del'>-		th-&gt;t_refcount++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __block_write_begin(page, from, len, reiserfs_get_block);</div><div class='del'>-	if (ret &amp;&amp; reiserfs_transaction_running(inode-&gt;i_sb)) {</div><div class='del'>-		struct reiserfs_transaction_handle *th = current-&gt;journal_info;</div><div class='del'>-		/*</div><div class='del'>-		 * this gets a little ugly.  If reiserfs_get_block returned an</div><div class='del'>-		 * error and left a transacstion running, we've got to close</div><div class='del'>-		 * it, and we've got to free handle if it was a persistent</div><div class='del'>-		 * transaction.</div><div class='del'>-		 *</div><div class='del'>-		 * But, if we had nested into an existing transaction, we need</div><div class='del'>-		 * to just drop the ref count on the handle.</div><div class='del'>-		 *</div><div class='del'>-		 * If old_ref == 0, the transaction is from reiserfs_get_block,</div><div class='del'>-		 * and it was a persistent trans.  Otherwise, it was nested</div><div class='del'>-		 * above.</div><div class='del'>-		 */</div><div class='del'>-		if (th-&gt;t_refcount &gt; old_ref) {</div><div class='del'>-			if (old_ref)</div><div class='del'>-				th-&gt;t_refcount--;</div><div class='del'>-			else {</div><div class='del'>-				int err;</div><div class='del'>-				reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-				err = reiserfs_end_persistent_transaction(th);</div><div class='del'>-				reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-				if (err)</div><div class='del'>-					ret = err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static sector_t reiserfs_aop_bmap(struct address_space *as, sector_t block)</div><div class='del'>-{</div><div class='del'>-	return generic_block_bmap(as, block, reiserfs_bmap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_write_end(struct file *file, struct address_space *mapping,</div><div class='del'>-			      loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-			      struct page *page, void *fsdata)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = page_folio(page);</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int update_sd = 0;</div><div class='del'>-	struct reiserfs_transaction_handle *th;</div><div class='del'>-	unsigned start;</div><div class='del'>-	bool locked = false;</div><div class='del'>-</div><div class='del'>-	reiserfs_wait_on_write_block(inode-&gt;i_sb);</div><div class='del'>-	if (reiserfs_transaction_running(inode-&gt;i_sb))</div><div class='del'>-		th = current-&gt;journal_info;</div><div class='del'>-	else</div><div class='del'>-		th = NULL;</div><div class='del'>-</div><div class='del'>-	start = pos &amp; (PAGE_SIZE - 1);</div><div class='del'>-	if (unlikely(copied &lt; len)) {</div><div class='del'>-		if (!folio_test_uptodate(folio))</div><div class='del'>-			copied = 0;</div><div class='del'>-</div><div class='del'>-		folio_zero_new_buffers(folio, start + copied, start + len);</div><div class='del'>-	}</div><div class='del'>-	flush_dcache_folio(folio);</div><div class='del'>-</div><div class='del'>-	reiserfs_commit_page(inode, page, start, start + copied);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * generic_commit_write does this for us, but does not update the</div><div class='del'>-	 * transaction tracking stuff when the size changes.  So, we have</div><div class='del'>-	 * to do the i_size updates here.</div><div class='del'>-	 */</div><div class='del'>-	if (pos + copied &gt; inode-&gt;i_size) {</div><div class='del'>-		struct reiserfs_transaction_handle myth;</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		locked = true;</div><div class='del'>-		/*</div><div class='del'>-		 * If the file have grown beyond the border where it</div><div class='del'>-		 * can have a tail, unmark it as needing a tail</div><div class='del'>-		 * packing</div><div class='del'>-		 */</div><div class='del'>-		if ((have_large_tails(inode-&gt;i_sb)</div><div class='del'>-		     &amp;&amp; inode-&gt;i_size &gt; i_block_size(inode) * 4)</div><div class='del'>-		    || (have_small_tails(inode-&gt;i_sb)</div><div class='del'>-			&amp;&amp; inode-&gt;i_size &gt; i_block_size(inode)))</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags &amp;= ~i_pack_on_close_mask;</div><div class='del'>-</div><div class='del'>-		ret = journal_begin(&amp;myth, inode-&gt;i_sb, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto journal_error;</div><div class='del'>-</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-		inode-&gt;i_size = pos + copied;</div><div class='del'>-		/*</div><div class='del'>-		 * this will just nest into our transaction.  It's important</div><div class='del'>-		 * to use mark_inode_dirty so the inode gets pushed around on</div><div class='del'>-		 * the dirty lists, and so that O_SYNC works as expected</div><div class='del'>-		 */</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-		reiserfs_update_sd(&amp;myth, inode);</div><div class='del'>-		update_sd = 1;</div><div class='del'>-		ret = journal_end(&amp;myth);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto journal_error;</div><div class='del'>-	}</div><div class='del'>-	if (th) {</div><div class='del'>-		if (!locked) {</div><div class='del'>-			reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-			locked = true;</div><div class='del'>-		}</div><div class='del'>-		if (!update_sd)</div><div class='del'>-			mark_inode_dirty(inode);</div><div class='del'>-		ret = reiserfs_end_persistent_transaction(th);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (locked)</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-</div><div class='del'>-	if (pos + len &gt; inode-&gt;i_size)</div><div class='del'>-		reiserfs_truncate_failed_write(inode);</div><div class='del'>-</div><div class='del'>-	return ret == 0 ? copied : ret;</div><div class='del'>-</div><div class='del'>-journal_error:</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	locked = false;</div><div class='del'>-	if (th) {</div><div class='del'>-		if (!update_sd)</div><div class='del'>-			reiserfs_update_sd(th, inode);</div><div class='del'>-		ret = reiserfs_end_persistent_transaction(th);</div><div class='del'>-	}</div><div class='del'>-	goto out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_commit_write(struct file *f, struct page *page,</div><div class='del'>-			  unsigned from, unsigned to)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='del'>-	loff_t pos = ((loff_t) page-&gt;index &lt;&lt; PAGE_SHIFT) + to;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int update_sd = 0;</div><div class='del'>-	struct reiserfs_transaction_handle *th = NULL;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-	reiserfs_wait_on_write_block(inode-&gt;i_sb);</div><div class='del'>-	reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-</div><div class='del'>-	if (reiserfs_transaction_running(inode-&gt;i_sb)) {</div><div class='del'>-		th = current-&gt;journal_info;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_commit_page(inode, page, from, to);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * generic_commit_write does this for us, but does not update the</div><div class='del'>-	 * transaction tracking stuff when the size changes.  So, we have</div><div class='del'>-	 * to do the i_size updates here.</div><div class='del'>-	 */</div><div class='del'>-	if (pos &gt; inode-&gt;i_size) {</div><div class='del'>-		struct reiserfs_transaction_handle myth;</div><div class='del'>-		/*</div><div class='del'>-		 * If the file have grown beyond the border where it</div><div class='del'>-		 * can have a tail, unmark it as needing a tail</div><div class='del'>-		 * packing</div><div class='del'>-		 */</div><div class='del'>-		if ((have_large_tails(inode-&gt;i_sb)</div><div class='del'>-		     &amp;&amp; inode-&gt;i_size &gt; i_block_size(inode) * 4)</div><div class='del'>-		    || (have_small_tails(inode-&gt;i_sb)</div><div class='del'>-			&amp;&amp; inode-&gt;i_size &gt; i_block_size(inode)))</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags &amp;= ~i_pack_on_close_mask;</div><div class='del'>-</div><div class='del'>-		ret = journal_begin(&amp;myth, inode-&gt;i_sb, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto journal_error;</div><div class='del'>-</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-		inode-&gt;i_size = pos;</div><div class='del'>-		/*</div><div class='del'>-		 * this will just nest into our transaction.  It's important</div><div class='del'>-		 * to use mark_inode_dirty so the inode gets pushed around</div><div class='del'>-		 * on the dirty lists, and so that O_SYNC works as expected</div><div class='del'>-		 */</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-		reiserfs_update_sd(&amp;myth, inode);</div><div class='del'>-		update_sd = 1;</div><div class='del'>-		ret = journal_end(&amp;myth);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto journal_error;</div><div class='del'>-	}</div><div class='del'>-	if (th) {</div><div class='del'>-		if (!update_sd)</div><div class='del'>-			mark_inode_dirty(inode);</div><div class='del'>-		ret = reiserfs_end_persistent_transaction(th);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-journal_error:</div><div class='del'>-	if (th) {</div><div class='del'>-		if (!update_sd)</div><div class='del'>-			reiserfs_update_sd(th, inode);</div><div class='del'>-		ret = reiserfs_end_persistent_transaction(th);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (reiserfs_attrs(inode-&gt;i_sb)) {</div><div class='del'>-		if (sd_attrs &amp; REISERFS_SYNC_FL)</div><div class='del'>-			inode-&gt;i_flags |= S_SYNC;</div><div class='del'>-		else</div><div class='del'>-			inode-&gt;i_flags &amp;= ~S_SYNC;</div><div class='del'>-		if (sd_attrs &amp; REISERFS_IMMUTABLE_FL)</div><div class='del'>-			inode-&gt;i_flags |= S_IMMUTABLE;</div><div class='del'>-		else</div><div class='del'>-			inode-&gt;i_flags &amp;= ~S_IMMUTABLE;</div><div class='del'>-		if (sd_attrs &amp; REISERFS_APPEND_FL)</div><div class='del'>-			inode-&gt;i_flags |= S_APPEND;</div><div class='del'>-		else</div><div class='del'>-			inode-&gt;i_flags &amp;= ~S_APPEND;</div><div class='del'>-		if (sd_attrs &amp; REISERFS_NOATIME_FL)</div><div class='del'>-			inode-&gt;i_flags |= S_NOATIME;</div><div class='del'>-		else</div><div class='del'>-			inode-&gt;i_flags &amp;= ~S_NOATIME;</div><div class='del'>-		if (sd_attrs &amp; REISERFS_NOTAIL_FL)</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags |= i_nopack_mask;</div><div class='del'>-		else</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags &amp;= ~i_nopack_mask;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * decide if this buffer needs to stay around for data logging or ordered</div><div class='del'>- * write purposes</div><div class='del'>- */</div><div class='del'>-static int invalidate_folio_can_drop(struct inode *inode, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	int ret = 1;</div><div class='del'>-	struct reiserfs_journal *j = SB_JOURNAL(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	lock_buffer(bh);</div><div class='del'>-	spin_lock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-	if (!buffer_mapped(bh)) {</div><div class='del'>-		goto free_jh;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * the page is locked, and the only places that log a data buffer</div><div class='del'>-	 * also lock the page.</div><div class='del'>-	 */</div><div class='del'>-	if (reiserfs_file_data_log(inode)) {</div><div class='del'>-		/*</div><div class='del'>-		 * very conservative, leave the buffer pinned if</div><div class='del'>-		 * anyone might need it.</div><div class='del'>-		 */</div><div class='del'>-		if (buffer_journaled(bh) || buffer_journal_dirty(bh)) {</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='del'>-	} else  if (buffer_dirty(bh)) {</div><div class='del'>-		struct reiserfs_journal_list *jl;</div><div class='del'>-		struct reiserfs_jh *jh = bh-&gt;b_private;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * why is this safe?</div><div class='del'>-		 * reiserfs_setattr updates i_size in the on disk</div><div class='del'>-		 * stat data before allowing vmtruncate to be called.</div><div class='del'>-		 *</div><div class='del'>-		 * If buffer was put onto the ordered list for this</div><div class='del'>-		 * transaction, we know for sure either this transaction</div><div class='del'>-		 * or an older one already has updated i_size on disk,</div><div class='del'>-		 * and this ordered data won't be referenced in the file</div><div class='del'>-		 * if we crash.</div><div class='del'>-		 *</div><div class='del'>-		 * if the buffer was put onto the ordered list for an older</div><div class='del'>-		 * transaction, we need to leave it around</div><div class='del'>-		 */</div><div class='del'>-		if (jh &amp;&amp; (jl = jh-&gt;jl)</div><div class='del'>-		    &amp;&amp; jl != SB_JOURNAL(inode-&gt;i_sb)-&gt;j_current_jl)</div><div class='del'>-			ret = 0;</div><div class='del'>-	}</div><div class='del'>-free_jh:</div><div class='del'>-	if (ret &amp;&amp; bh-&gt;b_private) {</div><div class='del'>-		reiserfs_free_jh(bh);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clm -- taken from fs/buffer.c:block_invalidate_folio */</div><div class='del'>-static void reiserfs_invalidate_folio(struct folio *folio, size_t offset,</div><div class='del'>-				    size_t length)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *head, *bh, *next;</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	unsigned int curr_off = 0;</div><div class='del'>-	unsigned int stop = offset + length;</div><div class='del'>-	int partial_page = (offset || length &lt; folio_size(folio));</div><div class='del'>-	int ret = 1;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!folio_test_locked(folio));</div><div class='del'>-</div><div class='del'>-	if (!partial_page)</div><div class='del'>-		folio_clear_checked(folio);</div><div class='del'>-</div><div class='del'>-	head = folio_buffers(folio);</div><div class='del'>-	if (!head)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	bh = head;</div><div class='del'>-	do {</div><div class='del'>-		unsigned int next_off = curr_off + bh-&gt;b_size;</div><div class='del'>-		next = bh-&gt;b_this_page;</div><div class='del'>-</div><div class='del'>-		if (next_off &gt; stop)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * is this block fully invalidated?</div><div class='del'>-		 */</div><div class='del'>-		if (offset &lt;= curr_off) {</div><div class='del'>-			if (invalidate_folio_can_drop(inode, bh))</div><div class='del'>-				reiserfs_unmap_buffer(bh);</div><div class='del'>-			else</div><div class='del'>-				ret = 0;</div><div class='del'>-		}</div><div class='del'>-		curr_off = next_off;</div><div class='del'>-		bh = next;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We release buffers only if the entire page is being invalidated.</div><div class='del'>-	 * The get_block cached value has been unconditionally invalidated,</div><div class='del'>-	 * so real IO is not possible anymore.</div><div class='del'>-	 */</div><div class='del'>-	if (!partial_page &amp;&amp; ret) {</div><div class='del'>-		ret = filemap_release_folio(folio, 0);</div><div class='del'>-		/* maybe should BUG_ON(!ret); - neilb */</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool reiserfs_dirty_folio(struct address_space *mapping,</div><div class='del'>-		struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	if (reiserfs_file_data_log(mapping-&gt;host)) {</div><div class='del'>-		folio_set_checked(folio);</div><div class='del'>-		return filemap_dirty_folio(mapping, folio);</div><div class='del'>-	}</div><div class='del'>-	return block_dirty_folio(mapping, folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns true if the folio's buffers were dropped.  The folio is locked.</div><div class='del'>- *</div><div class='del'>- * Takes j_dirty_buffers_lock to protect the b_assoc_buffers list_heads</div><div class='del'>- * in the buffers at folio_buffers(folio).</div><div class='del'>- *</div><div class='del'>- * even in -o notail mode, we can't be sure an old mount without -o notail</div><div class='del'>- * didn't create files with tails.</div><div class='del'>- */</div><div class='del'>-static bool reiserfs_release_folio(struct folio *folio, gfp_t unused_gfp_flags)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = folio-&gt;mapping-&gt;host;</div><div class='del'>-	struct reiserfs_journal *j = SB_JOURNAL(inode-&gt;i_sb);</div><div class='del'>-	struct buffer_head *head;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	bool ret = true;</div><div class='del'>-</div><div class='del'>-	WARN_ON(folio_test_checked(folio));</div><div class='del'>-	spin_lock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-	head = folio_buffers(folio);</div><div class='del'>-	bh = head;</div><div class='del'>-	do {</div><div class='del'>-		if (bh-&gt;b_private) {</div><div class='del'>-			if (!buffer_dirty(bh) &amp;&amp; !buffer_locked(bh)) {</div><div class='del'>-				reiserfs_free_jh(bh);</div><div class='del'>-			} else {</div><div class='del'>-				ret = false;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		bh = bh-&gt;b_this_page;</div><div class='del'>-	} while (bh != head);</div><div class='del'>-	if (ret)</div><div class='del'>-		ret = try_to_free_buffers(folio);</div><div class='del'>-	spin_unlock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We thank Mingming Cao for helping us understand in great detail what</div><div class='del'>- * to do in this section of the code.</div><div class='del'>- */</div><div class='del'>-static ssize_t reiserfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)</div><div class='del'>-{</div><div class='del'>-	struct file *file = iocb-&gt;ki_filp;</div><div class='del'>-	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='del'>-	size_t count = iov_iter_count(iter);</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	ret = blockdev_direct_IO(iocb, inode, iter,</div><div class='del'>-				 reiserfs_get_blocks_direct_io);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In case of error extending write may have instantiated a few</div><div class='del'>-	 * blocks outside i_size. Trim these off again.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(iov_iter_rw(iter) == WRITE &amp;&amp; ret &lt; 0)) {</div><div class='del'>-		loff_t isize = i_size_read(inode);</div><div class='del'>-		loff_t end = iocb-&gt;ki_pos + count;</div><div class='del'>-</div><div class='del'>-		if ((end &gt; isize) &amp;&amp; inode_newsize_ok(inode, isize) == 0) {</div><div class='del'>-			truncate_setsize(inode, isize);</div><div class='del'>-			reiserfs_vfs_truncate_file(inode);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		     struct iattr *attr)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	unsigned int ia_valid;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = setattr_prepare(&amp;nop_mnt_idmap, dentry, attr);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	/* must be turned off for recursive notify_change calls */</div><div class='del'>-	ia_valid = attr-&gt;ia_valid &amp;= ~(ATTR_KILL_SUID|ATTR_KILL_SGID);</div><div class='del'>-</div><div class='del'>-	if (is_quota_modification(&amp;nop_mnt_idmap, inode, attr)) {</div><div class='del'>-		error = dquot_initialize(inode);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	if (attr-&gt;ia_valid &amp; ATTR_SIZE) {</div><div class='del'>-		/*</div><div class='del'>-		 * version 2 items will be caught by the s_maxbytes check</div><div class='del'>-		 * done for us in vmtruncate</div><div class='del'>-		 */</div><div class='del'>-		if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5 &amp;&amp;</div><div class='del'>-		    attr-&gt;ia_size &gt; MAX_NON_LFS) {</div><div class='del'>-			reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-			error = -EFBIG;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		inode_dio_wait(inode);</div><div class='del'>-</div><div class='del'>-		/* fill in hole pointers in the expanding truncate case. */</div><div class='del'>-		if (attr-&gt;ia_size &gt; inode-&gt;i_size) {</div><div class='del'>-			loff_t pos = attr-&gt;ia_size;</div><div class='del'>-</div><div class='del'>-			if ((pos &amp; (inode-&gt;i_sb-&gt;s_blocksize - 1)) == 0)</div><div class='del'>-				pos++;</div><div class='del'>-			error = generic_cont_expand_simple(inode, pos);</div><div class='del'>-			if (REISERFS_I(inode)-&gt;i_prealloc_count &gt; 0) {</div><div class='del'>-				int err;</div><div class='del'>-				struct reiserfs_transaction_handle th;</div><div class='del'>-				/* we're changing at most 2 bitmaps, inode + super */</div><div class='del'>-				err = journal_begin(&amp;th, inode-&gt;i_sb, 4);</div><div class='del'>-				if (!err) {</div><div class='del'>-					reiserfs_discard_prealloc(&amp;th, inode);</div><div class='del'>-					err = journal_end(&amp;th);</div><div class='del'>-				}</div><div class='del'>-				if (err)</div><div class='del'>-					error = err;</div><div class='del'>-			}</div><div class='del'>-			if (error) {</div><div class='del'>-				reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * file size is changed, ctime and mtime are</div><div class='del'>-			 * to be updated</div><div class='del'>-			 */</div><div class='del'>-			attr-&gt;ia_valid |= (ATTR_MTIME | ATTR_CTIME);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	if ((((attr-&gt;ia_valid &amp; ATTR_UID) &amp;&amp; (from_kuid(&amp;init_user_ns, attr-&gt;ia_uid) &amp; ~0xffff)) ||</div><div class='del'>-	     ((attr-&gt;ia_valid &amp; ATTR_GID) &amp;&amp; (from_kgid(&amp;init_user_ns, attr-&gt;ia_gid) &amp; ~0xffff))) &amp;&amp;</div><div class='del'>-	    (get_inode_sd_version(inode) == STAT_DATA_V1)) {</div><div class='del'>-		/* stat data of format v3.5 has 16 bit uid and gid */</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ia_valid &amp; ATTR_UID &amp;&amp; !uid_eq(attr-&gt;ia_uid, inode-&gt;i_uid)) ||</div><div class='del'>-	    (ia_valid &amp; ATTR_GID &amp;&amp; !gid_eq(attr-&gt;ia_gid, inode-&gt;i_gid))) {</div><div class='del'>-		struct reiserfs_transaction_handle th;</div><div class='del'>-		int jbegin_count =</div><div class='del'>-		    2 *</div><div class='del'>-		    (REISERFS_QUOTA_INIT_BLOCKS(inode-&gt;i_sb) +</div><div class='del'>-		     REISERFS_QUOTA_DEL_BLOCKS(inode-&gt;i_sb)) +</div><div class='del'>-		    2;</div><div class='del'>-</div><div class='del'>-		error = reiserfs_chown_xattrs(inode, attr);</div><div class='del'>-</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * (user+group)*(old+new) structure - we count quota</div><div class='del'>-		 * info and , inode write (sb, inode)</div><div class='del'>-		 */</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		error = journal_begin(&amp;th, inode-&gt;i_sb, jbegin_count);</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		if (error)</div><div class='del'>-			goto out;</div><div class='del'>-		error = dquot_transfer(&amp;nop_mnt_idmap, inode, attr);</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		if (error) {</div><div class='del'>-			journal_end(&amp;th);</div><div class='del'>-			reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Update corresponding info in inode so that everything</div><div class='del'>-		 * is in one transaction</div><div class='del'>-		 */</div><div class='del'>-		if (attr-&gt;ia_valid &amp; ATTR_UID)</div><div class='del'>-			inode-&gt;i_uid = attr-&gt;ia_uid;</div><div class='del'>-		if (attr-&gt;ia_valid &amp; ATTR_GID)</div><div class='del'>-			inode-&gt;i_gid = attr-&gt;ia_gid;</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-		error = journal_end(&amp;th);</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		if (error)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((attr-&gt;ia_valid &amp; ATTR_SIZE) &amp;&amp;</div><div class='del'>-	    attr-&gt;ia_size != i_size_read(inode)) {</div><div class='del'>-		error = inode_newsize_ok(inode, attr-&gt;ia_size);</div><div class='del'>-		if (!error) {</div><div class='del'>-			/*</div><div class='del'>-			 * Could race against reiserfs_file_release</div><div class='del'>-			 * if called from NFS, so take tailpack mutex.</div><div class='del'>-			 */</div><div class='del'>-			mutex_lock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-			truncate_setsize(inode, attr-&gt;ia_size);</div><div class='del'>-			reiserfs_truncate_file(inode, 1);</div><div class='del'>-			mutex_unlock(&amp;REISERFS_I(inode)-&gt;tailpack);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!error) {</div><div class='del'>-		setattr_copy(&amp;nop_mnt_idmap, inode, attr);</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!error &amp;&amp; reiserfs_posixacl(inode-&gt;i_sb)) {</div><div class='del'>-		if (attr-&gt;ia_valid &amp; ATTR_MODE)</div><div class='del'>-			error = reiserfs_acl_chmod(dentry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct address_space_operations reiserfs_address_space_operations = {</div><div class='del'>-	.writepage = reiserfs_writepage,</div><div class='del'>-	.read_folio = reiserfs_read_folio,</div><div class='del'>-	.readahead = reiserfs_readahead,</div><div class='del'>-	.release_folio = reiserfs_release_folio,</div><div class='del'>-	.invalidate_folio = reiserfs_invalidate_folio,</div><div class='del'>-	.write_begin = reiserfs_write_begin,</div><div class='del'>-	.write_end = reiserfs_write_end,</div><div class='del'>-	.bmap = reiserfs_aop_bmap,</div><div class='del'>-	.direct_IO = reiserfs_direct_IO,</div><div class='del'>-	.dirty_folio = reiserfs_dirty_folio,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c<br/>deleted file mode 100644<br/>index dd33f8cc6eda..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/ioctl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/ioctl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,221 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/compat.h&gt;</div><div class='del'>-#include &lt;linux/fileattr.h&gt;</div><div class='del'>-</div><div class='del'>-int reiserfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-</div><div class='del'>-	if (!reiserfs_attrs(inode-&gt;i_sb))</div><div class='del'>-		return -ENOTTY;</div><div class='del'>-</div><div class='del'>-	fileattr_fill_flags(fa, REISERFS_I(inode)-&gt;i_attrs);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-			  struct dentry *dentry, struct fileattr *fa)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	unsigned int flags = fa-&gt;flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	err = -ENOTTY;</div><div class='del'>-	if (!reiserfs_attrs(inode-&gt;i_sb))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = -EOPNOTSUPP;</div><div class='del'>-	if (fileattr_has_fsx(fa))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Is it quota file? Do not allow user to mess with it</div><div class='del'>-	 */</div><div class='del'>-	err = -EPERM;</div><div class='del'>-	if (IS_NOQUOTA(inode))</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; REISERFS_NOTAIL_FL) &amp;&amp; S_ISREG(inode-&gt;i_mode)) {</div><div class='del'>-		err = reiserfs_unpack(inode);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='del'>-	}</div><div class='del'>-	sd_attrs_to_i_attrs(flags, inode);</div><div class='del'>-	REISERFS_I(inode)-&gt;i_attrs = flags;</div><div class='del'>-	inode_set_ctime_current(inode);</div><div class='del'>-	mark_inode_dirty(inode);</div><div class='del'>-	err = 0;</div><div class='del'>-unlock:</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * reiserfs_ioctl - handler for ioctl for inode</div><div class='del'>- * supported commands:</div><div class='del'>- *  1) REISERFS_IOC_UNPACK - try to unpack tail from direct item into indirect</div><div class='del'>- *                           and prevent packing file (argument arg has t</div><div class='del'>- *			      be non-zero)</div><div class='del'>- *  2) REISERFS_IOC_[GS]ETFLAGS, REISERFS_IOC_[GS]ETVERSION</div><div class='del'>- *  3) That's all for a while ...</div><div class='del'>- */</div><div class='del'>-long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = file_inode(filp);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case REISERFS_IOC_UNPACK:</div><div class='del'>-		if (S_ISREG(inode-&gt;i_mode)) {</div><div class='del'>-			if (arg)</div><div class='del'>-				err = reiserfs_unpack(inode);</div><div class='del'>-		} else</div><div class='del'>-			err = -ENOTTY;</div><div class='del'>-		break;</div><div class='del'>-		/*</div><div class='del'>-		 * following two cases are taken from fs/ext2/ioctl.c by Remy</div><div class='del'>-		 * Card (card@masi.ibp.fr)</div><div class='del'>-		 */</div><div class='del'>-	case REISERFS_IOC_GETVERSION:</div><div class='del'>-		err = put_user(inode-&gt;i_generation, (int __user *)arg);</div><div class='del'>-		break;</div><div class='del'>-	case REISERFS_IOC_SETVERSION:</div><div class='del'>-		if (!inode_owner_or_capable(&amp;nop_mnt_idmap, inode)) {</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		err = mnt_want_write_file(filp);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		if (get_user(inode-&gt;i_generation, (int __user *)arg)) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			goto setversion_out;</div><div class='del'>-		}</div><div class='del'>-		inode_set_ctime_current(inode);</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-setversion_out:</div><div class='del'>-		mnt_drop_write_file(filp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -ENOTTY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-long reiserfs_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-				unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * These are just misnamed, they actually</div><div class='del'>-	 * get/put from/to user an int</div><div class='del'>-	 */</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case REISERFS_IOC32_UNPACK:</div><div class='del'>-		cmd = REISERFS_IOC_UNPACK;</div><div class='del'>-		break;</div><div class='del'>-	case REISERFS_IOC32_GETVERSION:</div><div class='del'>-		cmd = REISERFS_IOC_GETVERSION;</div><div class='del'>-		break;</div><div class='del'>-	case REISERFS_IOC32_SETVERSION:</div><div class='del'>-		cmd = REISERFS_IOC_SETVERSION;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return reiserfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int reiserfs_commit_write(struct file *f, struct page *page,</div><div class='del'>-			  unsigned from, unsigned to);</div><div class='del'>-/*</div><div class='del'>- * reiserfs_unpack</div><div class='del'>- * Function try to convert tail from direct item into indirect.</div><div class='del'>- * It set up nopack attribute in the REISERFS_I(inode)-&gt;nopack</div><div class='del'>- */</div><div class='del'>-int reiserfs_unpack(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-	int index;</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct address_space *mapping;</div><div class='del'>-	unsigned long write_from;</div><div class='del'>-	unsigned long blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;i_size == 0) {</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags |= i_nopack_mask;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* ioctl already done */</div><div class='del'>-	if (REISERFS_I(inode)-&gt;i_flags &amp; i_nopack_mask) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we need to make sure nobody is changing the file size beneath us */</div><div class='del'>-	{</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		inode_lock(inode);</div><div class='del'>-		reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	write_from = inode-&gt;i_size &amp; (blocksize - 1);</div><div class='del'>-	/* if we are on a block boundary, we are already unpacked.  */</div><div class='del'>-	if (write_from == 0) {</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags |= i_nopack_mask;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we unpack by finding the page with the tail, and calling</div><div class='del'>-	 * __reiserfs_write_begin on that page.  This will force a</div><div class='del'>-	 * reiserfs_get_block to unpack the tail for us.</div><div class='del'>-	 */</div><div class='del'>-	index = inode-&gt;i_size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	mapping = inode-&gt;i_mapping;</div><div class='del'>-	page = grab_cache_page(mapping, index);</div><div class='del'>-	retval = -ENOMEM;</div><div class='del'>-	if (!page) {</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	retval = __reiserfs_write_begin(page, write_from, 0);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='del'>-	/* conversion can change page contents, must flush */</div><div class='del'>-	flush_dcache_page(page);</div><div class='del'>-	retval = reiserfs_commit_write(NULL, page, write_from, write_from);</div><div class='del'>-	REISERFS_I(inode)-&gt;i_flags |= i_nopack_mask;</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	unlock_page(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c<br/>deleted file mode 100644<br/>index 3a5a752d96c7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/item_ops.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/item_ops.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,744 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this contains item handlers for old item types: sd, direct,</div><div class='del'>- * indirect, directory</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * and where are the comments? how about saying where we can find an</div><div class='del'>- * explanation of each item handler method? -Hans</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* stat data functions */</div><div class='del'>-static int sd_bytes_number(struct item_head *ih, int block_size)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_decrement_key(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	key-&gt;on_disk_key.k_objectid--;</div><div class='del'>-	set_cpu_key_k_type(key, TYPE_ANY);</div><div class='del'>-	set_cpu_key_k_offset(key, (loff_t)(~0ULL &gt;&gt; 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sd_is_left_mergeable(struct reiserfs_key *key, unsigned long bsize)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_print_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	printk("\tmode | size | nlinks | first direct | mtime\n");</div><div class='del'>-	if (stat_data_v1(ih)) {</div><div class='del'>-		struct stat_data_v1 *sd = (struct stat_data_v1 *)item;</div><div class='del'>-</div><div class='del'>-		printk("\t0%-6o | %6u | %2u | %d | %u\n", sd_v1_mode(sd),</div><div class='del'>-		       sd_v1_size(sd), sd_v1_nlink(sd),</div><div class='del'>-		       sd_v1_first_direct_byte(sd),</div><div class='del'>-		       sd_v1_mtime(sd));</div><div class='del'>-	} else {</div><div class='del'>-		struct stat_data *sd = (struct stat_data *)item;</div><div class='del'>-</div><div class='del'>-		printk("\t0%-6o | %6llu | %2u | %d | %u\n", sd_v2_mode(sd),</div><div class='del'>-		       (unsigned long long)sd_v2_size(sd), sd_v2_nlink(sd),</div><div class='del'>-		       sd_v2_rdev(sd), sd_v2_mtime(sd));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_check_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	/* unused */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sd_create_vi(struct virtual_node *vn,</div><div class='del'>-			struct virtual_item *vi,</div><div class='del'>-			int is_affected, int insert_size)</div><div class='del'>-{</div><div class='del'>-	vi-&gt;vi_index = TYPE_STAT_DATA;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sd_check_left(struct virtual_item *vi, int free,</div><div class='del'>-			 int start_skip, int end_skip)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(start_skip || end_skip);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sd_check_right(struct virtual_item *vi, int free)</div><div class='del'>-{</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sd_part_size(struct virtual_item *vi, int first, int count)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(count);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sd_unit_num(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	return vi-&gt;vi_item_len - IH_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sd_print_vi(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "reiserfs-16100",</div><div class='del'>-			 "STATDATA, index %d, type 0x%x, %h",</div><div class='del'>-			 vi-&gt;vi_index, vi-&gt;vi_type, vi-&gt;vi_ih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct item_operations stat_data_ops = {</div><div class='del'>-	.bytes_number = sd_bytes_number,</div><div class='del'>-	.decrement_key = sd_decrement_key,</div><div class='del'>-	.is_left_mergeable = sd_is_left_mergeable,</div><div class='del'>-	.print_item = sd_print_item,</div><div class='del'>-	.check_item = sd_check_item,</div><div class='del'>-</div><div class='del'>-	.create_vi = sd_create_vi,</div><div class='del'>-	.check_left = sd_check_left,</div><div class='del'>-	.check_right = sd_check_right,</div><div class='del'>-	.part_size = sd_part_size,</div><div class='del'>-	.unit_num = sd_unit_num,</div><div class='del'>-	.print_vi = sd_print_vi</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* direct item functions */</div><div class='del'>-static int direct_bytes_number(struct item_head *ih, int block_size)</div><div class='del'>-{</div><div class='del'>-	return ih_item_len(ih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: this should probably switch to indirect as well */</div><div class='del'>-static void direct_decrement_key(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	cpu_key_k_offset_dec(key);</div><div class='del'>-	if (cpu_key_k_offset(key) == 0)</div><div class='del'>-		set_cpu_key_k_type(key, TYPE_STAT_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direct_is_left_mergeable(struct reiserfs_key *key,</div><div class='del'>-				    unsigned long bsize)</div><div class='del'>-{</div><div class='del'>-	int version = le_key_version(key);</div><div class='del'>-	return ((le_key_k_offset(version, key) &amp; (bsize - 1)) != 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direct_print_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	int j = 0;</div><div class='del'>-</div><div class='del'>-/*    return; */</div><div class='del'>-	printk("\"");</div><div class='del'>-	while (j &lt; ih_item_len(ih))</div><div class='del'>-		printk("%c", item[j++]);</div><div class='del'>-	printk("\"\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direct_check_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	/* unused */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direct_create_vi(struct virtual_node *vn,</div><div class='del'>-			    struct virtual_item *vi,</div><div class='del'>-			    int is_affected, int insert_size)</div><div class='del'>-{</div><div class='del'>-	vi-&gt;vi_index = TYPE_DIRECT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direct_check_left(struct virtual_item *vi, int free,</div><div class='del'>-			     int start_skip, int end_skip)</div><div class='del'>-{</div><div class='del'>-	int bytes;</div><div class='del'>-</div><div class='del'>-	bytes = free - free % 8;</div><div class='del'>-	return bytes ? : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direct_check_right(struct virtual_item *vi, int free)</div><div class='del'>-{</div><div class='del'>-	return direct_check_left(vi, free, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direct_part_size(struct virtual_item *vi, int first, int count)</div><div class='del'>-{</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direct_unit_num(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	return vi-&gt;vi_item_len - IH_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direct_print_vi(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "reiserfs-16101",</div><div class='del'>-			 "DIRECT, index %d, type 0x%x, %h",</div><div class='del'>-			 vi-&gt;vi_index, vi-&gt;vi_type, vi-&gt;vi_ih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct item_operations direct_ops = {</div><div class='del'>-	.bytes_number = direct_bytes_number,</div><div class='del'>-	.decrement_key = direct_decrement_key,</div><div class='del'>-	.is_left_mergeable = direct_is_left_mergeable,</div><div class='del'>-	.print_item = direct_print_item,</div><div class='del'>-	.check_item = direct_check_item,</div><div class='del'>-</div><div class='del'>-	.create_vi = direct_create_vi,</div><div class='del'>-	.check_left = direct_check_left,</div><div class='del'>-	.check_right = direct_check_right,</div><div class='del'>-	.part_size = direct_part_size,</div><div class='del'>-	.unit_num = direct_unit_num,</div><div class='del'>-	.print_vi = direct_print_vi</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* indirect item functions */</div><div class='del'>-static int indirect_bytes_number(struct item_head *ih, int block_size)</div><div class='del'>-{</div><div class='del'>-	return ih_item_len(ih) / UNFM_P_SIZE * block_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* decrease offset, if it becomes 0, change type to stat data */</div><div class='del'>-static void indirect_decrement_key(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	cpu_key_k_offset_dec(key);</div><div class='del'>-	if (cpu_key_k_offset(key) == 0)</div><div class='del'>-		set_cpu_key_k_type(key, TYPE_STAT_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* if it is not first item of the body, then it is mergeable */</div><div class='del'>-static int indirect_is_left_mergeable(struct reiserfs_key *key,</div><div class='del'>-				      unsigned long bsize)</div><div class='del'>-{</div><div class='del'>-	int version = le_key_version(key);</div><div class='del'>-	return (le_key_k_offset(version, key) != 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* printing of indirect item */</div><div class='del'>-static void start_new_sequence(__u32 * start, int *len, __u32 new)</div><div class='del'>-{</div><div class='del'>-	*start = new;</div><div class='del'>-	*len = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sequence_finished(__u32 start, int *len, __u32 new)</div><div class='del'>-{</div><div class='del'>-	if (start == INT_MAX)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (start == 0 &amp;&amp; new == 0) {</div><div class='del'>-		(*len)++;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (start != 0 &amp;&amp; (start + *len) == new) {</div><div class='del'>-		(*len)++;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_sequence(__u32 start, int len)</div><div class='del'>-{</div><div class='del'>-	if (start == INT_MAX)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (len == 1)</div><div class='del'>-		printk(" %d", start);</div><div class='del'>-	else</div><div class='del'>-		printk(" %d(%d)", start, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void indirect_print_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	int j;</div><div class='del'>-	__le32 *unp;</div><div class='del'>-	__u32 prev = INT_MAX;</div><div class='del'>-	int num = 0;</div><div class='del'>-</div><div class='del'>-	unp = (__le32 *) item;</div><div class='del'>-</div><div class='del'>-	if (ih_item_len(ih) % UNFM_P_SIZE)</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-16102", "invalid item len");</div><div class='del'>-</div><div class='del'>-	printk("%d pointers\n[ ", (int)I_UNFM_NUM(ih));</div><div class='del'>-	for (j = 0; j &lt; I_UNFM_NUM(ih); j++) {</div><div class='del'>-		if (sequence_finished(prev, &amp;num, get_block_num(unp, j))) {</div><div class='del'>-			print_sequence(prev, num);</div><div class='del'>-			start_new_sequence(&amp;prev, &amp;num, get_block_num(unp, j));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	print_sequence(prev, num);</div><div class='del'>-	printk("]\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void indirect_check_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	/* unused */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int indirect_create_vi(struct virtual_node *vn,</div><div class='del'>-			      struct virtual_item *vi,</div><div class='del'>-			      int is_affected, int insert_size)</div><div class='del'>-{</div><div class='del'>-	vi-&gt;vi_index = TYPE_INDIRECT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int indirect_check_left(struct virtual_item *vi, int free,</div><div class='del'>-			       int start_skip, int end_skip)</div><div class='del'>-{</div><div class='del'>-	int bytes;</div><div class='del'>-</div><div class='del'>-	bytes = free - free % UNFM_P_SIZE;</div><div class='del'>-	return bytes ? : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int indirect_check_right(struct virtual_item *vi, int free)</div><div class='del'>-{</div><div class='del'>-	return indirect_check_left(vi, free, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * return size in bytes of 'units' units. If first == 0 - calculate</div><div class='del'>- * from the head (left), otherwise - from tail (right)</div><div class='del'>- */</div><div class='del'>-static int indirect_part_size(struct virtual_item *vi, int first, int units)</div><div class='del'>-{</div><div class='del'>-	/* unit of indirect item is byte (yet) */</div><div class='del'>-	return units;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int indirect_unit_num(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	/* unit of indirect item is byte (yet) */</div><div class='del'>-	return vi-&gt;vi_item_len - IH_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void indirect_print_vi(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "reiserfs-16103",</div><div class='del'>-			 "INDIRECT, index %d, type 0x%x, %h",</div><div class='del'>-			 vi-&gt;vi_index, vi-&gt;vi_type, vi-&gt;vi_ih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct item_operations indirect_ops = {</div><div class='del'>-	.bytes_number = indirect_bytes_number,</div><div class='del'>-	.decrement_key = indirect_decrement_key,</div><div class='del'>-	.is_left_mergeable = indirect_is_left_mergeable,</div><div class='del'>-	.print_item = indirect_print_item,</div><div class='del'>-	.check_item = indirect_check_item,</div><div class='del'>-</div><div class='del'>-	.create_vi = indirect_create_vi,</div><div class='del'>-	.check_left = indirect_check_left,</div><div class='del'>-	.check_right = indirect_check_right,</div><div class='del'>-	.part_size = indirect_part_size,</div><div class='del'>-	.unit_num = indirect_unit_num,</div><div class='del'>-	.print_vi = indirect_print_vi</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* direntry functions */</div><div class='del'>-static int direntry_bytes_number(struct item_head *ih, int block_size)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "vs-16090",</div><div class='del'>-			 "bytes number is asked for direntry");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direntry_decrement_key(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	cpu_key_k_offset_dec(key);</div><div class='del'>-	if (cpu_key_k_offset(key) == 0)</div><div class='del'>-		set_cpu_key_k_type(key, TYPE_STAT_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direntry_is_left_mergeable(struct reiserfs_key *key,</div><div class='del'>-				      unsigned long bsize)</div><div class='del'>-{</div><div class='del'>-	if (le32_to_cpu(key-&gt;u.k_offset_v1.k_offset) == DOT_OFFSET)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direntry_print_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int namelen;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	char *name;</div><div class='del'>-	static char namebuf[80];</div><div class='del'>-</div><div class='del'>-	printk("\n # %-15s%-30s%-15s%-15s%-15s\n", "Name",</div><div class='del'>-	       "Key of pointed object", "Hash", "Gen number", "Status");</div><div class='del'>-</div><div class='del'>-	deh = (struct reiserfs_de_head *)item;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ih_entry_count(ih); i++, deh++) {</div><div class='del'>-		namelen =</div><div class='del'>-		    (i ? (deh_location(deh - 1)) : ih_item_len(ih)) -</div><div class='del'>-		    deh_location(deh);</div><div class='del'>-		name = item + deh_location(deh);</div><div class='del'>-		if (name[namelen - 1] == 0)</div><div class='del'>-			namelen = strlen(name);</div><div class='del'>-		namebuf[0] = '"';</div><div class='del'>-		if (namelen &gt; sizeof(namebuf) - 3) {</div><div class='del'>-			strncpy(namebuf + 1, name, sizeof(namebuf) - 3);</div><div class='del'>-			namebuf[sizeof(namebuf) - 2] = '"';</div><div class='del'>-			namebuf[sizeof(namebuf) - 1] = 0;</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(namebuf + 1, name, namelen);</div><div class='del'>-			namebuf[namelen + 1] = '"';</div><div class='del'>-			namebuf[namelen + 2] = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printk("%d:  %-15s%-15d%-15d%-15lld%-15lld(%s)\n",</div><div class='del'>-		       i, namebuf,</div><div class='del'>-		       deh_dir_id(deh), deh_objectid(deh),</div><div class='del'>-		       GET_HASH_VALUE(deh_offset(deh)),</div><div class='del'>-		       GET_GENERATION_NUMBER((deh_offset(deh))),</div><div class='del'>-		       (de_hidden(deh)) ? "HIDDEN" : "VISIBLE");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direntry_check_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-</div><div class='del'>-	/* unused */</div><div class='del'>-	deh = (struct reiserfs_de_head *)item;</div><div class='del'>-	for (i = 0; i &lt; ih_entry_count(ih); i++, deh++) {</div><div class='del'>-		;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DIRENTRY_VI_FIRST_DIRENTRY_ITEM 1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * function returns old entry number in directory item in real node</div><div class='del'>- * using new entry number in virtual item in virtual node</div><div class='del'>- */</div><div class='del'>-static inline int old_entry_num(int is_affected, int virtual_entry_num,</div><div class='del'>-				int pos_in_item, int mode)</div><div class='del'>-{</div><div class='del'>-	if (mode == M_INSERT || mode == M_DELETE)</div><div class='del'>-		return virtual_entry_num;</div><div class='del'>-</div><div class='del'>-	if (!is_affected)</div><div class='del'>-		/* cut or paste is applied to another item */</div><div class='del'>-		return virtual_entry_num;</div><div class='del'>-</div><div class='del'>-	if (virtual_entry_num &lt; pos_in_item)</div><div class='del'>-		return virtual_entry_num;</div><div class='del'>-</div><div class='del'>-	if (mode == M_CUT)</div><div class='del'>-		return virtual_entry_num + 1;</div><div class='del'>-</div><div class='del'>-	RFALSE(mode != M_PASTE || virtual_entry_num == 0,</div><div class='del'>-	       "vs-8015: old_entry_num: mode must be M_PASTE (mode = \'%c\'",</div><div class='del'>-	       mode);</div><div class='del'>-</div><div class='del'>-	return virtual_entry_num - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create an array of sizes of directory entries for virtual</div><div class='del'>- * item. Return space used by an item. FIXME: no control over</div><div class='del'>- * consuming of space used by this item handler</div><div class='del'>- */</div><div class='del'>-static int direntry_create_vi(struct virtual_node *vn,</div><div class='del'>-			      struct virtual_item *vi,</div><div class='del'>-			      int is_affected, int insert_size)</div><div class='del'>-{</div><div class='del'>-	struct direntry_uarea *dir_u = vi-&gt;vi_uarea;</div><div class='del'>-	int i, j;</div><div class='del'>-	int size = sizeof(struct direntry_uarea);</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-</div><div class='del'>-	vi-&gt;vi_index = TYPE_DIRENTRY;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(vi-&gt;vi_ih) || !vi-&gt;vi_item);</div><div class='del'>-</div><div class='del'>-	dir_u-&gt;flags = 0;</div><div class='del'>-	if (le_ih_k_offset(vi-&gt;vi_ih) == DOT_OFFSET)</div><div class='del'>-		dir_u-&gt;flags |= DIRENTRY_VI_FIRST_DIRENTRY_ITEM;</div><div class='del'>-</div><div class='del'>-	deh = (struct reiserfs_de_head *)(vi-&gt;vi_item);</div><div class='del'>-</div><div class='del'>-	/* virtual directory item have this amount of entry after */</div><div class='del'>-	dir_u-&gt;entry_count = ih_entry_count(vi-&gt;vi_ih) +</div><div class='del'>-	    ((is_affected) ? ((vn-&gt;vn_mode == M_CUT) ? -1 :</div><div class='del'>-			      (vn-&gt;vn_mode == M_PASTE ? 1 : 0)) : 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dir_u-&gt;entry_count; i++) {</div><div class='del'>-		j = old_entry_num(is_affected, i, vn-&gt;vn_pos_in_item,</div><div class='del'>-				  vn-&gt;vn_mode);</div><div class='del'>-		dir_u-&gt;entry_sizes[i] =</div><div class='del'>-		    (j ? deh_location(&amp;deh[j - 1]) : ih_item_len(vi-&gt;vi_ih)) -</div><div class='del'>-		    deh_location(&amp;deh[j]) + DEH_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	size += (dir_u-&gt;entry_count * sizeof(short));</div><div class='del'>-</div><div class='del'>-	/* set size of pasted entry */</div><div class='del'>-	if (is_affected &amp;&amp; vn-&gt;vn_mode == M_PASTE)</div><div class='del'>-		dir_u-&gt;entry_sizes[vn-&gt;vn_pos_in_item] = insert_size;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	/* compare total size of entries with item length */</div><div class='del'>-	{</div><div class='del'>-		int k, l;</div><div class='del'>-</div><div class='del'>-		l = 0;</div><div class='del'>-		for (k = 0; k &lt; dir_u-&gt;entry_count; k++)</div><div class='del'>-			l += dir_u-&gt;entry_sizes[k];</div><div class='del'>-</div><div class='del'>-		if (l + IH_SIZE != vi-&gt;vi_item_len +</div><div class='del'>-		    ((is_affected</div><div class='del'>-		      &amp;&amp; (vn-&gt;vn_mode == M_PASTE</div><div class='del'>-			  || vn-&gt;vn_mode == M_CUT)) ? insert_size : 0)) {</div><div class='del'>-			reiserfs_panic(NULL, "vs-8025", "(mode==%c, "</div><div class='del'>-				       "insert_size==%d), invalid length of "</div><div class='del'>-				       "directory item",</div><div class='del'>-				       vn-&gt;vn_mode, insert_size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * return number of entries which may fit into specified amount of</div><div class='del'>- * free space, or -1 if free space is not enough even for 1 entry</div><div class='del'>- */</div><div class='del'>-static int direntry_check_left(struct virtual_item *vi, int free,</div><div class='del'>-			       int start_skip, int end_skip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int entries = 0;</div><div class='del'>-	struct direntry_uarea *dir_u = vi-&gt;vi_uarea;</div><div class='del'>-</div><div class='del'>-	for (i = start_skip; i &lt; dir_u-&gt;entry_count - end_skip; i++) {</div><div class='del'>-		/* i-th entry doesn't fit into the remaining free space */</div><div class='del'>-		if (dir_u-&gt;entry_sizes[i] &gt; free)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		free -= dir_u-&gt;entry_sizes[i];</div><div class='del'>-		entries++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (entries == dir_u-&gt;entry_count) {</div><div class='del'>-		reiserfs_panic(NULL, "item_ops-1",</div><div class='del'>-			       "free space %d, entry_count %d", free,</div><div class='del'>-			       dir_u-&gt;entry_count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* "." and ".." can not be separated from each other */</div><div class='del'>-	if (start_skip == 0 &amp;&amp; (dir_u-&gt;flags &amp; DIRENTRY_VI_FIRST_DIRENTRY_ITEM)</div><div class='del'>-	    &amp;&amp; entries &lt; 2)</div><div class='del'>-		entries = 0;</div><div class='del'>-</div><div class='del'>-	return entries ? : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direntry_check_right(struct virtual_item *vi, int free)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int entries = 0;</div><div class='del'>-	struct direntry_uarea *dir_u = vi-&gt;vi_uarea;</div><div class='del'>-</div><div class='del'>-	for (i = dir_u-&gt;entry_count - 1; i &gt;= 0; i--) {</div><div class='del'>-		/* i-th entry doesn't fit into the remaining free space */</div><div class='del'>-		if (dir_u-&gt;entry_sizes[i] &gt; free)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		free -= dir_u-&gt;entry_sizes[i];</div><div class='del'>-		entries++;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(entries == dir_u-&gt;entry_count);</div><div class='del'>-</div><div class='del'>-	/* "." and ".." can not be separated from each other */</div><div class='del'>-	if ((dir_u-&gt;flags &amp; DIRENTRY_VI_FIRST_DIRENTRY_ITEM)</div><div class='del'>-	    &amp;&amp; entries &gt; dir_u-&gt;entry_count - 2)</div><div class='del'>-		entries = dir_u-&gt;entry_count - 2;</div><div class='del'>-</div><div class='del'>-	return entries ? : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sum of entry sizes between from-th and to-th entries including both edges */</div><div class='del'>-static int direntry_part_size(struct virtual_item *vi, int first, int count)</div><div class='del'>-{</div><div class='del'>-	int i, retval;</div><div class='del'>-	int from, to;</div><div class='del'>-	struct direntry_uarea *dir_u = vi-&gt;vi_uarea;</div><div class='del'>-</div><div class='del'>-	retval = 0;</div><div class='del'>-	if (first == 0)</div><div class='del'>-		from = 0;</div><div class='del'>-	else</div><div class='del'>-		from = dir_u-&gt;entry_count - count;</div><div class='del'>-	to = from + count - 1;</div><div class='del'>-</div><div class='del'>-	for (i = from; i &lt;= to; i++)</div><div class='del'>-		retval += dir_u-&gt;entry_sizes[i];</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int direntry_unit_num(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	struct direntry_uarea *dir_u = vi-&gt;vi_uarea;</div><div class='del'>-</div><div class='del'>-	return dir_u-&gt;entry_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void direntry_print_vi(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct direntry_uarea *dir_u = vi-&gt;vi_uarea;</div><div class='del'>-</div><div class='del'>-	reiserfs_warning(NULL, "reiserfs-16104",</div><div class='del'>-			 "DIRENTRY, index %d, type 0x%x, %h, flags 0x%x",</div><div class='del'>-			 vi-&gt;vi_index, vi-&gt;vi_type, vi-&gt;vi_ih, dir_u-&gt;flags);</div><div class='del'>-	printk("%d entries: ", dir_u-&gt;entry_count);</div><div class='del'>-	for (i = 0; i &lt; dir_u-&gt;entry_count; i++)</div><div class='del'>-		printk("%d ", dir_u-&gt;entry_sizes[i]);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct item_operations direntry_ops = {</div><div class='del'>-	.bytes_number = direntry_bytes_number,</div><div class='del'>-	.decrement_key = direntry_decrement_key,</div><div class='del'>-	.is_left_mergeable = direntry_is_left_mergeable,</div><div class='del'>-	.print_item = direntry_print_item,</div><div class='del'>-	.check_item = direntry_check_item,</div><div class='del'>-</div><div class='del'>-	.create_vi = direntry_create_vi,</div><div class='del'>-	.check_left = direntry_check_left,</div><div class='del'>-	.check_right = direntry_check_right,</div><div class='del'>-	.part_size = direntry_part_size,</div><div class='del'>-	.unit_num = direntry_unit_num,</div><div class='del'>-	.print_vi = direntry_print_vi</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Error catching functions to catch errors caused by incorrect item types. */</div><div class='del'>-static int errcatch_bytes_number(struct item_head *ih, int block_size)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16001",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void errcatch_decrement_key(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16002",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int errcatch_is_left_mergeable(struct reiserfs_key *key,</div><div class='del'>-				      unsigned long bsize)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16003",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void errcatch_print_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16004",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void errcatch_check_item(struct item_head *ih, char *item)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16005",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int errcatch_create_vi(struct virtual_node *vn,</div><div class='del'>-			      struct virtual_item *vi,</div><div class='del'>-			      int is_affected, int insert_size)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16006",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	/*</div><div class='del'>-	 * We might return -1 here as well, but it won't help as</div><div class='del'>-	 * create_virtual_node() from where this operation is called</div><div class='del'>-	 * from is of return type void.</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int errcatch_check_left(struct virtual_item *vi, int free,</div><div class='del'>-			       int start_skip, int end_skip)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16007",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int errcatch_check_right(struct virtual_item *vi, int free)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16008",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int errcatch_part_size(struct virtual_item *vi, int first, int count)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16009",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int errcatch_unit_num(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16010",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void errcatch_print_vi(struct virtual_item *vi)</div><div class='del'>-{</div><div class='del'>-	reiserfs_warning(NULL, "green-16011",</div><div class='del'>-			 "Invalid item type observed, run fsck ASAP");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct item_operations errcatch_ops = {</div><div class='del'>-	.bytes_number = errcatch_bytes_number,</div><div class='del'>-	.decrement_key = errcatch_decrement_key,</div><div class='del'>-	.is_left_mergeable = errcatch_is_left_mergeable,</div><div class='del'>-	.print_item = errcatch_print_item,</div><div class='del'>-	.check_item = errcatch_check_item,</div><div class='del'>-</div><div class='del'>-	.create_vi = errcatch_create_vi,</div><div class='del'>-	.check_left = errcatch_check_left,</div><div class='del'>-	.check_right = errcatch_check_right,</div><div class='del'>-	.part_size = errcatch_part_size,</div><div class='del'>-	.unit_num = errcatch_unit_num,</div><div class='del'>-	.print_vi = errcatch_print_vi</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if ! (TYPE_STAT_DATA == 0 &amp;&amp; TYPE_INDIRECT == 1 &amp;&amp; TYPE_DIRECT == 2 &amp;&amp; TYPE_DIRENTRY == 3)</div><div class='del'>-#error Item types must use disk-format assigned values.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct item_operations *item_ops[TYPE_ANY + 1] = {</div><div class='del'>-	&amp;stat_data_ops,</div><div class='del'>-	&amp;indirect_ops,</div><div class='del'>-	&amp;direct_ops,</div><div class='del'>-	&amp;direntry_ops,</div><div class='del'>-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-	&amp;errcatch_ops		/* This is to catch errors with invalid type (15th entry for TYPE_ANY) */</div><div class='del'>-};</div><div class='head'>diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c<br/>deleted file mode 100644<br/>index 6474529c4253..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/journal.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/journal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4405 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Write ahead logging implementation copyright Chris Mason 2000</div><div class='del'>- *</div><div class='del'>- * The background commits make this code very interrelated, and</div><div class='del'>- * overly complex.  I need to rethink things a bit....The major players:</div><div class='del'>- *</div><div class='del'>- * journal_begin -- call with the number of blocks you expect to log.</div><div class='del'>- *                  If the current transaction is too</div><div class='del'>- *		    old, it will block until the current transaction is</div><div class='del'>- *		    finished, and then start a new one.</div><div class='del'>- *		    Usually, your transaction will get joined in with</div><div class='del'>- *                  previous ones for speed.</div><div class='del'>- *</div><div class='del'>- * journal_join  -- same as journal_begin, but won't block on the current</div><div class='del'>- *                  transaction regardless of age.  Don't ever call</div><div class='del'>- *                  this.  Ever.  There are only two places it should be</div><div class='del'>- *                  called from, and they are both inside this file.</div><div class='del'>- *</div><div class='del'>- * journal_mark_dirty -- adds blocks into this transaction.  clears any flags</div><div class='del'>- *                       that might make them get sent to disk</div><div class='del'>- *                       and then marks them BH_JDirty.  Puts the buffer head</div><div class='del'>- *                       into the current transaction hash.</div><div class='del'>- *</div><div class='del'>- * journal_end -- if the current transaction is batchable, it does nothing</div><div class='del'>- *                   otherwise, it could do an async/synchronous commit, or</div><div class='del'>- *                   a full flush of all log and real blocks in the</div><div class='del'>- *                   transaction.</div><div class='del'>- *</div><div class='del'>- * flush_old_commits -- if the current transaction is too old, it is ended and</div><div class='del'>- *                      commit blocks are sent to disk.  Forces commit blocks</div><div class='del'>- *                      to disk for all backgrounded commits that have been</div><div class='del'>- *                      around too long.</div><div class='del'>- *		     -- Note, if you call this as an immediate flush from</div><div class='del'>- *		        within kupdate, it will ignore the immediate flag</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/semaphore.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* gets a struct reiserfs_journal_list * from a list head */</div><div class='del'>-#define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \</div><div class='del'>-                               j_list))</div><div class='del'>-</div><div class='del'>-/* must be correct to keep the desc and commit structs at 4k */</div><div class='del'>-#define JOURNAL_TRANS_HALF 1018</div><div class='del'>-#define BUFNR 64		/*read ahead */</div><div class='del'>-</div><div class='del'>-/* cnode stat bits.  Move these into reiserfs_fs.h */</div><div class='del'>-</div><div class='del'>-/* this block was freed, and can't be written.  */</div><div class='del'>-#define BLOCK_FREED 2</div><div class='del'>-/* this block was freed during this transaction, and can't be written */</div><div class='del'>-#define BLOCK_FREED_HOLDER 3</div><div class='del'>-</div><div class='del'>-/* used in flush_journal_list */</div><div class='del'>-#define BLOCK_NEEDS_FLUSH 4</div><div class='del'>-#define BLOCK_DIRTIED 5</div><div class='del'>-</div><div class='del'>-/* journal list state bits */</div><div class='del'>-#define LIST_TOUCHED 1</div><div class='del'>-#define LIST_DIRTY   2</div><div class='del'>-#define LIST_COMMIT_PENDING  4	/* someone will commit this list */</div><div class='del'>-</div><div class='del'>-/* flags for do_journal_end */</div><div class='del'>-#define FLUSH_ALL   1		/* flush commit and real blocks */</div><div class='del'>-#define COMMIT_NOW  2		/* end and commit this transaction */</div><div class='del'>-#define WAIT        4		/* wait for the log blocks to hit the disk */</div><div class='del'>-</div><div class='del'>-static int do_journal_end(struct reiserfs_transaction_handle *, int flags);</div><div class='del'>-static int flush_journal_list(struct super_block *s,</div><div class='del'>-			      struct reiserfs_journal_list *jl, int flushall);</div><div class='del'>-static int flush_commit_list(struct super_block *s,</div><div class='del'>-			     struct reiserfs_journal_list *jl, int flushall);</div><div class='del'>-static int can_dirty(struct reiserfs_journal_cnode *cn);</div><div class='del'>-static int journal_join(struct reiserfs_transaction_handle *th,</div><div class='del'>-			struct super_block *sb);</div><div class='del'>-static void release_journal_dev(struct reiserfs_journal *journal);</div><div class='del'>-static void dirty_one_transaction(struct super_block *s,</div><div class='del'>-				 struct reiserfs_journal_list *jl);</div><div class='del'>-static void flush_async_commits(struct work_struct *work);</div><div class='del'>-static void queue_log_writer(struct super_block *s);</div><div class='del'>-</div><div class='del'>-/* values for join in do_journal_begin_r */</div><div class='del'>-enum {</div><div class='del'>-	JBEGIN_REG = 0,		/* regular journal begin */</div><div class='del'>-	/* join the running transaction if at all possible */</div><div class='del'>-	JBEGIN_JOIN = 1,</div><div class='del'>-	/* called from cleanup code, ignores aborted flag */</div><div class='del'>-	JBEGIN_ABORT = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int do_journal_begin_r(struct reiserfs_transaction_handle *th,</div><div class='del'>-			      struct super_block *sb,</div><div class='del'>-			      unsigned long nblocks, int join);</div><div class='del'>-</div><div class='del'>-static void init_journal_hash(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	memset(journal-&gt;j_hash_table, 0,</div><div class='del'>-	       JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * clears BH_Dirty and sticks the buffer on the clean list.  Called because</div><div class='del'>- * I can't allow refile_buffer to make schedule happen after I've freed a</div><div class='del'>- * block.  Look at remove_from_transaction and journal_mark_freed for</div><div class='del'>- * more details.</div><div class='del'>- */</div><div class='del'>-static int reiserfs_clean_and_file_buffer(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	if (bh) {</div><div class='del'>-		clear_buffer_dirty(bh);</div><div class='del'>-		clear_buffer_journal_test(bh);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct reiserfs_bitmap_node *allocate_bitmap_node(struct super_block</div><div class='del'>-							 *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_bitmap_node *bn;</div><div class='del'>-	static int id;</div><div class='del'>-</div><div class='del'>-	bn = kmalloc(sizeof(struct reiserfs_bitmap_node), GFP_NOFS);</div><div class='del'>-	if (!bn) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	bn-&gt;data = kzalloc(sb-&gt;s_blocksize, GFP_NOFS);</div><div class='del'>-	if (!bn-&gt;data) {</div><div class='del'>-		kfree(bn);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	bn-&gt;id = id++;</div><div class='del'>-	INIT_LIST_HEAD(&amp;bn-&gt;list);</div><div class='del'>-	return bn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct reiserfs_bitmap_node *get_bitmap_node(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_bitmap_node *bn = NULL;</div><div class='del'>-	struct list_head *entry = journal-&gt;j_bitmap_nodes.next;</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_used_bitmap_nodes++;</div><div class='del'>-repeat:</div><div class='del'>-</div><div class='del'>-	if (entry != &amp;journal-&gt;j_bitmap_nodes) {</div><div class='del'>-		bn = list_entry(entry, struct reiserfs_bitmap_node, list);</div><div class='del'>-		list_del(entry);</div><div class='del'>-		memset(bn-&gt;data, 0, sb-&gt;s_blocksize);</div><div class='del'>-		journal-&gt;j_free_bitmap_nodes--;</div><div class='del'>-		return bn;</div><div class='del'>-	}</div><div class='del'>-	bn = allocate_bitmap_node(sb);</div><div class='del'>-	if (!bn) {</div><div class='del'>-		yield();</div><div class='del'>-		goto repeat;</div><div class='del'>-	}</div><div class='del'>-	return bn;</div><div class='del'>-}</div><div class='del'>-static inline void free_bitmap_node(struct super_block *sb,</div><div class='del'>-				    struct reiserfs_bitmap_node *bn)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	journal-&gt;j_used_bitmap_nodes--;</div><div class='del'>-	if (journal-&gt;j_free_bitmap_nodes &gt; REISERFS_MAX_BITMAP_NODES) {</div><div class='del'>-		kfree(bn-&gt;data);</div><div class='del'>-		kfree(bn);</div><div class='del'>-	} else {</div><div class='del'>-		list_add(&amp;bn-&gt;list, &amp;journal-&gt;j_bitmap_nodes);</div><div class='del'>-		journal-&gt;j_free_bitmap_nodes++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void allocate_bitmap_nodes(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_bitmap_node *bn = NULL;</div><div class='del'>-	for (i = 0; i &lt; REISERFS_MIN_BITMAP_NODES; i++) {</div><div class='del'>-		bn = allocate_bitmap_node(sb);</div><div class='del'>-		if (bn) {</div><div class='del'>-			list_add(&amp;bn-&gt;list, &amp;journal-&gt;j_bitmap_nodes);</div><div class='del'>-			journal-&gt;j_free_bitmap_nodes++;</div><div class='del'>-		} else {</div><div class='del'>-			/* this is ok, we'll try again when more are needed */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_bit_in_list_bitmap(struct super_block *sb,</div><div class='del'>-				  b_blocknr_t block,</div><div class='del'>-				  struct reiserfs_list_bitmap *jb)</div><div class='del'>-{</div><div class='del'>-	unsigned int bmap_nr = block / (sb-&gt;s_blocksize &lt;&lt; 3);</div><div class='del'>-	unsigned int bit_nr = block % (sb-&gt;s_blocksize &lt;&lt; 3);</div><div class='del'>-</div><div class='del'>-	if (!jb-&gt;bitmaps[bmap_nr]) {</div><div class='del'>-		jb-&gt;bitmaps[bmap_nr] = get_bitmap_node(sb);</div><div class='del'>-	}</div><div class='del'>-	set_bit(bit_nr, (unsigned long *)jb-&gt;bitmaps[bmap_nr]-&gt;data);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cleanup_bitmap_list(struct super_block *sb,</div><div class='del'>-				struct reiserfs_list_bitmap *jb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	if (jb-&gt;bitmaps == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; reiserfs_bmap_count(sb); i++) {</div><div class='del'>-		if (jb-&gt;bitmaps[i]) {</div><div class='del'>-			free_bitmap_node(sb, jb-&gt;bitmaps[i]);</div><div class='del'>-			jb-&gt;bitmaps[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * only call this on FS unmount.</div><div class='del'>- */</div><div class='del'>-static int free_list_bitmaps(struct super_block *sb,</div><div class='del'>-			     struct reiserfs_list_bitmap *jb_array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct reiserfs_list_bitmap *jb;</div><div class='del'>-	for (i = 0; i &lt; JOURNAL_NUM_BITMAPS; i++) {</div><div class='del'>-		jb = jb_array + i;</div><div class='del'>-		jb-&gt;journal_list = NULL;</div><div class='del'>-		cleanup_bitmap_list(sb, jb);</div><div class='del'>-		vfree(jb-&gt;bitmaps);</div><div class='del'>-		jb-&gt;bitmaps = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int free_bitmap_nodes(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct list_head *next = journal-&gt;j_bitmap_nodes.next;</div><div class='del'>-	struct reiserfs_bitmap_node *bn;</div><div class='del'>-</div><div class='del'>-	while (next != &amp;journal-&gt;j_bitmap_nodes) {</div><div class='del'>-		bn = list_entry(next, struct reiserfs_bitmap_node, list);</div><div class='del'>-		list_del(next);</div><div class='del'>-		kfree(bn-&gt;data);</div><div class='del'>-		kfree(bn);</div><div class='del'>-		next = journal-&gt;j_bitmap_nodes.next;</div><div class='del'>-		journal-&gt;j_free_bitmap_nodes--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get memory for JOURNAL_NUM_BITMAPS worth of bitmaps.</div><div class='del'>- * jb_array is the array to be filled in.</div><div class='del'>- */</div><div class='del'>-int reiserfs_allocate_list_bitmaps(struct super_block *sb,</div><div class='del'>-				   struct reiserfs_list_bitmap *jb_array,</div><div class='del'>-				   unsigned int bmap_nr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int failed = 0;</div><div class='del'>-	struct reiserfs_list_bitmap *jb;</div><div class='del'>-	int mem = bmap_nr * sizeof(struct reiserfs_bitmap_node *);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; JOURNAL_NUM_BITMAPS; i++) {</div><div class='del'>-		jb = jb_array + i;</div><div class='del'>-		jb-&gt;journal_list = NULL;</div><div class='del'>-		jb-&gt;bitmaps = vzalloc(mem);</div><div class='del'>-		if (!jb-&gt;bitmaps) {</div><div class='del'>-			reiserfs_warning(sb, "clm-2000", "unable to "</div><div class='del'>-					 "allocate bitmaps for journal lists");</div><div class='del'>-			failed = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (failed) {</div><div class='del'>-		free_list_bitmaps(sb, jb_array);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * find an available list bitmap.  If you can't find one, flush a commit list</div><div class='del'>- * and try again</div><div class='del'>- */</div><div class='del'>-static struct reiserfs_list_bitmap *get_list_bitmap(struct super_block *sb,</div><div class='del'>-						    struct reiserfs_journal_list</div><div class='del'>-						    *jl)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_list_bitmap *jb = NULL;</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; (JOURNAL_NUM_BITMAPS * 3); j++) {</div><div class='del'>-		i = journal-&gt;j_list_bitmap_index;</div><div class='del'>-		journal-&gt;j_list_bitmap_index = (i + 1) % JOURNAL_NUM_BITMAPS;</div><div class='del'>-		jb = journal-&gt;j_list_bitmap + i;</div><div class='del'>-		if (journal-&gt;j_list_bitmap[i].journal_list) {</div><div class='del'>-			flush_commit_list(sb,</div><div class='del'>-					  journal-&gt;j_list_bitmap[i].</div><div class='del'>-					  journal_list, 1);</div><div class='del'>-			if (!journal-&gt;j_list_bitmap[i].journal_list) {</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* double check to make sure if flushed correctly */</div><div class='del'>-	if (jb-&gt;journal_list)</div><div class='del'>-		return NULL;</div><div class='del'>-	jb-&gt;journal_list = jl;</div><div class='del'>-	return jb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * allocates a new chunk of X nodes, and links them all together as a list.</div><div class='del'>- * Uses the cnode-&gt;next and cnode-&gt;prev pointers</div><div class='del'>- * returns NULL on failure</div><div class='del'>- */</div><div class='del'>-static struct reiserfs_journal_cnode *allocate_cnodes(int num_cnodes)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *head;</div><div class='del'>-	int i;</div><div class='del'>-	if (num_cnodes &lt;= 0) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	head = vzalloc(array_size(num_cnodes,</div><div class='del'>-				  sizeof(struct reiserfs_journal_cnode)));</div><div class='del'>-	if (!head) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	head[0].prev = NULL;</div><div class='del'>-	head[0].next = head + 1;</div><div class='del'>-	for (i = 1; i &lt; num_cnodes; i++) {</div><div class='del'>-		head[i].prev = head + (i - 1);</div><div class='del'>-		head[i].next = head + (i + 1);	/* if last one, overwrite it after the if */</div><div class='del'>-	}</div><div class='del'>-	head[num_cnodes - 1].next = NULL;</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pulls a cnode off the free list, or returns NULL on failure */</div><div class='del'>-static struct reiserfs_journal_cnode *get_cnode(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *cn;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-</div><div class='del'>-	reiserfs_check_lock_depth(sb, "get_cnode");</div><div class='del'>-</div><div class='del'>-	if (journal-&gt;j_cnode_free &lt;= 0) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	journal-&gt;j_cnode_used++;</div><div class='del'>-	journal-&gt;j_cnode_free--;</div><div class='del'>-	cn = journal-&gt;j_cnode_free_list;</div><div class='del'>-	if (!cn) {</div><div class='del'>-		return cn;</div><div class='del'>-	}</div><div class='del'>-	if (cn-&gt;next) {</div><div class='del'>-		cn-&gt;next-&gt;prev = NULL;</div><div class='del'>-	}</div><div class='del'>-	journal-&gt;j_cnode_free_list = cn-&gt;next;</div><div class='del'>-	memset(cn, 0, sizeof(struct reiserfs_journal_cnode));</div><div class='del'>-	return cn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns a cnode to the free list</div><div class='del'>- */</div><div class='del'>-static void free_cnode(struct super_block *sb,</div><div class='del'>-		       struct reiserfs_journal_cnode *cn)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-</div><div class='del'>-	reiserfs_check_lock_depth(sb, "free_cnode");</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_cnode_used--;</div><div class='del'>-	journal-&gt;j_cnode_free++;</div><div class='del'>-	/* memset(cn, 0, sizeof(struct reiserfs_journal_cnode)) ; */</div><div class='del'>-	cn-&gt;next = journal-&gt;j_cnode_free_list;</div><div class='del'>-	if (journal-&gt;j_cnode_free_list) {</div><div class='del'>-		journal-&gt;j_cnode_free_list-&gt;prev = cn;</div><div class='del'>-	}</div><div class='del'>-	cn-&gt;prev = NULL;	/* not needed with the memset, but I might kill the memset, and forget to do this */</div><div class='del'>-	journal-&gt;j_cnode_free_list = cn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void clear_prepared_bits(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	clear_buffer_journal_prepared(bh);</div><div class='del'>-	clear_buffer_journal_restore_dirty(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * return a cnode with same dev, block number and size in table,</div><div class='del'>- * or null if not found</div><div class='del'>- */</div><div class='del'>-static inline struct reiserfs_journal_cnode *get_journal_hash_dev(struct</div><div class='del'>-								  super_block</div><div class='del'>-								  *sb,</div><div class='del'>-								  struct</div><div class='del'>-								  reiserfs_journal_cnode</div><div class='del'>-								  **table,</div><div class='del'>-								  long bl)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *cn;</div><div class='del'>-	cn = journal_hash(table, sb, bl);</div><div class='del'>-	while (cn) {</div><div class='del'>-		if (cn-&gt;blocknr == bl &amp;&amp; cn-&gt;sb == sb)</div><div class='del'>-			return cn;</div><div class='del'>-		cn = cn-&gt;hnext;</div><div class='del'>-	}</div><div class='del'>-	return (struct reiserfs_journal_cnode *)0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this actually means 'can this block be reallocated yet?'.  If you set</div><div class='del'>- * search_all, a block can only be allocated if it is not in the current</div><div class='del'>- * transaction, was not freed by the current transaction, and has no chance</div><div class='del'>- * of ever being overwritten by a replay after crashing.</div><div class='del'>- *</div><div class='del'>- * If you don't set search_all, a block can only be allocated if it is not</div><div class='del'>- * in the current transaction.  Since deleting a block removes it from the</div><div class='del'>- * current transaction, this case should never happen.  If you don't set</div><div class='del'>- * search_all, make sure you never write the block without logging it.</div><div class='del'>- *</div><div class='del'>- * next_zero_bit is a suggestion about the next block to try for find_forward.</div><div class='del'>- * when bl is rejected because it is set in a journal list bitmap, we search</div><div class='del'>- * for the next zero bit in the bitmap that rejected bl.  Then, we return</div><div class='del'>- * that through next_zero_bit for find_forward to try.</div><div class='del'>- *</div><div class='del'>- * Just because we return something in next_zero_bit does not mean we won't</div><div class='del'>- * reject it on the next call to reiserfs_in_journal</div><div class='del'>- */</div><div class='del'>-int reiserfs_in_journal(struct super_block *sb,</div><div class='del'>-			unsigned int bmap_nr, int bit_nr, int search_all,</div><div class='del'>-			b_blocknr_t * next_zero_bit)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_list_bitmap *jb;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long bl;</div><div class='del'>-</div><div class='del'>-	*next_zero_bit = 0;	/* always start this at zero. */</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(sb, journal.in_journal);</div><div class='del'>-	/*</div><div class='del'>-	 * If we aren't doing a search_all, this is a metablock, and it</div><div class='del'>-	 * will be logged before use.  if we crash before the transaction</div><div class='del'>-	 * that freed it commits,  this transaction won't have committed</div><div class='del'>-	 * either, and the block will never be written</div><div class='del'>-	 */</div><div class='del'>-	if (search_all) {</div><div class='del'>-		for (i = 0; i &lt; JOURNAL_NUM_BITMAPS; i++) {</div><div class='del'>-			PROC_INFO_INC(sb, journal.in_journal_bitmap);</div><div class='del'>-			jb = journal-&gt;j_list_bitmap + i;</div><div class='del'>-			if (jb-&gt;journal_list &amp;&amp; jb-&gt;bitmaps[bmap_nr] &amp;&amp;</div><div class='del'>-			    test_bit(bit_nr,</div><div class='del'>-				     (unsigned long *)jb-&gt;bitmaps[bmap_nr]-&gt;</div><div class='del'>-				     data)) {</div><div class='del'>-				*next_zero_bit =</div><div class='del'>-				    find_next_zero_bit((unsigned long *)</div><div class='del'>-						       (jb-&gt;bitmaps[bmap_nr]-&gt;</div><div class='del'>-							data),</div><div class='del'>-						       sb-&gt;s_blocksize &lt;&lt; 3,</div><div class='del'>-						       bit_nr + 1);</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bl = bmap_nr * (sb-&gt;s_blocksize &lt;&lt; 3) + bit_nr;</div><div class='del'>-	/* is it in any old transactions? */</div><div class='del'>-	if (search_all</div><div class='del'>-	    &amp;&amp; (get_journal_hash_dev(sb, journal-&gt;j_list_hash_table, bl))) {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* is it in the current transaction.  This should never happen */</div><div class='del'>-	if ((get_journal_hash_dev(sb, journal-&gt;j_hash_table, bl))) {</div><div class='del'>-		BUG();</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(sb, journal.in_journal_reusable);</div><div class='del'>-	/* safe for reuse */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* insert cn into table */</div><div class='del'>-static inline void insert_journal_hash(struct reiserfs_journal_cnode **table,</div><div class='del'>-				       struct reiserfs_journal_cnode *cn)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *cn_orig;</div><div class='del'>-</div><div class='del'>-	cn_orig = journal_hash(table, cn-&gt;sb, cn-&gt;blocknr);</div><div class='del'>-	cn-&gt;hnext = cn_orig;</div><div class='del'>-	cn-&gt;hprev = NULL;</div><div class='del'>-	if (cn_orig) {</div><div class='del'>-		cn_orig-&gt;hprev = cn;</div><div class='del'>-	}</div><div class='del'>-	journal_hash(table, cn-&gt;sb, cn-&gt;blocknr) = cn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* lock the current transaction */</div><div class='del'>-static inline void lock_journal(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	PROC_INFO_INC(sb, journal.lock_journal);</div><div class='del'>-</div><div class='del'>-	reiserfs_mutex_lock_safe(&amp;SB_JOURNAL(sb)-&gt;j_mutex, sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock the current transaction */</div><div class='del'>-static inline void unlock_journal(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	mutex_unlock(&amp;SB_JOURNAL(sb)-&gt;j_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void get_journal_list(struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	jl-&gt;j_refcount++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void put_journal_list(struct super_block *s,</div><div class='del'>-				    struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	if (jl-&gt;j_refcount &lt; 1) {</div><div class='del'>-		reiserfs_panic(s, "journal-2", "trans id %u, refcount at %d",</div><div class='del'>-			       jl-&gt;j_trans_id, jl-&gt;j_refcount);</div><div class='del'>-	}</div><div class='del'>-	if (--jl-&gt;j_refcount == 0)</div><div class='del'>-		kfree(jl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this used to be much more involved, and I'm keeping it just in case</div><div class='del'>- * things get ugly again.  it gets called by flush_commit_list, and</div><div class='del'>- * cleans up any data stored about blocks freed during a transaction.</div><div class='del'>- */</div><div class='del'>-static void cleanup_freed_for_journal_list(struct super_block *sb,</div><div class='del'>-					   struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct reiserfs_list_bitmap *jb = jl-&gt;j_list_bitmap;</div><div class='del'>-	if (jb) {</div><div class='del'>-		cleanup_bitmap_list(sb, jb);</div><div class='del'>-	}</div><div class='del'>-	jl-&gt;j_list_bitmap-&gt;journal_list = NULL;</div><div class='del'>-	jl-&gt;j_list_bitmap = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_list_still_alive(struct super_block *s,</div><div class='del'>-				    unsigned int trans_id)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	struct list_head *entry = &amp;journal-&gt;j_journal_list;</div><div class='del'>-	struct reiserfs_journal_list *jl;</div><div class='del'>-</div><div class='del'>-	if (!list_empty(entry)) {</div><div class='del'>-		jl = JOURNAL_LIST_ENTRY(entry-&gt;next);</div><div class='del'>-		if (jl-&gt;j_trans_id &lt;= trans_id) {</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If page-&gt;mapping was null, we failed to truncate this page for</div><div class='del'>- * some reason.  Most likely because it was truncated after being</div><div class='del'>- * logged via data=journal.</div><div class='del'>- *</div><div class='del'>- * This does a check to see if the buffer belongs to one of these</div><div class='del'>- * lost pages before doing the final put_bh.  If page-&gt;mapping was</div><div class='del'>- * null, it tries to free buffers on the page, which should make the</div><div class='del'>- * final put_page drop the page from the lru.</div><div class='del'>- */</div><div class='del'>-static void release_buffer_page(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = bh-&gt;b_folio;</div><div class='del'>-	if (!folio-&gt;mapping &amp;&amp; folio_trylock(folio)) {</div><div class='del'>-		folio_get(folio);</div><div class='del'>-		put_bh(bh);</div><div class='del'>-		if (!folio-&gt;mapping)</div><div class='del'>-			try_to_free_buffers(folio);</div><div class='del'>-		folio_unlock(folio);</div><div class='del'>-		folio_put(folio);</div><div class='del'>-	} else {</div><div class='del'>-		put_bh(bh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reiserfs_end_buffer_io_sync(struct buffer_head *bh, int uptodate)</div><div class='del'>-{</div><div class='del'>-	if (buffer_journaled(bh)) {</div><div class='del'>-		reiserfs_warning(NULL, "clm-2084",</div><div class='del'>-				 "pinned buffer %lu:%pg sent to disk",</div><div class='del'>-				 bh-&gt;b_blocknr, bh-&gt;b_bdev);</div><div class='del'>-	}</div><div class='del'>-	if (uptodate)</div><div class='del'>-		set_buffer_uptodate(bh);</div><div class='del'>-	else</div><div class='del'>-		clear_buffer_uptodate(bh);</div><div class='del'>-</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-	release_buffer_page(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reiserfs_end_ordered_io(struct buffer_head *bh, int uptodate)</div><div class='del'>-{</div><div class='del'>-	if (uptodate)</div><div class='del'>-		set_buffer_uptodate(bh);</div><div class='del'>-	else</div><div class='del'>-		clear_buffer_uptodate(bh);</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-	put_bh(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void submit_logged_buffer(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	get_bh(bh);</div><div class='del'>-	bh-&gt;b_end_io = reiserfs_end_buffer_io_sync;</div><div class='del'>-	clear_buffer_journal_new(bh);</div><div class='del'>-	clear_buffer_dirty(bh);</div><div class='del'>-	if (!test_clear_buffer_journal_test(bh))</div><div class='del'>-		BUG();</div><div class='del'>-	if (!buffer_uptodate(bh))</div><div class='del'>-		BUG();</div><div class='del'>-	submit_bh(REQ_OP_WRITE, bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void submit_ordered_buffer(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	get_bh(bh);</div><div class='del'>-	bh-&gt;b_end_io = reiserfs_end_ordered_io;</div><div class='del'>-	clear_buffer_dirty(bh);</div><div class='del'>-	if (!buffer_uptodate(bh))</div><div class='del'>-		BUG();</div><div class='del'>-	submit_bh(REQ_OP_WRITE, bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CHUNK_SIZE 32</div><div class='del'>-struct buffer_chunk {</div><div class='del'>-	struct buffer_head *bh[CHUNK_SIZE];</div><div class='del'>-	int nr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void write_chunk(struct buffer_chunk *chunk)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; chunk-&gt;nr; i++) {</div><div class='del'>-		submit_logged_buffer(chunk-&gt;bh[i]);</div><div class='del'>-	}</div><div class='del'>-	chunk-&gt;nr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void write_ordered_chunk(struct buffer_chunk *chunk)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; chunk-&gt;nr; i++) {</div><div class='del'>-		submit_ordered_buffer(chunk-&gt;bh[i]);</div><div class='del'>-	}</div><div class='del'>-	chunk-&gt;nr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_to_chunk(struct buffer_chunk *chunk, struct buffer_head *bh,</div><div class='del'>-			spinlock_t * lock, void (fn) (struct buffer_chunk *))</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	BUG_ON(chunk-&gt;nr &gt;= CHUNK_SIZE);</div><div class='del'>-	chunk-&gt;bh[chunk-&gt;nr++] = bh;</div><div class='del'>-	if (chunk-&gt;nr &gt;= CHUNK_SIZE) {</div><div class='del'>-		ret = 1;</div><div class='del'>-		if (lock) {</div><div class='del'>-			spin_unlock(lock);</div><div class='del'>-			fn(chunk);</div><div class='del'>-			spin_lock(lock);</div><div class='del'>-		} else {</div><div class='del'>-			fn(chunk);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static atomic_t nr_reiserfs_jh = ATOMIC_INIT(0);</div><div class='del'>-static struct reiserfs_jh *alloc_jh(void)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_jh *jh;</div><div class='del'>-	while (1) {</div><div class='del'>-		jh = kmalloc(sizeof(*jh), GFP_NOFS);</div><div class='del'>-		if (jh) {</div><div class='del'>-			atomic_inc(&amp;nr_reiserfs_jh);</div><div class='del'>-			return jh;</div><div class='del'>-		}</div><div class='del'>-		yield();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * we want to free the jh when the buffer has been written</div><div class='del'>- * and waited on</div><div class='del'>- */</div><div class='del'>-void reiserfs_free_jh(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_jh *jh;</div><div class='del'>-</div><div class='del'>-	jh = bh-&gt;b_private;</div><div class='del'>-	if (jh) {</div><div class='del'>-		bh-&gt;b_private = NULL;</div><div class='del'>-		jh-&gt;bh = NULL;</div><div class='del'>-		list_del_init(&amp;jh-&gt;list);</div><div class='del'>-		kfree(jh);</div><div class='del'>-		if (atomic_read(&amp;nr_reiserfs_jh) &lt;= 0)</div><div class='del'>-			BUG();</div><div class='del'>-		atomic_dec(&amp;nr_reiserfs_jh);</div><div class='del'>-		put_bh(bh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __add_jh(struct reiserfs_journal *j, struct buffer_head *bh,</div><div class='del'>-			   int tail)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_jh *jh;</div><div class='del'>-</div><div class='del'>-	if (bh-&gt;b_private) {</div><div class='del'>-		spin_lock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-		if (!bh-&gt;b_private) {</div><div class='del'>-			spin_unlock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-			goto no_jh;</div><div class='del'>-		}</div><div class='del'>-		jh = bh-&gt;b_private;</div><div class='del'>-		list_del_init(&amp;jh-&gt;list);</div><div class='del'>-	} else {</div><div class='del'>-no_jh:</div><div class='del'>-		get_bh(bh);</div><div class='del'>-		jh = alloc_jh();</div><div class='del'>-		spin_lock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-		/*</div><div class='del'>-		 * buffer must be locked for __add_jh, should be able to have</div><div class='del'>-		 * two adds at the same time</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(bh-&gt;b_private);</div><div class='del'>-		jh-&gt;bh = bh;</div><div class='del'>-		bh-&gt;b_private = jh;</div><div class='del'>-	}</div><div class='del'>-	jh-&gt;jl = j-&gt;j_current_jl;</div><div class='del'>-	if (tail)</div><div class='del'>-		list_add_tail(&amp;jh-&gt;list, &amp;jh-&gt;jl-&gt;j_tail_bh_list);</div><div class='del'>-	else {</div><div class='del'>-		list_add_tail(&amp;jh-&gt;list, &amp;jh-&gt;jl-&gt;j_bh_list);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_add_tail_list(struct inode *inode, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	return __add_jh(SB_JOURNAL(inode-&gt;i_sb), bh, 1);</div><div class='del'>-}</div><div class='del'>-int reiserfs_add_ordered_list(struct inode *inode, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	return __add_jh(SB_JOURNAL(inode-&gt;i_sb), bh, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define JH_ENTRY(l) list_entry((l), struct reiserfs_jh, list)</div><div class='del'>-static int write_ordered_buffers(spinlock_t * lock,</div><div class='del'>-				 struct reiserfs_journal *j,</div><div class='del'>-				 struct reiserfs_journal_list *jl,</div><div class='del'>-				 struct list_head *list)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct reiserfs_jh *jh;</div><div class='del'>-	int ret = j-&gt;j_errno;</div><div class='del'>-	struct buffer_chunk chunk;</div><div class='del'>-	struct list_head tmp;</div><div class='del'>-	INIT_LIST_HEAD(&amp;tmp);</div><div class='del'>-</div><div class='del'>-	chunk.nr = 0;</div><div class='del'>-	spin_lock(lock);</div><div class='del'>-	while (!list_empty(list)) {</div><div class='del'>-		jh = JH_ENTRY(list-&gt;next);</div><div class='del'>-		bh = jh-&gt;bh;</div><div class='del'>-		get_bh(bh);</div><div class='del'>-		if (!trylock_buffer(bh)) {</div><div class='del'>-			if (!buffer_dirty(bh)) {</div><div class='del'>-				list_move(&amp;jh-&gt;list, &amp;tmp);</div><div class='del'>-				goto loop_next;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock(lock);</div><div class='del'>-			if (chunk.nr)</div><div class='del'>-				write_ordered_chunk(&amp;chunk);</div><div class='del'>-			wait_on_buffer(bh);</div><div class='del'>-			cond_resched();</div><div class='del'>-			spin_lock(lock);</div><div class='del'>-			goto loop_next;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * in theory, dirty non-uptodate buffers should never get here,</div><div class='del'>-		 * but the upper layer io error paths still have a few quirks.</div><div class='del'>-		 * Handle them here as gracefully as we can</div><div class='del'>-		 */</div><div class='del'>-		if (!buffer_uptodate(bh) &amp;&amp; buffer_dirty(bh)) {</div><div class='del'>-			clear_buffer_dirty(bh);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (buffer_dirty(bh)) {</div><div class='del'>-			list_move(&amp;jh-&gt;list, &amp;tmp);</div><div class='del'>-			add_to_chunk(&amp;chunk, bh, lock, write_ordered_chunk);</div><div class='del'>-		} else {</div><div class='del'>-			reiserfs_free_jh(bh);</div><div class='del'>-			unlock_buffer(bh);</div><div class='del'>-		}</div><div class='del'>-loop_next:</div><div class='del'>-		put_bh(bh);</div><div class='del'>-		cond_resched_lock(lock);</div><div class='del'>-	}</div><div class='del'>-	if (chunk.nr) {</div><div class='del'>-		spin_unlock(lock);</div><div class='del'>-		write_ordered_chunk(&amp;chunk);</div><div class='del'>-		spin_lock(lock);</div><div class='del'>-	}</div><div class='del'>-	while (!list_empty(&amp;tmp)) {</div><div class='del'>-		jh = JH_ENTRY(tmp.prev);</div><div class='del'>-		bh = jh-&gt;bh;</div><div class='del'>-		get_bh(bh);</div><div class='del'>-		reiserfs_free_jh(bh);</div><div class='del'>-</div><div class='del'>-		if (buffer_locked(bh)) {</div><div class='del'>-			spin_unlock(lock);</div><div class='del'>-			wait_on_buffer(bh);</div><div class='del'>-			spin_lock(lock);</div><div class='del'>-		}</div><div class='del'>-		if (!buffer_uptodate(bh)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * ugly interaction with invalidate_folio here.</div><div class='del'>-		 * reiserfs_invalidate_folio will pin any buffer that has a</div><div class='del'>-		 * valid journal head from an older transaction.  If someone</div><div class='del'>-		 * else sets our buffer dirty after we write it in the first</div><div class='del'>-		 * loop, and then someone truncates the page away, nobody</div><div class='del'>-		 * will ever write the buffer. We're safe if we write the</div><div class='del'>-		 * page one last time after freeing the journal header.</div><div class='del'>-		 */</div><div class='del'>-		if (buffer_dirty(bh) &amp;&amp; unlikely(bh-&gt;b_folio-&gt;mapping == NULL)) {</div><div class='del'>-			spin_unlock(lock);</div><div class='del'>-			write_dirty_buffer(bh, 0);</div><div class='del'>-			spin_lock(lock);</div><div class='del'>-		}</div><div class='del'>-		put_bh(bh);</div><div class='del'>-		cond_resched_lock(lock);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int flush_older_commits(struct super_block *s,</div><div class='del'>-			       struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	struct reiserfs_journal_list *other_jl;</div><div class='del'>-	struct reiserfs_journal_list *first_jl;</div><div class='del'>-	struct list_head *entry;</div><div class='del'>-	unsigned int trans_id = jl-&gt;j_trans_id;</div><div class='del'>-	unsigned int other_trans_id;</div><div class='del'>-</div><div class='del'>-find_first:</div><div class='del'>-	/*</div><div class='del'>-	 * first we walk backwards to find the oldest uncommitted transation</div><div class='del'>-	 */</div><div class='del'>-	first_jl = jl;</div><div class='del'>-	entry = jl-&gt;j_list.prev;</div><div class='del'>-	while (1) {</div><div class='del'>-		other_jl = JOURNAL_LIST_ENTRY(entry);</div><div class='del'>-		if (entry == &amp;journal-&gt;j_journal_list ||</div><div class='del'>-		    atomic_read(&amp;other_jl-&gt;j_older_commits_done))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		first_jl = other_jl;</div><div class='del'>-		entry = other_jl-&gt;j_list.prev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if we didn't find any older uncommitted transactions, return now */</div><div class='del'>-	if (first_jl == jl) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry = &amp;first_jl-&gt;j_list;</div><div class='del'>-	while (1) {</div><div class='del'>-		other_jl = JOURNAL_LIST_ENTRY(entry);</div><div class='del'>-		other_trans_id = other_jl-&gt;j_trans_id;</div><div class='del'>-</div><div class='del'>-		if (other_trans_id &lt; trans_id) {</div><div class='del'>-			if (atomic_read(&amp;other_jl-&gt;j_commit_left) != 0) {</div><div class='del'>-				flush_commit_list(s, other_jl, 0);</div><div class='del'>-</div><div class='del'>-				/* list we were called with is gone, return */</div><div class='del'>-				if (!journal_list_still_alive(s, trans_id))</div><div class='del'>-					return 1;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * the one we just flushed is gone, this means</div><div class='del'>-				 * all older lists are also gone, so first_jl</div><div class='del'>-				 * is no longer valid either.  Go back to the</div><div class='del'>-				 * beginning.</div><div class='del'>-				 */</div><div class='del'>-				if (!journal_list_still_alive</div><div class='del'>-				    (s, other_trans_id)) {</div><div class='del'>-					goto find_first;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			entry = entry-&gt;next;</div><div class='del'>-			if (entry == &amp;journal-&gt;j_journal_list)</div><div class='del'>-				return 0;</div><div class='del'>-		} else {</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_async_progress_wait(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *j = SB_JOURNAL(s);</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;j-&gt;j_async_throttle)) {</div><div class='del'>-		int depth;</div><div class='del'>-</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		wait_var_event_timeout(&amp;j-&gt;j_async_throttle,</div><div class='del'>-				       atomic_read(&amp;j-&gt;j_async_throttle) == 0,</div><div class='del'>-				       HZ / 10);</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if this journal list still has commit blocks unflushed, send them to disk.</div><div class='del'>- *</div><div class='del'>- * log areas must be flushed in order (transaction 2 can't commit before</div><div class='del'>- * transaction 1) Before the commit block can by written, every other log</div><div class='del'>- * block must be safely on disk</div><div class='del'>- */</div><div class='del'>-static int flush_commit_list(struct super_block *s,</div><div class='del'>-			     struct reiserfs_journal_list *jl, int flushall)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	b_blocknr_t bn;</div><div class='del'>-	struct buffer_head *tbh = NULL;</div><div class='del'>-	unsigned int trans_id = jl-&gt;j_trans_id;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	int retval = 0;</div><div class='del'>-	int write_len;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	reiserfs_check_lock_depth(s, "flush_commit_list");</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;jl-&gt;j_older_commits_done)) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * before we can put our commit blocks on disk, we have to make</div><div class='del'>-	 * sure everyone older than us is on disk too</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(jl-&gt;j_len &lt;= 0);</div><div class='del'>-	BUG_ON(trans_id == journal-&gt;j_trans_id);</div><div class='del'>-</div><div class='del'>-	get_journal_list(jl);</div><div class='del'>-	if (flushall) {</div><div class='del'>-		if (flush_older_commits(s, jl) == 1) {</div><div class='del'>-			/*</div><div class='del'>-			 * list disappeared during flush_older_commits.</div><div class='del'>-			 * return</div><div class='del'>-			 */</div><div class='del'>-			goto put_jl;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure nobody is trying to flush this one at the same time */</div><div class='del'>-	reiserfs_mutex_lock_safe(&amp;jl-&gt;j_commit_mutex, s);</div><div class='del'>-</div><div class='del'>-	if (!journal_list_still_alive(s, trans_id)) {</div><div class='del'>-		mutex_unlock(&amp;jl-&gt;j_commit_mutex);</div><div class='del'>-		goto put_jl;</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(jl-&gt;j_trans_id == 0);</div><div class='del'>-</div><div class='del'>-	/* this commit is done, exit */</div><div class='del'>-	if (atomic_read(&amp;jl-&gt;j_commit_left) &lt;= 0) {</div><div class='del'>-		if (flushall) {</div><div class='del'>-			atomic_set(&amp;jl-&gt;j_older_commits_done, 1);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;jl-&gt;j_commit_mutex);</div><div class='del'>-		goto put_jl;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!list_empty(&amp;jl-&gt;j_bh_list)) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We might sleep in numerous places inside</div><div class='del'>-		 * write_ordered_buffers. Relax the write lock.</div><div class='del'>-		 */</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		ret = write_ordered_buffers(&amp;journal-&gt;j_dirty_buffers_lock,</div><div class='del'>-					    journal, jl, &amp;jl-&gt;j_bh_list);</div><div class='del'>-		if (ret &lt; 0 &amp;&amp; retval == 0)</div><div class='del'>-			retval = ret;</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!list_empty(&amp;jl-&gt;j_bh_list));</div><div class='del'>-	/*</div><div class='del'>-	 * for the description block and all the log blocks, submit any buffers</div><div class='del'>-	 * that haven't already reached the disk.  Try to write at least 256</div><div class='del'>-	 * log blocks. later on, we will only wait on blocks that correspond</div><div class='del'>-	 * to this transaction, but while we're unplugging we might as well</div><div class='del'>-	 * get a chunk of data on there.</div><div class='del'>-	 */</div><div class='del'>-	atomic_inc(&amp;journal-&gt;j_async_throttle);</div><div class='del'>-	write_len = jl-&gt;j_len + 1;</div><div class='del'>-	if (write_len &lt; 256)</div><div class='del'>-		write_len = 256;</div><div class='del'>-	for (i = 0 ; i &lt; write_len ; i++) {</div><div class='del'>-		bn = SB_ONDISK_JOURNAL_1st_BLOCK(s) + (jl-&gt;j_start + i) %</div><div class='del'>-		    SB_ONDISK_JOURNAL_SIZE(s);</div><div class='del'>-		tbh = journal_find_get_block(s, bn);</div><div class='del'>-		if (tbh) {</div><div class='del'>-			if (buffer_dirty(tbh)) {</div><div class='del'>-		            depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-			    write_dirty_buffer(tbh, 0);</div><div class='del'>-			    reiserfs_write_lock_nested(s, depth);</div><div class='del'>-			}</div><div class='del'>-			put_bh(tbh) ;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (atomic_dec_and_test(&amp;journal-&gt;j_async_throttle))</div><div class='del'>-		wake_up_var(&amp;journal-&gt;j_async_throttle);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (jl-&gt;j_len + 1); i++) {</div><div class='del'>-		bn = SB_ONDISK_JOURNAL_1st_BLOCK(s) +</div><div class='del'>-		    (jl-&gt;j_start + i) % SB_ONDISK_JOURNAL_SIZE(s);</div><div class='del'>-		tbh = journal_find_get_block(s, bn);</div><div class='del'>-</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		__wait_on_buffer(tbh);</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-		/*</div><div class='del'>-		 * since we're using ll_rw_blk above, it might have skipped</div><div class='del'>-		 * over a locked buffer.  Double check here</div><div class='del'>-		 */</div><div class='del'>-		/* redundant, sync_dirty_buffer() checks */</div><div class='del'>-		if (buffer_dirty(tbh)) {</div><div class='del'>-			depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-			sync_dirty_buffer(tbh);</div><div class='del'>-			reiserfs_write_lock_nested(s, depth);</div><div class='del'>-		}</div><div class='del'>-		if (unlikely(!buffer_uptodate(tbh))) {</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-			reiserfs_warning(s, "journal-601",</div><div class='del'>-					 "buffer write failed");</div><div class='del'>-#endif</div><div class='del'>-			retval = -EIO;</div><div class='del'>-		}</div><div class='del'>-		/* once for journal_find_get_block */</div><div class='del'>-		put_bh(tbh);</div><div class='del'>-		/* once due to original getblk in do_journal_end */</div><div class='del'>-		put_bh(tbh);</div><div class='del'>-		atomic_dec(&amp;jl-&gt;j_commit_left);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(atomic_read(&amp;jl-&gt;j_commit_left) != 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there was a write error in the journal - we can't commit</div><div class='del'>-	 * this transaction - it will be invalid and, if successful,</div><div class='del'>-	 * will just end up propagating the write error out to</div><div class='del'>-	 * the file system.</div><div class='del'>-	 */</div><div class='del'>-	if (likely(!retval &amp;&amp; !reiserfs_is_journal_aborted (journal))) {</div><div class='del'>-		if (buffer_dirty(jl-&gt;j_commit_bh))</div><div class='del'>-			BUG();</div><div class='del'>-		mark_buffer_dirty(jl-&gt;j_commit_bh) ;</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		if (reiserfs_barrier_flush(s))</div><div class='del'>-			__sync_dirty_buffer(jl-&gt;j_commit_bh,</div><div class='del'>-					REQ_SYNC | REQ_PREFLUSH | REQ_FUA);</div><div class='del'>-		else</div><div class='del'>-			sync_dirty_buffer(jl-&gt;j_commit_bh);</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there was a write error in the journal - we can't commit this</div><div class='del'>-	 * transaction - it will be invalid and, if successful, will just end</div><div class='del'>-	 * up propagating the write error out to the filesystem.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(!buffer_uptodate(jl-&gt;j_commit_bh))) {</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		reiserfs_warning(s, "journal-615", "buffer write failed");</div><div class='del'>-#endif</div><div class='del'>-		retval = -EIO;</div><div class='del'>-	}</div><div class='del'>-	bforget(jl-&gt;j_commit_bh);</div><div class='del'>-	if (journal-&gt;j_last_commit_id != 0 &amp;&amp;</div><div class='del'>-	    (jl-&gt;j_trans_id - journal-&gt;j_last_commit_id) != 1) {</div><div class='del'>-		reiserfs_warning(s, "clm-2200", "last commit %lu, current %lu",</div><div class='del'>-				 journal-&gt;j_last_commit_id, jl-&gt;j_trans_id);</div><div class='del'>-	}</div><div class='del'>-	journal-&gt;j_last_commit_id = jl-&gt;j_trans_id;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * now, every commit block is on the disk.  It is safe to allow</div><div class='del'>-	 * blocks freed during this transaction to be reallocated</div><div class='del'>-	 */</div><div class='del'>-	cleanup_freed_for_journal_list(s, jl);</div><div class='del'>-</div><div class='del'>-	retval = retval ? retval : journal-&gt;j_errno;</div><div class='del'>-</div><div class='del'>-	/* mark the metadata dirty */</div><div class='del'>-	if (!retval)</div><div class='del'>-		dirty_one_transaction(s, jl);</div><div class='del'>-	atomic_dec(&amp;jl-&gt;j_commit_left);</div><div class='del'>-</div><div class='del'>-	if (flushall) {</div><div class='del'>-		atomic_set(&amp;jl-&gt;j_older_commits_done, 1);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;jl-&gt;j_commit_mutex);</div><div class='del'>-put_jl:</div><div class='del'>-	put_journal_list(s, jl);</div><div class='del'>-</div><div class='del'>-	if (retval)</div><div class='del'>-		reiserfs_abort(s, retval, "Journal write error in %s",</div><div class='del'>-			       __func__);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * flush_journal_list frequently needs to find a newer transaction for a</div><div class='del'>- * given block.  This does that, or returns NULL if it can't find anything</div><div class='del'>- */</div><div class='del'>-static struct reiserfs_journal_list *find_newer_jl_for_cn(struct</div><div class='del'>-							  reiserfs_journal_cnode</div><div class='del'>-							  *cn)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = cn-&gt;sb;</div><div class='del'>-	b_blocknr_t blocknr = cn-&gt;blocknr;</div><div class='del'>-</div><div class='del'>-	cn = cn-&gt;hprev;</div><div class='del'>-	while (cn) {</div><div class='del'>-		if (cn-&gt;sb == sb &amp;&amp; cn-&gt;blocknr == blocknr &amp;&amp; cn-&gt;jlist) {</div><div class='del'>-			return cn-&gt;jlist;</div><div class='del'>-		}</div><div class='del'>-		cn = cn-&gt;hprev;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void remove_journal_hash(struct super_block *,</div><div class='del'>-				struct reiserfs_journal_cnode **,</div><div class='del'>-				struct reiserfs_journal_list *, unsigned long,</div><div class='del'>-				int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * once all the real blocks have been flushed, it is safe to remove them</div><div class='del'>- * from the journal list for this transaction.  Aside from freeing the</div><div class='del'>- * cnode, this also allows the block to be reallocated for data blocks</div><div class='del'>- * if it had been deleted.</div><div class='del'>- */</div><div class='del'>-static void remove_all_from_journal_list(struct super_block *sb,</div><div class='del'>-					 struct reiserfs_journal_list *jl,</div><div class='del'>-					 int debug)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_journal_cnode *cn, *last;</div><div class='del'>-	cn = jl-&gt;j_realblock;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * which is better, to lock once around the whole loop, or</div><div class='del'>-	 * to lock for each call to remove_journal_hash?</div><div class='del'>-	 */</div><div class='del'>-	while (cn) {</div><div class='del'>-		if (cn-&gt;blocknr != 0) {</div><div class='del'>-			if (debug) {</div><div class='del'>-				reiserfs_warning(sb, "reiserfs-2201",</div><div class='del'>-						 "block %u, bh is %d, state %ld",</div><div class='del'>-						 cn-&gt;blocknr, cn-&gt;bh ? 1 : 0,</div><div class='del'>-						 cn-&gt;state);</div><div class='del'>-			}</div><div class='del'>-			cn-&gt;state = 0;</div><div class='del'>-			remove_journal_hash(sb, journal-&gt;j_list_hash_table,</div><div class='del'>-					    jl, cn-&gt;blocknr, 1);</div><div class='del'>-		}</div><div class='del'>-		last = cn;</div><div class='del'>-		cn = cn-&gt;next;</div><div class='del'>-		free_cnode(sb, last);</div><div class='del'>-	}</div><div class='del'>-	jl-&gt;j_realblock = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if this timestamp is greater than the timestamp we wrote last to the</div><div class='del'>- * header block, write it to the header block.  once this is done, I can</div><div class='del'>- * safely say the log area for this transaction won't ever be replayed,</div><div class='del'>- * and I can start releasing blocks in this transaction for reuse as data</div><div class='del'>- * blocks.  called by flush_journal_list, before it calls</div><div class='del'>- * remove_all_from_journal_list</div><div class='del'>- */</div><div class='del'>-static int _update_journal_header_block(struct super_block *sb,</div><div class='del'>-					unsigned long offset,</div><div class='del'>-					unsigned int trans_id)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_header *jh;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	if (reiserfs_is_journal_aborted(journal))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (trans_id &gt;= journal-&gt;j_last_flush_trans_id) {</div><div class='del'>-		if (buffer_locked((journal-&gt;j_header_bh))) {</div><div class='del'>-			depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-			__wait_on_buffer(journal-&gt;j_header_bh);</div><div class='del'>-			reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-			if (unlikely(!buffer_uptodate(journal-&gt;j_header_bh))) {</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-				reiserfs_warning(sb, "journal-699",</div><div class='del'>-						 "buffer write failed");</div><div class='del'>-#endif</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		journal-&gt;j_last_flush_trans_id = trans_id;</div><div class='del'>-		journal-&gt;j_first_unflushed_offset = offset;</div><div class='del'>-		jh = (struct reiserfs_journal_header *)(journal-&gt;j_header_bh-&gt;</div><div class='del'>-							b_data);</div><div class='del'>-		jh-&gt;j_last_flush_trans_id = cpu_to_le32(trans_id);</div><div class='del'>-		jh-&gt;j_first_unflushed_offset = cpu_to_le32(offset);</div><div class='del'>-		jh-&gt;j_mount_id = cpu_to_le32(journal-&gt;j_mount_id);</div><div class='del'>-</div><div class='del'>-		set_buffer_dirty(journal-&gt;j_header_bh);</div><div class='del'>-		depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-</div><div class='del'>-		if (reiserfs_barrier_flush(sb))</div><div class='del'>-			__sync_dirty_buffer(journal-&gt;j_header_bh,</div><div class='del'>-					REQ_SYNC | REQ_PREFLUSH | REQ_FUA);</div><div class='del'>-		else</div><div class='del'>-			sync_dirty_buffer(journal-&gt;j_header_bh);</div><div class='del'>-</div><div class='del'>-		reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-		if (!buffer_uptodate(journal-&gt;j_header_bh)) {</div><div class='del'>-			reiserfs_warning(sb, "journal-837",</div><div class='del'>-					 "IO error during journal replay");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int update_journal_header_block(struct super_block *sb,</div><div class='del'>-				       unsigned long offset,</div><div class='del'>-				       unsigned int trans_id)</div><div class='del'>-{</div><div class='del'>-	return _update_journal_header_block(sb, offset, trans_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** flush any and all journal lists older than you are</div><div class='del'>-** can only be called from flush_journal_list</div><div class='del'>-*/</div><div class='del'>-static int flush_older_journal_lists(struct super_block *sb,</div><div class='del'>-				     struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	struct list_head *entry;</div><div class='del'>-	struct reiserfs_journal_list *other_jl;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	unsigned int trans_id = jl-&gt;j_trans_id;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we know we are the only ones flushing things, no extra race</div><div class='del'>-	 * protection is required.</div><div class='del'>-	 */</div><div class='del'>-restart:</div><div class='del'>-	entry = journal-&gt;j_journal_list.next;</div><div class='del'>-	/* Did we wrap? */</div><div class='del'>-	if (entry == &amp;journal-&gt;j_journal_list)</div><div class='del'>-		return 0;</div><div class='del'>-	other_jl = JOURNAL_LIST_ENTRY(entry);</div><div class='del'>-	if (other_jl-&gt;j_trans_id &lt; trans_id) {</div><div class='del'>-		BUG_ON(other_jl-&gt;j_refcount &lt;= 0);</div><div class='del'>-		/* do not flush all */</div><div class='del'>-		flush_journal_list(sb, other_jl, 0);</div><div class='del'>-</div><div class='del'>-		/* other_jl is now deleted from the list */</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void del_from_work_list(struct super_block *s,</div><div class='del'>-			       struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	if (!list_empty(&amp;jl-&gt;j_working_list)) {</div><div class='del'>-		list_del_init(&amp;jl-&gt;j_working_list);</div><div class='del'>-		journal-&gt;j_num_work_lists--;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * flush a journal list, both commit and real blocks</div><div class='del'>- *</div><div class='del'>- * always set flushall to 1, unless you are calling from inside</div><div class='del'>- * flush_journal_list</div><div class='del'>- *</div><div class='del'>- * IMPORTANT.  This can only be called while there are no journal writers,</div><div class='del'>- * and the journal is locked.  That means it can only be called from</div><div class='del'>- * do_journal_end, or by journal_release</div><div class='del'>- */</div><div class='del'>-static int flush_journal_list(struct super_block *s,</div><div class='del'>-			      struct reiserfs_journal_list *jl, int flushall)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_list *pjl;</div><div class='del'>-	struct reiserfs_journal_cnode *cn;</div><div class='del'>-	int count;</div><div class='del'>-	int was_jwait = 0;</div><div class='del'>-	int was_dirty = 0;</div><div class='del'>-	struct buffer_head *saved_bh;</div><div class='del'>-	unsigned long j_len_saved = jl-&gt;j_len;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	int err = 0;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	BUG_ON(j_len_saved &lt;= 0);</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;journal-&gt;j_wcount) != 0) {</div><div class='del'>-		reiserfs_warning(s, "clm-2048", "called with wcount %d",</div><div class='del'>-				 atomic_read(&amp;journal-&gt;j_wcount));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if flushall == 0, the lock is already held */</div><div class='del'>-	if (flushall) {</div><div class='del'>-		reiserfs_mutex_lock_safe(&amp;journal-&gt;j_flush_mutex, s);</div><div class='del'>-	} else if (mutex_trylock(&amp;journal-&gt;j_flush_mutex)) {</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = 0;</div><div class='del'>-	if (j_len_saved &gt; journal-&gt;j_trans_max) {</div><div class='del'>-		reiserfs_panic(s, "journal-715", "length is %lu, trans id %lu",</div><div class='del'>-			       j_len_saved, jl-&gt;j_trans_id);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if all the work is already done, get out of here */</div><div class='del'>-	if (atomic_read(&amp;jl-&gt;j_nonzerolen) &lt;= 0 &amp;&amp;</div><div class='del'>-	    atomic_read(&amp;jl-&gt;j_commit_left) &lt;= 0) {</div><div class='del'>-		goto flush_older_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * start by putting the commit list on disk.  This will also flush</div><div class='del'>-	 * the commit lists of any olders transactions</div><div class='del'>-	 */</div><div class='del'>-	flush_commit_list(s, jl, 1);</div><div class='del'>-</div><div class='del'>-	if (!(jl-&gt;j_state &amp; LIST_DIRTY)</div><div class='del'>-	    &amp;&amp; !reiserfs_is_journal_aborted(journal))</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	/* are we done now? */</div><div class='del'>-	if (atomic_read(&amp;jl-&gt;j_nonzerolen) &lt;= 0 &amp;&amp;</div><div class='del'>-	    atomic_read(&amp;jl-&gt;j_commit_left) &lt;= 0) {</div><div class='del'>-		goto flush_older_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * loop through each cnode, see if we need to write it,</div><div class='del'>-	 * or wait on a more recent transaction, or just ignore it</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;journal-&gt;j_wcount) != 0) {</div><div class='del'>-		reiserfs_panic(s, "journal-844", "journal list is flushing, "</div><div class='del'>-			       "wcount is not 0");</div><div class='del'>-	}</div><div class='del'>-	cn = jl-&gt;j_realblock;</div><div class='del'>-	while (cn) {</div><div class='del'>-		was_jwait = 0;</div><div class='del'>-		was_dirty = 0;</div><div class='del'>-		saved_bh = NULL;</div><div class='del'>-		/* blocknr of 0 is no longer in the hash, ignore it */</div><div class='del'>-		if (cn-&gt;blocknr == 0) {</div><div class='del'>-			goto free_cnode;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This transaction failed commit.</div><div class='del'>-		 * Don't write out to the disk</div><div class='del'>-		 */</div><div class='del'>-		if (!(jl-&gt;j_state &amp; LIST_DIRTY))</div><div class='del'>-			goto free_cnode;</div><div class='del'>-</div><div class='del'>-		pjl = find_newer_jl_for_cn(cn);</div><div class='del'>-		/*</div><div class='del'>-		 * the order is important here.  We check pjl to make sure we</div><div class='del'>-		 * don't clear BH_JDirty_wait if we aren't the one writing this</div><div class='del'>-		 * block to disk</div><div class='del'>-		 */</div><div class='del'>-		if (!pjl &amp;&amp; cn-&gt;bh) {</div><div class='del'>-			saved_bh = cn-&gt;bh;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * we do this to make sure nobody releases the</div><div class='del'>-			 * buffer while we are working with it</div><div class='del'>-			 */</div><div class='del'>-			get_bh(saved_bh);</div><div class='del'>-</div><div class='del'>-			if (buffer_journal_dirty(saved_bh)) {</div><div class='del'>-				BUG_ON(!can_dirty(cn));</div><div class='del'>-				was_jwait = 1;</div><div class='del'>-				was_dirty = 1;</div><div class='del'>-			} else if (can_dirty(cn)) {</div><div class='del'>-				/*</div><div class='del'>-				 * everything with !pjl &amp;&amp; jwait</div><div class='del'>-				 * should be writable</div><div class='del'>-				 */</div><div class='del'>-				BUG();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if someone has this block in a newer transaction, just make</div><div class='del'>-		 * sure they are committed, and don't try writing it to disk</div><div class='del'>-		 */</div><div class='del'>-		if (pjl) {</div><div class='del'>-			if (atomic_read(&amp;pjl-&gt;j_commit_left))</div><div class='del'>-				flush_commit_list(s, pjl, 1);</div><div class='del'>-			goto free_cnode;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * bh == NULL when the block got to disk on its own, OR,</div><div class='del'>-		 * the block got freed in a future transaction</div><div class='del'>-		 */</div><div class='del'>-		if (saved_bh == NULL) {</div><div class='del'>-			goto free_cnode;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * this should never happen.  kupdate_one_transaction has</div><div class='del'>-		 * this list locked while it works, so we should never see a</div><div class='del'>-		 * buffer here that is not marked JDirty_wait</div><div class='del'>-		 */</div><div class='del'>-		if ((!was_jwait) &amp;&amp; !buffer_locked(saved_bh)) {</div><div class='del'>-			reiserfs_warning(s, "journal-813",</div><div class='del'>-					 "BAD! buffer %llu %cdirty %cjwait, "</div><div class='del'>-					 "not in a newer transaction",</div><div class='del'>-					 (unsigned long long)saved_bh-&gt;</div><div class='del'>-					 b_blocknr, was_dirty ? ' ' : '!',</div><div class='del'>-					 was_jwait ? ' ' : '!');</div><div class='del'>-		}</div><div class='del'>-		if (was_dirty) {</div><div class='del'>-			/*</div><div class='del'>-			 * we inc again because saved_bh gets decremented</div><div class='del'>-			 * at free_cnode</div><div class='del'>-			 */</div><div class='del'>-			get_bh(saved_bh);</div><div class='del'>-			set_bit(BLOCK_NEEDS_FLUSH, &amp;cn-&gt;state);</div><div class='del'>-			lock_buffer(saved_bh);</div><div class='del'>-			BUG_ON(cn-&gt;blocknr != saved_bh-&gt;b_blocknr);</div><div class='del'>-			if (buffer_dirty(saved_bh))</div><div class='del'>-				submit_logged_buffer(saved_bh);</div><div class='del'>-			else</div><div class='del'>-				unlock_buffer(saved_bh);</div><div class='del'>-			count++;</div><div class='del'>-		} else {</div><div class='del'>-			reiserfs_warning(s, "clm-2082",</div><div class='del'>-					 "Unable to flush buffer %llu in %s",</div><div class='del'>-					 (unsigned long long)saved_bh-&gt;</div><div class='del'>-					 b_blocknr, __func__);</div><div class='del'>-		}</div><div class='del'>-free_cnode:</div><div class='del'>-		cn = cn-&gt;next;</div><div class='del'>-		if (saved_bh) {</div><div class='del'>-			/*</div><div class='del'>-			 * we incremented this to keep others from</div><div class='del'>-			 * taking the buffer head away</div><div class='del'>-			 */</div><div class='del'>-			put_bh(saved_bh);</div><div class='del'>-			if (atomic_read(&amp;saved_bh-&gt;b_count) &lt; 0) {</div><div class='del'>-				reiserfs_warning(s, "journal-945",</div><div class='del'>-						 "saved_bh-&gt;b_count &lt; 0");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (count &gt; 0) {</div><div class='del'>-		cn = jl-&gt;j_realblock;</div><div class='del'>-		while (cn) {</div><div class='del'>-			if (test_bit(BLOCK_NEEDS_FLUSH, &amp;cn-&gt;state)) {</div><div class='del'>-				if (!cn-&gt;bh) {</div><div class='del'>-					reiserfs_panic(s, "journal-1011",</div><div class='del'>-						       "cn-&gt;bh is NULL");</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-				__wait_on_buffer(cn-&gt;bh);</div><div class='del'>-				reiserfs_write_lock_nested(s, depth);</div><div class='del'>-</div><div class='del'>-				if (!cn-&gt;bh) {</div><div class='del'>-					reiserfs_panic(s, "journal-1012",</div><div class='del'>-						       "cn-&gt;bh is NULL");</div><div class='del'>-				}</div><div class='del'>-				if (unlikely(!buffer_uptodate(cn-&gt;bh))) {</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-					reiserfs_warning(s, "journal-949",</div><div class='del'>-							 "buffer write failed");</div><div class='del'>-#endif</div><div class='del'>-					err = -EIO;</div><div class='del'>-				}</div><div class='del'>-				/*</div><div class='del'>-				 * note, we must clear the JDirty_wait bit</div><div class='del'>-				 * after the up to date check, otherwise we</div><div class='del'>-				 * race against our flushpage routine</div><div class='del'>-				 */</div><div class='del'>-				BUG_ON(!test_clear_buffer_journal_dirty</div><div class='del'>-				       (cn-&gt;bh));</div><div class='del'>-</div><div class='del'>-				/* drop one ref for us */</div><div class='del'>-				put_bh(cn-&gt;bh);</div><div class='del'>-				/* drop one ref for journal_mark_dirty */</div><div class='del'>-				release_buffer_page(cn-&gt;bh);</div><div class='del'>-			}</div><div class='del'>-			cn = cn-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		reiserfs_abort(s, -EIO,</div><div class='del'>-			       "Write error while pushing transaction to disk in %s",</div><div class='del'>-			       __func__);</div><div class='del'>-flush_older_and_return:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * before we can update the journal header block, we _must_ flush all</div><div class='del'>-	 * real blocks from all older transactions to disk.  This is because</div><div class='del'>-	 * once the header block is updated, this transaction will not be</div><div class='del'>-	 * replayed after a crash</div><div class='del'>-	 */</div><div class='del'>-	if (flushall) {</div><div class='del'>-		flush_older_journal_lists(s, jl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = journal-&gt;j_errno;</div><div class='del'>-	/*</div><div class='del'>-	 * before we can remove everything from the hash tables for this</div><div class='del'>-	 * transaction, we must make sure it can never be replayed</div><div class='del'>-	 *</div><div class='del'>-	 * since we are only called from do_journal_end, we know for sure there</div><div class='del'>-	 * are no allocations going on while we are flushing journal lists.  So,</div><div class='del'>-	 * we only need to update the journal header block for the last list</div><div class='del'>-	 * being flushed</div><div class='del'>-	 */</div><div class='del'>-	if (!err &amp;&amp; flushall) {</div><div class='del'>-		err =</div><div class='del'>-		    update_journal_header_block(s,</div><div class='del'>-						(jl-&gt;j_start + jl-&gt;j_len +</div><div class='del'>-						 2) % SB_ONDISK_JOURNAL_SIZE(s),</div><div class='del'>-						jl-&gt;j_trans_id);</div><div class='del'>-		if (err)</div><div class='del'>-			reiserfs_abort(s, -EIO,</div><div class='del'>-				       "Write error while updating journal header in %s",</div><div class='del'>-				       __func__);</div><div class='del'>-	}</div><div class='del'>-	remove_all_from_journal_list(s, jl, 0);</div><div class='del'>-	list_del_init(&amp;jl-&gt;j_list);</div><div class='del'>-	journal-&gt;j_num_lists--;</div><div class='del'>-	del_from_work_list(s, jl);</div><div class='del'>-</div><div class='del'>-	if (journal-&gt;j_last_flush_id != 0 &amp;&amp;</div><div class='del'>-	    (jl-&gt;j_trans_id - journal-&gt;j_last_flush_id) != 1) {</div><div class='del'>-		reiserfs_warning(s, "clm-2201", "last flush %lu, current %lu",</div><div class='del'>-				 journal-&gt;j_last_flush_id, jl-&gt;j_trans_id);</div><div class='del'>-	}</div><div class='del'>-	journal-&gt;j_last_flush_id = jl-&gt;j_trans_id;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * not strictly required since we are freeing the list, but it should</div><div class='del'>-	 * help find code using dead lists later on</div><div class='del'>-	 */</div><div class='del'>-	jl-&gt;j_len = 0;</div><div class='del'>-	atomic_set(&amp;jl-&gt;j_nonzerolen, 0);</div><div class='del'>-	jl-&gt;j_start = 0;</div><div class='del'>-	jl-&gt;j_realblock = NULL;</div><div class='del'>-	jl-&gt;j_commit_bh = NULL;</div><div class='del'>-	jl-&gt;j_trans_id = 0;</div><div class='del'>-	jl-&gt;j_state = 0;</div><div class='del'>-	put_journal_list(s, jl);</div><div class='del'>-	if (flushall)</div><div class='del'>-		mutex_unlock(&amp;journal-&gt;j_flush_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_one_transaction(struct super_block *s,</div><div class='del'>-				 struct reiserfs_journal_list *jl,</div><div class='del'>-				 struct buffer_chunk *chunk)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *cn;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	jl-&gt;j_state |= LIST_TOUCHED;</div><div class='del'>-	del_from_work_list(s, jl);</div><div class='del'>-	if (jl-&gt;j_len == 0 || atomic_read(&amp;jl-&gt;j_nonzerolen) == 0) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cn = jl-&gt;j_realblock;</div><div class='del'>-	while (cn) {</div><div class='del'>-		/*</div><div class='del'>-		 * if the blocknr == 0, this has been cleared from the hash,</div><div class='del'>-		 * skip it</div><div class='del'>-		 */</div><div class='del'>-		if (cn-&gt;blocknr == 0) {</div><div class='del'>-			goto next;</div><div class='del'>-		}</div><div class='del'>-		if (cn-&gt;bh &amp;&amp; can_dirty(cn) &amp;&amp; buffer_dirty(cn-&gt;bh)) {</div><div class='del'>-			struct buffer_head *tmp_bh;</div><div class='del'>-			/*</div><div class='del'>-			 * we can race against journal_mark_freed when we try</div><div class='del'>-			 * to lock_buffer(cn-&gt;bh), so we have to inc the buffer</div><div class='del'>-			 * count, and recheck things after locking</div><div class='del'>-			 */</div><div class='del'>-			tmp_bh = cn-&gt;bh;</div><div class='del'>-			get_bh(tmp_bh);</div><div class='del'>-			lock_buffer(tmp_bh);</div><div class='del'>-			if (cn-&gt;bh &amp;&amp; can_dirty(cn) &amp;&amp; buffer_dirty(tmp_bh)) {</div><div class='del'>-				if (!buffer_journal_dirty(tmp_bh) ||</div><div class='del'>-				    buffer_journal_prepared(tmp_bh))</div><div class='del'>-					BUG();</div><div class='del'>-				add_to_chunk(chunk, tmp_bh, NULL, write_chunk);</div><div class='del'>-				ret++;</div><div class='del'>-			} else {</div><div class='del'>-				/* note, cn-&gt;bh might be null now */</div><div class='del'>-				unlock_buffer(tmp_bh);</div><div class='del'>-			}</div><div class='del'>-			put_bh(tmp_bh);</div><div class='del'>-		}</div><div class='del'>-next:</div><div class='del'>-		cn = cn-&gt;next;</div><div class='del'>-		cond_resched();</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used by flush_commit_list */</div><div class='del'>-static void dirty_one_transaction(struct super_block *s,</div><div class='del'>-				 struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *cn;</div><div class='del'>-	struct reiserfs_journal_list *pjl;</div><div class='del'>-</div><div class='del'>-	jl-&gt;j_state |= LIST_DIRTY;</div><div class='del'>-	cn = jl-&gt;j_realblock;</div><div class='del'>-	while (cn) {</div><div class='del'>-		/*</div><div class='del'>-		 * look for a more recent transaction that logged this</div><div class='del'>-		 * buffer.  Only the most recent transaction with a buffer in</div><div class='del'>-		 * it is allowed to send that buffer to disk</div><div class='del'>-		 */</div><div class='del'>-		pjl = find_newer_jl_for_cn(cn);</div><div class='del'>-		if (!pjl &amp;&amp; cn-&gt;blocknr &amp;&amp; cn-&gt;bh</div><div class='del'>-		    &amp;&amp; buffer_journal_dirty(cn-&gt;bh)) {</div><div class='del'>-			BUG_ON(!can_dirty(cn));</div><div class='del'>-			/*</div><div class='del'>-			 * if the buffer is prepared, it will either be logged</div><div class='del'>-			 * or restored.  If restored, we need to make sure</div><div class='del'>-			 * it actually gets marked dirty</div><div class='del'>-			 */</div><div class='del'>-			clear_buffer_journal_new(cn-&gt;bh);</div><div class='del'>-			if (buffer_journal_prepared(cn-&gt;bh)) {</div><div class='del'>-				set_buffer_journal_restore_dirty(cn-&gt;bh);</div><div class='del'>-			} else {</div><div class='del'>-				set_buffer_journal_test(cn-&gt;bh);</div><div class='del'>-				mark_buffer_dirty(cn-&gt;bh);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		cn = cn-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kupdate_transactions(struct super_block *s,</div><div class='del'>-				struct reiserfs_journal_list *jl,</div><div class='del'>-				struct reiserfs_journal_list **next_jl,</div><div class='del'>-				unsigned int *next_trans_id,</div><div class='del'>-				int num_blocks, int num_trans)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int written = 0;</div><div class='del'>-	int transactions_flushed = 0;</div><div class='del'>-	unsigned int orig_trans_id = jl-&gt;j_trans_id;</div><div class='del'>-	struct buffer_chunk chunk;</div><div class='del'>-	struct list_head *entry;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	chunk.nr = 0;</div><div class='del'>-</div><div class='del'>-	reiserfs_mutex_lock_safe(&amp;journal-&gt;j_flush_mutex, s);</div><div class='del'>-	if (!journal_list_still_alive(s, orig_trans_id)) {</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we've got j_flush_mutex held, nobody is going to delete any</div><div class='del'>-	 * of these lists out from underneath us</div><div class='del'>-	 */</div><div class='del'>-	while ((num_trans &amp;&amp; transactions_flushed &lt; num_trans) ||</div><div class='del'>-	       (!num_trans &amp;&amp; written &lt; num_blocks)) {</div><div class='del'>-</div><div class='del'>-		if (jl-&gt;j_len == 0 || (jl-&gt;j_state &amp; LIST_TOUCHED) ||</div><div class='del'>-		    atomic_read(&amp;jl-&gt;j_commit_left)</div><div class='del'>-		    || !(jl-&gt;j_state &amp; LIST_DIRTY)) {</div><div class='del'>-			del_from_work_list(s, jl);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = write_one_transaction(s, jl, &amp;chunk);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto done;</div><div class='del'>-		transactions_flushed++;</div><div class='del'>-		written += ret;</div><div class='del'>-		entry = jl-&gt;j_list.next;</div><div class='del'>-</div><div class='del'>-		/* did we wrap? */</div><div class='del'>-		if (entry == &amp;journal-&gt;j_journal_list) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		jl = JOURNAL_LIST_ENTRY(entry);</div><div class='del'>-</div><div class='del'>-		/* don't bother with older transactions */</div><div class='del'>-		if (jl-&gt;j_trans_id &lt;= orig_trans_id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (chunk.nr) {</div><div class='del'>-		write_chunk(&amp;chunk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	mutex_unlock(&amp;journal-&gt;j_flush_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * for o_sync and fsync heavy applications, they tend to use</div><div class='del'>- * all the journa list slots with tiny transactions.  These</div><div class='del'>- * trigger lots and lots of calls to update the header block, which</div><div class='del'>- * adds seeks and slows things down.</div><div class='del'>- *</div><div class='del'>- * This function tries to clear out a large chunk of the journal lists</div><div class='del'>- * at once, which makes everything faster since only the newest journal</div><div class='del'>- * list updates the header block</div><div class='del'>- */</div><div class='del'>-static int flush_used_journal_lists(struct super_block *s,</div><div class='del'>-				    struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	unsigned long len = 0;</div><div class='del'>-	unsigned long cur_len;</div><div class='del'>-	int i;</div><div class='del'>-	int limit = 256;</div><div class='del'>-	struct reiserfs_journal_list *tjl;</div><div class='del'>-	struct reiserfs_journal_list *flush_jl;</div><div class='del'>-	unsigned int trans_id;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-</div><div class='del'>-	flush_jl = tjl = jl;</div><div class='del'>-</div><div class='del'>-	/* in data logging mode, try harder to flush a lot of blocks */</div><div class='del'>-	if (reiserfs_data_log(s))</div><div class='del'>-		limit = 1024;</div><div class='del'>-	/* flush for 256 transactions or limit blocks, whichever comes first */</div><div class='del'>-	for (i = 0; i &lt; 256 &amp;&amp; len &lt; limit; i++) {</div><div class='del'>-		if (atomic_read(&amp;tjl-&gt;j_commit_left) ||</div><div class='del'>-		    tjl-&gt;j_trans_id &lt; jl-&gt;j_trans_id) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cur_len = atomic_read(&amp;tjl-&gt;j_nonzerolen);</div><div class='del'>-		if (cur_len &gt; 0) {</div><div class='del'>-			tjl-&gt;j_state &amp;= ~LIST_TOUCHED;</div><div class='del'>-		}</div><div class='del'>-		len += cur_len;</div><div class='del'>-		flush_jl = tjl;</div><div class='del'>-		if (tjl-&gt;j_list.next == &amp;journal-&gt;j_journal_list)</div><div class='del'>-			break;</div><div class='del'>-		tjl = JOURNAL_LIST_ENTRY(tjl-&gt;j_list.next);</div><div class='del'>-	}</div><div class='del'>-	get_journal_list(jl);</div><div class='del'>-	get_journal_list(flush_jl);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * try to find a group of blocks we can flush across all the</div><div class='del'>-	 * transactions, but only bother if we've actually spanned</div><div class='del'>-	 * across multiple lists</div><div class='del'>-	 */</div><div class='del'>-	if (flush_jl != jl)</div><div class='del'>-		kupdate_transactions(s, jl, &amp;tjl, &amp;trans_id, len, i);</div><div class='del'>-</div><div class='del'>-	flush_journal_list(s, flush_jl, 1);</div><div class='del'>-	put_journal_list(s, flush_jl);</div><div class='del'>-	put_journal_list(s, jl);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * removes any nodes in table with name block and dev as bh.</div><div class='del'>- * only touchs the hnext and hprev pointers.</div><div class='del'>- */</div><div class='del'>-static void remove_journal_hash(struct super_block *sb,</div><div class='del'>-			 struct reiserfs_journal_cnode **table,</div><div class='del'>-			 struct reiserfs_journal_list *jl,</div><div class='del'>-			 unsigned long block, int remove_freed)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_cnode *cur;</div><div class='del'>-	struct reiserfs_journal_cnode **head;</div><div class='del'>-</div><div class='del'>-	head = &amp;(journal_hash(table, sb, block));</div><div class='del'>-	if (!head) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	cur = *head;</div><div class='del'>-	while (cur) {</div><div class='del'>-		if (cur-&gt;blocknr == block &amp;&amp; cur-&gt;sb == sb</div><div class='del'>-		    &amp;&amp; (jl == NULL || jl == cur-&gt;jlist)</div><div class='del'>-		    &amp;&amp; (!test_bit(BLOCK_FREED, &amp;cur-&gt;state) || remove_freed)) {</div><div class='del'>-			if (cur-&gt;hnext) {</div><div class='del'>-				cur-&gt;hnext-&gt;hprev = cur-&gt;hprev;</div><div class='del'>-			}</div><div class='del'>-			if (cur-&gt;hprev) {</div><div class='del'>-				cur-&gt;hprev-&gt;hnext = cur-&gt;hnext;</div><div class='del'>-			} else {</div><div class='del'>-				*head = cur-&gt;hnext;</div><div class='del'>-			}</div><div class='del'>-			cur-&gt;blocknr = 0;</div><div class='del'>-			cur-&gt;sb = NULL;</div><div class='del'>-			cur-&gt;state = 0;</div><div class='del'>-			/*</div><div class='del'>-			 * anybody who clears the cur-&gt;bh will also</div><div class='del'>-			 * dec the nonzerolen</div><div class='del'>-			 */</div><div class='del'>-			if (cur-&gt;bh &amp;&amp; cur-&gt;jlist)</div><div class='del'>-				atomic_dec(&amp;cur-&gt;jlist-&gt;j_nonzerolen);</div><div class='del'>-			cur-&gt;bh = NULL;</div><div class='del'>-			cur-&gt;jlist = NULL;</div><div class='del'>-		}</div><div class='del'>-		cur = cur-&gt;hnext;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_journal_ram(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	kfree(journal-&gt;j_current_jl);</div><div class='del'>-	journal-&gt;j_num_lists--;</div><div class='del'>-</div><div class='del'>-	vfree(journal-&gt;j_cnode_free_orig);</div><div class='del'>-	free_list_bitmaps(sb, journal-&gt;j_list_bitmap);</div><div class='del'>-	free_bitmap_nodes(sb);	/* must be after free_list_bitmaps */</div><div class='del'>-	if (journal-&gt;j_header_bh) {</div><div class='del'>-		brelse(journal-&gt;j_header_bh);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * j_header_bh is on the journal dev, make sure</div><div class='del'>-	 * not to release the journal dev until we brelse j_header_bh</div><div class='del'>-	 */</div><div class='del'>-	release_journal_dev(journal);</div><div class='del'>-	vfree(journal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * call on unmount.  Only set error to 1 if you haven't made your way out</div><div class='del'>- * of read_super() yet.  Any other caller must keep error at 0.</div><div class='del'>- */</div><div class='del'>-static int do_journal_release(struct reiserfs_transaction_handle *th,</div><div class='del'>-			      struct super_block *sb, int error)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle myth;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we only want to flush out transactions if we were</div><div class='del'>-	 * called with error == 0</div><div class='del'>-	 */</div><div class='del'>-	if (!error &amp;&amp; !sb_rdonly(sb)) {</div><div class='del'>-		/* end the current trans */</div><div class='del'>-		BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-		do_journal_end(th, FLUSH_ALL);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * make sure something gets logged to force</div><div class='del'>-		 * our way into the flush code</div><div class='del'>-		 */</div><div class='del'>-		if (!journal_join(&amp;myth, sb)) {</div><div class='del'>-			reiserfs_prepare_for_journal(sb,</div><div class='del'>-						     SB_BUFFER_WITH_SB(sb),</div><div class='del'>-						     1);</div><div class='del'>-			journal_mark_dirty(&amp;myth, SB_BUFFER_WITH_SB(sb));</div><div class='del'>-			do_journal_end(&amp;myth, FLUSH_ALL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this also catches errors during the do_journal_end above */</div><div class='del'>-	if (!error &amp;&amp; reiserfs_is_journal_aborted(journal)) {</div><div class='del'>-		memset(&amp;myth, 0, sizeof(myth));</div><div class='del'>-		if (!journal_join_abort(&amp;myth, sb)) {</div><div class='del'>-			reiserfs_prepare_for_journal(sb,</div><div class='del'>-						     SB_BUFFER_WITH_SB(sb),</div><div class='del'>-						     1);</div><div class='del'>-			journal_mark_dirty(&amp;myth, SB_BUFFER_WITH_SB(sb));</div><div class='del'>-			do_journal_end(&amp;myth, FLUSH_ALL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We must release the write lock here because</div><div class='del'>-	 * the workqueue job (flush_async_commit) needs this lock</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Cancel flushing of old commits. Note that neither of these works</div><div class='del'>-	 * will be requeued because superblock is being shutdown and doesn't</div><div class='del'>-	 * have SB_ACTIVE set.</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_cancel_old_flush(sb);</div><div class='del'>-	/* wait for all commits to finish */</div><div class='del'>-	cancel_delayed_work_sync(&amp;SB_JOURNAL(sb)-&gt;j_work);</div><div class='del'>-</div><div class='del'>-	free_journal_ram(sb);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* * call on unmount.  flush all journal trans, release all alloc'd ram */</div><div class='del'>-int journal_release(struct reiserfs_transaction_handle *th,</div><div class='del'>-		    struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return do_journal_release(th, sb, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* only call from an error condition inside reiserfs_read_super!  */</div><div class='del'>-int journal_release_error(struct reiserfs_transaction_handle *th,</div><div class='del'>-			  struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return do_journal_release(th, sb, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * compares description block with commit block.</div><div class='del'>- * returns 1 if they differ, 0 if they are the same</div><div class='del'>- */</div><div class='del'>-static int journal_compare_desc_commit(struct super_block *sb,</div><div class='del'>-				       struct reiserfs_journal_desc *desc,</div><div class='del'>-				       struct reiserfs_journal_commit *commit)</div><div class='del'>-{</div><div class='del'>-	if (get_commit_trans_id(commit) != get_desc_trans_id(desc) ||</div><div class='del'>-	    get_commit_trans_len(commit) != get_desc_trans_len(desc) ||</div><div class='del'>-	    get_commit_trans_len(commit) &gt; SB_JOURNAL(sb)-&gt;j_trans_max ||</div><div class='del'>-	    get_commit_trans_len(commit) &lt;= 0) {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns 0 if it did not find a description block</div><div class='del'>- * returns -1 if it found a corrupt commit block</div><div class='del'>- * returns 1 if both desc and commit were valid</div><div class='del'>- * NOTE: only called during fs mount</div><div class='del'>- */</div><div class='del'>-static int journal_transaction_is_valid(struct super_block *sb,</div><div class='del'>-					struct buffer_head *d_bh,</div><div class='del'>-					unsigned int *oldest_invalid_trans_id,</div><div class='del'>-					unsigned long *newest_mount_id)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_desc *desc;</div><div class='del'>-	struct reiserfs_journal_commit *commit;</div><div class='del'>-	struct buffer_head *c_bh;</div><div class='del'>-	unsigned long offset;</div><div class='del'>-</div><div class='del'>-	if (!d_bh)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	desc = (struct reiserfs_journal_desc *)d_bh-&gt;b_data;</div><div class='del'>-	if (get_desc_trans_len(desc) &gt; 0</div><div class='del'>-	    &amp;&amp; !memcmp(get_journal_desc_magic(d_bh), JOURNAL_DESC_MAGIC, 8)) {</div><div class='del'>-		if (oldest_invalid_trans_id &amp;&amp; *oldest_invalid_trans_id</div><div class='del'>-		    &amp;&amp; get_desc_trans_id(desc) &gt; *oldest_invalid_trans_id) {</div><div class='del'>-			reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-				       "journal-986: transaction "</div><div class='del'>-				       "is valid returning because trans_id %d is greater than "</div><div class='del'>-				       "oldest_invalid %lu",</div><div class='del'>-				       get_desc_trans_id(desc),</div><div class='del'>-				       *oldest_invalid_trans_id);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (newest_mount_id</div><div class='del'>-		    &amp;&amp; *newest_mount_id &gt; get_desc_mount_id(desc)) {</div><div class='del'>-			reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-				       "journal-1087: transaction "</div><div class='del'>-				       "is valid returning because mount_id %d is less than "</div><div class='del'>-				       "newest_mount_id %lu",</div><div class='del'>-				       get_desc_mount_id(desc),</div><div class='del'>-				       *newest_mount_id);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		if (get_desc_trans_len(desc) &gt; SB_JOURNAL(sb)-&gt;j_trans_max) {</div><div class='del'>-			reiserfs_warning(sb, "journal-2018",</div><div class='del'>-					 "Bad transaction length %d "</div><div class='del'>-					 "encountered, ignoring transaction",</div><div class='del'>-					 get_desc_trans_len(desc));</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		offset = d_bh-&gt;b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(sb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ok, we have a journal description block,</div><div class='del'>-		 * let's see if the transaction was valid</div><div class='del'>-		 */</div><div class='del'>-		c_bh =</div><div class='del'>-		    journal_bread(sb,</div><div class='del'>-				  SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-				  ((offset + get_desc_trans_len(desc) +</div><div class='del'>-				    1) % SB_ONDISK_JOURNAL_SIZE(sb)));</div><div class='del'>-		if (!c_bh)</div><div class='del'>-			return 0;</div><div class='del'>-		commit = (struct reiserfs_journal_commit *)c_bh-&gt;b_data;</div><div class='del'>-		if (journal_compare_desc_commit(sb, desc, commit)) {</div><div class='del'>-			reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-				       "journal_transaction_is_valid, commit offset %ld had bad "</div><div class='del'>-				       "time %d or length %d",</div><div class='del'>-				       c_bh-&gt;b_blocknr -</div><div class='del'>-				       SB_ONDISK_JOURNAL_1st_BLOCK(sb),</div><div class='del'>-				       get_commit_trans_id(commit),</div><div class='del'>-				       get_commit_trans_len(commit));</div><div class='del'>-			brelse(c_bh);</div><div class='del'>-			if (oldest_invalid_trans_id) {</div><div class='del'>-				*oldest_invalid_trans_id =</div><div class='del'>-				    get_desc_trans_id(desc);</div><div class='del'>-				reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-					       "journal-1004: "</div><div class='del'>-					       "transaction_is_valid setting oldest invalid trans_id "</div><div class='del'>-					       "to %d",</div><div class='del'>-					       get_desc_trans_id(desc));</div><div class='del'>-			}</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		brelse(c_bh);</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "journal-1006: found valid "</div><div class='del'>-			       "transaction start offset %llu, len %d id %d",</div><div class='del'>-			       d_bh-&gt;b_blocknr -</div><div class='del'>-			       SB_ONDISK_JOURNAL_1st_BLOCK(sb),</div><div class='del'>-			       get_desc_trans_len(desc),</div><div class='del'>-			       get_desc_trans_id(desc));</div><div class='del'>-		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void brelse_array(struct buffer_head **heads, int num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		brelse(heads[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * given the start, and values for the oldest acceptable transactions,</div><div class='del'>- * this either reads in a replays a transaction, or returns because the</div><div class='del'>- * transaction is invalid, or too old.</div><div class='del'>- * NOTE: only called during fs mount</div><div class='del'>- */</div><div class='del'>-static int journal_read_transaction(struct super_block *sb,</div><div class='del'>-				    unsigned long cur_dblock,</div><div class='del'>-				    unsigned long oldest_start,</div><div class='del'>-				    unsigned int oldest_trans_id,</div><div class='del'>-				    unsigned long newest_mount_id)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_journal_desc *desc;</div><div class='del'>-	struct reiserfs_journal_commit *commit;</div><div class='del'>-	unsigned int trans_id = 0;</div><div class='del'>-	struct buffer_head *c_bh;</div><div class='del'>-	struct buffer_head *d_bh;</div><div class='del'>-	struct buffer_head **log_blocks = NULL;</div><div class='del'>-	struct buffer_head **real_blocks = NULL;</div><div class='del'>-	unsigned int trans_offset;</div><div class='del'>-	int i;</div><div class='del'>-	int trans_half;</div><div class='del'>-</div><div class='del'>-	d_bh = journal_bread(sb, cur_dblock);</div><div class='del'>-	if (!d_bh)</div><div class='del'>-		return 1;</div><div class='del'>-	desc = (struct reiserfs_journal_desc *)d_bh-&gt;b_data;</div><div class='del'>-	trans_offset = d_bh-&gt;b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(sb);</div><div class='del'>-	reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1037: "</div><div class='del'>-		       "journal_read_transaction, offset %llu, len %d mount_id %d",</div><div class='del'>-		       d_bh-&gt;b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(sb),</div><div class='del'>-		       get_desc_trans_len(desc), get_desc_mount_id(desc));</div><div class='del'>-	if (get_desc_trans_id(desc) &lt; oldest_trans_id) {</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1039: "</div><div class='del'>-			       "journal_read_trans skipping because %lu is too old",</div><div class='del'>-			       cur_dblock -</div><div class='del'>-			       SB_ONDISK_JOURNAL_1st_BLOCK(sb));</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (get_desc_mount_id(desc) != newest_mount_id) {</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1146: "</div><div class='del'>-			       "journal_read_trans skipping because %d is != "</div><div class='del'>-			       "newest_mount_id %lu", get_desc_mount_id(desc),</div><div class='del'>-			       newest_mount_id);</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	c_bh = journal_bread(sb, SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-			     ((trans_offset + get_desc_trans_len(desc) + 1) %</div><div class='del'>-			      SB_ONDISK_JOURNAL_SIZE(sb)));</div><div class='del'>-	if (!c_bh) {</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	commit = (struct reiserfs_journal_commit *)c_bh-&gt;b_data;</div><div class='del'>-	if (journal_compare_desc_commit(sb, desc, commit)) {</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "journal_read_transaction, "</div><div class='del'>-			       "commit offset %llu had bad time %d or length %d",</div><div class='del'>-			       c_bh-&gt;b_blocknr -</div><div class='del'>-			       SB_ONDISK_JOURNAL_1st_BLOCK(sb),</div><div class='del'>-			       get_commit_trans_id(commit),</div><div class='del'>-			       get_commit_trans_len(commit));</div><div class='del'>-		brelse(c_bh);</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bdev_read_only(sb-&gt;s_bdev)) {</div><div class='del'>-		reiserfs_warning(sb, "clm-2076",</div><div class='del'>-				 "device is readonly, unable to replay log");</div><div class='del'>-		brelse(c_bh);</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		return -EROFS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trans_id = get_desc_trans_id(desc);</div><div class='del'>-	/*</div><div class='del'>-	 * now we know we've got a good transaction, and it was</div><div class='del'>-	 * inside the valid time ranges</div><div class='del'>-	 */</div><div class='del'>-	log_blocks = kmalloc_array(get_desc_trans_len(desc),</div><div class='del'>-				   sizeof(struct buffer_head *),</div><div class='del'>-				   GFP_NOFS);</div><div class='del'>-	real_blocks = kmalloc_array(get_desc_trans_len(desc),</div><div class='del'>-				    sizeof(struct buffer_head *),</div><div class='del'>-				    GFP_NOFS);</div><div class='del'>-	if (!log_blocks || !real_blocks) {</div><div class='del'>-		brelse(c_bh);</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		kfree(log_blocks);</div><div class='del'>-		kfree(real_blocks);</div><div class='del'>-		reiserfs_warning(sb, "journal-1169",</div><div class='del'>-				 "kmalloc failed, unable to mount FS");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	/* get all the buffer heads */</div><div class='del'>-	trans_half = journal_trans_half(sb-&gt;s_blocksize);</div><div class='del'>-	for (i = 0; i &lt; get_desc_trans_len(desc); i++) {</div><div class='del'>-		log_blocks[i] =</div><div class='del'>-		    journal_getblk(sb,</div><div class='del'>-				   SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-				   (trans_offset + 1 +</div><div class='del'>-				    i) % SB_ONDISK_JOURNAL_SIZE(sb));</div><div class='del'>-		if (i &lt; trans_half) {</div><div class='del'>-			real_blocks[i] =</div><div class='del'>-			    sb_getblk(sb,</div><div class='del'>-				      le32_to_cpu(desc-&gt;j_realblock[i]));</div><div class='del'>-		} else {</div><div class='del'>-			real_blocks[i] =</div><div class='del'>-			    sb_getblk(sb,</div><div class='del'>-				      le32_to_cpu(commit-&gt;</div><div class='del'>-						  j_realblock[i - trans_half]));</div><div class='del'>-		}</div><div class='del'>-		if (real_blocks[i]-&gt;b_blocknr &gt; SB_BLOCK_COUNT(sb)) {</div><div class='del'>-			reiserfs_warning(sb, "journal-1207",</div><div class='del'>-					 "REPLAY FAILURE fsck required! "</div><div class='del'>-					 "Block to replay is outside of "</div><div class='del'>-					 "filesystem");</div><div class='del'>-			goto abort_replay;</div><div class='del'>-		}</div><div class='del'>-		/* make sure we don't try to replay onto log or reserved area */</div><div class='del'>-		if (is_block_in_log_or_reserved_area</div><div class='del'>-		    (sb, real_blocks[i]-&gt;b_blocknr)) {</div><div class='del'>-			reiserfs_warning(sb, "journal-1204",</div><div class='del'>-					 "REPLAY FAILURE fsck required! "</div><div class='del'>-					 "Trying to replay onto a log block");</div><div class='del'>-abort_replay:</div><div class='del'>-			brelse_array(log_blocks, i);</div><div class='del'>-			brelse_array(real_blocks, i);</div><div class='del'>-			brelse(c_bh);</div><div class='del'>-			brelse(d_bh);</div><div class='del'>-			kfree(log_blocks);</div><div class='del'>-			kfree(real_blocks);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* read in the log blocks, memcpy to the corresponding real block */</div><div class='del'>-	bh_read_batch(get_desc_trans_len(desc), log_blocks);</div><div class='del'>-	for (i = 0; i &lt; get_desc_trans_len(desc); i++) {</div><div class='del'>-</div><div class='del'>-		wait_on_buffer(log_blocks[i]);</div><div class='del'>-		if (!buffer_uptodate(log_blocks[i])) {</div><div class='del'>-			reiserfs_warning(sb, "journal-1212",</div><div class='del'>-					 "REPLAY FAILURE fsck required! "</div><div class='del'>-					 "buffer write failed");</div><div class='del'>-			brelse_array(log_blocks + i,</div><div class='del'>-				     get_desc_trans_len(desc) - i);</div><div class='del'>-			brelse_array(real_blocks, get_desc_trans_len(desc));</div><div class='del'>-			brelse(c_bh);</div><div class='del'>-			brelse(d_bh);</div><div class='del'>-			kfree(log_blocks);</div><div class='del'>-			kfree(real_blocks);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		memcpy(real_blocks[i]-&gt;b_data, log_blocks[i]-&gt;b_data,</div><div class='del'>-		       real_blocks[i]-&gt;b_size);</div><div class='del'>-		set_buffer_uptodate(real_blocks[i]);</div><div class='del'>-		brelse(log_blocks[i]);</div><div class='del'>-	}</div><div class='del'>-	/* flush out the real blocks */</div><div class='del'>-	for (i = 0; i &lt; get_desc_trans_len(desc); i++) {</div><div class='del'>-		set_buffer_dirty(real_blocks[i]);</div><div class='del'>-		write_dirty_buffer(real_blocks[i], 0);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; get_desc_trans_len(desc); i++) {</div><div class='del'>-		wait_on_buffer(real_blocks[i]);</div><div class='del'>-		if (!buffer_uptodate(real_blocks[i])) {</div><div class='del'>-			reiserfs_warning(sb, "journal-1226",</div><div class='del'>-					 "REPLAY FAILURE, fsck required! "</div><div class='del'>-					 "buffer write failed");</div><div class='del'>-			brelse_array(real_blocks + i,</div><div class='del'>-				     get_desc_trans_len(desc) - i);</div><div class='del'>-			brelse(c_bh);</div><div class='del'>-			brelse(d_bh);</div><div class='del'>-			kfree(log_blocks);</div><div class='del'>-			kfree(real_blocks);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		brelse(real_blocks[i]);</div><div class='del'>-	}</div><div class='del'>-	cur_dblock =</div><div class='del'>-	    SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-	    ((trans_offset + get_desc_trans_len(desc) +</div><div class='del'>-	      2) % SB_ONDISK_JOURNAL_SIZE(sb));</div><div class='del'>-	reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-		       "journal-1095: setting journal " "start to offset %ld",</div><div class='del'>-		       cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(sb));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * init starting values for the first transaction, in case</div><div class='del'>-	 * this is the last transaction to be replayed.</div><div class='del'>-	 */</div><div class='del'>-	journal-&gt;j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(sb);</div><div class='del'>-	journal-&gt;j_last_flush_trans_id = trans_id;</div><div class='del'>-	journal-&gt;j_trans_id = trans_id + 1;</div><div class='del'>-	/* check for trans_id overflow */</div><div class='del'>-	if (journal-&gt;j_trans_id == 0)</div><div class='del'>-		journal-&gt;j_trans_id = 10;</div><div class='del'>-	brelse(c_bh);</div><div class='del'>-	brelse(d_bh);</div><div class='del'>-	kfree(log_blocks);</div><div class='del'>-	kfree(real_blocks);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function reads blocks starting from block and to max_block of bufsize</div><div class='del'>- * size (but no more than BUFNR blocks at a time). This proved to improve</div><div class='del'>- * mounting speed on self-rebuilding raid5 arrays at least.</div><div class='del'>- * Right now it is only used from journal code. But later we might use it</div><div class='del'>- * from other places.</div><div class='del'>- * Note: Do not use journal_getblk/sb_getblk functions here!</div><div class='del'>- */</div><div class='del'>-static struct buffer_head *reiserfs_breada(struct block_device *dev,</div><div class='del'>-					   b_blocknr_t block, int bufsize,</div><div class='del'>-					   b_blocknr_t max_block)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bhlist[BUFNR];</div><div class='del'>-	unsigned int blocks = BUFNR;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	bh = __getblk(dev, block, bufsize);</div><div class='del'>-	if (!bh || buffer_uptodate(bh))</div><div class='del'>-		return (bh);</div><div class='del'>-</div><div class='del'>-	if (block + BUFNR &gt; max_block) {</div><div class='del'>-		blocks = max_block - block;</div><div class='del'>-	}</div><div class='del'>-	bhlist[0] = bh;</div><div class='del'>-	j = 1;</div><div class='del'>-	for (i = 1; i &lt; blocks; i++) {</div><div class='del'>-		bh = __getblk(dev, block + i, bufsize);</div><div class='del'>-		if (!bh)</div><div class='del'>-			break;</div><div class='del'>-		if (buffer_uptodate(bh)) {</div><div class='del'>-			brelse(bh);</div><div class='del'>-			break;</div><div class='del'>-		} else</div><div class='del'>-			bhlist[j++] = bh;</div><div class='del'>-	}</div><div class='del'>-	bh = bhlist[0];</div><div class='del'>-	bh_read_nowait(bh, 0);</div><div class='del'>-	bh_readahead_batch(j - 1, &amp;bhlist[1], 0);</div><div class='del'>-	for (i = 1; i &lt; j; i++)</div><div class='del'>-		brelse(bhlist[i]);</div><div class='del'>-	wait_on_buffer(bh);</div><div class='del'>-	if (buffer_uptodate(bh))</div><div class='del'>-		return bh;</div><div class='del'>-	brelse(bh);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * read and replay the log</div><div class='del'>- * on a clean unmount, the journal header's next unflushed pointer will be</div><div class='del'>- * to an invalid transaction.  This tests that before finding all the</div><div class='del'>- * transactions in the log, which makes normal mount times fast.</div><div class='del'>- *</div><div class='del'>- * After a crash, this starts with the next unflushed transaction, and</div><div class='del'>- * replays until it finds one too old, or invalid.</div><div class='del'>- *</div><div class='del'>- * On exit, it sets things up so the first transaction will work correctly.</div><div class='del'>- * NOTE: only called during fs mount</div><div class='del'>- */</div><div class='del'>-static int journal_read(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_journal_desc *desc;</div><div class='del'>-	unsigned int oldest_trans_id = 0;</div><div class='del'>-	unsigned int oldest_invalid_trans_id = 0;</div><div class='del'>-	time64_t start;</div><div class='del'>-	unsigned long oldest_start = 0;</div><div class='del'>-	unsigned long cur_dblock = 0;</div><div class='del'>-	unsigned long newest_mount_id = 9;</div><div class='del'>-	struct buffer_head *d_bh;</div><div class='del'>-	struct reiserfs_journal_header *jh;</div><div class='del'>-	int valid_journal_header = 0;</div><div class='del'>-	int replay_count = 0;</div><div class='del'>-	int continue_replay = 1;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(sb);</div><div class='del'>-	reiserfs_info(sb, "checking transaction log (%pg)\n",</div><div class='del'>-		      file_bdev(journal-&gt;j_bdev_file));</div><div class='del'>-	start = ktime_get_seconds();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * step 1, read in the journal header block.  Check the transaction</div><div class='del'>-	 * it says is the first unflushed, and if that transaction is not</div><div class='del'>-	 * valid, replay is done</div><div class='del'>-	 */</div><div class='del'>-	journal-&gt;j_header_bh = journal_bread(sb,</div><div class='del'>-					     SB_ONDISK_JOURNAL_1st_BLOCK(sb)</div><div class='del'>-					     + SB_ONDISK_JOURNAL_SIZE(sb));</div><div class='del'>-	if (!journal-&gt;j_header_bh) {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	jh = (struct reiserfs_journal_header *)(journal-&gt;j_header_bh-&gt;b_data);</div><div class='del'>-	if (le32_to_cpu(jh-&gt;j_first_unflushed_offset) &lt;</div><div class='del'>-	    SB_ONDISK_JOURNAL_SIZE(sb)</div><div class='del'>-	    &amp;&amp; le32_to_cpu(jh-&gt;j_last_flush_trans_id) &gt; 0) {</div><div class='del'>-		oldest_start =</div><div class='del'>-		    SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-		    le32_to_cpu(jh-&gt;j_first_unflushed_offset);</div><div class='del'>-		oldest_trans_id = le32_to_cpu(jh-&gt;j_last_flush_trans_id) + 1;</div><div class='del'>-		newest_mount_id = le32_to_cpu(jh-&gt;j_mount_id);</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "journal-1153: found in "</div><div class='del'>-			       "header: first_unflushed_offset %d, last_flushed_trans_id "</div><div class='del'>-			       "%lu", le32_to_cpu(jh-&gt;j_first_unflushed_offset),</div><div class='del'>-			       le32_to_cpu(jh-&gt;j_last_flush_trans_id));</div><div class='del'>-		valid_journal_header = 1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * now, we try to read the first unflushed offset.  If it</div><div class='del'>-		 * is not valid, there is nothing more we can do, and it</div><div class='del'>-		 * makes no sense to read through the whole log.</div><div class='del'>-		 */</div><div class='del'>-		d_bh =</div><div class='del'>-		    journal_bread(sb,</div><div class='del'>-				  SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-				  le32_to_cpu(jh-&gt;j_first_unflushed_offset));</div><div class='del'>-		ret = journal_transaction_is_valid(sb, d_bh, NULL, NULL);</div><div class='del'>-		if (!ret) {</div><div class='del'>-			continue_replay = 0;</div><div class='del'>-		}</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-		goto start_log_replay;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ok, there are transactions that need to be replayed.  start</div><div class='del'>-	 * with the first log block, find all the valid transactions, and</div><div class='del'>-	 * pick out the oldest.</div><div class='del'>-	 */</div><div class='del'>-	while (continue_replay</div><div class='del'>-	       &amp;&amp; cur_dblock &lt;</div><div class='del'>-	       (SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-		SB_ONDISK_JOURNAL_SIZE(sb))) {</div><div class='del'>-		/*</div><div class='del'>-		 * Note that it is required for blocksize of primary fs</div><div class='del'>-		 * device and journal device to be the same</div><div class='del'>-		 */</div><div class='del'>-		d_bh =</div><div class='del'>-		    reiserfs_breada(file_bdev(journal-&gt;j_bdev_file), cur_dblock,</div><div class='del'>-				    sb-&gt;s_blocksize,</div><div class='del'>-				    SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-				    SB_ONDISK_JOURNAL_SIZE(sb));</div><div class='del'>-		ret =</div><div class='del'>-		    journal_transaction_is_valid(sb, d_bh,</div><div class='del'>-						 &amp;oldest_invalid_trans_id,</div><div class='del'>-						 &amp;newest_mount_id);</div><div class='del'>-		if (ret == 1) {</div><div class='del'>-			desc = (struct reiserfs_journal_desc *)d_bh-&gt;b_data;</div><div class='del'>-			if (oldest_start == 0) {	/* init all oldest_ values */</div><div class='del'>-				oldest_trans_id = get_desc_trans_id(desc);</div><div class='del'>-				oldest_start = d_bh-&gt;b_blocknr;</div><div class='del'>-				newest_mount_id = get_desc_mount_id(desc);</div><div class='del'>-				reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-					       "journal-1179: Setting "</div><div class='del'>-					       "oldest_start to offset %llu, trans_id %lu",</div><div class='del'>-					       oldest_start -</div><div class='del'>-					       SB_ONDISK_JOURNAL_1st_BLOCK</div><div class='del'>-					       (sb), oldest_trans_id);</div><div class='del'>-			} else if (oldest_trans_id &gt; get_desc_trans_id(desc)) {</div><div class='del'>-				/* one we just read was older */</div><div class='del'>-				oldest_trans_id = get_desc_trans_id(desc);</div><div class='del'>-				oldest_start = d_bh-&gt;b_blocknr;</div><div class='del'>-				reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-					       "journal-1180: Resetting "</div><div class='del'>-					       "oldest_start to offset %lu, trans_id %lu",</div><div class='del'>-					       oldest_start -</div><div class='del'>-					       SB_ONDISK_JOURNAL_1st_BLOCK</div><div class='del'>-					       (sb), oldest_trans_id);</div><div class='del'>-			}</div><div class='del'>-			if (newest_mount_id &lt; get_desc_mount_id(desc)) {</div><div class='del'>-				newest_mount_id = get_desc_mount_id(desc);</div><div class='del'>-				reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-					       "journal-1299: Setting "</div><div class='del'>-					       "newest_mount_id to %d",</div><div class='del'>-					       get_desc_mount_id(desc));</div><div class='del'>-			}</div><div class='del'>-			cur_dblock += get_desc_trans_len(desc) + 2;</div><div class='del'>-		} else {</div><div class='del'>-			cur_dblock++;</div><div class='del'>-		}</div><div class='del'>-		brelse(d_bh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-start_log_replay:</div><div class='del'>-	cur_dblock = oldest_start;</div><div class='del'>-	if (oldest_trans_id) {</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "journal-1206: Starting replay "</div><div class='del'>-			       "from offset %llu, trans_id %lu",</div><div class='del'>-			       cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(sb),</div><div class='del'>-			       oldest_trans_id);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	replay_count = 0;</div><div class='del'>-	while (continue_replay &amp;&amp; oldest_trans_id &gt; 0) {</div><div class='del'>-		ret =</div><div class='del'>-		    journal_read_transaction(sb, cur_dblock, oldest_start,</div><div class='del'>-					     oldest_trans_id, newest_mount_id);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			return ret;</div><div class='del'>-		} else if (ret != 0) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cur_dblock =</div><div class='del'>-		    SB_ONDISK_JOURNAL_1st_BLOCK(sb) + journal-&gt;j_start;</div><div class='del'>-		replay_count++;</div><div class='del'>-		if (cur_dblock == oldest_start)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (oldest_trans_id == 0) {</div><div class='del'>-		reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "journal-1225: No valid " "transactions found");</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * j_start does not get set correctly if we don't replay any</div><div class='del'>-	 * transactions.  if we had a valid journal_header, set j_start</div><div class='del'>-	 * to the first unflushed transaction value, copy the trans_id</div><div class='del'>-	 * from the header</div><div class='del'>-	 */</div><div class='del'>-	if (valid_journal_header &amp;&amp; replay_count == 0) {</div><div class='del'>-		journal-&gt;j_start = le32_to_cpu(jh-&gt;j_first_unflushed_offset);</div><div class='del'>-		journal-&gt;j_trans_id =</div><div class='del'>-		    le32_to_cpu(jh-&gt;j_last_flush_trans_id) + 1;</div><div class='del'>-		/* check for trans_id overflow */</div><div class='del'>-		if (journal-&gt;j_trans_id == 0)</div><div class='del'>-			journal-&gt;j_trans_id = 10;</div><div class='del'>-		journal-&gt;j_last_flush_trans_id =</div><div class='del'>-		    le32_to_cpu(jh-&gt;j_last_flush_trans_id);</div><div class='del'>-		journal-&gt;j_mount_id = le32_to_cpu(jh-&gt;j_mount_id) + 1;</div><div class='del'>-	} else {</div><div class='del'>-		journal-&gt;j_mount_id = newest_mount_id + 1;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1299: Setting "</div><div class='del'>-		       "newest_mount_id to %lu", journal-&gt;j_mount_id);</div><div class='del'>-	journal-&gt;j_first_unflushed_offset = journal-&gt;j_start;</div><div class='del'>-	if (replay_count &gt; 0) {</div><div class='del'>-		reiserfs_info(sb,</div><div class='del'>-			      "replayed %d transactions in %lu seconds\n",</div><div class='del'>-			      replay_count, ktime_get_seconds() - start);</div><div class='del'>-	}</div><div class='del'>-	/* needed to satisfy the locking in _update_journal_header_block */</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-	if (!bdev_read_only(sb-&gt;s_bdev) &amp;&amp;</div><div class='del'>-	    _update_journal_header_block(sb, journal-&gt;j_start,</div><div class='del'>-					 journal-&gt;j_last_flush_trans_id)) {</div><div class='del'>-		reiserfs_write_unlock(sb);</div><div class='del'>-		/*</div><div class='del'>-		 * replay failed, caller must call free_journal_ram and abort</div><div class='del'>-		 * the mount</div><div class='del'>-		 */</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct reiserfs_journal_list *alloc_journal_list(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_list *jl;</div><div class='del'>-	jl = kzalloc(sizeof(struct reiserfs_journal_list),</div><div class='del'>-		     GFP_NOFS | __GFP_NOFAIL);</div><div class='del'>-	INIT_LIST_HEAD(&amp;jl-&gt;j_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;jl-&gt;j_working_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;jl-&gt;j_tail_bh_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;jl-&gt;j_bh_list);</div><div class='del'>-	mutex_init(&amp;jl-&gt;j_commit_mutex);</div><div class='del'>-	SB_JOURNAL(s)-&gt;j_num_lists++;</div><div class='del'>-	get_journal_list(jl);</div><div class='del'>-	return jl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void journal_list_init(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	SB_JOURNAL(sb)-&gt;j_current_jl = alloc_journal_list(sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void release_journal_dev(struct reiserfs_journal *journal)</div><div class='del'>-{</div><div class='del'>-	if (journal-&gt;j_bdev_file) {</div><div class='del'>-		fput(journal-&gt;j_bdev_file);</div><div class='del'>-		journal-&gt;j_bdev_file = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_init_dev(struct super_block *super,</div><div class='del'>-			    struct reiserfs_journal *journal,</div><div class='del'>-			    const char *jdev_name)</div><div class='del'>-{</div><div class='del'>-	blk_mode_t blkdev_mode = BLK_OPEN_READ;</div><div class='del'>-	void *holder = journal;</div><div class='del'>-	int result;</div><div class='del'>-	dev_t jdev;</div><div class='del'>-</div><div class='del'>-	result = 0;</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_bdev_file = NULL;</div><div class='del'>-	jdev = SB_ONDISK_JOURNAL_DEVICE(super) ?</div><div class='del'>-	    new_decode_dev(SB_ONDISK_JOURNAL_DEVICE(super)) : super-&gt;s_dev;</div><div class='del'>-</div><div class='del'>-	if (!bdev_read_only(super-&gt;s_bdev))</div><div class='del'>-		blkdev_mode |= BLK_OPEN_WRITE;</div><div class='del'>-</div><div class='del'>-	/* there is no "jdev" option and journal is on separate device */</div><div class='del'>-	if ((!jdev_name || !jdev_name[0])) {</div><div class='del'>-		if (jdev == super-&gt;s_dev)</div><div class='del'>-			holder = NULL;</div><div class='del'>-		journal-&gt;j_bdev_file = bdev_file_open_by_dev(jdev, blkdev_mode,</div><div class='del'>-							  holder, NULL);</div><div class='del'>-		if (IS_ERR(journal-&gt;j_bdev_file)) {</div><div class='del'>-			result = PTR_ERR(journal-&gt;j_bdev_file);</div><div class='del'>-			journal-&gt;j_bdev_file = NULL;</div><div class='del'>-			reiserfs_warning(super, "sh-458",</div><div class='del'>-					 "cannot init journal device unknown-block(%u,%u): %i",</div><div class='del'>-					 MAJOR(jdev), MINOR(jdev), result);</div><div class='del'>-			return result;</div><div class='del'>-		} else if (jdev != super-&gt;s_dev)</div><div class='del'>-			set_blocksize(file_bdev(journal-&gt;j_bdev_file),</div><div class='del'>-				      super-&gt;s_blocksize);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_bdev_file = bdev_file_open_by_path(jdev_name, blkdev_mode,</div><div class='del'>-						   holder, NULL);</div><div class='del'>-	if (IS_ERR(journal-&gt;j_bdev_file)) {</div><div class='del'>-		result = PTR_ERR(journal-&gt;j_bdev_file);</div><div class='del'>-		journal-&gt;j_bdev_file = NULL;</div><div class='del'>-		reiserfs_warning(super, "sh-457",</div><div class='del'>-				 "journal_init_dev: Cannot open '%s': %i",</div><div class='del'>-				 jdev_name, result);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_blocksize(file_bdev(journal-&gt;j_bdev_file), super-&gt;s_blocksize);</div><div class='del'>-	reiserfs_info(super,</div><div class='del'>-		      "journal_init_dev: journal device: %pg\n",</div><div class='del'>-		      file_bdev(journal-&gt;j_bdev_file));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When creating/tuning a file system user can assign some</div><div class='del'>- * journal params within boundaries which depend on the ratio</div><div class='del'>- * blocksize/standard_blocksize.</div><div class='del'>- *</div><div class='del'>- * For blocks &gt;= standard_blocksize transaction size should</div><div class='del'>- * be not less then JOURNAL_TRANS_MIN_DEFAULT, and not more</div><div class='del'>- * then JOURNAL_TRANS_MAX_DEFAULT.</div><div class='del'>- *</div><div class='del'>- * For blocks &lt; standard_blocksize these boundaries should be</div><div class='del'>- * decreased proportionally.</div><div class='del'>- */</div><div class='del'>-#define REISERFS_STANDARD_BLKSIZE (4096)</div><div class='del'>-</div><div class='del'>-static int check_advise_trans_params(struct super_block *sb,</div><div class='del'>-				     struct reiserfs_journal *journal)</div><div class='del'>-{</div><div class='del'>-        if (journal-&gt;j_trans_max) {</div><div class='del'>-		/* Non-default journal params.  Do sanity check for them. */</div><div class='del'>-	        int ratio = 1;</div><div class='del'>-		if (sb-&gt;s_blocksize &lt; REISERFS_STANDARD_BLKSIZE)</div><div class='del'>-		        ratio = REISERFS_STANDARD_BLKSIZE / sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-		if (journal-&gt;j_trans_max &gt; JOURNAL_TRANS_MAX_DEFAULT / ratio ||</div><div class='del'>-		    journal-&gt;j_trans_max &lt; JOURNAL_TRANS_MIN_DEFAULT / ratio ||</div><div class='del'>-		    SB_ONDISK_JOURNAL_SIZE(sb) / journal-&gt;j_trans_max &lt;</div><div class='del'>-		    JOURNAL_MIN_RATIO) {</div><div class='del'>-			reiserfs_warning(sb, "sh-462",</div><div class='del'>-					 "bad transaction max size (%u). "</div><div class='del'>-					 "FSCK?", journal-&gt;j_trans_max);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if (journal-&gt;j_max_batch != (journal-&gt;j_trans_max) *</div><div class='del'>-		        JOURNAL_MAX_BATCH_DEFAULT/JOURNAL_TRANS_MAX_DEFAULT) {</div><div class='del'>-			reiserfs_warning(sb, "sh-463",</div><div class='del'>-					 "bad transaction max batch (%u). "</div><div class='del'>-					 "FSCK?", journal-&gt;j_max_batch);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Default journal params.</div><div class='del'>-		 * The file system was created by old version</div><div class='del'>-		 * of mkreiserfs, so some fields contain zeros,</div><div class='del'>-		 * and we need to advise proper values for them</div><div class='del'>-		 */</div><div class='del'>-		if (sb-&gt;s_blocksize != REISERFS_STANDARD_BLKSIZE) {</div><div class='del'>-			reiserfs_warning(sb, "sh-464", "bad blocksize (%u)",</div><div class='del'>-					 sb-&gt;s_blocksize);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		journal-&gt;j_trans_max = JOURNAL_TRANS_MAX_DEFAULT;</div><div class='del'>-		journal-&gt;j_max_batch = JOURNAL_MAX_BATCH_DEFAULT;</div><div class='del'>-		journal-&gt;j_max_commit_age = JOURNAL_MAX_COMMIT_AGE;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* must be called once on fs mount.  calls journal_read for you */</div><div class='del'>-int journal_init(struct super_block *sb, const char *j_dev_name,</div><div class='del'>-		 int old_format, unsigned int commit_max_age)</div><div class='del'>-{</div><div class='del'>-	int num_cnodes = SB_ONDISK_JOURNAL_SIZE(sb) * 2;</div><div class='del'>-	struct buffer_head *bhjh;</div><div class='del'>-	struct reiserfs_super_block *rs;</div><div class='del'>-	struct reiserfs_journal_header *jh;</div><div class='del'>-	struct reiserfs_journal *journal;</div><div class='del'>-	struct reiserfs_journal_list *jl;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	journal = SB_JOURNAL(sb) = vzalloc(sizeof(struct reiserfs_journal));</div><div class='del'>-	if (!journal) {</div><div class='del'>-		reiserfs_warning(sb, "journal-1256",</div><div class='del'>-				 "unable to get memory for journal structure");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	INIT_LIST_HEAD(&amp;journal-&gt;j_bitmap_nodes);</div><div class='del'>-	INIT_LIST_HEAD(&amp;journal-&gt;j_prealloc_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;journal-&gt;j_working_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;journal-&gt;j_journal_list);</div><div class='del'>-	journal-&gt;j_persistent_trans = 0;</div><div class='del'>-	if (reiserfs_allocate_list_bitmaps(sb, journal-&gt;j_list_bitmap,</div><div class='del'>-					   reiserfs_bmap_count(sb)))</div><div class='del'>-		goto free_and_return;</div><div class='del'>-</div><div class='del'>-	allocate_bitmap_nodes(sb);</div><div class='del'>-</div><div class='del'>-	/* reserved for journal area support */</div><div class='del'>-	SB_JOURNAL_1st_RESERVED_BLOCK(sb) = (old_format ?</div><div class='del'>-						 REISERFS_OLD_DISK_OFFSET_IN_BYTES</div><div class='del'>-						 / sb-&gt;s_blocksize +</div><div class='del'>-						 reiserfs_bmap_count(sb) +</div><div class='del'>-						 1 :</div><div class='del'>-						 REISERFS_DISK_OFFSET_IN_BYTES /</div><div class='del'>-						 sb-&gt;s_blocksize + 2);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sanity check to see is the standard journal fitting</div><div class='del'>-	 * within first bitmap (actual for small blocksizes)</div><div class='del'>-	 */</div><div class='del'>-	if (!SB_ONDISK_JOURNAL_DEVICE(sb) &amp;&amp;</div><div class='del'>-	    (SB_JOURNAL_1st_RESERVED_BLOCK(sb) +</div><div class='del'>-	     SB_ONDISK_JOURNAL_SIZE(sb) &gt; sb-&gt;s_blocksize * 8)) {</div><div class='del'>-		reiserfs_warning(sb, "journal-1393",</div><div class='del'>-				 "journal does not fit for area addressed "</div><div class='del'>-				 "by first of bitmap blocks. It starts at "</div><div class='del'>-				 "%u and its size is %u. Block size %ld",</div><div class='del'>-				 SB_JOURNAL_1st_RESERVED_BLOCK(sb),</div><div class='del'>-				 SB_ONDISK_JOURNAL_SIZE(sb),</div><div class='del'>-				 sb-&gt;s_blocksize);</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sanity check to see if journal first block is correct.</div><div class='del'>-	 * If journal first block is invalid it can cause</div><div class='del'>-	 * zeroing important superblock members.</div><div class='del'>-	 */</div><div class='del'>-	if (!SB_ONDISK_JOURNAL_DEVICE(sb) &amp;&amp;</div><div class='del'>-	    SB_ONDISK_JOURNAL_1st_BLOCK(sb) &lt; SB_JOURNAL_1st_RESERVED_BLOCK(sb)) {</div><div class='del'>-		reiserfs_warning(sb, "journal-1393",</div><div class='del'>-				 "journal 1st super block is invalid: 1st reserved block %d, but actual 1st block is %d",</div><div class='del'>-				 SB_JOURNAL_1st_RESERVED_BLOCK(sb),</div><div class='del'>-				 SB_ONDISK_JOURNAL_1st_BLOCK(sb));</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_init_dev(sb, journal, j_dev_name) != 0) {</div><div class='del'>-		reiserfs_warning(sb, "sh-462",</div><div class='del'>-				 "unable to initialize journal device");</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rs = SB_DISK_SUPER_BLOCK(sb);</div><div class='del'>-</div><div class='del'>-	/* read journal header */</div><div class='del'>-	bhjh = journal_bread(sb,</div><div class='del'>-			     SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-			     SB_ONDISK_JOURNAL_SIZE(sb));</div><div class='del'>-	if (!bhjh) {</div><div class='del'>-		reiserfs_warning(sb, "sh-459",</div><div class='del'>-				 "unable to read journal header");</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-	jh = (struct reiserfs_journal_header *)(bhjh-&gt;b_data);</div><div class='del'>-</div><div class='del'>-	/* make sure that journal matches to the super block */</div><div class='del'>-	if (is_reiserfs_jr(rs)</div><div class='del'>-	    &amp;&amp; (le32_to_cpu(jh-&gt;jh_journal.jp_journal_magic) !=</div><div class='del'>-		sb_jp_journal_magic(rs))) {</div><div class='del'>-		reiserfs_warning(sb, "sh-460",</div><div class='del'>-				 "journal header magic %x (device %pg) does "</div><div class='del'>-				 "not match to magic found in super block %x",</div><div class='del'>-				 jh-&gt;jh_journal.jp_journal_magic,</div><div class='del'>-				 file_bdev(journal-&gt;j_bdev_file),</div><div class='del'>-				 sb_jp_journal_magic(rs));</div><div class='del'>-		brelse(bhjh);</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_trans_max = le32_to_cpu(jh-&gt;jh_journal.jp_journal_trans_max);</div><div class='del'>-	journal-&gt;j_max_batch = le32_to_cpu(jh-&gt;jh_journal.jp_journal_max_batch);</div><div class='del'>-	journal-&gt;j_max_commit_age =</div><div class='del'>-	    le32_to_cpu(jh-&gt;jh_journal.jp_journal_max_commit_age);</div><div class='del'>-	journal-&gt;j_max_trans_age = JOURNAL_MAX_TRANS_AGE;</div><div class='del'>-</div><div class='del'>-	if (check_advise_trans_params(sb, journal) != 0)</div><div class='del'>-	        goto free_and_return;</div><div class='del'>-	journal-&gt;j_default_max_commit_age = journal-&gt;j_max_commit_age;</div><div class='del'>-</div><div class='del'>-	if (commit_max_age != 0) {</div><div class='del'>-		journal-&gt;j_max_commit_age = commit_max_age;</div><div class='del'>-		journal-&gt;j_max_trans_age = commit_max_age;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_info(sb, "journal params: device %pg, size %u, "</div><div class='del'>-		      "journal first block %u, max trans len %u, max batch %u, "</div><div class='del'>-		      "max commit age %u, max trans age %u\n",</div><div class='del'>-		      file_bdev(journal-&gt;j_bdev_file),</div><div class='del'>-		      SB_ONDISK_JOURNAL_SIZE(sb),</div><div class='del'>-		      SB_ONDISK_JOURNAL_1st_BLOCK(sb),</div><div class='del'>-		      journal-&gt;j_trans_max,</div><div class='del'>-		      journal-&gt;j_max_batch,</div><div class='del'>-		      journal-&gt;j_max_commit_age, journal-&gt;j_max_trans_age);</div><div class='del'>-</div><div class='del'>-	brelse(bhjh);</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_list_bitmap_index = 0;</div><div class='del'>-	journal_list_init(sb);</div><div class='del'>-</div><div class='del'>-	memset(journal-&gt;j_list_hash_table, 0,</div><div class='del'>-	       JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *));</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;journal-&gt;j_dirty_buffers);</div><div class='del'>-	spin_lock_init(&amp;journal-&gt;j_dirty_buffers_lock);</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_start = 0;</div><div class='del'>-	journal-&gt;j_len = 0;</div><div class='del'>-	journal-&gt;j_len_alloc = 0;</div><div class='del'>-	atomic_set(&amp;journal-&gt;j_wcount, 0);</div><div class='del'>-	atomic_set(&amp;journal-&gt;j_async_throttle, 0);</div><div class='del'>-	journal-&gt;j_bcount = 0;</div><div class='del'>-	journal-&gt;j_trans_start_time = 0;</div><div class='del'>-	journal-&gt;j_last = NULL;</div><div class='del'>-	journal-&gt;j_first = NULL;</div><div class='del'>-	init_waitqueue_head(&amp;journal-&gt;j_join_wait);</div><div class='del'>-	mutex_init(&amp;journal-&gt;j_mutex);</div><div class='del'>-	mutex_init(&amp;journal-&gt;j_flush_mutex);</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_trans_id = 10;</div><div class='del'>-	journal-&gt;j_mount_id = 10;</div><div class='del'>-	journal-&gt;j_state = 0;</div><div class='del'>-	atomic_set(&amp;journal-&gt;j_jlock, 0);</div><div class='del'>-	journal-&gt;j_cnode_free_list = allocate_cnodes(num_cnodes);</div><div class='del'>-	journal-&gt;j_cnode_free_orig = journal-&gt;j_cnode_free_list;</div><div class='del'>-	journal-&gt;j_cnode_free = journal-&gt;j_cnode_free_list ? num_cnodes : 0;</div><div class='del'>-	journal-&gt;j_cnode_used = 0;</div><div class='del'>-	journal-&gt;j_must_wait = 0;</div><div class='del'>-</div><div class='del'>-	if (journal-&gt;j_cnode_free == 0) {</div><div class='del'>-		reiserfs_warning(sb, "journal-2004", "Journal cnode memory "</div><div class='del'>-		                 "allocation failed (%ld bytes). Journal is "</div><div class='del'>-		                 "too large for available memory. Usually "</div><div class='del'>-		                 "this is due to a journal that is too large.",</div><div class='del'>-		                 sizeof (struct reiserfs_journal_cnode) * num_cnodes);</div><div class='del'>-        	goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_journal_hash(sb);</div><div class='del'>-	jl = journal-&gt;j_current_jl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * get_list_bitmap() may call flush_commit_list() which</div><div class='del'>-	 * requires the lock. Calling flush_commit_list() shouldn't happen</div><div class='del'>-	 * this early but I like to be paranoid.</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-	jl-&gt;j_list_bitmap = get_list_bitmap(sb, jl);</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-	if (!jl-&gt;j_list_bitmap) {</div><div class='del'>-		reiserfs_warning(sb, "journal-2005",</div><div class='del'>-				 "get_list_bitmap failed for journal list 0");</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = journal_read(sb);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		reiserfs_warning(sb, "reiserfs-2006",</div><div class='del'>-				 "Replay Failure, unable to mount");</div><div class='del'>-		goto free_and_return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_DELAYED_WORK(&amp;journal-&gt;j_work, flush_async_commits);</div><div class='del'>-	journal-&gt;j_work_sb = sb;</div><div class='del'>-	return 0;</div><div class='del'>-free_and_return:</div><div class='del'>-	free_journal_ram(sb);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * test for a polite end of the current transaction.  Used by file_write,</div><div class='del'>- * and should be used by delete to make sure they don't write more than</div><div class='del'>- * can fit inside a single transaction</div><div class='del'>- */</div><div class='del'>-int journal_transaction_should_end(struct reiserfs_transaction_handle *th,</div><div class='del'>-				   int new_alloc)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(th-&gt;t_super);</div><div class='del'>-	time64_t now = ktime_get_seconds();</div><div class='del'>-	/* cannot restart while nested */</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	if (th-&gt;t_refcount &gt; 1)</div><div class='del'>-		return 0;</div><div class='del'>-	if (journal-&gt;j_must_wait &gt; 0 ||</div><div class='del'>-	    (journal-&gt;j_len_alloc + new_alloc) &gt;= journal-&gt;j_max_batch ||</div><div class='del'>-	    atomic_read(&amp;journal-&gt;j_jlock) ||</div><div class='del'>-	    (now - journal-&gt;j_trans_start_time) &gt; journal-&gt;j_max_trans_age ||</div><div class='del'>-	    journal-&gt;j_cnode_free &lt; (journal-&gt;j_trans_max * 3)) {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_len_alloc += new_alloc;</div><div class='del'>-	th-&gt;t_blocks_allocated += new_alloc ;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this must be called inside a transaction */</div><div class='del'>-void reiserfs_block_writes(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(th-&gt;t_super);</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	journal-&gt;j_must_wait = 1;</div><div class='del'>-	set_bit(J_WRITERS_BLOCKED, &amp;journal-&gt;j_state);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this must be called without a transaction started */</div><div class='del'>-void reiserfs_allow_writes(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	clear_bit(J_WRITERS_BLOCKED, &amp;journal-&gt;j_state);</div><div class='del'>-	wake_up(&amp;journal-&gt;j_join_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this must be called without a transaction started */</div><div class='del'>-void reiserfs_wait_on_write_block(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	wait_event(journal-&gt;j_join_wait,</div><div class='del'>-		   !test_bit(J_WRITERS_BLOCKED, &amp;journal-&gt;j_state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void queue_log_writer(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	wait_queue_entry_t wait;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	set_bit(J_WRITERS_QUEUED, &amp;journal-&gt;j_state);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we don't want to use wait_event here because</div><div class='del'>-	 * we only want to wait once.</div><div class='del'>-	 */</div><div class='del'>-	init_waitqueue_entry(&amp;wait, current);</div><div class='del'>-	add_wait_queue(&amp;journal-&gt;j_join_wait, &amp;wait);</div><div class='del'>-	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-	if (test_bit(J_WRITERS_QUEUED, &amp;journal-&gt;j_state)) {</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		schedule();</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-	__set_current_state(TASK_RUNNING);</div><div class='del'>-	remove_wait_queue(&amp;journal-&gt;j_join_wait, &amp;wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wake_queued_writers(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	if (test_and_clear_bit(J_WRITERS_QUEUED, &amp;journal-&gt;j_state))</div><div class='del'>-		wake_up(&amp;journal-&gt;j_join_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void let_transaction_grow(struct super_block *sb, unsigned int trans_id)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	unsigned long bcount = journal-&gt;j_bcount;</div><div class='del'>-	while (1) {</div><div class='del'>-		int depth;</div><div class='del'>-</div><div class='del'>-		depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='del'>-		reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-</div><div class='del'>-		journal-&gt;j_current_jl-&gt;j_state |= LIST_COMMIT_PENDING;</div><div class='del'>-		while ((atomic_read(&amp;journal-&gt;j_wcount) &gt; 0 ||</div><div class='del'>-			atomic_read(&amp;journal-&gt;j_jlock)) &amp;&amp;</div><div class='del'>-		       journal-&gt;j_trans_id == trans_id) {</div><div class='del'>-			queue_log_writer(sb);</div><div class='del'>-		}</div><div class='del'>-		if (journal-&gt;j_trans_id != trans_id)</div><div class='del'>-			break;</div><div class='del'>-		if (bcount == journal-&gt;j_bcount)</div><div class='del'>-			break;</div><div class='del'>-		bcount = journal-&gt;j_bcount;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * join == true if you must join an existing transaction.</div><div class='del'>- * join == false if you can deal with waiting for others to finish</div><div class='del'>- *</div><div class='del'>- * this will block until the transaction is joinable.  send the number of</div><div class='del'>- * blocks you expect to use in nblocks.</div><div class='del'>-*/</div><div class='del'>-static int do_journal_begin_r(struct reiserfs_transaction_handle *th,</div><div class='del'>-			      struct super_block *sb, unsigned long nblocks,</div><div class='del'>-			      int join)</div><div class='del'>-{</div><div class='del'>-	time64_t now = ktime_get_seconds();</div><div class='del'>-	unsigned int old_trans_id;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_transaction_handle myth;</div><div class='del'>-	int retval;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	reiserfs_check_lock_depth(sb, "journal_begin");</div><div class='del'>-	BUG_ON(nblocks &gt; journal-&gt;j_trans_max);</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(sb, journal.journal_being);</div><div class='del'>-	/* set here for journal_join */</div><div class='del'>-	th-&gt;t_refcount = 1;</div><div class='del'>-	th-&gt;t_super = sb;</div><div class='del'>-</div><div class='del'>-relock:</div><div class='del'>-	lock_journal(sb);</div><div class='del'>-	if (join != JBEGIN_ABORT &amp;&amp; reiserfs_is_journal_aborted(journal)) {</div><div class='del'>-		unlock_journal(sb);</div><div class='del'>-		retval = journal-&gt;j_errno;</div><div class='del'>-		goto out_fail;</div><div class='del'>-	}</div><div class='del'>-	journal-&gt;j_bcount++;</div><div class='del'>-</div><div class='del'>-	if (test_bit(J_WRITERS_BLOCKED, &amp;journal-&gt;j_state)) {</div><div class='del'>-		unlock_journal(sb);</div><div class='del'>-		depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-		reiserfs_wait_on_write_block(sb);</div><div class='del'>-		reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-		PROC_INFO_INC(sb, journal.journal_relock_writers);</div><div class='del'>-		goto relock;</div><div class='del'>-	}</div><div class='del'>-	now = ktime_get_seconds();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if there is no room in the journal OR</div><div class='del'>-	 * if this transaction is too old, and we weren't called joinable,</div><div class='del'>-	 * wait for it to finish before beginning we don't sleep if there</div><div class='del'>-	 * aren't other writers</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if ((!join &amp;&amp; journal-&gt;j_must_wait &gt; 0) ||</div><div class='del'>-	    (!join</div><div class='del'>-	     &amp;&amp; (journal-&gt;j_len_alloc + nblocks + 2) &gt;= journal-&gt;j_max_batch)</div><div class='del'>-	    || (!join &amp;&amp; atomic_read(&amp;journal-&gt;j_wcount) &gt; 0</div><div class='del'>-		&amp;&amp; journal-&gt;j_trans_start_time &gt; 0</div><div class='del'>-		&amp;&amp; (now - journal-&gt;j_trans_start_time) &gt;</div><div class='del'>-		journal-&gt;j_max_trans_age) || (!join</div><div class='del'>-					      &amp;&amp; atomic_read(&amp;journal-&gt;j_jlock))</div><div class='del'>-	    || (!join &amp;&amp; journal-&gt;j_cnode_free &lt; (journal-&gt;j_trans_max * 3))) {</div><div class='del'>-</div><div class='del'>-		old_trans_id = journal-&gt;j_trans_id;</div><div class='del'>-		/* allow others to finish this transaction */</div><div class='del'>-		unlock_journal(sb);</div><div class='del'>-</div><div class='del'>-		if (!join &amp;&amp; (journal-&gt;j_len_alloc + nblocks + 2) &gt;=</div><div class='del'>-		    journal-&gt;j_max_batch &amp;&amp;</div><div class='del'>-		    ((journal-&gt;j_len + nblocks + 2) * 100) &lt;</div><div class='del'>-		    (journal-&gt;j_len_alloc * 75)) {</div><div class='del'>-			if (atomic_read(&amp;journal-&gt;j_wcount) &gt; 10) {</div><div class='del'>-				queue_log_writer(sb);</div><div class='del'>-				goto relock;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * don't mess with joining the transaction if all we</div><div class='del'>-		 * have to do is wait for someone else to do a commit</div><div class='del'>-		 */</div><div class='del'>-		if (atomic_read(&amp;journal-&gt;j_jlock)) {</div><div class='del'>-			while (journal-&gt;j_trans_id == old_trans_id &amp;&amp;</div><div class='del'>-			       atomic_read(&amp;journal-&gt;j_jlock)) {</div><div class='del'>-				queue_log_writer(sb);</div><div class='del'>-			}</div><div class='del'>-			goto relock;</div><div class='del'>-		}</div><div class='del'>-		retval = journal_join(&amp;myth, sb);</div><div class='del'>-		if (retval)</div><div class='del'>-			goto out_fail;</div><div class='del'>-</div><div class='del'>-		/* someone might have ended the transaction while we joined */</div><div class='del'>-		if (old_trans_id != journal-&gt;j_trans_id) {</div><div class='del'>-			retval = do_journal_end(&amp;myth, 0);</div><div class='del'>-		} else {</div><div class='del'>-			retval = do_journal_end(&amp;myth, COMMIT_NOW);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (retval)</div><div class='del'>-			goto out_fail;</div><div class='del'>-</div><div class='del'>-		PROC_INFO_INC(sb, journal.journal_relock_wcount);</div><div class='del'>-		goto relock;</div><div class='del'>-	}</div><div class='del'>-	/* we are the first writer, set trans_id */</div><div class='del'>-	if (journal-&gt;j_trans_start_time == 0) {</div><div class='del'>-		journal-&gt;j_trans_start_time = ktime_get_seconds();</div><div class='del'>-	}</div><div class='del'>-	atomic_inc(&amp;journal-&gt;j_wcount);</div><div class='del'>-	journal-&gt;j_len_alloc += nblocks;</div><div class='del'>-	th-&gt;t_blocks_logged = 0;</div><div class='del'>-	th-&gt;t_blocks_allocated = nblocks;</div><div class='del'>-	th-&gt;t_trans_id = journal-&gt;j_trans_id;</div><div class='del'>-	unlock_journal(sb);</div><div class='del'>-	INIT_LIST_HEAD(&amp;th-&gt;t_list);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_fail:</div><div class='del'>-	memset(th, 0, sizeof(*th));</div><div class='del'>-	/*</div><div class='del'>-	 * Re-set th-&gt;t_super, so we can properly keep track of how many</div><div class='del'>-	 * persistent transactions there are. We need to do this so if this</div><div class='del'>-	 * call is part of a failed restart_transaction, we can free it later</div><div class='del'>-	 */</div><div class='del'>-	th-&gt;t_super = sb;</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct reiserfs_transaction_handle *reiserfs_persistent_transaction(struct</div><div class='del'>-								    super_block</div><div class='del'>-								    *s,</div><div class='del'>-								    int nblocks)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct reiserfs_transaction_handle *th;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if we're nesting into an existing transaction.  It will be</div><div class='del'>-	 * persistent on its own</div><div class='del'>-	 */</div><div class='del'>-	if (reiserfs_transaction_running(s)) {</div><div class='del'>-		th = current-&gt;journal_info;</div><div class='del'>-		th-&gt;t_refcount++;</div><div class='del'>-		BUG_ON(th-&gt;t_refcount &lt; 2);</div><div class='del'>-</div><div class='del'>-		return th;</div><div class='del'>-	}</div><div class='del'>-	th = kmalloc(sizeof(struct reiserfs_transaction_handle), GFP_NOFS);</div><div class='del'>-	if (!th)</div><div class='del'>-		return NULL;</div><div class='del'>-	ret = journal_begin(th, s, nblocks);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(th);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SB_JOURNAL(s)-&gt;j_persistent_trans++;</div><div class='del'>-	return th;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_end_persistent_transaction(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	if (th-&gt;t_trans_id)</div><div class='del'>-		ret = journal_end(th);</div><div class='del'>-	else</div><div class='del'>-		ret = -EIO;</div><div class='del'>-	if (th-&gt;t_refcount == 0) {</div><div class='del'>-		SB_JOURNAL(s)-&gt;j_persistent_trans--;</div><div class='del'>-		kfree(th);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int journal_join(struct reiserfs_transaction_handle *th,</div><div class='del'>-			struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle *cur_th = current-&gt;journal_info;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this keeps do_journal_end from NULLing out the</div><div class='del'>-	 * current-&gt;journal_info pointer</div><div class='del'>-	 */</div><div class='del'>-	th-&gt;t_handle_save = cur_th;</div><div class='del'>-	BUG_ON(cur_th &amp;&amp; cur_th-&gt;t_refcount &gt; 1);</div><div class='del'>-	return do_journal_begin_r(th, sb, 1, JBEGIN_JOIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int journal_join_abort(struct reiserfs_transaction_handle *th,</div><div class='del'>-		       struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle *cur_th = current-&gt;journal_info;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this keeps do_journal_end from NULLing out the</div><div class='del'>-	 * current-&gt;journal_info pointer</div><div class='del'>-	 */</div><div class='del'>-	th-&gt;t_handle_save = cur_th;</div><div class='del'>-	BUG_ON(cur_th &amp;&amp; cur_th-&gt;t_refcount &gt; 1);</div><div class='del'>-	return do_journal_begin_r(th, sb, 1, JBEGIN_ABORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int journal_begin(struct reiserfs_transaction_handle *th,</div><div class='del'>-		  struct super_block *sb, unsigned long nblocks)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle *cur_th = current-&gt;journal_info;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	th-&gt;t_handle_save = NULL;</div><div class='del'>-	if (cur_th) {</div><div class='del'>-		/* we are nesting into the current transaction */</div><div class='del'>-		if (cur_th-&gt;t_super == sb) {</div><div class='del'>-			BUG_ON(!cur_th-&gt;t_refcount);</div><div class='del'>-			cur_th-&gt;t_refcount++;</div><div class='del'>-			memcpy(th, cur_th, sizeof(*th));</div><div class='del'>-			if (th-&gt;t_refcount &lt;= 1)</div><div class='del'>-				reiserfs_warning(sb, "reiserfs-2005",</div><div class='del'>-						 "BAD: refcount &lt;= 1, but "</div><div class='del'>-						 "journal_info != 0");</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * we've ended up with a handle from a different</div><div class='del'>-			 * filesystem.  save it and restore on journal_end.</div><div class='del'>-			 * This should never really happen...</div><div class='del'>-			 */</div><div class='del'>-			reiserfs_warning(sb, "clm-2100",</div><div class='del'>-					 "nesting info a different FS");</div><div class='del'>-			th-&gt;t_handle_save = current-&gt;journal_info;</div><div class='del'>-			current-&gt;journal_info = th;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		current-&gt;journal_info = th;</div><div class='del'>-	}</div><div class='del'>-	ret = do_journal_begin_r(th, sb, nblocks, JBEGIN_REG);</div><div class='del'>-	BUG_ON(current-&gt;journal_info != th);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I guess this boils down to being the reciprocal of clm-2100 above.</div><div class='del'>-	 * If do_journal_begin_r fails, we need to put it back, since</div><div class='del'>-	 * journal_end won't be called to do it. */</div><div class='del'>-	if (ret)</div><div class='del'>-		current-&gt;journal_info = th-&gt;t_handle_save;</div><div class='del'>-	else</div><div class='del'>-		BUG_ON(!th-&gt;t_refcount);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * puts bh into the current transaction.  If it was already there, reorders</div><div class='del'>- * removes the old pointers from the hash, and puts new ones in (to make</div><div class='del'>- * sure replay happen in the right order).</div><div class='del'>- *</div><div class='del'>- * if it was dirty, cleans and files onto the clean list.  I can't let it</div><div class='del'>- * be dirty again until the transaction is committed.</div><div class='del'>- *</div><div class='del'>- * if j_len, is bigger than j_len_alloc, it pushes j_len_alloc to 10 + j_len.</div><div class='del'>- */</div><div class='del'>-int journal_mark_dirty(struct reiserfs_transaction_handle *th,</div><div class='del'>-		       struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_journal_cnode *cn = NULL;</div><div class='del'>-	int count_already_incd = 0;</div><div class='del'>-	int prepared = 0;</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(sb, journal.mark_dirty);</div><div class='del'>-	if (th-&gt;t_trans_id != journal-&gt;j_trans_id) {</div><div class='del'>-		reiserfs_panic(th-&gt;t_super, "journal-1577",</div><div class='del'>-			       "handle trans id %ld != current trans id %ld",</div><div class='del'>-			       th-&gt;t_trans_id, journal-&gt;j_trans_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prepared = test_clear_buffer_journal_prepared(bh);</div><div class='del'>-	clear_buffer_journal_restore_dirty(bh);</div><div class='del'>-	/* already in this transaction, we are done */</div><div class='del'>-	if (buffer_journaled(bh)) {</div><div class='del'>-		PROC_INFO_INC(sb, journal.mark_dirty_already);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this must be turned into a panic instead of a warning.  We can't</div><div class='del'>-	 * allow a dirty or journal_dirty or locked buffer to be logged, as</div><div class='del'>-	 * some changes could get to disk too early.  NOT GOOD.</div><div class='del'>-	 */</div><div class='del'>-	if (!prepared || buffer_dirty(bh)) {</div><div class='del'>-		reiserfs_warning(sb, "journal-1777",</div><div class='del'>-				 "buffer %llu bad state "</div><div class='del'>-				 "%cPREPARED %cLOCKED %cDIRTY %cJDIRTY_WAIT",</div><div class='del'>-				 (unsigned long long)bh-&gt;b_blocknr,</div><div class='del'>-				 prepared ? ' ' : '!',</div><div class='del'>-				 buffer_locked(bh) ? ' ' : '!',</div><div class='del'>-				 buffer_dirty(bh) ? ' ' : '!',</div><div class='del'>-				 buffer_journal_dirty(bh) ? ' ' : '!');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;journal-&gt;j_wcount) &lt;= 0) {</div><div class='del'>-		reiserfs_warning(sb, "journal-1409",</div><div class='del'>-				 "returning because j_wcount was %d",</div><div class='del'>-				 atomic_read(&amp;journal-&gt;j_wcount));</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * this error means I've screwed up, and we've overflowed</div><div class='del'>-	 * the transaction.  Nothing can be done here, except make the</div><div class='del'>-	 * FS readonly or panic.</div><div class='del'>-	 */</div><div class='del'>-	if (journal-&gt;j_len &gt;= journal-&gt;j_trans_max) {</div><div class='del'>-		reiserfs_panic(th-&gt;t_super, "journal-1413",</div><div class='del'>-			       "j_len (%lu) is too big",</div><div class='del'>-			       journal-&gt;j_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (buffer_journal_dirty(bh)) {</div><div class='del'>-		count_already_incd = 1;</div><div class='del'>-		PROC_INFO_INC(sb, journal.mark_dirty_notjournal);</div><div class='del'>-		clear_buffer_journal_dirty(bh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal-&gt;j_len &gt; journal-&gt;j_len_alloc) {</div><div class='del'>-		journal-&gt;j_len_alloc = journal-&gt;j_len + JOURNAL_PER_BALANCE_CNT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_buffer_journaled(bh);</div><div class='del'>-</div><div class='del'>-	/* now put this guy on the end */</div><div class='del'>-	if (!cn) {</div><div class='del'>-		cn = get_cnode(sb);</div><div class='del'>-		if (!cn) {</div><div class='del'>-			reiserfs_panic(sb, "journal-4", "get_cnode failed!");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (th-&gt;t_blocks_logged == th-&gt;t_blocks_allocated) {</div><div class='del'>-			th-&gt;t_blocks_allocated += JOURNAL_PER_BALANCE_CNT;</div><div class='del'>-			journal-&gt;j_len_alloc += JOURNAL_PER_BALANCE_CNT;</div><div class='del'>-		}</div><div class='del'>-		th-&gt;t_blocks_logged++;</div><div class='del'>-		journal-&gt;j_len++;</div><div class='del'>-</div><div class='del'>-		cn-&gt;bh = bh;</div><div class='del'>-		cn-&gt;blocknr = bh-&gt;b_blocknr;</div><div class='del'>-		cn-&gt;sb = sb;</div><div class='del'>-		cn-&gt;jlist = NULL;</div><div class='del'>-		insert_journal_hash(journal-&gt;j_hash_table, cn);</div><div class='del'>-		if (!count_already_incd) {</div><div class='del'>-			get_bh(bh);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	cn-&gt;next = NULL;</div><div class='del'>-	cn-&gt;prev = journal-&gt;j_last;</div><div class='del'>-	cn-&gt;bh = bh;</div><div class='del'>-	if (journal-&gt;j_last) {</div><div class='del'>-		journal-&gt;j_last-&gt;next = cn;</div><div class='del'>-		journal-&gt;j_last = cn;</div><div class='del'>-	} else {</div><div class='del'>-		journal-&gt;j_first = cn;</div><div class='del'>-		journal-&gt;j_last = cn;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_schedule_old_flush(sb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int journal_end(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	if (!current-&gt;journal_info &amp;&amp; th-&gt;t_refcount &gt; 1)</div><div class='del'>-		reiserfs_warning(sb, "REISER-NESTING",</div><div class='del'>-				 "th NULL, refcount %d", th-&gt;t_refcount);</div><div class='del'>-</div><div class='del'>-	if (!th-&gt;t_trans_id) {</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	th-&gt;t_refcount--;</div><div class='del'>-	if (th-&gt;t_refcount &gt; 0) {</div><div class='del'>-		struct reiserfs_transaction_handle *cur_th =</div><div class='del'>-		    current-&gt;journal_info;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * we aren't allowed to close a nested transaction on a</div><div class='del'>-		 * different filesystem from the one in the task struct</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(cur_th-&gt;t_super != th-&gt;t_super);</div><div class='del'>-</div><div class='del'>-		if (th != cur_th) {</div><div class='del'>-			memcpy(current-&gt;journal_info, th, sizeof(*th));</div><div class='del'>-			th-&gt;t_trans_id = 0;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		return do_journal_end(th, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * removes from the current transaction, relsing and descrementing any counters.</div><div class='del'>- * also files the removed buffer directly onto the clean list</div><div class='del'>- *</div><div class='del'>- * called by journal_mark_freed when a block has been deleted</div><div class='del'>- *</div><div class='del'>- * returns 1 if it cleaned and relsed the buffer. 0 otherwise</div><div class='del'>- */</div><div class='del'>-static int remove_from_transaction(struct super_block *sb,</div><div class='del'>-				   b_blocknr_t blocknr, int already_cleaned)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct reiserfs_journal_cnode *cn;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	cn = get_journal_hash_dev(sb, journal-&gt;j_hash_table, blocknr);</div><div class='del'>-	if (!cn || !cn-&gt;bh) {</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	bh = cn-&gt;bh;</div><div class='del'>-	if (cn-&gt;prev) {</div><div class='del'>-		cn-&gt;prev-&gt;next = cn-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	if (cn-&gt;next) {</div><div class='del'>-		cn-&gt;next-&gt;prev = cn-&gt;prev;</div><div class='del'>-	}</div><div class='del'>-	if (cn == journal-&gt;j_first) {</div><div class='del'>-		journal-&gt;j_first = cn-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	if (cn == journal-&gt;j_last) {</div><div class='del'>-		journal-&gt;j_last = cn-&gt;prev;</div><div class='del'>-	}</div><div class='del'>-	remove_journal_hash(sb, journal-&gt;j_hash_table, NULL,</div><div class='del'>-			    bh-&gt;b_blocknr, 0);</div><div class='del'>-	clear_buffer_journaled(bh);	/* don't log this one */</div><div class='del'>-</div><div class='del'>-	if (!already_cleaned) {</div><div class='del'>-		clear_buffer_journal_dirty(bh);</div><div class='del'>-		clear_buffer_dirty(bh);</div><div class='del'>-		clear_buffer_journal_test(bh);</div><div class='del'>-		put_bh(bh);</div><div class='del'>-		if (atomic_read(&amp;bh-&gt;b_count) &lt; 0) {</div><div class='del'>-			reiserfs_warning(sb, "journal-1752",</div><div class='del'>-					 "b_count &lt; 0");</div><div class='del'>-		}</div><div class='del'>-		ret = 1;</div><div class='del'>-	}</div><div class='del'>-	journal-&gt;j_len--;</div><div class='del'>-	journal-&gt;j_len_alloc--;</div><div class='del'>-	free_cnode(sb, cn);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * for any cnode in a journal list, it can only be dirtied of all the</div><div class='del'>- * transactions that include it are committed to disk.</div><div class='del'>- * this checks through each transaction, and returns 1 if you are allowed</div><div class='del'>- * to dirty, and 0 if you aren't</div><div class='del'>- *</div><div class='del'>- * it is called by dirty_journal_list, which is called after</div><div class='del'>- * flush_commit_list has gotten all the log blocks for a given</div><div class='del'>- * transaction on disk</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int can_dirty(struct reiserfs_journal_cnode *cn)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = cn-&gt;sb;</div><div class='del'>-	b_blocknr_t blocknr = cn-&gt;blocknr;</div><div class='del'>-	struct reiserfs_journal_cnode *cur = cn-&gt;hprev;</div><div class='del'>-	int can_dirty = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * first test hprev.  These are all newer than cn, so any node here</div><div class='del'>-	 * with the same block number and dev means this node can't be sent</div><div class='del'>-	 * to disk right now.</div><div class='del'>-	 */</div><div class='del'>-	while (cur &amp;&amp; can_dirty) {</div><div class='del'>-		if (cur-&gt;jlist &amp;&amp; cur-&gt;bh &amp;&amp; cur-&gt;blocknr &amp;&amp; cur-&gt;sb == sb &amp;&amp;</div><div class='del'>-		    cur-&gt;blocknr == blocknr) {</div><div class='del'>-			can_dirty = 0;</div><div class='del'>-		}</div><div class='del'>-		cur = cur-&gt;hprev;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * then test hnext.  These are all older than cn.  As long as they</div><div class='del'>-	 * are committed to the log, it is safe to write cn to disk</div><div class='del'>-	 */</div><div class='del'>-	cur = cn-&gt;hnext;</div><div class='del'>-	while (cur &amp;&amp; can_dirty) {</div><div class='del'>-		if (cur-&gt;jlist &amp;&amp; cur-&gt;jlist-&gt;j_len &gt; 0 &amp;&amp;</div><div class='del'>-		    atomic_read(&amp;cur-&gt;jlist-&gt;j_commit_left) &gt; 0 &amp;&amp; cur-&gt;bh &amp;&amp;</div><div class='del'>-		    cur-&gt;blocknr &amp;&amp; cur-&gt;sb == sb &amp;&amp; cur-&gt;blocknr == blocknr) {</div><div class='del'>-			can_dirty = 0;</div><div class='del'>-		}</div><div class='del'>-		cur = cur-&gt;hnext;</div><div class='del'>-	}</div><div class='del'>-	return can_dirty;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * syncs the commit blocks, but does not force the real buffers to disk</div><div class='del'>- * will wait until the current transaction is done/committed before returning</div><div class='del'>- */</div><div class='del'>-int journal_end_sync(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	/* you can sync while nested, very, very bad */</div><div class='del'>-	BUG_ON(th-&gt;t_refcount &gt; 1);</div><div class='del'>-	if (journal-&gt;j_len == 0) {</div><div class='del'>-		reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb),</div><div class='del'>-					     1);</div><div class='del'>-		journal_mark_dirty(th, SB_BUFFER_WITH_SB(sb));</div><div class='del'>-	}</div><div class='del'>-	return do_journal_end(th, COMMIT_NOW | WAIT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* writeback the pending async commits to disk */</div><div class='del'>-static void flush_async_commits(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal =</div><div class='del'>-		container_of(work, struct reiserfs_journal, j_work.work);</div><div class='del'>-	struct super_block *sb = journal-&gt;j_work_sb;</div><div class='del'>-	struct reiserfs_journal_list *jl;</div><div class='del'>-	struct list_head *entry;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-	if (!list_empty(&amp;journal-&gt;j_journal_list)) {</div><div class='del'>-		/* last entry is the youngest, commit it and you get everything */</div><div class='del'>-		entry = journal-&gt;j_journal_list.prev;</div><div class='del'>-		jl = JOURNAL_LIST_ENTRY(entry);</div><div class='del'>-		flush_commit_list(sb, jl, 1);</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * flushes any old transactions to disk</div><div class='del'>- * ends the current transaction if it is too old</div><div class='del'>- */</div><div class='del'>-void reiserfs_flush_old_commits(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	time64_t now;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-</div><div class='del'>-	now = ktime_get_seconds();</div><div class='del'>-	/*</div><div class='del'>-	 * safety check so we don't flush while we are replaying the log during</div><div class='del'>-	 * mount</div><div class='del'>-	 */</div><div class='del'>-	if (list_empty(&amp;journal-&gt;j_journal_list))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * check the current transaction.  If there are no writers, and it is</div><div class='del'>-	 * too old, finish it, and force the commit blocks to disk</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;journal-&gt;j_wcount) &lt;= 0 &amp;&amp;</div><div class='del'>-	    journal-&gt;j_trans_start_time &gt; 0 &amp;&amp;</div><div class='del'>-	    journal-&gt;j_len &gt; 0 &amp;&amp;</div><div class='del'>-	    (now - journal-&gt;j_trans_start_time) &gt; journal-&gt;j_max_trans_age) {</div><div class='del'>-		if (!journal_join(&amp;th, sb)) {</div><div class='del'>-			reiserfs_prepare_for_journal(sb,</div><div class='del'>-						     SB_BUFFER_WITH_SB(sb),</div><div class='del'>-						     1);</div><div class='del'>-			journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(sb));</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * we're only being called from kreiserfsd, it makes</div><div class='del'>-			 * no sense to do an async commit so that kreiserfsd</div><div class='del'>-			 * can do it later</div><div class='del'>-			 */</div><div class='del'>-			do_journal_end(&amp;th, COMMIT_NOW | WAIT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns 0 if do_journal_end should return right away, returns 1 if</div><div class='del'>- * do_journal_end should finish the commit</div><div class='del'>- *</div><div class='del'>- * if the current transaction is too old, but still has writers, this will</div><div class='del'>- * wait on j_join_wait until all the writers are done.  By the time it</div><div class='del'>- * wakes up, the transaction it was called has already ended, so it just</div><div class='del'>- * flushes the commit list and returns 0.</div><div class='del'>- *</div><div class='del'>- * Won't batch when flush or commit_now is set.  Also won't batch when</div><div class='del'>- * others are waiting on j_join_wait.</div><div class='del'>- *</div><div class='del'>- * Note, we can't allow the journal_end to proceed while there are still</div><div class='del'>- * writers in the log.</div><div class='del'>- */</div><div class='del'>-static int check_journal_end(struct reiserfs_transaction_handle *th, int flags)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	time64_t now;</div><div class='del'>-	int flush = flags &amp; FLUSH_ALL;</div><div class='del'>-	int commit_now = flags &amp; COMMIT_NOW;</div><div class='del'>-	int wait_on_commit = flags &amp; WAIT;</div><div class='del'>-	struct reiserfs_journal_list *jl;</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	if (th-&gt;t_trans_id != journal-&gt;j_trans_id) {</div><div class='del'>-		reiserfs_panic(th-&gt;t_super, "journal-1577",</div><div class='del'>-			       "handle trans id %ld != current trans id %ld",</div><div class='del'>-			       th-&gt;t_trans_id, journal-&gt;j_trans_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_len_alloc -= (th-&gt;t_blocks_allocated - th-&gt;t_blocks_logged);</div><div class='del'>-	/* &lt;= 0 is allowed.  unmounting might not call begin */</div><div class='del'>-	if (atomic_read(&amp;journal-&gt;j_wcount) &gt; 0)</div><div class='del'>-		atomic_dec(&amp;journal-&gt;j_wcount);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * BUG, deal with case where j_len is 0, but people previously</div><div class='del'>-	 * freed blocks need to be released will be dealt with by next</div><div class='del'>-	 * transaction that actually writes something, but should be taken</div><div class='del'>-	 * care of in this trans</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(journal-&gt;j_len == 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if wcount &gt; 0, and we are called to with flush or commit_now,</div><div class='del'>-	 * we wait on j_join_wait.  We will wake up when the last writer has</div><div class='del'>-	 * finished the transaction, and started it on its way to the disk.</div><div class='del'>-	 * Then, we flush the commit or journal list, and just return 0</div><div class='del'>-	 * because the rest of journal end was already done for this</div><div class='del'>-	 * transaction.</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;journal-&gt;j_wcount) &gt; 0) {</div><div class='del'>-		if (flush || commit_now) {</div><div class='del'>-			unsigned trans_id;</div><div class='del'>-</div><div class='del'>-			jl = journal-&gt;j_current_jl;</div><div class='del'>-			trans_id = jl-&gt;j_trans_id;</div><div class='del'>-			if (wait_on_commit)</div><div class='del'>-				jl-&gt;j_state |= LIST_COMMIT_PENDING;</div><div class='del'>-			atomic_set(&amp;journal-&gt;j_jlock, 1);</div><div class='del'>-			if (flush) {</div><div class='del'>-				journal-&gt;j_next_full_flush = 1;</div><div class='del'>-			}</div><div class='del'>-			unlock_journal(sb);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * sleep while the current transaction is</div><div class='del'>-			 * still j_jlocked</div><div class='del'>-			 */</div><div class='del'>-			while (journal-&gt;j_trans_id == trans_id) {</div><div class='del'>-				if (atomic_read(&amp;journal-&gt;j_jlock)) {</div><div class='del'>-					queue_log_writer(sb);</div><div class='del'>-				} else {</div><div class='del'>-					lock_journal(sb);</div><div class='del'>-					if (journal-&gt;j_trans_id == trans_id) {</div><div class='del'>-						atomic_set(&amp;journal-&gt;j_jlock,</div><div class='del'>-							   1);</div><div class='del'>-					}</div><div class='del'>-					unlock_journal(sb);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			BUG_ON(journal-&gt;j_trans_id == trans_id);</div><div class='del'>-</div><div class='del'>-			if (commit_now</div><div class='del'>-			    &amp;&amp; journal_list_still_alive(sb, trans_id)</div><div class='del'>-			    &amp;&amp; wait_on_commit) {</div><div class='del'>-				flush_commit_list(sb, jl, 1);</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		unlock_journal(sb);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* deal with old transactions where we are the last writers */</div><div class='del'>-	now = ktime_get_seconds();</div><div class='del'>-	if ((now - journal-&gt;j_trans_start_time) &gt; journal-&gt;j_max_trans_age) {</div><div class='del'>-		commit_now = 1;</div><div class='del'>-		journal-&gt;j_next_async_flush = 1;</div><div class='del'>-	}</div><div class='del'>-	/* don't batch when someone is waiting on j_join_wait */</div><div class='del'>-	/* don't batch when syncing the commit or flushing the whole trans */</div><div class='del'>-	if (!(journal-&gt;j_must_wait &gt; 0) &amp;&amp; !(atomic_read(&amp;journal-&gt;j_jlock))</div><div class='del'>-	    &amp;&amp; !flush &amp;&amp; !commit_now &amp;&amp; (journal-&gt;j_len &lt; journal-&gt;j_max_batch)</div><div class='del'>-	    &amp;&amp; journal-&gt;j_len_alloc &lt; journal-&gt;j_max_batch</div><div class='del'>-	    &amp;&amp; journal-&gt;j_cnode_free &gt; (journal-&gt;j_trans_max * 3)) {</div><div class='del'>-		journal-&gt;j_bcount++;</div><div class='del'>-		unlock_journal(sb);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal-&gt;j_start &gt; SB_ONDISK_JOURNAL_SIZE(sb)) {</div><div class='del'>-		reiserfs_panic(sb, "journal-003",</div><div class='del'>-			       "j_start (%ld) is too high",</div><div class='del'>-			       journal-&gt;j_start);</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Does all the work that makes deleting blocks safe.</div><div class='del'>- * when deleting a block mark BH_JNew, just remove it from the current</div><div class='del'>- * transaction, clean it's buffer_head and move on.</div><div class='del'>- *</div><div class='del'>- * otherwise:</div><div class='del'>- * set a bit for the block in the journal bitmap.  That will prevent it from</div><div class='del'>- * being allocated for unformatted nodes before this transaction has finished.</div><div class='del'>- *</div><div class='del'>- * mark any cnodes for this block as BLOCK_FREED, and clear their bh pointers.</div><div class='del'>- * That will prevent any old transactions with this block from trying to flush</div><div class='del'>- * to the real location.  Since we aren't removing the cnode from the</div><div class='del'>- * journal_list_hash, *the block can't be reallocated yet.</div><div class='del'>- *</div><div class='del'>- * Then remove it from the current transaction, decrementing any counters and</div><div class='del'>- * filing it on the clean list.</div><div class='del'>- */</div><div class='del'>-int journal_mark_freed(struct reiserfs_transaction_handle *th,</div><div class='del'>-		       struct super_block *sb, b_blocknr_t blocknr)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_journal_cnode *cn = NULL;</div><div class='del'>-	struct buffer_head *bh = NULL;</div><div class='del'>-	struct reiserfs_list_bitmap *jb = NULL;</div><div class='del'>-	int cleaned = 0;</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	cn = get_journal_hash_dev(sb, journal-&gt;j_hash_table, blocknr);</div><div class='del'>-	if (cn &amp;&amp; cn-&gt;bh) {</div><div class='del'>-		bh = cn-&gt;bh;</div><div class='del'>-		get_bh(bh);</div><div class='del'>-	}</div><div class='del'>-	/* if it is journal new, we just remove it from this transaction */</div><div class='del'>-	if (bh &amp;&amp; buffer_journal_new(bh)) {</div><div class='del'>-		clear_buffer_journal_new(bh);</div><div class='del'>-		clear_prepared_bits(bh);</div><div class='del'>-		reiserfs_clean_and_file_buffer(bh);</div><div class='del'>-		cleaned = remove_from_transaction(sb, blocknr, cleaned);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * set the bit for this block in the journal bitmap</div><div class='del'>-		 * for this transaction</div><div class='del'>-		 */</div><div class='del'>-		jb = journal-&gt;j_current_jl-&gt;j_list_bitmap;</div><div class='del'>-		if (!jb) {</div><div class='del'>-			reiserfs_panic(sb, "journal-1702",</div><div class='del'>-				       "journal_list_bitmap is NULL");</div><div class='del'>-		}</div><div class='del'>-		set_bit_in_list_bitmap(sb, blocknr, jb);</div><div class='del'>-</div><div class='del'>-		/* Note, the entire while loop is not allowed to schedule.  */</div><div class='del'>-</div><div class='del'>-		if (bh) {</div><div class='del'>-			clear_prepared_bits(bh);</div><div class='del'>-			reiserfs_clean_and_file_buffer(bh);</div><div class='del'>-		}</div><div class='del'>-		cleaned = remove_from_transaction(sb, blocknr, cleaned);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * find all older transactions with this block,</div><div class='del'>-		 * make sure they don't try to write it out</div><div class='del'>-		 */</div><div class='del'>-		cn = get_journal_hash_dev(sb, journal-&gt;j_list_hash_table,</div><div class='del'>-					  blocknr);</div><div class='del'>-		while (cn) {</div><div class='del'>-			if (sb == cn-&gt;sb &amp;&amp; blocknr == cn-&gt;blocknr) {</div><div class='del'>-				set_bit(BLOCK_FREED, &amp;cn-&gt;state);</div><div class='del'>-				if (cn-&gt;bh) {</div><div class='del'>-					/*</div><div class='del'>-					 * remove_from_transaction will brelse</div><div class='del'>-					 * the buffer if it was in the current</div><div class='del'>-					 * trans</div><div class='del'>-					 */</div><div class='del'>-					if (!cleaned) {</div><div class='del'>-						clear_buffer_journal_dirty(cn-&gt;</div><div class='del'>-									   bh);</div><div class='del'>-						clear_buffer_dirty(cn-&gt;bh);</div><div class='del'>-						clear_buffer_journal_test(cn-&gt;</div><div class='del'>-									  bh);</div><div class='del'>-						cleaned = 1;</div><div class='del'>-						put_bh(cn-&gt;bh);</div><div class='del'>-						if (atomic_read</div><div class='del'>-						    (&amp;cn-&gt;bh-&gt;b_count) &lt; 0) {</div><div class='del'>-							reiserfs_warning(sb,</div><div class='del'>-								 "journal-2138",</div><div class='del'>-								 "cn-&gt;bh-&gt;b_count &lt; 0");</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-					/*</div><div class='del'>-					 * since we are clearing the bh,</div><div class='del'>-					 * we MUST dec nonzerolen</div><div class='del'>-					 */</div><div class='del'>-					if (cn-&gt;jlist) {</div><div class='del'>-						atomic_dec(&amp;cn-&gt;jlist-&gt;</div><div class='del'>-							   j_nonzerolen);</div><div class='del'>-					}</div><div class='del'>-					cn-&gt;bh = NULL;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			cn = cn-&gt;hnext;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bh)</div><div class='del'>-		release_buffer_page(bh); /* get_hash grabs the buffer */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_update_inode_transaction(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(inode-&gt;i_sb);</div><div class='del'>-	REISERFS_I(inode)-&gt;i_jl = journal-&gt;j_current_jl;</div><div class='del'>-	REISERFS_I(inode)-&gt;i_trans_id = journal-&gt;j_trans_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns -1 on error, 0 if no commits/barriers were done and 1</div><div class='del'>- * if a transaction was actually committed and the barrier was done</div><div class='del'>- */</div><div class='del'>-static int __commit_trans_jl(struct inode *inode, unsigned long id,</div><div class='del'>-			     struct reiserfs_journal_list *jl)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * is it from the current transaction,</div><div class='del'>-	 * or from an unknown transaction?</div><div class='del'>-	 */</div><div class='del'>-	if (id == journal-&gt;j_trans_id) {</div><div class='del'>-		jl = journal-&gt;j_current_jl;</div><div class='del'>-		/*</div><div class='del'>-		 * try to let other writers come in and</div><div class='del'>-		 * grow this transaction</div><div class='del'>-		 */</div><div class='del'>-		let_transaction_grow(sb, id);</div><div class='del'>-		if (journal-&gt;j_trans_id != id) {</div><div class='del'>-			goto flush_commit_only;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = journal_begin(&amp;th, sb, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		/* someone might have ended this transaction while we joined */</div><div class='del'>-		if (journal-&gt;j_trans_id != id) {</div><div class='del'>-			reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb),</div><div class='del'>-						     1);</div><div class='del'>-			journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(sb));</div><div class='del'>-			ret = journal_end(&amp;th);</div><div class='del'>-			goto flush_commit_only;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = journal_end_sync(&amp;th);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = 1;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * this gets tricky, we have to make sure the journal list in</div><div class='del'>-		 * the inode still exists.  We know the list is still around</div><div class='del'>-		 * if we've got a larger transaction id than the oldest list</div><div class='del'>-		 */</div><div class='del'>-flush_commit_only:</div><div class='del'>-		if (journal_list_still_alive(inode-&gt;i_sb, id)) {</div><div class='del'>-			/*</div><div class='del'>-			 * we only set ret to 1 when we know for sure</div><div class='del'>-			 * the barrier hasn't been started yet on the commit</div><div class='del'>-			 * block.</div><div class='del'>-			 */</div><div class='del'>-			if (atomic_read(&amp;jl-&gt;j_commit_left) &gt; 1)</div><div class='del'>-				ret = 1;</div><div class='del'>-			flush_commit_list(sb, jl, 1);</div><div class='del'>-			if (journal-&gt;j_errno)</div><div class='del'>-				ret = journal-&gt;j_errno;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* otherwise the list is gone, and long since committed */</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_commit_for_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	unsigned int id = REISERFS_I(inode)-&gt;i_trans_id;</div><div class='del'>-	struct reiserfs_journal_list *jl = REISERFS_I(inode)-&gt;i_jl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * for the whole inode, assume unset id means it was</div><div class='del'>-	 * changed in the current transaction.  More conservative</div><div class='del'>-	 */</div><div class='del'>-	if (!id || !jl) {</div><div class='del'>-		reiserfs_update_inode_transaction(inode);</div><div class='del'>-		id = REISERFS_I(inode)-&gt;i_trans_id;</div><div class='del'>-		/* jl will be updated in __commit_trans_jl */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __commit_trans_jl(inode, id, jl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_restore_prepared_buffer(struct super_block *sb,</div><div class='del'>-				      struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	PROC_INFO_INC(sb, journal.restore_prepared);</div><div class='del'>-	if (!bh) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (test_clear_buffer_journal_restore_dirty(bh) &amp;&amp;</div><div class='del'>-	    buffer_journal_dirty(bh)) {</div><div class='del'>-		struct reiserfs_journal_cnode *cn;</div><div class='del'>-		reiserfs_write_lock(sb);</div><div class='del'>-		cn = get_journal_hash_dev(sb,</div><div class='del'>-					  journal-&gt;j_list_hash_table,</div><div class='del'>-					  bh-&gt;b_blocknr);</div><div class='del'>-		if (cn &amp;&amp; can_dirty(cn)) {</div><div class='del'>-			set_buffer_journal_test(bh);</div><div class='del'>-			mark_buffer_dirty(bh);</div><div class='del'>-		}</div><div class='del'>-		reiserfs_write_unlock(sb);</div><div class='del'>-	}</div><div class='del'>-	clear_buffer_journal_prepared(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern struct tree_balance *cur_tb;</div><div class='del'>-/*</div><div class='del'>- * before we can change a metadata block, we have to make sure it won't</div><div class='del'>- * be written to disk while we are altering it.  So, we must:</div><div class='del'>- * clean it</div><div class='del'>- * wait on it.</div><div class='del'>- */</div><div class='del'>-int reiserfs_prepare_for_journal(struct super_block *sb,</div><div class='del'>-				 struct buffer_head *bh, int wait)</div><div class='del'>-{</div><div class='del'>-	PROC_INFO_INC(sb, journal.prepare);</div><div class='del'>-</div><div class='del'>-	if (!trylock_buffer(bh)) {</div><div class='del'>-		if (!wait)</div><div class='del'>-			return 0;</div><div class='del'>-		lock_buffer(bh);</div><div class='del'>-	}</div><div class='del'>-	set_buffer_journal_prepared(bh);</div><div class='del'>-	if (test_clear_buffer_dirty(bh) &amp;&amp; buffer_journal_dirty(bh)) {</div><div class='del'>-		clear_buffer_journal_test(bh);</div><div class='del'>-		set_buffer_journal_restore_dirty(bh);</div><div class='del'>-	}</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * long and ugly.  If flush, will not return until all commit</div><div class='del'>- * blocks and all real buffers in the trans are on disk.</div><div class='del'>- * If no_async, won't return until all commit blocks are on disk.</div><div class='del'>- *</div><div class='del'>- * keep reading, there are comments as you go along</div><div class='del'>- *</div><div class='del'>- * If the journal is aborted, we just clean up. Things like flushing</div><div class='del'>- * journal lists, etc just won't happen.</div><div class='del'>- */</div><div class='del'>-static int do_journal_end(struct reiserfs_transaction_handle *th, int flags)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	struct reiserfs_journal_cnode *cn, *next, *jl_cn;</div><div class='del'>-	struct reiserfs_journal_cnode *last_cn = NULL;</div><div class='del'>-	struct reiserfs_journal_desc *desc;</div><div class='del'>-	struct reiserfs_journal_commit *commit;</div><div class='del'>-	struct buffer_head *c_bh;	/* commit bh */</div><div class='del'>-	struct buffer_head *d_bh;	/* desc bh */</div><div class='del'>-	int cur_write_start = 0;	/* start index of current log write */</div><div class='del'>-	int i;</div><div class='del'>-	int flush;</div><div class='del'>-	int wait_on_commit;</div><div class='del'>-	struct reiserfs_journal_list *jl, *temp_jl;</div><div class='del'>-	struct list_head *entry, *safe;</div><div class='del'>-	unsigned long jindex;</div><div class='del'>-	unsigned int commit_trans_id;</div><div class='del'>-	int trans_half;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	BUG_ON(th-&gt;t_refcount &gt; 1);</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	BUG_ON(!th-&gt;t_super);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * protect flush_older_commits from doing mistakes if the</div><div class='del'>-	 * transaction ID counter gets overflowed.</div><div class='del'>-	 */</div><div class='del'>-	if (th-&gt;t_trans_id == ~0U)</div><div class='del'>-		flags |= FLUSH_ALL | COMMIT_NOW | WAIT;</div><div class='del'>-	flush = flags &amp; FLUSH_ALL;</div><div class='del'>-	wait_on_commit = flags &amp; WAIT;</div><div class='del'>-</div><div class='del'>-	current-&gt;journal_info = th-&gt;t_handle_save;</div><div class='del'>-	reiserfs_check_lock_depth(sb, "journal end");</div><div class='del'>-	if (journal-&gt;j_len == 0) {</div><div class='del'>-		reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb),</div><div class='del'>-					     1);</div><div class='del'>-		journal_mark_dirty(th, SB_BUFFER_WITH_SB(sb));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lock_journal(sb);</div><div class='del'>-	if (journal-&gt;j_next_full_flush) {</div><div class='del'>-		flags |= FLUSH_ALL;</div><div class='del'>-		flush = 1;</div><div class='del'>-	}</div><div class='del'>-	if (journal-&gt;j_next_async_flush) {</div><div class='del'>-		flags |= COMMIT_NOW | WAIT;</div><div class='del'>-		wait_on_commit = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * check_journal_end locks the journal, and unlocks if it does</div><div class='del'>-	 * not return 1 it tells us if we should continue with the</div><div class='del'>-	 * journal_end, or just return</div><div class='del'>-	 */</div><div class='del'>-	if (!check_journal_end(th, flags)) {</div><div class='del'>-		reiserfs_schedule_old_flush(sb);</div><div class='del'>-		wake_queued_writers(sb);</div><div class='del'>-		reiserfs_async_progress_wait(sb);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check_journal_end might set these, check again */</div><div class='del'>-	if (journal-&gt;j_next_full_flush) {</div><div class='del'>-		flush = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * j must wait means we have to flush the log blocks, and the</div><div class='del'>-	 * real blocks for this transaction</div><div class='del'>-	 */</div><div class='del'>-	if (journal-&gt;j_must_wait &gt; 0) {</div><div class='del'>-		flush = 1;</div><div class='del'>-	}</div><div class='del'>-#ifdef REISERFS_PREALLOCATE</div><div class='del'>-	/*</div><div class='del'>-	 * quota ops might need to nest, setup the journal_info pointer</div><div class='del'>-	 * for them and raise the refcount so that it is &gt; 0.</div><div class='del'>-	 */</div><div class='del'>-	current-&gt;journal_info = th;</div><div class='del'>-	th-&gt;t_refcount++;</div><div class='del'>-</div><div class='del'>-	/* it should not involve new blocks into the transaction */</div><div class='del'>-	reiserfs_discard_all_prealloc(th);</div><div class='del'>-</div><div class='del'>-	th-&gt;t_refcount--;</div><div class='del'>-	current-&gt;journal_info = th-&gt;t_handle_save;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* setup description block */</div><div class='del'>-	d_bh =</div><div class='del'>-	    journal_getblk(sb,</div><div class='del'>-			   SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-			   journal-&gt;j_start);</div><div class='del'>-	set_buffer_uptodate(d_bh);</div><div class='del'>-	desc = (struct reiserfs_journal_desc *)(d_bh)-&gt;b_data;</div><div class='del'>-	memset(d_bh-&gt;b_data, 0, d_bh-&gt;b_size);</div><div class='del'>-	memcpy(get_journal_desc_magic(d_bh), JOURNAL_DESC_MAGIC, 8);</div><div class='del'>-	set_desc_trans_id(desc, journal-&gt;j_trans_id);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * setup commit block.  Don't write (keep it clean too) this one</div><div class='del'>-	 * until after everyone else is written</div><div class='del'>-	 */</div><div class='del'>-	c_bh = journal_getblk(sb, SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-			      ((journal-&gt;j_start + journal-&gt;j_len +</div><div class='del'>-				1) % SB_ONDISK_JOURNAL_SIZE(sb)));</div><div class='del'>-	commit = (struct reiserfs_journal_commit *)c_bh-&gt;b_data;</div><div class='del'>-	memset(c_bh-&gt;b_data, 0, c_bh-&gt;b_size);</div><div class='del'>-	set_commit_trans_id(commit, journal-&gt;j_trans_id);</div><div class='del'>-	set_buffer_uptodate(c_bh);</div><div class='del'>-</div><div class='del'>-	/* init this journal list */</div><div class='del'>-	jl = journal-&gt;j_current_jl;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we lock the commit before doing anything because</div><div class='del'>-	 * we want to make sure nobody tries to run flush_commit_list until</div><div class='del'>-	 * the new transaction is fully setup, and we've already flushed the</div><div class='del'>-	 * ordered bh list</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_mutex_lock_safe(&amp;jl-&gt;j_commit_mutex, sb);</div><div class='del'>-</div><div class='del'>-	/* save the transaction id in case we need to commit it later */</div><div class='del'>-	commit_trans_id = jl-&gt;j_trans_id;</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;jl-&gt;j_older_commits_done, 0);</div><div class='del'>-	jl-&gt;j_trans_id = journal-&gt;j_trans_id;</div><div class='del'>-	jl-&gt;j_timestamp = journal-&gt;j_trans_start_time;</div><div class='del'>-	jl-&gt;j_commit_bh = c_bh;</div><div class='del'>-	jl-&gt;j_start = journal-&gt;j_start;</div><div class='del'>-	jl-&gt;j_len = journal-&gt;j_len;</div><div class='del'>-	atomic_set(&amp;jl-&gt;j_nonzerolen, journal-&gt;j_len);</div><div class='del'>-	atomic_set(&amp;jl-&gt;j_commit_left, journal-&gt;j_len + 2);</div><div class='del'>-	jl-&gt;j_realblock = NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The ENTIRE FOR LOOP MUST not cause schedule to occur.</div><div class='del'>-	 * for each real block, add it to the journal list hash,</div><div class='del'>-	 * copy into real block index array in the commit or desc block</div><div class='del'>-	 */</div><div class='del'>-	trans_half = journal_trans_half(sb-&gt;s_blocksize);</div><div class='del'>-	for (i = 0, cn = journal-&gt;j_first; cn; cn = cn-&gt;next, i++) {</div><div class='del'>-		if (buffer_journaled(cn-&gt;bh)) {</div><div class='del'>-			jl_cn = get_cnode(sb);</div><div class='del'>-			if (!jl_cn) {</div><div class='del'>-				reiserfs_panic(sb, "journal-1676",</div><div class='del'>-					       "get_cnode returned NULL");</div><div class='del'>-			}</div><div class='del'>-			if (i == 0) {</div><div class='del'>-				jl-&gt;j_realblock = jl_cn;</div><div class='del'>-			}</div><div class='del'>-			jl_cn-&gt;prev = last_cn;</div><div class='del'>-			jl_cn-&gt;next = NULL;</div><div class='del'>-			if (last_cn) {</div><div class='del'>-				last_cn-&gt;next = jl_cn;</div><div class='del'>-			}</div><div class='del'>-			last_cn = jl_cn;</div><div class='del'>-			/*</div><div class='del'>-			 * make sure the block we are trying to log</div><div class='del'>-			 * is not a block of journal or reserved area</div><div class='del'>-			 */</div><div class='del'>-			if (is_block_in_log_or_reserved_area</div><div class='del'>-			    (sb, cn-&gt;bh-&gt;b_blocknr)) {</div><div class='del'>-				reiserfs_panic(sb, "journal-2332",</div><div class='del'>-					       "Trying to log block %lu, "</div><div class='del'>-					       "which is a log block",</div><div class='del'>-					       cn-&gt;bh-&gt;b_blocknr);</div><div class='del'>-			}</div><div class='del'>-			jl_cn-&gt;blocknr = cn-&gt;bh-&gt;b_blocknr;</div><div class='del'>-			jl_cn-&gt;state = 0;</div><div class='del'>-			jl_cn-&gt;sb = sb;</div><div class='del'>-			jl_cn-&gt;bh = cn-&gt;bh;</div><div class='del'>-			jl_cn-&gt;jlist = jl;</div><div class='del'>-			insert_journal_hash(journal-&gt;j_list_hash_table, jl_cn);</div><div class='del'>-			if (i &lt; trans_half) {</div><div class='del'>-				desc-&gt;j_realblock[i] =</div><div class='del'>-				    cpu_to_le32(cn-&gt;bh-&gt;b_blocknr);</div><div class='del'>-			} else {</div><div class='del'>-				commit-&gt;j_realblock[i - trans_half] =</div><div class='del'>-				    cpu_to_le32(cn-&gt;bh-&gt;b_blocknr);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			i--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	set_desc_trans_len(desc, journal-&gt;j_len);</div><div class='del'>-	set_desc_mount_id(desc, journal-&gt;j_mount_id);</div><div class='del'>-	set_desc_trans_id(desc, journal-&gt;j_trans_id);</div><div class='del'>-	set_commit_trans_len(commit, journal-&gt;j_len);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * special check in case all buffers in the journal</div><div class='del'>-	 * were marked for not logging</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(journal-&gt;j_len == 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we're about to dirty all the log blocks, mark the description block</div><div class='del'>-	 * dirty now too.  Don't mark the commit block dirty until all the</div><div class='del'>-	 * others are on disk</div><div class='del'>-	 */</div><div class='del'>-	mark_buffer_dirty(d_bh);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * first data block is j_start + 1, so add one to</div><div class='del'>-	 * cur_write_start wherever you use it</div><div class='del'>-	 */</div><div class='del'>-	cur_write_start = journal-&gt;j_start;</div><div class='del'>-	cn = journal-&gt;j_first;</div><div class='del'>-	jindex = 1;	/* start at one so we don't get the desc again */</div><div class='del'>-	while (cn) {</div><div class='del'>-		clear_buffer_journal_new(cn-&gt;bh);</div><div class='del'>-		/* copy all the real blocks into log area.  dirty log blocks */</div><div class='del'>-		if (buffer_journaled(cn-&gt;bh)) {</div><div class='del'>-			struct buffer_head *tmp_bh;</div><div class='del'>-			char *addr;</div><div class='del'>-			struct page *page;</div><div class='del'>-			tmp_bh =</div><div class='del'>-			    journal_getblk(sb,</div><div class='del'>-					   SB_ONDISK_JOURNAL_1st_BLOCK(sb) +</div><div class='del'>-					   ((cur_write_start +</div><div class='del'>-					     jindex) %</div><div class='del'>-					    SB_ONDISK_JOURNAL_SIZE(sb)));</div><div class='del'>-			set_buffer_uptodate(tmp_bh);</div><div class='del'>-			page = cn-&gt;bh-&gt;b_page;</div><div class='del'>-			addr = kmap(page);</div><div class='del'>-			memcpy(tmp_bh-&gt;b_data,</div><div class='del'>-			       addr + offset_in_page(cn-&gt;bh-&gt;b_data),</div><div class='del'>-			       cn-&gt;bh-&gt;b_size);</div><div class='del'>-			kunmap(page);</div><div class='del'>-			mark_buffer_dirty(tmp_bh);</div><div class='del'>-			jindex++;</div><div class='del'>-			set_buffer_journal_dirty(cn-&gt;bh);</div><div class='del'>-			clear_buffer_journaled(cn-&gt;bh);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * JDirty cleared sometime during transaction.</div><div class='del'>-			 * don't log this one</div><div class='del'>-			 */</div><div class='del'>-			reiserfs_warning(sb, "journal-2048",</div><div class='del'>-					 "BAD, buffer in journal hash, "</div><div class='del'>-					 "but not JDirty!");</div><div class='del'>-			brelse(cn-&gt;bh);</div><div class='del'>-		}</div><div class='del'>-		next = cn-&gt;next;</div><div class='del'>-		free_cnode(sb, cn);</div><div class='del'>-		cn = next;</div><div class='del'>-		reiserfs_cond_resched(sb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we are done with both the c_bh and d_bh, but</div><div class='del'>-	 * c_bh must be written after all other commit blocks,</div><div class='del'>-	 * so we dirty/relse c_bh in flush_commit_list, with commit_left &lt;= 1.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_current_jl = alloc_journal_list(sb);</div><div class='del'>-</div><div class='del'>-	/* now it is safe to insert this transaction on the main list */</div><div class='del'>-	list_add_tail(&amp;jl-&gt;j_list, &amp;journal-&gt;j_journal_list);</div><div class='del'>-	list_add_tail(&amp;jl-&gt;j_working_list, &amp;journal-&gt;j_working_list);</div><div class='del'>-	journal-&gt;j_num_work_lists++;</div><div class='del'>-</div><div class='del'>-	/* reset journal values for the next transaction */</div><div class='del'>-	journal-&gt;j_start =</div><div class='del'>-	    (journal-&gt;j_start + journal-&gt;j_len +</div><div class='del'>-	     2) % SB_ONDISK_JOURNAL_SIZE(sb);</div><div class='del'>-	atomic_set(&amp;journal-&gt;j_wcount, 0);</div><div class='del'>-	journal-&gt;j_bcount = 0;</div><div class='del'>-	journal-&gt;j_last = NULL;</div><div class='del'>-	journal-&gt;j_first = NULL;</div><div class='del'>-	journal-&gt;j_len = 0;</div><div class='del'>-	journal-&gt;j_trans_start_time = 0;</div><div class='del'>-	/* check for trans_id overflow */</div><div class='del'>-	if (++journal-&gt;j_trans_id == 0)</div><div class='del'>-		journal-&gt;j_trans_id = 10;</div><div class='del'>-	journal-&gt;j_current_jl-&gt;j_trans_id = journal-&gt;j_trans_id;</div><div class='del'>-	journal-&gt;j_must_wait = 0;</div><div class='del'>-	journal-&gt;j_len_alloc = 0;</div><div class='del'>-	journal-&gt;j_next_full_flush = 0;</div><div class='del'>-	journal-&gt;j_next_async_flush = 0;</div><div class='del'>-	init_journal_hash(sb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * make sure reiserfs_add_jh sees the new current_jl before we</div><div class='del'>-	 * write out the tails</div><div class='del'>-	 */</div><div class='del'>-	smp_mb();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * tail conversion targets have to hit the disk before we end the</div><div class='del'>-	 * transaction.  Otherwise a later transaction might repack the tail</div><div class='del'>-	 * before this transaction commits, leaving the data block unflushed</div><div class='del'>-	 * and clean, if we crash before the later transaction commits, the</div><div class='del'>-	 * data block is lost.</div><div class='del'>-	 */</div><div class='del'>-	if (!list_empty(&amp;jl-&gt;j_tail_bh_list)) {</div><div class='del'>-		depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-		write_ordered_buffers(&amp;journal-&gt;j_dirty_buffers_lock,</div><div class='del'>-				      journal, jl, &amp;jl-&gt;j_tail_bh_list);</div><div class='del'>-		reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(!list_empty(&amp;jl-&gt;j_tail_bh_list));</div><div class='del'>-	mutex_unlock(&amp;jl-&gt;j_commit_mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * honor the flush wishes from the caller, simple commits can</div><div class='del'>-	 * be done outside the journal lock, they are done below</div><div class='del'>-	 *</div><div class='del'>-	 * if we don't flush the commit list right now, we put it into</div><div class='del'>-	 * the work queue so the people waiting on the async progress work</div><div class='del'>-	 * queue don't wait for this proc to flush journal lists and such.</div><div class='del'>-	 */</div><div class='del'>-	if (flush) {</div><div class='del'>-		flush_commit_list(sb, jl, 1);</div><div class='del'>-		flush_journal_list(sb, jl, 1);</div><div class='del'>-	} else if (!(jl-&gt;j_state &amp; LIST_COMMIT_PENDING)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Avoid queueing work when sb is being shut down. Transaction</div><div class='del'>-		 * will be flushed on journal shutdown.</div><div class='del'>-		 */</div><div class='del'>-		if (sb-&gt;s_flags &amp; SB_ACTIVE)</div><div class='del'>-			queue_delayed_work(REISERFS_SB(sb)-&gt;commit_wq,</div><div class='del'>-					   &amp;journal-&gt;j_work, HZ / 10);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if the next transaction has any chance of wrapping, flush</div><div class='del'>-	 * transactions that might get overwritten.  If any journal lists</div><div class='del'>-	 * are very old flush them as well.</div><div class='del'>-	 */</div><div class='del'>-first_jl:</div><div class='del'>-	list_for_each_safe(entry, safe, &amp;journal-&gt;j_journal_list) {</div><div class='del'>-		temp_jl = JOURNAL_LIST_ENTRY(entry);</div><div class='del'>-		if (journal-&gt;j_start &lt;= temp_jl-&gt;j_start) {</div><div class='del'>-			if ((journal-&gt;j_start + journal-&gt;j_trans_max + 1) &gt;=</div><div class='del'>-			    temp_jl-&gt;j_start) {</div><div class='del'>-				flush_used_journal_lists(sb, temp_jl);</div><div class='del'>-				goto first_jl;</div><div class='del'>-			} else if ((journal-&gt;j_start +</div><div class='del'>-				    journal-&gt;j_trans_max + 1) &lt;</div><div class='del'>-				   SB_ONDISK_JOURNAL_SIZE(sb)) {</div><div class='del'>-				/*</div><div class='del'>-				 * if we don't cross into the next</div><div class='del'>-				 * transaction and we don't wrap, there is</div><div class='del'>-				 * no way we can overlap any later transactions</div><div class='del'>-				 * break now</div><div class='del'>-				 */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if ((journal-&gt;j_start +</div><div class='del'>-			    journal-&gt;j_trans_max + 1) &gt;</div><div class='del'>-			   SB_ONDISK_JOURNAL_SIZE(sb)) {</div><div class='del'>-			if (((journal-&gt;j_start + journal-&gt;j_trans_max + 1) %</div><div class='del'>-			     SB_ONDISK_JOURNAL_SIZE(sb)) &gt;=</div><div class='del'>-			    temp_jl-&gt;j_start) {</div><div class='del'>-				flush_used_journal_lists(sb, temp_jl);</div><div class='del'>-				goto first_jl;</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				* we don't overlap anything from out start</div><div class='del'>-				* to the end of the log, and our wrapped</div><div class='del'>-				* portion doesn't overlap anything at</div><div class='del'>-				* the start of the log.  We can break</div><div class='del'>-				*/</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal-&gt;j_current_jl-&gt;j_list_bitmap =</div><div class='del'>-	    get_list_bitmap(sb, journal-&gt;j_current_jl);</div><div class='del'>-</div><div class='del'>-	if (!(journal-&gt;j_current_jl-&gt;j_list_bitmap)) {</div><div class='del'>-		reiserfs_panic(sb, "journal-1996",</div><div class='del'>-			       "could not get a list bitmap");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;journal-&gt;j_jlock, 0);</div><div class='del'>-	unlock_journal(sb);</div><div class='del'>-	/* wake up any body waiting to join. */</div><div class='del'>-	clear_bit(J_WRITERS_QUEUED, &amp;journal-&gt;j_state);</div><div class='del'>-	wake_up(&amp;journal-&gt;j_join_wait);</div><div class='del'>-</div><div class='del'>-	if (!flush &amp;&amp; wait_on_commit &amp;&amp;</div><div class='del'>-	    journal_list_still_alive(sb, commit_trans_id)) {</div><div class='del'>-		flush_commit_list(sb, jl, 1);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	reiserfs_check_lock_depth(sb, "journal end2");</div><div class='del'>-</div><div class='del'>-	memset(th, 0, sizeof(*th));</div><div class='del'>-	/*</div><div class='del'>-	 * Re-set th-&gt;t_super, so we can properly keep track of how many</div><div class='del'>-	 * persistent transactions there are. We need to do this so if this</div><div class='del'>-	 * call is part of a failed restart_transaction, we can free it later</div><div class='del'>-	 */</div><div class='del'>-	th-&gt;t_super = sb;</div><div class='del'>-</div><div class='del'>-	return journal-&gt;j_errno;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Send the file system read only and refuse new transactions */</div><div class='del'>-void reiserfs_abort_journal(struct super_block *sb, int errno)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(sb);</div><div class='del'>-	if (test_bit(J_ABORTED, &amp;journal-&gt;j_state))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!journal-&gt;j_errno)</div><div class='del'>-		journal-&gt;j_errno = errno;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-	set_bit(J_ABORTED, &amp;journal-&gt;j_state);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	dump_stack();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c<br/>deleted file mode 100644<br/>index 7f868569d4d0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/lbalance.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/lbalance.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1426 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * copy copy_count entries from source directory item to dest buffer</div><div class='del'>- * (creating new item if needed)</div><div class='del'>- */</div><div class='del'>-static void leaf_copy_dir_entries(struct buffer_info *dest_bi,</div><div class='del'>-				  struct buffer_head *source, int last_first,</div><div class='del'>-				  int item_num, int from, int copy_count)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *dest = dest_bi-&gt;bi_bh;</div><div class='del'>-	/*</div><div class='del'>-	 * either the number of target item, or if we must create a</div><div class='del'>-	 * new item, the number of the item we will create it next to</div><div class='del'>-	 */</div><div class='del'>-	int item_num_in_dest;</div><div class='del'>-</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	int copy_records_len;	/* length of all records in item to be copied */</div><div class='del'>-	char *records;</div><div class='del'>-</div><div class='del'>-	ih = item_head(source, item_num);</div><div class='del'>-</div><div class='del'>-	RFALSE(!is_direntry_le_ih(ih), "vs-10000: item must be directory item");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * length of all record to be copied and first byte of</div><div class='del'>-	 * the last of them</div><div class='del'>-	 */</div><div class='del'>-	deh = B_I_DEH(source, ih);</div><div class='del'>-	if (copy_count) {</div><div class='del'>-		copy_records_len = (from ? deh_location(&amp;deh[from - 1]) :</div><div class='del'>-				    ih_item_len(ih)) -</div><div class='del'>-		    deh_location(&amp;deh[from + copy_count - 1]);</div><div class='del'>-		records =</div><div class='del'>-		    source-&gt;b_data + ih_location(ih) +</div><div class='del'>-		    deh_location(&amp;deh[from + copy_count - 1]);</div><div class='del'>-	} else {</div><div class='del'>-		copy_records_len = 0;</div><div class='del'>-		records = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* when copy last to first, dest buffer can contain 0 items */</div><div class='del'>-	item_num_in_dest =</div><div class='del'>-	    (last_first ==</div><div class='del'>-	     LAST_TO_FIRST) ? ((B_NR_ITEMS(dest)) ? 0 : -1) : (B_NR_ITEMS(dest)</div><div class='del'>-							       - 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if there are no items in dest or the first/last item in</div><div class='del'>-	 * dest is not item of the same directory</div><div class='del'>-	 */</div><div class='del'>-	if ((item_num_in_dest == -1) ||</div><div class='del'>-	    (last_first == FIRST_TO_LAST &amp;&amp; le_ih_k_offset(ih) == DOT_OFFSET) ||</div><div class='del'>-	    (last_first == LAST_TO_FIRST</div><div class='del'>-	     &amp;&amp; comp_short_le_keys /*COMP_SHORT_KEYS */ (&amp;ih-&gt;ih_key,</div><div class='del'>-							 leaf_key(dest,</div><div class='del'>-								  item_num_in_dest))))</div><div class='del'>-	{</div><div class='del'>-		/* create new item in dest */</div><div class='del'>-		struct item_head new_ih;</div><div class='del'>-</div><div class='del'>-		/* form item header */</div><div class='del'>-		memcpy(&amp;new_ih.ih_key, &amp;ih-&gt;ih_key, KEY_SIZE);</div><div class='del'>-		put_ih_version(&amp;new_ih, KEY_FORMAT_3_5);</div><div class='del'>-		/* calculate item len */</div><div class='del'>-		put_ih_item_len(&amp;new_ih,</div><div class='del'>-				DEH_SIZE * copy_count + copy_records_len);</div><div class='del'>-		put_ih_entry_count(&amp;new_ih, 0);</div><div class='del'>-</div><div class='del'>-		if (last_first == LAST_TO_FIRST) {</div><div class='del'>-			/* form key by the following way */</div><div class='del'>-			if (from &lt; ih_entry_count(ih)) {</div><div class='del'>-				set_le_ih_k_offset(&amp;new_ih,</div><div class='del'>-						   deh_offset(&amp;deh[from]));</div><div class='del'>-			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * no entries will be copied to this</div><div class='del'>-				 * item in this function</div><div class='del'>-				 */</div><div class='del'>-				set_le_ih_k_offset(&amp;new_ih, U32_MAX);</div><div class='del'>-				/*</div><div class='del'>-				 * this item is not yet valid, but we</div><div class='del'>-				 * want I_IS_DIRECTORY_ITEM to return 1</div><div class='del'>-				 * for it, so we -1</div><div class='del'>-				 */</div><div class='del'>-			}</div><div class='del'>-			set_le_key_k_type(KEY_FORMAT_3_5, &amp;new_ih.ih_key,</div><div class='del'>-					  TYPE_DIRENTRY);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* insert item into dest buffer */</div><div class='del'>-		leaf_insert_into_buf(dest_bi,</div><div class='del'>-				     (last_first ==</div><div class='del'>-				      LAST_TO_FIRST) ? 0 : B_NR_ITEMS(dest),</div><div class='del'>-				     &amp;new_ih, NULL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		/* prepare space for entries */</div><div class='del'>-		leaf_paste_in_buffer(dest_bi,</div><div class='del'>-				     (last_first ==</div><div class='del'>-				      FIRST_TO_LAST) ? (B_NR_ITEMS(dest) -</div><div class='del'>-							1) : 0, MAX_US_INT,</div><div class='del'>-				     DEH_SIZE * copy_count + copy_records_len,</div><div class='del'>-				     records, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	item_num_in_dest =</div><div class='del'>-	    (last_first == FIRST_TO_LAST) ? (B_NR_ITEMS(dest) - 1) : 0;</div><div class='del'>-</div><div class='del'>-	leaf_paste_entries(dest_bi, item_num_in_dest,</div><div class='del'>-			   (last_first ==</div><div class='del'>-			    FIRST_TO_LAST) ? ih_entry_count(item_head(dest,</div><div class='del'>-									  item_num_in_dest))</div><div class='del'>-			   : 0, copy_count, deh + from, records,</div><div class='del'>-			   DEH_SIZE * copy_count + copy_records_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copy the first (if last_first == FIRST_TO_LAST) or last</div><div class='del'>- * (last_first == LAST_TO_FIRST) item or part of it or nothing</div><div class='del'>- * (see the return 0 below) from SOURCE to the end (if last_first)</div><div class='del'>- * or beginning (!last_first) of the DEST</div><div class='del'>- */</div><div class='del'>-/* returns 1 if anything was copied, else 0 */</div><div class='del'>-static int leaf_copy_boundary_item(struct buffer_info *dest_bi,</div><div class='del'>-				   struct buffer_head *src, int last_first,</div><div class='del'>-				   int bytes_or_entries)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *dest = dest_bi-&gt;bi_bh;</div><div class='del'>-	/* number of items in the source and destination buffers */</div><div class='del'>-	int dest_nr_item, src_nr_item;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	struct item_head *dih;</div><div class='del'>-</div><div class='del'>-	dest_nr_item = B_NR_ITEMS(dest);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if ( DEST is empty or first item of SOURCE and last item of</div><div class='del'>-	 * DEST are the items of different objects or of different types )</div><div class='del'>-	 * then there is no need to treat this item differently from the</div><div class='del'>-	 * other items that we copy, so we return</div><div class='del'>-	 */</div><div class='del'>-	if (last_first == FIRST_TO_LAST) {</div><div class='del'>-		ih = item_head(src, 0);</div><div class='del'>-		dih = item_head(dest, dest_nr_item - 1);</div><div class='del'>-</div><div class='del'>-		/* there is nothing to merge */</div><div class='del'>-		if (!dest_nr_item</div><div class='del'>-		    || (!op_is_left_mergeable(&amp;ih-&gt;ih_key, src-&gt;b_size)))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		RFALSE(!ih_item_len(ih),</div><div class='del'>-		       "vs-10010: item can not have empty length");</div><div class='del'>-</div><div class='del'>-		if (is_direntry_le_ih(ih)) {</div><div class='del'>-			if (bytes_or_entries == -1)</div><div class='del'>-				/* copy all entries to dest */</div><div class='del'>-				bytes_or_entries = ih_entry_count(ih);</div><div class='del'>-			leaf_copy_dir_entries(dest_bi, src, FIRST_TO_LAST, 0, 0,</div><div class='del'>-					      bytes_or_entries);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * copy part of the body of the first item of SOURCE</div><div class='del'>-		 * to the end of the body of the last item of the DEST</div><div class='del'>-		 * part defined by 'bytes_or_entries'; if bytes_or_entries</div><div class='del'>-		 * == -1 copy whole body; don't create new item header</div><div class='del'>-		 */</div><div class='del'>-		if (bytes_or_entries == -1)</div><div class='del'>-			bytes_or_entries = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		else {</div><div class='del'>-			if (bytes_or_entries == ih_item_len(ih)</div><div class='del'>-			    &amp;&amp; is_indirect_le_ih(ih))</div><div class='del'>-				if (get_ih_free_space(ih))</div><div class='del'>-					reiserfs_panic(sb_from_bi(dest_bi),</div><div class='del'>-						       "vs-10020",</div><div class='del'>-						       "last unformatted node "</div><div class='del'>-						       "must be filled "</div><div class='del'>-						       "entirely (%h)", ih);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * merge first item (or its part) of src buffer with the last</div><div class='del'>-		 * item of dest buffer. Both are of the same file</div><div class='del'>-		 */</div><div class='del'>-		leaf_paste_in_buffer(dest_bi,</div><div class='del'>-				     dest_nr_item - 1, ih_item_len(dih),</div><div class='del'>-				     bytes_or_entries, ih_item_body(src, ih), 0);</div><div class='del'>-</div><div class='del'>-		if (is_indirect_le_ih(dih)) {</div><div class='del'>-			RFALSE(get_ih_free_space(dih),</div><div class='del'>-			       "vs-10030: merge to left: last unformatted node of non-last indirect item %h must have zerto free space",</div><div class='del'>-			       ih);</div><div class='del'>-			if (bytes_or_entries == ih_item_len(ih))</div><div class='del'>-				set_ih_free_space(dih, get_ih_free_space(ih));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* copy boundary item to right (last_first == LAST_TO_FIRST) */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * (DEST is empty or last item of SOURCE and first item of DEST</div><div class='del'>-	 * are the items of different object or of different types)</div><div class='del'>-	 */</div><div class='del'>-	src_nr_item = B_NR_ITEMS(src);</div><div class='del'>-	ih = item_head(src, src_nr_item - 1);</div><div class='del'>-	dih = item_head(dest, 0);</div><div class='del'>-</div><div class='del'>-	if (!dest_nr_item || !op_is_left_mergeable(&amp;dih-&gt;ih_key, src-&gt;b_size))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (is_direntry_le_ih(ih)) {</div><div class='del'>-		/*</div><div class='del'>-		 * bytes_or_entries = entries number in last</div><div class='del'>-		 * item body of SOURCE</div><div class='del'>-		 */</div><div class='del'>-		if (bytes_or_entries == -1)</div><div class='del'>-			bytes_or_entries = ih_entry_count(ih);</div><div class='del'>-</div><div class='del'>-		leaf_copy_dir_entries(dest_bi, src, LAST_TO_FIRST,</div><div class='del'>-				      src_nr_item - 1,</div><div class='del'>-				      ih_entry_count(ih) - bytes_or_entries,</div><div class='del'>-				      bytes_or_entries);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * copy part of the body of the last item of SOURCE to the</div><div class='del'>-	 * begin of the body of the first item of the DEST; part defined</div><div class='del'>-	 * by 'bytes_or_entries'; if byte_or_entriess == -1 copy whole body;</div><div class='del'>-	 * change first item key of the DEST; don't create new item header</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	RFALSE(is_indirect_le_ih(ih) &amp;&amp; get_ih_free_space(ih),</div><div class='del'>-	       "vs-10040: merge to right: last unformatted node of non-last indirect item must be filled entirely (%h)",</div><div class='del'>-	       ih);</div><div class='del'>-</div><div class='del'>-	if (bytes_or_entries == -1) {</div><div class='del'>-		/* bytes_or_entries = length of last item body of SOURCE */</div><div class='del'>-		bytes_or_entries = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-		RFALSE(le_ih_k_offset(dih) !=</div><div class='del'>-		       le_ih_k_offset(ih) + op_bytes_number(ih, src-&gt;b_size),</div><div class='del'>-		       "vs-10050: items %h and %h do not match", ih, dih);</div><div class='del'>-</div><div class='del'>-		/* change first item key of the DEST */</div><div class='del'>-		set_le_ih_k_offset(dih, le_ih_k_offset(ih));</div><div class='del'>-</div><div class='del'>-		/* item becomes non-mergeable */</div><div class='del'>-		/* or mergeable if left item was */</div><div class='del'>-		set_le_ih_k_type(dih, le_ih_k_type(ih));</div><div class='del'>-	} else {</div><div class='del'>-		/* merge to right only part of item */</div><div class='del'>-		RFALSE(ih_item_len(ih) &lt;= bytes_or_entries,</div><div class='del'>-		       "vs-10060: no so much bytes %lu (needed %lu)",</div><div class='del'>-		       (unsigned long)ih_item_len(ih),</div><div class='del'>-		       (unsigned long)bytes_or_entries);</div><div class='del'>-</div><div class='del'>-		/* change first item key of the DEST */</div><div class='del'>-		if (is_direct_le_ih(dih)) {</div><div class='del'>-			RFALSE(le_ih_k_offset(dih) &lt;=</div><div class='del'>-			       (unsigned long)bytes_or_entries,</div><div class='del'>-			       "vs-10070: dih %h, bytes_or_entries(%d)", dih,</div><div class='del'>-			       bytes_or_entries);</div><div class='del'>-			set_le_ih_k_offset(dih,</div><div class='del'>-					   le_ih_k_offset(dih) -</div><div class='del'>-					   bytes_or_entries);</div><div class='del'>-		} else {</div><div class='del'>-			RFALSE(le_ih_k_offset(dih) &lt;=</div><div class='del'>-			       (bytes_or_entries / UNFM_P_SIZE) * dest-&gt;b_size,</div><div class='del'>-			       "vs-10080: dih %h, bytes_or_entries(%d)",</div><div class='del'>-			       dih,</div><div class='del'>-			       (bytes_or_entries / UNFM_P_SIZE) * dest-&gt;b_size);</div><div class='del'>-			set_le_ih_k_offset(dih,</div><div class='del'>-					   le_ih_k_offset(dih) -</div><div class='del'>-					   ((bytes_or_entries / UNFM_P_SIZE) *</div><div class='del'>-					    dest-&gt;b_size));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	leaf_paste_in_buffer(dest_bi, 0, 0, bytes_or_entries,</div><div class='del'>-			     ih_item_body(src,</div><div class='del'>-				       ih) + ih_item_len(ih) - bytes_or_entries,</div><div class='del'>-			     0);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * copy cpy_mun items from buffer src to buffer dest</div><div class='del'>- * last_first == FIRST_TO_LAST means, that we copy cpy_num items beginning</div><div class='del'>- *                             from first-th item in src to tail of dest</div><div class='del'>- * last_first == LAST_TO_FIRST means, that we copy cpy_num items beginning</div><div class='del'>- *                             from first-th item in src to head of dest</div><div class='del'>- */</div><div class='del'>-static void leaf_copy_items_entirely(struct buffer_info *dest_bi,</div><div class='del'>-				     struct buffer_head *src, int last_first,</div><div class='del'>-				     int first, int cpy_num)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *dest;</div><div class='del'>-	int nr, free_space;</div><div class='del'>-	int dest_before;</div><div class='del'>-	int last_loc, last_inserted_loc, location;</div><div class='del'>-	int i, j;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-</div><div class='del'>-	RFALSE(last_first != LAST_TO_FIRST &amp;&amp; last_first != FIRST_TO_LAST,</div><div class='del'>-	       "vs-10090: bad last_first parameter %d", last_first);</div><div class='del'>-	RFALSE(B_NR_ITEMS(src) - first &lt; cpy_num,</div><div class='del'>-	       "vs-10100: too few items in source %d, required %d from %d",</div><div class='del'>-	       B_NR_ITEMS(src), cpy_num, first);</div><div class='del'>-	RFALSE(cpy_num &lt; 0, "vs-10110: can not copy negative amount of items");</div><div class='del'>-	RFALSE(!dest_bi, "vs-10120: can not copy negative amount of items");</div><div class='del'>-</div><div class='del'>-	dest = dest_bi-&gt;bi_bh;</div><div class='del'>-</div><div class='del'>-	RFALSE(!dest, "vs-10130: can not copy negative amount of items");</div><div class='del'>-</div><div class='del'>-	if (cpy_num == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(dest);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-	free_space = blkh_free_space(blkh);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we will insert items before 0-th or nr-th item in dest buffer.</div><div class='del'>-	 * It depends of last_first parameter</div><div class='del'>-	 */</div><div class='del'>-	dest_before = (last_first == LAST_TO_FIRST) ? 0 : nr;</div><div class='del'>-</div><div class='del'>-	/* location of head of first new item */</div><div class='del'>-	ih = item_head(dest, dest_before);</div><div class='del'>-</div><div class='del'>-	RFALSE(blkh_free_space(blkh) &lt; cpy_num * IH_SIZE,</div><div class='del'>-	       "vs-10140: not enough free space for headers %d (needed %d)",</div><div class='del'>-	       B_FREE_SPACE(dest), cpy_num * IH_SIZE);</div><div class='del'>-</div><div class='del'>-	/* prepare space for headers */</div><div class='del'>-	memmove(ih + cpy_num, ih, (nr - dest_before) * IH_SIZE);</div><div class='del'>-</div><div class='del'>-	/* copy item headers */</div><div class='del'>-	memcpy(ih, item_head(src, first), cpy_num * IH_SIZE);</div><div class='del'>-</div><div class='del'>-	free_space -= (IH_SIZE * cpy_num);</div><div class='del'>-	set_blkh_free_space(blkh, free_space);</div><div class='del'>-</div><div class='del'>-	/* location of unmovable item */</div><div class='del'>-	j = location = (dest_before == 0) ? dest-&gt;b_size : ih_location(ih - 1);</div><div class='del'>-	for (i = dest_before; i &lt; nr + cpy_num; i++) {</div><div class='del'>-		location -= ih_item_len(ih + i - dest_before);</div><div class='del'>-		put_ih_location(ih + i - dest_before, location);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* prepare space for items */</div><div class='del'>-	last_loc = ih_location(&amp;ih[nr + cpy_num - 1 - dest_before]);</div><div class='del'>-	last_inserted_loc = ih_location(&amp;ih[cpy_num - 1]);</div><div class='del'>-</div><div class='del'>-	/* check free space */</div><div class='del'>-	RFALSE(free_space &lt; j - last_inserted_loc,</div><div class='del'>-	       "vs-10150: not enough free space for items %d (needed %d)",</div><div class='del'>-	       free_space, j - last_inserted_loc);</div><div class='del'>-</div><div class='del'>-	memmove(dest-&gt;b_data + last_loc,</div><div class='del'>-		dest-&gt;b_data + last_loc + j - last_inserted_loc,</div><div class='del'>-		last_inserted_loc - last_loc);</div><div class='del'>-</div><div class='del'>-	/* copy items */</div><div class='del'>-	memcpy(dest-&gt;b_data + last_inserted_loc,</div><div class='del'>-	       item_body(src, (first + cpy_num - 1)),</div><div class='del'>-	       j - last_inserted_loc);</div><div class='del'>-</div><div class='del'>-	/* sizes, item number */</div><div class='del'>-	set_blkh_nr_item(blkh, nr + cpy_num);</div><div class='del'>-	set_blkh_free_space(blkh, free_space - (j - last_inserted_loc));</div><div class='del'>-</div><div class='del'>-	do_balance_mark_leaf_dirty(dest_bi-&gt;tb, dest, 0);</div><div class='del'>-</div><div class='del'>-	if (dest_bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc;</div><div class='del'>-		t_dc = B_N_CHILD(dest_bi-&gt;bi_parent, dest_bi-&gt;bi_position);</div><div class='del'>-		RFALSE(dc_block_number(t_dc) != dest-&gt;b_blocknr,</div><div class='del'>-		       "vs-10160: block number in bh does not match to field in disk_child structure %lu and %lu",</div><div class='del'>-		       (long unsigned)dest-&gt;b_blocknr,</div><div class='del'>-		       (long unsigned)dc_block_number(t_dc));</div><div class='del'>-		put_dc_size(t_dc,</div><div class='del'>-			    dc_size(t_dc) + (j - last_inserted_loc +</div><div class='del'>-					     IH_SIZE * cpy_num));</div><div class='del'>-</div><div class='del'>-		do_balance_mark_internal_dirty(dest_bi-&gt;tb, dest_bi-&gt;bi_parent,</div><div class='del'>-					       0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function splits the (liquid) item into two items (useful when</div><div class='del'>- * shifting part of an item into another node.)</div><div class='del'>- */</div><div class='del'>-static void leaf_item_bottle(struct buffer_info *dest_bi,</div><div class='del'>-			     struct buffer_head *src, int last_first,</div><div class='del'>-			     int item_num, int cpy_bytes)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *dest = dest_bi-&gt;bi_bh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-</div><div class='del'>-	RFALSE(cpy_bytes == -1,</div><div class='del'>-	       "vs-10170: bytes == - 1 means: do not split item");</div><div class='del'>-</div><div class='del'>-	if (last_first == FIRST_TO_LAST) {</div><div class='del'>-		/*</div><div class='del'>-		 * if ( if item in position item_num in buffer SOURCE</div><div class='del'>-		 * is directory item )</div><div class='del'>-		 */</div><div class='del'>-		ih = item_head(src, item_num);</div><div class='del'>-		if (is_direntry_le_ih(ih))</div><div class='del'>-			leaf_copy_dir_entries(dest_bi, src, FIRST_TO_LAST,</div><div class='del'>-					      item_num, 0, cpy_bytes);</div><div class='del'>-		else {</div><div class='del'>-			struct item_head n_ih;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * copy part of the body of the item number 'item_num'</div><div class='del'>-			 * of SOURCE to the end of the DEST part defined by</div><div class='del'>-			 * 'cpy_bytes'; create new item header; change old</div><div class='del'>-			 * item_header (????); n_ih = new item_header;</div><div class='del'>-			 */</div><div class='del'>-			memcpy(&amp;n_ih, ih, IH_SIZE);</div><div class='del'>-			put_ih_item_len(&amp;n_ih, cpy_bytes);</div><div class='del'>-			if (is_indirect_le_ih(ih)) {</div><div class='del'>-				RFALSE(cpy_bytes == ih_item_len(ih)</div><div class='del'>-				       &amp;&amp; get_ih_free_space(ih),</div><div class='del'>-				       "vs-10180: when whole indirect item is bottle to left neighbor, it must have free_space==0 (not %lu)",</div><div class='del'>-				       (long unsigned)get_ih_free_space(ih));</div><div class='del'>-				set_ih_free_space(&amp;n_ih, 0);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			RFALSE(op_is_left_mergeable(&amp;ih-&gt;ih_key, src-&gt;b_size),</div><div class='del'>-			       "vs-10190: bad mergeability of item %h", ih);</div><div class='del'>-			n_ih.ih_version = ih-&gt;ih_version;	/* JDM Endian safe, both le */</div><div class='del'>-			leaf_insert_into_buf(dest_bi, B_NR_ITEMS(dest), &amp;n_ih,</div><div class='del'>-					     item_body(src, item_num), 0);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * if ( if item in position item_num in buffer</div><div class='del'>-		 * SOURCE is directory item )</div><div class='del'>-		 */</div><div class='del'>-		ih = item_head(src, item_num);</div><div class='del'>-		if (is_direntry_le_ih(ih))</div><div class='del'>-			leaf_copy_dir_entries(dest_bi, src, LAST_TO_FIRST,</div><div class='del'>-					      item_num,</div><div class='del'>-					      ih_entry_count(ih) - cpy_bytes,</div><div class='del'>-					      cpy_bytes);</div><div class='del'>-		else {</div><div class='del'>-			struct item_head n_ih;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * copy part of the body of the item number 'item_num'</div><div class='del'>-			 * of SOURCE to the begin of the DEST part defined by</div><div class='del'>-			 * 'cpy_bytes'; create new item header;</div><div class='del'>-			 * n_ih = new item_header;</div><div class='del'>-			 */</div><div class='del'>-			memcpy(&amp;n_ih.ih_key, &amp;ih-&gt;ih_key, KEY_SIZE);</div><div class='del'>-</div><div class='del'>-			/* Endian safe, both le */</div><div class='del'>-			n_ih.ih_version = ih-&gt;ih_version;</div><div class='del'>-</div><div class='del'>-			if (is_direct_le_ih(ih)) {</div><div class='del'>-				set_le_ih_k_offset(&amp;n_ih,</div><div class='del'>-						   le_ih_k_offset(ih) +</div><div class='del'>-						   ih_item_len(ih) - cpy_bytes);</div><div class='del'>-				set_le_ih_k_type(&amp;n_ih, TYPE_DIRECT);</div><div class='del'>-				set_ih_free_space(&amp;n_ih, MAX_US_INT);</div><div class='del'>-			} else {</div><div class='del'>-				/* indirect item */</div><div class='del'>-				RFALSE(!cpy_bytes &amp;&amp; get_ih_free_space(ih),</div><div class='del'>-				       "vs-10200: ih-&gt;ih_free_space must be 0 when indirect item will be appended");</div><div class='del'>-				set_le_ih_k_offset(&amp;n_ih,</div><div class='del'>-						   le_ih_k_offset(ih) +</div><div class='del'>-						   (ih_item_len(ih) -</div><div class='del'>-						    cpy_bytes) / UNFM_P_SIZE *</div><div class='del'>-						   dest-&gt;b_size);</div><div class='del'>-				set_le_ih_k_type(&amp;n_ih, TYPE_INDIRECT);</div><div class='del'>-				set_ih_free_space(&amp;n_ih, get_ih_free_space(ih));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* set item length */</div><div class='del'>-			put_ih_item_len(&amp;n_ih, cpy_bytes);</div><div class='del'>-</div><div class='del'>-			/* Endian safe, both le */</div><div class='del'>-			n_ih.ih_version = ih-&gt;ih_version;</div><div class='del'>-</div><div class='del'>-			leaf_insert_into_buf(dest_bi, 0, &amp;n_ih,</div><div class='del'>-					     item_body(src, item_num) +</div><div class='del'>-						ih_item_len(ih) - cpy_bytes, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If cpy_bytes equals minus one than copy cpy_num whole items from SOURCE</div><div class='del'>- * to DEST.  If cpy_bytes not equal to minus one than copy cpy_num-1 whole</div><div class='del'>- * items from SOURCE to DEST.  From last item copy cpy_num bytes for regular</div><div class='del'>- * item and cpy_num directory entries for directory item.</div><div class='del'>- */</div><div class='del'>-static int leaf_copy_items(struct buffer_info *dest_bi, struct buffer_head *src,</div><div class='del'>-			   int last_first, int cpy_num, int cpy_bytes)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *dest;</div><div class='del'>-	int pos, i, src_nr_item, bytes;</div><div class='del'>-</div><div class='del'>-	dest = dest_bi-&gt;bi_bh;</div><div class='del'>-	RFALSE(!dest || !src, "vs-10210: !dest || !src");</div><div class='del'>-	RFALSE(last_first != FIRST_TO_LAST &amp;&amp; last_first != LAST_TO_FIRST,</div><div class='del'>-	       "vs-10220:last_first != FIRST_TO_LAST &amp;&amp; last_first != LAST_TO_FIRST");</div><div class='del'>-	RFALSE(B_NR_ITEMS(src) &lt; cpy_num,</div><div class='del'>-	       "vs-10230: No enough items: %d, req. %d", B_NR_ITEMS(src),</div><div class='del'>-	       cpy_num);</div><div class='del'>-	RFALSE(cpy_num &lt; 0, "vs-10240: cpy_num &lt; 0 (%d)", cpy_num);</div><div class='del'>-</div><div class='del'>-	if (cpy_num == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (last_first == FIRST_TO_LAST) {</div><div class='del'>-		/* copy items to left */</div><div class='del'>-		pos = 0;</div><div class='del'>-		if (cpy_num == 1)</div><div class='del'>-			bytes = cpy_bytes;</div><div class='del'>-		else</div><div class='del'>-			bytes = -1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * copy the first item or it part or nothing to the end of</div><div class='del'>-		 * the DEST (i = leaf_copy_boundary_item(DEST,SOURCE,0,bytes))</div><div class='del'>-		 */</div><div class='del'>-		i = leaf_copy_boundary_item(dest_bi, src, FIRST_TO_LAST, bytes);</div><div class='del'>-		cpy_num -= i;</div><div class='del'>-		if (cpy_num == 0)</div><div class='del'>-			return i;</div><div class='del'>-		pos += i;</div><div class='del'>-		if (cpy_bytes == -1)</div><div class='del'>-			/*</div><div class='del'>-			 * copy first cpy_num items starting from position</div><div class='del'>-			 * 'pos' of SOURCE to end of DEST</div><div class='del'>-			 */</div><div class='del'>-			leaf_copy_items_entirely(dest_bi, src, FIRST_TO_LAST,</div><div class='del'>-						 pos, cpy_num);</div><div class='del'>-		else {</div><div class='del'>-			/*</div><div class='del'>-			 * copy first cpy_num-1 items starting from position</div><div class='del'>-			 * 'pos-1' of the SOURCE to the end of the DEST</div><div class='del'>-			 */</div><div class='del'>-			leaf_copy_items_entirely(dest_bi, src, FIRST_TO_LAST,</div><div class='del'>-						 pos, cpy_num - 1);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * copy part of the item which number is</div><div class='del'>-			 * cpy_num+pos-1 to the end of the DEST</div><div class='del'>-			 */</div><div class='del'>-			leaf_item_bottle(dest_bi, src, FIRST_TO_LAST,</div><div class='del'>-					 cpy_num + pos - 1, cpy_bytes);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* copy items to right */</div><div class='del'>-		src_nr_item = B_NR_ITEMS(src);</div><div class='del'>-		if (cpy_num == 1)</div><div class='del'>-			bytes = cpy_bytes;</div><div class='del'>-		else</div><div class='del'>-			bytes = -1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * copy the last item or it part or nothing to the</div><div class='del'>-		 * begin of the DEST</div><div class='del'>-		 * (i = leaf_copy_boundary_item(DEST,SOURCE,1,bytes));</div><div class='del'>-		 */</div><div class='del'>-		i = leaf_copy_boundary_item(dest_bi, src, LAST_TO_FIRST, bytes);</div><div class='del'>-</div><div class='del'>-		cpy_num -= i;</div><div class='del'>-		if (cpy_num == 0)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-		pos = src_nr_item - cpy_num - i;</div><div class='del'>-		if (cpy_bytes == -1) {</div><div class='del'>-			/*</div><div class='del'>-			 * starting from position 'pos' copy last cpy_num</div><div class='del'>-			 * items of SOURCE to begin of DEST</div><div class='del'>-			 */</div><div class='del'>-			leaf_copy_items_entirely(dest_bi, src, LAST_TO_FIRST,</div><div class='del'>-						 pos, cpy_num);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * copy last cpy_num-1 items starting from position</div><div class='del'>-			 * 'pos+1' of the SOURCE to the begin of the DEST;</div><div class='del'>-			 */</div><div class='del'>-			leaf_copy_items_entirely(dest_bi, src, LAST_TO_FIRST,</div><div class='del'>-						 pos + 1, cpy_num - 1);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * copy part of the item which number is pos to</div><div class='del'>-			 * the begin of the DEST</div><div class='del'>-			 */</div><div class='del'>-			leaf_item_bottle(dest_bi, src, LAST_TO_FIRST, pos,</div><div class='del'>-					 cpy_bytes);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * there are types of coping: from S[0] to L[0], from S[0] to R[0],</div><div class='del'>- * from R[0] to L[0]. for each of these we have to define parent and</div><div class='del'>- * positions of destination and source buffers</div><div class='del'>- */</div><div class='del'>-static void leaf_define_dest_src_infos(int shift_mode, struct tree_balance *tb,</div><div class='del'>-				       struct buffer_info *dest_bi,</div><div class='del'>-				       struct buffer_info *src_bi,</div><div class='del'>-				       int *first_last,</div><div class='del'>-				       struct buffer_head *Snew)</div><div class='del'>-{</div><div class='del'>-	memset(dest_bi, 0, sizeof(struct buffer_info));</div><div class='del'>-	memset(src_bi, 0, sizeof(struct buffer_info));</div><div class='del'>-</div><div class='del'>-	/* define dest, src, dest parent, dest position */</div><div class='del'>-	switch (shift_mode) {</div><div class='del'>-	case LEAF_FROM_S_TO_L:	/* it is used in leaf_shift_left */</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-		src_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, 0);</div><div class='del'>-</div><div class='del'>-		/* src-&gt;b_item_order */</div><div class='del'>-		src_bi-&gt;bi_position = PATH_H_B_ITEM_ORDER(tb-&gt;tb_path, 0);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;L[0];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FL[0];</div><div class='del'>-		dest_bi-&gt;bi_position = get_left_neighbor_position(tb, 0);</div><div class='del'>-		*first_last = FIRST_TO_LAST;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case LEAF_FROM_S_TO_R:	/* it is used in leaf_shift_right */</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-		src_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, 0);</div><div class='del'>-		src_bi-&gt;bi_position = PATH_H_B_ITEM_ORDER(tb-&gt;tb_path, 0);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;R[0];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FR[0];</div><div class='del'>-		dest_bi-&gt;bi_position = get_right_neighbor_position(tb, 0);</div><div class='del'>-		*first_last = LAST_TO_FIRST;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case LEAF_FROM_R_TO_L:	/* it is used in balance_leaf_when_delete */</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = tb-&gt;R[0];</div><div class='del'>-		src_bi-&gt;bi_parent = tb-&gt;FR[0];</div><div class='del'>-		src_bi-&gt;bi_position = get_right_neighbor_position(tb, 0);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;L[0];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FL[0];</div><div class='del'>-		dest_bi-&gt;bi_position = get_left_neighbor_position(tb, 0);</div><div class='del'>-		*first_last = FIRST_TO_LAST;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case LEAF_FROM_L_TO_R:	/* it is used in balance_leaf_when_delete */</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = tb-&gt;L[0];</div><div class='del'>-		src_bi-&gt;bi_parent = tb-&gt;FL[0];</div><div class='del'>-		src_bi-&gt;bi_position = get_left_neighbor_position(tb, 0);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = tb-&gt;R[0];</div><div class='del'>-		dest_bi-&gt;bi_parent = tb-&gt;FR[0];</div><div class='del'>-		dest_bi-&gt;bi_position = get_right_neighbor_position(tb, 0);</div><div class='del'>-		*first_last = LAST_TO_FIRST;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case LEAF_FROM_S_TO_SNEW:</div><div class='del'>-		src_bi-&gt;tb = tb;</div><div class='del'>-		src_bi-&gt;bi_bh = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-		src_bi-&gt;bi_parent = PATH_H_PPARENT(tb-&gt;tb_path, 0);</div><div class='del'>-		src_bi-&gt;bi_position = PATH_H_B_ITEM_ORDER(tb-&gt;tb_path, 0);</div><div class='del'>-		dest_bi-&gt;tb = tb;</div><div class='del'>-		dest_bi-&gt;bi_bh = Snew;</div><div class='del'>-		dest_bi-&gt;bi_parent = NULL;</div><div class='del'>-		dest_bi-&gt;bi_position = 0;</div><div class='del'>-		*first_last = LAST_TO_FIRST;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		reiserfs_panic(sb_from_bi(src_bi), "vs-10250",</div><div class='del'>-			       "shift type is unknown (%d)", shift_mode);</div><div class='del'>-	}</div><div class='del'>-	RFALSE(!src_bi-&gt;bi_bh || !dest_bi-&gt;bi_bh,</div><div class='del'>-	       "vs-10260: mode==%d, source (%p) or dest (%p) buffer is initialized incorrectly",</div><div class='del'>-	       shift_mode, src_bi-&gt;bi_bh, dest_bi-&gt;bi_bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * copy mov_num items and mov_bytes of the (mov_num-1)th item to</div><div class='del'>- * neighbor. Delete them from source</div><div class='del'>- */</div><div class='del'>-int leaf_move_items(int shift_mode, struct tree_balance *tb, int mov_num,</div><div class='del'>-		    int mov_bytes, struct buffer_head *Snew)</div><div class='del'>-{</div><div class='del'>-	int ret_value;</div><div class='del'>-	struct buffer_info dest_bi, src_bi;</div><div class='del'>-	int first_last;</div><div class='del'>-</div><div class='del'>-	leaf_define_dest_src_infos(shift_mode, tb, &amp;dest_bi, &amp;src_bi,</div><div class='del'>-				   &amp;first_last, Snew);</div><div class='del'>-</div><div class='del'>-	ret_value =</div><div class='del'>-	    leaf_copy_items(&amp;dest_bi, src_bi.bi_bh, first_last, mov_num,</div><div class='del'>-			    mov_bytes);</div><div class='del'>-</div><div class='del'>-	leaf_delete_items(&amp;src_bi, first_last,</div><div class='del'>-			  (first_last ==</div><div class='del'>-			   FIRST_TO_LAST) ? 0 : (B_NR_ITEMS(src_bi.bi_bh) -</div><div class='del'>-						 mov_num), mov_num, mov_bytes);</div><div class='del'>-</div><div class='del'>-	return ret_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Shift shift_num items (and shift_bytes of last shifted item if</div><div class='del'>- * shift_bytes != -1) from S[0] to L[0] and replace the delimiting key</div><div class='del'>- */</div><div class='del'>-int leaf_shift_left(struct tree_balance *tb, int shift_num, int shift_bytes)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *S0 = PATH_PLAST_BUFFER(tb-&gt;tb_path);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * move shift_num (and shift_bytes bytes) items from S[0]</div><div class='del'>-	 * to left neighbor L[0]</div><div class='del'>-	 */</div><div class='del'>-	i = leaf_move_items(LEAF_FROM_S_TO_L, tb, shift_num, shift_bytes, NULL);</div><div class='del'>-</div><div class='del'>-	if (shift_num) {</div><div class='del'>-		/* number of items in S[0] == 0 */</div><div class='del'>-		if (B_NR_ITEMS(S0) == 0) {</div><div class='del'>-</div><div class='del'>-			RFALSE(shift_bytes != -1,</div><div class='del'>-			       "vs-10270: S0 is empty now, but shift_bytes != -1 (%d)",</div><div class='del'>-			       shift_bytes);</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-			if (tb-&gt;tb_mode == M_PASTE || tb-&gt;tb_mode == M_INSERT) {</div><div class='del'>-				print_cur_tb("vs-10275");</div><div class='del'>-				reiserfs_panic(tb-&gt;tb_sb, "vs-10275",</div><div class='del'>-					       "balance condition corrupted "</div><div class='del'>-					       "(%c)", tb-&gt;tb_mode);</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			if (PATH_H_POSITION(tb-&gt;tb_path, 1) == 0)</div><div class='del'>-				replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0],</div><div class='del'>-					    PATH_H_PPARENT(tb-&gt;tb_path, 0), 0);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			/* replace lkey in CFL[0] by 0-th key from S[0]; */</div><div class='del'>-			replace_key(tb, tb-&gt;CFL[0], tb-&gt;lkey[0], S0, 0);</div><div class='del'>-</div><div class='del'>-			RFALSE((shift_bytes != -1 &amp;&amp;</div><div class='del'>-				!(is_direntry_le_ih(item_head(S0, 0))</div><div class='del'>-				  &amp;&amp; !ih_entry_count(item_head(S0, 0)))) &amp;&amp;</div><div class='del'>-			       (!op_is_left_mergeable</div><div class='del'>-				(leaf_key(S0, 0), S0-&gt;b_size)),</div><div class='del'>-			       "vs-10280: item must be mergeable");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CLEANING STOPPED HERE */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Shift shift_num (shift_bytes) items from S[0] to the right neighbor,</div><div class='del'>- * and replace the delimiting key</div><div class='del'>- */</div><div class='del'>-int leaf_shift_right(struct tree_balance *tb, int shift_num, int shift_bytes)</div><div class='del'>-{</div><div class='del'>-	int ret_value;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * move shift_num (and shift_bytes) items from S[0] to</div><div class='del'>-	 * right neighbor R[0]</div><div class='del'>-	 */</div><div class='del'>-	ret_value =</div><div class='del'>-	    leaf_move_items(LEAF_FROM_S_TO_R, tb, shift_num, shift_bytes, NULL);</div><div class='del'>-</div><div class='del'>-	/* replace rkey in CFR[0] by the 0-th key from R[0] */</div><div class='del'>-	if (shift_num) {</div><div class='del'>-		replace_key(tb, tb-&gt;CFR[0], tb-&gt;rkey[0], tb-&gt;R[0], 0);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void leaf_delete_items_entirely(struct buffer_info *bi,</div><div class='del'>-				       int first, int del_num);</div><div class='del'>-/*</div><div class='del'>- * If del_bytes == -1, starting from position 'first' delete del_num</div><div class='del'>- * items in whole in buffer CUR.</div><div class='del'>- *   If not.</div><div class='del'>- *   If last_first == 0. Starting from position 'first' delete del_num-1</div><div class='del'>- *   items in whole. Delete part of body of the first item. Part defined by</div><div class='del'>- *   del_bytes. Don't delete first item header</div><div class='del'>- *   If last_first == 1. Starting from position 'first+1' delete del_num-1</div><div class='del'>- *   items in whole. Delete part of body of the last item . Part defined by</div><div class='del'>- *   del_bytes. Don't delete last item header.</div><div class='del'>-*/</div><div class='del'>-void leaf_delete_items(struct buffer_info *cur_bi, int last_first,</div><div class='del'>-		       int first, int del_num, int del_bytes)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int item_amount = B_NR_ITEMS(bh = cur_bi-&gt;bi_bh);</div><div class='del'>-</div><div class='del'>-	RFALSE(!bh, "10155: bh is not defined");</div><div class='del'>-	RFALSE(del_num &lt; 0, "10160: del_num can not be &lt; 0. del_num==%d",</div><div class='del'>-	       del_num);</div><div class='del'>-	RFALSE(first &lt; 0</div><div class='del'>-	       || first + del_num &gt; item_amount,</div><div class='del'>-	       "10165: invalid number of first item to be deleted (%d) or "</div><div class='del'>-	       "no so much items (%d) to delete (only %d)", first,</div><div class='del'>-	       first + del_num, item_amount);</div><div class='del'>-</div><div class='del'>-	if (del_num == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (first == 0 &amp;&amp; del_num == item_amount &amp;&amp; del_bytes == -1) {</div><div class='del'>-		make_empty_node(cur_bi);</div><div class='del'>-		do_balance_mark_leaf_dirty(cur_bi-&gt;tb, bh, 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (del_bytes == -1)</div><div class='del'>-		/* delete del_num items beginning from item in position first */</div><div class='del'>-		leaf_delete_items_entirely(cur_bi, first, del_num);</div><div class='del'>-	else {</div><div class='del'>-		if (last_first == FIRST_TO_LAST) {</div><div class='del'>-			/*</div><div class='del'>-			 * delete del_num-1 items beginning from</div><div class='del'>-			 * item in position first</div><div class='del'>-			 */</div><div class='del'>-			leaf_delete_items_entirely(cur_bi, first, del_num - 1);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * delete the part of the first item of the bh</div><div class='del'>-			 * do not delete item header</div><div class='del'>-			 */</div><div class='del'>-			leaf_cut_from_buffer(cur_bi, 0, 0, del_bytes);</div><div class='del'>-		} else {</div><div class='del'>-			struct item_head *ih;</div><div class='del'>-			int len;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * delete del_num-1 items beginning from</div><div class='del'>-			 * item in position first+1</div><div class='del'>-			 */</div><div class='del'>-			leaf_delete_items_entirely(cur_bi, first + 1,</div><div class='del'>-						   del_num - 1);</div><div class='del'>-</div><div class='del'>-			ih = item_head(bh, B_NR_ITEMS(bh) - 1);</div><div class='del'>-			if (is_direntry_le_ih(ih))</div><div class='del'>-				/* the last item is directory  */</div><div class='del'>-				/*</div><div class='del'>-				 * len = numbers of directory entries</div><div class='del'>-				 * in this item</div><div class='del'>-				 */</div><div class='del'>-				len = ih_entry_count(ih);</div><div class='del'>-			else</div><div class='del'>-				/* len = body len of item */</div><div class='del'>-				len = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * delete the part of the last item of the bh</div><div class='del'>-			 * do not delete item header</div><div class='del'>-			 */</div><div class='del'>-			leaf_cut_from_buffer(cur_bi, B_NR_ITEMS(bh) - 1,</div><div class='del'>-					     len - del_bytes, del_bytes);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* insert item into the leaf node in position before */</div><div class='del'>-void leaf_insert_into_buf(struct buffer_info *bi, int before,</div><div class='del'>-			  struct item_head * const inserted_item_ih,</div><div class='del'>-			  const char * const inserted_item_body,</div><div class='del'>-			  int zeros_number)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh = bi-&gt;bi_bh;</div><div class='del'>-	int nr, free_space;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	int i;</div><div class='del'>-	int last_loc, unmoved_loc;</div><div class='del'>-	char *to;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-	free_space = blkh_free_space(blkh);</div><div class='del'>-</div><div class='del'>-	/* check free space */</div><div class='del'>-	RFALSE(free_space &lt; ih_item_len(inserted_item_ih) + IH_SIZE,</div><div class='del'>-	       "vs-10170: not enough free space in block %z, new item %h",</div><div class='del'>-	       bh, inserted_item_ih);</div><div class='del'>-	RFALSE(zeros_number &gt; ih_item_len(inserted_item_ih),</div><div class='del'>-	       "vs-10172: zero number == %d, item length == %d",</div><div class='del'>-	       zeros_number, ih_item_len(inserted_item_ih));</div><div class='del'>-</div><div class='del'>-	/* get item new item must be inserted before */</div><div class='del'>-	ih = item_head(bh, before);</div><div class='del'>-</div><div class='del'>-	/* prepare space for the body of new item */</div><div class='del'>-	last_loc = nr ? ih_location(&amp;ih[nr - before - 1]) : bh-&gt;b_size;</div><div class='del'>-	unmoved_loc = before ? ih_location(ih - 1) : bh-&gt;b_size;</div><div class='del'>-</div><div class='del'>-	memmove(bh-&gt;b_data + last_loc - ih_item_len(inserted_item_ih),</div><div class='del'>-		bh-&gt;b_data + last_loc, unmoved_loc - last_loc);</div><div class='del'>-</div><div class='del'>-	to = bh-&gt;b_data + unmoved_loc - ih_item_len(inserted_item_ih);</div><div class='del'>-	memset(to, 0, zeros_number);</div><div class='del'>-	to += zeros_number;</div><div class='del'>-</div><div class='del'>-	/* copy body to prepared space */</div><div class='del'>-	if (inserted_item_body)</div><div class='del'>-		memmove(to, inserted_item_body,</div><div class='del'>-			ih_item_len(inserted_item_ih) - zeros_number);</div><div class='del'>-	else</div><div class='del'>-		memset(to, '\0', ih_item_len(inserted_item_ih) - zeros_number);</div><div class='del'>-</div><div class='del'>-	/* insert item header */</div><div class='del'>-	memmove(ih + 1, ih, IH_SIZE * (nr - before));</div><div class='del'>-	memmove(ih, inserted_item_ih, IH_SIZE);</div><div class='del'>-</div><div class='del'>-	/* change locations */</div><div class='del'>-	for (i = before; i &lt; nr + 1; i++) {</div><div class='del'>-		unmoved_loc -= ih_item_len(&amp;ih[i - before]);</div><div class='del'>-		put_ih_location(&amp;ih[i - before], unmoved_loc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sizes, free space, item number */</div><div class='del'>-	set_blkh_nr_item(blkh, blkh_nr_item(blkh) + 1);</div><div class='del'>-	set_blkh_free_space(blkh,</div><div class='del'>-			    free_space - (IH_SIZE +</div><div class='del'>-					  ih_item_len(inserted_item_ih)));</div><div class='del'>-	do_balance_mark_leaf_dirty(bi-&gt;tb, bh, 1);</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc;</div><div class='del'>-		t_dc = B_N_CHILD(bi-&gt;bi_parent, bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc,</div><div class='del'>-			    dc_size(t_dc) + (IH_SIZE +</div><div class='del'>-					     ih_item_len(inserted_item_ih)));</div><div class='del'>-		do_balance_mark_internal_dirty(bi-&gt;tb, bi-&gt;bi_parent, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * paste paste_size bytes to affected_item_num-th item.</div><div class='del'>- * When item is a directory, this only prepare space for new entries</div><div class='del'>- */</div><div class='del'>-void leaf_paste_in_buffer(struct buffer_info *bi, int affected_item_num,</div><div class='del'>-			  int pos_in_item, int paste_size,</div><div class='del'>-			  const char *body, int zeros_number)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh = bi-&gt;bi_bh;</div><div class='del'>-	int nr, free_space;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	int i;</div><div class='del'>-	int last_loc, unmoved_loc;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-	free_space = blkh_free_space(blkh);</div><div class='del'>-</div><div class='del'>-	/* check free space */</div><div class='del'>-	RFALSE(free_space &lt; paste_size,</div><div class='del'>-	       "vs-10175: not enough free space: needed %d, available %d",</div><div class='del'>-	       paste_size, free_space);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	if (zeros_number &gt; paste_size) {</div><div class='del'>-		struct super_block *sb = NULL;</div><div class='del'>-		if (bi &amp;&amp; bi-&gt;tb)</div><div class='del'>-			sb = bi-&gt;tb-&gt;tb_sb;</div><div class='del'>-		print_cur_tb("10177");</div><div class='del'>-		reiserfs_panic(sb, "vs-10177",</div><div class='del'>-			       "zeros_number == %d, paste_size == %d",</div><div class='del'>-			       zeros_number, paste_size);</div><div class='del'>-	}</div><div class='del'>-#endif				/* CONFIG_REISERFS_CHECK */</div><div class='del'>-</div><div class='del'>-	/* item to be appended */</div><div class='del'>-	ih = item_head(bh, affected_item_num);</div><div class='del'>-</div><div class='del'>-	last_loc = ih_location(&amp;ih[nr - affected_item_num - 1]);</div><div class='del'>-	unmoved_loc = affected_item_num ? ih_location(ih - 1) : bh-&gt;b_size;</div><div class='del'>-</div><div class='del'>-	/* prepare space */</div><div class='del'>-	memmove(bh-&gt;b_data + last_loc - paste_size, bh-&gt;b_data + last_loc,</div><div class='del'>-		unmoved_loc - last_loc);</div><div class='del'>-</div><div class='del'>-	/* change locations */</div><div class='del'>-	for (i = affected_item_num; i &lt; nr; i++)</div><div class='del'>-		put_ih_location(&amp;ih[i - affected_item_num],</div><div class='del'>-				ih_location(&amp;ih[i - affected_item_num]) -</div><div class='del'>-				paste_size);</div><div class='del'>-</div><div class='del'>-	if (body) {</div><div class='del'>-		if (!is_direntry_le_ih(ih)) {</div><div class='del'>-			if (!pos_in_item) {</div><div class='del'>-				/* shift data to right */</div><div class='del'>-				memmove(bh-&gt;b_data + ih_location(ih) +</div><div class='del'>-					paste_size,</div><div class='del'>-					bh-&gt;b_data + ih_location(ih),</div><div class='del'>-					ih_item_len(ih));</div><div class='del'>-				/* paste data in the head of item */</div><div class='del'>-				memset(bh-&gt;b_data + ih_location(ih), 0,</div><div class='del'>-				       zeros_number);</div><div class='del'>-				memcpy(bh-&gt;b_data + ih_location(ih) +</div><div class='del'>-				       zeros_number, body,</div><div class='del'>-				       paste_size - zeros_number);</div><div class='del'>-			} else {</div><div class='del'>-				memset(bh-&gt;b_data + unmoved_loc - paste_size, 0,</div><div class='del'>-				       zeros_number);</div><div class='del'>-				memcpy(bh-&gt;b_data + unmoved_loc - paste_size +</div><div class='del'>-				       zeros_number, body,</div><div class='del'>-				       paste_size - zeros_number);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		memset(bh-&gt;b_data + unmoved_loc - paste_size, '\0', paste_size);</div><div class='del'>-</div><div class='del'>-	put_ih_item_len(ih, ih_item_len(ih) + paste_size);</div><div class='del'>-</div><div class='del'>-	/* change free space */</div><div class='del'>-	set_blkh_free_space(blkh, free_space - paste_size);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_leaf_dirty(bi-&gt;tb, bh, 0);</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc =</div><div class='del'>-		    B_N_CHILD(bi-&gt;bi_parent, bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc, dc_size(t_dc) + paste_size);</div><div class='del'>-		do_balance_mark_internal_dirty(bi-&gt;tb, bi-&gt;bi_parent, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * cuts DEL_COUNT entries beginning from FROM-th entry. Directory item</div><div class='del'>- * does not have free space, so it moves DEHs and remaining records as</div><div class='del'>- * necessary. Return value is size of removed part of directory item</div><div class='del'>- * in bytes.</div><div class='del'>- */</div><div class='del'>-static int leaf_cut_entries(struct buffer_head *bh,</div><div class='del'>-			    struct item_head *ih, int from, int del_count)</div><div class='del'>-{</div><div class='del'>-	char *item;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	int prev_record_offset;	/* offset of record, that is (from-1)th */</div><div class='del'>-	char *prev_record;	/* */</div><div class='del'>-	int cut_records_len;	/* length of all removed records */</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * make sure that item is directory and there are enough entries to</div><div class='del'>-	 * remove</div><div class='del'>-	 */</div><div class='del'>-	RFALSE(!is_direntry_le_ih(ih), "10180: item is not directory item");</div><div class='del'>-	RFALSE(ih_entry_count(ih) &lt; from + del_count,</div><div class='del'>-	       "10185: item contains not enough entries: entry_count = %d, from = %d, to delete = %d",</div><div class='del'>-	       ih_entry_count(ih), from, del_count);</div><div class='del'>-</div><div class='del'>-	if (del_count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* first byte of item */</div><div class='del'>-	item = bh-&gt;b_data + ih_location(ih);</div><div class='del'>-</div><div class='del'>-	/* entry head array */</div><div class='del'>-	deh = B_I_DEH(bh, ih);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * first byte of remaining entries, those are BEFORE cut entries</div><div class='del'>-	 * (prev_record) and length of all removed records (cut_records_len)</div><div class='del'>-	 */</div><div class='del'>-	prev_record_offset =</div><div class='del'>-	    (from ? deh_location(&amp;deh[from - 1]) : ih_item_len(ih));</div><div class='del'>-	cut_records_len = prev_record_offset /*from_record */  -</div><div class='del'>-	    deh_location(&amp;deh[from + del_count - 1]);</div><div class='del'>-	prev_record = item + prev_record_offset;</div><div class='del'>-</div><div class='del'>-	/* adjust locations of remaining entries */</div><div class='del'>-	for (i = ih_entry_count(ih) - 1; i &gt; from + del_count - 1; i--)</div><div class='del'>-		put_deh_location(&amp;deh[i],</div><div class='del'>-				 deh_location(&amp;deh[i]) -</div><div class='del'>-				 (DEH_SIZE * del_count));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; from; i++)</div><div class='del'>-		put_deh_location(&amp;deh[i],</div><div class='del'>-				 deh_location(&amp;deh[i]) - (DEH_SIZE * del_count +</div><div class='del'>-							  cut_records_len));</div><div class='del'>-</div><div class='del'>-	put_ih_entry_count(ih, ih_entry_count(ih) - del_count);</div><div class='del'>-</div><div class='del'>-	/* shift entry head array and entries those are AFTER removed entries */</div><div class='del'>-	memmove((char *)(deh + from),</div><div class='del'>-		deh + from + del_count,</div><div class='del'>-		prev_record - cut_records_len - (char *)(deh + from +</div><div class='del'>-							 del_count));</div><div class='del'>-</div><div class='del'>-	/* shift records, those are BEFORE removed entries */</div><div class='del'>-	memmove(prev_record - cut_records_len - DEH_SIZE * del_count,</div><div class='del'>-		prev_record, item + ih_item_len(ih) - prev_record);</div><div class='del'>-</div><div class='del'>-	return DEH_SIZE * del_count + cut_records_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * when cut item is part of regular file</div><div class='del'>- *      pos_in_item - first byte that must be cut</div><div class='del'>- *      cut_size - number of bytes to be cut beginning from pos_in_item</div><div class='del'>- *</div><div class='del'>- * when cut item is part of directory</div><div class='del'>- *      pos_in_item - number of first deleted entry</div><div class='del'>- *      cut_size - count of deleted entries</div><div class='del'>- */</div><div class='del'>-void leaf_cut_from_buffer(struct buffer_info *bi, int cut_item_num,</div><div class='del'>-			  int pos_in_item, int cut_size)</div><div class='del'>-{</div><div class='del'>-	int nr;</div><div class='del'>-	struct buffer_head *bh = bi-&gt;bi_bh;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	int last_loc, unmoved_loc;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	/* item head of truncated item */</div><div class='del'>-	ih = item_head(bh, cut_item_num);</div><div class='del'>-</div><div class='del'>-	if (is_direntry_le_ih(ih)) {</div><div class='del'>-		/* first cut entry () */</div><div class='del'>-		cut_size = leaf_cut_entries(bh, ih, pos_in_item, cut_size);</div><div class='del'>-		if (pos_in_item == 0) {</div><div class='del'>-			/* change key */</div><div class='del'>-			RFALSE(cut_item_num,</div><div class='del'>-			       "when 0-th enrty of item is cut, that item must be first in the node, not %d-th",</div><div class='del'>-			       cut_item_num);</div><div class='del'>-			/* change item key by key of first entry in the item */</div><div class='del'>-			set_le_ih_k_offset(ih, deh_offset(B_I_DEH(bh, ih)));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* item is direct or indirect */</div><div class='del'>-		RFALSE(is_statdata_le_ih(ih), "10195: item is stat data");</div><div class='del'>-		RFALSE(pos_in_item &amp;&amp; pos_in_item + cut_size != ih_item_len(ih),</div><div class='del'>-		       "10200: invalid offset (%lu) or trunc_size (%lu) or ih_item_len (%lu)",</div><div class='del'>-		       (long unsigned)pos_in_item, (long unsigned)cut_size,</div><div class='del'>-		       (long unsigned)ih_item_len(ih));</div><div class='del'>-</div><div class='del'>-		/* shift item body to left if cut is from the head of item */</div><div class='del'>-		if (pos_in_item == 0) {</div><div class='del'>-			memmove(bh-&gt;b_data + ih_location(ih),</div><div class='del'>-				bh-&gt;b_data + ih_location(ih) + cut_size,</div><div class='del'>-				ih_item_len(ih) - cut_size);</div><div class='del'>-</div><div class='del'>-			/* change key of item */</div><div class='del'>-			if (is_direct_le_ih(ih))</div><div class='del'>-				set_le_ih_k_offset(ih,</div><div class='del'>-						   le_ih_k_offset(ih) +</div><div class='del'>-						   cut_size);</div><div class='del'>-			else {</div><div class='del'>-				set_le_ih_k_offset(ih,</div><div class='del'>-						   le_ih_k_offset(ih) +</div><div class='del'>-						   (cut_size / UNFM_P_SIZE) *</div><div class='del'>-						   bh-&gt;b_size);</div><div class='del'>-				RFALSE(ih_item_len(ih) == cut_size</div><div class='del'>-				       &amp;&amp; get_ih_free_space(ih),</div><div class='del'>-				       "10205: invalid ih_free_space (%h)", ih);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* location of the last item */</div><div class='del'>-	last_loc = ih_location(&amp;ih[nr - cut_item_num - 1]);</div><div class='del'>-</div><div class='del'>-	/* location of the item, which is remaining at the same place */</div><div class='del'>-	unmoved_loc = cut_item_num ? ih_location(ih - 1) : bh-&gt;b_size;</div><div class='del'>-</div><div class='del'>-	/* shift */</div><div class='del'>-	memmove(bh-&gt;b_data + last_loc + cut_size, bh-&gt;b_data + last_loc,</div><div class='del'>-		unmoved_loc - last_loc - cut_size);</div><div class='del'>-</div><div class='del'>-	/* change item length */</div><div class='del'>-	put_ih_item_len(ih, ih_item_len(ih) - cut_size);</div><div class='del'>-</div><div class='del'>-	if (is_indirect_le_ih(ih)) {</div><div class='del'>-		if (pos_in_item)</div><div class='del'>-			set_ih_free_space(ih, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* change locations */</div><div class='del'>-	for (i = cut_item_num; i &lt; nr; i++)</div><div class='del'>-		put_ih_location(&amp;ih[i - cut_item_num],</div><div class='del'>-				ih_location(&amp;ih[i - cut_item_num]) + cut_size);</div><div class='del'>-</div><div class='del'>-	/* size, free space */</div><div class='del'>-	set_blkh_free_space(blkh, blkh_free_space(blkh) + cut_size);</div><div class='del'>-</div><div class='del'>-	do_balance_mark_leaf_dirty(bi-&gt;tb, bh, 0);</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc;</div><div class='del'>-		t_dc = B_N_CHILD(bi-&gt;bi_parent, bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc, dc_size(t_dc) - cut_size);</div><div class='del'>-		do_balance_mark_internal_dirty(bi-&gt;tb, bi-&gt;bi_parent, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* delete del_num items from buffer starting from the first'th item */</div><div class='del'>-static void leaf_delete_items_entirely(struct buffer_info *bi,</div><div class='del'>-				       int first, int del_num)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh = bi-&gt;bi_bh;</div><div class='del'>-	int nr;</div><div class='del'>-	int i, j;</div><div class='del'>-	int last_loc, last_removed_loc;</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-</div><div class='del'>-	RFALSE(bh == NULL, "10210: buffer is 0");</div><div class='del'>-	RFALSE(del_num &lt; 0, "10215: del_num less than 0 (%d)", del_num);</div><div class='del'>-</div><div class='del'>-	if (del_num == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	RFALSE(first &lt; 0 || first + del_num &gt; nr,</div><div class='del'>-	       "10220: first=%d, number=%d, there is %d items", first, del_num,</div><div class='del'>-	       nr);</div><div class='del'>-</div><div class='del'>-	if (first == 0 &amp;&amp; del_num == nr) {</div><div class='del'>-		/* this does not work */</div><div class='del'>-		make_empty_node(bi);</div><div class='del'>-</div><div class='del'>-		do_balance_mark_leaf_dirty(bi-&gt;tb, bh, 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ih = item_head(bh, first);</div><div class='del'>-</div><div class='del'>-	/* location of unmovable item */</div><div class='del'>-	j = (first == 0) ? bh-&gt;b_size : ih_location(ih - 1);</div><div class='del'>-</div><div class='del'>-	/* delete items */</div><div class='del'>-	last_loc = ih_location(&amp;ih[nr - 1 - first]);</div><div class='del'>-	last_removed_loc = ih_location(&amp;ih[del_num - 1]);</div><div class='del'>-</div><div class='del'>-	memmove(bh-&gt;b_data + last_loc + j - last_removed_loc,</div><div class='del'>-		bh-&gt;b_data + last_loc, last_removed_loc - last_loc);</div><div class='del'>-</div><div class='del'>-	/* delete item headers */</div><div class='del'>-	memmove(ih, ih + del_num, (nr - first - del_num) * IH_SIZE);</div><div class='del'>-</div><div class='del'>-	/* change item location */</div><div class='del'>-	for (i = first; i &lt; nr - del_num; i++)</div><div class='del'>-		put_ih_location(&amp;ih[i - first],</div><div class='del'>-				ih_location(&amp;ih[i - first]) + (j -</div><div class='del'>-								 last_removed_loc));</div><div class='del'>-</div><div class='del'>-	/* sizes, item number */</div><div class='del'>-	set_blkh_nr_item(blkh, blkh_nr_item(blkh) - del_num);</div><div class='del'>-	set_blkh_free_space(blkh,</div><div class='del'>-			    blkh_free_space(blkh) + (j - last_removed_loc +</div><div class='del'>-						     IH_SIZE * del_num));</div><div class='del'>-</div><div class='del'>-	do_balance_mark_leaf_dirty(bi-&gt;tb, bh, 0);</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_parent) {</div><div class='del'>-		struct disk_child *t_dc =</div><div class='del'>-		    B_N_CHILD(bi-&gt;bi_parent, bi-&gt;bi_position);</div><div class='del'>-		put_dc_size(t_dc,</div><div class='del'>-			    dc_size(t_dc) - (j - last_removed_loc +</div><div class='del'>-					     IH_SIZE * del_num));</div><div class='del'>-		do_balance_mark_internal_dirty(bi-&gt;tb, bi-&gt;bi_parent, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * paste new_entry_count entries (new_dehs, records) into position</div><div class='del'>- * before to item_num-th item</div><div class='del'>- */</div><div class='del'>-void leaf_paste_entries(struct buffer_info *bi,</div><div class='del'>-			int item_num,</div><div class='del'>-			int before,</div><div class='del'>-			int new_entry_count,</div><div class='del'>-			struct reiserfs_de_head *new_dehs,</div><div class='del'>-			const char *records, int paste_size)</div><div class='del'>-{</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	char *item;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	char *insert_point;</div><div class='del'>-	int i;</div><div class='del'>-	struct buffer_head *bh = bi-&gt;bi_bh;</div><div class='del'>-</div><div class='del'>-	if (new_entry_count == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ih = item_head(bh, item_num);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * make sure, that item is directory, and there are enough</div><div class='del'>-	 * records in it</div><div class='del'>-	 */</div><div class='del'>-	RFALSE(!is_direntry_le_ih(ih), "10225: item is not directory item");</div><div class='del'>-	RFALSE(ih_entry_count(ih) &lt; before,</div><div class='del'>-	       "10230: there are no entry we paste entries before. entry_count = %d, before = %d",</div><div class='del'>-	       ih_entry_count(ih), before);</div><div class='del'>-</div><div class='del'>-	/* first byte of dest item */</div><div class='del'>-	item = bh-&gt;b_data + ih_location(ih);</div><div class='del'>-</div><div class='del'>-	/* entry head array */</div><div class='del'>-	deh = B_I_DEH(bh, ih);</div><div class='del'>-</div><div class='del'>-	/* new records will be pasted at this point */</div><div class='del'>-	insert_point =</div><div class='del'>-	    item +</div><div class='del'>-	    (before ? deh_location(&amp;deh[before - 1])</div><div class='del'>-	     : (ih_item_len(ih) - paste_size));</div><div class='del'>-</div><div class='del'>-	/* adjust locations of records that will be AFTER new records */</div><div class='del'>-	for (i = ih_entry_count(ih) - 1; i &gt;= before; i--)</div><div class='del'>-		put_deh_location(&amp;deh[i],</div><div class='del'>-				 deh_location(&amp;deh[i]) +</div><div class='del'>-				 (DEH_SIZE * new_entry_count));</div><div class='del'>-</div><div class='del'>-	/* adjust locations of records that will be BEFORE new records */</div><div class='del'>-	for (i = 0; i &lt; before; i++)</div><div class='del'>-		put_deh_location(&amp;deh[i],</div><div class='del'>-				 deh_location(&amp;deh[i]) + paste_size);</div><div class='del'>-</div><div class='del'>-	put_ih_entry_count(ih, ih_entry_count(ih) + new_entry_count);</div><div class='del'>-</div><div class='del'>-	/* prepare space for pasted records */</div><div class='del'>-	memmove(insert_point + paste_size, insert_point,</div><div class='del'>-		item + (ih_item_len(ih) - paste_size) - insert_point);</div><div class='del'>-</div><div class='del'>-	/* copy new records */</div><div class='del'>-	memcpy(insert_point + DEH_SIZE * new_entry_count, records,</div><div class='del'>-	       paste_size - DEH_SIZE * new_entry_count);</div><div class='del'>-</div><div class='del'>-	/* prepare space for new entry heads */</div><div class='del'>-	deh += before;</div><div class='del'>-	memmove((char *)(deh + new_entry_count), deh,</div><div class='del'>-		insert_point - (char *)deh);</div><div class='del'>-</div><div class='del'>-	/* copy new entry heads */</div><div class='del'>-	deh = (struct reiserfs_de_head *)((char *)deh);</div><div class='del'>-	memcpy(deh, new_dehs, DEH_SIZE * new_entry_count);</div><div class='del'>-</div><div class='del'>-	/* set locations of new records */</div><div class='del'>-	for (i = 0; i &lt; new_entry_count; i++) {</div><div class='del'>-		put_deh_location(&amp;deh[i],</div><div class='del'>-				 deh_location(&amp;deh[i]) +</div><div class='del'>-				 (-deh_location</div><div class='del'>-				  (&amp;new_dehs[new_entry_count - 1]) +</div><div class='del'>-				  insert_point + DEH_SIZE * new_entry_count -</div><div class='del'>-				  item));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* change item key if necessary (when we paste before 0-th entry */</div><div class='del'>-	if (!before) {</div><div class='del'>-		set_le_ih_k_offset(ih, deh_offset(new_dehs));</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	{</div><div class='del'>-		int prev, next;</div><div class='del'>-		/* check record locations */</div><div class='del'>-		deh = B_I_DEH(bh, ih);</div><div class='del'>-		for (i = 0; i &lt; ih_entry_count(ih); i++) {</div><div class='del'>-			next =</div><div class='del'>-			    (i &lt;</div><div class='del'>-			     ih_entry_count(ih) -</div><div class='del'>-			     1) ? deh_location(&amp;deh[i + 1]) : 0;</div><div class='del'>-			prev = (i != 0) ? deh_location(&amp;deh[i - 1]) : 0;</div><div class='del'>-</div><div class='del'>-			if (prev &amp;&amp; prev &lt;= deh_location(&amp;deh[i]))</div><div class='del'>-				reiserfs_error(sb_from_bi(bi), "vs-10240",</div><div class='del'>-					       "directory item (%h) "</div><div class='del'>-					       "corrupted (prev %a, "</div><div class='del'>-					       "cur(%d) %a)",</div><div class='del'>-					       ih, deh + i - 1, i, deh + i);</div><div class='del'>-			if (next &amp;&amp; next &gt;= deh_location(&amp;deh[i]))</div><div class='del'>-				reiserfs_error(sb_from_bi(bi), "vs-10250",</div><div class='del'>-					       "directory item (%h) "</div><div class='del'>-					       "corrupted (cur(%d) %a, "</div><div class='del'>-					       "next %a)",</div><div class='del'>-					       ih, i, deh + i, deh + i + 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/lock.c b/fs/reiserfs/lock.c<br/>deleted file mode 100644<br/>index 46bd7bd63a71..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/lock.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/lock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The previous reiserfs locking scheme was heavily based on</div><div class='del'>- * the tricky properties of the Bkl:</div><div class='del'>- *</div><div class='del'>- * - it was acquired recursively by a same task</div><div class='del'>- * - the performances relied on the release-while-schedule() property</div><div class='del'>- *</div><div class='del'>- * Now that we replace it by a mutex, we still want to keep the same</div><div class='del'>- * recursive property to avoid big changes in the code structure.</div><div class='del'>- * We use our own lock_owner here because the owner field on a mutex</div><div class='del'>- * is only available in SMP or mutex debugging, also we only need this field</div><div class='del'>- * for this mutex, no need for a system wide mutex facility.</div><div class='del'>- *</div><div class='del'>- * Also this lock is often released before a call that could block because</div><div class='del'>- * reiserfs performances were partially based on the release while schedule()</div><div class='del'>- * property of the Bkl.</div><div class='del'>- */</div><div class='del'>-void reiserfs_write_lock(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sb_i = REISERFS_SB(s);</div><div class='del'>-</div><div class='del'>-	if (sb_i-&gt;lock_owner != current) {</div><div class='del'>-		mutex_lock(&amp;sb_i-&gt;lock);</div><div class='del'>-		sb_i-&gt;lock_owner = current;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No need to protect it, only the current task touches it */</div><div class='del'>-	sb_i-&gt;lock_depth++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_write_unlock(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sb_i = REISERFS_SB(s);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Are we unlocking without even holding the lock?</div><div class='del'>-	 * Such a situation must raise a BUG() if we don't want</div><div class='del'>-	 * to corrupt the data.</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(sb_i-&gt;lock_owner != current);</div><div class='del'>-</div><div class='del'>-	if (--sb_i-&gt;lock_depth == -1) {</div><div class='del'>-		sb_i-&gt;lock_owner = NULL;</div><div class='del'>-		mutex_unlock(&amp;sb_i-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __must_check reiserfs_write_unlock_nested(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sb_i = REISERFS_SB(s);</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	/* this can happen when the lock isn't always held */</div><div class='del'>-	if (sb_i-&gt;lock_owner != current)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	depth = sb_i-&gt;lock_depth;</div><div class='del'>-</div><div class='del'>-	sb_i-&gt;lock_depth = -1;</div><div class='del'>-	sb_i-&gt;lock_owner = NULL;</div><div class='del'>-	mutex_unlock(&amp;sb_i-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return depth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_write_lock_nested(struct super_block *s, int depth)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sb_i = REISERFS_SB(s);</div><div class='del'>-</div><div class='del'>-	/* this can happen when the lock isn't always held */</div><div class='del'>-	if (depth == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sb_i-&gt;lock);</div><div class='del'>-	sb_i-&gt;lock_owner = current;</div><div class='del'>-	sb_i-&gt;lock_depth = depth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Utility function to force a BUG if it is called without the superblock</div><div class='del'>- * write lock held.  caller is the string printed just before calling BUG()</div><div class='del'>- */</div><div class='del'>-void reiserfs_check_lock_depth(struct super_block *sb, char *caller)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sb_i = REISERFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	WARN_ON(sb_i-&gt;lock_depth &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-void reiserfs_lock_check_recursive(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sb_i = REISERFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	WARN_ONCE((sb_i-&gt;lock_depth &gt; 0), "Unwanted recursive reiserfs lock!\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c<br/>deleted file mode 100644<br/>index 7e7b531fcc49..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/namei.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/namei.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1725 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- *</div><div class='del'>- * Trivial changes by Alan Cox to remove EHASHCOLLISION for compatibility</div><div class='del'>- *</div><div class='del'>- * Trivial Changes:</div><div class='del'>- * Rights granted to Hans Reiser to redistribute under other terms providing</div><div class='del'>- * he accepts all liability including but not limited to patent, fitness</div><div class='del'>- * for purpose, and direct or indirect claims arising from failure to perform.</div><div class='del'>- *</div><div class='del'>- * NO WARRANTY</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-</div><div class='del'>-#define INC_DIR_INODE_NLINK(i) if (i-&gt;i_nlink != 1) { inc_nlink(i); if (i-&gt;i_nlink &gt;= REISERFS_LINK_MAX) set_nlink(i, 1); }</div><div class='del'>-#define DEC_DIR_INODE_NLINK(i) if (i-&gt;i_nlink != 1) drop_nlink(i);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * directory item contains array of entry headers. This performs</div><div class='del'>- * binary search through that array</div><div class='del'>- */</div><div class='del'>-static int bin_search_in_dir_item(struct reiserfs_dir_entry *de, loff_t off)</div><div class='del'>-{</div><div class='del'>-	struct item_head *ih = de-&gt;de_ih;</div><div class='del'>-	struct reiserfs_de_head *deh = de-&gt;de_deh;</div><div class='del'>-	int rbound, lbound, j;</div><div class='del'>-</div><div class='del'>-	lbound = 0;</div><div class='del'>-	rbound = ih_entry_count(ih) - 1;</div><div class='del'>-</div><div class='del'>-	for (j = (rbound + lbound) / 2; lbound &lt;= rbound;</div><div class='del'>-	     j = (rbound + lbound) / 2) {</div><div class='del'>-		if (off &lt; deh_offset(deh + j)) {</div><div class='del'>-			rbound = j - 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (off &gt; deh_offset(deh + j)) {</div><div class='del'>-			lbound = j + 1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		/* this is not name found, but matched third key component */</div><div class='del'>-		de-&gt;de_entry_num = j;</div><div class='del'>-		return NAME_FOUND;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	de-&gt;de_entry_num = lbound;</div><div class='del'>-	return NAME_NOT_FOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * comment?  maybe something like set de to point to what the path points to?</div><div class='del'>- */</div><div class='del'>-static inline void set_de_item_location(struct reiserfs_dir_entry *de,</div><div class='del'>-					struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	de-&gt;de_bh = get_last_bh(path);</div><div class='del'>-	de-&gt;de_ih = tp_item_head(path);</div><div class='del'>-	de-&gt;de_deh = B_I_DEH(de-&gt;de_bh, de-&gt;de_ih);</div><div class='del'>-	de-&gt;de_item_num = PATH_LAST_POSITION(path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * de_bh, de_ih, de_deh (points to first element of array), de_item_num is set</div><div class='del'>- */</div><div class='del'>-inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *deh = de-&gt;de_deh + de-&gt;de_entry_num;</div><div class='del'>-</div><div class='del'>-	BUG_ON(de-&gt;de_entry_num &gt;= ih_entry_count(de-&gt;de_ih));</div><div class='del'>-</div><div class='del'>-	de-&gt;de_entrylen = entry_length(de-&gt;de_bh, de-&gt;de_ih, de-&gt;de_entry_num);</div><div class='del'>-	de-&gt;de_namelen = de-&gt;de_entrylen - (de_with_sd(deh) ? SD_SIZE : 0);</div><div class='del'>-	de-&gt;de_name = ih_item_body(de-&gt;de_bh, de-&gt;de_ih) + deh_location(deh);</div><div class='del'>-	if (de-&gt;de_name[de-&gt;de_namelen - 1] == 0)</div><div class='del'>-		de-&gt;de_namelen = strlen(de-&gt;de_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* what entry points to */</div><div class='del'>-static inline void set_de_object_key(struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(de-&gt;de_entry_num &gt;= ih_entry_count(de-&gt;de_ih));</div><div class='del'>-	de-&gt;de_dir_id = deh_dir_id(&amp;de-&gt;de_deh[de-&gt;de_entry_num]);</div><div class='del'>-	de-&gt;de_objectid = deh_objectid(&amp;de-&gt;de_deh[de-&gt;de_entry_num]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void store_de_entry_key(struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *deh = de-&gt;de_deh + de-&gt;de_entry_num;</div><div class='del'>-</div><div class='del'>-	BUG_ON(de-&gt;de_entry_num &gt;= ih_entry_count(de-&gt;de_ih));</div><div class='del'>-</div><div class='del'>-	/* store key of the found entry */</div><div class='del'>-	de-&gt;de_entry_key.version = KEY_FORMAT_3_5;</div><div class='del'>-	de-&gt;de_entry_key.on_disk_key.k_dir_id =</div><div class='del'>-	    le32_to_cpu(de-&gt;de_ih-&gt;ih_key.k_dir_id);</div><div class='del'>-	de-&gt;de_entry_key.on_disk_key.k_objectid =</div><div class='del'>-	    le32_to_cpu(de-&gt;de_ih-&gt;ih_key.k_objectid);</div><div class='del'>-	set_cpu_key_k_offset(&amp;de-&gt;de_entry_key, deh_offset(deh));</div><div class='del'>-	set_cpu_key_k_type(&amp;de-&gt;de_entry_key, TYPE_DIRENTRY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We assign a key to each directory item, and place multiple entries in a</div><div class='del'>- * single directory item.  A directory item has a key equal to the key of</div><div class='del'>- * the first directory entry in it.</div><div class='del'>-</div><div class='del'>- * This function first calls search_by_key, then, if item whose first entry</div><div class='del'>- * matches is not found it looks for the entry inside directory item found</div><div class='del'>- * by search_by_key. Fills the path to the entry, and to the entry position</div><div class='del'>- * in the item</div><div class='del'>- */</div><div class='del'>-/* The function is NOT SCHEDULE-SAFE! */</div><div class='del'>-int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,</div><div class='del'>-			struct treepath *path, struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = search_item(sb, key, path);</div><div class='del'>-	switch (retval) {</div><div class='del'>-	case ITEM_NOT_FOUND:</div><div class='del'>-		if (!PATH_LAST_POSITION(path)) {</div><div class='del'>-			reiserfs_error(sb, "vs-7000", "search_by_key "</div><div class='del'>-				       "returned item position == 0");</div><div class='del'>-			pathrelse(path);</div><div class='del'>-			return IO_ERROR;</div><div class='del'>-		}</div><div class='del'>-		PATH_LAST_POSITION(path)--;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ITEM_FOUND:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IO_ERROR:</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		pathrelse(path);</div><div class='del'>-		reiserfs_error(sb, "vs-7002", "no path to here");</div><div class='del'>-		return IO_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_de_item_location(de, path);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	if (!is_direntry_le_ih(de-&gt;de_ih) ||</div><div class='del'>-	    COMP_SHORT_KEYS(&amp;de-&gt;de_ih-&gt;ih_key, key)) {</div><div class='del'>-		print_block(de-&gt;de_bh, 0, -1, -1);</div><div class='del'>-		reiserfs_panic(sb, "vs-7005", "found item %h is not directory "</div><div class='del'>-			       "item or does not belong to the same directory "</div><div class='del'>-			       "as key %K", de-&gt;de_ih, key);</div><div class='del'>-	}</div><div class='del'>-#endif				/* CONFIG_REISERFS_CHECK */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * binary search in directory item by third component of the</div><div class='del'>-	 * key. sets de-&gt;de_entry_num of de</div><div class='del'>-	 */</div><div class='del'>-	retval = bin_search_in_dir_item(de, cpu_key_k_offset(key));</div><div class='del'>-	path-&gt;pos_in_item = de-&gt;de_entry_num;</div><div class='del'>-	if (retval != NAME_NOT_FOUND) {</div><div class='del'>-		/*</div><div class='del'>-		 * ugly, but rename needs de_bh, de_deh, de_name,</div><div class='del'>-		 * de_namelen, de_objectid set</div><div class='del'>-		 */</div><div class='del'>-		set_de_name_and_namelen(de);</div><div class='del'>-		set_de_object_key(de);</div><div class='del'>-	}</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Keyed 32-bit hash function using TEA in a Davis-Meyer function */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The third component is hashed, and you can choose from more than</div><div class='del'>- * one hash function.  Per directory hashes are not yet implemented</div><div class='del'>- * but are thought about. This function should be moved to hashes.c</div><div class='del'>- * Jedi, please do so.  -Hans</div><div class='del'>- */</div><div class='del'>-static __u32 get_third_component(struct super_block *s,</div><div class='del'>-				 const char *name, int len)</div><div class='del'>-{</div><div class='del'>-	__u32 res;</div><div class='del'>-</div><div class='del'>-	if (!len || (len == 1 &amp;&amp; name[0] == '.'))</div><div class='del'>-		return DOT_OFFSET;</div><div class='del'>-	if (len == 2 &amp;&amp; name[0] == '.' &amp;&amp; name[1] == '.')</div><div class='del'>-		return DOT_DOT_OFFSET;</div><div class='del'>-</div><div class='del'>-	res = REISERFS_SB(s)-&gt;s_hash_function(name, len);</div><div class='del'>-</div><div class='del'>-	/* take bits from 7-th to 30-th including both bounds */</div><div class='del'>-	res = GET_HASH_VALUE(res);</div><div class='del'>-	if (res == 0)</div><div class='del'>-		/*</div><div class='del'>-		 * needed to have no names before "." and ".." those have hash</div><div class='del'>-		 * value == 0 and generation conters 1 and 2 accordingly</div><div class='del'>-		 */</div><div class='del'>-		res = 128;</div><div class='del'>-	return res + MAX_GENERATION_NUMBER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_match(struct reiserfs_dir_entry *de,</div><div class='del'>-			  const char *name, int namelen)</div><div class='del'>-{</div><div class='del'>-	int retval = NAME_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	if ((namelen == de-&gt;de_namelen) &amp;&amp;</div><div class='del'>-	    !memcmp(de-&gt;de_name, name, de-&gt;de_namelen))</div><div class='del'>-		retval =</div><div class='del'>-		    (de_visible(de-&gt;de_deh + de-&gt;de_entry_num) ? NAME_FOUND :</div><div class='del'>-		     NAME_FOUND_INVISIBLE);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* de's de_bh, de_ih, de_deh, de_item_num, de_entry_num are set already */</div><div class='del'>-</div><div class='del'>-/* used when hash collisions exist */</div><div class='del'>-</div><div class='del'>-static int linear_search_in_dir_item(struct cpu_key *key,</div><div class='del'>-				     struct reiserfs_dir_entry *de,</div><div class='del'>-				     const char *name, int namelen)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *deh = de-&gt;de_deh;</div><div class='del'>-	int retval;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	i = de-&gt;de_entry_num;</div><div class='del'>-</div><div class='del'>-	if (i == ih_entry_count(de-&gt;de_ih) ||</div><div class='del'>-	    GET_HASH_VALUE(deh_offset(deh + i)) !=</div><div class='del'>-	    GET_HASH_VALUE(cpu_key_k_offset(key))) {</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(de-&gt;de_deh != B_I_DEH(de-&gt;de_bh, de-&gt;de_ih),</div><div class='del'>-	       "vs-7010: array of entry headers not found");</div><div class='del'>-</div><div class='del'>-	deh += i;</div><div class='del'>-</div><div class='del'>-	for (; i &gt;= 0; i--, deh--) {</div><div class='del'>-		/* hash value does not match, no need to check whole name */</div><div class='del'>-		if (GET_HASH_VALUE(deh_offset(deh)) !=</div><div class='del'>-		    GET_HASH_VALUE(cpu_key_k_offset(key))) {</div><div class='del'>-			return NAME_NOT_FOUND;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* mark that this generation number is used */</div><div class='del'>-		if (de-&gt;de_gen_number_bit_string)</div><div class='del'>-			set_bit(GET_GENERATION_NUMBER(deh_offset(deh)),</div><div class='del'>-				de-&gt;de_gen_number_bit_string);</div><div class='del'>-</div><div class='del'>-		/* calculate pointer to name and namelen */</div><div class='del'>-		de-&gt;de_entry_num = i;</div><div class='del'>-		set_de_name_and_namelen(de);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * de's de_name, de_namelen, de_recordlen are set.</div><div class='del'>-		 * Fill the rest.</div><div class='del'>-		 */</div><div class='del'>-		if ((retval =</div><div class='del'>-		     reiserfs_match(de, name, namelen)) != NAME_NOT_FOUND) {</div><div class='del'>-</div><div class='del'>-			/* key of pointed object */</div><div class='del'>-			set_de_object_key(de);</div><div class='del'>-</div><div class='del'>-			store_de_entry_key(de);</div><div class='del'>-</div><div class='del'>-			/* retval can be NAME_FOUND or NAME_FOUND_INVISIBLE */</div><div class='del'>-			return retval;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GET_GENERATION_NUMBER(le_ih_k_offset(de-&gt;de_ih)) == 0)</div><div class='del'>-		/*</div><div class='del'>-		 * we have reached left most entry in the node. In common we</div><div class='del'>-		 * have to go to the left neighbor, but if generation counter</div><div class='del'>-		 * is 0 already, we know for sure, that there is no name with</div><div class='del'>-		 * the same hash value</div><div class='del'>-		 */</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: this work correctly only because hash value can not</div><div class='del'>-		 *  be 0. Btw, in case of Yura's hash it is probably possible,</div><div class='del'>-		 * so, this is a bug</div><div class='del'>-		 */</div><div class='del'>-		return NAME_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	RFALSE(de-&gt;de_item_num,</div><div class='del'>-	       "vs-7015: two diritems of the same directory in one node?");</div><div class='del'>-</div><div class='del'>-	return GOTO_PREVIOUS_ITEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * may return NAME_FOUND, NAME_FOUND_INVISIBLE, NAME_NOT_FOUND</div><div class='del'>- * FIXME: should add something like IOERROR</div><div class='del'>- */</div><div class='del'>-static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen,</div><div class='del'>-			       struct treepath *path_to_entry,</div><div class='del'>-			       struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	struct cpu_key key_to_search;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (namelen &gt; REISERFS_MAX_NAME(dir-&gt;i_sb-&gt;s_blocksize))</div><div class='del'>-		return NAME_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/* we will search for this key in the tree */</div><div class='del'>-	make_cpu_key(&amp;key_to_search, dir,</div><div class='del'>-		     get_third_component(dir-&gt;i_sb, name, namelen),</div><div class='del'>-		     TYPE_DIRENTRY, 3);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		retval =</div><div class='del'>-		    search_by_entry_key(dir-&gt;i_sb, &amp;key_to_search,</div><div class='del'>-					path_to_entry, de);</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			reiserfs_error(dir-&gt;i_sb, "zam-7001", "io error");</div><div class='del'>-			return IO_ERROR;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* compare names for all entries having given hash value */</div><div class='del'>-		retval =</div><div class='del'>-		    linear_search_in_dir_item(&amp;key_to_search, de, name,</div><div class='del'>-					      namelen);</div><div class='del'>-		/*</div><div class='del'>-		 * there is no need to scan directory anymore.</div><div class='del'>-		 * Given entry found or does not exist</div><div class='del'>-		 */</div><div class='del'>-		if (retval != GOTO_PREVIOUS_ITEM) {</div><div class='del'>-			path_to_entry-&gt;pos_in_item = de-&gt;de_entry_num;</div><div class='del'>-			return retval;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * there is left neighboring item of this directory</div><div class='del'>-		 * and given entry can be there</div><div class='del'>-		 */</div><div class='del'>-		set_cpu_key_k_offset(&amp;key_to_search,</div><div class='del'>-				     le_ih_k_offset(de-&gt;de_ih) - 1);</div><div class='del'>-		pathrelse(path_to_entry);</div><div class='del'>-</div><div class='del'>-	}			/* while (1) */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='del'>-				      unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	INITIALIZE_PATH(path_to_entry);</div><div class='del'>-</div><div class='del'>-	if (REISERFS_MAX_NAME(dir-&gt;i_sb-&gt;s_blocksize) &lt; dentry-&gt;d_name.len)</div><div class='del'>-		return ERR_PTR(-ENAMETOOLONG);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	de.de_gen_number_bit_string = NULL;</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_find_entry(dir, dentry-&gt;d_name.name, dentry-&gt;d_name.len,</div><div class='del'>-				&amp;path_to_entry, &amp;de);</div><div class='del'>-	pathrelse(&amp;path_to_entry);</div><div class='del'>-	if (retval == NAME_FOUND) {</div><div class='del'>-		inode = reiserfs_iget(dir-&gt;i_sb,</div><div class='del'>-				      (struct cpu_key *)&amp;de.de_dir_id);</div><div class='del'>-		if (!inode || IS_ERR(inode)) {</div><div class='del'>-			reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-			return ERR_PTR(-EACCES);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Propagate the private flag so we know we're</div><div class='del'>-		 * in the priv tree.  Also clear xattr support</div><div class='del'>-		 * since we don't have xattrs on xattr files.</div><div class='del'>-		 */</div><div class='del'>-		if (IS_PRIVATE(dir))</div><div class='del'>-			reiserfs_init_priv_inode(inode);</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		return ERR_PTR(-EIO);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return d_splice_alias(inode, dentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * looks up the dentry of the parent directory for child.</div><div class='del'>- * taken from ext2_get_parent</div><div class='del'>- */</div><div class='del'>-struct dentry *reiserfs_get_parent(struct dentry *child)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode = NULL;</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	INITIALIZE_PATH(path_to_entry);</div><div class='del'>-	struct inode *dir = d_inode(child);</div><div class='del'>-</div><div class='del'>-	if (dir-&gt;i_nlink == 0) {</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-	}</div><div class='del'>-	de.de_gen_number_bit_string = NULL;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-	retval = reiserfs_find_entry(dir, "..", 2, &amp;path_to_entry, &amp;de);</div><div class='del'>-	pathrelse(&amp;path_to_entry);</div><div class='del'>-	if (retval != NAME_FOUND) {</div><div class='del'>-		reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-	}</div><div class='del'>-	inode = reiserfs_iget(dir-&gt;i_sb, (struct cpu_key *)&amp;de.de_dir_id);</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	return d_obtain_alias(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add entry to the directory (entry can be hidden).</div><div class='del'>-</div><div class='del'>-insert definition of when hidden directories are used here -Hans</div><div class='del'>-</div><div class='del'>- Does not mark dir   inode dirty, do it after successesfull call to it */</div><div class='del'>-</div><div class='del'>-static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,</div><div class='del'>-			      struct inode *dir, const char *name, int namelen,</div><div class='del'>-			      struct inode *inode, int visible)</div><div class='del'>-{</div><div class='del'>-	struct cpu_key entry_key;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	DECLARE_BITMAP(bit_string, MAX_GENERATION_NUMBER + 1);</div><div class='del'>-	int gen_number;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 48 bytes now and we avoid kmalloc if we</div><div class='del'>-	 * create file with short name</div><div class='del'>-	 */</div><div class='del'>-	char small_buf[32 + DEH_SIZE];</div><div class='del'>-</div><div class='del'>-	char *buffer;</div><div class='del'>-	int buflen, paste_size;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	/* each entry has unique key. compose it */</div><div class='del'>-	make_cpu_key(&amp;entry_key, dir,</div><div class='del'>-		     get_third_component(dir-&gt;i_sb, name, namelen),</div><div class='del'>-		     TYPE_DIRENTRY, 3);</div><div class='del'>-</div><div class='del'>-	/* get memory for composing the entry */</div><div class='del'>-	buflen = DEH_SIZE + ROUND_UP(namelen);</div><div class='del'>-	if (buflen &gt; sizeof(small_buf)) {</div><div class='del'>-		buffer = kmalloc(buflen, GFP_NOFS);</div><div class='del'>-		if (!buffer)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	} else</div><div class='del'>-		buffer = small_buf;</div><div class='del'>-</div><div class='del'>-	paste_size =</div><div class='del'>-	    (get_inode_sd_version(dir) ==</div><div class='del'>-	     STAT_DATA_V1) ? (DEH_SIZE + namelen) : buflen;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * fill buffer : directory entry head, name[, dir objectid | ,</div><div class='del'>-	 * stat data | ,stat data, dir objectid ]</div><div class='del'>-	 */</div><div class='del'>-	deh = (struct reiserfs_de_head *)buffer;</div><div class='del'>-	deh-&gt;deh_location = 0;	/* JDM Endian safe if 0 */</div><div class='del'>-	put_deh_offset(deh, cpu_key_k_offset(&amp;entry_key));</div><div class='del'>-	deh-&gt;deh_state = 0;	/* JDM Endian safe if 0 */</div><div class='del'>-	/* put key (ino analog) to de */</div><div class='del'>-</div><div class='del'>-	/* safe: k_dir_id is le */</div><div class='del'>-	deh-&gt;deh_dir_id = INODE_PKEY(inode)-&gt;k_dir_id;</div><div class='del'>-	/* safe: k_objectid is le */</div><div class='del'>-	deh-&gt;deh_objectid = INODE_PKEY(inode)-&gt;k_objectid;</div><div class='del'>-</div><div class='del'>-	/* copy name */</div><div class='del'>-	memcpy((char *)(deh + 1), name, namelen);</div><div class='del'>-	/* padd by 0s to the 4 byte boundary */</div><div class='del'>-	padd_item((char *)(deh + 1), ROUND_UP(namelen), namelen);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * entry is ready to be pasted into tree, set 'visibility'</div><div class='del'>-	 * and 'stat data in entry' attributes</div><div class='del'>-	 */</div><div class='del'>-	mark_de_without_sd(deh);</div><div class='del'>-	visible ? mark_de_visible(deh) : mark_de_hidden(deh);</div><div class='del'>-</div><div class='del'>-	/* find the proper place for the new entry */</div><div class='del'>-	memset(bit_string, 0, sizeof(bit_string));</div><div class='del'>-	de.de_gen_number_bit_string = bit_string;</div><div class='del'>-	retval = reiserfs_find_entry(dir, name, namelen, &amp;path, &amp;de);</div><div class='del'>-	if (retval != NAME_NOT_FOUND) {</div><div class='del'>-		if (buffer != small_buf)</div><div class='del'>-			kfree(buffer);</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (retval != NAME_FOUND) {</div><div class='del'>-			reiserfs_error(dir-&gt;i_sb, "zam-7002",</div><div class='del'>-				       "reiserfs_find_entry() returned "</div><div class='del'>-				       "unexpected value (%d)", retval);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gen_number =</div><div class='del'>-	    find_first_zero_bit(bit_string,</div><div class='del'>-				MAX_GENERATION_NUMBER + 1);</div><div class='del'>-	if (gen_number &gt; MAX_GENERATION_NUMBER) {</div><div class='del'>-		/* there is no free generation number */</div><div class='del'>-		reiserfs_warning(dir-&gt;i_sb, "reiserfs-7010",</div><div class='del'>-				 "Congratulations! we have got hash function "</div><div class='del'>-				 "screwed up");</div><div class='del'>-		if (buffer != small_buf)</div><div class='del'>-			kfree(buffer);</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	/* adjust offset of directory enrty */</div><div class='del'>-	put_deh_offset(deh, SET_GENERATION_NUMBER(deh_offset(deh), gen_number));</div><div class='del'>-	set_cpu_key_k_offset(&amp;entry_key, deh_offset(deh));</div><div class='del'>-</div><div class='del'>-	/* update max-hash-collisions counter in reiserfs_sb_info */</div><div class='del'>-	PROC_INFO_MAX(th-&gt;t_super, max_hash_collisions, gen_number);</div><div class='del'>-</div><div class='del'>-	/* we need to re-search for the insertion point */</div><div class='del'>-	if (gen_number != 0) {</div><div class='del'>-		if (search_by_entry_key(dir-&gt;i_sb, &amp;entry_key, &amp;path, &amp;de) !=</div><div class='del'>-		    NAME_NOT_FOUND) {</div><div class='del'>-			reiserfs_warning(dir-&gt;i_sb, "vs-7032",</div><div class='del'>-					 "entry with this key (%K) already "</div><div class='del'>-					 "exists", &amp;entry_key);</div><div class='del'>-</div><div class='del'>-			if (buffer != small_buf)</div><div class='del'>-				kfree(buffer);</div><div class='del'>-			pathrelse(&amp;path);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* perform the insertion of the entry that we have prepared */</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_paste_into_item(th, &amp;path, &amp;entry_key, dir, buffer,</div><div class='del'>-				     paste_size);</div><div class='del'>-	if (buffer != small_buf)</div><div class='del'>-		kfree(buffer);</div><div class='del'>-	if (retval) {</div><div class='del'>-		reiserfs_check_path(&amp;path);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dir-&gt;i_size += paste_size;</div><div class='del'>-	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='del'>-	if (!S_ISDIR(inode-&gt;i_mode) &amp;&amp; visible)</div><div class='del'>-		/* reiserfs_mkdir or reiserfs_rename will do that by itself */</div><div class='del'>-		reiserfs_update_sd(th, dir);</div><div class='del'>-</div><div class='del'>-	reiserfs_check_path(&amp;path);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * quota utility function, call if you've had to abort after calling</div><div class='del'>- * new_inode_init, and have not called reiserfs_new_inode yet.</div><div class='del'>- * This should only be called on inodes that do not have stat data</div><div class='del'>- * inserted into the tree yet.</div><div class='del'>- */</div><div class='del'>-static int drop_new_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	dquot_drop(inode);</div><div class='del'>-	make_bad_inode(inode);</div><div class='del'>-	inode-&gt;i_flags |= S_NOQUOTA;</div><div class='del'>-	iput(inode);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * utility function that does setup for reiserfs_new_inode.</div><div class='del'>- * dquot_initialize needs lots of credits so it's better to have it</div><div class='del'>- * outside of a transaction, so we had to pull some bits of</div><div class='del'>- * reiserfs_new_inode out into this func.</div><div class='del'>- */</div><div class='del'>-static int new_inode_init(struct inode *inode, struct inode *dir, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Make inode invalid - just in case we are going to drop it before</div><div class='del'>-	 * the initialization happens</div><div class='del'>-	 */</div><div class='del'>-	INODE_PKEY(inode)-&gt;k_objectid = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the quota init calls have to know who to charge the quota to, so</div><div class='del'>-	 * we have to set uid and gid here</div><div class='del'>-	 */</div><div class='del'>-	inode_init_owner(&amp;nop_mnt_idmap, inode, dir, mode);</div><div class='del'>-	return dquot_initialize(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_create(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			   struct dentry *dentry, umode_t mode, bool excl)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	/*</div><div class='del'>-	 * We need blocks for transaction + (user+group)*(quotas</div><div class='del'>-	 * for new inode + update of quota for directory owner)</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 2 +</div><div class='del'>-	    2 * (REISERFS_QUOTA_INIT_BLOCKS(dir-&gt;i_sb) +</div><div class='del'>-		 REISERFS_QUOTA_TRANS_BLOCKS(dir-&gt;i_sb));</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct reiserfs_security_handle security;</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	if (!(inode = new_inode(dir-&gt;i_sb))) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	retval = new_inode_init(inode, dir, mode);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jbegin_count += reiserfs_cache_default_acl(dir);</div><div class='del'>-	retval = reiserfs_security_init(dir, inode, &amp;dentry-&gt;d_name, &amp;security);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	jbegin_count += retval;</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	retval = journal_begin(&amp;th, dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_new_inode(&amp;th, dir, mode, NULL, 0 /*i_size */ , dentry,</div><div class='del'>-			       inode, &amp;security);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out_failed;</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_op = &amp;reiserfs_file_inode_operations;</div><div class='del'>-	inode-&gt;i_fop = &amp;reiserfs_file_operations;</div><div class='del'>-	inode-&gt;i_mapping-&gt;a_ops = &amp;reiserfs_address_space_operations;</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_add_entry(&amp;th, dir, dentry-&gt;d_name.name,</div><div class='del'>-			       dentry-&gt;d_name.len, inode, 1 /*visible */ );</div><div class='del'>-	if (retval) {</div><div class='del'>-		int err;</div><div class='del'>-		drop_nlink(inode);</div><div class='del'>-		reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-		err = journal_end(&amp;th);</div><div class='del'>-		if (err)</div><div class='del'>-			retval = err;</div><div class='del'>-		unlock_new_inode(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(dir);</div><div class='del'>-</div><div class='del'>-	d_instantiate_new(dentry, inode);</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-</div><div class='del'>-out_failed:</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	reiserfs_security_free(&amp;security);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_mknod(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			  struct dentry *dentry, umode_t mode, dev_t rdev)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct reiserfs_security_handle security;</div><div class='del'>-	/*</div><div class='del'>-	 * We need blocks for transaction + (user+group)*(quotas</div><div class='del'>-	 * for new inode + update of quota for directory owner)</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 3 +</div><div class='del'>-	    2 * (REISERFS_QUOTA_INIT_BLOCKS(dir-&gt;i_sb) +</div><div class='del'>-		 REISERFS_QUOTA_TRANS_BLOCKS(dir-&gt;i_sb));</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	if (!(inode = new_inode(dir-&gt;i_sb))) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	retval = new_inode_init(inode, dir, mode);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jbegin_count += reiserfs_cache_default_acl(dir);</div><div class='del'>-	retval = reiserfs_security_init(dir, inode, &amp;dentry-&gt;d_name, &amp;security);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	jbegin_count += retval;</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	retval = journal_begin(&amp;th, dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_new_inode(&amp;th, dir, mode, NULL, 0 /*i_size */ , dentry,</div><div class='del'>-			       inode, &amp;security);</div><div class='del'>-	if (retval) {</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_op = &amp;reiserfs_special_inode_operations;</div><div class='del'>-	init_special_inode(inode, inode-&gt;i_mode, rdev);</div><div class='del'>-</div><div class='del'>-	/* FIXME: needed for block and char devices only */</div><div class='del'>-	reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(dir);</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_add_entry(&amp;th, dir, dentry-&gt;d_name.name,</div><div class='del'>-			       dentry-&gt;d_name.len, inode, 1 /*visible */ );</div><div class='del'>-	if (retval) {</div><div class='del'>-		int err;</div><div class='del'>-		drop_nlink(inode);</div><div class='del'>-		reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-		err = journal_end(&amp;th);</div><div class='del'>-		if (err)</div><div class='del'>-			retval = err;</div><div class='del'>-		unlock_new_inode(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d_instantiate_new(dentry, inode);</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-</div><div class='del'>-out_failed:</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	reiserfs_security_free(&amp;security);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,</div><div class='del'>-			  struct dentry *dentry, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct reiserfs_security_handle security;</div><div class='del'>-	/*</div><div class='del'>-	 * We need blocks for transaction + (user+group)*(quotas</div><div class='del'>-	 * for new inode + update of quota for directory owner)</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 3 +</div><div class='del'>-	    2 * (REISERFS_QUOTA_INIT_BLOCKS(dir-&gt;i_sb) +</div><div class='del'>-		 REISERFS_QUOTA_TRANS_BLOCKS(dir-&gt;i_sb));</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	/*</div><div class='del'>-	 * set flag that new packing locality created and new blocks</div><div class='del'>-	 * for the content of that directory are not displaced yet</div><div class='del'>-	 */</div><div class='del'>-	REISERFS_I(dir)-&gt;new_packing_locality = 1;</div><div class='del'>-#endif</div><div class='del'>-	mode = S_IFDIR | mode;</div><div class='del'>-	if (!(inode = new_inode(dir-&gt;i_sb))) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	retval = new_inode_init(inode, dir, mode);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jbegin_count += reiserfs_cache_default_acl(dir);</div><div class='del'>-	retval = reiserfs_security_init(dir, inode, &amp;dentry-&gt;d_name, &amp;security);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	jbegin_count += retval;</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	retval = journal_begin(&amp;th, dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * inc the link count now, so another writer doesn't overflow</div><div class='del'>-	 * it while we sleep later on.</div><div class='del'>-	 */</div><div class='del'>-	INC_DIR_INODE_NLINK(dir)</div><div class='del'>-</div><div class='del'>-	retval = reiserfs_new_inode(&amp;th, dir, mode, NULL /*symlink */,</div><div class='del'>-				    old_format_only(dir-&gt;i_sb) ?</div><div class='del'>-				    EMPTY_DIR_SIZE_V1 : EMPTY_DIR_SIZE,</div><div class='del'>-				    dentry, inode, &amp;security);</div><div class='del'>-	if (retval) {</div><div class='del'>-		DEC_DIR_INODE_NLINK(dir)</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(dir);</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_op = &amp;reiserfs_dir_inode_operations;</div><div class='del'>-	inode-&gt;i_fop = &amp;reiserfs_dir_operations;</div><div class='del'>-</div><div class='del'>-	/* note, _this_ add_entry will not update dir's stat data */</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_add_entry(&amp;th, dir, dentry-&gt;d_name.name,</div><div class='del'>-			       dentry-&gt;d_name.len, inode, 1 /*visible */ );</div><div class='del'>-	if (retval) {</div><div class='del'>-		int err;</div><div class='del'>-		clear_nlink(inode);</div><div class='del'>-		DEC_DIR_INODE_NLINK(dir);</div><div class='del'>-		reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-		err = journal_end(&amp;th);</div><div class='del'>-		if (err)</div><div class='del'>-			retval = err;</div><div class='del'>-		unlock_new_inode(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-	/* the above add_entry did not update dir's stat data */</div><div class='del'>-	reiserfs_update_sd(&amp;th, dir);</div><div class='del'>-</div><div class='del'>-	d_instantiate_new(dentry, inode);</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-out_failed:</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	reiserfs_security_free(&amp;security);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_empty_dir(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * we can cheat because an old format dir cannot have</div><div class='del'>-	 * EMPTY_DIR_SIZE, and a new format dir cannot have</div><div class='del'>-	 * EMPTY_DIR_SIZE_V1.  So, if the inode is either size,</div><div class='del'>-	 * regardless of disk format version, the directory is empty.</div><div class='del'>-	 */</div><div class='del'>-	if (inode-&gt;i_size != EMPTY_DIR_SIZE &amp;&amp;</div><div class='del'>-	    inode-&gt;i_size != EMPTY_DIR_SIZE_V1) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int retval, err;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int jbegin_count;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we will be doing 2 balancings and update 2 stat data, we</div><div class='del'>-	 * change quotas of the owner of the directory and of the owner</div><div class='del'>-	 * of the parent directory.  The quota structure is possibly</div><div class='del'>-	 * deleted only on last iput =&gt; outside of this transaction</div><div class='del'>-	 */</div><div class='del'>-	jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 2 + 2 +</div><div class='del'>-	    4 * REISERFS_QUOTA_TRANS_BLOCKS(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-	retval = journal_begin(&amp;th, dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out_rmdir;</div><div class='del'>-</div><div class='del'>-	de.de_gen_number_bit_string = NULL;</div><div class='del'>-	if ((retval =</div><div class='del'>-	     reiserfs_find_entry(dir, dentry-&gt;d_name.name, dentry-&gt;d_name.len,</div><div class='del'>-				 &amp;path, &amp;de)) == NAME_NOT_FOUND) {</div><div class='del'>-		retval = -ENOENT;</div><div class='del'>-		goto end_rmdir;</div><div class='del'>-	} else if (retval == IO_ERROR) {</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto end_rmdir;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode = d_inode(dentry);</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(dir);</div><div class='del'>-</div><div class='del'>-	if (de.de_objectid != inode-&gt;i_ino) {</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: compare key of an object and a key found in the entry</div><div class='del'>-		 */</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto end_rmdir;</div><div class='del'>-	}</div><div class='del'>-	if (!reiserfs_empty_dir(inode)) {</div><div class='del'>-		retval = -ENOTEMPTY;</div><div class='del'>-		goto end_rmdir;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* cut entry from dir directory */</div><div class='del'>-	retval = reiserfs_cut_from_item(&amp;th, &amp;path, &amp;de.de_entry_key,</div><div class='del'>-					dir, NULL,	/* page */</div><div class='del'>-					0 /*new file size - not used here */ );</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto end_rmdir;</div><div class='del'>-</div><div class='del'>-	if (inode-&gt;i_nlink != 2 &amp;&amp; inode-&gt;i_nlink != 1)</div><div class='del'>-		reiserfs_error(inode-&gt;i_sb, "reiserfs-7040",</div><div class='del'>-			       "empty directory has nlink != 2 (%d)",</div><div class='del'>-			       inode-&gt;i_nlink);</div><div class='del'>-</div><div class='del'>-	clear_nlink(inode);</div><div class='del'>-	inode_set_mtime_to_ts(dir,</div><div class='del'>-			      inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode)));</div><div class='del'>-	reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-</div><div class='del'>-	DEC_DIR_INODE_NLINK(dir)</div><div class='del'>-	dir-&gt;i_size -= (DEH_SIZE + de.de_entrylen);</div><div class='del'>-	reiserfs_update_sd(&amp;th, dir);</div><div class='del'>-</div><div class='del'>-	/* prevent empty directory from getting lost */</div><div class='del'>-	add_save_link(&amp;th, inode, 0 /* not truncate */ );</div><div class='del'>-</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-	reiserfs_check_path(&amp;path);</div><div class='del'>-out_rmdir:</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-end_rmdir:</div><div class='del'>-	/*</div><div class='del'>-	 * we must release path, because we did not call</div><div class='del'>-	 * reiserfs_cut_from_item, or reiserfs_cut_from_item does not</div><div class='del'>-	 * release path if operation was not complete</div><div class='del'>-	 */</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	return err ? err : retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int retval, err;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int jbegin_count;</div><div class='del'>-	unsigned long savelink;</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	inode = d_inode(dentry);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * in this transaction we can be doing at max two balancings and</div><div class='del'>-	 * update two stat datas, we change quotas of the owner of the</div><div class='del'>-	 * directory and of the owner of the parent directory. The quota</div><div class='del'>-	 * structure is possibly deleted only on iput =&gt; outside of</div><div class='del'>-	 * this transaction</div><div class='del'>-	 */</div><div class='del'>-	jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 2 + 2 +</div><div class='del'>-	    4 * REISERFS_QUOTA_TRANS_BLOCKS(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-	retval = journal_begin(&amp;th, dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out_unlink;</div><div class='del'>-</div><div class='del'>-	de.de_gen_number_bit_string = NULL;</div><div class='del'>-	if ((retval =</div><div class='del'>-	     reiserfs_find_entry(dir, dentry-&gt;d_name.name, dentry-&gt;d_name.len,</div><div class='del'>-				 &amp;path, &amp;de)) == NAME_NOT_FOUND) {</div><div class='del'>-		retval = -ENOENT;</div><div class='del'>-		goto end_unlink;</div><div class='del'>-	} else if (retval == IO_ERROR) {</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto end_unlink;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(dir);</div><div class='del'>-</div><div class='del'>-	if (de.de_objectid != inode-&gt;i_ino) {</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: compare key of an object and a key found in the entry</div><div class='del'>-		 */</div><div class='del'>-		retval = -EIO;</div><div class='del'>-		goto end_unlink;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!inode-&gt;i_nlink) {</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "reiserfs-7042",</div><div class='del'>-				 "deleting nonexistent file (%lu), %d",</div><div class='del'>-				 inode-&gt;i_ino, inode-&gt;i_nlink);</div><div class='del'>-		set_nlink(inode, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	drop_nlink(inode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we schedule before doing the add_save_link call, save the link</div><div class='del'>-	 * count so we don't race</div><div class='del'>-	 */</div><div class='del'>-	savelink = inode-&gt;i_nlink;</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_cut_from_item(&amp;th, &amp;path, &amp;de.de_entry_key, dir, NULL,</div><div class='del'>-				   0);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		inc_nlink(inode);</div><div class='del'>-		goto end_unlink;</div><div class='del'>-	}</div><div class='del'>-	inode_set_ctime_current(inode);</div><div class='del'>-	reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-</div><div class='del'>-	dir-&gt;i_size -= (de.de_entrylen + DEH_SIZE);</div><div class='del'>-	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));</div><div class='del'>-	reiserfs_update_sd(&amp;th, dir);</div><div class='del'>-</div><div class='del'>-	if (!savelink)</div><div class='del'>-		/* prevent file from getting lost */</div><div class='del'>-		add_save_link(&amp;th, inode, 0 /* not truncate */ );</div><div class='del'>-</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-	reiserfs_check_path(&amp;path);</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-end_unlink:</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	reiserfs_check_path(&amp;path);</div><div class='del'>-	if (err)</div><div class='del'>-		retval = err;</div><div class='del'>-out_unlink:</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_symlink(struct mnt_idmap *idmap,</div><div class='del'>-			    struct inode *parent_dir, struct dentry *dentry,</div><div class='del'>-			    const char *symname)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	char *name;</div><div class='del'>-	int item_len;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct reiserfs_security_handle security;</div><div class='del'>-	int mode = S_IFLNK | S_IRWXUGO;</div><div class='del'>-	/*</div><div class='del'>-	 * We need blocks for transaction + (user+group)*(quotas for</div><div class='del'>-	 * new inode + update of quota for directory owner)</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 3 +</div><div class='del'>-	    2 * (REISERFS_QUOTA_INIT_BLOCKS(parent_dir-&gt;i_sb) +</div><div class='del'>-		 REISERFS_QUOTA_TRANS_BLOCKS(parent_dir-&gt;i_sb));</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(parent_dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	if (!(inode = new_inode(parent_dir-&gt;i_sb))) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	retval = new_inode_init(inode, parent_dir, mode);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = reiserfs_security_init(parent_dir, inode, &amp;dentry-&gt;d_name,</div><div class='del'>-					&amp;security);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	jbegin_count += retval;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(parent_dir-&gt;i_sb);</div><div class='del'>-	item_len = ROUND_UP(strlen(symname));</div><div class='del'>-	if (item_len &gt; MAX_DIRECT_ITEM_LEN(parent_dir-&gt;i_sb-&gt;s_blocksize)) {</div><div class='del'>-		retval = -ENAMETOOLONG;</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name = kmalloc(item_len, GFP_NOFS);</div><div class='del'>-	if (!name) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-	memcpy(name, symname, strlen(symname));</div><div class='del'>-	padd_item(name, item_len, strlen(symname));</div><div class='del'>-</div><div class='del'>-	retval = journal_begin(&amp;th, parent_dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_new_inode(inode);</div><div class='del'>-		kfree(name);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_new_inode(&amp;th, parent_dir, mode, name, strlen(symname),</div><div class='del'>-			       dentry, inode, &amp;security);</div><div class='del'>-	kfree(name);</div><div class='del'>-	if (retval) {		/* reiserfs_new_inode iputs for us */</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(parent_dir);</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_op = &amp;reiserfs_symlink_inode_operations;</div><div class='del'>-	inode_nohighmem(inode);</div><div class='del'>-	inode-&gt;i_mapping-&gt;a_ops = &amp;reiserfs_address_space_operations;</div><div class='del'>-</div><div class='del'>-	retval = reiserfs_add_entry(&amp;th, parent_dir, dentry-&gt;d_name.name,</div><div class='del'>-				    dentry-&gt;d_name.len, inode, 1 /*visible */ );</div><div class='del'>-	if (retval) {</div><div class='del'>-		int err;</div><div class='del'>-		drop_nlink(inode);</div><div class='del'>-		reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-		err = journal_end(&amp;th);</div><div class='del'>-		if (err)</div><div class='del'>-			retval = err;</div><div class='del'>-		unlock_new_inode(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-		goto out_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d_instantiate_new(dentry, inode);</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-out_failed:</div><div class='del'>-	reiserfs_write_unlock(parent_dir-&gt;i_sb);</div><div class='del'>-	reiserfs_security_free(&amp;security);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='del'>-			 struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode = d_inode(old_dentry);</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	/*</div><div class='del'>-	 * We need blocks for transaction + update of quotas for</div><div class='del'>-	 * the owners of the directory</div><div class='del'>-	 */</div><div class='del'>-	int jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 3 +</div><div class='del'>-	    2 * REISERFS_QUOTA_TRANS_BLOCKS(dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dir-&gt;i_sb);</div><div class='del'>-	if (inode-&gt;i_nlink &gt;= REISERFS_LINK_MAX) {</div><div class='del'>-		/* FIXME: sd_nlink is 32 bit for new files */</div><div class='del'>-		reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-		return -EMLINK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* inc before scheduling so reiserfs_unlink knows we are here */</div><div class='del'>-	inc_nlink(inode);</div><div class='del'>-</div><div class='del'>-	retval = journal_begin(&amp;th, dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval) {</div><div class='del'>-		drop_nlink(inode);</div><div class='del'>-		reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create new entry */</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_add_entry(&amp;th, dir, dentry-&gt;d_name.name,</div><div class='del'>-			       dentry-&gt;d_name.len, inode, 1 /*visible */ );</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(inode);</div><div class='del'>-	reiserfs_update_inode_transaction(dir);</div><div class='del'>-</div><div class='del'>-	if (retval) {</div><div class='del'>-		int err;</div><div class='del'>-		drop_nlink(inode);</div><div class='del'>-		err = journal_end(&amp;th);</div><div class='del'>-		reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-		return err ? err : retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_set_ctime_current(inode);</div><div class='del'>-	reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-</div><div class='del'>-	ihold(inode);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-	reiserfs_write_unlock(dir-&gt;i_sb);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* de contains information pointing to an entry which */</div><div class='del'>-static int de_still_valid(const char *name, int len,</div><div class='del'>-			  struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_dir_entry tmp = *de;</div><div class='del'>-</div><div class='del'>-	/* recalculate pointer to name and name length */</div><div class='del'>-	set_de_name_and_namelen(&amp;tmp);</div><div class='del'>-	/* FIXME: could check more */</div><div class='del'>-	if (tmp.de_namelen != len || memcmp(name, de-&gt;de_name, len))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int entry_points_to_object(const char *name, int len,</div><div class='del'>-				  struct reiserfs_dir_entry *de,</div><div class='del'>-				  struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (!de_still_valid(name, len, de))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (inode) {</div><div class='del'>-		if (!de_visible(de-&gt;de_deh + de-&gt;de_entry_num))</div><div class='del'>-			reiserfs_panic(inode-&gt;i_sb, "vs-7042",</div><div class='del'>-				       "entry must be visible");</div><div class='del'>-		return (de-&gt;de_objectid == inode-&gt;i_ino) ? 1 : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this must be added hidden entry */</div><div class='del'>-	if (de_visible(de-&gt;de_deh + de-&gt;de_entry_num))</div><div class='del'>-		reiserfs_panic(NULL, "vs-7043", "entry must be visible");</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sets key of objectid the entry has to point to */</div><div class='del'>-static void set_ino_in_dir_entry(struct reiserfs_dir_entry *de,</div><div class='del'>-				 struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	/* JDM These operations are endian safe - both are le */</div><div class='del'>-	de-&gt;de_deh[de-&gt;de_entry_num].deh_dir_id = key-&gt;k_dir_id;</div><div class='del'>-	de-&gt;de_deh[de-&gt;de_entry_num].deh_objectid = key-&gt;k_objectid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * process, that is going to call fix_nodes/do_balance must hold only</div><div class='del'>- * one path. If it holds 2 or more, it can get into endless waiting in</div><div class='del'>- * get_empty_nodes or its clones</div><div class='del'>- */</div><div class='del'>-static int reiserfs_rename(struct mnt_idmap *idmap,</div><div class='del'>-			   struct inode *old_dir, struct dentry *old_dentry,</div><div class='del'>-			   struct inode *new_dir, struct dentry *new_dentry,</div><div class='del'>-			   unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	INITIALIZE_PATH(old_entry_path);</div><div class='del'>-	INITIALIZE_PATH(new_entry_path);</div><div class='del'>-	INITIALIZE_PATH(dot_dot_entry_path);</div><div class='del'>-	struct item_head new_entry_ih, old_entry_ih, dot_dot_ih;</div><div class='del'>-	struct reiserfs_dir_entry old_de, new_de, dot_dot_de;</div><div class='del'>-	struct inode *old_inode, *new_dentry_inode;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int jbegin_count;</div><div class='del'>-	unsigned long savelink = 1;</div><div class='del'>-	bool update_dir_parent = false;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; ~RENAME_NOREPLACE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * three balancings: (1) old name removal, (2) new name insertion</div><div class='del'>-	 * and (3) maybe "save" link insertion</div><div class='del'>-	 * stat data updates: (1) old directory,</div><div class='del'>-	 * (2) new directory and (3) maybe old object stat data (when it is</div><div class='del'>-	 * directory) and (4) maybe stat data of object to which new entry</div><div class='del'>-	 * pointed initially and (5) maybe block containing ".." of</div><div class='del'>-	 * renamed directory</div><div class='del'>-	 * quota updates: two parent directories</div><div class='del'>-	 */</div><div class='del'>-	jbegin_count =</div><div class='del'>-	    JOURNAL_PER_BALANCE_CNT * 3 + 5 +</div><div class='del'>-	    4 * REISERFS_QUOTA_TRANS_BLOCKS(old_dir-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	retval = dquot_initialize(old_dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-	retval = dquot_initialize(new_dir);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	old_inode = d_inode(old_dentry);</div><div class='del'>-	new_dentry_inode = d_inode(new_dentry);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * make sure that oldname still exists and points to an object we</div><div class='del'>-	 * are going to rename</div><div class='del'>-	 */</div><div class='del'>-	old_de.de_gen_number_bit_string = NULL;</div><div class='del'>-	reiserfs_write_lock(old_dir-&gt;i_sb);</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_find_entry(old_dir, old_dentry-&gt;d_name.name,</div><div class='del'>-				old_dentry-&gt;d_name.len, &amp;old_entry_path,</div><div class='del'>-				&amp;old_de);</div><div class='del'>-	pathrelse(&amp;old_entry_path);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (retval != NAME_FOUND || old_de.de_objectid != old_inode-&gt;i_ino) {</div><div class='del'>-		reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (S_ISDIR(old_inode-&gt;i_mode)) {</div><div class='del'>-		/*</div><div class='del'>-		 * make sure that directory being renamed has correct ".."</div><div class='del'>-		 * and that its new parent directory has not too many links</div><div class='del'>-		 * already</div><div class='del'>-		 */</div><div class='del'>-		if (new_dentry_inode) {</div><div class='del'>-			if (!reiserfs_empty_dir(new_dentry_inode)) {</div><div class='del'>-				reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-				return -ENOTEMPTY;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (old_dir != new_dir) {</div><div class='del'>-			/*</div><div class='del'>-			 * directory is renamed, its parent directory will be</div><div class='del'>-			 * changed, so find ".." entry</div><div class='del'>-			 */</div><div class='del'>-			dot_dot_de.de_gen_number_bit_string = NULL;</div><div class='del'>-			retval =</div><div class='del'>-			    reiserfs_find_entry(old_inode, "..", 2,</div><div class='del'>-					&amp;dot_dot_entry_path,</div><div class='del'>-					&amp;dot_dot_de);</div><div class='del'>-			pathrelse(&amp;dot_dot_entry_path);</div><div class='del'>-			if (retval != NAME_FOUND) {</div><div class='del'>-				reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* inode number of .. must equal old_dir-&gt;i_ino */</div><div class='del'>-			if (dot_dot_de.de_objectid != old_dir-&gt;i_ino) {</div><div class='del'>-				reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			update_dir_parent = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = journal_begin(&amp;th, old_dir-&gt;i_sb, jbegin_count);</div><div class='del'>-	if (retval) {</div><div class='del'>-		reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* add new entry (or find the existing one) */</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_add_entry(&amp;th, new_dir, new_dentry-&gt;d_name.name,</div><div class='del'>-			       new_dentry-&gt;d_name.len, old_inode, 0);</div><div class='del'>-	if (retval == -EEXIST) {</div><div class='del'>-		if (!new_dentry_inode) {</div><div class='del'>-			reiserfs_panic(old_dir-&gt;i_sb, "vs-7050",</div><div class='del'>-				       "new entry is found, new inode == 0");</div><div class='del'>-		}</div><div class='del'>-	} else if (retval) {</div><div class='del'>-		int err = journal_end(&amp;th);</div><div class='del'>-		reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-		return err ? err : retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_update_inode_transaction(old_dir);</div><div class='del'>-	reiserfs_update_inode_transaction(new_dir);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this makes it so an fsync on an open fd for the old name will</div><div class='del'>-	 * commit the rename operation</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_update_inode_transaction(old_inode);</div><div class='del'>-</div><div class='del'>-	if (new_dentry_inode)</div><div class='del'>-		reiserfs_update_inode_transaction(new_dentry_inode);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		/*</div><div class='del'>-		 * look for old name using corresponding entry key</div><div class='del'>-		 * (found by reiserfs_find_entry)</div><div class='del'>-		 */</div><div class='del'>-		if ((retval =</div><div class='del'>-		     search_by_entry_key(new_dir-&gt;i_sb, &amp;old_de.de_entry_key,</div><div class='del'>-					 &amp;old_entry_path,</div><div class='del'>-					 &amp;old_de)) != NAME_FOUND) {</div><div class='del'>-			pathrelse(&amp;old_entry_path);</div><div class='del'>-			journal_end(&amp;th);</div><div class='del'>-			reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		copy_item_head(&amp;old_entry_ih, tp_item_head(&amp;old_entry_path));</div><div class='del'>-</div><div class='del'>-		reiserfs_prepare_for_journal(old_inode-&gt;i_sb, old_de.de_bh, 1);</div><div class='del'>-</div><div class='del'>-		/* look for new name by reiserfs_find_entry */</div><div class='del'>-		new_de.de_gen_number_bit_string = NULL;</div><div class='del'>-		retval =</div><div class='del'>-		    reiserfs_find_entry(new_dir, new_dentry-&gt;d_name.name,</div><div class='del'>-					new_dentry-&gt;d_name.len, &amp;new_entry_path,</div><div class='del'>-					&amp;new_de);</div><div class='del'>-		/*</div><div class='del'>-		 * reiserfs_add_entry should not return IO_ERROR,</div><div class='del'>-		 * because it is called with essentially same parameters from</div><div class='del'>-		 * reiserfs_add_entry above, and we'll catch any i/o errors</div><div class='del'>-		 * before we get here.</div><div class='del'>-		 */</div><div class='del'>-		if (retval != NAME_FOUND_INVISIBLE &amp;&amp; retval != NAME_FOUND) {</div><div class='del'>-			pathrelse(&amp;new_entry_path);</div><div class='del'>-			pathrelse(&amp;old_entry_path);</div><div class='del'>-			journal_end(&amp;th);</div><div class='del'>-			reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		copy_item_head(&amp;new_entry_ih, tp_item_head(&amp;new_entry_path));</div><div class='del'>-</div><div class='del'>-		reiserfs_prepare_for_journal(old_inode-&gt;i_sb, new_de.de_bh, 1);</div><div class='del'>-</div><div class='del'>-		if (update_dir_parent) {</div><div class='del'>-			if ((retval =</div><div class='del'>-			     search_by_entry_key(new_dir-&gt;i_sb,</div><div class='del'>-						 &amp;dot_dot_de.de_entry_key,</div><div class='del'>-						 &amp;dot_dot_entry_path,</div><div class='del'>-						 &amp;dot_dot_de)) != NAME_FOUND) {</div><div class='del'>-				pathrelse(&amp;dot_dot_entry_path);</div><div class='del'>-				pathrelse(&amp;new_entry_path);</div><div class='del'>-				pathrelse(&amp;old_entry_path);</div><div class='del'>-				journal_end(&amp;th);</div><div class='del'>-				reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			copy_item_head(&amp;dot_dot_ih,</div><div class='del'>-				       tp_item_head(&amp;dot_dot_entry_path));</div><div class='del'>-			/* node containing ".." gets into transaction */</div><div class='del'>-			reiserfs_prepare_for_journal(old_inode-&gt;i_sb,</div><div class='del'>-						     dot_dot_de.de_bh, 1);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * we should check seals here, not do</div><div class='del'>-		 * this stuff, yes? Then, having</div><div class='del'>-		 * gathered everything into RAM we</div><div class='del'>-		 * should lock the buffers, yes?  -Hans</div><div class='del'>-		 */</div><div class='del'>-		/*</div><div class='del'>-		 * probably.  our rename needs to hold more</div><div class='del'>-		 * than one path at once.  The seals would</div><div class='del'>-		 * have to be written to deal with multi-path</div><div class='del'>-		 * issues -chris</div><div class='del'>-		 */</div><div class='del'>-		/*</div><div class='del'>-		 * sanity checking before doing the rename - avoid races many</div><div class='del'>-		 * of the above checks could have scheduled.  We have to be</div><div class='del'>-		 * sure our items haven't been shifted by another process.</div><div class='del'>-		 */</div><div class='del'>-		if (item_moved(&amp;new_entry_ih, &amp;new_entry_path) ||</div><div class='del'>-		    !entry_points_to_object(new_dentry-&gt;d_name.name,</div><div class='del'>-					    new_dentry-&gt;d_name.len,</div><div class='del'>-					    &amp;new_de, new_dentry_inode) ||</div><div class='del'>-		    item_moved(&amp;old_entry_ih, &amp;old_entry_path) ||</div><div class='del'>-		    !entry_points_to_object(old_dentry-&gt;d_name.name,</div><div class='del'>-					    old_dentry-&gt;d_name.len,</div><div class='del'>-					    &amp;old_de, old_inode)) {</div><div class='del'>-			reiserfs_restore_prepared_buffer(old_inode-&gt;i_sb,</div><div class='del'>-							 new_de.de_bh);</div><div class='del'>-			reiserfs_restore_prepared_buffer(old_inode-&gt;i_sb,</div><div class='del'>-							 old_de.de_bh);</div><div class='del'>-			if (update_dir_parent)</div><div class='del'>-				reiserfs_restore_prepared_buffer(old_inode-&gt;</div><div class='del'>-								 i_sb,</div><div class='del'>-								 dot_dot_de.</div><div class='del'>-								 de_bh);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (update_dir_parent) {</div><div class='del'>-			if (item_moved(&amp;dot_dot_ih, &amp;dot_dot_entry_path) ||</div><div class='del'>-			    !entry_points_to_object("..", 2, &amp;dot_dot_de,</div><div class='del'>-						    old_dir)) {</div><div class='del'>-				reiserfs_restore_prepared_buffer(old_inode-&gt;</div><div class='del'>-								 i_sb,</div><div class='del'>-								 old_de.de_bh);</div><div class='del'>-				reiserfs_restore_prepared_buffer(old_inode-&gt;</div><div class='del'>-								 i_sb,</div><div class='del'>-								 new_de.de_bh);</div><div class='del'>-				reiserfs_restore_prepared_buffer(old_inode-&gt;</div><div class='del'>-								 i_sb,</div><div class='del'>-								 dot_dot_de.</div><div class='del'>-								 de_bh);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RFALSE(update_dir_parent &amp;&amp;</div><div class='del'>-		       !buffer_journal_prepared(dot_dot_de.de_bh), "");</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ok, all the changes can be done in one fell swoop when we</div><div class='del'>-	 * have claimed all the buffers needed.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	mark_de_visible(new_de.de_deh + new_de.de_entry_num);</div><div class='del'>-	set_ino_in_dir_entry(&amp;new_de, INODE_PKEY(old_inode));</div><div class='del'>-	journal_mark_dirty(&amp;th, new_de.de_bh);</div><div class='del'>-</div><div class='del'>-	mark_de_hidden(old_de.de_deh + old_de.de_entry_num);</div><div class='del'>-	journal_mark_dirty(&amp;th, old_de.de_bh);</div><div class='del'>-	/*</div><div class='del'>-	 * thanks to Alex Adriaanse &lt;alex_a@caltech.edu&gt; for patch</div><div class='del'>-	 * which adds ctime update of renamed object</div><div class='del'>-	 */</div><div class='del'>-	simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);</div><div class='del'>-</div><div class='del'>-	if (new_dentry_inode) {</div><div class='del'>-		/* adjust link number of the victim */</div><div class='del'>-		if (S_ISDIR(new_dentry_inode-&gt;i_mode)) {</div><div class='del'>-			clear_nlink(new_dentry_inode);</div><div class='del'>-		} else {</div><div class='del'>-			drop_nlink(new_dentry_inode);</div><div class='del'>-		}</div><div class='del'>-		savelink = new_dentry_inode-&gt;i_nlink;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (update_dir_parent) {</div><div class='del'>-		/* adjust ".." of renamed directory */</div><div class='del'>-		set_ino_in_dir_entry(&amp;dot_dot_de, INODE_PKEY(new_dir));</div><div class='del'>-		journal_mark_dirty(&amp;th, dot_dot_de.de_bh);</div><div class='del'>-	}</div><div class='del'>-	if (S_ISDIR(old_inode-&gt;i_mode)) {</div><div class='del'>-		/*</div><div class='del'>-		 * there (in new_dir) was no directory, so it got new link</div><div class='del'>-		 * (".."  of renamed directory)</div><div class='del'>-		 */</div><div class='del'>-		if (!new_dentry_inode)</div><div class='del'>-			INC_DIR_INODE_NLINK(new_dir);</div><div class='del'>-</div><div class='del'>-		/* old directory lost one link - ".. " of renamed directory */</div><div class='del'>-		DEC_DIR_INODE_NLINK(old_dir);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * looks like in 2.3.99pre3 brelse is atomic.</div><div class='del'>-	 * so we can use pathrelse</div><div class='del'>-	 */</div><div class='del'>-	pathrelse(&amp;new_entry_path);</div><div class='del'>-	pathrelse(&amp;dot_dot_entry_path);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: this reiserfs_cut_from_item's return value may screw up</div><div class='del'>-	 * anybody, but it will panic if will not be able to find the</div><div class='del'>-	 * entry. This needs one more clean up</div><div class='del'>-	 */</div><div class='del'>-	if (reiserfs_cut_from_item</div><div class='del'>-	    (&amp;th, &amp;old_entry_path, &amp;old_de.de_entry_key, old_dir, NULL,</div><div class='del'>-	     0) &lt; 0)</div><div class='del'>-		reiserfs_error(old_dir-&gt;i_sb, "vs-7060",</div><div class='del'>-			       "couldn't not cut old name. Fsck later?");</div><div class='del'>-</div><div class='del'>-	old_dir-&gt;i_size -= DEH_SIZE + old_de.de_entrylen;</div><div class='del'>-</div><div class='del'>-	reiserfs_update_sd(&amp;th, old_dir);</div><div class='del'>-	reiserfs_update_sd(&amp;th, new_dir);</div><div class='del'>-	reiserfs_update_sd(&amp;th, old_inode);</div><div class='del'>-</div><div class='del'>-	if (new_dentry_inode) {</div><div class='del'>-		if (savelink == 0)</div><div class='del'>-			add_save_link(&amp;th, new_dentry_inode,</div><div class='del'>-				      0 /* not truncate */ );</div><div class='del'>-		reiserfs_update_sd(&amp;th, new_dentry_inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = journal_end(&amp;th);</div><div class='del'>-	reiserfs_write_unlock(old_dir-&gt;i_sb);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct inode_operations reiserfs_priv_dir_inode_operations = {</div><div class='del'>-	.create = reiserfs_create,</div><div class='del'>-	.lookup = reiserfs_lookup,</div><div class='del'>-	.link = reiserfs_link,</div><div class='del'>-	.unlink = reiserfs_unlink,</div><div class='del'>-	.symlink = reiserfs_symlink,</div><div class='del'>-	.mkdir = reiserfs_mkdir,</div><div class='del'>-	.rmdir = reiserfs_rmdir,</div><div class='del'>-	.mknod = reiserfs_mknod,</div><div class='del'>-	.rename = reiserfs_rename,</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-	.fileattr_get = reiserfs_fileattr_get,</div><div class='del'>-	.fileattr_set = reiserfs_fileattr_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inode_operations reiserfs_priv_symlink_inode_operations = {</div><div class='del'>-	.get_link	= page_get_link,</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct inode_operations reiserfs_priv_special_inode_operations = {</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void reiserfs_init_priv_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	inode-&gt;i_flags |= S_PRIVATE;</div><div class='del'>-	inode-&gt;i_opflags &amp;= ~IOP_XATTR;</div><div class='del'>-</div><div class='del'>-	if (S_ISREG(inode-&gt;i_mode))</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_priv_file_inode_operations;</div><div class='del'>-	else if (S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_priv_dir_inode_operations;</div><div class='del'>-	else if (S_ISLNK(inode-&gt;i_mode))</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_priv_symlink_inode_operations;</div><div class='del'>-	else</div><div class='del'>-		inode-&gt;i_op = &amp;reiserfs_priv_special_inode_operations;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* directories can handle most operations...  */</div><div class='del'>-const struct inode_operations reiserfs_dir_inode_operations = {</div><div class='del'>-	.create = reiserfs_create,</div><div class='del'>-	.lookup = reiserfs_lookup,</div><div class='del'>-	.link = reiserfs_link,</div><div class='del'>-	.unlink = reiserfs_unlink,</div><div class='del'>-	.symlink = reiserfs_symlink,</div><div class='del'>-	.mkdir = reiserfs_mkdir,</div><div class='del'>-	.rmdir = reiserfs_rmdir,</div><div class='del'>-	.mknod = reiserfs_mknod,</div><div class='del'>-	.rename = reiserfs_rename,</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.listxattr = reiserfs_listxattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-	.get_inode_acl = reiserfs_get_acl,</div><div class='del'>-	.set_acl = reiserfs_set_acl,</div><div class='del'>-	.fileattr_get = reiserfs_fileattr_get,</div><div class='del'>-	.fileattr_set = reiserfs_fileattr_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * symlink operations.. same as page_symlink_inode_operations, with xattr</div><div class='del'>- * stuff added</div><div class='del'>- */</div><div class='del'>-const struct inode_operations reiserfs_symlink_inode_operations = {</div><div class='del'>-	.get_link	= page_get_link,</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.listxattr = reiserfs_listxattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * special file operations.. just xattr/acl stuff</div><div class='del'>- */</div><div class='del'>-const struct inode_operations reiserfs_special_inode_operations = {</div><div class='del'>-	.setattr = reiserfs_setattr,</div><div class='del'>-	.listxattr = reiserfs_listxattr,</div><div class='del'>-	.permission = reiserfs_permission,</div><div class='del'>-	.get_inode_acl = reiserfs_get_acl,</div><div class='del'>-	.set_acl = reiserfs_set_acl,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c<br/>deleted file mode 100644<br/>index 34baf5c0f265..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/objectid.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/objectid.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,216 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/uuid.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-</div><div class='del'>-/* find where objectid map starts */</div><div class='del'>-#define objectid_map(s,rs) (old_format_only (s) ? \</div><div class='del'>-                         (__le32 *)((struct reiserfs_super_block_v1 *)(rs) + 1) :\</div><div class='del'>-			 (__le32 *)((rs) + 1))</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-</div><div class='del'>-static void check_objectid_map(struct super_block *s, __le32 * map)</div><div class='del'>-{</div><div class='del'>-	if (le32_to_cpu(map[0]) != 1)</div><div class='del'>-		reiserfs_panic(s, "vs-15010", "map corrupted: %lx",</div><div class='del'>-			       (long unsigned int)le32_to_cpu(map[0]));</div><div class='del'>-</div><div class='del'>-	/* FIXME: add something else here */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static void check_objectid_map(struct super_block *s, __le32 * map)</div><div class='del'>-{;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When we allocate objectids we allocate the first unused objectid.</div><div class='del'>- * Each sequence of objectids in use (the odd sequences) is followed</div><div class='del'>- * by a sequence of objectids not in use (the even sequences).  We</div><div class='del'>- * only need to record the last objectid in each of these sequences</div><div class='del'>- * (both the odd and even sequences) in order to fully define the</div><div class='del'>- * boundaries of the sequences.  A consequence of allocating the first</div><div class='del'>- * objectid not in use is that under most conditions this scheme is</div><div class='del'>- * extremely compact.  The exception is immediately after a sequence</div><div class='del'>- * of operations which deletes a large number of objects of</div><div class='del'>- * non-sequential objectids, and even then it will become compact</div><div class='del'>- * again as soon as more objects are created.  Note that many</div><div class='del'>- * interesting optimizations of layout could result from complicating</div><div class='del'>- * objectid assignment, but we have deferred making them for now.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* get unique object identifier */</div><div class='del'>-__u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_super_block *rs = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-	__le32 *map = objectid_map(s, rs);</div><div class='del'>-	__u32 unused_objectid;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	check_objectid_map(s, map);</div><div class='del'>-</div><div class='del'>-	reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);</div><div class='del'>-	/* comment needed -Hans */</div><div class='del'>-	unused_objectid = le32_to_cpu(map[1]);</div><div class='del'>-	if (unused_objectid == U32_MAX) {</div><div class='del'>-		reiserfs_warning(s, "reiserfs-15100", "no more object ids");</div><div class='del'>-		reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This incrementation allocates the first unused objectid. That</div><div class='del'>-	 * is to say, the first entry on the objectid map is the first</div><div class='del'>-	 * unused objectid, and by incrementing it we use it.  See below</div><div class='del'>-	 * where we check to see if we eliminated a sequence of unused</div><div class='del'>-	 * objectids....</div><div class='del'>-	 */</div><div class='del'>-	map[1] = cpu_to_le32(unused_objectid + 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now we check to see if we eliminated the last remaining member of</div><div class='del'>-	 * the first even sequence (and can eliminate the sequence by</div><div class='del'>-	 * eliminating its last objectid from oids), and can collapse the</div><div class='del'>-	 * first two odd sequences into one sequence.  If so, then the net</div><div class='del'>-	 * result is to eliminate a pair of objectids from oids.  We do this</div><div class='del'>-	 * by shifting the entire map to the left.</div><div class='del'>-	 */</div><div class='del'>-	if (sb_oid_cursize(rs) &gt; 2 &amp;&amp; map[1] == map[2]) {</div><div class='del'>-		memmove(map + 1, map + 3,</div><div class='del'>-			(sb_oid_cursize(rs) - 3) * sizeof(__u32));</div><div class='del'>-		set_sb_oid_cursize(rs, sb_oid_cursize(rs) - 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	journal_mark_dirty(th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-	return unused_objectid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* makes object identifier unused */</div><div class='del'>-void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       __u32 objectid_to_release)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = th-&gt;t_super;</div><div class='del'>-	struct reiserfs_super_block *rs = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-	__le32 *map = objectid_map(s, rs);</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	/*return; */</div><div class='del'>-	check_objectid_map(s, map);</div><div class='del'>-</div><div class='del'>-	reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);</div><div class='del'>-	journal_mark_dirty(th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * start at the beginning of the objectid map (i = 0) and go to</div><div class='del'>-	 * the end of it (i = disk_sb-&gt;s_oid_cursize).  Linear search is</div><div class='del'>-	 * what we use, though it is possible that binary search would be</div><div class='del'>-	 * more efficient after performing lots of deletions (which is</div><div class='del'>-	 * when oids is large.)  We only check even i's.</div><div class='del'>-	 */</div><div class='del'>-	while (i &lt; sb_oid_cursize(rs)) {</div><div class='del'>-		if (objectid_to_release == le32_to_cpu(map[i])) {</div><div class='del'>-			/* This incrementation unallocates the objectid. */</div><div class='del'>-			le32_add_cpu(&amp;map[i], 1);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Did we unallocate the last member of an</div><div class='del'>-			 * odd sequence, and can shrink oids?</div><div class='del'>-			 */</div><div class='del'>-			if (map[i] == map[i + 1]) {</div><div class='del'>-				/* shrink objectid map */</div><div class='del'>-				memmove(map + i, map + i + 2,</div><div class='del'>-					(sb_oid_cursize(rs) - i -</div><div class='del'>-					 2) * sizeof(__u32));</div><div class='del'>-				set_sb_oid_cursize(rs, sb_oid_cursize(rs) - 2);</div><div class='del'>-</div><div class='del'>-				RFALSE(sb_oid_cursize(rs) &lt; 2 ||</div><div class='del'>-				       sb_oid_cursize(rs) &gt; sb_oid_maxsize(rs),</div><div class='del'>-				       "vs-15005: objectid map corrupted cur_size == %d (max == %d)",</div><div class='del'>-				       sb_oid_cursize(rs), sb_oid_maxsize(rs));</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (objectid_to_release &gt; le32_to_cpu(map[i]) &amp;&amp;</div><div class='del'>-		    objectid_to_release &lt; le32_to_cpu(map[i + 1])) {</div><div class='del'>-			/* size of objectid map is not changed */</div><div class='del'>-			if (objectid_to_release + 1 == le32_to_cpu(map[i + 1])) {</div><div class='del'>-				le32_add_cpu(&amp;map[i + 1], -1);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * JDM comparing two little-endian values for</div><div class='del'>-			 * equality -- safe</div><div class='del'>-			 */</div><div class='del'>-			/*</div><div class='del'>-			 * objectid map must be expanded, but</div><div class='del'>-			 * there is no space</div><div class='del'>-			 */</div><div class='del'>-			if (sb_oid_cursize(rs) == sb_oid_maxsize(rs)) {</div><div class='del'>-				PROC_INFO_INC(s, leaked_oid);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* expand the objectid map */</div><div class='del'>-			memmove(map + i + 3, map + i + 1,</div><div class='del'>-				(sb_oid_cursize(rs) - i - 1) * sizeof(__u32));</div><div class='del'>-			map[i + 1] = cpu_to_le32(objectid_to_release);</div><div class='del'>-			map[i + 2] = cpu_to_le32(objectid_to_release + 1);</div><div class='del'>-			set_sb_oid_cursize(rs, sb_oid_cursize(rs) + 2);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		i += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_error(s, "vs-15011", "tried to free free object id (%lu)",</div><div class='del'>-		       (long unsigned)objectid_to_release);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_convert_objectid_map_v1(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_super_block *disk_sb = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-	int cur_size = sb_oid_cursize(disk_sb);</div><div class='del'>-	int new_size = (s-&gt;s_blocksize - SB_SIZE) / sizeof(__u32) / 2 * 2;</div><div class='del'>-	int old_max = sb_oid_maxsize(disk_sb);</div><div class='del'>-	struct reiserfs_super_block_v1 *disk_sb_v1;</div><div class='del'>-	__le32 *objectid_map;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	disk_sb_v1 =</div><div class='del'>-	    (struct reiserfs_super_block_v1 *)(SB_BUFFER_WITH_SB(s)-&gt;b_data);</div><div class='del'>-	objectid_map = (__le32 *) (disk_sb_v1 + 1);</div><div class='del'>-</div><div class='del'>-	if (cur_size &gt; new_size) {</div><div class='del'>-		/*</div><div class='del'>-		 * mark everyone used that was listed as free at</div><div class='del'>-		 * the end of the objectid map</div><div class='del'>-		 */</div><div class='del'>-		objectid_map[new_size - 1] = objectid_map[cur_size - 1];</div><div class='del'>-		set_sb_oid_cursize(disk_sb, new_size);</div><div class='del'>-	}</div><div class='del'>-	/* move the smaller objectid map past the end of the new super */</div><div class='del'>-	for (i = new_size - 1; i &gt;= 0; i--) {</div><div class='del'>-		objectid_map[i + (old_max - new_size)] = objectid_map[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the max size so we don't overflow later */</div><div class='del'>-	set_sb_oid_maxsize(disk_sb, new_size);</div><div class='del'>-</div><div class='del'>-	/* Zero out label and generate random UUID */</div><div class='del'>-	memset(disk_sb-&gt;s_label, 0, sizeof(disk_sb-&gt;s_label));</div><div class='del'>-	generate_random_uuid(disk_sb-&gt;s_uuid);</div><div class='del'>-</div><div class='del'>-	/* finally, zero out the unused chunk of the new super */</div><div class='del'>-	memset(disk_sb-&gt;s_unused, 0, sizeof(disk_sb-&gt;s_unused));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c<br/>deleted file mode 100644<br/>index 84a194b77f19..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/prints.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/prints.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,792 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-static char error_buf[1024];</div><div class='del'>-static char fmt_buf[1024];</div><div class='del'>-static char off_buf[80];</div><div class='del'>-</div><div class='del'>-static char *reiserfs_cpu_offset(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	if (cpu_key_k_type(key) == TYPE_DIRENTRY)</div><div class='del'>-		sprintf(off_buf, "%llu(%llu)",</div><div class='del'>-			(unsigned long long)</div><div class='del'>-			GET_HASH_VALUE(cpu_key_k_offset(key)),</div><div class='del'>-			(unsigned long long)</div><div class='del'>-			GET_GENERATION_NUMBER(cpu_key_k_offset(key)));</div><div class='del'>-	else</div><div class='del'>-		sprintf(off_buf, "0x%Lx",</div><div class='del'>-			(unsigned long long)cpu_key_k_offset(key));</div><div class='del'>-	return off_buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *le_offset(struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	int version;</div><div class='del'>-</div><div class='del'>-	version = le_key_version(key);</div><div class='del'>-	if (le_key_k_type(version, key) == TYPE_DIRENTRY)</div><div class='del'>-		sprintf(off_buf, "%llu(%llu)",</div><div class='del'>-			(unsigned long long)</div><div class='del'>-			GET_HASH_VALUE(le_key_k_offset(version, key)),</div><div class='del'>-			(unsigned long long)</div><div class='del'>-			GET_GENERATION_NUMBER(le_key_k_offset(version, key)));</div><div class='del'>-	else</div><div class='del'>-		sprintf(off_buf, "0x%Lx",</div><div class='del'>-			(unsigned long long)le_key_k_offset(version, key));</div><div class='del'>-	return off_buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *cpu_type(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	if (cpu_key_k_type(key) == TYPE_STAT_DATA)</div><div class='del'>-		return "SD";</div><div class='del'>-	if (cpu_key_k_type(key) == TYPE_DIRENTRY)</div><div class='del'>-		return "DIR";</div><div class='del'>-	if (cpu_key_k_type(key) == TYPE_DIRECT)</div><div class='del'>-		return "DIRECT";</div><div class='del'>-	if (cpu_key_k_type(key) == TYPE_INDIRECT)</div><div class='del'>-		return "IND";</div><div class='del'>-	return "UNKNOWN";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *le_type(struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	int version;</div><div class='del'>-</div><div class='del'>-	version = le_key_version(key);</div><div class='del'>-</div><div class='del'>-	if (le_key_k_type(version, key) == TYPE_STAT_DATA)</div><div class='del'>-		return "SD";</div><div class='del'>-	if (le_key_k_type(version, key) == TYPE_DIRENTRY)</div><div class='del'>-		return "DIR";</div><div class='del'>-	if (le_key_k_type(version, key) == TYPE_DIRECT)</div><div class='del'>-		return "DIRECT";</div><div class='del'>-	if (le_key_k_type(version, key) == TYPE_INDIRECT)</div><div class='del'>-		return "IND";</div><div class='del'>-	return "UNKNOWN";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* %k */</div><div class='del'>-static int scnprintf_le_key(char *buf, size_t size, struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	if (key)</div><div class='del'>-		return scnprintf(buf, size, "[%d %d %s %s]",</div><div class='del'>-				 le32_to_cpu(key-&gt;k_dir_id),</div><div class='del'>-				 le32_to_cpu(key-&gt;k_objectid), le_offset(key),</div><div class='del'>-				 le_type(key));</div><div class='del'>-	else</div><div class='del'>-		return scnprintf(buf, size, "[NULL]");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* %K */</div><div class='del'>-static int scnprintf_cpu_key(char *buf, size_t size, struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	if (key)</div><div class='del'>-		return scnprintf(buf, size, "[%d %d %s %s]",</div><div class='del'>-				 key-&gt;on_disk_key.k_dir_id,</div><div class='del'>-				 key-&gt;on_disk_key.k_objectid,</div><div class='del'>-				 reiserfs_cpu_offset(key), cpu_type(key));</div><div class='del'>-	else</div><div class='del'>-		return scnprintf(buf, size, "[NULL]");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int scnprintf_de_head(char *buf, size_t size,</div><div class='del'>-			     struct reiserfs_de_head *deh)</div><div class='del'>-{</div><div class='del'>-	if (deh)</div><div class='del'>-		return scnprintf(buf, size,</div><div class='del'>-				 "[offset=%d dir_id=%d objectid=%d location=%d state=%04x]",</div><div class='del'>-				 deh_offset(deh), deh_dir_id(deh),</div><div class='del'>-				 deh_objectid(deh), deh_location(deh),</div><div class='del'>-				 deh_state(deh));</div><div class='del'>-	else</div><div class='del'>-		return scnprintf(buf, size, "[NULL]");</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int scnprintf_item_head(char *buf, size_t size, struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	if (ih) {</div><div class='del'>-		char *p = buf;</div><div class='del'>-		char * const end = buf + size;</div><div class='del'>-</div><div class='del'>-		p += scnprintf(p, end - p, "%s",</div><div class='del'>-			       (ih_version(ih) == KEY_FORMAT_3_6) ?</div><div class='del'>-			       "*3.6* " : "*3.5*");</div><div class='del'>-</div><div class='del'>-		p += scnprintf_le_key(p, end - p, &amp;ih-&gt;ih_key);</div><div class='del'>-</div><div class='del'>-		p += scnprintf(p, end - p,</div><div class='del'>-			       ", item_len %d, item_location %d, free_space(entry_count) %d",</div><div class='del'>-			       ih_item_len(ih), ih_location(ih),</div><div class='del'>-			       ih_free_space(ih));</div><div class='del'>-		return p - buf;</div><div class='del'>-	} else</div><div class='del'>-		return scnprintf(buf, size, "[NULL]");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int scnprintf_direntry(char *buf, size_t size,</div><div class='del'>-			      struct reiserfs_dir_entry *de)</div><div class='del'>-{</div><div class='del'>-	char name[20];</div><div class='del'>-</div><div class='del'>-	memcpy(name, de-&gt;de_name, de-&gt;de_namelen &gt; 19 ? 19 : de-&gt;de_namelen);</div><div class='del'>-	name[de-&gt;de_namelen &gt; 19 ? 19 : de-&gt;de_namelen] = 0;</div><div class='del'>-	return scnprintf(buf, size, "\"%s\"==&gt;[%d %d]",</div><div class='del'>-			 name, de-&gt;de_dir_id, de-&gt;de_objectid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int scnprintf_block_head(char *buf, size_t size, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	return scnprintf(buf, size,</div><div class='del'>-			 "level=%d, nr_items=%d, free_space=%d rdkey ",</div><div class='del'>-			 B_LEVEL(bh), B_NR_ITEMS(bh), B_FREE_SPACE(bh));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int scnprintf_buffer_head(char *buf, size_t size, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	return scnprintf(buf, size,</div><div class='del'>-			 "dev %pg, size %zd, blocknr %llu, count %d, state 0x%lx, page %p, (%s, %s, %s)",</div><div class='del'>-			 bh-&gt;b_bdev, bh-&gt;b_size,</div><div class='del'>-			 (unsigned long long)bh-&gt;b_blocknr,</div><div class='del'>-			 atomic_read(&amp;(bh-&gt;b_count)),</div><div class='del'>-			 bh-&gt;b_state, bh-&gt;b_page,</div><div class='del'>-			 buffer_uptodate(bh) ? "UPTODATE" : "!UPTODATE",</div><div class='del'>-			 buffer_dirty(bh) ? "DIRTY" : "CLEAN",</div><div class='del'>-			 buffer_locked(bh) ? "LOCKED" : "UNLOCKED");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int scnprintf_disk_child(char *buf, size_t size, struct disk_child *dc)</div><div class='del'>-{</div><div class='del'>-	return scnprintf(buf, size, "[dc_number=%d, dc_size=%u]",</div><div class='del'>-			 dc_block_number(dc), dc_size(dc));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *is_there_reiserfs_struct(char *fmt, int *what)</div><div class='del'>-{</div><div class='del'>-	char *k = fmt;</div><div class='del'>-</div><div class='del'>-	while ((k = strchr(k, '%')) != NULL) {</div><div class='del'>-		if (k[1] == 'k' || k[1] == 'K' || k[1] == 'h' || k[1] == 't' ||</div><div class='del'>-		    k[1] == 'z' || k[1] == 'b' || k[1] == 'y' || k[1] == 'a') {</div><div class='del'>-			*what = k[1];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		k++;</div><div class='del'>-	}</div><div class='del'>-	return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * debugging reiserfs we used to print out a lot of different</div><div class='del'>- * variables, like keys, item headers, buffer heads etc. Values of</div><div class='del'>- * most fields matter. So it took a long time just to write</div><div class='del'>- * appropriative printk. With this reiserfs_warning you can use format</div><div class='del'>- * specification for complex structures like you used to do with</div><div class='del'>- * printfs for integers, doubles and pointers. For instance, to print</div><div class='del'>- * out key structure you have to write just:</div><div class='del'>- * reiserfs_warning ("bad key %k", key);</div><div class='del'>- * instead of</div><div class='del'>- * printk ("bad key %lu %lu %lu %lu", key-&gt;k_dir_id, key-&gt;k_objectid,</div><div class='del'>- *         key-&gt;k_offset, key-&gt;k_uniqueness);</div><div class='del'>- */</div><div class='del'>-static DEFINE_SPINLOCK(error_lock);</div><div class='del'>-static void prepare_error_buf(const char *fmt, va_list args)</div><div class='del'>-{</div><div class='del'>-	char *fmt1 = fmt_buf;</div><div class='del'>-	char *k;</div><div class='del'>-	char *p = error_buf;</div><div class='del'>-	char * const end = &amp;error_buf[sizeof(error_buf)];</div><div class='del'>-	int what;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;error_lock);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(strscpy(fmt_buf, fmt, sizeof(fmt_buf)) &lt; 0)) {</div><div class='del'>-		strscpy(error_buf, "format string too long", end - error_buf);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((k = is_there_reiserfs_struct(fmt1, &amp;what)) != NULL) {</div><div class='del'>-		*k = 0;</div><div class='del'>-</div><div class='del'>-		p += vscnprintf(p, end - p, fmt1, args);</div><div class='del'>-</div><div class='del'>-		switch (what) {</div><div class='del'>-		case 'k':</div><div class='del'>-			p += scnprintf_le_key(p, end - p,</div><div class='del'>-					      va_arg(args, struct reiserfs_key *));</div><div class='del'>-			break;</div><div class='del'>-		case 'K':</div><div class='del'>-			p += scnprintf_cpu_key(p, end - p,</div><div class='del'>-					       va_arg(args, struct cpu_key *));</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			p += scnprintf_item_head(p, end - p,</div><div class='del'>-						 va_arg(args, struct item_head *));</div><div class='del'>-			break;</div><div class='del'>-		case 't':</div><div class='del'>-			p += scnprintf_direntry(p, end - p,</div><div class='del'>-						va_arg(args, struct reiserfs_dir_entry *));</div><div class='del'>-			break;</div><div class='del'>-		case 'y':</div><div class='del'>-			p += scnprintf_disk_child(p, end - p,</div><div class='del'>-						  va_arg(args, struct disk_child *));</div><div class='del'>-			break;</div><div class='del'>-		case 'z':</div><div class='del'>-			p += scnprintf_block_head(p, end - p,</div><div class='del'>-						  va_arg(args, struct buffer_head *));</div><div class='del'>-			break;</div><div class='del'>-		case 'b':</div><div class='del'>-			p += scnprintf_buffer_head(p, end - p,</div><div class='del'>-						   va_arg(args, struct buffer_head *));</div><div class='del'>-			break;</div><div class='del'>-		case 'a':</div><div class='del'>-			p += scnprintf_de_head(p, end - p,</div><div class='del'>-					       va_arg(args, struct reiserfs_de_head *));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fmt1 = k + 2;</div><div class='del'>-	}</div><div class='del'>-	p += vscnprintf(p, end - p, fmt1, args);</div><div class='del'>-out_unlock:</div><div class='del'>-	spin_unlock(&amp;error_lock);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * in addition to usual conversion specifiers this accepts reiserfs</div><div class='del'>- * specific conversion specifiers:</div><div class='del'>- * %k to print little endian key,</div><div class='del'>- * %K to print cpu key,</div><div class='del'>- * %h to print item_head,</div><div class='del'>- * %t to print directory entry</div><div class='del'>- * %z to print block head (arg must be struct buffer_head *</div><div class='del'>- * %b to print buffer_head</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define do_reiserfs_warning(fmt)\</div><div class='del'>-{\</div><div class='del'>-    va_list args;\</div><div class='del'>-    va_start( args, fmt );\</div><div class='del'>-    prepare_error_buf( fmt, args );\</div><div class='del'>-    va_end( args );\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __reiserfs_warning(struct super_block *sb, const char *id,</div><div class='del'>-			 const char *function, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-	if (sb)</div><div class='del'>-		printk(KERN_WARNING "REISERFS warning (device %s): %s%s%s: "</div><div class='del'>-		       "%s\n", sb-&gt;s_id, id ? id : "", id ? " " : "",</div><div class='del'>-		       function, error_buf);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_WARNING "REISERFS warning: %s%s%s: %s\n",</div><div class='del'>-		       id ? id : "", id ? " " : "", function, error_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No newline.. reiserfs_info calls can be followed by printk's */</div><div class='del'>-void reiserfs_info(struct super_block *sb, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-	if (sb)</div><div class='del'>-		printk(KERN_NOTICE "REISERFS (device %s): %s",</div><div class='del'>-		       sb-&gt;s_id, error_buf);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_NOTICE "REISERFS %s:", error_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No newline.. reiserfs_printk calls can be followed by printk's */</div><div class='del'>-static void reiserfs_printk(const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-	printk(error_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_debug(struct super_block *s, int level, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-	if (s)</div><div class='del'>-		printk(KERN_DEBUG "REISERFS debug (device %s): %s\n",</div><div class='del'>-		       s-&gt;s_id, error_buf);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_DEBUG "REISERFS debug: %s\n", error_buf);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The format:</div><div class='del'>- *</div><div class='del'>- *          maintainer-errorid: [function-name:] message</div><div class='del'>- *</div><div class='del'>- *   where errorid is unique to the maintainer and function-name is</div><div class='del'>- *   optional, is recommended, so that anyone can easily find the bug</div><div class='del'>- *   with a simple grep for the short to type string</div><div class='del'>- *   maintainer-errorid.  Don't bother with reusing errorids, there are</div><div class='del'>- *   lots of numbers out there.</div><div class='del'>- *</div><div class='del'>- *   Example:</div><div class='del'>- *</div><div class='del'>- *   reiserfs_panic(</div><div class='del'>- *     p_sb, "reiser-29: reiserfs_new_blocknrs: "</div><div class='del'>- *     "one of search_start or rn(%d) is equal to MAX_B_NUM,"</div><div class='del'>- *     "which means that we are optimizing location based on the "</div><div class='del'>- *     "bogus location of a temp buffer (%p).",</div><div class='del'>- *     rn, bh</div><div class='del'>- *   );</div><div class='del'>- *</div><div class='del'>- *   Regular panic()s sometimes clear the screen before the message can</div><div class='del'>- *   be read, thus the need for the while loop.</div><div class='del'>- *</div><div class='del'>- *   Numbering scheme for panic used by Vladimir and Anatoly( Hans completely</div><div class='del'>- *   ignores this scheme, and considers it pointless complexity):</div><div class='del'>- *</div><div class='del'>- *   panics in reiserfs_fs.h have numbers from 1000 to 1999</div><div class='del'>- *   super.c			2000 to 2999</div><div class='del'>- *   preserve.c (unused)	3000 to 3999</div><div class='del'>- *   bitmap.c			4000 to 4999</div><div class='del'>- *   stree.c			5000 to 5999</div><div class='del'>- *   prints.c			6000 to 6999</div><div class='del'>- *   namei.c			7000 to 7999</div><div class='del'>- *   fix_nodes.c		8000 to 8999</div><div class='del'>- *   dir.c			9000 to 9999</div><div class='del'>- *   lbalance.c			10000 to 10999</div><div class='del'>- *   ibalance.c			11000 to 11999 not ready</div><div class='del'>- *   do_balan.c			12000 to 12999</div><div class='del'>- *   inode.c			13000 to 13999</div><div class='del'>- *   file.c			14000 to 14999</div><div class='del'>- *   objectid.c			15000 - 15999</div><div class='del'>- *   buffer.c			16000 - 16999</div><div class='del'>- *   symlink.c			17000 - 17999</div><div class='del'>- *</div><div class='del'>- *  .  */</div><div class='del'>-</div><div class='del'>-void __reiserfs_panic(struct super_block *sb, const char *id,</div><div class='del'>-		      const char *function, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	dump_stack();</div><div class='del'>-#endif</div><div class='del'>-	if (sb)</div><div class='del'>-		printk(KERN_WARNING "REISERFS panic (device %s): %s%s%s: %s\n",</div><div class='del'>-		      sb-&gt;s_id, id ? id : "", id ? " " : "",</div><div class='del'>-		      function, error_buf);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_WARNING "REISERFS panic: %s%s%s: %s\n",</div><div class='del'>-		      id ? id : "", id ? " " : "", function, error_buf);</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __reiserfs_error(struct super_block *sb, const char *id,</div><div class='del'>-		      const char *function, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-</div><div class='del'>-	BUG_ON(sb == NULL);</div><div class='del'>-</div><div class='del'>-	if (reiserfs_error_panic(sb))</div><div class='del'>-		__reiserfs_panic(sb, id, function, error_buf);</div><div class='del'>-</div><div class='del'>-	if (id &amp;&amp; id[0])</div><div class='del'>-		printk(KERN_CRIT "REISERFS error (device %s): %s %s: %s\n",</div><div class='del'>-		       sb-&gt;s_id, id, function, error_buf);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_CRIT "REISERFS error (device %s): %s: %s\n",</div><div class='del'>-		       sb-&gt;s_id, function, error_buf);</div><div class='del'>-</div><div class='del'>-	if (sb_rdonly(sb))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	reiserfs_info(sb, "Remounting filesystem read-only\n");</div><div class='del'>-	sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-	reiserfs_abort_journal(sb, -EIO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	do_reiserfs_warning(fmt);</div><div class='del'>-</div><div class='del'>-	if (reiserfs_error_panic(sb)) {</div><div class='del'>-		panic(KERN_CRIT "REISERFS panic (device %s): %s\n", sb-&gt;s_id,</div><div class='del'>-		      error_buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reiserfs_is_journal_aborted(SB_JOURNAL(sb)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	printk(KERN_CRIT "REISERFS abort (device %s): %s\n", sb-&gt;s_id,</div><div class='del'>-	       error_buf);</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-	reiserfs_abort_journal(sb, errno);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this prints internal nodes (4 keys/items in line) (dc_number,</div><div class='del'>- * dc_size)[k_dirid, k_objectid, k_offset, k_uniqueness](dc_number,</div><div class='del'>- * dc_size)...</div><div class='del'>- */</div><div class='del'>-static int print_internal(struct buffer_head *bh, int first, int last)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_key *key;</div><div class='del'>-	struct disk_child *dc;</div><div class='del'>-	int i;</div><div class='del'>-	int from, to;</div><div class='del'>-</div><div class='del'>-	if (!B_IS_KEYS_LEVEL(bh))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	check_internal(bh);</div><div class='del'>-</div><div class='del'>-	if (first == -1) {</div><div class='del'>-		from = 0;</div><div class='del'>-		to = B_NR_ITEMS(bh);</div><div class='del'>-	} else {</div><div class='del'>-		from = first;</div><div class='del'>-		to = min_t(int, last, B_NR_ITEMS(bh));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_printk("INTERNAL NODE (%ld) contains %z\n", bh-&gt;b_blocknr, bh);</div><div class='del'>-</div><div class='del'>-	dc = B_N_CHILD(bh, from);</div><div class='del'>-	reiserfs_printk("PTR %d: %y ", from, dc);</div><div class='del'>-</div><div class='del'>-	for (i = from, key = internal_key(bh, from), dc++; i &lt; to;</div><div class='del'>-	     i++, key++, dc++) {</div><div class='del'>-		reiserfs_printk("KEY %d: %k PTR %d: %y ", i, key, i + 1, dc);</div><div class='del'>-		if (i &amp;&amp; i % 4 == 0)</div><div class='del'>-			printk("\n");</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int print_leaf(struct buffer_head *bh, int print_mode, int first,</div><div class='del'>-		      int last)</div><div class='del'>-{</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	int i, nr;</div><div class='del'>-	int from, to;</div><div class='del'>-</div><div class='del'>-	if (!B_IS_ITEMS_LEVEL(bh))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	check_leaf(bh);</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	ih = item_head(bh, 0);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-</div><div class='del'>-	printk</div><div class='del'>-	    ("\n===================================================================\n");</div><div class='del'>-	reiserfs_printk("LEAF NODE (%ld) contains %z\n", bh-&gt;b_blocknr, bh);</div><div class='del'>-</div><div class='del'>-	if (!(print_mode &amp; PRINT_LEAF_ITEMS)) {</div><div class='del'>-		reiserfs_printk("FIRST ITEM_KEY: %k, LAST ITEM KEY: %k\n",</div><div class='del'>-				&amp;(ih-&gt;ih_key), &amp;((ih + nr - 1)-&gt;ih_key));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (first &lt; 0 || first &gt; nr - 1)</div><div class='del'>-		from = 0;</div><div class='del'>-	else</div><div class='del'>-		from = first;</div><div class='del'>-</div><div class='del'>-	if (last &lt; 0 || last &gt; nr)</div><div class='del'>-		to = nr;</div><div class='del'>-	else</div><div class='del'>-		to = last;</div><div class='del'>-</div><div class='del'>-	ih += from;</div><div class='del'>-	printk</div><div class='del'>-	    ("-------------------------------------------------------------------------------\n");</div><div class='del'>-	printk</div><div class='del'>-	    ("|##|   type    |           key           | ilen | free_space | version | loc  |\n");</div><div class='del'>-	for (i = from; i &lt; to; i++, ih++) {</div><div class='del'>-		printk</div><div class='del'>-		    ("-------------------------------------------------------------------------------\n");</div><div class='del'>-		reiserfs_printk("|%2d| %h |\n", i, ih);</div><div class='del'>-		if (print_mode &amp; PRINT_LEAF_ITEMS)</div><div class='del'>-			op_print_item(ih, ih_item_body(bh, ih));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk</div><div class='del'>-	    ("===================================================================\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *reiserfs_hashname(int code)</div><div class='del'>-{</div><div class='del'>-	if (code == YURA_HASH)</div><div class='del'>-		return "rupasov";</div><div class='del'>-	if (code == TEA_HASH)</div><div class='del'>-		return "tea";</div><div class='del'>-	if (code == R5_HASH)</div><div class='del'>-		return "r5";</div><div class='del'>-</div><div class='del'>-	return "unknown";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return 1 if this is not super block */</div><div class='del'>-static int print_super_block(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_super_block *rs =</div><div class='del'>-	    (struct reiserfs_super_block *)(bh-&gt;b_data);</div><div class='del'>-	int skipped, data_blocks;</div><div class='del'>-	char *version;</div><div class='del'>-</div><div class='del'>-	if (is_reiserfs_3_5(rs)) {</div><div class='del'>-		version = "3.5";</div><div class='del'>-	} else if (is_reiserfs_3_6(rs)) {</div><div class='del'>-		version = "3.6";</div><div class='del'>-	} else if (is_reiserfs_jr(rs)) {</div><div class='del'>-		version = ((sb_version(rs) == REISERFS_VERSION_2) ?</div><div class='del'>-			   "3.6" : "3.5");</div><div class='del'>-	} else {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("%pg\'s super block is in block %llu\n", bh-&gt;b_bdev,</div><div class='del'>-	       (unsigned long long)bh-&gt;b_blocknr);</div><div class='del'>-	printk("Reiserfs version %s\n", version);</div><div class='del'>-	printk("Block count %u\n", sb_block_count(rs));</div><div class='del'>-	printk("Blocksize %d\n", sb_blocksize(rs));</div><div class='del'>-	printk("Free blocks %u\n", sb_free_blocks(rs));</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: this would be confusing if</div><div class='del'>-	 * someone stores reiserfs super block in some data block ;)</div><div class='del'>-//    skipped = (bh-&gt;b_blocknr * bh-&gt;b_size) / sb_blocksize(rs);</div><div class='del'>-	 */</div><div class='del'>-	skipped = bh-&gt;b_blocknr;</div><div class='del'>-	data_blocks = sb_block_count(rs) - skipped - 1 - sb_bmap_nr(rs) -</div><div class='del'>-	    (!is_reiserfs_jr(rs) ? sb_jp_journal_size(rs) +</div><div class='del'>-	     1 : sb_reserved_for_journal(rs)) - sb_free_blocks(rs);</div><div class='del'>-	printk</div><div class='del'>-	    ("Busy blocks (skipped %d, bitmaps - %d, journal (or reserved) blocks - %d\n"</div><div class='del'>-	     "1 super block, %d data blocks\n", skipped, sb_bmap_nr(rs),</div><div class='del'>-	     (!is_reiserfs_jr(rs) ? (sb_jp_journal_size(rs) + 1) :</div><div class='del'>-	      sb_reserved_for_journal(rs)), data_blocks);</div><div class='del'>-	printk("Root block %u\n", sb_root_block(rs));</div><div class='del'>-	printk("Journal block (first) %d\n", sb_jp_journal_1st_block(rs));</div><div class='del'>-	printk("Journal dev %d\n", sb_jp_journal_dev(rs));</div><div class='del'>-	printk("Journal orig size %d\n", sb_jp_journal_size(rs));</div><div class='del'>-	printk("FS state %d\n", sb_fs_state(rs));</div><div class='del'>-	printk("Hash function \"%s\"\n",</div><div class='del'>-	       reiserfs_hashname(sb_hash_function_code(rs)));</div><div class='del'>-</div><div class='del'>-	printk("Tree height %d\n", sb_tree_height(rs));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int print_desc_block(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_journal_desc *desc;</div><div class='del'>-</div><div class='del'>-	if (memcmp(get_journal_desc_magic(bh), JOURNAL_DESC_MAGIC, 8))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	desc = (struct reiserfs_journal_desc *)(bh-&gt;b_data);</div><div class='del'>-	printk("Desc block %llu (j_trans_id %d, j_mount_id %d, j_len %d)",</div><div class='del'>-	       (unsigned long long)bh-&gt;b_blocknr, get_desc_trans_id(desc),</div><div class='del'>-	       get_desc_mount_id(desc), get_desc_trans_len(desc));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* ..., int print_mode, int first, int last) */</div><div class='del'>-void print_block(struct buffer_head *bh, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	int mode, first, last;</div><div class='del'>-</div><div class='del'>-	if (!bh) {</div><div class='del'>-		printk("print_block: buffer is NULL\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_start(args, bh);</div><div class='del'>-</div><div class='del'>-	mode = va_arg(args, int);</div><div class='del'>-	first = va_arg(args, int);</div><div class='del'>-	last = va_arg(args, int);</div><div class='del'>-	if (print_leaf(bh, mode, first, last))</div><div class='del'>-		if (print_internal(bh, first, last))</div><div class='del'>-			if (print_super_block(bh))</div><div class='del'>-				if (print_desc_block(bh))</div><div class='del'>-					printk</div><div class='del'>-					    ("Block %llu contains unformatted data\n",</div><div class='del'>-					     (unsigned long long)bh-&gt;b_blocknr);</div><div class='del'>-</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char print_tb_buf[2048];</div><div class='del'>-</div><div class='del'>-/* this stores initial state of tree balance in the print_tb_buf */</div><div class='del'>-void store_print_tb(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	int h = 0;</div><div class='del'>-	int i;</div><div class='del'>-	struct buffer_head *tbSh, *tbFh;</div><div class='del'>-</div><div class='del'>-	if (!tb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sprintf(print_tb_buf, "\n"</div><div class='del'>-		"BALANCING %d\n"</div><div class='del'>-		"MODE=%c, ITEM_POS=%d POS_IN_ITEM=%d\n"</div><div class='del'>-		"=====================================================================\n"</div><div class='del'>-		"* h *    S    *    L    *    R    *   F   *   FL  *   FR  *  CFL  *  CFR  *\n",</div><div class='del'>-		REISERFS_SB(tb-&gt;tb_sb)-&gt;s_do_balance,</div><div class='del'>-		tb-&gt;tb_mode, PATH_LAST_POSITION(tb-&gt;tb_path),</div><div class='del'>-		tb-&gt;tb_path-&gt;pos_in_item);</div><div class='del'>-</div><div class='del'>-	for (h = 0; h &lt; ARRAY_SIZE(tb-&gt;insert_size); h++) {</div><div class='del'>-		if (PATH_H_PATH_OFFSET(tb-&gt;tb_path, h) &lt;=</div><div class='del'>-		    tb-&gt;tb_path-&gt;path_length</div><div class='del'>-		    &amp;&amp; PATH_H_PATH_OFFSET(tb-&gt;tb_path,</div><div class='del'>-					  h) &gt; ILLEGAL_PATH_ELEMENT_OFFSET) {</div><div class='del'>-			tbSh = PATH_H_PBUFFER(tb-&gt;tb_path, h);</div><div class='del'>-			tbFh = PATH_H_PPARENT(tb-&gt;tb_path, h);</div><div class='del'>-		} else {</div><div class='del'>-			tbSh = NULL;</div><div class='del'>-			tbFh = NULL;</div><div class='del'>-		}</div><div class='del'>-		sprintf(print_tb_buf + strlen(print_tb_buf),</div><div class='del'>-			"* %d * %3lld(%2d) * %3lld(%2d) * %3lld(%2d) * %5lld * %5lld * %5lld * %5lld * %5lld *\n",</div><div class='del'>-			h,</div><div class='del'>-			(tbSh) ? (long long)(tbSh-&gt;b_blocknr) : (-1LL),</div><div class='del'>-			(tbSh) ? atomic_read(&amp;tbSh-&gt;b_count) : -1,</div><div class='del'>-			(tb-&gt;L[h]) ? (long long)(tb-&gt;L[h]-&gt;b_blocknr) : (-1LL),</div><div class='del'>-			(tb-&gt;L[h]) ? atomic_read(&amp;tb-&gt;L[h]-&gt;b_count) : -1,</div><div class='del'>-			(tb-&gt;R[h]) ? (long long)(tb-&gt;R[h]-&gt;b_blocknr) : (-1LL),</div><div class='del'>-			(tb-&gt;R[h]) ? atomic_read(&amp;tb-&gt;R[h]-&gt;b_count) : -1,</div><div class='del'>-			(tbFh) ? (long long)(tbFh-&gt;b_blocknr) : (-1LL),</div><div class='del'>-			(tb-&gt;FL[h]) ? (long long)(tb-&gt;FL[h]-&gt;</div><div class='del'>-						  b_blocknr) : (-1LL),</div><div class='del'>-			(tb-&gt;FR[h]) ? (long long)(tb-&gt;FR[h]-&gt;</div><div class='del'>-						  b_blocknr) : (-1LL),</div><div class='del'>-			(tb-&gt;CFL[h]) ? (long long)(tb-&gt;CFL[h]-&gt;</div><div class='del'>-						   b_blocknr) : (-1LL),</div><div class='del'>-			(tb-&gt;CFR[h]) ? (long long)(tb-&gt;CFR[h]-&gt;</div><div class='del'>-						   b_blocknr) : (-1LL));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sprintf(print_tb_buf + strlen(print_tb_buf),</div><div class='del'>-		"=====================================================================\n"</div><div class='del'>-		"* h * size * ln * lb * rn * rb * blkn * s0 * s1 * s1b * s2 * s2b * curb * lk * rk *\n"</div><div class='del'>-		"* 0 * %4d * %2d * %2d * %2d * %2d * %4d * %2d * %2d * %3d * %2d * %3d * %4d * %2d * %2d *\n",</div><div class='del'>-		tb-&gt;insert_size[0], tb-&gt;lnum[0], tb-&gt;lbytes, tb-&gt;rnum[0],</div><div class='del'>-		tb-&gt;rbytes, tb-&gt;blknum[0], tb-&gt;s0num, tb-&gt;snum[0],</div><div class='del'>-		tb-&gt;sbytes[0], tb-&gt;snum[1], tb-&gt;sbytes[1],</div><div class='del'>-		tb-&gt;cur_blknum, tb-&gt;lkey[0], tb-&gt;rkey[0]);</div><div class='del'>-</div><div class='del'>-	/* this prints balance parameters for non-leaf levels */</div><div class='del'>-	h = 0;</div><div class='del'>-	do {</div><div class='del'>-		h++;</div><div class='del'>-		sprintf(print_tb_buf + strlen(print_tb_buf),</div><div class='del'>-			"* %d * %4d * %2d *    * %2d *    * %2d *\n",</div><div class='del'>-			h, tb-&gt;insert_size[h], tb-&gt;lnum[h], tb-&gt;rnum[h],</div><div class='del'>-			tb-&gt;blknum[h]);</div><div class='del'>-	} while (tb-&gt;insert_size[h]);</div><div class='del'>-</div><div class='del'>-	sprintf(print_tb_buf + strlen(print_tb_buf),</div><div class='del'>-		"=====================================================================\n"</div><div class='del'>-		"FEB list: ");</div><div class='del'>-</div><div class='del'>-	/* print FEB list (list of buffers in form (bh (b_blocknr, b_count), that will be used for new nodes) */</div><div class='del'>-	h = 0;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tb-&gt;FEB); i++)</div><div class='del'>-		sprintf(print_tb_buf + strlen(print_tb_buf),</div><div class='del'>-			"%p (%llu %d)%s", tb-&gt;FEB[i],</div><div class='del'>-			tb-&gt;FEB[i] ? (unsigned long long)tb-&gt;FEB[i]-&gt;</div><div class='del'>-			b_blocknr : 0ULL,</div><div class='del'>-			tb-&gt;FEB[i] ? atomic_read(&amp;tb-&gt;FEB[i]-&gt;b_count) : 0,</div><div class='del'>-			(i == ARRAY_SIZE(tb-&gt;FEB) - 1) ? "\n" : ", ");</div><div class='del'>-</div><div class='del'>-	sprintf(print_tb_buf + strlen(print_tb_buf),</div><div class='del'>-		"======================== the end ====================================\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void print_cur_tb(char *mes)</div><div class='del'>-{</div><div class='del'>-	printk("%s\n%s", mes, print_tb_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_leaf_block_head(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	int nr;</div><div class='del'>-</div><div class='del'>-	blkh = B_BLK_HEAD(bh);</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-	if (nr &gt; (bh-&gt;b_size - BLKH_SIZE) / IH_SIZE)</div><div class='del'>-		reiserfs_panic(NULL, "vs-6010", "invalid item number %z",</div><div class='del'>-			       bh);</div><div class='del'>-	if (blkh_free_space(blkh) &gt; bh-&gt;b_size - BLKH_SIZE - IH_SIZE * nr)</div><div class='del'>-		reiserfs_panic(NULL, "vs-6020", "invalid free space %z",</div><div class='del'>-			       bh);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_internal_block_head(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	if (!(B_LEVEL(bh) &gt; DISK_LEAF_NODE_LEVEL &amp;&amp; B_LEVEL(bh) &lt;= MAX_HEIGHT))</div><div class='del'>-		reiserfs_panic(NULL, "vs-6025", "invalid level %z", bh);</div><div class='del'>-</div><div class='del'>-	if (B_NR_ITEMS(bh) &gt; (bh-&gt;b_size - BLKH_SIZE) / IH_SIZE)</div><div class='del'>-		reiserfs_panic(NULL, "vs-6030", "invalid item number %z", bh);</div><div class='del'>-</div><div class='del'>-	if (B_FREE_SPACE(bh) !=</div><div class='del'>-	    bh-&gt;b_size - BLKH_SIZE - KEY_SIZE * B_NR_ITEMS(bh) -</div><div class='del'>-	    DC_SIZE * (B_NR_ITEMS(bh) + 1))</div><div class='del'>-		reiserfs_panic(NULL, "vs-6040", "invalid free space %z", bh);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void check_leaf(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-</div><div class='del'>-	if (!bh)</div><div class='del'>-		return;</div><div class='del'>-	check_leaf_block_head(bh);</div><div class='del'>-	for (i = 0, ih = item_head(bh, 0); i &lt; B_NR_ITEMS(bh); i++, ih++)</div><div class='del'>-		op_check_item(ih, ih_item_body(bh, ih));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void check_internal(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	if (!bh)</div><div class='del'>-		return;</div><div class='del'>-	check_internal_block_head(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void print_statistics(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	   printk ("reiserfs_put_super: session statistics: balances %d, fix_nodes %d, \</div><div class='del'>-	   bmap with search %d, without %d, dir2ind %d, ind2dir %d\n",</div><div class='del'>-	   REISERFS_SB(s)-&gt;s_do_balance, REISERFS_SB(s)-&gt;s_fix_nodes,</div><div class='del'>-	   REISERFS_SB(s)-&gt;s_bmaps, REISERFS_SB(s)-&gt;s_bmaps_without_search,</div><div class='del'>-	   REISERFS_SB(s)-&gt;s_direct2indirect, REISERFS_SB(s)-&gt;s_indirect2direct);</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c<br/>deleted file mode 100644<br/>index 5c68a4a52d78..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/procfs.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/procfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,490 +0,0 @@</div><div class='del'>-/* -*- linux-c -*- */</div><div class='del'>-</div><div class='del'>-/* fs/reiserfs/procfs.c */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* proc info support a la one created by Sizif@Botik.RU for PGC */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * LOCKING:</div><div class='del'>- *</div><div class='del'>- * These guys are evicted from procfs as the very first step in -&gt;kill_sb().</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int show_version(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	char *format;</div><div class='del'>-</div><div class='del'>-	if (REISERFS_SB(sb)-&gt;s_properties &amp; (1 &lt;&lt; REISERFS_3_6)) {</div><div class='del'>-		format = "3.6";</div><div class='del'>-	} else if (REISERFS_SB(sb)-&gt;s_properties &amp; (1 &lt;&lt; REISERFS_3_5)) {</div><div class='del'>-		format = "3.5";</div><div class='del'>-	} else {</div><div class='del'>-		format = "unknown";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "%s format\twith checks %s\n", format,</div><div class='del'>-#if defined( CONFIG_REISERFS_CHECK )</div><div class='del'>-		   "on"</div><div class='del'>-#else</div><div class='del'>-		   "off"</div><div class='del'>-#endif</div><div class='del'>-	    );</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SF( x ) ( r -&gt; x )</div><div class='del'>-#define SFP( x ) SF( s_proc_info_data.x )</div><div class='del'>-#define SFPL( x ) SFP( x[ level ] )</div><div class='del'>-#define SFPF( x ) SFP( scan_bitmap.x )</div><div class='del'>-#define SFPJ( x ) SFP( journal.x )</div><div class='del'>-</div><div class='del'>-#define D2C( x ) le16_to_cpu( x )</div><div class='del'>-#define D4C( x ) le32_to_cpu( x )</div><div class='del'>-#define DF( x ) D2C( rs -&gt; s_v1.x )</div><div class='del'>-#define DFL( x ) D4C( rs -&gt; s_v1.x )</div><div class='del'>-</div><div class='del'>-#define objectid_map( s, rs ) (old_format_only (s) ?				\</div><div class='del'>-                         (__le32 *)((struct reiserfs_super_block_v1 *)rs + 1) :	\</div><div class='del'>-			 (__le32 *)(rs + 1))</div><div class='del'>-#define MAP( i ) D4C( objectid_map( sb, rs )[ i ] )</div><div class='del'>-</div><div class='del'>-#define DJF( x ) le32_to_cpu( rs -&gt; x )</div><div class='del'>-#define DJP( x ) le32_to_cpu( jp -&gt; x )</div><div class='del'>-#define JF( x ) ( r -&gt; s_journal -&gt; x )</div><div class='del'>-</div><div class='del'>-static int show_super(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	struct reiserfs_sb_info *r = REISERFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "state: \t%s\n"</div><div class='del'>-		   "mount options: \t%s%s%s%s%s%s%s%s%s%s%s\n"</div><div class='del'>-		   "gen. counter: \t%i\n"</div><div class='del'>-		   "s_disk_reads: \t%i\n"</div><div class='del'>-		   "s_disk_writes: \t%i\n"</div><div class='del'>-		   "s_fix_nodes: \t%i\n"</div><div class='del'>-		   "s_do_balance: \t%i\n"</div><div class='del'>-		   "s_unneeded_left_neighbor: \t%i\n"</div><div class='del'>-		   "s_good_search_by_key_reada: \t%i\n"</div><div class='del'>-		   "s_bmaps: \t%i\n"</div><div class='del'>-		   "s_bmaps_without_search: \t%i\n"</div><div class='del'>-		   "s_direct2indirect: \t%i\n"</div><div class='del'>-		   "s_indirect2direct: \t%i\n"</div><div class='del'>-		   "\n"</div><div class='del'>-		   "max_hash_collisions: \t%i\n"</div><div class='del'>-		   "breads: \t%lu\n"</div><div class='del'>-		   "bread_misses: \t%lu\n"</div><div class='del'>-		   "search_by_key: \t%lu\n"</div><div class='del'>-		   "search_by_key_fs_changed: \t%lu\n"</div><div class='del'>-		   "search_by_key_restarted: \t%lu\n"</div><div class='del'>-		   "insert_item_restarted: \t%lu\n"</div><div class='del'>-		   "paste_into_item_restarted: \t%lu\n"</div><div class='del'>-		   "cut_from_item_restarted: \t%lu\n"</div><div class='del'>-		   "delete_solid_item_restarted: \t%lu\n"</div><div class='del'>-		   "delete_item_restarted: \t%lu\n"</div><div class='del'>-		   "leaked_oid: \t%lu\n"</div><div class='del'>-		   "leaves_removable: \t%lu\n",</div><div class='del'>-		   SF(s_mount_state) == REISERFS_VALID_FS ?</div><div class='del'>-		   "REISERFS_VALID_FS" : "REISERFS_ERROR_FS",</div><div class='del'>-		   reiserfs_r5_hash(sb) ? "FORCE_R5 " : "",</div><div class='del'>-		   reiserfs_rupasov_hash(sb) ? "FORCE_RUPASOV " : "",</div><div class='del'>-		   reiserfs_tea_hash(sb) ? "FORCE_TEA " : "",</div><div class='del'>-		   reiserfs_hash_detect(sb) ? "DETECT_HASH " : "",</div><div class='del'>-		   reiserfs_no_border(sb) ? "NO_BORDER " : "BORDER ",</div><div class='del'>-		   reiserfs_no_unhashed_relocation(sb) ?</div><div class='del'>-		   "NO_UNHASHED_RELOCATION " : "",</div><div class='del'>-		   reiserfs_hashed_relocation(sb) ? "UNHASHED_RELOCATION " : "",</div><div class='del'>-		   reiserfs_test4(sb) ? "TEST4 " : "",</div><div class='del'>-		   have_large_tails(sb) ? "TAILS " : have_small_tails(sb) ?</div><div class='del'>-		   "SMALL_TAILS " : "NO_TAILS ",</div><div class='del'>-		   replay_only(sb) ? "REPLAY_ONLY " : "",</div><div class='del'>-		   convert_reiserfs(sb) ? "CONV " : "",</div><div class='del'>-		   atomic_read(&amp;r-&gt;s_generation_counter),</div><div class='del'>-		   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),</div><div class='del'>-		   SF(s_do_balance), SF(s_unneeded_left_neighbor),</div><div class='del'>-		   SF(s_good_search_by_key_reada), SF(s_bmaps),</div><div class='del'>-		   SF(s_bmaps_without_search), SF(s_direct2indirect),</div><div class='del'>-		   SF(s_indirect2direct), SFP(max_hash_collisions), SFP(breads),</div><div class='del'>-		   SFP(bread_miss), SFP(search_by_key),</div><div class='del'>-		   SFP(search_by_key_fs_changed), SFP(search_by_key_restarted),</div><div class='del'>-		   SFP(insert_item_restarted), SFP(paste_into_item_restarted),</div><div class='del'>-		   SFP(cut_from_item_restarted),</div><div class='del'>-		   SFP(delete_solid_item_restarted), SFP(delete_item_restarted),</div><div class='del'>-		   SFP(leaked_oid), SFP(leaves_removable));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int show_per_level(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	struct reiserfs_sb_info *r = REISERFS_SB(sb);</div><div class='del'>-	int level;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "level\t"</div><div class='del'>-		   "     balances"</div><div class='del'>-		   " [sbk:  reads"</div><div class='del'>-		   "   fs_changed"</div><div class='del'>-		   "   restarted]"</div><div class='del'>-		   "   free space"</div><div class='del'>-		   "        items"</div><div class='del'>-		   "   can_remove"</div><div class='del'>-		   "         lnum"</div><div class='del'>-		   "         rnum"</div><div class='del'>-		   "       lbytes"</div><div class='del'>-		   "       rbytes"</div><div class='del'>-		   "     get_neig"</div><div class='del'>-		   " get_neig_res" "  need_l_neig" "  need_r_neig" "\n");</div><div class='del'>-</div><div class='del'>-	for (level = 0; level &lt; MAX_HEIGHT; ++level) {</div><div class='del'>-		seq_printf(m, "%i\t"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12li"</div><div class='del'>-			   " %12li"</div><div class='del'>-			   " %12li"</div><div class='del'>-			   " %12li"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   " %12lu"</div><div class='del'>-			   "\n",</div><div class='del'>-			   level,</div><div class='del'>-			   SFPL(balance_at),</div><div class='del'>-			   SFPL(sbk_read_at),</div><div class='del'>-			   SFPL(sbk_fs_changed),</div><div class='del'>-			   SFPL(sbk_restarted),</div><div class='del'>-			   SFPL(free_at),</div><div class='del'>-			   SFPL(items_at),</div><div class='del'>-			   SFPL(can_node_be_removed),</div><div class='del'>-			   SFPL(lnum),</div><div class='del'>-			   SFPL(rnum),</div><div class='del'>-			   SFPL(lbytes),</div><div class='del'>-			   SFPL(rbytes),</div><div class='del'>-			   SFPL(get_neighbors),</div><div class='del'>-			   SFPL(get_neighbors_restart),</div><div class='del'>-			   SFPL(need_l_neighbor), SFPL(need_r_neighbor)</div><div class='del'>-		    );</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int show_bitmap(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	struct reiserfs_sb_info *r = REISERFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "free_block: %lu\n"</div><div class='del'>-		   "  scan_bitmap:"</div><div class='del'>-		   "          wait"</div><div class='del'>-		   "          bmap"</div><div class='del'>-		   "         retry"</div><div class='del'>-		   "        stolen"</div><div class='del'>-		   "  journal_hint"</div><div class='del'>-		   "journal_nohint"</div><div class='del'>-		   "\n"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   " %14lu"</div><div class='del'>-		   "\n",</div><div class='del'>-		   SFP(free_block),</div><div class='del'>-		   SFPF(call),</div><div class='del'>-		   SFPF(wait),</div><div class='del'>-		   SFPF(bmap),</div><div class='del'>-		   SFPF(retry),</div><div class='del'>-		   SFPF(stolen),</div><div class='del'>-		   SFPF(in_journal_hint), SFPF(in_journal_nohint));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int show_on_disk_super(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	struct reiserfs_sb_info *sb_info = REISERFS_SB(sb);</div><div class='del'>-	struct reiserfs_super_block *rs = sb_info-&gt;s_rs;</div><div class='del'>-	int hash_code = DFL(s_hash_function_code);</div><div class='del'>-	__u32 flags = DJF(s_flags);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "block_count: \t%i\n"</div><div class='del'>-		   "free_blocks: \t%i\n"</div><div class='del'>-		   "root_block: \t%i\n"</div><div class='del'>-		   "blocksize: \t%i\n"</div><div class='del'>-		   "oid_maxsize: \t%i\n"</div><div class='del'>-		   "oid_cursize: \t%i\n"</div><div class='del'>-		   "umount_state: \t%i\n"</div><div class='del'>-		   "magic: \t%10.10s\n"</div><div class='del'>-		   "fs_state: \t%i\n"</div><div class='del'>-		   "hash: \t%s\n"</div><div class='del'>-		   "tree_height: \t%i\n"</div><div class='del'>-		   "bmap_nr: \t%i\n"</div><div class='del'>-		   "version: \t%i\n"</div><div class='del'>-		   "flags: \t%x[%s]\n"</div><div class='del'>-		   "reserved_for_journal: \t%i\n",</div><div class='del'>-		   DFL(s_block_count),</div><div class='del'>-		   DFL(s_free_blocks),</div><div class='del'>-		   DFL(s_root_block),</div><div class='del'>-		   DF(s_blocksize),</div><div class='del'>-		   DF(s_oid_maxsize),</div><div class='del'>-		   DF(s_oid_cursize),</div><div class='del'>-		   DF(s_umount_state),</div><div class='del'>-		   rs-&gt;s_v1.s_magic,</div><div class='del'>-		   DF(s_fs_state),</div><div class='del'>-		   hash_code == TEA_HASH ? "tea" :</div><div class='del'>-		   (hash_code == YURA_HASH) ? "rupasov" :</div><div class='del'>-		   (hash_code == R5_HASH) ? "r5" :</div><div class='del'>-		   (hash_code == UNSET_HASH) ? "unset" : "unknown",</div><div class='del'>-		   DF(s_tree_height),</div><div class='del'>-		   DF(s_bmap_nr),</div><div class='del'>-		   DF(s_version), flags, (flags &amp; reiserfs_attrs_cleared)</div><div class='del'>-		   ? "attrs_cleared" : "", DF(s_reserved_for_journal));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int show_oidmap(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	struct reiserfs_sb_info *sb_info = REISERFS_SB(sb);</div><div class='del'>-	struct reiserfs_super_block *rs = sb_info-&gt;s_rs;</div><div class='del'>-	unsigned int mapsize = le16_to_cpu(rs-&gt;s_v1.s_oid_cursize);</div><div class='del'>-	unsigned long total_used = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; mapsize; ++i) {</div><div class='del'>-		__u32 right;</div><div class='del'>-</div><div class='del'>-		right = (i == mapsize - 1) ? MAX_KEY_OBJECTID : MAP(i + 1);</div><div class='del'>-		seq_printf(m, "%s: [ %x .. %x )\n",</div><div class='del'>-			   (i &amp; 1) ? "free" : "used", MAP(i), right);</div><div class='del'>-		if (!(i &amp; 1)) {</div><div class='del'>-			total_used += right - MAP(i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#if defined( REISERFS_USE_OIDMAPF )</div><div class='del'>-	if (sb_info-&gt;oidmap.use_file &amp;&amp; (sb_info-&gt;oidmap.mapf != NULL)) {</div><div class='del'>-		loff_t size = file_inode(sb_info-&gt;oidmap.mapf)-&gt;i_size;</div><div class='del'>-		total_used += size / sizeof(reiserfs_oidinterval_d_t);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	seq_printf(m, "total: \t%i [%i/%i] used: %lu [exact]\n",</div><div class='del'>-		   mapsize,</div><div class='del'>-		   mapsize, le16_to_cpu(rs-&gt;s_v1.s_oid_maxsize), total_used);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static time64_t ktime_mono_to_real_seconds(time64_t mono)</div><div class='del'>-{</div><div class='del'>-	ktime_t kt = ktime_set(mono, NSEC_PER_SEC/2);</div><div class='del'>-</div><div class='del'>-	return ktime_divns(ktime_mono_to_real(kt), NSEC_PER_SEC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int show_journal(struct seq_file *m, void *unused)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = m-&gt;private;</div><div class='del'>-	struct reiserfs_sb_info *r = REISERFS_SB(sb);</div><div class='del'>-	struct reiserfs_super_block *rs = r-&gt;s_rs;</div><div class='del'>-	struct journal_params *jp = &amp;rs-&gt;s_v1.s_journal;</div><div class='del'>-</div><div class='del'>-	seq_printf(m,		/* on-disk fields */</div><div class='del'>-		   "jp_journal_1st_block: \t%i\n"</div><div class='del'>-		   "jp_journal_dev: \t%pg[%x]\n"</div><div class='del'>-		   "jp_journal_size: \t%i\n"</div><div class='del'>-		   "jp_journal_trans_max: \t%i\n"</div><div class='del'>-		   "jp_journal_magic: \t%i\n"</div><div class='del'>-		   "jp_journal_max_batch: \t%i\n"</div><div class='del'>-		   "jp_journal_max_commit_age: \t%i\n"</div><div class='del'>-		   "jp_journal_max_trans_age: \t%i\n"</div><div class='del'>-		   /* incore fields */</div><div class='del'>-		   "j_1st_reserved_block: \t%i\n"</div><div class='del'>-		   "j_state: \t%li\n"</div><div class='del'>-		   "j_trans_id: \t%u\n"</div><div class='del'>-		   "j_mount_id: \t%lu\n"</div><div class='del'>-		   "j_start: \t%lu\n"</div><div class='del'>-		   "j_len: \t%lu\n"</div><div class='del'>-		   "j_len_alloc: \t%lu\n"</div><div class='del'>-		   "j_wcount: \t%i\n"</div><div class='del'>-		   "j_bcount: \t%lu\n"</div><div class='del'>-		   "j_first_unflushed_offset: \t%lu\n"</div><div class='del'>-		   "j_last_flush_trans_id: \t%u\n"</div><div class='del'>-		   "j_trans_start_time: \t%lli\n"</div><div class='del'>-		   "j_list_bitmap_index: \t%i\n"</div><div class='del'>-		   "j_must_wait: \t%i\n"</div><div class='del'>-		   "j_next_full_flush: \t%i\n"</div><div class='del'>-		   "j_next_async_flush: \t%i\n"</div><div class='del'>-		   "j_cnode_used: \t%i\n" "j_cnode_free: \t%i\n" "\n"</div><div class='del'>-		   /* reiserfs_proc_info_data_t.journal fields */</div><div class='del'>-		   "in_journal: \t%12lu\n"</div><div class='del'>-		   "in_journal_bitmap: \t%12lu\n"</div><div class='del'>-		   "in_journal_reusable: \t%12lu\n"</div><div class='del'>-		   "lock_journal: \t%12lu\n"</div><div class='del'>-		   "lock_journal_wait: \t%12lu\n"</div><div class='del'>-		   "journal_begin: \t%12lu\n"</div><div class='del'>-		   "journal_relock_writers: \t%12lu\n"</div><div class='del'>-		   "journal_relock_wcount: \t%12lu\n"</div><div class='del'>-		   "mark_dirty: \t%12lu\n"</div><div class='del'>-		   "mark_dirty_already: \t%12lu\n"</div><div class='del'>-		   "mark_dirty_notjournal: \t%12lu\n"</div><div class='del'>-		   "restore_prepared: \t%12lu\n"</div><div class='del'>-		   "prepare: \t%12lu\n"</div><div class='del'>-		   "prepare_retry: \t%12lu\n",</div><div class='del'>-		   DJP(jp_journal_1st_block),</div><div class='del'>-		   file_bdev(SB_JOURNAL(sb)-&gt;j_bdev_file),</div><div class='del'>-		   DJP(jp_journal_dev),</div><div class='del'>-		   DJP(jp_journal_size),</div><div class='del'>-		   DJP(jp_journal_trans_max),</div><div class='del'>-		   DJP(jp_journal_magic),</div><div class='del'>-		   DJP(jp_journal_max_batch),</div><div class='del'>-		   SB_JOURNAL(sb)-&gt;j_max_commit_age,</div><div class='del'>-		   DJP(jp_journal_max_trans_age),</div><div class='del'>-		   JF(j_1st_reserved_block),</div><div class='del'>-		   JF(j_state),</div><div class='del'>-		   JF(j_trans_id),</div><div class='del'>-		   JF(j_mount_id),</div><div class='del'>-		   JF(j_start),</div><div class='del'>-		   JF(j_len),</div><div class='del'>-		   JF(j_len_alloc),</div><div class='del'>-		   atomic_read(&amp;r-&gt;s_journal-&gt;j_wcount),</div><div class='del'>-		   JF(j_bcount),</div><div class='del'>-		   JF(j_first_unflushed_offset),</div><div class='del'>-		   JF(j_last_flush_trans_id),</div><div class='del'>-		   ktime_mono_to_real_seconds(JF(j_trans_start_time)),</div><div class='del'>-		   JF(j_list_bitmap_index),</div><div class='del'>-		   JF(j_must_wait),</div><div class='del'>-		   JF(j_next_full_flush),</div><div class='del'>-		   JF(j_next_async_flush),</div><div class='del'>-		   JF(j_cnode_used),</div><div class='del'>-		   JF(j_cnode_free),</div><div class='del'>-		   SFPJ(in_journal),</div><div class='del'>-		   SFPJ(in_journal_bitmap),</div><div class='del'>-		   SFPJ(in_journal_reusable),</div><div class='del'>-		   SFPJ(lock_journal),</div><div class='del'>-		   SFPJ(lock_journal_wait),</div><div class='del'>-		   SFPJ(journal_being),</div><div class='del'>-		   SFPJ(journal_relock_writers),</div><div class='del'>-		   SFPJ(journal_relock_wcount),</div><div class='del'>-		   SFPJ(mark_dirty),</div><div class='del'>-		   SFPJ(mark_dirty_already),</div><div class='del'>-		   SFPJ(mark_dirty_notjournal),</div><div class='del'>-		   SFPJ(restore_prepared), SFPJ(prepare), SFPJ(prepare_retry)</div><div class='del'>-	    );</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct proc_dir_entry *proc_info_root = NULL;</div><div class='del'>-static const char proc_info_root_name[] = "fs/reiserfs";</div><div class='del'>-</div><div class='del'>-static void add_file(struct super_block *sb, char *name,</div><div class='del'>-		     int (*func) (struct seq_file *, void *))</div><div class='del'>-{</div><div class='del'>-	proc_create_single_data(name, 0, REISERFS_SB(sb)-&gt;procdir, func, sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_proc_info_init(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	char b[BDEVNAME_SIZE];</div><div class='del'>-	char *s;</div><div class='del'>-</div><div class='del'>-	/* Some block devices use /'s */</div><div class='del'>-	strscpy(b, sb-&gt;s_id, BDEVNAME_SIZE);</div><div class='del'>-	s = strchr(b, '/');</div><div class='del'>-	if (s)</div><div class='del'>-		*s = '!';</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;__PINFO(sb).lock);</div><div class='del'>-	REISERFS_SB(sb)-&gt;procdir = proc_mkdir_data(b, 0, proc_info_root, sb);</div><div class='del'>-	if (REISERFS_SB(sb)-&gt;procdir) {</div><div class='del'>-		add_file(sb, "version", show_version);</div><div class='del'>-		add_file(sb, "super", show_super);</div><div class='del'>-		add_file(sb, "per-level", show_per_level);</div><div class='del'>-		add_file(sb, "bitmap", show_bitmap);</div><div class='del'>-		add_file(sb, "on-disk-super", show_on_disk_super);</div><div class='del'>-		add_file(sb, "oidmap", show_oidmap);</div><div class='del'>-		add_file(sb, "journal", show_journal);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_warning(sb, "cannot create /proc/%s/%s",</div><div class='del'>-			 proc_info_root_name, b);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_proc_info_done(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct proc_dir_entry *de = REISERFS_SB(sb)-&gt;procdir;</div><div class='del'>-	if (de) {</div><div class='del'>-		char b[BDEVNAME_SIZE];</div><div class='del'>-		char *s;</div><div class='del'>-</div><div class='del'>-		/* Some block devices use /'s */</div><div class='del'>-		strscpy(b, sb-&gt;s_id, BDEVNAME_SIZE);</div><div class='del'>-		s = strchr(b, '/');</div><div class='del'>-		if (s)</div><div class='del'>-			*s = '!';</div><div class='del'>-</div><div class='del'>-		remove_proc_subtree(b, proc_info_root);</div><div class='del'>-		REISERFS_SB(sb)-&gt;procdir = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_proc_info_global_init(void)</div><div class='del'>-{</div><div class='del'>-	if (proc_info_root == NULL) {</div><div class='del'>-		proc_info_root = proc_mkdir(proc_info_root_name, NULL);</div><div class='del'>-		if (!proc_info_root) {</div><div class='del'>-			reiserfs_warning(NULL, "cannot create /proc/%s",</div><div class='del'>-					 proc_info_root_name);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_proc_info_global_done(void)</div><div class='del'>-{</div><div class='del'>-	if (proc_info_root != NULL) {</div><div class='del'>-		proc_info_root = NULL;</div><div class='del'>-		remove_proc_entry(proc_info_root_name, NULL);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * Revision 1.1.8.2  2001/07/15 17:08:42  god</div><div class='del'>- *  . use get_super() in procfs.c</div><div class='del'>- *  . remove remove_save_link() from reiserfs_do_truncate()</div><div class='del'>- *</div><div class='del'>- * I accept terms and conditions stated in the Legal Agreement</div><div class='del'>- * (available at http://www.namesys.com/legalese.html)</div><div class='del'>- *</div><div class='del'>- * Revision 1.1.8.1  2001/07/11 16:48:50  god</div><div class='del'>- * proc info support</div><div class='del'>- *</div><div class='del'>- * I accept terms and conditions stated in the Legal Agreement</div><div class='del'>- * (available at http://www.namesys.com/legalese.html)</div><div class='del'>- *</div><div class='del'>- */</div><div class='head'>diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h<br/>deleted file mode 100644<br/>index 0554903f42a9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/reiserfs.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/reiserfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3419 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Copyright 1996, 1997, 1998 Hans Reiser, see reiserfs/README for</div><div class='del'>- * licensing and copyright details</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/reiserfs_fs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-/* the 32 bit compat definitions with int argument */</div><div class='del'>-#define REISERFS_IOC32_UNPACK		_IOW(0xCD, 1, int)</div><div class='del'>-#define REISERFS_IOC32_GETVERSION	FS_IOC32_GETVERSION</div><div class='del'>-#define REISERFS_IOC32_SETVERSION	FS_IOC32_SETVERSION</div><div class='del'>-</div><div class='del'>-struct reiserfs_journal_list;</div><div class='del'>-</div><div class='del'>-/* bitmasks for i_flags field in reiserfs-specific part of inode */</div><div class='del'>-typedef enum {</div><div class='del'>-	/*</div><div class='del'>-	 * this says what format of key do all items (but stat data) of</div><div class='del'>-	 * an object have.  If this is set, that format is 3.6 otherwise - 3.5</div><div class='del'>-	 */</div><div class='del'>-	i_item_key_version_mask = 0x0001,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If this is unset, object has 3.5 stat data, otherwise,</div><div class='del'>-	 * it has 3.6 stat data with 64bit size, 32bit nlink etc.</div><div class='del'>-	 */</div><div class='del'>-	i_stat_data_version_mask = 0x0002,</div><div class='del'>-</div><div class='del'>-	/* file might need tail packing on close */</div><div class='del'>-	i_pack_on_close_mask = 0x0004,</div><div class='del'>-</div><div class='del'>-	/* don't pack tail of file */</div><div class='del'>-	i_nopack_mask = 0x0008,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If either of these are set, "safe link" was created for this</div><div class='del'>-	 * file during truncate or unlink. Safe link is used to avoid</div><div class='del'>-	 * leakage of disk space on crash with some files open, but unlinked.</div><div class='del'>-	 */</div><div class='del'>-	i_link_saved_unlink_mask = 0x0010,</div><div class='del'>-	i_link_saved_truncate_mask = 0x0020,</div><div class='del'>-</div><div class='del'>-	i_has_xattr_dir = 0x0040,</div><div class='del'>-	i_data_log = 0x0080,</div><div class='del'>-} reiserfs_inode_flags;</div><div class='del'>-</div><div class='del'>-struct reiserfs_inode_info {</div><div class='del'>-	__u32 i_key[4];		/* key is still 4 32 bit integers */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * transient inode flags that are never stored on disk. Bitmasks</div><div class='del'>-	 * for this field are defined above.</div><div class='del'>-	 */</div><div class='del'>-	__u32 i_flags;</div><div class='del'>-</div><div class='del'>-	/* offset of first byte stored in direct item. */</div><div class='del'>-	__u32 i_first_direct_byte;</div><div class='del'>-</div><div class='del'>-	/* copy of persistent inode flags read from sd_attrs. */</div><div class='del'>-	__u32 i_attrs;</div><div class='del'>-</div><div class='del'>-	/* first unused block of a sequence of unused blocks */</div><div class='del'>-	int i_prealloc_block;</div><div class='del'>-	int i_prealloc_count;	/* length of that sequence */</div><div class='del'>-</div><div class='del'>-	/* per-transaction list of inodes which  have preallocated blocks */</div><div class='del'>-	struct list_head i_prealloc_list;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * new_packing_locality is created; new blocks for the contents</div><div class='del'>-	 * of this directory should be displaced</div><div class='del'>-	 */</div><div class='del'>-	unsigned new_packing_locality:1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we use these for fsync or O_SYNC to decide which transaction</div><div class='del'>-	 * needs to be committed in order for this inode to be properly</div><div class='del'>-	 * flushed</div><div class='del'>-	 */</div><div class='del'>-	unsigned int i_trans_id;</div><div class='del'>-</div><div class='del'>-	struct reiserfs_journal_list *i_jl;</div><div class='del'>-	atomic_t openers;</div><div class='del'>-	struct mutex tailpack;</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_XATTR</div><div class='del'>-	struct rw_semaphore i_xattr_sem;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	struct dquot *i_dquot[MAXQUOTAS];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	struct inode vfs_inode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	reiserfs_attrs_cleared = 0x00000001,</div><div class='del'>-} reiserfs_super_block_flags;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * struct reiserfs_super_block accessors/mutators since this is a disk</div><div class='del'>- * structure, it will always be in little endian format.</div><div class='del'>- */</div><div class='del'>-#define sb_block_count(sbp)         (le32_to_cpu((sbp)-&gt;s_v1.s_block_count))</div><div class='del'>-#define set_sb_block_count(sbp,v)   ((sbp)-&gt;s_v1.s_block_count = cpu_to_le32(v))</div><div class='del'>-#define sb_free_blocks(sbp)         (le32_to_cpu((sbp)-&gt;s_v1.s_free_blocks))</div><div class='del'>-#define set_sb_free_blocks(sbp,v)   ((sbp)-&gt;s_v1.s_free_blocks = cpu_to_le32(v))</div><div class='del'>-#define sb_root_block(sbp)          (le32_to_cpu((sbp)-&gt;s_v1.s_root_block))</div><div class='del'>-#define set_sb_root_block(sbp,v)    ((sbp)-&gt;s_v1.s_root_block = cpu_to_le32(v))</div><div class='del'>-</div><div class='del'>-#define sb_jp_journal_1st_block(sbp)  \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_1st_block))</div><div class='del'>-#define set_sb_jp_journal_1st_block(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_1st_block = cpu_to_le32(v))</div><div class='del'>-#define sb_jp_journal_dev(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_dev))</div><div class='del'>-#define set_sb_jp_journal_dev(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_dev = cpu_to_le32(v))</div><div class='del'>-#define sb_jp_journal_size(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_size))</div><div class='del'>-#define set_sb_jp_journal_size(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_size = cpu_to_le32(v))</div><div class='del'>-#define sb_jp_journal_trans_max(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_trans_max))</div><div class='del'>-#define set_sb_jp_journal_trans_max(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_trans_max = cpu_to_le32(v))</div><div class='del'>-#define sb_jp_journal_magic(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_magic))</div><div class='del'>-#define set_sb_jp_journal_magic(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_magic = cpu_to_le32(v))</div><div class='del'>-#define sb_jp_journal_max_batch(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_max_batch))</div><div class='del'>-#define set_sb_jp_journal_max_batch(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_max_batch = cpu_to_le32(v))</div><div class='del'>-#define sb_jp_jourmal_max_commit_age(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_journal.jp_journal_max_commit_age))</div><div class='del'>-#define set_sb_jp_journal_max_commit_age(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_journal.jp_journal_max_commit_age = cpu_to_le32(v))</div><div class='del'>-</div><div class='del'>-#define sb_blocksize(sbp)          (le16_to_cpu((sbp)-&gt;s_v1.s_blocksize))</div><div class='del'>-#define set_sb_blocksize(sbp,v)    ((sbp)-&gt;s_v1.s_blocksize = cpu_to_le16(v))</div><div class='del'>-#define sb_oid_maxsize(sbp)        (le16_to_cpu((sbp)-&gt;s_v1.s_oid_maxsize))</div><div class='del'>-#define set_sb_oid_maxsize(sbp,v)  ((sbp)-&gt;s_v1.s_oid_maxsize = cpu_to_le16(v))</div><div class='del'>-#define sb_oid_cursize(sbp)        (le16_to_cpu((sbp)-&gt;s_v1.s_oid_cursize))</div><div class='del'>-#define set_sb_oid_cursize(sbp,v)  ((sbp)-&gt;s_v1.s_oid_cursize = cpu_to_le16(v))</div><div class='del'>-#define sb_umount_state(sbp)       (le16_to_cpu((sbp)-&gt;s_v1.s_umount_state))</div><div class='del'>-#define set_sb_umount_state(sbp,v) ((sbp)-&gt;s_v1.s_umount_state = cpu_to_le16(v))</div><div class='del'>-#define sb_fs_state(sbp)           (le16_to_cpu((sbp)-&gt;s_v1.s_fs_state))</div><div class='del'>-#define set_sb_fs_state(sbp,v)     ((sbp)-&gt;s_v1.s_fs_state = cpu_to_le16(v))</div><div class='del'>-#define sb_hash_function_code(sbp) \</div><div class='del'>-              (le32_to_cpu((sbp)-&gt;s_v1.s_hash_function_code))</div><div class='del'>-#define set_sb_hash_function_code(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_hash_function_code = cpu_to_le32(v))</div><div class='del'>-#define sb_tree_height(sbp)        (le16_to_cpu((sbp)-&gt;s_v1.s_tree_height))</div><div class='del'>-#define set_sb_tree_height(sbp,v)  ((sbp)-&gt;s_v1.s_tree_height = cpu_to_le16(v))</div><div class='del'>-#define sb_bmap_nr(sbp)            (le16_to_cpu((sbp)-&gt;s_v1.s_bmap_nr))</div><div class='del'>-#define set_sb_bmap_nr(sbp,v)      ((sbp)-&gt;s_v1.s_bmap_nr = cpu_to_le16(v))</div><div class='del'>-#define sb_version(sbp)            (le16_to_cpu((sbp)-&gt;s_v1.s_version))</div><div class='del'>-#define set_sb_version(sbp,v)      ((sbp)-&gt;s_v1.s_version = cpu_to_le16(v))</div><div class='del'>-</div><div class='del'>-#define sb_mnt_count(sbp)	   (le16_to_cpu((sbp)-&gt;s_mnt_count))</div><div class='del'>-#define set_sb_mnt_count(sbp, v)   ((sbp)-&gt;s_mnt_count = cpu_to_le16(v))</div><div class='del'>-</div><div class='del'>-#define sb_reserved_for_journal(sbp) \</div><div class='del'>-              (le16_to_cpu((sbp)-&gt;s_v1.s_reserved_for_journal))</div><div class='del'>-#define set_sb_reserved_for_journal(sbp,v) \</div><div class='del'>-              ((sbp)-&gt;s_v1.s_reserved_for_journal = cpu_to_le16(v))</div><div class='del'>-</div><div class='del'>-/* LOGGING -- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These all interelate for performance.</div><div class='del'>- *</div><div class='del'>- * If the journal block count is smaller than n transactions, you lose speed.</div><div class='del'>- * I don't know what n is yet, I'm guessing 8-16.</div><div class='del'>- *</div><div class='del'>- * typical transaction size depends on the application, how often fsync is</div><div class='del'>- * called, and how many metadata blocks you dirty in a 30 second period.</div><div class='del'>- * The more small files (&lt;16k) you use, the larger your transactions will</div><div class='del'>- * be.</div><div class='del'>- *</div><div class='del'>- * If your journal fills faster than dirty buffers get flushed to disk, it</div><div class='del'>- * must flush them before allowing the journal to wrap, which slows things</div><div class='del'>- * down.  If you need high speed meta data updates, the journal should be</div><div class='del'>- * big enough to prevent wrapping before dirty meta blocks get to disk.</div><div class='del'>- *</div><div class='del'>- * If the batch max is smaller than the transaction max, you'll waste space</div><div class='del'>- * at the end of the journal because journal_end sets the next transaction</div><div class='del'>- * to start at 0 if the next transaction has any chance of wrapping.</div><div class='del'>- *</div><div class='del'>- * The large the batch max age, the better the speed, and the more meta</div><div class='del'>- * data changes you'll lose after a crash.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* don't mess with these for a while */</div><div class='del'>-/* we have a node size define somewhere in reiserfs_fs.h. -Hans */</div><div class='del'>-#define JOURNAL_BLOCK_SIZE  4096	/* BUG gotta get rid of this */</div><div class='del'>-#define JOURNAL_MAX_CNODE   1500	/* max cnodes to allocate. */</div><div class='del'>-#define JOURNAL_HASH_SIZE 8192</div><div class='del'>-</div><div class='del'>-/* number of copies of the bitmaps to have floating.  Must be &gt;= 2 */</div><div class='del'>-#define JOURNAL_NUM_BITMAPS 5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * One of these for every block in every transaction</div><div class='del'>- * Each one is in two hash tables.  First, a hash of the current transaction,</div><div class='del'>- * and after journal_end, a hash of all the in memory transactions.</div><div class='del'>- * next and prev are used by the current transaction (journal_hash).</div><div class='del'>- * hnext and hprev are used by journal_list_hash.  If a block is in more</div><div class='del'>- * than one transaction, the journal_list_hash links it in multiple times.</div><div class='del'>- * This allows flush_journal_list to remove just the cnode belonging to a</div><div class='del'>- * given transaction.</div><div class='del'>- */</div><div class='del'>-struct reiserfs_journal_cnode {</div><div class='del'>-	struct buffer_head *bh;	/* real buffer head */</div><div class='del'>-	struct super_block *sb;	/* dev of real buffer head */</div><div class='del'>-</div><div class='del'>-	/* block number of real buffer head, == 0 when buffer on disk */</div><div class='del'>-	__u32 blocknr;</div><div class='del'>-</div><div class='del'>-	unsigned long state;</div><div class='del'>-</div><div class='del'>-	/* journal list this cnode lives in */</div><div class='del'>-	struct reiserfs_journal_list *jlist;</div><div class='del'>-</div><div class='del'>-	struct reiserfs_journal_cnode *next;	/* next in transaction list */</div><div class='del'>-	struct reiserfs_journal_cnode *prev;	/* prev in transaction list */</div><div class='del'>-	struct reiserfs_journal_cnode *hprev;	/* prev in hash list */</div><div class='del'>-	struct reiserfs_journal_cnode *hnext;	/* next in hash list */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct reiserfs_bitmap_node {</div><div class='del'>-	int id;</div><div class='del'>-	char *data;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct reiserfs_list_bitmap {</div><div class='del'>-	struct reiserfs_journal_list *journal_list;</div><div class='del'>-	struct reiserfs_bitmap_node **bitmaps;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * one of these for each transaction.  The most important part here is the</div><div class='del'>- * j_realblock.  this list of cnodes is used to hash all the blocks in all</div><div class='del'>- * the commits, to mark all the real buffer heads dirty once all the commits</div><div class='del'>- * hit the disk, and to make sure every real block in a transaction is on</div><div class='del'>- * disk before allowing the log area to be overwritten</div><div class='del'>- */</div><div class='del'>-struct reiserfs_journal_list {</div><div class='del'>-	unsigned long j_start;</div><div class='del'>-	unsigned long j_state;</div><div class='del'>-	unsigned long j_len;</div><div class='del'>-	atomic_t j_nonzerolen;</div><div class='del'>-	atomic_t j_commit_left;</div><div class='del'>-</div><div class='del'>-	/* all commits older than this on disk */</div><div class='del'>-	atomic_t j_older_commits_done;</div><div class='del'>-</div><div class='del'>-	struct mutex j_commit_mutex;</div><div class='del'>-	unsigned int j_trans_id;</div><div class='del'>-	time64_t j_timestamp; /* write-only but useful for crash dump analysis */</div><div class='del'>-	struct reiserfs_list_bitmap *j_list_bitmap;</div><div class='del'>-	struct buffer_head *j_commit_bh;	/* commit buffer head */</div><div class='del'>-	struct reiserfs_journal_cnode *j_realblock;</div><div class='del'>-	struct reiserfs_journal_cnode *j_freedlist;	/* list of buffers that were freed during this trans.  free each of these on flush */</div><div class='del'>-	/* time ordered list of all active transactions */</div><div class='del'>-	struct list_head j_list;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * time ordered list of all transactions we haven't tried</div><div class='del'>-	 * to flush yet</div><div class='del'>-	 */</div><div class='del'>-	struct list_head j_working_list;</div><div class='del'>-</div><div class='del'>-	/* list of tail conversion targets in need of flush before commit */</div><div class='del'>-	struct list_head j_tail_bh_list;</div><div class='del'>-</div><div class='del'>-	/* list of data=ordered buffers in need of flush before commit */</div><div class='del'>-	struct list_head j_bh_list;</div><div class='del'>-	int j_refcount;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct reiserfs_journal {</div><div class='del'>-	struct buffer_head **j_ap_blocks;	/* journal blocks on disk */</div><div class='del'>-	/* newest journal block */</div><div class='del'>-	struct reiserfs_journal_cnode *j_last;</div><div class='del'>-</div><div class='del'>-	/* oldest journal block.  start here for traverse */</div><div class='del'>-	struct reiserfs_journal_cnode *j_first;</div><div class='del'>-</div><div class='del'>-	struct file *j_bdev_file;</div><div class='del'>-</div><div class='del'>-	/* first block on s_dev of reserved area journal */</div><div class='del'>-	int j_1st_reserved_block;</div><div class='del'>-</div><div class='del'>-	unsigned long j_state;</div><div class='del'>-	unsigned int j_trans_id;</div><div class='del'>-	unsigned long j_mount_id;</div><div class='del'>-</div><div class='del'>-	/* start of current waiting commit (index into j_ap_blocks) */</div><div class='del'>-	unsigned long j_start;</div><div class='del'>-	unsigned long j_len;	/* length of current waiting commit */</div><div class='del'>-</div><div class='del'>-	/* number of buffers requested by journal_begin() */</div><div class='del'>-	unsigned long j_len_alloc;</div><div class='del'>-</div><div class='del'>-	atomic_t j_wcount;	/* count of writers for current commit */</div><div class='del'>-</div><div class='del'>-	/* batch count. allows turning X transactions into 1 */</div><div class='del'>-	unsigned long j_bcount;</div><div class='del'>-</div><div class='del'>-	/* first unflushed transactions offset */</div><div class='del'>-	unsigned long j_first_unflushed_offset;</div><div class='del'>-</div><div class='del'>-	/* last fully flushed journal timestamp */</div><div class='del'>-	unsigned j_last_flush_trans_id;</div><div class='del'>-</div><div class='del'>-	struct buffer_head *j_header_bh;</div><div class='del'>-</div><div class='del'>-	time64_t j_trans_start_time;	/* time this transaction started */</div><div class='del'>-	struct mutex j_mutex;</div><div class='del'>-	struct mutex j_flush_mutex;</div><div class='del'>-</div><div class='del'>-	/* wait for current transaction to finish before starting new one */</div><div class='del'>-	wait_queue_head_t j_join_wait;</div><div class='del'>-</div><div class='del'>-	atomic_t j_jlock;		/* lock for j_join_wait */</div><div class='del'>-	int j_list_bitmap_index;	/* number of next list bitmap to use */</div><div class='del'>-</div><div class='del'>-	/* no more journal begins allowed. MUST sleep on j_join_wait */</div><div class='del'>-	int j_must_wait;</div><div class='del'>-</div><div class='del'>-	/* next journal_end will flush all journal list */</div><div class='del'>-	int j_next_full_flush;</div><div class='del'>-</div><div class='del'>-	/* next journal_end will flush all async commits */</div><div class='del'>-	int j_next_async_flush;</div><div class='del'>-</div><div class='del'>-	int j_cnode_used;	/* number of cnodes on the used list */</div><div class='del'>-	int j_cnode_free;	/* number of cnodes on the free list */</div><div class='del'>-</div><div class='del'>-	/* max number of blocks in a transaction.  */</div><div class='del'>-	unsigned int j_trans_max;</div><div class='del'>-</div><div class='del'>-	/* max number of blocks to batch into a trans */</div><div class='del'>-	unsigned int j_max_batch;</div><div class='del'>-</div><div class='del'>-	/* in seconds, how old can an async commit be */</div><div class='del'>-	unsigned int j_max_commit_age;</div><div class='del'>-</div><div class='del'>-	/* in seconds, how old can a transaction be */</div><div class='del'>-	unsigned int j_max_trans_age;</div><div class='del'>-</div><div class='del'>-	/* the default for the max commit age */</div><div class='del'>-	unsigned int j_default_max_commit_age;</div><div class='del'>-</div><div class='del'>-	struct reiserfs_journal_cnode *j_cnode_free_list;</div><div class='del'>-</div><div class='del'>-	/* orig pointer returned from vmalloc */</div><div class='del'>-	struct reiserfs_journal_cnode *j_cnode_free_orig;</div><div class='del'>-</div><div class='del'>-	struct reiserfs_journal_list *j_current_jl;</div><div class='del'>-	int j_free_bitmap_nodes;</div><div class='del'>-	int j_used_bitmap_nodes;</div><div class='del'>-</div><div class='del'>-	int j_num_lists;	/* total number of active transactions */</div><div class='del'>-	int j_num_work_lists;	/* number that need attention from kreiserfsd */</div><div class='del'>-</div><div class='del'>-	/* debugging to make sure things are flushed in order */</div><div class='del'>-	unsigned int j_last_flush_id;</div><div class='del'>-</div><div class='del'>-	/* debugging to make sure things are committed in order */</div><div class='del'>-	unsigned int j_last_commit_id;</div><div class='del'>-</div><div class='del'>-	struct list_head j_bitmap_nodes;</div><div class='del'>-	struct list_head j_dirty_buffers;</div><div class='del'>-	spinlock_t j_dirty_buffers_lock;	/* protects j_dirty_buffers */</div><div class='del'>-</div><div class='del'>-	/* list of all active transactions */</div><div class='del'>-	struct list_head j_journal_list;</div><div class='del'>-</div><div class='del'>-	/* lists that haven't been touched by writeback attempts */</div><div class='del'>-	struct list_head j_working_list;</div><div class='del'>-</div><div class='del'>-	/* hash table for real buffer heads in current trans */</div><div class='del'>-	struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE];</div><div class='del'>-</div><div class='del'>-	/* hash table for all the real buffer heads in all the transactions */</div><div class='del'>-	struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE];</div><div class='del'>-</div><div class='del'>-	/* array of bitmaps to record the deleted blocks */</div><div class='del'>-	struct reiserfs_list_bitmap j_list_bitmap[JOURNAL_NUM_BITMAPS];</div><div class='del'>-</div><div class='del'>-	/* list of inodes which have preallocated blocks */</div><div class='del'>-	struct list_head j_prealloc_list;</div><div class='del'>-	int j_persistent_trans;</div><div class='del'>-	unsigned long j_max_trans_size;</div><div class='del'>-	unsigned long j_max_batch_size;</div><div class='del'>-</div><div class='del'>-	int j_errno;</div><div class='del'>-</div><div class='del'>-	/* when flushing ordered buffers, throttle new ordered writers */</div><div class='del'>-	struct delayed_work j_work;</div><div class='del'>-	struct super_block *j_work_sb;</div><div class='del'>-	atomic_t j_async_throttle;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum journal_state_bits {</div><div class='del'>-	J_WRITERS_BLOCKED = 1,	/* set when new writers not allowed */</div><div class='del'>-	J_WRITERS_QUEUED,    /* set when log is full due to too many writers */</div><div class='del'>-	J_ABORTED,           /* set when log is aborted */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ick.  magic string to find desc blocks in the journal */</div><div class='del'>-#define JOURNAL_DESC_MAGIC "ReIsErLB"</div><div class='del'>-</div><div class='del'>-typedef __u32(*hashf_t) (const signed char *, int);</div><div class='del'>-</div><div class='del'>-struct reiserfs_bitmap_info {</div><div class='del'>-	__u32 free_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct proc_dir_entry;</div><div class='del'>-</div><div class='del'>-#if defined( CONFIG_PROC_FS ) &amp;&amp; defined( CONFIG_REISERFS_PROC_INFO )</div><div class='del'>-typedef unsigned long int stat_cnt_t;</div><div class='del'>-typedef struct reiserfs_proc_info_data {</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	int exiting;</div><div class='del'>-	int max_hash_collisions;</div><div class='del'>-</div><div class='del'>-	stat_cnt_t breads;</div><div class='del'>-	stat_cnt_t bread_miss;</div><div class='del'>-	stat_cnt_t search_by_key;</div><div class='del'>-	stat_cnt_t search_by_key_fs_changed;</div><div class='del'>-	stat_cnt_t search_by_key_restarted;</div><div class='del'>-</div><div class='del'>-	stat_cnt_t insert_item_restarted;</div><div class='del'>-	stat_cnt_t paste_into_item_restarted;</div><div class='del'>-	stat_cnt_t cut_from_item_restarted;</div><div class='del'>-	stat_cnt_t delete_solid_item_restarted;</div><div class='del'>-	stat_cnt_t delete_item_restarted;</div><div class='del'>-</div><div class='del'>-	stat_cnt_t leaked_oid;</div><div class='del'>-	stat_cnt_t leaves_removable;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * balances per level.</div><div class='del'>-	 * Use explicit 5 as MAX_HEIGHT is not visible yet.</div><div class='del'>-	 */</div><div class='del'>-	stat_cnt_t balance_at[5];	/* XXX */</div><div class='del'>-	/* sbk == search_by_key */</div><div class='del'>-	stat_cnt_t sbk_read_at[5];	/* XXX */</div><div class='del'>-	stat_cnt_t sbk_fs_changed[5];</div><div class='del'>-	stat_cnt_t sbk_restarted[5];</div><div class='del'>-	stat_cnt_t items_at[5];	/* XXX */</div><div class='del'>-	stat_cnt_t free_at[5];	/* XXX */</div><div class='del'>-	stat_cnt_t can_node_be_removed[5];	/* XXX */</div><div class='del'>-	long int lnum[5];	/* XXX */</div><div class='del'>-	long int rnum[5];	/* XXX */</div><div class='del'>-	long int lbytes[5];	/* XXX */</div><div class='del'>-	long int rbytes[5];	/* XXX */</div><div class='del'>-	stat_cnt_t get_neighbors[5];</div><div class='del'>-	stat_cnt_t get_neighbors_restart[5];</div><div class='del'>-	stat_cnt_t need_l_neighbor[5];</div><div class='del'>-	stat_cnt_t need_r_neighbor[5];</div><div class='del'>-</div><div class='del'>-	stat_cnt_t free_block;</div><div class='del'>-	struct __scan_bitmap_stats {</div><div class='del'>-		stat_cnt_t call;</div><div class='del'>-		stat_cnt_t wait;</div><div class='del'>-		stat_cnt_t bmap;</div><div class='del'>-		stat_cnt_t retry;</div><div class='del'>-		stat_cnt_t in_journal_hint;</div><div class='del'>-		stat_cnt_t in_journal_nohint;</div><div class='del'>-		stat_cnt_t stolen;</div><div class='del'>-	} scan_bitmap;</div><div class='del'>-	struct __journal_stats {</div><div class='del'>-		stat_cnt_t in_journal;</div><div class='del'>-		stat_cnt_t in_journal_bitmap;</div><div class='del'>-		stat_cnt_t in_journal_reusable;</div><div class='del'>-		stat_cnt_t lock_journal;</div><div class='del'>-		stat_cnt_t lock_journal_wait;</div><div class='del'>-		stat_cnt_t journal_being;</div><div class='del'>-		stat_cnt_t journal_relock_writers;</div><div class='del'>-		stat_cnt_t journal_relock_wcount;</div><div class='del'>-		stat_cnt_t mark_dirty;</div><div class='del'>-		stat_cnt_t mark_dirty_already;</div><div class='del'>-		stat_cnt_t mark_dirty_notjournal;</div><div class='del'>-		stat_cnt_t restore_prepared;</div><div class='del'>-		stat_cnt_t prepare;</div><div class='del'>-		stat_cnt_t prepare_retry;</div><div class='del'>-	} journal;</div><div class='del'>-} reiserfs_proc_info_data_t;</div><div class='del'>-#else</div><div class='del'>-typedef struct reiserfs_proc_info_data {</div><div class='del'>-} reiserfs_proc_info_data_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Number of quota types we support */</div><div class='del'>-#define REISERFS_MAXQUOTAS 2</div><div class='del'>-</div><div class='del'>-/* reiserfs union of in-core super block data */</div><div class='del'>-struct reiserfs_sb_info {</div><div class='del'>-	/* Buffer containing the super block */</div><div class='del'>-	struct buffer_head *s_sbh;</div><div class='del'>-</div><div class='del'>-	/* Pointer to the on-disk super block in the buffer */</div><div class='del'>-	struct reiserfs_super_block *s_rs;</div><div class='del'>-	struct reiserfs_bitmap_info *s_ap_bitmap;</div><div class='del'>-</div><div class='del'>-	/* pointer to journal information */</div><div class='del'>-	struct reiserfs_journal *s_journal;</div><div class='del'>-</div><div class='del'>-	unsigned short s_mount_state;	/* reiserfs state (valid, invalid) */</div><div class='del'>-</div><div class='del'>-	/* Serialize writers access, replace the old bkl */</div><div class='del'>-	struct mutex lock;</div><div class='del'>-</div><div class='del'>-	/* Owner of the lock (can be recursive) */</div><div class='del'>-	struct task_struct *lock_owner;</div><div class='del'>-</div><div class='del'>-	/* Depth of the lock, start from -1 like the bkl */</div><div class='del'>-	int lock_depth;</div><div class='del'>-</div><div class='del'>-	struct workqueue_struct *commit_wq;</div><div class='del'>-</div><div class='del'>-	/* Comment? -Hans */</div><div class='del'>-	void (*end_io_handler) (struct buffer_head *, int);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * pointer to function which is used to sort names in directory.</div><div class='del'>-	 * Set on mount</div><div class='del'>-	 */</div><div class='del'>-	hashf_t s_hash_function;</div><div class='del'>-</div><div class='del'>-	/* reiserfs's mount options are set here */</div><div class='del'>-	unsigned long s_mount_opt;</div><div class='del'>-</div><div class='del'>-	/* This is a structure that describes block allocator options */</div><div class='del'>-	struct {</div><div class='del'>-		/* Bitfield for enable/disable kind of options */</div><div class='del'>-		unsigned long bits;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * size started from which we consider file</div><div class='del'>-		 * to be a large one (in blocks)</div><div class='del'>-		 */</div><div class='del'>-		unsigned long large_file_size;</div><div class='del'>-</div><div class='del'>-		int border;	/* percentage of disk, border takes */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Minimal file size (in blocks) starting</div><div class='del'>-		 * from which we do preallocations</div><div class='del'>-		 */</div><div class='del'>-		int preallocmin;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Number of blocks we try to prealloc when file</div><div class='del'>-		 * reaches preallocmin size (in blocks) or prealloc_list</div><div class='del'>-		 is empty.</div><div class='del'>-		 */</div><div class='del'>-		int preallocsize;</div><div class='del'>-	} s_alloc_options;</div><div class='del'>-</div><div class='del'>-	/* Comment? -Hans */</div><div class='del'>-	wait_queue_head_t s_wait;</div><div class='del'>-	/* increased by one every time the  tree gets re-balanced */</div><div class='del'>-	atomic_t s_generation_counter;</div><div class='del'>-</div><div class='del'>-	/* File system properties. Currently holds on-disk FS format */</div><div class='del'>-	unsigned long s_properties;</div><div class='del'>-</div><div class='del'>-	/* session statistics */</div><div class='del'>-	int s_disk_reads;</div><div class='del'>-	int s_disk_writes;</div><div class='del'>-	int s_fix_nodes;</div><div class='del'>-	int s_do_balance;</div><div class='del'>-	int s_unneeded_left_neighbor;</div><div class='del'>-	int s_good_search_by_key_reada;</div><div class='del'>-	int s_bmaps;</div><div class='del'>-	int s_bmaps_without_search;</div><div class='del'>-	int s_direct2indirect;</div><div class='del'>-	int s_indirect2direct;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set up when it's ok for reiserfs_read_inode2() to read from</div><div class='del'>-	 * disk inode with nlink==0. Currently this is only used during</div><div class='del'>-	 * finish_unfinished() processing at mount time</div><div class='del'>-	 */</div><div class='del'>-	int s_is_unlinked_ok;</div><div class='del'>-</div><div class='del'>-	reiserfs_proc_info_data_t s_proc_info_data;</div><div class='del'>-	struct proc_dir_entry *procdir;</div><div class='del'>-</div><div class='del'>-	/* amount of blocks reserved for further allocations */</div><div class='del'>-	int reserved_blocks;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* this lock on now only used to protect reserved_blocks variable */</div><div class='del'>-	spinlock_t bitmap_lock;</div><div class='del'>-	struct dentry *priv_root;	/* root of /.reiserfs_priv */</div><div class='del'>-	struct dentry *xattr_root;	/* root of /.reiserfs_priv/xattrs */</div><div class='del'>-	int j_errno;</div><div class='del'>-</div><div class='del'>-	int work_queued;              /* non-zero delayed work is queued */</div><div class='del'>-	struct delayed_work old_work; /* old transactions flush delayed work */</div><div class='del'>-	spinlock_t old_work_lock;     /* protects old_work and work_queued */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	char *s_qf_names[REISERFS_MAXQUOTAS];</div><div class='del'>-	int s_jquota_fmt;</div><div class='del'>-#endif</div><div class='del'>-	char *s_jdev;		/* Stored jdev for mount option showing */</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Detects whether more than one copy of tb exists per superblock</div><div class='del'>-	 * as a means of checking whether do_balance is executing</div><div class='del'>-	 * concurrently against another tree reader/writer on a same</div><div class='del'>-	 * mount point.</div><div class='del'>-	 */</div><div class='del'>-	struct tree_balance *cur_tb;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Definitions of reiserfs on-disk properties: */</div><div class='del'>-#define REISERFS_3_5 0</div><div class='del'>-#define REISERFS_3_6 1</div><div class='del'>-#define REISERFS_OLD_FORMAT 2</div><div class='del'>-</div><div class='del'>-/* Mount options */</div><div class='del'>-enum reiserfs_mount_options {</div><div class='del'>-	/* large tails will be created in a session */</div><div class='del'>-	REISERFS_LARGETAIL,</div><div class='del'>-	/*</div><div class='del'>-	 * small (for files less than block size) tails will</div><div class='del'>-	 * be created in a session</div><div class='del'>-	 */</div><div class='del'>-	REISERFS_SMALLTAIL,</div><div class='del'>-</div><div class='del'>-	/* replay journal and return 0. Use by fsck */</div><div class='del'>-	REPLAYONLY,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * -o conv: causes conversion of old format super block to the</div><div class='del'>-	 * new format. If not specified - old partition will be dealt</div><div class='del'>-	 * with in a manner of 3.5.x</div><div class='del'>-	 */</div><div class='del'>-	REISERFS_CONVERT,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * -o hash={tea, rupasov, r5, detect} is meant for properly mounting</div><div class='del'>-	 * reiserfs disks from 3.5.19 or earlier.  99% of the time, this</div><div class='del'>-	 * option is not required.  If the normal autodection code can't</div><div class='del'>-	 * determine which hash to use (because both hashes had the same</div><div class='del'>-	 * value for a file) use this option to force a specific hash.</div><div class='del'>-	 * It won't allow you to override the existing hash on the FS, so</div><div class='del'>-	 * if you have a tea hash disk, and mount with -o hash=rupasov,</div><div class='del'>-	 * the mount will fail.</div><div class='del'>-	 */</div><div class='del'>-	FORCE_TEA_HASH,		/* try to force tea hash on mount */</div><div class='del'>-	FORCE_RUPASOV_HASH,	/* try to force rupasov hash on mount */</div><div class='del'>-	FORCE_R5_HASH,		/* try to force rupasov hash on mount */</div><div class='del'>-	FORCE_HASH_DETECT,	/* try to detect hash function on mount */</div><div class='del'>-</div><div class='del'>-	REISERFS_DATA_LOG,</div><div class='del'>-	REISERFS_DATA_ORDERED,</div><div class='del'>-	REISERFS_DATA_WRITEBACK,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * used for testing experimental features, makes benchmarking new</div><div class='del'>-	 * features with and without more convenient, should never be used by</div><div class='del'>-	 * users in any code shipped to users (ideally)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	REISERFS_NO_BORDER,</div><div class='del'>-	REISERFS_NO_UNHASHED_RELOCATION,</div><div class='del'>-	REISERFS_HASHED_RELOCATION,</div><div class='del'>-	REISERFS_ATTRS,</div><div class='del'>-	REISERFS_XATTRS_USER,</div><div class='del'>-	REISERFS_POSIXACL,</div><div class='del'>-	REISERFS_EXPOSE_PRIVROOT,</div><div class='del'>-	REISERFS_BARRIER_NONE,</div><div class='del'>-	REISERFS_BARRIER_FLUSH,</div><div class='del'>-</div><div class='del'>-	/* Actions on error */</div><div class='del'>-	REISERFS_ERROR_PANIC,</div><div class='del'>-	REISERFS_ERROR_RO,</div><div class='del'>-	REISERFS_ERROR_CONTINUE,</div><div class='del'>-</div><div class='del'>-	REISERFS_USRQUOTA,	/* User quota option specified */</div><div class='del'>-	REISERFS_GRPQUOTA,	/* Group quota option specified */</div><div class='del'>-</div><div class='del'>-	REISERFS_TEST1,</div><div class='del'>-	REISERFS_TEST2,</div><div class='del'>-	REISERFS_TEST3,</div><div class='del'>-	REISERFS_TEST4,</div><div class='del'>-	REISERFS_UNSUPPORTED_OPT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define reiserfs_r5_hash(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; FORCE_R5_HASH))</div><div class='del'>-#define reiserfs_rupasov_hash(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; FORCE_RUPASOV_HASH))</div><div class='del'>-#define reiserfs_tea_hash(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; FORCE_TEA_HASH))</div><div class='del'>-#define reiserfs_hash_detect(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; FORCE_HASH_DETECT))</div><div class='del'>-#define reiserfs_no_border(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_NO_BORDER))</div><div class='del'>-#define reiserfs_no_unhashed_relocation(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_NO_UNHASHED_RELOCATION))</div><div class='del'>-#define reiserfs_hashed_relocation(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_HASHED_RELOCATION))</div><div class='del'>-#define reiserfs_test4(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_TEST4))</div><div class='del'>-</div><div class='del'>-#define have_large_tails(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_LARGETAIL))</div><div class='del'>-#define have_small_tails(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_SMALLTAIL))</div><div class='del'>-#define replay_only(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REPLAYONLY))</div><div class='del'>-#define reiserfs_attrs(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_ATTRS))</div><div class='del'>-#define old_format_only(s) (REISERFS_SB(s)-&gt;s_properties &amp; (1 &lt;&lt; REISERFS_3_5))</div><div class='del'>-#define convert_reiserfs(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_CONVERT))</div><div class='del'>-#define reiserfs_data_log(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_DATA_LOG))</div><div class='del'>-#define reiserfs_data_ordered(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_DATA_ORDERED))</div><div class='del'>-#define reiserfs_data_writeback(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_DATA_WRITEBACK))</div><div class='del'>-#define reiserfs_xattrs_user(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_XATTRS_USER))</div><div class='del'>-#define reiserfs_posixacl(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_POSIXACL))</div><div class='del'>-#define reiserfs_expose_privroot(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_EXPOSE_PRIVROOT))</div><div class='del'>-#define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s))</div><div class='del'>-#define reiserfs_barrier_none(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_BARRIER_NONE))</div><div class='del'>-#define reiserfs_barrier_flush(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_BARRIER_FLUSH))</div><div class='del'>-</div><div class='del'>-#define reiserfs_error_panic(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_ERROR_PANIC))</div><div class='del'>-#define reiserfs_error_ro(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; (1 &lt;&lt; REISERFS_ERROR_RO))</div><div class='del'>-</div><div class='del'>-void reiserfs_file_buffer(struct buffer_head *bh, int list);</div><div class='del'>-extern struct file_system_type reiserfs_fs_type;</div><div class='del'>-int reiserfs_resize(struct super_block *, unsigned long);</div><div class='del'>-</div><div class='del'>-#define CARRY_ON                0</div><div class='del'>-#define SCHEDULE_OCCURRED       1</div><div class='del'>-</div><div class='del'>-#define SB_BUFFER_WITH_SB(s) (REISERFS_SB(s)-&gt;s_sbh)</div><div class='del'>-#define SB_JOURNAL(s) (REISERFS_SB(s)-&gt;s_journal)</div><div class='del'>-#define SB_JOURNAL_1st_RESERVED_BLOCK(s) (SB_JOURNAL(s)-&gt;j_1st_reserved_block)</div><div class='del'>-#define SB_JOURNAL_LEN_FREE(s) (SB_JOURNAL(s)-&gt;j_journal_len_free)</div><div class='del'>-#define SB_AP_BITMAP(s) (REISERFS_SB(s)-&gt;s_ap_bitmap)</div><div class='del'>-</div><div class='del'>-#define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)-&gt;j_header_bh-&gt;)</div><div class='del'>-</div><div class='del'>-#define reiserfs_is_journal_aborted(journal) (unlikely (__reiserfs_is_journal_aborted (journal)))</div><div class='del'>-static inline int __reiserfs_is_journal_aborted(struct reiserfs_journal</div><div class='del'>-						*journal)</div><div class='del'>-{</div><div class='del'>-	return test_bit(J_ABORTED, &amp;journal-&gt;j_state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Locking primitives. The write lock is a per superblock</div><div class='del'>- * special mutex that has properties close to the Big Kernel Lock</div><div class='del'>- * which was used in the previous locking scheme.</div><div class='del'>- */</div><div class='del'>-void reiserfs_write_lock(struct super_block *s);</div><div class='del'>-void reiserfs_write_unlock(struct super_block *s);</div><div class='del'>-int __must_check reiserfs_write_unlock_nested(struct super_block *s);</div><div class='del'>-void reiserfs_write_lock_nested(struct super_block *s, int depth);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-void reiserfs_lock_check_recursive(struct super_block *s);</div><div class='del'>-#else</div><div class='del'>-static inline void reiserfs_lock_check_recursive(struct super_block *s) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Several mutexes depend on the write lock.</div><div class='del'>- * However sometimes we want to relax the write lock while we hold</div><div class='del'>- * these mutexes, according to the release/reacquire on schedule()</div><div class='del'>- * properties of the Bkl that were used.</div><div class='del'>- * Reiserfs performances and locking were based on this scheme.</div><div class='del'>- * Now that the write lock is a mutex and not the bkl anymore, doing so</div><div class='del'>- * may result in a deadlock:</div><div class='del'>- *</div><div class='del'>- * A acquire write_lock</div><div class='del'>- * A acquire j_commit_mutex</div><div class='del'>- * A release write_lock and wait for something</div><div class='del'>- * B acquire write_lock</div><div class='del'>- * B can't acquire j_commit_mutex and sleep</div><div class='del'>- * A can't acquire write lock anymore</div><div class='del'>- * deadlock</div><div class='del'>- *</div><div class='del'>- * What we do here is avoiding such deadlock by playing the same game</div><div class='del'>- * than the Bkl: if we can't acquire a mutex that depends on the write lock,</div><div class='del'>- * we release the write lock, wait a bit and then retry.</div><div class='del'>- *</div><div class='del'>- * The mutexes concerned by this hack are:</div><div class='del'>- * - The commit mutex of a journal list</div><div class='del'>- * - The flush mutex</div><div class='del'>- * - The journal lock</div><div class='del'>- * - The inode mutex</div><div class='del'>- */</div><div class='del'>-static inline void reiserfs_mutex_lock_safe(struct mutex *m,</div><div class='del'>-					    struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-	mutex_lock(m);</div><div class='del'>-	reiserfs_write_lock_nested(s, depth);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-reiserfs_mutex_lock_nested_safe(struct mutex *m, unsigned int subclass,</div><div class='del'>-				struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-	mutex_lock_nested(m, subclass);</div><div class='del'>-	reiserfs_write_lock_nested(s, depth);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-reiserfs_down_read_safe(struct rw_semaphore *sem, struct super_block *s)</div><div class='del'>-{</div><div class='del'>-       int depth;</div><div class='del'>-       depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-       down_read(sem);</div><div class='del'>-       reiserfs_write_lock_nested(s, depth);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When we schedule, we usually want to also release the write lock,</div><div class='del'>- * according to the previous bkl based locking scheme of reiserfs.</div><div class='del'>- */</div><div class='del'>-static inline void reiserfs_cond_resched(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	if (need_resched()) {</div><div class='del'>-		int depth;</div><div class='del'>-</div><div class='del'>-		depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-		schedule();</div><div class='del'>-		reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct fid;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * in reading the #defines, it may help to understand that they employ</div><div class='del'>- *  the following abbreviations:</div><div class='del'>- *</div><div class='del'>- *  B = Buffer</div><div class='del'>- *  I = Item header</div><div class='del'>- *  H = Height within the tree (should be changed to LEV)</div><div class='del'>- *  N = Number of the item in the node</div><div class='del'>- *  STAT = stat data</div><div class='del'>- *  DEH = Directory Entry Header</div><div class='del'>- *  EC = Entry Count</div><div class='del'>- *  E = Entry number</div><div class='del'>- *  UL = Unsigned Long</div><div class='del'>- *  BLKH = BLocK Header</div><div class='del'>- *  UNFM = UNForMatted node</div><div class='del'>- *  DC = Disk Child</div><div class='del'>- *  P = Path</div><div class='del'>- *</div><div class='del'>- *  These #defines are named by concatenating these abbreviations,</div><div class='del'>- *  where first comes the arguments, and last comes the return value,</div><div class='del'>- *  of the macro.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define USE_INODE_GENERATION_COUNTER</div><div class='del'>-</div><div class='del'>-#define REISERFS_PREALLOCATE</div><div class='del'>-#define DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-#define PREALLOCATION_SIZE 9</div><div class='del'>-</div><div class='del'>-/* n must be power of 2 */</div><div class='del'>-#define _ROUND_UP(x,n) (((x)+(n)-1u) &amp; ~((n)-1u))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * to be ok for alpha and others we have to align structures to 8 byte</div><div class='del'>- * boundary.</div><div class='del'>- * FIXME: do not change 4 by anything else: there is code which relies on that</div><div class='del'>- */</div><div class='del'>-#define ROUND_UP(x) _ROUND_UP(x,8LL)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * debug levels.  Right now, CONFIG_REISERFS_CHECK means print all debug</div><div class='del'>- * messages.</div><div class='del'>- */</div><div class='del'>-#define REISERFS_DEBUG_CODE 5	/* extra messages to help find/debug errors */</div><div class='del'>-</div><div class='del'>-void __reiserfs_warning(struct super_block *s, const char *id,</div><div class='del'>-			 const char *func, const char *fmt, ...);</div><div class='del'>-#define reiserfs_warning(s, id, fmt, args...) \</div><div class='del'>-	 __reiserfs_warning(s, id, __func__, fmt, ##args)</div><div class='del'>-/* assertions handling */</div><div class='del'>-</div><div class='del'>-/* always check a condition and panic if it's false. */</div><div class='del'>-#define __RASSERT(cond, scond, format, args...)			\</div><div class='del'>-do {									\</div><div class='del'>-	if (!(cond))							\</div><div class='del'>-		reiserfs_panic(NULL, "assertion failure", "(" #cond ") at " \</div><div class='del'>-			       __FILE__ ":%i:%s: " format "\n",		\</div><div class='del'>-			       __LINE__, __func__ , ##args);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define RASSERT(cond, format, args...) __RASSERT(cond, #cond, format, ##args)</div><div class='del'>-</div><div class='del'>-#if defined( CONFIG_REISERFS_CHECK )</div><div class='del'>-#define RFALSE(cond, format, args...) __RASSERT(!(cond), "!(" #cond ")", format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define RFALSE( cond, format, args... ) do {;} while( 0 )</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CONSTF __attribute_const__</div><div class='del'>-/*</div><div class='del'>- * Disk Data Structures</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                             SUPER BLOCK                                 *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Structure of super block on disk, a version of which in RAM is often</div><div class='del'>- * accessed as REISERFS_SB(s)-&gt;s_rs. The version in RAM is part of a larger</div><div class='del'>- * structure containing fields never written to disk.</div><div class='del'>- */</div><div class='del'>-#define UNSET_HASH 0	/* Detect hash on disk */</div><div class='del'>-#define TEA_HASH  1</div><div class='del'>-#define YURA_HASH 2</div><div class='del'>-#define R5_HASH   3</div><div class='del'>-#define DEFAULT_HASH R5_HASH</div><div class='del'>-</div><div class='del'>-struct journal_params {</div><div class='del'>-	/* where does journal start from on its * device */</div><div class='del'>-	__le32 jp_journal_1st_block;</div><div class='del'>-</div><div class='del'>-	/* journal device st_rdev */</div><div class='del'>-	__le32 jp_journal_dev;</div><div class='del'>-</div><div class='del'>-	/* size of the journal */</div><div class='del'>-	__le32 jp_journal_size;</div><div class='del'>-</div><div class='del'>-	/* max number of blocks in a transaction. */</div><div class='del'>-	__le32 jp_journal_trans_max;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * random value made on fs creation</div><div class='del'>-	 * (this was sb_journal_block_count)</div><div class='del'>-	 */</div><div class='del'>-	__le32 jp_journal_magic;</div><div class='del'>-</div><div class='del'>-	/* max number of blocks to batch into a trans */</div><div class='del'>-	__le32 jp_journal_max_batch;</div><div class='del'>-</div><div class='del'>-	/* in seconds, how old can an async  commit be */</div><div class='del'>-	__le32 jp_journal_max_commit_age;</div><div class='del'>-</div><div class='del'>-	/* in seconds, how old can a transaction be */</div><div class='del'>-	__le32 jp_journal_max_trans_age;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* this is the super from 3.5.X, where X &gt;= 10 */</div><div class='del'>-struct reiserfs_super_block_v1 {</div><div class='del'>-	__le32 s_block_count;	/* blocks count         */</div><div class='del'>-	__le32 s_free_blocks;	/* free blocks count    */</div><div class='del'>-	__le32 s_root_block;	/* root block number    */</div><div class='del'>-	struct journal_params s_journal;</div><div class='del'>-	__le16 s_blocksize;	/* block size */</div><div class='del'>-</div><div class='del'>-	/* max size of object id array, see get_objectid() commentary  */</div><div class='del'>-	__le16 s_oid_maxsize;</div><div class='del'>-	__le16 s_oid_cursize;	/* current size of object id array */</div><div class='del'>-</div><div class='del'>-	/* this is set to 1 when filesystem was umounted, to 2 - when not */</div><div class='del'>-	__le16 s_umount_state;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reiserfs magic string indicates that file system is reiserfs:</div><div class='del'>-	 * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs"</div><div class='del'>-	 */</div><div class='del'>-	char s_magic[10];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * it is set to used by fsck to mark which</div><div class='del'>-	 * phase of rebuilding is done</div><div class='del'>-	 */</div><div class='del'>-	__le16 s_fs_state;</div><div class='del'>-	/*</div><div class='del'>-	 * indicate, what hash function is being use</div><div class='del'>-	 * to sort names in a directory</div><div class='del'>-	 */</div><div class='del'>-	__le32 s_hash_function_code;</div><div class='del'>-	__le16 s_tree_height;	/* height of disk tree */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * amount of bitmap blocks needed to address</div><div class='del'>-	 * each block of file system</div><div class='del'>-	 */</div><div class='del'>-	__le16 s_bmap_nr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this field is only reliable on filesystem with non-standard journal</div><div class='del'>-	 */</div><div class='del'>-	__le16 s_version;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * size in blocks of journal area on main device, we need to</div><div class='del'>-	 * keep after making fs with non-standard journal</div><div class='del'>-	 */</div><div class='del'>-	__le16 s_reserved_for_journal;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-#define SB_SIZE_V1 (sizeof(struct reiserfs_super_block_v1))</div><div class='del'>-</div><div class='del'>-/* this is the on disk super block */</div><div class='del'>-struct reiserfs_super_block {</div><div class='del'>-	struct reiserfs_super_block_v1 s_v1;</div><div class='del'>-	__le32 s_inode_generation;</div><div class='del'>-</div><div class='del'>-	/* Right now used only by inode-attributes, if enabled */</div><div class='del'>-	__le32 s_flags;</div><div class='del'>-</div><div class='del'>-	unsigned char s_uuid[16];	/* filesystem unique identifier */</div><div class='del'>-	unsigned char s_label[16];	/* filesystem volume label */</div><div class='del'>-	__le16 s_mnt_count;		/* Count of mounts since last fsck */</div><div class='del'>-	__le16 s_max_mnt_count;		/* Maximum mounts before check */</div><div class='del'>-	__le32 s_lastcheck;		/* Timestamp of last fsck */</div><div class='del'>-	__le32 s_check_interval;	/* Interval between checks */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * zero filled by mkreiserfs and reiserfs_convert_objectid_map_v1()</div><div class='del'>-	 * so any additions must be updated there as well. */</div><div class='del'>-	char s_unused[76];</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-#define SB_SIZE (sizeof(struct reiserfs_super_block))</div><div class='del'>-</div><div class='del'>-#define REISERFS_VERSION_1 0</div><div class='del'>-#define REISERFS_VERSION_2 2</div><div class='del'>-</div><div class='del'>-/* on-disk super block fields converted to cpu form */</div><div class='del'>-#define SB_DISK_SUPER_BLOCK(s) (REISERFS_SB(s)-&gt;s_rs)</div><div class='del'>-#define SB_V1_DISK_SUPER_BLOCK(s) (&amp;(SB_DISK_SUPER_BLOCK(s)-&gt;s_v1))</div><div class='del'>-#define SB_BLOCKSIZE(s) \</div><div class='del'>-        le32_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_blocksize))</div><div class='del'>-#define SB_BLOCK_COUNT(s) \</div><div class='del'>-        le32_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_block_count))</div><div class='del'>-#define SB_FREE_BLOCKS(s) \</div><div class='del'>-        le32_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_free_blocks))</div><div class='del'>-#define SB_REISERFS_MAGIC(s) \</div><div class='del'>-        (SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_magic)</div><div class='del'>-#define SB_ROOT_BLOCK(s) \</div><div class='del'>-        le32_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_root_block))</div><div class='del'>-#define SB_TREE_HEIGHT(s) \</div><div class='del'>-        le16_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_tree_height))</div><div class='del'>-#define SB_REISERFS_STATE(s) \</div><div class='del'>-        le16_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_umount_state))</div><div class='del'>-#define SB_VERSION(s) le16_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_version))</div><div class='del'>-#define SB_BMAP_NR(s) le16_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_bmap_nr))</div><div class='del'>-</div><div class='del'>-#define PUT_SB_BLOCK_COUNT(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_block_count = cpu_to_le32(val); } while (0)</div><div class='del'>-#define PUT_SB_FREE_BLOCKS(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_free_blocks = cpu_to_le32(val); } while (0)</div><div class='del'>-#define PUT_SB_ROOT_BLOCK(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_root_block = cpu_to_le32(val); } while (0)</div><div class='del'>-#define PUT_SB_TREE_HEIGHT(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_tree_height = cpu_to_le16(val); } while (0)</div><div class='del'>-#define PUT_SB_REISERFS_STATE(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_umount_state = cpu_to_le16(val); } while (0)</div><div class='del'>-#define PUT_SB_VERSION(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_version = cpu_to_le16(val); } while (0)</div><div class='del'>-#define PUT_SB_BMAP_NR(s, val) \</div><div class='del'>-   do { SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_bmap_nr = cpu_to_le16 (val); } while (0)</div><div class='del'>-</div><div class='del'>-#define SB_ONDISK_JP(s) (&amp;SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_journal)</div><div class='del'>-#define SB_ONDISK_JOURNAL_SIZE(s) \</div><div class='del'>-         le32_to_cpu ((SB_ONDISK_JP(s)-&gt;jp_journal_size))</div><div class='del'>-#define SB_ONDISK_JOURNAL_1st_BLOCK(s) \</div><div class='del'>-         le32_to_cpu ((SB_ONDISK_JP(s)-&gt;jp_journal_1st_block))</div><div class='del'>-#define SB_ONDISK_JOURNAL_DEVICE(s) \</div><div class='del'>-         le32_to_cpu ((SB_ONDISK_JP(s)-&gt;jp_journal_dev))</div><div class='del'>-#define SB_ONDISK_RESERVED_FOR_JOURNAL(s) \</div><div class='del'>-         le16_to_cpu ((SB_V1_DISK_SUPER_BLOCK(s)-&gt;s_reserved_for_journal))</div><div class='del'>-</div><div class='del'>-#define is_block_in_log_or_reserved_area(s, block) \</div><div class='del'>-         block &gt;= SB_JOURNAL_1st_RESERVED_BLOCK(s) \</div><div class='del'>-         &amp;&amp; block &lt; SB_JOURNAL_1st_RESERVED_BLOCK(s) +  \</div><div class='del'>-         ((!is_reiserfs_jr(SB_DISK_SUPER_BLOCK(s)) ? \</div><div class='del'>-         SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s)))</div><div class='del'>-</div><div class='del'>-int is_reiserfs_3_5(struct reiserfs_super_block *rs);</div><div class='del'>-int is_reiserfs_3_6(struct reiserfs_super_block *rs);</div><div class='del'>-int is_reiserfs_jr(struct reiserfs_super_block *rs);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ReiserFS leaves the first 64k unused, so that partition labels have</div><div class='del'>- * enough space.  If someone wants to write a fancy bootloader that</div><div class='del'>- * needs more than 64k, let us know, and this will be increased in size.</div><div class='del'>- * This number must be larger than the largest block size on any</div><div class='del'>- * platform, or code will break.  -Hans</div><div class='del'>- */</div><div class='del'>-#define REISERFS_DISK_OFFSET_IN_BYTES (64 * 1024)</div><div class='del'>-#define REISERFS_FIRST_BLOCK unused_define</div><div class='del'>-#define REISERFS_JOURNAL_OFFSET_IN_BYTES REISERFS_DISK_OFFSET_IN_BYTES</div><div class='del'>-</div><div class='del'>-/* the spot for the super in versions 3.5 - 3.5.10 (inclusive) */</div><div class='del'>-#define REISERFS_OLD_DISK_OFFSET_IN_BYTES (8 * 1024)</div><div class='del'>-</div><div class='del'>-/* reiserfs internal error code (used by search_by_key and fix_nodes)) */</div><div class='del'>-#define CARRY_ON      0</div><div class='del'>-#define REPEAT_SEARCH -1</div><div class='del'>-#define IO_ERROR      -2</div><div class='del'>-#define NO_DISK_SPACE -3</div><div class='del'>-#define NO_BALANCING_NEEDED  (-4)</div><div class='del'>-#define NO_MORE_UNUSED_CONTIGUOUS_BLOCKS (-5)</div><div class='del'>-#define QUOTA_EXCEEDED -6</div><div class='del'>-</div><div class='del'>-typedef __u32 b_blocknr_t;</div><div class='del'>-typedef __le32 unp_t;</div><div class='del'>-</div><div class='del'>-struct unfm_nodeinfo {</div><div class='del'>-	unp_t unfm_nodenum;</div><div class='del'>-	unsigned short unfm_freespace;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* there are two formats of keys: 3.5 and 3.6 */</div><div class='del'>-#define KEY_FORMAT_3_5 0</div><div class='del'>-#define KEY_FORMAT_3_6 1</div><div class='del'>-</div><div class='del'>-/* there are two stat datas */</div><div class='del'>-#define STAT_DATA_V1 0</div><div class='del'>-#define STAT_DATA_V2 1</div><div class='del'>-</div><div class='del'>-static inline struct reiserfs_inode_info *REISERFS_I(const struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return container_of(inode, struct reiserfs_inode_info, vfs_inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct reiserfs_sb_info *REISERFS_SB(const struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return sb-&gt;s_fs_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Don't trust REISERFS_SB(sb)-&gt;s_bmap_nr, it's a u16</div><div class='del'>- * which overflows on large file systems.</div><div class='del'>- */</div><div class='del'>-static inline __u32 reiserfs_bmap_count(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return (SB_BLOCK_COUNT(sb) - 1) / (sb-&gt;s_blocksize * 8) + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bmap_would_wrap(unsigned bmap_nr)</div><div class='del'>-{</div><div class='del'>-	return bmap_nr &gt; ((1LL &lt;&lt; 16) - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern const struct xattr_handler * const reiserfs_xattr_handlers[];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this says about version of key of all items (but stat data) the</div><div class='del'>- * object consists of</div><div class='del'>- */</div><div class='del'>-#define get_inode_item_key_version( inode )                                    \</div><div class='del'>-    ((REISERFS_I(inode)-&gt;i_flags &amp; i_item_key_version_mask) ? KEY_FORMAT_3_6 : KEY_FORMAT_3_5)</div><div class='del'>-</div><div class='del'>-#define set_inode_item_key_version( inode, version )                           \</div><div class='del'>-         ({ if((version)==KEY_FORMAT_3_6)                                      \</div><div class='del'>-                REISERFS_I(inode)-&gt;i_flags |= i_item_key_version_mask;      \</div><div class='del'>-            else                                                               \</div><div class='del'>-                REISERFS_I(inode)-&gt;i_flags &amp;= ~i_item_key_version_mask; })</div><div class='del'>-</div><div class='del'>-#define get_inode_sd_version(inode)                                            \</div><div class='del'>-    ((REISERFS_I(inode)-&gt;i_flags &amp; i_stat_data_version_mask) ? STAT_DATA_V2 : STAT_DATA_V1)</div><div class='del'>-</div><div class='del'>-#define set_inode_sd_version(inode, version)                                   \</div><div class='del'>-         ({ if((version)==STAT_DATA_V2)                                        \</div><div class='del'>-                REISERFS_I(inode)-&gt;i_flags |= i_stat_data_version_mask;     \</div><div class='del'>-            else                                                               \</div><div class='del'>-                REISERFS_I(inode)-&gt;i_flags &amp;= ~i_stat_data_version_mask; })</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is an aggressive tail suppression policy, I am hoping it</div><div class='del'>- * improves our benchmarks. The principle behind it is that percentage</div><div class='del'>- * space saving is what matters, not absolute space saving.  This is</div><div class='del'>- * non-intuitive, but it helps to understand it if you consider that the</div><div class='del'>- * cost to access 4 blocks is not much more than the cost to access 1</div><div class='del'>- * block, if you have to do a seek and rotate.  A tail risks a</div><div class='del'>- * non-linear disk access that is significant as a percentage of total</div><div class='del'>- * time cost for a 4 block file and saves an amount of space that is</div><div class='del'>- * less significant as a percentage of space, or so goes the hypothesis.</div><div class='del'>- * -Hans</div><div class='del'>- */</div><div class='del'>-#define STORE_TAIL_IN_UNFM_S1(n_file_size,n_tail_size,n_block_size) \</div><div class='del'>-(\</div><div class='del'>-  (!(n_tail_size)) || \</div><div class='del'>-  (((n_tail_size) &gt; MAX_DIRECT_ITEM_LEN(n_block_size)) || \</div><div class='del'>-   ( (n_file_size) &gt;= (n_block_size) * 4 ) || \</div><div class='del'>-   ( ( (n_file_size) &gt;= (n_block_size) * 3 ) &amp;&amp; \</div><div class='del'>-     ( (n_tail_size) &gt;=   (MAX_DIRECT_ITEM_LEN(n_block_size))/4) ) || \</div><div class='del'>-   ( ( (n_file_size) &gt;= (n_block_size) * 2 ) &amp;&amp; \</div><div class='del'>-     ( (n_tail_size) &gt;=   (MAX_DIRECT_ITEM_LEN(n_block_size))/2) ) || \</div><div class='del'>-   ( ( (n_file_size) &gt;= (n_block_size) ) &amp;&amp; \</div><div class='del'>-     ( (n_tail_size) &gt;=   (MAX_DIRECT_ITEM_LEN(n_block_size) * 3)/4) ) ) \</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Another strategy for tails, this one means only create a tail if all the</div><div class='del'>- * file would fit into one DIRECT item.</div><div class='del'>- * Primary intention for this one is to increase performance by decreasing</div><div class='del'>- * seeking.</div><div class='del'>-*/</div><div class='del'>-#define STORE_TAIL_IN_UNFM_S2(n_file_size,n_tail_size,n_block_size) \</div><div class='del'>-(\</div><div class='del'>-  (!(n_tail_size)) || \</div><div class='del'>-  (((n_file_size) &gt; MAX_DIRECT_ITEM_LEN(n_block_size)) ) \</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * values for s_umount_state field</div><div class='del'>- */</div><div class='del'>-#define REISERFS_VALID_FS    1</div><div class='del'>-#define REISERFS_ERROR_FS    2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * there are 5 item types currently</div><div class='del'>- */</div><div class='del'>-#define TYPE_STAT_DATA 0</div><div class='del'>-#define TYPE_INDIRECT 1</div><div class='del'>-#define TYPE_DIRECT 2</div><div class='del'>-#define TYPE_DIRENTRY 3</div><div class='del'>-#define TYPE_MAXTYPE 3</div><div class='del'>-#define TYPE_ANY 15		/* FIXME: comment is required */</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                       KEY &amp; ITEM HEAD                                   *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-/* * directories use this key as well as old files */</div><div class='del'>-struct offset_v1 {</div><div class='del'>-	__le32 k_offset;</div><div class='del'>-	__le32 k_uniqueness;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-struct offset_v2 {</div><div class='del'>-	__le64 v;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-static inline __u16 offset_v2_k_type(const struct offset_v2 *v2)</div><div class='del'>-{</div><div class='del'>-	__u8 type = le64_to_cpu(v2-&gt;v) &gt;&gt; 60;</div><div class='del'>-	return (type &lt;= TYPE_MAXTYPE) ? type : TYPE_ANY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_offset_v2_k_type(struct offset_v2 *v2, int type)</div><div class='del'>-{</div><div class='del'>-	v2-&gt;v =</div><div class='del'>-	    (v2-&gt;v &amp; cpu_to_le64(~0ULL &gt;&gt; 4)) | cpu_to_le64((__u64) type &lt;&lt; 60);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t offset_v2_k_offset(const struct offset_v2 *v2)</div><div class='del'>-{</div><div class='del'>-	return le64_to_cpu(v2-&gt;v) &amp; (~0ULL &gt;&gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_offset_v2_k_offset(struct offset_v2 *v2, loff_t offset)</div><div class='del'>-{</div><div class='del'>-	offset &amp;= (~0ULL &gt;&gt; 4);</div><div class='del'>-	v2-&gt;v = (v2-&gt;v &amp; cpu_to_le64(15ULL &lt;&lt; 60)) | cpu_to_le64(offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Key of an item determines its location in the S+tree, and</div><div class='del'>- * is composed of 4 components</div><div class='del'>- */</div><div class='del'>-struct reiserfs_key {</div><div class='del'>-	/* packing locality: by default parent directory object id */</div><div class='del'>-	__le32 k_dir_id;</div><div class='del'>-</div><div class='del'>-	__le32 k_objectid;	/* object identifier */</div><div class='del'>-	union {</div><div class='del'>-		struct offset_v1 k_offset_v1;</div><div class='del'>-		struct offset_v2 k_offset_v2;</div><div class='del'>-	} __attribute__ ((__packed__)) u;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-struct in_core_key {</div><div class='del'>-	/* packing locality: by default parent directory object id */</div><div class='del'>-	__u32 k_dir_id;</div><div class='del'>-	__u32 k_objectid;	/* object identifier */</div><div class='del'>-	__u64 k_offset;</div><div class='del'>-	__u8 k_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpu_key {</div><div class='del'>-	struct in_core_key on_disk_key;</div><div class='del'>-	int version;</div><div class='del'>-	/* 3 in all cases but direct2indirect and indirect2direct conversion */</div><div class='del'>-	int key_length;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Our function for comparing keys can compare keys of different</div><div class='del'>- * lengths.  It takes as a parameter the length of the keys it is to</div><div class='del'>- * compare.  These defines are used in determining what is to be passed</div><div class='del'>- * to it as that parameter.</div><div class='del'>- */</div><div class='del'>-#define REISERFS_FULL_KEY_LEN     4</div><div class='del'>-#define REISERFS_SHORT_KEY_LEN    2</div><div class='del'>-</div><div class='del'>-/* The result of the key compare */</div><div class='del'>-#define FIRST_GREATER 1</div><div class='del'>-#define SECOND_GREATER -1</div><div class='del'>-#define KEYS_IDENTICAL 0</div><div class='del'>-#define KEY_FOUND 1</div><div class='del'>-#define KEY_NOT_FOUND 0</div><div class='del'>-</div><div class='del'>-#define KEY_SIZE (sizeof(struct reiserfs_key))</div><div class='del'>-</div><div class='del'>-/* return values for search_by_key and clones */</div><div class='del'>-#define ITEM_FOUND 1</div><div class='del'>-#define ITEM_NOT_FOUND 0</div><div class='del'>-#define ENTRY_FOUND 1</div><div class='del'>-#define ENTRY_NOT_FOUND 0</div><div class='del'>-#define DIRECTORY_NOT_FOUND -1</div><div class='del'>-#define REGULAR_FILE_FOUND -2</div><div class='del'>-#define DIRECTORY_FOUND -3</div><div class='del'>-#define BYTE_FOUND 1</div><div class='del'>-#define BYTE_NOT_FOUND 0</div><div class='del'>-#define FILE_NOT_FOUND -1</div><div class='del'>-</div><div class='del'>-#define POSITION_FOUND 1</div><div class='del'>-#define POSITION_NOT_FOUND 0</div><div class='del'>-</div><div class='del'>-/* return values for reiserfs_find_entry and search_by_entry_key */</div><div class='del'>-#define NAME_FOUND 1</div><div class='del'>-#define NAME_NOT_FOUND 0</div><div class='del'>-#define GOTO_PREVIOUS_ITEM 2</div><div class='del'>-#define NAME_FOUND_INVISIBLE 3</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Everything in the filesystem is stored as a set of items.  The</div><div class='del'>- * item head contains the key of the item, its free space (for</div><div class='del'>- * indirect items) and specifies the location of the item itself</div><div class='del'>- * within the block.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct item_head {</div><div class='del'>-	/*</div><div class='del'>-	 * Everything in the tree is found by searching for it based on</div><div class='del'>-	 * its key.</div><div class='del'>-	 */</div><div class='del'>-	struct reiserfs_key ih_key;</div><div class='del'>-	union {</div><div class='del'>-		/*</div><div class='del'>-		 * The free space in the last unformatted node of an</div><div class='del'>-		 * indirect item if this is an indirect item.  This</div><div class='del'>-		 * equals 0xFFFF iff this is a direct item or stat data</div><div class='del'>-		 * item. Note that the key, not this field, is used to</div><div class='del'>-		 * determine the item type, and thus which field this</div><div class='del'>-		 * union contains.</div><div class='del'>-		 */</div><div class='del'>-		__le16 ih_free_space_reserved;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Iff this is a directory item, this field equals the</div><div class='del'>-		 * number of directory entries in the directory item.</div><div class='del'>-		 */</div><div class='del'>-		__le16 ih_entry_count;</div><div class='del'>-	} __attribute__ ((__packed__)) u;</div><div class='del'>-	__le16 ih_item_len;	/* total size of the item body */</div><div class='del'>-</div><div class='del'>-	/* an offset to the item body within the block */</div><div class='del'>-	__le16 ih_item_location;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 0 for all old items, 2 for new ones. Highest bit is set by fsck</div><div class='del'>-	 * temporary, cleaned after all done</div><div class='del'>-	 */</div><div class='del'>-	__le16 ih_version;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-/* size of item header     */</div><div class='del'>-#define IH_SIZE (sizeof(struct item_head))</div><div class='del'>-</div><div class='del'>-#define ih_free_space(ih)            le16_to_cpu((ih)-&gt;u.ih_free_space_reserved)</div><div class='del'>-#define ih_version(ih)               le16_to_cpu((ih)-&gt;ih_version)</div><div class='del'>-#define ih_entry_count(ih)           le16_to_cpu((ih)-&gt;u.ih_entry_count)</div><div class='del'>-#define ih_location(ih)              le16_to_cpu((ih)-&gt;ih_item_location)</div><div class='del'>-#define ih_item_len(ih)              le16_to_cpu((ih)-&gt;ih_item_len)</div><div class='del'>-</div><div class='del'>-#define put_ih_free_space(ih, val)   do { (ih)-&gt;u.ih_free_space_reserved = cpu_to_le16(val); } while(0)</div><div class='del'>-#define put_ih_version(ih, val)      do { (ih)-&gt;ih_version = cpu_to_le16(val); } while (0)</div><div class='del'>-#define put_ih_entry_count(ih, val)  do { (ih)-&gt;u.ih_entry_count = cpu_to_le16(val); } while (0)</div><div class='del'>-#define put_ih_location(ih, val)     do { (ih)-&gt;ih_item_location = cpu_to_le16(val); } while (0)</div><div class='del'>-#define put_ih_item_len(ih, val)     do { (ih)-&gt;ih_item_len = cpu_to_le16(val); } while (0)</div><div class='del'>-</div><div class='del'>-#define unreachable_item(ih) (ih_version(ih) &amp; (1 &lt;&lt; 15))</div><div class='del'>-</div><div class='del'>-#define get_ih_free_space(ih) (ih_version (ih) == KEY_FORMAT_3_6 ? 0 : ih_free_space (ih))</div><div class='del'>-#define set_ih_free_space(ih,val) put_ih_free_space((ih), ((ih_version(ih) == KEY_FORMAT_3_6) ? 0 : (val)))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * these operate on indirect items, where you've got an array of ints</div><div class='del'>- * at a possibly unaligned location.  These are a noop on ia32</div><div class='del'>- *</div><div class='del'>- * p is the array of __u32, i is the index into the array, v is the value</div><div class='del'>- * to store there.</div><div class='del'>- */</div><div class='del'>-#define get_block_num(p, i) get_unaligned_le32((p) + (i))</div><div class='del'>-#define put_block_num(p, i, v) put_unaligned_le32((v), (p) + (i))</div><div class='del'>-</div><div class='del'>-/* * in old version uniqueness field shows key type */</div><div class='del'>-#define V1_SD_UNIQUENESS 0</div><div class='del'>-#define V1_INDIRECT_UNIQUENESS 0xfffffffe</div><div class='del'>-#define V1_DIRECT_UNIQUENESS 0xffffffff</div><div class='del'>-#define V1_DIRENTRY_UNIQUENESS 500</div><div class='del'>-#define V1_ANY_UNIQUENESS 555	/* FIXME: comment is required */</div><div class='del'>-</div><div class='del'>-/* here are conversion routines */</div><div class='del'>-static inline int uniqueness2type(__u32 uniqueness) CONSTF;</div><div class='del'>-static inline int uniqueness2type(__u32 uniqueness)</div><div class='del'>-{</div><div class='del'>-	switch ((int)uniqueness) {</div><div class='del'>-	case V1_SD_UNIQUENESS:</div><div class='del'>-		return TYPE_STAT_DATA;</div><div class='del'>-	case V1_INDIRECT_UNIQUENESS:</div><div class='del'>-		return TYPE_INDIRECT;</div><div class='del'>-	case V1_DIRECT_UNIQUENESS:</div><div class='del'>-		return TYPE_DIRECT;</div><div class='del'>-	case V1_DIRENTRY_UNIQUENESS:</div><div class='del'>-		return TYPE_DIRENTRY;</div><div class='del'>-	case V1_ANY_UNIQUENESS:</div><div class='del'>-	default:</div><div class='del'>-		return TYPE_ANY;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 type2uniqueness(int type) CONSTF;</div><div class='del'>-static inline __u32 type2uniqueness(int type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case TYPE_STAT_DATA:</div><div class='del'>-		return V1_SD_UNIQUENESS;</div><div class='del'>-	case TYPE_INDIRECT:</div><div class='del'>-		return V1_INDIRECT_UNIQUENESS;</div><div class='del'>-	case TYPE_DIRECT:</div><div class='del'>-		return V1_DIRECT_UNIQUENESS;</div><div class='del'>-	case TYPE_DIRENTRY:</div><div class='del'>-		return V1_DIRENTRY_UNIQUENESS;</div><div class='del'>-	case TYPE_ANY:</div><div class='del'>-	default:</div><div class='del'>-		return V1_ANY_UNIQUENESS;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * key is pointer to on disk key which is stored in le, result is cpu,</div><div class='del'>- * there is no way to get version of object from key, so, provide</div><div class='del'>- * version to these defines</div><div class='del'>- */</div><div class='del'>-static inline loff_t le_key_k_offset(int version,</div><div class='del'>-				     const struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	return (version == KEY_FORMAT_3_5) ?</div><div class='del'>-	    le32_to_cpu(key-&gt;u.k_offset_v1.k_offset) :</div><div class='del'>-	    offset_v2_k_offset(&amp;(key-&gt;u.k_offset_v2));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t le_ih_k_offset(const struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return le_key_k_offset(ih_version(ih), &amp;(ih-&gt;ih_key));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t le_key_k_type(int version, const struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	if (version == KEY_FORMAT_3_5) {</div><div class='del'>-		loff_t val = le32_to_cpu(key-&gt;u.k_offset_v1.k_uniqueness);</div><div class='del'>-		return uniqueness2type(val);</div><div class='del'>-	} else</div><div class='del'>-		return offset_v2_k_type(&amp;(key-&gt;u.k_offset_v2));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t le_ih_k_type(const struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return le_key_k_type(ih_version(ih), &amp;(ih-&gt;ih_key));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_le_key_k_offset(int version, struct reiserfs_key *key,</div><div class='del'>-				       loff_t offset)</div><div class='del'>-{</div><div class='del'>-	if (version == KEY_FORMAT_3_5)</div><div class='del'>-		key-&gt;u.k_offset_v1.k_offset = cpu_to_le32(offset);</div><div class='del'>-	else</div><div class='del'>-		set_offset_v2_k_offset(&amp;key-&gt;u.k_offset_v2, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void add_le_key_k_offset(int version, struct reiserfs_key *key,</div><div class='del'>-				       loff_t offset)</div><div class='del'>-{</div><div class='del'>-	set_le_key_k_offset(version, key,</div><div class='del'>-			    le_key_k_offset(version, key) + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void add_le_ih_k_offset(struct item_head *ih, loff_t offset)</div><div class='del'>-{</div><div class='del'>-	add_le_key_k_offset(ih_version(ih), &amp;(ih-&gt;ih_key), offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_le_ih_k_offset(struct item_head *ih, loff_t offset)</div><div class='del'>-{</div><div class='del'>-	set_le_key_k_offset(ih_version(ih), &amp;(ih-&gt;ih_key), offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_le_key_k_type(int version, struct reiserfs_key *key,</div><div class='del'>-				     int type)</div><div class='del'>-{</div><div class='del'>-	if (version == KEY_FORMAT_3_5) {</div><div class='del'>-		type = type2uniqueness(type);</div><div class='del'>-		key-&gt;u.k_offset_v1.k_uniqueness = cpu_to_le32(type);</div><div class='del'>-	} else</div><div class='del'>-	       set_offset_v2_k_type(&amp;key-&gt;u.k_offset_v2, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_le_ih_k_type(struct item_head *ih, int type)</div><div class='del'>-{</div><div class='del'>-	set_le_key_k_type(ih_version(ih), &amp;(ih-&gt;ih_key), type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_direntry_le_key(int version, struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	return le_key_k_type(version, key) == TYPE_DIRENTRY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_direct_le_key(int version, struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	return le_key_k_type(version, key) == TYPE_DIRECT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_indirect_le_key(int version, struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	return le_key_k_type(version, key) == TYPE_INDIRECT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_statdata_le_key(int version, struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	return le_key_k_type(version, key) == TYPE_STAT_DATA;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* item header has version.  */</div><div class='del'>-static inline int is_direntry_le_ih(struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return is_direntry_le_key(ih_version(ih), &amp;ih-&gt;ih_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_direct_le_ih(struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return is_direct_le_key(ih_version(ih), &amp;ih-&gt;ih_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_indirect_le_ih(struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return is_indirect_le_key(ih_version(ih), &amp;ih-&gt;ih_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_statdata_le_ih(struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return is_statdata_le_key(ih_version(ih), &amp;ih-&gt;ih_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* key is pointer to cpu key, result is cpu */</div><div class='del'>-static inline loff_t cpu_key_k_offset(const struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	return key-&gt;on_disk_key.k_offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t cpu_key_k_type(const struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	return key-&gt;on_disk_key.k_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_cpu_key_k_offset(struct cpu_key *key, loff_t offset)</div><div class='del'>-{</div><div class='del'>-	key-&gt;on_disk_key.k_offset = offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_cpu_key_k_type(struct cpu_key *key, int type)</div><div class='del'>-{</div><div class='del'>-	key-&gt;on_disk_key.k_type = type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void cpu_key_k_offset_dec(struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	key-&gt;on_disk_key.k_offset--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define is_direntry_cpu_key(key) (cpu_key_k_type (key) == TYPE_DIRENTRY)</div><div class='del'>-#define is_direct_cpu_key(key) (cpu_key_k_type (key) == TYPE_DIRECT)</div><div class='del'>-#define is_indirect_cpu_key(key) (cpu_key_k_type (key) == TYPE_INDIRECT)</div><div class='del'>-#define is_statdata_cpu_key(key) (cpu_key_k_type (key) == TYPE_STAT_DATA)</div><div class='del'>-</div><div class='del'>-/* are these used ? */</div><div class='del'>-#define is_direntry_cpu_ih(ih) (is_direntry_cpu_key (&amp;((ih)-&gt;ih_key)))</div><div class='del'>-#define is_direct_cpu_ih(ih) (is_direct_cpu_key (&amp;((ih)-&gt;ih_key)))</div><div class='del'>-#define is_indirect_cpu_ih(ih) (is_indirect_cpu_key (&amp;((ih)-&gt;ih_key)))</div><div class='del'>-#define is_statdata_cpu_ih(ih) (is_statdata_cpu_key (&amp;((ih)-&gt;ih_key)))</div><div class='del'>-</div><div class='del'>-#define I_K_KEY_IN_ITEM(ih, key, n_blocksize) \</div><div class='del'>-    (!COMP_SHORT_KEYS(ih, key) &amp;&amp; \</div><div class='del'>-	  I_OFF_BYTE_IN_ITEM(ih, k_offset(key), n_blocksize))</div><div class='del'>-</div><div class='del'>-/* maximal length of item */</div><div class='del'>-#define MAX_ITEM_LEN(block_size) (block_size - BLKH_SIZE - IH_SIZE)</div><div class='del'>-#define MIN_ITEM_LEN 1</div><div class='del'>-</div><div class='del'>-/* object identifier for root dir */</div><div class='del'>-#define REISERFS_ROOT_OBJECTID 2</div><div class='del'>-#define REISERFS_ROOT_PARENT_OBJECTID 1</div><div class='del'>-</div><div class='del'>-extern struct reiserfs_key root_key;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Picture represents a leaf of the S+tree</div><div class='del'>- *  ______________________________________________________</div><div class='del'>- * |      |  Array of     |                   |           |</div><div class='del'>- * |Block |  Object-Item  |      F r e e      |  Objects- |</div><div class='del'>- * | head |  Headers      |     S p a c e     |   Items   |</div><div class='del'>- * |______|_______________|___________________|___________|</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Header of a disk block.  More precisely, header of a formatted leaf</div><div class='del'>- * or internal node, and not the header of an unformatted node.</div><div class='del'>- */</div><div class='del'>-struct block_head {</div><div class='del'>-	__le16 blk_level;	/* Level of a block in the tree. */</div><div class='del'>-	__le16 blk_nr_item;	/* Number of keys/items in a block. */</div><div class='del'>-	__le16 blk_free_space;	/* Block free space in bytes. */</div><div class='del'>-	__le16 blk_reserved;</div><div class='del'>-	/* dump this in v4/planA */</div><div class='del'>-</div><div class='del'>-	/* kept only for compatibility */</div><div class='del'>-	struct reiserfs_key blk_right_delim_key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BLKH_SIZE                     (sizeof(struct block_head))</div><div class='del'>-#define blkh_level(p_blkh)            (le16_to_cpu((p_blkh)-&gt;blk_level))</div><div class='del'>-#define blkh_nr_item(p_blkh)          (le16_to_cpu((p_blkh)-&gt;blk_nr_item))</div><div class='del'>-#define blkh_free_space(p_blkh)       (le16_to_cpu((p_blkh)-&gt;blk_free_space))</div><div class='del'>-#define blkh_reserved(p_blkh)         (le16_to_cpu((p_blkh)-&gt;blk_reserved))</div><div class='del'>-#define set_blkh_level(p_blkh,val)    ((p_blkh)-&gt;blk_level = cpu_to_le16(val))</div><div class='del'>-#define set_blkh_nr_item(p_blkh,val)  ((p_blkh)-&gt;blk_nr_item = cpu_to_le16(val))</div><div class='del'>-#define set_blkh_free_space(p_blkh,val) ((p_blkh)-&gt;blk_free_space = cpu_to_le16(val))</div><div class='del'>-#define set_blkh_reserved(p_blkh,val) ((p_blkh)-&gt;blk_reserved = cpu_to_le16(val))</div><div class='del'>-#define blkh_right_delim_key(p_blkh)  ((p_blkh)-&gt;blk_right_delim_key)</div><div class='del'>-#define set_blkh_right_delim_key(p_blkh,val)  ((p_blkh)-&gt;blk_right_delim_key = val)</div><div class='del'>-</div><div class='del'>-/* values for blk_level field of the struct block_head */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When node gets removed from the tree its blk_level is set to FREE_LEVEL.</div><div class='del'>- * It is then  used to see whether the node is still in the tree</div><div class='del'>- */</div><div class='del'>-#define FREE_LEVEL 0</div><div class='del'>-</div><div class='del'>-#define DISK_LEAF_NODE_LEVEL  1	/* Leaf node level. */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Given the buffer head of a formatted node, resolve to the</div><div class='del'>- * block head of that node.</div><div class='del'>- */</div><div class='del'>-#define B_BLK_HEAD(bh)			((struct block_head *)((bh)-&gt;b_data))</div><div class='del'>-/* Number of items that are in buffer. */</div><div class='del'>-#define B_NR_ITEMS(bh)			(blkh_nr_item(B_BLK_HEAD(bh)))</div><div class='del'>-#define B_LEVEL(bh)			(blkh_level(B_BLK_HEAD(bh)))</div><div class='del'>-#define B_FREE_SPACE(bh)		(blkh_free_space(B_BLK_HEAD(bh)))</div><div class='del'>-</div><div class='del'>-#define PUT_B_NR_ITEMS(bh, val)		do { set_blkh_nr_item(B_BLK_HEAD(bh), val); } while (0)</div><div class='del'>-#define PUT_B_LEVEL(bh, val)		do { set_blkh_level(B_BLK_HEAD(bh), val); } while (0)</div><div class='del'>-#define PUT_B_FREE_SPACE(bh, val)	do { set_blkh_free_space(B_BLK_HEAD(bh), val); } while (0)</div><div class='del'>-</div><div class='del'>-/* Get right delimiting key. -- little endian */</div><div class='del'>-#define B_PRIGHT_DELIM_KEY(bh)		(&amp;(blk_right_delim_key(B_BLK_HEAD(bh))))</div><div class='del'>-</div><div class='del'>-/* Does the buffer contain a disk leaf. */</div><div class='del'>-#define B_IS_ITEMS_LEVEL(bh)		(B_LEVEL(bh) == DISK_LEAF_NODE_LEVEL)</div><div class='del'>-</div><div class='del'>-/* Does the buffer contain a disk internal node */</div><div class='del'>-#define B_IS_KEYS_LEVEL(bh)      (B_LEVEL(bh) &gt; DISK_LEAF_NODE_LEVEL \</div><div class='del'>-					    &amp;&amp; B_LEVEL(bh) &lt;= MAX_HEIGHT)</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                             STAT DATA                                   *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * old stat data is 32 bytes long. We are going to distinguish new one by</div><div class='del'>- * different size</div><div class='del'>-*/</div><div class='del'>-struct stat_data_v1 {</div><div class='del'>-	__le16 sd_mode;		/* file type, permissions */</div><div class='del'>-	__le16 sd_nlink;	/* number of hard links */</div><div class='del'>-	__le16 sd_uid;		/* owner */</div><div class='del'>-	__le16 sd_gid;		/* group */</div><div class='del'>-	__le32 sd_size;		/* file size */</div><div class='del'>-	__le32 sd_atime;	/* time of last access */</div><div class='del'>-	__le32 sd_mtime;	/* time file was last modified  */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * time inode (stat data) was last changed</div><div class='del'>-	 * (except changes to sd_atime and sd_mtime)</div><div class='del'>-	 */</div><div class='del'>-	__le32 sd_ctime;</div><div class='del'>-	union {</div><div class='del'>-		__le32 sd_rdev;</div><div class='del'>-		__le32 sd_blocks;	/* number of blocks file uses */</div><div class='del'>-	} __attribute__ ((__packed__)) u;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * first byte of file which is stored in a direct item: except that if</div><div class='del'>-	 * it equals 1 it is a symlink and if it equals ~(__u32)0 there is no</div><div class='del'>-	 * direct item.  The existence of this field really grates on me.</div><div class='del'>-	 * Let's replace it with a macro based on sd_size and our tail</div><div class='del'>-	 * suppression policy.  Someday.  -Hans</div><div class='del'>-	 */</div><div class='del'>-	__le32 sd_first_direct_byte;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-#define SD_V1_SIZE              (sizeof(struct stat_data_v1))</div><div class='del'>-#define stat_data_v1(ih)        (ih_version (ih) == KEY_FORMAT_3_5)</div><div class='del'>-#define sd_v1_mode(sdp)         (le16_to_cpu((sdp)-&gt;sd_mode))</div><div class='del'>-#define set_sd_v1_mode(sdp,v)   ((sdp)-&gt;sd_mode = cpu_to_le16(v))</div><div class='del'>-#define sd_v1_nlink(sdp)        (le16_to_cpu((sdp)-&gt;sd_nlink))</div><div class='del'>-#define set_sd_v1_nlink(sdp,v)  ((sdp)-&gt;sd_nlink = cpu_to_le16(v))</div><div class='del'>-#define sd_v1_uid(sdp)          (le16_to_cpu((sdp)-&gt;sd_uid))</div><div class='del'>-#define set_sd_v1_uid(sdp,v)    ((sdp)-&gt;sd_uid = cpu_to_le16(v))</div><div class='del'>-#define sd_v1_gid(sdp)          (le16_to_cpu((sdp)-&gt;sd_gid))</div><div class='del'>-#define set_sd_v1_gid(sdp,v)    ((sdp)-&gt;sd_gid = cpu_to_le16(v))</div><div class='del'>-#define sd_v1_size(sdp)         (le32_to_cpu((sdp)-&gt;sd_size))</div><div class='del'>-#define set_sd_v1_size(sdp,v)   ((sdp)-&gt;sd_size = cpu_to_le32(v))</div><div class='del'>-#define sd_v1_atime(sdp)        (le32_to_cpu((sdp)-&gt;sd_atime))</div><div class='del'>-#define set_sd_v1_atime(sdp,v)  ((sdp)-&gt;sd_atime = cpu_to_le32(v))</div><div class='del'>-#define sd_v1_mtime(sdp)        (le32_to_cpu((sdp)-&gt;sd_mtime))</div><div class='del'>-#define set_sd_v1_mtime(sdp,v)  ((sdp)-&gt;sd_mtime = cpu_to_le32(v))</div><div class='del'>-#define sd_v1_ctime(sdp)        (le32_to_cpu((sdp)-&gt;sd_ctime))</div><div class='del'>-#define set_sd_v1_ctime(sdp,v)  ((sdp)-&gt;sd_ctime = cpu_to_le32(v))</div><div class='del'>-#define sd_v1_rdev(sdp)         (le32_to_cpu((sdp)-&gt;u.sd_rdev))</div><div class='del'>-#define set_sd_v1_rdev(sdp,v)   ((sdp)-&gt;u.sd_rdev = cpu_to_le32(v))</div><div class='del'>-#define sd_v1_blocks(sdp)       (le32_to_cpu((sdp)-&gt;u.sd_blocks))</div><div class='del'>-#define set_sd_v1_blocks(sdp,v) ((sdp)-&gt;u.sd_blocks = cpu_to_le32(v))</div><div class='del'>-#define sd_v1_first_direct_byte(sdp) \</div><div class='del'>-                                (le32_to_cpu((sdp)-&gt;sd_first_direct_byte))</div><div class='del'>-#define set_sd_v1_first_direct_byte(sdp,v) \</div><div class='del'>-                                ((sdp)-&gt;sd_first_direct_byte = cpu_to_le32(v))</div><div class='del'>-</div><div class='del'>-/* inode flags stored in sd_attrs (nee sd_reserved) */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * we want common flags to have the same values as in ext2,</div><div class='del'>- * so chattr(1) will work without problems</div><div class='del'>- */</div><div class='del'>-#define REISERFS_IMMUTABLE_FL FS_IMMUTABLE_FL</div><div class='del'>-#define REISERFS_APPEND_FL    FS_APPEND_FL</div><div class='del'>-#define REISERFS_SYNC_FL      FS_SYNC_FL</div><div class='del'>-#define REISERFS_NOATIME_FL   FS_NOATIME_FL</div><div class='del'>-#define REISERFS_NODUMP_FL    FS_NODUMP_FL</div><div class='del'>-#define REISERFS_SECRM_FL     FS_SECRM_FL</div><div class='del'>-#define REISERFS_UNRM_FL      FS_UNRM_FL</div><div class='del'>-#define REISERFS_COMPR_FL     FS_COMPR_FL</div><div class='del'>-#define REISERFS_NOTAIL_FL    FS_NOTAIL_FL</div><div class='del'>-</div><div class='del'>-/* persistent flags that file inherits from the parent directory */</div><div class='del'>-#define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL |	\</div><div class='del'>-				REISERFS_SYNC_FL |	\</div><div class='del'>-				REISERFS_NOATIME_FL |	\</div><div class='del'>-				REISERFS_NODUMP_FL |	\</div><div class='del'>-				REISERFS_SECRM_FL |	\</div><div class='del'>-				REISERFS_COMPR_FL |	\</div><div class='del'>-				REISERFS_NOTAIL_FL )</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stat Data on disk (reiserfs version of UFS disk inode minus the</div><div class='del'>- * address blocks)</div><div class='del'>- */</div><div class='del'>-struct stat_data {</div><div class='del'>-	__le16 sd_mode;		/* file type, permissions */</div><div class='del'>-	__le16 sd_attrs;	/* persistent inode flags */</div><div class='del'>-	__le32 sd_nlink;	/* number of hard links */</div><div class='del'>-	__le64 sd_size;		/* file size */</div><div class='del'>-	__le32 sd_uid;		/* owner */</div><div class='del'>-	__le32 sd_gid;		/* group */</div><div class='del'>-	__le32 sd_atime;	/* time of last access */</div><div class='del'>-	__le32 sd_mtime;	/* time file was last modified  */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * time inode (stat data) was last changed</div><div class='del'>-	 * (except changes to sd_atime and sd_mtime)</div><div class='del'>-	 */</div><div class='del'>-	__le32 sd_ctime;</div><div class='del'>-	__le32 sd_blocks;</div><div class='del'>-	union {</div><div class='del'>-		__le32 sd_rdev;</div><div class='del'>-		__le32 sd_generation;</div><div class='del'>-	} __attribute__ ((__packed__)) u;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-/* this is 44 bytes long */</div><div class='del'>-#define SD_SIZE (sizeof(struct stat_data))</div><div class='del'>-#define SD_V2_SIZE              SD_SIZE</div><div class='del'>-#define stat_data_v2(ih)        (ih_version (ih) == KEY_FORMAT_3_6)</div><div class='del'>-#define sd_v2_mode(sdp)         (le16_to_cpu((sdp)-&gt;sd_mode))</div><div class='del'>-#define set_sd_v2_mode(sdp,v)   ((sdp)-&gt;sd_mode = cpu_to_le16(v))</div><div class='del'>-/* sd_reserved */</div><div class='del'>-/* set_sd_reserved */</div><div class='del'>-#define sd_v2_nlink(sdp)        (le32_to_cpu((sdp)-&gt;sd_nlink))</div><div class='del'>-#define set_sd_v2_nlink(sdp,v)  ((sdp)-&gt;sd_nlink = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_size(sdp)         (le64_to_cpu((sdp)-&gt;sd_size))</div><div class='del'>-#define set_sd_v2_size(sdp,v)   ((sdp)-&gt;sd_size = cpu_to_le64(v))</div><div class='del'>-#define sd_v2_uid(sdp)          (le32_to_cpu((sdp)-&gt;sd_uid))</div><div class='del'>-#define set_sd_v2_uid(sdp,v)    ((sdp)-&gt;sd_uid = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_gid(sdp)          (le32_to_cpu((sdp)-&gt;sd_gid))</div><div class='del'>-#define set_sd_v2_gid(sdp,v)    ((sdp)-&gt;sd_gid = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_atime(sdp)        (le32_to_cpu((sdp)-&gt;sd_atime))</div><div class='del'>-#define set_sd_v2_atime(sdp,v)  ((sdp)-&gt;sd_atime = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_mtime(sdp)        (le32_to_cpu((sdp)-&gt;sd_mtime))</div><div class='del'>-#define set_sd_v2_mtime(sdp,v)  ((sdp)-&gt;sd_mtime = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_ctime(sdp)        (le32_to_cpu((sdp)-&gt;sd_ctime))</div><div class='del'>-#define set_sd_v2_ctime(sdp,v)  ((sdp)-&gt;sd_ctime = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_blocks(sdp)       (le32_to_cpu((sdp)-&gt;sd_blocks))</div><div class='del'>-#define set_sd_v2_blocks(sdp,v) ((sdp)-&gt;sd_blocks = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_rdev(sdp)         (le32_to_cpu((sdp)-&gt;u.sd_rdev))</div><div class='del'>-#define set_sd_v2_rdev(sdp,v)   ((sdp)-&gt;u.sd_rdev = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_generation(sdp)   (le32_to_cpu((sdp)-&gt;u.sd_generation))</div><div class='del'>-#define set_sd_v2_generation(sdp,v) ((sdp)-&gt;u.sd_generation = cpu_to_le32(v))</div><div class='del'>-#define sd_v2_attrs(sdp)         (le16_to_cpu((sdp)-&gt;sd_attrs))</div><div class='del'>-#define set_sd_v2_attrs(sdp,v)   ((sdp)-&gt;sd_attrs = cpu_to_le16(v))</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                      DIRECTORY STRUCTURE                                *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * Picture represents the structure of directory items</div><div class='del'>- * ________________________________________________</div><div class='del'>- * |  Array of     |   |     |        |       |   |</div><div class='del'>- * | directory     |N-1| N-2 | ....   |   1st |0th|</div><div class='del'>- * | entry headers |   |     |        |       |   |</div><div class='del'>- * |_______________|___|_____|________|_______|___|</div><div class='del'>- *                  &lt;----   directory entries         ------&gt;</div><div class='del'>- *</div><div class='del'>- * First directory item has k_offset component 1. We store "." and ".."</div><div class='del'>- * in one item, always, we never split "." and ".." into differing</div><div class='del'>- * items.  This makes, among other things, the code for removing</div><div class='del'>- * directories simpler.</div><div class='del'>- */</div><div class='del'>-#define SD_OFFSET  0</div><div class='del'>-#define SD_UNIQUENESS 0</div><div class='del'>-#define DOT_OFFSET 1</div><div class='del'>-#define DOT_DOT_OFFSET 2</div><div class='del'>-#define DIRENTRY_UNIQUENESS 500</div><div class='del'>-</div><div class='del'>-#define FIRST_ITEM_OFFSET 1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Q: How to get key of object pointed to by entry from entry?</div><div class='del'>- *</div><div class='del'>- * A: Each directory entry has its header. This header has deh_dir_id</div><div class='del'>- *    and deh_objectid fields, those are key of object, entry points to</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NOT IMPLEMENTED:</div><div class='del'>- * Directory will someday contain stat data of object</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct reiserfs_de_head {</div><div class='del'>-	__le32 deh_offset;	/* third component of the directory entry key */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * objectid of the parent directory of the object, that is referenced</div><div class='del'>-	 * by directory entry</div><div class='del'>-	 */</div><div class='del'>-	__le32 deh_dir_id;</div><div class='del'>-</div><div class='del'>-	/* objectid of the object, that is referenced by directory entry */</div><div class='del'>-	__le32 deh_objectid;</div><div class='del'>-	__le16 deh_location;	/* offset of name in the whole item */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * whether 1) entry contains stat data (for future), and</div><div class='del'>-	 * 2) whether entry is hidden (unlinked)</div><div class='del'>-	 */</div><div class='del'>-	__le16 deh_state;</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-#define DEH_SIZE                  sizeof(struct reiserfs_de_head)</div><div class='del'>-#define deh_offset(p_deh)         (le32_to_cpu((p_deh)-&gt;deh_offset))</div><div class='del'>-#define deh_dir_id(p_deh)         (le32_to_cpu((p_deh)-&gt;deh_dir_id))</div><div class='del'>-#define deh_objectid(p_deh)       (le32_to_cpu((p_deh)-&gt;deh_objectid))</div><div class='del'>-#define deh_location(p_deh)       (le16_to_cpu((p_deh)-&gt;deh_location))</div><div class='del'>-#define deh_state(p_deh)          (le16_to_cpu((p_deh)-&gt;deh_state))</div><div class='del'>-</div><div class='del'>-#define put_deh_offset(p_deh,v)   ((p_deh)-&gt;deh_offset = cpu_to_le32((v)))</div><div class='del'>-#define put_deh_dir_id(p_deh,v)   ((p_deh)-&gt;deh_dir_id = cpu_to_le32((v)))</div><div class='del'>-#define put_deh_objectid(p_deh,v) ((p_deh)-&gt;deh_objectid = cpu_to_le32((v)))</div><div class='del'>-#define put_deh_location(p_deh,v) ((p_deh)-&gt;deh_location = cpu_to_le16((v)))</div><div class='del'>-#define put_deh_state(p_deh,v)    ((p_deh)-&gt;deh_state = cpu_to_le16((v)))</div><div class='del'>-</div><div class='del'>-/* empty directory contains two entries "." and ".." and their headers */</div><div class='del'>-#define EMPTY_DIR_SIZE \</div><div class='del'>-(DEH_SIZE * 2 + ROUND_UP (sizeof(".") - 1) + ROUND_UP (sizeof("..") - 1))</div><div class='del'>-</div><div class='del'>-/* old format directories have this size when empty */</div><div class='del'>-#define EMPTY_DIR_SIZE_V1 (DEH_SIZE * 2 + 3)</div><div class='del'>-</div><div class='del'>-#define DEH_Statdata 0		/* not used now */</div><div class='del'>-#define DEH_Visible 2</div><div class='del'>-</div><div class='del'>-/* 64 bit systems (and the S/390) need to be aligned explicitly -jdm */</div><div class='del'>-#if BITS_PER_LONG == 64 || defined(__s390__) || defined(__hppa__)</div><div class='del'>-#   define ADDR_UNALIGNED_BITS  (3)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are only used to manipulate deh_state.</div><div class='del'>- * Because of this, we'll use the ext2_ bit routines,</div><div class='del'>- * since they are little endian</div><div class='del'>- */</div><div class='del'>-#ifdef ADDR_UNALIGNED_BITS</div><div class='del'>-</div><div class='del'>-#   define aligned_address(addr)           ((void *)((long)(addr) &amp; ~((1UL &lt;&lt; ADDR_UNALIGNED_BITS) - 1)))</div><div class='del'>-#   define unaligned_offset(addr)          (((int)((long)(addr) &amp; ((1 &lt;&lt; ADDR_UNALIGNED_BITS) - 1))) &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#   define set_bit_unaligned(nr, addr)	\</div><div class='del'>-	__test_and_set_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))</div><div class='del'>-#   define clear_bit_unaligned(nr, addr)	\</div><div class='del'>-	__test_and_clear_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))</div><div class='del'>-#   define test_bit_unaligned(nr, addr)	\</div><div class='del'>-	test_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#   define set_bit_unaligned(nr, addr)	__test_and_set_bit_le(nr, addr)</div><div class='del'>-#   define clear_bit_unaligned(nr, addr)	__test_and_clear_bit_le(nr, addr)</div><div class='del'>-#   define test_bit_unaligned(nr, addr)	test_bit_le(nr, addr)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define mark_de_with_sd(deh)        set_bit_unaligned (DEH_Statdata, &amp;((deh)-&gt;deh_state))</div><div class='del'>-#define mark_de_without_sd(deh)     clear_bit_unaligned (DEH_Statdata, &amp;((deh)-&gt;deh_state))</div><div class='del'>-#define mark_de_visible(deh)	    set_bit_unaligned (DEH_Visible, &amp;((deh)-&gt;deh_state))</div><div class='del'>-#define mark_de_hidden(deh)	    clear_bit_unaligned (DEH_Visible, &amp;((deh)-&gt;deh_state))</div><div class='del'>-</div><div class='del'>-#define de_with_sd(deh)		    test_bit_unaligned (DEH_Statdata, &amp;((deh)-&gt;deh_state))</div><div class='del'>-#define de_visible(deh)	    	    test_bit_unaligned (DEH_Visible, &amp;((deh)-&gt;deh_state))</div><div class='del'>-#define de_hidden(deh)	    	    !test_bit_unaligned (DEH_Visible, &amp;((deh)-&gt;deh_state))</div><div class='del'>-</div><div class='del'>-extern void make_empty_dir_item_v1(char *body, __le32 dirid, __le32 objid,</div><div class='del'>-				   __le32 par_dirid, __le32 par_objid);</div><div class='del'>-extern void make_empty_dir_item(char *body, __le32 dirid, __le32 objid,</div><div class='del'>-				__le32 par_dirid, __le32 par_objid);</div><div class='del'>-</div><div class='del'>-/* two entries per block (at least) */</div><div class='del'>-#define REISERFS_MAX_NAME(block_size) 255</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this structure is used for operations on directory entries. It is</div><div class='del'>- * not a disk structure.</div><div class='del'>- *</div><div class='del'>- * When reiserfs_find_entry or search_by_entry_key find directory</div><div class='del'>- * entry, they return filled reiserfs_dir_entry structure</div><div class='del'>- */</div><div class='del'>-struct reiserfs_dir_entry {</div><div class='del'>-	struct buffer_head *de_bh;</div><div class='del'>-	int de_item_num;</div><div class='del'>-	struct item_head *de_ih;</div><div class='del'>-	int de_entry_num;</div><div class='del'>-	struct reiserfs_de_head *de_deh;</div><div class='del'>-	int de_entrylen;</div><div class='del'>-	int de_namelen;</div><div class='del'>-	char *de_name;</div><div class='del'>-	unsigned long *de_gen_number_bit_string;</div><div class='del'>-</div><div class='del'>-	__u32 de_dir_id;</div><div class='del'>-	__u32 de_objectid;</div><div class='del'>-</div><div class='del'>-	struct cpu_key de_entry_key;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * these defines are useful when a particular member of</div><div class='del'>- * a reiserfs_dir_entry is needed</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* pointer to file name, stored in entry */</div><div class='del'>-#define B_I_DEH_ENTRY_FILE_NAME(bh, ih, deh) \</div><div class='del'>-				(ih_item_body(bh, ih) + deh_location(deh))</div><div class='del'>-</div><div class='del'>-/* length of name */</div><div class='del'>-#define I_DEH_N_ENTRY_FILE_NAME_LENGTH(ih,deh,entry_num) \</div><div class='del'>-(I_DEH_N_ENTRY_LENGTH (ih, deh, entry_num) - (de_with_sd (deh) ? SD_SIZE : 0))</div><div class='del'>-</div><div class='del'>-/* hash value occupies bits from 7 up to 30 */</div><div class='del'>-#define GET_HASH_VALUE(offset) ((offset) &amp; 0x7fffff80LL)</div><div class='del'>-/* generation number occupies 7 bits starting from 0 up to 6 */</div><div class='del'>-#define GET_GENERATION_NUMBER(offset) ((offset) &amp; 0x7fLL)</div><div class='del'>-#define MAX_GENERATION_NUMBER  127</div><div class='del'>-</div><div class='del'>-#define SET_GENERATION_NUMBER(offset,gen_number) (GET_HASH_VALUE(offset)|(gen_number))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Picture represents an internal node of the reiserfs tree</div><div class='del'>- *  ______________________________________________________</div><div class='del'>- * |      |  Array of     |  Array of         |  Free     |</div><div class='del'>- * |block |    keys       |  pointers         | space     |</div><div class='del'>- * | head |      N        |      N+1          |           |</div><div class='del'>- * |______|_______________|___________________|___________|</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                      DISK CHILD                                         *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * Disk child pointer:</div><div class='del'>- * The pointer from an internal node of the tree to a node that is on disk.</div><div class='del'>- */</div><div class='del'>-struct disk_child {</div><div class='del'>-	__le32 dc_block_number;	/* Disk child's block number. */</div><div class='del'>-	__le16 dc_size;		/* Disk child's used space.   */</div><div class='del'>-	__le16 dc_reserved;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DC_SIZE (sizeof(struct disk_child))</div><div class='del'>-#define dc_block_number(dc_p)	(le32_to_cpu((dc_p)-&gt;dc_block_number))</div><div class='del'>-#define dc_size(dc_p)		(le16_to_cpu((dc_p)-&gt;dc_size))</div><div class='del'>-#define put_dc_block_number(dc_p, val)   do { (dc_p)-&gt;dc_block_number = cpu_to_le32(val); } while(0)</div><div class='del'>-#define put_dc_size(dc_p, val)   do { (dc_p)-&gt;dc_size = cpu_to_le16(val); } while(0)</div><div class='del'>-</div><div class='del'>-/* Get disk child by buffer header and position in the tree node. */</div><div class='del'>-#define B_N_CHILD(bh, n_pos)  ((struct disk_child *)\</div><div class='del'>-((bh)-&gt;b_data + BLKH_SIZE + B_NR_ITEMS(bh) * KEY_SIZE + DC_SIZE * (n_pos)))</div><div class='del'>-</div><div class='del'>-/* Get disk child number by buffer header and position in the tree node. */</div><div class='del'>-#define B_N_CHILD_NUM(bh, n_pos) (dc_block_number(B_N_CHILD(bh, n_pos)))</div><div class='del'>-#define PUT_B_N_CHILD_NUM(bh, n_pos, val) \</div><div class='del'>-				(put_dc_block_number(B_N_CHILD(bh, n_pos), val))</div><div class='del'>-</div><div class='del'>- /* maximal value of field child_size in structure disk_child */</div><div class='del'>- /* child size is the combined size of all items and their headers */</div><div class='del'>-#define MAX_CHILD_SIZE(bh) ((int)( (bh)-&gt;b_size - BLKH_SIZE ))</div><div class='del'>-</div><div class='del'>-/* amount of used space in buffer (not including block head) */</div><div class='del'>-#define B_CHILD_SIZE(cur) (MAX_CHILD_SIZE(cur)-(B_FREE_SPACE(cur)))</div><div class='del'>-</div><div class='del'>-/* max and min number of keys in internal node */</div><div class='del'>-#define MAX_NR_KEY(bh) ( (MAX_CHILD_SIZE(bh)-DC_SIZE)/(KEY_SIZE+DC_SIZE) )</div><div class='del'>-#define MIN_NR_KEY(bh)    (MAX_NR_KEY(bh)/2)</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                      PATH STRUCTURES AND DEFINES                        *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * search_by_key fills up the path from the root to the leaf as it descends</div><div class='del'>- * the tree looking for the key.  It uses reiserfs_bread to try to find</div><div class='del'>- * buffers in the cache given their block number.  If it does not find</div><div class='del'>- * them in the cache it reads them from disk.  For each node search_by_key</div><div class='del'>- * finds using reiserfs_bread it then uses bin_search to look through that</div><div class='del'>- * node.  bin_search will find the position of the block_number of the next</div><div class='del'>- * node if it is looking through an internal node.  If it is looking through</div><div class='del'>- * a leaf node bin_search will find the position of the item which has key</div><div class='del'>- * either equal to given key, or which is the maximal key less than the</div><div class='del'>- * given key.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct path_element {</div><div class='del'>-	/* Pointer to the buffer at the path in the tree. */</div><div class='del'>-	struct buffer_head *pe_buffer;</div><div class='del'>-	/* Position in the tree node which is placed in the buffer above. */</div><div class='del'>-	int pe_position;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * maximal height of a tree. don't change this without</div><div class='del'>- * changing JOURNAL_PER_BALANCE_CNT</div><div class='del'>- */</div><div class='del'>-#define MAX_HEIGHT 5</div><div class='del'>-</div><div class='del'>-/* Must be equals MAX_HEIGHT + FIRST_PATH_ELEMENT_OFFSET */</div><div class='del'>-#define EXTENDED_MAX_HEIGHT         7</div><div class='del'>-</div><div class='del'>-/* Must be equal to at least 2. */</div><div class='del'>-#define FIRST_PATH_ELEMENT_OFFSET   2</div><div class='del'>-</div><div class='del'>-/* Must be equal to FIRST_PATH_ELEMENT_OFFSET - 1 */</div><div class='del'>-#define ILLEGAL_PATH_ELEMENT_OFFSET 1</div><div class='del'>-</div><div class='del'>-/* this MUST be MAX_HEIGHT + 1. See about FEB below */</div><div class='del'>-#define MAX_FEB_SIZE 6</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We need to keep track of who the ancestors of nodes are.  When we</div><div class='del'>- * perform a search we record which nodes were visited while</div><div class='del'>- * descending the tree looking for the node we searched for. This list</div><div class='del'>- * of nodes is called the path.  This information is used while</div><div class='del'>- * performing balancing.  Note that this path information may become</div><div class='del'>- * invalid, and this means we must check it when using it to see if it</div><div class='del'>- * is still valid. You'll need to read search_by_key and the comments</div><div class='del'>- * in it, especially about decrement_counters_in_path(), to understand</div><div class='del'>- * this structure.</div><div class='del'>- *</div><div class='del'>- * Paths make the code so much harder to work with and debug.... An</div><div class='del'>- * enormous number of bugs are due to them, and trying to write or modify</div><div class='del'>- * code that uses them just makes my head hurt.  They are based on an</div><div class='del'>- * excessive effort to avoid disturbing the precious VFS code.:-( The</div><div class='del'>- * gods only know how we are going to SMP the code that uses them.</div><div class='del'>- * znodes are the way!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define PATH_READA	0x1	/* do read ahead */</div><div class='del'>-#define PATH_READA_BACK 0x2	/* read backwards */</div><div class='del'>-</div><div class='del'>-struct treepath {</div><div class='del'>-	int path_length;	/* Length of the array above.   */</div><div class='del'>-	int reada;</div><div class='del'>-	/* Array of the path elements.  */</div><div class='del'>-	struct path_element path_elements[EXTENDED_MAX_HEIGHT];</div><div class='del'>-	int pos_in_item;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define pos_in_item(path) ((path)-&gt;pos_in_item)</div><div class='del'>-</div><div class='del'>-#define INITIALIZE_PATH(var) \</div><div class='del'>-struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}</div><div class='del'>-</div><div class='del'>-/* Get path element by path and path position. */</div><div class='del'>-#define PATH_OFFSET_PELEMENT(path, n_offset)  ((path)-&gt;path_elements + (n_offset))</div><div class='del'>-</div><div class='del'>-/* Get buffer header at the path by path and path position. */</div><div class='del'>-#define PATH_OFFSET_PBUFFER(path, n_offset)   (PATH_OFFSET_PELEMENT(path, n_offset)-&gt;pe_buffer)</div><div class='del'>-</div><div class='del'>-/* Get position in the element at the path by path and path position. */</div><div class='del'>-#define PATH_OFFSET_POSITION(path, n_offset) (PATH_OFFSET_PELEMENT(path, n_offset)-&gt;pe_position)</div><div class='del'>-</div><div class='del'>-#define PATH_PLAST_BUFFER(path) (PATH_OFFSET_PBUFFER((path), (path)-&gt;path_length))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * you know, to the person who didn't write this the macro name does not</div><div class='del'>- * at first suggest what it does.  Maybe POSITION_FROM_PATH_END? Or</div><div class='del'>- * maybe we should just focus on dumping paths... -Hans</div><div class='del'>- */</div><div class='del'>-#define PATH_LAST_POSITION(path) (PATH_OFFSET_POSITION((path), (path)-&gt;path_length))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * in do_balance leaf has h == 0 in contrast with path structure,</div><div class='del'>- * where root has level == 0. That is why we need these defines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* tb-&gt;S[h] */</div><div class='del'>-#define PATH_H_PBUFFER(path, h) \</div><div class='del'>-			PATH_OFFSET_PBUFFER(path, path-&gt;path_length - (h))</div><div class='del'>-</div><div class='del'>-/* tb-&gt;F[h] or tb-&gt;S[0]-&gt;b_parent */</div><div class='del'>-#define PATH_H_PPARENT(path, h) PATH_H_PBUFFER(path, (h) + 1)</div><div class='del'>-</div><div class='del'>-#define PATH_H_POSITION(path, h) \</div><div class='del'>-			PATH_OFFSET_POSITION(path, path-&gt;path_length - (h))</div><div class='del'>-</div><div class='del'>-/* tb-&gt;S[h]-&gt;b_item_order */</div><div class='del'>-#define PATH_H_B_ITEM_ORDER(path, h) PATH_H_POSITION(path, h + 1)</div><div class='del'>-</div><div class='del'>-#define PATH_H_PATH_OFFSET(path, n_h) ((path)-&gt;path_length - (n_h))</div><div class='del'>-</div><div class='del'>-static inline void *reiserfs_node_data(const struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	return bh-&gt;b_data + sizeof(struct block_head);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get key from internal node */</div><div class='del'>-static inline struct reiserfs_key *internal_key(struct buffer_head *bh,</div><div class='del'>-						int item_num)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_key *key = reiserfs_node_data(bh);</div><div class='del'>-</div><div class='del'>-	return &amp;key[item_num];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get the item header from leaf node */</div><div class='del'>-static inline struct item_head *item_head(const struct buffer_head *bh,</div><div class='del'>-					  int item_num)</div><div class='del'>-{</div><div class='del'>-	struct item_head *ih = reiserfs_node_data(bh);</div><div class='del'>-</div><div class='del'>-	return &amp;ih[item_num];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get the key from leaf node */</div><div class='del'>-static inline struct reiserfs_key *leaf_key(const struct buffer_head *bh,</div><div class='del'>-					    int item_num)</div><div class='del'>-{</div><div class='del'>-	return &amp;item_head(bh, item_num)-&gt;ih_key;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *ih_item_body(const struct buffer_head *bh,</div><div class='del'>-				 const struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	return bh-&gt;b_data + ih_location(ih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get item body from leaf node */</div><div class='del'>-static inline void *item_body(const struct buffer_head *bh, int item_num)</div><div class='del'>-{</div><div class='del'>-	return ih_item_body(bh, item_head(bh, item_num));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct item_head *tp_item_head(const struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	return item_head(PATH_PLAST_BUFFER(path), PATH_LAST_POSITION(path));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *tp_item_body(const struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	return item_body(PATH_PLAST_BUFFER(path), PATH_LAST_POSITION(path));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define get_last_bh(path) PATH_PLAST_BUFFER(path)</div><div class='del'>-#define get_item_pos(path) PATH_LAST_POSITION(path)</div><div class='del'>-#define item_moved(ih,path) comp_items(ih, path)</div><div class='del'>-#define path_changed(ih,path) comp_items (ih, path)</div><div class='del'>-</div><div class='del'>-/* array of the entry headers */</div><div class='del'>- /* get item body */</div><div class='del'>-#define B_I_DEH(bh, ih) ((struct reiserfs_de_head *)(ih_item_body(bh, ih)))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * length of the directory entry in directory item. This define</div><div class='del'>- * calculates length of i-th directory entry using directory entry</div><div class='del'>- * locations from dir entry head. When it calculates length of 0-th</div><div class='del'>- * directory entry, it uses length of whole item in place of entry</div><div class='del'>- * location of the non-existent following entry in the calculation.</div><div class='del'>- * See picture above.</div><div class='del'>- */</div><div class='del'>-static inline int entry_length(const struct buffer_head *bh,</div><div class='del'>-			       const struct item_head *ih, int pos_in_item)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-</div><div class='del'>-	deh = B_I_DEH(bh, ih) + pos_in_item;</div><div class='del'>-	if (pos_in_item)</div><div class='del'>-		return deh_location(deh - 1) - deh_location(deh);</div><div class='del'>-</div><div class='del'>-	return ih_item_len(ih) - deh_location(deh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                       MISC                                              *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Size of pointer to the unformatted node. */</div><div class='del'>-#define UNFM_P_SIZE (sizeof(unp_t))</div><div class='del'>-#define UNFM_P_SHIFT 2</div><div class='del'>-</div><div class='del'>-/* in in-core inode key is stored on le form */</div><div class='del'>-#define INODE_PKEY(inode) ((struct reiserfs_key *)(REISERFS_I(inode)-&gt;i_key))</div><div class='del'>-</div><div class='del'>-#define MAX_UL_INT 0xffffffff</div><div class='del'>-#define MAX_INT    0x7ffffff</div><div class='del'>-#define MAX_US_INT 0xffff</div><div class='del'>-</div><div class='del'>-// reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset</div><div class='del'>-static inline loff_t max_reiserfs_offset(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5)</div><div class='del'>-		return (loff_t) U32_MAX;</div><div class='del'>-</div><div class='del'>-	return (loff_t) ((~(__u64) 0) &gt;&gt; 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_KEY_OBJECTID	MAX_UL_INT</div><div class='del'>-</div><div class='del'>-#define MAX_B_NUM  MAX_UL_INT</div><div class='del'>-#define MAX_FC_NUM MAX_US_INT</div><div class='del'>-</div><div class='del'>-/* the purpose is to detect overflow of an unsigned short */</div><div class='del'>-#define REISERFS_LINK_MAX (MAX_US_INT - 1000)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following defines are used in reiserfs_insert_item</div><div class='del'>- * and reiserfs_append_item</div><div class='del'>- */</div><div class='del'>-#define REISERFS_KERNEL_MEM		0	/* kernel memory mode */</div><div class='del'>-#define REISERFS_USER_MEM		1	/* user memory mode */</div><div class='del'>-</div><div class='del'>-#define fs_generation(s) (REISERFS_SB(s)-&gt;s_generation_counter)</div><div class='del'>-#define get_generation(s) atomic_read (&amp;fs_generation(s))</div><div class='del'>-#define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)-&gt;tb_sb) != (tb)-&gt;fs_gen)</div><div class='del'>-#define __fs_changed(gen,s) (gen != get_generation (s))</div><div class='del'>-#define fs_changed(gen,s)		\</div><div class='del'>-({					\</div><div class='del'>-	reiserfs_cond_resched(s);	\</div><div class='del'>-	__fs_changed(gen, s);		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                  FIXATE NODES                                           *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-#define VI_TYPE_LEFT_MERGEABLE 1</div><div class='del'>-#define VI_TYPE_RIGHT_MERGEABLE 2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * To make any changes in the tree we always first find node, that</div><div class='del'>- * contains item to be changed/deleted or place to insert a new</div><div class='del'>- * item. We call this node S. To do balancing we need to decide what</div><div class='del'>- * we will shift to left/right neighbor, or to a new node, where new</div><div class='del'>- * item will be etc. To make this analysis simpler we build virtual</div><div class='del'>- * node. Virtual node is an array of items, that will replace items of</div><div class='del'>- * node S. (For instance if we are going to delete an item, virtual</div><div class='del'>- * node does not contain it). Virtual node keeps information about</div><div class='del'>- * item sizes and types, mergeability of first and last items, sizes</div><div class='del'>- * of all entries in directory item. We use this array of items when</div><div class='del'>- * calculating what we can shift to neighbors and how many nodes we</div><div class='del'>- * have to have if we do not any shiftings, if we shift to left/right</div><div class='del'>- * neighbor or to both.</div><div class='del'>- */</div><div class='del'>-struct virtual_item {</div><div class='del'>-	int vi_index;		/* index in the array of item operations */</div><div class='del'>-	unsigned short vi_type;	/* left/right mergeability */</div><div class='del'>-</div><div class='del'>-	/* length of item that it will have after balancing */</div><div class='del'>-	unsigned short vi_item_len;</div><div class='del'>-</div><div class='del'>-	struct item_head *vi_ih;</div><div class='del'>-	const char *vi_item;	/* body of item (old or new) */</div><div class='del'>-	const void *vi_new_data;	/* 0 always but paste mode */</div><div class='del'>-	void *vi_uarea;		/* item specific area */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct virtual_node {</div><div class='del'>-	/* this is a pointer to the free space in the buffer */</div><div class='del'>-	char *vn_free_ptr;</div><div class='del'>-</div><div class='del'>-	unsigned short vn_nr_item;	/* number of items in virtual node */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * size of node , that node would have if it has</div><div class='del'>-	 * unlimited size and no balancing is performed</div><div class='del'>-	 */</div><div class='del'>-	short vn_size;</div><div class='del'>-</div><div class='del'>-	/* mode of balancing (paste, insert, delete, cut) */</div><div class='del'>-	short vn_mode;</div><div class='del'>-</div><div class='del'>-	short vn_affected_item_num;</div><div class='del'>-	short vn_pos_in_item;</div><div class='del'>-</div><div class='del'>-	/* item header of inserted item, 0 for other modes */</div><div class='del'>-	struct item_head *vn_ins_ih;</div><div class='del'>-	const void *vn_data;</div><div class='del'>-</div><div class='del'>-	/* array of items (including a new one, excluding item to be deleted) */</div><div class='del'>-	struct virtual_item *vn_vi;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* used by directory items when creating virtual nodes */</div><div class='del'>-struct direntry_uarea {</div><div class='del'>-	int flags;</div><div class='del'>-	__u16 entry_count;</div><div class='del'>-	__u16 entry_sizes[];</div><div class='del'>-} __attribute__ ((__packed__));</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                  TREE BALANCE                                           *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This temporary structure is used in tree balance algorithms, and</div><div class='del'>- * constructed as we go to the extent that its various parts are</div><div class='del'>- * needed.  It contains arrays of nodes that can potentially be</div><div class='del'>- * involved in the balancing of node S, and parameters that define how</div><div class='del'>- * each of the nodes must be balanced.  Note that in these algorithms</div><div class='del'>- * for balancing the worst case is to need to balance the current node</div><div class='del'>- * S and the left and right neighbors and all of their parents plus</div><div class='del'>- * create a new node.  We implement S1 balancing for the leaf nodes</div><div class='del'>- * and S0 balancing for the internal nodes (S1 and S0 are defined in</div><div class='del'>- * our papers.)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* size of the array of buffers to free at end of do_balance */</div><div class='del'>-#define MAX_FREE_BLOCK 7</div><div class='del'>-</div><div class='del'>-/* maximum number of FEB blocknrs on a single level */</div><div class='del'>-#define MAX_AMOUNT_NEEDED 2</div><div class='del'>-</div><div class='del'>-/* someday somebody will prefix every field in this struct with tb_ */</div><div class='del'>-struct tree_balance {</div><div class='del'>-	int tb_mode;</div><div class='del'>-	int need_balance_dirty;</div><div class='del'>-	struct super_block *tb_sb;</div><div class='del'>-	struct reiserfs_transaction_handle *transaction_handle;</div><div class='del'>-	struct treepath *tb_path;</div><div class='del'>-</div><div class='del'>-	/* array of left neighbors of nodes in the path */</div><div class='del'>-	struct buffer_head *L[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* array of right neighbors of nodes in the path */</div><div class='del'>-	struct buffer_head *R[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* array of fathers of the left neighbors */</div><div class='del'>-	struct buffer_head *FL[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* array of fathers of the right neighbors */</div><div class='del'>-	struct buffer_head *FR[MAX_HEIGHT];</div><div class='del'>-	/* array of common parents of center node and its left neighbor */</div><div class='del'>-	struct buffer_head *CFL[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* array of common parents of center node and its right neighbor */</div><div class='del'>-	struct buffer_head *CFR[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * array of empty buffers. Number of buffers in array equals</div><div class='del'>-	 * cur_blknum.</div><div class='del'>-	 */</div><div class='del'>-	struct buffer_head *FEB[MAX_FEB_SIZE];</div><div class='del'>-	struct buffer_head *used[MAX_FEB_SIZE];</div><div class='del'>-	struct buffer_head *thrown[MAX_FEB_SIZE];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * array of number of items which must be shifted to the left in</div><div class='del'>-	 * order to balance the current node; for leaves includes item that</div><div class='del'>-	 * will be partially shifted; for internal nodes, it is the number</div><div class='del'>-	 * of child pointers rather than items. It includes the new item</div><div class='del'>-	 * being created. The code sometimes subtracts one to get the</div><div class='del'>-	 * number of wholly shifted items for other purposes.</div><div class='del'>-	 */</div><div class='del'>-	int lnum[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* substitute right for left in comment above */</div><div class='del'>-	int rnum[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * array indexed by height h mapping the key delimiting L[h] and</div><div class='del'>-	 * S[h] to its item number within the node CFL[h]</div><div class='del'>-	 */</div><div class='del'>-	int lkey[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* substitute r for l in comment above */</div><div class='del'>-	int rkey[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the number of bytes by we are trying to add or remove from</div><div class='del'>-	 * S[h]. A negative value means removing.</div><div class='del'>-	 */</div><div class='del'>-	int insert_size[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of nodes that will replace node S[h] after balancing</div><div class='del'>-	 * on the level h of the tree.  If 0 then S is being deleted,</div><div class='del'>-	 * if 1 then S is remaining and no new nodes are being created,</div><div class='del'>-	 * if 2 or 3 then 1 or 2 new nodes is being created</div><div class='del'>-	 */</div><div class='del'>-	int blknum[MAX_HEIGHT];</div><div class='del'>-</div><div class='del'>-	/* fields that are used only for balancing leaves of the tree */</div><div class='del'>-</div><div class='del'>-	/* number of empty blocks having been already allocated */</div><div class='del'>-	int cur_blknum;</div><div class='del'>-</div><div class='del'>-	/* number of items that fall into left most node when S[0] splits */</div><div class='del'>-	int s0num;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of bytes which can flow to the left neighbor from the left</div><div class='del'>-	 * most liquid item that cannot be shifted from S[0] entirely</div><div class='del'>-	 * if -1 then nothing will be partially shifted</div><div class='del'>-	 */</div><div class='del'>-	int lbytes;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of bytes which will flow to the right neighbor from the right</div><div class='del'>-	 * most liquid item that cannot be shifted from S[0] entirely</div><div class='del'>-	 * if -1 then nothing will be partially shifted</div><div class='del'>-	 */</div><div class='del'>-	int rbytes;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * index into the array of item headers in</div><div class='del'>-	 * S[0] of the affected item</div><div class='del'>-	 */</div><div class='del'>-	int item_pos;</div><div class='del'>-</div><div class='del'>-	/* new nodes allocated to hold what could not fit into S */</div><div class='del'>-	struct buffer_head *S_new[2];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of items that will be placed into nodes in S_new</div><div class='del'>-	 * when S[0] splits</div><div class='del'>-	 */</div><div class='del'>-	int snum[2];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * number of bytes which flow to nodes in S_new when S[0] splits</div><div class='del'>-	 * note: if S[0] splits into 3 nodes, then items do not need to be cut</div><div class='del'>-	 */</div><div class='del'>-	int sbytes[2];</div><div class='del'>-</div><div class='del'>-	int pos_in_item;</div><div class='del'>-	int zeroes_num;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * buffers which are to be freed after do_balance finishes</div><div class='del'>-	 * by unfix_nodes</div><div class='del'>-	 */</div><div class='del'>-	struct buffer_head *buf_to_free[MAX_FREE_BLOCK];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * kmalloced memory. Used to create virtual node and keep</div><div class='del'>-	 * map of dirtied bitmap blocks</div><div class='del'>-	 */</div><div class='del'>-	char *vn_buf;</div><div class='del'>-</div><div class='del'>-	int vn_buf_size;	/* size of the vn_buf */</div><div class='del'>-</div><div class='del'>-	/* VN starts after bitmap of bitmap blocks */</div><div class='del'>-	struct virtual_node *tb_vn;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * saved value of `reiserfs_generation' counter see</div><div class='del'>-	 * FILESYSTEM_CHANGED() macro in reiserfs_fs.h</div><div class='del'>-	 */</div><div class='del'>-	int fs_gen;</div><div class='del'>-</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	/*</div><div class='del'>-	 * key pointer, to pass to block allocator or</div><div class='del'>-	 * another low-level subsystem</div><div class='del'>-	 */</div><div class='del'>-	struct in_core_key key;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* These are modes of balancing */</div><div class='del'>-</div><div class='del'>-/* When inserting an item. */</div><div class='del'>-#define M_INSERT	'i'</div><div class='del'>-/*</div><div class='del'>- * When inserting into (directories only) or appending onto an already</div><div class='del'>- * existent item.</div><div class='del'>- */</div><div class='del'>-#define M_PASTE		'p'</div><div class='del'>-/* When deleting an item. */</div><div class='del'>-#define M_DELETE	'd'</div><div class='del'>-/* When truncating an item or removing an entry from a (directory) item. */</div><div class='del'>-#define M_CUT		'c'</div><div class='del'>-</div><div class='del'>-/* used when balancing on leaf level skipped (in reiserfsck) */</div><div class='del'>-#define M_INTERNAL	'n'</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When further balancing is not needed, then do_balance does not need</div><div class='del'>- * to be called.</div><div class='del'>- */</div><div class='del'>-#define M_SKIP_BALANCING		's'</div><div class='del'>-#define M_CONVERT	'v'</div><div class='del'>-</div><div class='del'>-/* modes of leaf_move_items */</div><div class='del'>-#define LEAF_FROM_S_TO_L 0</div><div class='del'>-#define LEAF_FROM_S_TO_R 1</div><div class='del'>-#define LEAF_FROM_R_TO_L 2</div><div class='del'>-#define LEAF_FROM_L_TO_R 3</div><div class='del'>-#define LEAF_FROM_S_TO_SNEW 4</div><div class='del'>-</div><div class='del'>-#define FIRST_TO_LAST 0</div><div class='del'>-#define LAST_TO_FIRST 1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * used in do_balance for passing parent of node information that has</div><div class='del'>- * been gotten from tb struct</div><div class='del'>- */</div><div class='del'>-struct buffer_info {</div><div class='del'>-	struct tree_balance *tb;</div><div class='del'>-	struct buffer_head *bi_bh;</div><div class='del'>-	struct buffer_head *bi_parent;</div><div class='del'>-	int bi_position;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct super_block *sb_from_tb(struct tree_balance *tb)</div><div class='del'>-{</div><div class='del'>-	return tb ? tb-&gt;tb_sb : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct super_block *sb_from_bi(struct buffer_info *bi)</div><div class='del'>-{</div><div class='del'>-	return bi ? sb_from_tb(bi-&gt;tb) : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * there are 4 types of items: stat data, directory item, indirect, direct.</div><div class='del'>- * +-------------------+------------+--------------+------------+</div><div class='del'>- * |                   |  k_offset  | k_uniqueness | mergeable? |</div><div class='del'>- * +-------------------+------------+--------------+------------+</div><div class='del'>- * |     stat data     |     0      |      0       |   no       |</div><div class='del'>- * +-------------------+------------+--------------+------------+</div><div class='del'>- * | 1st directory item| DOT_OFFSET | DIRENTRY_ .. |   no       |</div><div class='del'>- * | non 1st directory | hash value | UNIQUENESS   |   yes      |</div><div class='del'>- * |     item          |            |              |            |</div><div class='del'>- * +-------------------+------------+--------------+------------+</div><div class='del'>- * | indirect item     | offset + 1 |TYPE_INDIRECT |    [1]	|</div><div class='del'>- * +-------------------+------------+--------------+------------+</div><div class='del'>- * | direct item       | offset + 1 |TYPE_DIRECT   |    [2]     |</div><div class='del'>- * +-------------------+------------+--------------+------------+</div><div class='del'>- *</div><div class='del'>- * [1] if this is not the first indirect item of the object</div><div class='del'>- * [2] if this is not the first direct item of the object</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-struct item_operations {</div><div class='del'>-	int (*bytes_number) (struct item_head * ih, int block_size);</div><div class='del'>-	void (*decrement_key) (struct cpu_key *);</div><div class='del'>-	int (*is_left_mergeable) (struct reiserfs_key * ih,</div><div class='del'>-				  unsigned long bsize);</div><div class='del'>-	void (*print_item) (struct item_head *, char *item);</div><div class='del'>-	void (*check_item) (struct item_head *, char *item);</div><div class='del'>-</div><div class='del'>-	int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,</div><div class='del'>-			  int is_affected, int insert_size);</div><div class='del'>-	int (*check_left) (struct virtual_item * vi, int free,</div><div class='del'>-			   int start_skip, int end_skip);</div><div class='del'>-	int (*check_right) (struct virtual_item * vi, int free);</div><div class='del'>-	int (*part_size) (struct virtual_item * vi, int from, int to);</div><div class='del'>-	int (*unit_num) (struct virtual_item * vi);</div><div class='del'>-	void (*print_vi) (struct virtual_item * vi);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct item_operations *item_ops[TYPE_ANY + 1];</div><div class='del'>-</div><div class='del'>-#define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]-&gt;bytes_number (ih, bsize)</div><div class='del'>-#define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]-&gt;is_left_mergeable (key, bsize)</div><div class='del'>-#define op_print_item(ih,item)                       item_ops[le_ih_k_type (ih)]-&gt;print_item (ih, item)</div><div class='del'>-#define op_check_item(ih,item)                       item_ops[le_ih_k_type (ih)]-&gt;check_item (ih, item)</div><div class='del'>-#define op_create_vi(vn,vi,is_affected,insert_size)  item_ops[le_ih_k_type ((vi)-&gt;vi_ih)]-&gt;create_vi (vn,vi,is_affected,insert_size)</div><div class='del'>-#define op_check_left(vi,free,start_skip,end_skip) item_ops[(vi)-&gt;vi_index]-&gt;check_left (vi, free, start_skip, end_skip)</div><div class='del'>-#define op_check_right(vi,free)                      item_ops[(vi)-&gt;vi_index]-&gt;check_right (vi, free)</div><div class='del'>-#define op_part_size(vi,from,to)                     item_ops[(vi)-&gt;vi_index]-&gt;part_size (vi, from, to)</div><div class='del'>-#define op_unit_num(vi)				     item_ops[(vi)-&gt;vi_index]-&gt;unit_num (vi)</div><div class='del'>-#define op_print_vi(vi)                              item_ops[(vi)-&gt;vi_index]-&gt;print_vi (vi)</div><div class='del'>-</div><div class='del'>-#define COMP_SHORT_KEYS comp_short_keys</div><div class='del'>-</div><div class='del'>-/* number of blocks pointed to by the indirect item */</div><div class='del'>-#define I_UNFM_NUM(ih)	(ih_item_len(ih) / UNFM_P_SIZE)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the used space within the unformatted node corresponding</div><div class='del'>- * to pos within the item pointed to by ih</div><div class='del'>- */</div><div class='del'>-#define I_POS_UNFM_SIZE(ih,pos,size) (((pos) == I_UNFM_NUM(ih) - 1 ) ? (size) - ih_free_space(ih) : (size))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * number of bytes contained by the direct item or the</div><div class='del'>- * unformatted nodes the indirect item points to</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* following defines use reiserfs buffer header and item header */</div><div class='del'>-</div><div class='del'>-/* get stat-data */</div><div class='del'>-#define B_I_STAT_DATA(bh, ih) ( (struct stat_data * )((bh)-&gt;b_data + ih_location(ih)) )</div><div class='del'>-</div><div class='del'>-/* this is 3976 for size==4096 */</div><div class='del'>-#define MAX_DIRECT_ITEM_LEN(size) ((size) - BLKH_SIZE - 2*IH_SIZE - SD_SIZE - UNFM_P_SIZE)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * indirect items consist of entries which contain blocknrs, pos</div><div class='del'>- * indicates which entry, and B_I_POS_UNFM_POINTER resolves to the</div><div class='del'>- * blocknr contained by the entry pos points to</div><div class='del'>- */</div><div class='del'>-#define B_I_POS_UNFM_POINTER(bh, ih, pos)				\</div><div class='del'>-	le32_to_cpu(*(((unp_t *)ih_item_body(bh, ih)) + (pos)))</div><div class='del'>-#define PUT_B_I_POS_UNFM_POINTER(bh, ih, pos, val)			\</div><div class='del'>-	(*(((unp_t *)ih_item_body(bh, ih)) + (pos)) = cpu_to_le32(val))</div><div class='del'>-</div><div class='del'>-struct reiserfs_iget_args {</div><div class='del'>-	__u32 objectid;</div><div class='del'>-	__u32 dirid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/***************************************************************************</div><div class='del'>- *                    FUNCTION DECLARATIONS                                *</div><div class='del'>- ***************************************************************************/</div><div class='del'>-</div><div class='del'>-#define get_journal_desc_magic(bh) (bh-&gt;b_data + bh-&gt;b_size - 12)</div><div class='del'>-</div><div class='del'>-#define journal_trans_half(blocksize) \</div><div class='del'>-	((blocksize - sizeof(struct reiserfs_journal_desc) - 12) / sizeof(__u32))</div><div class='del'>-</div><div class='del'>-/* journal.c see journal.c for all the comments here */</div><div class='del'>-</div><div class='del'>-/* first block written in a commit.  */</div><div class='del'>-struct reiserfs_journal_desc {</div><div class='del'>-	__le32 j_trans_id;	/* id of commit */</div><div class='del'>-</div><div class='del'>-	/* length of commit. len +1 is the commit block */</div><div class='del'>-	__le32 j_len;</div><div class='del'>-</div><div class='del'>-	__le32 j_mount_id;	/* mount id of this trans */</div><div class='del'>-	__le32 j_realblock[];	/* real locations for each block */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define get_desc_trans_id(d)   le32_to_cpu((d)-&gt;j_trans_id)</div><div class='del'>-#define get_desc_trans_len(d)  le32_to_cpu((d)-&gt;j_len)</div><div class='del'>-#define get_desc_mount_id(d)   le32_to_cpu((d)-&gt;j_mount_id)</div><div class='del'>-</div><div class='del'>-#define set_desc_trans_id(d,val)       do { (d)-&gt;j_trans_id = cpu_to_le32 (val); } while (0)</div><div class='del'>-#define set_desc_trans_len(d,val)      do { (d)-&gt;j_len = cpu_to_le32 (val); } while (0)</div><div class='del'>-#define set_desc_mount_id(d,val)       do { (d)-&gt;j_mount_id = cpu_to_le32 (val); } while (0)</div><div class='del'>-</div><div class='del'>-/* last block written in a commit */</div><div class='del'>-struct reiserfs_journal_commit {</div><div class='del'>-	__le32 j_trans_id;	/* must match j_trans_id from the desc block */</div><div class='del'>-	__le32 j_len;		/* ditto */</div><div class='del'>-	__le32 j_realblock[];	/* real locations for each block */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define get_commit_trans_id(c) le32_to_cpu((c)-&gt;j_trans_id)</div><div class='del'>-#define get_commit_trans_len(c)        le32_to_cpu((c)-&gt;j_len)</div><div class='del'>-#define get_commit_mount_id(c) le32_to_cpu((c)-&gt;j_mount_id)</div><div class='del'>-</div><div class='del'>-#define set_commit_trans_id(c,val)     do { (c)-&gt;j_trans_id = cpu_to_le32 (val); } while (0)</div><div class='del'>-#define set_commit_trans_len(c,val)    do { (c)-&gt;j_len = cpu_to_le32 (val); } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this header block gets written whenever a transaction is considered</div><div class='del'>- * fully flushed, and is more recent than the last fully flushed transaction.</div><div class='del'>- * fully flushed means all the log blocks and all the real blocks are on</div><div class='del'>- * disk, and this transaction does not need to be replayed.</div><div class='del'>- */</div><div class='del'>-struct reiserfs_journal_header {</div><div class='del'>-	/* id of last fully flushed transaction */</div><div class='del'>-	__le32 j_last_flush_trans_id;</div><div class='del'>-</div><div class='del'>-	/* offset in the log of where to start replay after a crash */</div><div class='del'>-	__le32 j_first_unflushed_offset;</div><div class='del'>-</div><div class='del'>-	__le32 j_mount_id;</div><div class='del'>-	/* 12 */ struct journal_params jh_journal;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* biggest tunable defines are right here */</div><div class='del'>-#define JOURNAL_BLOCK_COUNT 8192	/* number of blocks in the journal */</div><div class='del'>-</div><div class='del'>-/* biggest possible single transaction, don't change for now (8/3/99) */</div><div class='del'>-#define JOURNAL_TRANS_MAX_DEFAULT 1024</div><div class='del'>-#define JOURNAL_TRANS_MIN_DEFAULT 256</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * max blocks to batch into one transaction,</div><div class='del'>- * don't make this any bigger than 900</div><div class='del'>- */</div><div class='del'>-#define JOURNAL_MAX_BATCH_DEFAULT   900</div><div class='del'>-#define JOURNAL_MIN_RATIO 2</div><div class='del'>-#define JOURNAL_MAX_COMMIT_AGE 30</div><div class='del'>-#define JOURNAL_MAX_TRANS_AGE 30</div><div class='del'>-#define JOURNAL_PER_BALANCE_CNT (3 * (MAX_HEIGHT-2) + 9)</div><div class='del'>-#define JOURNAL_BLOCKS_PER_OBJECT(sb)  (JOURNAL_PER_BALANCE_CNT * 3 + \</div><div class='del'>-					 2 * (REISERFS_QUOTA_INIT_BLOCKS(sb) + \</div><div class='del'>-					      REISERFS_QUOTA_TRANS_BLOCKS(sb)))</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-#define REISERFS_QUOTA_OPTS ((1 &lt;&lt; REISERFS_USRQUOTA) | (1 &lt;&lt; REISERFS_GRPQUOTA))</div><div class='del'>-/* We need to update data and inode (atime) */</div><div class='del'>-#define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; REISERFS_QUOTA_OPTS ? 2 : 0)</div><div class='del'>-/* 1 balancing, 1 bitmap, 1 data per write + stat data update */</div><div class='del'>-#define REISERFS_QUOTA_INIT_BLOCKS(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; REISERFS_QUOTA_OPTS ? \</div><div class='del'>-(DQUOT_INIT_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_INIT_REWRITE+1) : 0)</div><div class='del'>-/* same as with INIT */</div><div class='del'>-#define REISERFS_QUOTA_DEL_BLOCKS(s) (REISERFS_SB(s)-&gt;s_mount_opt &amp; REISERFS_QUOTA_OPTS ? \</div><div class='del'>-(DQUOT_DEL_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_DEL_REWRITE+1) : 0)</div><div class='del'>-#else</div><div class='del'>-#define REISERFS_QUOTA_TRANS_BLOCKS(s) 0</div><div class='del'>-#define REISERFS_QUOTA_INIT_BLOCKS(s) 0</div><div class='del'>-#define REISERFS_QUOTA_DEL_BLOCKS(s) 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * both of these can be as low as 1, or as high as you want.  The min is the</div><div class='del'>- * number of 4k bitmap nodes preallocated on mount. New nodes are allocated</div><div class='del'>- * as needed, and released when transactions are committed.  On release, if</div><div class='del'>- * the current number of nodes is &gt; max, the node is freed, otherwise,</div><div class='del'>- * it is put on a free list for faster use later.</div><div class='del'>-*/</div><div class='del'>-#define REISERFS_MIN_BITMAP_NODES 10</div><div class='del'>-#define REISERFS_MAX_BITMAP_NODES 100</div><div class='del'>-</div><div class='del'>-/* these are based on journal hash size of 8192 */</div><div class='del'>-#define JBH_HASH_SHIFT 13</div><div class='del'>-#define JBH_HASH_MASK 8191</div><div class='del'>-</div><div class='del'>-#define _jhashfn(sb,block)	\</div><div class='del'>-	(((unsigned long)sb&gt;&gt;L1_CACHE_SHIFT) ^ \</div><div class='del'>-	 (((block)&lt;&lt;(JBH_HASH_SHIFT - 6)) ^ ((block) &gt;&gt; 13) ^ ((block) &lt;&lt; (JBH_HASH_SHIFT - 12))))</div><div class='del'>-#define journal_hash(t,sb,block) ((t)[_jhashfn((sb),(block)) &amp; JBH_HASH_MASK])</div><div class='del'>-</div><div class='del'>-/* We need these to make journal.c code more readable */</div><div class='del'>-#define journal_find_get_block(s, block) __find_get_block(\</div><div class='del'>-		file_bdev(SB_JOURNAL(s)-&gt;j_bdev_file), block, s-&gt;s_blocksize)</div><div class='del'>-#define journal_getblk(s, block) __getblk(file_bdev(SB_JOURNAL(s)-&gt;j_bdev_file),\</div><div class='del'>-		block, s-&gt;s_blocksize)</div><div class='del'>-#define journal_bread(s, block) __bread(file_bdev(SB_JOURNAL(s)-&gt;j_bdev_file),\</div><div class='del'>-		block, s-&gt;s_blocksize)</div><div class='del'>-</div><div class='del'>-enum reiserfs_bh_state_bits {</div><div class='del'>-	BH_JDirty = BH_PrivateStart,	/* buffer is in current transaction */</div><div class='del'>-	BH_JDirty_wait,</div><div class='del'>-	/*</div><div class='del'>-	 * disk block was taken off free list before being in a</div><div class='del'>-	 * finished transaction, or written to disk. Can be reused immed.</div><div class='del'>-	 */</div><div class='del'>-	BH_JNew,</div><div class='del'>-	BH_JPrepared,</div><div class='del'>-	BH_JRestore_dirty,</div><div class='del'>-	BH_JTest,		/* debugging only will go away */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-BUFFER_FNS(JDirty, journaled);</div><div class='del'>-TAS_BUFFER_FNS(JDirty, journaled);</div><div class='del'>-BUFFER_FNS(JDirty_wait, journal_dirty);</div><div class='del'>-TAS_BUFFER_FNS(JDirty_wait, journal_dirty);</div><div class='del'>-BUFFER_FNS(JNew, journal_new);</div><div class='del'>-TAS_BUFFER_FNS(JNew, journal_new);</div><div class='del'>-BUFFER_FNS(JPrepared, journal_prepared);</div><div class='del'>-TAS_BUFFER_FNS(JPrepared, journal_prepared);</div><div class='del'>-BUFFER_FNS(JRestore_dirty, journal_restore_dirty);</div><div class='del'>-TAS_BUFFER_FNS(JRestore_dirty, journal_restore_dirty);</div><div class='del'>-BUFFER_FNS(JTest, journal_test);</div><div class='del'>-TAS_BUFFER_FNS(JTest, journal_test);</div><div class='del'>-</div><div class='del'>-/* transaction handle which is passed around for all journal calls */</div><div class='del'>-struct reiserfs_transaction_handle {</div><div class='del'>-	/*</div><div class='del'>-	 * super for this FS when journal_begin was called. saves calls to</div><div class='del'>-	 * reiserfs_get_super also used by nested transactions to make</div><div class='del'>-	 * sure they are nesting on the right FS _must_ be first</div><div class='del'>-	 * in the handle</div><div class='del'>-	 */</div><div class='del'>-	struct super_block *t_super;</div><div class='del'>-</div><div class='del'>-	int t_refcount;</div><div class='del'>-	int t_blocks_logged;	/* number of blocks this writer has logged */</div><div class='del'>-	int t_blocks_allocated;	/* number of blocks this writer allocated */</div><div class='del'>-</div><div class='del'>-	/* sanity check, equals the current trans id */</div><div class='del'>-	unsigned int t_trans_id;</div><div class='del'>-</div><div class='del'>-	void *t_handle_save;	/* save existing current-&gt;journal_info */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if new block allocation occurres, that block</div><div class='del'>-	 * should be displaced from others</div><div class='del'>-	 */</div><div class='del'>-	unsigned displace_new_blocks:1;</div><div class='del'>-</div><div class='del'>-	struct list_head t_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * used to keep track of ordered and tail writes, attached to the buffer</div><div class='del'>- * head through b_journal_head.</div><div class='del'>- */</div><div class='del'>-struct reiserfs_jh {</div><div class='del'>-	struct reiserfs_journal_list *jl;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void reiserfs_free_jh(struct buffer_head *bh);</div><div class='del'>-int reiserfs_add_tail_list(struct inode *inode, struct buffer_head *bh);</div><div class='del'>-int reiserfs_add_ordered_list(struct inode *inode, struct buffer_head *bh);</div><div class='del'>-int journal_mark_dirty(struct reiserfs_transaction_handle *,</div><div class='del'>-		       struct buffer_head *bh);</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_file_data_log(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (reiserfs_data_log(inode-&gt;i_sb) ||</div><div class='del'>-	    (REISERFS_I(inode)-&gt;i_flags &amp; i_data_log))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_transaction_running(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle *th = current-&gt;journal_info;</div><div class='del'>-	if (th &amp;&amp; th-&gt;t_super == s)</div><div class='del'>-		return 1;</div><div class='del'>-	if (th &amp;&amp; th-&gt;t_super == NULL)</div><div class='del'>-		BUG();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_transaction_free_space(struct reiserfs_transaction_handle *th)</div><div class='del'>-{</div><div class='del'>-	return th-&gt;t_blocks_allocated - th-&gt;t_blocks_logged;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct reiserfs_transaction_handle *reiserfs_persistent_transaction(struct</div><div class='del'>-								    super_block</div><div class='del'>-								    *,</div><div class='del'>-								    int count);</div><div class='del'>-int reiserfs_end_persistent_transaction(struct reiserfs_transaction_handle *);</div><div class='del'>-void reiserfs_vfs_truncate_file(struct inode *inode);</div><div class='del'>-int reiserfs_commit_page(struct inode *inode, struct page *page,</div><div class='del'>-			 unsigned from, unsigned to);</div><div class='del'>-void reiserfs_flush_old_commits(struct super_block *);</div><div class='del'>-int reiserfs_commit_for_inode(struct inode *);</div><div class='del'>-int reiserfs_inode_needs_commit(struct inode *);</div><div class='del'>-void reiserfs_update_inode_transaction(struct inode *);</div><div class='del'>-void reiserfs_wait_on_write_block(struct super_block *s);</div><div class='del'>-void reiserfs_block_writes(struct reiserfs_transaction_handle *th);</div><div class='del'>-void reiserfs_allow_writes(struct super_block *s);</div><div class='del'>-void reiserfs_check_lock_depth(struct super_block *s, char *caller);</div><div class='del'>-int reiserfs_prepare_for_journal(struct super_block *, struct buffer_head *bh,</div><div class='del'>-				 int wait);</div><div class='del'>-void reiserfs_restore_prepared_buffer(struct super_block *,</div><div class='del'>-				      struct buffer_head *bh);</div><div class='del'>-int journal_init(struct super_block *, const char *j_dev_name, int old_format,</div><div class='del'>-		 unsigned int);</div><div class='del'>-int journal_release(struct reiserfs_transaction_handle *, struct super_block *);</div><div class='del'>-int journal_release_error(struct reiserfs_transaction_handle *,</div><div class='del'>-			  struct super_block *);</div><div class='del'>-int journal_end(struct reiserfs_transaction_handle *);</div><div class='del'>-int journal_end_sync(struct reiserfs_transaction_handle *);</div><div class='del'>-int journal_mark_freed(struct reiserfs_transaction_handle *,</div><div class='del'>-		       struct super_block *, b_blocknr_t blocknr);</div><div class='del'>-int journal_transaction_should_end(struct reiserfs_transaction_handle *, int);</div><div class='del'>-int reiserfs_in_journal(struct super_block *sb, unsigned int bmap_nr,</div><div class='del'>-			 int bit_nr, int searchall, b_blocknr_t *next);</div><div class='del'>-int journal_begin(struct reiserfs_transaction_handle *,</div><div class='del'>-		  struct super_block *sb, unsigned long);</div><div class='del'>-int journal_join_abort(struct reiserfs_transaction_handle *,</div><div class='del'>-		       struct super_block *sb);</div><div class='del'>-void reiserfs_abort_journal(struct super_block *sb, int errno);</div><div class='del'>-void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...);</div><div class='del'>-int reiserfs_allocate_list_bitmaps(struct super_block *s,</div><div class='del'>-				   struct reiserfs_list_bitmap *, unsigned int);</div><div class='del'>-</div><div class='del'>-void reiserfs_schedule_old_flush(struct super_block *s);</div><div class='del'>-void reiserfs_cancel_old_flush(struct super_block *s);</div><div class='del'>-void add_save_link(struct reiserfs_transaction_handle *th,</div><div class='del'>-		   struct inode *inode, int truncate);</div><div class='del'>-int remove_save_link(struct inode *inode, int truncate);</div><div class='del'>-</div><div class='del'>-/* objectid.c */</div><div class='del'>-__u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th);</div><div class='del'>-void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       __u32 objectid_to_release);</div><div class='del'>-int reiserfs_convert_objectid_map_v1(struct super_block *);</div><div class='del'>-</div><div class='del'>-/* stree.c */</div><div class='del'>-int B_IS_IN_TREE(const struct buffer_head *);</div><div class='del'>-extern void copy_item_head(struct item_head *to,</div><div class='del'>-			   const struct item_head *from);</div><div class='del'>-</div><div class='del'>-/* first key is in cpu form, second - le */</div><div class='del'>-extern int comp_short_keys(const struct reiserfs_key *le_key,</div><div class='del'>-			   const struct cpu_key *cpu_key);</div><div class='del'>-extern void le_key2cpu_key(struct cpu_key *to, const struct reiserfs_key *from);</div><div class='del'>-</div><div class='del'>-/* both are in le form */</div><div class='del'>-extern int comp_le_keys(const struct reiserfs_key *,</div><div class='del'>-			const struct reiserfs_key *);</div><div class='del'>-extern int comp_short_le_keys(const struct reiserfs_key *,</div><div class='del'>-			      const struct reiserfs_key *);</div><div class='del'>-</div><div class='del'>-/* * get key version from on disk key - kludge */</div><div class='del'>-static inline int le_key_version(const struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	int type;</div><div class='del'>-</div><div class='del'>-	type = offset_v2_k_type(&amp;(key-&gt;u.k_offset_v2));</div><div class='del'>-	if (type != TYPE_DIRECT &amp;&amp; type != TYPE_INDIRECT</div><div class='del'>-	    &amp;&amp; type != TYPE_DIRENTRY)</div><div class='del'>-		return KEY_FORMAT_3_5;</div><div class='del'>-</div><div class='del'>-	return KEY_FORMAT_3_6;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void copy_key(struct reiserfs_key *to,</div><div class='del'>-			    const struct reiserfs_key *from)</div><div class='del'>-{</div><div class='del'>-	memcpy(to, from, KEY_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int comp_items(const struct item_head *stored_ih, const struct treepath *path);</div><div class='del'>-const struct reiserfs_key *get_rkey(const struct treepath *chk_path,</div><div class='del'>-				    const struct super_block *sb);</div><div class='del'>-int search_by_key(struct super_block *, const struct cpu_key *,</div><div class='del'>-		  struct treepath *, int);</div><div class='del'>-#define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL)</div><div class='del'>-int search_for_position_by_key(struct super_block *sb,</div><div class='del'>-			       const struct cpu_key *cpu_key,</div><div class='del'>-			       struct treepath *search_path);</div><div class='del'>-extern void decrement_bcount(struct buffer_head *bh);</div><div class='del'>-void decrement_counters_in_path(struct treepath *search_path);</div><div class='del'>-void pathrelse(struct treepath *search_path);</div><div class='del'>-int reiserfs_check_path(struct treepath *p);</div><div class='del'>-void pathrelse_and_restore(struct super_block *s, struct treepath *search_path);</div><div class='del'>-</div><div class='del'>-int reiserfs_insert_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct treepath *path,</div><div class='del'>-			 const struct cpu_key *key,</div><div class='del'>-			 struct item_head *ih,</div><div class='del'>-			 struct inode *inode, const char *body);</div><div class='del'>-</div><div class='del'>-int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     struct treepath *path,</div><div class='del'>-			     const struct cpu_key *key,</div><div class='del'>-			     struct inode *inode,</div><div class='del'>-			     const char *body, int paste_size);</div><div class='del'>-</div><div class='del'>-int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			   struct treepath *path,</div><div class='del'>-			   struct cpu_key *key,</div><div class='del'>-			   struct inode *inode,</div><div class='del'>-			   struct page *page, loff_t new_file_size);</div><div class='del'>-</div><div class='del'>-int reiserfs_delete_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct treepath *path,</div><div class='del'>-			 const struct cpu_key *key,</div><div class='del'>-			 struct inode *inode, struct buffer_head *un_bh);</div><div class='del'>-</div><div class='del'>-void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-				struct inode *inode, struct reiserfs_key *key);</div><div class='del'>-int reiserfs_delete_object(struct reiserfs_transaction_handle *th,</div><div class='del'>-			   struct inode *inode);</div><div class='del'>-int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct inode *inode, struct page *,</div><div class='del'>-			 int update_timestamps);</div><div class='del'>-</div><div class='del'>-#define i_block_size(inode) ((inode)-&gt;i_sb-&gt;s_blocksize)</div><div class='del'>-#define file_size(inode) ((inode)-&gt;i_size)</div><div class='del'>-#define tail_size(inode) (file_size (inode) &amp; (i_block_size (inode) - 1))</div><div class='del'>-</div><div class='del'>-#define tail_has_to_be_packed(inode) (have_large_tails ((inode)-&gt;i_sb)?\</div><div class='del'>-!STORE_TAIL_IN_UNFM_S1(file_size (inode), tail_size(inode), inode-&gt;i_sb-&gt;s_blocksize):have_small_tails ((inode)-&gt;i_sb)?!STORE_TAIL_IN_UNFM_S2(file_size (inode), tail_size(inode), inode-&gt;i_sb-&gt;s_blocksize):0 )</div><div class='del'>-</div><div class='del'>-void padd_item(char *item, int total_length, int length);</div><div class='del'>-</div><div class='del'>-/* inode.c */</div><div class='del'>-/* args for the create parameter of reiserfs_get_block */</div><div class='del'>-#define GET_BLOCK_NO_CREATE 0	 /* don't create new blocks or convert tails */</div><div class='del'>-#define GET_BLOCK_CREATE 1	 /* add anything you need to find block */</div><div class='del'>-#define GET_BLOCK_NO_HOLE 2	 /* return -ENOENT for file holes */</div><div class='del'>-#define GET_BLOCK_READ_DIRECT 4	 /* read the tail if indirect item not found */</div><div class='del'>-#define GET_BLOCK_NO_IMUX     8	 /* i_mutex is not held, don't preallocate */</div><div class='del'>-#define GET_BLOCK_NO_DANGLE   16 /* don't leave any transactions running */</div><div class='del'>-</div><div class='del'>-void reiserfs_read_locked_inode(struct inode *inode,</div><div class='del'>-				struct reiserfs_iget_args *args);</div><div class='del'>-int reiserfs_find_actor(struct inode *inode, void *p);</div><div class='del'>-int reiserfs_init_locked_inode(struct inode *inode, void *p);</div><div class='del'>-void reiserfs_evict_inode(struct inode *inode);</div><div class='del'>-int reiserfs_write_inode(struct inode *inode, struct writeback_control *wbc);</div><div class='del'>-int reiserfs_get_block(struct inode *inode, sector_t block,</div><div class='del'>-		       struct buffer_head *bh_result, int create);</div><div class='del'>-struct dentry *reiserfs_fh_to_dentry(struct super_block *sb, struct fid *fid,</div><div class='del'>-				     int fh_len, int fh_type);</div><div class='del'>-struct dentry *reiserfs_fh_to_parent(struct super_block *sb, struct fid *fid,</div><div class='del'>-				     int fh_len, int fh_type);</div><div class='del'>-int reiserfs_encode_fh(struct inode *inode, __u32 * data, int *lenp,</div><div class='del'>-		       struct inode *parent);</div><div class='del'>-</div><div class='del'>-int reiserfs_truncate_file(struct inode *, int update_timestamps);</div><div class='del'>-void make_cpu_key(struct cpu_key *cpu_key, struct inode *inode, loff_t offset,</div><div class='del'>-		  int type, int key_length);</div><div class='del'>-void make_le_item_head(struct item_head *ih, const struct cpu_key *key,</div><div class='del'>-		       int version,</div><div class='del'>-		       loff_t offset, int type, int length, int entry_count);</div><div class='del'>-struct inode *reiserfs_iget(struct super_block *s, const struct cpu_key *key);</div><div class='del'>-</div><div class='del'>-struct reiserfs_security_handle;</div><div class='del'>-int reiserfs_new_inode(struct reiserfs_transaction_handle *th,</div><div class='del'>-		       struct inode *dir, umode_t mode,</div><div class='del'>-		       const char *symname, loff_t i_size,</div><div class='del'>-		       struct dentry *dentry, struct inode *inode,</div><div class='del'>-		       struct reiserfs_security_handle *security);</div><div class='del'>-</div><div class='del'>-void reiserfs_update_sd_size(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     struct inode *inode, loff_t size);</div><div class='del'>-</div><div class='del'>-static inline void reiserfs_update_sd(struct reiserfs_transaction_handle *th,</div><div class='del'>-				      struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	reiserfs_update_sd_size(th, inode, inode-&gt;i_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);</div><div class='del'>-int reiserfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		     struct iattr *attr);</div><div class='del'>-</div><div class='del'>-int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);</div><div class='del'>-</div><div class='del'>-/* namei.c */</div><div class='del'>-void reiserfs_init_priv_inode(struct inode *inode);</div><div class='del'>-void set_de_name_and_namelen(struct reiserfs_dir_entry *de);</div><div class='del'>-int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,</div><div class='del'>-			struct treepath *path, struct reiserfs_dir_entry *de);</div><div class='del'>-struct dentry *reiserfs_get_parent(struct dentry *);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_PROC_INFO</div><div class='del'>-int reiserfs_proc_info_init(struct super_block *sb);</div><div class='del'>-int reiserfs_proc_info_done(struct super_block *sb);</div><div class='del'>-int reiserfs_proc_info_global_init(void);</div><div class='del'>-int reiserfs_proc_info_global_done(void);</div><div class='del'>-</div><div class='del'>-#define PROC_EXP( e )   e</div><div class='del'>-</div><div class='del'>-#define __PINFO( sb ) REISERFS_SB(sb) -&gt; s_proc_info_data</div><div class='del'>-#define PROC_INFO_MAX( sb, field, value )								\</div><div class='del'>-    __PINFO( sb ).field =												\</div><div class='del'>-        max( REISERFS_SB( sb ) -&gt; s_proc_info_data.field, value )</div><div class='del'>-#define PROC_INFO_INC( sb, field ) ( ++ ( __PINFO( sb ).field ) )</div><div class='del'>-#define PROC_INFO_ADD( sb, field, val ) ( __PINFO( sb ).field += ( val ) )</div><div class='del'>-#define PROC_INFO_BH_STAT( sb, bh, level )							\</div><div class='del'>-    PROC_INFO_INC( sb, sbk_read_at[ ( level ) ] );						\</div><div class='del'>-    PROC_INFO_ADD( sb, free_at[ ( level ) ], B_FREE_SPACE( bh ) );	\</div><div class='del'>-    PROC_INFO_ADD( sb, items_at[ ( level ) ], B_NR_ITEMS( bh ) )</div><div class='del'>-#else</div><div class='del'>-static inline int reiserfs_proc_info_init(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_proc_info_done(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_proc_info_global_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_proc_info_global_done(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PROC_EXP( e )</div><div class='del'>-#define VOID_V ( ( void ) 0 )</div><div class='del'>-#define PROC_INFO_MAX( sb, field, value ) VOID_V</div><div class='del'>-#define PROC_INFO_INC( sb, field ) VOID_V</div><div class='del'>-#define PROC_INFO_ADD( sb, field, val ) VOID_V</div><div class='del'>-#define PROC_INFO_BH_STAT(sb, bh, n_node_level) VOID_V</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* dir.c */</div><div class='del'>-extern const struct inode_operations reiserfs_dir_inode_operations;</div><div class='del'>-extern const struct inode_operations reiserfs_symlink_inode_operations;</div><div class='del'>-extern const struct inode_operations reiserfs_special_inode_operations;</div><div class='del'>-extern const struct file_operations reiserfs_dir_operations;</div><div class='del'>-int reiserfs_readdir_inode(struct inode *, struct dir_context *);</div><div class='del'>-</div><div class='del'>-/* tail_conversion.c */</div><div class='del'>-int direct2indirect(struct reiserfs_transaction_handle *, struct inode *,</div><div class='del'>-		    struct treepath *, struct buffer_head *, loff_t);</div><div class='del'>-int indirect2direct(struct reiserfs_transaction_handle *, struct inode *,</div><div class='del'>-		    struct page *, struct treepath *, const struct cpu_key *,</div><div class='del'>-		    loff_t, char *);</div><div class='del'>-void reiserfs_unmap_buffer(struct buffer_head *);</div><div class='del'>-</div><div class='del'>-/* file.c */</div><div class='del'>-extern const struct inode_operations reiserfs_file_inode_operations;</div><div class='del'>-extern const struct inode_operations reiserfs_priv_file_inode_operations;</div><div class='del'>-extern const struct file_operations reiserfs_file_operations;</div><div class='del'>-extern const struct address_space_operations reiserfs_address_space_operations;</div><div class='del'>-</div><div class='del'>-/* fix_nodes.c */</div><div class='del'>-</div><div class='del'>-int fix_nodes(int n_op_mode, struct tree_balance *tb,</div><div class='del'>-	      struct item_head *ins_ih, const void *);</div><div class='del'>-void unfix_nodes(struct tree_balance *);</div><div class='del'>-</div><div class='del'>-/* prints.c */</div><div class='del'>-void __reiserfs_panic(struct super_block *s, const char *id,</div><div class='del'>-		      const char *function, const char *fmt, ...)</div><div class='del'>-    __attribute__ ((noreturn));</div><div class='del'>-#define reiserfs_panic(s, id, fmt, args...) \</div><div class='del'>-	__reiserfs_panic(s, id, __func__, fmt, ##args)</div><div class='del'>-void __reiserfs_error(struct super_block *s, const char *id,</div><div class='del'>-		      const char *function, const char *fmt, ...);</div><div class='del'>-#define reiserfs_error(s, id, fmt, args...) \</div><div class='del'>-	 __reiserfs_error(s, id, __func__, fmt, ##args)</div><div class='del'>-void reiserfs_info(struct super_block *s, const char *fmt, ...);</div><div class='del'>-void reiserfs_debug(struct super_block *s, int level, const char *fmt, ...);</div><div class='del'>-void print_indirect_item(struct buffer_head *bh, int item_num);</div><div class='del'>-void store_print_tb(struct tree_balance *tb);</div><div class='del'>-void print_cur_tb(char *mes);</div><div class='del'>-void print_de(struct reiserfs_dir_entry *de);</div><div class='del'>-void print_bi(struct buffer_info *bi, char *mes);</div><div class='del'>-#define PRINT_LEAF_ITEMS 1	/* print all items */</div><div class='del'>-#define PRINT_DIRECTORY_ITEMS 2	/* print directory items */</div><div class='del'>-#define PRINT_DIRECT_ITEMS 4	/* print contents of direct items */</div><div class='del'>-void print_block(struct buffer_head *bh, ...);</div><div class='del'>-void print_bmap(struct super_block *s, int silent);</div><div class='del'>-void print_bmap_block(int i, char *data, int size, int silent);</div><div class='del'>-/*void print_super_block (struct super_block * s, char * mes);*/</div><div class='del'>-void print_objectid_map(struct super_block *s);</div><div class='del'>-void print_block_head(struct buffer_head *bh, char *mes);</div><div class='del'>-void check_leaf(struct buffer_head *bh);</div><div class='del'>-void check_internal(struct buffer_head *bh);</div><div class='del'>-void print_statistics(struct super_block *s);</div><div class='del'>-char *reiserfs_hashname(int code);</div><div class='del'>-</div><div class='del'>-/* lbalance.c */</div><div class='del'>-int leaf_move_items(int shift_mode, struct tree_balance *tb, int mov_num,</div><div class='del'>-		    int mov_bytes, struct buffer_head *Snew);</div><div class='del'>-int leaf_shift_left(struct tree_balance *tb, int shift_num, int shift_bytes);</div><div class='del'>-int leaf_shift_right(struct tree_balance *tb, int shift_num, int shift_bytes);</div><div class='del'>-void leaf_delete_items(struct buffer_info *cur_bi, int last_first, int first,</div><div class='del'>-		       int del_num, int del_bytes);</div><div class='del'>-void leaf_insert_into_buf(struct buffer_info *bi, int before,</div><div class='del'>-			  struct item_head * const inserted_item_ih,</div><div class='del'>-			  const char * const inserted_item_body,</div><div class='del'>-			  int zeros_number);</div><div class='del'>-void leaf_paste_in_buffer(struct buffer_info *bi, int pasted_item_num,</div><div class='del'>-			  int pos_in_item, int paste_size,</div><div class='del'>-			  const char * const body, int zeros_number);</div><div class='del'>-void leaf_cut_from_buffer(struct buffer_info *bi, int cut_item_num,</div><div class='del'>-			  int pos_in_item, int cut_size);</div><div class='del'>-void leaf_paste_entries(struct buffer_info *bi, int item_num, int before,</div><div class='del'>-			int new_entry_count, struct reiserfs_de_head *new_dehs,</div><div class='del'>-			const char *records, int paste_size);</div><div class='del'>-/* ibalance.c */</div><div class='del'>-int balance_internal(struct tree_balance *, int, int, struct item_head *,</div><div class='del'>-		     struct buffer_head **);</div><div class='del'>-</div><div class='del'>-/* do_balance.c */</div><div class='del'>-void do_balance_mark_leaf_dirty(struct tree_balance *tb,</div><div class='del'>-				struct buffer_head *bh, int flag);</div><div class='del'>-#define do_balance_mark_internal_dirty do_balance_mark_leaf_dirty</div><div class='del'>-#define do_balance_mark_sb_dirty do_balance_mark_leaf_dirty</div><div class='del'>-</div><div class='del'>-void do_balance(struct tree_balance *tb, struct item_head *ih,</div><div class='del'>-		const char *body, int flag);</div><div class='del'>-void reiserfs_invalidate_buffer(struct tree_balance *tb,</div><div class='del'>-				struct buffer_head *bh);</div><div class='del'>-</div><div class='del'>-int get_left_neighbor_position(struct tree_balance *tb, int h);</div><div class='del'>-int get_right_neighbor_position(struct tree_balance *tb, int h);</div><div class='del'>-void replace_key(struct tree_balance *tb, struct buffer_head *, int,</div><div class='del'>-		 struct buffer_head *, int);</div><div class='del'>-void make_empty_node(struct buffer_info *);</div><div class='del'>-struct buffer_head *get_FEB(struct tree_balance *);</div><div class='del'>-</div><div class='del'>-/* bitmap.c */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * structure contains hints for block allocator, and it is a container for</div><div class='del'>- * arguments, such as node, search path, transaction_handle, etc.</div><div class='del'>- */</div><div class='del'>-struct __reiserfs_blocknr_hint {</div><div class='del'>-	/* inode passed to allocator, if we allocate unf. nodes */</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	sector_t block;		/* file offset, in blocks */</div><div class='del'>-	struct in_core_key key;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * search path, used by allocator to deternine search_start by</div><div class='del'>-	 * various ways</div><div class='del'>-	 */</div><div class='del'>-	struct treepath *path;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * transaction handle is needed to log super blocks</div><div class='del'>-	 * and bitmap blocks changes</div><div class='del'>-	 */</div><div class='del'>-	struct reiserfs_transaction_handle *th;</div><div class='del'>-</div><div class='del'>-	b_blocknr_t beg, end;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * a field used to transfer search start value (block number)</div><div class='del'>-	 * between different block allocator procedures</div><div class='del'>-	 * (determine_search_start() and others)</div><div class='del'>-	 */</div><div class='del'>-	b_blocknr_t search_start;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * is set in determine_prealloc_size() function,</div><div class='del'>-	 * used by underlayed function that do actual allocation</div><div class='del'>-	 */</div><div class='del'>-	int prealloc_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the allocator uses different polices for getting disk</div><div class='del'>-	 * space for formatted/unformatted blocks with/without preallocation</div><div class='del'>-	 */</div><div class='del'>-	unsigned formatted_node:1;</div><div class='del'>-	unsigned preallocate:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct __reiserfs_blocknr_hint reiserfs_blocknr_hint_t;</div><div class='del'>-</div><div class='del'>-int reiserfs_parse_alloc_options(struct super_block *, char *);</div><div class='del'>-void reiserfs_init_alloc_options(struct super_block *s);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * given a directory, this will tell you what packing locality</div><div class='del'>- * to use for a new object underneat it.  The locality is returned</div><div class='del'>- * in disk byte order (le).</div><div class='del'>- */</div><div class='del'>-__le32 reiserfs_choose_packing(struct inode *dir);</div><div class='del'>-</div><div class='del'>-void show_alloc_options(struct seq_file *seq, struct super_block *s);</div><div class='del'>-int reiserfs_init_bitmap_cache(struct super_block *sb);</div><div class='del'>-void reiserfs_free_bitmap_cache(struct super_block *sb);</div><div class='del'>-void reiserfs_cache_bitmap_metadata(struct super_block *sb, struct buffer_head *bh, struct reiserfs_bitmap_info *info);</div><div class='del'>-struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb, unsigned int bitmap);</div><div class='del'>-int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value);</div><div class='del'>-void reiserfs_free_block(struct reiserfs_transaction_handle *th, struct inode *,</div><div class='del'>-			 b_blocknr_t, int for_unformatted);</div><div class='del'>-int reiserfs_allocate_blocknrs(reiserfs_blocknr_hint_t *, b_blocknr_t *, int,</div><div class='del'>-			       int);</div><div class='del'>-static inline int reiserfs_new_form_blocknrs(struct tree_balance *tb,</div><div class='del'>-					     b_blocknr_t * new_blocknrs,</div><div class='del'>-					     int amount_needed)</div><div class='del'>-{</div><div class='del'>-	reiserfs_blocknr_hint_t hint = {</div><div class='del'>-		.th = tb-&gt;transaction_handle,</div><div class='del'>-		.path = tb-&gt;tb_path,</div><div class='del'>-		.inode = NULL,</div><div class='del'>-		.key = tb-&gt;key,</div><div class='del'>-		.block = 0,</div><div class='del'>-		.formatted_node = 1</div><div class='del'>-	};</div><div class='del'>-	return reiserfs_allocate_blocknrs(&amp;hint, new_blocknrs, amount_needed,</div><div class='del'>-					  0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle</div><div class='del'>-					    *th, struct inode *inode,</div><div class='del'>-					    b_blocknr_t * new_blocknrs,</div><div class='del'>-					    struct treepath *path,</div><div class='del'>-					    sector_t block)</div><div class='del'>-{</div><div class='del'>-	reiserfs_blocknr_hint_t hint = {</div><div class='del'>-		.th = th,</div><div class='del'>-		.path = path,</div><div class='del'>-		.inode = inode,</div><div class='del'>-		.block = block,</div><div class='del'>-		.formatted_node = 0,</div><div class='del'>-		.preallocate = 0</div><div class='del'>-	};</div><div class='del'>-	return reiserfs_allocate_blocknrs(&amp;hint, new_blocknrs, 1, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef REISERFS_PREALLOCATE</div><div class='del'>-static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle</div><div class='del'>-					     *th, struct inode *inode,</div><div class='del'>-					     b_blocknr_t * new_blocknrs,</div><div class='del'>-					     struct treepath *path,</div><div class='del'>-					     sector_t block)</div><div class='del'>-{</div><div class='del'>-	reiserfs_blocknr_hint_t hint = {</div><div class='del'>-		.th = th,</div><div class='del'>-		.path = path,</div><div class='del'>-		.inode = inode,</div><div class='del'>-		.block = block,</div><div class='del'>-		.formatted_node = 0,</div><div class='del'>-		.preallocate = 1</div><div class='del'>-	};</div><div class='del'>-	return reiserfs_allocate_blocknrs(&amp;hint, new_blocknrs, 1, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_discard_prealloc(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       struct inode *inode);</div><div class='del'>-void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* hashes.c */</div><div class='del'>-__u32 keyed_hash(const signed char *msg, int len);</div><div class='del'>-__u32 yura_hash(const signed char *msg, int len);</div><div class='del'>-__u32 r5_hash(const signed char *msg, int len);</div><div class='del'>-</div><div class='del'>-#define reiserfs_set_le_bit		__set_bit_le</div><div class='del'>-#define reiserfs_test_and_set_le_bit	__test_and_set_bit_le</div><div class='del'>-#define reiserfs_clear_le_bit		__clear_bit_le</div><div class='del'>-#define reiserfs_test_and_clear_le_bit	__test_and_clear_bit_le</div><div class='del'>-#define reiserfs_test_le_bit		test_bit_le</div><div class='del'>-#define reiserfs_find_next_zero_le_bit	find_next_zero_bit_le</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * sometimes reiserfs_truncate may require to allocate few new blocks</div><div class='del'>- * to perform indirect2direct conversion. People probably used to</div><div class='del'>- * think, that truncate should work without problems on a filesystem</div><div class='del'>- * without free disk space. They may complain that they can not</div><div class='del'>- * truncate due to lack of free disk space. This spare space allows us</div><div class='del'>- * to not worry about it. 500 is probably too much, but it should be</div><div class='del'>- * absolutely safe</div><div class='del'>- */</div><div class='del'>-#define SPARE_SPACE 500</div><div class='del'>-</div><div class='del'>-/* prototypes from ioctl.c */</div><div class='del'>-int reiserfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='del'>-int reiserfs_fileattr_set(struct mnt_idmap *idmap,</div><div class='del'>-			  struct dentry *dentry, struct fileattr *fa);</div><div class='del'>-long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);</div><div class='del'>-long reiserfs_compat_ioctl(struct file *filp,</div><div class='del'>-		   unsigned int cmd, unsigned long arg);</div><div class='del'>-int reiserfs_unpack(struct inode *inode);</div><div class='head'>diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c<br/>deleted file mode 100644<br/>index 7b498a0d060b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/resize.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/resize.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Written by Alexander Zarochentcev.</div><div class='del'>- *</div><div class='del'>- * The kernel part of the (on-line) reiserfs resizer.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-int reiserfs_resize(struct super_block *s, unsigned long block_count_new)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct reiserfs_super_block *sb;</div><div class='del'>-	struct reiserfs_bitmap_info *bitmap;</div><div class='del'>-	struct reiserfs_bitmap_info *info;</div><div class='del'>-	struct reiserfs_bitmap_info *old_bitmap = SB_AP_BITMAP(s);</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	unsigned int bmap_nr_new, bmap_nr;</div><div class='del'>-	unsigned int block_r_new, block_r;</div><div class='del'>-</div><div class='del'>-	struct reiserfs_list_bitmap *jb;</div><div class='del'>-	struct reiserfs_list_bitmap jbitmap[JOURNAL_NUM_BITMAPS];</div><div class='del'>-</div><div class='del'>-	unsigned long int block_count, free_blocks;</div><div class='del'>-	int i;</div><div class='del'>-	int copy_size;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	sb = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-</div><div class='del'>-	if (SB_BLOCK_COUNT(s) &gt;= block_count_new) {</div><div class='del'>-		printk("can\'t shrink filesystem on-line\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check the device size */</div><div class='del'>-	depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-	bh = sb_bread(s, block_count_new - 1);</div><div class='del'>-	reiserfs_write_lock_nested(s, depth);</div><div class='del'>-	if (!bh) {</div><div class='del'>-		printk("reiserfs_resize: can\'t read last block\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	bforget(bh);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * old disk layout detection; those partitions can be mounted, but</div><div class='del'>-	 * cannot be resized</div><div class='del'>-	 */</div><div class='del'>-	if (SB_BUFFER_WITH_SB(s)-&gt;b_blocknr * SB_BUFFER_WITH_SB(s)-&gt;b_size</div><div class='del'>-	    != REISERFS_DISK_OFFSET_IN_BYTES) {</div><div class='del'>-		printk</div><div class='del'>-		    ("reiserfs_resize: unable to resize a reiserfs without distributed bitmap (fs version &lt; 3.5.12)\n");</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* count used bits in last bitmap block */</div><div class='del'>-	block_r = SB_BLOCK_COUNT(s) -</div><div class='del'>-			(reiserfs_bmap_count(s) - 1) * s-&gt;s_blocksize * 8;</div><div class='del'>-</div><div class='del'>-	/* count bitmap blocks in new fs */</div><div class='del'>-	bmap_nr_new = block_count_new / (s-&gt;s_blocksize * 8);</div><div class='del'>-	block_r_new = block_count_new - bmap_nr_new * s-&gt;s_blocksize * 8;</div><div class='del'>-	if (block_r_new)</div><div class='del'>-		bmap_nr_new++;</div><div class='del'>-	else</div><div class='del'>-		block_r_new = s-&gt;s_blocksize * 8;</div><div class='del'>-</div><div class='del'>-	/* save old values */</div><div class='del'>-	block_count = SB_BLOCK_COUNT(s);</div><div class='del'>-	bmap_nr = reiserfs_bmap_count(s);</div><div class='del'>-</div><div class='del'>-	/* resizing of reiserfs bitmaps (journal and real), if needed */</div><div class='del'>-	if (bmap_nr_new &gt; bmap_nr) {</div><div class='del'>-		/* reallocate journal bitmaps */</div><div class='del'>-		if (reiserfs_allocate_list_bitmaps(s, jbitmap, bmap_nr_new) &lt; 0) {</div><div class='del'>-			printk</div><div class='del'>-			    ("reiserfs_resize: unable to allocate memory for journal bitmaps\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * the new journal bitmaps are zero filled, now we copy i</div><div class='del'>-		 * the bitmap node pointers from the old journal bitmap</div><div class='del'>-		 * structs, and then transfer the new data structures</div><div class='del'>-		 * into the journal struct.</div><div class='del'>-		 *</div><div class='del'>-		 * using the copy_size var below allows this code to work for</div><div class='del'>-		 * both shrinking and expanding the FS.</div><div class='del'>-		 */</div><div class='del'>-		copy_size = min(bmap_nr_new, bmap_nr);</div><div class='del'>-		copy_size =</div><div class='del'>-		    copy_size * sizeof(struct reiserfs_list_bitmap_node *);</div><div class='del'>-		for (i = 0; i &lt; JOURNAL_NUM_BITMAPS; i++) {</div><div class='del'>-			struct reiserfs_bitmap_node **node_tmp;</div><div class='del'>-			jb = SB_JOURNAL(s)-&gt;j_list_bitmap + i;</div><div class='del'>-			memcpy(jbitmap[i].bitmaps, jb-&gt;bitmaps, copy_size);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * just in case vfree schedules on us, copy the new</div><div class='del'>-			 * pointer into the journal struct before freeing the</div><div class='del'>-			 * old one</div><div class='del'>-			 */</div><div class='del'>-			node_tmp = jb-&gt;bitmaps;</div><div class='del'>-			jb-&gt;bitmaps = jbitmap[i].bitmaps;</div><div class='del'>-			vfree(node_tmp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * allocate additional bitmap blocks, reallocate</div><div class='del'>-		 * array of bitmap block pointers</div><div class='del'>-		 */</div><div class='del'>-		bitmap =</div><div class='del'>-		    vzalloc(array_size(bmap_nr_new,</div><div class='del'>-				       sizeof(struct reiserfs_bitmap_info)));</div><div class='del'>-		if (!bitmap) {</div><div class='del'>-			/*</div><div class='del'>-			 * Journal bitmaps are still supersized, but the</div><div class='del'>-			 * memory isn't leaked, so I guess it's ok</div><div class='del'>-			 */</div><div class='del'>-			printk("reiserfs_resize: unable to allocate memory.\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; bmap_nr; i++)</div><div class='del'>-			bitmap[i] = old_bitmap[i];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This doesn't go through the journal, but it doesn't have to.</div><div class='del'>-		 * The changes are still atomic: We're synced up when the</div><div class='del'>-		 * journal transaction begins, and the new bitmaps don't</div><div class='del'>-		 * matter if the transaction fails.</div><div class='del'>-		 */</div><div class='del'>-		for (i = bmap_nr; i &lt; bmap_nr_new; i++) {</div><div class='del'>-			int depth;</div><div class='del'>-			/*</div><div class='del'>-			 * don't use read_bitmap_block since it will cache</div><div class='del'>-			 * the uninitialized bitmap</div><div class='del'>-			 */</div><div class='del'>-			depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-			bh = sb_bread(s, i * s-&gt;s_blocksize * 8);</div><div class='del'>-			reiserfs_write_lock_nested(s, depth);</div><div class='del'>-			if (!bh) {</div><div class='del'>-				vfree(bitmap);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			memset(bh-&gt;b_data, 0, sb_blocksize(sb));</div><div class='del'>-			reiserfs_set_le_bit(0, bh-&gt;b_data);</div><div class='del'>-			reiserfs_cache_bitmap_metadata(s, bh, bitmap + i);</div><div class='del'>-</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-			mark_buffer_dirty(bh);</div><div class='del'>-			depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-			sync_dirty_buffer(bh);</div><div class='del'>-			reiserfs_write_lock_nested(s, depth);</div><div class='del'>-			/* update bitmap_info stuff */</div><div class='del'>-			bitmap[i].free_count = sb_blocksize(sb) * 8 - 1;</div><div class='del'>-			brelse(bh);</div><div class='del'>-		}</div><div class='del'>-		/* free old bitmap blocks array */</div><div class='del'>-		SB_AP_BITMAP(s) = bitmap;</div><div class='del'>-		vfree(old_bitmap);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * begin transaction, if there was an error, it's fine. Yes, we have</div><div class='del'>-	 * incorrect bitmaps now, but none of it is ever going to touch the</div><div class='del'>-	 * disk anyway.</div><div class='del'>-	 */</div><div class='del'>-	err = journal_begin(&amp;th, s, 10);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Extend old last bitmap block - new blocks have been made available */</div><div class='del'>-	info = SB_AP_BITMAP(s) + bmap_nr - 1;</div><div class='del'>-	bh = reiserfs_read_bitmap_block(s, bmap_nr - 1);</div><div class='del'>-	if (!bh) {</div><div class='del'>-		int jerr = journal_end(&amp;th);</div><div class='del'>-		if (jerr)</div><div class='del'>-			return jerr;</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_prepare_for_journal(s, bh, 1);</div><div class='del'>-	for (i = block_r; i &lt; s-&gt;s_blocksize * 8; i++)</div><div class='del'>-		reiserfs_clear_le_bit(i, bh-&gt;b_data);</div><div class='del'>-	info-&gt;free_count += s-&gt;s_blocksize * 8 - block_r;</div><div class='del'>-</div><div class='del'>-	journal_mark_dirty(&amp;th, bh);</div><div class='del'>-	brelse(bh);</div><div class='del'>-</div><div class='del'>-	/* Correct new last bitmap block - It may not be full */</div><div class='del'>-	info = SB_AP_BITMAP(s) + bmap_nr_new - 1;</div><div class='del'>-	bh = reiserfs_read_bitmap_block(s, bmap_nr_new - 1);</div><div class='del'>-	if (!bh) {</div><div class='del'>-		int jerr = journal_end(&amp;th);</div><div class='del'>-		if (jerr)</div><div class='del'>-			return jerr;</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_prepare_for_journal(s, bh, 1);</div><div class='del'>-	for (i = block_r_new; i &lt; s-&gt;s_blocksize * 8; i++)</div><div class='del'>-		reiserfs_set_le_bit(i, bh-&gt;b_data);</div><div class='del'>-	journal_mark_dirty(&amp;th, bh);</div><div class='del'>-	brelse(bh);</div><div class='del'>-</div><div class='del'>-	info-&gt;free_count -= s-&gt;s_blocksize * 8 - block_r_new;</div><div class='del'>-	/* update super */</div><div class='del'>-	reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);</div><div class='del'>-	free_blocks = SB_FREE_BLOCKS(s);</div><div class='del'>-	PUT_SB_FREE_BLOCKS(s,</div><div class='del'>-			   free_blocks + (block_count_new - block_count -</div><div class='del'>-					  (bmap_nr_new - bmap_nr)));</div><div class='del'>-	PUT_SB_BLOCK_COUNT(s, block_count_new);</div><div class='del'>-	PUT_SB_BMAP_NR(s, bmap_would_wrap(bmap_nr_new) ? : bmap_nr_new);</div><div class='del'>-</div><div class='del'>-	journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-</div><div class='del'>-	SB_JOURNAL(s)-&gt;j_must_wait = 1;</div><div class='del'>-	return journal_end(&amp;th);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c<br/>deleted file mode 100644<br/>index 5faf702f8d15..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/stree.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/stree.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2280 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Written by Anatoly P. Pinchuk pap@namesys.botik.ru</div><div class='del'>- *  Programm System Institute</div><div class='del'>- *  Pereslavl-Zalessky Russia</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-</div><div class='del'>-/* Does the buffer contain a disk block which is in the tree. */</div><div class='del'>-inline int B_IS_IN_TREE(const struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	RFALSE(B_LEVEL(bh) &gt; MAX_HEIGHT,</div><div class='del'>-	       "PAP-1010: block (%b) has too big level (%z)", bh, bh);</div><div class='del'>-</div><div class='del'>-	return (B_LEVEL(bh) != FREE_LEVEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* to get item head in le form */</div><div class='del'>-inline void copy_item_head(struct item_head *to,</div><div class='del'>-			   const struct item_head *from)</div><div class='del'>-{</div><div class='del'>-	memcpy(to, from, IH_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * k1 is pointer to on-disk structure which is stored in little-endian</div><div class='del'>- * form. k2 is pointer to cpu variable. For key of items of the same</div><div class='del'>- * object this returns 0.</div><div class='del'>- * Returns: -1 if key1 &lt; key2</div><div class='del'>- * 0 if key1 == key2</div><div class='del'>- * 1 if key1 &gt; key2</div><div class='del'>- */</div><div class='del'>-inline int comp_short_keys(const struct reiserfs_key *le_key,</div><div class='del'>-			   const struct cpu_key *cpu_key)</div><div class='del'>-{</div><div class='del'>-	__u32 n;</div><div class='del'>-	n = le32_to_cpu(le_key-&gt;k_dir_id);</div><div class='del'>-	if (n &lt; cpu_key-&gt;on_disk_key.k_dir_id)</div><div class='del'>-		return -1;</div><div class='del'>-	if (n &gt; cpu_key-&gt;on_disk_key.k_dir_id)</div><div class='del'>-		return 1;</div><div class='del'>-	n = le32_to_cpu(le_key-&gt;k_objectid);</div><div class='del'>-	if (n &lt; cpu_key-&gt;on_disk_key.k_objectid)</div><div class='del'>-		return -1;</div><div class='del'>-	if (n &gt; cpu_key-&gt;on_disk_key.k_objectid)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * k1 is pointer to on-disk structure which is stored in little-endian</div><div class='del'>- * form. k2 is pointer to cpu variable.</div><div class='del'>- * Compare keys using all 4 key fields.</div><div class='del'>- * Returns: -1 if key1 &lt; key2 0</div><div class='del'>- * if key1 = key2 1 if key1 &gt; key2</div><div class='del'>- */</div><div class='del'>-static inline int comp_keys(const struct reiserfs_key *le_key,</div><div class='del'>-			    const struct cpu_key *cpu_key)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = comp_short_keys(le_key, cpu_key);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-	if (le_key_k_offset(le_key_version(le_key), le_key) &lt;</div><div class='del'>-	    cpu_key_k_offset(cpu_key))</div><div class='del'>-		return -1;</div><div class='del'>-	if (le_key_k_offset(le_key_version(le_key), le_key) &gt;</div><div class='del'>-	    cpu_key_k_offset(cpu_key))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (cpu_key-&gt;key_length == 3)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* this part is needed only when tail conversion is in progress */</div><div class='del'>-	if (le_key_k_type(le_key_version(le_key), le_key) &lt;</div><div class='del'>-	    cpu_key_k_type(cpu_key))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (le_key_k_type(le_key_version(le_key), le_key) &gt;</div><div class='del'>-	    cpu_key_k_type(cpu_key))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline int comp_short_le_keys(const struct reiserfs_key *key1,</div><div class='del'>-			      const struct reiserfs_key *key2)</div><div class='del'>-{</div><div class='del'>-	__u32 *k1_u32, *k2_u32;</div><div class='del'>-	int key_length = REISERFS_SHORT_KEY_LEN;</div><div class='del'>-</div><div class='del'>-	k1_u32 = (__u32 *) key1;</div><div class='del'>-	k2_u32 = (__u32 *) key2;</div><div class='del'>-	for (; key_length--; ++k1_u32, ++k2_u32) {</div><div class='del'>-		if (le32_to_cpu(*k1_u32) &lt; le32_to_cpu(*k2_u32))</div><div class='del'>-			return -1;</div><div class='del'>-		if (le32_to_cpu(*k1_u32) &gt; le32_to_cpu(*k2_u32))</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void le_key2cpu_key(struct cpu_key *to, const struct reiserfs_key *from)</div><div class='del'>-{</div><div class='del'>-	int version;</div><div class='del'>-	to-&gt;on_disk_key.k_dir_id = le32_to_cpu(from-&gt;k_dir_id);</div><div class='del'>-	to-&gt;on_disk_key.k_objectid = le32_to_cpu(from-&gt;k_objectid);</div><div class='del'>-</div><div class='del'>-	/* find out version of the key */</div><div class='del'>-	version = le_key_version(from);</div><div class='del'>-	to-&gt;version = version;</div><div class='del'>-	to-&gt;on_disk_key.k_offset = le_key_k_offset(version, from);</div><div class='del'>-	to-&gt;on_disk_key.k_type = le_key_k_type(version, from);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this does not say which one is bigger, it only returns 1 if keys</div><div class='del'>- * are not equal, 0 otherwise</div><div class='del'>- */</div><div class='del'>-inline int comp_le_keys(const struct reiserfs_key *k1,</div><div class='del'>-			const struct reiserfs_key *k2)</div><div class='del'>-{</div><div class='del'>-	return memcmp(k1, k2, sizeof(struct reiserfs_key));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- *  Binary search toolkit function                                        *</div><div class='del'>- *  Search for an item in the array by the item key                       *</div><div class='del'>- *  Returns:    1 if found,  0 if not found;                              *</div><div class='del'>- *        *pos = number of the searched element if found, else the        *</div><div class='del'>- *        number of the first element that is larger than key.            *</div><div class='del'>- **************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * For those not familiar with binary search: lbound is the leftmost item</div><div class='del'>- * that it could be, rbound the rightmost item that it could be.  We examine</div><div class='del'>- * the item halfway between lbound and rbound, and that tells us either</div><div class='del'>- * that we can increase lbound, or decrease rbound, or that we have found it,</div><div class='del'>- * or if lbound &lt;= rbound that there are no possible items, and we have not</div><div class='del'>- * found it. With each examination we cut the number of possible items it</div><div class='del'>- * could be by one more than half rounded down, or we find it.</div><div class='del'>- */</div><div class='del'>-static inline int bin_search(const void *key,	/* Key to search for. */</div><div class='del'>-			     const void *base,	/* First item in the array. */</div><div class='del'>-			     int num,	/* Number of items in the array. */</div><div class='del'>-			     /*</div><div class='del'>-			      * Item size in the array.  searched. Lest the</div><div class='del'>-			      * reader be confused, note that this is crafted</div><div class='del'>-			      * as a general function, and when it is applied</div><div class='del'>-			      * specifically to the array of item headers in a</div><div class='del'>-			      * node, width is actually the item header size</div><div class='del'>-			      * not the item size.</div><div class='del'>-			      */</div><div class='del'>-			     int width,</div><div class='del'>-			     int *pos /* Number of the searched for element. */</div><div class='del'>-    )</div><div class='del'>-{</div><div class='del'>-	int rbound, lbound, j;</div><div class='del'>-</div><div class='del'>-	for (j = ((rbound = num - 1) + (lbound = 0)) / 2;</div><div class='del'>-	     lbound &lt;= rbound; j = (rbound + lbound) / 2)</div><div class='del'>-		switch (comp_keys</div><div class='del'>-			((struct reiserfs_key *)((char *)base + j * width),</div><div class='del'>-			 (struct cpu_key *)key)) {</div><div class='del'>-		case -1:</div><div class='del'>-			lbound = j + 1;</div><div class='del'>-			continue;</div><div class='del'>-		case 1:</div><div class='del'>-			rbound = j - 1;</div><div class='del'>-			continue;</div><div class='del'>-		case 0:</div><div class='del'>-			*pos = j;</div><div class='del'>-			return ITEM_FOUND;	/* Key found in the array.  */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * bin_search did not find given key, it returns position of key,</div><div class='del'>-	 * that is minimal and greater than the given one.</div><div class='del'>-	 */</div><div class='del'>-	*pos = lbound;</div><div class='del'>-	return ITEM_NOT_FOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Minimal possible key. It is never in the tree. */</div><div class='del'>-const struct reiserfs_key MIN_KEY = { 0, 0, {{0, 0},} };</div><div class='del'>-</div><div class='del'>-/* Maximal possible key. It is never in the tree. */</div><div class='del'>-static const struct reiserfs_key MAX_KEY = {</div><div class='del'>-	cpu_to_le32(0xffffffff),</div><div class='del'>-	cpu_to_le32(0xffffffff),</div><div class='del'>-	{{cpu_to_le32(0xffffffff),</div><div class='del'>-	  cpu_to_le32(0xffffffff)},}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get delimiting key of the buffer by looking for it in the buffers in the</div><div class='del'>- * path, starting from the bottom of the path, and going upwards.  We must</div><div class='del'>- * check the path's validity at each step.  If the key is not in the path,</div><div class='del'>- * there is no delimiting key in the tree (buffer is first or last buffer</div><div class='del'>- * in tree), and in this case we return a special key, either MIN_KEY or</div><div class='del'>- * MAX_KEY.</div><div class='del'>- */</div><div class='del'>-static inline const struct reiserfs_key *get_lkey(const struct treepath *chk_path,</div><div class='del'>-						  const struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	int position, path_offset = chk_path-&gt;path_length;</div><div class='del'>-	struct buffer_head *parent;</div><div class='del'>-</div><div class='del'>-	RFALSE(path_offset &lt; FIRST_PATH_ELEMENT_OFFSET,</div><div class='del'>-	       "PAP-5010: invalid offset in the path");</div><div class='del'>-</div><div class='del'>-	/* While not higher in path than first element. */</div><div class='del'>-	while (path_offset-- &gt; FIRST_PATH_ELEMENT_OFFSET) {</div><div class='del'>-</div><div class='del'>-		RFALSE(!buffer_uptodate</div><div class='del'>-		       (PATH_OFFSET_PBUFFER(chk_path, path_offset)),</div><div class='del'>-		       "PAP-5020: parent is not uptodate");</div><div class='del'>-</div><div class='del'>-		/* Parent at the path is not in the tree now. */</div><div class='del'>-		if (!B_IS_IN_TREE</div><div class='del'>-		    (parent =</div><div class='del'>-		     PATH_OFFSET_PBUFFER(chk_path, path_offset)))</div><div class='del'>-			return &amp;MAX_KEY;</div><div class='del'>-		/* Check whether position in the parent is correct. */</div><div class='del'>-		if ((position =</div><div class='del'>-		     PATH_OFFSET_POSITION(chk_path,</div><div class='del'>-					  path_offset)) &gt;</div><div class='del'>-		    B_NR_ITEMS(parent))</div><div class='del'>-			return &amp;MAX_KEY;</div><div class='del'>-		/* Check whether parent at the path really points to the child. */</div><div class='del'>-		if (B_N_CHILD_NUM(parent, position) !=</div><div class='del'>-		    PATH_OFFSET_PBUFFER(chk_path,</div><div class='del'>-					path_offset + 1)-&gt;b_blocknr)</div><div class='del'>-			return &amp;MAX_KEY;</div><div class='del'>-		/*</div><div class='del'>-		 * Return delimiting key if position in the parent</div><div class='del'>-		 * is not equal to zero.</div><div class='del'>-		 */</div><div class='del'>-		if (position)</div><div class='del'>-			return internal_key(parent, position - 1);</div><div class='del'>-	}</div><div class='del'>-	/* Return MIN_KEY if we are in the root of the buffer tree. */</div><div class='del'>-	if (PATH_OFFSET_PBUFFER(chk_path, FIRST_PATH_ELEMENT_OFFSET)-&gt;</div><div class='del'>-	    b_blocknr == SB_ROOT_BLOCK(sb))</div><div class='del'>-		return &amp;MIN_KEY;</div><div class='del'>-	return &amp;MAX_KEY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get delimiting key of the buffer at the path and its right neighbor. */</div><div class='del'>-inline const struct reiserfs_key *get_rkey(const struct treepath *chk_path,</div><div class='del'>-					   const struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	int position, path_offset = chk_path-&gt;path_length;</div><div class='del'>-	struct buffer_head *parent;</div><div class='del'>-</div><div class='del'>-	RFALSE(path_offset &lt; FIRST_PATH_ELEMENT_OFFSET,</div><div class='del'>-	       "PAP-5030: invalid offset in the path");</div><div class='del'>-</div><div class='del'>-	while (path_offset-- &gt; FIRST_PATH_ELEMENT_OFFSET) {</div><div class='del'>-</div><div class='del'>-		RFALSE(!buffer_uptodate</div><div class='del'>-		       (PATH_OFFSET_PBUFFER(chk_path, path_offset)),</div><div class='del'>-		       "PAP-5040: parent is not uptodate");</div><div class='del'>-</div><div class='del'>-		/* Parent at the path is not in the tree now. */</div><div class='del'>-		if (!B_IS_IN_TREE</div><div class='del'>-		    (parent =</div><div class='del'>-		     PATH_OFFSET_PBUFFER(chk_path, path_offset)))</div><div class='del'>-			return &amp;MIN_KEY;</div><div class='del'>-		/* Check whether position in the parent is correct. */</div><div class='del'>-		if ((position =</div><div class='del'>-		     PATH_OFFSET_POSITION(chk_path,</div><div class='del'>-					  path_offset)) &gt;</div><div class='del'>-		    B_NR_ITEMS(parent))</div><div class='del'>-			return &amp;MIN_KEY;</div><div class='del'>-		/*</div><div class='del'>-		 * Check whether parent at the path really points</div><div class='del'>-		 * to the child.</div><div class='del'>-		 */</div><div class='del'>-		if (B_N_CHILD_NUM(parent, position) !=</div><div class='del'>-		    PATH_OFFSET_PBUFFER(chk_path,</div><div class='del'>-					path_offset + 1)-&gt;b_blocknr)</div><div class='del'>-			return &amp;MIN_KEY;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Return delimiting key if position in the parent</div><div class='del'>-		 * is not the last one.</div><div class='del'>-		 */</div><div class='del'>-		if (position != B_NR_ITEMS(parent))</div><div class='del'>-			return internal_key(parent, position);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Return MAX_KEY if we are in the root of the buffer tree. */</div><div class='del'>-	if (PATH_OFFSET_PBUFFER(chk_path, FIRST_PATH_ELEMENT_OFFSET)-&gt;</div><div class='del'>-	    b_blocknr == SB_ROOT_BLOCK(sb))</div><div class='del'>-		return &amp;MAX_KEY;</div><div class='del'>-	return &amp;MIN_KEY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether a key is contained in the tree rooted from a buffer at a path.</div><div class='del'>- * This works by looking at the left and right delimiting keys for the buffer</div><div class='del'>- * in the last path_element in the path.  These delimiting keys are stored</div><div class='del'>- * at least one level above that buffer in the tree. If the buffer is the</div><div class='del'>- * first or last node in the tree order then one of the delimiting keys may</div><div class='del'>- * be absent, and in this case get_lkey and get_rkey return a special key</div><div class='del'>- * which is MIN_KEY or MAX_KEY.</div><div class='del'>- */</div><div class='del'>-static inline int key_in_buffer(</div><div class='del'>-				/* Path which should be checked. */</div><div class='del'>-				struct treepath *chk_path,</div><div class='del'>-				/* Key which should be checked. */</div><div class='del'>-				const struct cpu_key *key,</div><div class='del'>-				struct super_block *sb</div><div class='del'>-    )</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	RFALSE(!key || chk_path-&gt;path_length &lt; FIRST_PATH_ELEMENT_OFFSET</div><div class='del'>-	       || chk_path-&gt;path_length &gt; MAX_HEIGHT,</div><div class='del'>-	       "PAP-5050: pointer to the key(%p) is NULL or invalid path length(%d)",</div><div class='del'>-	       key, chk_path-&gt;path_length);</div><div class='del'>-	RFALSE(!PATH_PLAST_BUFFER(chk_path)-&gt;b_bdev,</div><div class='del'>-	       "PAP-5060: device must not be NODEV");</div><div class='del'>-</div><div class='del'>-	if (comp_keys(get_lkey(chk_path, sb), key) == 1)</div><div class='del'>-		/* left delimiting key is bigger, that the key we look for */</div><div class='del'>-		return 0;</div><div class='del'>-	/*  if ( comp_keys(key, get_rkey(chk_path, sb)) != -1 ) */</div><div class='del'>-	if (comp_keys(get_rkey(chk_path, sb), key) != 1)</div><div class='del'>-		/* key must be less than right delimitiing key */</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_check_path(struct treepath *p)</div><div class='del'>-{</div><div class='del'>-	RFALSE(p-&gt;path_length != ILLEGAL_PATH_ELEMENT_OFFSET,</div><div class='del'>-	       "path not properly relsed");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Drop the reference to each buffer in a path and restore</div><div class='del'>- * dirty bits clean when preparing the buffer for the log.</div><div class='del'>- * This version should only be called from fix_nodes()</div><div class='del'>- */</div><div class='del'>-void pathrelse_and_restore(struct super_block *sb,</div><div class='del'>-			   struct treepath *search_path)</div><div class='del'>-{</div><div class='del'>-	int path_offset = search_path-&gt;path_length;</div><div class='del'>-</div><div class='del'>-	RFALSE(path_offset &lt; ILLEGAL_PATH_ELEMENT_OFFSET,</div><div class='del'>-	       "clm-4000: invalid path offset");</div><div class='del'>-</div><div class='del'>-	while (path_offset &gt; ILLEGAL_PATH_ELEMENT_OFFSET) {</div><div class='del'>-		struct buffer_head *bh;</div><div class='del'>-		bh = PATH_OFFSET_PBUFFER(search_path, path_offset--);</div><div class='del'>-		reiserfs_restore_prepared_buffer(sb, bh);</div><div class='del'>-		brelse(bh);</div><div class='del'>-	}</div><div class='del'>-	search_path-&gt;path_length = ILLEGAL_PATH_ELEMENT_OFFSET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Drop the reference to each buffer in a path */</div><div class='del'>-void pathrelse(struct treepath *search_path)</div><div class='del'>-{</div><div class='del'>-	int path_offset = search_path-&gt;path_length;</div><div class='del'>-</div><div class='del'>-	RFALSE(path_offset &lt; ILLEGAL_PATH_ELEMENT_OFFSET,</div><div class='del'>-	       "PAP-5090: invalid path offset");</div><div class='del'>-</div><div class='del'>-	while (path_offset &gt; ILLEGAL_PATH_ELEMENT_OFFSET)</div><div class='del'>-		brelse(PATH_OFFSET_PBUFFER(search_path, path_offset--));</div><div class='del'>-</div><div class='del'>-	search_path-&gt;path_length = ILLEGAL_PATH_ELEMENT_OFFSET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int has_valid_deh_location(struct buffer_head *bh, struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	deh = B_I_DEH(bh, ih);</div><div class='del'>-	for (i = 0; i &lt; ih_entry_count(ih); i++) {</div><div class='del'>-		if (deh_location(&amp;deh[i]) &gt; ih_item_len(ih)) {</div><div class='del'>-			reiserfs_warning(NULL, "reiserfs-5094",</div><div class='del'>-					 "directory entry location seems wrong %h",</div><div class='del'>-					 &amp;deh[i]);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_leaf(char *buf, int blocksize, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	int used_space;</div><div class='del'>-	int prev_location;</div><div class='del'>-	int i;</div><div class='del'>-	int nr;</div><div class='del'>-</div><div class='del'>-	blkh = (struct block_head *)buf;</div><div class='del'>-	if (blkh_level(blkh) != DISK_LEAF_NODE_LEVEL) {</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5080",</div><div class='del'>-				 "this should be caught earlier");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-	if (nr &lt; 1 || nr &gt; ((blocksize - BLKH_SIZE) / (IH_SIZE + MIN_ITEM_LEN))) {</div><div class='del'>-		/* item number is too big or too small */</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5081",</div><div class='del'>-				 "nr_item seems wrong: %z", bh);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ih = (struct item_head *)(buf + BLKH_SIZE) + nr - 1;</div><div class='del'>-	used_space = BLKH_SIZE + IH_SIZE * nr + (blocksize - ih_location(ih));</div><div class='del'>-</div><div class='del'>-	/* free space does not match to calculated amount of use space */</div><div class='del'>-	if (used_space != blocksize - blkh_free_space(blkh)) {</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5082",</div><div class='del'>-				 "free space seems wrong: %z", bh);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: it is_leaf will hit performance too much - we may have</div><div class='del'>-	 * return 1 here</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* check tables of item heads */</div><div class='del'>-	ih = (struct item_head *)(buf + BLKH_SIZE);</div><div class='del'>-	prev_location = blocksize;</div><div class='del'>-	for (i = 0; i &lt; nr; i++, ih++) {</div><div class='del'>-		if (le_ih_k_type(ih) == TYPE_ANY) {</div><div class='del'>-			reiserfs_warning(NULL, "reiserfs-5083",</div><div class='del'>-					 "wrong item type for item %h",</div><div class='del'>-					 ih);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (ih_location(ih) &gt;= blocksize</div><div class='del'>-		    || ih_location(ih) &lt; IH_SIZE * nr) {</div><div class='del'>-			reiserfs_warning(NULL, "reiserfs-5084",</div><div class='del'>-					 "item location seems wrong: %h",</div><div class='del'>-					 ih);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (ih_item_len(ih) &lt; 1</div><div class='del'>-		    || ih_item_len(ih) &gt; MAX_ITEM_LEN(blocksize)) {</div><div class='del'>-			reiserfs_warning(NULL, "reiserfs-5085",</div><div class='del'>-					 "item length seems wrong: %h",</div><div class='del'>-					 ih);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (prev_location - ih_location(ih) != ih_item_len(ih)) {</div><div class='del'>-			reiserfs_warning(NULL, "reiserfs-5086",</div><div class='del'>-					 "item location seems wrong "</div><div class='del'>-					 "(second one): %h", ih);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (is_direntry_le_ih(ih)) {</div><div class='del'>-			if (ih_item_len(ih) &lt; (ih_entry_count(ih) * IH_SIZE)) {</div><div class='del'>-				reiserfs_warning(NULL, "reiserfs-5093",</div><div class='del'>-						 "item entry count seems wrong %h",</div><div class='del'>-						 ih);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			return has_valid_deh_location(bh, ih);</div><div class='del'>-		}</div><div class='del'>-		prev_location = ih_location(ih);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* one may imagine many more checks */</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns 1 if buf looks like an internal node, 0 otherwise */</div><div class='del'>-static int is_internal(char *buf, int blocksize, struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	struct block_head *blkh;</div><div class='del'>-	int nr;</div><div class='del'>-	int used_space;</div><div class='del'>-</div><div class='del'>-	blkh = (struct block_head *)buf;</div><div class='del'>-	nr = blkh_level(blkh);</div><div class='del'>-	if (nr &lt;= DISK_LEAF_NODE_LEVEL || nr &gt; MAX_HEIGHT) {</div><div class='del'>-		/* this level is not possible for internal nodes */</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5087",</div><div class='del'>-				 "this should be caught earlier");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nr = blkh_nr_item(blkh);</div><div class='del'>-	/* for internal which is not root we might check min number of keys */</div><div class='del'>-	if (nr &gt; (blocksize - BLKH_SIZE - DC_SIZE) / (KEY_SIZE + DC_SIZE)) {</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5088",</div><div class='del'>-				 "number of key seems wrong: %z", bh);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	used_space = BLKH_SIZE + KEY_SIZE * nr + DC_SIZE * (nr + 1);</div><div class='del'>-	if (used_space != blocksize - blkh_free_space(blkh)) {</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5089",</div><div class='del'>-				 "free space seems wrong: %z", bh);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* one may imagine many more checks */</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * make sure that bh contains formatted node of reiserfs tree of</div><div class='del'>- * 'level'-th level</div><div class='del'>- */</div><div class='del'>-static int is_tree_node(struct buffer_head *bh, int level)</div><div class='del'>-{</div><div class='del'>-	if (B_LEVEL(bh) != level) {</div><div class='del'>-		reiserfs_warning(NULL, "reiserfs-5090", "node level %d does "</div><div class='del'>-				 "not match to the expected one %d",</div><div class='del'>-				 B_LEVEL(bh), level);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (level == DISK_LEAF_NODE_LEVEL)</div><div class='del'>-		return is_leaf(bh-&gt;b_data, bh-&gt;b_size, bh);</div><div class='del'>-</div><div class='del'>-	return is_internal(bh-&gt;b_data, bh-&gt;b_size, bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SEARCH_BY_KEY_READA 16</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The function is NOT SCHEDULE-SAFE!</div><div class='del'>- * It might unlock the write lock if we needed to wait for a block</div><div class='del'>- * to be read. Note that in this case it won't recover the lock to avoid</div><div class='del'>- * high contention resulting from too much lock requests, especially</div><div class='del'>- * the caller (search_by_key) will perform other schedule-unsafe</div><div class='del'>- * operations just after calling this function.</div><div class='del'>- *</div><div class='del'>- * @return depth of lock to be restored after read completes</div><div class='del'>- */</div><div class='del'>-static int search_by_key_reada(struct super_block *s,</div><div class='del'>-				struct buffer_head **bh,</div><div class='del'>-				b_blocknr_t *b, int num)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	int depth = -1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		bh[i] = sb_getblk(s, b[i]);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * We are going to read some blocks on which we</div><div class='del'>-	 * have a reference. It's safe, though we might be</div><div class='del'>-	 * reading blocks concurrently changed if we release</div><div class='del'>-	 * the lock. But it's still fine because we check later</div><div class='del'>-	 * if the tree changed</div><div class='del'>-	 */</div><div class='del'>-	for (j = 0; j &lt; i; j++) {</div><div class='del'>-		/*</div><div class='del'>-		 * note, this needs attention if we are getting rid of the BKL</div><div class='del'>-		 * you have to make sure the prepared bit isn't set on this</div><div class='del'>-		 * buffer</div><div class='del'>-		 */</div><div class='del'>-		if (!buffer_uptodate(bh[j])) {</div><div class='del'>-			if (depth == -1)</div><div class='del'>-				depth = reiserfs_write_unlock_nested(s);</div><div class='del'>-			bh_readahead(bh[j], REQ_RAHEAD);</div><div class='del'>-		}</div><div class='del'>-		brelse(bh[j]);</div><div class='del'>-	}</div><div class='del'>-	return depth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function fills up the path from the root to the leaf as it</div><div class='del'>- * descends the tree looking for the key.  It uses reiserfs_bread to</div><div class='del'>- * try to find buffers in the cache given their block number.  If it</div><div class='del'>- * does not find them in the cache it reads them from disk.  For each</div><div class='del'>- * node search_by_key finds using reiserfs_bread it then uses</div><div class='del'>- * bin_search to look through that node.  bin_search will find the</div><div class='del'>- * position of the block_number of the next node if it is looking</div><div class='del'>- * through an internal node.  If it is looking through a leaf node</div><div class='del'>- * bin_search will find the position of the item which has key either</div><div class='del'>- * equal to given key, or which is the maximal key less than the given</div><div class='del'>- * key.  search_by_key returns a path that must be checked for the</div><div class='del'>- * correctness of the top of the path but need not be checked for the</div><div class='del'>- * correctness of the bottom of the path</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * search_by_key - search for key (and item) in stree</div><div class='del'>- * @sb: superblock</div><div class='del'>- * @key: pointer to key to search for</div><div class='del'>- * @search_path: Allocated and initialized struct treepath; Returned filled</div><div class='del'>- *		 on success.</div><div class='del'>- * @stop_level: How far down the tree to search, Use DISK_LEAF_NODE_LEVEL to</div><div class='del'>- *		stop at leaf level.</div><div class='del'>- *</div><div class='del'>- * The function is NOT SCHEDULE-SAFE!</div><div class='del'>- */</div><div class='del'>-int search_by_key(struct super_block *sb, const struct cpu_key *key,</div><div class='del'>-		  struct treepath *search_path, int stop_level)</div><div class='del'>-{</div><div class='del'>-	b_blocknr_t block_number;</div><div class='del'>-	int expected_level;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct path_element *last_element;</div><div class='del'>-	int node_level, retval;</div><div class='del'>-	int fs_gen;</div><div class='del'>-	struct buffer_head *reada_bh[SEARCH_BY_KEY_READA];</div><div class='del'>-	b_blocknr_t reada_blocks[SEARCH_BY_KEY_READA];</div><div class='del'>-	int reada_count = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	int repeat_counter = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	PROC_INFO_INC(sb, search_by_key);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * As we add each node to a path we increase its count.  This means</div><div class='del'>-	 * that we must be careful to release all nodes in a path before we</div><div class='del'>-	 * either discard the path struct or re-use the path struct, as we</div><div class='del'>-	 * do here.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	pathrelse(search_path);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * With each iteration of this loop we search through the items in the</div><div class='del'>-	 * current node, and calculate the next current node(next path element)</div><div class='del'>-	 * for the next iteration of this loop..</div><div class='del'>-	 */</div><div class='del'>-	block_number = SB_ROOT_BLOCK(sb);</div><div class='del'>-	expected_level = -1;</div><div class='del'>-	while (1) {</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		if (!(++repeat_counter % 50000))</div><div class='del'>-			reiserfs_warning(sb, "PAP-5100",</div><div class='del'>-					 "%s: there were %d iterations of "</div><div class='del'>-					 "while loop looking for key %K",</div><div class='del'>-					 current-&gt;comm, repeat_counter,</div><div class='del'>-					 key);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* prep path to have another element added to it. */</div><div class='del'>-		last_element =</div><div class='del'>-		    PATH_OFFSET_PELEMENT(search_path,</div><div class='del'>-					 ++search_path-&gt;path_length);</div><div class='del'>-		fs_gen = get_generation(sb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Read the next tree node, and set the last element</div><div class='del'>-		 * in the path to have a pointer to it.</div><div class='del'>-		 */</div><div class='del'>-		if ((bh = last_element-&gt;pe_buffer =</div><div class='del'>-		     sb_getblk(sb, block_number))) {</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * We'll need to drop the lock if we encounter any</div><div class='del'>-			 * buffers that need to be read. If all of them are</div><div class='del'>-			 * already up to date, we don't need to drop the lock.</div><div class='del'>-			 */</div><div class='del'>-			int depth = -1;</div><div class='del'>-</div><div class='del'>-			if (!buffer_uptodate(bh) &amp;&amp; reada_count &gt; 1)</div><div class='del'>-				depth = search_by_key_reada(sb, reada_bh,</div><div class='del'>-						    reada_blocks, reada_count);</div><div class='del'>-</div><div class='del'>-			if (!buffer_uptodate(bh) &amp;&amp; depth == -1)</div><div class='del'>-				depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-</div><div class='del'>-			bh_read_nowait(bh, 0);</div><div class='del'>-			wait_on_buffer(bh);</div><div class='del'>-</div><div class='del'>-			if (depth != -1)</div><div class='del'>-				reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-			if (!buffer_uptodate(bh))</div><div class='del'>-				goto io_error;</div><div class='del'>-		} else {</div><div class='del'>-io_error:</div><div class='del'>-			search_path-&gt;path_length--;</div><div class='del'>-			pathrelse(search_path);</div><div class='del'>-			return IO_ERROR;</div><div class='del'>-		}</div><div class='del'>-		reada_count = 0;</div><div class='del'>-		if (expected_level == -1)</div><div class='del'>-			expected_level = SB_TREE_HEIGHT(sb);</div><div class='del'>-		expected_level--;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * It is possible that schedule occurred. We must check</div><div class='del'>-		 * whether the key to search is still in the tree rooted</div><div class='del'>-		 * from the current buffer. If not then repeat search</div><div class='del'>-		 * from the root.</div><div class='del'>-		 */</div><div class='del'>-		if (fs_changed(fs_gen, sb) &amp;&amp;</div><div class='del'>-		    (!B_IS_IN_TREE(bh) ||</div><div class='del'>-		     B_LEVEL(bh) != expected_level ||</div><div class='del'>-		     !key_in_buffer(search_path, key, sb))) {</div><div class='del'>-			PROC_INFO_INC(sb, search_by_key_fs_changed);</div><div class='del'>-			PROC_INFO_INC(sb, search_by_key_restarted);</div><div class='del'>-			PROC_INFO_INC(sb,</div><div class='del'>-				      sbk_restarted[expected_level - 1]);</div><div class='del'>-			pathrelse(search_path);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Get the root block number so that we can</div><div class='del'>-			 * repeat the search starting from the root.</div><div class='del'>-			 */</div><div class='del'>-			block_number = SB_ROOT_BLOCK(sb);</div><div class='del'>-			expected_level = -1;</div><div class='del'>-</div><div class='del'>-			/* repeat search from the root */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * only check that the key is in the buffer if key is not</div><div class='del'>-		 * equal to the MAX_KEY. Latter case is only possible in</div><div class='del'>-		 * "finish_unfinished()" processing during mount.</div><div class='del'>-		 */</div><div class='del'>-		RFALSE(comp_keys(&amp;MAX_KEY, key) &amp;&amp;</div><div class='del'>-		       !key_in_buffer(search_path, key, sb),</div><div class='del'>-		       "PAP-5130: key is not in the buffer");</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		if (REISERFS_SB(sb)-&gt;cur_tb) {</div><div class='del'>-			print_cur_tb("5140");</div><div class='del'>-			reiserfs_panic(sb, "PAP-5140",</div><div class='del'>-				       "schedule occurred in do_balance!");</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * make sure, that the node contents look like a node of</div><div class='del'>-		 * certain level</div><div class='del'>-		 */</div><div class='del'>-		if (!is_tree_node(bh, expected_level)) {</div><div class='del'>-			reiserfs_error(sb, "vs-5150",</div><div class='del'>-				       "invalid format found in block %ld. "</div><div class='del'>-				       "Fsck?", bh-&gt;b_blocknr);</div><div class='del'>-			pathrelse(search_path);</div><div class='del'>-			return IO_ERROR;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* ok, we have acquired next formatted node in the tree */</div><div class='del'>-		node_level = B_LEVEL(bh);</div><div class='del'>-</div><div class='del'>-		PROC_INFO_BH_STAT(sb, bh, node_level - 1);</div><div class='del'>-</div><div class='del'>-		RFALSE(node_level &lt; stop_level,</div><div class='del'>-		       "vs-5152: tree level (%d) is less than stop level (%d)",</div><div class='del'>-		       node_level, stop_level);</div><div class='del'>-</div><div class='del'>-		retval = bin_search(key, item_head(bh, 0),</div><div class='del'>-				      B_NR_ITEMS(bh),</div><div class='del'>-				      (node_level ==</div><div class='del'>-				       DISK_LEAF_NODE_LEVEL) ? IH_SIZE :</div><div class='del'>-				      KEY_SIZE,</div><div class='del'>-				      &amp;last_element-&gt;pe_position);</div><div class='del'>-		if (node_level == stop_level) {</div><div class='del'>-			return retval;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we are not in the stop level */</div><div class='del'>-		/*</div><div class='del'>-		 * item has been found, so we choose the pointer which</div><div class='del'>-		 * is to the right of the found one</div><div class='del'>-		 */</div><div class='del'>-		if (retval == ITEM_FOUND)</div><div class='del'>-			last_element-&gt;pe_position++;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if item was not found we choose the position which is to</div><div class='del'>-		 * the left of the found item. This requires no code,</div><div class='del'>-		 * bin_search did it already.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * So we have chosen a position in the current node which is</div><div class='del'>-		 * an internal node.  Now we calculate child block number by</div><div class='del'>-		 * position in the node.</div><div class='del'>-		 */</div><div class='del'>-		block_number =</div><div class='del'>-		    B_N_CHILD_NUM(bh, last_element-&gt;pe_position);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if we are going to read leaf nodes, try for read</div><div class='del'>-		 * ahead as well</div><div class='del'>-		 */</div><div class='del'>-		if ((search_path-&gt;reada &amp; PATH_READA) &amp;&amp;</div><div class='del'>-		    node_level == DISK_LEAF_NODE_LEVEL + 1) {</div><div class='del'>-			int pos = last_element-&gt;pe_position;</div><div class='del'>-			int limit = B_NR_ITEMS(bh);</div><div class='del'>-			struct reiserfs_key *le_key;</div><div class='del'>-</div><div class='del'>-			if (search_path-&gt;reada &amp; PATH_READA_BACK)</div><div class='del'>-				limit = 0;</div><div class='del'>-			while (reada_count &lt; SEARCH_BY_KEY_READA) {</div><div class='del'>-				if (pos == limit)</div><div class='del'>-					break;</div><div class='del'>-				reada_blocks[reada_count++] =</div><div class='del'>-				    B_N_CHILD_NUM(bh, pos);</div><div class='del'>-				if (search_path-&gt;reada &amp; PATH_READA_BACK)</div><div class='del'>-					pos--;</div><div class='del'>-				else</div><div class='del'>-					pos++;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * check to make sure we're in the same object</div><div class='del'>-				 */</div><div class='del'>-				le_key = internal_key(bh, pos);</div><div class='del'>-				if (le32_to_cpu(le_key-&gt;k_objectid) !=</div><div class='del'>-				    key-&gt;on_disk_key.k_objectid) {</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Form the path to an item and position in this item which contains</div><div class='del'>- * file byte defined by key. If there is no such item</div><div class='del'>- * corresponding to the key, we point the path to the item with</div><div class='del'>- * maximal key less than key, and *pos_in_item is set to one</div><div class='del'>- * past the last entry/byte in the item.  If searching for entry in a</div><div class='del'>- * directory item, and it is not found, *pos_in_item is set to one</div><div class='del'>- * entry more than the entry with maximal key which is less than the</div><div class='del'>- * sought key.</div><div class='del'>- *</div><div class='del'>- * Note that if there is no entry in this same node which is one more,</div><div class='del'>- * then we point to an imaginary entry.  for direct items, the</div><div class='del'>- * position is in units of bytes, for indirect items the position is</div><div class='del'>- * in units of blocknr entries, for directory items the position is in</div><div class='del'>- * units of directory entries.</div><div class='del'>- */</div><div class='del'>-/* The function is NOT SCHEDULE-SAFE! */</div><div class='del'>-int search_for_position_by_key(struct super_block *sb,</div><div class='del'>-			       /* Key to search (cpu variable) */</div><div class='del'>-			       const struct cpu_key *p_cpu_key,</div><div class='del'>-			       /* Filled up by this function. */</div><div class='del'>-			       struct treepath *search_path)</div><div class='del'>-{</div><div class='del'>-	struct item_head *p_le_ih;	/* pointer to on-disk structure */</div><div class='del'>-	int blk_size;</div><div class='del'>-	loff_t item_offset, offset;</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	/* If searching for directory entry. */</div><div class='del'>-	if (is_direntry_cpu_key(p_cpu_key))</div><div class='del'>-		return search_by_entry_key(sb, p_cpu_key, search_path,</div><div class='del'>-					   &amp;de);</div><div class='del'>-</div><div class='del'>-	/* If not searching for directory entry. */</div><div class='del'>-</div><div class='del'>-	/* If item is found. */</div><div class='del'>-	retval = search_item(sb, p_cpu_key, search_path);</div><div class='del'>-	if (retval == IO_ERROR)</div><div class='del'>-		return retval;</div><div class='del'>-	if (retval == ITEM_FOUND) {</div><div class='del'>-</div><div class='del'>-		RFALSE(!ih_item_len</div><div class='del'>-		       (item_head</div><div class='del'>-			(PATH_PLAST_BUFFER(search_path),</div><div class='del'>-			 PATH_LAST_POSITION(search_path))),</div><div class='del'>-		       "PAP-5165: item length equals zero");</div><div class='del'>-</div><div class='del'>-		pos_in_item(search_path) = 0;</div><div class='del'>-		return POSITION_FOUND;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	RFALSE(!PATH_LAST_POSITION(search_path),</div><div class='del'>-	       "PAP-5170: position equals zero");</div><div class='del'>-</div><div class='del'>-	/* Item is not found. Set path to the previous item. */</div><div class='del'>-	p_le_ih =</div><div class='del'>-	    item_head(PATH_PLAST_BUFFER(search_path),</div><div class='del'>-			   --PATH_LAST_POSITION(search_path));</div><div class='del'>-	blk_size = sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-	if (comp_short_keys(&amp;p_le_ih-&gt;ih_key, p_cpu_key))</div><div class='del'>-		return FILE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/* FIXME: quite ugly this far */</div><div class='del'>-</div><div class='del'>-	item_offset = le_ih_k_offset(p_le_ih);</div><div class='del'>-	offset = cpu_key_k_offset(p_cpu_key);</div><div class='del'>-</div><div class='del'>-	/* Needed byte is contained in the item pointed to by the path. */</div><div class='del'>-	if (item_offset &lt;= offset &amp;&amp;</div><div class='del'>-	    item_offset + op_bytes_number(p_le_ih, blk_size) &gt; offset) {</div><div class='del'>-		pos_in_item(search_path) = offset - item_offset;</div><div class='del'>-		if (is_indirect_le_ih(p_le_ih)) {</div><div class='del'>-			pos_in_item(search_path) /= blk_size;</div><div class='del'>-		}</div><div class='del'>-		return POSITION_FOUND;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Needed byte is not contained in the item pointed to by the</div><div class='del'>-	 * path. Set pos_in_item out of the item.</div><div class='del'>-	 */</div><div class='del'>-	if (is_indirect_le_ih(p_le_ih))</div><div class='del'>-		pos_in_item(search_path) =</div><div class='del'>-		    ih_item_len(p_le_ih) / UNFM_P_SIZE;</div><div class='del'>-	else</div><div class='del'>-		pos_in_item(search_path) = ih_item_len(p_le_ih);</div><div class='del'>-</div><div class='del'>-	return POSITION_NOT_FOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compare given item and item pointed to by the path. */</div><div class='del'>-int comp_items(const struct item_head *stored_ih, const struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh = PATH_PLAST_BUFFER(path);</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-</div><div class='del'>-	/* Last buffer at the path is not in the tree. */</div><div class='del'>-	if (!B_IS_IN_TREE(bh))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* Last path position is invalid. */</div><div class='del'>-	if (PATH_LAST_POSITION(path) &gt;= B_NR_ITEMS(bh))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* we need only to know, whether it is the same item */</div><div class='del'>-	ih = tp_item_head(path);</div><div class='del'>-	return memcmp(stored_ih, ih, IH_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* prepare for delete or cut of direct item */</div><div class='del'>-static inline int prepare_for_direct_item(struct treepath *path,</div><div class='del'>-					  struct item_head *le_ih,</div><div class='del'>-					  struct inode *inode,</div><div class='del'>-					  loff_t new_file_length, int *cut_size)</div><div class='del'>-{</div><div class='del'>-	loff_t round_len;</div><div class='del'>-</div><div class='del'>-	if (new_file_length == max_reiserfs_offset(inode)) {</div><div class='del'>-		/* item has to be deleted */</div><div class='del'>-		*cut_size = -(IH_SIZE + ih_item_len(le_ih));</div><div class='del'>-		return M_DELETE;</div><div class='del'>-	}</div><div class='del'>-	/* new file gets truncated */</div><div class='del'>-	if (get_inode_item_key_version(inode) == KEY_FORMAT_3_6) {</div><div class='del'>-		round_len = ROUND_UP(new_file_length);</div><div class='del'>-		/* this was new_file_length &lt; le_ih ... */</div><div class='del'>-		if (round_len &lt; le_ih_k_offset(le_ih)) {</div><div class='del'>-			*cut_size = -(IH_SIZE + ih_item_len(le_ih));</div><div class='del'>-			return M_DELETE;	/* Delete this item. */</div><div class='del'>-		}</div><div class='del'>-		/* Calculate first position and size for cutting from item. */</div><div class='del'>-		pos_in_item(path) = round_len - (le_ih_k_offset(le_ih) - 1);</div><div class='del'>-		*cut_size = -(ih_item_len(le_ih) - pos_in_item(path));</div><div class='del'>-</div><div class='del'>-		return M_CUT;	/* Cut from this item. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* old file: items may have any length */</div><div class='del'>-</div><div class='del'>-	if (new_file_length &lt; le_ih_k_offset(le_ih)) {</div><div class='del'>-		*cut_size = -(IH_SIZE + ih_item_len(le_ih));</div><div class='del'>-		return M_DELETE;	/* Delete this item. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate first position and size for cutting from item. */</div><div class='del'>-	*cut_size = -(ih_item_len(le_ih) -</div><div class='del'>-		      (pos_in_item(path) =</div><div class='del'>-		       new_file_length + 1 - le_ih_k_offset(le_ih)));</div><div class='del'>-	return M_CUT;		/* Cut from this item. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int prepare_for_direntry_item(struct treepath *path,</div><div class='del'>-					    struct item_head *le_ih,</div><div class='del'>-					    struct inode *inode,</div><div class='del'>-					    loff_t new_file_length,</div><div class='del'>-					    int *cut_size)</div><div class='del'>-{</div><div class='del'>-	if (le_ih_k_offset(le_ih) == DOT_OFFSET &amp;&amp;</div><div class='del'>-	    new_file_length == max_reiserfs_offset(inode)) {</div><div class='del'>-		RFALSE(ih_entry_count(le_ih) != 2,</div><div class='del'>-		       "PAP-5220: incorrect empty directory item (%h)", le_ih);</div><div class='del'>-		*cut_size = -(IH_SIZE + ih_item_len(le_ih));</div><div class='del'>-		/* Delete the directory item containing "." and ".." entry. */</div><div class='del'>-		return M_DELETE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ih_entry_count(le_ih) == 1) {</div><div class='del'>-		/*</div><div class='del'>-		 * Delete the directory item such as there is one record only</div><div class='del'>-		 * in this item</div><div class='del'>-		 */</div><div class='del'>-		*cut_size = -(IH_SIZE + ih_item_len(le_ih));</div><div class='del'>-		return M_DELETE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cut one record from the directory item. */</div><div class='del'>-	*cut_size =</div><div class='del'>-	    -(DEH_SIZE +</div><div class='del'>-	      entry_length(get_last_bh(path), le_ih, pos_in_item(path)));</div><div class='del'>-	return M_CUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define JOURNAL_FOR_FREE_BLOCK_AND_UPDATE_SD (2 * JOURNAL_PER_BALANCE_CNT + 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If the path points to a directory or direct item, calculate mode</div><div class='del'>- * and the size cut, for balance.</div><div class='del'>- * If the path points to an indirect item, remove some number of its</div><div class='del'>- * unformatted nodes.</div><div class='del'>- * In case of file truncate calculate whether this item must be</div><div class='del'>- * deleted/truncated or last unformatted node of this item will be</div><div class='del'>- * converted to a direct item.</div><div class='del'>- * This function returns a determination of what balance mode the</div><div class='del'>- * calling function should employ.</div><div class='del'>- */</div><div class='del'>-static char prepare_for_delete_or_cut(struct reiserfs_transaction_handle *th,</div><div class='del'>-				      struct inode *inode,</div><div class='del'>-				      struct treepath *path,</div><div class='del'>-				      const struct cpu_key *item_key,</div><div class='del'>-				      /*</div><div class='del'>-				       * Number of unformatted nodes</div><div class='del'>-				       * which were removed from end</div><div class='del'>-				       * of the file.</div><div class='del'>-				       */</div><div class='del'>-				      int *removed,</div><div class='del'>-				      int *cut_size,</div><div class='del'>-				      /* MAX_KEY_OFFSET in case of delete. */</div><div class='del'>-				      unsigned long long new_file_length</div><div class='del'>-    )</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct item_head *p_le_ih = tp_item_head(path);</div><div class='del'>-	struct buffer_head *bh = PATH_PLAST_BUFFER(path);</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	/* Stat_data item. */</div><div class='del'>-	if (is_statdata_le_ih(p_le_ih)) {</div><div class='del'>-</div><div class='del'>-		RFALSE(new_file_length != max_reiserfs_offset(inode),</div><div class='del'>-		       "PAP-5210: mode must be M_DELETE");</div><div class='del'>-</div><div class='del'>-		*cut_size = -(IH_SIZE + ih_item_len(p_le_ih));</div><div class='del'>-		return M_DELETE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Directory item. */</div><div class='del'>-	if (is_direntry_le_ih(p_le_ih))</div><div class='del'>-		return prepare_for_direntry_item(path, p_le_ih, inode,</div><div class='del'>-						 new_file_length,</div><div class='del'>-						 cut_size);</div><div class='del'>-</div><div class='del'>-	/* Direct item. */</div><div class='del'>-	if (is_direct_le_ih(p_le_ih))</div><div class='del'>-		return prepare_for_direct_item(path, p_le_ih, inode,</div><div class='del'>-					       new_file_length, cut_size);</div><div class='del'>-</div><div class='del'>-	/* Case of an indirect item. */</div><div class='del'>-	{</div><div class='del'>-	    int blk_size = sb-&gt;s_blocksize;</div><div class='del'>-	    struct item_head s_ih;</div><div class='del'>-	    int need_re_search;</div><div class='del'>-	    int delete = 0;</div><div class='del'>-	    int result = M_CUT;</div><div class='del'>-	    int pos = 0;</div><div class='del'>-</div><div class='del'>-	    if ( new_file_length == max_reiserfs_offset (inode) ) {</div><div class='del'>-		/*</div><div class='del'>-		 * prepare_for_delete_or_cut() is called by</div><div class='del'>-		 * reiserfs_delete_item()</div><div class='del'>-		 */</div><div class='del'>-		new_file_length = 0;</div><div class='del'>-		delete = 1;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    do {</div><div class='del'>-		need_re_search = 0;</div><div class='del'>-		*cut_size = 0;</div><div class='del'>-		bh = PATH_PLAST_BUFFER(path);</div><div class='del'>-		copy_item_head(&amp;s_ih, tp_item_head(path));</div><div class='del'>-		pos = I_UNFM_NUM(&amp;s_ih);</div><div class='del'>-</div><div class='del'>-		while (le_ih_k_offset (&amp;s_ih) + (pos - 1) * blk_size &gt; new_file_length) {</div><div class='del'>-		    __le32 *unfm;</div><div class='del'>-		    __u32 block;</div><div class='del'>-</div><div class='del'>-		    /*</div><div class='del'>-		     * Each unformatted block deletion may involve</div><div class='del'>-		     * one additional bitmap block into the transaction,</div><div class='del'>-		     * thereby the initial journal space reservation</div><div class='del'>-		     * might not be enough.</div><div class='del'>-		     */</div><div class='del'>-		    if (!delete &amp;&amp; (*cut_size) != 0 &amp;&amp;</div><div class='del'>-			reiserfs_transaction_free_space(th) &lt; JOURNAL_FOR_FREE_BLOCK_AND_UPDATE_SD)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		    unfm = (__le32 *)ih_item_body(bh, &amp;s_ih) + pos - 1;</div><div class='del'>-		    block = get_block_num(unfm, 0);</div><div class='del'>-</div><div class='del'>-		    if (block != 0) {</div><div class='del'>-			reiserfs_prepare_for_journal(sb, bh, 1);</div><div class='del'>-			put_block_num(unfm, 0, 0);</div><div class='del'>-			journal_mark_dirty(th, bh);</div><div class='del'>-			reiserfs_free_block(th, inode, block, 1);</div><div class='del'>-		    }</div><div class='del'>-</div><div class='del'>-		    reiserfs_cond_resched(sb);</div><div class='del'>-</div><div class='del'>-		    if (item_moved (&amp;s_ih, path))  {</div><div class='del'>-			need_re_search = 1;</div><div class='del'>-			break;</div><div class='del'>-		    }</div><div class='del'>-</div><div class='del'>-		    pos --;</div><div class='del'>-		    (*removed)++;</div><div class='del'>-		    (*cut_size) -= UNFM_P_SIZE;</div><div class='del'>-</div><div class='del'>-		    if (pos == 0) {</div><div class='del'>-			(*cut_size) -= IH_SIZE;</div><div class='del'>-			result = M_DELETE;</div><div class='del'>-			break;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * a trick.  If the buffer has been logged, this will</div><div class='del'>-		 * do nothing.  If we've broken the loop without logging</div><div class='del'>-		 * it, it will restore the buffer</div><div class='del'>-		 */</div><div class='del'>-		reiserfs_restore_prepared_buffer(sb, bh);</div><div class='del'>-	    } while (need_re_search &amp;&amp;</div><div class='del'>-		     search_for_position_by_key(sb, item_key, path) == POSITION_FOUND);</div><div class='del'>-	    pos_in_item(path) = pos * UNFM_P_SIZE;</div><div class='del'>-</div><div class='del'>-	    if (*cut_size == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Nothing was cut. maybe convert last unformatted node to the</div><div class='del'>-		 * direct item?</div><div class='del'>-		 */</div><div class='del'>-		result = M_CONVERT;</div><div class='del'>-	    }</div><div class='del'>-	    return result;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calculate number of bytes which will be deleted or cut during balance */</div><div class='del'>-static int calc_deleted_bytes_number(struct tree_balance *tb, char mode)</div><div class='del'>-{</div><div class='del'>-	int del_size;</div><div class='del'>-	struct item_head *p_le_ih = tp_item_head(tb-&gt;tb_path);</div><div class='del'>-</div><div class='del'>-	if (is_statdata_le_ih(p_le_ih))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	del_size =</div><div class='del'>-	    (mode ==</div><div class='del'>-	     M_DELETE) ? ih_item_len(p_le_ih) : -tb-&gt;insert_size[0];</div><div class='del'>-	if (is_direntry_le_ih(p_le_ih)) {</div><div class='del'>-		/*</div><div class='del'>-		 * return EMPTY_DIR_SIZE; We delete emty directories only.</div><div class='del'>-		 * we can't use EMPTY_DIR_SIZE, as old format dirs have a</div><div class='del'>-		 * different empty size.  ick. FIXME, is this right?</div><div class='del'>-		 */</div><div class='del'>-		return del_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_indirect_le_ih(p_le_ih))</div><div class='del'>-		del_size = (del_size / UNFM_P_SIZE) *</div><div class='del'>-				(PATH_PLAST_BUFFER(tb-&gt;tb_path)-&gt;b_size);</div><div class='del'>-	return del_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_tb_struct(struct reiserfs_transaction_handle *th,</div><div class='del'>-			   struct tree_balance *tb,</div><div class='del'>-			   struct super_block *sb,</div><div class='del'>-			   struct treepath *path, int size)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	memset(tb, '\0', sizeof(struct tree_balance));</div><div class='del'>-	tb-&gt;transaction_handle = th;</div><div class='del'>-	tb-&gt;tb_sb = sb;</div><div class='del'>-	tb-&gt;tb_path = path;</div><div class='del'>-	PATH_OFFSET_PBUFFER(path, ILLEGAL_PATH_ELEMENT_OFFSET) = NULL;</div><div class='del'>-	PATH_OFFSET_POSITION(path, ILLEGAL_PATH_ELEMENT_OFFSET) = 0;</div><div class='del'>-	tb-&gt;insert_size[0] = size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void padd_item(char *item, int total_length, int length)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = total_length; i &gt; length;)</div><div class='del'>-		item[--i] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-char key2type(struct reiserfs_key *ih)</div><div class='del'>-{</div><div class='del'>-	if (is_direntry_le_key(2, ih))</div><div class='del'>-		return 'd';</div><div class='del'>-	if (is_direct_le_key(2, ih))</div><div class='del'>-		return 'D';</div><div class='del'>-	if (is_indirect_le_key(2, ih))</div><div class='del'>-		return 'i';</div><div class='del'>-	if (is_statdata_le_key(2, ih))</div><div class='del'>-		return 's';</div><div class='del'>-	return 'u';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char head2type(struct item_head *ih)</div><div class='del'>-{</div><div class='del'>-	if (is_direntry_le_ih(ih))</div><div class='del'>-		return 'd';</div><div class='del'>-	if (is_direct_le_ih(ih))</div><div class='del'>-		return 'D';</div><div class='del'>-	if (is_indirect_le_ih(ih))</div><div class='del'>-		return 'i';</div><div class='del'>-	if (is_statdata_le_ih(ih))</div><div class='del'>-		return 's';</div><div class='del'>-	return 'u';</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Delete object item.</div><div class='del'>- * th       - active transaction handle</div><div class='del'>- * path     - path to the deleted item</div><div class='del'>- * item_key - key to search for the deleted item</div><div class='del'>- * indode   - used for updating i_blocks and quotas</div><div class='del'>- * un_bh    - NULL or unformatted node pointer</div><div class='del'>- */</div><div class='del'>-int reiserfs_delete_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct treepath *path, const struct cpu_key *item_key,</div><div class='del'>-			 struct inode *inode, struct buffer_head *un_bh)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct tree_balance s_del_balance;</div><div class='del'>-	struct item_head s_ih;</div><div class='del'>-	struct item_head *q_ih;</div><div class='del'>-	int quota_cut_bytes;</div><div class='del'>-	int ret_value, del_size, removed;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	char mode;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	init_tb_struct(th, &amp;s_del_balance, sb, path,</div><div class='del'>-		       0 /*size is unknown */ );</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		removed = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		mode =</div><div class='del'>-#endif</div><div class='del'>-		    prepare_for_delete_or_cut(th, inode, path,</div><div class='del'>-					      item_key, &amp;removed,</div><div class='del'>-					      &amp;del_size,</div><div class='del'>-					      max_reiserfs_offset(inode));</div><div class='del'>-</div><div class='del'>-		RFALSE(mode != M_DELETE, "PAP-5320: mode must be M_DELETE");</div><div class='del'>-</div><div class='del'>-		copy_item_head(&amp;s_ih, tp_item_head(path));</div><div class='del'>-		s_del_balance.insert_size[0] = del_size;</div><div class='del'>-</div><div class='del'>-		ret_value = fix_nodes(M_DELETE, &amp;s_del_balance, NULL, NULL);</div><div class='del'>-		if (ret_value != REPEAT_SEARCH)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		PROC_INFO_INC(sb, delete_item_restarted);</div><div class='del'>-</div><div class='del'>-		/* file system changed, repeat search */</div><div class='del'>-		ret_value =</div><div class='del'>-		    search_for_position_by_key(sb, item_key, path);</div><div class='del'>-		if (ret_value == IO_ERROR)</div><div class='del'>-			break;</div><div class='del'>-		if (ret_value == FILE_NOT_FOUND) {</div><div class='del'>-			reiserfs_warning(sb, "vs-5340",</div><div class='del'>-					 "no items of the file %K found",</div><div class='del'>-					 item_key);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}			/* while (1) */</div><div class='del'>-</div><div class='del'>-	if (ret_value != CARRY_ON) {</div><div class='del'>-		unfix_nodes(&amp;s_del_balance);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reiserfs_delete_item returns item length when success */</div><div class='del'>-	ret_value = calc_deleted_bytes_number(&amp;s_del_balance, M_DELETE);</div><div class='del'>-	q_ih = tp_item_head(path);</div><div class='del'>-	quota_cut_bytes = ih_item_len(q_ih);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * hack so the quota code doesn't have to guess if the file has a</div><div class='del'>-	 * tail.  On tail insert, we allocate quota for 1 unformatted node.</div><div class='del'>-	 * We test the offset because the tail might have been</div><div class='del'>-	 * split into multiple items, and we only want to decrement for</div><div class='del'>-	 * the unfm node once</div><div class='del'>-	 */</div><div class='del'>-	if (!S_ISLNK(inode-&gt;i_mode) &amp;&amp; is_direct_le_ih(q_ih)) {</div><div class='del'>-		if ((le_ih_k_offset(q_ih) &amp; (sb-&gt;s_blocksize - 1)) == 1) {</div><div class='del'>-			quota_cut_bytes = sb-&gt;s_blocksize + UNFM_P_SIZE;</div><div class='del'>-		} else {</div><div class='del'>-			quota_cut_bytes = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (un_bh) {</div><div class='del'>-		int off;</div><div class='del'>-		char *data;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We are in direct2indirect conversion, so move tail contents</div><div class='del'>-		 * to the unformatted node</div><div class='del'>-		 */</div><div class='del'>-		/*</div><div class='del'>-		 * note, we do the copy before preparing the buffer because we</div><div class='del'>-		 * don't care about the contents of the unformatted node yet.</div><div class='del'>-		 * the only thing we really care about is the direct item's</div><div class='del'>-		 * data is in the unformatted node.</div><div class='del'>-		 *</div><div class='del'>-		 * Otherwise, we would have to call</div><div class='del'>-		 * reiserfs_prepare_for_journal on the unformatted node,</div><div class='del'>-		 * which might schedule, meaning we'd have to loop all the</div><div class='del'>-		 * way back up to the start of the while loop.</div><div class='del'>-		 *</div><div class='del'>-		 * The unformatted node must be dirtied later on.  We can't be</div><div class='del'>-		 * sure here if the entire tail has been deleted yet.</div><div class='del'>-		 *</div><div class='del'>-		 * un_bh is from the page cache (all unformatted nodes are</div><div class='del'>-		 * from the page cache) and might be a highmem page.  So, we</div><div class='del'>-		 * can't use un_bh-&gt;b_data.</div><div class='del'>-		 * -clm</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		data = kmap_atomic(un_bh-&gt;b_page);</div><div class='del'>-		off = ((le_ih_k_offset(&amp;s_ih) - 1) &amp; (PAGE_SIZE - 1));</div><div class='del'>-		memcpy(data + off,</div><div class='del'>-		       ih_item_body(PATH_PLAST_BUFFER(path), &amp;s_ih),</div><div class='del'>-		       ret_value);</div><div class='del'>-		kunmap_atomic(data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Perform balancing after all resources have been collected at once. */</div><div class='del'>-	do_balance(&amp;s_del_balance, NULL, NULL, M_DELETE);</div><div class='del'>-</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-	reiserfs_debug(sb, REISERFS_DEBUG_CODE,</div><div class='del'>-		       "reiserquota delete_item(): freeing %u, id=%u type=%c",</div><div class='del'>-		       quota_cut_bytes, inode-&gt;i_uid, head2type(&amp;s_ih));</div><div class='del'>-#endif</div><div class='del'>-	depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-	dquot_free_space_nodirty(inode, quota_cut_bytes);</div><div class='del'>-	reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-</div><div class='del'>-	/* Return deleted body length */</div><div class='del'>-	return ret_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Summary Of Mechanisms For Handling Collisions Between Processes:</div><div class='del'>- *</div><div class='del'>- *  deletion of the body of the object is performed by iput(), with the</div><div class='del'>- *  result that if multiple processes are operating on a file, the</div><div class='del'>- *  deletion of the body of the file is deferred until the last process</div><div class='del'>- *  that has an open inode performs its iput().</div><div class='del'>- *</div><div class='del'>- *  writes and truncates are protected from collisions by use of</div><div class='del'>- *  semaphores.</div><div class='del'>- *</div><div class='del'>- *  creates, linking, and mknod are protected from collisions with other</div><div class='del'>- *  processes by making the reiserfs_add_entry() the last step in the</div><div class='del'>- *  creation, and then rolling back all changes if there was a collision.</div><div class='del'>- *  - Hans</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* this deletes item which never gets split */</div><div class='del'>-void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-				struct inode *inode, struct reiserfs_key *key)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = th-&gt;t_super;</div><div class='del'>-	struct tree_balance tb;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	int item_len = 0;</div><div class='del'>-	int tb_init = 0;</div><div class='del'>-	struct cpu_key cpu_key = {};</div><div class='del'>-	int retval;</div><div class='del'>-	int quota_cut_bytes = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	le_key2cpu_key(&amp;cpu_key, key);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		retval = search_item(th-&gt;t_super, &amp;cpu_key, &amp;path);</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			reiserfs_error(th-&gt;t_super, "vs-5350",</div><div class='del'>-				       "i/o failure occurred trying "</div><div class='del'>-				       "to delete %K", &amp;cpu_key);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (retval != ITEM_FOUND) {</div><div class='del'>-			pathrelse(&amp;path);</div><div class='del'>-			/*</div><div class='del'>-			 * No need for a warning, if there is just no free</div><div class='del'>-			 * space to insert '..' item into the</div><div class='del'>-			 * newly-created subdir</div><div class='del'>-			 */</div><div class='del'>-			if (!</div><div class='del'>-			    ((unsigned long long)</div><div class='del'>-			     GET_HASH_VALUE(le_key_k_offset</div><div class='del'>-					    (le_key_version(key), key)) == 0</div><div class='del'>-			     &amp;&amp; (unsigned long long)</div><div class='del'>-			     GET_GENERATION_NUMBER(le_key_k_offset</div><div class='del'>-						   (le_key_version(key),</div><div class='del'>-						    key)) == 1))</div><div class='del'>-				reiserfs_warning(th-&gt;t_super, "vs-5355",</div><div class='del'>-						 "%k not found", key);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!tb_init) {</div><div class='del'>-			tb_init = 1;</div><div class='del'>-			item_len = ih_item_len(tp_item_head(&amp;path));</div><div class='del'>-			init_tb_struct(th, &amp;tb, th-&gt;t_super, &amp;path,</div><div class='del'>-				       -(IH_SIZE + item_len));</div><div class='del'>-		}</div><div class='del'>-		quota_cut_bytes = ih_item_len(tp_item_head(&amp;path));</div><div class='del'>-</div><div class='del'>-		retval = fix_nodes(M_DELETE, &amp;tb, NULL, NULL);</div><div class='del'>-		if (retval == REPEAT_SEARCH) {</div><div class='del'>-			PROC_INFO_INC(th-&gt;t_super, delete_solid_item_restarted);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (retval == CARRY_ON) {</div><div class='del'>-			do_balance(&amp;tb, NULL, NULL, M_DELETE);</div><div class='del'>-			/*</div><div class='del'>-			 * Should we count quota for item? (we don't</div><div class='del'>-			 * count quotas for save-links)</div><div class='del'>-			 */</div><div class='del'>-			if (inode) {</div><div class='del'>-				int depth;</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-				reiserfs_debug(th-&gt;t_super, REISERFS_DEBUG_CODE,</div><div class='del'>-					       "reiserquota delete_solid_item(): freeing %u id=%u type=%c",</div><div class='del'>-					       quota_cut_bytes, inode-&gt;i_uid,</div><div class='del'>-					       key2type(key));</div><div class='del'>-#endif</div><div class='del'>-				depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-				dquot_free_space_nodirty(inode,</div><div class='del'>-							 quota_cut_bytes);</div><div class='del'>-				reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* IO_ERROR, NO_DISK_SPACE, etc */</div><div class='del'>-		reiserfs_warning(th-&gt;t_super, "vs-5360",</div><div class='del'>-				 "could not delete %K due to fix_nodes failure",</div><div class='del'>-				 &amp;cpu_key);</div><div class='del'>-		unfix_nodes(&amp;tb);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_check_path(&amp;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_delete_object(struct reiserfs_transaction_handle *th,</div><div class='del'>-			   struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	inode-&gt;i_size = 0;</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	/* for directory this deletes item containing "." and ".." */</div><div class='del'>-	err =</div><div class='del'>-	    reiserfs_do_truncate(th, inode, NULL, 0 /*no timestamp updates */ );</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-#if defined( USE_INODE_GENERATION_COUNTER )</div><div class='del'>-	if (!old_format_only(th-&gt;t_super)) {</div><div class='del'>-		__le32 *inode_generation;</div><div class='del'>-</div><div class='del'>-		inode_generation =</div><div class='del'>-		    &amp;REISERFS_SB(th-&gt;t_super)-&gt;s_rs-&gt;s_inode_generation;</div><div class='del'>-		le32_add_cpu(inode_generation, 1);</div><div class='del'>-	}</div><div class='del'>-/* USE_INODE_GENERATION_COUNTER */</div><div class='del'>-#endif</div><div class='del'>-	reiserfs_delete_solid_item(th, inode, INODE_PKEY(inode));</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unmap_buffers(struct page *page, loff_t pos)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct buffer_head *head;</div><div class='del'>-	struct buffer_head *next;</div><div class='del'>-	unsigned long tail_index;</div><div class='del'>-	unsigned long cur_index;</div><div class='del'>-</div><div class='del'>-	if (page) {</div><div class='del'>-		if (page_has_buffers(page)) {</div><div class='del'>-			tail_index = pos &amp; (PAGE_SIZE - 1);</div><div class='del'>-			cur_index = 0;</div><div class='del'>-			head = page_buffers(page);</div><div class='del'>-			bh = head;</div><div class='del'>-			do {</div><div class='del'>-				next = bh-&gt;b_this_page;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * we want to unmap the buffers that contain</div><div class='del'>-				 * the tail, and all the buffers after it</div><div class='del'>-				 * (since the tail must be at the end of the</div><div class='del'>-				 * file).  We don't want to unmap file data</div><div class='del'>-				 * before the tail, since it might be dirty</div><div class='del'>-				 * and waiting to reach disk</div><div class='del'>-				 */</div><div class='del'>-				cur_index += bh-&gt;b_size;</div><div class='del'>-				if (cur_index &gt; tail_index) {</div><div class='del'>-					reiserfs_unmap_buffer(bh);</div><div class='del'>-				}</div><div class='del'>-				bh = next;</div><div class='del'>-			} while (bh != head);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th,</div><div class='del'>-				    struct inode *inode,</div><div class='del'>-				    struct page *page,</div><div class='del'>-				    struct treepath *path,</div><div class='del'>-				    const struct cpu_key *item_key,</div><div class='del'>-				    loff_t new_file_size, char *mode)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	int block_size = sb-&gt;s_blocksize;</div><div class='del'>-	int cut_bytes;</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	BUG_ON(new_file_size != inode-&gt;i_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the page being sent in could be NULL if there was an i/o error</div><div class='del'>-	 * reading in the last block.  The user will hit problems trying to</div><div class='del'>-	 * read the file, but for now we just skip the indirect2direct</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;inode-&gt;i_count) &gt; 1 ||</div><div class='del'>-	    !tail_has_to_be_packed(inode) ||</div><div class='del'>-	    !page || (REISERFS_I(inode)-&gt;i_flags &amp; i_nopack_mask)) {</div><div class='del'>-		/* leave tail in an unformatted node */</div><div class='del'>-		*mode = M_SKIP_BALANCING;</div><div class='del'>-		cut_bytes =</div><div class='del'>-		    block_size - (new_file_size &amp; (block_size - 1));</div><div class='del'>-		pathrelse(path);</div><div class='del'>-		return cut_bytes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Perform the conversion to a direct_item. */</div><div class='del'>-	return indirect2direct(th, inode, page, path, item_key,</div><div class='del'>-			       new_file_size, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * we did indirect_to_direct conversion. And we have inserted direct</div><div class='del'>- * item successesfully, but there were no disk space to cut unfm</div><div class='del'>- * pointer being converted. Therefore we have to delete inserted</div><div class='del'>- * direct item(s)</div><div class='del'>- */</div><div class='del'>-static void indirect_to_direct_roll_back(struct reiserfs_transaction_handle *th,</div><div class='del'>-					 struct inode *inode, struct treepath *path)</div><div class='del'>-{</div><div class='del'>-	struct cpu_key tail_key;</div><div class='del'>-	int tail_len;</div><div class='del'>-	int removed;</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	make_cpu_key(&amp;tail_key, inode, inode-&gt;i_size + 1, TYPE_DIRECT, 4);</div><div class='del'>-	tail_key.key_length = 4;</div><div class='del'>-</div><div class='del'>-	tail_len =</div><div class='del'>-	    (cpu_key_k_offset(&amp;tail_key) &amp; (inode-&gt;i_sb-&gt;s_blocksize - 1)) - 1;</div><div class='del'>-	while (tail_len) {</div><div class='del'>-		/* look for the last byte of the tail */</div><div class='del'>-		if (search_for_position_by_key(inode-&gt;i_sb, &amp;tail_key, path) ==</div><div class='del'>-		    POSITION_NOT_FOUND)</div><div class='del'>-			reiserfs_panic(inode-&gt;i_sb, "vs-5615",</div><div class='del'>-				       "found invalid item");</div><div class='del'>-		RFALSE(path-&gt;pos_in_item !=</div><div class='del'>-		       ih_item_len(tp_item_head(path)) - 1,</div><div class='del'>-		       "vs-5616: appended bytes found");</div><div class='del'>-		PATH_LAST_POSITION(path)--;</div><div class='del'>-</div><div class='del'>-		removed =</div><div class='del'>-		    reiserfs_delete_item(th, path, &amp;tail_key, inode,</div><div class='del'>-					 NULL /*unbh not needed */ );</div><div class='del'>-		RFALSE(removed &lt;= 0</div><div class='del'>-		       || removed &gt; tail_len,</div><div class='del'>-		       "vs-5617: there was tail %d bytes, removed item length %d bytes",</div><div class='del'>-		       tail_len, removed);</div><div class='del'>-		tail_len -= removed;</div><div class='del'>-		set_cpu_key_k_offset(&amp;tail_key,</div><div class='del'>-				     cpu_key_k_offset(&amp;tail_key) - removed);</div><div class='del'>-	}</div><div class='del'>-	reiserfs_warning(inode-&gt;i_sb, "reiserfs-5091", "indirect_to_direct "</div><div class='del'>-			 "conversion has been rolled back due to "</div><div class='del'>-			 "lack of disk space");</div><div class='del'>-	mark_inode_dirty(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (Truncate or cut entry) or delete object item. Returns &lt; 0 on failure */</div><div class='del'>-int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			   struct treepath *path,</div><div class='del'>-			   struct cpu_key *item_key,</div><div class='del'>-			   struct inode *inode,</div><div class='del'>-			   struct page *page, loff_t new_file_size)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	/*</div><div class='del'>-	 * Every function which is going to call do_balance must first</div><div class='del'>-	 * create a tree_balance structure.  Then it must fill up this</div><div class='del'>-	 * structure by using the init_tb_struct and fix_nodes functions.</div><div class='del'>-	 * After that we can make tree balancing.</div><div class='del'>-	 */</div><div class='del'>-	struct tree_balance s_cut_balance;</div><div class='del'>-	struct item_head *p_le_ih;</div><div class='del'>-	int cut_size = 0;	/* Amount to be cut. */</div><div class='del'>-	int ret_value = CARRY_ON;</div><div class='del'>-	int removed = 0;	/* Number of the removed unformatted nodes. */</div><div class='del'>-	int is_inode_locked = 0;</div><div class='del'>-	char mode;		/* Mode of the balance. */</div><div class='del'>-	int retval2 = -1;</div><div class='del'>-	int quota_cut_bytes;</div><div class='del'>-	loff_t tail_pos = 0;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	init_tb_struct(th, &amp;s_cut_balance, inode-&gt;i_sb, path,</div><div class='del'>-		       cut_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Repeat this loop until we either cut the item without needing</div><div class='del'>-	 * to balance, or we fix_nodes without schedule occurring</div><div class='del'>-	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		/*</div><div class='del'>-		 * Determine the balance mode, position of the first byte to</div><div class='del'>-		 * be cut, and size to be cut.  In case of the indirect item</div><div class='del'>-		 * free unformatted nodes which are pointed to by the cut</div><div class='del'>-		 * pointers.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		mode =</div><div class='del'>-		    prepare_for_delete_or_cut(th, inode, path,</div><div class='del'>-					      item_key, &amp;removed,</div><div class='del'>-					      &amp;cut_size, new_file_size);</div><div class='del'>-		if (mode == M_CONVERT) {</div><div class='del'>-			/*</div><div class='del'>-			 * convert last unformatted node to direct item or</div><div class='del'>-			 * leave tail in the unformatted node</div><div class='del'>-			 */</div><div class='del'>-			RFALSE(ret_value != CARRY_ON,</div><div class='del'>-			       "PAP-5570: can not convert twice");</div><div class='del'>-</div><div class='del'>-			ret_value =</div><div class='del'>-			    maybe_indirect_to_direct(th, inode, page,</div><div class='del'>-						     path, item_key,</div><div class='del'>-						     new_file_size, &amp;mode);</div><div class='del'>-			if (mode == M_SKIP_BALANCING)</div><div class='del'>-				/* tail has been left in the unformatted node */</div><div class='del'>-				return ret_value;</div><div class='del'>-</div><div class='del'>-			is_inode_locked = 1;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * removing of last unformatted node will</div><div class='del'>-			 * change value we have to return to truncate.</div><div class='del'>-			 * Save it</div><div class='del'>-			 */</div><div class='del'>-			retval2 = ret_value;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * So, we have performed the first part of the</div><div class='del'>-			 * conversion:</div><div class='del'>-			 * inserting the new direct item.  Now we are</div><div class='del'>-			 * removing the last unformatted node pointer.</div><div class='del'>-			 * Set key to search for it.</div><div class='del'>-			 */</div><div class='del'>-			set_cpu_key_k_type(item_key, TYPE_INDIRECT);</div><div class='del'>-			item_key-&gt;key_length = 4;</div><div class='del'>-			new_file_size -=</div><div class='del'>-			    (new_file_size &amp; (sb-&gt;s_blocksize - 1));</div><div class='del'>-			tail_pos = new_file_size;</div><div class='del'>-			set_cpu_key_k_offset(item_key, new_file_size + 1);</div><div class='del'>-			if (search_for_position_by_key</div><div class='del'>-			    (sb, item_key,</div><div class='del'>-			     path) == POSITION_NOT_FOUND) {</div><div class='del'>-				print_block(PATH_PLAST_BUFFER(path), 3,</div><div class='del'>-					    PATH_LAST_POSITION(path) - 1,</div><div class='del'>-					    PATH_LAST_POSITION(path) + 1);</div><div class='del'>-				reiserfs_panic(sb, "PAP-5580", "item to "</div><div class='del'>-					       "convert does not exist (%K)",</div><div class='del'>-					       item_key);</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (cut_size == 0) {</div><div class='del'>-			pathrelse(path);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		s_cut_balance.insert_size[0] = cut_size;</div><div class='del'>-</div><div class='del'>-		ret_value = fix_nodes(mode, &amp;s_cut_balance, NULL, NULL);</div><div class='del'>-		if (ret_value != REPEAT_SEARCH)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		PROC_INFO_INC(sb, cut_from_item_restarted);</div><div class='del'>-</div><div class='del'>-		ret_value =</div><div class='del'>-		    search_for_position_by_key(sb, item_key, path);</div><div class='del'>-		if (ret_value == POSITION_FOUND)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		reiserfs_warning(sb, "PAP-5610", "item %K not found",</div><div class='del'>-				 item_key);</div><div class='del'>-		unfix_nodes(&amp;s_cut_balance);</div><div class='del'>-		return (ret_value == IO_ERROR) ? -EIO : -ENOENT;</div><div class='del'>-	}			/* while */</div><div class='del'>-</div><div class='del'>-	/* check fix_nodes results (IO_ERROR or NO_DISK_SPACE) */</div><div class='del'>-	if (ret_value != CARRY_ON) {</div><div class='del'>-		if (is_inode_locked) {</div><div class='del'>-			/*</div><div class='del'>-			 * FIXME: this seems to be not needed: we are always</div><div class='del'>-			 * able to cut item</div><div class='del'>-			 */</div><div class='del'>-			indirect_to_direct_roll_back(th, inode, path);</div><div class='del'>-		}</div><div class='del'>-		if (ret_value == NO_DISK_SPACE)</div><div class='del'>-			reiserfs_warning(sb, "reiserfs-5092",</div><div class='del'>-					 "NO_DISK_SPACE");</div><div class='del'>-		unfix_nodes(&amp;s_cut_balance);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* go ahead and perform balancing */</div><div class='del'>-</div><div class='del'>-	RFALSE(mode == M_PASTE || mode == M_INSERT, "invalid mode");</div><div class='del'>-</div><div class='del'>-	/* Calculate number of bytes that need to be cut from the item. */</div><div class='del'>-	quota_cut_bytes =</div><div class='del'>-	    (mode ==</div><div class='del'>-	     M_DELETE) ? ih_item_len(tp_item_head(path)) : -s_cut_balance.</div><div class='del'>-	    insert_size[0];</div><div class='del'>-	if (retval2 == -1)</div><div class='del'>-		ret_value = calc_deleted_bytes_number(&amp;s_cut_balance, mode);</div><div class='del'>-	else</div><div class='del'>-		ret_value = retval2;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For direct items, we only change the quota when deleting the last</div><div class='del'>-	 * item.</div><div class='del'>-	 */</div><div class='del'>-	p_le_ih = tp_item_head(s_cut_balance.tb_path);</div><div class='del'>-	if (!S_ISLNK(inode-&gt;i_mode) &amp;&amp; is_direct_le_ih(p_le_ih)) {</div><div class='del'>-		if (mode == M_DELETE &amp;&amp;</div><div class='del'>-		    (le_ih_k_offset(p_le_ih) &amp; (sb-&gt;s_blocksize - 1)) ==</div><div class='del'>-		    1) {</div><div class='del'>-			/* FIXME: this is to keep 3.5 happy */</div><div class='del'>-			REISERFS_I(inode)-&gt;i_first_direct_byte = U32_MAX;</div><div class='del'>-			quota_cut_bytes = sb-&gt;s_blocksize + UNFM_P_SIZE;</div><div class='del'>-		} else {</div><div class='del'>-			quota_cut_bytes = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	if (is_inode_locked) {</div><div class='del'>-		struct item_head *le_ih =</div><div class='del'>-		    tp_item_head(s_cut_balance.tb_path);</div><div class='del'>-		/*</div><div class='del'>-		 * we are going to complete indirect2direct conversion. Make</div><div class='del'>-		 * sure, that we exactly remove last unformatted node pointer</div><div class='del'>-		 * of the item</div><div class='del'>-		 */</div><div class='del'>-		if (!is_indirect_le_ih(le_ih))</div><div class='del'>-			reiserfs_panic(sb, "vs-5652",</div><div class='del'>-				       "item must be indirect %h", le_ih);</div><div class='del'>-</div><div class='del'>-		if (mode == M_DELETE &amp;&amp; ih_item_len(le_ih) != UNFM_P_SIZE)</div><div class='del'>-			reiserfs_panic(sb, "vs-5653", "completing "</div><div class='del'>-				       "indirect2direct conversion indirect "</div><div class='del'>-				       "item %h being deleted must be of "</div><div class='del'>-				       "4 byte long", le_ih);</div><div class='del'>-</div><div class='del'>-		if (mode == M_CUT</div><div class='del'>-		    &amp;&amp; s_cut_balance.insert_size[0] != -UNFM_P_SIZE) {</div><div class='del'>-			reiserfs_panic(sb, "vs-5654", "can not complete "</div><div class='del'>-				       "indirect2direct conversion of %h "</div><div class='del'>-				       "(CUT, insert_size==%d)",</div><div class='del'>-				       le_ih, s_cut_balance.insert_size[0]);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * it would be useful to make sure, that right neighboring</div><div class='del'>-		 * item is direct item of this file</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	do_balance(&amp;s_cut_balance, NULL, NULL, mode);</div><div class='del'>-	if (is_inode_locked) {</div><div class='del'>-		/*</div><div class='del'>-		 * we've done an indirect-&gt;direct conversion.  when the</div><div class='del'>-		 * data block was freed, it was removed from the list of</div><div class='del'>-		 * blocks that must be flushed before the transaction</div><div class='del'>-		 * commits, make sure to unmap and invalidate it</div><div class='del'>-		 */</div><div class='del'>-		unmap_buffers(page, tail_pos);</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags &amp;= ~i_pack_on_close_mask;</div><div class='del'>-	}</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-	reiserfs_debug(inode-&gt;i_sb, REISERFS_DEBUG_CODE,</div><div class='del'>-		       "reiserquota cut_from_item(): freeing %u id=%u type=%c",</div><div class='del'>-		       quota_cut_bytes, inode-&gt;i_uid, '?');</div><div class='del'>-#endif</div><div class='del'>-	depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-	dquot_free_space_nodirty(inode, quota_cut_bytes);</div><div class='del'>-	reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-	return ret_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void truncate_directory(struct reiserfs_transaction_handle *th,</div><div class='del'>-			       struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	if (inode-&gt;i_nlink)</div><div class='del'>-		reiserfs_error(inode-&gt;i_sb, "vs-5655", "link count != 0");</div><div class='del'>-</div><div class='del'>-	set_le_key_k_offset(KEY_FORMAT_3_5, INODE_PKEY(inode), DOT_OFFSET);</div><div class='del'>-	set_le_key_k_type(KEY_FORMAT_3_5, INODE_PKEY(inode), TYPE_DIRENTRY);</div><div class='del'>-	reiserfs_delete_solid_item(th, inode, INODE_PKEY(inode));</div><div class='del'>-	reiserfs_update_sd(th, inode);</div><div class='del'>-	set_le_key_k_offset(KEY_FORMAT_3_5, INODE_PKEY(inode), SD_OFFSET);</div><div class='del'>-	set_le_key_k_type(KEY_FORMAT_3_5, INODE_PKEY(inode), TYPE_STAT_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Truncate file to the new size. Note, this must be called with a</div><div class='del'>- * transaction already started</div><div class='del'>- */</div><div class='del'>-int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct inode *inode,	/* -&gt;i_size contains new size */</div><div class='del'>-			 struct page *page,	/* up to date for last block */</div><div class='del'>-			 /*</div><div class='del'>-			  * when it is called by file_release to convert</div><div class='del'>-			  * the tail - no timestamps should be updated</div><div class='del'>-			  */</div><div class='del'>-			 int update_timestamps</div><div class='del'>-    )</div><div class='del'>-{</div><div class='del'>-	INITIALIZE_PATH(s_search_path);	/* Path to the current object item. */</div><div class='del'>-	struct item_head *p_le_ih;	/* Pointer to an item header. */</div><div class='del'>-</div><div class='del'>-	/* Key to search for a previous file item. */</div><div class='del'>-	struct cpu_key s_item_key;</div><div class='del'>-	loff_t file_size,	/* Old file size. */</div><div class='del'>-	 new_file_size;	/* New file size. */</div><div class='del'>-	int deleted;		/* Number of deleted or truncated bytes. */</div><div class='del'>-	int retval;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-	if (!</div><div class='del'>-	    (S_ISREG(inode-&gt;i_mode) || S_ISDIR(inode-&gt;i_mode)</div><div class='del'>-	     || S_ISLNK(inode-&gt;i_mode)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* deletion of directory - no need to update timestamps */</div><div class='del'>-	if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-		truncate_directory(th, inode);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get new file size. */</div><div class='del'>-	new_file_size = inode-&gt;i_size;</div><div class='del'>-</div><div class='del'>-	/* FIXME: note, that key type is unimportant here */</div><div class='del'>-	make_cpu_key(&amp;s_item_key, inode, max_reiserfs_offset(inode),</div><div class='del'>-		     TYPE_DIRECT, 3);</div><div class='del'>-</div><div class='del'>-	retval =</div><div class='del'>-	    search_for_position_by_key(inode-&gt;i_sb, &amp;s_item_key,</div><div class='del'>-				       &amp;s_search_path);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		reiserfs_error(inode-&gt;i_sb, "vs-5657",</div><div class='del'>-			       "i/o failure occurred trying to truncate %K",</div><div class='del'>-			       &amp;s_item_key);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (retval == POSITION_FOUND || retval == FILE_NOT_FOUND) {</div><div class='del'>-		reiserfs_error(inode-&gt;i_sb, "PAP-5660",</div><div class='del'>-			       "wrong result %d of search for %K", retval,</div><div class='del'>-			       &amp;s_item_key);</div><div class='del'>-</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s_search_path.pos_in_item--;</div><div class='del'>-</div><div class='del'>-	/* Get real file size (total length of all file items) */</div><div class='del'>-	p_le_ih = tp_item_head(&amp;s_search_path);</div><div class='del'>-	if (is_statdata_le_ih(p_le_ih))</div><div class='del'>-		file_size = 0;</div><div class='del'>-	else {</div><div class='del'>-		loff_t offset = le_ih_k_offset(p_le_ih);</div><div class='del'>-		int bytes =</div><div class='del'>-		    op_bytes_number(p_le_ih, inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * this may mismatch with real file size: if last direct item</div><div class='del'>-		 * had no padding zeros and last unformatted node had no free</div><div class='del'>-		 * space, this file would have this file size</div><div class='del'>-		 */</div><div class='del'>-		file_size = offset + bytes - 1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * are we doing a full truncate or delete, if so</div><div class='del'>-	 * kick in the reada code</div><div class='del'>-	 */</div><div class='del'>-	if (new_file_size == 0)</div><div class='del'>-		s_search_path.reada = PATH_READA | PATH_READA_BACK;</div><div class='del'>-</div><div class='del'>-	if (file_size == 0 || file_size &lt; new_file_size) {</div><div class='del'>-		goto update_and_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update key to search for the last file item. */</div><div class='del'>-	set_cpu_key_k_offset(&amp;s_item_key, file_size);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* Cut or delete file item. */</div><div class='del'>-		deleted =</div><div class='del'>-		    reiserfs_cut_from_item(th, &amp;s_search_path, &amp;s_item_key,</div><div class='del'>-					   inode, page, new_file_size);</div><div class='del'>-		if (deleted &lt; 0) {</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "vs-5665",</div><div class='del'>-					 "reiserfs_cut_from_item failed");</div><div class='del'>-			reiserfs_check_path(&amp;s_search_path);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		RFALSE(deleted &gt; file_size,</div><div class='del'>-		       "PAP-5670: reiserfs_cut_from_item: too many bytes deleted: deleted %d, file_size %lu, item_key %K",</div><div class='del'>-		       deleted, file_size, &amp;s_item_key);</div><div class='del'>-</div><div class='del'>-		/* Change key to search the last file item. */</div><div class='del'>-		file_size -= deleted;</div><div class='del'>-</div><div class='del'>-		set_cpu_key_k_offset(&amp;s_item_key, file_size);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * While there are bytes to truncate and previous</div><div class='del'>-		 * file item is presented in the tree.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This loop could take a really long time, and could log</div><div class='del'>-		 * many more blocks than a transaction can hold.  So, we do</div><div class='del'>-		 * a polite journal end here, and if the transaction needs</div><div class='del'>-		 * ending, we make sure the file is consistent before ending</div><div class='del'>-		 * the current trans and starting a new one</div><div class='del'>-		 */</div><div class='del'>-		if (journal_transaction_should_end(th, 0) ||</div><div class='del'>-		    reiserfs_transaction_free_space(th) &lt;= JOURNAL_FOR_FREE_BLOCK_AND_UPDATE_SD) {</div><div class='del'>-			pathrelse(&amp;s_search_path);</div><div class='del'>-</div><div class='del'>-			if (update_timestamps) {</div><div class='del'>-				inode_set_mtime_to_ts(inode,</div><div class='del'>-						      current_time(inode));</div><div class='del'>-				inode_set_ctime_current(inode);</div><div class='del'>-			}</div><div class='del'>-			reiserfs_update_sd(th, inode);</div><div class='del'>-</div><div class='del'>-			err = journal_end(th);</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='del'>-			err = journal_begin(th, inode-&gt;i_sb,</div><div class='del'>-					    JOURNAL_FOR_FREE_BLOCK_AND_UPDATE_SD + JOURNAL_PER_BALANCE_CNT * 4) ;</div><div class='del'>-			if (err)</div><div class='del'>-				goto out;</div><div class='del'>-			reiserfs_update_inode_transaction(inode);</div><div class='del'>-		}</div><div class='del'>-	} while (file_size &gt; ROUND_UP(new_file_size) &amp;&amp;</div><div class='del'>-		 search_for_position_by_key(inode-&gt;i_sb, &amp;s_item_key,</div><div class='del'>-					    &amp;s_search_path) == POSITION_FOUND);</div><div class='del'>-</div><div class='del'>-	RFALSE(file_size &gt; ROUND_UP(new_file_size),</div><div class='del'>-	       "PAP-5680: truncate did not finish: new_file_size %lld, current %lld, oid %d",</div><div class='del'>-	       new_file_size, file_size, s_item_key.on_disk_key.k_objectid);</div><div class='del'>-</div><div class='del'>-update_and_out:</div><div class='del'>-	if (update_timestamps) {</div><div class='del'>-		/* this is truncate, not file closing */</div><div class='del'>-		inode_set_mtime_to_ts(inode, current_time(inode));</div><div class='del'>-		inode_set_ctime_current(inode);</div><div class='del'>-	}</div><div class='del'>-	reiserfs_update_sd(th, inode);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	pathrelse(&amp;s_search_path);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-/* this makes sure, that we __append__, not overwrite or add holes */</div><div class='del'>-static void check_research_for_paste(struct treepath *path,</div><div class='del'>-				     const struct cpu_key *key)</div><div class='del'>-{</div><div class='del'>-	struct item_head *found_ih = tp_item_head(path);</div><div class='del'>-</div><div class='del'>-	if (is_direct_le_ih(found_ih)) {</div><div class='del'>-		if (le_ih_k_offset(found_ih) +</div><div class='del'>-		    op_bytes_number(found_ih,</div><div class='del'>-				    get_last_bh(path)-&gt;b_size) !=</div><div class='del'>-		    cpu_key_k_offset(key)</div><div class='del'>-		    || op_bytes_number(found_ih,</div><div class='del'>-				       get_last_bh(path)-&gt;b_size) !=</div><div class='del'>-		    pos_in_item(path))</div><div class='del'>-			reiserfs_panic(NULL, "PAP-5720", "found direct item "</div><div class='del'>-				       "%h or position (%d) does not match "</div><div class='del'>-				       "to key %K", found_ih,</div><div class='del'>-				       pos_in_item(path), key);</div><div class='del'>-	}</div><div class='del'>-	if (is_indirect_le_ih(found_ih)) {</div><div class='del'>-		if (le_ih_k_offset(found_ih) +</div><div class='del'>-		    op_bytes_number(found_ih,</div><div class='del'>-				    get_last_bh(path)-&gt;b_size) !=</div><div class='del'>-		    cpu_key_k_offset(key)</div><div class='del'>-		    || I_UNFM_NUM(found_ih) != pos_in_item(path)</div><div class='del'>-		    || get_ih_free_space(found_ih) != 0)</div><div class='del'>-			reiserfs_panic(NULL, "PAP-5730", "found indirect "</div><div class='del'>-				       "item (%h) or position (%d) does not "</div><div class='del'>-				       "match to key (%K)",</div><div class='del'>-				       found_ih, pos_in_item(path), key);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif				/* config reiserfs check */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Paste bytes to the existing item.</div><div class='del'>- * Returns bytes number pasted into the item.</div><div class='del'>- */</div><div class='del'>-int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     /* Path to the pasted item. */</div><div class='del'>-			     struct treepath *search_path,</div><div class='del'>-			     /* Key to search for the needed item. */</div><div class='del'>-			     const struct cpu_key *key,</div><div class='del'>-			     /* Inode item belongs to */</div><div class='del'>-			     struct inode *inode,</div><div class='del'>-			     /* Pointer to the bytes to paste. */</div><div class='del'>-			     const char *body,</div><div class='del'>-			     /* Size of pasted bytes. */</div><div class='del'>-			     int pasted_size)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct tree_balance s_paste_balance;</div><div class='del'>-	int retval;</div><div class='del'>-	int fs_gen;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	fs_gen = get_generation(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-	reiserfs_debug(inode-&gt;i_sb, REISERFS_DEBUG_CODE,</div><div class='del'>-		       "reiserquota paste_into_item(): allocating %u id=%u type=%c",</div><div class='del'>-		       pasted_size, inode-&gt;i_uid,</div><div class='del'>-		       key2type(&amp;key-&gt;on_disk_key));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-	retval = dquot_alloc_space_nodirty(inode, pasted_size);</div><div class='del'>-	reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-	if (retval) {</div><div class='del'>-		pathrelse(search_path);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	init_tb_struct(th, &amp;s_paste_balance, th-&gt;t_super, search_path,</div><div class='del'>-		       pasted_size);</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	s_paste_balance.key = key-&gt;on_disk_key;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* DQUOT_* can schedule, must check before the fix_nodes */</div><div class='del'>-	if (fs_changed(fs_gen, inode-&gt;i_sb)) {</div><div class='del'>-		goto search_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((retval =</div><div class='del'>-		fix_nodes(M_PASTE, &amp;s_paste_balance, NULL,</div><div class='del'>-			  body)) == REPEAT_SEARCH) {</div><div class='del'>-search_again:</div><div class='del'>-		/* file system changed while we were in the fix_nodes */</div><div class='del'>-		PROC_INFO_INC(th-&gt;t_super, paste_into_item_restarted);</div><div class='del'>-		retval =</div><div class='del'>-		    search_for_position_by_key(th-&gt;t_super, key,</div><div class='del'>-					       search_path);</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			retval = -EIO;</div><div class='del'>-			goto error_out;</div><div class='del'>-		}</div><div class='del'>-		if (retval == POSITION_FOUND) {</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "PAP-5710",</div><div class='del'>-					 "entry or pasted byte (%K) exists",</div><div class='del'>-					 key);</div><div class='del'>-			retval = -EEXIST;</div><div class='del'>-			goto error_out;</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		check_research_for_paste(search_path, key);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Perform balancing after all resources are collected by fix_nodes,</div><div class='del'>-	 * and accessing them will not risk triggering schedule.</div><div class='del'>-	 */</div><div class='del'>-	if (retval == CARRY_ON) {</div><div class='del'>-		do_balance(&amp;s_paste_balance, NULL /*ih */ , body, M_PASTE);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	retval = (retval == NO_DISK_SPACE) ? -ENOSPC : -EIO;</div><div class='del'>-error_out:</div><div class='del'>-	/* this also releases the path */</div><div class='del'>-	unfix_nodes(&amp;s_paste_balance);</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-	reiserfs_debug(inode-&gt;i_sb, REISERFS_DEBUG_CODE,</div><div class='del'>-		       "reiserquota paste_into_item(): freeing %u id=%u type=%c",</div><div class='del'>-		       pasted_size, inode-&gt;i_uid,</div><div class='del'>-		       key2type(&amp;key-&gt;on_disk_key));</div><div class='del'>-#endif</div><div class='del'>-	depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-	dquot_free_space_nodirty(inode, pasted_size);</div><div class='del'>-	reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Insert new item into the buffer at the path.</div><div class='del'>- * th   - active transaction handle</div><div class='del'>- * path - path to the inserted item</div><div class='del'>- * ih   - pointer to the item header to insert</div><div class='del'>- * body - pointer to the bytes to insert</div><div class='del'>- */</div><div class='del'>-int reiserfs_insert_item(struct reiserfs_transaction_handle *th,</div><div class='del'>-			 struct treepath *path, const struct cpu_key *key,</div><div class='del'>-			 struct item_head *ih, struct inode *inode,</div><div class='del'>-			 const char *body)</div><div class='del'>-{</div><div class='del'>-	struct tree_balance s_ins_balance;</div><div class='del'>-	int retval;</div><div class='del'>-	int fs_gen = 0;</div><div class='del'>-	int quota_bytes = 0;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	if (inode) {		/* Do we count quotas for item? */</div><div class='del'>-		int depth;</div><div class='del'>-		fs_gen = get_generation(inode-&gt;i_sb);</div><div class='del'>-		quota_bytes = ih_item_len(ih);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * hack so the quota code doesn't have to guess</div><div class='del'>-		 * if the file has a tail, links are always tails,</div><div class='del'>-		 * so there's no guessing needed</div><div class='del'>-		 */</div><div class='del'>-		if (!S_ISLNK(inode-&gt;i_mode) &amp;&amp; is_direct_le_ih(ih))</div><div class='del'>-			quota_bytes = inode-&gt;i_sb-&gt;s_blocksize + UNFM_P_SIZE;</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-		reiserfs_debug(inode-&gt;i_sb, REISERFS_DEBUG_CODE,</div><div class='del'>-			       "reiserquota insert_item(): allocating %u id=%u type=%c",</div><div class='del'>-			       quota_bytes, inode-&gt;i_uid, head2type(ih));</div><div class='del'>-#endif</div><div class='del'>-		/*</div><div class='del'>-		 * We can't dirty inode here. It would be immediately</div><div class='del'>-		 * written but appropriate stat item isn't inserted yet...</div><div class='del'>-		 */</div><div class='del'>-		depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-		retval = dquot_alloc_space_nodirty(inode, quota_bytes);</div><div class='del'>-		reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-		if (retval) {</div><div class='del'>-			pathrelse(path);</div><div class='del'>-			return retval;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	init_tb_struct(th, &amp;s_ins_balance, th-&gt;t_super, path,</div><div class='del'>-		       IH_SIZE + ih_item_len(ih));</div><div class='del'>-#ifdef DISPLACE_NEW_PACKING_LOCALITIES</div><div class='del'>-	s_ins_balance.key = key-&gt;on_disk_key;</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * DQUOT_* can schedule, must check to be sure calling</div><div class='del'>-	 * fix_nodes is safe</div><div class='del'>-	 */</div><div class='del'>-	if (inode &amp;&amp; fs_changed(fs_gen, inode-&gt;i_sb)) {</div><div class='del'>-		goto search_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((retval =</div><div class='del'>-		fix_nodes(M_INSERT, &amp;s_ins_balance, ih,</div><div class='del'>-			  body)) == REPEAT_SEARCH) {</div><div class='del'>-search_again:</div><div class='del'>-		/* file system changed while we were in the fix_nodes */</div><div class='del'>-		PROC_INFO_INC(th-&gt;t_super, insert_item_restarted);</div><div class='del'>-		retval = search_item(th-&gt;t_super, key, path);</div><div class='del'>-		if (retval == IO_ERROR) {</div><div class='del'>-			retval = -EIO;</div><div class='del'>-			goto error_out;</div><div class='del'>-		}</div><div class='del'>-		if (retval == ITEM_FOUND) {</div><div class='del'>-			reiserfs_warning(th-&gt;t_super, "PAP-5760",</div><div class='del'>-					 "key %K already exists in the tree",</div><div class='del'>-					 key);</div><div class='del'>-			retval = -EEXIST;</div><div class='del'>-			goto error_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make balancing after all resources will be collected at a time */</div><div class='del'>-	if (retval == CARRY_ON) {</div><div class='del'>-		do_balance(&amp;s_ins_balance, ih, body, M_INSERT);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = (retval == NO_DISK_SPACE) ? -ENOSPC : -EIO;</div><div class='del'>-error_out:</div><div class='del'>-	/* also releases the path */</div><div class='del'>-	unfix_nodes(&amp;s_ins_balance);</div><div class='del'>-#ifdef REISERQUOTA_DEBUG</div><div class='del'>-	if (inode)</div><div class='del'>-		reiserfs_debug(th-&gt;t_super, REISERFS_DEBUG_CODE,</div><div class='del'>-		       "reiserquota insert_item(): freeing %u id=%u type=%c",</div><div class='del'>-		       quota_bytes, inode-&gt;i_uid, head2type(ih));</div><div class='del'>-#endif</div><div class='del'>-	if (inode) {</div><div class='del'>-		int depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-		dquot_free_space_nodirty(inode, quota_bytes);</div><div class='del'>-		reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-	}</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c<br/>deleted file mode 100644<br/>index 67b5510beded..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/super.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/super.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2647 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README</div><div class='del'>- *</div><div class='del'>- * Trivial changes by Alan Cox to add the LFS fixes</div><div class='del'>- *</div><div class='del'>- * Trivial Changes:</div><div class='del'>- * Rights granted to Hans Reiser to redistribute under other terms providing</div><div class='del'>- * he accepts all liability including but not limited to patent, fitness</div><div class='del'>- * for purpose, and direct or indirect claims arising from failure to perform.</div><div class='del'>- *</div><div class='del'>- * NO WARRANTY</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include &lt;linux/exportfs.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-#include &lt;linux/vfs.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='del'>-#include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-struct file_system_type reiserfs_fs_type;</div><div class='del'>-</div><div class='del'>-static const char reiserfs_3_5_magic_string[] = REISERFS_SUPER_MAGIC_STRING;</div><div class='del'>-static const char reiserfs_3_6_magic_string[] = REISER2FS_SUPER_MAGIC_STRING;</div><div class='del'>-static const char reiserfs_jr_magic_string[] = REISER2FS_JR_SUPER_MAGIC_STRING;</div><div class='del'>-</div><div class='del'>-int is_reiserfs_3_5(struct reiserfs_super_block *rs)</div><div class='del'>-{</div><div class='del'>-	return !strncmp(rs-&gt;s_v1.s_magic, reiserfs_3_5_magic_string,</div><div class='del'>-			strlen(reiserfs_3_5_magic_string));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int is_reiserfs_3_6(struct reiserfs_super_block *rs)</div><div class='del'>-{</div><div class='del'>-	return !strncmp(rs-&gt;s_v1.s_magic, reiserfs_3_6_magic_string,</div><div class='del'>-			strlen(reiserfs_3_6_magic_string));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int is_reiserfs_jr(struct reiserfs_super_block *rs)</div><div class='del'>-{</div><div class='del'>-	return !strncmp(rs-&gt;s_v1.s_magic, reiserfs_jr_magic_string,</div><div class='del'>-			strlen(reiserfs_jr_magic_string));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_any_reiserfs_magic_string(struct reiserfs_super_block *rs)</div><div class='del'>-{</div><div class='del'>-	return (is_reiserfs_3_5(rs) || is_reiserfs_3_6(rs) ||</div><div class='del'>-		is_reiserfs_jr(rs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_remount(struct super_block *s, int *flags, char *data);</div><div class='del'>-static int reiserfs_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='del'>-</div><div class='del'>-static int reiserfs_sync_fs(struct super_block *s, int wait)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Writeback quota in non-journalled quota case - journalled quota has</div><div class='del'>-	 * no dirty dquots</div><div class='del'>-	 */</div><div class='del'>-	dquot_writeback_dquots(s, -1);</div><div class='del'>-	reiserfs_write_lock(s);</div><div class='del'>-	if (!journal_begin(&amp;th, s, 1))</div><div class='del'>-		if (!journal_end_sync(&amp;th))</div><div class='del'>-			reiserfs_flush_old_commits(s);</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void flush_old_commits(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sbi;</div><div class='del'>-	struct super_block *s;</div><div class='del'>-</div><div class='del'>-	sbi = container_of(work, struct reiserfs_sb_info, old_work.work);</div><div class='del'>-	s = sbi-&gt;s_journal-&gt;j_work_sb;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We need s_umount for protecting quota writeback. We have to use</div><div class='del'>-	 * trylock as reiserfs_cancel_old_flush() may be waiting for this work</div><div class='del'>-	 * to complete with s_umount held.</div><div class='del'>-	 */</div><div class='del'>-	if (!down_read_trylock(&amp;s-&gt;s_umount)) {</div><div class='del'>-		/* Requeue work if we are not cancelling it */</div><div class='del'>-		spin_lock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-		if (sbi-&gt;work_queued == 1)</div><div class='del'>-			queue_delayed_work(system_long_wq, &amp;sbi-&gt;old_work, HZ);</div><div class='del'>-		spin_unlock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	spin_lock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	/* Avoid clobbering the cancel state... */</div><div class='del'>-	if (sbi-&gt;work_queued == 1)</div><div class='del'>-		sbi-&gt;work_queued = 0;</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-</div><div class='del'>-	reiserfs_sync_fs(s, 1);</div><div class='del'>-	up_read(&amp;s-&gt;s_umount);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_schedule_old_flush(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sbi = REISERFS_SB(s);</div><div class='del'>-	unsigned long delay;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Avoid scheduling flush when sb is being shut down. It can race</div><div class='del'>-	 * with journal shutdown and free still queued delayed work.</div><div class='del'>-	 */</div><div class='del'>-	if (sb_rdonly(s) || !(s-&gt;s_flags &amp; SB_ACTIVE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	if (!sbi-&gt;work_queued) {</div><div class='del'>-		delay = msecs_to_jiffies(dirty_writeback_interval * 10);</div><div class='del'>-		queue_delayed_work(system_long_wq, &amp;sbi-&gt;old_work, delay);</div><div class='del'>-		sbi-&gt;work_queued = 1;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_cancel_old_flush(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sbi = REISERFS_SB(s);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	/* Make sure no new flushes will be queued */</div><div class='del'>-	sbi-&gt;work_queued = 2;</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	cancel_delayed_work_sync(&amp;REISERFS_SB(s)-&gt;old_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_freeze(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-</div><div class='del'>-	reiserfs_cancel_old_flush(s);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(s);</div><div class='del'>-	if (!sb_rdonly(s)) {</div><div class='del'>-		int err = journal_begin(&amp;th, s, 1);</div><div class='del'>-		if (err) {</div><div class='del'>-			reiserfs_block_writes(&amp;th);</div><div class='del'>-		} else {</div><div class='del'>-			reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s),</div><div class='del'>-						     1);</div><div class='del'>-			journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-			reiserfs_block_writes(&amp;th);</div><div class='del'>-			journal_end_sync(&amp;th);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_unfreeze(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_sb_info *sbi = REISERFS_SB(s);</div><div class='del'>-</div><div class='del'>-	reiserfs_allow_writes(s);</div><div class='del'>-	spin_lock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	/* Allow old_work to run again */</div><div class='del'>-	sbi-&gt;work_queued = 0;</div><div class='del'>-	spin_unlock(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern const struct in_core_key MAX_IN_CORE_KEY;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this is used to delete "save link" when there are no items of a</div><div class='del'>- * file it points to. It can either happen if unlink is completed but</div><div class='del'>- * "save unlink" removal, or if file has both unlink and truncate</div><div class='del'>- * pending and as unlink completes first (because key of "save link"</div><div class='del'>- * protecting unlink is bigger that a key lf "save link" which</div><div class='del'>- * protects truncate), so there left no items to make truncate</div><div class='del'>- * completion on</div><div class='del'>- */</div><div class='del'>-static int remove_save_link_only(struct super_block *s,</div><div class='del'>-				 struct reiserfs_key *key, int oid_free)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* we are going to do one balancing */</div><div class='del'>-	err = journal_begin(&amp;th, s, JOURNAL_PER_BALANCE_CNT);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	reiserfs_delete_solid_item(&amp;th, NULL, key);</div><div class='del'>-	if (oid_free)</div><div class='del'>-		/* removals are protected by direct items */</div><div class='del'>-		reiserfs_release_objectid(&amp;th, le32_to_cpu(key-&gt;k_objectid));</div><div class='del'>-</div><div class='del'>-	return journal_end(&amp;th);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-static int reiserfs_quota_on_mount(struct super_block *, int);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Look for uncompleted unlinks and truncates and complete them</div><div class='del'>- *</div><div class='del'>- * Called with superblock write locked.  If quotas are enabled, we have to</div><div class='del'>- * release/retake lest we call dquot_quota_on_mount(), proceed to</div><div class='del'>- * schedule_on_each_cpu() in invalidate_bdev() and deadlock waiting for the per</div><div class='del'>- * cpu worklets to complete flush_async_commits() that in turn wait for the</div><div class='del'>- * superblock write lock.</div><div class='del'>- */</div><div class='del'>-static int finish_unfinished(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct cpu_key max_cpu_key, obj_key;</div><div class='del'>-	struct reiserfs_key save_link_key, last_inode_key;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	struct item_head *ih;</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	int item_pos;</div><div class='del'>-	char *item;</div><div class='del'>-	int done;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	int truncate;</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	int i;</div><div class='del'>-	int ms_active_set;</div><div class='del'>-	int quota_enabled[REISERFS_MAXQUOTAS];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* compose key to look for "save" links */</div><div class='del'>-	max_cpu_key.version = KEY_FORMAT_3_5;</div><div class='del'>-	max_cpu_key.on_disk_key.k_dir_id = ~0U;</div><div class='del'>-	max_cpu_key.on_disk_key.k_objectid = ~0U;</div><div class='del'>-	set_cpu_key_k_offset(&amp;max_cpu_key, ~0U);</div><div class='del'>-	max_cpu_key.key_length = 3;</div><div class='del'>-</div><div class='del'>-	memset(&amp;last_inode_key, 0, sizeof(last_inode_key));</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	/* Needed for iput() to work correctly and not trash data */</div><div class='del'>-	if (s-&gt;s_flags &amp; SB_ACTIVE) {</div><div class='del'>-		ms_active_set = 0;</div><div class='del'>-	} else {</div><div class='del'>-		ms_active_set = 1;</div><div class='del'>-		s-&gt;s_flags |= SB_ACTIVE;</div><div class='del'>-	}</div><div class='del'>-	/* Turn on quotas so that they are updated correctly */</div><div class='del'>-	for (i = 0; i &lt; REISERFS_MAXQUOTAS; i++) {</div><div class='del'>-		quota_enabled[i] = 1;</div><div class='del'>-		if (REISERFS_SB(s)-&gt;s_qf_names[i]) {</div><div class='del'>-			int ret;</div><div class='del'>-</div><div class='del'>-			if (sb_has_quota_active(s, i)) {</div><div class='del'>-				quota_enabled[i] = 0;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			reiserfs_write_unlock(s);</div><div class='del'>-			ret = reiserfs_quota_on_mount(s, i);</div><div class='del'>-			reiserfs_write_lock(s);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				reiserfs_warning(s, "reiserfs-2500",</div><div class='del'>-						 "cannot turn on journaled "</div><div class='del'>-						 "quota: error %d", ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	done = 0;</div><div class='del'>-	REISERFS_SB(s)-&gt;s_is_unlinked_ok = 1;</div><div class='del'>-	while (!retval) {</div><div class='del'>-		int depth;</div><div class='del'>-		retval = search_item(s, &amp;max_cpu_key, &amp;path);</div><div class='del'>-		if (retval != ITEM_NOT_FOUND) {</div><div class='del'>-			reiserfs_error(s, "vs-2140",</div><div class='del'>-				       "search_by_key returned %d", retval);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bh = get_last_bh(&amp;path);</div><div class='del'>-		item_pos = get_item_pos(&amp;path);</div><div class='del'>-		if (item_pos != B_NR_ITEMS(bh)) {</div><div class='del'>-			reiserfs_warning(s, "vs-2060",</div><div class='del'>-					 "wrong position found");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		item_pos--;</div><div class='del'>-		ih = item_head(bh, item_pos);</div><div class='del'>-</div><div class='del'>-		if (le32_to_cpu(ih-&gt;ih_key.k_dir_id) != MAX_KEY_OBJECTID)</div><div class='del'>-			/* there are no "save" links anymore */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		save_link_key = ih-&gt;ih_key;</div><div class='del'>-		if (is_indirect_le_ih(ih))</div><div class='del'>-			truncate = 1;</div><div class='del'>-		else</div><div class='del'>-			truncate = 0;</div><div class='del'>-</div><div class='del'>-		/* reiserfs_iget needs k_dirid and k_objectid only */</div><div class='del'>-		item = ih_item_body(bh, ih);</div><div class='del'>-		obj_key.on_disk_key.k_dir_id = le32_to_cpu(*(__le32 *) item);</div><div class='del'>-		obj_key.on_disk_key.k_objectid =</div><div class='del'>-		    le32_to_cpu(ih-&gt;ih_key.k_objectid);</div><div class='del'>-		obj_key.on_disk_key.k_offset = 0;</div><div class='del'>-		obj_key.on_disk_key.k_type = 0;</div><div class='del'>-</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-</div><div class='del'>-		inode = reiserfs_iget(s, &amp;obj_key);</div><div class='del'>-		if (IS_ERR_OR_NULL(inode)) {</div><div class='del'>-			/*</div><div class='del'>-			 * the unlink almost completed, it just did not</div><div class='del'>-			 * manage to remove "save" link and release objectid</div><div class='del'>-			 */</div><div class='del'>-			reiserfs_warning(s, "vs-2180", "iget failed for %K",</div><div class='del'>-					 &amp;obj_key);</div><div class='del'>-			retval = remove_save_link_only(s, &amp;save_link_key, 1);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!truncate &amp;&amp; inode-&gt;i_nlink) {</div><div class='del'>-			/* file is not unlinked */</div><div class='del'>-			reiserfs_warning(s, "vs-2185",</div><div class='del'>-					 "file %K is not unlinked",</div><div class='del'>-					 &amp;obj_key);</div><div class='del'>-			retval = remove_save_link_only(s, &amp;save_link_key, 0);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		depth = reiserfs_write_unlock_nested(inode-&gt;i_sb);</div><div class='del'>-		dquot_initialize(inode);</div><div class='del'>-		reiserfs_write_lock_nested(inode-&gt;i_sb, depth);</div><div class='del'>-</div><div class='del'>-		if (truncate &amp;&amp; S_ISDIR(inode-&gt;i_mode)) {</div><div class='del'>-			/*</div><div class='del'>-			 * We got a truncate request for a dir which</div><div class='del'>-			 * is impossible.  The only imaginable way is to</div><div class='del'>-			 * execute unfinished truncate request then boot</div><div class='del'>-			 * into old kernel, remove the file and create dir</div><div class='del'>-			 * with the same key.</div><div class='del'>-			 */</div><div class='del'>-			reiserfs_warning(s, "green-2101",</div><div class='del'>-					 "impossible truncate on a "</div><div class='del'>-					 "directory %k. Please report",</div><div class='del'>-					 INODE_PKEY(inode));</div><div class='del'>-			retval = remove_save_link_only(s, &amp;save_link_key, 0);</div><div class='del'>-			truncate = 0;</div><div class='del'>-			iput(inode);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (truncate) {</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags |=</div><div class='del'>-			    i_link_saved_truncate_mask;</div><div class='del'>-			/*</div><div class='del'>-			 * not completed truncate found. New size was</div><div class='del'>-			 * committed together with "save" link</div><div class='del'>-			 */</div><div class='del'>-			reiserfs_info(s, "Truncating %k to %lld ..",</div><div class='del'>-				      INODE_PKEY(inode), inode-&gt;i_size);</div><div class='del'>-</div><div class='del'>-			/* don't update modification time */</div><div class='del'>-			reiserfs_truncate_file(inode, 0);</div><div class='del'>-</div><div class='del'>-			retval = remove_save_link(inode, truncate);</div><div class='del'>-		} else {</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags |= i_link_saved_unlink_mask;</div><div class='del'>-			/* not completed unlink (rmdir) found */</div><div class='del'>-			reiserfs_info(s, "Removing %k..", INODE_PKEY(inode));</div><div class='del'>-			if (memcmp(&amp;last_inode_key, INODE_PKEY(inode),</div><div class='del'>-					sizeof(last_inode_key))){</div><div class='del'>-				last_inode_key = *INODE_PKEY(inode);</div><div class='del'>-				/* removal gets completed in iput */</div><div class='del'>-				retval = 0;</div><div class='del'>-			} else {</div><div class='del'>-				reiserfs_warning(s, "super-2189", "Dead loop "</div><div class='del'>-						 "in finish_unfinished "</div><div class='del'>-						 "detected, just remove "</div><div class='del'>-						 "save link\n");</div><div class='del'>-				retval = remove_save_link_only(s,</div><div class='del'>-							&amp;save_link_key, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iput(inode);</div><div class='del'>-		printk("done\n");</div><div class='del'>-		done++;</div><div class='del'>-	}</div><div class='del'>-	REISERFS_SB(s)-&gt;s_is_unlinked_ok = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	/* Turn quotas off */</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-	for (i = 0; i &lt; REISERFS_MAXQUOTAS; i++) {</div><div class='del'>-		if (sb_dqopt(s)-&gt;files[i] &amp;&amp; quota_enabled[i])</div><div class='del'>-			dquot_quota_off(s, i);</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_lock(s);</div><div class='del'>-	if (ms_active_set)</div><div class='del'>-		/* Restore the flag back */</div><div class='del'>-		s-&gt;s_flags &amp;= ~SB_ACTIVE;</div><div class='del'>-#endif</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-	if (done)</div><div class='del'>-		reiserfs_info(s, "There were %d uncompleted unlinks/truncates. "</div><div class='del'>-			      "Completed\n", done);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * to protect file being unlinked from getting lost we "safe" link files</div><div class='del'>- * being unlinked. This link will be deleted in the same transaction with last</div><div class='del'>- * item of file. mounting the filesystem we scan all these links and remove</div><div class='del'>- * files which almost got lost</div><div class='del'>- */</div><div class='del'>-void add_save_link(struct reiserfs_transaction_handle *th,</div><div class='del'>-		   struct inode *inode, int truncate)</div><div class='del'>-{</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	int retval;</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	struct item_head ih;</div><div class='del'>-	__le32 link;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	/* file can only get one "save link" of each kind */</div><div class='del'>-	RFALSE(truncate &amp;&amp;</div><div class='del'>-	       (REISERFS_I(inode)-&gt;i_flags &amp; i_link_saved_truncate_mask),</div><div class='del'>-	       "saved link already exists for truncated inode %lx",</div><div class='del'>-	       (long)inode-&gt;i_ino);</div><div class='del'>-	RFALSE(!truncate &amp;&amp;</div><div class='del'>-	       (REISERFS_I(inode)-&gt;i_flags &amp; i_link_saved_unlink_mask),</div><div class='del'>-	       "saved link already exists for unlinked inode %lx",</div><div class='del'>-	       (long)inode-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	/* setup key of "save" link */</div><div class='del'>-	key.version = KEY_FORMAT_3_5;</div><div class='del'>-	key.on_disk_key.k_dir_id = MAX_KEY_OBJECTID;</div><div class='del'>-	key.on_disk_key.k_objectid = inode-&gt;i_ino;</div><div class='del'>-	if (!truncate) {</div><div class='del'>-		/* unlink, rmdir, rename */</div><div class='del'>-		set_cpu_key_k_offset(&amp;key, 1 + inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-		set_cpu_key_k_type(&amp;key, TYPE_DIRECT);</div><div class='del'>-</div><div class='del'>-		/* item head of "safe" link */</div><div class='del'>-		make_le_item_head(&amp;ih, &amp;key, key.version,</div><div class='del'>-				  1 + inode-&gt;i_sb-&gt;s_blocksize, TYPE_DIRECT,</div><div class='del'>-				  4 /*length */ , 0xffff /*free space */ );</div><div class='del'>-	} else {</div><div class='del'>-		/* truncate */</div><div class='del'>-		if (S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-			reiserfs_warning(inode-&gt;i_sb, "green-2102",</div><div class='del'>-					 "Adding a truncate savelink for "</div><div class='del'>-					 "a directory %k! Please report",</div><div class='del'>-					 INODE_PKEY(inode));</div><div class='del'>-		set_cpu_key_k_offset(&amp;key, 1);</div><div class='del'>-		set_cpu_key_k_type(&amp;key, TYPE_INDIRECT);</div><div class='del'>-</div><div class='del'>-		/* item head of "safe" link */</div><div class='del'>-		make_le_item_head(&amp;ih, &amp;key, key.version, 1, TYPE_INDIRECT,</div><div class='del'>-				  4 /*length */ , 0 /*free space */ );</div><div class='del'>-	}</div><div class='del'>-	key.key_length = 3;</div><div class='del'>-</div><div class='del'>-	/* look for its place in the tree */</div><div class='del'>-	retval = search_item(inode-&gt;i_sb, &amp;key, &amp;path);</div><div class='del'>-	if (retval != ITEM_NOT_FOUND) {</div><div class='del'>-		if (retval != -ENOSPC)</div><div class='del'>-			reiserfs_error(inode-&gt;i_sb, "vs-2100",</div><div class='del'>-				       "search_by_key (%K) returned %d", &amp;key,</div><div class='del'>-				       retval);</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* body of "save" link */</div><div class='del'>-	link = INODE_PKEY(inode)-&gt;k_dir_id;</div><div class='del'>-</div><div class='del'>-	/* put "save" link into tree, don't charge quota to anyone */</div><div class='del'>-	retval =</div><div class='del'>-	    reiserfs_insert_item(th, &amp;path, &amp;key, &amp;ih, NULL, (char *)&amp;link);</div><div class='del'>-	if (retval) {</div><div class='del'>-		if (retval != -ENOSPC)</div><div class='del'>-			reiserfs_error(inode-&gt;i_sb, "vs-2120",</div><div class='del'>-				       "insert_item returned %d", retval);</div><div class='del'>-	} else {</div><div class='del'>-		if (truncate)</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags |=</div><div class='del'>-			    i_link_saved_truncate_mask;</div><div class='del'>-		else</div><div class='del'>-			REISERFS_I(inode)-&gt;i_flags |= i_link_saved_unlink_mask;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this opens transaction unlike add_save_link */</div><div class='del'>-int remove_save_link(struct inode *inode, int truncate)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	struct reiserfs_key key;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* we are going to do one balancing only */</div><div class='del'>-	err = journal_begin(&amp;th, inode-&gt;i_sb, JOURNAL_PER_BALANCE_CNT);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* setup key of "save" link */</div><div class='del'>-	key.k_dir_id = cpu_to_le32(MAX_KEY_OBJECTID);</div><div class='del'>-	key.k_objectid = INODE_PKEY(inode)-&gt;k_objectid;</div><div class='del'>-	if (!truncate) {</div><div class='del'>-		/* unlink, rmdir, rename */</div><div class='del'>-		set_le_key_k_offset(KEY_FORMAT_3_5, &amp;key,</div><div class='del'>-				    1 + inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-		set_le_key_k_type(KEY_FORMAT_3_5, &amp;key, TYPE_DIRECT);</div><div class='del'>-	} else {</div><div class='del'>-		/* truncate */</div><div class='del'>-		set_le_key_k_offset(KEY_FORMAT_3_5, &amp;key, 1);</div><div class='del'>-		set_le_key_k_type(KEY_FORMAT_3_5, &amp;key, TYPE_INDIRECT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((truncate &amp;&amp;</div><div class='del'>-	     (REISERFS_I(inode)-&gt;i_flags &amp; i_link_saved_truncate_mask)) ||</div><div class='del'>-	    (!truncate &amp;&amp;</div><div class='del'>-	     (REISERFS_I(inode)-&gt;i_flags &amp; i_link_saved_unlink_mask)))</div><div class='del'>-		/* don't take quota bytes from anywhere */</div><div class='del'>-		reiserfs_delete_solid_item(&amp;th, NULL, &amp;key);</div><div class='del'>-	if (!truncate) {</div><div class='del'>-		reiserfs_release_objectid(&amp;th, inode-&gt;i_ino);</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags &amp;= ~i_link_saved_unlink_mask;</div><div class='del'>-	} else</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags &amp;= ~i_link_saved_truncate_mask;</div><div class='del'>-</div><div class='del'>-	return journal_end(&amp;th);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reiserfs_kill_sb(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	if (REISERFS_SB(s)) {</div><div class='del'>-		reiserfs_proc_info_done(s);</div><div class='del'>-		/*</div><div class='del'>-		 * Force any pending inode evictions to occur now. Any</div><div class='del'>-		 * inodes to be removed that have extended attributes</div><div class='del'>-		 * associated with them need to clean them up before</div><div class='del'>-		 * we can release the extended attribute root dentries.</div><div class='del'>-		 * shrink_dcache_for_umount will BUG if we don't release</div><div class='del'>-		 * those before it's called so -&gt;put_super is too late.</div><div class='del'>-		 */</div><div class='del'>-		shrink_dcache_sb(s);</div><div class='del'>-</div><div class='del'>-		dput(REISERFS_SB(s)-&gt;xattr_root);</div><div class='del'>-		REISERFS_SB(s)-&gt;xattr_root = NULL;</div><div class='del'>-		dput(REISERFS_SB(s)-&gt;priv_root);</div><div class='del'>-		REISERFS_SB(s)-&gt;priv_root = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kill_block_super(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-static int reiserfs_quota_off(struct super_block *sb, int type);</div><div class='del'>-</div><div class='del'>-static void reiserfs_quota_off_umount(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	int type;</div><div class='del'>-</div><div class='del'>-	for (type = 0; type &lt; REISERFS_MAXQUOTAS; type++)</div><div class='del'>-		reiserfs_quota_off(s, type);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void reiserfs_quota_off_umount(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void reiserfs_put_super(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	th.t_trans_id = 0;</div><div class='del'>-</div><div class='del'>-	reiserfs_quota_off_umount(s);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(s);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * change file system state to current state if it was mounted</div><div class='del'>-	 * with read-write permissions</div><div class='del'>-	 */</div><div class='del'>-	if (!sb_rdonly(s)) {</div><div class='del'>-		if (!journal_begin(&amp;th, s, 10)) {</div><div class='del'>-			reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s),</div><div class='del'>-						     1);</div><div class='del'>-			set_sb_umount_state(SB_DISK_SUPER_BLOCK(s),</div><div class='del'>-					    REISERFS_SB(s)-&gt;s_mount_state);</div><div class='del'>-			journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * note, journal_release checks for readonly mount, and can</div><div class='del'>-	 * decide not to do a journal_end</div><div class='del'>-	 */</div><div class='del'>-	journal_release(&amp;th, s);</div><div class='del'>-</div><div class='del'>-	reiserfs_free_bitmap_cache(s);</div><div class='del'>-</div><div class='del'>-	brelse(SB_BUFFER_WITH_SB(s));</div><div class='del'>-</div><div class='del'>-	print_statistics(s);</div><div class='del'>-</div><div class='del'>-	if (REISERFS_SB(s)-&gt;reserved_blocks != 0) {</div><div class='del'>-		reiserfs_warning(s, "green-2005", "reserved blocks left %d",</div><div class='del'>-				 REISERFS_SB(s)-&gt;reserved_blocks);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-	mutex_destroy(&amp;REISERFS_SB(s)-&gt;lock);</div><div class='del'>-	destroy_workqueue(REISERFS_SB(s)-&gt;commit_wq);</div><div class='del'>-	kfree(REISERFS_SB(s)-&gt;s_jdev);</div><div class='del'>-	kfree(s-&gt;s_fs_info);</div><div class='del'>-	s-&gt;s_fs_info = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct kmem_cache *reiserfs_inode_cachep;</div><div class='del'>-</div><div class='del'>-static struct inode *reiserfs_alloc_inode(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_inode_info *ei;</div><div class='del'>-	ei = alloc_inode_sb(sb, reiserfs_inode_cachep, GFP_KERNEL);</div><div class='del'>-	if (!ei)</div><div class='del'>-		return NULL;</div><div class='del'>-	atomic_set(&amp;ei-&gt;openers, 0);</div><div class='del'>-	mutex_init(&amp;ei-&gt;tailpack);</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	memset(&amp;ei-&gt;i_dquot, 0, sizeof(ei-&gt;i_dquot));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return &amp;ei-&gt;vfs_inode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reiserfs_free_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_free(reiserfs_inode_cachep, REISERFS_I(inode));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_once(void *foo)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_inode_info *ei = (struct reiserfs_inode_info *)foo;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;ei-&gt;i_prealloc_list);</div><div class='del'>-	inode_init_once(&amp;ei-&gt;vfs_inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_inodecache(void)</div><div class='del'>-{</div><div class='del'>-	reiserfs_inode_cachep = kmem_cache_create("reiser_inode_cache",</div><div class='del'>-						  sizeof(struct</div><div class='del'>-							 reiserfs_inode_info),</div><div class='del'>-						  0, (SLAB_RECLAIM_ACCOUNT|</div><div class='del'>-						      SLAB_MEM_SPREAD|</div><div class='del'>-						      SLAB_ACCOUNT),</div><div class='del'>-						  init_once);</div><div class='del'>-	if (reiserfs_inode_cachep == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void destroy_inodecache(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure all delayed rcu free inodes are flushed before we</div><div class='del'>-	 * destroy cache.</div><div class='del'>-	 */</div><div class='del'>-	rcu_barrier();</div><div class='del'>-	kmem_cache_destroy(reiserfs_inode_cachep);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* we don't mark inodes dirty, we just log them */</div><div class='del'>-static void reiserfs_dirty_inode(struct inode *inode, int flags)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (sb_rdonly(inode-&gt;i_sb)) {</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "clm-6006",</div><div class='del'>-				 "writing inode %lu on readonly FS",</div><div class='del'>-				 inode-&gt;i_ino);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this is really only used for atime updates, so they don't have</div><div class='del'>-	 * to be included in O_SYNC or fsync</div><div class='del'>-	 */</div><div class='del'>-	err = journal_begin(&amp;th, inode-&gt;i_sb, 1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	reiserfs_update_sd(&amp;th, inode);</div><div class='del'>-	journal_end(&amp;th);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_show_options(struct seq_file *seq, struct dentry *root)</div><div class='del'>-{</div><div class='del'>-	struct super_block *s = root-&gt;d_sb;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	long opts = REISERFS_SB(s)-&gt;s_mount_opt;</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_LARGETAIL))</div><div class='del'>-		seq_puts(seq, ",tails=on");</div><div class='del'>-	else if (!(opts &amp; (1 &lt;&lt; REISERFS_SMALLTAIL)))</div><div class='del'>-		seq_puts(seq, ",notail");</div><div class='del'>-	/* tails=small is default so we don't show it */</div><div class='del'>-</div><div class='del'>-	if (!(opts &amp; (1 &lt;&lt; REISERFS_BARRIER_FLUSH)))</div><div class='del'>-		seq_puts(seq, ",barrier=none");</div><div class='del'>-	/* barrier=flush is default so we don't show it */</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_ERROR_CONTINUE))</div><div class='del'>-		seq_puts(seq, ",errors=continue");</div><div class='del'>-	else if (opts &amp; (1 &lt;&lt; REISERFS_ERROR_PANIC))</div><div class='del'>-		seq_puts(seq, ",errors=panic");</div><div class='del'>-	/* errors=ro is default so we don't show it */</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_DATA_LOG))</div><div class='del'>-		seq_puts(seq, ",data=journal");</div><div class='del'>-	else if (opts &amp; (1 &lt;&lt; REISERFS_DATA_WRITEBACK))</div><div class='del'>-		seq_puts(seq, ",data=writeback");</div><div class='del'>-	/* data=ordered is default so we don't show it */</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_ATTRS))</div><div class='del'>-		seq_puts(seq, ",attrs");</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_XATTRS_USER))</div><div class='del'>-		seq_puts(seq, ",user_xattr");</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_EXPOSE_PRIVROOT))</div><div class='del'>-		seq_puts(seq, ",expose_privroot");</div><div class='del'>-</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_POSIXACL))</div><div class='del'>-		seq_puts(seq, ",acl");</div><div class='del'>-</div><div class='del'>-	if (REISERFS_SB(s)-&gt;s_jdev)</div><div class='del'>-		seq_show_option(seq, "jdev", REISERFS_SB(s)-&gt;s_jdev);</div><div class='del'>-</div><div class='del'>-	if (journal-&gt;j_max_commit_age != journal-&gt;j_default_max_commit_age)</div><div class='del'>-		seq_printf(seq, ",commit=%d", journal-&gt;j_max_commit_age);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	if (REISERFS_SB(s)-&gt;s_qf_names[USRQUOTA])</div><div class='del'>-		seq_show_option(seq, "usrjquota",</div><div class='del'>-				REISERFS_SB(s)-&gt;s_qf_names[USRQUOTA]);</div><div class='del'>-	else if (opts &amp; (1 &lt;&lt; REISERFS_USRQUOTA))</div><div class='del'>-		seq_puts(seq, ",usrquota");</div><div class='del'>-	if (REISERFS_SB(s)-&gt;s_qf_names[GRPQUOTA])</div><div class='del'>-		seq_show_option(seq, "grpjquota",</div><div class='del'>-				REISERFS_SB(s)-&gt;s_qf_names[GRPQUOTA]);</div><div class='del'>-	else if (opts &amp; (1 &lt;&lt; REISERFS_GRPQUOTA))</div><div class='del'>-		seq_puts(seq, ",grpquota");</div><div class='del'>-	if (REISERFS_SB(s)-&gt;s_jquota_fmt) {</div><div class='del'>-		if (REISERFS_SB(s)-&gt;s_jquota_fmt == QFMT_VFS_OLD)</div><div class='del'>-			seq_puts(seq, ",jqfmt=vfsold");</div><div class='del'>-		else if (REISERFS_SB(s)-&gt;s_jquota_fmt == QFMT_VFS_V0)</div><div class='del'>-			seq_puts(seq, ",jqfmt=vfsv0");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Block allocator options */</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_NO_BORDER))</div><div class='del'>-		seq_puts(seq, ",block-allocator=noborder");</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_NO_UNHASHED_RELOCATION))</div><div class='del'>-		seq_puts(seq, ",block-allocator=no_unhashed_relocation");</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_HASHED_RELOCATION))</div><div class='del'>-		seq_puts(seq, ",block-allocator=hashed_relocation");</div><div class='del'>-	if (opts &amp; (1 &lt;&lt; REISERFS_TEST4))</div><div class='del'>-		seq_puts(seq, ",block-allocator=test4");</div><div class='del'>-	show_alloc_options(seq, s);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-static ssize_t reiserfs_quota_write(struct super_block *, int, const char *,</div><div class='del'>-				    size_t, loff_t);</div><div class='del'>-static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,</div><div class='del'>-				   loff_t);</div><div class='del'>-</div><div class='del'>-static struct dquot **reiserfs_get_dquots(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	return REISERFS_I(inode)-&gt;i_dquot;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct super_operations reiserfs_sops = {</div><div class='del'>-	.alloc_inode = reiserfs_alloc_inode,</div><div class='del'>-	.free_inode = reiserfs_free_inode,</div><div class='del'>-	.write_inode = reiserfs_write_inode,</div><div class='del'>-	.dirty_inode = reiserfs_dirty_inode,</div><div class='del'>-	.evict_inode = reiserfs_evict_inode,</div><div class='del'>-	.put_super = reiserfs_put_super,</div><div class='del'>-	.sync_fs = reiserfs_sync_fs,</div><div class='del'>-	.freeze_fs = reiserfs_freeze,</div><div class='del'>-	.unfreeze_fs = reiserfs_unfreeze,</div><div class='del'>-	.statfs = reiserfs_statfs,</div><div class='del'>-	.remount_fs = reiserfs_remount,</div><div class='del'>-	.show_options = reiserfs_show_options,</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	.quota_read = reiserfs_quota_read,</div><div class='del'>-	.quota_write = reiserfs_quota_write,</div><div class='del'>-	.get_dquots = reiserfs_get_dquots,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-#define QTYPE2NAME(t) ((t)==USRQUOTA?"user":"group")</div><div class='del'>-</div><div class='del'>-static int reiserfs_write_dquot(struct dquot *);</div><div class='del'>-static int reiserfs_acquire_dquot(struct dquot *);</div><div class='del'>-static int reiserfs_release_dquot(struct dquot *);</div><div class='del'>-static int reiserfs_mark_dquot_dirty(struct dquot *);</div><div class='del'>-static int reiserfs_write_info(struct super_block *, int);</div><div class='del'>-static int reiserfs_quota_on(struct super_block *, int, int, const struct path *);</div><div class='del'>-</div><div class='del'>-static const struct dquot_operations reiserfs_quota_operations = {</div><div class='del'>-	.write_dquot = reiserfs_write_dquot,</div><div class='del'>-	.acquire_dquot = reiserfs_acquire_dquot,</div><div class='del'>-	.release_dquot = reiserfs_release_dquot,</div><div class='del'>-	.mark_dirty = reiserfs_mark_dquot_dirty,</div><div class='del'>-	.write_info = reiserfs_write_info,</div><div class='del'>-	.alloc_dquot	= dquot_alloc,</div><div class='del'>-	.destroy_dquot	= dquot_destroy,</div><div class='del'>-	.get_next_id	= dquot_get_next_id,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct quotactl_ops reiserfs_qctl_operations = {</div><div class='del'>-	.quota_on = reiserfs_quota_on,</div><div class='del'>-	.quota_off = reiserfs_quota_off,</div><div class='del'>-	.quota_sync = dquot_quota_sync,</div><div class='del'>-	.get_state = dquot_get_state,</div><div class='del'>-	.set_info = dquot_set_dqinfo,</div><div class='del'>-	.get_dqblk = dquot_get_dqblk,</div><div class='del'>-	.set_dqblk = dquot_set_dqblk,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const struct export_operations reiserfs_export_ops = {</div><div class='del'>-	.encode_fh = reiserfs_encode_fh,</div><div class='del'>-	.fh_to_dentry = reiserfs_fh_to_dentry,</div><div class='del'>-	.fh_to_parent = reiserfs_fh_to_parent,</div><div class='del'>-	.get_parent = reiserfs_get_parent,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this struct is used in reiserfs_getopt () for containing the value for</div><div class='del'>- * those mount options that have values rather than being toggles.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *value;</div><div class='del'>-	/*</div><div class='del'>-	 * bitmask which is to set on mount_options bitmask</div><div class='del'>-	 * when this value is found, 0 is no bits are to be changed.</div><div class='del'>-	 */</div><div class='del'>-	int setmask;</div><div class='del'>-	/*</div><div class='del'>-	 * bitmask which is to clear on mount_options bitmask</div><div class='del'>-	 * when this value is found, 0 is no bits are to be changed.</div><div class='del'>-	 * This is applied BEFORE setmask</div><div class='del'>-	 */</div><div class='del'>-	int clrmask;</div><div class='del'>-} arg_desc_t;</div><div class='del'>-</div><div class='del'>-/* Set this bit in arg_required to allow empty arguments */</div><div class='del'>-#define REISERFS_OPT_ALLOWEMPTY 31</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this struct is used in reiserfs_getopt() for describing the</div><div class='del'>- * set of reiserfs mount options</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *option_name;</div><div class='del'>-</div><div class='del'>-	/* 0 if argument is not required, not 0 otherwise */</div><div class='del'>-	int arg_required;</div><div class='del'>-</div><div class='del'>-	/* list of values accepted by an option */</div><div class='del'>-	const arg_desc_t *values;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * bitmask which is to set on mount_options bitmask</div><div class='del'>-	 * when this value is found, 0 is no bits are to be changed.</div><div class='del'>-	 */</div><div class='del'>-	int setmask;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * bitmask which is to clear on mount_options bitmask</div><div class='del'>-	 * when this value is found, 0 is no bits are to be changed.</div><div class='del'>-	 * This is applied BEFORE setmask</div><div class='del'>-	 */</div><div class='del'>-	int clrmask;</div><div class='del'>-} opt_desc_t;</div><div class='del'>-</div><div class='del'>-/* possible values for -o data= */</div><div class='del'>-static const arg_desc_t logging_mode[] = {</div><div class='del'>-	{"ordered", 1 &lt;&lt; REISERFS_DATA_ORDERED,</div><div class='del'>-	 (1 &lt;&lt; REISERFS_DATA_LOG | 1 &lt;&lt; REISERFS_DATA_WRITEBACK)},</div><div class='del'>-	{"journal", 1 &lt;&lt; REISERFS_DATA_LOG,</div><div class='del'>-	 (1 &lt;&lt; REISERFS_DATA_ORDERED | 1 &lt;&lt; REISERFS_DATA_WRITEBACK)},</div><div class='del'>-	{"writeback", 1 &lt;&lt; REISERFS_DATA_WRITEBACK,</div><div class='del'>-	 (1 &lt;&lt; REISERFS_DATA_ORDERED | 1 &lt;&lt; REISERFS_DATA_LOG)},</div><div class='del'>-	{.value = NULL}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* possible values for -o barrier= */</div><div class='del'>-static const arg_desc_t barrier_mode[] = {</div><div class='del'>-	{"none", 1 &lt;&lt; REISERFS_BARRIER_NONE, 1 &lt;&lt; REISERFS_BARRIER_FLUSH},</div><div class='del'>-	{"flush", 1 &lt;&lt; REISERFS_BARRIER_FLUSH, 1 &lt;&lt; REISERFS_BARRIER_NONE},</div><div class='del'>-	{.value = NULL}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * possible values for "-o block-allocator=" and bits which are to be set in</div><div class='del'>- * s_mount_opt of reiserfs specific part of in-core super block</div><div class='del'>- */</div><div class='del'>-static const arg_desc_t balloc[] = {</div><div class='del'>-	{"noborder", 1 &lt;&lt; REISERFS_NO_BORDER, 0},</div><div class='del'>-	{"border", 0, 1 &lt;&lt; REISERFS_NO_BORDER},</div><div class='del'>-	{"no_unhashed_relocation", 1 &lt;&lt; REISERFS_NO_UNHASHED_RELOCATION, 0},</div><div class='del'>-	{"hashed_relocation", 1 &lt;&lt; REISERFS_HASHED_RELOCATION, 0},</div><div class='del'>-	{"test4", 1 &lt;&lt; REISERFS_TEST4, 0},</div><div class='del'>-	{"notest4", 0, 1 &lt;&lt; REISERFS_TEST4},</div><div class='del'>-	{NULL, 0, 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const arg_desc_t tails[] = {</div><div class='del'>-	{"on", 1 &lt;&lt; REISERFS_LARGETAIL, 1 &lt;&lt; REISERFS_SMALLTAIL},</div><div class='del'>-	{"off", 0, (1 &lt;&lt; REISERFS_LARGETAIL) | (1 &lt;&lt; REISERFS_SMALLTAIL)},</div><div class='del'>-	{"small", 1 &lt;&lt; REISERFS_SMALLTAIL, 1 &lt;&lt; REISERFS_LARGETAIL},</div><div class='del'>-	{NULL, 0, 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const arg_desc_t error_actions[] = {</div><div class='del'>-	{"panic", 1 &lt;&lt; REISERFS_ERROR_PANIC,</div><div class='del'>-	 (1 &lt;&lt; REISERFS_ERROR_RO | 1 &lt;&lt; REISERFS_ERROR_CONTINUE)},</div><div class='del'>-	{"ro-remount", 1 &lt;&lt; REISERFS_ERROR_RO,</div><div class='del'>-	 (1 &lt;&lt; REISERFS_ERROR_PANIC | 1 &lt;&lt; REISERFS_ERROR_CONTINUE)},</div><div class='del'>-#ifdef REISERFS_JOURNAL_ERROR_ALLOWS_NO_LOG</div><div class='del'>-	{"continue", 1 &lt;&lt; REISERFS_ERROR_CONTINUE,</div><div class='del'>-	 (1 &lt;&lt; REISERFS_ERROR_PANIC | 1 &lt;&lt; REISERFS_ERROR_RO)},</div><div class='del'>-#endif</div><div class='del'>-	{NULL, 0, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * proceed only one option from a list *cur - string containing of mount</div><div class='del'>- * options</div><div class='del'>- * opts - array of options which are accepted</div><div class='del'>- * opt_arg - if option is found and requires an argument and if it is specifed</div><div class='del'>- * in the input - pointer to the argument is stored here</div><div class='del'>- * bit_flags - if option requires to set a certain bit - it is set here</div><div class='del'>- * return -1 if unknown option is found, opt-&gt;arg_required otherwise</div><div class='del'>- */</div><div class='del'>-static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,</div><div class='del'>-			   char **opt_arg, unsigned long *bit_flags)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	/*</div><div class='del'>-	 * foo=bar,</div><div class='del'>-	 * ^   ^  ^</div><div class='del'>-	 * |   |  +-- option_end</div><div class='del'>-	 * |   +-- arg_start</div><div class='del'>-	 * +-- option_start</div><div class='del'>-	 */</div><div class='del'>-	const opt_desc_t *opt;</div><div class='del'>-	const arg_desc_t *arg;</div><div class='del'>-</div><div class='del'>-	p = *cur;</div><div class='del'>-</div><div class='del'>-	/* assume argument cannot contain commas */</div><div class='del'>-	*cur = strchr(p, ',');</div><div class='del'>-	if (*cur) {</div><div class='del'>-		*(*cur) = '\0';</div><div class='del'>-		(*cur)++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strncmp(p, "alloc=", 6)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Ugly special case, probably we should redo options</div><div class='del'>-		 * parser so that it can understand several arguments for</div><div class='del'>-		 * some options, also so that it can fill several bitfields</div><div class='del'>-		 * with option values.</div><div class='del'>-		 */</div><div class='del'>-		if (reiserfs_parse_alloc_options(s, p + 6)) {</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* for every option in the list */</div><div class='del'>-	for (opt = opts; opt-&gt;option_name; opt++) {</div><div class='del'>-		if (!strncmp(p, opt-&gt;option_name, strlen(opt-&gt;option_name))) {</div><div class='del'>-			if (bit_flags) {</div><div class='del'>-				if (opt-&gt;clrmask ==</div><div class='del'>-				    (1 &lt;&lt; REISERFS_UNSUPPORTED_OPT))</div><div class='del'>-					reiserfs_warning(s, "super-6500",</div><div class='del'>-							 "%s not supported.\n",</div><div class='del'>-							 p);</div><div class='del'>-				else</div><div class='del'>-					*bit_flags &amp;= ~opt-&gt;clrmask;</div><div class='del'>-				if (opt-&gt;setmask ==</div><div class='del'>-				    (1 &lt;&lt; REISERFS_UNSUPPORTED_OPT))</div><div class='del'>-					reiserfs_warning(s, "super-6501",</div><div class='del'>-							 "%s not supported.\n",</div><div class='del'>-							 p);</div><div class='del'>-				else</div><div class='del'>-					*bit_flags |= opt-&gt;setmask;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!opt-&gt;option_name) {</div><div class='del'>-		reiserfs_warning(s, "super-6502",</div><div class='del'>-				 "unknown mount option \"%s\"", p);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p += strlen(opt-&gt;option_name);</div><div class='del'>-	switch (*p) {</div><div class='del'>-	case '=':</div><div class='del'>-		if (!opt-&gt;arg_required) {</div><div class='del'>-			reiserfs_warning(s, "super-6503",</div><div class='del'>-					 "the option \"%s\" does not "</div><div class='del'>-					 "require an argument\n",</div><div class='del'>-					 opt-&gt;option_name);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='del'>-		if (opt-&gt;arg_required) {</div><div class='del'>-			reiserfs_warning(s, "super-6504",</div><div class='del'>-					 "the option \"%s\" requires an "</div><div class='del'>-					 "argument\n", opt-&gt;option_name);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		reiserfs_warning(s, "super-6505",</div><div class='del'>-				 "head of option \"%s\" is only correct\n",</div><div class='del'>-				 opt-&gt;option_name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * move to the argument, or to next option if argument is not</div><div class='del'>-	 * required</div><div class='del'>-	 */</div><div class='del'>-	p++;</div><div class='del'>-</div><div class='del'>-	if (opt-&gt;arg_required</div><div class='del'>-	    &amp;&amp; !(opt-&gt;arg_required &amp; (1 &lt;&lt; REISERFS_OPT_ALLOWEMPTY))</div><div class='del'>-	    &amp;&amp; !strlen(p)) {</div><div class='del'>-		/* this catches "option=," if not allowed */</div><div class='del'>-		reiserfs_warning(s, "super-6506",</div><div class='del'>-				 "empty argument for \"%s\"\n",</div><div class='del'>-				 opt-&gt;option_name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!opt-&gt;values) {</div><div class='del'>-		/* *=NULLopt_arg contains pointer to argument */</div><div class='del'>-		*opt_arg = p;</div><div class='del'>-		return opt-&gt;arg_required &amp; ~(1 &lt;&lt; REISERFS_OPT_ALLOWEMPTY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* values possible for this option are listed in opt-&gt;values */</div><div class='del'>-	for (arg = opt-&gt;values; arg-&gt;value; arg++) {</div><div class='del'>-		if (!strcmp(p, arg-&gt;value)) {</div><div class='del'>-			if (bit_flags) {</div><div class='del'>-				*bit_flags &amp;= ~arg-&gt;clrmask;</div><div class='del'>-				*bit_flags |= arg-&gt;setmask;</div><div class='del'>-			}</div><div class='del'>-			return opt-&gt;arg_required;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_warning(s, "super-6506",</div><div class='del'>-			 "bad value \"%s\" for option \"%s\"\n", p,</div><div class='del'>-			 opt-&gt;option_name);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns 0 if something is wrong in option string, 1 - otherwise */</div><div class='del'>-static int reiserfs_parse_options(struct super_block *s,</div><div class='del'>-</div><div class='del'>-				  /* string given via mount's -o */</div><div class='del'>-				  char *options,</div><div class='del'>-</div><div class='del'>-				  /*</div><div class='del'>-				   * after the parsing phase, contains the</div><div class='del'>-				   * collection of bitflags defining what</div><div class='del'>-				   * mount options were selected.</div><div class='del'>-				   */</div><div class='del'>-				  unsigned long *mount_options,</div><div class='del'>-</div><div class='del'>-				  /* strtol-ed from NNN of resize=NNN */</div><div class='del'>-				  unsigned long *blocks,</div><div class='del'>-				  char **jdev_name,</div><div class='del'>-				  unsigned int *commit_max_age,</div><div class='del'>-				  char **qf_names,</div><div class='del'>-				  unsigned int *qfmt)</div><div class='del'>-{</div><div class='del'>-	int c;</div><div class='del'>-	char *arg = NULL;</div><div class='del'>-	char *pos;</div><div class='del'>-	opt_desc_t opts[] = {</div><div class='del'>-		/*</div><div class='del'>-		 * Compatibility stuff, so that -o notail for old</div><div class='del'>-		 * setups still work</div><div class='del'>-		 */</div><div class='del'>-		{"tails",.arg_required = 't',.values = tails},</div><div class='del'>-		{"notail",.clrmask =</div><div class='del'>-		 (1 &lt;&lt; REISERFS_LARGETAIL) | (1 &lt;&lt; REISERFS_SMALLTAIL)},</div><div class='del'>-		{"conv",.setmask = 1 &lt;&lt; REISERFS_CONVERT},</div><div class='del'>-		{"attrs",.setmask = 1 &lt;&lt; REISERFS_ATTRS},</div><div class='del'>-		{"noattrs",.clrmask = 1 &lt;&lt; REISERFS_ATTRS},</div><div class='del'>-		{"expose_privroot", .setmask = 1 &lt;&lt; REISERFS_EXPOSE_PRIVROOT},</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_XATTR</div><div class='del'>-		{"user_xattr",.setmask = 1 &lt;&lt; REISERFS_XATTRS_USER},</div><div class='del'>-		{"nouser_xattr",.clrmask = 1 &lt;&lt; REISERFS_XATTRS_USER},</div><div class='del'>-#else</div><div class='del'>-		{"user_xattr",.setmask = 1 &lt;&lt; REISERFS_UNSUPPORTED_OPT},</div><div class='del'>-		{"nouser_xattr",.clrmask = 1 &lt;&lt; REISERFS_UNSUPPORTED_OPT},</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_POSIX_ACL</div><div class='del'>-		{"acl",.setmask = 1 &lt;&lt; REISERFS_POSIXACL},</div><div class='del'>-		{"noacl",.clrmask = 1 &lt;&lt; REISERFS_POSIXACL},</div><div class='del'>-#else</div><div class='del'>-		{"acl",.setmask = 1 &lt;&lt; REISERFS_UNSUPPORTED_OPT},</div><div class='del'>-		{"noacl",.clrmask = 1 &lt;&lt; REISERFS_UNSUPPORTED_OPT},</div><div class='del'>-#endif</div><div class='del'>-		{.option_name = "nolog"},</div><div class='del'>-		{"replayonly",.setmask = 1 &lt;&lt; REPLAYONLY},</div><div class='del'>-		{"block-allocator",.arg_required = 'a',.values = balloc},</div><div class='del'>-		{"data",.arg_required = 'd',.values = logging_mode},</div><div class='del'>-		{"barrier",.arg_required = 'b',.values = barrier_mode},</div><div class='del'>-		{"resize",.arg_required = 'r',.values = NULL},</div><div class='del'>-		{"jdev",.arg_required = 'j',.values = NULL},</div><div class='del'>-		{"nolargeio",.arg_required = 'w',.values = NULL},</div><div class='del'>-		{"commit",.arg_required = 'c',.values = NULL},</div><div class='del'>-		{"usrquota",.setmask = 1 &lt;&lt; REISERFS_USRQUOTA},</div><div class='del'>-		{"grpquota",.setmask = 1 &lt;&lt; REISERFS_GRPQUOTA},</div><div class='del'>-		{"noquota",.clrmask = 1 &lt;&lt; REISERFS_USRQUOTA | 1 &lt;&lt; REISERFS_GRPQUOTA},</div><div class='del'>-		{"errors",.arg_required = 'e',.values = error_actions},</div><div class='del'>-		{"usrjquota",.arg_required =</div><div class='del'>-		 'u' | (1 &lt;&lt; REISERFS_OPT_ALLOWEMPTY),.values = NULL},</div><div class='del'>-		{"grpjquota",.arg_required =</div><div class='del'>-		 'g' | (1 &lt;&lt; REISERFS_OPT_ALLOWEMPTY),.values = NULL},</div><div class='del'>-		{"jqfmt",.arg_required = 'f',.values = NULL},</div><div class='del'>-		{.option_name = NULL}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*blocks = 0;</div><div class='del'>-	if (!options || !*options)</div><div class='del'>-		/*</div><div class='del'>-		 * use default configuration: create tails, journaling on, no</div><div class='del'>-		 * conversion to newest format</div><div class='del'>-		 */</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	for (pos = options; pos;) {</div><div class='del'>-		c = reiserfs_getopt(s, &amp;pos, opts, &amp;arg, mount_options);</div><div class='del'>-		if (c == -1)</div><div class='del'>-			/* wrong option is given */</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		if (c == 'r') {</div><div class='del'>-			char *p;</div><div class='del'>-</div><div class='del'>-			p = NULL;</div><div class='del'>-			/* "resize=NNN" or "resize=auto" */</div><div class='del'>-</div><div class='del'>-			if (!strcmp(arg, "auto")) {</div><div class='del'>-				/* From JFS code, to auto-get the size. */</div><div class='del'>-				*blocks = sb_bdev_nr_blocks(s);</div><div class='del'>-			} else {</div><div class='del'>-				*blocks = simple_strtoul(arg, &amp;p, 0);</div><div class='del'>-				if (*p != '\0') {</div><div class='del'>-					/* NNN does not look like a number */</div><div class='del'>-					reiserfs_warning(s, "super-6507",</div><div class='del'>-							 "bad value %s for "</div><div class='del'>-							 "-oresize\n", arg);</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (c == 'c') {</div><div class='del'>-			char *p = NULL;</div><div class='del'>-			unsigned long val = simple_strtoul(arg, &amp;p, 0);</div><div class='del'>-			/* commit=NNN (time in seconds) */</div><div class='del'>-			if (*p != '\0' || val &gt;= (unsigned int)-1) {</div><div class='del'>-				reiserfs_warning(s, "super-6508",</div><div class='del'>-						 "bad value %s for -ocommit\n",</div><div class='del'>-						 arg);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			*commit_max_age = (unsigned int)val;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (c == 'w') {</div><div class='del'>-			reiserfs_warning(s, "super-6509", "nolargeio option "</div><div class='del'>-					 "is no longer supported");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (c == 'j') {</div><div class='del'>-			if (arg &amp;&amp; *arg &amp;&amp; jdev_name) {</div><div class='del'>-				/* Hm, already assigned? */</div><div class='del'>-				if (*jdev_name) {</div><div class='del'>-					reiserfs_warning(s, "super-6510",</div><div class='del'>-							 "journal device was "</div><div class='del'>-							 "already specified to "</div><div class='del'>-							 "be %s", *jdev_name);</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				*jdev_name = arg;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-		if (c == 'u' || c == 'g') {</div><div class='del'>-			int qtype = c == 'u' ? USRQUOTA : GRPQUOTA;</div><div class='del'>-</div><div class='del'>-			if (sb_any_quota_loaded(s) &amp;&amp;</div><div class='del'>-			    (!*arg != !REISERFS_SB(s)-&gt;s_qf_names[qtype])) {</div><div class='del'>-				reiserfs_warning(s, "super-6511",</div><div class='del'>-						 "cannot change journaled "</div><div class='del'>-						 "quota options when quota "</div><div class='del'>-						 "turned on.");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			if (qf_names[qtype] !=</div><div class='del'>-			    REISERFS_SB(s)-&gt;s_qf_names[qtype])</div><div class='del'>-				kfree(qf_names[qtype]);</div><div class='del'>-			qf_names[qtype] = NULL;</div><div class='del'>-			if (*arg) {	/* Some filename specified? */</div><div class='del'>-				if (REISERFS_SB(s)-&gt;s_qf_names[qtype]</div><div class='del'>-				    &amp;&amp; strcmp(REISERFS_SB(s)-&gt;s_qf_names[qtype],</div><div class='del'>-					      arg)) {</div><div class='del'>-					reiserfs_warning(s, "super-6512",</div><div class='del'>-							 "%s quota file "</div><div class='del'>-							 "already specified.",</div><div class='del'>-							 QTYPE2NAME(qtype));</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				if (strchr(arg, '/')) {</div><div class='del'>-					reiserfs_warning(s, "super-6513",</div><div class='del'>-							 "quotafile must be "</div><div class='del'>-							 "on filesystem root.");</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				qf_names[qtype] = kstrdup(arg, GFP_KERNEL);</div><div class='del'>-				if (!qf_names[qtype]) {</div><div class='del'>-					reiserfs_warning(s, "reiserfs-2502",</div><div class='del'>-							 "not enough memory "</div><div class='del'>-							 "for storing "</div><div class='del'>-							 "quotafile name.");</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-				if (qtype == USRQUOTA)</div><div class='del'>-					*mount_options |= 1 &lt;&lt; REISERFS_USRQUOTA;</div><div class='del'>-				else</div><div class='del'>-					*mount_options |= 1 &lt;&lt; REISERFS_GRPQUOTA;</div><div class='del'>-			} else {</div><div class='del'>-				if (qtype == USRQUOTA)</div><div class='del'>-					*mount_options &amp;= ~(1 &lt;&lt; REISERFS_USRQUOTA);</div><div class='del'>-				else</div><div class='del'>-					*mount_options &amp;= ~(1 &lt;&lt; REISERFS_GRPQUOTA);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (c == 'f') {</div><div class='del'>-			if (!strcmp(arg, "vfsold"))</div><div class='del'>-				*qfmt = QFMT_VFS_OLD;</div><div class='del'>-			else if (!strcmp(arg, "vfsv0"))</div><div class='del'>-				*qfmt = QFMT_VFS_V0;</div><div class='del'>-			else {</div><div class='del'>-				reiserfs_warning(s, "super-6514",</div><div class='del'>-						 "unknown quota format "</div><div class='del'>-						 "specified.");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			if (sb_any_quota_loaded(s) &amp;&amp;</div><div class='del'>-			    *qfmt != REISERFS_SB(s)-&gt;s_jquota_fmt) {</div><div class='del'>-				reiserfs_warning(s, "super-6515",</div><div class='del'>-						 "cannot change journaled "</div><div class='del'>-						 "quota options when quota "</div><div class='del'>-						 "turned on.");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		if (c == 'u' || c == 'g' || c == 'f') {</div><div class='del'>-			reiserfs_warning(s, "reiserfs-2503", "journaled "</div><div class='del'>-					 "quota options not supported.");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	if (!REISERFS_SB(s)-&gt;s_jquota_fmt &amp;&amp; !*qfmt</div><div class='del'>-	    &amp;&amp; (qf_names[USRQUOTA] || qf_names[GRPQUOTA])) {</div><div class='del'>-		reiserfs_warning(s, "super-6515",</div><div class='del'>-				 "journaled quota format not specified.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if ((!(*mount_options &amp; (1 &lt;&lt; REISERFS_USRQUOTA)) &amp;&amp;</div><div class='del'>-	       sb_has_quota_loaded(s, USRQUOTA)) ||</div><div class='del'>-	    (!(*mount_options &amp; (1 &lt;&lt; REISERFS_GRPQUOTA)) &amp;&amp;</div><div class='del'>-	       sb_has_quota_loaded(s, GRPQUOTA))) {</div><div class='del'>-		reiserfs_warning(s, "super-6516", "quota options must "</div><div class='del'>-				 "be present when quota is turned on.");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void switch_data_mode(struct super_block *s, unsigned long mode)</div><div class='del'>-{</div><div class='del'>-	REISERFS_SB(s)-&gt;s_mount_opt &amp;= ~((1 &lt;&lt; REISERFS_DATA_LOG) |</div><div class='del'>-					 (1 &lt;&lt; REISERFS_DATA_ORDERED) |</div><div class='del'>-					 (1 &lt;&lt; REISERFS_DATA_WRITEBACK));</div><div class='del'>-	REISERFS_SB(s)-&gt;s_mount_opt |= (1 &lt;&lt; mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handle_data_mode(struct super_block *s, unsigned long mount_options)</div><div class='del'>-{</div><div class='del'>-	if (mount_options &amp; (1 &lt;&lt; REISERFS_DATA_LOG)) {</div><div class='del'>-		if (!reiserfs_data_log(s)) {</div><div class='del'>-			switch_data_mode(s, REISERFS_DATA_LOG);</div><div class='del'>-			reiserfs_info(s, "switching to journaled data mode\n");</div><div class='del'>-		}</div><div class='del'>-	} else if (mount_options &amp; (1 &lt;&lt; REISERFS_DATA_ORDERED)) {</div><div class='del'>-		if (!reiserfs_data_ordered(s)) {</div><div class='del'>-			switch_data_mode(s, REISERFS_DATA_ORDERED);</div><div class='del'>-			reiserfs_info(s, "switching to ordered data mode\n");</div><div class='del'>-		}</div><div class='del'>-	} else if (mount_options &amp; (1 &lt;&lt; REISERFS_DATA_WRITEBACK)) {</div><div class='del'>-		if (!reiserfs_data_writeback(s)) {</div><div class='del'>-			switch_data_mode(s, REISERFS_DATA_WRITEBACK);</div><div class='del'>-			reiserfs_info(s, "switching to writeback data mode\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handle_barrier_mode(struct super_block *s, unsigned long bits)</div><div class='del'>-{</div><div class='del'>-	int flush = (1 &lt;&lt; REISERFS_BARRIER_FLUSH);</div><div class='del'>-	int none = (1 &lt;&lt; REISERFS_BARRIER_NONE);</div><div class='del'>-	int all_barrier = flush | none;</div><div class='del'>-</div><div class='del'>-	if (bits &amp; all_barrier) {</div><div class='del'>-		REISERFS_SB(s)-&gt;s_mount_opt &amp;= ~all_barrier;</div><div class='del'>-		if (bits &amp; flush) {</div><div class='del'>-			REISERFS_SB(s)-&gt;s_mount_opt |= flush;</div><div class='del'>-			printk("reiserfs: enabling write barrier flush mode\n");</div><div class='del'>-		} else if (bits &amp; none) {</div><div class='del'>-			REISERFS_SB(s)-&gt;s_mount_opt |= none;</div><div class='del'>-			printk("reiserfs: write barriers turned off\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handle_attrs(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_super_block *rs = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-</div><div class='del'>-	if (reiserfs_attrs(s)) {</div><div class='del'>-		if (old_format_only(s)) {</div><div class='del'>-			reiserfs_warning(s, "super-6517", "cannot support "</div><div class='del'>-					 "attributes on 3.5.x disk format");</div><div class='del'>-			REISERFS_SB(s)-&gt;s_mount_opt &amp;= ~(1 &lt;&lt; REISERFS_ATTRS);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (!(le32_to_cpu(rs-&gt;s_flags) &amp; reiserfs_attrs_cleared)) {</div><div class='del'>-			reiserfs_warning(s, "super-6518", "cannot support "</div><div class='del'>-					 "attributes until flag is set in "</div><div class='del'>-					 "super-block");</div><div class='del'>-			REISERFS_SB(s)-&gt;s_mount_opt &amp;= ~(1 &lt;&lt; REISERFS_ATTRS);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-static void handle_quota_files(struct super_block *s, char **qf_names,</div><div class='del'>-			       unsigned int *qfmt)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; REISERFS_MAXQUOTAS; i++) {</div><div class='del'>-		if (qf_names[i] != REISERFS_SB(s)-&gt;s_qf_names[i])</div><div class='del'>-			kfree(REISERFS_SB(s)-&gt;s_qf_names[i]);</div><div class='del'>-		REISERFS_SB(s)-&gt;s_qf_names[i] = qf_names[i];</div><div class='del'>-	}</div><div class='del'>-	if (*qfmt)</div><div class='del'>-		REISERFS_SB(s)-&gt;s_jquota_fmt = *qfmt;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_super_block *rs;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	unsigned long blocks;</div><div class='del'>-	unsigned long mount_options = REISERFS_SB(s)-&gt;s_mount_opt;</div><div class='del'>-	unsigned long safe_mask = 0;</div><div class='del'>-	unsigned int commit_max_age = (unsigned int)-1;</div><div class='del'>-	struct reiserfs_journal *journal = SB_JOURNAL(s);</div><div class='del'>-	int err;</div><div class='del'>-	char *qf_names[REISERFS_MAXQUOTAS];</div><div class='del'>-	unsigned int qfmt = 0;</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	int i;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	sync_filesystem(s);</div><div class='del'>-	reiserfs_write_lock(s);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	memcpy(qf_names, REISERFS_SB(s)-&gt;s_qf_names, sizeof(qf_names));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	rs = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-</div><div class='del'>-	if (!reiserfs_parse_options</div><div class='del'>-	    (s, arg, &amp;mount_options, &amp;blocks, NULL, &amp;commit_max_age,</div><div class='del'>-	    qf_names, &amp;qfmt)) {</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-		for (i = 0; i &lt; REISERFS_MAXQUOTAS; i++)</div><div class='del'>-			if (qf_names[i] != REISERFS_SB(s)-&gt;s_qf_names[i])</div><div class='del'>-				kfree(qf_names[i]);</div><div class='del'>-#endif</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out_err_unlock;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	handle_quota_files(s, qf_names, &amp;qfmt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	handle_attrs(s);</div><div class='del'>-</div><div class='del'>-	/* Add options that are safe here */</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_SMALLTAIL;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_LARGETAIL;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_NO_BORDER;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_NO_UNHASHED_RELOCATION;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_HASHED_RELOCATION;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_TEST4;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_ATTRS;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_XATTRS_USER;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_POSIXACL;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_BARRIER_FLUSH;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_BARRIER_NONE;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_ERROR_RO;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_ERROR_CONTINUE;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_ERROR_PANIC;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_USRQUOTA;</div><div class='del'>-	safe_mask |= 1 &lt;&lt; REISERFS_GRPQUOTA;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update the bitmask, taking care to keep</div><div class='del'>-	 * the bits we're not allowed to change here</div><div class='del'>-	 */</div><div class='del'>-	REISERFS_SB(s)-&gt;s_mount_opt =</div><div class='del'>-	    (REISERFS_SB(s)-&gt;</div><div class='del'>-	     s_mount_opt &amp; ~safe_mask) | (mount_options &amp; safe_mask);</div><div class='del'>-</div><div class='del'>-	if (commit_max_age != 0 &amp;&amp; commit_max_age != (unsigned int)-1) {</div><div class='del'>-		journal-&gt;j_max_commit_age = commit_max_age;</div><div class='del'>-		journal-&gt;j_max_trans_age = commit_max_age;</div><div class='del'>-	} else if (commit_max_age == 0) {</div><div class='del'>-		/* 0 means restore defaults. */</div><div class='del'>-		journal-&gt;j_max_commit_age = journal-&gt;j_default_max_commit_age;</div><div class='del'>-		journal-&gt;j_max_trans_age = JOURNAL_MAX_TRANS_AGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (blocks) {</div><div class='del'>-		err = reiserfs_resize(s, blocks);</div><div class='del'>-		if (err != 0)</div><div class='del'>-			goto out_err_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*mount_flags &amp; SB_RDONLY) {</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-		reiserfs_xattr_init(s, *mount_flags);</div><div class='del'>-		/* remount read-only */</div><div class='del'>-		if (sb_rdonly(s))</div><div class='del'>-			/* it is read-only already */</div><div class='del'>-			goto out_ok_unlocked;</div><div class='del'>-</div><div class='del'>-		err = dquot_suspend(s, -1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out_err;</div><div class='del'>-</div><div class='del'>-		/* try to remount file system with read-only permissions */</div><div class='del'>-		if (sb_umount_state(rs) == REISERFS_VALID_FS</div><div class='del'>-		    || REISERFS_SB(s)-&gt;s_mount_state != REISERFS_VALID_FS) {</div><div class='del'>-			goto out_ok_unlocked;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-</div><div class='del'>-		err = journal_begin(&amp;th, s, 10);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_err_unlock;</div><div class='del'>-</div><div class='del'>-		/* Mounting a rw partition read-only. */</div><div class='del'>-		reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);</div><div class='del'>-		set_sb_umount_state(rs, REISERFS_SB(s)-&gt;s_mount_state);</div><div class='del'>-		journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-	} else {</div><div class='del'>-		/* remount read-write */</div><div class='del'>-		if (!sb_rdonly(s)) {</div><div class='del'>-			reiserfs_write_unlock(s);</div><div class='del'>-			reiserfs_xattr_init(s, *mount_flags);</div><div class='del'>-			goto out_ok_unlocked;	/* We are read-write already */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (reiserfs_is_journal_aborted(journal)) {</div><div class='del'>-			err = journal-&gt;j_errno;</div><div class='del'>-			goto out_err_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		handle_data_mode(s, mount_options);</div><div class='del'>-		handle_barrier_mode(s, mount_options);</div><div class='del'>-		REISERFS_SB(s)-&gt;s_mount_state = sb_umount_state(rs);</div><div class='del'>-</div><div class='del'>-		/* now it is safe to call journal_begin */</div><div class='del'>-		s-&gt;s_flags &amp;= ~SB_RDONLY;</div><div class='del'>-		err = journal_begin(&amp;th, s, 10);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_err_unlock;</div><div class='del'>-</div><div class='del'>-		/* Mount a partition which is read-only, read-write */</div><div class='del'>-		reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);</div><div class='del'>-		REISERFS_SB(s)-&gt;s_mount_state = sb_umount_state(rs);</div><div class='del'>-		s-&gt;s_flags &amp;= ~SB_RDONLY;</div><div class='del'>-		set_sb_umount_state(rs, REISERFS_ERROR_FS);</div><div class='del'>-		if (!old_format_only(s))</div><div class='del'>-			set_sb_mnt_count(rs, sb_mnt_count(rs) + 1);</div><div class='del'>-		/* mark_buffer_dirty (SB_BUFFER_WITH_SB (s), 1); */</div><div class='del'>-		journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-		REISERFS_SB(s)-&gt;s_mount_state = REISERFS_VALID_FS;</div><div class='del'>-	}</div><div class='del'>-	/* this will force a full flush of all journal lists */</div><div class='del'>-	SB_JOURNAL(s)-&gt;j_must_wait = 1;</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_err_unlock;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-	if (!(*mount_flags &amp; SB_RDONLY)) {</div><div class='del'>-		dquot_resume(s, -1);</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-		finish_unfinished(s);</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-		reiserfs_xattr_init(s, *mount_flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out_ok_unlocked:</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_err_unlock:</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-out_err:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_super_block(struct super_block *s, int offset)</div><div class='del'>-{</div><div class='del'>-	struct buffer_head *bh;</div><div class='del'>-	struct reiserfs_super_block *rs;</div><div class='del'>-	int fs_blocksize;</div><div class='del'>-</div><div class='del'>-	bh = sb_bread(s, offset / s-&gt;s_blocksize);</div><div class='del'>-	if (!bh) {</div><div class='del'>-		reiserfs_warning(s, "sh-2006",</div><div class='del'>-				 "bread failed (dev %s, block %lu, size %lu)",</div><div class='del'>-				 s-&gt;s_id, offset / s-&gt;s_blocksize,</div><div class='del'>-				 s-&gt;s_blocksize);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rs = (struct reiserfs_super_block *)bh-&gt;b_data;</div><div class='del'>-	if (!is_any_reiserfs_magic_string(rs)) {</div><div class='del'>-		brelse(bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * ok, reiserfs signature (old or new) found in at the given offset</div><div class='del'>-	 */</div><div class='del'>-	fs_blocksize = sb_blocksize(rs);</div><div class='del'>-	brelse(bh);</div><div class='del'>-	sb_set_blocksize(s, fs_blocksize);</div><div class='del'>-</div><div class='del'>-	bh = sb_bread(s, offset / s-&gt;s_blocksize);</div><div class='del'>-	if (!bh) {</div><div class='del'>-		reiserfs_warning(s, "sh-2007",</div><div class='del'>-				 "bread failed (dev %s, block %lu, size %lu)",</div><div class='del'>-				 s-&gt;s_id, offset / s-&gt;s_blocksize,</div><div class='del'>-				 s-&gt;s_blocksize);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rs = (struct reiserfs_super_block *)bh-&gt;b_data;</div><div class='del'>-	if (sb_blocksize(rs) != s-&gt;s_blocksize) {</div><div class='del'>-		reiserfs_warning(s, "sh-2011", "can't find a reiserfs "</div><div class='del'>-				 "filesystem on (dev %s, block %llu, size %lu)",</div><div class='del'>-				 s-&gt;s_id,</div><div class='del'>-				 (unsigned long long)bh-&gt;b_blocknr,</div><div class='del'>-				 s-&gt;s_blocksize);</div><div class='del'>-		brelse(bh);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rs-&gt;s_v1.s_root_block == cpu_to_le32(-1)) {</div><div class='del'>-		brelse(bh);</div><div class='del'>-		reiserfs_warning(s, "super-6519", "Unfinished reiserfsck "</div><div class='del'>-				 "--rebuild-tree run detected. Please run\n"</div><div class='del'>-				 "reiserfsck --rebuild-tree and wait for a "</div><div class='del'>-				 "completion. If that fails\n"</div><div class='del'>-				 "get newer reiserfsprogs package");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_warning(NULL, "", "reiserfs filesystem is deprecated and "</div><div class='del'>-		"scheduled to be removed from the kernel in 2025");</div><div class='del'>-	SB_BUFFER_WITH_SB(s) = bh;</div><div class='del'>-	SB_DISK_SUPER_BLOCK(s) = rs;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * magic is of non-standard journal filesystem, look at s_version to</div><div class='del'>-	 * find which format is in use</div><div class='del'>-	 */</div><div class='del'>-	if (is_reiserfs_jr(rs)) {</div><div class='del'>-		if (sb_version(rs) == REISERFS_VERSION_2)</div><div class='del'>-			reiserfs_info(s, "found reiserfs format \"3.6\""</div><div class='del'>-				      " with non-standard journal\n");</div><div class='del'>-		else if (sb_version(rs) == REISERFS_VERSION_1)</div><div class='del'>-			reiserfs_info(s, "found reiserfs format \"3.5\""</div><div class='del'>-				      " with non-standard journal\n");</div><div class='del'>-		else {</div><div class='del'>-			reiserfs_warning(s, "sh-2012", "found unknown "</div><div class='del'>-					 "format \"%u\" of reiserfs with "</div><div class='del'>-					 "non-standard magic", sb_version(rs));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		/*</div><div class='del'>-		 * s_version of standard format may contain incorrect</div><div class='del'>-		 * information, so we just look at the magic string</div><div class='del'>-		 */</div><div class='del'>-		reiserfs_info(s,</div><div class='del'>-			      "found reiserfs format \"%s\" with standard journal\n",</div><div class='del'>-			      is_reiserfs_3_5(rs) ? "3.5" : "3.6");</div><div class='del'>-</div><div class='del'>-	s-&gt;s_op = &amp;reiserfs_sops;</div><div class='del'>-	s-&gt;s_export_op = &amp;reiserfs_export_ops;</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	s-&gt;s_qcop = &amp;reiserfs_qctl_operations;</div><div class='del'>-	s-&gt;dq_op = &amp;reiserfs_quota_operations;</div><div class='del'>-	s-&gt;s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * new format is limited by the 32 bit wide i_blocks field, want to</div><div class='del'>-	 * be one full block below that.</div><div class='del'>-	 */</div><div class='del'>-	s-&gt;s_maxbytes = (512LL &lt;&lt; 32) - s-&gt;s_blocksize;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* after journal replay, reread all bitmap and super blocks */</div><div class='del'>-static int reread_meta_blocks(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	if (bh_read(SB_BUFFER_WITH_SB(s), 0) &lt; 0) {</div><div class='del'>-		reiserfs_warning(s, "reiserfs-2504", "error reading the super");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hash detection stuff */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if root directory is empty - we set default - Yura's - hash and</div><div class='del'>- * warn about it</div><div class='del'>- * FIXME: we look for only one name in a directory. If tea and yura</div><div class='del'>- * both have the same value - we ask user to send report to the</div><div class='del'>- * mailing list</div><div class='del'>- */</div><div class='del'>-static __u32 find_hash_out(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-	INITIALIZE_PATH(path);</div><div class='del'>-	struct reiserfs_dir_entry de;</div><div class='del'>-	struct reiserfs_de_head *deh;</div><div class='del'>-	__u32 hash = DEFAULT_HASH;</div><div class='del'>-	__u32 deh_hashval, teahash, r5hash, yurahash;</div><div class='del'>-</div><div class='del'>-	inode = d_inode(s-&gt;s_root);</div><div class='del'>-</div><div class='del'>-	make_cpu_key(&amp;key, inode, ~0, TYPE_DIRENTRY, 3);</div><div class='del'>-	retval = search_by_entry_key(s, &amp;key, &amp;path, &amp;de);</div><div class='del'>-	if (retval == IO_ERROR) {</div><div class='del'>-		pathrelse(&amp;path);</div><div class='del'>-		return UNSET_HASH;</div><div class='del'>-	}</div><div class='del'>-	if (retval == NAME_NOT_FOUND)</div><div class='del'>-		de.de_entry_num--;</div><div class='del'>-</div><div class='del'>-	set_de_name_and_namelen(&amp;de);</div><div class='del'>-	deh = de.de_deh + de.de_entry_num;</div><div class='del'>-</div><div class='del'>-	if (deh_offset(deh) == DOT_DOT_OFFSET) {</div><div class='del'>-		/* allow override in this case */</div><div class='del'>-		if (reiserfs_rupasov_hash(s))</div><div class='del'>-			hash = YURA_HASH;</div><div class='del'>-		reiserfs_info(s, "FS seems to be empty, autodetect is using the default hash\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	deh_hashval = GET_HASH_VALUE(deh_offset(deh));</div><div class='del'>-	r5hash = GET_HASH_VALUE(r5_hash(de.de_name, de.de_namelen));</div><div class='del'>-	teahash = GET_HASH_VALUE(keyed_hash(de.de_name, de.de_namelen));</div><div class='del'>-	yurahash = GET_HASH_VALUE(yura_hash(de.de_name, de.de_namelen));</div><div class='del'>-</div><div class='del'>-	if ((teahash == r5hash &amp;&amp; deh_hashval == r5hash) ||</div><div class='del'>-	    (teahash == yurahash &amp;&amp; deh_hashval == yurahash) ||</div><div class='del'>-	    (r5hash == yurahash &amp;&amp; deh_hashval == yurahash)) {</div><div class='del'>-		reiserfs_warning(s, "reiserfs-2506",</div><div class='del'>-				 "Unable to automatically detect hash "</div><div class='del'>-				 "function. Please mount with -o "</div><div class='del'>-				 "hash={tea,rupasov,r5}");</div><div class='del'>-		hash = UNSET_HASH;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (deh_hashval == yurahash)</div><div class='del'>-		hash = YURA_HASH;</div><div class='del'>-	else if (deh_hashval == teahash)</div><div class='del'>-		hash = TEA_HASH;</div><div class='del'>-	else if (deh_hashval == r5hash)</div><div class='del'>-		hash = R5_HASH;</div><div class='del'>-	else {</div><div class='del'>-		reiserfs_warning(s, "reiserfs-2506",</div><div class='del'>-				 "Unrecognised hash function");</div><div class='del'>-		hash = UNSET_HASH;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	pathrelse(&amp;path);</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* finds out which hash names are sorted with */</div><div class='del'>-static int what_hash(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	__u32 code;</div><div class='del'>-</div><div class='del'>-	code = sb_hash_function_code(SB_DISK_SUPER_BLOCK(s));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reiserfs_hash_detect() == true if any of the hash mount options</div><div class='del'>-	 * were used.  We must check them to make sure the user isn't</div><div class='del'>-	 * using a bad hash value</div><div class='del'>-	 */</div><div class='del'>-	if (code == UNSET_HASH || reiserfs_hash_detect(s))</div><div class='del'>-		code = find_hash_out(s);</div><div class='del'>-</div><div class='del'>-	if (code != UNSET_HASH &amp;&amp; reiserfs_hash_detect(s)) {</div><div class='del'>-		/*</div><div class='del'>-		 * detection has found the hash, and we must check against the</div><div class='del'>-		 * mount options</div><div class='del'>-		 */</div><div class='del'>-		if (reiserfs_rupasov_hash(s) &amp;&amp; code != YURA_HASH) {</div><div class='del'>-			reiserfs_warning(s, "reiserfs-2507",</div><div class='del'>-					 "Error, %s hash detected, "</div><div class='del'>-					 "unable to force rupasov hash",</div><div class='del'>-					 reiserfs_hashname(code));</div><div class='del'>-			code = UNSET_HASH;</div><div class='del'>-		} else if (reiserfs_tea_hash(s) &amp;&amp; code != TEA_HASH) {</div><div class='del'>-			reiserfs_warning(s, "reiserfs-2508",</div><div class='del'>-					 "Error, %s hash detected, "</div><div class='del'>-					 "unable to force tea hash",</div><div class='del'>-					 reiserfs_hashname(code));</div><div class='del'>-			code = UNSET_HASH;</div><div class='del'>-		} else if (reiserfs_r5_hash(s) &amp;&amp; code != R5_HASH) {</div><div class='del'>-			reiserfs_warning(s, "reiserfs-2509",</div><div class='del'>-					 "Error, %s hash detected, "</div><div class='del'>-					 "unable to force r5 hash",</div><div class='del'>-					 reiserfs_hashname(code));</div><div class='del'>-			code = UNSET_HASH;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * find_hash_out was not called or</div><div class='del'>-		 * could not determine the hash</div><div class='del'>-		 */</div><div class='del'>-		if (reiserfs_rupasov_hash(s)) {</div><div class='del'>-			code = YURA_HASH;</div><div class='del'>-		} else if (reiserfs_tea_hash(s)) {</div><div class='del'>-			code = TEA_HASH;</div><div class='del'>-		} else if (reiserfs_r5_hash(s)) {</div><div class='del'>-			code = R5_HASH;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if we are mounted RW, and we have a new valid hash code, update</div><div class='del'>-	 * the super</div><div class='del'>-	 */</div><div class='del'>-	if (code != UNSET_HASH &amp;&amp;</div><div class='del'>-	    !sb_rdonly(s) &amp;&amp;</div><div class='del'>-	    code != sb_hash_function_code(SB_DISK_SUPER_BLOCK(s))) {</div><div class='del'>-		set_sb_hash_function_code(SB_DISK_SUPER_BLOCK(s), code);</div><div class='del'>-	}</div><div class='del'>-	return code;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return pointer to appropriate function */</div><div class='del'>-static hashf_t hash_function(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	switch (what_hash(s)) {</div><div class='del'>-	case TEA_HASH:</div><div class='del'>-		reiserfs_info(s, "Using tea hash to sort names\n");</div><div class='del'>-		return keyed_hash;</div><div class='del'>-	case YURA_HASH:</div><div class='del'>-		reiserfs_info(s, "Using rupasov hash to sort names\n");</div><div class='del'>-		return yura_hash;</div><div class='del'>-	case R5_HASH:</div><div class='del'>-		reiserfs_info(s, "Using r5 hash to sort names\n");</div><div class='del'>-		return r5_hash;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this is used to set up correct value for old partitions */</div><div class='del'>-static int function2code(hashf_t func)</div><div class='del'>-{</div><div class='del'>-	if (func == keyed_hash)</div><div class='del'>-		return TEA_HASH;</div><div class='del'>-	if (func == yura_hash)</div><div class='del'>-		return YURA_HASH;</div><div class='del'>-	if (func == r5_hash)</div><div class='del'>-		return R5_HASH;</div><div class='del'>-</div><div class='del'>-	BUG();			/* should never happen */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SWARN(silent, s, id, ...)			\</div><div class='del'>-	if (!(silent))				\</div><div class='del'>-		reiserfs_warning(s, id, __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-static int reiserfs_fill_super(struct super_block *s, void *data, int silent)</div><div class='del'>-{</div><div class='del'>-	struct inode *root_inode;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int old_format = 0;</div><div class='del'>-	unsigned long blocks;</div><div class='del'>-	unsigned int commit_max_age = 0;</div><div class='del'>-	int jinit_done = 0;</div><div class='del'>-	struct reiserfs_iget_args args;</div><div class='del'>-	struct reiserfs_super_block *rs;</div><div class='del'>-	char *jdev_name;</div><div class='del'>-	struct reiserfs_sb_info *sbi;</div><div class='del'>-	int errval = -EINVAL;</div><div class='del'>-	char *qf_names[REISERFS_MAXQUOTAS] = {};</div><div class='del'>-	unsigned int qfmt = 0;</div><div class='del'>-</div><div class='del'>-	sbi = kzalloc(sizeof(struct reiserfs_sb_info), GFP_KERNEL);</div><div class='del'>-	if (!sbi)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	s-&gt;s_fs_info = sbi;</div><div class='del'>-	/* Set default values for options: non-aggressive tails, RO on errors */</div><div class='del'>-	sbi-&gt;s_mount_opt |= (1 &lt;&lt; REISERFS_SMALLTAIL);</div><div class='del'>-	sbi-&gt;s_mount_opt |= (1 &lt;&lt; REISERFS_ERROR_RO);</div><div class='del'>-	sbi-&gt;s_mount_opt |= (1 &lt;&lt; REISERFS_BARRIER_FLUSH);</div><div class='del'>-	/* no preallocation minimum, be smart in reiserfs_file_write instead */</div><div class='del'>-	sbi-&gt;s_alloc_options.preallocmin = 0;</div><div class='del'>-	/* Preallocate by 16 blocks (17-1) at once */</div><div class='del'>-	sbi-&gt;s_alloc_options.preallocsize = 17;</div><div class='del'>-	/* setup default block allocator options */</div><div class='del'>-	reiserfs_init_alloc_options(s);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;sbi-&gt;old_work_lock);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;sbi-&gt;old_work, flush_old_commits);</div><div class='del'>-	mutex_init(&amp;sbi-&gt;lock);</div><div class='del'>-	sbi-&gt;lock_depth = -1;</div><div class='del'>-</div><div class='del'>-	sbi-&gt;commit_wq = alloc_workqueue("reiserfs/%s", WQ_MEM_RECLAIM, 0,</div><div class='del'>-					 s-&gt;s_id);</div><div class='del'>-	if (!sbi-&gt;commit_wq) {</div><div class='del'>-		SWARN(silent, s, "", "Cannot allocate commit workqueue");</div><div class='del'>-		errval = -ENOMEM;</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	jdev_name = NULL;</div><div class='del'>-	if (reiserfs_parse_options</div><div class='del'>-	    (s, (char *)data, &amp;sbi-&gt;s_mount_opt, &amp;blocks, &amp;jdev_name,</div><div class='del'>-	     &amp;commit_max_age, qf_names, &amp;qfmt) == 0) {</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-	if (jdev_name &amp;&amp; jdev_name[0]) {</div><div class='del'>-		sbi-&gt;s_jdev = kstrdup(jdev_name, GFP_KERNEL);</div><div class='del'>-		if (!sbi-&gt;s_jdev) {</div><div class='del'>-			SWARN(silent, s, "", "Cannot allocate memory for "</div><div class='del'>-				"journal device name");</div><div class='del'>-			goto error_unlocked;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	handle_quota_files(s, qf_names, &amp;qfmt);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (blocks) {</div><div class='del'>-		SWARN(silent, s, "jmacd-7", "resize option for remount only");</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * try old format (undistributed bitmap, super block in 8-th 1k</div><div class='del'>-	 * block of a device)</div><div class='del'>-	 */</div><div class='del'>-	if (!read_super_block(s, REISERFS_OLD_DISK_OFFSET_IN_BYTES))</div><div class='del'>-		old_format = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * try new format (64-th 1k block), which can contain reiserfs</div><div class='del'>-	 * super block</div><div class='del'>-	 */</div><div class='del'>-	else if (read_super_block(s, REISERFS_DISK_OFFSET_IN_BYTES)) {</div><div class='del'>-		SWARN(silent, s, "sh-2021", "can not find reiserfs on %s",</div><div class='del'>-		      s-&gt;s_id);</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;s_time_min = 0;</div><div class='del'>-	s-&gt;s_time_max = U32_MAX;</div><div class='del'>-</div><div class='del'>-	rs = SB_DISK_SUPER_BLOCK(s);</div><div class='del'>-	/*</div><div class='del'>-	 * Let's do basic sanity check to verify that underlying device is not</div><div class='del'>-	 * smaller than the filesystem. If the check fails then abort and</div><div class='del'>-	 * scream, because bad stuff will happen otherwise.</div><div class='del'>-	 */</div><div class='del'>-	if (bdev_nr_bytes(s-&gt;s_bdev) &lt; sb_block_count(rs) * sb_blocksize(rs)) {</div><div class='del'>-		SWARN(silent, s, "", "Filesystem cannot be "</div><div class='del'>-		      "mounted because it is bigger than the device");</div><div class='del'>-		SWARN(silent, s, "", "You may need to run fsck "</div><div class='del'>-		      "or increase size of your LVM partition");</div><div class='del'>-		SWARN(silent, s, "", "Or may be you forgot to "</div><div class='del'>-		      "reboot after fdisk when it told you to");</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sbi-&gt;s_mount_state = SB_REISERFS_STATE(s);</div><div class='del'>-	sbi-&gt;s_mount_state = REISERFS_VALID_FS;</div><div class='del'>-</div><div class='del'>-	if ((errval = reiserfs_init_bitmap_cache(s))) {</div><div class='del'>-		SWARN(silent, s, "jmacd-8", "unable to read bitmap");</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	errval = -EINVAL;</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-	SWARN(silent, s, "", "CONFIG_REISERFS_CHECK is set ON");</div><div class='del'>-	SWARN(silent, s, "", "- it is slow mode for debugging.");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* make data=ordered the default */</div><div class='del'>-	if (!reiserfs_data_log(s) &amp;&amp; !reiserfs_data_ordered(s) &amp;&amp;</div><div class='del'>-	    !reiserfs_data_writeback(s)) {</div><div class='del'>-		sbi-&gt;s_mount_opt |= (1 &lt;&lt; REISERFS_DATA_ORDERED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reiserfs_data_log(s)) {</div><div class='del'>-		reiserfs_info(s, "using journaled data mode\n");</div><div class='del'>-	} else if (reiserfs_data_ordered(s)) {</div><div class='del'>-		reiserfs_info(s, "using ordered data mode\n");</div><div class='del'>-	} else {</div><div class='del'>-		reiserfs_info(s, "using writeback data mode\n");</div><div class='del'>-	}</div><div class='del'>-	if (reiserfs_barrier_flush(s)) {</div><div class='del'>-		printk("reiserfs: using flush barriers\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (journal_init(s, jdev_name, old_format, commit_max_age)) {</div><div class='del'>-		SWARN(silent, s, "sh-2022",</div><div class='del'>-		      "unable to initialize journal space");</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * once this is set, journal_release must be called</div><div class='del'>-		 * if we error out of the mount</div><div class='del'>-		 */</div><div class='del'>-		jinit_done = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reread_meta_blocks(s)) {</div><div class='del'>-		SWARN(silent, s, "jmacd-9",</div><div class='del'>-		      "unable to reread meta blocks after journal init");</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (replay_only(s))</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-</div><div class='del'>-	s-&gt;s_xattr = reiserfs_xattr_handlers;</div><div class='del'>-</div><div class='del'>-	if (bdev_read_only(s-&gt;s_bdev) &amp;&amp; !sb_rdonly(s)) {</div><div class='del'>-		SWARN(silent, s, "clm-7000",</div><div class='del'>-		      "Detected readonly device, marking FS readonly");</div><div class='del'>-		s-&gt;s_flags |= SB_RDONLY;</div><div class='del'>-	}</div><div class='del'>-	args.objectid = REISERFS_ROOT_OBJECTID;</div><div class='del'>-	args.dirid = REISERFS_ROOT_PARENT_OBJECTID;</div><div class='del'>-	root_inode =</div><div class='del'>-	    iget5_locked(s, REISERFS_ROOT_OBJECTID, reiserfs_find_actor,</div><div class='del'>-			 reiserfs_init_locked_inode, (void *)&amp;args);</div><div class='del'>-	if (!root_inode) {</div><div class='del'>-		SWARN(silent, s, "jmacd-10", "get root inode failed");</div><div class='del'>-		goto error_unlocked;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This path assumed to be called with the BKL in the old times.</div><div class='del'>-	 * Now we have inherited the big reiserfs lock from it and many</div><div class='del'>-	 * reiserfs helpers called in the mount path and elsewhere require</div><div class='del'>-	 * this lock to be held even if it's not always necessary. Let's be</div><div class='del'>-	 * conservative and hold it early. The window can be reduced after</div><div class='del'>-	 * careful review of the code.</div><div class='del'>-	 */</div><div class='del'>-	reiserfs_write_lock(s);</div><div class='del'>-</div><div class='del'>-	if (root_inode-&gt;i_state &amp; I_NEW) {</div><div class='del'>-		reiserfs_read_locked_inode(root_inode, &amp;args);</div><div class='del'>-		unlock_new_inode(root_inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!S_ISDIR(root_inode-&gt;i_mode) || !inode_get_bytes(root_inode) ||</div><div class='del'>-	    !root_inode-&gt;i_size) {</div><div class='del'>-		SWARN(silent, s, "", "corrupt root inode, run fsck");</div><div class='del'>-		iput(root_inode);</div><div class='del'>-		errval = -EUCLEAN;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;s_root = d_make_root(root_inode);</div><div class='del'>-	if (!s-&gt;s_root)</div><div class='del'>-		goto error;</div><div class='del'>-	/* define and initialize hash function */</div><div class='del'>-	sbi-&gt;s_hash_function = hash_function(s);</div><div class='del'>-	if (sbi-&gt;s_hash_function == NULL) {</div><div class='del'>-		dput(s-&gt;s_root);</div><div class='del'>-		s-&gt;s_root = NULL;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_reiserfs_3_5(rs)</div><div class='del'>-	    || (is_reiserfs_jr(rs) &amp;&amp; SB_VERSION(s) == REISERFS_VERSION_1))</div><div class='del'>-		set_bit(REISERFS_3_5, &amp;sbi-&gt;s_properties);</div><div class='del'>-	else if (old_format)</div><div class='del'>-		set_bit(REISERFS_OLD_FORMAT, &amp;sbi-&gt;s_properties);</div><div class='del'>-	else</div><div class='del'>-		set_bit(REISERFS_3_6, &amp;sbi-&gt;s_properties);</div><div class='del'>-</div><div class='del'>-	if (!sb_rdonly(s)) {</div><div class='del'>-</div><div class='del'>-		errval = journal_begin(&amp;th, s, 1);</div><div class='del'>-		if (errval) {</div><div class='del'>-			dput(s-&gt;s_root);</div><div class='del'>-			s-&gt;s_root = NULL;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1);</div><div class='del'>-</div><div class='del'>-		set_sb_umount_state(rs, REISERFS_ERROR_FS);</div><div class='del'>-		set_sb_fs_state(rs, 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Clear out s_bmap_nr if it would wrap. We can handle this</div><div class='del'>-		 * case, but older revisions can't. This will cause the</div><div class='del'>-		 * file system to fail mount on those older implementations,</div><div class='del'>-		 * avoiding corruption. -jeffm</div><div class='del'>-		 */</div><div class='del'>-		if (bmap_would_wrap(reiserfs_bmap_count(s)) &amp;&amp;</div><div class='del'>-		    sb_bmap_nr(rs) != 0) {</div><div class='del'>-			reiserfs_warning(s, "super-2030", "This file system "</div><div class='del'>-					"claims to use %u bitmap blocks in "</div><div class='del'>-					"its super block, but requires %u. "</div><div class='del'>-					"Clearing to zero.", sb_bmap_nr(rs),</div><div class='del'>-					reiserfs_bmap_count(s));</div><div class='del'>-</div><div class='del'>-			set_sb_bmap_nr(rs, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (old_format_only(s)) {</div><div class='del'>-			/*</div><div class='del'>-			 * filesystem of format 3.5 either with standard</div><div class='del'>-			 * or non-standard journal</div><div class='del'>-			 */</div><div class='del'>-			if (convert_reiserfs(s)) {</div><div class='del'>-				/* and -o conv is given */</div><div class='del'>-				if (!silent)</div><div class='del'>-					reiserfs_info(s,</div><div class='del'>-						      "converting 3.5 filesystem to the 3.6 format");</div><div class='del'>-</div><div class='del'>-				if (is_reiserfs_3_5(rs))</div><div class='del'>-					/*</div><div class='del'>-					 * put magic string of 3.6 format.</div><div class='del'>-					 * 2.2 will not be able to</div><div class='del'>-					 * mount this filesystem anymore</div><div class='del'>-					 */</div><div class='del'>-					memcpy(rs-&gt;s_v1.s_magic,</div><div class='del'>-					       reiserfs_3_6_magic_string,</div><div class='del'>-					       sizeof</div><div class='del'>-					       (reiserfs_3_6_magic_string));</div><div class='del'>-</div><div class='del'>-				set_sb_version(rs, REISERFS_VERSION_2);</div><div class='del'>-				reiserfs_convert_objectid_map_v1(s);</div><div class='del'>-				set_bit(REISERFS_3_6, &amp;sbi-&gt;s_properties);</div><div class='del'>-				clear_bit(REISERFS_3_5, &amp;sbi-&gt;s_properties);</div><div class='del'>-			} else if (!silent) {</div><div class='del'>-				reiserfs_info(s, "using 3.5.x disk format\n");</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			set_sb_mnt_count(rs, sb_mnt_count(rs) + 1);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		journal_mark_dirty(&amp;th, SB_BUFFER_WITH_SB(s));</div><div class='del'>-		errval = journal_end(&amp;th);</div><div class='del'>-		if (errval) {</div><div class='del'>-			dput(s-&gt;s_root);</div><div class='del'>-			s-&gt;s_root = NULL;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-		if ((errval = reiserfs_lookup_privroot(s)) ||</div><div class='del'>-		    (errval = reiserfs_xattr_init(s, s-&gt;s_flags))) {</div><div class='del'>-			dput(s-&gt;s_root);</div><div class='del'>-			s-&gt;s_root = NULL;</div><div class='del'>-			goto error_unlocked;</div><div class='del'>-		}</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * look for files which were to be removed in previous session</div><div class='del'>-		 */</div><div class='del'>-		finish_unfinished(s);</div><div class='del'>-	} else {</div><div class='del'>-		if (old_format_only(s) &amp;&amp; !silent) {</div><div class='del'>-			reiserfs_info(s, "using 3.5.x disk format\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-		if ((errval = reiserfs_lookup_privroot(s)) ||</div><div class='del'>-		    (errval = reiserfs_xattr_init(s, s-&gt;s_flags))) {</div><div class='del'>-			dput(s-&gt;s_root);</div><div class='del'>-			s-&gt;s_root = NULL;</div><div class='del'>-			goto error_unlocked;</div><div class='del'>-		}</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * mark hash in super block: it could be unset. overwrite should be ok</div><div class='del'>-	 */</div><div class='del'>-	set_sb_hash_function_code(rs, function2code(sbi-&gt;s_hash_function));</div><div class='del'>-</div><div class='del'>-	handle_attrs(s);</div><div class='del'>-</div><div class='del'>-	reiserfs_proc_info_init(s);</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;(sbi-&gt;s_wait));</div><div class='del'>-	spin_lock_init(&amp;sbi-&gt;bitmap_lock);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-</div><div class='del'>-	return (0);</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	reiserfs_write_unlock(s);</div><div class='del'>-</div><div class='del'>-error_unlocked:</div><div class='del'>-	/* kill the commit thread, free journal ram */</div><div class='del'>-	if (jinit_done) {</div><div class='del'>-		reiserfs_write_lock(s);</div><div class='del'>-		journal_release_error(NULL, s);</div><div class='del'>-		reiserfs_write_unlock(s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sbi-&gt;commit_wq)</div><div class='del'>-		destroy_workqueue(sbi-&gt;commit_wq);</div><div class='del'>-</div><div class='del'>-	reiserfs_cancel_old_flush(s);</div><div class='del'>-</div><div class='del'>-	reiserfs_free_bitmap_cache(s);</div><div class='del'>-	if (SB_BUFFER_WITH_SB(s))</div><div class='del'>-		brelse(SB_BUFFER_WITH_SB(s));</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	{</div><div class='del'>-		int j;</div><div class='del'>-		for (j = 0; j &lt; REISERFS_MAXQUOTAS; j++)</div><div class='del'>-			kfree(qf_names[j]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	kfree(sbi-&gt;s_jdev);</div><div class='del'>-	kfree(sbi);</div><div class='del'>-</div><div class='del'>-	s-&gt;s_fs_info = NULL;</div><div class='del'>-	return errval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_super_block *rs = SB_DISK_SUPER_BLOCK(dentry-&gt;d_sb);</div><div class='del'>-</div><div class='del'>-	buf-&gt;f_namelen = (REISERFS_MAX_NAME(s-&gt;s_blocksize));</div><div class='del'>-	buf-&gt;f_bfree = sb_free_blocks(rs);</div><div class='del'>-	buf-&gt;f_bavail = buf-&gt;f_bfree;</div><div class='del'>-	buf-&gt;f_blocks = sb_block_count(rs) - sb_bmap_nr(rs) - 1;</div><div class='del'>-	buf-&gt;f_bsize = dentry-&gt;d_sb-&gt;s_blocksize;</div><div class='del'>-	/* changed to accommodate gcc folks. */</div><div class='del'>-	buf-&gt;f_type = REISERFS_SUPER_MAGIC;</div><div class='del'>-	buf-&gt;f_fsid.val[0] = (u32)crc32_le(0, rs-&gt;s_uuid, sizeof(rs-&gt;s_uuid)/2);</div><div class='del'>-	buf-&gt;f_fsid.val[1] = (u32)crc32_le(0, rs-&gt;s_uuid + sizeof(rs-&gt;s_uuid)/2,</div><div class='del'>-				sizeof(rs-&gt;s_uuid)/2);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-static int reiserfs_write_dquot(struct dquot *dquot)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int ret, err;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dquot-&gt;dq_sb);</div><div class='del'>-	ret =</div><div class='del'>-	    journal_begin(&amp;th, dquot-&gt;dq_sb,</div><div class='del'>-			  REISERFS_QUOTA_TRANS_BLOCKS(dquot-&gt;dq_sb));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-	depth = reiserfs_write_unlock_nested(dquot-&gt;dq_sb);</div><div class='del'>-	ret = dquot_commit(dquot);</div><div class='del'>-	reiserfs_write_lock_nested(dquot-&gt;dq_sb, depth);</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	if (!ret &amp;&amp; err)</div><div class='del'>-		ret = err;</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(dquot-&gt;dq_sb);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_acquire_dquot(struct dquot *dquot)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int ret, err;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dquot-&gt;dq_sb);</div><div class='del'>-	ret =</div><div class='del'>-	    journal_begin(&amp;th, dquot-&gt;dq_sb,</div><div class='del'>-			  REISERFS_QUOTA_INIT_BLOCKS(dquot-&gt;dq_sb));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-	depth = reiserfs_write_unlock_nested(dquot-&gt;dq_sb);</div><div class='del'>-	ret = dquot_acquire(dquot);</div><div class='del'>-	reiserfs_write_lock_nested(dquot-&gt;dq_sb, depth);</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	if (!ret &amp;&amp; err)</div><div class='del'>-		ret = err;</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(dquot-&gt;dq_sb);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_release_dquot(struct dquot *dquot)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int ret, err;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(dquot-&gt;dq_sb);</div><div class='del'>-	ret =</div><div class='del'>-	    journal_begin(&amp;th, dquot-&gt;dq_sb,</div><div class='del'>-			  REISERFS_QUOTA_DEL_BLOCKS(dquot-&gt;dq_sb));</div><div class='del'>-	reiserfs_write_unlock(dquot-&gt;dq_sb);</div><div class='del'>-	if (ret) {</div><div class='del'>-		/* Release dquot anyway to avoid endless cycle in dqput() */</div><div class='del'>-		dquot_release(dquot);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	ret = dquot_release(dquot);</div><div class='del'>-	reiserfs_write_lock(dquot-&gt;dq_sb);</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	if (!ret &amp;&amp; err)</div><div class='del'>-		ret = err;</div><div class='del'>-	reiserfs_write_unlock(dquot-&gt;dq_sb);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_mark_dquot_dirty(struct dquot *dquot)</div><div class='del'>-{</div><div class='del'>-	/* Are we journaling quotas? */</div><div class='del'>-	if (REISERFS_SB(dquot-&gt;dq_sb)-&gt;s_qf_names[USRQUOTA] ||</div><div class='del'>-	    REISERFS_SB(dquot-&gt;dq_sb)-&gt;s_qf_names[GRPQUOTA]) {</div><div class='del'>-		dquot_mark_dquot_dirty(dquot);</div><div class='del'>-		return reiserfs_write_dquot(dquot);</div><div class='del'>-	} else</div><div class='del'>-		return dquot_mark_dquot_dirty(dquot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_write_info(struct super_block *sb, int type)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int ret, err;</div><div class='del'>-	int depth;</div><div class='del'>-</div><div class='del'>-	/* Data block + inode block */</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-	ret = journal_begin(&amp;th, sb, 2);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-	depth = reiserfs_write_unlock_nested(sb);</div><div class='del'>-	ret = dquot_commit_info(sb, type);</div><div class='del'>-	reiserfs_write_lock_nested(sb, depth);</div><div class='del'>-	err = journal_end(&amp;th);</div><div class='del'>-	if (!ret &amp;&amp; err)</div><div class='del'>-		ret = err;</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Turn on quotas during mount time - we need to find the quota file and such...</div><div class='del'>- */</div><div class='del'>-static int reiserfs_quota_on_mount(struct super_block *sb, int type)</div><div class='del'>-{</div><div class='del'>-	return dquot_quota_on_mount(sb, REISERFS_SB(sb)-&gt;s_qf_names[type],</div><div class='del'>-					REISERFS_SB(sb)-&gt;s_jquota_fmt, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Standard function to be called on quota_on</div><div class='del'>- */</div><div class='del'>-static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,</div><div class='del'>-			     const struct path *path)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int opt = type == USRQUOTA ? REISERFS_USRQUOTA : REISERFS_GRPQUOTA;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(sb);</div><div class='del'>-	if (!(REISERFS_SB(sb)-&gt;s_mount_opt &amp; (1 &lt;&lt; opt))) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Quotafile not on the same filesystem? */</div><div class='del'>-	if (path-&gt;dentry-&gt;d_sb != sb) {</div><div class='del'>-		err = -EXDEV;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	inode = d_inode(path-&gt;dentry);</div><div class='del'>-	/*</div><div class='del'>-	 * We must not pack tails for quota files on reiserfs for quota</div><div class='del'>-	 * IO to work</div><div class='del'>-	 */</div><div class='del'>-	if (!(REISERFS_I(inode)-&gt;i_flags &amp; i_nopack_mask)) {</div><div class='del'>-		err = reiserfs_unpack(inode);</div><div class='del'>-		if (err) {</div><div class='del'>-			reiserfs_warning(sb, "super-6520",</div><div class='del'>-				"Unpacking tail of quota file failed"</div><div class='del'>-				" (%d). Cannot turn on quotas.", err);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-	}</div><div class='del'>-	/* Journaling quota? */</div><div class='del'>-	if (REISERFS_SB(sb)-&gt;s_qf_names[type]) {</div><div class='del'>-		/* Quotafile not of fs root? */</div><div class='del'>-		if (path-&gt;dentry-&gt;d_parent != sb-&gt;s_root)</div><div class='del'>-			reiserfs_warning(sb, "super-6521",</div><div class='del'>-				 "Quota file not on filesystem root. "</div><div class='del'>-				 "Journalled quota will not work.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When we journal data on quota file, we have to flush journal to see</div><div class='del'>-	 * all updates to the file when we bypass pagecache...</div><div class='del'>-	 */</div><div class='del'>-	if (reiserfs_file_data_log(inode)) {</div><div class='del'>-		/* Just start temporary transaction and finish it */</div><div class='del'>-		err = journal_begin(&amp;th, sb, 1);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		err = journal_end_sync(&amp;th);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-	err = dquot_quota_on(sb, type, format_id, path);</div><div class='del'>-	if (!err) {</div><div class='del'>-		inode_lock(inode);</div><div class='del'>-		REISERFS_I(inode)-&gt;i_attrs |= REISERFS_IMMUTABLE_FL |</div><div class='del'>-					      REISERFS_NOATIME_FL;</div><div class='del'>-		inode_set_flags(inode, S_IMMUTABLE | S_NOATIME,</div><div class='del'>-				S_IMMUTABLE | S_NOATIME);</div><div class='del'>-		inode_unlock(inode);</div><div class='del'>-		mark_inode_dirty(inode);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-out:</div><div class='del'>-	reiserfs_write_unlock(sb);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_quota_off(struct super_block *sb, int type)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct inode *inode = sb_dqopt(sb)-&gt;files[type];</div><div class='del'>-</div><div class='del'>-	if (!inode || !igrab(inode))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = dquot_quota_off(sb, type);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_put;</div><div class='del'>-</div><div class='del'>-	inode_lock(inode);</div><div class='del'>-	REISERFS_I(inode)-&gt;i_attrs &amp;= ~(REISERFS_IMMUTABLE_FL |</div><div class='del'>-					REISERFS_NOATIME_FL);</div><div class='del'>-	inode_set_flags(inode, 0, S_IMMUTABLE | S_NOATIME);</div><div class='del'>-	inode_unlock(inode);</div><div class='del'>-	mark_inode_dirty(inode);</div><div class='del'>-out_put:</div><div class='del'>-	iput(inode);</div><div class='del'>-	return err;</div><div class='del'>-out:</div><div class='del'>-	return dquot_quota_off(sb, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Read data from quotafile - avoid pagecache and such because we cannot afford</div><div class='del'>- * acquiring the locks... As quota files are never truncated and quota code</div><div class='del'>- * itself serializes the operations (and no one else should touch the files)</div><div class='del'>- * we don't have to be afraid of races</div><div class='del'>- */</div><div class='del'>-static ssize_t reiserfs_quota_read(struct super_block *sb, int type, char *data,</div><div class='del'>-				   size_t len, loff_t off)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = sb_dqopt(sb)-&gt;files[type];</div><div class='del'>-	unsigned long blk = off &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='del'>-	int err = 0, offset = off &amp; (sb-&gt;s_blocksize - 1), tocopy;</div><div class='del'>-	size_t toread;</div><div class='del'>-	struct buffer_head tmp_bh, *bh;</div><div class='del'>-	loff_t i_size = i_size_read(inode);</div><div class='del'>-</div><div class='del'>-	if (off &gt; i_size)</div><div class='del'>-		return 0;</div><div class='del'>-	if (off + len &gt; i_size)</div><div class='del'>-		len = i_size - off;</div><div class='del'>-	toread = len;</div><div class='del'>-	while (toread &gt; 0) {</div><div class='del'>-		tocopy = min_t(unsigned long, sb-&gt;s_blocksize - offset, toread);</div><div class='del'>-		tmp_bh.b_state = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * Quota files are without tails so we can safely</div><div class='del'>-		 * use this function</div><div class='del'>-		 */</div><div class='del'>-		reiserfs_write_lock(sb);</div><div class='del'>-		err = reiserfs_get_block(inode, blk, &amp;tmp_bh, 0);</div><div class='del'>-		reiserfs_write_unlock(sb);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		if (!buffer_mapped(&amp;tmp_bh))	/* A hole? */</div><div class='del'>-			memset(data, 0, tocopy);</div><div class='del'>-		else {</div><div class='del'>-			bh = sb_bread(sb, tmp_bh.b_blocknr);</div><div class='del'>-			if (!bh)</div><div class='del'>-				return -EIO;</div><div class='del'>-			memcpy(data, bh-&gt;b_data + offset, tocopy);</div><div class='del'>-			brelse(bh);</div><div class='del'>-		}</div><div class='del'>-		offset = 0;</div><div class='del'>-		toread -= tocopy;</div><div class='del'>-		data += tocopy;</div><div class='del'>-		blk++;</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Write to quotafile (we know the transaction is already started and has</div><div class='del'>- * enough credits)</div><div class='del'>- */</div><div class='del'>-static ssize_t reiserfs_quota_write(struct super_block *sb, int type,</div><div class='del'>-				    const char *data, size_t len, loff_t off)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = sb_dqopt(sb)-&gt;files[type];</div><div class='del'>-	unsigned long blk = off &gt;&gt; sb-&gt;s_blocksize_bits;</div><div class='del'>-	int err = 0, offset = off &amp; (sb-&gt;s_blocksize - 1), tocopy;</div><div class='del'>-	int journal_quota = REISERFS_SB(sb)-&gt;s_qf_names[type] != NULL;</div><div class='del'>-	size_t towrite = len;</div><div class='del'>-	struct buffer_head tmp_bh, *bh;</div><div class='del'>-</div><div class='del'>-	if (!current-&gt;journal_info) {</div><div class='del'>-		printk(KERN_WARNING "reiserfs: Quota write (off=%llu, len=%llu) cancelled because transaction is not started.\n",</div><div class='del'>-			(unsigned long long)off, (unsigned long long)len);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	while (towrite &gt; 0) {</div><div class='del'>-		tocopy = min_t(unsigned long, sb-&gt;s_blocksize - offset, towrite);</div><div class='del'>-		tmp_bh.b_state = 0;</div><div class='del'>-		reiserfs_write_lock(sb);</div><div class='del'>-		err = reiserfs_get_block(inode, blk, &amp;tmp_bh, GET_BLOCK_CREATE);</div><div class='del'>-		reiserfs_write_unlock(sb);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		if (offset || tocopy != sb-&gt;s_blocksize)</div><div class='del'>-			bh = sb_bread(sb, tmp_bh.b_blocknr);</div><div class='del'>-		else</div><div class='del'>-			bh = sb_getblk(sb, tmp_bh.b_blocknr);</div><div class='del'>-		if (!bh) {</div><div class='del'>-			err = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		lock_buffer(bh);</div><div class='del'>-		memcpy(bh-&gt;b_data + offset, data, tocopy);</div><div class='del'>-		flush_dcache_page(bh-&gt;b_page);</div><div class='del'>-		set_buffer_uptodate(bh);</div><div class='del'>-		unlock_buffer(bh);</div><div class='del'>-		reiserfs_write_lock(sb);</div><div class='del'>-		reiserfs_prepare_for_journal(sb, bh, 1);</div><div class='del'>-		journal_mark_dirty(current-&gt;journal_info, bh);</div><div class='del'>-		if (!journal_quota)</div><div class='del'>-			reiserfs_add_ordered_list(inode, bh);</div><div class='del'>-		reiserfs_write_unlock(sb);</div><div class='del'>-		brelse(bh);</div><div class='del'>-		offset = 0;</div><div class='del'>-		towrite -= tocopy;</div><div class='del'>-		data += tocopy;</div><div class='del'>-		blk++;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	if (len == towrite)</div><div class='del'>-		return err;</div><div class='del'>-	if (inode-&gt;i_size &lt; off + len - towrite)</div><div class='del'>-		i_size_write(inode, off + len - towrite);</div><div class='del'>-	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));</div><div class='del'>-	mark_inode_dirty(inode);</div><div class='del'>-	return len - towrite;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct dentry *get_super_block(struct file_system_type *fs_type,</div><div class='del'>-			   int flags, const char *dev_name,</div><div class='del'>-			   void *data)</div><div class='del'>-{</div><div class='del'>-	return mount_bdev(fs_type, flags, dev_name, data, reiserfs_fill_super);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_reiserfs_fs(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = init_inodecache();</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	reiserfs_proc_info_global_init();</div><div class='del'>-</div><div class='del'>-	ret = register_filesystem(&amp;reiserfs_fs_type);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-out:</div><div class='del'>-	reiserfs_proc_info_global_done();</div><div class='del'>-	destroy_inodecache();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit exit_reiserfs_fs(void)</div><div class='del'>-{</div><div class='del'>-	reiserfs_proc_info_global_done();</div><div class='del'>-	unregister_filesystem(&amp;reiserfs_fs_type);</div><div class='del'>-	destroy_inodecache();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct file_system_type reiserfs_fs_type = {</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.name = "reiserfs",</div><div class='del'>-	.mount = get_super_block,</div><div class='del'>-	.kill_sb = reiserfs_kill_sb,</div><div class='del'>-	.fs_flags = FS_REQUIRES_DEV,</div><div class='del'>-};</div><div class='del'>-MODULE_ALIAS_FS("reiserfs");</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("ReiserFS journaled filesystem");</div><div class='del'>-MODULE_AUTHOR("Hans Reiser &lt;reiser@namesys.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_init(init_reiserfs_fs);</div><div class='del'>-module_exit(exit_reiserfs_fs);</div><div class='head'>diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c<br/>deleted file mode 100644<br/>index 2cec61af2a9e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/tail_conversion.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/tail_conversion.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,318 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright 1999 Hans Reiser, see reiserfs/README for licensing and copyright</div><div class='del'>- * details</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * access to tail : when one is going to read tail it must make sure, that is</div><div class='del'>- * not running.  direct2indirect and indirect2direct can not run concurrently</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Converts direct items to an unformatted node. Panics if file has no</div><div class='del'>- * tail. -ENOSPC if no disk space for conversion</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * path points to first direct item of the file regardless of how many of</div><div class='del'>- * them are there</div><div class='del'>- */</div><div class='del'>-int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,</div><div class='del'>-		    struct treepath *path, struct buffer_head *unbh,</div><div class='del'>-		    loff_t tail_offset)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct buffer_head *up_to_date_bh;</div><div class='del'>-	struct item_head *p_le_ih = tp_item_head(path);</div><div class='del'>-	unsigned long total_tail = 0;</div><div class='del'>-</div><div class='del'>-	/* Key to search for the last byte of the converted item. */</div><div class='del'>-	struct cpu_key end_key;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * new indirect item to be inserted or key</div><div class='del'>-	 * of unfm pointer to be pasted</div><div class='del'>-	 */</div><div class='del'>-	struct item_head ind_ih;</div><div class='del'>-	int blk_size;</div><div class='del'>-	/* returned value for reiserfs_insert_item and clones */</div><div class='del'>-	int  retval;</div><div class='del'>-	/* Handle on an unformatted node that will be inserted in the tree. */</div><div class='del'>-	unp_t unfm_ptr;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	REISERFS_SB(sb)-&gt;s_direct2indirect++;</div><div class='del'>-</div><div class='del'>-	blk_size = sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * and key to search for append or insert pointer to the new</div><div class='del'>-	 * unformatted node.</div><div class='del'>-	 */</div><div class='del'>-	copy_item_head(&amp;ind_ih, p_le_ih);</div><div class='del'>-	set_le_ih_k_offset(&amp;ind_ih, tail_offset);</div><div class='del'>-	set_le_ih_k_type(&amp;ind_ih, TYPE_INDIRECT);</div><div class='del'>-</div><div class='del'>-	/* Set the key to search for the place for new unfm pointer */</div><div class='del'>-	make_cpu_key(&amp;end_key, inode, tail_offset, TYPE_INDIRECT, 4);</div><div class='del'>-</div><div class='del'>-	/* FIXME: we could avoid this */</div><div class='del'>-	if (search_for_position_by_key(sb, &amp;end_key, path) == POSITION_FOUND) {</div><div class='del'>-		reiserfs_error(sb, "PAP-14030",</div><div class='del'>-			       "pasted or inserted byte exists in "</div><div class='del'>-			       "the tree %K. Use fsck to repair.", &amp;end_key);</div><div class='del'>-		pathrelse(path);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p_le_ih = tp_item_head(path);</div><div class='del'>-</div><div class='del'>-	unfm_ptr = cpu_to_le32(unbh-&gt;b_blocknr);</div><div class='del'>-</div><div class='del'>-	if (is_statdata_le_ih(p_le_ih)) {</div><div class='del'>-		/* Insert new indirect item. */</div><div class='del'>-		set_ih_free_space(&amp;ind_ih, 0);	/* delete at nearest future */</div><div class='del'>-		put_ih_item_len(&amp;ind_ih, UNFM_P_SIZE);</div><div class='del'>-		PATH_LAST_POSITION(path)++;</div><div class='del'>-		retval =</div><div class='del'>-		    reiserfs_insert_item(th, path, &amp;end_key, &amp;ind_ih, inode,</div><div class='del'>-					 (char *)&amp;unfm_ptr);</div><div class='del'>-	} else {</div><div class='del'>-		/* Paste into last indirect item of an object. */</div><div class='del'>-		retval = reiserfs_paste_into_item(th, path, &amp;end_key, inode,</div><div class='del'>-						    (char *)&amp;unfm_ptr,</div><div class='del'>-						    UNFM_P_SIZE);</div><div class='del'>-	}</div><div class='del'>-	if (retval) {</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * note: from here there are two keys which have matching first</div><div class='del'>-	 *  three key components. They only differ by the fourth one.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Set the key to search for the direct items of the file */</div><div class='del'>-	make_cpu_key(&amp;end_key, inode, max_reiserfs_offset(inode), TYPE_DIRECT,</div><div class='del'>-		     4);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Move bytes from the direct items to the new unformatted node</div><div class='del'>-	 * and delete them.</div><div class='del'>-	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		int tail_size;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * end_key.k_offset is set so, that we will always have found</div><div class='del'>-		 * last item of the file</div><div class='del'>-		 */</div><div class='del'>-		if (search_for_position_by_key(sb, &amp;end_key, path) ==</div><div class='del'>-		    POSITION_FOUND)</div><div class='del'>-			reiserfs_panic(sb, "PAP-14050",</div><div class='del'>-				       "direct item (%K) not found", &amp;end_key);</div><div class='del'>-		p_le_ih = tp_item_head(path);</div><div class='del'>-		RFALSE(!is_direct_le_ih(p_le_ih),</div><div class='del'>-		       "vs-14055: direct item expected(%K), found %h",</div><div class='del'>-		       &amp;end_key, p_le_ih);</div><div class='del'>-		tail_size = (le_ih_k_offset(p_le_ih) &amp; (blk_size - 1))</div><div class='del'>-		    + ih_item_len(p_le_ih) - 1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * we only send the unbh pointer if the buffer is not</div><div class='del'>-		 * up to date.  this avoids overwriting good data from</div><div class='del'>-		 * writepage() with old data from the disk or buffer cache</div><div class='del'>-		 * Special case: unbh-&gt;b_page will be NULL if we are coming</div><div class='del'>-		 * through DIRECT_IO handler here.</div><div class='del'>-		 */</div><div class='del'>-		if (!unbh-&gt;b_page || buffer_uptodate(unbh)</div><div class='del'>-		    || PageUptodate(unbh-&gt;b_page)) {</div><div class='del'>-			up_to_date_bh = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			up_to_date_bh = unbh;</div><div class='del'>-		}</div><div class='del'>-		retval = reiserfs_delete_item(th, path, &amp;end_key, inode,</div><div class='del'>-						up_to_date_bh);</div><div class='del'>-</div><div class='del'>-		total_tail += retval;</div><div class='del'>-</div><div class='del'>-		/* done: file does not have direct items anymore */</div><div class='del'>-		if (tail_size == retval)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * if we've copied bytes from disk into the page, we need to zero</div><div class='del'>-	 * out the unused part of the block (it was not up to date before)</div><div class='del'>-	 */</div><div class='del'>-	if (up_to_date_bh) {</div><div class='del'>-		unsigned pgoff =</div><div class='del'>-		    (tail_offset + total_tail - 1) &amp; (PAGE_SIZE - 1);</div><div class='del'>-		char *kaddr = kmap_atomic(up_to_date_bh-&gt;b_page);</div><div class='del'>-		memset(kaddr + pgoff, 0, blk_size - total_tail);</div><div class='del'>-		kunmap_atomic(kaddr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	REISERFS_I(inode)-&gt;i_first_direct_byte = U32_MAX;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stolen from fs/buffer.c */</div><div class='del'>-void reiserfs_unmap_buffer(struct buffer_head *bh)</div><div class='del'>-{</div><div class='del'>-	lock_buffer(bh);</div><div class='del'>-	if (buffer_journaled(bh) || buffer_journal_dirty(bh)) {</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	clear_buffer_dirty(bh);</div><div class='del'>-	/*</div><div class='del'>-	 * Remove the buffer from whatever list it belongs to. We are mostly</div><div class='del'>-	 * interested in removing it from per-sb j_dirty_buffers list, to avoid</div><div class='del'>-	 * BUG() on attempt to write not mapped buffer</div><div class='del'>-	 */</div><div class='del'>-	if ((!list_empty(&amp;bh-&gt;b_assoc_buffers) || bh-&gt;b_private) &amp;&amp; bh-&gt;b_page) {</div><div class='del'>-		struct inode *inode = bh-&gt;b_folio-&gt;mapping-&gt;host;</div><div class='del'>-		struct reiserfs_journal *j = SB_JOURNAL(inode-&gt;i_sb);</div><div class='del'>-		spin_lock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-		list_del_init(&amp;bh-&gt;b_assoc_buffers);</div><div class='del'>-		reiserfs_free_jh(bh);</div><div class='del'>-		spin_unlock(&amp;j-&gt;j_dirty_buffers_lock);</div><div class='del'>-	}</div><div class='del'>-	clear_buffer_mapped(bh);</div><div class='del'>-	clear_buffer_req(bh);</div><div class='del'>-	clear_buffer_new(bh);</div><div class='del'>-	bh-&gt;b_bdev = NULL;</div><div class='del'>-	unlock_buffer(bh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this first locks inode (neither reads nor sync are permitted),</div><div class='del'>- * reads tail through page cache, insert direct item. When direct item</div><div class='del'>- * inserted successfully inode is left locked. Return value is always</div><div class='del'>- * what we expect from it (number of cut bytes). But when tail remains</div><div class='del'>- * in the unformatted node, we set mode to SKIP_BALANCING and unlock</div><div class='del'>- * inode</div><div class='del'>- */</div><div class='del'>-int indirect2direct(struct reiserfs_transaction_handle *th,</div><div class='del'>-		    struct inode *inode, struct page *page,</div><div class='del'>-		    struct treepath *path,	/* path to the indirect item. */</div><div class='del'>-		    const struct cpu_key *item_key,	/* Key to look for</div><div class='del'>-							 * unformatted node</div><div class='del'>-							 * pointer to be cut. */</div><div class='del'>-		    loff_t n_new_file_size,	/* New file size. */</div><div class='del'>-		    char *mode)</div><div class='del'>-{</div><div class='del'>-	struct super_block *sb = inode-&gt;i_sb;</div><div class='del'>-	struct item_head s_ih;</div><div class='del'>-	unsigned long block_size = sb-&gt;s_blocksize;</div><div class='del'>-	char *tail;</div><div class='del'>-	int tail_len, round_tail_len;</div><div class='del'>-	loff_t pos, pos1;	/* position of first byte of the tail */</div><div class='del'>-	struct cpu_key key;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!th-&gt;t_trans_id);</div><div class='del'>-</div><div class='del'>-	REISERFS_SB(sb)-&gt;s_indirect2direct++;</div><div class='del'>-</div><div class='del'>-	*mode = M_SKIP_BALANCING;</div><div class='del'>-</div><div class='del'>-	/* store item head path points to. */</div><div class='del'>-	copy_item_head(&amp;s_ih, tp_item_head(path));</div><div class='del'>-</div><div class='del'>-	tail_len = (n_new_file_size &amp; (block_size - 1));</div><div class='del'>-	if (get_inode_sd_version(inode) == STAT_DATA_V2)</div><div class='del'>-		round_tail_len = ROUND_UP(tail_len);</div><div class='del'>-	else</div><div class='del'>-		round_tail_len = tail_len;</div><div class='del'>-</div><div class='del'>-	pos =</div><div class='del'>-	    le_ih_k_offset(&amp;s_ih) - 1 + (ih_item_len(&amp;s_ih) / UNFM_P_SIZE -</div><div class='del'>-					 1) * sb-&gt;s_blocksize;</div><div class='del'>-	pos1 = pos;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we are protected by i_mutex. The tail can not disapper, not</div><div class='del'>-	 * append can be done either</div><div class='del'>-	 * we are in truncate or packing tail in file_release</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	tail = (char *)kmap(page);	/* this can schedule */</div><div class='del'>-</div><div class='del'>-	if (path_changed(&amp;s_ih, path)) {</div><div class='del'>-		/* re-search indirect item */</div><div class='del'>-		if (search_for_position_by_key(sb, item_key, path)</div><div class='del'>-		    == POSITION_NOT_FOUND)</div><div class='del'>-			reiserfs_panic(sb, "PAP-5520",</div><div class='del'>-				       "item to be converted %K does not exist",</div><div class='del'>-				       item_key);</div><div class='del'>-		copy_item_head(&amp;s_ih, tp_item_head(path));</div><div class='del'>-#ifdef CONFIG_REISERFS_CHECK</div><div class='del'>-		pos = le_ih_k_offset(&amp;s_ih) - 1 +</div><div class='del'>-		    (ih_item_len(&amp;s_ih) / UNFM_P_SIZE -</div><div class='del'>-		     1) * sb-&gt;s_blocksize;</div><div class='del'>-		if (pos != pos1)</div><div class='del'>-			reiserfs_panic(sb, "vs-5530", "tail position "</div><div class='del'>-				       "changed while we were reading it");</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set direct item header to insert. */</div><div class='del'>-	make_le_item_head(&amp;s_ih, NULL, get_inode_item_key_version(inode),</div><div class='del'>-			  pos1 + 1, TYPE_DIRECT, round_tail_len,</div><div class='del'>-			  0xffff /*ih_free_space */ );</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we want a pointer to the first byte of the tail in the page.</div><div class='del'>-	 * the page was locked and this part of the page was up to date when</div><div class='del'>-	 * indirect2direct was called, so we know the bytes are still valid</div><div class='del'>-	 */</div><div class='del'>-	tail = tail + (pos &amp; (PAGE_SIZE - 1));</div><div class='del'>-</div><div class='del'>-	PATH_LAST_POSITION(path)++;</div><div class='del'>-</div><div class='del'>-	key = *item_key;</div><div class='del'>-	set_cpu_key_k_type(&amp;key, TYPE_DIRECT);</div><div class='del'>-	key.key_length = 4;</div><div class='del'>-	/* Insert tail as new direct item in the tree */</div><div class='del'>-	if (reiserfs_insert_item(th, path, &amp;key, &amp;s_ih, inode,</div><div class='del'>-				 tail ? tail : NULL) &lt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * No disk memory. So we can not convert last unformatted node</div><div class='del'>-		 * to the direct item.  In this case we used to adjust</div><div class='del'>-		 * indirect items's ih_free_space. Now ih_free_space is not</div><div class='del'>-		 * used, it would be ideal to write zeros to corresponding</div><div class='del'>-		 * unformatted node. For now i_size is considered as guard for</div><div class='del'>-		 * going out of file size</div><div class='del'>-		 */</div><div class='del'>-		kunmap(page);</div><div class='del'>-		return block_size - round_tail_len;</div><div class='del'>-	}</div><div class='del'>-	kunmap(page);</div><div class='del'>-</div><div class='del'>-	/* make sure to get the i_blocks changes from reiserfs_insert_item */</div><div class='del'>-	reiserfs_update_sd(th, inode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * note: we have now the same as in above direct2indirect</div><div class='del'>-	 * conversion: there are two keys which have matching first three</div><div class='del'>-	 * key components. They only differ by the fourth one.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We have inserted new direct item and must remove last</div><div class='del'>-	 * unformatted node.</div><div class='del'>-	 */</div><div class='del'>-	*mode = M_CUT;</div><div class='del'>-</div><div class='del'>-	/* we store position of first direct item in the in-core inode */</div><div class='del'>-	/* mark_file_with_tail (inode, pos1 + 1); */</div><div class='del'>-	REISERFS_I(inode)-&gt;i_first_direct_byte = pos1 + 1;</div><div class='del'>-</div><div class='del'>-	return block_size - round_tail_len;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c<br/>deleted file mode 100644<br/>index 998035a6388e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/xattr.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1039 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * linux/fs/reiserfs/xattr.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2002 by Jeff Mahoney, &lt;jeffm@suse.com&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In order to implement EA/ACLs in a clean, backwards compatible manner,</div><div class='del'>- * they are implemented as files in a "private" directory.</div><div class='del'>- * Each EA is in it's own file, with the directory layout like so (/ is assumed</div><div class='del'>- * to be relative to fs root). Inside the /.reiserfs_priv/xattrs directory,</div><div class='del'>- * directories named using the capital-hex form of the objectid and</div><div class='del'>- * generation number are used. Inside each directory are individual files</div><div class='del'>- * named with the name of the extended attribute.</div><div class='del'>- *</div><div class='del'>- * So, for objectid 12648430, we could have:</div><div class='del'>- * /.reiserfs_priv/xattrs/C0FFEE.0/system.posix_acl_access</div><div class='del'>- * /.reiserfs_priv/xattrs/C0FFEE.0/system.posix_acl_default</div><div class='del'>- * /.reiserfs_priv/xattrs/C0FFEE.0/user.Content-Type</div><div class='del'>- * .. or similar.</div><div class='del'>- *</div><div class='del'>- * The file contents are the text of the EA. The size is known based on the</div><div class='del'>- * stat data describing the file.</div><div class='del'>- *</div><div class='del'>- * In the case of system.posix_acl_access and system.posix_acl_default, since</div><div class='del'>- * these are special cases for filesystem ACLs, they are interpreted by the</div><div class='del'>- * kernel, in addition, they are negatively and positively cached and attached</div><div class='del'>- * to the inode so that unnecessary lookups are avoided.</div><div class='del'>- *</div><div class='del'>- * Locking works like so:</div><div class='del'>- * Directory components (xattr root, xattr dir) are protectd by their i_mutex.</div><div class='del'>- * The xattrs themselves are protected by the xattr_sem.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/dcache.h&gt;</div><div class='del'>-#include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-#include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/quotaops.h&gt;</div><div class='del'>-#include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl_xattr.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-</div><div class='del'>-#define PRIVROOT_NAME ".reiserfs_priv"</div><div class='del'>-#define XAROOT_NAME   "xattrs"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Helpers for inode ops. We do this so that we don't have all the VFS</div><div class='del'>- * overhead and also for proper i_mutex annotation.</div><div class='del'>- * dir-&gt;i_mutex must be held for all of them.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_XATTR</div><div class='del'>-static int xattr_create(struct inode *dir, struct dentry *dentry, int mode)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!inode_is_locked(dir));</div><div class='del'>-	return dir-&gt;i_op-&gt;create(&amp;nop_mnt_idmap, dir, dentry, mode, true);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int xattr_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!inode_is_locked(dir));</div><div class='del'>-	return dir-&gt;i_op-&gt;mkdir(&amp;nop_mnt_idmap, dir, dentry, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We use I_MUTEX_CHILD here to silence lockdep. It's safe because xattr</div><div class='del'>- * mutation ops aren't called during rename or splace, which are the</div><div class='del'>- * only other users of I_MUTEX_CHILD. It violates the ordering, but that's</div><div class='del'>- * better than allocating another subclass just for this code.</div><div class='del'>- */</div><div class='del'>-static int xattr_unlink(struct inode *dir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!inode_is_locked(dir));</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(dentry), I_MUTEX_CHILD);</div><div class='del'>-	error = dir-&gt;i_op-&gt;unlink(dir, dentry);</div><div class='del'>-	inode_unlock(d_inode(dentry));</div><div class='del'>-</div><div class='del'>-	if (!error)</div><div class='del'>-		d_delete(dentry);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xattr_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!inode_is_locked(dir));</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(dentry), I_MUTEX_CHILD);</div><div class='del'>-	error = dir-&gt;i_op-&gt;rmdir(dir, dentry);</div><div class='del'>-	if (!error)</div><div class='del'>-		d_inode(dentry)-&gt;i_flags |= S_DEAD;</div><div class='del'>-	inode_unlock(d_inode(dentry));</div><div class='del'>-	if (!error)</div><div class='del'>-		d_delete(dentry);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define xattr_may_create(flags)	(!flags || flags &amp; XATTR_CREATE)</div><div class='del'>-</div><div class='del'>-static struct dentry *open_xa_root(struct super_block *sb, int flags)</div><div class='del'>-{</div><div class='del'>-	struct dentry *privroot = REISERFS_SB(sb)-&gt;priv_root;</div><div class='del'>-	struct dentry *xaroot;</div><div class='del'>-</div><div class='del'>-	if (d_really_is_negative(privroot))</div><div class='del'>-		return ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(privroot), I_MUTEX_XATTR);</div><div class='del'>-</div><div class='del'>-	xaroot = dget(REISERFS_SB(sb)-&gt;xattr_root);</div><div class='del'>-	if (!xaroot)</div><div class='del'>-		xaroot = ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-	else if (d_really_is_negative(xaroot)) {</div><div class='del'>-		int err = -ENODATA;</div><div class='del'>-</div><div class='del'>-		if (xattr_may_create(flags))</div><div class='del'>-			err = xattr_mkdir(d_inode(privroot), xaroot, 0700);</div><div class='del'>-		if (err) {</div><div class='del'>-			dput(xaroot);</div><div class='del'>-			xaroot = ERR_PTR(err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_unlock(d_inode(privroot));</div><div class='del'>-	return xaroot;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dentry *open_xa_dir(const struct inode *inode, int flags)</div><div class='del'>-{</div><div class='del'>-	struct dentry *xaroot, *xadir;</div><div class='del'>-	char namebuf[17];</div><div class='del'>-</div><div class='del'>-	xaroot = open_xa_root(inode-&gt;i_sb, flags);</div><div class='del'>-	if (IS_ERR(xaroot))</div><div class='del'>-		return xaroot;</div><div class='del'>-</div><div class='del'>-	snprintf(namebuf, sizeof(namebuf), "%X.%X",</div><div class='del'>-		 le32_to_cpu(INODE_PKEY(inode)-&gt;k_objectid),</div><div class='del'>-		 inode-&gt;i_generation);</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(xaroot), I_MUTEX_XATTR);</div><div class='del'>-</div><div class='del'>-	xadir = lookup_one_len(namebuf, xaroot, strlen(namebuf));</div><div class='del'>-	if (!IS_ERR(xadir) &amp;&amp; d_really_is_negative(xadir)) {</div><div class='del'>-		int err = -ENODATA;</div><div class='del'>-</div><div class='del'>-		if (xattr_may_create(flags))</div><div class='del'>-			err = xattr_mkdir(d_inode(xaroot), xadir, 0700);</div><div class='del'>-		if (err) {</div><div class='del'>-			dput(xadir);</div><div class='del'>-			xadir = ERR_PTR(err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_unlock(d_inode(xaroot));</div><div class='del'>-	dput(xaroot);</div><div class='del'>-	return xadir;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following are side effects of other operations that aren't explicitly</div><div class='del'>- * modifying extended attributes. This includes operations such as permissions</div><div class='del'>- * or ownership changes, object deletions, etc.</div><div class='del'>- */</div><div class='del'>-struct reiserfs_dentry_buf {</div><div class='del'>-	struct dir_context ctx;</div><div class='del'>-	struct dentry *xadir;</div><div class='del'>-	int count;</div><div class='del'>-	int err;</div><div class='del'>-	struct dentry *dentries[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool</div><div class='del'>-fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,</div><div class='del'>-		   loff_t offset, u64 ino, unsigned int d_type)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_dentry_buf *dbuf =</div><div class='del'>-		container_of(ctx, struct reiserfs_dentry_buf, ctx);</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(!inode_is_locked(d_inode(dbuf-&gt;xadir)));</div><div class='del'>-</div><div class='del'>-	if (dbuf-&gt;count == ARRAY_SIZE(dbuf-&gt;dentries))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (name[0] == '.' &amp;&amp; (namelen &lt; 2 ||</div><div class='del'>-			       (namelen == 2 &amp;&amp; name[1] == '.')))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	dentry = lookup_one_len(name, dbuf-&gt;xadir, namelen);</div><div class='del'>-	if (IS_ERR(dentry)) {</div><div class='del'>-		dbuf-&gt;err = PTR_ERR(dentry);</div><div class='del'>-		return false;</div><div class='del'>-	} else if (d_really_is_negative(dentry)) {</div><div class='del'>-		/* A directory entry exists, but no file? */</div><div class='del'>-		reiserfs_error(dentry-&gt;d_sb, "xattr-20003",</div><div class='del'>-			       "Corrupted directory: xattr %pd listed but "</div><div class='del'>-			       "not found for file %pd.\n",</div><div class='del'>-			       dentry, dbuf-&gt;xadir);</div><div class='del'>-		dput(dentry);</div><div class='del'>-		dbuf-&gt;err = -EIO;</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dbuf-&gt;dentries[dbuf-&gt;count++] = dentry;</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cleanup_dentry_buf(struct reiserfs_dentry_buf *buf)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; buf-&gt;count; i++)</div><div class='del'>-		if (buf-&gt;dentries[i])</div><div class='del'>-			dput(buf-&gt;dentries[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reiserfs_for_each_xattr(struct inode *inode,</div><div class='del'>-				   int (*action)(struct dentry *, void *),</div><div class='del'>-				   void *data)</div><div class='del'>-{</div><div class='del'>-	struct dentry *dir;</div><div class='del'>-	int i, err = 0;</div><div class='del'>-	struct reiserfs_dentry_buf buf = {</div><div class='del'>-		.ctx.actor = fill_with_dentries,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Skip out, an xattr has no xattrs associated with it */</div><div class='del'>-	if (IS_PRIVATE(inode) || get_inode_sd_version(inode) == STAT_DATA_V1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dir = open_xa_dir(inode, XATTR_REPLACE);</div><div class='del'>-	if (IS_ERR(dir)) {</div><div class='del'>-		err = PTR_ERR(dir);</div><div class='del'>-		goto out;</div><div class='del'>-	} else if (d_really_is_negative(dir)) {</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_dir;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(dir), I_MUTEX_XATTR);</div><div class='del'>-</div><div class='del'>-	buf.xadir = dir;</div><div class='del'>-	while (1) {</div><div class='del'>-		err = reiserfs_readdir_inode(d_inode(dir), &amp;buf.ctx);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		if (buf.err) {</div><div class='del'>-			err = buf.err;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!buf.count)</div><div class='del'>-			break;</div><div class='del'>-		for (i = 0; !err &amp;&amp; i &lt; buf.count &amp;&amp; buf.dentries[i]; i++) {</div><div class='del'>-			struct dentry *dentry = buf.dentries[i];</div><div class='del'>-</div><div class='del'>-			if (!d_is_dir(dentry))</div><div class='del'>-				err = action(dentry, data);</div><div class='del'>-</div><div class='del'>-			dput(dentry);</div><div class='del'>-			buf.dentries[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-		buf.count = 0;</div><div class='del'>-	}</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='del'>-</div><div class='del'>-	cleanup_dentry_buf(&amp;buf);</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		/*</div><div class='del'>-		 * We start a transaction here to avoid a ABBA situation</div><div class='del'>-		 * between the xattr root's i_mutex and the journal lock.</div><div class='del'>-		 * This doesn't incur much additional overhead since the</div><div class='del'>-		 * new transaction will just nest inside the</div><div class='del'>-		 * outer transaction.</div><div class='del'>-		 */</div><div class='del'>-		int blocks = JOURNAL_PER_BALANCE_CNT * 2 + 2 +</div><div class='del'>-			     4 * REISERFS_QUOTA_TRANS_BLOCKS(inode-&gt;i_sb);</div><div class='del'>-		struct reiserfs_transaction_handle th;</div><div class='del'>-</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		err = journal_begin(&amp;th, inode-&gt;i_sb, blocks);</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		if (!err) {</div><div class='del'>-			int jerror;</div><div class='del'>-</div><div class='del'>-			inode_lock_nested(d_inode(dir-&gt;d_parent),</div><div class='del'>-					  I_MUTEX_XATTR);</div><div class='del'>-			err = action(dir, data);</div><div class='del'>-			reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-			jerror = journal_end(&amp;th);</div><div class='del'>-			reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-			inode_unlock(d_inode(dir-&gt;d_parent));</div><div class='del'>-			err = jerror ?: err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out_dir:</div><div class='del'>-	dput(dir);</div><div class='del'>-out:</div><div class='del'>-	/*</div><div class='del'>-	 * -ENODATA: this object doesn't have any xattrs</div><div class='del'>-	 * -EOPNOTSUPP: this file system doesn't have xattrs enabled on disk.</div><div class='del'>-	 * Neither are errors</div><div class='del'>-	 */</div><div class='del'>-	if (err == -ENODATA || err == -EOPNOTSUPP)</div><div class='del'>-		err = 0;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int delete_one_xattr(struct dentry *dentry, void *data)</div><div class='del'>-{</div><div class='del'>-	struct inode *dir = d_inode(dentry-&gt;d_parent);</div><div class='del'>-</div><div class='del'>-	/* This is the xattr dir, handle specially. */</div><div class='del'>-	if (d_is_dir(dentry))</div><div class='del'>-		return xattr_rmdir(dir, dentry);</div><div class='del'>-</div><div class='del'>-	return xattr_unlink(dir, dentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int chown_one_xattr(struct dentry *dentry, void *data)</div><div class='del'>-{</div><div class='del'>-	struct iattr *attrs = data;</div><div class='del'>-	int ia_valid = attrs-&gt;ia_valid;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We only want the ownership bits. Otherwise, we'll do</div><div class='del'>-	 * things like change a directory to a regular file if</div><div class='del'>-	 * ATTR_MODE is set.</div><div class='del'>-	 */</div><div class='del'>-	attrs-&gt;ia_valid &amp;= (ATTR_UID|ATTR_GID);</div><div class='del'>-	err = reiserfs_setattr(&amp;nop_mnt_idmap, dentry, attrs);</div><div class='del'>-	attrs-&gt;ia_valid = ia_valid;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No i_mutex, but the inode is unconnected. */</div><div class='del'>-int reiserfs_delete_xattrs(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	int err = reiserfs_for_each_xattr(inode, delete_one_xattr, NULL);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "jdm-20004",</div><div class='del'>-				 "Couldn't delete all xattrs (%d)\n", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* inode-&gt;i_mutex: down */</div><div class='del'>-int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs)</div><div class='del'>-{</div><div class='del'>-	int err = reiserfs_for_each_xattr(inode, chown_one_xattr, attrs);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "jdm-20007",</div><div class='del'>-				 "Couldn't chown all xattrs (%d)\n", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_XATTR</div><div class='del'>-/*</div><div class='del'>- * Returns a dentry corresponding to a specific extended attribute file</div><div class='del'>- * for the inode. If flags allow, the file is created. Otherwise, a</div><div class='del'>- * valid or negative dentry, or an error is returned.</div><div class='del'>- */</div><div class='del'>-static struct dentry *xattr_lookup(struct inode *inode, const char *name,</div><div class='del'>-				    int flags)</div><div class='del'>-{</div><div class='del'>-	struct dentry *xadir, *xafile;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	xadir = open_xa_dir(inode, flags);</div><div class='del'>-	if (IS_ERR(xadir))</div><div class='del'>-		return ERR_CAST(xadir);</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(xadir), I_MUTEX_XATTR);</div><div class='del'>-	xafile = lookup_one_len(name, xadir, strlen(name));</div><div class='del'>-	if (IS_ERR(xafile)) {</div><div class='del'>-		err = PTR_ERR(xafile);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d_really_is_positive(xafile) &amp;&amp; (flags &amp; XATTR_CREATE))</div><div class='del'>-		err = -EEXIST;</div><div class='del'>-</div><div class='del'>-	if (d_really_is_negative(xafile)) {</div><div class='del'>-		err = -ENODATA;</div><div class='del'>-		if (xattr_may_create(flags))</div><div class='del'>-			err = xattr_create(d_inode(xadir), xafile,</div><div class='del'>-					      0700|S_IFREG);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		dput(xafile);</div><div class='del'>-out:</div><div class='del'>-	inode_unlock(d_inode(xadir));</div><div class='del'>-	dput(xadir);</div><div class='del'>-	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	return xafile;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Internal operations on file data */</div><div class='del'>-static inline void reiserfs_put_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	kunmap(page);</div><div class='del'>-	put_page(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct page *reiserfs_get_page(struct inode *dir, size_t n)</div><div class='del'>-{</div><div class='del'>-	struct address_space *mapping = dir-&gt;i_mapping;</div><div class='del'>-	struct page *page;</div><div class='del'>-	/*</div><div class='del'>-	 * We can deadlock if we try to free dentries,</div><div class='del'>-	 * and an unlink/rmdir has just occurred - GFP_NOFS avoids this</div><div class='del'>-	 */</div><div class='del'>-	mapping_set_gfp_mask(mapping, GFP_NOFS);</div><div class='del'>-	page = read_mapping_page(mapping, n &gt;&gt; PAGE_SHIFT, NULL);</div><div class='del'>-	if (!IS_ERR(page))</div><div class='del'>-		kmap(page);</div><div class='del'>-	return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 xattr_hash(const char *msg, int len)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * csum_partial() gives different results for little-endian and</div><div class='del'>-	 * big endian hosts. Images created on little-endian hosts and</div><div class='del'>-	 * mounted on big-endian hosts(and vice versa) will see csum mismatches</div><div class='del'>-	 * when trying to fetch xattrs. Treating the hash as __wsum_t would</div><div class='del'>-	 * lower the frequency of mismatch.  This is an endianness bug in</div><div class='del'>-	 * reiserfs.  The return statement would result in a sparse warning. Do</div><div class='del'>-	 * not fix the sparse warning so as to not hide a reminder of the bug.</div><div class='del'>-	 */</div><div class='del'>-	return csum_partial(msg, len, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_commit_write(struct file *f, struct page *page,</div><div class='del'>-			  unsigned from, unsigned to);</div><div class='del'>-</div><div class='del'>-static void update_ctime(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct timespec64 now = current_time(inode);</div><div class='del'>-	struct timespec64 ctime = inode_get_ctime(inode);</div><div class='del'>-</div><div class='del'>-	if (inode_unhashed(inode) || !inode-&gt;i_nlink ||</div><div class='del'>-	    timespec64_equal(&amp;ctime, &amp;now))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inode_set_ctime_to_ts(inode, now);</div><div class='del'>-	mark_inode_dirty(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lookup_and_delete_xattr(struct inode *inode, const char *name)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct dentry *dentry, *xadir;</div><div class='del'>-</div><div class='del'>-	xadir = open_xa_dir(inode, XATTR_REPLACE);</div><div class='del'>-	if (IS_ERR(xadir))</div><div class='del'>-		return PTR_ERR(xadir);</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(xadir), I_MUTEX_XATTR);</div><div class='del'>-	dentry = lookup_one_len(name, xadir, strlen(name));</div><div class='del'>-	if (IS_ERR(dentry)) {</div><div class='del'>-		err = PTR_ERR(dentry);</div><div class='del'>-		goto out_dput;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d_really_is_positive(dentry)) {</div><div class='del'>-		err = xattr_unlink(d_inode(xadir), dentry);</div><div class='del'>-		update_ctime(inode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dput(dentry);</div><div class='del'>-out_dput:</div><div class='del'>-	inode_unlock(d_inode(xadir));</div><div class='del'>-	dput(xadir);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Generic extended attribute operations that can be used by xa plugins */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inode-&gt;i_mutex: down</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,</div><div class='del'>-			  struct inode *inode, const char *name,</div><div class='del'>-			  const void *buffer, size_t buffer_size, int flags)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	struct page *page;</div><div class='del'>-	char *data;</div><div class='del'>-	size_t file_pos = 0;</div><div class='del'>-	size_t buffer_pos = 0;</div><div class='del'>-	size_t new_size;</div><div class='del'>-	__u32 xahash = 0;</div><div class='del'>-</div><div class='del'>-	if (get_inode_sd_version(inode) == STAT_DATA_V1)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!buffer) {</div><div class='del'>-		err = lookup_and_delete_xattr(inode, name);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dentry = xattr_lookup(inode, name, flags);</div><div class='del'>-	if (IS_ERR(dentry))</div><div class='del'>-		return PTR_ERR(dentry);</div><div class='del'>-</div><div class='del'>-	down_write(&amp;REISERFS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-</div><div class='del'>-	xahash = xattr_hash(buffer, buffer_size);</div><div class='del'>-	while (buffer_pos &lt; buffer_size || buffer_pos == 0) {</div><div class='del'>-		size_t chunk;</div><div class='del'>-		size_t skip = 0;</div><div class='del'>-		size_t page_offset = (file_pos &amp; (PAGE_SIZE - 1));</div><div class='del'>-</div><div class='del'>-		if (buffer_size - buffer_pos &gt; PAGE_SIZE)</div><div class='del'>-			chunk = PAGE_SIZE;</div><div class='del'>-		else</div><div class='del'>-			chunk = buffer_size - buffer_pos;</div><div class='del'>-</div><div class='del'>-		page = reiserfs_get_page(d_inode(dentry), file_pos);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lock_page(page);</div><div class='del'>-		data = page_address(page);</div><div class='del'>-</div><div class='del'>-		if (file_pos == 0) {</div><div class='del'>-			struct reiserfs_xattr_header *rxh;</div><div class='del'>-</div><div class='del'>-			skip = file_pos = sizeof(struct reiserfs_xattr_header);</div><div class='del'>-			if (chunk + skip &gt; PAGE_SIZE)</div><div class='del'>-				chunk = PAGE_SIZE - skip;</div><div class='del'>-			rxh = (struct reiserfs_xattr_header *)data;</div><div class='del'>-			rxh-&gt;h_magic = cpu_to_le32(REISERFS_XATTR_MAGIC);</div><div class='del'>-			rxh-&gt;h_hash = cpu_to_le32(xahash);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		err = __reiserfs_write_begin(page, page_offset, chunk + skip);</div><div class='del'>-		if (!err) {</div><div class='del'>-			if (buffer)</div><div class='del'>-				memcpy(data + skip, buffer + buffer_pos, chunk);</div><div class='del'>-			err = reiserfs_commit_write(NULL, page, page_offset,</div><div class='del'>-						    page_offset + chunk +</div><div class='del'>-						    skip);</div><div class='del'>-		}</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		reiserfs_put_page(page);</div><div class='del'>-		buffer_pos += chunk;</div><div class='del'>-		file_pos += chunk;</div><div class='del'>-		skip = 0;</div><div class='del'>-		if (err || buffer_size == 0 || !buffer)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_size = buffer_size + sizeof(struct reiserfs_xattr_header);</div><div class='del'>-	if (!err &amp;&amp; new_size &lt; i_size_read(d_inode(dentry))) {</div><div class='del'>-		struct iattr newattrs = {</div><div class='del'>-			.ia_ctime = current_time(inode),</div><div class='del'>-			.ia_size = new_size,</div><div class='del'>-			.ia_valid = ATTR_SIZE | ATTR_CTIME,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		inode_lock_nested(d_inode(dentry), I_MUTEX_XATTR);</div><div class='del'>-		inode_dio_wait(d_inode(dentry));</div><div class='del'>-</div><div class='del'>-		err = reiserfs_setattr(&amp;nop_mnt_idmap, dentry, &amp;newattrs);</div><div class='del'>-		inode_unlock(d_inode(dentry));</div><div class='del'>-	} else</div><div class='del'>-		update_ctime(inode);</div><div class='del'>-out_unlock:</div><div class='del'>-	up_write(&amp;REISERFS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-	dput(dentry);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We need to start a transaction to maintain lock ordering */</div><div class='del'>-int reiserfs_xattr_set(struct inode *inode, const char *name,</div><div class='del'>-		       const void *buffer, size_t buffer_size, int flags)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	int error, error2;</div><div class='del'>-	size_t jbegin_count = reiserfs_xattr_nblocks(inode, buffer_size);</div><div class='del'>-</div><div class='del'>-	/* Check before we start a transaction and then do nothing. */</div><div class='del'>-	if (!d_really_is_positive(REISERFS_SB(inode-&gt;i_sb)-&gt;priv_root))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; XATTR_REPLACE))</div><div class='del'>-		jbegin_count += reiserfs_xattr_jcreate_nblocks(inode);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	error = journal_begin(&amp;th, inode-&gt;i_sb, jbegin_count);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	if (error) {</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = reiserfs_xattr_set_handle(&amp;th, inode, name,</div><div class='del'>-					  buffer, buffer_size, flags);</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	error2 = journal_end(&amp;th);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	if (error == 0)</div><div class='del'>-		error = error2;</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inode-&gt;i_mutex: down</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer,</div><div class='del'>-		   size_t buffer_size)</div><div class='del'>-{</div><div class='del'>-	ssize_t err = 0;</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	size_t isize;</div><div class='del'>-	size_t file_pos = 0;</div><div class='del'>-	size_t buffer_pos = 0;</div><div class='del'>-	struct page *page;</div><div class='del'>-	__u32 hash = 0;</div><div class='del'>-</div><div class='del'>-	if (name == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't have xattrs attached to v1 items since they don't have</div><div class='del'>-	 * generation numbers</div><div class='del'>-	 */</div><div class='del'>-	if (get_inode_sd_version(inode) == STAT_DATA_V1)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * priv_root needn't be initialized during mount so allow initial</div><div class='del'>-	 * lookups to succeed.</div><div class='del'>-	 */</div><div class='del'>-	if (!REISERFS_SB(inode-&gt;i_sb)-&gt;priv_root)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dentry = xattr_lookup(inode, name, XATTR_REPLACE);</div><div class='del'>-	if (IS_ERR(dentry)) {</div><div class='del'>-		err = PTR_ERR(dentry);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_read(&amp;REISERFS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-</div><div class='del'>-	isize = i_size_read(d_inode(dentry));</div><div class='del'>-</div><div class='del'>-	/* Just return the size needed */</div><div class='del'>-	if (buffer == NULL) {</div><div class='del'>-		err = isize - sizeof(struct reiserfs_xattr_header);</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (buffer_size &lt; isize - sizeof(struct reiserfs_xattr_header)) {</div><div class='del'>-		err = -ERANGE;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (file_pos &lt; isize) {</div><div class='del'>-		size_t chunk;</div><div class='del'>-		char *data;</div><div class='del'>-		size_t skip = 0;</div><div class='del'>-</div><div class='del'>-		if (isize - file_pos &gt; PAGE_SIZE)</div><div class='del'>-			chunk = PAGE_SIZE;</div><div class='del'>-		else</div><div class='del'>-			chunk = isize - file_pos;</div><div class='del'>-</div><div class='del'>-		page = reiserfs_get_page(d_inode(dentry), file_pos);</div><div class='del'>-		if (IS_ERR(page)) {</div><div class='del'>-			err = PTR_ERR(page);</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lock_page(page);</div><div class='del'>-		data = page_address(page);</div><div class='del'>-		if (file_pos == 0) {</div><div class='del'>-			struct reiserfs_xattr_header *rxh =</div><div class='del'>-			    (struct reiserfs_xattr_header *)data;</div><div class='del'>-			skip = file_pos = sizeof(struct reiserfs_xattr_header);</div><div class='del'>-			chunk -= skip;</div><div class='del'>-			/* Magic doesn't match up.. */</div><div class='del'>-			if (rxh-&gt;h_magic != cpu_to_le32(REISERFS_XATTR_MAGIC)) {</div><div class='del'>-				unlock_page(page);</div><div class='del'>-				reiserfs_put_page(page);</div><div class='del'>-				reiserfs_warning(inode-&gt;i_sb, "jdm-20001",</div><div class='del'>-						 "Invalid magic for xattr (%s) "</div><div class='del'>-						 "associated with %k", name,</div><div class='del'>-						 INODE_PKEY(inode));</div><div class='del'>-				err = -EIO;</div><div class='del'>-				goto out_unlock;</div><div class='del'>-			}</div><div class='del'>-			hash = le32_to_cpu(rxh-&gt;h_hash);</div><div class='del'>-		}</div><div class='del'>-		memcpy(buffer + buffer_pos, data + skip, chunk);</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		reiserfs_put_page(page);</div><div class='del'>-		file_pos += chunk;</div><div class='del'>-		buffer_pos += chunk;</div><div class='del'>-		skip = 0;</div><div class='del'>-	}</div><div class='del'>-	err = isize - sizeof(struct reiserfs_xattr_header);</div><div class='del'>-</div><div class='del'>-	if (xattr_hash(buffer, isize - sizeof(struct reiserfs_xattr_header)) !=</div><div class='del'>-	    hash) {</div><div class='del'>-		reiserfs_warning(inode-&gt;i_sb, "jdm-20002",</div><div class='del'>-				 "Invalid hash for xattr (%s) associated "</div><div class='del'>-				 "with %k", name, INODE_PKEY(inode));</div><div class='del'>-		err = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	up_read(&amp;REISERFS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-	dput(dentry);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In order to implement different sets of xattr operations for each xattr</div><div class='del'>- * prefix with the generic xattr API, a filesystem should create a</div><div class='del'>- * null-terminated array of struct xattr_handler (one for each prefix) and</div><div class='del'>- * hang a pointer to it off of the s_xattr field of the superblock.</div><div class='del'>- *</div><div class='del'>- * The generic_fooxattr() functions will use this list to dispatch xattr</div><div class='del'>- * operations to the correct xattr_handler.</div><div class='del'>- */</div><div class='del'>-#define for_each_xattr_handler(handlers, handler)		\</div><div class='del'>-		for ((handler) = *(handlers)++;			\</div><div class='del'>-			(handler) != NULL;			\</div><div class='del'>-			(handler) = *(handlers)++)</div><div class='del'>-</div><div class='del'>-static inline bool reiserfs_posix_acl_list(const char *name,</div><div class='del'>-					   struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	return (posix_acl_type(name) &gt;= 0) &amp;&amp;</div><div class='del'>-	       IS_POSIXACL(d_backing_inode(dentry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the implementation for the xattr plugin infrastructure */</div><div class='del'>-static inline bool reiserfs_xattr_list(const struct xattr_handler * const *handlers,</div><div class='del'>-				       const char *name, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	if (handlers) {</div><div class='del'>-		const struct xattr_handler *xah = NULL;</div><div class='del'>-</div><div class='del'>-		for_each_xattr_handler(handlers, xah) {</div><div class='del'>-			const char *prefix = xattr_prefix(xah);</div><div class='del'>-</div><div class='del'>-			if (strncmp(prefix, name, strlen(prefix)))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!xattr_handler_can_list(xah, dentry))</div><div class='del'>-				return false;</div><div class='del'>-</div><div class='del'>-			return true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return reiserfs_posix_acl_list(name, dentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct listxattr_buf {</div><div class='del'>-	struct dir_context ctx;</div><div class='del'>-	size_t size;</div><div class='del'>-	size_t pos;</div><div class='del'>-	char *buf;</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool listxattr_filler(struct dir_context *ctx, const char *name,</div><div class='del'>-			    int namelen, loff_t offset, u64 ino,</div><div class='del'>-			    unsigned int d_type)</div><div class='del'>-{</div><div class='del'>-	struct listxattr_buf *b =</div><div class='del'>-		container_of(ctx, struct listxattr_buf, ctx);</div><div class='del'>-	size_t size;</div><div class='del'>-</div><div class='del'>-	if (name[0] != '.' ||</div><div class='del'>-	    (namelen != 1 &amp;&amp; (name[1] != '.' || namelen != 2))) {</div><div class='del'>-		if (!reiserfs_xattr_list(b-&gt;dentry-&gt;d_sb-&gt;s_xattr, name,</div><div class='del'>-					 b-&gt;dentry))</div><div class='del'>-			return true;</div><div class='del'>-		size = namelen + 1;</div><div class='del'>-		if (b-&gt;buf) {</div><div class='del'>-			if (b-&gt;pos + size &gt; b-&gt;size) {</div><div class='del'>-				b-&gt;pos = -ERANGE;</div><div class='del'>-				return false;</div><div class='del'>-			}</div><div class='del'>-			memcpy(b-&gt;buf + b-&gt;pos, name, namelen);</div><div class='del'>-			b-&gt;buf[b-&gt;pos + namelen] = 0;</div><div class='del'>-		}</div><div class='del'>-		b-&gt;pos += size;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Inode operation listxattr()</div><div class='del'>- *</div><div class='del'>- * We totally ignore the generic listxattr here because it would be stupid</div><div class='del'>- * not to. Since the xattrs are organized in a directory, we can just</div><div class='del'>- * readdir to find them.</div><div class='del'>- */</div><div class='del'>-ssize_t reiserfs_listxattr(struct dentry * dentry, char *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	struct dentry *dir;</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct listxattr_buf buf = {</div><div class='del'>-		.ctx.actor = listxattr_filler,</div><div class='del'>-		.dentry = dentry,</div><div class='del'>-		.buf = buffer,</div><div class='del'>-		.size = buffer ? size : 0,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (d_really_is_negative(dentry))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (get_inode_sd_version(d_inode(dentry)) == STAT_DATA_V1)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	dir = open_xa_dir(d_inode(dentry), XATTR_REPLACE);</div><div class='del'>-	if (IS_ERR(dir)) {</div><div class='del'>-		err = PTR_ERR(dir);</div><div class='del'>-		if (err == -ENODATA)</div><div class='del'>-			err = 0;  /* Not an error if there aren't any xattrs */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode_lock_nested(d_inode(dir), I_MUTEX_XATTR);</div><div class='del'>-	err = reiserfs_readdir_inode(d_inode(dir), &amp;buf.ctx);</div><div class='del'>-	inode_unlock(d_inode(dir));</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='del'>-		err = buf.pos;</div><div class='del'>-</div><div class='del'>-	dput(dir);</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int create_privroot(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct inode *inode = d_inode(dentry-&gt;d_parent);</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(!inode_is_locked(inode));</div><div class='del'>-</div><div class='del'>-	err = xattr_mkdir(inode, dentry, 0700);</div><div class='del'>-	if (err || d_really_is_negative(dentry)) {</div><div class='del'>-		reiserfs_warning(dentry-&gt;d_sb, "jdm-20006",</div><div class='del'>-				 "xattrs/ACLs enabled and couldn't "</div><div class='del'>-				 "find/create .reiserfs_priv. "</div><div class='del'>-				 "Failing mount.");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reiserfs_init_priv_inode(d_inode(dentry));</div><div class='del'>-	reiserfs_info(dentry-&gt;d_sb, "Created %s - reserved for xattr "</div><div class='del'>-		      "storage.\n", PRIVROOT_NAME);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-int __init reiserfs_xattr_register_handlers(void) { return 0; }</div><div class='del'>-void reiserfs_xattr_unregister_handlers(void) {}</div><div class='del'>-static int create_privroot(struct dentry *dentry) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Actual operations that are exported to VFS-land */</div><div class='del'>-const struct xattr_handler * const reiserfs_xattr_handlers[] = {</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_XATTR</div><div class='del'>-	&amp;reiserfs_xattr_user_handler,</div><div class='del'>-	&amp;reiserfs_xattr_trusted_handler,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_SECURITY</div><div class='del'>-	&amp;reiserfs_xattr_security_handler,</div><div class='del'>-#endif</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int xattr_mount_check(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We need generation numbers to ensure that the oid mapping is correct</div><div class='del'>-	 * v3.5 filesystems don't have them.</div><div class='del'>-	 */</div><div class='del'>-	if (old_format_only(s)) {</div><div class='del'>-		if (reiserfs_xattrs_optional(s)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Old format filesystem, but optional xattrs have</div><div class='del'>-			 * been enabled. Error out.</div><div class='del'>-			 */</div><div class='del'>-			reiserfs_warning(s, "jdm-2005",</div><div class='del'>-					 "xattrs/ACLs not supported "</div><div class='del'>-					 "on pre-v3.6 format filesystems. "</div><div class='del'>-					 "Failing mount.");</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_permission(struct mnt_idmap *idmap, struct inode *inode,</div><div class='del'>-			int mask)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We don't do permission checks on the internal objects.</div><div class='del'>-	 * Permissions are determined by the "owning" object.</div><div class='del'>-	 */</div><div class='del'>-	if (IS_PRIVATE(inode))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return generic_permission(&amp;nop_mnt_idmap, inode, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xattr_hide_revalidate(struct dentry *dentry, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return -EPERM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct dentry_operations xattr_lookup_poison_ops = {</div><div class='del'>-	.d_revalidate = xattr_hide_revalidate,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int reiserfs_lookup_privroot(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* If we don't have the privroot located yet - go find it */</div><div class='del'>-	inode_lock(d_inode(s-&gt;s_root));</div><div class='del'>-	dentry = lookup_one_len(PRIVROOT_NAME, s-&gt;s_root,</div><div class='del'>-				strlen(PRIVROOT_NAME));</div><div class='del'>-	if (!IS_ERR(dentry)) {</div><div class='del'>-		REISERFS_SB(s)-&gt;priv_root = dentry;</div><div class='del'>-		d_set_d_op(dentry, &amp;xattr_lookup_poison_ops);</div><div class='del'>-		if (d_really_is_positive(dentry))</div><div class='del'>-			reiserfs_init_priv_inode(d_inode(dentry));</div><div class='del'>-	} else</div><div class='del'>-		err = PTR_ERR(dentry);</div><div class='del'>-	inode_unlock(d_inode(s-&gt;s_root));</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We need to take a copy of the mount flags since things like</div><div class='del'>- * SB_RDONLY don't get set until *after* we're called.</div><div class='del'>- * mount_flags != mount_options</div><div class='del'>- */</div><div class='del'>-int reiserfs_xattr_init(struct super_block *s, int mount_flags)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct dentry *privroot = REISERFS_SB(s)-&gt;priv_root;</div><div class='del'>-</div><div class='del'>-	err = xattr_mount_check(s);</div><div class='del'>-	if (err)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (d_really_is_negative(privroot) &amp;&amp; !(mount_flags &amp; SB_RDONLY)) {</div><div class='del'>-		inode_lock(d_inode(s-&gt;s_root));</div><div class='del'>-		err = create_privroot(REISERFS_SB(s)-&gt;priv_root);</div><div class='del'>-		inode_unlock(d_inode(s-&gt;s_root));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (d_really_is_positive(privroot)) {</div><div class='del'>-		inode_lock(d_inode(privroot));</div><div class='del'>-		if (!REISERFS_SB(s)-&gt;xattr_root) {</div><div class='del'>-			struct dentry *dentry;</div><div class='del'>-</div><div class='del'>-			dentry = lookup_one_len(XAROOT_NAME, privroot,</div><div class='del'>-						strlen(XAROOT_NAME));</div><div class='del'>-			if (!IS_ERR(dentry))</div><div class='del'>-				REISERFS_SB(s)-&gt;xattr_root = dentry;</div><div class='del'>-			else</div><div class='del'>-				err = PTR_ERR(dentry);</div><div class='del'>-		}</div><div class='del'>-		inode_unlock(d_inode(privroot));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	if (err) {</div><div class='del'>-		clear_bit(REISERFS_XATTRS_USER, &amp;REISERFS_SB(s)-&gt;s_mount_opt);</div><div class='del'>-		clear_bit(REISERFS_POSIXACL, &amp;REISERFS_SB(s)-&gt;s_mount_opt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The super_block SB_POSIXACL must mirror the (no)acl mount option. */</div><div class='del'>-	if (reiserfs_posixacl(s))</div><div class='del'>-		s-&gt;s_flags |= SB_POSIXACL;</div><div class='del'>-	else</div><div class='del'>-		s-&gt;s_flags &amp;= ~SB_POSIXACL;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/xattr.h b/fs/reiserfs/xattr.h<br/>deleted file mode 100644<br/>index 5868a4e990e3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/xattr.h?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,117 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#include &lt;linux/reiserfs_xattr.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-</div><div class='del'>-struct inode;</div><div class='del'>-struct dentry;</div><div class='del'>-struct iattr;</div><div class='del'>-struct super_block;</div><div class='del'>-</div><div class='del'>-int reiserfs_xattr_register_handlers(void) __init;</div><div class='del'>-void reiserfs_xattr_unregister_handlers(void);</div><div class='del'>-int reiserfs_xattr_init(struct super_block *sb, int mount_flags);</div><div class='del'>-int reiserfs_lookup_privroot(struct super_block *sb);</div><div class='del'>-int reiserfs_delete_xattrs(struct inode *inode);</div><div class='del'>-int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);</div><div class='del'>-int reiserfs_permission(struct mnt_idmap *idmap,</div><div class='del'>-			struct inode *inode, int mask);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_XATTR</div><div class='del'>-#define has_xattr_dir(inode) (REISERFS_I(inode)-&gt;i_flags &amp; i_has_xattr_dir)</div><div class='del'>-ssize_t reiserfs_listxattr(struct dentry *dentry, char *buffer, size_t size);</div><div class='del'>-</div><div class='del'>-int reiserfs_xattr_get(struct inode *, const char *, void *, size_t);</div><div class='del'>-int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int);</div><div class='del'>-int reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *,</div><div class='del'>-			      struct inode *, const char *, const void *,</div><div class='del'>-			      size_t, int);</div><div class='del'>-</div><div class='del'>-extern const struct xattr_handler reiserfs_xattr_user_handler;</div><div class='del'>-extern const struct xattr_handler reiserfs_xattr_trusted_handler;</div><div class='del'>-extern const struct xattr_handler reiserfs_xattr_security_handler;</div><div class='del'>-#ifdef CONFIG_REISERFS_FS_SECURITY</div><div class='del'>-int reiserfs_security_init(struct inode *dir, struct inode *inode,</div><div class='del'>-			   const struct qstr *qstr,</div><div class='del'>-			   struct reiserfs_security_handle *sec);</div><div class='del'>-int reiserfs_security_write(struct reiserfs_transaction_handle *th,</div><div class='del'>-			    struct inode *inode,</div><div class='del'>-			    struct reiserfs_security_handle *sec);</div><div class='del'>-void reiserfs_security_free(struct reiserfs_security_handle *sec);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int reiserfs_xattrs_initialized(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return REISERFS_SB(sb)-&gt;priv_root &amp;&amp; REISERFS_SB(sb)-&gt;xattr_root;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header))</div><div class='del'>-static inline loff_t reiserfs_xattr_nblocks(struct inode *inode, loff_t size)</div><div class='del'>-{</div><div class='del'>-	loff_t ret = 0;</div><div class='del'>-	if (reiserfs_file_data_log(inode)) {</div><div class='del'>-		ret = _ROUND_UP(xattr_size(size), inode-&gt;i_sb-&gt;s_blocksize);</div><div class='del'>-		ret &gt;&gt;= inode-&gt;i_sb-&gt;s_blocksize_bits;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We may have to create up to 3 objects: xattr root, xattr dir, xattr file.</div><div class='del'>- * Let's try to be smart about it.</div><div class='del'>- * xattr root: We cache it. If it's not cached, we may need to create it.</div><div class='del'>- * xattr dir: If anything has been loaded for this inode, we can set a flag</div><div class='del'>- *            saying so.</div><div class='del'>- * xattr file: Since we don't cache xattrs, we can't tell. We always include</div><div class='del'>- *             blocks for it.</div><div class='del'>- *</div><div class='del'>- * However, since root and dir can be created between calls - YOU MUST SAVE</div><div class='del'>- * THIS VALUE.</div><div class='del'>- */</div><div class='del'>-static inline size_t reiserfs_xattr_jcreate_nblocks(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	size_t nblocks = JOURNAL_BLOCKS_PER_OBJECT(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-	if ((REISERFS_I(inode)-&gt;i_flags &amp; i_has_xattr_dir) == 0) {</div><div class='del'>-		nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode-&gt;i_sb);</div><div class='del'>-		if (d_really_is_negative(REISERFS_SB(inode-&gt;i_sb)-&gt;xattr_root))</div><div class='del'>-			nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode-&gt;i_sb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nblocks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void reiserfs_init_xattr_rwsem(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	init_rwsem(&amp;REISERFS_I(inode)-&gt;i_xattr_sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define reiserfs_listxattr NULL</div><div class='del'>-</div><div class='del'>-static inline void reiserfs_init_xattr_rwsem(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif  /*  CONFIG_REISERFS_FS_XATTR  */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_REISERFS_FS_SECURITY</div><div class='del'>-static inline int reiserfs_security_init(struct inode *dir,</div><div class='del'>-					 struct inode *inode,</div><div class='del'>-					 const struct qstr *qstr,</div><div class='del'>-					 struct reiserfs_security_handle *sec)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int</div><div class='del'>-reiserfs_security_write(struct reiserfs_transaction_handle *th,</div><div class='del'>-			struct inode *inode,</div><div class='del'>-			struct reiserfs_security_handle *sec)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline void reiserfs_security_free(struct reiserfs_security_handle *sec)</div><div class='del'>-{}</div><div class='del'>-#endif</div><div class='head'>diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c<br/>deleted file mode 100644<br/>index 064264992b49..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/xattr_acl.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_acl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,411 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl.h&gt;</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/posix_acl_xattr.h&gt;</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include "acl.h"</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-static int __reiserfs_set_acl(struct reiserfs_transaction_handle *th,</div><div class='del'>-			    struct inode *inode, int type,</div><div class='del'>-			    struct posix_acl *acl);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-reiserfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		 struct posix_acl *acl, int type)</div><div class='del'>-{</div><div class='del'>-	int error, error2;</div><div class='del'>-	struct reiserfs_transaction_handle th;</div><div class='del'>-	size_t jcreate_blocks;</div><div class='del'>-	int size = acl ? posix_acl_xattr_size(acl-&gt;a_count) : 0;</div><div class='del'>-	int update_mode = 0;</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-	umode_t mode = inode-&gt;i_mode;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Pessimism: We can't assume that anything from the xattr root up</div><div class='del'>-	 * has been created.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	jcreate_blocks = reiserfs_xattr_jcreate_nblocks(inode) +</div><div class='del'>-			 reiserfs_xattr_nblocks(inode, size) * 2;</div><div class='del'>-</div><div class='del'>-	reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-	error = journal_begin(&amp;th, inode-&gt;i_sb, jcreate_blocks);</div><div class='del'>-	reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-	if (error == 0) {</div><div class='del'>-		if (type == ACL_TYPE_ACCESS &amp;&amp; acl) {</div><div class='del'>-			error = posix_acl_update_mode(&amp;nop_mnt_idmap, inode,</div><div class='del'>-						      &amp;mode, &amp;acl);</div><div class='del'>-			if (error)</div><div class='del'>-				goto unlock;</div><div class='del'>-			update_mode = 1;</div><div class='del'>-		}</div><div class='del'>-		error = __reiserfs_set_acl(&amp;th, inode, type, acl);</div><div class='del'>-		if (!error &amp;&amp; update_mode)</div><div class='del'>-			inode-&gt;i_mode = mode;</div><div class='del'>-unlock:</div><div class='del'>-		reiserfs_write_lock(inode-&gt;i_sb);</div><div class='del'>-		error2 = journal_end(&amp;th);</div><div class='del'>-		reiserfs_write_unlock(inode-&gt;i_sb);</div><div class='del'>-		if (error2)</div><div class='del'>-			error = error2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from filesystem to in-memory representation.</div><div class='del'>- */</div><div class='del'>-static struct posix_acl *reiserfs_posix_acl_from_disk(const void *value, size_t size)</div><div class='del'>-{</div><div class='del'>-	const char *end = (char *)value + size;</div><div class='del'>-	int n, count;</div><div class='del'>-	struct posix_acl *acl;</div><div class='del'>-</div><div class='del'>-	if (!value)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (size &lt; sizeof(reiserfs_acl_header))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	if (((reiserfs_acl_header *) value)-&gt;a_version !=</div><div class='del'>-	    cpu_to_le32(REISERFS_ACL_VERSION))</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	value = (char *)value + sizeof(reiserfs_acl_header);</div><div class='del'>-	count = reiserfs_acl_count(size);</div><div class='del'>-	if (count &lt; 0)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	acl = posix_acl_alloc(count, GFP_NOFS);</div><div class='del'>-	if (!acl)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	for (n = 0; n &lt; count; n++) {</div><div class='del'>-		reiserfs_acl_entry *entry = (reiserfs_acl_entry *) value;</div><div class='del'>-		if ((char *)value + sizeof(reiserfs_acl_entry_short) &gt; end)</div><div class='del'>-			goto fail;</div><div class='del'>-		acl-&gt;a_entries[n].e_tag = le16_to_cpu(entry-&gt;e_tag);</div><div class='del'>-		acl-&gt;a_entries[n].e_perm = le16_to_cpu(entry-&gt;e_perm);</div><div class='del'>-		switch (acl-&gt;a_entries[n].e_tag) {</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			value = (char *)value +</div><div class='del'>-			    sizeof(reiserfs_acl_entry_short);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ACL_USER:</div><div class='del'>-			value = (char *)value + sizeof(reiserfs_acl_entry);</div><div class='del'>-			if ((char *)value &gt; end)</div><div class='del'>-				goto fail;</div><div class='del'>-			acl-&gt;a_entries[n].e_uid = </div><div class='del'>-				make_kuid(&amp;init_user_ns,</div><div class='del'>-					  le32_to_cpu(entry-&gt;e_id));</div><div class='del'>-			break;</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			value = (char *)value + sizeof(reiserfs_acl_entry);</div><div class='del'>-			if ((char *)value &gt; end)</div><div class='del'>-				goto fail;</div><div class='del'>-			acl-&gt;a_entries[n].e_gid =</div><div class='del'>-				make_kgid(&amp;init_user_ns,</div><div class='del'>-					  le32_to_cpu(entry-&gt;e_id));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (value != end)</div><div class='del'>-		goto fail;</div><div class='del'>-	return acl;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	posix_acl_release(acl);</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert from in-memory to filesystem representation.</div><div class='del'>- */</div><div class='del'>-static void *reiserfs_posix_acl_to_disk(const struct posix_acl *acl, size_t * size)</div><div class='del'>-{</div><div class='del'>-	reiserfs_acl_header *ext_acl;</div><div class='del'>-	char *e;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	*size = reiserfs_acl_size(acl-&gt;a_count);</div><div class='del'>-	ext_acl = kmalloc(sizeof(reiserfs_acl_header) +</div><div class='del'>-						  acl-&gt;a_count *</div><div class='del'>-						  sizeof(reiserfs_acl_entry),</div><div class='del'>-						  GFP_NOFS);</div><div class='del'>-	if (!ext_acl)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	ext_acl-&gt;a_version = cpu_to_le32(REISERFS_ACL_VERSION);</div><div class='del'>-	e = (char *)ext_acl + sizeof(reiserfs_acl_header);</div><div class='del'>-	for (n = 0; n &lt; acl-&gt;a_count; n++) {</div><div class='del'>-		const struct posix_acl_entry *acl_e = &amp;acl-&gt;a_entries[n];</div><div class='del'>-		reiserfs_acl_entry *entry = (reiserfs_acl_entry *) e;</div><div class='del'>-		entry-&gt;e_tag = cpu_to_le16(acl-&gt;a_entries[n].e_tag);</div><div class='del'>-		entry-&gt;e_perm = cpu_to_le16(acl-&gt;a_entries[n].e_perm);</div><div class='del'>-		switch (acl-&gt;a_entries[n].e_tag) {</div><div class='del'>-		case ACL_USER:</div><div class='del'>-			entry-&gt;e_id = cpu_to_le32(</div><div class='del'>-				from_kuid(&amp;init_user_ns, acl_e-&gt;e_uid));</div><div class='del'>-			e += sizeof(reiserfs_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-		case ACL_GROUP:</div><div class='del'>-			entry-&gt;e_id = cpu_to_le32(</div><div class='del'>-				from_kgid(&amp;init_user_ns, acl_e-&gt;e_gid));</div><div class='del'>-			e += sizeof(reiserfs_acl_entry);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ACL_USER_OBJ:</div><div class='del'>-		case ACL_GROUP_OBJ:</div><div class='del'>-		case ACL_MASK:</div><div class='del'>-		case ACL_OTHER:</div><div class='del'>-			e += sizeof(reiserfs_acl_entry_short);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return (char *)ext_acl;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	kfree(ext_acl);</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Inode operation get_posix_acl().</div><div class='del'>- *</div><div class='del'>- * inode-&gt;i_mutex: down</div><div class='del'>- * BKL held [before 2.5.x]</div><div class='del'>- */</div><div class='del'>-struct posix_acl *reiserfs_get_acl(struct inode *inode, int type, bool rcu)</div><div class='del'>-{</div><div class='del'>-	char *name, *value;</div><div class='del'>-	struct posix_acl *acl;</div><div class='del'>-	int size;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (rcu)</div><div class='del'>-		return ERR_PTR(-ECHILD);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ACL_TYPE_ACCESS:</div><div class='del'>-		name = XATTR_NAME_POSIX_ACL_ACCESS;</div><div class='del'>-		break;</div><div class='del'>-	case ACL_TYPE_DEFAULT:</div><div class='del'>-		name = XATTR_NAME_POSIX_ACL_DEFAULT;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	size = reiserfs_xattr_get(inode, name, NULL, 0);</div><div class='del'>-	if (size &lt; 0) {</div><div class='del'>-		if (size == -ENODATA || size == -ENOSYS)</div><div class='del'>-			return NULL;</div><div class='del'>-		return ERR_PTR(size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value = kmalloc(size, GFP_NOFS);</div><div class='del'>-	if (!value)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	retval = reiserfs_xattr_get(inode, name, value, size);</div><div class='del'>-	if (retval == -ENODATA || retval == -ENOSYS) {</div><div class='del'>-		/*</div><div class='del'>-		 * This shouldn't actually happen as it should have</div><div class='del'>-		 * been caught above.. but just in case</div><div class='del'>-		 */</div><div class='del'>-		acl = NULL;</div><div class='del'>-	} else if (retval &lt; 0) {</div><div class='del'>-		acl = ERR_PTR(retval);</div><div class='del'>-	} else {</div><div class='del'>-		acl = reiserfs_posix_acl_from_disk(value, retval);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(value);</div><div class='del'>-	return acl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Inode operation set_posix_acl().</div><div class='del'>- *</div><div class='del'>- * inode-&gt;i_mutex: down</div><div class='del'>- * BKL held [before 2.5.x]</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-__reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,</div><div class='del'>-		 int type, struct posix_acl *acl)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	void *value = NULL;</div><div class='del'>-	size_t size = 0;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ACL_TYPE_ACCESS:</div><div class='del'>-		name = XATTR_NAME_POSIX_ACL_ACCESS;</div><div class='del'>-		break;</div><div class='del'>-	case ACL_TYPE_DEFAULT:</div><div class='del'>-		name = XATTR_NAME_POSIX_ACL_DEFAULT;</div><div class='del'>-		if (!S_ISDIR(inode-&gt;i_mode))</div><div class='del'>-			return acl ? -EACCES : 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (acl) {</div><div class='del'>-		value = reiserfs_posix_acl_to_disk(acl, &amp;size);</div><div class='del'>-		if (IS_ERR(value))</div><div class='del'>-			return (int)PTR_ERR(value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = reiserfs_xattr_set_handle(th, inode, name, value, size, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure that the inode gets dirtied if we're only using</div><div class='del'>-	 * the mode bits and an old ACL didn't exist. We don't need</div><div class='del'>-	 * to check if the inode is hashed here since we won't get</div><div class='del'>-	 * called by reiserfs_inherit_default_acl().</div><div class='del'>-	 */</div><div class='del'>-	if (error == -ENODATA) {</div><div class='del'>-		error = 0;</div><div class='del'>-		if (type == ACL_TYPE_ACCESS) {</div><div class='del'>-			inode_set_ctime_current(inode);</div><div class='del'>-			mark_inode_dirty(inode);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(value);</div><div class='del'>-</div><div class='del'>-	if (!error)</div><div class='del'>-		set_cached_acl(inode, type, acl);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * dir-&gt;i_mutex: locked,</div><div class='del'>- * inode is new and not released into the wild yet</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,</div><div class='del'>-			     struct inode *dir, struct dentry *dentry,</div><div class='del'>-			     struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct posix_acl *default_acl, *acl;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	/* ACLs only get applied to files and directories */</div><div class='del'>-	if (S_ISLNK(inode-&gt;i_mode))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ACLs can only be used on "new" objects, so if it's an old object</div><div class='del'>-	 * there is nothing to inherit from</div><div class='del'>-	 */</div><div class='del'>-	if (get_inode_sd_version(dir) == STAT_DATA_V1)</div><div class='del'>-		goto apply_umask;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't apply ACLs to objects in the .reiserfs_priv tree.. This</div><div class='del'>-	 * would be useless since permissions are ignored, and a pain because</div><div class='del'>-	 * it introduces locking cycles</div><div class='del'>-	 */</div><div class='del'>-	if (IS_PRIVATE(inode))</div><div class='del'>-		goto apply_umask;</div><div class='del'>-</div><div class='del'>-	err = posix_acl_create(dir, &amp;inode-&gt;i_mode, &amp;default_acl, &amp;acl);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (default_acl) {</div><div class='del'>-		err = __reiserfs_set_acl(th, inode, ACL_TYPE_DEFAULT,</div><div class='del'>-					 default_acl);</div><div class='del'>-		posix_acl_release(default_acl);</div><div class='del'>-	}</div><div class='del'>-	if (acl) {</div><div class='del'>-		if (!err)</div><div class='del'>-			err = __reiserfs_set_acl(th, inode, ACL_TYPE_ACCESS,</div><div class='del'>-						 acl);</div><div class='del'>-		posix_acl_release(acl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-apply_umask:</div><div class='del'>-	/* no ACL, apply umask */</div><div class='del'>-	inode-&gt;i_mode &amp;= ~current_umask();</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is used to cache the default acl before a new object is created.</div><div class='del'>- * The biggest reason for this is to get an idea of how many blocks will</div><div class='del'>- * actually be required for the create operation if we must inherit an ACL.</div><div class='del'>- * An ACL write can add up to 3 object creations and an additional file write</div><div class='del'>- * so we'd prefer not to reserve that many blocks in the journal if we can.</div><div class='del'>- * It also has the advantage of not loading the ACL with a transaction open,</div><div class='del'>- * this may seem silly, but if the owner of the directory is doing the</div><div class='del'>- * creation, the ACL may not be loaded since the permissions wouldn't require</div><div class='del'>- * it.</div><div class='del'>- * We return the number of blocks required for the transaction.</div><div class='del'>- */</div><div class='del'>-int reiserfs_cache_default_acl(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct posix_acl *acl;</div><div class='del'>-	int nblocks = 0;</div><div class='del'>-</div><div class='del'>-	if (IS_PRIVATE(inode))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	acl = get_inode_acl(inode, ACL_TYPE_DEFAULT);</div><div class='del'>-</div><div class='del'>-	if (acl &amp;&amp; !IS_ERR(acl)) {</div><div class='del'>-		int size = reiserfs_acl_size(acl-&gt;a_count);</div><div class='del'>-</div><div class='del'>-		/* Other xattrs can be created during inode creation. We don't</div><div class='del'>-		 * want to claim too many blocks, so we check to see if we</div><div class='del'>-		 * need to create the tree to the xattrs, and then we</div><div class='del'>-		 * just want two files. */</div><div class='del'>-		nblocks = reiserfs_xattr_jcreate_nblocks(inode);</div><div class='del'>-		nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode-&gt;i_sb);</div><div class='del'>-</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags |= i_has_xattr_dir;</div><div class='del'>-</div><div class='del'>-		/* We need to account for writes + bitmaps for two files */</div><div class='del'>-		nblocks += reiserfs_xattr_nblocks(inode, size) * 4;</div><div class='del'>-		posix_acl_release(acl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nblocks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called under i_mutex</div><div class='del'>- */</div><div class='del'>-int reiserfs_acl_chmod(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = d_inode(dentry);</div><div class='del'>-</div><div class='del'>-	if (IS_PRIVATE(inode))</div><div class='del'>-		return 0;</div><div class='del'>-	if (get_inode_sd_version(inode) == STAT_DATA_V1 ||</div><div class='del'>-	    !reiserfs_posixacl(inode-&gt;i_sb))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return posix_acl_chmod(&amp;nop_mnt_idmap, dentry, inode-&gt;i_mode);</div><div class='del'>-}</div><div class='head'>diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c<br/>deleted file mode 100644<br/>index 078dd8cc312f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/xattr_security.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_security.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/security.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-security_get(const struct xattr_handler *handler, struct dentry *unused,</div><div class='del'>-	     struct inode *inode, const char *name, void *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	if (IS_PRIVATE(inode))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	return reiserfs_xattr_get(inode, xattr_full_name(handler, name),</div><div class='del'>-				  buffer, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-security_set(const struct xattr_handler *handler,</div><div class='del'>-	     struct mnt_idmap *idmap, struct dentry *unused,</div><div class='del'>-	     struct inode *inode, const char *name, const void *buffer,</div><div class='del'>-	     size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	if (IS_PRIVATE(inode))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	return reiserfs_xattr_set(inode,</div><div class='del'>-				  xattr_full_name(handler, name),</div><div class='del'>-				  buffer, size, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool security_list(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	return !IS_PRIVATE(d_inode(dentry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-reiserfs_initxattrs(struct inode *inode, const struct xattr *xattr_array,</div><div class='del'>-		    void *fs_info)</div><div class='del'>-{</div><div class='del'>-	struct reiserfs_security_handle *sec = fs_info;</div><div class='del'>-</div><div class='del'>-	sec-&gt;value = kmemdup(xattr_array-&gt;value, xattr_array-&gt;value_len,</div><div class='del'>-			     GFP_KERNEL);</div><div class='del'>-	if (!sec-&gt;value)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	sec-&gt;name = xattr_array-&gt;name;</div><div class='del'>-	sec-&gt;length = xattr_array-&gt;value_len;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initializes the security context for a new inode and returns the number</div><div class='del'>- * of blocks needed for the transaction. If successful, reiserfs_security</div><div class='del'>- * must be released using reiserfs_security_free when the caller is done. */</div><div class='del'>-int reiserfs_security_init(struct inode *dir, struct inode *inode,</div><div class='del'>-			   const struct qstr *qstr,</div><div class='del'>-			   struct reiserfs_security_handle *sec)</div><div class='del'>-{</div><div class='del'>-	int blocks = 0;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	sec-&gt;name = NULL;</div><div class='del'>-	sec-&gt;value = NULL;</div><div class='del'>-	sec-&gt;length = 0;</div><div class='del'>-</div><div class='del'>-	/* Don't add selinux attributes on xattrs - they'll never get used */</div><div class='del'>-	if (IS_PRIVATE(dir))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	error = security_inode_init_security(inode, dir, qstr,</div><div class='del'>-					     &amp;reiserfs_initxattrs, sec);</div><div class='del'>-	if (error) {</div><div class='del'>-		sec-&gt;name = NULL;</div><div class='del'>-		sec-&gt;value = NULL;</div><div class='del'>-		sec-&gt;length = 0;</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sec-&gt;length &amp;&amp; reiserfs_xattrs_initialized(inode-&gt;i_sb)) {</div><div class='del'>-		blocks = reiserfs_xattr_jcreate_nblocks(inode) +</div><div class='del'>-			 reiserfs_xattr_nblocks(inode, sec-&gt;length);</div><div class='del'>-		/* We don't want to count the directories twice if we have</div><div class='del'>-		 * a default ACL. */</div><div class='del'>-		REISERFS_I(inode)-&gt;i_flags |= i_has_xattr_dir;</div><div class='del'>-	}</div><div class='del'>-	return blocks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int reiserfs_security_write(struct reiserfs_transaction_handle *th,</div><div class='del'>-			    struct inode *inode,</div><div class='del'>-			    struct reiserfs_security_handle *sec)</div><div class='del'>-{</div><div class='del'>-	char xattr_name[XATTR_NAME_MAX + 1] = XATTR_SECURITY_PREFIX;</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	if (XATTR_SECURITY_PREFIX_LEN + strlen(sec-&gt;name) &gt; XATTR_NAME_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	strlcat(xattr_name, sec-&gt;name, sizeof(xattr_name));</div><div class='del'>-</div><div class='del'>-	error = reiserfs_xattr_set_handle(th, inode, xattr_name, sec-&gt;value,</div><div class='del'>-					  sec-&gt;length, XATTR_CREATE);</div><div class='del'>-	if (error == -ENODATA || error == -EOPNOTSUPP)</div><div class='del'>-		error = 0;</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reiserfs_security_free(struct reiserfs_security_handle *sec)</div><div class='del'>-{</div><div class='del'>-	kfree(sec-&gt;value);</div><div class='del'>-	sec-&gt;name = NULL;</div><div class='del'>-	sec-&gt;value = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct xattr_handler reiserfs_xattr_security_handler = {</div><div class='del'>-	.prefix = XATTR_SECURITY_PREFIX,</div><div class='del'>-	.get = security_get,</div><div class='del'>-	.set = security_set,</div><div class='del'>-	.list = security_list,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c<br/>deleted file mode 100644<br/>index 0c0c74d8db0e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/xattr_trusted.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_trusted.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-trusted_get(const struct xattr_handler *handler, struct dentry *unused,</div><div class='del'>-	    struct inode *inode, const char *name, void *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	return reiserfs_xattr_get(inode, xattr_full_name(handler, name),</div><div class='del'>-				  buffer, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-trusted_set(const struct xattr_handler *handler,</div><div class='del'>-	    struct mnt_idmap *idmap, struct dentry *unused,</div><div class='del'>-	    struct inode *inode, const char *name, const void *buffer,</div><div class='del'>-	    size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	return reiserfs_xattr_set(inode,</div><div class='del'>-				  xattr_full_name(handler, name),</div><div class='del'>-				  buffer, size, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool trusted_list(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	return capable(CAP_SYS_ADMIN) &amp;&amp; !IS_PRIVATE(d_inode(dentry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct xattr_handler reiserfs_xattr_trusted_handler = {</div><div class='del'>-	.prefix = XATTR_TRUSTED_PREFIX,</div><div class='del'>-	.get = trusted_get,</div><div class='del'>-	.set = trusted_set,</div><div class='del'>-	.list = trusted_list,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c<br/>deleted file mode 100644<br/>index 88195181e1d7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/reiserfs/xattr_user.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/reiserfs/xattr_user.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "reiserfs.h"</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/pagemap.h&gt;</div><div class='del'>-#include &lt;linux/xattr.h&gt;</div><div class='del'>-#include "xattr.h"</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-user_get(const struct xattr_handler *handler, struct dentry *unused,</div><div class='del'>-	 struct inode *inode, const char *name, void *buffer, size_t size)</div><div class='del'>-{</div><div class='del'>-	if (!reiserfs_xattrs_user(inode-&gt;i_sb))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return reiserfs_xattr_get(inode, xattr_full_name(handler, name),</div><div class='del'>-				  buffer, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-user_set(const struct xattr_handler *handler, struct mnt_idmap *idmap,</div><div class='del'>-	 struct dentry *unused,</div><div class='del'>-	 struct inode *inode, const char *name, const void *buffer,</div><div class='del'>-	 size_t size, int flags)</div><div class='del'>-{</div><div class='del'>-	if (!reiserfs_xattrs_user(inode-&gt;i_sb))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	return reiserfs_xattr_set(inode,</div><div class='del'>-				  xattr_full_name(handler, name),</div><div class='del'>-				  buffer, size, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool user_list(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	return reiserfs_xattrs_user(dentry-&gt;d_sb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct xattr_handler reiserfs_xattr_user_handler = {</div><div class='del'>-	.prefix = XATTR_USER_PREFIX,</div><div class='del'>-	.get = user_get,</div><div class='del'>-	.set = user_set,</div><div class='del'>-	.list = user_list,</div><div class='del'>-};</div><div class='head'>diff --git a/fs/remap_range.c b/fs/remap_range.c<br/>index f8c1120b8311..26afbbbfb10c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/fs/remap_range.c?id=40ebc18b991bdb867bc693a4ac1b5d7db44838f3'>fs/remap_range.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/remap_range.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/remap_range.c</a></div><div class='hunk'>@@ -99,8 +99,7 @@ static int generic_remap_checks(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int remap_verify_area(struct file *file, loff_t pos, loff_t len,</div><div class='del'>-			     bool write)</div><div class='add'>+int remap_verify_area(struct file *file, loff_t pos, loff_t len, bool write)</div><div class='ctx'> {</div><div class='ctx'> 	int mask = write ? MAY_WRITE : MAY_READ;</div><div class='ctx'> 	loff_t tmp;</div><div class='hunk'>@@ -118,6 +117,7 @@ static int remap_verify_area(struct file *file, loff_t pos, loff_t len,</div><div class='ctx'> </div><div class='ctx'> 	return fsnotify_file_area_perm(file, mask, &amp;pos, len);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(remap_verify_area);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Ensure that we don't remap a partial EOF block in the middle of something</div><div class='hunk'>@@ -373,9 +373,9 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(generic_remap_file_range_prep);</div><div class='ctx'> </div><div class='del'>-loff_t do_clone_file_range(struct file *file_in, loff_t pos_in,</div><div class='del'>-			   struct file *file_out, loff_t pos_out,</div><div class='del'>-			   loff_t len, unsigned int remap_flags)</div><div class='add'>+loff_t vfs_clone_file_range(struct file *file_in, loff_t pos_in,</div><div class='add'>+			    struct file *file_out, loff_t pos_out,</div><div class='add'>+			    loff_t len, unsigned int remap_flags)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t ret;</div><div class='ctx'> </div><div class='hunk'>@@ -391,23 +391,6 @@ loff_t do_clone_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 	if (!file_in-&gt;f_op-&gt;remap_file_range)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ret = file_in-&gt;f_op-&gt;remap_file_range(file_in, pos_in,</div><div class='del'>-			file_out, pos_out, len, remap_flags);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	fsnotify_access(file_in);</div><div class='del'>-	fsnotify_modify(file_out);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(do_clone_file_range);</div><div class='del'>-</div><div class='del'>-loff_t vfs_clone_file_range(struct file *file_in, loff_t pos_in,</div><div class='del'>-			    struct file *file_out, loff_t pos_out,</div><div class='del'>-			    loff_t len, unsigned int remap_flags)</div><div class='del'>-{</div><div class='del'>-	loff_t ret;</div><div class='del'>-</div><div class='ctx'> 	ret = remap_verify_area(file_in, pos_in, len, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -417,10 +400,14 @@ loff_t vfs_clone_file_range(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	file_start_write(file_out);</div><div class='del'>-	ret = do_clone_file_range(file_in, pos_in, file_out, pos_out, len,</div><div class='del'>-				  remap_flags);</div><div class='add'>+	ret = file_in-&gt;f_op-&gt;remap_file_range(file_in, pos_in,</div><div class='add'>+			file_out, pos_out, len, remap_flags);</div><div class='ctx'> 	file_end_write(file_out);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='add'>+	fsnotify_access(file_in);</div><div class='add'>+	fsnotify_modify(file_out);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vfs_clone_file_range);</div><div class='hunk'>@@ -549,20 +536,19 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, info = same-&gt;info; i &lt; count; i++, info++) {</div><div class='del'>-		struct fd dst_fd = fdget(info-&gt;dest_fd);</div><div class='del'>-		struct file *dst_file = dst_fd.file;</div><div class='add'>+		CLASS(fd, dst_fd)(info-&gt;dest_fd);</div><div class='ctx'> </div><div class='del'>-		if (!dst_file) {</div><div class='add'>+		if (fd_empty(dst_fd)) {</div><div class='ctx'> 			info-&gt;status = -EBADF;</div><div class='ctx'> 			goto next_loop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (info-&gt;reserved) {</div><div class='ctx'> 			info-&gt;status = -EINVAL;</div><div class='del'>-			goto next_fdput;</div><div class='add'>+			goto next_loop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		deduped = vfs_dedupe_file_range_one(file, off, dst_file,</div><div class='add'>+		deduped = vfs_dedupe_file_range_one(file, off, fd_file(dst_fd),</div><div class='ctx'> 						    info-&gt;dest_offset, len,</div><div class='ctx'> 						    REMAP_FILE_CAN_SHORTEN);</div><div class='ctx'> 		if (deduped == -EBADE)</div><div class='hunk'>@@ -572,8 +558,6 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)</div><div class='ctx'> 		else</div><div class='ctx'> 			info-&gt;bytes_deduped = len;</div><div class='ctx'> </div><div class='del'>-next_fdput:</div><div class='del'>-		fdput(dst_fd);</div><div class='ctx'> next_loop:</div><div class='ctx'> 		if (fatal_signal_pending(current))</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/fs/resctrl/Kconfig b/fs/resctrl/Kconfig<br/>new file mode 100644<br/>index 000000000000..21671301bd8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+config RESCTRL_FS</div><div class='add'>+	bool "CPU Resource Control Filesystem (resctrl)"</div><div class='add'>+	depends on ARCH_HAS_CPU_RESCTRL</div><div class='add'>+	select KERNFS</div><div class='add'>+	select PROC_CPU_RESCTRL if PROC_FS</div><div class='add'>+	help</div><div class='add'>+	  Some architectures provide hardware facilities to group tasks and</div><div class='add'>+	  monitor and control their usage of memory system resources such as</div><div class='add'>+	  caches and memory bandwidth.  Examples of such facilities include</div><div class='add'>+	  Intel's Resource Director Technology (Intel(R) RDT) and AMD's</div><div class='add'>+	  Platform Quality of Service (AMD QoS).</div><div class='add'>+</div><div class='add'>+	  If your system has the necessary support and you want to be able to</div><div class='add'>+	  assign tasks to groups and manipulate the associated resource</div><div class='add'>+	  monitors and controls from userspace, say Y here to get a mountable</div><div class='add'>+	  'resctrl' filesystem that lets you do just that.</div><div class='add'>+</div><div class='add'>+	  If nothing mounts or prods the 'resctrl' filesystem, resource</div><div class='add'>+	  controls and monitors are left in a quiescent, permissive state.</div><div class='add'>+</div><div class='add'>+	  On architectures where this can be disabled independently, it is</div><div class='add'>+	  safe to say N.</div><div class='add'>+</div><div class='add'>+	  See &lt;file:Documentation/filesystems/resctrl.rst&gt; for more information.</div><div class='add'>+</div><div class='add'>+config RESCTRL_FS_PSEUDO_LOCK</div><div class='add'>+	bool</div><div class='add'>+	depends on RESCTRL_FS</div><div class='add'>+	help</div><div class='add'>+	  Software mechanism to pin data in a cache portion using</div><div class='add'>+	  micro-architecture specific knowledge.</div><div class='add'>+</div><div class='add'>+config RESCTRL_RMID_DEPENDS_ON_CLOSID</div><div class='add'>+	bool</div><div class='add'>+	depends on RESCTRL_FS</div><div class='add'>+	help</div><div class='add'>+	  Enabled by the architecture when the RMID values depend on the CLOSID.</div><div class='add'>+	  This causes the CLOSID allocator to search for CLOSID with clean</div><div class='add'>+	  RMID.</div><div class='head'>diff --git a/fs/resctrl/Makefile b/fs/resctrl/Makefile<br/>new file mode 100644<br/>index 000000000000..e67f34d2236a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+obj-$(CONFIG_RESCTRL_FS)		+= rdtgroup.o ctrlmondata.o monitor.o</div><div class='add'>+obj-$(CONFIG_RESCTRL_FS_PSEUDO_LOCK)	+= pseudo_lock.o</div><div class='add'>+</div><div class='add'>+# To allow define_trace.h's recursive include:</div><div class='add'>+CFLAGS_monitor.o = -I$(src)</div><div class='head'>diff --git a/fs/resctrl/ctrlmondata.c b/fs/resctrl/ctrlmondata.c<br/>new file mode 100644<br/>index 000000000000..b2d178d3556e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/ctrlmondata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/ctrlmondata.c</a></div><div class='hunk'>@@ -0,0 +1,959 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Resource Director Technology(RDT)</div><div class='add'>+ * - Cache Allocation code.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+ *    Tony Luck &lt;tony.luck@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * More information about RDT be found in the Intel (R) x86 Architecture</div><div class='add'>+ * Software Developer Manual June 2016, volume 3, section 17.17.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/tick.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+struct rdt_parse_data {</div><div class='add'>+	u32			closid;</div><div class='add'>+	enum rdtgrp_mode	mode;</div><div class='add'>+	char			*buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef int (ctrlval_parser_t)(struct rdt_parse_data *data,</div><div class='add'>+			       struct resctrl_schema *s,</div><div class='add'>+			       struct rdt_ctrl_domain *d);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check whether MBA bandwidth percentage value is correct. The value is</div><div class='add'>+ * checked against the minimum and max bandwidth values specified by the</div><div class='add'>+ * hardware. The allocated bandwidth percentage is rounded to the next</div><div class='add'>+ * control step available on the hardware.</div><div class='add'>+ */</div><div class='add'>+static bool bw_validate(char *buf, u32 *data, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 bw;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only linear delay values is supported for current Intel SKUs.</div><div class='add'>+	 */</div><div class='add'>+	if (!r-&gt;membw.delay_linear &amp;&amp; r-&gt;membw.arch_needs_linear) {</div><div class='add'>+		rdt_last_cmd_puts("No support for non-linear MB domains\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = kstrtou32(buf, 10, &amp;bw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rdt_last_cmd_printf("Invalid MB value %s\n", buf);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Nothing else to do if software controller is enabled. */</div><div class='add'>+	if (is_mba_sc(r)) {</div><div class='add'>+		*data = bw;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bw &lt; r-&gt;membw.min_bw || bw &gt; r-&gt;membw.max_bw) {</div><div class='add'>+		rdt_last_cmd_printf("MB value %u out of range [%d,%d]\n",</div><div class='add'>+				    bw, r-&gt;membw.min_bw, r-&gt;membw.max_bw);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data = roundup(bw, (unsigned long)r-&gt;membw.bw_gran);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_bw(struct rdt_parse_data *data, struct resctrl_schema *s,</div><div class='add'>+		    struct rdt_ctrl_domain *d)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_staged_config *cfg;</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	u32 closid = data-&gt;closid;</div><div class='add'>+	u32 bw_val;</div><div class='add'>+</div><div class='add'>+	cfg = &amp;d-&gt;staged_config[s-&gt;conf_type];</div><div class='add'>+	if (cfg-&gt;have_new_ctrl) {</div><div class='add'>+		rdt_last_cmd_printf("Duplicate domain %d\n", d-&gt;hdr.id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bw_validate(data-&gt;buf, &amp;bw_val, r))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (is_mba_sc(r)) {</div><div class='add'>+		d-&gt;mbps_val[closid] = bw_val;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg-&gt;new_ctrl = bw_val;</div><div class='add'>+	cfg-&gt;have_new_ctrl = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check whether a cache bit mask is valid.</div><div class='add'>+ * On Intel CPUs, non-contiguous 1s value support is indicated by CPUID:</div><div class='add'>+ *   - CPUID.0x10.1:ECX[3]: L3 non-contiguous 1s value supported if 1</div><div class='add'>+ *   - CPUID.0x10.2:ECX[3]: L2 non-contiguous 1s value supported if 1</div><div class='add'>+ *</div><div class='add'>+ * Haswell does not support a non-contiguous 1s value and additionally</div><div class='add'>+ * requires at least two bits set.</div><div class='add'>+ * AMD allows non-contiguous bitmasks.</div><div class='add'>+ */</div><div class='add'>+static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	u32 supported_bits = BIT_MASK(r-&gt;cache.cbm_len) - 1;</div><div class='add'>+	unsigned int cbm_len = r-&gt;cache.cbm_len;</div><div class='add'>+	unsigned long first_bit, zero_bit, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul(buf, 16, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rdt_last_cmd_printf("Non-hex character in the mask %s\n", buf);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((r-&gt;cache.min_cbm_bits &gt; 0 &amp;&amp; val == 0) || val &gt; supported_bits) {</div><div class='add'>+		rdt_last_cmd_puts("Mask out of range\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	first_bit = find_first_bit(&amp;val, cbm_len);</div><div class='add'>+	zero_bit = find_next_zero_bit(&amp;val, cbm_len, first_bit);</div><div class='add'>+</div><div class='add'>+	/* Are non-contiguous bitmasks allowed? */</div><div class='add'>+	if (!r-&gt;cache.arch_has_sparse_bitmasks &amp;&amp;</div><div class='add'>+	    (find_next_bit(&amp;val, cbm_len, zero_bit) &lt; cbm_len)) {</div><div class='add'>+		rdt_last_cmd_printf("The mask %lx has non-consecutive 1-bits\n", val);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((zero_bit - first_bit) &lt; r-&gt;cache.min_cbm_bits) {</div><div class='add'>+		rdt_last_cmd_printf("Need at least %d bits in the mask\n",</div><div class='add'>+				    r-&gt;cache.min_cbm_bits);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data = val;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read one cache bit mask (hex). Check that it is valid for the current</div><div class='add'>+ * resource type.</div><div class='add'>+ */</div><div class='add'>+static int parse_cbm(struct rdt_parse_data *data, struct resctrl_schema *s,</div><div class='add'>+		     struct rdt_ctrl_domain *d)</div><div class='add'>+{</div><div class='add'>+	enum rdtgrp_mode mode = data-&gt;mode;</div><div class='add'>+	struct resctrl_staged_config *cfg;</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	u32 closid = data-&gt;closid;</div><div class='add'>+	u32 cbm_val;</div><div class='add'>+</div><div class='add'>+	cfg = &amp;d-&gt;staged_config[s-&gt;conf_type];</div><div class='add'>+	if (cfg-&gt;have_new_ctrl) {</div><div class='add'>+		rdt_last_cmd_printf("Duplicate domain %d\n", d-&gt;hdr.id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cannot set up more than one pseudo-locked region in a cache</div><div class='add'>+	 * hierarchy.</div><div class='add'>+	 */</div><div class='add'>+	if (mode == RDT_MODE_PSEUDO_LOCKSETUP &amp;&amp;</div><div class='add'>+	    rdtgroup_pseudo_locked_in_hierarchy(d)) {</div><div class='add'>+		rdt_last_cmd_puts("Pseudo-locked region in hierarchy\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cbm_validate(data-&gt;buf, &amp;cbm_val, r))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((mode == RDT_MODE_EXCLUSIVE || mode == RDT_MODE_SHAREABLE) &amp;&amp;</div><div class='add'>+	    rdtgroup_cbm_overlaps_pseudo_locked(d, cbm_val)) {</div><div class='add'>+		rdt_last_cmd_puts("CBM overlaps with pseudo-locked region\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The CBM may not overlap with the CBM of another closid if</div><div class='add'>+	 * either is exclusive.</div><div class='add'>+	 */</div><div class='add'>+	if (rdtgroup_cbm_overlaps(s, d, cbm_val, closid, true)) {</div><div class='add'>+		rdt_last_cmd_puts("Overlaps with exclusive group\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgroup_cbm_overlaps(s, d, cbm_val, closid, false)) {</div><div class='add'>+		if (mode == RDT_MODE_EXCLUSIVE ||</div><div class='add'>+		    mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+			rdt_last_cmd_puts("Overlaps with other group\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg-&gt;new_ctrl = cbm_val;</div><div class='add'>+	cfg-&gt;have_new_ctrl = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For each domain in this resource we expect to find a series of:</div><div class='add'>+ *	id=mask</div><div class='add'>+ * separated by ";". The "id" is in decimal, and must match one of</div><div class='add'>+ * the "id"s for this resource.</div><div class='add'>+ */</div><div class='add'>+static int parse_line(char *line, struct resctrl_schema *s,</div><div class='add'>+		      struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	enum resctrl_conf_type t = s-&gt;conf_type;</div><div class='add'>+	ctrlval_parser_t *parse_ctrlval = NULL;</div><div class='add'>+	struct resctrl_staged_config *cfg;</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	struct rdt_parse_data data;</div><div class='add'>+	struct rdt_ctrl_domain *d;</div><div class='add'>+	char *dom = NULL, *id;</div><div class='add'>+	unsigned long dom_id;</div><div class='add'>+</div><div class='add'>+	/* Walking r-&gt;domains, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	switch (r-&gt;schema_fmt) {</div><div class='add'>+	case RESCTRL_SCHEMA_BITMAP:</div><div class='add'>+		parse_ctrlval = &amp;parse_cbm;</div><div class='add'>+		break;</div><div class='add'>+	case RESCTRL_SCHEMA_RANGE:</div><div class='add'>+		parse_ctrlval = &amp;parse_bw;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!parse_ctrlval))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP &amp;&amp;</div><div class='add'>+	    (r-&gt;rid == RDT_RESOURCE_MBA || r-&gt;rid == RDT_RESOURCE_SMBA)) {</div><div class='add'>+		rdt_last_cmd_puts("Cannot pseudo-lock MBA resource\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+	if (!line || line[0] == '\0')</div><div class='add'>+		return 0;</div><div class='add'>+	dom = strsep(&amp;line, ";");</div><div class='add'>+	id = strsep(&amp;dom, "=");</div><div class='add'>+	if (!dom || kstrtoul(id, 10, &amp;dom_id)) {</div><div class='add'>+		rdt_last_cmd_puts("Missing '=' or non-numeric domain\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dom = strim(dom);</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+		if (d-&gt;hdr.id == dom_id) {</div><div class='add'>+			data.buf = dom;</div><div class='add'>+			data.closid = rdtgrp-&gt;closid;</div><div class='add'>+			data.mode = rdtgrp-&gt;mode;</div><div class='add'>+			if (parse_ctrlval(&amp;data, s, d))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (rdtgrp-&gt;mode ==  RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+				cfg = &amp;d-&gt;staged_config[t];</div><div class='add'>+				/*</div><div class='add'>+				 * In pseudo-locking setup mode and just</div><div class='add'>+				 * parsed a valid CBM that should be</div><div class='add'>+				 * pseudo-locked. Only one locked region per</div><div class='add'>+				 * resource group and domain so just do</div><div class='add'>+				 * the required initialization for single</div><div class='add'>+				 * region and return.</div><div class='add'>+				 */</div><div class='add'>+				rdtgrp-&gt;plr-&gt;s = s;</div><div class='add'>+				rdtgrp-&gt;plr-&gt;d = d;</div><div class='add'>+				rdtgrp-&gt;plr-&gt;cbm = cfg-&gt;new_ctrl;</div><div class='add'>+				d-&gt;plr = rdtgrp-&gt;plr;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_parse_resource(char *resname, char *tok,</div><div class='add'>+				   struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;resctrl_schema_all, list) {</div><div class='add'>+		if (!strcmp(resname, s-&gt;name) &amp;&amp; rdtgrp-&gt;closid &lt; s-&gt;num_closid)</div><div class='add'>+			return parse_line(tok, s, rdtgrp);</div><div class='add'>+	}</div><div class='add'>+	rdt_last_cmd_printf("Unknown or unsupported resource name '%s'\n", resname);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,</div><div class='add'>+				char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	char *tok, *resname;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No changes to pseudo-locked region allowed. It has to be removed</div><div class='add'>+	 * and re-created instead.</div><div class='add'>+	 */</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKED) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rdt_last_cmd_puts("Resource group is pseudo-locked\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdt_staged_configs_clear();</div><div class='add'>+</div><div class='add'>+	while ((tok = strsep(&amp;buf, "\n")) != NULL) {</div><div class='add'>+		resname = strim(strsep(&amp;tok, ":"));</div><div class='add'>+		if (!tok) {</div><div class='add'>+			rdt_last_cmd_puts("Missing ':'\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (tok[0] == '\0') {</div><div class='add'>+			rdt_last_cmd_printf("Missing '%s' value\n", resname);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		ret = rdtgroup_parse_resource(resname, tok, rdtgrp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;resctrl_schema_all, list) {</div><div class='add'>+		r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Writes to mba_sc resources update the software controller,</div><div class='add'>+		 * not the control MSR.</div><div class='add'>+		 */</div><div class='add'>+		if (is_mba_sc(r))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = resctrl_arch_update_domains(r, rdtgrp-&gt;closid);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+		/*</div><div class='add'>+		 * If pseudo-locking fails we keep the resource group in</div><div class='add'>+		 * mode RDT_MODE_PSEUDO_LOCKSETUP with its class of service</div><div class='add'>+		 * active and updated for just the domain the pseudo-locked</div><div class='add'>+		 * region was requested for.</div><div class='add'>+		 */</div><div class='add'>+		ret = rdtgroup_pseudo_lock_create(rdtgrp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rdt_staged_configs_clear();</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void show_doms(struct seq_file *s, struct resctrl_schema *schema,</div><div class='add'>+		      char *resource_name, int closid)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = schema-&gt;res;</div><div class='add'>+	struct rdt_ctrl_domain *dom;</div><div class='add'>+	bool sep = false;</div><div class='add'>+	u32 ctrl_val;</div><div class='add'>+</div><div class='add'>+	/* Walking r-&gt;domains, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	if (resource_name)</div><div class='add'>+		seq_printf(s, "%*s:", max_name_width, resource_name);</div><div class='add'>+	list_for_each_entry(dom, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+		if (sep)</div><div class='add'>+			seq_puts(s, ";");</div><div class='add'>+</div><div class='add'>+		if (is_mba_sc(r))</div><div class='add'>+			ctrl_val = dom-&gt;mbps_val[closid];</div><div class='add'>+		else</div><div class='add'>+			ctrl_val = resctrl_arch_get_config(r, dom, closid,</div><div class='add'>+							   schema-&gt;conf_type);</div><div class='add'>+</div><div class='add'>+		seq_printf(s, schema-&gt;fmt_str, dom-&gt;hdr.id, ctrl_val);</div><div class='add'>+		sep = true;</div><div class='add'>+	}</div><div class='add'>+	seq_puts(s, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdtgroup_schemata_show(struct kernfs_open_file *of,</div><div class='add'>+			   struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *schema;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 closid;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (rdtgrp) {</div><div class='add'>+		if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+			list_for_each_entry(schema, &amp;resctrl_schema_all, list) {</div><div class='add'>+				seq_printf(s, "%s:uninitialized\n", schema-&gt;name);</div><div class='add'>+			}</div><div class='add'>+		} else if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKED) {</div><div class='add'>+			if (!rdtgrp-&gt;plr-&gt;d) {</div><div class='add'>+				rdt_last_cmd_clear();</div><div class='add'>+				rdt_last_cmd_puts("Cache domain offline\n");</div><div class='add'>+				ret = -ENODEV;</div><div class='add'>+			} else {</div><div class='add'>+				seq_printf(s, "%s:%d=%x\n",</div><div class='add'>+					   rdtgrp-&gt;plr-&gt;s-&gt;res-&gt;name,</div><div class='add'>+					   rdtgrp-&gt;plr-&gt;d-&gt;hdr.id,</div><div class='add'>+					   rdtgrp-&gt;plr-&gt;cbm);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			closid = rdtgrp-&gt;closid;</div><div class='add'>+			list_for_each_entry(schema, &amp;resctrl_schema_all, list) {</div><div class='add'>+				if (closid &lt; schema-&gt;num_closid)</div><div class='add'>+					show_doms(s, schema, schema-&gt;name, closid);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smp_mon_event_count(void *arg)</div><div class='add'>+{</div><div class='add'>+	mon_event_count(arg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t rdtgroup_mba_mbps_event_write(struct kernfs_open_file *of,</div><div class='add'>+				      char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!strcmp(buf, "mbm_local_bytes")) {</div><div class='add'>+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+			rdtgrp-&gt;mba_mbps_event = QOS_L3_MBM_LOCAL_EVENT_ID;</div><div class='add'>+		else</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+	} else if (!strcmp(buf, "mbm_total_bytes")) {</div><div class='add'>+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+			rdtgrp-&gt;mba_mbps_event = QOS_L3_MBM_TOTAL_EVENT_ID;</div><div class='add'>+		else</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		rdt_last_cmd_printf("Unsupported event id '%s'\n", buf);</div><div class='add'>+</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdtgroup_mba_mbps_event_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	if (rdtgrp) {</div><div class='add'>+		switch (rdtgrp-&gt;mba_mbps_event) {</div><div class='add'>+		case QOS_L3_MBM_LOCAL_EVENT_ID:</div><div class='add'>+			seq_puts(s, "mbm_local_bytes\n");</div><div class='add'>+			break;</div><div class='add'>+		case QOS_L3_MBM_TOTAL_EVENT_ID:</div><div class='add'>+			seq_puts(s, "mbm_total_bytes\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pr_warn_once("Bad event %d\n", rdtgrp-&gt;mba_mbps_event);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rdt_domain_hdr *resctrl_find_domain(struct list_head *h, int id,</div><div class='add'>+					   struct list_head **pos)</div><div class='add'>+{</div><div class='add'>+	struct rdt_domain_hdr *d;</div><div class='add'>+	struct list_head *l;</div><div class='add'>+</div><div class='add'>+	list_for_each(l, h) {</div><div class='add'>+		d = list_entry(l, struct rdt_domain_hdr, list);</div><div class='add'>+		/* When id is found, return its domain. */</div><div class='add'>+		if (id == d-&gt;id)</div><div class='add'>+			return d;</div><div class='add'>+		/* Stop searching when finding id's position in sorted list. */</div><div class='add'>+		if (id &lt; d-&gt;id)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pos)</div><div class='add'>+		*pos = l;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mon_event_read(struct rmid_read *rr, struct rdt_resource *r,</div><div class='add'>+		    struct rdt_mon_domain *d, struct rdtgroup *rdtgrp,</div><div class='add'>+		    cpumask_t *cpumask, int evtid, int first)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	/* When picking a CPU from cpu_mask, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the parameters to pass to mon_event_count() to read the data.</div><div class='add'>+	 */</div><div class='add'>+	rr-&gt;rgrp = rdtgrp;</div><div class='add'>+	rr-&gt;evtid = evtid;</div><div class='add'>+	rr-&gt;r = r;</div><div class='add'>+	rr-&gt;d = d;</div><div class='add'>+	rr-&gt;first = first;</div><div class='add'>+	if (resctrl_arch_mbm_cntr_assign_enabled(r) &amp;&amp;</div><div class='add'>+	    resctrl_is_mbm_event(evtid)) {</div><div class='add'>+		rr-&gt;is_mbm_cntr = true;</div><div class='add'>+	} else {</div><div class='add'>+		rr-&gt;arch_mon_ctx = resctrl_arch_mon_ctx_alloc(r, evtid);</div><div class='add'>+		if (IS_ERR(rr-&gt;arch_mon_ctx)) {</div><div class='add'>+			rr-&gt;err = -EINVAL;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpu = cpumask_any_housekeeping(cpumask, RESCTRL_PICK_ANY_CPU);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * cpumask_any_housekeeping() prefers housekeeping CPUs, but</div><div class='add'>+	 * are all the CPUs nohz_full? If yes, pick a CPU to IPI.</div><div class='add'>+	 * MPAM's resctrl_arch_rmid_read() is unable to read the</div><div class='add'>+	 * counters on some platforms if its called in IRQ context.</div><div class='add'>+	 */</div><div class='add'>+	if (tick_nohz_full_cpu(cpu))</div><div class='add'>+		smp_call_function_any(cpumask, mon_event_count, rr, 1);</div><div class='add'>+	else</div><div class='add'>+		smp_call_on_cpu(cpu, smp_mon_event_count, rr, false);</div><div class='add'>+</div><div class='add'>+	if (rr-&gt;arch_mon_ctx)</div><div class='add'>+		resctrl_arch_mon_ctx_free(r, evtid, rr-&gt;arch_mon_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdtgroup_mondata_show(struct seq_file *m, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_open_file *of = m-&gt;private;</div><div class='add'>+	enum resctrl_res_level resid;</div><div class='add'>+	enum resctrl_event_id evtid;</div><div class='add'>+	struct rdt_domain_hdr *hdr;</div><div class='add'>+	struct rmid_read rr = {0};</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int domid, cpu, ret = 0;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	struct cacheinfo *ci;</div><div class='add'>+	struct mon_data *md;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	md = of-&gt;kn-&gt;priv;</div><div class='add'>+	if (WARN_ON_ONCE(!md)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resid = md-&gt;rid;</div><div class='add'>+	domid = md-&gt;domid;</div><div class='add'>+	evtid = md-&gt;evtid;</div><div class='add'>+	r = resctrl_arch_get_resource(resid);</div><div class='add'>+</div><div class='add'>+	if (md-&gt;sum) {</div><div class='add'>+		/*</div><div class='add'>+		 * This file requires summing across all domains that share</div><div class='add'>+		 * the L3 cache id that was provided in the "domid" field of the</div><div class='add'>+		 * struct mon_data. Search all domains in the resource for</div><div class='add'>+		 * one that matches this cache id.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+			if (d-&gt;ci_id == domid) {</div><div class='add'>+				cpu = cpumask_any(&amp;d-&gt;hdr.cpu_mask);</div><div class='add'>+				ci = get_cpu_cacheinfo_level(cpu, RESCTRL_L3_CACHE);</div><div class='add'>+				if (!ci)</div><div class='add'>+					continue;</div><div class='add'>+				rr.ci = ci;</div><div class='add'>+				mon_event_read(&amp;rr, r, NULL, rdtgrp,</div><div class='add'>+					       &amp;ci-&gt;shared_cpu_map, evtid, false);</div><div class='add'>+				goto checkresult;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * This file provides data from a single domain. Search</div><div class='add'>+		 * the resource to find the domain with "domid".</div><div class='add'>+		 */</div><div class='add'>+		hdr = resctrl_find_domain(&amp;r-&gt;mon_domains, domid, NULL);</div><div class='add'>+		if (!hdr || WARN_ON_ONCE(hdr-&gt;type != RESCTRL_MON_DOMAIN)) {</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		d = container_of(hdr, struct rdt_mon_domain, hdr);</div><div class='add'>+		mon_event_read(&amp;rr, r, d, rdtgrp, &amp;d-&gt;hdr.cpu_mask, evtid, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+checkresult:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * -ENOENT is a special case, set only when "mbm_event" counter assignment</div><div class='add'>+	 * mode is enabled and no counter has been assigned.</div><div class='add'>+	 */</div><div class='add'>+	if (rr.err == -EIO)</div><div class='add'>+		seq_puts(m, "Error\n");</div><div class='add'>+	else if (rr.err == -EINVAL)</div><div class='add'>+		seq_puts(m, "Unavailable\n");</div><div class='add'>+	else if (rr.err == -ENOENT)</div><div class='add'>+		seq_puts(m, "Unassigned\n");</div><div class='add'>+	else</div><div class='add'>+		seq_printf(m, "%llu\n", rr.val);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int resctrl_io_alloc_show(struct kernfs_open_file *of, struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (r-&gt;cache.io_alloc_capable) {</div><div class='add'>+		if (resctrl_arch_get_io_alloc_enabled(r))</div><div class='add'>+			seq_puts(seq, "enabled\n");</div><div class='add'>+		else</div><div class='add'>+			seq_puts(seq, "disabled\n");</div><div class='add'>+	} else {</div><div class='add'>+		seq_puts(seq, "not supported\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * resctrl_io_alloc_closid_supported() - io_alloc feature utilizes the</div><div class='add'>+ * highest CLOSID value to direct I/O traffic. Ensure that io_alloc_closid</div><div class='add'>+ * is in the supported range.</div><div class='add'>+ */</div><div class='add'>+static bool resctrl_io_alloc_closid_supported(u32 io_alloc_closid)</div><div class='add'>+{</div><div class='add'>+	return io_alloc_closid &lt; closids_supported();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize io_alloc CLOSID cache resource CBM with all usable (shared</div><div class='add'>+ * and unused) cache portions.</div><div class='add'>+ */</div><div class='add'>+static int resctrl_io_alloc_init_cbm(struct resctrl_schema *s, u32 closid)</div><div class='add'>+{</div><div class='add'>+	enum resctrl_conf_type peer_type;</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	struct rdt_ctrl_domain *d;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rdt_staged_configs_clear();</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_init_cat(s, closid);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Keep CDP_CODE and CDP_DATA of io_alloc CLOSID's CBM in sync. */</div><div class='add'>+	if (resctrl_arch_get_cdp_enabled(r-&gt;rid)) {</div><div class='add'>+		peer_type = resctrl_peer_type(s-&gt;conf_type);</div><div class='add'>+		list_for_each_entry(d, &amp;s-&gt;res-&gt;ctrl_domains, hdr.list)</div><div class='add'>+			memcpy(&amp;d-&gt;staged_config[peer_type],</div><div class='add'>+			       &amp;d-&gt;staged_config[s-&gt;conf_type],</div><div class='add'>+			       sizeof(d-&gt;staged_config[0]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = resctrl_arch_update_domains(r, closid);</div><div class='add'>+out:</div><div class='add'>+	rdt_staged_configs_clear();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * resctrl_io_alloc_closid() - io_alloc feature routes I/O traffic using</div><div class='add'>+ * the highest available CLOSID. Retrieve the maximum CLOSID supported by the</div><div class='add'>+ * resource. Note that if Code Data Prioritization (CDP) is enabled, the number</div><div class='add'>+ * of available CLOSIDs is reduced by half.</div><div class='add'>+ */</div><div class='add'>+u32 resctrl_io_alloc_closid(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	if (resctrl_arch_get_cdp_enabled(r-&gt;rid))</div><div class='add'>+		return resctrl_arch_get_num_closid(r) / 2  - 1;</div><div class='add'>+	else</div><div class='add'>+		return resctrl_arch_get_num_closid(r) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_io_alloc_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+			       size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	char const *grp_name;</div><div class='add'>+	u32 io_alloc_closid;</div><div class='add'>+	bool enable;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;cache.io_alloc_capable) {</div><div class='add'>+		rdt_last_cmd_printf("io_alloc is not supported on %s\n", s-&gt;name);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the feature is already up to date, no action is needed. */</div><div class='add'>+	if (resctrl_arch_get_io_alloc_enabled(r) == enable)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	io_alloc_closid = resctrl_io_alloc_closid(r);</div><div class='add'>+	if (!resctrl_io_alloc_closid_supported(io_alloc_closid)) {</div><div class='add'>+		rdt_last_cmd_printf("io_alloc CLOSID (ctrl_hw_id) %u is not available\n",</div><div class='add'>+				    io_alloc_closid);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		if (!closid_alloc_fixed(io_alloc_closid)) {</div><div class='add'>+			grp_name = rdtgroup_name_by_closid(io_alloc_closid);</div><div class='add'>+			WARN_ON_ONCE(!grp_name);</div><div class='add'>+			rdt_last_cmd_printf("CLOSID (ctrl_hw_id) %u for io_alloc is used by %s group\n",</div><div class='add'>+					    io_alloc_closid, grp_name ? grp_name : "another");</div><div class='add'>+			ret = -ENOSPC;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = resctrl_io_alloc_init_cbm(s, io_alloc_closid);</div><div class='add'>+		if (ret) {</div><div class='add'>+			rdt_last_cmd_puts("Failed to initialize io_alloc allocations\n");</div><div class='add'>+			closid_free(io_alloc_closid);</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		closid_free(io_alloc_closid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = resctrl_arch_io_alloc_enable(r, enable);</div><div class='add'>+	if (enable &amp;&amp; ret) {</div><div class='add'>+		rdt_last_cmd_puts("Failed to enable io_alloc feature\n");</div><div class='add'>+		closid_free(io_alloc_closid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int resctrl_io_alloc_cbm_show(struct kernfs_open_file *of, struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;cache.io_alloc_capable) {</div><div class='add'>+		rdt_last_cmd_printf("io_alloc is not supported on %s\n", s-&gt;name);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_get_io_alloc_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_printf("io_alloc is not enabled on %s\n", s-&gt;name);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When CDP is enabled, the CBMs of the highest CLOSID of CDP_CODE and</div><div class='add'>+	 * CDP_DATA are kept in sync. As a result, the io_alloc CBMs shown for</div><div class='add'>+	 * either CDP resource are identical and accurately represent the CBMs</div><div class='add'>+	 * used for I/O.</div><div class='add'>+	 */</div><div class='add'>+	show_doms(seq, s, NULL, resctrl_io_alloc_closid(r));</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resctrl_io_alloc_parse_line(char *line,  struct rdt_resource *r,</div><div class='add'>+				       struct resctrl_schema *s, u32 closid)</div><div class='add'>+{</div><div class='add'>+	enum resctrl_conf_type peer_type;</div><div class='add'>+	struct rdt_parse_data data;</div><div class='add'>+	struct rdt_ctrl_domain *d;</div><div class='add'>+	char *dom = NULL, *id;</div><div class='add'>+	unsigned long dom_id;</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+	if (!line || line[0] == '\0')</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dom = strsep(&amp;line, ";");</div><div class='add'>+	id = strsep(&amp;dom, "=");</div><div class='add'>+	if (!dom || kstrtoul(id, 10, &amp;dom_id)) {</div><div class='add'>+		rdt_last_cmd_puts("Missing '=' or non-numeric domain\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dom = strim(dom);</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+		if (d-&gt;hdr.id == dom_id) {</div><div class='add'>+			data.buf = dom;</div><div class='add'>+			data.mode = RDT_MODE_SHAREABLE;</div><div class='add'>+			data.closid = closid;</div><div class='add'>+			if (parse_cbm(&amp;data, s, d))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			/*</div><div class='add'>+			 * Keep io_alloc CLOSID's CBM of CDP_CODE and CDP_DATA</div><div class='add'>+			 * in sync.</div><div class='add'>+			 */</div><div class='add'>+			if (resctrl_arch_get_cdp_enabled(r-&gt;rid)) {</div><div class='add'>+				peer_type = resctrl_peer_type(s-&gt;conf_type);</div><div class='add'>+				memcpy(&amp;d-&gt;staged_config[peer_type],</div><div class='add'>+				       &amp;d-&gt;staged_config[s-&gt;conf_type],</div><div class='add'>+				       sizeof(d-&gt;staged_config[0]));</div><div class='add'>+			}</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_io_alloc_cbm_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				   size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	u32 io_alloc_closid;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;cache.io_alloc_capable) {</div><div class='add'>+		rdt_last_cmd_printf("io_alloc is not supported on %s\n", s-&gt;name);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_get_io_alloc_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_printf("io_alloc is not enabled on %s\n", s-&gt;name);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	io_alloc_closid = resctrl_io_alloc_closid(r);</div><div class='add'>+</div><div class='add'>+	rdt_staged_configs_clear();</div><div class='add'>+	ret = resctrl_io_alloc_parse_line(buf, r, s, io_alloc_closid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_clear_configs;</div><div class='add'>+</div><div class='add'>+	ret = resctrl_arch_update_domains(r, io_alloc_closid);</div><div class='add'>+</div><div class='add'>+out_clear_configs:</div><div class='add'>+	rdt_staged_configs_clear();</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h<br/>new file mode 100644<br/>index 000000000000..bff4a54ae333<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/internal.h</a></div><div class='hunk'>@@ -0,0 +1,495 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _FS_RESCTRL_INTERNAL_H</div><div class='add'>+#define _FS_RESCTRL_INTERNAL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/resctrl.h&gt;</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/fs_context.h&gt;</div><div class='add'>+#include &lt;linux/tick.h&gt;</div><div class='add'>+</div><div class='add'>+#define CQM_LIMBOCHECK_INTERVAL	1000</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpumask_any_housekeeping() - Choose any CPU in @mask, preferring those that</div><div class='add'>+ *			        aren't marked nohz_full</div><div class='add'>+ * @mask:	The mask to pick a CPU from.</div><div class='add'>+ * @exclude_cpu:The CPU to avoid picking.</div><div class='add'>+ *</div><div class='add'>+ * Returns a CPU from @mask, but not @exclude_cpu. If there are housekeeping</div><div class='add'>+ * CPUs that don't use nohz_full, these are preferred. Pass</div><div class='add'>+ * RESCTRL_PICK_ANY_CPU to avoid excluding any CPUs.</div><div class='add'>+ *</div><div class='add'>+ * When a CPU is excluded, returns &gt;= nr_cpu_ids if no CPUs are available.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int</div><div class='add'>+cpumask_any_housekeeping(const struct cpumask *mask, int exclude_cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+</div><div class='add'>+	/* Try to find a CPU that isn't nohz_full to use in preference */</div><div class='add'>+	if (tick_nohz_full_enabled()) {</div><div class='add'>+		cpu = cpumask_any_andnot_but(mask, tick_nohz_full_mask, exclude_cpu);</div><div class='add'>+		if (cpu &lt; nr_cpu_ids)</div><div class='add'>+			return cpu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cpumask_any_but(mask, exclude_cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rdt_fs_context {</div><div class='add'>+	struct kernfs_fs_context	kfc;</div><div class='add'>+	bool				enable_cdpl2;</div><div class='add'>+	bool				enable_cdpl3;</div><div class='add'>+	bool				enable_mba_mbps;</div><div class='add'>+	bool				enable_debug;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct rdt_fs_context *rdt_fc2context(struct fs_context *fc)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_fs_context *kfc = fc-&gt;fs_private;</div><div class='add'>+</div><div class='add'>+	return container_of(kfc, struct rdt_fs_context, kfc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mon_evt - Properties of a monitor event</div><div class='add'>+ * @evtid:		event id</div><div class='add'>+ * @rid:		resource id for this event</div><div class='add'>+ * @name:		name of the event</div><div class='add'>+ * @evt_cfg:		Event configuration value that represents the</div><div class='add'>+ *			memory transactions (e.g., READS_TO_LOCAL_MEM,</div><div class='add'>+ *			READS_TO_REMOTE_MEM) being tracked by @evtid.</div><div class='add'>+ *			Only valid if @evtid is an MBM event.</div><div class='add'>+ * @configurable:	true if the event is configurable</div><div class='add'>+ * @enabled:		true if the event is enabled</div><div class='add'>+ */</div><div class='add'>+struct mon_evt {</div><div class='add'>+	enum resctrl_event_id	evtid;</div><div class='add'>+	enum resctrl_res_level	rid;</div><div class='add'>+	char			*name;</div><div class='add'>+	u32			evt_cfg;</div><div class='add'>+	bool			configurable;</div><div class='add'>+	bool			enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct mon_evt mon_event_all[QOS_NUM_EVENTS];</div><div class='add'>+</div><div class='add'>+#define for_each_mon_event(mevt) for (mevt = &amp;mon_event_all[QOS_FIRST_EVENT];	\</div><div class='add'>+				      mevt &lt; &amp;mon_event_all[QOS_NUM_EVENTS]; mevt++)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mon_data - Monitoring details for each event file.</div><div class='add'>+ * @list:            Member of the global @mon_data_kn_priv_list list.</div><div class='add'>+ * @rid:             Resource id associated with the event file.</div><div class='add'>+ * @evtid:           Event id associated with the event file.</div><div class='add'>+ * @sum:             Set when event must be summed across multiple</div><div class='add'>+ *                   domains.</div><div class='add'>+ * @domid:           When @sum is zero this is the domain to which</div><div class='add'>+ *                   the event file belongs. When @sum is one this</div><div class='add'>+ *                   is the id of the L3 cache that all domains to be</div><div class='add'>+ *                   summed share.</div><div class='add'>+ *</div><div class='add'>+ * Pointed to by the kernfs kn-&gt;priv field of monitoring event files.</div><div class='add'>+ * Readers and writers must hold rdtgroup_mutex.</div><div class='add'>+ */</div><div class='add'>+struct mon_data {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	enum resctrl_res_level	rid;</div><div class='add'>+	enum resctrl_event_id	evtid;</div><div class='add'>+	int			domid;</div><div class='add'>+	bool			sum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rmid_read - Data passed across smp_call*() to read event count.</div><div class='add'>+ * @rgrp:  Resource group for which the counter is being read. If it is a parent</div><div class='add'>+ *	   resource group then its event count is summed with the count from all</div><div class='add'>+ *	   its child resource groups.</div><div class='add'>+ * @r:	   Resource describing the properties of the event being read.</div><div class='add'>+ * @d:	   Domain that the counter should be read from. If NULL then sum all</div><div class='add'>+ *	   domains in @r sharing L3 @ci.id</div><div class='add'>+ * @evtid: Which monitor event to read.</div><div class='add'>+ * @first: Initialize MBM counter when true.</div><div class='add'>+ * @ci:    Cacheinfo for L3. Only set when @d is NULL. Used when summing domains.</div><div class='add'>+ * @is_mbm_cntr: true if "mbm_event" counter assignment mode is enabled and it</div><div class='add'>+ *	   is an MBM event.</div><div class='add'>+ * @err:   Error encountered when reading counter.</div><div class='add'>+ * @val:   Returned value of event counter. If @rgrp is a parent resource group,</div><div class='add'>+ *	   @val includes the sum of event counts from its child resource groups.</div><div class='add'>+ *	   If @d is NULL, @val includes the sum of all domains in @r sharing @ci.id,</div><div class='add'>+ *	   (summed across child resource groups if @rgrp is a parent resource group).</div><div class='add'>+ * @arch_mon_ctx: Hardware monitor allocated for this read request (MPAM only).</div><div class='add'>+ */</div><div class='add'>+struct rmid_read {</div><div class='add'>+	struct rdtgroup		*rgrp;</div><div class='add'>+	struct rdt_resource	*r;</div><div class='add'>+	struct rdt_mon_domain	*d;</div><div class='add'>+	enum resctrl_event_id	evtid;</div><div class='add'>+	bool			first;</div><div class='add'>+	struct cacheinfo	*ci;</div><div class='add'>+	bool			is_mbm_cntr;</div><div class='add'>+	int			err;</div><div class='add'>+	u64			val;</div><div class='add'>+	void			*arch_mon_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct list_head resctrl_schema_all;</div><div class='add'>+</div><div class='add'>+extern bool resctrl_mounted;</div><div class='add'>+</div><div class='add'>+enum rdt_group_type {</div><div class='add'>+	RDTCTRL_GROUP = 0,</div><div class='add'>+	RDTMON_GROUP,</div><div class='add'>+	RDT_NUM_GROUP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum rdtgrp_mode - Mode of a RDT resource group</div><div class='add'>+ * @RDT_MODE_SHAREABLE: This resource group allows sharing of its allocations</div><div class='add'>+ * @RDT_MODE_EXCLUSIVE: No sharing of this resource group's allocations allowed</div><div class='add'>+ * @RDT_MODE_PSEUDO_LOCKSETUP: Resource group will be used for Pseudo-Locking</div><div class='add'>+ * @RDT_MODE_PSEUDO_LOCKED: No sharing of this resource group's allocations</div><div class='add'>+ *                          allowed AND the allocations are Cache Pseudo-Locked</div><div class='add'>+ * @RDT_NUM_MODES: Total number of modes</div><div class='add'>+ *</div><div class='add'>+ * The mode of a resource group enables control over the allowed overlap</div><div class='add'>+ * between allocations associated with different resource groups (classes</div><div class='add'>+ * of service). User is able to modify the mode of a resource group by</div><div class='add'>+ * writing to the "mode" resctrl file associated with the resource group.</div><div class='add'>+ *</div><div class='add'>+ * The "shareable", "exclusive", and "pseudo-locksetup" modes are set by</div><div class='add'>+ * writing the appropriate text to the "mode" file. A resource group enters</div><div class='add'>+ * "pseudo-locked" mode after the schemata is written while the resource</div><div class='add'>+ * group is in "pseudo-locksetup" mode.</div><div class='add'>+ */</div><div class='add'>+enum rdtgrp_mode {</div><div class='add'>+	RDT_MODE_SHAREABLE = 0,</div><div class='add'>+	RDT_MODE_EXCLUSIVE,</div><div class='add'>+	RDT_MODE_PSEUDO_LOCKSETUP,</div><div class='add'>+	RDT_MODE_PSEUDO_LOCKED,</div><div class='add'>+</div><div class='add'>+	/* Must be last */</div><div class='add'>+	RDT_NUM_MODES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mongroup - store mon group's data in resctrl fs.</div><div class='add'>+ * @mon_data_kn:		kernfs node for the mon_data directory</div><div class='add'>+ * @parent:			parent rdtgrp</div><div class='add'>+ * @crdtgrp_list:		child rdtgroup node list</div><div class='add'>+ * @rmid:			rmid for this rdtgroup</div><div class='add'>+ */</div><div class='add'>+struct mongroup {</div><div class='add'>+	struct kernfs_node	*mon_data_kn;</div><div class='add'>+	struct rdtgroup		*parent;</div><div class='add'>+	struct list_head	crdtgrp_list;</div><div class='add'>+	u32			rmid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rdtgroup - store rdtgroup's data in resctrl file system.</div><div class='add'>+ * @kn:				kernfs node</div><div class='add'>+ * @rdtgroup_list:		linked list for all rdtgroups</div><div class='add'>+ * @closid:			closid for this rdtgroup</div><div class='add'>+ * @cpu_mask:			CPUs assigned to this rdtgroup</div><div class='add'>+ * @flags:			status bits</div><div class='add'>+ * @waitcount:			how many cpus expect to find this</div><div class='add'>+ *				group when they acquire rdtgroup_mutex</div><div class='add'>+ * @type:			indicates type of this rdtgroup - either</div><div class='add'>+ *				monitor only or ctrl_mon group</div><div class='add'>+ * @mon:			mongroup related data</div><div class='add'>+ * @mode:			mode of resource group</div><div class='add'>+ * @mba_mbps_event:		input monitoring event id when mba_sc is enabled</div><div class='add'>+ * @plr:			pseudo-locked region</div><div class='add'>+ */</div><div class='add'>+struct rdtgroup {</div><div class='add'>+	struct kernfs_node		*kn;</div><div class='add'>+	struct list_head		rdtgroup_list;</div><div class='add'>+	u32				closid;</div><div class='add'>+	struct cpumask			cpu_mask;</div><div class='add'>+	int				flags;</div><div class='add'>+	atomic_t			waitcount;</div><div class='add'>+	enum rdt_group_type		type;</div><div class='add'>+	struct mongroup			mon;</div><div class='add'>+	enum rdtgrp_mode		mode;</div><div class='add'>+	enum resctrl_event_id		mba_mbps_event;</div><div class='add'>+	struct pseudo_lock_region	*plr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rdtgroup.flags */</div><div class='add'>+#define	RDT_DELETED		1</div><div class='add'>+</div><div class='add'>+/* rftype.flags */</div><div class='add'>+#define RFTYPE_FLAGS_CPUS_LIST	1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define the file type flags for base and info directories.</div><div class='add'>+ */</div><div class='add'>+#define RFTYPE_INFO			BIT(0)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_BASE			BIT(1)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_CTRL			BIT(4)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_MON			BIT(5)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_TOP			BIT(6)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_RES_CACHE		BIT(8)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_RES_MB			BIT(9)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_DEBUG			BIT(10)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_ASSIGN_CONFIG		BIT(11)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_CTRL_INFO		(RFTYPE_INFO | RFTYPE_CTRL)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_MON_INFO			(RFTYPE_INFO | RFTYPE_MON)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_TOP_INFO			(RFTYPE_INFO | RFTYPE_TOP)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_CTRL_BASE		(RFTYPE_BASE | RFTYPE_CTRL)</div><div class='add'>+</div><div class='add'>+#define RFTYPE_MON_BASE			(RFTYPE_BASE | RFTYPE_MON)</div><div class='add'>+</div><div class='add'>+/* List of all resource groups */</div><div class='add'>+extern struct list_head rdt_all_groups;</div><div class='add'>+</div><div class='add'>+extern int max_name_width;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rftype - describe each file in the resctrl file system</div><div class='add'>+ * @name:	File name</div><div class='add'>+ * @mode:	Access mode</div><div class='add'>+ * @kf_ops:	File operations</div><div class='add'>+ * @flags:	File specific RFTYPE_FLAGS_* flags</div><div class='add'>+ * @fflags:	File specific RFTYPE_* flags</div><div class='add'>+ * @seq_show:	Show content of the file</div><div class='add'>+ * @write:	Write to the file</div><div class='add'>+ */</div><div class='add'>+struct rftype {</div><div class='add'>+	char			*name;</div><div class='add'>+	umode_t			mode;</div><div class='add'>+	const struct kernfs_ops	*kf_ops;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	unsigned long		fflags;</div><div class='add'>+</div><div class='add'>+	int (*seq_show)(struct kernfs_open_file *of,</div><div class='add'>+			struct seq_file *sf, void *v);</div><div class='add'>+	/*</div><div class='add'>+	 * write() is the generic write callback which maps directly to</div><div class='add'>+	 * kernfs write operation and overrides all other operations.</div><div class='add'>+	 * Maximum write size is determined by -&gt;max_write_len.</div><div class='add'>+	 */</div><div class='add'>+	ssize_t (*write)(struct kernfs_open_file *of,</div><div class='add'>+			 char *buf, size_t nbytes, loff_t off);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mbm_state - status for each MBM counter in each domain</div><div class='add'>+ * @prev_bw_bytes: Previous bytes value read for bandwidth calculation</div><div class='add'>+ * @prev_bw:	The most recent bandwidth in MBps</div><div class='add'>+ */</div><div class='add'>+struct mbm_state {</div><div class='add'>+	u64	prev_bw_bytes;</div><div class='add'>+	u32	prev_bw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct mutex rdtgroup_mutex;</div><div class='add'>+</div><div class='add'>+static inline const char *rdt_kn_name(const struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference_check(kn-&gt;name, lockdep_is_held(&amp;rdtgroup_mutex));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern struct rdtgroup rdtgroup_default;</div><div class='add'>+</div><div class='add'>+extern struct dentry *debugfs_resctrl;</div><div class='add'>+</div><div class='add'>+extern enum resctrl_event_id mba_mbps_default_event;</div><div class='add'>+</div><div class='add'>+void rdt_last_cmd_clear(void);</div><div class='add'>+</div><div class='add'>+void rdt_last_cmd_puts(const char *s);</div><div class='add'>+</div><div class='add'>+__printf(1, 2)</div><div class='add'>+void rdt_last_cmd_printf(const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+struct rdtgroup *rdtgroup_kn_lock_live(struct kernfs_node *kn);</div><div class='add'>+</div><div class='add'>+void rdtgroup_kn_unlock(struct kernfs_node *kn);</div><div class='add'>+</div><div class='add'>+int rdtgroup_kn_mode_restrict(struct rdtgroup *r, const char *name);</div><div class='add'>+</div><div class='add'>+int rdtgroup_kn_mode_restore(struct rdtgroup *r, const char *name,</div><div class='add'>+			     umode_t mask);</div><div class='add'>+</div><div class='add'>+ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,</div><div class='add'>+				char *buf, size_t nbytes, loff_t off);</div><div class='add'>+</div><div class='add'>+int rdtgroup_schemata_show(struct kernfs_open_file *of,</div><div class='add'>+			   struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+ssize_t rdtgroup_mba_mbps_event_write(struct kernfs_open_file *of,</div><div class='add'>+				      char *buf, size_t nbytes, loff_t off);</div><div class='add'>+</div><div class='add'>+int rdtgroup_mba_mbps_event_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+bool rdtgroup_cbm_overlaps(struct resctrl_schema *s, struct rdt_ctrl_domain *d,</div><div class='add'>+			   unsigned long cbm, int closid, bool exclusive);</div><div class='add'>+</div><div class='add'>+unsigned int rdtgroup_cbm_to_size(struct rdt_resource *r, struct rdt_ctrl_domain *d,</div><div class='add'>+				  unsigned long cbm);</div><div class='add'>+</div><div class='add'>+enum rdtgrp_mode rdtgroup_mode_by_closid(int closid);</div><div class='add'>+</div><div class='add'>+int rdtgroup_tasks_assigned(struct rdtgroup *r);</div><div class='add'>+</div><div class='add'>+int closids_supported(void);</div><div class='add'>+</div><div class='add'>+void closid_free(int closid);</div><div class='add'>+</div><div class='add'>+int alloc_rmid(u32 closid);</div><div class='add'>+</div><div class='add'>+void free_rmid(u32 closid, u32 rmid);</div><div class='add'>+</div><div class='add'>+void resctrl_mon_resource_exit(void);</div><div class='add'>+</div><div class='add'>+void mon_event_count(void *info);</div><div class='add'>+</div><div class='add'>+int rdtgroup_mondata_show(struct seq_file *m, void *arg);</div><div class='add'>+</div><div class='add'>+void mon_event_read(struct rmid_read *rr, struct rdt_resource *r,</div><div class='add'>+		    struct rdt_mon_domain *d, struct rdtgroup *rdtgrp,</div><div class='add'>+		    cpumask_t *cpumask, int evtid, int first);</div><div class='add'>+</div><div class='add'>+int resctrl_mon_resource_init(void);</div><div class='add'>+</div><div class='add'>+void mbm_setup_overflow_handler(struct rdt_mon_domain *dom,</div><div class='add'>+				unsigned long delay_ms,</div><div class='add'>+				int exclude_cpu);</div><div class='add'>+</div><div class='add'>+void mbm_handle_overflow(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+bool is_mba_sc(struct rdt_resource *r);</div><div class='add'>+</div><div class='add'>+void cqm_setup_limbo_handler(struct rdt_mon_domain *dom, unsigned long delay_ms,</div><div class='add'>+			     int exclude_cpu);</div><div class='add'>+</div><div class='add'>+void cqm_handle_limbo(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+bool has_busy_rmid(struct rdt_mon_domain *d);</div><div class='add'>+</div><div class='add'>+void __check_limbo(struct rdt_mon_domain *d, bool force_free);</div><div class='add'>+</div><div class='add'>+void resctrl_file_fflags_init(const char *config, unsigned long fflags);</div><div class='add'>+</div><div class='add'>+void rdt_staged_configs_clear(void);</div><div class='add'>+</div><div class='add'>+bool closid_allocated(unsigned int closid);</div><div class='add'>+</div><div class='add'>+bool closid_alloc_fixed(u32 closid);</div><div class='add'>+</div><div class='add'>+int resctrl_find_cleanest_closid(void);</div><div class='add'>+</div><div class='add'>+void *rdt_kn_parent_priv(struct kernfs_node *kn);</div><div class='add'>+</div><div class='add'>+int resctrl_mbm_assign_mode_show(struct kernfs_open_file *of, struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_mbm_assign_mode_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				      size_t nbytes, loff_t off);</div><div class='add'>+</div><div class='add'>+void resctrl_bmec_files_show(struct rdt_resource *r, struct kernfs_node *l3_mon_kn,</div><div class='add'>+			     bool show);</div><div class='add'>+</div><div class='add'>+int resctrl_num_mbm_cntrs_show(struct kernfs_open_file *of, struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+int resctrl_available_mbm_cntrs_show(struct kernfs_open_file *of, struct seq_file *s,</div><div class='add'>+				     void *v);</div><div class='add'>+</div><div class='add'>+void rdtgroup_assign_cntrs(struct rdtgroup *rdtgrp);</div><div class='add'>+</div><div class='add'>+void rdtgroup_unassign_cntrs(struct rdtgroup *rdtgrp);</div><div class='add'>+</div><div class='add'>+int event_filter_show(struct kernfs_open_file *of, struct seq_file *seq, void *v);</div><div class='add'>+</div><div class='add'>+ssize_t event_filter_write(struct kernfs_open_file *of, char *buf, size_t nbytes,</div><div class='add'>+			   loff_t off);</div><div class='add'>+</div><div class='add'>+int resctrl_mbm_assign_on_mkdir_show(struct kernfs_open_file *of,</div><div class='add'>+				     struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_mbm_assign_on_mkdir_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+					  size_t nbytes, loff_t off);</div><div class='add'>+</div><div class='add'>+int mbm_L3_assignments_show(struct kernfs_open_file *of, struct seq_file *s, void *v);</div><div class='add'>+</div><div class='add'>+ssize_t mbm_L3_assignments_write(struct kernfs_open_file *of, char *buf, size_t nbytes,</div><div class='add'>+				 loff_t off);</div><div class='add'>+int resctrl_io_alloc_show(struct kernfs_open_file *of, struct seq_file *seq, void *v);</div><div class='add'>+</div><div class='add'>+int rdtgroup_init_cat(struct resctrl_schema *s, u32 closid);</div><div class='add'>+</div><div class='add'>+enum resctrl_conf_type resctrl_peer_type(enum resctrl_conf_type my_type);</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_io_alloc_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+			       size_t nbytes, loff_t off);</div><div class='add'>+</div><div class='add'>+const char *rdtgroup_name_by_closid(u32 closid);</div><div class='add'>+int resctrl_io_alloc_cbm_show(struct kernfs_open_file *of, struct seq_file *seq,</div><div class='add'>+			      void *v);</div><div class='add'>+ssize_t resctrl_io_alloc_cbm_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				   size_t nbytes, loff_t off);</div><div class='add'>+u32 resctrl_io_alloc_closid(struct rdt_resource *r);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RESCTRL_FS_PSEUDO_LOCK</div><div class='add'>+int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp);</div><div class='add'>+</div><div class='add'>+int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp);</div><div class='add'>+</div><div class='add'>+bool rdtgroup_cbm_overlaps_pseudo_locked(struct rdt_ctrl_domain *d, unsigned long cbm);</div><div class='add'>+</div><div class='add'>+bool rdtgroup_pseudo_locked_in_hierarchy(struct rdt_ctrl_domain *d);</div><div class='add'>+</div><div class='add'>+int rdt_pseudo_lock_init(void);</div><div class='add'>+</div><div class='add'>+void rdt_pseudo_lock_release(void);</div><div class='add'>+</div><div class='add'>+int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp);</div><div class='add'>+</div><div class='add'>+void rdtgroup_pseudo_lock_remove(struct rdtgroup *rdtgrp);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool rdtgroup_cbm_overlaps_pseudo_locked(struct rdt_ctrl_domain *d, unsigned long cbm)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool rdtgroup_pseudo_locked_in_hierarchy(struct rdt_ctrl_domain *d)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rdt_pseudo_lock_init(void) { return 0; }</div><div class='add'>+static inline void rdt_pseudo_lock_release(void) { }</div><div class='add'>+static inline int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rdtgroup_pseudo_lock_remove(struct rdtgroup *rdtgrp) { }</div><div class='add'>+#endif /* CONFIG_RESCTRL_FS_PSEUDO_LOCK */</div><div class='add'>+</div><div class='add'>+#endif /* _FS_RESCTRL_INTERNAL_H */</div><div class='head'>diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c<br/>new file mode 100644<br/>index 000000000000..572a9925bd6c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/monitor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/monitor.c</a></div><div class='hunk'>@@ -0,0 +1,1811 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Resource Director Technology(RDT)</div><div class='add'>+ * - Monitoring code</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author:</div><div class='add'>+ *    Vikas Shivappa &lt;vikas.shivappa@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This replaces the cqm.c based on perf but we reuse a lot of</div><div class='add'>+ * code and datastructures originally from Peter Zijlstra and Matt Fleming.</div><div class='add'>+ *</div><div class='add'>+ * More information about RDT be found in the Intel (R) x86 Architecture</div><div class='add'>+ * Software Developer Manual June 2016, volume 3, section 17.17.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	"resctrl: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/resctrl.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+</div><div class='add'>+#include "monitor_trace.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rmid_entry - dirty tracking for all RMID.</div><div class='add'>+ * @closid:	The CLOSID for this entry.</div><div class='add'>+ * @rmid:	The RMID for this entry.</div><div class='add'>+ * @busy:	The number of domains with cached data using this RMID.</div><div class='add'>+ * @list:	Member of the rmid_free_lru list when busy == 0.</div><div class='add'>+ *</div><div class='add'>+ * Depending on the architecture the correct monitor is accessed using</div><div class='add'>+ * both @closid and @rmid, or @rmid only.</div><div class='add'>+ *</div><div class='add'>+ * Take the rdtgroup_mutex when accessing.</div><div class='add'>+ */</div><div class='add'>+struct rmid_entry {</div><div class='add'>+	u32				closid;</div><div class='add'>+	u32				rmid;</div><div class='add'>+	int				busy;</div><div class='add'>+	struct list_head		list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @rmid_free_lru - A least recently used list of free RMIDs</div><div class='add'>+ *     These RMIDs are guaranteed to have an occupancy less than the</div><div class='add'>+ *     threshold occupancy</div><div class='add'>+ */</div><div class='add'>+static LIST_HEAD(rmid_free_lru);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @closid_num_dirty_rmid    The number of dirty RMID each CLOSID has.</div><div class='add'>+ *     Only allocated when CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID is defined.</div><div class='add'>+ *     Indexed by CLOSID. Protected by rdtgroup_mutex.</div><div class='add'>+ */</div><div class='add'>+static u32 *closid_num_dirty_rmid;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @rmid_limbo_count - count of currently unused but (potentially)</div><div class='add'>+ *     dirty RMIDs.</div><div class='add'>+ *     This counts RMIDs that no one is currently using but that</div><div class='add'>+ *     may have a occupancy value &gt; resctrl_rmid_realloc_threshold. User can</div><div class='add'>+ *     change the threshold occupancy value.</div><div class='add'>+ */</div><div class='add'>+static unsigned int rmid_limbo_count;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @rmid_entry - The entry in the limbo and free lists.</div><div class='add'>+ */</div><div class='add'>+static struct rmid_entry	*rmid_ptrs;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the threshold cache occupancy in bytes at which we will consider an</div><div class='add'>+ * RMID available for re-allocation.</div><div class='add'>+ */</div><div class='add'>+unsigned int resctrl_rmid_realloc_threshold;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the maximum value for the reallocation threshold, in bytes.</div><div class='add'>+ */</div><div class='add'>+unsigned int resctrl_rmid_realloc_limit;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * x86 and arm64 differ in their handling of monitoring.</div><div class='add'>+ * x86's RMID are independent numbers, there is only one source of traffic</div><div class='add'>+ * with an RMID value of '1'.</div><div class='add'>+ * arm64's PMG extends the PARTID/CLOSID space, there are multiple sources of</div><div class='add'>+ * traffic with a PMG value of '1', one for each CLOSID, meaning the RMID</div><div class='add'>+ * value is no longer unique.</div><div class='add'>+ * To account for this, resctrl uses an index. On x86 this is just the RMID,</div><div class='add'>+ * on arm64 it encodes the CLOSID and RMID. This gives a unique number.</div><div class='add'>+ *</div><div class='add'>+ * The domain's rmid_busy_llc and rmid_ptrs[] are sized by index. The arch code</div><div class='add'>+ * must accept an attempt to read every index.</div><div class='add'>+ */</div><div class='add'>+static inline struct rmid_entry *__rmid_entry(u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct rmid_entry *entry;</div><div class='add'>+	u32 closid, rmid;</div><div class='add'>+</div><div class='add'>+	entry = &amp;rmid_ptrs[idx];</div><div class='add'>+	resctrl_arch_rmid_idx_decode(idx, &amp;closid, &amp;rmid);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(entry-&gt;closid != closid);</div><div class='add'>+	WARN_ON_ONCE(entry-&gt;rmid != rmid);</div><div class='add'>+</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void limbo_release_entry(struct rmid_entry *entry)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rmid_limbo_count--;</div><div class='add'>+	list_add_tail(&amp;entry-&gt;list, &amp;rmid_free_lru);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID))</div><div class='add'>+		closid_num_dirty_rmid[entry-&gt;closid]--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the RMIDs that are marked as busy for this domain. If the</div><div class='add'>+ * reported LLC occupancy is below the threshold clear the busy bit and</div><div class='add'>+ * decrement the count. If the busy count gets to zero on an RMID, we</div><div class='add'>+ * free the RMID</div><div class='add'>+ */</div><div class='add'>+void __check_limbo(struct rdt_mon_domain *d, bool force_free)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+	u32 idx_limit = resctrl_arch_system_num_rmid_idx();</div><div class='add'>+	struct rmid_entry *entry;</div><div class='add'>+	u32 idx, cur_idx = 1;</div><div class='add'>+	void *arch_mon_ctx;</div><div class='add'>+	bool rmid_dirty;</div><div class='add'>+	u64 val = 0;</div><div class='add'>+</div><div class='add'>+	arch_mon_ctx = resctrl_arch_mon_ctx_alloc(r, QOS_L3_OCCUP_EVENT_ID);</div><div class='add'>+	if (IS_ERR(arch_mon_ctx)) {</div><div class='add'>+		pr_warn_ratelimited("Failed to allocate monitor context: %ld",</div><div class='add'>+				    PTR_ERR(arch_mon_ctx));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Skip RMID 0 and start from RMID 1 and check all the RMIDs that</div><div class='add'>+	 * are marked as busy for occupancy &lt; threshold. If the occupancy</div><div class='add'>+	 * is less than the threshold decrement the busy counter of the</div><div class='add'>+	 * RMID and move it to the free list when the counter reaches 0.</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		idx = find_next_bit(d-&gt;rmid_busy_llc, idx_limit, cur_idx);</div><div class='add'>+		if (idx &gt;= idx_limit)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		entry = __rmid_entry(idx);</div><div class='add'>+		if (resctrl_arch_rmid_read(r, d, entry-&gt;closid, entry-&gt;rmid,</div><div class='add'>+					   QOS_L3_OCCUP_EVENT_ID, &amp;val,</div><div class='add'>+					   arch_mon_ctx)) {</div><div class='add'>+			rmid_dirty = true;</div><div class='add'>+		} else {</div><div class='add'>+			rmid_dirty = (val &gt;= resctrl_rmid_realloc_threshold);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * x86's CLOSID and RMID are independent numbers, so the entry's</div><div class='add'>+			 * CLOSID is an empty CLOSID (X86_RESCTRL_EMPTY_CLOSID). On Arm the</div><div class='add'>+			 * RMID (PMG) extends the CLOSID (PARTID) space with bits that aren't</div><div class='add'>+			 * used to select the configuration. It is thus necessary to track both</div><div class='add'>+			 * CLOSID and RMID because there may be dependencies between them</div><div class='add'>+			 * on some architectures.</div><div class='add'>+			 */</div><div class='add'>+			trace_mon_llc_occupancy_limbo(entry-&gt;closid, entry-&gt;rmid, d-&gt;hdr.id, val);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (force_free || !rmid_dirty) {</div><div class='add'>+			clear_bit(idx, d-&gt;rmid_busy_llc);</div><div class='add'>+			if (!--entry-&gt;busy)</div><div class='add'>+				limbo_release_entry(entry);</div><div class='add'>+		}</div><div class='add'>+		cur_idx = idx + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resctrl_arch_mon_ctx_free(r, QOS_L3_OCCUP_EVENT_ID, arch_mon_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool has_busy_rmid(struct rdt_mon_domain *d)</div><div class='add'>+{</div><div class='add'>+	u32 idx_limit = resctrl_arch_system_num_rmid_idx();</div><div class='add'>+</div><div class='add'>+	return find_first_bit(d-&gt;rmid_busy_llc, idx_limit) != idx_limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rmid_entry *resctrl_find_free_rmid(u32 closid)</div><div class='add'>+{</div><div class='add'>+	struct rmid_entry *itr;</div><div class='add'>+	u32 itr_idx, cmp_idx;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;rmid_free_lru))</div><div class='add'>+		return rmid_limbo_count ? ERR_PTR(-EBUSY) : ERR_PTR(-ENOSPC);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(itr, &amp;rmid_free_lru, list) {</div><div class='add'>+		/*</div><div class='add'>+		 * Get the index of this free RMID, and the index it would need</div><div class='add'>+		 * to be if it were used with this CLOSID.</div><div class='add'>+		 * If the CLOSID is irrelevant on this architecture, the two</div><div class='add'>+		 * index values are always the same on every entry and thus the</div><div class='add'>+		 * very first entry will be returned.</div><div class='add'>+		 */</div><div class='add'>+		itr_idx = resctrl_arch_rmid_idx_encode(itr-&gt;closid, itr-&gt;rmid);</div><div class='add'>+		cmp_idx = resctrl_arch_rmid_idx_encode(closid, itr-&gt;rmid);</div><div class='add'>+</div><div class='add'>+		if (itr_idx == cmp_idx)</div><div class='add'>+			return itr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENOSPC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_find_cleanest_closid() - Find a CLOSID where all the associated</div><div class='add'>+ *                                  RMID are clean, or the CLOSID that has</div><div class='add'>+ *                                  the most clean RMID.</div><div class='add'>+ *</div><div class='add'>+ * MPAM's equivalent of RMID are per-CLOSID, meaning a freshly allocated CLOSID</div><div class='add'>+ * may not be able to allocate clean RMID. To avoid this the allocator will</div><div class='add'>+ * choose the CLOSID with the most clean RMID.</div><div class='add'>+ *</div><div class='add'>+ * When the CLOSID and RMID are independent numbers, the first free CLOSID will</div><div class='add'>+ * be returned.</div><div class='add'>+ */</div><div class='add'>+int resctrl_find_cleanest_closid(void)</div><div class='add'>+{</div><div class='add'>+	u32 cleanest_closid = ~0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; closids_supported(); i++) {</div><div class='add'>+		int num_dirty;</div><div class='add'>+</div><div class='add'>+		if (closid_allocated(i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		num_dirty = closid_num_dirty_rmid[i];</div><div class='add'>+		if (num_dirty == 0)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+		if (cleanest_closid == ~0)</div><div class='add'>+			cleanest_closid = i;</div><div class='add'>+</div><div class='add'>+		if (num_dirty &lt; closid_num_dirty_rmid[cleanest_closid])</div><div class='add'>+			cleanest_closid = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cleanest_closid == ~0)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	return cleanest_closid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For MPAM the RMID value is not unique, and has to be considered with</div><div class='add'>+ * the CLOSID. The (CLOSID, RMID) pair is allocated on all domains, which</div><div class='add'>+ * allows all domains to be managed by a single free list.</div><div class='add'>+ * Each domain also has a rmid_busy_llc to reduce the work of the limbo handler.</div><div class='add'>+ */</div><div class='add'>+int alloc_rmid(u32 closid)</div><div class='add'>+{</div><div class='add'>+	struct rmid_entry *entry;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	entry = resctrl_find_free_rmid(closid);</div><div class='add'>+	if (IS_ERR(entry))</div><div class='add'>+		return PTR_ERR(entry);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+	return entry-&gt;rmid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_rmid_to_limbo(struct rmid_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	/* Walking r-&gt;domains, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	idx = resctrl_arch_rmid_idx_encode(entry-&gt;closid, entry-&gt;rmid);</div><div class='add'>+</div><div class='add'>+	entry-&gt;busy = 0;</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		/*</div><div class='add'>+		 * For the first limbo RMID in the domain,</div><div class='add'>+		 * setup up the limbo worker.</div><div class='add'>+		 */</div><div class='add'>+		if (!has_busy_rmid(d))</div><div class='add'>+			cqm_setup_limbo_handler(d, CQM_LIMBOCHECK_INTERVAL,</div><div class='add'>+						RESCTRL_PICK_ANY_CPU);</div><div class='add'>+		set_bit(idx, d-&gt;rmid_busy_llc);</div><div class='add'>+		entry-&gt;busy++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmid_limbo_count++;</div><div class='add'>+	if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID))</div><div class='add'>+		closid_num_dirty_rmid[entry-&gt;closid]++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_rmid(u32 closid, u32 rmid)</div><div class='add'>+{</div><div class='add'>+	u32 idx = resctrl_arch_rmid_idx_encode(closid, rmid);</div><div class='add'>+	struct rmid_entry *entry;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do not allow the default rmid to be free'd. Comparing by index</div><div class='add'>+	 * allows architectures that ignore the closid parameter to avoid an</div><div class='add'>+	 * unnecessary check.</div><div class='add'>+	 */</div><div class='add'>+	if (!resctrl_arch_mon_capable() ||</div><div class='add'>+	    idx == resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,</div><div class='add'>+						RESCTRL_RESERVED_RMID))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	entry = __rmid_entry(idx);</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_OCCUP_EVENT_ID))</div><div class='add'>+		add_rmid_to_limbo(entry);</div><div class='add'>+	else</div><div class='add'>+		list_add_tail(&amp;entry-&gt;list, &amp;rmid_free_lru);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mbm_state *get_mbm_state(struct rdt_mon_domain *d, u32 closid,</div><div class='add'>+				       u32 rmid, enum resctrl_event_id evtid)</div><div class='add'>+{</div><div class='add'>+	u32 idx = resctrl_arch_rmid_idx_encode(closid, rmid);</div><div class='add'>+	struct mbm_state *state;</div><div class='add'>+</div><div class='add'>+	if (!resctrl_is_mbm_event(evtid))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	state = d-&gt;mbm_states[MBM_STATE_IDX(evtid)];</div><div class='add'>+</div><div class='add'>+	return state ? &amp;state[idx] : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mbm_cntr_get() - Return the counter ID for the matching @evtid and @rdtgrp.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * Valid counter ID on success, or -ENOENT on failure.</div><div class='add'>+ */</div><div class='add'>+static int mbm_cntr_get(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+			struct rdtgroup *rdtgrp, enum resctrl_event_id evtid)</div><div class='add'>+{</div><div class='add'>+	int cntr_id;</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;mon.mbm_cntr_assignable)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!resctrl_is_mbm_event(evtid))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	for (cntr_id = 0; cntr_id &lt; r-&gt;mon.num_mbm_cntrs; cntr_id++) {</div><div class='add'>+		if (d-&gt;cntr_cfg[cntr_id].rdtgrp == rdtgrp &amp;&amp;</div><div class='add'>+		    d-&gt;cntr_cfg[cntr_id].evtid == evtid)</div><div class='add'>+			return cntr_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mbm_cntr_alloc() - Initialize and return a new counter ID in the domain @d.</div><div class='add'>+ * Caller must ensure that the specified event is not assigned already.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * Valid counter ID on success, or -ENOSPC on failure.</div><div class='add'>+ */</div><div class='add'>+static int mbm_cntr_alloc(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+			  struct rdtgroup *rdtgrp, enum resctrl_event_id evtid)</div><div class='add'>+{</div><div class='add'>+	int cntr_id;</div><div class='add'>+</div><div class='add'>+	for (cntr_id = 0; cntr_id &lt; r-&gt;mon.num_mbm_cntrs; cntr_id++) {</div><div class='add'>+		if (!d-&gt;cntr_cfg[cntr_id].rdtgrp) {</div><div class='add'>+			d-&gt;cntr_cfg[cntr_id].rdtgrp = rdtgrp;</div><div class='add'>+			d-&gt;cntr_cfg[cntr_id].evtid = evtid;</div><div class='add'>+			return cntr_id;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mbm_cntr_free() - Clear the counter ID configuration details in the domain @d.</div><div class='add'>+ */</div><div class='add'>+static void mbm_cntr_free(struct rdt_mon_domain *d, int cntr_id)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;d-&gt;cntr_cfg[cntr_id], 0, sizeof(*d-&gt;cntr_cfg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mon_event_count(struct rdtgroup *rdtgrp, struct rmid_read *rr)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	u32 closid = rdtgrp-&gt;closid;</div><div class='add'>+	u32 rmid = rdtgrp-&gt;mon.rmid;</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	int cntr_id = -ENOENT;</div><div class='add'>+	struct mbm_state *m;</div><div class='add'>+	int err, ret;</div><div class='add'>+	u64 tval = 0;</div><div class='add'>+</div><div class='add'>+	if (rr-&gt;is_mbm_cntr) {</div><div class='add'>+		cntr_id = mbm_cntr_get(rr-&gt;r, rr-&gt;d, rdtgrp, rr-&gt;evtid);</div><div class='add'>+		if (cntr_id &lt; 0) {</div><div class='add'>+			rr-&gt;err = -ENOENT;</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rr-&gt;first) {</div><div class='add'>+		if (rr-&gt;is_mbm_cntr)</div><div class='add'>+			resctrl_arch_reset_cntr(rr-&gt;r, rr-&gt;d, closid, rmid, cntr_id, rr-&gt;evtid);</div><div class='add'>+		else</div><div class='add'>+			resctrl_arch_reset_rmid(rr-&gt;r, rr-&gt;d, closid, rmid, rr-&gt;evtid);</div><div class='add'>+		m = get_mbm_state(rr-&gt;d, closid, rmid, rr-&gt;evtid);</div><div class='add'>+		if (m)</div><div class='add'>+			memset(m, 0, sizeof(struct mbm_state));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rr-&gt;d) {</div><div class='add'>+		/* Reading a single domain, must be on a CPU in that domain. */</div><div class='add'>+		if (!cpumask_test_cpu(cpu, &amp;rr-&gt;d-&gt;hdr.cpu_mask))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (rr-&gt;is_mbm_cntr)</div><div class='add'>+			rr-&gt;err = resctrl_arch_cntr_read(rr-&gt;r, rr-&gt;d, closid, rmid, cntr_id,</div><div class='add'>+							 rr-&gt;evtid, &amp;tval);</div><div class='add'>+		else</div><div class='add'>+			rr-&gt;err = resctrl_arch_rmid_read(rr-&gt;r, rr-&gt;d, closid, rmid,</div><div class='add'>+							 rr-&gt;evtid, &amp;tval, rr-&gt;arch_mon_ctx);</div><div class='add'>+		if (rr-&gt;err)</div><div class='add'>+			return rr-&gt;err;</div><div class='add'>+</div><div class='add'>+		rr-&gt;val += tval;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Summing domains that share a cache, must be on a CPU for that cache. */</div><div class='add'>+	if (!cpumask_test_cpu(cpu, &amp;rr-&gt;ci-&gt;shared_cpu_map))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Legacy files must report the sum of an event across all</div><div class='add'>+	 * domains that share the same L3 cache instance.</div><div class='add'>+	 * Report success if a read from any domain succeeds, -EINVAL</div><div class='add'>+	 * (translated to "Unavailable" for user space) if reading from</div><div class='add'>+	 * all domains fail for any reason.</div><div class='add'>+	 */</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	list_for_each_entry(d, &amp;rr-&gt;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		if (d-&gt;ci_id != rr-&gt;ci-&gt;id)</div><div class='add'>+			continue;</div><div class='add'>+		if (rr-&gt;is_mbm_cntr)</div><div class='add'>+			err = resctrl_arch_cntr_read(rr-&gt;r, d, closid, rmid, cntr_id,</div><div class='add'>+						     rr-&gt;evtid, &amp;tval);</div><div class='add'>+		else</div><div class='add'>+			err = resctrl_arch_rmid_read(rr-&gt;r, d, closid, rmid,</div><div class='add'>+						     rr-&gt;evtid, &amp;tval, rr-&gt;arch_mon_ctx);</div><div class='add'>+		if (!err) {</div><div class='add'>+			rr-&gt;val += tval;</div><div class='add'>+			ret = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		rr-&gt;err = ret;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mbm_bw_count() - Update bw count from values previously read by</div><div class='add'>+ *		    __mon_event_count().</div><div class='add'>+ * @rdtgrp:	resctrl group associated with the CLOSID and RMID to identify</div><div class='add'>+ *		the cached mbm_state.</div><div class='add'>+ * @rr:		The struct rmid_read populated by __mon_event_count().</div><div class='add'>+ *</div><div class='add'>+ * Supporting function to calculate the memory bandwidth</div><div class='add'>+ * and delta bandwidth in MBps. The chunks value previously read by</div><div class='add'>+ * __mon_event_count() is compared with the chunks value from the previous</div><div class='add'>+ * invocation. This must be called once per second to maintain values in MBps.</div><div class='add'>+ */</div><div class='add'>+static void mbm_bw_count(struct rdtgroup *rdtgrp, struct rmid_read *rr)</div><div class='add'>+{</div><div class='add'>+	u64 cur_bw, bytes, cur_bytes;</div><div class='add'>+	u32 closid = rdtgrp-&gt;closid;</div><div class='add'>+	u32 rmid = rdtgrp-&gt;mon.rmid;</div><div class='add'>+	struct mbm_state *m;</div><div class='add'>+</div><div class='add'>+	m = get_mbm_state(rr-&gt;d, closid, rmid, rr-&gt;evtid);</div><div class='add'>+	if (WARN_ON_ONCE(!m))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cur_bytes = rr-&gt;val;</div><div class='add'>+	bytes = cur_bytes - m-&gt;prev_bw_bytes;</div><div class='add'>+	m-&gt;prev_bw_bytes = cur_bytes;</div><div class='add'>+</div><div class='add'>+	cur_bw = bytes / SZ_1M;</div><div class='add'>+</div><div class='add'>+	m-&gt;prev_bw = cur_bw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is scheduled by mon_event_read() to read the CQM/MBM counters</div><div class='add'>+ * on a domain.</div><div class='add'>+ */</div><div class='add'>+void mon_event_count(void *info)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp, *entry;</div><div class='add'>+	struct rmid_read *rr = info;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rr-&gt;rgrp;</div><div class='add'>+</div><div class='add'>+	ret = __mon_event_count(rdtgrp, rr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For Ctrl groups read data from child monitor groups and</div><div class='add'>+	 * add them together. Count events which are read successfully.</div><div class='add'>+	 * Discard the rmid_read's reporting errors.</div><div class='add'>+	 */</div><div class='add'>+	head = &amp;rdtgrp-&gt;mon.crdtgrp_list;</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;type == RDTCTRL_GROUP) {</div><div class='add'>+		list_for_each_entry(entry, head, mon.crdtgrp_list) {</div><div class='add'>+			if (__mon_event_count(entry, rr) == 0)</div><div class='add'>+				ret = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * __mon_event_count() calls for newly created monitor groups may</div><div class='add'>+	 * report -EINVAL/Unavailable if the monitor hasn't seen any traffic.</div><div class='add'>+	 * Discard error if any of the monitor event reads succeeded.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		rr-&gt;err = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rdt_ctrl_domain *get_ctrl_domain_from_cpu(int cpu,</div><div class='add'>+							struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	struct rdt_ctrl_domain *d;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+		/* Find the domain that contains this CPU */</div><div class='add'>+		if (cpumask_test_cpu(cpu, &amp;d-&gt;hdr.cpu_mask))</div><div class='add'>+			return d;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Feedback loop for MBA software controller (mba_sc)</div><div class='add'>+ *</div><div class='add'>+ * mba_sc is a feedback loop where we periodically read MBM counters and</div><div class='add'>+ * adjust the bandwidth percentage values via the IA32_MBA_THRTL_MSRs so</div><div class='add'>+ * that:</div><div class='add'>+ *</div><div class='add'>+ *   current bandwidth(cur_bw) &lt; user specified bandwidth(user_bw)</div><div class='add'>+ *</div><div class='add'>+ * This uses the MBM counters to measure the bandwidth and MBA throttle</div><div class='add'>+ * MSRs to control the bandwidth for a particular rdtgrp. It builds on the</div><div class='add'>+ * fact that resctrl rdtgroups have both monitoring and control.</div><div class='add'>+ *</div><div class='add'>+ * The frequency of the checks is 1s and we just tag along the MBM overflow</div><div class='add'>+ * timer. Having 1s interval makes the calculation of bandwidth simpler.</div><div class='add'>+ *</div><div class='add'>+ * Although MBA's goal is to restrict the bandwidth to a maximum, there may</div><div class='add'>+ * be a need to increase the bandwidth to avoid unnecessarily restricting</div><div class='add'>+ * the L2 &lt;-&gt; L3 traffic.</div><div class='add'>+ *</div><div class='add'>+ * Since MBA controls the L2 external bandwidth where as MBM measures the</div><div class='add'>+ * L3 external bandwidth the following sequence could lead to such a</div><div class='add'>+ * situation.</div><div class='add'>+ *</div><div class='add'>+ * Consider an rdtgroup which had high L3 &lt;-&gt; memory traffic in initial</div><div class='add'>+ * phases -&gt; mba_sc kicks in and reduced bandwidth percentage values -&gt; but</div><div class='add'>+ * after some time rdtgroup has mostly L2 &lt;-&gt; L3 traffic.</div><div class='add'>+ *</div><div class='add'>+ * In this case we may restrict the rdtgroup's L2 &lt;-&gt; L3 traffic as its</div><div class='add'>+ * throttle MSRs already have low percentage values.  To avoid</div><div class='add'>+ * unnecessarily restricting such rdtgroups, we also increase the bandwidth.</div><div class='add'>+ */</div><div class='add'>+static void update_mba_bw(struct rdtgroup *rgrp, struct rdt_mon_domain *dom_mbm)</div><div class='add'>+{</div><div class='add'>+	u32 closid, rmid, cur_msr_val, new_msr_val;</div><div class='add'>+	struct mbm_state *pmbm_data, *cmbm_data;</div><div class='add'>+	struct rdt_ctrl_domain *dom_mba;</div><div class='add'>+	enum resctrl_event_id evt_id;</div><div class='add'>+	struct rdt_resource *r_mba;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+	struct rdtgroup *entry;</div><div class='add'>+	u32 cur_bw, user_bw;</div><div class='add'>+</div><div class='add'>+	r_mba = resctrl_arch_get_resource(RDT_RESOURCE_MBA);</div><div class='add'>+	evt_id = rgrp-&gt;mba_mbps_event;</div><div class='add'>+</div><div class='add'>+	closid = rgrp-&gt;closid;</div><div class='add'>+	rmid = rgrp-&gt;mon.rmid;</div><div class='add'>+	pmbm_data = get_mbm_state(dom_mbm, closid, rmid, evt_id);</div><div class='add'>+	if (WARN_ON_ONCE(!pmbm_data))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dom_mba = get_ctrl_domain_from_cpu(smp_processor_id(), r_mba);</div><div class='add'>+	if (!dom_mba) {</div><div class='add'>+		pr_warn_once("Failure to get domain for MBA update\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cur_bw = pmbm_data-&gt;prev_bw;</div><div class='add'>+	user_bw = dom_mba-&gt;mbps_val[closid];</div><div class='add'>+</div><div class='add'>+	/* MBA resource doesn't support CDP */</div><div class='add'>+	cur_msr_val = resctrl_arch_get_config(r_mba, dom_mba, closid, CDP_NONE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For Ctrl groups read data from child monitor groups.</div><div class='add'>+	 */</div><div class='add'>+	head = &amp;rgrp-&gt;mon.crdtgrp_list;</div><div class='add'>+	list_for_each_entry(entry, head, mon.crdtgrp_list) {</div><div class='add'>+		cmbm_data = get_mbm_state(dom_mbm, entry-&gt;closid, entry-&gt;mon.rmid, evt_id);</div><div class='add'>+		if (WARN_ON_ONCE(!cmbm_data))</div><div class='add'>+			return;</div><div class='add'>+		cur_bw += cmbm_data-&gt;prev_bw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scale up/down the bandwidth linearly for the ctrl group.  The</div><div class='add'>+	 * bandwidth step is the bandwidth granularity specified by the</div><div class='add'>+	 * hardware.</div><div class='add'>+	 * Always increase throttling if current bandwidth is above the</div><div class='add'>+	 * target set by user.</div><div class='add'>+	 * But avoid thrashing up and down on every poll by checking</div><div class='add'>+	 * whether a decrease in throttling is likely to push the group</div><div class='add'>+	 * back over target. E.g. if currently throttling to 30% of bandwidth</div><div class='add'>+	 * on a system with 10% granularity steps, check whether moving to</div><div class='add'>+	 * 40% would go past the limit by multiplying current bandwidth by</div><div class='add'>+	 * "(30 + 10) / 30".</div><div class='add'>+	 */</div><div class='add'>+	if (cur_msr_val &gt; r_mba-&gt;membw.min_bw &amp;&amp; user_bw &lt; cur_bw) {</div><div class='add'>+		new_msr_val = cur_msr_val - r_mba-&gt;membw.bw_gran;</div><div class='add'>+	} else if (cur_msr_val &lt; MAX_MBA_BW &amp;&amp;</div><div class='add'>+		   (user_bw &gt; (cur_bw * (cur_msr_val + r_mba-&gt;membw.min_bw) / cur_msr_val))) {</div><div class='add'>+		new_msr_val = cur_msr_val + r_mba-&gt;membw.bw_gran;</div><div class='add'>+	} else {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resctrl_arch_update_one(r_mba, dom_mba, closid, CDP_NONE, new_msr_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mbm_update_one_event(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+				 struct rdtgroup *rdtgrp, enum resctrl_event_id evtid)</div><div class='add'>+{</div><div class='add'>+	struct rmid_read rr = {0};</div><div class='add'>+</div><div class='add'>+	rr.r = r;</div><div class='add'>+	rr.d = d;</div><div class='add'>+	rr.evtid = evtid;</div><div class='add'>+	if (resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rr.is_mbm_cntr = true;</div><div class='add'>+	} else {</div><div class='add'>+		rr.arch_mon_ctx = resctrl_arch_mon_ctx_alloc(rr.r, rr.evtid);</div><div class='add'>+		if (IS_ERR(rr.arch_mon_ctx)) {</div><div class='add'>+			pr_warn_ratelimited("Failed to allocate monitor context: %ld",</div><div class='add'>+					    PTR_ERR(rr.arch_mon_ctx));</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__mon_event_count(rdtgrp, &amp;rr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the software controller is enabled, compute the</div><div class='add'>+	 * bandwidth for this event id.</div><div class='add'>+	 */</div><div class='add'>+	if (is_mba_sc(NULL))</div><div class='add'>+		mbm_bw_count(rdtgrp, &amp;rr);</div><div class='add'>+</div><div class='add'>+	if (rr.arch_mon_ctx)</div><div class='add'>+		resctrl_arch_mon_ctx_free(rr.r, rr.evtid, rr.arch_mon_ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mbm_update(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+		       struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * This is protected from concurrent reads from user as both</div><div class='add'>+	 * the user and overflow handler hold the global mutex.</div><div class='add'>+	 */</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+		mbm_update_one_event(r, d, rdtgrp, QOS_L3_MBM_TOTAL_EVENT_ID);</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+		mbm_update_one_event(r, d, rdtgrp, QOS_L3_MBM_LOCAL_EVENT_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handler to scan the limbo list and move the RMIDs</div><div class='add'>+ * to free list whose occupancy &lt; threshold_occupancy.</div><div class='add'>+ */</div><div class='add'>+void cqm_handle_limbo(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	unsigned long delay = msecs_to_jiffies(CQM_LIMBOCHECK_INTERVAL);</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	d = container_of(work, struct rdt_mon_domain, cqm_limbo.work);</div><div class='add'>+</div><div class='add'>+	__check_limbo(d, false);</div><div class='add'>+</div><div class='add'>+	if (has_busy_rmid(d)) {</div><div class='add'>+		d-&gt;cqm_work_cpu = cpumask_any_housekeeping(&amp;d-&gt;hdr.cpu_mask,</div><div class='add'>+							   RESCTRL_PICK_ANY_CPU);</div><div class='add'>+		schedule_delayed_work_on(d-&gt;cqm_work_cpu, &amp;d-&gt;cqm_limbo,</div><div class='add'>+					 delay);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cqm_setup_limbo_handler() - Schedule the limbo handler to run for this</div><div class='add'>+ *                             domain.</div><div class='add'>+ * @dom:           The domain the limbo handler should run for.</div><div class='add'>+ * @delay_ms:      How far in the future the handler should run.</div><div class='add'>+ * @exclude_cpu:   Which CPU the handler should not run on,</div><div class='add'>+ *		   RESCTRL_PICK_ANY_CPU to pick any CPU.</div><div class='add'>+ */</div><div class='add'>+void cqm_setup_limbo_handler(struct rdt_mon_domain *dom, unsigned long delay_ms,</div><div class='add'>+			     int exclude_cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long delay = msecs_to_jiffies(delay_ms);</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	cpu = cpumask_any_housekeeping(&amp;dom-&gt;hdr.cpu_mask, exclude_cpu);</div><div class='add'>+	dom-&gt;cqm_work_cpu = cpu;</div><div class='add'>+</div><div class='add'>+	if (cpu &lt; nr_cpu_ids)</div><div class='add'>+		schedule_delayed_work_on(cpu, &amp;dom-&gt;cqm_limbo, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mbm_handle_overflow(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	unsigned long delay = msecs_to_jiffies(MBM_OVERFLOW_INTERVAL);</div><div class='add'>+	struct rdtgroup *prgrp, *crgrp;</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the filesystem has been unmounted this work no longer needs to</div><div class='add'>+	 * run.</div><div class='add'>+	 */</div><div class='add'>+	if (!resctrl_mounted || !resctrl_arch_mon_capable())</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+	d = container_of(work, struct rdt_mon_domain, mbm_over.work);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(prgrp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		mbm_update(r, d, prgrp);</div><div class='add'>+</div><div class='add'>+		head = &amp;prgrp-&gt;mon.crdtgrp_list;</div><div class='add'>+		list_for_each_entry(crgrp, head, mon.crdtgrp_list)</div><div class='add'>+			mbm_update(r, d, crgrp);</div><div class='add'>+</div><div class='add'>+		if (is_mba_sc(NULL))</div><div class='add'>+			update_mba_bw(prgrp, d);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Re-check for housekeeping CPUs. This allows the overflow handler to</div><div class='add'>+	 * move off a nohz_full CPU quickly.</div><div class='add'>+	 */</div><div class='add'>+	d-&gt;mbm_work_cpu = cpumask_any_housekeeping(&amp;d-&gt;hdr.cpu_mask,</div><div class='add'>+						   RESCTRL_PICK_ANY_CPU);</div><div class='add'>+	schedule_delayed_work_on(d-&gt;mbm_work_cpu, &amp;d-&gt;mbm_over, delay);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mbm_setup_overflow_handler() - Schedule the overflow handler to run for this</div><div class='add'>+ *                                domain.</div><div class='add'>+ * @dom:           The domain the overflow handler should run for.</div><div class='add'>+ * @delay_ms:      How far in the future the handler should run.</div><div class='add'>+ * @exclude_cpu:   Which CPU the handler should not run on,</div><div class='add'>+ *		   RESCTRL_PICK_ANY_CPU to pick any CPU.</div><div class='add'>+ */</div><div class='add'>+void mbm_setup_overflow_handler(struct rdt_mon_domain *dom, unsigned long delay_ms,</div><div class='add'>+				int exclude_cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long delay = msecs_to_jiffies(delay_ms);</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When a domain comes online there is no guarantee the filesystem is</div><div class='add'>+	 * mounted. If not, there is no need to catch counter overflow.</div><div class='add'>+	 */</div><div class='add'>+	if (!resctrl_mounted || !resctrl_arch_mon_capable())</div><div class='add'>+		return;</div><div class='add'>+	cpu = cpumask_any_housekeeping(&amp;dom-&gt;hdr.cpu_mask, exclude_cpu);</div><div class='add'>+	dom-&gt;mbm_work_cpu = cpu;</div><div class='add'>+</div><div class='add'>+	if (cpu &lt; nr_cpu_ids)</div><div class='add'>+		schedule_delayed_work_on(cpu, &amp;dom-&gt;mbm_over, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dom_data_init(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	u32 idx_limit = resctrl_arch_system_num_rmid_idx();</div><div class='add'>+	u32 num_closid = resctrl_arch_get_num_closid(r);</div><div class='add'>+	struct rmid_entry *entry = NULL;</div><div class='add'>+	int err = 0, i;</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {</div><div class='add'>+		u32 *tmp;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the architecture hasn't provided a sanitised value here,</div><div class='add'>+		 * this may result in larger arrays than necessary. Resctrl will</div><div class='add'>+		 * use a smaller system wide value based on the resources in</div><div class='add'>+		 * use.</div><div class='add'>+		 */</div><div class='add'>+		tmp = kcalloc(num_closid, sizeof(*tmp), GFP_KERNEL);</div><div class='add'>+		if (!tmp) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		closid_num_dirty_rmid = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmid_ptrs = kcalloc(idx_limit, sizeof(struct rmid_entry), GFP_KERNEL);</div><div class='add'>+	if (!rmid_ptrs) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {</div><div class='add'>+			kfree(closid_num_dirty_rmid);</div><div class='add'>+			closid_num_dirty_rmid = NULL;</div><div class='add'>+		}</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; idx_limit; i++) {</div><div class='add'>+		entry = &amp;rmid_ptrs[i];</div><div class='add'>+		INIT_LIST_HEAD(&amp;entry-&gt;list);</div><div class='add'>+</div><div class='add'>+		resctrl_arch_rmid_idx_decode(i, &amp;entry-&gt;closid, &amp;entry-&gt;rmid);</div><div class='add'>+		list_add_tail(&amp;entry-&gt;list, &amp;rmid_free_lru);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RESCTRL_RESERVED_CLOSID and RESCTRL_RESERVED_RMID are special and</div><div class='add'>+	 * are always allocated. These are used for the rdtgroup_default</div><div class='add'>+	 * control group, which will be setup later in resctrl_init().</div><div class='add'>+	 */</div><div class='add'>+	idx = resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,</div><div class='add'>+					   RESCTRL_RESERVED_RMID);</div><div class='add'>+	entry = __rmid_entry(idx);</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dom_data_exit(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;mon_capable)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {</div><div class='add'>+		kfree(closid_num_dirty_rmid);</div><div class='add'>+		closid_num_dirty_rmid = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(rmid_ptrs);</div><div class='add'>+	rmid_ptrs = NULL;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * All available events. Architecture code marks the ones that</div><div class='add'>+ * are supported by a system using resctrl_enable_mon_event()</div><div class='add'>+ * to set .enabled.</div><div class='add'>+ */</div><div class='add'>+struct mon_evt mon_event_all[QOS_NUM_EVENTS] = {</div><div class='add'>+	[QOS_L3_OCCUP_EVENT_ID] = {</div><div class='add'>+		.name	= "llc_occupancy",</div><div class='add'>+		.evtid	= QOS_L3_OCCUP_EVENT_ID,</div><div class='add'>+		.rid	= RDT_RESOURCE_L3,</div><div class='add'>+	},</div><div class='add'>+	[QOS_L3_MBM_TOTAL_EVENT_ID] = {</div><div class='add'>+		.name	= "mbm_total_bytes",</div><div class='add'>+		.evtid	= QOS_L3_MBM_TOTAL_EVENT_ID,</div><div class='add'>+		.rid	= RDT_RESOURCE_L3,</div><div class='add'>+	},</div><div class='add'>+	[QOS_L3_MBM_LOCAL_EVENT_ID] = {</div><div class='add'>+		.name	= "mbm_local_bytes",</div><div class='add'>+		.evtid	= QOS_L3_MBM_LOCAL_EVENT_ID,</div><div class='add'>+		.rid	= RDT_RESOURCE_L3,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void resctrl_enable_mon_event(enum resctrl_event_id eventid)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(eventid &lt; QOS_FIRST_EVENT || eventid &gt;= QOS_NUM_EVENTS))</div><div class='add'>+		return;</div><div class='add'>+	if (mon_event_all[eventid].enabled) {</div><div class='add'>+		pr_warn("Duplicate enable for event %d\n", eventid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mon_event_all[eventid].enabled = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool resctrl_is_mon_event_enabled(enum resctrl_event_id eventid)</div><div class='add'>+{</div><div class='add'>+	return eventid &gt;= QOS_FIRST_EVENT &amp;&amp; eventid &lt; QOS_NUM_EVENTS &amp;&amp;</div><div class='add'>+	       mon_event_all[eventid].enabled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 resctrl_get_mon_evt_cfg(enum resctrl_event_id evtid)</div><div class='add'>+{</div><div class='add'>+	return mon_event_all[evtid].evt_cfg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mbm_transaction - Memory transaction an MBM event can be configured with.</div><div class='add'>+ * @name:	Name of memory transaction (read, write ...).</div><div class='add'>+ * @val:	The bit (eg. READS_TO_LOCAL_MEM or READS_TO_REMOTE_MEM) used to</div><div class='add'>+ *		represent the memory transaction within an event's configuration.</div><div class='add'>+ */</div><div class='add'>+struct mbm_transaction {</div><div class='add'>+	char	name[32];</div><div class='add'>+	u32	val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Decoded values for each type of memory transaction. */</div><div class='add'>+static struct mbm_transaction mbm_transactions[NUM_MBM_TRANSACTIONS] = {</div><div class='add'>+	{"local_reads", READS_TO_LOCAL_MEM},</div><div class='add'>+	{"remote_reads", READS_TO_REMOTE_MEM},</div><div class='add'>+	{"local_non_temporal_writes", NON_TEMP_WRITE_TO_LOCAL_MEM},</div><div class='add'>+	{"remote_non_temporal_writes", NON_TEMP_WRITE_TO_REMOTE_MEM},</div><div class='add'>+	{"local_reads_slow_memory", READS_TO_LOCAL_S_MEM},</div><div class='add'>+	{"remote_reads_slow_memory", READS_TO_REMOTE_S_MEM},</div><div class='add'>+	{"dirty_victim_writes_all", DIRTY_VICTIMS_TO_ALL_MEM},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int event_filter_show(struct kernfs_open_file *of, struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct mon_evt *mevt = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	bool sep = false;</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	r = resctrl_arch_get_resource(mevt-&gt;rid);</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event counter assignment mode is not enabled\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_MBM_TRANSACTIONS; i++) {</div><div class='add'>+		if (mevt-&gt;evt_cfg &amp; mbm_transactions[i].val) {</div><div class='add'>+			if (sep)</div><div class='add'>+				seq_putc(seq, ',');</div><div class='add'>+			seq_printf(seq, "%s", mbm_transactions[i].name);</div><div class='add'>+			sep = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	seq_putc(seq, '\n');</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int resctrl_mbm_assign_on_mkdir_show(struct kernfs_open_file *of, struct seq_file *s,</div><div class='add'>+				     void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event counter assignment mode is not enabled\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%u\n", r-&gt;mon.mbm_assign_on_mkdir);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_mbm_assign_on_mkdir_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+					  size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	bool value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtobool(buf, &amp;value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event counter assignment mode is not enabled\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r-&gt;mon.mbm_assign_on_mkdir = value;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mbm_cntr_free_all() - Clear all the counter ID configuration details in the</div><div class='add'>+ *			 domain @d. Called when mbm_assign_mode is changed.</div><div class='add'>+ */</div><div class='add'>+static void mbm_cntr_free_all(struct rdt_resource *r, struct rdt_mon_domain *d)</div><div class='add'>+{</div><div class='add'>+	memset(d-&gt;cntr_cfg, 0, sizeof(*d-&gt;cntr_cfg) * r-&gt;mon.num_mbm_cntrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * resctrl_reset_rmid_all() - Reset all non-architecture states for all the</div><div class='add'>+ *			      supported RMIDs.</div><div class='add'>+ */</div><div class='add'>+static void resctrl_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain *d)</div><div class='add'>+{</div><div class='add'>+	u32 idx_limit = resctrl_arch_system_num_rmid_idx();</div><div class='add'>+	enum resctrl_event_id evt;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for_each_mbm_event_id(evt) {</div><div class='add'>+		if (!resctrl_is_mon_event_enabled(evt))</div><div class='add'>+			continue;</div><div class='add'>+		idx = MBM_STATE_IDX(evt);</div><div class='add'>+		memset(d-&gt;mbm_states[idx], 0, sizeof(*d-&gt;mbm_states[0]) * idx_limit);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_assign_cntr() - Assign/unassign the counter ID for the event, RMID</div><div class='add'>+ * pair in the domain.</div><div class='add'>+ *</div><div class='add'>+ * Assign the counter if @assign is true else unassign the counter. Reset the</div><div class='add'>+ * associated non-architectural state.</div><div class='add'>+ */</div><div class='add'>+static void rdtgroup_assign_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+				 enum resctrl_event_id evtid, u32 rmid, u32 closid,</div><div class='add'>+				 u32 cntr_id, bool assign)</div><div class='add'>+{</div><div class='add'>+	struct mbm_state *m;</div><div class='add'>+</div><div class='add'>+	resctrl_arch_config_cntr(r, d, evtid, rmid, closid, cntr_id, assign);</div><div class='add'>+</div><div class='add'>+	m = get_mbm_state(d, closid, rmid, evtid);</div><div class='add'>+	if (m)</div><div class='add'>+		memset(m, 0, sizeof(*m));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_alloc_assign_cntr() - Allocate a counter ID and assign it to the event</div><div class='add'>+ * pointed to by @mevt and the resctrl group @rdtgrp within the domain @d.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success, &lt; 0 on failure.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_alloc_assign_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+				      struct rdtgroup *rdtgrp, struct mon_evt *mevt)</div><div class='add'>+{</div><div class='add'>+	int cntr_id;</div><div class='add'>+</div><div class='add'>+	/* No action required if the counter is assigned already. */</div><div class='add'>+	cntr_id = mbm_cntr_get(r, d, rdtgrp, mevt-&gt;evtid);</div><div class='add'>+	if (cntr_id &gt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cntr_id = mbm_cntr_alloc(r, d, rdtgrp, mevt-&gt;evtid);</div><div class='add'>+	if (cntr_id &lt; 0) {</div><div class='add'>+		rdt_last_cmd_printf("Failed to allocate counter for %s in domain %d\n",</div><div class='add'>+				    mevt-&gt;name, d-&gt;hdr.id);</div><div class='add'>+		return cntr_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdtgroup_assign_cntr(r, d, mevt-&gt;evtid, rdtgrp-&gt;mon.rmid, rdtgrp-&gt;closid, cntr_id, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_assign_cntr_event() - Assign a hardware counter for the event in</div><div class='add'>+ * @mevt to the resctrl group @rdtgrp. Assign counters to all domains if @d is</div><div class='add'>+ * NULL; otherwise, assign the counter to the specified domain @d.</div><div class='add'>+ *</div><div class='add'>+ * If all counters in a domain are already in use, rdtgroup_alloc_assign_cntr()</div><div class='add'>+ * will fail. The assignment process will abort at the first failure encountered</div><div class='add'>+ * during domain traversal, which may result in the event being only partially</div><div class='add'>+ * assigned.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success, &lt; 0 on failure.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_assign_cntr_event(struct rdt_mon_domain *d, struct rdtgroup *rdtgrp,</div><div class='add'>+				      struct mon_evt *mevt)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(mevt-&gt;rid);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!d) {</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+			ret = rdtgroup_alloc_assign_cntr(r, d, rdtgrp, mevt);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = rdtgroup_alloc_assign_cntr(r, d, rdtgrp, mevt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_assign_cntrs() - Assign counters to MBM events. Called when</div><div class='add'>+ *			     a new group is created.</div><div class='add'>+ *</div><div class='add'>+ * Each group can accommodate two counters per domain: one for the total</div><div class='add'>+ * event and one for the local event. Assignments may fail due to the limited</div><div class='add'>+ * number of counters. However, it is not necessary to fail the group creation</div><div class='add'>+ * and thus no failure is returned. Users have the option to modify the</div><div class='add'>+ * counter assignments after the group has been created.</div><div class='add'>+ */</div><div class='add'>+void rdtgroup_assign_cntrs(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;mon_capable || !resctrl_arch_mbm_cntr_assign_enabled(r) ||</div><div class='add'>+	    !r-&gt;mon.mbm_assign_on_mkdir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+		rdtgroup_assign_cntr_event(NULL, rdtgrp,</div><div class='add'>+					   &amp;mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID]);</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+		rdtgroup_assign_cntr_event(NULL, rdtgrp,</div><div class='add'>+					   &amp;mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_free_unassign_cntr() - Unassign and reset the counter ID configuration</div><div class='add'>+ * for the event pointed to by @mevt within the domain @d and resctrl group @rdtgrp.</div><div class='add'>+ */</div><div class='add'>+static void rdtgroup_free_unassign_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+					struct rdtgroup *rdtgrp, struct mon_evt *mevt)</div><div class='add'>+{</div><div class='add'>+	int cntr_id;</div><div class='add'>+</div><div class='add'>+	cntr_id = mbm_cntr_get(r, d, rdtgrp, mevt-&gt;evtid);</div><div class='add'>+</div><div class='add'>+	/* If there is no cntr_id assigned, nothing to do */</div><div class='add'>+	if (cntr_id &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rdtgroup_assign_cntr(r, d, mevt-&gt;evtid, rdtgrp-&gt;mon.rmid, rdtgrp-&gt;closid, cntr_id, false);</div><div class='add'>+</div><div class='add'>+	mbm_cntr_free(d, cntr_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_unassign_cntr_event() - Unassign a hardware counter associated with</div><div class='add'>+ * the event structure @mevt from the domain @d and the group @rdtgrp. Unassign</div><div class='add'>+ * the counters from all the domains if @d is NULL else unassign from @d.</div><div class='add'>+ */</div><div class='add'>+static void rdtgroup_unassign_cntr_event(struct rdt_mon_domain *d, struct rdtgroup *rdtgrp,</div><div class='add'>+					 struct mon_evt *mevt)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(mevt-&gt;rid);</div><div class='add'>+</div><div class='add'>+	if (!d) {</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list)</div><div class='add'>+			rdtgroup_free_unassign_cntr(r, d, rdtgrp, mevt);</div><div class='add'>+	} else {</div><div class='add'>+		rdtgroup_free_unassign_cntr(r, d, rdtgrp, mevt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_unassign_cntrs() - Unassign the counters associated with MBM events.</div><div class='add'>+ *			       Called when a group is deleted.</div><div class='add'>+ */</div><div class='add'>+void rdtgroup_unassign_cntrs(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;mon_capable || !resctrl_arch_mbm_cntr_assign_enabled(r))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+		rdtgroup_unassign_cntr_event(NULL, rdtgrp,</div><div class='add'>+					     &amp;mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID]);</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+		rdtgroup_unassign_cntr_event(NULL, rdtgrp,</div><div class='add'>+					     &amp;mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resctrl_parse_mem_transactions(char *tok, u32 *val)</div><div class='add'>+{</div><div class='add'>+	u32 temp_val = 0;</div><div class='add'>+	char *evt_str;</div><div class='add'>+	bool found;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+next_config:</div><div class='add'>+	if (!tok || tok[0] == '\0') {</div><div class='add'>+		*val = temp_val;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start processing the strings for each memory transaction type */</div><div class='add'>+	evt_str = strim(strsep(&amp;tok, ","));</div><div class='add'>+	found = false;</div><div class='add'>+	for (i = 0; i &lt; NUM_MBM_TRANSACTIONS; i++) {</div><div class='add'>+		if (!strcmp(mbm_transactions[i].name, evt_str)) {</div><div class='add'>+			temp_val |= mbm_transactions[i].val;</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!found) {</div><div class='add'>+		rdt_last_cmd_printf("Invalid memory transaction type %s\n", evt_str);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto next_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_update_cntr_event - Update the counter assignments for the event</div><div class='add'>+ *				in a group.</div><div class='add'>+ * @r:		Resource to which update needs to be done.</div><div class='add'>+ * @rdtgrp:	Resctrl group.</div><div class='add'>+ * @evtid:	MBM monitor event.</div><div class='add'>+ */</div><div class='add'>+static void rdtgroup_update_cntr_event(struct rdt_resource *r, struct rdtgroup *rdtgrp,</div><div class='add'>+				       enum resctrl_event_id evtid)</div><div class='add'>+{</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	int cntr_id;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		cntr_id = mbm_cntr_get(r, d, rdtgrp, evtid);</div><div class='add'>+		if (cntr_id &gt;= 0)</div><div class='add'>+			rdtgroup_assign_cntr(r, d, evtid, rdtgrp-&gt;mon.rmid,</div><div class='add'>+					     rdtgrp-&gt;closid, cntr_id, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * resctrl_update_cntr_allrdtgrp - Update the counter assignments for the event</div><div class='add'>+ *				   for all the groups.</div><div class='add'>+ * @mevt	MBM Monitor event.</div><div class='add'>+ */</div><div class='add'>+static void resctrl_update_cntr_allrdtgrp(struct mon_evt *mevt)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(mevt-&gt;rid);</div><div class='add'>+	struct rdtgroup *prgrp, *crgrp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find all the groups where the event is assigned and update the</div><div class='add'>+	 * configuration of existing assignments.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(prgrp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		rdtgroup_update_cntr_event(r, prgrp, mevt-&gt;evtid);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(crgrp, &amp;prgrp-&gt;mon.crdtgrp_list, mon.crdtgrp_list)</div><div class='add'>+			rdtgroup_update_cntr_event(r, crgrp, mevt-&gt;evtid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t event_filter_write(struct kernfs_open_file *of, char *buf, size_t nbytes,</div><div class='add'>+			   loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct mon_evt *mevt = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	u32 evt_cfg = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	r = resctrl_arch_get_resource(mevt-&gt;rid);</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event counter assignment mode is not enabled\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = resctrl_parse_mem_transactions(buf, &amp;evt_cfg);</div><div class='add'>+	if (!ret &amp;&amp; mevt-&gt;evt_cfg != evt_cfg) {</div><div class='add'>+		mevt-&gt;evt_cfg = evt_cfg;</div><div class='add'>+		resctrl_update_cntr_allrdtgrp(mevt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int resctrl_mbm_assign_mode_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	bool enabled;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	enabled = resctrl_arch_mbm_cntr_assign_enabled(r);</div><div class='add'>+</div><div class='add'>+	if (r-&gt;mon.mbm_cntr_assignable) {</div><div class='add'>+		if (enabled)</div><div class='add'>+			seq_puts(s, "[mbm_event]\n");</div><div class='add'>+		else</div><div class='add'>+			seq_puts(s, "[default]\n");</div><div class='add'>+</div><div class='add'>+		if (!IS_ENABLED(CONFIG_RESCTRL_ASSIGN_FIXED)) {</div><div class='add'>+			if (enabled)</div><div class='add'>+				seq_puts(s, "default\n");</div><div class='add'>+			else</div><div class='add'>+				seq_puts(s, "mbm_event\n");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		seq_puts(s, "[default]\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t resctrl_mbm_assign_mode_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				      size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool enable;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!strcmp(buf, "default")) {</div><div class='add'>+		enable = 0;</div><div class='add'>+	} else if (!strcmp(buf, "mbm_event")) {</div><div class='add'>+		if (r-&gt;mon.mbm_cntr_assignable) {</div><div class='add'>+			enable = 1;</div><div class='add'>+		} else {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			rdt_last_cmd_puts("mbm_event mode is not supported\n");</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rdt_last_cmd_puts("Unsupported assign mode\n");</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable != resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		ret = resctrl_arch_mbm_cntr_assign_set(r, enable);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		/* Update the visibility of BMEC related files */</div><div class='add'>+		resctrl_bmec_files_show(r, NULL, !enable);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Initialize the default memory transaction values for</div><div class='add'>+		 * total and local events.</div><div class='add'>+		 */</div><div class='add'>+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+			mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID].evt_cfg = r-&gt;mon.mbm_cfg_mask;</div><div class='add'>+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+			mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID].evt_cfg = r-&gt;mon.mbm_cfg_mask &amp;</div><div class='add'>+									   (READS_TO_LOCAL_MEM |</div><div class='add'>+									    READS_TO_LOCAL_S_MEM |</div><div class='add'>+									    NON_TEMP_WRITE_TO_LOCAL_MEM);</div><div class='add'>+		/* Enable auto assignment when switching to "mbm_event" mode */</div><div class='add'>+		if (enable)</div><div class='add'>+			r-&gt;mon.mbm_assign_on_mkdir = true;</div><div class='add'>+		/*</div><div class='add'>+		 * Reset all the non-achitectural RMID state and assignable counters.</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+			mbm_cntr_free_all(r, d);</div><div class='add'>+			resctrl_reset_rmid_all(r, d);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int resctrl_num_mbm_cntrs_show(struct kernfs_open_file *of,</div><div class='add'>+			       struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_mon_domain *dom;</div><div class='add'>+	bool sep = false;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dom, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		if (sep)</div><div class='add'>+			seq_putc(s, ';');</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "%d=%d", dom-&gt;hdr.id, r-&gt;mon.num_mbm_cntrs);</div><div class='add'>+		sep = true;</div><div class='add'>+	}</div><div class='add'>+	seq_putc(s, '\n');</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int resctrl_available_mbm_cntrs_show(struct kernfs_open_file *of,</div><div class='add'>+				     struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_mon_domain *dom;</div><div class='add'>+	bool sep = false;</div><div class='add'>+	u32 cntrs, i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event counter assignment mode is not enabled\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dom, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		if (sep)</div><div class='add'>+			seq_putc(s, ';');</div><div class='add'>+</div><div class='add'>+		cntrs = 0;</div><div class='add'>+		for (i = 0; i &lt; r-&gt;mon.num_mbm_cntrs; i++) {</div><div class='add'>+			if (!dom-&gt;cntr_cfg[i].rdtgrp)</div><div class='add'>+				cntrs++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "%d=%u", dom-&gt;hdr.id, cntrs);</div><div class='add'>+		sep = true;</div><div class='add'>+	}</div><div class='add'>+	seq_putc(s, '\n');</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mbm_L3_assignments_show(struct kernfs_open_file *of, struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct mon_evt *mevt;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	bool sep;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event counter assignment mode is not enabled\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_mon_event(mevt) {</div><div class='add'>+		if (mevt-&gt;rid != r-&gt;rid || !mevt-&gt;enabled || !resctrl_is_mbm_event(mevt-&gt;evtid))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sep = false;</div><div class='add'>+		seq_printf(s, "%s:", mevt-&gt;name);</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+			if (sep)</div><div class='add'>+				seq_putc(s, ';');</div><div class='add'>+</div><div class='add'>+			if (mbm_cntr_get(r, d, rdtgrp, mevt-&gt;evtid) &lt; 0)</div><div class='add'>+				seq_printf(s, "%d=_", d-&gt;hdr.id);</div><div class='add'>+			else</div><div class='add'>+				seq_printf(s, "%d=e", d-&gt;hdr.id);</div><div class='add'>+</div><div class='add'>+			sep = true;</div><div class='add'>+		}</div><div class='add'>+		seq_putc(s, '\n');</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mbm_get_mon_event_by_name() - Return the mon_evt entry for the matching</div><div class='add'>+ * event name.</div><div class='add'>+ */</div><div class='add'>+static struct mon_evt *mbm_get_mon_event_by_name(struct rdt_resource *r, char *name)</div><div class='add'>+{</div><div class='add'>+	struct mon_evt *mevt;</div><div class='add'>+</div><div class='add'>+	for_each_mon_event(mevt) {</div><div class='add'>+		if (mevt-&gt;rid == r-&gt;rid &amp;&amp; mevt-&gt;enabled &amp;&amp;</div><div class='add'>+		    resctrl_is_mbm_event(mevt-&gt;evtid) &amp;&amp;</div><div class='add'>+		    !strcmp(mevt-&gt;name, name))</div><div class='add'>+			return mevt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_modify_assign_state(char *assign, struct rdt_mon_domain *d,</div><div class='add'>+					struct rdtgroup *rdtgrp, struct mon_evt *mevt)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!assign || strlen(assign) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (*assign) {</div><div class='add'>+	case 'e':</div><div class='add'>+		ret = rdtgroup_assign_cntr_event(d, rdtgrp, mevt);</div><div class='add'>+		break;</div><div class='add'>+	case '_':</div><div class='add'>+		rdtgroup_unassign_cntr_event(d, rdtgrp, mevt);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resctrl_parse_mbm_assignment(struct rdt_resource *r, struct rdtgroup *rdtgrp,</div><div class='add'>+					char *event, char *tok)</div><div class='add'>+{</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+	unsigned long dom_id = 0;</div><div class='add'>+	char *dom_str, *id_str;</div><div class='add'>+	struct mon_evt *mevt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mevt = mbm_get_mon_event_by_name(r, event);</div><div class='add'>+	if (!mevt) {</div><div class='add'>+		rdt_last_cmd_printf("Invalid event %s\n", event);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+	if (!tok || tok[0] == '\0')</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Start processing the strings for each domain */</div><div class='add'>+	dom_str = strim(strsep(&amp;tok, ";"));</div><div class='add'>+</div><div class='add'>+	id_str = strsep(&amp;dom_str, "=");</div><div class='add'>+</div><div class='add'>+	/* Check for domain id '*' which means all domains */</div><div class='add'>+	if (id_str &amp;&amp; *id_str == '*') {</div><div class='add'>+		ret = rdtgroup_modify_assign_state(dom_str, NULL, rdtgrp, mevt);</div><div class='add'>+		if (ret)</div><div class='add'>+			rdt_last_cmd_printf("Assign operation '%s:*=%s' failed\n",</div><div class='add'>+					    event, dom_str);</div><div class='add'>+		return ret;</div><div class='add'>+	} else if (!id_str || kstrtoul(id_str, 10, &amp;dom_id)) {</div><div class='add'>+		rdt_last_cmd_puts("Missing domain id\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify if the dom_id is valid */</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		if (d-&gt;hdr.id == dom_id) {</div><div class='add'>+			ret = rdtgroup_modify_assign_state(dom_str, d, rdtgrp, mevt);</div><div class='add'>+			if (ret) {</div><div class='add'>+				rdt_last_cmd_printf("Assign operation '%s:%ld=%s' failed\n",</div><div class='add'>+						    event, dom_id, dom_str);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_printf("Invalid domain id %ld\n", dom_id);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t mbm_L3_assignments_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				 size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	char *token, *event;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_mbm_cntr_assign_enabled(r)) {</div><div class='add'>+		rdt_last_cmd_puts("mbm_event mode is not enabled\n");</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((token = strsep(&amp;buf, "\n")) != NULL) {</div><div class='add'>+		/*</div><div class='add'>+		 * The write command follows the following format:</div><div class='add'>+		 * "&lt;Event&gt;:&lt;Domain ID&gt;=&lt;Assignment state&gt;"</div><div class='add'>+		 * Extract the event name first.</div><div class='add'>+		 */</div><div class='add'>+		event = strsep(&amp;token, ":");</div><div class='add'>+</div><div class='add'>+		ret = resctrl_parse_mbm_assignment(r, rdtgrp, event, token);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_mon_resource_init() - Initialise global monitoring structures.</div><div class='add'>+ *</div><div class='add'>+ * Allocate and initialise global monitor resources that do not belong to a</div><div class='add'>+ * specific domain. i.e. the rmid_ptrs[] used for the limbo and free lists.</div><div class='add'>+ * Called once during boot after the struct rdt_resource's have been configured</div><div class='add'>+ * but before the filesystem is mounted.</div><div class='add'>+ * Resctrl's cpuhp callbacks may be called before this point to bring a domain</div><div class='add'>+ * online.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 for success, or -ENOMEM.</div><div class='add'>+ */</div><div class='add'>+int resctrl_mon_resource_init(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;mon_capable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = dom_data_init(r);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (resctrl_arch_is_evt_configurable(QOS_L3_MBM_TOTAL_EVENT_ID)) {</div><div class='add'>+		mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID].configurable = true;</div><div class='add'>+		resctrl_file_fflags_init("mbm_total_bytes_config",</div><div class='add'>+					 RFTYPE_MON_INFO | RFTYPE_RES_CACHE);</div><div class='add'>+	}</div><div class='add'>+	if (resctrl_arch_is_evt_configurable(QOS_L3_MBM_LOCAL_EVENT_ID)) {</div><div class='add'>+		mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID].configurable = true;</div><div class='add'>+		resctrl_file_fflags_init("mbm_local_bytes_config",</div><div class='add'>+					 RFTYPE_MON_INFO | RFTYPE_RES_CACHE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+		mba_mbps_default_event = QOS_L3_MBM_LOCAL_EVENT_ID;</div><div class='add'>+	else if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+		mba_mbps_default_event = QOS_L3_MBM_TOTAL_EVENT_ID;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;mon.mbm_cntr_assignable) {</div><div class='add'>+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))</div><div class='add'>+			mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID].evt_cfg = r-&gt;mon.mbm_cfg_mask;</div><div class='add'>+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))</div><div class='add'>+			mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID].evt_cfg = r-&gt;mon.mbm_cfg_mask &amp;</div><div class='add'>+									   (READS_TO_LOCAL_MEM |</div><div class='add'>+									    READS_TO_LOCAL_S_MEM |</div><div class='add'>+									    NON_TEMP_WRITE_TO_LOCAL_MEM);</div><div class='add'>+		r-&gt;mon.mbm_assign_on_mkdir = true;</div><div class='add'>+		resctrl_file_fflags_init("num_mbm_cntrs",</div><div class='add'>+					 RFTYPE_MON_INFO | RFTYPE_RES_CACHE);</div><div class='add'>+		resctrl_file_fflags_init("available_mbm_cntrs",</div><div class='add'>+					 RFTYPE_MON_INFO | RFTYPE_RES_CACHE);</div><div class='add'>+		resctrl_file_fflags_init("event_filter", RFTYPE_ASSIGN_CONFIG);</div><div class='add'>+		resctrl_file_fflags_init("mbm_assign_on_mkdir", RFTYPE_MON_INFO |</div><div class='add'>+					 RFTYPE_RES_CACHE);</div><div class='add'>+		resctrl_file_fflags_init("mbm_L3_assignments", RFTYPE_MON_BASE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void resctrl_mon_resource_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);</div><div class='add'>+</div><div class='add'>+	dom_data_exit(r);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/resctrl/monitor_trace.h b/fs/resctrl/monitor_trace.h<br/>new file mode 100644<br/>index 000000000000..fdf49f22576a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/monitor_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/monitor_trace.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM resctrl</div><div class='add'>+</div><div class='add'>+#if !defined(_FS_RESCTRL_MONITOR_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _FS_RESCTRL_MONITOR_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(mon_llc_occupancy_limbo,</div><div class='add'>+	    TP_PROTO(u32 ctrl_hw_id, u32 mon_hw_id, int domain_id, u64 llc_occupancy_bytes),</div><div class='add'>+	    TP_ARGS(ctrl_hw_id, mon_hw_id, domain_id, llc_occupancy_bytes),</div><div class='add'>+	    TP_STRUCT__entry(__field(u32, ctrl_hw_id)</div><div class='add'>+			     __field(u32, mon_hw_id)</div><div class='add'>+			     __field(int, domain_id)</div><div class='add'>+			     __field(u64, llc_occupancy_bytes)),</div><div class='add'>+	    TP_fast_assign(__entry-&gt;ctrl_hw_id = ctrl_hw_id;</div><div class='add'>+			   __entry-&gt;mon_hw_id = mon_hw_id;</div><div class='add'>+			   __entry-&gt;domain_id = domain_id;</div><div class='add'>+			   __entry-&gt;llc_occupancy_bytes = llc_occupancy_bytes;),</div><div class='add'>+	    TP_printk("ctrl_hw_id=%u mon_hw_id=%u domain_id=%d llc_occupancy_bytes=%llu",</div><div class='add'>+		      __entry-&gt;ctrl_hw_id, __entry-&gt;mon_hw_id, __entry-&gt;domain_id,</div><div class='add'>+		      __entry-&gt;llc_occupancy_bytes)</div><div class='add'>+	   );</div><div class='add'>+</div><div class='add'>+#endif /* _FS_RESCTRL_MONITOR_TRACE_H */</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+</div><div class='add'>+#define TRACE_INCLUDE_FILE monitor_trace</div><div class='add'>+</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/fs/resctrl/pseudo_lock.c b/fs/resctrl/pseudo_lock.c<br/>new file mode 100644<br/>index 000000000000..0bfc13c5b96d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/pseudo_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/pseudo_lock.c</a></div><div class='hunk'>@@ -0,0 +1,1099 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Resource Director Technology (RDT)</div><div class='add'>+ *</div><div class='add'>+ * Pseudo-locking support built on top of Cache Allocation Technology (CAT)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Reinette Chatre &lt;reinette.chatre@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cacheinfo.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/pm_qos.h&gt;</div><div class='add'>+#include &lt;linux/resctrl.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Major number assigned to and shared by all devices exposing</div><div class='add'>+ * pseudo-locked regions.</div><div class='add'>+ */</div><div class='add'>+static unsigned int pseudo_lock_major;</div><div class='add'>+</div><div class='add'>+static unsigned long pseudo_lock_minor_avail = GENMASK(MINORBITS, 0);</div><div class='add'>+</div><div class='add'>+static char *pseudo_lock_devnode(const struct device *dev, umode_t *mode)</div><div class='add'>+{</div><div class='add'>+	const struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	rdtgrp = dev_get_drvdata(dev);</div><div class='add'>+	if (mode)</div><div class='add'>+		*mode = 0600;</div><div class='add'>+	guard(mutex)(&amp;rdtgroup_mutex);</div><div class='add'>+	return kasprintf(GFP_KERNEL, "pseudo_lock/%s", rdt_kn_name(rdtgrp-&gt;kn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct class pseudo_lock_class = {</div><div class='add'>+	.name = "pseudo_lock",</div><div class='add'>+	.devnode = pseudo_lock_devnode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_minor_get - Obtain available minor number</div><div class='add'>+ * @minor: Pointer to where new minor number will be stored</div><div class='add'>+ *</div><div class='add'>+ * A bitmask is used to track available minor numbers. Here the next free</div><div class='add'>+ * minor number is marked as unavailable and returned.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure.</div><div class='add'>+ */</div><div class='add'>+static int pseudo_lock_minor_get(unsigned int *minor)</div><div class='add'>+{</div><div class='add'>+	unsigned long first_bit;</div><div class='add'>+</div><div class='add'>+	first_bit = find_first_bit(&amp;pseudo_lock_minor_avail, MINORBITS);</div><div class='add'>+</div><div class='add'>+	if (first_bit == MINORBITS)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	__clear_bit(first_bit, &amp;pseudo_lock_minor_avail);</div><div class='add'>+	*minor = first_bit;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_minor_release - Return minor number to available</div><div class='add'>+ * @minor: The minor number made available</div><div class='add'>+ */</div><div class='add'>+static void pseudo_lock_minor_release(unsigned int minor)</div><div class='add'>+{</div><div class='add'>+	__set_bit(minor, &amp;pseudo_lock_minor_avail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * region_find_by_minor - Locate a pseudo-lock region by inode minor number</div><div class='add'>+ * @minor: The minor number of the device representing pseudo-locked region</div><div class='add'>+ *</div><div class='add'>+ * When the character device is accessed we need to determine which</div><div class='add'>+ * pseudo-locked region it belongs to. This is done by matching the minor</div><div class='add'>+ * number of the device to the pseudo-locked region it belongs.</div><div class='add'>+ *</div><div class='add'>+ * Minor numbers are assigned at the time a pseudo-locked region is associated</div><div class='add'>+ * with a cache instance.</div><div class='add'>+ *</div><div class='add'>+ * Return: On success return pointer to resource group owning the pseudo-locked</div><div class='add'>+ *         region, NULL on failure.</div><div class='add'>+ */</div><div class='add'>+static struct rdtgroup *region_find_by_minor(unsigned int minor)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp, *rdtgrp_match = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rdtgrp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		if (rdtgrp-&gt;plr &amp;&amp; rdtgrp-&gt;plr-&gt;minor == minor) {</div><div class='add'>+			rdtgrp_match = rdtgrp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return rdtgrp_match;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pseudo_lock_pm_req - A power management QoS request list entry</div><div class='add'>+ * @list:	Entry within the @pm_reqs list for a pseudo-locked region</div><div class='add'>+ * @req:	PM QoS request</div><div class='add'>+ */</div><div class='add'>+struct pseudo_lock_pm_req {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct dev_pm_qos_request req;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void pseudo_lock_cstates_relax(struct pseudo_lock_region *plr)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_lock_pm_req *pm_req, *next;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(pm_req, next, &amp;plr-&gt;pm_reqs, list) {</div><div class='add'>+		dev_pm_qos_remove_request(&amp;pm_req-&gt;req);</div><div class='add'>+		list_del(&amp;pm_req-&gt;list);</div><div class='add'>+		kfree(pm_req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_cstates_constrain - Restrict cores from entering C6</div><div class='add'>+ * @plr: Pseudo-locked region</div><div class='add'>+ *</div><div class='add'>+ * To prevent the cache from being affected by power management entering</div><div class='add'>+ * C6 has to be avoided. This is accomplished by requesting a latency</div><div class='add'>+ * requirement lower than lowest C6 exit latency of all supported</div><div class='add'>+ * platforms as found in the cpuidle state tables in the intel_idle driver.</div><div class='add'>+ * At this time it is possible to do so with a single latency requirement</div><div class='add'>+ * for all supported platforms.</div><div class='add'>+ *</div><div class='add'>+ * Since Goldmont is supported, which is affected by X86_BUG_MONITOR,</div><div class='add'>+ * the ACPI latencies need to be considered while keeping in mind that C2</div><div class='add'>+ * may be set to map to deeper sleep states. In this case the latency</div><div class='add'>+ * requirement needs to prevent entering C2 also.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure</div><div class='add'>+ */</div><div class='add'>+static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_lock_pm_req *pm_req;</div><div class='add'>+	int cpu;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for_each_cpu(cpu, &amp;plr-&gt;d-&gt;hdr.cpu_mask) {</div><div class='add'>+		pm_req = kzalloc(sizeof(*pm_req), GFP_KERNEL);</div><div class='add'>+		if (!pm_req) {</div><div class='add'>+			rdt_last_cmd_puts("Failure to allocate memory for PM QoS\n");</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		ret = dev_pm_qos_add_request(get_cpu_device(cpu),</div><div class='add'>+					     &amp;pm_req-&gt;req,</div><div class='add'>+					     DEV_PM_QOS_RESUME_LATENCY,</div><div class='add'>+					     30);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			rdt_last_cmd_printf("Failed to add latency req CPU%d\n",</div><div class='add'>+					    cpu);</div><div class='add'>+			kfree(pm_req);</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+		list_add(&amp;pm_req-&gt;list, &amp;plr-&gt;pm_reqs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	pseudo_lock_cstates_relax(plr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_region_clear - Reset pseudo-lock region data</div><div class='add'>+ * @plr: pseudo-lock region</div><div class='add'>+ *</div><div class='add'>+ * All content of the pseudo-locked region is reset - any memory allocated</div><div class='add'>+ * freed.</div><div class='add'>+ *</div><div class='add'>+ * Return: void</div><div class='add'>+ */</div><div class='add'>+static void pseudo_lock_region_clear(struct pseudo_lock_region *plr)</div><div class='add'>+{</div><div class='add'>+	plr-&gt;size = 0;</div><div class='add'>+	plr-&gt;line_size = 0;</div><div class='add'>+	kfree(plr-&gt;kmem);</div><div class='add'>+	plr-&gt;kmem = NULL;</div><div class='add'>+	plr-&gt;s = NULL;</div><div class='add'>+	if (plr-&gt;d)</div><div class='add'>+		plr-&gt;d-&gt;plr = NULL;</div><div class='add'>+	plr-&gt;d = NULL;</div><div class='add'>+	plr-&gt;cbm = 0;</div><div class='add'>+	plr-&gt;debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_region_init - Initialize pseudo-lock region information</div><div class='add'>+ * @plr: pseudo-lock region</div><div class='add'>+ *</div><div class='add'>+ * Called after user provided a schemata to be pseudo-locked. From the</div><div class='add'>+ * schemata the &amp;struct pseudo_lock_region is on entry already initialized</div><div class='add'>+ * with the resource, domain, and capacity bitmask. Here the information</div><div class='add'>+ * required for pseudo-locking is deduced from this data and &amp;struct</div><div class='add'>+ * pseudo_lock_region initialized further. This information includes:</div><div class='add'>+ * - size in bytes of the region to be pseudo-locked</div><div class='add'>+ * - cache line size to know the stride with which data needs to be accessed</div><div class='add'>+ *   to be pseudo-locked</div><div class='add'>+ * - a cpu associated with the cache instance on which the pseudo-locking</div><div class='add'>+ *   flow can be executed</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure. Descriptive error will be written</div><div class='add'>+ * to last_cmd_status buffer.</div><div class='add'>+ */</div><div class='add'>+static int pseudo_lock_region_init(struct pseudo_lock_region *plr)</div><div class='add'>+{</div><div class='add'>+	enum resctrl_scope scope = plr-&gt;s-&gt;res-&gt;ctrl_scope;</div><div class='add'>+	struct cacheinfo *ci;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(scope != RESCTRL_L2_CACHE &amp;&amp; scope != RESCTRL_L3_CACHE))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Pick the first cpu we find that is associated with the cache. */</div><div class='add'>+	plr-&gt;cpu = cpumask_first(&amp;plr-&gt;d-&gt;hdr.cpu_mask);</div><div class='add'>+</div><div class='add'>+	if (!cpu_online(plr-&gt;cpu)) {</div><div class='add'>+		rdt_last_cmd_printf("CPU %u associated with cache not online\n",</div><div class='add'>+				    plr-&gt;cpu);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ci = get_cpu_cacheinfo_level(plr-&gt;cpu, scope);</div><div class='add'>+	if (ci) {</div><div class='add'>+		plr-&gt;line_size = ci-&gt;coherency_line_size;</div><div class='add'>+		plr-&gt;size = rdtgroup_cbm_to_size(plr-&gt;s-&gt;res, plr-&gt;d, plr-&gt;cbm);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -1;</div><div class='add'>+	rdt_last_cmd_puts("Unable to determine cache line size\n");</div><div class='add'>+out_region:</div><div class='add'>+	pseudo_lock_region_clear(plr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_init - Initialize a pseudo-lock region</div><div class='add'>+ * @rdtgrp: resource group to which new pseudo-locked region will belong</div><div class='add'>+ *</div><div class='add'>+ * A pseudo-locked region is associated with a resource group. When this</div><div class='add'>+ * association is created the pseudo-locked region is initialized. The</div><div class='add'>+ * details of the pseudo-locked region are not known at this time so only</div><div class='add'>+ * allocation is done and association established.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure</div><div class='add'>+ */</div><div class='add'>+static int pseudo_lock_init(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_lock_region *plr;</div><div class='add'>+</div><div class='add'>+	plr = kzalloc(sizeof(*plr), GFP_KERNEL);</div><div class='add'>+	if (!plr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;plr-&gt;lock_thread_wq);</div><div class='add'>+	INIT_LIST_HEAD(&amp;plr-&gt;pm_reqs);</div><div class='add'>+	rdtgrp-&gt;plr = plr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_region_alloc - Allocate kernel memory that will be pseudo-locked</div><div class='add'>+ * @plr: pseudo-lock region</div><div class='add'>+ *</div><div class='add'>+ * Initialize the details required to set up the pseudo-locked region and</div><div class='add'>+ * allocate the contiguous memory that will be pseudo-locked to the cache.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure.  Descriptive error will be written</div><div class='add'>+ * to last_cmd_status buffer.</div><div class='add'>+ */</div><div class='add'>+static int pseudo_lock_region_alloc(struct pseudo_lock_region *plr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pseudo_lock_region_init(plr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not yet support contiguous regions larger than</div><div class='add'>+	 * KMALLOC_MAX_SIZE.</div><div class='add'>+	 */</div><div class='add'>+	if (plr-&gt;size &gt; KMALLOC_MAX_SIZE) {</div><div class='add'>+		rdt_last_cmd_puts("Requested region exceeds maximum size\n");</div><div class='add'>+		ret = -E2BIG;</div><div class='add'>+		goto out_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plr-&gt;kmem = kzalloc(plr-&gt;size, GFP_KERNEL);</div><div class='add'>+	if (!plr-&gt;kmem) {</div><div class='add'>+		rdt_last_cmd_puts("Unable to allocate memory\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='add'>+out_region:</div><div class='add'>+	pseudo_lock_region_clear(plr);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_free - Free a pseudo-locked region</div><div class='add'>+ * @rdtgrp: resource group to which pseudo-locked region belonged</div><div class='add'>+ *</div><div class='add'>+ * The pseudo-locked region's resources have already been released, or not</div><div class='add'>+ * yet created at this point. Now it can be freed and disassociated from the</div><div class='add'>+ * resource group.</div><div class='add'>+ *</div><div class='add'>+ * Return: void</div><div class='add'>+ */</div><div class='add'>+static void pseudo_lock_free(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	pseudo_lock_region_clear(rdtgrp-&gt;plr);</div><div class='add'>+	kfree(rdtgrp-&gt;plr);</div><div class='add'>+	rdtgrp-&gt;plr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_monitor_in_progress - Test if monitoring in progress</div><div class='add'>+ * @rdtgrp: resource group being queried</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if monitor groups have been created for this resource</div><div class='add'>+ * group, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_monitor_in_progress(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;rdtgrp-&gt;mon.crdtgrp_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_locksetup_user_restrict - Restrict user access to group</div><div class='add'>+ * @rdtgrp: resource group needing access restricted</div><div class='add'>+ *</div><div class='add'>+ * A resource group used for cache pseudo-locking cannot have cpus or tasks</div><div class='add'>+ * assigned to it. This is communicated to the user by restricting access</div><div class='add'>+ * to all the files that can be used to make such changes.</div><div class='add'>+ *</div><div class='add'>+ * Permissions restored with rdtgroup_locksetup_user_restore()</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure. If a failure occurs during the</div><div class='add'>+ * restriction of access an attempt will be made to restore permissions but</div><div class='add'>+ * the state of the mode of these files will be uncertain when a failure</div><div class='add'>+ * occurs.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_locksetup_user_restrict(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_mode_restrict(rdtgrp, "tasks");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_mode_restrict(rdtgrp, "cpus");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_tasks;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_mode_restrict(rdtgrp, "cpus_list");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_cpus;</div><div class='add'>+</div><div class='add'>+	if (resctrl_arch_mon_capable()) {</div><div class='add'>+		ret = rdtgroup_kn_mode_restrict(rdtgrp, "mon_groups");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_cpus_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+err_cpus_list:</div><div class='add'>+	rdtgroup_kn_mode_restore(rdtgrp, "cpus_list", 0777);</div><div class='add'>+err_cpus:</div><div class='add'>+	rdtgroup_kn_mode_restore(rdtgrp, "cpus", 0777);</div><div class='add'>+err_tasks:</div><div class='add'>+	rdtgroup_kn_mode_restore(rdtgrp, "tasks", 0777);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_locksetup_user_restore - Restore user access to group</div><div class='add'>+ * @rdtgrp: resource group needing access restored</div><div class='add'>+ *</div><div class='add'>+ * Restore all file access previously removed using</div><div class='add'>+ * rdtgroup_locksetup_user_restrict()</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure.  If a failure occurs during the</div><div class='add'>+ * restoration of access an attempt will be made to restrict permissions</div><div class='add'>+ * again but the state of the mode of these files will be uncertain when</div><div class='add'>+ * a failure occurs.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_locksetup_user_restore(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_mode_restore(rdtgrp, "tasks", 0777);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_mode_restore(rdtgrp, "cpus", 0777);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_tasks;</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_mode_restore(rdtgrp, "cpus_list", 0777);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_cpus;</div><div class='add'>+</div><div class='add'>+	if (resctrl_arch_mon_capable()) {</div><div class='add'>+		ret = rdtgroup_kn_mode_restore(rdtgrp, "mon_groups", 0777);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_cpus_list;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+err_cpus_list:</div><div class='add'>+	rdtgroup_kn_mode_restrict(rdtgrp, "cpus_list");</div><div class='add'>+err_cpus:</div><div class='add'>+	rdtgroup_kn_mode_restrict(rdtgrp, "cpus");</div><div class='add'>+err_tasks:</div><div class='add'>+	rdtgroup_kn_mode_restrict(rdtgrp, "tasks");</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_locksetup_enter - Resource group enters locksetup mode</div><div class='add'>+ * @rdtgrp: resource group requested to enter locksetup mode</div><div class='add'>+ *</div><div class='add'>+ * A resource group enters locksetup mode to reflect that it would be used</div><div class='add'>+ * to represent a pseudo-locked region and is in the process of being set</div><div class='add'>+ * up to do so. A resource group used for a pseudo-locked region would</div><div class='add'>+ * lose the closid associated with it so we cannot allow it to have any</div><div class='add'>+ * tasks or cpus assigned nor permit tasks or cpus to be assigned in the</div><div class='add'>+ * future. Monitoring of a pseudo-locked region is not allowed either.</div><div class='add'>+ *</div><div class='add'>+ * The above and more restrictions on a pseudo-locked region are checked</div><div class='add'>+ * for and enforced before the resource group enters the locksetup mode.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if the resource group successfully entered locksetup mode, &lt;0</div><div class='add'>+ * on failure. On failure the last_cmd_status buffer is updated with text to</div><div class='add'>+ * communicate details of failure to the user.</div><div class='add'>+ */</div><div class='add'>+int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The default resource group can neither be removed nor lose the</div><div class='add'>+	 * default closid associated with it.</div><div class='add'>+	 */</div><div class='add'>+	if (rdtgrp == &amp;rdtgroup_default) {</div><div class='add'>+		rdt_last_cmd_puts("Cannot pseudo-lock default group\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cache Pseudo-locking not supported when CDP is enabled.</div><div class='add'>+	 *</div><div class='add'>+	 * Some things to consider if you would like to enable this</div><div class='add'>+	 * support (using L3 CDP as example):</div><div class='add'>+	 * - When CDP is enabled two separate resources are exposed,</div><div class='add'>+	 *   L3DATA and L3CODE, but they are actually on the same cache.</div><div class='add'>+	 *   The implication for pseudo-locking is that if a</div><div class='add'>+	 *   pseudo-locked region is created on a domain of one</div><div class='add'>+	 *   resource (eg. L3CODE), then a pseudo-locked region cannot</div><div class='add'>+	 *   be created on that same domain of the other resource</div><div class='add'>+	 *   (eg. L3DATA). This is because the creation of a</div><div class='add'>+	 *   pseudo-locked region involves a call to wbinvd that will</div><div class='add'>+	 *   affect all cache allocations on particular domain.</div><div class='add'>+	 * - Considering the previous, it may be possible to only</div><div class='add'>+	 *   expose one of the CDP resources to pseudo-locking and</div><div class='add'>+	 *   hide the other. For example, we could consider to only</div><div class='add'>+	 *   expose L3DATA and since the L3 cache is unified it is</div><div class='add'>+	 *   still possible to place instructions there are execute it.</div><div class='add'>+	 * - If only one region is exposed to pseudo-locking we should</div><div class='add'>+	 *   still keep in mind that availability of a portion of cache</div><div class='add'>+	 *   for pseudo-locking should take into account both resources.</div><div class='add'>+	 *   Similarly, if a pseudo-locked region is created in one</div><div class='add'>+	 *   resource, the portion of cache used by it should be made</div><div class='add'>+	 *   unavailable to all future allocations from both resources.</div><div class='add'>+	 */</div><div class='add'>+	if (resctrl_arch_get_cdp_enabled(RDT_RESOURCE_L3) ||</div><div class='add'>+	    resctrl_arch_get_cdp_enabled(RDT_RESOURCE_L2)) {</div><div class='add'>+		rdt_last_cmd_puts("CDP enabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not knowing the bits to disable prefetching implies that this</div><div class='add'>+	 * platform does not support Cache Pseudo-Locking.</div><div class='add'>+	 */</div><div class='add'>+	if (resctrl_arch_get_prefetch_disable_bits() == 0) {</div><div class='add'>+		rdt_last_cmd_puts("Pseudo-locking not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgroup_monitor_in_progress(rdtgrp)) {</div><div class='add'>+		rdt_last_cmd_puts("Monitoring in progress\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgroup_tasks_assigned(rdtgrp)) {</div><div class='add'>+		rdt_last_cmd_puts("Tasks assigned to resource group\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cpumask_empty(&amp;rdtgrp-&gt;cpu_mask)) {</div><div class='add'>+		rdt_last_cmd_puts("CPUs assigned to resource group\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgroup_locksetup_user_restrict(rdtgrp)) {</div><div class='add'>+		rdt_last_cmd_puts("Unable to modify resctrl permissions\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pseudo_lock_init(rdtgrp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rdt_last_cmd_puts("Unable to init pseudo-lock region\n");</div><div class='add'>+		goto out_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this system is capable of monitoring a rmid would have been</div><div class='add'>+	 * allocated when the control group was created. This is not needed</div><div class='add'>+	 * anymore when this group would be used for pseudo-locking. This</div><div class='add'>+	 * is safe to call on platforms not capable of monitoring.</div><div class='add'>+	 */</div><div class='add'>+	free_rmid(rdtgrp-&gt;closid, rdtgrp-&gt;mon.rmid);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+out_release:</div><div class='add'>+	rdtgroup_locksetup_user_restore(rdtgrp);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_locksetup_exit - resource group exist locksetup mode</div><div class='add'>+ * @rdtgrp: resource group</div><div class='add'>+ *</div><div class='add'>+ * When a resource group exits locksetup mode the earlier restrictions are</div><div class='add'>+ * lifted.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure</div><div class='add'>+ */</div><div class='add'>+int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (resctrl_arch_mon_capable()) {</div><div class='add'>+		ret = alloc_rmid(rdtgrp-&gt;closid);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			rdt_last_cmd_puts("Out of RMIDs\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		rdtgrp-&gt;mon.rmid = ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_locksetup_user_restore(rdtgrp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		free_rmid(rdtgrp-&gt;closid, rdtgrp-&gt;mon.rmid);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pseudo_lock_free(rdtgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_cbm_overlaps_pseudo_locked - Test if CBM or portion is pseudo-locked</div><div class='add'>+ * @d: RDT domain</div><div class='add'>+ * @cbm: CBM to test</div><div class='add'>+ *</div><div class='add'>+ * @d represents a cache instance and @cbm a capacity bitmask that is</div><div class='add'>+ * considered for it. Determine if @cbm overlaps with any existing</div><div class='add'>+ * pseudo-locked region on @d.</div><div class='add'>+ *</div><div class='add'>+ * @cbm is unsigned long, even if only 32 bits are used, to make the</div><div class='add'>+ * bitmap functions work correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if @cbm overlaps with pseudo-locked region on @d, false</div><div class='add'>+ * otherwise.</div><div class='add'>+ */</div><div class='add'>+bool rdtgroup_cbm_overlaps_pseudo_locked(struct rdt_ctrl_domain *d, unsigned long cbm)</div><div class='add'>+{</div><div class='add'>+	unsigned int cbm_len;</div><div class='add'>+	unsigned long cbm_b;</div><div class='add'>+</div><div class='add'>+	if (d-&gt;plr) {</div><div class='add'>+		cbm_len = d-&gt;plr-&gt;s-&gt;res-&gt;cache.cbm_len;</div><div class='add'>+		cbm_b = d-&gt;plr-&gt;cbm;</div><div class='add'>+		if (bitmap_intersects(&amp;cbm, &amp;cbm_b, cbm_len))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_pseudo_locked_in_hierarchy - Pseudo-locked region in cache hierarchy</div><div class='add'>+ * @d: RDT domain under test</div><div class='add'>+ *</div><div class='add'>+ * The setup of a pseudo-locked region affects all cache instances within</div><div class='add'>+ * the hierarchy of the region. It is thus essential to know if any</div><div class='add'>+ * pseudo-locked regions exist within a cache hierarchy to prevent any</div><div class='add'>+ * attempts to create new pseudo-locked regions in the same hierarchy.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if a pseudo-locked region exists in the hierarchy of @d or</div><div class='add'>+ *         if it is not possible to test due to memory allocation issue,</div><div class='add'>+ *         false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool rdtgroup_pseudo_locked_in_hierarchy(struct rdt_ctrl_domain *d)</div><div class='add'>+{</div><div class='add'>+	struct rdt_ctrl_domain *d_i;</div><div class='add'>+	cpumask_var_t cpu_with_psl;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	/* Walking r-&gt;domains, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;cpu_with_psl, GFP_KERNEL))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First determine which cpus have pseudo-locked regions</div><div class='add'>+	 * associated with them.</div><div class='add'>+	 */</div><div class='add'>+	for_each_alloc_capable_rdt_resource(r) {</div><div class='add'>+		list_for_each_entry(d_i, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+			if (d_i-&gt;plr)</div><div class='add'>+				cpumask_or(cpu_with_psl, cpu_with_psl,</div><div class='add'>+					   &amp;d_i-&gt;hdr.cpu_mask);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Next test if new pseudo-locked region would intersect with</div><div class='add'>+	 * existing region.</div><div class='add'>+	 */</div><div class='add'>+	if (cpumask_intersects(&amp;d-&gt;hdr.cpu_mask, cpu_with_psl))</div><div class='add'>+		ret = true;</div><div class='add'>+</div><div class='add'>+	free_cpumask_var(cpu_with_psl);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pseudo_lock_measure_cycles - Trigger latency measure to pseudo-locked region</div><div class='add'>+ * @rdtgrp: Resource group to which the pseudo-locked region belongs.</div><div class='add'>+ * @sel: Selector of which measurement to perform on a pseudo-locked region.</div><div class='add'>+ *</div><div class='add'>+ * The measurement of latency to access a pseudo-locked region should be</div><div class='add'>+ * done from a cpu that is associated with that pseudo-locked region.</div><div class='add'>+ * Determine which cpu is associated with this region and start a thread on</div><div class='add'>+ * that cpu to perform the measurement, wait for that thread to complete.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, &lt;0 on failure</div><div class='add'>+ */</div><div class='add'>+static int pseudo_lock_measure_cycles(struct rdtgroup *rdtgrp, int sel)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_lock_region *plr = rdtgrp-&gt;plr;</div><div class='add'>+	struct task_struct *thread;</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;flags &amp; RDT_DELETED) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!plr-&gt;d) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plr-&gt;thread_done = 0;</div><div class='add'>+	cpu = cpumask_first(&amp;plr-&gt;d-&gt;hdr.cpu_mask);</div><div class='add'>+	if (!cpu_online(cpu)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plr-&gt;cpu = cpu;</div><div class='add'>+</div><div class='add'>+	if (sel == 1)</div><div class='add'>+		thread = kthread_run_on_cpu(resctrl_arch_measure_cycles_lat_fn,</div><div class='add'>+					    plr, cpu, "pseudo_lock_measure/%u");</div><div class='add'>+	else if (sel == 2)</div><div class='add'>+		thread = kthread_run_on_cpu(resctrl_arch_measure_l2_residency,</div><div class='add'>+					    plr, cpu, "pseudo_lock_measure/%u");</div><div class='add'>+	else if (sel == 3)</div><div class='add'>+		thread = kthread_run_on_cpu(resctrl_arch_measure_l3_residency,</div><div class='add'>+					    plr, cpu, "pseudo_lock_measure/%u");</div><div class='add'>+	else</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(thread)) {</div><div class='add'>+		ret = PTR_ERR(thread);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_event_interruptible(plr-&gt;lock_thread_wq,</div><div class='add'>+				       plr-&gt;thread_done == 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pseudo_lock_measure_trigger(struct file *file,</div><div class='add'>+					   const char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp = file-&gt;private_data;</div><div class='add'>+	size_t buf_size;</div><div class='add'>+	char buf[32];</div><div class='add'>+	int ret;</div><div class='add'>+	int sel;</div><div class='add'>+</div><div class='add'>+	buf_size = min(count, (sizeof(buf) - 1));</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[buf_size] = '\0';</div><div class='add'>+	ret = kstrtoint(buf, 10, &amp;sel);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		if (sel != 1 &amp;&amp; sel != 2 &amp;&amp; sel != 3)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ret = pseudo_lock_measure_cycles(rdtgrp, sel);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			ret = count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations pseudo_measure_fops = {</div><div class='add'>+	.write = pseudo_lock_measure_trigger,</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_pseudo_lock_create - Create a pseudo-locked region</div><div class='add'>+ * @rdtgrp: resource group to which pseudo-lock region belongs</div><div class='add'>+ *</div><div class='add'>+ * Called when a resource group in the pseudo-locksetup mode receives a</div><div class='add'>+ * valid schemata that should be pseudo-locked. Since the resource group is</div><div class='add'>+ * in pseudo-locksetup mode the &amp;struct pseudo_lock_region has already been</div><div class='add'>+ * allocated and initialized with the essential information. If a failure</div><div class='add'>+ * occurs the resource group remains in the pseudo-locksetup mode with the</div><div class='add'>+ * &amp;struct pseudo_lock_region associated with it, but cleared from all</div><div class='add'>+ * information and ready for the user to re-attempt pseudo-locking by</div><div class='add'>+ * writing the schemata again.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the pseudo-locked region was successfully pseudo-locked, &lt;0</div><div class='add'>+ * on failure. Descriptive error will be written to last_cmd_status buffer.</div><div class='add'>+ */</div><div class='add'>+int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_lock_region *plr = rdtgrp-&gt;plr;</div><div class='add'>+	struct task_struct *thread;</div><div class='add'>+	unsigned int new_minor;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	char *kn_name __free(kfree) = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pseudo_lock_region_alloc(plr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pseudo_lock_cstates_constrain(plr);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_region;</div><div class='add'>+	}</div><div class='add'>+	kn_name = kstrdup(rdt_kn_name(rdtgrp-&gt;kn), GFP_KERNEL);</div><div class='add'>+	if (!kn_name) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_cstates;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plr-&gt;thread_done = 0;</div><div class='add'>+</div><div class='add'>+	thread = kthread_run_on_cpu(resctrl_arch_pseudo_lock_fn, plr,</div><div class='add'>+				    plr-&gt;cpu, "pseudo_lock/%u");</div><div class='add'>+	if (IS_ERR(thread)) {</div><div class='add'>+		ret = PTR_ERR(thread);</div><div class='add'>+		rdt_last_cmd_printf("Locking thread returned error %d\n", ret);</div><div class='add'>+		goto out_cstates;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_event_interruptible(plr-&gt;lock_thread_wq,</div><div class='add'>+				       plr-&gt;thread_done == 1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the thread does not get on the CPU for whatever</div><div class='add'>+		 * reason and the process which sets up the region is</div><div class='add'>+		 * interrupted then this will leave the thread in runnable</div><div class='add'>+		 * state and once it gets on the CPU it will dereference</div><div class='add'>+		 * the cleared, but not freed, plr struct resulting in an</div><div class='add'>+		 * empty pseudo-locking loop.</div><div class='add'>+		 */</div><div class='add'>+		rdt_last_cmd_puts("Locking thread interrupted\n");</div><div class='add'>+		goto out_cstates;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pseudo_lock_minor_get(&amp;new_minor);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		rdt_last_cmd_puts("Unable to obtain a new minor number\n");</div><div class='add'>+		goto out_cstates;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unlock access but do not release the reference. The</div><div class='add'>+	 * pseudo-locked region will still be here on return.</div><div class='add'>+	 *</div><div class='add'>+	 * The mutex has to be released temporarily to avoid a potential</div><div class='add'>+	 * deadlock with the mm-&gt;mmap_lock which is obtained in the</div><div class='add'>+	 * device_create() and debugfs_create_dir() callpath below as well as</div><div class='add'>+	 * before the mmap() callback is called.</div><div class='add'>+	 */</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR_OR_NULL(debugfs_resctrl)) {</div><div class='add'>+		plr-&gt;debugfs_dir = debugfs_create_dir(kn_name, debugfs_resctrl);</div><div class='add'>+		if (!IS_ERR_OR_NULL(plr-&gt;debugfs_dir))</div><div class='add'>+			debugfs_create_file("pseudo_lock_measure", 0200,</div><div class='add'>+					    plr-&gt;debugfs_dir, rdtgrp,</div><div class='add'>+					    &amp;pseudo_measure_fops);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = device_create(&amp;pseudo_lock_class, NULL,</div><div class='add'>+			    MKDEV(pseudo_lock_major, new_minor),</div><div class='add'>+			    rdtgrp, "%s", kn_name);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(dev)) {</div><div class='add'>+		ret = PTR_ERR(dev);</div><div class='add'>+		rdt_last_cmd_printf("Failed to create character device: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+		goto out_debugfs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We released the mutex - check if group was removed while we did so */</div><div class='add'>+	if (rdtgrp-&gt;flags &amp; RDT_DELETED) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plr-&gt;minor = new_minor;</div><div class='add'>+</div><div class='add'>+	rdtgrp-&gt;mode = RDT_MODE_PSEUDO_LOCKED;</div><div class='add'>+	closid_free(rdtgrp-&gt;closid);</div><div class='add'>+	rdtgroup_kn_mode_restore(rdtgrp, "cpus", 0444);</div><div class='add'>+	rdtgroup_kn_mode_restore(rdtgrp, "cpus_list", 0444);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+out_device:</div><div class='add'>+	device_destroy(&amp;pseudo_lock_class, MKDEV(pseudo_lock_major, new_minor));</div><div class='add'>+out_debugfs:</div><div class='add'>+	debugfs_remove_recursive(plr-&gt;debugfs_dir);</div><div class='add'>+	pseudo_lock_minor_release(new_minor);</div><div class='add'>+out_cstates:</div><div class='add'>+	pseudo_lock_cstates_relax(plr);</div><div class='add'>+out_region:</div><div class='add'>+	pseudo_lock_region_clear(plr);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_pseudo_lock_remove - Remove a pseudo-locked region</div><div class='add'>+ * @rdtgrp: resource group to which the pseudo-locked region belongs</div><div class='add'>+ *</div><div class='add'>+ * The removal of a pseudo-locked region can be initiated when the resource</div><div class='add'>+ * group is removed from user space via a "rmdir" from userspace or the</div><div class='add'>+ * unmount of the resctrl filesystem. On removal the resource group does</div><div class='add'>+ * not go back to pseudo-locksetup mode before it is removed, instead it is</div><div class='add'>+ * removed directly. There is thus asymmetry with the creation where the</div><div class='add'>+ * &amp;struct pseudo_lock_region is removed here while it was not created in</div><div class='add'>+ * rdtgroup_pseudo_lock_create().</div><div class='add'>+ *</div><div class='add'>+ * Return: void</div><div class='add'>+ */</div><div class='add'>+void rdtgroup_pseudo_lock_remove(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	struct pseudo_lock_region *plr = rdtgrp-&gt;plr;</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+		/*</div><div class='add'>+		 * Default group cannot be a pseudo-locked region so we can</div><div class='add'>+		 * free closid here.</div><div class='add'>+		 */</div><div class='add'>+		closid_free(rdtgrp-&gt;closid);</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pseudo_lock_cstates_relax(plr);</div><div class='add'>+	debugfs_remove_recursive(rdtgrp-&gt;plr-&gt;debugfs_dir);</div><div class='add'>+	device_destroy(&amp;pseudo_lock_class, MKDEV(pseudo_lock_major, plr-&gt;minor));</div><div class='add'>+	pseudo_lock_minor_release(plr-&gt;minor);</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	pseudo_lock_free(rdtgrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pseudo_lock_dev_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdtgrp = region_find_by_minor(iminor(inode));</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	filp-&gt;private_data = rdtgrp;</div><div class='add'>+	atomic_inc(&amp;rdtgrp-&gt;waitcount);</div><div class='add'>+	/* Perform a non-seekable open - llseek is not supported */</div><div class='add'>+	filp-&gt;f_mode &amp;= ~(FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pseudo_lock_dev_release(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	rdtgrp = filp-&gt;private_data;</div><div class='add'>+	WARN_ON(!rdtgrp);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	filp-&gt;private_data = NULL;</div><div class='add'>+	atomic_dec(&amp;rdtgrp-&gt;waitcount);</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pseudo_lock_dev_mremap(struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	/* Not supported */</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct vm_operations_struct pseudo_mmap_ops = {</div><div class='add'>+	.mremap = pseudo_lock_dev_mremap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pseudo_lock_dev_mmap_prepare(struct vm_area_desc *desc)</div><div class='add'>+{</div><div class='add'>+	unsigned long off = desc-&gt;pgoff &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	unsigned long vsize = vma_desc_size(desc);</div><div class='add'>+	struct file *filp = desc-&gt;file;</div><div class='add'>+	struct pseudo_lock_region *plr;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	unsigned long physical;</div><div class='add'>+	unsigned long psize;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdtgrp = filp-&gt;private_data;</div><div class='add'>+	WARN_ON(!rdtgrp);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plr = rdtgrp-&gt;plr;</div><div class='add'>+</div><div class='add'>+	if (!plr-&gt;d) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Task is required to run with affinity to the cpus associated</div><div class='add'>+	 * with the pseudo-locked region. If this is not the case the task</div><div class='add'>+	 * may be scheduled elsewhere and invalidate entries in the</div><div class='add'>+	 * pseudo-locked region.</div><div class='add'>+	 */</div><div class='add'>+	if (!cpumask_subset(current-&gt;cpus_ptr, &amp;plr-&gt;d-&gt;hdr.cpu_mask)) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	physical = __pa(plr-&gt;kmem) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	psize = plr-&gt;size - off;</div><div class='add'>+</div><div class='add'>+	if (off &gt; plr-&gt;size) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure changes are carried directly to the memory being mapped,</div><div class='add'>+	 * do not allow copy-on-write mapping.</div><div class='add'>+	 */</div><div class='add'>+	if (!(desc-&gt;vm_flags &amp; VM_SHARED)) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vsize &gt; psize) {</div><div class='add'>+		mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(plr-&gt;kmem + off, 0, vsize);</div><div class='add'>+</div><div class='add'>+	desc-&gt;vm_ops = &amp;pseudo_mmap_ops;</div><div class='add'>+	mmap_action_remap_full(desc, physical + desc-&gt;pgoff);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations pseudo_lock_dev_fops = {</div><div class='add'>+	.owner =	THIS_MODULE,</div><div class='add'>+	.read =		NULL,</div><div class='add'>+	.write =	NULL,</div><div class='add'>+	.open =		pseudo_lock_dev_open,</div><div class='add'>+	.release =	pseudo_lock_dev_release,</div><div class='add'>+	.mmap_prepare =	pseudo_lock_dev_mmap_prepare,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int rdt_pseudo_lock_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_chrdev(0, "pseudo_lock", &amp;pseudo_lock_dev_fops);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pseudo_lock_major = ret;</div><div class='add'>+</div><div class='add'>+	ret = class_register(&amp;pseudo_lock_class);</div><div class='add'>+	if (ret) {</div><div class='add'>+		unregister_chrdev(pseudo_lock_major, "pseudo_lock");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdt_pseudo_lock_release(void)</div><div class='add'>+{</div><div class='add'>+	class_unregister(&amp;pseudo_lock_class);</div><div class='add'>+	unregister_chrdev(pseudo_lock_major, "pseudo_lock");</div><div class='add'>+	pseudo_lock_major = 0;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c<br/>new file mode 100644<br/>index 000000000000..8e39dfda56bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/fs/resctrl/rdtgroup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>fs/resctrl/rdtgroup.c</a></div><div class='hunk'>@@ -0,0 +1,4584 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * User interface for Resource Allocation in Resource Director Technology(RDT)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Fenghua Yu &lt;fenghua.yu@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * More information about RDT be found in the Intel (R) x86 Architecture</div><div class='add'>+ * Software Developer Manual.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/fs_parser.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/kernfs.h&gt;</div><div class='add'>+#include &lt;linux/resctrl.h&gt;</div><div class='add'>+#include &lt;linux/seq_buf.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/sched/task.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/user_namespace.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/magic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+/* Mutex to protect rdtgroup access. */</div><div class='add'>+DEFINE_MUTEX(rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+static struct kernfs_root *rdt_root;</div><div class='add'>+</div><div class='add'>+struct rdtgroup rdtgroup_default;</div><div class='add'>+</div><div class='add'>+LIST_HEAD(rdt_all_groups);</div><div class='add'>+</div><div class='add'>+/* list of entries for the schemata file */</div><div class='add'>+LIST_HEAD(resctrl_schema_all);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * List of struct mon_data containing private data of event files for use by</div><div class='add'>+ * rdtgroup_mondata_show(). Protected by rdtgroup_mutex.</div><div class='add'>+ */</div><div class='add'>+static LIST_HEAD(mon_data_kn_priv_list);</div><div class='add'>+</div><div class='add'>+/* The filesystem can only be mounted once. */</div><div class='add'>+bool resctrl_mounted;</div><div class='add'>+</div><div class='add'>+/* Kernel fs node for "info" directory under root */</div><div class='add'>+static struct kernfs_node *kn_info;</div><div class='add'>+</div><div class='add'>+/* Kernel fs node for "mon_groups" directory under root */</div><div class='add'>+static struct kernfs_node *kn_mongrp;</div><div class='add'>+</div><div class='add'>+/* Kernel fs node for "mon_data" directory under root */</div><div class='add'>+static struct kernfs_node *kn_mondata;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used to store the max resource name width to display the schemata names in</div><div class='add'>+ * a tabular format.</div><div class='add'>+ */</div><div class='add'>+int max_name_width;</div><div class='add'>+</div><div class='add'>+static struct seq_buf last_cmd_status;</div><div class='add'>+</div><div class='add'>+static char last_cmd_status_buf[512];</div><div class='add'>+</div><div class='add'>+static int rdtgroup_setup_root(struct rdt_fs_context *ctx);</div><div class='add'>+</div><div class='add'>+static void rdtgroup_destroy_root(void);</div><div class='add'>+</div><div class='add'>+struct dentry *debugfs_resctrl;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Memory bandwidth monitoring event to use for the default CTRL_MON group</div><div class='add'>+ * and each new CTRL_MON group created by the user.  Only relevant when</div><div class='add'>+ * the filesystem is mounted with the "mba_MBps" option so it does not</div><div class='add'>+ * matter that it remains uninitialized on systems that do not support</div><div class='add'>+ * the "mba_MBps" option.</div><div class='add'>+ */</div><div class='add'>+enum resctrl_event_id mba_mbps_default_event;</div><div class='add'>+</div><div class='add'>+static bool resctrl_debug;</div><div class='add'>+</div><div class='add'>+void rdt_last_cmd_clear(void)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+	seq_buf_clear(&amp;last_cmd_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdt_last_cmd_puts(const char *s)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+	seq_buf_puts(&amp;last_cmd_status, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdt_last_cmd_printf(const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list ap;</div><div class='add'>+</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+	seq_buf_vprintf(&amp;last_cmd_status, fmt, ap);</div><div class='add'>+	va_end(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdt_staged_configs_clear(void)</div><div class='add'>+{</div><div class='add'>+	struct rdt_ctrl_domain *dom;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	for_each_alloc_capable_rdt_resource(r) {</div><div class='add'>+		list_for_each_entry(dom, &amp;r-&gt;ctrl_domains, hdr.list)</div><div class='add'>+			memset(dom-&gt;staged_config, 0, sizeof(dom-&gt;staged_config));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool resctrl_is_mbm_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID) ||</div><div class='add'>+		resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Trivial allocator for CLOSIDs. Use BITMAP APIs to manipulate a bitmap</div><div class='add'>+ * of free CLOSIDs.</div><div class='add'>+ *</div><div class='add'>+ * Using a global CLOSID across all resources has some advantages and</div><div class='add'>+ * some drawbacks:</div><div class='add'>+ * + We can simply set current's closid to assign a task to a resource</div><div class='add'>+ *   group.</div><div class='add'>+ * + Context switch code can avoid extra memory references deciding which</div><div class='add'>+ *   CLOSID to load into the PQR_ASSOC MSR</div><div class='add'>+ * - We give up some options in configuring resource groups across multi-socket</div><div class='add'>+ *   systems.</div><div class='add'>+ * - Our choices on how to configure each resource become progressively more</div><div class='add'>+ *   limited as the number of resources grows.</div><div class='add'>+ */</div><div class='add'>+static unsigned long *closid_free_map;</div><div class='add'>+</div><div class='add'>+static int closid_free_map_len;</div><div class='add'>+</div><div class='add'>+int closids_supported(void)</div><div class='add'>+{</div><div class='add'>+	return closid_free_map_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int closid_init(void)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s;</div><div class='add'>+	u32 rdt_min_closid = ~0;</div><div class='add'>+</div><div class='add'>+	/* Monitor only platforms still call closid_init() */</div><div class='add'>+	if (list_empty(&amp;resctrl_schema_all))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Compute rdt_min_closid across all resources */</div><div class='add'>+	list_for_each_entry(s, &amp;resctrl_schema_all, list)</div><div class='add'>+		rdt_min_closid = min(rdt_min_closid, s-&gt;num_closid);</div><div class='add'>+</div><div class='add'>+	closid_free_map = bitmap_alloc(rdt_min_closid, GFP_KERNEL);</div><div class='add'>+	if (!closid_free_map)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	bitmap_fill(closid_free_map, rdt_min_closid);</div><div class='add'>+</div><div class='add'>+	/* RESCTRL_RESERVED_CLOSID is always reserved for the default group */</div><div class='add'>+	__clear_bit(RESCTRL_RESERVED_CLOSID, closid_free_map);</div><div class='add'>+	closid_free_map_len = rdt_min_closid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void closid_exit(void)</div><div class='add'>+{</div><div class='add'>+	bitmap_free(closid_free_map);</div><div class='add'>+	closid_free_map = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int closid_alloc(void)</div><div class='add'>+{</div><div class='add'>+	int cleanest_closid;</div><div class='add'>+	u32 closid;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID) &amp;&amp;</div><div class='add'>+	    resctrl_is_mon_event_enabled(QOS_L3_OCCUP_EVENT_ID)) {</div><div class='add'>+		cleanest_closid = resctrl_find_cleanest_closid();</div><div class='add'>+		if (cleanest_closid &lt; 0)</div><div class='add'>+			return cleanest_closid;</div><div class='add'>+		closid = cleanest_closid;</div><div class='add'>+	} else {</div><div class='add'>+		closid = find_first_bit(closid_free_map, closid_free_map_len);</div><div class='add'>+		if (closid == closid_free_map_len)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+	__clear_bit(closid, closid_free_map);</div><div class='add'>+</div><div class='add'>+	return closid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void closid_free(int closid)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	__set_bit(closid, closid_free_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * closid_allocated - test if provided closid is in use</div><div class='add'>+ * @closid: closid to be tested</div><div class='add'>+ *</div><div class='add'>+ * Return: true if @closid is currently associated with a resource group,</div><div class='add'>+ * false if @closid is free</div><div class='add'>+ */</div><div class='add'>+bool closid_allocated(unsigned int closid)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return !test_bit(closid, closid_free_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool closid_alloc_fixed(u32 closid)</div><div class='add'>+{</div><div class='add'>+	return __test_and_clear_bit(closid, closid_free_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_mode_by_closid - Return mode of resource group with closid</div><div class='add'>+ * @closid: closid if the resource group</div><div class='add'>+ *</div><div class='add'>+ * Each resource group is associated with a @closid. Here the mode</div><div class='add'>+ * of a resource group can be queried by searching for it using its closid.</div><div class='add'>+ *</div><div class='add'>+ * Return: mode as &amp;enum rdtgrp_mode of resource group with closid @closid</div><div class='add'>+ */</div><div class='add'>+enum rdtgrp_mode rdtgroup_mode_by_closid(int closid)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rdtgrp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		if (rdtgrp-&gt;closid == closid)</div><div class='add'>+			return rdtgrp-&gt;mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return RDT_NUM_MODES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const rdt_mode_str[] = {</div><div class='add'>+	[RDT_MODE_SHAREABLE]		= "shareable",</div><div class='add'>+	[RDT_MODE_EXCLUSIVE]		= "exclusive",</div><div class='add'>+	[RDT_MODE_PSEUDO_LOCKSETUP]	= "pseudo-locksetup",</div><div class='add'>+	[RDT_MODE_PSEUDO_LOCKED]	= "pseudo-locked",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_mode_str - Return the string representation of mode</div><div class='add'>+ * @mode: the resource group mode as &amp;enum rdtgroup_mode</div><div class='add'>+ *</div><div class='add'>+ * Return: string representation of valid mode, "unknown" otherwise</div><div class='add'>+ */</div><div class='add'>+static const char *rdtgroup_mode_str(enum rdtgrp_mode mode)</div><div class='add'>+{</div><div class='add'>+	if (mode &lt; RDT_MODE_SHAREABLE || mode &gt;= RDT_NUM_MODES)</div><div class='add'>+		return "unknown";</div><div class='add'>+</div><div class='add'>+	return rdt_mode_str[mode];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set uid and gid of rdtgroup dirs and files to that of the creator */</div><div class='add'>+static int rdtgroup_kn_set_ugid(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	struct iattr iattr = { .ia_valid = ATTR_UID | ATTR_GID,</div><div class='add'>+				.ia_uid = current_fsuid(),</div><div class='add'>+				.ia_gid = current_fsgid(), };</div><div class='add'>+</div><div class='add'>+	if (uid_eq(iattr.ia_uid, GLOBAL_ROOT_UID) &amp;&amp;</div><div class='add'>+	    gid_eq(iattr.ia_gid, GLOBAL_ROOT_GID))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return kernfs_setattr(kn, &amp;iattr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_add_file(struct kernfs_node *parent_kn, struct rftype *rft)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_node *kn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	kn = __kernfs_create_file(parent_kn, rft-&gt;name, rft-&gt;mode,</div><div class='add'>+				  GLOBAL_ROOT_UID, GLOBAL_ROOT_GID,</div><div class='add'>+				  0, rft-&gt;kf_ops, rft, NULL, NULL);</div><div class='add'>+	if (IS_ERR(kn))</div><div class='add'>+		return PTR_ERR(kn);</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_kn_set_ugid(kn);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kernfs_remove(kn);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_seqfile_show(struct seq_file *m, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_open_file *of = m-&gt;private;</div><div class='add'>+	struct rftype *rft = of-&gt;kn-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (rft-&gt;seq_show)</div><div class='add'>+		return rft-&gt;seq_show(of, m, arg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rdtgroup_file_write(struct kernfs_open_file *of, char *buf,</div><div class='add'>+				   size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rftype *rft = of-&gt;kn-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (rft-&gt;write)</div><div class='add'>+		return rft-&gt;write(of, buf, nbytes, off);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct kernfs_ops rdtgroup_kf_single_ops = {</div><div class='add'>+	.atomic_write_len	= PAGE_SIZE,</div><div class='add'>+	.write			= rdtgroup_file_write,</div><div class='add'>+	.seq_show		= rdtgroup_seqfile_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kernfs_ops kf_mondata_ops = {</div><div class='add'>+	.atomic_write_len	= PAGE_SIZE,</div><div class='add'>+	.seq_show		= rdtgroup_mondata_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool is_cpu_list(struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	struct rftype *rft = of-&gt;kn-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return rft-&gt;flags &amp; RFTYPE_FLAGS_CPUS_LIST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_cpus_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct cpumask *mask;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	if (rdtgrp) {</div><div class='add'>+		if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKED) {</div><div class='add'>+			if (!rdtgrp-&gt;plr-&gt;d) {</div><div class='add'>+				rdt_last_cmd_clear();</div><div class='add'>+				rdt_last_cmd_puts("Cache domain offline\n");</div><div class='add'>+				ret = -ENODEV;</div><div class='add'>+			} else {</div><div class='add'>+				mask = &amp;rdtgrp-&gt;plr-&gt;d-&gt;hdr.cpu_mask;</div><div class='add'>+				seq_printf(s, is_cpu_list(of) ?</div><div class='add'>+					   "%*pbl\n" : "%*pb\n",</div><div class='add'>+					   cpumask_pr_args(mask));</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			seq_printf(s, is_cpu_list(of) ? "%*pbl\n" : "%*pb\n",</div><div class='add'>+				   cpumask_pr_args(&amp;rdtgrp-&gt;cpu_mask));</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update the PGR_ASSOC MSR on all cpus in @cpu_mask,</div><div class='add'>+ *</div><div class='add'>+ * Per task closids/rmids must have been set up before calling this function.</div><div class='add'>+ * @r may be NULL.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+update_closid_rmid(const struct cpumask *cpu_mask, struct rdtgroup *r)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_cpu_defaults defaults, *p = NULL;</div><div class='add'>+</div><div class='add'>+	if (r) {</div><div class='add'>+		defaults.closid = r-&gt;closid;</div><div class='add'>+		defaults.rmid = r-&gt;mon.rmid;</div><div class='add'>+		p = &amp;defaults;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	on_each_cpu_mask(cpu_mask, resctrl_arch_sync_cpu_closid_rmid, p, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,</div><div class='add'>+			  cpumask_var_t tmpmask)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *prgrp = rdtgrp-&gt;mon.parent, *crgrp;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+</div><div class='add'>+	/* Check whether cpus belong to parent ctrl group */</div><div class='add'>+	cpumask_andnot(tmpmask, newmask, &amp;prgrp-&gt;cpu_mask);</div><div class='add'>+	if (!cpumask_empty(tmpmask)) {</div><div class='add'>+		rdt_last_cmd_puts("Can only add CPUs to mongroup that belong to parent\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check whether cpus are dropped from this group */</div><div class='add'>+	cpumask_andnot(tmpmask, &amp;rdtgrp-&gt;cpu_mask, newmask);</div><div class='add'>+	if (!cpumask_empty(tmpmask)) {</div><div class='add'>+		/* Give any dropped cpus to parent rdtgroup */</div><div class='add'>+		cpumask_or(&amp;prgrp-&gt;cpu_mask, &amp;prgrp-&gt;cpu_mask, tmpmask);</div><div class='add'>+		update_closid_rmid(tmpmask, prgrp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we added cpus, remove them from previous group that owned them</div><div class='add'>+	 * and update per-cpu rmid</div><div class='add'>+	 */</div><div class='add'>+	cpumask_andnot(tmpmask, newmask, &amp;rdtgrp-&gt;cpu_mask);</div><div class='add'>+	if (!cpumask_empty(tmpmask)) {</div><div class='add'>+		head = &amp;prgrp-&gt;mon.crdtgrp_list;</div><div class='add'>+		list_for_each_entry(crgrp, head, mon.crdtgrp_list) {</div><div class='add'>+			if (crgrp == rdtgrp)</div><div class='add'>+				continue;</div><div class='add'>+			cpumask_andnot(&amp;crgrp-&gt;cpu_mask, &amp;crgrp-&gt;cpu_mask,</div><div class='add'>+				       tmpmask);</div><div class='add'>+		}</div><div class='add'>+		update_closid_rmid(tmpmask, rdtgrp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Done pushing/pulling - update this group with new mask */</div><div class='add'>+	cpumask_copy(&amp;rdtgrp-&gt;cpu_mask, newmask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpumask_rdtgrp_clear(struct rdtgroup *r, struct cpumask *m)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *crgrp;</div><div class='add'>+</div><div class='add'>+	cpumask_andnot(&amp;r-&gt;cpu_mask, &amp;r-&gt;cpu_mask, m);</div><div class='add'>+	/* update the child mon group masks as well*/</div><div class='add'>+	list_for_each_entry(crgrp, &amp;r-&gt;mon.crdtgrp_list, mon.crdtgrp_list)</div><div class='add'>+		cpumask_and(&amp;crgrp-&gt;cpu_mask, &amp;r-&gt;cpu_mask, &amp;crgrp-&gt;cpu_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cpus_ctrl_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,</div><div class='add'>+			   cpumask_var_t tmpmask, cpumask_var_t tmpmask1)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *r, *crgrp;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+</div><div class='add'>+	/* Check whether cpus are dropped from this group */</div><div class='add'>+	cpumask_andnot(tmpmask, &amp;rdtgrp-&gt;cpu_mask, newmask);</div><div class='add'>+	if (!cpumask_empty(tmpmask)) {</div><div class='add'>+		/* Can't drop from default group */</div><div class='add'>+		if (rdtgrp == &amp;rdtgroup_default) {</div><div class='add'>+			rdt_last_cmd_puts("Can't drop CPUs from default group\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Give any dropped cpus to rdtgroup_default */</div><div class='add'>+		cpumask_or(&amp;rdtgroup_default.cpu_mask,</div><div class='add'>+			   &amp;rdtgroup_default.cpu_mask, tmpmask);</div><div class='add'>+		update_closid_rmid(tmpmask, &amp;rdtgroup_default);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we added cpus, remove them from previous group and</div><div class='add'>+	 * the prev group's child groups that owned them</div><div class='add'>+	 * and update per-cpu closid/rmid.</div><div class='add'>+	 */</div><div class='add'>+	cpumask_andnot(tmpmask, newmask, &amp;rdtgrp-&gt;cpu_mask);</div><div class='add'>+	if (!cpumask_empty(tmpmask)) {</div><div class='add'>+		list_for_each_entry(r, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+			if (r == rdtgrp)</div><div class='add'>+				continue;</div><div class='add'>+			cpumask_and(tmpmask1, &amp;r-&gt;cpu_mask, tmpmask);</div><div class='add'>+			if (!cpumask_empty(tmpmask1))</div><div class='add'>+				cpumask_rdtgrp_clear(r, tmpmask1);</div><div class='add'>+		}</div><div class='add'>+		update_closid_rmid(tmpmask, rdtgrp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Done pushing/pulling - update this group with new mask */</div><div class='add'>+	cpumask_copy(&amp;rdtgrp-&gt;cpu_mask, newmask);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear child mon group masks since there is a new parent mask</div><div class='add'>+	 * now and update the rmid for the cpus the child lost.</div><div class='add'>+	 */</div><div class='add'>+	head = &amp;rdtgrp-&gt;mon.crdtgrp_list;</div><div class='add'>+	list_for_each_entry(crgrp, head, mon.crdtgrp_list) {</div><div class='add'>+		cpumask_and(tmpmask, &amp;rdtgrp-&gt;cpu_mask, &amp;crgrp-&gt;cpu_mask);</div><div class='add'>+		update_closid_rmid(tmpmask, rdtgrp);</div><div class='add'>+		cpumask_clear(&amp;crgrp-&gt;cpu_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,</div><div class='add'>+				   char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	cpumask_var_t tmpmask, newmask, tmpmask1;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;newmask, GFP_KERNEL)) {</div><div class='add'>+		free_cpumask_var(tmpmask);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	if (!zalloc_cpumask_var(&amp;tmpmask1, GFP_KERNEL)) {</div><div class='add'>+		free_cpumask_var(tmpmask);</div><div class='add'>+		free_cpumask_var(newmask);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKED ||</div><div class='add'>+	    rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rdt_last_cmd_puts("Pseudo-locking in progress\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_cpu_list(of))</div><div class='add'>+		ret = cpulist_parse(buf, newmask);</div><div class='add'>+	else</div><div class='add'>+		ret = cpumask_parse(buf, newmask);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		rdt_last_cmd_puts("Bad CPU list/mask\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check that user didn't specify any offline cpus */</div><div class='add'>+	cpumask_andnot(tmpmask, newmask, cpu_online_mask);</div><div class='add'>+	if (!cpumask_empty(tmpmask)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rdt_last_cmd_puts("Can only assign online CPUs\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;type == RDTCTRL_GROUP)</div><div class='add'>+		ret = cpus_ctrl_write(rdtgrp, newmask, tmpmask, tmpmask1);</div><div class='add'>+	else if (rdtgrp-&gt;type == RDTMON_GROUP)</div><div class='add'>+		ret = cpus_mon_write(rdtgrp, newmask, tmpmask);</div><div class='add'>+	else</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	free_cpumask_var(tmpmask);</div><div class='add'>+	free_cpumask_var(newmask);</div><div class='add'>+	free_cpumask_var(tmpmask1);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_remove - the helper to remove resource group safely</div><div class='add'>+ * @rdtgrp: resource group to remove</div><div class='add'>+ *</div><div class='add'>+ * On resource group creation via a mkdir, an extra kernfs_node reference is</div><div class='add'>+ * taken to ensure that the rdtgroup structure remains accessible for the</div><div class='add'>+ * rdtgroup_kn_unlock() calls where it is removed.</div><div class='add'>+ *</div><div class='add'>+ * Drop the extra reference here, then free the rdtgroup structure.</div><div class='add'>+ *</div><div class='add'>+ * Return: void</div><div class='add'>+ */</div><div class='add'>+static void rdtgroup_remove(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	kernfs_put(rdtgrp-&gt;kn);</div><div class='add'>+	kfree(rdtgrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _update_task_closid_rmid(void *task)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If the task is still current on this CPU, update PQR_ASSOC MSR.</div><div class='add'>+	 * Otherwise, the MSR is updated when the task is scheduled in.</div><div class='add'>+	 */</div><div class='add'>+	if (task == current)</div><div class='add'>+		resctrl_arch_sched_in(task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_task_closid_rmid(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_SMP) &amp;&amp; task_curr(t))</div><div class='add'>+		smp_call_function_single(task_cpu(t), _update_task_closid_rmid, t, 1);</div><div class='add'>+	else</div><div class='add'>+		_update_task_closid_rmid(t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool task_in_rdtgroup(struct task_struct *tsk, struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	u32 closid, rmid = rdtgrp-&gt;mon.rmid;</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;type == RDTCTRL_GROUP)</div><div class='add'>+		closid = rdtgrp-&gt;closid;</div><div class='add'>+	else if (rdtgrp-&gt;type == RDTMON_GROUP)</div><div class='add'>+		closid = rdtgrp-&gt;mon.parent-&gt;closid;</div><div class='add'>+	else</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return resctrl_arch_match_closid(tsk, closid) &amp;&amp;</div><div class='add'>+	       resctrl_arch_match_rmid(tsk, closid, rmid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __rdtgroup_move_task(struct task_struct *tsk,</div><div class='add'>+				struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	/* If the task is already in rdtgrp, no need to move the task. */</div><div class='add'>+	if (task_in_rdtgroup(tsk, rdtgrp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the task's closid/rmid before the PQR_ASSOC MSR can be</div><div class='add'>+	 * updated by them.</div><div class='add'>+	 *</div><div class='add'>+	 * For ctrl_mon groups, move both closid and rmid.</div><div class='add'>+	 * For monitor groups, can move the tasks only from</div><div class='add'>+	 * their parent CTRL group.</div><div class='add'>+	 */</div><div class='add'>+	if (rdtgrp-&gt;type == RDTMON_GROUP &amp;&amp;</div><div class='add'>+	    !resctrl_arch_match_closid(tsk, rdtgrp-&gt;mon.parent-&gt;closid)) {</div><div class='add'>+		rdt_last_cmd_puts("Can't move task to different control group\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;type == RDTMON_GROUP)</div><div class='add'>+		resctrl_arch_set_closid_rmid(tsk, rdtgrp-&gt;mon.parent-&gt;closid,</div><div class='add'>+					     rdtgrp-&gt;mon.rmid);</div><div class='add'>+	else</div><div class='add'>+		resctrl_arch_set_closid_rmid(tsk, rdtgrp-&gt;closid,</div><div class='add'>+					     rdtgrp-&gt;mon.rmid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure the task's closid and rmid are written before determining if</div><div class='add'>+	 * the task is current that will decide if it will be interrupted.</div><div class='add'>+	 * This pairs with the full barrier between the rq-&gt;curr update and</div><div class='add'>+	 * resctrl_arch_sched_in() during context switch.</div><div class='add'>+	 */</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * By now, the task's closid and rmid are set. If the task is current</div><div class='add'>+	 * on a CPU, the PQR_ASSOC MSR needs to be updated to make the resource</div><div class='add'>+	 * group go into effect. If the task is not current, the MSR will be</div><div class='add'>+	 * updated when the task is scheduled in.</div><div class='add'>+	 */</div><div class='add'>+	update_task_closid_rmid(tsk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_closid_match(struct task_struct *t, struct rdtgroup *r)</div><div class='add'>+{</div><div class='add'>+	return (resctrl_arch_alloc_capable() &amp;&amp; (r-&gt;type == RDTCTRL_GROUP) &amp;&amp;</div><div class='add'>+		resctrl_arch_match_closid(t, r-&gt;closid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_rmid_match(struct task_struct *t, struct rdtgroup *r)</div><div class='add'>+{</div><div class='add'>+	return (resctrl_arch_mon_capable() &amp;&amp; (r-&gt;type == RDTMON_GROUP) &amp;&amp;</div><div class='add'>+		resctrl_arch_match_rmid(t, r-&gt;mon.parent-&gt;closid,</div><div class='add'>+					r-&gt;mon.rmid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_tasks_assigned - Test if tasks have been assigned to resource group</div><div class='add'>+ * @r: Resource group</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if tasks have been assigned to @r, 0 otherwise</div><div class='add'>+ */</div><div class='add'>+int rdtgroup_tasks_assigned(struct rdtgroup *r)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p, *t;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_process_thread(p, t) {</div><div class='add'>+		if (is_closid_match(t, r) || is_rmid_match(t, r)) {</div><div class='add'>+			ret = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_task_write_permission(struct task_struct *task,</div><div class='add'>+					  struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	const struct cred *tcred = get_task_cred(task);</div><div class='add'>+	const struct cred *cred = current_cred();</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Even if we're attaching all tasks in the thread group, we only</div><div class='add'>+	 * need to check permissions on one of them.</div><div class='add'>+	 */</div><div class='add'>+	if (!uid_eq(cred-&gt;euid, GLOBAL_ROOT_UID) &amp;&amp;</div><div class='add'>+	    !uid_eq(cred-&gt;euid, tcred-&gt;uid) &amp;&amp;</div><div class='add'>+	    !uid_eq(cred-&gt;euid, tcred-&gt;suid)) {</div><div class='add'>+		rdt_last_cmd_printf("No permission to move task %d\n", task-&gt;pid);</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_cred(tcred);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_move_task(pid_t pid, struct rdtgroup *rdtgrp,</div><div class='add'>+			      struct kernfs_open_file *of)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *tsk;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (pid) {</div><div class='add'>+		tsk = find_task_by_vpid(pid);</div><div class='add'>+		if (!tsk) {</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			rdt_last_cmd_printf("No task %d\n", pid);</div><div class='add'>+			return -ESRCH;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		tsk = current;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_task_struct(tsk);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	ret = rdtgroup_task_write_permission(tsk, of);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = __rdtgroup_move_task(tsk, rdtgrp);</div><div class='add'>+</div><div class='add'>+	put_task_struct(tsk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,</div><div class='add'>+				    char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	char *pid_str;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKED ||</div><div class='add'>+	    rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		rdt_last_cmd_puts("Pseudo-locking in progress\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (buf &amp;&amp; buf[0] != '\0' &amp;&amp; buf[0] != '\n') {</div><div class='add'>+		pid_str = strim(strsep(&amp;buf, ","));</div><div class='add'>+</div><div class='add'>+		if (kstrtoint(pid_str, 0, &amp;pid)) {</div><div class='add'>+			rdt_last_cmd_printf("Task list parsing error pid %s\n", pid_str);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pid &lt; 0) {</div><div class='add'>+			rdt_last_cmd_printf("Invalid pid %d\n", pid);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = rdtgroup_move_task(pid, rdtgrp, of);</div><div class='add'>+		if (ret) {</div><div class='add'>+			rdt_last_cmd_printf("Error while processing task %d\n", pid);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void show_rdt_tasks(struct rdtgroup *r, struct seq_file *s)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p, *t;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_process_thread(p, t) {</div><div class='add'>+		if (is_closid_match(t, r) || is_rmid_match(t, r)) {</div><div class='add'>+			pid = task_pid_vnr(t);</div><div class='add'>+			if (pid)</div><div class='add'>+				seq_printf(s, "%d\n", pid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_tasks_show(struct kernfs_open_file *of,</div><div class='add'>+			       struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (rdtgrp)</div><div class='add'>+		show_rdt_tasks(rdtgrp, s);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_closid_show(struct kernfs_open_file *of,</div><div class='add'>+				struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (rdtgrp)</div><div class='add'>+		seq_printf(s, "%u\n", rdtgrp-&gt;closid);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdtgroup_rmid_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (rdtgrp)</div><div class='add'>+		seq_printf(s, "%u\n", rdtgrp-&gt;mon.rmid);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_CPU_RESCTRL</div><div class='add'>+/*</div><div class='add'>+ * A task can only be part of one resctrl control group and of one monitor</div><div class='add'>+ * group which is associated to that control group.</div><div class='add'>+ *</div><div class='add'>+ * 1)   res:</div><div class='add'>+ *      mon:</div><div class='add'>+ *</div><div class='add'>+ *    resctrl is not available.</div><div class='add'>+ *</div><div class='add'>+ * 2)   res:/</div><div class='add'>+ *      mon:</div><div class='add'>+ *</div><div class='add'>+ *    Task is part of the root resctrl control group, and it is not associated</div><div class='add'>+ *    to any monitor group.</div><div class='add'>+ *</div><div class='add'>+ * 3)  res:/</div><div class='add'>+ *     mon:mon0</div><div class='add'>+ *</div><div class='add'>+ *    Task is part of the root resctrl control group and monitor group mon0.</div><div class='add'>+ *</div><div class='add'>+ * 4)  res:group0</div><div class='add'>+ *     mon:</div><div class='add'>+ *</div><div class='add'>+ *    Task is part of resctrl control group group0, and it is not associated</div><div class='add'>+ *    to any monitor group.</div><div class='add'>+ *</div><div class='add'>+ * 5) res:group0</div><div class='add'>+ *    mon:mon1</div><div class='add'>+ *</div><div class='add'>+ *    Task is part of resctrl control group group0 and monitor group mon1.</div><div class='add'>+ */</div><div class='add'>+int proc_resctrl_show(struct seq_file *s, struct pid_namespace *ns,</div><div class='add'>+		      struct pid *pid, struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtg;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	/* Return empty if resctrl has not been mounted. */</div><div class='add'>+	if (!resctrl_mounted) {</div><div class='add'>+		seq_puts(s, "res:\nmon:\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rdtg, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		struct rdtgroup *crg;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Task information is only relevant for shareable</div><div class='add'>+		 * and exclusive groups.</div><div class='add'>+		 */</div><div class='add'>+		if (rdtg-&gt;mode != RDT_MODE_SHAREABLE &amp;&amp;</div><div class='add'>+		    rdtg-&gt;mode != RDT_MODE_EXCLUSIVE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!resctrl_arch_match_closid(tsk, rdtg-&gt;closid))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "res:%s%s\n", (rdtg == &amp;rdtgroup_default) ? "/" : "",</div><div class='add'>+			   rdt_kn_name(rdtg-&gt;kn));</div><div class='add'>+		seq_puts(s, "mon:");</div><div class='add'>+		list_for_each_entry(crg, &amp;rdtg-&gt;mon.crdtgrp_list,</div><div class='add'>+				    mon.crdtgrp_list) {</div><div class='add'>+			if (!resctrl_arch_match_rmid(tsk, crg-&gt;mon.parent-&gt;closid,</div><div class='add'>+						     crg-&gt;mon.rmid))</div><div class='add'>+				continue;</div><div class='add'>+			seq_printf(s, "%s", rdt_kn_name(crg-&gt;kn));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		seq_putc(s, '\n');</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * The above search should succeed. Otherwise return</div><div class='add'>+	 * with an error.</div><div class='add'>+	 */</div><div class='add'>+	ret = -ENOENT;</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int rdt_last_cmd_status_show(struct kernfs_open_file *of,</div><div class='add'>+				    struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	len = seq_buf_used(&amp;last_cmd_status);</div><div class='add'>+	if (len)</div><div class='add'>+		seq_printf(seq, "%.*s", len, last_cmd_status_buf);</div><div class='add'>+	else</div><div class='add'>+		seq_puts(seq, "ok\n");</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *rdt_kn_parent_priv(struct kernfs_node *kn)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The parent pointer is only valid within RCU section since it can be</div><div class='add'>+	 * replaced.</div><div class='add'>+	 */</div><div class='add'>+	guard(rcu)();</div><div class='add'>+	return rcu_dereference(kn-&gt;__parent)-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_num_closids_show(struct kernfs_open_file *of,</div><div class='add'>+				struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%u\n", s-&gt;num_closid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_default_ctrl_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%x\n", resctrl_get_default_ctrl(r));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_min_cbm_bits_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%u\n", r-&gt;cache.min_cbm_bits);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_shareable_bits_show(struct kernfs_open_file *of,</div><div class='add'>+				   struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%x\n", r-&gt;cache.shareable_bits);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdt_bit_usage_show - Display current usage of resources</div><div class='add'>+ *</div><div class='add'>+ * A domain is a shared resource that can now be allocated differently. Here</div><div class='add'>+ * we display the current regions of the domain as an annotated bitmask.</div><div class='add'>+ * For each domain of this resource its allocation bitmask</div><div class='add'>+ * is annotated as below to indicate the current usage of the corresponding bit:</div><div class='add'>+ *   0 - currently unused</div><div class='add'>+ *   X - currently available for sharing and used by software and hardware</div><div class='add'>+ *   H - currently used by hardware only but available for software use</div><div class='add'>+ *   S - currently used and shareable by software only</div><div class='add'>+ *   E - currently used exclusively by one resource group</div><div class='add'>+ *   P - currently pseudo-locked by one resource group</div><div class='add'>+ */</div><div class='add'>+static int rdt_bit_usage_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	/*</div><div class='add'>+	 * Use unsigned long even though only 32 bits are used to ensure</div><div class='add'>+	 * test_bit() is used safely.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long sw_shareable = 0, hw_shareable = 0;</div><div class='add'>+	unsigned long exclusive = 0, pseudo_locked = 0;</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+	struct rdt_ctrl_domain *dom;</div><div class='add'>+	int i, hwb, swb, excl, psl;</div><div class='add'>+	enum rdtgrp_mode mode;</div><div class='add'>+	bool sep = false;</div><div class='add'>+	u32 ctrl_val;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+	list_for_each_entry(dom, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+		if (sep)</div><div class='add'>+			seq_putc(seq, ';');</div><div class='add'>+		hw_shareable = r-&gt;cache.shareable_bits;</div><div class='add'>+		sw_shareable = 0;</div><div class='add'>+		exclusive = 0;</div><div class='add'>+		seq_printf(seq, "%d=", dom-&gt;hdr.id);</div><div class='add'>+		for (i = 0; i &lt; closids_supported(); i++) {</div><div class='add'>+			if (!closid_allocated(i) ||</div><div class='add'>+			    (resctrl_arch_get_io_alloc_enabled(r) &amp;&amp;</div><div class='add'>+			     i == resctrl_io_alloc_closid(r)))</div><div class='add'>+				continue;</div><div class='add'>+			ctrl_val = resctrl_arch_get_config(r, dom, i,</div><div class='add'>+							   s-&gt;conf_type);</div><div class='add'>+			mode = rdtgroup_mode_by_closid(i);</div><div class='add'>+			switch (mode) {</div><div class='add'>+			case RDT_MODE_SHAREABLE:</div><div class='add'>+				sw_shareable |= ctrl_val;</div><div class='add'>+				break;</div><div class='add'>+			case RDT_MODE_EXCLUSIVE:</div><div class='add'>+				exclusive |= ctrl_val;</div><div class='add'>+				break;</div><div class='add'>+			case RDT_MODE_PSEUDO_LOCKSETUP:</div><div class='add'>+			/*</div><div class='add'>+			 * RDT_MODE_PSEUDO_LOCKSETUP is possible</div><div class='add'>+			 * here but not included since the CBM</div><div class='add'>+			 * associated with this CLOSID in this mode</div><div class='add'>+			 * is not initialized and no task or cpu can be</div><div class='add'>+			 * assigned this CLOSID.</div><div class='add'>+			 */</div><div class='add'>+				break;</div><div class='add'>+			case RDT_MODE_PSEUDO_LOCKED:</div><div class='add'>+			case RDT_NUM_MODES:</div><div class='add'>+				WARN(1,</div><div class='add'>+				     "invalid mode for closid %d\n", i);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * When the "io_alloc" feature is enabled, a portion of the cache</div><div class='add'>+		 * is configured for shared use between hardware and software.</div><div class='add'>+		 * Also, when CDP is enabled the CBMs of CDP_CODE and CDP_DATA</div><div class='add'>+		 * resources are kept in sync. So, the CBMs for "io_alloc" can</div><div class='add'>+		 * be accessed through either resource.</div><div class='add'>+		 */</div><div class='add'>+		if (resctrl_arch_get_io_alloc_enabled(r)) {</div><div class='add'>+			ctrl_val = resctrl_arch_get_config(r, dom,</div><div class='add'>+							   resctrl_io_alloc_closid(r),</div><div class='add'>+							   s-&gt;conf_type);</div><div class='add'>+			hw_shareable |= ctrl_val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = r-&gt;cache.cbm_len - 1; i &gt;= 0; i--) {</div><div class='add'>+			pseudo_locked = dom-&gt;plr ? dom-&gt;plr-&gt;cbm : 0;</div><div class='add'>+			hwb = test_bit(i, &amp;hw_shareable);</div><div class='add'>+			swb = test_bit(i, &amp;sw_shareable);</div><div class='add'>+			excl = test_bit(i, &amp;exclusive);</div><div class='add'>+			psl = test_bit(i, &amp;pseudo_locked);</div><div class='add'>+			if (hwb &amp;&amp; swb)</div><div class='add'>+				seq_putc(seq, 'X');</div><div class='add'>+			else if (hwb &amp;&amp; !swb)</div><div class='add'>+				seq_putc(seq, 'H');</div><div class='add'>+			else if (!hwb &amp;&amp; swb)</div><div class='add'>+				seq_putc(seq, 'S');</div><div class='add'>+			else if (excl)</div><div class='add'>+				seq_putc(seq, 'E');</div><div class='add'>+			else if (psl)</div><div class='add'>+				seq_putc(seq, 'P');</div><div class='add'>+			else /* Unused bits remain */</div><div class='add'>+				seq_putc(seq, '0');</div><div class='add'>+		}</div><div class='add'>+		sep = true;</div><div class='add'>+	}</div><div class='add'>+	seq_putc(seq, '\n');</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_min_bw_show(struct kernfs_open_file *of,</div><div class='add'>+			   struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%u\n", r-&gt;membw.min_bw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_num_rmids_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%d\n", r-&gt;mon.num_rmid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_mon_features_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct mon_evt *mevt;</div><div class='add'>+</div><div class='add'>+	for_each_mon_event(mevt) {</div><div class='add'>+		if (mevt-&gt;rid != r-&gt;rid || !mevt-&gt;enabled)</div><div class='add'>+			continue;</div><div class='add'>+		seq_printf(seq, "%s\n", mevt-&gt;name);</div><div class='add'>+		if (mevt-&gt;configurable &amp;&amp;</div><div class='add'>+		    !resctrl_arch_mbm_cntr_assign_enabled(r))</div><div class='add'>+			seq_printf(seq, "%s_config\n", mevt-&gt;name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_bw_gran_show(struct kernfs_open_file *of,</div><div class='add'>+			    struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%u\n", r-&gt;membw.bw_gran);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_delay_linear_show(struct kernfs_open_file *of,</div><div class='add'>+				 struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%u\n", r-&gt;membw.delay_linear);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max_threshold_occ_show(struct kernfs_open_file *of,</div><div class='add'>+				  struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	seq_printf(seq, "%u\n", resctrl_rmid_realloc_threshold);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_thread_throttle_mode_show(struct kernfs_open_file *of,</div><div class='add'>+					 struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	switch (r-&gt;membw.throttle_mode) {</div><div class='add'>+	case THREAD_THROTTLE_PER_THREAD:</div><div class='add'>+		seq_puts(seq, "per-thread\n");</div><div class='add'>+		return 0;</div><div class='add'>+	case THREAD_THROTTLE_MAX:</div><div class='add'>+		seq_puts(seq, "max\n");</div><div class='add'>+		return 0;</div><div class='add'>+	case THREAD_THROTTLE_UNDEFINED:</div><div class='add'>+		seq_puts(seq, "undefined\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t max_threshold_occ_write(struct kernfs_open_file *of,</div><div class='add'>+				       char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	unsigned int bytes;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtouint(buf, 0, &amp;bytes);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (bytes &gt; resctrl_rmid_realloc_limit)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	resctrl_rmid_realloc_threshold = resctrl_arch_round_mon_val(bytes);</div><div class='add'>+</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_mode_show - Display mode of this resource group</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_mode_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%s\n", rdtgroup_mode_str(rdtgrp-&gt;mode));</div><div class='add'>+</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum resctrl_conf_type resctrl_peer_type(enum resctrl_conf_type my_type)</div><div class='add'>+{</div><div class='add'>+	switch (my_type) {</div><div class='add'>+	case CDP_CODE:</div><div class='add'>+		return CDP_DATA;</div><div class='add'>+	case CDP_DATA:</div><div class='add'>+		return CDP_CODE;</div><div class='add'>+	default:</div><div class='add'>+	case CDP_NONE:</div><div class='add'>+		return CDP_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rdt_has_sparse_bitmasks_show(struct kernfs_open_file *of,</div><div class='add'>+					struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *s = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "%u\n", r-&gt;cache.arch_has_sparse_bitmasks);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __rdtgroup_cbm_overlaps - Does CBM for intended closid overlap with other</div><div class='add'>+ * @r: Resource to which domain instance @d belongs.</div><div class='add'>+ * @d: The domain instance for which @closid is being tested.</div><div class='add'>+ * @cbm: Capacity bitmask being tested.</div><div class='add'>+ * @closid: Intended closid for @cbm.</div><div class='add'>+ * @type: CDP type of @r.</div><div class='add'>+ * @exclusive: Only check if overlaps with exclusive resource groups</div><div class='add'>+ *</div><div class='add'>+ * Checks if provided @cbm intended to be used for @closid on domain</div><div class='add'>+ * @d overlaps with any other closids or other hardware usage associated</div><div class='add'>+ * with this domain. If @exclusive is true then only overlaps with</div><div class='add'>+ * resource groups in exclusive mode will be considered. If @exclusive</div><div class='add'>+ * is false then overlaps with any resource group or hardware entities</div><div class='add'>+ * will be considered.</div><div class='add'>+ *</div><div class='add'>+ * @cbm is unsigned long, even if only 32 bits are used, to make the</div><div class='add'>+ * bitmap functions work correctly.</div><div class='add'>+ *</div><div class='add'>+ * Return: false if CBM does not overlap, true if it does.</div><div class='add'>+ */</div><div class='add'>+static bool __rdtgroup_cbm_overlaps(struct rdt_resource *r, struct rdt_ctrl_domain *d,</div><div class='add'>+				    unsigned long cbm, int closid,</div><div class='add'>+				    enum resctrl_conf_type type, bool exclusive)</div><div class='add'>+{</div><div class='add'>+	enum rdtgrp_mode mode;</div><div class='add'>+	unsigned long ctrl_b;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Check for any overlap with regions used by hardware directly */</div><div class='add'>+	if (!exclusive) {</div><div class='add'>+		ctrl_b = r-&gt;cache.shareable_bits;</div><div class='add'>+		if (bitmap_intersects(&amp;cbm, &amp;ctrl_b, r-&gt;cache.cbm_len))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for overlap with other resource groups */</div><div class='add'>+	for (i = 0; i &lt; closids_supported(); i++) {</div><div class='add'>+		ctrl_b = resctrl_arch_get_config(r, d, i, type);</div><div class='add'>+		mode = rdtgroup_mode_by_closid(i);</div><div class='add'>+		if (closid_allocated(i) &amp;&amp; i != closid &amp;&amp;</div><div class='add'>+		    mode != RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+			if (bitmap_intersects(&amp;cbm, &amp;ctrl_b, r-&gt;cache.cbm_len)) {</div><div class='add'>+				if (exclusive) {</div><div class='add'>+					if (mode == RDT_MODE_EXCLUSIVE)</div><div class='add'>+						return true;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_cbm_overlaps - Does CBM overlap with other use of hardware</div><div class='add'>+ * @s: Schema for the resource to which domain instance @d belongs.</div><div class='add'>+ * @d: The domain instance for which @closid is being tested.</div><div class='add'>+ * @cbm: Capacity bitmask being tested.</div><div class='add'>+ * @closid: Intended closid for @cbm.</div><div class='add'>+ * @exclusive: Only check if overlaps with exclusive resource groups</div><div class='add'>+ *</div><div class='add'>+ * Resources that can be allocated using a CBM can use the CBM to control</div><div class='add'>+ * the overlap of these allocations. rdtgroup_cmb_overlaps() is the test</div><div class='add'>+ * for overlap. Overlap test is not limited to the specific resource for</div><div class='add'>+ * which the CBM is intended though - when dealing with CDP resources that</div><div class='add'>+ * share the underlying hardware the overlap check should be performed on</div><div class='add'>+ * the CDP resource sharing the hardware also.</div><div class='add'>+ *</div><div class='add'>+ * Refer to description of __rdtgroup_cbm_overlaps() for the details of the</div><div class='add'>+ * overlap test.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if CBM overlap detected, false if there is no overlap</div><div class='add'>+ */</div><div class='add'>+bool rdtgroup_cbm_overlaps(struct resctrl_schema *s, struct rdt_ctrl_domain *d,</div><div class='add'>+			   unsigned long cbm, int closid, bool exclusive)</div><div class='add'>+{</div><div class='add'>+	enum resctrl_conf_type peer_type = resctrl_peer_type(s-&gt;conf_type);</div><div class='add'>+	struct rdt_resource *r = s-&gt;res;</div><div class='add'>+</div><div class='add'>+	if (__rdtgroup_cbm_overlaps(r, d, cbm, closid, s-&gt;conf_type,</div><div class='add'>+				    exclusive))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!resctrl_arch_get_cdp_enabled(r-&gt;rid))</div><div class='add'>+		return false;</div><div class='add'>+	return  __rdtgroup_cbm_overlaps(r, d, cbm, closid, peer_type, exclusive);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_mode_test_exclusive - Test if this resource group can be exclusive</div><div class='add'>+ * @rdtgrp: Resource group identified through its closid.</div><div class='add'>+ *</div><div class='add'>+ * An exclusive resource group implies that there should be no sharing of</div><div class='add'>+ * its allocated resources. At the time this group is considered to be</div><div class='add'>+ * exclusive this test can determine if its current schemata supports this</div><div class='add'>+ * setting by testing for overlap with all other resource groups.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if resource group can be exclusive, false if there is overlap</div><div class='add'>+ * with allocations of other resource groups and thus this resource group</div><div class='add'>+ * cannot be exclusive.</div><div class='add'>+ */</div><div class='add'>+static bool rdtgroup_mode_test_exclusive(struct rdtgroup *rdtgrp)</div><div class='add'>+{</div><div class='add'>+	int closid = rdtgrp-&gt;closid;</div><div class='add'>+	struct rdt_ctrl_domain *d;</div><div class='add'>+	struct resctrl_schema *s;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	bool has_cache = false;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	/* Walking r-&gt;domains, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;resctrl_schema_all, list) {</div><div class='add'>+		r = s-&gt;res;</div><div class='add'>+		if (r-&gt;rid == RDT_RESOURCE_MBA || r-&gt;rid == RDT_RESOURCE_SMBA)</div><div class='add'>+			continue;</div><div class='add'>+		has_cache = true;</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+			ctrl = resctrl_arch_get_config(r, d, closid,</div><div class='add'>+						       s-&gt;conf_type);</div><div class='add'>+			if (rdtgroup_cbm_overlaps(s, d, ctrl, closid, false)) {</div><div class='add'>+				rdt_last_cmd_puts("Schemata overlaps\n");</div><div class='add'>+				return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!has_cache) {</div><div class='add'>+		rdt_last_cmd_puts("Cannot be exclusive without CAT/CDP\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_mode_write - Modify the resource group's mode</div><div class='add'>+ */</div><div class='add'>+static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of,</div><div class='add'>+				   char *buf, size_t nbytes, loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	enum rdtgrp_mode mode;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	mode = rdtgrp-&gt;mode;</div><div class='add'>+</div><div class='add'>+	if ((!strcmp(buf, "shareable") &amp;&amp; mode == RDT_MODE_SHAREABLE) ||</div><div class='add'>+	    (!strcmp(buf, "exclusive") &amp;&amp; mode == RDT_MODE_EXCLUSIVE) ||</div><div class='add'>+	    (!strcmp(buf, "pseudo-locksetup") &amp;&amp;</div><div class='add'>+	     mode == RDT_MODE_PSEUDO_LOCKSETUP) ||</div><div class='add'>+	    (!strcmp(buf, "pseudo-locked") &amp;&amp; mode == RDT_MODE_PSEUDO_LOCKED))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (mode == RDT_MODE_PSEUDO_LOCKED) {</div><div class='add'>+		rdt_last_cmd_puts("Cannot change pseudo-locked group\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(buf, "shareable")) {</div><div class='add'>+		if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+			ret = rdtgroup_locksetup_exit(rdtgrp);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		rdtgrp-&gt;mode = RDT_MODE_SHAREABLE;</div><div class='add'>+	} else if (!strcmp(buf, "exclusive")) {</div><div class='add'>+		if (!rdtgroup_mode_test_exclusive(rdtgrp)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+			ret = rdtgroup_locksetup_exit(rdtgrp);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		rdtgrp-&gt;mode = RDT_MODE_EXCLUSIVE;</div><div class='add'>+	} else if (IS_ENABLED(CONFIG_RESCTRL_FS_PSEUDO_LOCK) &amp;&amp;</div><div class='add'>+		   !strcmp(buf, "pseudo-locksetup")) {</div><div class='add'>+		ret = rdtgroup_locksetup_enter(rdtgrp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		rdtgrp-&gt;mode = RDT_MODE_PSEUDO_LOCKSETUP;</div><div class='add'>+	} else {</div><div class='add'>+		rdt_last_cmd_puts("Unknown or unsupported mode\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rdtgroup_cbm_to_size - Translate CBM to size in bytes</div><div class='add'>+ * @r: RDT resource to which @d belongs.</div><div class='add'>+ * @d: RDT domain instance.</div><div class='add'>+ * @cbm: bitmask for which the size should be computed.</div><div class='add'>+ *</div><div class='add'>+ * The bitmask provided associated with the RDT domain instance @d will be</div><div class='add'>+ * translated into how many bytes it represents. The size in bytes is</div><div class='add'>+ * computed by first dividing the total cache size by the CBM length to</div><div class='add'>+ * determine how many bytes each bit in the bitmask represents. The result</div><div class='add'>+ * is multiplied with the number of bits set in the bitmask.</div><div class='add'>+ *</div><div class='add'>+ * @cbm is unsigned long, even if only 32 bits are used to make the</div><div class='add'>+ * bitmap functions work correctly.</div><div class='add'>+ */</div><div class='add'>+unsigned int rdtgroup_cbm_to_size(struct rdt_resource *r,</div><div class='add'>+				  struct rdt_ctrl_domain *d, unsigned long cbm)</div><div class='add'>+{</div><div class='add'>+	unsigned int size = 0;</div><div class='add'>+	struct cacheinfo *ci;</div><div class='add'>+	int num_b;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(r-&gt;ctrl_scope != RESCTRL_L2_CACHE &amp;&amp; r-&gt;ctrl_scope != RESCTRL_L3_CACHE))</div><div class='add'>+		return size;</div><div class='add'>+</div><div class='add'>+	num_b = bitmap_weight(&amp;cbm, r-&gt;cache.cbm_len);</div><div class='add'>+	ci = get_cpu_cacheinfo_level(cpumask_any(&amp;d-&gt;hdr.cpu_mask), r-&gt;ctrl_scope);</div><div class='add'>+	if (ci)</div><div class='add'>+		size = ci-&gt;size / r-&gt;cache.cbm_len * num_b;</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool is_mba_sc(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	if (!r)</div><div class='add'>+		r = resctrl_arch_get_resource(RDT_RESOURCE_MBA);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The software controller support is only applicable to MBA resource.</div><div class='add'>+	 * Make sure to check for resource type.</div><div class='add'>+	 */</div><div class='add'>+	if (r-&gt;rid != RDT_RESOURCE_MBA)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return r-&gt;membw.mba_sc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rdtgroup_size_show - Display size in bytes of allocated regions</div><div class='add'>+ *</div><div class='add'>+ * The "size" file mirrors the layout of the "schemata" file, printing the</div><div class='add'>+ * size in bytes of each region instead of the capacity bitmask.</div><div class='add'>+ */</div><div class='add'>+static int rdtgroup_size_show(struct kernfs_open_file *of,</div><div class='add'>+			      struct seq_file *s, void *v)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_schema *schema;</div><div class='add'>+	enum resctrl_conf_type type;</div><div class='add'>+	struct rdt_ctrl_domain *d;</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+	struct rdt_resource *r;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 closid;</div><div class='add'>+	bool sep;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	rdtgrp = rdtgroup_kn_lock_live(of-&gt;kn);</div><div class='add'>+	if (!rdtgrp) {</div><div class='add'>+		rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKED) {</div><div class='add'>+		if (!rdtgrp-&gt;plr-&gt;d) {</div><div class='add'>+			rdt_last_cmd_clear();</div><div class='add'>+			rdt_last_cmd_puts("Cache domain offline\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+		} else {</div><div class='add'>+			seq_printf(s, "%*s:", max_name_width,</div><div class='add'>+				   rdtgrp-&gt;plr-&gt;s-&gt;name);</div><div class='add'>+			size = rdtgroup_cbm_to_size(rdtgrp-&gt;plr-&gt;s-&gt;res,</div><div class='add'>+						    rdtgrp-&gt;plr-&gt;d,</div><div class='add'>+						    rdtgrp-&gt;plr-&gt;cbm);</div><div class='add'>+			seq_printf(s, "%d=%u\n", rdtgrp-&gt;plr-&gt;d-&gt;hdr.id, size);</div><div class='add'>+		}</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	closid = rdtgrp-&gt;closid;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(schema, &amp;resctrl_schema_all, list) {</div><div class='add'>+		r = schema-&gt;res;</div><div class='add'>+		type = schema-&gt;conf_type;</div><div class='add'>+		sep = false;</div><div class='add'>+		seq_printf(s, "%*s:", max_name_width, schema-&gt;name);</div><div class='add'>+		list_for_each_entry(d, &amp;r-&gt;ctrl_domains, hdr.list) {</div><div class='add'>+			if (sep)</div><div class='add'>+				seq_putc(s, ';');</div><div class='add'>+			if (rdtgrp-&gt;mode == RDT_MODE_PSEUDO_LOCKSETUP) {</div><div class='add'>+				size = 0;</div><div class='add'>+			} else {</div><div class='add'>+				if (is_mba_sc(r))</div><div class='add'>+					ctrl = d-&gt;mbps_val[closid];</div><div class='add'>+				else</div><div class='add'>+					ctrl = resctrl_arch_get_config(r, d,</div><div class='add'>+								       closid,</div><div class='add'>+								       type);</div><div class='add'>+				if (r-&gt;rid == RDT_RESOURCE_MBA ||</div><div class='add'>+				    r-&gt;rid == RDT_RESOURCE_SMBA)</div><div class='add'>+					size = ctrl;</div><div class='add'>+				else</div><div class='add'>+					size = rdtgroup_cbm_to_size(r, d, ctrl);</div><div class='add'>+			}</div><div class='add'>+			seq_printf(s, "%d=%u", d-&gt;hdr.id, size);</div><div class='add'>+			sep = true;</div><div class='add'>+		}</div><div class='add'>+		seq_putc(s, '\n');</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rdtgroup_kn_unlock(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mondata_config_read(struct resctrl_mon_config_info *mon_info)</div><div class='add'>+{</div><div class='add'>+	smp_call_function_any(&amp;mon_info-&gt;d-&gt;hdr.cpu_mask,</div><div class='add'>+			      resctrl_arch_mon_event_config_read, mon_info, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbm_config_show(struct seq_file *s, struct rdt_resource *r, u32 evtid)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_mon_config_info mon_info;</div><div class='add'>+	struct rdt_mon_domain *dom;</div><div class='add'>+	bool sep = false;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dom, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		if (sep)</div><div class='add'>+			seq_puts(s, ";");</div><div class='add'>+</div><div class='add'>+		memset(&amp;mon_info, 0, sizeof(struct resctrl_mon_config_info));</div><div class='add'>+		mon_info.r = r;</div><div class='add'>+		mon_info.d = dom;</div><div class='add'>+		mon_info.evtid = evtid;</div><div class='add'>+		mondata_config_read(&amp;mon_info);</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "%d=0x%02x", dom-&gt;hdr.id, mon_info.mon_config);</div><div class='add'>+		sep = true;</div><div class='add'>+	}</div><div class='add'>+	seq_puts(s, "\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbm_total_bytes_config_show(struct kernfs_open_file *of,</div><div class='add'>+				       struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	mbm_config_show(seq, r, QOS_L3_MBM_TOTAL_EVENT_ID);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbm_local_bytes_config_show(struct kernfs_open_file *of,</div><div class='add'>+				       struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+</div><div class='add'>+	mbm_config_show(seq, r, QOS_L3_MBM_LOCAL_EVENT_ID);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mbm_config_write_domain(struct rdt_resource *r,</div><div class='add'>+				    struct rdt_mon_domain *d, u32 evtid, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct resctrl_mon_config_info mon_info = {0};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read the current config value first. If both are the same then</div><div class='add'>+	 * no need to write it again.</div><div class='add'>+	 */</div><div class='add'>+	mon_info.r = r;</div><div class='add'>+	mon_info.d = d;</div><div class='add'>+	mon_info.evtid = evtid;</div><div class='add'>+	mondata_config_read(&amp;mon_info);</div><div class='add'>+	if (mon_info.mon_config == val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mon_info.mon_config = val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update MSR_IA32_EVT_CFG_BASE MSR on one of the CPUs in the</div><div class='add'>+	 * domain. The MSRs offset from MSR MSR_IA32_EVT_CFG_BASE</div><div class='add'>+	 * are scoped at the domain level. Writing any of these MSRs</div><div class='add'>+	 * on one CPU is observed by all the CPUs in the domain.</div><div class='add'>+	 */</div><div class='add'>+	smp_call_function_any(&amp;d-&gt;hdr.cpu_mask, resctrl_arch_mon_event_config_write,</div><div class='add'>+			      &amp;mon_info, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When an Event Configuration is changed, the bandwidth counters</div><div class='add'>+	 * for all RMIDs and Events will be cleared by the hardware. The</div><div class='add'>+	 * hardware also sets MSR_IA32_QM_CTR.Unavailable (bit 62) for</div><div class='add'>+	 * every RMID on the next read to any event for every RMID.</div><div class='add'>+	 * Subsequent reads will have MSR_IA32_QM_CTR.Unavailable (bit 62)</div><div class='add'>+	 * cleared while it is tracked by the hardware. Clear the</div><div class='add'>+	 * mbm_local and mbm_total counts for all the RMIDs.</div><div class='add'>+	 */</div><div class='add'>+	resctrl_arch_reset_rmid_all(r, d);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mon_config_write(struct rdt_resource *r, char *tok, u32 evtid)</div><div class='add'>+{</div><div class='add'>+	char *dom_str = NULL, *id_str;</div><div class='add'>+	unsigned long dom_id, val;</div><div class='add'>+	struct rdt_mon_domain *d;</div><div class='add'>+</div><div class='add'>+	/* Walking r-&gt;domains, ensure it can't race with cpuhp */</div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+	if (!tok || tok[0] == '\0')</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Start processing the strings for each domain */</div><div class='add'>+	dom_str = strim(strsep(&amp;tok, ";"));</div><div class='add'>+	id_str = strsep(&amp;dom_str, "=");</div><div class='add'>+</div><div class='add'>+	if (!id_str || kstrtoul(id_str, 10, &amp;dom_id)) {</div><div class='add'>+		rdt_last_cmd_puts("Missing '=' or non-numeric domain id\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dom_str || kstrtoul(dom_str, 16, &amp;val)) {</div><div class='add'>+		rdt_last_cmd_puts("Non-numeric event configuration value\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Value from user cannot be more than the supported set of events */</div><div class='add'>+	if ((val &amp; r-&gt;mon.mbm_cfg_mask) != val) {</div><div class='add'>+		rdt_last_cmd_printf("Invalid event configuration: max valid mask is 0x%02x\n",</div><div class='add'>+				    r-&gt;mon.mbm_cfg_mask);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(d, &amp;r-&gt;mon_domains, hdr.list) {</div><div class='add'>+		if (d-&gt;hdr.id == dom_id) {</div><div class='add'>+			mbm_config_write_domain(r, d, evtid, val);</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mbm_total_bytes_config_write(struct kernfs_open_file *of,</div><div class='add'>+					    char *buf, size_t nbytes,</div><div class='add'>+					    loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	ret = mon_config_write(r, buf, QOS_L3_MBM_TOTAL_EVENT_ID);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mbm_local_bytes_config_write(struct kernfs_open_file *of,</div><div class='add'>+					    char *buf, size_t nbytes,</div><div class='add'>+					    loff_t off)</div><div class='add'>+{</div><div class='add'>+	struct rdt_resource *r = rdt_kn_parent_priv(of-&gt;kn);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Valid input requires a trailing newline */</div><div class='add'>+	if (nbytes == 0 || buf[nbytes - 1] != '\n')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cpus_read_lock();</div><div class='add'>+	mutex_lock(&amp;rdtgroup_mutex);</div><div class='add'>+</div><div class='add'>+	rdt_last_cmd_clear();</div><div class='add'>+</div><div class='add'>+	buf[nbytes - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	ret = mon_config_write(r, buf, QOS_L3_MBM_LOCAL_EVENT_ID);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rdtgroup_mutex);</div><div class='add'>+	cpus_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret ?: nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * resctrl_bmec_files_show() — Controls the visibility of BMEC-related resctrl</div><div class='add'>+ * files. When @show is true, the files are displayed; when false, the files</div><div class='add'>+ * are hidden.</div><div class='add'>+ * Don't treat kernfs_find_and_get failure as an error, since this function may</div><div class='add'>+ * be called regardless of whether BMEC is supported or the event is enabled.</div><div class='add'>+ */</div><div class='add'>+void resctrl_bmec_files_show(struct rdt_resource *r, struct kernfs_node *l3_mon_kn,</div><div class='add'>+			     bool show)</div><div class='add'>+{</div><div class='add'>+	struct kernfs_node *kn_config, *mon_kn = NULL;</div><div class='add'>+	char name[32];</div><div class='add'>+</div><div class='add'>+	if (!l3_mon_kn) {</div><div class='add'>+		sprintf(name, "%s_MON", r-&gt;name);</div><div class='add'>+		mon_kn = kernfs_find_and_get(kn_info, name);</div><div class='add'>+		if (!mon_kn)</div><div class='add'>+			return;</div><div class='add'>+		l3_mon_kn = mon_kn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kn_config = kernfs_find_and_get(l3_mon_kn, "mbm_total_bytes_config");</div><div class='add'>+	if (kn_config) {</div><div class='add'>+		kernfs_show(kn_config, show);</div><div class='add'>+		kernfs_put(kn_config);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kn_config = kernfs_find_and_get(l3_mon_kn, "mbm_local_bytes_config");</div><div class='add'>+	if (kn_config) {</div><div class='add'>+		kernfs_show(kn_config, show);</div><div class='add'>+		kernfs_put(kn_config);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Release the reference only if it was acquired */</div><div class='add'>+	if (mon_kn)</div><div class='add'>+		kernfs_put(mon_kn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *rdtgroup_name_by_closid(u32 closid)</div><div class='add'>+{</div><div class='add'>+	struct rdtgroup *rdtgrp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rdtgrp, &amp;rdt_all_groups, rdtgroup_list) {</div><div class='add'>+		if (rdtgrp-&gt;closid == closid)</div><div class='add'>+			return rdt_kn_name(rdtgrp-&gt;kn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rdtgroup information files for one cache resource. */</div><div class='add'>+static struct rftype res_common_files[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "last_cmd_status",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_last_cmd_status_show,</div><div class='add'>+		.fflags		= RFTYPE_TOP_INFO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mbm_assign_on_mkdir",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= resctrl_mbm_assign_on_mkdir_show,</div><div class='add'>+		.write		= resctrl_mbm_assign_on_mkdir_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "num_closids",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_num_closids_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mon_features",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_mon_features_show,</div><div class='add'>+		.fflags		= RFTYPE_MON_INFO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "available_mbm_cntrs",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= resctrl_available_mbm_cntrs_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "num_rmids",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_num_rmids_show,</div><div class='add'>+		.fflags		= RFTYPE_MON_INFO,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "cbm_mask",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_default_ctrl_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "num_mbm_cntrs",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= resctrl_num_mbm_cntrs_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "min_cbm_bits",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_min_cbm_bits_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "shareable_bits",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_shareable_bits_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "bit_usage",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_bit_usage_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "min_bandwidth",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_min_bw_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_MB,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "bandwidth_gran",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_bw_gran_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_MB,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "delay_linear",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_delay_linear_show,</div><div class='add'>+		.fflags		= RFTYPE_CTRL_INFO | RFTYPE_RES_MB,</div><div class='add'>+	},</div><div class='add'>+	/*</div><div class='add'>+	 * Platform specific which (if any) capabilities are provided by</div><div class='add'>+	 * thread_throttle_mode. Defer "fflags" initialization to platform</div><div class='add'>+	 * discovery.</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		.name		= "thread_throttle_mode",</div><div class='add'>+		.mode		= 0444,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= rdt_thread_throttle_mode_show,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "io_alloc",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= resctrl_io_alloc_show,</div><div class='add'>+		.write          = resctrl_io_alloc_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "io_alloc_cbm",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= resctrl_io_alloc_cbm_show,</div><div class='add'>+		.write		= resctrl_io_alloc_cbm_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "max_threshold_occupancy",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.write		= max_threshold_occ_write,</div><div class='add'>+		.seq_show	= max_threshold_occ_show,</div><div class='add'>+		.fflags		= RFTYPE_MON_INFO | RFTYPE_RES_CACHE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mbm_total_bytes_config",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= mbm_total_bytes_config_show,</div><div class='add'>+		.write		= mbm_total_bytes_config_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mbm_local_bytes_config",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= mbm_local_bytes_config_show,</div><div class='add'>+		.write		= mbm_local_bytes_config_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "event_filter",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= event_filter_show,</div><div class='add'>+		.write		= event_filter_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mbm_L3_assignments",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= mbm_L3_assignments_show,</div><div class='add'>+		.write		= mbm_L3_assignments_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mbm_assign_mode",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div><div class='add'>+		.seq_show	= resctrl_mbm_assign_mode_show,</div><div class='add'>+		.write		= resctrl_mbm_assign_mode_write,</div><div class='add'>+		.fflags		= RFTYPE_MON_INFO | RFTYPE_RES_CACHE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "cpus",</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.kf_ops		= &amp;rdtgroup_kf_single_ops,</div>